diff --git a/.changelog/13023.txt b/.changelog/13023.txt
deleted file mode 100644
index cadf7bb938495..0000000000000
--- a/.changelog/13023.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: the topology view now properly displays services with mixed connect and non-connect instances.
-```
diff --git a/.changelog/15654.txt b/.changelog/15654.txt
deleted file mode 100644
index 169191377ba3b..0000000000000
--- a/.changelog/15654.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-cli: Adds new command - `consul services export` - for exporting a service to a peer or partition
-```
diff --git a/.changelog/15987.txt b/.changelog/15987.txt
deleted file mode 100644
index 2a4da0320a36d..0000000000000
--- a/.changelog/15987.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-api: Enable setting query options on agent force-leave endpoint.
-```
\ No newline at end of file
diff --git a/.changelog/16224.txt b/.changelog/16224.txt
deleted file mode 100644
index 76f73d05953c3..0000000000000
--- a/.changelog/16224.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ca: support Vault agent auto-auth config for Vault CA provider using AliCloud authentication.
-```
diff --git a/.changelog/16251.txt b/.changelog/16251.txt
deleted file mode 100644
index 7aaf58011e0ac..0000000000000
--- a/.changelog/16251.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: update from <button> and <a> to design-system-components button <Hds::Button>
-```
\ No newline at end of file
diff --git a/.changelog/16259.txt b/.changelog/16259.txt
deleted file mode 100644
index dd73aaf6e6687..0000000000000
--- a/.changelog/16259.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ca: support Vault agent auto-auth config for Vault CA provider using AppRole authentication.
-```
diff --git a/.changelog/16262.txt b/.changelog/16262.txt
deleted file mode 100644
index 3a53c5b2c1107..0000000000000
--- a/.changelog/16262.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ca: support Vault agent auto-auth config for Vault CA provider using Kubernetes authentication.
-```
diff --git a/.changelog/16266.txt b/.changelog/16266.txt
deleted file mode 100644
index 72dbc398007b8..0000000000000
--- a/.changelog/16266.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ca: support Vault agent auto-auth config for Vault CA provider using JWT authentication.
-```
diff --git a/.changelog/16292.txt b/.changelog/16292.txt
deleted file mode 100644
index 085fe7fd07c27..0000000000000
--- a/.changelog/16292.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-server: added server side RPC requests global read/write rate-limiter.
-```
diff --git a/.changelog/16298.txt b/.changelog/16298.txt
deleted file mode 100644
index 6d79987eff074..0000000000000
--- a/.changelog/16298.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ca: support Vault agent auto-auth config for Vault CA provider using Azure MSI authentication.
-```
diff --git a/.changelog/16412.txt b/.changelog/16412.txt
deleted file mode 100644
index 9b405be61eb4d..0000000000000
--- a/.changelog/16412.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: Update alerts to Hds::Alert component
-```
diff --git a/.changelog/16428.txt b/.changelog/16428.txt
deleted file mode 100644
index 30f9206de096d..0000000000000
--- a/.changelog/16428.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ui: fixes ui tests run on CI
-```
\ No newline at end of file
diff --git a/.changelog/16519.txt b/.changelog/16519.txt
deleted file mode 100644
index 758d4cb11a28c..0000000000000
--- a/.changelog/16519.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: Update to use Hds::Toast component to show notifications
-```
\ No newline at end of file
diff --git a/.changelog/16577.txt b/.changelog/16577.txt
deleted file mode 100644
index 3e8fdbece14bb..0000000000000
--- a/.changelog/16577.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: update typography to styles from hds
-```
\ No newline at end of file
diff --git a/.changelog/16651.txt b/.changelog/16651.txt
new file mode 100644
index 0000000000000..c297cca489d90
--- /dev/null
+++ b/.changelog/16651.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+gateway: **(Enterprise only)** Fix bug where namespace/partition would fail to unmarshal.
+```
diff --git a/.changelog/16673.txt b/.changelog/16675.txt
similarity index 100%
rename from .changelog/16673.txt
rename to .changelog/16675.txt
diff --git a/.changelog/16871.txt b/.changelog/16871.txt
deleted file mode 100644
index f1167c45006a5..0000000000000
--- a/.changelog/16871.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-Fix a race condition where an event is published before the data associated is commited to memdb.
-```
diff --git a/.changelog/16877.txt b/.changelog/16877.txt
deleted file mode 100644
index b27c04ca4a11b..0000000000000
--- a/.changelog/16877.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-xds: Add a built-in Envoy extension that inserts Wasm HTTP filters.
-```
diff --git a/.changelog/16957.txt b/.changelog/16957.txt
deleted file mode 100644
index 83b7dc2456f60..0000000000000
--- a/.changelog/16957.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-```release-note:breaking-change
-peering: Removed deprecated backward-compatibility behavior.
-Upstream overrides in service-defaults will now only apply to peer upstreams when the `peer` field is provided.
-Visit the 1.16.x [upgrade instructions](https://developer.hashicorp.com/consul/docs/upgrading/upgrade-specific) for more information.
-```
diff --git a/.changelog/17035.txt b/.changelog/17035.txt
deleted file mode 100644
index fb254cf96ffb8..0000000000000
--- a/.changelog/17035.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-mesh: Add new permissive mTLS mode that allows sidecar proxies to forward incoming traffic unmodified to the application. This adds `AllowEnablingPermissiveMutualTLS` setting to the mesh config entry and the `MutualTLSMode` setting to proxy-defaults and service-defaults.
-```
diff --git a/.changelog/17066.txt b/.changelog/17066.txt
deleted file mode 100644
index 9b8b181859d09..0000000000000
--- a/.changelog/17066.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-command: Allow creating ACL Token TTL with greater than 24 hours with the -expires-ttl flag.
-```
diff --git a/.changelog/17075.txt b/.changelog/17075.txt
deleted file mode 100644
index 1c882fabbddd3..0000000000000
--- a/.changelog/17075.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-agent: remove agent cache dependency from service mesh leaf certificate management
-```
diff --git a/.changelog/17086.txt b/.changelog/17086.txt
deleted file mode 100644
index ad7b7231d177e..0000000000000
--- a/.changelog/17086.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-command: Adds ACL enabled to status output on agent startup.
-```
diff --git a/.changelog/17107.txt b/.changelog/17107.txt
deleted file mode 100644
index 5694fca2c9cc8..0000000000000
--- a/.changelog/17107.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:breaking-change
-api: RaftLeaderTransfer now requires an id string. An empty string can be specified to keep the old behavior.
-```
diff --git a/.changelog/17138.txt b/.changelog/17138.txt
deleted file mode 100644
index 63843690b0e3f..0000000000000
--- a/.changelog/17138.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-ca: automatically set up Vault's auto-tidy setting for tidy_expired_issuers when using Vault as a CA provider.
-```
-
diff --git a/.changelog/17155.txt b/.changelog/17155.txt
deleted file mode 100644
index 03cec33e991af..0000000000000
--- a/.changelog/17155.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-config: Add new `tls.defaults.verify_server_hostname` configuration option. This specifies the default value for any interfaces that support the `verify_server_hostname` option.
-```
diff --git a/.changelog/17183.txt b/.changelog/17183.txt
deleted file mode 100644
index 1d4326c552b00..0000000000000
--- a/.changelog/17183.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-```release-note:improvement
-* cli: Add `-filter` option to `consul config list` for filtering config entries.
-```
-```release-note:improvement
-* api: Support filtering for config entries.
-```
-
diff --git a/.changelog/17424.txt b/.changelog/17424.txt
deleted file mode 100644
index cd35f9aa333b9..0000000000000
--- a/.changelog/17424.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:breaking-change
-api: The `/v1/health/connect/` and `/v1/health/ingress/` endpoints now immediately return 403 "Permission Denied" errors whenever a token with insufficient `service:read` permissions is provided. Prior to this change, the endpoints returned a success code with an empty result list when a token with insufficient permissions was provided.
-```
diff --git a/.changelog/17452.txt b/.changelog/17452.txt
deleted file mode 100644
index 2f40095dcd9f8..0000000000000
--- a/.changelog/17452.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-mesh: Support configuring JWT authentication in Envoy.
-```
diff --git a/.changelog/17481.txt b/.changelog/17481.txt
deleted file mode 100644
index 89ad16998e836..0000000000000
--- a/.changelog/17481.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-tlsutil: Default setting of ServerName field in outgoing TLS configuration for checks now handled by crypto/tls.
-```
diff --git a/.changelog/17487.txt b/.changelog/17487.txt
deleted file mode 100644
index a18bea889fbee..0000000000000
--- a/.changelog/17487.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-xds: Add `property-override` built-in Envoy extension that directly patches Envoy resources.
-```
diff --git a/.changelog/17495.txt b/.changelog/17495.txt
deleted file mode 100644
index 1fea78ee3092c..0000000000000
--- a/.changelog/17495.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-xds: Add a built-in Envoy extension that inserts External Authorization (ext_authz) network and HTTP filters.
-```
diff --git a/.changelog/17505.txt b/.changelog/17505.txt
deleted file mode 100644
index 28ed8d0ed9345..0000000000000
--- a/.changelog/17505.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-xds: Add a built-in Envoy extension that inserts Wasm network filters.
-```
diff --git a/.changelog/17525.txt b/.changelog/17525.txt
deleted file mode 100644
index 66bdcb8d90042..0000000000000
--- a/.changelog/17525.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-http: accept query parameters `datacenter`, `ap` (enterprise-only), and `namespace` (enterprise-only). Both short-hand and long-hand forms of these query params are now supported via the HTTP API (dc/datacenter, ap/partition, ns/namespace).
-```
\ No newline at end of file
diff --git a/.changelog/17545.txt b/.changelog/17545.txt
new file mode 100644
index 0000000000000..a605f21bb3aec
--- /dev/null
+++ b/.changelog/17545.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: update supported envoy versions to 1.22.11, 1.23.9, 1.24.7, 1.25.6
+```
diff --git a/.changelog/17546.txt b/.changelog/17546.txt
deleted file mode 100644
index 6f4025553986c..0000000000000
--- a/.changelog/17546.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-connect: update supported envoy versions to 1.23.10, 1.24.8, 1.25.7, 1.26.2
-```
diff --git a/.changelog/17636.txt b/.changelog/17636.txt
new file mode 100644
index 0000000000000..aa06f9191b967
--- /dev/null
+++ b/.changelog/17636.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cache: fix a few minor goroutine leaks in leaf certs and the agent cache
+```
diff --git a/.changelog/17694.txt b/.changelog/17694.txt
deleted file mode 100644
index 703b100d1d3a3..0000000000000
--- a/.changelog/17694.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-Windows: support consul connect envoy command on Windows
-```
diff --git a/.changelog/17719.txt b/.changelog/17719.txt
deleted file mode 100644
index f45370b3f7dc6..0000000000000
--- a/.changelog/17719.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:security
-Bump Dockerfile base image to `alpine:3.18`. 
- ```
diff --git a/.changelog/17754.txt b/.changelog/17754.txt
deleted file mode 100644
index 32272ec1ae911..0000000000000
--- a/.changelog/17754.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-ui: Display the Consul agent version in the nodes list, and allow filtering and sorting of nodes based on versions.
-```
\ No newline at end of file
diff --git a/.changelog/17755.txt b/.changelog/17755.txt
deleted file mode 100644
index 7edf7b26e1591..0000000000000
--- a/.changelog/17755.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-mesh: Stop jwt providers referenced by intentions from being deleted.
-```
\ No newline at end of file
diff --git a/.changelog/17757.txt b/.changelog/17757.txt
deleted file mode 100644
index e207438cf8437..0000000000000
--- a/.changelog/17757.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-connect: Improve transparent proxy support for virtual services and failovers.
-```
diff --git a/.changelog/17759.txt b/.changelog/17759.txt
deleted file mode 100644
index 0836608ae1f24..0000000000000
--- a/.changelog/17759.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-extensions: Improve validation and error feedback for `property-override` builtin Envoy extension
-```
diff --git a/.changelog/17775.txt b/.changelog/17775.txt
deleted file mode 100644
index 8060cfa128ce7..0000000000000
--- a/.changelog/17775.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-connect: Fix issue where changes to service exports were not reflected in proxies.
-```
diff --git a/.changelog/17831.txt b/.changelog/17831.txt
deleted file mode 100644
index 2833bda1d5765..0000000000000
--- a/.changelog/17831.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ca: Vault CA provider config no longer requires root_pki_path for secondary datacenters
-```
diff --git a/.changelog/17911.txt b/.changelog/17911.txt
deleted file mode 100644
index a17cd6d2bdf26..0000000000000
--- a/.changelog/17911.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:bug
-gateway: Fixes a bug where envoy would silently reject RSA keys that are smaller than 2048 bits,
-we now reject those earlier in the process when we validate the certificate.
-```
diff --git a/.changelog/17936.txt b/.changelog/17936.txt
deleted file mode 100644
index 61f5117d8712f..0000000000000
--- a/.changelog/17936.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-acl: Add new `acl.tokens.dns` config field which specifies the token used implicitly during dns checks.
-```
diff --git a/.changelog/17939.txt b/.changelog/17939.txt
deleted file mode 100644
index 069ac53ee7be5..0000000000000
--- a/.changelog/17939.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-http: GET API `operator/usage` endpoint now returns node count
-cli: `consul operator usage` command now returns node count
-```
\ No newline at end of file
diff --git a/.changelog/17978.txt b/.changelog/17978.txt
deleted file mode 100644
index 81d5a648da1ff..0000000000000
--- a/.changelog/17978.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-mesh: Expose remote jwks cluster configuration through jwt-provider config entry
-```
\ No newline at end of file
diff --git a/.changelog/18007.txt b/.changelog/18007.txt
deleted file mode 100644
index b963d2f77fcd6..0000000000000
--- a/.changelog/18007.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-Windows: Integration tests for Consul Windows VMs
-```
diff --git a/.changelog/18068.txt b/.changelog/18068.txt
deleted file mode 100644
index be55ad365877b..0000000000000
--- a/.changelog/18068.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-xds: Prevent partial application of non-Required Envoy extensions in the case of failure.
-```
\ No newline at end of file
diff --git a/.changelog/18112.txt b/.changelog/18112.txt
deleted file mode 100644
index ddd37786f5520..0000000000000
--- a/.changelog/18112.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-ca: Fixes a Vault CA provider bug where updating RootPKIPath but not IntermediatePKIPath would not renew leaf signing certificates
-```
diff --git a/.changelog/18184.txt b/.changelog/18184.txt
deleted file mode 100644
index 594546ca32592..0000000000000
--- a/.changelog/18184.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-api: Fix client deserialization errors by marking new Enterprise-only prepared query fields as omit empty
-```
diff --git a/.changelog/18300.txt b/.changelog/18300.txt
deleted file mode 100644
index 717a697777e26..0000000000000
--- a/.changelog/18300.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-connect: update supported envoy versions to 1.24.10, 1.25.9, 1.26.4, 1.27.0
-```
diff --git a/.changelog/18304.txt b/.changelog/18304.txt
new file mode 100644
index 0000000000000..b5f8fbc1410ca
--- /dev/null
+++ b/.changelog/18304.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: update supported envoy versions to 1.22.11, 1.23.12, 1.24.10, 1.25.9
+```
diff --git a/.changelog/18324.txt b/.changelog/18324.txt
deleted file mode 100644
index 6d1f11a92e969..0000000000000
--- a/.changelog/18324.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-api-gateway: add retry and timeout filters
-```
\ No newline at end of file
diff --git a/.changelog/18325.txt b/.changelog/18325.txt
deleted file mode 100644
index b2870352b6c00..0000000000000
--- a/.changelog/18325.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-mesh: **(Enterprise Only)** Require that `jwt-provider` config entries are created in the `default` namespace.
-```
\ No newline at end of file
diff --git a/.changelog/18336.txt b/.changelog/18336.txt
deleted file mode 100644
index 5d91046ec5efd..0000000000000
--- a/.changelog/18336.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-```release-note:feature
-xds: Add a built-in Envoy extension that appends OpenTelemetry Access Logging (otel-access-logging) to the HTTP Connection Manager filter.
-```
-
-```release-note:feature
-xds: Add support for patching outbound listeners to the built-in Envoy External Authorization extension.
-```
diff --git a/.changelog/18367.txt b/.changelog/18367.txt
deleted file mode 100644
index 578cf7091853f..0000000000000
--- a/.changelog/18367.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-dev-mode: Fix dev mode has new line in responses. Now new line is added only when url has pretty query parameter.
-```
diff --git a/.changelog/18381.txt b/.changelog/18381.txt
deleted file mode 100644
index f6af62993f596..0000000000000
--- a/.changelog/18381.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-```release-note:improvement
-checks: It is now possible to configure agent TCP checks to use TLS with
-optional server SNI and mutual authentication. To use TLS with a TCP check, the
-check must enable the `tcp_use_tls` boolean. By default the agent will use the
-TLS configuration in the `tls.default` stanza. 
-```
diff --git a/.changelog/18437.txt b/.changelog/18437.txt
deleted file mode 100644
index 2ae3c5bdda238..0000000000000
--- a/.changelog/18437.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-Inherit locality from services when registering sidecar proxies.
-```
diff --git a/.changelog/18439.txt b/.changelog/18439.txt
deleted file mode 100644
index dd12738d5c387..0000000000000
--- a/.changelog/18439.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-Support custom watches on the Consul Controller framework.
-```
diff --git a/.changelog/18464.txt b/.changelog/18464.txt
deleted file mode 100644
index b0c15cf0d5520..0000000000000
--- a/.changelog/18464.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-UI : Nodes list view was breaking for synthetic-nodes. Fix handles non existence of consul-version meta for node.
-```
diff --git a/.changelog/18504.txt b/.changelog/18504.txt
deleted file mode 100644
index 6df042237a93c..0000000000000
--- a/.changelog/18504.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-dataplane: Allow getting bootstrap parameters when using V2 APIs
-```
\ No newline at end of file
diff --git a/.changelog/18560.txt b/.changelog/18560.txt
deleted file mode 100644
index 118fad95306d7..0000000000000
--- a/.changelog/18560.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-ui: Use Community verbiage
-```
\ No newline at end of file
diff --git a/.changelog/18573.txt b/.changelog/18573.txt
deleted file mode 100644
index ce03f1c55baf7..0000000000000
--- a/.changelog/18573.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:enhancement
-xds: Use downstream protocol when connecting to local app
-```
diff --git a/.changelog/18583.txt b/.changelog/18583.txt
deleted file mode 100644
index 8121e01ced0db..0000000000000
--- a/.changelog/18583.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-mesh: **(Enterprise only)** Adds rate limiting config to service-defaults
-```
diff --git a/.changelog/18636.txt b/.changelog/18636.txt
deleted file mode 100644
index ff6990f5abcbf..0000000000000
--- a/.changelog/18636.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-connect: Fix issue where Envoy endpoints would not populate correctly after a snapshot restore.
-```
diff --git a/.changelog/18646.txt b/.changelog/18646.txt
deleted file mode 100644
index 93da75819901a..0000000000000
--- a/.changelog/18646.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-api-gateway: Add support for response header modifiers on http-route configuration entry
-```
diff --git a/.changelog/18668.txt b/.changelog/18668.txt
deleted file mode 100644
index fdd63e1c6d4b6..0000000000000
--- a/.changelog/18668.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:breaking-change
-audit-logging: **(Enterprise only)** allowing timestamp based filename only on rotation. initially the filename will be just file.json
-```
diff --git a/.changelog/18708.txt b/.changelog/18708.txt
deleted file mode 100644
index 66a34da789703..0000000000000
--- a/.changelog/18708.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-```release-note:feature
-acl: Added ACL Templated policies to simplify getting the right ACL token.
-```
-
-```release-note:improvement
-cli: Added `-templated-policy`, `-templated-policy-file`, `-replace-templated-policy`, `-append-templated-policy`, `-replace-templated-policy-file`, `-append-templated-policy-file` and `-var` flags for creating or updating tokens/roles.
-```
diff --git a/.changelog/18719.txt b/.changelog/18719.txt
deleted file mode 100644
index 4da370b91b90f..0000000000000
--- a/.changelog/18719.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-```release-note:feature
-acl: Add BindRule support for templated policies. Add new BindType: templated-policy and BindVar field for templated policy variables.
-```
-
-```release-note:feature
-cli: Add `bind-var` flag to `consul acl binding-rule` for templated policy variables.
-```
\ No newline at end of file
diff --git a/.changelog/18769.txt b/.changelog/18769.txt
deleted file mode 100644
index b9cf8aa207465..0000000000000
--- a/.changelog/18769.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-acl: Adds a new ACL rule for workload identities
-```
diff --git a/.changelog/18813.txt b/.changelog/18813.txt
deleted file mode 100644
index 3dcb4612915b0..0000000000000
--- a/.changelog/18813.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-acl: Use templated policy to generate synthetic policies for tokens/roles with node and/or service identities
-```
\ No newline at end of file
diff --git a/.changelog/18816.txt b/.changelog/18816.txt
deleted file mode 100644
index ef8989ee705b3..0000000000000
--- a/.changelog/18816.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-cli: Add `consul acl templated-policy` commands to read, list and preview templated policies. 
-```
\ No newline at end of file
diff --git a/.changelog/18943.txt b/.changelog/18943.txt
deleted file mode 100644
index adb027dee9fd9..0000000000000
--- a/.changelog/18943.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-api: added `CheckRegisterOpts` to Agent API
-```
diff --git a/.changelog/18983.txt b/.changelog/18983.txt
deleted file mode 100644
index 8a49a850eb356..0000000000000
--- a/.changelog/18983.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-api: added `Token` field to `ServiceRegisterOpts` type in Agent API
-```
diff --git a/.changelog/18994.txt b/.changelog/18994.txt
deleted file mode 100644
index f28381721d54b..0000000000000
--- a/.changelog/18994.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-```release-note:feature
-# Catalog v2 feature preview
-This release provides the ability to preview Consul's v2 Catalog and Resource API if enabled. The new model supports
-multi-port application deployments with only a single Envoy proxy. Note that the v1 and v2 catalogs are not cross
-compatible, and not all Consul features are available within this v2 feature preview. See the [v2 Catalog and Resource
-API documentation](https://developer.hashicorp.com/consul/docs/architecture/v2) for more information. The v2 Catalog and
-Resources API should be considered a feature preview within this release and should not be used in production
-environments.
-
-### Limitations
-* The v2 catalog API feature preview does not support connections with client agents. As a result, it is only available for Kubernetes deployments, which use [Consul dataplanes](consul/docs/connect/dataplane) instead of client agents.
-* The v1 and v2 catalog APIs cannot run concurrently.
-* The Consul UI does not support multi-port services or the v2 catalog API in this release.
-* HCP Consul does not support multi-port services or the v2 catalog API in this release.
-* The v2 API only supports transparent proxy mode where services that have permissions to connect to each other can use
-  Kube DNS to connect.
-
-### Known Issues
-* When using the v2 API with transparent proxy, Kubernetes pods cannot use L7 liveness, readiness, or startup probes.
-
-
-[[Catalog resource controllers]](https://github.com/hashicorp/consul/tree/e6b724d06249d3e62cd75afe3ee6042ba1fd5415/internal/catalog/internal/controllers)
-[[Mesh resource controllers]](https://github.com/hashicorp/consul/tree/e6b724d06249d3e62cd75afe3ee6042ba1fd5415/internal/mesh/internal/controllers)
-[[Auth resource controllers]](https://github.com/hashicorp/consul/tree/e6b724d06249d3e62cd75afe3ee6042ba1fd5415/internal/auth/internal)
-[[V2 Protobufs]](https://github.com/hashicorp/consul/tree/e6b724d06249d3e62cd75afe3ee6042ba1fd5415/proto-public)
-```
\ No newline at end of file
diff --git a/.changelog/19077.txt b/.changelog/19077.txt
deleted file mode 100644
index d7c9b0483c7c4..0000000000000
--- a/.changelog/19077.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-acl: Adds workload identity templated policy
-```
diff --git a/.changelog/4633.txt b/.changelog/4633.txt
deleted file mode 100644
index ffacfccced2a4..0000000000000
--- a/.changelog/4633.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-server: **(Enterprise Only)** added server side RPC requests IP based read/write rate-limiter.
-```
diff --git a/.changelog/5200.txt b/.changelog/5200.txt
deleted file mode 100644
index 289c222159e9e..0000000000000
--- a/.changelog/5200.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-connect: update supported envoy versions to 1.23.8, 1.24.6, 1.25.4, 1.26.0
-```
\ No newline at end of file
diff --git a/.changelog/_18366.txt b/.changelog/_18366.txt
deleted file mode 100644
index 02a3599c2c27c..0000000000000
--- a/.changelog/_18366.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-config-entry(api-gateway): (Enterprise only) Add GatewayPolicy to APIGateway Config Entry listeners
-```
diff --git a/.changelog/_18422.txt b/.changelog/_18422.txt
deleted file mode 100644
index 4f0efbbe3b278..0000000000000
--- a/.changelog/_18422.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-config-entry(api-gateway): (Enterprise only) Add JWTFilter to HTTPRoute Filters
-```
diff --git a/.changelog/_4734.txt b/.changelog/_4734.txt
deleted file mode 100644
index 370ecb0c54b24..0000000000000
--- a/.changelog/_4734.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-connect: **(Consul Enterprise only)** Implement order-by-locality failover.
-```
diff --git a/.changelog/_4821.txt b/.changelog/_4821.txt
deleted file mode 100644
index 88758540add34..0000000000000
--- a/.changelog/_4821.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-connect: **(Enterprise Only)** Add support for specifying "Partition" and "Namespace" in Prepared Queries failover rules.
-```
\ No newline at end of file
diff --git a/.changelog/_5669.txt b/.changelog/_5669.txt
deleted file mode 100644
index 6528460e69bda..0000000000000
--- a/.changelog/_5669.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-audit-logging: **(Enterprise only)** enable error response and request body logging
-```
\ No newline at end of file
diff --git a/.changelog/_5740.txt b/.changelog/_5740.txt
deleted file mode 100644
index 4f1d6f6448f3f..0000000000000
--- a/.changelog/_5740.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-api: (Enterprise only) Add `POST /v1/operator/audit-hash` endpoint to calculate the hash of the data used by the audit log hash function and salt.
-```
\ No newline at end of file
diff --git a/.changelog/_5750.txt b/.changelog/_5750.txt
deleted file mode 100644
index 027753c721565..0000000000000
--- a/.changelog/_5750.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-cli: (Enterprise only) Add a new `consul operator audit hash` command to retrieve and compare the hash of the data used by the audit log hash function and salt.
-```
\ No newline at end of file
diff --git a/.changelog/_5805.txt b/.changelog/_5805.txt
deleted file mode 100644
index 786effc310258..0000000000000
--- a/.changelog/_5805.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:security
-audit-logging: **(Enterprise only)** limit `v1/operator/audit-hash` endpoint to ACL token with `operator:read` privileges.
-```
\ No newline at end of file
diff --git a/.changelog/_6074.txt b/.changelog/_6074.txt
deleted file mode 100644
index 6539fa6a4fa19..0000000000000
--- a/.changelog/_6074.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-connect: **(Enterprise only)** Fix bug where incorrect service-defaults entries were fetched to determine an upstream's protocol whenever the upstream did not explicitly define the namespace / partition. When this bug occurs, upstreams would use the protocol from a service-default entry in the default namespace / partition, rather than their own namespace / partition.
-```
diff --git a/.changelog/_6870.txt b/.changelog/_6870.txt
deleted file mode 100644
index b4c52f7d67554..0000000000000
--- a/.changelog/_6870.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-gateway: **(Enterprise only)** Add JWT authentication and authorization to APIGateway Listeners and HTTPRoutes.
-```
diff --git a/.copywrite.hcl b/.copywrite.hcl
deleted file mode 100644
index 243a0a730722b..0000000000000
--- a/.copywrite.hcl
+++ /dev/null
@@ -1,39 +0,0 @@
-schema_version = 1
-
-project {
-  license        = "BUSL-1.1"
-  copyright_year = 2023
-
-  # (OPTIONAL) A list of globs that should not have copyright/license headers.
-  # Supports doublestar glob patterns for more flexibility in defining which
-  # files or folders should be ignored
-  header_ignore = [
-    # Forked and modified UI libs
-    "ui/packages/consul-ui/app/utils/dom/event-target/**",
-    "ui/packages/consul-ui/lib/rehype-prism/**",
-    "ui/packages/consul-ui/lib/block-slots/**",
-
-    # UI file that do not render properly with copyright headers
-    "ui/packages/consul-ui/app/components/brand-loader/enterprise.hbs",
-    "ui/packages/consul-ui/app/components/brand-loader/index.hbs",
-
-    # ignore specific test data files
-    "agent/uiserver/testdata/**",
-    "internal/resourcehcl/testdata/**",
-
-    # generated files 
-    "agent/structs/structs.deepcopy.go",
-    "agent/proxycfg/proxycfg.deepcopy.go",
-    "agent/grpc-middleware/rate_limit_mappings.gen.go",
-    "agent/uiserver/dist/**",
-
-    # ignoring policy embedded files
-    "agent/structs/acltemplatedpolicy/policies/ce/**",
-
-    # licensed under MPL - ignoring for now until the copywrite tool can support
-    # multiple licenses per repo.
-    "sdk/**",
-    "api/**",
-    "proto-public/**",
-  ]
-}
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index c6c09d402a920..c1b965235c9ff 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -161,7 +161,8 @@ When you're ready to submit a pull request:
    | --- | --- |
    | `pr/no-changelog` | This PR does not have an intended changelog entry |
    | `pr/no-metrics-test` | This PR does not require any testing for metrics |
-   | `backport/1.12.x` | Backport the changes in this PR to the targeted release branch. Consult the [Consul Release Notes](https://www.consul.io/docs/release-notes) page to view active releases. Website documentation merged to the latest release branch is deployed immediately |
+   | `backport/stable-website` | This PR contains documentation changes that are ready to be deployed immediately. Changes will also automatically get backported to the latest release branch |
+   | `backport/1.12.x` | Backport the changes in this PR to the targeted release branch. Consult the [Consul Release Notes](https://www.consul.io/docs/release-notes) page to view active releases. |
    Other labels may automatically be added by the Github Action CI.
 7. After you submit, the Consul maintainers team needs time to carefully review your
    contribution and ensure it is production-ready, considering factors such as: security,
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 678431cae3084..c269a70a458f8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,41 +4,27 @@ about: You're experiencing an issue with Consul that is different than the docum
 
 ---
 
-<!-- When filing a bug, please include the following headings if possible. Any example text in this template can be deleted.
--->
+When filing a bug, please include the following headings if possible. Any example text in this template can be deleted.
 
 #### Overview of the Issue
 
-<!-- Please provide a paragraph or two about the issue you're experiencing. -->
-
----
+A paragraph or two about the issue you're experiencing.
 
 #### Reproduction Steps
 
-<!-- Please provide steps to reproduce the bug, without any details it would be hard to troubleshoot: 
-
 Steps to reproduce this issue, eg:
 
 1. Create a cluster with n client nodes n and n server nodes
 1. Run `curl ...`
 1. View error
 
--->
-
 ### Consul info for both Client and Server
 
-
-<!---  Please provide both `consul info` and agent HCL config for both client and servers to help us better diagnose the issue. Take careful steps to remove any sensitive information from config files that include secrets such as Gossip keys. --->
-
 <details>
   <summary>Client info</summary>
 
 ```
-Output from client 'consul info' command here
-```
-
-```
-Client agent HCL config
+output from client 'consul info' command here
 ```
 
 </details>
@@ -47,19 +33,15 @@ Client agent HCL config
   <summary>Server info</summary>
 
 ```
-Output from server 'consul info' command here
-```
-
-```
-Server agent HCL config
+output from server 'consul info' command here
 ```
 
 </details>
 
 ### Operating system and Environment details
 
-<!--  OS, Architecture, and any other information you can provide about the environment. -->
+OS, Architecture, and any other information you can provide about the environment.
 
 ### Log Fragments
 
-<!-- Include appropriate Client or Server log fragments. If the log is longer than a few dozen lines, please include the URL to the [gist](https://gist.github.com/) of the log instead of posting it in the issue. Use `-log-level=TRACE` on the client and server to capture the maximum log detail. -->
+Include appropriate Client or Server log fragments. If the log is longer than a few dozen lines, please include the URL to the [gist](https://gist.github.com/) of the log instead of posting it in the issue. Use `-log-level=TRACE` on the client and server to capture the maximum log detail.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 16480bb6f4f94..2efc5faff9b75 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 blank_issues_enabled: false
 contact_links:
   - name: Consul Community Support
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 14017a9ae9c84..fb9b6b4ef03ea 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,12 +4,12 @@ about: If you have something you think Consul could improve or add support for.
 
 ---
 
-<!--- Please search the existing issues for relevant feature requests, and use the reaction feature (https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to add upvotes to pre-existing requests. --->
+Please search the existing issues for relevant feature requests, and use the reaction feature (https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to add upvotes to pre-existing requests.
 
 #### Feature Description
 
-<!--- Please provide a written overview of the feature and why this feature solves challenges that you are facing today. --->
+A written overview of the feature.
 
 #### Use Case(s)
 
-<!--- Please describe the use case for this feature (i.e. Service Mesh, Service Discovery, KV, API Gateway) and also deployment environments you are looking to see this addressed in (K8s, VMs, Nomad, ECS, Lambda). -->
+Any relevant use-cases that you see.
diff --git a/.github/ISSUE_TEMPLATE/ui_issues.md b/.github/ISSUE_TEMPLATE/ui_issues.md
index 3f1dc3f037124..dd5a6351c8d1f 100644
--- a/.github/ISSUE_TEMPLATE/ui_issues.md
+++ b/.github/ISSUE_TEMPLATE/ui_issues.md
@@ -4,42 +4,41 @@ about: You have usage feedback for the browser based UI
 
 ---
 
-<!--- When filing a bug, please include the following headings if possible. Any example text in this template can be deleted. --->
+When filing a bug, please include the following headings if possible. Any example text in this template can be deleted.
 
 ### Overview of the Issue
 
-<!--- Please provide a paragraph or two about the issue you're experiencing / suggestion for
-improvement. --->
+A paragraph or two about the issue you're experiencing / suggestion for
+improvement.
 
 ### Reproduction Steps
 
-<!--- Steps to reproduce this issue/view the area for improvement, eg:
+Steps to reproduce this issue/view the area for improvement, eg:
 
 1. Visit the UI page at `/ui/services`
 1. Click .... then click...etc.
 1. View error/area.
 
---->
-
 ### Describe the solution you'd like
 
-<!--- If this is an improvement rather than a bug, a clear and concise description
+If this is an improvement rather than a bug, a clear and concise description
 of what you want to happen. How have you seen this problem solved in other
-UIs? --->
+UIs?
 
 ### Consul Version
 
-<!--- This can be found either in the footer of the UI (Consul versions pre 1.10) or
-at the top of the help menu that is in the top right side of the UI. --->
+This can be found either in the footer of the UI (Consul versions pre 1.10) or
+at the top of the help menu that is in the top right side of the UI.
 
 ### Browser and Operating system details
 
-<!--- Browser, Browser Version, OS, and any other information you can provide about the environment that may be relevant. --->
+Browser, Browser Version, OS, and any other information you can provide about the environment that may be relevant.
 
 ### Screengrabs / Web Inspector logs
 
-<!--- If you think it's worthwhile, include appropriate screengrabs showing the
+If you think it's worthwhile, include appropriate screengrabs showing the
 error/area for improvement. Try to include the URL bar of the browser so we
 can see the current URL where the error manifests. Please be careful to
 obfuscate any sensitive information either in the URL or in the browser page
-itself. --->
+itself.
+
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d618028e100bd..c60f2e8696722 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 version: 2
 updates:
 - package-ecosystem: gomod
diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
index fd39f2ccab423..759130301bfbc 100644
--- a/.github/pr-labeler.yml
+++ b/.github/pr-labeler.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 pr/dependencies:
     - vendor/**/*
     - go.*
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 8ad5c145117a5..43b3ac71337bf 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,30 +1,18 @@
 ### Description
-
-<!-- Please describe why you're making this change, in plain English. -->
+Describe why you're making this change, in plain English.
 
 ### Testing & Reproduction steps
-
-<!--
-
 * In the case of bugs, describe how to replicate
 * If any manual tests were done, document the steps and the conditions to replicate
 * Call out any important/ relevant unit tests, e2e tests or integration tests you have added or are adding
 
--->
-
 ### Links
-
-<!--
-
 Include any links here that might be helpful for people reviewing your PR (Tickets, GH issues, API docs, external benchmarks, tools docs, etc). If there are none, feel free to delete this section.
 
 Please be mindful not to leak any customer or confidential information. HashiCorp employees may want to use our internal URL shortener to obfuscate links.
 
--->
-
 ### PR Checklist
 
 * [ ] updated test coverage
 * [ ] external facing docs updated
-* [ ] appropriate backport labels added
 * [ ] not a security concern
diff --git a/.github/scripts/changelog_checker.sh b/.github/scripts/changelog_checker.sh
index a214ef2477979..e46030da1e16e 100755
--- a/.github/scripts/changelog_checker.sh
+++ b/.github/scripts/changelog_checker.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/.github/scripts/get_runner_classes.sh b/.github/scripts/get_runner_classes.sh
index 603ed20ec7257..5eb56ff172bee 100755
--- a/.github/scripts/get_runner_classes.sh
+++ b/.github/scripts/get_runner_classes.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 #
 # This script generates tag-sets that can be used as runs-on: values to select runners.
 
diff --git a/.github/scripts/get_runner_classes_windows.sh b/.github/scripts/get_runner_classes_windows.sh
deleted file mode 100755
index ae75625974cf2..0000000000000
--- a/.github/scripts/get_runner_classes_windows.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-#
-# This script generates tag-sets that can be used as runs-on: values to select runners.
-
-set -euo pipefail
-
-case "$GITHUB_REPOSITORY" in
-*-enterprise)
-	# shellcheck disable=SC2129
-	echo "compute-small=['self-hosted', 'ondemand', 'os=windows-2019', 'type=m6a.2xlarge']" >>"$GITHUB_OUTPUT"
-	echo "compute-medium=['self-hosted', 'ondemand', 'os=windows-2019', 'type=m6a.4xlarge']" >>"$GITHUB_OUTPUT"
-	echo "compute-large=['self-hosted', 'ondemand', 'os=windows-2019', 'type=m6a.8xlarge']" >>"$GITHUB_OUTPUT"
-	# m5d.8xlarge is equivalent to our xl custom runner in CE
-	echo "compute-xl=['self-hosted', 'ondemand', 'os=windows-2019', 'type=m6a.12xlarge']" >>"$GITHUB_OUTPUT"
-	;;
-*)
-	# shellcheck disable=SC2129
-	echo "compute-small=['windows-2019']" >>"$GITHUB_OUTPUT"
-	echo "compute-medium=['windows-2019']" >>"$GITHUB_OUTPUT"
-	echo "compute-large=['windows-2019']" >>"$GITHUB_OUTPUT"
-	echo "compute-xl=['windows-2019']" >>"$GITHUB_OUTPUT"
-	;;
-esac
diff --git a/.github/scripts/metrics_checker.sh b/.github/scripts/metrics_checker.sh
index 37659de4df8bd..f68c85ed1af28 100755
--- a/.github/scripts/metrics_checker.sh
+++ b/.github/scripts/metrics_checker.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 set -uo pipefail
 
 ### This script checks if any metric behavior has been modified.
diff --git a/.github/scripts/notify_slack.sh b/.github/scripts/notify_slack.sh
index 8df3f3f648766..b3dcdb210dc68 100755
--- a/.github/scripts/notify_slack.sh
+++ b/.github/scripts/notify_slack.sh
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
 
 set -uo pipefail
 
@@ -12,8 +10,8 @@ if [[ $GITHUB_REF_NAME == "main" ]]; then
 	COMMIT_MESSAGE=$(git log -1 --pretty=%B | head -n1)
 	SHORT_REF=$(git rev-parse --short "${GITHUB_SHA}")
 	curl -X POST -H 'Content-type: application/json' \
-		--data \
-		"{ \
+	--data \
+	"{ \
 	\"attachments\": [ \
 		{ \
 		\"fallback\": \"GitHub Actions workflow failed!\", \
diff --git a/.github/scripts/rerun_fails_report.sh b/.github/scripts/rerun_fails_report.sh
index 90bae7a03a59d..ac6b7cf2ff9da 100755
--- a/.github/scripts/rerun_fails_report.sh
+++ b/.github/scripts/rerun_fails_report.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
+# SPDX-License-Identifier: MPL-2.0
 
 #
 # Add a comment on the github PR if there were any rerun tests.
diff --git a/.github/scripts/set_test_package_matrix.sh b/.github/scripts/set_test_package_matrix.sh
index da8b6d563c37a..a9a21c747e570 100755
--- a/.github/scripts/set_test_package_matrix.sh
+++ b/.github/scripts/set_test_package_matrix.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 set -euo pipefail
 export RUNNER_COUNT=$1
 
diff --git a/.github/scripts/verify_artifact.sh b/.github/scripts/verify_artifact.sh
index 3aa9e0848dfb3..d1998785662a5 100755
--- a/.github/scripts/verify_artifact.sh
+++ b/.github/scripts/verify_artifact.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/.github/scripts/verify_bin.sh b/.github/scripts/verify_bin.sh
index dc5ac9f9f0e34..6f70172717483 100755
--- a/.github/scripts/verify_bin.sh
+++ b/.github/scripts/verify_bin.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/.github/scripts/verify_deb.sh b/.github/scripts/verify_deb.sh
index c6b6926c5d1a2..e4a22a26191d7 100755
--- a/.github/scripts/verify_deb.sh
+++ b/.github/scripts/verify_deb.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/.github/scripts/verify_docker.sh b/.github/scripts/verify_docker.sh
index ea9180920f8ae..725bf92b9f565 100755
--- a/.github/scripts/verify_docker.sh
+++ b/.github/scripts/verify_docker.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/.github/scripts/verify_envoy_version.sh b/.github/scripts/verify_envoy_version.sh
index f9067eaa37f71..773431f50bc85 100755
--- a/.github/scripts/verify_envoy_version.sh
+++ b/.github/scripts/verify_envoy_version.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
+# SPDX-License-Identifier: MPL-2.0
 
 set -euo pipefail
 
diff --git a/.github/scripts/verify_rpm.sh b/.github/scripts/verify_rpm.sh
index 96cd658eef3d5..75a63bcbc91be 100755
--- a/.github/scripts/verify_rpm.sh
+++ b/.github/scripts/verify_rpm.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/.github/workflows/backport-assistant.yml b/.github/workflows/backport-assistant.yml
index 17462f811261c..d842f1b167309 100644
--- a/.github/workflows/backport-assistant.yml
+++ b/.github/workflows/backport-assistant.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # This action creates downstream PRs for PRs with backport labels defined.
 # See docs here: https://github.com/hashicorp/backport-assistant
 
@@ -21,6 +18,33 @@ jobs:
     runs-on: ubuntu-latest
     container: hashicorpdev/backport-assistant:0.3.4
     steps:
+      - name: Run Backport Assistant for stable-website
+        run: |
+          backport-assistant backport -merge-method=squash -gh-automerge
+        env:
+          BACKPORT_LABEL_REGEXP: "type/docs-(?P<target>cherrypick)"
+          BACKPORT_TARGET_TEMPLATE: "stable-website"
+          BACKPORT_MERGE_COMMIT: true
+          GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
+      - name: Backport changes to latest release branch
+        run: |
+          # Use standard token here 
+          resp=$(curl -f -s -H 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' "https://api.github.com/repos/$GITHUB_REPOSITORY/labels?per_page=100")
+          ret="$?"
+          if [[ "$ret" -ne 0 ]]; then
+              echo "The GitHub API returned $ret"
+              exit $ret
+          fi
+          # get the latest backport label excluding any website labels, ex: `backport/0.3.x` and not `backport/website`
+          latest_backport_label=$(echo "$resp" | jq -r '.[] | select(.name | (startswith("backport/") and (contains("website") | not))) | .name' | sort -rV | head -n1)
+          echo "Latest backport label: $latest_backport_label"
+          # set BACKPORT_TARGET_TEMPLATE for backport-assistant
+          # trims backport/ from the beginning with parameter substitution
+          export BACKPORT_TARGET_TEMPLATE="release/${latest_backport_label#backport/}.x"
+          backport-assistant backport -merge-method=squash -gh-automerge
+        env:
+          BACKPORT_LABEL_REGEXP: "type/docs-(?P<target>cherrypick)"
+          GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
       - name: Run Backport Assistant for release branches
         run: |
           backport-assistant backport -merge-method=squash -gh-automerge
diff --git a/.github/workflows/backport-checker.yml b/.github/workflows/backport-checker.yml
index 0e7cb0396ae56..c9af23ea97172 100644
--- a/.github/workflows/backport-checker.yml
+++ b/.github/workflows/backport-checker.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # This workflow checks that there is either a 'pr/no-backport' label applied to a PR
 # or there is a backport/* label indicating a backport has been set
 
diff --git a/.github/workflows/bot-auto-approve.yaml b/.github/workflows/bot-auto-approve.yaml
index 911fc27f46968..7731e4553ce8f 100644
--- a/.github/workflows/bot-auto-approve.yaml
+++ b/.github/workflows/bot-auto-approve.yaml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 name: Bot Auto Approve
 
 on: pull_request_target
@@ -10,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.actor == 'hc-github-team-consul-core'
     steps:
-      - uses: hmarr/auto-approve-action@44888193675f29a83e04faf4002fa8c0b537b1e4 # v3.2.1
+      - uses: hmarr/auto-approve-action@v3
         with:
           review-message: "Auto approved Consul Bot automated PR"
           github-token: ${{ secrets.MERGE_APPROVE_TOKEN }}
diff --git a/.github/workflows/broken-link-check.yml b/.github/workflows/broken-link-check.yml
deleted file mode 100644
index 2a8d77c5880fd..0000000000000
--- a/.github/workflows/broken-link-check.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-name: Broken Link Check
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * 1"
-
-jobs:
-  linkChecker:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-
-      - name: Run lychee link checker
-        id: lychee
-        uses: lycheeverse/lychee-action@ec3ed119d4f44ad2673a7232460dc7dff59d2421 # v1.8.0
-        with:
-          args: ./website/content/docs/ --base https://developer.hashicorp.com/ --exclude-all-private --exclude '\.(svg|gif|jpg|png)' --exclude 'manage\.auth0\.com' --accept 403 --max-concurrency=24 --no-progress --verbose
-          # Fail GitHub action when broken links are found?
-          fail: false
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-
-      - name: Create GitHub Issue From lychee output file
-        if: env.lychee_exit_code != 0
-        uses: peter-evans/create-issue-from-file@433e51abf769039ee20ba1293a088ca19d573b7f # v4.0.1
-        with:
-          title: Link Checker Report
-          content-filepath: ./lychee/out.md
-          labels: report, automated issue
\ No newline at end of file
diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml
index 2977a73b6eb07..f57ea3527d485 100644
--- a/.github/workflows/build-artifacts.yml
+++ b/.github/workflows/build-artifacts.yml
@@ -13,7 +13,7 @@ permissions:
   contents: read
 
 env:
-  GOPRIVATE: github.com/hashicorp # Required for enterprise deps
+  GOPRIVATE: github.com/hashicorp
 
 jobs:
   setup:
@@ -25,7 +25,7 @@ jobs:
       compute-large: ${{ steps.setup-outputs.outputs.compute-large }}
       compute-xl: ${{ steps.setup-outputs.outputs.compute-xl }}
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
     - id: setup-outputs
       name: Setup outputs
       run: ./.github/scripts/get_runner_classes.sh
@@ -56,14 +56,14 @@ jobs:
             kv/data/github/${{ github.repository }}/dockerhub username | DOCKERHUB_USERNAME;
             kv/data/github/${{ github.repository }}/dockerhub token | DOCKERHUB_TOKEN;
 
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
 
     # NOTE: ENT specific step as we need to set elevated GitHub permissions.
     - name: Setup Git
       if: ${{ endsWith(github.repository, '-enterprise') }}
       run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
 
-    - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+    - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3.5.0
       with:
         go-version-file: 'go.mod'
     
@@ -78,17 +78,17 @@ jobs:
         echo "GITHUB_BUILD_URL=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@2a1a44ac4aa01993040736bd95bb470da1a38365 # v2.9.0
+      uses: docker/setup-buildx-action@f03ac48505955848960e80bbb68046aa35c7b9e7 # pin@v2.4.1
 
     # NOTE: conditional specific logic as we store secrets in Vault in ENT and use GHA secrets in CE.
     - name: Login to Docker Hub
-      uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
+      uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # pin@v2.1.0
       with:
         username: ${{ endsWith(github.repository, '-enterprise') && steps.secrets.outputs.DOCKERHUB_USERNAME || secrets.DOCKERHUB_USERNAME }}
         password: ${{ endsWith(github.repository, '-enterprise') && steps.secrets.outputs.DOCKERHUB_TOKEN || secrets.DOCKERHUB_TOKEN }}
 
     - name: Docker build and push
-      uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4.1.1
+      uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # pin@v4.0.0
       with:
         context: ./bin
         file: ./build-support/docker/Consul-Dev.dockerfile
diff --git a/.github/workflows/build-distros.yml b/.github/workflows/build-distros.yml
index 4d8799a5643d8..10c5208933412 100644
--- a/.github/workflows/build-distros.yml
+++ b/.github/workflows/build-distros.yml
@@ -17,10 +17,6 @@ env:
   GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
   GOPRIVATE: github.com/hashicorp # Required for enterprise deps
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   setup:
     name: Setup
@@ -31,7 +27,7 @@ jobs:
       compute-large: ${{ steps.setup-outputs.outputs.compute-large }}
       compute-xl: ${{ steps.setup-outputs.outputs.compute-xl }}
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
     - id: setup-outputs
       name: Setup outputs
       run: ./.github/scripts/get_runner_classes.sh
@@ -54,7 +50,7 @@ jobs:
       XC_OS: "freebsd linux windows"
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-xl) }}
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
     # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
     - name: Setup Git
@@ -78,7 +74,7 @@ jobs:
       XC_OS: "darwin freebsd linux solaris windows"
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-xl) }}
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
     # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
     - name: Setup Git
@@ -103,7 +99,7 @@ jobs:
       CGO_ENABLED: 1
       GOOS: linux
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
     # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
     - name: Setup Git
@@ -129,7 +125,7 @@ jobs:
     - check-go-mod
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-xl) }}
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
     # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
     - name: Setup Git
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a6bade292ea62..48b7339173850 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
       pre-version: ${{ steps.set-product-version.outputs.prerelease-product-version }}
       shared-ldflags: ${{ steps.shared-ldflags.outputs.shared-ldflags }}
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       - name: set product version
         id: set-product-version
         uses: hashicorp/actions-set-product-version@v1
@@ -66,7 +66,7 @@ jobs:
       filepath: ${{ steps.generate-metadata-file.outputs.filepath }}
     steps:
       - name: 'Checkout directory'
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       - name: Generate metadata file
         id: generate-metadata-file
         uses: hashicorp/actions-generate-metadata@v1
@@ -98,10 +98,10 @@ jobs:
 
     name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Setup with node and yarn
-        uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
         with:
           node-version: '14'
           cache: 'yarn'
@@ -187,10 +187,10 @@ jobs:
 
     name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Setup with node and yarn
-        uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
         with:
           node-version: '14'
           cache: 'yarn'
@@ -238,10 +238,10 @@ jobs:
 
     name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Setup with node and yarn
-        uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
         with:
           node-version: '14'
           cache: 'yarn'
@@ -283,17 +283,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-          - { arch: "386" }
-          - { arch: "arm" }
-          - { arch: "amd64" }
-          - { arch: "arm64" }
+        arch: ["386", "amd64", "arm", "arm64"]
     env:
       repo: ${{github.event.repository.name}}
       version: ${{needs.set-product-version.outputs.product-version}}
 
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       # Strip everything but MAJOR.MINOR from the version string and add a `-dev` suffix
       # This naming convention will be used ONLY for per-commit dev images
@@ -327,7 +323,7 @@ jobs:
       version: ${{needs.set-product-version.outputs.product-version}}
 
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       - uses: hashicorp/actions-docker-build@v1
         with:
           version: ${{env.version}}
@@ -347,7 +343,7 @@ jobs:
       version: ${{needs.set-product-version.outputs.product-version}}
 
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       # Strip everything but MAJOR.MINOR from the version string and add a `-dev` suffix
       # This naming convention will be used ONLY for per-commit dev images
@@ -376,11 +372,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-          - { arch: "386" }
-          - { arch: "arm" }
-          - { arch: "amd64" }
-          - { arch: "arm64" }
+        arch: ["386", "amd64", "arm", "arm64"]
       fail-fast: true
     env:
       version: ${{ needs.set-product-version.outputs.product-version }}
@@ -388,7 +380,7 @@ jobs:
 
     name: Verify ${{ matrix.arch }} linux binary
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         if: ${{ endsWith(github.repository, '-enterprise') || matrix.arch != 's390x' }}
 
       - name: Download ${{ matrix.arch  }} zip
@@ -398,7 +390,7 @@ jobs:
           name: ${{ env.zip_name }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0
+        uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
         if: ${{ matrix.arch == 'arm' || matrix.arch == 'arm64' }}
         with:
           # this should be a comma-separated string as opposed to an array
@@ -421,7 +413,7 @@ jobs:
 
     name: Verify amd64 darwin binary
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Download amd64 darwin zip
         uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
@@ -441,18 +433,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-          - { arch: "i386" }
-          - { arch: "armhf" }
-          - { arch: "amd64" }
-          - { arch: "arm64" }
+        arch: ["i386", "amd64", "armhf", "arm64"]
       # fail-fast: true
     env:
       version: ${{ needs.set-product-version.outputs.product-version }}
 
     name: Verify ${{ matrix.arch }} debian package
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Set package version
         run: |
@@ -468,7 +456,7 @@ jobs:
           name: ${{ env.pkg_name }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0
+        uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
         with:
           platforms: all
 
@@ -482,18 +470,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-          - { arch: "i386" }
-          - { arch: "x86_64" }
         # TODO(eculver): re-enable when there is a smaller verification container available
-          # - { arch: "armv7hl" }
-          # - { arch: "aarch64" }
+        arch: ["i386", "x86_64"] #, "armv7hl", "aarch64"]
     env:
       version: ${{ needs.set-product-version.outputs.product-version }}
 
     name: Verify ${{ matrix.arch }} rpm
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Set package version
         run: |
@@ -509,7 +493,7 @@ jobs:
           name: ${{ env.pkg_name }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0
+        uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
         with:
           platforms: all
 
diff --git a/.github/workflows/ce-merge-trigger.yml b/.github/workflows/ce-merge-trigger.yml
index 30a6b5fd90dff..3a62146631aa3 100644
--- a/.github/workflows/ce-merge-trigger.yml
+++ b/.github/workflows/ce-merge-trigger.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 name: Trigger Community Edition to Enterprise Merge
 on:
   pull_request_target:
@@ -8,7 +5,7 @@ on:
       - closed
     branches:
       - main
-      - release/**
+      - 'release/*.*.x'
 
 jobs:
   trigger-ce-merge:
@@ -27,4 +24,4 @@ jobs:
           curl -H "Authorization: token $GH_PAT" \
             -H 'Accept: application/json' \
             -d "{\"event_type\": \"oss-merge\", \"client_payload\": {\"git-ref\": \"${GIT_REF}\", \"git-sha\": \"${GIT_SHA}\", \"git-actor\": \"${GIT_ACTOR}\" }}" \
-            "https://api.github.com/repos/hashicorp/consul-enterprise/dispatches"
+            "https://api.github.com/repos/hashicorp/consul-enterprise/dispatches"
\ No newline at end of file
diff --git a/.github/workflows/changelog-checker.yml b/.github/workflows/changelog-checker.yml
index 62b906eda3e66..c81eb8a7a0418 100644
--- a/.github/workflows/changelog-checker.yml
+++ b/.github/workflows/changelog-checker.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # This workflow checks that there is either a 'pr/no-changelog' label applied to a PR
 # or there is a .changelog/<pr number>.txt file associated with a PR for a changelog entry
 
@@ -22,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0 # by default the checkout action doesn't checkout all branches
diff --git a/.github/workflows/embedded-asset-checker.yml b/.github/workflows/embedded-asset-checker.yml
index 38879945e209c..8eb60d70d08db 100644
--- a/.github/workflows/embedded-asset-checker.yml
+++ b/.github/workflows/embedded-asset-checker.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 # This workflow detects if there is a diff in the `agent/uiserver/dist` directory
 # which is used by Consul to serve its embedded UI.
 # `agent/uiserver/dist` should not be manually updated.
@@ -20,7 +17,7 @@ jobs:
     if: "! ( contains(github.event.pull_request.labels.*.name, 'pr/update-ui-assets') || github.event.pull_request.user.login == 'hc-github-team-consul-core' )"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0 # by default the checkout action doesn't checkout all branches
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index aede8a48e1b27..defd0b22e380d 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -5,8 +5,10 @@ name: frontend
 
 on:
   push:
-    paths:
+    branches:
+      - main
       - ui/**
+      - backport/ui/**
 
 permissions:
   contents: read
@@ -21,7 +23,7 @@ jobs:
       compute-large: ${{ steps.setup-outputs.outputs.compute-large }}
       compute-xl: ${{ steps.setup-outputs.outputs.compute-xl }}
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
     - id: setup-outputs
       name: Setup outputs
       run: ./.github/scripts/get_runner_classes.sh
@@ -33,9 +35,9 @@ jobs:
       run:
         working-directory: ui
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
 
-    - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+    - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # pin@v3.6.0
       with:
         node-version: '16'
 
@@ -53,9 +55,9 @@ jobs:
     needs: setup
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
 
-    - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+    - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # pin@v3.6.0
       with:
         node-version: '16'
 
@@ -72,7 +74,7 @@ jobs:
 
   ember-build-test:
     needs: setup
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-large ) }}
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
     strategy:
       matrix:
         partition: [1, 2, 3, 4]
@@ -82,9 +84,9 @@ jobs:
       CONSUL_NSPACES_ENABLED: ${{ endsWith(github.repository, '-enterprise') && 1 || 0 }} # NOTE: this should be 1 in ENT.
       JOBS: 2 # limit parallelism for broccoli-babel-transpiler
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
 
-    - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+    - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # pin@v3.6.0
       with:
         node-version: '16'
 
@@ -92,7 +94,7 @@ jobs:
       run: npm install -g yarn
 
     - name: Install Chrome
-      uses: browser-actions/setup-chrome@c485fa3bab6be59dce18dbc18ef6ab7cbc8ff5f1 # v1.2.0
+      uses: browser-actions/setup-chrome@29abc1a83d1d71557708563b4bc962d0f983a376 # pin@v1.2.1
 
     - name: Install dependencies
       working-directory: ui
diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml
index 20452515740f4..abb910b29e677 100644
--- a/.github/workflows/go-tests.yml
+++ b/.github/workflows/go-tests.yml
@@ -54,7 +54,7 @@ jobs:
       compute-large: ${{ steps.setup-outputs.outputs.compute-large }}
       compute-xl: ${{ steps.setup-outputs.outputs.compute-xl }}
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
     - id: setup-outputs
       name: Setup outputs
       run: ./.github/scripts/get_runner_classes.sh
@@ -74,7 +74,7 @@ jobs:
     - setup
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-medium) }}
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
     # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
     - name: Setup Git
       if: ${{ endsWith(github.repository, '-enterprise') }}
@@ -97,35 +97,35 @@ jobs:
     - name: Notify Slack
       if: ${{ failure() }}
       run: .github/scripts/notify_slack.sh
-  check-codegen:
-     needs:
-     - setup
-     runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
-     steps:
-     - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-     # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
-     - name: Setup Git
-       if: ${{ endsWith(github.repository, '-enterprise') }}
-       run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
-     - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
-       with:
-         go-version-file: 'go.mod'
-     - run: make --always-make codegen
-     - run: |
-         if ! git diff --exit-code; then
-           echo "Generated code was not updated correctly"
-           exit 1
-         fi
-     - name: Notify Slack
-       if: ${{ failure() }}
-       run: .github/scripts/notify_slack.sh
+  check-generated-deep-copy:
+    needs:
+    - setup
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
+    steps:
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+    # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
+    - name: Setup Git
+      if: ${{ endsWith(github.repository, '-enterprise') }}
+      run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
+    - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      with:
+        go-version-file: 'go.mod'
+    - run: make --always-make deep-copy
+    - run: |
+        if ! git diff --exit-code; then
+          echo "Generated code was not updated correctly"
+          exit 1
+        fi
+    - name: Notify Slack
+      if: ${{ failure() }}
+      run: .github/scripts/notify_slack.sh
 
   lint-enums:
     needs:
     - setup
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
     # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
     - name: Setup Git
       if: ${{ endsWith(github.repository, '-enterprise') }}
@@ -143,7 +143,7 @@ jobs:
     - setup
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
     # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
     - name: Setup Git
       run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
@@ -160,7 +160,7 @@ jobs:
     - setup
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
     # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
     - name: Setup Git
       if: ${{ endsWith(github.repository, '-enterprise') }}
@@ -486,7 +486,7 @@ jobs:
     needs:
     - conditional-skip
     - setup
-    - check-codegen
+    - check-generated-deep-copy
     - check-generated-protobuf
     - check-go-mod
     - lint-consul-retry
diff --git a/.github/workflows/issue-comment-created.yml b/.github/workflows/issue-comment-created.yml
index 42483d92b1645..47056a66bc22d 100644
--- a/.github/workflows/issue-comment-created.yml
+++ b/.github/workflows/issue-comment-created.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 name: Issue Comment Created
 
 on:
@@ -11,8 +8,8 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0 # v1.3.0
+      - uses: actions/checkout@v2 
+      - uses: actions-ecosystem/action-remove-labels@v1
         with:
           labels: |
             waiting-reply
diff --git a/.github/workflows/jira-issues.yaml b/.github/workflows/jira-issues.yaml
index c136dfd69a78c..78700d2b730ca 100644
--- a/.github/workflows/jira-issues.yaml
+++ b/.github/workflows/jira-issues.yaml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 on:
   issues:
     types: [opened, closed, deleted, reopened]
@@ -16,7 +13,7 @@ jobs:
     name: Jira Community Issue sync
     steps:    
       - name: Login
-        uses: atlassian/gajira-login@ca13f8850ea309cf44a6e4e0c49d9aa48ac3ca4c # v3
+        uses: atlassian/gajira-login@v3.0.0
         env:
           JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
           JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
@@ -40,7 +37,7 @@ jobs:
 
       - name: Create ticket if an issue is filed, or if PR not by a team member is opened
         if: github.event.action == 'opened'
-        uses: tomhjp/gh-action-jira-create@3ed1789cad3521292e591a7cfa703215ec1348bf # v0.2.1
+        uses: tomhjp/gh-action-jira-create@v0.2.0
         with:
           project: NET
           issuetype: "${{ steps.set-ticket-type.outputs.TYPE }}"
@@ -57,48 +54,31 @@ jobs:
           JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
           JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
 
-      # Education Jira
-      - name: Create ticket in Education board an issue is filed, or if PR not by a team member is opened
-        if: github.event.action == 'opened' && contains(github.event.issue.labels.*.name, 'type/docs')
-        uses: tomhjp/gh-action-jira-create@3ed1789cad3521292e591a7cfa703215ec1348bf # v0.2.1
-        with:
-          project: CE
-          issuetype: "${{ steps.set-ticket-type.outputs.TYPE }}"
-          summary: "${{ github.event.repository.name }} [${{ steps.set-ticket-type.outputs.TYPE }} #${{ github.event.issue.number }}]: ${{ github.event.issue.title }}"
-          description: "GitHub URL: ${{ github.event.issue.html_url || github.event.pull_request.html_url }}\n\n${{ github.event.issue.body || github.event.pull_request.body }}\n\n_Created in GitHub by ${{ github.actor }}._"
-          # customfield_10089 is "Issue Link", customfield_10371 is "Source" (use JIRA API to retrieve)
-          extraFields: '{ "components": [{ "name": "${{ github.event.repository.name }}" }] }'
-
-        env:
-          JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
-          JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
-          JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
-
       - name: Search
         if: github.event.action != 'opened'
         id: search
-        uses: tomhjp/gh-action-jira-search@04700b457f317c3e341ce90da5a3ff4ce058f2fa # v0.2.2
+        uses: tomhjp/gh-action-jira-search@v0.2.1
         with:
           # cf[10089] is Issue Link (use JIRA API to retrieve)
           jql: 'issuetype = "${{ steps.set-ticket-type.outputs.TYPE }}" and cf[10089] = "${{ github.event.issue.html_url || github.event.pull_request.html_url }}"'
 
       - name: Sync comment
         if: github.event.action == 'created' && steps.search.outputs.issue
-        uses: tomhjp/gh-action-jira-comment@6eb6b9ead70221916b6badd118c24535ed220bd9 # v0.2.0
+        uses: tomhjp/gh-action-jira-comment@v0.1.0
         with:
           issue: ${{ steps.search.outputs.issue }}
           comment: "${{ github.actor }} ${{ github.event.review.state || 'commented' }}:\n\n${{ github.event.comment.body || github.event.review.body }}\n\n${{ github.event.comment.html_url || github.event.review.html_url }}"
 
       - name: Close ticket
         if: ( github.event.action == 'closed' || github.event.action == 'deleted' ) && steps.search.outputs.issue
-        uses: atlassian/gajira-transition@4749176faf14633954d72af7a44d7f2af01cc92b # v3
+        uses: atlassian/gajira-transition@v2.0.1
         with:
           issue: ${{ steps.search.outputs.issue }}
           transition: "Closed"
 
       - name: Reopen ticket
         if: github.event.action == 'reopened' && steps.search.outputs.issue
-        uses: atlassian/gajira-transition@4749176faf14633954d72af7a44d7f2af01cc92b # v3
+        uses: atlassian/gajira-transition@v2.0.1
         with:
           issue: ${{ steps.search.outputs.issue }}
           transition: "To Do"
diff --git a/.github/workflows/jira-pr.yaml b/.github/workflows/jira-pr.yaml
index a40bb0ae0f829..a7569d90d9467 100644
--- a/.github/workflows/jira-pr.yaml
+++ b/.github/workflows/jira-pr.yaml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 on:
   pull_request_target:
     types: [opened, closed, reopened]
@@ -14,7 +11,7 @@ jobs:
     name: Jira sync
     steps:    
       - name: Login
-        uses: atlassian/gajira-login@ca13f8850ea309cf44a6e4e0c49d9aa48ac3ca4c # v3
+        uses: atlassian/gajira-login@v3.0.0
         env:
           JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
           JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
@@ -59,7 +56,7 @@ jobs:
 
       - name: Create ticket if an issue is filed, or if PR not by a team member is opened
         if: ( github.event.action == 'opened' && steps.is-team-member.outputs.MESSAGE == 'false' )
-        uses: tomhjp/gh-action-jira-create@3ed1789cad3521292e591a7cfa703215ec1348bf # v0.2.1
+        uses: tomhjp/gh-action-jira-create@v0.2.0
         with:
           project: NET
           issuetype: "${{ steps.set-ticket-type.outputs.TYPE }}"
@@ -75,44 +72,32 @@ jobs:
           JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
           JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
           JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
-      
-      # Education Jira
-      - name: Create ticket in Education board an issue is filed, or if PR not by a team member is opened
-        if: github.event.action == 'opened' && steps.is-team-member.outputs.MESSAGE == 'false' && contains(github.event.issue.labels.*.name, 'type/docs')
-        uses: tomhjp/gh-action-jira-create@3ed1789cad3521292e591a7cfa703215ec1348bf # v0.2.1
-        with:
-          project: CE
-          issuetype: "${{ steps.set-ticket-type.outputs.TYPE }}"
-          summary: "${{ github.event.repository.name }} [${{ steps.set-ticket-type.outputs.TYPE }} #${{ github.event.pull_request.number }}]: ${{ github.event.pull_request.title }}"
-          description: "GitHub URL: ${{ github.event.issue.html_url || github.event.pull_request.html_url }}\n\n${{ github.event.issue.body || github.event.pull_request.body }}\n\n_Created in GitHub by ${{ github.actor }}._"
-          # customfield_10089 is "Issue Link", customfield_10371 is "Source" (use JIRA API to retrieve)
-          extraFields: '{ "components": [{ "name": "${{ github.event.repository.name }}" }] }'
 
       - name: Search
         if: github.event.action != 'opened'
         id: search
-        uses: tomhjp/gh-action-jira-search@04700b457f317c3e341ce90da5a3ff4ce058f2fa # v0.2.2
+        uses: tomhjp/gh-action-jira-search@v0.2.1
         with:
           # cf[10089] is Issue Link (use JIRA API to retrieve)
           jql: 'issuetype = "${{ steps.set-ticket-type.outputs.TYPE }}" and cf[10089] = "${{ github.event.issue.html_url || github.event.pull_request.html_url }}"'
 
       - name: Sync comment
         if: github.event.action == 'created' && steps.search.outputs.issue
-        uses: tomhjp/gh-action-jira-comment@6eb6b9ead70221916b6badd118c24535ed220bd9 # v0.2.0
+        uses: tomhjp/gh-action-jira-comment@v0.1.0
         with:
           issue: ${{ steps.search.outputs.issue }}
           comment: "${{ github.actor }} ${{ github.event.review.state || 'commented' }}:\n\n${{ github.event.comment.body || github.event.review.body }}\n\n${{ github.event.comment.html_url || github.event.review.html_url }}"
 
       - name: Close ticket
         if: ( github.event.action == 'closed' || github.event.action == 'deleted' ) && steps.search.outputs.issue
-        uses: atlassian/gajira-transition@4749176faf14633954d72af7a44d7f2af01cc92b # v3
+        uses: atlassian/gajira-transition@v2.0.1
         with:
           issue: ${{ steps.search.outputs.issue }}
           transition: "Closed"
 
       - name: Reopen ticket
         if: github.event.action == 'reopened' && steps.search.outputs.issue
-        uses: atlassian/gajira-transition@4749176faf14633954d72af7a44d7f2af01cc92b # v3
+        uses: atlassian/gajira-transition@v2.0.1
         with:
           issue: ${{ steps.search.outputs.issue }}
           transition: "To Do"
diff --git a/.github/workflows/nightly-test-1.11.x.yaml b/.github/workflows/nightly-test-1.11.x.yaml
new file mode 100644
index 0000000000000..e913dd0aaf597
--- /dev/null
+++ b/.github/workflows/nightly-test-1.11.x.yaml
@@ -0,0 +1,230 @@
+name: Nightly Test 1.11.x
+on:
+  schedule:
+    - cron: '0 4 * * *'
+  workflow_dispatch: {}
+
+env:
+  EMBER_PARTITION_TOTAL: 4      # Has to be changed in tandem with the matrix.partition
+  BRANCH: "release/1.11.x"
+  BRANCH_NAME: "release-1.11.x" # Used for naming artifacts
+
+jobs:
+  frontend-test-workspace-node:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ env.BRANCH }}
+
+      # Not necessary to use yarn, but enables caching
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+          cache: 'yarn'
+          cache-dependency-path: ./ui/yarn.lock
+
+      - name: Install
+        id: install
+        working-directory: ./ui
+        run: make deps
+
+      - name: Workspace Tests
+        id: workspace-test
+        working-directory: ./ui
+        run: make test-workspace
+
+      - name: Node Tests
+        id: node-test
+        working-directory: ./ui/packages/consul-ui
+        run: make test-node
+
+  frontend-build-ce:
+    runs-on: ubuntu-latest
+    env:
+      JOBS: 2
+      CONSUL_NSPACES_ENABLED: 0
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ env.BRANCH }}
+
+      # Not necessary to use yarn, but enables caching
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+          cache: 'yarn'
+          cache-dependency-path: ./ui/yarn.lock
+
+      - name: Install
+        id: install
+        working-directory: ./ui
+        run: make deps
+
+      - name: Ember Build CE
+        id: build-ce
+        working-directory: ./ui/packages/consul-ui
+        run: make build-ci
+
+      - name: Upload CE Frontend
+        uses: actions/upload-artifact@v3
+        with:
+          name: frontend-ce-${{ env.BRANCH_NAME }}
+          path: ./ui/packages/consul-ui/dist
+          if-no-files-found: error
+
+  frontend-test-ce:
+    runs-on: ubuntu-latest
+    needs: [frontend-build-ce]
+    strategy:
+      matrix:
+        partition: [ 1, 2, 3, 4 ]
+    env:
+      CONSUL_NSPACES_ENABLED: 0
+      EMBER_TEST_REPORT: test-results/report-ce.xml #outputs test report for CI test summary
+      EMBER_TEST_PARALLEL: true #enables test parallelization with ember-exam
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ env.BRANCH }}
+
+      # Not necessary to use yarn, but enables caching
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+          cache: 'yarn'
+          cache-dependency-path: ./ui/yarn.lock
+
+      - name: Install
+        id: install
+        working-directory: ./ui
+        run: make deps
+
+      - name: Download CE Frontend
+        uses: actions/download-artifact@v3
+        with:
+          name: frontend-ce-${{ env.BRANCH_NAME }}
+          path: ./ui/packages/consul-ui/dist
+
+      - name: Ember Test CE
+        id: cache
+        working-directory: ./ui/packages/consul-ui
+        run: node_modules/.bin/ember exam --split=$EMBER_PARTITION_TOTAL --partition=${{ matrix.partition }} --path dist --silent -r xunit
+
+  frontend-build-ent:
+    runs-on: ubuntu-latest
+    env:
+      JOBS: 2
+      CONSUL_NSPACES_ENABLED: 1
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ env.BRANCH }}
+
+      # Not necessary to use yarn, but enables caching
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+          cache: 'yarn'
+          cache-dependency-path: ./ui/yarn.lock
+
+      - name: Install
+        id: install
+        working-directory: ./ui
+        run: make deps
+
+      - name: Ember Build ENT
+        id: build-ce
+        working-directory: ./ui/packages/consul-ui
+        run: make build-ci
+
+      - name: Upload ENT Frontend
+        uses: actions/upload-artifact@v3
+        with:
+          name: frontend-ent-${{ env.BRANCH_NAME }}
+          path: ./ui/packages/consul-ui/dist
+          if-no-files-found: error
+
+  frontend-test-ent:
+    runs-on: ubuntu-latest
+    needs: [frontend-build-ent]
+    strategy:
+      matrix:
+        partition: [ 1, 2, 3, 4 ]
+    env:
+      CONSUL_NSPACES_ENABLED: 1
+      EMBER_TEST_REPORT: test-results/report-ce.xml #outputs test report for CI test summary
+      EMBER_TEST_PARALLEL: true #enables test parallelization with ember-exam
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ env.BRANCH }}
+
+      # Not necessary to use yarn, but enables caching
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+          cache: 'yarn'
+          cache-dependency-path: ./ui/yarn.lock
+
+      - name: Install
+        id: install
+        working-directory: ./ui
+        run: make deps
+
+      - name: Download ENT Frontend
+        uses: actions/download-artifact@v3
+        with:
+          name: frontend-ent-${{ env.BRANCH_NAME }}
+          path: ./ui/packages/consul-ui/dist
+
+      - name: Ember Test ENT
+        id: cache
+        working-directory: ./ui/packages/consul-ui
+        run: node_modules/.bin/ember exam --split=$EMBER_PARTITION_TOTAL --partition=${{ matrix.partition }} --path dist --silent -r xunit
+
+  frontend-test-coverage-ent:
+    runs-on: ubuntu-latest
+    needs: [frontend-build-ent]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ env.BRANCH }}
+
+      # Not necessary to use yarn, but enables caching
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+          cache: 'yarn'
+          cache-dependency-path: ./ui/yarn.lock
+
+      - name: Install
+        id: install
+        working-directory: ./ui
+        run: make deps
+
+      - name: Download ENT Frontend
+        uses: actions/download-artifact@v3
+        with:
+          name: frontend-ent-${{ env.BRANCH_NAME }}
+          path: ./ui/packages/consul-ui/dist
+
+      - name: Run ENT Code Coverage
+        working-directory: ./ui/packages/consul-ui
+        run: make test-coverage-ci
+
+  slack-failure-notification:
+    runs-on: ubuntu-latest
+    needs: [frontend-test-ce, frontend-test-ent]
+    if: ${{ failure() }}
+    steps:
+      - name: Slack Notification
+        id: slack
+        uses: slackapi/slack-github-action@v1.19
+        with:
+          payload: |
+            {
+              "message": "One or more nightly UI tests have failed on branch ${{ env.BRANCH }} for Consul. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.CONSUL_UI_SLACK_WEBHOOK }}
diff --git a/.github/workflows/nightly-test-1.12.x.yaml b/.github/workflows/nightly-test-1.12.x.yaml
new file mode 100644
index 0000000000000..4d4fbde750ad0
--- /dev/null
+++ b/.github/workflows/nightly-test-1.12.x.yaml
@@ -0,0 +1,230 @@
+name: Nightly Test 1.12.x
+on:
+  schedule:
+    - cron: '0 4 * * *'
+  workflow_dispatch: {}
+
+env:
+  EMBER_PARTITION_TOTAL: 4      # Has to be changed in tandem with the matrix.partition
+  BRANCH: "release/1.12.x"
+  BRANCH_NAME: "release-1.12.x" # Used for naming artifacts
+
+jobs:
+  frontend-test-workspace-node:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ env.BRANCH }}
+
+      # Not necessary to use yarn, but enables caching
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+          cache: 'yarn'
+          cache-dependency-path: ./ui/yarn.lock
+
+      - name: Install
+        id: install
+        working-directory: ./ui
+        run: make deps
+
+      - name: Workspace Tests
+        id: workspace-test
+        working-directory: ./ui
+        run: make test-workspace
+
+      - name: Node Tests
+        id: node-test
+        working-directory: ./ui/packages/consul-ui
+        run: make test-node
+
+  frontend-build-ce:
+    runs-on: ubuntu-latest
+    env:
+      JOBS: 2
+      CONSUL_NSPACES_ENABLED: 0
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ env.BRANCH }}
+
+      # Not necessary to use yarn, but enables caching
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+          cache: 'yarn'
+          cache-dependency-path: ./ui/yarn.lock
+
+      - name: Install
+        id: install
+        working-directory: ./ui
+        run: make deps
+
+      - name: Ember Build CE
+        id: build-ce
+        working-directory: ./ui/packages/consul-ui
+        run: make build-ci
+
+      - name: Upload CE Frontend
+        uses: actions/upload-artifact@v3
+        with:
+          name: frontend-ce-${{ env.BRANCH_NAME }}
+          path: ./ui/packages/consul-ui/dist
+          if-no-files-found: error
+
+  frontend-test-ce:
+    runs-on: ubuntu-latest
+    needs: [frontend-build-ce]
+    strategy:
+      matrix:
+        partition: [ 1, 2, 3, 4 ]
+    env:
+      CONSUL_NSPACES_ENABLED: 0
+      EMBER_TEST_REPORT: test-results/report-ce.xml #outputs test report for CI test summary
+      EMBER_TEST_PARALLEL: true #enables test parallelization with ember-exam
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ env.BRANCH }}
+
+      # Not necessary to use yarn, but enables caching
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+          cache: 'yarn'
+          cache-dependency-path: ./ui/yarn.lock
+
+      - name: Install
+        id: install
+        working-directory: ./ui
+        run: make deps
+
+      - name: Download CE Frontend
+        uses: actions/download-artifact@v3
+        with:
+          name: frontend-ce-${{ env.BRANCH_NAME }}
+          path: ./ui/packages/consul-ui/dist
+
+      - name: Ember Test CE
+        id: cache
+        working-directory: ./ui/packages/consul-ui
+        run: node_modules/.bin/ember exam --split=$EMBER_PARTITION_TOTAL --partition=${{ matrix.partition }} --path dist --silent -r xunit
+
+  frontend-build-ent:
+    runs-on: ubuntu-latest
+    env:
+      JOBS: 2
+      CONSUL_NSPACES_ENABLED: 1
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ env.BRANCH }}
+
+      # Not necessary to use yarn, but enables caching
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+          cache: 'yarn'
+          cache-dependency-path: ./ui/yarn.lock
+
+      - name: Install
+        id: install
+        working-directory: ./ui
+        run: make deps
+
+      - name: Ember Build ENT
+        id: build-ce
+        working-directory: ./ui/packages/consul-ui
+        run: make build-ci
+
+      - name: Upload ENT Frontend
+        uses: actions/upload-artifact@v3
+        with:
+          name: frontend-ent-${{ env.BRANCH_NAME }}
+          path: ./ui/packages/consul-ui/dist
+          if-no-files-found: error
+
+  frontend-test-ent:
+    runs-on: ubuntu-latest
+    needs: [frontend-build-ent]
+    strategy:
+      matrix:
+        partition: [ 1, 2, 3, 4 ]
+    env:
+      CONSUL_NSPACES_ENABLED: 1
+      EMBER_TEST_REPORT: test-results/report-ce.xml #outputs test report for CI test summary
+      EMBER_TEST_PARALLEL: true #enables test parallelization with ember-exam
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ env.BRANCH }}
+
+      # Not necessary to use yarn, but enables caching
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+          cache: 'yarn'
+          cache-dependency-path: ./ui/yarn.lock
+
+      - name: Install
+        id: install
+        working-directory: ./ui
+        run: make deps
+
+      - name: Download ENT Frontend
+        uses: actions/download-artifact@v3
+        with:
+          name: frontend-ent-${{ env.BRANCH_NAME }}
+          path: ./ui/packages/consul-ui/dist
+
+      - name: Ember Test ENT
+        id: cache
+        working-directory: ./ui/packages/consul-ui
+        run: node_modules/.bin/ember exam --split=$EMBER_PARTITION_TOTAL --partition=${{ matrix.partition }} --path dist --silent -r xunit
+
+  frontend-test-coverage-ent:
+    runs-on: ubuntu-latest
+    needs: [frontend-build-ent]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ env.BRANCH }}
+
+      # Not necessary to use yarn, but enables caching
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+          cache: 'yarn'
+          cache-dependency-path: ./ui/yarn.lock
+
+      - name: Install
+        id: install
+        working-directory: ./ui
+        run: make deps
+
+      - name: Download ENT Frontend
+        uses: actions/download-artifact@v3
+        with:
+          name: frontend-ent-${{ env.BRANCH_NAME }}
+          path: ./ui/packages/consul-ui/dist
+
+      - name: Run ENT Code Coverage
+        working-directory: ./ui/packages/consul-ui
+        run: make test-coverage-ci
+
+  slack-failure-notification:
+    runs-on: ubuntu-latest
+    needs: [frontend-test-ce, frontend-test-ent]
+    if: ${{ failure() }}
+    steps:
+      - name: Slack Notification
+        id: slack
+        uses: slackapi/slack-github-action@v1.19
+        with:
+          payload: |
+            {
+              "message": "One or more nightly UI tests have failed on branch ${{ env.BRANCH }} for Consul. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.CONSUL_UI_SLACK_WEBHOOK }}
diff --git a/.github/workflows/nightly-test-1.13.x.yaml b/.github/workflows/nightly-test-1.13.x.yaml
index f314a475dfbd7..c1e9d035be053 100644
--- a/.github/workflows/nightly-test-1.13.x.yaml
+++ b/.github/workflows/nightly-test-1.13.x.yaml
@@ -1,28 +1,24 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-name: Nightly Frontend Test 1.13.x
+name: Nightly Test 1.13.x
 on:
   schedule:
     - cron: '0 4 * * *'
   workflow_dispatch: {}
 
 env:
-  EMBER_PARTITION_TOTAL: 4        # Has to be changed in tandem with the matrix.partition
+  EMBER_PARTITION_TOTAL: 4      # Has to be changed in tandem with the matrix.partition
   BRANCH: "release/1.13.x"
-  BRANCH_NAME: "release-1.13.x"   # Used for naming artifacts
-  GOPRIVATE: github.com/hashicorp # Required for enterprise deps
+  BRANCH_NAME: "release-1.13.x" # Used for naming artifacts
 
 jobs:
   frontend-test-workspace-node:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -49,12 +45,12 @@ jobs:
       JOBS: 2
       CONSUL_NSPACES_ENABLED: 0
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -71,7 +67,7 @@ jobs:
         run: make build-ci
 
       - name: Upload CE Frontend
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@v3
         with:
           name: frontend-ce-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -88,12 +84,12 @@ jobs:
       EMBER_TEST_REPORT: test-results/report-ce.xml #outputs test report for CI test summary
       EMBER_TEST_PARALLEL: true #enables test parallelization with ember-exam
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -105,7 +101,7 @@ jobs:
         run: make deps
 
       - name: Download CE Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@v3
         with:
           name: frontend-ce-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -121,12 +117,12 @@ jobs:
       JOBS: 2
       CONSUL_NSPACES_ENABLED: 1
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -143,7 +139,7 @@ jobs:
         run: make build-ci
 
       - name: Upload ENT Frontend
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@v3
         with:
           name: frontend-ent-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -160,12 +156,12 @@ jobs:
       EMBER_TEST_REPORT: test-results/report-ce.xml #outputs test report for CI test summary
       EMBER_TEST_PARALLEL: true #enables test parallelization with ember-exam
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -177,7 +173,7 @@ jobs:
         run: make deps
 
       - name: Download ENT Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@v3
         with:
           name: frontend-ent-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -191,12 +187,12 @@ jobs:
     runs-on: ubuntu-latest
     needs: [frontend-build-ent]
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -208,7 +204,7 @@ jobs:
         run: make deps
 
       - name: Download ENT Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@v3
         with:
           name: frontend-ent-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -224,7 +220,7 @@ jobs:
     steps:
       - name: Slack Notification
         id: slack
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+        uses: slackapi/slack-github-action@v1.19
         with:
           payload: |
             {
diff --git a/.github/workflows/nightly-test-1.14.x.yaml b/.github/workflows/nightly-test-1.14.x.yaml
index 11fb011d13571..ee9fbd117c2ef 100644
--- a/.github/workflows/nightly-test-1.14.x.yaml
+++ b/.github/workflows/nightly-test-1.14.x.yaml
@@ -1,28 +1,24 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-name: Nightly Frontend Test 1.14.x
+name: Nightly Test 1.14.x
 on:
   schedule:
     - cron: '0 4 * * *'
   workflow_dispatch: {}
 
 env:
-  EMBER_PARTITION_TOTAL: 4        # Has to be changed in tandem with the matrix.partition
+  EMBER_PARTITION_TOTAL: 4      # Has to be changed in tandem with the matrix.partition
   BRANCH: "release/1.14.x"
-  BRANCH_NAME: "release-1.14.x"   # Used for naming artifacts
-  GOPRIVATE: github.com/hashicorp # Required for enterprise deps
+  BRANCH_NAME: "release-1.14.x" # Used for naming artifacts
 
 jobs:
   frontend-test-workspace-node:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -49,12 +45,12 @@ jobs:
       JOBS: 2
       CONSUL_NSPACES_ENABLED: 0
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -71,7 +67,7 @@ jobs:
         run: make build-ci
 
       - name: Upload CE Frontend
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@v3
         with:
           name: frontend-ce-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -88,12 +84,12 @@ jobs:
       EMBER_TEST_REPORT: test-results/report-ce.xml #outputs test report for CI test summary
       EMBER_TEST_PARALLEL: true #enables test parallelization with ember-exam
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -105,7 +101,7 @@ jobs:
         run: make deps
 
       - name: Download CE Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@v3
         with:
           name: frontend-ce-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -121,12 +117,12 @@ jobs:
       JOBS: 2
       CONSUL_NSPACES_ENABLED: 1
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -143,7 +139,7 @@ jobs:
         run: make build-ci
 
       - name: Upload ENT Frontend
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@v3
         with:
           name: frontend-ent-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -160,12 +156,12 @@ jobs:
       EMBER_TEST_REPORT: test-results/report-ce.xml #outputs test report for CI test summary
       EMBER_TEST_PARALLEL: true #enables test parallelization with ember-exam
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -177,7 +173,7 @@ jobs:
         run: make deps
 
       - name: Download ENT Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@v3
         with:
           name: frontend-ent-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -191,12 +187,12 @@ jobs:
     runs-on: ubuntu-latest
     needs: [frontend-build-ent]
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -208,7 +204,7 @@ jobs:
         run: make deps
 
       - name: Download ENT Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@v3
         with:
           name: frontend-ent-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -224,7 +220,7 @@ jobs:
     steps:
       - name: Slack Notification
         id: slack
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+        uses: slackapi/slack-github-action@v1.19
         with:
           payload: |
             {
diff --git a/.github/workflows/nightly-test-1.15.x.yaml b/.github/workflows/nightly-test-1.15.x.yaml
deleted file mode 100644
index a98eb73070b36..0000000000000
--- a/.github/workflows/nightly-test-1.15.x.yaml
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-name: Nightly Frontend Test 1.15.x
-on:
-  schedule:
-    - cron: '0 4 * * *'
-  workflow_dispatch: {}
-
-env:
-  EMBER_PARTITION_TOTAL: 4        # Has to be changed in tandem with the matrix.partition
-  BRANCH: "release/1.15.x"
-  BRANCH_NAME: "release-1.15.x"   # Used for naming artifacts
-  GOPRIVATE: github.com/hashicorp # Required for enterprise deps
-
-jobs:
-  frontend-test-workspace-node:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-
-      # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
-        with:
-          node-version: 14
-          cache: 'yarn'
-          cache-dependency-path: ./ui/yarn.lock
-
-      - name: Install
-        id: install
-        working-directory: ./ui
-        run: make deps
-
-      - name: Workspace Tests
-        id: workspace-test
-        working-directory: ./ui
-        run: make test-workspace
-
-      - name: Node Tests
-        id: node-test
-        working-directory: ./ui/packages/consul-ui
-        run: make test-node
-
-  frontend-build-ce:
-    runs-on: ubuntu-latest
-    env:
-      JOBS: 2
-      CONSUL_NSPACES_ENABLED: 0
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-
-      # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
-        with:
-          node-version: 14
-          cache: 'yarn'
-          cache-dependency-path: ./ui/yarn.lock
-
-      - name: Install
-        id: install
-        working-directory: ./ui
-        run: make deps
-
-      - name: Ember Build CE
-        id: build-ce
-        working-directory: ./ui/packages/consul-ui
-        run: make build-ci
-
-      - name: Upload CE Frontend
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: frontend-ce-${{ env.BRANCH_NAME }}
-          path: ./ui/packages/consul-ui/dist
-          if-no-files-found: error
-
-  frontend-test-ce:
-    runs-on: ubuntu-latest
-    needs: [frontend-build-ce]
-    strategy:
-      matrix:
-        partition: [ 1, 2, 3, 4 ]
-    env:
-      CONSUL_NSPACES_ENABLED: 0
-      EMBER_TEST_REPORT: test-results/report-ce.xml #outputs test report for CI test summary
-      EMBER_TEST_PARALLEL: true #enables test parallelization with ember-exam
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-
-      # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
-        with:
-          node-version: 14
-          cache: 'yarn'
-          cache-dependency-path: ./ui/yarn.lock
-
-      - name: Install
-        id: install
-        working-directory: ./ui
-        run: make deps
-
-      - name: Download CE Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: frontend-ce-${{ env.BRANCH_NAME }}
-          path: ./ui/packages/consul-ui/dist
-
-      - name: Ember Test CE
-        id: cache
-        working-directory: ./ui/packages/consul-ui
-        run: node_modules/.bin/ember exam --split=$EMBER_PARTITION_TOTAL --partition=${{ matrix.partition }} --path dist --silent -r xunit
-
-  frontend-build-ent:
-    runs-on: ubuntu-latest
-    env:
-      JOBS: 2
-      CONSUL_NSPACES_ENABLED: 1
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-
-      # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
-        with:
-          node-version: 14
-          cache: 'yarn'
-          cache-dependency-path: ./ui/yarn.lock
-
-      - name: Install
-        id: install
-        working-directory: ./ui
-        run: make deps
-
-      - name: Ember Build ENT
-        id: build-ce
-        working-directory: ./ui/packages/consul-ui
-        run: make build-ci
-
-      - name: Upload ENT Frontend
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: frontend-ent-${{ env.BRANCH_NAME }}
-          path: ./ui/packages/consul-ui/dist
-          if-no-files-found: error
-
-  frontend-test-ent:
-    runs-on: ubuntu-latest
-    needs: [frontend-build-ent]
-    strategy:
-      matrix:
-        partition: [ 1, 2, 3, 4 ]
-    env:
-      CONSUL_NSPACES_ENABLED: 1
-      EMBER_TEST_REPORT: test-results/report-ce.xml #outputs test report for CI test summary
-      EMBER_TEST_PARALLEL: true #enables test parallelization with ember-exam
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-
-      # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
-        with:
-          node-version: 14
-          cache: 'yarn'
-          cache-dependency-path: ./ui/yarn.lock
-
-      - name: Install
-        id: install
-        working-directory: ./ui
-        run: make deps
-
-      - name: Download ENT Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: frontend-ent-${{ env.BRANCH_NAME }}
-          path: ./ui/packages/consul-ui/dist
-
-      - name: Ember Test ENT
-        id: cache
-        working-directory: ./ui/packages/consul-ui
-        run: node_modules/.bin/ember exam --split=$EMBER_PARTITION_TOTAL --partition=${{ matrix.partition }} --path dist --silent -r xunit
-
-  frontend-test-coverage-ent:
-    runs-on: ubuntu-latest
-    needs: [frontend-build-ent]
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-
-      # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
-        with:
-          node-version: 14
-          cache: 'yarn'
-          cache-dependency-path: ./ui/yarn.lock
-
-      - name: Install
-        id: install
-        working-directory: ./ui
-        run: make deps
-
-      - name: Download ENT Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: frontend-ent-${{ env.BRANCH_NAME }}
-          path: ./ui/packages/consul-ui/dist
-
-      - name: Run ENT Code Coverage
-        working-directory: ./ui/packages/consul-ui
-        run: make test-coverage-ci
-
-  slack-failure-notification:
-    runs-on: ubuntu-latest
-    needs: [frontend-test-ce, frontend-test-ent]
-    if: ${{ failure() }}
-    steps:
-      - name: Slack Notification
-        id: slack
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
-        with:
-          payload: |
-            {
-              "message": "One or more nightly UI tests have failed on branch ${{ env.BRANCH }} for Consul. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.CONSUL_UI_SLACK_WEBHOOK }}
diff --git a/.github/workflows/nightly-test-1.16.x.yaml b/.github/workflows/nightly-test-1.16.x.yaml
deleted file mode 100644
index b441eca5d0f59..0000000000000
--- a/.github/workflows/nightly-test-1.16.x.yaml
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-name: Nightly Frontend Test 1.16.x
-on:
-  schedule:
-    - cron: '0 4 * * *'
-  workflow_dispatch: {}
-
-env:
-  EMBER_PARTITION_TOTAL: 4        # Has to be changed in tandem with the matrix.partition
-  BRANCH: "release/1.16.x"
-  BRANCH_NAME: "release-1.16.x"   # Used for naming artifacts
-  GOPRIVATE: github.com/hashicorp # Required for enterprise deps
-
-jobs:
-  frontend-test-workspace-node:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-
-      # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
-        with:
-          node-version: 14
-          cache: 'yarn'
-          cache-dependency-path: ./ui/yarn.lock
-
-      - name: Install
-        id: install
-        working-directory: ./ui
-        run: make deps
-
-      - name: Workspace Tests
-        id: workspace-test
-        working-directory: ./ui
-        run: make test-workspace
-
-      - name: Node Tests
-        id: node-test
-        working-directory: ./ui/packages/consul-ui
-        run: make test-node
-
-  frontend-build-ce:
-    runs-on: ubuntu-latest
-    env:
-      JOBS: 2
-      CONSUL_NSPACES_ENABLED: 0
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-
-      # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
-        with:
-          node-version: 14
-          cache: 'yarn'
-          cache-dependency-path: ./ui/yarn.lock
-
-      - name: Install
-        id: install
-        working-directory: ./ui
-        run: make deps
-
-      - name: Ember Build CE
-        id: build-ce
-        working-directory: ./ui/packages/consul-ui
-        run: make build-ci
-
-      - name: Upload CE Frontend
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: frontend-ce-${{ env.BRANCH_NAME }}
-          path: ./ui/packages/consul-ui/dist
-          if-no-files-found: error
-
-  frontend-test-ce:
-    runs-on: ubuntu-latest
-    needs: [frontend-build-ce]
-    strategy:
-      matrix:
-        partition: [ 1, 2, 3, 4 ]
-    env:
-      CONSUL_NSPACES_ENABLED: 0
-      EMBER_TEST_REPORT: test-results/report-ce.xml #outputs test report for CI test summary
-      EMBER_TEST_PARALLEL: true #enables test parallelization with ember-exam
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-
-      # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
-        with:
-          node-version: 14
-          cache: 'yarn'
-          cache-dependency-path: ./ui/yarn.lock
-
-      - name: Install
-        id: install
-        working-directory: ./ui
-        run: make deps
-
-      - name: Download CE Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: frontend-ce-${{ env.BRANCH_NAME }}
-          path: ./ui/packages/consul-ui/dist
-
-      - name: Ember Test CE
-        id: cache
-        working-directory: ./ui/packages/consul-ui
-        run: node_modules/.bin/ember exam --split=$EMBER_PARTITION_TOTAL --partition=${{ matrix.partition }} --path dist --silent -r xunit
-
-  frontend-build-ent:
-    runs-on: ubuntu-latest
-    env:
-      JOBS: 2
-      CONSUL_NSPACES_ENABLED: 1
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-
-      # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
-        with:
-          node-version: 14
-          cache: 'yarn'
-          cache-dependency-path: ./ui/yarn.lock
-
-      - name: Install
-        id: install
-        working-directory: ./ui
-        run: make deps
-
-      - name: Ember Build ENT
-        id: build-ce
-        working-directory: ./ui/packages/consul-ui
-        run: make build-ci
-
-      - name: Upload ENT Frontend
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: frontend-ent-${{ env.BRANCH_NAME }}
-          path: ./ui/packages/consul-ui/dist
-          if-no-files-found: error
-
-  frontend-test-ent:
-    runs-on: ubuntu-latest
-    needs: [frontend-build-ent]
-    strategy:
-      matrix:
-        partition: [ 1, 2, 3, 4 ]
-    env:
-      CONSUL_NSPACES_ENABLED: 1
-      EMBER_TEST_REPORT: test-results/report-ce.xml #outputs test report for CI test summary
-      EMBER_TEST_PARALLEL: true #enables test parallelization with ember-exam
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-
-      # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
-        with:
-          node-version: 14
-          cache: 'yarn'
-          cache-dependency-path: ./ui/yarn.lock
-
-      - name: Install
-        id: install
-        working-directory: ./ui
-        run: make deps
-
-      - name: Download ENT Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: frontend-ent-${{ env.BRANCH_NAME }}
-          path: ./ui/packages/consul-ui/dist
-
-      - name: Ember Test ENT
-        id: cache
-        working-directory: ./ui/packages/consul-ui
-        run: node_modules/.bin/ember exam --split=$EMBER_PARTITION_TOTAL --partition=${{ matrix.partition }} --path dist --silent -r xunit
-
-  frontend-test-coverage-ent:
-    runs-on: ubuntu-latest
-    needs: [frontend-build-ent]
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-
-      # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
-        with:
-          node-version: 14
-          cache: 'yarn'
-          cache-dependency-path: ./ui/yarn.lock
-
-      - name: Install
-        id: install
-        working-directory: ./ui
-        run: make deps
-
-      - name: Download ENT Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: frontend-ent-${{ env.BRANCH_NAME }}
-          path: ./ui/packages/consul-ui/dist
-
-      - name: Run ENT Code Coverage
-        working-directory: ./ui/packages/consul-ui
-        run: make test-coverage-ci
-
-  slack-failure-notification:
-    runs-on: ubuntu-latest
-    needs: [frontend-test-ce, frontend-test-ent]
-    if: ${{ failure() }}
-    steps:
-      - name: Slack Notification
-        id: slack
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
-        with:
-          payload: |
-            {
-              "message": "One or more nightly UI tests have failed on branch ${{ env.BRANCH }} for Consul. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.CONSUL_UI_SLACK_WEBHOOK }}
diff --git a/.github/workflows/nightly-test-integrations-1.15.x.yml b/.github/workflows/nightly-test-integrations-1.15.x.yml
deleted file mode 100644
index 80597f64e2fad..0000000000000
--- a/.github/workflows/nightly-test-integrations-1.15.x.yml
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-name: Nightly test-integrations 1.15.x
-
-on:
-  schedule:
-    # Run nightly at 1AM UTC/9PM EST/6PM PST
-    - cron: '* 1 * * *'
-  workflow_dispatch: {}
-
-env:
-  TEST_RESULTS_DIR: /tmp/test-results
-  TEST_RESULTS_ARTIFACT_NAME: test-results
-  CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
-  GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
-  GOTESTSUM_VERSION: "1.10.1"
-  CONSUL_BINARY_UPLOAD_NAME: consul-bin
-  # strip the hashicorp/ off the front of github.repository for consul
-  CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }}
-  GOPRIVATE: github.com/hashicorp # Required for enterprise deps
-  BRANCH: "release/1.15.x"
-  BRANCH_NAME: "release-1.15.x"   # Used for naming artifacts
-
-jobs:
-  setup:
-    runs-on: ubuntu-latest
-    name: Setup
-    outputs:
-      compute-small: ${{ steps.runners.outputs.compute-small }}
-      compute-medium: ${{ steps.runners.outputs.compute-medium }}
-      compute-large: ${{ steps.runners.outputs.compute-large }}
-      compute-xl: ${{ steps.runners.outputs.compute-xl }}
-      enterprise: ${{ steps.runners.outputs.enterprise }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-      - id: runners
-        run: .github/scripts/get_runner_classes.sh
-
-  dev-build:
-    needs: [setup]
-    uses: ./.github/workflows/reusable-dev-build.yml
-    with:
-      runs-on: ${{ needs.setup.outputs.compute-large }}
-      repository-name: ${{ github.repository }}
-      uploaded-binary-name: 'consul-bin'
-      branch-name: "release/1.15.x"
-    secrets:
-      elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
-
-  generate-envoy-job-matrices:
-    needs: [setup]
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
-    name: Generate Envoy Job Matrices
-    outputs:
-      envoy-matrix: ${{ steps.set-matrix.outputs.envoy-matrix }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-      - name: Generate Envoy Job Matrix
-        id: set-matrix
-        env:
-          # this is further going to multiplied in envoy-integration tests by the 
-          # other dimensions in the matrix.  Currently TOTAL_RUNNERS would be
-          # multiplied by 8 based on these values:
-          # envoy-version: ["1.22.11", "1.23.12", "1.24.10", "1.25.9"]
-          # xds-target: ["server", "client"]
-          TOTAL_RUNNERS: 4 
-          JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
-        run: |
-          NUM_RUNNERS=$TOTAL_RUNNERS
-          NUM_DIRS=$(find ./test/integration/connect/envoy -mindepth 1 -maxdepth 1 -type d | wc -l)
-
-          if [ "$NUM_DIRS" -lt "$NUM_RUNNERS" ]; then
-            echo "TOTAL_RUNNERS is larger than the number of tests/packages to split."
-            NUM_RUNNERS=$((NUM_DIRS-1))
-          fi
-          # fix issue where test splitting calculation generates 1 more split than TOTAL_RUNNERS.
-          NUM_RUNNERS=$((NUM_RUNNERS-1))
-          {
-            echo -n "envoy-matrix="
-            find ./test/integration/connect/envoy -maxdepth 1 -type d -print0 \
-              | xargs -0 -n 1 basename \
-              | jq --raw-input --argjson runnercount "$NUM_RUNNERS" "$JQ_SLICER" \
-              | jq --compact-output 'map(join("|"))'
-          } >> "$GITHUB_OUTPUT"
-  
-  envoy-integration-test:
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
-    needs:
-      - setup
-      - generate-envoy-job-matrices
-      - dev-build
-    permissions:
-      id-token: write # NOTE: this permission is explicitly required for Vault auth.
-      contents: read
-    strategy:
-      fail-fast: false
-      matrix:
-        envoy-version: ["1.22.11", "1.23.12", "1.24.10", "1.25.9"]
-        xds-target: ["server", "client"]
-        test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
-    env:
-      ENVOY_VERSION: ${{ matrix.envoy-version }}
-      XDS_TARGET: ${{ matrix.xds-target }}
-      AWS_LAMBDA_REGION: us-west-2
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
-        with:
-          go-version-file: 'go.mod'
-
-      - name: fetch binary
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: '${{ env.CONSUL_BINARY_UPLOAD_NAME }}'
-          path: ./bin
-      - name: restore mode+x
-        run: chmod +x ./bin/consul
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@2a1a44ac4aa01993040736bd95bb470da1a38365 # v2.9.0
-      - name: Docker build
-        run: docker build -t consul:local -f ./build-support/docker/Consul-Dev.dockerfile ./bin
-      - name: Envoy Integration Tests
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running $(sed 's,|, ,g' <<< "${{ matrix.test-cases }}" |wc -w) subtests"
-          # shellcheck disable=SC2001
-          sed 's,|,\n,g' <<< "${{ matrix.test-cases }}"
-          go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
-              --debug \
-              --rerun-fails \
-              --rerun-fails-report=/tmp/gotestsum-rerun-fails \
-              --jsonfile /tmp/jsonfile/go-test.log \
-              --packages=./test/integration/connect/envoy \
-              -- -timeout=30m -tags integration -run="TestEnvoy/(${{ matrix.test-cases }})"
-
-      # NOTE: ENT specific step as we store secrets in Vault.
-      - name: Authenticate to Vault
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        id: vault-auth
-        run: vault-auth
-
-      # NOTE: ENT specific step as we store secrets in Vault.
-      - name: Fetch Secrets
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        id: secrets
-        uses: hashicorp/vault-action@v2.5.0
-        with:
-          url: ${{ steps.vault-auth.outputs.addr }}
-          caCertificate: ${{ steps.vault-auth.outputs.ca_certificate }}
-          token: ${{ steps.vault-auth.outputs.token }}
-          secrets: |
-              kv/data/github/${{ github.repository }}/datadog apikey | DATADOG_API_KEY;
-
-      - name: prepare datadog-ci
-        if: ${{ !endsWith(github.repository, '-enterprise') }}
-        run: |
-          curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64" --output "/usr/local/bin/datadog-ci"
-          chmod +x /usr/local/bin/datadog-ci
-
-      - name: upload coverage
-        # do not run on forks
-        if: github.event.pull_request.head.repo.full_name == github.repository
-        env:
-          DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}"
-          DD_ENV: ci
-        run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" $TEST_RESULTS_DIR/results.xml
-  
-  upgrade-integration-test:
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
-    needs:
-      - setup
-      - dev-build
-    permissions:
-      id-token: write # NOTE: this permission is explicitly required for Vault auth.
-      contents: read
-    strategy:
-      fail-fast: false
-      matrix:
-        consul-version: ["1.14", "1.15"]
-    env:
-      CONSUL_LATEST_VERSION: ${{ matrix.consul-version }}
-      ENVOY_VERSION: "1.24.6"
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-      # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
-      - name: Setup Git
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
-        with:
-          go-version-file: 'go.mod'
-      - run: go env
-
-      # Get go binary from workspace
-      - name: fetch binary
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: '${{ env.CONSUL_BINARY_UPLOAD_NAME }}'
-          path: .
-      - name: restore mode+x
-        run: chmod +x consul
-      - name: Build consul:local image
-        run: docker build -t ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local -f ./build-support/docker/Consul-Dev.dockerfile .
-      - name: Configure GH workaround for ipv6 loopback
-        if: ${{ !endsWith(github.repository, '-enterprise') }}
-        run: |
-          cat /etc/hosts && echo "-----------"
-          sudo sed -i 's/::1 *localhost ip6-localhost ip6-loopback/::1 ip6-localhost ip6-loopback/g' /etc/hosts
-          cat /etc/hosts
-      - name: Upgrade Integration Tests
-        run: |
-          mkdir -p "${{ env.TEST_RESULTS_DIR }}"
-          cd ./test/integration/consul-container/test/upgrade
-          docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
-          go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
-            --raw-command \
-            --format=short-verbose \
-            --debug \
-            --rerun-fails=2 \
-            --packages="./..." \
-            -- \
-            go test \
-            -p=4 \
-            -tags "${{ env.GOTAGS }}" \
-            -timeout=30m \
-            -json \
-            ./... \
-            --follow-log=false \
-            --target-image ${{ env.CONSUL_LATEST_IMAGE_NAME }} \
-            --target-version local \
-            --latest-image docker.mirror.hashicorp.services/${{ env.CONSUL_LATEST_IMAGE_NAME }} \
-            --latest-version "${{ env.CONSUL_LATEST_VERSION }}"
-          ls -lrt
-        env:
-          # this is needed because of incompatibility between RYUK container and GHA
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          # tput complains if this isn't set to something.
-          TERM: ansi
-      # NOTE: ENT specific step as we store secrets in Vault.
-      - name: Authenticate to Vault
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        id: vault-auth
-        run: vault-auth
-
-      # NOTE: ENT specific step as we store secrets in Vault.
-      - name: Fetch Secrets
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        id: secrets
-        uses: hashicorp/vault-action@v2.5.0
-        with:
-          url: ${{ steps.vault-auth.outputs.addr }}
-          caCertificate: ${{ steps.vault-auth.outputs.ca_certificate }}
-          token: ${{ steps.vault-auth.outputs.token }}
-          secrets: |
-              kv/data/github/${{ github.repository }}/datadog apikey | DATADOG_API_KEY;
-
-      - name: prepare datadog-ci
-        if: ${{ !endsWith(github.repository, '-enterprise') }}
-        run: |
-          curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64" --output "/usr/local/bin/datadog-ci"
-          chmod +x /usr/local/bin/datadog-ci
-
-      - name: upload coverage
-        # do not run on forks
-        if: github.event.pull_request.head.repo.full_name == github.repository
-        env:
-          DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}"
-          DD_ENV: ci
-        run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" $TEST_RESULTS_DIR/results.xml
-
-  test-integrations-success:
-    needs: 
-    - setup
-    - dev-build
-    - generate-envoy-job-matrices
-    - envoy-integration-test
-    - upgrade-integration-test
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
-    if: ${{ always() }}
-    steps:
-      - name: evaluate upstream job results
-        run: |
-          # exit 1 if failure or cancelled result for any upstream job
-          if printf '${{ toJSON(needs) }}' | grep -E -i '\"result\": \"(failure|cancelled)\"'; then
-            printf "Tests failed or workflow cancelled:\n\n${{ toJSON(needs) }}"
-            exit 1
-          fi
-      - name: Notify Slack
-        if: ${{ failure() }}
-        id: slack
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
-        with:
-          payload: |
-            {
-              "message": "One or more nightly integration tests have failed on branch ${{ env.BRANCH }} for Consul. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.CONSUL_NIGHTLY_INTEG_TEST_SLACK_WEBHOOK }}
diff --git a/.github/workflows/nightly-test-integrations-1.16.x.yml b/.github/workflows/nightly-test-integrations-1.16.x.yml
deleted file mode 100644
index c4f16d9be618e..0000000000000
--- a/.github/workflows/nightly-test-integrations-1.16.x.yml
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-name: Nightly test-integrations 1.16.x
-
-on:
-  schedule:
-    # Run nightly at 1AM UTC/9PM EST/6PM PST
-    - cron: '* 1 * * *'
-  workflow_dispatch: {}
-
-env:
-  TEST_RESULTS_DIR: /tmp/test-results
-  TEST_RESULTS_ARTIFACT_NAME: test-results
-  CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
-  GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
-  GOTESTSUM_VERSION: "1.10.1"
-  CONSUL_BINARY_UPLOAD_NAME: consul-bin
-  # strip the hashicorp/ off the front of github.repository for consul
-  CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }}
-  GOPRIVATE: github.com/hashicorp # Required for enterprise deps
-  BRANCH: "release/1.16.x"
-  BRANCH_NAME: "release-1.16.x"   # Used for naming artifacts
-
-jobs:
-  setup:
-    runs-on: ubuntu-latest
-    name: Setup
-    outputs:
-      compute-small: ${{ steps.runners.outputs.compute-small }}
-      compute-medium: ${{ steps.runners.outputs.compute-medium }}
-      compute-large: ${{ steps.runners.outputs.compute-large }}
-      compute-xl: ${{ steps.runners.outputs.compute-xl }}
-      enterprise: ${{ steps.runners.outputs.enterprise }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-      - id: runners
-        run: .github/scripts/get_runner_classes.sh
-
-  dev-build:
-    needs: [setup]
-    uses: ./.github/workflows/reusable-dev-build.yml
-    with:
-      runs-on: ${{ needs.setup.outputs.compute-large }}
-      repository-name: ${{ github.repository }}
-      uploaded-binary-name: 'consul-bin'
-      branch-name: "release/1.16.x"
-    secrets:
-      elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
-
-  generate-envoy-job-matrices:
-    needs: [setup]
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
-    name: Generate Envoy Job Matrices
-    outputs:
-      envoy-matrix: ${{ steps.set-matrix.outputs.envoy-matrix }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-      - name: Generate Envoy Job Matrix
-        id: set-matrix
-        env:
-          # this is further going to multiplied in envoy-integration tests by the 
-          # other dimensions in the matrix.  Currently TOTAL_RUNNERS would be
-          # multiplied by 8 based on these values:
-          # envoy-version: ["1.24.10", "1.25.9", "1.26.4", "1.27.0"]
-          # xds-target: ["server", "client"]
-          TOTAL_RUNNERS: 4 
-          JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
-        run: |
-          NUM_RUNNERS=$TOTAL_RUNNERS
-          NUM_DIRS=$(find ./test/integration/connect/envoy -mindepth 1 -maxdepth 1 -type d | wc -l)
-
-          if [ "$NUM_DIRS" -lt "$NUM_RUNNERS" ]; then
-            echo "TOTAL_RUNNERS is larger than the number of tests/packages to split."
-            NUM_RUNNERS=$((NUM_DIRS-1))
-          fi
-          # fix issue where test splitting calculation generates 1 more split than TOTAL_RUNNERS.
-          NUM_RUNNERS=$((NUM_RUNNERS-1))
-          {
-            echo -n "envoy-matrix="
-            find ./test/integration/connect/envoy -maxdepth 1 -type d -print0 \
-              | xargs -0 -n 1 basename \
-              | jq --raw-input --argjson runnercount "$NUM_RUNNERS" "$JQ_SLICER" \
-              | jq --compact-output 'map(join("|"))'
-          } >> "$GITHUB_OUTPUT"
-  
-  envoy-integration-test:
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
-    needs:
-      - setup
-      - generate-envoy-job-matrices
-      - dev-build
-    permissions:
-      id-token: write # NOTE: this permission is explicitly required for Vault auth.
-      contents: read
-    strategy:
-      fail-fast: false
-      matrix:
-        envoy-version: ["1.23.12", "1.24.10", "1.25.9", "1.26.4"]
-        xds-target: ["server", "client"]
-        test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
-    env:
-      ENVOY_VERSION: ${{ matrix.envoy-version }}
-      XDS_TARGET: ${{ matrix.xds-target }}
-      AWS_LAMBDA_REGION: us-west-2
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
-        with:
-          go-version-file: 'go.mod'
-
-      - name: fetch binary
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: '${{ env.CONSUL_BINARY_UPLOAD_NAME }}'
-          path: ./bin
-      - name: restore mode+x
-        run: chmod +x ./bin/consul
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@2a1a44ac4aa01993040736bd95bb470da1a38365 # v2.9.0
-
-      - name: Docker build
-        run: docker build -t consul:local -f ./build-support/docker/Consul-Dev.dockerfile ./bin
-
-      - name: Envoy Integration Tests
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running $(sed 's,|, ,g' <<< "${{ matrix.test-cases }}" |wc -w) subtests"
-          # shellcheck disable=SC2001
-          sed 's,|,\n,g' <<< "${{ matrix.test-cases }}"
-          go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
-              --debug \
-              --rerun-fails \
-              --rerun-fails-report=/tmp/gotestsum-rerun-fails \
-              --jsonfile /tmp/jsonfile/go-test.log \
-              --packages=./test/integration/connect/envoy \
-              -- -timeout=30m -tags integration -run="TestEnvoy/(${{ matrix.test-cases }})"
-
-      # NOTE: ENT specific step as we store secrets in Vault.
-      - name: Authenticate to Vault
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        id: vault-auth
-        run: vault-auth
-
-      # NOTE: ENT specific step as we store secrets in Vault.
-      - name: Fetch Secrets
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        id: secrets
-        uses: hashicorp/vault-action@v2.5.0
-        with:
-          url: ${{ steps.vault-auth.outputs.addr }}
-          caCertificate: ${{ steps.vault-auth.outputs.ca_certificate }}
-          token: ${{ steps.vault-auth.outputs.token }}
-          secrets: |
-              kv/data/github/${{ github.repository }}/datadog apikey | DATADOG_API_KEY;
-
-      - name: prepare datadog-ci
-        if: ${{ !endsWith(github.repository, '-enterprise') }}
-        run: |
-          curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64" --output "/usr/local/bin/datadog-ci"
-          chmod +x /usr/local/bin/datadog-ci
-
-      - name: upload coverage
-        # do not run on forks
-        if: github.event.pull_request.head.repo.full_name == github.repository
-        env:
-          DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}"
-          DD_ENV: ci
-        run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" $TEST_RESULTS_DIR/results.xml
-  
-  upgrade-integration-test:
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
-    needs:
-      - setup
-      - dev-build
-    permissions:
-      id-token: write # NOTE: this permission is explicitly required for Vault auth.
-      contents: read
-    strategy:
-      fail-fast: false
-      matrix:
-        consul-version: ["1.14", "1.15", "1.16"]
-    env:
-      CONSUL_LATEST_VERSION: ${{ matrix.consul-version }}
-      ENVOY_VERSION: "1.24.6"
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ env.BRANCH }}
-      # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
-      - name: Setup Git
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
-        with:
-          go-version-file: 'go.mod'
-      - run: go env
-
-      # Get go binary from workspace
-      - name: fetch binary
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: '${{ env.CONSUL_BINARY_UPLOAD_NAME }}'
-          path: .
-      - name: restore mode+x
-        run: chmod +x consul
-      - name: Build consul:local image
-        run: docker build -t ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local -f ./build-support/docker/Consul-Dev.dockerfile .
-      - name: Build consul-envoy:latest-version image
-        id: buildConsulEnvoyLatestImage
-        run: |
-          if ${{ endsWith(github.repository, '-enterprise') }} == 'true'
-          then
-            docker build -t consul-envoy:latest-version --build-arg CONSUL_IMAGE=docker.mirror.hashicorp.services/${{ env.CONSUL_LATEST_IMAGE_NAME }}:${{ env.CONSUL_LATEST_VERSION }}-ent --build-arg ENVOY_VERSION=${{ env.ENVOY_VERSION }} -f ./test/integration/consul-container/assets/Dockerfile-consul-envoy ./test/integration/consul-container/assets
-          else
-            docker build -t consul-envoy:latest-version --build-arg CONSUL_IMAGE=docker.mirror.hashicorp.services/${{ env.CONSUL_LATEST_IMAGE_NAME }}:${{ env.CONSUL_LATEST_VERSION }}     --build-arg ENVOY_VERSION=${{ env.ENVOY_VERSION }} -f ./test/integration/consul-container/assets/Dockerfile-consul-envoy ./test/integration/consul-container/assets
-          fi
-      - name: Build consul-envoy:target-version image
-        id: buildConsulEnvoyTargetImage
-        continue-on-error: true
-        run: docker build -t consul-envoy:target-version --build-arg CONSUL_IMAGE=${{ env.CONSUL_LATEST_IMAGE_NAME }}:local --build-arg ENVOY_VERSION=${{ env.ENVOY_VERSION }} -f ./test/integration/consul-container/assets/Dockerfile-consul-envoy ./test/integration/consul-container/assets
-      - name: Retry Build consul-envoy:target-version image
-        if: steps.buildConsulEnvoyTargetImage.outcome == 'failure'
-        run: docker build -t consul-envoy:target-version --build-arg CONSUL_IMAGE=${{ env.CONSUL_LATEST_IMAGE_NAME }}:local --build-arg ENVOY_VERSION=${{ env.ENVOY_VERSION }} -f ./test/integration/consul-container/assets/Dockerfile-consul-envoy ./test/integration/consul-container/assets
-      - name: Build sds image
-        run: docker build -t consul-sds-server ./test/integration/connect/envoy/test-sds-server/
-      - name: Configure GH workaround for ipv6 loopback
-        if: ${{ !endsWith(github.repository, '-enterprise') }}
-        run: |
-          cat /etc/hosts && echo "-----------"
-          sudo sed -i 's/::1 *localhost ip6-localhost ip6-loopback/::1 ip6-localhost ip6-loopback/g' /etc/hosts
-          cat /etc/hosts
-      - name: Upgrade Integration Tests
-        run: |
-          mkdir -p "${{ env.TEST_RESULTS_DIR }}"
-          cd ./test/integration/consul-container/test/upgrade
-          docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
-          go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
-            --raw-command \
-            --format=short-verbose \
-            --debug \
-            --rerun-fails=2 \
-            --packages="./..." \
-            -- \
-            go test \
-            -p=4 \
-            -tags "${{ env.GOTAGS }}" \
-            -timeout=30m \
-            -json \
-            ./... \
-            --follow-log=false \
-            --target-image ${{ env.CONSUL_LATEST_IMAGE_NAME }} \
-            --target-version local \
-            --latest-image docker.mirror.hashicorp.services/${{ env.CONSUL_LATEST_IMAGE_NAME }} \
-            --latest-version "${{ env.CONSUL_LATEST_VERSION }}"
-          ls -lrt
-        env:
-          # this is needed because of incompatibility between RYUK container and GHA
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          # tput complains if this isn't set to something.
-          TERM: ansi
-      # NOTE: ENT specific step as we store secrets in Vault.
-      - name: Authenticate to Vault
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        id: vault-auth
-        run: vault-auth
-
-      # NOTE: ENT specific step as we store secrets in Vault.
-      - name: Fetch Secrets
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        id: secrets
-        uses: hashicorp/vault-action@v2.5.0
-        with:
-          url: ${{ steps.vault-auth.outputs.addr }}
-          caCertificate: ${{ steps.vault-auth.outputs.ca_certificate }}
-          token: ${{ steps.vault-auth.outputs.token }}
-          secrets: |
-              kv/data/github/${{ github.repository }}/datadog apikey | DATADOG_API_KEY;
-
-      - name: prepare datadog-ci
-        if: ${{ !endsWith(github.repository, '-enterprise') }}
-        run: |
-          curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64" --output "/usr/local/bin/datadog-ci"
-          chmod +x /usr/local/bin/datadog-ci
-
-      - name: upload coverage
-        # do not run on forks
-        if: github.event.pull_request.head.repo.full_name == github.repository
-        env:
-          DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}"
-          DD_ENV: ci
-        run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" $TEST_RESULTS_DIR/results.xml
-
-
-  test-integrations-success:
-    needs: 
-    - setup
-    - dev-build
-    - generate-envoy-job-matrices
-    - envoy-integration-test
-    - upgrade-integration-test
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
-    if: ${{ always() }}
-    steps:
-      - name: evaluate upstream job results
-        run: |
-          # exit 1 if failure or cancelled result for any upstream job
-          if printf '${{ toJSON(needs) }}' | grep -E -i '\"result\": \"(failure|cancelled)\"'; then
-            printf "Tests failed or workflow cancelled:\n\n${{ toJSON(needs) }}"
-            exit 1
-          fi
-      - name: Notify Slack
-        if: ${{ failure() }}
-        id: slack
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
-        with:
-          payload: |
-            {
-              "message": "One or more nightly integration tests have failed on branch ${{ env.BRANCH }} for Consul. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.CONSUL_NIGHTLY_INTEG_TEST_SLACK_WEBHOOK }}
diff --git a/.github/workflows/nightly-test-integrations.yml b/.github/workflows/nightly-test-integrations.yml
index 5e30df72229e7..ab42dbc25d0c9 100644
--- a/.github/workflows/nightly-test-integrations.yml
+++ b/.github/workflows/nightly-test-integrations.yml
@@ -88,7 +88,7 @@ jobs:
           } >> "$GITHUB_OUTPUT"
   
   envoy-integration-test:
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-large ) }}
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
     needs:
       - setup
       - generate-envoy-job-matrices
@@ -99,7 +99,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        envoy-version: ["1.24.10", "1.25.9", "1.26.4", "1.27.0"]
+        envoy-version: ["1.22.11", "1.23.12", "1.24.10", "1.25.9"]
         xds-target: ["server", "client"]
         test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
     env:
@@ -183,7 +183,7 @@ jobs:
         run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" $TEST_RESULTS_DIR/results.xml
   
   upgrade-integration-test:
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-large ) }}
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
     needs:
       - setup
       - dev-build
@@ -193,7 +193,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        consul-version: [ "1.15", "1.16"]
+        consul-version: [ "1.14", "1.15"]
     env:
       CONSUL_LATEST_VERSION: ${{ matrix.consul-version }}
       ENVOY_VERSION: "1.24.6"
@@ -223,13 +223,11 @@ jobs:
         run: docker build -t ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local -f ./build-support/docker/Consul-Dev.dockerfile .
       - name: Build consul-envoy:latest-version image
         id: buildConsulEnvoyLatestImage
-        run: |
-          if ${{ endsWith(github.repository, '-enterprise') }} == 'true'
-          then
-            docker build -t consul-envoy:latest-version --build-arg CONSUL_IMAGE=docker.mirror.hashicorp.services/${{ env.CONSUL_LATEST_IMAGE_NAME }}:${{ env.CONSUL_LATEST_VERSION }}-ent --build-arg ENVOY_VERSION=${{ env.ENVOY_VERSION }} -f ./test/integration/consul-container/assets/Dockerfile-consul-envoy ./test/integration/consul-container/assets
-          else
-            docker build -t consul-envoy:latest-version --build-arg CONSUL_IMAGE=docker.mirror.hashicorp.services/${{ env.CONSUL_LATEST_IMAGE_NAME }}:${{ env.CONSUL_LATEST_VERSION }}     --build-arg ENVOY_VERSION=${{ env.ENVOY_VERSION }} -f ./test/integration/consul-container/assets/Dockerfile-consul-envoy ./test/integration/consul-container/assets
-          fi
+        continue-on-error: true
+        run: docker build -t consul-envoy:latest-version --build-arg CONSUL_IMAGE=docker.mirror.hashicorp.services/${{ env.CONSUL_LATEST_IMAGE_NAME }}:${{ env.CONSUL_LATEST_VERSION }} --build-arg ENVOY_VERSION=${{ env.ENVOY_VERSION }} -f ./test/integration/consul-container/assets/Dockerfile-consul-envoy ./test/integration/consul-container/assets
+      - name: Retry Build consul-envoy:latest-version image
+        if: steps.buildConsulEnvoyLatestImage.outcome == 'failure'
+        run: docker build -t consul-envoy:latest-version --build-arg CONSUL_IMAGE=docker.mirror.hashicorp.services/${{ env.CONSUL_LATEST_IMAGE_NAME }}:${{ env.CONSUL_LATEST_VERSION }} --build-arg ENVOY_VERSION=${{ env.ENVOY_VERSION }} -f ./test/integration/consul-container/assets/Dockerfile-consul-envoy ./test/integration/consul-container/assets
       - name: Build consul-envoy:target-version image
         id: buildConsulEnvoyTargetImage
         continue-on-error: true
@@ -309,99 +307,6 @@ jobs:
         run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" $TEST_RESULTS_DIR/results.xml
 
 
-  peering_commontopo-integration-test:
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-large ) }}
-    needs:
-      - setup
-      - dev-build
-    permissions:
-      id-token: write # NOTE: this permission is explicitly required for Vault auth.
-      contents: read
-    strategy:
-      fail-fast: false
-    env:
-      ENVOY_VERSION: "1.24.6"
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
-      - name: Setup Git
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
-        with:
-          go-version-file: 'go.mod'
-      - run: go env
-
-      # Get go binary from workspace
-      - name: fetch binary
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: '${{ env.CONSUL_BINARY_UPLOAD_NAME }}'
-          path: .
-      - name: restore mode+x
-        run: chmod +x consul
-      - name: Build consul:local image
-        run: docker build -t ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local -f ./build-support/docker/Consul-Dev.dockerfile .
-      - name: Peering commonTopo Integration Tests
-        run: |
-          mkdir -p "${{ env.TEST_RESULTS_DIR }}"
-          cd ./test-integ/peering_commontopo
-          docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
-          go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
-            --raw-command \
-            --format=short-verbose \
-            --debug \
-            --packages="./..." \
-            -- \
-            go test \
-            -tags "${{ env.GOTAGS }}" \
-            -timeout=30m \
-            -json . \
-            --target-image ${{ env.CONSUL_LATEST_IMAGE_NAME }} \
-            --target-version local \
-            --latest-image docker.mirror.hashicorp.services/${{ env.CONSUL_LATEST_IMAGE_NAME }} \
-            --latest-version latest
-          ls -lrt
-        env:
-          # this is needed because of incompatibility between RYUK container and GHA
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          # tput complains if this isn't set to something.
-          TERM: ansi
-      # NOTE: ENT specific step as we store secrets in Vault.
-      - name: Authenticate to Vault
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        id: vault-auth
-        run: vault-auth
-
-      # NOTE: ENT specific step as we store secrets in Vault.
-      - name: Fetch Secrets
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        id: secrets
-        uses: hashicorp/vault-action@v2.5.0
-        with:
-          url: ${{ steps.vault-auth.outputs.addr }}
-          caCertificate: ${{ steps.vault-auth.outputs.ca_certificate }}
-          token: ${{ steps.vault-auth.outputs.token }}
-          secrets: |
-              kv/data/github/${{ github.repository }}/datadog apikey | DATADOG_API_KEY;
-
-      - name: prepare datadog-ci
-        if: ${{ !endsWith(github.repository, '-enterprise') }}
-        run: |
-          curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64" --output "/usr/local/bin/datadog-ci"
-          chmod +x /usr/local/bin/datadog-ci
-
-      - name: upload coverage
-        # do not run on forks
-        if: github.event.pull_request.head.repo.full_name == github.repository
-        env:
-          DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}"
-          DD_ENV: ci
-        run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" $TEST_RESULTS_DIR/results.xml
-
-
   test-integrations-success:
     needs: 
     - setup
@@ -409,7 +314,6 @@ jobs:
     - generate-envoy-job-matrices
     - envoy-integration-test
     - upgrade-integration-test
-    - peering_commontopo-integration-test
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
     if: ${{ always() }}
     steps:
@@ -420,14 +324,3 @@ jobs:
             printf "Tests failed or workflow cancelled:\n\n${{ toJSON(needs) }}"
             exit 1
           fi
-      - name: Notify Slack
-        if: ${{ failure() }}
-        id: slack
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
-        with:
-          payload: |
-            {
-              "message": "One or more nightly integration tests have failed. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.CONSUL_NIGHTLY_INTEG_TEST_SLACK_WEBHOOK }}
diff --git a/.github/workflows/nightly-test-main.yaml b/.github/workflows/nightly-test-main.yaml
index 2846f5b71c39e..33b2a8b622161 100644
--- a/.github/workflows/nightly-test-main.yaml
+++ b/.github/workflows/nightly-test-main.yaml
@@ -1,28 +1,24 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-name: Nightly Frontend Test Main
+name: Nightly Test Main
 on:
   schedule:
     - cron: '0 4 * * *'
   workflow_dispatch: {}
 
 env:
-  EMBER_PARTITION_TOTAL: 4        # Has to be changed in tandem with the matrix.partition
+  EMBER_PARTITION_TOTAL: 4      # Has to be changed in tandem with the matrix.partition
   BRANCH: "main"
-  BRANCH_NAME: "main"             # Used for naming artifacts
-  GOPRIVATE: github.com/hashicorp # Required for enterprise deps
+  BRANCH_NAME: "main"           # Used for naming artifacts
 
 jobs:
   frontend-test-workspace-node:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -49,12 +45,12 @@ jobs:
       JOBS: 2
       CONSUL_NSPACES_ENABLED: 0
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -71,7 +67,7 @@ jobs:
         run: make build-ci
 
       - name: Upload CE Frontend
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@v3
         with:
           name: frontend-ce-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -88,12 +84,12 @@ jobs:
       EMBER_TEST_REPORT: test-results/report-ce.xml #outputs test report for CI test summary
       EMBER_TEST_PARALLEL: true #enables test parallelization with ember-exam
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -105,7 +101,7 @@ jobs:
         run: make deps
 
       - name: Download CE Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@v3
         with:
           name: frontend-ce-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -121,12 +117,12 @@ jobs:
       JOBS: 2
       CONSUL_NSPACES_ENABLED: 1
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -143,7 +139,7 @@ jobs:
         run: make build-ci
 
       - name: Upload ENT Frontend
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@v3
         with:
           name: frontend-ent-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -160,12 +156,12 @@ jobs:
       EMBER_TEST_REPORT: test-results/report-ce.xml #outputs test report for CI test summary
       EMBER_TEST_PARALLEL: true #enables test parallelization with ember-exam
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -177,7 +173,7 @@ jobs:
         run: make deps
 
       - name: Download ENT Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@v3
         with:
           name: frontend-ent-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -191,12 +187,12 @@ jobs:
     runs-on: ubuntu-latest
     needs: [frontend-build-ent]
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ env.BRANCH }}
 
       # Not necessary to use yarn, but enables caching
-      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           cache: 'yarn'
@@ -208,7 +204,7 @@ jobs:
         run: make deps
 
       - name: Download ENT Frontend
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@v3
         with:
           name: frontend-ent-${{ env.BRANCH_NAME }}
           path: ./ui/packages/consul-ui/dist
@@ -224,7 +220,7 @@ jobs:
     steps:
       - name: Slack Notification
         id: slack
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+        uses: slackapi/slack-github-action@v1.19
         with:
           payload: |
             {
diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index 0d6b71c9f0618..64d728084b54b 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 name: "Pull Request Labeler"
 on:
   pull_request_target:
@@ -10,7 +7,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@0967ca812e7fdc8f5f71402a1b486d5bd061fe20 # v4.2.0
+    - uses: actions/labeler@main
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         configuration-path: .github/pr-labeler.yml
diff --git a/.github/workflows/pr-metrics-test-checker.yml b/.github/workflows/pr-metrics-test-checker.yml
index d0bdac04f7e3f..7c42da595bdc9 100644
--- a/.github/workflows/pr-metrics-test-checker.yml
+++ b/.github/workflows/pr-metrics-test-checker.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 name: "Check for metrics tests"
 on:
   pull_request:
@@ -14,7 +11,7 @@ jobs:
     if: "! ( contains(github.event.pull_request.labels.*.name, 'pr/no-metrics-test') || github.event.pull_request.user.login == 'hc-github-team-consul-core' )" 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         name: "checkout repo"
         with:
           ref: ${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows/reusable-check-go-mod.yml b/.github/workflows/reusable-check-go-mod.yml
index 7fffb616879ef..2078b0c3217d6 100644
--- a/.github/workflows/reusable-check-go-mod.yml
+++ b/.github/workflows/reusable-check-go-mod.yml
@@ -18,12 +18,12 @@ jobs:
     runs-on: ${{ fromJSON(inputs.runs-on) }}
 
     steps:
-    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
     # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
     - name: Setup Git
       if: ${{ endsWith(inputs.repository-name, '-enterprise') }}
       run: git config --global url."https://${{ secrets.elevated-github-token }}:@github.com".insteadOf "https://github.com"
-    - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+    - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3.5.0
       with:
         go-version-file: 'go.mod'
     - run: go mod tidy
diff --git a/.github/workflows/reusable-dev-build-windows.yml b/.github/workflows/reusable-dev-build-windows.yml
deleted file mode 100644
index 01247c477878c..0000000000000
--- a/.github/workflows/reusable-dev-build-windows.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: reusable-dev-build-windows
-
-on:
-  workflow_call:
-    inputs:
-      uploaded-binary-name:
-        required: false
-        type: string
-        default: "consul.exe"
-      runs-on:
-        description: An expression indicating which kind of runners to use.
-        required: true
-        type: string
-      repository-name:
-        required: true
-        type: string
-      go-arch:
-        required: false
-        type: string
-        default: ""
-    secrets:
-      elevated-github-token:
-        required: true
-jobs:
-  build:
-    runs-on: 'windows-2019'
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
-      - name: Setup Git
-        if: ${{ endsWith(inputs.repository-name, '-enterprise') }}
-        run: git config --global url."https://${{ secrets.elevated-github-token }}:@github.com".insteadOf "https://github.com"
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
-        with:
-          go-version-file: 'go.mod'
-      - name: Build
-        env:
-          GOARCH: ${{ inputs.goarch }}
-        run: go build .
-      # save dev build to pass to downstream jobs
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: ${{inputs.uploaded-binary-name}}
-          path: consul.exe
-      - name: Notify Slack
-        if: ${{ failure() }}
-        run: .github/scripts/notify_slack.sh
diff --git a/.github/workflows/reusable-dev-build.yml b/.github/workflows/reusable-dev-build.yml
index 99bcb96592c3a..2db9670655e46 100644
--- a/.github/workflows/reusable-dev-build.yml
+++ b/.github/workflows/reusable-dev-build.yml
@@ -14,10 +14,6 @@ on:
       repository-name:
         required: true
         type: string
-      branch-name:
-          required: false
-          type: string
-          default: ""
       go-arch:
         required: false
         type: string
@@ -29,15 +25,7 @@ jobs:
   build:
     runs-on: ${{ fromJSON(inputs.runs-on) }}
     steps:
-      # NOTE: This is used for nightly job of building release branch.
-      - name: Checkout branch ${{ inputs.branch-name }}
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          ref: ${{ inputs.branch-name }}
-        if: inputs.branch-name != ''
-      - name: Checkout code
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        if: inputs.branch-name == ''
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
       - name: Setup Git
         if: ${{ endsWith(inputs.repository-name, '-enterprise') }}
diff --git a/.github/workflows/reusable-lint.yml b/.github/workflows/reusable-lint.yml
index 902ff1867144f..f7032f9866633 100644
--- a/.github/workflows/reusable-lint.yml
+++ b/.github/workflows/reusable-lint.yml
@@ -20,7 +20,6 @@ on:
 env:
   GOTAGS: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
   GOARCH: ${{inputs.go-arch}}
-  GOPRIVATE: github.com/hashicorp # Required for enterprise deps
 
 jobs:
   lint:
@@ -34,22 +33,20 @@ jobs:
         - "envoyextensions"
         - "troubleshoot"
         - "test/integration/consul-container"
-        - "test-integ"
-        - "testing/deployer"
       fail-fast: true
     name: lint ${{ matrix.directory }}
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
       # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
       - name: Setup Git
         if: ${{ endsWith(inputs.repository-name, '-enterprise') }}
         run: git config --global url."https://${{ secrets.elevated-github-token }}:@github.com".insteadOf "https://github.com"
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3.5.0
         with:
           go-version-file: 'go.mod'
       - run: go env
       - name: lint-${{ matrix.directory }}
-        uses: golangci/golangci-lint-action@639cd343e1d3b897ff35927a75193d57cfcba299 # v3.6.0
+        uses: golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5 # pin@v3.4.0
         with:
           working-directory: ${{ matrix.directory }}
           version: v1.51.1
diff --git a/.github/workflows/reusable-unit-split.yml b/.github/workflows/reusable-unit-split.yml
index 29c341998dd65..6c13670e742ed 100644
--- a/.github/workflows/reusable-unit-split.yml
+++ b/.github/workflows/reusable-unit-split.yml
@@ -51,7 +51,6 @@ env:
   TOTAL_RUNNERS: ${{inputs.runner-count}}
   CONSUL_LICENSE: ${{secrets.consul-license}}
   GOTAGS: ${{ inputs.go-tags}}
-  GOPRIVATE: github.com/hashicorp # Required for enterprise deps
   DATADOG_API_KEY: ${{secrets.datadog-api-key}}
   
 jobs:
@@ -60,8 +59,8 @@ jobs:
     outputs:
       package-matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+      - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3.5.0
         with:
           go-version-file: 'go.mod'
       - id: set-matrix
@@ -83,12 +82,12 @@ jobs:
           ulimit -Sa
           echo "Hard limits"
           ulimit -Ha   
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
       # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
       - name: Setup Git
         if: ${{ endsWith(inputs.repository-name, '-enterprise') }}
         run: git config --global url."https://${{ secrets.elevated-github-token }}:@github.com".insteadOf "https://github.com"
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3.5.0
         with:
           go-version-file: 'go.mod'
           cache: true
@@ -97,7 +96,7 @@ jobs:
         working-directory: ${{inputs.directory}}
         run: go mod download
       - name: Download consul
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # pin@v3.0.2
         with:
           name: ${{inputs.uploaded-binary-name}}
           path: ${{inputs.directory}} 
@@ -129,7 +128,8 @@ jobs:
           --rerun-fails-report=/tmp/gotestsum-rerun-fails \
           --packages="$PACKAGE_NAMES" \
           --junitfile ${{env.TEST_RESULTS}}/gotestsum-report.xml -- \
-          -tags="${{env.GOTAGS}}" \
+          -tags="${{env.GOTAGS}}" -p 2 \
+          ${GO_TEST_FLAGS-} \
           -cover -coverprofile=coverage.txt
 
       # NOTE: ENT specific step as we store secrets in Vault.
@@ -163,11 +163,11 @@ jobs:
           DD_ENV: ci
         run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" ${{env.TEST_RESULTS}}/gotestsum-report.xml
 
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # pin@v3.1.2
         with:
           name: test-results
           path: ${{env.TEST_RESULTS}}
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # pin@v3.1.2
         with:
           name: jsonfile
           path: /tmp/jsonfile
diff --git a/.github/workflows/reusable-unit.yml b/.github/workflows/reusable-unit.yml
index 42943954475d3..c49a6291fa2e2 100644
--- a/.github/workflows/reusable-unit.yml
+++ b/.github/workflows/reusable-unit.yml
@@ -50,14 +50,13 @@ env:
   GOARCH: ${{inputs.go-arch}}
   CONSUL_LICENSE: ${{secrets.consul-license}}
   GOTAGS: ${{ inputs.go-tags}}
-  GOPRIVATE: github.com/hashicorp # Required for enterprise deps
   DATADOG_API_KEY: ${{secrets.datadog-api-key}}
   
 jobs:
   go-test:
     runs-on: ${{ fromJSON(inputs.runs-on) }}
     steps:      
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
       # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
       - name: Setup Git
         if: ${{ endsWith(inputs.repository-name, '-enterprise') }}
@@ -77,7 +76,7 @@ jobs:
         working-directory: ${{inputs.directory}}
         run: go mod download
       - name: Download consul
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # pin@v3.0.2
         with:
           name: ${{inputs.uploaded-binary-name}}
           path: ${{inputs.directory}}
@@ -142,11 +141,11 @@ jobs:
           DD_ENV: ci
         run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" ${{env.TEST_RESULTS}}/gotestsum-report.xml
 
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # pin@v3.1.2
         with:
           name: test-results
           path: ${{env.TEST_RESULTS}}
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # pin@v3.1.2
         with:
           name: jsonfile
           path: /tmp/jsonfile
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index ff07a961a4e48..a0646a559d693 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 name: stale
 on:
   schedule:
@@ -12,7 +9,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8.0.0
+      - uses: actions/stale@v4
         with:
           days-before-stale: -1
           days-before-close: -1
diff --git a/.github/workflows/test-integrations-windows.yml b/.github/workflows/test-integrations-windows.yml
deleted file mode 100644
index 8ece1ef6c9b7b..0000000000000
--- a/.github/workflows/test-integrations-windows.yml
+++ /dev/null
@@ -1,1211 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-name: test-integrations-windows
-
-on:
-  workflow_dispatch:
-
-env:
-  TEST_RESULTS_DIR: /tmp/test-results
-  TEST_RESULTS_ARTIFACT_NAME: test-results
-  CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
-  GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
-  GOTESTSUM_VERSION: "1.9.0"
-  CONSUL_BINARY_UPLOAD_NAME: consul.exe
-  # strip the hashicorp/ off the front of github.repository for consul
-  CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'consul' }}
-  GOPRIVATE: github.com/hashicorp # Required for enterprise deps
-
-jobs:
-  setup:
-    runs-on: ubuntu-latest
-    name: Setup
-    outputs:
-      compute-small: ${{ steps.runners.outputs.compute-small }}
-      compute-medium: ${{ steps.runners.outputs.compute-medium }}
-      compute-large: ${{ steps.runners.outputs.compute-large }}
-      compute-xl: ${{ steps.runners.outputs.compute-xl }}
-      enterprise: ${{ steps.runners.outputs.enterprise }}
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - id: runners
-        run: .github/scripts/get_runner_classes_windows.sh
-
-  dev-build:
-    uses: ./.github/workflows/reusable-dev-build-windows.yml
-    with:
-      runs-on: ${{ needs.setup.outputs.compute-large }}
-      repository-name: ${{ github.repository }}
-      uploaded-binary-name: 'consul.exe'
-    secrets:
-      elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
-
-  # NOTE: Jobs needs to be added here manually. Jobs when run together on windows fails intermittently.
-  # So they are run independently of each other.
-  envoy-integration-test:
-    needs:
-      - setup
-      - dev-build
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
-    permissions:
-      id-token: write # NOTE: this permission is explicitly required for Vault auth.
-      contents: read
-    strategy:
-      fail-fast: false
-      matrix:
-        envoy-version: [ "1.27.0" ]
-        xds-target: [ "server", "client" ]
-    env:
-      ENVOY_VERSION: ${{ matrix.envoy-version }}
-      XDS_TARGET: ${{ matrix.xds-target }}
-      AWS_LAMBDA_REGION: us-west-2
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
-        with:
-          go-version-file: 'go.mod'
-
-      - name: Fetch binary
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: '${{ env.CONSUL_BINARY_UPLOAD_NAME }}'
-          path: ${{ github.workspace }}
-
-      - name: Create dist folder and copy binary
-        run: |
-          mkdir dist
-          cp ${{ github.workspace }}\consul.exe dist\
-
-      - name: Restore mode+x
-        run: icacls ${{ github.workspace }}\consul.exe /grant:rx Everyone:RX
-
-      - name: Setup TcpDump Docker Image
-        shell: bash
-        run: |
-          cd test/integration/connect/envoy
-          curl -sSL "https://asheshvidyut-bucket.s3.ap-southeast-2.amazonaws.com/tcpdump.exe" -o tcpdump.exe
-          docker build -t envoy-tcpdump -f Dockerfile-tcpdump-windows .
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@2a1a44ac4aa01993040736bd95bb470da1a38365 # v2.9.0
-
-      - name: Docker build consul
-        run: docker build -t windows/consul -f Dockerfile-windows .
-
-      - name: Docker build consul local
-        shell: bash
-        run: cd build-support/windows && ./build-consul-local-images.sh
-
-      - name: Docker build consul dev
-        shell: bash
-        run: cd build-support/windows && ./build-consul-dev-image.sh
-
-      # https://hashicorp.atlassian.net/browse/NET-4973
-      # ^ Ticket to figure out why grouping test case is failing on Windows Machine
-
-#      - name: Envoy Integration Tests for windows case-api-gateway-http-hostnames
-#        shell: bash
-#        if: always()
-#        env:
-#          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-#          GOTESTSUM_FORMAT: standard-verbose
-#          COMPOSE_INTERACTIVE_NO_CLI: 1
-#          LAMBDA_TESTS_ENABLED: "true"
-#          # tput complains if this isn't set to something.
-#          TERM: ansi
-#        run: |
-#          # shellcheck disable=SC2001
-#          echo "Running Integration Test case-api-gateway-http-hostnames"
-#          # shellcheck disable=SC2001
-#          go test -v -timeout=45m -tags integration \
-#            ./test/integration/connect/envoy -run="TestEnvoy/case-api-gateway-http-hostnames" -win=true
-
-      - name: Envoy Integration Tests for windows case-api-gateway-http-simple
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-api-gateway-http-simple"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-api-gateway-http-simple" -win=true
-
-      - name: Envoy Integration Tests for windows case-api-gateway-http-splitter-targets
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-api-gateway-http-splitter-targets"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-api-gateway-http-splitter-targets" -win=true
-
-      - name: Envoy Integration Tests for windows case-api-gateway-http-tls-overlapping-hosts
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-api-gateway-http-tls-overlapping-hosts"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-api-gateway-http-tls-overlapping-hosts" -win=true
-
-      - name: Envoy Integration Tests for windows case-api-gateway-tcp-conflicted
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-api-gateway-tcp-conflicted"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-api-gateway-tcp-conflicted" -win=true
-
-      - name: Envoy Integration Tests for windows case-api-gateway-tcp-simple
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-api-gateway-tcp-simple"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-api-gateway-tcp-simple" -win=true
-
-      - name: Envoy Integration Tests for windows case-api-gateway-tcp-tls-overlapping-hosts
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-api-gateway-tcp-tls-overlapping-hosts"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-api-gateway-tcp-tls-overlapping-hosts" -win=true
-
-      - name: Envoy Integration Tests for windows case-badauthz
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-badauthz"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-badauthz" -win=true
-
-      - name: Envoy Integration Tests for windows case-basic
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-basic"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-basic" -win=true
-
-      - name: Envoy Integration Tests for windows case-centralconf
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-centralconf"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-centralconf" -win=true
-
-      - name: Envoy Integration Tests for windows case-cfg-resolver-cluster-peering-failover
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cfg-resolver-cluster-peering-failover"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-cluster-peering-failover" -win=true
-
-      - name: Envoy Integration Tests for windows case-cfg-resolver-dc-failover-gateways-none
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cfg-resolver-dc-failover-gateways-none"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-dc-failover-gateways-none" -win=true
-
-      - name: Envoy Integration Tests for windows case-cfg-resolver-dc-failover-gateways-remote
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cfg-resolver-dc-failover-gateways-remote"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-dc-failover-gateways-remote" -win=true
-
-      - name: Envoy Integration Tests for windows case-cfg-resolver-defaultsubset
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cfg-resolver-defaultsubset"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-defaultsubset" -win=true
-
-      - name: Envoy Integration Tests for windows case-cfg-resolver-features
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cfg-resolver-features"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-features" -win=true
-
-      - name: Envoy Integration Tests for windows case-cfg-resolver-subset-onlypassing
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cfg-resolver-subset-onlypassing"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-subset-onlypassing" -win=true
-
-      - name: Envoy Integration Tests for windows case-cfg-resolver-subset-redirect
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cfg-resolver-subset-redirect"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-subset-redirect" -win=true
-
-      - name: Envoy Integration Tests for windows case-cfg-resolver-svc-failover
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cfg-resolver-svc-failover"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-failover" -win=true
-
-      - name: Envoy Integration Tests for windows case-cfg-resolver-svc-redirect-http
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cfg-resolver-svc-redirect-http"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-redirect-http" -win=true
-
-      - name: Envoy Integration Tests for windows case-cfg-resolver-svc-redirect-tcp
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cfg-resolver-svc-redirect-tcp"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-resolver-svc-redirect-tcp" -win=true
-
-      - name: Envoy Integration Tests for windows case-cfg-router-features
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cfg-router-features"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-router-features" -win=true
-
-      - name: Envoy Integration Tests for windows case-cfg-splitter-cluster-peering
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cfg-splitter-cluster-peering"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-splitter-cluster-peering" -win=true
-
-      - name: Envoy Integration Tests for windows case-cfg-splitter-features
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cfg-splitter-features"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-splitter-features" -win=true
-
-      - name: Envoy Integration Tests for windows case-cfg-splitter-peering-ingress-gateways
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cfg-splitter-peering-ingress-gateways"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cfg-splitter-peering-ingress-gateways" -win=true
-
-      # This test runs fine on windows machine but fails on CI
-      # Task to be picked later on - https://hashicorp.atlassian.net/browse/NET-4972
-      # - name: Envoy Integration Tests for windows case-consul-exec
-      #     if: always()
-      #     shell: bash
-      #     env:
-      #       GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-      #       GOTESTSUM_FORMAT: standard-verbose
-      #       COMPOSE_INTERACTIVE_NO_CLI: 1
-      #       LAMBDA_TESTS_ENABLED: "true"
-      #       # tput complains if this isn't set to something.
-      #       TERM: ansi
-      #      run: |
-      #        #shellcheck disable=SC2001
-      #        echo "Running Integration Test case-consul-exec"
-      #        # shellcheck disable=SC2001
-      #        go test -v -timeout=45m -tags integration \
-      #            ./test/integration/connect/envoy -run="TestEnvoy/case-consul-exec" -win=true
-
-      - name: Envoy Integration Tests for windows case-cross-peer-control-plane-mgw
-        if: always()
-        shell: bash
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cross-peer-control-plane-mgw"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cross-peer-control-plane-mgw" -win=true
-
-      - name: Envoy Integration Tests for windows case-cross-peers
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cross-peers"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cross-peers" -win=true
-
-      - name: Envoy Integration Tests for windows case-cross-peers-http
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cross-peers-http"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cross-peers-http" -win=true
-
-      - name: Envoy Integration Tests for windows case-cross-peers-http-router
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cross-peers-http-router"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cross-peers-http-router" -win=true
-
-      - name: Envoy Integration Tests for windows case-cross-peers-resolver-redirect-tcp
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-cross-peers-resolver-redirect-tcp"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-cross-peers-resolver-redirect-tcp" -win=true
-
-      - name: Envoy Integration Tests for windows case-dogstatsd-udp
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-dogstatsd-udp"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-dogstatsd-udp" -win=true
-
-      - name: Envoy Integration Tests for windows case-envoyext-ratelimit
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-envoyext-ratelimit"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-envoyext-ratelimit" -win=true
-
-      - name: Envoy Integration Tests for windows case-expose-checks
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-expose-checks"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-expose-checks" -win=true
-
-      - name: Envoy Integration Tests for windows case-gateway-without-services
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-gateway-without-services"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-gateway-without-services" -win=true
-
-      - name: Envoy Integration Tests for windows case-gateways-local
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-gateways-local"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-gateways-local" -win=true
-
-      - name: Envoy Integration Tests for windows case-gateways-remote
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-gateways-remote"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-gateways-remote" -win=true
-
-      - name: Envoy Integration Tests for windows case-grpc
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-grpc"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-grpc" -win=true
-
-      - name: Envoy Integration Tests for windows case-http
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-http"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-http" -win=true
-
-      - name: Envoy Integration Tests for windows case-http-badauthz
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-http-badauthz"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-http-badauthz" -win=true
-
-      - name: Envoy Integration Tests for windows case-ingress-gateway-grpc
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-ingress-gateway-grpc"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-grpc" -win=true
-
-      - name: Envoy Integration Tests for windows case-ingress-gateway-http
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-ingress-gateway-http"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-http" -win=true
-
-      - name: Envoy Integration Tests for windows case-ingress-gateway-multiple-services
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-ingress-gateway-multiple-services"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-multiple-services" -win=true
-
-      - name: Envoy Integration Tests for windows case-ingress-gateway-peering-failover
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-ingress-gateway-peering-failover"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-peering-failover" -win=true
-
-      - name: Envoy Integration Tests for windows case-ingress-gateway-simple
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-ingress-gateway-simple"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-simple" -win=true
-
-      - name: Envoy Integration Tests for windows case-ingress-mesh-gateways-resolver
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-ingress-mesh-gateways-resolver"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-mesh-gateways-resolver" -win=true
-
-      - name: Envoy Integration Tests for windows case-l7-intentions
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-l7-intentions"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-l7-intentions" -win=true
-
-      - name: Envoy Integration Tests for windows case-multidc-rsa-ca
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-multidc-rsa-ca"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-multidc-rsa-ca" -win=true
-
-      - name: Envoy Integration Tests for windows case-prometheus
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-prometheus"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-prometheus" -win=true
-
-      - name: Envoy Integration Tests for windows case-property-override
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-property-override"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-property-override" -win=true
-
-      - name: Envoy Integration Tests for windows case-stats-proxy
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-stats-proxy"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-stats-proxy" -win=true
-
-      - name: Envoy Integration Tests for windows case-statsd-udp
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-statsd-udp"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-statsd-udp" -win=true
-
-      - name: Envoy Integration Tests for windows case-terminating-gateway-hostnames
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-terminating-gateway-hostnames"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-hostnames" -win=true
-
-      - name: Envoy Integration Tests for windows case-terminating-gateway-simple
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-terminating-gateway-simple"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-simple" -win=true
-
-      - name: Envoy Integration Tests for windows case-terminating-gateway-without-services
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-terminating-gateway-without-services"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-without-services" -win=true
-
-      - name: Envoy Integration Tests for windows case-upstream-config
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-upstream-config"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-upstream-config" -win=true
-
-      - name: Envoy Integration Tests for windows case-wanfed-gw
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-wanfed-gw"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-wanfed-gw" -win=true
-
-      - name: Envoy Integration Tests for windows case-ingress-gateway-sds
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-ingress-gateway-sds"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-sds" -win=true
-
-      - name: Envoy Integration Tests for windows case-lua
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-lua"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-lua" -win=true
-
-      - name: Envoy Integration Tests for windows case-terminating-gateway-subsets
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-terminating-gateway-subsets"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-terminating-gateway-subsets" -win=true
-
-      #      Skipping this because - https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/wasm_filter
-      #      - name: Envoy Integration Tests for windows case-wasm
-      #        shell: bash
-      #        env:
-      #          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-      #          GOTESTSUM_FORMAT: standard-verbose
-      #          COMPOSE_INTERACTIVE_NO_CLI: 1
-      #          LAMBDA_TESTS_ENABLED: "true"
-      #          # tput complains if this isn't set to something.
-      #          TERM: ansi
-      #        run: |
-      #          # shellcheck disable=SC2001
-      #          echo "Running Integration Test case-wasm"
-      #          # shellcheck disable=SC2001
-      #          go test -v -timeout=45m -tags integration \
-      #            ./test/integration/connect/envoy -run="TestEnvoy/case-wasm" -win=true
-
-      #     Skipping because of - cacert is not available in curl windows
-      #     https://www.phillipsj.net/posts/windows-curl-and-self-signed-certs/
-      #      - name: Envoy Integration Tests for windows case-ingress-gateway-tls
-      #        shell: bash
-      #        if: always()
-      #        env:
-      #          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-      #          GOTESTSUM_FORMAT: standard-verbose
-      #          COMPOSE_INTERACTIVE_NO_CLI: 1
-      #          LAMBDA_TESTS_ENABLED: "true"
-      #          # tput complains if this isn't set to something.
-      #          TERM: ansi
-      #        run: |
-      #          # shellcheck disable=SC2001
-      #          echo "Running Integration Test case-ingress-gateway-tls"
-      #          # shellcheck disable=SC2001
-      #          go test -v -timeout=45m -tags integration \
-      #            ./test/integration/connect/envoy -run="TestEnvoy/case-ingress-gateway-tls" -win=true
-
-      - name: Envoy Integration Tests for windows case-mesh-to-lambda
-        shell: bash
-        if: always()
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          COMPOSE_INTERACTIVE_NO_CLI: 1
-          LAMBDA_TESTS_ENABLED: "true"
-          # tput complains if this isn't set to something.
-          TERM: ansi
-        run: |
-          # shellcheck disable=SC2001
-          echo "Running Integration Test case-mesh-to-lambda"
-          # shellcheck disable=SC2001
-          go test -v -timeout=45m -tags integration \
-            ./test/integration/connect/envoy -run="TestEnvoy/case-mesh-to-lambda" -win=true
-
-
-        # NOTE: ENT specific step as we store secrets in Vault.
-      - name: Authenticate to Vault
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        id: vault-auth
-        run: vault-auth
-
-      # NOTE: ENT specific step as we store secrets in Vault.
-      - name: Fetch Secrets
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        id: secrets
-        uses: hashicorp/vault-action@v2.5.0
-        with:
-          url: ${{ steps.vault-auth.outputs.addr }}
-          caCertificate: ${{ steps.vault-auth.outputs.ca_certificate }}
-          token: ${{ steps.vault-auth.outputs.token }}
-          secrets: |
-            kv/data/github/${{ github.repository }}/datadog apikey | DATADOG_API_KEY;
-
-      - name: Prepare datadog-ci
-        shell: bash
-        if: ${{ !endsWith(github.repository, '-enterprise') }}
-        run: |
-          curl -L --fail "https://github.com/DataDog/datadog-ci/releases/download/v2.17.2/datadog-ci_win-x64.exe" --output "C:/datadog-ci"
-          icacls C:/datadog-ci /grant:rx Everyone:RX
-
-      - name: Upload coverage
-        # do not run on forks
-        if: github.event.pull_request.head.repo.full_name == github.repository
-        env:
-          DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}"
-          DD_ENV: ci
-        run: C:/datadog-ci junit upload --service "$GITHUB_REPOSITORY" $TEST_RESULTS_DIR/results.xml
-
-  test-integrations-success:
-    needs:
-      - envoy-integration-test
-    runs-on: 'ubuntu-latest'
-    if: ${{ always() }}
-    steps:
-      - name: evaluate upstream job results
-        run: |
-          # exit 1 if failure or cancelled result for any upstream job
-          if printf '${{ toJSON(needs) }}' | grep -E -i '\"result\": \"(failure|cancelled)\"'; then
-            printf "Tests failed or workflow cancelled:\n\n${{ toJSON(needs) }}"
-            exit 1
-          fi
diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml
index 28dcf701fdf13..4bc6319da39f7 100644
--- a/.github/workflows/test-integrations.yml
+++ b/.github/workflows/test-integrations.yml
@@ -32,14 +32,14 @@ concurrency:
 
 jobs:
   conditional-skip:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest 
     name: Get files changed and conditionally skip CI
     outputs:
       skip-ci: ${{ steps.read-files.outputs.skip-ci }}
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
         with:
-          fetch-depth: 0
+          fetch-depth: 0  
       - name: Get changed files
         id: read-files
         run: ./.github/scripts/filter_changed_files_go_test.sh
@@ -56,7 +56,7 @@ jobs:
       compute-xl: ${{ steps.runners.outputs.compute-xl }}
       enterprise: ${{ steps.runners.outputs.enterprise }}
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0
       - id: runners
         run: .github/scripts/get_runner_classes.sh
 
@@ -80,16 +80,16 @@ jobs:
       contents: read
     strategy:
       matrix:
-        nomad-version: ['v1.6.1', 'v1.5.8', 'v1.4.12']
+        nomad-version: ['v1.3.3', 'v1.2.10', 'v1.1.16']
     steps:
       - name: Checkout Nomad
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0
         with:
           repository: hashicorp/nomad
           ref: ${{ matrix.nomad-version }}
 
       - name: Install Go
-        uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
         with:
           go-version-file: 'go.mod'
 
@@ -116,7 +116,7 @@ jobs:
             --packages="./command/agent/consul" \
             --junitfile $TEST_RESULTS_DIR/results.xml -- \
             -run TestConsul
-
+      
       # NOTE: ENT specific step as we store secrets in Vault.
       - name: Authenticate to Vault
         if: ${{ endsWith(github.repository, '-enterprise') }}
@@ -159,18 +159,18 @@ jobs:
       contents: read
     strategy:
       matrix:
-        vault-version: ["1.14.1", "1.13.5", "1.12.9", "1.11.12"]
+        vault-version: ["1.13.1", "1.12.5", "1.11.9", "1.10.11"]
     env:
       VAULT_BINARY_VERSION: ${{ matrix.vault-version }}
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0
 
       # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
       - name: Setup Git
         if: ${{ endsWith(github.repository, '-enterprise') }}
         run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
 
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
         with:
           go-version-file: 'go.mod'
 
@@ -253,16 +253,16 @@ jobs:
     outputs:
       envoy-matrix: ${{ steps.set-matrix.outputs.envoy-matrix }}
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0
       - name: Generate Envoy Job Matrix
         id: set-matrix
         env:
-          # this is further going to multiplied in envoy-integration tests by the
+          # this is further going to multiplied in envoy-integration tests by the 
           # other dimensions in the matrix.  Currently TOTAL_RUNNERS would be
           # multiplied by 8 based on these values:
-          # envoy-version: ["1.24.10", "1.25.9", "1.26.4", "1.27.0"]
+          # envoy-version: ["1.22.11", "1.23.12", "1.24.10", "1.25.9"]
           # xds-target: ["server", "client"]
-          TOTAL_RUNNERS: 4
+          TOTAL_RUNNERS: 4 
           JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
         run: |
           NUM_RUNNERS=$TOTAL_RUNNERS
@@ -281,7 +281,7 @@ jobs:
               | jq --raw-input --argjson runnercount "$NUM_RUNNERS" "$JQ_SLICER" \
               | jq --compact-output 'map(join("|"))'
           } >> "$GITHUB_OUTPUT"
-
+  
   envoy-integration-test:
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
     needs:
@@ -294,7 +294,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        envoy-version: ["1.27.0"]
+        envoy-version: ["1.25.9"]
         xds-target: ["server", "client"]
         test-cases: ${{ fromJSON(needs.generate-envoy-job-matrices.outputs.envoy-matrix) }}
     env:
@@ -302,8 +302,8 @@ jobs:
       XDS_TARGET: ${{ matrix.xds-target }}
       AWS_LAMBDA_REGION: us-west-2
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      - uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0
+      - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
         with:
           go-version-file: 'go.mod'
 
@@ -316,7 +316,7 @@ jobs:
         run: chmod +x ./bin/consul
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@2a1a44ac4aa01993040736bd95bb470da1a38365 # v2.9.0
+        uses: docker/setup-buildx-action@f03ac48505955848960e80bbb68046aa35c7b9e7 # v2.4.1
 
       - name: Docker build
         run: docker build -t consul:local -f ./build-support/docker/Consul-Dev.dockerfile ./bin
@@ -375,7 +375,7 @@ jobs:
         run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" $TEST_RESULTS_DIR/results.xml
 
   compatibility-integration-test:
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-xl) }} # NOTE: do not change without tuning the -p and -parallel flags in go test.
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
     needs:
       - setup
       - dev-build
@@ -384,14 +384,9 @@ jobs:
       contents: read
     env:
       ENVOY_VERSION: "1.25.4"
-      CONSUL_DATAPLANE_IMAGE: "docker.io/hashicorppreview/consul-dataplane:1.3-dev-ubi"
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
-      - name: Setup Git
-        if: ${{ endsWith(github.repository, '-enterprise') }}
-        run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      - uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0
+      - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
         with:
           go-version-file: 'go.mod'
       - run: go env
@@ -409,15 +404,6 @@ jobs:
       # Build the consul:local image from the already built binary
       - name: Build consul:local image
         run: docker build -t ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local -f ./build-support/docker/Consul-Dev.dockerfile .
-      - name: Build consul-envoy:target-version image
-        id: buildConsulEnvoyImage
-        continue-on-error: true
-        run: docker build -t consul-envoy:target-version --build-arg CONSUL_IMAGE=${{ env.CONSUL_LATEST_IMAGE_NAME }}:local --build-arg ENVOY_VERSION=${{ env.ENVOY_VERSION }} -f ./test/integration/consul-container/assets/Dockerfile-consul-envoy ./test/integration/consul-container/assets
-      - name: Retry Build consul-envoy:target-version image
-        if: steps.buildConsulEnvoyImage.outcome == 'failure'
-        run: docker build -t consul-envoy:target-version --build-arg CONSUL_IMAGE=${{ env.CONSUL_LATEST_IMAGE_NAME }}:local --build-arg ENVOY_VERSION=${{ env.ENVOY_VERSION }} -f ./test/integration/consul-container/assets/Dockerfile-consul-envoy ./test/integration/consul-container/assets
-      - name: Build consul-dataplane:local image
-        run: docker build -t consul-dataplane:local --build-arg CONSUL_IMAGE=${{ env.CONSUL_LATEST_IMAGE_NAME }}:local --build-arg CONSUL_DATAPLANE_IMAGE=${{ env.CONSUL_DATAPLANE_IMAGE }} -f ./test/integration/consul-container/assets/Dockerfile-consul-dataplane ./test/integration/consul-container/assets
       - name: Configure GH workaround for ipv6 loopback
         if: ${{ !endsWith(github.repository, '-enterprise') }}
         run: |
@@ -431,7 +417,7 @@ jobs:
             docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
             go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
               --raw-command \
-              --format=pkgname-and-test-fails \
+              --format=standard-verbose \
               --debug \
               --rerun-fails=3 \
               -- \
@@ -441,7 +427,7 @@ jobs:
               -tags "${{ env.GOTAGS }}" \
               -timeout=30m \
               -json \
-              `go list -tags "${{ env.GOTAGS }}" ./... | grep -v upgrade | grep -v peering_commontopo` \
+              `go list ./... | grep -v upgrade` \
               --target-image ${{ env.CONSUL_LATEST_IMAGE_NAME }} \
               --target-version local \
               --latest-image docker.mirror.hashicorp.services/${{ env.CONSUL_LATEST_IMAGE_NAME }} \
@@ -487,9 +473,8 @@ jobs:
           DD_ENV: ci
         run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" $TEST_RESULTS_DIR/results.xml
 
-
   test-integrations-success:
-    needs:
+    needs: 
     - conditional-skip
     - setup
     - dev-build
diff --git a/.github/workflows/test-link-rewrites.yml b/.github/workflows/test-link-rewrites.yml
new file mode 100644
index 0000000000000..b189c6d79cadf
--- /dev/null
+++ b/.github/workflows/test-link-rewrites.yml
@@ -0,0 +1,16 @@
+name: Test Link Rewrites
+
+on: [deployment_status]
+
+jobs:
+  test-link-rewrites:
+    if: github.event.deployment_status.state == 'success'
+    uses: hashicorp/dev-portal/.github/workflows/docs-content-link-rewrites-e2e.yml@2aceb60125f6c15f4c8dbe2e4d79148047bfa437
+    with:
+      repo-owner: "hashicorp"
+      repo-name: "consul"
+      commit-sha: ${{ github.sha }}
+      main-branch-preview-url: "https://consul-git-main-hashicorp.vercel.app/"
+      # Workflow is only intended to run for one single migration PR
+      # This variable does not need to be updated
+      pr-branch-preview-url: "https://consul-git-docs-ambmigrate-link-formats-hashicorp.vercel.app/"
diff --git a/.github/workflows/verify-envoy-version.yml b/.github/workflows/verify-envoy-version.yml
index 9e8b7e7e89b36..d097e335d37b2 100644
--- a/.github/workflows/verify-envoy-version.yml
+++ b/.github/workflows/verify-envoy-version.yml
@@ -18,7 +18,7 @@ jobs:
   verify-envoy-version:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0 # by default the checkout action doesn't checkout all branches
diff --git a/.github/workflows/website-checker.yml b/.github/workflows/website-checker.yml
new file mode 100644
index 0000000000000..e5d628235dd9e
--- /dev/null
+++ b/.github/workflows/website-checker.yml
@@ -0,0 +1,51 @@
+# The outline of this workflow is something that the GitHub Security team warns against
+# here: https://securitylab.github.com/research/github-actions-preventing-pwn-requests. But
+# due to this workflow only running a git diff check and not building or publishing anything,
+# there is no harm in checking out the PR HEAD code.
+#
+# All the code checked out in this workflow should be considered untrusted. This workflow must
+# never call any makefiles or scripts. It must never be changed to run any code from the checkout.
+
+# This workflow posts a message to a PR to remind maintainers that there are website/ changes
+# in the PR and if they need to be cherry-picked to the stable-website branch, the
+# 'type/docs-cherrypick' label needs to be applied.
+
+name: Website Checker
+
+on:
+  pull_request_target:
+    types: [opened]
+    # Runs on PRs to main and all release branches
+    branches:
+      - main
+      - release/*
+
+jobs:
+  # checks that a 'type/docs-cherrypick' label is attached to PRs with website/ changes
+  website-check:
+    # If there's already a `type/docs-cherrypick` label or an explicit `pr/no-docs` label, we ignore this check 
+    if: >-
+      !contains(github.event.pull_request.labels.*.name, 'type/docs-cherrypick') &&
+      !contains(github.event.pull_request.labels.*.name, 'pr/no-docs')
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0 # by default the checkout action doesn't checkout all branches
+      - name: Check for website/ dir change in diff
+        run: |
+          # check if there is a diff in the website/ directory
+          website_files=$(git --no-pager diff --name-only HEAD "$(git merge-base HEAD "origin/${{ github.event.pull_request.base.ref }}")" -- website/)
+
+          # If we find changed files in the website/ directory, we post a comment to the PR
+          if [ -n "$website_files" ]; then
+            # post PR comment to GitHub to check if a 'type/docs-cherrypick' label needs to be applied to the PR
+            echo "website-check: Did not find a 'type/docs-cherrypick' label, posting a reminder in the PR"
+            github_message="🤔 This PR has changes in the \`website/\` directory but does not have a \`type/docs-cherrypick\` label. If the changes are for the next version, this can be ignored. If they are updates to current docs, attach the label to auto cherrypick to the \`stable-website\` branch after merging."
+            curl -s -H "Authorization: token ${{ secrets.PR_COMMENT_TOKEN }}" \
+                -X POST \
+                -d "{ \"body\": \"${github_message}\"}" \
+                "https://api.github.com/repos/${GITHUB_REPOSITORY}/issues/${{ github.event.pull_request.number }}/comments"
+          fi
diff --git a/.gitignore b/.gitignore
index 793354db02d52..9bb786209cbd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@
 .vagrant/
 /pkg
 bin/
-workdir/
 changelog.tmp
 exit-code
 Thumbs.db
@@ -67,6 +66,3 @@ override.tf.json
 # Ignore CLI configuration files
 .terraformrc
 terraform.rc
-/go.work
-/go.work.sum
-.docker
diff --git a/.golangci.yml b/.golangci.yml
index 0d426b34cd024..69e8f43a1cecd 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,5 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
+# SPDX-License-Identifier: MPL-2.0
 
 linters:
   disable-all: true
@@ -28,11 +28,6 @@ issues:
     - linters: [staticcheck]
       text: 'SA1019: "io/ioutil" has been deprecated since Go 1.16'
 
-    # Allow usage of deprecated values.
-    - linters: [ staticcheck ]
-      text: 'SA1019:'
-      path: "(agent/grpc-external)"
-
     # An argument that always receives the same value is often not a problem.
     - linters: [unparam]
       text: "always receives"
@@ -93,9 +88,6 @@ linters-settings:
         - github.com/hashicorp/go-msgpack:
             recommendations:
               - github.com/hashicorp/consul-net-rpc/go-msgpack
-        - github.com/golang/protobuf:
-            recommendations:
-              - google.golang.org/protobuf
 
   depguard:
     list-type: denylist
@@ -109,9 +101,7 @@ linters-settings:
     # Default: []
     packages-with-error-message:
       - net/rpc: "only use forked copy in github.com/hashicorp/consul-net-rpc/net/rpc"
-      - github.com/golang/protobuf: "only use google.golang.org/protobuf"
 
 run:
   timeout: 10m
   concurrency: 4
-  skip-dirs-use-default: false
diff --git a/.release/ci.hcl b/.release/ci.hcl
index d11983b460574..25f64e4c6b782 100644
--- a/.release/ci.hcl
+++ b/.release/ci.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 schema = "1"
 
 project "consul" {
@@ -132,9 +129,21 @@ event "post-publish-website" {
     on = "always"
   }
 }
+event "bump-version" {
+  depends = ["post-publish-website"]
+  action "bump-version" {
+    organization = "hashicorp"
+    repository = "crt-workflows-common"
+    workflow = "bump-version"
+  }
+
+  notification {
+    on = "fail"
+  }
+}
 
 event "update-ironbank" {
-  depends = ["post-publish-website"]
+  depends = ["bump-version"]
   action "update-ironbank" {
     organization = "hashicorp"
     repository = "crt-workflows-common"
diff --git a/.release/docker/docker-entrypoint-ubi.sh b/.release/docker/docker-entrypoint-ubi.sh
index 96e70df925672..6ce389b274222 100755
--- a/.release/docker/docker-entrypoint-ubi.sh
+++ b/.release/docker/docker-entrypoint-ubi.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/dumb-init /bin/sh
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 set -e
 
 # Note above that we run dumb-init as PID 1 in order to reap zombie processes
diff --git a/.release/docker/docker-entrypoint-windows.sh b/.release/docker/docker-entrypoint-windows.sh
deleted file mode 100644
index f6aac9afaeca7..0000000000000
--- a/.release/docker/docker-entrypoint-windows.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/dumb-init /bin/sh
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-set -e
-
-# Note above that we run dumb-init as PID 1 in order to reap zombie processes
-# as well as forward signals to all processes in its session. Normally, sh
-# wouldn't do either of these functions so we'd leak zombies as well as do
-# unclean termination of all our sub-processes.
-# As of docker 1.13, using docker run --init achieves the same outcome.
-
-# You can set CONSUL_BIND_INTERFACE to the name of the interface you'd like to
-# bind to and this will look up the IP and pass the proper -bind= option along
-# to Consul.
-CONSUL_BIND=
-if [ -n "$CONSUL_BIND_INTERFACE" ]; then
-  CONSUL_BIND_ADDRESS=$(ip -o -4 addr list $CONSUL_BIND_INTERFACE | head -n1 | awk '{print $4}' | cut -d/ -f1)
-  if [ -z "$CONSUL_BIND_ADDRESS" ]; then
-    echo "Could not find IP for interface '$CONSUL_BIND_INTERFACE', exiting"
-    exit 1
-  fi
-
-  CONSUL_BIND="-bind=$CONSUL_BIND_ADDRESS"
-  echo "==> Found address '$CONSUL_BIND_ADDRESS' for interface '$CONSUL_BIND_INTERFACE', setting bind option..."
-fi
-
-# You can set CONSUL_CLIENT_INTERFACE to the name of the interface you'd like to
-# bind client intefaces (HTTP, DNS, and RPC) to and this will look up the IP and
-# pass the proper -client= option along to Consul.
-CONSUL_CLIENT=
-if [ -n "$CONSUL_CLIENT_INTERFACE" ]; then
-  CONSUL_CLIENT_ADDRESS=$(ip -o -4 addr list $CONSUL_CLIENT_INTERFACE | head -n1 | awk '{print $4}' | cut -d/ -f1)
-  if [ -z "$CONSUL_CLIENT_ADDRESS" ]; then
-    echo "Could not find IP for interface '$CONSUL_CLIENT_INTERFACE', exiting"
-    exit 1
-  fi
-
-  CONSUL_CLIENT="-client=$CONSUL_CLIENT_ADDRESS"
-  echo "==> Found address '$CONSUL_CLIENT_ADDRESS' for interface '$CONSUL_CLIENT_INTERFACE', setting client option..."
-fi
-
-# CONSUL_DATA_DIR is exposed as a volume for possible persistent storage. The
-# CONSUL_CONFIG_DIR isn't exposed as a volume but you can compose additional
-# config files in there if you use this image as a base, or use CONSUL_LOCAL_CONFIG
-# below.
-CONSUL_DATA_DIR=C:\\consul\\data
-CONSUL_CONFIG_DIR=C:\\consul\\config
-
-# You can also set the CONSUL_LOCAL_CONFIG environemnt variable to pass some
-# Consul configuration JSON without having to bind any volumes.
-if [ -n "$CONSUL_LOCAL_CONFIG" ]; then
-	echo "$CONSUL_LOCAL_CONFIG" > "$CONSUL_CONFIG_DIR/local.json"
-fi
-
-# If the user is trying to run Consul directly with some arguments, then
-# pass them to Consul.
-if [ "${1:0:1}" = '-' ]; then
-    set -- consul "$@"
-fi
-
-# Look for Consul subcommands.
-if [ "$1" = 'agent' ]; then
-    shift
-    set -- consul agent \
-        -data-dir="$CONSUL_DATA_DIR" \
-        -config-dir="$CONSUL_CONFIG_DIR" \
-        $CONSUL_BIND \
-        $CONSUL_CLIENT \
-        "$@"
-elif [ "$1" = 'version' ]; then
-    # This needs a special case because there's no help output.
-    set -- consul "$@"
-elif consul --help "$1" 2>&1 | grep -q "consul $1"; then
-    # We can't use the return code to check for the existence of a subcommand, so
-    # we have to use grep to look for a pattern in the help output.
-    set -- consul "$@"
-fi
-
-# NOTE: Unlike in the regular Consul Docker image, we don't have code here
-# for changing data-dir directory ownership or using su-exec because OpenShift
-# won't run this container as root and so we can't change data dir ownership,
-# and there's no need to use su-exec.
-
-exec "$@"
\ No newline at end of file
diff --git a/.release/docker/docker-entrypoint.sh b/.release/docker/docker-entrypoint.sh
index a544809643e00..fe91711c6eb0c 100755
--- a/.release/docker/docker-entrypoint.sh
+++ b/.release/docker/docker-entrypoint.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/dumb-init /bin/sh
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 set -e
 
 # Note above that we run dumb-init as PID 1 in order to reap zombie processes
diff --git a/.release/linux/package/etc/consul.d/consul.hcl b/.release/linux/package/etc/consul.d/consul.hcl
index b25f186858564..a064e95af7704 100644
--- a/.release/linux/package/etc/consul.d/consul.hcl
+++ b/.release/linux/package/etc/consul.d/consul.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # Full configuration options can be found at https://www.consul.io/docs/agent/config
 
 # datacenter
diff --git a/.release/release-metadata.hcl b/.release/release-metadata.hcl
index 963192fc4b80e..fedd5c53f9f33 100644
--- a/.release/release-metadata.hcl
+++ b/.release/release-metadata.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 url_docker_registry_dockerhub = "https://hub.docker.com/r/hashicorp/consul"
 url_docker_registry_ecr = "https://gallery.ecr.aws/hashicorp/consul"
 url_license = "https://github.com/hashicorp/consul/blob/main/LICENSE"
diff --git a/.release/security-scan.hcl b/.release/security-scan.hcl
index 0dd5116c6ecef..97124dd4eb324 100644
--- a/.release/security-scan.hcl
+++ b/.release/security-scan.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 container {
 	dependencies = true
 	alpine_secdb = false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f72f27cb912dd..eff8d697d00d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,40 +1,3 @@
-## 1.16.2 (September 19, 2023)
-
-SECURITY:
-
-* Upgrade to use Go 1.20.8. This resolves CVEs
-[CVE-2023-39320](https://github.com/advisories/GHSA-rxv8-v965-v333) (`cmd/go`),
-[CVE-2023-39318](https://github.com/advisories/GHSA-vq7j-gx56-rxjh) (`html/template`),
-[CVE-2023-39319](https://github.com/advisories/GHSA-vv9m-32rr-3g55) (`html/template`),
-[CVE-2023-39321](https://github.com/advisories/GHSA-9v7r-x7cv-v437) (`crypto/tls`), and
-[CVE-2023-39322](https://github.com/advisories/GHSA-892h-r6cr-53g4) (`crypto/tls`) [[GH-18742](https://github.com/hashicorp/consul/issues/18742)]
-
-IMPROVEMENTS:
-
-* Adds flag -append-filename (which works on values version, dc, node and status) to consul snapshot save command.
-Adding the flag -append-filename version,dc,node,status will add consul version, consul datacenter, node name and leader/follower
-(status) in the file name given in the snapshot save command before the file extension. [[GH-18625](https://github.com/hashicorp/consul/issues/18625)]
-* Reduce the frequency of metric exports from Consul to HCP from every 10s to every 1m [[GH-18584](https://github.com/hashicorp/consul/issues/18584)]
-* api: Add support for listing ACL tokens by service name. [[GH-18667](https://github.com/hashicorp/consul/issues/18667)]
-* checks: It is now possible to configure agent TCP checks to use TLS with
-optional server SNI and mutual authentication. To use TLS with a TCP check, the
-check must enable the `tcp_use_tls` boolean. By default the agent will use the
-TLS configuration in the `tls.default` stanza. [[GH-18381](https://github.com/hashicorp/consul/issues/18381)]
-* command: Adds -since flag in consul debug command which internally calls hcdiag for debug information in the past. [[GH-18797](https://github.com/hashicorp/consul/issues/18797)]
-* log: Currently consul logs files like this consul-{timestamp}.log. This change makes sure that there is always
-consul.log file with the latest logs in it. [[GH-18617](https://github.com/hashicorp/consul/issues/18617)]
-
-BUG FIXES:
-
-* Inherit locality from services when registering sidecar proxies. [[GH-18437](https://github.com/hashicorp/consul/issues/18437)]
-* UI : Nodes list view was breaking for synthetic-nodes. Fix handles non existence of consul-version meta for node. [[GH-18464](https://github.com/hashicorp/consul/issues/18464)]
-* api: Fix `/v1/agent/self` not returning latest configuration [[GH-18681](https://github.com/hashicorp/consul/issues/18681)]
-* ca: Vault provider now cleans up the previous Vault issuer and key when generating a new leaf signing certificate [[GH-18779](https://github.com/hashicorp/consul/issues/18779)] [[GH-18773](https://github.com/hashicorp/consul/issues/18773)]
-* check: prevent go routine leakage when existing Defercheck of same check id is not nil [[GH-18558](https://github.com/hashicorp/consul/issues/18558)]
-* connect: Fix issue where Envoy endpoints would not populate correctly after a snapshot restore. [[GH-18636](https://github.com/hashicorp/consul/issues/18636)]
-* gateways: Fix a bug where gateway to service mappings weren't being cleaned up properly when externally registered proxies were being deregistered. [[GH-18831](https://github.com/hashicorp/consul/issues/18831)]
-* telemetry: emit consul version metric on a regular interval. [[GH-18724](https://github.com/hashicorp/consul/issues/18724)]
-
 ## 1.15.6 (September 19, 2023)
 
 SECURITY:
@@ -65,97 +28,6 @@ BUG FIXES:
 * gateways: Fix a bug where gateway to service mappings weren't being cleaned up properly when externally registered proxies were being deregistered. [[GH-18831](https://github.com/hashicorp/consul/issues/18831)]
 * telemetry: emit consul version metric on a regular interval. [[GH-18724](https://github.com/hashicorp/consul/issues/18724)]
 
-## 1.14.10 (September 19, 2023)
-
-SECURITY:
-
-* Upgrade to use Go 1.20.8. This resolves CVEs
-[CVE-2023-39320](https://github.com/advisories/GHSA-rxv8-v965-v333) (`cmd/go`),
-[CVE-2023-39318](https://github.com/advisories/GHSA-vq7j-gx56-rxjh) (`html/template`),
-[CVE-2023-39319](https://github.com/advisories/GHSA-vv9m-32rr-3g55) (`html/template`),
-[CVE-2023-39321](https://github.com/advisories/GHSA-9v7r-x7cv-v437) (`crypto/tls`), and
-[CVE-2023-39322](https://github.com/advisories/GHSA-892h-r6cr-53g4) (`crypto/tls`) [[GH-18742](https://github.com/hashicorp/consul/issues/18742)]
-
-IMPROVEMENTS:
-
-* Adds flag -append-filename (which works on values version, dc, node and status) to consul snapshot save command.
-Adding the flag -append-filename version,dc,node,status will add consul version, consul datacenter, node name and leader/follower
-(status) in the file name given in the snapshot save command before the file extension. [[GH-18625](https://github.com/hashicorp/consul/issues/18625)]
-* api: Add support for listing ACL tokens by service name. [[GH-18667](https://github.com/hashicorp/consul/issues/18667)]
-* command: Adds -since flag in consul debug command which internally calls hcdiag for debug information in the past. [[GH-18797](https://github.com/hashicorp/consul/issues/18797)]
-* log: Currently consul logs files like this consul-{timestamp}.log. This change makes sure that there is always
-consul.log file with the latest logs in it. [[GH-18617](https://github.com/hashicorp/consul/issues/18617)]
-
-BUG FIXES:
-
-* api: Fix `/v1/agent/self` not returning latest configuration [[GH-18681](https://github.com/hashicorp/consul/issues/18681)]
-* ca: Vault provider now cleans up the previous Vault issuer and key when generating a new leaf signing certificate [[GH-18779](https://github.com/hashicorp/consul/issues/18779)] [[GH-18773](https://github.com/hashicorp/consul/issues/18773)]
-* gateways: Fix a bug where gateway to service mappings weren't being cleaned up properly when externally registered proxies were being deregistered. [[GH-18831](https://github.com/hashicorp/consul/issues/18831)]
-* telemetry: emit consul version metric on a regular interval. [[GH-18724](https://github.com/hashicorp/consul/issues/18724)]
-
-## 1.16.1 (August 8, 2023)
-
-KNOWN ISSUES:
-
-* connect: Consul versions 1.16.0 and 1.16.1 may have issues when a snapshot restore is performed and the servers are hosting xDS streams. When this bug triggers, it will cause Envoy to incorrectly populate upstream endpoints. This bug only impacts agent-less service mesh and should be fixed in Consul 1.16.2 by [GH-18636](https://github.com/hashicorp/consul/pull/18636).
-
-SECURITY:
-
-* Update `golang.org/x/net` to v0.13.0 to address [CVE-2023-3978](https://nvd.nist.gov/vuln/detail/CVE-2023-3978). [[GH-18358](https://github.com/hashicorp/consul/issues/18358)]
-* Upgrade golang.org/x/net to address [CVE-2023-29406](https://nvd.nist.gov/vuln/detail/CVE-2023-29406) [[GH-18186](https://github.com/hashicorp/consul/issues/18186)]
-* Upgrade to use Go 1.20.6.
-This resolves [CVE-2023-29406](https://github.com/advisories/GHSA-f8f7-69v5-w4vx)(`net/http`) for uses of the standard library.
-A separate change updates dependencies on `golang.org/x/net` to use `0.12.0`. [[GH-18190](https://github.com/hashicorp/consul/issues/18190)]
-* Upgrade to use Go 1.20.7.
-This resolves vulnerability [CVE-2023-29409](https://nvd.nist.gov/vuln/detail/CVE-2023-29409)(`crypto/tls`). [[GH-18358](https://github.com/hashicorp/consul/issues/18358)]
-
-FEATURES:
-
-* cli: `consul members` command uses `-filter` expression to filter members based on bexpr. [[GH-18223](https://github.com/hashicorp/consul/issues/18223)]
-* cli: `consul operator raft list-peers` command shows the number of commits each follower is trailing the leader by to aid in troubleshooting. [[GH-17582](https://github.com/hashicorp/consul/issues/17582)]
-* cli: `consul watch` command uses `-filter` expression to filter response from checks, services, nodes, and service. [[GH-17780](https://github.com/hashicorp/consul/issues/17780)]
-* reloadable config: Made enable_debug config reloadable and enable pprof command to work when config toggles to true [[GH-17565](https://github.com/hashicorp/consul/issues/17565)]
-* ui: consul version is displayed in nodes list with filtering and sorting based on versions [[GH-17754](https://github.com/hashicorp/consul/issues/17754)]
-
-IMPROVEMENTS:
-
-* Fix some typos in metrics docs [[GH-18080](https://github.com/hashicorp/consul/issues/18080)]
-* acl: added builtin ACL policy that provides global read-only access (builtin/global-read-only) [[GH-18319](https://github.com/hashicorp/consul/issues/18319)]
-* acl: allow for a single slash character in policy names [[GH-18319](https://github.com/hashicorp/consul/issues/18319)]
-* connect: Add capture group labels from Envoy cluster FQDNs to Envoy exported metric labels [[GH-17888](https://github.com/hashicorp/consul/issues/17888)]
-* connect: Improve transparent proxy support for virtual services and failovers. [[GH-17757](https://github.com/hashicorp/consul/issues/17757)]
-* connect: update supported envoy versions to 1.23.12, 1.24.10, 1.25.9, 1.26.4 [[GH-18303](https://github.com/hashicorp/consul/issues/18303)]
-* debug: change default setting of consul debug command. now default duration is 5ms and default log level is 'TRACE' [[GH-17596](https://github.com/hashicorp/consul/issues/17596)]
-* extensions: Improve validation and error feedback for `property-override` builtin Envoy extension [[GH-17759](https://github.com/hashicorp/consul/issues/17759)]
-* hcp: Add dynamic configuration support for the export of server metrics to HCP. [[GH-18168](https://github.com/hashicorp/consul/issues/18168)]
-* hcp: Removes requirement for HCP to provide a management token [[GH-18140](https://github.com/hashicorp/consul/issues/18140)]
-* http: GET API `operator/usage` endpoint now returns node count
-cli: `consul operator usage` command now returns node count [[GH-17939](https://github.com/hashicorp/consul/issues/17939)]
-* mesh: Expose remote jwks cluster configuration through jwt-provider config entry [[GH-17978](https://github.com/hashicorp/consul/issues/17978)]
-* mesh: Stop jwt providers referenced by intentions from being deleted. [[GH-17755](https://github.com/hashicorp/consul/issues/17755)]
-* ui: the topology view now properly displays services with mixed connect and non-connect instances. [[GH-13023](https://github.com/hashicorp/consul/issues/13023)]
-* xds: Explicitly enable WebSocket connection upgrades in HTTP connection manager [[GH-18150](https://github.com/hashicorp/consul/issues/18150)]
-
-BUG FIXES:
-
-* Fix a bug that wrongly trims domains when there is an overlap with DC name. [[GH-17160](https://github.com/hashicorp/consul/issues/17160)]
-* api-gateway: fix race condition in proxy config generation when Consul is notified of the bound-api-gateway config entry before it is notified of the api-gateway config entry. [[GH-18291](https://github.com/hashicorp/consul/issues/18291)]
-* api: Fix client deserialization errors by marking new Enterprise-only prepared query fields as omit empty [[GH-18184](https://github.com/hashicorp/consul/issues/18184)]
-* ca: Fixes a Vault CA provider bug where updating RootPKIPath but not IntermediatePKIPath would not renew leaf signing certificates [[GH-18112](https://github.com/hashicorp/consul/issues/18112)]
-* connect/ca: Fixes a bug preventing CA configuration updates in secondary datacenters [[GH-17846](https://github.com/hashicorp/consul/issues/17846)]
-* connect: **(Enterprise only)** Fix bug where intentions referencing sameness groups would not always apply to members properly.
-* connect: Fix incorrect protocol config merging for transparent proxy implicit upstreams. [[GH-17894](https://github.com/hashicorp/consul/issues/17894)]
-* connect: Removes the default health check from the `consul connect envoy` command when starting an API Gateway.
-This health check would always fail. [[GH-18011](https://github.com/hashicorp/consul/issues/18011)]
-* connect: fix a bug with Envoy potentially starting with incomplete configuration by not waiting enough for initial xDS configuration. [[GH-18024](https://github.com/hashicorp/consul/issues/18024)]
-* gateway: Fixes a bug where envoy would silently reject RSA keys that are smaller than 2048 bits,
-we now reject those earlier in the process when we validate the certificate. [[GH-17911](https://github.com/hashicorp/consul/issues/17911)]
-* http: fixed API endpoint `PUT /acl/token/:AccessorID` (update token), no longer requires `AccessorID` in the request body. Web UI can now update tokens. [[GH-17739](https://github.com/hashicorp/consul/issues/17739)]
-* mesh: **(Enterprise Only)** Require that `jwt-provider` config entries are created in the `default` namespace. [[GH-18325](https://github.com/hashicorp/consul/issues/18325)]
-* snapshot: fix access denied and handle is invalid when we call snapshot save on windows - skip sync() for folders in windows in
-https://github.com/rboyer/safeio/pull/3 [[GH-18302](https://github.com/hashicorp/consul/issues/18302)]
-* xds: Prevent partial application of non-Required Envoy extensions in the case of failure. [[GH-18068](https://github.com/hashicorp/consul/issues/18068)]
-
 ## 1.15.5 (August 8, 2023)
 
 SECURITY:
@@ -197,119 +69,6 @@ This health check would always fail. [[GH-18011](https://github.com/hashicorp/co
 * snapshot: fix access denied and handle is invalid when we call snapshot save on windows - skip sync() for folders in windows in
 https://github.com/rboyer/safeio/pull/3 [[GH-18302](https://github.com/hashicorp/consul/issues/18302)]
 
-## 1.14.9 (August 8, 2023)
-
-SECURITY:
-
-* Update `golang.org/x/net` to v0.13.0 to address [CVE-2023-3978](https://nvd.nist.gov/vuln/detail/CVE-2023-3978). [[GH-18358](https://github.com/hashicorp/consul/issues/18358)]
-* Upgrade golang.org/x/net to address [CVE-2023-29406](https://nvd.nist.gov/vuln/detail/CVE-2023-29406) [[GH-18186](https://github.com/hashicorp/consul/issues/18186)]
-* Upgrade to use Go 1.20.6.
-This resolves [CVE-2023-29406](https://github.com/advisories/GHSA-f8f7-69v5-w4vx)(`net/http`) for uses of the standard library. 
-A separate change updates dependencies on `golang.org/x/net` to use `0.12.0`. [[GH-18190](https://github.com/hashicorp/consul/issues/18190)]
-* Upgrade to use Go 1.20.7.
-This resolves vulnerability [CVE-2023-29409](https://nvd.nist.gov/vuln/detail/CVE-2023-29409)(`crypto/tls`). [[GH-18358](https://github.com/hashicorp/consul/issues/18358)]
-
-FEATURES:
-
-* cli: `consul members` command uses `-filter` expression to filter members based on bexpr. [[GH-18223](https://github.com/hashicorp/consul/issues/18223)]
-* cli: `consul watch` command uses `-filter` expression to filter response from checks, services, nodes, and service. [[GH-17780](https://github.com/hashicorp/consul/issues/17780)]
-* reloadable config: Made enable_debug config reloadable and enable pprof command to work when config toggles to true [[GH-17565](https://github.com/hashicorp/consul/issues/17565)]
-
-IMPROVEMENTS:
-
-* Fix some typos in metrics docs [[GH-18080](https://github.com/hashicorp/consul/issues/18080)]
-* acl: added builtin ACL policy that provides global read-only access (builtin/global-read-only) [[GH-18319](https://github.com/hashicorp/consul/issues/18319)]
-* acl: allow for a single slash character in policy names [[GH-18319](https://github.com/hashicorp/consul/issues/18319)]
-* connect: update supported envoy versions to 1.21.6, 1.22.11, 1.23.12, 1.24.10 [[GH-18305](https://github.com/hashicorp/consul/issues/18305)]
-* hcp: Removes requirement for HCP to provide a management token [[GH-18140](https://github.com/hashicorp/consul/issues/18140)]
-* xds: Explicitly enable WebSocket connection upgrades in HTTP connection manager [[GH-18150](https://github.com/hashicorp/consul/issues/18150)]
-
-BUG FIXES:
-
-* Fix a bug that wrongly trims domains when there is an overlap with DC name. [[GH-17160](https://github.com/hashicorp/consul/issues/17160)]
-* connect/ca: Fixes a bug preventing CA configuration updates in secondary datacenters [[GH-17846](https://github.com/hashicorp/consul/issues/17846)]
-* connect: Fix incorrect protocol config merging for transparent proxy implicit upstreams. [[GH-17894](https://github.com/hashicorp/consul/issues/17894)]
-* connect: fix a bug with Envoy potentially starting with incomplete configuration by not waiting enough for initial xDS configuration. [[GH-18024](https://github.com/hashicorp/consul/issues/18024)]
-* snapshot: fix access denied and handle is invalid when we call snapshot save on windows - skip sync() for folders in windows in
-https://github.com/rboyer/safeio/pull/3 [[GH-18302](https://github.com/hashicorp/consul/issues/18302)]
-
-## 1.16.0 (June 26, 2023)
-
-KNOWN ISSUES:
-
-* connect: Consul versions 1.16.0 and 1.16.1 may have issues when a snapshot restore is performed and the servers are hosting xDS streams. When this bug triggers, it will cause Envoy to incorrectly populate upstream endpoints. This bug only impacts agent-less service mesh and should be fixed in Consul 1.16.2 by [GH-18636](https://github.com/hashicorp/consul/pull/18636).
-
-BREAKING CHANGES:
-
-* api: The `/v1/health/connect/` and `/v1/health/ingress/` endpoints now immediately return 403 "Permission Denied" errors whenever a token with insufficient `service:read` permissions is provided. Prior to this change, the endpoints returned a success code with an empty result list when a token with insufficient permissions was provided. [[GH-17424](https://github.com/hashicorp/consul/issues/17424)]
-* peering: Removed deprecated backward-compatibility behavior.
-  Upstream overrides in service-defaults will now only apply to peer upstreams when the `peer` field is provided.
-  Visit the 1.16.x [upgrade instructions](https://developer.hashicorp.com/consul/docs/upgrading/upgrade-specific) for more information. [[GH-16957](https://github.com/hashicorp/consul/issues/16957)]
-
-SECURITY:
-
-* Bump Dockerfile base image to `alpine:3.18`. [[GH-17719](https://github.com/hashicorp/consul/issues/17719)]
-* audit-logging: **(Enterprise only)** limit `v1/operator/audit-hash` endpoint to ACL token with `operator:read` privileges.
-
-FEATURES:
-
-* api: (Enterprise only) Add `POST /v1/operator/audit-hash` endpoint to calculate the hash of the data used by the audit log hash function and salt.
-* cli: (Enterprise only) Add a new `consul operator audit hash` command to retrieve and compare the hash of the data used by the audit log hash function and salt.
-* cli: Adds new command - `consul services export` - for exporting a service to a peer or partition [[GH-15654](https://github.com/hashicorp/consul/issues/15654)]
-* connect: **(Consul Enterprise only)** Implement order-by-locality failover.
-* mesh: Add new permissive mTLS mode that allows sidecar proxies to forward incoming traffic unmodified to the application. This adds `AllowEnablingPermissiveMutualTLS` setting to the mesh config entry and the `MutualTLSMode` setting to proxy-defaults and service-defaults. [[GH-17035](https://github.com/hashicorp/consul/issues/17035)]
-* mesh: Support configuring JWT authentication in Envoy. [[GH-17452](https://github.com/hashicorp/consul/issues/17452)]
-* server: **(Enterprise Only)** added server side RPC requests IP based read/write rate-limiter. [[GH-4633](https://github.com/hashicorp/consul/issues/4633)]
-* server: **(Enterprise Only)** allow automatic license utilization reporting. [[GH-5102](https://github.com/hashicorp/consul/issues/5102)]
-* server: added server side RPC requests global read/write rate-limiter. [[GH-16292](https://github.com/hashicorp/consul/issues/16292)]
-* xds: Add `property-override` built-in Envoy extension that directly patches Envoy resources. [[GH-17487](https://github.com/hashicorp/consul/issues/17487)]
-* xds: Add a built-in Envoy extension that inserts External Authorization (ext_authz) network and HTTP filters. [[GH-17495](https://github.com/hashicorp/consul/issues/17495)]
-* xds: Add a built-in Envoy extension that inserts Wasm HTTP filters. [[GH-16877](https://github.com/hashicorp/consul/issues/16877)]
-* xds: Add a built-in Envoy extension that inserts Wasm network filters. [[GH-17505](https://github.com/hashicorp/consul/issues/17505)]
-
-IMPROVEMENTS:
-
-* * api: Support filtering for config entries. [[GH-17183](https://github.com/hashicorp/consul/issues/17183)]
-* * cli: Add `-filter` option to `consul config list` for filtering config entries. [[GH-17183](https://github.com/hashicorp/consul/issues/17183)]
-* agent: remove agent cache dependency from service mesh leaf certificate management [[GH-17075](https://github.com/hashicorp/consul/issues/17075)]
-* api: Enable setting query options on agent force-leave endpoint. [[GH-15987](https://github.com/hashicorp/consul/issues/15987)]
-* audit-logging: **(Enterprise only)** enable error response and request body logging
-* ca: automatically set up Vault's auto-tidy setting for tidy_expired_issuers when using Vault as a CA provider. [[GH-17138](https://github.com/hashicorp/consul/issues/17138)]
-* ca: support Vault agent auto-auth config for Vault CA provider using AliCloud authentication. [[GH-16224](https://github.com/hashicorp/consul/issues/16224)]
-* ca: support Vault agent auto-auth config for Vault CA provider using AppRole authentication. [[GH-16259](https://github.com/hashicorp/consul/issues/16259)]
-* ca: support Vault agent auto-auth config for Vault CA provider using Azure MSI authentication. [[GH-16298](https://github.com/hashicorp/consul/issues/16298)]
-* ca: support Vault agent auto-auth config for Vault CA provider using JWT authentication. [[GH-16266](https://github.com/hashicorp/consul/issues/16266)]
-* ca: support Vault agent auto-auth config for Vault CA provider using Kubernetes authentication. [[GH-16262](https://github.com/hashicorp/consul/issues/16262)]
-* command: Adds ACL enabled to status output on agent startup. [[GH-17086](https://github.com/hashicorp/consul/issues/17086)]
-* command: Allow creating ACL Token TTL with greater than 24 hours with the -expires-ttl flag. [[GH-17066](https://github.com/hashicorp/consul/issues/17066)]
-* connect: **(Enterprise Only)** Add support for specifying "Partition" and "Namespace" in Prepared Queries failover rules.
-* connect: update supported envoy versions to 1.23.10, 1.24.8, 1.25.7, 1.26.2 [[GH-17546](https://github.com/hashicorp/consul/issues/17546)]
-* connect: update supported envoy versions to 1.23.8, 1.24.6, 1.25.4, 1.26.0 [[GH-5200](https://github.com/hashicorp/consul/issues/5200)]
-* fix metric names in /docs/agent/telemetry [[GH-17577](https://github.com/hashicorp/consul/issues/17577)]
-* gateway: Change status condition reason for invalid certificate on a listener from "Accepted" to "ResolvedRefs". [[GH-17115](https://github.com/hashicorp/consul/issues/17115)]
-* http: accept query parameters `datacenter`, `ap` (enterprise-only), and `namespace` (enterprise-only). Both short-hand and long-hand forms of these query params are now supported via the HTTP API (dc/datacenter, ap/partition, ns/namespace). [[GH-17525](https://github.com/hashicorp/consul/issues/17525)]
-* systemd: set service type to notify. [[GH-16845](https://github.com/hashicorp/consul/issues/16845)]
-* ui: Update alerts to Hds::Alert component [[GH-16412](https://github.com/hashicorp/consul/issues/16412)]
-* ui: Update to use Hds::Toast component to show notifications [[GH-16519](https://github.com/hashicorp/consul/issues/16519)]
-* ui: update from <button> and <a> to design-system-components button <Hds::Button> [[GH-16251](https://github.com/hashicorp/consul/issues/16251)]
-* ui: update typography to styles from hds [[GH-16577](https://github.com/hashicorp/consul/issues/16577)]
-
-BUG FIXES:
-
-* Fix a race condition where an event is published before the data associated is commited to memdb. [[GH-16871](https://github.com/hashicorp/consul/issues/16871)]
-* connect: Fix issue where changes to service exports were not reflected in proxies. [[GH-17775](https://github.com/hashicorp/consul/issues/17775)]
-* gateways: **(Enterprise only)** Fixed a bug in API gateways where gateway configuration objects in non-default partitions did not reconcile properly. [[GH-17581](https://github.com/hashicorp/consul/issues/17581)]
-* gateways: Fixed a bug in API gateways where binding a route that only targets a service imported from a peer results
-  in the programmed gateway having no routes. [[GH-17609](https://github.com/hashicorp/consul/issues/17609)]
-* gateways: Fixed a bug where API gateways were not being taken into account in determining xDS rate limits. [[GH-17631](https://github.com/hashicorp/consul/issues/17631)]
-* namespaces: **(Enterprise only)** fixes a bug where agent health checks stop syncing for all services on a node if the namespace of any service has been removed from the server.
-* namespaces: **(Enterprise only)** fixes a bug where namespaces are stuck in a deferred deletion state indefinitely under some conditions.
-  Also fixes the Consul query metadata present in the HTTP headers of the namespace read and list endpoints.
-* peering: Fix a bug that caused server agents to continue cleaning up peering resources even after loss of leadership. [[GH-17483](https://github.com/hashicorp/consul/issues/17483)]
-* peering: Fixes a bug where the importing partition was not added to peered failover targets, which causes issues when the importing partition is a non-default partition. [[GH-16673](https://github.com/hashicorp/consul/issues/16673)]
-* ui: fixes ui tests run on CI [[GH-16428](https://github.com/hashicorp/consul/issues/16428)]
-* xds: Fixed a bug where modifying ACLs on a token being actively used for an xDS connection caused all xDS updates to fail. [[GH-17566](https://github.com/hashicorp/consul/issues/17566)]
-
 ## 1.15.4 (June 26, 2023)
 FEATURES:
 
@@ -339,138 +98,6 @@ BUG FIXES:
 * peering: Fix a bug that caused server agents to continue cleaning up peering resources even after loss of leadership. [[GH-17483](https://github.com/hashicorp/consul/issues/17483)]
 * xds: Fixed a bug where modifying ACLs on a token being actively used for an xDS connection caused all xDS updates to fail. [[GH-17566](https://github.com/hashicorp/consul/issues/17566)]
 
-## 1.14.8 (June 26, 2023)
-
-SECURITY:
-
-* Update to UBI base image to 9.2. [[GH-17513](https://github.com/hashicorp/consul/issues/17513)]
-
-FEATURES:
-
-* cli: `consul operator raft list-peers` command shows the number of commits each follower is trailing the leader by to aid in troubleshooting. [[GH-17582](https://github.com/hashicorp/consul/issues/17582)]
-* server: **(Enterprise Only)** allow automatic license utilization reporting. [[GH-5102](https://github.com/hashicorp/consul/issues/5102)]
-
-IMPROVEMENTS:
-
-* connect: update supported envoy versions to 1.21.6, 1.22.11, 1.23.9, 1.24.7 [[GH-17547](https://github.com/hashicorp/consul/issues/17547)]
-* debug: change default setting of consul debug command. now default duration is 5ms and default log level is 'TRACE' [[GH-17596](https://github.com/hashicorp/consul/issues/17596)]
-* fix metric names in /docs/agent/telemetry [[GH-17577](https://github.com/hashicorp/consul/issues/17577)]
-* peering: gRPC queries for TrustBundleList, TrustBundleRead, PeeringList, and PeeringRead now support blocking semantics,
-  reducing network and CPU demand.
-  The HTTP APIs for Peering List and Read have been updated to support blocking. [[GH-17426](https://github.com/hashicorp/consul/issues/17426)]
-* raft: Remove expensive reflection from raft/mesh hot path [[GH-16552](https://github.com/hashicorp/consul/issues/16552)]
-* systemd: set service type to notify. [[GH-16845](https://github.com/hashicorp/consul/issues/16845)]
-
-BUG FIXES:
-
-* cache: fix a few minor goroutine leaks in leaf certs and the agent cache [[GH-17636](https://github.com/hashicorp/consul/issues/17636)]
-* connect: reverts #17317 fix that caused a downstream error for Ingress/Mesh/Terminating GWs when their respective config entry does not already exist. [[GH-17541](https://github.com/hashicorp/consul/issues/17541)]
-* namespaces: **(Enterprise only)** fixes a bug where agent health checks stop syncing for all services on a node if the namespace of any service has been removed from the server.
-* namespaces: **(Enterprise only)** fixes a bug where namespaces are stuck in a deferred deletion state indefinitely under some conditions.
-  Also fixes the Consul query metadata present in the HTTP headers of the namespace read and list endpoints.
-* namespaces: adjusts the return type from HTTP list API to return the `api` module representation of a namespace.
-  This fixes an error with the `consul namespace list` command when a namespace has a deferred deletion timestamp.
-* peering: Fix a bug that caused server agents to continue cleaning up peering resources even after loss of leadership. [[GH-17483](https://github.com/hashicorp/consul/issues/17483)]
-* peering: Fix issue where modifying the list of exported services did not correctly replicate changes for services that exist in a non-default namespace. [[GH-17456](https://github.com/hashicorp/consul/issues/17456)]
-
-## 1.13.9 (June 26, 2023)
-BREAKING CHANGES:
-
-* connect: Disable peering by default in connect proxies for Consul 1.13. This change was made to prevent inefficient polling
-  queries from having a negative impact on server performance. Peering in Consul 1.13 is an experimental feature and is not
-  recommended for use in production environments. If you still wish to use the experimental peering feature, ensure
-  [`peering.enabled = true`](https://developer.hashicorp.com/consul/docs/v1.13.x/agent/config/config-files#peering_enabled)
-  is set on all clients and servers. [[GH-17731](https://github.com/hashicorp/consul/issues/17731)]
-
-SECURITY:
-
-* Update to UBI base image to 9.2. [[GH-17513](https://github.com/hashicorp/consul/issues/17513)]
-
-FEATURES:
-
-* server: **(Enterprise Only)** allow automatic license utilization reporting. [[GH-5102](https://github.com/hashicorp/consul/issues/5102)]
-
-IMPROVEMENTS:
-
-* debug: change default setting of consul debug command. now default duration is 5ms and default log level is 'TRACE' [[GH-17596](https://github.com/hashicorp/consul/issues/17596)]
-* systemd: set service type to notify. [[GH-16845](https://github.com/hashicorp/consul/issues/16845)]
-
-BUG FIXES:
-
-* cache: fix a few minor goroutine leaks in leaf certs and the agent cache [[GH-17636](https://github.com/hashicorp/consul/issues/17636)]
-* namespaces: **(Enterprise only)** fixes a bug where namespaces are stuck in a deferred deletion state indefinitely under some conditions.
-  Also fixes the Consul query metadata present in the HTTP headers of the namespace read and list endpoints.
-* namespaces: adjusts the return type from HTTP list API to return the `api` module representation of a namespace.
-  This fixes an error with the `consul namespace list` command when a namespace has a deferred deletion timestamp.
-* peering: Fix a bug that caused server agents to continue cleaning up peering resources even after loss of leadership. [[GH-17483](https://github.com/hashicorp/consul/issues/17483)]
-
-## 1.16.0-rc1 (June 12, 2023)
-
-BREAKING CHANGES:
-
-* api: The `/v1/health/connect/` and `/v1/health/ingress/` endpoints now immediately return 403 "Permission Denied" errors whenever a token with insufficient `service:read` permissions is provided. Prior to this change, the endpoints returned a success code with an empty result list when a token with insufficient permissions was provided. [[GH-17424](https://github.com/hashicorp/consul/issues/17424)]
-* peering: Removed deprecated backward-compatibility behavior.
-Upstream overrides in service-defaults will now only apply to peer upstreams when the `peer` field is provided.
-Visit the 1.16.x [upgrade instructions](https://developer.hashicorp.com/consul/docs/upgrading/upgrade-specific) for more information. [[GH-16957](https://github.com/hashicorp/consul/issues/16957)]
-
-SECURITY:
-
-* audit-logging: **(Enterprise only)** limit `v1/operator/audit-hash` endpoint to ACL token with `operator:read` privileges.
-
-FEATURES:
-
-* api: (Enterprise only) Add `POST /v1/operator/audit-hash` endpoint to calculate the hash of the data used by the audit log hash function and salt.
-* cli: (Enterprise only) Add a new `consul operator audit hash` command to retrieve and compare the hash of the data used by the audit log hash function and salt.
-* cli: Adds new command - `consul services export` - for exporting a service to a peer or partition [[GH-15654](https://github.com/hashicorp/consul/issues/15654)]
-* connect: **(Consul Enterprise only)** Implement order-by-locality failover.
-* mesh: Add new permissive mTLS mode that allows sidecar proxies to forward incoming traffic unmodified to the application. This adds `AllowEnablingPermissiveMutualTLS` setting to the mesh config entry and the `MutualTLSMode` setting to proxy-defaults and service-defaults. [[GH-17035](https://github.com/hashicorp/consul/issues/17035)]
-* mesh: Support configuring JWT authentication in Envoy. [[GH-17452](https://github.com/hashicorp/consul/issues/17452)]
-* server: **(Enterprise Only)** added server side RPC requests IP based read/write rate-limiter. [[GH-4633](https://github.com/hashicorp/consul/issues/4633)]
-* server: **(Enterprise Only)** allow automatic license utilization reporting. [[GH-5102](https://github.com/hashicorp/consul/issues/5102)]
-* server: added server side RPC requests global read/write rate-limiter. [[GH-16292](https://github.com/hashicorp/consul/issues/16292)]
-* xds: Add `property-override` built-in Envoy extension that directly patches Envoy resources. [[GH-17487](https://github.com/hashicorp/consul/issues/17487)]
-* xds: Add a built-in Envoy extension that inserts External Authorization (ext_authz) network and HTTP filters. [[GH-17495](https://github.com/hashicorp/consul/issues/17495)]
-* xds: Add a built-in Envoy extension that inserts Wasm HTTP filters. [[GH-16877](https://github.com/hashicorp/consul/issues/16877)]
-* xds: Add a built-in Envoy extension that inserts Wasm network filters. [[GH-17505](https://github.com/hashicorp/consul/issues/17505)]
-
-IMPROVEMENTS:
-
-* * api: Support filtering for config entries. [[GH-17183](https://github.com/hashicorp/consul/issues/17183)]
-* * cli: Add `-filter` option to `consul config list` for filtering config entries. [[GH-17183](https://github.com/hashicorp/consul/issues/17183)]
-* api: Enable setting query options on agent force-leave endpoint. [[GH-15987](https://github.com/hashicorp/consul/issues/15987)]
-* audit-logging: (Enterprise only) enable error response and request body logging [[GH-5669](https://github.com/hashicorp/consul/issues/5669)]
-* audit-logging: **(Enterprise only)** enable error response and request body logging
-* ca: automatically set up Vault's auto-tidy setting for tidy_expired_issuers when using Vault as a CA provider. [[GH-17138](https://github.com/hashicorp/consul/issues/17138)]
-* ca: support Vault agent auto-auth config for Vault CA provider using AliCloud authentication. [[GH-16224](https://github.com/hashicorp/consul/issues/16224)]
-* ca: support Vault agent auto-auth config for Vault CA provider using AppRole authentication. [[GH-16259](https://github.com/hashicorp/consul/issues/16259)]
-* ca: support Vault agent auto-auth config for Vault CA provider using Azure MSI authentication. [[GH-16298](https://github.com/hashicorp/consul/issues/16298)]
-* ca: support Vault agent auto-auth config for Vault CA provider using JWT authentication. [[GH-16266](https://github.com/hashicorp/consul/issues/16266)]
-* ca: support Vault agent auto-auth config for Vault CA provider using Kubernetes authentication. [[GH-16262](https://github.com/hashicorp/consul/issues/16262)]
-* command: Adds ACL enabled to status output on agent startup. [[GH-17086](https://github.com/hashicorp/consul/issues/17086)]
-* command: Allow creating ACL Token TTL with greater than 24 hours with the -expires-ttl flag. [[GH-17066](https://github.com/hashicorp/consul/issues/17066)]
-* connect: **(Enterprise Only)** Add support for specifying "Partition" and "Namespace" in Prepared Queries failover rules.
-* connect: update supported envoy versions to 1.23.10, 1.24.8, 1.25.7, 1.26.2 [[GH-17546](https://github.com/hashicorp/consul/issues/17546)]
-* connect: update supported envoy versions to 1.23.8, 1.24.6, 1.25.4, 1.26.0 [[GH-5200](https://github.com/hashicorp/consul/issues/5200)]
-* fix metric names in /docs/agent/telemetry [[GH-17577](https://github.com/hashicorp/consul/issues/17577)]
-* gateway: Change status condition reason for invalid certificate on a listener from "Accepted" to "ResolvedRefs". [[GH-17115](https://github.com/hashicorp/consul/issues/17115)]
-* http: accept query parameters `datacenter`, `ap` (enterprise-only), and `namespace` (enterprise-only). Both short-hand and long-hand forms of these query params are now supported via the HTTP API (dc/datacenter, ap/partition, ns/namespace). [[GH-17525](https://github.com/hashicorp/consul/issues/17525)]
-* systemd: set service type to notify. [[GH-16845](https://github.com/hashicorp/consul/issues/16845)]
-* ui: Update alerts to Hds::Alert component [[GH-16412](https://github.com/hashicorp/consul/issues/16412)]
-* ui: Update to use Hds::Toast component to show notifications [[GH-16519](https://github.com/hashicorp/consul/issues/16519)]
-* ui: update from <button> and <a> to design-system-components button <Hds::Button> [[GH-16251](https://github.com/hashicorp/consul/issues/16251)]
-* ui: update typography to styles from hds [[GH-16577](https://github.com/hashicorp/consul/issues/16577)]
-
-BUG FIXES:
-
-* Fix a race condition where an event is published before the data associated is commited to memdb. [[GH-16871](https://github.com/hashicorp/consul/issues/16871)]
-* gateways: **(Enterprise only)** Fixed a bug in API gateways where gateway configuration objects in non-default partitions did not reconcile properly. [[GH-17581](https://github.com/hashicorp/consul/issues/17581)]
-* gateways: Fixed a bug in API gateways where binding a route that only targets a service imported from a peer results
-in the programmed gateway having no routes. [[GH-17609](https://github.com/hashicorp/consul/issues/17609)]
-* gateways: Fixed a bug where API gateways were not being taken into account in determining xDS rate limits. [[GH-17631](https://github.com/hashicorp/consul/issues/17631)]
-* peering: Fixes a bug where the importing partition was not added to peered failover targets, which causes issues when the importing partition is a non-default partition. [[GH-16673](https://github.com/hashicorp/consul/issues/16673)]
-* ui: fixes ui tests run on CI [[GH-16428](https://github.com/hashicorp/consul/issues/16428)]
-* xds: Fixed a bug where modifying ACLs on a token being actively used for an xDS connection caused all xDS updates to fail. [[GH-17566](https://github.com/hashicorp/consul/issues/17566)]
-
 ## 1.15.3 (June 1, 2023)
 
 BREAKING CHANGES:
@@ -529,74 +156,6 @@ This fixes an error with the `consul namespace list` command when a namespace ha
 * peering: ensure that merged central configs of peered upstreams for partitioned downstreams work [[GH-17179](https://github.com/hashicorp/consul/issues/17179)]
 * xds: Fix possible panic that can when generating clusters before the root certificates have been fetched. [[GH-17185](https://github.com/hashicorp/consul/issues/17185)]
 
-## 1.14.7 (May 16, 2023)
-
-SECURITY:
-
-* Upgrade to use Go 1.20.4.
-  This resolves vulnerabilities [CVE-2023-24537](https://github.com/advisories/GHSA-9f7g-gqwh-jpf5)(`go/scanner`),
-  [CVE-2023-24538](https://github.com/advisories/GHSA-v4m2-x4rp-hv22)(`html/template`),
-  [CVE-2023-24534](https://github.com/advisories/GHSA-8v5j-pwr7-w5f8)(`net/textproto`) and
-  [CVE-2023-24536](https://github.com/advisories/GHSA-9f7g-gqwh-jpf5)(`mime/multipart`).
-  Also, `golang.org/x/net` has been updated to v0.7.0 to resolve CVEs [CVE-2022-41721
-  ](https://github.com/advisories/GHSA-fxg5-wq6x-vr4w
-  ), [CVE-2022-27664](https://github.com/advisories/GHSA-69cg-p879-7622) and [CVE-2022-41723
-  ](https://github.com/advisories/GHSA-vvpx-j8f3-3w6h
-  .) [[GH-17240](https://github.com/hashicorp/consul/issues/17240)]
-
-IMPROVEMENTS:
-
-* connect: update supported envoy versions to 1.21.6, 1.22.11, 1.23.8, 1.24.6 [[GH-16888](https://github.com/hashicorp/consul/issues/16888)]
-* envoy: add `MaxEjectionPercent` and `BaseEjectionTime` to passive health check configs. [[GH-15979](https://github.com/hashicorp/consul/issues/15979)]
-* hcp: Add support for linking existing Consul clusters to HCP management plane. [[GH-16916](https://github.com/hashicorp/consul/issues/16916)]
-* logging: change snapshot log header from `agent.server.snapshot` to `agent.server.raft.snapshot` [[GH-17236](https://github.com/hashicorp/consul/issues/17236)]
-* peering: allow re-establishing terminated peering from new token without deleting existing peering first. [[GH-16776](https://github.com/hashicorp/consul/issues/16776)]
-
-BUG FIXES:
-
-* Fix an bug where decoding some Config structs with unset pointer fields could fail with `reflect: call of reflect.Value.Type on zero Value`. [[GH-17048](https://github.com/hashicorp/consul/issues/17048)]
-* acl: **(Enterprise only)** Check permissions in correct partition/namespace when resolving service in non-default partition/namespace
-* acls: Fix ACL bug that can result in sidecar proxies having incorrect endpoints.
-* connect: Fix multiple inefficient behaviors when querying service health. [[GH-17241](https://github.com/hashicorp/consul/issues/17241)]
-* connect: fix a bug with Envoy potentially starting with incomplete configuration by not waiting enough for initial xDS configuration. [[GH-17317](https://github.com/hashicorp/consul/issues/17317)]
-* grpc: ensure grpc resolver correctly uses lan/wan addresses on servers [[GH-17270](https://github.com/hashicorp/consul/issues/17270)]
-* peering: Fix issue where peer streams could incorrectly deregister services in various scenarios. [[GH-17235](https://github.com/hashicorp/consul/issues/17235)]
-* proxycfg: ensure that an irrecoverable error in proxycfg closes the xds session and triggers a replacement proxycfg watcher [[GH-16497](https://github.com/hashicorp/consul/issues/16497)]
-* xds: Fix possible panic that can when generating clusters before the root certificates have been fetched. [[GH-17185](https://github.com/hashicorp/consul/issues/17185)]
-
-## 1.13.8 (May 16, 2023)
-
-SECURITY:
-
-* Upgrade to use Go 1.20.1.
-  This resolves vulnerabilities [CVE-2022-41724](https://go.dev/issue/58001) in `crypto/tls` and [CVE-2022-41723](https://go.dev/issue/57855) in `net/http`. [[GH-16263](https://github.com/hashicorp/consul/issues/16263)]
-* Upgrade to use Go 1.20.4.
-  This resolves vulnerabilities [CVE-2023-24537](https://github.com/advisories/GHSA-9f7g-gqwh-jpf5)(`go/scanner`),
-  [CVE-2023-24538](https://github.com/advisories/GHSA-v4m2-x4rp-hv22)(`html/template`),
-  [CVE-2023-24534](https://github.com/advisories/GHSA-8v5j-pwr7-w5f8)(`net/textproto`) and
-  [CVE-2023-24536](https://github.com/advisories/GHSA-9f7g-gqwh-jpf5)(`mime/multipart`).
-  Also, `golang.org/x/net` has been updated to v0.7.0 to resolve CVEs [CVE-2022-41721
-  ](https://github.com/advisories/GHSA-fxg5-wq6x-vr4w
-  ), [CVE-2022-27664](https://github.com/advisories/GHSA-69cg-p879-7622) and [CVE-2022-41723
-  ](https://github.com/advisories/GHSA-vvpx-j8f3-3w6h
-  .) [[GH-17240](https://github.com/hashicorp/consul/issues/17240)]
-
-IMPROVEMENTS:
-
-* api: updated the go module directive to 1.18. [[GH-15297](https://github.com/hashicorp/consul/issues/15297)]
-* connect: update supported envoy versions to 1.20.7, 1.21.6, 1.22.11, 1.23.8 [[GH-16891](https://github.com/hashicorp/consul/issues/16891)]
-* sdk: updated the go module directive to 1.18. [[GH-15297](https://github.com/hashicorp/consul/issues/15297)]
-
-BUG FIXES:
-
-* Fix an bug where decoding some Config structs with unset pointer fields could fail with `reflect: call of reflect.Value.Type on zero Value`. [[GH-17048](https://github.com/hashicorp/consul/issues/17048)]
-* audit-logging: (Enterprise only) Fix a bug where `/agent/monitor` and `/agent/metrics` endpoints return a `Streaming not supported` error when audit logs are enabled. This also fixes the delay receiving logs when running `consul monitor` against an agent with audit logs enabled. [[GH-16700](https://github.com/hashicorp/consul/issues/16700)]
-* ca: Fixes a bug where updating Vault CA Provider config would cause TLS issues in the service mesh [[GH-16592](https://github.com/hashicorp/consul/issues/16592)]
-* connect: Fix multiple inefficient behaviors when querying service health. [[GH-17241](https://github.com/hashicorp/consul/issues/17241)]
-* grpc: ensure grpc resolver correctly uses lan/wan addresses on servers [[GH-17270](https://github.com/hashicorp/consul/issues/17270)]
-* peering: Fixes a bug that can lead to peering service deletes impacting the state of local services [[GH-16570](https://github.com/hashicorp/consul/issues/16570)]
-* xds: Fix possible panic that can when generating clusters before the root certificates have been fetched. [[GH-17185](https://github.com/hashicorp/consul/issues/17185)]
-
 ## 1.15.2 (March 30, 2023)
 
 FEATURES:
@@ -623,19 +182,6 @@ BUG FIXES:
 * ui: fix PUT token request with adding missed AccessorID property to requestBody [[GH-16660](https://github.com/hashicorp/consul/issues/16660)]
 * ui: fix rendering issues on Overview and empty-states by addressing isHTMLSafe errors [[GH-16574](https://github.com/hashicorp/consul/issues/16574)]
 
-## 1.14.6 (March 30, 2023)
-
-BUG FIXES:
-
-* audit-logging: (Enterprise only) Fix a bug where `/agent/monitor` and `/agent/metrics` endpoints return a `Streaming not supported` error when audit logs are enabled. This also fixes the delay receiving logs when running `consul monitor` against an agent with audit logs enabled. [[GH-16700](https://github.com/hashicorp/consul/issues/16700)]
-* ca: Fixes a bug where updating Vault CA Provider config would cause TLS issues in the service mesh [[GH-16592](https://github.com/hashicorp/consul/issues/16592)]
-* peering: **(Consul Enterprise only)** Fix issue where connect-enabled services with peer upstreams incorrectly required `service:write` access in the `default` namespace to query data, which was too restrictive. Now having `service:write` to any namespace is sufficient to query the peering data.
-* peering: **(Consul Enterprise only)** Fix issue where resolvers, routers, and splitters referencing peer targets may not work correctly for non-default partitions and namespaces. Enterprise customers leveraging peering are encouraged to upgrade both servers and agents to avoid this problem.
-* peering: Fix issue resulting in prepared query failover to cluster peers never un-failing over. [[GH-16729](https://github.com/hashicorp/consul/issues/16729)]
-* peering: Fixes a bug that can lead to peering service deletes impacting the state of local services [[GH-16570](https://github.com/hashicorp/consul/issues/16570)]
-* peering: Fixes a bug where the importing partition was not added to peered failover targets, which causes issues when the importing partition is a non-default partition. [[GH-16693](https://github.com/hashicorp/consul/issues/16693)]
-* ui: fix PUT token request with adding missed AccessorID property to requestBody [[GH-16660](https://github.com/hashicorp/consul/issues/16660)]
-
 ## 1.15.1 (March 7, 2023)
 
 IMPROVEMENTS:
@@ -666,44 +212,6 @@ BUG FIXES:
 * proxycfg: fix a bug where terminating gateways were not cleaning up deleted service resolvers for their referenced services [[GH-16498](https://github.com/hashicorp/consul/issues/16498)]
 * ui: Fix issue with lists and filters not rendering properly [[GH-16444](https://github.com/hashicorp/consul/issues/16444)]
 
-## 1.14.5 (March 7, 2023)
-
-SECURITY:
-
-* Upgrade to use Go 1.20.1.
-This resolves vulnerabilities [CVE-2022-41724](https://go.dev/issue/58001) in `crypto/tls` and [CVE-2022-41723](https://go.dev/issue/57855) in `net/http`. [[GH-16263](https://github.com/hashicorp/consul/issues/16263)]
-
-IMPROVEMENTS:
-
-* container: Upgrade container image to use to Alpine 3.17. [[GH-16358](https://github.com/hashicorp/consul/issues/16358)]
-* mesh: Add ServiceResolver RequestTimeout for route timeouts to make request timeouts configurable [[GH-16495](https://github.com/hashicorp/consul/issues/16495)]
-
-BUG FIXES:
-
-* mesh: Fix resolution of service resolvers with subsets for external upstreams [[GH-16499](https://github.com/hashicorp/consul/issues/16499)]
-* peering: Fix bug where services were incorrectly imported as connect-enabled. [[GH-16339](https://github.com/hashicorp/consul/issues/16339)]
-* peering: Fix issue where mesh gateways would use the wrong address when contacting a remote peer with the same datacenter name. [[GH-16257](https://github.com/hashicorp/consul/issues/16257)]
-* peering: Fix issue where secondary wan-federated datacenters could not be used as peering acceptors. [[GH-16230](https://github.com/hashicorp/consul/issues/16230)]
-* proxycfg: fix a bug where terminating gateways were not cleaning up deleted service resolvers for their referenced services [[GH-16498](https://github.com/hashicorp/consul/issues/16498)]
-
-## 1.13.7 (March 7, 2023)
-
-SECURITY:
-
-* Upgrade to use Go 1.19.6.
-This resolves vulnerabilities [CVE-2022-41724](https://go.dev/issue/58001) in `crypto/tls` and [CVE-2022-41723](https://go.dev/issue/57855) in `net/http`. [[GH-16299](https://github.com/hashicorp/consul/issues/16299)]
-
-IMPROVEMENTS:
-
-* xds: Removed a bottleneck in Envoy config generation. [[GH-16269](https://github.com/hashicorp/consul/issues/16269)]
-* container: Upgrade container image to use to Alpine 3.17. [[GH-16358](https://github.com/hashicorp/consul/issues/16358)]
-* mesh: Add ServiceResolver RequestTimeout for route timeouts to make request timeouts configurable [[GH-16495](https://github.com/hashicorp/consul/issues/16495)]
-
-BUG FIXES:
-
-* mesh: Fix resolution of service resolvers with subsets for external upstreams [[GH-16499](https://github.com/hashicorp/consul/issues/16499)]
-* proxycfg: fix a bug where terminating gateways were not cleaning up deleted service resolvers for their referenced services [[GH-16498](https://github.com/hashicorp/consul/issues/16498)]
-
 ## 1.15.0 (February 23, 2023)
 
 KNOWN ISSUES:
@@ -3920,12 +3428,12 @@ BUG FIXES:
 * snapshot: Fixed a bug where node metadata wasn't being included in or restored from the snapshots. [[GH-4524](https://github.com/hashicorp/consul/issues/4524)]
 * connect: Fixed a bug where managed proxy instances registered for instances with different name and ID and with restrictive ACL would not be allowed. [[GH-4619](https://github.com/hashicorp/consul/issues/4619)]
 * connect: Fixed a bug where built-in CA state was not correctly restored from a snapshot [[GH-4535](https://github.com/hashicorp/consul/pull/4535)]
-* connect: Fixed a bug where Checks with `deregister_critical_service_after` would deregister the service but not remove the managed proxy [[GH-4649](https://github.com/hashicorp/consul/issues/4649)]
+* connect: Fixed a bug where Checks with `deregister_critical_service_after` would deregister the service but not remove the managed proxy [[GH-4649](github.com/hashicorp/consul/pull/4649)]
 * connect: Fixed a bug that would output an error about pruning CAs every hour on the leader and might cause some CA configurations not to be pruned correctly [[GH-4669](https://github.com/hashicorp/consul/pull/4669)]
 * raft: Update raft vendoring to pull in a fix for a potential memory leak. [[GH-4539](https://github.com/hashicorp/consul/pull/4539)]
 * license: (Consul Enterprise) Fix an issue with the license not being reloaded from snapshots.
 * license: (Consul Enterprise) Fix an issue with encoding/decoding of the license package type from the /v1/operator/license endpoint.
-* cli: Correctly exit with error code 1 when failing to list DCs with the catalog command [[GH-4583]](https://github.com/hashicorp/consul/pull/4583)
+* cli: Correctly exit with error code 1 when failing to list DCs with the catalog command [[GH-4583]]
 * ui: Improve layout on screens of a large portrait orientation [[GH-4564]](https://github.com/hashicorp/consul/pull/4564)
 * ui: Various browser layout bugs for various vendors/setups [[GH-4608]](https://github.com/hashicorp/consul/pull/4608) [[GH-4613]](https://github.com/hashicorp/consul/pull/4613) [[GH-4615]](https://github.com/hashicorp/consul/pull/4615)
 
@@ -4115,26 +3623,6 @@ BUG FIXES:
 * agent: Fixed several areas where reading from catalog, health, or agent HTTP endpoints could make unintended mofidications to Consul's state in a way that would cause unnecessary anti-entropy syncs back to the Consul servers. This could cause extra churn on downstream applications like consul-template or Fabio. [[GH-3867](https://github.com/hashicorp/consul/issues/3867)]
 * agent: Fixed an issue where Serf events for failed Consul servers weren't being proactively processed by the RPC router. This would prvent Consul from proactively choosing a new server, and would instead wait for a failed RPC request before choosing a new server. This exposed clients to a failed request, when often the proactive switching would avoid that. [[GH-3864](https://github.com/hashicorp/consul/issues/3864)]
 
-## 1.0.4 (February 6, 2018)
-SECURITY:
-
-* dns: Updated DNS vendor library to pick up bug fix in the DNS server where an open idle connection blocks the accept loop. [[GH-3859](https://github.com/hashicorp/consul/issues/3859)]
-
-FEATURES:
-
-* agent: Added support for gRPC health checks that probe the standard gRPC health endpoint. [[GH-3073](https://github.com/hashicorp/consul/issues/3073)]
-
-IMPROVEMENTS:
-
-* agent: (Consul Enterprise) The `disable_update_check` option to disable Checkpoint now defaults to `true` (this is only in the Enterprise version).
-* build: Bumped Go version to 1.9.3. [[GH-3837](https://github.com/hashicorp/consul/issues/3837)]
-
-BUG FIXES:
-
-* agent: (Consul Enterprise) Fixed an issue where the snapshot agent's HTTP client config was being ignored in favor of the HTTP command-line flags.
-* agent: Fixed an issue where health checks added to services with tags would cause extra periodic writes to the Consul servers, even if nothing had changed. This could cause extra churn on downstream applications like consul-template or Fabio. [[GH-3845](https://github.com/hashicorp/consul/issues/3845)]
-* agent: Fixed an issue where Serf events for failed Consul servers weren't being proactively processed by the RPC router. This would prvent Consul from proactively choosing a new server, and would instead wait for a failed RPC request before choosing a new server. This exposed clients to a failed request, when often the proactive switching would avoid that. [[GH-3864](https://github.com/hashicorp/consul/issues/3864)]
-
 ## 1.0.3 (January 24, 2018)
 
 SECURITY:
diff --git a/Dockerfile b/Dockerfile
index 1926c521299a7..f5550f8f14d28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # This Dockerfile contains multiple targets.
 # Use 'docker build --target=<name> .' to build one.
 # e.g. `docker build --target=official .`
@@ -16,7 +13,7 @@
 # Official docker image that includes binaries from releases.hashicorp.com. This
 # downloads the release from releases.hashicorp.com and therefore requires that
 # the release is published before building the Docker image.
-FROM docker.mirror.hashicorp.services/alpine:3.18 as official
+FROM docker.mirror.hashicorp.services/alpine:3.17 as official
 
 # This is the release of Consul to pull in.
 ARG VERSION
@@ -112,7 +109,7 @@ CMD ["agent", "-dev", "-client", "0.0.0.0"]
 
 # Production docker image that uses CI built binaries.
 # Remember, this image cannot be built locally.
-FROM docker.mirror.hashicorp.services/alpine:3.18 as default
+FROM docker.mirror.hashicorp.services/alpine:3.17 as default
 
 ARG PRODUCT_VERSION
 ARG BIN_NAME
diff --git a/Dockerfile-windows b/Dockerfile-windows
deleted file mode 100644
index 14582908db550..0000000000000
--- a/Dockerfile-windows
+++ /dev/null
@@ -1,51 +0,0 @@
-FROM mcr.microsoft.com/windows/servercore:ltsc2019
-ARG VERSION=1.16.0
-
-ENV chocolateyVersion=1.4.0
-
-LABEL org.opencontainers.image.authors="Consul Team <consul@hashicorp.com>" \
-      org.opencontainers.image.url="https://www.consul.io/" \
-      org.opencontainers.image.documentation="https://www.consul.io/docs" \
-      org.opencontainers.image.source="https://github.com/hashicorp/consul" \
-      org.opencontainers.image.version=$VERSION \
-      org.opencontainers.image.vendor="HashiCorp" \
-      org.opencontainers.image.title="consul" \
-      org.opencontainers.image.description="Consul is a datacenter runtime that provides service discovery, configuration, and orchestration." \
-      version=${VERSION}
-
-RUN ["powershell", "Set-ExecutionPolicy", "Bypass", "-Scope", "Process", "-Force;"]
-RUN ["powershell", "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"]
-
-RUN choco install git.install -yf
-RUN SETX /M path "%PATH%;C:\Program Files\Git\bin"
-
-RUN mkdir C:\\consul
-RUN mkdir C:\\consul\\data
-RUN mkdir C:\\consul\\config
-
-# Server RPC is used for communication between Consul clients and servers for internal
-# request forwarding.
-EXPOSE 8300
-
-# Serf LAN and WAN (WAN is used only by Consul servers) are used for gossip between
-# Consul agents. LAN is within the datacenter and WAN is between just the Consul
-# servers in all datacenters.
-EXPOSE 8301 8301/udp 8302 8302/udp
-
-# HTTP and DNS (both TCP and UDP) are the primary interfaces that applications
-# use to interact with Consul.
-EXPOSE 8500 8600 8600/udp
-
-#ENV CONSUL_URL=https://releases.hashicorp.com/consul/${VERSION}/consul_${VERSION}_windows_amd64.zip
-#RUN curl %CONSUL_URL% -L -o consul.zip
-#RUN tar -xf consul.zip -C consul
-
-COPY consul.exe C:\\consul
-
-COPY .release/docker/docker-entrypoint-windows.sh C:\\docker-entrypoint-windows.sh
-ENTRYPOINT ["bash.exe", "docker-entrypoint-windows.sh"]
-
-# By default you'll get an insecure single-node development server that stores
-# everything in RAM, exposes a web UI and HTTP endpoints, and bootstraps itself.
-# Don't use this configuration for production.
-CMD ["agent", "-dev", "-client", "0.0.0.0"]
diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644
index 0000000000000..3541fc5d10a21
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,544 @@
+# For documentation on building consul from source, refer to:
+# https://www.consul.io/docs/install#compiling-from-source
+
+SHELL = bash
+
+###
+# These version variables can either be a valid string for "go install <module>@<version>"
+# or the string @DEV to imply use what is currently installed locally.
+###
+GOLANGCI_LINT_VERSION='v1.51.1'
+MOCKERY_VERSION='v2.20.0'
+BUF_VERSION='v1.4.0'
+PROTOC_GEN_GO_GRPC_VERSION="v1.2.0"
+MOG_VERSION='v0.4.0'
+PROTOC_GO_INJECT_TAG_VERSION='v1.3.0'
+PROTOC_GEN_GO_BINARY_VERSION="v0.1.0"
+DEEP_COPY_VERSION='bc3f5aa5735d8a54961580a3a24422c308c831c2'
+
+MOCKED_PB_DIRS= pbdns
+
+GOTAGS ?=
+GOPATH=$(shell go env GOPATH)
+GOARCH?=$(shell go env GOARCH)
+MAIN_GOPATH=$(shell go env GOPATH | cut -d: -f1)
+
+export PATH := $(PWD)/bin:$(GOPATH)/bin:$(PATH)
+
+# Get the git commit
+GIT_COMMIT?=$(shell git rev-parse --short HEAD)
+GIT_COMMIT_YEAR?=$(shell git show -s --format=%cd --date=format:%Y HEAD)
+GIT_DIRTY?=$(shell test -n "`git status --porcelain`" && echo "+CHANGES" || true)
+GIT_IMPORT=github.com/hashicorp/consul/version
+DATE_FORMAT="%Y-%m-%dT%H:%M:%SZ" # it's tricky to do an RFC3339 format in a cross platform way, so we hardcode UTC
+GIT_DATE=$(shell $(CURDIR)/build-support/scripts/build-date.sh) # we're using this for build date because it's stable across platform builds
+GOLDFLAGS=-X $(GIT_IMPORT).GitCommit=$(GIT_COMMIT)$(GIT_DIRTY) -X $(GIT_IMPORT).BuildDate=$(GIT_DATE)
+
+GOTESTSUM_PATH?=$(shell command -v gotestsum)
+
+ifeq ($(FORCE_REBUILD),1)
+NOCACHE=--no-cache
+else
+NOCACHE=
+endif
+
+DOCKER_BUILD_QUIET?=1
+ifeq (${DOCKER_BUILD_QUIET},1)
+QUIET=-q
+else
+QUIET=
+endif
+
+ifeq ("$(GOTAGS)","")
+CONSUL_COMPAT_TEST_IMAGE=consul
+else
+CONSUL_COMPAT_TEST_IMAGE=hashicorp/consul-enterprise
+endif
+
+CONSUL_DEV_IMAGE?=consul-dev
+GO_BUILD_TAG?=consul-build-go
+UI_BUILD_TAG?=consul-build-ui
+BUILD_CONTAINER_NAME?=consul-builder
+CONSUL_IMAGE_VERSION?=latest
+
+################
+# CI Variables #
+################
+CI_DEV_DOCKER_NAMESPACE?=hashicorpdev
+CI_DEV_DOCKER_IMAGE_NAME?=consul
+CI_DEV_DOCKER_WORKDIR?=bin/
+################
+
+TEST_MODCACHE?=1
+TEST_BUILDCACHE?=1
+
+# You can only use as many CPUs as you have allocated to docker
+ifdef TEST_DOCKER_CPUS
+TEST_DOCKER_RESOURCE_CONSTRAINTS=--cpus $(TEST_DOCKER_CPUS)
+TEST_PARALLELIZATION=-e GOMAXPROCS=$(TEST_DOCKER_CPUS)
+else
+TEST_DOCKER_RESOURCE_CONSTRAINTS=
+TEST_PARALLELIZATION=
+endif
+
+ifeq ($(TEST_MODCACHE), 1)
+TEST_MODCACHE_VOL=-v $(MAIN_GOPATH)/pkg/mod:/go/pkg/mod
+else
+TEST_MODCACHE_VOL=
+endif
+
+ifeq ($(TEST_BUILDCACHE), 1)
+TEST_BUILDCACHE_VOL=-v $(shell go env GOCACHE):/root/.caches/go-build
+else
+TEST_BUILDCACHE_VOL=
+endif
+
+DIST_TAG?=1
+DIST_BUILD?=1
+DIST_SIGN?=1
+
+ifdef DIST_VERSION
+DIST_VERSION_ARG=-v "$(DIST_VERSION)"
+else
+DIST_VERSION_ARG=
+endif
+
+ifdef DIST_RELEASE_DATE
+DIST_DATE_ARG=-d "$(DIST_RELEASE_DATE)"
+else
+DIST_DATE_ARG=
+endif
+
+ifdef DIST_PRERELEASE
+DIST_REL_ARG=-r "$(DIST_PRERELEASE)"
+else
+DIST_REL_ARG=
+endif
+
+PUB_GIT?=1
+PUB_WEBSITE?=1
+
+ifeq ($(PUB_GIT),1)
+PUB_GIT_ARG=-g
+else
+PUB_GIT_ARG=
+endif
+
+ifeq ($(PUB_WEBSITE),1)
+PUB_WEBSITE_ARG=-w
+else
+PUB_WEBSITE_ARG=
+endif
+
+
+export GO_BUILD_TAG
+export UI_BUILD_TAG
+export BUILD_CONTAINER_NAME
+export GIT_COMMIT
+export GIT_COMMIT_YEAR
+export GIT_DIRTY
+export GOTAGS
+export GOLDFLAGS
+
+# Allow skipping docker build during integration tests in CI since we already
+# have a built binary
+ENVOY_INTEG_DEPS?=docker-envoy-integ
+ifdef SKIP_DOCKER_BUILD
+ENVOY_INTEG_DEPS=noop
+endif
+
+all: dev-build
+
+# used to make integration dependencies conditional
+noop: ;
+
+# dev creates binaries for testing locally - these are put into ./bin
+dev: dev-build
+
+dev-build:
+	mkdir -p bin
+	CGO_ENABLED=0 go install -ldflags "$(GOLDFLAGS)" -tags "$(GOTAGS)"
+	# rm needed due to signature caching (https://apple.stackexchange.com/a/428388)
+	rm -f ./bin/consul
+	cp ${MAIN_GOPATH}/bin/consul ./bin/consul
+
+dev-docker: linux dev-build
+	@echo "Pulling consul container image - $(CONSUL_IMAGE_VERSION)"
+	@docker pull hashicorp/consul:$(CONSUL_IMAGE_VERSION) >/dev/null
+	@echo "Building Consul Development container - $(CONSUL_DEV_IMAGE)"
+	@#  'consul:local' tag is needed to run the integration tests
+	@#  'consul-dev:latest' is needed by older workflows
+	@docker buildx use default && docker buildx build -t 'consul:local' -t '$(CONSUL_DEV_IMAGE)' \
+       --platform linux/$(GOARCH) \
+	   --build-arg CONSUL_IMAGE_VERSION=$(CONSUL_IMAGE_VERSION) \
+       --load \
+       -f $(CURDIR)/build-support/docker/Consul-Dev-Multiarch.dockerfile $(CURDIR)/pkg/bin/
+
+check-remote-dev-image-env:
+ifndef REMOTE_DEV_IMAGE
+	$(error REMOTE_DEV_IMAGE is undefined: set this image to <your_docker_repo>/<your_docker_image>:<image_tag>, e.g. hashicorp/consul-k8s-dev:latest)
+endif
+
+remote-docker: check-remote-dev-image-env
+	$(MAKE) GOARCH=amd64 linux
+	$(MAKE) GOARCH=arm64 linux
+	@echo "Pulling consul container image - $(CONSUL_IMAGE_VERSION)"
+	@docker pull hashicorp/consul:$(CONSUL_IMAGE_VERSION) >/dev/null
+	@echo "Building and Pushing Consul Development container - $(REMOTE_DEV_IMAGE)"
+	@if ! docker buildx inspect consul-builder; then \
+		docker buildx create --name consul-builder --driver docker-container --bootstrap; \
+	fi; 
+	@docker buildx use consul-builder && docker buildx build -t '$(REMOTE_DEV_IMAGE)' \
+       --platform linux/amd64,linux/arm64 \
+	   --build-arg CONSUL_IMAGE_VERSION=$(CONSUL_IMAGE_VERSION) \
+       --push \
+       -f $(CURDIR)/build-support/docker/Consul-Dev-Multiarch.dockerfile $(CURDIR)/pkg/bin/
+
+# In CI, the linux binary will be attached from a previous step at bin/. This make target
+# should only run in CI and not locally.
+ci.dev-docker:
+	@echo "Pulling consul container image - $(CONSUL_IMAGE_VERSION)"
+	@docker pull hashicorp/consul:$(CONSUL_IMAGE_VERSION) >/dev/null
+	@echo "Building Consul Development container - $(CI_DEV_DOCKER_IMAGE_NAME)"
+	@docker build $(NOCACHE) $(QUIET) -t '$(CI_DEV_DOCKER_NAMESPACE)/$(CI_DEV_DOCKER_IMAGE_NAME):$(GIT_COMMIT)' \
+	--build-arg CONSUL_IMAGE_VERSION=$(CONSUL_IMAGE_VERSION) \
+	--label COMMIT_SHA=$(CIRCLE_SHA1) \
+	--label PULL_REQUEST=$(CIRCLE_PULL_REQUEST) \
+	--label CIRCLE_BUILD_URL=$(CIRCLE_BUILD_URL) \
+	$(CI_DEV_DOCKER_WORKDIR) -f $(CURDIR)/build-support/docker/Consul-Dev.dockerfile
+	@echo $(DOCKER_PASS) | docker login -u="$(DOCKER_USER)" --password-stdin
+	@echo "Pushing dev image to: https://cloud.docker.com/u/hashicorpdev/repository/docker/hashicorpdev/consul"
+	@docker push $(CI_DEV_DOCKER_NAMESPACE)/$(CI_DEV_DOCKER_IMAGE_NAME):$(GIT_COMMIT)
+ifeq ($(CIRCLE_BRANCH), main)
+	@docker tag $(CI_DEV_DOCKER_NAMESPACE)/$(CI_DEV_DOCKER_IMAGE_NAME):$(GIT_COMMIT) $(CI_DEV_DOCKER_NAMESPACE)/$(CI_DEV_DOCKER_IMAGE_NAME):latest
+	@docker push $(CI_DEV_DOCKER_NAMESPACE)/$(CI_DEV_DOCKER_IMAGE_NAME):latest
+endif
+
+# linux builds a linux binary compatible with the source platform
+linux:
+	@mkdir -p ./pkg/bin/linux_$(GOARCH)
+	CGO_ENABLED=0 GOOS=linux GOARCH=$(GOARCH) go build -o ./pkg/bin/linux_$(GOARCH) -ldflags "$(GOLDFLAGS)" -tags "$(GOTAGS)"
+
+# dist builds binaries for all platforms and packages them for distribution
+dist:
+	@$(SHELL) $(CURDIR)/build-support/scripts/release.sh -t '$(DIST_TAG)' -b '$(DIST_BUILD)' -S '$(DIST_SIGN)' $(DIST_VERSION_ARG) $(DIST_DATE_ARG) $(DIST_REL_ARG)
+
+cover: cov
+cov: other-consul dev-build
+	go test -tags '$(GOTAGS)' ./... -coverprofile=coverage.out
+	cd sdk && go test -tags '$(GOTAGS)' ./... -coverprofile=../coverage.sdk.part
+	cd api && go test -tags '$(GOTAGS)' ./... -coverprofile=../coverage.api.part
+	grep -h -v "mode: set" coverage.{sdk,api}.part >> coverage.out
+	rm -f coverage.{sdk,api}.part
+	go tool cover -html=coverage.out
+
+test: other-consul dev-build lint test-internal
+
+go-mod-tidy:
+	@echo "--> Running go mod tidy"
+	@cd sdk && go mod tidy
+	@cd api && go mod tidy
+	@go mod tidy
+	@cd test/integration/consul-container && go mod tidy
+	@cd test/integration/connect/envoy/test-sds-server && go mod tidy
+	@cd proto-public && go mod tidy
+	@cd internal/tools/proto-gen-rpc-glue && go mod tidy
+	@cd internal/tools/proto-gen-rpc-glue/e2e && go mod tidy
+	@cd internal/tools/proto-gen-rpc-glue/e2e/consul && go mod tidy
+	@cd internal/tools/protoc-gen-consul-rate-limit && go mod tidy
+
+
+test-internal:
+	@echo "--> Running go test"
+	@rm -f test.log exit-code
+	@# Dump verbose output to test.log so we can surface test names on failure but
+	@# hide it from travis as it exceeds their log limits and causes job to be
+	@# terminated (over 4MB and over 10k lines in the UI). We need to output
+	@# _something_ to stop them terminating us due to inactivity...
+	@echo "===================== submodule: sdk =====================" | tee -a test.log
+	cd sdk && { go test -v $(GOTEST_FLAGS) -tags '$(GOTAGS)' ./... 2>&1 ; echo $$? >> ../exit-code ; } | tee -a ../test.log | egrep '^(ok|FAIL|panic:|--- FAIL|--- PASS)'
+	@echo "===================== submodule: api =====================" | tee -a test.log
+	cd api && { go test -v $(GOTEST_FLAGS) -tags '$(GOTAGS)' ./... 2>&1 ; echo $$? >> ../exit-code ; } | tee -a ../test.log | egrep '^(ok|FAIL|panic:|--- FAIL|--- PASS)'
+	@echo "===================== submodule: root =====================" | tee -a test.log
+	{           go test -v $(GOTEST_FLAGS) -tags '$(GOTAGS)' ./... 2>&1 ; echo $$? >> exit-code    ; } | tee -a test.log    | egrep '^(ok|FAIL|panic:|--- FAIL|--- PASS)'
+	@# if everything worked fine then all 3 zeroes will be collapsed to a single zero here
+	@exit_codes="$$(sort -u exit-code)" ; echo "$$exit_codes" > exit-code
+	@echo "Exit code: $$(cat exit-code)"
+	@# This prints all the race report between ====== lines
+	@awk '/^WARNING: DATA RACE/ {do_print=1; print "=================="} do_print==1 {print} /^={10,}/ {do_print=0}' test.log || true
+	@grep -A10 'panic: ' test.log || true
+	@# Prints all the failure output until the next non-indented line - testify
+	@# helpers often output multiple lines for readability but useless if we can't
+	@# see them. Un-intuitive order of matches is necessary. No || true because
+	@# awk always returns true even if there is no match and it breaks non-bash
+	@# shells locally.
+	@awk '/^[^[:space:]]/ {do_print=0} /--- SKIP/ {do_print=1} do_print==1 {print}' test.log
+	@awk '/^[^[:space:]]/ {do_print=0} /--- FAIL/ {do_print=1} do_print==1 {print}' test.log
+	@grep '^FAIL' test.log || true
+	@if [ "$$(cat exit-code)" == "0" ] ; then echo "PASS" ; exit 0 ; else exit 1 ; fi
+
+test-race:
+	$(MAKE) GOTEST_FLAGS=-race
+
+test-docker: linux go-build-image
+	@# -ti run in the foreground showing stdout
+	@# --rm removes the container once its finished running
+	@# GO_MODCACHE_VOL - args for mapping in the go module cache
+	@# GO_BUILD_CACHE_VOL - args for mapping in the go build cache
+	@# All the env vars are so we pass through all the relevant bits of information
+	@# Needed for running the tests
+	@# We map in our local linux_amd64 bin directory as thats where the linux dep
+	@#   target dropped the binary. We could build the binary in the container too
+	@#   but that might take longer as caching gets weird
+	@# Lastly we map the source dir here to the /consul workdir
+	@echo "Running tests within a docker container"
+	@docker run -ti --rm \
+		-e 'GOTEST_FLAGS=$(GOTEST_FLAGS)' \
+		-e 'GOTAGS=$(GOTAGS)' \
+		-e 'GIT_COMMIT=$(GIT_COMMIT)' \
+		-e 'GIT_COMMIT_YEAR=$(GIT_COMMIT_YEAR)' \
+		-e 'GIT_DIRTY=$(GIT_DIRTY)' \
+		$(TEST_PARALLELIZATION) \
+		$(TEST_DOCKER_RESOURCE_CONSTRAINTS) \
+		$(TEST_MODCACHE_VOL) \
+		$(TEST_BUILDCACHE_VOL) \
+		-v $(MAIN_GOPATH)/bin/linux_amd64/:/go/bin \
+		-v $(shell pwd):/consul \
+		$(GO_BUILD_TAG) \
+		make test-internal
+
+other-consul:
+	@echo "--> Checking for other consul instances"
+	@if ps -ef | grep 'consul agent' | grep -v grep ; then \
+		echo "Found other running consul agents. This may affect your tests." ; \
+		exit 1 ; \
+	fi
+
+lint: -lint-main lint-container-test-deps
+
+.PHONY: -lint-main
+-lint-main: lint-tools
+	@echo "--> Running golangci-lint"
+	@golangci-lint run --build-tags '$(GOTAGS)' && \
+		(cd api && golangci-lint run --build-tags '$(GOTAGS)') && \
+		(cd sdk && golangci-lint run --build-tags '$(GOTAGS)')
+	@echo "--> Running golangci-lint (container tests)"
+	@cd test/integration/consul-container && golangci-lint run --build-tags '$(GOTAGS)'
+	@echo "--> Running lint-consul-retry"
+	@lint-consul-retry
+	@echo "--> Running enumcover"
+	@enumcover ./...
+
+.PHONY: lint-container-test-deps
+lint-container-test-deps:
+	@echo "--> Checking container tests for bad dependencies"
+	@cd test/integration/consul-container && ( \
+		found="$$(go list -m all | grep -c '^github.com/hashicorp/consul ')" ; \
+		if [[ "$$found" != "0" ]]; then \
+			echo "test/integration/consul-container: This project should not depend on the root consul module" >&2 ; \
+			exit 1 ; \
+		fi \
+	)
+
+# Build the static web ui inside a Docker container. For local testing only; do not commit these assets.
+ui: ui-docker
+
+# Build the static web ui with yarn. This is the version to commit.
+.PHONY: ui-regen
+ui-regen:
+	cd $(CURDIR)/ui && make && cd ..
+	rm -rf $(CURDIR)/agent/uiserver/dist
+	mv $(CURDIR)/ui/packages/consul-ui/dist $(CURDIR)/agent/uiserver/
+
+tools:
+	@$(SHELL) $(CURDIR)/build-support/scripts/devtools.sh
+
+.PHONY: lint-tools
+lint-tools:
+	@$(SHELL) $(CURDIR)/build-support/scripts/devtools.sh -lint
+
+.PHONY: proto-tools
+proto-tools:
+	@$(SHELL) $(CURDIR)/build-support/scripts/devtools.sh -protobuf
+
+.PHONY: codegen-tools
+codegen-tools:
+	@$(SHELL) $(CURDIR)/build-support/scripts/devtools.sh -codegen
+
+.PHONY: deep-copy
+deep-copy: codegen-tools
+	@$(SHELL) $(CURDIR)/agent/structs/deep-copy.sh
+	@$(SHELL) $(CURDIR)/agent/proxycfg/deep-copy.sh
+	@$(SHELL) $(CURDIR)/agent/consul/state/deep-copy.sh
+	@$(SHELL) $(CURDIR)/agent/config/deep-copy.sh
+
+version:
+	@echo -n "Version:                    "
+	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh
+	@echo -n "Version + release:          "
+	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh -r
+	@echo -n "Version + git:              "
+	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh  -g
+	@echo -n "Version + release + git:    "
+	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh -r -g
+
+
+docker-images: go-build-image ui-build-image
+
+go-build-image:
+	@echo "Building Golang build container"
+	@docker build $(NOCACHE) $(QUIET) -t $(GO_BUILD_TAG) - < build-support/docker/Build-Go.dockerfile
+
+ui-build-image:
+	@echo "Building UI build container"
+	@docker build $(NOCACHE) $(QUIET) -t $(UI_BUILD_TAG) - < build-support/docker/Build-UI.dockerfile
+
+# Builds consul in a docker container and then dumps executable into ./pkg/bin/...
+consul-docker: go-build-image
+	@$(SHELL) $(CURDIR)/build-support/scripts/build-docker.sh consul
+
+ui-docker: ui-build-image
+	@$(SHELL) $(CURDIR)/build-support/scripts/build-docker.sh ui
+
+# Build image used to run integration tests locally.
+docker-envoy-integ:
+	$(MAKE) GOARCH=amd64 linux
+	docker build \
+      --platform linux/amd64 $(NOCACHE) $(QUIET) \
+      -t 'consul:local' \
+      --build-arg CONSUL_IMAGE_VERSION=$(CONSUL_IMAGE_VERSION) \
+      $(CURDIR)/pkg/bin/linux_amd64 \
+      -f $(CURDIR)/build-support/docker/Consul-Dev.dockerfile
+
+# Run integration tests.
+# Use GO_TEST_FLAGS to run specific tests:
+#      make test-envoy-integ GO_TEST_FLAGS="-run TestEnvoy/case-basic"
+# NOTE: Always uses amd64 images, even when running on M1 macs, to match CI/CD environment.
+test-envoy-integ: $(ENVOY_INTEG_DEPS)
+	@go test -v -timeout=30m -tags integration $(GO_TEST_FLAGS) ./test/integration/connect/envoy
+
+.PHONY: test-compat-integ
+test-compat-integ: test-compat-integ-setup
+ifeq ("$(GOTESTSUM_PATH)","")
+	@cd ./test/integration/consul-container && \
+	go test \
+		-v \
+		-timeout=30m \
+		./... \
+		--tags $(GOTAGS) \
+		--target-image $(CONSUL_COMPAT_TEST_IMAGE) \
+		--target-version local \
+		--latest-image $(CONSUL_COMPAT_TEST_IMAGE) \
+		--latest-version latest
+else
+	@cd ./test/integration/consul-container && \
+	gotestsum \
+		--format=short-verbose \
+		--debug \
+		--rerun-fails=3 \
+		--packages="./..." \
+		-- \
+		--tags $(GOTAGS) \
+		-timeout=30m \
+		./... \
+		--target-image $(CONSUL_COMPAT_TEST_IMAGE) \
+		--target-version local \
+		--latest-image $(CONSUL_COMPAT_TEST_IMAGE) \
+		--latest-version latest
+endif
+
+.PHONY: test-compat-integ-setup
+test-compat-integ-setup: dev-docker
+	@docker tag consul-dev:latest $(CONSUL_COMPAT_TEST_IMAGE):local
+	@docker run --rm -t $(CONSUL_COMPAT_TEST_IMAGE):local consul version
+
+.PHONY: test-metrics-integ
+test-metrics-integ: test-compat-integ-setup
+	@cd ./test/integration/consul-container && \
+		go test -v -timeout=7m ./test/metrics \
+		--target-image $(CONSUL_COMPAT_TEST_IMAGE) \
+		--target-version local \
+		--latest-image $(CONSUL_COMPAT_TEST_IMAGE) \
+		--latest-version latest
+
+test-connect-ca-providers:
+	@echo "Running /agent/connect/ca tests in verbose mode"
+	@go test -v ./agent/connect/ca
+	@go test -v ./agent/consul -run Vault
+	@go test -v ./agent -run Vault
+
+.PHONY: proto
+proto: proto-tools proto-gen proto-mocks
+
+.PHONY: proto-gen
+proto-gen: proto-tools
+	@$(SHELL) $(CURDIR)/build-support/scripts/protobuf.sh
+
+.PHONY: proto-mocks
+proto-mocks:
+	for dir in $(MOCKED_PB_DIRS) ; do \
+		cd proto-public && \
+		rm -f $$dir/mock*.go && \
+		mockery --dir $$dir --inpackage --all --recursive --log-level trace ; \
+	done
+
+.PHONY: proto-format
+proto-format: proto-tools
+	@buf format -w
+
+.PHONY: proto-lint
+proto-lint: proto-tools
+	@buf lint --config proto/buf.yaml --path proto
+	@buf lint --config proto-public/buf.yaml --path proto-public
+	@for fn in $$(find proto -name '*.proto'); do \
+		if [[ "$$fn" = "proto/pbsubscribe/subscribe.proto" ]]; then \
+			continue ; \
+		elif [[ "$$fn" = "proto/pbpartition/partition.proto" ]]; then \
+			continue ; \
+		fi ; \
+		pkg=$$(grep "^package " "$$fn" | sed 's/^package \(.*\);/\1/'); \
+		if [[ "$$pkg" != hashicorp.consul.internal.* ]]; then \
+			echo "ERROR: $$fn: is missing 'hashicorp.consul.internal' package prefix: $$pkg" >&2; \
+			exit 1; \
+		fi \
+	done
+
+# utility to echo a makefile variable (i.e. 'make print-PROTOC_VERSION')
+print-%  : ; @echo $($*)
+
+.PHONY: module-versions
+# Print a list of modules which can be updated.
+# Columns are: module current_version date_of_current_version latest_version
+module-versions:
+	@go list -m -u -f '{{if .Update}} {{printf "%-50v %-40s" .Path .Version}} {{with .Time}} {{ .Format "2006-01-02" -}} {{else}} {{printf "%9s" ""}} {{end}}   {{ .Update.Version}} {{end}}' all
+
+.PHONY: envoy-library
+envoy-library:
+	@$(SHELL) $(CURDIR)/build-support/scripts/envoy-library-references.sh
+
+.PHONY: envoy-regen
+envoy-regen:
+	$(info regenerating envoy golden files)
+	@for d in endpoints listeners routes clusters rbac; do \
+		if [[ -d "agent/xds/testdata/$${d}" ]]; then \
+			find "agent/xds/testdata/$${d}" -name '*.golden' -delete ; \
+		fi \
+	done
+	@go test -tags '$(GOTAGS)' ./agent/xds -update
+	@find "command/connect/envoy/testdata" -name '*.golden' -delete
+	@go test -tags '$(GOTAGS)' ./command/connect/envoy -update
+
+# Point your web browser to http://localhost:3000/consul to live render docs from ./website/
+.PHONY: docs
+docs:
+	make -C website
+
+.PHONY: help
+help:
+	$(info available make targets)
+	$(info ----------------------)
+	@grep "^[a-z0-9-][a-z0-9.-]*:" GNUmakefile  | cut -d':' -f1 | sort
+
+.PHONY: all bin dev dist cov test test-internal cover lint ui tools
+.PHONY: docker-images go-build-image ui-build-image consul-docker ui-docker
+.PHONY: version test-envoy-integ
diff --git a/LICENSE b/LICENSE
index 1f38fcdd11e2d..c72625e4cc88b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,61 +1,356 @@
-License text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.
-“Business Source License” is a trademark of MariaDB Corporation Ab.
-
-Parameters
-
-Licensor:             HashiCorp, Inc.
-Licensed Work:        Consul 1.17.0. The Licensed Work is (c) 2023 HashiCorp, Inc.
-Additional Use Grant: You may make production use of the Licensed Work,
-                      provided such use does not include offering the Licensed Work
-                      to third parties on a hosted or embedded basis which is
-                      competitive with HashiCorp's products.
-Change Date:          Four years from the date the Licensed Work is published.
-Change License:       MPL 2.0
-
-For information about alternative licensing arrangements for the Licensed Work,
-please contact licensing@hashicorp.com.
-
-Notice
-
-Business Source License 1.1
-
-Terms
-
-The Licensor hereby grants you the right to copy, modify, create derivative
-works, redistribute, and make non-production use of the Licensed Work. The
-Licensor may make an Additional Use Grant, above, permitting limited production use.
-
-Effective on the Change Date, or the fourth anniversary of the first publicly
-available distribution of a specific version of the Licensed Work under this
-License, whichever comes first, the Licensor hereby grants you rights under
-the terms of the Change License, and the rights granted in the paragraph
-above terminate.
-
-If your use of the Licensed Work does not comply with the requirements
-currently in effect as described in this License, you must purchase a
-commercial license from the Licensor, its affiliated entities, or authorized
-resellers, or you must refrain from using the Licensed Work.
-
-All copies of the original and modified Licensed Work, and derivative works
-of the Licensed Work, are subject to this License. This License applies
-separately for each version of the Licensed Work and the Change Date may vary
-for each version of the Licensed Work released by Licensor.
-
-You must conspicuously display this License on each original or modified copy
-of the Licensed Work. If you receive the Licensed Work in original or
-modified form from a third party, the terms and conditions set forth in this
-License apply to your use of that work.
-
-Any use of the Licensed Work in violation of this License will automatically
-terminate your rights under this License for the current and all other
-versions of the Licensed Work.
-
-This License does not grant you any right in any trademark or logo of
-Licensor or its affiliates (provided that you may use a trademark or logo of
-Licensor as expressly required by this License).
-
-TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
-AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
-EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
-TITLE.
+Copyright (c) 2013 HashiCorp, Inc.
+
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. “Contributor”
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. “Contributor Version”
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor’s Contribution.
+
+1.3. “Contribution”
+
+     means Covered Software of a particular Contributor.
+
+1.4. “Covered Software”
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. “Incompatible With Secondary Licenses”
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of version
+        1.1 or earlier of the License, but not also under the terms of a
+        Secondary License.
+
+1.6. “Executable Form”
+
+     means any form of the work other than Source Code Form.
+
+1.7. “Larger Work”
+
+     means a work that combines Covered Software with other material, in a separate
+     file or files, that is not Covered Software.
+
+1.8. “License”
+
+     means this document.
+
+1.9. “Licensable”
+
+     means having the right to grant, to the maximum extent possible, whether at the
+     time of the initial grant or subsequently, any and all of the rights conveyed by
+     this License.
+
+1.10. “Modifications”
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to, deletion
+        from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. “Patent Claims” of a Contributor
+
+      means any patent claim(s), including without limitation, method, process,
+      and apparatus claims, in any patent Licensable by such Contributor that
+      would be infringed, but for the grant of the License, by the making,
+      using, selling, offering for sale, having made, import, or transfer of
+      either its Contributions or its Contributor Version.
+
+1.12. “Secondary License”
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. “Source Code Form”
+
+      means the form of the work preferred for making modifications.
+
+1.14. “You” (or “Your”)
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, “You” includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, “control” means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or as
+        part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its Contributions
+        or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution become
+     effective for each Contribution on the date the Contributor first distributes
+     such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under this
+     License. No additional rights or licenses will be implied from the distribution
+     or licensing of Covered Software under this License. Notwithstanding Section
+     2.1(b) above, no patent license is granted by a Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party’s
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of its
+        Contributions.
+
+     This License does not grant any rights in the trademarks, service marks, or
+     logos of any Contributor (except as may be necessary to comply with the
+     notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this License
+     (see Section 10.2) or under the terms of a Secondary License (if permitted
+     under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its Contributions
+     are its original creation(s) or it has sufficient rights to grant the
+     rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under applicable
+     copyright doctrines of fair use, fair dealing, or other equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under the
+     terms of this License. You must inform recipients that the Source Code Form
+     of the Covered Software is governed by the terms of this License, and how
+     they can obtain a copy of this License. You may not attempt to alter or
+     restrict the recipients’ rights in the Source Code Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this License,
+        or sublicense it under different terms, provided that the license for
+        the Executable Form does not attempt to limit or alter the recipients’
+        rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for the
+     Covered Software. If the Larger Work is a combination of Covered Software
+     with a work governed by one or more Secondary Licenses, and the Covered
+     Software is not Incompatible With Secondary Licenses, this License permits
+     You to additionally distribute such Covered Software under the terms of
+     such Secondary License(s), so that the recipient of the Larger Work may, at
+     their option, further distribute the Covered Software under the terms of
+     either this License or such Secondary License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices (including
+     copyright notices, patent notices, disclaimers of warranty, or limitations
+     of liability) contained within the Source Code Form of the Covered
+     Software, except that You may alter any license notices to the extent
+     required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on behalf
+     of any Contributor. You must make it absolutely clear that any such
+     warranty, support, indemnity, or liability obligation is offered by You
+     alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute, judicial
+   order, or regulation then You must: (a) comply with the terms of this License
+   to the maximum extent possible; and (b) describe the limitations and the code
+   they affect. Such description must be placed in a text file included with all
+   distributions of the Covered Software under this License. Except to the
+   extent prohibited by statute or regulation, such description must be
+   sufficiently detailed for a recipient of ordinary skill to be able to
+   understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
+     if such Contributor fails to notify You of the non-compliance by some
+     reasonable means prior to 60 days after You have come back into compliance.
+     Moreover, Your grants from a particular Contributor are reinstated on an
+     ongoing basis if such Contributor notifies You of the non-compliance by
+     some reasonable means, this is the first time You have received notice of
+     non-compliance with this License from such Contributor, and You become
+     compliant prior to 30 days after Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions, counter-claims,
+     and cross-claims) alleging that a Contributor Version directly or
+     indirectly infringes any patent, then the rights granted to You by any and
+     all Contributors for the Covered Software under Section 2.1 of this License
+     shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an “as is” basis, without
+   warranty of any kind, either expressed, implied, or statutory, including,
+   without limitation, warranties that the Covered Software is free of defects,
+   merchantable, fit for a particular purpose or non-infringing. The entire
+   risk as to the quality and performance of the Covered Software is with You.
+   Should any Covered Software prove defective in any respect, You (not any
+   Contributor) assume the cost of any necessary servicing, repair, or
+   correction. This disclaimer of warranty constitutes an essential part of this
+   License. No use of  any Covered Software is authorized under this License
+   except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from such
+   party’s negligence to the extent applicable law prohibits such limitation.
+   Some jurisdictions do not allow the exclusion or limitation of incidental or
+   consequential damages, so this exclusion and limitation may not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts of
+   a jurisdiction where the defendant maintains its principal place of business
+   and such litigation shall be governed by laws of that jurisdiction, without
+   reference to its conflict-of-law provisions. Nothing in this Section shall
+   prevent a party’s ability to bring cross-claims or counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject matter
+   hereof. If any provision of this License is held to be unenforceable, such
+   provision shall be reformed only to the extent necessary to make it
+   enforceable. Any law or regulation which provides that the language of a
+   contract shall be construed against the drafter shall not be used to construe
+   this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version of
+      the License under which You originally received the Covered Software, or
+      under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a modified
+      version of this License if you rename the license and remove any
+      references to the name of the license steward (except to note that such
+      modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+      If You choose to distribute Source Code Form that is Incompatible With
+      Secondary Licenses under the terms of this version of the License, the
+      notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file, then
+You may include the notice in a location (such as a LICENSE file in a relevant
+directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - “Incompatible With Secondary Licenses” Notice
+
+      This Source Code Form is “Incompatible
+      With Secondary Licenses”, as defined by
+      the Mozilla Public License, v. 2.0.
+
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4ee07faef5003..0000000000000
--- a/Makefile
+++ /dev/null
@@ -1,560 +0,0 @@
-# For documentation on building consul from source, refer to:
-# https://www.consul.io/docs/install#compiling-from-source
-
-SHELL = bash
-
-
-GO_MODULES := $(shell find . -name go.mod -exec dirname {} \; | grep -v "proto-gen-rpc-glue/e2e" | sort)
-
-###
-# These version variables can either be a valid string for "go install <module>@<version>"
-# or the string @DEV to imply use what is currently installed locally.
-###
-GOLANGCI_LINT_VERSION='v1.51.1'
-MOCKERY_VERSION='v2.20.0'
-BUF_VERSION='v1.26.0'
-
-PROTOC_GEN_GO_GRPC_VERSION="v1.2.0"
-MOG_VERSION='v0.4.0'
-PROTOC_GO_INJECT_TAG_VERSION='v1.3.0'
-PROTOC_GEN_GO_BINARY_VERSION="v0.1.0"
-DEEP_COPY_VERSION='bc3f5aa5735d8a54961580a3a24422c308c831c2'
-COPYWRITE_TOOL_VERSION='v0.16.4'
-
-MOCKED_PB_DIRS= pbdns
-
-GOTAGS ?=
-GOPATH=$(shell go env GOPATH)
-GOARCH?=$(shell go env GOARCH)
-MAIN_GOPATH=$(shell go env GOPATH | cut -d: -f1)
-
-export PATH := $(PWD)/bin:$(GOPATH)/bin:$(PATH)
-
-# Get the git commit
-GIT_COMMIT?=$(shell git rev-parse --short HEAD)
-GIT_COMMIT_YEAR?=$(shell git show -s --format=%cd --date=format:%Y HEAD)
-GIT_DIRTY?=$(shell test -n "`git status --porcelain`" && echo "+CHANGES" || true)
-GIT_IMPORT=github.com/hashicorp/consul/version
-DATE_FORMAT="%Y-%m-%dT%H:%M:%SZ" # it's tricky to do an RFC3339 format in a cross platform way, so we hardcode UTC
-GIT_DATE=$(shell $(CURDIR)/build-support/scripts/build-date.sh) # we're using this for build date because it's stable across platform builds
-GOLDFLAGS=-X $(GIT_IMPORT).GitCommit=$(GIT_COMMIT)$(GIT_DIRTY) -X $(GIT_IMPORT).BuildDate=$(GIT_DATE)
-
-GOTESTSUM_PATH?=$(shell command -v gotestsum)
-
-ifeq ($(FORCE_REBUILD),1)
-NOCACHE=--no-cache
-else
-NOCACHE=
-endif
-
-DOCKER_BUILD_QUIET?=1
-ifeq (${DOCKER_BUILD_QUIET},1)
-QUIET=-q
-else
-QUIET=
-endif
-
-ifeq ("$(GOTAGS)","")
-CONSUL_COMPAT_TEST_IMAGE=hashicorp/consul
-else
-CONSUL_COMPAT_TEST_IMAGE=hashicorp/consul-enterprise
-endif
-
-CONSUL_DEV_IMAGE?=consul-dev
-GO_BUILD_TAG?=consul-build-go
-UI_BUILD_TAG?=consul-build-ui
-BUILD_CONTAINER_NAME?=consul-builder
-CONSUL_IMAGE_VERSION?=latest
-ENVOY_VERSION?='1.25.4'
-CONSUL_DATAPLANE_IMAGE := $(or $(CONSUL_DATAPLANE_IMAGE),"docker.io/hashicorppreview/consul-dataplane:1.3-dev-ubi")
-
-CONSUL_VERSION?=$(shell cat version/VERSION)
-
-TEST_MODCACHE?=1
-TEST_BUILDCACHE?=1
-
-# You can only use as many CPUs as you have allocated to docker
-ifdef TEST_DOCKER_CPUS
-TEST_DOCKER_RESOURCE_CONSTRAINTS=--cpus $(TEST_DOCKER_CPUS)
-TEST_PARALLELIZATION=-e GOMAXPROCS=$(TEST_DOCKER_CPUS)
-else
-TEST_DOCKER_RESOURCE_CONSTRAINTS=
-TEST_PARALLELIZATION=
-endif
-
-ifeq ($(TEST_MODCACHE), 1)
-TEST_MODCACHE_VOL=-v $(MAIN_GOPATH)/pkg/mod:/go/pkg/mod
-else
-TEST_MODCACHE_VOL=
-endif
-
-ifeq ($(TEST_BUILDCACHE), 1)
-TEST_BUILDCACHE_VOL=-v $(shell go env GOCACHE):/root/.caches/go-build
-else
-TEST_BUILDCACHE_VOL=
-endif
-
-DIST_TAG?=1
-DIST_BUILD?=1
-DIST_SIGN?=1
-
-ifdef DIST_VERSION
-DIST_VERSION_ARG=-v "$(DIST_VERSION)"
-else
-DIST_VERSION_ARG=
-endif
-
-ifdef DIST_RELEASE_DATE
-DIST_DATE_ARG=-d "$(DIST_RELEASE_DATE)"
-else
-DIST_DATE_ARG=
-endif
-
-ifdef DIST_PRERELEASE
-DIST_REL_ARG=-r "$(DIST_PRERELEASE)"
-else
-DIST_REL_ARG=
-endif
-
-PUB_GIT?=1
-PUB_WEBSITE?=1
-
-ifeq ($(PUB_GIT),1)
-PUB_GIT_ARG=-g
-else
-PUB_GIT_ARG=
-endif
-
-ifeq ($(PUB_WEBSITE),1)
-PUB_WEBSITE_ARG=-w
-else
-PUB_WEBSITE_ARG=
-endif
-
-
-export GO_BUILD_TAG
-export UI_BUILD_TAG
-export BUILD_CONTAINER_NAME
-export GIT_COMMIT
-export GIT_COMMIT_YEAR
-export GIT_DIRTY
-export GOTAGS
-export GOLDFLAGS
-
-# Allow skipping docker build during integration tests in CI since we already
-# have a built binary
-ENVOY_INTEG_DEPS?=docker-envoy-integ
-ifdef SKIP_DOCKER_BUILD
-ENVOY_INTEG_DEPS=noop
-endif
-
-##@ Build
-
-.PHONY: all
-all: dev-build ## Command running by default
-
-# used to make integration dependencies conditional
-noop: ;
-
-.PHONY: dev
-dev: dev-build ## Dev creates binaries for testing locally - these are put into ./bin
-
-.PHONY: dev-build
-dev-build: ## Same as dev
-	mkdir -p bin
-	CGO_ENABLED=0 go install -ldflags "$(GOLDFLAGS)" -tags "$(GOTAGS)"
-	# rm needed due to signature caching (https://apple.stackexchange.com/a/428388)
-	rm -f ./bin/consul
-	cp ${MAIN_GOPATH}/bin/consul ./bin/consul
-
-.PHONY: dev-docker-dbg
-dev-docker-dbg: dev-docker ## Build containers for debug mode
-	@echo "Pulling consul container image - $(CONSUL_IMAGE_VERSION)"
-	@docker pull hashicorp/consul:$(CONSUL_IMAGE_VERSION) >/dev/null
-	@echo "Building Consul Development container - $(CONSUL_DEV_IMAGE)"
-	@#  'consul-dbg:local' tag is needed to run the integration tests
-	@#  'consul-dev:latest' is needed by older workflows
-	@docker buildx use default && docker buildx build -t $(CONSUL_COMPAT_TEST_IMAGE)-dbg:local \
-       --platform linux/$(GOARCH) \
-	   --build-arg CONSUL_IMAGE_VERSION=$(CONSUL_IMAGE_VERSION) \
-       --load \
-       -f $(CURDIR)/build-support/docker/Consul-Dev-Dbg.dockerfile $(CURDIR)/pkg/bin/
-
-.PHONY: dev-docker
-dev-docker: linux dev-build ## Build and tag docker images in dev env
-	@echo "Pulling consul container image - $(CONSUL_IMAGE_VERSION)"
-	@docker pull hashicorp/consul:$(CONSUL_IMAGE_VERSION) >/dev/null
-	@echo "Building Consul Development container - $(CONSUL_DEV_IMAGE)"
-	@#  'consul:local' tag is needed to run the integration tests
-	@#  'consul-dev:latest' is needed by older workflows
-	@docker buildx use default && docker buildx build -t 'consul:local' -t '$(CONSUL_DEV_IMAGE)' \
-       --platform linux/$(GOARCH) \
-	   --build-arg CONSUL_IMAGE_VERSION=$(CONSUL_IMAGE_VERSION) \
-		--label org.opencontainers.image.version=$(CONSUL_VERSION) \
-		--label version=$(CONSUL_VERSION) \
-       --load \
-       -f $(CURDIR)/build-support/docker/Consul-Dev-Multiarch.dockerfile $(CURDIR)/pkg/bin/
-	docker tag 'consul:local'  '$(CONSUL_COMPAT_TEST_IMAGE):local'
-
-.PHONY: check-remote-dev-image-env
-check-remote-dev-image-env: ## Check remote dev image env
-ifndef REMOTE_DEV_IMAGE
-	$(error REMOTE_DEV_IMAGE is undefined: set this image to <your_docker_repo>/<your_docker_image>:<image_tag>, e.g. hashicorp/consul-k8s-dev:latest)
-endif
-
-.PHONY: remote-docker
-remote-docker: check-remote-dev-image-env ## Remote docker
-	$(MAKE) GOARCH=amd64 linux
-	$(MAKE) GOARCH=arm64 linux
-	@echo "Pulling consul container image - $(CONSUL_IMAGE_VERSION)"
-	@docker pull hashicorp/consul:$(CONSUL_IMAGE_VERSION) >/dev/null
-	@echo "Building and Pushing Consul Development container - $(REMOTE_DEV_IMAGE)"
-	@if ! docker buildx inspect consul-builder; then \
-		docker buildx create --name consul-builder --driver docker-container --bootstrap; \
-	fi; 
-	@docker buildx use consul-builder && docker buildx build -t '$(REMOTE_DEV_IMAGE)' \
-       --platform linux/amd64,linux/arm64 \
-	   --build-arg CONSUL_IMAGE_VERSION=$(CONSUL_IMAGE_VERSION) \
-		--label org.opencontainers.image.version=$(CONSUL_VERSION) \
-		--label version=$(CONSUL_VERSION) \
-       --push \
-       -f $(CURDIR)/build-support/docker/Consul-Dev-Multiarch.dockerfile $(CURDIR)/pkg/bin/
-
-linux:  ## Linux builds a linux binary compatible with the source platform
-	@mkdir -p ./pkg/bin/linux_$(GOARCH)
-	CGO_ENABLED=0 GOOS=linux GOARCH=$(GOARCH) go build -o ./pkg/bin/linux_$(GOARCH) -ldflags "$(GOLDFLAGS)" -tags "$(GOTAGS)"
-
-.PHONY: go-mod-tidy
-go-mod-tidy: $(foreach mod,$(GO_MODULES),go-mod-tidy/$(mod)) ## Run go mod tidy in every module
-
-.PHONY: mod-tidy/%
-go-mod-tidy/%:
-	@echo "--> Running go mod tidy ($*)"
-	@cd $* && go mod tidy
-
-##@ Checks
-
-.PHONY: fmt
-fmt: $(foreach mod,$(GO_MODULES),fmt/$(mod)) ## Format go modules
-
-.PHONY: fmt/%
-fmt/%:
-	@echo "--> Running go fmt ($*)"
-	@cd $* && gofmt -s -l -w .
-
-.PHONY: lint
-lint: $(foreach mod,$(GO_MODULES),lint/$(mod)) lint-container-test-deps ## Lint go modules and test deps
-
-.PHONY: lint/%
-lint/%:
-	@echo "--> Running golangci-lint ($*)"
-	@cd $* && GOWORK=off golangci-lint run --build-tags '$(GOTAGS)'
-	@echo "--> Running lint-consul-retry ($*)"
-	@cd $* && GOWORK=off lint-consul-retry
-	@echo "--> Running enumcover ($*)"
-	@cd $* && GOWORK=off enumcover ./...
-
-# check that the test-container module only imports allowlisted packages
-# from the root consul module. Generally we don't want to allow these imports.
-# In a few specific instances though it is okay to import test definitions and
-# helpers from some of the packages in the root module.
-.PHONY: lint-container-test-deps
-lint-container-test-deps: ## Check that the test-container module only imports allowlisted packages from the root consul module.
-	@echo "--> Checking container tests for bad dependencies"
-	@cd test/integration/consul-container && \
-		$(CURDIR)/build-support/scripts/check-allowed-imports.sh \
-			github.com/hashicorp/consul \
-			"internal/catalog/catalogtest" \
-			"internal/resource/resourcetest"
-
-##@ Testing
-
-.PHONY: cover
-cover: cov ## Run tests and generate coverage report
-
-.PHONY: cov
-cov: other-consul dev-build
-	go test -tags '$(GOTAGS)' ./... -coverprofile=coverage.out
-	cd sdk && go test -tags '$(GOTAGS)' ./... -coverprofile=../coverage.sdk.part
-	cd api && go test -tags '$(GOTAGS)' ./... -coverprofile=../coverage.api.part
-	grep -h -v "mode: set" coverage.{sdk,api}.part >> coverage.out
-	rm -f coverage.{sdk,api}.part
-	go tool cover -html=coverage.out
-
-.PHONY: test
-test: other-consul dev-build lint test-internal
-
-.PHONY: test-internal
-test-internal: ## Test internal
-	@echo "--> Running go test"
-	@rm -f test.log exit-code
-	@# Dump verbose output to test.log so we can surface test names on failure but
-	@# hide it from travis as it exceeds their log limits and causes job to be
-	@# terminated (over 4MB and over 10k lines in the UI). We need to output
-	@# _something_ to stop them terminating us due to inactivity...
-	@echo "===================== submodule: sdk =====================" | tee -a test.log
-	cd sdk && { go test -v $(GOTEST_FLAGS) -tags '$(GOTAGS)' ./... 2>&1 ; echo $$? >> ../exit-code ; } | tee -a ../test.log | egrep '^(ok|FAIL|panic:|--- FAIL|--- PASS)'
-	@echo "===================== submodule: api =====================" | tee -a test.log
-	cd api && { go test -v $(GOTEST_FLAGS) -tags '$(GOTAGS)' ./... 2>&1 ; echo $$? >> ../exit-code ; } | tee -a ../test.log | egrep '^(ok|FAIL|panic:|--- FAIL|--- PASS)'
-	@echo "===================== submodule: root =====================" | tee -a test.log
-	{           go test -v $(GOTEST_FLAGS) -tags '$(GOTAGS)' ./... 2>&1 ; echo $$? >> exit-code    ; } | tee -a test.log    | egrep '^(ok|FAIL|panic:|--- FAIL|--- PASS)'
-	@# if everything worked fine then all 3 zeroes will be collapsed to a single zero here
-	@exit_codes="$$(sort -u exit-code)" ; echo "$$exit_codes" > exit-code
-	@echo "Exit code: $$(cat exit-code)"
-	@# This prints all the race report between ====== lines
-	@awk '/^WARNING: DATA RACE/ {do_print=1; print "=================="} do_print==1 {print} /^={10,}/ {do_print=0}' test.log || true
-	@grep -A10 'panic: ' test.log || true
-	@# Prints all the failure output until the next non-indented line - testify
-	@# helpers often output multiple lines for readability but useless if we can't
-	@# see them. Un-intuitive order of matches is necessary. No || true because
-	@# awk always returns true even if there is no match and it breaks non-bash
-	@# shells locally.
-	@awk '/^[^[:space:]]/ {do_print=0} /--- SKIP/ {do_print=1} do_print==1 {print}' test.log
-	@awk '/^[^[:space:]]/ {do_print=0} /--- FAIL/ {do_print=1} do_print==1 {print}' test.log
-	@grep '^FAIL' test.log || true
-	@if [ "$$(cat exit-code)" == "0" ] ; then echo "PASS" ; exit 0 ; else exit 1 ; fi
-
-.PHONY: test-all
-test-all: other-consul dev-build lint $(foreach mod,$(GO_MODULES),test-module/$(mod)) ## Test all
-
-.PHONY: test-module/%
-test-module/%:
-	@echo "--> Running go test ($*)"
-	cd $* && go test $(GOTEST_FLAGS) -tags '$(GOTAGS)' ./...
-
-.PHONY: test-race
-test-race: ## Test race
-	$(MAKE) GOTEST_FLAGS=-race
-
-.PHONY: other-consul
-other-consul: ## Checking for other consul instances
-	@echo "--> Checking for other consul instances"
-	@if ps -ef | grep 'consul agent' | grep -v grep ; then \
-		echo "Found other running consul agents. This may affect your tests." ; \
-		exit 1 ; \
-	fi
-
-# Use GO_TEST_FLAGS to run specific tests:
-#      make test-envoy-integ GO_TEST_FLAGS="-run TestEnvoy/case-basic"
-# NOTE: Always uses amd64 images, even when running on M1 macs, to match CI/CD environment.
-#       You can also specify the envoy version (example: 1.27.0) setting the environment variable: ENVOY_VERSION=1.27.0
-.PHONY: test-envoy-integ
-test-envoy-integ: $(ENVOY_INTEG_DEPS) ## Run integration tests.
-	@go test -v -timeout=30m -tags integration $(GO_TEST_FLAGS) ./test/integration/connect/envoy
-
-# NOTE: Use DOCKER_BUILDKIT=0, if docker build fails to resolve consul:local base image
-.PHONY: test-compat-integ-setup
-test-compat-integ-setup: dev-docker
-	@docker tag consul-dev:latest $(CONSUL_COMPAT_TEST_IMAGE):local
-	@docker run --rm -t $(CONSUL_COMPAT_TEST_IMAGE):local consul version
-	@#  'consul-envoy:target-version' is needed by compatibility integ test
-	@docker build -t consul-envoy:target-version --build-arg CONSUL_IMAGE=$(CONSUL_COMPAT_TEST_IMAGE):local --build-arg ENVOY_VERSION=${ENVOY_VERSION} -f ./test/integration/consul-container/assets/Dockerfile-consul-envoy ./test/integration/consul-container/assets
-	@docker build -t consul-dataplane:local --build-arg CONSUL_IMAGE=$(CONSUL_COMPAT_TEST_IMAGE):local --build-arg CONSUL_DATAPLANE_IMAGE=${CONSUL_DATAPLANE_IMAGE} -f ./test/integration/consul-container/assets/Dockerfile-consul-dataplane ./test/integration/consul-container/assets
-
-.PHONY: test-compat-integ
-test-compat-integ: test-compat-integ-setup ## Test compat integ
-ifeq ("$(GOTESTSUM_PATH)","")
-	@cd ./test/integration/consul-container && \
-	go test \
-		-v \
-		-timeout=30m \
-		./... \
-		--tags $(GOTAGS) \
-		--target-image $(CONSUL_COMPAT_TEST_IMAGE) \
-		--target-version local \
-		--latest-image $(CONSUL_COMPAT_TEST_IMAGE) \
-		--latest-version latest
-else
-	@cd ./test/integration/consul-container && \
-	gotestsum \
-		--format=short-verbose \
-		--debug \
-		--rerun-fails=3 \
-		--packages="./..." \
-		-- \
-		--tags $(GOTAGS) \
-		-timeout=30m \
-		./... \
-		--target-image $(CONSUL_COMPAT_TEST_IMAGE) \
-		--target-version local \
-		--latest-image $(CONSUL_COMPAT_TEST_IMAGE) \
-		--latest-version latest
-endif
-
-.PHONY: test-metrics-integ
-test-metrics-integ: test-compat-integ-setup ## Test metrics integ
-	@cd ./test/integration/consul-container && \
-		go test -v -timeout=7m ./test/metrics \
-		--target-image $(CONSUL_COMPAT_TEST_IMAGE) \
-		--target-version local \
-		--latest-image $(CONSUL_COMPAT_TEST_IMAGE) \
-		--latest-version latest
-
-.PHONY: test-connect-ca-providers
-test-connect-ca-providers: ## Running /agent/connect/ca tests in verbose mode
-	@echo "Running /agent/connect/ca tests in verbose mode"
-	@go test -v ./agent/connect/ca
-	@go test -v ./agent/consul -run Vault
-	@go test -v ./agent -run Vault
-
-##@ UI
-
-.PHONY: ui
-ui: ui-docker ## Build the static web ui inside a Docker container. For local testing only; do not commit these assets.
-
-.PHONY: ui-regen
-ui-regen: ## Build the static web ui with yarn. This is the version to commit.
-	cd $(CURDIR)/ui && make && cd ..
-	rm -rf $(CURDIR)/agent/uiserver/dist
-	mv $(CURDIR)/ui/packages/consul-ui/dist $(CURDIR)/agent/uiserver/
-
-.PHONY: ui-build-image
-ui-build-image: ## Building UI build container
-	@echo "Building UI build container"
-	@docker build $(NOCACHE) $(QUIET) -t $(UI_BUILD_TAG) - < build-support/docker/Build-UI.dockerfile
-
-.PHONY: ui-docker
-ui-docker: ui-build-image ## Builds ui within docker container and copy all the relevant artifacts out of the containers back to the source
-	@$(SHELL) $(CURDIR)/build-support/scripts/build-docker.sh ui
-
-##@ Tools
-
-.PHONY: tools
-tools: ## Installs various supporting Go tools.
-	@$(SHELL) $(CURDIR)/build-support/scripts/devtools.sh
-
-.PHONY: lint-tools
-lint-tools: ## Install tools for linting
-	@$(SHELL) $(CURDIR)/build-support/scripts/devtools.sh -lint
-
-.PHONY: codegen-tools
-codegen-tools: ## Install tools for codegen
-	@$(SHELL) $(CURDIR)/build-support/scripts/devtools.sh -codegen
-
-.PHONY: codegen
-codegen: codegen-tools ## Deep copy
-	@$(SHELL) $(CURDIR)/agent/structs/deep-copy.sh
-	@$(SHELL) $(CURDIR)/agent/proxycfg/deep-copy.sh
-	@$(SHELL) $(CURDIR)/agent/consul/state/deep-copy.sh
-	@$(SHELL) $(CURDIR)/agent/config/deep-copy.sh
-	copywrite headers
-
-print-%  : ; @echo $($*) ## utility to echo a makefile variable (i.e. 'make print-GOPATH')
-
-.PHONY: module-versions
-module-versions: ## Print a list of modules which can be updated. Columns are: module current_version date_of_current_version latest_version
-	@go list -m -u -f '{{if .Update}} {{printf "%-50v %-40s" .Path .Version}} {{with .Time}} {{ .Format "2006-01-02" -}} {{else}} {{printf "%9s" ""}} {{end}}   {{ .Update.Version}} {{end}}' all
-
-.PHONY: docs
-docs: ## Point your web browser to http://localhost:3000/consul to live render docs from ./website/
-	make -C website
-
-##@ Release
-
-.PHONY: version
-version:  ## Current Consul version
-	@echo -n "Version:                    "
-	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh
-	@echo -n "Version + release:          "
-	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh -r
-	@echo -n "Version + git:              "
-	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh  -g
-	@echo -n "Version + release + git:    "
-	@$(SHELL) $(CURDIR)/build-support/scripts/version.sh -r -g
-
-.PHONY: docker-images
-docker-images: go-build-image ui-build-image
-
-.PHONY: go-build-image
-go-build-image: ## Building Golang build container
-	@echo "Building Golang build container"
-	@docker build $(NOCACHE) $(QUIET) -t $(GO_BUILD_TAG) - < build-support/docker/Build-Go.dockerfile
-
-.PHONY: consul-docker
-consul-docker: go-build-image ## Builds consul in a docker container and then dumps executable into ./pkg/bin/...
-	@$(SHELL) $(CURDIR)/build-support/scripts/build-docker.sh consul
-
-.PHONY: docker-envoy-integ
-docker-envoy-integ: ## Build image used to run integration tests locally.
-	$(MAKE) GOARCH=amd64 linux
-	docker build \
-      --platform linux/amd64 $(NOCACHE) $(QUIET) \
-      -t 'consul:local' \
-      --build-arg CONSUL_IMAGE_VERSION=$(CONSUL_IMAGE_VERSION) \
-      $(CURDIR)/pkg/bin/linux_amd64 \
-      -f $(CURDIR)/build-support/docker/Consul-Dev.dockerfile
-
-##@ Proto
-
-.PHONY: proto
-proto: proto-tools proto-gen proto-mocks ## Protobuf setup command
-
-.PHONY: proto-tools
-proto-tools: ## Install tools for protobuf
-	@$(SHELL) $(CURDIR)/build-support/scripts/devtools.sh -protobuf
-
-.PHONY: proto-gen
-proto-gen: proto-tools ## Regenerates all Go files from protobuf definitions
-	@$(SHELL) $(CURDIR)/build-support/scripts/protobuf.sh
-
-.PHONY: proto-mocks
-proto-mocks: ## Proto mocks
-	for dir in $(MOCKED_PB_DIRS) ; do \
-		cd proto-public && \
-		rm -f $$dir/mock*.go && \
-		mockery --dir $$dir --inpackage --all --recursive --log-level trace ; \
-	done
-
-.PHONY: proto-format
-proto-format: proto-tools ## Proto format
-	@buf format -w
-
-.PHONY: proto-lint
-proto-lint: proto-tools ## Proto lint
-	@buf lint 
-	@for fn in $$(find proto -name '*.proto'); do \
-		if [[ "$$fn" = "proto/private/pbsubscribe/subscribe.proto" ]]; then \
-			continue ; \
-		elif [[ "$$fn" = "proto/private/pbpartition/partition.proto" ]]; then \
-			continue ; \
-		fi ; \
-		pkg=$$(grep "^package " "$$fn" | sed 's/^package \(.*\);/\1/'); \
-		if [[ "$$pkg" != hashicorp.consul.internal.* ]]; then \
-			echo "ERROR: $$fn: is missing 'hashicorp.consul.internal' package prefix: $$pkg" >&2; \
-			exit 1; \
-		fi \
-	done
-
-##@ Envoy
-
-.PHONY: envoy-library
-envoy-library: ## Ensures that all of the protobuf packages present in the github.com/envoyproxy/go-control-plane library are referenced in the consul codebase
-	@$(SHELL) $(CURDIR)/build-support/scripts/envoy-library-references.sh
-
-.PHONY: envoy-regen
-envoy-regen: ## Regenerating envoy golden files
-	$(info regenerating envoy golden files)
-	@for d in endpoints listeners routes clusters rbac; do \
-		if [[ -d "agent/xds/testdata/$${d}" ]]; then \
-			find "agent/xds/testdata/$${d}" -name '*.golden' -delete ; \
-		fi \
-	done
-	@go test -tags '$(GOTAGS)' ./agent/xds -update
-	@find "command/connect/envoy/testdata" -name '*.golden' -delete
-	@go test -tags '$(GOTAGS)' ./command/connect/envoy -update
-
-##@ Help
-
-# The help target prints out all targets with their descriptions organized
-# beneath their categories. The categories are represented by '##@' and the
-# target descriptions by '##'. The awk commands is responsible for reading the
-# entire set of makefiles included in this invocation, looking for lines of the
-# file as xyz: ## something, and then pretty-format the target and help. Then,
-# if there's a line with ##@ something, that gets pretty-printed as a category.
-# More info on the usage of ANSI control characters for terminal formatting:
-# https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_parameters
-# More info on the awk command:
-# http://linuxcommand.org/lc3_adv_awk.php
-.PHONY: help
-help: ## Display this help.
-	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
diff --git a/README.md b/README.md
index 870e00f76c761..6874819733b8d 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,7 @@
   <span>Consul</span>
 </h1>
 
-[![License: BUSL-1.1](https://img.shields.io/badge/License-BUSL--1.1-yellow.svg)](LICENSE)
-[![Docker Pulls](https://img.shields.io/docker/pulls/hashicorp/consul.svg)](https://hub.docker.com/r/hashicorp/consul)
+[![Docker Pulls](https://img.shields.io/docker/pulls/_/consul.svg)](https://hub.docker.com/_/consul)
 [![Go Report Card](https://goreportcard.com/badge/github.com/hashicorp/consul)](https://goreportcard.com/report/github.com/hashicorp/consul)
 
 Consul is a distributed, highly available, and data center aware solution to connect and configure applications across dynamic, distributed infrastructure.
@@ -32,8 +31,9 @@ Consul provides several key features:
   discovery prevents routing traffic to unhealthy hosts and enables service
   level circuit breakers.
 
-* **Dynamic App Configuration** - An HTTP API that allows users to store indexed objects within Consul,
-  for storing configuration parameters and application metadata.
+* **Key/Value Storage** - A flexible key/value store enables storing
+  dynamic configuration, feature flagging, coordination, leader election and
+  more. The simple HTTP API makes it easy to use anywhere.
 
 Consul runs on Linux, macOS, FreeBSD, Solaris, and Windows and includes an
 optional [browser based UI](https://demo.consul.io). A commercial version
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000000000..43752be80dedb
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,66 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+
+LINUX_BASE_BOX = "bento/ubuntu-16.04"
+
+Vagrant.configure(2) do |config|
+	config.vm.define "linux", autostart: true, primary: true do |vmCfg|
+		vmCfg.vm.box = LINUX_BASE_BOX
+		vmCfg.vm.hostname = "linux"
+		vmCfg = configureProviders vmCfg,
+			cpus: suggestedCPUCores()
+
+		vmCfg = configureLinuxProvisioners(vmCfg)
+
+		vmCfg.vm.synced_folder '.',
+			'/opt/gopath/src/github.com/hashicorp/consul'
+
+        vmCfg.vm.network "forwarded_port", guest: 8500, host: 8500, auto_correct: true
+	end
+end
+
+def configureLinuxProvisioners(vmCfg)
+	vmCfg.vm.provision "shell",
+		privileged: true,
+		inline: 'rm -f /home/vagrant/linux.iso'
+
+	vmCfg.vm.provision "shell",
+		privileged: true,
+		path: './scripts/vagrant-linux-priv-go.sh'
+
+	return vmCfg
+end
+
+def configureProviders(vmCfg, cpus: "2", memory: "2048")
+	vmCfg.vm.provider "virtualbox" do |v|
+		v.memory = memory
+		v.cpus = cpus
+	end
+
+	["vmware_fusion", "vmware_workstation"].each do |p|
+		vmCfg.vm.provider p do |v|
+			v.enable_vmrun_ip_lookup = false
+			v.vmx["memsize"] = memory
+			v.vmx["numvcpus"] = cpus
+		end
+	end
+
+	vmCfg.vm.provider "virtualbox" do |v|
+		v.memory = memory
+		v.cpus = cpus
+	end
+
+	return vmCfg
+end
+
+def suggestedCPUCores()
+	case RbConfig::CONFIG['host_os']
+	when /darwin/
+		Integer(`sysctl -n hw.ncpu`) / 2
+	when /linux/
+		Integer(`cat /proc/cpuinfo | grep processor | wc -l`) / 2
+	else
+		2
+	end
+end
diff --git a/acl/MockAuthorizer.go b/acl/MockAuthorizer.go
index 46e6c243a6343..22be8c9b762c3 100644
--- a/acl/MockAuthorizer.go
+++ b/acl/MockAuthorizer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import "github.com/stretchr/testify/mock"
@@ -59,31 +56,6 @@ func (m *MockAuthorizer) EventWrite(segment string, ctx *AuthorizerContext) Enfo
 	return ret.Get(0).(EnforcementDecision)
 }
 
-// IdentityRead checks for permission to read a given workload identity.
-func (m *MockAuthorizer) IdentityRead(segment string, ctx *AuthorizerContext) EnforcementDecision {
-	ret := m.Called(segment, ctx)
-	return ret.Get(0).(EnforcementDecision)
-}
-
-// IdentityReadAll checks for permission to read all workload identities.
-func (m *MockAuthorizer) IdentityReadAll(ctx *AuthorizerContext) EnforcementDecision {
-	ret := m.Called(ctx)
-	return ret.Get(0).(EnforcementDecision)
-}
-
-// IdentityWrite checks for permission to create or update a given
-// workload identity.
-func (m *MockAuthorizer) IdentityWrite(segment string, ctx *AuthorizerContext) EnforcementDecision {
-	ret := m.Called(segment, ctx)
-	return ret.Get(0).(EnforcementDecision)
-}
-
-// IdentityWriteAny checks for write permission on any workload identity.
-func (m *MockAuthorizer) IdentityWriteAny(ctx *AuthorizerContext) EnforcementDecision {
-	ret := m.Called(ctx)
-	return ret.Get(0).(EnforcementDecision)
-}
-
 // IntentionDefaultAllow determines the default authorized behavior
 // when no intentions match a Connect request.
 func (m *MockAuthorizer) IntentionDefaultAllow(ctx *AuthorizerContext) EnforcementDecision {
@@ -256,19 +228,6 @@ func (m *MockAuthorizer) Snapshot(ctx *AuthorizerContext) EnforcementDecision {
 	return ret.Get(0).(EnforcementDecision)
 }
 
-// TrafficPermissionsRead determines if specific traffic permissions can be read.
-func (m *MockAuthorizer) TrafficPermissionsRead(segment string, ctx *AuthorizerContext) EnforcementDecision {
-	ret := m.Called(segment, ctx)
-	return ret.Get(0).(EnforcementDecision)
-}
-
-// TrafficPermissionsWrite determines if specific traffic permissions can be
-// created, modified, or deleted.
-func (m *MockAuthorizer) TrafficPermissionsWrite(segment string, ctx *AuthorizerContext) EnforcementDecision {
-	ret := m.Called(segment, ctx)
-	return ret.Get(0).(EnforcementDecision)
-}
-
 func (p *MockAuthorizer) ToAllowAuthorizer() AllowAuthorizer {
 	return AllowAuthorizer{Authorizer: p}
 }
diff --git a/acl/acl.go b/acl/acl.go
index 753db01516e8c..29413974c4009 100644
--- a/acl/acl.go
+++ b/acl/acl.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 const (
diff --git a/acl/acl_ce.go b/acl/acl_ce.go
index 7d2b8513b8327..2648550356476 100644
--- a/acl/acl_ce.go
+++ b/acl/acl_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package acl
 
diff --git a/acl/acl_test.go b/acl/acl_test.go
index 17547b4959d1e..78f93207290c8 100644
--- a/acl/acl_test.go
+++ b/acl/acl_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
@@ -40,22 +37,6 @@ func checkAllowEventWrite(t *testing.T, authz Authorizer, prefix string, entCtx
 	require.Equal(t, Allow, authz.EventWrite(prefix, entCtx))
 }
 
-func checkAllowIdentityRead(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
-	require.Equal(t, Allow, authz.IdentityRead(prefix, entCtx))
-}
-
-func checkAllowIdentityReadAll(t *testing.T, authz Authorizer, _ string, entCtx *AuthorizerContext) {
-	require.Equal(t, Allow, authz.IdentityReadAll(entCtx))
-}
-
-func checkAllowIdentityWrite(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
-	require.Equal(t, Allow, authz.IdentityWrite(prefix, entCtx))
-}
-
-func checkAllowIdentityWriteAny(t *testing.T, authz Authorizer, _ string, entCtx *AuthorizerContext) {
-	require.Equal(t, Allow, authz.IdentityWriteAny(entCtx))
-}
-
 func checkAllowIntentionDefaultAllow(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
 	require.Equal(t, Allow, authz.IntentionDefaultAllow(entCtx))
 }
@@ -164,14 +145,6 @@ func checkAllowSnapshot(t *testing.T, authz Authorizer, prefix string, entCtx *A
 	require.Equal(t, Allow, authz.Snapshot(entCtx))
 }
 
-func checkAllowTrafficPermissionsRead(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
-	require.Equal(t, Allow, authz.TrafficPermissionsRead(prefix, entCtx))
-}
-
-func checkAllowTrafficPermissionsWrite(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
-	require.Equal(t, Allow, authz.TrafficPermissionsWrite(prefix, entCtx))
-}
-
 func checkDenyACLRead(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
 	require.Equal(t, Deny, authz.ACLRead(entCtx))
 }
@@ -196,22 +169,6 @@ func checkDenyEventWrite(t *testing.T, authz Authorizer, prefix string, entCtx *
 	require.Equal(t, Deny, authz.EventWrite(prefix, entCtx))
 }
 
-func checkDenyIdentityRead(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
-	require.Equal(t, Deny, authz.IdentityRead(prefix, entCtx))
-}
-
-func checkDenyIdentityReadAll(t *testing.T, authz Authorizer, _ string, entCtx *AuthorizerContext) {
-	require.Equal(t, Deny, authz.IdentityReadAll(entCtx))
-}
-
-func checkDenyIdentityWrite(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
-	require.Equal(t, Deny, authz.IdentityWrite(prefix, entCtx))
-}
-
-func checkDenyIdentityWriteAny(t *testing.T, authz Authorizer, _ string, entCtx *AuthorizerContext) {
-	require.Equal(t, Deny, authz.IdentityWriteAny(entCtx))
-}
-
 func checkDenyIntentionDefaultAllow(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
 	require.Equal(t, Deny, authz.IntentionDefaultAllow(entCtx))
 }
@@ -320,14 +277,6 @@ func checkDenySnapshot(t *testing.T, authz Authorizer, prefix string, entCtx *Au
 	require.Equal(t, Deny, authz.Snapshot(entCtx))
 }
 
-func checkDenyTrafficPermissionsRead(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
-	require.Equal(t, Deny, authz.TrafficPermissionsRead(prefix, entCtx))
-}
-
-func checkDenyTrafficPermissionsWrite(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
-	require.Equal(t, Deny, authz.TrafficPermissionsWrite(prefix, entCtx))
-}
-
 func checkDefaultACLRead(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
 	require.Equal(t, Default, authz.ACLRead(entCtx))
 }
@@ -352,22 +301,6 @@ func checkDefaultEventWrite(t *testing.T, authz Authorizer, prefix string, entCt
 	require.Equal(t, Default, authz.EventWrite(prefix, entCtx))
 }
 
-func checkDefaultIdentityRead(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
-	require.Equal(t, Default, authz.IdentityRead(prefix, entCtx))
-}
-
-func checkDefaultIdentityReadAll(t *testing.T, authz Authorizer, _ string, entCtx *AuthorizerContext) {
-	require.Equal(t, Default, authz.IdentityReadAll(entCtx))
-}
-
-func checkDefaultIdentityWrite(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
-	require.Equal(t, Default, authz.IdentityWrite(prefix, entCtx))
-}
-
-func checkDefaultIdentityWriteAny(t *testing.T, authz Authorizer, _ string, entCtx *AuthorizerContext) {
-	require.Equal(t, Default, authz.IdentityWriteAny(entCtx))
-}
-
 func checkDefaultIntentionDefaultAllow(t *testing.T, authz Authorizer, prefix string, entCtx *AuthorizerContext) {
 	require.Equal(t, Default, authz.IntentionDefaultAllow(entCtx))
 }
@@ -504,10 +437,6 @@ func TestACL(t *testing.T) {
 				{name: "DenyIntentionDefaultAllow", check: checkDenyIntentionDefaultAllow},
 				{name: "DenyIntentionRead", check: checkDenyIntentionRead},
 				{name: "DenyIntentionWrite", check: checkDenyIntentionWrite},
-				{name: "DenyIdentityRead", check: checkDenyIdentityRead},
-				{name: "DenyIdentityReadAll", check: checkDenyIdentityReadAll},
-				{name: "DenyIdentityWrite", check: checkDenyIdentityWrite},
-				{name: "DenyIdentityWriteAny", check: checkDenyIdentityWriteAny},
 				{name: "DenyKeyRead", check: checkDenyKeyRead},
 				{name: "DenyKeyringRead", check: checkDenyKeyringRead},
 				{name: "DenyKeyringWrite", check: checkDenyKeyringWrite},
@@ -526,7 +455,6 @@ func TestACL(t *testing.T) {
 				{name: "DenyServiceRead", check: checkDenyServiceRead},
 				{name: "DenyServiceReadAll", check: checkDenyServiceReadAll},
 				{name: "DenyServiceWrite", check: checkDenyServiceWrite},
-				{name: "DenyServiceWriteAny", check: checkDenyServiceWriteAny},
 				{name: "DenySessionRead", check: checkDenySessionRead},
 				{name: "DenySessionWrite", check: checkDenySessionWrite},
 				{name: "DenySnapshot", check: checkDenySnapshot},
@@ -542,10 +470,6 @@ func TestACL(t *testing.T) {
 				{name: "AllowAgentWrite", check: checkAllowAgentWrite},
 				{name: "AllowEventRead", check: checkAllowEventRead},
 				{name: "AllowEventWrite", check: checkAllowEventWrite},
-				{name: "AllowIdentityRead", check: checkAllowIdentityRead},
-				{name: "AllowIdentityReadAll", check: checkAllowIdentityReadAll},
-				{name: "AllowIdentityWrite", check: checkAllowIdentityWrite},
-				{name: "AllowIdentityWriteAny", check: checkAllowIdentityWriteAny},
 				{name: "AllowIntentionDefaultAllow", check: checkAllowIntentionDefaultAllow},
 				{name: "AllowIntentionRead", check: checkAllowIntentionRead},
 				{name: "AllowIntentionWrite", check: checkAllowIntentionWrite},
@@ -567,12 +491,9 @@ func TestACL(t *testing.T) {
 				{name: "AllowServiceRead", check: checkAllowServiceRead},
 				{name: "AllowServiceReadAll", check: checkAllowServiceReadAll},
 				{name: "AllowServiceWrite", check: checkAllowServiceWrite},
-				{name: "AllowServiceWriteAny", check: checkAllowServiceWriteAny},
 				{name: "AllowSessionRead", check: checkAllowSessionRead},
 				{name: "AllowSessionWrite", check: checkAllowSessionWrite},
 				{name: "DenySnapshot", check: checkDenySnapshot},
-				{name: "AllowTrafficPermissionsRead", check: checkAllowTrafficPermissionsRead},
-				{name: "AllowTrafficPermissionsWrite", check: checkAllowTrafficPermissionsWrite},
 			},
 		},
 		{
@@ -585,10 +506,6 @@ func TestACL(t *testing.T) {
 				{name: "AllowAgentWrite", check: checkAllowAgentWrite},
 				{name: "AllowEventRead", check: checkAllowEventRead},
 				{name: "AllowEventWrite", check: checkAllowEventWrite},
-				{name: "AllowIdentityRead", check: checkAllowIdentityRead},
-				{name: "AllowIdentityReadAll", check: checkAllowIdentityReadAll},
-				{name: "AllowIdentityWrite", check: checkAllowIdentityWrite},
-				{name: "AllowIdentityWriteAny", check: checkAllowIdentityWriteAny},
 				{name: "AllowIntentionDefaultAllow", check: checkAllowIntentionDefaultAllow},
 				{name: "AllowIntentionRead", check: checkAllowIntentionRead},
 				{name: "AllowIntentionWrite", check: checkAllowIntentionWrite},
@@ -610,12 +527,9 @@ func TestACL(t *testing.T) {
 				{name: "AllowServiceRead", check: checkAllowServiceRead},
 				{name: "AllowServiceReadAll", check: checkAllowServiceReadAll},
 				{name: "AllowServiceWrite", check: checkAllowServiceWrite},
-				{name: "AllowServiceWriteAny", check: checkAllowServiceWriteAny},
 				{name: "AllowSessionRead", check: checkAllowSessionRead},
 				{name: "AllowSessionWrite", check: checkAllowSessionWrite},
 				{name: "AllowSnapshot", check: checkAllowSnapshot},
-				{name: "AllowTrafficPermissionsRead", check: checkAllowTrafficPermissionsRead},
-				{name: "AllowTrafficPermissionsWrite", check: checkAllowTrafficPermissionsWrite},
 			},
 		},
 		{
@@ -988,134 +902,6 @@ func TestACL(t *testing.T) {
 				{name: "ChildOverrideWriteAllowed", prefix: "override", check: checkAllowAgentWrite},
 			},
 		},
-		{
-			name:          "IdentityDefaultAllowPolicyDeny",
-			defaultPolicy: AllowAll(),
-			policyStack: []*Policy{
-				{
-					PolicyRules: PolicyRules{
-						Identities: []*IdentityRule{
-							{
-								Name:   "foo",
-								Policy: PolicyDeny,
-							},
-						},
-						IdentityPrefixes: []*IdentityRule{
-							{
-								Name:   "prefix",
-								Policy: PolicyDeny,
-							},
-						},
-					},
-				},
-			},
-			checks: []aclCheck{
-				{name: "IdentityFooReadDenied", prefix: "foo", check: checkDenyIdentityRead},
-				{name: "IdentityFooWriteDenied", prefix: "foo", check: checkDenyIdentityWrite},
-				{name: "IdentityPrefixReadDenied", prefix: "prefix", check: checkDenyIdentityRead},
-				{name: "IdentityPrefixWriteDenied", prefix: "prefix", check: checkDenyIdentityWrite},
-				{name: "IdentityBarReadAllowed", prefix: "fail", check: checkAllowIdentityRead},
-				{name: "IdentityBarWriteAllowed", prefix: "fail", check: checkAllowIdentityWrite},
-			},
-		},
-		{
-			name:          "IdentityDefaultDenyPolicyAllow",
-			defaultPolicy: DenyAll(),
-			policyStack: []*Policy{
-				{
-					PolicyRules: PolicyRules{
-						Identities: []*IdentityRule{
-							{
-								Name:   "foo",
-								Policy: PolicyWrite,
-							},
-						},
-						IdentityPrefixes: []*IdentityRule{
-							{
-								Name:   "prefix",
-								Policy: PolicyRead,
-							},
-						},
-					},
-				},
-			},
-			checks: []aclCheck{
-				{name: "IdentityFooReadAllowed", prefix: "foo", check: checkAllowIdentityRead},
-				{name: "IdentityFooWriteAllowed", prefix: "foo", check: checkAllowIdentityWrite},
-				{name: "IdentityPrefixReadAllowed", prefix: "prefix", check: checkAllowIdentityRead},
-				{name: "IdentityPrefixWriteDenied", prefix: "prefix", check: checkDenyIdentityWrite},
-				{name: "IdentityBarReadDenied", prefix: "fail", check: checkDenyIdentityRead},
-				{name: "IdentityBarWriteDenied", prefix: "fail", check: checkDenyIdentityWrite},
-			},
-		},
-		{
-			name:          "IdentityDefaultDenyPolicyComplex",
-			defaultPolicy: DenyAll(),
-			policyStack: []*Policy{
-				{
-					PolicyRules: PolicyRules{
-						Identities: []*IdentityRule{
-							{
-								Name:   "football",
-								Policy: PolicyRead,
-							},
-							{
-								Name:       "prefix-forbidden",
-								Policy:     PolicyDeny,
-								Intentions: PolicyDeny,
-							},
-						},
-						IdentityPrefixes: []*IdentityRule{
-							{
-								Name:       "foo",
-								Policy:     PolicyWrite,
-								Intentions: PolicyWrite,
-							},
-							{
-								Name:       "prefix",
-								Policy:     PolicyRead,
-								Intentions: PolicyWrite,
-							},
-						},
-					},
-				},
-				{
-					PolicyRules: PolicyRules{
-						Identities: []*IdentityRule{
-							{
-								Name:       "foozball",
-								Policy:     PolicyWrite,
-								Intentions: PolicyRead,
-							},
-						},
-					},
-				},
-			},
-			checks: []aclCheck{
-				{name: "IdentityReadAllowed", prefix: "foo", check: checkAllowIdentityRead},
-				{name: "IdentityWriteAllowed", prefix: "foo", check: checkAllowIdentityWrite},
-				{name: "TrafficPermissionsReadAllowed", prefix: "foo", check: checkAllowTrafficPermissionsRead},
-				{name: "TrafficPermissionsWriteAllowed", prefix: "foo", check: checkAllowTrafficPermissionsWrite},
-				{name: "IdentityReadAllowed", prefix: "football", check: checkAllowIdentityRead},
-				{name: "IdentityWriteDenied", prefix: "football", check: checkDenyIdentityWrite},
-				{name: "TrafficPermissionsReadAllowed", prefix: "football", check: checkAllowTrafficPermissionsRead},
-				// This might be surprising but omitting intention rule gives at most intention:read
-				// if we have identity:write perms. This matches services as well.
-				{name: "TrafficPermissionsWriteDenied", prefix: "football", check: checkDenyTrafficPermissionsWrite},
-				{name: "IdentityReadAllowed", prefix: "prefix", check: checkAllowIdentityRead},
-				{name: "IdentityWriteDenied", prefix: "prefix", check: checkDenyIdentityWrite},
-				{name: "TrafficPermissionsReadAllowed", prefix: "prefix", check: checkAllowTrafficPermissionsRead},
-				{name: "TrafficPermissionsWriteDenied", prefix: "prefix", check: checkAllowTrafficPermissionsWrite},
-				{name: "IdentityReadDenied", prefix: "prefix-forbidden", check: checkDenyIdentityRead},
-				{name: "IdentityWriteDenied", prefix: "prefix-forbidden", check: checkDenyIdentityWrite},
-				{name: "TrafficPermissionsReadDenied", prefix: "prefix-forbidden", check: checkDenyTrafficPermissionsRead},
-				{name: "TrafficPermissionsWriteDenied", prefix: "prefix-forbidden", check: checkDenyTrafficPermissionsWrite},
-				{name: "IdentityReadAllowed", prefix: "foozball", check: checkAllowIdentityRead},
-				{name: "IdentityWriteAllowed", prefix: "foozball", check: checkAllowIdentityWrite},
-				{name: "TrafficPermissionsReadAllowed", prefix: "foozball", check: checkAllowTrafficPermissionsRead},
-				{name: "TrafficPermissionsWriteDenied", prefix: "foozball", check: checkDenyTrafficPermissionsWrite},
-			},
-		},
 		{
 			name:          "KeyringDefaultAllowPolicyDeny",
 			defaultPolicy: AllowAll(),
diff --git a/acl/authorizer.go b/acl/authorizer.go
index 9abd09b02f79d..1ecf9f2afe353 100644
--- a/acl/authorizer.go
+++ b/acl/authorizer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
@@ -43,7 +40,6 @@ const (
 	ResourceACL       Resource = "acl"
 	ResourceAgent     Resource = "agent"
 	ResourceEvent     Resource = "event"
-	ResourceIdentity  Resource = "identity"
 	ResourceIntention Resource = "intention"
 	ResourceKey       Resource = "key"
 	ResourceKeyring   Resource = "keyring"
@@ -78,19 +74,6 @@ type Authorizer interface {
 	// EventWrite determines if a specific event may be fired.
 	EventWrite(string, *AuthorizerContext) EnforcementDecision
 
-	// IdentityRead checks for permission to read a given workload identity.
-	IdentityRead(string, *AuthorizerContext) EnforcementDecision
-
-	// IdentityReadAll checks for permission to read all workload identities.
-	IdentityReadAll(*AuthorizerContext) EnforcementDecision
-
-	// IdentityWrite checks for permission to create or update a given
-	// workload identity.
-	IdentityWrite(string, *AuthorizerContext) EnforcementDecision
-
-	// IdentityWriteAny checks for write permission on any workload identity.
-	IdentityWriteAny(*AuthorizerContext) EnforcementDecision
-
 	// IntentionDefaultAllow determines the default authorized behavior
 	// when no intentions match a Connect request.
 	IntentionDefaultAllow(*AuthorizerContext) EnforcementDecision
@@ -188,13 +171,6 @@ type Authorizer interface {
 	// Snapshot checks for permission to take and restore snapshots.
 	Snapshot(*AuthorizerContext) EnforcementDecision
 
-	// TrafficPermissionsRead determines if specific traffic permissions can be read.
-	TrafficPermissionsRead(string, *AuthorizerContext) EnforcementDecision
-
-	// TrafficPermissionsWrite determines if specific traffic permissions can be
-	// created, modified, or deleted.
-	TrafficPermissionsWrite(string, *AuthorizerContext) EnforcementDecision
-
 	// Embedded Interface for Consul Enterprise specific ACL enforcement
 	enterpriseAuthorizer
 
@@ -260,40 +236,6 @@ func (a AllowAuthorizer) EventWriteAllowed(name string, ctx *AuthorizerContext)
 	return nil
 }
 
-// IdentityReadAllowed checks for permission to read a given workload identity,
-func (a AllowAuthorizer) IdentityReadAllowed(name string, ctx *AuthorizerContext) error {
-	if a.Authorizer.IdentityRead(name, ctx) != Allow {
-		return PermissionDeniedByACL(a, ctx, ResourceIdentity, AccessRead, name)
-	}
-	return nil
-}
-
-// IdentityReadAllAllowed checks for permission to read all workload identities.
-func (a AllowAuthorizer) IdentityReadAllAllowed(ctx *AuthorizerContext) error {
-	if a.Authorizer.IdentityReadAll(ctx) != Allow {
-		// This is only used to gate certain UI functions right now (e.g metrics)
-		return PermissionDeniedByACL(a, ctx, ResourceIdentity, AccessRead, "all identities") // read
-	}
-	return nil
-}
-
-// IdentityWriteAllowed checks for permission to create or update a given
-// workload identity.
-func (a AllowAuthorizer) IdentityWriteAllowed(name string, ctx *AuthorizerContext) error {
-	if a.Authorizer.IdentityWrite(name, ctx) != Allow {
-		return PermissionDeniedByACL(a, ctx, ResourceIdentity, AccessWrite, name)
-	}
-	return nil
-}
-
-// IdentityWriteAnyAllowed checks for write permission on any workload identity
-func (a AllowAuthorizer) IdentityWriteAnyAllowed(ctx *AuthorizerContext) error {
-	if a.Authorizer.IdentityWriteAny(ctx) != Allow {
-		return PermissionDeniedByACL(a, ctx, ResourceIdentity, AccessWrite, "any identity")
-	}
-	return nil
-}
-
 // IntentionDefaultAllowAllowed determines the default authorized behavior
 // when no intentions match a Connect request.
 func (a AllowAuthorizer) IntentionDefaultAllowAllowed(ctx *AuthorizerContext) error {
@@ -322,23 +264,6 @@ func (a AllowAuthorizer) IntentionWriteAllowed(name string, ctx *AuthorizerConte
 	return nil
 }
 
-// TrafficPermissionsReadAllowed determines if specific traffic permissions can be read.
-func (a AllowAuthorizer) TrafficPermissionsReadAllowed(name string, ctx *AuthorizerContext) error {
-	if a.Authorizer.TrafficPermissionsRead(name, ctx) != Allow {
-		return PermissionDeniedByACL(a, ctx, ResourceIntention, AccessRead, name)
-	}
-	return nil
-}
-
-// TrafficPermissionsWriteAllowed determines if specific traffic permissions can be
-// created, modified, or deleted.
-func (a AllowAuthorizer) TrafficPermissionsWriteAllowed(name string, ctx *AuthorizerContext) error {
-	if a.Authorizer.TrafficPermissionsWrite(name, ctx) != Allow {
-		return PermissionDeniedByACL(a, ctx, ResourceIntention, AccessWrite, name)
-	}
-	return nil
-}
-
 // KeyListAllowed checks for permission to list keys under a prefix
 func (a AllowAuthorizer) KeyListAllowed(name string, ctx *AuthorizerContext) error {
 	if a.Authorizer.KeyList(name, ctx) != Allow {
@@ -575,13 +500,6 @@ func Enforce(authz Authorizer, rsc Resource, segment string, access string, ctx
 		case "write":
 			return authz.EventWrite(segment, ctx), nil
 		}
-	case ResourceIdentity:
-		switch lowerAccess {
-		case "read":
-			return authz.IdentityRead(segment, ctx), nil
-		case "write":
-			return authz.IdentityWrite(segment, ctx), nil
-		}
 	case ResourceIntention:
 		switch lowerAccess {
 		case "read":
diff --git a/acl/authorizer_ce.go b/acl/authorizer_ce.go
index dafac8692a9a3..e448c84589e0c 100644
--- a/acl/authorizer_ce.go
+++ b/acl/authorizer_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package acl
 
diff --git a/acl/authorizer_test.go b/acl/authorizer_test.go
index d538a04ad7152..27a7aef4b9b29 100644
--- a/acl/authorizer_test.go
+++ b/acl/authorizer_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
@@ -188,34 +185,6 @@ func TestACL_Enforce(t *testing.T) {
 			ret:      Deny,
 			err:      "Invalid access level",
 		},
-		{
-			method:   "IdentityRead",
-			resource: ResourceIdentity,
-			segment:  "foo",
-			access:   "read",
-			ret:      Deny,
-		},
-		{
-			method:   "IdentityRead",
-			resource: ResourceIdentity,
-			segment:  "foo",
-			access:   "read",
-			ret:      Allow,
-		},
-		{
-			method:   "IdentityWrite",
-			resource: ResourceIdentity,
-			segment:  "foo",
-			access:   "write",
-			ret:      Deny,
-		},
-		{
-			method:   "IdentityWrite",
-			resource: ResourceIdentity,
-			segment:  "foo",
-			access:   "write",
-			ret:      Allow,
-		},
 		{
 			method:   "IntentionRead",
 			resource: ResourceIntention,
diff --git a/acl/chained_authorizer.go b/acl/chained_authorizer.go
index e35b62ad2fbb9..cf81cc4b18af7 100644
--- a/acl/chained_authorizer.go
+++ b/acl/chained_authorizer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 // ChainedAuthorizer can combine multiple Authorizers into one.
@@ -80,35 +77,6 @@ func (c *ChainedAuthorizer) EventWrite(name string, entCtx *AuthorizerContext) E
 	})
 }
 
-// IdentityRead checks for permission to read a given workload identity.
-func (c *ChainedAuthorizer) IdentityRead(name string, entCtx *AuthorizerContext) EnforcementDecision {
-	return c.executeChain(func(authz Authorizer) EnforcementDecision {
-		return authz.IdentityRead(name, entCtx)
-	})
-}
-
-// IdentityReadAll checks for permission to read all workload identities.
-func (c *ChainedAuthorizer) IdentityReadAll(entCtx *AuthorizerContext) EnforcementDecision {
-	return c.executeChain(func(authz Authorizer) EnforcementDecision {
-		return authz.IdentityReadAll(entCtx)
-	})
-}
-
-// IdentityWrite checks for permission to create or update a given
-// workload identity.
-func (c *ChainedAuthorizer) IdentityWrite(name string, entCtx *AuthorizerContext) EnforcementDecision {
-	return c.executeChain(func(authz Authorizer) EnforcementDecision {
-		return authz.IdentityWrite(name, entCtx)
-	})
-}
-
-// IdentityWriteAny checks for write permission on any workload identity.
-func (c *ChainedAuthorizer) IdentityWriteAny(entCtx *AuthorizerContext) EnforcementDecision {
-	return c.executeChain(func(authz Authorizer) EnforcementDecision {
-		return authz.IdentityWriteAny(entCtx)
-	})
-}
-
 // IntentionDefaultAllow determines the default authorized behavior
 // when no intentions match a Connect request.
 func (c *ChainedAuthorizer) IntentionDefaultAllow(entCtx *AuthorizerContext) EnforcementDecision {
@@ -312,21 +280,6 @@ func (c *ChainedAuthorizer) Snapshot(entCtx *AuthorizerContext) EnforcementDecis
 	})
 }
 
-// TrafficPermissionsRead determines if specific traffic permissions can be read.
-func (c *ChainedAuthorizer) TrafficPermissionsRead(prefix string, entCtx *AuthorizerContext) EnforcementDecision {
-	return c.executeChain(func(authz Authorizer) EnforcementDecision {
-		return authz.TrafficPermissionsRead(prefix, entCtx)
-	})
-}
-
-// TrafficPermissionsWrite determines if specific traffic permissions can be
-// created, modified, or deleted.
-func (c *ChainedAuthorizer) TrafficPermissionsWrite(prefix string, entCtx *AuthorizerContext) EnforcementDecision {
-	return c.executeChain(func(authz Authorizer) EnforcementDecision {
-		return authz.TrafficPermissionsWrite(prefix, entCtx)
-	})
-}
-
 func (c *ChainedAuthorizer) ToAllowAuthorizer() AllowAuthorizer {
 	return AllowAuthorizer{Authorizer: c}
 }
diff --git a/acl/chained_authorizer_test.go b/acl/chained_authorizer_test.go
index 6c6152dded13c..284a1bd0e7ea0 100644
--- a/acl/chained_authorizer_test.go
+++ b/acl/chained_authorizer_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
@@ -29,18 +26,6 @@ func (authz testAuthorizer) EventRead(string, *AuthorizerContext) EnforcementDec
 func (authz testAuthorizer) EventWrite(string, *AuthorizerContext) EnforcementDecision {
 	return EnforcementDecision(authz)
 }
-func (authz testAuthorizer) IdentityRead(string, *AuthorizerContext) EnforcementDecision {
-	return EnforcementDecision(authz)
-}
-func (authz testAuthorizer) IdentityReadAll(*AuthorizerContext) EnforcementDecision {
-	return EnforcementDecision(authz)
-}
-func (authz testAuthorizer) IdentityWrite(string, *AuthorizerContext) EnforcementDecision {
-	return EnforcementDecision(authz)
-}
-func (authz testAuthorizer) IdentityWriteAny(*AuthorizerContext) EnforcementDecision {
-	return EnforcementDecision(authz)
-}
 func (authz testAuthorizer) IntentionDefaultAllow(*AuthorizerContext) EnforcementDecision {
 	return EnforcementDecision(authz)
 }
@@ -122,12 +107,6 @@ func (authz testAuthorizer) SessionWrite(string, *AuthorizerContext) Enforcement
 func (authz testAuthorizer) Snapshot(*AuthorizerContext) EnforcementDecision {
 	return EnforcementDecision(authz)
 }
-func (authz testAuthorizer) TrafficPermissionsRead(string, *AuthorizerContext) EnforcementDecision {
-	return EnforcementDecision(authz)
-}
-func (authz testAuthorizer) TrafficPermissionsWrite(string, *AuthorizerContext) EnforcementDecision {
-	return EnforcementDecision(authz)
-}
 
 func (authz testAuthorizer) ToAllowAuthorizer() AllowAuthorizer {
 	return AllowAuthorizer{Authorizer: &authz}
diff --git a/acl/enterprisemeta_ce.go b/acl/enterprisemeta_ce.go
index 7262e79b6dc6f..97d01c10a65d6 100644
--- a/acl/enterprisemeta_ce.go
+++ b/acl/enterprisemeta_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package acl
 
diff --git a/acl/errors.go b/acl/errors.go
index 7f4548ed95d62..9938957c19716 100644
--- a/acl/errors.go
+++ b/acl/errors.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
diff --git a/acl/errors_ce.go b/acl/errors_ce.go
index e342137b534e0..ef8dc993cddf4 100644
--- a/acl/errors_ce.go
+++ b/acl/errors_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package acl
 
diff --git a/acl/errors_test.go b/acl/errors_test.go
index b4e645c073122..963b2cbb1627c 100644
--- a/acl/errors_test.go
+++ b/acl/errors_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
diff --git a/acl/policy.go b/acl/policy.go
index 0c88a9041b289..51e53be95fc8e 100644
--- a/acl/policy.go
+++ b/acl/policy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
@@ -59,8 +56,6 @@ type PolicyRules struct {
 	ACL                   string               `hcl:"acl,expand"`
 	Agents                []*AgentRule         `hcl:"agent,expand"`
 	AgentPrefixes         []*AgentRule         `hcl:"agent_prefix,expand"`
-	Identities            []*IdentityRule      `hcl:"identity,expand"`
-	IdentityPrefixes      []*IdentityRule      `hcl:"identity_prefix,expand"`
 	Keys                  []*KeyRule           `hcl:"key,expand"`
 	KeyPrefixes           []*KeyRule           `hcl:"key_prefix,expand"`
 	Nodes                 []*NodeRule          `hcl:"node,expand"`
@@ -92,19 +87,6 @@ type AgentRule struct {
 	Policy string
 }
 
-// IdentityRule represents a policy for a workload identity
-type IdentityRule struct {
-	Name   string `hcl:",key"`
-	Policy string
-
-	// Intentions is the policy for intentions where this workload identity
-	// is the destination. This may be empty, in which case the Policy determines
-	// the intentions policy.
-	Intentions string
-
-	EnterpriseRule `hcl:",squash"`
-}
-
 // KeyRule represents a rule for a key
 type KeyRule struct {
 	Prefix string `hcl:",key"`
@@ -183,30 +165,6 @@ func (pr *PolicyRules) Validate(conf *Config) error {
 		}
 	}
 
-	// Validate the identity policies
-	for _, id := range pr.Identities {
-		if !isPolicyValid(id.Policy, false) {
-			return fmt.Errorf("Invalid identity policy: %#v", id)
-		}
-		if id.Intentions != "" && !isPolicyValid(id.Intentions, false) {
-			return fmt.Errorf("Invalid identity intentions policy: %#v", id)
-		}
-		if err := id.EnterpriseRule.Validate(id.Policy, conf); err != nil {
-			return fmt.Errorf("Invalid identity enterprise policy: %#v, got error: %v", id, err)
-		}
-	}
-	for _, id := range pr.IdentityPrefixes {
-		if !isPolicyValid(id.Policy, false) {
-			return fmt.Errorf("Invalid identity_prefix policy: %#v", id)
-		}
-		if id.Intentions != "" && !isPolicyValid(id.Intentions, false) {
-			return fmt.Errorf("Invalid identity_prefix intentions policy: %#v", id)
-		}
-		if err := id.EnterpriseRule.Validate(id.Policy, conf); err != nil {
-			return fmt.Errorf("Invalid identity_prefix enterprise policy: %#v, got error: %v", id, err)
-		}
-	}
-
 	// Validate the key policy
 	for _, kp := range pr.Keys {
 		if !isPolicyValid(kp.Policy, true) {
diff --git a/acl/policy_authorizer.go b/acl/policy_authorizer.go
index 802b49a8d98fa..7de30d029a9fb 100644
--- a/acl/policy_authorizer.go
+++ b/acl/policy_authorizer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
@@ -14,15 +11,9 @@ type policyAuthorizer struct {
 	// agentRules contain the exact-match agent policies
 	agentRules *radix.Tree
 
-	// identityRules contains the identity exact-match policies
-	identityRules *radix.Tree
-
 	// intentionRules contains the service intention exact-match policies
 	intentionRules *radix.Tree
 
-	// trafficPermissionsRules contains the service intention exact-match policies
-	trafficPermissionsRules *radix.Tree
-
 	// keyRules contains the key exact-match policies
 	keyRules *radix.Tree
 
@@ -186,48 +177,6 @@ func (p *policyAuthorizer) loadRules(policy *PolicyRules) error {
 		}
 	}
 
-	// Load the identity policy (exact matches)
-	for _, id := range policy.Identities {
-		if err := insertPolicyIntoRadix(id.Name, id.Policy, &id.EnterpriseRule, p.identityRules, false); err != nil {
-			return err
-		}
-
-		intention := id.Intentions
-		if intention == "" {
-			switch id.Policy {
-			case PolicyRead, PolicyWrite:
-				intention = PolicyRead
-			default:
-				intention = PolicyDeny
-			}
-		}
-
-		if err := insertPolicyIntoRadix(id.Name, intention, &id.EnterpriseRule, p.trafficPermissionsRules, false); err != nil {
-			return err
-		}
-	}
-
-	// Load the identity policy (prefix matches)
-	for _, id := range policy.IdentityPrefixes {
-		if err := insertPolicyIntoRadix(id.Name, id.Policy, &id.EnterpriseRule, p.identityRules, true); err != nil {
-			return err
-		}
-
-		intention := id.Intentions
-		if intention == "" {
-			switch id.Policy {
-			case PolicyRead, PolicyWrite:
-				intention = PolicyRead
-			default:
-				intention = PolicyDeny
-			}
-		}
-
-		if err := insertPolicyIntoRadix(id.Name, intention, &id.EnterpriseRule, p.trafficPermissionsRules, true); err != nil {
-			return err
-		}
-	}
-
 	// Load the key policy (exact matches)
 	for _, kp := range policy.Keys {
 		if err := insertPolicyIntoRadix(kp.Prefix, kp.Policy, &kp.EnterpriseRule, p.keyRules, false); err != nil {
@@ -396,16 +345,14 @@ func newPolicyAuthorizer(policies []*Policy, ent *Config) (*policyAuthorizer, er
 
 func newPolicyAuthorizerFromRules(rules *PolicyRules, ent *Config) (*policyAuthorizer, error) {
 	p := &policyAuthorizer{
-		agentRules:              radix.New(),
-		identityRules:           radix.New(),
-		intentionRules:          radix.New(),
-		trafficPermissionsRules: radix.New(),
-		keyRules:                radix.New(),
-		nodeRules:               radix.New(),
-		serviceRules:            radix.New(),
-		sessionRules:            radix.New(),
-		eventRules:              radix.New(),
-		preparedQueryRules:      radix.New(),
+		agentRules:         radix.New(),
+		intentionRules:     radix.New(),
+		keyRules:           radix.New(),
+		nodeRules:          radix.New(),
+		serviceRules:       radix.New(),
+		sessionRules:       radix.New(),
+		eventRules:         radix.New(),
+		preparedQueryRules: radix.New(),
 	}
 
 	p.enterprisePolicyAuthorizer.init(ent)
@@ -578,33 +525,6 @@ func (p *policyAuthorizer) EventWrite(name string, _ *AuthorizerContext) Enforce
 	return Default
 }
 
-// IdentityRead checks for permission to read a given workload identity.
-func (p *policyAuthorizer) IdentityRead(name string, _ *AuthorizerContext) EnforcementDecision {
-	if rule, ok := getPolicy(name, p.identityRules); ok {
-		return enforce(rule.access, AccessRead)
-	}
-	return Default
-}
-
-// IdentityReadAll checks for permission to read all workload identities.
-func (p *policyAuthorizer) IdentityReadAll(_ *AuthorizerContext) EnforcementDecision {
-	return p.allAllowed(p.identityRules, AccessRead)
-}
-
-// IdentityWrite checks for permission to create or update a given
-// workload identity.
-func (p *policyAuthorizer) IdentityWrite(name string, _ *AuthorizerContext) EnforcementDecision {
-	if rule, ok := getPolicy(name, p.identityRules); ok {
-		return enforce(rule.access, AccessWrite)
-	}
-	return Default
-}
-
-// IdentityWriteAny checks for write permission on any workload identity.
-func (p *policyAuthorizer) IdentityWriteAny(_ *AuthorizerContext) EnforcementDecision {
-	return p.anyAllowed(p.identityRules, AccessWrite)
-}
-
 // IntentionDefaultAllow returns whether the default behavior when there are
 // no matching intentions is to allow or deny.
 func (p *policyAuthorizer) IntentionDefaultAllow(_ *AuthorizerContext) EnforcementDecision {
@@ -612,7 +532,8 @@ func (p *policyAuthorizer) IntentionDefaultAllow(_ *AuthorizerContext) Enforceme
 	return Default
 }
 
-// IntentionRead checks if reading an intention is allowed.
+// IntentionRead checks if writing (creating, updating, or deleting) of an
+// intention is allowed.
 func (p *policyAuthorizer) IntentionRead(prefix string, _ *AuthorizerContext) EnforcementDecision {
 	if prefix == "*" {
 		return p.anyAllowed(p.intentionRules, AccessRead)
@@ -637,31 +558,6 @@ func (p *policyAuthorizer) IntentionWrite(prefix string, _ *AuthorizerContext) E
 	return Default
 }
 
-// TrafficPermissionsRead checks if reading of traffic permissions is allowed.
-func (p *policyAuthorizer) TrafficPermissionsRead(prefix string, _ *AuthorizerContext) EnforcementDecision {
-	if prefix == "*" {
-		return p.anyAllowed(p.trafficPermissionsRules, AccessRead)
-	}
-
-	if rule, ok := getPolicy(prefix, p.trafficPermissionsRules); ok {
-		return enforce(rule.access, AccessRead)
-	}
-	return Default
-}
-
-// TrafficPermissionsWrite checks if writing (creating, updating, or deleting) of traffic
-// permissions is allowed.
-func (p *policyAuthorizer) TrafficPermissionsWrite(prefix string, _ *AuthorizerContext) EnforcementDecision {
-	if prefix == "*" {
-		return p.allAllowed(p.trafficPermissionsRules, AccessWrite)
-	}
-
-	if rule, ok := getPolicy(prefix, p.trafficPermissionsRules); ok {
-		return enforce(rule.access, AccessWrite)
-	}
-	return Default
-}
-
 // KeyRead returns if a key is allowed to be read
 func (p *policyAuthorizer) KeyRead(key string, _ *AuthorizerContext) EnforcementDecision {
 	if rule, ok := getPolicy(key, p.keyRules); ok {
diff --git a/acl/policy_authorizer_ce.go b/acl/policy_authorizer_ce.go
index 34f8f1bf947dd..4829048a86636 100644
--- a/acl/policy_authorizer_ce.go
+++ b/acl/policy_authorizer_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package acl
 
diff --git a/acl/policy_authorizer_test.go b/acl/policy_authorizer_test.go
index 06e5ee2bb25e7..0f5f9ca8b6a6c 100644
--- a/acl/policy_authorizer_test.go
+++ b/acl/policy_authorizer_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
@@ -41,9 +38,6 @@ func TestPolicyAuthorizer(t *testing.T) {
 				{name: "DefaultAgentWrite", prefix: "foo", check: checkDefaultAgentWrite},
 				{name: "DefaultEventRead", prefix: "foo", check: checkDefaultEventRead},
 				{name: "DefaultEventWrite", prefix: "foo", check: checkDefaultEventWrite},
-				{name: "DefaultIdentityRead", prefix: "foo", check: checkDefaultIdentityRead},
-				{name: "DefaultIdentityWrite", prefix: "foo", check: checkDefaultIdentityWrite},
-				{name: "DefaultIdentityWriteAny", prefix: "", check: checkDefaultIdentityWriteAny},
 				{name: "DefaultIntentionDefaultAllow", prefix: "foo", check: checkDefaultIntentionDefaultAllow},
 				{name: "DefaultIntentionRead", prefix: "foo", check: checkDefaultIntentionRead},
 				{name: "DefaultIntentionWrite", prefix: "foo", check: checkDefaultIntentionWrite},
@@ -188,29 +182,6 @@ func TestPolicyAuthorizer(t *testing.T) {
 						Policy: PolicyRead,
 					},
 				},
-				Identities: []*IdentityRule{
-					{
-						Name:       "foo",
-						Policy:     PolicyWrite,
-						Intentions: PolicyWrite,
-					},
-					{
-						Name:   "football",
-						Policy: PolicyDeny,
-					},
-				},
-				IdentityPrefixes: []*IdentityRule{
-					{
-						Name:       "foot",
-						Policy:     PolicyRead,
-						Intentions: PolicyRead,
-					},
-					{
-						Name:       "fo",
-						Policy:     PolicyRead,
-						Intentions: PolicyRead,
-					},
-				},
 				Keys: []*KeyRule{
 					{
 						Prefix: "foo",
@@ -397,21 +368,20 @@ func TestPolicyAuthorizer(t *testing.T) {
 				{name: "ServiceWriteDenied", prefix: "football", check: checkDenyServiceWrite},
 				{name: "ServiceWriteAnyAllowed", prefix: "", check: checkAllowServiceWriteAny},
 
-				{name: "IdentityReadPrefixAllowed", prefix: "fo", check: checkAllowIdentityRead},
-				{name: "IdentityWritePrefixDenied", prefix: "fo", check: checkDenyIdentityWrite},
-				{name: "IdentityReadPrefixAllowed", prefix: "for", check: checkAllowIdentityRead},
-				{name: "IdentityWritePrefixDenied", prefix: "for", check: checkDenyIdentityWrite},
-				{name: "IdentityReadAllowed", prefix: "foo", check: checkAllowIdentityRead},
-				{name: "IdentityWriteAllowed", prefix: "foo", check: checkAllowIdentityWrite},
-				{name: "IdentityReadPrefixAllowed", prefix: "foot", check: checkAllowIdentityRead},
-				{name: "IdentityWritePrefixDenied", prefix: "foot", check: checkDenyIdentityWrite},
-				{name: "IdentityReadPrefixAllowed", prefix: "foot2", check: checkAllowIdentityRead},
-				{name: "IdentityWritePrefixDenied", prefix: "foot2", check: checkDenyIdentityWrite},
-				{name: "IdentityReadPrefixAllowed", prefix: "food", check: checkAllowIdentityRead},
-				{name: "IdentityWritePrefixDenied", prefix: "food", check: checkDenyIdentityWrite},
-				{name: "IdentityReadDenied", prefix: "football", check: checkDenyIdentityRead},
-				{name: "IdentityWriteDenied", prefix: "football", check: checkDenyIdentityWrite},
-				{name: "IdentityWriteAnyAllowed", prefix: "", check: checkAllowIdentityWriteAny},
+				{name: "NodeReadPrefixAllowed", prefix: "fo", check: checkAllowNodeRead},
+				{name: "NodeWritePrefixDenied", prefix: "fo", check: checkDenyNodeWrite},
+				{name: "NodeReadPrefixAllowed", prefix: "for", check: checkAllowNodeRead},
+				{name: "NodeWritePrefixDenied", prefix: "for", check: checkDenyNodeWrite},
+				{name: "NodeReadAllowed", prefix: "foo", check: checkAllowNodeRead},
+				{name: "NodeWriteAllowed", prefix: "foo", check: checkAllowNodeWrite},
+				{name: "NodeReadPrefixAllowed", prefix: "foot", check: checkAllowNodeRead},
+				{name: "NodeWritePrefixDenied", prefix: "foot", check: checkDenyNodeWrite},
+				{name: "NodeReadPrefixAllowed", prefix: "foot2", check: checkAllowNodeRead},
+				{name: "NodeWritePrefixDenied", prefix: "foot2", check: checkDenyNodeWrite},
+				{name: "NodeReadPrefixAllowed", prefix: "food", check: checkAllowNodeRead},
+				{name: "NodeWritePrefixDenied", prefix: "food", check: checkDenyNodeWrite},
+				{name: "NodeReadDenied", prefix: "football", check: checkDenyNodeRead},
+				{name: "NodeWriteDenied", prefix: "football", check: checkDenyNodeWrite},
 
 				{name: "IntentionReadPrefixAllowed", prefix: "fo", check: checkAllowIntentionRead},
 				{name: "IntentionWritePrefixDenied", prefix: "fo", check: checkDenyIntentionWrite},
diff --git a/acl/policy_ce.go b/acl/policy_ce.go
index fe139ef7ab757..a5d6828b63d6f 100644
--- a/acl/policy_ce.go
+++ b/acl/policy_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package acl
 
diff --git a/acl/policy_merger.go b/acl/policy_merger.go
index 83166e167dd05..3a617aa1e1793 100644
--- a/acl/policy_merger.go
+++ b/acl/policy_merger.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 type policyRulesMergeContext struct {
@@ -9,8 +6,6 @@ type policyRulesMergeContext struct {
 	agentPrefixRules         map[string]*AgentRule
 	eventRules               map[string]*EventRule
 	eventPrefixRules         map[string]*EventRule
-	identityRules            map[string]*IdentityRule
-	identityPrefixRules      map[string]*IdentityRule
 	keyringRule              string
 	keyRules                 map[string]*KeyRule
 	keyPrefixRules           map[string]*KeyRule
@@ -35,8 +30,6 @@ func (p *policyRulesMergeContext) init() {
 	p.agentPrefixRules = make(map[string]*AgentRule)
 	p.eventRules = make(map[string]*EventRule)
 	p.eventPrefixRules = make(map[string]*EventRule)
-	p.identityRules = make(map[string]*IdentityRule)
-	p.identityPrefixRules = make(map[string]*IdentityRule)
 	p.keyringRule = ""
 	p.keyRules = make(map[string]*KeyRule)
 	p.keyPrefixRules = make(map[string]*KeyRule)
@@ -102,42 +95,6 @@ func (p *policyRulesMergeContext) merge(policy *PolicyRules) {
 		}
 	}
 
-	for _, id := range policy.Identities {
-		existing, found := p.identityRules[id.Name]
-
-		if !found {
-			p.identityRules[id.Name] = id
-			continue
-		}
-
-		if takesPrecedenceOver(id.Policy, existing.Policy) {
-			existing.Policy = id.Policy
-			existing.EnterpriseRule = id.EnterpriseRule
-		}
-
-		if takesPrecedenceOver(id.Intentions, existing.Intentions) {
-			existing.Intentions = id.Intentions
-		}
-	}
-
-	for _, id := range policy.IdentityPrefixes {
-		existing, found := p.identityPrefixRules[id.Name]
-
-		if !found {
-			p.identityPrefixRules[id.Name] = id
-			continue
-		}
-
-		if takesPrecedenceOver(id.Policy, existing.Policy) {
-			existing.Policy = id.Policy
-			existing.EnterpriseRule = id.EnterpriseRule
-		}
-
-		if takesPrecedenceOver(id.Intentions, existing.Intentions) {
-			existing.Intentions = id.Intentions
-		}
-	}
-
 	if takesPrecedenceOver(policy.Keyring, p.keyringRule) {
 		p.keyringRule = policy.Keyring
 	}
@@ -309,16 +266,6 @@ func (p *policyRulesMergeContext) fill(merged *PolicyRules) {
 		merged.EventPrefixes = append(merged.EventPrefixes, policy)
 	}
 
-	merged.Identities = []*IdentityRule{}
-	for _, policy := range p.identityRules {
-		merged.Identities = append(merged.Identities, policy)
-	}
-
-	merged.IdentityPrefixes = []*IdentityRule{}
-	for _, policy := range p.identityPrefixRules {
-		merged.IdentityPrefixes = append(merged.IdentityPrefixes, policy)
-	}
-
 	merged.Keys = []*KeyRule{}
 	for _, policy := range p.keyRules {
 		merged.Keys = append(merged.Keys, policy)
diff --git a/acl/policy_merger_ce.go b/acl/policy_merger_ce.go
index 4738314a6c1dd..cff74c7325276 100644
--- a/acl/policy_merger_ce.go
+++ b/acl/policy_merger_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package acl
 
diff --git a/acl/policy_test.go b/acl/policy_test.go
index 599c8c977e1b9..7095df286b3a6 100644
--- a/acl/policy_test.go
+++ b/acl/policy_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
@@ -42,12 +39,6 @@ func TestPolicySourceParse(t *testing.T) {
 				event "bar" {
 					policy = "deny"
 				}
-				identity_prefix "" {
-					policy = "write"
-				}
-				identity "foo" {
-					policy = "read"
-				}
 				key_prefix "" {
 					policy = "read"
 				}
@@ -123,16 +114,6 @@ func TestPolicySourceParse(t *testing.T) {
 					  "policy": "deny"
 					}
 				  },
-				  "identity_prefix": {
-					"": {
-					  "policy": "write"
-					}
-				  },
-				  "identity": {
-					"foo": {
-					  "policy": "read"
-					}
-				  },
 				  "key_prefix": {
 					"": {
 					  "policy": "read"
@@ -233,18 +214,6 @@ func TestPolicySourceParse(t *testing.T) {
 						Policy: PolicyDeny,
 					},
 				},
-				IdentityPrefixes: []*IdentityRule{
-					{
-						Name:   "",
-						Policy: PolicyWrite,
-					},
-				},
-				Identities: []*IdentityRule{
-					{
-						Name:   "foo",
-						Policy: PolicyRead,
-					},
-				},
 				Keyring: PolicyDeny,
 				KeyPrefixes: []*KeyRule{
 					{
@@ -331,39 +300,6 @@ func TestPolicySourceParse(t *testing.T) {
 				},
 			}},
 		},
-		{
-			Name:      "Identity No Intentions",
-			Rules:     `identity "foo" { policy = "write" }`,
-			RulesJSON: `{ "identity": { "foo": { "policy": "write" }}}`,
-			Expected: &Policy{PolicyRules: PolicyRules{
-				Identities: []*IdentityRule{
-					{
-						Name:   "foo",
-						Policy: "write",
-					},
-				},
-			}},
-		},
-		{
-			Name:      "Identity Intentions",
-			Rules:     `identity "foo" { policy = "write" intentions = "read" }`,
-			RulesJSON: `{ "identity": { "foo": { "policy": "write", "intentions": "read" }}}`,
-			Expected: &Policy{PolicyRules: PolicyRules{
-				Identities: []*IdentityRule{
-					{
-						Name:       "foo",
-						Policy:     "write",
-						Intentions: "read",
-					},
-				},
-			}},
-		},
-		{
-			Name:      "Identity Intention: invalid value",
-			Rules:     `identity "foo" { policy = "write" intentions = "foo" }`,
-			RulesJSON: `{ "identity": { "foo": { "policy": "write", "intentions": "foo" }}}`,
-			Err:       "Invalid identity intentions policy",
-		},
 		{
 			Name:      "Service No Intentions",
 			Rules:     `service "foo" { policy = "write" }`,
@@ -415,18 +351,6 @@ func TestPolicySourceParse(t *testing.T) {
 			RulesJSON: `{ "agent_prefix": { "foo": { "policy": "nope" }}}`,
 			Err:       "Invalid agent_prefix policy",
 		},
-		{
-			Name:      "Bad Policy - Identity",
-			Rules:     `identity "foo" { policy = "nope" }`,
-			RulesJSON: `{ "identity": { "foo": { "policy": "nope" }}}`,
-			Err:       "Invalid identity policy",
-		},
-		{
-			Name:      "Bad Policy - Identity Prefix",
-			Rules:     `identity_prefix "foo" { policy = "nope" }`,
-			RulesJSON: `{ "identity_prefix": { "foo": { "policy": "nope" }}}`,
-			Err:       "Invalid identity_prefix policy",
-		},
 		{
 			Name:      "Bad Policy - Key",
 			Rules:     `key "foo" { policy = "nope" }`,
@@ -758,109 +682,6 @@ func TestMergePolicies(t *testing.T) {
 				},
 			}},
 		},
-		{
-			name: "Identities",
-			input: []*Policy{
-				{PolicyRules: PolicyRules{
-					Identities: []*IdentityRule{
-						{
-							Name:       "foo",
-							Policy:     PolicyWrite,
-							Intentions: PolicyWrite,
-						},
-						{
-							Name:       "bar",
-							Policy:     PolicyRead,
-							Intentions: PolicyRead,
-						},
-						{
-							Name:       "baz",
-							Policy:     PolicyWrite,
-							Intentions: PolicyWrite,
-						},
-					},
-					IdentityPrefixes: []*IdentityRule{
-						{
-							Name:       "000",
-							Policy:     PolicyWrite,
-							Intentions: PolicyWrite,
-						},
-						{
-							Name:       "111",
-							Policy:     PolicyRead,
-							Intentions: PolicyRead,
-						},
-						{
-							Name:       "222",
-							Policy:     PolicyWrite,
-							Intentions: PolicyWrite,
-						},
-					},
-				}},
-				{PolicyRules: PolicyRules{
-					Identities: []*IdentityRule{
-						{
-							Name:       "foo",
-							Policy:     PolicyRead,
-							Intentions: PolicyRead,
-						},
-						{
-							Name:       "baz",
-							Policy:     PolicyDeny,
-							Intentions: PolicyDeny,
-						},
-					},
-					IdentityPrefixes: []*IdentityRule{
-						{
-							Name:       "000",
-							Policy:     PolicyRead,
-							Intentions: PolicyRead,
-						},
-						{
-							Name:       "222",
-							Policy:     PolicyDeny,
-							Intentions: PolicyDeny,
-						},
-					},
-				}},
-			},
-			expected: &Policy{PolicyRules: PolicyRules{
-				Identities: []*IdentityRule{
-					{
-						Name:       "foo",
-						Policy:     PolicyWrite,
-						Intentions: PolicyWrite,
-					},
-					{
-						Name:       "bar",
-						Policy:     PolicyRead,
-						Intentions: PolicyRead,
-					},
-					{
-						Name:       "baz",
-						Policy:     PolicyDeny,
-						Intentions: PolicyDeny,
-					},
-				},
-				IdentityPrefixes: []*IdentityRule{
-					{
-						Name:       "000",
-						Policy:     PolicyWrite,
-						Intentions: PolicyWrite,
-					},
-					{
-						Name:       "111",
-						Policy:     PolicyRead,
-						Intentions: PolicyRead,
-					},
-					{
-						Name:       "222",
-						Policy:     PolicyDeny,
-						Intentions: PolicyDeny,
-					},
-				},
-			}},
-		},
 		{
 			name: "Node",
 			input: []*Policy{
diff --git a/acl/resolver/danger.go b/acl/resolver/danger.go
deleted file mode 100644
index 29b4f35ac1d0f..0000000000000
--- a/acl/resolver/danger.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resolver
-
-import (
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-// DANGER_NO_AUTH implements an ACL resolver short-circuit authorization in
-// cases where it is handled somewhere else or expressly not required.
-type DANGER_NO_AUTH struct{}
-
-// ResolveTokenAndDefaultMeta returns an authorizer with unfettered permissions.
-func (DANGER_NO_AUTH) ResolveTokenAndDefaultMeta(_ string, entMeta *acl.EnterpriseMeta, _ *acl.AuthorizerContext) (Result, error) {
-	entMeta.Merge(structs.DefaultEnterpriseMetaInDefaultPartition())
-	return Result{Authorizer: acl.ManageAll()}, nil
-}
diff --git a/acl/resolver/result.go b/acl/resolver/result.go
index 1e52b1c573168..abf85056887f9 100644
--- a/acl/resolver/result.go
+++ b/acl/resolver/result.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package resolver
 
 import (
diff --git a/acl/static_authorizer.go b/acl/static_authorizer.go
index 225aa64e74dbf..07cc8451141dd 100644
--- a/acl/static_authorizer.go
+++ b/acl/static_authorizer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 var (
@@ -75,34 +72,6 @@ func (s *staticAuthorizer) EventWrite(string, *AuthorizerContext) EnforcementDec
 	return Deny
 }
 
-func (s *staticAuthorizer) IdentityRead(string, *AuthorizerContext) EnforcementDecision {
-	if s.defaultAllow {
-		return Allow
-	}
-	return Deny
-}
-
-func (s *staticAuthorizer) IdentityReadAll(*AuthorizerContext) EnforcementDecision {
-	if s.defaultAllow {
-		return Allow
-	}
-	return Deny
-}
-
-func (s *staticAuthorizer) IdentityWrite(string, *AuthorizerContext) EnforcementDecision {
-	if s.defaultAllow {
-		return Allow
-	}
-	return Deny
-}
-
-func (s *staticAuthorizer) IdentityWriteAny(*AuthorizerContext) EnforcementDecision {
-	if s.defaultAllow {
-		return Allow
-	}
-	return Deny
-}
-
 func (s *staticAuthorizer) IntentionDefaultAllow(*AuthorizerContext) EnforcementDecision {
 	if s.defaultAllow {
 		return Allow
@@ -292,20 +261,6 @@ func (s *staticAuthorizer) Snapshot(_ *AuthorizerContext) EnforcementDecision {
 	return Deny
 }
 
-func (s *staticAuthorizer) TrafficPermissionsRead(string, *AuthorizerContext) EnforcementDecision {
-	if s.defaultAllow {
-		return Allow
-	}
-	return Deny
-}
-
-func (s *staticAuthorizer) TrafficPermissionsWrite(string, *AuthorizerContext) EnforcementDecision {
-	if s.defaultAllow {
-		return Allow
-	}
-	return Deny
-}
-
 func (s *staticAuthorizer) ToAllowAuthorizer() AllowAuthorizer {
 	return AllowAuthorizer{Authorizer: s}
 }
diff --git a/acl/static_authorizer_test.go b/acl/static_authorizer_test.go
index cdaf91ef71020..b9ed590933ed8 100644
--- a/acl/static_authorizer_test.go
+++ b/acl/static_authorizer_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
diff --git a/acl/testing.go b/acl/testing.go
index ef4d0343c6b9e..283446d00c7f3 100644
--- a/acl/testing.go
+++ b/acl/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
diff --git a/acl/validation.go b/acl/validation.go
index c0017effa15d7..a8151e121d09d 100644
--- a/acl/validation.go
+++ b/acl/validation.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
diff --git a/acl/validation_test.go b/acl/validation_test.go
index 3bf14719b12ae..d5d01e0e9054e 100644
--- a/acl/validation_test.go
+++ b/acl/validation_test.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MPL-2.0
 
 package acl
 
diff --git a/agent/acl.go b/agent/acl.go
index 0f64ee62c79e9..f3ba50cf4b717 100644
--- a/agent/acl.go
+++ b/agent/acl.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/acl_ce.go b/agent/acl_ce.go
index 4ce9bb00642ab..0a50dcda12a34 100644
--- a/agent/acl_ce.go
+++ b/agent/acl_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
diff --git a/agent/acl_endpoint.go b/agent/acl_endpoint.go
index fb94862800eba..8e952392a86b4 100644
--- a/agent/acl_endpoint.go
+++ b/agent/acl_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -1133,144 +1130,3 @@ func (s *HTTPHandlers) ACLAuthorize(resp http.ResponseWriter, req *http.Request)
 
 	return responses, nil
 }
-
-func (s *HTTPHandlers) ACLTemplatedPoliciesList(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
-	if s.checkACLDisabled() {
-		return nil, aclDisabled
-	}
-
-	var token string
-	s.parseToken(req, &token)
-
-	var entMeta acl.EnterpriseMeta
-	if err := s.parseEntMetaNoWildcard(req, &entMeta); err != nil {
-		return nil, err
-	}
-
-	s.defaultMetaPartitionToAgent(&entMeta)
-	var authzContext acl.AuthorizerContext
-	authz, err := s.agent.delegate.ResolveTokenAndDefaultMeta(token, &entMeta, &authzContext)
-	if err != nil {
-		return nil, err
-	}
-
-	// Only ACLRead privileges are required to list templated policies
-	if err := authz.ToAllowAuthorizer().ACLReadAllowed(&authzContext); err != nil {
-		return nil, err
-	}
-
-	templatedPolicies := make(map[string]api.ACLTemplatedPolicyResponse)
-
-	for tp, tmpBase := range structs.GetACLTemplatedPolicyList() {
-		templatedPolicies[tp] = api.ACLTemplatedPolicyResponse{
-			TemplateName: tmpBase.TemplateName,
-			Schema:       tmpBase.Schema,
-			Template:     tmpBase.Template,
-		}
-	}
-
-	return templatedPolicies, nil
-}
-
-func (s *HTTPHandlers) ACLTemplatedPolicyRead(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
-	if s.checkACLDisabled() {
-		return nil, aclDisabled
-	}
-
-	templateName := strings.TrimPrefix(req.URL.Path, "/v1/acl/templated-policy/name/")
-	if templateName == "" {
-		return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: "Missing templated policy Name"}
-	}
-
-	var token string
-	s.parseToken(req, &token)
-
-	var entMeta acl.EnterpriseMeta
-	if err := s.parseEntMetaNoWildcard(req, &entMeta); err != nil {
-		return nil, err
-	}
-
-	s.defaultMetaPartitionToAgent(&entMeta)
-	var authzContext acl.AuthorizerContext
-	authz, err := s.agent.delegate.ResolveTokenAndDefaultMeta(token, &entMeta, &authzContext)
-	if err != nil {
-		return nil, err
-	}
-
-	// Only ACLRead privileges are required to read templated policies
-	if err := authz.ToAllowAuthorizer().ACLReadAllowed(&authzContext); err != nil {
-		return nil, err
-	}
-
-	baseTemplate, ok := structs.GetACLTemplatedPolicyBase(templateName)
-	if !ok {
-		return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: fmt.Sprintf("Invalid templated policy Name: %s", templateName)}
-	}
-
-	return api.ACLTemplatedPolicyResponse{
-		TemplateName: baseTemplate.TemplateName,
-		Schema:       baseTemplate.Schema,
-		Template:     baseTemplate.Template,
-	}, nil
-}
-
-func (s *HTTPHandlers) ACLTemplatedPolicyPreview(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
-	if s.checkACLDisabled() {
-		return nil, aclDisabled
-	}
-
-	templateName := strings.TrimPrefix(req.URL.Path, "/v1/acl/templated-policy/preview/")
-	if templateName == "" {
-		return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: "Missing templated policy Name"}
-	}
-
-	var token string
-	s.parseToken(req, &token)
-
-	var entMeta acl.EnterpriseMeta
-	if err := s.parseEntMetaNoWildcard(req, &entMeta); err != nil {
-		return nil, err
-	}
-
-	s.defaultMetaPartitionToAgent(&entMeta)
-	var authzContext acl.AuthorizerContext
-	authz, err := s.agent.delegate.ResolveTokenAndDefaultMeta(token, &entMeta, &authzContext)
-	if err != nil {
-		return nil, err
-	}
-
-	// Only ACLRead privileges are required to read/preview templated policies
-	if err := authz.ToAllowAuthorizer().ACLReadAllowed(&authzContext); err != nil {
-		return nil, err
-	}
-
-	baseTemplate, ok := structs.GetACLTemplatedPolicyBase(templateName)
-	if !ok {
-		return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: fmt.Sprintf("templated policy %q does not exist", templateName)}
-	}
-
-	var tpRequest structs.ACLTemplatedPolicyVariables
-
-	if err := decodeBody(req.Body, &tpRequest); err != nil {
-		return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: fmt.Sprintf("Failed to decode request body: %s", err.Error())}
-	}
-
-	templatedPolicy := structs.ACLTemplatedPolicy{
-		TemplateID:        baseTemplate.TemplateID,
-		TemplateName:      baseTemplate.TemplateName,
-		TemplateVariables: &tpRequest,
-	}
-
-	err = templatedPolicy.ValidateTemplatedPolicy(baseTemplate.Schema)
-	if err != nil {
-		return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: fmt.Sprintf("validation error for templated policy: %q: %s", templatedPolicy.TemplateName, err.Error())}
-	}
-
-	renderedPolicy, err := templatedPolicy.SyntheticPolicy(&entMeta)
-
-	if err != nil {
-		return nil, HTTPError{StatusCode: http.StatusInternalServerError, Reason: fmt.Sprintf("Failed to generate synthetic policy: %q: %s", templatedPolicy.TemplateName, err.Error())}
-	}
-
-	return renderedPolicy, nil
-}
diff --git a/agent/acl_endpoint_test.go b/agent/acl_endpoint_test.go
index 7ce090204d828..4ff21fe47236a 100644
--- a/agent/acl_endpoint_test.go
+++ b/agent/acl_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -21,7 +18,6 @@ import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/consul/authmethod/testauth"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/internal/go-sso/oidcauth/oidcauthtest"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/testrpc"
@@ -1362,88 +1358,6 @@ func TestACL_HTTP(t *testing.T) {
 			require.Equal(t, "sn1", token.ServiceIdentities[0].ServiceName)
 		})
 	})
-
-	t.Run("ACLTemplatedPolicy", func(t *testing.T) {
-		t.Run("List", func(t *testing.T) {
-			req, _ := http.NewRequest("GET", "/v1/acl/templated-policies", nil)
-			req.Header.Add("X-Consul-Token", "root")
-			resp := httptest.NewRecorder()
-			a.srv.h.ServeHTTP(resp, req)
-
-			require.Equal(t, http.StatusOK, resp.Code)
-
-			var list map[string]api.ACLTemplatedPolicyResponse
-			require.NoError(t, json.NewDecoder(resp.Body).Decode(&list))
-			require.Len(t, list, 5)
-
-			require.Equal(t, api.ACLTemplatedPolicyResponse{
-				TemplateName: api.ACLTemplatedPolicyServiceName,
-				Schema:       structs.ACLTemplatedPolicyServiceSchema,
-				Template:     structs.ACLTemplatedPolicyService,
-			}, list[api.ACLTemplatedPolicyServiceName])
-		})
-		t.Run("Read", func(t *testing.T) {
-			t.Run("With non existing templated policy", func(t *testing.T) {
-				req, _ := http.NewRequest("GET", "/v1/acl/templated-policy/name/fake", nil)
-				req.Header.Add("X-Consul-Token", "root")
-				resp := httptest.NewRecorder()
-				a.srv.h.ServeHTTP(resp, req)
-				require.Equal(t, http.StatusBadRequest, resp.Code)
-			})
-
-			t.Run("With existing templated policy", func(t *testing.T) {
-				req, _ := http.NewRequest("GET", "/v1/acl/templated-policy/name/"+api.ACLTemplatedPolicyDNSName, nil)
-				req.Header.Add("X-Consul-Token", "root")
-				resp := httptest.NewRecorder()
-
-				a.srv.h.ServeHTTP(resp, req)
-				require.Equal(t, http.StatusOK, resp.Code)
-
-				var templatedPolicy api.ACLTemplatedPolicyResponse
-				require.NoError(t, json.NewDecoder(resp.Body).Decode(&templatedPolicy))
-				require.Equal(t, structs.ACLTemplatedPolicyNoRequiredVariablesSchema, templatedPolicy.Schema)
-				require.Equal(t, api.ACLTemplatedPolicyDNSName, templatedPolicy.TemplateName)
-				require.Equal(t, structs.ACLTemplatedPolicyDNS, templatedPolicy.Template)
-			})
-		})
-		t.Run("preview", func(t *testing.T) {
-			t.Run("When missing required variables", func(t *testing.T) {
-				previewInput := &structs.ACLTemplatedPolicyVariables{}
-				req, _ := http.NewRequest(
-					"POST",
-					fmt.Sprintf("/v1/acl/templated-policy/preview/%s", api.ACLTemplatedPolicyServiceName),
-					jsonBody(previewInput),
-				)
-				req.Header.Add("X-Consul-Token", "root")
-				resp := httptest.NewRecorder()
-
-				a.srv.h.ServeHTTP(resp, req)
-				require.Equal(t, http.StatusBadRequest, resp.Code)
-			})
-
-			t.Run("Correct input", func(t *testing.T) {
-				previewInput := &structs.ACLTemplatedPolicyVariables{Name: "web"}
-				req, _ := http.NewRequest(
-					"POST",
-					fmt.Sprintf("/v1/acl/templated-policy/preview/%s", api.ACLTemplatedPolicyServiceName),
-					jsonBody(previewInput),
-				)
-				req.Header.Add("X-Consul-Token", "root")
-				resp := httptest.NewRecorder()
-
-				a.srv.h.ServeHTTP(resp, req)
-				require.Equal(t, http.StatusOK, resp.Code)
-
-				var syntheticPolicy *structs.ACLPolicy
-				require.NoError(t, json.NewDecoder(resp.Body).Decode(&syntheticPolicy))
-
-				require.NotEmpty(t, syntheticPolicy.ID)
-				require.NotEmpty(t, syntheticPolicy.Hash)
-				require.Equal(t, "synthetic policy generated from templated policy: builtin/service", syntheticPolicy.Description)
-				require.Contains(t, syntheticPolicy.Name, "synthetic-policy-")
-			})
-		})
-	})
 }
 
 func TestACL_LoginProcedure_HTTP(t *testing.T) {
@@ -2190,7 +2104,7 @@ func TestACL_Authorize(t *testing.T) {
 	policyReq := structs.ACLPolicySetRequest{
 		Policy: structs.ACLPolicy{
 			Name:  "test",
-			Rules: `acl = "read" operator = "write" identity_prefix "" { policy = "read"} service_prefix "" { policy = "read"} node_prefix "" { policy= "write" } key_prefix "/foo" { policy = "write" } `,
+			Rules: `acl = "read" operator = "write" service_prefix "" { policy = "read"} node_prefix "" { policy= "write" } key_prefix "/foo" { policy = "write" } `,
 		},
 		Datacenter:   "dc1",
 		WriteRequest: structs.WriteRequest{Token: TestDefaultInitialManagementToken},
@@ -2276,16 +2190,6 @@ func TestACL_Authorize(t *testing.T) {
 				Segment:  "foo",
 				Access:   "write",
 			},
-			{
-				Resource: "identity",
-				Segment:  "foo",
-				Access:   "read",
-			},
-			{
-				Resource: "identity",
-				Segment:  "foo",
-				Access:   "write",
-			},
 			{
 				Resource: "intention",
 				Segment:  "foo",
@@ -2436,16 +2340,6 @@ func TestACL_Authorize(t *testing.T) {
 			Segment:  "foo",
 			Access:   "write",
 		},
-		{
-			Resource: "identity",
-			Segment:  "foo",
-			Access:   "read",
-		},
-		{
-			Resource: "identity",
-			Segment:  "foo",
-			Access:   "write",
-		},
 		{
 			Resource: "intention",
 			Segment:  "foo",
@@ -2552,8 +2446,6 @@ func TestACL_Authorize(t *testing.T) {
 		false, // agent:write
 		false, // event:read
 		false, // event:write
-		true,  // identity:read
-		false, // identity:write
 		true,  // intentions:read
 		false, // intention:write
 		false, // key:read
diff --git a/agent/acl_test.go b/agent/acl_test.go
index 0958db8db6fb0..cc2249c6750c7 100644
--- a/agent/acl_test.go
+++ b/agent/acl_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -22,7 +19,6 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/types"
 
@@ -164,9 +160,6 @@ func (a *TestACLAgent) Stats() map[string]map[string]string {
 func (a *TestACLAgent) ReloadConfig(_ consul.ReloadableConfig) error {
 	return fmt.Errorf("Unimplemented")
 }
-func (a *TestACLAgent) ResourceServiceClient() pbresource.ResourceServiceClient {
-	return nil
-}
 
 func TestACL_Version8EnabledByDefault(t *testing.T) {
 	t.Parallel()
diff --git a/agent/ae/ae.go b/agent/ae/ae.go
index f8b9a331d100c..9b2841cc5bb59 100644
--- a/agent/ae/ae.go
+++ b/agent/ae/ae.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // Package ae provides tools to synchronize state between local and remote consul servers.
 package ae
 
@@ -81,9 +78,8 @@ type StateSyncer struct {
 	SyncChanges *Trigger
 
 	// paused stores whether sync runs are temporarily disabled.
-	pauseLock    sync.Mutex
-	paused       int
-	hardDisabled bool
+	pauseLock sync.Mutex
+	paused    int
 
 	// serverUpInterval is the max time after which a full sync is
 	// performed when a server has been added to the cluster.
@@ -152,20 +148,9 @@ const (
 	retryFullSyncState fsmState = "retryFullSync"
 )
 
-// HardDisableSync is like PauseSync but is one-way. It causes other
-// Pause/Resume/Start operations to be completely ignored.
-func (s *StateSyncer) HardDisableSync() {
-	s.pauseLock.Lock()
-	s.hardDisabled = true
-	s.pauseLock.Unlock()
-}
-
 // Run is the long running method to perform state synchronization
 // between local and remote servers.
 func (s *StateSyncer) Run() {
-	if s.Disabled() {
-		return
-	}
 	if s.ClusterSize == nil {
 		panic("ClusterSize not set")
 	}
@@ -341,14 +326,7 @@ func (s *StateSyncer) Pause() {
 func (s *StateSyncer) Paused() bool {
 	s.pauseLock.Lock()
 	defer s.pauseLock.Unlock()
-	return s.paused != 0 || s.hardDisabled
-}
-
-// Disabled returns whether sync runs are permanently disabled.
-func (s *StateSyncer) Disabled() bool {
-	s.pauseLock.Lock()
-	defer s.pauseLock.Unlock()
-	return s.hardDisabled
+	return s.paused != 0
 }
 
 // Resume re-enables sync runs. It returns true if it was the last pause/resume
@@ -359,7 +337,7 @@ func (s *StateSyncer) Resume() bool {
 	if s.paused < 0 {
 		panic("unbalanced pause/resume")
 	}
-	trigger := s.paused == 0 && !s.hardDisabled
+	trigger := s.paused == 0
 	s.pauseLock.Unlock()
 	if trigger {
 		s.SyncChanges.Trigger()
diff --git a/agent/ae/ae_test.go b/agent/ae/ae_test.go
index 9e9593f4f92d2..c719f1951c1ac 100644
--- a/agent/ae/ae_test.go
+++ b/agent/ae/ae_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ae
 
 import (
diff --git a/agent/ae/trigger.go b/agent/ae/trigger.go
index 29bdd988907eb..1aa5f45862760 100644
--- a/agent/ae/trigger.go
+++ b/agent/ae/trigger.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ae
 
 // Trigger implements a non-blocking event notifier. Events can be
diff --git a/agent/agent.go b/agent/agent.go
index 06f538bf9695e..64282e3200a0f 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -50,14 +47,11 @@ import (
 	grpcDNS "github.com/hashicorp/consul/agent/grpc-external/services/dns"
 	middleware "github.com/hashicorp/consul/agent/grpc-middleware"
 	"github.com/hashicorp/consul/agent/hcp/scada"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/local"
 	"github.com/hashicorp/consul/agent/proxycfg"
 	proxycfgglue "github.com/hashicorp/consul/agent/proxycfg-glue"
 	catalogproxycfg "github.com/hashicorp/consul/agent/proxycfg-sources/catalog"
 	localproxycfg "github.com/hashicorp/consul/agent/proxycfg-sources/local"
-	"github.com/hashicorp/consul/agent/rpcclient"
-	"github.com/hashicorp/consul/agent/rpcclient/configentry"
 	"github.com/hashicorp/consul/agent/rpcclient/health"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/systemd"
@@ -65,16 +59,14 @@ import (
 	"github.com/hashicorp/consul/agent/xds"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/api/watch"
-	proxytracker "github.com/hashicorp/consul/internal/mesh/proxy-tracker"
 	"github.com/hashicorp/consul/ipaddr"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/lib/file"
 	"github.com/hashicorp/consul/lib/mutex"
 	"github.com/hashicorp/consul/lib/routine"
 	"github.com/hashicorp/consul/logging"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/pboperator"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pboperator"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/tlsutil"
 	"github.com/hashicorp/consul/types"
 )
@@ -127,7 +119,6 @@ var configSourceToName = map[configSource]string{
 	ConfigSourceLocal:  "local",
 	ConfigSourceRemote: "remote",
 }
-
 var configSourceFromName = map[string]configSource{
 	"local":  ConfigSourceLocal,
 	"remote": ConfigSourceRemote,
@@ -200,9 +191,6 @@ type delegate interface {
 
 	RPC(ctx context.Context, method string, args interface{}, reply interface{}) error
 
-	// ResourceServiceClient is a client for the gRPC Resource Service.
-	ResourceServiceClient() pbresource.ResourceServiceClient
-
 	SnapshotRPC(args *structs.SnapshotRequest, in io.Reader, out io.Writer, replyFn structs.SnapshotReplyFn) error
 	Shutdown() error
 	Stats() map[string]map[string]string
@@ -255,9 +243,6 @@ type Agent struct {
 	// cache is the in-memory cache for data the Agent requests.
 	cache *cache.Cache
 
-	// leafCertManager issues and caches leaf certs as needed.
-	leafCertManager *leafcert.Manager
-
 	// checkReapAfter maps the check ID to a timeout after which we should
 	// reap its associated service
 	checkReapAfter map[structs.CheckID]time.Duration
@@ -397,8 +382,7 @@ type Agent struct {
 
 	// TODO: pass directly to HTTPHandlers and DNSServer once those are passed
 	// into Agent, which will allow us to remove this field.
-	rpcClientHealth      *health.Client
-	rpcClientConfigEntry *configentry.Client
+	rpcClientHealth *health.Client
 
 	rpcClientPeering pbpeering.PeeringServiceClient
 
@@ -441,12 +425,6 @@ type Agent struct {
 //   - create the AutoConfig object for future use in fully
 //     resolving the configuration
 func New(bd BaseDeps) (*Agent, error) {
-	if bd.LeafCertManager == nil {
-		return nil, errors.New("LeafCertManager is required")
-	}
-	if bd.NetRPC == nil {
-		return nil, errors.New("NetRPC is required")
-	}
 	a := Agent{
 		checkReapAfter:  make(map[structs.CheckID]time.Duration),
 		checkMonitors:   make(map[structs.CheckID]*checks.CheckMonitor),
@@ -473,7 +451,6 @@ func New(bd BaseDeps) (*Agent, error) {
 		tlsConfigurator: bd.TLSConfigurator,
 		config:          bd.RuntimeConfig,
 		cache:           bd.Cache,
-		leafCertManager: bd.LeafCertManager,
 		routineManager:  routine.NewManager(bd.Logger),
 		scadaProvider:   bd.HCP.Provider,
 	}
@@ -485,40 +462,22 @@ func New(bd BaseDeps) (*Agent, error) {
 	}
 
 	a.rpcClientHealth = &health.Client{
-		Client: rpcclient.Client{
-			Cache:     bd.Cache,
-			NetRPC:    &a,
-			CacheName: cachetype.HealthServicesName,
-			ViewStore: bd.ViewStore,
-			MaterializerDeps: rpcclient.MaterializerDeps{
-				Conn:   conn,
-				Logger: bd.Logger.Named("rpcclient.health"),
-			},
-			UseStreamingBackend: a.config.UseStreamingBackend,
-			QueryOptionDefaults: config.ApplyDefaultQueryOptions(a.config),
+		Cache:     bd.Cache,
+		NetRPC:    &a,
+		CacheName: cachetype.HealthServicesName,
+		ViewStore: bd.ViewStore,
+		MaterializerDeps: health.MaterializerDeps{
+			Conn:   conn,
+			Logger: bd.Logger.Named("rpcclient.health"),
 		},
+		UseStreamingBackend: a.config.UseStreamingBackend,
+		QueryOptionDefaults: config.ApplyDefaultQueryOptions(a.config),
 	}
 
 	a.rpcClientPeering = pbpeering.NewPeeringServiceClient(conn)
 	a.rpcClientOperator = pboperator.NewOperatorServiceClient(conn)
 
 	a.serviceManager = NewServiceManager(&a)
-	a.rpcClientConfigEntry = &configentry.Client{
-		Client: rpcclient.Client{
-			Cache:     bd.Cache,
-			NetRPC:    &a,
-			CacheName: cachetype.ConfigEntryName,
-			ViewStore: bd.ViewStore,
-			MaterializerDeps: rpcclient.MaterializerDeps{
-				Conn:   conn,
-				Logger: bd.Logger.Named("rpcclient.configentry"),
-			},
-			QueryOptionDefaults: config.ApplyDefaultQueryOptions(a.config),
-		},
-	}
-
-	// TODO(rb): remove this once NetRPC is properly available in BaseDeps without an Agent
-	bd.NetRPC.SetNetRPC(&a)
 
 	// We used to do this in the Start method. However it doesn't need to go
 	// there any longer. Originally it did because we passed the agent
@@ -576,7 +535,6 @@ func LocalConfig(cfg *config.RuntimeConfig) local.Config {
 		DiscardCheckOutput:  cfg.DiscardCheckOutput,
 		NodeID:              cfg.NodeID,
 		NodeName:            cfg.NodeName,
-		NodeLocality:        cfg.StructLocality(),
 		Partition:           cfg.PartitionOrDefault(),
 		TaggedAddresses:     map[string]string{},
 	}
@@ -621,15 +579,6 @@ func (a *Agent) Start(ctx context.Context) error {
 	// create the state synchronization manager which performs
 	// regular and on-demand state synchronizations (anti-entropy).
 	a.sync = ae.NewStateSyncer(a.State, c.AEInterval, a.shutdownCh, a.logger)
-	if a.baseDeps.UseV2Resources() {
-		a.sync.HardDisableSync()
-	}
-
-	err = validateFIPSConfig(a.config)
-	if err != nil {
-		// Log warning, rather than force breaking
-		a.logger.Warn("FIPS 140-2 Compliance", "issue", err)
-	}
 
 	// create the config for the rpc server/client
 	consulCfg, err := newConsulConfig(a.config, a.logger)
@@ -655,42 +604,6 @@ func (a *Agent) Start(ctx context.Context) error {
 		return fmt.Errorf("failed to start Consul enterprise component: %v", err)
 	}
 
-	// Create proxy config manager now because it is a dependency of creating the proxyWatcher
-	// which will be passed to consul.NewServer so that it is then passed to the
-	// controller registration for the XDS controller in v2 mode, and the xds server in v1 and v2 mode.
-	intentionDefaultAllow, err := a.config.ACLResolverSettings.IsDefaultAllow()
-	if err != nil {
-		return fmt.Errorf("unexpected ACL default policy value of %q", a.config.ACLResolverSettings.ACLDefaultPolicy)
-	}
-
-	go a.baseDeps.ViewStore.Run(&lib.StopChannelContext{StopCh: a.shutdownCh})
-
-	// Start the proxy config manager.
-	a.proxyConfig, err = proxycfg.NewManager(proxycfg.ManagerConfig{
-		DataSources: a.proxyDataSources(),
-		Logger:      a.logger.Named(logging.ProxyConfig),
-		Source: &structs.QuerySource{
-			Datacenter:    a.config.Datacenter,
-			Segment:       a.config.SegmentName,
-			Node:          a.config.NodeName,
-			NodePartition: a.config.PartitionOrEmpty(),
-		},
-		DNSConfig: proxycfg.DNSConfig{
-			Domain:    a.config.DNSDomain,
-			AltDomain: a.config.DNSAltDomain,
-		},
-		TLSConfigurator:       a.tlsConfigurator,
-		IntentionDefaultAllow: intentionDefaultAllow,
-		UpdateRateLimit:       a.config.XDSUpdateRateLimit,
-	})
-	if err != nil {
-		return err
-	}
-
-	// proxyWatcher will be used in the creation of the XDS server and also
-	// in the registration of the xds controller.
-	proxyWatcher := a.getProxyWatcher()
-
 	// Setup either the client or the server.
 	if c.ServerMode {
 		serverLogger := a.baseDeps.Logger.NamedIntercept(logging.ConsulServer)
@@ -724,11 +637,7 @@ func (a *Agent) Start(ctx context.Context) error {
 			incomingRPCLimiter,
 		)
 
-		var pt *proxytracker.ProxyTracker
-		if a.baseDeps.UseV2Resources() {
-			pt = proxyWatcher.(*proxytracker.ProxyTracker)
-		}
-		server, err := consul.NewServer(consulCfg, a.baseDeps.Deps, a.externalGRPCServer, incomingRPCLimiter, serverLogger, pt)
+		server, err := consul.NewServer(consulCfg, a.baseDeps.Deps, a.externalGRPCServer, incomingRPCLimiter, serverLogger)
 		if err != nil {
 			return fmt.Errorf("Failed to start Consul server: %v", err)
 		}
@@ -742,7 +651,7 @@ func (a *Agent) Start(ctx context.Context) error {
 					Datacenter:  a.config.Datacenter,
 					ACLsEnabled: a.config.ACLsEnabled,
 				},
-				LeafCertManager: a.leafCertManager,
+				Cache:           a.cache,
 				GetStore:        func() servercert.Store { return server.FSM().State() },
 				TLSConfigurator: a.tlsConfigurator,
 			}
@@ -795,6 +704,40 @@ func (a *Agent) Start(ctx context.Context) error {
 		return err
 	}
 
+	var intentionDefaultAllow bool
+	switch a.config.ACLResolverSettings.ACLDefaultPolicy {
+	case "allow":
+		intentionDefaultAllow = true
+	case "deny":
+		intentionDefaultAllow = false
+	default:
+		return fmt.Errorf("unexpected ACL default policy value of %q", a.config.ACLResolverSettings.ACLDefaultPolicy)
+	}
+
+	go a.baseDeps.ViewStore.Run(&lib.StopChannelContext{StopCh: a.shutdownCh})
+
+	// Start the proxy config manager.
+	a.proxyConfig, err = proxycfg.NewManager(proxycfg.ManagerConfig{
+		DataSources: a.proxyDataSources(),
+		Logger:      a.logger.Named(logging.ProxyConfig),
+		Source: &structs.QuerySource{
+			Datacenter:    a.config.Datacenter,
+			Segment:       a.config.SegmentName,
+			Node:          a.config.NodeName,
+			NodePartition: a.config.PartitionOrEmpty(),
+		},
+		DNSConfig: proxycfg.DNSConfig{
+			Domain:    a.config.DNSDomain,
+			AltDomain: a.config.DNSAltDomain,
+		},
+		TLSConfigurator:       a.tlsConfigurator,
+		IntentionDefaultAllow: intentionDefaultAllow,
+		UpdateRateLimit:       a.config.XDSUpdateRateLimit,
+	})
+	if err != nil {
+		return err
+	}
+
 	go localproxycfg.Sync(
 		&lib.StopChannelContext{StopCh: a.shutdownCh},
 		localproxycfg.SyncConfig{
@@ -847,7 +790,7 @@ func (a *Agent) Start(ctx context.Context) error {
 	}
 
 	// Start grpc and grpc_tls servers.
-	if err := a.listenAndServeGRPC(proxyWatcher); err != nil {
+	if err := a.listenAndServeGRPC(); err != nil {
 		return err
 	}
 
@@ -912,70 +855,39 @@ func (a *Agent) Failed() <-chan struct{} {
 	return a.apiServers.failed
 }
 
-// getProxyWatcher returns the proper implementation of the ProxyWatcher interface.
-// It will return a ProxyTracker if "resource-apis" experiment is active.  Otherwise,
-// it will return a ConfigSource.
-func (a *Agent) getProxyWatcher() xds.ProxyWatcher {
-	if a.baseDeps.UseV2Resources() {
-		a.logger.Trace("returning proxyTracker for getProxyWatcher")
-		return proxytracker.NewProxyTracker(proxytracker.ProxyTrackerConfig{
-			Logger:         a.logger.Named("proxy-tracker"),
-			SessionLimiter: a.baseDeps.XDSStreamLimiter,
-		})
-	} else {
-		a.logger.Trace("returning configSource for getProxyWatcher")
-		return localproxycfg.NewConfigSource(a.proxyConfig)
+func (a *Agent) listenAndServeGRPC() error {
+	if len(a.config.GRPCAddrs) < 1 && len(a.config.GRPCTLSAddrs) < 1 {
+		return nil
 	}
-}
-
-// configureXDSServer configures an XDS server with the proper implementation of
-// the PRoxyWatcher interface and registers the XDS server with Consul's
-// external facing GRPC server.
-func (a *Agent) configureXDSServer(proxyWatcher xds.ProxyWatcher) {
 	// TODO(agentless): rather than asserting the concrete type of delegate, we
 	// should add a method to the Delegate interface to build a ConfigSource.
+	var cfg xds.ProxyConfigSource = localproxycfg.NewConfigSource(a.proxyConfig)
 	if server, ok := a.delegate.(*consul.Server); ok {
-		switch proxyWatcher.(type) {
-		case *proxytracker.ProxyTracker:
-			go func() {
-				<-a.shutdownCh
-				proxyWatcher.(*proxytracker.ProxyTracker).Shutdown()
-			}()
-		default:
-			catalogCfg := catalogproxycfg.NewConfigSource(catalogproxycfg.Config{
-				NodeName:          a.config.NodeName,
-				LocalState:        a.State,
-				LocalConfigSource: proxyWatcher,
-				Manager:           a.proxyConfig,
-				GetStore:          func() catalogproxycfg.Store { return server.FSM().State() },
-				Logger:            a.proxyConfig.Logger.Named("server-catalog"),
-				SessionLimiter:    a.baseDeps.XDSStreamLimiter,
-			})
-			go func() {
-				<-a.shutdownCh
-				catalogCfg.Shutdown()
-			}()
-			proxyWatcher = catalogCfg
-		}
+		catalogCfg := catalogproxycfg.NewConfigSource(catalogproxycfg.Config{
+			NodeName:          a.config.NodeName,
+			LocalState:        a.State,
+			LocalConfigSource: cfg,
+			Manager:           a.proxyConfig,
+			GetStore:          func() catalogproxycfg.Store { return server.FSM().State() },
+			Logger:            a.proxyConfig.Logger.Named("server-catalog"),
+			SessionLimiter:    a.baseDeps.XDSStreamLimiter,
+		})
+		go func() {
+			<-a.shutdownCh
+			catalogCfg.Shutdown()
+		}()
+		cfg = catalogCfg
 	}
 	a.xdsServer = xds.NewServer(
 		a.config.NodeName,
 		a.logger.Named(logging.Envoy),
-		proxyWatcher,
+		cfg,
 		func(id string) (acl.Authorizer, error) {
 			return a.delegate.ResolveTokenAndDefaultMeta(id, nil, nil)
 		},
 		a,
 	)
 	a.xdsServer.Register(a.externalGRPCServer)
-}
-
-func (a *Agent) listenAndServeGRPC(proxyWatcher xds.ProxyWatcher) error {
-	if len(a.config.GRPCAddrs) < 1 && len(a.config.GRPCTLSAddrs) < 1 {
-		return nil
-	}
-
-	a.configureXDSServer(proxyWatcher)
 
 	// Attempt to spawn listeners
 	var listeners []net.Listener
@@ -1595,7 +1507,6 @@ func newConsulConfig(runtimeCfg *config.RuntimeConfig, logger hclog.Logger) (*co
 	cfg.RequestLimitsMode = runtimeCfg.RequestLimitsMode.String()
 	cfg.RequestLimitsReadRate = runtimeCfg.RequestLimitsReadRate
 	cfg.RequestLimitsWriteRate = runtimeCfg.RequestLimitsWriteRate
-	cfg.Locality = runtimeCfg.StructLocality()
 
 	cfg.Cloud.ManagementToken = runtimeCfg.Cloud.ManagementToken
 
@@ -1680,18 +1591,7 @@ func (a *Agent) RPC(ctx context.Context, method string, args interface{}, reply
 			method = e + "." + p[1]
 		}
 	}
-
-	// audit log only on consul clients
-	_, ok := a.delegate.(*consul.Client)
-	if ok {
-		a.writeAuditRPCEvent(method, "OperationStart")
-	}
-
 	a.endpointsLock.RUnlock()
-
-	defer func() {
-		a.writeAuditRPCEvent(method, "OperationComplete")
-	}()
 	return a.delegate.RPC(ctx, method, args, reply)
 }
 
@@ -1775,7 +1675,6 @@ func (a *Agent) ShutdownAgent() error {
 	}
 
 	a.rpcClientHealth.Close()
-	a.rpcClientConfigEntry.Close()
 
 	// Shutdown SCADA provider
 	if a.scadaProvider != nil {
@@ -3056,20 +2955,14 @@ func (a *Agent) addCheck(check *structs.HealthCheck, chkType *structs.CheckType,
 				chkType.Interval = checks.MinInterval
 			}
 
-			var tlsClientConfig *tls.Config
-			if chkType.TCPUseTLS {
-				tlsClientConfig = a.tlsConfigurator.OutgoingTLSConfigForCheck(chkType.TLSSkipVerify, chkType.TLSServerName)
-			}
-
 			tcp := &checks.CheckTCP{
-				CheckID:         cid,
-				ServiceID:       sid,
-				TCP:             chkType.TCP,
-				Interval:        chkType.Interval,
-				Timeout:         chkType.Timeout,
-				Logger:          a.logger,
-				TLSClientConfig: tlsClientConfig,
-				StatusHandler:   statusHandler,
+				CheckID:       cid,
+				ServiceID:     sid,
+				TCP:           chkType.TCP,
+				Interval:      chkType.Interval,
+				Timeout:       chkType.Timeout,
+				Logger:        a.logger,
+				StatusHandler: statusHandler,
 			}
 			tcp.Start()
 			a.checkTCPs[cid] = tcp
@@ -4044,7 +3937,6 @@ func (a *Agent) loadMetadata(conf *config.RuntimeConfig) error {
 		meta[k] = v
 	}
 	meta[structs.MetaSegmentKey] = conf.SegmentName
-	meta[structs.MetaConsulVersion] = conf.Version
 	return a.State.LoadMetadata(meta)
 }
 
@@ -4426,6 +4318,13 @@ func (a *Agent) registerCache() {
 
 	a.cache.RegisterType(cachetype.ConnectCARootName, &cachetype.ConnectCARoot{RPC: a})
 
+	a.cache.RegisterType(cachetype.ConnectCALeafName, &cachetype.ConnectCALeaf{
+		RPC:                              a,
+		Cache:                            a.cache,
+		Datacenter:                       a.config.Datacenter,
+		TestOverrideCAChangeInitialDelay: a.config.ConnectTestCALeafRootChangeSpread,
+	})
+
 	a.cache.RegisterType(cachetype.IntentionMatchName, &cachetype.IntentionMatch{RPC: a})
 
 	a.cache.RegisterType(cachetype.IntentionUpstreamsName, &cachetype.IntentionUpstreams{RPC: a})
@@ -4586,7 +4485,7 @@ func (a *Agent) proxyDataSources() proxycfg.DataSources {
 		IntentionUpstreams:              proxycfgglue.CacheIntentionUpstreams(a.cache),
 		IntentionUpstreamsDestination:   proxycfgglue.CacheIntentionUpstreamsDestination(a.cache),
 		InternalServiceDump:             proxycfgglue.CacheInternalServiceDump(a.cache),
-		LeafCertificate:                 proxycfgglue.LocalLeafCerts(a.leafCertManager),
+		LeafCertificate:                 proxycfgglue.CacheLeafCertificate(a.cache),
 		PeeredUpstreams:                 proxycfgglue.CachePeeredUpstreams(a.cache),
 		PeeringList:                     proxycfgglue.CachePeeringList(a.cache),
 		PreparedQuery:                   proxycfgglue.CachePrepraredQuery(a.cache),
@@ -4612,11 +4511,7 @@ func (a *Agent) proxyDataSources() proxycfg.DataSources {
 		sources.ExportedPeeredServices = proxycfgglue.ServerExportedPeeredServices(deps)
 		sources.FederationStateListMeshGateways = proxycfgglue.ServerFederationStateListMeshGateways(deps)
 		sources.GatewayServices = proxycfgglue.ServerGatewayServices(deps)
-		// We do not use this health check currently due to a bug with the way that service exports
-		// interact with ACLs and the streaming backend. See comments in `proxycfgglue.ServerHealthBlocking`
-		// for more details.
-		// sources.Health = proxycfgglue.ServerHealth(deps, proxycfgglue.ClientHealth(a.rpcClientHealth))
-		sources.Health = proxycfgglue.ServerHealthBlocking(deps, proxycfgglue.ClientHealth(a.rpcClientHealth))
+		sources.Health = proxycfgglue.ServerHealth(deps, proxycfgglue.ClientHealth(a.rpcClientHealth))
 		sources.HTTPChecks = proxycfgglue.ServerHTTPChecks(deps, a.config.NodeName, proxycfgglue.CacheHTTPChecks(a.cache), a.State)
 		sources.Intentions = proxycfgglue.ServerIntentions(deps)
 		sources.IntentionUpstreams = proxycfgglue.ServerIntentionUpstreams(deps)
@@ -4632,6 +4527,7 @@ func (a *Agent) proxyDataSources() proxycfg.DataSources {
 
 	a.fillEnterpriseProxyDataSources(&sources)
 	return sources
+
 }
 
 // persistServerMetadata periodically writes a server's metadata to a file
diff --git a/agent/agent_ce.go b/agent/agent_ce.go
index a4a6cbf809d9e..39adbef81e647 100644
--- a/agent/agent_ce.go
+++ b/agent/agent_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
@@ -39,11 +37,6 @@ func (a *Agent) reloadEnterprise(conf *config.RuntimeConfig) error {
 func enterpriseConsulConfig(_ *consul.Config, _ *config.RuntimeConfig) {
 }
 
-// validateFIPSConfig is a noop stub for the func defined in agent_ent.go
-func validateFIPSConfig(_ *config.RuntimeConfig) error {
-	return nil
-}
-
 // WriteEvent is a noop stub for the func defined agent_ent.go
 func (a *Agent) WriteEvent(eventType string, payload interface{}) {
 }
@@ -68,7 +61,3 @@ func (a *Agent) AgentEnterpriseMeta() *acl.EnterpriseMeta {
 func (a *Agent) registerEntCache() {}
 
 func (*Agent) fillEnterpriseProxyDataSources(*proxycfg.DataSources) {}
-
-func (a *Agent) writeAuditRPCEvent(_ string, _ string) interface{} {
-	return nil
-}
diff --git a/agent/agent_ce_test.go b/agent/agent_ce_test.go
index f9eed9018ba0a..ceb90beb0634c 100644
--- a/agent/agent_ce_test.go
+++ b/agent/agent_ce_test.go
@@ -1,7 +1,8 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MPL-2.0
 
 //go:build !consulent
+// +build !consulent
 
 package agent
 
diff --git a/agent/agent_endpoint.go b/agent/agent_endpoint.go
index 3fab6e8c6a192..d33e6ccc0a2d4 100644
--- a/agent/agent_endpoint.go
+++ b/agent/agent_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -11,12 +8,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/go-bexpr"
+	"github.com/hashicorp/consul/envoyextensions/xdscommon"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-memdb"
+	"github.com/mitchellh/hashstructure"
+
+	"github.com/hashicorp/go-bexpr"
 	"github.com/hashicorp/serf/coordinate"
 	"github.com/hashicorp/serf/serf"
-	"github.com/mitchellh/hashstructure"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
@@ -24,17 +23,14 @@ import (
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
 	"github.com/hashicorp/consul/agent/consul"
 	"github.com/hashicorp/consul/agent/debug"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/structs"
 	token_store "github.com/hashicorp/consul/agent/token"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
 	"github.com/hashicorp/consul/ipaddr"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/logging"
 	"github.com/hashicorp/consul/logging/monitor"
 	"github.com/hashicorp/consul/types"
-	"github.com/hashicorp/consul/version"
 )
 
 type Self struct {
@@ -308,7 +304,6 @@ func buildAgentService(s *structs.NodeService, dc string) api.AgentService {
 		ModifyIndex:       s.ModifyIndex,
 		Weights:           weights,
 		Datacenter:        dc,
-		Locality:          s.Locality.ToAPI(),
 	}
 
 	if as.Tags == nil {
@@ -1531,9 +1526,6 @@ func (s *HTTPHandlers) AgentToken(resp http.ResponseWriter, req *http.Request) (
 		case "config_file_service_registration":
 			s.agent.tokens.UpdateConfigFileRegistrationToken(args.Token, token_store.TokenSourceAPI)
 
-		case "dns_token", "dns":
-			s.agent.tokens.UpdateDNSToken(args.Token, token_store.TokenSourceAPI)
-
 		default:
 			return HTTPError{StatusCode: http.StatusNotFound, Reason: fmt.Sprintf("Token %q is unknown", target)}
 		}
@@ -1588,7 +1580,7 @@ func (s *HTTPHandlers) AgentConnectCALeafCert(resp http.ResponseWriter, req *htt
 
 	// TODO(peering): expose way to get kind=mesh-gateway type cert with appropriate ACLs
 
-	args := leafcert.ConnectCALeafRequest{
+	args := cachetype.ConnectCALeafRequest{
 		Service: serviceName, // Need name not ID
 	}
 	var qOpts structs.QueryOptions
@@ -1617,13 +1609,17 @@ func (s *HTTPHandlers) AgentConnectCALeafCert(resp http.ResponseWriter, req *htt
 		return nil, nil
 	}
 
-	reply, m, err := s.agent.leafCertManager.Get(req.Context(), &args)
+	raw, m, err := s.agent.cache.Get(req.Context(), cachetype.ConnectCALeafName, &args)
 	if err != nil {
 		return nil, err
 	}
-
 	defer setCacheMeta(resp, &m)
 
+	reply, ok := raw.(*structs.IssuedCert)
+	if !ok {
+		// This should never happen, but we want to protect against panics
+		return nil, fmt.Errorf("internal error: response type not correct")
+	}
 	setIndex(resp, reply.ModifyIndex)
 
 	return reply, nil
@@ -1698,12 +1694,3 @@ func (s *HTTPHandlers) AgentHost(resp http.ResponseWriter, req *http.Request) (i
 
 	return debug.CollectHostInfo(), nil
 }
-
-// AgentVersion
-//
-// GET /v1/agent/version
-//
-// Retrieves Consul version information.
-func (s *HTTPHandlers) AgentVersion(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
-	return version.GetBuildInfo(), nil
-}
diff --git a/agent/agent_endpoint_ce.go b/agent/agent_endpoint_ce.go
index 657d5122fe247..b54b9df99fa6c 100644
--- a/agent/agent_endpoint_ce.go
+++ b/agent/agent_endpoint_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
diff --git a/agent/agent_endpoint_ce_test.go b/agent/agent_endpoint_ce_test.go
index 1b1dc866837fd..d815bb45810c1 100644
--- a/agent/agent_endpoint_ce_test.go
+++ b/agent/agent_endpoint_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
diff --git a/agent/agent_endpoint_test.go b/agent/agent_endpoint_test.go
index 1a021d7b8e4c0..9f89afb77d0a1 100644
--- a/agent/agent_endpoint_test.go
+++ b/agent/agent_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -21,6 +18,7 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
+	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/serf/serf"
@@ -40,14 +38,12 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/token"
 	tokenStore "github.com/hashicorp/consul/agent/token"
-	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/envoyextensions/xdscommon"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/types"
-	"github.com/hashicorp/consul/version"
 )
 
 func createACLTokenWithAgentReadPolicy(t *testing.T, srv *HTTPHandlers) string {
@@ -79,34 +75,6 @@ func createACLTokenWithAgentReadPolicy(t *testing.T, srv *HTTPHandlers) string {
 	return svcToken.SecretID
 }
 
-func TestAgentEndpointsFailInV2(t *testing.T) {
-	t.Parallel()
-
-	a := NewTestAgent(t, `experiments = ["resource-apis"]`)
-
-	checkRequest := func(method, url string) {
-		t.Run(method+" "+url, func(t *testing.T) {
-			assertV1CatalogEndpointDoesNotWorkWithV2(t, a, method, url, `{}`)
-		})
-	}
-
-	checkRequest("PUT", "/v1/agent/maintenance")
-	checkRequest("GET", "/v1/agent/services")
-	checkRequest("GET", "/v1/agent/service/web")
-	checkRequest("GET", "/v1/agent/checks")
-	checkRequest("GET", "/v1/agent/health/service/id/web")
-	checkRequest("GET", "/v1/agent/health/service/name/web")
-	checkRequest("PUT", "/v1/agent/check/register")
-	checkRequest("PUT", "/v1/agent/check/deregister/web")
-	checkRequest("PUT", "/v1/agent/check/pass/web")
-	checkRequest("PUT", "/v1/agent/check/warn/web")
-	checkRequest("PUT", "/v1/agent/check/fail/web")
-	checkRequest("PUT", "/v1/agent/check/update/web")
-	checkRequest("PUT", "/v1/agent/service/register")
-	checkRequest("PUT", "/v1/agent/service/deregister/web")
-	checkRequest("PUT", "/v1/agent/service/maintenance/web")
-}
-
 func TestAgent_Services(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
@@ -765,6 +733,9 @@ func TestAgent_Service(t *testing.T) {
 			if tt.wantWait != 0 {
 				assert.True(t, elapsed >= tt.wantWait, "should have waited at least %s, "+
 					"took %s", tt.wantWait, elapsed)
+			} else {
+				assert.True(t, elapsed < 10*time.Millisecond, "should not have waited, "+
+					"took %s", elapsed)
 			}
 
 			if tt.wantResp != nil {
@@ -1531,8 +1502,7 @@ func TestAgent_Self(t *testing.T) {
 			require.NoError(t, err)
 			require.Equal(t, cs[a.config.SegmentName], val.Coord)
 
-			delete(val.Meta, structs.MetaSegmentKey)    // Added later, not in config.
-			delete(val.Meta, structs.MetaConsulVersion) // Added later, not in config.
+			delete(val.Meta, structs.MetaSegmentKey) // Added later, not in config.
 			require.Equal(t, a.config.NodeMeta, val.Meta)
 
 			if tc.expectXDS {
@@ -1626,37 +1596,14 @@ func TestAgent_Metrics_ACLDeny(t *testing.T) {
 	})
 }
 
-func newDefaultBaseDeps(t *testing.T) BaseDeps {
-	dataDir := testutil.TempDir(t, "acl-agent")
-	logBuffer := testutil.NewLogBuffer(t)
-	logger := hclog.NewInterceptLogger(nil)
-	loader := func(source config.Source) (config.LoadResult, error) {
-		dataDir := fmt.Sprintf(`data_dir = "%s"`, dataDir)
-		opts := config.LoadOpts{
-			HCL:           []string{TestConfigHCL(NodeID()), "", dataDir},
-			DefaultConfig: source,
-		}
-		result, err := config.Load(opts)
-		if result.RuntimeConfig != nil {
-			result.RuntimeConfig.Telemetry.Disable = true
-		}
-		return result, err
-	}
-	bd, err := NewBaseDeps(loader, logBuffer, logger)
-	require.NoError(t, err)
-	return bd
-}
-
 func TestHTTPHandlers_AgentMetricsStream_ACLDeny(t *testing.T) {
-	bd := newDefaultBaseDeps(t)
+	bd := BaseDeps{}
 	bd.Tokens = new(tokenStore.Store)
 	sink := metrics.NewInmemSink(30*time.Millisecond, time.Second)
 	bd.MetricsConfig = &lib.MetricsConfig{
 		Handler: sink,
 	}
-	mockDelegate := delegateMock{}
-	mockDelegate.On("LicenseCheck").Return()
-	d := fakeResolveTokenDelegate{delegate: &mockDelegate, authorizer: acl.DenyAll()}
+	d := fakeResolveTokenDelegate{authorizer: acl.DenyAll()}
 	agent := &Agent{
 		baseDeps: bd,
 		delegate: d,
@@ -1679,15 +1626,13 @@ func TestHTTPHandlers_AgentMetricsStream_ACLDeny(t *testing.T) {
 }
 
 func TestHTTPHandlers_AgentMetricsStream(t *testing.T) {
-	bd := newDefaultBaseDeps(t)
+	bd := BaseDeps{}
 	bd.Tokens = new(tokenStore.Store)
 	sink := metrics.NewInmemSink(20*time.Millisecond, time.Second)
 	bd.MetricsConfig = &lib.MetricsConfig{
 		Handler: sink,
 	}
-	mockDelegate := delegateMock{}
-	mockDelegate.On("LicenseCheck").Return()
-	d := fakeResolveTokenDelegate{delegate: &mockDelegate, authorizer: acl.ManageAll()}
+	d := fakeResolveTokenDelegate{authorizer: acl.ManageAll()}
 	agent := &Agent{
 		baseDeps: bd,
 		delegate: d,
@@ -4473,7 +4418,7 @@ func testAgent_RegisterServiceDeregisterService_Sidecar(t *testing.T, extraHCL s
 			}
 			`,
 			enableACL: true,
-			policies:  ``, // No policies means no valid token
+			policies:  ``, // No policy means no valid token
 			wantNS:    nil,
 			wantErr:   "Permission denied",
 		},
@@ -6965,27 +6910,14 @@ func TestAgentConnectCALeafCert_good(t *testing.T) {
 		require.Equal(t, issued, issued2)
 	}
 
-	replyCh := make(chan *httptest.ResponseRecorder, 1)
-
-	go func(index string) {
-		resp := httptest.NewRecorder()
-		req, _ := http.NewRequest("GET", "/v1/agent/connect/ca/leaf/test?index="+index, nil)
-		a.srv.h.ServeHTTP(resp, req)
-
-		replyCh <- resp
-	}(index)
-
 	// Set a new CA
 	ca2 := connect.TestCAConfigSet(t, a, nil)
 
 	// Issue a blocking query to ensure that the cert gets updated appropriately
 	t.Run("test blocking queries update leaf cert", func(t *testing.T) {
-		var resp *httptest.ResponseRecorder
-		select {
-		case resp = <-replyCh:
-		case <-time.After(500 * time.Millisecond):
-			t.Fatal("blocking query did not wake up during rotation")
-		}
+		resp := httptest.NewRecorder()
+		req, _ := http.NewRequest("GET", "/v1/agent/connect/ca/leaf/test?index="+index, nil)
+		a.srv.h.ServeHTTP(resp, req)
 		dec := json.NewDecoder(resp.Body)
 		issued2 := &structs.IssuedCert{}
 		require.NoError(t, dec.Decode(issued2))
@@ -8148,32 +8080,6 @@ func TestAgent_HostBadACL(t *testing.T) {
 	assert.Equal(t, http.StatusOK, resp.Code)
 }
 
-func TestAgent_Version(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	dc1 := "dc1"
-	a := NewTestAgent(t, `
-		primary_datacenter = "`+dc1+`"
-	`)
-	defer a.Shutdown()
-
-	testrpc.WaitForLeader(t, a.RPC, "dc1")
-	req, _ := http.NewRequest("GET", "/v1/agent/version", nil)
-	// req.Header.Add("X-Consul-Token", "initial-management")
-	resp := httptest.NewRecorder()
-	respRaw, err := a.srv.AgentVersion(resp, req)
-	assert.Nil(t, err)
-	assert.Equal(t, http.StatusOK, resp.Code)
-	assert.NotNil(t, respRaw)
-
-	obj := respRaw.(*version.BuildInfo)
-	assert.NotNil(t, obj.HumanVersion)
-}
-
 // Thie tests that a proxy with an ExposeConfig is returned as expected.
 func TestAgent_Services_ExposeConfig(t *testing.T) {
 	if testing.Short() {
diff --git a/agent/agent_test.go b/agent/agent_test.go
index 455a8bbb3e66e..7f5de5b69a19d 100644
--- a/agent/agent_test.go
+++ b/agent/agent_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -14,7 +11,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
 	mathrand "math/rand"
 	"net"
 	"net/http"
@@ -23,19 +19,12 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"reflect"
 	"strconv"
 	"strings"
 	"sync"
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/agent/grpc-external/limiter"
-	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/proxycfg-sources/local"
-	"github.com/hashicorp/consul/agent/xds"
-	proxytracker "github.com/hashicorp/consul/internal/mesh/proxy-tracker"
-
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/tcpproxy"
@@ -60,15 +49,13 @@ import (
 	"github.com/hashicorp/consul/agent/consul"
 	"github.com/hashicorp/consul/agent/hcp"
 	"github.com/hashicorp/consul/agent/hcp/scada"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/token"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/internal/go-sso/oidcauth/oidcauthtest"
-	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/ipaddr"
 	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/proto/private/pbautoconf"
+	"github.com/hashicorp/consul/proto/pbautoconf"
 	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
@@ -331,7 +318,6 @@ func TestAgent_HTTPMaxHeaderBytes(t *testing.T) {
 					Tokens:          new(token.Store),
 					TLSConfigurator: tlsConf,
 					GRPCConnPool:    &fakeGRPCConnPool{},
-					Registry:        resource.NewRegistry(),
 				},
 				RuntimeConfig: &config.RuntimeConfig{
 					HTTPAddrs: []net.Addr{
@@ -339,25 +325,15 @@ func TestAgent_HTTPMaxHeaderBytes(t *testing.T) {
 					},
 					HTTPMaxHeaderBytes: tt.maxHeaderBytes,
 				},
-				Cache:  cache.New(cache.Options{}),
-				NetRPC: &LazyNetRPC{},
+				Cache: cache.New(cache.Options{}),
 			}
 
-			bd.LeafCertManager = leafcert.NewManager(leafcert.Deps{
-				CertSigner:  leafcert.NewNetRPCCertSigner(bd.NetRPC),
-				RootsReader: leafcert.NewCachedRootsReader(bd.Cache, "dc1"),
-				Config:      leafcert.Config{},
-			})
-
 			cfg := config.RuntimeConfig{BuildDate: time.Date(2000, 1, 1, 0, 0, 1, 0, time.UTC)}
 			bd, err = initEnterpriseBaseDeps(bd, &cfg)
 			require.NoError(t, err)
 
 			a, err := New(bd)
 			require.NoError(t, err)
-			mockDelegate := delegateMock{}
-			mockDelegate.On("LicenseCheck").Return()
-			a.delegate = &mockDelegate
 
 			a.startLicenseManager(testutil.TestContext(t))
 
@@ -392,8 +368,6 @@ func TestAgent_HTTPMaxHeaderBytes(t *testing.T) {
 				resp, err := client.Do(req.WithContext(ctx))
 				require.NoError(t, err)
 				require.Equal(t, tt.expectedHTTPResponse, resp.StatusCode, "expected a '%d' http response, got '%d'", tt.expectedHTTPResponse, resp.StatusCode)
-				resp.Body.Close()
-				s.Shutdown(ctx)
 			}
 		})
 	}
@@ -470,7 +444,6 @@ func testAgent_AddService(t *testing.T, extraHCL string) {
 				Tags:           []string{"tag1"},
 				Weights:        nil, // nil weights...
 				Port:           8100,
-				Locality:       &structs.Locality{Region: "us-west-1", Zone: "us-west-1a"},
 				EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
 			},
 			// ... should be populated to avoid "IsSame" returning true during AE.
@@ -977,80 +950,6 @@ func TestAgent_AddServiceWithH2CPINGCheck(t *testing.T) {
 	requireCheckExists(t, a, "test-h2cping-check")
 }
 
-func startMockTLSServer(t *testing.T) (addr string, closeFunc func() error) {
-	// Load certificates
-	cert, err := tls.LoadX509KeyPair("../test/key/ourdomain_server.cer", "../test/key/ourdomain_server.key")
-	require.NoError(t, err)
-	// Create a certificate pool
-	rootCertPool := x509.NewCertPool()
-	caCert, err := os.ReadFile("../test/ca/root.cer")
-	require.NoError(t, err)
-	rootCertPool.AppendCertsFromPEM(caCert)
-	// Configure TLS
-	config := &tls.Config{
-		Certificates: []tls.Certificate{cert},
-		ClientAuth:   tls.RequireAndVerifyClientCert,
-		ClientCAs:    rootCertPool,
-	}
-	// Start TLS server
-	ln, err := tls.Listen("tcp", "127.0.0.1:0", config)
-	require.NoError(t, err)
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			io.Copy(io.Discard, conn)
-			conn.Close()
-		}
-	}()
-	return ln.Addr().String(), ln.Close
-}
-
-func TestAgent_AddServiceWithTCPTLSCheck(t *testing.T) {
-	t.Parallel()
-	dataDir := testutil.TempDir(t, "agent")
-	a := NewTestAgent(t, `
-		data_dir = "`+dataDir+`"
-		enable_agent_tls_for_checks = true
-		datacenter = "dc1"
-		tls {
-			defaults {
-				ca_file   = "../test/ca/root.cer"
-				cert_file = "../test/key/ourdomain_server.cer"
-				key_file  = "../test/key/ourdomain_server.key"
-			}
-		}
-	`)
-	defer a.Shutdown()
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1")
-	// Start mock TCP+TLS server
-	addr, closeServer := startMockTLSServer(t)
-	defer closeServer()
-	check := &structs.HealthCheck{
-		Node:    "foo",
-		CheckID: "arbitraryTCPServerTLSCheck",
-		Name:    "arbitraryTCPServerTLSCheck",
-		Status:  api.HealthCritical,
-	}
-	chkType := &structs.CheckType{
-		TCP:           addr,
-		TCPUseTLS:     true,
-		TLSServerName: "server.dc1.consul",
-		Interval:      5 * time.Second,
-	}
-	err := a.AddCheck(check, chkType, false, "", ConfigSourceLocal)
-	require.NoError(t, err)
-	// Retry until the healthcheck is passing.
-	retry.Run(t, func(r *retry.R) {
-		status := getCheck(a, "arbitraryTCPServerTLSCheck")
-		if status.Status != api.HealthPassing {
-			r.Fatalf("bad: %v", status.Status)
-		}
-	})
-}
-
 func TestAgent_AddServiceNoExec(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
@@ -4300,7 +4199,9 @@ func TestAgent_ReloadConfig_EnableDebug(t *testing.T) {
 			Data:   cfg + ` enable_debug = true`,
 		},
 	)
+
 	require.NoError(t, a.reloadConfigInternal(c))
+
 	require.Equal(t, true, a.enableDebug.Load())
 
 	c = TestConfig(
@@ -4312,6 +4213,7 @@ func TestAgent_ReloadConfig_EnableDebug(t *testing.T) {
 		},
 	)
 	require.NoError(t, a.reloadConfigInternal(c))
+
 	require.Equal(t, false, a.enableDebug.Load())
 }
 
@@ -4386,7 +4288,7 @@ func TestAgent_consulConfig_RequestLimits(t *testing.T) {
 
 	t.Parallel()
 	hcl := `
-		limits {
+		limits { 
 			request_limits {
 				mode = "enforcing"
 				read_rate = 8888
@@ -5566,7 +5468,6 @@ func TestAgent_ListenHTTP_MultipleAddresses(t *testing.T) {
 			Tokens:          new(token.Store),
 			TLSConfigurator: tlsConf,
 			GRPCConnPool:    &fakeGRPCConnPool{},
-			Registry:        resource.NewRegistry(),
 		},
 		RuntimeConfig: &config.RuntimeConfig{
 			HTTPAddrs: []net.Addr{
@@ -5574,24 +5475,14 @@ func TestAgent_ListenHTTP_MultipleAddresses(t *testing.T) {
 				&net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: ports[1]},
 			},
 		},
-		Cache:  cache.New(cache.Options{}),
-		NetRPC: &LazyNetRPC{},
+		Cache: cache.New(cache.Options{}),
 	}
 
-	bd.LeafCertManager = leafcert.NewManager(leafcert.Deps{
-		CertSigner:  leafcert.NewNetRPCCertSigner(bd.NetRPC),
-		RootsReader: leafcert.NewCachedRootsReader(bd.Cache, "dc1"),
-		Config:      leafcert.Config{},
-	})
-
 	cfg := config.RuntimeConfig{BuildDate: time.Date(2000, 1, 1, 0, 0, 1, 0, time.UTC)}
 	bd, err = initEnterpriseBaseDeps(bd, &cfg)
 	require.NoError(t, err)
 
 	agent, err := New(bd)
-	mockDelegate := delegateMock{}
-	mockDelegate.On("LicenseCheck").Return()
-	agent.delegate = &mockDelegate
 	require.NoError(t, err)
 
 	agent.startLicenseManager(testutil.TestContext(t))
@@ -6166,28 +6057,17 @@ func TestAgent_startListeners(t *testing.T) {
 			Logger:       hclog.NewInterceptLogger(nil),
 			Tokens:       new(token.Store),
 			GRPCConnPool: &fakeGRPCConnPool{},
-			Registry:     resource.NewRegistry(),
 		},
 		RuntimeConfig: &config.RuntimeConfig{
 			HTTPAddrs: []net.Addr{},
 		},
-		Cache:  cache.New(cache.Options{}),
-		NetRPC: &LazyNetRPC{},
+		Cache: cache.New(cache.Options{}),
 	}
 
-	bd.LeafCertManager = leafcert.NewManager(leafcert.Deps{
-		CertSigner:  leafcert.NewNetRPCCertSigner(bd.NetRPC),
-		RootsReader: leafcert.NewCachedRootsReader(bd.Cache, "dc1"),
-		Config:      leafcert.Config{},
-	})
-
 	bd, err := initEnterpriseBaseDeps(bd, &config.RuntimeConfig{})
 	require.NoError(t, err)
 
 	agent, err := New(bd)
-	mockDelegate := delegateMock{}
-	mockDelegate.On("LicenseCheck").Return()
-	agent.delegate = &mockDelegate
 	require.NoError(t, err)
 
 	// use up an address
@@ -6310,27 +6190,16 @@ func TestAgent_startListeners_scada(t *testing.T) {
 			HCP: hcp.Deps{
 				Provider: pvd,
 			},
-			Registry: resource.NewRegistry(),
 		},
 		RuntimeConfig: &config.RuntimeConfig{},
 		Cache:         cache.New(cache.Options{}),
-		NetRPC:        &LazyNetRPC{},
 	}
 
-	bd.LeafCertManager = leafcert.NewManager(leafcert.Deps{
-		CertSigner:  leafcert.NewNetRPCCertSigner(bd.NetRPC),
-		RootsReader: leafcert.NewCachedRootsReader(bd.Cache, "dc1"),
-		Config:      leafcert.Config{},
-	})
-
 	cfg := config.RuntimeConfig{BuildDate: time.Date(2000, 1, 1, 0, 0, 1, 0, time.UTC)}
 	bd, err := initEnterpriseBaseDeps(bd, &cfg)
 	require.NoError(t, err)
 
 	agent, err := New(bd)
-	mockDelegate := delegateMock{}
-	mockDelegate.On("LicenseCheck").Return()
-	agent.delegate = &mockDelegate
 	require.NoError(t, err)
 
 	_, err = agent.startListeners([]net.Addr{c})
@@ -6356,7 +6225,7 @@ func TestAgent_scadaProvider(t *testing.T) {
 		},
 		Overrides: `
 cloud {
-  resource_id = "organization/0b9de9a3-8403-4ca6-aba8-fca752f42100/project/0b9de9a3-8403-4ca6-aba8-fca752f42100/consul.cluster/0b9de9a3-8403-4ca6-aba8-fca752f42100"
+  resource_id = "organization/0b9de9a3-8403-4ca6-aba8-fca752f42100/project/0b9de9a3-8403-4ca6-aba8-fca752f42100/consul.cluster/0b9de9a3-8403-4ca6-aba8-fca752f42100" 
   client_id = "test"
   client_secret = "test"
 }`,
@@ -6374,21 +6243,11 @@ func TestAgent_checkServerLastSeen(t *testing.T) {
 			Logger:       hclog.NewInterceptLogger(nil),
 			Tokens:       new(token.Store),
 			GRPCConnPool: &fakeGRPCConnPool{},
-			Registry:     resource.NewRegistry(),
 		},
 		RuntimeConfig: &config.RuntimeConfig{},
 		Cache:         cache.New(cache.Options{}),
-		NetRPC:        &LazyNetRPC{},
 	}
-	bd.LeafCertManager = leafcert.NewManager(leafcert.Deps{
-		CertSigner:  leafcert.NewNetRPCCertSigner(bd.NetRPC),
-		RootsReader: leafcert.NewCachedRootsReader(bd.Cache, "dc1"),
-		Config:      leafcert.Config{},
-	})
 	agent, err := New(bd)
-	mockDelegate := delegateMock{}
-	mockDelegate.On("LicenseCheck").Return()
-	agent.delegate = &mockDelegate
 	require.NoError(t, err)
 
 	// Test that an ErrNotExist OS error is treated as ok.
@@ -6442,73 +6301,6 @@ func TestAgent_checkServerLastSeen(t *testing.T) {
 	})
 }
 
-func TestAgent_getProxyWatcher(t *testing.T) {
-	type testcase struct {
-		description    string
-		getExperiments func() []string
-		expectedType   xds.ProxyWatcher
-	}
-	testscases := []testcase{
-		{
-			description:  "config source is returned when api-resources experiment is not configured",
-			expectedType: &local.ConfigSource{},
-			getExperiments: func() []string {
-				return []string{}
-			},
-		},
-		{
-			description:  "proxy tracker is returned when api-resources experiment is configured",
-			expectedType: &proxytracker.ProxyTracker{},
-			getExperiments: func() []string {
-				return []string{consul.CatalogResourceExperimentName}
-			},
-		},
-	}
-	for _, tc := range testscases {
-		caConfig := tlsutil.Config{}
-		tlsConf, err := tlsutil.NewConfigurator(caConfig, hclog.New(nil))
-		require.NoError(t, err)
-
-		bd := BaseDeps{
-			Deps: consul.Deps{
-				Logger:          hclog.NewInterceptLogger(nil),
-				Tokens:          new(token.Store),
-				TLSConfigurator: tlsConf,
-				GRPCConnPool:    &fakeGRPCConnPool{},
-				Registry:        resource.NewRegistry(),
-			},
-			RuntimeConfig: &config.RuntimeConfig{
-				HTTPAddrs: []net.Addr{
-					&net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: freeport.GetOne(t)},
-				},
-			},
-			Cache:  cache.New(cache.Options{}),
-			NetRPC: &LazyNetRPC{},
-		}
-
-		bd.XDSStreamLimiter = limiter.NewSessionLimiter()
-		bd.LeafCertManager = leafcert.NewManager(leafcert.Deps{
-			CertSigner:  leafcert.NewNetRPCCertSigner(bd.NetRPC),
-			RootsReader: leafcert.NewCachedRootsReader(bd.Cache, "dc1"),
-			Config:      leafcert.Config{},
-		})
-
-		cfg := config.RuntimeConfig{
-			BuildDate: time.Date(2000, 1, 1, 0, 0, 1, 0, time.UTC),
-		}
-		bd, err = initEnterpriseBaseDeps(bd, &cfg)
-		require.NoError(t, err)
-
-		bd.Experiments = tc.getExperiments()
-
-		agent, err := New(bd)
-		require.NoError(t, err)
-		agent.proxyConfig, err = proxycfg.NewManager(proxycfg.ManagerConfig{Logger: bd.Logger, Source: &structs.QuerySource{}})
-		require.NoError(t, err)
-		require.IsTypef(t, tc.expectedType, agent.getProxyWatcher(), fmt.Sprintf("Expected proxyWatcher to be of type %s", reflect.TypeOf(tc.expectedType)))
-	}
-
-}
 func getExpectedCaPoolByFile(t *testing.T) *x509.CertPool {
 	pool := x509.NewCertPool()
 	data, err := os.ReadFile("../test/ca/root.cer")
diff --git a/agent/apiserver.go b/agent/apiserver.go
index 1f386e3f6b171..044bf604125f3 100644
--- a/agent/apiserver.go
+++ b/agent/apiserver.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/apiserver_test.go b/agent/apiserver_test.go
index 848487a78154c..72f8c6d65127f 100644
--- a/agent/apiserver_test.go
+++ b/agent/apiserver_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/auto-config/auto_config.go b/agent/auto-config/auto_config.go
index a1a5848f623f0..df4fe3d29df63 100644
--- a/agent/auto-config/auto_config.go
+++ b/agent/auto-config/auto_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autoconf
 
 import (
@@ -17,7 +14,7 @@ import (
 	"github.com/hashicorp/consul/agent/token"
 	"github.com/hashicorp/consul/lib/retry"
 	"github.com/hashicorp/consul/logging"
-	"github.com/hashicorp/consul/proto/private/pbautoconf"
+	"github.com/hashicorp/consul/proto/pbautoconf"
 )
 
 // AutoConfig is all the state necessary for being able to parse a configuration
diff --git a/agent/auto-config/auto_config_ce.go b/agent/auto-config/auto_config_ce.go
index 9ac615847e69f..29f626568fdbb 100644
--- a/agent/auto-config/auto_config_ce.go
+++ b/agent/auto-config/auto_config_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package autoconf
 
diff --git a/agent/auto-config/auto_config_ce_test.go b/agent/auto-config/auto_config_ce_test.go
index a38b0f155e391..6a318644fb23b 100644
--- a/agent/auto-config/auto_config_ce_test.go
+++ b/agent/auto-config/auto_config_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package autoconf
 
diff --git a/agent/auto-config/auto_config_test.go b/agent/auto-config/auto_config_test.go
index 7c5c629be2f73..4834fcaac516f 100644
--- a/agent/auto-config/auto_config_test.go
+++ b/agent/auto-config/auto_config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autoconf
 
 import (
@@ -21,13 +18,12 @@ import (
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
 	"github.com/hashicorp/consul/agent/config"
 	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/metadata"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/token"
 	"github.com/hashicorp/consul/lib/retry"
-	"github.com/hashicorp/consul/proto/private/pbautoconf"
-	"github.com/hashicorp/consul/proto/private/pbconfig"
+	"github.com/hashicorp/consul/proto/pbautoconf"
+	"github.com/hashicorp/consul/proto/pbconfig"
 	"github.com/hashicorp/consul/sdk/testutil"
 	testretry "github.com/hashicorp/consul/sdk/testutil/retry"
 )
@@ -567,8 +563,9 @@ func TestGoRoutineManagement(t *testing.T) {
 	})
 
 	leafReq := ac.leafCertRequest()
-	mcfg.leafCerts.On("Notify",
+	mcfg.cache.On("Notify",
 		mock.Anything,
+		cachetype.ConnectCALeafName,
 		&leafReq,
 		leafWatchID,
 		mock.Anything,
@@ -717,9 +714,10 @@ func startedAutoConfig(t *testing.T, autoEncrypt bool) testAutoConfig {
 		mock.Anything,
 	).Return(nil).Once()
 
-	mcfg.leafCerts.On("Notify",
+	mcfg.cache.On("Notify",
 		mock.Anything,
-		&leafcert.ConnectCALeafRequest{
+		cachetype.ConnectCALeafName,
+		&cachetype.ConnectCALeafRequest{
 			Datacenter: "dc1",
 			Agent:      "autoconf",
 			Token:      originalToken,
@@ -874,9 +872,10 @@ func TestTokenUpdate(t *testing.T) {
 	})
 
 	leafCtx, leafCancel := context.WithCancel(context.Background())
-	testAC.mcfg.leafCerts.On("Notify",
+	testAC.mcfg.cache.On("Notify",
 		mock.Anything,
-		&leafcert.ConnectCALeafRequest{
+		cachetype.ConnectCALeafName,
+		&cachetype.ConnectCALeafRequest{
 			Datacenter: "dc1",
 			Agent:      "autoconf",
 			Token:      newToken,
@@ -973,14 +972,14 @@ func TestCertUpdate(t *testing.T) {
 		NotAfter: secondCert.ValidBefore,
 	}).Once()
 
-	req := leafcert.ConnectCALeafRequest{
+	req := cachetype.ConnectCALeafRequest{
 		Datacenter: "dc1",
 		Agent:      "autoconf",
 		Token:      testAC.originalToken,
 		DNSSAN:     defaultDNSSANs,
 		IPSAN:      defaultIPSANs,
 	}
-	require.True(t, testAC.mcfg.leafCerts.sendNotification(context.Background(), req.Key(), cache.UpdateEvent{
+	require.True(t, testAC.mcfg.cache.sendNotification(context.Background(), req.CacheInfo().Key, cache.UpdateEvent{
 		CorrelationID: leafWatchID,
 		Result:        secondCert,
 		Meta: cache.ResultMeta{
@@ -1100,14 +1099,14 @@ func TestFallback(t *testing.T) {
 
 	// now that all the mocks are set up we can trigger the whole thing by sending the second expired cert
 	// as a cache update event.
-	req := leafcert.ConnectCALeafRequest{
+	req := cachetype.ConnectCALeafRequest{
 		Datacenter: "dc1",
 		Agent:      "autoconf",
 		Token:      testAC.originalToken,
 		DNSSAN:     defaultDNSSANs,
 		IPSAN:      defaultIPSANs,
 	}
-	require.True(t, testAC.mcfg.leafCerts.sendNotification(context.Background(), req.Key(), cache.UpdateEvent{
+	require.True(t, testAC.mcfg.cache.sendNotification(context.Background(), req.CacheInfo().Key, cache.UpdateEvent{
 		CorrelationID: leafWatchID,
 		Result:        secondCert,
 		Meta: cache.ResultMeta{
diff --git a/agent/auto-config/auto_encrypt.go b/agent/auto-config/auto_encrypt.go
index 1b77c089f6f60..8118d1312ce8b 100644
--- a/agent/auto-config/auto_encrypt.go
+++ b/agent/auto-config/auto_encrypt.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autoconf
 
 import (
diff --git a/agent/auto-config/auto_encrypt_test.go b/agent/auto-config/auto_encrypt_test.go
index 10a7c8da46888..2036d7f200673 100644
--- a/agent/auto-config/auto_encrypt_test.go
+++ b/agent/auto-config/auto_encrypt_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autoconf
 
 import (
@@ -20,7 +17,6 @@ import (
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
 	"github.com/hashicorp/consul/agent/config"
 	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/metadata"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib/retry"
@@ -348,9 +344,10 @@ func TestAutoEncrypt_TokenUpdate(t *testing.T) {
 	})
 
 	leafCtx, leafCancel := context.WithCancel(context.Background())
-	testAC.mcfg.leafCerts.On("Notify",
+	testAC.mcfg.cache.On("Notify",
 		mock.Anything,
-		&leafcert.ConnectCALeafRequest{
+		cachetype.ConnectCALeafName,
+		&cachetype.ConnectCALeafRequest{
 			Datacenter: "dc1",
 			Agent:      "autoconf",
 			Token:      newToken,
@@ -430,14 +427,14 @@ func TestAutoEncrypt_CertUpdate(t *testing.T) {
 		NotAfter: secondCert.ValidBefore,
 	}).Once()
 
-	req := leafcert.ConnectCALeafRequest{
+	req := cachetype.ConnectCALeafRequest{
 		Datacenter: "dc1",
 		Agent:      "autoconf",
 		Token:      testAC.originalToken,
 		DNSSAN:     defaultDNSSANs,
 		IPSAN:      defaultIPSANs,
 	}
-	require.True(t, testAC.mcfg.leafCerts.sendNotification(context.Background(), req.Key(), cache.UpdateEvent{
+	require.True(t, testAC.mcfg.cache.sendNotification(context.Background(), req.CacheInfo().Key, cache.UpdateEvent{
 		CorrelationID: leafWatchID,
 		Result:        secondCert,
 		Meta: cache.ResultMeta{
@@ -538,14 +535,14 @@ func TestAutoEncrypt_Fallback(t *testing.T) {
 
 	// now that all the mocks are set up we can trigger the whole thing by sending the second expired cert
 	// as a cache update event.
-	req := leafcert.ConnectCALeafRequest{
+	req := cachetype.ConnectCALeafRequest{
 		Datacenter: "dc1",
 		Agent:      "autoconf",
 		Token:      testAC.originalToken,
 		DNSSAN:     defaultDNSSANs,
 		IPSAN:      defaultIPSANs,
 	}
-	require.True(t, testAC.mcfg.leafCerts.sendNotification(context.Background(), req.Key(), cache.UpdateEvent{
+	require.True(t, testAC.mcfg.cache.sendNotification(context.Background(), req.CacheInfo().Key, cache.UpdateEvent{
 		CorrelationID: leafWatchID,
 		Result:        secondCert,
 		Meta: cache.ResultMeta{
diff --git a/agent/auto-config/config.go b/agent/auto-config/config.go
index 69eee08bc061b..94f45d1fc64f7 100644
--- a/agent/auto-config/config.go
+++ b/agent/auto-config/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autoconf
 
 import (
@@ -13,9 +10,7 @@ import (
 
 	"github.com/hashicorp/consul/agent/cache"
 	"github.com/hashicorp/consul/agent/config"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/metadata"
-	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/token"
 	"github.com/hashicorp/consul/lib/retry"
 )
@@ -35,19 +30,6 @@ type Cache interface {
 	Prepopulate(t string, result cache.FetchResult, dc string, peerName string, token string, key string) error
 }
 
-// LeafCertManager is an interface to represent the methods of the
-// agent/leafcert.Manager struct that we care about
-type LeafCertManager interface {
-	Prepopulate(
-		ctx context.Context,
-		key string,
-		index uint64,
-		value *structs.IssuedCert,
-		authorityKeyID string,
-	) error
-	Notify(ctx context.Context, req *leafcert.ConnectCALeafRequest, correlationID string, ch chan<- cache.UpdateEvent) error
-}
-
 // ServerProvider is an interface that can be used to find one server in the local DC known to
 // the agent via Gossip
 type ServerProvider interface {
@@ -107,12 +89,9 @@ type Config struct {
 	TLSConfigurator TLSConfigurator
 
 	// Cache is an object implementing our Cache interface. The Cache
-	// used at runtime must be able to handle Roots watches
+	// used at runtime must be able to handle Roots and Leaf Cert watches
 	Cache Cache
 
-	// LeafCertManager is an object implementing our LeafCertManager interface.
-	LeafCertManager LeafCertManager
-
 	// FallbackLeeway is the amount of time after certificate expiration before
 	// invoking the fallback routine. If not set this will default to 10s.
 	FallbackLeeway time.Duration
diff --git a/agent/auto-config/config_ce.go b/agent/auto-config/config_ce.go
index 5d699f32a498d..dbd7d90eb3c2c 100644
--- a/agent/auto-config/config_ce.go
+++ b/agent/auto-config/config_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package autoconf
 
diff --git a/agent/auto-config/config_translate.go b/agent/auto-config/config_translate.go
index b60b3388eb2a8..c5c3606a9060b 100644
--- a/agent/auto-config/config_translate.go
+++ b/agent/auto-config/config_translate.go
@@ -1,14 +1,11 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autoconf
 
 import (
 	"github.com/hashicorp/consul/agent/config"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbautoconf"
-	"github.com/hashicorp/consul/proto/private/pbconfig"
-	"github.com/hashicorp/consul/proto/private/pbconnect"
+	"github.com/hashicorp/consul/proto/pbautoconf"
+	"github.com/hashicorp/consul/proto/pbconfig"
+	"github.com/hashicorp/consul/proto/pbconnect"
 	"github.com/hashicorp/consul/types"
 )
 
diff --git a/agent/auto-config/config_translate_test.go b/agent/auto-config/config_translate_test.go
index 8e2cef8c46ea9..e48eebf312c7b 100644
--- a/agent/auto-config/config_translate_test.go
+++ b/agent/auto-config/config_translate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autoconf
 
 import (
@@ -10,8 +7,8 @@ import (
 
 	"github.com/hashicorp/consul/agent/config"
 	"github.com/hashicorp/consul/agent/structs"
-	pbconfig "github.com/hashicorp/consul/proto/private/pbconfig"
-	"github.com/hashicorp/consul/proto/private/pbconnect"
+	pbconfig "github.com/hashicorp/consul/proto/pbconfig"
+	"github.com/hashicorp/consul/proto/pbconnect"
 )
 
 func stringPointer(s string) *string {
diff --git a/agent/auto-config/mock_ce_test.go b/agent/auto-config/mock_ce_test.go
index ea416a3de87cf..1a7acaa483783 100644
--- a/agent/auto-config/mock_ce_test.go
+++ b/agent/auto-config/mock_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package autoconf
 
diff --git a/agent/auto-config/mock_test.go b/agent/auto-config/mock_test.go
index 0ef5084af2640..1ff53bc629113 100644
--- a/agent/auto-config/mock_test.go
+++ b/agent/auto-config/mock_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autoconf
 
 import (
@@ -15,11 +12,10 @@ import (
 	"github.com/hashicorp/consul/agent/cache"
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
 	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/metadata"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/token"
-	"github.com/hashicorp/consul/proto/private/pbautoconf"
+	"github.com/hashicorp/consul/proto/pbautoconf"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
@@ -113,85 +109,6 @@ type mockWatcher struct {
 	done <-chan struct{}
 }
 
-type mockLeafCerts struct {
-	mock.Mock
-
-	lock     sync.Mutex
-	watchers map[string][]mockWatcher
-}
-
-var _ LeafCertManager = (*mockLeafCerts)(nil)
-
-func newMockLeafCerts(t *testing.T) *mockLeafCerts {
-	m := mockLeafCerts{
-		watchers: make(map[string][]mockWatcher),
-	}
-	m.Test(t)
-	return &m
-}
-
-func (m *mockLeafCerts) Notify(ctx context.Context, req *leafcert.ConnectCALeafRequest, correlationID string, ch chan<- cache.UpdateEvent) error {
-	ret := m.Called(ctx, req, correlationID, ch)
-
-	err := ret.Error(0)
-	if err == nil {
-		m.lock.Lock()
-		key := req.Key()
-		m.watchers[key] = append(m.watchers[key], mockWatcher{ch: ch, done: ctx.Done()})
-		m.lock.Unlock()
-	}
-	return err
-}
-
-func (m *mockLeafCerts) Prepopulate(
-	ctx context.Context,
-	key string,
-	index uint64,
-	value *structs.IssuedCert,
-	authorityKeyID string,
-) error {
-	// we cannot know what the private key is prior to it being injected into the cache.
-	// therefore redact it here and all mock expectations should take that into account
-	restore := value.PrivateKeyPEM
-	value.PrivateKeyPEM = "redacted"
-
-	ret := m.Called(ctx, key, index, value, authorityKeyID)
-
-	if restore != "" {
-		value.PrivateKeyPEM = restore
-	}
-	return ret.Error(0)
-}
-
-func (m *mockLeafCerts) sendNotification(ctx context.Context, key string, u cache.UpdateEvent) bool {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-
-	watchers, ok := m.watchers[key]
-	if !ok || len(m.watchers) < 1 {
-		return false
-	}
-
-	var newWatchers []mockWatcher
-
-	for _, watcher := range watchers {
-		select {
-		case watcher.ch <- u:
-			newWatchers = append(newWatchers, watcher)
-		case <-watcher.done:
-			// do nothing, this watcher will be removed from the list
-		case <-ctx.Done():
-			// return doesn't matter here really, the test is being cancelled
-			return true
-		}
-	}
-
-	// this removes any already cancelled watches from being sent to
-	m.watchers[key] = newWatchers
-
-	return true
-}
-
 type mockCache struct {
 	mock.Mock
 
@@ -303,7 +220,6 @@ type mockedConfig struct {
 	directRPC        *mockDirectRPC
 	serverProvider   *mockServerProvider
 	cache            *mockCache
-	leafCerts        *mockLeafCerts
 	tokens           *mockTokenStore
 	tlsCfg           *mockTLSConfigurator
 	enterpriseConfig *mockedEnterpriseConfig
@@ -314,7 +230,6 @@ func newMockedConfig(t *testing.T) *mockedConfig {
 	directRPC := newMockDirectRPC(t)
 	serverProvider := newMockServerProvider(t)
 	mcache := newMockCache(t)
-	mleafs := newMockLeafCerts(t)
 	tokens := newMockTokenStore(t)
 	tlsCfg := newMockTLSConfigurator(t)
 
@@ -328,7 +243,6 @@ func newMockedConfig(t *testing.T) *mockedConfig {
 		if !t.Failed() {
 			directRPC.AssertExpectations(t)
 			serverProvider.AssertExpectations(t)
-			mleafs.AssertExpectations(t)
 			mcache.AssertExpectations(t)
 			tokens.AssertExpectations(t)
 			tlsCfg.AssertExpectations(t)
@@ -341,7 +255,6 @@ func newMockedConfig(t *testing.T) *mockedConfig {
 			DirectRPC:        directRPC,
 			ServerProvider:   serverProvider,
 			Cache:            mcache,
-			LeafCertManager:  mleafs,
 			Tokens:           tokens,
 			TLSConfigurator:  tlsCfg,
 			Logger:           testutil.Logger(t),
@@ -351,7 +264,6 @@ func newMockedConfig(t *testing.T) *mockedConfig {
 		directRPC:      directRPC,
 		serverProvider: serverProvider,
 		cache:          mcache,
-		leafCerts:      mleafs,
 		tokens:         tokens,
 		tlsCfg:         tlsCfg,
 
@@ -396,7 +308,7 @@ func (m *mockedConfig) expectInitialTLS(t *testing.T, agentName, datacenter, tok
 		rootsReq.CacheInfo().Key,
 	).Return(nil).Once()
 
-	leafReq := leafcert.ConnectCALeafRequest{
+	leafReq := cachetype.ConnectCALeafRequest{
 		Token:      token,
 		Agent:      agentName,
 		Datacenter: datacenter,
@@ -408,18 +320,24 @@ func (m *mockedConfig) expectInitialTLS(t *testing.T, agentName, datacenter, tok
 	// on up with the request.
 	copy := *cert
 	copy.PrivateKeyPEM = "redacted"
+	leafRes := cache.FetchResult{
+		Value: &copy,
+		Index: copy.RaftIndex.ModifyIndex,
+		State: cachetype.ConnectCALeafSuccess(ca.SigningKeyID),
+	}
 
 	// we should prepopulate the cache with the agents cert
-	m.leafCerts.On("Prepopulate",
-		mock.Anything,
+	m.cache.On("Prepopulate",
+		cachetype.ConnectCALeafName,
+		leafRes,
+		datacenter,
+		"",
+		token,
 		leafReq.Key(),
-		copy.RaftIndex.ModifyIndex,
-		&copy,
-		ca.SigningKeyID,
 	).Return(nil).Once()
 
 	// when prepopulating the cert in the cache we grab the token so
-	// we should expect that here
+	// we should expec that here
 	m.tokens.On("AgentToken").Return(token).Once()
 }
 
diff --git a/agent/auto-config/persist.go b/agent/auto-config/persist.go
index 66cda1c41438c..f75c0f376bfc8 100644
--- a/agent/auto-config/persist.go
+++ b/agent/auto-config/persist.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autoconf
 
 import (
@@ -8,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/hashicorp/consul/proto/private/pbautoconf"
+	"github.com/hashicorp/consul/proto/pbautoconf"
 	"google.golang.org/protobuf/encoding/protojson"
 )
 
diff --git a/agent/auto-config/run.go b/agent/auto-config/run.go
index ed3389c1880cb..136d4a8ae5264 100644
--- a/agent/auto-config/run.go
+++ b/agent/auto-config/run.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autoconf
 
 import (
diff --git a/agent/auto-config/server_addr.go b/agent/auto-config/server_addr.go
index 6bca15d42fb8d..98af4ae55ab91 100644
--- a/agent/auto-config/server_addr.go
+++ b/agent/auto-config/server_addr.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autoconf
 
 import (
diff --git a/agent/auto-config/tls.go b/agent/auto-config/tls.go
index 8142a1eeb809b..e8a59d19f99a9 100644
--- a/agent/auto-config/tls.go
+++ b/agent/auto-config/tls.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autoconf
 
 import (
@@ -11,10 +8,9 @@ import (
 	"github.com/hashicorp/consul/agent/cache"
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
 	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbautoconf"
-	"github.com/hashicorp/consul/proto/private/pbconnect"
+	"github.com/hashicorp/consul/proto/pbautoconf"
+	"github.com/hashicorp/consul/proto/pbconnect"
 )
 
 const (
@@ -107,14 +103,12 @@ func (ac *AutoConfig) populateCertificateCache(certs *structs.SignedResponse) er
 	leafReq := ac.leafCertRequest()
 
 	// prepolutate leaf cache
-	err = ac.acConfig.LeafCertManager.Prepopulate(
-		context.Background(),
-		leafReq.Key(),
-		certs.IssuedCert.RaftIndex.ModifyIndex,
-		&certs.IssuedCert,
-		connect.EncodeSigningKeyID(cert.AuthorityKeyId),
-	)
-	if err != nil {
+	certRes := cache.FetchResult{
+		Value: &certs.IssuedCert,
+		Index: certs.IssuedCert.RaftIndex.ModifyIndex,
+		State: cachetype.ConnectCALeafSuccess(connect.EncodeSigningKeyID(cert.AuthorityKeyId)),
+	}
+	if err := ac.acConfig.Cache.Prepopulate(cachetype.ConnectCALeafName, certRes, leafReq.Datacenter, structs.DefaultPeerKeyword, leafReq.Token, leafReq.Key()); err != nil {
 		return err
 	}
 
@@ -132,7 +126,7 @@ func (ac *AutoConfig) setupCertificateCacheWatches(ctx context.Context) (context
 	}
 
 	leafReq := ac.leafCertRequest()
-	err = ac.acConfig.LeafCertManager.Notify(notificationCtx, &leafReq, leafWatchID, ac.cacheUpdates)
+	err = ac.acConfig.Cache.Notify(notificationCtx, cachetype.ConnectCALeafName, &leafReq, leafWatchID, ac.cacheUpdates)
 	if err != nil {
 		cancel()
 		return nil, err
@@ -197,8 +191,8 @@ func (ac *AutoConfig) caRootsRequest() structs.DCSpecificRequest {
 	return structs.DCSpecificRequest{Datacenter: ac.config.Datacenter}
 }
 
-func (ac *AutoConfig) leafCertRequest() leafcert.ConnectCALeafRequest {
-	return leafcert.ConnectCALeafRequest{
+func (ac *AutoConfig) leafCertRequest() cachetype.ConnectCALeafRequest {
+	return cachetype.ConnectCALeafRequest{
 		Datacenter:     ac.config.Datacenter,
 		Agent:          ac.config.NodeName,
 		DNSSAN:         ac.getDNSSANs(),
diff --git a/agent/auto-config/tls_test.go b/agent/auto-config/tls_test.go
index 667c7dfa96e5c..bad66ba700e75 100644
--- a/agent/auto-config/tls_test.go
+++ b/agent/auto-config/tls_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autoconf
 
 import (
diff --git a/agent/blockingquery/blockingquery.go b/agent/blockingquery/blockingquery.go
index 3e073a1ffab2b..cb46110222de0 100644
--- a/agent/blockingquery/blockingquery.go
+++ b/agent/blockingquery/blockingquery.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package blockingquery
 
 import (
diff --git a/agent/blockingquery/blockingquery_test.go b/agent/blockingquery/blockingquery_test.go
index 5861ed3991641..6cfc07c114aa7 100644
--- a/agent/blockingquery/blockingquery_test.go
+++ b/agent/blockingquery/blockingquery_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package blockingquery
 
 // TODO: move tests from the consul package, rpc_test.go, TestServer_blockingQuery
diff --git a/agent/cache-types/catalog_datacenters.go b/agent/cache-types/catalog_datacenters.go
index 2a4e64c9e5c1c..b84d2a933a87f 100644
--- a/agent/cache-types/catalog_datacenters.go
+++ b/agent/cache-types/catalog_datacenters.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/catalog_datacenters_test.go b/agent/cache-types/catalog_datacenters_test.go
index f04bfb4c7b421..23b923afc9306 100644
--- a/agent/cache-types/catalog_datacenters_test.go
+++ b/agent/cache-types/catalog_datacenters_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/catalog_list_services.go b/agent/cache-types/catalog_list_services.go
index 0a14ed3ef120a..0324d4a6e1ac1 100644
--- a/agent/cache-types/catalog_list_services.go
+++ b/agent/cache-types/catalog_list_services.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/catalog_list_services_test.go b/agent/cache-types/catalog_list_services_test.go
index 623cda2cee3ce..90ea7be81aa28 100644
--- a/agent/cache-types/catalog_list_services_test.go
+++ b/agent/cache-types/catalog_list_services_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/catalog_service_list.go b/agent/cache-types/catalog_service_list.go
index 37ac4ba0f8131..7e417cd2c280a 100644
--- a/agent/cache-types/catalog_service_list.go
+++ b/agent/cache-types/catalog_service_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/catalog_service_list_test.go b/agent/cache-types/catalog_service_list_test.go
index eb686193cc3ca..9eef36bbc5ecf 100644
--- a/agent/cache-types/catalog_service_list_test.go
+++ b/agent/cache-types/catalog_service_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/catalog_services.go b/agent/cache-types/catalog_services.go
index 8e04997b9f62d..0f5f7f8aa0e08 100644
--- a/agent/cache-types/catalog_services.go
+++ b/agent/cache-types/catalog_services.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/catalog_services_test.go b/agent/cache-types/catalog_services_test.go
index c084de67ccaad..c28aa2a012c83 100644
--- a/agent/cache-types/catalog_services_test.go
+++ b/agent/cache-types/catalog_services_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/config_entry.go b/agent/cache-types/config_entry.go
index 98443363c1b87..3c434c24f620e 100644
--- a/agent/cache-types/config_entry.go
+++ b/agent/cache-types/config_entry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/config_entry_test.go b/agent/cache-types/config_entry_test.go
index d892b069e4c7b..50954f35cffa3 100644
--- a/agent/cache-types/config_entry_test.go
+++ b/agent/cache-types/config_entry_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/connect_ca_leaf.go b/agent/cache-types/connect_ca_leaf.go
new file mode 100644
index 0000000000000..06b06c206c32f
--- /dev/null
+++ b/agent/cache-types/connect_ca_leaf.go
@@ -0,0 +1,777 @@
+package cachetype
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net"
+	"sync"
+	"sync/atomic"
+	"time"
+
+	"github.com/mitchellh/hashstructure"
+
+	"github.com/hashicorp/consul/acl"
+	"github.com/hashicorp/consul/agent/cache"
+	"github.com/hashicorp/consul/agent/connect"
+	"github.com/hashicorp/consul/agent/consul"
+	"github.com/hashicorp/consul/agent/structs"
+	"github.com/hashicorp/consul/lib"
+)
+
+// Recommended name for registration.
+const ConnectCALeafName = "connect-ca-leaf"
+
+// caChangeJitterWindow is the time over which we spread each round of retries
+// when attempting to get a new certificate following a root rotation. It's
+// selected to be a trade-off between not making rotation unnecessarily slow on
+// a tiny cluster while not hammering the servers on a huge cluster
+// unnecessarily hard. Servers rate limit to protect themselves from the
+// expensive crypto work, but in practice have 10k+ RPCs all in the same second
+// will cause a major disruption even on large servers due to downloading the
+// payloads, parsing msgpack etc. Instead we pick a window that for now is fixed
+// but later might be either user configurable (not nice since it would become
+// another hard-to-tune value) or set dynamically by the server based on it's
+// knowledge of how many certs need to be rotated. Currently the server doesn't
+// know that so we pick something that is reasonable. We err on the side of
+// being slower that we need in trivial cases but gentler for large deployments.
+// 30s means that even with a cluster of 10k service instances, the server only
+// has to cope with ~333 RPCs a second which shouldn't be too bad if it's rate
+// limiting the actual expensive crypto work.
+//
+// The actual backoff strategy when we are rate limited is to have each cert
+// only retry once with each window of this size, at a point in the window
+// selected at random. This performs much better than exponential backoff in
+// terms of getting things rotated quickly with more predictable load and so
+// fewer rate limited requests. See the full simulation this is based on at
+// https://github.com/banks/sim-rate-limit-backoff/blob/master/README.md for
+// more detail.
+const caChangeJitterWindow = 30 * time.Second
+
+// ConnectCALeaf supports fetching and generating Connect leaf
+// certificates.
+type ConnectCALeaf struct {
+	RegisterOptionsBlockingNoRefresh
+	caIndex uint64 // Current index for CA roots
+
+	// rootWatchMu protects access to the rootWatchSubscribers map and
+	// rootWatchCancel
+	rootWatchMu sync.Mutex
+	// rootWatchSubscribers is a set of chans, one for each currently in-flight
+	// Fetch. These chans have root updates delivered from the root watcher.
+	rootWatchSubscribers map[chan struct{}]struct{}
+	// rootWatchCancel is a func to call to stop the background root watch if any.
+	// You must hold inflightMu to read (e.g. call) or write the value.
+	rootWatchCancel func()
+
+	// testRootWatchStart/StopCount are testing helpers that allow tests to
+	// observe the reference counting behavior that governs the shared root watch.
+	// It's not exactly pretty to expose internals like this, but seems cleaner
+	// than constructing elaborate and brittle test cases that we can infer
+	// correct behavior from, and simpler than trying to probe runtime goroutine
+	// traces to infer correct behavior that way. They must be accessed
+	// atomically.
+	testRootWatchStartCount uint32
+	testRootWatchStopCount  uint32
+
+	RPC        RPC          // RPC client for remote requests
+	Cache      *cache.Cache // Cache that has CA root certs via ConnectCARoot
+	Datacenter string       // This agent's datacenter
+
+	// TestOverrideCAChangeInitialDelay allows overriding the random jitter after a
+	// root change with a fixed delay. So far ths is only done in tests. If it's
+	// zero the caChangeInitialSpreadDefault maximum jitter will be used but if
+	// set, it overrides and provides a fixed delay. To essentially disable the
+	// delay in tests they can set it to 1 nanosecond. We may separately allow
+	// configuring the jitter limit by users later but this is different and for
+	// tests only since we need to set a deterministic time delay in order to test
+	// the behavior here fully and determinstically.
+	TestOverrideCAChangeInitialDelay time.Duration
+}
+
+// fetchState is some additional metadata we store with each cert in the cache
+// to track things like expiry and coordinate paces root rotations. It's
+// important this doesn't contain any pointer types since we rely on the struct
+// being copied to avoid modifying the actual state in the cache entry during
+// Fetch. Pointers themselves are OK, but if we point to another struct that we
+// call a method or modify in some way that would directly mutate the cache and
+// cause problems. We'd need to deep-clone in that case in Fetch below.
+// time.Time technically contains a pointer to the Location but we ignore that
+// since all times we get from our wall clock should point to the same Location
+// anyway.
+type fetchState struct {
+	// authorityKeyId is the ID of the CA key (whether root or intermediate) that signed
+	// the current cert.  This is just to save parsing the whole cert everytime
+	// we have to check if the root changed.
+	authorityKeyID string
+
+	// forceExpireAfter is used to coordinate renewing certs after a CA rotation
+	// in a staggered way so that we don't overwhelm the servers.
+	forceExpireAfter time.Time
+
+	// activeRootRotationStart is set when the root has changed and we need to get
+	// a new cert but haven't got one yet. forceExpireAfter will be set to the
+	// next scheduled time we should try our CSR, but this is needed to calculate
+	// the retry windows if we are rate limited when we try. See comment on
+	// caChangeJitterWindow above for more.
+	activeRootRotationStart time.Time
+
+	// consecutiveRateLimitErrs stores how many rate limit errors we've hit. We
+	// use this to choose a new window for the next retry. See comment on
+	// caChangeJitterWindow above for more.
+	consecutiveRateLimitErrs int
+}
+
+func ConnectCALeafSuccess(authorityKeyID string) interface{} {
+	return fetchState{
+		authorityKeyID:           authorityKeyID,
+		forceExpireAfter:         time.Time{},
+		consecutiveRateLimitErrs: 0,
+		activeRootRotationStart:  time.Time{},
+	}
+}
+
+// fetchStart is called on each fetch that is about to block and wait for
+// changes to the leaf. It subscribes a chan to receive updates from the shared
+// root watcher and triggers root watcher if it's not already running.
+func (c *ConnectCALeaf) fetchStart(rootUpdateCh chan struct{}) {
+	c.rootWatchMu.Lock()
+	defer c.rootWatchMu.Unlock()
+	// Lazy allocation
+	if c.rootWatchSubscribers == nil {
+		c.rootWatchSubscribers = make(map[chan struct{}]struct{})
+	}
+	// Make sure a root watcher is running. We don't only do this on first request
+	// to be more tolerant of errors that could cause the root watcher to fail and
+	// exit.
+	if c.rootWatchCancel == nil {
+		ctx, cancel := context.WithCancel(context.Background())
+		c.rootWatchCancel = cancel
+		go c.rootWatcher(ctx)
+	}
+	c.rootWatchSubscribers[rootUpdateCh] = struct{}{}
+}
+
+// fetchDone is called when a blocking call exits to unsubscribe from root
+// updates and possibly stop the shared root watcher if it's no longer needed.
+// Note that typically root CA is still being watched by clients directly and
+// probably by the ProxyConfigManager so it will stay hot in cache for a while,
+// we are just not monitoring it for updates any more.
+func (c *ConnectCALeaf) fetchDone(rootUpdateCh chan struct{}) {
+	c.rootWatchMu.Lock()
+	defer c.rootWatchMu.Unlock()
+	delete(c.rootWatchSubscribers, rootUpdateCh)
+	if len(c.rootWatchSubscribers) == 0 && c.rootWatchCancel != nil {
+		// This was the last request. Stop the root watcher.
+		c.rootWatchCancel()
+		c.rootWatchCancel = nil
+	}
+}
+
+// rootWatcher is the shared rootWatcher that runs in a background goroutine
+// while needed by one or more inflight Fetch calls.
+func (c *ConnectCALeaf) rootWatcher(ctx context.Context) {
+	atomic.AddUint32(&c.testRootWatchStartCount, 1)
+	defer atomic.AddUint32(&c.testRootWatchStopCount, 1)
+
+	ch := make(chan cache.UpdateEvent, 1)
+	err := c.Cache.Notify(ctx, ConnectCARootName, &structs.DCSpecificRequest{
+		Datacenter: c.Datacenter,
+	}, "roots", ch)
+
+	notifyChange := func() {
+		c.rootWatchMu.Lock()
+		defer c.rootWatchMu.Unlock()
+
+		for ch := range c.rootWatchSubscribers {
+			select {
+			case ch <- struct{}{}:
+			default:
+				// Don't block - chans are 1-buffered so act as an edge trigger and
+				// reload CA state directly from cache so they never "miss" updates.
+			}
+		}
+	}
+
+	if err != nil {
+		// Trigger all inflight watchers. We don't pass the error, but they will
+		// reload from cache and observe the same error and return it to the caller,
+		// or if it's transient, will continue and the next Fetch will get us back
+		// into the right state. Seems better than busy loop-retrying here given
+		// that almost any error we would see here would also be returned from the
+		// cache get this will trigger.
+		notifyChange()
+		return
+	}
+
+	var oldRoots *structs.IndexedCARoots
+	// Wait for updates to roots or all requests to stop
+	for {
+		select {
+		case <-ctx.Done():
+			return
+		case e := <-ch:
+			// Root response changed in some way. Note this might be the initial
+			// fetch.
+			if e.Err != nil {
+				// See above rationale about the error propagation
+				notifyChange()
+				continue
+			}
+
+			roots, ok := e.Result.(*structs.IndexedCARoots)
+			if !ok {
+				// See above rationale about the error propagation
+				notifyChange()
+				continue
+			}
+
+			// Check that the active root is actually different from the last CA
+			// config there are many reasons the config might have changed without
+			// actually updating the CA root that is signing certs in the cluster.
+			// The Fetch calls will also validate this since the first call here we
+			// don't know if it changed or not, but there is no point waking up all
+			// Fetch calls to check this if we know none of them will need to act on
+			// this update.
+			if oldRoots != nil && oldRoots.ActiveRootID == roots.ActiveRootID {
+				continue
+			}
+
+			// Distribute the update to all inflight requests - they will decide
+			// whether or not they need to act on it.
+			notifyChange()
+			oldRoots = roots
+		}
+	}
+}
+
+// calculateSoftExpiry encapsulates our logic for when to renew a cert based on
+// it's age. It returns a pair of times min, max which makes it easier to test
+// the logic without non-deterministic jitter to account for. The caller should
+// choose a time randomly in between these.
+//
+// We want to balance a few factors here:
+//   - renew too early and it increases the aggregate CSR rate in the cluster
+//   - renew too late and it risks disruption to the service if a transient
+//     error prevents the renewal
+//   - we want a broad amount of jitter so if there is an outage, we don't end
+//     up with all services in sync and causing a thundering herd every
+//     renewal period. Broader is better for smoothing requests but pushes
+//     both earlier and later tradeoffs above.
+//
+// Somewhat arbitrarily the current strategy looks like this:
+//
+//	         0                              60%             90%
+//	  Issued [------------------------------|===============|!!!!!] Expires
+//	72h TTL: 0                             ~43h            ~65h
+//	 1h TTL: 0                              36m             54m
+//
+// Where |===| is the soft renewal period where we jitter for the first attempt
+// and |!!!| is the danger zone where we just try immediately.
+//
+// In the happy path (no outages) the average renewal occurs half way through
+// the soft renewal region or at 75% of the cert lifetime which is ~54 hours for
+// a 72 hour cert, or 45 mins for a 1 hour cert.
+//
+// If we are already in the softRenewal period, we randomly pick a time between
+// now and the start of the danger zone.
+//
+// We pass in now to make testing easier.
+func calculateSoftExpiry(now time.Time, cert *structs.IssuedCert) (min time.Time, max time.Time) {
+
+	certLifetime := cert.ValidBefore.Sub(cert.ValidAfter)
+	if certLifetime < 10*time.Minute {
+		// Shouldn't happen as we limit to 1 hour shortest elsewhere but just be
+		// defensive against strange times or bugs.
+		return now, now
+	}
+
+	// Find the 60% mark in diagram above
+	softRenewTime := cert.ValidAfter.Add(time.Duration(float64(certLifetime) * 0.6))
+	hardRenewTime := cert.ValidAfter.Add(time.Duration(float64(certLifetime) * 0.9))
+
+	if now.After(hardRenewTime) {
+		// In the hard renew period, or already expired. Renew now!
+		return now, now
+	}
+
+	if now.After(softRenewTime) {
+		// Already in the soft renew period, make now the lower bound for jitter
+		softRenewTime = now
+	}
+	return softRenewTime, hardRenewTime
+}
+
+func (c *ConnectCALeaf) Fetch(opts cache.FetchOptions, req cache.Request) (cache.FetchResult, error) {
+	var result cache.FetchResult
+
+	// Get the correct type
+	reqReal, ok := req.(*ConnectCALeafRequest)
+	if !ok {
+		return result, fmt.Errorf(
+			"Internal cache failure: request wrong type: %T", req)
+	}
+
+	// Lightweight copy this object so that manipulating QueryOptions doesn't race.
+	dup := *reqReal
+	reqReal = &dup
+
+	// Do we already have a cert in the cache?
+	var existing *structs.IssuedCert
+	// Really important this is not a pointer type since otherwise we would set it
+	// to point to the actual fetchState in the cache entry below and then would
+	// be directly modifying that in the cache entry even when we might later
+	// return an error and not update index etc. By being a value, we force a copy
+	var state fetchState
+	if opts.LastResult != nil {
+		existing, ok = opts.LastResult.Value.(*structs.IssuedCert)
+		if !ok {
+			return result, fmt.Errorf(
+				"Internal cache failure: last value wrong type: %T", opts.LastResult.Value)
+		}
+		if opts.LastResult.State != nil {
+			state, ok = opts.LastResult.State.(fetchState)
+			if !ok {
+				return result, fmt.Errorf(
+					"Internal cache failure: last state wrong type: %T", opts.LastResult.State)
+			}
+		}
+	}
+
+	// Handle brand new request first as it's simplest.
+	if existing == nil {
+		return c.generateNewLeaf(reqReal, result)
+	}
+
+	// Setup result to mirror the current value for if we timeout or hit a rate
+	// limit. This allows us to update the state (e.g. for backoff or retry
+	// coordination on root change) even if we don't get a new cert.
+	result.Value = existing
+	result.Index = existing.ModifyIndex
+	result.State = state
+
+	// Since state is not a pointer, we can't just set it once in result and then
+	// continue to update it later since we will be updating only our copy.
+	// Instead we have a helper function that is used to make sure the state is
+	// updated in the result when we return.
+	lastResultWithNewState := func() cache.FetchResult {
+		return cache.FetchResult{
+			Value: existing,
+			Index: existing.ModifyIndex,
+			State: state,
+		}
+	}
+
+	// Beyond this point we need to only return lastResultWithNewState() not just
+	// result since otherwise we might "loose" state updates we expect not to.
+
+	// We have a certificate in cache already. Check it's still valid.
+	now := time.Now()
+	minExpire, maxExpire := calculateSoftExpiry(now, existing)
+	expiresAt := minExpire.Add(lib.RandomStagger(maxExpire.Sub(minExpire)))
+
+	// Check if we have been force-expired by a root update that jittered beyond
+	// the timeout of the query it was running.
+	if !state.forceExpireAfter.IsZero() && state.forceExpireAfter.Before(expiresAt) {
+		expiresAt = state.forceExpireAfter
+	}
+
+	if expiresAt.Equal(now) || expiresAt.Before(now) {
+		// Already expired, just make a new one right away
+		return c.generateNewLeaf(reqReal, lastResultWithNewState())
+	}
+
+	// If we called Fetch() with MustRevalidate then this call came from a non-blocking query.
+	// Any prior CA rotations should've already expired the cert.
+	// All we need to do is check whether the current CA is the one that signed the leaf. If not, generate a new leaf.
+	// This is not a perfect solution (as a CA rotation update can be missed) but it should take care of instances like
+	// see https://github.com/hashicorp/consul/issues/10871, https://github.com/hashicorp/consul/issues/9862
+	// This seems to me like a hack, so maybe we can revisit the caching/ fetching logic in this case
+	if req.CacheInfo().MustRevalidate {
+		roots, err := c.rootsFromCache()
+		if err != nil {
+			return lastResultWithNewState(), err
+		}
+		if activeRootHasKey(roots, state.authorityKeyID) {
+			return lastResultWithNewState(), nil
+		}
+
+		// if we reach here then the current leaf was not signed by the same CAs, just regen
+		return c.generateNewLeaf(reqReal, lastResultWithNewState())
+	}
+
+	// We are about to block and wait for a change or timeout.
+
+	// Make a chan we can be notified of changes to CA roots on. It must be
+	// buffered so we don't miss broadcasts from rootsWatch. It is an edge trigger
+	// so a single buffer element is sufficient regardless of whether we consume
+	// the updates fast enough since as soon as we see an element in it, we will
+	// reload latest CA from cache.
+	rootUpdateCh := make(chan struct{}, 1)
+
+	// The roots may have changed in between blocking calls. We need to verify
+	// that the existing cert was signed by the current root. If it was we still
+	// want to do the whole jitter thing. We could code that again here but it's
+	// identical to the select case below so we just trigger our own update chan
+	// and let the logic below handle checking if the CA actually changed in the
+	// common case where it didn't it is a no-op anyway.
+	rootUpdateCh <- struct{}{}
+
+	// Subscribe our chan to get root update notification.
+	c.fetchStart(rootUpdateCh)
+	defer c.fetchDone(rootUpdateCh)
+
+	// Setup the timeout chan outside the loop so we don't keep bumping the timeout
+	// later if we loop around.
+	timeoutTimer := time.NewTimer(opts.Timeout)
+	defer timeoutTimer.Stop()
+
+	// Setup initial expiry chan. We may change this if root update occurs in the
+	// loop below.
+	expiresTimer := time.NewTimer(expiresAt.Sub(now))
+	defer func() {
+		// Resolve the timer reference at defer time, so we use the latest one each time.
+		expiresTimer.Stop()
+	}()
+
+	// Current cert is valid so just wait until it expires or we time out.
+	for {
+		select {
+		case <-timeoutTimer.C:
+			// We timed out the request with same cert.
+			return lastResultWithNewState(), nil
+
+		case <-expiresTimer.C:
+			// Cert expired or was force-expired by a root change.
+			return c.generateNewLeaf(reqReal, lastResultWithNewState())
+
+		case <-rootUpdateCh:
+			// A root cache change occurred, reload roots from cache.
+			roots, err := c.rootsFromCache()
+			if err != nil {
+				return lastResultWithNewState(), err
+			}
+
+			// Handle _possibly_ changed roots. We still need to verify the new active
+			// root is not the same as the one our current cert was signed by since we
+			// can be notified spuriously if we are the first request since the
+			// rootsWatcher didn't know about the CA we were signed by. We also rely
+			// on this on every request to do the initial check that the current roots
+			// are the same ones the current cert was signed by.
+			if activeRootHasKey(roots, state.authorityKeyID) {
+				// Current active CA is the same one that signed our current cert so
+				// keep waiting for a change.
+				continue
+			}
+			state.activeRootRotationStart = time.Now()
+
+			// CA root changed. We add some jitter here to avoid a thundering herd.
+			// See docs on caChangeJitterWindow const.
+			delay := lib.RandomStagger(caChangeJitterWindow)
+			if c.TestOverrideCAChangeInitialDelay > 0 {
+				delay = c.TestOverrideCAChangeInitialDelay
+			}
+			// Force the cert to be expired after the jitter - the delay above might
+			// be longer than we have left on our timeout. We set forceExpireAfter in
+			// the cache state so the next request will notice we still need to renew
+			// and do it at the right time. This is cleared once a new cert is
+			// returned by generateNewLeaf.
+			state.forceExpireAfter = state.activeRootRotationStart.Add(delay)
+			// If the delay time is within the current timeout, we want to renew the
+			// as soon as it's up. We change the expire time and chan so that when we
+			// loop back around, we'll wait at most delay until generating a new cert.
+			if state.forceExpireAfter.Before(expiresAt) {
+				expiresAt = state.forceExpireAfter
+				// Stop the former one and create a new one.
+				expiresTimer.Stop()
+				expiresTimer = time.NewTimer(delay)
+			}
+			continue
+		}
+	}
+}
+
+func activeRootHasKey(roots *structs.IndexedCARoots, currentSigningKeyID string) bool {
+	for _, ca := range roots.Roots {
+		if ca.Active {
+			return ca.SigningKeyID == currentSigningKeyID
+		}
+	}
+	// Shouldn't be possible since at least one root should be active.
+	return false
+}
+
+func (c *ConnectCALeaf) rootsFromCache() (*structs.IndexedCARoots, error) {
+	// Background is fine here because this isn't a blocking query as no index is set.
+	// Therefore this will just either be a cache hit or return once the non-blocking query returns.
+	rawRoots, _, err := c.Cache.Get(context.Background(), ConnectCARootName, &structs.DCSpecificRequest{
+		Datacenter: c.Datacenter,
+	})
+	if err != nil {
+		return nil, err
+	}
+	roots, ok := rawRoots.(*structs.IndexedCARoots)
+	if !ok {
+		return nil, errors.New("invalid RootCA response type")
+	}
+	return roots, nil
+}
+
+// generateNewLeaf does the actual work of creating a new private key,
+// generating a CSR and getting it signed by the servers. result argument
+// represents the last result currently in cache if any along with its state.
+func (c *ConnectCALeaf) generateNewLeaf(req *ConnectCALeafRequest,
+	result cache.FetchResult) (cache.FetchResult, error) {
+
+	var state fetchState
+	if result.State != nil {
+		var ok bool
+		state, ok = result.State.(fetchState)
+		if !ok {
+			return result, fmt.Errorf(
+				"Internal cache failure: result state wrong type: %T", result.State)
+		}
+	}
+
+	// Need to lookup RootCAs response to discover trust domain. This should be a
+	// cache hit.
+	roots, err := c.rootsFromCache()
+	if err != nil {
+		return result, err
+	}
+	if roots.TrustDomain == "" {
+		return result, errors.New("cluster has no CA bootstrapped yet")
+	}
+
+	// Build the cert uri
+	var id connect.CertURI
+	var dnsNames []string
+	var ipAddresses []net.IP
+
+	switch {
+	case req.Service != "":
+		id = &connect.SpiffeIDService{
+			Host:       roots.TrustDomain,
+			Datacenter: req.Datacenter,
+			Partition:  req.TargetPartition(),
+			Namespace:  req.TargetNamespace(),
+			Service:    req.Service,
+		}
+		dnsNames = append(dnsNames, req.DNSSAN...)
+
+	case req.Agent != "":
+		id = &connect.SpiffeIDAgent{
+			Host:       roots.TrustDomain,
+			Datacenter: req.Datacenter,
+			Partition:  req.TargetPartition(),
+			Agent:      req.Agent,
+		}
+		dnsNames = append([]string{"localhost"}, req.DNSSAN...)
+		ipAddresses = append([]net.IP{net.ParseIP("127.0.0.1"), net.ParseIP("::1")}, req.IPSAN...)
+
+	case req.Kind == structs.ServiceKindMeshGateway:
+		id = &connect.SpiffeIDMeshGateway{
+			Host:       roots.TrustDomain,
+			Datacenter: req.Datacenter,
+			Partition:  req.TargetPartition(),
+		}
+		dnsNames = append(dnsNames, req.DNSSAN...)
+
+	case req.Kind != "":
+		return result, fmt.Errorf("unsupported kind: %s", req.Kind)
+
+	case req.Server:
+		if req.Datacenter == "" {
+			return result, errors.New("datacenter name must be specified")
+		}
+		id = &connect.SpiffeIDServer{
+			Host:       roots.TrustDomain,
+			Datacenter: req.Datacenter,
+		}
+		dnsNames = append(dnsNames, connect.PeeringServerSAN(req.Datacenter, roots.TrustDomain))
+
+	default:
+		return result, errors.New("URI must be either service, agent, server, or kind")
+	}
+
+	// Create a new private key
+
+	// TODO: for now we always generate EC keys on clients regardless of the key
+	// type being used by the active CA. This is fine and allowed in TLS1.2 and
+	// signing EC CSRs with an RSA key is supported by all current CA providers so
+	// it's OK. IFF we ever need to support a CA provider that refuses to sign a
+	// CSR with a different signature algorithm, or if we have compatibility
+	// issues with external PKI systems that require EC certs be signed with ECDSA
+	// from the CA (this was required in TLS1.1 but not in 1.2) then we can
+	// instead intelligently pick the key type we generate here based on the key
+	// type of the active signing CA. We already have that loaded since we need
+	// the trust domain.
+	pk, pkPEM, err := connect.GeneratePrivateKey()
+	if err != nil {
+		return result, err
+	}
+
+	// Create a CSR.
+	csr, err := connect.CreateCSR(id, pk, dnsNames, ipAddresses)
+	if err != nil {
+		return result, err
+	}
+
+	// Request signing
+	var reply structs.IssuedCert
+	args := structs.CASignRequest{
+		WriteRequest: structs.WriteRequest{Token: req.Token},
+		Datacenter:   req.Datacenter,
+		CSR:          csr,
+	}
+	if err := c.RPC.RPC(context.Background(), "ConnectCA.Sign", &args, &reply); err != nil {
+		if err.Error() == consul.ErrRateLimited.Error() {
+			if result.Value == nil {
+				// This was a first fetch - we have no good value in cache. In this case
+				// we just return the error to the caller rather than rely on surprising
+				// semi-blocking until the rate limit is appeased or we timeout
+				// behavior. It's likely the caller isn't expecting this to block since
+				// it's an initial fetch. This also massively simplifies this edge case.
+				return result, err
+			}
+
+			if state.activeRootRotationStart.IsZero() {
+				// We hit a rate limit error by chance - for example a cert expired
+				// before the root rotation was observed (not triggered by rotation) but
+				// while server is working through high load from a recent rotation.
+				// Just pretend there is a rotation and the retry logic here will start
+				// jittering and retrying in the same way from now.
+				state.activeRootRotationStart = time.Now()
+			}
+
+			// Increment the errors in the state
+			state.consecutiveRateLimitErrs++
+
+			delay := lib.RandomStagger(caChangeJitterWindow)
+			if c.TestOverrideCAChangeInitialDelay > 0 {
+				delay = c.TestOverrideCAChangeInitialDelay
+			}
+
+			// Find the start of the next window we can retry in. See comment on
+			// caChangeJitterWindow for details of why we use this strategy.
+			windowStart := state.activeRootRotationStart.Add(
+				time.Duration(state.consecutiveRateLimitErrs) * delay)
+
+			// Pick a random time in that window
+			state.forceExpireAfter = windowStart.Add(delay)
+
+			// Return a result with the existing cert but the new state - the cache
+			// will see this as no change. Note that we always have an existing result
+			// here due to the nil value check above.
+			result.State = state
+			return result, nil
+		}
+		return result, err
+	}
+	reply.PrivateKeyPEM = pkPEM
+
+	// Reset rotation state
+	state.forceExpireAfter = time.Time{}
+	state.consecutiveRateLimitErrs = 0
+	state.activeRootRotationStart = time.Time{}
+
+	cert, err := connect.ParseCert(reply.CertPEM)
+	if err != nil {
+		return result, err
+	}
+	// Set the CA key ID so we can easily tell when a active root has changed.
+	state.authorityKeyID = connect.EncodeSigningKeyID(cert.AuthorityKeyId)
+
+	result.Value = &reply
+	// Store value not pointer so we don't accidentally mutate the cache entry
+	// state in Fetch.
+	result.State = state
+	result.Index = reply.ModifyIndex
+	return result, nil
+}
+
+// ConnectCALeafRequest is the cache.Request implementation for the
+// ConnectCALeaf cache type. This is implemented here and not in structs
+// since this is only used for cache-related requests and not forwarded
+// directly to any Consul servers.
+type ConnectCALeafRequest struct {
+	Token         string
+	Datacenter    string
+	DNSSAN        []string
+	IPSAN         []net.IP
+	MinQueryIndex uint64
+	MaxQueryTime  time.Duration
+	acl.EnterpriseMeta
+	MustRevalidate bool
+
+	// The following flags indicate the entity we are requesting a cert for.
+	// Only one of these must be specified.
+	Service string              // Given a Service name, not ID, the request is for a SpiffeIDService.
+	Agent   string              // Given an Agent name, not ID, the request is for a SpiffeIDAgent.
+	Kind    structs.ServiceKind // Given "mesh-gateway", the request is for a SpiffeIDMeshGateway. No other kinds supported.
+	Server  bool                // If true, the request is for a SpiffeIDServer.
+}
+
+func (r *ConnectCALeafRequest) Key() string {
+	r.EnterpriseMeta.Normalize()
+
+	switch {
+	case r.Agent != "":
+		v, err := hashstructure.Hash([]interface{}{
+			r.Agent,
+			r.PartitionOrDefault(),
+		}, nil)
+		if err == nil {
+			return fmt.Sprintf("agent:%d", v)
+		}
+	case r.Kind == structs.ServiceKindMeshGateway:
+		v, err := hashstructure.Hash([]interface{}{
+			r.PartitionOrDefault(),
+			r.DNSSAN,
+			r.IPSAN,
+		}, nil)
+		if err == nil {
+			return fmt.Sprintf("kind:%d", v)
+		}
+	case r.Kind != "":
+		// this is not valid
+	case r.Server:
+		v, err := hashstructure.Hash([]interface{}{
+			"server",
+			r.Datacenter,
+		}, nil)
+		if err == nil {
+			return fmt.Sprintf("server:%d", v)
+		}
+	default:
+		v, err := hashstructure.Hash([]interface{}{
+			r.Service,
+			r.EnterpriseMeta,
+			r.DNSSAN,
+			r.IPSAN,
+		}, nil)
+		if err == nil {
+			return fmt.Sprintf("service:%d", v)
+		}
+	}
+
+	// If there is an error, we don't set the key. A blank key forces
+	// no cache for this request so the request is forwarded directly
+	// to the server.
+	return ""
+}
+
+func (req *ConnectCALeafRequest) TargetPartition() string {
+	return req.PartitionOrDefault()
+}
+
+func (r *ConnectCALeafRequest) CacheInfo() cache.RequestInfo {
+	return cache.RequestInfo{
+		Token:          r.Token,
+		Key:            r.Key(),
+		Datacenter:     r.Datacenter,
+		MinIndex:       r.MinQueryIndex,
+		Timeout:        r.MaxQueryTime,
+		MustRevalidate: r.MustRevalidate,
+	}
+}
diff --git a/agent/cache-types/connect_ca_leaf_ce.go b/agent/cache-types/connect_ca_leaf_ce.go
new file mode 100644
index 0000000000000..07de1e7935585
--- /dev/null
+++ b/agent/cache-types/connect_ca_leaf_ce.go
@@ -0,0 +1,8 @@
+//go:build !consulent
+// +build !consulent
+
+package cachetype
+
+func (req *ConnectCALeafRequest) TargetNamespace() string {
+	return "default"
+}
diff --git a/agent/cache-types/connect_ca_leaf_test.go b/agent/cache-types/connect_ca_leaf_test.go
new file mode 100644
index 0000000000000..48e5a17924662
--- /dev/null
+++ b/agent/cache-types/connect_ca_leaf_test.go
@@ -0,0 +1,1175 @@
+package cachetype
+
+import (
+	"context"
+	"crypto/x509"
+	"encoding/pem"
+	"fmt"
+	"net"
+	"strings"
+	"sync/atomic"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
+	"github.com/hashicorp/consul/agent/cache"
+	"github.com/hashicorp/consul/agent/connect"
+	"github.com/hashicorp/consul/agent/consul"
+	"github.com/hashicorp/consul/agent/structs"
+	"github.com/hashicorp/consul/sdk/testutil/retry"
+)
+
+func TestCalculateSoftExpire(t *testing.T) {
+	tests := []struct {
+		name     string
+		now      string
+		issued   string
+		lifetime time.Duration
+		wantMin  string
+		wantMax  string
+	}{
+		{
+			name:     "72h just issued",
+			now:      "2018-01-01 00:00:01",
+			issued:   "2018-01-01 00:00:00",
+			lifetime: 72 * time.Hour,
+			// Should jitter between 60% and 90% of the lifetime which is 43.2/64.8
+			// hours after issued
+			wantMin: "2018-01-02 19:12:00",
+			wantMax: "2018-01-03 16:48:00",
+		},
+		{
+			name: "72h in renew range",
+			// This time should be inside the renewal range.
+			now:      "2018-01-02 20:00:20",
+			issued:   "2018-01-01 00:00:00",
+			lifetime: 72 * time.Hour,
+			// Min should be the "now" time
+			wantMin: "2018-01-02 20:00:20",
+			wantMax: "2018-01-03 16:48:00",
+		},
+		{
+			name: "72h in hard renew",
+			// This time should be inside the renewal range.
+			now:      "2018-01-03 18:00:00",
+			issued:   "2018-01-01 00:00:00",
+			lifetime: 72 * time.Hour,
+			// Min and max should both be the "now" time
+			wantMin: "2018-01-03 18:00:00",
+			wantMax: "2018-01-03 18:00:00",
+		},
+		{
+			name: "72h expired",
+			// This time is after expiry
+			now:      "2018-01-05 00:00:00",
+			issued:   "2018-01-01 00:00:00",
+			lifetime: 72 * time.Hour,
+			// Min and max should both be the "now" time
+			wantMin: "2018-01-05 00:00:00",
+			wantMax: "2018-01-05 00:00:00",
+		},
+		{
+			name:     "1h just issued",
+			now:      "2018-01-01 00:00:01",
+			issued:   "2018-01-01 00:00:00",
+			lifetime: 1 * time.Hour,
+			// Should jitter between 60% and 90% of the lifetime which is 36/54 mins
+			// hours after issued
+			wantMin: "2018-01-01 00:36:00",
+			wantMax: "2018-01-01 00:54:00",
+		},
+		{
+			name: "1h in renew range",
+			// This time should be inside the renewal range.
+			now:      "2018-01-01 00:40:00",
+			issued:   "2018-01-01 00:00:00",
+			lifetime: 1 * time.Hour,
+			// Min should be the "now" time
+			wantMin: "2018-01-01 00:40:00",
+			wantMax: "2018-01-01 00:54:00",
+		},
+		{
+			name: "1h in hard renew",
+			// This time should be inside the renewal range.
+			now:      "2018-01-01 00:55:00",
+			issued:   "2018-01-01 00:00:00",
+			lifetime: 1 * time.Hour,
+			// Min and max should both be the "now" time
+			wantMin: "2018-01-01 00:55:00",
+			wantMax: "2018-01-01 00:55:00",
+		},
+		{
+			name: "1h expired",
+			// This time is after expiry
+			now:      "2018-01-01 01:01:01",
+			issued:   "2018-01-01 00:00:00",
+			lifetime: 1 * time.Hour,
+			// Min and max should both be the "now" time
+			wantMin: "2018-01-01 01:01:01",
+			wantMax: "2018-01-01 01:01:01",
+		},
+		{
+			name: "too short lifetime",
+			// This time is after expiry
+			now:      "2018-01-01 01:01:01",
+			issued:   "2018-01-01 00:00:00",
+			lifetime: 1 * time.Minute,
+			// Min and max should both be the "now" time
+			wantMin: "2018-01-01 01:01:01",
+			wantMax: "2018-01-01 01:01:01",
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			now, err := time.Parse("2006-01-02 15:04:05", tc.now)
+			require.NoError(t, err)
+			issued, err := time.Parse("2006-01-02 15:04:05", tc.issued)
+			require.NoError(t, err)
+			wantMin, err := time.Parse("2006-01-02 15:04:05", tc.wantMin)
+			require.NoError(t, err)
+			wantMax, err := time.Parse("2006-01-02 15:04:05", tc.wantMax)
+			require.NoError(t, err)
+
+			min, max := calculateSoftExpiry(now, &structs.IssuedCert{
+				ValidAfter:  issued,
+				ValidBefore: issued.Add(tc.lifetime),
+			})
+
+			require.Equal(t, wantMin, min)
+			require.Equal(t, wantMax, max)
+		})
+	}
+}
+
+// Test that after an initial signing, new CA roots (new ID) will
+// trigger a blocking query to execute.
+func TestConnectCALeaf_changingRoots(t *testing.T) {
+	if testing.Short() {
+		t.Skip("too slow for testing.Short")
+	}
+
+	if testingRace {
+		t.Skip("fails with -race because caRoot.Active is modified concurrently")
+	}
+	t.Parallel()
+
+	rpc := TestRPC(t)
+	defer rpc.AssertExpectations(t)
+
+	typ, rootsCh := testCALeafType(t, rpc)
+	defer close(rootsCh)
+
+	caRoot := connect.TestCA(t, nil)
+	caRoot.Active = true
+	rootsCh <- structs.IndexedCARoots{
+		ActiveRootID: caRoot.ID,
+		TrustDomain:  "fake-trust-domain.consul",
+		Roots: []*structs.CARoot{
+			caRoot,
+		},
+		QueryMeta: structs.QueryMeta{Index: 1},
+	}
+
+	// We need this later but needs to be defined so we sign second CSR with it
+	// otherwise we break the cert root checking.
+	caRoot2 := connect.TestCA(t, nil)
+
+	// Instrument ConnectCA.Sign to return signed cert
+	var resp *structs.IssuedCert
+	var idx uint64
+
+	rpc.On("RPC", mock.Anything, "ConnectCA.Sign", mock.Anything, mock.Anything).Return(nil).
+		Run(func(args mock.Arguments) {
+			ca := caRoot
+			cIdx := atomic.AddUint64(&idx, 1)
+			if cIdx > 1 {
+				// Second time round use the new CA
+				ca = caRoot2
+			}
+			reply := args.Get(3).(*structs.IssuedCert)
+			leaf, _ := connect.TestLeaf(t, "web", ca)
+			reply.CertPEM = leaf
+			reply.ValidAfter = time.Now().Add(-1 * time.Hour)
+			reply.ValidBefore = time.Now().Add(11 * time.Hour)
+			reply.CreateIndex = cIdx
+			reply.ModifyIndex = reply.CreateIndex
+			resp = reply
+		})
+
+	// We'll reuse the fetch options and request
+	opts := cache.FetchOptions{MinIndex: 0, Timeout: 10 * time.Second}
+	req := &ConnectCALeafRequest{Datacenter: "dc1", Service: "web"}
+
+	// First fetch should return immediately
+	fetchCh := TestFetchCh(t, typ, opts, req)
+	select {
+	case <-time.After(100 * time.Millisecond):
+		t.Fatal("shouldn't block waiting for fetch")
+	case result := <-fetchCh:
+		v := mustFetchResult(t, result)
+		require.Equal(t, resp, v.Value)
+		require.Equal(t, uint64(1), v.Index)
+		// Set the LastResult for subsequent fetches
+		opts.LastResult = &v
+	}
+
+	// Second fetch should block with set index
+	opts.MinIndex = 1
+	fetchCh = TestFetchCh(t, typ, opts, req)
+	select {
+	case result := <-fetchCh:
+		t.Fatalf("should not return: %#v", result)
+	case <-time.After(100 * time.Millisecond):
+	}
+
+	// Let's send in new roots, which should trigger the sign req. We need to take
+	// care to set the new root as active
+	caRoot2.Active = true
+	caRoot.Active = false
+	rootsCh <- structs.IndexedCARoots{
+		ActiveRootID: caRoot2.ID,
+		TrustDomain:  "fake-trust-domain.consul",
+		Roots: []*structs.CARoot{
+			caRoot2,
+			caRoot,
+		},
+		QueryMeta: structs.QueryMeta{Index: atomic.AddUint64(&idx, 1)},
+	}
+	select {
+	case <-time.After(100 * time.Millisecond):
+		t.Fatal("shouldn't block waiting for fetch")
+	case result := <-fetchCh:
+		v := mustFetchResult(t, result)
+		require.Equal(t, resp, v.Value)
+		// 3 since the second CA "update" used up 2
+		require.Equal(t, uint64(3), v.Index)
+		// Set the LastResult for subsequent fetches
+		opts.LastResult = &v
+		opts.MinIndex = 3
+	}
+
+	// Third fetch should block
+	fetchCh = TestFetchCh(t, typ, opts, req)
+	select {
+	case result := <-fetchCh:
+		t.Fatalf("should not return: %#v", result)
+	case <-time.After(100 * time.Millisecond):
+	}
+}
+
+// Tests that if the root change jitter is longer than the time left on the
+// timeout, we return normally but then still renew the cert on a subsequent
+// call.
+func TestConnectCALeaf_changingRootsJitterBetweenCalls(t *testing.T) {
+	t.Parallel()
+
+	rpc := TestRPC(t)
+	defer rpc.AssertExpectations(t)
+
+	typ, rootsCh := testCALeafType(t, rpc)
+	defer close(rootsCh)
+
+	// Override the root-change delay so we will timeout first. We can't set it to
+	// a crazy high value otherwise we'll have to wait that long in the test to
+	// see if it actually happens on subsequent calls. We instead reduce the
+	// timeout in FetchOptions to be much shorter than this.
+	typ.TestOverrideCAChangeInitialDelay = 100 * time.Millisecond
+
+	caRoot := connect.TestCA(t, nil)
+	caRoot.Active = true
+	rootsCh <- structs.IndexedCARoots{
+		ActiveRootID: caRoot.ID,
+		TrustDomain:  "fake-trust-domain.consul",
+		Roots: []*structs.CARoot{
+			caRoot,
+		},
+		QueryMeta: structs.QueryMeta{Index: 1},
+	}
+
+	// Instrument ConnectCA.Sign to return signed cert
+	var resp *structs.IssuedCert
+	var idx uint64
+	rpc.On("RPC", mock.Anything, "ConnectCA.Sign", mock.Anything, mock.Anything).Return(nil).
+		Run(func(args mock.Arguments) {
+			reply := args.Get(3).(*structs.IssuedCert)
+			leaf, _ := connect.TestLeaf(t, "web", caRoot)
+			reply.CertPEM = leaf
+			reply.ValidAfter = time.Now().Add(-1 * time.Hour)
+			reply.ValidBefore = time.Now().Add(11 * time.Hour)
+			reply.CreateIndex = atomic.AddUint64(&idx, 1)
+			reply.ModifyIndex = reply.CreateIndex
+			resp = reply
+		})
+
+	// We'll reuse the fetch options and request. Timeout must be much shorter
+	// than the initial root delay. 20ms means that if we deliver the root change
+	// during the first blocking call, we should need to block fully for 5 more
+	// calls before the cert is renewed. We pick a timeout that is not an exact
+	// multiple of the 100ms delay above to reduce the chance that timing works
+	// out in a way that makes it hard to tell a timeout from an early return due
+	// to a cert renewal.
+	opts := cache.FetchOptions{MinIndex: 0, Timeout: 35 * time.Millisecond}
+	req := &ConnectCALeafRequest{Datacenter: "dc1", Service: "web"}
+
+	// First fetch should return immediately
+	fetchCh := TestFetchCh(t, typ, opts, req)
+	select {
+	case <-time.After(100 * time.Millisecond):
+		t.Fatal("shouldn't block waiting for fetch")
+	case result := <-fetchCh:
+		v := mustFetchResult(t, result)
+		require.Equal(t, resp, v.Value)
+		require.Equal(t, uint64(1), v.Index)
+		// Set the LastResult for subsequent fetches
+		opts.LastResult = &v
+	}
+
+	// Let's send in new roots, which should eventually trigger the sign req. We
+	// need to take care to set the new root as active. Note that this is
+	// implicitly testing that root updates that happen in between leaf blocking
+	// queries are still noticed too. At this point no leaf blocking query is
+	// running so the root watch should be stopped. By pushing this update, the
+	// next blocking query will _immediately_ see the new root which means it
+	// needs to correctly notice that it is not the same one that generated the
+	// current cert and start the rotation. This is good, just not obvious that
+	// the behavior is actually well tested here when it is.
+	caRoot2 := connect.TestCA(t, nil)
+	caRoot2.Active = true
+	caRoot.Active = false
+	rootsCh <- structs.IndexedCARoots{
+		ActiveRootID: caRoot2.ID,
+		TrustDomain:  "fake-trust-domain.consul",
+		Roots: []*structs.CARoot{
+			caRoot2,
+			caRoot,
+		},
+		QueryMeta: structs.QueryMeta{Index: atomic.AddUint64(&idx, 1)},
+	}
+	earliestRootDelivery := time.Now()
+
+	// Some number of fetches (2,3,4 likely) should timeout after 20ms and after
+	// 100ms has elapsed total we should see the new cert. Since this is all very
+	// timing dependent, we don't hard code exact numbers here and instead loop
+	// for plenty of time and do as many calls as it takes and just assert on the
+	// time taken and that the call either blocks and returns the cached cert, or
+	// returns the new one.
+	opts.MinIndex = 1
+	var shouldExpireAfter time.Time
+	i := 1
+	rootsDelivered := false
+	for rootsDelivered {
+		start := time.Now()
+		fetchCh = TestFetchCh(t, typ, opts, req)
+		select {
+		case result := <-fetchCh:
+			v := mustFetchResult(t, result)
+			timeTaken := time.Since(start)
+
+			// There are two options, either it blocked waiting for the delay after
+			// the rotation or it returned the new CA cert before the timeout was
+			// done. TO be more robust against timing, we take the value as the
+			// decider for which case it is, and assert timing matches our expected
+			// bounds rather than vice versa.
+
+			if v.Index > uint64(1) {
+				// Got a new cert
+				require.Equal(t, resp, v.Value)
+				require.Equal(t, uint64(3), v.Index)
+				// Should not have been delivered before the delay
+				require.True(t, time.Since(earliestRootDelivery) > typ.TestOverrideCAChangeInitialDelay)
+				// All good. We are done!
+				rootsDelivered = true
+			} else {
+				// Should be the cached cert
+				require.Equal(t, resp, v.Value)
+				require.Equal(t, uint64(1), v.Index)
+				// Sanity check we blocked for the whole timeout
+				require.Truef(t, timeTaken > opts.Timeout,
+					"should block for at least %s, returned after %s",
+					opts.Timeout, timeTaken)
+				// Sanity check that the forceExpireAfter state was set correctly
+				shouldExpireAfter = v.State.(*fetchState).forceExpireAfter
+				require.True(t, shouldExpireAfter.After(time.Now()))
+				require.True(t, shouldExpireAfter.Before(time.Now().Add(typ.TestOverrideCAChangeInitialDelay)))
+			}
+			// Set the LastResult for subsequent fetches
+			opts.LastResult = &v
+		case <-time.After(50 * time.Millisecond):
+			t.Fatalf("request %d blocked too long", i)
+		}
+		i++
+
+		// Sanity check that we've not gone way beyond the deadline without a
+		// new cert. We give some leeway to make it less brittle.
+		require.Falsef(t, time.Now().After(shouldExpireAfter.Add(100*time.Millisecond)),
+			"waited extra 100ms and delayed CA rotate renew didn't happen")
+	}
+}
+
+// Tests that if the root changes in between blocking calls we still pick it up.
+func TestConnectCALeaf_changingRootsBetweenBlockingCalls(t *testing.T) {
+	t.Parallel()
+
+	rpc := TestRPC(t)
+	defer rpc.AssertExpectations(t)
+
+	typ, rootsCh := testCALeafType(t, rpc)
+	defer close(rootsCh)
+
+	caRoot := connect.TestCA(t, nil)
+	caRoot.Active = true
+	rootsCh <- structs.IndexedCARoots{
+		ActiveRootID: caRoot.ID,
+		TrustDomain:  "fake-trust-domain.consul",
+		Roots: []*structs.CARoot{
+			caRoot,
+		},
+		QueryMeta: structs.QueryMeta{Index: 1},
+	}
+
+	// Instrument ConnectCA.Sign to return signed cert
+	var resp *structs.IssuedCert
+	var idx uint64
+	rpc.On("RPC", mock.Anything, "ConnectCA.Sign", mock.Anything, mock.Anything).Return(nil).
+		Run(func(args mock.Arguments) {
+			reply := args.Get(3).(*structs.IssuedCert)
+			leaf, _ := connect.TestLeaf(t, "web", caRoot)
+			reply.CertPEM = leaf
+			reply.ValidAfter = time.Now().Add(-1 * time.Hour)
+			reply.ValidBefore = time.Now().Add(11 * time.Hour)
+			reply.CreateIndex = atomic.AddUint64(&idx, 1)
+			reply.ModifyIndex = reply.CreateIndex
+			resp = reply
+		})
+
+	// We'll reuse the fetch options and request. Short timeout important since we
+	// wait the full timeout before chaning roots.
+	opts := cache.FetchOptions{MinIndex: 0, Timeout: 35 * time.Millisecond}
+	req := &ConnectCALeafRequest{Datacenter: "dc1", Service: "web"}
+
+	// First fetch should return immediately
+	fetchCh := TestFetchCh(t, typ, opts, req)
+	select {
+	case <-time.After(100 * time.Millisecond):
+		t.Fatal("shouldn't block waiting for fetch")
+	case result := <-fetchCh:
+		v := mustFetchResult(t, result)
+		require.Equal(t, resp, v.Value)
+		require.Equal(t, uint64(1), v.Index)
+		// Set the LastResult for subsequent fetches
+		opts.LastResult = &v
+	}
+
+	// Next fetch should block for the full timeout
+	start := time.Now()
+	fetchCh = TestFetchCh(t, typ, opts, req)
+	select {
+	case <-time.After(100 * time.Millisecond):
+		t.Fatal("shouldn't block for too long waiting for fetch")
+	case result := <-fetchCh:
+		v := mustFetchResult(t, result)
+		require.Equal(t, resp, v.Value)
+		// Still the initial cached result
+		require.Equal(t, uint64(1), v.Index)
+		// Sanity check that it waited
+		require.True(t, time.Since(start) > opts.Timeout)
+		// Set the LastResult for subsequent fetches
+		opts.LastResult = &v
+	}
+
+	// No active requests, simulate root change now
+	caRoot2 := connect.TestCA(t, nil)
+	caRoot2.Active = true
+	caRoot.Active = false
+	rootsCh <- structs.IndexedCARoots{
+		ActiveRootID: caRoot2.ID,
+		TrustDomain:  "fake-trust-domain.consul",
+		Roots: []*structs.CARoot{
+			caRoot2,
+			caRoot,
+		},
+		QueryMeta: structs.QueryMeta{Index: atomic.AddUint64(&idx, 1)},
+	}
+	earliestRootDelivery := time.Now()
+
+	// We should get the new cert immediately on next fetch (since test override
+	// root change jitter to be 1 nanosecond so no delay expected).
+	fetchCh = TestFetchCh(t, typ, opts, req)
+	select {
+	case <-time.After(100 * time.Millisecond):
+		t.Fatal("shouldn't block too long waiting for fetch")
+	case result := <-fetchCh:
+		v := mustFetchResult(t, result)
+		require.Equal(t, resp, v.Value)
+		// Index should be 3 since root change consumed 2
+		require.Equal(t, uint64(3), v.Index)
+		// Sanity check that we didn't wait too long
+		require.True(t, time.Since(earliestRootDelivery) < opts.Timeout)
+		// Set the LastResult for subsequent fetches
+		opts.LastResult = &v
+	}
+
+}
+
+func TestConnectCALeaf_CSRRateLimiting(t *testing.T) {
+	if testing.Short() {
+		t.Skip("too slow for testing.Short")
+	}
+
+	t.Parallel()
+
+	rpc := TestRPC(t)
+	defer rpc.AssertExpectations(t)
+
+	typ, rootsCh := testCALeafType(t, rpc)
+	defer close(rootsCh)
+
+	// Each jitter window will be only 100 ms long to make testing quick but
+	// highly likely not to fail based on scheduling issues.
+	typ.TestOverrideCAChangeInitialDelay = 100 * time.Millisecond
+
+	// Setup root that will be returned by the mocked Root cache fetch
+	caRoot := connect.TestCA(t, nil)
+	caRoot.Active = true
+	rootsCh <- structs.IndexedCARoots{
+		ActiveRootID: caRoot.ID,
+		TrustDomain:  "fake-trust-domain.consul",
+		Roots: []*structs.CARoot{
+			caRoot,
+		},
+		QueryMeta: structs.QueryMeta{Index: 1},
+	}
+
+	// Instrument ConnectCA.Sign
+	var resp *structs.IssuedCert
+	var idx, rateLimitedRPCs uint64
+
+	genCert := func(args mock.Arguments) {
+		reply := args.Get(3).(*structs.IssuedCert)
+		leaf, _ := connect.TestLeaf(t, "web", caRoot)
+		reply.CertPEM = leaf
+		reply.ValidAfter = time.Now().Add(-1 * time.Hour)
+		reply.ValidBefore = time.Now().Add(11 * time.Hour)
+		reply.CreateIndex = atomic.AddUint64(&idx, 1)
+		reply.ModifyIndex = reply.CreateIndex
+		resp = reply
+	}
+
+	incRateLimit := func(args mock.Arguments) {
+		atomic.AddUint64(&rateLimitedRPCs, 1)
+	}
+
+	// First call return rate limit error. This is important as it checks
+	// behavior when cache is empty and we have to return a nil Value but need to
+	// save state to do the right thing for retry.
+	rpc.On("RPC", mock.Anything, "ConnectCA.Sign", mock.Anything, mock.Anything).
+		Return(consul.ErrRateLimited).Once().Run(incRateLimit)
+	// Then succeed on second call
+	rpc.On("RPC", mock.Anything, "ConnectCA.Sign", mock.Anything, mock.Anything).
+		Return(nil).Run(genCert).Once()
+	// Then be rate limited again on several further calls
+	rpc.On("RPC", mock.Anything, "ConnectCA.Sign", mock.Anything, mock.Anything).
+		Return(consul.ErrRateLimited).Twice().Run(incRateLimit)
+	// Then fine after that
+	rpc.On("RPC", mock.Anything, "ConnectCA.Sign", mock.Anything, mock.Anything).
+		Return(nil).Run(genCert)
+
+	opts := cache.FetchOptions{MinIndex: 0, Timeout: 10 * time.Minute}
+	req := &ConnectCALeafRequest{Datacenter: "dc1", Service: "web"}
+
+	// First fetch should return rate limit error directly - client is expected to
+	// backoff itself.
+	fetchCh := TestFetchCh(t, typ, opts, req)
+	select {
+	case <-time.After(200 * time.Millisecond):
+		t.Fatal("shouldn't block longer than one jitter window for success")
+	case result := <-fetchCh:
+		switch v := result.(type) {
+		case error:
+			require.Error(t, v)
+			require.Equal(t, consul.ErrRateLimited.Error(), v.Error())
+		case cache.FetchResult:
+			t.Fatalf("Expected error")
+		}
+	}
+
+	// Second call should return correct cert immediately.
+	fetchCh = TestFetchCh(t, typ, opts, req)
+	select {
+	case <-time.After(100 * time.Millisecond):
+		t.Fatal("shouldn't block waiting for fetch")
+	case result := <-fetchCh:
+		v := mustFetchResult(t, result)
+		require.Equal(t, resp, v.Value)
+		require.Equal(t, uint64(1), v.Index)
+		// Set the LastResult for subsequent fetches
+		opts.LastResult = &v
+		// Set MinIndex
+		opts.MinIndex = 1
+	}
+
+	// Send in new roots, which should trigger the next sign req. We need to take
+	// care to set the new root as active
+	caRoot2 := connect.TestCA(t, nil)
+	caRoot2.Active = true
+	caRoot.Active = false
+	rootsCh <- structs.IndexedCARoots{
+		ActiveRootID: caRoot2.ID,
+		TrustDomain:  "fake-trust-domain.consul",
+		Roots: []*structs.CARoot{
+			caRoot2,
+			caRoot,
+		},
+		QueryMeta: structs.QueryMeta{Index: atomic.AddUint64(&idx, 1)},
+	}
+	earliestRootDelivery := time.Now()
+
+	// Sanity check state
+	require.Equal(t, uint64(1), atomic.LoadUint64(&rateLimitedRPCs))
+
+	// After root rotation jitter has been waited out, a new CSR will
+	// be attempted but will fail and return the previous cached result with no
+	// error since we will try again soon.
+	fetchCh = TestFetchCh(t, typ, opts, req)
+	select {
+	case <-time.After(200 * time.Millisecond):
+		t.Fatal("shouldn't block too long waiting for fetch")
+	case result := <-fetchCh:
+		// We should block for _at least_ one jitter period since we set that to
+		// 100ms and in test override mode we always pick the max jitter not a
+		// random amount.
+		require.True(t, time.Since(earliestRootDelivery) > 100*time.Millisecond)
+		require.Equal(t, uint64(2), atomic.LoadUint64(&rateLimitedRPCs))
+
+		v := mustFetchResult(t, result)
+		require.Equal(t, resp, v.Value)
+		// 1 since this should still be the original cached result as we failed to
+		// get a new cert.
+		require.Equal(t, uint64(1), v.Index)
+		// Set the LastResult for subsequent fetches
+		opts.LastResult = &v
+	}
+
+	// Root rotation state is now only captured in the opts.LastResult.State so a
+	// subsequent call should also wait for 100ms and then attempt to generate a
+	// new cert since we failed last time.
+	fetchCh = TestFetchCh(t, typ, opts, req)
+	select {
+	case <-time.After(200 * time.Millisecond):
+		t.Fatal("shouldn't block too long waiting for fetch")
+	case result := <-fetchCh:
+		// We should block for _at least_ two jitter periods now.
+		require.True(t, time.Since(earliestRootDelivery) > 200*time.Millisecond)
+		require.Equal(t, uint64(3), atomic.LoadUint64(&rateLimitedRPCs))
+
+		v := mustFetchResult(t, result)
+		require.Equal(t, resp, v.Value)
+		// 1 since this should still be the original cached result as we failed to
+		// get a new cert.
+		require.Equal(t, uint64(1), v.Index)
+		// Set the LastResult for subsequent fetches
+		opts.LastResult = &v
+	}
+
+	// Now we've had two rate limit failures and seen root rotation state work
+	// across both the blocking request that observed the rotation and the
+	// subsequent one. The next request should wait out the rest of the backoff
+	// and then actually fetch a new cert at last!
+	fetchCh = TestFetchCh(t, typ, opts, req)
+	select {
+	case <-time.After(200 * time.Millisecond):
+		t.Fatal("shouldn't block too long waiting for fetch")
+	case result := <-fetchCh:
+		// We should block for _at least_ three jitter periods now.
+		require.True(t, time.Since(earliestRootDelivery) > 300*time.Millisecond)
+		require.Equal(t, uint64(3), atomic.LoadUint64(&rateLimitedRPCs))
+
+		v := mustFetchResult(t, result)
+		require.Equal(t, resp, v.Value)
+		// 3 since the rootCA change used 2
+		require.Equal(t, uint64(3), v.Index)
+		// Set the LastResult for subsequent fetches
+		opts.LastResult = &v
+	}
+}
+
+// This test runs multiple concurrent callers watching different leaf certs and
+// tries to ensure that the background root watch activity behaves correctly.
+func TestConnectCALeaf_watchRootsDedupingMultipleCallers(t *testing.T) {
+	if testing.Short() {
+		t.Skip("too slow for testing.Short")
+	}
+
+	if testingRace {
+		t.Skip("fails with -race because caRoot.Active is modified concurrently")
+	}
+	t.Parallel()
+
+	rpc := TestRPC(t)
+	defer rpc.AssertExpectations(t)
+
+	typ, rootsCh := testCALeafType(t, rpc)
+	defer close(rootsCh)
+
+	caRoot := connect.TestCA(t, nil)
+	caRoot.Active = true
+	rootsCh <- structs.IndexedCARoots{
+		ActiveRootID: caRoot.ID,
+		TrustDomain:  "fake-trust-domain.consul",
+		Roots: []*structs.CARoot{
+			caRoot,
+		},
+		QueryMeta: structs.QueryMeta{Index: 1},
+	}
+
+	// Instrument ConnectCA.Sign to return signed cert
+	var idx uint64
+	rpc.On("RPC", mock.Anything, "ConnectCA.Sign", mock.Anything, mock.Anything).Return(nil).
+		Run(func(args mock.Arguments) {
+			reply := args.Get(3).(*structs.IssuedCert)
+			// Note we will sign certs for same service name each time because
+			// otherwise we have to re-invent whole CSR endpoint here to be able to
+			// control things - parse PEM sign with right key etc. It doesn't matter -
+			// we use the CreateIndex to differentiate the "right" results.
+			leaf, _ := connect.TestLeaf(t, "web", caRoot)
+			reply.CertPEM = leaf
+			reply.ValidAfter = time.Now().Add(-1 * time.Hour)
+			reply.ValidBefore = time.Now().Add(11 * time.Hour)
+			reply.CreateIndex = atomic.AddUint64(&idx, 1)
+			reply.ModifyIndex = reply.CreateIndex
+		})
+
+	// n is the number of clients we'll run
+	n := 3
+
+	// setup/testDoneCh are used for coordinating clients such that each has
+	// initial cert delivered and is blocking before the root changes. It's not a
+	// wait group since we want to be able to timeout the main test goroutine if
+	// one of the clients gets stuck. Instead it's a buffered chan.
+	setupDoneCh := make(chan error, n)
+	testDoneCh := make(chan error, n)
+	// rootsUpdate is used to coordinate clients so they know when they should
+	// expect to see leaf renewed after root change.
+	rootsUpdatedCh := make(chan struct{})
+
+	// Create a function that models a single client. It should go through the
+	// steps of getting an initial cert and then watching for changes until root
+	// updates.
+	client := func(i int) {
+		// We'll reuse the fetch options and request
+		opts := cache.FetchOptions{MinIndex: 0, Timeout: 10 * time.Second}
+		req := &ConnectCALeafRequest{Datacenter: "dc1", Service: fmt.Sprintf("web-%d", i)}
+
+		// First fetch should return immediately
+		fetchCh := TestFetchCh(t, typ, opts, req)
+		select {
+		case <-time.After(100 * time.Millisecond):
+			setupDoneCh <- fmt.Errorf("shouldn't block waiting for fetch")
+			return
+		case result := <-fetchCh:
+			v := mustFetchResult(t, result)
+			opts.LastResult = &v
+		}
+
+		// Second fetch should block with set index
+		opts.MinIndex = 1
+		fetchCh = TestFetchCh(t, typ, opts, req)
+		select {
+		case result := <-fetchCh:
+			setupDoneCh <- fmt.Errorf("should not return: %#v", result)
+			return
+		case <-time.After(100 * time.Millisecond):
+		}
+
+		// We're done with setup and the blocking call is still blocking in
+		// background.
+		setupDoneCh <- nil
+
+		// Wait until all others are also done and roots change incase there are
+		// stragglers delaying the root update.
+		select {
+		case <-rootsUpdatedCh:
+		case <-time.After(200 * time.Millisecond):
+			testDoneCh <- fmt.Errorf("waited too long for root update")
+			return
+		}
+
+		// Now we should see root update within a short period
+		select {
+		case <-time.After(100 * time.Millisecond):
+			testDoneCh <- fmt.Errorf("shouldn't block waiting for fetch")
+			return
+		case result := <-fetchCh:
+			v := mustFetchResult(t, result)
+			if opts.MinIndex == v.Value.(*structs.IssuedCert).CreateIndex {
+				testDoneCh <- fmt.Errorf("index must be different")
+				return
+			}
+		}
+
+		testDoneCh <- nil
+	}
+
+	// Sanity check the roots watcher is not running yet
+	assertRootsWatchCounts(t, typ, 0, 0)
+
+	for i := 0; i < n; i++ {
+		go client(i)
+	}
+
+	timeoutCh := time.After(200 * time.Millisecond)
+
+	for i := 0; i < n; i++ {
+		select {
+		case <-timeoutCh:
+			t.Fatal("timed out waiting for clients")
+		case err := <-setupDoneCh:
+			if err != nil {
+				t.Fatalf(err.Error())
+			}
+		}
+	}
+
+	// Should be 3 clients running now, so the roots watcher should have started
+	// once and not stopped.
+	assertRootsWatchCounts(t, typ, 1, 0)
+
+	// Now we deliver the root update
+	caRoot2 := connect.TestCA(t, nil)
+	caRoot2.Active = true
+	caRoot.Active = false
+	rootsCh <- structs.IndexedCARoots{
+		ActiveRootID: caRoot2.ID,
+		TrustDomain:  "fake-trust-domain.consul",
+		Roots: []*structs.CARoot{
+			caRoot2,
+			caRoot,
+		},
+		QueryMeta: structs.QueryMeta{Index: atomic.AddUint64(&idx, 1)},
+	}
+	// And notify clients
+	close(rootsUpdatedCh)
+
+	timeoutCh = time.After(200 * time.Millisecond)
+	for i := 0; i < n; i++ {
+		select {
+		case <-timeoutCh:
+			t.Fatalf("timed out waiting for %d of %d clients to renew after root change", n-i, n)
+		case err := <-testDoneCh:
+			if err != nil {
+				t.Fatalf(err.Error())
+			}
+		}
+	}
+
+	// All active requests have returned the new cert so the rootsWatcher should
+	// have stopped. This is timing dependent though so retry a few times
+	retry.RunWith(retry.ThreeTimes(), t, func(r *retry.R) {
+		assertRootsWatchCounts(r, typ, 1, 1)
+	})
+}
+
+func assertRootsWatchCounts(t require.TestingT, typ *ConnectCALeaf, wantStarts, wantStops int) {
+	if tt, ok := t.(*testing.T); ok {
+		tt.Helper()
+	}
+	starts := atomic.LoadUint32(&typ.testRootWatchStartCount)
+	stops := atomic.LoadUint32(&typ.testRootWatchStopCount)
+	require.Equal(t, wantStarts, int(starts))
+	require.Equal(t, wantStops, int(stops))
+}
+
+func mustFetchResult(t *testing.T, result interface{}) cache.FetchResult {
+	t.Helper()
+	switch v := result.(type) {
+	case error:
+		require.NoError(t, v)
+	case cache.FetchResult:
+		return v
+	default:
+		t.Fatalf("unexpected type from fetch %T", v)
+	}
+	return cache.FetchResult{}
+}
+
+// Test that after an initial signing, an expiringLeaf will trigger a
+// blocking query to resign.
+func TestConnectCALeaf_expiringLeaf(t *testing.T) {
+	if testing.Short() {
+		t.Skip("too slow for testing.Short")
+	}
+
+	t.Parallel()
+
+	rpc := TestRPC(t)
+	defer rpc.AssertExpectations(t)
+
+	typ, rootsCh := testCALeafType(t, rpc)
+	defer close(rootsCh)
+
+	caRoot := connect.TestCA(t, nil)
+	caRoot.Active = true
+	rootsCh <- structs.IndexedCARoots{
+		ActiveRootID: caRoot.ID,
+		TrustDomain:  "fake-trust-domain.consul",
+		Roots: []*structs.CARoot{
+			caRoot,
+		},
+		QueryMeta: structs.QueryMeta{Index: 1},
+	}
+
+	// Instrument ConnectCA.Sign to
+	var resp *structs.IssuedCert
+	var idx uint64
+	rpc.On("RPC", mock.Anything, "ConnectCA.Sign", mock.Anything, mock.Anything).Return(nil).
+		Run(func(args mock.Arguments) {
+			reply := args.Get(3).(*structs.IssuedCert)
+			reply.CreateIndex = atomic.AddUint64(&idx, 1)
+			reply.ModifyIndex = reply.CreateIndex
+
+			leaf, _ := connect.TestLeaf(t, "web", caRoot)
+			reply.CertPEM = leaf
+
+			if reply.CreateIndex == 1 {
+				// First call returns expired cert to prime cache with an expired one.
+				reply.ValidAfter = time.Now().Add(-13 * time.Hour)
+				reply.ValidBefore = time.Now().Add(-1 * time.Hour)
+			} else {
+				reply.ValidAfter = time.Now().Add(-1 * time.Hour)
+				reply.ValidBefore = time.Now().Add(11 * time.Hour)
+			}
+
+			resp = reply
+		})
+
+	// We'll reuse the fetch options and request
+	opts := cache.FetchOptions{MinIndex: 0, Timeout: 10 * time.Second}
+	req := &ConnectCALeafRequest{Datacenter: "dc1", Service: "web"}
+
+	// First fetch should return immediately
+	fetchCh := TestFetchCh(t, typ, opts, req)
+	select {
+	case <-time.After(100 * time.Millisecond):
+		t.Fatal("shouldn't block waiting for fetch")
+	case result := <-fetchCh:
+		switch v := result.(type) {
+		case error:
+			require.NoError(t, v)
+		case cache.FetchResult:
+			require.Equal(t, resp, v.Value)
+			require.Equal(t, uint64(1), v.Index)
+			// Set the LastResult for subsequent fetches
+			opts.LastResult = &v
+		}
+	}
+
+	// Second fetch should return immediately despite there being
+	// no updated CA roots, because we issued an expired cert.
+	fetchCh = TestFetchCh(t, typ, opts, req)
+	select {
+	case <-time.After(100 * time.Millisecond):
+		t.Fatal("shouldn't block waiting for fetch")
+	case result := <-fetchCh:
+		switch v := result.(type) {
+		case error:
+			require.NoError(t, v)
+		case cache.FetchResult:
+			require.Equal(t, resp, v.Value)
+			require.Equal(t, uint64(2), v.Index)
+			// Set the LastResult for subsequent fetches
+			opts.LastResult = &v
+		}
+	}
+
+	// Third fetch should block since the cert is not expiring and
+	// we also didn't update CA certs.
+	opts.MinIndex = 2
+	fetchCh = TestFetchCh(t, typ, opts, req)
+	select {
+	case result := <-fetchCh:
+		t.Fatalf("should not return: %#v", result)
+	case <-time.After(100 * time.Millisecond):
+	}
+}
+
+func TestConnectCALeaf_DNSSANForService(t *testing.T) {
+	t.Parallel()
+
+	rpc := TestRPC(t)
+	defer rpc.AssertExpectations(t)
+
+	typ, rootsCh := testCALeafType(t, rpc)
+	defer close(rootsCh)
+
+	caRoot := connect.TestCA(t, nil)
+	caRoot.Active = true
+	rootsCh <- structs.IndexedCARoots{
+		ActiveRootID: caRoot.ID,
+		TrustDomain:  "fake-trust-domain.consul",
+		Roots: []*structs.CARoot{
+			caRoot,
+		},
+		QueryMeta: structs.QueryMeta{Index: 1},
+	}
+
+	// Instrument ConnectCA.Sign to
+	var caReq *structs.CASignRequest
+	rpc.On("RPC", mock.Anything, "ConnectCA.Sign", mock.Anything, mock.Anything).Return(nil).
+		Run(func(args mock.Arguments) {
+			reply := args.Get(3).(*structs.IssuedCert)
+			leaf, _ := connect.TestLeaf(t, "web", caRoot)
+			reply.CertPEM = leaf
+
+			caReq = args.Get(2).(*structs.CASignRequest)
+		})
+
+	opts := cache.FetchOptions{MinIndex: 0, Timeout: 10 * time.Second}
+	req := &ConnectCALeafRequest{
+		Datacenter: "dc1",
+		Service:    "web",
+		DNSSAN:     []string{"test.example.com"},
+	}
+	_, err := typ.Fetch(opts, req)
+	require.NoError(t, err)
+
+	pemBlock, _ := pem.Decode([]byte(caReq.CSR))
+	csr, err := x509.ParseCertificateRequest(pemBlock.Bytes)
+	require.NoError(t, err)
+	require.Equal(t, csr.DNSNames, []string{"test.example.com"})
+}
+
+// testConnectCaRoot wraps ConnectCARoot to disable refresh so that the gated
+// channel controls the request directly. Otherwise, we get background refreshes and
+// it screws up the ordering of the channel reads of the testGatedRootsRPC
+// implementation.
+type testConnectCaRoot struct {
+	ConnectCARoot
+}
+
+func (r testConnectCaRoot) RegisterOptions() cache.RegisterOptions {
+	return cache.RegisterOptions{
+		Refresh:          false,
+		SupportsBlocking: true,
+	}
+}
+
+// testCALeafType returns a *ConnectCALeaf that is pre-configured to
+// use the given RPC implementation for "ConnectCA.Sign" operations.
+func testCALeafType(t *testing.T, rpc RPC) (*ConnectCALeaf, chan structs.IndexedCARoots) {
+	// This creates an RPC implementation that will block until the
+	// value is sent on the channel. This lets us control when the
+	// next values show up.
+	rootsCh := make(chan structs.IndexedCARoots, 10)
+	rootsRPC := &testGatedRootsRPC{ValueCh: rootsCh}
+
+	// Create a cache
+	c := cache.New(cache.Options{})
+	c.RegisterType(ConnectCARootName, &testConnectCaRoot{
+		ConnectCARoot: ConnectCARoot{RPC: rootsRPC},
+	})
+	// Create the leaf type
+	return &ConnectCALeaf{
+		RPC:        rpc,
+		Cache:      c,
+		Datacenter: "dc1",
+		// Override the root-change spread so we don't have to wait up to 20 seconds
+		// to see root changes work. Can be changed back for specific tests that
+		// need to test this, Note it's not 0 since that used default but is
+		// effectively the same.
+		TestOverrideCAChangeInitialDelay: 1 * time.Microsecond,
+	}, rootsCh
+}
+
+// testGatedRootsRPC will send each subsequent value on the channel as the
+// RPC response, blocking if it is waiting for a value on the channel. This
+// can be used to control when background fetches are returned and what they
+// return.
+//
+// This should be used with Refresh = false for the registration options so
+// automatic refreshes don't mess up the channel read ordering.
+type testGatedRootsRPC struct {
+	ValueCh chan structs.IndexedCARoots
+}
+
+func (r *testGatedRootsRPC) RPC(ctx context.Context, method string, args interface{}, reply interface{}) error {
+	if method != "ConnectCA.Roots" {
+		return fmt.Errorf("invalid RPC method: %s", method)
+	}
+
+	replyReal := reply.(*structs.IndexedCARoots)
+	*replyReal = <-r.ValueCh
+	return nil
+}
+
+func TestConnectCALeaf_Key(t *testing.T) {
+	key := func(r ConnectCALeafRequest) string {
+		return r.Key()
+	}
+	t.Run("service", func(t *testing.T) {
+		t.Run("name", func(t *testing.T) {
+			r1 := key(ConnectCALeafRequest{Service: "web"})
+			r2 := key(ConnectCALeafRequest{Service: "api"})
+			require.True(t, strings.HasPrefix(r1, "service:"), "Key %s does not start with service:", r1)
+			require.True(t, strings.HasPrefix(r2, "service:"), "Key %s does not start with service:", r2)
+			require.NotEqual(t, r1, r2, "Cache keys for different services should not be equal")
+		})
+		t.Run("dns-san", func(t *testing.T) {
+			r3 := key(ConnectCALeafRequest{Service: "foo", DNSSAN: []string{"a.com"}})
+			r4 := key(ConnectCALeafRequest{Service: "foo", DNSSAN: []string{"b.com"}})
+			require.NotEqual(t, r3, r4, "Cache keys for different DNSSAN should not be equal")
+		})
+		t.Run("ip-san", func(t *testing.T) {
+			r5 := key(ConnectCALeafRequest{Service: "foo", IPSAN: []net.IP{net.ParseIP("192.168.4.139")}})
+			r6 := key(ConnectCALeafRequest{Service: "foo", IPSAN: []net.IP{net.ParseIP("192.168.4.140")}})
+			require.NotEqual(t, r5, r6, "Cache keys for different IPSAN should not be equal")
+		})
+	})
+	t.Run("agent", func(t *testing.T) {
+		t.Run("name", func(t *testing.T) {
+			r1 := key(ConnectCALeafRequest{Agent: "abc"})
+			require.True(t, strings.HasPrefix(r1, "agent:"), "Key %s does not start with agent:", r1)
+		})
+		t.Run("dns-san ignored", func(t *testing.T) {
+			r3 := key(ConnectCALeafRequest{Agent: "foo", DNSSAN: []string{"a.com"}})
+			r4 := key(ConnectCALeafRequest{Agent: "foo", DNSSAN: []string{"b.com"}})
+			require.Equal(t, r3, r4, "DNSSAN is ignored for agent type")
+		})
+		t.Run("ip-san ignored", func(t *testing.T) {
+			r5 := key(ConnectCALeafRequest{Agent: "foo", IPSAN: []net.IP{net.ParseIP("192.168.4.139")}})
+			r6 := key(ConnectCALeafRequest{Agent: "foo", IPSAN: []net.IP{net.ParseIP("192.168.4.140")}})
+			require.Equal(t, r5, r6, "IPSAN is ignored for agent type")
+		})
+	})
+	t.Run("kind", func(t *testing.T) {
+		t.Run("invalid", func(t *testing.T) {
+			r1 := key(ConnectCALeafRequest{Kind: "terminating-gateway"})
+			require.Empty(t, r1)
+		})
+		t.Run("mesh-gateway", func(t *testing.T) {
+			t.Run("normal", func(t *testing.T) {
+				r1 := key(ConnectCALeafRequest{Kind: "mesh-gateway"})
+				require.True(t, strings.HasPrefix(r1, "kind:"), "Key %s does not start with kind:", r1)
+			})
+			t.Run("dns-san", func(t *testing.T) {
+				r3 := key(ConnectCALeafRequest{Kind: "mesh-gateway", DNSSAN: []string{"a.com"}})
+				r4 := key(ConnectCALeafRequest{Kind: "mesh-gateway", DNSSAN: []string{"b.com"}})
+				require.NotEqual(t, r3, r4, "Cache keys for different DNSSAN should not be equal")
+			})
+			t.Run("ip-san", func(t *testing.T) {
+				r5 := key(ConnectCALeafRequest{Kind: "mesh-gateway", IPSAN: []net.IP{net.ParseIP("192.168.4.139")}})
+				r6 := key(ConnectCALeafRequest{Kind: "mesh-gateway", IPSAN: []net.IP{net.ParseIP("192.168.4.140")}})
+				require.NotEqual(t, r5, r6, "Cache keys for different IPSAN should not be equal")
+			})
+		})
+	})
+	t.Run("server", func(t *testing.T) {
+		r1 := key(ConnectCALeafRequest{
+			Server:     true,
+			Datacenter: "us-east",
+		})
+		require.True(t, strings.HasPrefix(r1, "server:"), "Key %s does not start with server:", r1)
+	})
+}
diff --git a/agent/cache-types/connect_ca_root.go b/agent/cache-types/connect_ca_root.go
index 9ba1dab0b7dcd..deca68e31c20c 100644
--- a/agent/cache-types/connect_ca_root.go
+++ b/agent/cache-types/connect_ca_root.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
@@ -8,12 +5,11 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/consul/agent/cache"
-	"github.com/hashicorp/consul/agent/cacheshim"
 	"github.com/hashicorp/consul/agent/structs"
 )
 
 // Recommended name for registration.
-const ConnectCARootName = cacheshim.ConnectCARootName
+const ConnectCARootName = "connect-ca-root"
 
 // ConnectCARoot supports fetching the Connect CA roots. This is a
 // straightforward cache type since it only has to block on the given
diff --git a/agent/cache-types/connect_ca_root_test.go b/agent/cache-types/connect_ca_root_test.go
index 74aa53c31a4c7..7fd23264cad44 100644
--- a/agent/cache-types/connect_ca_root_test.go
+++ b/agent/cache-types/connect_ca_root_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/discovery_chain.go b/agent/cache-types/discovery_chain.go
index e27b621061e1d..2d8cd1bea64db 100644
--- a/agent/cache-types/discovery_chain.go
+++ b/agent/cache-types/discovery_chain.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/discovery_chain_test.go b/agent/cache-types/discovery_chain_test.go
index a9c9783e882bb..62fe634e82eb5 100644
--- a/agent/cache-types/discovery_chain_test.go
+++ b/agent/cache-types/discovery_chain_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
@@ -20,7 +17,7 @@ func TestCompiledDiscoveryChain(t *testing.T) {
 	typ := &CompiledDiscoveryChain{RPC: rpc}
 
 	// just do the default chain
-	chain := discoverychain.TestCompileConfigEntries(t, "web", "default", "default", "dc1", "trustdomain.consul", nil, nil)
+	chain := discoverychain.TestCompileConfigEntries(t, "web", "default", "default", "dc1", "trustdomain.consul", nil)
 
 	// Expect the proper RPC call. This also sets the expected value
 	// since that is return-by-pointer in the arguments.
diff --git a/agent/cache-types/exported_peered_services.go b/agent/cache-types/exported_peered_services.go
index 69bd2d92ba71f..21ff779f56168 100644
--- a/agent/cache-types/exported_peered_services.go
+++ b/agent/cache-types/exported_peered_services.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/exported_peered_services_test.go b/agent/cache-types/exported_peered_services_test.go
index a2d618bb60c52..a946c32960571 100644
--- a/agent/cache-types/exported_peered_services_test.go
+++ b/agent/cache-types/exported_peered_services_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/federation_state_list_gateways.go b/agent/cache-types/federation_state_list_gateways.go
index 501a8bcead289..c28ad3700d4f9 100644
--- a/agent/cache-types/federation_state_list_gateways.go
+++ b/agent/cache-types/federation_state_list_gateways.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/federation_state_list_gateways_test.go b/agent/cache-types/federation_state_list_gateways_test.go
index 04bd661e80fc6..3be25f69afc6c 100644
--- a/agent/cache-types/federation_state_list_gateways_test.go
+++ b/agent/cache-types/federation_state_list_gateways_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/gateway_services.go b/agent/cache-types/gateway_services.go
index 9c13800beeee0..02ae60b080b95 100644
--- a/agent/cache-types/gateway_services.go
+++ b/agent/cache-types/gateway_services.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/gateway_services_test.go b/agent/cache-types/gateway_services_test.go
index 49be4edf47808..e3c399cd2443d 100644
--- a/agent/cache-types/gateway_services_test.go
+++ b/agent/cache-types/gateway_services_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/health_services.go b/agent/cache-types/health_services.go
index ae8369364743e..63e52470a1094 100644
--- a/agent/cache-types/health_services.go
+++ b/agent/cache-types/health_services.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/health_services_test.go b/agent/cache-types/health_services_test.go
index 6e83ec9a40181..d1524ca2c56b6 100644
--- a/agent/cache-types/health_services_test.go
+++ b/agent/cache-types/health_services_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/intention_match.go b/agent/cache-types/intention_match.go
index fd69eab65c75a..3b4b519c72adb 100644
--- a/agent/cache-types/intention_match.go
+++ b/agent/cache-types/intention_match.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/intention_match_test.go b/agent/cache-types/intention_match_test.go
index 26788b679befb..ec313013f07cc 100644
--- a/agent/cache-types/intention_match_test.go
+++ b/agent/cache-types/intention_match_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/intention_upstreams.go b/agent/cache-types/intention_upstreams.go
index a0e1ea0c0fd35..80d657ebb8865 100644
--- a/agent/cache-types/intention_upstreams.go
+++ b/agent/cache-types/intention_upstreams.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/intention_upstreams_destination.go b/agent/cache-types/intention_upstreams_destination.go
index 1b5200a163c2c..95130033641ef 100644
--- a/agent/cache-types/intention_upstreams_destination.go
+++ b/agent/cache-types/intention_upstreams_destination.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/intention_upstreams_destination_test.go b/agent/cache-types/intention_upstreams_destination_test.go
index 32852891846f0..660cdb6b41935 100644
--- a/agent/cache-types/intention_upstreams_destination_test.go
+++ b/agent/cache-types/intention_upstreams_destination_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/intention_upstreams_test.go b/agent/cache-types/intention_upstreams_test.go
index 3259969f03a8f..a6f2e3aa09617 100644
--- a/agent/cache-types/intention_upstreams_test.go
+++ b/agent/cache-types/intention_upstreams_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/mock_PeeringLister_test.go b/agent/cache-types/mock_PeeringLister_test.go
index b881b0b80b851..c9141e28a447e 100644
--- a/agent/cache-types/mock_PeeringLister_test.go
+++ b/agent/cache-types/mock_PeeringLister_test.go
@@ -9,7 +9,7 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	pbpeering "github.com/hashicorp/consul/proto/private/pbpeering"
+	pbpeering "github.com/hashicorp/consul/proto/pbpeering"
 )
 
 // MockPeeringLister is an autogenerated mock type for the PeeringLister type
diff --git a/agent/cache-types/mock_TrustBundleLister_test.go b/agent/cache-types/mock_TrustBundleLister_test.go
index 08bc593371216..4fde13129d6dc 100644
--- a/agent/cache-types/mock_TrustBundleLister_test.go
+++ b/agent/cache-types/mock_TrustBundleLister_test.go
@@ -9,7 +9,7 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	pbpeering "github.com/hashicorp/consul/proto/private/pbpeering"
+	pbpeering "github.com/hashicorp/consul/proto/pbpeering"
 )
 
 // MockTrustBundleLister is an autogenerated mock type for the TrustBundleLister type
diff --git a/agent/cache-types/mock_TrustBundleReader_test.go b/agent/cache-types/mock_TrustBundleReader_test.go
index 6394b32e000a9..119f246fb1ba0 100644
--- a/agent/cache-types/mock_TrustBundleReader_test.go
+++ b/agent/cache-types/mock_TrustBundleReader_test.go
@@ -9,7 +9,7 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	pbpeering "github.com/hashicorp/consul/proto/private/pbpeering"
+	pbpeering "github.com/hashicorp/consul/proto/pbpeering"
 )
 
 // MockTrustBundleReader is an autogenerated mock type for the TrustBundleReader type
diff --git a/agent/cache-types/node_services.go b/agent/cache-types/node_services.go
index 44dd5624f5658..9856b50180c17 100644
--- a/agent/cache-types/node_services.go
+++ b/agent/cache-types/node_services.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/node_services_test.go b/agent/cache-types/node_services_test.go
index 6f16f93d5d61f..049ac3c249c79 100644
--- a/agent/cache-types/node_services_test.go
+++ b/agent/cache-types/node_services_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/norace_test.go b/agent/cache-types/norace_test.go
new file mode 100644
index 0000000000000..93645410d1b3d
--- /dev/null
+++ b/agent/cache-types/norace_test.go
@@ -0,0 +1,6 @@
+//go:build !race
+// +build !race
+
+package cachetype
+
+const testingRace = false
diff --git a/agent/cache-types/options.go b/agent/cache-types/options.go
index cd46060f8bce4..5eb6cdd9b6253 100644
--- a/agent/cache-types/options.go
+++ b/agent/cache-types/options.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/peered_upstreams.go b/agent/cache-types/peered_upstreams.go
index 964b350eb1505..6aa8a3e34a601 100644
--- a/agent/cache-types/peered_upstreams.go
+++ b/agent/cache-types/peered_upstreams.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/peered_upstreams_test.go b/agent/cache-types/peered_upstreams_test.go
index 07be6e4188082..7f8481ffc5ec4 100644
--- a/agent/cache-types/peered_upstreams_test.go
+++ b/agent/cache-types/peered_upstreams_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/peerings.go b/agent/cache-types/peerings.go
index 53138e5512d8e..9f587598844a8 100644
--- a/agent/cache-types/peerings.go
+++ b/agent/cache-types/peerings.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
@@ -17,7 +14,7 @@ import (
 	"github.com/hashicorp/consul/agent/cache"
 	external "github.com/hashicorp/consul/agent/grpc-external"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 // PeeringListName is the recommended name for registration.
diff --git a/agent/cache-types/peerings_test.go b/agent/cache-types/peerings_test.go
index 088a077c4f504..525de96ed885a 100644
--- a/agent/cache-types/peerings_test.go
+++ b/agent/cache-types/peerings_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
@@ -18,7 +15,7 @@ import (
 	"github.com/hashicorp/consul/agent/cache"
 	external "github.com/hashicorp/consul/agent/grpc-external"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 func TestPeerings(t *testing.T) {
diff --git a/agent/cache-types/prepared_query.go b/agent/cache-types/prepared_query.go
index 8a9ec7720959c..5a5230c7c232e 100644
--- a/agent/cache-types/prepared_query.go
+++ b/agent/cache-types/prepared_query.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/prepared_query_test.go b/agent/cache-types/prepared_query_test.go
index 50850c20fe9bc..c45386bd7ec94 100644
--- a/agent/cache-types/prepared_query_test.go
+++ b/agent/cache-types/prepared_query_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/race_test.go b/agent/cache-types/race_test.go
new file mode 100644
index 0000000000000..7848991f2138c
--- /dev/null
+++ b/agent/cache-types/race_test.go
@@ -0,0 +1,6 @@
+//go:build race
+// +build race
+
+package cachetype
+
+const testingRace = true
diff --git a/agent/cache-types/resolved_service_config.go b/agent/cache-types/resolved_service_config.go
index 76c333840f5d3..3065ab4eb3b12 100644
--- a/agent/cache-types/resolved_service_config.go
+++ b/agent/cache-types/resolved_service_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/resolved_service_config_test.go b/agent/cache-types/resolved_service_config_test.go
index a71cdb7834362..a945597e10126 100644
--- a/agent/cache-types/resolved_service_config_test.go
+++ b/agent/cache-types/resolved_service_config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/rpc.go b/agent/cache-types/rpc.go
index 13bfdb3e5a5d7..750e5058bcb7d 100644
--- a/agent/cache-types/rpc.go
+++ b/agent/cache-types/rpc.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import "context"
diff --git a/agent/cache-types/service_checks.go b/agent/cache-types/service_checks.go
index 55ea3896f33cb..3688db7e2ba96 100644
--- a/agent/cache-types/service_checks.go
+++ b/agent/cache-types/service_checks.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/service_checks_test.go b/agent/cache-types/service_checks_test.go
index 898ea4aa9c937..f6b5a594de30e 100644
--- a/agent/cache-types/service_checks_test.go
+++ b/agent/cache-types/service_checks_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/service_dump.go b/agent/cache-types/service_dump.go
index 60c2895aff1f5..fccd4da8aec49 100644
--- a/agent/cache-types/service_dump.go
+++ b/agent/cache-types/service_dump.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/service_dump_test.go b/agent/cache-types/service_dump_test.go
index 3570fc9720a16..b261a504609d1 100644
--- a/agent/cache-types/service_dump_test.go
+++ b/agent/cache-types/service_dump_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/service_gateways.go b/agent/cache-types/service_gateways.go
index a080fc77451ce..54ba2694978f8 100644
--- a/agent/cache-types/service_gateways.go
+++ b/agent/cache-types/service_gateways.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/service_gateways_test.go b/agent/cache-types/service_gateways_test.go
index 9f615162b6fb3..27333d68d9af3 100644
--- a/agent/cache-types/service_gateways_test.go
+++ b/agent/cache-types/service_gateways_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/testing.go b/agent/cache-types/testing.go
index 3789eff4e2a5e..c033a022d96c8 100644
--- a/agent/cache-types/testing.go
+++ b/agent/cache-types/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
diff --git a/agent/cache-types/trust_bundle.go b/agent/cache-types/trust_bundle.go
index 0bac27e2b8c23..f9015d9d259d8 100644
--- a/agent/cache-types/trust_bundle.go
+++ b/agent/cache-types/trust_bundle.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
@@ -15,7 +12,7 @@ import (
 	"github.com/hashicorp/consul/agent/cache"
 	external "github.com/hashicorp/consul/agent/grpc-external"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 // Recommended name for registration.
diff --git a/agent/cache-types/trust_bundle_test.go b/agent/cache-types/trust_bundle_test.go
index f39a15bdc6622..80347132e722c 100644
--- a/agent/cache-types/trust_bundle_test.go
+++ b/agent/cache-types/trust_bundle_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
@@ -16,7 +13,7 @@ import (
 	"github.com/hashicorp/consul/agent/cache"
 	external "github.com/hashicorp/consul/agent/grpc-external"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 func TestTrustBundle(t *testing.T) {
diff --git a/agent/cache-types/trust_bundles.go b/agent/cache-types/trust_bundles.go
index 7098c01af47ad..010848f5b8654 100644
--- a/agent/cache-types/trust_bundles.go
+++ b/agent/cache-types/trust_bundles.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
@@ -17,7 +14,7 @@ import (
 	"github.com/hashicorp/consul/agent/cache"
 	external "github.com/hashicorp/consul/agent/grpc-external"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 // Recommended name for registration.
diff --git a/agent/cache-types/trust_bundles_test.go b/agent/cache-types/trust_bundles_test.go
index f565bab18fdbf..0f104253ef5e5 100644
--- a/agent/cache-types/trust_bundles_test.go
+++ b/agent/cache-types/trust_bundles_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cachetype
 
 import (
@@ -18,7 +15,7 @@ import (
 	"github.com/hashicorp/consul/agent/cache"
 	external "github.com/hashicorp/consul/agent/grpc-external"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 func TestTrustBundles(t *testing.T) {
diff --git a/agent/cache/cache.go b/agent/cache/cache.go
index c78a3baaf0901..5871d826fde41 100644
--- a/agent/cache/cache.go
+++ b/agent/cache/cache.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // Package cache provides caching features for data from a Consul server.
 //
 // While this is similar in some ways to the "agent/ae" package, a key
@@ -32,7 +29,6 @@ import (
 	"golang.org/x/time/rate"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/cacheshim"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/lib/ttlcache"
 )
@@ -95,7 +91,7 @@ const (
 	// rate limiter settings.
 
 	// DefaultEntryFetchRate is the default rate at which cache entries can
-	// be fetch. This defaults to not being unlimited
+	// be fetch. This defaults to not being limited
 	DefaultEntryFetchRate = rate.Inf
 
 	// DefaultEntryFetchMaxBurst is the number of cache entry fetches that can
@@ -173,7 +169,32 @@ type typeEntry struct {
 
 // ResultMeta is returned from Get calls along with the value and can be used
 // to expose information about the cache status for debugging or testing.
-type ResultMeta = cacheshim.ResultMeta
+type ResultMeta struct {
+	// Hit indicates whether or not the request was a cache hit
+	Hit bool
+
+	// Age identifies how "stale" the result is. It's semantics differ based on
+	// whether or not the cache type performs background refresh or not as defined
+	// in https://www.consul.io/api/index.html#agent-caching.
+	//
+	// For background refresh types, Age is 0 unless the background blocking query
+	// is currently in a failed state and so not keeping up with the server's
+	// values. If it is non-zero it represents the time since the first failure to
+	// connect during background refresh, and is reset after a background request
+	// does manage to reconnect and either return successfully, or block for at
+	// least the yamux keepalive timeout of 30 seconds (which indicates the
+	// connection is OK but blocked as expected).
+	//
+	// For simple cache types, Age is the time since the result being returned was
+	// fetched from the servers.
+	Age time.Duration
+
+	// Index is the internal ModifyIndex for the cache entry. Not all types
+	// support blocking and all that do will likely have this in their result type
+	// already but this allows generic code to reason about whether cache values
+	// have changed.
+	Index uint64
+}
 
 // Options are options for the Cache.
 type Options struct {
@@ -512,7 +533,10 @@ RETRY_GET:
 
 	// Set our timeout channel if we must
 	if r.Info.Timeout > 0 && timeoutCh == nil {
-		timeoutCh = time.After(r.Info.Timeout)
+		timeoutTimer := time.NewTimer(r.Info.Timeout)
+		defer timeoutTimer.Stop()
+
+		timeoutCh = timeoutTimer.C
 	}
 
 	// At this point, we know we either don't have a value at all or the
diff --git a/agent/cache/cache_test.go b/agent/cache/cache_test.go
index 6a4216c85929a..6f8805be06d88 100644
--- a/agent/cache/cache_test.go
+++ b/agent/cache/cache_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cache
 
 import (
diff --git a/agent/cache/entry.go b/agent/cache/entry.go
index 9ee1fc0007fa9..0c71e94437134 100644
--- a/agent/cache/entry.go
+++ b/agent/cache/entry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cache
 
 import (
diff --git a/agent/cache/request.go b/agent/cache/request.go
index 92f5b6e1ffa68..3dc4ea86f8afa 100644
--- a/agent/cache/request.go
+++ b/agent/cache/request.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cache
 
 import (
-	"github.com/hashicorp/consul/agent/cacheshim"
+	"time"
 )
 
 // Request is a cacheable request.
@@ -13,7 +10,10 @@ import (
 // the agent/structs package.
 //
 //go:generate mockery --name Request --inpackage
-type Request = cacheshim.Request
+type Request interface {
+	// CacheInfo returns information used for caching this request.
+	CacheInfo() RequestInfo
+}
 
 // RequestInfo represents cache information for a request. The caching
 // framework uses this to control the behavior of caching and to determine
@@ -21,4 +21,53 @@ type Request = cacheshim.Request
 //
 // TODO(peering): finish ensuring everything that sets a Datacenter sets or doesn't set PeerName.
 // TODO(peering): also make sure the peer name is present in the cache key likely in lieu of the datacenter somehow.
-type RequestInfo = cacheshim.RequestInfo
+type RequestInfo struct {
+	// Key is a unique cache key for this request. This key should
+	// be globally unique to identify this request, since any conflicting
+	// cache keys could result in invalid data being returned from the cache.
+	// The Key does not need to include ACL or DC information, since the
+	// cache already partitions by these values prior to using this key.
+	Key string
+
+	// Token is the ACL token associated with this request.
+	//
+	// Datacenter is the datacenter that the request is targeting.
+	//
+	// PeerName is the peer that the request is targeting.
+	//
+	// All of these values are used to partition the cache. The cache framework
+	// today partitions data on these values to simplify behavior: by
+	// partitioning ACL tokens, the cache doesn't need to be smart about
+	// filtering results. By filtering datacenter/peer results, the cache can
+	// service the multi-DC/multi-peer nature of Consul. This comes at the expense of
+	// working set size, but in general the effect is minimal.
+	Token      string
+	Datacenter string
+	PeerName   string
+
+	// MinIndex is the minimum index being queried. This is used to
+	// determine if we already have data satisfying the query or if we need
+	// to block until new data is available. If no index is available, the
+	// default value (zero) is acceptable.
+	MinIndex uint64
+
+	// Timeout is the timeout for waiting on a blocking query. When the
+	// timeout is reached, the last known value is returned (or maybe nil
+	// if there was no prior value). This "last known value" behavior matches
+	// normal Consul blocking queries.
+	Timeout time.Duration
+
+	// MaxAge if set limits how stale a cache entry can be. If it is non-zero and
+	// there is an entry in cache that is older than specified, it is treated as a
+	// cache miss and re-fetched. It is ignored for cachetypes with Refresh =
+	// true.
+	MaxAge time.Duration
+
+	// MustRevalidate forces a new lookup of the cache even if there is an
+	// existing one that has not expired. It is implied by HTTP requests with
+	// `Cache-Control: max-age=0` but we can't distinguish that case from the
+	// unset case for MaxAge. Later we may support revalidating the index without
+	// a full re-fetch but for now the only option is to refetch. It is ignored
+	// for cachetypes with Refresh = true.
+	MustRevalidate bool
+}
diff --git a/agent/cache/testing.go b/agent/cache/testing.go
index b754dae3e76a2..bbcee6b272a04 100644
--- a/agent/cache/testing.go
+++ b/agent/cache/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cache
 
 import (
diff --git a/agent/cache/type.go b/agent/cache/type.go
index ccab3216ca837..fbe6978aa2f97 100644
--- a/agent/cache/type.go
+++ b/agent/cache/type.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cache
 
 import (
diff --git a/agent/cache/watch.go b/agent/cache/watch.go
index 111ac85acb3ef..abd247c4f1c5d 100644
--- a/agent/cache/watch.go
+++ b/agent/cache/watch.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cache
 
 import (
@@ -9,17 +6,26 @@ import (
 	"reflect"
 	"time"
 
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/agent/cacheshim"
 	"github.com/hashicorp/consul/lib"
+	"google.golang.org/protobuf/proto"
 )
 
 // UpdateEvent is a struct summarizing an update to a cache entry
-type UpdateEvent = cacheshim.UpdateEvent
+type UpdateEvent struct {
+	// CorrelationID is used by the Notify API to allow correlation of updates
+	// with specific requests. We could return the full request object and
+	// cachetype for consumers to match against the calls they made but in
+	// practice it's cleaner for them to choose the minimal necessary unique
+	// identifier given the set of things they are watching. They might even
+	// choose to assign random IDs for example.
+	CorrelationID string
+	Result        interface{}
+	Meta          ResultMeta
+	Err           error
+}
 
 // Callback is the function type accepted by NotifyCallback.
-type Callback = cacheshim.Callback
+type Callback func(ctx context.Context, event UpdateEvent)
 
 // Notify registers a desire to be updated about changes to a cache result.
 //
@@ -117,7 +123,7 @@ func (c *Cache) notifyBlockingQuery(ctx context.Context, r getOptions, correlati
 		// Check the index of the value returned in the cache entry to be sure it
 		// changed
 		if index == 0 || index < meta.Index {
-			cb(ctx, UpdateEvent{CorrelationID: correlationID, Result: res, Meta: meta, Err: err})
+			cb(ctx, UpdateEvent{correlationID, res, meta, err})
 
 			// Update index for next request
 			index = meta.Index
@@ -177,7 +183,7 @@ func (c *Cache) notifyPollingQuery(ctx context.Context, r getOptions, correlatio
 
 		// Check for a change in the value or an index change
 		if index < meta.Index || !isEqual(lastValue, res) {
-			cb(ctx, UpdateEvent{CorrelationID: correlationID, Result: res, Meta: meta, Err: err})
+			cb(ctx, UpdateEvent{correlationID, res, meta, err})
 
 			// Update index and lastValue
 			lastValue = res
diff --git a/agent/cache/watch_test.go b/agent/cache/watch_test.go
index 41c30f4dbb5cf..ecd1cc9f3b359 100644
--- a/agent/cache/watch_test.go
+++ b/agent/cache/watch_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cache
 
 import (
diff --git a/agent/cacheshim/cache.go b/agent/cacheshim/cache.go
deleted file mode 100644
index 64754da644865..0000000000000
--- a/agent/cacheshim/cache.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package cacheshim
-
-import (
-	"context"
-	"time"
-)
-
-// cacheshim defines any shared cache types for any packages that don't want to have a dependency on the agent cache.
-// This was created as part of a refactor to remove agent/leafcert package's dependency on agent/cache.
-
-type ResultMeta struct {
-	// Hit indicates whether or not the request was a cache hit
-	Hit bool
-
-	// Age identifies how "stale" the result is. It's semantics differ based on
-	// whether or not the cache type performs background refresh or not as defined
-	// in https://www.consul.io/api/index.html#agent-caching.
-	//
-	// For background refresh types, Age is 0 unless the background blocking query
-	// is currently in a failed state and so not keeping up with the server's
-	// values. If it is non-zero it represents the time since the first failure to
-	// connect during background refresh, and is reset after a background request
-	// does manage to reconnect and either return successfully, or block for at
-	// least the yamux keepalive timeout of 30 seconds (which indicates the
-	// connection is OK but blocked as expected).
-	//
-	// For simple cache types, Age is the time since the result being returned was
-	// fetched from the servers.
-	Age time.Duration
-
-	// Index is the internal ModifyIndex for the cache entry. Not all types
-	// support blocking and all that do will likely have this in their result type
-	// already but this allows generic code to reason about whether cache values
-	// have changed.
-	Index uint64
-}
-
-type Request interface {
-	// CacheInfo returns information used for caching this request.
-	CacheInfo() RequestInfo
-}
-
-type RequestInfo struct {
-	// Key is a unique cache key for this request. This key should
-	// be globally unique to identify this request, since any conflicting
-	// cache keys could result in invalid data being returned from the cache.
-	// The Key does not need to include ACL or DC information, since the
-	// cache already partitions by these values prior to using this key.
-	Key string
-
-	// Token is the ACL token associated with this request.
-	//
-	// Datacenter is the datacenter that the request is targeting.
-	//
-	// PeerName is the peer that the request is targeting.
-	//
-	// All of these values are used to partition the cache. The cache framework
-	// today partitions data on these values to simplify behavior: by
-	// partitioning ACL tokens, the cache doesn't need to be smart about
-	// filtering results. By filtering datacenter/peer results, the cache can
-	// service the multi-DC/multi-peer nature of Consul. This comes at the expense of
-	// working set size, but in general the effect is minimal.
-	Token      string
-	Datacenter string
-	PeerName   string
-
-	// MinIndex is the minimum index being queried. This is used to
-	// determine if we already have data satisfying the query or if we need
-	// to block until new data is available. If no index is available, the
-	// default value (zero) is acceptable.
-	MinIndex uint64
-
-	// Timeout is the timeout for waiting on a blocking query. When the
-	// timeout is reached, the last known value is returned (or maybe nil
-	// if there was no prior value). This "last known value" behavior matches
-	// normal Consul blocking queries.
-	Timeout time.Duration
-
-	// MaxAge if set limits how stale a cache entry can be. If it is non-zero and
-	// there is an entry in cache that is older than specified, it is treated as a
-	// cache miss and re-fetched. It is ignored for cachetypes with Refresh =
-	// true.
-	MaxAge time.Duration
-
-	// MustRevalidate forces a new lookup of the cache even if there is an
-	// existing one that has not expired. It is implied by HTTP requests with
-	// `Cache-Control: max-age=0` but we can't distinguish that case from the
-	// unset case for MaxAge. Later we may support revalidating the index without
-	// a full re-fetch but for now the only option is to refetch. It is ignored
-	// for cachetypes with Refresh = true.
-	MustRevalidate bool
-}
-
-type UpdateEvent struct {
-	// CorrelationID is used by the Notify API to allow correlation of updates
-	// with specific requests. We could return the full request object and
-	// cachetype for consumers to match against the calls they made but in
-	// practice it's cleaner for them to choose the minimal necessary unique
-	// identifier given the set of things they are watching. They might even
-	// choose to assign random IDs for example.
-	CorrelationID string
-	Result        interface{}
-	Meta          ResultMeta
-	Err           error
-}
-
-type Callback func(ctx context.Context, event UpdateEvent)
-
-type Cache interface {
-	Get(ctx context.Context, t string, r Request) (interface{}, ResultMeta, error)
-	NotifyCallback(ctx context.Context, t string, r Request, correlationID string, cb Callback) error
-	Notify(ctx context.Context, t string, r Request, correlationID string, ch chan<- UpdateEvent) error
-}
-
-const ConnectCARootName = "connect-ca-root"
diff --git a/agent/catalog_endpoint.go b/agent/catalog_endpoint.go
index 1dac61befa475..3e722e2860599 100644
--- a/agent/catalog_endpoint.go
+++ b/agent/catalog_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -573,34 +570,3 @@ RETRY_ONCE:
 		s.nodeMetricsLabels())
 	return out.Services, nil
 }
-
-func (s *HTTPHandlers) AssignManualServiceVIPs(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
-	metrics.IncrCounterWithLabels([]string{"client", "api", "service_virtual_ips"}, 1,
-		s.nodeMetricsLabels())
-
-	var args structs.AssignServiceManualVIPsRequest
-	if err := s.parseEntMetaNoWildcard(req, &args.EnterpriseMeta); err != nil {
-		return nil, err
-	}
-
-	if err := s.rewordUnknownEnterpriseFieldError(decodeBody(req.Body, &args)); err != nil {
-		return nil, HTTPError{StatusCode: http.StatusBadRequest, Reason: fmt.Sprintf("Request decode failed: %v", err)}
-	}
-
-	// Setup the default DC if not provided
-	if args.Datacenter == "" {
-		args.Datacenter = s.agent.config.Datacenter
-	}
-	s.parseToken(req, &args.Token)
-
-	// Forward to the servers
-	var out structs.AssignServiceManualVIPsResponse
-	if err := s.agent.RPC(req.Context(), "Internal.AssignManualServiceVIPs", &args, &out); err != nil {
-		metrics.IncrCounterWithLabels([]string{"client", "rpc", "error", "service_virtual_ips"}, 1,
-			s.nodeMetricsLabels())
-		return nil, err
-	}
-	metrics.IncrCounterWithLabels([]string{"client", "api", "success", "service_virtual_ips"}, 1,
-		s.nodeMetricsLabels())
-	return out, nil
-}
diff --git a/agent/catalog_endpoint_ce.go b/agent/catalog_endpoint_ce.go
index 68433e2196d7c..da27ab476a7f8 100644
--- a/agent/catalog_endpoint_ce.go
+++ b/agent/catalog_endpoint_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
diff --git a/agent/catalog_endpoint_test.go b/agent/catalog_endpoint_test.go
index 19d520220427c..b0a5922e0f95a 100644
--- a/agent/catalog_endpoint_test.go
+++ b/agent/catalog_endpoint_test.go
@@ -1,73 +1,26 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
 	"context"
 	"fmt"
-	"io"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
-	"strings"
 	"testing"
 	"time"
 
+	"github.com/hashicorp/consul/acl"
+	"github.com/hashicorp/consul/api"
+
 	"github.com/hashicorp/serf/coordinate"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/consul/testrpc"
 )
 
-func TestCatalogEndpointsFailInV2(t *testing.T) {
-	t.Parallel()
-
-	a := NewTestAgent(t, `experiments = ["resource-apis"]`)
-
-	checkRequest := func(method, url string) {
-		t.Run(method+" "+url, func(t *testing.T) {
-			assertV1CatalogEndpointDoesNotWorkWithV2(t, a, method, url, "{}")
-		})
-	}
-
-	checkRequest("PUT", "/v1/catalog/register")
-	checkRequest("GET", "/v1/catalog/connect/")
-	checkRequest("PUT", "/v1/catalog/deregister")
-	checkRequest("GET", "/v1/catalog/datacenters")
-	checkRequest("GET", "/v1/catalog/nodes")
-	checkRequest("GET", "/v1/catalog/services")
-	checkRequest("GET", "/v1/catalog/service/")
-	checkRequest("GET", "/v1/catalog/node/")
-	checkRequest("GET", "/v1/catalog/node-services/")
-	checkRequest("GET", "/v1/catalog/gateway-services/")
-}
-
-func assertV1CatalogEndpointDoesNotWorkWithV2(t *testing.T, a *TestAgent, method, url string, requestBody string) {
-	var body io.Reader
-	switch method {
-	case http.MethodPost, http.MethodPut:
-		body = strings.NewReader(requestBody + "\n")
-	}
-
-	req, err := http.NewRequest(method, url, body)
-	require.NoError(t, err)
-
-	resp := httptest.NewRecorder()
-	a.srv.h.ServeHTTP(resp, req)
-	require.Equal(t, http.StatusBadRequest, resp.Code)
-
-	got, err := io.ReadAll(resp.Body)
-	require.NoError(t, err)
-
-	require.Contains(t, string(got), structs.ErrUsingV2CatalogExperiment.Error())
-}
-
 func TestCatalogRegister_PeeringRegistration(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
@@ -2072,67 +2025,3 @@ func TestCatalog_GatewayServices_Ingress(t *testing.T) {
 		require.Equal(r, expect, gatewayServices)
 	})
 }
-
-func TestCatalogRegister_AssignManualServiceVIPs(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-	a := NewTestAgent(t, "")
-	defer a.Shutdown()
-
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1")
-
-	for _, service := range []string{"api", "web"} {
-		req := structs.ConfigEntryRequest{
-			Datacenter: "dc1",
-			Entry: &structs.ServiceResolverConfigEntry{
-				Kind: structs.ServiceResolver,
-				Name: service,
-			},
-		}
-		var out bool
-		require.NoError(t, a.RPC(context.Background(), "ConfigEntry.Apply", &req, &out))
-	}
-
-	assignVIPs := func(req structs.AssignServiceManualVIPsRequest, expect structs.AssignServiceManualVIPsResponse) {
-		httpReq, _ := http.NewRequest("PUT", "/v1/internal/service-virtual-ip", jsonReader(req))
-		resp := httptest.NewRecorder()
-		obj, err := a.srv.AssignManualServiceVIPs(resp, httpReq)
-		require.NoError(t, err)
-
-		result, ok := obj.(structs.AssignServiceManualVIPsResponse)
-		require.True(t, ok)
-		require.Equal(t, expect, result)
-	}
-
-	// Assign some manual IPs to the service
-	assignVIPs(structs.AssignServiceManualVIPsRequest{
-		Service:    "api",
-		ManualVIPs: []string{"1.1.1.1", "2.2.2.2", "3.3.3.3"},
-	}, structs.AssignServiceManualVIPsResponse{
-		Found: true,
-	})
-
-	// Assign some manual IPs to the new service, reassigning one from the existing service.
-	assignVIPs(structs.AssignServiceManualVIPsRequest{
-		Service:    "web",
-		ManualVIPs: []string{"2.2.2.2", "4.4.4.4"},
-	}, structs.AssignServiceManualVIPsResponse{
-		Found: true,
-		UnassignedFrom: []structs.PeeredServiceName{
-			{
-				ServiceName: structs.ServiceName{Name: "api", EnterpriseMeta: *acl.DefaultEnterpriseMeta()},
-			},
-		},
-	})
-
-	// Assign some manual IPs a non-existent service, should be a no-op.
-	assignVIPs(structs.AssignServiceManualVIPsRequest{
-		Service:    "nope",
-		ManualVIPs: []string{"1.1.1.1", "2.2.2.2", "3.3.3.3", "4.4.4.4"},
-	}, structs.AssignServiceManualVIPsResponse{
-		Found: false,
-	})
-}
diff --git a/agent/check.go b/agent/check.go
index 078361be66010..da70a80053e2e 100644
--- a/agent/check.go
+++ b/agent/check.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/checks/alias.go b/agent/checks/alias.go
index f75c05b9580bb..a301daa4fa063 100644
--- a/agent/checks/alias.go
+++ b/agent/checks/alias.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package checks
 
 import (
diff --git a/agent/checks/alias_test.go b/agent/checks/alias_test.go
index 1f5662019929a..4f77e7495ee2c 100644
--- a/agent/checks/alias_test.go
+++ b/agent/checks/alias_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package checks
 
 import (
diff --git a/agent/checks/check.go b/agent/checks/check.go
index cabecddcf5a21..2eb200dd85161 100644
--- a/agent/checks/check.go
+++ b/agent/checks/check.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package checks
 
 import (
@@ -625,20 +622,19 @@ func (c *CheckH2PING) Start() {
 	go c.run()
 }
 
-// CheckTCP is used to periodically make a TCP connection to determine the
-// health of a given check.
+// CheckTCP is used to periodically make an TCP/UDP connection to
+// determine the health of a given check.
 // The check is passing if the connection succeeds
 // The check is critical if the connection returns an error
 // Supports failures_before_critical and success_before_passing.
 type CheckTCP struct {
-	CheckID         structs.CheckID
-	ServiceID       structs.ServiceID
-	TCP             string
-	Interval        time.Duration
-	Timeout         time.Duration
-	Logger          hclog.Logger
-	TLSClientConfig *tls.Config
-	StatusHandler   *StatusHandler
+	CheckID       structs.CheckID
+	ServiceID     structs.ServiceID
+	TCP           string
+	Interval      time.Duration
+	Timeout       time.Duration
+	Logger        hclog.Logger
+	StatusHandler *StatusHandler
 
 	dialer   *net.Dialer
 	stop     bool
@@ -695,30 +691,17 @@ func (c *CheckTCP) run() {
 
 // check is invoked periodically to perform the TCP check
 func (c *CheckTCP) check() {
-	var conn io.Closer
-	var err error
-	var checkType string
-
-	if c.TLSClientConfig == nil {
-		conn, err = c.dialer.Dial(`tcp`, c.TCP)
-		checkType = "TCP"
-	} else {
-		conn, err = tls.DialWithDialer(c.dialer, `tcp`, c.TCP, c.TLSClientConfig)
-		checkType = "TCP+TLS"
-	}
-
+	conn, err := c.dialer.Dial(`tcp`, c.TCP)
 	if err != nil {
-		c.Logger.Warn(fmt.Sprintf("Check %s connection failed", checkType),
+		c.Logger.Warn("Check socket connection failed",
 			"check", c.CheckID.String(),
 			"error", err,
 		)
 		c.StatusHandler.updateCheck(c.CheckID, api.HealthCritical, err.Error())
 		return
 	}
-
 	conn.Close()
-	c.StatusHandler.updateCheck(c.CheckID, api.HealthPassing, fmt.Sprintf("%s connect %s: Success", checkType, c.TCP))
-
+	c.StatusHandler.updateCheck(c.CheckID, api.HealthPassing, fmt.Sprintf("TCP connect %s: Success", c.TCP))
 }
 
 // CheckUDP is used to periodically send a UDP datagram to determine the health of a given check.
diff --git a/agent/checks/check_test.go b/agent/checks/check_test.go
index ae53b477f5554..a4bdf2ca3ed7f 100644
--- a/agent/checks/check_test.go
+++ b/agent/checks/check_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package checks
 
 import (
diff --git a/agent/checks/check_windows_test.go b/agent/checks/check_windows_test.go
index 2f6d40f243648..c0f59a3fc9d0a 100644
--- a/agent/checks/check_windows_test.go
+++ b/agent/checks/check_windows_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build windows
+// +build windows
 
 package checks
 
diff --git a/agent/checks/docker.go b/agent/checks/docker.go
index e3483e073b037..17974b96822d2 100644
--- a/agent/checks/docker.go
+++ b/agent/checks/docker.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package checks
 
 import (
diff --git a/agent/checks/docker_unix.go b/agent/checks/docker_unix.go
index 6d169f2bbc3cd..528cb7d851ae7 100644
--- a/agent/checks/docker_unix.go
+++ b/agent/checks/docker_unix.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !windows
+// +build !windows
 
 package checks
 
diff --git a/agent/checks/docker_windows.go b/agent/checks/docker_windows.go
index 6008b695ba1b0..c2b1e173d44bc 100644
--- a/agent/checks/docker_windows.go
+++ b/agent/checks/docker_windows.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package checks
 
 const DefaultDockerHost = "npipe:////./pipe/docker_engine"
diff --git a/agent/checks/grpc.go b/agent/checks/grpc.go
index b3bcba20b5a61..578b496f55ede 100644
--- a/agent/checks/grpc.go
+++ b/agent/checks/grpc.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package checks
 
 import (
diff --git a/agent/checks/grpc_test.go b/agent/checks/grpc_test.go
index e67b453bda62a..6db78bfa5a0bd 100644
--- a/agent/checks/grpc_test.go
+++ b/agent/checks/grpc_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package checks
 
 import (
diff --git a/agent/checks/os_service.go b/agent/checks/os_service.go
index 3350c73a2c3b4..4473c2c23a79b 100644
--- a/agent/checks/os_service.go
+++ b/agent/checks/os_service.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package checks
 
 import (
diff --git a/agent/checks/os_service_unix.go b/agent/checks/os_service_unix.go
index 4c61ac0babc7e..dfb4a6509ec6d 100644
--- a/agent/checks/os_service_unix.go
+++ b/agent/checks/os_service_unix.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !windows
+// +build !windows
 
 package checks
 
diff --git a/agent/checks/os_service_windows.go b/agent/checks/os_service_windows.go
index f142ea698ec5c..1587133812a6d 100644
--- a/agent/checks/os_service_windows.go
+++ b/agent/checks/os_service_windows.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build windows
+// +build windows
 
 package checks
 
diff --git a/agent/config/agent_limits.go b/agent/config/agent_limits.go
index 7abbb075d3166..71924f7e7b756 100644
--- a/agent/config/agent_limits.go
+++ b/agent/config/agent_limits.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
diff --git a/agent/config/builder.go b/agent/config/builder.go
index c7fdcb7dd7c98..33fcdfe1d345a 100644
--- a/agent/config/builder.go
+++ b/agent/config/builder.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
@@ -457,14 +454,6 @@ func (b *builder) build() (rt RuntimeConfig, err error) {
 	sidecarMaxPort := b.portVal("ports.sidecar_max_port", c.Ports.SidecarMaxPort)
 	exposeMinPort := b.portVal("ports.expose_min_port", c.Ports.ExposeMinPort)
 	exposeMaxPort := b.portVal("ports.expose_max_port", c.Ports.ExposeMaxPort)
-	if serverPort <= 0 {
-		return RuntimeConfig{}, fmt.Errorf(
-			"server-port must be greater than zero")
-	}
-	if serfPortLAN <= 0 {
-		return RuntimeConfig{}, fmt.Errorf(
-			"serf-lan-port must be greater than zero")
-	}
 	if proxyMaxPort < proxyMinPort {
 		return RuntimeConfig{}, fmt.Errorf(
 			"proxy_min_port must be less than proxy_max_port. To disable, set both to zero.")
@@ -828,7 +817,6 @@ func (b *builder) build() (rt RuntimeConfig, err error) {
 		Version:                    stringVal(c.Version),
 		VersionPrerelease:          stringVal(c.VersionPrerelease),
 		VersionMetadata:            stringVal(c.VersionMetadata),
-		Experiments:                c.Experiments,
 		// What is a sensible default for BuildDate?
 		BuildDate: timeValWithDefault(c.BuildDate, time.Date(1970, 1, 00, 00, 00, 01, 0, time.UTC)),
 
@@ -844,7 +832,6 @@ func (b *builder) build() (rt RuntimeConfig, err error) {
 		// gossip configuration
 		GossipLANGossipInterval: b.durationVal("gossip_lan..gossip_interval", c.GossipLAN.GossipInterval),
 		GossipLANGossipNodes:    intVal(c.GossipLAN.GossipNodes),
-		Locality:                c.Locality,
 		GossipLANProbeInterval:  b.durationVal("gossip_lan..probe_interval", c.GossipLAN.ProbeInterval),
 		GossipLANProbeTimeout:   b.durationVal("gossip_lan..probe_timeout", c.GossipLAN.ProbeTimeout),
 		GossipLANSuspicionMult:  intVal(c.GossipLAN.SuspicionMult),
@@ -882,7 +869,6 @@ func (b *builder) build() (rt RuntimeConfig, err error) {
 			ACLAgentRecoveryToken:          stringVal(c.ACL.Tokens.AgentRecovery),
 			ACLReplicationToken:            stringVal(c.ACL.Tokens.Replication),
 			ACLConfigFileRegistrationToken: stringVal(c.ACL.Tokens.ConfigFileRegistration),
-			ACLDNSToken:                    stringVal(c.ACL.Tokens.DNS),
 		},
 
 		// Autopilot
@@ -1135,15 +1121,6 @@ func (b *builder) build() (rt RuntimeConfig, err error) {
 		return RuntimeConfig{}, fmt.Errorf("cache.entry_fetch_rate must be strictly positive, was: %v", rt.Cache.EntryFetchRate)
 	}
 
-	// TODO(CC-6389): Remove once resource-apis is no longer considered experimental and is supported by HCP
-	if stringslice.Contains(rt.Experiments, consul.CatalogResourceExperimentName) && rt.IsCloudEnabled() {
-		// Allow override of this check for development/testing purposes. Should not be used in production
-		override, err := strconv.ParseBool(os.Getenv("CONSUL_OVERRIDE_HCP_RESOURCE_APIS_CHECK"))
-		if err != nil || !override {
-			return RuntimeConfig{}, fmt.Errorf("`experiments` cannot include 'resource-apis' when HCP `cloud` configuration is set")
-		}
-	}
-
 	if rt.UIConfig.MetricsProvider == "prometheus" {
 		// Handle defaulting for the built-in version of prometheus.
 		if len(rt.UIConfig.MetricsProxy.PathAllowlist) == 0 {
@@ -1300,10 +1277,6 @@ func (b *builder) validate(rt RuntimeConfig) error {
 			"1 and 63 bytes.", rt.NodeName)
 	}
 
-	if err := rt.StructLocality().Validate(); err != nil {
-		return fmt.Errorf("locality is invalid: %s", err)
-	}
-
 	if ipaddr.IsAny(rt.AdvertiseAddrLAN.IP) {
 		return fmt.Errorf("Advertise address cannot be 0.0.0.0, :: or [::]")
 	}
@@ -1414,7 +1387,7 @@ func (b *builder) validate(rt RuntimeConfig) error {
 
 		// Raft LogStore validation
 		if rt.RaftLogStoreConfig.Backend != consul.LogStoreBackendBoltDB &&
-			rt.RaftLogStoreConfig.Backend != consul.LogStoreBackendWAL && rt.RaftLogStoreConfig.Backend != consul.LogStoreBackendDefault {
+			rt.RaftLogStoreConfig.Backend != consul.LogStoreBackendWAL {
 			return fmt.Errorf("raft_logstore.backend must be one of '%s' or '%s'",
 				consul.LogStoreBackendBoltDB, consul.LogStoreBackendWAL)
 		}
@@ -1483,7 +1456,7 @@ func (b *builder) validate(rt RuntimeConfig) error {
 				return err
 			}
 		case structs.VaultCAProvider:
-			if _, err := ca.ParseVaultCAConfig(rt.ConnectCAConfig, rt.PrimaryDatacenter == rt.Datacenter); err != nil {
+			if _, err := ca.ParseVaultCAConfig(rt.ConnectCAConfig); err != nil {
 				return err
 			}
 		case structs.AWSCAProvider:
@@ -1628,7 +1601,6 @@ func (b *builder) checkVal(v *CheckDefinition) *structs.CheckDefinition {
 		Body:                           stringVal(v.Body),
 		DisableRedirects:               boolVal(v.DisableRedirects),
 		TCP:                            stringVal(v.TCP),
-		TCPUseTLS:                      boolVal(v.TCPUseTLS),
 		UDP:                            stringVal(v.UDP),
 		Interval:                       b.durationVal(fmt.Sprintf("check[%s].interval", id), v.Interval),
 		DockerContainerID:              stringVal(v.DockerContainerID),
@@ -2560,7 +2532,7 @@ func (b *builder) cloudConfigVal(v Config) hcpconfig.CloudConfig {
 	val := hcpconfig.CloudConfig{
 		ResourceID: os.Getenv("HCP_RESOURCE_ID"),
 	}
-	// Node id might get overridden in setup.go:142
+	// Node id might get overriden in setup.go:142
 	nodeID := stringVal(v.NodeID)
 	val.NodeID = types.NodeID(nodeID)
 	val.NodeName = b.nodeName(v.NodeName)
@@ -2664,10 +2636,10 @@ func (b *builder) buildTLSConfig(rt RuntimeConfig, t TLS) (tlsutil.Config, error
 		return c, errors.New("verify_outgoing is not valid in the tls.grpc stanza")
 	}
 
-	// Similarly, only the internal RPC and defaults configuration honor VerifyServerHostname
+	// Similarly, only the internal RPC configuration honors VerifyServerHostname
 	// so we call it out here too.
-	if t.GRPC.VerifyServerHostname != nil || t.HTTPS.VerifyServerHostname != nil {
-		return c, errors.New("verify_server_hostname is only valid in the tls.defaults and tls.internal_rpc stanzas")
+	if t.Defaults.VerifyServerHostname != nil || t.GRPC.VerifyServerHostname != nil || t.HTTPS.VerifyServerHostname != nil {
+		return c, errors.New("verify_server_hostname is only valid in the tls.internal_rpc stanza")
 	}
 
 	// And UseAutoCert right now only applies to external gRPC interface.
@@ -2717,11 +2689,8 @@ func (b *builder) buildTLSConfig(rt RuntimeConfig, t TLS) (tlsutil.Config, error
 	}
 
 	mapCommon("internal_rpc", t.InternalRPC, &c.InternalRPC)
+	c.InternalRPC.VerifyServerHostname = boolVal(t.InternalRPC.VerifyServerHostname)
 
-	c.InternalRPC.VerifyServerHostname = boolVal(t.Defaults.VerifyServerHostname)
-	if t.InternalRPC.VerifyServerHostname != nil {
-		c.InternalRPC.VerifyServerHostname = boolVal(t.InternalRPC.VerifyServerHostname)
-	}
 	// Setting only verify_server_hostname is documented to imply verify_outgoing.
 	// If it doesn't then we risk sending communication over plain TCP when we
 	// documented it as forcing TLS for RPCs. Enforce this here rather than in
@@ -2782,7 +2751,7 @@ func (b *builder) parsePrefixFilter(telemetry *Telemetry) ([]string, []string) {
 func (b *builder) raftLogStoreConfigVal(raw *RaftLogStoreRaw) consul.RaftLogStoreConfig {
 	var cfg consul.RaftLogStoreConfig
 	if raw != nil {
-		cfg.Backend = stringValWithDefault(raw.Backend, consul.LogStoreBackendDefault)
+		cfg.Backend = stringValWithDefault(raw.Backend, consul.LogStoreBackendBoltDB)
 		cfg.DisableLogCache = boolVal(raw.DisableLogCache)
 
 		cfg.Verification.Enabled = boolVal(raw.Verification.Enabled)
diff --git a/agent/config/builder_ce.go b/agent/config/builder_ce.go
index 068e02f0ce8b1..cfe05b5fd9d1a 100644
--- a/agent/config/builder_ce.go
+++ b/agent/config/builder_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package config
 
diff --git a/agent/config/builder_ce_test.go b/agent/config/builder_ce_test.go
index 9c3114ddc18ea..1fdba09e6028b 100644
--- a/agent/config/builder_ce_test.go
+++ b/agent/config/builder_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package config
 
diff --git a/agent/config/builder_test.go b/agent/config/builder_test.go
index 6f8fdc9598a0f..16bacbedffeb4 100644
--- a/agent/config/builder_test.go
+++ b/agent/config/builder_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
@@ -575,72 +572,3 @@ func TestBuidler_hostMetricsWithCloud(t *testing.T) {
 	require.NotNil(t, cfg)
 	require.True(t, cfg.Telemetry.EnableHostMetrics)
 }
-
-func TestBuilder_WarnCloudConfigWithResourceApis(t *testing.T) {
-	tests := []struct {
-		name      string
-		hcl       string
-		expectErr bool
-		override  bool
-	}{
-		{
-			name: "base_case",
-			hcl:  ``,
-		},
-		{
-			name: "resource-apis_no_cloud",
-			hcl:  `experiments = ["resource-apis"]`,
-		},
-		{
-			name: "cloud-config_no_experiments",
-			hcl:  `cloud{ resource_id = "abc" client_id = "abc" client_secret = "abc"}`,
-		},
-		{
-			name: "cloud-config_resource-apis_experiment",
-			hcl: `
-			experiments = ["resource-apis"]
-			cloud{ resource_id = "abc" client_id = "abc" client_secret = "abc"}`,
-			expectErr: true,
-		},
-		{
-			name: "cloud-config_other_experiment",
-			hcl: `
-			experiments = ["test"]
-			cloud{ resource_id = "abc" client_id = "abc" client_secret = "abc"}`,
-		},
-		{
-			name: "cloud-config_resource-apis_experiment_override",
-			hcl: `
-			experiments = ["resource-apis"]
-			cloud{ resource_id = "abc" client_id = "abc" client_secret = "abc"}`,
-			override: true,
-		},
-	}
-	for _, tc := range tests {
-		// using dev mode skips the need for a data dir
-		devMode := true
-		builderOpts := LoadOpts{
-			DevMode: &devMode,
-			Overrides: []Source{
-				FileSource{
-					Name:   "overrides",
-					Format: "hcl",
-					Data:   tc.hcl,
-				},
-			},
-		}
-		if tc.override {
-			os.Setenv("CONSUL_OVERRIDE_HCP_RESOURCE_APIS_CHECK", "1")
-		}
-		_, err := Load(builderOpts)
-		if tc.override {
-			os.Unsetenv("CONSUL_OVERRIDE_HCP_RESOURCE_APIS_CHECK")
-		}
-		if tc.expectErr {
-			require.Error(t, err)
-			require.Contains(t, err.Error(), "cannot include 'resource-apis' when HCP")
-		} else {
-			require.NoError(t, err)
-		}
-	}
-}
diff --git a/agent/config/config.deepcopy.go b/agent/config/config.deepcopy.go
index 2a5ebfce276c7..447277fd56237 100644
--- a/agent/config/config.deepcopy.go
+++ b/agent/config/config.deepcopy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // generated by deep-copy -pointer-receiver -o ./config.deepcopy.go -type RuntimeConfig ./; DO NOT EDIT.
 
 package config
@@ -951,18 +948,6 @@ func (o *RuntimeConfig) DeepCopy() *RuntimeConfig {
 		cp.HTTPSAddrs = make([]net.Addr, len(o.HTTPSAddrs))
 		copy(cp.HTTPSAddrs, o.HTTPSAddrs)
 	}
-	if o.Locality != nil {
-		cp.Locality = new(Locality)
-		*cp.Locality = *o.Locality
-		if o.Locality.Region != nil {
-			cp.Locality.Region = new(string)
-			*cp.Locality.Region = *o.Locality.Region
-		}
-		if o.Locality.Zone != nil {
-			cp.Locality.Zone = new(string)
-			*cp.Locality.Zone = *o.Locality.Zone
-		}
-	}
 	if o.NodeMeta != nil {
 		cp.NodeMeta = make(map[string]string, len(o.NodeMeta))
 		for k2, v2 := range o.NodeMeta {
@@ -1136,9 +1121,5 @@ func (o *RuntimeConfig) DeepCopy() *RuntimeConfig {
 			}
 		}
 	}
-	if o.Experiments != nil {
-		cp.Experiments = make([]string, len(o.Experiments))
-		copy(cp.Experiments, o.Experiments)
-	}
 	return &cp
 }
diff --git a/agent/config/config.go b/agent/config/config.go
index 816f7ae85f172..8e7e7330e6c53 100644
--- a/agent/config/config.go
+++ b/agent/config/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
@@ -183,14 +180,12 @@ type Config struct {
 	EncryptKey                       *string             `mapstructure:"encrypt" json:"encrypt,omitempty"`
 	EncryptVerifyIncoming            *bool               `mapstructure:"encrypt_verify_incoming" json:"encrypt_verify_incoming,omitempty"`
 	EncryptVerifyOutgoing            *bool               `mapstructure:"encrypt_verify_outgoing" json:"encrypt_verify_outgoing,omitempty"`
-	Experiments                      []string            `mapstructure:"experiments" json:"experiments,omitempty"`
 	GossipLAN                        GossipLANConfig     `mapstructure:"gossip_lan" json:"-"`
 	GossipWAN                        GossipWANConfig     `mapstructure:"gossip_wan" json:"-"`
 	HTTPConfig                       HTTPConfig          `mapstructure:"http_config" json:"-"`
 	LeaveOnTerm                      *bool               `mapstructure:"leave_on_terminate" json:"leave_on_terminate,omitempty"`
 	LicensePath                      *string             `mapstructure:"license_path" json:"license_path,omitempty"`
 	Limits                           Limits              `mapstructure:"limits" json:"-"`
-	Locality                         *Locality           `mapstructure:"locality" json:"-"`
 	LogLevel                         *string             `mapstructure:"log_level" json:"log_level,omitempty"`
 	LogJSON                          *bool               `mapstructure:"log_json" json:"log_json,omitempty"`
 	LogFile                          *string             `mapstructure:"log_file" json:"log_file,omitempty"`
@@ -320,15 +315,6 @@ type GossipWANConfig struct {
 	RetransmitMult *int    `mapstructure:"retransmit_mult"`
 }
 
-// Locality identifies where a given entity is running.
-type Locality struct {
-	// Region is region the zone belongs to.
-	Region *string `mapstructure:"region"`
-
-	// Zone is the zone the entity is running in.
-	Zone *string `mapstructure:"zone"`
-}
-
 type Consul struct {
 	Coordinate struct {
 		UpdateBatchSize  *int    `mapstructure:"update_batch_size"`
@@ -423,7 +409,6 @@ type CheckDefinition struct {
 	DisableRedirects               *bool               `mapstructure:"disable_redirects"`
 	OutputMaxSize                  *int                `mapstructure:"output_max_size"`
 	TCP                            *string             `mapstructure:"tcp"`
-	TCPUseTLS                      *bool               `mapstructure:"tcp_use_tls"`
 	UDP                            *string             `mapstructure:"udp"`
 	Interval                       *string             `mapstructure:"interval"`
 	DockerContainerID              *string             `mapstructure:"docker_container_id" alias:"dockercontainerid"`
@@ -778,7 +763,6 @@ type Tokens struct {
 	Default                *string `mapstructure:"default"`
 	Agent                  *string `mapstructure:"agent"`
 	ConfigFileRegistration *string `mapstructure:"config_file_service_registration"`
-	DNS                    *string `mapstructure:"dns"`
 
 	// Enterprise Only
 	ManagedServiceProvider []ServiceProviderToken `mapstructure:"managed_service_provider"`
@@ -810,9 +794,8 @@ type ConfigEntries struct {
 
 // Audit allows us to enable and define destinations for auditing
 type Audit struct {
-	Enabled    *bool                `mapstructure:"enabled"`
-	Sinks      map[string]AuditSink `mapstructure:"sink"`
-	RPCEnabled *bool                `mapstructure:"rpc_enabled"`
+	Enabled *bool                `mapstructure:"enabled"`
+	Sinks   map[string]AuditSink `mapstructure:"sink"`
 }
 
 // AuditSink can be provided multiple times to define pipelines for auditing
diff --git a/agent/config/config_ce.go b/agent/config/config_ce.go
index a60a49be25db5..5a297cacccfc8 100644
--- a/agent/config/config_ce.go
+++ b/agent/config/config_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package config
 
diff --git a/agent/config/deep-copy.sh b/agent/config/deep-copy.sh
index 159dcf9535d6b..f69b95da931dc 100644
--- a/agent/config/deep-copy.sh
+++ b/agent/config/deep-copy.sh
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
 
 readonly PACKAGE_DIR="$(dirname "${BASH_SOURCE[0]}")"
 cd $PACKAGE_DIR
diff --git a/agent/config/default.go b/agent/config/default.go
index cb71d4eedefd9..8ef20942efdb1 100644
--- a/agent/config/default.go
+++ b/agent/config/default.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
@@ -145,6 +142,7 @@ func DefaultSource() Source {
 		raft_snapshot_interval =  "` + cfg.RaftConfig.SnapshotInterval.String() + `"
 		raft_trailing_logs = ` + strconv.Itoa(int(cfg.RaftConfig.TrailingLogs)) + `
 		raft_logstore {
+			backend = "boltdb"
 			wal {
 				segment_size_mb = 64
 			}
@@ -208,7 +206,6 @@ func DevSource() Source {
 		ports = {
 			grpc = 8502
 		}
-		experiments = []
 	`,
 	}
 }
diff --git a/agent/config/default_ce.go b/agent/config/default_ce.go
index 34caf4b52b71a..d98e27bcb298e 100644
--- a/agent/config/default_ce.go
+++ b/agent/config/default_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package config
 
diff --git a/agent/config/deprecated.go b/agent/config/deprecated.go
index 921e3329ffa6b..1b4b32e248f86 100644
--- a/agent/config/deprecated.go
+++ b/agent/config/deprecated.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
diff --git a/agent/config/deprecated_test.go b/agent/config/deprecated_test.go
index 8d03e431f7afb..3e773593dfeb0 100644
--- a/agent/config/deprecated_test.go
+++ b/agent/config/deprecated_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
diff --git a/agent/config/doc.go b/agent/config/doc.go
index 5bfc77d902528..b695c1c769852 100644
--- a/agent/config/doc.go
+++ b/agent/config/doc.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // Package config contains the command line and config file code for the
 // consul agent.
 //
diff --git a/agent/config/file_watcher.go b/agent/config/file_watcher.go
index 2afe19b1a659a..f0458af5f55c5 100644
--- a/agent/config/file_watcher.go
+++ b/agent/config/file_watcher.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
diff --git a/agent/config/file_watcher_test.go b/agent/config/file_watcher_test.go
index f937d1401195a..52abb1328de2b 100644
--- a/agent/config/file_watcher_test.go
+++ b/agent/config/file_watcher_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
diff --git a/agent/config/flags.go b/agent/config/flags.go
index b56a162287c0c..f6cb131d7ee7a 100644
--- a/agent/config/flags.go
+++ b/agent/config/flags.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
diff --git a/agent/config/flags_test.go b/agent/config/flags_test.go
index a6c9ee23bd4aa..ebefa6806befa 100644
--- a/agent/config/flags_test.go
+++ b/agent/config/flags_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
diff --git a/agent/config/flagset.go b/agent/config/flagset.go
index af1b06d70ce9a..2b56dfd423b43 100644
--- a/agent/config/flagset.go
+++ b/agent/config/flagset.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
diff --git a/agent/config/golden_test.go b/agent/config/golden_test.go
index a9ce20d7bd1af..da49f3fce4dd1 100644
--- a/agent/config/golden_test.go
+++ b/agent/config/golden_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
diff --git a/agent/config/limits.go b/agent/config/limits.go
index baad156e63c5d..f1ff5e7f5b02d 100644
--- a/agent/config/limits.go
+++ b/agent/config/limits.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !windows
+// +build !windows
 
 package config
 
diff --git a/agent/config/limits_windows.go b/agent/config/limits_windows.go
index f0efc27eaf9a0..1e6e1822fb9d3 100644
--- a/agent/config/limits_windows.go
+++ b/agent/config/limits_windows.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build windows
+// +build windows
 
 package config
 
diff --git a/agent/config/merge.go b/agent/config/merge.go
index 64c7c1e974964..a743891f4a27f 100644
--- a/agent/config/merge.go
+++ b/agent/config/merge.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
diff --git a/agent/config/merge_test.go b/agent/config/merge_test.go
index 9c2e2a1a07363..4de92a24fa825 100644
--- a/agent/config/merge_test.go
+++ b/agent/config/merge_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
diff --git a/agent/config/ratelimited_file_watcher.go b/agent/config/ratelimited_file_watcher.go
index 41f894837035f..a47f9733d8c7c 100644
--- a/agent/config/ratelimited_file_watcher.go
+++ b/agent/config/ratelimited_file_watcher.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
diff --git a/agent/config/ratelimited_file_watcher_test.go b/agent/config/ratelimited_file_watcher_test.go
index 8e4415aaa8712..ee1ecb8bb02de 100644
--- a/agent/config/ratelimited_file_watcher_test.go
+++ b/agent/config/ratelimited_file_watcher_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
diff --git a/agent/config/runtime.go b/agent/config/runtime.go
index 18278b08b1ac8..d5159ee6e5919 100644
--- a/agent/config/runtime.go
+++ b/agent/config/runtime.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
@@ -799,8 +796,6 @@ type RuntimeConfig struct {
 	// hcl: leave_on_terminate = (true|false)
 	LeaveOnTerm bool
 
-	Locality *Locality
-
 	// Logging configuration used to initialize agent logging.
 	Logging logging.Config
 
@@ -1498,9 +1493,6 @@ type RuntimeConfig struct {
 
 	Reporting ReportingConfig
 
-	// List of experiments to enable
-	Experiments []string
-
 	EnterpriseRuntimeConfig
 }
 
@@ -1743,17 +1735,6 @@ func (c *RuntimeConfig) VersionWithMetadata() string {
 	return version
 }
 
-// StructLocality converts the RuntimeConfig Locality to a struct Locality.
-func (c *RuntimeConfig) StructLocality() *structs.Locality {
-	if c.Locality == nil {
-		return nil
-	}
-	return &structs.Locality{
-		Region: stringVal(c.Locality.Region),
-		Zone:   stringVal(c.Locality.Zone),
-	}
-}
-
 // Sanitized returns a JSON/HCL compatible representation of the runtime
 // configuration where all fields with potential secrets had their
 // values replaced by 'hidden'. In addition, network addresses and
diff --git a/agent/config/runtime_ce.go b/agent/config/runtime_ce.go
index 4fb54ae079c20..0cec03ccdb856 100644
--- a/agent/config/runtime_ce.go
+++ b/agent/config/runtime_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package config
 
diff --git a/agent/config/runtime_ce_test.go b/agent/config/runtime_ce_test.go
index af6bb1f8babe2..c95e2d3add457 100644
--- a/agent/config/runtime_ce_test.go
+++ b/agent/config/runtime_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package config
 
diff --git a/agent/config/runtime_test.go b/agent/config/runtime_test.go
index e7772c94a955f..3286321881758 100644
--- a/agent/config/runtime_test.go
+++ b/agent/config/runtime_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
@@ -35,7 +32,7 @@ import (
 	"github.com/hashicorp/consul/agent/token"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/logging"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/tlsutil"
 	"github.com/hashicorp/consul/types"
@@ -324,7 +321,6 @@ func TestLoad_IntegrationWithFlags(t *testing.T) {
 			rt.DevMode = true
 			rt.DisableAnonymousSignature = true
 			rt.DisableKeyringFile = true
-			rt.Experiments = nil
 			rt.EnableDebug = true
 			rt.UIConfig.Enabled = true
 			rt.LeaveOnTerm = false
@@ -1038,13 +1034,6 @@ func TestLoad_IntegrationWithFlags(t *testing.T) {
 			},
 		},
 	})
-	run(t, testCase{
-		desc:        "locality invalid",
-		args:        []string{`-data-dir=` + dataDir},
-		json:        []string{`{"locality": {"zone": "us-west-1a"}}`},
-		hcl:         []string{`locality { zone = "us-west-1a" }`},
-		expectedErr: "locality is invalid: zone cannot be set without region",
-	})
 	run(t, testCase{
 		desc: "client addr and ports == 0",
 		args: []string{`-data-dir=` + dataDir},
@@ -2357,12 +2346,12 @@ func TestLoad_IntegrationWithFlags(t *testing.T) {
 		},
 		json: []string{`{
 			  "cloud": {
-              	"resource_id": "file-id"
+              	"resource_id": "file-id" 
               }
 			}`},
 		hcl: []string{`
 			  cloud = {
-	            resource_id = "file-id"
+	            resource_id = "file-id" 
 			  }
 			`},
 		expected: func(rt *RuntimeConfig) {
@@ -2529,60 +2518,6 @@ func TestLoad_IntegrationWithFlags(t *testing.T) {
 			rt.DataDir = dataDir
 		},
 	})
-	run(t, testCase{
-		desc: "tcp check with tcp_use_tls set",
-		args: []string{
-			`-data-dir=` + dataDir,
-		},
-		json: []string{
-			`{ "check": { "name": "a", "tcp": "localhost:55555", "tcp_use_tls": true, "interval": "5s" } }`,
-		},
-		hcl: []string{
-			`check = { name = "a" tcp = "localhost:55555" tcp_use_tls = true interval = "5s" }`,
-		},
-		expected: func(rt *RuntimeConfig) {
-			rt.Checks = []*structs.CheckDefinition{
-				{Name: "a", TCP: "localhost:55555", TCPUseTLS: true, OutputMaxSize: checks.DefaultBufSize, Interval: 5 * time.Second},
-			}
-			rt.DataDir = dataDir
-		},
-	})
-	run(t, testCase{
-		desc: "tcp check with tcp_use_tls set to false",
-		args: []string{
-			`-data-dir=` + dataDir,
-		},
-		json: []string{
-			`{ "check": { "name": "a", "tcp": "localhost:55555", "tcp_use_tls": false, "interval": "5s" } }`,
-		},
-		hcl: []string{
-			`check = { name = "a" tcp = "localhost:55555" tcp_use_tls = false interval = "5s" }`,
-		},
-		expected: func(rt *RuntimeConfig) {
-			rt.Checks = []*structs.CheckDefinition{
-				{Name: "a", TCP: "localhost:55555", TCPUseTLS: false, OutputMaxSize: checks.DefaultBufSize, Interval: 5 * time.Second},
-			}
-			rt.DataDir = dataDir
-		},
-	})
-	run(t, testCase{
-		desc: "tcp check with tcp_use_tls not set",
-		args: []string{
-			`-data-dir=` + dataDir,
-		},
-		json: []string{
-			`{ "check": { "name": "a", "tcp": "localhost:55555", "interval": "5s" } }`,
-		},
-		hcl: []string{
-			`check = { name = "a" tcp = "localhost:55555" interval = "5s" }`,
-		},
-		expected: func(rt *RuntimeConfig) {
-			rt.Checks = []*structs.CheckDefinition{
-				{Name: "a", TCP: "localhost:55555", TCPUseTLS: false, OutputMaxSize: checks.DefaultBufSize, Interval: 5 * time.Second},
-			}
-			rt.DataDir = dataDir
-		},
-	})
 	run(t, testCase{
 		desc: "h2ping check without h2ping_use_tls set",
 		args: []string{
@@ -2790,44 +2725,7 @@ func TestLoad_IntegrationWithFlags(t *testing.T) {
 				}
 			}
 		`},
-		expected: func(rt *RuntimeConfig) {
-			rt.DataDir = dataDir
-			rt.TLS.InternalRPC.VerifyServerHostname = true
-			rt.TLS.InternalRPC.VerifyOutgoing = true
-		},
-	})
-	run(t, testCase{
-		desc: "verify_server_hostname in the defaults stanza and internal_rpc",
-		args: []string{
-			`-data-dir=` + dataDir,
-		},
-		hcl: []string{`
-			tls {
-				defaults {
-					verify_server_hostname = false
-				},
-				internal_rpc {
-					verify_server_hostname = true
-				}
-			}
-		`},
-		json: []string{`
-			{
-				"tls": {
-					"defaults": {
-						"verify_server_hostname": false
-					},
-					"internal_rpc": {
-						"verify_server_hostname": true
-					}
-				}
-			}
-		`},
-		expected: func(rt *RuntimeConfig) {
-			rt.DataDir = dataDir
-			rt.TLS.InternalRPC.VerifyServerHostname = true
-			rt.TLS.InternalRPC.VerifyOutgoing = true
-		},
+		expectedErr: "verify_server_hostname is only valid in the tls.internal_rpc stanza",
 	})
 	run(t, testCase{
 		desc: "verify_server_hostname in the grpc stanza",
@@ -2850,7 +2748,7 @@ func TestLoad_IntegrationWithFlags(t *testing.T) {
 				}
 			}
 		`},
-		expectedErr: "verify_server_hostname is only valid in the tls.defaults and tls.internal_rpc stanza",
+		expectedErr: "verify_server_hostname is only valid in the tls.internal_rpc stanza",
 	})
 	run(t, testCase{
 		desc: "verify_server_hostname in the https stanza",
@@ -2873,7 +2771,7 @@ func TestLoad_IntegrationWithFlags(t *testing.T) {
 				}
 			}
 		`},
-		expectedErr: "verify_server_hostname is only valid in the tls.defaults and tls.internal_rpc stanza",
+		expectedErr: "verify_server_hostname is only valid in the tls.internal_rpc stanza",
 	})
 	run(t, testCase{
 		desc: "translated keys",
@@ -5814,74 +5712,6 @@ func TestLoad_IntegrationWithFlags(t *testing.T) {
 			rt.TLS.InternalRPC.VerifyOutgoing = true
 		},
 	})
-	run(t, testCase{
-		desc: "tls.defaults.verify_server_hostname implies tls.internal_rpc.verify_outgoing",
-		args: []string{
-			`-data-dir=` + dataDir,
-		},
-		json: []string{`
-			{
-				"tls": {
-					"defaults": {
-						"verify_server_hostname": true
-					}
-				}
-			}
-		`},
-		hcl: []string{`
-			tls {
-				defaults {
-					verify_server_hostname = true
-				}
-			}
-		`},
-		expected: func(rt *RuntimeConfig) {
-			rt.DataDir = dataDir
-
-			rt.TLS.Domain = "consul."
-			rt.TLS.NodeName = "thehostname"
-
-			rt.TLS.InternalRPC.VerifyServerHostname = true
-			rt.TLS.InternalRPC.VerifyOutgoing = true
-		},
-	})
-	run(t, testCase{
-		desc: "tls.internal_rpc.verify_server_hostname overwrites tls.defaults.verify_server_hostname",
-		args: []string{
-			`-data-dir=` + dataDir,
-		},
-		json: []string{`
-			{
-				"tls": {
-					"defaults": {
-						"verify_server_hostname": false
-					},
-					"internal_rpc": {
-						"verify_server_hostname": true
-					}
-				}
-			}
-		`},
-		hcl: []string{`
-			tls {
-				defaults {
-					verify_server_hostname = false
-				},
-				internal_rpc {
-					verify_server_hostname = true
-				}
-			}
-		`},
-		expected: func(rt *RuntimeConfig) {
-			rt.DataDir = dataDir
-
-			rt.TLS.Domain = "consul."
-			rt.TLS.NodeName = "thehostname"
-
-			rt.TLS.InternalRPC.VerifyServerHostname = true
-			rt.TLS.InternalRPC.VerifyOutgoing = true
-		},
-	})
 	run(t, testCase{
 		desc: "tls.grpc.use_auto_cert defaults to false",
 		args: []string{
@@ -6010,26 +5840,8 @@ func TestLoad_IntegrationWithFlags(t *testing.T) {
 		hcl:  []string{``},
 		expected: func(rt *RuntimeConfig) {
 			rt.DataDir = dataDir
-			rt.RaftLogStoreConfig.Backend = consul.LogStoreBackendDefault
-			rt.RaftLogStoreConfig.WAL.SegmentSize = 64 * 1024 * 1024
-		},
-	})
-	run(t, testCase{
-		desc: "logstore defaults",
-		args: []string{
-			`-data-dir=` + dataDir,
-		},
-		json: []string{`
-			{
-				"experiments": ["resource-apis"]
-			}	
-		`},
-		hcl: []string{`experiments=["resource-apis"]`},
-		expected: func(rt *RuntimeConfig) {
-			rt.DataDir = dataDir
-			rt.RaftLogStoreConfig.Backend = consul.LogStoreBackendDefault
+			rt.RaftLogStoreConfig.Backend = consul.LogStoreBackendBoltDB
 			rt.RaftLogStoreConfig.WAL.SegmentSize = 64 * 1024 * 1024
-			rt.Experiments = []string{"resource-apis"}
 		},
 	})
 	run(t, testCase{
@@ -6359,7 +6171,6 @@ func TestLoad_FullConfig(t *testing.T) {
 				Body:                           "wSjTy7dg",
 				DisableRedirects:               true,
 				TCP:                            "RJQND605",
-				TCPUseTLS:                      false,
 				H2PING:                         "9N1cSb5B",
 				H2PingUseTLS:                   false,
 				OSService:                      "aAjE6m9Z",
@@ -6390,7 +6201,6 @@ func TestLoad_FullConfig(t *testing.T) {
 				DisableRedirects:               false,
 				OutputMaxSize:                  checks.DefaultBufSize,
 				TCP:                            "4jG5casb",
-				TCPUseTLS:                      false,
 				H2PING:                         "HCHU7gEb",
 				H2PingUseTLS:                   false,
 				OSService:                      "aqq95BhP",
@@ -6420,7 +6230,6 @@ func TestLoad_FullConfig(t *testing.T) {
 				DisableRedirects:               true,
 				OutputMaxSize:                  checks.DefaultBufSize,
 				TCP:                            "JY6fTTcw",
-				TCPUseTLS:                      false,
 				H2PING:                         "rQ8eyCSF",
 				H2PingUseTLS:                   false,
 				OSService:                      "aZaCAXww",
@@ -6550,7 +6359,6 @@ func TestLoad_FullConfig(t *testing.T) {
 		EnableRemoteScriptChecks:         true,
 		EnableLocalScriptChecks:          true,
 		EncryptKey:                       "A4wELWqH",
-		Experiments:                      []string{"foo"},
 		StaticRuntimeConfig: StaticRuntimeConfig{
 			EncryptVerifyIncoming: true,
 			EncryptVerifyOutgoing: true,
@@ -7366,7 +7174,6 @@ func TestRuntimeConfig_Sanitize(t *testing.T) {
 				},
 			},
 		},
-		Locality:           &Locality{Region: strPtr("us-west-1"), Zone: strPtr("us-west-1a")},
 		ServerRejoinAgeMax: 24 * 7 * time.Hour,
 	}
 
diff --git a/agent/config/segment_ce.go b/agent/config/segment_ce.go
index 78ba9b87c7fdc..d7a80c71ea90d 100644
--- a/agent/config/segment_ce.go
+++ b/agent/config/segment_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package config
 
diff --git a/agent/config/segment_ce_test.go b/agent/config/segment_ce_test.go
index f58781338184a..e31a9602b416f 100644
--- a/agent/config/segment_ce_test.go
+++ b/agent/config/segment_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package config
 
diff --git a/agent/config/testdata/TestRuntimeConfig_Sanitize.golden b/agent/config/testdata/TestRuntimeConfig_Sanitize.golden
index b82baea535140..57217f6eaa9ee 100644
--- a/agent/config/testdata/TestRuntimeConfig_Sanitize.golden
+++ b/agent/config/testdata/TestRuntimeConfig_Sanitize.golden
@@ -17,7 +17,6 @@
         "ACLAgentRecoveryToken": "hidden",
         "ACLAgentToken": "hidden",
         "ACLConfigFileRegistrationToken": "hidden",
-        "ACLDNSToken": "hidden",
         "ACLDefaultToken": "hidden",
         "ACLReplicationToken": "hidden",
         "DataDir": "",
@@ -118,7 +117,6 @@
             "Status": "",
             "SuccessBeforePassing": 0,
             "TCP": "",
-            "TCPUseTLS": false,
             "TLSServerName": "",
             "TLSSkipVerify": false,
             "TTL": "0s",
@@ -203,7 +201,6 @@
     "EnableRemoteScriptChecks": false,
     "EncryptKey": "hidden",
     "EnterpriseRuntimeConfig": {},
-    "Experiments": [],
     "ExposeMaxPort": 0,
     "ExposeMinPort": 0,
     "GRPCAddrs": [],
@@ -239,10 +236,6 @@
     "LeaveDrainTime": "0s",
     "LeaveOnTerm": false,
     "LocalProxyConfigResyncInterval": "0s",
-    "Locality": {
-        "Region": "us-west-1",
-        "Zone": "us-west-1a"
-    },
     "Logging": {
         "EnableSyslog": false,
         "LogFilePath": "",
@@ -370,7 +363,6 @@
                 "Status": "",
                 "SuccessBeforePassing": 0,
                 "TCP": "",
-                "TCPUseTLS": false,
                 "TLSServerName": "",
                 "TLSSkipVerify": false,
                 "TTL": "0s",
@@ -383,7 +375,6 @@
             "EnterpriseMeta": {},
             "ID": "",
             "Kind": "",
-            "Locality": null,
             "Meta": {},
             "Name": "foo",
             "Port": 0,
diff --git a/agent/config/testdata/full-config.hcl b/agent/config/testdata/full-config.hcl
index 1c1fb0158aa5c..7d43254a98225 100644
--- a/agent/config/testdata/full-config.hcl
+++ b/agent/config/testdata/full-config.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 acl_agent_master_token = "furuQD0b"
 acl_agent_token = "cOshLOQ2"
 acl_datacenter = "m3urck3z"
@@ -285,9 +282,6 @@ enable_syslog = true
 encrypt = "A4wELWqH"
 encrypt_verify_incoming = true
 encrypt_verify_outgoing = true
-experiments = [
-    "foo"
-]
 http_config {
     block_endpoints = [ "RBvAFcGD", "fWOWFznh" ]
     allow_write_http_from = [ "127.0.0.1/8", "22.33.44.55/32", "0.0.0.0/0" ]
diff --git a/agent/config/testdata/full-config.json b/agent/config/testdata/full-config.json
index cd407d3e5daec..52dab37bfa53c 100644
--- a/agent/config/testdata/full-config.json
+++ b/agent/config/testdata/full-config.json
@@ -327,9 +327,6 @@
   "encrypt": "A4wELWqH",
   "encrypt_verify_incoming": true,
   "encrypt_verify_outgoing": true,
-  "experiments": [
-    "foo"
-  ],
   "http_config": {
     "block_endpoints": [
       "RBvAFcGD",
@@ -410,17 +407,17 @@
   "raft_snapshot_interval": "30s",
   "raft_trailing_logs": 83749,
   "raft_logstore": {
-    "backend": "wal",
-    "disable_log_cache": true,
+    "backend" : "wal",
+    "disable_log_cache":  true,
     "verification": {
-      "enabled": true,
-      "interval": "12345s"
+        "enabled": true,
+        "interval":"12345s"
     },
     "boltdb": {
-      "no_freelist_sync": true
+        "no_freelist_sync": true
     },
     "wal": {
-      "segment_size_mb": 15
+       "segment_size_mb": 15
     }
   },
   "read_replica": true,
@@ -930,4 +927,4 @@
   "xds": {
     "update_max_per_second": 9526.2
   }
-}
\ No newline at end of file
+}
diff --git a/agent/config_endpoint.go b/agent/config_endpoint.go
index e1b3f0eeef415..fbcac83ce3b0c 100644
--- a/agent/config_endpoint.go
+++ b/agent/config_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/config_endpoint_test.go b/agent/config_endpoint_test.go
index 43a8ec206e9fe..f3c1c17201796 100644
--- a/agent/config_endpoint_test.go
+++ b/agent/config_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -19,23 +16,6 @@ import (
 	"github.com/hashicorp/consul/testrpc"
 )
 
-func TestConfigEndpointsFailInV2(t *testing.T) {
-	t.Parallel()
-
-	a := NewTestAgent(t, `experiments = ["resource-apis"]`)
-
-	checkRequest := func(method, url string) {
-		t.Run(method+" "+url, func(t *testing.T) {
-			assertV1CatalogEndpointDoesNotWorkWithV2(t, a, method, url, `{"kind":"service-defaults", "name":"web"}`)
-		})
-	}
-
-	checkRequest("GET", "/v1/config/service-defaults")
-	checkRequest("GET", "/v1/config/service-defaults/web")
-	checkRequest("DELETE", "/v1/config/service-defaults/web")
-	checkRequest("PUT", "/v1/config")
-}
-
 func TestConfig_Get(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
diff --git a/agent/configentry/compare.go b/agent/configentry/compare.go
deleted file mode 100644
index 3bf761dba828d..0000000000000
--- a/agent/configentry/compare.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package configentry
-
-import (
-	"sort"
-
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-func SortSlice(configs []structs.ConfigEntry) {
-	sort.SliceStable(configs, func(i, j int) bool {
-		return Less(configs[i], configs[j])
-	})
-}
-
-func Less(first structs.ConfigEntry, second structs.ConfigEntry) bool {
-	if first.GetKind() < second.GetKind() {
-		return true
-	}
-	if first.GetKind() > second.GetKind() {
-		return false
-	}
-
-	if first.GetEnterpriseMeta().LessThan(second.GetEnterpriseMeta()) {
-		return true
-	}
-	if second.GetEnterpriseMeta().LessThan(first.GetEnterpriseMeta()) {
-		return false
-	}
-
-	return first.GetName() < second.GetName()
-}
-
-func EqualID(e1, e2 structs.ConfigEntry) bool {
-	return e1.GetKind() == e2.GetKind() &&
-		e1.GetEnterpriseMeta().IsSame(e2.GetEnterpriseMeta()) &&
-		e1.GetName() == e2.GetName()
-}
diff --git a/agent/configentry/compare_test.go b/agent/configentry/compare_test.go
deleted file mode 100644
index eeeec32f853b4..0000000000000
--- a/agent/configentry/compare_test.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package configentry
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-func TestSortSlice(t *testing.T) {
-	newDefaults := func(name, protocol string) *structs.ServiceConfigEntry {
-		return &structs.ServiceConfigEntry{
-			Kind:     structs.ServiceDefaults,
-			Name:     name,
-			Protocol: protocol,
-		}
-	}
-	newResolver := func(name string, timeout time.Duration) *structs.ServiceResolverConfigEntry {
-		return &structs.ServiceResolverConfigEntry{
-			Kind:           structs.ServiceResolver,
-			Name:           name,
-			ConnectTimeout: timeout,
-		}
-	}
-
-	type testcase struct {
-		configs []structs.ConfigEntry
-		expect  []structs.ConfigEntry
-	}
-
-	cases := map[string]testcase{
-		"none": {},
-		"one": {
-			configs: []structs.ConfigEntry{
-				newDefaults("web", "grpc"),
-			},
-			expect: []structs.ConfigEntry{
-				newDefaults("web", "grpc"),
-			},
-		},
-		"just kinds": {
-			configs: []structs.ConfigEntry{
-				newResolver("web", 33*time.Second),
-				newDefaults("web", "grpc"),
-			},
-			expect: []structs.ConfigEntry{
-				newDefaults("web", "grpc"),
-				newResolver("web", 33*time.Second),
-			},
-		},
-		"just names": {
-			configs: []structs.ConfigEntry{
-				newDefaults("db", "grpc"),
-				newDefaults("api", "http2"),
-			},
-			expect: []structs.ConfigEntry{
-				newDefaults("api", "http2"),
-				newDefaults("db", "grpc"),
-			},
-		},
-		"all": {
-			configs: []structs.ConfigEntry{
-				newResolver("web", 33*time.Second),
-				newDefaults("web", "grpc"),
-				newDefaults("db", "grpc"),
-				newDefaults("api", "http2"),
-			},
-			expect: []structs.ConfigEntry{
-				newDefaults("api", "http2"),
-				newDefaults("db", "grpc"),
-				newDefaults("web", "grpc"),
-				newResolver("web", 33*time.Second),
-			},
-		},
-	}
-
-	for name, tc := range cases {
-		tc := tc
-		t.Run(name, func(t *testing.T) {
-			SortSlice(tc.configs)
-			require.Equal(t, tc.expect, tc.configs)
-			// and it should be stable
-			SortSlice(tc.configs)
-			require.Equal(t, tc.expect, tc.configs)
-		})
-	}
-}
diff --git a/agent/configentry/config_entry.go b/agent/configentry/config_entry.go
index b10989aa95d79..7bf308c36f1fd 100644
--- a/agent/configentry/config_entry.go
+++ b/agent/configentry/config_entry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package configentry
 
 import (
diff --git a/agent/configentry/discoverychain.go b/agent/configentry/discoverychain.go
index 58bdb81fc20ca..4acf3f9ff8858 100644
--- a/agent/configentry/discoverychain.go
+++ b/agent/configentry/discoverychain.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package configentry
 
 import (
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
 )
 
 // DiscoveryChainSet is a wrapped set of raw cross-referenced config entries
@@ -13,25 +9,20 @@ import (
 //
 // None of these are defaulted.
 type DiscoveryChainSet struct {
-	Routers              map[structs.ServiceID]*structs.ServiceRouterConfigEntry
-	Splitters            map[structs.ServiceID]*structs.ServiceSplitterConfigEntry
-	Resolvers            map[structs.ServiceID]*structs.ServiceResolverConfigEntry
-	Services             map[structs.ServiceID]*structs.ServiceConfigEntry
-	Peers                map[string]*pbpeering.Peering
-	DefaultSamenessGroup *structs.SamenessGroupConfigEntry
-	SamenessGroups       map[string]*structs.SamenessGroupConfigEntry
-	ProxyDefaults        map[string]*structs.ProxyConfigEntry
+	Routers       map[structs.ServiceID]*structs.ServiceRouterConfigEntry
+	Splitters     map[structs.ServiceID]*structs.ServiceSplitterConfigEntry
+	Resolvers     map[structs.ServiceID]*structs.ServiceResolverConfigEntry
+	Services      map[structs.ServiceID]*structs.ServiceConfigEntry
+	ProxyDefaults map[string]*structs.ProxyConfigEntry
 }
 
 func NewDiscoveryChainSet() *DiscoveryChainSet {
 	return &DiscoveryChainSet{
-		Routers:        make(map[structs.ServiceID]*structs.ServiceRouterConfigEntry),
-		Splitters:      make(map[structs.ServiceID]*structs.ServiceSplitterConfigEntry),
-		Resolvers:      make(map[structs.ServiceID]*structs.ServiceResolverConfigEntry),
-		Services:       make(map[structs.ServiceID]*structs.ServiceConfigEntry),
-		Peers:          make(map[string]*pbpeering.Peering),
-		ProxyDefaults:  make(map[string]*structs.ProxyConfigEntry),
-		SamenessGroups: make(map[string]*structs.SamenessGroupConfigEntry),
+		Routers:       make(map[structs.ServiceID]*structs.ServiceRouterConfigEntry),
+		Splitters:     make(map[structs.ServiceID]*structs.ServiceSplitterConfigEntry),
+		Resolvers:     make(map[structs.ServiceID]*structs.ServiceResolverConfigEntry),
+		Services:      make(map[structs.ServiceID]*structs.ServiceConfigEntry),
+		ProxyDefaults: make(map[string]*structs.ProxyConfigEntry),
 	}
 }
 
@@ -63,17 +54,6 @@ func (e *DiscoveryChainSet) GetService(sid structs.ServiceID) *structs.ServiceCo
 	return nil
 }
 
-func (e *DiscoveryChainSet) GetSamenessGroup(name string) *structs.SamenessGroupConfigEntry {
-	if e.SamenessGroups != nil {
-		return e.SamenessGroups[name]
-	}
-	return nil
-}
-
-func (e *DiscoveryChainSet) GetDefaultSamenessGroup() *structs.SamenessGroupConfigEntry {
-	return e.DefaultSamenessGroup
-}
-
 func (e *DiscoveryChainSet) GetProxyDefaults(partition string) *structs.ProxyConfigEntry {
 	if e.ProxyDefaults != nil {
 		return e.ProxyDefaults[partition]
@@ -121,30 +101,6 @@ func (e *DiscoveryChainSet) AddServices(entries ...*structs.ServiceConfigEntry)
 	}
 }
 
-// AddSamenessGroup adds a sameness group. Convenience function for testing.
-func (e *DiscoveryChainSet) AddSamenessGroup(entries ...*structs.SamenessGroupConfigEntry) {
-	if e.SamenessGroups == nil {
-		e.SamenessGroups = make(map[string]*structs.SamenessGroupConfigEntry)
-	}
-	for _, entry := range entries {
-		e.SamenessGroups[entry.Name] = entry
-	}
-}
-
-// SetDefaultSamenessGroup sets the default sameness group. Convenience function for testing.
-func (e *DiscoveryChainSet) SetDefaultSamenessGroup(entry *structs.SamenessGroupConfigEntry) {
-	if e.SamenessGroups == nil {
-		e.SamenessGroups = make(map[string]*structs.SamenessGroupConfigEntry)
-	}
-
-	if entry == nil {
-		return
-	}
-
-	e.SamenessGroups[entry.Name] = entry
-	e.DefaultSamenessGroup = entry
-}
-
 // AddProxyDefaults adds proxy-defaults configs. Convenience function for testing.
 func (e *DiscoveryChainSet) AddProxyDefaults(entries ...*structs.ProxyConfigEntry) {
 	if e.ProxyDefaults == nil {
@@ -155,39 +111,24 @@ func (e *DiscoveryChainSet) AddProxyDefaults(entries ...*structs.ProxyConfigEntr
 	}
 }
 
-// AddPeers adds cluster peers. Convenience function for testing.
-func (e *DiscoveryChainSet) AddPeers(entries ...*pbpeering.Peering) {
-	if e.Peers == nil {
-		e.Peers = make(map[string]*pbpeering.Peering)
-	}
-	for _, entry := range entries {
-		e.Peers[entry.Name] = entry
-	}
-}
-
 // AddEntries adds generic configs. Convenience function for testing. Panics on
 // operator error.
 func (e *DiscoveryChainSet) AddEntries(entries ...structs.ConfigEntry) {
-	for _, rawEntry := range entries {
-		switch entry := rawEntry.(type) {
-		case *structs.ServiceRouterConfigEntry:
-			e.AddRouters(entry)
-		case *structs.ServiceSplitterConfigEntry:
-			e.AddSplitters(entry)
-		case *structs.ServiceResolverConfigEntry:
-			e.AddResolvers(entry)
-		case *structs.ServiceConfigEntry:
-			e.AddServices(entry)
-		case *structs.SamenessGroupConfigEntry:
-			if entry.DefaultForFailover {
-				e.DefaultSamenessGroup = entry
-			}
-			e.AddSamenessGroup(entry)
-		case *structs.ProxyConfigEntry:
+	for _, entry := range entries {
+		switch entry.GetKind() {
+		case structs.ServiceRouter:
+			e.AddRouters(entry.(*structs.ServiceRouterConfigEntry))
+		case structs.ServiceSplitter:
+			e.AddSplitters(entry.(*structs.ServiceSplitterConfigEntry))
+		case structs.ServiceResolver:
+			e.AddResolvers(entry.(*structs.ServiceResolverConfigEntry))
+		case structs.ServiceDefaults:
+			e.AddServices(entry.(*structs.ServiceConfigEntry))
+		case structs.ProxyDefaults:
 			if entry.GetName() != structs.ProxyConfigGlobal {
 				panic("the only supported proxy-defaults name is '" + structs.ProxyConfigGlobal + "'")
 			}
-			e.AddProxyDefaults(entry)
+			e.AddProxyDefaults(entry.(*structs.ProxyConfigEntry))
 		default:
 			panic("unhandled config entry kind: " + entry.GetKind())
 		}
@@ -204,5 +145,5 @@ func (e *DiscoveryChainSet) IsEmpty() bool {
 // service-splitters, or service-resolvers that are present. These config
 // entries are the primary parts of the discovery chain.
 func (e *DiscoveryChainSet) IsChainEmpty() bool {
-	return len(e.Routers) == 0 && len(e.Splitters) == 0 && len(e.Resolvers) == 0 && e.DefaultSamenessGroup == nil
+	return len(e.Routers) == 0 && len(e.Splitters) == 0 && len(e.Resolvers) == 0
 }
diff --git a/agent/configentry/doc.go b/agent/configentry/doc.go
index 7dff4a06621b5..b7da03fcd0372 100644
--- a/agent/configentry/doc.go
+++ b/agent/configentry/doc.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // Package configentry contains structs and logic related to the Configuration
 // Entry subsystem. Currently this is restricted to structs used during
 // runtime, but which are not serialized to the network or disk.
diff --git a/agent/configentry/merge_service_config.go b/agent/configentry/merge_service_config.go
index d36c152105af3..c11a3112ed918 100644
--- a/agent/configentry/merge_service_config.go
+++ b/agent/configentry/merge_service_config.go
@@ -1,13 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package configentry
 
 import (
 	"fmt"
 
 	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-memdb"
+	memdb "github.com/hashicorp/go-memdb"
 	"github.com/imdario/mergo"
 	"github.com/mitchellh/copystructure"
 
@@ -26,22 +23,32 @@ type StateStore interface {
 func MergeNodeServiceWithCentralConfig(
 	ws memdb.WatchSet,
 	state StateStore,
-	unmergedNS *structs.NodeService,
+	ns *structs.NodeService,
 	logger hclog.Logger) (uint64, *structs.NodeService, error) {
 
-	ns := unmergedNS.WithNormalizedUpstreams()
 	serviceName := ns.Service
+	var upstreams []structs.PeeredServiceName
 	if ns.IsSidecarProxy() {
 		// This is a sidecar proxy, ignore the proxy service's config since we are
 		// managed by the target service config.
 		serviceName = ns.Proxy.DestinationServiceName
-	}
-	var upstreams []structs.PeeredServiceName
-	for _, us := range ns.Proxy.Upstreams {
-		if us.DestinationType == "" || us.DestinationType == structs.UpstreamDestTypeService {
-			upstreams = append(upstreams, us.DestinationID())
+
+		// Also if we have any upstreams defined, add them to the defaults lookup request
+		// so we can learn about their configs.
+		for _, us := range ns.Proxy.Upstreams {
+			if us.DestinationType == "" || us.DestinationType == structs.UpstreamDestTypeService {
+				psn := us.DestinationID()
+				if psn.Peer == "" {
+					psn.ServiceName.EnterpriseMeta.Merge(&ns.EnterpriseMeta)
+				} else {
+					// Peer services should not have their namespace overwritten.
+					psn.ServiceName.EnterpriseMeta.OverridePartition(ns.EnterpriseMeta.PartitionOrDefault())
+				}
+				upstreams = append(upstreams, psn)
+			}
 		}
 	}
+
 	configReq := &structs.ServiceConfigRequest{
 		Name:                 serviceName,
 		MeshGateway:          ns.Proxy.MeshGateway,
@@ -131,10 +138,6 @@ func MergeServiceConfig(defaults *structs.ServiceConfigResponse, service *struct
 		ns.Proxy.EnvoyExtensions = nsExtensions
 	}
 
-	if ratelimit := defaults.RateLimits.ToEnvoyExtension(); ratelimit != nil {
-		ns.Proxy.EnvoyExtensions = append(ns.Proxy.EnvoyExtensions, *ratelimit)
-	}
-
 	if ns.Proxy.MeshGateway.Mode == structs.MeshGatewayModeDefault {
 		ns.Proxy.MeshGateway.Mode = defaults.MeshGateway.Mode
 	}
@@ -148,10 +151,6 @@ func MergeServiceConfig(defaults *structs.ServiceConfigResponse, service *struct
 		ns.Proxy.TransparentProxy.DialedDirectly = defaults.TransparentProxy.DialedDirectly
 	}
 
-	if ns.Proxy.MutualTLSMode == structs.MutualTLSModeDefault {
-		ns.Proxy.MutualTLSMode = defaults.MutualTLSMode
-	}
-
 	// remoteUpstreams contains synthetic Upstreams generated from central config (service-defaults.UpstreamConfigs).
 	remoteUpstreams := make(map[structs.PeeredServiceName]structs.Upstream)
 
@@ -159,30 +158,54 @@ func MergeServiceConfig(defaults *structs.ServiceConfigResponse, service *struct
 	entMeta := ns.EnterpriseMeta
 	entMeta.Normalize()
 
-	for _, us := range defaults.UpstreamConfigs {
-		parsed, err := structs.ParseUpstreamConfigNoDefaults(us.Config)
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse upstream config map for %s: %v", us.Upstream.String(), err)
+	if len(defaults.UpstreamIDConfigs) > 0 {
+		// Handle legacy upstreams. This should be removed in Consul 1.16.
+		for _, us := range defaults.UpstreamIDConfigs {
+			parsed, err := structs.ParseUpstreamConfigNoDefaults(us.Config)
+			if err != nil {
+				return nil, fmt.Errorf("failed to parse upstream config map for %s: %v", us.Upstream.String(), err)
+			}
+			psn := structs.PeeredServiceName{
+				Peer:        "",
+				ServiceName: structs.NewServiceName(us.Upstream.ID, &us.Upstream.EnterpriseMeta),
+			}
+
+			remoteUpstreams[psn] = structs.Upstream{
+				DestinationNamespace: us.Upstream.NamespaceOrDefault(),
+				DestinationPartition: us.Upstream.PartitionOrDefault(),
+				DestinationName:      us.Upstream.ID,
+				DestinationPeer:      "",
+				Config:               us.Config,
+				MeshGateway:          parsed.MeshGateway,
+				CentrallyConfigured:  true,
+			}
 		}
+	} else {
+		for _, us := range defaults.UpstreamConfigs {
+			parsed, err := structs.ParseUpstreamConfigNoDefaults(us.Config)
+			if err != nil {
+				return nil, fmt.Errorf("failed to parse upstream config map for %s: %v", us.Upstream.String(), err)
+			}
 
-		// If the defaults did not fully normalize tenancy stuff, take care of
-		// that now too.
-		psn := us.Upstream // only normalize the copy
-		psn.ServiceName.EnterpriseMeta.Normalize()
+			// If the defaults did not fully normalize tenancy stuff, take care of
+			// that now too.
+			psn := us.Upstream // only normalize the copy
+			psn.ServiceName.EnterpriseMeta.Normalize()
 
-		// Normalize the partition field specially.
-		if psn.Peer != "" {
-			psn.ServiceName.OverridePartition(entMeta.PartitionOrDefault())
-		}
+			// Normalize the partition field specially.
+			if psn.Peer != "" {
+				psn.ServiceName.OverridePartition(entMeta.PartitionOrDefault())
+			}
 
-		remoteUpstreams[psn] = structs.Upstream{
-			DestinationNamespace: psn.ServiceName.NamespaceOrDefault(),
-			DestinationPartition: psn.ServiceName.PartitionOrDefault(),
-			DestinationName:      psn.ServiceName.Name,
-			DestinationPeer:      psn.Peer,
-			Config:               us.Config,
-			MeshGateway:          parsed.MeshGateway,
-			CentrallyConfigured:  true,
+			remoteUpstreams[us.Upstream] = structs.Upstream{
+				DestinationNamespace: psn.ServiceName.NamespaceOrDefault(),
+				DestinationPartition: psn.ServiceName.PartitionOrDefault(),
+				DestinationName:      psn.ServiceName.Name,
+				DestinationPeer:      psn.Peer,
+				Config:               us.Config,
+				MeshGateway:          parsed.MeshGateway,
+				CentrallyConfigured:  true,
+			}
 		}
 	}
 
diff --git a/agent/configentry/merge_service_config_test.go b/agent/configentry/merge_service_config_test.go
index e9f051d0026af..fbe136244c61e 100644
--- a/agent/configentry/merge_service_config_test.go
+++ b/agent/configentry/merge_service_config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package configentry
 
 import (
@@ -36,7 +33,6 @@ func Test_MergeServiceConfig_TransparentProxy(t *testing.T) {
 					ProxyConfig: map[string]interface{}{
 						"foo": "bar",
 					},
-					MutualTLSMode: structs.MutualTLSModePermissive,
 					Expose: structs.ExposeConfig{
 						Checks: true,
 						Paths: []structs.ExposePath{
@@ -78,7 +74,6 @@ func Test_MergeServiceConfig_TransparentProxy(t *testing.T) {
 						OutboundListenerPort: 10101,
 						DialedDirectly:       true,
 					},
-					MutualTLSMode: structs.MutualTLSModePermissive,
 					Config: map[string]interface{}{
 						"foo": "bar",
 					},
@@ -972,111 +967,3 @@ func Test_MergeServiceConfig_UpstreamOverrides(t *testing.T) {
 		})
 	}
 }
-
-// Tests that RateLimit config is a no-op in non-enterprise.
-// In practice, the ratelimit config would have been validated
-// on write.
-func Test_MergeServiceConfig_RateLimit(t *testing.T) {
-	rl := structs.RateLimits{
-		InstanceLevel: structs.InstanceLevelRateLimits{
-			RequestsPerSecond: 1234,
-			RequestsMaxBurst:  2345,
-			Routes: []structs.InstanceLevelRouteRateLimits{
-				{
-					PathExact:         "/admin",
-					RequestsPerSecond: 3333,
-					RequestsMaxBurst:  4444,
-				},
-			},
-		},
-	}
-	tests := []struct {
-		name     string
-		defaults *structs.ServiceConfigResponse
-		service  *structs.NodeService
-		want     *structs.NodeService
-	}{
-		{
-			name: "injects ratelimit extension",
-			defaults: &structs.ServiceConfigResponse{
-				RateLimits: rl,
-			},
-			service: &structs.NodeService{
-				ID:      "foo-proxy",
-				Service: "foo-proxy",
-				Proxy: structs.ConnectProxyConfig{
-					DestinationServiceName: "foo",
-					DestinationServiceID:   "foo",
-				},
-			},
-			want: &structs.NodeService{
-				ID:      "foo-proxy",
-				Service: "foo-proxy",
-				Proxy: structs.ConnectProxyConfig{
-					DestinationServiceName: "foo",
-					DestinationServiceID:   "foo",
-					EnvoyExtensions: func() []structs.EnvoyExtension {
-						if ext := rl.ToEnvoyExtension(); ext != nil {
-							return []structs.EnvoyExtension{*ext}
-						}
-						return nil
-					}(),
-				},
-			},
-		},
-		{
-			name: "injects ratelimit extension at the end",
-			defaults: &structs.ServiceConfigResponse{
-				RateLimits: rl,
-				EnvoyExtensions: []structs.EnvoyExtension{
-					{
-						Name:     "existing-ext",
-						Required: true,
-						Arguments: map[string]interface{}{
-							"arg1": "val1",
-						},
-					},
-				},
-			},
-			service: &structs.NodeService{
-				ID:      "foo-proxy",
-				Service: "foo-proxy",
-				Proxy: structs.ConnectProxyConfig{
-					DestinationServiceName: "foo",
-					DestinationServiceID:   "foo",
-				},
-			},
-
-			want: &structs.NodeService{
-				ID:      "foo-proxy",
-				Service: "foo-proxy",
-				Proxy: structs.ConnectProxyConfig{
-					DestinationServiceName: "foo",
-					DestinationServiceID:   "foo",
-					EnvoyExtensions: func() []structs.EnvoyExtension {
-						existing := []structs.EnvoyExtension{
-							{
-								Name:     "existing-ext",
-								Required: true,
-								Arguments: map[string]interface{}{
-									"arg1": "val1",
-								},
-							},
-						}
-						if ext := rl.ToEnvoyExtension(); ext != nil {
-							existing = append(existing, *ext)
-						}
-						return existing
-					}(),
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := MergeServiceConfig(tt.defaults, tt.service)
-			require.NoError(t, err)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
diff --git a/agent/configentry/resolve.go b/agent/configentry/resolve.go
index 82efc3b8bd759..9daad80188220 100644
--- a/agent/configentry/resolve.go
+++ b/agent/configentry/resolve.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package configentry
 
 import (
@@ -48,7 +45,6 @@ func ComputeResolvedServiceConfig(
 		thisReply.ProxyConfig = mapCopy.(map[string]interface{})
 		thisReply.Mode = proxyConf.Mode
 		thisReply.TransparentProxy = proxyConf.TransparentProxy
-		thisReply.MutualTLSMode = proxyConf.MutualTLSMode
 		thisReply.MeshGateway = proxyConf.MeshGateway
 		thisReply.Expose = proxyConf.Expose
 		thisReply.EnvoyExtensions = proxyConf.EnvoyExtensions
@@ -117,9 +113,6 @@ func ComputeResolvedServiceConfig(
 		if serviceConf.Destination != nil {
 			thisReply.Destination = *serviceConf.Destination
 		}
-		if serviceConf.RateLimits != nil {
-			thisReply.RateLimits = *serviceConf.RateLimits
-		}
 
 		// Populate values for the proxy config map
 		proxyConf := thisReply.ProxyConfig
@@ -146,10 +139,6 @@ func ComputeResolvedServiceConfig(
 			thisReply.ProxyConfig = proxyConf
 		}
 
-		if serviceConf.MutualTLSMode != structs.MutualTLSModeDefault {
-			thisReply.MutualTLSMode = serviceConf.MutualTLSMode
-		}
-
 		thisReply.Meta = serviceConf.Meta
 		// Service defaults' envoy extensions are appended to the proxy defaults extensions so that proxy defaults
 		// extensions are applied first.
@@ -163,7 +152,7 @@ func ComputeResolvedServiceConfig(
 	seenUpstreams := map[structs.PeeredServiceName]struct{}{}
 
 	var (
-		noUpstreamArgs = len(args.UpstreamServiceNames) == 0
+		noUpstreamArgs = len(args.UpstreamServiceNames) == 0 && len(args.UpstreamIDs) == 0
 
 		// Check the args and the resolved value. If it was exclusively set via a config entry, then args.Mode
 		// will never be transparent because the service config request does not use the resolved value.
@@ -183,6 +172,15 @@ func ComputeResolvedServiceConfig(
 			seenUpstreams[psn] = struct{}{}
 		}
 	}
+	// For 1.14, service-defaults overrides would apply to peer upstreams incorrectly
+	// because the config merging logic was oblivious to the concept of a peer.
+	// We replicate this behavior on legacy calls for backwards-compatibility.
+	for _, sid := range args.UpstreamIDs {
+		psn := structs.PeeredServiceName{
+			ServiceName: structs.NewServiceName(sid.ID, &sid.EnterpriseMeta),
+		}
+		seenUpstreams[psn] = struct{}{}
+	}
 
 	// Then store upstreams inferred from service-defaults and mapify the overrides.
 	var (
@@ -227,6 +225,22 @@ func ComputeResolvedServiceConfig(
 		resolvedConfigs[wildcard] = wildcardUpstreamDefaults
 	}
 
+	// For Consul 1.14.x, service-defaults would apply to either local or peer services as long
+	// as the `name` matched. We introduce `legacyUpstreams` as a compatibility mode for:
+	//   1. old agents, that are using the deprecated UpstreamIDs api
+	//   2. Migrations to 1.15 that do not specify the "peer" field. The behavior should remain the same
+	//      until the config entries are updates.
+	//
+	// This should be remove in Consul 1.16
+	var hasPeerUpstream bool
+	for _, override := range upstreamOverrides {
+		if override.Peer != "" {
+			hasPeerUpstream = true
+			break
+		}
+	}
+	legacyUpstreams := len(args.UpstreamIDs) > 0 || !hasPeerUpstream
+
 	for upstream := range seenUpstreams {
 		resolvedCfg := make(map[string]interface{})
 
@@ -282,6 +296,16 @@ func ComputeResolvedServiceConfig(
 		}
 
 		// Merge in Overrides for the upstream (step 5).
+		// In the legacy case, overrides only match on name. We remove the peer and try to match against
+		// our map of overrides. We still want to check the full PSN in the map in case there is a specific
+		// override that applies to peers.
+		if legacyUpstreams {
+			peerlessUpstream := upstream
+			peerlessUpstream.Peer = ""
+			if upstreamOverrides[peerlessUpstream] != nil {
+				upstreamOverrides[peerlessUpstream].MergeInto(resolvedCfg)
+			}
+		}
 		if upstreamOverrides[upstream] != nil {
 			upstreamOverrides[upstream].MergeInto(resolvedCfg)
 		}
@@ -296,11 +320,21 @@ func ComputeResolvedServiceConfig(
 		return &thisReply, nil
 	}
 
-	thisReply.UpstreamConfigs = make(structs.OpaqueUpstreamConfigs, 0, len(resolvedConfigs))
+	if len(args.UpstreamIDs) > 0 {
+		// DEPRECATED: Remove these legacy upstreams in Consul v1.16
+		thisReply.UpstreamIDConfigs = make(structs.OpaqueUpstreamConfigsDeprecated, 0, len(resolvedConfigs))
 
-	for us, conf := range resolvedConfigs {
-		thisReply.UpstreamConfigs = append(thisReply.UpstreamConfigs,
-			structs.OpaqueUpstreamConfig{Upstream: us, Config: conf})
+		for us, conf := range resolvedConfigs {
+			thisReply.UpstreamIDConfigs = append(thisReply.UpstreamIDConfigs,
+				structs.OpaqueUpstreamConfigDeprecated{Upstream: us.ServiceName.ToServiceID(), Config: conf})
+		}
+	} else {
+		thisReply.UpstreamConfigs = make(structs.OpaqueUpstreamConfigs, 0, len(resolvedConfigs))
+
+		for us, conf := range resolvedConfigs {
+			thisReply.UpstreamConfigs = append(thisReply.UpstreamConfigs,
+				structs.OpaqueUpstreamConfig{Upstream: us, Config: conf})
+		}
 	}
 
 	return &thisReply, nil
diff --git a/agent/configentry/resolve_test.go b/agent/configentry/resolve_test.go
index f93649df8ae7b..052e489196d4b 100644
--- a/agent/configentry/resolve_test.go
+++ b/agent/configentry/resolve_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package configentry
 
 import (
@@ -494,50 +491,6 @@ func Test_ComputeResolvedServiceConfig(t *testing.T) {
 				},
 			},
 		},
-		{
-			name: "service-defaults inherits mutual_tls_mode from proxy-defaults",
-			args: args{
-				scReq: &structs.ServiceConfigRequest{
-					Name: "sid",
-				},
-				entries: &ResolvedServiceConfigSet{
-					ProxyDefaults: map[string]*structs.ProxyConfigEntry{
-						acl.DefaultEnterpriseMeta().PartitionOrDefault(): {
-							MutualTLSMode: structs.MutualTLSModePermissive,
-						},
-					},
-					ServiceDefaults: map[structs.ServiceID]*structs.ServiceConfigEntry{
-						sid: {},
-					},
-				},
-			},
-			want: &structs.ServiceConfigResponse{
-				MutualTLSMode: structs.MutualTLSModePermissive,
-			},
-		},
-		{
-			name: "service-defaults overrides mutual_tls_mode in proxy-defaults",
-			args: args{
-				scReq: &structs.ServiceConfigRequest{
-					Name: "sid",
-				},
-				entries: &ResolvedServiceConfigSet{
-					ProxyDefaults: map[string]*structs.ProxyConfigEntry{
-						acl.DefaultEnterpriseMeta().PartitionOrDefault(): {
-							MutualTLSMode: structs.MutualTLSModeStrict,
-						},
-					},
-					ServiceDefaults: map[structs.ServiceID]*structs.ServiceConfigEntry{
-						sid: {
-							MutualTLSMode: structs.MutualTLSModePermissive,
-						},
-					},
-				},
-			},
-			want: &structs.ServiceConfigResponse{
-				MutualTLSMode: structs.MutualTLSModePermissive,
-			},
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
diff --git a/agent/configentry/service_config.go b/agent/configentry/service_config.go
index 83e24e27c390b..5cc6e740a404b 100644
--- a/agent/configentry/service_config.go
+++ b/agent/configentry/service_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package configentry
 
 import (
diff --git a/agent/connect/authz.go b/agent/connect/authz.go
index cc14dd0cb61d1..f3beb1be60da8 100644
--- a/agent/connect/authz.go
+++ b/agent/connect/authz.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
@@ -15,67 +12,47 @@ import (
 // The return value of `auth` is only valid if the second value `match` is true.
 // If `match` is false, then the intention doesn't match this target and any result should be ignored.
 func AuthorizeIntentionTarget(
-	target, targetNS, targetAP, targetPeer string,
-	ixn *structs.Intention,
-	matchType structs.IntentionMatchType,
-) (bool, bool) {
-
-	match := IntentionMatch(target, targetNS, targetAP, targetPeer, ixn, matchType)
-
-	if match {
-		return ixn.Action == structs.IntentionActionAllow, true
-	} else {
-		return false, false
-	}
-}
-
-// IntentionMatch determines whether the target is covered by the given intention.
-func IntentionMatch(
-	target, targetNS, targetAP, targetPeer string,
+	target, targetNS, targetAP string,
 	ixn *structs.Intention,
 	matchType structs.IntentionMatchType,
-) bool {
+) (auth bool, match bool) {
 
 	switch matchType {
 	case structs.IntentionMatchDestination:
 		if acl.PartitionOrDefault(ixn.DestinationPartition) != acl.PartitionOrDefault(targetAP) {
-			return false
+			return false, false
 		}
 
 		if ixn.DestinationNS != structs.WildcardSpecifier && ixn.DestinationNS != targetNS {
 			// Non-matching namespace
-			return false
+			return false, false
 		}
 
 		if ixn.DestinationName != structs.WildcardSpecifier && ixn.DestinationName != target {
 			// Non-matching name
-			return false
+			return false, false
 		}
 
 	case structs.IntentionMatchSource:
-		if ixn.SourcePeer != targetPeer {
-			return false
-		}
-
 		if acl.PartitionOrDefault(ixn.SourcePartition) != acl.PartitionOrDefault(targetAP) {
-			return false
+			return false, false
 		}
 
 		if ixn.SourceNS != structs.WildcardSpecifier && ixn.SourceNS != targetNS {
 			// Non-matching namespace
-			return false
+			return false, false
 		}
 
 		if ixn.SourceName != structs.WildcardSpecifier && ixn.SourceName != target {
 			// Non-matching name
-			return false
+			return false, false
 		}
 
 	default:
 		// Reject on any un-recognized match type
-		return false
+		return false, false
 	}
 
 	// The name and namespace match, so the destination is covered
-	return true
+	return ixn.Action == structs.IntentionActionAllow, true
 }
diff --git a/agent/connect/authz_test.go b/agent/connect/authz_test.go
index 1cbf17517d819..cad97646d82db 100644
--- a/agent/connect/authz_test.go
+++ b/agent/connect/authz_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
@@ -11,15 +8,14 @@ import (
 
 func TestAuthorizeIntentionTarget(t *testing.T) {
 	cases := []struct {
-		name       string
-		target     string
-		targetNS   string
-		targetAP   string
-		targetPeer string
-		ixn        *structs.Intention
-		matchType  structs.IntentionMatchType
-		auth       bool
-		match      bool
+		name      string
+		target    string
+		targetNS  string
+		targetAP  string
+		ixn       *structs.Intention
+		matchType structs.IntentionMatchType
+		auth      bool
+		match     bool
 	}{
 		// Source match type
 		{
@@ -144,41 +140,11 @@ func TestAuthorizeIntentionTarget(t *testing.T) {
 			auth:      false,
 			match:     false,
 		},
-		{
-			name:       "match peer",
-			target:     "web",
-			targetNS:   structs.IntentionDefaultNamespace,
-			targetPeer: "cluster-01",
-			ixn: &structs.Intention{
-				SourceName: "web",
-				SourceNS:   structs.IntentionDefaultNamespace,
-				SourcePeer: "cluster-01",
-				Action:     structs.IntentionActionAllow,
-			},
-			matchType: structs.IntentionMatchSource,
-			auth:      true,
-			match:     true,
-		},
-		{
-			name:       "no peer match",
-			target:     "web",
-			targetNS:   structs.IntentionDefaultNamespace,
-			targetPeer: "cluster-02",
-			ixn: &structs.Intention{
-				SourceName: "web",
-				SourceNS:   structs.IntentionDefaultNamespace,
-				SourcePeer: "cluster-01",
-				Action:     structs.IntentionActionAllow,
-			},
-			matchType: structs.IntentionMatchSource,
-			auth:      false,
-			match:     false,
-		},
 	}
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			auth, match := AuthorizeIntentionTarget(tc.target, tc.targetNS, tc.targetAP, tc.targetPeer, tc.ixn, tc.matchType)
+			auth, match := AuthorizeIntentionTarget(tc.target, tc.targetNS, tc.targetAP, tc.ixn, tc.matchType)
 			assert.Equal(t, tc.auth, auth)
 			assert.Equal(t, tc.match, match)
 		})
diff --git a/agent/connect/ca/common.go b/agent/connect/ca/common.go
index f52b030ed977e..848a4fa7b1736 100644
--- a/agent/connect/ca/common.go
+++ b/agent/connect/ca/common.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
diff --git a/agent/connect/ca/mock_Provider.go b/agent/connect/ca/mock_Provider.go
index 0a745ad9bb3f9..50136cbc74a2e 100644
--- a/agent/connect/ca/mock_Provider.go
+++ b/agent/connect/ca/mock_Provider.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.20.0. DO NOT EDIT.
+// Code generated by mockery v2.15.0. DO NOT EDIT.
 
 package ca
 
@@ -13,21 +13,18 @@ type MockProvider struct {
 	mock.Mock
 }
 
-// ActiveLeafSigningCert provides a mock function with given fields:
-func (_m *MockProvider) ActiveLeafSigningCert() (string, error) {
+// ActiveIntermediate provides a mock function with given fields:
+func (_m *MockProvider) ActiveIntermediate() (string, error) {
 	ret := _m.Called()
 
 	var r0 string
-	var r1 error
-	if rf, ok := ret.Get(0).(func() (string, error)); ok {
-		return rf()
-	}
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
 	} else {
 		r0 = ret.Get(0).(string)
 	}
 
+	var r1 error
 	if rf, ok := ret.Get(1).(func() error); ok {
 		r1 = rf()
 	} else {
@@ -70,16 +67,13 @@ func (_m *MockProvider) CrossSignCA(_a0 *x509.Certificate) (string, error) {
 	ret := _m.Called(_a0)
 
 	var r0 string
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*x509.Certificate) (string, error)); ok {
-		return rf(_a0)
-	}
 	if rf, ok := ret.Get(0).(func(*x509.Certificate) string); ok {
 		r0 = rf(_a0)
 	} else {
 		r0 = ret.Get(0).(string)
 	}
 
+	var r1 error
 	if rf, ok := ret.Get(1).(func(*x509.Certificate) error); ok {
 		r1 = rf(_a0)
 	} else {
@@ -89,21 +83,18 @@ func (_m *MockProvider) CrossSignCA(_a0 *x509.Certificate) (string, error) {
 	return r0, r1
 }
 
-// GenerateCAChain provides a mock function with given fields:
-func (_m *MockProvider) GenerateCAChain() (string, error) {
+// GenerateIntermediate provides a mock function with given fields:
+func (_m *MockProvider) GenerateIntermediate() (string, error) {
 	ret := _m.Called()
 
 	var r0 string
-	var r1 error
-	if rf, ok := ret.Get(0).(func() (string, error)); ok {
-		return rf()
-	}
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
 	} else {
 		r0 = ret.Get(0).(string)
 	}
 
+	var r1 error
 	if rf, ok := ret.Get(1).(func() error); ok {
 		r1 = rf()
 	} else {
@@ -118,23 +109,20 @@ func (_m *MockProvider) GenerateIntermediateCSR() (string, string, error) {
 	ret := _m.Called()
 
 	var r0 string
-	var r1 string
-	var r2 error
-	if rf, ok := ret.Get(0).(func() (string, string, error)); ok {
-		return rf()
-	}
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
 	} else {
 		r0 = ret.Get(0).(string)
 	}
 
+	var r1 string
 	if rf, ok := ret.Get(1).(func() string); ok {
 		r1 = rf()
 	} else {
 		r1 = ret.Get(1).(string)
 	}
 
+	var r2 error
 	if rf, ok := ret.Get(2).(func() error); ok {
 		r2 = rf()
 	} else {
@@ -144,6 +132,27 @@ func (_m *MockProvider) GenerateIntermediateCSR() (string, string, error) {
 	return r0, r1, r2
 }
 
+// GenerateRoot provides a mock function with given fields:
+func (_m *MockProvider) GenerateRoot() (RootResult, error) {
+	ret := _m.Called()
+
+	var r0 RootResult
+	if rf, ok := ret.Get(0).(func() RootResult); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(RootResult)
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func() error); ok {
+		r1 = rf()
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // SetIntermediate provides a mock function with given fields: intermediatePEM, rootPEM, opaque
 func (_m *MockProvider) SetIntermediate(intermediatePEM string, rootPEM string, opaque string) error {
 	ret := _m.Called(intermediatePEM, rootPEM, opaque)
@@ -163,16 +172,13 @@ func (_m *MockProvider) Sign(_a0 *x509.CertificateRequest) (string, error) {
 	ret := _m.Called(_a0)
 
 	var r0 string
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*x509.CertificateRequest) (string, error)); ok {
-		return rf(_a0)
-	}
 	if rf, ok := ret.Get(0).(func(*x509.CertificateRequest) string); ok {
 		r0 = rf(_a0)
 	} else {
 		r0 = ret.Get(0).(string)
 	}
 
+	var r1 error
 	if rf, ok := ret.Get(1).(func(*x509.CertificateRequest) error); ok {
 		r1 = rf(_a0)
 	} else {
@@ -187,16 +193,13 @@ func (_m *MockProvider) SignIntermediate(_a0 *x509.CertificateRequest) (string,
 	ret := _m.Called(_a0)
 
 	var r0 string
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*x509.CertificateRequest) (string, error)); ok {
-		return rf(_a0)
-	}
 	if rf, ok := ret.Get(0).(func(*x509.CertificateRequest) string); ok {
 		r0 = rf(_a0)
 	} else {
 		r0 = ret.Get(0).(string)
 	}
 
+	var r1 error
 	if rf, ok := ret.Get(1).(func(*x509.CertificateRequest) error); ok {
 		r1 = rf(_a0)
 	} else {
@@ -211,10 +214,6 @@ func (_m *MockProvider) State() (map[string]string, error) {
 	ret := _m.Called()
 
 	var r0 map[string]string
-	var r1 error
-	if rf, ok := ret.Get(0).(func() (map[string]string, error)); ok {
-		return rf()
-	}
 	if rf, ok := ret.Get(0).(func() map[string]string); ok {
 		r0 = rf()
 	} else {
@@ -223,6 +222,7 @@ func (_m *MockProvider) State() (map[string]string, error) {
 		}
 	}
 
+	var r1 error
 	if rf, ok := ret.Get(1).(func() error); ok {
 		r1 = rf()
 	} else {
@@ -237,16 +237,13 @@ func (_m *MockProvider) SupportsCrossSigning() (bool, error) {
 	ret := _m.Called()
 
 	var r0 bool
-	var r1 error
-	if rf, ok := ret.Get(0).(func() (bool, error)); ok {
-		return rf()
-	}
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
 	} else {
 		r0 = ret.Get(0).(bool)
 	}
 
+	var r1 error
 	if rf, ok := ret.Get(1).(func() error); ok {
 		r1 = rf()
 	} else {
diff --git a/agent/connect/ca/provider.go b/agent/connect/ca/provider.go
index 898da46af7290..c80ccd82be950 100644
--- a/agent/connect/ca/provider.go
+++ b/agent/connect/ca/provider.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
@@ -17,16 +14,12 @@ import (
 // on servers and CA provider.
 var ErrRateLimited = errors.New("operation rate limited by CA provider")
 
-// PrimaryUsesIntermediate is an optional interface that CA providers may implement
+// PrimaryUsesIntermediate is an optional interface  that CA providers may implement
 // to indicate that they use an intermediate cert in the primary datacenter as
 // well as the secondary. This is used when determining whether to run the
 // intermediate renewal routine in the primary.
 type PrimaryUsesIntermediate interface {
-	// GenerateLeafSigningCert returns a new intermediate signing cert and sets it to
-	// the active intermediate. If multiple intermediates are needed to complete
-	// the chain from the signing certificate back to the active root, they should
-	// all by bundled here.
-	GenerateLeafSigningCert() (string, error)
+	PrimaryUsesIntermediate()
 }
 
 // ProviderConfig encapsulates all the data Consul passes to `Configure` on a
@@ -91,12 +84,12 @@ type Provider interface {
 	// in the Provider struct so it won't change after being returned.
 	State() (map[string]string, error)
 
-	// ActiveLeafSigningCert returns the current signing cert used by this provider
+	// ActiveIntermediate returns the current signing cert used by this provider
 	// for generating SPIFFE leaf certs. Note that this must not change except
-	// when Consul requests the change via GenerateLeafSigningCert. Changing the
+	// when Consul requests the change via GenerateIntermediate. Changing the
 	// signing cert will break Consul's assumptions about which validation paths
 	// are active.
-	ActiveLeafSigningCert() (string, error)
+	ActiveIntermediate() (string, error)
 
 	// Sign signs a leaf certificate used by Connect proxies from a CSR. The PEM
 	// returned should include only the leaf certificate as all Intermediates
@@ -125,22 +118,25 @@ type Provider interface {
 }
 
 type PrimaryProvider interface {
-	// GenerateCAChain is called:
+	// GenerateRoot is called:
 	//   * to initialize the CA system when a server is elected as a raft leader
 	//   * when the CA configuration is updated in a way that might require
 	//     generating a new root certificate.
 	//
-	// In both cases GenerateCAChain is always called on a newly created provider
+	// In both cases GenerateRoot is always called on a newly created provider
 	// after calling Provider.Configure, and before any other calls to the
 	// provider.
 	//
-	// Depending on the provider and its configuration, GenerateCAChain may return
-	// a single root certificate or a chain of certs.
-	// The first certificate must be the primary CA used to sign intermediates for
-	// secondary datacenters, and the last certificate must be the trusted CA.
-	// The provider should return an existing CA chain if one exists or generate a
-	// new one and return it.
-	GenerateCAChain() (string, error)
+	// The provider should return an existing root certificate if one exists,
+	// otherwise it should generate a new root certificate and return it.
+	GenerateRoot() (RootResult, error)
+
+	// GenerateIntermediate returns a new intermediate signing cert and sets it to
+	// the active intermediate. If multiple intermediates are needed to complete
+	// the chain from the signing certificate back to the active root, they should
+	// all by bundled here.
+	// TODO: replace with GenerateLeafSigningCert (https://github.com/hashicorp/consul/issues/12386)
+	GenerateIntermediate() (string, error)
 
 	// SignIntermediate will validate the CSR to ensure the trust domain in the
 	// URI SAN matches the local one and that basic constraints for a CA
@@ -152,7 +148,7 @@ type PrimaryProvider interface {
 	SignIntermediate(*x509.CertificateRequest) (string, error)
 
 	// CrossSignCA must accept a CA certificate from another CA provider and cross
-	// sign it exactly as it is such that it forms a chain back the
+	// sign it exactly as it is such that it forms a chain back the the
 	// CAProvider's current root. Specifically, the Distinguished Name, Subject
 	// Alternative Name, SubjectKeyID and other relevant extensions must be kept.
 	// The resulting certificate must have a distinct Serial Number and the
@@ -196,8 +192,10 @@ type SecondaryProvider interface {
 	SetIntermediate(intermediatePEM, rootPEM, opaque string) error
 }
 
-// CAChainResult is the result returned by PrimaryProvider.GenerateCAChain.
-type CAChainResult struct {
+// RootResult is the result returned by PrimaryProvider.GenerateRoot.
+//
+// TODO: rename this struct
+type RootResult struct {
 	// PEM encoded bundle of CA certificates. The first certificate must be the
 	// primary CA used to sign intermediates for secondary datacenters, and the
 	// last certificate must be the trusted CA.
@@ -205,11 +203,6 @@ type CAChainResult struct {
 	// If there is only a single certificate in the bundle then it will be used
 	// as both the primary CA and the trusted CA.
 	PEM string
-
-	// IntermediatePEM is an encoded bundle of CA certificates used only by
-	// providers that use an intermediate CA to sign leaf certificates (e.g.
-	// Vault). Its issuer should form a chain leading to the trusted CA in PEM.
-	IntermediatePEM string
 }
 
 // NeedsStop is an optional interface that allows a CA to define a function
diff --git a/agent/connect/ca/provider_aws.go b/agent/connect/ca/provider_aws.go
index 1ce5a5eba57d8..97e075b114a61 100644
--- a/agent/connect/ca/provider_aws.go
+++ b/agent/connect/ca/provider_aws.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
@@ -139,20 +136,20 @@ func (a *AWSProvider) State() (map[string]string, error) {
 	return state, nil
 }
 
-// GenerateCAChain implements Provider
-func (a *AWSProvider) GenerateCAChain() (string, error) {
+// GenerateRoot implements Provider
+func (a *AWSProvider) GenerateRoot() (RootResult, error) {
 	if !a.isPrimary {
-		return "", fmt.Errorf("provider is not the root certificate authority")
+		return RootResult{}, fmt.Errorf("provider is not the root certificate authority")
 	}
 
 	if err := a.ensureCA(); err != nil {
-		return "", err
+		return RootResult{}, err
 	}
 
 	if a.rootPEM == "" {
-		return "", fmt.Errorf("AWS CA provider not fully Initialized")
+		return RootResult{}, fmt.Errorf("AWS CA provider not fully Initialized")
 	}
-	return a.rootPEM, nil
+	return RootResult{PEM: a.rootPEM}, nil
 }
 
 // ensureCA loads the CA resource to check it exists if configured by User or in
@@ -545,8 +542,8 @@ func (a *AWSProvider) SetIntermediate(intermediatePEM string, rootPEM string, _
 	return nil
 }
 
-// ActiveLeafSigningCert implements Provider
-func (a *AWSProvider) ActiveLeafSigningCert() (string, error) {
+// ActiveIntermediate implements Provider
+func (a *AWSProvider) ActiveIntermediate() (string, error) {
 	err := a.ensureCA()
 	if err != nil {
 		return "", err
@@ -574,6 +571,19 @@ func (a *AWSProvider) ActiveLeafSigningCert() (string, error) {
 	return a.intermediatePEM, nil
 }
 
+// GenerateIntermediate implements Provider
+func (a *AWSProvider) GenerateIntermediate() (string, error) {
+	// Like the consul provider, for now the Primary DC just gets a root and no
+	// intermediate to sign with. so just return this. Secondaries use
+	// intermediates but this method is only called during primary DC (root)
+	// initialization in case a provider generates separate root and
+	// intermediates.
+	//
+	// TODO(banks) support user-supplied CA being a Subordinate even in the
+	// primary DC.
+	return a.ActiveIntermediate()
+}
+
 // Sign implements Provider
 func (a *AWSProvider) Sign(csr *x509.CertificateRequest) (string, error) {
 	connect.HackSANExtensionForCSR(csr)
diff --git a/agent/connect/ca/provider_aws_test.go b/agent/connect/ca/provider_aws_test.go
index d46221af1fce9..f6105d3dc8343 100644
--- a/agent/connect/ca/provider_aws_test.go
+++ b/agent/connect/ca/provider_aws_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
@@ -49,9 +46,18 @@ func TestAWSBootstrapAndSignPrimary(t *testing.T) {
 			provider := testAWSProvider(t, testProviderConfigPrimary(t, cfg))
 			defer provider.Cleanup(true, nil)
 
-			rootPEM, err := provider.GenerateCAChain()
+			root, err := provider.GenerateRoot()
+			require.NoError(t, err)
+			rootPEM := root.PEM
+
+			// Generate Intermediate (not actually needed for this provider for now
+			// but this simulates the calls in Server.initializeRoot).
+			interPEM, err := provider.GenerateIntermediate()
 			require.NoError(t, err)
 
+			// Should be the same for now
+			require.Equal(t, rootPEM, interPEM)
+
 			// Ensure they use the right key type
 			rootCert, err := connect.ParseCert(rootPEM)
 			require.NoError(t, err)
@@ -75,8 +81,9 @@ func TestAWSBootstrapAndSignPrimary(t *testing.T) {
 		provider := testAWSProvider(t, testProviderConfigPrimary(t, nil))
 		defer provider.Cleanup(true, nil)
 
-		rootPEM, err := provider.GenerateCAChain()
+		root, err := provider.GenerateRoot()
 		require.NoError(t, err)
+		rootPEM := root.PEM
 
 		// Ensure they use the right key type
 		rootCert, err := connect.ParseCert(rootPEM)
@@ -109,8 +116,9 @@ func TestAWSBootstrapAndSignSecondary(t *testing.T) {
 
 	p1 := testAWSProvider(t, testProviderConfigPrimary(t, nil))
 	defer p1.Cleanup(true, nil)
-	rootPEM, err := p1.GenerateCAChain()
+	root, err := p1.GenerateRoot()
 	require.NoError(t, err)
+	rootPEM := root.PEM
 
 	p2 := testAWSProvider(t, testProviderConfigSecondary(t, nil))
 	defer p2.Cleanup(true, nil)
@@ -118,7 +126,7 @@ func TestAWSBootstrapAndSignSecondary(t *testing.T) {
 	testSignIntermediateCrossDC(t, p1, p2)
 
 	// Fetch intermediate from s2 now for later comparison
-	intPEM, err := p2.ActiveLeafSigningCert()
+	intPEM, err := p2.ActiveIntermediate()
 	require.NoError(t, err)
 
 	// Capture the state of the providers we've setup
@@ -137,14 +145,15 @@ func TestAWSBootstrapAndSignSecondary(t *testing.T) {
 		cfg1 := testProviderConfigPrimary(t, nil)
 		cfg1.State = p1State
 		p1 = testAWSProvider(t, cfg1)
-		newRootPEM, err := p1.GenerateCAChain()
+		root, err := p1.GenerateRoot()
 		require.NoError(t, err)
+		newRootPEM := root.PEM
 
 		cfg2 := testProviderConfigPrimary(t, nil)
 		cfg2.State = p2State
 		p2 = testAWSProvider(t, cfg2)
-		// Need call ActiveLeafSigningCert like leader would to trigger loading from PCA
-		newIntPEM, err := p2.ActiveLeafSigningCert()
+		// Need call ActiveIntermediate like leader would to trigger loading from PCA
+		newIntPEM, err := p2.ActiveIntermediate()
 		require.NoError(t, err)
 
 		// Root cert should not have changed
@@ -170,16 +179,17 @@ func TestAWSBootstrapAndSignSecondary(t *testing.T) {
 			"ExistingARN": p1State[AWSStateCAARNKey],
 		})
 		p1 = testAWSProvider(t, cfg1)
-		newRootPEM, err := p1.GenerateCAChain()
+		root, err := p1.GenerateRoot()
 		require.NoError(t, err)
+		newRootPEM := root.PEM
 
 		cfg2 := testProviderConfigPrimary(t, map[string]interface{}{
 			"ExistingARN": p2State[AWSStateCAARNKey],
 		})
 		cfg1.RawConfig["ExistingARN"] = p2State[AWSStateCAARNKey]
 		p2 = testAWSProvider(t, cfg2)
-		// Need call ActiveLeafSigningCert like leader would to trigger loading from PCA
-		newIntPEM, err := p2.ActiveLeafSigningCert()
+		// Need call ActiveIntermediate like leader would to trigger loading from PCA
+		newIntPEM, err := p2.ActiveIntermediate()
 		require.NoError(t, err)
 
 		// Root cert should not have changed
@@ -208,9 +218,10 @@ func TestAWSBootstrapAndSignSecondary(t *testing.T) {
 		p2 = testAWSProvider(t, cfg2)
 		require.NoError(t, p2.SetIntermediate(newIntPEM, newRootPEM, ""))
 
-		newRootPEM, err = p1.GenerateCAChain()
+		root, err = p1.GenerateRoot()
 		require.NoError(t, err)
-		newIntPEM, err = p2.ActiveLeafSigningCert()
+		newRootPEM = root.PEM
+		newIntPEM, err = p2.ActiveIntermediate()
 		require.NoError(t, err)
 
 		require.Equal(t, rootPEM, newRootPEM)
@@ -229,7 +240,7 @@ func TestAWSBootstrapAndSignSecondaryConsul(t *testing.T) {
 		p1 := TestConsulProvider(t, delegate)
 		cfg := testProviderConfig(conf)
 		require.NoError(t, p1.Configure(cfg))
-		_, err := p1.GenerateCAChain()
+		_, err := p1.GenerateRoot()
 		require.NoError(t, err)
 
 		p2 := testAWSProvider(t, testProviderConfigSecondary(t, nil))
@@ -242,7 +253,7 @@ func TestAWSBootstrapAndSignSecondaryConsul(t *testing.T) {
 		p1 := testAWSProvider(t, testProviderConfigPrimary(t, nil))
 		defer p1.Cleanup(true, nil)
 
-		_, err := p1.GenerateCAChain()
+		_, err := p1.GenerateRoot()
 		require.NoError(t, err)
 
 		conf := testConsulCAConfig()
@@ -320,7 +331,7 @@ func TestAWSProvider_Cleanup(t *testing.T) {
 		// create a provider with the default config which will create the CA
 		p1Conf := testProviderConfigPrimary(t, nil)
 		p1 := testAWSProvider(t, p1Conf)
-		p1.GenerateCAChain()
+		p1.GenerateRoot()
 
 		t.Cleanup(func() {
 			// This is a fail safe just in case the Cleanup routine of the
@@ -354,7 +365,7 @@ func TestAWSProvider_Cleanup(t *testing.T) {
 		// create a provider with the default config which will create the CA
 		p1Conf := testProviderConfigPrimary(t, nil)
 		p1 := testAWSProvider(t, p1Conf)
-		p1.GenerateCAChain()
+		p1.GenerateRoot()
 
 		t.Cleanup(func() {
 			// This is a fail safe just in case the Cleanup routine of the
@@ -391,7 +402,7 @@ func TestAWSProvider_Cleanup(t *testing.T) {
 		// create a provider with the default config which will create the CA
 		p1Conf := testProviderConfigPrimary(t, nil)
 		p1 := testAWSProvider(t, p1Conf)
-		p1.GenerateCAChain()
+		p1.GenerateRoot()
 
 		t.Cleanup(func() {
 			// the p2 provider should not remove the CA but we need to ensure that
diff --git a/agent/connect/ca/provider_consul.go b/agent/connect/ca/provider_consul.go
index a4aba91942bf4..0493fffe75a61 100644
--- a/agent/connect/ca/provider_consul.go
+++ b/agent/connect/ca/provider_consul.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
@@ -154,18 +151,18 @@ func (c *ConsulProvider) State() (map[string]string, error) {
 	return c.testState, nil
 }
 
-// GenerateCAChain initializes a new root certificate and private key if needed.
-func (c *ConsulProvider) GenerateCAChain() (string, error) {
+// GenerateRoot initializes a new root certificate and private key if needed.
+func (c *ConsulProvider) GenerateRoot() (RootResult, error) {
 	providerState, err := c.getState()
 	if err != nil {
-		return "", err
+		return RootResult{}, err
 	}
 
 	if !c.isPrimary {
-		return "", fmt.Errorf("provider is not the root certificate authority")
+		return RootResult{}, fmt.Errorf("provider is not the root certificate authority")
 	}
 	if providerState.RootCert != "" {
-		return providerState.RootCert, nil
+		return RootResult{PEM: providerState.RootCert}, nil
 	}
 
 	// Generate a private key if needed
@@ -173,7 +170,7 @@ func (c *ConsulProvider) GenerateCAChain() (string, error) {
 	if c.config.PrivateKey == "" {
 		_, pk, err := connect.GeneratePrivateKeyWithConfig(c.config.PrivateKeyType, c.config.PrivateKeyBits)
 		if err != nil {
-			return "", err
+			return RootResult{}, err
 		}
 		newState.PrivateKey = pk
 	} else {
@@ -184,12 +181,12 @@ func (c *ConsulProvider) GenerateCAChain() (string, error) {
 	if c.config.RootCert == "" {
 		nextSerial, err := c.incrementAndGetNextSerialNumber()
 		if err != nil {
-			return "", fmt.Errorf("error computing next serial number: %v", err)
+			return RootResult{}, fmt.Errorf("error computing next serial number: %v", err)
 		}
 
 		ca, err := c.generateCA(newState.PrivateKey, nextSerial, c.config.RootCertTTL)
 		if err != nil {
-			return "", fmt.Errorf("error generating CA: %v", err)
+			return RootResult{}, fmt.Errorf("error generating CA: %v", err)
 		}
 		newState.RootCert = ca
 	} else {
@@ -202,10 +199,10 @@ func (c *ConsulProvider) GenerateCAChain() (string, error) {
 		ProviderState: &newState,
 	}
 	if _, err := c.Delegate.ApplyCARequest(args); err != nil {
-		return "", err
+		return RootResult{}, err
 	}
 
-	return newState.RootCert, nil
+	return RootResult{PEM: newState.RootCert}, nil
 }
 
 // GenerateIntermediateCSR creates a private key and generates a CSR
@@ -280,7 +277,7 @@ func (c *ConsulProvider) SetIntermediate(intermediatePEM, rootPEM, _ string) err
 	return nil
 }
 
-func (c *ConsulProvider) ActiveLeafSigningCert() (string, error) {
+func (c *ConsulProvider) ActiveIntermediate() (string, error) {
 	providerState, err := c.getState()
 	if err != nil {
 		return "", err
@@ -292,6 +289,12 @@ func (c *ConsulProvider) ActiveLeafSigningCert() (string, error) {
 	return providerState.IntermediateCert, nil
 }
 
+// We aren't maintaining separate root/intermediate CAs for the builtin
+// provider, so just return the root.
+func (c *ConsulProvider) GenerateIntermediate() (string, error) {
+	return c.ActiveIntermediate()
+}
+
 // Remove the state store entry for this provider instance.
 func (c *ConsulProvider) Cleanup(_ bool, _ map[string]interface{}) error {
 	// This method only gets called for final cleanup. Therefore we don't
@@ -348,7 +351,7 @@ func (c *ConsulProvider) Sign(csr *x509.CertificateRequest) (string, error) {
 	}
 
 	// Parse the CA cert
-	certPEM, err := c.ActiveLeafSigningCert()
+	certPEM, err := c.ActiveIntermediate()
 	if err != nil {
 		return "", err
 	}
diff --git a/agent/connect/ca/provider_consul_config.go b/agent/connect/ca/provider_consul_config.go
index c7e8b0346cdb9..eb04ce9a7f737 100644
--- a/agent/connect/ca/provider_consul_config.go
+++ b/agent/connect/ca/provider_consul_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
diff --git a/agent/connect/ca/provider_consul_test.go b/agent/connect/ca/provider_consul_test.go
index 658a97d39bd97..9845eea74c988 100644
--- a/agent/connect/ca/provider_consul_test.go
+++ b/agent/connect/ca/provider_consul_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
@@ -87,16 +84,16 @@ func TestConsulCAProvider_Bootstrap(t *testing.T) {
 	provider := TestConsulProvider(t, delegate)
 	require.NoError(t, provider.Configure(testProviderConfig(conf)))
 
-	root, err := provider.GenerateCAChain()
+	root, err := provider.GenerateRoot()
 	require.NoError(t, err)
 
 	// Intermediate should be the same cert.
-	inter, err := provider.ActiveLeafSigningCert()
+	inter, err := provider.ActiveIntermediate()
 	require.NoError(t, err)
-	require.Equal(t, root, inter)
+	require.Equal(t, root.PEM, inter)
 
 	// Should be a valid cert
-	parsed, err := connect.ParseCert(root)
+	parsed, err := connect.ParseCert(root.PEM)
 	require.NoError(t, err)
 	require.Equal(t, parsed.URIs[0].String(), fmt.Sprintf("spiffe://%s.consul", conf.ClusterID))
 	requireNotEncoded(t, parsed.SubjectKeyId)
@@ -126,12 +123,12 @@ func TestConsulCAProvider_Bootstrap_WithCert(t *testing.T) {
 	provider := TestConsulProvider(t, delegate)
 	require.NoError(t, provider.Configure(testProviderConfig(conf)))
 
-	root, err := provider.GenerateCAChain()
+	root, err := provider.GenerateRoot()
 	require.NoError(t, err)
-	require.Equal(t, root, rootCA.RootCert)
+	require.Equal(t, root.PEM, rootCA.RootCert)
 
 	// Should be a valid cert
-	parsed, err := connect.ParseCert(root)
+	parsed, err := connect.ParseCert(root.PEM)
 	require.NoError(t, err)
 
 	// test that the default root cert ttl was not applied to the provided cert
@@ -161,7 +158,7 @@ func TestConsulCAProvider_SignLeaf(t *testing.T) {
 
 			provider := TestConsulProvider(t, delegate)
 			require.NoError(t, provider.Configure(testProviderConfig(conf)))
-			_, err := provider.GenerateCAChain()
+			_, err := provider.GenerateRoot()
 			require.NoError(t, err)
 
 			spiffeService := &connect.SpiffeIDService{
@@ -274,7 +271,7 @@ func TestConsulCAProvider_CrossSignCA(t *testing.T) {
 			conf1.Config["PrivateKeyType"] = tc.SigningKeyType
 			conf1.Config["PrivateKeyBits"] = tc.SigningKeyBits
 			require.NoError(t, provider1.Configure(testProviderConfig(conf1)))
-			_, err := provider1.GenerateCAChain()
+			_, err := provider1.GenerateRoot()
 			require.NoError(t, err)
 
 			conf2 := testConsulCAConfig()
@@ -284,7 +281,7 @@ func TestConsulCAProvider_CrossSignCA(t *testing.T) {
 			conf2.Config["PrivateKeyType"] = tc.CSRKeyType
 			conf2.Config["PrivateKeyBits"] = tc.CSRKeyBits
 			require.NoError(t, provider2.Configure(testProviderConfig(conf2)))
-			_, err = provider2.GenerateCAChain()
+			_, err = provider2.GenerateRoot()
 			require.NoError(t, err)
 
 			testCrossSignProviders(t, provider1, provider2)
@@ -295,16 +292,16 @@ func TestConsulCAProvider_CrossSignCA(t *testing.T) {
 func testCrossSignProviders(t *testing.T, provider1, provider2 Provider) {
 
 	// Get the root from the new provider to be cross-signed.
-	root, err := provider2.GenerateCAChain()
+	root, err := provider2.GenerateRoot()
 	require.NoError(t, err)
 
-	newRoot, err := connect.ParseCert(root)
+	newRoot, err := connect.ParseCert(root.PEM)
 	require.NoError(t, err)
 	oldSubject := newRoot.Subject.CommonName
 	requireNotEncoded(t, newRoot.SubjectKeyId)
 	requireNotEncoded(t, newRoot.AuthorityKeyId)
 
-	newInterPEM, err := provider2.ActiveLeafSigningCert()
+	newInterPEM, err := provider2.ActiveIntermediate()
 	require.NoError(t, err)
 	newIntermediate, err := connect.ParseCert(newInterPEM)
 	require.NoError(t, err)
@@ -319,9 +316,9 @@ func testCrossSignProviders(t *testing.T, provider1, provider2 Provider) {
 	requireNotEncoded(t, xc.SubjectKeyId)
 	requireNotEncoded(t, xc.AuthorityKeyId)
 
-	p1Root, err := provider1.GenerateCAChain()
+	p1Root, err := provider1.GenerateRoot()
 	require.NoError(t, err)
-	oldRoot, err := connect.ParseCert(p1Root)
+	oldRoot, err := connect.ParseCert(p1Root.PEM)
 	require.NoError(t, err)
 	requireNotEncoded(t, oldRoot.SubjectKeyId)
 	requireNotEncoded(t, oldRoot.AuthorityKeyId)
@@ -382,15 +379,15 @@ func testCrossSignProvidersShouldFail(t *testing.T, provider1, provider2 Provide
 	t.Helper()
 
 	// Get the root from the new provider to be cross-signed.
-	root, err := provider2.GenerateCAChain()
+	root, err := provider2.GenerateRoot()
 	require.NoError(t, err)
 
-	newRoot, err := connect.ParseCert(root)
+	newRoot, err := connect.ParseCert(root.PEM)
 	require.NoError(t, err)
 	requireNotEncoded(t, newRoot.SubjectKeyId)
 	requireNotEncoded(t, newRoot.AuthorityKeyId)
 
-	newInterPEM, err := provider2.ActiveLeafSigningCert()
+	newInterPEM, err := provider2.ActiveIntermediate()
 	require.NoError(t, err)
 	newIntermediate, err := connect.ParseCert(newInterPEM)
 	require.NoError(t, err)
@@ -421,7 +418,7 @@ func TestConsulProvider_SignIntermediate(t *testing.T) {
 			conf1.Config["PrivateKeyType"] = tc.SigningKeyType
 			conf1.Config["PrivateKeyBits"] = tc.SigningKeyBits
 			require.NoError(t, provider1.Configure(testProviderConfig(conf1)))
-			_, err := provider1.GenerateCAChain()
+			_, err := provider1.GenerateRoot()
 			require.NoError(t, err)
 
 			conf2 := testConsulCAConfig()
@@ -452,9 +449,9 @@ func testSignIntermediateCrossDC(t *testing.T, provider1, provider2 Provider) {
 	// Sign the CSR with provider1.
 	intermediatePEM, err := provider1.SignIntermediate(csr)
 	require.NoError(t, err)
-	root, err := provider1.GenerateCAChain()
+	root, err := provider1.GenerateRoot()
 	require.NoError(t, err)
-	rootPEM := root
+	rootPEM := root.PEM
 
 	// Give the new intermediate to provider2 to use.
 	require.NoError(t, provider2.SetIntermediate(intermediatePEM, rootPEM, opaque))
@@ -527,7 +524,7 @@ func TestConsulCAProvider_MigrateOldID(t *testing.T) {
 
 			provider := TestConsulProvider(t, delegate)
 			require.NoError(t, provider.Configure(testProviderConfig(conf)))
-			_, err = provider.GenerateCAChain()
+			_, err = provider.GenerateRoot()
 			require.NoError(t, err)
 
 			// After running Configure, the old ID entry should be gone.
diff --git a/agent/connect/ca/provider_test.go b/agent/connect/ca/provider_test.go
index 85deedbf4cb57..c8cd65778238d 100644
--- a/agent/connect/ca/provider_test.go
+++ b/agent/connect/ca/provider_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
@@ -113,7 +110,7 @@ func TestStructs_CAConfiguration_MsgpackEncodeDecode(t *testing.T) {
 				TLSSkipVerify:          true,
 			},
 			parseFunc: func(t *testing.T, raw map[string]interface{}) interface{} {
-				config, err := ParseVaultCAConfig(raw, true)
+				config, err := ParseVaultCAConfig(raw)
 				require.NoError(t, err)
 				return config
 			},
diff --git a/agent/connect/ca/provider_vault.go b/agent/connect/ca/provider_vault.go
index 60627b5314a24..cafb350f940f2 100644
--- a/agent/connect/ca/provider_vault.go
+++ b/agent/connect/ca/provider_vault.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
@@ -11,6 +8,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 	"strings"
 	"time"
 
@@ -98,7 +96,7 @@ func vaultTLSConfig(config *structs.VaultCAProviderConfig) *vaultapi.TLSConfig {
 // Configure sets up the provider using the given configuration.
 // Configure supports being called multiple times to re-configure the provider.
 func (v *VaultProvider) Configure(cfg ProviderConfig) error {
-	config, err := ParseVaultCAConfig(cfg.RawConfig, v.isPrimary)
+	config, err := ParseVaultCAConfig(cfg.RawConfig)
 	if err != nil {
 		return err
 	}
@@ -189,11 +187,11 @@ func (v *VaultProvider) Configure(cfg ProviderConfig) error {
 }
 
 func (v *VaultProvider) ValidateConfigUpdate(prevRaw, nextRaw map[string]interface{}) error {
-	prev, err := ParseVaultCAConfig(prevRaw, v.isPrimary)
+	prev, err := ParseVaultCAConfig(prevRaw)
 	if err != nil {
 		return fmt.Errorf("failed to parse existing CA config: %w", err)
 	}
-	next, err := ParseVaultCAConfig(nextRaw, v.isPrimary)
+	next, err := ParseVaultCAConfig(nextRaw)
 	if err != nil {
 		return fmt.Errorf("failed to parse new CA config: %w", err)
 	}
@@ -276,10 +274,10 @@ func (v *VaultProvider) State() (map[string]string, error) {
 	return nil, nil
 }
 
-// GenerateCAChain mounts and initializes a new root PKI backend if needed.
-func (v *VaultProvider) GenerateCAChain() (string, error) {
+// GenerateRoot mounts and initializes a new root PKI backend if needed.
+func (v *VaultProvider) GenerateRoot() (RootResult, error) {
 	if !v.isPrimary {
-		return "", fmt.Errorf("provider is not the root certificate authority")
+		return RootResult{}, fmt.Errorf("provider is not the root certificate authority")
 	}
 
 	// Set up the root PKI backend if necessary.
@@ -299,7 +297,7 @@ func (v *VaultProvider) GenerateCAChain() (string, error) {
 			},
 		})
 		if err != nil {
-			return "", fmt.Errorf("failed to mount root CA backend: %w", err)
+			return RootResult{}, fmt.Errorf("failed to mount root CA backend: %w", err)
 		}
 
 		// We want to initialize afterwards
@@ -307,7 +305,7 @@ func (v *VaultProvider) GenerateCAChain() (string, error) {
 	case ErrBackendNotInitialized:
 		uid, err := connect.CompactUID()
 		if err != nil {
-			return "", err
+			return RootResult{}, err
 		}
 		resp, err := v.writeNamespaced(v.config.RootPKINamespace, v.config.RootPKIPath+"root/generate/internal", map[string]interface{}{
 			"common_name": connect.CACN("vault", uid, v.clusterID, v.isPrimary),
@@ -316,23 +314,23 @@ func (v *VaultProvider) GenerateCAChain() (string, error) {
 			"key_bits":    v.config.PrivateKeyBits,
 		})
 		if err != nil {
-			return "", fmt.Errorf("failed to initialize root CA: %w", err)
+			return RootResult{}, fmt.Errorf("failed to initialize root CA: %w", err)
 		}
 		var ok bool
 		rootPEM, ok = resp.Data["certificate"].(string)
 		if !ok {
-			return "", fmt.Errorf("unexpected response from Vault: %v", resp.Data["certificate"])
+			return RootResult{}, fmt.Errorf("unexpected response from Vault: %v", resp.Data["certificate"])
 		}
 
 	default:
 		if err != nil {
-			return "", fmt.Errorf("unexpected error while setting root PKI backend: %w", err)
+			return RootResult{}, fmt.Errorf("unexpected error while setting root PKI backend: %w", err)
 		}
 	}
 
 	rootChain, err := v.getCAChain(v.config.RootPKINamespace, v.config.RootPKIPath)
 	if err != nil {
-		return "", err
+		return RootResult{}, err
 	}
 
 	// Workaround for a bug in the Vault PKI API.
@@ -341,7 +339,7 @@ func (v *VaultProvider) GenerateCAChain() (string, error) {
 		rootChain = rootPEM
 	}
 
-	return rootChain, nil
+	return RootResult{PEM: rootChain}, nil
 }
 
 // GenerateIntermediateCSR creates a private key and generates a CSR
@@ -424,9 +422,6 @@ func (v *VaultProvider) setupIntermediatePKIPath() error {
 		"require_cn":       false,
 	})
 
-	// enable auto-tidy with tidy_expired_issuers
-	v.autotidyIssuers(v.config.IntermediatePKIPath)
-
 	return err
 }
 
@@ -498,7 +493,7 @@ func (v *VaultProvider) SetIntermediate(intermediatePEM, rootPEM, keyId string)
 }
 
 // ActiveIntermediate returns the current intermediate certificate.
-func (v *VaultProvider) ActiveLeafSigningCert() (string, error) {
+func (v *VaultProvider) ActiveIntermediate() (string, error) {
 	cert, err := v.getCA(v.config.IntermediatePKINamespace, v.config.IntermediatePKIPath)
 
 	// This error is expected when calling initializeSecondaryCA for the
@@ -564,10 +559,10 @@ func (v *VaultProvider) getCAChain(namespace, path string) (string, error) {
 	return root, nil
 }
 
-// GenerateLeafSigningCert mounts the configured intermediate PKI backend if
+// GenerateIntermediate mounts the configured intermediate PKI backend if
 // necessary, then generates and signs a new CA CSR using the root PKI backend
 // and updates the intermediate backend to use that new certificate.
-func (v *VaultProvider) GenerateLeafSigningCert() (string, error) {
+func (v *VaultProvider) GenerateIntermediate() (string, error) {
 	csr, keyId, err := v.generateIntermediateCSR()
 	if err != nil {
 		return "", err
@@ -603,7 +598,7 @@ func (v *VaultProvider) GenerateLeafSigningCert() (string, error) {
 		}
 	}
 
-	return v.ActiveLeafSigningCert()
+	return v.ActiveIntermediate()
 }
 
 // setDefaultIntermediateIssuer updates the default issuer for
@@ -821,7 +816,7 @@ func (v *VaultProvider) Cleanup(providerTypeChange bool, otherConfig map[string]
 	v.Stop()
 
 	if !providerTypeChange {
-		newConfig, err := ParseVaultCAConfig(otherConfig, v.isPrimary)
+		newConfig, err := ParseVaultCAConfig(otherConfig)
 		if err != nil {
 			return err
 		}
@@ -849,6 +844,8 @@ func (v *VaultProvider) Stop() {
 	v.stopWatcher()
 }
 
+func (v *VaultProvider) PrimaryUsesIntermediate() {}
+
 // We use raw path here
 func (v *VaultProvider) mountNamespaced(namespace, path string, mountInfo *vaultapi.MountInput) error {
 	return v.client.WithNamespace(v.getNamespace(namespace)).Sys().Mount(path, mountInfo)
@@ -881,40 +878,7 @@ func (v *VaultProvider) getNamespace(namespace string) string {
 	return v.baseNamespace
 }
 
-// autotidyIssuers sets Vault's auto-tidy to remove expired issuers
-// Returns a boolean on success for testing (as there is no post-facto way of
-// checking if it is set). Logs at info level on failure to set and why,
-// returning the log message for test purposes as well.
-func (v *VaultProvider) autotidyIssuers(path string) (bool, string) {
-	s, err := v.client.Logical().Write(path+"/config/auto-tidy",
-		map[string]interface{}{
-			"enabled":              true,
-			"tidy_expired_issuers": true,
-		})
-	var errStr string
-	if err != nil {
-		errStr = err.Error()
-		switch {
-		case strings.Contains(errStr, "404"):
-			errStr = "vault versions < 1.12 don't support auto-tidy"
-		case strings.Contains(errStr, "400"):
-			errStr = "vault versions < 1.13 don't support the tidy_expired_issuers field"
-		case strings.Contains(errStr, "403"):
-			errStr = "permission denied on auto-tidy path in vault"
-		}
-		v.logger.Info("Unable to enable Vault's auto-tidy feature for expired issuers", "reason", errStr, "path", path)
-	}
-	// return values for tests
-	tidySet := false
-	if s != nil {
-		if tei, ok := s.Data["tidy_expired_issuers"]; ok {
-			tidySet, _ = tei.(bool)
-		}
-	}
-	return tidySet, errStr
-}
-
-func ParseVaultCAConfig(raw map[string]interface{}, isPrimary bool) (*structs.VaultCAProviderConfig, error) {
+func ParseVaultCAConfig(raw map[string]interface{}) (*structs.VaultCAProviderConfig, error) {
 	config := structs.VaultCAProviderConfig{
 		CommonCAProviderConfig: defaultCommonConfig(),
 	}
@@ -945,10 +909,10 @@ func ParseVaultCAConfig(raw map[string]interface{}, isPrimary bool) (*structs.Va
 		return nil, fmt.Errorf("only one of Vault token or Vault auth method can be provided, but not both")
 	}
 
-	if isPrimary && config.RootPKIPath == "" {
+	if config.RootPKIPath == "" {
 		return nil, fmt.Errorf("must provide a valid path to a root PKI backend")
 	}
-	if config.RootPKIPath != "" && !strings.HasSuffix(config.RootPKIPath, "/") {
+	if !strings.HasSuffix(config.RootPKIPath, "/") {
 		config.RootPKIPath += "/"
 	}
 
@@ -983,14 +947,6 @@ func vaultLogin(client *vaultapi.Client, authMethod *structs.VaultAuthMethod) (*
 	return resp, nil
 }
 
-// Note the authMethod's parameters (Params) is populated from a freeform map
-// in the configuration where they could hardcode values to be passed directly
-// to the `auth/*/login` endpoint. Each auth method's authentication code
-// needs to handle two cases:
-// - The legacy case (which should be deprecated) where the user has
-// hardcoded login values directly (eg. a `jwt` string)
-// - The case where they use the configuration option used in the
-// vault agent's auth methods.
 func configureVaultAuthMethod(authMethod *structs.VaultAuthMethod) (VaultAuthenticator, error) {
 	if authMethod.MountPath == "" {
 		authMethod.MountPath = authMethod.Type
@@ -1000,18 +956,20 @@ func configureVaultAuthMethod(authMethod *structs.VaultAuthMethod) (VaultAuthent
 	switch authMethod.Type {
 	case VaultAuthMethodTypeAWS:
 		return NewAWSAuthClient(authMethod), nil
-	case VaultAuthMethodTypeAzure:
-		return NewAzureAuthClient(authMethod)
 	case VaultAuthMethodTypeGCP:
 		return NewGCPAuthClient(authMethod)
-	case VaultAuthMethodTypeJWT:
-		return NewJwtAuthClient(authMethod)
-	case VaultAuthMethodTypeAppRole:
-		return NewAppRoleAuthClient(authMethod)
-	case VaultAuthMethodTypeAliCloud:
-		return NewAliCloudAuthClient(authMethod)
 	case VaultAuthMethodTypeKubernetes:
-		return NewK8sAuthClient(authMethod)
+		// For the Kubernetes Auth method, we will try to read the JWT token
+		// from the default service account file location if jwt was not provided.
+		if jwt, ok := authMethod.Params["jwt"]; !ok || jwt == "" {
+			serviceAccountToken, err := os.ReadFile(defaultK8SServiceAccountTokenPath)
+			if err != nil {
+				return nil, err
+			}
+
+			authMethod.Params["jwt"] = string(serviceAccountToken)
+		}
+		return NewVaultAPIAuthClient(authMethod, loginPath), nil
 	// These auth methods require a username for the login API path.
 	case VaultAuthMethodTypeLDAP, VaultAuthMethodTypeUserpass, VaultAuthMethodTypeOkta, VaultAuthMethodTypeRadius:
 		// Get username from the params.
@@ -1033,8 +991,12 @@ func configureVaultAuthMethod(authMethod *structs.VaultAuthMethod) (VaultAuthent
 		return nil, fmt.Errorf("'token' auth method is not supported via auth method configuration; " +
 			"please provide the token with the 'token' parameter in the CA configuration")
 	// The rest of the auth methods use auth/<auth method path> login API path.
-	case VaultAuthMethodTypeCloudFoundry,
+	case VaultAuthMethodTypeAliCloud,
+		VaultAuthMethodTypeAppRole,
+		VaultAuthMethodTypeAzure,
+		VaultAuthMethodTypeCloudFoundry,
 		VaultAuthMethodTypeGitHub,
+		VaultAuthMethodTypeJWT,
 		VaultAuthMethodTypeKerberos,
 		VaultAuthMethodTypeTLS:
 		return NewVaultAPIAuthClient(authMethod, loginPath), nil
diff --git a/agent/connect/ca/provider_vault_auth.go b/agent/connect/ca/provider_vault_auth.go
index 70176cc3c328a..51b9a1b091219 100644
--- a/agent/connect/ca/provider_vault_auth.go
+++ b/agent/connect/ca/provider_vault_auth.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
@@ -79,14 +76,13 @@ func toMapStringString(in map[string]interface{}) (map[string]string, error) {
 	return out, nil
 }
 
-// legacyCheck is used to see if all the parameters needed to /login have been
-// hardcoded in the auth-method's config Parameters field.
-// Note it returns true if any /login specific fields are found (vs. all). This
-// is because the AWS client has multiple possible ways to call /login with
-// different parameters.
-func legacyCheck(params map[string]any, expectedKeys ...string) bool {
-	for _, key := range expectedKeys {
-		if v, ok := params[key]; ok && v != "" {
+// containsVaultLoginParams indicates if the provided auth method contains the
+// config parameters needed to call the auth/<method>/login API directly.
+// It compares the keys in the authMethod.Params struct to the provided slice of
+// keys and if any of the keys match it returns true.
+func containsVaultLoginParams(authMethod *structs.VaultAuthMethod, keys ...string) bool {
+	for _, key := range keys {
+		if _, exists := authMethod.Params[key]; exists {
 			return true
 		}
 	}
diff --git a/agent/connect/ca/provider_vault_auth_alicloud.go b/agent/connect/ca/provider_vault_auth_alicloud.go
deleted file mode 100644
index d6ae5b185ed38..0000000000000
--- a/agent/connect/ca/provider_vault_auth_alicloud.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package ca
-
-import (
-	"fmt"
-
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth/credentials/providers"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/vault-plugin-auth-alicloud/tools"
-)
-
-func NewAliCloudAuthClient(authMethod *structs.VaultAuthMethod) (*VaultAuthClient, error) {
-	params := authMethod.Params
-	authClient := NewVaultAPIAuthClient(authMethod, "")
-	// check for login data already in params (for backwards compability)
-	legacyKeys := []string{"access_key", "secret_key", "access_token"}
-	if legacyCheck(params, legacyKeys...) {
-		return authClient, nil
-	}
-
-	if r, ok := params["role"].(string); !ok || r == "" {
-		return nil, fmt.Errorf("role is required for AliCloud login")
-	}
-	if r, ok := params["region"].(string); !ok || r == "" {
-		return nil, fmt.Errorf("region is required for AliCloud login")
-	}
-	client := NewVaultAPIAuthClient(authMethod, "")
-	client.LoginDataGen = AliLoginDataGen
-	return client, nil
-}
-
-func AliLoginDataGen(authMethod *structs.VaultAuthMethod) (map[string]any, error) {
-	// validity of these params is checked above in New..
-	role := authMethod.Params["role"].(string)
-	region := authMethod.Params["region"].(string)
-	// Credentials can be provided either explicitly via env vars,
-	// or we will try to derive them from instance metadata.
-	credentialChain := []providers.Provider{
-		providers.NewEnvCredentialProvider(),
-		providers.NewInstanceMetadataProvider(),
-	}
-	creds, err := providers.NewChainProvider(credentialChain).Retrieve()
-	if err != nil {
-		return nil, err
-	}
-
-	loginData, err := tools.GenerateLoginData(role, creds, region)
-	if err != nil {
-		return nil, err
-	}
-
-	return loginData, nil
-}
diff --git a/agent/connect/ca/provider_vault_auth_approle.go b/agent/connect/ca/provider_vault_auth_approle.go
deleted file mode 100644
index c3d7d8f9c8ac8..0000000000000
--- a/agent/connect/ca/provider_vault_auth_approle.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package ca
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-// left out 2 config options as we are re-using vault agent's auth config.
-// Why?
-// remove_secret_id_file_after_reading - don't remove what we don't own
-// secret_id_response_wrapping_path - wrapping the secret before writing to disk
-//                                    (which we don't need to do)
-
-func NewAppRoleAuthClient(authMethod *structs.VaultAuthMethod) (*VaultAuthClient, error) {
-	authClient := NewVaultAPIAuthClient(authMethod, "")
-	// check for hardcoded /login params
-	if legacyCheck(authMethod.Params, "role_id", "secret_id") {
-		return authClient, nil
-	}
-
-	// check for required config params
-	key := "role_id_file_path"
-	if val, ok := authMethod.Params[key].(string); !ok {
-		return nil, fmt.Errorf("missing '%s' value", key)
-	} else if strings.TrimSpace(val) == "" {
-		return nil, fmt.Errorf("'%s' value is empty", key)
-	}
-	authClient.LoginDataGen = ArLoginDataGen
-
-	return authClient, nil
-}
-
-func ArLoginDataGen(authMethod *structs.VaultAuthMethod) (map[string]any, error) {
-	// don't need to check for legacy params as this func isn't used in that case
-	params := authMethod.Params
-	// role_id is required
-	roleIdFilePath := params["role_id_file_path"].(string)
-	// secret_id is optional (secret_ok is used in check below)
-	// secretIdFilePath, secret_ok := params["secret_id_file_path"].(string)
-	secretIdFilePath, hasSecret := params["secret_id_file_path"].(string)
-	if hasSecret && strings.TrimSpace(secretIdFilePath) == "" {
-		hasSecret = false
-	}
-
-	var err error
-	var rawRoleID, rawSecretID []byte
-	data := make(map[string]any)
-	if rawRoleID, err = os.ReadFile(roleIdFilePath); err != nil {
-		return nil, err
-	}
-	data["role_id"] = string(rawRoleID)
-	if hasSecret {
-		switch rawSecretID, err = os.ReadFile(secretIdFilePath); {
-		case err != nil:
-			return nil, err
-		case len(bytes.TrimSpace(rawSecretID)) > 0:
-			data["secret_id"] = strings.TrimSpace(string(rawSecretID))
-		}
-	}
-
-	return data, nil
-}
diff --git a/agent/connect/ca/provider_vault_auth_aws.go b/agent/connect/ca/provider_vault_auth_aws.go
index 61762b36fd618..0bb3c7d55d256 100644
--- a/agent/connect/ca/provider_vault_auth_aws.go
+++ b/agent/connect/ca/provider_vault_auth_aws.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
@@ -29,7 +26,7 @@ func NewAWSAuthClient(authMethod *structs.VaultAuthMethod) *VaultAuthClient {
 		"pkcs7",                   // EC2 PKCS7
 		"iam_http_request_method", // IAM
 	}
-	if legacyCheck(authMethod.Params, keys...) {
+	if containsVaultLoginParams(authMethod, keys...) {
 		return authClient
 	}
 
diff --git a/agent/connect/ca/provider_vault_auth_azure.go b/agent/connect/ca/provider_vault_auth_azure.go
deleted file mode 100644
index ac8d326b32790..0000000000000
--- a/agent/connect/ca/provider_vault_auth_azure.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package ca
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/go-cleanhttp"
-	"github.com/hashicorp/vault/sdk/helper/jsonutil"
-)
-
-func NewAzureAuthClient(authMethod *structs.VaultAuthMethod) (*VaultAuthClient, error) {
-	params := authMethod.Params
-	authClient := NewVaultAPIAuthClient(authMethod, "")
-	// check for login data already in params (for backwards compability)
-	legacyKeys := []string{
-		"vm_name", "vmss_name", "resource_group_name", "subscription_id", "jwt",
-	}
-	if legacyCheck(params, legacyKeys...) {
-		return authClient, nil
-	}
-
-	role, ok := params["role"].(string)
-	if !ok || strings.TrimSpace(role) == "" {
-		return nil, fmt.Errorf("missing 'role' value")
-	}
-	resource, ok := params["resource"].(string)
-	if !ok || strings.TrimSpace(resource) == "" {
-		return nil, fmt.Errorf("missing 'resource' value")
-	}
-
-	authClient.LoginDataGen = AzureLoginDataGen
-	return authClient, nil
-}
-
-var ( // use variables so we can change these in tests
-	instanceEndpoint = "http://169.254.169.254/metadata/instance"
-	identityEndpoint = "http://169.254.169.254/metadata/identity/oauth2/token"
-	// minimum version 2018-02-01 needed for identity metadata
-	apiVersion = "2018-02-01"
-)
-
-type instanceData struct {
-	Compute Compute
-}
-type Compute struct {
-	Name              string
-	ResourceGroupName string
-	SubscriptionID    string
-	VMScaleSetName    string
-}
-type identityData struct {
-	AccessToken string `json:"access_token"`
-}
-
-func AzureLoginDataGen(authMethod *structs.VaultAuthMethod) (map[string]any, error) {
-	params := authMethod.Params
-	role := params["role"].(string)
-	metaConf := map[string]string{
-		"role":     role,
-		"resource": params["resource"].(string),
-	}
-	if objectID, ok := params["object_id"].(string); ok {
-		metaConf["object_id"] = objectID
-	}
-	if clientID, ok := params["client_id"].(string); ok {
-		metaConf["client_id"] = clientID
-	}
-
-	// Fetch instance data
-	var instance instanceData
-	body, err := getMetadataInfo(instanceEndpoint, nil)
-	if err != nil {
-		return nil, err
-	}
-	err = jsonutil.DecodeJSON(body, &instance)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing instance metadata response: %w", err)
-	}
-
-	// Fetch JWT
-	var identity identityData
-	body, err = getMetadataInfo(identityEndpoint, metaConf)
-	if err != nil {
-		return nil, err
-	}
-	err = jsonutil.DecodeJSON(body, &identity)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing instance metadata response: %w", err)
-	}
-
-	data := map[string]interface{}{
-		"role":                role,
-		"vm_name":             instance.Compute.Name,
-		"vmss_name":           instance.Compute.VMScaleSetName,
-		"resource_group_name": instance.Compute.ResourceGroupName,
-		"subscription_id":     instance.Compute.SubscriptionID,
-		"jwt":                 identity.AccessToken,
-	}
-
-	return data, nil
-}
-
-func getMetadataInfo(endpoint string, query map[string]string) ([]byte, error) {
-	req, err := http.NewRequest("GET", endpoint, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	q := req.URL.Query()
-	q.Add("api-version", apiVersion)
-	for k, v := range query {
-		q.Add(k, v)
-	}
-	req.URL.RawQuery = q.Encode()
-	req.Header.Set("Metadata", "true")
-	req.Header.Set("User-Agent", "Consul")
-
-	client := cleanhttp.DefaultClient()
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("error fetching metadata from %s: %w", endpoint, err)
-	}
-
-	if resp == nil {
-		return nil, fmt.Errorf("empty response fetching metadata from %s", endpoint)
-	}
-
-	defer resp.Body.Close()
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("error reading metadata from %s: %w", endpoint, err)
-	}
-
-	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("error response in metadata from %s: %s", endpoint, body)
-	}
-
-	return body, nil
-}
diff --git a/agent/connect/ca/provider_vault_auth_gcp.go b/agent/connect/ca/provider_vault_auth_gcp.go
index 10dfbf4b294a7..38e544d48b6c3 100644
--- a/agent/connect/ca/provider_vault_auth_gcp.go
+++ b/agent/connect/ca/provider_vault_auth_gcp.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
@@ -19,7 +16,7 @@ func NewGCPAuthClient(authMethod *structs.VaultAuthMethod) (VaultAuthenticator,
 	// perform a direct request to the login API with the config that is provided.
 	// This supports the  Vault CA config in a backwards compatible way so that we don't
 	// break existing configurations.
-	if legacyCheck(authMethod.Params, "jwt") {
+	if containsVaultLoginParams(authMethod, "jwt") {
 		return NewVaultAPIAuthClient(authMethod, ""), nil
 	}
 
diff --git a/agent/connect/ca/provider_vault_auth_jwt.go b/agent/connect/ca/provider_vault_auth_jwt.go
deleted file mode 100644
index e80751cd59c3d..0000000000000
--- a/agent/connect/ca/provider_vault_auth_jwt.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package ca
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-func NewJwtAuthClient(authMethod *structs.VaultAuthMethod) (*VaultAuthClient, error) {
-	params := authMethod.Params
-
-	role, ok := params["role"].(string)
-	if !ok || strings.TrimSpace(role) == "" {
-		return nil, fmt.Errorf("missing 'role' value")
-	}
-
-	authClient := NewVaultAPIAuthClient(authMethod, "")
-	if legacyCheck(params, "jwt") {
-		return authClient, nil
-	}
-
-	// The path is required for the auto-auth config, but this auth provider
-	// seems to be used for jwt based auth by directly passing the jwt token.
-	// So we only require the token file path if the token string isn't
-	// present.
-	tokenPath, ok := params["path"].(string)
-	if !ok || strings.TrimSpace(tokenPath) == "" {
-		return nil, fmt.Errorf("missing 'path' value")
-	}
-	authClient.LoginDataGen = JwtLoginDataGen
-	return authClient, nil
-}
-
-func JwtLoginDataGen(authMethod *structs.VaultAuthMethod) (map[string]any, error) {
-	params := authMethod.Params
-	role := params["role"].(string)
-
-	tokenPath := params["path"].(string)
-	rawToken, err := os.ReadFile(tokenPath)
-	if err != nil {
-		return nil, err
-	}
-
-	return map[string]any{
-		"role": role,
-		"jwt":  strings.TrimSpace(string(rawToken)),
-	}, nil
-}
diff --git a/agent/connect/ca/provider_vault_auth_k8s.go b/agent/connect/ca/provider_vault_auth_k8s.go
deleted file mode 100644
index acd6f68bc5ddc..0000000000000
--- a/agent/connect/ca/provider_vault_auth_k8s.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package ca
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-func NewK8sAuthClient(authMethod *structs.VaultAuthMethod) (*VaultAuthClient, error) {
-	params := authMethod.Params
-	role, ok := params["role"].(string)
-	if !ok || strings.TrimSpace(role) == "" {
-		return nil, fmt.Errorf("missing 'role' value")
-	}
-	// don't check for `token_path` as it is optional
-
-	authClient := NewVaultAPIAuthClient(authMethod, "")
-	// Note the `jwt` can be passed directly in the authMethod as a Param value
-	// is a freeform map in the config where they could hardcode it.
-	if legacyCheck(params, "jwt") {
-		return authClient, nil
-	}
-
-	authClient.LoginDataGen = K8sLoginDataGen
-	return authClient, nil
-}
-
-func K8sLoginDataGen(authMethod *structs.VaultAuthMethod) (map[string]any, error) {
-	params := authMethod.Params
-	role := params["role"].(string)
-
-	// read token from file on path
-	tokenPath, ok := params["token_path"].(string)
-	if !ok || strings.TrimSpace(tokenPath) == "" {
-		tokenPath = defaultK8SServiceAccountTokenPath
-	}
-	rawToken, err := os.ReadFile(tokenPath)
-	if err != nil {
-		return nil, err
-	}
-	return map[string]any{
-		"role": role,
-		"jwt":  strings.TrimSpace(string(rawToken)),
-	}, nil
-}
diff --git a/agent/connect/ca/provider_vault_auth_test.go b/agent/connect/ca/provider_vault_auth_test.go
index 361d89400e22c..d9971c6930b45 100644
--- a/agent/connect/ca/provider_vault_auth_test.go
+++ b/agent/connect/ca/provider_vault_auth_test.go
@@ -1,15 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
-	"encoding/base64"
-	"encoding/json"
 	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
 	"os"
 	"strconv"
 	"testing"
@@ -18,7 +10,6 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/go-secure-stdlib/awsutil"
 	"github.com/hashicorp/vault/api/auth/gcp"
-	"github.com/hashicorp/vault/sdk/helper/jsonutil"
 	"github.com/stretchr/testify/require"
 )
 
@@ -321,459 +312,3 @@ func TestVaultCAProvider_AWSLoginDataGenerator(t *testing.T) {
 		})
 	}
 }
-
-func TestVaultCAProvider_AzureAuthClient(t *testing.T) {
-	instance := instanceData{Compute: Compute{
-		Name: "a", ResourceGroupName: "b", SubscriptionID: "c", VMScaleSetName: "d",
-	}}
-	instanceJSON, err := json.Marshal(instance)
-	require.NoError(t, err)
-	identity := identityData{AccessToken: "a-jwt-token"}
-	identityJSON, err := json.Marshal(identity)
-	require.NoError(t, err)
-
-	msi := httptest.NewServer(http.HandlerFunc(
-		func(w http.ResponseWriter, r *http.Request) {
-			url := r.URL.Path
-			switch url {
-			case "/metadata/instance":
-				w.Write(instanceJSON)
-			case "/metadata/identity/oauth2/token":
-				w.Write(identityJSON)
-			default:
-				t.Errorf("unexpected testing URL: %s", url)
-			}
-		}))
-
-	origIn, origId := instanceEndpoint, identityEndpoint
-	instanceEndpoint = msi.URL + "/metadata/instance"
-	identityEndpoint = msi.URL + "/metadata/identity/oauth2/token"
-	defer func() {
-		instanceEndpoint, identityEndpoint = origIn, origId
-	}()
-
-	t.Run("get-metadata-instance-info", func(t *testing.T) {
-		md, err := getMetadataInfo(instanceEndpoint, nil)
-		require.NoError(t, err)
-		var testInstance instanceData
-		err = jsonutil.DecodeJSON(md, &testInstance)
-		require.NoError(t, err)
-		require.Equal(t, testInstance, instance)
-	})
-
-	t.Run("get-metadata-identity-info", func(t *testing.T) {
-		md, err := getMetadataInfo(identityEndpoint, nil)
-		require.NoError(t, err)
-		var testIdentity identityData
-		err = jsonutil.DecodeJSON(md, &testIdentity)
-		require.NoError(t, err)
-		require.Equal(t, testIdentity, identity)
-	})
-
-	cases := map[string]struct {
-		authMethod *structs.VaultAuthMethod
-		expData    map[string]any
-		expErr     error
-	}{
-		"legacy-case": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: "azure",
-				Params: map[string]interface{}{
-					"role":                "a",
-					"vm_name":             "b",
-					"vmss_name":           "c",
-					"resource_group_name": "d",
-					"subscription_id":     "e",
-					"jwt":                 "f",
-				},
-			},
-			expData: map[string]any{
-				"role":                "a",
-				"vm_name":             "b",
-				"vmss_name":           "c",
-				"resource_group_name": "d",
-				"subscription_id":     "e",
-				"jwt":                 "f",
-			},
-		},
-		"base-case": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: "azure",
-				Params: map[string]interface{}{
-					"role":     "a-role",
-					"resource": "b-resource",
-				},
-			},
-			expData: map[string]any{
-				"role": "a-role",
-				"jwt":  "a-jwt-token",
-			},
-		},
-		"no-role": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: "azure",
-				Params: map[string]interface{}{
-					"resource": "b-resource",
-				},
-			},
-			expErr: fmt.Errorf("missing 'role' value"),
-		},
-		"no-resource": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: "azure",
-				Params: map[string]interface{}{
-					"role": "a-role",
-				},
-			},
-			expErr: fmt.Errorf("missing 'resource' value"),
-		},
-	}
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			auth, err := NewAzureAuthClient(c.authMethod)
-			if c.expErr != nil {
-				require.EqualError(t, err, c.expErr.Error())
-				return
-			}
-			require.NoError(t, err)
-			if auth.LoginDataGen != nil {
-				data, err := auth.LoginDataGen(c.authMethod)
-				require.NoError(t, err)
-				require.Subset(t, data, c.expData)
-			}
-		})
-	}
-}
-
-func TestVaultCAProvider_JwtAuthClient(t *testing.T) {
-	tokenF, err := os.CreateTemp("", "token-path")
-	require.NoError(t, err)
-	defer func() { os.Remove(tokenF.Name()) }()
-	_, err = tokenF.WriteString("test-token")
-	require.NoError(t, err)
-	err = tokenF.Close()
-	require.NoError(t, err)
-
-	cases := map[string]struct {
-		authMethod *structs.VaultAuthMethod
-		expData    map[string]any
-		expErr     error
-	}{
-		"base-case": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: "jwt",
-				Params: map[string]any{
-					"role": "test-role",
-					"path": tokenF.Name(),
-				},
-			},
-			expData: map[string]any{
-				"role": "test-role",
-				"jwt":  "test-token",
-			},
-		},
-		"no-role": {
-			authMethod: &structs.VaultAuthMethod{
-				Type:   "jwt",
-				Params: map[string]any{},
-			},
-			expErr: fmt.Errorf("missing 'role' value"),
-		},
-		"no-path": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: "jwt",
-				Params: map[string]any{
-					"role": "test-role",
-				},
-			},
-			expErr: fmt.Errorf("missing 'path' value"),
-		},
-		"no-path-but-jwt": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: "jwt",
-				Params: map[string]any{
-					"role": "test-role",
-					"jwt":  "test-jwt",
-				},
-			},
-			expData: map[string]any{
-				"role": "test-role",
-				"jwt":  "test-jwt",
-			},
-		},
-	}
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			auth, err := NewJwtAuthClient(c.authMethod)
-			if c.expErr != nil {
-				require.EqualError(t, c.expErr, err.Error())
-				return
-			}
-			require.NoError(t, err)
-			if auth.LoginDataGen != nil {
-				data, err := auth.LoginDataGen(c.authMethod)
-				require.NoError(t, err)
-				require.Equal(t, c.expData, data)
-			}
-		})
-	}
-}
-
-func TestVaultCAProvider_K8sAuthClient(t *testing.T) {
-	tokenF, err := os.CreateTemp("", "token-path")
-	require.NoError(t, err)
-	defer func() { os.Remove(tokenF.Name()) }()
-	_, err = tokenF.WriteString("test-token")
-	require.NoError(t, err)
-	err = tokenF.Close()
-	require.NoError(t, err)
-
-	cases := map[string]struct {
-		authMethod *structs.VaultAuthMethod
-		expData    map[string]any
-		expErr     error
-	}{
-		"base-case": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: "kubernetes",
-				Params: map[string]any{
-					"role":       "test-role",
-					"token_path": tokenF.Name(),
-				},
-			},
-			expData: map[string]any{
-				"role": "test-role",
-				"jwt":  "test-token",
-			},
-		},
-		"legacy-case": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: "kubernetes",
-				Params: map[string]any{
-					"role": "test-role",
-					"jwt":  "test-token",
-				},
-			},
-			expData: map[string]any{
-				"role": "test-role",
-				"jwt":  "test-token",
-			},
-		},
-		"no-role": {
-			authMethod: &structs.VaultAuthMethod{
-				Type:   "kubernetes",
-				Params: map[string]any{},
-			},
-			expErr: fmt.Errorf("missing 'role' value"),
-		},
-	}
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			auth, err := NewK8sAuthClient(c.authMethod)
-			if c.expErr != nil {
-				require.Error(t, err)
-				require.EqualError(t, c.expErr, err.Error())
-				return
-			}
-			require.NoError(t, err)
-			if auth.LoginDataGen != nil {
-				data, err := auth.LoginDataGen(c.authMethod)
-				require.NoError(t, err)
-				require.Equal(t, c.expData, data)
-			}
-		})
-	}
-}
-
-func TestVaultCAProvider_AppRoleAuthClient(t *testing.T) {
-	roleID, secretID := "test_role_id", "test_secret_id"
-
-	roleFd, err := os.CreateTemp("", "role")
-	require.NoError(t, err)
-	_, err = roleFd.WriteString(roleID)
-	require.NoError(t, err)
-	err = roleFd.Close()
-	require.NoError(t, err)
-
-	secretFd, err := os.CreateTemp("", "secret")
-	require.NoError(t, err)
-	_, err = secretFd.WriteString(secretID)
-	require.NoError(t, err)
-	err = secretFd.Close()
-	require.NoError(t, err)
-
-	roleIdPath := roleFd.Name()
-	secretIdPath := secretFd.Name()
-
-	defer func() {
-		os.Remove(secretFd.Name())
-		os.Remove(roleFd.Name())
-	}()
-
-	cases := map[string]struct {
-		authMethod *structs.VaultAuthMethod
-		expData    map[string]any
-		expErr     error
-	}{
-		"base-case": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: "approle",
-				Params: map[string]any{
-					"role_id_file_path":   roleIdPath,
-					"secret_id_file_path": secretIdPath,
-				},
-			},
-			expData: map[string]any{
-				"role_id":   roleID,
-				"secret_id": secretID,
-			},
-		},
-		"optional-secret-left-out": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: "approle",
-				Params: map[string]any{
-					"role_id_file_path": roleIdPath,
-				},
-			},
-			expData: map[string]any{
-				"role_id": roleID,
-			},
-		},
-		"missing-role-id-file-path": {
-			authMethod: &structs.VaultAuthMethod{
-				Type:   "approle",
-				Params: map[string]any{},
-			},
-			expErr: fmt.Errorf("missing '%s' value", "role_id_file_path"),
-		},
-		"legacy-direct-values": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: "approle",
-				Params: map[string]any{
-					"role_id":   "test-role",
-					"secret_id": "test-secret",
-				},
-			},
-			expData: map[string]any{
-				"role_id":   "test-role",
-				"secret_id": "test-secret",
-			},
-		},
-	}
-
-	for k, c := range cases {
-		t.Run(k, func(t *testing.T) {
-			auth, err := NewAppRoleAuthClient(c.authMethod)
-			if c.expErr != nil {
-				require.Error(t, err)
-				require.EqualError(t, c.expErr, err.Error())
-				return
-			}
-			require.NoError(t, err)
-			if auth.LoginDataGen != nil {
-				data, err := auth.LoginDataGen(c.authMethod)
-				require.NoError(t, err)
-				require.Equal(t, c.expData, data)
-			}
-		})
-	}
-}
-
-func TestVaultCAProvider_AliCloudAuthClient(t *testing.T) {
-	// required as login parameters, will hang if not set
-	os.Setenv("ALICLOUD_ACCESS_KEY", "test-access-key")
-	os.Setenv("ALICLOUD_SECRET_KEY", "test-secret-key")
-	os.Setenv("ALICLOUD_ACCESS_KEY_STS_TOKEN", "test-access-token")
-	defer func() {
-		os.Unsetenv("ALICLOUD_ACCESS_KEY")
-		os.Unsetenv("ALICLOUD_SECRET_KEY")
-		os.Unsetenv("ALICLOUD_ACCESS_KEY_STS_TOKEN")
-	}()
-	cases := map[string]struct {
-		authMethod *structs.VaultAuthMethod
-		expQry     map[string][]string
-		expErr     error
-	}{
-		"base-case": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: VaultAuthMethodTypeAliCloud,
-				Params: map[string]interface{}{
-					"role":   "test-role",
-					"region": "test-region",
-				},
-			},
-			expQry: map[string][]string{
-				"Action":      {"GetCallerIdentity"},
-				"AccessKeyId": {"test-access-key"},
-				"RegionId":    {"test-region"},
-			},
-		},
-		"no-role": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: VaultAuthMethodTypeAliCloud,
-				Params: map[string]interface{}{
-					"region": "test-region",
-				},
-			},
-			expErr: fmt.Errorf("role is required for AliCloud login"),
-		},
-		"no-region": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: VaultAuthMethodTypeAliCloud,
-				Params: map[string]interface{}{
-					"role": "test-role",
-				},
-			},
-			expErr: fmt.Errorf("region is required for AliCloud login"),
-		},
-		"legacy-case": {
-			authMethod: &structs.VaultAuthMethod{
-				Type: VaultAuthMethodTypeAliCloud,
-				Params: map[string]interface{}{
-					"access_key":   "test-key",
-					"access_token": "test-token",
-					"secret_key":   "test-secret-key",
-				},
-			},
-		},
-	}
-
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			auth, err := NewAliCloudAuthClient(c.authMethod)
-			if c.expErr != nil {
-				require.Error(t, err)
-				require.EqualError(t, c.expErr, err.Error())
-				return
-			}
-			require.NotNil(t, auth)
-
-			if auth.LoginDataGen != nil {
-				encodedData, err := auth.LoginDataGen(c.authMethod)
-				require.NoError(t, err)
-
-				// identity_request_headers (json encoded headers)
-				rawheaders, err := base64.StdEncoding.DecodeString(
-					encodedData["identity_request_headers"].(string))
-				require.NoError(t, err)
-				headers := string(rawheaders)
-				require.Contains(t, headers, "User-Agent")
-				require.Contains(t, headers, "AlibabaCloud")
-				require.Contains(t, headers, "Content-Type")
-				require.Contains(t, headers, "x-acs-action")
-				require.Contains(t, headers, "GetCallerIdentity")
-
-				// identity_request_url (w/ query params)
-				rawurl, err := base64.StdEncoding.DecodeString(
-					encodedData["identity_request_url"].(string))
-				require.NoError(t, err)
-				requrl, err := url.Parse(string(rawurl))
-				require.NoError(t, err)
-
-				queries := requrl.Query()
-				require.Subset(t, queries, c.expQry, "query missing fields")
-				require.Equal(t, requrl.Hostname(), "sts.test-region.aliyuncs.com")
-			}
-		})
-	}
-}
diff --git a/agent/connect/ca/provider_vault_test.go b/agent/connect/ca/provider_vault_test.go
index ece7659d04aa5..67cefdcac1163 100644
--- a/agent/connect/ca/provider_vault_test.go
+++ b/agent/connect/ca/provider_vault_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
@@ -8,8 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"strconv"
-	"strings"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -61,7 +56,6 @@ func TestVaultCAProvider_ParseVaultCAConfig(t *testing.T) {
 	cases := map[string]struct {
 		rawConfig map[string]interface{}
 		expConfig *structs.VaultCAProviderConfig
-		isPrimary bool
 		expError  string
 	}{
 		"no token and no auth method provided": {
@@ -72,26 +66,15 @@ func TestVaultCAProvider_ParseVaultCAConfig(t *testing.T) {
 			rawConfig: map[string]interface{}{"Token": "test", "AuthMethod": map[string]interface{}{"Type": "test"}},
 			expError:  "only one of Vault token or Vault auth method can be provided, but not both",
 		},
-		"primary no root PKI path": {
-			rawConfig: map[string]interface{}{"Token": "test", "IntermediatePKIPath": "test"},
-			isPrimary: true,
+		"no root PKI path": {
+			rawConfig: map[string]interface{}{"Token": "test"},
 			expError:  "must provide a valid path to a root PKI backend",
 		},
-		"secondary no root PKI path": {
-			rawConfig: map[string]interface{}{"Token": "test", "IntermediatePKIPath": "test"},
-			isPrimary: false,
-			expConfig: &structs.VaultCAProviderConfig{
-				CommonCAProviderConfig: defaultCommonConfig(),
-				Token:                  "test",
-				IntermediatePKIPath:    "test/",
-			},
-		},
 		"no root intermediate path": {
 			rawConfig: map[string]interface{}{"Token": "test", "RootPKIPath": "test"},
 			expError:  "must provide a valid path for the intermediate PKI backend",
 		},
 		"adds a slash to RootPKIPath and IntermediatePKIPath": {
-			isPrimary: true,
 			rawConfig: map[string]interface{}{"Token": "test", "RootPKIPath": "test", "IntermediatePKIPath": "test"},
 			expConfig: &structs.VaultCAProviderConfig{
 				CommonCAProviderConfig: defaultCommonConfig(),
@@ -104,7 +87,7 @@ func TestVaultCAProvider_ParseVaultCAConfig(t *testing.T) {
 
 	for name, c := range cases {
 		t.Run(name, func(t *testing.T) {
-			config, err := ParseVaultCAConfig(c.rawConfig, c.isPrimary)
+			config, err := ParseVaultCAConfig(c.rawConfig)
 			if c.expError != "" {
 				require.EqualError(t, err, c.expError)
 			} else {
@@ -122,16 +105,16 @@ func TestVaultCAProvider_configureVaultAuthMethod(t *testing.T) {
 		expError     string
 		hasLDG       bool
 	}{
-		"alicloud":    {expLoginPath: "auth/alicloud/login", params: map[string]any{"role": "test-role", "region": "test-region"}, hasLDG: true},
-		"approle":     {expLoginPath: "auth/approle/login", params: map[string]any{"role_id_file_path": "test-path"}, hasLDG: true},
+		"alicloud":    {expLoginPath: "auth/alicloud/login"},
+		"approle":     {expLoginPath: "auth/approle/login"},
 		"aws":         {expLoginPath: "auth/aws/login", params: map[string]interface{}{"type": "iam"}, hasLDG: true},
-		"azure":       {expLoginPath: "auth/azure/login", params: map[string]interface{}{"role": "test-role", "resource": "test-resource"}, hasLDG: true},
+		"azure":       {expLoginPath: "auth/azure/login"},
 		"cf":          {expLoginPath: "auth/cf/login"},
 		"github":      {expLoginPath: "auth/github/login"},
 		"gcp":         {expLoginPath: "auth/gcp/login", params: map[string]interface{}{"type": "iam", "role": "test-role"}},
-		"jwt":         {expLoginPath: "auth/jwt/login", params: map[string]any{"role": "test-role", "path": "test-path"}, hasLDG: true},
+		"jwt":         {expLoginPath: "auth/jwt/login"},
 		"kerberos":    {expLoginPath: "auth/kerberos/login"},
-		"kubernetes":  {expLoginPath: "auth/kubernetes/login", params: map[string]interface{}{"role": "test-role"}, hasLDG: true},
+		"kubernetes":  {expLoginPath: "auth/kubernetes/login", params: map[string]interface{}{"jwt": "fake"}},
 		"ldap":        {expLoginPath: "auth/ldap/login/foo", params: map[string]interface{}{"username": "foo"}},
 		"oci":         {expLoginPath: "auth/oci/login/foo", params: map[string]interface{}{"role": "foo"}},
 		"okta":        {expLoginPath: "auth/okta/login/foo", params: map[string]interface{}{"username": "foo"}},
@@ -260,7 +243,7 @@ func TestVaultCAProvider_SecondaryActiveIntermediate(t *testing.T) {
 		"IntermediatePKIPath": "pki-intermediate/",
 	})
 
-	cert, err := provider.ActiveLeafSigningCert()
+	cert, err := provider.ActiveIntermediate()
 	require.Empty(t, cert)
 	require.NoError(t, err)
 }
@@ -420,8 +403,8 @@ func TestVaultCAProvider_Bootstrap(t *testing.T) {
 				"LeafCertTTL": "1h",
 			},
 			certFunc: func(provider *VaultProvider) (string, error) {
-				root, err := provider.GenerateCAChain()
-				return root, err
+				root, err := provider.GenerateRoot()
+				return root.PEM, err
 			},
 			backendPath:         "pki-root/",
 			rootCaCreation:      true,
@@ -434,7 +417,7 @@ func TestVaultCAProvider_Bootstrap(t *testing.T) {
 				"RootCertTTL": "8761h",
 			},
 			certFunc: func(provider *VaultProvider) (string, error) {
-				return provider.ActiveLeafSigningCert()
+				return provider.ActiveIntermediate()
 			},
 			backendPath:         "pki-intermediate/",
 			rootCaCreation:      false,
@@ -498,11 +481,12 @@ func TestVaultCAProvider_SignLeaf(t *testing.T) {
 			Service:    "foo",
 		}
 
-		rootPEM, err := provider.GenerateCAChain()
+		root, err := provider.GenerateRoot()
 		require.NoError(t, err)
+		rootPEM := root.PEM
 		assertCorrectKeyType(t, tc.KeyType, rootPEM)
 
-		intPEM, err := provider.ActiveLeafSigningCert()
+		intPEM, err := provider.ActiveIntermediate()
 		require.NoError(t, err)
 		assertCorrectKeyType(t, tc.KeyType, intPEM)
 
@@ -575,6 +559,12 @@ func TestVaultCAProvider_CrossSignCA(t *testing.T) {
 	run := func(t *testing.T, tc CASigningKeyTypes, withSudo, expectFailure bool) {
 		t.Parallel()
 
+		if tc.SigningKeyType != tc.CSRKeyType {
+			// TODO: uncomment since the bug is closed
+			// See https://github.com/hashicorp/vault/issues/7709
+			t.Skip("Vault doesn't support cross-signing different key types yet.")
+		}
+
 		testVault1 := NewTestVaultServer(t)
 
 		attr1 := &VaultTokenAttributes{
@@ -594,11 +584,11 @@ func TestVaultCAProvider_CrossSignCA(t *testing.T) {
 		})
 
 		testutil.RunStep(t, "init", func(t *testing.T) {
-			rootPEM, err := provider1.GenerateCAChain()
+			root, err := provider1.GenerateRoot()
 			require.NoError(t, err)
-			assertCorrectKeyType(t, tc.SigningKeyType, rootPEM)
+			assertCorrectKeyType(t, tc.SigningKeyType, root.PEM)
 
-			intPEM, err := provider1.ActiveLeafSigningCert()
+			intPEM, err := provider1.ActiveIntermediate()
 			require.NoError(t, err)
 			assertCorrectKeyType(t, tc.SigningKeyType, intPEM)
 		})
@@ -622,11 +612,11 @@ func TestVaultCAProvider_CrossSignCA(t *testing.T) {
 		})
 
 		testutil.RunStep(t, "swap", func(t *testing.T) {
-			rootPEM, err := provider2.GenerateCAChain()
+			root, err := provider2.GenerateRoot()
 			require.NoError(t, err)
-			assertCorrectKeyType(t, tc.CSRKeyType, rootPEM)
+			assertCorrectKeyType(t, tc.CSRKeyType, root.PEM)
 
-			intPEM, err := provider2.ActiveLeafSigningCert()
+			intPEM, err := provider2.ActiveIntermediate()
 			require.NoError(t, err)
 			assertCorrectKeyType(t, tc.CSRKeyType, intPEM)
 
@@ -746,7 +736,7 @@ func TestVaultProvider_SignIntermediateConsul(t *testing.T) {
 		delegate := newMockDelegate(t, conf)
 		provider1 := TestConsulProvider(t, delegate)
 		require.NoError(t, provider1.Configure(testProviderConfig(conf)))
-		_, err := provider1.GenerateCAChain()
+		_, err := provider1.GenerateRoot()
 		require.NoError(t, err)
 
 		// Ensure that we don't configure vault to try and mint leafs that
@@ -1084,9 +1074,9 @@ func TestVaultProvider_ReconfigureIntermediateTTL(t *testing.T) {
 	t.Cleanup(provider.Stop)
 	err = provider.Configure(makeProviderConfWithTTL("222h"))
 	require.NoError(t, err)
-	_, err = provider.GenerateCAChain()
+	_, err = provider.GenerateRoot()
 	require.NoError(t, err)
-	_, err = provider.GenerateLeafSigningCert()
+	_, err = provider.GenerateIntermediate()
 	require.NoError(t, err)
 
 	// Attempt to update the ttl without permissions for the tune endpoint - shouldn't
@@ -1135,59 +1125,20 @@ func TestVaultCAProvider_GenerateIntermediate(t *testing.T) {
 		"IntermediatePKIPath": "pki-intermediate/",
 	})
 
-	orig, err := provider.ActiveLeafSigningCert()
+	orig, err := provider.ActiveIntermediate()
 	require.NoError(t, err)
 
 	// This test was created to ensure that our calls to Vault
 	// returns a new Intermediate certificate and further calls
-	// to ActiveLeafSigningCert return the same new cert.
-	newLeaf, err := provider.GenerateLeafSigningCert()
+	// to ActiveIntermediate return the same new cert.
+	new, err := provider.GenerateIntermediate()
 	require.NoError(t, err)
 
-	newActive, err := provider.ActiveLeafSigningCert()
+	newActive, err := provider.ActiveIntermediate()
 	require.NoError(t, err)
 
-	require.Equal(t, newLeaf, newActive)
-	require.NotEqual(t, orig, newLeaf)
-}
-
-func TestVaultCAProvider_AutoTidyExpiredIssuers(t *testing.T) {
-	SkipIfVaultNotPresent(t)
-	t.Parallel()
-
-	testVault := NewTestVaultServer(t)
-	attr := &VaultTokenAttributes{
-		RootPath:         "pki-root",
-		IntermediatePath: "pki-intermediate",
-		ConsulManaged:    true,
-	}
-	token := CreateVaultTokenWithAttrs(t, testVault.client, attr)
-	provider := createVaultProvider(t, true, testVault.Addr, token,
-		map[string]any{
-			"RootPKIPath":         "pki-root/",
-			"IntermediatePKIPath": "pki-intermediate/",
-		})
-
-	version := strings.Split(vaultTestVersion, ".")
-	require.Len(t, version, 3)
-	minorVersion, err := strconv.Atoi(version[1])
-	require.NoError(t, err)
-	expIssSet, errStr := provider.autotidyIssuers("pki-intermediate/")
-	switch {
-	case minorVersion <= 11:
-		require.False(t, expIssSet)
-		require.Contains(t, errStr, "auto-tidy")
-	case minorVersion == 12:
-		require.False(t, expIssSet)
-		require.Contains(t, errStr, "tidy_expired_issuers")
-	default: // Consul 1.13+
-		require.True(t, expIssSet)
-	}
-
-	// check permission denied
-	expIssSet, errStr = provider.autotidyIssuers("pki-bad/")
-	require.False(t, expIssSet)
-	require.Contains(t, errStr, "permission denied")
+	require.Equal(t, new, newActive)
+	require.NotEqual(t, orig, new)
 }
 
 func TestVaultCAProvider_DeletePreviousIssuerAndKey(t *testing.T) {
@@ -1208,6 +1159,11 @@ func TestVaultCAProvider_DeletePreviousIssuerAndKey(t *testing.T) {
 		})
 	res, err := testVault.Client().Logical().List("pki-intermediate/issuers")
 	require.NoError(t, err)
+
+	if res == nil {
+		t.Skip("Vault version < 1.11 does not have multi issuers functionality")
+	}
+
 	// Why 2 issuers? There is always an initial issuer that
 	// gets created before we manage the lifecycle of issuers.
 	// Since we're asserting that the number doesn't grow
@@ -1222,7 +1178,7 @@ func TestVaultCAProvider_DeletePreviousIssuerAndKey(t *testing.T) {
 	require.Len(t, res.Data["keys"], 1)
 
 	for i := 0; i < 3; i++ {
-		_, err := provider.GenerateLeafSigningCert()
+		_, err := provider.GenerateIntermediate()
 		require.NoError(t, err)
 
 		res, err := testVault.Client().Logical().List("pki-intermediate/issuers")
@@ -1245,7 +1201,7 @@ func TestVaultCAProvider_GenerateIntermediate_inSecondary(t *testing.T) {
 	delegate := newMockDelegate(t, conf)
 	primaryProvider := TestConsulProvider(t, delegate)
 	require.NoError(t, primaryProvider.Configure(testProviderConfig(conf)))
-	_, err := primaryProvider.GenerateCAChain()
+	_, err := primaryProvider.GenerateRoot()
 	require.NoError(t, err)
 
 	// Ensure that we don't configure vault to try and mint leafs that
@@ -1279,13 +1235,14 @@ func TestVaultCAProvider_GenerateIntermediate_inSecondary(t *testing.T) {
 		// Sign the CSR with primaryProvider.
 		intermediatePEM, err := primaryProvider.SignIntermediate(csr)
 		require.NoError(t, err)
-		rootPEM, err := primaryProvider.GenerateCAChain()
+		root, err := primaryProvider.GenerateRoot()
 		require.NoError(t, err)
+		rootPEM := root.PEM
 
 		// Give the new intermediate to provider to use.
 		require.NoError(t, provider.SetIntermediate(intermediatePEM, rootPEM, issuerID))
 
-		origIntermediate, err = provider.ActiveLeafSigningCert()
+		origIntermediate, err = provider.ActiveIntermediate()
 		require.NoError(t, err)
 	})
 
@@ -1299,16 +1256,17 @@ func TestVaultCAProvider_GenerateIntermediate_inSecondary(t *testing.T) {
 		// Sign the CSR with primaryProvider.
 		intermediatePEM, err := primaryProvider.SignIntermediate(csr)
 		require.NoError(t, err)
-		rootPEM, err := primaryProvider.GenerateCAChain()
+		root, err := primaryProvider.GenerateRoot()
 		require.NoError(t, err)
+		rootPEM := root.PEM
 
 		// Give the new intermediate to provider to use.
 		require.NoError(t, provider.SetIntermediate(intermediatePEM, rootPEM, issuerID))
 
 		// This test was created to ensure that our calls to Vault
 		// returns a new Intermediate certificate and further calls
-		// to ActiveLeafSigningCert return the same new cert.
-		newActiveIntermediate, err := provider.ActiveLeafSigningCert()
+		// to ActiveIntermediate return the same new cert.
+		newActiveIntermediate, err := provider.ActiveIntermediate()
 		require.NoError(t, err)
 
 		require.NotEqual(t, origIntermediate, newActiveIntermediate)
@@ -1538,10 +1496,10 @@ func createVaultProviderE(t *testing.T, isPrimary bool, addr, token string, rawC
 		return provider, err
 	}
 	if isPrimary {
-		if _, err := provider.GenerateCAChain(); err != nil {
+		if _, err := provider.GenerateRoot(); err != nil {
 			return provider, err
 		}
-		if _, err := provider.GenerateLeafSigningCert(); err != nil {
+		if _, err := provider.GenerateIntermediate(); err != nil {
 			return provider, err
 		}
 	}
diff --git a/agent/connect/ca/testing.go b/agent/connect/ca/testing.go
index 7386deea94944..fb445e9bab8e1 100644
--- a/agent/connect/ca/testing.go
+++ b/agent/connect/ca/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
@@ -198,7 +195,6 @@ type TestVaultServer struct {
 }
 
 var printedVaultVersion sync.Once
-var vaultTestVersion string
 
 func (v *TestVaultServer) Client() *vaultapi.Client {
 	return v.client
@@ -220,7 +216,6 @@ func (v *TestVaultServer) WaitUntilReady(t testing.T) {
 		version = resp.Version
 	})
 	printedVaultVersion.Do(func() {
-		vaultTestVersion = version
 		fmt.Fprintf(os.Stderr, "[INFO] agent/connect/ca: testing with vault server version: %s\n", version)
 	})
 }
@@ -253,8 +248,8 @@ func requireTrailingNewline(t testing.T, leafPEM string) {
 	if len(leafPEM) == 0 {
 		t.Fatalf("cert is empty")
 	}
-	if rune(leafPEM[len(leafPEM)-1]) != '\n' {
-		t.Fatalf("cert does not end with a new line")
+	if '\n' != rune(leafPEM[len(leafPEM)-1]) {
+		t.Fatalf("cert do not end with a new line")
 	}
 }
 
diff --git a/agent/connect/common_names.go b/agent/connect/common_names.go
index c52df9f10fb49..641831b24f36d 100644
--- a/agent/connect/common_names.go
+++ b/agent/connect/common_names.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect/csr.go b/agent/connect/csr.go
index 0a491b0b65522..63ba59476bf65 100644
--- a/agent/connect/csr.go
+++ b/agent/connect/csr.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect/csr_test.go b/agent/connect/csr_test.go
index 1833b78a77985..322585840ebb3 100644
--- a/agent/connect/csr_test.go
+++ b/agent/connect/csr_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect/generate.go b/agent/connect/generate.go
index 84c91a246846b..8c40faf9a6dd3 100644
--- a/agent/connect/generate.go
+++ b/agent/connect/generate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect/generate_test.go b/agent/connect/generate_test.go
index ca956b702f165..b6234a4970921 100644
--- a/agent/connect/generate_test.go
+++ b/agent/connect/generate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect/parsing.go b/agent/connect/parsing.go
index f1e89fe0255bc..d591926503237 100644
--- a/agent/connect/parsing.go
+++ b/agent/connect/parsing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
@@ -148,7 +145,7 @@ func ParseSigner(pemValue string) (crypto.Signer, error) {
 }
 
 // ParseCSR parses a CSR from a PEM-encoded value. The certificate request
-// must be the first block in the PEM value.
+// must be the the first block in the PEM value.
 func ParseCSR(pemValue string) (*x509.CertificateRequest, error) {
 	// The _ result below is not an error but the remaining PEM bytes.
 	block, _ := pem.Decode([]byte(pemValue))
diff --git a/agent/connect/sni.go b/agent/connect/sni.go
index f7d14800a922f..221d7c61c15e6 100644
--- a/agent/connect/sni.go
+++ b/agent/connect/sni.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect/sni_test.go b/agent/connect/sni_test.go
index ed0bd07280417..59e9f41fcdce7 100644
--- a/agent/connect/sni_test.go
+++ b/agent/connect/sni_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect/testing_ca.go b/agent/connect/testing_ca.go
index a852d9130c87b..aa44859b37603 100644
--- a/agent/connect/testing_ca.go
+++ b/agent/connect/testing_ca.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect/testing_ca_test.go b/agent/connect/testing_ca_test.go
index 9b62a2baee54b..7d3cb95798a1a 100644
--- a/agent/connect/testing_ca_test.go
+++ b/agent/connect/testing_ca_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect/testing_spiffe.go b/agent/connect/testing_spiffe.go
index fdbff5eda67d7..4a0577880c9c8 100644
--- a/agent/connect/testing_spiffe.go
+++ b/agent/connect/testing_spiffe.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect/uri.go b/agent/connect/uri.go
index bc898f78654f4..6d64be3b4738b 100644
--- a/agent/connect/uri.go
+++ b/agent/connect/uri.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
@@ -23,8 +20,6 @@ type CertURI interface {
 }
 
 var (
-	spiffeIDWorkloadIdentityRegexp = regexp.MustCompile(
-		`^(?:/ap/([^/]+))/ns/([^/]+)/identity/([^/]+)$`)
 	spiffeIDServiceRegexp = regexp.MustCompile(
 		`^(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/]+)$`)
 	spiffeIDAgentRegexp = regexp.MustCompile(
@@ -96,32 +91,6 @@ func ParseCertURI(input *url.URL) (CertURI, error) {
 			Datacenter: dc,
 			Service:    service,
 		}, nil
-	} else if v := spiffeIDWorkloadIdentityRegexp.FindStringSubmatch(path); v != nil {
-		// Determine the values. We assume they're reasonable to save cycles,
-		// but if the raw path is not empty that means that something is
-		// URL encoded so we go to the slow path.
-		ap := v[1]
-		ns := v[2]
-		workloadIdentity := v[3]
-		if input.RawPath != "" {
-			var err error
-			if ap, err = url.PathUnescape(v[1]); err != nil {
-				return nil, fmt.Errorf("Invalid admin partition: %s", err)
-			}
-			if ns, err = url.PathUnescape(v[2]); err != nil {
-				return nil, fmt.Errorf("Invalid namespace: %s", err)
-			}
-			if workloadIdentity, err = url.PathUnescape(v[3]); err != nil {
-				return nil, fmt.Errorf("Invalid workload identity: %s", err)
-			}
-		}
-
-		return &SpiffeIDWorkloadIdentity{
-			TrustDomain:      input.Host,
-			Partition:        ap,
-			Namespace:        ns,
-			WorkloadIdentity: workloadIdentity,
-		}, nil
 	} else if v := spiffeIDAgentRegexp.FindStringSubmatch(path); v != nil {
 		// Determine the values. We assume they're reasonable to save cycles,
 		// but if the raw path is not empty that means that something is
diff --git a/agent/connect/uri_agent.go b/agent/connect/uri_agent.go
index 1babf99873809..fb86614cd8375 100644
--- a/agent/connect/uri_agent.go
+++ b/agent/connect/uri_agent.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect/uri_agent_ce.go b/agent/connect/uri_agent_ce.go
index 70e775f6e4975..fdfb075a8d4b7 100644
--- a/agent/connect/uri_agent_ce.go
+++ b/agent/connect/uri_agent_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package connect
 
diff --git a/agent/connect/uri_agent_ce_test.go b/agent/connect/uri_agent_ce_test.go
index 026d4bc173031..37ebc0bf3e34f 100644
--- a/agent/connect/uri_agent_ce_test.go
+++ b/agent/connect/uri_agent_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package connect
 
diff --git a/agent/connect/uri_mesh_gateway.go b/agent/connect/uri_mesh_gateway.go
index d5cf155bf8d7c..9358f7eaf6b3b 100644
--- a/agent/connect/uri_mesh_gateway.go
+++ b/agent/connect/uri_mesh_gateway.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect/uri_mesh_gateway_ce.go b/agent/connect/uri_mesh_gateway_ce.go
index 48c43326f1450..a92d0fc7ffcab 100644
--- a/agent/connect/uri_mesh_gateway_ce.go
+++ b/agent/connect/uri_mesh_gateway_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package connect
 
diff --git a/agent/connect/uri_mesh_gateway_ce_test.go b/agent/connect/uri_mesh_gateway_ce_test.go
index bb4579cdc641c..6ab1ede1fd529 100644
--- a/agent/connect/uri_mesh_gateway_ce_test.go
+++ b/agent/connect/uri_mesh_gateway_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package connect
 
diff --git a/agent/connect/uri_server.go b/agent/connect/uri_server.go
index 5a2b9c2429283..e6d711051411e 100644
--- a/agent/connect/uri_server.go
+++ b/agent/connect/uri_server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect/uri_service.go b/agent/connect/uri_service.go
index b35d1e0df437d..e3ed1b28895a2 100644
--- a/agent/connect/uri_service.go
+++ b/agent/connect/uri_service.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
@@ -8,7 +5,6 @@ import (
 	"net/url"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
 // SpiffeIDService is the structure to represent the SPIFFE ID for a service.
@@ -53,14 +49,3 @@ func (id SpiffeIDService) uriPath() string {
 	}
 	return path
 }
-
-// SpiffeIDFromIdentityRef creates the SPIFFE ID from a workload identity.
-// TODO (ishustava): make sure ref type is workload identity.
-func SpiffeIDFromIdentityRef(trustDomain string, ref *pbresource.Reference) string {
-	return SpiffeIDWorkloadIdentity{
-		TrustDomain:      trustDomain,
-		Partition:        ref.Tenancy.Partition,
-		Namespace:        ref.Tenancy.Namespace,
-		WorkloadIdentity: ref.Name,
-	}.URI().String()
-}
diff --git a/agent/connect/uri_service_ce.go b/agent/connect/uri_service_ce.go
index 6aafde36a60e9..7eedecade6769 100644
--- a/agent/connect/uri_service_ce.go
+++ b/agent/connect/uri_service_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package connect
 
diff --git a/agent/connect/uri_service_ce_test.go b/agent/connect/uri_service_ce_test.go
index 8368454db5237..31b504150b5f4 100644
--- a/agent/connect/uri_service_ce_test.go
+++ b/agent/connect/uri_service_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package connect
 
diff --git a/agent/connect/uri_signing.go b/agent/connect/uri_signing.go
index 1913ae6bdfdfe..67ef7ecea7989 100644
--- a/agent/connect/uri_signing.go
+++ b/agent/connect/uri_signing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
@@ -51,20 +48,14 @@ func (id SpiffeIDSigning) CanSign(cu CertURI) bool {
 		// worry about Unicode domains if we start allowing customisation beyond the
 		// built-in cluster ids.
 		return strings.ToLower(other.Host) == id.Host()
-	case *SpiffeIDWorkloadIdentity:
-		// The trust domain component of the workload identity SPIFFE ID must be an exact match for now under
-		// ascii case folding (since hostnames are case-insensitive). Later we might
-		// worry about Unicode domains if we start allowing customisation beyond the
-		// built-in cluster ids.
-		return strings.ToLower(other.TrustDomain) == id.Host()
 	case *SpiffeIDMeshGateway:
-		// The host component of the mesh gateway SPIFFE ID must be an exact match for now under
+		// The host component of the service must be an exact match for now under
 		// ascii case folding (since hostnames are case-insensitive). Later we might
 		// worry about Unicode domains if we start allowing customisation beyond the
 		// built-in cluster ids.
 		return strings.ToLower(other.Host) == id.Host()
 	case *SpiffeIDServer:
-		// The host component of the server SPIFFE ID must be an exact match for now under
+		// The host component of the service must be an exact match for now under
 		// ascii case folding (since hostnames are case-insensitive). Later we might
 		// worry about Unicode domains if we start allowing customisation beyond the
 		// built-in cluster ids.
diff --git a/agent/connect/uri_signing_test.go b/agent/connect/uri_signing_test.go
index 737ca460542b7..6fef1f811f56f 100644
--- a/agent/connect/uri_signing_test.go
+++ b/agent/connect/uri_signing_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
@@ -98,30 +95,6 @@ func TestSpiffeIDSigning_CanSign(t *testing.T) {
 			input: &SpiffeIDService{Host: TestClusterID + ".fake", Namespace: "default", Datacenter: "dc1", Service: "web"},
 			want:  false,
 		},
-		{
-			name:  "workload - good",
-			id:    testSigning,
-			input: &SpiffeIDWorkloadIdentity{TrustDomain: TestClusterID + ".consul", Namespace: "default", WorkloadIdentity: "web"},
-			want:  true,
-		},
-		{
-			name:  "workload - good mixed case",
-			id:    testSigning,
-			input: &SpiffeIDWorkloadIdentity{TrustDomain: strings.ToUpper(TestClusterID) + ".CONsuL", Namespace: "defAUlt", WorkloadIdentity: "WEB"},
-			want:  true,
-		},
-		{
-			name:  "workload - different cluster",
-			id:    testSigning,
-			input: &SpiffeIDWorkloadIdentity{TrustDomain: "55555555-4444-3333-2222-111111111111.consul", Namespace: "default", WorkloadIdentity: "web"},
-			want:  false,
-		},
-		{
-			name:  "workload - different TLD",
-			id:    testSigning,
-			input: &SpiffeIDWorkloadIdentity{TrustDomain: TestClusterID + ".fake", Namespace: "default", WorkloadIdentity: "web"},
-			want:  false,
-		},
 		{
 			name:  "mesh gateway - good",
 			id:    testSigning,
diff --git a/agent/connect/uri_test.go b/agent/connect/uri_test.go
index 52116845975bb..b57f3ffe84d58 100644
--- a/agent/connect/uri_test.go
+++ b/agent/connect/uri_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
@@ -51,61 +48,6 @@ func TestParseCertURIFromString(t *testing.T) {
 			},
 			ParseError: "",
 		},
-		{
-			Name: "basic workload ID",
-			URI:  "spiffe://1234.consul/ap/default/ns/default/identity/web",
-			Struct: &SpiffeIDWorkloadIdentity{
-				TrustDomain:      "1234.consul",
-				Partition:        defaultEntMeta.PartitionOrDefault(),
-				Namespace:        "default",
-				WorkloadIdentity: "web",
-			},
-			ParseError: "",
-		},
-		{
-			Name: "basic workload ID with nondefault partition",
-			URI:  "spiffe://1234.consul/ap/bizdev/ns/default/identity/web",
-			Struct: &SpiffeIDWorkloadIdentity{
-				TrustDomain:      "1234.consul",
-				Partition:        "bizdev",
-				Namespace:        "default",
-				WorkloadIdentity: "web",
-			},
-			ParseError: "",
-		},
-		{
-			Name: "workload ID error - missing identity",
-			URI:  "spiffe://1234.consul/ns/default",
-			Struct: &SpiffeIDWorkloadIdentity{
-				TrustDomain:      "1234.consul",
-				Partition:        defaultEntMeta.PartitionOrDefault(),
-				Namespace:        "default",
-				WorkloadIdentity: "web",
-			},
-			ParseError: "SPIFFE ID is not in the expected format",
-		},
-		{
-			Name: "workload ID error - missing partition",
-			URI:  "spiffe://1234.consul/ns/default/identity/web",
-			Struct: &SpiffeIDWorkloadIdentity{
-				TrustDomain:      "1234.consul",
-				Partition:        defaultEntMeta.PartitionOrDefault(),
-				Namespace:        "default",
-				WorkloadIdentity: "web",
-			},
-			ParseError: "SPIFFE ID is not in the expected format",
-		},
-		{
-			Name: "workload ID error - missing namespace",
-			URI:  "spiffe://1234.consul/ap/default/identity/web",
-			Struct: &SpiffeIDWorkloadIdentity{
-				TrustDomain:      "1234.consul",
-				Partition:        defaultEntMeta.PartitionOrDefault(),
-				Namespace:        "default",
-				WorkloadIdentity: "web",
-			},
-			ParseError: "SPIFFE ID is not in the expected format",
-		},
 		{
 			Name: "basic agent ID",
 			URI:  "spiffe://1234.consul/agent/client/dc/dc1/id/uuid",
diff --git a/agent/connect/uri_workload_identity.go b/agent/connect/uri_workload_identity.go
deleted file mode 100644
index 48afd1f534b27..0000000000000
--- a/agent/connect/uri_workload_identity.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package connect
-
-import (
-	"fmt"
-	"net/url"
-
-	"github.com/hashicorp/consul/acl"
-)
-
-// SpiffeIDWorkloadIdentity is the structure to represent the SPIFFE ID for a workload.
-type SpiffeIDWorkloadIdentity struct {
-	TrustDomain      string
-	Partition        string
-	Namespace        string
-	WorkloadIdentity string
-}
-
-func (id SpiffeIDWorkloadIdentity) NamespaceOrDefault() string {
-	return acl.NamespaceOrDefault(id.Namespace)
-}
-
-// URI returns the *url.URL for this SPIFFE ID.
-func (id SpiffeIDWorkloadIdentity) URI() *url.URL {
-	var result url.URL
-	result.Scheme = "spiffe"
-	result.Host = id.TrustDomain
-	result.Path = id.uriPath()
-	return &result
-}
-
-func (id SpiffeIDWorkloadIdentity) uriPath() string {
-	// Although CE has no support for partitions, it still needs to be able to
-	// handle exportedPartition from peered Consul Enterprise clusters in order
-	// to generate the correct SpiffeID.
-	// We intentionally avoid using pbpartition.DefaultName here to be CE friendly.
-	path := fmt.Sprintf("/ap/%s/ns/%s/identity/%s",
-		id.PartitionOrDefault(),
-		id.NamespaceOrDefault(),
-		id.WorkloadIdentity,
-	)
-
-	return path
-}
diff --git a/agent/connect/uri_workload_identity_ce.go b/agent/connect/uri_workload_identity_ce.go
deleted file mode 100644
index 99544b014efac..0000000000000
--- a/agent/connect/uri_workload_identity_ce.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package connect
-
-import (
-	"strings"
-
-	"github.com/hashicorp/consul/acl"
-)
-
-// GetEnterpriseMeta will synthesize an EnterpriseMeta struct from the SpiffeIDWorkloadIdentity.
-// in CE this just returns an empty (but never nil) struct pointer
-func (id SpiffeIDWorkloadIdentity) GetEnterpriseMeta() *acl.EnterpriseMeta {
-	return &acl.EnterpriseMeta{}
-}
-
-// PartitionOrDefault breaks from CE's pattern of returning empty strings.
-// Although CE has no support for partitions, it still needs to be able to
-// handle exportedPartition from peered Consul Enterprise clusters in order
-// to generate the correct SpiffeID.
-func (id SpiffeIDWorkloadIdentity) PartitionOrDefault() string {
-	if id.Partition == "" {
-		return "default"
-	}
-
-	return strings.ToLower(id.Partition)
-}
diff --git a/agent/connect/uri_workload_identity_ce_test.go b/agent/connect/uri_workload_identity_ce_test.go
deleted file mode 100644
index 17a2cc3d4a0e2..0000000000000
--- a/agent/connect/uri_workload_identity_ce_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package connect
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestSpiffeIDWorkloadURI(t *testing.T) {
-	t.Run("default partition; default namespace", func(t *testing.T) {
-		wl := &SpiffeIDWorkloadIdentity{
-			TrustDomain:      "1234.consul",
-			WorkloadIdentity: "web",
-		}
-		require.Equal(t, "spiffe://1234.consul/ap/default/ns/default/identity/web", wl.URI().String())
-	})
-
-	t.Run("namespaces are ignored", func(t *testing.T) {
-		wl := &SpiffeIDWorkloadIdentity{
-			TrustDomain:      "1234.consul",
-			WorkloadIdentity: "web",
-			Namespace:        "other",
-		}
-		require.Equal(t, "spiffe://1234.consul/ap/default/ns/default/identity/web", wl.URI().String())
-	})
-
-	t.Run("partitions are not ignored", func(t *testing.T) {
-		wl := &SpiffeIDWorkloadIdentity{
-			TrustDomain:      "1234.consul",
-			WorkloadIdentity: "web",
-			Partition:        "other",
-		}
-		require.Equal(t, "spiffe://1234.consul/ap/other/ns/default/identity/web", wl.URI().String())
-	})
-}
diff --git a/agent/connect/x509_patch.go b/agent/connect/x509_patch.go
index 54a33ce07834f..9dcd12de1ce8c 100644
--- a/agent/connect/x509_patch.go
+++ b/agent/connect/x509_patch.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect/x509_patch_test.go b/agent/connect/x509_patch_test.go
index bdcb99045b578..61278b359c96f 100644
--- a/agent/connect/x509_patch_test.go
+++ b/agent/connect/x509_patch_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/agent/connect_auth.go b/agent/connect_auth.go
index 3b07013d3919b..80fa6d42ea724 100644
--- a/agent/connect_auth.go
+++ b/agent/connect_auth.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -119,7 +116,7 @@ func (a *Agent) ConnectAuthorize(token string,
 	for _, ixn := range reply.Matches[0] {
 		// We match on the intention source because the uriService is the source of the connection to authorize.
 		if _, ok := connect.AuthorizeIntentionTarget(
-			uriService.Service, uriService.Namespace, uriService.Partition, "", ixn, structs.IntentionMatchSource); ok {
+			uriService.Service, uriService.Namespace, uriService.Partition, ixn, structs.IntentionMatchSource); ok {
 			ixnMatch = ixn
 			break
 		}
diff --git a/agent/connect_ca_endpoint.go b/agent/connect_ca_endpoint.go
index 0a60f37662473..bb2ec637c48a7 100644
--- a/agent/connect_ca_endpoint.go
+++ b/agent/connect_ca_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/connect_ca_endpoint_test.go b/agent/connect_ca_endpoint_test.go
index f83d7328863c9..1296ab3175567 100644
--- a/agent/connect_ca_endpoint_test.go
+++ b/agent/connect_ca_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/consul/acl.go b/agent/consul/acl.go
index ddba359d949f0..40df5d3ff7bff 100644
--- a/agent/consul/acl.go
+++ b/agent/consul/acl.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -102,10 +99,6 @@ func (id *missingIdentity) NodeIdentityList() []*structs.ACLNodeIdentity {
 	return nil
 }
 
-func (id *missingIdentity) TemplatedPolicyList() []*structs.ACLTemplatedPolicy {
-	return nil
-}
-
 func (id *missingIdentity) IsExpired(asOf time.Time) bool {
 	return false
 }
@@ -221,17 +214,6 @@ type ACLResolverSettings struct {
 	ACLDefaultPolicy string
 }
 
-func (s ACLResolverSettings) IsDefaultAllow() (bool, error) {
-	switch s.ACLDefaultPolicy {
-	case "allow":
-		return true, nil
-	case "deny":
-		return false, nil
-	default:
-		return false, fmt.Errorf("unexpected ACL default policy value of %q", s.ACLDefaultPolicy)
-	}
-}
-
 // ACLResolver is the type to handle all your token and policy resolution needs.
 //
 // Supports:
@@ -611,11 +593,9 @@ func (r *ACLResolver) resolvePoliciesForIdentity(identity structs.ACLIdentity) (
 		roleIDs           = identity.RoleIDs()
 		serviceIdentities = structs.ACLServiceIdentities(identity.ServiceIdentityList())
 		nodeIdentities    = structs.ACLNodeIdentities(identity.NodeIdentityList())
-		templatedPolicies = structs.ACLTemplatedPolicies(identity.TemplatedPolicyList())
 	)
 
-	if len(policyIDs) == 0 && len(serviceIdentities) == 0 &&
-		len(roleIDs) == 0 && len(nodeIdentities) == 0 && len(templatedPolicies) == 0 {
+	if len(policyIDs) == 0 && len(serviceIdentities) == 0 && len(roleIDs) == 0 && len(nodeIdentities) == 0 {
 		// In this case the default policy will be all that is in effect.
 		return nil, nil
 	}
@@ -633,19 +613,16 @@ func (r *ACLResolver) resolvePoliciesForIdentity(identity structs.ACLIdentity) (
 		}
 		serviceIdentities = append(serviceIdentities, role.ServiceIdentities...)
 		nodeIdentities = append(nodeIdentities, role.NodeIdentityList()...)
-		templatedPolicies = append(templatedPolicies, role.TemplatedPolicyList()...)
 	}
 
 	// Now deduplicate any policies or service identities that occur more than once.
 	policyIDs = dedupeStringSlice(policyIDs)
 	serviceIdentities = serviceIdentities.Deduplicate()
 	nodeIdentities = nodeIdentities.Deduplicate()
-	templatedPolicies = templatedPolicies.Deduplicate()
 
 	// Generate synthetic policies for all service identities in effect.
 	syntheticPolicies := r.synthesizePoliciesForServiceIdentities(serviceIdentities, identity.EnterpriseMetadata())
 	syntheticPolicies = append(syntheticPolicies, r.synthesizePoliciesForNodeIdentities(nodeIdentities, identity.EnterpriseMetadata())...)
-	syntheticPolicies = append(syntheticPolicies, r.synthesizePoliciesForTemplatedPolicies(templatedPolicies, identity.EnterpriseMetadata())...)
 
 	// For the new ACLs policy replication is mandatory for correct operation on servers. Therefore
 	// we only attempt to resolve policies locally
@@ -689,24 +666,6 @@ func (r *ACLResolver) synthesizePoliciesForNodeIdentities(nodeIdentities []*stru
 	return syntheticPolicies
 }
 
-func (r *ACLResolver) synthesizePoliciesForTemplatedPolicies(templatedPolicies []*structs.ACLTemplatedPolicy, entMeta *acl.EnterpriseMeta) []*structs.ACLPolicy {
-	if len(templatedPolicies) == 0 {
-		return nil
-	}
-
-	syntheticPolicies := make([]*structs.ACLPolicy, 0, len(templatedPolicies))
-	for _, tp := range templatedPolicies {
-		policy, err := tp.SyntheticPolicy(entMeta)
-		if err != nil {
-			r.logger.Warn(fmt.Sprintf("could not generate synthetic policy for templated policy: %q", tp.TemplateName), "error", err)
-			continue
-		}
-		syntheticPolicies = append(syntheticPolicies, policy)
-	}
-
-	return syntheticPolicies
-}
-
 func mergeStringSlice(a, b []string) []string {
 	out := make([]string, 0, len(a)+len(b))
 	out = append(out, a...)
diff --git a/agent/consul/acl_authmethod.go b/agent/consul/acl_authmethod.go
index 217007f2b5ee4..f7826c7bd3387 100644
--- a/agent/consul/acl_authmethod.go
+++ b/agent/consul/acl_authmethod.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/acl_authmethod_ce.go b/agent/consul/acl_authmethod_ce.go
index 28802e77e633b..b2f28da9ab3c2 100644
--- a/agent/consul/acl_authmethod_ce.go
+++ b/agent/consul/acl_authmethod_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/acl_ce.go b/agent/consul/acl_ce.go
index a21514f3bbb7f..85555c57fc3e2 100644
--- a/agent/consul/acl_ce.go
+++ b/agent/consul/acl_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/acl_ce_test.go b/agent/consul/acl_ce_test.go
index 5078ab41af743..df2165e1c5251 100644
--- a/agent/consul/acl_ce_test.go
+++ b/agent/consul/acl_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/acl_client.go b/agent/consul/acl_client.go
index e6ff70720cfc8..d93923e654806 100644
--- a/agent/consul/acl_client.go
+++ b/agent/consul/acl_client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/acl_endpoint.go b/agent/consul/acl_endpoint.go
index 2b8eb88952ef0..0072445caffac 100644
--- a/agent/consul/acl_endpoint.go
+++ b/agent/consul/acl_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -350,10 +347,9 @@ func (a *ACL) lookupExpandedTokenInfo(ws memdb.WatchSet, state *state.Store, tok
 	policyIDs := make(map[string]struct{})
 	roleIDs := make(map[string]struct{})
 	identityPolicies := make(map[string]*structs.ACLPolicy)
-	templatedPolicies := make(map[string]*structs.ACLPolicy)
 	tokenInfo := structs.ExpandedTokenInfo{}
 
-	// Add the token's policies, templated policies and node/service identity policies
+	// Add the token's policies and node/service identity policies
 	for _, policy := range token.Policies {
 		policyIDs[policy.ID] = struct{}{}
 	}
@@ -369,14 +365,6 @@ func (a *ACL) lookupExpandedTokenInfo(ws memdb.WatchSet, state *state.Store, tok
 		policy := identity.SyntheticPolicy(&token.EnterpriseMeta)
 		identityPolicies[policy.ID] = policy
 	}
-	for _, templatedPolicy := range token.TemplatedPolicies {
-		policy, err := templatedPolicy.SyntheticPolicy(&token.EnterpriseMeta)
-		if err != nil {
-			a.logger.Warn(fmt.Sprintf("could not generate synthetic policy for templated policy: %q", templatedPolicy.TemplateName), "error", err)
-			continue
-		}
-		templatedPolicies[policy.ID] = policy
-	}
 
 	// Get any namespace default roles/policies to look up
 	nsPolicies, nsRoles, err := getTokenNamespaceDefaults(ws, state, &token.EnterpriseMeta)
@@ -414,14 +402,6 @@ func (a *ACL) lookupExpandedTokenInfo(ws memdb.WatchSet, state *state.Store, tok
 			policy := identity.SyntheticPolicy(&role.EnterpriseMeta)
 			identityPolicies[policy.ID] = policy
 		}
-		for _, templatedPolicy := range role.TemplatedPolicies {
-			policy, err := templatedPolicy.SyntheticPolicy(&role.EnterpriseMeta)
-			if err != nil {
-				a.logger.Warn(fmt.Sprintf("could not generate synthetic policy for templated policy: %q", templatedPolicy.TemplateName), "error", err)
-				continue
-			}
-			templatedPolicies[policy.ID] = policy
-		}
 
 		tokenInfo.ExpandedRoles = append(tokenInfo.ExpandedRoles, role)
 	}
@@ -440,9 +420,6 @@ func (a *ACL) lookupExpandedTokenInfo(ws memdb.WatchSet, state *state.Store, tok
 	for _, policy := range identityPolicies {
 		policies = append(policies, policy)
 	}
-	for _, policy := range templatedPolicies {
-		policies = append(policies, policy)
-	}
 
 	tokenInfo.ExpandedPolicies = policies
 	tokenInfo.AgentACLDefaultPolicy = a.srv.config.ACLResolverSettings.ACLDefaultPolicy
@@ -506,7 +483,6 @@ func (a *ACL) TokenClone(args *structs.ACLTokenSetRequest, reply *structs.ACLTok
 		Roles:             token.Roles,
 		ServiceIdentities: token.ServiceIdentities,
 		NodeIdentities:    token.NodeIdentities,
-		TemplatedPolicies: token.TemplatedPolicies,
 		Local:             token.Local,
 		Description:       token.Description,
 		ExpirationTime:    token.ExpirationTime,
@@ -1385,27 +1361,6 @@ func (a *ACL) RoleSet(args *structs.ACLRoleSetRequest, reply *structs.ACLRole) e
 	}
 	role.NodeIdentities = role.NodeIdentities.Deduplicate()
 
-	for _, templatedPolicy := range role.TemplatedPolicies {
-		if templatedPolicy.TemplateName == "" {
-			return fmt.Errorf("templated policy is missing the template name field on this role")
-		}
-
-		baseTemplate, ok := structs.GetACLTemplatedPolicyBase(templatedPolicy.TemplateName)
-		if !ok {
-			return fmt.Errorf("templated policy with an invalid templated name: %s for this role", templatedPolicy.TemplateName)
-		}
-
-		if templatedPolicy.TemplateID == "" {
-			templatedPolicy.TemplateID = baseTemplate.TemplateID
-		}
-
-		err := templatedPolicy.ValidateTemplatedPolicy(baseTemplate.Schema)
-		if err != nil {
-			return fmt.Errorf("encountered role with invalid templated policy: %w", err)
-		}
-	}
-	role.TemplatedPolicies = role.TemplatedPolicies.Deduplicate()
-
 	// calculate the hash for this role
 	role.SetHash(true)
 
@@ -1719,12 +1674,18 @@ func (a *ACL) BindingRuleSet(args *structs.ACLBindingRuleSetRequest, reply *stru
 		return fmt.Errorf("Invalid Binding Rule: no BindName is set")
 	}
 
-	if rule.BindType != structs.BindingRuleBindTypeTemplatedPolicy && rule.BindVars != nil {
-		return fmt.Errorf("invalid Binding Rule: BindVars cannot be set when bind type is not templated-policy.")
+	switch rule.BindType {
+	case structs.BindingRuleBindTypeService:
+	case structs.BindingRuleBindTypeNode:
+	case structs.BindingRuleBindTypeRole:
+	default:
+		return fmt.Errorf("Invalid Binding Rule: unknown BindType %q", rule.BindType)
 	}
 
-	if err := auth.IsValidBindingRule(rule.BindType, rule.BindName, rule.BindVars, blankID.ProjectedVarNames()); err != nil {
-		return fmt.Errorf("Invalid Binding Rule: invalid BindName or BindVars: %w", err)
+	if valid, err := auth.IsValidBindName(rule.BindType, rule.BindName, blankID.ProjectedVarNames()); err != nil {
+		return fmt.Errorf("Invalid Binding Rule: invalid BindName: %v", err)
+	} else if !valid {
+		return fmt.Errorf("Invalid Binding Rule: invalid BindName")
 	}
 
 	req := &structs.ACLBindingRuleBatchSetRequest{
diff --git a/agent/consul/acl_endpoint_ce.go b/agent/consul/acl_endpoint_ce.go
index 13d00a1694752..da2890fde0d2b 100644
--- a/agent/consul/acl_endpoint_ce.go
+++ b/agent/consul/acl_endpoint_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/acl_endpoint_test.go b/agent/consul/acl_endpoint_test.go
index 39840942d1851..c010d16a8ed4a 100644
--- a/agent/consul/acl_endpoint_test.go
+++ b/agent/consul/acl_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -23,7 +20,6 @@ import (
 	"github.com/hashicorp/consul/agent/consul/authmethod/testauth"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/structs/aclfilter"
-	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/internal/go-sso/oidcauth/oidcauthtest"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
@@ -377,7 +373,7 @@ func TestACLEndpoint_TokenRead(t *testing.T) {
 		require.ElementsMatch(t, []*structs.ACLRole{r1, r2}, resp.ExpandedRoles)
 	})
 
-	t.Run("expanded output with node/service identities and templated policies", func(t *testing.T) {
+	t.Run("expanded output with node/service identities", func(t *testing.T) {
 		setReq := structs.ACLTokenSetRequest{
 			Datacenter: "dc1",
 			ACLToken: structs.ACLToken{
@@ -402,22 +398,6 @@ func TestACLEndpoint_TokenRead(t *testing.T) {
 						Datacenter: "dc1",
 					},
 				},
-				TemplatedPolicies: []*structs.ACLTemplatedPolicy{
-					{
-						TemplateName: api.ACLTemplatedPolicyServiceName,
-						TemplateVariables: &structs.ACLTemplatedPolicyVariables{
-							Name: "web",
-						},
-						Datacenters: []string{"dc1"},
-					},
-					{
-						TemplateName: api.ACLTemplatedPolicyNodeName,
-						TemplateVariables: &structs.ACLTemplatedPolicyVariables{
-							Name: "foo",
-						},
-						Datacenters: []string{"dc1"},
-					},
-				},
 				Local: false,
 			},
 			WriteRequest: structs.WriteRequest{Token: TestDefaultInitialManagementToken},
@@ -431,11 +411,6 @@ func TestACLEndpoint_TokenRead(t *testing.T) {
 		for _, serviceIdentity := range setReq.ACLToken.NodeIdentities {
 			expectedPolicies = append(expectedPolicies, serviceIdentity.SyntheticPolicy(entMeta))
 		}
-		for _, templatedPolicy := range setReq.ACLToken.TemplatedPolicies {
-			pol, tmplError := templatedPolicy.SyntheticPolicy(entMeta)
-			require.NoError(t, tmplError)
-			expectedPolicies = append(expectedPolicies, pol)
-		}
 
 		setResp := structs.ACLToken{}
 		err := msgpackrpc.CallWithCodec(codec, "ACL.TokenSet", &setReq, &setResp)
@@ -490,10 +465,6 @@ func TestACLEndpoint_TokenClone(t *testing.T) {
 		t.NodeIdentities = []*structs.ACLNodeIdentity{
 			{NodeName: "foo", Datacenter: "bar"},
 		}
-		t.TemplatedPolicies = []*structs.ACLTemplatedPolicy{
-			{TemplateName: api.ACLTemplatedPolicyServiceName, TemplateVariables: &structs.ACLTemplatedPolicyVariables{Name: "foo"}, Datacenters: []string{"bar"}},
-			{TemplateName: api.ACLTemplatedPolicyNodeName, TemplateVariables: &structs.ACLTemplatedPolicyVariables{Name: "node"}},
-		}
 	})
 	require.NoError(t, err)
 
@@ -516,7 +487,6 @@ func TestACLEndpoint_TokenClone(t *testing.T) {
 		require.Equal(t, t1.Roles, t2.Roles)
 		require.Equal(t, t1.ServiceIdentities, t2.ServiceIdentities)
 		require.Equal(t, t1.NodeIdentities, t2.NodeIdentities)
-		require.Equal(t, t1.TemplatedPolicies, t2.TemplatedPolicies)
 		require.Equal(t, t1.Local, t2.Local)
 		require.NotEqual(t, t1.AccessorID, t2.AccessorID)
 		require.NotEqual(t, t1.SecretID, t2.SecretID)
@@ -575,10 +545,6 @@ func TestACLEndpoint_TokenSet(t *testing.T) {
 						Datacenter: "dc1",
 					},
 				},
-				TemplatedPolicies: []*structs.ACLTemplatedPolicy{
-					{TemplateName: api.ACLTemplatedPolicyServiceName, TemplateVariables: &structs.ACLTemplatedPolicyVariables{Name: "foo"}, Datacenters: []string{"bar"}},
-					{TemplateName: api.ACLTemplatedPolicyNodeName, TemplateVariables: &structs.ACLTemplatedPolicyVariables{Name: "node"}},
-				},
 			},
 			WriteRequest: structs.WriteRequest{Token: TestDefaultInitialManagementToken},
 		}
@@ -601,19 +567,6 @@ func TestACLEndpoint_TokenSet(t *testing.T) {
 		require.Equal(t, "foo", token.NodeIdentities[0].NodeName)
 		require.Equal(t, "dc1", token.NodeIdentities[0].Datacenter)
 
-		require.Len(t, token.TemplatedPolicies, 2)
-		require.Contains(t, token.TemplatedPolicies, &structs.ACLTemplatedPolicy{
-			TemplateID:        structs.ACLTemplatedPolicyServiceID,
-			TemplateName:      api.ACLTemplatedPolicyServiceName,
-			TemplateVariables: &structs.ACLTemplatedPolicyVariables{Name: "foo"},
-			Datacenters:       []string{"bar"},
-		})
-		require.Contains(t, token.TemplatedPolicies, &structs.ACLTemplatedPolicy{
-			TemplateID:        structs.ACLTemplatedPolicyNodeID,
-			TemplateName:      api.ACLTemplatedPolicyNodeName,
-			TemplateVariables: &structs.ACLTemplatedPolicyVariables{Name: "node"},
-		})
-
 		accessorID = token.AccessorID
 	})
 
@@ -2227,39 +2180,6 @@ func TestACLEndpoint_PolicySet_CustomID(t *testing.T) {
 	require.Error(t, err)
 }
 
-func TestACLEndpoint_TemplatedPolicySet_UnknownTemplateName(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	_, srv, _ := testACLServerWithConfig(t, nil, false)
-	waitForLeaderEstablishment(t, srv)
-
-	aclEp := ACL{srv: srv}
-
-	t.Run("unknown template name", func(t *testing.T) {
-		req := structs.ACLTokenSetRequest{
-			Datacenter: "dc1",
-			ACLToken: structs.ACLToken{
-				Description:       "foobar",
-				Policies:          nil,
-				Local:             false,
-				TemplatedPolicies: []*structs.ACLTemplatedPolicy{{TemplateName: "fake-builtin"}},
-			},
-			Create:       true,
-			WriteRequest: structs.WriteRequest{Token: TestDefaultInitialManagementToken},
-		}
-
-		resp := structs.ACLToken{}
-
-		err := aclEp.TokenSet(&req, &resp)
-		require.Error(t, err)
-		require.ErrorContains(t, err, "no such ACL templated policy with Name \"fake-builtin\"")
-	})
-}
-
 func TestACLEndpoint_PolicySet_builtins(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
@@ -3343,6 +3263,21 @@ func TestACLEndpoint_AuthMethodSet(t *testing.T) {
 		err := aclEp.AuthMethodSet(&req, &resp)
 		testutil.RequireErrorContains(t, err, "MaxTokenTTL 1ms cannot be less than")
 	})
+
+	t.Run("Create with MaxTokenTTL too big", func(t *testing.T) {
+		reqMethod := newAuthMethod("test")
+		reqMethod.MaxTokenTTL = 25 * time.Hour
+
+		req := structs.ACLAuthMethodSetRequest{
+			Datacenter:   "dc1",
+			AuthMethod:   reqMethod,
+			WriteRequest: structs.WriteRequest{Token: TestDefaultInitialManagementToken},
+		}
+		resp := structs.ACLAuthMethod{}
+
+		err := aclEp.AuthMethodSet(&req, &resp)
+		testutil.RequireErrorContains(t, err, "MaxTokenTTL 25h0m0s cannot be more than")
+	})
 }
 
 func TestACLEndpoint_AuthMethodDelete(t *testing.T) {
@@ -3573,7 +3508,7 @@ func TestACLEndpoint_BindingRuleSet(t *testing.T) {
 		}
 	}
 
-	requireSetErrors := func(t *testing.T, reqRule structs.ACLBindingRule, msg ...string) {
+	requireSetErrors := func(t *testing.T, reqRule structs.ACLBindingRule) {
 		req := structs.ACLBindingRuleSetRequest{
 			Datacenter:   "dc1",
 			BindingRule:  reqRule,
@@ -3583,10 +3518,6 @@ func TestACLEndpoint_BindingRuleSet(t *testing.T) {
 
 		err := aclEp.BindingRuleSet(&req, &resp)
 		require.Error(t, err)
-
-		for _, s := range msg {
-			require.Contains(t, err.Error(), s)
-		}
 	}
 
 	requireOK := func(t *testing.T, reqRule structs.ACLBindingRule) *structs.ACLBindingRule {
@@ -3663,40 +3594,6 @@ func TestACLEndpoint_BindingRuleSet(t *testing.T) {
 		require.Equal(t, "test-node", rule.BindName)
 	})
 
-	t.Run("templated policy", func(t *testing.T) {
-		req := structs.ACLBindingRuleSetRequest{
-			Datacenter: "dc1",
-			BindingRule: structs.ACLBindingRule{
-				Description: "templated policy binding rule",
-				AuthMethod:  testAuthMethod.Name,
-				Selector:    "serviceaccount.name==abc",
-				BindType:    structs.BindingRuleBindTypeTemplatedPolicy,
-				BindName:    api.ACLTemplatedPolicyNodeName,
-				BindVars: &structs.ACLTemplatedPolicyVariables{
-					Name: "test-node",
-				},
-			},
-			WriteRequest: structs.WriteRequest{Token: TestDefaultInitialManagementToken},
-		}
-		var resp structs.ACLBindingRule
-
-		err := aclEp.BindingRuleSet(&req, &resp)
-		require.NoError(t, err)
-		require.NotNil(t, resp.ID)
-
-		// Get the rule directly to validate that it exists
-		ruleResp, err := retrieveTestBindingRule(codec, TestDefaultInitialManagementToken, "dc1", resp.ID)
-		require.NoError(t, err)
-		rule := ruleResp.BindingRule
-
-		require.NotEmpty(t, rule.ID)
-		require.Equal(t, rule.Description, "templated policy binding rule")
-		require.Equal(t, rule.AuthMethod, testAuthMethod.Name)
-		require.Equal(t, "serviceaccount.name==abc", rule.Selector)
-		require.Equal(t, structs.BindingRuleBindTypeTemplatedPolicy, rule.BindType)
-		require.Equal(t, api.ACLTemplatedPolicyNodeName, rule.BindName)
-	})
-
 	t.Run("Update fails; cannot change method name", func(t *testing.T) {
 		reqRule := newRule()
 		reqRule.ID = ruleID
@@ -3813,35 +3710,10 @@ func TestACLEndpoint_BindingRuleSet(t *testing.T) {
 		requireSetErrors(t, reqRule)
 	})
 
-	t.Run("Create fails; when bind vars is set for non templated policy", func(t *testing.T) {
-		reqRule := newRule()
-		reqRule.BindVars = &structs.ACLTemplatedPolicyVariables{
-			Name: "test",
-		}
-		requireSetErrors(t, reqRule, "invalid Binding Rule: BindVars cannot be set when bind type is not templated-policy.")
-	})
-
-	t.Run("Create fails; when missing required bindvars", func(t *testing.T) {
-		reqRule := newRule()
-		reqRule.BindName = api.ACLTemplatedPolicyServiceName
-		reqRule.BindType = structs.BindingRuleBindTypeTemplatedPolicy
-		requireSetErrors(t, reqRule, "Invalid Binding Rule: invalid BindName or BindVars")
-	})
-
-	t.Run("Create fails; when bindvars contains unknown vars", func(t *testing.T) {
-		reqRule := newRule()
-		reqRule.BindName = api.ACLTemplatedPolicyServiceName
-		reqRule.BindType = structs.BindingRuleBindTypeTemplatedPolicy
-		reqRule.BindVars = &structs.ACLTemplatedPolicyVariables{
-			Name: "method-${serviceaccount.bizarroname}",
-		}
-		requireSetErrors(t, reqRule, "Invalid Binding Rule: invalid BindName or BindVars")
-	})
-
 	t.Run("Create fails; invalid bind type", func(t *testing.T) {
 		reqRule := newRule()
 		reqRule.BindType = "invalid"
-		requireSetErrors(t, reqRule, "Invalid Binding Rule: unknown BindType")
+		requireSetErrors(t, reqRule)
 	})
 
 	t.Run("Create fails; bind name with unknown vars", func(t *testing.T) {
diff --git a/agent/consul/acl_replication.go b/agent/consul/acl_replication.go
index 79e4e5d7a7d89..3b41a3eec79a0 100644
--- a/agent/consul/acl_replication.go
+++ b/agent/consul/acl_replication.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/acl_replication_test.go b/agent/consul/acl_replication_test.go
index 70ed42672916b..bbb6120f35cf6 100644
--- a/agent/consul/acl_replication_test.go
+++ b/agent/consul/acl_replication_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/acl_replication_types.go b/agent/consul/acl_replication_types.go
index 8a672cb90d566..20e4456988ee3 100644
--- a/agent/consul/acl_replication_types.go
+++ b/agent/consul/acl_replication_types.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/acl_server.go b/agent/consul/acl_server.go
index 8fe1f45fd0984..299d7392dbfa8 100644
--- a/agent/consul/acl_server.go
+++ b/agent/consul/acl_server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/acl_server_ce.go b/agent/consul/acl_server_ce.go
index 5adb8be5725d5..6d281c225510b 100644
--- a/agent/consul/acl_server_ce.go
+++ b/agent/consul/acl_server_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/acl_test.go b/agent/consul/acl_test.go
index a6d6a77405f5a..b7b28123ebdc6 100644
--- a/agent/consul/acl_test.go
+++ b/agent/consul/acl_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -21,7 +18,6 @@ import (
 	"github.com/hashicorp/consul/acl/resolver"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/token"
-	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 )
@@ -615,6 +611,10 @@ func (d *ACLResolverTestDelegate) ACLDatacenter() string {
 	return d.datacenter
 }
 
+func (d *ACLResolverTestDelegate) UseLegacyACLs() bool {
+	return d.legacy
+}
+
 func (d *ACLResolverTestDelegate) ResolveIdentityFromToken(token string) (bool, structs.ACLIdentity, error) {
 	if !d.localTokens {
 		return false, nil, nil
@@ -727,6 +727,7 @@ func TestACLResolver_Disabled(t *testing.T) {
 	delegate := &ACLResolverTestDelegate{
 		enabled:    false,
 		datacenter: "dc1",
+		legacy:     false,
 	}
 
 	r := newTestACLResolver(t, delegate, nil)
@@ -741,6 +742,7 @@ func TestACLResolver_ResolveRootACL(t *testing.T) {
 	delegate := &ACLResolverTestDelegate{
 		enabled:    true,
 		datacenter: "dc1",
+		legacy:     false,
 	}
 	r := newTestACLResolver(t, delegate, nil)
 
@@ -791,6 +793,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   false,
 			localPolicies: true,
 			localRoles:    true,
@@ -818,6 +821,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   false,
 			localPolicies: true,
 			localRoles:    true,
@@ -845,6 +849,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   true,
 			localPolicies: false,
 			localRoles:    false,
@@ -880,6 +885,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   true,
 			localPolicies: false,
 			localRoles:    false,
@@ -910,6 +916,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   false,
 			localPolicies: true,
 			localRoles:    true,
@@ -960,6 +967,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   false,
 			localPolicies: true,
 			localRoles:    true,
@@ -990,6 +998,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   true,
 			localPolicies: false,
 			localRoles:    false,
@@ -1025,6 +1034,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   true,
 			localPolicies: false,
 			localRoles:    false,
@@ -1056,6 +1066,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   true,
 			localPolicies: false,
 			localRoles:    false,
@@ -1102,6 +1113,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   true,
 			localPolicies: false,
 			localRoles:    false,
@@ -1143,6 +1155,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   false,
 			localPolicies: false,
 			localRoles:    false,
@@ -1177,6 +1190,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   false,
 			localPolicies: false,
 			localRoles:    false,
@@ -1212,6 +1226,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   false,
 			localPolicies: true,
 			localRoles:    true,
@@ -1257,6 +1272,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   false,
 			localPolicies: false,
 			tokenReadFn: func(_ *structs.ACLTokenGetRequest, reply *structs.ACLTokenResponse) error {
@@ -1320,6 +1336,7 @@ func TestACLResolver_DownPolicy(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   false,
 			localPolicies: false,
 			tokenReadFn: func(_ *structs.ACLTokenGetRequest, reply *structs.ACLTokenResponse) error {
@@ -1377,6 +1394,7 @@ func TestACLResolver_DatacenterScoping(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   true,
 			localPolicies: true,
 			localRoles:    true,
@@ -1396,6 +1414,7 @@ func TestACLResolver_DatacenterScoping(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc2",
+			legacy:        false,
 			localTokens:   true,
 			localPolicies: true,
 			localRoles:    true,
@@ -1431,6 +1450,7 @@ func TestACLResolver_Client(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   false,
 			localPolicies: false,
 			tokenReadFn: func(_ *structs.ACLTokenGetRequest, reply *structs.ACLTokenResponse) error {
@@ -1521,6 +1541,7 @@ func TestACLResolver_Client(t *testing.T) {
 		delegate := &ACLResolverTestDelegate{
 			enabled:       true,
 			datacenter:    "dc1",
+			legacy:        false,
 			localTokens:   false,
 			localPolicies: false,
 			tokenReadFn: func(args *structs.ACLTokenGetRequest, reply *structs.ACLTokenResponse) error {
@@ -1583,6 +1604,7 @@ func TestACLResolver_Client_TokensPoliciesAndRoles(t *testing.T) {
 	delegate := &ACLResolverTestDelegate{
 		enabled:       true,
 		datacenter:    "dc1",
+		legacy:        false,
 		localTokens:   false,
 		localPolicies: false,
 		localRoles:    false,
@@ -1599,6 +1621,7 @@ func TestACLResolver_LocalTokensPoliciesAndRoles(t *testing.T) {
 	delegate := &ACLResolverTestDelegate{
 		enabled:       true,
 		datacenter:    "dc1",
+		legacy:        false,
 		localTokens:   true,
 		localPolicies: true,
 		localRoles:    true,
@@ -1614,6 +1637,7 @@ func TestACLResolver_LocalPoliciesAndRoles(t *testing.T) {
 	delegate := &ACLResolverTestDelegate{
 		enabled:       true,
 		datacenter:    "dc1",
+		legacy:        false,
 		localTokens:   false,
 		localPolicies: true,
 		localRoles:    true,
@@ -1951,48 +1975,6 @@ func testACLResolver_variousTokens(t *testing.T, delegate *ACLResolverTestDelega
 					},
 				},
 			},
-			&structs.ACLToken{
-				AccessorID: "359b9927-25fd-46b9-84c2-3470f848ec65",
-				SecretID:   "found-synthetic-policy-5",
-				TemplatedPolicies: []*structs.ACLTemplatedPolicy{
-					{
-						TemplateName: api.ACLTemplatedPolicyNodeName,
-						TemplateVariables: &structs.ACLTemplatedPolicyVariables{
-							Name: "templated-test-node1",
-						},
-						Datacenters: []string{"dc1"},
-					},
-					{
-						TemplateName: api.ACLTemplatedPolicyNodeName,
-						TemplateVariables: &structs.ACLTemplatedPolicyVariables{
-							Name: "templated-test-node2",
-						},
-						// as the resolver is in dc1 this identity should be ignored
-						Datacenters: []string{"dc2"},
-					},
-				},
-			},
-			&structs.ACLToken{
-				AccessorID: "359b9927-25fd-46b9-84c2-3470f848ec65",
-				SecretID:   "found-synthetic-policy-6",
-				TemplatedPolicies: []*structs.ACLTemplatedPolicy{
-					{
-						TemplateName: api.ACLTemplatedPolicyNodeName,
-						TemplateVariables: &structs.ACLTemplatedPolicyVariables{
-							Name: "templated-test-node3",
-						},
-						Datacenters: []string{"dc1"},
-					},
-					{
-						TemplateName: api.ACLTemplatedPolicyNodeName,
-						TemplateVariables: &structs.ACLTemplatedPolicyVariables{
-							Name: "templated-test-node4",
-						},
-						// as the resolver is in dc1 this identity should be ignored
-						Datacenters: []string{"dc2"},
-					},
-				},
-			},
 		})
 
 		// We resolve these tokens in the same cache session
@@ -2058,22 +2040,6 @@ func testACLResolver_variousTokens(t *testing.T, delegate *ACLResolverTestDelega
 			// ensure node identity for other DC is ignored
 			require.Equal(t, acl.Deny, authz.NodeWrite("test-node-dc2", nil))
 		})
-		t.Run("synthetic-policy-6", func(t *testing.T) { // templated policy
-			authz, err := r.ResolveToken("found-synthetic-policy-6")
-			require.NoError(t, err)
-			require.NotNil(t, authz)
-
-			// spot check some random perms
-			require.Equal(t, acl.Deny, authz.ACLRead(nil))
-			require.Equal(t, acl.Deny, authz.NodeWrite("foo", nil))
-			// ensure we didn't bleed over to the other synthetic policy
-			require.Equal(t, acl.Deny, authz.NodeWrite("templated-test-node1", nil))
-			// check our own synthetic policy
-			require.Equal(t, acl.Allow, authz.ServiceRead("literally-anything", nil))
-			require.Equal(t, acl.Allow, authz.NodeWrite("templated-test-node3", nil))
-			// ensure template identity for other DC is ignored
-			require.Equal(t, acl.Deny, authz.NodeWrite("templated-test-node4", nil))
-		})
 	})
 
 	runTwiceAndReset("Anonymous", func(t *testing.T) {
diff --git a/agent/consul/acl_token_exp.go b/agent/consul/acl_token_exp.go
index 06559ce71d566..e373e0cdd6dce 100644
--- a/agent/consul/acl_token_exp.go
+++ b/agent/consul/acl_token_exp.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/acl_token_exp_test.go b/agent/consul/acl_token_exp_test.go
index 031c150dabb0c..c4f0c768d0b99 100644
--- a/agent/consul/acl_token_exp_test.go
+++ b/agent/consul/acl_token_exp_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/auth/binder.go b/agent/consul/auth/binder.go
index 1964cc5a877ea..f1eec01410a75 100644
--- a/agent/consul/auth/binder.go
+++ b/agent/consul/auth/binder.go
@@ -1,10 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package auth
 
 import (
-	"errors"
 	"fmt"
 
 	"github.com/hashicorp/go-bexpr"
@@ -38,13 +34,12 @@ type BinderStateStore interface {
 	ACLRoleGetByName(ws memdb.WatchSet, roleName string, entMeta *acl.EnterpriseMeta) (uint64, *structs.ACLRole, error)
 }
 
-// Bindings contains the ACL roles, service identities, node identities,
-// templated policies, and enterprise meta to be assigned to the created token.
+// Bindings contains the ACL roles, service identities, node identities and
+// enterprise meta to be assigned to the created token.
 type Bindings struct {
 	Roles             []structs.ACLTokenRoleLink
 	ServiceIdentities []*structs.ACLServiceIdentity
 	NodeIdentities    []*structs.ACLNodeIdentity
-	TemplatedPolicies structs.ACLTemplatedPolicies
 	EnterpriseMeta    acl.EnterpriseMeta
 }
 
@@ -57,7 +52,6 @@ func (b *Bindings) None() bool {
 
 	return len(b.ServiceIdentities) == 0 &&
 		len(b.NodeIdentities) == 0 &&
-		len(b.TemplatedPolicies) == 0 &&
 		len(b.Roles) == 0
 }
 
@@ -89,42 +83,30 @@ func (b *Binder) Bind(authMethod *structs.ACLAuthMethod, verifiedIdentity *authm
 		return &bindings, nil
 	}
 
-	// Compute role, service identity, node identity or templated policy names by interpolating
+	// Compute role, service identity, or node identity names by interpolating
 	// the identity's projected variables into the rule BindName templates.
 	for _, rule := range matchingRules {
+		bindName, valid, err := computeBindName(rule.BindType, rule.BindName, verifiedIdentity.ProjectedVars)
+		switch {
+		case err != nil:
+			return nil, fmt.Errorf("cannot compute %q bind name for bind target: %w", rule.BindType, err)
+		case !valid:
+			return nil, fmt.Errorf("computed %q bind name for bind target is invalid: %q", rule.BindType, bindName)
+		}
+
 		switch rule.BindType {
 		case structs.BindingRuleBindTypeService:
-			bindName, err := computeBindName(rule.BindName, verifiedIdentity.ProjectedVars, acl.IsValidServiceIdentityName)
-			if err != nil {
-				return nil, err
-			}
 			bindings.ServiceIdentities = append(bindings.ServiceIdentities, &structs.ACLServiceIdentity{
 				ServiceName: bindName,
 			})
 
 		case structs.BindingRuleBindTypeNode:
-			bindName, err := computeBindName(rule.BindName, verifiedIdentity.ProjectedVars, acl.IsValidNodeIdentityName)
-			if err != nil {
-				return nil, err
-			}
 			bindings.NodeIdentities = append(bindings.NodeIdentities, &structs.ACLNodeIdentity{
 				NodeName:   bindName,
 				Datacenter: b.datacenter,
 			})
 
-		case structs.BindingRuleBindTypeTemplatedPolicy:
-			templatedPolicy, err := generateTemplatedPolicies(rule.BindName, rule.BindVars, verifiedIdentity.ProjectedVars)
-			if err != nil {
-				return nil, err
-			}
-			bindings.TemplatedPolicies = append(bindings.TemplatedPolicies, templatedPolicy)
-
 		case structs.BindingRuleBindTypeRole:
-			bindName, err := computeBindName(rule.BindName, verifiedIdentity.ProjectedVars, acl.IsValidRoleName)
-			if err != nil {
-				return nil, err
-			}
-
 			_, role, err := b.store.ACLRoleGetByName(nil, bindName, &bindings.EnterpriseMeta)
 			if err != nil {
 				return nil, err
@@ -141,11 +123,11 @@ func (b *Binder) Bind(authMethod *structs.ACLAuthMethod, verifiedIdentity *authm
 	return &bindings, nil
 }
 
-// IsValidBindingRule returns whether the given BindName and/or BindVars template produces valid
+// IsValidBindName returns whether the given BindName template produces valid
 // results when interpolating the auth method's available variables.
-func IsValidBindingRule(bindType, bindName string, bindVars *structs.ACLTemplatedPolicyVariables, availableVariables []string) error {
+func IsValidBindName(bindType, bindName string, availableVariables []string) (bool, error) {
 	if bindType == "" || bindName == "" {
-		return errors.New("bindType and bindName must not be empty")
+		return false, nil
 	}
 
 	fakeVarMap := make(map[string]string)
@@ -153,96 +135,38 @@ func IsValidBindingRule(bindType, bindName string, bindVars *structs.ACLTemplate
 		fakeVarMap[v] = "fake"
 	}
 
-	switch bindType {
-	case structs.BindingRuleBindTypeService:
-		if _, err := computeBindName(bindName, fakeVarMap, acl.IsValidServiceIdentityName); err != nil {
-			return fmt.Errorf("failed to validate bindType %q: %w", bindType, err)
-		}
-
-	case structs.BindingRuleBindTypeNode:
-		if _, err := computeBindName(bindName, fakeVarMap, acl.IsValidNodeIdentityName); err != nil {
-			return fmt.Errorf("failed to validate bindType %q: %w", bindType, err)
-		}
-
-	case structs.BindingRuleBindTypeTemplatedPolicy:
-		// If user-defined templated policies are supported in the future,
-		// we will need to lookup state to ensure a template exists for given
-		// bindName. A possible solution is to rip out the check for templated
-		// policy into its own step which has access to the state store.
-		if _, err := generateTemplatedPolicies(bindName, bindVars, fakeVarMap); err != nil {
-			return fmt.Errorf("failed to validate bindType %q: %w", bindType, err)
-		}
-
-	case structs.BindingRuleBindTypeRole:
-		if _, err := computeBindName(bindName, fakeVarMap, acl.IsValidRoleName); err != nil {
-			return fmt.Errorf("failed to validate bindType %q: %w", bindType, err)
-		}
-	default:
-		return fmt.Errorf("Invalid Binding Rule: unknown BindType %q", bindType)
-	}
-
-	return nil
-}
-
-// computeBindName interprets given HIL bindName with any given variables in projectedVars.
-// validate (if not nil) will be called on the interpreted string.
-func computeBindName(bindName string, projectedVars map[string]string, validate func(string) bool) (string, error) {
-	computed, err := template.InterpolateHIL(bindName, projectedVars, true)
+	_, valid, err := computeBindName(bindType, bindName, fakeVarMap)
 	if err != nil {
-		return "", fmt.Errorf("error interpreting template: %w", err)
+		return false, err
 	}
-	if validate != nil && !validate(computed) {
-		return "", fmt.Errorf("invalid bind name: %q", computed)
-	}
-	return computed, nil
+	return valid, nil
 }
 
-// generateTemplatedPolicies fetches a templated policy by bindName then attempts to interpret
-// bindVars with any given variables in projectedVars. The resulting template is validated
-// by the template's schema.
-func generateTemplatedPolicies(
-	bindName string,
-	bindVars *structs.ACLTemplatedPolicyVariables,
-	projectedVars map[string]string,
-) (*structs.ACLTemplatedPolicy, error) {
-	baseTemplate, ok := structs.GetACLTemplatedPolicyBase(bindName)
-	if !ok {
-		return nil, fmt.Errorf("Bind name for templated-policy bind type does not match existing template name: %s", bindName)
-	}
-
-	computedBindVars, err := computeBindVars(bindVars, projectedVars)
+// computeBindName processes the HIL for the provided bind type+name using the
+// projected variables.
+//
+// - If the HIL is invalid ("", false, AN_ERROR) is returned.
+// - If the computed name is not valid for the type ("INVALID_NAME", false, nil) is returned.
+// - If the computed name is valid for the type ("VALID_NAME", true, nil) is returned.
+func computeBindName(bindType, bindName string, projectedVars map[string]string) (string, bool, error) {
+	bindName, err := template.InterpolateHIL(bindName, projectedVars, true)
 	if err != nil {
-		return nil, fmt.Errorf("failed to interpret templated policy variables: %w", err)
-	}
-
-	out := &structs.ACLTemplatedPolicy{
-		TemplateName:      bindName,
-		TemplateVariables: computedBindVars,
-		TemplateID:        baseTemplate.TemplateID,
+		return "", false, err
 	}
 
-	if err := out.ValidateTemplatedPolicy(baseTemplate.Schema); err != nil {
-		return nil, fmt.Errorf("templated policy failed validation: %w", err)
-	}
-
-	return out, nil
-}
-
-func computeBindVars(bindVars *structs.ACLTemplatedPolicyVariables, projectedVars map[string]string) (*structs.ACLTemplatedPolicyVariables, error) {
-	if bindVars == nil {
-		return nil, nil
-	}
-
-	out := &structs.ACLTemplatedPolicyVariables{}
-	if bindVars.Name != "" {
-		nameValue, err := template.InterpolateHIL(bindVars.Name, projectedVars, true)
-		if err != nil {
-			return nil, err
-		}
-		out.Name = nameValue
+	var valid bool
+	switch bindType {
+	case structs.BindingRuleBindTypeService:
+		valid = acl.IsValidServiceIdentityName(bindName)
+	case structs.BindingRuleBindTypeNode:
+		valid = acl.IsValidNodeIdentityName(bindName)
+	case structs.BindingRuleBindTypeRole:
+		valid = acl.IsValidRoleName(bindName)
+	default:
+		return "", false, fmt.Errorf("unknown binding rule bind type: %s", bindType)
 	}
 
-	return out, nil
+	return bindName, valid, nil
 }
 
 // doesSelectorMatch checks that a single selector matches the provided vars.
diff --git a/agent/consul/auth/binder_ce.go b/agent/consul/auth/binder_ce.go
index 2b1a474a407cb..bbd34090ee5f9 100644
--- a/agent/consul/auth/binder_ce.go
+++ b/agent/consul/auth/binder_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package auth
 
diff --git a/agent/consul/auth/binder_test.go b/agent/consul/auth/binder_test.go
index 41e0d14ddc35f..240131dfdb540 100644
--- a/agent/consul/auth/binder_test.go
+++ b/agent/consul/auth/binder_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package auth
 
 import (
@@ -119,7 +116,7 @@ func TestBinder_Roles_NameValidation(t *testing.T) {
 
 	_, err := binder.Bind(&structs.ACLAuthMethod{}, &authmethod.Identity{})
 	require.Error(t, err)
-	require.Contains(t, err.Error(), "invalid bind name")
+	require.Contains(t, err.Error(), "bind name for bind target is invalid")
 }
 
 func TestBinder_ServiceIdentities_Success(t *testing.T) {
@@ -187,7 +184,7 @@ func TestBinder_ServiceIdentities_NameValidation(t *testing.T) {
 
 	_, err := binder.Bind(&structs.ACLAuthMethod{}, &authmethod.Identity{})
 	require.Error(t, err)
-	require.Contains(t, err.Error(), "invalid bind name")
+	require.Contains(t, err.Error(), "bind name for bind target is invalid")
 }
 
 func TestBinder_NodeIdentities_Success(t *testing.T) {
@@ -255,87 +252,74 @@ func TestBinder_NodeIdentities_NameValidation(t *testing.T) {
 
 	_, err := binder.Bind(&structs.ACLAuthMethod{}, &authmethod.Identity{})
 	require.Error(t, err)
-	require.Contains(t, err.Error(), "invalid bind name")
+	require.Contains(t, err.Error(), "bind name for bind target is invalid")
 }
 
-func Test_IsValidBindingRule(t *testing.T) {
+func Test_IsValidBindName(t *testing.T) {
 	type testcase struct {
 		name     string
 		bindType string
 		bindName string
-		bindVars *structs.ACLTemplatedPolicyVariables
 		fields   string
-		err      bool
+		valid    bool // valid HIL, invalid contents
+		err      bool // invalid HIL
 	}
 
 	for _, test := range []testcase{
 		{"no bind type",
-			"", "", nil, "", true},
+			"", "", "", false, false},
 		{"bad bind type",
-			"invalid", "blah", nil, "", true},
+			"invalid", "blah", "", false, true},
 		// valid HIL, invalid name
 		{"empty",
-			"both", "", nil, "", true},
+			"both", "", "", false, false},
 		{"just end",
-			"both", "}", nil, "", true},
+			"both", "}", "", false, false},
 		{"var without start",
-			"both", " item }", nil, "item", true},
+			"both", " item }", "item", false, false},
 		{"two vars missing second start",
-			"both", "before-${ item }after--more }", nil, "item,more", true},
+			"both", "before-${ item }after--more }", "item,more", false, false},
 		// names for the two types are validated differently
 		{"@ is disallowed",
-			"both", "bad@name", nil, "", true},
+			"both", "bad@name", "", false, false},
 		{"leading dash",
-			"role", "-name", nil, "", false},
+			"role", "-name", "", true, false},
 		{"leading dash",
-			"service", "-name", nil, "", true},
+			"service", "-name", "", false, false},
 		{"trailing dash",
-			"role", "name-", nil, "", false},
+			"role", "name-", "", true, false},
 		{"trailing dash",
-			"service", "name-", nil, "", true},
+			"service", "name-", "", false, false},
 		{"inner dash",
-			"both", "name-end", nil, "", false},
+			"both", "name-end", "", true, false},
 		{"upper case",
-			"role", "NAME", nil, "", false},
+			"role", "NAME", "", true, false},
 		{"upper case",
-			"service", "NAME", nil, "", true},
+			"service", "NAME", "", false, false},
 		// valid HIL, valid name
 		{"no vars",
-			"both", "nothing", nil, "", false},
+			"both", "nothing", "", true, false},
 		{"just var",
-			"both", "${item}", nil, "item", false},
+			"both", "${item}", "item", true, false},
 		{"var in middle",
-			"both", "before-${item}after", nil, "item", false},
+			"both", "before-${item}after", "item", true, false},
 		{"two vars",
-			"both", "before-${item}after-${more}", nil, "item,more", false},
+			"both", "before-${item}after-${more}", "item,more", true, false},
 		// bad
 		{"no bind name",
-			"both", "", nil, "", true},
+			"both", "", "", false, false},
 		{"just start",
-			"both", "${", nil, "", true},
+			"both", "${", "", false, true},
 		{"backwards",
-			"both", "}${", nil, "", true},
+			"both", "}${", "", false, true},
 		{"no varname",
-			"both", "${}", nil, "", true},
+			"both", "${}", "", false, true},
 		{"missing map key",
-			"both", "${item}", nil, "", true},
+			"both", "${item}", "", false, true},
 		{"var without end",
-			"both", "${ item ", nil, "item", true},
+			"both", "${ item ", "item", false, true},
 		{"two vars missing first end",
-			"both", "before-${ item after-${ more }", nil, "item,more", true},
-
-		// bind type: templated policy - bad input
-		{"templated-policy missing bindvars", "templated-policy", "builtin/service", nil, "", true},
-		{"templated-policy with unknown templated policy name",
-			"templated-policy", "builtin/service", &structs.ACLTemplatedPolicyVariables{Name: "before-${item}after-${more}"}, "", true},
-		{"templated-policy with correct bindvars and unknown vars",
-			"templated-policy", "builtin/fake", &structs.ACLTemplatedPolicyVariables{Name: "test"}, "", true},
-		{"templated-policy with correct bindvars but incorrect HIL",
-			"templated-policy", "builtin/service", &structs.ACLTemplatedPolicyVariables{Name: "before-${ item }after--more }"}, "", true},
-
-		// bind type: templated policy - good input
-		{"templated-policy with appropriate bindvars",
-			"templated-policy", "builtin/service", &structs.ACLTemplatedPolicyVariables{Name: "before-${item}after-${more}"}, "item,more", false},
+			"both", "before-${ item after-${ more }", "item,more", false, true},
 	} {
 		var cases []testcase
 		if test.bindType == "both" {
@@ -352,13 +336,18 @@ func Test_IsValidBindingRule(t *testing.T) {
 			test := test
 			t.Run(test.bindType+"--"+test.name, func(t *testing.T) {
 				t.Parallel()
-				err := IsValidBindingRule(
+				valid, err := IsValidBindName(
 					test.bindType,
 					test.bindName,
-					test.bindVars,
 					strings.Split(test.fields, ","),
 				)
-				require.Equal(t, test.err, err != nil)
+				if test.err {
+					require.NotNil(t, err)
+					require.False(t, valid)
+				} else {
+					require.NoError(t, err)
+					require.Equal(t, test.valid, valid)
+				}
 			})
 		}
 	}
diff --git a/agent/consul/auth/login.go b/agent/consul/auth/login.go
index a084f33bf19bf..3848fb8c8c49a 100644
--- a/agent/consul/auth/login.go
+++ b/agent/consul/auth/login.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package auth
 
 import (
@@ -46,7 +43,6 @@ func (l *Login) TokenForVerifiedIdentity(identity *authmethod.Identity, authMeth
 		ExpirationTTL:     authMethod.MaxTokenTTL,
 		ServiceIdentities: bindings.ServiceIdentities,
 		NodeIdentities:    bindings.NodeIdentities,
-		TemplatedPolicies: bindings.TemplatedPolicies,
 		Roles:             bindings.Roles,
 		EnterpriseMeta:    bindings.EnterpriseMeta,
 	}
diff --git a/agent/consul/auth/token_writer.go b/agent/consul/auth/token_writer.go
index 0112d0387c56d..2b90e257b5d11 100644
--- a/agent/consul/auth/token_writer.go
+++ b/agent/consul/auth/token_writer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package auth
 
 import (
@@ -309,12 +306,6 @@ func (w *TokenWriter) write(token, existing *structs.ACLToken, fromLogin bool) (
 	}
 	token.NodeIdentities = nodeIdentities
 
-	templatedPolicies, err := w.normalizeTemplatedPolicies(token.TemplatedPolicies)
-	if err != nil {
-		return nil, err
-	}
-	token.TemplatedPolicies = templatedPolicies
-
 	if err := w.enterpriseValidation(token, existing); err != nil {
 		return nil, err
 	}
@@ -448,32 +439,3 @@ func (w *TokenWriter) normalizeNodeIdentities(nodeIDs structs.ACLNodeIdentities)
 	}
 	return nodeIDs.Deduplicate(), nil
 }
-
-func (w *TokenWriter) normalizeTemplatedPolicies(templatedPolicies structs.ACLTemplatedPolicies) (structs.ACLTemplatedPolicies, error) {
-	if len(templatedPolicies) == 0 {
-		return templatedPolicies, nil
-	}
-
-	finalPolicies := make(structs.ACLTemplatedPolicies, 0, len(templatedPolicies))
-	for _, templatedPolicy := range templatedPolicies {
-		if templatedPolicy.TemplateName == "" {
-			return nil, errors.New("templated policy is missing the template name field on this token")
-		}
-
-		tmp, ok := structs.GetACLTemplatedPolicyBase(templatedPolicy.TemplateName)
-		if !ok {
-			return nil, fmt.Errorf("no such ACL templated policy with Name %q", templatedPolicy.TemplateName)
-		}
-
-		out := templatedPolicy.Clone()
-		out.TemplateID = tmp.TemplateID
-
-		err := templatedPolicy.ValidateTemplatedPolicy(tmp.Schema)
-		if err != nil {
-			return nil, fmt.Errorf("validation error for templated policy %q: %w", templatedPolicy.TemplateName, err)
-		}
-		finalPolicies = append(finalPolicies, out)
-	}
-
-	return finalPolicies.Deduplicate(), nil
-}
diff --git a/agent/consul/auth/token_writer_ce.go b/agent/consul/auth/token_writer_ce.go
index fe8840138a823..57365610efd75 100644
--- a/agent/consul/auth/token_writer_ce.go
+++ b/agent/consul/auth/token_writer_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package auth
 
diff --git a/agent/consul/auth/token_writer_test.go b/agent/consul/auth/token_writer_test.go
index 3206476a504d9..86c34f90a8c12 100644
--- a/agent/consul/auth/token_writer_test.go
+++ b/agent/consul/auth/token_writer_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package auth
 
 import (
@@ -15,7 +12,6 @@ import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/api"
 )
 
 func TestTokenWriter_Create_Validation(t *testing.T) {
@@ -358,59 +354,6 @@ func TestTokenWriter_NodeIdentities(t *testing.T) {
 	}
 }
 
-func TestTokenWriter_TemplatedPolicies(t *testing.T) {
-	aclCache := &MockACLCache{}
-	aclCache.On("RemoveIdentityWithSecretToken", mock.Anything)
-
-	store := testStateStore(t)
-
-	writer := buildTokenWriter(store, aclCache)
-
-	testCases := map[string]struct {
-		input         []*structs.ACLTemplatedPolicy
-		output        []*structs.ACLTemplatedPolicy
-		errorContains string
-	}{
-		"missing templated policy name": {
-			input:         []*structs.ACLTemplatedPolicy{{TemplateName: ""}},
-			errorContains: "templated policy is missing the template name field on this token",
-		},
-		"invalid templated policy name": {
-			input:         []*structs.ACLTemplatedPolicy{{TemplateName: "faketemplate"}},
-			errorContains: "no such ACL templated policy with Name \"faketemplate\"",
-		},
-		"missing required template variable: name": {
-			input:         []*structs.ACLTemplatedPolicy{{TemplateName: api.ACLTemplatedPolicyServiceName, Datacenters: []string{"dc1"}}},
-			errorContains: "validation error for templated policy \"builtin/service\"",
-		},
-		"duplicate templated policies are removed and ids are set": {
-			input: []*structs.ACLTemplatedPolicy{
-				{TemplateName: api.ACLTemplatedPolicyServiceName, TemplateVariables: &structs.ACLTemplatedPolicyVariables{Name: "web"}},
-				{TemplateName: api.ACLTemplatedPolicyServiceName, TemplateVariables: &structs.ACLTemplatedPolicyVariables{Name: "web"}},
-				{TemplateName: api.ACLTemplatedPolicyServiceName, TemplateVariables: &structs.ACLTemplatedPolicyVariables{Name: "api"}},
-				{TemplateName: api.ACLTemplatedPolicyNodeName, TemplateVariables: &structs.ACLTemplatedPolicyVariables{Name: "nodename"}},
-			},
-			output: []*structs.ACLTemplatedPolicy{
-				{TemplateID: structs.ACLTemplatedPolicyServiceID, TemplateName: api.ACLTemplatedPolicyServiceName, TemplateVariables: &structs.ACLTemplatedPolicyVariables{Name: "web"}},
-				{TemplateID: structs.ACLTemplatedPolicyServiceID, TemplateName: api.ACLTemplatedPolicyServiceName, TemplateVariables: &structs.ACLTemplatedPolicyVariables{Name: "api"}},
-				{TemplateID: structs.ACLTemplatedPolicyNodeID, TemplateName: api.ACLTemplatedPolicyNodeName, TemplateVariables: &structs.ACLTemplatedPolicyVariables{Name: "nodename"}},
-			},
-		},
-	}
-	for desc, tc := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			updated, err := writer.Create(&structs.ACLToken{TemplatedPolicies: tc.input}, false)
-			if tc.errorContains == "" {
-				require.NoError(t, err)
-				require.ElementsMatch(t, tc.output, updated.TemplatedPolicies)
-			} else {
-				require.Error(t, err)
-				require.Contains(t, err.Error(), tc.errorContains)
-			}
-		})
-	}
-}
-
 func TestTokenWriter_Create_Expiration(t *testing.T) {
 	aclCache := &MockACLCache{}
 	aclCache.On("RemoveIdentityWithSecretToken", mock.Anything)
diff --git a/agent/consul/authmethod/authmethods.go b/agent/consul/authmethod/authmethods.go
index d03e2b410cb4f..fbcd27e015097 100644
--- a/agent/consul/authmethod/authmethods.go
+++ b/agent/consul/authmethod/authmethods.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package authmethod
 
 import (
diff --git a/agent/consul/authmethod/authmethods_ce.go b/agent/consul/authmethod/authmethods_ce.go
index 38b27b70115bc..0e5cc5a7f438b 100644
--- a/agent/consul/authmethod/authmethods_ce.go
+++ b/agent/consul/authmethod/authmethods_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package authmethod
 
diff --git a/agent/consul/authmethod/awsauth/aws.go b/agent/consul/authmethod/awsauth/aws.go
index 3381a893fa5da..7c7758476cc70 100644
--- a/agent/consul/authmethod/awsauth/aws.go
+++ b/agent/consul/authmethod/awsauth/aws.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package awsauth
 
 import (
diff --git a/agent/consul/authmethod/awsauth/aws_test.go b/agent/consul/authmethod/awsauth/aws_test.go
index 279e4b3e46d48..031cd035b7182 100644
--- a/agent/consul/authmethod/awsauth/aws_test.go
+++ b/agent/consul/authmethod/awsauth/aws_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package awsauth
 
 import (
diff --git a/agent/consul/authmethod/kubeauth/k8s.go b/agent/consul/authmethod/kubeauth/k8s.go
index 274dd2ec9d03a..a976664a69dc4 100644
--- a/agent/consul/authmethod/kubeauth/k8s.go
+++ b/agent/consul/authmethod/kubeauth/k8s.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package kubeauth
 
 import (
diff --git a/agent/consul/authmethod/kubeauth/k8s_ce.go b/agent/consul/authmethod/kubeauth/k8s_ce.go
index b180836948cf3..a023c24e7ce87 100644
--- a/agent/consul/authmethod/kubeauth/k8s_ce.go
+++ b/agent/consul/authmethod/kubeauth/k8s_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package kubeauth
 
diff --git a/agent/consul/authmethod/kubeauth/k8s_test.go b/agent/consul/authmethod/kubeauth/k8s_test.go
index 48ef6e61c4839..e8c1abe1ba711 100644
--- a/agent/consul/authmethod/kubeauth/k8s_test.go
+++ b/agent/consul/authmethod/kubeauth/k8s_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package kubeauth
 
 import (
diff --git a/agent/consul/authmethod/kubeauth/testing.go b/agent/consul/authmethod/kubeauth/testing.go
index 38b7d9c330a3f..83e5d4fa29de0 100644
--- a/agent/consul/authmethod/kubeauth/testing.go
+++ b/agent/consul/authmethod/kubeauth/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package kubeauth
 
 import (
diff --git a/agent/consul/authmethod/ssoauth/sso.go b/agent/consul/authmethod/ssoauth/sso.go
index 398f5689799b3..ee8fff4bd872c 100644
--- a/agent/consul/authmethod/ssoauth/sso.go
+++ b/agent/consul/authmethod/ssoauth/sso.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ssoauth
 
 import (
diff --git a/agent/consul/authmethod/ssoauth/sso_ce.go b/agent/consul/authmethod/ssoauth/sso_ce.go
index 504329d20089c..495ce482b21c6 100644
--- a/agent/consul/authmethod/ssoauth/sso_ce.go
+++ b/agent/consul/authmethod/ssoauth/sso_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package ssoauth
 
diff --git a/agent/consul/authmethod/ssoauth/sso_test.go b/agent/consul/authmethod/ssoauth/sso_test.go
index 357612fad6894..39501b026cb36 100644
--- a/agent/consul/authmethod/ssoauth/sso_test.go
+++ b/agent/consul/authmethod/ssoauth/sso_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ssoauth
 
 import (
diff --git a/agent/consul/authmethod/testauth/testing.go b/agent/consul/authmethod/testauth/testing.go
index ead9ae081a7ea..5ad0f1e490993 100644
--- a/agent/consul/authmethod/testauth/testing.go
+++ b/agent/consul/authmethod/testauth/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package testauth
 
 import (
diff --git a/agent/consul/authmethod/testauth/testing_ce.go b/agent/consul/authmethod/testauth/testing_ce.go
index 460f30fe4f798..d03a6ad876f39 100644
--- a/agent/consul/authmethod/testauth/testing_ce.go
+++ b/agent/consul/authmethod/testauth/testing_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package testauth
 
diff --git a/agent/consul/authmethod/testing.go b/agent/consul/authmethod/testing.go
index 0f43e5e5201fc..d367f64767dc7 100644
--- a/agent/consul/authmethod/testing.go
+++ b/agent/consul/authmethod/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package authmethod
 
 import (
diff --git a/agent/consul/auto_config_backend.go b/agent/consul/auto_config_backend.go
index 0aaccfa35d99b..e77093d5ea326 100644
--- a/agent/consul/auto_config_backend.go
+++ b/agent/consul/auto_config_backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -34,7 +31,7 @@ func (b autoConfigBackend) GetCARoots() (*structs.IndexedCARoots, error) {
 }
 
 // DatacenterJoinAddresses will return all the strings suitable for usage in
-// retry join operations to connect to the LAN or LAN segment gossip pool.
+// retry join operations to connect to the the LAN or LAN segment gossip pool.
 func (b autoConfigBackend) DatacenterJoinAddresses(partition, segment string) ([]string, error) {
 	members, err := b.Server.LANMembers(LANMemberFilter{
 		Segment:   segment,
diff --git a/agent/consul/auto_config_backend_test.go b/agent/consul/auto_config_backend_test.go
index 00c0dc10d80d7..b4a8a2c6cd1df 100644
--- a/agent/consul/auto_config_backend_test.go
+++ b/agent/consul/auto_config_backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/auto_config_endpoint.go b/agent/consul/auto_config_endpoint.go
index f491bcbad832a..e33fb19d49e71 100644
--- a/agent/consul/auto_config_endpoint.go
+++ b/agent/consul/auto_config_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -19,9 +16,9 @@ import (
 	"github.com/hashicorp/consul/agent/dns"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib/template"
-	"github.com/hashicorp/consul/proto/private/pbautoconf"
-	"github.com/hashicorp/consul/proto/private/pbconfig"
-	"github.com/hashicorp/consul/proto/private/pbconnect"
+	"github.com/hashicorp/consul/proto/pbautoconf"
+	"github.com/hashicorp/consul/proto/pbconfig"
+	"github.com/hashicorp/consul/proto/pbconnect"
 	"github.com/hashicorp/consul/tlsutil"
 )
 
diff --git a/agent/consul/auto_config_endpoint_test.go b/agent/consul/auto_config_endpoint_test.go
index 39c4f3a7a5efa..1f0f8e18a1ca4 100644
--- a/agent/consul/auto_config_endpoint_test.go
+++ b/agent/consul/auto_config_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -26,10 +23,10 @@ import (
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/internal/go-sso/oidcauth/oidcauthtest"
-	"github.com/hashicorp/consul/proto/private/pbautoconf"
-	"github.com/hashicorp/consul/proto/private/pbconfig"
-	"github.com/hashicorp/consul/proto/private/pbconnect"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/pbautoconf"
+	"github.com/hashicorp/consul/proto/pbconfig"
+	"github.com/hashicorp/consul/proto/pbconnect"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/tlsutil"
 	"github.com/hashicorp/consul/types"
diff --git a/agent/consul/auto_encrypt_endpoint.go b/agent/consul/auto_encrypt_endpoint.go
index dbd39355cfbf3..3adfad8ecd2b4 100644
--- a/agent/consul/auto_encrypt_endpoint.go
+++ b/agent/consul/auto_encrypt_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/auto_encrypt_endpoint_test.go b/agent/consul/auto_encrypt_endpoint_test.go
index f3b2320116340..50d356d9f86da 100644
--- a/agent/consul/auto_encrypt_endpoint_test.go
+++ b/agent/consul/auto_encrypt_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/autopilot.go b/agent/consul/autopilot.go
index 70391f6b99107..a41febb058142 100644
--- a/agent/consul/autopilot.go
+++ b/agent/consul/autopilot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/autopilot_ce.go b/agent/consul/autopilot_ce.go
index 4a95e69e23fed..d84cd2fdfb9fa 100644
--- a/agent/consul/autopilot_ce.go
+++ b/agent/consul/autopilot_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/autopilot_test.go b/agent/consul/autopilot_test.go
index 8d1d214b17104..2ebd5806b4787 100644
--- a/agent/consul/autopilot_test.go
+++ b/agent/consul/autopilot_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/autopilotevents/ready_servers_events.go b/agent/consul/autopilotevents/ready_servers_events.go
index 16e064aa7905d..862959a127195 100644
--- a/agent/consul/autopilotevents/ready_servers_events.go
+++ b/agent/consul/autopilotevents/ready_servers_events.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autopilotevents
 
 import (
@@ -17,7 +14,7 @@ import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 	"github.com/hashicorp/consul/types"
 )
 
diff --git a/agent/consul/autopilotevents/ready_servers_events_test.go b/agent/consul/autopilotevents/ready_servers_events_test.go
index 16d78b52e3b5f..aedf25c4d9928 100644
--- a/agent/consul/autopilotevents/ready_servers_events_test.go
+++ b/agent/consul/autopilotevents/ready_servers_events_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autopilotevents
 
 import (
@@ -16,7 +13,7 @@ import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	structs "github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 	types "github.com/hashicorp/consul/types"
 )
 
diff --git a/agent/consul/catalog_endpoint.go b/agent/consul/catalog_endpoint.go
index 36426afe253a2..acf7edde26185 100644
--- a/agent/consul/catalog_endpoint.go
+++ b/agent/consul/catalog_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -601,6 +598,7 @@ func (c *Catalog) ListServices(args *structs.DCSpecificRequest, reply *structs.I
 			if err != nil {
 				return err
 			}
+
 			if isUnmodified(args.QueryOptions, reply.Index) {
 				reply.Services = nil
 				reply.QueryMeta.NotModified = true
diff --git a/agent/consul/catalog_endpoint_test.go b/agent/consul/catalog_endpoint_test.go
index 628ad83ae4db0..e4c6cd7deeb0f 100644
--- a/agent/consul/catalog_endpoint_test.go
+++ b/agent/consul/catalog_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/client.go b/agent/consul/client.go
index fa5f1239e134e..7f6ed8034054f 100644
--- a/agent/consul/client.go
+++ b/agent/consul/client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -25,7 +22,6 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/logging"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"github.com/hashicorp/consul/tlsutil"
 	"github.com/hashicorp/consul/types"
 )
@@ -94,9 +90,6 @@ type Client struct {
 	EnterpriseClient
 
 	tlsConfigurator *tlsutil.Configurator
-
-	// resourceServiceClient is a client for the gRPC Resource Service.
-	resourceServiceClient pbresource.ResourceServiceClient
 }
 
 // NewClient creates and returns a Client
@@ -155,13 +148,6 @@ func NewClient(config *Config, deps Deps) (*Client, error) {
 	}
 	c.router = deps.Router
 
-	conn, err := deps.GRPCConnPool.ClientConn(deps.ConnPool.Datacenter)
-	if err != nil {
-		c.Shutdown()
-		return nil, fmt.Errorf("Failed to get gRPC client connection: %w", err)
-	}
-	c.resourceServiceClient = pbresource.NewResourceServiceClient(conn)
-
 	// Start LAN event handlers after the router is complete since the event
 	// handlers depend on the router and the router depends on Serf.
 	go c.lanEventHandler()
@@ -462,7 +448,3 @@ func (c *Client) AgentEnterpriseMeta() *acl.EnterpriseMeta {
 func (c *Client) agentSegmentName() string {
 	return c.config.Segment
 }
-
-func (c *Client) ResourceServiceClient() pbresource.ResourceServiceClient {
-	return c.resourceServiceClient
-}
diff --git a/agent/consul/client_serf.go b/agent/consul/client_serf.go
index c92fdd1726c30..50a0844485a9a 100644
--- a/agent/consul/client_serf.go
+++ b/agent/consul/client_serf.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/client_test.go b/agent/consul/client_test.go
index 1d6fa28b526c0..e8b79f04dc6d7 100644
--- a/agent/consul/client_test.go
+++ b/agent/consul/client_test.go
@@ -1,15 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/mesh"
-	"github.com/hashicorp/consul/internal/resource/demo"
 	"net"
 	"os"
 	"strings"
@@ -17,8 +11,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/internal/resource"
-
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/serf/serf"
 	"github.com/stretchr/testify/require"
@@ -562,10 +554,6 @@ func newDefaultDeps(t *testing.T, c *Config) Deps {
 		RPCHoldTimeout:   c.RPCHoldTimeout,
 	}
 	connPool.SetRPCClientTimeout(c.RPCClientTimeout)
-	registry := resource.NewRegistry()
-	demo.RegisterTypes(registry)
-	mesh.RegisterTypes(registry)
-	catalog.RegisterTypes(registry)
 	return Deps{
 		EventPublisher:  stream.NewEventPublisher(10 * time.Second),
 		Logger:          logger,
@@ -585,7 +573,6 @@ func newDefaultDeps(t *testing.T, c *Config) Deps {
 		GetNetRPCInterceptorFunc: middleware.GetNetRPCInterceptor,
 		EnterpriseDeps:           newDefaultDepsEnterprise(t, logger, c),
 		XDSStreamLimiter:         limiter.NewSessionLimiter(),
-		Registry:                 registry,
 	}
 }
 
@@ -841,7 +828,6 @@ func TestClient_ReloadConfig(t *testing.T) {
 	deps := newDefaultDeps(t, &Config{NodeName: "node1", Datacenter: "dc1"})
 	c, err := NewClient(cfg, deps)
 	require.NoError(t, err)
-	defer c.Shutdown()
 
 	limiter := c.rpcLimiter.Load().(*rate.Limiter)
 	require.Equal(t, rate.Limit(500), limiter.Limit())
@@ -887,6 +873,7 @@ func TestClient_ShortReconnectTimeout(t *testing.T) {
 		func() bool {
 			return len(cluster.Servers[0].LANMembersInAgentPartition()) == 2 &&
 				len(cluster.Clients[0].LANMembersInAgentPartition()) == 2
+
 		},
 		time.Second,
 		50*time.Millisecond,
@@ -918,7 +905,6 @@ func TestClient_RPC_Timeout(t *testing.T) {
 		c.MaxQueryTime = 200 * time.Millisecond
 		c.RPCHoldTimeout = 50 * time.Millisecond
 	})
-	defer c1.Shutdown()
 	joinLAN(t, c1, s1)
 
 	retry.Run(t, func(r *retry.R) {
diff --git a/agent/consul/cluster_test.go b/agent/consul/cluster_test.go
index 7cc266908198c..bf2c63a2e8e0c 100644
--- a/agent/consul/cluster_test.go
+++ b/agent/consul/cluster_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/config.go b/agent/consul/config.go
index 8e3bb92e4eb1d..db3cc5d19d4ec 100644
--- a/agent/consul/config.go
+++ b/agent/consul/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -40,9 +37,8 @@ const (
 
 	// LogStoreBackend* are well-known string values used to configure different
 	// log store backends.
-	LogStoreBackendDefault = "default"
-	LogStoreBackendBoltDB  = "boltdb"
-	LogStoreBackendWAL     = "wal"
+	LogStoreBackendBoltDB = "boltdb"
+	LogStoreBackendWAL    = "wal"
 )
 
 var (
@@ -239,9 +235,9 @@ type Config struct {
 	AutoConfigAuthzAllowReuse      bool
 
 	// TombstoneTTL is used to control how long KV tombstones are retained.
-	// This provides a window of time when the X-Consul-Index is monotonic.
+	// This provides a window of time where the X-Consul-Index is monotonic.
 	// Outside this window, the index may not be monotonic. This is a result
-	// of a few trade-offs:
+	// of a few trade offs:
 	// 1) The index is defined by the data view and not globally. This is a
 	// performance optimization that prevents any write from incrementing the
 	// index for all data views.
@@ -249,10 +245,10 @@ type Config struct {
 	// is also monotonic. This prevents deletes from reducing the disk space
 	// used.
 	// In theory, neither of these are intrinsic limitations, however for the
-	// purposes of building a practical system, they are reasonable trade-offs.
+	// purposes of building a practical system, they are reasonable trade offs.
 	//
 	// It is also possible to set this to an incredibly long time, thereby
-	// simulating infinite retention. This is not recommended, however.
+	// simulating infinite retention. This is not recommended however.
 	//
 	TombstoneTTL time.Duration
 
@@ -440,8 +436,6 @@ type Config struct {
 
 	PeeringTestAllowPeerRegistrations bool
 
-	Locality *structs.Locality
-
 	Cloud CloudConfig
 
 	Reporting Reporting
@@ -529,13 +523,11 @@ func DefaultConfig() *Config {
 		TombstoneTTLGranularity:              30 * time.Second,
 		SessionTTLMin:                        10 * time.Second,
 		ACLTokenMinExpirationTTL:             1 * time.Minute,
-		// Duration is stored as an int64. Setting the default max
-		// to the max possible duration (approx 290 years).
-		ACLTokenMaxExpirationTTL: 1<<63 - 1,
+		ACLTokenMaxExpirationTTL:             24 * time.Hour,
 
 		// These are tuned to provide a total throughput of 128 updates
-		// per second. If you update these, you should update the client-side
-		// SyncCoordinateRateTarget parameter accordingly.
+		// per second. If you update these, you should update the client-
+		// side SyncCoordinateRateTarget parameter accordingly.
 		CoordinateUpdatePeriod:     5 * time.Second,
 		CoordinateUpdateBatchSize:  128,
 		CoordinateUpdateMaxBatches: 5,
@@ -567,7 +559,7 @@ func DefaultConfig() *Config {
 			},
 		},
 
-		// Stay under the 10-second aggregation interval of
+		// Stay under the 10 second aggregation interval of
 		// go-metrics. This ensures we always report the
 		// usage metrics in each cycle.
 		MetricsReportingInterval: 9 * time.Second,
diff --git a/agent/consul/config_ce.go b/agent/consul/config_ce.go
index b65a518615086..bae469eaf8778 100644
--- a/agent/consul/config_ce.go
+++ b/agent/consul/config_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/config_cloud.go b/agent/consul/config_cloud.go
index 5b62574c811b4..b0780052f668a 100644
--- a/agent/consul/config_cloud.go
+++ b/agent/consul/config_cloud.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 type CloudConfig struct {
diff --git a/agent/consul/config_endpoint.go b/agent/consul/config_endpoint.go
index a78859c35058e..f6ec3b3ba6a9a 100644
--- a/agent/consul/config_endpoint.go
+++ b/agent/consul/config_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -10,7 +7,6 @@ import (
 
 	metrics "github.com/armon/go-metrics"
 	"github.com/armon/go-metrics/prometheus"
-	"github.com/hashicorp/go-bexpr"
 	"github.com/hashicorp/go-hclog"
 	memdb "github.com/hashicorp/go-memdb"
 	hashstructure_v2 "github.com/mitchellh/hashstructure/v2"
@@ -249,22 +245,6 @@ func (c *ConfigEntry) List(args *structs.ConfigEntryQuery, reply *structs.Indexe
 		}
 	}
 
-	// Filtering.
-	// This is only supported for certain config entries.
-	var filter *bexpr.Filter
-	if args.Filter != "" {
-		switch args.Kind {
-		case structs.ServiceDefaults:
-			f, err := bexpr.CreateFilter(args.Filter, nil, []*structs.ServiceConfigEntry{})
-			if err != nil {
-				return err
-			}
-			filter = f
-		default:
-			return fmt.Errorf("filtering not supported for config entry kind=%v", args.Kind)
-		}
-	}
-
 	var (
 		priorHash uint64
 		ranOnce   bool
@@ -300,14 +280,6 @@ func (c *ConfigEntry) List(args *structs.ConfigEntryQuery, reply *structs.Indexe
 				return fmt.Errorf("error hashing reply for spurious wakeup suppression: %w", err)
 			}
 
-			if filter != nil {
-				raw, err := filter.Execute(reply.Entries)
-				if err != nil {
-					return err
-				}
-				reply.Entries = raw.([]structs.ConfigEntry)
-			}
-
 			if ranOnce && priorHash == newHash {
 				priorHash = newHash
 				return errNotChanged
diff --git a/agent/consul/config_endpoint_test.go b/agent/consul/config_endpoint_test.go
index 49a10dce21797..569ec4f51c15f 100644
--- a/agent/consul/config_endpoint_test.go
+++ b/agent/consul/config_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -633,131 +630,6 @@ func TestConfigEntry_ListAll(t *testing.T) {
 	})
 }
 
-func TestConfigEntry_List_Filter(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	dir1, s1 := testServer(t)
-	t.Cleanup(func() { os.RemoveAll(dir1) })
-	t.Cleanup(func() { s1.Shutdown() })
-	codec := rpcClient(t, s1)
-	t.Cleanup(func() { codec.Close() })
-
-	// Create some services
-	state := s1.fsm.State()
-	expected := structs.IndexedConfigEntries{
-		Entries: []structs.ConfigEntry{
-			&structs.ServiceConfigEntry{
-				Kind:          structs.ServiceDefaults,
-				Name:          "svc1",
-				MutualTLSMode: structs.MutualTLSModeDefault,
-			},
-			&structs.ServiceConfigEntry{
-				Kind:          structs.ServiceDefaults,
-				Name:          "svc2",
-				MutualTLSMode: structs.MutualTLSModeStrict,
-			},
-			&structs.ServiceConfigEntry{
-				Kind:          structs.ServiceDefaults,
-				Name:          "svc3",
-				MutualTLSMode: structs.MutualTLSModePermissive,
-			},
-		},
-	}
-
-	require.NoError(t, state.EnsureConfigEntry(1, &structs.MeshConfigEntry{
-		AllowEnablingPermissiveMutualTLS: true,
-	}))
-	for i, e := range expected.Entries {
-		require.NoError(t, state.EnsureConfigEntry(uint64(i+2), e))
-	}
-
-	cases := []struct {
-		filter   string
-		expected []structs.ConfigEntry
-	}{
-		{
-			filter:   `MutualTLSMode == ""`,
-			expected: expected.Entries[0:1],
-		},
-		{
-			filter:   `MutualTLSMode == "strict"`,
-			expected: expected.Entries[1:2],
-		},
-		{
-			filter:   `MutualTLSMode == "permissive"`,
-			expected: expected.Entries[2:3],
-		},
-	}
-	for _, c := range cases {
-		c := c
-		t.Run(c.filter, func(t *testing.T) {
-			args := structs.ConfigEntryQuery{
-				Kind:       structs.ServiceDefaults,
-				Datacenter: "dc1",
-				QueryOptions: structs.QueryOptions{
-					Filter: c.filter,
-				},
-			}
-
-			var out structs.IndexedConfigEntries
-			require.NoError(t, msgpackrpc.CallWithCodec(codec, "ConfigEntry.List", &args, &out))
-			require.Equal(t, out.Entries, c.expected)
-		})
-	}
-}
-
-func TestConfigEntry_List_Filter_UnsupportedType(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	dir1, s1 := testServer(t)
-	t.Cleanup(func() { os.RemoveAll(dir1) })
-	t.Cleanup(func() { s1.Shutdown() })
-	codec := rpcClient(t, s1)
-	t.Cleanup(func() { codec.Close() })
-
-	for _, kind := range []string{
-		// Only service-defaults is supported for now.
-		structs.ProxyDefaults,
-		structs.ServiceRouter,
-		structs.ServiceSplitter,
-		structs.ServiceResolver,
-		structs.IngressGateway,
-		structs.TerminatingGateway,
-		structs.ServiceIntentions,
-		structs.MeshConfig,
-		structs.ExportedServices,
-		structs.SamenessGroup,
-		structs.APIGateway,
-		structs.BoundAPIGateway,
-		structs.InlineCertificate,
-		structs.HTTPRoute,
-		structs.TCPRoute,
-		structs.JWTProvider,
-	} {
-		args := structs.ConfigEntryQuery{
-			Kind:       kind,
-			Datacenter: "dc1",
-			QueryOptions: structs.QueryOptions{
-				Filter: `X == "y"`,
-			},
-		}
-
-		var out structs.IndexedConfigEntries
-		err := msgpackrpc.CallWithCodec(codec, "ConfigEntry.List", &args, &out)
-		require.Error(t, err)
-		require.Equal(t, "filtering not supported for config entry kind="+kind, err.Error())
-	}
-
-}
-
 func TestConfigEntry_List_ACLDeny(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
@@ -1459,6 +1331,57 @@ func TestConfigEntry_ResolveServiceConfig_Upstreams(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "upstream config entries from UpstreamIDs and service-defaults",
+			entries: []structs.ConfigEntry{
+				&structs.ProxyConfigEntry{
+					Kind: structs.ProxyDefaults,
+					Name: structs.ProxyConfigGlobal,
+					Config: map[string]interface{}{
+						"protocol": "grpc",
+					},
+				},
+				&structs.ServiceConfigEntry{
+					Kind: structs.ServiceDefaults,
+					Name: "api",
+					UpstreamConfig: &structs.UpstreamConfiguration{
+						Overrides: []*structs.UpstreamConfig{
+							{
+								Name:     "mysql",
+								Peer:     "peer1", // This should be ignored for legacy UpstreamIDs mode
+								Protocol: "http",
+							},
+						},
+					},
+				},
+			},
+			request: structs.ServiceConfigRequest{
+				Name:       "api",
+				Datacenter: "dc1",
+				UpstreamIDs: []structs.ServiceID{
+					structs.NewServiceID("cache", nil),
+				},
+			},
+			expect: structs.ServiceConfigResponse{
+				ProxyConfig: map[string]interface{}{
+					"protocol": "grpc",
+				},
+				UpstreamIDConfigs: structs.OpaqueUpstreamConfigsDeprecated{
+					{
+						Upstream: structs.NewServiceID("cache", nil),
+						Config: map[string]interface{}{
+							"protocol": "grpc",
+						},
+					},
+					{
+						Upstream: structs.NewServiceID("mysql", nil),
+						Config: map[string]interface{}{
+							"protocol": "http",
+						},
+					},
+				},
+			},
+		},
 		{
 			name: "upstream config entries from UpstreamServiceNames and service-defaults",
 			entries: []structs.ConfigEntry{
@@ -1819,6 +1742,9 @@ func TestConfigEntry_ResolveServiceConfig_Upstreams(t *testing.T) {
 			sort.SliceStable(out.UpstreamConfigs, func(i, j int) bool {
 				return out.UpstreamConfigs[i].Upstream.String() < out.UpstreamConfigs[j].Upstream.String()
 			})
+			sort.SliceStable(out.UpstreamIDConfigs, func(i, j int) bool {
+				return out.UpstreamIDConfigs[i].Upstream.String() < out.UpstreamIDConfigs[j].Upstream.String()
+			})
 
 			require.Equal(t, tc.expect, out)
 		})
@@ -2089,9 +2015,9 @@ func TestConfigEntry_ResolveServiceConfig_Upstreams_Blocking(t *testing.T) {
 			&structs.ServiceConfigRequest{
 				Name:       "foo",
 				Datacenter: "dc1",
-				UpstreamServiceNames: []structs.PeeredServiceName{
-					{ServiceName: structs.NewServiceName("bar", nil)},
-					{ServiceName: structs.NewServiceName("other", nil)},
+				UpstreamIDs: []structs.ServiceID{
+					structs.NewServiceID("bar", nil),
+					structs.NewServiceID("other", nil),
 				},
 				QueryOptions: structs.QueryOptions{
 					MinQueryIndex: index,
@@ -2125,9 +2051,9 @@ func TestConfigEntry_ResolveServiceConfig_Upstreams_Blocking(t *testing.T) {
 			&structs.ServiceConfigRequest{
 				Name:       "foo",
 				Datacenter: "dc1",
-				UpstreamServiceNames: []structs.PeeredServiceName{
-					{ServiceName: structs.NewServiceName("bar", nil)},
-					{ServiceName: structs.NewServiceName("other", nil)},
+				UpstreamIDs: []structs.ServiceID{
+					structs.NewServiceID("bar", nil),
+					structs.NewServiceID("other", nil),
 				},
 			},
 			&out,
@@ -2168,9 +2094,9 @@ func TestConfigEntry_ResolveServiceConfig_Upstreams_Blocking(t *testing.T) {
 			&structs.ServiceConfigRequest{
 				Name:       "foo",
 				Datacenter: "dc1",
-				UpstreamServiceNames: []structs.PeeredServiceName{
-					{ServiceName: structs.NewServiceName("bar", nil)},
-					{ServiceName: structs.NewServiceName("other", nil)},
+				UpstreamIDs: []structs.ServiceID{
+					structs.NewServiceID("bar", nil),
+					structs.NewServiceID("other", nil),
 				},
 				QueryOptions: structs.QueryOptions{
 					MinQueryIndex: index,
@@ -2386,8 +2312,8 @@ func TestConfigEntry_ResolveServiceConfig_BlockOnNoChange(t *testing.T) {
 			func(minQueryIndex uint64) (*structs.QueryMeta, <-chan error) {
 				args := structs.ServiceConfigRequest{
 					Name: "foo",
-					UpstreamServiceNames: []structs.PeeredServiceName{
-						{ServiceName: structs.NewServiceName("bar", nil)},
+					UpstreamIDs: []structs.ServiceID{
+						structs.NewServiceID("bar", nil),
 					},
 				}
 				args.QueryOptions.MinQueryIndex = minQueryIndex
diff --git a/agent/consul/config_replication.go b/agent/consul/config_replication.go
index d9573ad58bf99..902f92a6afe78 100644
--- a/agent/consul/config_replication.go
+++ b/agent/consul/config_replication.go
@@ -1,24 +1,27 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
 	"context"
 	"fmt"
+	"sort"
 	"time"
 
 	"github.com/armon/go-metrics"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-multierror"
 
-	"github.com/hashicorp/consul/agent/configentry"
 	"github.com/hashicorp/consul/agent/structs"
 )
 
+func configSort(configs []structs.ConfigEntry) {
+	sort.SliceStable(configs, func(i, j int) bool {
+		return cmpConfigLess(configs[i], configs[j])
+	})
+}
+
 func diffConfigEntries(local []structs.ConfigEntry, remote []structs.ConfigEntry, lastRemoteIndex uint64) ([]structs.ConfigEntry, []structs.ConfigEntry) {
-	configentry.SortSlice(local)
-	configentry.SortSlice(remote)
+	configSort(local)
+	configSort(remote)
 
 	var (
 		deletions []structs.ConfigEntry
@@ -27,7 +30,7 @@ func diffConfigEntries(local []structs.ConfigEntry, remote []structs.ConfigEntry
 		remoteIdx int
 	)
 	for localIdx, remoteIdx = 0, 0; localIdx < len(local) && remoteIdx < len(remote); {
-		if configentry.EqualID(local[localIdx], remote[remoteIdx]) {
+		if configSameID(local[localIdx], remote[remoteIdx]) {
 			// config is in both the local and remote state - need to check raft indices
 			if remote[remoteIdx].GetRaftIndex().ModifyIndex > lastRemoteIndex {
 				updates = append(updates, remote[remoteIdx])
@@ -35,7 +38,7 @@ func diffConfigEntries(local []structs.ConfigEntry, remote []structs.ConfigEntry
 			// increment both indices when equal
 			localIdx += 1
 			remoteIdx += 1
-		} else if configentry.Less(local[localIdx], remote[remoteIdx]) {
+		} else if cmpConfigLess(local[localIdx], remote[remoteIdx]) {
 			// config no longer in remoted state - needs deleting
 			deletions = append(deletions, local[localIdx])
 
@@ -61,6 +64,30 @@ func diffConfigEntries(local []structs.ConfigEntry, remote []structs.ConfigEntry
 	return deletions, updates
 }
 
+func cmpConfigLess(first structs.ConfigEntry, second structs.ConfigEntry) bool {
+	if first.GetKind() < second.GetKind() {
+		return true
+	}
+	if first.GetKind() > second.GetKind() {
+		return false
+	}
+
+	if first.GetEnterpriseMeta().LessThan(second.GetEnterpriseMeta()) {
+		return true
+	}
+	if second.GetEnterpriseMeta().LessThan(first.GetEnterpriseMeta()) {
+		return false
+	}
+
+	return first.GetName() < second.GetName()
+}
+
+func configSameID(e1, e2 structs.ConfigEntry) bool {
+	return e1.GetKind() == e2.GetKind() &&
+		e1.GetEnterpriseMeta().IsSame(e2.GetEnterpriseMeta()) &&
+		e1.GetName() == e2.GetName()
+}
+
 func (s *Server) reconcileLocalConfig(ctx context.Context, configs []structs.ConfigEntry, op structs.ConfigEntryOp) (bool, error) {
 	ticker := time.NewTicker(time.Second / time.Duration(s.config.ConfigReplicationApplyLimit))
 	defer ticker.Stop()
diff --git a/agent/consul/config_replication_test.go b/agent/consul/config_replication_test.go
index 41ccf53362d5d..24d51de884a0a 100644
--- a/agent/consul/config_replication_test.go
+++ b/agent/consul/config_replication_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -8,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 
@@ -16,6 +14,85 @@ import (
 	"github.com/hashicorp/consul/testrpc"
 )
 
+func TestReplication_ConfigSort(t *testing.T) {
+	newDefaults := func(name, protocol string) *structs.ServiceConfigEntry {
+		return &structs.ServiceConfigEntry{
+			Kind:     structs.ServiceDefaults,
+			Name:     name,
+			Protocol: protocol,
+		}
+	}
+	newResolver := func(name string, timeout time.Duration) *structs.ServiceResolverConfigEntry {
+		return &structs.ServiceResolverConfigEntry{
+			Kind:           structs.ServiceResolver,
+			Name:           name,
+			ConnectTimeout: timeout,
+		}
+	}
+
+	type testcase struct {
+		configs []structs.ConfigEntry
+		expect  []structs.ConfigEntry
+	}
+
+	cases := map[string]testcase{
+		"none": {},
+		"one": {
+			configs: []structs.ConfigEntry{
+				newDefaults("web", "grpc"),
+			},
+			expect: []structs.ConfigEntry{
+				newDefaults("web", "grpc"),
+			},
+		},
+		"just kinds": {
+			configs: []structs.ConfigEntry{
+				newResolver("web", 33*time.Second),
+				newDefaults("web", "grpc"),
+			},
+			expect: []structs.ConfigEntry{
+				newDefaults("web", "grpc"),
+				newResolver("web", 33*time.Second),
+			},
+		},
+		"just names": {
+			configs: []structs.ConfigEntry{
+				newDefaults("db", "grpc"),
+				newDefaults("api", "http2"),
+			},
+			expect: []structs.ConfigEntry{
+				newDefaults("api", "http2"),
+				newDefaults("db", "grpc"),
+			},
+		},
+		"all": {
+			configs: []structs.ConfigEntry{
+				newResolver("web", 33*time.Second),
+				newDefaults("web", "grpc"),
+				newDefaults("db", "grpc"),
+				newDefaults("api", "http2"),
+			},
+			expect: []structs.ConfigEntry{
+				newDefaults("api", "http2"),
+				newDefaults("db", "grpc"),
+				newDefaults("web", "grpc"),
+				newResolver("web", 33*time.Second),
+			},
+		},
+	}
+
+	for name, tc := range cases {
+		tc := tc
+		t.Run(name, func(t *testing.T) {
+			configSort(tc.configs)
+			require.Equal(t, tc.expect, tc.configs)
+			// and it should be stable
+			configSort(tc.configs)
+			require.Equal(t, tc.expect, tc.configs)
+		})
+	}
+}
+
 func TestReplication_ConfigEntries(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
diff --git a/agent/consul/config_test.go b/agent/consul/config_test.go
index 8e61b8fe96806..8e6c7055ddd37 100644
--- a/agent/consul/config_test.go
+++ b/agent/consul/config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/connect_ca_endpoint.go b/agent/consul/connect_ca_endpoint.go
index c61ee6ded900e..29cfc38bec0be 100644
--- a/agent/consul/connect_ca_endpoint.go
+++ b/agent/consul/connect_ca_endpoint.go
@@ -1,9 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
+	"errors"
 	"fmt"
 	"time"
 
@@ -25,11 +23,10 @@ var (
 	// variable points to. Clients need to compare using `err.Error() ==
 	// consul.ErrRateLimited.Error()` which is very sad. Short of replacing our
 	// RPC mechanism it's hard to know how to make that much better though.
-
-	ErrConnectNotEnabled    = structs.ErrConnectNotEnabled
-	ErrRateLimited          = structs.ErrRateLimited
-	ErrNotPrimaryDatacenter = structs.ErrNotPrimaryDatacenter
-	ErrStateReadOnly        = structs.ErrStateReadOnly
+	ErrConnectNotEnabled    = errors.New("Connect must be enabled in order to use this endpoint")
+	ErrRateLimited          = errors.New("Rate limit reached, try again later") // Note: we depend on this error message in the gRPC ConnectCA.Sign endpoint (see: isRateLimitError).
+	ErrNotPrimaryDatacenter = errors.New("not the primary datacenter")
+	ErrStateReadOnly        = errors.New("CA Provider State is read-only")
 )
 
 const (
diff --git a/agent/consul/connect_ca_endpoint_test.go b/agent/consul/connect_ca_endpoint_test.go
index 587ed42b5a10e..8e0cd6d3739cc 100644
--- a/agent/consul/connect_ca_endpoint_test.go
+++ b/agent/consul/connect_ca_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/context.go b/agent/consul/context.go
index d85124f74881a..ecf782911d84f 100644
--- a/agent/consul/context.go
+++ b/agent/consul/context.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/context_test.go b/agent/consul/context_test.go
index 42e6feb744868..b6e136fea7080 100644
--- a/agent/consul/context_test.go
+++ b/agent/consul/context_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/controller/controller.go b/agent/consul/controller/controller.go
index 1eccb7e7aba04..3dec902a528cd 100644
--- a/agent/consul/controller/controller.go
+++ b/agent/consul/controller/controller.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package controller
 
 import (
@@ -11,13 +8,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/hashicorp/go-hclog"
-	"golang.org/x/sync/errgroup"
-
-	"github.com/hashicorp/consul/agent/consul/controller/queue"
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
+	"github.com/hashicorp/go-hclog"
+	"golang.org/x/sync/errgroup"
 )
 
 // much of this is a re-implementation of
@@ -55,7 +50,7 @@ type Controller interface {
 	// WithQueueFactory allows a Controller to replace its underlying work queue
 	// implementation. This is most useful for testing. This should only ever be called
 	// prior to running Run.
-	WithQueueFactory(fn func(ctx context.Context, baseBackoff time.Duration, maxBackoff time.Duration) queue.WorkQueue[Request]) Controller
+	WithQueueFactory(fn func(ctx context.Context, baseBackoff time.Duration, maxBackoff time.Duration) WorkQueue) Controller
 	// AddTrigger allows for triggering a reconciliation request when a
 	// triggering function returns, when the passed in context is canceled
 	// the trigger must return
@@ -81,11 +76,11 @@ type controller struct {
 
 	// makeQueue is the factory used for creating the work queue, generally
 	// this shouldn't be touched, but can be updated for testing purposes
-	makeQueue func(ctx context.Context, baseBackoff time.Duration, maxBackoff time.Duration) queue.WorkQueue[Request]
+	makeQueue func(ctx context.Context, baseBackoff time.Duration, maxBackoff time.Duration) WorkQueue
 	// workers is the number of workers to use to process data
 	workers int
 	// work is the internal work queue that pending Requests are added to
-	work queue.WorkQueue[Request]
+	work WorkQueue
 	// baseBackoff is the starting backoff time for the work queue's rate limiter
 	baseBackoff time.Duration
 	// maxBackoff is the maximum backoff time for the work queue's rate limiter
@@ -127,7 +122,7 @@ func New(publisher state.EventPublisher, reconciler Reconciler) Controller {
 		workers:     1,
 		baseBackoff: 5 * time.Millisecond,
 		maxBackoff:  1000 * time.Second,
-		makeQueue:   queue.RunWorkQueue[Request],
+		makeQueue:   RunWorkQueue,
 		started:     make(chan struct{}),
 		triggers:    make(map[Request]func()),
 		logger:      hclog.NewNullLogger(),
@@ -181,7 +176,7 @@ func (c *controller) WithLogger(logger hclog.Logger) Controller {
 // WithQueueFactory changes the initialization method for the Controller's work
 // queue, this is predominantly just used for testing. This should only ever be called
 // prior to running Start.
-func (c *controller) WithQueueFactory(fn func(ctx context.Context, baseBackoff time.Duration, maxBackoff time.Duration) queue.WorkQueue[Request]) Controller {
+func (c *controller) WithQueueFactory(fn func(ctx context.Context, baseBackoff time.Duration, maxBackoff time.Duration) WorkQueue) Controller {
 	c.ensureNotRunning()
 
 	c.makeQueue = fn
diff --git a/agent/consul/controller/controller_test.go b/agent/consul/controller/controller_test.go
index 1d1002e8abede..ea42ed87cdf44 100644
--- a/agent/consul/controller/controller_test.go
+++ b/agent/consul/controller/controller_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package controller
 
 import (
@@ -10,15 +7,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-memdb"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/agent/consul/controller/queue"
 	"github.com/hashicorp/consul/agent/consul/fsm"
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
+	"github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/go-memdb"
+	"github.com/stretchr/testify/require"
 )
 
 func TestBasicController(t *testing.T) {
@@ -38,8 +33,7 @@ func TestBasicController(t *testing.T) {
 		NewStateStore: func() *state.Store {
 			return state.NewStateStoreWithEventPublisher(nil, publisher)
 		},
-		Publisher:      publisher,
-		StorageBackend: fsm.NullStorageBackend,
+		Publisher: publisher,
 	}).State()
 
 	for i := 0; i < 200; i++ {
@@ -95,8 +89,7 @@ func TestBasicController_Transform(t *testing.T) {
 		NewStateStore: func() *state.Store {
 			return state.NewStateStoreWithEventPublisher(nil, publisher)
 		},
-		Publisher:      publisher,
-		StorageBackend: fsm.NullStorageBackend,
+		Publisher: publisher,
 	}).State()
 
 	go New(publisher, reconciler).Subscribe(&stream.SubscribeRequest{
@@ -141,17 +134,16 @@ func TestBasicController_Retry(t *testing.T) {
 		NewStateStore: func() *state.Store {
 			return state.NewStateStoreWithEventPublisher(nil, publisher)
 		},
-		Publisher:      publisher,
-		StorageBackend: fsm.NullStorageBackend,
+		Publisher: publisher,
 	}).State()
 
-	queueInitialized := make(chan *countingWorkQueue[Request])
+	queueInitialized := make(chan *countingWorkQueue)
 	controller := New(publisher, reconciler).Subscribe(&stream.SubscribeRequest{
 		Topic:   state.EventTopicIngressGateway,
 		Subject: stream.SubjectWildcard,
 	}).WithWorkers(-1).WithBackoff(1*time.Millisecond, 1*time.Millisecond)
-	go controller.WithQueueFactory(func(ctx context.Context, baseBackoff, maxBackoff time.Duration) queue.WorkQueue[Request] {
-		queue := newCountingWorkQueue(queue.RunWorkQueue[Request](ctx, baseBackoff, maxBackoff))
+	go controller.WithQueueFactory(func(ctx context.Context, baseBackoff, maxBackoff time.Duration) WorkQueue {
+		queue := newCountingWorkQueue(RunWorkQueue(ctx, baseBackoff, maxBackoff))
 		queueInitialized <- queue
 		return queue
 	}).Run(ctx)
@@ -245,9 +237,9 @@ func TestBasicController_RunPanicAssertions(t *testing.T) {
 	started := make(chan struct{})
 	reconciler := newTestReconciler(false)
 	publisher := stream.NewEventPublisher(0)
-	controller := New(publisher, reconciler).WithQueueFactory(func(ctx context.Context, baseBackoff, maxBackoff time.Duration) queue.WorkQueue[Request] {
+	controller := New(publisher, reconciler).WithQueueFactory(func(ctx context.Context, baseBackoff, maxBackoff time.Duration) WorkQueue {
 		close(started)
-		return queue.RunWorkQueue[Request](ctx, baseBackoff, maxBackoff)
+		return RunWorkQueue(ctx, baseBackoff, maxBackoff)
 	})
 	subscription := &stream.SubscribeRequest{
 		Topic:   state.EventTopicIngressGateway,
@@ -277,7 +269,7 @@ func TestBasicController_RunPanicAssertions(t *testing.T) {
 		controller.WithWorkers(1)
 	})
 	require.Panics(t, func() {
-		controller.WithQueueFactory(queue.RunWorkQueue[Request])
+		controller.WithQueueFactory(RunWorkQueue)
 	})
 }
 
@@ -387,8 +379,7 @@ func TestConfigEntrySubscriptions(t *testing.T) {
 				NewStateStore: func() *state.Store {
 					return state.NewStateStoreWithEventPublisher(nil, publisher)
 				},
-				Publisher:      publisher,
-				StorageBackend: fsm.NullStorageBackend,
+				Publisher: publisher,
 			}).State()
 
 			for i := 0; i < 200; i++ {
@@ -524,8 +515,7 @@ func TestDiscoveryChainController(t *testing.T) {
 		NewStateStore: func() *state.Store {
 			return state.NewStateStoreWithEventPublisher(nil, publisher)
 		},
-		Publisher:      publisher,
-		StorageBackend: fsm.NullStorageBackend,
+		Publisher: publisher,
 	}).State()
 
 	controller := New(publisher, reconciler)
diff --git a/agent/consul/controller/defer.go b/agent/consul/controller/defer.go
new file mode 100644
index 0000000000000..398373b0bdda3
--- /dev/null
+++ b/agent/consul/controller/defer.go
@@ -0,0 +1,224 @@
+package controller
+
+import (
+	"container/heap"
+	"context"
+	"time"
+)
+
+// much of this is a re-implementation of
+// https://github.com/kubernetes/client-go/blob/release-1.25/util/workqueue/delaying_queue.go
+
+// DeferQueue is a generic priority queue implementation that
+// allows for deferring and later processing Requests.
+type DeferQueue interface {
+	// Defer defers processing a Request until a given time. When
+	// the timeout is hit, the request will be processed by the
+	// callback given in the Process loop. If the given context
+	// is canceled, the item is not deferred.
+	Defer(ctx context.Context, item Request, until time.Time)
+	// Process processes all items in the defer queue with the
+	// given callback, blocking until the given context is canceled.
+	// Callers should only ever call Process once, likely in a
+	// long-lived goroutine.
+	Process(ctx context.Context, callback func(item Request))
+}
+
+// deferredRequest is a wrapped Request with information about
+// when a retry should be attempted
+type deferredRequest struct {
+	enqueueAt time.Time
+	item      Request
+	// index holds the index for the given heap entry so that if
+	// the entry is updated the heap can be re-sorted
+	index int
+}
+
+// deferQueue is a priority queue for deferring Requests for
+// future processing
+type deferQueue struct {
+	heap    *deferHeap
+	entries map[Request]*deferredRequest
+
+	addChannel     chan *deferredRequest
+	heartbeat      *time.Ticker
+	nextReadyTimer *time.Timer
+}
+
+// NewDeferQueue returns a priority queue for deferred Requests.
+func NewDeferQueue(tick time.Duration) DeferQueue {
+	dHeap := &deferHeap{}
+	heap.Init(dHeap)
+
+	return &deferQueue{
+		heap:       dHeap,
+		entries:    make(map[Request]*deferredRequest),
+		addChannel: make(chan *deferredRequest),
+		heartbeat:  time.NewTicker(tick),
+	}
+}
+
+// Defer defers the given Request until the given time in the future. If the
+// passed in context is canceled before the Request is deferred, then this
+// immediately returns.
+func (q *deferQueue) Defer(ctx context.Context, item Request, until time.Time) {
+	entry := &deferredRequest{
+		enqueueAt: until,
+		item:      item,
+	}
+
+	select {
+	case <-ctx.Done():
+	case q.addChannel <- entry:
+	}
+}
+
+// deferEntry adds a deferred request to the priority queue
+func (q *deferQueue) deferEntry(entry *deferredRequest) {
+	existing, exists := q.entries[entry.item]
+	if exists {
+		// insert or update the item deferral time
+		if existing.enqueueAt.After(entry.enqueueAt) {
+			existing.enqueueAt = entry.enqueueAt
+			heap.Fix(q.heap, existing.index)
+		}
+
+		return
+	}
+
+	heap.Push(q.heap, entry)
+	q.entries[entry.item] = entry
+}
+
+// readyRequest returns a pointer to the next ready Request or
+// nil if no Requests are ready to be processed
+func (q *deferQueue) readyRequest() *Request {
+	if q.heap.Len() == 0 {
+		return nil
+	}
+
+	now := time.Now()
+
+	entry := q.heap.Peek().(*deferredRequest)
+	if entry.enqueueAt.After(now) {
+		return nil
+	}
+
+	entry = heap.Pop(q.heap).(*deferredRequest)
+	delete(q.entries, entry.item)
+	return &entry.item
+}
+
+// signalReady returns a timer signal to the next Request
+// that will be ready on the queue
+func (q *deferQueue) signalReady() <-chan time.Time {
+	if q.heap.Len() == 0 {
+		return make(<-chan time.Time)
+	}
+
+	if q.nextReadyTimer != nil {
+		q.nextReadyTimer.Stop()
+	}
+	now := time.Now()
+	entry := q.heap.Peek().(*deferredRequest)
+	q.nextReadyTimer = time.NewTimer(entry.enqueueAt.Sub(now))
+	return q.nextReadyTimer.C
+}
+
+// Process processes all items in the defer queue with the
+// given callback, blocking until the given context is canceled.
+// Callers should only ever call Process once, likely in a
+// long-lived goroutine.
+func (q *deferQueue) Process(ctx context.Context, callback func(item Request)) {
+	for {
+		ready := q.readyRequest()
+		if ready != nil {
+			callback(*ready)
+		}
+
+		signalReady := q.signalReady()
+
+		select {
+		case <-ctx.Done():
+			if q.nextReadyTimer != nil {
+				q.nextReadyTimer.Stop()
+			}
+			q.heartbeat.Stop()
+			return
+
+		case <-q.heartbeat.C:
+			// continue the loop, which process ready items
+
+		case <-signalReady:
+			// continue the loop, which process ready items
+
+		case entry := <-q.addChannel:
+			enqueueOrProcess := func(entry *deferredRequest) {
+				now := time.Now()
+				if entry.enqueueAt.After(now) {
+					q.deferEntry(entry)
+				} else {
+					// fast-path, process immediately if we don't need to defer
+					callback(entry.item)
+				}
+			}
+
+			enqueueOrProcess(entry)
+
+			// drain the add channel before we do anything else
+			drained := false
+			for !drained {
+				select {
+				case entry := <-q.addChannel:
+					enqueueOrProcess(entry)
+				default:
+					drained = true
+				}
+			}
+		}
+	}
+}
+
+var _ heap.Interface = &deferHeap{}
+
+// deferHeap implements heap.Interface
+type deferHeap []*deferredRequest
+
+// Len returns the length of the heap.
+func (h deferHeap) Len() int {
+	return len(h)
+}
+
+// Less compares heap items for purposes of sorting.
+func (h deferHeap) Less(i, j int) bool {
+	return h[i].enqueueAt.Before(h[j].enqueueAt)
+}
+
+// Swap swaps two entries in the heap.
+func (h deferHeap) Swap(i, j int) {
+	h[i], h[j] = h[j], h[i]
+	h[i].index = i
+	h[j].index = j
+}
+
+// Push pushes an entry onto the heap.
+func (h *deferHeap) Push(x interface{}) {
+	n := len(*h)
+	item := x.(*deferredRequest)
+	item.index = n
+	*h = append(*h, item)
+}
+
+// Pop pops an entry off the heap.
+func (h *deferHeap) Pop() interface{} {
+	n := len(*h)
+	item := (*h)[n-1]
+	item.index = -1
+	*h = (*h)[0:(n - 1)]
+	return item
+}
+
+// Peek returns the next item on the heap.
+func (h deferHeap) Peek() interface{} {
+	return h[0]
+}
diff --git a/agent/consul/controller/doc.go b/agent/consul/controller/doc.go
index ba30d95a546fd..ca40814e3c57f 100644
--- a/agent/consul/controller/doc.go
+++ b/agent/consul/controller/doc.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // Package controller contains a re-implementation of the Kubernetes
 // [controller-runtime](https://github.com/kubernetes-sigs/controller-runtime)
 // with the core using Consul's event publishing pipeline rather than
diff --git a/agent/consul/controller/queue.go b/agent/consul/controller/queue.go
new file mode 100644
index 0000000000000..d86c5c671b9ae
--- /dev/null
+++ b/agent/consul/controller/queue.go
@@ -0,0 +1,176 @@
+package controller
+
+import (
+	"context"
+	"sync"
+	"time"
+)
+
+// much of this is a re-implementation of
+// https://github.com/kubernetes/client-go/blob/release-1.25/util/workqueue/queue.go
+
+// WorkQueue is an interface for a work queue with semantics to help with
+// retries and rate limiting.
+type WorkQueue interface {
+	// Get retrieves the next Request in the queue, blocking until a Request is
+	// available, if shutdown is true, then the queue is shutting down and should
+	// no longer be used by the caller.
+	Get() (item Request, shutdown bool)
+	// Add immediately adds a Request to the work queue.
+	Add(item Request)
+	// AddAfter adds a Request to the work queue after a given amount of time.
+	AddAfter(item Request, duration time.Duration)
+	// AddRateLimited adds a Request to the work queue after the amount of time
+	// specified by applying the queue's rate limiter.
+	AddRateLimited(item Request)
+	// Forget signals the queue to reset the rate-limiting for the given Request.
+	Forget(item Request)
+	// Done tells the work queue that the Request has been successfully processed
+	// and can be deleted from the queue.
+	Done(item Request)
+}
+
+// queue implements a rate-limited work queue
+type queue struct {
+	// queue holds an ordered list of Requests needing to be processed
+	queue []Request
+
+	// dirty holds the working set of all Requests, whether they are being
+	// processed or not
+	dirty map[Request]struct{}
+	// processing holds the set of current requests being processed
+	processing map[Request]struct{}
+
+	// deferred is an internal priority queue that tracks deferred
+	// Requests
+	deferred DeferQueue
+	// ratelimiter is the internal rate-limiter for the queue
+	ratelimiter Limiter
+
+	// cond synchronizes queue access and handles signalling for when
+	// data is available in the queue
+	cond *sync.Cond
+
+	// ctx is the top-level context that, when canceled, shuts down the queue
+	ctx context.Context
+}
+
+// RunWorkQueue returns a started WorkQueue that has per-Request exponential backoff rate-limiting.
+// When the passed in context is canceled, the queue shuts down.
+func RunWorkQueue(ctx context.Context, baseBackoff, maxBackoff time.Duration) WorkQueue {
+	q := &queue{
+		ratelimiter: NewRateLimiter(baseBackoff, maxBackoff),
+		dirty:       make(map[Request]struct{}),
+		processing:  make(map[Request]struct{}),
+		cond:        sync.NewCond(&sync.Mutex{}),
+		deferred:    NewDeferQueue(500 * time.Millisecond),
+		ctx:         ctx,
+	}
+	go q.start()
+
+	return q
+}
+
+// start begins the asynchronous processing loop for the deferral queue
+func (q *queue) start() {
+	go q.deferred.Process(q.ctx, func(item Request) {
+		q.Add(item)
+	})
+
+	<-q.ctx.Done()
+	q.cond.Broadcast()
+}
+
+// shuttingDown returns whether the queue is in the process of shutting down
+func (q *queue) shuttingDown() bool {
+	select {
+	case <-q.ctx.Done():
+		return true
+	default:
+		return false
+	}
+}
+
+// Get returns the next Request to be processed by the caller, blocking until
+// an item is available in the queue. If the returned shutdown parameter is true,
+// then the caller should stop using the queue. Any Requests returned by a call
+// to Get must be explicitly marked as processed via the Done method.
+func (q *queue) Get() (item Request, shutdown bool) {
+	q.cond.L.Lock()
+	defer q.cond.L.Unlock()
+	for len(q.queue) == 0 && !q.shuttingDown() {
+		q.cond.Wait()
+	}
+	if len(q.queue) == 0 {
+		// We must be shutting down.
+		return Request{}, true
+	}
+
+	item, q.queue = q.queue[0], q.queue[1:]
+
+	q.processing[item] = struct{}{}
+	delete(q.dirty, item)
+
+	return item, false
+}
+
+// Add puts the given Request in the queue. If the Request is already in
+// the queue or the queue is stopping, then this is a no-op.
+func (q *queue) Add(item Request) {
+	q.cond.L.Lock()
+	defer q.cond.L.Unlock()
+	if q.shuttingDown() {
+		return
+	}
+	if _, ok := q.dirty[item]; ok {
+		return
+	}
+
+	q.dirty[item] = struct{}{}
+	if _, ok := q.processing[item]; ok {
+		return
+	}
+
+	q.queue = append(q.queue, item)
+	q.cond.Signal()
+}
+
+// AddAfter adds a Request to the work queue after a given amount of time.
+func (q *queue) AddAfter(item Request, duration time.Duration) {
+	// don't add if we're already shutting down
+	if q.shuttingDown() {
+		return
+	}
+
+	// immediately add if there is no delay
+	if duration <= 0 {
+		q.Add(item)
+		return
+	}
+
+	q.deferred.Defer(q.ctx, item, time.Now().Add(duration))
+}
+
+// AddRateLimited adds the given Request to the queue after applying the
+// rate limiter to determine when the Request should next be processed.
+func (q *queue) AddRateLimited(item Request) {
+	q.AddAfter(item, q.ratelimiter.NextRetry(item))
+}
+
+// Forget signals the queue to reset the rate-limiting for the given Request.
+func (q *queue) Forget(item Request) {
+	q.ratelimiter.Forget(item)
+}
+
+// Done removes the item from the queue, if it has been marked dirty
+// again while being processed, it is re-added to the queue.
+func (q *queue) Done(item Request) {
+	q.cond.L.Lock()
+	defer q.cond.L.Unlock()
+
+	delete(q.processing, item)
+	if _, ok := q.dirty[item]; ok {
+		q.queue = append(q.queue, item)
+		q.cond.Signal()
+	}
+}
diff --git a/agent/consul/controller/queue/defer.go b/agent/consul/controller/queue/defer.go
deleted file mode 100644
index e9b8a9c3ad751..0000000000000
--- a/agent/consul/controller/queue/defer.go
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package queue
-
-import (
-	"container/heap"
-	"context"
-	"time"
-)
-
-// much of this is a re-implementation of
-// https://github.com/kubernetes/client-go/blob/release-1.25/util/workqueue/delaying_queue.go
-
-// DeferQueue is a generic priority queue implementation that
-// allows for deferring and later processing Requests.
-type DeferQueue[T ItemType] interface {
-	// Defer defers processing a Request until a given time. When
-	// the timeout is hit, the request will be processed by the
-	// callback given in the Process loop. If the given context
-	// is canceled, the item is not deferred.
-	Defer(ctx context.Context, item T, until time.Time)
-	// Process processes all items in the defer queue with the
-	// given callback, blocking until the given context is canceled.
-	// Callers should only ever call Process once, likely in a
-	// long-lived goroutine.
-	Process(ctx context.Context, callback func(item T))
-}
-
-// deferredRequest is a wrapped Request with information about
-// when a retry should be attempted
-type deferredRequest[T ItemType] struct {
-	enqueueAt time.Time
-	item      T
-	// index holds the index for the given heap entry so that if
-	// the entry is updated the heap can be re-sorted
-	index int
-}
-
-// deferQueue is a priority queue for deferring Requests for
-// future processing
-type deferQueue[T ItemType] struct {
-	heap    *deferHeap[T]
-	entries map[string]*deferredRequest[T]
-
-	addChannel     chan *deferredRequest[T]
-	heartbeat      *time.Ticker
-	nextReadyTimer *time.Timer
-}
-
-// NewDeferQueue returns a priority queue for deferred Requests.
-func NewDeferQueue[T ItemType](tick time.Duration) DeferQueue[T] {
-	dHeap := &deferHeap[T]{}
-	heap.Init(dHeap)
-
-	return &deferQueue[T]{
-		heap:       dHeap,
-		entries:    make(map[string]*deferredRequest[T]),
-		addChannel: make(chan *deferredRequest[T]),
-		heartbeat:  time.NewTicker(tick),
-	}
-}
-
-// Defer defers the given Request until the given time in the future. If the
-// passed in context is canceled before the Request is deferred, then this
-// immediately returns.
-func (q *deferQueue[T]) Defer(ctx context.Context, item T, until time.Time) {
-	entry := &deferredRequest[T]{
-		enqueueAt: until,
-		item:      item,
-	}
-
-	select {
-	case <-ctx.Done():
-	case q.addChannel <- entry:
-	}
-}
-
-// deferEntry adds a deferred request to the priority queue
-func (q *deferQueue[T]) deferEntry(entry *deferredRequest[T]) {
-	existing, exists := q.entries[entry.item.Key()]
-	if exists {
-		// insert or update the item deferral time
-		if existing.enqueueAt.After(entry.enqueueAt) {
-			existing.enqueueAt = entry.enqueueAt
-			heap.Fix(q.heap, existing.index)
-		}
-
-		return
-	}
-
-	heap.Push(q.heap, entry)
-	q.entries[entry.item.Key()] = entry
-}
-
-// readyRequest returns a pointer to the next ready Request or
-// nil if no Requests are ready to be processed
-func (q *deferQueue[T]) readyRequest() *T {
-	if q.heap.Len() == 0 {
-		return nil
-	}
-
-	now := time.Now()
-
-	entry := q.heap.Peek().(*deferredRequest[T])
-	if entry.enqueueAt.After(now) {
-		return nil
-	}
-
-	entry = heap.Pop(q.heap).(*deferredRequest[T])
-	delete(q.entries, entry.item.Key())
-	return &entry.item
-}
-
-// signalReady returns a timer signal to the next Request
-// that will be ready on the queue
-func (q *deferQueue[T]) signalReady() <-chan time.Time {
-	if q.heap.Len() == 0 {
-		return make(<-chan time.Time)
-	}
-
-	if q.nextReadyTimer != nil {
-		q.nextReadyTimer.Stop()
-	}
-	now := time.Now()
-	entry := q.heap.Peek().(*deferredRequest[T])
-	q.nextReadyTimer = time.NewTimer(entry.enqueueAt.Sub(now))
-	return q.nextReadyTimer.C
-}
-
-// Process processes all items in the defer queue with the
-// given callback, blocking until the given context is canceled.
-// Callers should only ever call Process once, likely in a
-// long-lived goroutine.
-func (q *deferQueue[T]) Process(ctx context.Context, callback func(item T)) {
-	for {
-		ready := q.readyRequest()
-		if ready != nil {
-			callback(*ready)
-		}
-
-		signalReady := q.signalReady()
-
-		select {
-		case <-ctx.Done():
-			if q.nextReadyTimer != nil {
-				q.nextReadyTimer.Stop()
-			}
-			q.heartbeat.Stop()
-			return
-
-		case <-q.heartbeat.C:
-			// continue the loop, which process ready items
-
-		case <-signalReady:
-			// continue the loop, which process ready items
-
-		case entry := <-q.addChannel:
-			enqueueOrProcess := func(entry *deferredRequest[T]) {
-				now := time.Now()
-				if entry.enqueueAt.After(now) {
-					q.deferEntry(entry)
-				} else {
-					// fast-path, process immediately if we don't need to defer
-					callback(entry.item)
-				}
-			}
-
-			enqueueOrProcess(entry)
-
-			// drain the add channel before we do anything else
-			drained := false
-			for !drained {
-				select {
-				case entry := <-q.addChannel:
-					enqueueOrProcess(entry)
-				default:
-					drained = true
-				}
-			}
-		}
-	}
-}
-
-// deferHeap implements heap.Interface
-type deferHeap[T ItemType] []*deferredRequest[T]
-
-// Len returns the length of the heap.
-func (h deferHeap[T]) Len() int {
-	return len(h)
-}
-
-// Less compares heap items for purposes of sorting.
-func (h deferHeap[T]) Less(i, j int) bool {
-	return h[i].enqueueAt.Before(h[j].enqueueAt)
-}
-
-// Swap swaps two entries in the heap.
-func (h deferHeap[T]) Swap(i, j int) {
-	h[i], h[j] = h[j], h[i]
-	h[i].index = i
-	h[j].index = j
-}
-
-// Push pushes an entry onto the heap.
-func (h *deferHeap[T]) Push(x interface{}) {
-	n := len(*h)
-	item := x.(*deferredRequest[T])
-	item.index = n
-	*h = append(*h, item)
-}
-
-// Pop pops an entry off the heap.
-func (h *deferHeap[T]) Pop() interface{} {
-	n := len(*h)
-	item := (*h)[n-1]
-	item.index = -1
-	*h = (*h)[0:(n - 1)]
-	return item
-}
-
-// Peek returns the next item on the heap.
-func (h deferHeap[T]) Peek() interface{} {
-	return h[0]
-}
diff --git a/agent/consul/controller/queue/queue.go b/agent/consul/controller/queue/queue.go
deleted file mode 100644
index 92c624cc2a734..0000000000000
--- a/agent/consul/controller/queue/queue.go
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package queue
-
-import (
-	"context"
-	"sync"
-	"time"
-)
-
-// much of this is a re-implementation of
-// https://github.com/kubernetes/client-go/blob/release-1.25/util/workqueue/queue.go
-
-// ItemType is the type constraint for items in the WorkQueue.
-type ItemType interface {
-	// Key returns a string that will be used to de-duplicate items in the queue.
-	Key() string
-}
-
-// WorkQueue is an interface for a work queue with semantics to help with
-// retries and rate limiting.
-type WorkQueue[T ItemType] interface {
-	// Get retrieves the next Request in the queue, blocking until a Request is
-	// available, if shutdown is true, then the queue is shutting down and should
-	// no longer be used by the caller.
-	Get() (item T, shutdown bool)
-	// Add immediately adds a Request to the work queue.
-	Add(item T)
-	// AddAfter adds a Request to the work queue after a given amount of time.
-	AddAfter(item T, duration time.Duration)
-	// AddRateLimited adds a Request to the work queue after the amount of time
-	// specified by applying the queue's rate limiter.
-	AddRateLimited(item T)
-	// Forget signals the queue to reset the rate-limiting for the given Request.
-	Forget(item T)
-	// Done tells the work queue that the Request has been successfully processed
-	// and can be deleted from the queue.
-	Done(item T)
-}
-
-// queue implements a rate-limited work queue
-type queue[T ItemType] struct {
-	// queue holds an ordered list of Requests needing to be processed
-	queue []T
-
-	// dirty holds the working set of all Requests, whether they are being
-	// processed or not
-	dirty map[string]struct{}
-	// processing holds the set of current requests being processed
-	processing map[string]struct{}
-
-	// deferred is an internal priority queue that tracks deferred
-	// Requests
-	deferred DeferQueue[T]
-	// ratelimiter is the internal rate-limiter for the queue
-	ratelimiter Limiter[T]
-
-	// cond synchronizes queue access and handles signalling for when
-	// data is available in the queue
-	cond *sync.Cond
-
-	// ctx is the top-level context that, when canceled, shuts down the queue
-	ctx context.Context
-}
-
-// RunWorkQueue returns a started WorkQueue that has per-item exponential backoff rate-limiting.
-// When the passed in context is canceled, the queue shuts down.
-func RunWorkQueue[T ItemType](ctx context.Context, baseBackoff, maxBackoff time.Duration) WorkQueue[T] {
-	q := &queue[T]{
-		ratelimiter: NewRateLimiter[T](baseBackoff, maxBackoff),
-		dirty:       make(map[string]struct{}),
-		processing:  make(map[string]struct{}),
-		cond:        sync.NewCond(&sync.Mutex{}),
-		deferred:    NewDeferQueue[T](500 * time.Millisecond),
-		ctx:         ctx,
-	}
-	go q.start()
-
-	return q
-}
-
-// start begins the asynchronous processing loop for the deferral queue
-func (q *queue[T]) start() {
-	go q.deferred.Process(q.ctx, func(item T) {
-		q.Add(item)
-	})
-
-	<-q.ctx.Done()
-	q.cond.Broadcast()
-}
-
-// shuttingDown returns whether the queue is in the process of shutting down
-func (q *queue[T]) shuttingDown() bool {
-	select {
-	case <-q.ctx.Done():
-		return true
-	default:
-		return false
-	}
-}
-
-// Get returns the next Request to be processed by the caller, blocking until
-// an item is available in the queue. If the returned shutdown parameter is true,
-// then the caller should stop using the queue. Any Requests returned by a call
-// to Get must be explicitly marked as processed via the Done method.
-func (q *queue[T]) Get() (item T, shutdown bool) {
-	q.cond.L.Lock()
-	defer q.cond.L.Unlock()
-	for len(q.queue) == 0 && !q.shuttingDown() {
-		q.cond.Wait()
-	}
-	if len(q.queue) == 0 {
-		// We must be shutting down.
-		var zero T
-		return zero, true
-	}
-
-	item, q.queue = q.queue[0], q.queue[1:]
-
-	q.processing[item.Key()] = struct{}{}
-	delete(q.dirty, item.Key())
-
-	return item, false
-}
-
-// Add puts the given Request in the queue. If the Request is already in
-// the queue or the queue is stopping, then this is a no-op.
-func (q *queue[T]) Add(item T) {
-	q.cond.L.Lock()
-	defer q.cond.L.Unlock()
-	if q.shuttingDown() {
-		return
-	}
-	if _, ok := q.dirty[item.Key()]; ok {
-		return
-	}
-
-	q.dirty[item.Key()] = struct{}{}
-	if _, ok := q.processing[item.Key()]; ok {
-		return
-	}
-
-	q.queue = append(q.queue, item)
-	q.cond.Signal()
-}
-
-// AddAfter adds a Request to the work queue after a given amount of time.
-func (q *queue[T]) AddAfter(item T, duration time.Duration) {
-	// don't add if we're already shutting down
-	if q.shuttingDown() {
-		return
-	}
-
-	// immediately add if there is no delay
-	if duration <= 0 {
-		q.Add(item)
-		return
-	}
-
-	q.deferred.Defer(q.ctx, item, time.Now().Add(duration))
-}
-
-// AddRateLimited adds the given Request to the queue after applying the
-// rate limiter to determine when the Request should next be processed.
-func (q *queue[T]) AddRateLimited(item T) {
-	q.AddAfter(item, q.ratelimiter.NextRetry(item))
-}
-
-// Forget signals the queue to reset the rate-limiting for the given Request.
-func (q *queue[T]) Forget(item T) {
-	q.ratelimiter.Forget(item)
-}
-
-// Done removes the item from the queue, if it has been marked dirty
-// again while being processed, it is re-added to the queue.
-func (q *queue[T]) Done(item T) {
-	q.cond.L.Lock()
-	defer q.cond.L.Unlock()
-
-	delete(q.processing, item.Key())
-	if _, ok := q.dirty[item.Key()]; ok {
-		q.queue = append(q.queue, item)
-		q.cond.Signal()
-	}
-}
diff --git a/agent/consul/controller/queue/rate.go b/agent/consul/controller/queue/rate.go
deleted file mode 100644
index 615047fdeb39b..0000000000000
--- a/agent/consul/controller/queue/rate.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package queue
-
-import (
-	"math"
-	"sync"
-	"time"
-)
-
-// much of this is a re-implementation of:
-// https://github.com/kubernetes/client-go/blob/release-1.25/util/workqueue/default_rate_limiters.go
-
-// Limiter is an interface for a rate limiter that can limit
-// the number of retries processed in the work queue.
-type Limiter[T ItemType] interface {
-	// NextRetry returns the remaining time until the queue should
-	// reprocess a Request.
-	NextRetry(request T) time.Duration
-	// Forget causes the Limiter to reset the backoff for the Request.
-	Forget(request T)
-}
-
-type ratelimiter[T ItemType] struct {
-	failures map[string]int
-	base     time.Duration
-	max      time.Duration
-	mutex    sync.RWMutex
-}
-
-// NewRateLimiter returns a Limiter that does per-item exponential
-// backoff.
-func NewRateLimiter[T ItemType](base, max time.Duration) Limiter[T] {
-	return &ratelimiter[T]{
-		failures: make(map[string]int),
-		base:     base,
-		max:      max,
-	}
-}
-
-// NextRetry returns the remaining time until the queue should
-// reprocess a Request.
-func (r *ratelimiter[T]) NextRetry(request T) time.Duration {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-
-	exponent := r.failures[request.Key()]
-	r.failures[request.Key()] = r.failures[request.Key()] + 1
-
-	backoff := float64(r.base.Nanoseconds()) * math.Pow(2, float64(exponent))
-	// make sure we don't overflow time.Duration
-	if backoff > math.MaxInt64 {
-		return r.max
-	}
-
-	calculated := time.Duration(backoff)
-	if calculated > r.max {
-		return r.max
-	}
-
-	return calculated
-}
-
-// Forget causes the Limiter to reset the backoff for the Request.
-func (r *ratelimiter[T]) Forget(request T) {
-	r.mutex.Lock()
-	defer r.mutex.Unlock()
-
-	delete(r.failures, request.Key())
-}
diff --git a/agent/consul/controller/queue_test.go b/agent/consul/controller/queue_test.go
index cb6f609829100..8bfc00312b309 100644
--- a/agent/consul/controller/queue_test.go
+++ b/agent/consul/controller/queue_test.go
@@ -1,16 +1,13 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package controller
 
 import (
 	"sync/atomic"
 	"time"
-
-	"github.com/hashicorp/consul/agent/consul/controller/queue"
 )
 
-type countingWorkQueue[T queue.ItemType] struct {
+var _ WorkQueue = &countingWorkQueue{}
+
+type countingWorkQueue struct {
 	getCounter            uint64
 	addCounter            uint64
 	addAfterCounter       uint64
@@ -18,16 +15,16 @@ type countingWorkQueue[T queue.ItemType] struct {
 	forgetCounter         uint64
 	doneCounter           uint64
 
-	inner queue.WorkQueue[T]
+	inner WorkQueue
 }
 
-func newCountingWorkQueue[T queue.ItemType](inner queue.WorkQueue[T]) *countingWorkQueue[T] {
-	return &countingWorkQueue[T]{
+func newCountingWorkQueue(inner WorkQueue) *countingWorkQueue {
+	return &countingWorkQueue{
 		inner: inner,
 	}
 }
 
-func (c *countingWorkQueue[T]) reset() {
+func (c *countingWorkQueue) reset() {
 	atomic.StoreUint64(&c.getCounter, 0)
 	atomic.StoreUint64(&c.addCounter, 0)
 	atomic.StoreUint64(&c.addAfterCounter, 0)
@@ -36,61 +33,61 @@ func (c *countingWorkQueue[T]) reset() {
 	atomic.StoreUint64(&c.doneCounter, 0)
 }
 
-func (c *countingWorkQueue[T]) requeues() uint64 {
+func (c *countingWorkQueue) requeues() uint64 {
 	return c.addAfters() + c.addRateLimiteds()
 }
 
-func (c *countingWorkQueue[T]) Get() (item T, shutdown bool) {
+func (c *countingWorkQueue) Get() (item Request, shutdown bool) {
 	item, err := c.inner.Get()
 	atomic.AddUint64(&c.getCounter, 1)
 	return item, err
 }
 
-func (c *countingWorkQueue[T]) gets() uint64 {
+func (c *countingWorkQueue) gets() uint64 {
 	return atomic.LoadUint64(&c.getCounter)
 }
 
-func (c *countingWorkQueue[T]) Add(item T) {
+func (c *countingWorkQueue) Add(item Request) {
 	c.inner.Add(item)
 	atomic.AddUint64(&c.addCounter, 1)
 }
 
-func (c *countingWorkQueue[T]) adds() uint64 {
+func (c *countingWorkQueue) adds() uint64 {
 	return atomic.LoadUint64(&c.addCounter)
 }
 
-func (c *countingWorkQueue[T]) AddAfter(item T, duration time.Duration) {
+func (c *countingWorkQueue) AddAfter(item Request, duration time.Duration) {
 	c.inner.AddAfter(item, duration)
 	atomic.AddUint64(&c.addAfterCounter, 1)
 }
 
-func (c *countingWorkQueue[T]) addAfters() uint64 {
+func (c *countingWorkQueue) addAfters() uint64 {
 	return atomic.LoadUint64(&c.addAfterCounter)
 }
 
-func (c *countingWorkQueue[T]) AddRateLimited(item T) {
+func (c *countingWorkQueue) AddRateLimited(item Request) {
 	c.inner.AddRateLimited(item)
 	atomic.AddUint64(&c.addRateLimitedCounter, 1)
 }
 
-func (c *countingWorkQueue[T]) addRateLimiteds() uint64 {
+func (c *countingWorkQueue) addRateLimiteds() uint64 {
 	return atomic.LoadUint64(&c.addRateLimitedCounter)
 }
 
-func (c *countingWorkQueue[T]) Forget(item T) {
+func (c *countingWorkQueue) Forget(item Request) {
 	c.inner.Forget(item)
 	atomic.AddUint64(&c.forgetCounter, 1)
 }
 
-func (c *countingWorkQueue[T]) forgets() uint64 {
+func (c *countingWorkQueue) forgets() uint64 {
 	return atomic.LoadUint64(&c.forgetCounter)
 }
 
-func (c *countingWorkQueue[T]) Done(item T) {
+func (c *countingWorkQueue) Done(item Request) {
 	c.inner.Done(item)
 	atomic.AddUint64(&c.doneCounter, 1)
 }
 
-func (c *countingWorkQueue[T]) dones() uint64 {
+func (c *countingWorkQueue) dones() uint64 {
 	return atomic.LoadUint64(&c.doneCounter)
 }
diff --git a/agent/consul/controller/rate.go b/agent/consul/controller/rate.go
new file mode 100644
index 0000000000000..829b39705d371
--- /dev/null
+++ b/agent/consul/controller/rate.go
@@ -0,0 +1,70 @@
+package controller
+
+import (
+	"math"
+	"sync"
+	"time"
+)
+
+// much of this is a re-implementation of:
+// https://github.com/kubernetes/client-go/blob/release-1.25/util/workqueue/default_rate_limiters.go
+
+// Limiter is an interface for a rate limiter that can limit
+// the number of retries processed in the work queue.
+type Limiter interface {
+	// NextRetry returns the remaining time until the queue should
+	// reprocess a Request.
+	NextRetry(request Request) time.Duration
+	// Forget causes the Limiter to reset the backoff for the Request.
+	Forget(request Request)
+}
+
+var _ Limiter = &ratelimiter{}
+
+type ratelimiter struct {
+	failures map[Request]int
+	base     time.Duration
+	max      time.Duration
+	mutex    sync.RWMutex
+}
+
+// NewRateLimiter returns a Limiter that does per-item exponential
+// backoff.
+func NewRateLimiter(base, max time.Duration) Limiter {
+	return &ratelimiter{
+		failures: make(map[Request]int),
+		base:     base,
+		max:      max,
+	}
+}
+
+// NextRetry returns the remaining time until the queue should
+// reprocess a Request.
+func (r *ratelimiter) NextRetry(request Request) time.Duration {
+	r.mutex.RLock()
+	defer r.mutex.RUnlock()
+
+	exponent := r.failures[request]
+	r.failures[request] = r.failures[request] + 1
+
+	backoff := float64(r.base.Nanoseconds()) * math.Pow(2, float64(exponent))
+	// make sure we don't overflow time.Duration
+	if backoff > math.MaxInt64 {
+		return r.max
+	}
+
+	calculated := time.Duration(backoff)
+	if calculated > r.max {
+		return r.max
+	}
+
+	return calculated
+}
+
+// Forget causes the Limiter to reset the backoff for the Request.
+func (r *ratelimiter) Forget(request Request) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+
+	delete(r.failures, request)
+}
diff --git a/agent/consul/controller/queue/rate_test.go b/agent/consul/controller/rate_test.go
similarity index 81%
rename from agent/consul/controller/queue/rate_test.go
rename to agent/consul/controller/rate_test.go
index 166111d5c7508..8d128eee11c56 100644
--- a/agent/consul/controller/queue/rate_test.go
+++ b/agent/consul/controller/rate_test.go
@@ -1,7 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package queue
+package controller
 
 import (
 	"testing"
@@ -10,14 +7,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-type Request struct{ Kind string }
-
-func (r Request) Key() string { return r.Kind }
-
 func TestRateLimiter_Backoff(t *testing.T) {
 	t.Parallel()
 
-	limiter := NewRateLimiter[Request](1*time.Millisecond, 1*time.Second)
+	limiter := NewRateLimiter(1*time.Millisecond, 1*time.Second)
 
 	request := Request{Kind: "one"}
 	require.Equal(t, 1*time.Millisecond, limiter.NextRetry(request))
@@ -37,7 +30,7 @@ func TestRateLimiter_Backoff(t *testing.T) {
 func TestRateLimiter_Overflow(t *testing.T) {
 	t.Parallel()
 
-	limiter := NewRateLimiter[Request](1*time.Millisecond, 1000*time.Second)
+	limiter := NewRateLimiter(1*time.Millisecond, 1000*time.Second)
 
 	request := Request{Kind: "one"}
 	for i := 0; i < 5; i++ {
@@ -53,7 +46,7 @@ func TestRateLimiter_Overflow(t *testing.T) {
 	// make sure we're capped at the passed in max backoff
 	require.Equal(t, 1000*time.Second, limiter.NextRetry(overflow))
 
-	limiter = NewRateLimiter[Request](1*time.Minute, 1000*time.Hour)
+	limiter = NewRateLimiter(1*time.Minute, 1000*time.Hour)
 
 	for i := 0; i < 2; i++ {
 		limiter.NextRetry(request)
diff --git a/agent/consul/controller/reconciler.go b/agent/consul/controller/reconciler.go
index fa948f81f6e62..530c17ccbd9dd 100644
--- a/agent/consul/controller/reconciler.go
+++ b/agent/consul/controller/reconciler.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package controller
 
 import (
@@ -20,18 +17,6 @@ type Request struct {
 	Meta *acl.EnterpriseMeta
 }
 
-// Key satisfies the queue.ItemType interface. It returns a string which will be
-// used to de-duplicate requests in the queue.
-func (r Request) Key() string {
-	return fmt.Sprintf(
-		`kind=%q,name=%q,part=%q,ns=%q`,
-		r.Kind,
-		r.Name,
-		r.Meta.PartitionOrDefault(),
-		r.Meta.NamespaceOrDefault(),
-	)
-}
-
 // RequeueAfterError is an error that allows a Reconciler to override the
 // exponential backoff behavior of the Controller, rather than applying
 // the backoff algorithm, returning a RequeueAfterError will cause the
diff --git a/agent/consul/controller/reconciler_test.go b/agent/consul/controller/reconciler_test.go
index c3b8a450b18bb..5b08494ae6e4d 100644
--- a/agent/consul/controller/reconciler_test.go
+++ b/agent/consul/controller/reconciler_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package controller
 
 import (
diff --git a/agent/consul/coordinate_endpoint.go b/agent/consul/coordinate_endpoint.go
index f0e69332ee686..886df889e16d4 100644
--- a/agent/consul/coordinate_endpoint.go
+++ b/agent/consul/coordinate_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/coordinate_endpoint_test.go b/agent/consul/coordinate_endpoint_test.go
index 1c693ba83bbfe..471a92623c28e 100644
--- a/agent/consul/coordinate_endpoint_test.go
+++ b/agent/consul/coordinate_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/discovery_chain_endpoint.go b/agent/consul/discovery_chain_endpoint.go
index c70cebb094e68..e354d0064491b 100644
--- a/agent/consul/discovery_chain_endpoint.go
+++ b/agent/consul/discovery_chain_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/discovery_chain_endpoint_test.go b/agent/consul/discovery_chain_endpoint_test.go
index 62d90e9020af6..c1ad0fef35985 100644
--- a/agent/consul/discovery_chain_endpoint_test.go
+++ b/agent/consul/discovery_chain_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -261,8 +258,6 @@ func TestDiscoveryChainEndpoint_Get(t *testing.T) {
 						33*time.Second,
 					),
 				},
-				AutoVirtualIPs:   []string{"240.0.0.1"},
-				ManualVirtualIPs: []string{},
 			},
 		}
 		require.Equal(t, expect, resp)
diff --git a/agent/consul/discoverychain/compile.go b/agent/consul/discoverychain/compile.go
index 32a6408be5445..212c3d8fbd3a2 100644
--- a/agent/consul/discoverychain/compile.go
+++ b/agent/consul/discoverychain/compile.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package discoverychain
 
 import (
@@ -15,7 +12,6 @@ import (
 	"github.com/hashicorp/consul/agent/configentry"
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
 )
 
 type CompileRequest struct {
@@ -44,11 +40,6 @@ type CompileRequest struct {
 	OverrideConnectTimeout time.Duration
 
 	Entries *configentry.DiscoveryChainSet
-
-	// AutoVirtualIPs and ManualVirtualIPs are lists of IPs associated with
-	// the service.
-	AutoVirtualIPs   []string
-	ManualVirtualIPs []string
 }
 
 // Compile assembles a discovery chain in the form of a graph of nodes using
@@ -103,8 +94,6 @@ func Compile(req CompileRequest) (*structs.CompiledDiscoveryChain, error) {
 		overrideProtocol:       req.OverrideProtocol,
 		overrideConnectTimeout: req.OverrideConnectTimeout,
 		entries:                entries,
-		autoVirtualIPs:         req.AutoVirtualIPs,
-		manualVirtualIPs:       req.ManualVirtualIPs,
 
 		resolvers:     make(map[structs.ServiceID]*structs.ServiceResolverConfigEntry),
 		splitterNodes: make(map[string]*structs.DiscoveryGraphNode),
@@ -146,11 +135,6 @@ type compiler struct {
 	// This is an INPUT field.
 	entries *configentry.DiscoveryChainSet
 
-	// autoVirtualIPs and manualVirtualIPs are lists of IPs associated with
-	// the service.
-	autoVirtualIPs   []string
-	manualVirtualIPs []string
-
 	// resolvers is initially seeded by copying the provided entries.Resolvers
 	// map and default resolvers are added as they are needed.
 	resolvers map[structs.ServiceID]*structs.ServiceResolverConfigEntry
@@ -364,8 +348,6 @@ func (c *compiler) compile() (*structs.CompiledDiscoveryChain, error) {
 		StartNode:         c.startNode,
 		Nodes:             c.nodes,
 		Targets:           c.loadedTargets,
-		AutoVirtualIPs:    c.autoVirtualIPs,
-		ManualVirtualIPs:  c.manualVirtualIPs,
 	}, nil
 }
 
@@ -396,6 +378,7 @@ func (c *compiler) determineIfDefaultChain() bool {
 	}
 
 	target := c.loadedTargets[node.Resolver.Target]
+
 	return target.Service == c.serviceName && target.Namespace == c.evaluateInNamespace && target.Partition == c.evaluateInPartition
 }
 
@@ -595,7 +578,7 @@ func (c *compiler) assembleChain() error {
 	// Check for short circuit path.
 	if len(c.resolvers) == 0 && c.entries.IsChainEmpty() {
 		// Materialize defaults and cache.
-		c.resolvers[sid] = c.newDefaultServiceResolver(sid, "")
+		c.resolvers[sid] = newDefaultServiceResolver(sid)
 	}
 
 	// The only router we consult is the one for the service name at the top of
@@ -764,11 +747,6 @@ func (c *compiler) newTarget(opts structs.DiscoveryTargetOpts) *structs.Discover
 		// Use the same representation for the name. This will NOT be overridden
 		// later.
 		t.Name = t.SNI
-	} else {
-		peer := c.entries.Peers[opts.Peer]
-		if peer != nil && peer.Remote != nil {
-			t.Locality = pbpeering.LocalityToStructs(peer.Remote.Locality)
-		}
 	}
 
 	prev, ok := c.loadedTargets[t.ID]
@@ -936,7 +914,7 @@ RESOLVE_AGAIN:
 	resolver, ok := c.resolvers[targetID]
 	if !ok {
 		// Materialize defaults and cache.
-		resolver = c.newDefaultServiceResolver(targetID, target.Peer)
+		resolver = newDefaultServiceResolver(targetID)
 		c.resolvers[targetID] = resolver
 	}
 
@@ -957,8 +935,7 @@ RESOLVE_AGAIN:
 	//
 	// TODO(rb): What about a redirected subset reference? (web/v2, but web redirects to alt/"")
 
-	// Redirects to sameness groups are technically failovers.
-	if resolver.Redirect != nil && resolver.Redirect.SamenessGroup == "" {
+	if resolver.Redirect != nil {
 		redirect := resolver.Redirect
 
 		redirectedTarget := c.rewriteTarget(
@@ -1017,19 +994,6 @@ RESOLVE_AGAIN:
 		LoadBalancer: resolver.LoadBalancer,
 	}
 
-	proxyDefault := c.entries.GetProxyDefaults(targetID.PartitionOrDefault())
-
-	// Only set PrioritizeByLocality for targets in the same partition.
-	if target.Partition == c.evaluateInPartition && target.Peer == "" {
-		if resolver.PrioritizeByLocality != nil {
-			target.PrioritizeByLocality = resolver.PrioritizeByLocality.ToDiscovery()
-		}
-
-		if target.PrioritizeByLocality == nil && proxyDefault != nil {
-			target.PrioritizeByLocality = proxyDefault.PrioritizeByLocality.ToDiscovery()
-		}
-	}
-
 	target.Subset = resolver.Subsets[target.ServiceSubset]
 
 	if serviceDefault := c.entries.GetService(targetID); serviceDefault != nil && serviceDefault.ExternalSNI != "" {
@@ -1111,24 +1075,6 @@ RESOLVE_AGAIN:
 	// reasonably if there is some sort of graph loop below.
 	c.recordNode(node)
 
-	var err error
-	// Determine which failover definitions apply.
-	var failoverTargets []*structs.DiscoveryTarget
-	var failoverPolicy *structs.ServiceResolverFailoverPolicy
-
-	if proxyDefault != nil {
-		failoverPolicy = proxyDefault.FailoverPolicy
-	}
-
-	if resolver.Redirect != nil && resolver.Redirect.SamenessGroup != "" {
-		opts := structs.MergeDiscoveryTargetOpts(resolver.ToSamenessDiscoveryTargetOpts(),
-			resolver.Redirect.ToDiscoveryTargetOpts())
-		failoverTargets, err = c.makeSamenessGroupFailover(target, opts, resolver.Redirect.SamenessGroup)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	if len(resolver.Failover) > 0 {
 		f := resolver.Failover
 
@@ -1142,10 +1088,8 @@ RESOLVE_AGAIN:
 			return node, nil
 		}
 
-		if failover.Policy != nil {
-			failoverPolicy = failover.Policy
-		}
-
+		// Determine which failover definitions apply.
+		var failoverTargets []*structs.DiscoveryTarget
 		if len(failover.Datacenters) > 0 {
 			opts := failover.ToDiscoveryTargetOpts()
 			for _, dc := range failover.Datacenters {
@@ -1164,13 +1108,6 @@ RESOLVE_AGAIN:
 					failoverTargets = append(failoverTargets, failoverTarget)
 				}
 			}
-		} else if failover.SamenessGroup != "" {
-			opts := structs.MergeDiscoveryTargetOpts(resolver.ToSamenessDiscoveryTargetOpts(),
-				failover.ToDiscoveryTargetOpts())
-			failoverTargets, err = c.makeSamenessGroupFailover(target, opts, failover.SamenessGroup)
-			if err != nil {
-				return nil, err
-			}
 		} else {
 			// Rewrite the target as per the failover policy.
 			failoverTarget := c.rewriteTarget(target, failover.ToDiscoveryTargetOpts())
@@ -1179,72 +1116,29 @@ RESOLVE_AGAIN:
 			}
 		}
 
-	}
-
-	// If we filtered everything out then no point in having a failover.
-	if len(failoverTargets) > 0 {
-		df := &structs.DiscoveryFailover{}
-		node.Resolver.Failover = df
-
-		df.Policy = failoverPolicy
-
-		// Take care of doing any redirects or configuration loading
-		// related to targets by cheating a bit and recursing into
-		// ourselves.
-		for _, target := range failoverTargets {
-			failoverResolveNode, err := c.getResolverNode(target, true)
-			if err != nil {
-				return nil, err
+		// If we filtered everything out then no point in having a failover.
+		if len(failoverTargets) > 0 {
+			df := &structs.DiscoveryFailover{}
+			node.Resolver.Failover = df
+
+			// Take care of doing any redirects or configuration loading
+			// related to targets by cheating a bit and recursing into
+			// ourselves.
+			for _, target := range failoverTargets {
+				failoverResolveNode, err := c.getResolverNode(target, true)
+				if err != nil {
+					return nil, err
+				}
+				failoverTarget := failoverResolveNode.Resolver.Target
+				df.Targets = append(df.Targets, failoverTarget)
 			}
-			failoverTarget := failoverResolveNode.Resolver.Target
-			df.Targets = append(df.Targets, failoverTarget)
 		}
 	}
 
 	return node, nil
 }
 
-func (c *compiler) makeSamenessGroupFailover(target *structs.DiscoveryTarget, opts structs.DiscoveryTargetOpts, samenessGroupName string) ([]*structs.DiscoveryTarget, error) {
-	samenessGroup := c.entries.GetSamenessGroup(samenessGroupName)
-	if samenessGroup == nil {
-		return nil, &structs.ConfigEntryGraphError{
-			Message: fmt.Sprintf(
-				"sameness group missing for service %q",
-				target.Service,
-			),
-		}
-	}
-
-	var failoverTargets []*structs.DiscoveryTarget
-	for _, t := range samenessGroup.ToServiceResolverFailoverTargets() {
-		// Rewrite the target as per the failover policy.
-		targetOpts := structs.MergeDiscoveryTargetOpts(opts, t.ToDiscoveryTargetOpts())
-		failoverTarget := c.rewriteTarget(target, targetOpts)
-		if failoverTarget.ID != target.ID { // don't failover to yourself
-			failoverTargets = append(failoverTargets, failoverTarget)
-		}
-	}
-
-	return failoverTargets, nil
-}
-
-func (c *compiler) newDefaultServiceResolver(sid structs.ServiceID, peer string) *structs.ServiceResolverConfigEntry {
-	sg := c.entries.GetDefaultSamenessGroup()
-	entMeta := c.GetEnterpriseMeta()
-	if sg != nil && peer == "" && (entMeta == nil || sid.PartitionOrDefault() == entMeta.PartitionOrDefault()) {
-		return &structs.ServiceResolverConfigEntry{
-			Kind:           structs.ServiceResolver,
-			Name:           sid.ID,
-			EnterpriseMeta: sid.EnterpriseMeta,
-			// This needs to be a redirect rather than failover because failovers
-			// implicitly include the local service. This isn't the behavior we want
-			// for services on sameness groups the local partition isn't a member of.
-			Redirect: &structs.ServiceResolverRedirect{
-				SamenessGroup: sg.Name,
-			},
-		}
-	}
-
+func newDefaultServiceResolver(sid structs.ServiceID) *structs.ServiceResolverConfigEntry {
 	return &structs.ServiceResolverConfigEntry{
 		Kind:           structs.ServiceResolver,
 		Name:           sid.ID,
diff --git a/agent/consul/discoverychain/compile_ce.go b/agent/consul/discoverychain/compile_ce.go
index d407e4cc1c891..c0aa1118e146c 100644
--- a/agent/consul/discoverychain/compile_ce.go
+++ b/agent/consul/discoverychain/compile_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package discoverychain
 
diff --git a/agent/consul/discoverychain/compile_test.go b/agent/consul/discoverychain/compile_test.go
index dda28780431d1..1e6690233dad8 100644
--- a/agent/consul/discoverychain/compile_test.go
+++ b/agent/consul/discoverychain/compile_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package discoverychain
 
 import (
@@ -12,8 +9,6 @@ import (
 	"github.com/hashicorp/consul/agent/configentry"
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
 )
 
 type compileTestCase struct {
@@ -1583,25 +1578,12 @@ func testcase_Failover_Targets() compileTestCase {
 						{Datacenter: "dc3"},
 						{Service: "new-main"},
 						{Peer: "cluster-01"},
-						{Peer: "cluster-02"},
 					},
 				},
 			},
 		},
 	)
 
-	entries.AddPeers(
-		&pbpeering.Peering{
-			Name: "cluster-01",
-			Remote: &pbpeering.RemoteInfo{
-				Locality: &pbcommon.Locality{
-					Region: "us-west-1",
-					Zone:   "us-west-1a",
-				},
-			},
-		},
-	)
-
 	expect := &structs.CompiledDiscoveryChain{
 		Protocol:  "tcp",
 		StartNode: "resolver:main.default.default.dc1",
@@ -1617,7 +1599,6 @@ func testcase_Failover_Targets() compileTestCase {
 							"main.default.default.dc3",
 							"new-main.default.default.dc1",
 							"main.default.default.external.cluster-01",
-							"main.default.default.external.cluster-02",
 						},
 					},
 				},
@@ -1645,21 +1626,6 @@ func testcase_Failover_Targets() compileTestCase {
 			"main.default.default.external.cluster-01": newTarget(structs.DiscoveryTargetOpts{
 				Service: "main",
 				Peer:    "cluster-01",
-			}, func(t *structs.DiscoveryTarget) {
-				t.SNI = ""
-				t.Name = ""
-				t.Datacenter = ""
-				t.MeshGateway = structs.MeshGatewayConfig{
-					Mode: structs.MeshGatewayModeRemote,
-				}
-				t.Locality = &structs.Locality{
-					Region: "us-west-1",
-					Zone:   "us-west-1a",
-				}
-			}),
-			"main.default.default.external.cluster-02": newTarget(structs.DiscoveryTargetOpts{
-				Service: "main",
-				Peer:    "cluster-02",
 			}, func(t *structs.DiscoveryTarget) {
 				t.SNI = ""
 				t.Name = ""
@@ -3301,7 +3267,6 @@ func newTarget(opts structs.DiscoveryTargetOpts, modFn func(t *structs.Discovery
 	t.SNI = connect.TargetSNI(t, "trustdomain.consul")
 	t.Name = t.SNI
 	t.ConnectTimeout = 5 * time.Second // default
-	t.PrioritizeByLocality = opts.PrioritizeByLocality
 	if modFn != nil {
 		modFn(t)
 	}
diff --git a/agent/consul/discoverychain/gateway.go b/agent/consul/discoverychain/gateway.go
index c60c77b028fbf..f711a4915cad9 100644
--- a/agent/consul/discoverychain/gateway.go
+++ b/agent/consul/discoverychain/gateway.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package discoverychain
 
 import (
@@ -27,10 +24,9 @@ type GatewayChainSynthesizer struct {
 }
 
 type hostnameMatch struct {
-	match           structs.HTTPMatch
-	filters         structs.HTTPFilters
-	responseFilters structs.HTTPResponseFilters
-	services        []structs.HTTPService
+	match    structs.HTTPMatch
+	filters  structs.HTTPFilters
+	services []structs.HTTPService
 }
 
 // NewGatewayChainSynthesizer creates a new GatewayChainSynthesizer for the
@@ -60,13 +56,9 @@ func (l *GatewayChainSynthesizer) SetHostname(hostname string) {
 // single hostname can be specified in multiple routes. Routing for a given
 // hostname must behave based on the aggregate of all rules that apply to it.
 func (l *GatewayChainSynthesizer) AddHTTPRoute(route structs.HTTPRouteConfigEntry) {
-	l.matchesByHostname = initHostMatches(l.hostname, &route, l.matchesByHostname)
-}
-
-func initHostMatches(hostname string, route *structs.HTTPRouteConfigEntry, currentMatches map[string][]hostnameMatch) map[string][]hostnameMatch {
-	hostnames := route.FilteredHostnames(hostname)
+	hostnames := route.FilteredHostnames(l.hostname)
 	for _, host := range hostnames {
-		matches, ok := currentMatches[host]
+		matches, ok := l.matchesByHostname[host]
 		if !ok {
 			matches = []hostnameMatch{}
 		}
@@ -88,17 +80,15 @@ func initHostMatches(hostname string, route *structs.HTTPRouteConfigEntry, curre
 			// Add all matches for this rule to the list for this hostname
 			for _, match := range rule.Matches {
 				matches = append(matches, hostnameMatch{
-					match:           match,
-					filters:         rule.Filters,
-					responseFilters: rule.ResponseFilters,
-					services:        rule.Services,
+					match:    match,
+					filters:  rule.Filters,
+					services: rule.Services,
 				})
 			}
 		}
 
-		currentMatches[host] = matches
+		l.matchesByHostname[host] = matches
 	}
-	return currentMatches
 }
 
 // Synthesize assembles a synthetic discovery chain from multiple other discovery chains
@@ -123,7 +113,6 @@ func (l *GatewayChainSynthesizer) Synthesize(chains ...*structs.CompiledDiscover
 
 	compiledChains := make([]*structs.CompiledDiscoveryChain, 0, len(set))
 	for i, service := range services {
-
 		entries := set[i]
 
 		compiled, err := Compile(CompileRequest{
@@ -134,6 +123,7 @@ func (l *GatewayChainSynthesizer) Synthesize(chains ...*structs.CompiledDiscover
 			EvaluateInTrustDomain: l.trustDomain,
 			Entries:               entries,
 		})
+
 		if err != nil {
 			return nil, nil, err
 		}
@@ -195,34 +185,17 @@ func (l *GatewayChainSynthesizer) Synthesize(chains ...*structs.CompiledDiscover
 // consolidateHTTPRoutes combines all rules into the shortest possible list of routes
 // with one route per hostname containing all rules for that hostname.
 func (l *GatewayChainSynthesizer) consolidateHTTPRoutes() []structs.HTTPRouteConfigEntry {
-	return consolidateHTTPRoutes(l.matchesByHostname, l.suffix, l.gateway)
-}
-
-// ConsolidateHTTPRoutes takes in one or more HTTPRoutes and consolidates them down to the minimum
-// set of HTTPRoutes that can represent the same set of rules. This should result in approx. one
-// HTTPRoute per hostname.
-func ConsolidateHTTPRoutes(gateway *structs.APIGatewayConfigEntry, listener *structs.APIGatewayListener, routes ...*structs.HTTPRouteConfigEntry) []structs.HTTPRouteConfigEntry {
-	matches := map[string][]hostnameMatch{}
-	for _, route := range routes {
-		matches = initHostMatches(listener.GetHostname(), route, matches)
-	}
-	return consolidateHTTPRoutes(matches, listener.Name, gateway)
-}
-
-// consolidateHTTPRoutes combines all rules into the shortest possible list of routes
-// with one route per hostname containing all rules for that hostname.
-func consolidateHTTPRoutes(matchesByHostname map[string][]hostnameMatch, listenerName string, gateway *structs.APIGatewayConfigEntry) []structs.HTTPRouteConfigEntry {
 	var routes []structs.HTTPRouteConfigEntry
 
-	for hostname, rules := range matchesByHostname {
+	for hostname, rules := range l.matchesByHostname {
 		// Create route for this hostname
 		route := structs.HTTPRouteConfigEntry{
 			Kind:           structs.HTTPRoute,
-			Name:           fmt.Sprintf("%s-%s-%s", gateway.Name, listenerName, hostsKey(hostname)),
+			Name:           fmt.Sprintf("%s-%s-%s", l.gateway.Name, l.suffix, hostsKey(hostname)),
 			Hostnames:      []string{hostname},
 			Rules:          make([]structs.HTTPRouteRule, 0, len(rules)),
-			Meta:           gateway.Meta,
-			EnterpriseMeta: gateway.EnterpriseMeta,
+			Meta:           l.gateway.Meta,
+			EnterpriseMeta: l.gateway.EnterpriseMeta,
 		}
 
 		// Sort rules for this hostname in order of precedence
@@ -233,10 +206,9 @@ func consolidateHTTPRoutes(matchesByHostname map[string][]hostnameMatch, listene
 		// Add all rules for this hostname
 		for _, rule := range rules {
 			route.Rules = append(route.Rules, structs.HTTPRouteRule{
-				Matches:         []structs.HTTPMatch{rule.match},
-				Filters:         rule.filters,
-				ResponseFilters: rule.responseFilters,
-				Services:        rule.services,
+				Matches:  []structs.HTTPMatch{rule.match},
+				Filters:  rule.filters,
+				Services: rule.services,
 			})
 		}
 
@@ -290,14 +262,12 @@ func (l *GatewayChainSynthesizer) synthesizeEntries() ([]structs.IngressService,
 	entries := []*configentry.DiscoveryChainSet{}
 
 	for _, route := range l.consolidateHTTPRoutes() {
-		ingress, router, splitters, defaults := synthesizeHTTPRouteDiscoveryChain(route)
-
-		services = append(services, ingress)
-
 		entrySet := configentry.NewDiscoveryChainSet()
+		ingress, router, splitters, defaults := synthesizeHTTPRouteDiscoveryChain(route)
 		entrySet.AddRouters(router)
 		entrySet.AddSplitters(splitters...)
 		entrySet.AddServices(defaults...)
+		services = append(services, ingress)
 		entries = append(entries, entrySet)
 	}
 
diff --git a/agent/consul/discoverychain/gateway_httproute.go b/agent/consul/discoverychain/gateway_httproute.go
index 3a4acf48e4134..30968c9a4d5d1 100644
--- a/agent/consul/discoverychain/gateway_httproute.go
+++ b/agent/consul/discoverychain/gateway_httproute.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package discoverychain
 
 import (
@@ -79,8 +76,7 @@ func httpRouteToDiscoveryChain(route structs.HTTPRouteConfigEntry) (*structs.Ser
 	var defaults []*structs.ServiceConfigEntry
 
 	for idx, rule := range route.Rules {
-		requestModifier := httpRouteFiltersToServiceRouteHeaderModifier(rule.Filters.Headers)
-		responseModifier := httpRouteFiltersToServiceRouteHeaderModifier(rule.ResponseFilters.Headers)
+		modifier := httpRouteFiltersToServiceRouteHeaderModifier(rule.Filters.Headers)
 		prefixRewrite := httpRouteFiltersToDestinationPrefixRewrite(rule.Filters.URLRewrite)
 
 		var destination structs.ServiceRouteDestination
@@ -91,29 +87,16 @@ func httpRouteToDiscoveryChain(route structs.HTTPRouteConfigEntry) (*structs.Ser
 			if service.Filters.URLRewrite == nil {
 				servicePrefixRewrite = prefixRewrite
 			}
-
-			// Merge service request header modifier(s) onto route rule modifiers
-			// Note: Removals for the same header may exist on the rule + the service and
-			//   will result in idempotent duplicate values in the modifier w/ service coming last
-			serviceRequestModifier := httpRouteFiltersToServiceRouteHeaderModifier(service.Filters.Headers)
-			requestModifier.Add = mergeMaps(requestModifier.Add, serviceRequestModifier.Add)
-			requestModifier.Set = mergeMaps(requestModifier.Set, serviceRequestModifier.Set)
-			requestModifier.Remove = append(requestModifier.Remove, serviceRequestModifier.Remove...)
-
-			// Merge service response header modifier(s) onto route rule modifiers
-			// Note: Removals for the same header may exist on the rule + the service and
-			//   will result in idempotent duplicate values in the modifier w/ service coming last
-			serviceResponseModifier := httpRouteFiltersToServiceRouteHeaderModifier(service.ResponseFilters.Headers)
-			responseModifier.Add = mergeMaps(responseModifier.Add, serviceResponseModifier.Add)
-			responseModifier.Set = mergeMaps(responseModifier.Set, serviceResponseModifier.Set)
-			responseModifier.Remove = append(responseModifier.Remove, serviceResponseModifier.Remove...)
+			serviceModifier := httpRouteFiltersToServiceRouteHeaderModifier(service.Filters.Headers)
+			modifier.Add = mergeMaps(modifier.Add, serviceModifier.Add)
+			modifier.Set = mergeMaps(modifier.Set, serviceModifier.Set)
+			modifier.Remove = append(modifier.Remove, serviceModifier.Remove...)
 
 			destination.Service = service.Name
 			destination.Namespace = service.NamespaceOrDefault()
 			destination.Partition = service.PartitionOrDefault()
 			destination.PrefixRewrite = servicePrefixRewrite
-			destination.RequestHeaders = requestModifier
-			destination.ResponseHeaders = responseModifier
+			destination.RequestHeaders = modifier
 
 			// since we have already validated the protocol elsewhere, we
 			// create a new service defaults here to make sure we pass validation
@@ -129,8 +112,7 @@ func httpRouteToDiscoveryChain(route structs.HTTPRouteConfigEntry) (*structs.Ser
 			destination.Namespace = route.NamespaceOrDefault()
 			destination.Partition = route.PartitionOrDefault()
 			destination.PrefixRewrite = prefixRewrite
-			destination.RequestHeaders = requestModifier
-			destination.ResponseHeaders = responseModifier
+			destination.RequestHeaders = modifier
 
 			splitter := &structs.ServiceSplitterConfigEntry{
 				Kind:           structs.ServiceSplitter,
@@ -176,28 +158,6 @@ func httpRouteToDiscoveryChain(route structs.HTTPRouteConfigEntry) (*structs.Ser
 			}
 		}
 
-		if rule.Filters.RetryFilter != nil {
-			if rule.Filters.RetryFilter.NumRetries != nil {
-				destination.NumRetries = *rule.Filters.RetryFilter.NumRetries
-			}
-			if rule.Filters.RetryFilter.RetryOnConnectFailure != nil {
-				destination.RetryOnConnectFailure = *rule.Filters.RetryFilter.RetryOnConnectFailure
-			}
-
-			if len(rule.Filters.RetryFilter.RetryOn) > 0 {
-				destination.RetryOn = rule.Filters.RetryFilter.RetryOn
-			}
-
-			if len(rule.Filters.RetryFilter.RetryOnStatusCodes) > 0 {
-				destination.RetryOnStatusCodes = rule.Filters.RetryFilter.RetryOnStatusCodes
-			}
-		}
-
-		if rule.Filters.TimeoutFilter != nil {
-			destination.IdleTimeout = rule.Filters.TimeoutFilter.IdleTimeout
-			destination.RequestTimeout = rule.Filters.TimeoutFilter.RequestTimeout
-		}
-
 		// for each match rule a ServiceRoute is created for the service-router
 		// if there are no rules a single route with the destination is set
 		if len(rule.Matches) == 0 {
@@ -210,7 +170,6 @@ func httpRouteToDiscoveryChain(route structs.HTTPRouteConfigEntry) (*structs.Ser
 				Destination: &destination,
 			})
 		}
-
 	}
 
 	return router, splitters, defaults
diff --git a/agent/consul/discoverychain/gateway_tcproute.go b/agent/consul/discoverychain/gateway_tcproute.go
index 910fd517551c0..377e4450ee183 100644
--- a/agent/consul/discoverychain/gateway_tcproute.go
+++ b/agent/consul/discoverychain/gateway_tcproute.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package discoverychain
 
 import "github.com/hashicorp/consul/agent/structs"
diff --git a/agent/consul/discoverychain/gateway_test.go b/agent/consul/discoverychain/gateway_test.go
index 00c37e8aa407a..17fc539c3c5c4 100644
--- a/agent/consul/discoverychain/gateway_test.go
+++ b/agent/consul/discoverychain/gateway_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package discoverychain
 
 import (
@@ -518,70 +515,8 @@ func TestGatewayChainSynthesizer_Synthesize(t *testing.T) {
 					Kind: structs.HTTPRoute,
 					Name: "http-route",
 					Rules: []structs.HTTPRouteRule{{
-						Filters: structs.HTTPFilters{
-							Headers: []structs.HTTPHeaderFilter{
-								{
-									Add:    map[string]string{"add me to the rule request": "present"},
-									Set:    map[string]string{"set me on the rule request": "present"},
-									Remove: []string{"remove me from the rule request"},
-								},
-								{
-									Add: map[string]string{"add me to the rule and service request": "rule"},
-									Set: map[string]string{"set me on the rule and service request": "rule"},
-								},
-								{
-									Remove: []string{"remove me from the rule and service request"},
-								},
-							},
-						},
-						ResponseFilters: structs.HTTPResponseFilters{
-							Headers: []structs.HTTPHeaderFilter{{
-								Add: map[string]string{
-									"add me to the rule response":             "present",
-									"add me to the rule and service response": "rule",
-								},
-								Set: map[string]string{
-									"set me on the rule response":             "present",
-									"set me on the rule and service response": "rule",
-								},
-								Remove: []string{
-									"remove me from the rule response",
-									"remove me from the rule and service response",
-								},
-							}},
-						},
 						Services: []structs.HTTPService{{
 							Name: "foo",
-							Filters: structs.HTTPFilters{
-								Headers: []structs.HTTPHeaderFilter{
-									{
-										Add: map[string]string{"add me to the service request": "present"},
-									},
-									{
-										Set:    map[string]string{"set me on the service request": "present"},
-										Remove: []string{"remove me from the service request"},
-									},
-									{
-										Add:    map[string]string{"add me to the rule and service request": "service"},
-										Set:    map[string]string{"set me on the rule and service request": "service"},
-										Remove: []string{"remove me from the rule and service request"},
-									},
-								},
-							},
-							ResponseFilters: structs.HTTPResponseFilters{
-								Headers: []structs.HTTPHeaderFilter{
-									{
-										Add:    map[string]string{"add me to the service response": "present"},
-										Set:    map[string]string{"set me on the service response": "present"},
-										Remove: []string{"remove me from the service response"},
-									},
-									{
-										Add:    map[string]string{"add me to the rule and service response": "service"},
-										Set:    map[string]string{"set me on the rule and service response": "service"},
-										Remove: []string{"remove me from the rule and service response"},
-									},
-								},
-							},
 						}},
 					}},
 				},
@@ -619,40 +554,8 @@ func TestGatewayChainSynthesizer_Synthesize(t *testing.T) {
 									Partition: "default",
 									Namespace: "default",
 									RequestHeaders: &structs.HTTPHeaderModifiers{
-										Add: map[string]string{
-											"add me to the rule request":             "present",
-											"add me to the service request":          "present",
-											"add me to the rule and service request": "service",
-										},
-										Set: map[string]string{
-											"set me on the rule request":             "present",
-											"set me on the service request":          "present",
-											"set me on the rule and service request": "service",
-										},
-										Remove: []string{
-											"remove me from the rule request",
-											"remove me from the rule and service request",
-											"remove me from the service request",
-											"remove me from the rule and service request",
-										},
-									},
-									ResponseHeaders: &structs.HTTPHeaderModifiers{
-										Add: map[string]string{
-											"add me to the rule response":             "present",
-											"add me to the service response":          "present",
-											"add me to the rule and service response": "service",
-										},
-										Set: map[string]string{
-											"set me on the rule response":             "present",
-											"set me on the service response":          "present",
-											"set me on the rule and service response": "service",
-										},
-										Remove: []string{
-											"remove me from the rule response",
-											"remove me from the rule and service response",
-											"remove me from the service response",
-											"remove me from the rule and service response",
-										},
+										Add: make(map[string]string),
+										Set: make(map[string]string),
 									},
 								},
 							},
@@ -757,10 +660,6 @@ func TestGatewayChainSynthesizer_Synthesize(t *testing.T) {
 										Add: make(map[string]string),
 										Set: make(map[string]string),
 									},
-									ResponseHeaders: &structs.HTTPHeaderModifiers{
-										Add: make(map[string]string),
-										Set: make(map[string]string),
-									},
 								},
 							},
 							NextNode: "resolver:foo-2.default.default.dc2",
@@ -948,10 +847,6 @@ func TestGatewayChainSynthesizer_ComplexChain(t *testing.T) {
 										Add: make(map[string]string),
 										Set: make(map[string]string),
 									},
-									ResponseHeaders: &structs.HTTPHeaderModifiers{
-										Add: make(map[string]string),
-										Set: make(map[string]string),
-									},
 								},
 							},
 							NextNode: "splitter:splitter-one.default.default",
diff --git a/agent/consul/discoverychain/string_stack.go b/agent/consul/discoverychain/string_stack.go
index d5f842f3dc615..c68827d8d3344 100644
--- a/agent/consul/discoverychain/string_stack.go
+++ b/agent/consul/discoverychain/string_stack.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package discoverychain
 
 type stringStack []string
diff --git a/agent/consul/discoverychain/string_stack_test.go b/agent/consul/discoverychain/string_stack_test.go
index 9867b91795206..d33363c0b1c9a 100644
--- a/agent/consul/discoverychain/string_stack_test.go
+++ b/agent/consul/discoverychain/string_stack_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package discoverychain
 
 import (
diff --git a/agent/consul/discoverychain/testing.go b/agent/consul/discoverychain/testing.go
index 8992870f9c457..68a75c26a9199 100644
--- a/agent/consul/discoverychain/testing.go
+++ b/agent/consul/discoverychain/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package discoverychain
 
 import (
@@ -17,11 +14,11 @@ func TestCompileConfigEntries(t testing.T,
 	evaluateInPartition string,
 	evaluateInDatacenter string,
 	evaluateInTrustDomain string,
-	setup func(req *CompileRequest),
-	set *configentry.DiscoveryChainSet) *structs.CompiledDiscoveryChain {
-	if set == nil {
-		set = configentry.NewDiscoveryChainSet()
-	}
+	setup func(req *CompileRequest), entries ...structs.ConfigEntry) *structs.CompiledDiscoveryChain {
+	set := configentry.NewDiscoveryChainSet()
+
+	set.AddEntries(entries...)
+
 	req := CompileRequest{
 		ServiceName:           serviceName,
 		EvaluateInNamespace:   evaluateInNamespace,
diff --git a/agent/consul/enterprise_client_ce.go b/agent/consul/enterprise_client_ce.go
index 585c84d91d3ac..3dcf34732a294 100644
--- a/agent/consul/enterprise_client_ce.go
+++ b/agent/consul/enterprise_client_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/enterprise_config_ce.go b/agent/consul/enterprise_config_ce.go
index cb26252e59358..a58998406023b 100644
--- a/agent/consul/enterprise_config_ce.go
+++ b/agent/consul/enterprise_config_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/enterprise_server_ce.go b/agent/consul/enterprise_server_ce.go
index 61eb03cd1162e..b0a8129ad5f3b 100644
--- a/agent/consul/enterprise_server_ce.go
+++ b/agent/consul/enterprise_server_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/enterprise_server_ce_test.go b/agent/consul/enterprise_server_ce_test.go
index 1a3622d5d743c..46a73b6d1379b 100644
--- a/agent/consul/enterprise_server_ce_test.go
+++ b/agent/consul/enterprise_server_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/federation_state_endpoint.go b/agent/consul/federation_state_endpoint.go
index 4afa481a397b6..6aade9488351b 100644
--- a/agent/consul/federation_state_endpoint.go
+++ b/agent/consul/federation_state_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/federation_state_endpoint_test.go b/agent/consul/federation_state_endpoint_test.go
index 2ada2fc17a469..2996224478be1 100644
--- a/agent/consul/federation_state_endpoint_test.go
+++ b/agent/consul/federation_state_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/federation_state_replication.go b/agent/consul/federation_state_replication.go
index 2f5a6dd150f31..69fb896940cfb 100644
--- a/agent/consul/federation_state_replication.go
+++ b/agent/consul/federation_state_replication.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/federation_state_replication_test.go b/agent/consul/federation_state_replication_test.go
index 97a34b8dc8c16..b908aec96dfb3 100644
--- a/agent/consul/federation_state_replication_test.go
+++ b/agent/consul/federation_state_replication_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/filter.go b/agent/consul/filter.go
index 920b8e843676f..217af4400767b 100644
--- a/agent/consul/filter.go
+++ b/agent/consul/filter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/filter_test.go b/agent/consul/filter_test.go
index 1ca34b0ed0726..b5f81c28fed5a 100644
--- a/agent/consul/filter_test.go
+++ b/agent/consul/filter_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/flood.go b/agent/consul/flood.go
index e01b5ed97eb83..ab9c54003388c 100644
--- a/agent/consul/flood.go
+++ b/agent/consul/flood.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/fsm/commands_ce.go b/agent/consul/fsm/commands_ce.go
index c5e7fd968238b..0fb7d694f55e8 100644
--- a/agent/consul/fsm/commands_ce.go
+++ b/agent/consul/fsm/commands_ce.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package fsm
 
 import (
@@ -13,7 +10,7 @@ import (
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 var CommandsSummaries = []prometheus.SummaryDefinition{
@@ -145,8 +142,6 @@ func init() {
 	registerCommand(structs.PeeringTrustBundleWriteType, (*FSM).applyPeeringTrustBundleWrite)
 	registerCommand(structs.PeeringTrustBundleDeleteType, (*FSM).applyPeeringTrustBundleDelete)
 	registerCommand(structs.PeeringSecretsWriteType, (*FSM).applyPeeringSecretsWrite)
-	registerCommand(structs.ResourceOperationType, (*FSM).applyResourceOperation)
-	registerCommand(structs.UpdateVirtualIPRequestType, (*FSM).applyManualVirtualIPs)
 }
 
 func (c *FSM) applyRegister(buf []byte, index uint64) interface{} {
@@ -783,24 +778,3 @@ func (c *FSM) applyPeeringTrustBundleDelete(buf []byte, index uint64) interface{
 	}
 	return c.state.PeeringTrustBundleDelete(index, q)
 }
-
-func (f *FSM) applyResourceOperation(buf []byte, idx uint64) any {
-	return f.deps.StorageBackend.Apply(buf, idx)
-}
-
-func (c *FSM) applyManualVirtualIPs(buf []byte, index uint64) interface{} {
-	var req state.ServiceVirtualIP
-	if err := structs.Decode(buf, &req); err != nil {
-		panic(fmt.Errorf("failed to decode request: %v", err))
-	}
-
-	found, unassignedFrom, err := c.state.AssignManualServiceVIPs(index, req.Service, req.ManualIPs)
-	if err != nil {
-		c.logger.Warn("AssignManualVirtualIPs failed", "error", err)
-		return err
-	}
-	return structs.AssignServiceManualVIPsResponse{
-		Found:          found,
-		UnassignedFrom: unassignedFrom,
-	}
-}
diff --git a/agent/consul/fsm/commands_ce_test.go b/agent/consul/fsm/commands_ce_test.go
index 445f4c0190760..ea3196e55aca5 100644
--- a/agent/consul/fsm/commands_ce_test.go
+++ b/agent/consul/fsm/commands_ce_test.go
@@ -1,12 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package fsm
 
 import (
 	"bytes"
-	"context"
-	"errors"
 	"fmt"
 	"math/rand"
 	"reflect"
@@ -16,17 +11,11 @@ import (
 	"github.com/mitchellh/mapstructure"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
 	"google.golang.org/protobuf/proto"
 
 	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/internal/storage"
-	raftstorage "github.com/hashicorp/consul/internal/storage/raft"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/types"
 	"github.com/hashicorp/go-raftchunking"
@@ -1510,49 +1499,6 @@ func TestFSM_ConfigEntry_DeleteCAS(t *testing.T) {
 	require.True(t, didDelete)
 }
 
-func TestFSM_Resources(t *testing.T) {
-	t.Parallel()
-
-	logger := testutil.Logger(t)
-
-	handle := &testRaftHandle{}
-	storageBackend := newStorageBackend(t, handle)
-	fsm := NewFromDeps(Deps{
-		Logger:         logger,
-		NewStateStore:  func() *state.Store { return state.NewStateStore(nil) },
-		StorageBackend: storageBackend,
-	})
-	handle.apply = func(msg []byte) (any, error) {
-		buf := append(
-			[]byte{uint8(structs.ResourceOperationType)},
-			msg...,
-		)
-		return fsm.Apply(makeLog(buf)), nil
-	}
-
-	resource, err := storageBackend.WriteCAS(context.Background(), &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "test",
-				GroupVersion: "v1",
-				Kind:         "foo",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "default",
-				PeerName:  "local",
-				Namespace: "default",
-			},
-			Name: "bar",
-			Uid:  "a",
-		},
-	})
-	require.NoError(t, err)
-
-	storedResource, err := storageBackend.Read(context.Background(), storage.EventualConsistency, resource.Id)
-	require.NoError(t, err)
-	prototest.AssertDeepEqual(t, resource, storedResource)
-}
-
 // This adapts another test by chunking the encoded data and then performing
 // out-of-order applies of half the logs. It then snapshots, restores to a new
 // FSM, and applies the rest. The goal is to verify that chunking snapshotting
@@ -1565,14 +1511,8 @@ func TestFSM_Chunking_Lifecycle(t *testing.T) {
 	t.Parallel()
 
 	logger := testutil.Logger(t)
-
-	fsm := NewFromDeps(Deps{
-		Logger: logger,
-		NewStateStore: func() *state.Store {
-			return state.NewStateStore(nil)
-		},
-		StorageBackend: newStorageBackend(t, nil),
-	})
+	fsm, err := New(nil, logger)
+	require.NoError(t, err)
 
 	var logOfLogs [][]*raft.Log
 	for i := 0; i < 10; i++ {
@@ -1647,13 +1587,8 @@ func TestFSM_Chunking_Lifecycle(t *testing.T) {
 	err = snap.Persist(sink)
 	require.NoError(t, err)
 
-	fsm2 := NewFromDeps(Deps{
-		Logger: logger,
-		NewStateStore: func() *state.Store {
-			return state.NewStateStore(nil)
-		},
-		StorageBackend: newStorageBackend(t, nil),
-	})
+	fsm2, err := New(nil, logger)
+	require.NoError(t, err)
 	err = fsm2.Restore(sink)
 	require.NoError(t, err)
 
@@ -1780,27 +1715,3 @@ func TestFSM_Chunking_TermChange(t *testing.T) {
 		}
 	}
 }
-
-func newStorageBackend(t *testing.T, handle raftstorage.Handle) *raftstorage.Backend {
-	t.Helper()
-
-	backend, err := raftstorage.NewBackend(handle, testutil.Logger(t))
-	require.NoError(t, err)
-
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-	go backend.Run(ctx)
-
-	return backend
-}
-
-type testRaftHandle struct {
-	apply func(msg []byte) (any, error)
-}
-
-func (h *testRaftHandle) Apply(msg []byte) (any, error)              { return h.apply(msg) }
-func (testRaftHandle) IsLeader() bool                                { return true }
-func (testRaftHandle) EnsureStrongConsistency(context.Context) error { return nil }
-func (testRaftHandle) DialLeader() (*grpc.ClientConn, error) {
-	return nil, errors.New("DialLeader not implemented")
-}
diff --git a/agent/consul/fsm/fsm.go b/agent/consul/fsm/fsm.go
index 92a3931b5b331..afa922143a8f5 100644
--- a/agent/consul/fsm/fsm.go
+++ b/agent/consul/fsm/fsm.go
@@ -1,10 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package fsm
 
 import (
-	"errors"
 	"fmt"
 	"io"
 	"sync"
@@ -19,7 +15,6 @@ import (
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
-	raftstorage "github.com/hashicorp/consul/internal/storage/raft"
 	"github.com/hashicorp/consul/logging"
 )
 
@@ -74,11 +69,7 @@ func New(gc *state.TombstoneGC, logger hclog.Logger) (*FSM, error) {
 	newStateStore := func() *state.Store {
 		return state.NewStateStore(gc)
 	}
-	return NewFromDeps(Deps{
-		Logger:         logger,
-		NewStateStore:  newStateStore,
-		StorageBackend: NullStorageBackend,
-	}), nil
+	return NewFromDeps(Deps{Logger: logger, NewStateStore: newStateStore}), nil
 }
 
 // Deps are dependencies used to construct the FSM.
@@ -92,33 +83,6 @@ type Deps struct {
 	NewStateStore func() *state.Store
 
 	Publisher *stream.EventPublisher
-
-	// StorageBackend is the storage backend used by the resource service, it
-	// manages its own state and has methods for handling Raft logs, snapshotting,
-	// and restoring snapshots.
-	StorageBackend StorageBackend
-}
-
-// StorageBackend contains the methods on the Raft resource storage backend that
-// are used by the FSM. See the internal/storage/raft package docs for more info.
-type StorageBackend interface {
-	Apply(buf []byte, idx uint64) any
-	Snapshot() (*raftstorage.Snapshot, error)
-	Restore() (*raftstorage.Restoration, error)
-}
-
-// NullStorageBackend can be used as the StorageBackend dependency in tests
-// that won't exercize resource storage or snapshotting.
-var NullStorageBackend StorageBackend = nullStorageBackend{}
-
-type nullStorageBackend struct{}
-
-func (nullStorageBackend) Apply([]byte, uint64) any { return errors.New("NullStorageBackend in use") }
-func (nullStorageBackend) Snapshot() (*raftstorage.Snapshot, error) {
-	return nil, errors.New("NullStorageBackend in use")
-}
-func (nullStorageBackend) Restore() (*raftstorage.Restoration, error) {
-	return nil, errors.New("NullStorageBackend in use")
 }
 
 // NewFromDeps creates a new FSM from its dependencies.
@@ -126,9 +90,6 @@ func NewFromDeps(deps Deps) *FSM {
 	if deps.Logger == nil {
 		deps.Logger = hclog.New(&hclog.LoggerOptions{})
 	}
-	if deps.StorageBackend == nil {
-		panic("StorageBackend is required")
-	}
 
 	fsm := &FSM{
 		deps:   deps,
@@ -208,15 +169,9 @@ func (c *FSM) Snapshot() (raft.FSMSnapshot, error) {
 		return nil, err
 	}
 
-	storageSnapshot, err := c.deps.StorageBackend.Snapshot()
-	if err != nil {
-		return nil, err
-	}
-
 	return &snapshot{
-		state:           c.state.Snapshot(),
-		chunkState:      chunkState,
-		storageSnapshot: storageSnapshot,
+		state:      c.state.Snapshot(),
+		chunkState: chunkState,
 	}, nil
 }
 
@@ -231,12 +186,6 @@ func (c *FSM) Restore(old io.ReadCloser) error {
 	restore := stateNew.Restore()
 	defer restore.Abort()
 
-	storageRestoration, err := c.deps.StorageBackend.Restore()
-	if err != nil {
-		return err
-	}
-	defer storageRestoration.Abort()
-
 	handler := func(header *SnapshotHeader, msg structs.MessageType, dec *codec.Decoder) error {
 		switch {
 		case msg == structs.ChunkingStateType:
@@ -249,14 +198,6 @@ func (c *FSM) Restore(old io.ReadCloser) error {
 			if err := c.chunker.RestoreState(chunkState); err != nil {
 				return err
 			}
-		case msg == structs.ResourceOperationType:
-			var b []byte
-			if err := dec.Decode(&b); err != nil {
-				return err
-			}
-			if err := storageRestoration.Apply(b); err != nil {
-				return err
-			}
 		case restorers[msg] != nil:
 			fn := restorers[msg]
 			if err := fn(header, restore, dec); err != nil {
@@ -278,7 +219,6 @@ func (c *FSM) Restore(old io.ReadCloser) error {
 	if err := restore.Commit(); err != nil {
 		return err
 	}
-	storageRestoration.Commit()
 
 	// External code might be calling State(), so we need to synchronize
 	// here to make sure we swap in the new state store atomically.
@@ -350,91 +290,97 @@ func (c *FSM) registerStreamSnapshotHandlers() {
 	err := c.deps.Publisher.RegisterHandler(state.EventTopicServiceHealth, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 		return c.State().ServiceHealthSnapshot(req, buf)
 	}, false)
-	panicIfErr(err)
+	if err != nil {
+		panic(fmt.Errorf("fatal error encountered registering streaming snapshot handlers: %w", err))
+	}
 
 	err = c.deps.Publisher.RegisterHandler(state.EventTopicServiceHealthConnect, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 		return c.State().ServiceHealthSnapshot(req, buf)
 	}, false)
-	panicIfErr(err)
+	if err != nil {
+		panic(fmt.Errorf("fatal error encountered registering streaming snapshot handlers: %w", err))
+	}
 
 	err = c.deps.Publisher.RegisterHandler(state.EventTopicCARoots, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 		return c.State().CARootsSnapshot(req, buf)
 	}, false)
-	panicIfErr(err)
+	if err != nil {
+		panic(fmt.Errorf("fatal error encountered registering streaming snapshot handlers: %w", err))
+	}
 
 	err = c.deps.Publisher.RegisterHandler(state.EventTopicMeshConfig, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 		return c.State().MeshConfigSnapshot(req, buf)
 	}, true)
-	panicIfErr(err)
+	if err != nil {
+		panic(fmt.Errorf("fatal error encountered registering streaming snapshot handlers: %w", err))
+	}
 
 	err = c.deps.Publisher.RegisterHandler(state.EventTopicServiceResolver, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 		return c.State().ServiceResolverSnapshot(req, buf)
 	}, true)
-	panicIfErr(err)
+	if err != nil {
+		panic(fmt.Errorf("fatal error encountered registering streaming snapshot handlers: %w", err))
+	}
 
 	err = c.deps.Publisher.RegisterHandler(state.EventTopicIngressGateway, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 		return c.State().IngressGatewaySnapshot(req, buf)
 	}, true)
-	panicIfErr(err)
+	if err != nil {
+		panic(fmt.Errorf("fatal error encountered registering streaming snapshot handlers: %w", err))
+	}
 
 	err = c.deps.Publisher.RegisterHandler(state.EventTopicServiceIntentions, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 		return c.State().ServiceIntentionsSnapshot(req, buf)
 	}, true)
-	panicIfErr(err)
+	if err != nil {
+		panic(fmt.Errorf("fatal error encountered registering streaming snapshot handlers: %w", err))
+	}
 
 	err = c.deps.Publisher.RegisterHandler(state.EventTopicServiceList, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 		return c.State().ServiceListSnapshot(req, buf)
 	}, true)
-	panicIfErr(err)
+	if err != nil {
+		panic(fmt.Errorf("fatal error encountered registering streaming snapshot handlers: %w", err))
+	}
 
 	err = c.deps.Publisher.RegisterHandler(state.EventTopicServiceDefaults, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 		return c.State().ServiceDefaultsSnapshot(req, buf)
 	}, true)
-	panicIfErr(err)
+	if err != nil {
+		panic(fmt.Errorf("fatal error encountered registering streaming snapshot handlers: %w", err))
+	}
 
 	err = c.deps.Publisher.RegisterHandler(state.EventTopicAPIGateway, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 		return c.State().APIGatewaySnapshot(req, buf)
 	}, true)
-	panicIfErr(err)
+	if err != nil {
+		panic(fmt.Errorf("fatal error encountered registering streaming snapshot handlers: %w", err))
+	}
 
 	err = c.deps.Publisher.RegisterHandler(state.EventTopicInlineCertificate, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 		return c.State().InlineCertificateSnapshot(req, buf)
 	}, true)
-	panicIfErr(err)
+	if err != nil {
+		panic(fmt.Errorf("fatal error encountered registering streaming snapshot handlers: %w", err))
+	}
 
 	err = c.deps.Publisher.RegisterHandler(state.EventTopicHTTPRoute, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 		return c.State().HTTPRouteSnapshot(req, buf)
 	}, true)
-	panicIfErr(err)
+	if err != nil {
+		panic(fmt.Errorf("fatal error encountered registering streaming snapshot handlers: %w", err))
+	}
 
 	err = c.deps.Publisher.RegisterHandler(state.EventTopicTCPRoute, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 		return c.State().TCPRouteSnapshot(req, buf)
 	}, true)
-	panicIfErr(err)
+	if err != nil {
+		panic(fmt.Errorf("fatal error encountered registering streaming snapshot handlers: %w", err))
+	}
 
 	err = c.deps.Publisher.RegisterHandler(state.EventTopicBoundAPIGateway, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 		return c.State().BoundAPIGatewaySnapshot(req, buf)
 	}, true)
-	panicIfErr(err)
-
-	err = c.deps.Publisher.RegisterHandler(state.EventTopicIPRateLimit, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
-		return c.State().IPRateLimiterSnapshot(req, buf)
-	}, true)
-	panicIfErr(err)
-
-	err = c.deps.Publisher.RegisterHandler(state.EventTopicSamenessGroup, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
-		return c.State().SamenessGroupSnapshot(req, buf)
-	}, true)
-	panicIfErr(err)
-
-	err = c.deps.Publisher.RegisterHandler(state.EventTopicJWTProvider, func(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
-		return c.State().JWTProviderSnapshot(req, buf)
-	}, true)
-
-	panicIfErr(err)
-}
-
-func panicIfErr(err error) {
 	if err != nil {
 		panic(fmt.Errorf("fatal error encountered registering streaming snapshot handlers: %w", err))
 	}
diff --git a/agent/consul/fsm/fsm_test.go b/agent/consul/fsm/fsm_test.go
index 839401014b52e..43244da235e9b 100644
--- a/agent/consul/fsm/fsm_test.go
+++ b/agent/consul/fsm/fsm_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package fsm
 
 import (
diff --git a/agent/consul/fsm/log_verification_chunking_shim.go b/agent/consul/fsm/log_verification_chunking_shim.go
index 4f40c1820b74d..5b90fbeb4243d 100644
--- a/agent/consul/fsm/log_verification_chunking_shim.go
+++ b/agent/consul/fsm/log_verification_chunking_shim.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package fsm
 
 import (
diff --git a/agent/consul/fsm/snapshot.go b/agent/consul/fsm/snapshot.go
index 24c8450cad2c1..76b3651894f10 100644
--- a/agent/consul/fsm/snapshot.go
+++ b/agent/consul/fsm/snapshot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package fsm
 
 import (
@@ -9,13 +6,11 @@ import (
 
 	"github.com/armon/go-metrics"
 	"github.com/armon/go-metrics/prometheus"
-	"github.com/hashicorp/go-raftchunking"
-	"github.com/hashicorp/raft"
-
 	"github.com/hashicorp/consul-net-rpc/go-msgpack/codec"
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/structs"
-	raftstorage "github.com/hashicorp/consul/internal/storage/raft"
+	"github.com/hashicorp/go-raftchunking"
+	"github.com/hashicorp/raft"
 )
 
 var cePersister, entPersister persister
@@ -31,9 +26,8 @@ var SnapshotSummaries = []prometheus.SummaryDefinition{
 // state in a way that can be accessed concurrently with operations
 // that may modify the live state.
 type snapshot struct {
-	state           *state.Snapshot
-	chunkState      *raftchunking.State
-	storageSnapshot *raftstorage.Snapshot
+	state      *state.Snapshot
+	chunkState *raftchunking.State
 }
 
 // SnapshotHeader is the first entry in our snapshot
diff --git a/agent/consul/fsm/snapshot_ce.go b/agent/consul/fsm/snapshot_ce.go
index 0fcd38703661f..68562e54f481f 100644
--- a/agent/consul/fsm/snapshot_ce.go
+++ b/agent/consul/fsm/snapshot_ce.go
@@ -1,20 +1,16 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package fsm
 
 import (
 	"fmt"
 	"net"
 
+	"github.com/hashicorp/consul-net-rpc/go-msgpack/codec"
 	"github.com/hashicorp/raft"
 	"github.com/mitchellh/mapstructure"
 
-	"github.com/hashicorp/consul-net-rpc/go-msgpack/codec"
-
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 func init() {
@@ -104,9 +100,6 @@ func persistCE(s *snapshot, sink raft.SnapshotSink, encoder *codec.Encoder) erro
 	if err := s.persistPeeringSecrets(sink, encoder); err != nil {
 		return err
 	}
-	if err := s.persistResources(sink, encoder); err != nil {
-		return err
-	}
 	return nil
 }
 
@@ -612,25 +605,6 @@ func (s *snapshot) persistPeeringSecrets(sink raft.SnapshotSink, encoder *codec.
 	return nil
 }
 
-func (s *snapshot) persistResources(sink raft.SnapshotSink, encoder *codec.Encoder) error {
-	for {
-		v, err := s.storageSnapshot.Next()
-		if err != nil {
-			return err
-		}
-		if v == nil {
-			return nil
-		}
-
-		if _, err := sink.Write([]byte{byte(structs.ResourceOperationType)}); err != nil {
-			return err
-		}
-		if err := encoder.Encode(v); err != nil {
-			return err
-		}
-	}
-}
-
 func restoreRegistration(header *SnapshotHeader, restore *state.Restore, decoder *codec.Decoder) error {
 	var req structs.RegisterRequest
 	if err := decoder.Decode(&req); err != nil {
diff --git a/agent/consul/fsm/snapshot_ce_test.go b/agent/consul/fsm/snapshot_ce_test.go
index 70ab2000faa41..13c5b1dcc402e 100644
--- a/agent/consul/fsm/snapshot_ce_test.go
+++ b/agent/consul/fsm/snapshot_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package fsm
 
@@ -9,30 +7,18 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/hashicorp/consul-net-rpc/go-msgpack/codec"
+	"github.com/stretchr/testify/require"
 
-	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
 func TestRestoreFromEnterprise(t *testing.T) {
-	logger := testutil.Logger(t)
-
-	handle := &testRaftHandle{}
-	storageBackend := newStorageBackend(t, handle)
-	handle.apply = func(buf []byte) (any, error) { return storageBackend.Apply(buf, 123), nil }
-
-	fsm := NewFromDeps(Deps{
-		Logger: logger,
-		NewStateStore: func() *state.Store {
-			return state.NewStateStore(nil)
-		},
-		StorageBackend: storageBackend,
-	})
 
+	logger := testutil.Logger(t)
+	fsm, err := New(nil, logger)
+	require.NoError(t, err)
 	// To verify if a proper message is displayed when Consul CE tries to
 	//  unsuccessfully restore entries from a Consul Ent snapshot.
 	buf := bytes.NewBuffer(nil)
diff --git a/agent/consul/fsm/snapshot_test.go b/agent/consul/fsm/snapshot_test.go
index 22d6f5e956eea..9ba3ba32f1c5e 100644
--- a/agent/consul/fsm/snapshot_test.go
+++ b/agent/consul/fsm/snapshot_test.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package fsm
 
 import (
 	"bytes"
-	"context"
 	"net"
 	"testing"
 	"time"
@@ -19,11 +15,9 @@ import (
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/internal/storage"
 	"github.com/hashicorp/consul/lib/stringslice"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
@@ -31,20 +25,8 @@ func TestFSM_SnapshotRestore_CE(t *testing.T) {
 	t.Parallel()
 
 	logger := testutil.Logger(t)
-
-	handle := &testRaftHandle{}
-	storageBackend := newStorageBackend(t, handle)
-	handle.apply = func(buf []byte) (any, error) { return storageBackend.Apply(buf, 123), nil }
-
-	fsm := NewFromDeps(Deps{
-		Logger: logger,
-		NewStateStore: func() *state.Store {
-			return state.NewStateStore(nil)
-		},
-		StorageBackend: storageBackend,
-	})
-
-	fsm.state.SystemMetadataSet(10, &structs.SystemMetadataEntry{Key: structs.SystemMetadataVirtualIPsEnabled, Value: "true"})
+	fsm, err := New(nil, logger)
+	require.NoError(t, err)
 
 	// Add some state
 	node1 := &structs.Node{
@@ -81,14 +63,8 @@ func TestFSM_SnapshotRestore_CE(t *testing.T) {
 		Connect: connectConf,
 	})
 
-	psn := structs.PeeredServiceName{ServiceName: structs.NewServiceName("web", nil)}
-	vip, err := fsm.state.VirtualIPForService(psn)
-	require.NoError(t, err)
-	require.Equal(t, vip, "240.0.0.1")
-
 	fsm.state.EnsureService(4, "foo", &structs.NodeService{ID: "db", Service: "db", Tags: []string{"primary"}, Address: "127.0.0.1", Port: 5000})
 	fsm.state.EnsureService(5, "baz", &structs.NodeService{ID: "web", Service: "web", Tags: nil, Address: "127.0.0.2", Port: 80})
-
 	fsm.state.EnsureService(6, "baz", &structs.NodeService{ID: "db", Service: "db", Tags: []string{"secondary"}, Address: "127.0.0.2", Port: 5000})
 	fsm.state.EnsureCheck(7, &structs.HealthCheck{
 		Node:      "foo",
@@ -450,10 +426,6 @@ func TestFSM_SnapshotRestore_CE(t *testing.T) {
 		},
 	}
 	require.NoError(t, fsm.state.EnsureConfigEntry(26, serviceIxn))
-	psn = structs.PeeredServiceName{ServiceName: structs.NewServiceName("foo", nil)}
-	vip, err = fsm.state.VirtualIPForService(psn)
-	require.NoError(t, err)
-	require.Equal(t, vip, "240.0.0.2")
 
 	// mesh config entry
 	meshConfig := &structs.MeshConfigEntry{
@@ -477,10 +449,10 @@ func TestFSM_SnapshotRestore_CE(t *testing.T) {
 		Port:    8000,
 		Connect: connectConf,
 	})
-	psn = structs.PeeredServiceName{ServiceName: structs.NewServiceName("frontend", nil)}
-	vip, err = fsm.state.VirtualIPForService(psn)
+	psn := structs.PeeredServiceName{ServiceName: structs.NewServiceName("frontend", nil)}
+	vip, err := fsm.state.VirtualIPForService(psn)
 	require.NoError(t, err)
-	require.Equal(t, vip, "240.0.0.3")
+	require.Equal(t, vip, "240.0.0.1")
 
 	fsm.state.EnsureService(30, "foo", &structs.NodeService{
 		ID:      "backend",
@@ -492,7 +464,7 @@ func TestFSM_SnapshotRestore_CE(t *testing.T) {
 	psn = structs.PeeredServiceName{ServiceName: structs.NewServiceName("backend", nil)}
 	vip, err = fsm.state.VirtualIPForService(psn)
 	require.NoError(t, err)
-	require.Equal(t, vip, "240.0.0.4")
+	require.Equal(t, vip, "240.0.0.2")
 
 	_, serviceNames, err := fsm.state.ServiceNamesOfKind(nil, structs.ServiceKindTypical)
 	require.NoError(t, err)
@@ -546,35 +518,6 @@ func TestFSM_SnapshotRestore_CE(t *testing.T) {
 		},
 	}))
 
-	// Add a service-resolver entry to get a virtual IP for service goo
-	resolverEntry := &structs.ServiceResolverConfigEntry{
-		Kind: structs.ServiceResolver,
-		Name: "goo",
-	}
-	require.NoError(t, fsm.state.EnsureConfigEntry(34, resolverEntry))
-	vip, err = fsm.state.VirtualIPForService(structs.PeeredServiceName{ServiceName: structs.NewServiceName("goo", nil)})
-	require.NoError(t, err)
-	require.Equal(t, vip, "240.0.0.5")
-
-	// Resources
-	resource, err := storageBackend.WriteCAS(context.Background(), &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "test",
-				GroupVersion: "v1",
-				Kind:         "foo",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "default",
-				PeerName:  "local",
-				Namespace: "default",
-			},
-			Name: "bar",
-			Uid:  "a",
-		},
-	})
-	require.NoError(t, err)
-
 	// Snapshot
 	snap, err := fsm.Snapshot()
 	require.NoError(t, err)
@@ -613,15 +556,8 @@ func TestFSM_SnapshotRestore_CE(t *testing.T) {
 	require.NoError(t, encoder.Encode(&token2))
 
 	// Try to restore on a new FSM
-	storageBackend2 := newStorageBackend(t, nil)
-
-	fsm2 := NewFromDeps(Deps{
-		Logger: logger,
-		NewStateStore: func() *state.Store {
-			return state.NewStateStore(nil)
-		},
-		StorageBackend: storageBackend2,
-	})
+	fsm2, err := New(nil, logger)
+	require.NoError(t, err)
 
 	// Do a restore
 	require.NoError(t, fsm2.Restore(sink))
@@ -677,26 +613,14 @@ func TestFSM_SnapshotRestore_CE(t *testing.T) {
 	require.Equal(t, uint64(25), checks[0].ModifyIndex)
 
 	// Verify virtual IPs are consistent.
-	psn = structs.PeeredServiceName{ServiceName: structs.NewServiceName("web", nil)}
-	vip, err = fsm2.state.VirtualIPForService(psn)
-	require.NoError(t, err)
-	require.Equal(t, vip, "240.0.0.1")
-	psn = structs.PeeredServiceName{ServiceName: structs.NewServiceName("foo", nil)}
-	vip, err = fsm2.state.VirtualIPForService(psn)
-	require.NoError(t, err)
-	require.Equal(t, vip, "240.0.0.2")
 	psn = structs.PeeredServiceName{ServiceName: structs.NewServiceName("frontend", nil)}
 	vip, err = fsm2.state.VirtualIPForService(psn)
 	require.NoError(t, err)
-	require.Equal(t, vip, "240.0.0.3")
+	require.Equal(t, vip, "240.0.0.1")
 	psn = structs.PeeredServiceName{ServiceName: structs.NewServiceName("backend", nil)}
 	vip, err = fsm2.state.VirtualIPForService(psn)
 	require.NoError(t, err)
-	require.Equal(t, vip, "240.0.0.4")
-	psn = structs.PeeredServiceName{ServiceName: structs.NewServiceName("goo", nil)}
-	vip, err = fsm2.state.VirtualIPForService(psn)
-	require.NoError(t, err)
-	require.Equal(t, vip, "240.0.0.5")
+	require.Equal(t, vip, "240.0.0.2")
 
 	// Verify key is set
 	_, d, err := fsm2.state.KVSGet(nil, "/test", nil)
@@ -915,11 +839,6 @@ func TestFSM_SnapshotRestore_CE(t *testing.T) {
 	require.Len(t, ptbRestored.RootPEMs, 1)
 	require.Equal(t, "qux certificate bundle", ptbRestored.RootPEMs[0])
 
-	// Verify resources are restored.
-	resourceRestored, err := storageBackend2.Read(context.Background(), storage.EventualConsistency, resource.Id)
-	require.NoError(t, err)
-	prototest.AssertDeepEqual(t, resource, resourceRestored)
-
 	// Snapshot
 	snap, err = fsm2.Snapshot()
 	require.NoError(t, err)
@@ -945,14 +864,8 @@ func TestFSM_BadRestore_CE(t *testing.T) {
 	t.Parallel()
 	// Create an FSM with some state.
 	logger := testutil.Logger(t)
-
-	fsm := NewFromDeps(Deps{
-		Logger: logger,
-		NewStateStore: func() *state.Store {
-			return state.NewStateStore(nil)
-		},
-		StorageBackend: newStorageBackend(t, nil),
-	})
+	fsm, err := New(nil, logger)
+	require.NoError(t, err)
 	fsm.state.EnsureNode(1, &structs.Node{Node: "foo", Address: "127.0.0.1"})
 	abandonCh := fsm.state.AbandonCh()
 
@@ -982,14 +895,8 @@ func TestFSM_BadSnapshot_NilCAConfig(t *testing.T) {
 
 	// Create an FSM with no config entry.
 	logger := testutil.Logger(t)
-
-	fsm := NewFromDeps(Deps{
-		Logger: logger,
-		NewStateStore: func() *state.Store {
-			return state.NewStateStore(nil)
-		},
-		StorageBackend: newStorageBackend(t, nil),
-	})
+	fsm, err := New(nil, logger)
+	require.NoError(t, err)
 
 	// Snapshot
 	snap, err := fsm.Snapshot()
@@ -1002,13 +909,8 @@ func TestFSM_BadSnapshot_NilCAConfig(t *testing.T) {
 	require.NoError(t, snap.Persist(sink))
 
 	// Try to restore on a new FSM
-	fsm2 := NewFromDeps(Deps{
-		Logger: logger,
-		NewStateStore: func() *state.Store {
-			return state.NewStateStore(nil)
-		},
-		StorageBackend: newStorageBackend(t, nil),
-	})
+	fsm2, err := New(nil, logger)
+	require.NoError(t, err)
 
 	// Do a restore
 	require.NoError(t, fsm2.Restore(sink))
@@ -1044,14 +946,8 @@ func Test_restoreServiceVirtualIP(t *testing.T) {
 		dec := codec.NewDecoder(buf, structs.MsgpackHandle)
 
 		logger := testutil.Logger(t)
-
-		fsm := NewFromDeps(Deps{
-			Logger: logger,
-			NewStateStore: func() *state.Store {
-				return state.NewStateStore(nil)
-			},
-			StorageBackend: newStorageBackend(t, nil),
-		})
+		fsm, err := New(nil, logger)
+		require.NoError(t, err)
 
 		restore := fsm.State().Restore()
 
diff --git a/agent/consul/gateway_locator.go b/agent/consul/gateway_locator.go
index 6503ca0c979d5..756592bce716d 100644
--- a/agent/consul/gateway_locator.go
+++ b/agent/consul/gateway_locator.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/gateway_locator_test.go b/agent/consul/gateway_locator_test.go
index a3e9da3d69007..622445e2261fa 100644
--- a/agent/consul/gateway_locator_test.go
+++ b/agent/consul/gateway_locator_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/gateways/controller_gateways.go b/agent/consul/gateways/controller_gateways.go
index 24e1dd4c275a0..da595d915a80e 100644
--- a/agent/consul/gateways/controller_gateways.go
+++ b/agent/consul/gateways/controller_gateways.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package gateways
 
 import (
@@ -63,8 +60,6 @@ func (r *apiGatewayReconciler) Reconcile(ctx context.Context, req controller.Req
 		return reconcileEntry(r.fsm.State(), r.logger, ctx, req, r.reconcileTCPRoute, r.cleanupRoute)
 	case structs.InlineCertificate:
 		return r.enqueueCertificateReferencedGateways(r.fsm.State(), ctx, req)
-	case structs.JWTProvider:
-		return r.enqueueJWTProviderReferencedGatewaysAndHTTPRoutes(r.fsm.State(), ctx, req)
 	default:
 		return nil
 	}
@@ -235,18 +230,7 @@ func (r *apiGatewayReconciler) reconcileGateway(_ context.Context, req controlle
 		logger.Warn("error retrieving bound api gateway", "error", err)
 		return err
 	}
-
-	_, jwtProvidersConfigEntries, err := store.ConfigEntriesByKind(nil, structs.JWTProvider, wildcardMeta())
-	if err != nil {
-		return err
-	}
-
-	jwtProviders := make(map[string]*structs.JWTProviderConfigEntry, len(jwtProvidersConfigEntries))
-	for _, provider := range jwtProvidersConfigEntries {
-		jwtProviders[provider.GetName()] = provider.(*structs.JWTProviderConfigEntry)
-	}
-
-	meta := newGatewayMeta(gateway, bound, jwtProviders)
+	meta := newGatewayMeta(gateway, bound)
 
 	certificateErrors, err := meta.checkCertificates(store)
 	if err != nil {
@@ -254,22 +238,16 @@ func (r *apiGatewayReconciler) reconcileGateway(_ context.Context, req controlle
 		return err
 	}
 
-	jwtErrors, err := meta.checkJWTProviders()
-	if err != nil {
-		logger.Warn("error checking gateway JWT Providers", "error", err)
-		return err
-	}
-
-	// set each listener as having resolved refs, then overwrite that status condition
+	// set each listener as having valid certs, then overwrite that status condition
 	// if there are any certificate errors
-	meta.eachListener(func(_ *structs.APIGatewayListener, bound *structs.BoundAPIGatewayListener) error {
+	meta.eachListener(func(listener *structs.APIGatewayListener, bound *structs.BoundAPIGatewayListener) error {
 		listenerRef := structs.ResourceReference{
 			Kind:           structs.APIGateway,
 			Name:           meta.BoundGateway.Name,
 			SectionName:    bound.Name,
 			EnterpriseMeta: meta.BoundGateway.EnterpriseMeta,
 		}
-		updater.SetCondition(resolvedRefs(listenerRef))
+		updater.SetCondition(validCertificate(listenerRef))
 		return nil
 	})
 
@@ -277,19 +255,9 @@ func (r *apiGatewayReconciler) reconcileGateway(_ context.Context, req controlle
 		updater.SetCondition(invalidCertificate(ref, err))
 	}
 
-	for ref, err := range jwtErrors {
-		updater.SetCondition(invalidJWTProvider(ref, err))
-	}
-
 	if len(certificateErrors) > 0 {
 		updater.SetCondition(invalidCertificates())
-	}
-
-	if len(jwtErrors) > 0 {
-		updater.SetCondition(invalidJWTProviders())
-	}
-
-	if len(certificateErrors) == 0 && len(jwtErrors) == 0 {
+	} else {
 		updater.SetCondition(gatewayAccepted())
 	}
 
@@ -565,11 +533,6 @@ func NewAPIGatewayController(fsm *fsm.FSM, publisher state.EventPublisher, updat
 		&stream.SubscribeRequest{
 			Topic:   state.EventTopicInlineCertificate,
 			Subject: stream.SubjectWildcard,
-		},
-	).Subscribe(
-		&stream.SubscribeRequest{
-			Topic:   state.EventTopicJWTProvider,
-			Subject: stream.SubjectWildcard,
 		})
 }
 
@@ -592,10 +555,6 @@ type gatewayMeta struct {
 	// the map values are pointers so that we can update them directly
 	// and have the changes propagate back to the container gateways.
 	boundListeners map[string]*structs.BoundAPIGatewayListener
-	// jwtProviders holds the list of all the JWT Providers in a given partition
-	// we expect this list to be relatively small so we're okay with holding them all
-	// in memory
-	jwtProviders map[string]*structs.JWTProviderConfigEntry
 }
 
 // getAllGatewayMeta returns a pre-constructed list of all valid gateway and state
@@ -611,16 +570,6 @@ func getAllGatewayMeta(store *state.Store) ([]*gatewayMeta, error) {
 		return nil, err
 	}
 
-	_, jwtProvidersConfigEntries, err := store.ConfigEntriesByKind(nil, structs.JWTProvider, wildcardMeta())
-	if err != nil {
-		return nil, err
-	}
-
-	jwtProviders := make(map[string]*structs.JWTProviderConfigEntry, len(jwtProvidersConfigEntries))
-	for _, provider := range jwtProvidersConfigEntries {
-		jwtProviders[provider.GetName()] = provider.(*structs.JWTProviderConfigEntry)
-	}
-
 	meta := make([]*gatewayMeta, 0, len(boundGateways))
 	for _, b := range boundGateways {
 		bound := b.(*structs.BoundAPIGatewayConfigEntry)
@@ -630,7 +579,6 @@ func getAllGatewayMeta(store *state.Store) ([]*gatewayMeta, error) {
 				meta = append(meta, (&gatewayMeta{
 					BoundGateway: bound,
 					Gateway:      gateway,
-					jwtProviders: jwtProviders,
 				}).initialize())
 				break
 			}
@@ -685,14 +633,6 @@ func (g *gatewayMeta) updateRouteBinding(route structs.BoundRoute) (bool, []stru
 			if err != nil {
 				errors[ref] = err
 			}
-
-			if httpRoute, ok := route.(*structs.HTTPRouteConfigEntry); ok {
-				var jwtErrors map[structs.ResourceReference]error
-				didBind, jwtErrors = g.validateJWTForRoute(httpRoute)
-				for ref, err := range jwtErrors {
-					errors[ref] = err
-				}
-			}
 			if didBind {
 				refDidBind = true
 				listenerBound[listener.Name] = true
@@ -704,7 +644,6 @@ func (g *gatewayMeta) updateRouteBinding(route structs.BoundRoute) (bool, []stru
 		if !refDidBind && errors[ref] == nil {
 			errors[ref] = fmt.Errorf("failed to bind route %s to gateway %s with listener '%s'", route.GetName(), g.Gateway.Name, ref.SectionName)
 		}
-
 		if refDidBind {
 			boundRefs = append(boundRefs, ref)
 		}
@@ -877,7 +816,7 @@ func (g *gatewayMeta) initialize() *gatewayMeta {
 }
 
 // newGatewayMeta returns an object that wraps the given APIGateway and BoundAPIGateway
-func newGatewayMeta(gateway *structs.APIGatewayConfigEntry, bound structs.ConfigEntry, jwtProviders map[string]*structs.JWTProviderConfigEntry) *gatewayMeta {
+func newGatewayMeta(gateway *structs.APIGatewayConfigEntry, bound structs.ConfigEntry) *gatewayMeta {
 	var b *structs.BoundAPIGatewayConfigEntry
 	if bound == nil {
 		b = &structs.BoundAPIGatewayConfigEntry{
@@ -903,7 +842,6 @@ func newGatewayMeta(gateway *structs.APIGatewayConfigEntry, bound structs.Config
 	return (&gatewayMeta{
 		BoundGateway: b,
 		Gateway:      gateway,
-		jwtProviders: jwtProviders,
 	}).initialize()
 }
 
@@ -918,10 +856,10 @@ func gatewayAccepted() structs.Condition {
 	)
 }
 
-// invalidCertificate returns a condition used when a gateway references a
-// certificate that does not exist. It takes a ref used to scope the condition
+// validCertificate returns a condition used when a gateway references a
+// certificate that does exist. It takes a ref used to scope the condition
 // to a given APIGateway listener.
-func resolvedRefs(ref structs.ResourceReference) structs.Condition {
+func validCertificate(ref structs.ResourceReference) structs.Condition {
 	return structs.NewGatewayCondition(
 		api.GatewayConditionResolvedRefs,
 		api.ConditionStatusTrue,
@@ -956,31 +894,6 @@ func invalidCertificates() structs.Condition {
 	)
 }
 
-// invalidJWTProvider returns a condition used when a gateway listener references
-// a JWTProvider that does not exist. It takes a ref used to scope the condition
-// to a given APIGateway listener.
-func invalidJWTProvider(ref structs.ResourceReference, err error) structs.Condition {
-	return structs.NewGatewayCondition(
-		api.GatewayConditionResolvedRefs,
-		api.ConditionStatusFalse,
-		api.GatewayListenerReasonInvalidJWTProviderRef,
-		err.Error(),
-		ref,
-	)
-}
-
-// invalidJWTProviders is used to set the overall condition of the APIGateway
-// to invalid due to missing JWT providers that it references.
-func invalidJWTProviders() structs.Condition {
-	return structs.NewGatewayCondition(
-		api.GatewayConditionAccepted,
-		api.ConditionStatusFalse,
-		api.GatewayReasonInvalidJWTProviders,
-		"gateway references invalid JWT Providers",
-		structs.ResourceReference{},
-	)
-}
-
 // gatewayListenerNoConflicts marks an APIGateway listener as having no conflicts within its
 // bound routes
 func gatewayListenerNoConflicts(ref structs.ResourceReference) structs.Condition {
diff --git a/agent/consul/gateways/controller_gateways_ce.go b/agent/consul/gateways/controller_gateways_ce.go
deleted file mode 100644
index 4e2aa9a523c84..0000000000000
--- a/agent/consul/gateways/controller_gateways_ce.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package gateways
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/agent/consul/controller"
-	"github.com/hashicorp/consul/agent/consul/state"
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-func (r *apiGatewayReconciler) enqueueJWTProviderReferencedGatewaysAndHTTPRoutes(_ *state.Store, _ context.Context, _ controller.Request) error {
-	return nil
-}
-
-func (m *gatewayMeta) checkJWTProviders() (map[structs.ResourceReference]error, error) {
-	return nil, nil
-}
-
-func (m *gatewayMeta) validateJWTForRoute(_ *structs.HTTPRouteConfigEntry) (bool, map[structs.ResourceReference]error) {
-	return true, nil
-}
diff --git a/agent/consul/gateways/controller_gateways_test.go b/agent/consul/gateways/controller_gateways_test.go
index 5acb06f0411b8..973cc4cb88913 100644
--- a/agent/consul/gateways/controller_gateways_test.go
+++ b/agent/consul/gateways/controller_gateways_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package gateways
 
 import (
@@ -11,13 +8,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/hashicorp/go-hclog"
+	"github.com/stretchr/testify/require"
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/consul/controller"
-	"github.com/hashicorp/consul/agent/consul/controller/queue"
 	"github.com/hashicorp/consul/agent/consul/fsm"
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/consul/stream"
@@ -2013,7 +2008,7 @@ func TestAPIGatewayController(t *testing.T) {
 								EnterpriseMeta: *defaultMeta,
 								SectionName:    "listener",
 							}),
-							resolvedRefs(structs.ResourceReference{
+							validCertificate(structs.ResourceReference{
 								Kind:           structs.APIGateway,
 								Name:           "gateway",
 								EnterpriseMeta: *defaultMeta,
@@ -2111,7 +2106,7 @@ func TestAPIGatewayController(t *testing.T) {
 								EnterpriseMeta: *defaultMeta,
 								SectionName:    "listener",
 							}),
-							resolvedRefs(structs.ResourceReference{
+							validCertificate(structs.ResourceReference{
 								Kind:           structs.APIGateway,
 								Name:           "gateway",
 								EnterpriseMeta: *defaultMeta,
@@ -2240,7 +2235,7 @@ func TestAPIGatewayController(t *testing.T) {
 								EnterpriseMeta: *defaultMeta,
 								SectionName:    "listener",
 							}),
-							resolvedRefs(structs.ResourceReference{
+							validCertificate(structs.ResourceReference{
 								Kind:           structs.APIGateway,
 								Name:           "gateway",
 								EnterpriseMeta: *defaultMeta,
@@ -2389,7 +2384,7 @@ func TestAPIGatewayController(t *testing.T) {
 								EnterpriseMeta: *defaultMeta,
 								SectionName:    "listener",
 							}),
-							resolvedRefs(structs.ResourceReference{
+							validCertificate(structs.ResourceReference{
 								Kind:           structs.APIGateway,
 								Name:           "gateway",
 								EnterpriseMeta: *defaultMeta,
@@ -2536,7 +2531,7 @@ func TestAPIGatewayController(t *testing.T) {
 								EnterpriseMeta: *defaultMeta,
 								SectionName:    "listener",
 							}),
-							resolvedRefs(structs.ResourceReference{
+							validCertificate(structs.ResourceReference{
 								Kind:           structs.APIGateway,
 								Name:           "gateway",
 								EnterpriseMeta: *defaultMeta,
@@ -2700,12 +2695,12 @@ func TestAPIGatewayController(t *testing.T) {
 								Name:        "gateway",
 								SectionName: "tcp-listener",
 							}),
-							resolvedRefs(structs.ResourceReference{
+							validCertificate(structs.ResourceReference{
 								Kind:        structs.APIGateway,
 								Name:        "gateway",
 								SectionName: "http-listener",
 							}),
-							resolvedRefs(structs.ResourceReference{
+							validCertificate(structs.ResourceReference{
 								Kind:        structs.APIGateway,
 								Name:        "gateway",
 								SectionName: "tcp-listener",
@@ -3054,7 +3049,7 @@ func TestAPIGatewayController(t *testing.T) {
 								Name:        "gateway",
 								SectionName: "http-listener",
 							}),
-							resolvedRefs(structs.ResourceReference{
+							validCertificate(structs.ResourceReference{
 								Kind:        structs.APIGateway,
 								Name:        "gateway",
 								SectionName: "http-listener",
@@ -3407,7 +3402,7 @@ func TestAPIGatewayController(t *testing.T) {
 								Name:        "gateway",
 								SectionName: "http-listener",
 							}),
-							resolvedRefs(structs.ResourceReference{
+							validCertificate(structs.ResourceReference{
 								Kind:        structs.APIGateway,
 								Name:        "gateway",
 								SectionName: "http-listener",
@@ -3504,12 +3499,12 @@ func TestAPIGatewayController(t *testing.T) {
 					},
 					Status: structs.Status{
 						Conditions: []structs.Condition{
-							resolvedRefs(structs.ResourceReference{
+							validCertificate(structs.ResourceReference{
 								Kind:        structs.APIGateway,
 								Name:        "gateway",
 								SectionName: "listener-1",
 							}),
-							resolvedRefs(structs.ResourceReference{
+							validCertificate(structs.ResourceReference{
 								Kind:        structs.APIGateway,
 								Name:        "gateway",
 								SectionName: "listener-2",
@@ -3728,7 +3723,7 @@ func TestAPIGatewayController(t *testing.T) {
 								Name:        "gateway",
 								SectionName: "invalid-listener",
 							}, errors.New("certificate \"missing certificate\" not found")),
-							resolvedRefs(structs.ResourceReference{
+							validCertificate(structs.ResourceReference{
 								Kind:        structs.APIGateway,
 								Name:        "gateway",
 								SectionName: "valid-listener",
@@ -3834,7 +3829,7 @@ func TestAPIGatewayController(t *testing.T) {
 								Name:        "gateway",
 								SectionName: "http-listener",
 							}),
-							resolvedRefs(structs.ResourceReference{
+							validCertificate(structs.ResourceReference{
 								Kind:        structs.APIGateway,
 								Name:        "gateway",
 								SectionName: "http-listener",
@@ -3952,8 +3947,7 @@ func TestAPIGatewayController(t *testing.T) {
 				NewStateStore: func() *state.Store {
 					return state.NewStateStoreWithEventPublisher(nil, publisher)
 				},
-				Publisher:      publisher,
-				StorageBackend: fsm.NullStorageBackend,
+				Publisher: publisher,
 			})
 
 			var index uint64
@@ -4072,8 +4066,7 @@ func TestNewAPIGatewayController(t *testing.T) {
 		NewStateStore: func() *state.Store {
 			return state.NewStateStoreWithEventPublisher(nil, publisher)
 		},
-		Publisher:      publisher,
-		StorageBackend: fsm.NullStorageBackend,
+		Publisher: publisher,
 	})
 
 	updater := &Updater{
@@ -4097,7 +4090,7 @@ func (n *noopController) Subscribe(request *stream.SubscribeRequest, transformer
 func (n *noopController) WithBackoff(base, max time.Duration) controller.Controller { return n }
 func (n *noopController) WithLogger(logger hclog.Logger) controller.Controller      { return n }
 func (n *noopController) WithWorkers(i int) controller.Controller                   { return n }
-func (n *noopController) WithQueueFactory(fn func(ctx context.Context, baseBackoff time.Duration, maxBackoff time.Duration) queue.WorkQueue[controller.Request]) controller.Controller {
+func (n *noopController) WithQueueFactory(fn func(ctx context.Context, baseBackoff time.Duration, maxBackoff time.Duration) controller.WorkQueue) controller.Controller {
 	return n
 }
 
diff --git a/agent/consul/grpc_integration_test.go b/agent/consul/grpc_integration_test.go
index 6ae49e09fa3aa..fa1ed48896554 100644
--- a/agent/consul/grpc_integration_test.go
+++ b/agent/consul/grpc_integration_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/health_endpoint.go b/agent/consul/health_endpoint.go
index d26bbcd3b6f2f..82d130946ba55 100644
--- a/agent/consul/health_endpoint.go
+++ b/agent/consul/health_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -226,14 +223,6 @@ func (h *Health) ServiceNodes(args *structs.ServiceSpecificRequest, reply *struc
 		return err
 	}
 
-	// If we're doing a connect or ingress query, we need read access to the service
-	// we're trying to find proxies for, so check that.
-	if args.Connect || args.Ingress {
-		if authz.ServiceRead(args.ServiceName, &authzContext) != acl.Allow {
-			return acl.ErrPermissionDenied
-		}
-	}
-
 	filter, err := bexpr.CreateFilter(args.Filter, nil, reply.Nodes)
 	if err != nil {
 		return err
@@ -255,6 +244,17 @@ func (h *Health) ServiceNodes(args *structs.ServiceSpecificRequest, reply *struc
 				return err
 			}
 
+			// If we're doing a connect or ingress query, we need read access to the service
+			// we're trying to find proxies for, so check that.
+			if args.Connect || args.Ingress {
+				// TODO(acl-error-enhancements) Look for ways to percolate this information up to give any feedback to the user.
+				if authz.ServiceRead(args.ServiceName, &authzContext) != acl.Allow {
+					// Return the index here so that the agent cache does not infinitely loop.
+					reply.Index = index
+					return nil
+				}
+			}
+
 			resolvedNodes := nodes
 			if args.MergeCentralConfig {
 				for _, node := range resolvedNodes {
diff --git a/agent/consul/health_endpoint_test.go b/agent/consul/health_endpoint_test.go
index b47159c229424..e31263a987185 100644
--- a/agent/consul/health_endpoint_test.go
+++ b/agent/consul/health_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -1125,8 +1122,9 @@ node "foo" {
 		QueryOptions: structs.QueryOptions{Token: token},
 	}
 	var resp structs.IndexedCheckServiceNodes
-	assert.ErrorContains(t, msgpackrpc.CallWithCodec(codec, "Health.ServiceNodes", &req, &resp), "Permission denied")
+	assert.Nil(t, msgpackrpc.CallWithCodec(codec, "Health.ServiceNodes", &req, &resp))
 	assert.Len(t, resp.Nodes, 0)
+	assert.Greater(t, resp.Index, uint64(0))
 
 	// List w/ token. This should work since we're requesting "foo", but should
 	// also only contain the proxies with names that adhere to our ACL.
@@ -1464,7 +1462,7 @@ func TestHealth_ServiceNodes_Ingress_ACL(t *testing.T) {
 		ServiceName: "db",
 		Ingress:     true,
 	}
-	require.ErrorContains(t, msgpackrpc.CallWithCodec(codec, "Health.ServiceNodes", &req, &out2), "Permission denied")
+	require.Nil(t, msgpackrpc.CallWithCodec(codec, "Health.ServiceNodes", &req, &out2))
 	require.Len(t, out2.Nodes, 0)
 
 	// Requesting a service that is not covered by the token's policy
@@ -1474,7 +1472,7 @@ func TestHealth_ServiceNodes_Ingress_ACL(t *testing.T) {
 		Ingress:      true,
 		QueryOptions: structs.QueryOptions{Token: token.SecretID},
 	}
-	require.ErrorContains(t, msgpackrpc.CallWithCodec(codec, "Health.ServiceNodes", &req, &out2), "Permission denied")
+	require.Nil(t, msgpackrpc.CallWithCodec(codec, "Health.ServiceNodes", &req, &out2))
 	require.Len(t, out2.Nodes, 0)
 
 	// Requesting service covered by the token's policy
diff --git a/agent/consul/helper_test.go b/agent/consul/helper_test.go
index d21523b8fecff..d21bb5d64b7e0 100644
--- a/agent/consul/helper_test.go
+++ b/agent/consul/helper_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/intention_endpoint.go b/agent/consul/intention_endpoint.go
index a3e4ad678b1d3..6ad053f7f6636 100644
--- a/agent/consul/intention_endpoint.go
+++ b/agent/consul/intention_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -179,7 +176,7 @@ func (s *Intention) computeApplyChangesLegacyCreate(
 	if !args.Intention.CanWrite(authz) {
 		sn := args.Intention.SourceServiceName()
 		dn := args.Intention.DestinationServiceName()
-		s.logger.Debug("Intention creation denied due to ACLs",
+		s.logger.Warn("Intention creation denied due to ACLs",
 			"source", sn.String(),
 			"destination", dn.String(),
 			"accessorID", acl.AliasIfAnonymousToken(accessorID))
@@ -252,7 +249,7 @@ func (s *Intention) computeApplyChangesLegacyUpdate(
 	}
 
 	if !ixn.CanWrite(authz) {
-		s.logger.Debug("Update operation on intention denied due to ACLs",
+		s.logger.Warn("Update operation on intention denied due to ACLs",
 			"intention", args.Intention.ID,
 			"accessorID", acl.AliasIfAnonymousToken(accessorID))
 		return nil, acl.ErrPermissionDenied
@@ -314,7 +311,7 @@ func (s *Intention) computeApplyChangesUpsert(
 	if !args.Intention.CanWrite(authz) {
 		sn := args.Intention.SourceServiceName()
 		dn := args.Intention.DestinationServiceName()
-		s.logger.Debug("Intention upsert denied due to ACLs",
+		s.logger.Warn("Intention upsert denied due to ACLs",
 			"source", sn.String(),
 			"destination", dn.String(),
 			"accessorID", acl.AliasIfAnonymousToken(accessorID))
@@ -373,7 +370,7 @@ func (s *Intention) computeApplyChangesLegacyDelete(
 	}
 
 	if !ixn.CanWrite(authz) {
-		s.logger.Debug("Deletion operation on intention denied due to ACLs",
+		s.logger.Warn("Deletion operation on intention denied due to ACLs",
 			"intention", args.Intention.ID,
 			"accessorID", acl.AliasIfAnonymousToken(accessorID))
 		return nil, acl.ErrPermissionDenied
@@ -395,7 +392,7 @@ func (s *Intention) computeApplyChangesDelete(
 	if !args.Intention.CanWrite(authz) {
 		sn := args.Intention.SourceServiceName()
 		dn := args.Intention.DestinationServiceName()
-		s.logger.Debug("Intention delete denied due to ACLs",
+		s.logger.Warn("Intention delete denied due to ACLs",
 			"source", sn.String(),
 			"destination", dn.String(),
 			"accessorID", acl.AliasIfAnonymousToken(accessorID))
@@ -485,7 +482,7 @@ func (s *Intention) Get(args *structs.IntentionQueryRequest, reply *structs.Inde
 			// If ACLs prevented any responses, error
 			if len(reply.Intentions) == 0 {
 				accessorID := authz.AccessorID()
-				s.logger.Debug("Request to get intention denied due to ACLs",
+				s.logger.Warn("Request to get intention denied due to ACLs",
 					"intention", args.IntentionID,
 					"accessorID", acl.AliasIfAnonymousToken(accessorID))
 				return acl.ErrPermissionDenied
@@ -620,7 +617,7 @@ func (s *Intention) Match(args *structs.IntentionQueryRequest, reply *structs.In
 		if prefix := entry.Name; prefix != "" {
 			if err := authz.ToAllowAuthorizer().IntentionReadAllowed(prefix, &authzContext); err != nil {
 				accessorID := authz.AccessorID()
-				s.logger.Debug("Operation on intention prefix denied due to ACLs",
+				s.logger.Warn("Operation on intention prefix denied due to ACLs",
 					"prefix", prefix,
 					"accessorID", acl.AliasIfAnonymousToken(accessorID))
 				return err
@@ -745,7 +742,7 @@ func (s *Intention) Check(args *structs.IntentionQueryRequest, reply *structs.In
 		query.FillAuthzContext(&authzContext)
 		if err := authz.ToAllowAuthorizer().ServiceReadAllowed(prefix, &authzContext); err != nil {
 			accessorID := authz.AccessorID()
-			s.logger.Debug("test on intention denied due to ACLs",
+			s.logger.Warn("test on intention denied due to ACLs",
 				"prefix", prefix,
 				"accessorID", acl.AliasIfAnonymousToken(accessorID))
 			return err
diff --git a/agent/consul/intention_endpoint_test.go b/agent/consul/intention_endpoint_test.go
index d7e469b80326f..199f3ede4969d 100644
--- a/agent/consul/intention_endpoint_test.go
+++ b/agent/consul/intention_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -1926,7 +1923,6 @@ func TestIntentionMatch_acl(t *testing.T) {
 		}
 		var resp structs.IndexedIntentionMatches
 		err := msgpackrpc.CallWithCodec(codec, "Intention.Match", req, &resp)
-		require.Error(t, err)
 		require.True(t, acl.IsErrPermissionDenied(err))
 		require.Len(t, resp.Matches, 0)
 	}
diff --git a/agent/consul/internal_endpoint.go b/agent/consul/internal_endpoint.go
index 1a8a0fca3028e..1ede41881ab18 100644
--- a/agent/consul/internal_endpoint.go
+++ b/agent/consul/internal_endpoint.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
 	"fmt"
-	"net"
 
 	"github.com/hashicorp/go-bexpr"
 	"github.com/hashicorp/go-hclog"
@@ -18,8 +14,6 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 )
 
-const MaximumManualVIPsPerService = 8
-
 // Internal endpoint is used to query the miscellaneous info that
 // does not necessarily fit into the other systems. It is also
 // used to hold undocumented APIs that users should not rely on.
@@ -744,55 +738,6 @@ func (m *Internal) PeeredUpstreams(args *structs.PartitionSpecificRequest, reply
 		})
 }
 
-// AssignManualServiceVIPs allows for assigning virtual IPs to a service manually, so that they can
-// be returned along with discovery chain information for use by transparent proxies.
-func (m *Internal) AssignManualServiceVIPs(args *structs.AssignServiceManualVIPsRequest, reply *structs.AssignServiceManualVIPsResponse) error {
-	if done, err := m.srv.ForwardRPC("Internal.AssignManualServiceVIPs", args, reply); done {
-		return err
-	}
-
-	var authzCtx acl.AuthorizerContext
-	authz, err := m.srv.ResolveTokenAndDefaultMeta(args.Token, &args.EnterpriseMeta, &authzCtx)
-	if err != nil {
-		return err
-	}
-	if err := authz.ToAllowAuthorizer().MeshWriteAllowed(&authzCtx); err != nil {
-		return err
-	}
-
-	if err := m.srv.validateEnterpriseRequest(&args.EnterpriseMeta, true); err != nil {
-		return err
-	}
-
-	if len(args.ManualVIPs) > MaximumManualVIPsPerService {
-		return fmt.Errorf("cannot associate more than %d manual virtual IPs with the same service", MaximumManualVIPsPerService)
-	}
-
-	for _, ip := range args.ManualVIPs {
-		parsedIP := net.ParseIP(ip)
-		if parsedIP == nil || parsedIP.To4() == nil {
-			return fmt.Errorf("%q is not a valid IPv4 address", parsedIP.String())
-		}
-	}
-
-	req := state.ServiceVirtualIP{
-		Service: structs.PeeredServiceName{
-			ServiceName: structs.NewServiceName(args.Service, &args.EnterpriseMeta),
-		},
-		ManualIPs: args.ManualVIPs,
-	}
-	resp, err := m.srv.raftApplyMsgpack(structs.UpdateVirtualIPRequestType, req)
-	if err != nil {
-		return err
-	}
-	typedResp, ok := resp.(structs.AssignServiceManualVIPsResponse)
-	if !ok {
-		return fmt.Errorf("unexpected type %T for AssignManualServiceVIPs", resp)
-	}
-	*reply = typedResp
-	return nil
-}
-
 // EventFire is a bit of an odd endpoint, but it allows for a cross-DC RPC
 // call to fire an event. The primary use case is to enable user events being
 // triggered in a remote DC.
diff --git a/agent/consul/internal_endpoint_test.go b/agent/consul/internal_endpoint_test.go
index 3f853df7ceb22..181de4ed82c2c 100644
--- a/agent/consul/internal_endpoint_test.go
+++ b/agent/consul/internal_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -22,7 +19,7 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/lib/stringslice"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/consul/testrpc"
@@ -3621,109 +3618,3 @@ func testUUID() string {
 		buf[8:10],
 		buf[10:16])
 }
-
-func TestInternal_AssignManualServiceVIPs(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-	t.Parallel()
-
-	dir1, s1 := testServer(t)
-	defer os.RemoveAll(dir1)
-	defer s1.Shutdown()
-	codec := rpcClient(t, s1)
-	defer codec.Close()
-
-	testrpc.WaitForLeader(t, s1.RPC, "dc1")
-
-	// Set up web service with no manual IPs, and an existing service with manual IPs set.
-	registerReq := structs.RegisterRequest{
-		Datacenter: "dc1",
-		Node:       "foo",
-		Address:    "127.0.0.1",
-		Service: &structs.NodeService{
-			ID:      "web",
-			Service: "web",
-			Port:    8888,
-			Connect: structs.ServiceConnect{Native: true},
-		},
-	}
-	var out struct{}
-	require.NoError(t, msgpackrpc.CallWithCodec(codec, "Catalog.Register", &registerReq, &out))
-
-	registerReq2 := structs.RegisterRequest{
-		Datacenter: "dc1",
-		Node:       "foo",
-		Address:    "127.0.0.1",
-		Service: &structs.NodeService{
-			ID:      "existing",
-			Service: "existing",
-			Port:    9999,
-			Connect: structs.ServiceConnect{Native: true},
-		},
-	}
-	require.NoError(t, msgpackrpc.CallWithCodec(codec, "Catalog.Register", &registerReq2, &out))
-
-	req := structs.AssignServiceManualVIPsRequest{
-		Service:    "existing",
-		ManualVIPs: []string{"8.8.8.8", "9.9.9.9"},
-	}
-	var resp structs.AssignServiceManualVIPsResponse
-	require.NoError(t, msgpackrpc.CallWithCodec(codec, "Internal.AssignManualServiceVIPs", req, &resp))
-
-	type testcase struct {
-		name      string
-		req       structs.AssignServiceManualVIPsRequest
-		expect    structs.AssignServiceManualVIPsResponse
-		expectErr string
-	}
-	run := func(t *testing.T, tc testcase) {
-		var resp structs.AssignServiceManualVIPsResponse
-		err := msgpackrpc.CallWithCodec(codec, "Internal.AssignManualServiceVIPs", tc.req, &resp)
-		if tc.expectErr != "" {
-			require.Error(t, err)
-			require.Contains(t, err.Error(), tc.expectErr)
-			return
-		}
-		require.Equal(t, tc.expect, resp)
-	}
-	tcs := []testcase{
-		{
-			name: "successful manual ip assignment",
-			req: structs.AssignServiceManualVIPsRequest{
-				Service:    "web",
-				ManualVIPs: []string{"1.1.1.1", "2.2.2.2"},
-			},
-			expect: structs.AssignServiceManualVIPsResponse{Found: true},
-		},
-		{
-			name: "reassign existing ip",
-			req: structs.AssignServiceManualVIPsRequest{
-				Service:    "web",
-				ManualVIPs: []string{"8.8.8.8"},
-			},
-			expect: structs.AssignServiceManualVIPsResponse{
-				Found: true,
-				UnassignedFrom: []structs.PeeredServiceName{
-					{
-						ServiceName: structs.ServiceNameFromString("existing"),
-					},
-				},
-			},
-		},
-		{
-			name: "invalid ip",
-			req: structs.AssignServiceManualVIPsRequest{
-				Service:    "web",
-				ManualVIPs: []string{"3.3.3.3", "invalid"},
-			},
-			expect:    structs.AssignServiceManualVIPsResponse{},
-			expectErr: "not a valid",
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
diff --git a/agent/consul/issue_test.go b/agent/consul/issue_test.go
index 17624400fe3f1..7839be0b95374 100644
--- a/agent/consul/issue_test.go
+++ b/agent/consul/issue_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -33,7 +30,6 @@ func TestHealthCheckRace(t *testing.T) {
 		NewStateStore: func() *state.Store {
 			return state.NewStateStore(nil)
 		},
-		StorageBackend: consulfsm.NullStorageBackend,
 	})
 	state := fsm.State()
 
diff --git a/agent/consul/kvs_endpoint.go b/agent/consul/kvs_endpoint.go
index 65dc2cd56d40f..3f2cbe1ccc5c0 100644
--- a/agent/consul/kvs_endpoint.go
+++ b/agent/consul/kvs_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/kvs_endpoint_test.go b/agent/consul/kvs_endpoint_test.go
index dc4272c4bd55d..1289ac6553cfd 100644
--- a/agent/consul/kvs_endpoint_test.go
+++ b/agent/consul/kvs_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/leader.go b/agent/consul/leader.go
index fcbf794541f3d..8c3090f69225c 100644
--- a/agent/consul/leader.go
+++ b/agent/consul/leader.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -1094,13 +1091,6 @@ AFTER_CHECK:
 		"partition", getSerfMemberEnterpriseMeta(member).PartitionOrDefault(),
 	)
 
-	// Get consul version from serf member
-	// add this as node meta in catalog register request
-	buildVersion, err := metadata.Build(&member)
-	if err != nil {
-		return err
-	}
-
 	// Register with the catalog.
 	req := structs.RegisterRequest{
 		Datacenter: s.config.Datacenter,
@@ -1116,9 +1106,6 @@ AFTER_CHECK:
 			Output:  structs.SerfCheckAliveOutput,
 		},
 		EnterpriseMeta: *nodeEntMeta,
-		NodeMeta: map[string]string{
-			structs.MetaConsulVersion: buildVersion.String(),
-		},
 	}
 	if node != nil {
 		req.TaggedAddresses = node.TaggedAddresses
diff --git a/agent/consul/leader_ce_test.go b/agent/consul/leader_ce_test.go
index 8988adb9f7782..6aab96f89a409 100644
--- a/agent/consul/leader_ce_test.go
+++ b/agent/consul/leader_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/leader_connect.go b/agent/consul/leader_connect.go
index 794820786f576..7166ad75cd618 100644
--- a/agent/consul/leader_connect.go
+++ b/agent/consul/leader_connect.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/leader_connect_ca.go b/agent/consul/leader_connect_ca.go
index 92cdf40a6abd2..39defb752b0a4 100644
--- a/agent/consul/leader_connect_ca.go
+++ b/agent/consul/leader_connect_ca.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -258,8 +255,8 @@ func (c *CAManager) initializeCAConfig() (*structs.CAConfiguration, error) {
 }
 
 // newCARoot returns a filled-in structs.CARoot from a raw PEM value.
-func newCARoot(caPem, provider, clusterID string) (*structs.CARoot, error) {
-	primaryCert, err := connect.ParseCert(caPem)
+func newCARoot(pemValue, provider, clusterID string) (*structs.CARoot, error) {
+	primaryCert, err := connect.ParseCert(pemValue)
 	if err != nil {
 		return nil, err
 	}
@@ -267,7 +264,7 @@ func newCARoot(caPem, provider, clusterID string) (*structs.CARoot, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error extracting root key info: %v", err)
 	}
-	caRoot := &structs.CARoot{
+	return &structs.CARoot{
 		ID:                  connect.CalculateCertFingerprint(primaryCert.Raw),
 		Name:                fmt.Sprintf("%s CA Primary Cert", providerPrettyName(provider)),
 		SerialNumber:        primaryCert.SerialNumber.Uint64(),
@@ -275,13 +272,11 @@ func newCARoot(caPem, provider, clusterID string) (*structs.CARoot, error) {
 		ExternalTrustDomain: clusterID,
 		NotBefore:           primaryCert.NotBefore,
 		NotAfter:            primaryCert.NotAfter,
-		RootCert:            lib.EnsureTrailingNewline(caPem),
+		RootCert:            lib.EnsureTrailingNewline(pemValue),
 		PrivateKeyType:      keyType,
 		PrivateKeyBits:      keyBits,
 		Active:              true,
-	}
-
-	return caRoot, nil
+	}, nil
 }
 
 // getCAProvider returns the currently active instance of the CA Provider,
@@ -484,6 +479,25 @@ func (c *CAManager) primaryInitialize(provider ca.Provider, conf *structs.CAConf
 	if err := provider.Configure(pCfg); err != nil {
 		return fmt.Errorf("error configuring provider: %v", err)
 	}
+	root, err := provider.GenerateRoot()
+	if err != nil {
+		return fmt.Errorf("error generating CA root certificate: %v", err)
+	}
+
+	rootCA, err := newCARoot(root.PEM, conf.Provider, conf.ClusterID)
+	if err != nil {
+		return err
+	}
+
+	// TODO: https://github.com/hashicorp/consul/issues/12386
+	interPEM, err := provider.GenerateIntermediate()
+	if err != nil {
+		return fmt.Errorf("error generating intermediate cert: %v", err)
+	}
+	intermediateCert, err := connect.ParseCert(interPEM)
+	if err != nil {
+		return fmt.Errorf("error getting intermediate cert: %v", err)
+	}
 
 	// If the provider has state to persist and it's changed or new then update
 	// CAConfig.
@@ -503,31 +517,24 @@ func (c *CAManager) primaryInitialize(provider ca.Provider, conf *structs.CAConf
 		}
 	}
 
-	root, err := provider.GenerateCAChain()
-	if err != nil {
-		return fmt.Errorf("error generating CA root certificate: %v", err)
-	}
-
-	rootCA, err := newCARoot(root, conf.Provider, conf.ClusterID)
-	if err != nil {
-		return err
-	}
-
-	// provider may use intermediates for leaf signing in which case
-	// we need to generate a leaf signing CA.
-	if usesIntermediate, ok := provider.(ca.PrimaryUsesIntermediate); ok {
-		leafPem, err := usesIntermediate.GenerateLeafSigningCert()
-		if err != nil {
-			return fmt.Errorf("error generating new leaf signing cert: %w", err)
-		}
+	var rootUpdateRequired bool
 
-		if err := setLeafSigningCert(rootCA, leafPem); err != nil {
-			return fmt.Errorf("error setting leaf signing cert: %w", err)
-		}
+	// Versions prior to 1.9.3, 1.8.8, and 1.7.12 incorrectly used the primary
+	// rootCA's subjectKeyID here instead of the intermediate. For
+	// provider=consul this didn't matter since there are no intermediates in
+	// the primaryDC, but for vault it does matter.
+	expectedSigningKeyID := connect.EncodeSigningKeyID(intermediateCert.SubjectKeyId)
+	if rootCA.SigningKeyID != expectedSigningKeyID {
+		c.logger.Info("Correcting stored CARoot values",
+			"previous-signing-key", rootCA.SigningKeyID, "updated-signing-key", expectedSigningKeyID)
+		rootCA.SigningKeyID = expectedSigningKeyID
+		rootUpdateRequired = true
 	}
 
-	var rootUpdateRequired bool
-	if len(rootCA.IntermediateCerts) > 0 {
+	// Add the local leaf signing cert to the rootCA struct. This handles both
+	// upgrades of existing state, and new rootCA.
+	if c.getLeafSigningCertFromRoot(rootCA) != interPEM {
+		rootCA.IntermediateCerts = append(rootCA.IntermediateCerts, interPEM)
 		rootUpdateRequired = true
 	}
 
@@ -570,11 +577,15 @@ func (c *CAManager) primaryInitialize(provider ca.Provider, conf *structs.CAConf
 // sign leaf certificates in the local datacenter. The SubjectKeyId of the
 // returned cert should always match the SigningKeyID of the CARoot.
 //
-// TODO: only used in tests. Remove if possible.
+// TODO: fix the data model so that we don't need this complicated lookup to
+// find the leaf signing cert. See github.com/hashicorp/consul/issues/11347.
 func (c *CAManager) getLeafSigningCertFromRoot(root *structs.CARoot) string {
-	if len(root.IntermediateCerts) == 0 {
+	if !c.isIntermediateUsedToSignLeaf() {
 		return root.RootCert
 	}
+	if len(root.IntermediateCerts) == 0 {
+		return ""
+	}
 	return root.IntermediateCerts[len(root.IntermediateCerts)-1]
 }
 
@@ -585,7 +596,7 @@ func (c *CAManager) getLeafSigningCertFromRoot(root *structs.CARoot) string {
 // This method should only be called while the state lock is held by setting the
 // state to non-ready.
 func (c *CAManager) secondaryInitializeIntermediateCA(provider ca.Provider, config *structs.CAConfiguration) error {
-	activeIntermediate, err := provider.ActiveLeafSigningCert()
+	activeIntermediate, err := provider.ActiveIntermediate()
 	if err != nil {
 		return err
 	}
@@ -772,6 +783,7 @@ func (c *CAManager) UpdateConfiguration(args *structs.CARequest) (reterr error)
 		return err
 	}
 
+	// Exit early if it's a no-op change
 	state := c.delegate.State()
 	_, config, err := state.CAConfig(nil)
 	if err != nil {
@@ -787,8 +799,6 @@ func (c *CAManager) UpdateConfiguration(args *structs.CARequest) (reterr error)
 
 	// Don't allow users to change the ClusterID.
 	args.Config.ClusterID = config.ClusterID
-
-	// Exit early if it's a no-op change
 	if args.Config.Provider == config.Provider && reflect.DeepEqual(args.Config.Config, config.Config) {
 		return nil
 	}
@@ -868,58 +878,48 @@ type ValidateConfigUpdater interface {
 }
 
 func (c *CAManager) primaryUpdateRootCA(newProvider ca.Provider, args *structs.CARequest, config *structs.CAConfiguration) error {
-	// See if the provider needs to persist any state along with the config
-	pState, err := newProvider.State()
-	if err != nil {
-		return fmt.Errorf("error getting provider state: %v", err)
-	}
-	args.Config.State = pState
-
-	caPEM, err := newProvider.GenerateCAChain()
+	providerRoot, err := newProvider.GenerateRoot()
 	if err != nil {
 		return fmt.Errorf("error generating CA root certificate: %v", err)
 	}
 
-	newActiveRoot, err := newCARoot(caPEM, args.Config.Provider, args.Config.ClusterID)
+	newRootPEM := providerRoot.PEM
+	newActiveRoot, err := newCARoot(newRootPEM, args.Config.Provider, args.Config.ClusterID)
 	if err != nil {
 		return err
 	}
 
-	// Fetch the existing root CA to compare with the current one.
-	state := c.delegate.State()
-	_, root, err := state.CARootActive(nil)
+	// TODO: https://github.com/hashicorp/consul/issues/12386
+	intermediate, err := newProvider.ActiveIntermediate()
 	if err != nil {
-		return err
+		return fmt.Errorf("error fetching active intermediate: %w", err)
 	}
-
-	// provider may use intermediates for leaf signing in which case
-	// we may need to generate a leaf signing CA if the root has changed.
-	if usesIntermediate, ok := newProvider.(ca.PrimaryUsesIntermediate); ok {
-		var leafPemFunc func() (string, error)
-		if root != nil && root.ID == newActiveRoot.ID {
-			// If Root ID is the same, we can reuse the existing leaf signing cert
-			leafPemFunc = newProvider.ActiveLeafSigningCert
-		} else {
-			// If Root ID is different, we need to generate a new leaf signing cert
-			// else the trust chain will break when the old root expires.
-			leafPemFunc = usesIntermediate.GenerateLeafSigningCert
-		}
-		leafPem, err := leafPemFunc()
+	if intermediate == "" {
+		intermediate, err = newProvider.GenerateIntermediate()
 		if err != nil {
-			return fmt.Errorf("error fetching leaf signing cert: %w", err)
+			return fmt.Errorf("error generating intermediate: %w", err)
 		}
-		// newProvider.ActiveLeafSigningCert may return a blank leafPem so we
-		// fall back to generating a new one just in case.
-		if leafPem == "" {
-			leafPem, err = usesIntermediate.GenerateLeafSigningCert()
-			if err != nil {
-				return fmt.Errorf("error generating new leaf signing cert: %w", err)
-			}
+	}
+	if intermediate != newRootPEM {
+		if err := setLeafSigningCert(newActiveRoot, intermediate); err != nil {
+			return err
 		}
+	}
 
-		if err := setLeafSigningCert(newActiveRoot, leafPem); err != nil {
-			return fmt.Errorf("error setting leaf signing cert: %w", err)
-		}
+	// See if the provider needs to persist any state along with the config
+	pState, err := newProvider.State()
+	if err != nil {
+		return fmt.Errorf("error getting provider state: %v", err)
+	}
+	args.Config.State = pState
+
+	state := c.delegate.State()
+	// Compare the new provider's root CA ID to the current one. If they
+	// match, just update the existing provider with the new config.
+	// If they don't match, begin the root rotation process.
+	_, root, err := state.CARootActive(nil)
+	if err != nil {
+		return err
 	}
 
 	// If the root didn't change, just update the config and return.
@@ -955,7 +955,7 @@ func (c *CAManager) primaryUpdateRootCA(newProvider ca.Provider, args *structs.C
 		// 3. Take the active root for the new provider and append the intermediate from step 2
 		// to its list of intermediates.
 		// TODO: this cert is already parsed once in newCARoot, could we remove the second parse?
-		newRoot, err := connect.ParseCert(caPEM)
+		newRoot, err := connect.ParseCert(newRootPEM)
 		if err != nil {
 			return err
 		}
@@ -1041,12 +1041,8 @@ func (c *CAManager) primaryUpdateRootCA(newProvider ca.Provider, args *structs.C
 // This is only run for CAs that require an intermediary in the primary DC, such as Vault.
 // It should only be called while the state lock is held by setting the state to non-ready.
 func (c *CAManager) primaryRenewIntermediate(provider ca.Provider, newActiveRoot *structs.CARoot) error {
-	p, ok := provider.(ca.PrimaryUsesIntermediate)
-	if !ok {
-		return fmt.Errorf("tried to renew intermediates for a provider that does not use them")
-	}
 	// Generate and sign an intermediate cert using the root CA.
-	intermediatePEM, err := p.GenerateLeafSigningCert()
+	intermediatePEM, err := provider.GenerateIntermediate()
 	if err != nil {
 		return fmt.Errorf("error generating new intermediate cert: %v", err)
 	}
@@ -1190,7 +1186,7 @@ func (c *CAManager) renewIntermediate(ctx context.Context, forceNow bool) error
 		return nil
 	}
 
-	activeIntermediate, err := provider.ActiveLeafSigningCert()
+	activeIntermediate, err := provider.ActiveIntermediate()
 	if err != nil {
 		return err
 	}
@@ -1436,7 +1432,6 @@ func (c *CAManager) AuthorizeAndSignCertificate(csr *x509.CertificateRequest, au
 	if err != nil {
 		return nil, err
 	}
-	c.logger.Trace("authorizing and signing cert", "spiffeID", spiffeID)
 
 	// Perform authorization.
 	var authzContext acl.AuthorizerContext
@@ -1455,11 +1450,6 @@ func (c *CAManager) AuthorizeAndSignCertificate(csr *x509.CertificateRequest, au
 			return nil, connect.InvalidCSRError("SPIFFE ID in CSR from a different datacenter: %s, "+
 				"we are %s", v.Datacenter, dc)
 		}
-	case *connect.SpiffeIDWorkloadIdentity:
-		v.GetEnterpriseMeta().FillAuthzContext(&authzContext)
-		if err := allow.IdentityWriteAllowed(v.WorkloadIdentity, &authzContext); err != nil {
-			return nil, err
-		}
 	case *connect.SpiffeIDAgent:
 		v.GetEnterpriseMeta().FillAuthzContext(&authzContext)
 		if err := allow.NodeWriteAllowed(v.Agent, &authzContext); err != nil {
@@ -1493,7 +1483,6 @@ func (c *CAManager) AuthorizeAndSignCertificate(csr *x509.CertificateRequest, au
 				"we are %s", v.Datacenter, dc)
 		}
 	default:
-		c.logger.Trace("spiffe ID type is not expected", "spiffeID", spiffeID, "spiffeIDType", v)
 		return nil, connect.InvalidCSRError("SPIFFE ID in CSR must be a service, mesh-gateway, or agent ID")
 	}
 
@@ -1520,7 +1509,6 @@ func (c *CAManager) SignCertificate(csr *x509.CertificateRequest, spiffeID conne
 	agentID, isAgent := spiffeID.(*connect.SpiffeIDAgent)
 	serverID, isServer := spiffeID.(*connect.SpiffeIDServer)
 	mgwID, isMeshGateway := spiffeID.(*connect.SpiffeIDMeshGateway)
-	wID, isWorkloadIdentity := spiffeID.(*connect.SpiffeIDWorkloadIdentity)
 
 	var entMeta acl.EnterpriseMeta
 	switch {
@@ -1530,12 +1518,7 @@ func (c *CAManager) SignCertificate(csr *x509.CertificateRequest, spiffeID conne
 				"we are %s", serviceID.Host, signingID.Host())
 		}
 		entMeta.Merge(serviceID.GetEnterpriseMeta())
-	case isWorkloadIdentity:
-		if !signingID.CanSign(spiffeID) {
-			return nil, connect.InvalidCSRError("SPIFFE ID in CSR from a different trust domain: %s, "+
-				"we are %s", wID.TrustDomain, signingID.Host())
-		}
-		entMeta.Merge(wID.GetEnterpriseMeta())
+
 	case isMeshGateway:
 		if !signingID.CanSign(spiffeID) {
 			return nil, connect.InvalidCSRError("SPIFFE ID in CSR from a different trust domain: %s, "+
@@ -1658,9 +1641,6 @@ func (c *CAManager) SignCertificate(csr *x509.CertificateRequest, spiffeID conne
 	case isService:
 		reply.Service = serviceID.Service
 		reply.ServiceURI = cert.URIs[0].String()
-	case isWorkloadIdentity:
-		reply.WorkloadIdentity = wID.WorkloadIdentity
-		reply.WorkloadIdentityURI = cert.URIs[0].String()
 	case isMeshGateway:
 		reply.Kind = structs.ServiceKindMeshGateway
 		reply.KindURI = cert.URIs[0].String()
diff --git a/agent/consul/leader_connect_ca_test.go b/agent/consul/leader_connect_ca_test.go
index e372c010a7064..1e4e4d2af9600 100644
--- a/agent/consul/leader_connect_ca_test.go
+++ b/agent/consul/leader_connect_ca_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -259,8 +256,8 @@ type mockCAProvider struct {
 
 func (m *mockCAProvider) Configure(cfg ca.ProviderConfig) error { return nil }
 func (m *mockCAProvider) State() (map[string]string, error)     { return nil, nil }
-func (m *mockCAProvider) GenerateCAChain() (string, error) {
-	return m.rootPEM, nil
+func (m *mockCAProvider) GenerateRoot() (ca.RootResult, error) {
+	return ca.RootResult{PEM: m.rootPEM}, nil
 }
 func (m *mockCAProvider) GenerateIntermediateCSR() (string, string, error) {
 	m.callbackCh <- "provider/GenerateIntermediateCSR"
@@ -270,13 +267,13 @@ func (m *mockCAProvider) SetIntermediate(intermediatePEM, rootPEM, _ string) err
 	m.callbackCh <- "provider/SetIntermediate"
 	return nil
 }
-func (m *mockCAProvider) ActiveLeafSigningCert() (string, error) {
+func (m *mockCAProvider) ActiveIntermediate() (string, error) {
 	if m.intermediatePem == "" {
 		return m.rootPEM, nil
 	}
 	return m.intermediatePem, nil
 }
-
+func (m *mockCAProvider) GenerateIntermediate() (string, error)                     { return "", nil }
 func (m *mockCAProvider) Sign(*x509.CertificateRequest) (string, error)             { return "", nil }
 func (m *mockCAProvider) SignIntermediate(*x509.CertificateRequest) (string, error) { return "", nil }
 func (m *mockCAProvider) CrossSignCA(*x509.Certificate) (string, error)             { return "", nil }
@@ -566,7 +563,7 @@ func TestCAManager_Initialize_Logging(t *testing.T) {
 	deps := newDefaultDeps(t, conf1)
 	deps.Logger = logger
 
-	s1, err := NewServer(conf1, deps, grpc.NewServer(), nil, logger, nil)
+	s1, err := NewServer(conf1, deps, grpc.NewServer(), nil, logger)
 	require.NoError(t, err)
 	defer s1.Shutdown()
 	testrpc.WaitForLeader(t, s1.RPC, "dc1")
@@ -624,7 +621,7 @@ func TestCAManager_UpdateConfiguration_Vault_Primary(t *testing.T) {
 	require.Equal(t, connect.HexString(cert.SubjectKeyId), origRoot.SigningKeyID)
 
 	t.Run("update config without changing root", func(t *testing.T) {
-		require.NoError(t, s1.caManager.UpdateConfiguration(&structs.CARequest{
+		err = s1.caManager.UpdateConfiguration(&structs.CARequest{
 			Config: &structs.CAConfiguration{
 				Provider: "vault",
 				Config: map[string]interface{}{
@@ -635,117 +632,50 @@ func TestCAManager_UpdateConfiguration_Vault_Primary(t *testing.T) {
 					"CSRMaxPerSecond":     100,
 				},
 			},
-		}))
-
-		_, newRoot, err := s1.fsm.State().CARootActive(nil)
+		})
+		require.NoError(t, err)
+		_, sameRoot, err := s1.fsm.State().CARootActive(nil)
 		require.NoError(t, err)
-		require.Len(t, newRoot.IntermediateCerts, 1)
-		newRoot.CreateIndex = s1.caManager.providerRoot.CreateIndex
-		newRoot.ModifyIndex = s1.caManager.providerRoot.ModifyIndex
+		require.Len(t, sameRoot.IntermediateCerts, 1)
+		sameRoot.CreateIndex = s1.caManager.providerRoot.CreateIndex
+		sameRoot.ModifyIndex = s1.caManager.providerRoot.ModifyIndex
 
-		orig, err := connect.ParseCert(s1.caManager.getLeafSigningCertFromRoot(newRoot))
+		cert, err := connect.ParseCert(s1.caManager.getLeafSigningCertFromRoot(sameRoot))
 		require.NoError(t, err)
-		require.Equal(t, connect.HexString(orig.SubjectKeyId), newRoot.SigningKeyID)
+		require.Equal(t, connect.HexString(cert.SubjectKeyId), sameRoot.SigningKeyID)
 
-		require.Equal(t, origRoot, newRoot)
-		require.Equal(t, newRoot, s1.caManager.providerRoot)
+		require.Equal(t, origRoot, sameRoot)
+		require.Equal(t, sameRoot, s1.caManager.providerRoot)
 	})
 
-	t.Run("update config and change root only", func(t *testing.T) {
-		// Read the active leaf CA
-		provider, _ := s1.caManager.getCAProvider()
-
-		before, err := provider.ActiveLeafSigningCert()
-		require.NoError(t, err)
-
+	t.Run("update config and change root", func(t *testing.T) {
 		vaultToken2 := ca.CreateVaultTokenWithAttrs(t, vault.Client(), &ca.VaultTokenAttributes{
 			RootPath:         "pki-root-2",
-			IntermediatePath: "pki-intermediate",
+			IntermediatePath: "pki-intermediate-2",
 			ConsulManaged:    true,
-			WithSudo:         true,
 		})
 
-		require.NoError(t, s1.caManager.UpdateConfiguration(&structs.CARequest{
+		err = s1.caManager.UpdateConfiguration(&structs.CARequest{
 			Config: &structs.CAConfiguration{
 				Provider: "vault",
 				Config: map[string]interface{}{
 					"Address":             vault.Addr,
 					"Token":               vaultToken2,
 					"RootPKIPath":         "pki-root-2/",
-					"IntermediatePKIPath": "pki-intermediate/",
-				},
-			},
-		}))
-
-		// fetch the new root from the state store to check that
-		// raft apply has occurred.
-		_, newRoot, err := s1.fsm.State().CARootActive(nil)
-		require.NoError(t, err)
-		require.Len(t, newRoot.IntermediateCerts, 2,
-			"expected one cross-sign cert and one local leaf sign cert")
-
-		// Refresh provider
-		provider, _ = s1.caManager.getCAProvider()
-
-		// Leaf signing cert should have been updated
-		after, err := provider.ActiveLeafSigningCert()
-		require.NoError(t, err)
-
-		require.NotEqual(t, before, after,
-			"expected leaf signing cert to be changed after RootPKIPath was changed")
-
-		cert, err = connect.ParseCert(after)
-		require.NoError(t, err)
-
-		require.Equal(t, connect.HexString(cert.SubjectKeyId), newRoot.SigningKeyID)
-	})
-
-	t.Run("update config, change root and intermediate", func(t *testing.T) {
-		// Read the active leaf CA
-		provider, _ := s1.caManager.getCAProvider()
-
-		before, err := provider.ActiveLeafSigningCert()
-		require.NoError(t, err)
-
-		vaultToken3 := ca.CreateVaultTokenWithAttrs(t, vault.Client(), &ca.VaultTokenAttributes{
-			RootPath:         "pki-root-3",
-			IntermediatePath: "pki-intermediate-3",
-			ConsulManaged:    true,
-		})
-
-		err = s1.caManager.UpdateConfiguration(&structs.CARequest{
-			Config: &structs.CAConfiguration{
-				Provider: "vault",
-				Config: map[string]interface{}{
-					"Address":             vault.Addr,
-					"Token":               vaultToken3,
-					"RootPKIPath":         "pki-root-3/",
-					"IntermediatePKIPath": "pki-intermediate-3/",
+					"IntermediatePKIPath": "pki-intermediate-2/",
 				},
 			},
 		})
 		require.NoError(t, err)
 
-		// fetch the new root from the state store to check that
-		// raft apply has occurred.
 		_, newRoot, err := s1.fsm.State().CARootActive(nil)
 		require.NoError(t, err)
 		require.Len(t, newRoot.IntermediateCerts, 2,
 			"expected one cross-sign cert and one local leaf sign cert")
+		require.NotEqual(t, origRoot.ID, newRoot.ID)
 
-		// Refresh provider
-		provider, _ = s1.caManager.getCAProvider()
-
-		// Leaf signing cert should have been updated
-		after, err := provider.ActiveLeafSigningCert()
-		require.NoError(t, err)
-
-		require.NotEqual(t, before, after,
-			"expected leaf signing cert to be changed after RootPKIPath and IntermediatePKIPath were changed")
-
-		cert, err = connect.ParseCert(after)
+		cert, err = connect.ParseCert(s1.caManager.getLeafSigningCertFromRoot(newRoot))
 		require.NoError(t, err)
-
 		require.Equal(t, connect.HexString(cert.SubjectKeyId), newRoot.SigningKeyID)
 	})
 }
@@ -1317,12 +1247,6 @@ func TestCAManager_AuthorizeAndSignCertificate(t *testing.T) {
 		Host:       "test-host",
 		Partition:  "test-partition",
 	}.URI()
-	identityURL := connect.SpiffeIDWorkloadIdentity{
-		TrustDomain:      "test-trust-domain",
-		Partition:        "test-partition",
-		Namespace:        "test-namespace",
-		WorkloadIdentity: "test-workload-identity",
-	}.URI()
 
 	tests := []struct {
 		name      string
@@ -1418,15 +1342,6 @@ func TestCAManager_AuthorizeAndSignCertificate(t *testing.T) {
 				}
 			},
 		},
-		{
-			name:      "err_identity_write_not_allowed",
-			expectErr: "Permission denied",
-			getCSR: func() *x509.CertificateRequest {
-				return &x509.CertificateRequest{
-					URIs: []*url.URL{identityURL},
-				}
-			},
-		},
 	}
 
 	for _, tc := range tests {
diff --git a/agent/consul/leader_connect_test.go b/agent/consul/leader_connect_test.go
index dbee808de99eb..9c1218f9c2691 100644
--- a/agent/consul/leader_connect_test.go
+++ b/agent/consul/leader_connect_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -15,7 +12,7 @@ import (
 	"time"
 
 	msgpackrpc "github.com/hashicorp/consul-net-rpc/net-rpc-msgpackrpc"
-	"github.com/hashicorp/go-uuid"
+	uuid "github.com/hashicorp/go-uuid"
 	"github.com/stretchr/testify/require"
 	"gotest.tools/v3/assert"
 
@@ -52,9 +49,7 @@ func TestConnectCA_ConfigurationSet_ChangeKeyConfig_Primary(t *testing.T) {
 			src := src
 			dst := dst
 			t.Run(fmt.Sprintf("%s-%d to %s-%d", src.keyType, src.keyBits, dst.keyType, dst.keyBits), func(t *testing.T) {
-				// TODO(flaky): making this test parallel seems to create performance problems
-				// in CI. Until we spend time optimizing this test, it's best to take the runtime hit.
-				// t.Parallel()
+				t.Parallel()
 
 				providerState := map[string]string{"foo": "dc1-value"}
 
@@ -62,13 +57,14 @@ func TestConnectCA_ConfigurationSet_ChangeKeyConfig_Primary(t *testing.T) {
 				_, srv := testServerWithConfig(t, func(c *Config) {
 					c.Datacenter = "dc1"
 					c.PrimaryDatacenter = "dc1"
+					c.Build = "1.6.0"
 					c.CAConfig.Config["PrivateKeyType"] = src.keyType
 					c.CAConfig.Config["PrivateKeyBits"] = src.keyBits
 					c.CAConfig.Config["test_state"] = providerState
 				})
 				codec := rpcClient(t, srv)
 
-				testrpc.WaitForLeader(t, srv.RPC, "dc1")
+				waitForLeaderEstablishment(t, srv)
 				testrpc.WaitForActiveCARoot(t, srv.RPC, "dc1", nil)
 
 				var (
@@ -255,7 +251,7 @@ func TestCAManager_Initialize_Secondary(t *testing.T) {
 			retry.Run(t, func(r *retry.R) {
 				_, caRoot = getCAProviderWithLock(s1)
 				secondaryProvider, _ = getCAProviderWithLock(s2)
-				intermediatePEM, err = secondaryProvider.ActiveLeafSigningCert()
+				intermediatePEM, err = secondaryProvider.ActiveIntermediate()
 				require.NoError(r, err)
 
 				// Sanity check CA is using the correct key type
@@ -558,17 +554,23 @@ func TestConnectCA_ConfigurationSet_RootRotation_Secondary(t *testing.T) {
 
 	t.Parallel()
 
-	_, s1 := testServerWithConfig(t, func(c *Config) {
+	dir1, s1 := testServerWithConfig(t, func(c *Config) {
+		c.Build = "1.6.0"
 		c.PrimaryDatacenter = "dc1"
 	})
+	defer os.RemoveAll(dir1)
+	defer s1.Shutdown()
 
 	testrpc.WaitForLeader(t, s1.RPC, "dc1")
 
 	// dc2 as a secondary DC
-	_, s2 := testServerWithConfig(t, func(c *Config) {
+	dir2, s2 := testServerWithConfig(t, func(c *Config) {
 		c.Datacenter = "dc2"
 		c.PrimaryDatacenter = "dc1"
+		c.Build = "1.6.0"
 	})
+	defer os.RemoveAll(dir2)
+	defer s2.Shutdown()
 
 	// Create the WAN link
 	joinWAN(t, s2, s1)
@@ -576,7 +578,7 @@ func TestConnectCA_ConfigurationSet_RootRotation_Secondary(t *testing.T) {
 
 	// Get the original intermediate
 	secondaryProvider, _ := getCAProviderWithLock(s2)
-	oldIntermediatePEM, err := secondaryProvider.ActiveLeafSigningCert()
+	oldIntermediatePEM, err := secondaryProvider.ActiveIntermediate()
 	require.NoError(t, err)
 	require.NotEmpty(t, oldIntermediatePEM)
 
@@ -629,7 +631,7 @@ func TestConnectCA_ConfigurationSet_RootRotation_Secondary(t *testing.T) {
 	// Wait for dc2's intermediate to be refreshed.
 	var intermediatePEM string
 	retry.Run(t, func(r *retry.R) {
-		intermediatePEM, err = secondaryProvider.ActiveLeafSigningCert()
+		intermediatePEM, err = secondaryProvider.ActiveIntermediate()
 		r.Check(err)
 		if intermediatePEM == oldIntermediatePEM {
 			r.Fatal("not a new intermediate")
@@ -851,7 +853,7 @@ func TestCAManager_Initialize_Vault_FixesSigningKeyID_Primary(t *testing.T) {
 		require.NotNil(r, provider)
 		require.NotNil(r, activeRoot)
 
-		activeIntermediate, err := provider.ActiveLeafSigningCert()
+		activeIntermediate, err := provider.ActiveIntermediate()
 		require.NoError(r, err)
 
 		intermediateCert, err := connect.ParseCert(activeIntermediate)
@@ -952,7 +954,7 @@ func TestCAManager_Initialize_FixesSigningKeyID_Secondary(t *testing.T) {
 		require.NotNil(r, provider)
 		require.NotNil(r, activeRoot)
 
-		activeIntermediate, err := provider.ActiveLeafSigningCert()
+		activeIntermediate, err := provider.ActiveIntermediate()
 		require.NoError(r, err)
 
 		intermediateCert, err := connect.ParseCert(activeIntermediate)
@@ -1141,13 +1143,13 @@ func TestCAManager_Initialize_SecondaryBeforePrimary(t *testing.T) {
 		require.Equal(r, roots1[0].RootCert, roots2[0].RootCert)
 
 		secondaryProvider, _ := getCAProviderWithLock(s2)
-		inter, err := secondaryProvider.ActiveLeafSigningCert()
+		inter, err := secondaryProvider.ActiveIntermediate()
 		require.NoError(r, err)
 		require.NotEmpty(r, inter, "should have valid intermediate")
 	})
 
 	secondaryProvider, _ := getCAProviderWithLock(s2)
-	intermediatePEM, err := secondaryProvider.ActiveLeafSigningCert()
+	intermediatePEM, err := secondaryProvider.ActiveIntermediate()
 	require.NoError(t, err)
 
 	_, caRoot := getCAProviderWithLock(s1)
@@ -1349,26 +1351,20 @@ func TestConnectCA_ConfigurationSet_PersistsRoots(t *testing.T) {
 
 func TestNewCARoot(t *testing.T) {
 	type testCase struct {
-		name            string
-		pem             string
-		intermediatePem string
-		expected        *structs.CARoot
-		expectedErr     string
+		name        string
+		pem         string
+		expected    *structs.CARoot
+		expectedErr string
 	}
 
 	run := func(t *testing.T, tc testCase) {
-		root, err := newCARoot(
-			tc.pem,
-			"provider-name", "cluster-id")
-		if tc.intermediatePem != "" {
-			setLeafSigningCert(root, tc.intermediatePem)
-		}
+		root, err := newCARoot(tc.pem, "provider-name", "cluster-id")
 		if tc.expectedErr != "" {
 			testutil.RequireErrorContains(t, err, tc.expectedErr)
 			return
 		}
 		require.NoError(t, err)
-		assert.DeepEqual(t, tc.expected, root)
+		assert.DeepEqual(t, root, tc.expected)
 	}
 
 	// Test certs can be generated with
@@ -1465,28 +1461,6 @@ func TestNewCARoot(t *testing.T) {
 				PrivateKeyBits:      256,
 			},
 		},
-		{
-			// Although the intermediate pem doesn't have pem as the issuer
-			// as in a real certificate chain, we are testing that the IntermediateCerts
-			// are being populated and that the signing key is from the intermediatePem.
-			name:            "pem with intermediate pem",
-			pem:             readTestData(t, "cert-with-rsa-4096-key.pem"),
-			intermediatePem: readTestData(t, "cert-with-ec-256-key.pem"),
-			expected: &structs.CARoot{
-				ID:                  "3a:6a:e3:e2:2d:44:85:5a:e9:44:3b:ef:d2:90:78:83:7f:61:a2:84",
-				Name:                "Provider-Name CA Primary Cert",
-				SerialNumber:        5186695743100577491,
-				SigningKeyID:        "97:4d:17:81:64:f8:b4:af:05:e8:6c:79:c5:40:3b:0e:3e:8b:c0:ae:38:51:54:8a:2f:05:db:e3:e8:e4:24:ec",
-				ExternalTrustDomain: "cluster-id",
-				NotBefore:           time.Date(2019, 10, 17, 11, 53, 15, 0, time.UTC),
-				NotAfter:            time.Date(2029, 10, 17, 11, 53, 15, 0, time.UTC),
-				RootCert:            readTestData(t, "cert-with-rsa-4096-key.pem"),
-				IntermediateCerts:   []string{readTestData(t, "cert-with-ec-256-key.pem")},
-				Active:              true,
-				PrivateKeyType:      "rsa",
-				PrivateKeyBits:      4096,
-			},
-		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
diff --git a/agent/consul/leader_federation_state_ae.go b/agent/consul/leader_federation_state_ae.go
index 870dc5460e2b0..6cc0d4ba22a11 100644
--- a/agent/consul/leader_federation_state_ae.go
+++ b/agent/consul/leader_federation_state_ae.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/leader_federation_state_ae_test.go b/agent/consul/leader_federation_state_ae_test.go
index ca5ac47b7a974..597a9275300ec 100644
--- a/agent/consul/leader_federation_state_ae_test.go
+++ b/agent/consul/leader_federation_state_ae_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/leader_intentions.go b/agent/consul/leader_intentions.go
index 52736838aec81..2894acd58460e 100644
--- a/agent/consul/leader_intentions.go
+++ b/agent/consul/leader_intentions.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/leader_intentions_ce.go b/agent/consul/leader_intentions_ce.go
index 2d997b2329498..6913b6a90a3dd 100644
--- a/agent/consul/leader_intentions_ce.go
+++ b/agent/consul/leader_intentions_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/leader_intentions_ce_test.go b/agent/consul/leader_intentions_ce_test.go
index e97c45a320cf1..ea9b8b6a4ffbc 100644
--- a/agent/consul/leader_intentions_ce_test.go
+++ b/agent/consul/leader_intentions_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/leader_intentions_test.go b/agent/consul/leader_intentions_test.go
index fc868bc747fc1..89dbc9d6256cc 100644
--- a/agent/consul/leader_intentions_test.go
+++ b/agent/consul/leader_intentions_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/leader_log_verification.go b/agent/consul/leader_log_verification.go
index 32a23dd3f5c06..61fe84cd9895c 100644
--- a/agent/consul/leader_log_verification.go
+++ b/agent/consul/leader_log_verification.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/leader_metrics.go b/agent/consul/leader_metrics.go
index e210b2ffd9333..244d3fd5d0233 100644
--- a/agent/consul/leader_metrics.go
+++ b/agent/consul/leader_metrics.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -19,10 +16,8 @@ import (
 	"github.com/hashicorp/consul/logging"
 )
 
-var (
-	metricsKeyMeshRootCAExpiry          = []string{"mesh", "active-root-ca", "expiry"}
-	metricsKeyMeshActiveSigningCAExpiry = []string{"mesh", "active-signing-ca", "expiry"}
-)
+var metricsKeyMeshRootCAExpiry = []string{"mesh", "active-root-ca", "expiry"}
+var metricsKeyMeshActiveSigningCAExpiry = []string{"mesh", "active-signing-ca", "expiry"}
 
 var LeaderCertExpirationGauges = []prometheus.GaugeDefinition{
 	{
@@ -39,31 +34,30 @@ func rootCAExpiryMonitor(s *Server) CertExpirationMonitor {
 	return CertExpirationMonitor{
 		Key:    metricsKeyMeshRootCAExpiry,
 		Logger: s.logger.Named(logging.Connect),
-		Query: func() (time.Duration, time.Duration, error) {
+		Query: func() (time.Duration, error) {
 			return getRootCAExpiry(s)
 		},
 	}
 }
 
-func getRootCAExpiry(s *Server) (time.Duration, time.Duration, error) {
+func getRootCAExpiry(s *Server) (time.Duration, error) {
 	state := s.fsm.State()
 	_, root, err := state.CARootActive(nil)
 	switch {
 	case err != nil:
-		return 0, 0, fmt.Errorf("failed to retrieve root CA: %w", err)
+		return 0, fmt.Errorf("failed to retrieve root CA: %w", err)
 	case root == nil:
-		return 0, 0, fmt.Errorf("no active root CA")
+		return 0, fmt.Errorf("no active root CA")
 	}
 
-	lifetime := time.Since(root.NotBefore) + time.Until(root.NotAfter)
-	return lifetime, time.Until(root.NotAfter), nil
+	return time.Until(root.NotAfter), nil
 }
 
 func signingCAExpiryMonitor(s *Server) CertExpirationMonitor {
 	return CertExpirationMonitor{
 		Key:    metricsKeyMeshActiveSigningCAExpiry,
 		Logger: s.logger.Named(logging.Connect),
-		Query: func() (time.Duration, time.Duration, error) {
+		Query: func() (time.Duration, error) {
 			if s.caManager.isIntermediateUsedToSignLeaf() {
 				return getActiveIntermediateExpiry(s)
 			}
@@ -72,28 +66,26 @@ func signingCAExpiryMonitor(s *Server) CertExpirationMonitor {
 	}
 }
 
-func getActiveIntermediateExpiry(s *Server) (time.Duration, time.Duration, error) {
+func getActiveIntermediateExpiry(s *Server) (time.Duration, error) {
 	state := s.fsm.State()
 	_, root, err := state.CARootActive(nil)
 	switch {
 	case err != nil:
-		return 0, 0, fmt.Errorf("failed to retrieve root CA: %w", err)
+		return 0, fmt.Errorf("failed to retrieve root CA: %w", err)
 	case root == nil:
-		return 0, 0, fmt.Errorf("no active root CA")
+		return 0, fmt.Errorf("no active root CA")
 	}
 
 	// the CA used in a secondary DC is the active intermediate,
 	// which is the last in the IntermediateCerts stack
 	if len(root.IntermediateCerts) == 0 {
-		return 0, 0, errors.New("no intermediate available")
+		return 0, errors.New("no intermediate available")
 	}
 	cert, err := connect.ParseCert(root.IntermediateCerts[len(root.IntermediateCerts)-1])
 	if err != nil {
-		return 0, 0, err
+		return 0, err
 	}
-
-	lifetime := time.Since(cert.NotBefore) + time.Until(cert.NotAfter)
-	return lifetime, time.Until(cert.NotAfter), nil
+	return time.Until(cert.NotAfter), nil
 }
 
 type CertExpirationMonitor struct {
@@ -104,11 +96,9 @@ type CertExpirationMonitor struct {
 	// then the metrics will expire before they are emitted again.
 	Labels []metrics.Label
 	Logger hclog.Logger
-	// Query is called at each interval. It should return 2 durations, the full
-	// lifespan of the certificate (NotBefore -> NotAfter) and the duration
-	// until the certificate expires (Now -> NotAfter), or an error if the
-	// query failed.
-	Query func() (time.Duration, time.Duration, error)
+	// Query is called at each interval. It should return the duration until the
+	// certificate expires, or an error if the query failed.
+	Query func() (time.Duration, error)
 }
 
 const certExpirationMonitorInterval = time.Hour
@@ -120,37 +110,18 @@ func (m CertExpirationMonitor) Monitor(ctx context.Context) error {
 	logger := m.Logger.With("metric", strings.Join(m.Key, "."))
 
 	emitMetric := func() {
-		lifetime, untilAfter, err := m.Query()
+		d, err := m.Query()
 		if err != nil {
 			logger.Warn("failed to emit certificate expiry metric", "error", err)
 			return
 		}
 
-		if expiresSoon(lifetime, untilAfter) {
-			key := strings.Join(m.Key, ":")
-			switch key {
-			case "mesh:active-root-ca:expiry":
-				logger.Warn("root certificate will expire soon",
-					"time_to_expiry", untilAfter,
-					"expiration", time.Now().Add(untilAfter),
-					"suggested_action", "manually rotate the root certificate",
-				)
-			case "mesh:active-signing-ca:expiry":
-				logger.Warn("signing (intermediate) certificate will expire soon",
-					"time_to_expiry", untilAfter,
-					"expiration", time.Now().Add(untilAfter),
-					"suggested_action", "check consul logs for rotation issues",
-				)
-			case "agent:tls:cert:expiry":
-				logger.Warn("agent TLS certificate will expire soon",
-					"time_to_expiry", untilAfter,
-					"expiration", time.Now().Add(untilAfter),
-					"suggested_action", "manually rotate this agent's certificate",
-				)
-			}
+		if d < 24*time.Hour {
+			logger.Warn("certificate will expire soon",
+				"time_to_expiry", d, "expiration", time.Now().Add(d))
 		}
 
-		expiry := untilAfter / time.Second
+		expiry := d / time.Second
 		metrics.SetGaugeWithLabels(m.Key, float32(expiry), m.Labels)
 	}
 
@@ -179,19 +150,3 @@ func initLeaderMetrics() {
 		metrics.SetGaugeWithLabels(g.Name, float32(math.NaN()), g.ConstLabels)
 	}
 }
-
-// expiresSoon checks to see if we are close enough to the cert expiring that
-// we should send out a WARN log message.
-// It returns true if the cert will expire within 28 days or 40% of the
-// certificate's total duration (whichever is shorter).
-func expiresSoon(lifetime, untilAfter time.Duration) bool {
-	defaultPeriod := 28 * (24 * time.Hour) // 28 days
-	fortyPercent := (lifetime / 10) * 4    // 40% of total duration
-
-	warningPeriod := defaultPeriod
-	if fortyPercent < defaultPeriod {
-		warningPeriod = fortyPercent
-	}
-
-	return untilAfter < warningPeriod
-}
diff --git a/agent/consul/leader_metrics_test.go b/agent/consul/leader_metrics_test.go
deleted file mode 100644
index e3636e1bcf8c9..0000000000000
--- a/agent/consul/leader_metrics_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package consul
-
-import (
-	"testing"
-	"time"
-)
-
-const (
-	day  = time.Hour * 24
-	year = day * 365
-)
-
-func TestExpiresSoon(t *testing.T) {
-	// ExpiresSoon() should return true if 'untilAfter' is <= 28 days
-	// OR if 40% of lifetime if it is less than 28 days
-	testCases := []struct {
-		name                 string
-		lifetime, untilAfter time.Duration
-		expiresSoon          bool
-	}{
-		{name: "base-pass", lifetime: year, untilAfter: year, expiresSoon: false},
-		{name: "base-expire", lifetime: year, untilAfter: (day * 27), expiresSoon: true},
-		{name: "expires", lifetime: (day * 70), untilAfter: (day * 20), expiresSoon: true},
-		{name: "passes", lifetime: (day * 70), untilAfter: (day * 50), expiresSoon: false},
-		{name: "just-expires", lifetime: (day * 70), untilAfter: (day * 27), expiresSoon: true},
-		{name: "just-passes", lifetime: (day * 70), untilAfter: (day * 43), expiresSoon: false},
-		{name: "40%-expire", lifetime: (day * 30), untilAfter: (day * 10), expiresSoon: true},
-		{name: "40%-pass", lifetime: (day * 30), untilAfter: (day * 12), expiresSoon: false},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			if expiresSoon(tc.lifetime, tc.untilAfter) != tc.expiresSoon {
-				t.Errorf("test case failed, should return `%t`", tc.expiresSoon)
-			}
-		})
-	}
-}
diff --git a/agent/consul/leader_peering.go b/agent/consul/leader_peering.go
index 0f58ed08f491e..4e76c26d31dda 100644
--- a/agent/consul/leader_peering.go
+++ b/agent/consul/leader_peering.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -30,9 +27,8 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/logging"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/pbpeerstream"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeerstream"
 )
 
 var leaderExportedServicesCountKeyDeprecated = []string{"consul", "peering", "exported_services"}
@@ -389,7 +385,6 @@ func (s *Server) establishStream(ctx context.Context,
 					Remote: &pbpeering.RemoteInfo{
 						Partition:  peer.Partition,
 						Datacenter: s.config.Datacenter,
-						Locality:   pbcommon.LocalityToProto(s.config.Locality),
 					},
 				},
 			},
diff --git a/agent/consul/leader_peering_test.go b/agent/consul/leader_peering_test.go
index 8db496273d281..757fc87eebc5d 100644
--- a/agent/consul/leader_peering_test.go
+++ b/agent/consul/leader_peering_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -31,8 +28,7 @@ import (
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
@@ -689,11 +685,6 @@ func TestLeader_Peering_RemoteInfo(t *testing.T) {
 		t.Skip("too slow for testing.Short")
 	}
 
-	acceptorLocality := &structs.Locality{
-		Region: "us-west-2",
-		Zone:   "us-west-2a",
-	}
-
 	ca := connect.TestCA(t, nil)
 	_, acceptingServer := testServerWithConfig(t, func(c *Config) {
 		c.NodeName = "accepting-server"
@@ -709,7 +700,6 @@ func TestLeader_Peering_RemoteInfo(t *testing.T) {
 				"RootCert":   ca.RootCert,
 			},
 		}
-		c.Locality = acceptorLocality
 	})
 	testrpc.WaitForLeader(t, acceptingServer.RPC, "dc1")
 
@@ -717,10 +707,6 @@ func TestLeader_Peering_RemoteInfo(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
 	t.Cleanup(cancel)
 
-	dialerLocality := &structs.Locality{
-		Region: "us-west-1",
-		Zone:   "us-west-1a",
-	}
 	conn, err := grpc.DialContext(ctx, acceptingServer.config.RPCAddr.String(),
 		grpc.WithContextDialer(newServerDialer(acceptingServer.config.RPCAddr.String())),
 		//nolint:staticcheck
@@ -743,7 +729,6 @@ func TestLeader_Peering_RemoteInfo(t *testing.T) {
 	// Ensure that the token contains the correct partition and dc
 	require.Equal(t, "dc1", token.Remote.Datacenter)
 	require.Contains(t, []string{"", "default"}, token.Remote.Partition)
-	require.Equal(t, acceptorLocality, token.Remote.Locality)
 
 	// Bring up dialingServer and store acceptingServer's token so that it attempts to dial.
 	_, dialingServer := testServerWithConfig(t, func(c *Config) {
@@ -751,7 +736,6 @@ func TestLeader_Peering_RemoteInfo(t *testing.T) {
 		c.Datacenter = "dc2"
 		c.PrimaryDatacenter = "dc2"
 		c.PeeringEnabled = true
-		c.Locality = dialerLocality
 	})
 	testrpc.WaitForLeader(t, dialingServer.RPC, "dc2")
 
@@ -783,7 +767,6 @@ func TestLeader_Peering_RemoteInfo(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, "dc1", p.Peering.Remote.Datacenter)
 	require.Contains(t, []string{"", "default"}, p.Peering.Remote.Partition)
-	require.Equal(t, pbcommon.LocalityToProto(acceptorLocality), p.Peering.Remote.Locality)
 
 	// Retry fetching the until the peering is active in the acceptor.
 	ctx, cancel = context.WithTimeout(context.Background(), 10*time.Second)
@@ -799,7 +782,6 @@ func TestLeader_Peering_RemoteInfo(t *testing.T) {
 	require.NotNil(t, p)
 	require.Equal(t, "dc2", p.Peering.Remote.Datacenter)
 	require.Contains(t, []string{"", "default"}, p.Peering.Remote.Partition)
-	require.Equal(t, pbcommon.LocalityToProto(dialerLocality), p.Peering.Remote.Locality)
 }
 
 // Test that the dialing peer attempts to reestablish connections when the accepting peer
@@ -1921,7 +1903,7 @@ func Test_Leader_PeeringSync_ServerAddressUpdates(t *testing.T) {
 			require.True(r, found)
 			// We assert for this error to be set which would indicate that we iterated
 			// through a bad address.
-			require.Contains(r, status.LastSendErrorMessage, "transport: Error while dialing: dial tcp: address bad: missing port in address")
+			require.Contains(r, status.LastSendErrorMessage, "transport: Error while dialing dial tcp: address bad: missing port in address")
 			require.False(r, status.Connected)
 		})
 	})
diff --git a/agent/consul/leader_test.go b/agent/consul/leader_test.go
index 7a4b63eb05ee9..80af470e4f315 100644
--- a/agent/consul/leader_test.go
+++ b/agent/consul/leader_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -1640,7 +1637,7 @@ func TestLeader_ConfigEntryBootstrap_Fail(t *testing.T) {
 			deps := newDefaultDeps(t, config)
 			deps.Logger = logger
 
-			srv, err := NewServer(config, deps, grpc.NewServer(), nil, logger, nil)
+			srv, err := NewServer(config, deps, grpc.NewServer(), nil, logger)
 			require.NoError(t, err)
 			defer srv.Shutdown()
 
diff --git a/agent/consul/logging.go b/agent/consul/logging.go
index cfafe62b0d31f..94cc38f9208c2 100644
--- a/agent/consul/logging.go
+++ b/agent/consul/logging.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/logging_test.go b/agent/consul/logging_test.go
index 3b756c0bb6226..8f747bb43d784 100644
--- a/agent/consul/logging_test.go
+++ b/agent/consul/logging_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/merge.go b/agent/consul/merge.go
index f6771d110f0ce..553a980b38f2a 100644
--- a/agent/consul/merge.go
+++ b/agent/consul/merge.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/merge_ce.go b/agent/consul/merge_ce.go
index c5d8096e708a7..515bbbcd1a846 100644
--- a/agent/consul/merge_ce.go
+++ b/agent/consul/merge_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
@@ -12,10 +10,6 @@ import (
 )
 
 func (md *lanMergeDelegate) enterpriseNotifyMergeMember(m *serf.Member) error {
-	if memberFIPS := m.Tags["fips"]; memberFIPS != "" {
-		return fmt.Errorf("Member '%s' is FIPS Consul; FIPS Consul is only available in Consul Enterprise",
-			m.Name)
-	}
 	if memberPartition := m.Tags["ap"]; memberPartition != "" {
 		return fmt.Errorf("Member '%s' part of partition '%s'; Partitions are a Consul Enterprise feature",
 			m.Name, memberPartition)
diff --git a/agent/consul/merge_ce_test.go b/agent/consul/merge_ce_test.go
index e12ea660f72fa..f046300de6724 100644
--- a/agent/consul/merge_ce_test.go
+++ b/agent/consul/merge_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/merge_test.go b/agent/consul/merge_test.go
index bc9d1f2cb4da8..c508f6942de3a 100644
--- a/agent/consul/merge_test.go
+++ b/agent/consul/merge_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -12,7 +9,6 @@ import (
 
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/types"
-	"github.com/hashicorp/consul/version"
 )
 
 func TestMerge_LAN(t *testing.T) {
@@ -283,7 +279,6 @@ func makeTestNode(t *testing.T, tm testMember) *serf.Member {
 			"vsn":     "2",
 			"vsn_max": "3",
 			"vsn_min": "2",
-			"fips":    version.GetFIPSInfo(),
 		},
 	}
 	if tm.partition != "" {
diff --git a/agent/consul/multilimiter/mock_RateLimiter.go b/agent/consul/multilimiter/mock_RateLimiter.go
index 0c33f92bfa832..d36c2e161ef9b 100644
--- a/agent/consul/multilimiter/mock_RateLimiter.go
+++ b/agent/consul/multilimiter/mock_RateLimiter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.20.0. DO NOT EDIT.
+// Code generated by mockery v2.15.0. DO NOT EDIT.
 
 package multilimiter
 
@@ -27,11 +27,6 @@ func (_m *MockRateLimiter) Allow(entity LimitedEntity) bool {
 	return r0
 }
 
-// DeleteConfig provides a mock function with given fields: prefix
-func (_m *MockRateLimiter) DeleteConfig(prefix []byte) {
-	_m.Called(prefix)
-}
-
 // Run provides a mock function with given fields: ctx
 func (_m *MockRateLimiter) Run(ctx context.Context) {
 	_m.Called(ctx)
diff --git a/agent/consul/multilimiter/multilimiter.go b/agent/consul/multilimiter/multilimiter.go
index a0b9a6044f0df..c66948b263c74 100644
--- a/agent/consul/multilimiter/multilimiter.go
+++ b/agent/consul/multilimiter/multilimiter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package multilimiter
 
 import (
@@ -18,10 +15,14 @@ var _ RateLimiter = &MultiLimiter{}
 
 const separator = "♣"
 
-func Key(keys ...[]byte) KeyType {
+func makeKey(keys ...[]byte) KeyType {
 	return bytes.Join(keys, []byte(separator))
 }
 
+func Key(prefix, key []byte) KeyType {
+	return makeKey(prefix, key)
+}
+
 // RateLimiter is the interface implemented by MultiLimiter
 //
 //go:generate mockery --name RateLimiter --inpackage --filename mock_RateLimiter.go
@@ -29,7 +30,6 @@ type RateLimiter interface {
 	Run(ctx context.Context)
 	Allow(entity LimitedEntity) bool
 	UpdateConfig(c LimiterConfig, prefix []byte)
-	DeleteConfig(prefix []byte)
 }
 
 type limiterWithKey struct {
@@ -71,6 +71,7 @@ type LimiterConfig struct {
 
 // Config is a MultiLimiter configuration
 type Config struct {
+	LimiterConfig
 	ReconcileCheckLimit    time.Duration
 	ReconcileCheckInterval time.Duration
 }
@@ -78,13 +79,14 @@ type Config struct {
 // UpdateConfig will update the MultiLimiter Config
 // which will cascade to all the Limiter(s) LimiterConfig
 func (m *MultiLimiter) UpdateConfig(c LimiterConfig, prefix []byte) {
-	m.updateConfig(&c, prefix)
-}
-
-// DeleteConfig will delete the MultiLimiter Config
-// which will cascade to all the Limiter(s) LimiterConfig
-func (m *MultiLimiter) DeleteConfig(prefix []byte) {
-	m.updateConfig(nil, prefix)
+	m.configsLock.Lock()
+	defer m.configsLock.Unlock()
+	if prefix == nil {
+		prefix = []byte("")
+	}
+	configs := m.limitersConfigs.Load()
+	newConfigs, _, _ := configs.Insert(prefix, &c)
+	m.limitersConfigs.Store(newConfigs)
 }
 
 // NewMultiLimiter create a new MultiLimiter
@@ -129,9 +131,19 @@ func (m *MultiLimiter) Run(ctx context.Context) {
 
 }
 
+func splitKey(key []byte) ([]byte, []byte) {
+
+	ret := bytes.SplitN(key, []byte(separator), 2)
+	if len(ret) != 2 {
+		return []byte(""), []byte("")
+	}
+	return ret[0], ret[1]
+}
+
 // Allow should be called by a request processor to check if the current request is Limited
 // The request processor should provide a LimitedEntity that implement the right Key()
 func (m *MultiLimiter) Allow(e LimitedEntity) bool {
+	prefix, _ := splitKey(e.Key())
 	limiters := m.limiters.Load()
 	l, ok := limiters.Get(e.Key())
 	now := time.Now()
@@ -145,42 +157,20 @@ func (m *MultiLimiter) Allow(e LimitedEntity) bool {
 	}
 
 	configs := m.limitersConfigs.Load()
-
-	p, _, ok := configs.Root().LongestPrefix(e.Key())
-
-	if !ok {
-		return true
-	}
-	var config *LimiterConfig
-	c, ok := configs.Get(p)
-	if ok && c != nil {
-		config = c.(*LimiterConfig)
+	c, okP := configs.Get(prefix)
+	var config = &m.defaultConfig.Load().LimiterConfig
+	if okP {
+		prefixConfig := c.(*LimiterConfig)
+		if prefixConfig != nil {
+			config = prefixConfig
+		}
 	}
-
 	limiter := &Limiter{limiter: rate.NewLimiter(config.Rate, config.Burst)}
 	limiter.lastAccess.Store(unixNow)
 	m.limiterCh <- &limiterWithKey{l: limiter, k: e.Key(), t: now}
 	return limiter.limiter.Allow()
 }
 
-// UpdateConfig will update the MultiLimiter Config
-// which will cascade to all the Limiter(s) LimiterConfig
-func (m *MultiLimiter) updateConfig(c *LimiterConfig, prefix []byte) {
-	m.configsLock.Lock()
-	defer m.configsLock.Unlock()
-	if prefix == nil {
-		prefix = []byte("")
-	}
-	configs := m.limitersConfigs.Load()
-	var newConfigs *radix.Tree
-	if c == nil {
-		newConfigs, _, _ = configs.Delete(prefix)
-	} else {
-		newConfigs, _, _ = configs.Insert(prefix, c)
-	}
-	m.limitersConfigs.Store(newConfigs)
-}
-
 type ticker interface {
 	Ticker() <-chan time.Time
 }
@@ -192,6 +182,7 @@ type tickerWrapper struct {
 func (t tickerWrapper) Ticker() <-chan time.Time {
 	return t.ticker.C
 }
+
 func (m *MultiLimiter) reconcile(ctx context.Context, waiter ticker, txn *radix.Txn, reconcileCheckLimit time.Duration) *radix.Txn {
 	select {
 	case <-waiter.Ticker():
@@ -232,14 +223,8 @@ func (m *MultiLimiter) reconcileConfig(txn *radix.Txn) {
 
 		// find the prefix for the leaf and check if the defaultConfig is up-to-date
 		// it's possible that the prefix is equal to the key
-		p, _, ok := m.limitersConfigs.Load().Root().LongestPrefix(k)
-
-		// no corresponding config found, need to delete it
-		if !ok {
-			txn.Delete(k)
-			continue
-		}
-		v, ok := m.limitersConfigs.Load().Get(p)
+		prefix, _ := splitKey(k)
+		v, ok := m.limitersConfigs.Load().Get(prefix)
 		if v == nil || !ok {
 			continue
 		}
diff --git a/agent/consul/multilimiter/multilimiter_test.go b/agent/consul/multilimiter/multilimiter_test.go
index e7cdab4e14824..ceb38a2b850e3 100644
--- a/agent/consul/multilimiter/multilimiter_test.go
+++ b/agent/consul/multilimiter/multilimiter_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package multilimiter
 
 import (
@@ -8,15 +5,14 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
-	"math/rand"
-	"sync"
-	"testing"
-	"time"
-
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 	radix "github.com/hashicorp/go-immutable-radix"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/time/rate"
+	"math/rand"
+	"sync"
+	"testing"
+	"time"
 )
 
 type Limited struct {
@@ -28,19 +24,17 @@ func (l Limited) Key() []byte {
 }
 
 func TestNewMultiLimiter(t *testing.T) {
-	c := Config{}
+	c := Config{LimiterConfig: LimiterConfig{Rate: 0.1}}
 	m := NewMultiLimiter(c)
 	require.NotNil(t, m)
 	require.NotNil(t, m.limiters)
 }
 
 func TestRateLimiterUpdate(t *testing.T) {
-	c := Config{ReconcileCheckLimit: 1 * time.Hour, ReconcileCheckInterval: 10 * time.Millisecond}
+	c := Config{LimiterConfig: LimiterConfig{Rate: 0.1}, ReconcileCheckLimit: 1 * time.Hour, ReconcileCheckInterval: 10 * time.Millisecond}
 	m := NewMultiLimiter(c)
-	key := Key([]byte("test"))
+	key := makeKey([]byte("test"))
 
-	c1 := LimiterConfig{Rate: 10}
-	m.UpdateConfig(c1, key)
 	//Allow a key
 	m.Allow(Limited{key: key})
 	storeLimiter(m)
@@ -77,22 +71,21 @@ func TestRateLimiterUpdate(t *testing.T) {
 func TestRateLimiterCleanup(t *testing.T) {
 
 	// Create a limiter and Allow a key, check the key exists
-	c := Config{ReconcileCheckLimit: 1 * time.Second, ReconcileCheckInterval: 10 * time.Millisecond}
+	c := Config{LimiterConfig: LimiterConfig{Rate: 0.1}, ReconcileCheckLimit: 1 * time.Second, ReconcileCheckInterval: 10 * time.Millisecond}
 	m := NewMultiLimiter(c)
 	limiters := m.limiters.Load()
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	m.Run(ctx)
-	key := Key([]byte("test"))
-	m.UpdateConfig(LimiterConfig{Rate: 0.1}, key)
+	key := makeKey([]byte("test"))
 	m.Allow(Limited{key: key})
-	retry.RunWith(&retry.Timer{Wait: 100 * time.Millisecond, Timeout: 10 * time.Second}, t, func(r *retry.R) {
+	retry.RunWith(&retry.Timer{Wait: 100 * time.Millisecond, Timeout: 2 * time.Second}, t, func(r *retry.R) {
 		l := m.limiters.Load()
 		require.NotEqual(r, limiters, l)
 		limiters = l
 	})
 
-	retry.RunWith(&retry.Timer{Wait: 100 * time.Millisecond, Timeout: 10 * time.Second}, t, func(r *retry.R) {
+	retry.RunWith(&retry.Timer{Wait: 100 * time.Millisecond, Timeout: 2 * time.Second}, t, func(r *retry.R) {
 		v, ok := limiters.Get(key)
 		require.True(r, ok)
 		require.NotNil(r, v)
@@ -127,104 +120,79 @@ func reconcile(m *MultiLimiter) {
 	ctx := context.Background()
 	reconcileCheckLimit := m.defaultConfig.Load().ReconcileCheckLimit
 	mockTicker.tickerCh <- time.Now()
-	txn = m.reconcile(ctx, &mockTicker, txn, reconcileCheckLimit)
-	m.limiters.Store(txn.Commit())
+	m.reconcile(ctx, &mockTicker, txn, reconcileCheckLimit)
 }
 
 func TestRateLimiterStore(t *testing.T) {
 	// Create a MultiLimiter m with a defaultConfig c and check the defaultConfig is applied
 
 	t.Run("Store multiple transactions", func(t *testing.T) {
-		c := Config{ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
+		c := Config{LimiterConfig: LimiterConfig{Rate: 0.1}, ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
 		m := NewMultiLimiter(c)
 		require.Equal(t, *m.defaultConfig.Load(), c)
 		ipNoPrefix1 := Key([]byte(""), []byte("127.0.0.1"))
-		c1 := LimiterConfig{Rate: 1}
 		ipNoPrefix2 := Key([]byte(""), []byte("127.0.0.2"))
-		c2 := LimiterConfig{Rate: 2}
-
 		{
-			// Update config for ipNoPrefix1 and check it's applied
-			m.UpdateConfig(c1, ipNoPrefix1)
 			m.Allow(ipLimited{key: ipNoPrefix1})
 			storeLimiter(m)
 			l, ok := m.limiters.Load().Get(ipNoPrefix1)
 			require.True(t, ok)
 			require.NotNil(t, l)
 			limiter := l.(*Limiter)
-			require.True(t, c1.isApplied(limiter.limiter))
+			require.True(t, c.isApplied(limiter.limiter))
 		}
-
 		{
-			// Update config for ipNoPrefix2 and check it's applied
-			m.UpdateConfig(c2, ipNoPrefix2)
 			m.Allow(ipLimited{key: ipNoPrefix2})
 			storeLimiter(m)
 			l, ok := m.limiters.Load().Get(ipNoPrefix2)
 			require.True(t, ok)
 			require.NotNil(t, l)
 			limiter := l.(*Limiter)
-			require.True(t, c2.isApplied(limiter.limiter))
-
-			//Check that ipNoPrefix1 is unchanged
+			require.True(t, c.isApplied(limiter.limiter))
 			l, ok = m.limiters.Load().Get(ipNoPrefix1)
 			require.True(t, ok)
 			require.NotNil(t, l)
 			limiter = l.(*Limiter)
-			require.True(t, c1.isApplied(limiter.limiter))
+			require.True(t, c.isApplied(limiter.limiter))
 		}
 	})
 	t.Run("runStore store multiple Limiters", func(t *testing.T) {
-		c := Config{ReconcileCheckLimit: 10 * time.Second, ReconcileCheckInterval: 10 * time.Millisecond}
+		c := Config{LimiterConfig: LimiterConfig{Rate: 0.1}, ReconcileCheckLimit: 10 * time.Second, ReconcileCheckInterval: 10 * time.Millisecond}
 		m := NewMultiLimiter(c)
 		require.Equal(t, *m.defaultConfig.Load(), c)
 		ctx, cancel := context.WithCancel(context.Background())
 		m.Run(ctx)
 		defer cancel()
-
-		// Create a limiter for ipNoPrefix1
 		ipNoPrefix1 := Key([]byte(""), []byte("127.0.0.1"))
-		c1 := LimiterConfig{Rate: 1}
+		ipNoPrefix2 := Key([]byte(""), []byte("127.0.0.2"))
 		limiters := m.limiters.Load()
-		m.UpdateConfig(c1, ipNoPrefix1)
 		m.Allow(ipLimited{key: ipNoPrefix1})
 		retry.RunWith(&retry.Timer{Wait: 1 * time.Second, Timeout: 5 * time.Second}, t, func(r *retry.R) {
 			l := m.limiters.Load()
 			require.NotEqual(r, limiters, l)
 			limiters = l
 		})
-
-		// Check that ipNoPrefix1 have the expected limiter
 		l, ok := m.limiters.Load().Get(ipNoPrefix1)
 		require.True(t, ok)
 		require.NotNil(t, l)
 		limiter := l.(*Limiter)
-		require.True(t, c1.isApplied(limiter.limiter))
-
-		// Create a limiter for ipNoPrefix2
-		ipNoPrefix2 := Key([]byte(""), []byte("127.0.0.2"))
-		c2 := LimiterConfig{Rate: 2}
-		m.UpdateConfig(c2, ipNoPrefix2)
+		require.True(t, c.isApplied(limiter.limiter))
 		m.Allow(ipLimited{key: ipNoPrefix2})
 		retry.RunWith(&retry.Timer{Wait: 1 * time.Second, Timeout: 5 * time.Second}, t, func(r *retry.R) {
 			l := m.limiters.Load()
 			require.NotEqual(r, limiters, l)
 			limiters = l
 		})
-
-		// Check that ipNoPrefix1 have the expected limiter
 		l, ok = m.limiters.Load().Get(ipNoPrefix1)
 		require.True(t, ok)
 		require.NotNil(t, l)
 		limiter = l.(*Limiter)
-		require.True(t, c1.isApplied(limiter.limiter))
-
-		// Check that ipNoPrefix2 have the expected limiter
+		require.True(t, c.isApplied(limiter.limiter))
 		l, ok = m.limiters.Load().Get(ipNoPrefix2)
 		require.True(t, ok)
 		require.NotNil(t, l)
 		limiter = l.(*Limiter)
-		require.True(t, c2.isApplied(limiter.limiter))
+		require.True(t, c.isApplied(limiter.limiter))
 	})
 
 }
@@ -234,38 +202,26 @@ func TestRateLimiterUpdateConfig(t *testing.T) {
 	// Create a MultiLimiter m with a defaultConfig c and check the defaultConfig is applied
 
 	t.Run("Allow a key and check defaultConfig is applied to that key", func(t *testing.T) {
-		//Create a multilimiter
-		c := Config{ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
+		c := Config{LimiterConfig: LimiterConfig{Rate: 0.1}, ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
 		m := NewMultiLimiter(c)
 		require.Equal(t, *m.defaultConfig.Load(), c)
-
-		//Create a limiter for ipNoPrefix
 		ipNoPrefix := Key([]byte(""), []byte("127.0.0.1"))
-		c1 := LimiterConfig{Rate: 1}
-		m.UpdateConfig(c1, ipNoPrefix)
 		m.Allow(ipLimited{key: ipNoPrefix})
 		storeLimiter(m)
-
-		// Verify the expected limiter is applied
 		l, ok := m.limiters.Load().Get(ipNoPrefix)
 		require.True(t, ok)
 		require.NotNil(t, l)
 		limiter := l.(*Limiter)
-		require.True(t, c1.isApplied(limiter.limiter))
+		require.True(t, c.isApplied(limiter.limiter))
 	})
 
 	t.Run("Update nil prefix and make sure it's written in the root", func(t *testing.T) {
-		//Create a multilimiter
-		c := Config{ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
+		c := Config{LimiterConfig: LimiterConfig{Rate: 0.1}, ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
 		m := NewMultiLimiter(c)
 		require.Equal(t, *m.defaultConfig.Load(), c)
-
-		//Create a limiter for nil
 		prefix := []byte(nil)
-		c1 := LimiterConfig{Rate: 1}
+		c1 := LimiterConfig{Rate: 2}
 		m.UpdateConfig(c1, prefix)
-
-		// Verify the expected limiter is applied
 		v, ok := m.limitersConfigs.Load().Get([]byte(""))
 		require.True(t, ok)
 		require.NotNil(t, v)
@@ -274,39 +230,25 @@ func TestRateLimiterUpdateConfig(t *testing.T) {
 	})
 
 	t.Run("Allow 2 keys with prefix and check defaultConfig is applied to those keys", func(t *testing.T) {
-		//Create a multilimiter
-		c := Config{ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
+		c := Config{LimiterConfig: LimiterConfig{Rate: 0.1}, ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
 		m := NewMultiLimiter(c)
 		require.Equal(t, *m.defaultConfig.Load(), c)
-
-		//Create a limiter for ip
 		prefix := []byte("namespace.write")
 		ip := Key(prefix, []byte("127.0.0.1"))
-		c1 := LimiterConfig{Rate: 1}
-		m.UpdateConfig(c1, ip)
 		m.Allow(ipLimited{key: ip})
 		storeLimiter(m)
-
-		//Create a limiter for ip2
 		ip2 := Key(prefix, []byte("127.0.0.2"))
-		c2 := LimiterConfig{Rate: 2}
-		m.UpdateConfig(c2, ip2)
 		m.Allow(ipLimited{key: ip2})
-
-		//Verify the config is applied for ip
 		l, ok := m.limiters.Load().Get(ip)
 		require.True(t, ok)
 		require.NotNil(t, l)
 		limiter := l.(*Limiter)
-		require.True(t, c1.isApplied(limiter.limiter))
+		require.True(t, c.LimiterConfig.isApplied(limiter.limiter))
 	})
 	t.Run("Apply a defaultConfig to 'namespace.write' check the defaultConfig is applied to existing keys under that prefix", func(t *testing.T) {
-		//Create a multilimiter
-		c := Config{ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
+		c := Config{LimiterConfig: LimiterConfig{Rate: 0.1}, ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
 		m := NewMultiLimiter(c)
 		require.Equal(t, *m.defaultConfig.Load(), c)
-
-		//Create a limiter for ip
 		prefix := []byte("namespace.write")
 		ip := Key(prefix, []byte("127.0.0.1"))
 		c3 := LimiterConfig{Rate: 2}
@@ -315,8 +257,6 @@ func TestRateLimiterUpdateConfig(t *testing.T) {
 		m.reconcileConfig(m.limiters.Load().Txn())
 		m.Allow(ipLimited{key: ip})
 		storeLimiter(m)
-
-		//Verify the config is applied for ip
 		l3, ok3 := m.limiters.Load().Get(ip)
 		require.True(t, ok3)
 		require.NotNil(t, l3)
@@ -324,20 +264,15 @@ func TestRateLimiterUpdateConfig(t *testing.T) {
 		require.True(t, c3.isApplied(limiter3.limiter))
 	})
 	t.Run("Allow an IP with prefix and check prefix defaultConfig is applied to new keys under that prefix", func(t *testing.T) {
-		//Create a multilimiter
-		c := Config{ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
+		c := Config{LimiterConfig: LimiterConfig{Rate: 0.1}, ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
 		m := NewMultiLimiter(c)
 		require.Equal(t, *m.defaultConfig.Load(), c)
-
-		//Create a limiter for ip
 		c1 := LimiterConfig{Rate: 3}
 		prefix := []byte("namespace.read")
 		m.UpdateConfig(c1, prefix)
 		ip := Key(prefix, []byte("127.0.0.1"))
 		m.Allow(ipLimited{key: ip})
 		storeLimiter(m)
-
-		//Verify the config is applied for ip
 		l, ok := m.limiters.Load().Get(ip)
 		require.True(t, ok)
 		require.NotNil(t, l)
@@ -345,106 +280,10 @@ func TestRateLimiterUpdateConfig(t *testing.T) {
 		require.True(t, c1.isApplied(limiter.limiter))
 	})
 
-	t.Run("Allow an IP with prefix and check prefix defaultConfig is applied to new keys under that prefix, delete config and check default applied", func(t *testing.T) {
-		//Create a multilimiter
-		c := Config{ReconcileCheckLimit: 100 * time.Second, ReconcileCheckInterval: 10 * time.Millisecond}
-		m := NewMultiLimiter(c)
-		require.Equal(t, *m.defaultConfig.Load(), c)
-
-		//Create a limiter for ip
-		c1 := LimiterConfig{Rate: 3}
-		prefix := []byte("namespace.read")
-		m.UpdateConfig(c1, prefix)
-		ip := Key(prefix, []byte("127.0.0.1"))
-		m.Allow(ipLimited{key: ip})
-		storeLimiter(m)
-
-		//Verify the config is applied for ip
-		l, ok := m.limiters.Load().Get(ip)
-		require.True(t, ok)
-		require.NotNil(t, l)
-		limiter := l.(*Limiter)
-		require.True(t, c1.isApplied(limiter.limiter))
-
-		// Delete the prefix
-		m.DeleteConfig(prefix)
-		reconcile(m)
-
-		// Verify the limiter is removed
-		_, ok = m.limiters.Load().Get(ip)
-		require.False(t, ok)
-	})
-	t.Run("Allow an IP with prefix and check prefix config is applied to new keys under that prefix", func(t *testing.T) {
-		//Create a multilimiter
-		c := Config{ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
-		m := NewMultiLimiter(c)
-		require.Equal(t, *m.defaultConfig.Load(), c)
-
-		//Create a limiter for ip
-		c1 := LimiterConfig{Rate: 3}
-		prefix := Key([]byte("ip.ratelimit"), []byte("127.0"))
-		m.UpdateConfig(c1, prefix)
-		ip := Key([]byte("ip.ratelimit"), []byte("127.0.0.1"))
-		m.Allow(ipLimited{key: ip})
-		storeLimiter(m)
-
-		//Verify the config is applied for ip
-		load := m.limiters.Load()
-		l, ok := load.Get(ip)
-		require.True(t, ok)
-		require.NotNil(t, l)
-		limiter := l.(*Limiter)
-		require.True(t, c1.isApplied(limiter.limiter))
-	})
-
-	t.Run("Allow an IP with 2 prefixes and check prefix config is applied to new keys under that prefix", func(t *testing.T) {
-		//Create a multilimiter
-		c := Config{ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
-		m := NewMultiLimiter(c)
-		require.Equal(t, *m.defaultConfig.Load(), c)
-
-		//Create a limiter for "127.0" ip with config c1
-		c1 := LimiterConfig{Rate: 3}
-		prefix := Key([]byte("ip.ratelimit"), []byte("127.0"))
-		m.UpdateConfig(c1, prefix)
-
-		//Create a limiter for "127.0.0" ip with config c2
-		prefix = Key([]byte("ip.ratelimit"), []byte("127.0.0"))
-		c2 := LimiterConfig{Rate: 6}
-		m.UpdateConfig(c2, prefix)
-		ip := Key([]byte("ip.ratelimit"), []byte("127.0.0.1"))
-		m.Allow(ipLimited{key: ip})
-		storeLimiter(m)
-
-		// Verify that "127.0.0.1" have the right limiter config
-		load := m.limiters.Load()
-		l, ok := load.Get(ip)
-		require.True(t, ok)
-		require.NotNil(t, l)
-		limiter := l.(*Limiter)
-		require.True(t, c2.isApplied(limiter.limiter))
-
-		//Create a limiter for "127.0.1.1" ip with config c2
-		ip = Key([]byte("ip.ratelimit"), []byte("127.0.1.1"))
-		m.Allow(ipLimited{key: ip})
-		storeLimiter(m)
-
-		// Verify that "127.0.1.1" have the right limiter config
-		load = m.limiters.Load()
-		l, ok = load.Get(ip)
-		require.True(t, ok)
-		require.NotNil(t, l)
-		limiter = l.(*Limiter)
-		require.True(t, c1.isApplied(limiter.limiter))
-	})
-
 	t.Run("Allow an IP with prefix and check after it's cleaned new Allow would give it the right defaultConfig", func(t *testing.T) {
-		//Create a multilimiter
-		c := Config{ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
+		c := Config{LimiterConfig: LimiterConfig{Rate: 0.1}, ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
 		m := NewMultiLimiter(c)
 		require.Equal(t, *m.defaultConfig.Load(), c)
-
-		//Create a limiter for ip
 		prefix := []byte("namespace.read")
 		ip := Key(prefix, []byte("127.0.0.1"))
 		c1 := LimiterConfig{Rate: 1}
@@ -453,8 +292,6 @@ func TestRateLimiterUpdateConfig(t *testing.T) {
 		reconcile(m)
 		m.Allow(ipLimited{key: ip})
 		storeLimiter(m)
-
-		//Verify the config is applied for ip
 		l, ok := m.limiters.Load().Get(ip)
 		require.True(t, ok)
 		require.NotNil(t, l)
@@ -464,19 +301,14 @@ func TestRateLimiterUpdateConfig(t *testing.T) {
 }
 
 func FuzzSingleConfig(f *testing.F) {
-	c := Config{ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
+	c := Config{LimiterConfig: LimiterConfig{Rate: 0.1}, ReconcileCheckLimit: 100 * time.Millisecond, ReconcileCheckInterval: 10 * time.Millisecond}
 	m := NewMultiLimiter(c)
 	require.Equal(f, *m.defaultConfig.Load(), c)
-	f.Add(Key(randIP()))
-	f.Add(Key(randIP(), randIP()))
-	f.Add(Key(randIP(), randIP(), randIP()))
-	f.Add(Key(randIP(), randIP(), randIP(), randIP()))
-	c1 := LimiterConfig{
-		Rate:  100,
-		Burst: 123,
-	}
+	f.Add(makeKey(randIP()))
+	f.Add(makeKey(randIP(), randIP()))
+	f.Add(makeKey(randIP(), randIP(), randIP()))
+	f.Add(makeKey(randIP(), randIP(), randIP(), randIP()))
 	f.Fuzz(func(t *testing.T, ff []byte) {
-		m.UpdateConfig(c1, ff)
 		m.Allow(Limited{key: ff})
 		storeLimiter(m)
 		checkLimiter(t, ff, m.limiters.Load().Txn())
@@ -485,9 +317,9 @@ func FuzzSingleConfig(f *testing.F) {
 }
 
 func FuzzSplitKey(f *testing.F) {
-	f.Add(Key(randIP(), randIP()))
-	f.Add(Key(randIP(), randIP(), randIP()))
-	f.Add(Key(randIP(), randIP(), randIP(), randIP()))
+	f.Add(makeKey(randIP(), randIP()))
+	f.Add(makeKey(randIP(), randIP(), randIP()))
+	f.Add(makeKey(randIP(), randIP(), randIP(), randIP()))
 	f.Add([]byte(""))
 	f.Fuzz(func(t *testing.T, ff []byte) {
 		prefix, suffix := splitKey(ff)
@@ -510,9 +342,9 @@ func checkLimiter(t require.TestingT, ff []byte, Tree *radix.Txn) {
 
 func FuzzUpdateConfig(f *testing.F) {
 
-	f.Add(bytes.Join([][]byte{[]byte(""), Key(randIP()), Key(randIP(), randIP()), Key(randIP(), randIP(), randIP()), Key(randIP(), randIP(), randIP(), randIP())}, []byte(",")))
+	f.Add(bytes.Join([][]byte{[]byte(""), makeKey(randIP()), makeKey(randIP(), randIP()), makeKey(randIP(), randIP(), randIP()), makeKey(randIP(), randIP(), randIP(), randIP())}, []byte(",")))
 	f.Fuzz(func(t *testing.T, ff []byte) {
-		cm := Config{ReconcileCheckLimit: 1 * time.Millisecond, ReconcileCheckInterval: 1 * time.Millisecond}
+		cm := Config{LimiterConfig: LimiterConfig{Rate: 0.1}, ReconcileCheckLimit: 1 * time.Millisecond, ReconcileCheckInterval: 1 * time.Millisecond}
 		m := NewMultiLimiter(cm)
 		ctx, cancel := context.WithCancel(context.Background())
 		m.Run(ctx)
@@ -564,7 +396,7 @@ func (i ipLimited) Key() []byte {
 }
 
 func BenchmarkTestRateLimiterFixedIP(b *testing.B) {
-	var Config = Config{ReconcileCheckLimit: time.Microsecond, ReconcileCheckInterval: time.Millisecond}
+	var Config = Config{LimiterConfig: LimiterConfig{Rate: 1.0, Burst: 500}, ReconcileCheckLimit: time.Microsecond, ReconcileCheckInterval: time.Millisecond}
 	m := NewMultiLimiter(Config)
 	ctx, cancel := context.WithCancel(context.Background())
 	m.Run(ctx)
@@ -589,7 +421,7 @@ func BenchmarkTestRateLimiterAllowPrefill(b *testing.B) {
 	for _, tc := range cases {
 
 		b.Run(tc.name, func(b *testing.B) {
-			var Config = Config{ReconcileCheckLimit: time.Second, ReconcileCheckInterval: time.Second}
+			var Config = Config{LimiterConfig: LimiterConfig{Rate: 1.0, Burst: 500}, ReconcileCheckLimit: time.Second, ReconcileCheckInterval: time.Second}
 			m := NewMultiLimiter(Config)
 			var i uint64
 			for i = 0xdeaddead; i < 0xdeaddead+tc.prefill; i++ {
@@ -622,7 +454,7 @@ func BenchmarkTestRateLimiterAllowConcurrencyPrefill(b *testing.B) {
 	for _, tc := range cases {
 
 		b.Run(tc.name, func(b *testing.B) {
-			var Config = Config{ReconcileCheckLimit: time.Second, ReconcileCheckInterval: 100 * time.Second}
+			var Config = Config{LimiterConfig: LimiterConfig{Rate: 1.0, Burst: 500}, ReconcileCheckLimit: time.Second, ReconcileCheckInterval: 100 * time.Second}
 			m := NewMultiLimiter(Config)
 			ctx, cancel := context.WithCancel(context.Background())
 			m.Run(ctx)
@@ -651,7 +483,7 @@ func BenchmarkTestRateLimiterAllowConcurrencyPrefill(b *testing.B) {
 }
 
 func BenchmarkTestRateLimiterRandomIP(b *testing.B) {
-	var Config = Config{ReconcileCheckLimit: time.Microsecond, ReconcileCheckInterval: time.Millisecond}
+	var Config = Config{LimiterConfig: LimiterConfig{Rate: 1.0, Burst: 500}, ReconcileCheckLimit: time.Microsecond, ReconcileCheckInterval: time.Millisecond}
 	m := NewMultiLimiter(Config)
 	ctx, cancel := context.WithCancel(context.Background())
 	m.Run(ctx)
@@ -677,12 +509,3 @@ type mockTicker struct {
 func (m *mockTicker) Ticker() <-chan time.Time {
 	return m.tickerCh
 }
-
-func splitKey(key []byte) ([]byte, []byte) {
-
-	ret := bytes.SplitN(key, []byte(separator), 2)
-	if len(ret) != 2 {
-		return []byte(""), []byte("")
-	}
-	return ret[0], ret[1]
-}
diff --git a/agent/consul/operator_autopilot_endpoint.go b/agent/consul/operator_autopilot_endpoint.go
index 39bd5b648ddb8..babbb79561f78 100644
--- a/agent/consul/operator_autopilot_endpoint.go
+++ b/agent/consul/operator_autopilot_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/operator_autopilot_endpoint_test.go b/agent/consul/operator_autopilot_endpoint_test.go
index 4cef3f0960d42..a0a300c6dad73 100644
--- a/agent/consul/operator_autopilot_endpoint_test.go
+++ b/agent/consul/operator_autopilot_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/operator_backend.go b/agent/consul/operator_backend.go
index 136baa1a22ab1..50d7e56da8bb1 100644
--- a/agent/consul/operator_backend.go
+++ b/agent/consul/operator_backend.go
@@ -1,15 +1,11 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
 	"context"
-
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/acl/resolver"
 	"github.com/hashicorp/consul/agent/rpc/operator"
-	"github.com/hashicorp/consul/proto/private/pboperator"
+	"github.com/hashicorp/consul/proto/pboperator"
 	"github.com/hashicorp/raft"
 )
 
diff --git a/agent/consul/operator_backend_test.go b/agent/consul/operator_backend_test.go
index 0a4650359ec1e..0130416140fea 100644
--- a/agent/consul/operator_backend_test.go
+++ b/agent/consul/operator_backend_test.go
@@ -1,19 +1,15 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
 	"context"
-	"testing"
-	"time"
-
 	"github.com/hashicorp/consul/acl"
 	external "github.com/hashicorp/consul/agent/grpc-external"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pboperator"
+	"github.com/hashicorp/consul/proto/pboperator"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"google.golang.org/grpc/credentials/insecure"
+	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 	gogrpc "google.golang.org/grpc"
@@ -128,7 +124,8 @@ func TestOperatorBackend_TransferLeaderWithACL(t *testing.T) {
 		require.Nil(t, reply)
 		time.Sleep(1 * time.Second)
 		testrpc.WaitForLeader(t, s1.RPC, "dc1")
-		retry.RunWith(&retry.Timer{Wait: time.Second, Timeout: 3 * time.Second}, t, func(r *retry.R) {
+		retry.Run(t, func(r *retry.R) {
+			time.Sleep(1 * time.Second)
 			afterLeader, _ := s1.raft.LeaderWithID()
 			require.NotEmpty(r, afterLeader)
 			if afterLeader != beforeLeader {
@@ -154,7 +151,8 @@ func TestOperatorBackend_TransferLeaderWithACL(t *testing.T) {
 		require.True(t, acl.IsErrPermissionDenied(err))
 		require.Nil(t, reply)
 		testrpc.WaitForLeader(t, s1.RPC, "dc1")
-		retry.RunWith(&retry.Timer{Wait: time.Second, Timeout: 3 * time.Second}, t, func(r *retry.R) {
+		retry.Run(t, func(r *retry.R) {
+			time.Sleep(1 * time.Second)
 			afterLeader, _ := s1.raft.LeaderWithID()
 			require.NotEmpty(r, afterLeader)
 			if afterLeader != beforeLeader {
@@ -178,7 +176,8 @@ func TestOperatorBackend_TransferLeaderWithACL(t *testing.T) {
 		require.True(t, reply.Success)
 		time.Sleep(1 * time.Second)
 		testrpc.WaitForLeader(t, s1.RPC, "dc1")
-		retry.RunWith(&retry.Timer{Wait: 2 * time.Second, Timeout: 6 * time.Second}, t, func(r *retry.R) {
+		retry.Run(t, func(r *retry.R) {
+			time.Sleep(1 * time.Second)
 			afterLeader, _ := s1.raft.LeaderWithID()
 			require.NotEmpty(r, afterLeader)
 			if afterLeader == beforeLeader {
diff --git a/agent/consul/operator_endpoint.go b/agent/consul/operator_endpoint.go
index 67259c9408a95..4dbe7251adb21 100644
--- a/agent/consul/operator_endpoint.go
+++ b/agent/consul/operator_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import "github.com/hashicorp/go-hclog"
diff --git a/agent/consul/operator_raft_endpoint.go b/agent/consul/operator_raft_endpoint.go
index b8a16fc2c3ec9..f5678fffdde5c 100644
--- a/agent/consul/operator_raft_endpoint.go
+++ b/agent/consul/operator_raft_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/operator_raft_endpoint_test.go b/agent/consul/operator_raft_endpoint_test.go
index bb2dc88fc89e3..e4f322130a75e 100644
--- a/agent/consul/operator_raft_endpoint_test.go
+++ b/agent/consul/operator_raft_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/operator_usage_endpoint.go b/agent/consul/operator_usage_endpoint.go
index 68f3137d0a61f..b49ac60bbdc55 100644
--- a/agent/consul/operator_usage_endpoint.go
+++ b/agent/consul/operator_usage_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/options.go b/agent/consul/options.go
index 6dc754b3aef70..e3fca37e665fb 100644
--- a/agent/consul/options.go
+++ b/agent/consul/options.go
@@ -1,10 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
-	"github.com/hashicorp/consul/lib/stringslice"
 	"google.golang.org/grpc"
 
 	"github.com/hashicorp/consul-net-rpc/net/rpc"
@@ -13,17 +9,14 @@ import (
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/grpc-external/limiter"
 	"github.com/hashicorp/consul/agent/hcp"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/pool"
 	"github.com/hashicorp/consul/agent/router"
 	"github.com/hashicorp/consul/agent/rpc/middleware"
 	"github.com/hashicorp/consul/agent/token"
-	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/tlsutil"
 )
 
 type Deps struct {
-	LeafCertManager  *leafcert.Manager
 	EventPublisher   *stream.EventPublisher
 	Logger           hclog.InterceptLogger
 	TLSConfigurator  *tlsutil.Configurator
@@ -33,7 +26,6 @@ type Deps struct {
 	GRPCConnPool     GRPCClientConner
 	LeaderForwarder  LeaderForwarder
 	XDSStreamLimiter *limiter.SessionLimiter
-	Registry         resource.Registry
 	// GetNetRPCInterceptorFunc, if not nil, sets the net/rpc rpc.ServerServiceCallInterceptor on
 	// the server side to record metrics around the RPC requests. If nil, no interceptor is added to
 	// the rpc server.
@@ -44,20 +36,9 @@ type Deps struct {
 	// HCP contains the dependencies required when integrating with the HashiCorp Cloud Platform
 	HCP hcp.Deps
 
-	Experiments []string
-
 	EnterpriseDeps
 }
 
-// useV2Resources returns true if "resource-apis" is present in the Experiments
-// array of the agent config.
-func (d Deps) UseV2Resources() bool {
-	if stringslice.Contains(d.Experiments, CatalogResourceExperimentName) {
-		return true
-	}
-	return false
-}
-
 type GRPCClientConner interface {
 	ClientConn(datacenter string) (*grpc.ClientConn, error)
 	ClientConnLeader() (*grpc.ClientConn, error)
diff --git a/agent/consul/options_ce.go b/agent/consul/options_ce.go
index dbc8dd15ca7ee..0718d309f3e0b 100644
--- a/agent/consul/options_ce.go
+++ b/agent/consul/options_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/peering_backend.go b/agent/consul/peering_backend.go
index 5a27bc6442a1d..aa18cfd04aee0 100644
--- a/agent/consul/peering_backend.go
+++ b/agent/consul/peering_backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -24,7 +21,7 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/ipaddr"
 	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 type PeeringBackend struct {
diff --git a/agent/consul/peering_backend_ce.go b/agent/consul/peering_backend_ce.go
index 22b70886ab4ae..18d567b3c107c 100644
--- a/agent/consul/peering_backend_ce.go
+++ b/agent/consul/peering_backend_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/peering_backend_ce_test.go b/agent/consul/peering_backend_ce_test.go
index d8c476925969c..a9305de5ffa5d 100644
--- a/agent/consul/peering_backend_ce_test.go
+++ b/agent/consul/peering_backend_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
@@ -15,7 +13,7 @@ import (
 
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/hashicorp/consul/testrpc"
 )
diff --git a/agent/consul/peering_backend_test.go b/agent/consul/peering_backend_test.go
index adfe6fe228f95..4858066318941 100644
--- a/agent/consul/peering_backend_test.go
+++ b/agent/consul/peering_backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -20,8 +17,8 @@ import (
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/pool"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/pbpeerstream"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeerstream"
 	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/testrpc"
diff --git a/agent/consul/prepared_query/template.go b/agent/consul/prepared_query/template.go
index 03cf9d2f58505..dfe96f1420722 100644
--- a/agent/consul/prepared_query/template.go
+++ b/agent/consul/prepared_query/template.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package prepared_query
 
 import (
diff --git a/agent/consul/prepared_query/template_test.go b/agent/consul/prepared_query/template_test.go
index 7c9b2f1a3af29..3fbf2d5afb086 100644
--- a/agent/consul/prepared_query/template_test.go
+++ b/agent/consul/prepared_query/template_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package prepared_query
 
 import (
diff --git a/agent/consul/prepared_query/walk.go b/agent/consul/prepared_query/walk.go
index 72296c0c7fe64..09967c55be3d4 100644
--- a/agent/consul/prepared_query/walk.go
+++ b/agent/consul/prepared_query/walk.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package prepared_query
 
 import (
diff --git a/agent/consul/prepared_query/walk_ce_test.go b/agent/consul/prepared_query/walk_ce_test.go
index 00f3edb10de11..0049a62cccf67 100644
--- a/agent/consul/prepared_query/walk_ce_test.go
+++ b/agent/consul/prepared_query/walk_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package prepared_query
 
diff --git a/agent/consul/prepared_query/walk_test.go b/agent/consul/prepared_query/walk_test.go
index b788571e4af5f..12b71a2e3553c 100644
--- a/agent/consul/prepared_query/walk_test.go
+++ b/agent/consul/prepared_query/walk_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package prepared_query
 
 import (
@@ -46,7 +43,6 @@ func TestWalk_ServiceQuery(t *testing.T) {
 		".Tags[1]:tag2",
 		".Tags[2]:tag3",
 		".Peer:",
-		".SamenessGroup:",
 	}
 	expected = append(expected, entMetaWalkFields...)
 	sort.Strings(expected)
diff --git a/agent/consul/prepared_query_endpoint.go b/agent/consul/prepared_query_endpoint.go
index 139556bb1af8c..2d6384c39d226 100644
--- a/agent/consul/prepared_query_endpoint.go
+++ b/agent/consul/prepared_query_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -141,7 +138,7 @@ func (p *PreparedQuery) Apply(args *structs.PreparedQueryRequest, reply *string)
 }
 
 // parseQuery makes sure the entries of a query are valid for a create or
-// update operation. Some fields are not checked or are partially
+// update operation. Some of the fields are not checked or are partially
 // checked, as noted in the comments below. This also updates all the parsed
 // fields of the query.
 func parseQuery(query *structs.PreparedQuery) error {
@@ -205,10 +202,6 @@ func parseService(svc *structs.ServiceQuery) error {
 		return err
 	}
 
-	if err := parseSameness(svc); err != nil {
-		return err
-	}
-
 	// We skip a few fields:
 	// - There's no validation for Datacenters; we skip any unknown entries
 	//   at execution time.
@@ -375,117 +368,108 @@ func (p *PreparedQuery) Execute(args *structs.PreparedQueryExecuteRequest,
 		return structs.ErrQueryNotFound
 	}
 
-	// If we have a sameness group, it controls the initial query and
-	// subsequent failover if required (Enterprise Only)
-	if query.Service.SamenessGroup != "" {
-		wrapper := newQueryServerWrapper(p.srv, p.ExecuteRemote)
-		if err := querySameness(wrapper, *query, args, reply); err != nil {
-			return err
-		}
-	} else {
-		// Execute the query for the local DC.
-		if err := p.execute(query, reply, args.Connect); err != nil {
-			return err
-		}
+	// Execute the query for the local DC.
+	if err := p.execute(query, reply, args.Connect); err != nil {
+		return err
+	}
 
-		// If they supplied a token with the query, use that, otherwise use the
-		// token passed in with the request.
-		token := args.QueryOptions.Token
-		if query.Token != "" {
-			token = query.Token
-		}
-		if err := p.srv.filterACL(token, reply); err != nil {
-			return err
-		}
+	// If they supplied a token with the query, use that, otherwise use the
+	// token passed in with the request.
+	token := args.QueryOptions.Token
+	if query.Token != "" {
+		token = query.Token
+	}
+	if err := p.srv.filterACL(token, reply); err != nil {
+		return err
+	}
 
-		// TODO (slackpad) We could add a special case here that will avoid the
-		// fail over if we filtered everything due to ACLs. This seems like it
-		// might not be worth the code complexity and behavior differences,
-		// though, since this is essentially a misconfiguration.
+	// TODO (slackpad) We could add a special case here that will avoid the
+	// fail over if we filtered everything due to ACLs. This seems like it
+	// might not be worth the code complexity and behavior differences,
+	// though, since this is essentially a misconfiguration.
 
-		// We have to do this ourselves since we are not doing a blocking RPC.
-		p.srv.SetQueryMeta(&reply.QueryMeta, token)
+	// We have to do this ourselves since we are not doing a blocking RPC.
+	p.srv.SetQueryMeta(&reply.QueryMeta, token)
 
-		// Shuffle the results in case coordinates are not available if they
-		// requested an RTT sort.
-		reply.Nodes.Shuffle()
+	// Shuffle the results in case coordinates are not available if they
+	// requested an RTT sort.
+	reply.Nodes.Shuffle()
 
-		// Build the query source. This can be provided by the client, or by
-		// the prepared query. Client-specified takes priority.
-		qs := args.Source
-		if qs.Datacenter == "" {
-			qs.Datacenter = args.Agent.Datacenter
-		}
-		if query.Service.Near != "" && qs.Node == "" {
-			qs.Node = query.Service.Near
-		}
+	// Build the query source. This can be provided by the client, or by
+	// the prepared query. Client-specified takes priority.
+	qs := args.Source
+	if qs.Datacenter == "" {
+		qs.Datacenter = args.Agent.Datacenter
+	}
+	if query.Service.Near != "" && qs.Node == "" {
+		qs.Node = query.Service.Near
+	}
 
-		// Respect the magic "_agent" flag.
-		if qs.Node == "_agent" {
-			qs.Node = args.Agent.Node
-		} else if qs.Node == "_ip" {
-			if args.Source.Ip != "" {
-				_, nodes, err := state.Nodes(nil, structs.NodeEnterpriseMetaInDefaultPartition(), structs.TODOPeerKeyword)
-				if err != nil {
-					return err
-				}
+	// Respect the magic "_agent" flag.
+	if qs.Node == "_agent" {
+		qs.Node = args.Agent.Node
+	} else if qs.Node == "_ip" {
+		if args.Source.Ip != "" {
+			_, nodes, err := state.Nodes(nil, structs.NodeEnterpriseMetaInDefaultPartition(), structs.TODOPeerKeyword)
+			if err != nil {
+				return err
+			}
 
-				for _, node := range nodes {
-					if args.Source.Ip == node.Address {
-						qs.Node = node.Node
-						break
-					}
+			for _, node := range nodes {
+				if args.Source.Ip == node.Address {
+					qs.Node = node.Node
+					break
 				}
-			} else {
-				p.logger.Warn("Prepared Query using near=_ip requires " +
-					"the source IP to be set but none was provided. No distance " +
-					"sorting will be done.")
-
 			}
+		} else {
+			p.logger.Warn("Prepared Query using near=_ip requires " +
+				"the source IP to be set but none was provided. No distance " +
+				"sorting will be done.")
 
-			// Either a source IP was given, but we couldn't find the associated node
-			// or no source ip was given. In both cases we should wipe the Node value
-			if qs.Node == "_ip" {
-				qs.Node = ""
-			}
 		}
 
-		// Perform the distance sort
-		err = p.srv.sortNodesByDistanceFrom(qs, reply.Nodes)
-		if err != nil {
-			return err
+		// Either a source IP was given but we couldnt find the associated node
+		// or no source ip was given. In both cases we should wipe the Node value
+		if qs.Node == "_ip" {
+			qs.Node = ""
 		}
+	}
 
-		// If we applied a distance sort, make sure that the node queried for is in
-		// position 0, provided the results are from the same datacenter.
-		if qs.Node != "" && reply.Datacenter == qs.Datacenter {
-			for i, node := range reply.Nodes {
-				if strings.EqualFold(node.Node.Node, qs.Node) {
-					reply.Nodes[0], reply.Nodes[i] = reply.Nodes[i], reply.Nodes[0]
-					break
-				}
+	// Perform the distance sort
+	err = p.srv.sortNodesByDistanceFrom(qs, reply.Nodes)
+	if err != nil {
+		return err
+	}
 
-				// Put a cap on the depth of the search. The local agent should
-				// never be further in than this if distance sorting was applied.
-				if i == 9 {
-					break
-				}
+	// If we applied a distance sort, make sure that the node queried for is in
+	// position 0, provided the results are from the same datacenter.
+	if qs.Node != "" && reply.Datacenter == qs.Datacenter {
+		for i, node := range reply.Nodes {
+			if strings.EqualFold(node.Node.Node, qs.Node) {
+				reply.Nodes[0], reply.Nodes[i] = reply.Nodes[i], reply.Nodes[0]
+				break
 			}
-		}
 
-		// Apply the limit if given.
-		if args.Limit > 0 && len(reply.Nodes) > args.Limit {
-			reply.Nodes = reply.Nodes[:args.Limit]
+			// Put a cap on the depth of the search. The local agent should
+			// never be further in than this if distance sorting was applied.
+			if i == 9 {
+				break
+			}
 		}
+	}
 
-		// In the happy path where we found some healthy nodes we go with that
-		// and bail out. Otherwise, we fail over and try remote DCs, as allowed
-		// by the query setup.
-		if len(reply.Nodes) == 0 {
-			wrapper := newQueryServerWrapper(p.srv, p.ExecuteRemote)
-			if err := queryFailover(wrapper, *query, args, reply); err != nil {
-				return err
-			}
+	// Apply the limit if given.
+	if args.Limit > 0 && len(reply.Nodes) > args.Limit {
+		reply.Nodes = reply.Nodes[:args.Limit]
+	}
+
+	// In the happy path where we found some healthy nodes we go with that
+	// and bail out. Otherwise, we fail over and try remote DCs, as allowed
+	// by the query setup.
+	if len(reply.Nodes) == 0 {
+		wrapper := &queryServerWrapper{srv: p.srv, executeRemote: p.ExecuteRemote}
+		if err := queryFailover(wrapper, *query, args, reply); err != nil {
+			return err
 		}
 	}
 
@@ -673,38 +657,20 @@ func serviceMetaFilter(filters map[string]string, nodes structs.CheckServiceNode
 	return filtered
 }
 
-type stateLookuper interface {
-	samenessGroupLookup(name string, entMeta acl.EnterpriseMeta) (uint64, *structs.SamenessGroupConfigEntry, error)
-}
-
-type stateLookup struct {
-	srv *Server
-}
-
 // queryServer is a wrapper that makes it easier to test the failover logic.
 type queryServer interface {
 	GetLogger() hclog.Logger
 	GetOtherDatacentersByDistance() ([]string, error)
 	GetLocalDC() string
 	ExecuteRemote(args *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error
-	GetSamenessGroupFailoverTargets(name string, entMeta acl.EnterpriseMeta) ([]structs.QueryFailoverTarget, error)
 }
 
 // queryServerWrapper applies the queryServer interface to a Server.
 type queryServerWrapper struct {
 	srv           *Server
-	sl            stateLookuper
 	executeRemote func(args *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error
 }
 
-func newQueryServerWrapper(srv *Server, executeRemote func(args *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error) *queryServerWrapper {
-	return &queryServerWrapper{
-		srv:           srv,
-		executeRemote: executeRemote,
-		sl:            stateLookup{srv},
-	}
-}
-
 // GetLocalDC returns the name of the local datacenter.
 func (q *queryServerWrapper) GetLocalDC() string {
 	return q.srv.config.Datacenter
@@ -752,13 +718,13 @@ func queryFailover(q queryServer, query structs.PreparedQuery,
 		return err
 	}
 
-	// This will help us filter unknown targets supplied by the user.
+	// This will help us filter unknown DCs supplied by the user.
 	known := make(map[string]struct{})
 	for _, dc := range nearest {
 		known[dc] = struct{}{}
 	}
 
-	// Build a candidate list of failover targets to try, starting with the nearest N target
+	// Build a candidate list of DCs to try, starting with the nearest N
 	// from RTTs.
 	var targets []structs.QueryFailoverTarget
 	index := make(map[string]struct{})
@@ -773,9 +739,9 @@ func queryFailover(q queryServer, query structs.PreparedQuery,
 		}
 	}
 
-	// Then add any targets explicitly listed that weren't selected above.
+	// Then add any DCs explicitly listed that weren't selected above.
 	for _, target := range query.Service.Failover.AsTargets() {
-		// This will prevent a log of other log spam if we do not
+		// This will prevent a log of other log spammage if we do not
 		// attempt to talk to datacenters we don't know about.
 		if dc := target.Datacenter; dc != "" {
 			if _, ok := known[dc]; !ok {
@@ -787,23 +753,55 @@ func queryFailover(q queryServer, query structs.PreparedQuery,
 			// from the NearestN list.
 			if _, ok := index[dc]; !ok {
 				targets = append(targets, target)
-				continue
 			}
 		}
 
-		if target.Peer != "" || target.PartitionOrEmpty() != "" || target.NamespaceOrEmpty() != "" {
+		if target.Peer != "" {
 			targets = append(targets, target)
 		}
 	}
 
-	// Now try the selected targets in priority order.
+	// Now try the selected DCs in priority order.
 	failovers := 0
 	for _, target := range targets {
 		// This keeps track of how many iterations we actually run.
 		failovers++
 
-		err = targetSelector(q, query, args, target, reply)
-		if err != nil {
+		// Be super paranoid and set the nodes slice to nil since it's
+		// the same slice we used before. We know there's nothing in
+		// there, but the underlying msgpack library has a policy of
+		// updating the slice when it's non-nil, and that feels dirty.
+		// Let's just set it to nil so there's no way to communicate
+		// through this slice across successive RPC calls.
+		reply.Nodes = nil
+
+		// Reset PeerName because it may have been set by a previous failover
+		// target.
+		query.Service.Peer = target.Peer
+		dc := target.Datacenter
+		if target.Peer != "" {
+			dc = q.GetLocalDC()
+		}
+
+		// Note that we pass along the limit since may be applied
+		// remotely to save bandwidth. We also pass along the consistency
+		// mode information and token we were given, so that applies to
+		// the remote query as well.
+		remote := &structs.PreparedQueryExecuteRemoteRequest{
+			Datacenter:   dc,
+			Query:        query,
+			Limit:        args.Limit,
+			QueryOptions: args.QueryOptions,
+			Connect:      args.Connect,
+		}
+
+		if err = q.ExecuteRemote(remote, reply); err != nil {
+			q.GetLogger().Warn("Failed querying for service in datacenter",
+				"service", query.Service.Service,
+				"peerName", query.Service.Peer,
+				"datacenter", dc,
+				"error", err,
+			)
 			continue
 		}
 
@@ -819,52 +817,3 @@ func queryFailover(q queryServer, query structs.PreparedQuery,
 
 	return nil
 }
-
-func targetSelector(q queryServer,
-	query structs.PreparedQuery,
-	args *structs.PreparedQueryExecuteRequest,
-	target structs.QueryFailoverTarget,
-	reply *structs.PreparedQueryExecuteResponse) error {
-	// Be super paranoid and set the nodes slice to nil since it's
-	// the same slice we used before. We know there's nothing in
-	// there, but the underlying msgpack library has a policy of
-	// updating the slice when it's non-nil, and that feels dirty.
-	// Let's just set it to nil so there's no way to communicate
-	// through this slice across successive RPC calls.
-	reply.Nodes = nil
-
-	// Reset Peer, because it may have been set by a previous failover
-	// target.
-	query.Service.Peer = target.Peer
-	query.Service.EnterpriseMeta = target.EnterpriseMeta
-	dc := target.Datacenter
-	if target.Peer != "" {
-		dc = q.GetLocalDC()
-	}
-
-	// Note that we pass along the limit since may be applied
-	// remotely to save bandwidth. We also pass along the consistency
-	// mode information and token we were given, so that applies to
-	// the remote query as well.
-	remote := &structs.PreparedQueryExecuteRemoteRequest{
-		Datacenter:   dc,
-		Query:        query,
-		Limit:        args.Limit,
-		QueryOptions: args.QueryOptions,
-		Connect:      args.Connect,
-	}
-
-	var err error
-	if err = q.ExecuteRemote(remote, reply); err != nil {
-		q.GetLogger().Warn("Failed querying for service in datacenter",
-			"service", query.Service.Service,
-			"peerName", query.Service.Peer,
-			"datacenter", dc,
-			"enterpriseMeta", query.Service.EnterpriseMeta,
-			"error", err,
-		)
-		return err
-	}
-
-	return nil
-}
diff --git a/agent/consul/prepared_query_endpoint_ce.go b/agent/consul/prepared_query_endpoint_ce.go
deleted file mode 100644
index 3498b7063d3e4..0000000000000
--- a/agent/consul/prepared_query_endpoint_ce.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package consul
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-func parseSameness(svc *structs.ServiceQuery) error {
-	if svc.SamenessGroup != "" {
-		return fmt.Errorf("sameness-groups are an enterprise-only feature")
-	}
-	return nil
-}
-
-func (sl stateLookup) samenessGroupLookup(_ string, _ acl.EnterpriseMeta) (uint64, *structs.SamenessGroupConfigEntry, error) {
-	return 0, nil, nil
-}
-
-// GetSamenessGroupFailoverTargets supports Sameness Groups an enterprise only feature. This satisfies the queryServer interface
-func (q *queryServerWrapper) GetSamenessGroupFailoverTargets(_ string, _ acl.EnterpriseMeta) ([]structs.QueryFailoverTarget, error) {
-	return []structs.QueryFailoverTarget{}, nil
-}
-
-func querySameness(_ queryServer,
-	_ structs.PreparedQuery,
-	_ *structs.PreparedQueryExecuteRequest,
-	_ *structs.PreparedQueryExecuteResponse) error {
-
-	return nil
-}
diff --git a/agent/consul/prepared_query_endpoint_ce_test.go b/agent/consul/prepared_query_endpoint_ce_test.go
deleted file mode 100644
index d090fa1d84046..0000000000000
--- a/agent/consul/prepared_query_endpoint_ce_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package consul
-
-import (
-	"os"
-	"testing"
-
-	msgpackrpc "github.com/hashicorp/consul-net-rpc/net-rpc-msgpackrpc"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/testrpc"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestPreparedQuery_CE_Apply(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-	dir1, s1 := testServerWithConfig(t)
-	defer os.RemoveAll(dir1)
-	defer s1.Shutdown()
-	codec := rpcClient(t, s1)
-	defer codec.Close()
-
-	testrpc.WaitForLeader(t, s1.RPC, "dc1")
-
-	// Set up a bare bones query.
-	query := structs.PreparedQueryRequest{
-		Datacenter: "dc1",
-		Op:         structs.PreparedQueryCreate,
-		Query: &structs.PreparedQuery{
-			Name: "test",
-			Service: structs.ServiceQuery{
-				Service: "redis",
-			},
-		},
-	}
-	var reply string
-
-	// Fix that and ensure Targets and Datacenters cannot be set at the same time.
-	query.Query.Service.SamenessGroup = "sg"
-	err := msgpackrpc.CallWithCodec(codec, "PreparedQuery.Apply", &query, &reply)
-	require.Error(t, err)
-	assert.Contains(t, err.Error(), "enterprise")
-}
diff --git a/agent/consul/prepared_query_endpoint_test.go b/agent/consul/prepared_query_endpoint_test.go
index f0d63dc277c18..5e20d6976bfb3 100644
--- a/agent/consul/prepared_query_endpoint_test.go
+++ b/agent/consul/prepared_query_endpoint_test.go
@@ -1,12 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
 	"bytes"
 	"context"
-	"errors"
 	"fmt"
 	"os"
 	"reflect"
@@ -23,7 +19,6 @@ import (
 
 	msgpackrpc "github.com/hashicorp/consul-net-rpc/net-rpc-msgpackrpc"
 	"github.com/hashicorp/consul-net-rpc/net/rpc"
-
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/connect"
 	grpcexternal "github.com/hashicorp/consul/agent/grpc-external"
@@ -31,15 +26,13 @@ import (
 	"github.com/hashicorp/consul/agent/structs/aclfilter"
 	tokenStore "github.com/hashicorp/consul/agent/token"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/types"
 )
 
-const localTestDC = "dc1"
-
 func TestPreparedQuery_Apply(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
@@ -1443,9 +1436,152 @@ func TestPreparedQuery_Execute(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
 	}
+
 	t.Parallel()
+	dir1, s1 := testServerWithConfig(t, func(c *Config) {
+		c.PrimaryDatacenter = "dc1"
+		c.ACLsEnabled = true
+		c.ACLInitialManagementToken = "root"
+		c.ACLResolverSettings.ACLDefaultPolicy = "deny"
+	})
+	defer os.RemoveAll(dir1)
+	defer s1.Shutdown()
+	waitForLeaderEstablishment(t, s1)
+	codec1 := rpcClient(t, s1)
+	defer codec1.Close()
 
-	es := createExecuteServers(t)
+	dir2, s2 := testServerWithConfig(t, func(c *Config) {
+		c.Datacenter = "dc2"
+		c.PrimaryDatacenter = "dc1"
+		c.ACLsEnabled = true
+		c.ACLResolverSettings.ACLDefaultPolicy = "deny"
+	})
+	defer os.RemoveAll(dir2)
+	defer s2.Shutdown()
+	waitForLeaderEstablishment(t, s2)
+	codec2 := rpcClient(t, s2)
+	defer codec2.Close()
+
+	s2.tokens.UpdateReplicationToken("root", tokenStore.TokenSourceConfig)
+
+	ca := connect.TestCA(t, nil)
+	dir3, s3 := testServerWithConfig(t, func(c *Config) {
+		c.Datacenter = "dc3"
+		c.PrimaryDatacenter = "dc3"
+		c.NodeName = "acceptingServer.dc3"
+		c.GRPCTLSPort = freeport.GetOne(t)
+		c.CAConfig = &structs.CAConfiguration{
+			ClusterID: connect.TestClusterID,
+			Provider:  structs.ConsulCAProvider,
+			Config: map[string]interface{}{
+				"PrivateKey": ca.SigningKey,
+				"RootCert":   ca.RootCert,
+			},
+		}
+	})
+	defer os.RemoveAll(dir3)
+	defer s3.Shutdown()
+	waitForLeaderEstablishment(t, s3)
+	codec3 := rpcClient(t, s3)
+	defer codec3.Close()
+
+	// Try to WAN join.
+	joinWAN(t, s2, s1)
+	retry.Run(t, func(r *retry.R) {
+		if got, want := len(s1.WANMembers()), 2; got != want {
+			r.Fatalf("got %d WAN members want %d", got, want)
+		}
+		if got, want := len(s2.WANMembers()), 2; got != want {
+			r.Fatalf("got %d WAN members want %d", got, want)
+		}
+	})
+
+	// check for RPC forwarding
+	testrpc.WaitForLeader(t, s1.RPC, "dc1", testrpc.WithToken("root"))
+	testrpc.WaitForLeader(t, s1.RPC, "dc2", testrpc.WithToken("root"))
+	testrpc.WaitForLeader(t, s3.RPC, "dc3")
+
+	acceptingPeerName := "my-peer-accepting-server"
+	dialingPeerName := "my-peer-dialing-server"
+
+	// Set up peering between dc1 (dialing) and dc3 (accepting) and export the foo service
+	{
+		// Create a peering by generating a token.
+		ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+		t.Cleanup(cancel)
+
+		options := structs.QueryOptions{Token: "root"}
+		ctx, err := grpcexternal.ContextWithQueryOptions(ctx, options)
+		require.NoError(t, err)
+
+		conn, err := grpc.DialContext(ctx, s3.config.RPCAddr.String(),
+			grpc.WithContextDialer(newServerDialer(s3.config.RPCAddr.String())),
+			//nolint:staticcheck
+			grpc.WithInsecure(),
+			grpc.WithBlock())
+		require.NoError(t, err)
+		defer conn.Close()
+
+		peeringClient := pbpeering.NewPeeringServiceClient(conn)
+		req := pbpeering.GenerateTokenRequest{
+			PeerName: dialingPeerName,
+		}
+		resp, err := peeringClient.GenerateToken(ctx, &req)
+		require.NoError(t, err)
+
+		conn, err = grpc.DialContext(ctx, s1.config.RPCAddr.String(),
+			grpc.WithContextDialer(newServerDialer(s1.config.RPCAddr.String())),
+			//nolint:staticcheck
+			grpc.WithInsecure(),
+			grpc.WithBlock())
+		require.NoError(t, err)
+		defer conn.Close()
+
+		peeringClient = pbpeering.NewPeeringServiceClient(conn)
+		establishReq := pbpeering.EstablishRequest{
+			PeerName:     acceptingPeerName,
+			PeeringToken: resp.PeeringToken,
+		}
+		establishResp, err := peeringClient.Establish(ctx, &establishReq)
+		require.NoError(t, err)
+		require.NotNil(t, establishResp)
+
+		readResp, err := peeringClient.PeeringRead(ctx, &pbpeering.PeeringReadRequest{Name: acceptingPeerName})
+		require.NoError(t, err)
+		require.NotNil(t, readResp)
+
+		// Wait for the stream to be connected.
+		retry.Run(t, func(r *retry.R) {
+			status, found := s1.peerStreamServer.StreamStatus(readResp.GetPeering().GetID())
+			require.True(r, found)
+			require.True(r, status.Connected)
+		})
+
+		exportedServices := structs.ConfigEntryRequest{
+			Op:         structs.ConfigEntryUpsert,
+			Datacenter: "dc3",
+			Entry: &structs.ExportedServicesConfigEntry{
+				Name: "default",
+				Services: []structs.ExportedService{
+					{
+						Name:      "foo",
+						Consumers: []structs.ServiceConsumer{{Peer: dialingPeerName}},
+					},
+				},
+			},
+		}
+		var configOutput bool
+		require.NoError(t, msgpackrpc.CallWithCodec(codec3, "ConfigEntry.Apply", &exportedServices, &configOutput))
+		require.True(t, configOutput)
+	}
+
+	execNoNodesToken := createTokenWithPolicyName(t, codec1, "no-nodes", `service_prefix "foo" { policy = "read" }`, "root")
+	rules := `
+		service_prefix "" { policy = "read" }
+		node_prefix "" { policy = "read" }
+	`
+	execToken := createTokenWithPolicyName(t, codec1, "with-read", rules, "root")
+	denyToken := createTokenWithPolicyName(t, codec1, "with-deny", `service_prefix "foo" { policy = "deny" }`, "root")
 
 	newSessionDC1 := func(t *testing.T) string {
 		t.Helper()
@@ -1453,12 +1589,12 @@ func TestPreparedQuery_Execute(t *testing.T) {
 			Datacenter: "dc1",
 			Op:         structs.SessionCreate,
 			Session: structs.Session{
-				Node: es.server.server.config.NodeName,
+				Node: s1.config.NodeName,
 			},
 			WriteRequest: structs.WriteRequest{Token: "root"},
 		}
 		var session string
-		if err := msgpackrpc.CallWithCodec(es.server.codec, "Session.Apply", &req, &session); err != nil {
+		if err := msgpackrpc.CallWithCodec(codec1, "Session.Apply", &req, &session); err != nil {
 			t.Fatalf("err: %v", err)
 		}
 		return session
@@ -1471,9 +1607,9 @@ func TestPreparedQuery_Execute(t *testing.T) {
 				codec rpc.ClientCodec
 				dc    string
 			}{
-				{es.server.codec, "dc1"},
-				{es.wanServer.codec, "dc2"},
-				{es.peeringServer.codec, "dc3"},
+				{codec1, "dc1"},
+				{codec2, "dc2"},
+				{codec3, "dc3"},
 			} {
 				req := structs.RegisterRequest{
 					Datacenter: d.dc,
@@ -1522,7 +1658,7 @@ func TestPreparedQuery_Execute(t *testing.T) {
 		},
 		WriteRequest: structs.WriteRequest{Token: "root"},
 	}
-	if err := msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &query, &query.Query.ID); err != nil {
+	if err := msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &query, &query.Query.ID); err != nil {
 		t.Fatalf("err: %v", err)
 	}
 
@@ -1534,7 +1670,7 @@ func TestPreparedQuery_Execute(t *testing.T) {
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		err := msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply)
+		err := msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply)
 		assert.EqualError(t, err, structs.ErrQueryNotFound.Error())
 		assert.Len(t, reply.Nodes, 0)
 	})
@@ -1559,7 +1695,7 @@ func TestPreparedQuery_Execute(t *testing.T) {
 	expectFailoverPeerNodes := func(t require.TestingT, query *structs.PreparedQueryRequest, reply *structs.PreparedQueryExecuteResponse, n int) {
 		assert.Len(t, reply.Nodes, n)
 		assert.Equal(t, "", reply.Datacenter)
-		assert.Equal(t, es.peeringServer.acceptingPeerName, reply.PeerName)
+		assert.Equal(t, acceptingPeerName, reply.PeerName)
 		assert.Equal(t, 2, reply.Failovers)
 		assert.Equal(t, query.Query.Service.Service, reply.Service)
 		assert.Equal(t, query.Query.DNS, reply.DNS)
@@ -1570,11 +1706,11 @@ func TestPreparedQuery_Execute(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 		expectNodes(t, &query, &reply, 10)
 	})
 
@@ -1583,11 +1719,11 @@ func TestPreparedQuery_Execute(t *testing.T) {
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
 			Limit:         3,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 		expectNodes(t, &query, &reply, 3)
 	})
 
@@ -1631,16 +1767,16 @@ func TestPreparedQuery_Execute(t *testing.T) {
 				},
 				WriteRequest: structs.WriteRequest{Token: "root"},
 			}
-			require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &nodeMetaQuery, &nodeMetaQuery.Query.ID))
+			require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &nodeMetaQuery, &nodeMetaQuery.Query.ID))
 
 			req := structs.PreparedQueryExecuteRequest{
 				Datacenter:    "dc1",
 				QueryIDOrName: nodeMetaQuery.Query.ID,
-				QueryOptions:  structs.QueryOptions{Token: es.execToken},
+				QueryOptions:  structs.QueryOptions{Token: execToken},
 			}
 
 			var reply structs.PreparedQueryExecuteResponse
-			require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+			require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 			assert.Len(t, reply.Nodes, tc.numNodes)
 
 			for _, node := range reply.Nodes {
@@ -1694,16 +1830,16 @@ func TestPreparedQuery_Execute(t *testing.T) {
 				WriteRequest: structs.WriteRequest{Token: "root"},
 			}
 
-			require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &svcMetaQuery, &svcMetaQuery.Query.ID))
+			require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &svcMetaQuery, &svcMetaQuery.Query.ID))
 
 			req := structs.PreparedQueryExecuteRequest{
 				Datacenter:    "dc1",
 				QueryIDOrName: svcMetaQuery.Query.ID,
-				QueryOptions:  structs.QueryOptions{Token: es.execToken},
+				QueryOptions:  structs.QueryOptions{Token: execToken},
 			}
 
 			var reply structs.PreparedQueryExecuteResponse
-			require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+			require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 			assert.Len(t, reply.Nodes, tc.numNodes)
 			for _, node := range reply.Nodes {
 				assert.True(t, structs.SatisfiesMetaFilters(node.Service.Meta, tc.filters), "meta: %v", node.Service.Meta)
@@ -1721,8 +1857,8 @@ func TestPreparedQuery_Execute(t *testing.T) {
 			WriteRequest: structs.WriteRequest{Token: "root"},
 		}
 		var out struct{}
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "Coordinate.Update", &req, &out))
-		time.Sleep(3 * es.server.server.config.CoordinateUpdatePeriod)
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "Coordinate.Update", &req, &out))
+		time.Sleep(3 * s1.config.CoordinateUpdatePeriod)
 	}
 
 	// Try an RTT sort. We don't have any other coordinates in there but
@@ -1737,11 +1873,11 @@ func TestPreparedQuery_Execute(t *testing.T) {
 					Datacenter: "dc1",
 					Node:       "node3",
 				},
-				QueryOptions: structs.QueryOptions{Token: es.execToken},
+				QueryOptions: structs.QueryOptions{Token: execToken},
 			}
 
 			var reply structs.PreparedQueryExecuteResponse
-			require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+			require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 			expectNodes(t, &query, &reply, 10)
 			assert.Equal(t, "node3", reply.Nodes[0].Node.Node)
@@ -1755,11 +1891,11 @@ func TestPreparedQuery_Execute(t *testing.T) {
 			req := structs.PreparedQueryExecuteRequest{
 				Datacenter:    "dc1",
 				QueryIDOrName: query.Query.ID,
-				QueryOptions:  structs.QueryOptions{Token: es.execToken},
+				QueryOptions:  structs.QueryOptions{Token: execToken},
 			}
 
 			var reply structs.PreparedQueryExecuteResponse
-			require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+			require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 			expectNodes(t, &query, &reply, 10)
 
@@ -1784,7 +1920,7 @@ func TestPreparedQuery_Execute(t *testing.T) {
 	// so node3 should always show up first.
 	query.Op = structs.PreparedQueryUpdate
 	query.Query.Service.Near = "node3"
-	require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &query, &query.Query.ID))
+	require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &query, &query.Query.ID))
 
 	// Now run the query and make sure the sort looks right.
 	for i := 0; i < 10; i++ {
@@ -1796,11 +1932,11 @@ func TestPreparedQuery_Execute(t *testing.T) {
 				},
 				Datacenter:    "dc1",
 				QueryIDOrName: query.Query.ID,
-				QueryOptions:  structs.QueryOptions{Token: es.execToken},
+				QueryOptions:  structs.QueryOptions{Token: execToken},
 			}
 
 			var reply structs.PreparedQueryExecuteResponse
-			require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+			require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 			assert.Len(t, reply.Nodes, 10)
 			assert.Equal(t, "node3", reply.Nodes[0].Node.Node)
 		})
@@ -1823,13 +1959,13 @@ func TestPreparedQuery_Execute(t *testing.T) {
 			},
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		shuffled := false
 		for i := 0; i < 10; i++ {
 			var reply structs.PreparedQueryExecuteResponse
-			require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+			require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 			assert.Len(t, reply.Nodes, 10)
 
 			if node := reply.Nodes[0].Node.Node; node != "node3" {
@@ -1851,12 +1987,12 @@ func TestPreparedQuery_Execute(t *testing.T) {
 			},
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		for i := 0; i < 10; i++ {
 			var reply structs.PreparedQueryExecuteResponse
-			require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+			require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 			assert.Len(t, reply.Nodes, 10)
 			assert.Equal(t, "node1", reply.Nodes[0].Node.Node)
 		}
@@ -1864,7 +2000,7 @@ func TestPreparedQuery_Execute(t *testing.T) {
 
 	// Bake the magic "_agent" flag into the query.
 	query.Query.Service.Near = "_agent"
-	require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &query, &query.Query.ID))
+	require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &query, &query.Query.ID))
 
 	// Check that we sort the local agent first when the magic flag is set.
 	t.Run("local agent is first using _agent on node3", func(t *testing.T) {
@@ -1875,12 +2011,12 @@ func TestPreparedQuery_Execute(t *testing.T) {
 			},
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		for i := 0; i < 10; i++ {
 			var reply structs.PreparedQueryExecuteResponse
-			require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+			require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 			assert.Len(t, reply.Nodes, 10)
 			assert.Equal(t, "node3", reply.Nodes[0].Node.Node)
 		}
@@ -1897,7 +2033,7 @@ func TestPreparedQuery_Execute(t *testing.T) {
 			},
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		// Expect the set to be shuffled since we have no coordinates
@@ -1905,7 +2041,7 @@ func TestPreparedQuery_Execute(t *testing.T) {
 		shuffled := false
 		for i := 0; i < 10; i++ {
 			var reply structs.PreparedQueryExecuteResponse
-			require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+			require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 			assert.Len(t, reply.Nodes, 10)
 			if node := reply.Nodes[0].Node.Node; node != "node3" {
 				shuffled = true
@@ -1930,13 +2066,13 @@ func TestPreparedQuery_Execute(t *testing.T) {
 			},
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		shuffled := false
 		for i := 0; i < 10; i++ {
 			var reply structs.PreparedQueryExecuteResponse
-			require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+			require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 			assert.Len(t, reply.Nodes, 10)
 			if reply.Nodes[0].Node.Node != "node3" {
 				shuffled = true
@@ -1949,7 +2085,7 @@ func TestPreparedQuery_Execute(t *testing.T) {
 
 	// Un-bake the near parameter.
 	query.Query.Service.Near = ""
-	require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &query, &query.Query.ID))
+	require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &query, &query.Query.ID))
 
 	// Update the health of a node to mark it critical.
 	setHealth := func(t *testing.T, codec rpc.ClientCodec, dc string, i int, health string) {
@@ -1973,18 +2109,18 @@ func TestPreparedQuery_Execute(t *testing.T) {
 		var reply struct{}
 		require.NoError(t, msgpackrpc.CallWithCodec(codec, "Catalog.Register", &req, &reply))
 	}
-	setHealth(t, es.server.codec, "dc1", 1, api.HealthCritical)
+	setHealth(t, codec1, "dc1", 1, api.HealthCritical)
 
 	// The failing node should be filtered.
 	t.Run("failing node filtered", func(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectNodes(t, &query, &reply, 9)
 		for _, node := range reply.Nodes {
@@ -1993,34 +2129,34 @@ func TestPreparedQuery_Execute(t *testing.T) {
 	})
 
 	// Upgrade it to a warning and re-query, should be 10 nodes again.
-	setHealth(t, es.server.codec, "dc1", 1, api.HealthWarning)
+	setHealth(t, codec1, "dc1", 1, api.HealthWarning)
 	t.Run("warning nodes are included", func(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectNodes(t, &query, &reply, 10)
 	})
 
 	// Make the query more picky so it excludes warning nodes.
 	query.Query.Service.OnlyPassing = true
-	require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &query, &query.Query.ID))
+	require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &query, &query.Query.ID))
 
 	// The node in the warning state should be filtered.
 	t.Run("warning nodes are omitted with onlypassing=true", func(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectNodes(t, &query, &reply, 9)
 		for _, node := range reply.Nodes {
@@ -2031,31 +2167,31 @@ func TestPreparedQuery_Execute(t *testing.T) {
 	// Make the query ignore all our health checks (which have "failing" ID
 	// implicitly from their name).
 	query.Query.Service.IgnoreCheckIDs = []types.CheckID{"failing"}
-	require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &query, &query.Query.ID))
+	require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &query, &query.Query.ID))
 
 	// We should end up with 10 nodes again
 	t.Run("all nodes including when ignoring failing checks", func(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectNodes(t, &query, &reply, 10)
 	})
 
 	// Undo that so all the following tests aren't broken!
 	query.Query.Service.IgnoreCheckIDs = nil
-	require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &query, &query.Query.ID))
+	require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &query, &query.Query.ID))
 
 	// Make the query more picky by adding a tag filter. This just proves we
 	// call into the tag filter, it is tested more thoroughly in a separate
 	// test.
 	query.Query.Service.Tags = []string{"!tag3"}
-	require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &query, &query.Query.ID))
+	require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &query, &query.Query.ID))
 
 	// The node in the warning state should be filtered as well as the node
 	// with the filtered tag.
@@ -2063,11 +2199,11 @@ func TestPreparedQuery_Execute(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectNodes(t, &query, &reply, 8)
 		for _, node := range reply.Nodes {
@@ -2081,29 +2217,29 @@ func TestPreparedQuery_Execute(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.denyToken},
+			QueryOptions:  structs.QueryOptions{Token: denyToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectNodes(t, &query, &reply, 0)
 	})
 
 	// Bake the exec token into the query.
-	query.Query.Token = es.execToken
-	require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &query, &query.Query.ID))
+	query.Query.Token = execToken
+	require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &query, &query.Query.ID))
 
 	// Now even querying with the deny token should work.
 	t.Run("query with deny token still works", func(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.denyToken},
+			QueryOptions:  structs.QueryOptions{Token: denyToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectNodes(t, &query, &reply, 8)
 		for _, node := range reply.Nodes {
@@ -2114,18 +2250,18 @@ func TestPreparedQuery_Execute(t *testing.T) {
 
 	// Un-bake the token.
 	query.Query.Token = ""
-	require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &query, &query.Query.ID))
+	require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &query, &query.Query.ID))
 
 	// Make sure the query gets denied again with the deny token.
 	t.Run("denied with deny token when no query token", func(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.denyToken},
+			QueryOptions:  structs.QueryOptions{Token: denyToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectNodes(t, &query, &reply, 0)
 	})
@@ -2134,11 +2270,11 @@ func TestPreparedQuery_Execute(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execNoNodesToken},
+			QueryOptions:  structs.QueryOptions{Token: execNoNodesToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectNodes(t, &query, &reply, 0)
 		require.True(t, reply.QueryMeta.ResultsFilteredByACLs, "ResultsFilteredByACLs should be true")
@@ -2148,11 +2284,11 @@ func TestPreparedQuery_Execute(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectNodes(t, &query, &reply, 8)
 		for _, node := range reply.Nodes {
@@ -2163,35 +2299,35 @@ func TestPreparedQuery_Execute(t *testing.T) {
 
 	// Now fail everything in dc1 and we should get an empty list back.
 	for i := 0; i < 10; i++ {
-		setHealth(t, es.server.codec, "dc1", i+1, api.HealthCritical)
+		setHealth(t, codec1, "dc1", i+1, api.HealthCritical)
 	}
 	t.Run("everything is failing so should get empty list", func(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectNodes(t, &query, &reply, 0)
 	})
 
 	// Modify the query to have it fail over to a bogus DC and then dc2.
 	query.Query.Service.Failover.Datacenters = []string{"bogus", "dc2"}
-	require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &query, &query.Query.ID))
+	require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &query, &query.Query.ID))
 
 	// Now we should see 9 nodes from dc2 (we have the tag filter still).
 	t.Run("see 9 nodes from dc2 using tag filter", func(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectFailoverNodes(t, &query, &reply, 9)
 		for _, node := range reply.Nodes {
@@ -2206,13 +2342,13 @@ func TestPreparedQuery_Execute(t *testing.T) {
 			QueryIDOrName: query.Query.ID,
 			Limit:         3,
 			QueryOptions: structs.QueryOptions{
-				Token:             es.execToken,
+				Token:             execToken,
 				RequireConsistent: true,
 			},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectFailoverNodes(t, &query, &reply, 3)
 		for _, node := range reply.Nodes {
@@ -2227,11 +2363,11 @@ func TestPreparedQuery_Execute(t *testing.T) {
 			req := structs.PreparedQueryExecuteRequest{
 				Datacenter:    "dc1",
 				QueryIDOrName: query.Query.ID,
-				QueryOptions:  structs.QueryOptions{Token: es.execToken},
+				QueryOptions:  structs.QueryOptions{Token: execToken},
 			}
 
 			var reply structs.PreparedQueryExecuteResponse
-			require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+			require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 			expectFailoverNodes(t, &query, &reply, 9)
 			var names []string
@@ -2255,11 +2391,11 @@ func TestPreparedQuery_Execute(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.denyToken},
+			QueryOptions:  structs.QueryOptions{Token: denyToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectFailoverNodes(t, &query, &reply, 0)
 	})
@@ -2268,30 +2404,30 @@ func TestPreparedQuery_Execute(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execNoNodesToken},
+			QueryOptions:  structs.QueryOptions{Token: execNoNodesToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectFailoverNodes(t, &query, &reply, 0)
 		require.True(t, reply.QueryMeta.ResultsFilteredByACLs, "ResultsFilteredByACLs should be true")
 	})
 
 	// Bake the exec token into the query.
-	query.Query.Token = es.execToken
-	require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &query, &query.Query.ID))
+	query.Query.Token = execToken
+	require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &query, &query.Query.ID))
 
 	// Now even querying with the deny token should work.
 	t.Run("query from dc2 with exec token using deny token works", func(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.denyToken},
+			QueryOptions:  structs.QueryOptions{Token: denyToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		expectFailoverNodes(t, &query, &reply, 9)
 		for _, node := range reply.Nodes {
@@ -2303,14 +2439,14 @@ func TestPreparedQuery_Execute(t *testing.T) {
 	query.Query.Service.Failover = structs.QueryFailoverOptions{
 		Targets: []structs.QueryFailoverTarget{
 			{Datacenter: "dc2"},
-			{Peer: es.peeringServer.acceptingPeerName},
+			{Peer: acceptingPeerName},
 		},
 	}
-	require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Apply", &query, &query.Query.ID))
+	require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Apply", &query, &query.Query.ID))
 
 	// Ensure the foo service has fully replicated.
 	retry.Run(t, func(r *retry.R) {
-		_, nodes, err := es.server.server.fsm.State().CheckServiceNodes(nil, "foo", nil, es.peeringServer.acceptingPeerName)
+		_, nodes, err := s1.fsm.State().CheckServiceNodes(nil, "foo", nil, acceptingPeerName)
 		require.NoError(r, err)
 		require.Len(r, nodes, 10)
 	})
@@ -2320,11 +2456,11 @@ func TestPreparedQuery_Execute(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		for _, node := range reply.Nodes {
 			assert.NotEqual(t, "node3", node.Node.Node)
@@ -2334,7 +2470,7 @@ func TestPreparedQuery_Execute(t *testing.T) {
 
 	// Set all checks in dc2 as critical
 	for i := 0; i < 10; i++ {
-		setHealth(t, es.wanServer.codec, "dc2", i+1, api.HealthCritical)
+		setHealth(t, codec2, "dc2", i+1, api.HealthCritical)
 	}
 
 	// Now we should see 9 nodes from dc3 (we have the tag filter still)
@@ -2342,11 +2478,11 @@ func TestPreparedQuery_Execute(t *testing.T) {
 		req := structs.PreparedQueryExecuteRequest{
 			Datacenter:    "dc1",
 			QueryIDOrName: query.Query.ID,
-			QueryOptions:  structs.QueryOptions{Token: es.execToken},
+			QueryOptions:  structs.QueryOptions{Token: execToken},
 		}
 
 		var reply structs.PreparedQueryExecuteResponse
-		require.NoError(t, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+		require.NoError(t, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 		for _, node := range reply.Nodes {
 			assert.NotEqual(t, "node3", node.Node.Node)
@@ -2356,7 +2492,7 @@ func TestPreparedQuery_Execute(t *testing.T) {
 
 	// Set all checks in dc1 as passing
 	for i := 0; i < 10; i++ {
-		setHealth(t, es.server.codec, "dc1", i+1, api.HealthPassing)
+		setHealth(t, codec1, "dc1", i+1, api.HealthPassing)
 	}
 
 	// Nothing is healthy so nothing is returned
@@ -2365,11 +2501,11 @@ func TestPreparedQuery_Execute(t *testing.T) {
 			req := structs.PreparedQueryExecuteRequest{
 				Datacenter:    "dc1",
 				QueryIDOrName: query.Query.ID,
-				QueryOptions:  structs.QueryOptions{Token: es.execToken},
+				QueryOptions:  structs.QueryOptions{Token: execToken},
 			}
 
 			var reply structs.PreparedQueryExecuteResponse
-			require.NoError(r, msgpackrpc.CallWithCodec(es.server.codec, "PreparedQuery.Execute", &req, &reply))
+			require.NoError(r, msgpackrpc.CallWithCodec(codec1, "PreparedQuery.Execute", &req, &reply))
 
 			for _, node := range reply.Nodes {
 				assert.NotEqual(r, "node3", node.Node.Node)
@@ -2808,23 +2944,19 @@ func TestPreparedQuery_Wrapper(t *testing.T) {
 		t.Fatalf("bad: %v", ret)
 	}
 	// Since we have no idea when the joinWAN operation completes
-	// we keep on querying until the join operation completes.
+	// we keep on querying until the the join operation completes.
 	retry.Run(t, func(r *retry.R) {
 		r.Check(s1.forwardDC("Status.Ping", "dc2", &struct{}{}, &struct{}{}))
 	})
 }
 
-var _ queryServer = (*mockQueryServer)(nil)
-
 type mockQueryServer struct {
-	queryServerWrapper
 	Datacenters      []string
 	DatacentersError error
 	QueryLog         []string
 	QueryFn          func(args *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error
 	Logger           hclog.Logger
 	LogBuffer        *bytes.Buffer
-	SamenessGroup    map[string]*structs.SamenessGroupConfigEntry
 }
 
 func (m *mockQueryServer) JoinQueryLog() string {
@@ -2845,7 +2977,7 @@ func (m *mockQueryServer) GetLogger() hclog.Logger {
 }
 
 func (m *mockQueryServer) GetLocalDC() string {
-	return localTestDC
+	return "dc1"
 }
 
 func (m *mockQueryServer) GetOtherDatacentersByDistance() ([]string, error) {
@@ -2854,21 +2986,14 @@ func (m *mockQueryServer) GetOtherDatacentersByDistance() ([]string, error) {
 
 func (m *mockQueryServer) ExecuteRemote(args *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error {
 	peerName := args.Query.Service.Peer
-	partitionName := args.Query.Service.PartitionOrEmpty()
-	namespaceName := args.Query.Service.NamespaceOrEmpty()
 	dc := args.Datacenter
 	if peerName != "" {
 		m.QueryLog = append(m.QueryLog, fmt.Sprintf("peer:%s", peerName))
-	} else if partitionName != "" {
-		m.QueryLog = append(m.QueryLog, fmt.Sprintf("partition:%s", partitionName))
-	} else if namespaceName != "" {
-		m.QueryLog = append(m.QueryLog, fmt.Sprintf("namespace:%s", namespaceName))
 	} else {
 		m.QueryLog = append(m.QueryLog, fmt.Sprintf("%s:%s", dc, "PreparedQuery.ExecuteRemote"))
 	}
 	reply.PeerName = peerName
 	reply.Datacenter = dc
-	reply.EnterpriseMeta = acl.NewEnterpriseMetaWithPartition(partitionName, namespaceName)
 
 	if m.QueryFn != nil {
 		return m.QueryFn(args, reply)
@@ -2876,33 +3001,6 @@ func (m *mockQueryServer) ExecuteRemote(args *structs.PreparedQueryExecuteRemote
 	return nil
 }
 
-type mockStateLookup struct {
-	SamenessGroup map[string]*structs.SamenessGroupConfigEntry
-}
-
-func (sl mockStateLookup) samenessGroupLookup(name string, entMeta acl.EnterpriseMeta) (uint64, *structs.SamenessGroupConfigEntry, error) {
-	lookup := name
-	if ap := entMeta.PartitionOrEmpty(); ap != "" {
-		lookup = fmt.Sprintf("%s-%s", lookup, ap)
-	} else if ns := entMeta.NamespaceOrEmpty(); ns != "" {
-		lookup = fmt.Sprintf("%s-%s", lookup, ns)
-	}
-
-	sg, ok := sl.SamenessGroup[lookup]
-	if !ok {
-		return 0, nil, errors.New("unable to find sameness group")
-	}
-
-	return 0, sg, nil
-}
-
-func (m *mockQueryServer) GetSamenessGroupFailoverTargets(name string, entMeta acl.EnterpriseMeta) ([]structs.QueryFailoverTarget, error) {
-	m.sl = mockStateLookup{
-		SamenessGroup: m.SamenessGroup,
-	}
-	return m.queryServerWrapper.GetSamenessGroupFailoverTargets(name, entMeta)
-}
-
 func TestPreparedQuery_queryFailover(t *testing.T) {
 	t.Parallel()
 	query := structs.PreparedQuery{
@@ -2930,7 +3028,7 @@ func TestPreparedQuery_queryFailover(t *testing.T) {
 	}
 
 	// Datacenters are available but the query doesn't use them.
-	t.Run("Query no datacenters used", func(t *testing.T) {
+	{
 		mock := &mockQueryServer{
 			Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"},
 		}
@@ -2942,10 +3040,10 @@ func TestPreparedQuery_queryFailover(t *testing.T) {
 		if len(reply.Nodes) != 0 || reply.Datacenter != "" || reply.Failovers != 0 {
 			t.Fatalf("bad: %v", reply)
 		}
-	})
+	}
 
 	// Make it fail to get datacenters.
-	t.Run("Fail to get datacenters", func(t *testing.T) {
+	{
 		mock := &mockQueryServer{
 			Datacenters:      []string{"dc1", "dc2", "dc3", "xxx", "dc4"},
 			DatacentersError: fmt.Errorf("XXX"),
@@ -2959,11 +3057,11 @@ func TestPreparedQuery_queryFailover(t *testing.T) {
 		if len(reply.Nodes) != 0 || reply.Datacenter != "" || reply.Failovers != 0 {
 			t.Fatalf("bad: %v", reply)
 		}
-	})
+	}
 
 	// The query wants to use other datacenters but none are available.
-	t.Run("no datacenters available", func(t *testing.T) {
-		query.Service.Failover.NearestN = 3
+	query.Service.Failover.NearestN = 3
+	{
 		mock := &mockQueryServer{
 			Datacenters: []string{},
 		}
@@ -2975,11 +3073,11 @@ func TestPreparedQuery_queryFailover(t *testing.T) {
 		if len(reply.Nodes) != 0 || reply.Datacenter != "" || reply.Failovers != 0 {
 			t.Fatalf("bad: %v", reply)
 		}
-	})
+	}
 
 	// Try the first three nearest datacenters, first one has the data.
-	t.Run("first datacenter has data", func(t *testing.T) {
-		query.Service.Failover.NearestN = 3
+	query.Service.Failover.NearestN = 3
+	{
 		mock := &mockQueryServer{
 			Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"},
 			QueryFn: func(req *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error {
@@ -3002,11 +3100,11 @@ func TestPreparedQuery_queryFailover(t *testing.T) {
 		if queries := mock.JoinQueryLog(); queries != "dc1:PreparedQuery.ExecuteRemote" {
 			t.Fatalf("bad: %s", queries)
 		}
-	})
+	}
 
 	// Try the first three nearest datacenters, last one has the data.
-	t.Run("last datacenter has data", func(t *testing.T) {
-		query.Service.Failover.NearestN = 3
+	query.Service.Failover.NearestN = 3
+	{
 		mock := &mockQueryServer{
 			Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"},
 			QueryFn: func(req *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error {
@@ -3029,11 +3127,11 @@ func TestPreparedQuery_queryFailover(t *testing.T) {
 		if queries := mock.JoinQueryLog(); queries != "dc1:PreparedQuery.ExecuteRemote|dc2:PreparedQuery.ExecuteRemote|dc3:PreparedQuery.ExecuteRemote" {
 			t.Fatalf("bad: %s", queries)
 		}
-	})
+	}
 
 	// Try the first four nearest datacenters, nobody has the data.
-	t.Run("no datacenters with data", func(t *testing.T) {
-		query.Service.Failover.NearestN = 4
+	query.Service.Failover.NearestN = 4
+	{
 		mock := &mockQueryServer{
 			Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"},
 		}
@@ -3049,13 +3147,13 @@ func TestPreparedQuery_queryFailover(t *testing.T) {
 		if queries := mock.JoinQueryLog(); queries != "dc1:PreparedQuery.ExecuteRemote|dc2:PreparedQuery.ExecuteRemote|dc3:PreparedQuery.ExecuteRemote|xxx:PreparedQuery.ExecuteRemote" {
 			t.Fatalf("bad: %s", queries)
 		}
-	})
+	}
 
 	// Try the first two nearest datacenters, plus a user-specified one that
 	// has the data.
-	t.Run("user specified datacenter with data", func(t *testing.T) {
-		query.Service.Failover.NearestN = 2
-		query.Service.Failover.Datacenters = []string{"dc4"}
+	query.Service.Failover.NearestN = 2
+	query.Service.Failover.Datacenters = []string{"dc4"}
+	{
 		mock := &mockQueryServer{
 			Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"},
 			QueryFn: func(req *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error {
@@ -3078,12 +3176,12 @@ func TestPreparedQuery_queryFailover(t *testing.T) {
 		if queries := mock.JoinQueryLog(); queries != "dc1:PreparedQuery.ExecuteRemote|dc2:PreparedQuery.ExecuteRemote|dc4:PreparedQuery.ExecuteRemote" {
 			t.Fatalf("bad: %s", queries)
 		}
-	})
+	}
 
 	// Add in a hard-coded value that overlaps with the nearest list.
-	t.Run("overlap with nearest list", func(t *testing.T) {
-		query.Service.Failover.NearestN = 2
-		query.Service.Failover.Datacenters = []string{"dc4", "dc1"}
+	query.Service.Failover.NearestN = 2
+	query.Service.Failover.Datacenters = []string{"dc4", "dc1"}
+	{
 		mock := &mockQueryServer{
 			Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"},
 			QueryFn: func(req *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error {
@@ -3106,12 +3204,12 @@ func TestPreparedQuery_queryFailover(t *testing.T) {
 		if queries := mock.JoinQueryLog(); queries != "dc1:PreparedQuery.ExecuteRemote|dc2:PreparedQuery.ExecuteRemote|dc4:PreparedQuery.ExecuteRemote" {
 			t.Fatalf("bad: %s", queries)
 		}
-	})
+	}
 
 	// Now add a bogus user-defined one to the mix.
-	t.Run("bogus user-defined", func(t *testing.T) {
-		query.Service.Failover.NearestN = 2
-		query.Service.Failover.Datacenters = []string{"nope", "dc4", "dc1"}
+	query.Service.Failover.NearestN = 2
+	query.Service.Failover.Datacenters = []string{"nope", "dc4", "dc1"}
+	{
 		mock := &mockQueryServer{
 			Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"},
 			QueryFn: func(req *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error {
@@ -3135,13 +3233,13 @@ func TestPreparedQuery_queryFailover(t *testing.T) {
 			t.Fatalf("bad: %s", queries)
 		}
 		require.Contains(t, mock.LogBuffer.String(), "Skipping unknown datacenter")
-	})
+	}
 
 	// Same setup as before but dc1 is going to return an error and should
 	// get skipped over, still yielding data from dc4 which comes later.
-	t.Run("dc1 error", func(t *testing.T) {
-		query.Service.Failover.NearestN = 2
-		query.Service.Failover.Datacenters = []string{"dc4", "dc1"}
+	query.Service.Failover.NearestN = 2
+	query.Service.Failover.Datacenters = []string{"dc4", "dc1"}
+	{
 		mock := &mockQueryServer{
 			Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"},
 			QueryFn: func(req *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error {
@@ -3169,12 +3267,12 @@ func TestPreparedQuery_queryFailover(t *testing.T) {
 		if !strings.Contains(mock.LogBuffer.String(), "Failed querying") {
 			t.Fatalf("bad: %s", mock.LogBuffer.String())
 		}
-	})
+	}
 
 	// Just use a hard-coded list and now xxx has the data.
-	t.Run("hard coded list", func(t *testing.T) {
-		query.Service.Failover.NearestN = 0
-		query.Service.Failover.Datacenters = []string{"dc3", "xxx"}
+	query.Service.Failover.NearestN = 0
+	query.Service.Failover.Datacenters = []string{"dc3", "xxx"}
+	{
 		mock := &mockQueryServer{
 			Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"},
 			QueryFn: func(req *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error {
@@ -3197,12 +3295,12 @@ func TestPreparedQuery_queryFailover(t *testing.T) {
 		if queries := mock.JoinQueryLog(); queries != "dc3:PreparedQuery.ExecuteRemote|xxx:PreparedQuery.ExecuteRemote" {
 			t.Fatalf("bad: %s", queries)
 		}
-	})
+	}
 
 	// Make sure the limit and query options are plumbed through.
-	t.Run("limit and query options used", func(t *testing.T) {
-		query.Service.Failover.NearestN = 0
-		query.Service.Failover.Datacenters = []string{"xxx"}
+	query.Service.Failover.NearestN = 0
+	query.Service.Failover.Datacenters = []string{"xxx"}
+	{
 		mock := &mockQueryServer{
 			Datacenters: []string{"dc1", "dc2", "dc3", "xxx", "dc4"},
 			QueryFn: func(req *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error {
@@ -3234,331 +3332,33 @@ func TestPreparedQuery_queryFailover(t *testing.T) {
 		if queries := mock.JoinQueryLog(); queries != "xxx:PreparedQuery.ExecuteRemote" {
 			t.Fatalf("bad: %s", queries)
 		}
-	})
+	}
 
 	// Failover returns data from the first cluster peer with data.
-	t.Run("failover first peer with data", func(t *testing.T) {
-		query.Service.Failover.Datacenters = nil
-		query.Service.Failover.Targets = []structs.QueryFailoverTarget{
-			{Peer: "cluster-01"},
-			{Datacenter: "dc44"},
-			{Peer: "cluster-02"},
-		}
-		{
-			mock := &mockQueryServer{
-				Datacenters: []string{"dc44"},
-				QueryFn: func(args *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error {
-					if args.Query.Service.Peer == "cluster-02" {
-						reply.Nodes = nodes()
-					}
-					return nil
-				},
-			}
-
-			var reply structs.PreparedQueryExecuteResponse
-			if err := queryFailover(mock, query, &structs.PreparedQueryExecuteRequest{}, &reply); err != nil {
-				t.Fatalf("err: %v", err)
-			}
-			require.Equal(t, "cluster-02", reply.PeerName)
-			require.Equal(t, 3, reply.Failovers)
-			require.Equal(t, nodes(), reply.Nodes)
-			require.Equal(t, "peer:cluster-01|dc44:PreparedQuery.ExecuteRemote|peer:cluster-02", mock.JoinQueryLog())
-		}
-	})
-
-	tests := []struct {
-		name               string
-		targets            []structs.QueryFailoverTarget
-		datacenters        []string
-		queryfn            func(args *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error
-		expectedPeer       string
-		expectedDatacenter string
-		expectedReplies    int
-		expectedQuery      string
-	}{
-		{
-			name: "failover first peer with data",
-			targets: []structs.QueryFailoverTarget{
-				{Peer: "cluster-01"},
-				{Datacenter: "dc44"},
-				{Peer: "cluster-02"},
-			},
-			queryfn: func(args *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error {
+	query.Service.Failover.Datacenters = nil
+	query.Service.Failover.Targets = []structs.QueryFailoverTarget{
+		{Peer: "cluster-01"},
+		{Datacenter: "dc44"},
+		{Peer: "cluster-02"},
+	}
+	{
+		mock := &mockQueryServer{
+			Datacenters: []string{"dc44"},
+			QueryFn: func(args *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error {
 				if args.Query.Service.Peer == "cluster-02" {
 					reply.Nodes = nodes()
 				}
 				return nil
 			},
-			datacenters:        []string{"dc44"},
-			expectedPeer:       "cluster-02",
-			expectedDatacenter: "",
-			expectedReplies:    3,
-			expectedQuery:      "peer:cluster-01|dc44:PreparedQuery.ExecuteRemote|peer:cluster-02",
-		},
-		{
-			name: "failover datacenter with data",
-			targets: []structs.QueryFailoverTarget{
-				{Peer: "cluster-01"},
-				{Datacenter: "dc44"},
-				{Peer: "cluster-02"},
-			},
-			queryfn: func(args *structs.PreparedQueryExecuteRemoteRequest, reply *structs.PreparedQueryExecuteResponse) error {
-				if args.Datacenter == "dc44" {
-					reply.Nodes = nodes()
-				}
-				return nil
-			},
-			datacenters:        []string{"dc44"},
-			expectedPeer:       "",
-			expectedDatacenter: "dc44",
-			expectedReplies:    2,
-			expectedQuery:      "peer:cluster-01|dc44:PreparedQuery.ExecuteRemote",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			query.Service.Failover.Datacenters = nil
-			query.Service.Failover.Targets = tt.targets
-
-			mock := &mockQueryServer{
-				Datacenters: tt.datacenters,
-				QueryFn:     tt.queryfn,
-			}
-
-			var reply structs.PreparedQueryExecuteResponse
-			if err := queryFailover(mock, query, &structs.PreparedQueryExecuteRequest{}, &reply); err != nil {
-				t.Fatalf("err: %v", err)
-			}
-			require.Equal(t, tt.expectedPeer, reply.PeerName)
-			require.Equal(t, tt.expectedReplies, reply.Failovers)
-			require.Equal(t, nodes(), reply.Nodes)
-			require.Equal(t, tt.expectedQuery, mock.JoinQueryLog())
-		})
-	}
-}
-
-type serverTestMetadata struct {
-	server            *Server
-	codec             rpc.ClientCodec
-	datacenter        string
-	acceptingPeerName string
-	dialingPeerName   string
-}
-
-type executeServers struct {
-	server           *serverTestMetadata
-	peeringServer    *serverTestMetadata
-	wanServer        *serverTestMetadata
-	execToken        string
-	denyToken        string
-	execNoNodesToken string
-}
-
-func createExecuteServers(t *testing.T) *executeServers {
-	es := newExecuteServers(t)
-	es.initWanFed(t)
-	es.exportPeeringServices(t)
-	es.initTokens(t)
-
-	return es
-}
-
-func newExecuteServers(t *testing.T) *executeServers {
-
-	// Setup server
-	dir1, s1 := testServerWithConfig(t, func(c *Config) {
-		c.PrimaryDatacenter = "dc1"
-		c.ACLsEnabled = true
-		c.ACLInitialManagementToken = "root"
-		c.ACLResolverSettings.ACLDefaultPolicy = "deny"
-	})
-	t.Cleanup(func() {
-		os.RemoveAll(dir1)
-	})
-	t.Cleanup(func() {
-		s1.Shutdown()
-	})
-	waitForLeaderEstablishment(t, s1)
-	codec1 := rpcClient(t, s1)
-	t.Cleanup(func() {
-		codec1.Close()
-	})
-
-	ca := connect.TestCA(t, nil)
-	dir3, s3 := testServerWithConfig(t, func(c *Config) {
-		c.Datacenter = "dc3"
-		c.PrimaryDatacenter = "dc3"
-		c.NodeName = "acceptingServer.dc3"
-		c.GRPCTLSPort = freeport.GetOne(t)
-		c.CAConfig = &structs.CAConfiguration{
-			ClusterID: connect.TestClusterID,
-			Provider:  structs.ConsulCAProvider,
-			Config: map[string]interface{}{
-				"PrivateKey": ca.SigningKey,
-				"RootCert":   ca.RootCert,
-			},
-		}
-	})
-	t.Cleanup(func() {
-		os.RemoveAll(dir3)
-	})
-	t.Cleanup(func() {
-		s3.Shutdown()
-	})
-	waitForLeaderEstablishment(t, s3)
-	codec3 := rpcClient(t, s3)
-	t.Cleanup(func() {
-		codec3.Close()
-	})
-
-	// check for RPC forwarding
-	testrpc.WaitForLeader(t, s1.RPC, "dc1", testrpc.WithToken("root"))
-	testrpc.WaitForLeader(t, s3.RPC, "dc3")
-
-	acceptingPeerName := "my-peer-accepting-server"
-	dialingPeerName := "my-peer-dialing-server"
-
-	// Set up peering between dc1 (dialing) and dc3 (accepting) and export the foo service
-	{
-		// Create a peering by generating a token.
-		ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-		t.Cleanup(cancel)
-
-		options := structs.QueryOptions{Token: "root"}
-		ctx, err := grpcexternal.ContextWithQueryOptions(ctx, options)
-		require.NoError(t, err)
-
-		conn, err := grpc.DialContext(ctx, s3.config.RPCAddr.String(),
-			grpc.WithContextDialer(newServerDialer(s3.config.RPCAddr.String())),
-			//nolint:staticcheck
-			grpc.WithInsecure(),
-			grpc.WithBlock())
-		require.NoError(t, err)
-		t.Cleanup(func() {
-			conn.Close()
-		})
-
-		peeringClient := pbpeering.NewPeeringServiceClient(conn)
-		req := pbpeering.GenerateTokenRequest{
-			PeerName: dialingPeerName,
-		}
-		resp, err := peeringClient.GenerateToken(ctx, &req)
-		require.NoError(t, err)
-
-		conn, err = grpc.DialContext(ctx, s1.config.RPCAddr.String(),
-			grpc.WithContextDialer(newServerDialer(s1.config.RPCAddr.String())),
-			//nolint:staticcheck
-			grpc.WithInsecure(),
-			grpc.WithBlock())
-		require.NoError(t, err)
-		t.Cleanup(func() {
-			conn.Close()
-		})
-
-		peeringClient = pbpeering.NewPeeringServiceClient(conn)
-		establishReq := pbpeering.EstablishRequest{
-			PeerName:     acceptingPeerName,
-			PeeringToken: resp.PeeringToken,
 		}
-		establishResp, err := peeringClient.Establish(ctx, &establishReq)
-		require.NoError(t, err)
-		require.NotNil(t, establishResp)
-
-		readResp, err := peeringClient.PeeringRead(ctx, &pbpeering.PeeringReadRequest{Name: acceptingPeerName})
-		require.NoError(t, err)
-		require.NotNil(t, readResp)
-
-		// Wait for the stream to be connected.
-		retry.Run(t, func(r *retry.R) {
-			status, found := s1.peerStreamServer.StreamStatus(readResp.GetPeering().GetID())
-			require.True(r, found)
-			require.True(r, status.Connected)
-		})
-	}
-
-	es := executeServers{
-		server: &serverTestMetadata{
-			server:     s1,
-			codec:      codec1,
-			datacenter: "dc1",
-		},
-		peeringServer: &serverTestMetadata{
-			server:            s3,
-			codec:             codec3,
-			datacenter:        "dc3",
-			dialingPeerName:   dialingPeerName,
-			acceptingPeerName: acceptingPeerName,
-		},
-	}
-
-	return &es
-}
-
-func (es *executeServers) initTokens(t *testing.T) {
-	es.execNoNodesToken = createTokenWithPolicyName(t, es.server.codec, "no-nodes", `service_prefix "foo" { policy = "read" }`, "root")
-	rules := `
-		service_prefix "" { policy = "read" }
-		node_prefix "" { policy = "read" }
-	`
-	es.execToken = createTokenWithPolicyName(t, es.server.codec, "with-read", rules, "root")
-	es.denyToken = createTokenWithPolicyName(t, es.server.codec, "with-deny", `service_prefix "foo" { policy = "deny" }`, "root")
-}
-
-func (es *executeServers) exportPeeringServices(t *testing.T) {
-	exportedServices := structs.ConfigEntryRequest{
-		Op:         structs.ConfigEntryUpsert,
-		Datacenter: "dc3",
-		Entry: &structs.ExportedServicesConfigEntry{
-			Name: "default",
-			Services: []structs.ExportedService{
-				{
-					Name:      "foo",
-					Consumers: []structs.ServiceConsumer{{Peer: es.peeringServer.dialingPeerName}},
-				},
-			},
-		},
-	}
-	var configOutput bool
-	require.NoError(t, msgpackrpc.CallWithCodec(es.peeringServer.codec, "ConfigEntry.Apply", &exportedServices, &configOutput))
-	require.True(t, configOutput)
-}
-
-func (es *executeServers) initWanFed(t *testing.T) {
-	dir2, s2 := testServerWithConfig(t, func(c *Config) {
-		c.Datacenter = "dc2"
-		c.PrimaryDatacenter = "dc1"
-		c.ACLsEnabled = true
-		c.ACLResolverSettings.ACLDefaultPolicy = "deny"
-	})
-	t.Cleanup(func() {
-		os.RemoveAll(dir2)
-	})
-	t.Cleanup(func() {
-		s2.Shutdown()
-	})
-	waitForLeaderEstablishment(t, s2)
-	codec2 := rpcClient(t, s2)
-	t.Cleanup(func() {
-		codec2.Close()
-	})
-
-	s2.tokens.UpdateReplicationToken("root", tokenStore.TokenSourceConfig)
 
-	// Try to WAN join.
-	joinWAN(t, s2, es.server.server)
-	retry.Run(t, func(r *retry.R) {
-		if got, want := len(es.server.server.WANMembers()), 2; got != want {
-			r.Fatalf("got %d WAN members want %d", got, want)
-		}
-		if got, want := len(s2.WANMembers()), 2; got != want {
-			r.Fatalf("got %d WAN members want %d", got, want)
+		var reply structs.PreparedQueryExecuteResponse
+		if err := queryFailover(mock, query, &structs.PreparedQueryExecuteRequest{}, &reply); err != nil {
+			t.Fatalf("err: %v", err)
 		}
-	})
-	testrpc.WaitForLeader(t, es.server.server.RPC, "dc2", testrpc.WithToken("root"))
-	es.wanServer = &serverTestMetadata{
-		server:     s2,
-		codec:      codec2,
-		datacenter: "dc2",
+		require.Equal(t, "cluster-02", reply.PeerName)
+		require.Equal(t, 3, reply.Failovers)
+		require.Equal(t, nodes(), reply.Nodes)
+		require.Equal(t, "peer:cluster-01|dc44:PreparedQuery.ExecuteRemote|peer:cluster-02", mock.JoinQueryLog())
 	}
 }
diff --git a/agent/consul/raft_handle.go b/agent/consul/raft_handle.go
deleted file mode 100644
index 2906fe7115f19..0000000000000
--- a/agent/consul/raft_handle.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package consul
-
-import (
-	"context"
-	"errors"
-	"net"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-
-	"github.com/hashicorp/consul/agent/pool"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/internal/storage/raft"
-)
-
-// raftHandle is the glue layer between the Raft resource storage backend and
-// the exising Raft logic in Server.
-type raftHandle struct{ s *Server }
-
-func (h *raftHandle) IsLeader() bool {
-	return h.s.IsLeader()
-}
-
-func (h *raftHandle) EnsureStrongConsistency(ctx context.Context) error {
-	return h.s.consistentReadWithContext(ctx)
-}
-
-func (h *raftHandle) Apply(msg []byte) (any, error) {
-	return h.s.raftApplyEncoded(
-		structs.ResourceOperationType,
-		append([]byte{uint8(structs.ResourceOperationType)}, msg...),
-	)
-}
-
-func (h *raftHandle) DialLeader() (*grpc.ClientConn, error) {
-	leaderAddr, _ := h.s.raft.LeaderWithID()
-	if leaderAddr == "" {
-		return nil, errors.New("leader unknown")
-	}
-
-	dc := h.s.config.Datacenter
-	tlsCfg := h.s.tlsConfigurator
-
-	return grpc.Dial(string(leaderAddr),
-		// TLS is handled in the dialer below.
-		grpc.WithTransportCredentials(insecure.NewCredentials()),
-
-		// This dialer negotiates a connection on the multiplexed server port using
-		// our type-byte prefix scheme (see Server.handleConn for other side of it).
-		grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) {
-			var d net.Dialer
-			conn, err := d.DialContext(ctx, "tcp", addr)
-			if err != nil {
-				return nil, err
-			}
-
-			if tlsCfg.UseTLS(dc) {
-				if _, err := conn.Write([]byte{byte(pool.RPCTLS)}); err != nil {
-					conn.Close()
-					return nil, err
-				}
-
-				tc, err := tlsCfg.OutgoingRPCWrapper()(dc, conn)
-				if err != nil {
-					conn.Close()
-					return nil, err
-				}
-				conn = tc
-			}
-
-			if _, err := conn.Write([]byte{byte(pool.RPCRaftForwarding)}); err != nil {
-				conn.Close()
-				return nil, err
-			}
-			return conn, nil
-		}),
-	)
-}
-
-var _ raft.Handle = (*raftHandle)(nil)
diff --git a/agent/consul/raft_rpc.go b/agent/consul/raft_rpc.go
index 1a0d6caa64d4a..08e23a1409cb4 100644
--- a/agent/consul/raft_rpc.go
+++ b/agent/consul/raft_rpc.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/rate/handler.go b/agent/consul/rate/handler.go
index bb3aef63931dd..087cb83fa2d50 100644
--- a/agent/consul/rate/handler.go
+++ b/agent/consul/rate/handler.go
@@ -1,21 +1,16 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Package rate implements server-side RPC rate limiting.
+// package rate implements server-side RPC rate limiting.
 package rate
 
 import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/hashicorp/consul/agent/metadata"
 	"net"
 	"reflect"
 	"sync/atomic"
 
 	"github.com/armon/go-metrics"
 	"github.com/hashicorp/go-hclog"
-	"golang.org/x/time/rate"
 
 	"github.com/hashicorp/consul/agent/consul/multilimiter"
 )
@@ -56,7 +51,7 @@ var modeToName = map[Mode]string{
 	ModeEnforcing:  "enforcing",
 	ModePermissive: "permissive",
 }
-var ModeFromName = func() map[string]Mode {
+var modeFromName = func() map[string]Mode {
 	vals := map[string]Mode{
 		"": ModeDisabled,
 	}
@@ -72,13 +67,13 @@ func (m Mode) String() string {
 
 // RequestLimitsModeFromName will unmarshal the string form of a configMode.
 func RequestLimitsModeFromName(name string) (Mode, bool) {
-	s, ok := ModeFromName[name]
+	s, ok := modeFromName[name]
 	return s, ok
 }
 
 // RequestLimitsModeFromNameWithDefault will unmarshal the string form of a configMode.
 func RequestLimitsModeFromNameWithDefault(name string) Mode {
-	s, ok := ModeFromName[name]
+	s, ok := modeFromName[name]
 	if !ok {
 		return ModePermissive
 	}
@@ -88,13 +83,6 @@ func RequestLimitsModeFromNameWithDefault(name string) Mode {
 // OperationType is the type of operation the client is attempting to perform.
 type OperationType int
 
-type OperationCategory string
-
-type OperationSpec struct {
-	Type     OperationType
-	Category OperationCategory
-}
-
 const (
 	// OperationTypeRead represents a read operation.
 	OperationTypeRead OperationType = iota
@@ -106,34 +94,6 @@ const (
 	OperationTypeExempt
 )
 
-const (
-	OperationCategoryACL             OperationCategory = "ACL"
-	OperationCategoryCatalog         OperationCategory = "Catalog"
-	OperationCategoryConfigEntry     OperationCategory = "ConfigEntry"
-	OperationCategoryConnectCA       OperationCategory = "ConnectCA"
-	OperationCategoryCoordinate      OperationCategory = "Coordinate"
-	OperationCategoryDiscoveryChain  OperationCategory = "DiscoveryChain"
-	OperationCategoryServerDiscovery OperationCategory = "ServerDiscovery"
-	OperationCategoryHealth          OperationCategory = "Health"
-	OperationCategoryIntention       OperationCategory = "Intention"
-	OperationCategoryKV              OperationCategory = "KV"
-	OperationCategoryPreparedQuery   OperationCategory = "PreparedQuery"
-	OperationCategorySession         OperationCategory = "Session"
-	OperationCategoryStatus          OperationCategory = "Status" // not limited
-	OperationCategoryTxn             OperationCategory = "Txn"
-	OperationCategoryAutoConfig      OperationCategory = "AutoConfig"
-	OperationCategoryFederationState OperationCategory = "FederationState"
-	OperationCategoryInternal        OperationCategory = "Internal"
-	OperationCategoryOperator        OperationCategory = "Operator" // not limited
-	OperationCategoryPeerStream      OperationCategory = "PeerStream"
-	OperationCategoryPeering         OperationCategory = "Peering"
-	OperationCategoryPartition       OperationCategory = "Tenancy"
-	OperationCategoryDataPlane       OperationCategory = "DataPlane"
-	OperationCategoryDNS             OperationCategory = "DNS"
-	OperationCategorySubscribe       OperationCategory = "Subscribe"
-	OperationCategoryResource        OperationCategory = "Resource"
-)
-
 // Operation the client is attempting to perform.
 type Operation struct {
 	// Name of the RPC endpoint (e.g. "Foo.Bar" for net/rpc and "/foo.service/Bar" for gRPC).
@@ -144,8 +104,6 @@ type Operation struct {
 
 	// Type of operation to be performed (e.g. read or write).
 	Type OperationType
-
-	Category OperationCategory
 }
 
 //go:generate mockery --name RequestLimitsHandler --inpackage
@@ -153,52 +111,42 @@ type RequestLimitsHandler interface {
 	Run(ctx context.Context)
 	Allow(op Operation) error
 	UpdateConfig(cfg HandlerConfig)
-	UpdateIPConfig(cfg IPLimitConfig)
-	Register(serversStatusProvider ServersStatusProvider)
+	Register(leaderStatusProvider LeaderStatusProvider)
 }
 
 // Handler enforces rate limits for incoming RPCs.
 type Handler struct {
-	globalCfg             *atomic.Pointer[HandlerConfig]
-	ipCfg                 *atomic.Pointer[IPLimitConfig]
-	serversStatusProvider ServersStatusProvider
+	cfg                  *atomic.Pointer[HandlerConfig]
+	leaderStatusProvider LeaderStatusProvider
 
 	limiter multilimiter.RateLimiter
 
 	logger hclog.Logger
 }
 
-type ReadWriteConfig struct {
-	// WriteConfig configures the global rate limiter for write operations.
-	WriteConfig multilimiter.LimiterConfig
-
-	// ReadConfig configures the global rate limiter for read operations.
-	ReadConfig multilimiter.LimiterConfig
-}
-
-type GlobalLimitConfig struct {
-	Mode Mode
-	ReadWriteConfig
-}
-
 type HandlerConfig struct {
 	multilimiter.Config
 
-	GlobalLimitConfig GlobalLimitConfig
+	// GlobalMode configures the action that will be taken when a global rate-limit
+	// has been exhausted.
+	//
+	// Note: in the future there'll be a separate Mode for IP-based limits.
+	GlobalMode Mode
+
+	// GlobalWriteConfig configures the global rate limiter for write operations.
+	GlobalWriteConfig multilimiter.LimiterConfig
+
+	// GlobalReadConfig configures the global rate limiter for read operations.
+	GlobalReadConfig multilimiter.LimiterConfig
 }
 
-//go:generate mockery --name ServersStatusProvider --inpackage --filename mock_ServersStatusProvider_test.go
-type ServersStatusProvider interface {
+//go:generate mockery --name LeaderStatusProvider --inpackage --filename mock_LeaderStatusProvider_test.go
+type LeaderStatusProvider interface {
 	// IsLeader is used to determine whether the operation is being performed
 	// against the cluster leader, such that if it can _only_ be performed by
 	// the leader (e.g. write operations) we don't tell clients to retry against
 	// a different server.
 	IsLeader() bool
-	IsServer(addr string) bool
-}
-
-func isInfRate(cfg multilimiter.LimiterConfig) bool {
-	return cfg.Rate == rate.Inf
 }
 
 func NewHandlerWithLimiter(
@@ -206,18 +154,15 @@ func NewHandlerWithLimiter(
 	limiter multilimiter.RateLimiter,
 	logger hclog.Logger) *Handler {
 
-	limiter.UpdateConfig(cfg.GlobalLimitConfig.WriteConfig, globalWrite)
-
-	limiter.UpdateConfig(cfg.GlobalLimitConfig.ReadConfig, globalRead)
+	limiter.UpdateConfig(cfg.GlobalWriteConfig, globalWrite)
+	limiter.UpdateConfig(cfg.GlobalReadConfig, globalRead)
 
 	h := &Handler{
-		ipCfg:     new(atomic.Pointer[IPLimitConfig]),
-		globalCfg: new(atomic.Pointer[HandlerConfig]),
-		limiter:   limiter,
-		logger:    logger,
+		cfg:     new(atomic.Pointer[HandlerConfig]),
+		limiter: limiter,
+		logger:  logger,
 	}
-	h.globalCfg.Store(&cfg)
-	h.ipCfg.Store(&IPLimitConfig{})
+	h.cfg.Store(&cfg)
 
 	return h
 }
@@ -239,104 +184,85 @@ func (h *Handler) Run(ctx context.Context) {
 // because of an exhausted rate-limit.
 func (h *Handler) Allow(op Operation) error {
 
-	if h.serversStatusProvider == nil {
-		h.logger.Error("serversStatusProvider required to be set via Register(). bailing on rate limiter")
+	if h.leaderStatusProvider == nil {
+		h.logger.Error("leaderStatusProvider required to be set via Register(). bailing on rate limiter")
 		return nil
 		// TODO: panic and make sure to use the server's recovery handler
-		// panic("serversStatusProvider required to be set via Register(..)")
+		// panic("leaderStatusProvider required to be set via Register(..)")
 	}
 
-	cfg := h.globalCfg.Load()
-	if cfg.GlobalLimitConfig.Mode == ModeDisabled {
+	cfg := h.cfg.Load()
+	if cfg.GlobalMode == ModeDisabled {
 		return nil
 	}
 
-	allow, throttledLimits := h.allowAllLimits(h.limits(op), h.serversStatusProvider.IsServer(string(metadata.GetIP(op.SourceAddr))))
-
-	if !allow {
-		for _, l := range throttledLimits {
-			enforced := l.mode == ModeEnforcing
-			h.logger.Debug("RPC exceeded allowed rate limit",
-				"rpc", op.Name,
-				"source_addr", op.SourceAddr,
-				"limit_type", l.desc,
-				"limit_enforced", enforced,
-			)
-
-			metrics.IncrCounterWithLabels([]string{"rpc", "rate_limit", "exceeded"}, 1, []metrics.Label{
-				{
-					Name:  "limit_type",
-					Value: l.desc,
-				},
-				{
-					Name:  "op",
-					Value: op.Name,
-				},
-				{
-					Name:  "mode",
-					Value: l.mode.String(),
-				},
-			})
-
-			if enforced {
-				if h.serversStatusProvider.IsLeader() && op.Type == OperationTypeWrite {
-					return ErrRetryLater
-				}
-				return ErrRetryElsewhere
+	for _, l := range h.limits(op) {
+		if l.mode == ModeDisabled {
+			continue
+		}
+
+		if h.limiter.Allow(l.ent) {
+			continue
+		}
+
+		// TODO(NET-1382): is this the correct log-level?
+
+		enforced := l.mode == ModeEnforcing
+		h.logger.Debug("RPC exceeded allowed rate limit",
+			"rpc", op.Name,
+			"source_addr", op.SourceAddr,
+			"limit_type", l.desc,
+			"limit_enforced", enforced,
+		)
+
+		metrics.IncrCounterWithLabels([]string{"rpc", "rate_limit", "exceeded"}, 1, []metrics.Label{
+			{
+				Name:  "limit_type",
+				Value: l.desc,
+			},
+			{
+				Name:  "op",
+				Value: op.Name,
+			},
+			{
+				Name:  "mode",
+				Value: l.mode.String(),
+			},
+		})
+
+		if enforced {
+			if h.leaderStatusProvider.IsLeader() && op.Type == OperationTypeWrite {
+				return ErrRetryLater
 			}
+			return ErrRetryElsewhere
 		}
 	}
 	return nil
 }
 
 func (h *Handler) UpdateConfig(cfg HandlerConfig) {
-	existingCfg := h.globalCfg.Load()
-	h.globalCfg.Store(&cfg)
-	if reflect.DeepEqual(existingCfg, &cfg) {
+	existingCfg := h.cfg.Load()
+	h.cfg.Store(&cfg)
+	if reflect.DeepEqual(existingCfg, cfg) {
 		h.logger.Warn("UpdateConfig called but configuration has not changed.  Skipping updating the server rate limiter configuration.")
 		return
 	}
-
-	if !reflect.DeepEqual(existingCfg.GlobalLimitConfig.WriteConfig, cfg.GlobalLimitConfig.WriteConfig) {
-		h.limiter.UpdateConfig(cfg.GlobalLimitConfig.WriteConfig, globalWrite)
+	if !reflect.DeepEqual(existingCfg.GlobalWriteConfig, cfg.GlobalWriteConfig) {
+		h.limiter.UpdateConfig(cfg.GlobalWriteConfig, globalWrite)
 	}
-
-	if !reflect.DeepEqual(existingCfg.GlobalLimitConfig.ReadConfig, cfg.GlobalLimitConfig.ReadConfig) {
-		h.limiter.UpdateConfig(cfg.GlobalLimitConfig.ReadConfig, globalRead)
+	if !reflect.DeepEqual(existingCfg.GlobalReadConfig, cfg.GlobalReadConfig) {
+		h.limiter.UpdateConfig(cfg.GlobalReadConfig, globalRead)
 	}
-
 }
 
-func (h *Handler) Register(serversStatusProvider ServersStatusProvider) {
-	h.serversStatusProvider = serversStatusProvider
+func (h *Handler) Register(leaderStatusProvider LeaderStatusProvider) {
+	h.leaderStatusProvider = leaderStatusProvider
 }
 
 type limit struct {
-	mode          Mode
-	ent           multilimiter.LimitedEntity
-	desc          string
-	applyOnServer bool
-}
-
-func (h *Handler) allowAllLimits(limits []limit, isServer bool) (bool, []limit) {
-	allow := true
-	throttledLimits := make([]limit, 0)
-
-	for _, l := range limits {
-		if l.mode == ModeDisabled {
-			continue
-		}
-
-		if isServer && !l.applyOnServer {
-			continue
-		}
-
-		if !h.limiter.Allow(l.ent) {
-			throttledLimits = append(throttledLimits, l)
-			allow = false
-		}
-	}
-	return allow, throttledLimits
+	mode Mode
+	ent  multilimiter.LimitedEntity
+	desc string
 }
 
 // limits returns the limits to check for the given operation (e.g. global +
@@ -348,14 +274,6 @@ func (h *Handler) limits(op Operation) []limit {
 		limits = append(limits, *global)
 	}
 
-	if ipGlobal := h.ipGlobalLimit(op); ipGlobal != nil {
-		limits = append(limits, *ipGlobal)
-	}
-
-	if ipCategory := h.ipCategoryLimit(op); ipCategory != nil {
-		limits = append(limits, *ipCategory)
-	}
-
 	return limits
 }
 
@@ -363,9 +281,9 @@ func (h *Handler) globalLimit(op Operation) *limit {
 	if op.Type == OperationTypeExempt {
 		return nil
 	}
-	cfg := h.globalCfg.Load()
+	cfg := h.cfg.Load()
 
-	lim := &limit{mode: cfg.GlobalLimitConfig.Mode, applyOnServer: true}
+	lim := &limit{mode: cfg.GlobalMode}
 	switch op.Type {
 	case OperationTypeRead:
 		lim.desc = "global/read"
@@ -381,23 +299,17 @@ func (h *Handler) globalLimit(op Operation) *limit {
 
 var (
 	// globalWrite identifies the global rate limit applied to write operations.
-	globalWrite = limitedEntity("global.write")
+	globalWrite = globalLimit("global.write")
 
 	// globalRead identifies the global rate limit applied to read operations.
-	globalRead = limitedEntity("global.read")
-
-	// globalIPRead identifies the global rate limit applied to read operations.
-	globalIPRead = limitedEntity("global.ip.read")
-
-	// globalIPWrite identifies the global rate limit applied to read operations.
-	globalIPWrite = limitedEntity("global.ip.write")
+	globalRead = globalLimit("global.read")
 )
 
-// limitedEntity convert the string type to Multilimiter.LimitedEntity
-type limitedEntity []byte
+// globalLimit represents a limit that applies to all writes or reads.
+type globalLimit []byte
 
 // Key satisfies the multilimiter.LimitedEntity interface.
-func (prefix limitedEntity) Key() multilimiter.KeyType {
+func (prefix globalLimit) Key() multilimiter.KeyType {
 	return multilimiter.Key(prefix, nil)
 }
 
@@ -408,12 +320,10 @@ func NullRequestLimitsHandler() RequestLimitsHandler {
 
 type nullRequestLimitsHandler struct{}
 
-func (h nullRequestLimitsHandler) UpdateIPConfig(cfg IPLimitConfig) {}
-
 func (nullRequestLimitsHandler) Allow(Operation) error { return nil }
 
-func (nullRequestLimitsHandler) Run(_ context.Context) {}
+func (nullRequestLimitsHandler) Run(ctx context.Context) {}
 
-func (nullRequestLimitsHandler) UpdateConfig(_ HandlerConfig) {}
+func (nullRequestLimitsHandler) UpdateConfig(cfg HandlerConfig) {}
 
-func (nullRequestLimitsHandler) Register(_ ServersStatusProvider) {}
+func (nullRequestLimitsHandler) Register(leaderStatusProvider LeaderStatusProvider) {}
diff --git a/agent/consul/rate/handler_ce.go b/agent/consul/rate/handler_ce.go
deleted file mode 100644
index b0a7beb7c18a0..0000000000000
--- a/agent/consul/rate/handler_ce.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package rate
-
-type IPLimitConfig struct{}
-
-func (h *Handler) UpdateIPConfig(cfg IPLimitConfig) {
-	// noop
-}
-
-func (h *Handler) ipGlobalLimit(op Operation) *limit {
-	return nil
-}
-
-func (h *Handler) ipCategoryLimit(op Operation) *limit {
-	return nil
-}
diff --git a/agent/consul/rate/handler_test.go b/agent/consul/rate/handler_test.go
index 268568ce9599c..3cdb34fbcf55a 100644
--- a/agent/consul/rate/handler_test.go
+++ b/agent/consul/rate/handler_test.go
@@ -1,24 +1,37 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package rate
 
 import (
 	"bytes"
-	"github.com/hashicorp/consul/agent/metrics"
-	"github.com/stretchr/testify/require"
+	"context"
 	"net"
 	"net/netip"
 	"testing"
 
-	"golang.org/x/time/rate"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 
 	"github.com/hashicorp/go-hclog"
-	"github.com/stretchr/testify/mock"
 
 	"github.com/hashicorp/consul/agent/consul/multilimiter"
+	"github.com/hashicorp/consul/agent/metrics"
 )
 
+//
+// Revisit test when handler.go:189 TODO implemented
+//
+// func TestHandler_Allow_PanicsWhenLeaderStatusProviderNotRegistered(t *testing.T) {
+// 	defer func() {
+// 		err := recover()
+// 		if err == nil {
+// 			t.Fatal("Run should panic")
+// 		}
+// 	}()
+
+// 	handler := NewHandler(HandlerConfig{}, hclog.NewNullLogger())
+// 	handler.Allow(Operation{})
+// 	// intentionally skip handler.Register(...)
+// }
+
 func TestHandler(t *testing.T) {
 	var (
 		rpcName    = "Foo.Bar"
@@ -34,7 +47,6 @@ func TestHandler(t *testing.T) {
 		globalMode        Mode
 		checks            []limitCheck
 		isLeader          bool
-		isServer          bool
 		expectErr         error
 		expectLog         bool
 		expectMetric      bool
@@ -209,15 +221,14 @@ func TestHandler(t *testing.T) {
 	for desc, tc := range testCases {
 		t.Run(desc, func(t *testing.T) {
 			sink := metrics.TestSetupMetrics(t, "")
-			limiter := multilimiter.NewMockRateLimiter(t)
+			limiter := newMockLimiter(t)
 			limiter.On("UpdateConfig", mock.Anything, mock.Anything).Return()
 			for _, c := range tc.checks {
-				limiter.On("Allow", mock.Anything).Return(c.allow)
+				limiter.On("Allow", c.limit).Return(c.allow)
 			}
 
-			serversStatusProvider := NewMockServersStatusProvider(t)
-			serversStatusProvider.On("IsLeader").Return(tc.isLeader).Maybe()
-			serversStatusProvider.On("IsServer", mock.Anything).Return(tc.isServer).Maybe()
+			leaderStatusProvider := NewMockLeaderStatusProvider(t)
+			leaderStatusProvider.On("IsLeader").Return(tc.isLeader).Maybe()
 
 			var output bytes.Buffer
 			logger := hclog.NewInterceptLogger(&hclog.LoggerOptions{
@@ -227,18 +238,12 @@ func TestHandler(t *testing.T) {
 
 			handler := NewHandlerWithLimiter(
 				HandlerConfig{
-					GlobalLimitConfig: GlobalLimitConfig{
-						Mode: tc.globalMode,
-						ReadWriteConfig: ReadWriteConfig{
-							ReadConfig:  multilimiter.LimiterConfig{},
-							WriteConfig: multilimiter.LimiterConfig{},
-						},
-					},
+					GlobalMode: tc.globalMode,
 				},
 				limiter,
 				logger,
 			)
-			handler.Register(serversStatusProvider)
+			handler.Register(leaderStatusProvider)
 
 			require.Equal(t, tc.expectErr, handler.Allow(tc.op))
 
@@ -261,26 +266,15 @@ func TestNewHandlerWithLimiter_CallsUpdateConfig(t *testing.T) {
 	readCfg := multilimiter.LimiterConfig{Rate: 100, Burst: 100}
 	writeCfg := multilimiter.LimiterConfig{Rate: 99, Burst: 99}
 	cfg := &HandlerConfig{
-		GlobalLimitConfig: GlobalLimitConfig{
-			Mode: ModeEnforcing,
-			ReadWriteConfig: ReadWriteConfig{
-				ReadConfig:  readCfg,
-				WriteConfig: writeCfg,
-			},
-		},
+		GlobalReadConfig:  readCfg,
+		GlobalWriteConfig: writeCfg,
+		GlobalMode:        ModeEnforcing,
 	}
 	logger := hclog.NewNullLogger()
 	NewHandlerWithLimiter(*cfg, mockRateLimiter, logger)
 	mockRateLimiter.AssertNumberOfCalls(t, "UpdateConfig", 2)
 }
 
-func infReadRateConfig() ReadWriteConfig {
-	return ReadWriteConfig{
-		ReadConfig:  multilimiter.LimiterConfig{Rate: rate.Inf},
-		WriteConfig: multilimiter.LimiterConfig{Rate: rate.Inf},
-	}
-}
-
 func TestUpdateConfig(t *testing.T) {
 	type testCase struct {
 		description   string
@@ -298,29 +292,27 @@ func TestUpdateConfig(t *testing.T) {
 		{
 			description: "RateLimiter gets updated when GlobalReadConfig changes.",
 			configModFunc: func(cfg *HandlerConfig) {
-				rc := multilimiter.LimiterConfig{Rate: cfg.GlobalLimitConfig.ReadWriteConfig.ReadConfig.Rate, Burst: cfg.GlobalLimitConfig.ReadWriteConfig.ReadConfig.Burst + 1}
-				cfg.GlobalLimitConfig.ReadWriteConfig.ReadConfig = rc
+				cfg.GlobalReadConfig.Burst++
 			},
 			assertFunc: func(mockRateLimiter *multilimiter.MockRateLimiter, cfg *HandlerConfig) {
 				mockRateLimiter.AssertNumberOfCalls(t, "UpdateConfig", 1)
-				mockRateLimiter.AssertCalled(t, "UpdateConfig", cfg.GlobalLimitConfig.ReadWriteConfig.ReadConfig, []byte("global.read"))
+				mockRateLimiter.AssertCalled(t, "UpdateConfig", cfg.GlobalReadConfig, []byte("global.read"))
 			},
 		},
 		{
 			description: "RateLimiter gets updated when GlobalWriteConfig changes.",
 			configModFunc: func(cfg *HandlerConfig) {
-				wc := multilimiter.LimiterConfig{Rate: cfg.GlobalLimitConfig.ReadWriteConfig.WriteConfig.Rate, Burst: cfg.GlobalLimitConfig.ReadWriteConfig.WriteConfig.Burst + 1}
-				cfg.GlobalLimitConfig.ReadWriteConfig.WriteConfig = wc
+				cfg.GlobalWriteConfig.Burst++
 			},
 			assertFunc: func(mockRateLimiter *multilimiter.MockRateLimiter, cfg *HandlerConfig) {
 				mockRateLimiter.AssertNumberOfCalls(t, "UpdateConfig", 1)
-				mockRateLimiter.AssertCalled(t, "UpdateConfig", cfg.GlobalLimitConfig.ReadWriteConfig.WriteConfig, []byte("global.write"))
+				mockRateLimiter.AssertCalled(t, "UpdateConfig", cfg.GlobalWriteConfig, []byte("global.write"))
 			},
 		},
 		{
 			description: "RateLimiter does not get updated when GlobalMode changes.",
 			configModFunc: func(cfg *HandlerConfig) {
-				cfg.GlobalLimitConfig.Mode = ModePermissive
+				cfg.GlobalMode = ModePermissive
 			},
 			assertFunc: func(mockRateLimiter *multilimiter.MockRateLimiter, cfg *HandlerConfig) {
 				mockRateLimiter.AssertNumberOfCalls(t, "UpdateConfig", 0)
@@ -333,13 +325,9 @@ func TestUpdateConfig(t *testing.T) {
 			readCfg := multilimiter.LimiterConfig{Rate: 100, Burst: 100}
 			writeCfg := multilimiter.LimiterConfig{Rate: 99, Burst: 99}
 			cfg := &HandlerConfig{
-				GlobalLimitConfig: GlobalLimitConfig{
-					Mode: ModeEnforcing,
-					ReadWriteConfig: ReadWriteConfig{
-						ReadConfig:  readCfg,
-						WriteConfig: writeCfg,
-					},
-				},
+				GlobalReadConfig:  readCfg,
+				GlobalWriteConfig: writeCfg,
+				GlobalMode:        ModeEnforcing,
 			}
 			mockRateLimiter := multilimiter.NewMockRateLimiter(t)
 			mockRateLimiter.On("UpdateConfig", mock.Anything, mock.Anything).Return()
@@ -360,67 +348,75 @@ func TestAllow(t *testing.T) {
 	type testCase struct {
 		description        string
 		cfg                *HandlerConfig
-		expectedAllowCalls bool
+		expectedAllowCalls int
 	}
 	testCases := []testCase{
 		{
 			description: "RateLimiter does not get called when mode is disabled.",
 			cfg: &HandlerConfig{
-				GlobalLimitConfig: GlobalLimitConfig{
-					Mode: ModeDisabled,
-					ReadWriteConfig: ReadWriteConfig{
-						ReadConfig:  readCfg,
-						WriteConfig: writeCfg,
-					},
-				},
+				GlobalReadConfig:  readCfg,
+				GlobalWriteConfig: writeCfg,
+				GlobalMode:        ModeDisabled,
 			},
-			expectedAllowCalls: false,
+			expectedAllowCalls: 0,
 		},
 		{
 			description: "RateLimiter gets called when mode is permissive.",
 			cfg: &HandlerConfig{
-				GlobalLimitConfig: GlobalLimitConfig{
-					Mode: ModePermissive,
-					ReadWriteConfig: ReadWriteConfig{
-						ReadConfig:  readCfg,
-						WriteConfig: writeCfg,
-					},
-				},
+				GlobalReadConfig:  readCfg,
+				GlobalWriteConfig: writeCfg,
+				GlobalMode:        ModePermissive,
 			},
-			expectedAllowCalls: true,
+			expectedAllowCalls: 1,
 		},
 		{
 			description: "RateLimiter gets called when mode is enforcing.",
 			cfg: &HandlerConfig{
-				GlobalLimitConfig: GlobalLimitConfig{
-					Mode: ModeEnforcing,
-					ReadWriteConfig: ReadWriteConfig{
-						ReadConfig:  readCfg,
-						WriteConfig: writeCfg,
-					},
-				},
+				GlobalReadConfig:  readCfg,
+				GlobalWriteConfig: writeCfg,
+				GlobalMode:        ModeEnforcing,
 			},
-			expectedAllowCalls: true,
+			expectedAllowCalls: 1,
 		},
 	}
 
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
 			mockRateLimiter := multilimiter.NewMockRateLimiter(t)
-			if tc.expectedAllowCalls {
+			if tc.expectedAllowCalls > 0 {
 				mockRateLimiter.On("Allow", mock.Anything).Return(func(entity multilimiter.LimitedEntity) bool { return true })
 			}
 			mockRateLimiter.On("UpdateConfig", mock.Anything, mock.Anything).Return()
 			logger := hclog.NewNullLogger()
-			delegate := NewMockServersStatusProvider(t)
+			delegate := NewMockLeaderStatusProvider(t)
 			delegate.On("IsLeader").Return(true).Maybe()
-			delegate.On("IsServer", mock.Anything).Return(false).Maybe()
 			handler := NewHandlerWithLimiter(*tc.cfg, mockRateLimiter, logger)
 			handler.Register(delegate)
 			addr := net.TCPAddrFromAddrPort(netip.MustParseAddrPort("127.0.0.1:1234"))
 			mockRateLimiter.Calls = nil
 			handler.Allow(Operation{Name: "test", SourceAddr: addr})
-			mockRateLimiter.AssertExpectations(t)
+			mockRateLimiter.AssertNumberOfCalls(t, "Allow", tc.expectedAllowCalls)
 		})
 	}
 }
+
+var _ multilimiter.RateLimiter = (*mockLimiter)(nil)
+
+func newMockLimiter(t *testing.T) *mockLimiter {
+	l := &mockLimiter{}
+	l.Mock.Test(t)
+
+	t.Cleanup(func() { l.AssertExpectations(t) })
+
+	return l
+}
+
+type mockLimiter struct {
+	mock.Mock
+}
+
+func (m *mockLimiter) Allow(v multilimiter.LimitedEntity) bool { return m.Called(v).Bool(0) }
+func (m *mockLimiter) Run(ctx context.Context)                 { m.Called(ctx) }
+func (m *mockLimiter) UpdateConfig(cfg multilimiter.LimiterConfig, prefix []byte) {
+	m.Called(cfg, prefix)
+}
diff --git a/agent/consul/rate/metrics.go b/agent/consul/rate/metrics.go
index ac69c14661776..6307bbc51f0e4 100644
--- a/agent/consul/rate/metrics.go
+++ b/agent/consul/rate/metrics.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package rate
 
 import "github.com/armon/go-metrics/prometheus"
diff --git a/agent/consul/rate/mock_LeaderStatusProvider_test.go b/agent/consul/rate/mock_LeaderStatusProvider_test.go
new file mode 100644
index 0000000000000..2c7f1b6cb8fb2
--- /dev/null
+++ b/agent/consul/rate/mock_LeaderStatusProvider_test.go
@@ -0,0 +1,38 @@
+// Code generated by mockery v2.12.2. DO NOT EDIT.
+
+package rate
+
+import (
+	testing "testing"
+
+	mock "github.com/stretchr/testify/mock"
+)
+
+// MockLeaderStatusProvider is an autogenerated mock type for the LeaderStatusProvider type
+type MockLeaderStatusProvider struct {
+	mock.Mock
+}
+
+// IsLeader provides a mock function with given fields:
+func (_m *MockLeaderStatusProvider) IsLeader() bool {
+	ret := _m.Called()
+
+	var r0 bool
+	if rf, ok := ret.Get(0).(func() bool); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(bool)
+	}
+
+	return r0
+}
+
+// NewMockLeaderStatusProvider creates a new instance of MockLeaderStatusProvider. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations.
+func NewMockLeaderStatusProvider(t testing.TB) *MockLeaderStatusProvider {
+	mock := &MockLeaderStatusProvider{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/agent/consul/rate/mock_RequestLimitsHandler.go b/agent/consul/rate/mock_RequestLimitsHandler.go
index 3fa07089b7bd9..9ff0e3baafa05 100644
--- a/agent/consul/rate/mock_RequestLimitsHandler.go
+++ b/agent/consul/rate/mock_RequestLimitsHandler.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.20.0. DO NOT EDIT.
+// Code generated by mockery v2.15.0. DO NOT EDIT.
 
 package rate
 
@@ -27,11 +27,6 @@ func (_m *MockRequestLimitsHandler) Allow(op Operation) error {
 	return r0
 }
 
-// Register provides a mock function with given fields: serversStatusProvider
-func (_m *MockRequestLimitsHandler) Register(serversStatusProvider ServersStatusProvider) {
-	_m.Called(serversStatusProvider)
-}
-
 // Run provides a mock function with given fields: ctx
 func (_m *MockRequestLimitsHandler) Run(ctx context.Context) {
 	_m.Called(ctx)
@@ -42,9 +37,9 @@ func (_m *MockRequestLimitsHandler) UpdateConfig(cfg HandlerConfig) {
 	_m.Called(cfg)
 }
 
-// UpdateIPConfig provides a mock function with given fields: cfg
-func (_m *MockRequestLimitsHandler) UpdateIPConfig(cfg IPLimitConfig) {
-	_m.Called(cfg)
+// Register provides a mock function with given fields: leaderStatusProvider
+func (_m *MockRequestLimitsHandler) Register(leaderStatusProvider LeaderStatusProvider) {
+	_m.Called(leaderStatusProvider)
 }
 
 type mockConstructorTestingTNewMockRequestLimitsHandler interface {
diff --git a/agent/consul/rate/mock_ServersStatusProvider_test.go b/agent/consul/rate/mock_ServersStatusProvider_test.go
deleted file mode 100644
index 42cd710743652..0000000000000
--- a/agent/consul/rate/mock_ServersStatusProvider_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Code generated by mockery v2.20.0. DO NOT EDIT.
-
-package rate
-
-import mock "github.com/stretchr/testify/mock"
-
-// MockServersStatusProvider is an autogenerated mock type for the ServersStatusProvider type
-type MockServersStatusProvider struct {
-	mock.Mock
-}
-
-// IsLeader provides a mock function with given fields:
-func (_m *MockServersStatusProvider) IsLeader() bool {
-	ret := _m.Called()
-
-	var r0 bool
-	if rf, ok := ret.Get(0).(func() bool); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Get(0).(bool)
-	}
-
-	return r0
-}
-
-// IsServer provides a mock function with given fields: addr
-func (_m *MockServersStatusProvider) IsServer(addr string) bool {
-	ret := _m.Called(addr)
-
-	var r0 bool
-	if rf, ok := ret.Get(0).(func(string) bool); ok {
-		r0 = rf(addr)
-	} else {
-		r0 = ret.Get(0).(bool)
-	}
-
-	return r0
-}
-
-type mockConstructorTestingTNewMockServersStatusProvider interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewMockServersStatusProvider creates a new instance of MockServersStatusProvider. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewMockServersStatusProvider(t mockConstructorTestingTNewMockServersStatusProvider) *MockServersStatusProvider {
-	mock := &MockServersStatusProvider{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/agent/consul/replication.go b/agent/consul/replication.go
index 08b8811129bea..4b6f74c5cdf9c 100644
--- a/agent/consul/replication.go
+++ b/agent/consul/replication.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/replication_test.go b/agent/consul/replication_test.go
index 27000fc563b78..64d0388bf9a16 100644
--- a/agent/consul/replication_test.go
+++ b/agent/consul/replication_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/reporting/reporting.go b/agent/consul/reporting/reporting.go
index d6c480f6bace4..94f780ec06028 100644
--- a/agent/consul/reporting/reporting.go
+++ b/agent/consul/reporting/reporting.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package reporting
 
 import (
diff --git a/agent/consul/reporting/reporting_ce.go b/agent/consul/reporting/reporting_ce.go
index b9eb978b8c026..240500d6d5093 100644
--- a/agent/consul/reporting/reporting_ce.go
+++ b/agent/consul/reporting/reporting_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package reporting
 
diff --git a/agent/consul/rpc.go b/agent/consul/rpc.go
index dbb781951e348..f608fc307238a 100644
--- a/agent/consul/rpc.go
+++ b/agent/consul/rpc.go
@@ -1,10 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
-	"context"
 	"crypto/tls"
 	"encoding/binary"
 	"errors"
@@ -246,9 +242,6 @@ func (s *Server) handleConn(conn net.Conn, isTLS bool) {
 	case pool.RPCGRPC:
 		s.grpcHandler.Handle(conn)
 
-	case pool.RPCRaftForwarding:
-		s.handleRaftForwarding(conn)
-
 	default:
 		if !s.handleEnterpriseRPCConn(typ, conn, isTLS) {
 			s.rpcLogger().Error("unrecognized RPC byte",
@@ -317,9 +310,6 @@ func (s *Server) handleNativeTLS(conn net.Conn) {
 	case pool.ALPN_RPCGRPC:
 		s.grpcHandler.Handle(tlsConn)
 
-	case pool.ALPN_RPCRaftForwarding:
-		s.handleRaftForwarding(tlsConn)
-
 	case pool.ALPN_WANGossipPacket:
 		if err := s.handleALPN_WANGossipPacketStream(tlsConn); err != nil && err != io.EOF {
 			s.rpcLogger().Error(
@@ -502,19 +492,6 @@ func (s *Server) handleRaftRPC(conn net.Conn) {
 	s.raftLayer.Handoff(conn)
 }
 
-func (s *Server) handleRaftForwarding(conn net.Conn) {
-	if tlsConn, ok := conn.(*tls.Conn); ok {
-		err := s.tlsConfigurator.AuthorizeServerConn(s.config.Datacenter, tlsConn)
-		if err != nil {
-			s.rpcLogger().Warn(err.Error(), "from", conn.RemoteAddr(), "operation", "raft forwarding")
-			conn.Close()
-			return
-		}
-	}
-
-	s.raftStorageBackend.HandleConnection(conn)
-}
-
 func (s *Server) handleALPN_WANGossipPacketStream(conn net.Conn) error {
 	defer conn.Close()
 
@@ -922,19 +899,21 @@ func (s *Server) raftApply(t structs.MessageType, msg interface{}) (interface{},
 }
 
 // raftApplyMsgpack encodes the msg using msgpack and calls raft.Apply. See
-// raftApplyEncoded.
+// raftApplyWithEncoder.
 func (s *Server) raftApplyMsgpack(t structs.MessageType, msg interface{}) (interface{}, error) {
 	return s.raftApplyWithEncoder(t, msg, structs.Encode)
 }
 
 // raftApplyProtobuf encodes the msg using protobuf and calls raft.Apply. See
-// raftApplyEncoded.
+// raftApplyWithEncoder.
 func (s *Server) raftApplyProtobuf(t structs.MessageType, msg interface{}) (interface{}, error) {
 	return s.raftApplyWithEncoder(t, msg, structs.EncodeProtoInterface)
 }
 
 // raftApplyWithEncoder encodes a message, and then calls raft.Apply with the
-// encoded message. See raftApplyEncoded.
+// encoded message. Returns the FSM response along with any errors. If the
+// FSM.Apply response is an error it will be returned as the error return
+// value with a nil response.
 func (s *Server) raftApplyWithEncoder(
 	t structs.MessageType,
 	msg interface{},
@@ -947,13 +926,7 @@ func (s *Server) raftApplyWithEncoder(
 	if err != nil {
 		return nil, fmt.Errorf("Failed to encode request: %v", err)
 	}
-	return s.raftApplyEncoded(t, buf)
-}
 
-// raftApplyEncoded calls raft.Apply with the encoded message. Returns the FSM
-// response along with any errors. If the FSM.Apply response is an error it will
-// be returned as the error return value with a nil response.
-func (s *Server) raftApplyEncoded(t structs.MessageType, buf []byte) (any, error) {
 	// Warn if the command is very large
 	if n := len(buf); n > raftWarnSize {
 		s.rpcLogger().Warn("Attempting to apply large raft entry", "size_in_bytes", n)
@@ -1059,53 +1032,37 @@ func (s *Server) SetQueryMeta(m blockingquery.ResponseMeta, token string) {
 	}
 }
 
-func (s *Server) consistentReadWithContext(ctx context.Context) error {
+// consistentRead is used to ensure we do not perform a stale
+// read. This is done by verifying leadership before the read.
+func (s *Server) ConsistentRead() error {
 	defer metrics.MeasureSince([]string{"rpc", "consistentRead"}, time.Now())
 	future := s.raft.VerifyLeader()
 	if err := future.Error(); err != nil {
 		return err // fail fast if leader verification fails
 	}
-
+	// poll consistent read readiness, wait for up to RPCHoldTimeout milliseconds
 	if s.isReadyForConsistentReads() {
 		return nil
 	}
+	jitter := lib.RandomStagger(s.config.RPCHoldTimeout / structs.JitterFraction)
+	deadline := time.Now().Add(s.config.RPCHoldTimeout)
 
-	// Poll until the context reaches its deadline, or for RPCHoldTimeout if the
-	// context has no deadline.
-	pollFor := s.config.RPCHoldTimeout
-	if deadline, ok := ctx.Deadline(); ok {
-		pollFor = time.Until(deadline)
-	}
-
-	interval := pollFor / structs.JitterFraction
-	if interval <= 0 {
-		return structs.ErrNotReadyForConsistentReads
-	}
+	for time.Now().Before(deadline) {
 
-	ticker := time.NewTicker(interval)
-	defer ticker.Stop()
-
-	for {
 		select {
-		case <-ticker.C:
-			if s.isReadyForConsistentReads() {
-				return nil
-			}
-		case <-ctx.Done():
-			return structs.ErrNotReadyForConsistentReads
+		case <-time.After(jitter):
+			// Drop through and check before we loop again.
+
 		case <-s.shutdownCh:
 			return fmt.Errorf("shutdown waiting for leader")
 		}
-	}
-}
 
-// ConsistentRead is used to ensure we do not perform a stale
-// read. This is done by verifying leadership before the read.
-func (s *Server) ConsistentRead() error {
-	ctx, cancel := context.WithTimeout(context.Background(), s.config.RPCHoldTimeout)
-	defer cancel()
+		if s.isReadyForConsistentReads() {
+			return nil
+		}
+	}
 
-	return s.consistentReadWithContext(ctx)
+	return structs.ErrNotReadyForConsistentReads
 }
 
 // RPCQueryTimeout calculates the timeout for the query, ensures it is
diff --git a/agent/consul/rpc_test.go b/agent/consul/rpc_test.go
index 39351c98ca92a..263689f625bea 100644
--- a/agent/consul/rpc_test.go
+++ b/agent/consul/rpc_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -42,7 +39,7 @@ import (
 	tokenStore "github.com/hashicorp/consul/agent/token"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/consul/testrpc"
diff --git a/agent/consul/rtt.go b/agent/consul/rtt.go
index 1599301e158df..caf8116ed0d63 100644
--- a/agent/consul/rtt.go
+++ b/agent/consul/rtt.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/rtt_test.go b/agent/consul/rtt_test.go
index aeed0b66f50d5..9a488a372495a 100644
--- a/agent/consul/rtt_test.go
+++ b/agent/consul/rtt_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/segment_ce.go b/agent/consul/segment_ce.go
index 25e941ced0056..44b8a14b2e7ef 100644
--- a/agent/consul/segment_ce.go
+++ b/agent/consul/segment_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/serf_filter.go b/agent/consul/serf_filter.go
index 7b09c2b9e8020..ebd6db75911f1 100644
--- a/agent/consul/serf_filter.go
+++ b/agent/consul/serf_filter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/serf_test.go b/agent/consul/serf_test.go
index 4d4bc4926a46d..8335468f4d3c0 100644
--- a/agent/consul/serf_test.go
+++ b/agent/consul/serf_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/server.go b/agent/consul/server.go
index 9540cbe1c0fde..bf1166d2b734d 100644
--- a/agent/consul/server.go
+++ b/agent/consul/server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -33,12 +30,10 @@ import (
 	"go.etcd.io/bbolt"
 	"golang.org/x/time/rate"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-	"google.golang.org/grpc/reflection"
 
 	"github.com/hashicorp/consul-net-rpc/net/rpc"
+
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/acl/resolver"
 	"github.com/hashicorp/consul/agent/blockingquery"
 	"github.com/hashicorp/consul/agent/consul/authmethod"
 	"github.com/hashicorp/consul/agent/consul/authmethod/ssoauth"
@@ -55,7 +50,6 @@ import (
 	"github.com/hashicorp/consul/agent/grpc-external/services/connectca"
 	"github.com/hashicorp/consul/agent/grpc-external/services/dataplane"
 	"github.com/hashicorp/consul/agent/grpc-external/services/peerstream"
-	resourcegrpc "github.com/hashicorp/consul/agent/grpc-external/services/resource"
 	"github.com/hashicorp/consul/agent/grpc-external/services/serverdiscovery"
 	agentgrpc "github.com/hashicorp/consul/agent/grpc-internal"
 	"github.com/hashicorp/consul/agent/grpc-internal/services/subscribe"
@@ -70,22 +64,10 @@ import (
 	"github.com/hashicorp/consul/agent/rpc/peering"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/token"
-	"github.com/hashicorp/consul/internal/auth"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh"
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/internal/resource/reaper"
-	raftstorage "github.com/hashicorp/consul/internal/storage/raft"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/lib/routine"
-	"github.com/hashicorp/consul/lib/stringslice"
 	"github.com/hashicorp/consul/logging"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 	"github.com/hashicorp/consul/tlsutil"
 	"github.com/hashicorp/consul/types"
 	cslversion "github.com/hashicorp/consul/version"
@@ -135,9 +117,6 @@ const (
 	reconcileChSize = 256
 
 	LeaderTransferMinVersion = "1.6.0"
-
-	CatalogResourceExperimentName = "resource-apis"
-	V2TenancyExperimentName       = "v2tenancy"
 )
 
 const (
@@ -246,7 +225,7 @@ type Server struct {
 	// serf cluster that spans datacenters
 	eventChWAN chan serf.Event
 
-	// wanMembershipNotifyCh is used to receive notifications that the
+	// wanMembershipNotifyCh is used to receive notifications that the the
 	// serfWAN wan pool may have changed.
 	//
 	// If this is nil, notification is skipped.
@@ -273,9 +252,6 @@ type Server struct {
 	// transition notifications from the Raft layer.
 	raftNotifyCh <-chan bool
 
-	// raftStorageBackend is the Raft-backed storage backend for resources.
-	raftStorageBackend *raftstorage.Backend
-
 	// reconcileCh is used to pass events from the serf handler
 	// into the leader manager, so that the strong state can be
 	// updated
@@ -439,34 +415,8 @@ type Server struct {
 	EnterpriseServer
 	operatorServer *operator.Server
 
-	// routineManager is responsible for managing longer running go routines
-	// run by the Server
-	routineManager *routine.Manager
-
-	// resourceServiceServer implements the Resource Service.
-	resourceServiceServer *resourcegrpc.Server
-
-	// insecureResourceServiceClient is a client that can be used to communicate
-	// with the Resource Service in-process (i.e. not via the network) *without*
-	// auth. It should only be used for purely-internal workloads, such as
-	// controllers.
-	insecureResourceServiceClient pbresource.ResourceServiceClient
-
-	// secureResourceServiceClient is a client that can be used to communicate
-	// with the Resource Service in-process (i.e. not via the network) *with* auth.
-	// It can be used to make requests to the Resource Service on behalf of the user
-	// (e.g. from the HTTP API).
-	secureResourceServiceClient pbresource.ResourceServiceClient
-
-	// controllerManager schedules the execution of controllers.
-	controllerManager *controller.Manager
-
 	// handles metrics reporting to HashiCorp
 	reportingManager *reporting.ReportingManager
-
-	registry resource.Registry
-
-	useV2Resources bool
 }
 
 func (s *Server) DecrementBlockingQueries() uint64 {
@@ -487,22 +437,9 @@ type connHandler interface {
 	Shutdown() error
 }
 
-// ProxyUpdater is an interface for ProxyTracker.
-type ProxyUpdater interface {
-	// PushChange allows pushing a computed ProxyState to xds for xds resource generation to send to a proxy.
-	PushChange(id *pbresource.ID, snapshot proxysnapshot.ProxySnapshot) error
-
-	// ProxyConnectedToServer returns whether this id is connected to this server. If it is connected, it also returns
-	// the token as the first argument.
-	ProxyConnectedToServer(id *pbresource.ID) (string, bool)
-
-	EventChannel() chan controller.Event
-}
-
 // NewServer is used to construct a new Consul server from the configuration
 // and extra options, potentially returning an error.
-func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server,
-	incomingRPCLimiter rpcRate.RequestLimitsHandler, serverLogger hclog.InterceptLogger, proxyUpdater ProxyUpdater) (*Server, error) {
+func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server, incomingRPCLimiter rpcRate.RequestLimitsHandler, serverLogger hclog.InterceptLogger) (*Server, error) {
 	logger := flat.Logger
 	if err := config.CheckProtocolVersion(); err != nil {
 		return nil, err
@@ -525,6 +462,14 @@ func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server,
 
 	loggers := newLoggerStore(serverLogger)
 
+	fsmDeps := fsm.Deps{
+		Logger: flat.Logger,
+		NewStateStore: func() *state.Store {
+			return state.NewStateStoreWithEventPublisher(gc, flat.EventPublisher)
+		},
+		Publisher: flat.EventPublisher,
+	}
+
 	if incomingRPCLimiter == nil {
 		incomingRPCLimiter = rpcRate.NullRequestLimitsHandler()
 	}
@@ -551,28 +496,12 @@ func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server,
 		shutdownCh:              shutdownCh,
 		leaderRoutineManager:    routine.NewManager(logger.Named(logging.Leader)),
 		aclAuthMethodValidators: authmethod.NewCache(),
+		fsm:                     fsm.NewFromDeps(fsmDeps),
 		publisher:               flat.EventPublisher,
 		incomingRPCLimiter:      incomingRPCLimiter,
-		routineManager:          routine.NewManager(logger.Named(logging.ConsulServer)),
-		registry:                flat.Registry,
-		useV2Resources:          flat.UseV2Resources(),
-	}
-	incomingRPCLimiter.Register(s)
-
-	s.raftStorageBackend, err = raftstorage.NewBackend(&raftHandle{s}, logger.Named("raft-storage-backend"))
-	if err != nil {
-		return nil, fmt.Errorf("failed to create storage backend: %w", err)
 	}
-	go s.raftStorageBackend.Run(&lib.StopChannelContext{StopCh: shutdownCh})
 
-	s.fsm = fsm.NewFromDeps(fsm.Deps{
-		Logger: flat.Logger,
-		NewStateStore: func() *state.Store {
-			return state.NewStateStoreWithEventPublisher(gc, flat.EventPublisher)
-		},
-		Publisher:      flat.EventPublisher,
-		StorageBackend: s.raftStorageBackend,
-	})
+	incomingRPCLimiter.Register(s)
 
 	s.hcpManager = hcp.NewManager(hcp.ManagerConfig{
 		Client:   flat.HCP.Client,
@@ -591,17 +520,7 @@ func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server,
 	}
 
 	rpcServerOpts := []func(*rpc.Server){
-		rpc.WithPreBodyInterceptor(
-			middleware.ChainedRPCPreBodyInterceptor(
-				func(reqServiceMethod string, sourceAddr net.Addr) error {
-					if s.useV2Resources && isV1CatalogRequest(reqServiceMethod) {
-						return structs.ErrUsingV2CatalogExperiment
-					}
-					return nil
-				},
-				middleware.GetNetRPCRateLimitingInterceptor(s.incomingRPCLimiter, middleware.NewPanicHandler(s.logger)),
-			),
-		),
+		rpc.WithPreBodyInterceptor(middleware.GetNetRPCRateLimitingInterceptor(s.incomingRPCLimiter, middleware.NewPanicHandler(s.logger))),
 	}
 
 	if flat.GetNetRPCInterceptorFunc != nil {
@@ -703,7 +622,7 @@ func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server,
 	}
 
 	// Initialize the Raft server.
-	if err := s.setupRaft(stringslice.Contains(flat.Experiments, CatalogResourceExperimentName)); err != nil {
+	if err := s.setupRaft(); err != nil {
 		s.Shutdown()
 		return nil, fmt.Errorf("Failed to start Raft: %v", err)
 	}
@@ -832,19 +751,69 @@ func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server,
 	s.reportingManager = reporting.NewReportingManager(s.logger, getEnterpriseReportingDeps(flat), s, s.fsm.State())
 	go s.reportingManager.Run(&lib.StopChannelContext{StopCh: s.shutdownCh})
 
-	// Setup insecure resource service client.
-	if err := s.setupInsecureResourceServiceClient(flat.Registry, logger, flat); err != nil {
-		return nil, err
-	}
+	// Initialize external gRPC server - register services on external gRPC server.
+	s.externalACLServer = aclgrpc.NewServer(aclgrpc.Config{
+		ACLsEnabled: s.config.ACLsEnabled,
+		ForwardRPC: func(info structs.RPCInfo, fn func(*grpc.ClientConn) error) (bool, error) {
+			return s.ForwardGRPC(s.grpcConnPool, info, fn)
+		},
+		InPrimaryDatacenter: s.InPrimaryDatacenter(),
+		LoadAuthMethod: func(methodName string, entMeta *acl.EnterpriseMeta) (*structs.ACLAuthMethod, aclgrpc.Validator, error) {
+			return s.loadAuthMethod(methodName, entMeta)
+		},
+		LocalTokensEnabled:        s.LocalTokensEnabled,
+		Logger:                    logger.Named("grpc-api.acl"),
+		NewLogin:                  func() aclgrpc.Login { return s.aclLogin() },
+		NewTokenWriter:            func() aclgrpc.TokenWriter { return s.aclTokenWriter() },
+		PrimaryDatacenter:         s.config.PrimaryDatacenter,
+		ValidateEnterpriseRequest: s.validateEnterpriseRequest,
+	})
+	s.externalACLServer.Register(s.externalGRPCServer)
 
-	// Initialize external gRPC server
-	s.setupExternalGRPC(config, flat, logger)
+	s.externalConnectCAServer = connectca.NewServer(connectca.Config{
+		Publisher:   s.publisher,
+		GetStore:    func() connectca.StateStore { return s.FSM().State() },
+		Logger:      logger.Named("grpc-api.connect-ca"),
+		ACLResolver: s.ACLResolver,
+		CAManager:   s.caManager,
+		ForwardRPC: func(info structs.RPCInfo, fn func(*grpc.ClientConn) error) (bool, error) {
+			return s.ForwardGRPC(s.grpcConnPool, info, fn)
+		},
+		ConnectEnabled: s.config.ConnectEnabled,
+	})
+	s.externalConnectCAServer.Register(s.externalGRPCServer)
 
-	// Setup secure resource service client. We need to do it after we setup the
-	// gRPC server because it needs the server to be instantiated.
-	if err := s.setupSecureResourceServiceClient(); err != nil {
-		return nil, err
-	}
+	dataplane.NewServer(dataplane.Config{
+		GetStore:    func() dataplane.StateStore { return s.FSM().State() },
+		Logger:      logger.Named("grpc-api.dataplane"),
+		ACLResolver: s.ACLResolver,
+		Datacenter:  s.config.Datacenter,
+	}).Register(s.externalGRPCServer)
+
+	serverdiscovery.NewServer(serverdiscovery.Config{
+		Publisher:   s.publisher,
+		ACLResolver: s.ACLResolver,
+		Logger:      logger.Named("grpc-api.server-discovery"),
+	}).Register(s.externalGRPCServer)
+
+	s.peeringBackend = NewPeeringBackend(s)
+	s.operatorBackend = NewOperatorBackend(s)
+	s.peerStreamServer = peerstream.NewServer(peerstream.Config{
+		Backend:        s.peeringBackend,
+		GetStore:       func() peerstream.StateStore { return s.FSM().State() },
+		Logger:         logger.Named("grpc-api.peerstream"),
+		ACLResolver:    s.ACLResolver,
+		Datacenter:     s.config.Datacenter,
+		ConnectEnabled: s.config.ConnectEnabled,
+		ForwardRPC: func(info structs.RPCInfo, fn func(*grpc.ClientConn) error) (bool, error) {
+			// Only forward the request if the dc in the request matches the server's datacenter.
+			if info.RequestDatacenter() != "" && info.RequestDatacenter() != config.Datacenter {
+				return false, fmt.Errorf("requests to generate peering tokens cannot be forwarded to remote datacenters")
+			}
+			return s.ForwardGRPC(s.grpcConnPool, info, fn)
+		},
+	})
+	s.peerStreamServer.Register(s.externalGRPCServer)
 
 	// Initialize internal gRPC server.
 	//
@@ -852,16 +821,6 @@ func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server,
 	// to enable RPC forwarding.
 	s.grpcHandler = newGRPCHandlerFromConfig(flat, config, s)
 	s.grpcLeaderForwarder = flat.LeaderForwarder
-
-	s.controllerManager = controller.NewManager(
-		s.insecureResourceServiceClient,
-		logger.Named(logging.ControllerRuntime),
-	)
-	if err := s.registerControllers(flat, proxyUpdater); err != nil {
-		return nil, err
-	}
-	go s.controllerManager.Run(&lib.StopChannelContext{StopCh: shutdownCh})
-
 	go s.trackLeaderChanges()
 
 	s.xdsCapacityController = xdscapacity.NewController(xdscapacity.Config{
@@ -902,83 +861,9 @@ func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server,
 	// Now we are setup, configure the HCP manager
 	go s.hcpManager.Run(&lib.StopChannelContext{StopCh: shutdownCh})
 
-	err = s.runEnterpriseRateLimiterConfigEntryController()
-	if err != nil {
-		return nil, err
-	}
-
 	return s, nil
 }
 
-func isV1CatalogRequest(rpcName string) bool {
-	switch {
-	case strings.HasPrefix(rpcName, "Catalog."),
-		strings.HasPrefix(rpcName, "Health."),
-		strings.HasPrefix(rpcName, "ConfigEntry."):
-		return true
-	}
-
-	switch rpcName {
-	case "Internal.EventFire", "Internal.KeyringOperation", "Internal.OIDCAuthMethods":
-		return false
-	default:
-		if strings.HasPrefix(rpcName, "Internal.") {
-			return true
-		}
-		return false
-	}
-}
-
-func (s *Server) registerControllers(deps Deps, proxyUpdater ProxyUpdater) error {
-	if s.useV2Resources {
-		catalog.RegisterControllers(s.controllerManager, catalog.DefaultControllerDependencies())
-
-		defaultAllow, err := s.config.ACLResolverSettings.IsDefaultAllow()
-		if err != nil {
-			return err
-		}
-
-		mesh.RegisterControllers(s.controllerManager, mesh.ControllerDependencies{
-			TrustBundleFetcher: func() (*pbproxystate.TrustBundle, error) {
-				var bundle pbproxystate.TrustBundle
-				roots, err := s.getCARoots(nil, s.GetState())
-				if err != nil {
-					return nil, err
-				}
-				bundle.TrustDomain = roots.TrustDomain
-				for _, root := range roots.Roots {
-					bundle.Roots = append(bundle.Roots, root.RootCert)
-				}
-				return &bundle, nil
-			},
-			// This function is adapted from server_connect.go:getCARoots.
-			TrustDomainFetcher: func() (string, error) {
-				_, caConfig, err := s.fsm.State().CAConfig(nil)
-				if err != nil {
-					return "", err
-				}
-
-				return s.getTrustDomain(caConfig)
-			},
-
-			LeafCertManager: deps.LeafCertManager,
-			LocalDatacenter: s.config.Datacenter,
-			DefaultAllow:    defaultAllow,
-			ProxyUpdater:    proxyUpdater,
-		})
-
-		auth.RegisterControllers(s.controllerManager, auth.DefaultControllerDependencies())
-	}
-
-	reaper.RegisterControllers(s.controllerManager)
-
-	if s.config.DevMode {
-		demo.RegisterControllers(s.controllerManager)
-	}
-
-	return nil
-}
-
 func newGRPCHandlerFromConfig(deps Deps, config *Config, s *Server) connHandler {
 	if s.peeringBackend == nil {
 		panic("peeringBackend is required during construction")
@@ -998,7 +883,6 @@ func newGRPCHandlerFromConfig(deps Deps, config *Config, s *Server) connHandler
 		Datacenter:     config.Datacenter,
 		ConnectEnabled: config.ConnectEnabled,
 		PeeringEnabled: config.PeeringEnabled,
-		Locality:       config.Locality,
 		FSMServer:      s,
 	})
 	s.peeringServer = p
@@ -1031,7 +915,6 @@ func newGRPCHandlerFromConfig(deps Deps, config *Config, s *Server) connHandler
 		s.peerStreamServer.Register(srv)
 		s.externalACLServer.Register(srv)
 		s.externalConnectCAServer.Register(srv)
-		s.resourceServiceServer.Register(srv)
 	}
 
 	return agentgrpc.NewHandler(deps.Logger, config.RPCAddr, register, nil, s.incomingRPCLimiter)
@@ -1063,7 +946,7 @@ func (s *Server) connectCARootsMonitor(ctx context.Context) {
 }
 
 // setupRaft is used to setup and initialize Raft
-func (s *Server) setupRaft(isCatalogResourceExperiment bool) error {
+func (s *Server) setupRaft() error {
 	// If we have an unclean exit then attempt to close the Raft store.
 	defer func() {
 		if s.raft == nil && s.raftStore != nil {
@@ -1122,7 +1005,8 @@ func (s *Server) setupRaft(isCatalogResourceExperiment bool) error {
 			return fmt.Errorf("failed trying to see if raft.db exists not sure how to continue: %w", err)
 		}
 
-		initWAL := func() error {
+		// Only use WAL if there is no existing raft.db, even if it's enabled.
+		if s.config.LogStoreConfig.Backend == LogStoreBackendWAL && !boltFileExists {
 			walDir := filepath.Join(path, "wal")
 			if err := os.MkdirAll(walDir, 0755); err != nil {
 				return err
@@ -1141,29 +1025,13 @@ func (s *Server) setupRaft(isCatalogResourceExperiment bool) error {
 			s.raftStore = wal
 			log = wal
 			stable = wal
-			return nil
-		}
-		// Only use WAL if there is no existing raft.db, even if it's enabled.
-		if s.config.LogStoreConfig.Backend == LogStoreBackendDefault && !boltFileExists && isCatalogResourceExperiment {
-			s.config.LogStoreConfig.Backend = LogStoreBackendWAL
-			if !s.config.LogStoreConfig.Verification.Enabled {
-				s.config.LogStoreConfig.Verification.Enabled = true
-				s.config.LogStoreConfig.Verification.Interval = 1 * time.Minute
-			}
-			if err = initWAL(); err != nil {
-				return err
-			}
-		} else if s.config.LogStoreConfig.Backend == LogStoreBackendWAL && !boltFileExists {
-			if err = initWAL(); err != nil {
-				return err
-			}
 		} else {
 			if s.config.LogStoreConfig.Backend == LogStoreBackendWAL {
 				// User configured the new storage, but still has old raft.db. Warn
 				// them!
 				s.logger.Warn("BoltDB file raft.db found, IGNORING raft_logstore.backend which is set to 'wal'")
 			}
-			s.config.LogStoreConfig.Backend = LogStoreBackendBoltDB
+
 			// Create the backend raft store for logs and stable storage.
 			store, err := raftboltdb.New(raftboltdb.Options{
 				BoltOptions: &bbolt.Options{
@@ -1240,22 +1108,11 @@ func (s *Server) setupRaft(isCatalogResourceExperiment bool) error {
 				return fmt.Errorf("recovery failed to parse peers.json: %v", err)
 			}
 
-			// It's safe to pass nil as the handle argument here because we won't call
-			// the backend's data access methods (only Apply, Snapshot, and Restore).
-			backend, err := raftstorage.NewBackend(nil, hclog.NewNullLogger())
-			if err != nil {
-				return fmt.Errorf("recovery failed: %w", err)
-			}
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
-			go backend.Run(ctx)
-
 			tmpFsm := fsm.NewFromDeps(fsm.Deps{
 				Logger: s.logger,
 				NewStateStore: func() *state.Store {
 					return state.NewStateStore(s.tombstoneGC)
 				},
-				StorageBackend: backend,
 			})
 			if err := raft.RecoverCluster(s.config.RaftConfig, tmpFsm,
 				log, stable, snap, trans, configuration); err != nil {
@@ -1386,164 +1243,6 @@ func (s *Server) setupRPC() error {
 	return nil
 }
 
-// Initialize and register services on external gRPC server.
-func (s *Server) setupExternalGRPC(config *Config, deps Deps, logger hclog.Logger) {
-	s.externalACLServer = aclgrpc.NewServer(aclgrpc.Config{
-		ACLsEnabled: s.config.ACLsEnabled,
-		ForwardRPC: func(info structs.RPCInfo, fn func(*grpc.ClientConn) error) (bool, error) {
-			return s.ForwardGRPC(s.grpcConnPool, info, fn)
-		},
-		InPrimaryDatacenter: s.InPrimaryDatacenter(),
-		LoadAuthMethod: func(methodName string, entMeta *acl.EnterpriseMeta) (*structs.ACLAuthMethod, aclgrpc.Validator, error) {
-			return s.loadAuthMethod(methodName, entMeta)
-		},
-		LocalTokensEnabled:        s.LocalTokensEnabled,
-		Logger:                    logger.Named("grpc-api.acl"),
-		NewLogin:                  func() aclgrpc.Login { return s.aclLogin() },
-		NewTokenWriter:            func() aclgrpc.TokenWriter { return s.aclTokenWriter() },
-		PrimaryDatacenter:         s.config.PrimaryDatacenter,
-		ValidateEnterpriseRequest: s.validateEnterpriseRequest,
-	})
-	s.externalACLServer.Register(s.externalGRPCServer)
-
-	s.externalConnectCAServer = connectca.NewServer(connectca.Config{
-		Publisher:   s.publisher,
-		GetStore:    func() connectca.StateStore { return s.FSM().State() },
-		Logger:      logger.Named("grpc-api.connect-ca"),
-		ACLResolver: s.ACLResolver,
-		CAManager:   s.caManager,
-		ForwardRPC: func(info structs.RPCInfo, fn func(*grpc.ClientConn) error) (bool, error) {
-			return s.ForwardGRPC(s.grpcConnPool, info, fn)
-		},
-		ConnectEnabled: s.config.ConnectEnabled,
-	})
-	s.externalConnectCAServer.Register(s.externalGRPCServer)
-
-	dataplane.NewServer(dataplane.Config{
-		GetStore:          func() dataplane.StateStore { return s.FSM().State() },
-		Logger:            logger.Named("grpc-api.dataplane"),
-		ACLResolver:       s.ACLResolver,
-		Datacenter:        s.config.Datacenter,
-		EnableV2:          stringslice.Contains(deps.Experiments, CatalogResourceExperimentName),
-		ResourceAPIClient: s.insecureResourceServiceClient,
-	}).Register(s.externalGRPCServer)
-
-	serverdiscovery.NewServer(serverdiscovery.Config{
-		Publisher:   s.publisher,
-		ACLResolver: s.ACLResolver,
-		Logger:      logger.Named("grpc-api.server-discovery"),
-	}).Register(s.externalGRPCServer)
-
-	s.peeringBackend = NewPeeringBackend(s)
-	s.operatorBackend = NewOperatorBackend(s)
-
-	s.peerStreamServer = peerstream.NewServer(peerstream.Config{
-		Backend:        s.peeringBackend,
-		GetStore:       func() peerstream.StateStore { return s.FSM().State() },
-		Logger:         logger.Named("grpc-api.peerstream"),
-		ACLResolver:    s.ACLResolver,
-		Datacenter:     s.config.Datacenter,
-		ConnectEnabled: s.config.ConnectEnabled,
-		ForwardRPC: func(info structs.RPCInfo, fn func(*grpc.ClientConn) error) (bool, error) {
-			// Only forward the request if the dc in the request matches the server's datacenter.
-			if info.RequestDatacenter() != "" && info.RequestDatacenter() != config.Datacenter {
-				return false, fmt.Errorf("requests to generate peering tokens cannot be forwarded to remote datacenters")
-			}
-			return s.ForwardGRPC(s.grpcConnPool, info, fn)
-		},
-	})
-	s.peerStreamServer.Register(s.externalGRPCServer)
-
-	tenancyBridge := NewV1TenancyBridge(s)
-	if stringslice.Contains(deps.Experiments, V2TenancyExperimentName) {
-		tenancyBridge = resource.NewV2TenancyBridge()
-	}
-
-	s.resourceServiceServer = resourcegrpc.NewServer(resourcegrpc.Config{
-		Registry:      deps.Registry,
-		Backend:       s.raftStorageBackend,
-		ACLResolver:   s.ACLResolver,
-		Logger:        logger.Named("grpc-api.resource"),
-		TenancyBridge: tenancyBridge,
-	})
-	s.resourceServiceServer.Register(s.externalGRPCServer)
-
-	reflection.Register(s.externalGRPCServer)
-}
-
-func (s *Server) setupInsecureResourceServiceClient(typeRegistry resource.Registry, logger hclog.Logger, deps Deps) error {
-	if s.raftStorageBackend == nil {
-		return fmt.Errorf("raft storage backend cannot be nil")
-	}
-
-	tenancyBridge := NewV1TenancyBridge(s)
-	if stringslice.Contains(deps.Experiments, V2TenancyExperimentName) {
-		tenancyBridge = resource.NewV2TenancyBridge()
-	}
-	server := resourcegrpc.NewServer(resourcegrpc.Config{
-		Registry:      typeRegistry,
-		Backend:       s.raftStorageBackend,
-		ACLResolver:   resolver.DANGER_NO_AUTH{},
-		Logger:        logger.Named("grpc-api.resource"),
-		TenancyBridge: tenancyBridge,
-	})
-
-	conn, err := s.runInProcessGRPCServer(server.Register)
-	if err != nil {
-		return err
-	}
-	s.insecureResourceServiceClient = pbresource.NewResourceServiceClient(conn)
-
-	return nil
-}
-
-func (s *Server) setupSecureResourceServiceClient() error {
-	if s.resourceServiceServer == nil {
-		return fmt.Errorf("resource service server cannot be nil")
-	}
-	conn, err := s.runInProcessGRPCServer(s.resourceServiceServer.Register)
-	if err != nil {
-		return err
-	}
-	s.secureResourceServiceClient = pbresource.NewResourceServiceClient(conn)
-
-	return nil
-}
-
-// runInProcessGRPCServer runs a gRPC server that can only be accessed in the
-// same process, rather than over the network, using a pipe listener.
-func (s *Server) runInProcessGRPCServer(registerFn ...func(*grpc.Server)) (*grpc.ClientConn, error) {
-	server := grpc.NewServer()
-
-	for _, fn := range registerFn {
-		fn(server)
-	}
-
-	pipe := agentgrpc.NewPipeListener()
-	go server.Serve(pipe)
-
-	go func() {
-		<-s.shutdownCh
-		server.Stop()
-	}()
-
-	conn, err := grpc.Dial("",
-		grpc.WithTransportCredentials(insecure.NewCredentials()),
-		grpc.WithContextDialer(pipe.DialContext),
-		grpc.WithBlock(),
-	)
-	if err != nil {
-		server.Stop()
-		return nil, err
-	}
-	go func() {
-		<-s.shutdownCh
-		conn.Close()
-	}()
-
-	return conn, nil
-}
-
 // Shutdown is used to shutdown the server
 func (s *Server) Shutdown() error {
 	s.logger.Info("shutting down server")
@@ -1849,26 +1548,6 @@ func (s *Server) IsLeader() bool {
 	return s.raft.State() == raft.Leader
 }
 
-// IsServer checks if this addr is of a server
-func (s *Server) IsServer(addr string) bool {
-
-	for _, ss := range s.raft.GetConfiguration().Configuration().Servers {
-		a, err := net.ResolveTCPAddr("tcp", string(ss.Address))
-		if err != nil {
-			continue
-		}
-		localIP, err := net.ResolveTCPAddr("tcp", string(s.config.RaftConfig.LocalID))
-		if err != nil {
-			continue
-		}
-		// only return true if it's another server and not our local address
-		if string(metadata.GetIP(a)) == addr && string(metadata.GetIP(localIP)) != addr {
-			return true
-		}
-	}
-	return false
-}
-
 // LeaderLastContact returns the time of last contact by a leader.
 // This only makes sense if we are currently a follower.
 func (s *Server) LeaderLastContact() time.Time {
@@ -2191,8 +1870,6 @@ func (s *Server) trackLeaderChanges() {
 
 			s.grpcLeaderForwarder.UpdateLeaderAddr(s.config.Datacenter, string(leaderObs.LeaderAddr))
 			s.peeringBackend.SetLeaderAddress(string(leaderObs.LeaderAddr))
-			s.raftStorageBackend.LeaderChanged()
-			s.controllerManager.SetRaftLeader(s.IsLeader())
 
 			// Trigger sending an update to HCP status
 			s.hcpManager.SendUpdate()
@@ -2261,10 +1938,6 @@ func (s *Server) hcpServerStatus(deps Deps) hcp.StatusCallback {
 	}
 }
 
-func (s *Server) ResourceServiceClient() pbresource.ResourceServiceClient {
-	return s.secureResourceServiceClient
-}
-
 func fileExists(name string) (bool, error) {
 	_, err := os.Stat(name)
 	if err == nil {
@@ -2300,18 +1973,14 @@ func ConfiguredIncomingRPCLimiter(ctx context.Context, serverLogger hclog.Interc
 
 func convertConsulConfigToRateLimitHandlerConfig(limitsConfig RequestLimits, multilimiterConfig *multilimiter.Config) *rpcRate.HandlerConfig {
 	hc := &rpcRate.HandlerConfig{
-		GlobalLimitConfig: rpcRate.GlobalLimitConfig{
-			Mode: limitsConfig.Mode,
-			ReadWriteConfig: rpcRate.ReadWriteConfig{
-				ReadConfig: multilimiter.LimiterConfig{
-					Rate:  limitsConfig.ReadRate,
-					Burst: int(limitsConfig.ReadRate) * requestLimitsBurstMultiplier,
-				},
-				WriteConfig: multilimiter.LimiterConfig{
-					Rate:  limitsConfig.WriteRate,
-					Burst: int(limitsConfig.WriteRate) * requestLimitsBurstMultiplier,
-				},
-			},
+		GlobalMode: limitsConfig.Mode,
+		GlobalReadConfig: multilimiter.LimiterConfig{
+			Rate:  limitsConfig.ReadRate,
+			Burst: int(limitsConfig.ReadRate) * requestLimitsBurstMultiplier,
+		},
+		GlobalWriteConfig: multilimiter.LimiterConfig{
+			Rate:  limitsConfig.WriteRate,
+			Burst: int(limitsConfig.WriteRate) * requestLimitsBurstMultiplier,
 		},
 	}
 	if multilimiterConfig != nil {
diff --git a/agent/consul/server_ce.go b/agent/consul/server_ce.go
index fb3e55e76519f..63de1bfe852db 100644
--- a/agent/consul/server_ce.go
+++ b/agent/consul/server_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
@@ -22,11 +20,6 @@ import (
 	"github.com/hashicorp/consul/lib"
 )
 
-// runEnterpriseRateLimiterConfigEntryController start the rate limiter config controller
-func (s *Server) runEnterpriseRateLimiterConfigEntryController() error {
-	return nil
-}
-
 func (s *Server) registerEnterpriseGRPCServices(deps Deps, srv *grpc.Server) {}
 
 func (s *Server) enterpriseValidateJoinWAN() error {
diff --git a/agent/consul/server_ce_test.go b/agent/consul/server_ce_test.go
index 0b75cda1a5b7d..d5a2aff082086 100644
--- a/agent/consul/server_ce_test.go
+++ b/agent/consul/server_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package consul
 
diff --git a/agent/consul/server_connect.go b/agent/consul/server_connect.go
index 2274aff523bad..9193604d6ac06 100644
--- a/agent/consul/server_connect.go
+++ b/agent/consul/server_connect.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -19,15 +16,21 @@ func (s *Server) getCARoots(ws memdb.WatchSet, state *state.Store) (*structs.Ind
 	if err != nil {
 		return nil, err
 	}
-
-	trustDomain, err := s.getTrustDomain(config)
-	if err != nil {
-		return nil, err
+	if config == nil || config.ClusterID == "" {
+		return nil, fmt.Errorf("CA has not finished initializing")
 	}
 
 	indexedRoots := &structs.IndexedCARoots{}
 
-	indexedRoots.TrustDomain = trustDomain
+	// Build TrustDomain based on the ClusterID stored.
+	signingID := connect.SpiffeIDSigningForCluster(config.ClusterID)
+	if signingID == nil {
+		// If CA is bootstrapped at all then this should never happen but be
+		// defensive.
+		return nil, fmt.Errorf("no cluster trust domain setup")
+	}
+
+	indexedRoots.TrustDomain = signingID.Host()
 
 	indexedRoots.Index, indexedRoots.Roots = index, roots
 	if indexedRoots.Roots == nil {
@@ -71,19 +74,3 @@ func (s *Server) getCARoots(ws memdb.WatchSet, state *state.Store) (*structs.Ind
 
 	return indexedRoots, nil
 }
-
-func (s *Server) getTrustDomain(config *structs.CAConfiguration) (string, error) {
-	if config == nil || config.ClusterID == "" {
-		return "", fmt.Errorf("CA has not finished initializing")
-	}
-
-	// Build TrustDomain based on the ClusterID stored.
-	signingID := connect.SpiffeIDSigningForCluster(config.ClusterID)
-	if signingID == nil {
-		// If CA is bootstrapped at all then this should never happen but be
-		// defensive.
-		return "", fmt.Errorf("no cluster trust domain setup")
-	}
-
-	return signingID.Host(), nil
-}
diff --git a/agent/consul/server_log_verification.go b/agent/consul/server_log_verification.go
index 2bde7dbc81b40..cb95b9aeeee8c 100644
--- a/agent/consul/server_log_verification.go
+++ b/agent/consul/server_log_verification.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/server_lookup.go b/agent/consul/server_lookup.go
index 60b9c076bf148..5d290b019e2f8 100644
--- a/agent/consul/server_lookup.go
+++ b/agent/consul/server_lookup.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/server_lookup_test.go b/agent/consul/server_lookup_test.go
index 52e3605de719b..7c0b131224a7b 100644
--- a/agent/consul/server_lookup_test.go
+++ b/agent/consul/server_lookup_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/server_metadata.go b/agent/consul/server_metadata.go
index 03e4751a290c2..742391e0b6a1f 100644
--- a/agent/consul/server_metadata.go
+++ b/agent/consul/server_metadata.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MPL-2.0
 
 package consul
 
diff --git a/agent/consul/server_metadata_test.go b/agent/consul/server_metadata_test.go
index bf993bc1be57c..d091bfdf3630e 100644
--- a/agent/consul/server_metadata_test.go
+++ b/agent/consul/server_metadata_test.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MPL-2.0
 
 package consul
 
diff --git a/agent/consul/server_overview.go b/agent/consul/server_overview.go
index a94749d53498a..1c42f3483e9da 100644
--- a/agent/consul/server_overview.go
+++ b/agent/consul/server_overview.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/server_overview_test.go b/agent/consul/server_overview_test.go
index 7780b5ce83967..dc2d439e06cff 100644
--- a/agent/consul/server_overview_test.go
+++ b/agent/consul/server_overview_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/server_register.go b/agent/consul/server_register.go
index 90d95f061956f..7268a390349ff 100644
--- a/agent/consul/server_register.go
+++ b/agent/consul/server_register.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import "github.com/hashicorp/consul/logging"
diff --git a/agent/consul/server_serf.go b/agent/consul/server_serf.go
index aea50aa6dd199..8c4c7600ab778 100644
--- a/agent/consul/server_serf.go
+++ b/agent/consul/server_serf.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/server_test.go b/agent/consul/server_test.go
index e8058a468a3f9..1b87631d824ad 100644
--- a/agent/consul/server_test.go
+++ b/agent/consul/server_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -336,7 +333,7 @@ func newServerWithDeps(t *testing.T, c *Config, deps Deps) (*Server, error) {
 		}
 	}
 	grpcServer := external.NewServer(deps.Logger.Named("grpc.external"), nil, deps.TLSConfigurator, rpcRate.NullRequestLimitsHandler())
-	srv, err := NewServer(c, deps, grpcServer, nil, deps.Logger, nil)
+	srv, err := NewServer(c, deps, grpcServer, nil, deps.Logger)
 	if err != nil {
 		return nil, err
 	}
@@ -1243,7 +1240,7 @@ func TestServer_RPC_MetricsIntercept_Off(t *testing.T) {
 			}
 		}
 
-		s1, err := NewServer(conf, deps, grpc.NewServer(), nil, deps.Logger, nil)
+		s1, err := NewServer(conf, deps, grpc.NewServer(), nil, deps.Logger)
 		if err != nil {
 			t.Fatalf("err: %v", err)
 		}
@@ -1281,7 +1278,7 @@ func TestServer_RPC_MetricsIntercept_Off(t *testing.T) {
 			return nil
 		}
 
-		s2, err := NewServer(conf, deps, grpc.NewServer(), nil, deps.Logger, nil)
+		s2, err := NewServer(conf, deps, grpc.NewServer(), nil, deps.Logger)
 		if err != nil {
 			t.Fatalf("err: %v", err)
 		}
@@ -1315,7 +1312,7 @@ func TestServer_RPC_RequestRecorder(t *testing.T) {
 		deps := newDefaultDeps(t, conf)
 		deps.NewRequestRecorderFunc = nil
 
-		s1, err := NewServer(conf, deps, grpc.NewServer(), nil, deps.Logger, nil)
+		s1, err := NewServer(conf, deps, grpc.NewServer(), nil, deps.Logger)
 
 		require.Error(t, err, "need err when provider func is nil")
 		require.Equal(t, err.Error(), "cannot initialize server without an RPC request recorder provider")
@@ -1334,7 +1331,7 @@ func TestServer_RPC_RequestRecorder(t *testing.T) {
 			return nil
 		}
 
-		s2, err := NewServer(conf, deps, grpc.NewServer(), nil, deps.Logger, nil)
+		s2, err := NewServer(conf, deps, grpc.NewServer(), nil, deps.Logger)
 
 		require.Error(t, err, "need err when RequestRecorder is nil")
 		require.Equal(t, err.Error(), "cannot initialize server with a nil RPC request recorder")
@@ -1883,18 +1880,14 @@ func TestServer_ReloadConfig(t *testing.T) {
 
 	// Check the incoming RPC rate limiter got updated
 	mockHandler.AssertCalled(t, "UpdateConfig", rpcRate.HandlerConfig{
-		GlobalLimitConfig: rpcRate.GlobalLimitConfig{
-			Mode: rc.RequestLimits.Mode,
-			ReadWriteConfig: rpcRate.ReadWriteConfig{
-				ReadConfig: multilimiter.LimiterConfig{
-					Rate:  rc.RequestLimits.ReadRate,
-					Burst: int(rc.RequestLimits.ReadRate) * requestLimitsBurstMultiplier,
-				},
-				WriteConfig: multilimiter.LimiterConfig{
-					Rate:  rc.RequestLimits.WriteRate,
-					Burst: int(rc.RequestLimits.WriteRate) * requestLimitsBurstMultiplier,
-				},
-			},
+		GlobalMode: rc.RequestLimits.Mode,
+		GlobalReadConfig: multilimiter.LimiterConfig{
+			Rate:  rc.RequestLimits.ReadRate,
+			Burst: int(rc.RequestLimits.ReadRate) * requestLimitsBurstMultiplier,
+		},
+		GlobalWriteConfig: multilimiter.LimiterConfig{
+			Rate:  rc.RequestLimits.WriteRate,
+			Burst: int(rc.RequestLimits.WriteRate) * requestLimitsBurstMultiplier,
 		},
 	})
 
@@ -1905,7 +1898,7 @@ func TestServer_ReloadConfig(t *testing.T) {
 	defaults := DefaultConfig()
 	got := s.raft.ReloadableConfig()
 	require.Equal(t, uint64(4321), got.SnapshotThreshold,
-		"should have been reloaded to new value")
+		"should have be reloaded to new value")
 	require.Equal(t, defaults.RaftConfig.SnapshotInterval, got.SnapshotInterval,
 		"should have remained the default interval")
 	require.Equal(t, defaults.RaftConfig.TrailingLogs, got.TrailingLogs,
diff --git a/agent/consul/servercert/manager.go b/agent/consul/servercert/manager.go
index 664753439477d..dd15e66a8f43b 100644
--- a/agent/consul/servercert/manager.go
+++ b/agent/consul/servercert/manager.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package servercert
 
 import (
@@ -8,23 +5,22 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-memdb"
-
 	"github.com/hashicorp/consul/agent/cache"
+	cachetype "github.com/hashicorp/consul/agent/cache-types"
 	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib/retry"
+	"github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/go-memdb"
 )
 
 // Correlation ID for leaf cert watches.
 const leafWatchID = "leaf"
 
-// LeafCertManager is an interface to represent the necessary methods of the agent/leafcert.Manager.
+// Cache is an interface to represent the necessary methods of the agent/cache.Cache.
 // It is used to request and renew the server leaf certificate.
-type LeafCertManager interface {
-	Notify(ctx context.Context, req *leafcert.ConnectCALeafRequest, correlationID string, ch chan<- cache.UpdateEvent) error
+type Cache interface {
+	Notify(ctx context.Context, t string, r cache.Request, correlationID string, ch chan<- cache.UpdateEvent) error
 }
 
 // TLSConfigurator is an interface to represent the necessary methods of the tlsutil.Configurator.
@@ -53,7 +49,7 @@ type Config struct {
 type Deps struct {
 	Config          Config
 	Logger          hclog.Logger
-	LeafCertManager LeafCertManager
+	Cache           Cache
 	GetStore        func() Store
 	TLSConfigurator TLSConfigurator
 	waiter          retry.Waiter
@@ -68,8 +64,9 @@ type CertManager struct {
 	// config contains agent configuration necessary for the cert manager to operate.
 	config Config
 
-	// leafCerts grants access to request and renew the server leaf cert.
-	leafCerts LeafCertManager
+	// cache provides an API to issue internal RPC requests and receive notifications
+	// when there are changes.
+	cache Cache
 
 	// cacheUpdateCh receives notifications of cache update events for resources watched.
 	cacheUpdateCh chan cache.UpdateEvent
@@ -85,13 +82,10 @@ type CertManager struct {
 }
 
 func NewCertManager(deps Deps) *CertManager {
-	if deps.LeafCertManager == nil {
-		panic("LeafCertManager is required")
-	}
 	return &CertManager{
 		config:          deps.Config,
 		logger:          deps.Logger,
-		leafCerts:       deps.LeafCertManager,
+		cache:           deps.Cache,
 		cacheUpdateCh:   make(chan cache.UpdateEvent, 1),
 		getStore:        deps.GetStore,
 		tlsConfigurator: deps.TLSConfigurator,
@@ -159,12 +153,12 @@ func (m *CertManager) watchServerToken(ctx context.Context) {
 		cancel()
 		notifyCtx, cancel = context.WithCancel(ctx)
 
-		req := leafcert.ConnectCALeafRequest{
+		req := cachetype.ConnectCALeafRequest{
 			Datacenter: m.config.Datacenter,
 			Token:      token.Value,
 			Server:     true,
 		}
-		if err := m.leafCerts.Notify(notifyCtx, &req, leafWatchID, m.cacheUpdateCh); err != nil {
+		if err := m.cache.Notify(notifyCtx, cachetype.ConnectCALeafName, &req, leafWatchID, m.cacheUpdateCh); err != nil {
 			return fmt.Errorf("failed to setup leaf cert notifications: %w", err)
 		}
 
@@ -177,11 +171,11 @@ func (m *CertManager) watchServerToken(ctx context.Context) {
 }
 
 func (m *CertManager) watchLeafCert(ctx context.Context) error {
-	req := leafcert.ConnectCALeafRequest{
+	req := cachetype.ConnectCALeafRequest{
 		Datacenter: m.config.Datacenter,
 		Server:     true,
 	}
-	if err := m.leafCerts.Notify(ctx, &req, leafWatchID, m.cacheUpdateCh); err != nil {
+	if err := m.cache.Notify(ctx, cachetype.ConnectCALeafName, &req, leafWatchID, m.cacheUpdateCh); err != nil {
 		return fmt.Errorf("failed to setup leaf cert notifications: %w", err)
 	}
 
diff --git a/agent/consul/servercert/manager_test.go b/agent/consul/servercert/manager_test.go
index e9cc0c81c58c1..6beec683fb55e 100644
--- a/agent/consul/servercert/manager_test.go
+++ b/agent/consul/servercert/manager_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package servercert
 
 import (
@@ -8,15 +5,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/go-memdb"
-	"github.com/stretchr/testify/require"
-
 	"github.com/hashicorp/consul/agent/cache"
 	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib/retry"
 	"github.com/hashicorp/consul/sdk/testutil"
+	"github.com/hashicorp/go-memdb"
+	"github.com/stretchr/testify/require"
 )
 
 type fakeStore struct {
@@ -111,7 +106,7 @@ type watchInfo struct {
 	token string
 }
 
-type fakeLeafCertManager struct {
+type fakeCache struct {
 	updateCh chan<- cache.UpdateEvent
 
 	// watched is a map of watched correlation IDs to the ACL token of the request.
@@ -122,7 +117,7 @@ type fakeLeafCertManager struct {
 	syncCh chan struct{}
 }
 
-func (c *fakeLeafCertManager) triggerLeafUpdate() {
+func (c *fakeCache) triggerLeafUpdate() {
 	c.updateCh <- cache.UpdateEvent{
 		CorrelationID: leafWatchID,
 		Result: &structs.IssuedCert{
@@ -133,14 +128,14 @@ func (c *fakeLeafCertManager) triggerLeafUpdate() {
 	}
 }
 
-func (c *fakeLeafCertManager) Notify(ctx context.Context, r *leafcert.ConnectCALeafRequest, correlationID string, ch chan<- cache.UpdateEvent) error {
-	c.watched[correlationID] = watchInfo{ctx: ctx, token: r.Token}
+func (c *fakeCache) Notify(ctx context.Context, t string, r cache.Request, correlationID string, ch chan<- cache.UpdateEvent) error {
+	c.watched[correlationID] = watchInfo{ctx: ctx, token: r.CacheInfo().Token}
 	c.updateCh = ch
 	c.syncCh <- struct{}{}
 	return nil
 }
 
-func (c *fakeLeafCertManager) timeoutIfNotUpdated(t *testing.T) error {
+func (c *fakeCache) timeoutIfNotUpdated(t *testing.T) error {
 	t.Helper()
 
 	select {
@@ -161,7 +156,7 @@ func testWaiter() retry.Waiter {
 
 func TestCertManager_ACLsDisabled(t *testing.T) {
 	tlsConfigurator := fakeTLSConfigurator{syncCh: make(chan struct{}, 1)}
-	leafCerts := fakeLeafCertManager{watched: make(map[string]watchInfo), syncCh: make(chan struct{}, 1)}
+	cache := fakeCache{watched: make(map[string]watchInfo), syncCh: make(chan struct{}, 1)}
 	store := fakeStore{
 		conf:       make(chan *structs.CAConfiguration, 1),
 		tokenEntry: make(chan *structs.SystemMetadataEntry, 1),
@@ -174,7 +169,7 @@ func TestCertManager_ACLsDisabled(t *testing.T) {
 			ACLsEnabled: false,
 		},
 		TLSConfigurator: &tlsConfigurator,
-		LeafCertManager: &leafCerts,
+		Cache:           &cache,
 		GetStore:        func() Store { return &store },
 	})
 
@@ -187,11 +182,11 @@ func TestCertManager_ACLsDisabled(t *testing.T) {
 		require.Empty(t, tlsConfigurator.cert)
 		require.Empty(t, tlsConfigurator.peeringServerName)
 
-		require.Contains(t, leafCerts.watched, leafWatchID)
+		require.Contains(t, cache.watched, leafWatchID)
 	})
 
 	testutil.RunStep(t, "leaf cert update", func(t *testing.T) {
-		leafCerts.triggerLeafUpdate()
+		cache.triggerLeafUpdate()
 
 		// Wait for the update to arrive.
 		require.NoError(t, tlsConfigurator.timeoutIfNotUpdated(t))
@@ -216,7 +211,7 @@ func TestCertManager_ACLsDisabled(t *testing.T) {
 
 func TestCertManager_ACLsEnabled(t *testing.T) {
 	tlsConfigurator := fakeTLSConfigurator{syncCh: make(chan struct{}, 1)}
-	leafCerts := fakeLeafCertManager{watched: make(map[string]watchInfo), syncCh: make(chan struct{}, 1)}
+	cache := fakeCache{watched: make(map[string]watchInfo), syncCh: make(chan struct{}, 1)}
 	store := fakeStore{
 		conf:       make(chan *structs.CAConfiguration, 1),
 		tokenEntry: make(chan *structs.SystemMetadataEntry, 1),
@@ -229,7 +224,7 @@ func TestCertManager_ACLsEnabled(t *testing.T) {
 			ACLsEnabled: true,
 		},
 		TLSConfigurator: &tlsConfigurator,
-		LeafCertManager: &leafCerts,
+		Cache:           &cache,
 		GetStore:        func() Store { return &store },
 	})
 
@@ -242,7 +237,7 @@ func TestCertManager_ACLsEnabled(t *testing.T) {
 		require.Empty(t, tlsConfigurator.cert)
 		require.Empty(t, tlsConfigurator.peeringServerName)
 
-		require.Empty(t, leafCerts.watched)
+		require.Empty(t, cache.watched)
 	})
 
 	var leafCtx context.Context
@@ -251,16 +246,16 @@ func TestCertManager_ACLsEnabled(t *testing.T) {
 	testutil.RunStep(t, "server token update", func(t *testing.T) {
 		store.setServerToken("first-secret", tokenCanceler)
 
-		require.NoError(t, leafCerts.timeoutIfNotUpdated(t))
+		require.NoError(t, cache.timeoutIfNotUpdated(t))
 
-		require.Contains(t, leafCerts.watched, leafWatchID)
-		require.Equal(t, "first-secret", leafCerts.watched[leafWatchID].token)
+		require.Contains(t, cache.watched, leafWatchID)
+		require.Equal(t, "first-secret", cache.watched[leafWatchID].token)
 
-		leafCtx = leafCerts.watched[leafWatchID].ctx
+		leafCtx = cache.watched[leafWatchID].ctx
 	})
 
 	testutil.RunStep(t, "leaf cert update", func(t *testing.T) {
-		leafCerts.triggerLeafUpdate()
+		cache.triggerLeafUpdate()
 
 		// Wait for the update to arrive.
 		require.NoError(t, tlsConfigurator.timeoutIfNotUpdated(t))
@@ -278,15 +273,15 @@ func TestCertManager_ACLsEnabled(t *testing.T) {
 		// Fire the existing WatchSet to simulate a state store update.
 		tokenCanceler <- struct{}{}
 
-		// The leaf watch in the leafCerts should have been reset.
-		require.NoError(t, leafCerts.timeoutIfNotUpdated(t))
+		// The leaf watch in the cache should have been reset.
+		require.NoError(t, cache.timeoutIfNotUpdated(t))
 
 		// The original leaf watch context should have been canceled.
 		require.Error(t, leafCtx.Err())
 
 		// A new leaf watch is expected with the new token.
-		require.Contains(t, leafCerts.watched, leafWatchID)
-		require.Equal(t, "second-secret", leafCerts.watched[leafWatchID].token)
+		require.Contains(t, cache.watched, leafWatchID)
+		require.Equal(t, "second-secret", cache.watched[leafWatchID].token)
 	})
 
 	testutil.RunStep(t, "ca config update", func(t *testing.T) {
diff --git a/agent/consul/session_endpoint.go b/agent/consul/session_endpoint.go
index f2f8ab7740234..3affe357dee66 100644
--- a/agent/consul/session_endpoint.go
+++ b/agent/consul/session_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/session_endpoint_test.go b/agent/consul/session_endpoint_test.go
index 408cd7b058c59..277d326f3ebf8 100644
--- a/agent/consul/session_endpoint_test.go
+++ b/agent/consul/session_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/session_timers.go b/agent/consul/session_timers.go
index f1c62b08a8196..223cc0e318405 100644
--- a/agent/consul/session_timers.go
+++ b/agent/consul/session_timers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/session_timers_test.go b/agent/consul/session_timers_test.go
index f944cc76745d8..51d2bdc2cfec7 100644
--- a/agent/consul/session_timers_test.go
+++ b/agent/consul/session_timers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/session_ttl.go b/agent/consul/session_ttl.go
index 8f5440e14dffa..1b2d1ff0c760c 100644
--- a/agent/consul/session_ttl.go
+++ b/agent/consul/session_ttl.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/session_ttl_test.go b/agent/consul/session_ttl_test.go
index e552f0ff6cdff..2ebff6c092974 100644
--- a/agent/consul/session_ttl_test.go
+++ b/agent/consul/session_ttl_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/snapshot_endpoint.go b/agent/consul/snapshot_endpoint.go
index c9a6e9ace47c8..197a3ec974a39 100644
--- a/agent/consul/snapshot_endpoint.go
+++ b/agent/consul/snapshot_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // The snapshot endpoint is a special non-RPC endpoint that supports streaming
 // for taking and restoring snapshots for disaster recovery. This gets wired
 // directly into Consul's stream handler, and a new TCP connection is made for
diff --git a/agent/consul/snapshot_endpoint_test.go b/agent/consul/snapshot_endpoint_test.go
index 40bede9149743..29f60618be66f 100644
--- a/agent/consul/snapshot_endpoint_test.go
+++ b/agent/consul/snapshot_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/state/acl.go b/agent/consul/state/acl.go
index 34c26c621ab95..072d1a5fe18f5 100644
--- a/agent/consul/state/acl.go
+++ b/agent/consul/state/acl.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -11,7 +8,7 @@ import (
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbacl"
+	"github.com/hashicorp/consul/proto/pbacl"
 )
 
 // ACLTokens is used when saving a snapshot
@@ -526,8 +523,7 @@ func aclTokenSetTxn(tx WriteTxn, idx uint64, token *structs.ACLToken, opts ACLTo
 	}
 
 	if opts.ProhibitUnprivileged {
-		if numValidRoles == 0 && numValidPolicies == 0 && len(token.ServiceIdentities) == 0 &&
-			len(token.NodeIdentities) == 0 && len(token.TemplatedPolicies) == 0 {
+		if numValidRoles == 0 && numValidPolicies == 0 && len(token.ServiceIdentities) == 0 && len(token.NodeIdentities) == 0 {
 			return ErrTokenHasNoPrivileges
 		}
 	}
@@ -1178,26 +1174,6 @@ func aclRoleSetTxn(tx WriteTxn, idx uint64, role *structs.ACLRole, allowMissing
 		}
 	}
 
-	for _, templatedPolicy := range role.TemplatedPolicies {
-		if templatedPolicy.TemplateName == "" {
-			return fmt.Errorf("encountered a Role %s (%s) with an empty templated policy name in the state store", role.Name, role.ID)
-		}
-
-		baseTemplate, ok := structs.GetACLTemplatedPolicyBase(templatedPolicy.TemplateName)
-		if !ok {
-			return fmt.Errorf("encountered a Role %s (%s) with an invalid templated policy name %q", role.Name, role.ID, templatedPolicy.TemplateName)
-		}
-
-		if templatedPolicy.TemplateID == "" {
-			templatedPolicy.TemplateID = baseTemplate.TemplateID
-		}
-
-		err := templatedPolicy.ValidateTemplatedPolicy(baseTemplate.Schema)
-		if err != nil {
-			return fmt.Errorf("encountered a Role %s (%s) with an invalid templated policy: %w", role.Name, role.ID, err)
-		}
-	}
-
 	if err := aclRoleUpsertValidateEnterprise(tx, role, existing); err != nil {
 		return err
 	}
diff --git a/agent/consul/state/acl_ce.go b/agent/consul/state/acl_ce.go
index 9e1dd7ebdbb11..d1a176c0adef5 100644
--- a/agent/consul/state/acl_ce.go
+++ b/agent/consul/state/acl_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/acl_ce_test.go b/agent/consul/state/acl_ce_test.go
index 77b5bf3adb5a9..f86afc1a343fe 100644
--- a/agent/consul/state/acl_ce_test.go
+++ b/agent/consul/state/acl_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/acl_events.go b/agent/consul/state/acl_events.go
index d00062c23bac9..3d219f1fa5a08 100644
--- a/agent/consul/state/acl_events.go
+++ b/agent/consul/state/acl_events.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/acl_events_test.go b/agent/consul/state/acl_events_test.go
index 3c6e3fdfab174..4956029965063 100644
--- a/agent/consul/state/acl_events_test.go
+++ b/agent/consul/state/acl_events_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/acl_schema.go b/agent/consul/state/acl_schema.go
index 17c772b37e01c..521cb06edd9a0 100644
--- a/agent/consul/state/acl_schema.go
+++ b/agent/consul/state/acl_schema.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/acl_test.go b/agent/consul/state/acl_test.go
index f72f961114684..2e4aeb5dcebf7 100644
--- a/agent/consul/state/acl_test.go
+++ b/agent/consul/state/acl_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -16,7 +13,7 @@ import (
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbacl"
+	"github.com/hashicorp/consul/proto/pbacl"
 )
 
 const (
diff --git a/agent/consul/state/autopilot.go b/agent/consul/state/autopilot.go
index 608f08f5215c2..20b29147046e3 100644
--- a/agent/consul/state/autopilot.go
+++ b/agent/consul/state/autopilot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/autopilot_test.go b/agent/consul/state/autopilot_test.go
index a2877e2df5ffa..7567e2bf3c6d4 100644
--- a/agent/consul/state/autopilot_test.go
+++ b/agent/consul/state/autopilot_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/catalog.go b/agent/consul/state/catalog.go
index 02abd77132ac6..d7cc1ab1fde0b 100644
--- a/agent/consul/state/catalog.go
+++ b/agent/consul/state/catalog.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -17,7 +14,6 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/lib/maps"
 	"github.com/hashicorp/consul/types"
 )
 
@@ -200,7 +196,6 @@ func (s *Store) ensureRegistrationTxn(tx WriteTxn, idx uint64, preserveIndexes b
 		TaggedAddresses: req.TaggedAddresses,
 		Meta:            req.NodeMeta,
 		PeerName:        req.PeerName,
-		Locality:        req.Locality,
 	}
 	if preserveIndexes {
 		node.CreateIndex = req.CreateIndex
@@ -915,7 +910,7 @@ func ensureServiceTxn(tx WriteTxn, idx uint64, node string, preserveIndexes bool
 		if err != nil {
 			return err
 		}
-		if supported && sn.Name != "" {
+		if supported {
 			psn := structs.PeeredServiceName{Peer: svc.PeerName, ServiceName: sn}
 			vip, err := assignServiceVirtualIP(tx, idx, psn)
 			if err != nil {
@@ -1090,81 +1085,6 @@ func assignServiceVirtualIP(tx WriteTxn, idx uint64, psn structs.PeeredServiceNa
 	return result.String(), nil
 }
 
-// AssignManualServiceVIPs attempts to associate a list of manual virtual IP addresses with a given service name.
-// Any IP addresses given will be removed from other services in the same partition. This is done to ensure
-// that a manual VIP can only exist once for a given partition.
-// This function returns:
-// - a bool indicating whether the given service exists.
-// - a list of service names that had ip addresses removed from them.
-// - an error indicating success or failure of the call.
-func (s *Store) AssignManualServiceVIPs(idx uint64, psn structs.PeeredServiceName, ips []string) (bool, []structs.PeeredServiceName, error) {
-	tx := s.db.WriteTxn(idx)
-	defer tx.Abort()
-
-	// First remove the given IPs from any existing services, to avoid duplicate assignments.
-	assignedIPs := map[string]struct{}{}
-	for _, ip := range ips {
-		assignedIPs[ip] = struct{}{}
-	}
-	modifiedEntries := make(map[structs.PeeredServiceName]struct{})
-	for ip := range assignedIPs {
-		entry, err := tx.First(tableServiceVirtualIPs, indexManualVIPs, psn.ServiceName.PartitionOrDefault(), ip)
-		if err != nil {
-			return false, nil, fmt.Errorf("failed service virtual IP lookup: %s", err)
-		}
-
-		if entry == nil {
-			continue
-		}
-
-		newEntry := entry.(ServiceVirtualIP)
-		if newEntry.Service.ServiceName.Matches(psn.ServiceName) {
-			continue
-		}
-
-		// Rebuild this entry's list of manual IPs, removing any that are present
-		// in new list we're assigning.
-		var filteredIPs []string
-		for _, existingIP := range newEntry.ManualIPs {
-			if _, ok := assignedIPs[existingIP]; !ok {
-				filteredIPs = append(filteredIPs, existingIP)
-			}
-		}
-
-		newEntry.ManualIPs = filteredIPs
-		newEntry.ModifyIndex = idx
-		if err := tx.Insert(tableServiceVirtualIPs, newEntry); err != nil {
-			return false, nil, fmt.Errorf("failed inserting service virtual IP entry: %s", err)
-		}
-		modifiedEntries[newEntry.Service] = struct{}{}
-	}
-
-	entry, err := tx.First(tableServiceVirtualIPs, indexID, psn)
-	if err != nil {
-		return false, nil, fmt.Errorf("failed service virtual IP lookup: %s", err)
-	}
-
-	if entry == nil {
-		return false, nil, nil
-	}
-
-	newEntry := entry.(ServiceVirtualIP)
-	newEntry.ManualIPs = ips
-	newEntry.ModifyIndex = idx
-
-	if err := tx.Insert(tableServiceVirtualIPs, newEntry); err != nil {
-		return false, nil, fmt.Errorf("failed inserting service virtual IP entry: %s", err)
-	}
-	if err := updateVirtualIPMaxIndexes(tx, idx, psn.ServiceName.PartitionOrDefault(), psn.Peer); err != nil {
-		return false, nil, err
-	}
-	if err = tx.Commit(); err != nil {
-		return false, nil, err
-	}
-
-	return true, maps.SliceOfKeys(modifiedEntries), nil
-}
-
 func updateVirtualIPMaxIndexes(txn WriteTxn, idx uint64, partition, peerName string) error {
 	// update per-partition max index
 	if err := indexUpdateMaxTxn(txn, idx, partitionedIndexEntryName(tableServiceVirtualIPs, partition)); err != nil {
@@ -2107,39 +2027,6 @@ func freeServiceVirtualIP(
 		return nil
 	}
 
-	// Don't deregister the virtual IP if at least one instance of this service still exists.
-	q := Query{
-		Value:          psn.ServiceName.Name,
-		EnterpriseMeta: psn.ServiceName.EnterpriseMeta,
-		PeerName:       psn.Peer,
-	}
-	if remainingService, err := tx.First(tableServices, indexService, q); err == nil {
-		if remainingService != nil {
-			return nil
-		}
-	} else {
-		return fmt.Errorf("failed service lookup for %q: %s", psn.ServiceName.Name, err)
-	}
-
-	// Don't deregister the virtual IP if at least one resolver/router/splitter config entry still
-	// references this service.
-	configEntryVIPKinds := []string{
-		structs.ServiceResolver,
-		structs.ServiceRouter,
-		structs.ServiceSplitter,
-		structs.ServiceDefaults,
-		structs.ServiceIntentions,
-	}
-	for _, kind := range configEntryVIPKinds {
-		_, entry, err := configEntryTxn(tx, nil, kind, psn.ServiceName.Name, &psn.ServiceName.EnterpriseMeta)
-		if err != nil {
-			return fmt.Errorf("failed config entry lookup for %s/%s: %s", kind, psn.ServiceName.Name, err)
-		}
-		if entry != nil {
-			return nil
-		}
-	}
-
 	// Don't deregister the virtual IP if at least one terminating gateway still references this service.
 	termGatewaySupported, err := terminatingGatewayVirtualIPsSupported(tx, nil)
 	if err != nil {
@@ -3063,52 +2950,11 @@ func (s *Store) VirtualIPForService(psn structs.PeeredServiceName) (string, erro
 		return "", nil
 	}
 
-	return vip.(ServiceVirtualIP).IPWithOffset()
-}
-
-func (s *Store) ServiceVirtualIPs() (uint64, []ServiceVirtualIP, error) {
-	tx := s.db.Txn(false)
-	defer tx.Abort()
-
-	return servicesVirtualIPsTxn(tx, nil)
-}
-
-func servicesVirtualIPsTxn(tx ReadTxn, ws memdb.WatchSet) (uint64, []ServiceVirtualIP, error) {
-	iter, err := tx.Get(tableServiceVirtualIPs, indexID)
-	if err != nil {
-		return 0, nil, err
-	}
-	ws.Add(iter.WatchCh())
-
-	var vips []ServiceVirtualIP
-	for raw := iter.Next(); raw != nil; raw = iter.Next() {
-		vip := raw.(ServiceVirtualIP)
-		vips = append(vips, vip)
-	}
-
-	idx := maxIndexWatchTxn(tx, nil, tableServiceVirtualIPs)
-
-	return idx, vips, nil
-}
-
-func (s *Store) ServiceManualVIPs(psn structs.PeeredServiceName) (*ServiceVirtualIP, error) {
-	tx := s.db.Txn(false)
-	defer tx.Abort()
-
-	return serviceVIPsTxn(tx, psn)
-}
-
-func serviceVIPsTxn(tx ReadTxn, psn structs.PeeredServiceName) (*ServiceVirtualIP, error) {
-	vip, err := tx.First(tableServiceVirtualIPs, indexID, psn)
+	result, err := addIPOffset(startingVirtualIP, vip.(ServiceVirtualIP).IP)
 	if err != nil {
-		return nil, fmt.Errorf("failed service virtual IP lookup: %s", err)
-	}
-	if vip == nil {
-		return nil, nil
+		return "", err
 	}
-
-	entry := vip.(ServiceVirtualIP)
-	return &entry, nil
+	return result.String(), nil
 }
 
 // VirtualIPsForAllImportedServices returns a slice of ServiceVirtualIP for all
@@ -3463,13 +3309,6 @@ func parseNodes(tx ReadTxn, ws memdb.WatchSet, idx uint64,
 		ws.AddWithLimit(watchLimit, services.WatchCh(), allServicesCh)
 		for service := services.Next(); service != nil; service = services.Next() {
 			ns := service.(*structs.ServiceNode).ToNodeService()
-			// If version isn't defined in node meta, set it from the Consul service meta
-			if _, ok := dump.Meta[structs.MetaConsulVersion]; !ok && ns.ID == "consul" && ns.Meta["version"] != "" {
-				if dump.Meta == nil {
-					dump.Meta = make(map[string]string)
-				}
-				dump.Meta[structs.MetaConsulVersion] = ns.Meta["version"]
-			}
 			dump.Services = append(dump.Services, ns)
 		}
 
@@ -3985,7 +3824,7 @@ func updateGatewayService(tx WriteTxn, idx uint64, mapping *structs.GatewayServi
 }
 
 // checkWildcardForGatewaysAndUpdate checks whether a service matches a
-// wildcard definition in gateway config entries and if so adds it the
+// wildcard definition in gateway config entries and if so adds it the the
 // gateway-services table.
 func checkGatewayWildcardsAndUpdate(tx WriteTxn, idx uint64, svc *structs.ServiceName, ns *structs.NodeService, kind structs.GatewayServiceKind) error {
 	sn := structs.ServiceName{Name: structs.WildcardSpecifier, EnterpriseMeta: svc.EnterpriseMeta}
@@ -4033,7 +3872,7 @@ func checkGatewayWildcardsAndUpdate(tx WriteTxn, idx uint64, svc *structs.Servic
 }
 
 // checkGatewayAndUpdate checks whether a service matches a
-// wildcard definition in gateway config entries and if so adds it the
+// wildcard definition in gateway config entries and if so adds it the the
 // gateway-services table.
 func checkGatewayAndUpdate(tx WriteTxn, idx uint64, svc *structs.ServiceName, kind structs.GatewayServiceKind) error {
 	sn := structs.ServiceName{Name: svc.Name, EnterpriseMeta: svc.EnterpriseMeta}
@@ -4548,17 +4387,13 @@ func (s *Store) ServiceTopology(
 		maxIdx = idx
 	}
 
-	// Store downstreams with at least one instance in transparent proxy or connect native mode.
+	// Store downstreams with at least one instance in transparent proxy mode.
 	// This is to avoid returning downstreams from intentions when none of the downstreams are transparent proxies.
-	proxyMap := make(map[structs.ServiceName]struct{})
+	tproxyMap := make(map[structs.ServiceName]struct{})
 	for _, downstream := range unfilteredDownstreams {
 		if downstream.Service.Proxy.Mode == structs.ProxyModeTransparent {
 			sn := structs.NewServiceName(downstream.Service.Proxy.DestinationServiceName, &downstream.Service.EnterpriseMeta)
-			proxyMap[sn] = struct{}{}
-		}
-		if downstream.Service.Connect.Native {
-			sn := downstream.Service.CompoundServiceName()
-			proxyMap[sn] = struct{}{}
+			tproxyMap[sn] = struct{}{}
 		}
 	}
 
@@ -4568,7 +4403,7 @@ func (s *Store) ServiceTopology(
 		if downstream.Service.Kind == structs.ServiceKindConnectProxy {
 			sn = structs.NewServiceName(downstream.Service.Proxy.DestinationServiceName, &downstream.Service.EnterpriseMeta)
 		}
-		if _, ok := proxyMap[sn]; !ok && downstreamSources[sn.String()] != structs.TopologySourceRegistration {
+		if _, ok := tproxyMap[sn]; !ok && !downstream.Service.Connect.Native && downstreamSources[sn.String()] != structs.TopologySourceRegistration {
 			// If downstream is not a transparent proxy or connect native, remove references
 			delete(downstreamSources, sn.String())
 			delete(downstreamDecisions, sn.String())
@@ -4597,7 +4432,6 @@ func (s *Store) combinedServiceNodesTxn(tx ReadTxn, ws memdb.WatchSet, names []s
 		maxIdx uint64
 		resp   structs.CheckServiceNodes
 	)
-	dedupMap := make(map[string]structs.CheckServiceNode)
 	for _, u := range names {
 		// Collect typical then connect instances
 		idx, csn, err := checkServiceNodesTxn(tx, ws, u.Name, false, &u.EnterpriseMeta, peerName)
@@ -4607,9 +4441,7 @@ func (s *Store) combinedServiceNodesTxn(tx ReadTxn, ws memdb.WatchSet, names []s
 		if idx > maxIdx {
 			maxIdx = idx
 		}
-		for _, item := range csn {
-			dedupMap[item.Node.Node+"/"+item.Service.ID] = item
-		}
+		resp = append(resp, csn...)
 
 		idx, csn, err = checkServiceNodesTxn(tx, ws, u.Name, true, &u.EnterpriseMeta, peerName)
 		if err != nil {
@@ -4618,12 +4450,7 @@ func (s *Store) combinedServiceNodesTxn(tx ReadTxn, ws memdb.WatchSet, names []s
 		if idx > maxIdx {
 			maxIdx = idx
 		}
-		for _, item := range csn {
-			dedupMap[item.Node.Node+"/"+item.Service.ID] = item
-		}
-	}
-	for _, item := range dedupMap {
-		resp = append(resp, item)
+		resp = append(resp, csn...)
 	}
 	return maxIdx, resp, nil
 }
diff --git a/agent/consul/state/catalog_ce.go b/agent/consul/state/catalog_ce.go
index 8068b7f0700fc..ee599402d600b 100644
--- a/agent/consul/state/catalog_ce.go
+++ b/agent/consul/state/catalog_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/catalog_ce_test.go b/agent/consul/state/catalog_ce_test.go
index d1050ecfa04c1..e0b8dd74fcb73 100644
--- a/agent/consul/state/catalog_ce_test.go
+++ b/agent/consul/state/catalog_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/catalog_events.go b/agent/consul/state/catalog_events.go
index 7b2057c6f43a0..5fa03023e635e 100644
--- a/agent/consul/state/catalog_events.go
+++ b/agent/consul/state/catalog_events.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -12,9 +9,9 @@ import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/proto/private/pbservice"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbcommon"
+	"github.com/hashicorp/consul/proto/pbservice"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // EventSubjectService is a stream.Subject used to route and receive events for
@@ -645,7 +642,7 @@ func getPayloadCheckServiceNode(payload stream.Payload) *structs.CheckServiceNod
 }
 
 // newServiceHealthEventsForNode returns health events for all services on the
-// given node. This mirrors some of the logic in the oddly-named
+// given node. This mirrors some of the the logic in the oddly-named
 // parseCheckServiceNodes but is more efficient since we know they are all on
 // the same node.
 func newServiceHealthEventsForNode(tx ReadTxn, idx uint64, node string, entMeta *acl.EnterpriseMeta, peerName string) ([]stream.Event, error) {
diff --git a/agent/consul/state/catalog_events_ce.go b/agent/consul/state/catalog_events_ce.go
index 5b1559b22f364..e59636d318251 100644
--- a/agent/consul/state/catalog_events_ce.go
+++ b/agent/consul/state/catalog_events_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/catalog_events_ce_test.go b/agent/consul/state/catalog_events_ce_test.go
index 6945b5c47656e..8c29c692983bf 100644
--- a/agent/consul/state/catalog_events_ce_test.go
+++ b/agent/consul/state/catalog_events_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/catalog_events_test.go b/agent/consul/state/catalog_events_test.go
index 94406e34f9aee..5d1d0d1fc0294 100644
--- a/agent/consul/state/catalog_events_test.go
+++ b/agent/consul/state/catalog_events_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -15,8 +12,8 @@ import (
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/types"
 )
 
diff --git a/agent/consul/state/catalog_schema.deepcopy.go b/agent/consul/state/catalog_schema.deepcopy.go
index af4d430d2f971..406a7fdce796f 100644
--- a/agent/consul/state/catalog_schema.deepcopy.go
+++ b/agent/consul/state/catalog_schema.deepcopy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // generated by deep-copy -pointer-receiver -o ./catalog_schema.deepcopy.go -type upstreamDownstream ./; DO NOT EDIT.
 
 package state
diff --git a/agent/consul/state/catalog_schema.go b/agent/consul/state/catalog_schema.go
index b8da7c0999361..cad35bf4368b5 100644
--- a/agent/consul/state/catalog_schema.go
+++ b/agent/consul/state/catalog_schema.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -39,7 +36,6 @@ const (
 	indexUUID        = "uuid"
 	indexMeta        = "meta"
 	indexCounterOnly = "counter"
-	indexManualVIPs  = "manual-vips"
 )
 
 // nodesTableSchema returns a new table schema used for storing struct.Node.
@@ -609,21 +605,12 @@ func (q NodeCheckQuery) PartitionOrDefault() string {
 // ServiceVirtualIP is used to store a virtual IP associated with a service.
 // It is also used to store assigned virtual IPs when a snapshot is created.
 type ServiceVirtualIP struct {
-	Service   structs.PeeredServiceName
-	IP        net.IP
-	ManualIPs []string
+	Service structs.PeeredServiceName
+	IP      net.IP
 
 	structs.RaftIndex
 }
 
-func (s ServiceVirtualIP) IPWithOffset() (string, error) {
-	result, err := addIPOffset(startingVirtualIP, s.IP)
-	if err != nil {
-		return "", err
-	}
-	return result.String(), nil
-}
-
 // FreeVirtualIP is used to store a virtual IP freed up by a service deregistration.
 // It is also used to store free virtual IPs when a snapshot is created.
 type FreeVirtualIP struct {
@@ -638,33 +625,6 @@ func counterIndex(obj interface{}) (bool, error) {
 	return false, fmt.Errorf("object is not a virtual IP entry")
 }
 
-type ServiceManualVIPIndex struct{}
-
-func (index *ServiceManualVIPIndex) FromObject(obj interface{}) (bool, []byte, error) {
-	entry, ok := obj.(ServiceVirtualIP)
-	if !ok {
-		return false, nil, fmt.Errorf("object is not a ServiceVirtualIP")
-	}
-
-	// Enforce lowercase and add null character as terminator
-	id := strings.ToLower(entry.Service.ServiceName.PartitionOrDefault()) + "\x00"
-
-	return true, []byte(id), nil
-}
-
-func (index *ServiceManualVIPIndex) FromArgs(args ...interface{}) ([]byte, error) {
-	if len(args) != 1 {
-		return nil, fmt.Errorf("must provide only a single argument")
-	}
-	arg, ok := args[0].(string)
-	if !ok {
-		return nil, fmt.Errorf("argument must be a string: %#v", args[0])
-	}
-
-	id := strings.ToLower(arg) + "\x00"
-	return []byte(id), nil
-}
-
 func serviceVirtualIPTableSchema() *memdb.TableSchema {
 	return &memdb.TableSchema{
 		Name: tableServiceVirtualIPs,
@@ -680,19 +640,6 @@ func serviceVirtualIPTableSchema() *memdb.TableSchema {
 					prefixIndex: prefixIndexFromQueryWithPeerWildcardable,
 				},
 			},
-			indexManualVIPs: {
-				Name:         indexManualVIPs,
-				AllowMissing: true,
-				Unique:       false,
-				Indexer: &memdb.CompoundMultiIndex{
-					Indexes: []memdb.Indexer{
-						&ServiceManualVIPIndex{},
-						&memdb.StringSliceFieldIndex{
-							Field: "ManualIPs",
-						},
-					},
-				},
-			},
 		},
 	}
 }
diff --git a/agent/consul/state/catalog_test.go b/agent/consul/state/catalog_test.go
index f18b9beae8433..9fabb138097cf 100644
--- a/agent/consul/state/catalog_test.go
+++ b/agent/consul/state/catalog_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -42,21 +39,21 @@ func TestStateStore_GetNodeID(t *testing.T) {
 
 	_, out, err := s.GetNodeID(types.NodeID("wrongId"), nil, "")
 	if err == nil || out != nil || !strings.Contains(err.Error(), "node lookup by ID failed: index error: UUID (without hyphens) must be") {
-		t.Errorf("want an error, nil value, err:=%q ; out:=%+v", err.Error(), out)
+		t.Errorf("want an error, nil value, err:=%q ; out:=%q", err.Error(), out)
 	}
 	_, out, err = s.GetNodeID(types.NodeID("0123456789abcdefghijklmnopqrstuvwxyz"), nil, "")
 	if err == nil || out != nil || !strings.Contains(err.Error(), "node lookup by ID failed: index error: invalid UUID") {
-		t.Errorf("want an error, nil value, err:=%q ; out:=%+v", err, out)
+		t.Errorf("want an error, nil value, err:=%q ; out:=%q", err, out)
 	}
 
 	_, out, err = s.GetNodeID(types.NodeID("00a916bc-a357-4a19-b886-59419fcee50Z"), nil, "")
 	if err == nil || out != nil || !strings.Contains(err.Error(), "node lookup by ID failed: index error: invalid UUID") {
-		t.Errorf("want an error, nil value, err:=%q ; out:=%+v", err, out)
+		t.Errorf("want an error, nil value, err:=%q ; out:=%q", err, out)
 	}
 
 	_, out, err = s.GetNodeID(types.NodeID("00a916bc-a357-4a19-b886-59419fcee506"), nil, "")
 	if err != nil || out != nil {
-		t.Errorf("do not want any error nor returned value, err:=%q ; out:=%+v", err, out)
+		t.Errorf("do not want any error nor returned value, err:=%q ; out:=%q", err, out)
 	}
 
 	nodeID := types.NodeID("00a916bc-a357-4a19-b886-59419fceeaaa")
@@ -222,7 +219,6 @@ func TestStateStore_EnsureRegistration(t *testing.T) {
 				TaggedAddresses: map[string]string{"hello": "world"},
 				NodeMeta:        map[string]string{"somekey": "somevalue"},
 				PeerName:        peerName,
-				Locality:        &structs.Locality{Region: "us-west-1", Zone: "us-west-1a"},
 			}
 			if f != nil {
 				f(req)
@@ -240,7 +236,6 @@ func TestStateStore_EnsureRegistration(t *testing.T) {
 				Meta:            map[string]string{"somekey": "somevalue"},
 				RaftIndex:       structs.RaftIndex{CreateIndex: 1, ModifyIndex: 1},
 				PeerName:        peerName,
-				Locality:        &structs.Locality{Region: "us-west-1", Zone: "us-west-1a"},
 			}
 
 			_, out, err := s.GetNode("node1", nil, peerName)
@@ -264,7 +259,6 @@ func TestStateStore_EnsureRegistration(t *testing.T) {
 					RaftIndex:      structs.RaftIndex{CreateIndex: 2, ModifyIndex: 2},
 					EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
 					PeerName:       peerName,
-					Locality:       &structs.Locality{Region: "us-west-1", Zone: "us-west-1a"},
 				},
 			}
 
@@ -374,7 +368,6 @@ func TestStateStore_EnsureRegistration(t *testing.T) {
 					Meta:     map[string]string{strings.Repeat("a", 129): "somevalue"},
 					Tags:     []string{"primary"},
 					PeerName: peerName,
-					Locality: &structs.Locality{Region: "us-west-1", Zone: "us-west-1a"},
 				}
 			})
 			testutil.RequireErrorContains(t, s.EnsureRegistration(9, req), `Key is too long (limit: 128 characters)`)
@@ -391,7 +384,6 @@ func TestStateStore_EnsureRegistration(t *testing.T) {
 					Tags:     []string{"primary"},
 					Weights:  &structs.Weights{Passing: 1, Warning: 1},
 					PeerName: peerName,
-					Locality: &structs.Locality{Region: "us-west-1", Zone: "us-west-1a"},
 				}
 			})
 			require.NoError(t, s.EnsureRegistration(2, req))
@@ -412,7 +404,6 @@ func TestStateStore_EnsureRegistration(t *testing.T) {
 					Tags:     []string{"primary"},
 					Weights:  &structs.Weights{Passing: 1, Warning: 1},
 					PeerName: peerName,
-					Locality: &structs.Locality{Region: "us-west-1", Zone: "us-west-1a"},
 				}
 				req.Check = &structs.HealthCheck{
 					Node:     "node1",
@@ -441,7 +432,6 @@ func TestStateStore_EnsureRegistration(t *testing.T) {
 					Tags:     []string{"primary"},
 					Weights:  &structs.Weights{Passing: 1, Warning: 1},
 					PeerName: peerName,
-					Locality: &structs.Locality{Region: "us-west-1", Zone: "us-west-1a"},
 				}
 				req.Check = &structs.HealthCheck{
 					Node:     "node1",
@@ -949,7 +939,7 @@ func TestNodeRenamingNodes(t *testing.T) {
 	}
 
 	if _, node, err := s.GetNodeID(nodeID1, nil, ""); err != nil || node == nil || node.ID != nodeID1 {
-		t.Fatalf("err: %s, node:= %+v", err, node)
+		t.Fatalf("err: %s, node:= %q", err, node)
 	}
 
 	if _, node, err := s.GetNodeID(nodeID2, nil, ""); err != nil && node == nil || node.ID != nodeID2 {
@@ -1131,7 +1121,7 @@ func TestStateStore_EnsureNode(t *testing.T) {
 	_, out, err = s.GetNode("node1", nil, "")
 	require.NoError(t, err)
 	if out != nil {
-		t.Fatalf("Node should not exist anymore: %+v", out)
+		t.Fatalf("Node should not exist anymore: %q", out)
 	}
 
 	idx, out, err = s.GetNode("node1-renamed", nil, "")
@@ -1287,10 +1277,10 @@ func TestStateStore_EnsureNode(t *testing.T) {
 		t.Fatalf("[DEPRECATED] err: %s", err)
 	}
 	if out.CreateIndex != 10 {
-		t.Fatalf("[DEPRECATED] We expected to modify node previously added, but add index = %d for node %+v", out.CreateIndex, out)
+		t.Fatalf("[DEPRECATED] We expected to modify node previously added, but add index = %d for node %q", out.CreateIndex, out)
 	}
 	if out.Address != "1.1.1.66" || out.ModifyIndex != 15 {
-		t.Fatalf("[DEPRECATED] Node with newNodeID should have been updated, but was: %d with content := %+v", out.CreateIndex, out)
+		t.Fatalf("[DEPRECATED] Node with newNodeID should have been updated, but was: %d with content := %q", out.CreateIndex, out)
 	}
 }
 
@@ -1959,87 +1949,6 @@ func TestStateStore_EnsureService_VirtualIPAssign(t *testing.T) {
 	assert.Equal(t, ns5.Port, taggedAddress.Port)
 }
 
-func TestStateStore_AssignManualVirtualIPs(t *testing.T) {
-	s := testStateStore(t)
-	setVirtualIPFlags(t, s)
-
-	// Attempt to assign manual virtual IPs to a service that doesn't exist - should be a no-op.
-	psn := structs.PeeredServiceName{ServiceName: structs.ServiceName{Name: "foo", EnterpriseMeta: *acl.DefaultEnterpriseMeta()}}
-	found, svcs, err := s.AssignManualServiceVIPs(0, psn, []string{"7.7.7.7", "8.8.8.8"})
-	require.NoError(t, err)
-	require.False(t, found)
-	require.Empty(t, svcs)
-	serviceVIP, err := s.ServiceManualVIPs(psn)
-	require.NoError(t, err)
-	require.Nil(t, serviceVIP)
-
-	// Create the service registration.
-	entMeta := structs.DefaultEnterpriseMetaInDefaultPartition()
-	ns1 := &structs.NodeService{
-		ID:             "foo",
-		Service:        "foo",
-		Address:        "1.1.1.1",
-		Port:           1111,
-		Connect:        structs.ServiceConnect{Native: true},
-		EnterpriseMeta: *entMeta,
-	}
-
-	// Service successfully registers into the state store.
-	testRegisterNode(t, s, 0, "node1")
-	require.NoError(t, s.EnsureService(1, "node1", ns1))
-
-	// Make sure there's a virtual IP for the foo service.
-	vip, err := s.VirtualIPForService(psn)
-	require.NoError(t, err)
-	assert.Equal(t, "240.0.0.1", vip)
-
-	// No manual IP should be set yet.
-	serviceVIP, err = s.ServiceManualVIPs(psn)
-	require.NoError(t, err)
-	require.Equal(t, "0.0.0.1", serviceVIP.IP.String())
-	require.Empty(t, serviceVIP.ManualIPs)
-
-	// Attempt to assign manual virtual IPs again.
-	found, svcs, err = s.AssignManualServiceVIPs(2, psn, []string{"7.7.7.7", "8.8.8.8"})
-	require.NoError(t, err)
-	require.True(t, found)
-	require.Empty(t, svcs)
-	serviceVIP, err = s.ServiceManualVIPs(psn)
-	require.NoError(t, err)
-	require.Equal(t, "0.0.0.1", serviceVIP.IP.String())
-	require.Equal(t, serviceVIP.ManualIPs, []string{"7.7.7.7", "8.8.8.8"})
-
-	// Register another service via config entry.
-	s.EnsureConfigEntry(3, &structs.ServiceResolverConfigEntry{
-		Kind: structs.ServiceResolver,
-		Name: "bar",
-	})
-
-	psn2 := structs.PeeredServiceName{ServiceName: structs.ServiceName{Name: "bar"}}
-	vip, err = s.VirtualIPForService(psn2)
-	require.NoError(t, err)
-	assert.Equal(t, "240.0.0.2", vip)
-
-	// Attempt to assign manual virtual IPs for bar, with one IP overlapping with foo.
-	// This should cause the ip to be removed from foo's list of manual IPs.
-	found, svcs, err = s.AssignManualServiceVIPs(4, psn2, []string{"7.7.7.7", "9.9.9.9"})
-	require.NoError(t, err)
-	require.True(t, found)
-	require.ElementsMatch(t, svcs, []structs.PeeredServiceName{psn})
-
-	serviceVIP, err = s.ServiceManualVIPs(psn)
-	require.NoError(t, err)
-	require.Equal(t, "0.0.0.1", serviceVIP.IP.String())
-	require.Equal(t, []string{"8.8.8.8"}, serviceVIP.ManualIPs)
-	require.Equal(t, uint64(4), serviceVIP.ModifyIndex)
-
-	serviceVIP, err = s.ServiceManualVIPs(psn2)
-	require.NoError(t, err)
-	require.Equal(t, "0.0.0.2", serviceVIP.IP.String())
-	require.Equal(t, []string{"7.7.7.7", "9.9.9.9"}, serviceVIP.ManualIPs)
-	require.Equal(t, uint64(4), serviceVIP.ModifyIndex)
-}
-
 func TestStateStore_EnsureService_ReassignFreedVIPs(t *testing.T) {
 	s := testStateStore(t)
 	setVirtualIPFlags(t, s)
@@ -4837,9 +4746,6 @@ func TestStateStore_NodeInfo_NodeDump(t *testing.T) {
 	}
 
 	// Register some nodes
-	// node1 is registered withOut any nodemeta, and a consul service with id
-	// 'consul' is added later with meta 'version'. The expected node must have
-	// meta 'consul-version' with same value
 	testRegisterNode(t, s, 0, "node1")
 	testRegisterNode(t, s, 1, "node2")
 
@@ -4848,8 +4754,6 @@ func TestStateStore_NodeInfo_NodeDump(t *testing.T) {
 	testRegisterService(t, s, 3, "node1", "service2")
 	testRegisterService(t, s, 4, "node2", "service1")
 	testRegisterService(t, s, 5, "node2", "service2")
-	// Register consul service with meta 'version' for node1
-	testRegisterServiceWithMeta(t, s, 10, "node1", "consul", map[string]string{"version": "1.17.0"})
 
 	// Register service-level checks
 	testRegisterCheck(t, s, 6, "node1", "service1", "check1", api.HealthPassing)
@@ -4899,19 +4803,6 @@ func TestStateStore_NodeInfo_NodeDump(t *testing.T) {
 				},
 			},
 			Services: []*structs.NodeService{
-				{
-					ID:      "consul",
-					Service: "consul",
-					Address: "1.1.1.1",
-					Meta:    map[string]string{"version": "1.17.0"},
-					Port:    1111,
-					Weights: &structs.Weights{Passing: 1, Warning: 1},
-					RaftIndex: structs.RaftIndex{
-						CreateIndex: 10,
-						ModifyIndex: 10,
-					},
-					EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
-				},
 				{
 					ID:      "service1",
 					Service: "service1",
@@ -4939,7 +4830,6 @@ func TestStateStore_NodeInfo_NodeDump(t *testing.T) {
 					EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
 				},
 			},
-			Meta: map[string]string{"consul-version": "1.17.0"},
 		},
 		&structs.NodeInfo{
 			Node:      "node2",
@@ -5007,7 +4897,7 @@ func TestStateStore_NodeInfo_NodeDump(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
-	if idx != 10 {
+	if idx != 9 {
 		t.Fatalf("bad index: %d", idx)
 	}
 	require.Len(t, dump, 1)
@@ -5018,8 +4908,8 @@ func TestStateStore_NodeInfo_NodeDump(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
-	if idx != 10 {
-		t.Fatalf("bad index: %d", idx)
+	if idx != 9 {
+		t.Fatalf("bad index: %d", 9)
 	}
 	if !reflect.DeepEqual(dump, expect) {
 		t.Fatalf("bad: %#v", dump[0].Services[0])
diff --git a/agent/consul/state/config_entry.go b/agent/consul/state/config_entry.go
index b298b6122080d..903fcbe9ee75b 100644
--- a/agent/consul/state/config_entry.go
+++ b/agent/consul/state/config_entry.go
@@ -1,15 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
 	"errors"
 	"fmt"
-	"strings"
 
 	memdb "github.com/hashicorp/go-memdb"
-	"github.com/hashicorp/go-multierror"
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/configentry"
@@ -20,10 +15,6 @@ import (
 	"github.com/hashicorp/consul/lib/maps"
 )
 
-var (
-	permissiveModeNotAllowedError = errors.New("cannot set MutualTLSMode=permissive because AllowEnablingPermissiveMutualTLS=false in the mesh config entry")
-)
-
 type ConfigEntryLinkIndex struct {
 }
 
@@ -235,16 +226,14 @@ func ensureConfigEntryTxn(tx WriteTxn, idx uint64, statusUpdate bool, conf struc
 		return fmt.Errorf("failed configuration lookup: %s", err)
 	}
 
-	var existingConf structs.ConfigEntry
 	raftIndex := conf.GetRaftIndex()
 	if existing != nil {
-		existingConf = existing.(structs.ConfigEntry)
-		existingIdx := existingConf.GetRaftIndex()
+		existingIdx := existing.(structs.ConfigEntry).GetRaftIndex()
 		raftIndex.CreateIndex = existingIdx.CreateIndex
 
 		// Handle optional upsert logic.
 		if updatableConf, ok := conf.(structs.UpdatableConfigEntry); ok {
-			if err := updatableConf.UpdateOver(existingConf); err != nil {
+			if err := updatableConf.UpdateOver(existing.(structs.ConfigEntry)); err != nil {
 				return err
 			}
 		}
@@ -264,7 +253,7 @@ func ensureConfigEntryTxn(tx WriteTxn, idx uint64, statusUpdate bool, conf struc
 	}
 	raftIndex.ModifyIndex = idx
 
-	err = validateProposedConfigEntryInGraph(tx, q, conf, existingConf)
+	err = validateProposedConfigEntryInGraph(tx, q, conf)
 	if err != nil {
 		return err // Err is already sufficiently decorated.
 	}
@@ -453,7 +442,7 @@ func deleteConfigEntryTxn(tx WriteTxn, idx uint64, kind, name string, entMeta *a
 		}
 	}
 
-	err = validateProposedConfigEntryInGraph(tx, q, nil, c)
+	err = validateProposedConfigEntryInGraph(tx, q, nil)
 	if err != nil {
 		return err // Err is already sufficiently decorated.
 	}
@@ -466,14 +455,6 @@ func deleteConfigEntryTxn(tx WriteTxn, idx uint64, kind, name string, entMeta *a
 		return fmt.Errorf("failed updating index: %s", err)
 	}
 
-	// Attempt to delete the virtual IP associated with this service, if applicable.
-	if configEntryHasVirtualIP(c) {
-		psn := structs.PeeredServiceName{ServiceName: sn}
-		if err := freeServiceVirtualIP(tx, idx, psn, nil); err != nil {
-			return fmt.Errorf("failed to clean up virtual IP for %q: %v", psn.String(), err)
-		}
-	}
-
 	return nil
 }
 
@@ -484,15 +465,14 @@ func insertConfigEntryWithTxn(tx WriteTxn, idx uint64, conf structs.ConfigEntry)
 
 	// If the config entry is for a terminating or ingress gateway we update the memdb table
 	// that associates gateways <-> services.
-	kind := conf.GetKind()
-	if kind == structs.TerminatingGateway || kind == structs.IngressGateway {
+	if conf.GetKind() == structs.TerminatingGateway || conf.GetKind() == structs.IngressGateway {
 		err := updateGatewayServices(tx, idx, conf, conf.GetEnterpriseMeta())
 		if err != nil {
 			return fmt.Errorf("failed to associate services to gateway: %v", err)
 		}
 	}
 
-	switch kind {
+	switch conf.GetKind() {
 	case structs.ServiceDefaults:
 		if conf.(*structs.ServiceConfigEntry).Destination != nil {
 			sn := structs.ServiceName{Name: conf.GetName(), EnterpriseMeta: *conf.GetEnterpriseMeta()}
@@ -514,23 +494,6 @@ func insertConfigEntryWithTxn(tx WriteTxn, idx uint64, conf structs.ConfigEntry)
 				return fmt.Errorf("failed to persist service name: %v", err)
 			}
 		}
-	case structs.SamenessGroup:
-		err := checkSamenessGroup(tx, conf)
-		if err != nil {
-			return err
-		}
-	}
-
-	// Assign virtual-ips, if needed
-	supported, err := virtualIPsSupported(tx, nil)
-	if err != nil {
-		return err
-	}
-	if supported && configEntryHasVirtualIP(conf) {
-		psn := structs.PeeredServiceName{ServiceName: structs.NewServiceName(conf.GetName(), conf.GetEnterpriseMeta())}
-		if _, err := assignServiceVirtualIP(tx, idx, psn); err != nil {
-			return err
-		}
 	}
 
 	// Insert the config entry and update the index
@@ -544,28 +507,6 @@ func insertConfigEntryWithTxn(tx WriteTxn, idx uint64, conf structs.ConfigEntry)
 	return nil
 }
 
-func configEntryHasVirtualIP(c structs.ConfigEntry) bool {
-	if c == nil || c.GetName() == "" {
-		return false
-	}
-	switch c.GetKind() {
-	case structs.ServiceRouter:
-		return true
-	case structs.ServiceResolver:
-		return true
-	case structs.ServiceSplitter:
-		return true
-	case structs.ServiceDefaults:
-		return true
-	case structs.ServiceIntentions:
-		entMeta := c.GetEnterpriseMeta()
-		return !strings.Contains(c.GetName(), "*") &&
-			!strings.Contains(entMeta.NamespaceOrDefault(), "*") &&
-			!strings.Contains(entMeta.PartitionOrDefault(), "*")
-	}
-	return false
-}
-
 // validateProposedConfigEntryInGraph can be used to verify graph integrity for
 // a proposed graph create/update/delete.
 //
@@ -576,7 +517,7 @@ func configEntryHasVirtualIP(c structs.ConfigEntry) bool {
 func validateProposedConfigEntryInGraph(
 	tx ReadTxn,
 	kindName configentry.KindName,
-	newEntry, existingEntry structs.ConfigEntry,
+	newEntry structs.ConfigEntry,
 ) error {
 	switch kindName.Kind {
 	case structs.ProxyDefaults:
@@ -584,25 +525,7 @@ func validateProposedConfigEntryInGraph(
 		if kindName.Name != structs.ProxyConfigGlobal {
 			return nil
 		}
-		if newPD, ok := newEntry.(*structs.ProxyConfigEntry); ok && newPD != nil {
-			var existingMode structs.MutualTLSMode
-			if existingPD, ok := existingEntry.(*structs.ProxyConfigEntry); ok && existingPD != nil {
-				existingMode = existingPD.MutualTLSMode
-			}
-			if err := checkMutualTLSMode(tx, kindName, newPD.MutualTLSMode, existingMode); err != nil {
-				return err
-			}
-		}
 	case structs.ServiceDefaults:
-		if newSD, ok := newEntry.(*structs.ServiceConfigEntry); ok && newSD != nil {
-			var existingMode structs.MutualTLSMode
-			if existingSD, ok := existingEntry.(*structs.ServiceConfigEntry); ok && existingSD != nil {
-				existingMode = existingSD.MutualTLSMode
-			}
-			if err := checkMutualTLSMode(tx, kindName, newSD.MutualTLSMode, existingMode); err != nil {
-				return err
-			}
-		}
 	case structs.ServiceRouter:
 	case structs.ServiceSplitter:
 	case structs.ServiceResolver:
@@ -616,15 +539,7 @@ func validateProposedConfigEntryInGraph(
 		if err != nil {
 			return err
 		}
-	case structs.SamenessGroup:
 	case structs.ServiceIntentions:
-		if newEntry != nil {
-			err := validateJWTProvidersExist(tx, kindName, newEntry)
-			if err != nil {
-
-				return err
-			}
-		}
 	case structs.MeshConfig:
 	case structs.ExportedServices:
 	case structs.APIGateway: // TODO Consider checkGatewayClash
@@ -632,14 +547,6 @@ func validateProposedConfigEntryInGraph(
 	case structs.InlineCertificate:
 	case structs.HTTPRoute:
 	case structs.TCPRoute:
-	case structs.RateLimitIPConfig:
-	case structs.JWTProvider:
-		if newEntry == nil && existingEntry != nil {
-			err := validateJWTProviderIsReferenced(tx, kindName, existingEntry)
-			if err != nil {
-				return err
-			}
-		}
 	default:
 		return fmt.Errorf("unhandled kind %q during validation of %q", kindName.Kind, kindName.Name)
 	}
@@ -647,200 +554,6 @@ func validateProposedConfigEntryInGraph(
 	return validateProposedConfigEntryInServiceGraph(tx, kindName, newEntry)
 }
 
-func getExistingJWTProvidersByName(tx ReadTxn, kn configentry.KindName) (map[string]*structs.JWTProviderConfigEntry, error) {
-	meta := acl.NewEnterpriseMetaWithPartition(
-		kn.EnterpriseMeta.PartitionOrDefault(),
-		acl.DefaultNamespaceName,
-	)
-
-	_, configEntries, err := configEntriesByKindTxn(tx, nil, structs.JWTProvider, &meta)
-
-	providerNames := make(map[string]*structs.JWTProviderConfigEntry)
-
-	for i := range configEntries {
-		entry, ok := configEntries[i].(*structs.JWTProviderConfigEntry)
-		if !ok {
-			return nil, fmt.Errorf("Invalid type of jwt-provider config entry: %T", configEntries[i])
-		}
-
-		if _, ok := providerNames[entry.Name]; !ok {
-			providerNames[entry.Name] = entry
-		}
-	}
-
-	return providerNames, err
-}
-
-func validateJWTProvider(existingProviderNames map[string]*structs.JWTProviderConfigEntry, referencedProviderNames map[string]struct{}) error {
-	var result error
-
-	for referencedProvider := range referencedProviderNames {
-		_, found := existingProviderNames[referencedProvider]
-		if !found {
-			result = multierror.Append(result, fmt.Errorf("Referenced JWT Provider does not exist. Provider Name: %s", referencedProvider)).ErrorOrNil()
-		}
-	}
-
-	return result
-}
-
-func getReferencedProviderNames(j *structs.IntentionJWTRequirement, s []*structs.SourceIntention) map[string]struct{} {
-	providerNames := make(map[string]struct{})
-
-	if j != nil {
-		for _, provider := range j.Providers {
-			if _, ok := providerNames[provider.Name]; !ok {
-				providerNames[provider.Name] = struct{}{}
-			}
-		}
-	}
-
-	for _, src := range s {
-		for _, perm := range src.Permissions {
-			if perm.JWT != nil {
-				for _, provider := range perm.JWT.Providers {
-					if _, ok := providerNames[provider.Name]; !ok {
-						providerNames[provider.Name] = struct{}{}
-					}
-				}
-			}
-		}
-	}
-
-	return providerNames
-}
-
-// validateJWTProviderIsReferenced iterates over intentions to determine if the provider being
-// deleted is referenced by any intention.
-//
-// This could be an expensive operation based on the number of intentions. We purposely set this to only
-// run on delete and don't expect this to be called often.
-func validateJWTProviderIsReferenced(tx ReadTxn, kn configentry.KindName, ce structs.ConfigEntry) error {
-	meta := acl.NewEnterpriseMetaWithPartition(
-		kn.EnterpriseMeta.PartitionOrDefault(),
-		acl.DefaultNamespaceName,
-	)
-	entry, ok := ce.(*structs.JWTProviderConfigEntry)
-	if !ok {
-		return fmt.Errorf("invalid jwt provider config entry: %T", entry)
-	}
-
-	_, ixnEntries, err := configEntriesByKindTxn(tx, nil, structs.ServiceIntentions, &meta)
-	if err != nil {
-		return err
-	}
-
-	err = findJWTProviderNameReferences(ixnEntries, entry.Name)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func findJWTProviderNameReferences(entries []structs.ConfigEntry, pName string) error {
-	errMsg := "cannot delete jwt provider config entry referenced by an intention. Provider name: %s, intention name: %s"
-	for _, entry := range entries {
-		ixn, ok := entry.(*structs.ServiceIntentionsConfigEntry)
-		if !ok {
-			return fmt.Errorf("type %T is not a service intentions config entry", entry)
-		}
-
-		if ixn.JWT != nil {
-			for _, prov := range ixn.JWT.Providers {
-				if prov.Name == pName {
-					return fmt.Errorf(errMsg, pName, ixn.Name)
-				}
-			}
-		}
-
-		for _, s := range ixn.Sources {
-			for _, perm := range s.Permissions {
-				if perm.JWT == nil {
-					continue
-				}
-				for _, prov := range perm.JWT.Providers {
-					if prov.Name == pName {
-						return fmt.Errorf(errMsg, pName, ixn.Name)
-					}
-				}
-			}
-		}
-	}
-	return nil
-}
-
-// This fetches all the jwt-providers config entries and iterates over them
-// to validate that any provider referenced exists.
-// This is okay because we assume there are very few jwt-providers per partition
-func validateJWTProvidersExist(tx ReadTxn, kn configentry.KindName, ce structs.ConfigEntry) error {
-	var result error
-	entry, ok := ce.(*structs.ServiceIntentionsConfigEntry)
-	if !ok {
-		return fmt.Errorf("Invalid service intention config entry: %T", entry)
-	}
-
-	referencedProvidersNames := getReferencedProviderNames(entry.JWT, entry.Sources)
-
-	if len(referencedProvidersNames) > 0 {
-		jwtProvidersNames, err := getExistingJWTProvidersByName(tx, kn)
-		if err != nil {
-			return fmt.Errorf("Failed retrieval of jwt config entries with err: %v", err)
-		}
-
-		result = multierror.Append(result, validateJWTProvider(jwtProvidersNames, referencedProvidersNames)).ErrorOrNil()
-	}
-	return result
-}
-
-// checkMutualTLSMode validates the MutualTLSMode (in proxy-defaults or
-// service-defaults) against the AllowEnablingPermissiveMutualTLS setting in the
-// mesh config entry, as follows:
-//
-// - If AllowEnablingPermissiveMutualTLS=true, any value of MutualTLSMode is allowed.
-// - If AllowEnablingPermissiveMutualTLS=false, *changing* to MutualTLSMode=permissive is not allowed
-//
-// If MutualTLSMode=permissive is already stored, but the setting is not being changed
-// by this transaction, then the permissive setting is allowed (does not cause a validation error).
-func checkMutualTLSMode(tx ReadTxn, kindName configentry.KindName, newMode, existingMode structs.MutualTLSMode) error {
-	// Setting the mode to something not permissive is always allowed.
-	if newMode != structs.MutualTLSModePermissive {
-		return nil
-	}
-
-	// If the MutualTLSMode has not been changed, then do not error. This allows
-	// remaining in MutualTLSMode=permissive without causing validation failures
-	// after AllowEnablingPermissiveMutualTLS=false is set.
-	if existingMode == newMode {
-		return nil
-	}
-
-	// The mesh config entry exists in the default namespace in the given partition.
-	metaInDefaultNS := acl.NewEnterpriseMetaWithPartition(
-		kindName.EnterpriseMeta.PartitionOrDefault(),
-		acl.DefaultNamespaceName,
-	)
-	_, mesh, err := configEntryTxn(tx, nil, structs.MeshConfig, structs.MeshConfigMesh, &metaInDefaultNS)
-	if err != nil {
-		return fmt.Errorf("unable to validate MutualTLSMode against mesh config entry: %w", err)
-	}
-
-	permissiveAllowed := false
-	if mesh != nil {
-		meshConfig, ok := mesh.(*structs.MeshConfigEntry)
-		if !ok {
-			return fmt.Errorf("unable to validate MutualTLSMode: invalid type from mesh config entry lookup: %T", mesh)
-		}
-		permissiveAllowed = meshConfig.AllowEnablingPermissiveMutualTLS
-	}
-
-	// If permissive is not allowed, then any value for MutualTLSMode is allowed.
-	if !permissiveAllowed && newMode == structs.MutualTLSModePermissive {
-		return permissiveModeNotAllowedError
-	}
-	return nil
-}
-
 func checkGatewayClash(tx ReadTxn, kindName configentry.KindName, otherKind string) error {
 	_, entry, err := configEntryTxn(tx, nil, otherKind, kindName.Name, &kindName.EnterpriseMeta)
 	if err != nil {
@@ -988,9 +701,7 @@ func validateProposedConfigEntryInServiceGraph(
 
 		entry := newEntry.(*structs.ExportedServicesConfigEntry)
 
-		_, serviceList, err := listServicesExportedToAnyPeerByConfigEntry(nil, tx, entry.EnterpriseMeta, map[configentry.KindName]structs.ConfigEntry{
-			configentry.NewKindNameForEntry(entry): entry,
-		})
+		_, serviceList, err := listServicesExportedToAnyPeerByConfigEntry(nil, tx, entry, nil)
 		if err != nil {
 			return err
 		}
@@ -1007,72 +718,6 @@ func validateProposedConfigEntryInServiceGraph(
 		// Exported services and mesh config do not influence discovery chains.
 		return nil
 
-	case structs.SamenessGroup:
-		// Any service resolver could reference a sameness group.
-		_, resolverEntries, err := configEntriesByKindTxn(tx, nil, structs.ServiceResolver, wildcardEntMeta)
-		if err != nil {
-			return err
-		}
-		for _, entry := range resolverEntries {
-			checkChains[structs.NewServiceID(entry.GetName(), entry.GetEnterpriseMeta())] = struct{}{}
-		}
-
-		// This is the case for deleting a config entry
-		if newEntry == nil {
-			break
-		}
-
-		entry := newEntry.(*structs.SamenessGroupConfigEntry)
-
-		_, samenessGroupEntries, err := configEntriesByKindTxn(tx, nil, structs.SamenessGroup, wildcardEntMeta)
-		if err != nil {
-			return err
-		}
-
-		// Replace the existing sameness group if one exists.
-		var exists bool
-		for i := range samenessGroupEntries {
-			sg := samenessGroupEntries[i]
-			if sg.GetName() == entry.Name {
-				samenessGroupEntries[i] = entry
-				exists = true
-				break
-			}
-		}
-
-		// If this sameness group doesn't currently exist, add it.
-		if !exists {
-			samenessGroupEntries = append(samenessGroupEntries, entry)
-		}
-
-		existingPartitions := make(map[string]string)
-		existingPeers := make(map[string]string)
-		for _, e := range samenessGroupEntries {
-			sg, ok := e.(*structs.SamenessGroupConfigEntry)
-			if !ok {
-				return fmt.Errorf("type %T is not a sameness group config entry", e)
-			}
-
-			for _, m := range sg.AllMembers() {
-				if m.Peer != "" {
-					if prev, ok := existingPeers[m.Peer]; ok {
-						return fmt.Errorf("members can only belong to a single sameness group, but cluster peer %q is shared between groups %q and %q",
-							m.Peer, prev, sg.Name,
-						)
-					}
-					existingPeers[m.Peer] = sg.Name
-					continue
-				}
-
-				if prev, ok := existingPartitions[m.Partition]; ok {
-					return fmt.Errorf("members can only belong to a single sameness group, but partition %q is shared between groups %q and %q",
-						m.Partition, prev, sg.Name,
-					)
-				}
-				existingPartitions[m.Partition] = sg.Name
-			}
-		}
-
 	case structs.ProxyDefaults:
 		// Check anything that has a discovery chain entry. In the future we could
 		// somehow omit the ones that have a default protocol configured.
@@ -1212,23 +857,20 @@ func validateProposedConfigEntryInServiceGraph(
 		svcTopNodeType              = make(map[structs.ServiceID]string)
 		exportedServicesByPartition = make(map[string]map[structs.ServiceName]struct{})
 	)
-	for serviceID := range checkChains {
-		chain, err := testCompileDiscoveryChain(tx, serviceID.ID, overrides, &serviceID.EnterpriseMeta)
+	for chain := range checkChains {
+		protocol, topNode, newTargets, err := testCompileDiscoveryChain(tx, chain.ID, overrides, &chain.EnterpriseMeta)
 		if err != nil {
 			return err
 		}
-		topNode := chain.Nodes[chain.StartNode]
-		protocol := chain.Protocol
+		svcProtocols[chain] = protocol
+		svcTopNodeType[chain] = topNode.Type
 
-		svcProtocols[serviceID] = protocol
-		svcTopNodeType[serviceID] = topNode.Type
-
-		chainSvc := structs.NewServiceName(serviceID.ID, &serviceID.EnterpriseMeta)
+		chainSvc := structs.NewServiceName(chain.ID, &chain.EnterpriseMeta)
 
 		// Validate that we aren't adding a cross-datacenter or cross-partition
 		// reference to a peer-exported service's discovery chain by this pending
 		// edit.
-		partition := serviceID.PartitionOrDefault()
+		partition := chain.PartitionOrDefault()
 		exportedServices, ok := exportedServicesByPartition[partition]
 		if !ok {
 			entMeta := structs.NodeEnterpriseMetaInPartition(partition)
@@ -1246,15 +888,15 @@ func validateProposedConfigEntryInServiceGraph(
 			// If a TCP (L4) discovery chain is peer exported we have to take
 			// care to prohibit certain edits to service-resolvers.
 			if !structs.IsProtocolHTTPLike(protocol) {
-				oldChain, err := testCompileDiscoveryChain(tx, serviceID.ID, nil, &serviceID.EnterpriseMeta)
+				_, _, oldTargets, err := testCompileDiscoveryChain(tx, chain.ID, nil, &chain.EnterpriseMeta)
 				if err != nil {
 					return fmt.Errorf("error compiling current discovery chain for %q: %w", chainSvc, err)
 				}
 
 				// Ensure that you can't introduce any new targets that would
 				// produce a new SpiffeID for this L4 service.
-				oldSpiffeIDs := convertTargetsToTestSpiffeIDs(oldChain)
-				newSpiffeIDs := convertTargetsToTestSpiffeIDs(chain)
+				oldSpiffeIDs := convertTargetsToTestSpiffeIDs(oldTargets)
+				newSpiffeIDs := convertTargetsToTestSpiffeIDs(newTargets)
 				for id, targetID := range newSpiffeIDs {
 					if _, exists := oldSpiffeIDs[id]; !exists {
 						return fmt.Errorf("peer exported service %q uses protocol=%q and cannot introduce new discovery chain targets like %q",
@@ -1364,11 +1006,6 @@ func validateChainIsPeerExportSafe(
 			if e.Redirect.Datacenter != "" {
 				return fmt.Errorf("peer exported service %q contains cross-datacenter resolver redirect", exportedSvc)
 			}
-
-			if e.Redirect.Peer != "" {
-				return fmt.Errorf("peer exported service %q contains cross-peer resolver redirect", exportedSvc)
-			}
-
 			if !emptyOrMatchesEntryPartition(e, e.Redirect.Partition) {
 				return fmt.Errorf("peer exported service %q contains cross-partition resolver redirect", exportedSvc)
 			}
@@ -1378,14 +1015,6 @@ func validateChainIsPeerExportSafe(
 				if len(failover.Datacenters) > 0 {
 					return fmt.Errorf("peer exported service %q contains cross-datacenter failover", exportedSvc)
 				}
-
-				// We don't exclude Peer and Partition here because it's equivalent to sameness group failover behavior.
-				// Cross-peer and partition behavior is ignored by mesh gateways in xds/endpoints.
-				for _, t := range failover.Targets {
-					if t.Datacenter != "" {
-						return fmt.Errorf("peer exported service %q contains cross-datacenter failover", exportedSvc)
-					}
-				}
 			}
 		}
 	}
@@ -1410,10 +1039,10 @@ func testCompileDiscoveryChain(
 	chainName string,
 	overrides map[configentry.KindName]structs.ConfigEntry,
 	entMeta *acl.EnterpriseMeta,
-) (*structs.CompiledDiscoveryChain, error) {
+) (string, *structs.DiscoveryGraphNode, map[string]*structs.DiscoveryTarget, error) {
 	_, speculativeEntries, err := readDiscoveryChainConfigEntriesTxn(tx, nil, chainName, overrides, entMeta)
 	if err != nil {
-		return nil, err
+		return "", nil, nil, err
 	}
 
 	// Note we use an arbitrary namespace and datacenter as those would not
@@ -1430,10 +1059,10 @@ func testCompileDiscoveryChain(
 	}
 	chain, err := discoverychain.Compile(req)
 	if err != nil {
-		return nil, err
+		return "", nil, nil, err
 	}
 
-	return chain, nil
+	return chain.Protocol, chain.Nodes[chain.StartNode], chain.Targets, nil
 }
 
 func (s *Store) ServiceDiscoveryChain(
@@ -1478,22 +1107,6 @@ func serviceDiscoveryChainTxn(
 	}
 	req.EvaluateInTrustDomain = signingID.Host()
 
-	psn := structs.PeeredServiceName{ServiceName: structs.NewServiceName(serviceName, entMeta)}
-	serviceVIPEntry, err := serviceVIPsTxn(tx, psn)
-	if err != nil {
-		return 0, nil, nil, err
-	}
-
-	if serviceVIPEntry != nil {
-		assignedIP, err := serviceVIPEntry.IPWithOffset()
-		if err != nil {
-			return 0, nil, nil, err
-		}
-		req.AutoVirtualIPs = []string{assignedIP}
-		req.ManualVirtualIPs = make([]string, len(serviceVIPEntry.ManualIPs))
-		copy(req.ManualVirtualIPs, serviceVIPEntry.ManualIPs)
-	}
-
 	// Then we compile it into something useful.
 	chain, err := discoverychain.Compile(req)
 	if err != nil {
@@ -1680,11 +1293,9 @@ func readDiscoveryChainConfigEntriesTxn(
 		todoSplitters = make(map[structs.ServiceID]struct{})
 		todoResolvers = make(map[structs.ServiceID]struct{})
 		todoDefaults  = make(map[structs.ServiceID]struct{})
-		todoPeers     = make(map[string]struct{})
 	)
 
 	sid := structs.NewServiceID(serviceName, entMeta)
-	peerEntMeta := structs.DefaultEnterpriseMetaInPartition(entMeta.PartitionOrDefault())
 
 	// At every step we'll need service and proxy defaults.
 	todoDefaults[sid] = struct{}{}
@@ -1751,31 +1362,6 @@ func readDiscoveryChainConfigEntriesTxn(
 		}
 	}
 
-	processSamenessGroup := func(sg *structs.SamenessGroupConfigEntry, resolverID structs.ServiceID) error {
-		if sg == nil {
-			return nil
-		}
-
-		res.SamenessGroups[sg.Name] = sg
-
-		for _, peer := range sg.RelatedPeers() {
-			todoPeers[peer] = struct{}{}
-		}
-
-		for _, m := range sg.AllMembers() {
-			if m.Peer != "" {
-				continue
-			}
-
-			// Disco chains preserve the name and namespace from the resolver.
-			em := acl.NewEnterpriseMetaWithPartition(m.Partition, resolverID.NamespaceOrDefault())
-			s := structs.NewServiceID(resolverID.ID, &em)
-			todoResolvers[s] = struct{}{}
-		}
-
-		return nil
-	}
-
 	for {
 		resolverID, ok := anyKey(todoResolvers)
 		if !ok {
@@ -1798,49 +1384,16 @@ func readDiscoveryChainConfigEntriesTxn(
 			maxIdx = idx
 		}
 
-		res.Resolvers[resolverID] = resolver
 		if resolver == nil {
-			idx, sg, err := getDefaultSamenessGroup(tx, ws, resolverID.PartitionOrDefault())
-			if err != nil {
-				return 0, nil, err
-			}
-			if idx > maxIdx {
-				maxIdx = idx
-			}
-			processSamenessGroup(sg, resolverID)
-
-			if resolverID == sid {
-				res.DefaultSamenessGroup = sg
-			}
-
+			res.Resolvers[resolverID] = nil
 			continue
 		}
 
+		res.Resolvers[resolverID] = resolver
+
 		for _, svc := range resolver.ListRelatedServices() {
 			todoResolvers[svc] = struct{}{}
 		}
-
-		for _, peer := range resolver.RelatedPeers() {
-			todoPeers[peer] = struct{}{}
-		}
-
-		// We fetch sameness groups here rather than in another loop because we need the resolvers
-		// for services in different partitions of the local datacenter.
-		for _, sg := range resolver.RelatedSamenessGroups() {
-			if _, ok := res.SamenessGroups[sg]; ok {
-				continue
-			}
-
-			idx, entry, err := getSamenessGroupConfigEntryTxn(tx, ws, sg, overrides, peerEntMeta.PartitionOrDefault())
-			if err != nil {
-				return 0, nil, err
-			}
-			if idx > maxIdx {
-				maxIdx = idx
-			}
-
-			processSamenessGroup(entry, resolverID)
-		}
 	}
 
 	for {
@@ -1882,22 +1435,6 @@ func readDiscoveryChainConfigEntriesTxn(
 		res.Services[svcID] = entry
 	}
 
-	for peerName := range todoPeers {
-		q := Query{
-			Value:          peerName,
-			EnterpriseMeta: *peerEntMeta,
-		}
-		idx, entry, err := peeringReadTxn(tx, ws, q)
-		if err != nil {
-			return 0, nil, err
-		}
-		if idx > maxIdx {
-			maxIdx = idx
-		}
-
-		res.Peers[peerName] = entry
-	}
-
 	// Strip nils now that they are no longer necessary.
 	for sid, entry := range res.Routers {
 		if entry == nil {
@@ -2097,6 +1634,32 @@ func getServiceIntentionsConfigEntryTxn(
 	return idx, ixn, nil
 }
 
+// getExportedServicesConfigEntryTxn is a convenience method for fetching a
+// exported-services kind of config entry.
+//
+// If an override KEY is present for the requested config entry, the index
+// returned will be 0. Any override VALUE (nil or otherwise) will be returned
+// if there is a KEY match.
+func getExportedServicesConfigEntryTxn(
+	tx ReadTxn,
+	ws memdb.WatchSet,
+	overrides map[configentry.KindName]structs.ConfigEntry,
+	entMeta *acl.EnterpriseMeta,
+) (uint64, *structs.ExportedServicesConfigEntry, error) {
+	idx, entry, err := configEntryWithOverridesTxn(tx, ws, structs.ExportedServices, entMeta.PartitionOrDefault(), overrides, entMeta)
+	if err != nil {
+		return 0, nil, err
+	} else if entry == nil {
+		return idx, nil, nil
+	}
+
+	export, ok := entry.(*structs.ExportedServicesConfigEntry)
+	if !ok {
+		return 0, nil, fmt.Errorf("invalid service config type %T", entry)
+	}
+	return idx, export, nil
+}
+
 func configEntryWithOverridesTxn(
 	tx ReadTxn,
 	ws memdb.WatchSet,
@@ -2160,7 +1723,6 @@ func protocolForService(
 }
 
 const dummyTrustDomain = "b6fc9da3-03d4-4b5a-9134-c045e9b20152.consul"
-const dummyPeerTrustDomain = "4945bd44-b427-4cf5-b19a-5f54b195bf6e.consul"
 
 func newConfigEntryQuery(c structs.ConfigEntry) configentry.KindName {
 	return configentry.NewKindName(c.GetKind(), c.GetName(), c.GetEnterpriseMeta())
@@ -2187,24 +1749,9 @@ func (q ConfigEntryKindQuery) PartitionOrDefault() string {
 // convertTargetsToTestSpiffeIDs indexes the provided targets by their eventual
 // spiffeid values using a dummy trust domain. Returns a map of SpiffeIDs to
 // targetID values which can be used for error output.
-func convertTargetsToTestSpiffeIDs(chain *structs.CompiledDiscoveryChain) map[string]string {
-	excludedTargets := make(map[string]struct{})
-
-	for _, n := range chain.Nodes {
-		if n != nil && n.Resolver != nil && n.Resolver.Failover != nil {
-			failover := n.Resolver.Failover
-			for _, t := range failover.Targets {
-				excludedTargets[t] = struct{}{}
-			}
-		}
-	}
-
+func convertTargetsToTestSpiffeIDs(targets map[string]*structs.DiscoveryTarget) map[string]string {
 	out := make(map[string]string)
-	for tid, t := range chain.Targets {
-		if _, ok := excludedTargets[tid]; ok {
-			continue
-		}
-
+	for tid, t := range targets {
 		testSpiffeID := connect.SpiffeIDService{
 			Host:       dummyTrustDomain,
 			Partition:  t.Partition,
@@ -2212,15 +1759,6 @@ func convertTargetsToTestSpiffeIDs(chain *structs.CompiledDiscoveryChain) map[st
 			Datacenter: t.Datacenter,
 			Service:    t.Service,
 		}
-
-		// Setting peer to dc allows spiffe ids to compare peered services to non-peered services.
-		// We also have to use a distinct trust domain for peering services so we handle
-		// clashes between peers and datacenters.
-		if t.Peer != "" {
-			testSpiffeID.Datacenter = t.Peer
-			testSpiffeID.Host = dummyPeerTrustDomain
-		}
-
 		uri := testSpiffeID.URI().String()
 		if _, ok := out[uri]; !ok {
 			out[uri] = tid
diff --git a/agent/consul/state/config_entry_ce.go b/agent/consul/state/config_entry_ce.go
index 1f70baf19bb88..07e7167b38327 100644
--- a/agent/consul/state/config_entry_ce.go
+++ b/agent/consul/state/config_entry_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
@@ -75,14 +73,3 @@ func getExportedServicesMatchServiceNames(serviceName string, entMeta *acl.Enter
 		structs.NewServiceName(structs.WildcardSpecifier, entMeta),
 	}
 }
-
-func readSourceSamenessIntentionsFromConfigEntriesForServiceTxn(
-	tx ReadTxn,
-	ws memdb.WatchSet,
-	serviceName string,
-	sourceEntMeta *acl.EnterpriseMeta,
-	results structs.Intentions,
-	targetType structs.IntentionTargetType,
-) (structs.Intentions, error) {
-	return results, nil
-}
diff --git a/agent/consul/state/config_entry_ce_test.go b/agent/consul/state/config_entry_ce_test.go
index 4b9103a74ede8..16f153f3b699c 100644
--- a/agent/consul/state/config_entry_ce_test.go
+++ b/agent/consul/state/config_entry_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/config_entry_events.go b/agent/consul/state/config_entry_events.go
index c6c19fce3453e..c081d778b8d24 100644
--- a/agent/consul/state/config_entry_events.go
+++ b/agent/consul/state/config_entry_events.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -9,8 +6,8 @@ import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbconfigentry"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbconfigentry"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // Adding events for a new config entry kind? Remember to update ConfigEntryFromStructs and ConfigEntryToStructs.
@@ -25,9 +22,6 @@ var configEntryKindToTopic = map[string]stream.Topic{
 	structs.HTTPRoute:         EventTopicHTTPRoute,
 	structs.InlineCertificate: EventTopicInlineCertificate,
 	structs.BoundAPIGateway:   EventTopicBoundAPIGateway,
-	structs.RateLimitIPConfig: EventTopicIPRateLimit,
-	structs.SamenessGroup:     EventTopicSamenessGroup,
-	structs.JWTProvider:       EventTopicJWTProvider,
 }
 
 // EventSubjectConfigEntry is a stream.Subject used to route and receive events
@@ -158,24 +152,6 @@ func (s *Store) BoundAPIGatewaySnapshot(req stream.SubscribeRequest, buf stream.
 	return s.configEntrySnapshot(structs.BoundAPIGateway, req, buf)
 }
 
-// IPRateLimiterSnapshot is a stream.SnapshotFunc that returns a snapshot of
-// "control-plane-request-limit" config entries.
-func (s *Store) IPRateLimiterSnapshot(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
-	return s.configEntrySnapshot(structs.RateLimitIPConfig, req, buf)
-}
-
-// SamenessGroupSnapshot is a stream.SnapshotFunc that returns a snapshot of
-// "sameness-group" config entries.
-func (s *Store) SamenessGroupSnapshot(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
-	return s.configEntrySnapshot(structs.SamenessGroup, req, buf)
-}
-
-// JWTProviderSnapshot is a stream.SnapshotFunc that returns a snapshot of
-// jwt-provider config entries.
-func (s *Store) JWTProviderSnapshot(req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
-	return s.configEntrySnapshot(structs.JWTProvider, req, buf)
-}
-
 func (s *Store) configEntrySnapshot(kind string, req stream.SubscribeRequest, buf stream.SnapshotAppender) (uint64, error) {
 	var (
 		idx     uint64
diff --git a/agent/consul/state/config_entry_events_test.go b/agent/consul/state/config_entry_events_test.go
index e8ceb10f65d85..63c21f645b2b4 100644
--- a/agent/consul/state/config_entry_events_test.go
+++ b/agent/consul/state/config_entry_events_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -10,7 +7,7 @@ import (
 
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 func TestConfigEntryEventsFromChanges(t *testing.T) {
diff --git a/agent/consul/state/config_entry_exported_services.go b/agent/consul/state/config_entry_exported_services.go
deleted file mode 100644
index 7534613ae137a..0000000000000
--- a/agent/consul/state/config_entry_exported_services.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package state
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/configentry"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/go-memdb"
-)
-
-// SimplifiedExportedServices contains a version of the exported-services that has
-// been flattened by removing all of the sameness group references and replacing
-// them with corresponding partition / peer entries.
-type SimplifiedExportedServices structs.ExportedServicesConfigEntry
-
-// ToPartitionMap is only used by the partition exporting logic.
-// It returns a map[namespace][service] => []consuming_partitions
-func (e *SimplifiedExportedServices) ToPartitionMap() map[string]map[string][]string {
-	resp := make(map[string]map[string][]string)
-	for _, svc := range e.Services {
-		if _, ok := resp[svc.Namespace]; !ok {
-			resp[svc.Namespace] = make(map[string][]string)
-		}
-		if _, ok := resp[svc.Namespace][svc.Name]; !ok {
-			consumers := make([]string, 0, len(svc.Consumers))
-			for _, c := range svc.Consumers {
-				if c.Partition != "" {
-					consumers = append(consumers, c.Partition)
-				}
-			}
-			resp[svc.Namespace][svc.Name] = consumers
-			resp[svc.Namespace][svc.Name+structs.SidecarProxySuffix] = consumers
-		}
-	}
-	return resp
-}
-
-// getExportedServicesConfigEntryTxn is a convenience method for fetching a
-// exported-services kind of config entry.
-//
-// If an override KEY is present for the requested config entry, the index
-// returned will be 0. Any override VALUE (nil or otherwise) will be returned
-// if there is a KEY match.
-func getExportedServicesConfigEntryTxn(
-	tx ReadTxn,
-	ws memdb.WatchSet,
-	overrides map[configentry.KindName]structs.ConfigEntry,
-	entMeta *acl.EnterpriseMeta,
-) (uint64, *structs.ExportedServicesConfigEntry, error) {
-	idx, entry, err := configEntryWithOverridesTxn(tx, ws, structs.ExportedServices, entMeta.PartitionOrDefault(), overrides, entMeta)
-	if err != nil {
-		return 0, nil, err
-	} else if entry == nil {
-		return idx, nil, nil
-	}
-
-	export, ok := entry.(*structs.ExportedServicesConfigEntry)
-	if !ok {
-		return 0, nil, fmt.Errorf("invalid service config type %T", entry)
-	}
-	return idx, export, nil
-}
diff --git a/agent/consul/state/config_entry_exported_services_ce.go b/agent/consul/state/config_entry_exported_services_ce.go
deleted file mode 100644
index aa495fb0d8f48..0000000000000
--- a/agent/consul/state/config_entry_exported_services_ce.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package state
-
-import (
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/configentry"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/go-memdb"
-)
-
-func getSimplifiedExportedServices(
-	tx ReadTxn,
-	ws memdb.WatchSet,
-	overrides map[configentry.KindName]structs.ConfigEntry,
-	entMeta acl.EnterpriseMeta,
-) (uint64, *SimplifiedExportedServices, error) {
-	idx, exports, err := getExportedServicesConfigEntryTxn(tx, ws, overrides, &entMeta)
-	if exports == nil {
-		return idx, nil, err
-	}
-	simple := SimplifiedExportedServices(*exports)
-	return idx, &simple, err
-}
-
-func (s *Store) GetSimplifiedExportedServices(ws memdb.WatchSet, entMeta acl.EnterpriseMeta) (uint64, *SimplifiedExportedServices, error) {
-	tx := s.db.Txn(false)
-	defer tx.Abort()
-	return getSimplifiedExportedServices(tx, ws, nil, entMeta)
-}
diff --git a/agent/consul/state/config_entry_intention.go b/agent/consul/state/config_entry_intention.go
index 459d8c4276e6f..76b5a487af0d2 100644
--- a/agent/consul/state/config_entry_intention.go
+++ b/agent/consul/state/config_entry_intention.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -79,122 +76,6 @@ func (s *ServiceIntentionLegacyIDIndex) PrefixFromArgs(args ...interface{}) ([]b
 	return val, nil
 }
 
-type SamenessGroupMemberIndex struct {
-}
-
-// Compile-time assert that these interfaces hold to ensure that the
-// methods correctly exist across the ce/ent split.
-var _ memdb.Indexer = (*SamenessGroupMemberIndex)(nil)
-var _ memdb.MultiIndexer = (*SamenessGroupMemberIndex)(nil)
-
-func (s *SamenessGroupMemberIndex) FromObject(obj interface{}) (bool, [][]byte, error) {
-	entry, ok := obj.(structs.ConfigEntry)
-	if !ok {
-		return false, nil, fmt.Errorf("object is not a ConfigEntry")
-	}
-
-	sg, ok := entry.(*structs.SamenessGroupConfigEntry)
-	if !ok {
-		return false, nil, nil
-	}
-
-	vals := make([][]byte, 0)
-	for _, m := range sg.AllMembers() {
-		if m.Partition == "" {
-			continue
-		}
-
-		// add 1 for null separator after each string
-		buf := newIndexBuilder(len(m.Partition) + 1)
-		buf.String(m.Partition)
-		vals = append(vals, buf.Bytes())
-	}
-
-	if len(vals) == 0 {
-		return false, nil, nil
-	}
-
-	return true, vals, nil
-}
-
-func (s *SamenessGroupMemberIndex) FromArgs(args ...interface{}) ([]byte, error) {
-	if len(args) != 1 {
-		return nil, fmt.Errorf("must provide only a single argument")
-	}
-	arg, ok := args[0].(string)
-	if !ok {
-		return nil, fmt.Errorf("argument must be a string: %#v", args[0])
-	}
-	buf := newIndexBuilder(len(arg) + 1)
-	buf.String(arg)
-	// Add the null character as a terminator
-	return buf.Bytes(), nil
-}
-
-type ServiceIntentionSourceSamenessGroupIndex struct {
-}
-
-// Compile-time assert that these interfaces hold to ensure that the
-// methods correctly exist across the ce/ent split.
-var _ memdb.Indexer = (*ServiceIntentionSourceSamenessGroupIndex)(nil)
-var _ memdb.MultiIndexer = (*ServiceIntentionSourceSamenessGroupIndex)(nil)
-
-func (s *ServiceIntentionSourceSamenessGroupIndex) FromObject(obj interface{}) (bool, [][]byte, error) {
-	entry, ok := obj.(structs.ConfigEntry)
-	if !ok {
-		return false, nil, fmt.Errorf("object is not a ConfigEntry")
-	}
-
-	ixnEntry, ok := entry.(*structs.ServiceIntentionsConfigEntry)
-	if !ok {
-		return false, nil, nil
-	}
-
-	vals := make([][]byte, 0, len(ixnEntry.Sources))
-	for _, src := range ixnEntry.Sources {
-		sg := src.SamenessGroup
-		if sg == "" {
-			continue
-		}
-
-		sn := structs.ServiceName{
-			Name:           src.Name,
-			EnterpriseMeta: acl.NewEnterpriseMetaWithPartition(ixnEntry.PartitionOrDefault(), src.NamespaceOrDefault()),
-		}.String()
-
-		// add 2 for null separator after each string
-		buf := newIndexBuilder(len(sg) + len(sn) + 2)
-		buf.String(sg)
-		buf.String(sn)
-		vals = append(vals, buf.Bytes())
-	}
-
-	if len(vals) == 0 {
-		return false, nil, nil
-	}
-
-	return true, vals, nil
-}
-
-func (s *ServiceIntentionSourceSamenessGroupIndex) FromArgs(args ...interface{}) ([]byte, error) {
-	if len(args) != 1 {
-		return nil, fmt.Errorf("must provide only a single argument")
-	}
-	arg, ok := args[0].(structs.ServiceNameWithSamenessGroup)
-	if !ok {
-		return nil, fmt.Errorf("argument must be a structs.ServiceID: %#v", args[0])
-	}
-	// Intention queries cannot use a peered service as a source
-	sg := arg.SamenessGroup
-	sn := arg.ServiceName.String()
-	// add 2 for null separator after each string
-	buf := newIndexBuilder(len(sg) + len(sn) + 2)
-	buf.String(sg)
-	buf.String(sn)
-	// Add the null character as a terminator
-	return buf.Bytes(), nil
-}
-
 type ServiceIntentionSourceIndex struct {
 }
 
@@ -220,10 +101,6 @@ func (s *ServiceIntentionSourceIndex) FromObject(obj interface{}) (bool, [][]byt
 
 	vals := make([][]byte, 0, len(ixnEntry.Sources))
 	for _, src := range ixnEntry.Sources {
-		if src.SamenessGroup != "" {
-			continue
-		}
-
 		peer := src.Peer
 		if peer == "" {
 			peer = structs.LocalPeerKeyword
@@ -402,11 +279,6 @@ func readSourceIntentionsFromConfigEntriesTxn(
 		if err != nil {
 			return 0, nil, err
 		}
-
-		results, err = readSourceSamenessIntentionsFromConfigEntriesForServiceTxn(tx, ws, sn.Name, &sn.EnterpriseMeta, results, targetType)
-		if err != nil {
-			return 0, nil, err
-		}
 	}
 
 	// Sort the results by precedence
@@ -419,11 +291,12 @@ func readSourceIntentionsFromConfigEntriesForServiceTxn(
 	tx ReadTxn,
 	ws memdb.WatchSet,
 	serviceName string,
-	sourceEntMeta *acl.EnterpriseMeta,
+	entMeta *acl.EnterpriseMeta,
 	results structs.Intentions,
 	targetType structs.IntentionTargetType,
 ) (structs.Intentions, error) {
-	sn := structs.NewServiceName(serviceName, sourceEntMeta)
+	sn := structs.NewServiceName(serviceName, entMeta)
+
 	iter, err := tx.Get(tableConfigEntries, indexSource, sn)
 	if err != nil {
 		return nil, fmt.Errorf("failed config entry lookup: %s", err)
@@ -433,21 +306,29 @@ func readSourceIntentionsFromConfigEntriesForServiceTxn(
 	for v := iter.Next(); v != nil; v = iter.Next() {
 		entry := v.(*structs.ServiceIntentionsConfigEntry)
 		entMeta := entry.DestinationServiceName().EnterpriseMeta
-
-		kind, err := serviceIntentionsToGatewayServiceKind(tx, entry.DestinationServiceName().Name, entMeta)
-		if err != nil {
-			return nil, err
+		// if we have a wildcard namespace or partition assume we are querying a service intention
+		// as destination intentions will never be queried as wildcard
+		kind := structs.GatewayServiceKindService
+		if entMeta.NamespaceOrDefault() != acl.WildcardName && entMeta.PartitionOrDefault() != acl.WildcardName {
+			kind, err = GatewayServiceKind(tx, entry.DestinationServiceName().Name, &entMeta)
+			if err != nil {
+				return nil, err
+			}
 		}
-
 		for _, src := range entry.Sources {
 			if src.SourceServiceName() == sn {
-				canAdd, err := intentionMatches(targetType, kind, entry.HasWildcardDestination())
-				if err != nil {
-					return nil, err
-				}
-
-				if canAdd {
-					results = append(results, entry.ToIntention(src))
+				switch targetType {
+				case structs.IntentionTargetService:
+					if kind == structs.GatewayServiceKindService || kind == structs.GatewayServiceKindUnknown {
+						results = append(results, entry.ToIntention(src))
+					}
+				case structs.IntentionTargetDestination:
+					// wildcard is needed here to be able to consider destinations in the wildcard intentions
+					if kind == structs.GatewayServiceKindDestination || entry.HasWildcardDestination() {
+						results = append(results, entry.ToIntention(src))
+					}
+				default:
+					return nil, fmt.Errorf("invalid target type")
 				}
 			}
 		}
@@ -456,37 +337,6 @@ func readSourceIntentionsFromConfigEntriesForServiceTxn(
 	return results, nil
 }
 
-func serviceIntentionsToGatewayServiceKind(tx ReadTxn, serviceName string, entMeta acl.EnterpriseMeta) (structs.GatewayServiceKind, error) {
-	var err error
-	kind := structs.GatewayServiceKindService
-
-	// if we have a wildcard namespace or partition assume we are querying a service intention
-	// as destination intentions will never be queried as wildcard
-	if entMeta.NamespaceOrDefault() != acl.WildcardName && entMeta.PartitionOrDefault() != acl.WildcardName {
-		kind, err = GatewayServiceKind(tx, serviceName, &entMeta)
-		if err != nil {
-			return kind, err
-		}
-	}
-
-	return kind, nil
-}
-
-func intentionMatches(targetType structs.IntentionTargetType, kind structs.GatewayServiceKind, wildcardDestination bool) (bool, error) {
-	var canAdd bool
-	switch targetType {
-	case structs.IntentionTargetService:
-		canAdd = kind == structs.GatewayServiceKindService || kind == structs.GatewayServiceKindUnknown
-	case structs.IntentionTargetDestination:
-		// wildcard is needed here to be able to consider destinations in the wildcard intentions
-		canAdd = kind == structs.GatewayServiceKindDestination || wildcardDestination
-	default:
-		return false, fmt.Errorf("invalid target type")
-	}
-
-	return canAdd, nil
-}
-
 func readDestinationIntentionsFromConfigEntriesTxn(tx ReadTxn, ws memdb.WatchSet, serviceName string, entMeta *acl.EnterpriseMeta) (uint64, structs.Intentions, error) {
 	idx := maxIndexTxn(tx, tableConfigEntries)
 
diff --git a/agent/consul/state/config_entry_intention_ce.go b/agent/consul/state/config_entry_intention_ce.go
index 8cefdf2c3dffc..c954c147c6c71 100644
--- a/agent/consul/state/config_entry_intention_ce.go
+++ b/agent/consul/state/config_entry_intention_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/config_entry_sameness_group.go b/agent/consul/state/config_entry_sameness_group.go
deleted file mode 100644
index d8308008dfbb4..0000000000000
--- a/agent/consul/state/config_entry_sameness_group.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package state
-
-import (
-	"github.com/hashicorp/consul/agent/configentry"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/go-memdb"
-)
-
-// GetSamenessGroup returns a SamenessGroupConfigEntry from the state
-// store using the provided parameters.
-func (s *Store) GetSamenessGroup(ws memdb.WatchSet,
-	name string,
-	overrides map[configentry.KindName]structs.ConfigEntry,
-	partition string) (uint64, *structs.SamenessGroupConfigEntry, error) {
-	tx := s.db.ReadTxn()
-	defer tx.Abort()
-
-	return getSamenessGroupConfigEntryTxn(tx, ws, name, overrides, partition)
-}
diff --git a/agent/consul/state/config_entry_sameness_group_ce.go b/agent/consul/state/config_entry_sameness_group_ce.go
deleted file mode 100644
index fcff27158ba2e..0000000000000
--- a/agent/consul/state/config_entry_sameness_group_ce.go
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package state
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/agent/configentry"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/go-memdb"
-)
-
-// SamenessGroupDefaultIndex is a placeholder for CE. Sameness-groups are enterprise only.
-type SamenessGroupDefaultIndex struct{}
-
-var _ memdb.Indexer = (*SamenessGroupDefaultIndex)(nil)
-var _ memdb.MultiIndexer = (*SamenessGroupDefaultIndex)(nil)
-
-func (*SamenessGroupDefaultIndex) FromObject(obj interface{}) (bool, [][]byte, error) {
-	return false, nil, nil
-}
-
-func (*SamenessGroupDefaultIndex) FromArgs(args ...interface{}) ([]byte, error) {
-	return nil, nil
-}
-
-func checkSamenessGroup(tx ReadTxn, newConfig structs.ConfigEntry) error {
-	return fmt.Errorf("sameness-groups are an enterprise-only feature")
-}
-
-// getExportedServicesConfigEntryTxn is a convenience method for fetching a
-// sameness-group config entries.
-//
-// If an override KEY is present for the requested config entry, the index
-// returned will be 0. Any override VALUE (nil or otherwise) will be returned
-// if there is a KEY match.
-func getSamenessGroupConfigEntryTxn(
-	tx ReadTxn,
-	ws memdb.WatchSet,
-	name string,
-	overrides map[configentry.KindName]structs.ConfigEntry,
-	partition string,
-) (uint64, *structs.SamenessGroupConfigEntry, error) {
-	return 0, nil, nil
-}
-
-func getDefaultSamenessGroup(tx ReadTxn, ws memdb.WatchSet, partition string) (uint64, *structs.SamenessGroupConfigEntry, error) {
-	return 0, nil, nil
-}
diff --git a/agent/consul/state/config_entry_sameness_group_ce_test.go b/agent/consul/state/config_entry_sameness_group_ce_test.go
deleted file mode 100644
index 3d307238f3329..0000000000000
--- a/agent/consul/state/config_entry_sameness_group_ce_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package state
-
-import (
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/stretchr/testify/require"
-	"testing"
-)
-
-func TestStore_SamenessGroup_checkSamenessGroup(t *testing.T) {
-	s := testStateStore(t)
-	err := s.EnsureConfigEntry(0, &structs.SamenessGroupConfigEntry{
-		Name: "sg1",
-	})
-	require.ErrorContains(t, err, "sameness-groups are an enterprise-only feature")
-}
diff --git a/agent/consul/state/config_entry_schema.go b/agent/consul/state/config_entry_schema.go
index c662415252966..e99068d10450c 100644
--- a/agent/consul/state/config_entry_schema.go
+++ b/agent/consul/state/config_entry_schema.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -14,12 +11,9 @@ import (
 const (
 	tableConfigEntries = "config-entries"
 
-	indexLink                 = "link"
-	indexIntentionLegacyID    = "intention-legacy-id"
-	indexSource               = "intention-source"
-	indexSourceSamenessGroup  = "intention-source-sameness-group"
-	indexSamenessGroupMember  = "sameness-group-member"
-	indexSamenessGroupDefault = "sameness-group-default-for-failover"
+	indexLink              = "link"
+	indexIntentionLegacyID = "intention-legacy-id"
+	indexSource            = "intention-source"
 )
 
 // configTableSchema returns a new table schema used to store global
@@ -56,24 +50,6 @@ func configTableSchema() *memdb.TableSchema {
 				Unique:       false,
 				Indexer:      &ServiceIntentionSourceIndex{},
 			},
-			indexSourceSamenessGroup: {
-				Name:         indexSourceSamenessGroup,
-				AllowMissing: true,
-				Unique:       false,
-				Indexer:      &ServiceIntentionSourceSamenessGroupIndex{},
-			},
-			indexSamenessGroupMember: {
-				Name:         indexSamenessGroupMember,
-				AllowMissing: true,
-				Unique:       false,
-				Indexer:      &SamenessGroupMemberIndex{},
-			},
-			indexSamenessGroupDefault: {
-				Name:         indexSamenessGroupDefault,
-				AllowMissing: true,
-				Unique:       true,
-				Indexer:      &SamenessGroupDefaultIndex{},
-			},
 		},
 	}
 }
@@ -91,7 +67,6 @@ type configEntryIndexable interface {
 }
 
 var _ configEntryIndexable = (*structs.ExportedServicesConfigEntry)(nil)
-var _ configEntryIndexable = (*structs.SamenessGroupConfigEntry)(nil)
 var _ configEntryIndexable = (*structs.IngressGatewayConfigEntry)(nil)
 var _ configEntryIndexable = (*structs.MeshConfigEntry)(nil)
 var _ configEntryIndexable = (*structs.ProxyConfigEntry)(nil)
@@ -101,7 +76,6 @@ var _ configEntryIndexable = (*structs.ServiceResolverConfigEntry)(nil)
 var _ configEntryIndexable = (*structs.ServiceRouterConfigEntry)(nil)
 var _ configEntryIndexable = (*structs.ServiceSplitterConfigEntry)(nil)
 var _ configEntryIndexable = (*structs.TerminatingGatewayConfigEntry)(nil)
-var _ configEntryIndexable = (*structs.JWTProviderConfigEntry)(nil)
 
 func indexFromConfigEntry(c structs.ConfigEntry) ([]byte, error) {
 	if c.GetName() == "" || c.GetKind() == "" {
diff --git a/agent/consul/state/config_entry_test.go b/agent/consul/state/config_entry_test.go
index af9dc0997156d..5253a20278e11 100644
--- a/agent/consul/state/config_entry_test.go
+++ b/agent/consul/state/config_entry_test.go
@@ -1,23 +1,14 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
-	"fmt"
 	"testing"
 	"time"
 
 	memdb "github.com/hashicorp/go-memdb"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/configentry"
-	"github.com/hashicorp/consul/agent/consul/discoverychain"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
@@ -1663,280 +1654,6 @@ func TestStore_ConfigEntry_GraphValidation(t *testing.T) {
 			},
 			expectErr: `cannot introduce new discovery chain targets like`,
 		},
-		"can redirect a peer exported http service to another service": {
-			entries: []structs.ConfigEntry{
-				&structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "main",
-					Protocol: "http",
-				},
-				&structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "other",
-					Protocol: "http",
-				},
-				&structs.ExportedServicesConfigEntry{
-					Name: "default",
-					Services: []structs.ExportedService{{
-						Name:      "main",
-						Consumers: []structs.ServiceConsumer{{Peer: "my-peer"}},
-					}},
-				},
-			},
-			opAdd: &structs.ServiceResolverConfigEntry{
-				Kind: structs.ServiceResolver,
-				Name: "main",
-				Redirect: &structs.ServiceResolverRedirect{
-					Service: "other",
-				},
-			},
-		},
-		"cannot redirect a peer exported http service to another peer service": {
-			entries: []structs.ConfigEntry{
-				&structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "main",
-					Protocol: "http",
-				},
-				&structs.ExportedServicesConfigEntry{
-					Name: "default",
-					Services: []structs.ExportedService{{
-						Name:      "main",
-						Consumers: []structs.ServiceConsumer{{Peer: "my-peer"}},
-					}},
-				},
-			},
-			opAdd: &structs.ServiceResolverConfigEntry{
-				Kind: structs.ServiceResolver,
-				Name: "main",
-				Redirect: &structs.ServiceResolverRedirect{
-					Service: "other",
-					Peer:    "something",
-				},
-			},
-			expectErr: `contains cross-peer resolver redirect`,
-		},
-		"cannot redirect a peer exported http service to a service in another datacenter": {
-			entries: []structs.ConfigEntry{
-				&structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "main",
-					Protocol: "http",
-				},
-				&structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "other",
-					Protocol: "http",
-				},
-				&structs.ExportedServicesConfigEntry{
-					Name: "default",
-					Services: []structs.ExportedService{{
-						Name:      "main",
-						Consumers: []structs.ServiceConsumer{{Peer: "my-peer"}},
-					}},
-				},
-			},
-			opAdd: &structs.ServiceResolverConfigEntry{
-				Kind: structs.ServiceResolver,
-				Name: "main",
-				Redirect: &structs.ServiceResolverRedirect{
-					Service:    "other",
-					Datacenter: "dc12",
-				},
-			},
-			expectErr: `contains cross-datacenter resolver redirect`,
-		},
-		"can failover a peer exported http service to another service": {
-			entries: []structs.ConfigEntry{
-				&structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "main",
-					Protocol: "http",
-				},
-				&structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "other",
-					Protocol: "http",
-				},
-				&structs.ExportedServicesConfigEntry{
-					Name: "default",
-					Services: []structs.ExportedService{{
-						Name:      "main",
-						Consumers: []structs.ServiceConsumer{{Peer: "my-peer"}},
-					}},
-				},
-			},
-			opAdd: &structs.ServiceResolverConfigEntry{
-				Kind: structs.ServiceResolver,
-				Name: "main",
-				Failover: map[string]structs.ServiceResolverFailover{
-					"*": {
-						Service: "other",
-					},
-				},
-			},
-		},
-		"can failover a peer exported http service to another peer service": {
-			entries: []structs.ConfigEntry{
-				&structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "main",
-					Protocol: "http",
-				},
-				&structs.ExportedServicesConfigEntry{
-					Name: "default",
-					Services: []structs.ExportedService{{
-						Name:      "main",
-						Consumers: []structs.ServiceConsumer{{Peer: "my-peer"}},
-					}},
-				},
-			},
-			opAdd: &structs.ServiceResolverConfigEntry{
-				Kind: structs.ServiceResolver,
-				Name: "main",
-				Failover: map[string]structs.ServiceResolverFailover{
-					"*": {
-						Targets: []structs.ServiceResolverFailoverTarget{
-							{
-								Service: "other",
-								Peer:    "some-peer",
-							},
-						},
-					},
-				},
-			},
-		},
-		"can't failover a peer exported http service to another service in a different datacenter": {
-			entries: []structs.ConfigEntry{
-				&structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "main",
-					Protocol: "http",
-				},
-				&structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "other",
-					Protocol: "http",
-				},
-				&structs.ExportedServicesConfigEntry{
-					Name: "default",
-					Services: []structs.ExportedService{{
-						Name:      "main",
-						Consumers: []structs.ServiceConsumer{{Peer: "my-peer"}},
-					}},
-				},
-			},
-			opAdd: &structs.ServiceResolverConfigEntry{
-				Kind: structs.ServiceResolver,
-				Name: "main",
-				Failover: map[string]structs.ServiceResolverFailover{
-					"*": {
-						Service:     "other",
-						Datacenters: []string{"dc12"},
-					},
-				},
-			},
-			expectErr: `contains cross-datacenter failover`,
-		},
-		"can't failover a peer exported http service to another service in a different datacenter using targets": {
-			entries: []structs.ConfigEntry{
-				&structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "main",
-					Protocol: "http",
-				},
-				&structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "other",
-					Protocol: "http",
-				},
-				&structs.ExportedServicesConfigEntry{
-					Name: "default",
-					Services: []structs.ExportedService{{
-						Name:      "main",
-						Consumers: []structs.ServiceConsumer{{Peer: "my-peer"}},
-					}},
-				},
-			},
-			opAdd: &structs.ServiceResolverConfigEntry{
-				Kind: structs.ServiceResolver,
-				Name: "main",
-				Failover: map[string]structs.ServiceResolverFailover{
-					"*": {
-						Targets: []structs.ServiceResolverFailoverTarget{
-							{
-								Service:    "other",
-								Datacenter: "dc12",
-							},
-						},
-					},
-				},
-			},
-			expectErr: `contains cross-datacenter failover`,
-		},
-		"can failover a peer exported tcp service": {
-			entries: []structs.ConfigEntry{
-				&structs.ExportedServicesConfigEntry{
-					Name: "default",
-					Services: []structs.ExportedService{{
-						Name:      "main",
-						Consumers: []structs.ServiceConsumer{{Peer: "my-peer"}},
-					}},
-				},
-			},
-			opAdd: &structs.ServiceResolverConfigEntry{
-				Kind: structs.ServiceResolver,
-				Name: "main",
-				Failover: map[string]structs.ServiceResolverFailover{
-					"*": {
-						Targets: []structs.ServiceResolverFailoverTarget{
-							{
-								Service: "other",
-							},
-							{
-								Service: "other",
-								Peer:    "cluster-01",
-							},
-						},
-					},
-				},
-			},
-		},
-		"can failover a peer exported tcp service from a redirect": {
-			entries: []structs.ConfigEntry{
-				&structs.ExportedServicesConfigEntry{
-					Name: "default",
-					Services: []structs.ExportedService{{
-						Name:      "main",
-						Consumers: []structs.ServiceConsumer{{Peer: "my-peer"}},
-					}},
-				},
-				&structs.ServiceResolverConfigEntry{
-					Kind: structs.ServiceResolver,
-					Name: "other",
-					Redirect: &structs.ServiceResolverRedirect{
-						Service: "main",
-					},
-				},
-			},
-			opAdd: &structs.ServiceResolverConfigEntry{
-				Kind: structs.ServiceResolver,
-				Name: "main",
-				Failover: map[string]structs.ServiceResolverFailover{
-					"*": {
-						Targets: []structs.ServiceResolverFailoverTarget{
-							{
-								Service: "another",
-							},
-							{
-								Service: "other",
-								Peer:    "cluster-01",
-							},
-						},
-					},
-				},
-			},
-		},
 	}
 
 	for name, tc := range cases {
@@ -2348,53 +2065,6 @@ func TestStore_ReadDiscoveryChainConfigEntries_SubsetSplit(t *testing.T) {
 	require.Len(t, entrySet.Services, 1)
 }
 
-func TestStore_ReadDiscoveryChainConfigEntries_FetchPeers(t *testing.T) {
-	s := testConfigStateStore(t)
-
-	entries := []structs.ConfigEntry{
-		&structs.ServiceConfigEntry{
-			Kind:     structs.ServiceDefaults,
-			Name:     "main",
-			Protocol: "http",
-		},
-		&structs.ServiceResolverConfigEntry{
-			Kind: structs.ServiceResolver,
-			Name: "main",
-			Failover: map[string]structs.ServiceResolverFailover{
-				"*": {
-					Targets: []structs.ServiceResolverFailoverTarget{
-						{Peer: "cluster-01"},
-						{Peer: "cluster-02"}, // Non-existant
-					},
-				},
-			},
-		},
-	}
-
-	for _, entry := range entries {
-		require.NoError(t, s.EnsureConfigEntry(0, entry))
-	}
-
-	cluster01Peering := &pbpeering.Peering{
-		ID:   testFooPeerID,
-		Name: "cluster-01",
-	}
-	err := s.PeeringWrite(0, &pbpeering.PeeringWriteRequest{Peering: cluster01Peering})
-	require.NoError(t, err)
-
-	_, entrySet, err := s.readDiscoveryChainConfigEntries(nil, "main", nil, nil)
-	require.NoError(t, err)
-
-	require.Len(t, entrySet.Routers, 0)
-	require.Len(t, entrySet.Splitters, 0)
-	require.Len(t, entrySet.Resolvers, 1)
-	require.Len(t, entrySet.Services, 1)
-	prototest.AssertDeepEqual(t, entrySet.Peers, map[string]*pbpeering.Peering{
-		"cluster-01": cluster01Peering,
-		"cluster-02": nil,
-	})
-}
-
 // TODO(rb): add ServiceIntentions tests
 
 func TestStore_ValidateGatewayNamesCannotBeShared(t *testing.T) {
@@ -3313,579 +2983,3 @@ func TestStore_ValidateServiceIntentionsErrorOnIncompatibleProtocols(t *testing.
 		})
 	}
 }
-
-func TestStateStore_ConfigEntry_VirtualIP(t *testing.T) {
-	createServiceInstance := func(t *testing.T, s *Store, name string) {
-		ns1 := &structs.NodeService{
-			ID:      name,
-			Service: name,
-			Address: "1.1.1.1",
-			Port:    1111,
-			Connect: structs.ServiceConnect{Native: true},
-		}
-		require.NoError(t, s.EnsureService(0, "node1", ns1))
-	}
-	deleteServiceInstance := func(t *testing.T, s *Store, name string) {
-		require.NoError(t, s.DeleteService(0, "node1", name, nil, ""))
-	}
-	createServiceResolver := func(t *testing.T, s *Store, name string) {
-		require.NoError(t, s.EnsureConfigEntry(0, &structs.ServiceResolverConfigEntry{
-			Kind: structs.ServiceResolver,
-			Name: name,
-		}))
-	}
-	createServiceRouter := func(t *testing.T, s *Store, name string) {
-		require.NoError(t, s.EnsureConfigEntry(0, &structs.ServiceRouterConfigEntry{
-			Kind: structs.ServiceRouter,
-			Name: name,
-		}))
-	}
-	createServiceSplitter := func(t *testing.T, s *Store, name string) {
-		require.NoError(t, s.EnsureConfigEntry(0, &structs.ServiceSplitterConfigEntry{
-			Kind: structs.ServiceSplitter,
-			Name: name,
-			Splits: []structs.ServiceSplit{
-				{Weight: 100},
-			},
-		}))
-	}
-	deleteConfigEntry := func(t *testing.T, s *Store, kind, name string) {
-		require.NoError(t, s.DeleteConfigEntry(0, kind, name, nil))
-	}
-	ensureVirtualIP := func(t *testing.T, s *Store, service string, value string) {
-		vip, err := s.VirtualIPForService(structs.PeeredServiceName{ServiceName: structs.ServiceName{Name: service}})
-		require.NoError(t, err)
-		require.Equal(t, value, vip)
-	}
-
-	testVIPStateStore := func(t *testing.T) *Store {
-		s := testStateStore(t)
-		setVirtualIPFlags(t, s)
-		testRegisterNode(t, s, 0, "node1")
-		s.EnsureConfigEntry(0, &structs.ProxyConfigEntry{
-			Kind: structs.ProxyDefaults,
-			Name: structs.ProxyConfigGlobal,
-			Config: map[string]interface{}{
-				"protocol": "http",
-			},
-		})
-		return s
-	}
-
-	cases := []struct {
-		kind       string
-		createFunc func(*testing.T, *Store, string)
-	}{
-		{
-			kind:       structs.ServiceResolver,
-			createFunc: createServiceResolver,
-		},
-		{
-			kind:       structs.ServiceRouter,
-			createFunc: createServiceRouter,
-		},
-		{
-			kind:       structs.ServiceSplitter,
-			createFunc: createServiceSplitter,
-		},
-	}
-	for _, tc := range cases {
-		t.Run(fmt.Sprintf("create and delete %s with no service instances", tc.kind), func(t *testing.T) {
-			s := testVIPStateStore(t)
-
-			// Create unrelated service instance
-			createServiceInstance(t, s, "unrelated")
-
-			// Create the config entry and make sure a virtual ip is allocated
-			ensureVirtualIP(t, s, "foo", "")
-			tc.createFunc(t, s, "foo")
-			ensureVirtualIP(t, s, "foo", "240.0.0.2")
-
-			// Delete the config entry and make sure the virtual ip is freed and reused
-			ensureVirtualIP(t, s, "bar", "")
-			deleteConfigEntry(t, s, tc.kind, "foo")
-			ensureVirtualIP(t, s, "foo", "")
-			tc.createFunc(t, s, "bar")
-			ensureVirtualIP(t, s, "bar", "240.0.0.2")
-		})
-
-		t.Run(fmt.Sprintf("create and delete %s with service instances", tc.kind), func(t *testing.T) {
-			s := testVIPStateStore(t)
-
-			// Create a foo service instance and an unrelated service instance
-			createServiceInstance(t, s, "foo")
-
-			// Creating the config entry should not affect the service virtual IP
-			ensureVirtualIP(t, s, "foo", "240.0.0.1")
-			tc.createFunc(t, s, "foo")
-			ensureVirtualIP(t, s, "foo", "240.0.0.1")
-
-			// Deleting should also not affect the service virtual IP because there are still existing
-			// service instances that need the VIP.
-			deleteConfigEntry(t, s, tc.kind, "foo")
-			ensureVirtualIP(t, s, "foo", "240.0.0.1")
-
-			// Now delete the service instance, which should free up the virtual IP
-			deleteServiceInstance(t, s, "foo")
-			ensureVirtualIP(t, s, "foo", "")
-
-			// Make sure the free address can be reused
-			tc.createFunc(t, s, "bar")
-			ensureVirtualIP(t, s, "bar", "240.0.0.1")
-		})
-
-		t.Run(fmt.Sprintf("create and delete service instance while %s still exists", tc.kind), func(t *testing.T) {
-			s := testVIPStateStore(t)
-
-			// Create the config entry to get the virtual IP
-			tc.createFunc(t, s, "foo")
-			ensureVirtualIP(t, s, "foo", "240.0.0.1")
-
-			// Creating service instance should not affect virtual IP
-			createServiceInstance(t, s, "foo")
-			ensureVirtualIP(t, s, "foo", "240.0.0.1")
-
-			// Deleting should also not affect the service virtual IP because the config entry still exists.
-			deleteServiceInstance(t, s, "foo")
-			ensureVirtualIP(t, s, "foo", "240.0.0.1")
-
-			// Now delete the config entry, which should free up the ip
-			deleteConfigEntry(t, s, tc.kind, "foo")
-			ensureVirtualIP(t, s, "foo", "")
-
-			// Make sure the free address can be reused
-			tc.createFunc(t, s, "bar")
-			ensureVirtualIP(t, s, "bar", "240.0.0.1")
-		})
-	}
-}
-
-func TestStore_MutualTLSMode_Validation_InitialWrite(t *testing.T) {
-	cases := []struct {
-		// setup
-		mesh *structs.MeshConfigEntry
-
-		mtlsMode structs.MutualTLSMode
-		expErr   error
-	}{
-		// Mesh config entry does not exist. Should default to AllowEnablingPermissiveMutualTLS=false.
-		{
-			mtlsMode: structs.MutualTLSModeDefault,
-		},
-		{
-			mtlsMode: structs.MutualTLSModeStrict,
-		},
-		{
-			mtlsMode: structs.MutualTLSModePermissive,
-			expErr:   permissiveModeNotAllowedError,
-		},
-
-		// Mesh config entry contains AllowEnablingPermissiveMutualTLS=false
-		{
-			mesh:     &structs.MeshConfigEntry{},
-			mtlsMode: structs.MutualTLSModeDefault,
-		},
-		{
-			mesh:     &structs.MeshConfigEntry{},
-			mtlsMode: structs.MutualTLSModeStrict,
-		},
-		{
-			mesh:     &structs.MeshConfigEntry{},
-			mtlsMode: structs.MutualTLSModePermissive,
-			expErr:   permissiveModeNotAllowedError,
-		},
-
-		// Mesh config entry exists with AllowEnablingPermissiveMutualTLS=true.
-		{
-			mesh:     &structs.MeshConfigEntry{AllowEnablingPermissiveMutualTLS: true},
-			mtlsMode: structs.MutualTLSModeDefault,
-		},
-		{
-			mesh:     &structs.MeshConfigEntry{AllowEnablingPermissiveMutualTLS: true},
-			mtlsMode: structs.MutualTLSModeStrict,
-		},
-		{
-			mesh:     &structs.MeshConfigEntry{AllowEnablingPermissiveMutualTLS: true},
-			mtlsMode: structs.MutualTLSModePermissive,
-		},
-	}
-	for _, c := range cases {
-		c := c
-		var name string
-		if c.mesh == nil {
-			name = fmt.Sprintf("when mesh config entry not found")
-		} else {
-			name = fmt.Sprintf("when AllowEnablingPermissiveMutualTLS=%v", c.mesh.AllowEnablingPermissiveMutualTLS)
-		}
-		if c.expErr != nil {
-			name += " cannot"
-		} else {
-			name += " can"
-		}
-		name += fmt.Sprintf(" set MutualTLSMode=%q", c.mtlsMode)
-		t.Run(name, func(t *testing.T) {
-			s := testConfigStateStore(t)
-
-			var err error
-			var idx uint64
-			if c.mesh != nil {
-				idx, err = writeConfigAndBumpIndexForTest(s, idx, c.mesh)
-				require.NoError(t, err)
-			}
-
-			idx, err = writeConfigAndBumpIndexForTest(s, idx, &structs.ProxyConfigEntry{
-				Kind:          structs.ProxyDefaults,
-				Name:          structs.ProxyConfigGlobal,
-				MutualTLSMode: c.mtlsMode,
-			})
-			require.Equal(t, c.expErr, err)
-
-			_, err = writeConfigAndBumpIndexForTest(s, idx, &structs.ServiceConfigEntry{
-				Kind:          structs.ServiceDefaults,
-				Name:          "test-svc",
-				MutualTLSMode: c.mtlsMode,
-			})
-			require.Equal(t, c.expErr, err)
-		})
-	}
-}
-
-func TestStore_MutualTLSMode_Validation_SubsequentWrite(t *testing.T) {
-	cases := []struct {
-		allowPermissive bool
-		initialModes    []structs.MutualTLSMode
-		transitions     map[structs.MutualTLSMode]error
-	}{
-		{
-			allowPermissive: false,
-			initialModes: []structs.MutualTLSMode{
-				structs.MutualTLSModeDefault,
-				structs.MutualTLSModeStrict,
-			},
-			transitions: map[structs.MutualTLSMode]error{
-				structs.MutualTLSModeDefault: nil,
-				structs.MutualTLSModeStrict:  nil,
-				// Cannot transition from "" -> "permissive"
-				// Cannot transition from "strict" -> "permissive"
-				structs.MutualTLSModePermissive: permissiveModeNotAllowedError,
-			},
-		},
-		{
-			allowPermissive: false,
-			initialModes: []structs.MutualTLSMode{
-				structs.MutualTLSModePermissive,
-			},
-			transitions: map[structs.MutualTLSMode]error{
-				structs.MutualTLSModeDefault: nil,
-				structs.MutualTLSModeStrict:  nil,
-				// Can transition from "permissive" -> "permissive"
-				structs.MutualTLSModePermissive: nil,
-			},
-		},
-		{
-			allowPermissive: true,
-			initialModes: []structs.MutualTLSMode{
-				structs.MutualTLSModeDefault,
-				structs.MutualTLSModeStrict,
-				structs.MutualTLSModePermissive,
-			},
-			transitions: map[structs.MutualTLSMode]error{
-				// Can transition from any mode to any other mode when allowPermissive=true
-				structs.MutualTLSModeDefault:    nil,
-				structs.MutualTLSModeStrict:     nil,
-				structs.MutualTLSModePermissive: nil,
-			},
-		},
-	}
-	for _, c := range cases {
-		c := c
-
-		for _, initialMode := range c.initialModes {
-			for newMode, expErr := range c.transitions {
-				name := fmt.Sprintf("when AllowEnablingPermissiveMutualTLS=%v", c.allowPermissive)
-				if expErr != nil {
-					name += " cannot"
-				} else {
-					name += " can"
-				}
-				name += fmt.Sprintf(" transition MutualTLSMode from %q to %q", initialMode, newMode)
-				t.Run(name, func(t *testing.T) {
-					s := testConfigStateStore(t)
-
-					// Setup initial state.
-					idx, err := writeConfigAndBumpIndexForTest(s, 0, &structs.MeshConfigEntry{
-						AllowEnablingPermissiveMutualTLS: true, // set to true to allow writing any initial mode.
-					})
-					require.NoError(t, err)
-
-					idx, err = writeConfigAndBumpIndexForTest(s, idx, &structs.ProxyConfigEntry{
-						Kind:          structs.ProxyDefaults,
-						Name:          structs.ProxyConfigGlobal,
-						MutualTLSMode: initialMode,
-					})
-					require.NoError(t, err)
-
-					idx, err = writeConfigAndBumpIndexForTest(s, idx, &structs.ServiceConfigEntry{
-						Kind:          structs.ServiceDefaults,
-						Name:          "test-svc",
-						MutualTLSMode: initialMode,
-					})
-					require.NoError(t, err)
-
-					// Set AllowEnablingPermissiveMutualTLS for the test case.
-					idx, err = writeConfigAndBumpIndexForTest(s, idx, &structs.MeshConfigEntry{
-						AllowEnablingPermissiveMutualTLS: c.allowPermissive,
-					})
-					require.NoError(t, err)
-
-					// Test switching to the other mode.
-					idx, err = writeConfigAndBumpIndexForTest(s, idx, &structs.ProxyConfigEntry{
-						Kind:          structs.ProxyDefaults,
-						Name:          structs.ProxyConfigGlobal,
-						MutualTLSMode: newMode,
-					})
-					require.Equal(t, expErr, err)
-
-					_, err = writeConfigAndBumpIndexForTest(s, idx, &structs.ServiceConfigEntry{
-						Kind:          structs.ServiceDefaults,
-						Name:          "test-svc",
-						MutualTLSMode: newMode,
-					})
-					require.Equal(t, expErr, err)
-				})
-
-			}
-		}
-	}
-}
-
-func writeConfigAndBumpIndexForTest(s *Store, idx uint64, entry structs.ConfigEntry) (uint64, error) {
-	err := s.EnsureConfigEntry(idx, entry)
-	if err == nil {
-		idx++
-	}
-	return idx, err
-}
-
-func TestStateStore_DiscoveryChain_AttachVirtualIPs(t *testing.T) {
-	s := testStateStore(t)
-	setVirtualIPFlags(t, s)
-
-	ca := &structs.CAConfiguration{
-		Provider: "consul",
-	}
-	err := s.CASetConfig(0, ca)
-	require.NoError(t, err)
-
-	// Attempt to assign manual virtual IPs to a service that doesn't exist - should be a no-op.
-	psn := structs.PeeredServiceName{ServiceName: structs.ServiceName{Name: "foo", EnterpriseMeta: *acl.DefaultEnterpriseMeta()}}
-
-	// Register a service via config entry.
-	s.EnsureConfigEntry(1, &structs.ServiceResolverConfigEntry{
-		Kind: structs.ServiceResolver,
-		Name: "foo",
-	})
-
-	vip, err := s.VirtualIPForService(psn)
-	require.NoError(t, err)
-	assert.Equal(t, "240.0.0.1", vip)
-
-	// Assign manual virtual IPs for foo
-	found, _, err := s.AssignManualServiceVIPs(2, psn, []string{"2.2.2.2", "3.3.3.3"})
-	require.NoError(t, err)
-	require.True(t, found)
-
-	serviceVIP, err := s.ServiceManualVIPs(psn)
-	require.NoError(t, err)
-	require.Equal(t, uint64(2), serviceVIP.ModifyIndex)
-	require.Equal(t, "0.0.0.1", serviceVIP.IP.String())
-	require.Equal(t, []string{"2.2.2.2", "3.3.3.3"}, serviceVIP.ManualIPs)
-
-	req := discoverychain.CompileRequest{
-		ServiceName:          "foo",
-		EvaluateInNamespace:  psn.ServiceName.NamespaceOrDefault(),
-		EvaluateInPartition:  psn.ServiceName.PartitionOrDefault(),
-		EvaluateInDatacenter: "dc1",
-	}
-	idx, chain, _, err := s.ServiceDiscoveryChain(nil, "foo", structs.DefaultEnterpriseMetaInDefaultPartition(), req)
-	require.NoError(t, err)
-	require.Equal(t, uint64(1), idx)
-	require.Equal(t, []string{"240.0.0.1"}, chain.AutoVirtualIPs)
-	require.Equal(t, []string{"2.2.2.2", "3.3.3.3"}, chain.ManualVirtualIPs)
-
-}
-
-func TestFindJWTProviderNameReferences(t *testing.T) {
-	oktaProvider := structs.IntentionJWTProvider{Name: "okta"}
-	auth0Provider := structs.IntentionJWTProvider{Name: "auth0"}
-	cases := map[string]struct {
-		entries       []structs.ConfigEntry
-		providerName  string
-		expectedError string
-	}{
-		"no jwt at any level": {
-			entries:      []structs.ConfigEntry{},
-			providerName: "okta",
-		},
-		"provider not referenced": {
-			entries: []structs.ConfigEntry{
-				&structs.ServiceIntentionsConfigEntry{
-					Kind: "service-intentions",
-					Name: "api-intention",
-					JWT: &structs.IntentionJWTRequirement{
-						Providers: []*structs.IntentionJWTProvider{&oktaProvider, &auth0Provider},
-					},
-				},
-			},
-			providerName: "fake-provider",
-		},
-		"only top level jwt with no permissions": {
-			entries: []structs.ConfigEntry{
-				&structs.ServiceIntentionsConfigEntry{
-					Kind: "service-intentions",
-					Name: "api-intention",
-					JWT: &structs.IntentionJWTRequirement{
-						Providers: []*structs.IntentionJWTProvider{&oktaProvider, &auth0Provider},
-					},
-				},
-			},
-			providerName:  "okta",
-			expectedError: "cannot delete jwt provider config entry referenced by an intention. Provider name: okta, intention name: api-intention",
-		},
-		"top level jwt with permissions": {
-			entries: []structs.ConfigEntry{
-				&structs.ServiceIntentionsConfigEntry{
-					Kind: "service-intentions",
-					Name: "api-intention",
-					JWT: &structs.IntentionJWTRequirement{
-						Providers: []*structs.IntentionJWTProvider{&oktaProvider},
-					},
-					Sources: []*structs.SourceIntention{
-						{
-							Name:   "api",
-							Action: "allow",
-							Permissions: []*structs.IntentionPermission{
-								{
-									Action: "allow",
-									JWT: &structs.IntentionJWTRequirement{
-										Providers: []*structs.IntentionJWTProvider{&oktaProvider},
-									},
-								},
-							},
-						},
-						{
-							Name:   "serv",
-							Action: "allow",
-							Permissions: []*structs.IntentionPermission{
-								{
-									Action: "allow",
-									JWT: &structs.IntentionJWTRequirement{
-										Providers: []*structs.IntentionJWTProvider{&auth0Provider},
-									},
-								},
-							},
-						},
-						{
-							Name:   "web",
-							Action: "allow",
-							Permissions: []*structs.IntentionPermission{
-								{Action: "allow"},
-							},
-						},
-					},
-				},
-			},
-			providerName:  "auth0",
-			expectedError: "cannot delete jwt provider config entry referenced by an intention. Provider name: auth0, intention name: api-intention",
-		},
-		"no top level jwt and existing permissions": {
-			entries: []structs.ConfigEntry{
-				&structs.ServiceIntentionsConfigEntry{
-					Kind: "service-intentions",
-					Name: "api-intention",
-					Sources: []*structs.SourceIntention{
-						{
-							Name:   "api",
-							Action: "allow",
-							Permissions: []*structs.IntentionPermission{
-								{
-									Action: "allow",
-									JWT: &structs.IntentionJWTRequirement{
-										Providers: []*structs.IntentionJWTProvider{&oktaProvider},
-									},
-								},
-							},
-						},
-						{
-							Name:   "serv",
-							Action: "allow",
-							Permissions: []*structs.IntentionPermission{
-								{
-									Action: "allow",
-									JWT: &structs.IntentionJWTRequirement{
-										Providers: []*structs.IntentionJWTProvider{&auth0Provider},
-									},
-								},
-							},
-						},
-						{
-							Name:   "web",
-							Action: "allow",
-							Permissions: []*structs.IntentionPermission{
-								{Action: "allow"},
-							},
-						},
-					},
-				},
-			},
-			providerName:  "okta",
-			expectedError: "cannot delete jwt provider config entry referenced by an intention. Provider name: okta, intention name: api-intention",
-		},
-	}
-
-	for name, tt := range cases {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			err := findJWTProviderNameReferences(tt.entries, tt.providerName)
-
-			if tt.expectedError != "" {
-				require.Error(t, err)
-				require.Contains(t, err.Error(), tt.expectedError)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func TestStore_ValidateJWTProviderIsReferenced(t *testing.T) {
-	s := testStateStore(t)
-
-	// First create a config entry
-	provider := &structs.JWTProviderConfigEntry{
-		Kind: structs.JWTProvider,
-		Name: "okta",
-	}
-	require.NoError(t, s.EnsureConfigEntry(0, provider))
-
-	// create a service intention referencing the config entry
-	ixn := &structs.ServiceIntentionsConfigEntry{
-		Name: "api",
-		JWT: &structs.IntentionJWTRequirement{
-			Providers: []*structs.IntentionJWTProvider{
-				{Name: provider.Name},
-			},
-		},
-	}
-	require.NoError(t, s.EnsureConfigEntry(1, ixn))
-
-	// attempt deleting a referenced provider
-	err := s.DeleteConfigEntry(0, structs.JWTProvider, provider.Name, nil)
-	require.Error(t, err)
-	require.Contains(t, err.Error(), `cannot delete jwt provider config entry referenced by an intention. Provider name: okta, intention name: api`)
-
-	// delete the intention
-	require.NoError(t, s.DeleteConfigEntry(1, structs.ServiceIntentions, ixn.Name, nil))
-	// successfully delete the provider after deleting the intention
-	require.NoError(t, s.DeleteConfigEntry(0, structs.JWTProvider, provider.Name, nil))
-}
diff --git a/agent/consul/state/connect_ca.go b/agent/consul/state/connect_ca.go
index 4b1eeeab783d4..b07031147002f 100644
--- a/agent/consul/state/connect_ca.go
+++ b/agent/consul/state/connect_ca.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/connect_ca_events.go b/agent/consul/state/connect_ca_events.go
index a285b9d07cb75..36fe8ce35186e 100644
--- a/agent/consul/state/connect_ca_events.go
+++ b/agent/consul/state/connect_ca_events.go
@@ -1,13 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // EventTopicCARoots is the streaming topic to which events will be published
diff --git a/agent/consul/state/connect_ca_events_test.go b/agent/consul/state/connect_ca_events_test.go
index 79df8df5be879..ebd52b333201b 100644
--- a/agent/consul/state/connect_ca_events_test.go
+++ b/agent/consul/state/connect_ca_events_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/connect_ca_test.go b/agent/consul/state/connect_ca_test.go
index 2a49723d65cbc..0a39e76323024 100644
--- a/agent/consul/state/connect_ca_test.go
+++ b/agent/consul/state/connect_ca_test.go
@@ -1,13 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 
 	"github.com/hashicorp/go-memdb"
diff --git a/agent/consul/state/coordinate.go b/agent/consul/state/coordinate.go
index bcd71e5a0f08d..19ae722f824b6 100644
--- a/agent/consul/state/coordinate.go
+++ b/agent/consul/state/coordinate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/coordinate_ce.go b/agent/consul/state/coordinate_ce.go
index 000c3714c794b..8c86b768a0043 100644
--- a/agent/consul/state/coordinate_ce.go
+++ b/agent/consul/state/coordinate_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/coordinate_ce_test.go b/agent/consul/state/coordinate_ce_test.go
index b80a7b8ae832f..d5d15547be90b 100644
--- a/agent/consul/state/coordinate_ce_test.go
+++ b/agent/consul/state/coordinate_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/coordinate_test.go b/agent/consul/state/coordinate_test.go
index dad0ce3e32ec6..0335ac5f41563 100644
--- a/agent/consul/state/coordinate_test.go
+++ b/agent/consul/state/coordinate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/deep-copy.sh b/agent/consul/state/deep-copy.sh
index 809e20432b624..d976d921f3c83 100755
--- a/agent/consul/state/deep-copy.sh
+++ b/agent/consul/state/deep-copy.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 readonly PACKAGE_DIR="$(dirname "${BASH_SOURCE[0]}")"
 cd $PACKAGE_DIR
diff --git a/agent/consul/state/delay_ce.go b/agent/consul/state/delay_ce.go
index d0d2013cb0c8b..8167d6bfe4d02 100644
--- a/agent/consul/state/delay_ce.go
+++ b/agent/consul/state/delay_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/delay_test.go b/agent/consul/state/delay_test.go
index 6a2d0fa80c2d6..0653a14468ef3 100644
--- a/agent/consul/state/delay_test.go
+++ b/agent/consul/state/delay_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/events.go b/agent/consul/state/events.go
index 0d4f4eb4fe403..f17f38f657632 100644
--- a/agent/consul/state/events.go
+++ b/agent/consul/state/events.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -9,7 +6,7 @@ import (
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/consul/stream"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // PBToStreamSubscribeRequest takes a protobuf subscribe request and enterprise
@@ -45,8 +42,8 @@ func PBToStreamSubscribeRequest(req *pbsubscribe.SubscribeRequest, entMeta acl.E
 			}
 		case EventTopicMeshConfig, EventTopicServiceResolver, EventTopicIngressGateway,
 			EventTopicServiceIntentions, EventTopicServiceDefaults, EventTopicAPIGateway,
-			EventTopicTCPRoute, EventTopicHTTPRoute, EventTopicJWTProvider, EventTopicInlineCertificate,
-			EventTopicBoundAPIGateway, EventTopicSamenessGroup:
+			EventTopicTCPRoute, EventTopicHTTPRoute, EventTopicInlineCertificate,
+			EventTopicBoundAPIGateway:
 			subject = EventSubjectConfigEntry{
 				Name:           named.Key,
 				EnterpriseMeta: &entMeta,
diff --git a/agent/consul/state/events_test.go b/agent/consul/state/events_test.go
index c2a4ad399d641..cf231148d5c5c 100644
--- a/agent/consul/state/events_test.go
+++ b/agent/consul/state/events_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -11,7 +8,7 @@ import (
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/consul/stream"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 const aclToken = "67b04fbc-e35f-494a-ad43-739f1c8b839c"
@@ -84,32 +81,6 @@ func TestPBToStreamSubscribeRequest(t *testing.T) {
 			},
 			err: nil,
 		},
-		"Sameness Group": {
-			req: &pbsubscribe.SubscribeRequest{
-				Topic: EventTopicSamenessGroup,
-				Subject: &pbsubscribe.SubscribeRequest_NamedSubject{
-					NamedSubject: &pbsubscribe.NamedSubject{
-						Key:       "sg",
-						Namespace: "consul",
-						Partition: "partition",
-						PeerName:  "peer",
-					},
-				},
-				Token: aclToken,
-				Index: 2,
-			},
-			entMeta: acl.EnterpriseMeta{},
-			expectedSubscribeRequest: &stream.SubscribeRequest{
-				Topic: EventTopicSamenessGroup,
-				Subject: EventSubjectConfigEntry{
-					Name:           "sg",
-					EnterpriseMeta: &acl.EnterpriseMeta{},
-				},
-				Token: aclToken,
-				Index: 2,
-			},
-			err: nil,
-		},
 		"Config": {
 			req: &pbsubscribe.SubscribeRequest{
 				Topic: EventTopicAPIGateway,
diff --git a/agent/consul/state/federation_state.go b/agent/consul/state/federation_state.go
index a02a38ed3b532..c7eababf262f7 100644
--- a/agent/consul/state/federation_state.go
+++ b/agent/consul/state/federation_state.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/graveyard.go b/agent/consul/state/graveyard.go
index 45398584356cf..7058468811395 100644
--- a/agent/consul/state/graveyard.go
+++ b/agent/consul/state/graveyard.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/graveyard_ce.go b/agent/consul/state/graveyard_ce.go
index c39a8c335ec5c..bccbe1ec72c54 100644
--- a/agent/consul/state/graveyard_ce.go
+++ b/agent/consul/state/graveyard_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/graveyard_test.go b/agent/consul/state/graveyard_test.go
index 66aaaf92fb143..f8452be09df16 100644
--- a/agent/consul/state/graveyard_test.go
+++ b/agent/consul/state/graveyard_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/index_connect_test.go b/agent/consul/state/index_connect_test.go
index 7b5404b5b2a8e..9331318e55d74 100644
--- a/agent/consul/state/index_connect_test.go
+++ b/agent/consul/state/index_connect_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/indexer.go b/agent/consul/state/indexer.go
index c752b3af55cfc..83f205a2f8fc2 100644
--- a/agent/consul/state/indexer.go
+++ b/agent/consul/state/indexer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/intention.go b/agent/consul/state/intention.go
index f360555228586..c7bc8ea56ee42 100644
--- a/agent/consul/state/intention.go
+++ b/agent/consul/state/intention.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -740,8 +737,7 @@ type IntentionDecisionOpts struct {
 	Target           string
 	Namespace        string
 	Partition        string
-	Peer             string
-	Intentions       structs.SimplifiedIntentions
+	Intentions       structs.Intentions
 	MatchType        structs.IntentionMatchType
 	DefaultDecision  acl.EnforcementDecision
 	AllowPermissions bool
@@ -756,7 +752,7 @@ func (s *Store) IntentionDecision(opts IntentionDecisionOpts) (structs.Intention
 	// Figure out which source matches this request.
 	var ixnMatch *structs.Intention
 	for _, ixn := range opts.Intentions {
-		if _, ok := connect.AuthorizeIntentionTarget(opts.Target, opts.Namespace, opts.Partition, opts.Peer, ixn, opts.MatchType); ok {
+		if _, ok := connect.AuthorizeIntentionTarget(opts.Target, opts.Namespace, opts.Partition, ixn, opts.MatchType); ok {
 			ixnMatch = ixn
 			break
 		}
@@ -806,58 +802,10 @@ func (s *Store) IntentionMatch(ws memdb.WatchSet, args *structs.IntentionQueryMa
 	if err != nil {
 		return 0, nil, err
 	}
-
 	if !usingConfigEntries {
-		idx, ixnsList, err := s.legacyIntentionMatchTxn(tx, ws, args)
-		if err != nil {
-			return 0, nil, err
-		}
-
-		return idx, ixnsList, nil
+		return s.legacyIntentionMatchTxn(tx, ws, args)
 	}
-
-	maxIdx, ixnsList, err := s.configIntentionMatchTxn(tx, ws, args)
-	if err != nil {
-		return 0, nil, err
-	}
-
-	if args.WithSamenessGroups {
-		return maxIdx, ixnsList, err
-	}
-
-	// Non-legacy intentions support sameness groups. We need to simplify them.
-	var out []structs.Intentions
-	for i, ixns := range ixnsList {
-		entry := args.Entries[i]
-		idx, simplifiedIxns, err := getSimplifiedIntentions(tx, ws, ixns)
-		if err != nil {
-			return 0, nil, err
-		}
-		if idx > maxIdx {
-			maxIdx = idx
-		}
-
-		filteredIxns := filterIntentionsMatching(simplifiedIxns, args.Type, entry.GetEnterpriseMeta().PartitionOrDefault())
-
-		out = append(out, filteredIxns)
-	}
-
-	return maxIdx, out, nil
-}
-
-func filterIntentionsMatching(ixns structs.Intentions, matchType structs.IntentionMatchType, partition string) structs.Intentions {
-	var filteredIxns structs.Intentions
-	if matchType == structs.IntentionMatchSource {
-		for _, ixn := range ixns {
-			if partition == ixn.SourcePartitionOrDefault() {
-				filteredIxns = append(filteredIxns, ixn)
-			}
-		}
-	} else {
-		filteredIxns = ixns
-	}
-
-	return filteredIxns
+	return s.configIntentionMatchTxn(tx, ws, args)
 }
 
 func (s *Store) legacyIntentionMatchTxn(tx ReadTxn, ws memdb.WatchSet, args *structs.IntentionQueryMatch) (uint64, []structs.Intentions, error) {
@@ -896,7 +844,7 @@ func (s *Store) IntentionMatchOne(
 	entry structs.IntentionMatchEntry,
 	matchType structs.IntentionMatchType,
 	destinationType structs.IntentionTargetType,
-) (uint64, structs.SimplifiedIntentions, error) {
+) (uint64, structs.Intentions, error) {
 	tx := s.db.Txn(false)
 	defer tx.Abort()
 
@@ -909,37 +857,16 @@ func compatIntentionMatchOneTxn(
 	entry structs.IntentionMatchEntry,
 	matchType structs.IntentionMatchType,
 	destinationType structs.IntentionTargetType,
-) (uint64, structs.SimplifiedIntentions, error) {
+) (uint64, structs.Intentions, error) {
 
 	usingConfigEntries, err := areIntentionsInConfigEntries(tx, ws)
 	if err != nil {
 		return 0, nil, err
 	}
 	if !usingConfigEntries {
-		idx, ixns, err := legacyIntentionMatchOneTxn(tx, ws, entry, matchType)
-		if err != nil {
-			return 0, nil, err
-		}
-		return idx, structs.SimplifiedIntentions(ixns), err
-	}
-
-	maxIdx, ixns, err := configIntentionMatchOneTxn(tx, ws, entry, matchType, destinationType)
-	if err != nil {
-		return 0, nil, err
+		return legacyIntentionMatchOneTxn(tx, ws, entry, matchType)
 	}
-
-	idx, simplifiedIxns, err := getSimplifiedIntentions(tx, ws, ixns)
-	if err != nil {
-		return 0, nil, err
-	}
-
-	if idx > maxIdx {
-		maxIdx = idx
-	}
-
-	filteredIxns := filterIntentionsMatching(simplifiedIxns, matchType, entry.GetEnterpriseMeta().PartitionOrDefault())
-
-	return maxIdx, structs.SimplifiedIntentions(filteredIxns), nil
+	return configIntentionMatchOneTxn(tx, ws, entry, matchType, destinationType)
 }
 
 func legacyIntentionMatchOneTxn(
@@ -1085,45 +1012,12 @@ func (s *Store) intentionTopologyTxn(
 	//				 Ideally those should be excluded as well, since they can't be upstreams/downstreams without a proxy.
 	//				 Maybe narrow serviceNamesOfKindTxn to services represented by proxies? (ingress, sidecar-
 	wildcardMeta := structs.WildcardEnterpriseMetaInPartition(structs.WildcardSpecifier)
-
-	services := make(map[structs.ServiceName]struct{})
-	addSvcs := func(svcs []*KindServiceName) {
-		for _, s := range svcs {
-			services[s.Service] = struct{}{}
-		}
-	}
-
-	var tempServices []*KindServiceName
+	var services []*KindServiceName
 	if intentionTarget == structs.IntentionTargetService {
-		index, tempServices, err = serviceNamesOfKindTxn(tx, ws, structs.ServiceKindTypical, *wildcardMeta)
-		if err != nil {
-			return index, nil, fmt.Errorf("failed to list service names: %v", err)
-		}
-		addSvcs(tempServices)
-
-		if !downstreams {
-			// Query the virtual ip table as well to include virtual services that don't have a registered instance yet.
-			// We only need to do this for upstreams currently, so that tproxy can find which discovery chains should be
-			// contacted for failover scenarios. Virtual services technically don't need to be considered as downstreams,
-			// because they will take on the identity of the calling service, rather than the chain itself.
-			vipIndex, vipServices, err := servicesVirtualIPsTxn(tx, ws)
-			if err != nil {
-				return index, nil, fmt.Errorf("failed to list service virtual IPs: %v", err)
-			}
-			for _, svc := range vipServices {
-				services[svc.Service.ServiceName] = struct{}{}
-			}
-			if vipIndex > index {
-				index = vipIndex
-			}
-		}
+		index, services, err = serviceNamesOfKindTxn(tx, ws, structs.ServiceKindTypical, *wildcardMeta)
 	} else {
 		// destinations can only ever be upstream, since they are only allowed as intention destination.
-		index, tempServices, err = serviceNamesOfKindTxn(tx, ws, structs.ServiceKindDestination, *wildcardMeta)
-		if err != nil {
-			return index, nil, fmt.Errorf("failed to list destination service names: %v", err)
-		}
-		addSvcs(tempServices)
+		index, services, err = serviceNamesOfKindTxn(tx, ws, structs.ServiceKindDestination, *wildcardMeta)
 	}
 	if err != nil {
 		return index, nil, fmt.Errorf("failed to list ingress service names: %v", err)
@@ -1141,7 +1035,7 @@ func (s *Store) intentionTopologyTxn(
 		if index > maxIdx {
 			maxIdx = index
 		}
-		addSvcs(ingress)
+		services = append(services, ingress...)
 	}
 
 	// When checking authorization to upstreams, the match type for the decision is `destination` because we are deciding
@@ -1152,7 +1046,8 @@ func (s *Store) intentionTopologyTxn(
 		decisionMatchType = structs.IntentionMatchSource
 	}
 	result := make([]ServiceWithDecision, 0, len(services))
-	for candidate := range services {
+	for _, svc := range services {
+		candidate := svc.Service
 		if candidate.Name == structs.ConsulServiceName {
 			continue
 		}
diff --git a/agent/consul/state/intention_ce.go b/agent/consul/state/intention_ce.go
index 33e9bbe26184e..6c99e6749686f 100644
--- a/agent/consul/state/intention_ce.go
+++ b/agent/consul/state/intention_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
@@ -9,18 +7,9 @@ import (
 	memdb "github.com/hashicorp/go-memdb"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
 )
 
 func intentionListTxn(tx ReadTxn, _ *acl.EnterpriseMeta) (memdb.ResultIterator, error) {
 	// Get all intentions
 	return tx.Get(tableConnectIntentions, "id")
 }
-
-func getSimplifiedIntentions(
-	tx ReadTxn,
-	ws memdb.WatchSet,
-	ixns structs.Intentions,
-) (uint64, structs.Intentions, error) {
-	return 0, ixns, nil
-}
diff --git a/agent/consul/state/intention_test.go b/agent/consul/state/intention_test.go
index 72455565d5821..3c2dac3f28acd 100644
--- a/agent/consul/state/intention_test.go
+++ b/agent/consul/state/intention_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -1270,15 +1267,15 @@ func TestStore_IntentionExact_ConfigEntries(t *testing.T) {
 
 func TestStore_IntentionMatch_ConfigEntries(t *testing.T) {
 	type testcase struct {
-		name          string
-		configEntries []structs.ConfigEntry
-		query         structs.IntentionQueryMatch
-		expect        []structs.Intentions
+		name   string
+		input  []*structs.ServiceIntentionsConfigEntry
+		query  structs.IntentionQueryMatch
+		expect []structs.Intentions
 	}
 	run := func(t *testing.T, tc testcase) {
 		s := testConfigStateStore(t)
 		idx := uint64(0)
-		for _, conf := range tc.configEntries {
+		for _, conf := range tc.input {
 			require.NoError(t, conf.Normalize())
 			require.NoError(t, conf.Validate())
 			idx++
@@ -1300,8 +1297,8 @@ func TestStore_IntentionMatch_ConfigEntries(t *testing.T) {
 	tcs := []testcase{
 		{
 			name: "peered intention matched with destination query",
-			configEntries: []structs.ConfigEntry{
-				&structs.ServiceIntentionsConfigEntry{
+			input: []*structs.ServiceIntentionsConfigEntry{
+				{
 					Kind: structs.ServiceIntentions,
 					Name: "foo",
 					Sources: []*structs.SourceIntention{
@@ -1360,8 +1357,8 @@ func TestStore_IntentionMatch_ConfigEntries(t *testing.T) {
 			// This behavior may change in the future but this test is in place
 			// to ensure peered intentions cannot accidentally be queried by source
 			name: "peered intention cannot be queried by source",
-			configEntries: []structs.ConfigEntry{
-				&structs.ServiceIntentionsConfigEntry{
+			input: []*structs.ServiceIntentionsConfigEntry{
+				{
 					Kind: structs.ServiceIntentions,
 					Name: "foo",
 					Sources: []*structs.SourceIntention{
@@ -2097,7 +2094,6 @@ func disableLegacyIntentions(s *Store) error {
 
 func testConfigStateStore(t *testing.T) *Store {
 	s := testStateStore(t)
-	s.SystemMetadataSet(5, &structs.SystemMetadataEntry{Key: structs.SystemMetadataVirtualIPsEnabled, Value: "true"})
 	disableLegacyIntentions(s)
 	return s
 }
@@ -2162,7 +2158,6 @@ func TestStore_IntentionTopology(t *testing.T) {
 		name            string
 		defaultDecision acl.EnforcementDecision
 		intentions      []structs.ServiceIntentionsConfigEntry
-		discoveryChains []structs.ConfigEntry
 		target          structs.ServiceName
 		downstreams     bool
 		expect          expect
@@ -2194,68 +2189,6 @@ func TestStore_IntentionTopology(t *testing.T) {
 				},
 			},
 		},
-		{
-			name:            "(upstream) acl allow includes virtual service",
-			defaultDecision: acl.Allow,
-			discoveryChains: []structs.ConfigEntry{
-				&structs.ServiceResolverConfigEntry{
-					Kind: structs.ServiceResolver,
-					Name: "backend",
-				},
-			},
-			target:      structs.NewServiceName("web", nil),
-			downstreams: false,
-			expect: expect{
-				idx: 10,
-				services: structs.ServiceList{
-					{
-						Name:           "api",
-						EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
-					},
-					{
-						Name:           "backend",
-						EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
-					},
-					{
-						Name:           "mysql",
-						EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
-					},
-				},
-			},
-		},
-		{
-			name:            "(upstream) acl deny all intentions allow virtual service",
-			defaultDecision: acl.Deny,
-			discoveryChains: []structs.ConfigEntry{
-				&structs.ServiceResolverConfigEntry{
-					Kind: structs.ServiceResolver,
-					Name: "backend",
-				},
-			},
-			intentions: []structs.ServiceIntentionsConfigEntry{
-				{
-					Kind: structs.ServiceIntentions,
-					Name: "backend",
-					Sources: []*structs.SourceIntention{
-						{
-							Name:   "web",
-							Action: structs.IntentionActionAllow,
-						},
-					},
-				},
-			},
-			target:      structs.NewServiceName("web", nil),
-			downstreams: false,
-			expect: expect{
-				idx: 11,
-				services: structs.ServiceList{
-					{
-						Name:           "backend",
-						EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
-					},
-				},
-			},
-		},
 		{
 			name:            "(upstream) acl deny all intentions allow one",
 			defaultDecision: acl.Deny,
@@ -2442,10 +2375,6 @@ func TestStore_IntentionTopology(t *testing.T) {
 				require.NoError(t, s.EnsureConfigEntry(idx, &ixn))
 				idx++
 			}
-			for _, entry := range tt.discoveryChains {
-				require.NoError(t, s.EnsureConfigEntry(idx, entry))
-				idx++
-			}
 
 			idx, got, err := s.IntentionTopology(nil, tt.target, tt.downstreams, tt.defaultDecision, structs.IntentionTargetService)
 			require.NoError(t, err)
@@ -2652,7 +2581,6 @@ func TestStore_IntentionTopology_Destination(t *testing.T) {
 
 func TestStore_IntentionTopology_Watches(t *testing.T) {
 	s := testConfigStateStore(t)
-	s.SystemMetadataSet(10, &structs.SystemMetadataEntry{Key: structs.SystemMetadataVirtualIPsEnabled, Value: "true"})
 
 	var i uint64 = 1
 	require.NoError(t, s.EnsureNode(i, &structs.Node{
@@ -2689,8 +2617,7 @@ func TestStore_IntentionTopology_Watches(t *testing.T) {
 	index, got, err = s.IntentionTopology(ws, target, false, acl.Deny, structs.IntentionTargetService)
 	require.NoError(t, err)
 	require.Equal(t, uint64(2), index)
-	// Because API is a virtual service, it is included in this output.
-	require.Equal(t, structs.ServiceList{structs.NewServiceName("api", nil)}, got)
+	require.Empty(t, got)
 
 	// Watch should not fire after unrelated intention changes
 	require.NoError(t, s.EnsureConfigEntry(i, &structs.ServiceIntentionsConfigEntry{
@@ -2704,6 +2631,7 @@ func TestStore_IntentionTopology_Watches(t *testing.T) {
 		},
 	}))
 	i++
+
 	// TODO(freddy) Why is this firing?
 	// require.False(t, watchFired(ws))
 
@@ -2711,7 +2639,7 @@ func TestStore_IntentionTopology_Watches(t *testing.T) {
 	index, got, err = s.IntentionTopology(ws, target, false, acl.Deny, structs.IntentionTargetService)
 	require.NoError(t, err)
 	require.Equal(t, uint64(3), index)
-	require.Equal(t, structs.ServiceList{structs.NewServiceName("api", nil)}, got)
+	require.Empty(t, got)
 
 	// Watch should fire after service list changes
 	require.NoError(t, s.EnsureService(i, "foo", &structs.NodeService{
diff --git a/agent/consul/state/kvs.go b/agent/consul/state/kvs.go
index b0b4f6c1e52dc..62797125c81b6 100644
--- a/agent/consul/state/kvs.go
+++ b/agent/consul/state/kvs.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/kvs_ce.go b/agent/consul/state/kvs_ce.go
index 69d4c28ad2a4e..149fe2c4706d0 100644
--- a/agent/consul/state/kvs_ce.go
+++ b/agent/consul/state/kvs_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/kvs_ce_test.go b/agent/consul/state/kvs_ce_test.go
index 30e7b22e40d9c..7cee3689387e8 100644
--- a/agent/consul/state/kvs_ce_test.go
+++ b/agent/consul/state/kvs_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/kvs_test.go b/agent/consul/state/kvs_test.go
index b85a08f98d181..842e06ec240cc 100644
--- a/agent/consul/state/kvs_test.go
+++ b/agent/consul/state/kvs_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/memdb.go b/agent/consul/state/memdb.go
index 93707d0e0751d..a0b2f116acb2f 100644
--- a/agent/consul/state/memdb.go
+++ b/agent/consul/state/memdb.go
@@ -1,15 +1,12 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
-	"sync"
+	"fmt"
 
 	"github.com/hashicorp/go-memdb"
 
 	"github.com/hashicorp/consul/agent/consul/stream"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // ReadTxn is implemented by memdb.Txn to perform read operations.
@@ -93,15 +90,23 @@ func (c *changeTrackerDB) ReadTxn() *memdb.Txn {
 // data directly into the DB. These cases may use WriteTxnRestore.
 func (c *changeTrackerDB) WriteTxn(idx uint64) *txn {
 	t := &txn{
-		Txn:        c.db.Txn(true),
-		Index:      idx,
-		publish:    c.publisher.Publish,
-		prePublish: c.processChanges,
+		Txn:     c.db.Txn(true),
+		Index:   idx,
+		publish: c.publish,
 	}
 	t.Txn.TrackChanges()
 	return t
 }
 
+func (c *changeTrackerDB) publish(tx ReadTxn, changes Changes) error {
+	events, err := c.processChanges(tx, changes)
+	if err != nil {
+		return fmt.Errorf("failed generating events from changes: %v", err)
+	}
+	c.publisher.Publish(events)
+	return nil
+}
+
 // WriteTxnRestore returns a wrapped RW transaction that should only be used in
 // Restore where we need to replace the entire contents of the Store.
 // WriteTxnRestore uses a zero index since the whole restore doesn't really
@@ -119,11 +124,6 @@ func (c *changeTrackerDB) WriteTxnRestore() *txn {
 	return t
 }
 
-type prePublishFuncType func(tx ReadTxn, changes Changes) ([]stream.Event, error)
-
-//go:generate mockery --name publishFuncType --inpackage
-type publishFuncType func(events []stream.Event)
-
 // txn wraps a memdb.Txn to capture changes and send them to the EventPublisher.
 //
 // This can not be done with txn.Defer because the callback passed to Defer is
@@ -137,11 +137,7 @@ type txn struct {
 	// Index is stored so that it may be passed along to any subscribers as part
 	// of a change event.
 	Index   uint64
-	publish publishFuncType
-
-	prePublish prePublishFuncType
-
-	commitLock sync.Mutex
+	publish func(tx ReadTxn, changes Changes) error
 }
 
 // Commit first pushes changes to EventPublisher, then calls Commit on the
@@ -162,30 +158,16 @@ func (tx *txn) Commit() error {
 		}
 	}
 
-	// This lock prevents events from concurrent transactions getting published out of order.
-	tx.commitLock.Lock()
-	defer tx.commitLock.Unlock()
-
-	var events []stream.Event
-	var err error
-
-	// prePublish need to generate a list of events before the transaction is commited,
-	// as we loose the changes in the transaction after the call to Commit().
-	if tx.prePublish != nil {
-		events, err = tx.prePublish(tx.Txn, changes)
-		if err != nil {
+	// publish may be nil if this is a read-only or WriteTxnRestore transaction.
+	// In those cases changes should also be empty, and there will be nothing
+	// to publish.
+	if tx.publish != nil {
+		if err := tx.publish(tx.Txn, changes); err != nil {
 			return err
 		}
 	}
 
 	tx.Txn.Commit()
-
-	// publish may be nil if this is a read-only or WriteTxnRestore transaction.
-	// In those cases events should also be empty, and there will be nothing
-	// to publish.
-	if tx.publish != nil {
-		tx.publish(events)
-	}
 	return nil
 }
 
@@ -209,9 +191,6 @@ var (
 	EventTopicHTTPRoute            = pbsubscribe.Topic_HTTPRoute
 	EventTopicInlineCertificate    = pbsubscribe.Topic_InlineCertificate
 	EventTopicBoundAPIGateway      = pbsubscribe.Topic_BoundAPIGateway
-	EventTopicIPRateLimit          = pbsubscribe.Topic_IPRateLimit
-	EventTopicSamenessGroup        = pbsubscribe.Topic_SamenessGroup
-	EventTopicJWTProvider          = pbsubscribe.Topic_JWTProvider
 )
 
 func processDBChanges(tx ReadTxn, changes Changes) ([]stream.Event, error) {
diff --git a/agent/consul/state/memdb_test.go b/agent/consul/state/memdb_test.go
deleted file mode 100644
index e603fc5bb1691..0000000000000
--- a/agent/consul/state/memdb_test.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package state
-
-import (
-	"fmt"
-	"github.com/hashicorp/go-memdb"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/sync/errgroup"
-	"testing"
-	"time"
-)
-
-func testValidSchema() *memdb.DBSchema {
-	return &memdb.DBSchema{
-		Tables: map[string]*memdb.TableSchema{
-			"main": {
-				Name: "main",
-				Indexes: map[string]*memdb.IndexSchema{
-					"id": {
-						Name:    "id",
-						Unique:  true,
-						Indexer: &memdb.StringFieldIndex{Field: "ID"},
-					},
-					"foo": {
-						Name:    "foo",
-						Indexer: &memdb.StringFieldIndex{Field: "Foo"},
-					},
-				},
-			},
-		},
-	}
-}
-
-type TestObject struct {
-	ID  string
-	Foo string
-}
-
-// This test verify that the new data in a TXN is commited at the time that publishFunc is called.
-// To do so, the publish func is mocked, a read on ch1 means that publish is called and blocked,
-// ch2 permit to control the publish func and unblock it when receiving a signal.
-func Test_txn_Commit(t *testing.T) {
-	db, err := memdb.NewMemDB(testValidSchema())
-	require.NoError(t, err)
-	publishFunc := mockPublishFuncType{}
-	tx := txn{
-		Txn:     db.Txn(true),
-		Index:   0,
-		publish: publishFunc.Execute,
-	}
-	ch1 := make(chan struct{})
-	ch2 := make(chan struct{})
-	getCh := make(chan memdb.ResultIterator)
-	group := errgroup.Group{}
-	group.Go(func() error {
-		after := time.After(2 * time.Second)
-		select {
-		case <-ch1:
-			tx2 := txn{
-				Txn:     db.Txn(false),
-				Index:   0,
-				publish: publishFunc.Execute,
-			}
-			get, err := tx2.Get("main", "id")
-			if err != nil {
-				return err
-			}
-			close(ch2)
-			getCh <- get
-		case <-after:
-			close(ch2)
-			return fmt.Errorf("test timed out")
-		}
-		return nil
-	})
-
-	publishFunc.On("Execute", mock.Anything, mock.Anything).Run(func(args mock.Arguments) {
-		close(ch1)
-		<-ch2
-	}).Return(nil)
-
-	err = tx.Insert("main", TestObject{ID: "1", Foo: "foo"})
-	require.NoError(t, err)
-	err = tx.Commit()
-	require.NoError(t, err)
-	get := <-getCh
-	require.NotNil(t, get)
-	next := get.Next()
-	require.NotNil(t, next)
-
-	val := next.(TestObject)
-	require.Equal(t, val.ID, "1")
-	require.Equal(t, val.Foo, "foo")
-
-	err = group.Wait()
-	require.NoError(t, err)
-
-}
diff --git a/agent/consul/state/mock_publishFuncType.go b/agent/consul/state/mock_publishFuncType.go
deleted file mode 100644
index bf1c6a5acb152..0000000000000
--- a/agent/consul/state/mock_publishFuncType.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Code generated by mockery v2.20.0. DO NOT EDIT.
-
-package state
-
-import (
-	stream "github.com/hashicorp/consul/agent/consul/stream"
-	mock "github.com/stretchr/testify/mock"
-)
-
-// mockPublishFuncType is an autogenerated mock type for the publishFuncType type
-type mockPublishFuncType struct {
-	mock.Mock
-}
-
-// Execute provides a mock function with given fields: events
-func (_m *mockPublishFuncType) Execute(events []stream.Event) {
-	_m.Called(events)
-}
-
-type mockConstructorTestingTnewMockPublishFuncType interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// newMockPublishFuncType creates a new instance of mockPublishFuncType. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func newMockPublishFuncType(t mockConstructorTestingTnewMockPublishFuncType) *mockPublishFuncType {
-	mock := &mockPublishFuncType{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/agent/consul/state/operations_ce.go b/agent/consul/state/operations_ce.go
index 00469d6b0c95d..c1a3300ad5804 100644
--- a/agent/consul/state/operations_ce.go
+++ b/agent/consul/state/operations_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/peering.go b/agent/consul/state/peering.go
index 1763777cff838..5fbd1b79f26bf 100644
--- a/agent/consul/state/peering.go
+++ b/agent/consul/state/peering.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -17,7 +14,7 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/lib/maps"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 const (
@@ -594,7 +591,6 @@ func (s *Store) PeeringWrite(idx uint64, req *pbpeering.PeeringWriteRequest) err
 			req.Peering.Remote = &pbpeering.RemoteInfo{
 				Partition:  existing.Remote.Partition,
 				Datacenter: existing.Remote.Datacenter,
-				Locality:   existing.Remote.Locality,
 			}
 		}
 
@@ -774,9 +770,9 @@ func exportedServicesForPeerTxn(
 	maxIdx := peering.ModifyIndex
 
 	entMeta := structs.NodeEnterpriseMetaInPartition(peering.Partition)
-	idx, exportConf, err := getSimplifiedExportedServices(tx, ws, nil, *entMeta)
+	idx, exportConf, err := getExportedServicesConfigEntryTxn(tx, ws, nil, entMeta)
 	if err != nil {
-		return 0, nil, fmt.Errorf("failed to fetch simplified exported-services config entry: %w", err)
+		return 0, nil, fmt.Errorf("failed to fetch exported-services config entry: %w", err)
 	}
 	if idx > maxIdx {
 		maxIdx = idx
@@ -1019,8 +1015,17 @@ func listAllExportedServices(
 	overrides map[configentry.KindName]structs.ConfigEntry,
 	entMeta acl.EnterpriseMeta,
 ) (uint64, map[structs.ServiceName]struct{}, error) {
+	idx, export, err := getExportedServicesConfigEntryTxn(tx, ws, overrides, &entMeta)
+	if err != nil {
+		return 0, nil, err
+	}
+
 	found := make(map[structs.ServiceName]struct{})
-	idx, services, err := listServicesExportedToAnyPeerByConfigEntry(ws, tx, entMeta, overrides)
+	if export == nil {
+		return idx, found, nil
+	}
+
+	_, services, err := listServicesExportedToAnyPeerByConfigEntry(ws, tx, export, overrides)
 	if err != nil {
 		return 0, nil, err
 	}
@@ -1035,25 +1040,16 @@ func listAllExportedServices(
 func listServicesExportedToAnyPeerByConfigEntry(
 	ws memdb.WatchSet,
 	tx ReadTxn,
-	entMeta acl.EnterpriseMeta,
+	conf *structs.ExportedServicesConfigEntry,
 	overrides map[configentry.KindName]structs.ConfigEntry,
 ) (uint64, []structs.ServiceName, error) {
 	var (
-		found  = make(map[structs.ServiceName]struct{})
-		maxIdx uint64
+		entMeta = conf.GetEnterpriseMeta()
+		found   = make(map[structs.ServiceName]struct{})
+		maxIdx  uint64
 	)
-	idx, exports, err := getSimplifiedExportedServices(tx, ws, overrides, entMeta)
-	if err != nil {
-		return 0, nil, err
-	}
-	if idx > maxIdx {
-		maxIdx = idx
-	}
-	if exports == nil {
-		return 0, nil, nil
-	}
 
-	for _, svc := range exports.Services {
+	for _, svc := range conf.Services {
 		svcMeta := acl.NewEnterpriseMetaWithPartition(entMeta.PartitionOrDefault(), svc.Namespace)
 
 		sawPeer := false
@@ -1412,12 +1408,17 @@ func peersForServiceTxn(
 	// Exported service config entries are scoped to partitions so they are in the default namespace.
 	partitionMeta := structs.DefaultEnterpriseMetaInPartition(entMeta.PartitionOrDefault())
 
-	idx, exportedServices, err := getSimplifiedExportedServices(tx, ws, nil, *partitionMeta)
+	idx, rawEntry, err := configEntryTxn(tx, ws, structs.ExportedServices, partitionMeta.PartitionOrDefault(), partitionMeta)
 	if err != nil {
 		return 0, nil, err
 	}
-	if exportedServices == nil {
-		return idx, nil, nil
+	if rawEntry == nil {
+		return idx, nil, err
+	}
+
+	entry, ok := rawEntry.(*structs.ExportedServicesConfigEntry)
+	if !ok {
+		return 0, nil, fmt.Errorf("unexpected type %T for pbpeering.Peering index", rawEntry)
 	}
 
 	var (
@@ -1437,7 +1438,7 @@ func peersForServiceTxn(
 	// 		Namespace: *,     Service: *
 	// 		Namespace: Exact, Service: *
 	// 		Namespace: Exact, Service: Exact
-	for i, service := range exportedServices.Services {
+	for i, service := range entry.Services {
 		switch {
 		case service.Namespace == structs.WildcardSpecifier:
 			wildcardNamespaceIdx = i
@@ -1468,7 +1469,7 @@ func peersForServiceTxn(
 		return idx, results, nil
 	}
 
-	for _, c := range exportedServices.Services[targetIdx].Consumers {
+	for _, c := range entry.Services[targetIdx].Consumers {
 		if c.Peer != "" {
 			results = append(results, c.Peer)
 		}
diff --git a/agent/consul/state/peering_ce.go b/agent/consul/state/peering_ce.go
index 72082689486e8..a331b56489a63 100644
--- a/agent/consul/state/peering_ce.go
+++ b/agent/consul/state/peering_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
@@ -9,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 func indexPeeringFromQuery(q Query) ([]byte, error) {
diff --git a/agent/consul/state/peering_ce_test.go b/agent/consul/state/peering_ce_test.go
index 88546c17855ed..daea60c091ed1 100644
--- a/agent/consul/state/peering_ce_test.go
+++ b/agent/consul/state/peering_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
@@ -9,7 +7,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 func testIndexerTablePeering() map[string]indexerTestCase {
diff --git a/agent/consul/state/peering_test.go b/agent/consul/state/peering_test.go
index 764286bb77b8e..81933500d2f29 100644
--- a/agent/consul/state/peering_test.go
+++ b/agent/consul/state/peering_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -14,9 +11,8 @@ import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
@@ -1265,10 +1261,6 @@ func TestStore_PeeringWrite(t *testing.T) {
 					Remote: &pbpeering.RemoteInfo{
 						Partition:  "part1",
 						Datacenter: "datacenter1",
-						Locality: &pbcommon.Locality{
-							Region: "us-west-1",
-							Zone:   "us-west-1a",
-						},
 					},
 				},
 			},
@@ -1280,10 +1272,6 @@ func TestStore_PeeringWrite(t *testing.T) {
 					Remote: &pbpeering.RemoteInfo{
 						Partition:  "part1",
 						Datacenter: "datacenter1",
-						Locality: &pbcommon.Locality{
-							Region: "us-west-1",
-							Zone:   "us-west-1a",
-						},
 					},
 				},
 				secrets: &pbpeering.PeeringSecrets{
@@ -1315,10 +1303,6 @@ func TestStore_PeeringWrite(t *testing.T) {
 					Remote: &pbpeering.RemoteInfo{
 						Partition:  "part1",
 						Datacenter: "datacenter1",
-						Locality: &pbcommon.Locality{
-							Region: "us-west-1",
-							Zone:   "us-west-1a",
-						},
 					},
 				},
 				secrets: &pbpeering.PeeringSecrets{
@@ -1348,10 +1332,6 @@ func TestStore_PeeringWrite(t *testing.T) {
 					Remote: &pbpeering.RemoteInfo{
 						Partition:  "part1",
 						Datacenter: "datacenter1",
-						Locality: &pbcommon.Locality{
-							Region: "us-west-1",
-							Zone:   "us-west-1a",
-						},
 					},
 				},
 				secrets: &pbpeering.PeeringSecrets{
@@ -1381,10 +1361,6 @@ func TestStore_PeeringWrite(t *testing.T) {
 					Remote: &pbpeering.RemoteInfo{
 						Partition:  "part1",
 						Datacenter: "datacenter1",
-						Locality: &pbcommon.Locality{
-							Region: "us-west-1",
-							Zone:   "us-west-1a",
-						},
 					},
 				},
 				// Secrets for baz should have been deleted
@@ -1413,10 +1389,6 @@ func TestStore_PeeringWrite(t *testing.T) {
 					Remote: &pbpeering.RemoteInfo{
 						Partition:  "part1",
 						Datacenter: "datacenter1",
-						Locality: &pbcommon.Locality{
-							Region: "us-west-1",
-							Zone:   "us-west-1a",
-						},
 					},
 					// Meta should be unchanged.
 					Meta: nil,
@@ -1444,10 +1416,6 @@ func TestStore_PeeringWrite(t *testing.T) {
 					Remote: &pbpeering.RemoteInfo{
 						Partition:  "part1",
 						Datacenter: "datacenter1",
-						Locality: &pbcommon.Locality{
-							Region: "us-west-1",
-							Zone:   "us-west-1a",
-						},
 					},
 				},
 				secrets: nil,
@@ -1475,10 +1443,6 @@ func TestStore_PeeringWrite(t *testing.T) {
 					Remote: &pbpeering.RemoteInfo{
 						Partition:  "part1",
 						Datacenter: "datacenter1",
-						Locality: &pbcommon.Locality{
-							Region: "us-west-1",
-							Zone:   "us-west-1a",
-						},
 					},
 				},
 				// Secrets for baz should have been deleted
@@ -1505,10 +1469,6 @@ func TestStore_PeeringWrite(t *testing.T) {
 					Remote: &pbpeering.RemoteInfo{
 						Partition:  "part1",
 						Datacenter: "datacenter1",
-						Locality: &pbcommon.Locality{
-							Region: "us-west-1",
-							Zone:   "us-west-1a",
-						},
 					},
 				},
 				// Secrets for baz should have been deleted
diff --git a/agent/consul/state/prepared_query.go b/agent/consul/state/prepared_query.go
index 62cf39588d17a..bf4aecb0f5d97 100644
--- a/agent/consul/state/prepared_query.go
+++ b/agent/consul/state/prepared_query.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/prepared_query_index.go b/agent/consul/state/prepared_query_index.go
index 83bb5dc738251..b3c30807aa38e 100644
--- a/agent/consul/state/prepared_query_index.go
+++ b/agent/consul/state/prepared_query_index.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/prepared_query_index_test.go b/agent/consul/state/prepared_query_index_test.go
index aaaa62692f1cf..b81a6126760f8 100644
--- a/agent/consul/state/prepared_query_index_test.go
+++ b/agent/consul/state/prepared_query_index_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/prepared_query_test.go b/agent/consul/state/prepared_query_test.go
index dc902de4ad309..6c66b9eeec3d3 100644
--- a/agent/consul/state/prepared_query_test.go
+++ b/agent/consul/state/prepared_query_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/query.go b/agent/consul/state/query.go
index 288e715e83314..2e4a78869008c 100644
--- a/agent/consul/state/query.go
+++ b/agent/consul/state/query.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/query_ce.go b/agent/consul/state/query_ce.go
index 809f35279987c..d68a9b258edb3 100644
--- a/agent/consul/state/query_ce.go
+++ b/agent/consul/state/query_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/schema.go b/agent/consul/state/schema.go
index 0934ca483e5eb..cdce6d9792337 100644
--- a/agent/consul/state/schema.go
+++ b/agent/consul/state/schema.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/schema_ce.go b/agent/consul/state/schema_ce.go
index 7dce71a038f99..fbe3cd7e56fbf 100644
--- a/agent/consul/state/schema_ce.go
+++ b/agent/consul/state/schema_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/schema_ce_test.go b/agent/consul/state/schema_ce_test.go
index 9ed597acf6562..77581d0d9784d 100644
--- a/agent/consul/state/schema_ce_test.go
+++ b/agent/consul/state/schema_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/schema_test.go b/agent/consul/state/schema_test.go
index a0af2223e27ce..89adf14a2e6d6 100644
--- a/agent/consul/state/schema_test.go
+++ b/agent/consul/state/schema_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -10,7 +7,7 @@ import (
 	"github.com/hashicorp/go-memdb"
 	"github.com/stretchr/testify/require"
 
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 type indexerTestCase struct {
diff --git a/agent/consul/state/session.go b/agent/consul/state/session.go
index d57b05947d396..72d0791661bca 100644
--- a/agent/consul/state/session.go
+++ b/agent/consul/state/session.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/session_ce.go b/agent/consul/state/session_ce.go
index 2fa24878541cb..40e0b280afa9c 100644
--- a/agent/consul/state/session_ce.go
+++ b/agent/consul/state/session_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/session_test.go b/agent/consul/state/session_test.go
index 08f7ad09d0c1f..a4eae8a5073da 100644
--- a/agent/consul/state/session_test.go
+++ b/agent/consul/state/session_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/state_store.go b/agent/consul/state/state_store.go
index dff3441535bb5..598409a2cef5d 100644
--- a/agent/consul/state/state_store.go
+++ b/agent/consul/state/state_store.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/state_store_ce_test.go b/agent/consul/state/state_store_ce_test.go
index ca57cf1aface8..99f6d2950ad80 100644
--- a/agent/consul/state/state_store_ce_test.go
+++ b/agent/consul/state/state_store_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/state_store_test.go b/agent/consul/state/state_store_test.go
index 751ecee779dee..e1b1bbc4ded80 100644
--- a/agent/consul/state/state_store_test.go
+++ b/agent/consul/state/state_store_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -15,7 +12,7 @@ import (
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/types"
 )
 
@@ -189,37 +186,6 @@ func testRegisterServiceWithChangeOpts(t *testing.T, s *Store, idx uint64, nodeI
 	return svc
 }
 
-// testRegisterServiceWithMeta registers service with Meta passed as arg.
-func testRegisterServiceWithMeta(t *testing.T, s *Store, idx uint64, nodeID, serviceID string, meta map[string]string, opts ...func(service *structs.NodeService)) *structs.NodeService {
-	svc := &structs.NodeService{
-		ID:      serviceID,
-		Service: serviceID,
-		Address: "1.1.1.1",
-		Port:    1111,
-		Meta:    meta,
-	}
-	for _, o := range opts {
-		o(svc)
-	}
-
-	if err := s.EnsureService(idx, nodeID, svc); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	tx := s.db.Txn(false)
-	defer tx.Abort()
-	service, err := tx.First(tableServices, indexID, NodeServiceQuery{Node: nodeID, Service: serviceID, PeerName: svc.PeerName})
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	if result, ok := service.(*structs.ServiceNode); !ok ||
-		result.Node != nodeID ||
-		result.ServiceID != serviceID {
-		t.Fatalf("bad service: %#v", result)
-	}
-	return svc
-}
-
 // testRegisterService register a service with given transaction idx
 // If the service already exists, transaction number might not be increased
 // Use `testRegisterServiceWithChange()` if you want perform a registration that
diff --git a/agent/consul/state/store_integration_test.go b/agent/consul/state/store_integration_test.go
index 25a91c558646f..0d28880aa381c 100644
--- a/agent/consul/state/store_integration_test.go
+++ b/agent/consul/state/store_integration_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -13,7 +10,7 @@ import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 func TestStore_IntegrationWithEventPublisher_ACLTokenUpdate(t *testing.T) {
diff --git a/agent/consul/state/system_metadata.go b/agent/consul/state/system_metadata.go
index 06e2d3cc598b9..029ab8898bffa 100644
--- a/agent/consul/state/system_metadata.go
+++ b/agent/consul/state/system_metadata.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/system_metadata_test.go b/agent/consul/state/system_metadata_test.go
index c2ac97b390b8c..dbb196b4c3fee 100644
--- a/agent/consul/state/system_metadata_test.go
+++ b/agent/consul/state/system_metadata_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/tombstone_gc.go b/agent/consul/state/tombstone_gc.go
index 6eab5b6b5ba91..c20fd34004d29 100644
--- a/agent/consul/state/tombstone_gc.go
+++ b/agent/consul/state/tombstone_gc.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/tombstone_gc_test.go b/agent/consul/state/tombstone_gc_test.go
index def4c9af19720..d1aa5581d6c89 100644
--- a/agent/consul/state/tombstone_gc_test.go
+++ b/agent/consul/state/tombstone_gc_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/txn.go b/agent/consul/state/txn.go
index 30189fc1ed602..af6e989955bb9 100644
--- a/agent/consul/state/txn.go
+++ b/agent/consul/state/txn.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/txn_test.go b/agent/consul/state/txn_test.go
index bda004a63a3b6..a7694089b0e77 100644
--- a/agent/consul/state/txn_test.go
+++ b/agent/consul/state/txn_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/state/usage.go b/agent/consul/state/usage.go
index 20515e2e7b0cd..dd693225e0a2c 100644
--- a/agent/consul/state/usage.go
+++ b/agent/consul/state/usage.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
@@ -424,11 +421,6 @@ func (s *Store) ServiceUsage(ws memdb.WatchSet) (uint64, structs.ServiceUsage, e
 		return 0, structs.ServiceUsage{}, fmt.Errorf("failed services lookup: %s", err)
 	}
 
-	nodes, err := firstUsageEntry(ws, tx, tableNodes)
-	if err != nil {
-		return 0, structs.ServiceUsage{}, fmt.Errorf("failed nodes lookup: %s", err)
-	}
-
 	serviceKindInstances := make(map[string]int)
 	for _, kind := range allConnectKind {
 		usage, err := firstUsageEntry(ws, tx, connectUsageTableName(kind))
@@ -448,7 +440,6 @@ func (s *Store) ServiceUsage(ws memdb.WatchSet) (uint64, structs.ServiceUsage, e
 		Services:                 services.Count,
 		ConnectServiceInstances:  serviceKindInstances,
 		BillableServiceInstances: billableServiceInstances.Count,
-		Nodes:                    nodes.Count,
 	}
 	results, err := compileEnterpriseServiceUsage(ws, tx, usage)
 	if err != nil {
diff --git a/agent/consul/state/usage_ce.go b/agent/consul/state/usage_ce.go
index 679d114232d07..6279c10970d4d 100644
--- a/agent/consul/state/usage_ce.go
+++ b/agent/consul/state/usage_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package state
 
diff --git a/agent/consul/state/usage_test.go b/agent/consul/state/usage_test.go
index 4195779b8c037..2699ef6f22324 100644
--- a/agent/consul/state/usage_test.go
+++ b/agent/consul/state/usage_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/agent/consul/stats_fetcher.go b/agent/consul/stats_fetcher.go
index 94e122f2b4389..334472be5c300 100644
--- a/agent/consul/stats_fetcher.go
+++ b/agent/consul/stats_fetcher.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/stats_fetcher_test.go b/agent/consul/stats_fetcher_test.go
index 8dc9ce9eb2880..018f3ccc91361 100644
--- a/agent/consul/stats_fetcher_test.go
+++ b/agent/consul/stats_fetcher_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/status_endpoint.go b/agent/consul/status_endpoint.go
index bca454e25eb0f..b82baf8426263 100644
--- a/agent/consul/status_endpoint.go
+++ b/agent/consul/status_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/status_endpoint_test.go b/agent/consul/status_endpoint_test.go
index d4cf5cb7798b9..c531de7789cac 100644
--- a/agent/consul/status_endpoint_test.go
+++ b/agent/consul/status_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/stream/event.go b/agent/consul/stream/event.go
index df8160d2dd366..aade425bb2762 100644
--- a/agent/consul/stream/event.go
+++ b/agent/consul/stream/event.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 /*
 Package stream provides a publish/subscribe system for events produced by changes
 to the state store.
@@ -11,7 +8,7 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // Topic is an identifier that partitions events. A subscription will only receive
diff --git a/agent/consul/stream/event_buffer.go b/agent/consul/stream/event_buffer.go
index 08060306e8d64..b28d38a540c03 100644
--- a/agent/consul/stream/event_buffer.go
+++ b/agent/consul/stream/event_buffer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package stream
 
 import (
diff --git a/agent/consul/stream/event_buffer_test.go b/agent/consul/stream/event_buffer_test.go
index 892a14d733e1a..afc9728b6f907 100644
--- a/agent/consul/stream/event_buffer_test.go
+++ b/agent/consul/stream/event_buffer_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package stream
 
 import (
diff --git a/agent/consul/stream/event_publisher.go b/agent/consul/stream/event_publisher.go
index bb6d87f8bacf2..06591fe6456ff 100644
--- a/agent/consul/stream/event_publisher.go
+++ b/agent/consul/stream/event_publisher.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package stream
 
 import (
diff --git a/agent/consul/stream/event_publisher_test.go b/agent/consul/stream/event_publisher_test.go
index 4ae53ebcbf8f3..652747d3967a2 100644
--- a/agent/consul/stream/event_publisher_test.go
+++ b/agent/consul/stream/event_publisher_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package stream
 
 import (
@@ -12,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
diff --git a/agent/consul/stream/event_snapshot.go b/agent/consul/stream/event_snapshot.go
index 40c9f3d007d50..19caa6d689ee5 100644
--- a/agent/consul/stream/event_snapshot.go
+++ b/agent/consul/stream/event_snapshot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package stream
 
 // eventSnapshot represents the state of memdb for a given topic and key at some
diff --git a/agent/consul/stream/event_snapshot_test.go b/agent/consul/stream/event_snapshot_test.go
index 8a6d4e27c6bf5..5e3b1c6d1a76f 100644
--- a/agent/consul/stream/event_snapshot_test.go
+++ b/agent/consul/stream/event_snapshot_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package stream
 
 import (
diff --git a/agent/consul/stream/event_test.go b/agent/consul/stream/event_test.go
index 22afe390de9c7..a9b381fe4d37e 100644
--- a/agent/consul/stream/event_test.go
+++ b/agent/consul/stream/event_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package stream
 
 import (
diff --git a/agent/consul/stream/noop.go b/agent/consul/stream/noop.go
index 65fcbb3fb7770..37cd0dbff076f 100644
--- a/agent/consul/stream/noop.go
+++ b/agent/consul/stream/noop.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package stream
 
 import (
diff --git a/agent/consul/stream/string_types.go b/agent/consul/stream/string_types.go
index 2d0cb656777d3..568f972991b2d 100644
--- a/agent/consul/stream/string_types.go
+++ b/agent/consul/stream/string_types.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package stream
 
 // StringSubject can be used as a Subject for Events sent to the EventPublisher
diff --git a/agent/consul/stream/subscription.go b/agent/consul/stream/subscription.go
index 23911eff2e657..9e6c47e6f080b 100644
--- a/agent/consul/stream/subscription.go
+++ b/agent/consul/stream/subscription.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package stream
 
 import (
diff --git a/agent/consul/stream/subscription_test.go b/agent/consul/stream/subscription_test.go
index fd4af464ee532..80aed3dbb3ac5 100644
--- a/agent/consul/stream/subscription_test.go
+++ b/agent/consul/stream/subscription_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package stream
 
 import (
diff --git a/agent/consul/subscribe_backend.go b/agent/consul/subscribe_backend.go
index c73dea18136af..a82bb98c0b28d 100644
--- a/agent/consul/subscribe_backend.go
+++ b/agent/consul/subscribe_backend.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/subscribe_backend_test.go b/agent/consul/subscribe_backend_test.go
index 8d0f7a501ca1e..5b88c5f1e8102 100644
--- a/agent/consul/subscribe_backend_test.go
+++ b/agent/consul/subscribe_backend_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
@@ -22,8 +19,8 @@ import (
 	"github.com/hashicorp/consul/agent/grpc-internal/resolver"
 	"github.com/hashicorp/consul/agent/router"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbservice"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbservice"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/testrpc"
 )
diff --git a/agent/consul/system_metadata.go b/agent/consul/system_metadata.go
index f110255aa2e09..5ceb5fc5e7172 100644
--- a/agent/consul/system_metadata.go
+++ b/agent/consul/system_metadata.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/system_metadata_test.go b/agent/consul/system_metadata_test.go
index 75e69786b8dd5..b17790d22469b 100644
--- a/agent/consul/system_metadata_test.go
+++ b/agent/consul/system_metadata_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/tenancy_bridge.go b/agent/consul/tenancy_bridge.go
deleted file mode 100644
index 4e8daa0bc8def..0000000000000
--- a/agent/consul/tenancy_bridge.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package consul
-
-import "github.com/hashicorp/consul/agent/grpc-external/services/resource"
-
-// V1TenancyBridge is used by the resource service to access V1 implementations of
-// partitions and namespaces. This bridge will be removed when V2 implemenations
-// of partitions and namespaces are available.
-type V1TenancyBridge struct {
-	server *Server
-}
-
-func NewV1TenancyBridge(server *Server) resource.TenancyBridge {
-	return &V1TenancyBridge{server: server}
-}
diff --git a/agent/consul/tenancy_bridge_ce.go b/agent/consul/tenancy_bridge_ce.go
deleted file mode 100644
index f2938b156f026..0000000000000
--- a/agent/consul/tenancy_bridge_ce.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package consul
-
-func (b *V1TenancyBridge) PartitionExists(partition string) (bool, error) {
-	if partition == "default" {
-		return true, nil
-	}
-	return false, nil
-}
-
-func (b *V1TenancyBridge) IsPartitionMarkedForDeletion(partition string) (bool, error) {
-	return false, nil
-}
-
-func (b *V1TenancyBridge) NamespaceExists(partition, namespace string) (bool, error) {
-	if partition == "default" && namespace == "default" {
-		return true, nil
-	}
-	return false, nil
-}
-
-func (b *V1TenancyBridge) IsNamespaceMarkedForDeletion(partition, namespace string) (bool, error) {
-	return false, nil
-}
diff --git a/agent/consul/txn_endpoint.go b/agent/consul/txn_endpoint.go
index f39cd502cb170..e528ea725335f 100644
--- a/agent/consul/txn_endpoint.go
+++ b/agent/consul/txn_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/txn_endpoint_test.go b/agent/consul/txn_endpoint_test.go
index ef2ecd13a3f85..1cd33f18d1aee 100644
--- a/agent/consul/txn_endpoint_test.go
+++ b/agent/consul/txn_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/type_registry.go b/agent/consul/type_registry.go
deleted file mode 100644
index d93309159d4bb..0000000000000
--- a/agent/consul/type_registry.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package consul
-
-import (
-	"github.com/hashicorp/consul/internal/auth"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/mesh"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/internal/tenancy"
-)
-
-// NewTypeRegistry returns a registry populated with all supported resource
-// types.
-//
-// Note: the registry includes resource types that may not be suitable for
-// production use (e.g. experimental or development resource types) because
-// it is used in the CLI, where feature flags and other runtime configuration
-// may not be available.
-func NewTypeRegistry() resource.Registry {
-	registry := resource.NewRegistry()
-
-	demo.RegisterTypes(registry)
-	mesh.RegisterTypes(registry)
-	catalog.RegisterTypes(registry)
-	auth.RegisterTypes(registry)
-	tenancy.RegisterTypes(registry)
-
-	return registry
-}
diff --git a/agent/consul/usagemetrics/usagemetrics.go b/agent/consul/usagemetrics/usagemetrics.go
index 9539a743bbe69..e968b9918dfe7 100644
--- a/agent/consul/usagemetrics/usagemetrics.go
+++ b/agent/consul/usagemetrics/usagemetrics.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package usagemetrics
 
 import (
diff --git a/agent/consul/usagemetrics/usagemetrics_ce.go b/agent/consul/usagemetrics/usagemetrics_ce.go
index 71457cbb48a1b..884363b2aa467 100644
--- a/agent/consul/usagemetrics/usagemetrics_ce.go
+++ b/agent/consul/usagemetrics/usagemetrics_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package usagemetrics
 
diff --git a/agent/consul/usagemetrics/usagemetrics_ce_test.go b/agent/consul/usagemetrics/usagemetrics_ce_test.go
index d0b7587d068c1..85888bc1a7d47 100644
--- a/agent/consul/usagemetrics/usagemetrics_ce_test.go
+++ b/agent/consul/usagemetrics/usagemetrics_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package usagemetrics
 
@@ -19,7 +17,7 @@ import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/version"
 )
@@ -377,22 +375,6 @@ var baseCases = map[string]testCase{
 					{Name: "kind", Value: "exported-services"},
 				},
 			},
-			"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=sameness-group": { // Legacy
-				Name:  "consul.usage.test.consul.state.config_entries",
-				Value: 0,
-				Labels: []metrics.Label{
-					{Name: "datacenter", Value: "dc1"},
-					{Name: "kind", Value: "sameness-group"},
-				},
-			},
-			"consul.usage.test.state.config_entries;datacenter=dc1;kind=sameness-group": {
-				Name:  "consul.usage.test.state.config_entries",
-				Value: 0,
-				Labels: []metrics.Label{
-					{Name: "datacenter", Value: "dc1"},
-					{Name: "kind", Value: "sameness-group"},
-				},
-			},
 			"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=api-gateway": { // Legacy
 				Name:  "consul.usage.test.consul.state.config_entries",
 				Value: 0,
@@ -473,38 +455,6 @@ var baseCases = map[string]testCase{
 					{Name: "kind", Value: "tcp-route"},
 				},
 			},
-			"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=jwt-provider": { // Legacy
-				Name:  "consul.usage.test.consul.state.config_entries",
-				Value: 0,
-				Labels: []metrics.Label{
-					{Name: "datacenter", Value: "dc1"},
-					{Name: "kind", Value: "jwt-provider"},
-				},
-			},
-			"consul.usage.test.state.config_entries;datacenter=dc1;kind=jwt-provider": {
-				Name:  "consul.usage.test.state.config_entries",
-				Value: 0,
-				Labels: []metrics.Label{
-					{Name: "datacenter", Value: "dc1"},
-					{Name: "kind", Value: "jwt-provider"},
-				},
-			},
-			"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=control-plane-request-limit": {
-				Name:  "consul.usage.test.consul.state.config_entries",
-				Value: 0,
-				Labels: []metrics.Label{
-					{Name: "datacenter", Value: "dc1"},
-					{Name: "kind", Value: "control-plane-request-limit"},
-				},
-			},
-			"consul.usage.test.state.config_entries;datacenter=dc1;kind=control-plane-request-limit": {
-				Name:  "consul.usage.test.state.config_entries",
-				Value: 0,
-				Labels: []metrics.Label{
-					{Name: "datacenter", Value: "dc1"},
-					{Name: "kind", Value: "control-plane-request-limit"},
-				},
-			},
 			// --- version ---
 			fmt.Sprintf("consul.usage.test.version;version=%s;pre_release=%s", versionWithMetadata(), version.VersionPrerelease): {
 				Name:  "consul.usage.test.version",
@@ -877,22 +827,6 @@ var baseCases = map[string]testCase{
 					{Name: "kind", Value: "exported-services"},
 				},
 			},
-			"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=sameness-group": { // Legacy
-				Name:  "consul.usage.test.consul.state.config_entries",
-				Value: 0,
-				Labels: []metrics.Label{
-					{Name: "datacenter", Value: "dc1"},
-					{Name: "kind", Value: "sameness-group"},
-				},
-			},
-			"consul.usage.test.state.config_entries;datacenter=dc1;kind=sameness-group": {
-				Name:  "consul.usage.test.state.config_entries",
-				Value: 0,
-				Labels: []metrics.Label{
-					{Name: "datacenter", Value: "dc1"},
-					{Name: "kind", Value: "sameness-group"},
-				},
-			},
 			"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=api-gateway": { // Legacy
 				Name:  "consul.usage.test.consul.state.config_entries",
 				Value: 0,
@@ -973,38 +907,6 @@ var baseCases = map[string]testCase{
 					{Name: "kind", Value: "tcp-route"},
 				},
 			},
-			"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=jwt-provider": { // Legacy
-				Name:  "consul.usage.test.consul.state.config_entries",
-				Value: 0,
-				Labels: []metrics.Label{
-					{Name: "datacenter", Value: "dc1"},
-					{Name: "kind", Value: "jwt-provider"},
-				},
-			},
-			"consul.usage.test.state.config_entries;datacenter=dc1;kind=jwt-provider": {
-				Name:  "consul.usage.test.state.config_entries",
-				Value: 0,
-				Labels: []metrics.Label{
-					{Name: "datacenter", Value: "dc1"},
-					{Name: "kind", Value: "jwt-provider"},
-				},
-			},
-			"consul.usage.test.consul.state.config_entries;datacenter=dc1;kind=control-plane-request-limit": {
-				Name:  "consul.usage.test.consul.state.config_entries",
-				Value: 0,
-				Labels: []metrics.Label{
-					{Name: "datacenter", Value: "dc1"},
-					{Name: "kind", Value: "control-plane-request-limit"},
-				},
-			},
-			"consul.usage.test.state.config_entries;datacenter=dc1;kind=control-plane-request-limit": {
-				Name:  "consul.usage.test.state.config_entries",
-				Value: 0,
-				Labels: []metrics.Label{
-					{Name: "datacenter", Value: "dc1"},
-					{Name: "kind", Value: "control-plane-request-limit"},
-				},
-			},
 			// --- version ---
 			fmt.Sprintf("consul.usage.test.version;version=%s;pre_release=%s", versionWithMetadata(), version.VersionPrerelease): {
 				Name:  "consul.usage.test.version",
diff --git a/agent/consul/usagemetrics/usagemetrics_test.go b/agent/consul/usagemetrics/usagemetrics_test.go
index 4e48beb0a3b2e..04aea12051151 100644
--- a/agent/consul/usagemetrics/usagemetrics_test.go
+++ b/agent/consul/usagemetrics/usagemetrics_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package usagemetrics
 
 import (
diff --git a/agent/consul/util.go b/agent/consul/util.go
index 0fd88e14c8eb9..e12608ac5fc41 100644
--- a/agent/consul/util.go
+++ b/agent/consul/util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/util_test.go b/agent/consul/util_test.go
index d0a4fcb6842f1..48b608e694ca6 100644
--- a/agent/consul/util_test.go
+++ b/agent/consul/util_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package consul
 
 import (
diff --git a/agent/consul/wanfed/pool.go b/agent/consul/wanfed/pool.go
index 3d083019346d4..6a9d993520538 100644
--- a/agent/consul/wanfed/pool.go
+++ b/agent/consul/wanfed/pool.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package wanfed
 
 import (
diff --git a/agent/consul/wanfed/wanfed.go b/agent/consul/wanfed/wanfed.go
index 7732e05ad39a4..c528500c0a702 100644
--- a/agent/consul/wanfed/wanfed.go
+++ b/agent/consul/wanfed/wanfed.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package wanfed
 
 import (
diff --git a/agent/consul/wanfed/wanfed_test.go b/agent/consul/wanfed/wanfed_test.go
index 8254e9434b367..a4a18fc1714d5 100644
--- a/agent/consul/wanfed/wanfed_test.go
+++ b/agent/consul/wanfed/wanfed_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package wanfed
 
 import (
diff --git a/agent/consul/watch/server_local.go b/agent/consul/watch/server_local.go
index 2bb98fe349df9..e9a45c82ce32d 100644
--- a/agent/consul/watch/server_local.go
+++ b/agent/consul/watch/server_local.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package watch
 
 import (
@@ -16,9 +13,8 @@ import (
 )
 
 var (
-	ErrorNotFound     = errors.New("no data found for query")
-	ErrorNotChanged   = errors.New("data did not change for query")
-	ErrorACLResetData = errors.New("an acl update forced a state reset")
+	ErrorNotFound   = errors.New("no data found for query")
+	ErrorNotChanged = errors.New("data did not change for query")
 
 	errNilContext  = errors.New("cannot call ServerLocalNotify with a nil context")
 	errNilGetStore = errors.New("cannot call ServerLocalNotify without a callback to get a StateStore")
@@ -321,15 +317,8 @@ func serverLocalNotifyRoutine[ResultType any, StoreType StateStore](
 			return
 		}
 
-		// An ACL reset error can be raised so that the index greater-than check is
-		// bypassed. We should not propagate it to the caller.
-		forceReset := errors.Is(err, ErrorACLResetData)
-		if forceReset {
-			err = nil
-		}
-
 		// Check the index to see if we should call notify
-		if minIndex == 0 || minIndex < index || forceReset {
+		if minIndex == 0 || minIndex < index {
 			notify(ctx, correlationID, result, err)
 			minIndex = index
 		}
diff --git a/agent/consul/watch/server_local_test.go b/agent/consul/watch/server_local_test.go
index 84ab8de5739a2..cd803cebab17f 100644
--- a/agent/consul/watch/server_local_test.go
+++ b/agent/consul/watch/server_local_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package watch
 
 import (
diff --git a/agent/consul/xdscapacity/capacity.go b/agent/consul/xdscapacity/capacity.go
index bf3cf4ced02a1..31fb53ea92b9a 100644
--- a/agent/consul/xdscapacity/capacity.go
+++ b/agent/consul/xdscapacity/capacity.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xdscapacity
 
 import (
diff --git a/agent/consul/xdscapacity/capacity_test.go b/agent/consul/xdscapacity/capacity_test.go
index b3a3935a8806f..1b564949c4be5 100644
--- a/agent/consul/xdscapacity/capacity_test.go
+++ b/agent/consul/xdscapacity/capacity_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xdscapacity
 
 import (
diff --git a/agent/coordinate_endpoint.go b/agent/coordinate_endpoint.go
index 60b69244afd5d..a238f52ae6a08 100644
--- a/agent/coordinate_endpoint.go
+++ b/agent/coordinate_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/coordinate_endpoint_test.go b/agent/coordinate_endpoint_test.go
index 508f308d13c7c..71492d909c422 100644
--- a/agent/coordinate_endpoint_test.go
+++ b/agent/coordinate_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/debug/host.go b/agent/debug/host.go
index f863117e547b0..0323508a32829 100644
--- a/agent/debug/host.go
+++ b/agent/debug/host.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package debug
 
 import (
diff --git a/agent/debug/host_test.go b/agent/debug/host_test.go
index dce469b542f2a..1678fcda85511 100644
--- a/agent/debug/host_test.go
+++ b/agent/debug/host_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package debug
 
 import (
diff --git a/agent/delegate_mock_test.go b/agent/delegate_mock_test.go
index a75cf2d1e2624..67ba0abd8d7f2 100644
--- a/agent/delegate_mock_test.go
+++ b/agent/delegate_mock_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -15,7 +12,6 @@ import (
 	"github.com/hashicorp/consul/agent/consul"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
 type delegateMock struct {
@@ -77,7 +73,3 @@ func (m *delegateMock) Stats() map[string]map[string]string {
 func (m *delegateMock) ReloadConfig(config consul.ReloadableConfig) error {
 	return m.Called(config).Error(0)
 }
-
-func (m *delegateMock) ResourceServiceClient() pbresource.ResourceServiceClient {
-	return nil
-}
diff --git a/agent/denylist.go b/agent/denylist.go
index 5fdd8cc9f8721..75a351538af70 100644
--- a/agent/denylist.go
+++ b/agent/denylist.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/denylist_test.go b/agent/denylist_test.go
index dd77e977d94d7..8b13d122008b1 100644
--- a/agent/denylist_test.go
+++ b/agent/denylist_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/discovery_chain_endpoint.go b/agent/discovery_chain_endpoint.go
index 69a5e668f46e1..1b39a90966515 100644
--- a/agent/discovery_chain_endpoint.go
+++ b/agent/discovery_chain_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/discovery_chain_endpoint_test.go b/agent/discovery_chain_endpoint_test.go
index 7e1e9a5524e4f..f83fa49293f71 100644
--- a/agent/discovery_chain_endpoint_test.go
+++ b/agent/discovery_chain_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -285,8 +282,6 @@ func TestDiscoveryChainRead(t *testing.T) {
 						33*time.Second,
 					),
 				},
-				AutoVirtualIPs:   []string{"240.0.0.1"},
-				ManualVirtualIPs: []string{},
 			}
 			if !reflect.DeepEqual(expect, value.Chain) {
 				r.Fatalf("should be equal: expected=%+v, got=%+v", expect, value.Chain)
@@ -335,8 +330,6 @@ func TestDiscoveryChainRead(t *testing.T) {
 			expectTarget_DC1.ID: expectTarget_DC1,
 			expectTarget_DC2.ID: expectTarget_DC2,
 		},
-		AutoVirtualIPs:   []string{"240.0.0.1"},
-		ManualVirtualIPs: []string{},
 	}
 
 	require.True(t, t.Run("POST: read modified chain with overrides (camel case)", func(t *testing.T) {
diff --git a/agent/dns.go b/agent/dns.go
index b55338ea3e671..9f1c5fdd5accd 100644
--- a/agent/dns.go
+++ b/agent/dns.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -416,7 +413,7 @@ func (d *DNSServer) handlePtr(resp dns.ResponseWriter, req *dns.Msg) {
 	args := structs.DCSpecificRequest{
 		Datacenter: datacenter,
 		QueryOptions: structs.QueryOptions{
-			Token:      d.coalesceDNSToken(),
+			Token:      d.agent.tokens.UserToken(),
 			AllowStale: cfg.AllowStale,
 		},
 	}
@@ -452,7 +449,7 @@ func (d *DNSServer) handlePtr(resp dns.ResponseWriter, req *dns.Msg) {
 		sargs := structs.ServiceSpecificRequest{
 			Datacenter: datacenter,
 			QueryOptions: structs.QueryOptions{
-				Token:      d.coalesceDNSToken(),
+				Token:      d.agent.tokens.UserToken(),
 				AllowStale: cfg.AllowStale,
 			},
 			ServiceAddress: serviceAddress,
@@ -513,7 +510,7 @@ func (d *DNSServer) handleQuery(resp dns.ResponseWriter, req *dns.Msg) {
 
 	cfg := d.config.Load().(*dnsConfig)
 
-	// Set up the message response
+	// Setup the message response
 	m := new(dns.Msg)
 	m.SetReply(req)
 	m.Compress = !cfg.DisableCompression
@@ -776,63 +773,54 @@ func (d *DNSServer) dispatch(remoteAddr net.Addr, req, resp *dns.Msg, maxRecursi
 			return invalid()
 		}
 
-		localities, err := d.parseSamenessGroupLocality(cfg, querySuffixes, invalid)
-		if err != nil {
-			return err
+		locality, ok := d.parseLocality(querySuffixes, cfg)
+		if !ok {
+			return invalid()
 		}
 
-		// Loop over the localities and return as soon as a lookup is successful
-		for _, locality := range localities {
-			d.logger.Debug("labels", "querySuffixes", querySuffixes)
-
-			lookup := serviceLookup{
-				Datacenter:        locality.effectiveDatacenter(d.agent.config.Datacenter),
-				PeerName:          locality.peer,
-				Connect:           false,
-				Ingress:           false,
-				MaxRecursionLevel: maxRecursionLevel,
-				EnterpriseMeta:    locality.EnterpriseMeta,
-			}
-			// Only one of dc or peer can be used.
-			if lookup.PeerName != "" {
-				lookup.Datacenter = ""
-			}
-
-			// Support RFC 2782 style syntax
-			if n == 2 && strings.HasPrefix(queryParts[1], "_") && strings.HasPrefix(queryParts[0], "_") {
-				// Grab the tag since we make nuke it if it's tcp
-				tag := queryParts[1][1:]
+		lookup := serviceLookup{
+			Datacenter:        locality.effectiveDatacenter(d.agent.config.Datacenter),
+			PeerName:          locality.peer,
+			Connect:           false,
+			Ingress:           false,
+			MaxRecursionLevel: maxRecursionLevel,
+			EnterpriseMeta:    locality.EnterpriseMeta,
+		}
+		// Only one of dc or peer can be used.
+		if lookup.PeerName != "" {
+			lookup.Datacenter = ""
+		}
 
-				// Treat _name._tcp.service.consul as a default, no need to filter on that tag
-				if tag == "tcp" {
-					tag = ""
-				}
+		// Support RFC 2782 style syntax
+		if n == 2 && strings.HasPrefix(queryParts[1], "_") && strings.HasPrefix(queryParts[0], "_") {
 
-				lookup.Tag = tag
-				lookup.Service = queryParts[0][1:]
-				// _name._tag.service.consul
-			} else {
-				// Consul 0.3 and prior format for SRV queries
-				// Support "." in the label, re-join all the parts
-				tag := ""
-				if n >= 2 {
-					tag = strings.Join(queryParts[:n-1], ".")
-				}
+			// Grab the tag since we make nuke it if it's tcp
+			tag := queryParts[1][1:]
 
-				lookup.Tag = tag
-				lookup.Service = queryParts[n-1]
-				// tag[.tag].name.service.consul
+			// Treat _name._tcp.service.consul as a default, no need to filter on that tag
+			if tag == "tcp" {
+				tag = ""
 			}
 
-			err = d.serviceLookup(cfg, lookup, req, resp)
-			// Return if we are error free right away, otherwise loop again if we can
-			if err == nil {
-				return nil
-			}
+			lookup.Tag = tag
+			lookup.Service = queryParts[0][1:]
+			// _name._tag.service.consul
+			return d.serviceLookup(cfg, lookup, req, resp)
 		}
 
-		// We've exhausted all DNS possibilities so return here
-		return err
+		// Consul 0.3 and prior format for SRV queries
+		// Support "." in the label, re-join all the parts
+		tag := ""
+		if n >= 2 {
+			tag = strings.Join(queryParts[:n-1], ".")
+		}
+
+		lookup.Tag = tag
+		lookup.Service = queryParts[n-1]
+
+		// tag[.tag].name.service.consul
+		return d.serviceLookup(cfg, lookup, req, resp)
+
 	case "connect":
 		if len(queryParts) < 1 {
 			return invalid()
@@ -875,7 +863,7 @@ func (d *DNSServer) dispatch(remoteAddr net.Addr, req, resp *dns.Msg, maxRecursi
 			ServiceName:    queryParts[len(queryParts)-1],
 			EnterpriseMeta: locality.EnterpriseMeta,
 			QueryOptions: structs.QueryOptions{
-				Token: d.coalesceDNSToken(),
+				Token: d.agent.tokens.UserToken(),
 			},
 		}
 		if args.PeerName == "" {
@@ -1093,7 +1081,7 @@ func (d *DNSServer) nodeLookup(cfg *dnsConfig, lookup nodeLookup, req, resp *dns
 		PeerName:   lookup.PeerName,
 		Node:       lookup.Node,
 		QueryOptions: structs.QueryOptions{
-			Token:      d.coalesceDNSToken(),
+			Token:      d.agent.tokens.UserToken(),
 			AllowStale: cfg.AllowStale,
 		},
 		EnterpriseMeta: lookup.EnterpriseMeta,
@@ -1425,7 +1413,7 @@ func (d *DNSServer) lookupServiceNodes(cfg *dnsConfig, lookup serviceLookup) (st
 		ServiceTags: serviceTags,
 		TagFilter:   lookup.Tag != "",
 		QueryOptions: structs.QueryOptions{
-			Token:            d.coalesceDNSToken(),
+			Token:            d.agent.tokens.UserToken(),
 			AllowStale:       cfg.AllowStale,
 			MaxAge:           cfg.CacheMaxAge,
 			UseCache:         cfg.UseCache,
@@ -1503,7 +1491,7 @@ func (d *DNSServer) preparedQueryLookup(cfg *dnsConfig, datacenter, query string
 		Datacenter:    datacenter,
 		QueryIDOrName: query,
 		QueryOptions: structs.QueryOptions{
-			Token:      d.coalesceDNSToken(),
+			Token:      d.agent.tokens.UserToken(),
 			AllowStale: cfg.AllowStale,
 			MaxAge:     cfg.CacheMaxAge,
 		},
@@ -2172,11 +2160,3 @@ func (d *DNSServer) resolveCNAME(cfg *dnsConfig, name string, maxRecursionLevel
 	d.logger.Error("all resolvers failed for name", "name", name)
 	return nil
 }
-
-func (d *DNSServer) coalesceDNSToken() string {
-	if d.agent.tokens.DNSToken() != "" {
-		return d.agent.tokens.DNSToken()
-	} else {
-		return d.agent.tokens.UserToken()
-	}
-}
diff --git a/agent/dns/dns.go b/agent/dns/dns.go
index 1942a1fdd8d23..74d5773e84d2a 100644
--- a/agent/dns/dns.go
+++ b/agent/dns/dns.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package dns
 
 import (
diff --git a/agent/dns/dns_test.go b/agent/dns/dns_test.go
index 3acd2260e0a78..59d92efd0a572 100644
--- a/agent/dns/dns_test.go
+++ b/agent/dns/dns_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package dns
 
 import (
diff --git a/agent/dns/validation.go b/agent/dns/validation.go
index a88aaff2dbcba..8a73b0dd09a8d 100644
--- a/agent/dns/validation.go
+++ b/agent/dns/validation.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package dns
 
 import (
diff --git a/agent/dns/validation_test.go b/agent/dns/validation_test.go
index 8855e375c5f9c..b4b44a7f891ed 100644
--- a/agent/dns/validation_test.go
+++ b/agent/dns/validation_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package dns_test
 
 import (
diff --git a/agent/dns_ce.go b/agent/dns_ce.go
index bc6216e30a424..6ccbe2f8dfb28 100644
--- a/agent/dns_ce.go
+++ b/agent/dns_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
@@ -56,17 +54,6 @@ func (d *DNSServer) parseLocality(labels []string, cfg *dnsConfig) (queryLocalit
 	return queryLocality{}, false
 }
 
-type querySameness struct{}
-
-// parseSamenessGroupLocality wraps parseLocality in CE
-func (d *DNSServer) parseSamenessGroupLocality(cfg *dnsConfig, labels []string, errfnc func() error) ([]queryLocality, error) {
-	locality, ok := d.parseLocality(labels, cfg)
-	if !ok {
-		return nil, errfnc()
-	}
-	return []queryLocality{locality}, nil
-}
-
 func serviceCanonicalDNSName(name, kind, datacenter, domain string, _ *acl.EnterpriseMeta) string {
 	return fmt.Sprintf("%s.%s.%s.%s", name, kind, datacenter, domain)
 }
diff --git a/agent/dns_ce_test.go b/agent/dns_ce_test.go
index 976b7e7ebe549..26ee6dc247697 100644
--- a/agent/dns_ce_test.go
+++ b/agent/dns_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
@@ -9,12 +7,11 @@ import (
 	"context"
 	"testing"
 
-	"github.com/miekg/dns"
-	"github.com/stretchr/testify/require"
-
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/testrpc"
+	"github.com/miekg/dns"
+	"github.com/stretchr/testify/require"
 )
 
 func TestDNS_CE_PeeredServices(t *testing.T) {
diff --git a/agent/dns_test.go b/agent/dns_test.go
index 3c447db36ee2b..cb8197c9bf79e 100644
--- a/agent/dns_test.go
+++ b/agent/dns_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -6310,22 +6307,6 @@ func TestDNS_ServiceLookup_SRV_RFC_TCP_Default(t *testing.T) {
 
 }
 
-func initDNSToken(t *testing.T, rpc RPC) {
-	t.Helper()
-
-	reqToken := structs.ACLTokenSetRequest{
-		Datacenter: "dc1",
-		ACLToken: structs.ACLToken{
-			SecretID:          "279d4735-f8ca-4d48-b5cc-c00a9713bbf8",
-			Policies:          nil,
-			TemplatedPolicies: []*structs.ACLTemplatedPolicy{{TemplateName: "builtin/dns"}},
-		},
-		WriteRequest: structs.WriteRequest{Token: "root"},
-	}
-	err := rpc.RPC(context.Background(), "ACL.TokenSet", &reqToken, &structs.ACLToken{})
-	require.NoError(t, err)
-}
-
 func TestDNS_ServiceLookup_FilterACL(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
@@ -6338,11 +6319,10 @@ func TestDNS_ServiceLookup_FilterACL(t *testing.T) {
 	}{
 		{"root", 1},
 		{"anonymous", 0},
-		{"dns", 1},
 	}
 	for _, tt := range tests {
 		t.Run("ACLToken == "+tt.token, func(t *testing.T) {
-			hcl := `
+			a := NewTestAgent(t, `
 				primary_datacenter = "dc1"
 
 				acl {
@@ -6352,34 +6332,13 @@ func TestDNS_ServiceLookup_FilterACL(t *testing.T) {
 
 					tokens {
 						initial_management = "root"
-`
-			if tt.token == "dns" {
-				// Create a UUID for dns token since it doesn't have an alias
-				dnsToken := "279d4735-f8ca-4d48-b5cc-c00a9713bbf8"
-
-				hcl = hcl + `
-						default = "anonymous"
-						dns = "` + dnsToken + `"
-`
-			} else {
-				hcl = hcl + `
-						default = "` + tt.token + `"
-`
-			}
-
-			hcl = hcl + `
+						default = "`+tt.token+`"
 					}
 				}
-			`
-
-			a := NewTestAgent(t, hcl)
+			`)
 			defer a.Shutdown()
 			testrpc.WaitForLeader(t, a.RPC, "dc1")
 
-			if tt.token == "dns" {
-				initDNSToken(t, a)
-			}
-
 			// Register a service
 			args := &structs.RegisterRequest{
 				Datacenter: "dc1",
@@ -6411,7 +6370,6 @@ func TestDNS_ServiceLookup_FilterACL(t *testing.T) {
 		})
 	}
 }
-
 func TestDNS_ServiceLookup_MetaTXT(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
diff --git a/agent/enterprise_delegate_ce.go b/agent/enterprise_delegate_ce.go
index 85128b8b3c074..3998489825766 100644
--- a/agent/enterprise_delegate_ce.go
+++ b/agent/enterprise_delegate_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
diff --git a/agent/envoyextensions/builtin/aws-lambda/aws_lambda.go b/agent/envoyextensions/builtin/aws-lambda/aws_lambda.go
index 978fc5cf5552b..35cc39b2d7b44 100644
--- a/agent/envoyextensions/builtin/aws-lambda/aws_lambda.go
+++ b/agent/envoyextensions/builtin/aws-lambda/aws_lambda.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package awslambda
 
 import (
@@ -28,8 +25,6 @@ import (
 var _ extensioncommon.BasicExtension = (*awsLambda)(nil)
 
 type awsLambda struct {
-	extensioncommon.BasicExtensionAdapter
-
 	ARN                string
 	PayloadPassthrough bool
 	InvocationMode     string
@@ -72,19 +67,16 @@ func (a *awsLambda) CanApply(config *extensioncommon.RuntimeConfig) bool {
 
 // PatchRoute modifies the routing configuration for a service of kind TerminatingGateway. If the kind is
 // not TerminatingGateway, then it can not be modified.
-func (a *awsLambda) PatchRoute(p extensioncommon.RoutePayload) (*envoy_route_v3.RouteConfiguration, bool, error) {
-	cfg := p.RuntimeConfig
-	if cfg.Kind != api.ServiceKindTerminatingGateway {
-		return p.Message, false, nil
+func (a *awsLambda) PatchRoute(r *extensioncommon.RuntimeConfig, route *envoy_route_v3.RouteConfiguration) (*envoy_route_v3.RouteConfiguration, bool, error) {
+	if r.Kind != api.ServiceKindTerminatingGateway {
+		return route, false, nil
 	}
 
 	// Only patch outbound routes.
-	if p.IsInbound() {
-		return p.Message, false, nil
+	if extensioncommon.IsRouteToLocalAppCluster(route) {
+		return route, false, nil
 	}
 
-	route := p.Message
-
 	for _, virtualHost := range route.VirtualHosts {
 		for _, route := range virtualHost.Routes {
 			action, ok := route.Action.(*envoy_route_v3.Route_Route)
@@ -104,18 +96,16 @@ func (a *awsLambda) PatchRoute(p extensioncommon.RoutePayload) (*envoy_route_v3.
 }
 
 // PatchCluster patches the provided envoy cluster with data required to support an AWS lambda function
-func (a *awsLambda) PatchCluster(p extensioncommon.ClusterPayload) (*envoy_cluster_v3.Cluster, bool, error) {
+func (a *awsLambda) PatchCluster(_ *extensioncommon.RuntimeConfig, c *envoy_cluster_v3.Cluster) (*envoy_cluster_v3.Cluster, bool, error) {
 	// Only patch outbound clusters.
-	if p.IsInbound() {
-		return p.Message, false, nil
+	if extensioncommon.IsLocalAppCluster(c) {
+		return c, false, nil
 	}
 
-	transportSocket, err := extensioncommon.MakeUpstreamTLSTransportSocket(&envoy_tls_v3.UpstreamTlsContext{
+	transportSocket, err := makeUpstreamTLSTransportSocket(&envoy_tls_v3.UpstreamTlsContext{
 		Sni: "*.amazonaws.com",
 	})
 
-	c := p.Message
-
 	if err != nil {
 		return c, false, fmt.Errorf("failed to make transport socket: %w", err)
 	}
@@ -173,11 +163,9 @@ func (a *awsLambda) PatchCluster(p extensioncommon.ClusterPayload) (*envoy_clust
 
 // PatchFilter patches the provided envoy filter with an inserted lambda filter being careful not to
 // overwrite the http filters.
-func (a *awsLambda) PatchFilter(p extensioncommon.FilterPayload) (*envoy_listener_v3.Filter, bool, error) {
-	filter := p.Message
-
+func (a *awsLambda) PatchFilter(_ *extensioncommon.RuntimeConfig, filter *envoy_listener_v3.Filter, isInboundListener bool) (*envoy_listener_v3.Filter, bool, error) {
 	// Only patch outbound filters.
-	if p.IsInbound() {
+	if isInboundListener {
 		return filter, false, nil
 	}
 
@@ -193,7 +181,7 @@ func (a *awsLambda) PatchFilter(p extensioncommon.FilterPayload) (*envoy_listene
 		return filter, false, errors.New("error unmarshalling filter")
 	}
 
-	lambdaHttpFilter, err := extensioncommon.MakeEnvoyHTTPFilter(
+	lambdaHttpFilter, err := makeEnvoyHTTPFilter(
 		"envoy.filters.http.aws_lambda",
 		&envoy_lambda_v3.Config{
 			Arn:                a.ARN,
@@ -228,7 +216,7 @@ func (a *awsLambda) PatchFilter(p extensioncommon.FilterPayload) (*envoy_listene
 	config.StripPortMode = &envoy_http_v3.HttpConnectionManager_StripAnyHostPort{
 		StripAnyHostPort: true,
 	}
-	newFilter, err := extensioncommon.MakeFilter("envoy.filters.network.http_connection_manager", config)
+	newFilter, err := makeFilter("envoy.filters.network.http_connection_manager", config)
 	if err != nil {
 		return filter, false, errors.New("error making new filter")
 	}
diff --git a/agent/envoyextensions/builtin/aws-lambda/aws_lambda_test.go b/agent/envoyextensions/builtin/aws-lambda/aws_lambda_test.go
index 3dda09e317a47..c24f4e2af8a0d 100644
--- a/agent/envoyextensions/builtin/aws-lambda/aws_lambda_test.go
+++ b/agent/envoyextensions/builtin/aws-lambda/aws_lambda_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package awslambda
 
 import (
@@ -23,7 +20,7 @@ import (
 
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/envoyextensions/extensioncommon"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/prototest"
 )
 
 func TestConstructor(t *testing.T) {
@@ -152,7 +149,7 @@ func TestPatchCluster(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			transportSocket, err := extensioncommon.MakeUpstreamTLSTransportSocket(&envoy_tls_v3.UpstreamTlsContext{
+			transportSocket, err := makeUpstreamTLSTransportSocket(&envoy_tls_v3.UpstreamTlsContext{
 				Sni: "*.amazonaws.com",
 			})
 			require.NoError(t, err)
@@ -202,10 +199,7 @@ func TestPatchCluster(t *testing.T) {
 
 			// Test patching the cluster
 			rc := extensioncommon.RuntimeConfig{}
-			patchedCluster, patchSuccess, err := tc.lambda.PatchCluster(extensioncommon.ClusterPayload{
-				RuntimeConfig: &rc,
-				Message:       tc.input,
-			})
+			patchedCluster, patchSuccess, err := tc.lambda.PatchCluster(&rc, tc.input)
 			if tc.isErrExpected {
 				assert.Error(t, err)
 				assert.False(t, patchSuccess)
@@ -310,10 +304,7 @@ func TestPatchRoute(t *testing.T) {
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
 			l := awsLambda{}
-			r, ok, err := l.PatchRoute(extensioncommon.RoutePayload{
-				RuntimeConfig: tc.conf,
-				Message:       tc.route,
-			})
+			r, ok, err := l.PatchRoute(tc.conf, tc.route)
 			require.NoError(t, err)
 			require.Equal(t, tc.expectRoute, r)
 			require.Equal(t, tc.expectBool, ok)
@@ -462,14 +453,7 @@ func TestPatchFilter(t *testing.T) {
 				PayloadPassthrough: true,
 				InvocationMode:     "asynchronous",
 			}
-			d := extensioncommon.TrafficDirectionOutbound
-			if tc.isInboundFilter {
-				d = extensioncommon.TrafficDirectionInbound
-			}
-			f, ok, err := l.PatchFilter(extensioncommon.FilterPayload{
-				Message:          tc.filter,
-				TrafficDirection: d,
-			})
+			f, ok, err := l.PatchFilter(nil, tc.filter, tc.isInboundFilter)
 			require.Equal(t, tc.expectBool, ok)
 			if tc.expectErr == "" {
 				require.NoError(t, err)
diff --git a/agent/envoyextensions/builtin/aws-lambda/copied.go b/agent/envoyextensions/builtin/aws-lambda/copied.go
new file mode 100644
index 0000000000000..7f276323a73f3
--- /dev/null
+++ b/agent/envoyextensions/builtin/aws-lambda/copied.go
@@ -0,0 +1,58 @@
+package awslambda
+
+import (
+	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
+	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
+	envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
+	envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
+	"google.golang.org/protobuf/types/known/anypb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+// This is copied from xds and not put into the shared package because I'm not
+// convinced it should be shared.
+
+func makeUpstreamTLSTransportSocket(tlsContext *envoy_tls_v3.UpstreamTlsContext) (*envoy_core_v3.TransportSocket, error) {
+	if tlsContext == nil {
+		return nil, nil
+	}
+	return makeTransportSocket("tls", tlsContext)
+}
+
+func makeTransportSocket(name string, config proto.Message) (*envoy_core_v3.TransportSocket, error) {
+	any, err := anypb.New(config)
+	if err != nil {
+		return nil, err
+	}
+	return &envoy_core_v3.TransportSocket{
+		Name: name,
+		ConfigType: &envoy_core_v3.TransportSocket_TypedConfig{
+			TypedConfig: any,
+		},
+	}, nil
+}
+
+func makeEnvoyHTTPFilter(name string, cfg proto.Message) (*envoy_http_v3.HttpFilter, error) {
+	any, err := anypb.New(cfg)
+	if err != nil {
+		return nil, err
+	}
+
+	return &envoy_http_v3.HttpFilter{
+		Name:       name,
+		ConfigType: &envoy_http_v3.HttpFilter_TypedConfig{TypedConfig: any},
+	}, nil
+}
+
+func makeFilter(name string, cfg proto.Message) (*envoy_listener_v3.Filter, error) {
+	any, err := anypb.New(cfg)
+	if err != nil {
+		return nil, err
+	}
+
+	return &envoy_listener_v3.Filter{
+		Name:       name,
+		ConfigType: &envoy_listener_v3.Filter_TypedConfig{TypedConfig: any},
+	}, nil
+}
diff --git a/agent/envoyextensions/builtin/ext-authz/ext_authz.go b/agent/envoyextensions/builtin/ext-authz/ext_authz.go
deleted file mode 100644
index 00e1d47640c4a..0000000000000
--- a/agent/envoyextensions/builtin/ext-authz/ext_authz.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package extauthz
-
-import (
-	"fmt"
-
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	"github.com/mitchellh/mapstructure"
-
-	"github.com/hashicorp/consul/api"
-	ext_cmn "github.com/hashicorp/consul/envoyextensions/extensioncommon"
-	"github.com/hashicorp/go-multierror"
-)
-
-type extAuthz struct {
-	ext_cmn.BasicExtensionAdapter
-
-	// ProxyType identifies the type of Envoy proxy that this extension applies to.
-	// The extension will only be configured for proxies that match this type and
-	// will be ignored for all other proxy types.
-	ProxyType api.ServiceKind
-	// InsertOptions controls how the extension inserts the filter.
-	InsertOptions ext_cmn.InsertOptions
-	// ListenerType controls which listener the extension applies to. It supports "inbound" or "outbound" listeners.
-	ListenerType string
-	// Config holds the extension configuration.
-	Config extAuthzConfig
-}
-
-var _ ext_cmn.BasicExtension = (*extAuthz)(nil)
-
-func Constructor(ext api.EnvoyExtension) (ext_cmn.EnvoyExtender, error) {
-	auth, err := newExtAuthz(ext)
-	if err != nil {
-		return nil, err
-	}
-	return &ext_cmn.BasicEnvoyExtender{
-		Extension: auth,
-	}, nil
-}
-
-// CanApply indicates if the ext-authz extension can be applied to the given extension runtime configuration.
-func (a *extAuthz) CanApply(config *ext_cmn.RuntimeConfig) bool {
-	return config.Kind == api.ServiceKindConnectProxy
-}
-
-// PatchClusters modifies the cluster resources for the ext-authz extension.
-//
-// If the extension is configured to target an ext-authz service running on the local host network
-// this func will insert a cluster for calling that service. It does nothing if the extension is
-// configured to target an upstream service because the existing cluster for the upstream will be
-// used directly by the filter.
-func (a *extAuthz) PatchClusters(cfg *ext_cmn.RuntimeConfig, c ext_cmn.ClusterMap) (ext_cmn.ClusterMap, error) {
-	cluster, err := a.Config.toEnvoyCluster(cfg)
-	if err != nil {
-		return c, err
-	}
-	if cluster != nil {
-		c[cluster.Name] = cluster
-	}
-	return c, nil
-}
-
-func (a *extAuthz) matchesListenerDirection(isInboundListener bool) bool {
-	return (!isInboundListener && a.ListenerType == "outbound") || (isInboundListener && a.ListenerType == "inbound")
-}
-
-// PatchFilters inserts an ext-authz filter into the list of network filters or the filter chain of the HTTP connection manager.
-func (a *extAuthz) PatchFilters(cfg *ext_cmn.RuntimeConfig, filters []*envoy_listener_v3.Filter, isInboundListener bool) ([]*envoy_listener_v3.Filter, error) {
-	// The ext_authz extension only patches filters for inbound listeners.
-	if !a.matchesListenerDirection(isInboundListener) {
-		return filters, nil
-	}
-
-	a.configureInsertOptions(cfg.Protocol)
-
-	switch cfg.Protocol {
-	case "grpc", "http2", "http":
-		extAuthzFilter, err := a.Config.toEnvoyHttpFilter(cfg)
-		if err != nil {
-			return filters, err
-		}
-		return ext_cmn.InsertHTTPFilter(filters, extAuthzFilter, a.InsertOptions)
-	case "tcp":
-		fallthrough
-	default:
-		extAuthzFilter, err := a.Config.toEnvoyNetworkFilter(cfg)
-		if err != nil {
-			return filters, err
-		}
-		return ext_cmn.InsertNetworkFilter(filters, extAuthzFilter, a.InsertOptions)
-	}
-}
-
-func newExtAuthz(ext api.EnvoyExtension) (*extAuthz, error) {
-	auth := &extAuthz{}
-	if ext.Name != api.BuiltinExtAuthzExtension {
-		return auth, fmt.Errorf("expected extension name %q but got %q", api.BuiltinExtAuthzExtension, ext.Name)
-	}
-	if err := auth.fromArguments(ext.Arguments); err != nil {
-		return auth, err
-	}
-	// The filter's failure mode is always configured based on whether or not the extension is required.
-	auth.Config.failureModeAllow = !ext.Required
-	return auth, nil
-}
-
-func (a *extAuthz) fromArguments(args map[string]any) error {
-	if err := mapstructure.Decode(args, a); err != nil {
-		return err
-	}
-	a.normalize()
-	return a.validate()
-}
-
-func (a *extAuthz) configureInsertOptions(protocol string) {
-	// If the insert options have been expressly configured, then use them.
-	if a.InsertOptions.Location != "" {
-		return
-	}
-
-	// Configure the default, insert the filter immediately before the terminal filter.
-	a.InsertOptions.Location = ext_cmn.InsertBeforeFirstMatch
-	switch protocol {
-	case "grpc", "http2", "http":
-		a.InsertOptions.FilterName = "envoy.filters.http.router"
-	default:
-		a.InsertOptions.FilterName = "envoy.filters.network.tcp_proxy"
-	}
-}
-
-func (a *extAuthz) normalize() {
-	if a.ProxyType == "" {
-		a.ProxyType = api.ServiceKindConnectProxy
-	}
-
-	if a.ListenerType == "" {
-		a.ListenerType = "inbound"
-	}
-
-	a.Config.normalize()
-}
-
-func (a *extAuthz) validate() error {
-	var resultErr error
-	if a.ProxyType != api.ServiceKindConnectProxy {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("unsupported ProxyType %q, only %q is supported",
-			a.ProxyType,
-			api.ServiceKindConnectProxy))
-	}
-
-	if a.ListenerType != "inbound" && a.ListenerType != "outbound" {
-		resultErr = multierror.Append(resultErr, fmt.Errorf(`unexpected ListenerType %q, supported values are "inbound" or "outbound"`, a.ListenerType))
-	}
-
-	if err := a.Config.validate(); err != nil {
-		resultErr = multierror.Append(resultErr, err)
-	}
-
-	return resultErr
-}
diff --git a/agent/envoyextensions/builtin/ext-authz/ext_authz_test.go b/agent/envoyextensions/builtin/ext-authz/ext_authz_test.go
deleted file mode 100644
index 6db284476dd71..0000000000000
--- a/agent/envoyextensions/builtin/ext-authz/ext_authz_test.go
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package extauthz
-
-import (
-	"testing"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/envoyextensions/extensioncommon"
-	"github.com/stretchr/testify/require"
-)
-
-func TestConstructor(t *testing.T) {
-	t.Parallel()
-	cases := map[string]struct {
-		extName string
-		args    map[string]any
-		errMsg  string
-	}{
-		"invalid name": {
-			extName: "invalid",
-			errMsg:  `expected extension name "builtin/ext-authz"`,
-		},
-		"invalid proxy type": {
-			args:   map[string]any{"ProxyType": "invalid"},
-			errMsg: `unsupported ProxyType`,
-		},
-		"no service type": {
-			args:   map[string]any{"ProxyType": "connect-proxy"},
-			errMsg: `exactly one of GrpcService or HttpService must be set`,
-		},
-		"both service types": {
-			args: map[string]any{
-				"ProxyType": "connect-proxy",
-				"Config": map[string]any{
-					"GrpcService": map[string]any{
-						"Target": map[string]any{
-							"URI": "localhost:9191",
-						},
-					},
-					"HttpService": map[string]any{
-						"Target": map[string]any{
-							"URI": "localhost:9191",
-						},
-					},
-				},
-			},
-			errMsg: `exactly one of GrpcService or HttpService must be set`,
-		},
-		"non-loopback address hostname": {
-			args: map[string]any{
-				"ProxyType": "connect-proxy",
-				"Config": map[string]any{
-					"GrpcService": map[string]any{
-						"Target": map[string]any{
-							"URI": "foo.bar.com:9191",
-						},
-					},
-				},
-			},
-			errMsg: `invalid host for Target.URI "foo.bar.com:9191": expected "localhost", "127.0.0.1", or "::1"`,
-		},
-		"non-loopback address": {
-			args: map[string]any{
-				"ProxyType": "connect-proxy",
-				"Config": map[string]any{
-					"GrpcService": map[string]any{
-						"Target": map[string]any{
-							"URI": "10.0.0.1:9191",
-						},
-					},
-				},
-			},
-			errMsg: `invalid host for Target.URI "10.0.0.1:9191": expected "localhost", "127.0.0.1", or "::1"`,
-		},
-		"invalid target port": {
-			args: map[string]any{
-				"ProxyType": "connect-proxy",
-				"Config": map[string]any{
-					"GrpcService": map[string]any{
-						"Target": map[string]any{
-							"URI": "localhost:zero",
-						},
-					},
-				},
-			},
-			errMsg: `invalid format for Target.URI "localhost:zero": expected host:port`,
-		},
-		"invalid target timeout": {
-			args: map[string]any{
-				"ProxyType": "connect-proxy",
-				"Config": map[string]any{
-					"GrpcService": map[string]any{
-						"Target": map[string]any{
-							"URI":     "localhost:9191",
-							"Timeout": "one",
-						},
-					},
-				},
-			},
-			errMsg: `failed to parse Target.Timeout "one" as a duration`,
-		},
-		"no uri or service target": {
-			args: map[string]any{
-				"ProxyType": "connect-proxy",
-				"Config": map[string]any{
-					"HttpService": map[string]any{
-						"Target": map[string]any{
-							"Timeout": "1s",
-						},
-					},
-				},
-			},
-			errMsg: `exactly one of Target.Service or Target.URI must be set`,
-		},
-		"uri and service target": {
-			args: map[string]any{
-				"ProxyType": "connect-proxy",
-				"Config": map[string]any{
-					"GrpcService": map[string]any{
-						"Target": map[string]any{
-							"URI": "10.0.0.1:9191",
-							"Service": map[string]any{
-								"Name": "test-service",
-							},
-						},
-					},
-				},
-			},
-			errMsg: `exactly one of Target.Service or Target.URI must be set`,
-		},
-		"invalid status on error": {
-			args: map[string]any{
-				"ProxyType": "connect-proxy",
-				"Config": map[string]any{
-					"StatusOnError": 1,
-					"GrpcService": map[string]any{
-						"Target": map[string]any{
-							"URI": "10.0.0.1:9191",
-							"Service": map[string]any{
-								"Name": "test-service",
-							},
-						},
-					},
-				},
-			},
-			errMsg: `failed to validate Config.StatusOnError`,
-		},
-		"valid grpc service": {
-			args: map[string]any{
-				"ProxyType": "connect-proxy",
-				"Config": map[string]any{
-					"GrpcService": map[string]any{
-						"Target": map[string]any{
-							"URI": "localhost:9191",
-						},
-					},
-				},
-			},
-		},
-		"valid http service": {
-			args: map[string]any{
-				"ProxyType": "connect-proxy",
-				"Config": map[string]any{
-					"HttpService": map[string]any{
-						"Target": map[string]any{
-							"URI": "127.0.0.1:9191",
-						},
-					},
-				},
-			},
-		},
-	}
-	for name, c := range cases {
-		c := c
-		t.Run(name, func(t *testing.T) {
-			extName := api.BuiltinExtAuthzExtension
-			if c.extName != "" {
-				extName = c.extName
-			}
-			ext, err := newExtAuthz(api.EnvoyExtension{Name: extName, Arguments: c.args})
-			if c.errMsg == "" {
-				require.NoError(t, err)
-
-				httpFilter, err := ext.Config.toEnvoyHttpFilter(&extensioncommon.RuntimeConfig{})
-				require.NoError(t, err)
-				require.NotNil(t, httpFilter)
-
-				if ext.Config.isGRPC() {
-					netFilter, err := ext.Config.toEnvoyNetworkFilter(&extensioncommon.RuntimeConfig{})
-					require.NoError(t, err)
-					require.NotNil(t, netFilter)
-				}
-			} else {
-				require.Error(t, err)
-				require.Contains(t, err.Error(), c.errMsg)
-			}
-		})
-	}
-}
diff --git a/agent/envoyextensions/builtin/ext-authz/structs.go b/agent/envoyextensions/builtin/ext-authz/structs.go
deleted file mode 100644
index 0a7e7dcce43a7..0000000000000
--- a/agent/envoyextensions/builtin/ext-authz/structs.go
+++ /dev/null
@@ -1,697 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package extauthz
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-
-	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	envoy_http_ext_authz_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ext_authz/v3"
-	envoy_ext_authz_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/ext_authz/v3"
-	envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
-	envoy_upstreams_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v3"
-	envoy_type_matcher_v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3"
-	envoy_type_v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
-	"github.com/hashicorp/go-multierror"
-	"google.golang.org/protobuf/types/known/anypb"
-	"google.golang.org/protobuf/types/known/durationpb"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/api"
-	cmn "github.com/hashicorp/consul/envoyextensions/extensioncommon"
-)
-
-const (
-	LocalExtAuthzClusterName = "local_ext_authz"
-
-	defaultMetadataNS    = "consul"
-	defaultStatPrefix    = "response"
-	defaultStatusOnError = 403
-	localhost            = "localhost"
-	localhostIPv4        = "127.0.0.1"
-	localhostIPv6        = "::1"
-)
-
-type extAuthzConfig struct {
-	BootstrapMetadataLabelsKey string
-	ClearRouteCache            *bool
-	GrpcService                *GrpcService
-	HttpService                *HttpService
-	IncludePeerCertificate     *bool
-	MetadataContextNamespaces  []string
-	StatusOnError              *int
-	StatPrefix                 string
-	WithRequestBody            *BufferSettings
-
-	failureModeAllow bool
-}
-
-func (c *extAuthzConfig) normalize() {
-	if c.StatPrefix == "" {
-		c.StatPrefix = defaultStatPrefix
-	}
-	if c.isGRPC() {
-		c.GrpcService.normalize()
-	}
-	if c.isHTTP() {
-		c.HttpService.normalize()
-	}
-}
-
-func (c *extAuthzConfig) validate() error {
-	c.normalize()
-
-	var resultErr error
-	if c.isGRPC() == c.isHTTP() {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("exactly one of GrpcService or HttpService must be set"))
-	}
-
-	var field string
-	var validate func() error
-	if c.isHTTP() {
-		field = "HttpService"
-		validate = c.HttpService.validate
-	} else {
-		field = "GrpcService"
-		validate = c.GrpcService.validate
-	}
-
-	if err := validate(); err != nil {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("failed to validate Config.%s: %w", field, err))
-	}
-
-	if c.StatusOnError != nil {
-		if _, ok := envoy_type_v3.StatusCode_name[int32(*c.StatusOnError)]; !ok {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("failed to validate Config.StatusOnError:"+
-				"status code %d is not supported by Envoy, please refer to the Envoy documentation for supported status codes",
-				*c.StatusOnError))
-		}
-	}
-
-	return resultErr
-}
-
-func (c extAuthzConfig) envoyGrpcService(cfg *cmn.RuntimeConfig) (*envoy_core_v3.GrpcService, error) {
-	target := c.GrpcService.Target
-	clusterName, err := c.getClusterName(cfg, target)
-	if err != nil {
-		return nil, err
-	}
-
-	var initialMetadata []*envoy_core_v3.HeaderValue
-	for _, meta := range c.GrpcService.InitialMetadata {
-		initialMetadata = append(initialMetadata, meta.toEnvoy())
-	}
-
-	return &envoy_core_v3.GrpcService{
-		TargetSpecifier: &envoy_core_v3.GrpcService_EnvoyGrpc_{
-			EnvoyGrpc: &envoy_core_v3.GrpcService_EnvoyGrpc{
-				ClusterName: clusterName,
-				Authority:   c.GrpcService.Authority,
-			},
-		},
-		Timeout:         target.timeoutDurationPB(),
-		InitialMetadata: initialMetadata,
-	}, nil
-}
-
-func (c extAuthzConfig) envoyHttpService(cfg *cmn.RuntimeConfig) (*envoy_http_ext_authz_v3.HttpService, error) {
-	clusterName, err := c.getClusterName(cfg, c.HttpService.Target)
-	if err != nil {
-		return nil, err
-	}
-
-	return &envoy_http_ext_authz_v3.HttpService{
-		ServerUri: &envoy_core_v3.HttpUri{
-			Uri:              clusterName, // not used by Envoy, set to cluster
-			HttpUpstreamType: &envoy_core_v3.HttpUri_Cluster{Cluster: clusterName},
-			Timeout:          c.HttpService.Target.timeoutDurationPB(),
-		},
-		PathPrefix:            c.HttpService.PathPrefix,
-		AuthorizationRequest:  c.HttpService.AuthorizationRequest.toEnvoy(),
-		AuthorizationResponse: c.HttpService.AuthorizationResponse.toEnvoy(),
-	}, nil
-}
-
-// getClusterName returns the name of the cluster for the external authorization service.
-// If the extension is configured with an upstream ext-authz service then the name of the cluster for
-// that upstream is returned. If the extension is configured with a URI, the only allowed host is `localhost`
-// and the extension will insert a new cluster with the name "local_ext_authz", so we use that name.
-func (c extAuthzConfig) getClusterName(cfg *cmn.RuntimeConfig, target *Target) (string, error) {
-	var err error
-	clusterName := LocalExtAuthzClusterName
-	if target.isService() {
-		if clusterName, err = target.clusterName(cfg); err != nil {
-			return "", err
-		}
-	}
-	return clusterName, nil
-}
-
-func (c extAuthzConfig) isGRPC() bool {
-	return c.GrpcService != nil
-}
-
-func (c extAuthzConfig) isHTTP() bool {
-	return c.HttpService != nil
-}
-
-// toEnvoyCluster returns an Envoy cluster for connecting to the ext_authz service.
-// If the extension is configured with the ext_authz service locally via the URI set to localhost,
-// this func will return a new cluster definition that will allow the proxy to connect to the ext_authz
-// service running on localhost on the configured port.
-//
-// If the extension is configured with the ext_authz service as an upstream there is no need to insert
-// a new cluster so this method returns nil.
-func (c *extAuthzConfig) toEnvoyCluster(_ *cmn.RuntimeConfig) (*envoy_cluster_v3.Cluster, error) {
-	var target *Target
-	if c.isHTTP() {
-		target = c.HttpService.Target
-	} else {
-		target = c.GrpcService.Target
-	}
-
-	// If the target is an upstream we do not need to create a cluster. We will use the cluster of the upstream.
-	if target.isService() {
-		return nil, nil
-	}
-
-	host, port, err := target.addr()
-	if err != nil {
-		return nil, err
-	}
-
-	clusterType := &envoy_cluster_v3.Cluster_Type{Type: envoy_cluster_v3.Cluster_STATIC}
-	if host == localhost {
-		// If the host is "localhost" use a STRICT_DNS cluster type to perform DNS lookup.
-		clusterType = &envoy_cluster_v3.Cluster_Type{Type: envoy_cluster_v3.Cluster_STRICT_DNS}
-	}
-
-	var typedExtProtoOpts map[string]*anypb.Any
-	if c.isGRPC() {
-		// By default HTTP/1.1 is used for the transport protocol. gRPC requires that we explicitly configure HTTP/2
-		httpProtoOpts := &envoy_upstreams_http_v3.HttpProtocolOptions{
-			UpstreamProtocolOptions: &envoy_upstreams_http_v3.HttpProtocolOptions_ExplicitHttpConfig_{
-				ExplicitHttpConfig: &envoy_upstreams_http_v3.HttpProtocolOptions_ExplicitHttpConfig{
-					ProtocolConfig: &envoy_upstreams_http_v3.HttpProtocolOptions_ExplicitHttpConfig_Http2ProtocolOptions{},
-				},
-			},
-		}
-		httpProtoOptsAny, err := anypb.New(httpProtoOpts)
-		if err != nil {
-			return nil, err
-		}
-		typedExtProtoOpts = make(map[string]*anypb.Any)
-		typedExtProtoOpts["envoy.extensions.upstreams.http.v3.HttpProtocolOptions"] = httpProtoOptsAny
-	}
-
-	return &envoy_cluster_v3.Cluster{
-		Name:                 LocalExtAuthzClusterName,
-		ClusterDiscoveryType: clusterType,
-		ConnectTimeout:       target.timeoutDurationPB(),
-		LoadAssignment: &envoy_endpoint_v3.ClusterLoadAssignment{
-			ClusterName: LocalExtAuthzClusterName,
-			Endpoints: []*envoy_endpoint_v3.LocalityLbEndpoints{
-				{
-					LbEndpoints: []*envoy_endpoint_v3.LbEndpoint{{
-						HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
-							Endpoint: &envoy_endpoint_v3.Endpoint{
-								Address: &envoy_core_v3.Address{
-									Address: &envoy_core_v3.Address_SocketAddress{
-										SocketAddress: &envoy_core_v3.SocketAddress{
-											Address: host,
-											PortSpecifier: &envoy_core_v3.SocketAddress_PortValue{
-												PortValue: uint32(port),
-											},
-										},
-									},
-								},
-							},
-						},
-					}},
-				},
-			},
-		},
-		TypedExtensionProtocolOptions: typedExtProtoOpts,
-	}, nil
-}
-
-func (c extAuthzConfig) toEnvoyHttpFilter(cfg *cmn.RuntimeConfig) (*envoy_http_v3.HttpFilter, error) {
-	extAuthzFilter := &envoy_http_ext_authz_v3.ExtAuthz{
-		StatPrefix:                 c.StatPrefix,
-		WithRequestBody:            c.WithRequestBody.toEnvoy(),
-		TransportApiVersion:        envoy_core_v3.ApiVersion_V3,
-		MetadataContextNamespaces:  append(c.MetadataContextNamespaces, defaultMetadataNS),
-		FailureModeAllow:           c.failureModeAllow,
-		BootstrapMetadataLabelsKey: c.BootstrapMetadataLabelsKey,
-	}
-	if c.isHTTP() {
-		httpSvc, err := c.envoyHttpService(cfg)
-		if err != nil {
-			return nil, err
-		}
-		extAuthzFilter.Services = &envoy_http_ext_authz_v3.ExtAuthz_HttpService{HttpService: httpSvc}
-	} else {
-		grpcSvc, err := c.envoyGrpcService(cfg)
-		if err != nil {
-			return nil, err
-		}
-		extAuthzFilter.Services = &envoy_http_ext_authz_v3.ExtAuthz_GrpcService{GrpcService: grpcSvc}
-	}
-
-	if c.ClearRouteCache != nil {
-		extAuthzFilter.ClearRouteCache = *c.ClearRouteCache
-	}
-	if c.IncludePeerCertificate != nil {
-		extAuthzFilter.IncludePeerCertificate = *c.IncludePeerCertificate
-	}
-	if c.StatusOnError != nil {
-		extAuthzFilter.StatusOnError = &envoy_type_v3.HttpStatus{
-			Code: envoy_type_v3.StatusCode(*c.StatusOnError),
-		}
-	}
-
-	return cmn.MakeEnvoyHTTPFilter("envoy.filters.http.ext_authz", extAuthzFilter)
-}
-
-func (c extAuthzConfig) toEnvoyNetworkFilter(cfg *cmn.RuntimeConfig) (*envoy_listener_v3.Filter, error) {
-	grpcSvc, err := c.envoyGrpcService(cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	extAuthzFilter := &envoy_ext_authz_v3.ExtAuthz{
-		GrpcService:         grpcSvc,
-		StatPrefix:          c.StatPrefix,
-		TransportApiVersion: envoy_core_v3.ApiVersion_V3,
-		FailureModeAllow:    c.failureModeAllow,
-	}
-
-	if c.IncludePeerCertificate != nil {
-		extAuthzFilter.IncludePeerCertificate = *c.IncludePeerCertificate
-	}
-
-	return cmn.MakeFilter("envoy.filters.network.ext_authz", extAuthzFilter)
-}
-
-type validator interface {
-	validate() error
-}
-
-type AuthorizationRequest struct {
-	AllowedHeaders ListStringMatcher
-	HeadersToAdd   []*HeaderValue
-}
-
-func (r *AuthorizationRequest) toEnvoy() *envoy_http_ext_authz_v3.AuthorizationRequest {
-	if r == nil {
-		return nil
-	}
-	if len(r.AllowedHeaders) == 0 && len(r.HeadersToAdd) == 0 {
-		return nil
-	}
-
-	req := &envoy_http_ext_authz_v3.AuthorizationRequest{
-		AllowedHeaders: r.AllowedHeaders.toEnvoy(),
-	}
-	for _, header := range r.HeadersToAdd {
-		req.HeadersToAdd = append(req.HeadersToAdd, header.toEnvoy())
-	}
-
-	return req
-}
-
-func (r *AuthorizationRequest) validate() error {
-	var resultErr error
-	if r == nil {
-		return resultErr
-	}
-	if err := r.AllowedHeaders.validate(); err != nil {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("validation failed for AuthorizationRequest.AllowedHeaders: %w", err))
-	}
-	return resultErr
-}
-
-type AuthorizationResponse struct {
-	AllowedUpstreamHeaders         ListStringMatcher
-	AllowedUpstreamHeadersToAppend ListStringMatcher
-	AllowedClientHeaders           ListStringMatcher
-	AllowedClientHeadersOnSuccess  ListStringMatcher
-	DynamicMetadataFromHeaders     ListStringMatcher
-}
-
-func (r *AuthorizationResponse) toEnvoy() *envoy_http_ext_authz_v3.AuthorizationResponse {
-	if r == nil {
-		return nil
-	}
-
-	return &envoy_http_ext_authz_v3.AuthorizationResponse{
-		AllowedUpstreamHeaders:         r.AllowedUpstreamHeaders.toEnvoy(),
-		AllowedUpstreamHeadersToAppend: r.AllowedUpstreamHeadersToAppend.toEnvoy(),
-		AllowedClientHeaders:           r.AllowedClientHeaders.toEnvoy(),
-		AllowedClientHeadersOnSuccess:  r.AllowedClientHeadersOnSuccess.toEnvoy(),
-		DynamicMetadataFromHeaders:     r.DynamicMetadataFromHeaders.toEnvoy(),
-	}
-}
-
-func (r *AuthorizationResponse) validate() error {
-	var resultErr error
-	if r == nil {
-		return resultErr
-	}
-	for field, matchers := range r.fieldMap() {
-		if err := matchers.validate(); err != nil {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("validation failed for AuthorizationResponse.%s: %w", field, err))
-		}
-	}
-	return resultErr
-}
-
-func (r *AuthorizationResponse) fieldMap() map[string]ListStringMatcher {
-	if r == nil {
-		return nil
-	}
-	return map[string]ListStringMatcher{
-		"AllowedUpstreamHeaders":         r.AllowedUpstreamHeaders,
-		"AllowedUpstreamHeadersToAppend": r.AllowedUpstreamHeadersToAppend,
-		"AllowedClientHeaders":           r.AllowedClientHeaders,
-		"AllowedClientHeadersOnSuccess":  r.AllowedClientHeadersOnSuccess,
-		"DynamicMetadataFromHeaders":     r.DynamicMetadataFromHeaders,
-	}
-}
-
-type BufferSettings struct {
-	MaxRequestBytes     *int64
-	AllowPartialMessage *bool
-	PackAsBytes         *bool
-}
-
-func (b *BufferSettings) toEnvoy() *envoy_http_ext_authz_v3.BufferSettings {
-	if b == nil {
-		return nil
-	}
-	if b.AllowPartialMessage == nil &&
-		b.MaxRequestBytes == nil &&
-		b.PackAsBytes == nil {
-		return nil
-	}
-
-	bufSet := &envoy_http_ext_authz_v3.BufferSettings{}
-	if b.AllowPartialMessage != nil {
-		bufSet.AllowPartialMessage = *b.AllowPartialMessage
-	}
-	if b.MaxRequestBytes != nil {
-		bufSet.MaxRequestBytes = uint32(*b.MaxRequestBytes)
-	}
-	if b.PackAsBytes != nil {
-		bufSet.PackAsBytes = *b.PackAsBytes
-	}
-
-	return bufSet
-}
-
-type GrpcService struct {
-	Target          *Target
-	Authority       string
-	InitialMetadata []*HeaderValue
-}
-
-func (v *GrpcService) normalize() {
-	if v == nil {
-		return
-	}
-	v.Target.normalize()
-}
-
-func (v *GrpcService) validate() error {
-	var resultErr error
-	if v == nil {
-		return resultErr
-	}
-
-	if v.Target == nil {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("GrpcService.Target must be set"))
-	}
-	if err := v.Target.validate(); err != nil {
-		resultErr = multierror.Append(resultErr, err)
-	}
-	return resultErr
-}
-
-type HeaderValue struct {
-	Key   string
-	Value string
-}
-
-func (h *HeaderValue) toEnvoy() *envoy_core_v3.HeaderValue {
-	if h == nil {
-		return nil
-	}
-	return &envoy_core_v3.HeaderValue{Key: h.Key, Value: h.Value}
-}
-
-type HttpService struct {
-	Target                *Target
-	PathPrefix            string
-	AuthorizationRequest  *AuthorizationRequest
-	AuthorizationResponse *AuthorizationResponse
-}
-
-func (v *HttpService) normalize() {
-	if v == nil {
-		return
-	}
-	v.Target.normalize()
-}
-
-func (v *HttpService) validate() error {
-	var resultErr error
-	if v == nil {
-		return resultErr
-	}
-
-	if v.Target == nil {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("HttpService.Target must be set"))
-	}
-	for _, val := range []validator{v.Target, v.AuthorizationRequest, v.AuthorizationResponse} {
-		if err := val.validate(); err != nil {
-			resultErr = multierror.Append(resultErr, err)
-		}
-	}
-	return resultErr
-}
-
-type ListStringMatcher []*StringMatcher
-
-func (l ListStringMatcher) toEnvoy() *envoy_type_matcher_v3.ListStringMatcher {
-	if len(l) < 1 {
-		return nil
-	}
-	matchers := &envoy_type_matcher_v3.ListStringMatcher{}
-	for _, matcher := range l {
-		matchers.Patterns = append(matchers.Patterns, matcher.toEnvoy())
-	}
-	return matchers
-}
-
-func (l ListStringMatcher) validate() error {
-	var resultErr error
-	if len(l) < 1 {
-		return nil
-	}
-	for idx, matcher := range l {
-		if err := matcher.validate(); err != nil {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("validation failed for matcher at index %d: %w", idx, err))
-		}
-	}
-	return resultErr
-}
-
-type StringMatcher struct {
-	Contains   string
-	Exact      string
-	IgnoreCase bool
-	Prefix     string
-	SafeRegex  string
-	Suffix     string
-}
-
-func (s *StringMatcher) toEnvoy() *envoy_type_matcher_v3.StringMatcher {
-	if s == nil {
-		return nil
-	}
-	switch {
-	case s.Contains != "":
-		return &envoy_type_matcher_v3.StringMatcher{
-			MatchPattern: &envoy_type_matcher_v3.StringMatcher_Contains{Contains: s.Contains},
-			IgnoreCase:   s.IgnoreCase,
-		}
-	case s.Exact != "":
-		return &envoy_type_matcher_v3.StringMatcher{
-			MatchPattern: &envoy_type_matcher_v3.StringMatcher_Exact{Exact: s.Exact},
-			IgnoreCase:   s.IgnoreCase,
-		}
-	case s.Prefix != "":
-		return &envoy_type_matcher_v3.StringMatcher{
-			MatchPattern: &envoy_type_matcher_v3.StringMatcher_Prefix{Prefix: s.Prefix},
-			IgnoreCase:   s.IgnoreCase,
-		}
-	case s.SafeRegex != "":
-		return &envoy_type_matcher_v3.StringMatcher{
-			MatchPattern: &envoy_type_matcher_v3.StringMatcher_SafeRegex{
-				SafeRegex: &envoy_type_matcher_v3.RegexMatcher{
-					EngineType: &envoy_type_matcher_v3.RegexMatcher_GoogleRe2{},
-					Regex:      s.SafeRegex,
-				},
-			},
-		}
-	case s.Suffix != "":
-		return &envoy_type_matcher_v3.StringMatcher{
-			MatchPattern: &envoy_type_matcher_v3.StringMatcher_Suffix{Suffix: s.Suffix},
-			IgnoreCase:   s.IgnoreCase,
-		}
-	default:
-		return nil
-	}
-}
-
-func (s *StringMatcher) validate() error {
-	if s == nil {
-		return nil
-	}
-
-	set := 0
-	for _, s := range []string{s.Contains, s.Exact, s.Prefix, s.SafeRegex, s.Suffix} {
-		if s != "" {
-			set++
-		}
-	}
-	if set != 1 {
-		return fmt.Errorf("exactly one of Contains, Exact, Prefix, SafeRegex or Suffix must be set")
-	}
-	return nil
-}
-
-type Target struct {
-	Service api.CompoundServiceName
-	URI     string
-	Timeout string
-
-	timeout *time.Duration
-	host    string
-	port    int
-}
-
-// addr returns the host and port for the target when the target is a URI.
-// It returns a non-nil error if the target is not a URI.
-func (t Target) addr() (string, int, error) {
-	if !t.isURI() {
-		return "", 0, fmt.Errorf("target is not configured with a URI, set Target.URI")
-	}
-	return t.host, t.port, nil
-}
-
-// clusterName returns the cluster name for the target when the target is an upstream service.
-// It searches through the upstreams in the provided runtime configuration and returns the name
-// of the cluster for the first upstream service that matches the target service.
-// It returns a non-nil error if a matching cluster is not found or if the target is not an
-// upstream service.
-func (t Target) clusterName(cfg *cmn.RuntimeConfig) (string, error) {
-	if !t.isService() {
-		return "", fmt.Errorf("target is not configured with an upstream service, set Target.Service")
-	}
-
-	for service, upstream := range cfg.Upstreams {
-		if service == t.Service {
-			for sni := range upstream.SNIs {
-				return sni, nil
-			}
-		}
-	}
-	return "", fmt.Errorf("no upstream definition found for service %q", t.Service.Name)
-}
-
-func (t Target) isService() bool {
-	return t.Service.Name != ""
-}
-
-func (t Target) isURI() bool {
-	return t.URI != ""
-}
-
-func (t *Target) normalize() {
-	if t == nil {
-		return
-	}
-	t.Service.Namespace = acl.NamespaceOrDefault(t.Service.Namespace)
-	t.Service.Partition = acl.PartitionOrDefault(t.Service.Partition)
-}
-
-// timeoutDurationPB returns the target's timeout as a *durationpb.Duration.
-// It returns nil if the timeout has not been explicitly set.
-func (t *Target) timeoutDurationPB() *durationpb.Duration {
-	if t == nil || t.timeout == nil {
-		return nil
-	}
-	return durationpb.New(*t.timeout)
-}
-
-func (t *Target) validate() error {
-	var err, resultErr error
-	if t == nil {
-		return resultErr
-	}
-
-	if t.isURI() == t.isService() {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("exactly one of Target.Service or Target.URI must be set"))
-	}
-
-	if t.isURI() {
-		t.host, t.port, err = parseAddr(t.URI)
-		if err == nil {
-			switch t.host {
-			case localhost, localhostIPv4, localhostIPv6:
-			default:
-				resultErr = multierror.Append(resultErr,
-					fmt.Errorf("invalid host for Target.URI %q: expected %q, %q, or %q", t.URI, localhost, localhostIPv4, localhostIPv6))
-			}
-		} else {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("invalid format for Target.URI %q: expected host:port", t.URI))
-		}
-	}
-
-	if t.Timeout != "" {
-		if d, err := time.ParseDuration(t.Timeout); err == nil {
-			t.timeout = &d
-		} else {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("failed to parse Target.Timeout %q as a duration: %w", t.Timeout, err))
-		}
-	}
-	return resultErr
-}
-
-func parseAddr(s string) (host string, port int, err error) {
-	// Strip the protocol if one was provided
-	if _, addr, hasProto := strings.Cut(s, "://"); hasProto {
-		s = addr
-	}
-	idx := strings.LastIndex(s, ":")
-	switch idx {
-	case -1, len(s) - 1:
-		err = fmt.Errorf("invalid input format %q: expected host:port", s)
-	case 0:
-		host = localhost
-		port, err = strconv.Atoi(s[idx+1:])
-	default:
-		host = s[:idx]
-		port, err = strconv.Atoi(s[idx+1:])
-	}
-	return
-}
diff --git a/agent/envoyextensions/builtin/lua/copied.go b/agent/envoyextensions/builtin/lua/copied.go
new file mode 100644
index 0000000000000..f9d14b94ccc29
--- /dev/null
+++ b/agent/envoyextensions/builtin/lua/copied.go
@@ -0,0 +1,58 @@
+package lua
+
+import (
+	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
+	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
+	envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
+	envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
+
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/types/known/anypb"
+)
+
+// This is copied from xds and not put into the shared package because I'm not
+// convinced it should be shared.
+
+func makeUpstreamTLSTransportSocket(tlsContext *envoy_tls_v3.UpstreamTlsContext) (*envoy_core_v3.TransportSocket, error) {
+	if tlsContext == nil {
+		return nil, nil
+	}
+	return makeTransportSocket("tls", tlsContext)
+}
+
+func makeTransportSocket(name string, config proto.Message) (*envoy_core_v3.TransportSocket, error) {
+	any, err := anypb.New(config)
+	if err != nil {
+		return nil, err
+	}
+	return &envoy_core_v3.TransportSocket{
+		Name: name,
+		ConfigType: &envoy_core_v3.TransportSocket_TypedConfig{
+			TypedConfig: any,
+		},
+	}, nil
+}
+
+func makeEnvoyHTTPFilter(name string, cfg proto.Message) (*envoy_http_v3.HttpFilter, error) {
+	any, err := anypb.New(cfg)
+	if err != nil {
+		return nil, err
+	}
+
+	return &envoy_http_v3.HttpFilter{
+		Name:       name,
+		ConfigType: &envoy_http_v3.HttpFilter_TypedConfig{TypedConfig: any},
+	}, nil
+}
+
+func makeFilter(name string, cfg proto.Message) (*envoy_listener_v3.Filter, error) {
+	any, err := anypb.New(cfg)
+	if err != nil {
+		return nil, err
+	}
+
+	return &envoy_listener_v3.Filter{
+		Name:       name,
+		ConfigType: &envoy_listener_v3.Filter_TypedConfig{TypedConfig: any},
+	}, nil
+}
diff --git a/agent/envoyextensions/builtin/lua/lua.go b/agent/envoyextensions/builtin/lua/lua.go
index ba08d9d286c01..117912cd63f69 100644
--- a/agent/envoyextensions/builtin/lua/lua.go
+++ b/agent/envoyextensions/builtin/lua/lua.go
@@ -1,13 +1,12 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lua
 
 import (
 	"errors"
 	"fmt"
 
+	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
 	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
+	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
 	envoy_lua_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/lua/v3"
 	envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
 	envoy_resource_v3 "github.com/envoyproxy/go-control-plane/pkg/resource/v3"
@@ -20,8 +19,6 @@ import (
 var _ extensioncommon.BasicExtension = (*lua)(nil)
 
 type lua struct {
-	extensioncommon.BasicExtensionAdapter
-
 	ProxyType string
 	Listener  string
 	Script    string
@@ -45,9 +42,6 @@ func (l *lua) fromArguments(args map[string]interface{}) error {
 	if err := mapstructure.Decode(args, l); err != nil {
 		return fmt.Errorf("error decoding extension arguments: %v", err)
 	}
-	if l.ProxyType == "" {
-		l.ProxyType = string(api.ServiceKindConnectProxy)
-	}
 	return l.validate()
 }
 
@@ -56,7 +50,7 @@ func (l *lua) validate() error {
 	if l.Script == "" {
 		resultErr = multierror.Append(resultErr, fmt.Errorf("missing Script value"))
 	}
-	if l.ProxyType != string(api.ServiceKindConnectProxy) {
+	if l.ProxyType != "connect-proxy" {
 		resultErr = multierror.Append(resultErr, fmt.Errorf("unexpected ProxyType %q", l.ProxyType))
 	}
 	if l.Listener != "inbound" && l.Listener != "outbound" {
@@ -70,16 +64,24 @@ func (l *lua) CanApply(config *extensioncommon.RuntimeConfig) bool {
 	return string(config.Kind) == l.ProxyType
 }
 
-func (l *lua) matchesListenerDirection(p extensioncommon.FilterPayload) bool {
-	isInboundListener := p.IsInbound()
+func (l *lua) matchesListenerDirection(isInboundListener bool) bool {
 	return (!isInboundListener && l.Listener == "outbound") || (isInboundListener && l.Listener == "inbound")
 }
 
+// PatchRoute does nothing.
+func (l *lua) PatchRoute(_ *extensioncommon.RuntimeConfig, route *envoy_route_v3.RouteConfiguration) (*envoy_route_v3.RouteConfiguration, bool, error) {
+	return route, false, nil
+}
+
+// PatchCluster does nothing.
+func (l *lua) PatchCluster(_ *extensioncommon.RuntimeConfig, c *envoy_cluster_v3.Cluster) (*envoy_cluster_v3.Cluster, bool, error) {
+	return c, false, nil
+}
+
 // PatchFilter inserts a lua filter directly prior to envoy.filters.http.router.
-func (l *lua) PatchFilter(p extensioncommon.FilterPayload) (*envoy_listener_v3.Filter, bool, error) {
-	filter := p.Message
+func (l *lua) PatchFilter(_ *extensioncommon.RuntimeConfig, filter *envoy_listener_v3.Filter, isInboundListener bool) (*envoy_listener_v3.Filter, bool, error) {
 	// Make sure filter matches extension config.
-	if !l.matchesListenerDirection(p) {
+	if !l.matchesListenerDirection(isInboundListener) {
 		return filter, false, nil
 	}
 
@@ -94,7 +96,7 @@ func (l *lua) PatchFilter(p extensioncommon.FilterPayload) (*envoy_listener_v3.F
 	if config == nil {
 		return filter, false, errors.New("error unmarshalling filter")
 	}
-	luaHttpFilter, err := extensioncommon.MakeEnvoyHTTPFilter(
+	luaHttpFilter, err := makeEnvoyHTTPFilter(
 		"envoy.filters.http.lua",
 		&envoy_lua_v3.Lua{
 			InlineCode: l.Script,
@@ -124,7 +126,7 @@ func (l *lua) PatchFilter(p extensioncommon.FilterPayload) (*envoy_listener_v3.F
 		config.HttpFilters = changedFilters
 	}
 
-	newFilter, err := extensioncommon.MakeFilter("envoy.filters.network.http_connection_manager", config)
+	newFilter, err := makeFilter("envoy.filters.network.http_connection_manager", config)
 	if err != nil {
 		return filter, false, errors.New("error making new filter")
 	}
diff --git a/agent/envoyextensions/builtin/lua/lua_test.go b/agent/envoyextensions/builtin/lua/lua_test.go
index afe65d067f433..f67de3060081a 100644
--- a/agent/envoyextensions/builtin/lua/lua_test.go
+++ b/agent/envoyextensions/builtin/lua/lua_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lua
 
 import (
@@ -54,15 +51,6 @@ func TestConstructor(t *testing.T) {
 			arguments: makeArguments(map[string]interface{}{"Listener": "invalid"}),
 			ok:        false,
 		},
-		"default proxy type": {
-			arguments: makeArguments(map[string]interface{}{"ProxyType": ""}),
-			expected: lua{
-				ProxyType: "connect-proxy",
-				Listener:  "inbound",
-				Script:    "lua-script",
-			},
-			ok: true,
-		},
 		"valid everything": {
 			arguments: makeArguments(map[string]interface{}{}),
 			expected: lua{
diff --git a/agent/envoyextensions/builtin/otel-access-logging/otel_access_logging.go b/agent/envoyextensions/builtin/otel-access-logging/otel_access_logging.go
deleted file mode 100644
index 2f003b5525826..0000000000000
--- a/agent/envoyextensions/builtin/otel-access-logging/otel_access_logging.go
+++ /dev/null
@@ -1,274 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package otelaccesslogging
-
-import (
-	"fmt"
-
-	envoy_extensions_access_loggers_v3 "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3"
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	envoy_extensions_access_loggers_otel_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/open_telemetry/v3"
-	"github.com/mitchellh/mapstructure"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/api"
-	ext_cmn "github.com/hashicorp/consul/envoyextensions/extensioncommon"
-	"github.com/hashicorp/go-multierror"
-	v1 "go.opentelemetry.io/proto/otlp/common/v1"
-)
-
-type otelAccessLogging struct {
-	ext_cmn.BasicExtensionAdapter
-
-	// ProxyType identifies the type of Envoy proxy that this extension applies to.
-	// The extension will only be configured for proxies that match this type and
-	// will be ignored for all other proxy types.
-	ProxyType api.ServiceKind
-	// ListenerType controls which listener the extension applies to. It supports "inbound" or "outbound" listeners.
-	ListenerType string
-	// Config holds the extension configuration.
-	Config AccessLog
-}
-
-var _ ext_cmn.BasicExtension = (*otelAccessLogging)(nil)
-
-func Constructor(ext api.EnvoyExtension) (ext_cmn.EnvoyExtender, error) {
-	otel, err := newOTELAccessLogging(ext)
-	if err != nil {
-		return nil, err
-	}
-	return &ext_cmn.BasicEnvoyExtender{
-		Extension: otel,
-	}, nil
-}
-
-// CanApply indicates if the extension can be applied to the given extension runtime configuration.
-func (a *otelAccessLogging) CanApply(config *ext_cmn.RuntimeConfig) bool {
-	return config.Kind == api.ServiceKindConnectProxy
-}
-
-// PatchClusters modifies the cluster resources for the extension.
-//
-// If the extension is configured to target the OTEL service running on the local host network
-// this func will insert a cluster for calling that service. It does nothing if the extension is
-// configured to target an upstream service because the existing cluster for the upstream will be
-// used directly by the filter.
-func (a *otelAccessLogging) PatchClusters(cfg *ext_cmn.RuntimeConfig, c ext_cmn.ClusterMap) (ext_cmn.ClusterMap, error) {
-	cluster, err := a.Config.toEnvoyCluster(cfg)
-	if err != nil {
-		return c, err
-	}
-	if cluster != nil {
-		c[cluster.Name] = cluster
-	}
-	return c, nil
-}
-
-func (a *otelAccessLogging) matchesListenerDirection(p ext_cmn.FilterPayload) bool {
-	isInboundListener := p.IsInbound()
-	return (!isInboundListener && a.ListenerType == "outbound") || (isInboundListener && a.ListenerType == "inbound")
-}
-
-// PatchFilter adds the OTEL access log in the HTTP connection manager.
-func (a *otelAccessLogging) PatchFilter(p ext_cmn.FilterPayload) (*envoy_listener_v3.Filter, bool, error) {
-	filter := p.Message
-	// Make sure filter matches extension config.
-	if !a.matchesListenerDirection(p) {
-		return filter, false, nil
-	}
-
-	httpConnectionManager, _, err := ext_cmn.GetHTTPConnectionManager(filter)
-	if err != nil {
-		return filter, false, err
-	}
-
-	accessLog, err := a.toEnvoyAccessLog(p.RuntimeConfig)
-	if err != nil {
-		return filter, false, err
-	}
-
-	httpConnectionManager.AccessLog = append(httpConnectionManager.AccessLog, accessLog)
-	newHCM, err := ext_cmn.MakeFilter("envoy.filters.network.http_connection_manager", httpConnectionManager)
-	if err != nil {
-		return filter, false, err
-	}
-
-	return newHCM, true, nil
-}
-
-func newOTELAccessLogging(ext api.EnvoyExtension) (*otelAccessLogging, error) {
-	otel := &otelAccessLogging{}
-	if ext.Name != api.BuiltinOTELAccessLoggingExtension {
-		return otel, fmt.Errorf("expected extension name %q but got %q", api.BuiltinOTELAccessLoggingExtension, ext.Name)
-	}
-	if err := otel.fromArguments(ext.Arguments); err != nil {
-		return otel, err
-	}
-
-	return otel, nil
-}
-
-func (a *otelAccessLogging) fromArguments(args map[string]any) error {
-	if err := mapstructure.Decode(args, a); err != nil {
-		return err
-	}
-	a.normalize()
-	return a.validate()
-}
-
-func (a *otelAccessLogging) toEnvoyAccessLog(cfg *ext_cmn.RuntimeConfig) (*envoy_extensions_access_loggers_v3.AccessLog, error) {
-	commonConfig, err := a.Config.toEnvoyCommonGrpcAccessLogConfig(cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	body, err := toEnvoyAnyValue(a.Config.Body)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal Body: %w", err)
-	}
-
-	attributes, err := toEnvoyKeyValueList(a.Config.Attributes)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal Attributes: %w", err)
-	}
-
-	resourceAttributes, err := toEnvoyKeyValueList(a.Config.ResourceAttributes)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal ResourceAttributes: %w", err)
-	}
-
-	otelAccessLogConfig := &envoy_extensions_access_loggers_otel_v3.OpenTelemetryAccessLogConfig{
-		CommonConfig:       commonConfig,
-		Body:               body,
-		Attributes:         attributes,
-		ResourceAttributes: resourceAttributes,
-	}
-
-	// Marshal the struct to bytes.
-	otelAccessLogConfigBytes, err := proto.Marshal(otelAccessLogConfig)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal OpenTelemetryAccessLogConfig: %w", err)
-	}
-
-	return &envoy_extensions_access_loggers_v3.AccessLog{
-		Name: "envoy.access_loggers.open_telemetry",
-		ConfigType: &envoy_extensions_access_loggers_v3.AccessLog_TypedConfig{
-			TypedConfig: &anypb.Any{
-				Value:   otelAccessLogConfigBytes,
-				TypeUrl: "type.googleapis.com/envoy.extensions.access_loggers.open_telemetry.v3.OpenTelemetryAccessLogConfig",
-			},
-		},
-	}, nil
-}
-
-func (a *otelAccessLogging) normalize() {
-	if a.ProxyType == "" {
-		a.ProxyType = api.ServiceKindConnectProxy
-	}
-
-	if a.ListenerType == "" {
-		a.ListenerType = "inbound"
-	}
-
-	if a.Config.LogName == "" {
-		a.Config.LogName = a.ListenerType
-	}
-
-	a.Config.normalize()
-}
-
-func (a *otelAccessLogging) validate() error {
-	var resultErr error
-	if a.ProxyType != api.ServiceKindConnectProxy {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("unsupported ProxyType %q, only %q is supported",
-			a.ProxyType,
-			api.ServiceKindConnectProxy))
-	}
-
-	if a.ListenerType != "inbound" && a.ListenerType != "outbound" {
-		resultErr = multierror.Append(resultErr, fmt.Errorf(`unexpected ListenerType %q, supported values are "inbound" or "outbound"`, a.ListenerType))
-	}
-
-	if err := a.Config.validate(); err != nil {
-		resultErr = multierror.Append(resultErr, err)
-	}
-
-	return resultErr
-}
-
-func toEnvoyKeyValueList(attributes map[string]any) (*v1.KeyValueList, error) {
-	keyValueList := &v1.KeyValueList{}
-	for key, value := range attributes {
-		anyValue, err := toEnvoyAnyValue(value)
-		if err != nil {
-			return nil, err
-		}
-		keyValueList.Values = append(keyValueList.Values, &v1.KeyValue{
-			Key:   key,
-			Value: anyValue,
-		})
-	}
-
-	return keyValueList, nil
-}
-
-func toEnvoyAnyValue(value interface{}) (*v1.AnyValue, error) {
-	if value == nil {
-		return nil, nil
-	}
-
-	switch v := value.(type) {
-	case string:
-		return &v1.AnyValue{
-			Value: &v1.AnyValue_StringValue{
-				StringValue: v,
-			},
-		}, nil
-	case int:
-		return &v1.AnyValue{
-			Value: &v1.AnyValue_IntValue{
-				IntValue: int64(v),
-			},
-		}, nil
-	case int32:
-		return &v1.AnyValue{
-			Value: &v1.AnyValue_IntValue{
-				IntValue: int64(v),
-			},
-		}, nil
-	case int64:
-		return &v1.AnyValue{
-			Value: &v1.AnyValue_IntValue{
-				IntValue: v,
-			},
-		}, nil
-	case float32:
-		return &v1.AnyValue{
-			Value: &v1.AnyValue_DoubleValue{
-				DoubleValue: float64(v),
-			},
-		}, nil
-	case float64:
-		return &v1.AnyValue{
-			Value: &v1.AnyValue_DoubleValue{
-				DoubleValue: v,
-			},
-		}, nil
-	case bool:
-		return &v1.AnyValue{
-			Value: &v1.AnyValue_BoolValue{
-				BoolValue: v,
-			},
-		}, nil
-	case []byte:
-		return &v1.AnyValue{
-			Value: &v1.AnyValue_BytesValue{
-				BytesValue: v,
-			},
-		}, nil
-	default:
-		return nil, fmt.Errorf("unsupported type %T", v)
-	}
-}
diff --git a/agent/envoyextensions/builtin/otel-access-logging/otel_access_logging_test.go b/agent/envoyextensions/builtin/otel-access-logging/otel_access_logging_test.go
deleted file mode 100644
index 5c6b9ffa6636c..0000000000000
--- a/agent/envoyextensions/builtin/otel-access-logging/otel_access_logging_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package otelaccesslogging
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/envoyextensions/extensioncommon"
-)
-
-func TestConstructor(t *testing.T) {
-	makeArguments := func(overrides map[string]interface{}) map[string]interface{} {
-		m := map[string]interface{}{
-			"ProxyType":    "connect-proxy",
-			"ListenerType": "inbound",
-			"Config": AccessLog{
-				LogName: "access.log",
-				GrpcService: &GrpcService{
-					Target: &Target{
-						Service: api.CompoundServiceName{
-							Name:      "otel-collector",
-							Namespace: "default",
-							Partition: "default",
-						},
-					},
-				},
-			},
-		}
-
-		for k, v := range overrides {
-			m[k] = v
-		}
-
-		return m
-	}
-
-	cases := map[string]struct {
-		extensionName string
-		arguments     map[string]interface{}
-		expected      otelAccessLogging
-		ok            bool
-	}{
-		"with no arguments": {
-			arguments: nil,
-			ok:        false,
-		},
-		"with an invalid name": {
-			arguments:     makeArguments(map[string]interface{}{}),
-			extensionName: "bad",
-			ok:            false,
-		},
-		"invalid proxy type": {
-			arguments: makeArguments(map[string]interface{}{"ProxyType": "terminating-gateway"}),
-			ok:        false,
-		},
-		"invalid listener": {
-			arguments: makeArguments(map[string]interface{}{"ListenerType": "invalid"}),
-			ok:        false,
-		},
-		"default proxy type": {
-			arguments: makeArguments(map[string]interface{}{"ProxyType": ""}),
-			expected: otelAccessLogging{
-				ProxyType:    "connect-proxy",
-				ListenerType: "inbound",
-				Config: AccessLog{
-					LogName: "access.log",
-					GrpcService: &GrpcService{
-						Target: &Target{
-							Service: api.CompoundServiceName{
-								Name:      "otel-collector",
-								Namespace: "default",
-								Partition: "default",
-							},
-						},
-					},
-				},
-			},
-			ok: true,
-		},
-	}
-
-	for n, tc := range cases {
-		t.Run(n, func(t *testing.T) {
-
-			extensionName := api.BuiltinOTELAccessLoggingExtension
-			if tc.extensionName != "" {
-				extensionName = tc.extensionName
-			}
-
-			svc := api.CompoundServiceName{Name: "svc"}
-			ext := extensioncommon.RuntimeConfig{
-				ServiceName: svc,
-				EnvoyExtension: api.EnvoyExtension{
-					Name:      extensionName,
-					Arguments: tc.arguments,
-				},
-			}
-
-			e, err := Constructor(ext.EnvoyExtension)
-
-			if tc.ok {
-				require.NoError(t, err)
-				require.Equal(t, &extensioncommon.BasicEnvoyExtender{Extension: &tc.expected}, e)
-			} else {
-				require.Error(t, err)
-			}
-		})
-	}
-}
diff --git a/agent/envoyextensions/builtin/otel-access-logging/structs.go b/agent/envoyextensions/builtin/otel-access-logging/structs.go
deleted file mode 100644
index c6078679aa741..0000000000000
--- a/agent/envoyextensions/builtin/otel-access-logging/structs.go
+++ /dev/null
@@ -1,424 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package otelaccesslogging
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-
-	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
-	envoy_extensions_access_loggers_grpc_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/grpc/v3"
-	envoy_upstreams_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v3"
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/api"
-	cmn "github.com/hashicorp/consul/envoyextensions/extensioncommon"
-	"github.com/hashicorp/go-multierror"
-	"google.golang.org/protobuf/types/known/anypb"
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-)
-
-const (
-	LocalAccessLogClusterName = "local_access_log"
-
-	localhost     = "localhost"
-	localhostIPv4 = "127.0.0.1"
-	localhostIPv6 = "::1"
-)
-
-type AccessLog struct {
-	LogName                 string
-	GrpcService             *GrpcService
-	BufferFlushInterval     *time.Duration
-	BufferSizeBytes         uint32
-	FilterStateObjectsToLog []string
-	RetryPolicy             *RetryPolicy
-	Body                    any
-	Attributes              map[string]any
-	ResourceAttributes      map[string]any
-}
-
-func (a *AccessLog) normalize() {
-	if a.GrpcService != nil {
-		a.GrpcService.normalize()
-	}
-
-	if a.RetryPolicy != nil {
-		a.RetryPolicy.normalize()
-	}
-}
-
-func (a *AccessLog) validate() error {
-	a.normalize()
-
-	if a.GrpcService == nil {
-		return fmt.Errorf("missing GrpcService")
-	}
-
-	var resultErr error
-
-	var field string
-	var validate func() error
-	field = "GrpcService"
-	validate = a.GrpcService.validate
-
-	if err := validate(); err != nil {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("failed to validate Config.%s: %w", field, err))
-	}
-
-	return resultErr
-}
-
-func (a *AccessLog) envoyGrpcService(cfg *cmn.RuntimeConfig) (*envoy_core_v3.GrpcService, error) {
-	target := a.GrpcService.Target
-	clusterName, err := a.getClusterName(cfg, target)
-	if err != nil {
-		return nil, err
-	}
-
-	var initialMetadata []*envoy_core_v3.HeaderValue
-	for _, meta := range a.GrpcService.InitialMetadata {
-		initialMetadata = append(initialMetadata, meta.toEnvoy())
-	}
-
-	return &envoy_core_v3.GrpcService{
-		TargetSpecifier: &envoy_core_v3.GrpcService_EnvoyGrpc_{
-			EnvoyGrpc: &envoy_core_v3.GrpcService_EnvoyGrpc{
-				ClusterName: clusterName,
-				Authority:   a.GrpcService.Authority,
-			},
-		},
-		Timeout:         target.timeoutDurationPB(),
-		InitialMetadata: initialMetadata,
-	}, nil
-}
-
-// getClusterName returns the name of the cluster for the OpenTelemetry access logging service.
-// If the extension is configured with an upstream OpenTelemetry access logging service then the name of the cluster for
-// that upstream is returned. If the extension is configured with a URI, the only allowed host is `localhost`
-// and the extension will insert a new cluster with the name "local_access_log", so we use that name.
-func (a *AccessLog) getClusterName(cfg *cmn.RuntimeConfig, target *Target) (string, error) {
-	var err error
-	clusterName := LocalAccessLogClusterName
-	if target.isService() {
-		if clusterName, err = target.clusterName(cfg); err != nil {
-			return "", err
-		}
-	}
-	return clusterName, nil
-}
-
-// toEnvoyCluster returns an Envoy cluster for connecting to the OpenTelemetry access logging service.
-// If the extension is configured with the OpenTelemetry access logging service locally via the URI set to localhost,
-// this func will return a new cluster definition that will allow the proxy to connect to the OpenTelemetry access logging
-// service running on localhost on the configured port.
-//
-// If the extension is configured with the OpenTelemetry access logging service as an upstream there is no need to insert
-// a new cluster so this method returns nil.
-func (a *AccessLog) toEnvoyCluster(_ *cmn.RuntimeConfig) (*envoy_cluster_v3.Cluster, error) {
-	target := a.GrpcService.Target
-
-	// If the target is an upstream we do not need to create a cluster. We will use the cluster of the upstream.
-	if target.isService() {
-		return nil, nil
-	}
-
-	host, port, err := target.addr()
-	if err != nil {
-		return nil, err
-	}
-
-	clusterType := &envoy_cluster_v3.Cluster_Type{Type: envoy_cluster_v3.Cluster_STATIC}
-	if host == localhost {
-		// If the host is "localhost" use a STRICT_DNS cluster type to perform DNS lookup.
-		clusterType = &envoy_cluster_v3.Cluster_Type{Type: envoy_cluster_v3.Cluster_STRICT_DNS}
-	}
-
-	var typedExtProtoOpts map[string]*anypb.Any
-
-	httpProtoOpts := &envoy_upstreams_http_v3.HttpProtocolOptions{
-		UpstreamProtocolOptions: &envoy_upstreams_http_v3.HttpProtocolOptions_ExplicitHttpConfig_{
-			ExplicitHttpConfig: &envoy_upstreams_http_v3.HttpProtocolOptions_ExplicitHttpConfig{
-				ProtocolConfig: &envoy_upstreams_http_v3.HttpProtocolOptions_ExplicitHttpConfig_Http2ProtocolOptions{},
-			},
-		},
-	}
-	httpProtoOptsAny, err := anypb.New(httpProtoOpts)
-	if err != nil {
-		return nil, err
-	}
-	typedExtProtoOpts = make(map[string]*anypb.Any)
-	typedExtProtoOpts["envoy.extensions.upstreams.http.v3.HttpProtocolOptions"] = httpProtoOptsAny
-
-	return &envoy_cluster_v3.Cluster{
-		Name:                 LocalAccessLogClusterName,
-		ClusterDiscoveryType: clusterType,
-		ConnectTimeout:       target.timeoutDurationPB(),
-		LoadAssignment: &envoy_endpoint_v3.ClusterLoadAssignment{
-			ClusterName: LocalAccessLogClusterName,
-			Endpoints: []*envoy_endpoint_v3.LocalityLbEndpoints{
-				{
-					LbEndpoints: []*envoy_endpoint_v3.LbEndpoint{{
-						HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
-							Endpoint: &envoy_endpoint_v3.Endpoint{
-								Address: &envoy_core_v3.Address{
-									Address: &envoy_core_v3.Address_SocketAddress{
-										SocketAddress: &envoy_core_v3.SocketAddress{
-											Address: host,
-											PortSpecifier: &envoy_core_v3.SocketAddress_PortValue{
-												PortValue: uint32(port),
-											},
-										},
-									},
-								},
-							},
-						},
-					}},
-				},
-			},
-		},
-		TypedExtensionProtocolOptions: typedExtProtoOpts,
-	}, nil
-}
-
-func (a *AccessLog) toEnvoyCommonGrpcAccessLogConfig(cfg *cmn.RuntimeConfig) (*envoy_extensions_access_loggers_grpc_v3.CommonGrpcAccessLogConfig, error) {
-	config := &envoy_extensions_access_loggers_grpc_v3.CommonGrpcAccessLogConfig{
-		LogName:                 a.LogName,
-		BufferSizeBytes:         wrapperspb.UInt32(a.BufferSizeBytes),
-		FilterStateObjectsToLog: a.FilterStateObjectsToLog,
-		TransportApiVersion:     envoy_core_v3.ApiVersion_V3,
-	}
-
-	if a.BufferFlushInterval != nil {
-		config.BufferFlushInterval = durationpb.New(*a.BufferFlushInterval)
-	}
-
-	if a.RetryPolicy != nil {
-		config.GrpcStreamRetryPolicy = a.RetryPolicy.toEnvoy()
-	}
-
-	grpcSvc, err := a.envoyGrpcService(cfg)
-	if err != nil {
-		return nil, err
-	}
-	config.GrpcService = grpcSvc
-
-	return config, nil
-}
-
-type GrpcService struct {
-	Target          *Target
-	Authority       string
-	InitialMetadata []*HeaderValue
-}
-
-func (v *GrpcService) normalize() {
-	if v == nil {
-		return
-	}
-	v.Target.normalize()
-}
-
-func (v *GrpcService) validate() error {
-	var resultErr error
-	if v == nil {
-		return resultErr
-	}
-
-	if v.Target == nil {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("GrpcService.Target must be set"))
-	}
-	if err := v.Target.validate(); err != nil {
-		resultErr = multierror.Append(resultErr, err)
-	}
-	return resultErr
-}
-
-type HeaderValue struct {
-	Key   string
-	Value string
-}
-
-func (h *HeaderValue) toEnvoy() *envoy_core_v3.HeaderValue {
-	if h == nil {
-		return nil
-	}
-	return &envoy_core_v3.HeaderValue{Key: h.Key, Value: h.Value}
-}
-
-type Target struct {
-	Service api.CompoundServiceName
-	URI     string
-	Timeout string
-
-	timeout *time.Duration
-	host    string
-	port    int
-}
-
-// addr returns the host and port for the target when the target is a URI.
-// It returns a non-nil error if the target is not a URI.
-func (t Target) addr() (string, int, error) {
-	if !t.isURI() {
-		return "", 0, fmt.Errorf("target is not configured with a URI, set Target.URI")
-	}
-	return t.host, t.port, nil
-}
-
-// clusterName returns the cluster name for the target when the target is an upstream service.
-// It searches through the upstreams in the provided runtime configuration and returns the name
-// of the cluster for the first upstream service that matches the target service.
-// It returns a non-nil error if a matching cluster is not found or if the target is not an
-// upstream service.
-func (t Target) clusterName(cfg *cmn.RuntimeConfig) (string, error) {
-	if !t.isService() {
-		return "", fmt.Errorf("target is not configured with an upstream service, set Target.Service")
-	}
-
-	for service, upstream := range cfg.Upstreams {
-		if service == t.Service {
-			for sni := range upstream.SNIs {
-				return sni, nil
-			}
-		}
-	}
-	return "", fmt.Errorf("no upstream definition found for service %q", t.Service.Name)
-}
-
-func (t Target) isService() bool {
-	return t.Service.Name != ""
-}
-
-func (t Target) isURI() bool {
-	return t.URI != ""
-}
-
-func (t *Target) normalize() {
-	if t == nil {
-		return
-	}
-	t.Service.Namespace = acl.NamespaceOrDefault(t.Service.Namespace)
-	t.Service.Partition = acl.PartitionOrDefault(t.Service.Partition)
-}
-
-// timeoutDurationPB returns the target's timeout as a *durationpb.Duration.
-// It returns nil if the timeout has not been explicitly set.
-func (t *Target) timeoutDurationPB() *durationpb.Duration {
-	if t == nil || t.timeout == nil {
-		return nil
-	}
-	return durationpb.New(*t.timeout)
-}
-
-func (t *Target) validate() error {
-	var err, resultErr error
-	if t == nil {
-		return resultErr
-	}
-
-	if t.isURI() == t.isService() {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("exactly one of Target.Service or Target.URI must be set"))
-	}
-
-	if t.isURI() {
-		t.host, t.port, err = parseAddr(t.URI)
-		if err == nil {
-			switch t.host {
-			case localhost, localhostIPv4, localhostIPv6:
-			default:
-				resultErr = multierror.Append(resultErr,
-					fmt.Errorf("invalid host for Target.URI %q: expected %q, %q, or %q", t.URI, localhost, localhostIPv4, localhostIPv6))
-			}
-		} else {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("invalid format for Target.URI %q: expected host:port", t.URI))
-		}
-	}
-
-	if t.Timeout != "" {
-		if d, err := time.ParseDuration(t.Timeout); err == nil {
-			t.timeout = &d
-		} else {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("failed to parse Target.Timeout %q as a duration: %w", t.Timeout, err))
-		}
-	}
-	return resultErr
-}
-
-type RetryPolicy struct {
-	RetryBackOff *RetryBackOff
-	NumRetries   uint32
-}
-
-func (r *RetryPolicy) normalize() {
-	if r == nil {
-		return
-	}
-	r.RetryBackOff.normalize()
-}
-
-func (r *RetryPolicy) toEnvoy() *envoy_core_v3.RetryPolicy {
-	if r == nil {
-		return nil
-	}
-
-	return &envoy_core_v3.RetryPolicy{
-		RetryBackOff: r.RetryBackOff.toEnvoy(),
-		NumRetries:   wrapperspb.UInt32(r.NumRetries),
-	}
-}
-
-type RetryBackOff struct {
-	BaseInterval *time.Duration
-	MaxInterval  *time.Duration
-}
-
-func (v *RetryBackOff) normalize() {
-	if v == nil {
-		return
-	}
-
-	if v.BaseInterval == nil {
-		v.BaseInterval = new(time.Duration)
-		*v.BaseInterval = time.Second
-	}
-
-	if v.MaxInterval == nil {
-		v.MaxInterval = new(time.Duration)
-		*v.MaxInterval = time.Second * 30
-	}
-}
-
-func (r *RetryBackOff) toEnvoy() *envoy_core_v3.BackoffStrategy {
-	if r == nil {
-		return nil
-	}
-
-	return &envoy_core_v3.BackoffStrategy{
-		BaseInterval: durationpb.New(*r.BaseInterval),
-		MaxInterval:  durationpb.New(*r.MaxInterval),
-	}
-}
-
-func parseAddr(s string) (host string, port int, err error) {
-	// Strip the protocol if one was provided
-	if _, addr, hasProto := strings.Cut(s, "://"); hasProto {
-		s = addr
-	}
-	idx := strings.LastIndex(s, ":")
-	switch idx {
-	case -1, len(s) - 1:
-		err = fmt.Errorf("invalid input format %q: expected host:port", s)
-	case 0:
-		host = localhost
-		port, err = strconv.Atoi(s[idx+1:])
-	default:
-		host = s[:idx]
-		port, err = strconv.Atoi(s[idx+1:])
-	}
-	return
-}
diff --git a/agent/envoyextensions/builtin/property-override/property_override.go b/agent/envoyextensions/builtin/property-override/property_override.go
deleted file mode 100644
index 70577a56e3d40..0000000000000
--- a/agent/envoyextensions/builtin/property-override/property_override.go
+++ /dev/null
@@ -1,375 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package propertyoverride
-
-import (
-	"fmt"
-
-	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
-	"github.com/hashicorp/consul/lib/decode"
-	"github.com/hashicorp/go-multierror"
-	"github.com/mitchellh/mapstructure"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/envoyextensions/extensioncommon"
-)
-
-type propertyOverride struct {
-	extensioncommon.BasicExtensionAdapter
-	// Patches are an array of Patch operations to be applied to the target resource(s).
-	Patches []Patch
-	// Debug controls error messages when Path matching fails.
-	// When set to true, all possible fields for the unmatched segment of the Path are returned.
-	// When set to false, only the first ten possible fields are returned.
-	Debug bool
-	// ProxyType identifies the type of Envoy proxy that this extension applies to.
-	// The extension will only be configured for proxies that match this type and
-	// will be ignored for all other proxy types.
-	ProxyType api.ServiceKind
-}
-
-// ResourceFilter matches specific Envoy resources to target with a Patch operation.
-type ResourceFilter struct {
-	// ResourceType specifies the Envoy resource type the patch applies to. Valid values are
-	// `cluster`, `route`, `endpoint`, and `listener`.
-	// This field is required.
-	ResourceType ResourceType
-	// TrafficDirection determines whether the patch will be applied to a service's inbound
-	// or outbound resources.
-	// This field is required.
-	TrafficDirection extensioncommon.TrafficDirection
-
-	// Services indicates which upstream services will have corresponding Envoy resources patched.
-	// This includes directly targeted and discovery chain services. If Services is omitted or
-	// empty, all resources matching the filter will be targeted (including TProxy, which
-	// implicitly corresponds to any number of upstreams). Services must be omitted unless
-	// TrafficDirection is set to outbound.
-	Services []*ServiceName
-}
-
-func matchesResourceFilter[K proto.Message](rf ResourceFilter, resourceType ResourceType, payload extensioncommon.Payload[K]) bool {
-	if resourceType != rf.ResourceType {
-		return false
-	}
-
-	if payload.TrafficDirection != rf.TrafficDirection {
-		return false
-	}
-
-	if len(rf.Services) == 0 {
-		return true
-	}
-
-	for _, s := range rf.Services {
-		if payload.ServiceName == nil || s.CompoundServiceName != *payload.ServiceName {
-			continue
-		}
-
-		return true
-	}
-
-	return false
-}
-
-type ServiceName struct {
-	api.CompoundServiceName `mapstructure:",squash"`
-}
-
-// ResourceType is the type of Envoy resource being patched.
-type ResourceType string
-
-const (
-	ResourceTypeCluster               ResourceType = "cluster"
-	ResourceTypeClusterLoadAssignment ResourceType = "cluster-load-assignment"
-	ResourceTypeListener              ResourceType = "listener"
-	ResourceTypeRoute                 ResourceType = "route"
-)
-
-var ResourceTypes = extensioncommon.StringSet{
-	string(ResourceTypeCluster):               {},
-	string(ResourceTypeClusterLoadAssignment): {},
-	string(ResourceTypeRoute):                 {},
-	string(ResourceTypeListener):              {},
-}
-
-// Op is the type of JSON Patch operation being applied.
-type Op string
-
-const (
-	OpAdd    Op = "add"
-	OpRemove Op = "remove"
-)
-
-var Ops = extensioncommon.StringSet{string(OpAdd): {}, string(OpRemove): {}}
-
-// validProxyTypes is the set of supported proxy types for this extension.
-var validProxyTypes = extensioncommon.StringSet{
-	// For now, we only support `connect-proxy`.
-	string(api.ServiceKindConnectProxy): struct{}{},
-}
-
-// Patch describes a single patch operation to modify the specific field of matching
-// Envoy resources.
-//
-// The semantics of Patch closely resemble those of JSON Patch (https://jsonpatch.com/,
-// https://datatracker.ietf.org/doc/html/rfc6902/).
-type Patch struct {
-	// ResourceFilter determines which Envoy resource(s) will be patched. ResourceFilter and
-	// its subfields are not part of the JSON Patch specification.
-	// This field is required.
-	ResourceFilter ResourceFilter
-	// Op represents the JSON Patch operation to be applied by the patch. Supported ops are
-	// `add` and `remove`:
-	//   - add: Replaces a field with the current value at the specified Path. (Note that
-	//     JSON Patch does not inherently support object “merges”, which must be implemented
-	//     using one discrete add per changed field.)
-	//   - remove: Sets the value at the given path to `nil`. As with `add`, if the target
-	//     field does not exist in the corresponding schema, an error is returned; this
-	//     conforms to JSON Patch semantics and is intended to avoid silent failure when a
-	//     field removal is expected.
-	// This field is required.
-	Op Op
-	// Path specifies where the patch will be applied on a target resource. Path does not
-	// support array member lookups or appending (`-`).
-	//
-	// When an unset but schema-valid (i.e. specified in the corresponding Envoy resource
-	// .proto) intermediate message field is encountered on the Path, that field will be
-	// set to its non-`nil` empty (default) value and evaluation will continue. This means
-	// that even if parents of a field for a given Path are unset, a single patch can set
-	// deeply nested children of that parent. Subsequent patching of these initialized
-	// parent field(s) may be necessary to satisfy validation or configuration requirements.
-	// This field is required.
-	Path string
-	// Value specifies the value that will be set at the given Path in a target resource in
-	// an `add` operation.
-	//
-	// Value must be a map with scalar values, a scalar value, or an array of scalar values.
-	// (Note that this along with the Path constraints noted above imply that setting values
-	// nested within non-scalar arrays is not supported.)
-	//
-	// In every case, the target field will be replaced entirely with the specified value;
-	// this conforms to JSON Patch `add` semantics. If Value is a map, the non-`nil` empty
-	// value for the target field will be placed at the specified Path, and then the fields
-	// specified in the Value map will be explicitly set.
-	// This field is required if the Op is compatible with a Value per JSON Patch semantics
-	// (e.g. `add`), and must not be set otherwise.
-	Value any
-}
-
-var _ extensioncommon.BasicExtension = (*propertyOverride)(nil)
-
-func (f *ResourceFilter) isEmpty() bool {
-	if f == nil {
-		return true
-	}
-
-	if len(f.Services) > 0 {
-		return false
-	}
-
-	if string(f.TrafficDirection) != "" {
-		return false
-	}
-
-	if string(f.ResourceType) != "" {
-		return false
-	}
-
-	return true
-}
-
-func (f *ResourceFilter) validate() error {
-	if f == nil || f.isEmpty() {
-		return fmt.Errorf("field ResourceFilter is required")
-	}
-	if err := ResourceTypes.CheckRequired(string(f.ResourceType), "ResourceType"); err != nil {
-		return err
-	}
-	if err := extensioncommon.TrafficDirections.CheckRequired(string(f.TrafficDirection), "TrafficDirection"); err != nil {
-		return err
-	}
-
-	if len(f.Services) > 0 && f.TrafficDirection != extensioncommon.TrafficDirectionOutbound {
-		return fmt.Errorf("patch contains non-empty ResourceFilter.Services but ResourceFilter.TrafficDirection is not %q",
-			extensioncommon.TrafficDirectionOutbound)
-	}
-	for i := range f.Services {
-		sn := f.Services[i]
-		sn.normalize()
-
-		if err := sn.validate(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (sn *ServiceName) normalize() {
-	extensioncommon.NormalizeServiceName(&sn.CompoundServiceName)
-}
-
-func (sn *ServiceName) validate() error {
-	if sn.Name == "" {
-		return fmt.Errorf("service name is required")
-	}
-
-	return nil
-}
-
-// validate validates the fields of an individual Patch.
-func (p *Patch) validate(debug bool) error {
-	if err := p.ResourceFilter.validate(); err != nil {
-		return err
-	}
-
-	if err := Ops.CheckRequired(string(p.Op), "Op"); err != nil {
-		return err
-	}
-
-	if p.Value != nil && p.Op != OpAdd {
-		return fmt.Errorf("field Value is not supported for %s operation", p.Op)
-	}
-
-	// Attempt to execute the patch by applying it to a dummy empty struct.
-	var err error
-	switch p.ResourceFilter.ResourceType {
-	case ResourceTypeCluster:
-		_, err = PatchStruct(&envoy_cluster_v3.Cluster{}, *p, debug)
-	case ResourceTypeClusterLoadAssignment:
-		_, err = PatchStruct(&envoy_endpoint_v3.ClusterLoadAssignment{}, *p, debug)
-	case ResourceTypeRoute:
-		_, err = PatchStruct(&envoy_route_v3.RouteConfiguration{}, *p, debug)
-	case ResourceTypeListener:
-		_, err = PatchStruct(&envoy_listener_v3.Listener{}, *p, debug)
-	default:
-		return fmt.Errorf("path validation unimplemented for %q", p.ResourceFilter.ResourceType)
-	}
-
-	return err
-}
-
-// validate validates the fields of the property-override extension, including all of its
-// configured Patches.
-func (p *propertyOverride) validate() error {
-	if len(p.Patches) == 0 {
-		return fmt.Errorf("at least one patch is required")
-	}
-
-	var resultErr error
-	for i, patch := range p.Patches {
-		if err := patch.validate(p.Debug); err != nil {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("invalid Patches[%d]: %w", i, err))
-		}
-	}
-
-	if p.ProxyType == "" {
-		p.ProxyType = api.ServiceKindConnectProxy
-	}
-	if err := validProxyTypes.CheckRequired(string(p.ProxyType), "ProxyType"); err != nil {
-		resultErr = multierror.Append(resultErr, err)
-	}
-
-	return resultErr
-}
-
-// Constructor follows a specific function signature required for the extension registration.
-// It constructs a BasicEnvoyExtender with a patch Extension from the arguments provided by ext.
-func Constructor(ext api.EnvoyExtension) (extensioncommon.EnvoyExtender, error) {
-	var p propertyOverride
-
-	if name := ext.Name; name != api.BuiltinPropertyOverrideExtension {
-		return nil, fmt.Errorf("expected extension name %q but got %q", api.BuiltinPropertyOverrideExtension, name)
-	}
-	// This avoids issues with decoding nested slices, which are error-prone
-	// due to slice<->map coercion by mapstructure. See HookWeakDecodeFromSlice
-	// and WeaklyTypedInput docs for more details.
-	d, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
-		DecodeHook: mapstructure.ComposeDecodeHookFunc(
-			decode.HookWeakDecodeFromSlice,
-			decode.HookTranslateKeys,
-		),
-		WeaklyTypedInput: true,
-		Result:           &p,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("error configuring decoder: %v", err)
-	}
-	if err := d.Decode(ext.Arguments); err != nil {
-		return nil, fmt.Errorf("error decoding extension arguments: %v", err)
-	}
-	if err := p.validate(); err != nil {
-		return nil, err
-	}
-
-	return &extensioncommon.BasicEnvoyExtender{
-		Extension: &p,
-	}, nil
-}
-
-// CanApply returns true if the ProxyType of the extension config matches the kind of the local proxy indicated by the
-// RuntimeConfig.
-func (p *propertyOverride) CanApply(config *extensioncommon.RuntimeConfig) bool {
-	return config.Kind == p.ProxyType
-}
-
-// PatchRoute patches the provided Envoy Route with any applicable `route` ResourceType patches.
-func (p *propertyOverride) PatchRoute(payload extensioncommon.RoutePayload) (*envoy_route_v3.RouteConfiguration, bool, error) {
-	return patchResourceType[*envoy_route_v3.RouteConfiguration](p, ResourceTypeRoute, payload, &defaultStructPatcher[*envoy_route_v3.RouteConfiguration]{})
-}
-
-// PatchCluster patches the provided Envoy Cluster with any applicable `cluster` ResourceType patches.
-func (p *propertyOverride) PatchCluster(payload extensioncommon.ClusterPayload) (*envoy_cluster_v3.Cluster, bool, error) {
-	return patchResourceType[*envoy_cluster_v3.Cluster](p, ResourceTypeCluster, payload, &defaultStructPatcher[*envoy_cluster_v3.Cluster]{})
-}
-
-// PatchClusterLoadAssignment patches the provided Envoy ClusterLoadAssignment with any applicable `cluster-load-assignment` ResourceType patches.
-func (p *propertyOverride) PatchClusterLoadAssignment(payload extensioncommon.ClusterLoadAssignmentPayload) (*envoy_endpoint_v3.ClusterLoadAssignment, bool, error) {
-	return patchResourceType[*envoy_endpoint_v3.ClusterLoadAssignment](p, ResourceTypeClusterLoadAssignment, payload, &defaultStructPatcher[*envoy_endpoint_v3.ClusterLoadAssignment]{})
-}
-
-// PatchListener patches the provided Envoy Listener with any applicable `listener` ResourceType patches.
-func (p *propertyOverride) PatchListener(payload extensioncommon.ListenerPayload) (*envoy_listener_v3.Listener, bool, error) {
-	return patchResourceType[*envoy_listener_v3.Listener](p, ResourceTypeListener, payload, &defaultStructPatcher[*envoy_listener_v3.Listener]{})
-}
-
-// patchResourceType applies Patches matching the given ResourceType to the target K.
-// This helper simplifies implementation of the above per-type patch methods defined by BasicExtension.
-func patchResourceType[K proto.Message](p *propertyOverride, resourceType ResourceType, payload extensioncommon.Payload[K], patcher structPatcher[K]) (K, bool, error) {
-	resultPatched := false
-	var resultErr error
-
-	k := payload.Message
-
-	for _, patch := range p.Patches {
-		if !matchesResourceFilter(patch.ResourceFilter, resourceType, payload) {
-			continue
-		}
-		newK, err := patcher.applyPatch(k, patch, p.Debug)
-		if err != nil {
-			resultErr = multierror.Append(resultErr, err)
-		} else {
-			k = newK
-			resultPatched = true
-		}
-	}
-
-	return k, resultPatched && resultErr == nil, resultErr
-}
-
-// structPatcher allows us to mock applyPatch in tests.
-type structPatcher[K proto.Message] interface {
-	applyPatch(k K, patch Patch, debug bool) (result K, e error)
-}
-
-type defaultStructPatcher[K proto.Message] struct {
-}
-
-func (patcher *defaultStructPatcher[K]) applyPatch(k K, patch Patch, debug bool) (result K, e error) {
-	return PatchStruct(k, patch, debug)
-}
diff --git a/agent/envoyextensions/builtin/property-override/property_override_test.go b/agent/envoyextensions/builtin/property-override/property_override_test.go
deleted file mode 100644
index 20febc21074db..0000000000000
--- a/agent/envoyextensions/builtin/property-override/property_override_test.go
+++ /dev/null
@@ -1,702 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package propertyoverride
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	clusterv3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	endpointv3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
-	listenerv3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	routev3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/envoyextensions/extensioncommon"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-)
-
-// TestConstructor tests raw input to the Constructor function called to initialize
-// the property-override extension. This includes implicit validation of the deserialized
-// input to the extension.
-func TestConstructor(t *testing.T) {
-	// These helpers aid in constructing valid raw example input (map[string]any)
-	// for the Constructor, with optional overrides for fields under test.
-	applyOverrides := func(m map[string]any, overrides map[string]any) map[string]any {
-		for k, v := range overrides {
-			if v == nil {
-				delete(m, k)
-			} else {
-				m[k] = v
-			}
-		}
-		return m
-	}
-	makeResourceFilter := func(overrides map[string]any) map[string]any {
-		f := map[string]any{
-			"ResourceType":     ResourceTypeRoute,
-			"TrafficDirection": extensioncommon.TrafficDirectionOutbound,
-		}
-		return applyOverrides(f, overrides)
-	}
-	makePatch := func(overrides map[string]any) map[string]any {
-		p := map[string]any{
-			"ResourceFilter": makeResourceFilter(map[string]any{}),
-			"Op":             OpAdd,
-			"Path":           "/name",
-			"Value":          "foo",
-		}
-		return applyOverrides(p, overrides)
-	}
-	makeArguments := func(overrides map[string]any) map[string]any {
-		a := map[string]any{
-			"Patches": []map[string]any{
-				makePatch(map[string]any{}),
-			},
-			"Debug":     true,
-			"ProxyType": api.ServiceKindConnectProxy,
-		}
-		return applyOverrides(a, overrides)
-	}
-	type testCase struct {
-		extensionName string
-		arguments     map[string]any
-		expected      propertyOverride
-		ok            bool
-		errMsg        string
-		errFunc       func(*testing.T, error)
-	}
-
-	validTestCase := func(o Op, d extensioncommon.TrafficDirection, t ResourceType) testCase {
-		var v any = "foo"
-		if o != OpAdd {
-			v = nil
-		}
-
-		// Use a valid field for all resource types.
-		path := "/name"
-		if t == ResourceTypeClusterLoadAssignment {
-			path = "/cluster_name"
-		}
-
-		return testCase{
-			arguments: makeArguments(map[string]any{
-				"Patches": []map[string]any{
-					makePatch(map[string]any{
-						"ResourceFilter": makeResourceFilter(map[string]any{
-							"ResourceType":     t,
-							"TrafficDirection": d,
-						}),
-						"Op":    o,
-						"Path":  path,
-						"Value": v,
-					}),
-				},
-			}),
-			expected: propertyOverride{
-				Patches: []Patch{
-					{
-						ResourceFilter: ResourceFilter{
-							ResourceType:     t,
-							TrafficDirection: d,
-						},
-						Op:    o,
-						Path:  path,
-						Value: v,
-					},
-				},
-				Debug:     true,
-				ProxyType: api.ServiceKindConnectProxy,
-			},
-			ok: true,
-		}
-	}
-	cases := map[string]testCase{
-		"with no arguments": {
-			arguments: nil,
-			ok:        false,
-			errMsg:    "at least one patch is required",
-		},
-		"with an invalid name": {
-			arguments:     makeArguments(map[string]any{}),
-			extensionName: "bad",
-			ok:            false,
-			errMsg:        "expected extension name \"builtin/property-override\" but got \"bad\"",
-		},
-		"empty Patches": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{}}),
-			ok:        false,
-			errMsg:    "at least one patch is required",
-		},
-		"patch with no ResourceFilter": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{
-				makePatch(map[string]any{
-					"ResourceFilter": nil,
-				}),
-			}}),
-			ok:     false,
-			errMsg: "field ResourceFilter is required",
-		},
-		"patch with no ResourceType": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{
-				makePatch(map[string]any{
-					"ResourceFilter": makeResourceFilter(map[string]any{
-						"ResourceType": nil,
-					}),
-				}),
-			}}),
-			ok:     false,
-			errMsg: "field ResourceType is required",
-		},
-		"patch with invalid ResourceType": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{
-				makePatch(map[string]any{
-					"ResourceFilter": makeResourceFilter(map[string]any{
-						"ResourceType": "foo",
-					}),
-				}),
-			}}),
-			ok:     false,
-			errMsg: "invalid ResourceType",
-		},
-		"patch with no TrafficDirection": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{
-				makePatch(map[string]any{
-					"ResourceFilter": makeResourceFilter(map[string]any{
-						"TrafficDirection": nil,
-					}),
-				}),
-			}}),
-			ok:     false,
-			errMsg: "field TrafficDirection is required",
-		},
-		"patch with invalid TrafficDirection": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{
-				makePatch(map[string]any{
-					"ResourceFilter": makeResourceFilter(map[string]any{
-						"TrafficDirection": "foo",
-					}),
-				}),
-			}}),
-			ok:     false,
-			errMsg: "invalid TrafficDirection",
-		},
-		"patch with no Op": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{
-				makePatch(map[string]any{
-					"Op": nil,
-				}),
-			}}),
-			ok:     false,
-			errMsg: "field Op is required",
-		},
-		"patch with invalid Op": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{
-				makePatch(map[string]any{
-					"Op": "foo",
-				}),
-			}}),
-			ok:     false,
-			errMsg: "invalid Op",
-		},
-		"patch with invalid Envoy resource Path": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{
-				makePatch(map[string]any{
-					"Path": "/invalid",
-				}),
-			}}),
-			ok:     false,
-			errMsg: "no match for field", // this error comes from the patcher dry-run attempt
-		},
-		"non-Add patch with Value": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{
-				makePatch(map[string]any{
-					"Op":    OpRemove,
-					"Value": 1,
-				}),
-			}}),
-			ok:     false,
-			errMsg: fmt.Sprintf("field Value is not supported for %s operation", OpRemove),
-		},
-		"multiple patches includes indexed errors": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{
-				makePatch(map[string]any{
-					"Op":    OpRemove,
-					"Value": 0,
-				}),
-				makePatch(map[string]any{
-					"Op":    OpAdd,
-					"Value": nil,
-				}),
-				makePatch(map[string]any{
-					"Op":   OpAdd,
-					"Path": "/foo",
-				}),
-			}}),
-			ok: false,
-			errFunc: func(t *testing.T, err error) {
-				require.ErrorContains(t, err, "invalid Patches[0]: field Value is not supported for remove operation")
-				require.ErrorContains(t, err, "invalid Patches[1]: non-nil Value is required")
-				require.ErrorContains(t, err, "invalid Patches[2]: no match for field 'foo'")
-			},
-		},
-		"multiple patches single error contains correct index": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{
-				makePatch(map[string]any{
-					"Op":    OpAdd,
-					"Value": "foo",
-				}),
-				makePatch(map[string]any{
-					"Op":    OpRemove,
-					"Value": 1,
-				}),
-				makePatch(map[string]any{
-					"Op":    OpAdd,
-					"Value": "bar",
-				}),
-			}}),
-			ok: false,
-			errFunc: func(t *testing.T, err error) {
-				require.ErrorContains(t, err, "invalid Patches[1]: field Value is not supported for remove operation")
-				require.NotContains(t, err.Error(), "invalid Patches[0]")
-				require.NotContains(t, err.Error(), "invalid Patches[2]")
-			},
-		},
-		"empty service name": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{
-				makePatch(map[string]any{
-					"ResourceFilter": makeResourceFilter(map[string]any{
-						"Services": []map[string]any{
-							{},
-						},
-					}),
-				}),
-			}}),
-			ok:     false,
-			errMsg: "service name is required",
-		},
-		"non-empty services with invalid traffic direction": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{
-				makePatch(map[string]any{
-					"ResourceFilter": makeResourceFilter(map[string]any{
-						"TrafficDirection": extensioncommon.TrafficDirectionInbound,
-						"Services": []map[string]any{
-							{"Name:": "foo"},
-						},
-					}),
-				}),
-			}}),
-			ok:     false,
-			errMsg: "patch contains non-empty ResourceFilter.Services but ResourceFilter.TrafficDirection is not \"outbound\"",
-		},
-		// See decode.HookWeakDecodeFromSlice for more details. In practice, we can end up
-		// with a "Patches" field decoded to the single "Patch" value contained in the
-		// serialized slice (raised from the containing slice). Using WeakDecode solves
-		// for this. Ideally, we would kill that decoding hook entirely, but this test
-		// enforces expected behavior until we do. Multi-member slices should be unaffected
-		// by WeakDecode as it is a more-permissive version of the default behavior.
-		"single value Patches decoded as map construction succeeds": {
-			arguments: makeArguments(map[string]any{"Patches": makePatch(map[string]any{}), "ProxyType": nil}),
-			expected:  validTestCase(OpAdd, extensioncommon.TrafficDirectionOutbound, ResourceTypeRoute).expected,
-			ok:        true,
-		},
-		// Ensure that embedded api struct used for Services is parsed correctly.
-		// See also above comment on decode.HookWeakDecodeFromSlice.
-		"single value Services decoded as map construction succeeds": {
-			arguments: makeArguments(map[string]any{"Patches": []map[string]any{
-				makePatch(map[string]any{
-					"ResourceFilter": makeResourceFilter(map[string]any{
-						"Services": []map[string]any{
-							{"Name": "foo"},
-						},
-					}),
-				}),
-			}}),
-			expected: propertyOverride{
-				Patches: []Patch{
-					{
-						ResourceFilter: ResourceFilter{
-							ResourceType:     ResourceTypeRoute,
-							TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-							Services: []*ServiceName{
-								{CompoundServiceName: api.CompoundServiceName{
-									Name:      "foo",
-									Namespace: "default",
-									Partition: "default",
-								}},
-							},
-						},
-						Op:    OpAdd,
-						Path:  "/name",
-						Value: "foo",
-					},
-				},
-				Debug:     true,
-				ProxyType: api.ServiceKindConnectProxy,
-			},
-			ok: true,
-		},
-		"invalid ProxyType": {
-			arguments: makeArguments(map[string]any{
-				"Patches": []map[string]any{
-					makePatch(map[string]any{}),
-				},
-				"ProxyType": "invalid",
-			}),
-			ok:     false,
-			errMsg: "invalid ProxyType",
-		},
-		"unsupported ProxyType": {
-			arguments: makeArguments(map[string]any{
-				"Patches": []map[string]any{
-					makePatch(map[string]any{}),
-				},
-				"ProxyType": api.ServiceKindMeshGateway,
-			}),
-			ok:     false,
-			errMsg: "invalid ProxyType",
-		},
-	}
-
-	for o := range Ops {
-		for d := range extensioncommon.TrafficDirections {
-			for t := range ResourceTypes {
-				cases["valid everything: "+strings.Join([]string{o, d, t}, ",")] =
-					validTestCase(Op(o), extensioncommon.TrafficDirection(d), ResourceType(t))
-			}
-		}
-	}
-
-	for n, tc := range cases {
-		t.Run(n, func(t *testing.T) {
-
-			extensionName := api.BuiltinPropertyOverrideExtension
-			if tc.extensionName != "" {
-				extensionName = tc.extensionName
-			}
-
-			// Build the wrapping RuntimeConfig struct, which contains the serialized
-			// arguments for constructing the property-override extension.
-			svc := api.CompoundServiceName{Name: "svc"}
-			ext := extensioncommon.RuntimeConfig{
-				ServiceName: svc,
-				EnvoyExtension: api.EnvoyExtension{
-					Name:      extensionName,
-					Arguments: tc.arguments,
-				},
-			}
-
-			// Construct the actual extension
-			e, err := Constructor(ext.EnvoyExtension)
-
-			if tc.ok {
-				require.NoError(t, err)
-				require.Equal(t, &extensioncommon.BasicEnvoyExtender{Extension: &tc.expected}, e)
-			} else {
-				require.Error(t, err)
-				if tc.errMsg != "" {
-					require.ErrorContains(t, err, tc.errMsg)
-				}
-				if tc.errFunc != nil {
-					tc.errFunc(t, err)
-				}
-			}
-		})
-	}
-}
-
-func Test_patchResourceType(t *testing.T) {
-	makeExtension := func(patches ...Patch) *propertyOverride {
-		return &propertyOverride{
-			Patches: patches,
-		}
-	}
-	makePatchWithPath := func(filter ResourceFilter, p string) Patch {
-		return Patch{
-			ResourceFilter: filter,
-			Op:             OpAdd,
-			Path:           p,
-			Value:          1,
-		}
-	}
-	makePatch := func(filter ResourceFilter) Patch {
-		return makePatchWithPath(filter, "/foo")
-	}
-
-	svc1 := ServiceName{
-		CompoundServiceName: api.CompoundServiceName{Name: "svc1"},
-	}
-	svc2 := ServiceName{
-		CompoundServiceName: api.CompoundServiceName{Name: "svc2"},
-	}
-
-	clusterOutbound := makePatch(ResourceFilter{
-		ResourceType:     ResourceTypeCluster,
-		TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-	})
-	clusterInbound := makePatch(ResourceFilter{
-		ResourceType:     ResourceTypeCluster,
-		TrafficDirection: extensioncommon.TrafficDirectionInbound,
-	})
-	listenerOutbound := makePatch(ResourceFilter{
-		ResourceType:     ResourceTypeListener,
-		TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-	})
-	listenerOutbound2 := makePatchWithPath(ResourceFilter{
-		ResourceType:     ResourceTypeListener,
-		TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-	}, "/bar")
-	listenerInbound := makePatch(ResourceFilter{
-		ResourceType:     ResourceTypeListener,
-		TrafficDirection: extensioncommon.TrafficDirectionInbound,
-	})
-	routeOutbound := makePatch(ResourceFilter{
-		ResourceType:     ResourceTypeRoute,
-		TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-	})
-	routeOutbound2 := makePatchWithPath(ResourceFilter{
-		ResourceType:     ResourceTypeRoute,
-		TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-	}, "/bar")
-	routeInbound := makePatch(ResourceFilter{
-		ResourceType:     ResourceTypeRoute,
-		TrafficDirection: extensioncommon.TrafficDirectionInbound,
-	})
-
-	type args struct {
-		resourceType ResourceType
-		payload      extensioncommon.Payload[proto.Message]
-		p            *propertyOverride
-	}
-	type testCase struct {
-		args          args
-		expectPatched bool
-		wantApplied   []Patch
-	}
-	cases := map[string]testCase{
-		"outbound gets matching patch": {
-			args: args{
-				resourceType: ResourceTypeCluster,
-				payload: extensioncommon.Payload[proto.Message]{
-					TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-					Message:          &clusterv3.Cluster{},
-				},
-				p: makeExtension(clusterOutbound),
-			},
-			expectPatched: true,
-			wantApplied:   []Patch{clusterOutbound},
-		},
-		"inbound gets matching patch": {
-			args: args{
-				resourceType: ResourceTypeCluster,
-				payload: extensioncommon.Payload[proto.Message]{
-					TrafficDirection: extensioncommon.TrafficDirectionInbound,
-					Message:          &clusterv3.Cluster{},
-				},
-				p: makeExtension(clusterInbound),
-			},
-			expectPatched: true,
-			wantApplied:   []Patch{clusterInbound},
-		},
-		"multiple resources same direction only gets matching resource": {
-			args: args{
-				resourceType: ResourceTypeCluster,
-				payload: extensioncommon.Payload[proto.Message]{
-					TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-					Message:          &clusterv3.Cluster{},
-				},
-				p: makeExtension(clusterOutbound, listenerOutbound),
-			},
-			expectPatched: true,
-			wantApplied:   []Patch{clusterOutbound},
-		},
-		"multiple directions same resource only gets matching direction": {
-			args: args{
-				resourceType: ResourceTypeCluster,
-				payload: extensioncommon.Payload[proto.Message]{
-					TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-					Message:          &clusterv3.Cluster{},
-				},
-				p: makeExtension(clusterOutbound, clusterInbound),
-			},
-			expectPatched: true,
-			wantApplied:   []Patch{clusterOutbound},
-		},
-		"multiple directions and resources only gets matching patch": {
-			args: args{
-				resourceType: ResourceTypeRoute,
-				payload: extensioncommon.Payload[proto.Message]{
-					TrafficDirection: extensioncommon.TrafficDirectionInbound,
-					Message:          &routev3.RouteConfiguration{},
-				},
-				p: makeExtension(clusterOutbound, clusterInbound, listenerOutbound, listenerInbound, routeOutbound, routeOutbound2, routeInbound),
-			},
-			expectPatched: true,
-			wantApplied:   []Patch{routeInbound},
-		},
-		"multiple directions and resources multiple matches gets all matching patches": {
-			args: args{
-				resourceType: ResourceTypeRoute,
-				payload: extensioncommon.Payload[proto.Message]{
-					TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-					Message:          &routev3.RouteConfiguration{},
-				},
-				p: makeExtension(clusterOutbound, clusterInbound, listenerOutbound, listenerInbound, listenerOutbound2, routeOutbound, routeOutbound2, routeInbound),
-			},
-			expectPatched: true,
-			wantApplied:   []Patch{routeOutbound, routeOutbound2},
-		},
-		"multiple directions and resources no matches gets no patches": {
-			args: args{
-				resourceType: ResourceTypeCluster,
-				payload: extensioncommon.Payload[proto.Message]{
-					TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-					Message:          &clusterv3.Cluster{},
-				},
-				p: makeExtension(clusterInbound, listenerOutbound, listenerInbound, listenerOutbound2, routeInbound, routeOutbound),
-			},
-			expectPatched: false,
-			wantApplied:   nil,
-		},
-	}
-
-	type resourceTypeServiceMatch struct {
-		resourceType ResourceType
-		message      proto.Message
-	}
-
-	resourceTypeCases := []resourceTypeServiceMatch{
-		{
-			resourceType: ResourceTypeCluster,
-			message:      &clusterv3.Cluster{},
-		},
-		{
-			resourceType: ResourceTypeListener,
-			message:      &listenerv3.Listener{},
-		},
-		{
-			resourceType: ResourceTypeRoute,
-			message:      &routev3.RouteConfiguration{},
-		},
-		{
-			resourceType: ResourceTypeClusterLoadAssignment,
-			message:      &endpointv3.ClusterLoadAssignment{},
-		},
-	}
-
-	for _, tc := range resourceTypeCases {
-		{
-			patch := makePatch(ResourceFilter{
-				ResourceType:     tc.resourceType,
-				TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-				Services: []*ServiceName{
-					{CompoundServiceName: svc2.CompoundServiceName},
-				},
-			})
-
-			cases[fmt.Sprintf("%s - no match", tc.resourceType)] = testCase{
-				args: args{
-					resourceType: tc.resourceType,
-					payload: extensioncommon.Payload[proto.Message]{
-						TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-						ServiceName:      &svc1.CompoundServiceName,
-						Message:          tc.message,
-						RuntimeConfig: &extensioncommon.RuntimeConfig{
-							Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{
-								svc1.CompoundServiceName: {},
-							},
-						},
-					},
-					p: makeExtension(patch),
-				},
-				expectPatched: false,
-				wantApplied:   nil,
-			}
-		}
-
-		{
-			patch := makePatch(ResourceFilter{
-				ResourceType:     tc.resourceType,
-				TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-				Services: []*ServiceName{
-					{CompoundServiceName: svc2.CompoundServiceName},
-					{CompoundServiceName: svc1.CompoundServiceName},
-				},
-			})
-
-			cases[fmt.Sprintf("%s - match", tc.resourceType)] = testCase{
-				args: args{
-					resourceType: tc.resourceType,
-					payload: extensioncommon.Payload[proto.Message]{
-						TrafficDirection: extensioncommon.TrafficDirectionOutbound,
-						ServiceName:      &svc1.CompoundServiceName,
-						Message:          tc.message,
-						RuntimeConfig: &extensioncommon.RuntimeConfig{
-							Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{
-								svc1.CompoundServiceName: {},
-							},
-						},
-					},
-					p: makeExtension(patch),
-				},
-				expectPatched: true,
-				wantApplied:   []Patch{patch},
-			}
-		}
-	}
-
-	for n, tc := range cases {
-		t.Run(n, func(t *testing.T) {
-			mockPatcher := MockPatcher[proto.Message]{}
-			_, patched, err := patchResourceType[proto.Message](tc.args.p, tc.args.resourceType, tc.args.payload, &mockPatcher)
-
-			require.NoError(t, err, "unexpected error from mock")
-			require.Equal(t, tc.expectPatched, patched)
-			require.Equal(t, tc.wantApplied, mockPatcher.appliedPatches)
-		})
-	}
-}
-
-type MockPatcher[K proto.Message] struct {
-	appliedPatches []Patch
-}
-
-//nolint:unparam
-func (m *MockPatcher[K]) applyPatch(k K, p Patch, _ bool) (result K, e error) {
-	m.appliedPatches = append(m.appliedPatches, p)
-	return k, nil
-}
-
-func TestCanApply(t *testing.T) {
-	cases := map[string]struct {
-		ext      *propertyOverride
-		conf     *extensioncommon.RuntimeConfig
-		canApply bool
-	}{
-		"valid proxy type": {
-			ext: &propertyOverride{
-				ProxyType: api.ServiceKindConnectProxy,
-			},
-			conf: &extensioncommon.RuntimeConfig{
-				Kind: api.ServiceKindConnectProxy,
-			},
-			canApply: true,
-		},
-		"invalid proxy type": {
-			ext: &propertyOverride{
-				ProxyType: api.ServiceKindConnectProxy,
-			},
-			conf: &extensioncommon.RuntimeConfig{
-				Kind: api.ServiceKindMeshGateway,
-			},
-			canApply: false,
-		},
-	}
-	for n, tc := range cases {
-		t.Run(n, func(t *testing.T) {
-			require.Equal(t, tc.canApply, tc.ext.CanApply(tc.conf))
-		})
-	}
-}
diff --git a/agent/envoyextensions/builtin/property-override/structpatcher.go b/agent/envoyextensions/builtin/property-override/structpatcher.go
deleted file mode 100644
index 76fe3be1a8570..0000000000000
--- a/agent/envoyextensions/builtin/property-override/structpatcher.go
+++ /dev/null
@@ -1,534 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package propertyoverride
-
-import (
-	"fmt"
-	"strings"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-)
-
-// PatchStruct patches the given ProtoMessage according to the documented behavior of Patch and returns the result.
-// If an error is returned, the returned K (which may be a partially modified copy) should be ignored.
-func PatchStruct[K proto.Message](k K, patch Patch, debug bool) (result K, e error) {
-	// Don't panic due to misconfiguration.
-	defer func() {
-		if err := recover(); err != nil {
-			e = fmt.Errorf("unexpected panic: %v", err)
-		}
-	}()
-
-	protoM := k.ProtoReflect()
-
-	if patch.Path == "" || patch.Path == "/" {
-		// Return error with all possible fields at root of target.
-		return k, fmt.Errorf("non-empty, non-root Path is required;\n%s",
-			fieldListStr(protoM.Descriptor(), debug))
-	}
-
-	parsedPath := parsePath(patch.Path)
-	targetM, fieldDesc, err := findTargetMessageAndField(protoM, parsedPath, patch, debug)
-	if err != nil {
-		return k, err
-	}
-	if err := patchField(targetM, fieldDesc, patch, debug); err != nil {
-		return k, err
-	}
-
-	// ProtoReflect returns a reflective _view_ of the underlying K, so
-	// we don't need to convert back explictly when we return k here.
-	return k, nil
-}
-
-// parsePath returns the path tokens from a JSON Pointer (https://datatracker.ietf.org/doc/html/rfc6901/) string as
-// expected by JSON Patch (e.g. "/foo/bar/baz").
-func parsePath(path string) []string {
-	return strings.Split(strings.TrimLeft(path, "/"), "/")
-}
-
-// findTargetMessageAndField takes a root-level protoreflect.Message and slice of path elements and returns the
-// protoreflect.FieldDescriptor that corresponds to the full path, along with the parent protoreflect.Message of
-// that field. parsedPath must be non-empty.
-// If any field in parsedPath cannot be matched while traversing the tree of messages, an error is returned.
-func findTargetMessageAndField(m protoreflect.Message, parsedPath []string, patch Patch, debug bool) (protoreflect.Message, protoreflect.FieldDescriptor, error) {
-	if len(parsedPath) == 0 {
-		return nil, nil, fmt.Errorf("unexpected error: non-empty path is required")
-	}
-
-	// Iterate until we've matched the (potentially nested) target field.
-	for {
-		fieldName := parsedPath[0]
-		if fieldName == "" {
-			return nil, nil, fmt.Errorf("empty field name in path")
-		}
-
-		fieldDesc, err := childFieldDescriptor(m.Descriptor(), fieldName, debug)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		parsedPath = parsedPath[1:]
-		if len(parsedPath) == 0 {
-			// We've reached the end of the path, return current message and target field.
-			return m, fieldDesc, nil
-		}
-
-		// Check whether we have a non-terminal (parent) field in the path for which we
-		// don't support child operations.
-		switch {
-		case fieldDesc.IsList():
-			return nil, nil, fmt.Errorf("path contains member of repeated field '%s'; repeated field member access is not supported",
-				fieldName)
-		case fieldDesc.IsMap():
-			return nil, nil, fmt.Errorf("path contains member of map field '%s'; map field member access is not supported",
-				fieldName)
-		case fieldDesc.Message() != nil && fieldDesc.Message().FullName() == "google.protobuf.Any":
-			// Return a more helpful error for Any fields early.
-			//
-			// Doing this here prevents confusing two-step errors, e.g. "no match for field @type"
-			// on Any, when in fact we don't support variant proto message fields like Any in general.
-			// Because Any is a Message, we'd fail on invalid child fields or unsupported bytes target
-			// fields first.
-			//
-			// In the future, we could support Any by using the type field to initialize a struct for
-			// the nested message value.
-			return nil, nil, fmt.Errorf("variant-type message fields (google.protobuf.Any) are not supported")
-		case !(fieldDesc.Kind() == protoreflect.MessageKind):
-			// Non-Any fields that could be used to serialize protos as bytes will get a clear error message
-			// in this scenario. This also catches accidental use of non-complex fields as parent fields.
-			return nil, nil, fmt.Errorf("path contains member of non-message field '%s' (type '%s'); this type does not support child fields", fieldName, fieldDesc.Kind())
-		}
-
-		fieldM := m.Get(fieldDesc).Message()
-		if !fieldM.IsValid() && patch.Op == OpAdd {
-			// Init this message field to a valid, empty value so that we can keep walking
-			// the path and set inner fields. Only do this for add, as remove should not
-			// initialize fields on its own.
-			m.Set(fieldDesc, protoreflect.ValueOfMessage(fieldM.New()))
-			fieldM = m.Get(fieldDesc).Message()
-		}
-
-		// Advance our parent message "pointer" to the next field.
-		m = fieldM
-	}
-}
-
-// patchField applies the given patch op to the target field on given parent message.
-func patchField(parentM protoreflect.Message, fieldDesc protoreflect.FieldDescriptor, patch Patch, debug bool) error {
-	switch patch.Op {
-	case OpAdd:
-		return applyAdd(parentM, fieldDesc, patch, debug)
-	case OpRemove:
-		// Ignore Value if provided, per JSON Patch: "Members that are not explicitly defined for the
-		// operation in question MUST be ignored (i.e., the operation will complete as if the undefined
-		// member did not appear in the object)."
-		return applyRemove(parentM, fieldDesc)
-	}
-	return fmt.Errorf("unexpected error: no op implementation found")
-}
-
-// removeField clears the target field on the given message.
-func applyRemove(parentM protoreflect.Message, fieldDesc protoreflect.FieldDescriptor) error {
-	// Check whether the parent has this field, as clearing a field on an unset parent may panic.
-	if parentM.Has(fieldDesc) {
-		parentM.Clear(fieldDesc)
-	}
-	return nil
-}
-
-// applyAdd updates the target field(s) on the given message based on the content of patch.
-// If the patch value is a scalar, scalar wrapper, or scalar array, we set the target field directly with that value.
-// If the patch value is a map, we set the indicated child fields on a new (empty) message matching the target field.
-// Regardless, the target field is replaced entirely. This conforms to the PUT-style semantics of the JSON Patch "add"
-// operation for objects (https://www.rfc-editor.org/rfc/rfc6902#section-4.1).
-func applyAdd(parentM protoreflect.Message, fieldDesc protoreflect.FieldDescriptor, patch Patch, debug bool) error {
-	if patch.Value == nil {
-		return fmt.Errorf("non-nil Value is required; use an empty map to reset all fields on a message or the 'remove' op to unset fields")
-	}
-	mapValue, isMapValue := patch.Value.(map[string]interface{})
-	// If the field is a proto map type, we'll treat it as a "single" field for error handling purposes.
-	// If we support proto map targets in the future, it will still likely be treated as a single field,
-	// similar to a list (repeated field). This map handling is specific to _our_ patch semantics for
-	// updating multiple message fields at once.
-	if isMapValue && !fieldDesc.IsMap() {
-		if fieldDesc.Kind() != protoreflect.MessageKind {
-			return fmt.Errorf("non-message field type '%s' cannot be set via a map", fieldDesc.Kind())
-		}
-
-		// Get a fresh copy of the target field's message, then set the children indicated by the patch.
-		fieldM := parentM.Get(fieldDesc).Message().New()
-		for k, v := range mapValue {
-			targetFieldDesc, err := childFieldDescriptor(fieldDesc.Message(), k, debug)
-			if err != nil {
-				return err
-			}
-			val, err := toProtoValue(fieldM, targetFieldDesc, v)
-			if err != nil {
-				return err
-			}
-			fieldM.Set(targetFieldDesc, val)
-		}
-		parentM.Set(fieldDesc, protoreflect.ValueOf(fieldM))
-
-	} else {
-		// Just set the field directly, as our patch value is not a map.
-		val, err := toProtoValue(parentM, fieldDesc, patch.Value)
-		if err != nil {
-			return err
-		}
-		parentM.Set(fieldDesc, val)
-	}
-
-	return nil
-}
-
-func childFieldDescriptor(parentDesc protoreflect.MessageDescriptor, fieldName string, debug bool) (protoreflect.FieldDescriptor, error) {
-	if childFieldDesc := parentDesc.Fields().ByName(protoreflect.Name(fieldName)); childFieldDesc != nil {
-		return childFieldDesc, nil
-	}
-	return nil, fmt.Errorf("no match for field '%s'!\n%s", fieldName, fieldListStr(parentDesc, debug))
-}
-
-// fieldListStr prints all possible fields (debug) or the first 10 fields of a given MessageDescriptor.
-func fieldListStr(messageDesc protoreflect.MessageDescriptor, debug bool) string {
-	// Future: it might be nice to use something like https://github.com/agnivade/levenshtein
-	// or https://github.com/schollz/closestmatch to inform these choices.
-	fields := messageDesc.Fields()
-
-	// If we're not in debug mode and there's > 10 possible fields, only print the first 10.
-	printCount := fields.Len()
-	truncateFields := false
-	if !debug && printCount > 10 {
-		truncateFields = true
-		printCount = 10
-	}
-
-	msg := strings.Builder{}
-	msg.WriteString("available ")
-	msg.WriteString(string(messageDesc.FullName()))
-	msg.WriteString(" fields:\n")
-	for i := 0; i < printCount; i++ {
-		msg.WriteString(fields.Get(i).TextName())
-		msg.WriteString("\n")
-	}
-	if truncateFields {
-		msg.WriteString("First 10 fields for this message included, configure with `Debug = true` to print all.")
-	}
-
-	return msg.String()
-}
-
-func toProtoValue(parentM protoreflect.Message, fieldDesc protoreflect.FieldDescriptor, patchValue interface{}) (v protoreflect.Value, e error) {
-	// Repeated fields. Check for these first, so we can use Kind below for single value
-	// fields (repeated fields have a Kind corresponding to their members).
-	// We have to do special handling for int types and strings since they could be enums.
-	if fieldDesc.IsList() {
-		list := parentM.NewField(fieldDesc).List()
-		switch val := patchValue.(type) {
-		case []int:
-			return toProtoIntOrEnumList(val, list, fieldDesc)
-		case []int32:
-			return toProtoIntOrEnumList(val, list, fieldDesc)
-		case []int64:
-			return toProtoIntOrEnumList(val, list, fieldDesc)
-		case []uint:
-			return toProtoIntOrEnumList(val, list, fieldDesc)
-		case []uint32:
-			return toProtoIntOrEnumList(val, list, fieldDesc)
-		case []uint64:
-			return toProtoIntOrEnumList(val, list, fieldDesc)
-		case []float32:
-			return toProtoNumericList(val, list, fieldDesc)
-		case []float64:
-			return toProtoNumericList(val, list, fieldDesc)
-		case []bool:
-			return toProtoList(val, list)
-		case []string:
-			if fieldDesc.Kind() == protoreflect.EnumKind {
-				return toProtoEnumList(val, list, fieldDesc)
-			}
-			return toProtoList(val, list)
-		default:
-			if fieldDesc.Kind() == protoreflect.MessageKind ||
-				fieldDesc.Kind() == protoreflect.GroupKind ||
-				fieldDesc.Kind() == protoreflect.BytesKind {
-				return unsupportedTargetTypeErr(fieldDesc)
-			}
-			return typeMismatchErr(fieldDesc, val)
-		}
-	}
-
-	switch fieldDesc.Kind() {
-	case protoreflect.MessageKind:
-		// google.protobuf wrapper types are used for detecting presence of scalars. If the
-		// target field is a message, and the patch value is not a map, we assume the user
-		// is targeting a wrapper type or has misconfigured the path.
-		return toProtoWrapperValue(fieldDesc, patchValue)
-	case protoreflect.EnumKind:
-		return toProtoEnumValue(fieldDesc, patchValue)
-	case protoreflect.Int32Kind,
-		protoreflect.Int64Kind,
-		protoreflect.Sint32Kind,
-		protoreflect.Sint64Kind,
-		protoreflect.Uint32Kind,
-		protoreflect.Uint64Kind,
-		protoreflect.Fixed32Kind,
-		protoreflect.Fixed64Kind,
-		protoreflect.Sfixed32Kind,
-		protoreflect.Sfixed64Kind,
-		protoreflect.FloatKind,
-		protoreflect.DoubleKind:
-		// We have to be careful specifically obtaining the correct proto field type here,
-		// since conversion checking by protoreflect is stringent and will not accept e.g.
-		// int->uint32 mismatches, or float->int downcasts.
-		switch val := patchValue.(type) {
-		case int:
-			return toProtoNumericValue(fieldDesc, val)
-		case int32:
-			return toProtoNumericValue(fieldDesc, val)
-		case int64:
-			return toProtoNumericValue(fieldDesc, val)
-		case uint:
-			return toProtoNumericValue(fieldDesc, val)
-		case uint32:
-			return toProtoNumericValue(fieldDesc, val)
-		case uint64:
-			return toProtoNumericValue(fieldDesc, val)
-		case float32:
-			return toProtoNumericValue(fieldDesc, val)
-		case float64:
-			return toProtoNumericValue(fieldDesc, val)
-		}
-	case protoreflect.BytesKind,
-		protoreflect.GroupKind:
-		return unsupportedTargetTypeErr(fieldDesc)
-	}
-
-	// Fall back to protoreflect.ValueOf, which may panic if an unexpected type is passed.
-	defer func() {
-		if err := recover(); err != nil {
-			_, e = typeMismatchErr(fieldDesc, patchValue)
-		}
-	}()
-	return protoreflect.ValueOf(patchValue), nil
-}
-
-func toProtoList[V float32 | float64 | bool | string](vs []V, l protoreflect.List) (protoreflect.Value, error) {
-	for _, v := range vs {
-		l.Append(protoreflect.ValueOf(v))
-	}
-	return protoreflect.ValueOfList(l), nil
-}
-
-// toProtoIntOrEnumList takes a slice of some integer type V and returns a protoreflect.Value List of either the
-// corresponding proto integer type or enum values, depending on the type of the target field.
-func toProtoIntOrEnumList[V int | int32 | int64 | uint | uint32 | uint64](vs []V, l protoreflect.List, fieldDesc protoreflect.FieldDescriptor) (protoreflect.Value, error) {
-	if fieldDesc.Kind() == protoreflect.EnumKind {
-		return toProtoEnumList(vs, l, fieldDesc)
-	}
-	return toProtoNumericList(vs, l, fieldDesc)
-}
-
-// toProtoNumericList takes a slice of some numeric type V and returns a protoreflect.Value List of the corresponding
-// proto integer or float values, depending on the type of the target field.
-func toProtoNumericList[V int | int32 | int64 | uint | uint32 | uint64 | float32 | float64](vs []V, l protoreflect.List, fieldDesc protoreflect.FieldDescriptor) (protoreflect.Value, error) {
-	for _, v := range vs {
-		i, err := toProtoNumericValue(fieldDesc, v)
-		if err != nil {
-			return protoreflect.Value{}, err
-		}
-		l.Append(i)
-	}
-	return protoreflect.ValueOfList(l), nil
-}
-
-func toProtoEnumList[V int | int32 | int64 | uint | uint32 | uint64 | string](vs []V, l protoreflect.List, fieldDesc protoreflect.FieldDescriptor) (protoreflect.Value, error) {
-	for _, v := range vs {
-		e, err := toProtoEnumValue(fieldDesc, v)
-		if err != nil {
-			return protoreflect.Value{}, err
-		}
-		l.Append(e)
-	}
-	return protoreflect.ValueOfList(l), nil
-}
-
-// toProtoNumericValue aids converting from a Go numeric type to a specific protoreflect.Value type, casting to match
-// the target field type.
-//
-// It supports converting numeric Go slices to List values, and scalar numeric values, in a protoreflect
-// validation-compatible manner by replacing the internal conversion logic of protoreflect.ValueOf with a more lenient
-// "blind" cast, with the assumption that inputs to structpatcher may have been deserialized in such a way as to make
-// strict type checking infeasible, even if the actual value and target type are compatible. This function does _not_
-// attempt to handle overflows, only type conversion.
-//
-// See https://protobuf.dev/programming-guides/proto3/#scalar for canonical proto3 type mappings, reflected here.
-func toProtoNumericValue[V int | int32 | int64 | uint | uint32 | uint64 | float32 | float64](fieldDesc protoreflect.FieldDescriptor, v V) (protoreflect.Value, error) {
-	switch fieldDesc.Kind() {
-	case protoreflect.FloatKind:
-		return protoreflect.ValueOfFloat32(float32(v)), nil
-	case protoreflect.DoubleKind:
-		return protoreflect.ValueOfFloat64(float64(v)), nil
-	case protoreflect.Int32Kind:
-		return protoreflect.ValueOfInt32(int32(v)), nil
-	case protoreflect.Int64Kind:
-		return protoreflect.ValueOfInt64(int64(v)), nil
-	case protoreflect.Uint32Kind:
-		return protoreflect.ValueOfUint32(uint32(v)), nil
-	case protoreflect.Uint64Kind:
-		return protoreflect.ValueOfUint64(uint64(v)), nil
-	case protoreflect.Sint32Kind:
-		return protoreflect.ValueOfInt32(int32(v)), nil
-	case protoreflect.Sint64Kind:
-		return protoreflect.ValueOfInt64(int64(v)), nil
-	case protoreflect.Fixed32Kind:
-		return protoreflect.ValueOfUint32(uint32(v)), nil
-	case protoreflect.Fixed64Kind:
-		return protoreflect.ValueOfUint64(uint64(v)), nil
-	case protoreflect.Sfixed32Kind:
-		return protoreflect.ValueOfInt32(int32(v)), nil
-	case protoreflect.Sfixed64Kind:
-		return protoreflect.ValueOfInt64(int64(v)), nil
-	default:
-		// Fall back to protoreflect.ValueOf, which may panic if an unexpected type is passed.
-		return protoreflect.ValueOf(v), nil
-	}
-}
-
-func toProtoEnumValue(fieldDesc protoreflect.FieldDescriptor, patchValue any) (protoreflect.Value, error) {
-	// For enums, we accept the field number or a string representation of the name
-	// (both supported by protojson). EnumNumber is a type alias for int32, but we
-	// may be dealing with a 64-bit number in Go depending on how it was obtained.
-	var enumValue protoreflect.EnumValueDescriptor
-	switch val := patchValue.(type) {
-	case string:
-		enumValue = fieldDesc.Enum().Values().ByName(protoreflect.Name(val))
-	case int:
-		enumValue = fieldDesc.Enum().Values().ByNumber(protoreflect.EnumNumber(val))
-	case int32:
-		enumValue = fieldDesc.Enum().Values().ByNumber(protoreflect.EnumNumber(val))
-	case int64:
-		enumValue = fieldDesc.Enum().Values().ByNumber(protoreflect.EnumNumber(val))
-	case uint:
-		enumValue = fieldDesc.Enum().Values().ByNumber(protoreflect.EnumNumber(val))
-	case uint32:
-		enumValue = fieldDesc.Enum().Values().ByNumber(protoreflect.EnumNumber(val))
-	case uint64:
-		enumValue = fieldDesc.Enum().Values().ByNumber(protoreflect.EnumNumber(val))
-	}
-	if enumValue != nil {
-		return protoreflect.ValueOfEnum(enumValue.Number()), nil
-	}
-	return typeMismatchErr(fieldDesc, patchValue)
-}
-
-// toProtoWrapperValue converts possible runtime Go types (per https://protobuf.dev/programming-guides/proto3/#scalar)
-// to the appropriate proto wrapper target type based on the name of the given FieldDescriptor.
-//
-// This function does not attempt to handle overflows, only type conversion.
-func toProtoWrapperValue(fieldDesc protoreflect.FieldDescriptor, patchValue any) (protoreflect.Value, error) {
-	fullName := string(fieldDesc.Message().FullName())
-	if !strings.HasPrefix(fullName, "google.protobuf.") || !strings.HasSuffix(fullName, "Value") {
-		return unsupportedTargetTypeErr(fieldDesc)
-	}
-
-	switch val := patchValue.(type) {
-	case int:
-		return toProtoIntWrapperValue(fieldDesc, val)
-	case int32:
-		return toProtoIntWrapperValue(fieldDesc, val)
-	case int64:
-		return toProtoIntWrapperValue(fieldDesc, val)
-	case uint:
-		return toProtoIntWrapperValue(fieldDesc, val)
-	case uint32:
-		return toProtoIntWrapperValue(fieldDesc, val)
-	case uint64:
-		return toProtoIntWrapperValue(fieldDesc, val)
-	case float32:
-		switch fieldDesc.Message().FullName() {
-		case "google.protobuf.FloatValue":
-			v := wrapperspb.Float(val)
-			return protoreflect.ValueOf(v.ProtoReflect()), nil
-		case "google.protobuf.DoubleValue":
-			v := wrapperspb.Double(float64(val))
-			return protoreflect.ValueOf(v.ProtoReflect()), nil
-		default:
-			// Fall back to int wrapper, since we may actually be targeting this instead.
-			// Failure will result in a typical type mismatch error.
-			return toProtoIntWrapperValue(fieldDesc, val)
-		}
-	case float64:
-		switch fieldDesc.Message().FullName() {
-		case "google.protobuf.FloatValue":
-			v := wrapperspb.Float(float32(val))
-			return protoreflect.ValueOf(v.ProtoReflect()), nil
-		case "google.protobuf.DoubleValue":
-			v := wrapperspb.Double(val)
-			return protoreflect.ValueOf(v.ProtoReflect()), nil
-		default:
-			// Fall back to int wrapper, since we may actually be targeting this instead.
-			// Failure will result in a typical type mismatch error.
-			return toProtoIntWrapperValue(fieldDesc, val)
-		}
-	case bool:
-		switch fieldDesc.Message().FullName() {
-		case "google.protobuf.BoolValue":
-			v := wrapperspb.Bool(val)
-			return protoreflect.ValueOf(v.ProtoReflect()), nil
-		}
-	case string:
-		switch fieldDesc.Message().FullName() {
-		case "google.protobuf.StringValue":
-			v := wrapperspb.String(val)
-			return protoreflect.ValueOf(v.ProtoReflect()), nil
-		}
-	}
-	return typeMismatchErr(fieldDesc, patchValue)
-}
-
-func toProtoIntWrapperValue[V int | int32 | int64 | uint | uint32 | uint64 | float32 | float64](fieldDesc protoreflect.FieldDescriptor, v V) (protoreflect.Value, error) {
-	switch fieldDesc.Message().FullName() {
-	case "google.protobuf.UInt32Value":
-		v := wrapperspb.UInt32(uint32(v))
-		return protoreflect.ValueOf(v.ProtoReflect()), nil
-	case "google.protobuf.UInt64Value":
-		v := wrapperspb.UInt64(uint64(v))
-		return protoreflect.ValueOf(v.ProtoReflect()), nil
-	case "google.protobuf.Int32Value":
-		v := wrapperspb.Int32(int32(v))
-		return protoreflect.ValueOf(v.ProtoReflect()), nil
-	case "google.protobuf.Int64Value":
-		v := wrapperspb.Int64(int64(v))
-		return protoreflect.ValueOf(v.ProtoReflect()), nil
-	default:
-		return typeMismatchErr(fieldDesc, v)
-	}
-}
-
-func typeMismatchErr(fieldDesc protoreflect.FieldDescriptor, v interface{}) (protoreflect.Value, error) {
-	return protoreflect.Value{}, fmt.Errorf("patch value type %T could not be applied to target field type '%s'", v, fieldType(fieldDesc))
-}
-
-func unsupportedTargetTypeErr(fieldDesc protoreflect.FieldDescriptor) (protoreflect.Value, error) {
-	return protoreflect.Value{}, fmt.Errorf("unsupported target field type '%s'", fieldType(fieldDesc))
-}
-
-func fieldType(fieldDesc protoreflect.FieldDescriptor) string {
-	v := fieldDesc.Kind().String()
-	// Scalars have a useful Kind string, but complex fields should have their full name for clarity.
-	if fieldDesc.Kind() == protoreflect.MessageKind {
-		v = string(fieldDesc.Message().FullName())
-	}
-	if fieldDesc.IsList() {
-		v = "repeated " + v // Kind reflects the type of repeated elements in repeated fields.
-	}
-	if fieldDesc.IsMap() {
-		v = "map" // maps are difficult to get types from, but we don't support them, so return a simple value for now.
-	}
-	return v
-}
diff --git a/agent/envoyextensions/builtin/property-override/structpatcher_test.go b/agent/envoyextensions/builtin/property-override/structpatcher_test.go
deleted file mode 100644
index 4916f0c505c7d..0000000000000
--- a/agent/envoyextensions/builtin/property-override/structpatcher_test.go
+++ /dev/null
@@ -1,1156 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package propertyoverride
-
-import (
-	"fmt"
-	"google.golang.org/protobuf/types/known/anypb"
-	"testing"
-
-	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
-	"github.com/google/go-cmp/cmp"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/testing/protocmp"
-	_struct "google.golang.org/protobuf/types/known/structpb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-)
-
-func TestPatchStruct(t *testing.T) {
-	makePatch := func(o Op, p string, v any) Patch {
-		return Patch{
-			Op:    o,
-			Path:  p,
-			Value: v,
-		}
-	}
-	makeAddPatch := func(p string, v any) Patch {
-		return makePatch(OpAdd, p, v)
-	}
-	makeRemovePatch := func(p string) Patch {
-		return makePatch(OpRemove, p, nil)
-	}
-	expectFieldsListErr := func(resourceName string, truncatedFieldsWarning bool) func(t *testing.T, err error) {
-		return func(t *testing.T, err error) {
-			require.Contains(t, err.Error(), fmt.Sprintf("available %s fields:", resourceName))
-			if truncatedFieldsWarning {
-				require.Contains(t, err.Error(), "First 10 fields for this message included, configure with `Debug = true` to print all.")
-			} else {
-				require.NotContains(t, err.Error(), "First 10 fields for this message included, configure with `Debug = true` to print all.")
-			}
-		}
-	}
-	type args struct {
-		k       proto.Message
-		patches []Patch
-		debug   bool
-	}
-	type testCase struct {
-		args     args
-		expected proto.Message
-		ok       bool
-		errMsg   string
-		errFunc  func(*testing.T, error)
-	}
-
-	// Simplify test case construction for variants of potential input types
-	uint32VariantTestCase := func(i any) testCase {
-		return testCase{
-			args: args{
-				k: &envoy_endpoint_v3.Endpoint{
-					HealthCheckConfig: &envoy_endpoint_v3.Endpoint_HealthCheckConfig{
-						PortValue: 3000,
-					},
-				},
-				patches: []Patch{makeAddPatch(
-					"/health_check_config/port_value",
-					i,
-				)},
-			},
-			expected: &envoy_endpoint_v3.Endpoint{
-				HealthCheckConfig: &envoy_endpoint_v3.Endpoint_HealthCheckConfig{
-					PortValue: 1234,
-				},
-			},
-			ok: true,
-		}
-	}
-	uint32WrapperVariantTestCase := func(i any) testCase {
-		return testCase{
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-						EnforcingConsecutive_5Xx: wrapperspb.UInt32(9999),
-					},
-				},
-				patches: []Patch{makeAddPatch(
-					"/outlier_detection/enforcing_consecutive_5xx",
-					i,
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-					EnforcingConsecutive_5Xx: wrapperspb.UInt32(1234),
-				},
-			},
-			ok: true,
-		}
-	}
-	uint64WrapperVariantTestCase := func(i any) testCase {
-		return testCase{
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					LbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig_{
-						RingHashLbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig{
-							MaximumRingSize: wrapperspb.UInt64(999999999),
-						},
-					},
-				},
-				patches: []Patch{makeAddPatch(
-					"/ring_hash_lb_config/maximum_ring_size",
-					i,
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				LbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig_{
-					RingHashLbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig{
-						MaximumRingSize: wrapperspb.UInt64(12345678),
-					},
-				},
-			},
-			ok: true,
-		}
-	}
-	doubleVariantTestCase := func(i any) testCase {
-		return testCase{
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					LbConfig: &envoy_cluster_v3.Cluster_LeastRequestLbConfig_{
-						LeastRequestLbConfig: &envoy_cluster_v3.Cluster_LeastRequestLbConfig{
-							ActiveRequestBias: &corev3.RuntimeDouble{
-								DefaultValue: 1.0,
-							},
-						},
-					},
-				},
-				patches: []Patch{makeAddPatch(
-					"/least_request_lb_config/active_request_bias/default_value",
-					i,
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				LbConfig: &envoy_cluster_v3.Cluster_LeastRequestLbConfig_{
-					LeastRequestLbConfig: &envoy_cluster_v3.Cluster_LeastRequestLbConfig{
-						ActiveRequestBias: &corev3.RuntimeDouble{
-							DefaultValue: 1.5,
-						},
-					},
-				},
-			},
-			ok: true,
-		}
-	}
-	doubleWrapperVariantTestCase := func(i any) testCase {
-		return testCase{
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					PreconnectPolicy: &envoy_cluster_v3.Cluster_PreconnectPolicy{
-						PerUpstreamPreconnectRatio: wrapperspb.Double(1.0),
-					},
-				},
-				patches: []Patch{makeAddPatch(
-					"/preconnect_policy/per_upstream_preconnect_ratio",
-					i,
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				PreconnectPolicy: &envoy_cluster_v3.Cluster_PreconnectPolicy{
-					PerUpstreamPreconnectRatio: wrapperspb.Double(1.5),
-				},
-			},
-			ok: true,
-		}
-	}
-	enumByNumberVariantTestCase := func(i any) testCase {
-		return testCase{
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					LbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig_{
-						RingHashLbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig{
-							HashFunction: envoy_cluster_v3.Cluster_RingHashLbConfig_XX_HASH,
-						},
-					},
-				},
-				patches: []Patch{makeAddPatch(
-					"/ring_hash_lb_config/hash_function",
-					i,
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				LbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig_{
-					RingHashLbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig{
-						HashFunction: envoy_cluster_v3.Cluster_RingHashLbConfig_MURMUR_HASH_2,
-					},
-				},
-			},
-			ok: true,
-		}
-	}
-	repeatedIntVariantTestCase := func(i any) testCase {
-		return testCase{
-			args: args{
-				k: &envoy_route_v3.RetryPolicy{
-					RetriableStatusCodes: []uint32{429, 502},
-				},
-				patches: []Patch{makeAddPatch(
-					"/retriable_status_codes",
-					i,
-				)},
-			},
-			expected: &envoy_route_v3.RetryPolicy{
-				RetriableStatusCodes: []uint32{503, 504},
-			},
-			ok: true,
-		}
-	}
-
-	cases := map[string]testCase{
-		// Some variants of target types are covered in conversion code but missing
-		// from this table due to lacking available examples in Envoy v3 protos. An
-		// improvement could be a home-rolled proto with every possible target type.
-		"add single field: int->uint32":             uint32VariantTestCase(int(1234)),
-		"add single field: int32->uint32":           uint32VariantTestCase(int32(1234)),
-		"add single field: int64->uint32":           uint32VariantTestCase(int64(1234)),
-		"add single field: uint->uint32":            uint32VariantTestCase(uint(1234)),
-		"add single field: uint32->uint32":          uint32VariantTestCase(uint32(1234)),
-		"add single field: uint64->uint32":          uint32VariantTestCase(uint64(1234)),
-		"add single field: float32->uint32":         uint32VariantTestCase(float32(1234.0)),
-		"add single field: float64->uint32":         uint32VariantTestCase(float64(1234.0)),
-		"add single field: int->uint32 wrapper":     uint32WrapperVariantTestCase(int(1234)),
-		"add single field: int32->uint32 wrapper":   uint32WrapperVariantTestCase(int32(1234)),
-		"add single field: int64->uint32 wrapper":   uint32WrapperVariantTestCase(int64(1234)),
-		"add single field: uint->uint32 wrapper":    uint32WrapperVariantTestCase(uint(1234)),
-		"add single field: uint32->uint32 wrapper":  uint32WrapperVariantTestCase(uint32(1234)),
-		"add single field: uint64->uint32 wrapper":  uint32WrapperVariantTestCase(uint64(1234)),
-		"add single field: float32->uint32 wrapper": uint32WrapperVariantTestCase(float32(1234.0)),
-		"add single field: float64->uint32 wrapper": uint32WrapperVariantTestCase(float64(1234.0)),
-		"add single field: int->uint64 wrapper":     uint64WrapperVariantTestCase(int(12345678)),
-		"add single field: int32->uint64 wrapper":   uint64WrapperVariantTestCase(int32(12345678)),
-		"add single field: int64->uint64 wrapper":   uint64WrapperVariantTestCase(int64(12345678)),
-		"add single field: uint->uint64 wrapper":    uint64WrapperVariantTestCase(uint(12345678)),
-		"add single field: uint32->uint64 wrapper":  uint64WrapperVariantTestCase(uint32(12345678)),
-		"add single field: uint64->uint64 wrapper":  uint64WrapperVariantTestCase(uint64(12345678)),
-		"add single field: float32->uint64 wrapper": uint64WrapperVariantTestCase(float32(12345678.0)),
-		"add single field: float64->uint64 wrapper": uint64WrapperVariantTestCase(float64(12345678.0)),
-		"add single field: float32->double":         doubleVariantTestCase(float32(1.5)),
-		"add single field: float64->double":         doubleVariantTestCase(float64(1.5)),
-		"add single field: float32->double wrapper": doubleWrapperVariantTestCase(float32(1.5)),
-		"add single field: float64->double wrapper": doubleWrapperVariantTestCase(float64(1.5)),
-		"add single field: bool": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					RespectDnsTtl: false,
-				},
-				patches: []Patch{makeAddPatch(
-					"/respect_dns_ttl",
-					true,
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				RespectDnsTtl: true,
-			},
-			ok: true,
-		},
-		"add single field: bool wrapper": {
-			args: args{
-				k: &envoy_listener_v3.Listener{
-					UseOriginalDst: wrapperspb.Bool(false),
-				},
-				patches: []Patch{makeAddPatch(
-					"/use_original_dst",
-					true,
-				)},
-			},
-			expected: &envoy_listener_v3.Listener{
-				UseOriginalDst: wrapperspb.Bool(true),
-			},
-			ok: true,
-		},
-		"add single field: string": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					AltStatName: "foo",
-				},
-				patches: []Patch{makeAddPatch(
-					"/alt_stat_name",
-					"bar",
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				AltStatName: "bar",
-			},
-			ok: true,
-		},
-		"add single field: enum by name": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					LbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig_{
-						RingHashLbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig{
-							HashFunction: envoy_cluster_v3.Cluster_RingHashLbConfig_XX_HASH,
-						},
-					},
-				},
-				patches: []Patch{makeAddPatch(
-					"/ring_hash_lb_config/hash_function",
-					"MURMUR_HASH_2",
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				LbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig_{
-					RingHashLbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig{
-						HashFunction: envoy_cluster_v3.Cluster_RingHashLbConfig_MURMUR_HASH_2,
-					},
-				},
-			},
-			ok: true,
-		},
-		"add single field: enum by number int":    enumByNumberVariantTestCase(int(1)),
-		"add single field: enum by number int32":  enumByNumberVariantTestCase(int32(1)),
-		"add single field: enum by number int64":  enumByNumberVariantTestCase(int64(1)),
-		"add single field: enum by number uint":   enumByNumberVariantTestCase(uint(1)),
-		"add single field: enum by number uint32": enumByNumberVariantTestCase(uint32(1)),
-		"add single field: enum by number uint64": enumByNumberVariantTestCase(uint64(1)),
-		"add single field previously unmodified": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"/alt_stat_name",
-					"bar",
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				AltStatName: "bar",
-			},
-			ok: true,
-		},
-		"add single field deeply nested": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					UpstreamConnectionOptions: &envoy_cluster_v3.UpstreamConnectionOptions{
-						TcpKeepalive: &corev3.TcpKeepalive{
-							KeepaliveProbes: wrapperspb.UInt32(2),
-						},
-					},
-				},
-				patches: []Patch{makeAddPatch(
-					"/upstream_connection_options/tcp_keepalive/keepalive_probes",
-					5,
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				UpstreamConnectionOptions: &envoy_cluster_v3.UpstreamConnectionOptions{
-					TcpKeepalive: &corev3.TcpKeepalive{
-						KeepaliveProbes: wrapperspb.UInt32(5),
-					},
-				},
-			},
-			ok: true,
-		},
-		"add single field deeply nested with intermediate unset field": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					// Explicitly set to nil just in case defaults change.
-					UpstreamConnectionOptions: nil,
-				},
-				patches: []Patch{makeAddPatch(
-					"/upstream_connection_options/tcp_keepalive/keepalive_probes",
-					1234,
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				UpstreamConnectionOptions: &envoy_cluster_v3.UpstreamConnectionOptions{
-					TcpKeepalive: &corev3.TcpKeepalive{
-						KeepaliveProbes: wrapperspb.UInt32(1234),
-					},
-				},
-			},
-			ok: true,
-		},
-		"add repeated field: int->uint32":     repeatedIntVariantTestCase([]int{503, 504}),
-		"add repeated field: int32->uint32":   repeatedIntVariantTestCase([]int32{503, 504}),
-		"add repeated field: int64->uint32":   repeatedIntVariantTestCase([]int64{503, 504}),
-		"add repeated field: uint->uint32":    repeatedIntVariantTestCase([]uint{503, 504}),
-		"add repeated field: uint32->uint32":  repeatedIntVariantTestCase([]uint32{503, 504}),
-		"add repeated field: uint64->uint32":  repeatedIntVariantTestCase([]uint64{503, 504}),
-		"add repeated field: float32->uint32": repeatedIntVariantTestCase([]float32{503.0, 504.0}),
-		"add repeated field: float64->uint32": repeatedIntVariantTestCase([]float64{503.0, 504.0}),
-		"add repeated field: string": {
-			args: args{
-				k: &envoy_route_v3.RouteConfiguration{},
-				patches: []Patch{makeAddPatch(
-					"/internal_only_headers",
-					[]string{"X-Custom-Header1", "X-Custom-Header-2"},
-				)},
-			},
-			expected: &envoy_route_v3.RouteConfiguration{
-				InternalOnlyHeaders: []string{"X-Custom-Header1", "X-Custom-Header-2"},
-			},
-			ok: true,
-		},
-		"add repeated field: enum by name": {
-			args: args{
-				k: &corev3.HealthStatusSet{
-					Statuses: []corev3.HealthStatus{corev3.HealthStatus_DRAINING},
-				},
-				patches: []Patch{makeAddPatch(
-					"/statuses",
-					[]string{"HEALTHY", "UNHEALTHY"},
-				)},
-			},
-			expected: &corev3.HealthStatusSet{
-				Statuses: []corev3.HealthStatus{corev3.HealthStatus_HEALTHY, corev3.HealthStatus_UNHEALTHY},
-			},
-			ok: true,
-		},
-		"add repeated field: enum by number": {
-			args: args{
-				k: &corev3.HealthStatusSet{
-					Statuses: []corev3.HealthStatus{corev3.HealthStatus_DRAINING},
-				},
-				patches: []Patch{makeAddPatch(
-					"/statuses",
-					[]int{1, 2},
-				)},
-			},
-			expected: &corev3.HealthStatusSet{
-				Statuses: []corev3.HealthStatus{corev3.HealthStatus_HEALTHY, corev3.HealthStatus_UNHEALTHY},
-			},
-			ok: true,
-		},
-		"add message field: empty": {
-			args: args{
-				k: &envoy_listener_v3.Listener{},
-				patches: []Patch{makeAddPatch(
-					"/connection_balance_config/exact_balance",
-					map[string]any{},
-				)},
-			},
-			expected: &envoy_listener_v3.Listener{
-				ConnectionBalanceConfig: &envoy_listener_v3.Listener_ConnectionBalanceConfig{
-					BalanceType: &envoy_listener_v3.Listener_ConnectionBalanceConfig_ExactBalance_{},
-				},
-			},
-			ok: true,
-		},
-		"add message field: multiple fields": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-						EnforcingConsecutive_5Xx:   wrapperspb.UInt32(9999),
-						FailurePercentageThreshold: wrapperspb.UInt32(9999),
-					},
-				},
-				patches: []Patch{makeAddPatch(
-					"/outlier_detection",
-					map[string]any{
-						"enforcing_consecutive_5xx":         1234,
-						"failure_percentage_request_volume": 2345,
-					},
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-					EnforcingConsecutive_5Xx:       wrapperspb.UInt32(1234),
-					FailurePercentageRequestVolume: wrapperspb.UInt32(2345),
-				},
-			},
-			ok: true,
-		},
-		"add multiple single field patches merge with existing object": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-						EnforcingConsecutive_5Xx:   wrapperspb.UInt32(9999),
-						FailurePercentageThreshold: wrapperspb.UInt32(9999),
-					},
-				},
-				patches: []Patch{
-					makeAddPatch(
-						"/outlier_detection/enforcing_consecutive_5xx",
-						1234,
-					),
-					makeAddPatch(
-						"/outlier_detection/failure_percentage_request_volume",
-						2345,
-					),
-				},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-					EnforcingConsecutive_5Xx:       wrapperspb.UInt32(1234),
-					FailurePercentageRequestVolume: wrapperspb.UInt32(2345), // Previously unspecified field set
-					FailurePercentageThreshold:     wrapperspb.UInt32(9999), // Existing unmodified field retained
-				},
-			},
-			ok: true,
-		},
-		"remove single field: scalar wrapper": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-						EnforcingConsecutive_5Xx: wrapperspb.UInt32(9999),
-					},
-				},
-				patches: []Patch{makeRemovePatch(
-					"/outlier_detection/enforcing_consecutive_5xx",
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				OutlierDetection: &envoy_cluster_v3.OutlierDetection{},
-			},
-			ok: true,
-		},
-		"remove single field: string (reset to empty)": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					AltStatName: "foo",
-				},
-				patches: []Patch{makeRemovePatch(
-					"/alt_stat_name",
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{},
-			ok:       true,
-		},
-		"remove single field: bool (reset to false)": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					RespectDnsTtl: true,
-				},
-				patches: []Patch{makeRemovePatch(
-					"/respect_dns_ttl",
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				RespectDnsTtl: false,
-			},
-			ok: true,
-		},
-		"remove single field: enum (reset to default)": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					LbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig_{
-						RingHashLbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig{
-							HashFunction: envoy_cluster_v3.Cluster_RingHashLbConfig_MURMUR_HASH_2,
-						},
-					},
-				},
-				patches: []Patch{makeRemovePatch(
-					"/ring_hash_lb_config/hash_function",
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				LbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig_{
-					RingHashLbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig{
-						HashFunction: envoy_cluster_v3.Cluster_RingHashLbConfig_XX_HASH,
-					},
-				},
-			},
-			ok: true,
-		},
-		"remove single field: message": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-						EnforcingConsecutive_5Xx:   wrapperspb.UInt32(9999),
-						FailurePercentageThreshold: wrapperspb.UInt32(9999),
-					},
-				},
-				patches: []Patch{makeRemovePatch(
-					"/outlier_detection",
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{},
-			ok:       true,
-		},
-		"remove single field: map": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					Metadata: &corev3.Metadata{
-						FilterMetadata: map[string]*_struct.Struct{
-							"foo": nil,
-						},
-					},
-				},
-				patches: []Patch{makeRemovePatch(
-					"/metadata/filter_metadata",
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				Metadata: &corev3.Metadata{},
-			},
-			ok: true,
-		},
-		"remove single field: Any": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					ClusterDiscoveryType: &envoy_cluster_v3.Cluster_ClusterType{
-						ClusterType: &envoy_cluster_v3.Cluster_CustomClusterType{
-							TypedConfig: &anypb.Any{
-								TypeUrl: "foo",
-							},
-						},
-					},
-				},
-				patches: []Patch{
-					makeRemovePatch(
-						"/cluster_type/typed_config",
-					),
-				},
-			},
-			// Invalid actual config, but used as an example of removing Any field directly
-			expected: &envoy_cluster_v3.Cluster{
-				ClusterDiscoveryType: &envoy_cluster_v3.Cluster_ClusterType{
-					ClusterType: &envoy_cluster_v3.Cluster_CustomClusterType{},
-				},
-			},
-			ok: true,
-		},
-		"remove single field deeply nested": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					UpstreamConnectionOptions: &envoy_cluster_v3.UpstreamConnectionOptions{
-						TcpKeepalive: &corev3.TcpKeepalive{
-							KeepaliveProbes: wrapperspb.UInt32(9999),
-						},
-					},
-				},
-				patches: []Patch{makeRemovePatch(
-					"/upstream_connection_options/tcp_keepalive/keepalive_probes",
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				UpstreamConnectionOptions: &envoy_cluster_v3.UpstreamConnectionOptions{
-					TcpKeepalive: &corev3.TcpKeepalive{},
-				},
-			},
-			ok: true,
-		},
-		"remove repeated field: message": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					Filters: []*envoy_cluster_v3.Filter{
-						{
-							Name: "foo",
-						},
-					},
-				},
-				patches: []Patch{makeRemovePatch(
-					"/filters",
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{},
-			ok:       true,
-		},
-		"remove multiple single field patches merge with existing object": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-						EnforcingConsecutive_5Xx:   wrapperspb.UInt32(9999),
-						FailurePercentageThreshold: wrapperspb.UInt32(9999),
-					},
-				},
-				patches: []Patch{
-					makeRemovePatch(
-						"/outlier_detection/enforcing_consecutive_5xx",
-					),
-					makeRemovePatch(
-						"/outlier_detection/failure_percentage_request_volume", // No-op removal
-					),
-				},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-					FailurePercentageThreshold: wrapperspb.UInt32(9999), // Existing unmodified field retained
-				},
-			},
-			ok: true,
-		},
-		"remove does not instantiate intermediate fields that are unset": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					// Explicitly set to nil just in case defaults change.
-					UpstreamConnectionOptions: nil,
-				},
-				patches: []Patch{makeRemovePatch(
-					"/upstream_connection_options/tcp_keepalive/keepalive_probes",
-				)},
-			},
-			expected: &envoy_cluster_v3.Cluster{},
-			ok:       true,
-		},
-		"add and remove multiple single field patches merge with existing object": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-						FailurePercentageRequestVolume: wrapperspb.UInt32(9999),
-						FailurePercentageThreshold:     wrapperspb.UInt32(9999),
-					},
-				},
-				patches: []Patch{
-					makeAddPatch(
-						"/outlier_detection/enforcing_consecutive_5xx",
-						1234,
-					),
-					makeRemovePatch(
-						"/outlier_detection/failure_percentage_request_volume",
-					),
-				},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-					EnforcingConsecutive_5Xx:   wrapperspb.UInt32(1234), // New field added
-					FailurePercentageThreshold: wrapperspb.UInt32(9999), // Existing unmodified field retained
-				},
-			},
-			ok: true,
-		},
-		"add then remove respects order of operations": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{
-					makeAddPatch(
-						"/outlier_detection/enforcing_consecutive_5xx",
-						1234,
-					),
-					makeRemovePatch(
-						"/outlier_detection",
-					),
-				},
-			},
-			expected: &envoy_cluster_v3.Cluster{},
-			ok:       true,
-		},
-		"remove then add respects order of operations": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-						FailurePercentageRequestVolume: wrapperspb.UInt32(9999),
-					},
-				},
-				patches: []Patch{
-					makeRemovePatch(
-						"/outlier_detection",
-					),
-					makeAddPatch(
-						"/outlier_detection/enforcing_consecutive_5xx",
-						1234,
-					),
-				},
-			},
-			expected: &envoy_cluster_v3.Cluster{
-				OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-					EnforcingConsecutive_5Xx: wrapperspb.UInt32(1234), // New field added
-					// Previous field removed by remove op
-				},
-			},
-			ok: true,
-		},
-		"add invalid value: scalar->scalar type mismatch": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-						EnforcingConsecutive_5Xx: wrapperspb.UInt32(9999),
-					},
-				},
-				patches: []Patch{makeAddPatch(
-					"/outlier_detection/enforcing_consecutive_5xx",
-					"NaN",
-				)},
-			},
-			ok:     false,
-			errMsg: "patch value type string could not be applied to target field type 'google.protobuf.UInt32Value'",
-		},
-		"add invalid value: non-scalar->scalar type mismatch": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-						EnforcingConsecutive_5Xx: wrapperspb.UInt32(9999),
-					},
-				},
-				patches: []Patch{makeAddPatch(
-					"/respect_dns_ttl",
-					[]string{"bad", "value"},
-				)},
-			},
-			ok:     false,
-			errMsg: "patch value type []string could not be applied to target field type 'bool'",
-		},
-		"add invalid value: scalar->enum type mismatch": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"/ring_hash_lb_config/hash_function",
-					1.5,
-				)},
-			},
-			ok:     false,
-			errMsg: "patch value type float64 could not be applied to target field type 'enum'",
-		},
-		"add invalid value: nil scalar": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					RespectDnsTtl: false,
-				},
-				patches: []Patch{makeAddPatch(
-					"/respect_dns_ttl",
-					nil,
-				)},
-			},
-			ok:     false,
-			errMsg: "non-nil Value is required; use an empty map to reset all fields on a message or the 'remove' op to unset fields",
-		},
-		"add invalid value: nil wrapper": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-						EnforcingConsecutive_5Xx: wrapperspb.UInt32(9999),
-					},
-				},
-				patches: []Patch{makeAddPatch(
-					"/outlier_detection/enforcing_consecutive_5xx",
-					nil,
-				)},
-			},
-			ok:     false,
-			errMsg: "non-nil Value is required; use an empty map to reset all fields on a message or the 'remove' op to unset fields",
-		},
-		"add invalid value: nil message": {
-
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					OutlierDetection: &envoy_cluster_v3.OutlierDetection{
-						EnforcingConsecutive_5Xx:   wrapperspb.UInt32(9999),
-						FailurePercentageThreshold: wrapperspb.UInt32(9999),
-					},
-				},
-				patches: []Patch{makeAddPatch(
-					"/outlier_detection",
-					nil,
-				)},
-			},
-			ok:     false,
-			errMsg: "non-nil Value is required; use an empty map to reset all fields on a message or the 'remove' op to unset fields",
-		},
-		"add invalid value: mixed type scalar": {
-			args: args{
-				k: &envoy_route_v3.RouteConfiguration{},
-				patches: []Patch{makeAddPatch(
-					"/internal_only_headers",
-					[]any{"X-Custom-Header1", 123},
-				)},
-			},
-			expected: &envoy_route_v3.RouteConfiguration{
-				InternalOnlyHeaders: []string{"X-Custom-Header1", "X-Custom-Header-2"},
-			},
-			ok:     false,
-			errMsg: "patch value type []interface {} could not be applied to target field type 'repeated string'",
-		},
-		"add unsupported target: message with non-scalar fields": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"/dns_failure_refresh_rate",
-					map[string]any{
-						"base_interval": map[string]any{},
-					},
-				)},
-			},
-			ok:     false,
-			errMsg: "unsupported target field type 'google.protobuf.Duration'",
-		},
-		"add unsupported target: map field": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"/metadata/filter_metadata",
-					map[string]any{
-						"foo": "bar",
-					},
-				)},
-			},
-			ok:     false,
-			errMsg: "unsupported target field type 'map'",
-		},
-		"add unsupported target: non-message field via map": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{
-					makeAddPatch(
-						"/name",
-						map[string]any{
-							"cluster_refresh_rate":       "5s",
-							"cluster_refresh_timeout":    "3s",
-							"redirect_refresh_interval":  "5s",
-							"redirect_refresh_threshold": 5,
-						},
-					),
-				},
-			},
-			ok:     false,
-			errMsg: "non-message field type 'string' cannot be set via a map",
-		},
-		"add unsupported target: non-message parent field via single value": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{
-					makeAddPatch(
-						"/name/foo",
-						"bar",
-					),
-				},
-			},
-			ok:     false,
-			errMsg: "path contains member of non-message field 'name' (type 'string'); this type does not support child fields",
-		},
-		"add unsupported target: non-message parent field via map": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{
-					makeAddPatch(
-						"/name/foo",
-						map[string]any{
-							"cluster_refresh_rate":       "5s",
-							"cluster_refresh_timeout":    "3s",
-							"redirect_refresh_interval":  "5s",
-							"redirect_refresh_threshold": 5,
-						},
-					),
-				},
-			},
-			ok:     false,
-			errMsg: "path contains member of non-message field 'name' (type 'string'); this type does not support child fields",
-		},
-		"add unsupported target: Any field": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{
-					makeAddPatch(
-						// Purposefully use a wrong-but-reasonable field name to ensure special error is returned
-						"/cluster_type/typed_config/@type",
-						"foo",
-					),
-				},
-			},
-			ok:     false,
-			errMsg: "variant-type message fields (google.protobuf.Any) are not supported",
-		},
-		"add unsupported target: repeated message": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"/filters",
-					[]any{}, // We don't need a value in this slice to test behavior
-				)},
-			},
-			ok:     false,
-			errMsg: "unsupported target field type 'repeated envoy.config.cluster.v3.Filter'",
-		},
-		"empty path": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"",
-					"ignored",
-				)},
-			},
-			ok:      false,
-			errMsg:  "non-empty, non-root Path is required",
-			errFunc: expectFieldsListErr("envoy.config.cluster.v3.Cluster", true),
-		},
-		"empty path debug mode": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"",
-					"ignored",
-				)},
-				debug: true,
-			},
-			ok:      false,
-			errMsg:  "non-empty, non-root Path is required",
-			errFunc: expectFieldsListErr("envoy.config.cluster.v3.Cluster", false),
-		},
-		"root path": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"/",
-					"ignored",
-				)},
-			},
-			ok:      false,
-			errMsg:  "non-empty, non-root Path is required",
-			errFunc: expectFieldsListErr("envoy.config.cluster.v3.Cluster", true),
-		},
-		"root path debug mode": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"/",
-					"ignored",
-				)},
-				debug: true,
-			},
-			ok:      false,
-			errMsg:  "non-empty, non-root Path is required",
-			errFunc: expectFieldsListErr("envoy.config.cluster.v3.Cluster", false),
-		},
-		"invalid path: add unknown field": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"/outlier_detection/foo",
-					"ignored",
-				)},
-			},
-			ok:      false,
-			errMsg:  "no match for field 'foo'!",
-			errFunc: expectFieldsListErr("envoy.config.cluster.v3.OutlierDetection", true),
-		},
-		"invalid path: remove unknown field": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeRemovePatch(
-					"/outlier_detection/foo",
-				)},
-			},
-			ok:      false,
-			errMsg:  "no match for field 'foo'!",
-			errFunc: expectFieldsListErr("envoy.config.cluster.v3.OutlierDetection", true),
-		},
-		"invalid path: unknown field debug mode": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"/outlier_detection/foo",
-					"ignored",
-				)},
-				debug: true,
-			},
-			ok:      false,
-			errMsg:  "no match for field 'foo'!",
-			errFunc: expectFieldsListErr("envoy.config.cluster.v3.OutlierDetection", false),
-		},
-		"error field list includes first 10 fields when not in debug mode": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"",
-					"ignored",
-				)},
-			},
-			ok:      false,
-			errMsg:  "transport_socket_matches\nname\nalt_stat_name\ntype\ncluster_type\neds_cluster_config\nconnect_timeout\nper_connection_buffer_limit_bytes\nlb_policy\nload_assignment",
-			errFunc: expectFieldsListErr("envoy.config.cluster.v3.Cluster", true),
-		},
-		"error field list includes all fields when in debug mode": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"",
-					"ignored",
-				)},
-				debug: true,
-			},
-			ok:      false,
-			errMsg:  "transport_socket_matches\nname\nalt_stat_name\ntype\ncluster_type\neds_cluster_config\nconnect_timeout\nper_connection_buffer_limit_bytes\nlb_policy\nload_assignment\nhealth_checks\nmax_requests_per_connection\ncircuit_breakers\nupstream_http_protocol_options\ncommon_http_protocol_options\nhttp_protocol_options\nhttp2_protocol_options\ntyped_extension_protocol_options\ndns_refresh_rate\ndns_failure_refresh_rate\nrespect_dns_ttl\ndns_lookup_family\ndns_resolvers\nuse_tcp_for_dns_lookups\ndns_resolution_config\ntyped_dns_resolver_config\nwait_for_warm_on_init\noutlier_detection\ncleanup_interval\nupstream_bind_config\nlb_subset_config\nring_hash_lb_config\nmaglev_lb_config\noriginal_dst_lb_config\nleast_request_lb_config\nround_robin_lb_config\ncommon_lb_config\ntransport_socket\nmetadata\nprotocol_selection\nupstream_connection_options\nclose_connections_on_host_health_failure\nignore_health_on_host_removal\nfilters\nload_balancing_policy\nlrs_server\ntrack_timeout_budgets\nupstream_config\ntrack_cluster_stats\npreconnect_policy\nconnection_pool_per_downstream_connection",
-			errFunc: expectFieldsListErr("envoy.config.cluster.v3.Cluster", false),
-		},
-		"error field list warns about first 10 fields only when > 10 available when not in debug mode": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"/upstream_connection_options/tcp_keepalive/foo",
-					"ignored",
-				)},
-				debug: false,
-			},
-			ok:      false,
-			errMsg:  "keepalive_probes\nkeepalive_time\nkeepalive_interval",
-			errFunc: expectFieldsListErr("envoy.config.core.v3.TcpKeepalive", false),
-		},
-		"invalid path: empty path element": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{},
-				patches: []Patch{makeAddPatch(
-					"/outlier_detection//",
-					"ignored",
-				)},
-			},
-			ok:     false,
-			errMsg: "empty field name in path",
-		},
-		"invalid path: repeated field member": {
-			args: args{
-				k: &envoy_listener_v3.Listener{},
-				patches: []Patch{makeRemovePatch(
-					"/filter_chains/0/transport_socket_connect_timeout",
-				)},
-			},
-			ok:     false,
-			errMsg: "path contains member of repeated field 'filter_chains'; repeated field member access is not supported",
-		},
-		"invalid path: map field member": {
-			args: args{
-				k: &envoy_cluster_v3.Cluster{
-					Metadata: &corev3.Metadata{
-						FilterMetadata: map[string]*_struct.Struct{
-							"foo": nil,
-						},
-					},
-				},
-				patches: []Patch{makeRemovePatch(
-					"/metadata/filter_metadata/foo",
-				)},
-			},
-			ok:     false,
-			errMsg: "path contains member of map field 'filter_metadata'; map field member access is not supported",
-		},
-	}
-
-	copyMessage := func(m proto.Message) proto.Message { return m }
-	for n, tc := range cases {
-		t.Run(n, func(t *testing.T) {
-			// Copy k so that we can compare before and after
-			copyOfK := copyMessage(tc.args.k)
-			var err error
-			for _, p := range tc.args.patches {
-				// Repeatedly patch value, replacing with the new version each time
-				copyOfK, err = PatchStruct(copyOfK, p, tc.args.debug)
-				if err != nil {
-					break // Break on the first error
-				}
-			}
-			if tc.ok {
-				require.NoError(t, err)
-				if diff := cmp.Diff(tc.expected, copyOfK, protocmp.Transform()); diff != "" {
-					t.Errorf("unexpected difference:\n%v", diff)
-				}
-			} else {
-				require.Error(t, err)
-				if tc.errMsg != "" {
-					require.ErrorContains(t, err, tc.errMsg)
-				}
-				if tc.errFunc != nil {
-					tc.errFunc(t, err)
-				}
-			}
-		})
-	}
-}
diff --git a/agent/envoyextensions/builtin/wasm/structs.go b/agent/envoyextensions/builtin/wasm/structs.go
deleted file mode 100644
index 67540fee56c94..0000000000000
--- a/agent/envoyextensions/builtin/wasm/structs.go
+++ /dev/null
@@ -1,435 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package wasm
-
-import (
-	"fmt"
-	"net/url"
-	"time"
-
-	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	envoy_wasm_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/wasm/v3"
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/envoyextensions/extensioncommon"
-	"github.com/hashicorp/go-multierror"
-	"github.com/mitchellh/mapstructure"
-	"google.golang.org/protobuf/types/known/anypb"
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-)
-
-// wasmConfig defines the configuration for a Wasm Envoy extension.
-type wasmConfig struct {
-	// Protocol is the type of Wasm filter to apply, "tcp" or "http".
-	Protocol string
-	// ProxyType identifies the type of Envoy proxy that this extension applies to.
-	// The extension will only be configured for proxies that match this type and
-	// will be ignored for all other proxy types.
-	ProxyType api.ServiceKind
-	// ListenerType identifies the listener type the filter will be applied to.
-	ListenerType string
-	// PluginConfig holds the configuration for the Wasm plugin.
-	PluginConfig pluginConfig
-}
-
-// pluginConfig defines a Wasm plugin configuration.
-type pluginConfig struct {
-	// Name is the unique name for the filter in a VM. For use in identifying the
-	// filter if multiple filters are handled by the same VmID and RootID.
-	// Also used for logging/debugging.
-	Name string
-	// RootID is a unique ID for a set of filters in a VM which will share a
-	// RootContext and Contexts if applicable (e.g. a Wasm HttpFilter and a Wasm AccessLog).
-	// All filters with the same RootID and VmID will share Context(s).
-	RootID string
-	// VmConfig is the configuration for starting or finding the Wasm VM that the
-	// filter will run in.
-	VmConfig vmConfig
-	// Configuration holds the configuration that will be encoded as bytes and passed to
-	// the plugin on startup (proxy_on_configure).
-	Configuration string
-	// CapabilityRestrictionConfiguration controls the Wasm ABI capabilities available
-	// to the filter.
-	CapabilityRestrictionConfiguration capabilityRestrictionConfiguration
-
-	// failOpen controls the behavior when a runtime error occurs during filter
-	// processing.
-	//
-	// If set to false runtime errors will result in a failed request.
-	// For TCP filters, the connection will be closed. For HTTP filters a 503
-	// status is returned.
-	//
-	// If set to true, a runtime error will result in the filter being bypassed.
-	failOpen bool
-}
-
-// vmConfig defines a Wasm VM configuration.
-type vmConfig struct {
-	// VmID is an ID which will be used along with a hash of the Wasm code to
-	// determine which VM will be used for the plugin. All plugins which use
-	// the same VmID and code will use the same VM. May be left blank.
-	VmID string
-	// Runtime is the Wasm runtime type, one of: v8, wasmtime, wamr, or wavm.
-	Runtime string
-	// Code references the Wasm code that will run in the filter.
-	Code dataSource
-	// Configuration holds the configuration that will be encoded as bytes and
-	// passed to the plugin during VM startup (proxy_on_vm_start).
-	Configuration string
-	// EnvironmentVariables specifies environment variables to be injected to
-	// this VM which will be available through WASI’s environ_get and
-	// environ_get_sizes system calls.
-	EnvironmentVariables environmentVariables
-}
-
-// dataSource defines a local or remote location where Wasm code will be loaded from.
-type dataSource struct {
-	// Local supports loading files from a local volume.
-	Local localDataSource
-	// Remote supports loading files from a remote server.
-	Remote remoteDataSource
-}
-
-// environmentVariables defines the environment variables that will be made available
-// to the Wasm filter.
-type environmentVariables struct {
-	// HostEnvKeys holds the keys of Envoy’s environment variables exposed to this VM.
-	// If a key exists in Envoy’s environment variables, then that key-value pair will
-	// be injected into the Wasm VM. If a key does not exist, it will be ignored.
-	HostEnvKeys []string
-	// KeyValues is a list of key-value pairs to be injected to this VM in the form of "KEY=VALUE".
-	KeyValues map[string]string
-}
-
-// localDataSource defines a file from a local file system.
-type localDataSource struct {
-	// Filename is the path to the Wasm file on the local file system.
-	Filename string
-}
-
-// remoteDataSource defines a file from a remote file server.
-type remoteDataSource struct {
-	// HttpURI
-	HttpURI httpURI
-	// SHA256 of the remote file. Used to validate the remote file.
-	SHA256 string
-	// RetryPolicy determines how retries are handled.
-	RetryPolicy retryPolicy
-}
-
-// httpURI defines a remote file using an HTTP URI.
-type httpURI struct {
-	// Service is the upstream service the Wasm plugin will be fetched from.
-	Service api.CompoundServiceName
-	// URI is the location of the Wasm file on the upstream service.
-	URI string
-	// Timeout sets the maximum duration that a response can take.
-	Timeout string
-
-	timeout time.Duration
-}
-
-// retryPolicy defines how to handle retries when fetching remote files.
-type retryPolicy struct {
-	// RetryBackOff holds parameters that control retry backoff strategy.
-	RetryBackOff retryBackoff
-	// NumRetries specifies the allowed number of retries.
-	NumRetries int
-}
-
-// retryBackoff holds parameters that control retry backoff strategy.
-type retryBackoff struct {
-	// BaseInterval is the base interval to be used for the next back off
-	// computation. It should be greater than zero and less than or equal
-	// to MaxInterval.
-	BaseInterval string
-	// MaxInterval is the maximum interval between retries.
-	MaxInterval string
-
-	baseInterval time.Duration
-	maxInterval  time.Duration
-}
-
-// capabilityRestrictionConfiguration controls Wasm capabilities available to modules.
-type capabilityRestrictionConfiguration struct {
-	// AllowedCapabilities specifies the Wasm capabilities which will be allowed.
-	// Capabilities are mapped by name. The value which each capability maps to is
-	// currently ignored and should be left empty.
-	AllowedCapabilities map[string]any
-}
-
-// newWasmConfig creates a filterConfig from the given args.
-// It starts with the default wasm configuration and merges in the config
-// from the given args.
-func newWasmConfig(args map[string]any) (*wasmConfig, error) {
-	cfg := &wasmConfig{}
-	if err := mapstructure.Decode(args, cfg); err != nil {
-		return cfg, err
-	}
-	cfg.normalize()
-	return cfg, nil
-}
-
-func (p *pluginConfig) asyncDataSource(rtCfg *extensioncommon.RuntimeConfig) (*envoy_core_v3.AsyncDataSource, error) {
-
-	// Local data source
-	if filename := p.VmConfig.Code.Local.Filename; filename != "" {
-		return &envoy_core_v3.AsyncDataSource{
-			Specifier: &envoy_core_v3.AsyncDataSource_Local{
-				Local: &envoy_core_v3.DataSource{
-					Specifier: &envoy_core_v3.DataSource_Filename{
-						Filename: filename,
-					},
-				},
-			},
-		}, nil
-	}
-
-	// Remote data source
-	// For a remote file, ensure there is an upstream cluster for the host specified in the URL.
-	// Envoy requires an explicit cluster in order to perform the DNS lookup required to actually
-	// fetch the data from the upstream source.
-	remote := &p.VmConfig.Code.Remote
-	clusterSNI := ""
-	for service, upstream := range rtCfg.Upstreams {
-		if service == remote.HttpURI.Service {
-			for sni := range upstream.SNIs {
-				clusterSNI = sni
-				break
-			}
-		}
-	}
-	if clusterSNI == "" {
-		return nil, fmt.Errorf("no upstream found for remote service %q", remote.HttpURI.Service.Name)
-	}
-
-	d := time.Second
-	if remote.HttpURI.timeout > 0 {
-		d = remote.HttpURI.timeout
-	}
-	timeout := &durationpb.Duration{Seconds: int64(d.Seconds())}
-
-	return &envoy_core_v3.AsyncDataSource{
-		Specifier: &envoy_core_v3.AsyncDataSource_Remote{
-			Remote: &envoy_core_v3.RemoteDataSource{
-				Sha256: remote.SHA256,
-				HttpUri: &envoy_core_v3.HttpUri{
-					Uri: remote.HttpURI.URI,
-					HttpUpstreamType: &envoy_core_v3.HttpUri_Cluster{
-						Cluster: clusterSNI,
-					},
-					Timeout: timeout,
-				},
-				RetryPolicy: p.retryPolicy(),
-			},
-		},
-	}, nil
-}
-
-func (p *pluginConfig) capConfig() *envoy_wasm_v3.CapabilityRestrictionConfig {
-	if len(p.CapabilityRestrictionConfiguration.AllowedCapabilities) == 0 {
-		return nil
-	}
-
-	allowedCaps := make(map[string]*envoy_wasm_v3.SanitizationConfig)
-	for key := range p.CapabilityRestrictionConfiguration.AllowedCapabilities {
-		allowedCaps[key] = &envoy_wasm_v3.SanitizationConfig{}
-	}
-
-	return &envoy_wasm_v3.CapabilityRestrictionConfig{
-		AllowedCapabilities: allowedCaps,
-	}
-}
-
-func (p *pluginConfig) envoyPluginConfig(rtCfg *extensioncommon.RuntimeConfig) (*envoy_wasm_v3.PluginConfig, error) {
-	var err error
-	var pluginCfgData, vmCfgData *anypb.Any
-
-	if p.Configuration != "" {
-		pluginCfgData, err = anypb.New(wrapperspb.String(p.Configuration))
-		if err != nil {
-			return nil, fmt.Errorf("failed to encode Wasm plugin configuration: %w", err)
-		}
-	}
-
-	if p.VmConfig.Configuration != "" {
-		vmCfgData, err = anypb.New(wrapperspb.String(p.VmConfig.Configuration))
-		if err != nil {
-			return nil, fmt.Errorf("failed to encode Wasm VM configuration: %w", err)
-		}
-	}
-
-	code, err := p.asyncDataSource(rtCfg)
-	if err != nil {
-		return nil, fmt.Errorf("failed to encode async data source configuration: %w", err)
-	}
-
-	var envVars *envoy_wasm_v3.EnvironmentVariables
-	if len(p.VmConfig.EnvironmentVariables.HostEnvKeys) > 0 ||
-		len(p.VmConfig.EnvironmentVariables.KeyValues) > 0 {
-		envVars = &envoy_wasm_v3.EnvironmentVariables{
-			HostEnvKeys: p.VmConfig.EnvironmentVariables.HostEnvKeys,
-			KeyValues:   p.VmConfig.EnvironmentVariables.KeyValues,
-		}
-	}
-
-	return &envoy_wasm_v3.PluginConfig{
-		Name:   p.Name,
-		RootId: p.RootID,
-		Vm: &envoy_wasm_v3.PluginConfig_VmConfig{
-			VmConfig: &envoy_wasm_v3.VmConfig{
-				VmId:                 p.VmConfig.VmID,
-				Runtime:              fmt.Sprintf("envoy.wasm.runtime.%s", p.VmConfig.Runtime),
-				Code:                 code,
-				Configuration:        vmCfgData,
-				EnvironmentVariables: envVars,
-			},
-		},
-		Configuration:               pluginCfgData,
-		CapabilityRestrictionConfig: p.capConfig(),
-		FailOpen:                    p.failOpen,
-	}, nil
-}
-
-func (p *pluginConfig) retryPolicy() *envoy_core_v3.RetryPolicy {
-	remote := &p.VmConfig.Code.Remote
-	if remote.RetryPolicy.NumRetries <= 0 &&
-		remote.RetryPolicy.RetryBackOff.BaseInterval == "" &&
-		remote.RetryPolicy.RetryBackOff.MaxInterval == "" {
-		return nil
-	}
-
-	retryPolicy := &envoy_core_v3.RetryPolicy{}
-
-	if remote.RetryPolicy.NumRetries > 0 {
-		retryPolicy.NumRetries = wrapperspb.UInt32(uint32(remote.RetryPolicy.NumRetries))
-	}
-
-	var baseInterval, maxInterval *durationpb.Duration
-	if remote.RetryPolicy.RetryBackOff.baseInterval > 0 {
-		baseInterval = &durationpb.Duration{Seconds: int64(remote.RetryPolicy.RetryBackOff.baseInterval.Seconds())}
-	}
-	if remote.RetryPolicy.RetryBackOff.maxInterval > 0 {
-		maxInterval = &durationpb.Duration{Seconds: int64(remote.RetryPolicy.RetryBackOff.maxInterval.Seconds())}
-	}
-
-	if baseInterval != nil || maxInterval != nil {
-		retryPolicy.RetryBackOff = &envoy_core_v3.BackoffStrategy{
-			BaseInterval: baseInterval,
-			MaxInterval:  maxInterval,
-		}
-	}
-
-	return retryPolicy
-}
-
-func (w *wasmConfig) normalize() {
-	if w.ProxyType == "" {
-		w.ProxyType = api.ServiceKindConnectProxy
-	}
-
-	if w.PluginConfig.VmConfig.Runtime == "" {
-		w.PluginConfig.VmConfig.Runtime = supportedRuntimes[0]
-	}
-
-	httpURI := &w.PluginConfig.VmConfig.Code.Remote.HttpURI
-	httpURI.Service.Namespace = acl.NamespaceOrDefault(httpURI.Service.Namespace)
-	httpURI.Service.Partition = acl.PartitionOrDefault(httpURI.Service.Partition)
-	if httpURI.timeout <= 0 {
-		httpURI.timeout = time.Second
-	}
-}
-
-// validate ensures the filterConfig is valid or it returns an error.
-// This method must be called before using the configuration.
-func (w *wasmConfig) validate() error {
-	var err, resultErr error
-	if w.Protocol != "tcp" && w.Protocol != "http" {
-		resultErr = multierror.Append(resultErr, fmt.Errorf(`unsupported Protocol %q, expected "tcp" or "http"`, w.Protocol))
-	}
-	if w.ProxyType != api.ServiceKindConnectProxy {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("unsupported ProxyType %q, only %q is supported", w.ProxyType, api.ServiceKindConnectProxy))
-	}
-	if w.ListenerType != "inbound" && w.ListenerType != "outbound" {
-		resultErr = multierror.Append(resultErr, fmt.Errorf(`unsupported ListenerType %q, expected "inbound" or "outbound"`, w.ListenerType))
-	}
-	if err = validateRuntime(w.PluginConfig.VmConfig.Runtime); err != nil {
-		resultErr = multierror.Append(resultErr, err)
-	}
-
-	httpURI := &w.PluginConfig.VmConfig.Code.Remote.HttpURI
-	isLocal := w.PluginConfig.VmConfig.Code.Local.Filename != ""
-	isRemote := httpURI.Service.Name != "" || httpURI.URI != ""
-	if isLocal == isRemote {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("VmConfig.Code must provide exactly one of Local or Remote data source"))
-	}
-
-	// If the data source is Local then validation is complete.
-	if isLocal {
-		return resultErr
-	}
-
-	// Validate the remote data source fields.
-	// Both Service and URI are required inputs for remote data sources.
-	// We could catch this above in the isRemote check; however, we do an explicit check
-	// here for UX to give the user extra feedback in case they only provide one or the other.
-	if httpURI.Service.Name == "" || httpURI.URI == "" {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("both Service and URI are required for Remote data sources"))
-	}
-	if w.PluginConfig.VmConfig.Code.Remote.SHA256 == "" {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("SHA256 checksum is required for Remote data sources"))
-	}
-	if _, err := url.Parse(httpURI.URI); err != nil {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("invalid HttpURI.URI: %w", err))
-	}
-	if httpURI.Timeout != "" {
-		httpURI.timeout, err = time.ParseDuration(httpURI.Timeout)
-		if err != nil {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("failed to parse HttpURI.Timeout %q as a duration: %w", httpURI.Timeout, err))
-		}
-	}
-
-	retryPolicy := &w.PluginConfig.VmConfig.Code.Remote.RetryPolicy
-	if retryPolicy.NumRetries < 0 {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("RetryPolicy.NumRetries must be greater than or equal to 0"))
-	}
-
-	if retryPolicy.RetryBackOff.BaseInterval != "" {
-		retryPolicy.RetryBackOff.baseInterval, err = time.ParseDuration(retryPolicy.RetryBackOff.BaseInterval)
-		if err != nil {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("failed to parse RetryBackOff.BaseInterval %q: %w", retryPolicy.RetryBackOff.BaseInterval, err))
-		}
-	}
-	if retryPolicy.RetryBackOff.MaxInterval != "" {
-		retryPolicy.RetryBackOff.maxInterval, err = time.ParseDuration(retryPolicy.RetryBackOff.MaxInterval)
-		if err != nil {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("failed to parse RetryBackOff.MaxInterval %q: %w", retryPolicy.RetryBackOff.MaxInterval, err))
-		}
-	}
-
-	if retryPolicy.RetryBackOff.BaseInterval != "" && retryPolicy.RetryBackOff.baseInterval <= 0 {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("RetryBackOff.BaseInterval %q must be greater than zero and less than or equal to RetryBackOff.MaxInterval %q",
-			retryPolicy.RetryBackOff.BaseInterval,
-			retryPolicy.RetryBackOff.MaxInterval),
-		)
-	}
-	if retryPolicy.RetryBackOff.MaxInterval != "" &&
-		retryPolicy.RetryBackOff.maxInterval < retryPolicy.RetryBackOff.baseInterval {
-		resultErr = multierror.Append(resultErr, fmt.Errorf("RetryBackOff.MaxInterval %q must be greater than or equal to RetryBackOff.BaseInterval %q",
-			retryPolicy.RetryBackOff.MaxInterval,
-			retryPolicy.RetryBackOff.BaseInterval),
-		)
-	}
-	return resultErr
-}
-
-func validateRuntime(s string) error {
-	for _, rt := range supportedRuntimes {
-		if s == rt {
-			return nil
-		}
-	}
-	return fmt.Errorf("unsupported runtime %q", s)
-}
diff --git a/agent/envoyextensions/builtin/wasm/wasm.go b/agent/envoyextensions/builtin/wasm/wasm.go
deleted file mode 100644
index da1e0a7ceaa95..0000000000000
--- a/agent/envoyextensions/builtin/wasm/wasm.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package wasm
-
-import (
-	"fmt"
-
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	envoy_http_wasm_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/wasm/v3"
-	envoy_wasm_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/wasm/v3"
-
-	"github.com/hashicorp/consul/api"
-	cmn "github.com/hashicorp/consul/envoyextensions/extensioncommon"
-)
-
-// wasm is a built-in Envoy extension that can patch filter chains to insert Wasm plugins.
-type wasm struct {
-	cmn.BasicExtensionAdapter
-
-	name       string
-	wasmConfig *wasmConfig
-}
-
-var supportedRuntimes = []string{"v8", "wamr", "wavm", "wasmtime"}
-
-var _ cmn.BasicExtension = (*wasm)(nil)
-
-func Constructor(ext api.EnvoyExtension) (cmn.EnvoyExtender, error) {
-	w, err := construct(ext)
-	if err != nil {
-		return nil, err
-	}
-	return &cmn.BasicEnvoyExtender{
-		Extension: &w,
-	}, nil
-}
-
-func construct(ext api.EnvoyExtension) (wasm, error) {
-	w := wasm{name: ext.Name}
-
-	if w.name != api.BuiltinWasmExtension {
-		return w, fmt.Errorf("expected extension name %q but got %q", api.BuiltinWasmExtension, w.name)
-	}
-
-	if err := w.fromArguments(ext.Arguments); err != nil {
-		return w, err
-	}
-
-	// Configure the failure behavior for the filter. If the plugin is required,
-	// then filter runtime errors result in a failed request (fail "closed").
-	// Otherwise, runtime errors result in the filter being skipped (fail "open").
-	w.wasmConfig.PluginConfig.failOpen = !ext.Required
-
-	return w, nil
-}
-
-func (w *wasm) fromArguments(args map[string]any) error {
-	var err error
-	w.wasmConfig, err = newWasmConfig(args)
-	if err != nil {
-		return fmt.Errorf("error decoding extension arguments: %w", err)
-	}
-	return w.wasmConfig.validate()
-}
-
-// CanApply indicates if the WASM extension can be applied to the given extension configuration.
-func (w wasm) CanApply(cfg *cmn.RuntimeConfig) bool {
-	return cfg.Kind == w.wasmConfig.ProxyType &&
-		cfg.Protocol == w.wasmConfig.Protocol
-}
-
-func (w wasm) matchesConfigDirection(isInboundListener bool) bool {
-	return (isInboundListener && w.wasmConfig.ListenerType == "inbound") ||
-		(!isInboundListener && w.wasmConfig.ListenerType == "outbound")
-}
-
-// PatchFilters adds a Wasm HTTP or TCP filter to the filter chain.
-func (w wasm) PatchFilters(cfg *cmn.RuntimeConfig, filters []*envoy_listener_v3.Filter, isInboundListener bool) ([]*envoy_listener_v3.Filter, error) {
-	if !w.matchesConfigDirection(isInboundListener) {
-		return filters, nil
-	}
-
-	// Check that the Wasm plugin protocol matches the service protocol.
-	// It is a runtime error if the extension is configured to apply a Wasm plugin
-	// that doesn't match the service's protocol.
-	// This shouldn't happen because the caller should check CanApply first, but just in case.
-	if cfg.Protocol != w.wasmConfig.Protocol {
-		return filters, fmt.Errorf("failed to apply Wasm filter: service protocol for %q is %q but protocol for the Wasm extension is %q. Please ensure the protocols match",
-			cfg.ServiceName.Name, cfg.Protocol, w.wasmConfig.Protocol)
-	}
-
-	// Generate the Wasm plugin configuration. It is the same config for HTTP and network filters.
-	wasmPluginConfig, err := w.wasmConfig.PluginConfig.envoyPluginConfig(cfg)
-	if err != nil {
-		return filters, fmt.Errorf("failed to encode Envoy Wasm plugin configuration: %w", err)
-	}
-
-	// Insert the filter immediately before the terminal filter.
-	insertOptions := cmn.InsertOptions{Location: cmn.InsertBeforeFirstMatch}
-
-	switch cfg.Protocol {
-	case "grpc", "http2", "http":
-		insertOptions.FilterName = "envoy.filters.http.router"
-		filter, err := cmn.MakeEnvoyHTTPFilter("envoy.filters.http.wasm", &envoy_http_wasm_v3.Wasm{Config: wasmPluginConfig})
-		if err != nil {
-			return filters, fmt.Errorf("failed to make Wasm HTTP filter: %w", err)
-		}
-		return cmn.InsertHTTPFilter(filters, filter, insertOptions)
-	case "tcp":
-		fallthrough
-	default:
-		insertOptions.FilterName = "envoy.filters.network.tcp_proxy"
-		filter, err := cmn.MakeFilter("envoy.filters.network.wasm", &envoy_wasm_v3.Wasm{Config: wasmPluginConfig})
-		if err != nil {
-			return filters, fmt.Errorf("failed to make Wasm network filter: %w", err)
-		}
-		return cmn.InsertNetworkFilter(filters, filter, insertOptions)
-	}
-}
diff --git a/agent/envoyextensions/builtin/wasm/wasm_test.go b/agent/envoyextensions/builtin/wasm/wasm_test.go
deleted file mode 100644
index fd348d59a73d4..0000000000000
--- a/agent/envoyextensions/builtin/wasm/wasm_test.go
+++ /dev/null
@@ -1,678 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package wasm
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/url"
-	"strings"
-	"testing"
-	"time"
-
-	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	envoy_http_wasm_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/wasm/v3"
-	envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
-	envoy_network_wasm_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/wasm/v3"
-	envoy_wasm_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/wasm/v3"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/anypb"
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/envoyextensions/extensioncommon"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestHttpWasmExtension(t *testing.T) {
-	t.Parallel()
-	cases := map[string]struct {
-		extName         string
-		canApply        bool
-		cfg             func(string, bool) *testWasmConfig
-		rtCfg           func(string, bool) *extensioncommon.RuntimeConfig
-		isInboundFilter bool
-		errStr          string
-		debug           bool
-	}{
-		"remote file": {
-			extName:         api.BuiltinWasmExtension,
-			canApply:        true,
-			cfg:             func(proto string, ent bool) *testWasmConfig { return makeTestWasmConfig(proto, ent) },
-			rtCfg:           func(proto string, ent bool) *extensioncommon.RuntimeConfig { return makeTestRuntimeConfig(proto, ent) },
-			isInboundFilter: true,
-		},
-		"local file": {
-			extName:  api.BuiltinWasmExtension,
-			canApply: true,
-			cfg: func(proto string, ent bool) *testWasmConfig {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.ListenerType = "inbound"
-				cfg.PluginConfig.VmConfig.Code.Local.Filename = "plugin.wasm"
-				return cfg
-			},
-			rtCfg:           func(proto string, ent bool) *extensioncommon.RuntimeConfig { return makeTestRuntimeConfig(proto, ent) },
-			isInboundFilter: true,
-		},
-		"inbound filters ignored": {
-			extName:         api.BuiltinWasmExtension,
-			canApply:        true,
-			cfg:             func(proto string, ent bool) *testWasmConfig { return makeTestWasmConfig(proto, ent) },
-			rtCfg:           func(proto string, ent bool) *extensioncommon.RuntimeConfig { return makeTestRuntimeConfig(proto, ent) },
-			isInboundFilter: false,
-		},
-		"no cluster for remote file": {
-			extName:  api.BuiltinWasmExtension,
-			canApply: true,
-			cfg:      func(proto string, ent bool) *testWasmConfig { return makeTestWasmConfig(proto, ent) },
-			rtCfg: func(proto string, ent bool) *extensioncommon.RuntimeConfig {
-				rt := makeTestRuntimeConfig(proto, ent)
-				rt.Upstreams = nil
-				return rt
-			},
-			isInboundFilter: true,
-			errStr:          "no upstream found for remote service",
-		},
-		"protocol mismatch": {
-			extName:  api.BuiltinWasmExtension,
-			canApply: false,
-			cfg:      func(proto string, ent bool) *testWasmConfig { return makeTestWasmConfig(proto, ent) },
-			rtCfg: func(proto string, ent bool) *extensioncommon.RuntimeConfig {
-				rt := makeTestRuntimeConfig(proto, ent)
-				switch proto {
-				case "http":
-					rt.Protocol = "tcp"
-				case "tcp":
-					rt.Protocol = "http"
-				}
-				return rt
-			},
-			isInboundFilter: true,
-		},
-	}
-
-	for _, enterprise := range []bool{false, true} {
-		for _, protocol := range []string{"tcp", "http"} {
-			for name, c := range cases {
-				c := c
-				t.Run(fmt.Sprintf("%s_%s_ent_%t", name, protocol, enterprise), func(t *testing.T) {
-					cfg := c.cfg(protocol, enterprise)
-					rtCfg := c.rtCfg(protocol, enterprise)
-					rtCfg.EnvoyExtension = api.EnvoyExtension{
-						Name:      c.extName,
-						Arguments: cfg.toMap(t),
-					}
-
-					w, err := construct(rtCfg.EnvoyExtension)
-					require.NoError(t, err)
-					require.Equal(t, c.canApply, w.CanApply(rtCfg))
-					if !c.canApply {
-						return
-					}
-
-					var inputFilters []*envoy_listener_v3.Filter
-					if protocol == "http" {
-						inputFilters = append(inputFilters, makeHttpConMgr(t, makeTestHttpFilters()))
-					} else {
-						inputFilters = makeTestFilters()
-					}
-
-					obsFilters, err := w.PatchFilters(rtCfg, inputFilters, c.isInboundFilter)
-					if c.errStr == "" {
-						require.NoError(t, err)
-
-						expFilters := cfg.expFilters(t)
-						if !cfg.matchesDirection(c.isInboundFilter) {
-							// If the listener type does not match the filter direction then the
-							// filter should not be applied and the output should match the input.
-							expFilters = inputFilters
-						}
-
-						if c.debug {
-							t.Logf("cfg =\n%s\n\n", cfg.toJSON(t))
-							require.Equal(t, len(expFilters), len(obsFilters))
-							for idx, expFilter := range expFilters {
-								t.Logf("expFilterJSON[%d] =\n%s\n\n", idx, prototest.ProtoToJSON(t, expFilter))
-								t.Logf("obsfilterJSON[%d] =\n%s\n\n", idx, prototest.ProtoToJSON(t, obsFilters[idx]))
-							}
-						}
-
-						prototest.AssertDeepEqual(t, expFilters, obsFilters)
-					} else {
-						require.Error(t, err)
-						require.Contains(t, err.Error(), c.errStr)
-					}
-				})
-			}
-		}
-	}
-}
-
-func TestWasmConstructor(t *testing.T) {
-	t.Parallel()
-	cases := map[string]struct {
-		name   string
-		args   func(string, bool) map[string]any
-		errStr string
-	}{
-		"with no arguments": {
-			name:   api.BuiltinWasmExtension,
-			args:   func(_ string, _ bool) map[string]any { return nil },
-			errStr: "VmConfig.Code must provide exactly one of Local or Remote data source",
-		},
-		"invalid protocol": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.Protocol = "invalid"
-				return cfg.toMap(t)
-			},
-			errStr: `unsupported Protocol "invalid", expected "tcp" or "http"`,
-		},
-		"invalid proxy type": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.ProxyType = "invalid"
-				return cfg.toMap(t)
-			},
-			errStr: "unsupported ProxyType",
-		},
-		"invalid listener type": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.ListenerType = "invalid"
-				return cfg.toMap(t)
-			},
-			errStr: `unsupported ListenerType "invalid", expected "inbound" or "outbound"`,
-		},
-		"invalid runtime": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.PluginConfig.VmConfig.Runtime = "invalid"
-				return cfg.toMap(t)
-			},
-			errStr: "unsupported runtime",
-		},
-		"both local and remote files": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.PluginConfig.VmConfig.Code.Local.Filename = "plugin.wasm"
-				cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.Service.Name = "file-server"
-				cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.URI = "http://file-server/plugin.wasm"
-				return cfg.toMap(t)
-			},
-			errStr: "VmConfig.Code must provide exactly one of Local or Remote data source",
-		},
-		"service and uri required for remote files": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.Service.Name = "file-server"
-				return cfg.toMap(t)
-			},
-			errStr: "both Service and URI are required for Remote data sources",
-		},
-		"no sha for remote file": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.Service.Name = "file-server"
-				cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.URI = "http://file-server/plugin.wasm"
-				return cfg.toMap(t)
-			},
-			errStr: "SHA256 checksum is required for Remote data sources",
-		},
-		"invalid url for remote file": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.Service.Name = "file-server"
-				cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.URI = "://bogus.url.com/error"
-				return cfg.toMap(t)
-			},
-			errStr: `invalid HttpURI.URI: parse "://bogus.url.com/error": missing protocol scheme`,
-		},
-		"decoding error": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				a := makeTestWasmConfig(proto, ent).toMap(t)
-				setField(a, "PluginConfig.VmConfig.Code.Remote.RetryPolicy.RetryBackOff.BaseInterval", 1000)
-				return a
-			},
-			errStr: "got unconvertible type",
-		},
-		"invalid http timeout": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.Timeout = "invalid"
-				return cfg.toMap(t)
-			},
-			errStr: `failed to parse HttpURI.Timeout "invalid" as a duration`,
-		},
-		"invalid num retries": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.PluginConfig.VmConfig.Code.Remote.RetryPolicy.NumRetries = -1
-				return cfg.toMap(t)
-			},
-			errStr: "RetryPolicy.NumRetries must be greater than or equal to 0",
-		},
-		"invalid base interval": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.PluginConfig.VmConfig.Code.Remote.RetryPolicy.RetryBackOff.BaseInterval = "0s"
-				return cfg.toMap(t)
-			},
-			errStr: `RetryBackOff.BaseInterval "0s" must be greater than zero and less than or equal to RetryBackOff.MaxInterval`,
-		},
-		"invalid max interval": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.PluginConfig.VmConfig.Code.Remote.RetryPolicy.RetryBackOff.BaseInterval = "10s"
-				cfg.PluginConfig.VmConfig.Code.Remote.RetryPolicy.RetryBackOff.MaxInterval = "5s"
-				return cfg.toMap(t)
-			},
-			errStr: `RetryBackOff.MaxInterval "5s" must be greater than or equal to RetryBackOff.BaseInterval "10s"`,
-		},
-		"invalid base interval duration": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.PluginConfig.VmConfig.Code.Remote.RetryPolicy.RetryBackOff.BaseInterval = "invalid"
-				return cfg.toMap(t)
-			},
-			errStr: `failed to parse RetryBackOff.BaseInterval "invalid"`,
-		},
-		"invalid max interval duration": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any {
-				cfg := newTestWasmConfig(proto, ent)
-				cfg.PluginConfig.VmConfig.Code.Remote.RetryPolicy.RetryBackOff.MaxInterval = "invalid"
-				return cfg.toMap(t)
-			},
-			errStr: `failed to parse RetryBackOff.MaxInterval "invalid"`,
-		},
-		"invalid extension name": {
-			name:   "invalid",
-			args:   func(proto string, ent bool) map[string]any { return newTestWasmConfig(proto, ent).toMap(t) },
-			errStr: `expected extension name "builtin/wasm" but got "invalid"`,
-		},
-		"valid configuration": {
-			name: api.BuiltinWasmExtension,
-			args: func(proto string, ent bool) map[string]any { return makeTestWasmConfig(proto, ent).toMap(t) },
-		},
-	}
-	for _, enterprise := range []bool{false, true} {
-		for _, protocol := range []string{"tcp", "http"} {
-			for name, c := range cases {
-				c := c
-				t.Run(fmt.Sprintf("%s_%s_ent_%t", name, protocol, enterprise), func(t *testing.T) {
-					svc := api.CompoundServiceName{Name: "svc"}
-					ext := extensioncommon.RuntimeConfig{
-						ServiceName: svc,
-						EnvoyExtension: api.EnvoyExtension{
-							Name:      c.name,
-							Arguments: c.args(protocol, enterprise),
-						},
-					}
-
-					e, err := Constructor(ext.EnvoyExtension)
-
-					if c.errStr == "" {
-						require.NoError(t, err)
-						require.NotNil(t, e)
-					} else {
-						require.Error(t, err)
-						require.Contains(t, err.Error(), c.errStr)
-					}
-				})
-			}
-		}
-	}
-}
-
-type testWasmConfig struct {
-	Required     bool
-	Protocol     string
-	ProxyType    string
-	ListenerType string
-	PluginConfig struct {
-		Name     string
-		RootID   string
-		VmConfig struct {
-			VmID    string
-			Runtime string
-			Code    struct {
-				Local struct {
-					Filename string
-				}
-				Remote struct {
-					HttpURI struct {
-						Service api.CompoundServiceName
-						URI     string
-						Timeout string
-					}
-					SHA256      string
-					RetryPolicy struct {
-						RetryBackOff struct {
-							BaseInterval string
-							MaxInterval  string
-						}
-						NumRetries int
-					}
-				}
-			}
-			Configuration        string
-			EnvironmentVariables struct {
-				HostEnvKeys []string
-				KeyValues   map[string]string
-			}
-		}
-		Configuration                      string
-		CapabilityRestrictionConfiguration struct {
-			AllowedCapabilities map[string]any
-		}
-	}
-}
-
-func (c testWasmConfig) toMap(t *testing.T) map[string]any {
-	t.Helper()
-	var m map[string]any
-	require.NoError(t, json.Unmarshal(c.toJSON(t), &m))
-	return m
-}
-
-func (c testWasmConfig) toJSON(t *testing.T) []byte {
-	t.Helper()
-	b, err := json.MarshalIndent(c, "", "  ")
-	require.NoError(t, err)
-	return b
-}
-
-func (cfg testWasmConfig) toWasmPluginConfig(t *testing.T) *envoy_wasm_v3.PluginConfig {
-	t.Helper()
-	var code *envoy_core_v3.AsyncDataSource
-	if cfg.PluginConfig.VmConfig.Code.Local.Filename != "" {
-		code = &envoy_core_v3.AsyncDataSource{
-			Specifier: &envoy_core_v3.AsyncDataSource_Local{
-				Local: &envoy_core_v3.DataSource{
-					Specifier: &envoy_core_v3.DataSource_Filename{
-						Filename: cfg.PluginConfig.VmConfig.Code.Local.Filename,
-					},
-				},
-			},
-		}
-	} else {
-		cluster, err := url.Parse(cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.URI)
-		require.NoError(t, err)
-		timeout, err := time.ParseDuration(cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.Timeout)
-		require.NoError(t, err)
-		baseInterval, err := time.ParseDuration(cfg.PluginConfig.VmConfig.Code.Remote.RetryPolicy.RetryBackOff.BaseInterval)
-		require.NoError(t, err)
-		maxInterval, err := time.ParseDuration(cfg.PluginConfig.VmConfig.Code.Remote.RetryPolicy.RetryBackOff.MaxInterval)
-		require.NoError(t, err)
-
-		code = &envoy_core_v3.AsyncDataSource{
-			Specifier: &envoy_core_v3.AsyncDataSource_Remote{
-				Remote: &envoy_core_v3.RemoteDataSource{
-					Sha256: cfg.PluginConfig.VmConfig.Code.Remote.SHA256,
-					HttpUri: &envoy_core_v3.HttpUri{
-						Uri:     cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.URI,
-						Timeout: &durationpb.Duration{Seconds: int64(timeout.Seconds())},
-						HttpUpstreamType: &envoy_core_v3.HttpUri_Cluster{
-							Cluster: cluster.Host,
-						},
-					},
-					RetryPolicy: &envoy_core_v3.RetryPolicy{
-						RetryBackOff: &envoy_core_v3.BackoffStrategy{
-							BaseInterval: &durationpb.Duration{Seconds: int64(baseInterval.Seconds())},
-							MaxInterval:  &durationpb.Duration{Seconds: int64(maxInterval.Seconds())},
-						},
-						NumRetries: wrapperspb.UInt32(uint32(cfg.PluginConfig.VmConfig.Code.Remote.RetryPolicy.NumRetries)),
-					},
-				},
-			},
-		}
-	}
-
-	var capConfig *envoy_wasm_v3.CapabilityRestrictionConfig
-	if len(cfg.PluginConfig.CapabilityRestrictionConfiguration.AllowedCapabilities) > 0 {
-		caps := make(map[string]*envoy_wasm_v3.SanitizationConfig)
-		for cap := range cfg.PluginConfig.CapabilityRestrictionConfiguration.AllowedCapabilities {
-			caps[cap] = &envoy_wasm_v3.SanitizationConfig{}
-		}
-		capConfig = &envoy_wasm_v3.CapabilityRestrictionConfig{AllowedCapabilities: caps}
-	}
-
-	var vmConfiguration *anypb.Any
-	if cfg.PluginConfig.VmConfig.Configuration != "" {
-		vmConfiguration = makeAny(t, wrapperspb.String(cfg.PluginConfig.VmConfig.Configuration))
-	}
-
-	var envVars *envoy_wasm_v3.EnvironmentVariables
-	if len(cfg.PluginConfig.VmConfig.EnvironmentVariables.HostEnvKeys) > 0 ||
-		len(cfg.PluginConfig.VmConfig.EnvironmentVariables.KeyValues) > 0 {
-		envVars = &envoy_wasm_v3.EnvironmentVariables{
-			HostEnvKeys: cfg.PluginConfig.VmConfig.EnvironmentVariables.HostEnvKeys,
-			KeyValues:   cfg.PluginConfig.VmConfig.EnvironmentVariables.KeyValues,
-		}
-	}
-
-	var pluginConfiguration *anypb.Any
-	if cfg.PluginConfig.Configuration != "" {
-		pluginConfiguration = makeAny(t, wrapperspb.String(cfg.PluginConfig.Configuration))
-	}
-
-	rt := cfg.PluginConfig.VmConfig.Runtime
-	if rt == "" {
-		rt = supportedRuntimes[0]
-	}
-
-	return &envoy_wasm_v3.PluginConfig{
-		Name:   cfg.PluginConfig.Name,
-		RootId: cfg.PluginConfig.RootID,
-		Vm: &envoy_wasm_v3.PluginConfig_VmConfig{
-			VmConfig: &envoy_wasm_v3.VmConfig{
-				VmId:                 cfg.PluginConfig.VmConfig.VmID,
-				Runtime:              fmt.Sprintf("envoy.wasm.runtime.%s", rt),
-				Code:                 code,
-				Configuration:        vmConfiguration,
-				EnvironmentVariables: envVars,
-			},
-		},
-		Configuration:               pluginConfiguration,
-		FailOpen:                    !cfg.Required,
-		CapabilityRestrictionConfig: capConfig,
-	}
-}
-
-func (cfg testWasmConfig) toHttpFilter(t *testing.T) *envoy_http_v3.HttpFilter {
-	return &envoy_http_v3.HttpFilter{
-		Name: "envoy.filters.http.wasm",
-		ConfigType: &envoy_http_v3.HttpFilter_TypedConfig{
-			TypedConfig: makeAny(t,
-				&envoy_http_wasm_v3.Wasm{
-					Config: cfg.toWasmPluginConfig(t),
-				}),
-		},
-	}
-}
-
-func (cfg testWasmConfig) toNetworkFilter(t *testing.T) *envoy_listener_v3.Filter {
-	return &envoy_listener_v3.Filter{
-		Name: "envoy.filters.network.wasm",
-		ConfigType: &envoy_listener_v3.Filter_TypedConfig{
-			TypedConfig: makeAny(t,
-				&envoy_network_wasm_v3.Wasm{
-					Config: cfg.toWasmPluginConfig(t),
-				}),
-		},
-	}
-}
-
-func (cfg testWasmConfig) expFilters(t *testing.T) []*envoy_listener_v3.Filter {
-	if cfg.Protocol == "http" {
-		return []*envoy_listener_v3.Filter{makeHttpConMgr(t, cfg.expHttpFilters(t))}
-	} else {
-		return cfg.expNetworkFilters(t)
-	}
-}
-
-func (cfg testWasmConfig) expHttpFilters(t *testing.T) []*envoy_http_v3.HttpFilter {
-	return []*envoy_http_v3.HttpFilter{
-		{Name: "one"},
-		{Name: "two"},
-		cfg.toHttpFilter(t),
-		{Name: "envoy.filters.http.router"},
-		{Name: "three"},
-	}
-}
-
-func (cfg testWasmConfig) expNetworkFilters(t *testing.T) []*envoy_listener_v3.Filter {
-	return []*envoy_listener_v3.Filter{
-		{Name: "one"},
-		{Name: "two"},
-		cfg.toNetworkFilter(t),
-		{Name: "envoy.filters.network.tcp_proxy"},
-		{Name: "three"},
-	}
-}
-
-func (cfg testWasmConfig) matchesDirection(isInbound bool) bool {
-	return (isInbound && cfg.ListenerType == "inbound") ||
-		(!isInbound && cfg.ListenerType == "outbound")
-}
-
-func makeAny(t *testing.T, m proto.Message) *anypb.Any {
-	t.Helper()
-	v, err := anypb.New(m)
-	require.NoError(t, err)
-	return v
-}
-
-func makeHttpConMgr(t *testing.T, filters []*envoy_http_v3.HttpFilter) *envoy_listener_v3.Filter {
-	t.Helper()
-	return &envoy_listener_v3.Filter{
-		Name: "envoy.filters.network.http_connection_manager",
-		ConfigType: &envoy_listener_v3.Filter_TypedConfig{
-			TypedConfig: makeAny(t, &envoy_http_v3.HttpConnectionManager{
-				HttpFilters: filters,
-			}),
-		},
-	}
-}
-
-func makeTestFilters() []*envoy_listener_v3.Filter {
-	return []*envoy_listener_v3.Filter{
-		{Name: "one"},
-		{Name: "two"},
-		{Name: "envoy.filters.network.tcp_proxy"},
-		{Name: "three"},
-	}
-}
-
-func makeTestHttpFilters() []*envoy_http_v3.HttpFilter {
-	return []*envoy_http_v3.HttpFilter{
-		{Name: "one"},
-		{Name: "two"},
-		{Name: "envoy.filters.http.router"},
-		{Name: "three"},
-	}
-}
-
-func makeTestRuntimeConfig(protocol string, enterprise bool) *extensioncommon.RuntimeConfig {
-	var ns, ap string
-	if enterprise {
-		ns = "ns1"
-		ap = "ap1"
-	}
-	return &extensioncommon.RuntimeConfig{
-		Kind:        api.ServiceKindConnectProxy,
-		ServiceName: api.CompoundServiceName{Name: "test-service"},
-		Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{
-			{
-				Name:      "test-file-server",
-				Namespace: acl.NamespaceOrDefault(ns),
-				Partition: acl.PartitionOrDefault(ap),
-			}: {
-				SNIs:    map[string]struct{}{"test-file-server": {}},
-				EnvoyID: "test-file-server",
-			},
-		},
-		Protocol: protocol,
-	}
-}
-
-func makeTestWasmConfig(protocol string, enterprise bool) *testWasmConfig {
-	cfg := newTestWasmConfig(protocol, enterprise)
-	cfg.Required = false
-	cfg.Protocol = protocol
-	cfg.ProxyType = "connect-proxy"
-	cfg.ListenerType = "inbound"
-	cfg.PluginConfig.Name = "test-plugin-name"
-	cfg.PluginConfig.RootID = "test-root-id"
-	cfg.PluginConfig.VmConfig.VmID = "test-vm-id"
-	cfg.PluginConfig.VmConfig.Runtime = "wasmtime"
-	cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.Service.Name = "test-file-server"
-	cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.URI = "https://test-file-server/plugin.wasm"
-	cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.Timeout = "5s"
-	cfg.PluginConfig.VmConfig.Code.Remote.SHA256 = "d05d88b0ce8a8f1d5176481e0af3ae5c65ed82cbfb8c61506c5354b076078545"
-	cfg.PluginConfig.VmConfig.Code.Remote.RetryPolicy.RetryBackOff.BaseInterval = "3s"
-	cfg.PluginConfig.VmConfig.Code.Remote.RetryPolicy.RetryBackOff.MaxInterval = "15s"
-	cfg.PluginConfig.VmConfig.Code.Remote.RetryPolicy.NumRetries = 3
-	cfg.PluginConfig.VmConfig.Configuration = "test-vm-configuration"
-	cfg.PluginConfig.VmConfig.EnvironmentVariables.HostEnvKeys = []string{"PATH"}
-	cfg.PluginConfig.VmConfig.EnvironmentVariables.KeyValues = map[string]string{"TEST_VAR": "TEST_VAL"}
-	cfg.PluginConfig.Configuration = "test-plugin-configuration"
-	cfg.PluginConfig.CapabilityRestrictionConfiguration.AllowedCapabilities = map[string]any{"proxy_on_vm_start": true}
-	return cfg
-}
-
-func newTestWasmConfig(protocol string, enterprise bool) *testWasmConfig {
-	cfg := &testWasmConfig{Protocol: protocol}
-	if enterprise {
-		cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.Service.Namespace = "ns1"
-		cfg.PluginConfig.VmConfig.Code.Remote.HttpURI.Service.Partition = "ap1"
-	}
-	return cfg
-}
-
-func setField(m map[string]any, path string, value any) {
-	upsertField(m, path, value, 0)
-}
-
-func upsertField(m map[string]any, path string, value any, index int) {
-	keys := strings.Split(path, ".")
-	key := keys[index]
-
-	if val, ok := m[key]; ok {
-		// update the value
-		if index == len(keys)-1 {
-			m[key] = value
-		} else {
-			upsertField(val.(map[string]any), path, value, index+1)
-		}
-	} else {
-		// key does not exist so insert it
-		if index == len(keys)-1 {
-			m[key] = value
-		} else {
-			newMap := make(map[string]any)
-			m[key] = newMap
-			upsertField(newMap, path, value, index+1)
-		}
-	}
-}
diff --git a/agent/envoyextensions/registered_extensions.go b/agent/envoyextensions/registered_extensions.go
index b2bb2aeeaaa9e..c765df7c8381c 100644
--- a/agent/envoyextensions/registered_extensions.go
+++ b/agent/envoyextensions/registered_extensions.go
@@ -1,46 +1,31 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package envoyextensions
 
 import (
 	"fmt"
 
-	"github.com/hashicorp/go-multierror"
-	"github.com/hashicorp/go-version"
-
 	awslambda "github.com/hashicorp/consul/agent/envoyextensions/builtin/aws-lambda"
-	extauthz "github.com/hashicorp/consul/agent/envoyextensions/builtin/ext-authz"
 	"github.com/hashicorp/consul/agent/envoyextensions/builtin/lua"
-	otelaccesslogging "github.com/hashicorp/consul/agent/envoyextensions/builtin/otel-access-logging"
-	propertyoverride "github.com/hashicorp/consul/agent/envoyextensions/builtin/property-override"
-	"github.com/hashicorp/consul/agent/envoyextensions/builtin/wasm"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/envoyextensions/extensioncommon"
+	"github.com/hashicorp/go-multierror"
 )
 
 type extensionConstructor func(api.EnvoyExtension) (extensioncommon.EnvoyExtender, error)
 
 var extensionConstructors = map[string]extensionConstructor{
-	api.BuiltinOTELAccessLoggingExtension: otelaccesslogging.Constructor,
-	api.BuiltinLuaExtension:               lua.Constructor,
-	api.BuiltinAWSLambdaExtension:         awslambda.Constructor,
-	api.BuiltinPropertyOverrideExtension:  propertyoverride.Constructor,
-	api.BuiltinWasmExtension:              wasm.Constructor,
-	api.BuiltinExtAuthzExtension:          extauthz.Constructor,
+	api.BuiltinLuaExtension:       lua.Constructor,
+	api.BuiltinAWSLambdaExtension: awslambda.Constructor,
 }
 
 // ConstructExtension attempts to lookup and build an extension from the registry with the
 // given config. Returns an error if the extension does not exist, or if the extension fails
 // to be constructed properly.
 func ConstructExtension(ext api.EnvoyExtension) (extensioncommon.EnvoyExtender, error) {
-	if constructor, ok := extensionConstructors[ext.Name]; ok {
-		return constructor(ext)
-	}
-	if constructor, ok := enterpriseExtensionConstructors[ext.Name]; ok {
-		return constructor(ext)
+	constructor, ok := extensionConstructors[ext.Name]
+	if !ok {
+		return nil, fmt.Errorf("name %q is not a built-in extension", ext.Name)
 	}
-	return nil, fmt.Errorf("name %q is not a built-in extension", ext.Name)
+	return constructor(ext)
 }
 
 // ValidateExtensions will attempt to construct each instance of the given envoy extension configurations
@@ -54,23 +39,6 @@ func ValidateExtensions(extensions []api.EnvoyExtension) error {
 			output = multierror.Append(output, fmt.Errorf("invalid EnvoyExtensions[%d]: Name is required", i))
 			continue
 		}
-
-		if v := ext.EnvoyVersion; v != "" {
-			_, err := version.NewConstraint(v)
-			if err != nil {
-				output = multierror.Append(output, fmt.Errorf("invalid EnvoyExtensions[%d].EnvoyVersion: %w", i, err))
-				continue
-			}
-		}
-
-		if v := ext.ConsulVersion; v != "" {
-			_, err := version.NewConstraint(v)
-			if err != nil {
-				output = multierror.Append(output, fmt.Errorf("invalid EnvoyExtensions[%d].ConsulVersion: %w", i, err))
-				continue
-			}
-		}
-
 		_, err := ConstructExtension(ext)
 		if err != nil {
 			output = multierror.Append(output, fmt.Errorf("invalid EnvoyExtensions[%d][%s]: %w", i, ext.Name, err))
diff --git a/agent/envoyextensions/registered_extensions_ce.go b/agent/envoyextensions/registered_extensions_ce.go
deleted file mode 100644
index 4b9e07e50ba46..0000000000000
--- a/agent/envoyextensions/registered_extensions_ce.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package envoyextensions
-
-var enterpriseExtensionConstructors = map[string]extensionConstructor{}
diff --git a/agent/envoyextensions/registered_extensions_test.go b/agent/envoyextensions/registered_extensions_test.go
index 818db87fafea8..3428dbed86a98 100644
--- a/agent/envoyextensions/registered_extensions_test.go
+++ b/agent/envoyextensions/registered_extensions_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package envoyextensions
 
 import (
@@ -48,30 +45,6 @@ func TestValidateExtensions(t *testing.T) {
 				"missing Script value",
 			},
 		},
-		"invalid consul version constraint": {
-			input: []api.EnvoyExtension{{
-				Name: "builtin/aws/lambda",
-				Arguments: map[string]interface{}{
-					"ARN": "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
-				},
-				ConsulVersion: "bad",
-			}},
-			expectErrs: []string{
-				"invalid EnvoyExtensions[0].ConsulVersion: Malformed constraint: bad",
-			},
-		},
-		"invalid envoy version constraint": {
-			input: []api.EnvoyExtension{{
-				Name: "builtin/aws/lambda",
-				Arguments: map[string]interface{}{
-					"ARN": "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
-				},
-				EnvoyVersion: "bad",
-			}},
-			expectErrs: []string{
-				"invalid EnvoyExtensions[0].EnvoyVersion: Malformed constraint: bad",
-			},
-		},
 	}
 
 	for name, tc := range tests {
diff --git a/agent/event_endpoint.go b/agent/event_endpoint.go
index da589632c75af..971cb9deb84d6 100644
--- a/agent/event_endpoint.go
+++ b/agent/event_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/event_endpoint_test.go b/agent/event_endpoint_test.go
index a041088c448c7..9cc7a7eef9af9 100644
--- a/agent/event_endpoint_test.go
+++ b/agent/event_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/exec/exec.go b/agent/exec/exec.go
index 408dc6bb8110d..19097fe0fbc7a 100644
--- a/agent/exec/exec.go
+++ b/agent/exec/exec.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package exec
 
 import (
diff --git a/agent/exec/exec_unix.go b/agent/exec/exec_unix.go
index e0ec556771c0b..0bbdad8c59669 100644
--- a/agent/exec/exec_unix.go
+++ b/agent/exec/exec_unix.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !windows
+// +build !windows
 
 package exec
 
diff --git a/agent/exec/exec_windows.go b/agent/exec/exec_windows.go
index d85ea09d785e6..bb96e72c3d77a 100644
--- a/agent/exec/exec_windows.go
+++ b/agent/exec/exec_windows.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build windows
+// +build windows
 
 package exec
 
diff --git a/agent/federation_state_endpoint.go b/agent/federation_state_endpoint.go
index 40a3df1ff1cd9..bac8807ec4bc1 100644
--- a/agent/federation_state_endpoint.go
+++ b/agent/federation_state_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/grpc-external/forward.go b/agent/grpc-external/forward.go
index 395fb6aa479d0..353490a5932c2 100644
--- a/agent/grpc-external/forward.go
+++ b/agent/grpc-external/forward.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package external
 
 import (
diff --git a/agent/grpc-external/limiter/limiter.go b/agent/grpc-external/limiter/limiter.go
index 44aaac616f99f..9c0fcf795bad6 100644
--- a/agent/grpc-external/limiter/limiter.go
+++ b/agent/grpc-external/limiter/limiter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // package limiter provides primatives for limiting the number of concurrent
 // operations in-flight.
 package limiter
diff --git a/agent/grpc-external/limiter/limiter_test.go b/agent/grpc-external/limiter/limiter_test.go
index 3cfa3ad263273..7f5b9654a0aa2 100644
--- a/agent/grpc-external/limiter/limiter_test.go
+++ b/agent/grpc-external/limiter/limiter_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package limiter
 
 import (
diff --git a/agent/grpc-external/options.go b/agent/grpc-external/options.go
index 04e5c10efb513..851a04cbfe457 100644
--- a/agent/grpc-external/options.go
+++ b/agent/grpc-external/options.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package external
 
 import (
diff --git a/agent/grpc-external/options_test.go b/agent/grpc-external/options_test.go
index ccc0ad12fd697..036581a35551b 100644
--- a/agent/grpc-external/options_test.go
+++ b/agent/grpc-external/options_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package external
 
 import (
diff --git a/agent/grpc-external/querymeta.go b/agent/grpc-external/querymeta.go
index 0f4dd52adb867..55b960255fffa 100644
--- a/agent/grpc-external/querymeta.go
+++ b/agent/grpc-external/querymeta.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package external
 
 import (
diff --git a/agent/grpc-external/querymeta_test.go b/agent/grpc-external/querymeta_test.go
index 4406929648179..66c7136a3dd48 100644
--- a/agent/grpc-external/querymeta_test.go
+++ b/agent/grpc-external/querymeta_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package external
 
 import (
diff --git a/agent/grpc-external/server.go b/agent/grpc-external/server.go
index 6090a8f31a155..d0cccdbdf41af 100644
--- a/agent/grpc-external/server.go
+++ b/agent/grpc-external/server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package external
 
 import (
diff --git a/agent/grpc-external/services/acl/login.go b/agent/grpc-external/services/acl/login.go
index 1e44acf8a1712..629ea093ec3ee 100644
--- a/agent/grpc-external/services/acl/login.go
+++ b/agent/grpc-external/services/acl/login.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
diff --git a/agent/grpc-external/services/acl/login_test.go b/agent/grpc-external/services/acl/login_test.go
index 3b956d7c8c71e..9b05842d48501 100644
--- a/agent/grpc-external/services/acl/login_test.go
+++ b/agent/grpc-external/services/acl/login_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
diff --git a/agent/grpc-external/services/acl/logout.go b/agent/grpc-external/services/acl/logout.go
index 691ac7b888949..a9fa60673bd99 100644
--- a/agent/grpc-external/services/acl/logout.go
+++ b/agent/grpc-external/services/acl/logout.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
diff --git a/agent/grpc-external/services/acl/logout_test.go b/agent/grpc-external/services/acl/logout_test.go
index df5c39628297c..276d26652c55d 100644
--- a/agent/grpc-external/services/acl/logout_test.go
+++ b/agent/grpc-external/services/acl/logout_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
diff --git a/agent/grpc-external/services/acl/server.go b/agent/grpc-external/services/acl/server.go
index 2393f11aa1068..7f0994f040057 100644
--- a/agent/grpc-external/services/acl/server.go
+++ b/agent/grpc-external/services/acl/server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
diff --git a/agent/grpc-external/services/acl/server_test.go b/agent/grpc-external/services/acl/server_test.go
index 1b6cd066001ef..d2b381156e788 100644
--- a/agent/grpc-external/services/acl/server_test.go
+++ b/agent/grpc-external/services/acl/server_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
diff --git a/agent/grpc-external/services/connectca/server.go b/agent/grpc-external/services/connectca/server.go
index 4ef91705f7a14..fb09ab47fefaa 100644
--- a/agent/grpc-external/services/connectca/server.go
+++ b/agent/grpc-external/services/connectca/server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connectca
 
 import (
diff --git a/agent/grpc-external/services/connectca/server_test.go b/agent/grpc-external/services/connectca/server_test.go
index 27c8d17c0c9dc..1026860ae3425 100644
--- a/agent/grpc-external/services/connectca/server_test.go
+++ b/agent/grpc-external/services/connectca/server_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connectca
 
 import (
diff --git a/agent/grpc-external/services/connectca/sign.go b/agent/grpc-external/services/connectca/sign.go
index 148bf675b0570..891d8c98891ab 100644
--- a/agent/grpc-external/services/connectca/sign.go
+++ b/agent/grpc-external/services/connectca/sign.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connectca
 
 import (
diff --git a/agent/grpc-external/services/connectca/sign_test.go b/agent/grpc-external/services/connectca/sign_test.go
index 07be304081ebb..5aa1f114b389d 100644
--- a/agent/grpc-external/services/connectca/sign_test.go
+++ b/agent/grpc-external/services/connectca/sign_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connectca
 
 import (
diff --git a/agent/grpc-external/services/connectca/watch_roots.go b/agent/grpc-external/services/connectca/watch_roots.go
index ddd02ca56e0f9..09dfd95720c85 100644
--- a/agent/grpc-external/services/connectca/watch_roots.go
+++ b/agent/grpc-external/services/connectca/watch_roots.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connectca
 
 import (
diff --git a/agent/grpc-external/services/connectca/watch_roots_test.go b/agent/grpc-external/services/connectca/watch_roots_test.go
index 171e00324643c..1f7b8e89683cf 100644
--- a/agent/grpc-external/services/connectca/watch_roots_test.go
+++ b/agent/grpc-external/services/connectca/watch_roots_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connectca
 
 import (
diff --git a/agent/grpc-external/services/dataplane/get_envoy_bootstrap_params.go b/agent/grpc-external/services/dataplane/get_envoy_bootstrap_params.go
index ea5d9c47b4883..b51a0910e054f 100644
--- a/agent/grpc-external/services/dataplane/get_envoy_bootstrap_params.go
+++ b/agent/grpc-external/services/dataplane/get_envoy_bootstrap_params.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package dataplane
 
 import (
@@ -8,17 +5,11 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/hashicorp/go-hclog"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/structpb"
 
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/configentry"
 	"github.com/hashicorp/consul/agent/consul/state"
@@ -29,11 +20,7 @@ import (
 )
 
 func (s *Server) GetEnvoyBootstrapParams(ctx context.Context, req *pbdataplane.GetEnvoyBootstrapParamsRequest) (*pbdataplane.GetEnvoyBootstrapParamsResponse, error) {
-	proxyID := req.ProxyId
-	if req.GetServiceId() != "" {
-		proxyID = req.GetServiceId()
-	}
-	logger := s.Logger.Named("get-envoy-bootstrap-params").With("proxy_id", proxyID, "request_id", external.TraceID())
+	logger := s.Logger.Named("get-envoy-bootstrap-params").With("service_id", req.GetServiceId(), "request_id", external.TraceID())
 
 	logger.Trace("Started processing request")
 	defer logger.Trace("Finished processing request")
@@ -50,88 +37,9 @@ func (s *Server) GetEnvoyBootstrapParams(ctx context.Context, req *pbdataplane.G
 		return nil, status.Error(codes.Unauthenticated, err.Error())
 	}
 
-	if s.EnableV2 {
-		// Get the workload.
-		workloadId := &pbresource.ID{
-			Name: proxyID,
-			Tenancy: &pbresource.Tenancy{
-				Namespace: req.Namespace,
-				Partition: req.Partition,
-			},
-			Type: pbcatalog.WorkloadType,
-		}
-		workloadRsp, err := s.ResourceAPIClient.Read(ctx, &pbresource.ReadRequest{
-			Id: workloadId,
-		})
-		if err != nil {
-			// This error should already include the gRPC status code and so we don't need to wrap it
-			// in status.Error.
-			logger.Error("Error looking up workload", "error", err)
-			return nil, err
-		}
-		var workload pbcatalog.Workload
-		err = workloadRsp.Resource.Data.UnmarshalTo(&workload)
-		if err != nil {
-			return nil, status.Error(codes.Internal, "failed to parse workload data")
-		}
-
-		// Only workloads that have an associated identity can ask for proxy bootstrap parameters.
-		if workload.Identity == "" {
-			return nil, status.Errorf(codes.InvalidArgument, "workload %q doesn't have identity associated with it", req.ProxyId)
-		}
-
-		// verify identity:write is allowed.  if not, give permission denied error.
-		if err := authz.ToAllowAuthorizer().IdentityWriteAllowed(workload.Identity, &authzContext); err != nil {
-			return nil, err
-		}
-
-		// Get all proxy configurations for this workload. Currently we're only looking
-		// for proxy configurations in the same tenancy as the workload.
-		// todo (ishustava): we need to support wildcard proxy configurations as well.
-
-		proxyCfgList, err := s.ResourceAPIClient.List(ctx, &pbresource.ListRequest{
-			Tenancy: workloadRsp.Resource.Id.GetTenancy(),
-			Type:    pbmesh.ProxyConfigurationType,
-		})
-		if err != nil {
-			logger.Error("Error looking up proxyConfiguration", "error", err)
-			return nil, err
-		}
-
-		// Collect and merge proxy configs.
-		// todo (ishustava): sorting and conflict resolution.
-		bootstrapCfg := &pbmesh.BootstrapConfig{}
-		dynamicCfg := &pbmesh.DynamicConfig{}
-		for _, cfgResource := range proxyCfgList.Resources {
-			var proxyCfg pbmesh.ProxyConfiguration
-			err = cfgResource.Data.UnmarshalTo(&proxyCfg)
-			if err != nil {
-				return nil, status.Errorf(codes.Internal, "failed to parse proxy configuration data: %q", cfgResource.Id.Name)
-			}
-			if isWorkloadSelected(req.ProxyId, proxyCfg.Workloads) {
-				proto.Merge(bootstrapCfg, proxyCfg.BootstrapConfig)
-				proto.Merge(dynamicCfg, proxyCfg.DynamicConfig)
-			}
-		}
-
-		accessLogs := makeAccessLogs(dynamicCfg.GetAccessLogs(), logger)
-
-		return &pbdataplane.GetEnvoyBootstrapParamsResponse{
-			Identity:        workload.Identity,
-			Partition:       workloadRsp.Resource.Id.Tenancy.Partition,
-			Namespace:       workloadRsp.Resource.Id.Tenancy.Namespace,
-			BootstrapConfig: bootstrapCfg,
-			Datacenter:      s.Datacenter,
-			NodeName:        workload.NodeName,
-			AccessLogs:      accessLogs,
-		}, nil
-	}
-
-	// The remainder of this file focuses on v1 implementation of this endpoint.
-
 	store := s.GetStore()
 
-	_, svc, err := store.ServiceNode(req.GetNodeId(), req.GetNodeName(), proxyID, &entMeta, structs.DefaultPeerKeyword)
+	_, svc, err := store.ServiceNode(req.GetNodeId(), req.GetNodeName(), req.GetServiceId(), &entMeta, structs.DefaultPeerKeyword)
 	if err != nil {
 		logger.Error("Error looking up service", "error", err)
 		if errors.Is(err, state.ErrNodeNotFound) {
@@ -170,34 +78,8 @@ func (s *Server) GetEnvoyBootstrapParams(ctx context.Context, req *pbdataplane.G
 	// Inspect access logging
 	// This is non-essential, and don't want to return an error unless there is a more serious issue
 	var accessLogs []string
-	if ns != nil {
-		accessLogs = makeAccessLogs(&ns.Proxy.AccessLogs, logger)
-	}
-
-	// Build out the response
-	var serviceName string
-	if svc.ServiceKind == structs.ServiceKindConnectProxy {
-		serviceName = svc.ServiceProxy.DestinationServiceName
-	} else {
-		serviceName = svc.ServiceName
-	}
-
-	return &pbdataplane.GetEnvoyBootstrapParamsResponse{
-		Identity:   serviceName,
-		Service:    serviceName,
-		Partition:  svc.EnterpriseMeta.PartitionOrDefault(),
-		Namespace:  svc.EnterpriseMeta.NamespaceOrDefault(),
-		Config:     bootstrapConfig,
-		Datacenter: s.Datacenter,
-		NodeName:   svc.Node,
-		AccessLogs: accessLogs,
-	}, nil
-}
-
-func makeAccessLogs(logs structs.AccessLogs, logger hclog.Logger) []string {
-	var accessLogs []string
-	if logs.GetEnabled() {
-		envoyLoggers, err := accesslogs.MakeAccessLogs(logs, false)
+	if ns != nil && ns.Proxy.AccessLogs.Enabled {
+		envoyLoggers, err := accesslogs.MakeAccessLogs(&ns.Proxy.AccessLogs, false)
 		if err != nil {
 			logger.Warn("Error creating the envoy access log config", "error", err)
 		}
@@ -213,21 +95,41 @@ func makeAccessLogs(logs structs.AccessLogs, logger hclog.Logger) []string {
 		}
 	}
 
-	return accessLogs
-}
-
-func isWorkloadSelected(name string, selector *pbcatalog.WorkloadSelector) bool {
-	for _, prefix := range selector.Prefixes {
-		if strings.Contains(name, prefix) {
-			return true
-		}
+	// Build out the response
+	var serviceName string
+	if svc.ServiceKind == structs.ServiceKindConnectProxy {
+		serviceName = svc.ServiceProxy.DestinationServiceName
+	} else {
+		serviceName = svc.ServiceName
 	}
 
-	for _, selectorName := range selector.Names {
-		if name == selectorName {
-			return true
-		}
-	}
+	return &pbdataplane.GetEnvoyBootstrapParamsResponse{
+		Service:     serviceName,
+		Partition:   svc.EnterpriseMeta.PartitionOrDefault(),
+		Namespace:   svc.EnterpriseMeta.NamespaceOrDefault(),
+		Config:      bootstrapConfig,
+		Datacenter:  s.Datacenter,
+		ServiceKind: convertToResponseServiceKind(svc.ServiceKind),
+		NodeName:    svc.Node,
+		NodeId:      string(svc.ID),
+		AccessLogs:  accessLogs,
+	}, nil
+}
 
-	return false
+func convertToResponseServiceKind(serviceKind structs.ServiceKind) (respKind pbdataplane.ServiceKind) {
+	switch serviceKind {
+	case structs.ServiceKindConnectProxy:
+		respKind = pbdataplane.ServiceKind_SERVICE_KIND_CONNECT_PROXY
+	case structs.ServiceKindMeshGateway:
+		respKind = pbdataplane.ServiceKind_SERVICE_KIND_MESH_GATEWAY
+	case structs.ServiceKindTerminatingGateway:
+		respKind = pbdataplane.ServiceKind_SERVICE_KIND_TERMINATING_GATEWAY
+	case structs.ServiceKindIngressGateway:
+		respKind = pbdataplane.ServiceKind_SERVICE_KIND_INGRESS_GATEWAY
+	case structs.ServiceKindAPIGateway:
+		respKind = pbdataplane.ServiceKind_SERVICE_KIND_API_GATEWAY
+	case structs.ServiceKindTypical:
+		respKind = pbdataplane.ServiceKind_SERVICE_KIND_TYPICAL
+	}
+	return
 }
diff --git a/agent/grpc-external/services/dataplane/get_envoy_bootstrap_params_test.go b/agent/grpc-external/services/dataplane/get_envoy_bootstrap_params_test.go
index a3761305e97a8..807dbd9e73168 100644
--- a/agent/grpc-external/services/dataplane/get_envoy_bootstrap_params_test.go
+++ b/agent/grpc-external/services/dataplane/get_envoy_bootstrap_params_test.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package dataplane
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
 	"github.com/hashicorp/go-hclog"
@@ -15,26 +11,16 @@ import (
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/structpb"
 
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/mesh"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/acl/resolver"
 	external "github.com/hashicorp/consul/agent/grpc-external"
 	"github.com/hashicorp/consul/agent/grpc-external/testutils"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/proto-public/pbdataplane"
+	"github.com/hashicorp/consul/types"
 )
 
 const (
-	testIdentity     = "test-identity"
 	testToken        = "acl-token-get-envoy-bootstrap-params"
 	testServiceName  = "web"
 	proxyServiceID   = "web-proxy"
@@ -52,15 +38,13 @@ const (
 	proxyDefaultsRequestTimeout   = 1111
 	serviceDefaultsProtocol       = "tcp"
 	serviceDefaultsConnectTimeout = 4444
-
-	testAccessLogs = "{\"name\":\"Consul Listener Filter Log\",\"typedConfig\":{\"@type\":\"type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog\",\"logFormat\":{\"jsonFormat\":{\"custom_field\":\"%START_TIME%\"}}}}"
 )
 
 func testRegisterRequestProxy(t *testing.T) *structs.RegisterRequest {
 	return &structs.RegisterRequest{
 		Datacenter: serverDC,
 		Node:       nodeName,
-		ID:         nodeID,
+		ID:         types.NodeID(nodeID),
 		Address:    "127.0.0.1",
 		Service: &structs.NodeService{
 			Kind:    structs.ServiceKindConnectProxy,
@@ -81,7 +65,7 @@ func testRegisterRequestProxy(t *testing.T) *structs.RegisterRequest {
 
 func testRegisterIngressGateway(t *testing.T) *structs.RegisterRequest {
 	registerReq := structs.TestRegisterIngressGateway(t)
-	registerReq.ID = "2980b72b-bd9d-9d7b-d4f9-951bf7508d95"
+	registerReq.ID = types.NodeID("2980b72b-bd9d-9d7b-d4f9-951bf7508d95")
 	registerReq.Service.ID = registerReq.Service.Service
 	registerReq.Service.Proxy.Config = map[string]interface{}{
 		proxyConfigKey: proxyConfigValue,
@@ -180,7 +164,9 @@ func TestGetEnvoyBootstrapParams_Success(t *testing.T) {
 		require.Equal(t, tc.registerReq.EnterpriseMeta.PartitionOrDefault(), resp.Partition)
 		require.Equal(t, tc.registerReq.EnterpriseMeta.NamespaceOrDefault(), resp.Namespace)
 		requireConfigField(t, resp, proxyConfigKey, structpb.NewStringValue(proxyConfigValue))
+		require.Equal(t, convertToResponseServiceKind(tc.registerReq.Service.Kind), resp.ServiceKind)
 		require.Equal(t, tc.registerReq.Node, resp.NodeName)
+		require.Equal(t, string(tc.registerReq.ID), resp.NodeId)
 
 		if tc.serviceDefaults != nil && tc.proxyDefaults != nil {
 			// service-defaults take precedence over proxy-defaults
@@ -253,174 +239,6 @@ func TestGetEnvoyBootstrapParams_Success(t *testing.T) {
 	}
 }
 
-func TestGetEnvoyBootstrapParams_Success_EnableV2(t *testing.T) {
-	type testCase struct {
-		name            string
-		workloadData    *pbcatalog.Workload
-		proxyCfgs       []*pbmesh.ProxyConfiguration
-		expBootstrapCfg *pbmesh.BootstrapConfig
-		expAccessLogs   string
-	}
-
-	run := func(t *testing.T, tc testCase) {
-		resourceClient := svctest.RunResourceService(t, catalog.RegisterTypes, mesh.RegisterTypes)
-
-		options := structs.QueryOptions{Token: testToken}
-		ctx, err := external.ContextWithQueryOptions(context.Background(), options)
-		require.NoError(t, err)
-
-		aclResolver := &MockACLResolver{}
-
-		server := NewServer(Config{
-			Logger:            hclog.NewNullLogger(),
-			ACLResolver:       aclResolver,
-			Datacenter:        serverDC,
-			EnableV2:          true,
-			ResourceAPIClient: resourceClient,
-		})
-		client := testClient(t, server)
-
-		// Add required fields to workload data.
-		tc.workloadData.Addresses = []*pbcatalog.WorkloadAddress{
-			{
-				Host: "127.0.0.1",
-			},
-		}
-		tc.workloadData.Ports = map[string]*pbcatalog.WorkloadPort{
-			"tcp": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-		}
-		workloadResource := resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
-			WithData(t, tc.workloadData).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			Write(t, resourceClient)
-
-		// Create any proxy cfg resources.
-		for i, cfg := range tc.proxyCfgs {
-			resourcetest.Resource(pbmesh.ProxyConfigurationType, fmt.Sprintf("proxy-cfg-%d", i)).
-				WithData(t, cfg).
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				Write(t, resourceClient)
-		}
-
-		req := &pbdataplane.GetEnvoyBootstrapParamsRequest{
-			ProxyId:   workloadResource.Id.Name,
-			Namespace: workloadResource.Id.Tenancy.Namespace,
-			Partition: workloadResource.Id.Tenancy.Partition,
-		}
-
-		aclResolver.On("ResolveTokenAndDefaultMeta", testToken, mock.Anything, mock.Anything).
-			Return(testutils.ACLUseProvidedPolicy(t,
-				&acl.Policy{
-					PolicyRules: acl.PolicyRules{
-						Services: []*acl.ServiceRule{
-							{
-								Name:   workloadResource.Id.Name,
-								Policy: acl.PolicyRead,
-							},
-						},
-						Identities: []*acl.IdentityRule{
-							{
-								Name:   testIdentity,
-								Policy: acl.PolicyWrite,
-							},
-						},
-					},
-				}), nil)
-
-		resp, err := client.GetEnvoyBootstrapParams(ctx, req)
-		require.NoError(t, err)
-
-		require.Equal(t, tc.workloadData.Identity, resp.Identity)
-		require.Equal(t, serverDC, resp.Datacenter)
-		require.Equal(t, workloadResource.Id.Tenancy.Partition, resp.Partition)
-		require.Equal(t, workloadResource.Id.Tenancy.Namespace, resp.Namespace)
-		require.Equal(t, resp.NodeName, tc.workloadData.NodeName)
-		prototest.AssertDeepEqual(t, tc.expBootstrapCfg, resp.BootstrapConfig)
-		if tc.expAccessLogs != "" {
-			require.JSONEq(t, tc.expAccessLogs, resp.AccessLogs[0])
-		}
-	}
-
-	testCases := []testCase{
-		{
-			name: "workload without node",
-			workloadData: &pbcatalog.Workload{
-				Identity: testIdentity,
-			},
-			expBootstrapCfg: &pbmesh.BootstrapConfig{},
-		},
-		{
-			name: "workload with node",
-			workloadData: &pbcatalog.Workload{
-				Identity: testIdentity,
-				NodeName: "test-node",
-			},
-			expBootstrapCfg: &pbmesh.BootstrapConfig{},
-		},
-		{
-			name: "single proxy configuration",
-			workloadData: &pbcatalog.Workload{
-				Identity: testIdentity,
-			},
-			proxyCfgs: []*pbmesh.ProxyConfiguration{
-				{
-					Workloads: &pbcatalog.WorkloadSelector{Names: []string{"test-workload"}},
-					BootstrapConfig: &pbmesh.BootstrapConfig{
-						DogstatsdUrl: "dogstats-url",
-					},
-				},
-			},
-			expBootstrapCfg: &pbmesh.BootstrapConfig{
-				DogstatsdUrl: "dogstats-url",
-			},
-		},
-		{
-			name: "multiple proxy configurations",
-			workloadData: &pbcatalog.Workload{
-				Identity: testIdentity,
-			},
-			proxyCfgs: []*pbmesh.ProxyConfiguration{
-				{
-					Workloads: &pbcatalog.WorkloadSelector{Names: []string{"test-workload"}},
-					BootstrapConfig: &pbmesh.BootstrapConfig{
-						DogstatsdUrl: "dogstats-url",
-					},
-				},
-				{
-					Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"test-"}},
-					BootstrapConfig: &pbmesh.BootstrapConfig{
-						StatsdUrl: "stats-url",
-					},
-					DynamicConfig: &pbmesh.DynamicConfig{
-						AccessLogs: &pbmesh.AccessLogsConfig{
-							Enabled:    true,
-							JsonFormat: "{ \"custom_field\": \"%START_TIME%\" }",
-						},
-					},
-				},
-
-				{
-					Workloads: &pbcatalog.WorkloadSelector{Names: []string{"not-test-workload"}},
-					BootstrapConfig: &pbmesh.BootstrapConfig{
-						PrometheusBindAddr: "prom-addr",
-					},
-				},
-			},
-			expBootstrapCfg: &pbmesh.BootstrapConfig{
-				DogstatsdUrl: "dogstats-url",
-				StatsdUrl:    "stats-url",
-			},
-			expAccessLogs: testAccessLogs,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
 func TestGetEnvoyBootstrapParams_Error(t *testing.T) {
 	type testCase struct {
 		name            string
@@ -502,98 +320,6 @@ func TestGetEnvoyBootstrapParams_Error(t *testing.T) {
 
 }
 
-func TestGetEnvoyBootstrapParams_Error_EnableV2(t *testing.T) {
-	type testCase struct {
-		name            string
-		expectedErrCode codes.Code
-		expecteErrMsg   string
-		workload        *pbresource.Resource
-	}
-
-	run := func(t *testing.T, tc testCase) {
-		resourceClient := svctest.RunResourceService(t, catalog.RegisterTypes, mesh.RegisterTypes)
-
-		options := structs.QueryOptions{Token: testToken}
-		ctx, err := external.ContextWithQueryOptions(context.Background(), options)
-		require.NoError(t, err)
-
-		aclResolver := &MockACLResolver{}
-		aclResolver.On("ResolveTokenAndDefaultMeta", testToken, mock.Anything, mock.Anything).
-			Return(testutils.ACLServiceRead(t, "doesn't matter"), nil)
-
-		server := NewServer(Config{
-			Logger:            hclog.NewNullLogger(),
-			ACLResolver:       aclResolver,
-			Datacenter:        serverDC,
-			EnableV2:          true,
-			ResourceAPIClient: resourceClient,
-		})
-		client := testClient(t, server)
-
-		var req pbdataplane.GetEnvoyBootstrapParamsRequest
-		// Write the workload resource.
-		if tc.workload != nil {
-			_, err = resourceClient.Write(context.Background(), &pbresource.WriteRequest{
-				Resource: tc.workload,
-			})
-			require.NoError(t, err)
-
-			req = pbdataplane.GetEnvoyBootstrapParamsRequest{
-				ProxyId:   tc.workload.Id.Name,
-				Namespace: tc.workload.Id.Tenancy.Namespace,
-				Partition: tc.workload.Id.Tenancy.Partition,
-			}
-		} else {
-			req = pbdataplane.GetEnvoyBootstrapParamsRequest{
-				ProxyId:   "not-found",
-				Namespace: "default",
-				Partition: "default",
-			}
-		}
-
-		resp, err := client.GetEnvoyBootstrapParams(ctx, &req)
-		require.Nil(t, resp)
-		require.Error(t, err)
-		errStatus, ok := status.FromError(err)
-		require.True(t, ok)
-		require.Equal(t, tc.expectedErrCode.String(), errStatus.Code().String())
-		require.Equal(t, tc.expecteErrMsg, errStatus.Message())
-	}
-
-	workload := resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "127.0.0.1"},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"tcp": {Port: 8080},
-			},
-		}).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		Build()
-
-	testCases := []testCase{
-		{
-			name:            "workload doesn't exist",
-			expectedErrCode: codes.NotFound,
-			expecteErrMsg:   "resource not found",
-		},
-		{
-			name:            "workload without identity",
-			expectedErrCode: codes.InvalidArgument,
-			expecteErrMsg:   "workload \"test-workload\" doesn't have identity associated with it",
-			workload:        workload,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-
-}
-
 func TestGetEnvoyBootstrapParams_Unauthenticated(t *testing.T) {
 	// Mock the ACL resolver to return ErrNotFound.
 	aclResolver := &MockACLResolver{}
diff --git a/agent/grpc-external/services/dataplane/get_supported_features.go b/agent/grpc-external/services/dataplane/get_supported_features.go
index 09ee1c7ed4c51..a37d381b2ce8f 100644
--- a/agent/grpc-external/services/dataplane/get_supported_features.go
+++ b/agent/grpc-external/services/dataplane/get_supported_features.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package dataplane
 
 import (
@@ -11,10 +8,9 @@ import (
 
 	external "github.com/hashicorp/consul/agent/grpc-external"
 	"github.com/hashicorp/consul/proto-public/pbdataplane"
-	"github.com/hashicorp/consul/version"
 )
 
-func (s *Server) GetSupportedDataplaneFeatures(ctx context.Context, _ *pbdataplane.GetSupportedDataplaneFeaturesRequest) (*pbdataplane.GetSupportedDataplaneFeaturesResponse, error) {
+func (s *Server) GetSupportedDataplaneFeatures(ctx context.Context, req *pbdataplane.GetSupportedDataplaneFeaturesRequest) (*pbdataplane.GetSupportedDataplaneFeaturesResponse, error) {
 	logger := s.Logger.Named("get-supported-dataplane-features").With("request_id", external.TraceID())
 
 	logger.Trace("Started processing request")
@@ -41,10 +37,6 @@ func (s *Server) GetSupportedDataplaneFeatures(ctx context.Context, _ *pbdatapla
 			FeatureName: pbdataplane.DataplaneFeatures_DATAPLANE_FEATURES_ENVOY_BOOTSTRAP_CONFIGURATION,
 			Supported:   true,
 		},
-		{
-			FeatureName: pbdataplane.DataplaneFeatures_DATAPLANE_FEATURES_FIPS,
-			Supported:   version.IsFIPS(),
-		},
 	}
 
 	return &pbdataplane.GetSupportedDataplaneFeaturesResponse{SupportedDataplaneFeatures: supportedFeatures}, nil
diff --git a/agent/grpc-external/services/dataplane/get_supported_features_test.go b/agent/grpc-external/services/dataplane/get_supported_features_test.go
index 4761ccb3cb38a..86fcdb0c8892e 100644
--- a/agent/grpc-external/services/dataplane/get_supported_features_test.go
+++ b/agent/grpc-external/services/dataplane/get_supported_features_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package dataplane
 
 import (
@@ -19,7 +16,6 @@ import (
 	"github.com/hashicorp/consul/agent/grpc-external/testutils"
 	structs "github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/proto-public/pbdataplane"
-	"github.com/hashicorp/consul/version"
 )
 
 const testACLToken = "acl-token"
@@ -41,7 +37,7 @@ func TestSupportedDataplaneFeatures_Success(t *testing.T) {
 	client := testClient(t, server)
 	resp, err := client.GetSupportedDataplaneFeatures(ctx, &pbdataplane.GetSupportedDataplaneFeaturesRequest{})
 	require.NoError(t, err)
-	require.Equal(t, 4, len(resp.SupportedDataplaneFeatures))
+	require.Equal(t, 3, len(resp.SupportedDataplaneFeatures))
 
 	for _, feature := range resp.SupportedDataplaneFeatures {
 		switch feature.GetFeatureName() {
@@ -51,8 +47,6 @@ func TestSupportedDataplaneFeatures_Success(t *testing.T) {
 			require.True(t, feature.GetSupported())
 		case pbdataplane.DataplaneFeatures_DATAPLANE_FEATURES_ENVOY_BOOTSTRAP_CONFIGURATION:
 			require.True(t, feature.GetSupported())
-		case pbdataplane.DataplaneFeatures_DATAPLANE_FEATURES_FIPS:
-			require.Equal(t, version.IsFIPS(), feature.GetSupported())
 		default:
 			require.False(t, feature.GetSupported())
 		}
@@ -75,7 +69,7 @@ func TestSupportedDataplaneFeatures_ACLsDisabled(t *testing.T) {
 	client := testClient(t, server)
 	resp, err := client.GetSupportedDataplaneFeatures(ctx, &pbdataplane.GetSupportedDataplaneFeaturesRequest{})
 	require.NoError(t, err)
-	require.Equal(t, 4, len(resp.SupportedDataplaneFeatures))
+	require.Equal(t, 3, len(resp.SupportedDataplaneFeatures))
 }
 
 func TestSupportedDataplaneFeatures_InvalidACLToken(t *testing.T) {
diff --git a/agent/grpc-external/services/dataplane/server.go b/agent/grpc-external/services/dataplane/server.go
index fbce372f0efa0..b665b368a6cc0 100644
--- a/agent/grpc-external/services/dataplane/server.go
+++ b/agent/grpc-external/services/dataplane/server.go
@@ -1,10 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package dataplane
 
 import (
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"google.golang.org/grpc"
 
 	"github.com/hashicorp/go-hclog"
@@ -27,10 +23,6 @@ type Config struct {
 	ACLResolver ACLResolver
 	// Datacenter of the Consul server this gRPC server is hosted on
 	Datacenter string
-
-	// EnableV2 indicates whether a feature flag for v2 APIs is provided.
-	EnableV2          bool
-	ResourceAPIClient pbresource.ResourceServiceClient
 }
 
 type StateStore interface {
diff --git a/agent/grpc-external/services/dataplane/server_test.go b/agent/grpc-external/services/dataplane/server_test.go
index ec57396bcb791..ece296afd62f2 100644
--- a/agent/grpc-external/services/dataplane/server_test.go
+++ b/agent/grpc-external/services/dataplane/server_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package dataplane
 
 import (
diff --git a/agent/grpc-external/services/dns/server.go b/agent/grpc-external/services/dns/server.go
index a6f2249733c11..50b12f5d91457 100644
--- a/agent/grpc-external/services/dns/server.go
+++ b/agent/grpc-external/services/dns/server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package dns
 
 import (
diff --git a/agent/grpc-external/services/dns/server_test.go b/agent/grpc-external/services/dns/server_test.go
index a6576b51adcfd..dd27097097ff2 100644
--- a/agent/grpc-external/services/dns/server_test.go
+++ b/agent/grpc-external/services/dns/server_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package dns
 
 import (
diff --git a/agent/grpc-external/services/peerstream/health_snapshot.go b/agent/grpc-external/services/peerstream/health_snapshot.go
index efd60a7f1039e..196f3e4d6cd88 100644
--- a/agent/grpc-external/services/peerstream/health_snapshot.go
+++ b/agent/grpc-external/services/peerstream/health_snapshot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
diff --git a/agent/grpc-external/services/peerstream/health_snapshot_test.go b/agent/grpc-external/services/peerstream/health_snapshot_test.go
index 6759db252d2cc..afd83f220ba59 100644
--- a/agent/grpc-external/services/peerstream/health_snapshot_test.go
+++ b/agent/grpc-external/services/peerstream/health_snapshot_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
diff --git a/agent/grpc-external/services/peerstream/replication.go b/agent/grpc-external/services/peerstream/replication.go
index 692a475235be0..f00b0b590a72f 100644
--- a/agent/grpc-external/services/peerstream/replication.go
+++ b/agent/grpc-external/services/peerstream/replication.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
@@ -17,10 +14,10 @@ import (
 	"github.com/hashicorp/consul/agent/cache"
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/pbpeerstream"
-	"github.com/hashicorp/consul/proto/private/pbservice"
-	"github.com/hashicorp/consul/proto/private/pbstatus"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeerstream"
+	"github.com/hashicorp/consul/proto/pbservice"
+	"github.com/hashicorp/consul/proto/pbstatus"
 	"github.com/hashicorp/consul/types"
 )
 
diff --git a/agent/grpc-external/services/peerstream/server.go b/agent/grpc-external/services/peerstream/server.go
index 4127312fe72cd..a67da563a039e 100644
--- a/agent/grpc-external/services/peerstream/server.go
+++ b/agent/grpc-external/services/peerstream/server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
@@ -15,8 +12,8 @@ import (
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/pbpeerstream"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeerstream"
 )
 
 // TODO(peering): fix up these interfaces to be more testable now that they are
diff --git a/agent/grpc-external/services/peerstream/server_test.go b/agent/grpc-external/services/peerstream/server_test.go
index 836b09d89b2b1..a24d8edc2f51f 100644
--- a/agent/grpc-external/services/peerstream/server_test.go
+++ b/agent/grpc-external/services/peerstream/server_test.go
@@ -1,14 +1,11 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/pbpeerstream"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeerstream"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/stretchr/testify/require"
 )
diff --git a/agent/grpc-external/services/peerstream/stream_resources.go b/agent/grpc-external/services/peerstream/stream_resources.go
index 9f2d9cf896f3d..c9c077776f043 100644
--- a/agent/grpc-external/services/peerstream/stream_resources.go
+++ b/agent/grpc-external/services/peerstream/stream_resources.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
@@ -24,8 +21,8 @@ import (
 	external "github.com/hashicorp/consul/agent/grpc-external"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/pbpeerstream"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeerstream"
 )
 
 type BidirectionalStream interface {
@@ -319,7 +316,7 @@ func (s *Server) realHandleStream(streamReq HandleStreamRequest) error {
 	logger := s.Logger.Named("stream").
 		With("peer_name", streamReq.PeerName).
 		With("peer_id", streamReq.LocalID).
-		With("dialer", !streamReq.IsAcceptor())
+		With("dailer", !streamReq.IsAcceptor())
 	logger.Trace("handling stream for peer")
 
 	// handleStreamCtx is local to this function.
diff --git a/agent/grpc-external/services/peerstream/stream_test.go b/agent/grpc-external/services/peerstream/stream_test.go
index ad3399b79f5a9..a286e6fefe11f 100644
--- a/agent/grpc-external/services/peerstream/stream_test.go
+++ b/agent/grpc-external/services/peerstream/stream_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
@@ -32,12 +29,12 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/logging"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/pbpeerstream"
-	"github.com/hashicorp/consul/proto/private/pbservice"
-	"github.com/hashicorp/consul/proto/private/pbstatus"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/pbcommon"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeerstream"
+	"github.com/hashicorp/consul/proto/pbservice"
+	"github.com/hashicorp/consul/proto/pbstatus"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
diff --git a/agent/grpc-external/services/peerstream/stream_tracker.go b/agent/grpc-external/services/peerstream/stream_tracker.go
index c74a1b284f09e..61f8831ec78bb 100644
--- a/agent/grpc-external/services/peerstream/stream_tracker.go
+++ b/agent/grpc-external/services/peerstream/stream_tracker.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
diff --git a/agent/grpc-external/services/peerstream/stream_tracker_test.go b/agent/grpc-external/services/peerstream/stream_tracker_test.go
index 33ea536469d8a..cfe95d4012b75 100644
--- a/agent/grpc-external/services/peerstream/stream_tracker_test.go
+++ b/agent/grpc-external/services/peerstream/stream_tracker_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
diff --git a/agent/grpc-external/services/peerstream/subscription_blocking.go b/agent/grpc-external/services/peerstream/subscription_blocking.go
index a1257d3d33819..8b53d3f197835 100644
--- a/agent/grpc-external/services/peerstream/subscription_blocking.go
+++ b/agent/grpc-external/services/peerstream/subscription_blocking.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
@@ -14,7 +11,7 @@ import (
 	"github.com/hashicorp/consul/agent/cache"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib/retry"
-	"github.com/hashicorp/consul/proto/private/pbservice"
+	"github.com/hashicorp/consul/proto/pbservice"
 )
 
 // This file contains direct state store functions that need additional
diff --git a/agent/grpc-external/services/peerstream/subscription_manager.go b/agent/grpc-external/services/peerstream/subscription_manager.go
index bd2d36ffd942c..ec710e017587c 100644
--- a/agent/grpc-external/services/peerstream/subscription_manager.go
+++ b/agent/grpc-external/services/peerstream/subscription_manager.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
@@ -27,10 +24,10 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/submatview"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/pbpeerstream"
-	"github.com/hashicorp/consul/proto/private/pbservice"
+	"github.com/hashicorp/consul/proto/pbcommon"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeerstream"
+	"github.com/hashicorp/consul/proto/pbservice"
 )
 
 type MaterializedViewStore interface {
diff --git a/agent/grpc-external/services/peerstream/subscription_manager_test.go b/agent/grpc-external/services/peerstream/subscription_manager_test.go
index 2abd40be956ab..c9e664477f378 100644
--- a/agent/grpc-external/services/peerstream/subscription_manager_test.go
+++ b/agent/grpc-external/services/peerstream/subscription_manager_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
@@ -21,11 +18,11 @@ import (
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/pbpeerstream"
-	"github.com/hashicorp/consul/proto/private/pbservice"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/pbcommon"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeerstream"
+	"github.com/hashicorp/consul/proto/pbservice"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/types"
 )
diff --git a/agent/grpc-external/services/peerstream/subscription_state.go b/agent/grpc-external/services/peerstream/subscription_state.go
index a1a370a3ec4c6..54b4a84a3a2ad 100644
--- a/agent/grpc-external/services/peerstream/subscription_state.go
+++ b/agent/grpc-external/services/peerstream/subscription_state.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
@@ -15,7 +12,7 @@ import (
 
 	"github.com/hashicorp/consul/agent/cache"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbservice"
+	"github.com/hashicorp/consul/proto/pbservice"
 )
 
 // subscriptionState is a collection of working state tied to a peerID subscription.
diff --git a/agent/grpc-external/services/peerstream/subscription_state_test.go b/agent/grpc-external/services/peerstream/subscription_state_test.go
index cc3e49ab4c9cb..253def99a943a 100644
--- a/agent/grpc-external/services/peerstream/subscription_state_test.go
+++ b/agent/grpc-external/services/peerstream/subscription_state_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
@@ -15,7 +12,7 @@ import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/cache"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbservice"
+	"github.com/hashicorp/consul/proto/pbservice"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
diff --git a/agent/grpc-external/services/peerstream/subscription_view.go b/agent/grpc-external/services/peerstream/subscription_view.go
index 575729bc71df9..d8b17c76ab821 100644
--- a/agent/grpc-external/services/peerstream/subscription_view.go
+++ b/agent/grpc-external/services/peerstream/subscription_view.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
@@ -9,13 +6,14 @@ import (
 
 	"github.com/hashicorp/go-hclog"
 
+	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/acl/resolver"
 	"github.com/hashicorp/consul/agent/cache"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/submatview"
-	"github.com/hashicorp/consul/proto/private/pbservice"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbservice"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 type Subscriber interface {
@@ -77,7 +75,7 @@ func (e *exportedServiceRequest) NewMaterializer() (submatview.Materializer, err
 	}
 	deps := submatview.LocalMaterializerDeps{
 		Backend:     e.sub,
-		ACLResolver: resolver.DANGER_NO_AUTH{},
+		ACLResolver: DANGER_NO_AUTH{},
 		Deps: submatview.Deps{
 			View:    newExportedServicesView(),
 			Logger:  e.logger,
@@ -87,6 +85,14 @@ func (e *exportedServiceRequest) NewMaterializer() (submatview.Materializer, err
 	return submatview.NewLocalMaterializer(deps), nil
 }
 
+// DANGER_NO_AUTH implements submatview.ACLResolver to short-circuit authorization
+// in cases where it is handled somewhere else (e.g. in an RPC handler).
+type DANGER_NO_AUTH struct{}
+
+func (DANGER_NO_AUTH) ResolveTokenAndDefaultMeta(string, *acl.EnterpriseMeta, *acl.AuthorizerContext) (resolver.Result, error) {
+	return resolver.Result{Authorizer: acl.ManageAll()}, nil
+}
+
 // Type implements submatview.Request
 func (e *exportedServiceRequest) Type() string {
 	return "leader.peering.stream.exportedServiceRequest"
diff --git a/agent/grpc-external/services/peerstream/subscription_view_test.go b/agent/grpc-external/services/peerstream/subscription_view_test.go
index cd2f61e60feb7..c96b19bb21303 100644
--- a/agent/grpc-external/services/peerstream/subscription_view_test.go
+++ b/agent/grpc-external/services/peerstream/subscription_view_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
@@ -21,8 +18,8 @@ import (
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/submatview"
-	"github.com/hashicorp/consul/proto/private/pbservice"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbservice"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // testInitialIndex is the first index that will be used in simulated updates.
diff --git a/agent/grpc-external/services/peerstream/testing.go b/agent/grpc-external/services/peerstream/testing.go
index 47cc8d1dbec64..5eb575c06aa99 100644
--- a/agent/grpc-external/services/peerstream/testing.go
+++ b/agent/grpc-external/services/peerstream/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peerstream
 
 import (
@@ -14,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/metadata"
 
-	"github.com/hashicorp/consul/proto/private/pbpeerstream"
+	"github.com/hashicorp/consul/proto/pbpeerstream"
 )
 
 type MockClient struct {
diff --git a/agent/grpc-external/services/resource/delete.go b/agent/grpc-external/services/resource/delete.go
deleted file mode 100644
index 2f30e27f983fb..0000000000000
--- a/agent/grpc-external/services/resource/delete.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/oklog/ulid/v2"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// Delete deletes a resource.
-// - To delete a resource regardless of the stored version, set Version = ""
-// - Supports deleting a resource by name, hence Id.Uid may be empty.
-// - Delete of a previously deleted or non-existent resource is a no-op to support idempotency.
-// - Errors with Aborted if the requested Version does not match the stored Version.
-// - Errors with PermissionDenied if ACL check fails
-func (s *Server) Delete(ctx context.Context, req *pbresource.DeleteRequest) (*pbresource.DeleteResponse, error) {
-	reg, err := s.validateDeleteRequest(req)
-	if err != nil {
-		return nil, err
-	}
-
-	entMeta := v2TenancyToV1EntMeta(req.Id.Tenancy)
-	authz, authzContext, err := s.getAuthorizer(tokenFromContext(ctx), entMeta)
-	if err != nil {
-		return nil, err
-	}
-
-	// Retrieve resource since ACL hook requires it. Furthermore, we'll need the
-	// read to be strongly consistent if the passed in Version or Uid are empty.
-	consistency := storage.EventualConsistency
-	if req.Version == "" || req.Id.Uid == "" {
-		consistency = storage.StrongConsistency
-	}
-
-	// Apply defaults when tenancy units empty.
-	v1EntMetaToV2Tenancy(reg, entMeta, req.Id.Tenancy)
-
-	existing, err := s.Backend.Read(ctx, consistency, req.Id)
-	switch {
-	case errors.Is(err, storage.ErrNotFound):
-		// Deletes are idempotent so no-op when not found
-		return &pbresource.DeleteResponse{}, nil
-	case err != nil:
-		return nil, status.Errorf(codes.Internal, "failed read: %v", err)
-	}
-
-	// Check ACLs
-	err = reg.ACLs.Write(authz, authzContext, existing)
-	switch {
-	case acl.IsErrPermissionDenied(err):
-		return nil, status.Error(codes.PermissionDenied, err.Error())
-	case err != nil:
-		return nil, status.Errorf(codes.Internal, "failed write acl: %v", err)
-	}
-
-	deleteVersion := req.Version
-	deleteId := req.Id
-	if deleteVersion == "" || deleteId.Uid == "" {
-		deleteVersion = existing.Version
-		deleteId = existing.Id
-	}
-
-	if err := s.maybeCreateTombstone(ctx, deleteId); err != nil {
-		return nil, err
-	}
-
-	err = s.Backend.DeleteCAS(ctx, deleteId, deleteVersion)
-	switch {
-	case err == nil:
-		return &pbresource.DeleteResponse{}, nil
-	case errors.Is(err, storage.ErrCASFailure):
-		return nil, status.Error(codes.Aborted, err.Error())
-	default:
-		return nil, status.Errorf(codes.Internal, "failed delete: %v", err)
-	}
-}
-
-// Create a tombstone to capture the intent to delete child resources.
-// Tombstones are created preemptively to prevent partial failures even though
-// we are currently unaware of the success/failure/no-op of DeleteCAS. In
-// the failure and no-op cases the tombstone is effectively a no-op and will
-// still be deleted from the system by the reaper controller.
-func (s *Server) maybeCreateTombstone(ctx context.Context, deleteId *pbresource.ID) error {
-	// Don't create a tombstone when the resource being deleted is itself a tombstone.
-	if resource.EqualType(resource.TypeV1Tombstone, deleteId.Type) {
-		return nil
-	}
-
-	data, err := anypb.New(&pbresource.Tombstone{Owner: deleteId})
-	if err != nil {
-		return status.Errorf(codes.Internal, "failed creating tombstone: %v", err)
-	}
-
-	// Since a tombstone is an internal resource type that should not be visible
-	// or accessible by users, we're writing to the backend directly instead of
-	// using the resource service's Write endpoint. This bypasses resource level
-	// concerns that are either not relevant (valiation and mutation hooks) or
-	// futher complicate the implementation (user provided tokens having
-	// awareness of tombstone ACLs).
-	//
-	// ErrCASFailure should never happen since an empty Version is always passed.
-	//
-	// TODO(spatel): Probably a good idea to block writes of TypeV1Tombstone
-	//  	on the ResourceService.Write() endpoint to lock things down?
-	_, err = s.Backend.WriteCAS(ctx, &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type:    resource.TypeV1Tombstone,
-			Tenancy: deleteId.Tenancy,
-			Name:    tombstoneName(deleteId),
-			Uid:     ulid.Make().String(),
-		},
-		Generation: ulid.Make().String(),
-		Data:       data,
-		Metadata: map[string]string{
-			"generated_at": time.Now().Format(time.RFC3339),
-		},
-	})
-
-	switch {
-	case err == nil:
-		// Success!
-		return nil
-	case errors.Is(err, storage.ErrWrongUid):
-		// Backend has detected that we're trying to change the Uid for an
-		// existing tombstone (probably created from a previously failed Delete
-		// where the tombstone WriteCAS succeeded but the resource DeleteCAS
-		// failed). The fact that the tombstone already exists means we're good.
-		return nil
-	default:
-		return status.Errorf(codes.Internal, "failed writing tombstone: %v", err)
-	}
-}
-
-func (s *Server) validateDeleteRequest(req *pbresource.DeleteRequest) (*resource.Registration, error) {
-	if req.Id == nil {
-		return nil, status.Errorf(codes.InvalidArgument, "id is required")
-	}
-
-	if err := validateId(req.Id, "id"); err != nil {
-		return nil, err
-	}
-
-	reg, err := s.resolveType(req.Id.Type)
-	if err != nil {
-		return nil, err
-	}
-
-	// Check scope
-	if reg.Scope == resource.ScopePartition && req.Id.Tenancy.Namespace != "" {
-		return nil, status.Errorf(
-			codes.InvalidArgument,
-			"partition scoped resource %s cannot have a namespace. got: %s",
-			resource.ToGVK(req.Id.Type),
-			req.Id.Tenancy.Namespace,
-		)
-	}
-
-	return reg, nil
-}
-
-// Maintains a deterministic mapping between a resource and it's tombstone's
-// name by embedding the resources's Uid in the name.
-func tombstoneName(deleteId *pbresource.ID) string {
-	// deleteId.Name is just included for easier identification
-	return fmt.Sprintf("tombstone-%v-%v", deleteId.Name, deleteId.Uid)
-}
diff --git a/agent/grpc-external/services/resource/delete_test.go b/agent/grpc-external/services/resource/delete_test.go
deleted file mode 100644
index 5f5d7d7e21920..0000000000000
--- a/agent/grpc-external/services/resource/delete_test.go
+++ /dev/null
@@ -1,291 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/acl/resolver"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func TestDelete_InputValidation(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	testCases := map[string]func(artistId, recordLabelId *pbresource.ID) *pbresource.ID{
-		"no id": func(artistId, recordLabelId *pbresource.ID) *pbresource.ID {
-			return nil
-		},
-		"no type": func(artistId, _ *pbresource.ID) *pbresource.ID {
-			artistId.Type = nil
-			return artistId
-		},
-		"no name": func(artistId, _ *pbresource.ID) *pbresource.ID {
-			artistId.Name = ""
-			return artistId
-		},
-		"partition scoped resource with namespace": func(_, recordLabelId *pbresource.ID) *pbresource.ID {
-			recordLabelId.Tenancy.Namespace = "ishouldnothaveanamespace"
-			return recordLabelId
-		},
-	}
-	for desc, modFn := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
-			require.NoError(t, err)
-
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			req := &pbresource.DeleteRequest{Id: modFn(artist.Id, recordLabel.Id), Version: ""}
-
-			_, err = client.Delete(testContext(t), req)
-			require.Error(t, err)
-			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-		})
-	}
-}
-
-func TestDelete_TypeNotRegistered(t *testing.T) {
-	t.Parallel()
-
-	_, client, ctx := testDeps(t)
-	artist, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	// delete artist with unregistered type
-	_, err = client.Delete(ctx, &pbresource.DeleteRequest{Id: artist.Id, Version: ""})
-	require.Error(t, err)
-	require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-}
-
-func TestDelete_ACLs(t *testing.T) {
-	type testCase struct {
-		authz       resolver.Result
-		assertErrFn func(error)
-	}
-	testcases := map[string]testCase{
-		"delete denied": {
-			authz: AuthorizerFrom(t, demo.ArtistV1WritePolicy),
-			assertErrFn: func(err error) {
-				require.Error(t, err)
-				require.Equal(t, codes.PermissionDenied.String(), status.Code(err).String())
-			},
-		},
-		"delete allowed": {
-			authz: AuthorizerFrom(t, demo.ArtistV2WritePolicy),
-			assertErrFn: func(err error) {
-				require.NoError(t, err)
-			},
-		},
-	}
-
-	for desc, tc := range testcases {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			client := testClient(t, server)
-			demo.RegisterTypes(server.Registry)
-
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			// Write test resource to delete.
-			rsp, err := client.Write(context.Background(), &pbresource.WriteRequest{Resource: artist})
-			require.NoError(t, err)
-
-			// Mock is put in place after the above "write" since the "write" must also pass the ACL check.
-			mockACLResolver := &MockACLResolver{}
-			mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
-				Return(tc.authz, nil)
-			server.ACLResolver = mockACLResolver
-
-			// Exercise ACL.
-			_, err = client.Delete(testContext(t), &pbresource.DeleteRequest{Id: rsp.Resource.Id})
-			tc.assertErrFn(err)
-		})
-	}
-}
-
-func TestDelete_Success(t *testing.T) {
-	t.Parallel()
-
-	for desc, tc := range deleteTestCases() {
-		t.Run(desc, func(t *testing.T) {
-			for tenancyDesc, modFn := range tenancyCases() {
-				t.Run(tenancyDesc, func(t *testing.T) {
-					server, client, ctx := testDeps(t)
-					demo.RegisterTypes(server.Registry)
-
-					recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
-					require.NoError(t, err)
-					writeRsp, err := client.Write(ctx, &pbresource.WriteRequest{Resource: recordLabel})
-					require.NoError(t, err)
-					recordLabel = writeRsp.Resource
-					originalRecordLabelId := clone(recordLabel.Id)
-
-					artist, err := demo.GenerateV2Artist()
-					require.NoError(t, err)
-					writeRsp, err = client.Write(ctx, &pbresource.WriteRequest{Resource: artist})
-					require.NoError(t, err)
-					artist = writeRsp.Resource
-					originalArtistId := clone(artist.Id)
-
-					// Pick the resource to be deleted based on type's scope and mod tenancy
-					// based on the tenancy test case.
-					deleteId := modFn(artist.Id, recordLabel.Id)
-					deleteReq := tc.deleteReqFn(recordLabel)
-					if proto.Equal(deleteId.Type, demo.TypeV2Artist) {
-						deleteReq = tc.deleteReqFn(artist)
-					}
-
-					// Delete
-					_, err = client.Delete(ctx, deleteReq)
-					require.NoError(t, err)
-
-					// Verify deleted
-					_, err = client.Read(ctx, &pbresource.ReadRequest{Id: deleteId})
-					require.Error(t, err)
-					require.Equal(t, codes.NotFound.String(), status.Code(err).String())
-
-					// Derive tombstone name from resource that was deleted.
-					tname := tombstoneName(originalRecordLabelId)
-					if proto.Equal(deleteId.Type, demo.TypeV2Artist) {
-						tname = tombstoneName(originalArtistId)
-					}
-
-					// Verify tombstone created
-					_, err = client.Read(ctx, &pbresource.ReadRequest{
-						Id: &pbresource.ID{
-							Name:    tname,
-							Type:    resource.TypeV1Tombstone,
-							Tenancy: deleteReq.Id.Tenancy,
-						},
-					})
-					require.NoError(t, err, "expected tombstone to be found")
-				})
-			}
-		})
-	}
-}
-
-func TestDelete_TombstoneDeletionDoesNotCreateNewTombstone(t *testing.T) {
-	t.Parallel()
-
-	server, client, ctx := testDeps(t)
-	demo.RegisterTypes(server.Registry)
-
-	artist, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp, err := client.Write(ctx, &pbresource.WriteRequest{Resource: artist})
-	require.NoError(t, err)
-	artist = rsp.Resource
-
-	// delete artist
-	_, err = client.Delete(ctx, &pbresource.DeleteRequest{Id: artist.Id, Version: ""})
-	require.NoError(t, err)
-
-	// verify artist's tombstone created
-	rsp2, err := client.Read(ctx, &pbresource.ReadRequest{
-		Id: &pbresource.ID{
-			Name:    tombstoneName(artist.Id),
-			Type:    resource.TypeV1Tombstone,
-			Tenancy: artist.Id.Tenancy,
-		},
-	})
-	require.NoError(t, err)
-	tombstone := rsp2.Resource
-
-	// delete artist's tombstone
-	_, err = client.Delete(ctx, &pbresource.DeleteRequest{Id: tombstone.Id, Version: tombstone.Version})
-	require.NoError(t, err)
-
-	// verify no new tombstones created and artist's existing tombstone deleted
-	rsp3, err := client.List(ctx, &pbresource.ListRequest{Type: resource.TypeV1Tombstone, Tenancy: artist.Id.Tenancy})
-	require.NoError(t, err)
-	require.Empty(t, rsp3.Resources)
-}
-
-func TestDelete_NotFound(t *testing.T) {
-	t.Parallel()
-
-	for desc, tc := range deleteTestCases() {
-		t.Run(desc, func(t *testing.T) {
-			server, client, ctx := testDeps(t)
-			demo.RegisterTypes(server.Registry)
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			// verify delete of non-existant or already deleted resource is a no-op
-			_, err = client.Delete(ctx, tc.deleteReqFn(artist))
-			require.NoError(t, err)
-		})
-	}
-}
-
-func TestDelete_VersionMismatch(t *testing.T) {
-	t.Parallel()
-
-	server, client, ctx := testDeps(t)
-	demo.RegisterTypes(server.Registry)
-	artist, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-	rsp, err := client.Write(ctx, &pbresource.WriteRequest{Resource: artist})
-	require.NoError(t, err)
-
-	// delete with a version that is different from the stored version
-	_, err = client.Delete(ctx, &pbresource.DeleteRequest{Id: rsp.Resource.Id, Version: "non-existent-version"})
-	require.Error(t, err)
-	require.Equal(t, codes.Aborted.String(), status.Code(err).String())
-	require.ErrorContains(t, err, "CAS operation failed")
-}
-
-func testDeps(t *testing.T) (*Server, pbresource.ResourceServiceClient, context.Context) {
-	server := testServer(t)
-	client := testClient(t, server)
-	return server, client, context.Background()
-}
-
-type deleteTestCase struct {
-	deleteReqFn func(r *pbresource.Resource) *pbresource.DeleteRequest
-}
-
-func deleteTestCases() map[string]deleteTestCase {
-	return map[string]deleteTestCase{
-		"version and uid": {
-			deleteReqFn: func(r *pbresource.Resource) *pbresource.DeleteRequest {
-				return &pbresource.DeleteRequest{Id: r.Id, Version: r.Version}
-			},
-		},
-		"version only": {
-			deleteReqFn: func(r *pbresource.Resource) *pbresource.DeleteRequest {
-				r.Id.Uid = ""
-				return &pbresource.DeleteRequest{Id: r.Id, Version: r.Version}
-			},
-		},
-		"uid only": {
-			deleteReqFn: func(r *pbresource.Resource) *pbresource.DeleteRequest {
-				return &pbresource.DeleteRequest{Id: r.Id, Version: ""}
-			},
-		},
-		"no version or uid": {
-			deleteReqFn: func(r *pbresource.Resource) *pbresource.DeleteRequest {
-				r.Id.Uid = ""
-				return &pbresource.DeleteRequest{Id: r.Id, Version: ""}
-			},
-		},
-	}
-}
diff --git a/agent/grpc-external/services/resource/list.go b/agent/grpc-external/services/resource/list.go
deleted file mode 100644
index c1ecb253448ce..0000000000000
--- a/agent/grpc-external/services/resource/list.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func (s *Server) List(ctx context.Context, req *pbresource.ListRequest) (*pbresource.ListResponse, error) {
-	reg, err := s.validateListRequest(req)
-	if err != nil {
-		return nil, err
-	}
-
-	// v1 ACL subsystem is "wildcard" aware so just pass on through.
-	entMeta := v2TenancyToV1EntMeta(req.Tenancy)
-	token := tokenFromContext(ctx)
-	authz, authzContext, err := s.getAuthorizer(token, entMeta)
-	if err != nil {
-		return nil, err
-	}
-
-	// Check ACLs.
-	err = reg.ACLs.List(authz, authzContext)
-	switch {
-	case acl.IsErrPermissionDenied(err):
-		return nil, status.Error(codes.PermissionDenied, err.Error())
-	case err != nil:
-		return nil, status.Errorf(codes.Internal, "failed list acl: %v", err)
-	}
-
-	// Ensure we're defaulting correctly when request tenancy units are empty.
-	v1EntMetaToV2Tenancy(reg, entMeta, req.Tenancy)
-
-	resources, err := s.Backend.List(
-		ctx,
-		readConsistencyFrom(ctx),
-		storage.UnversionedTypeFrom(req.Type),
-		req.Tenancy,
-		req.NamePrefix,
-	)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed list: %v", err)
-	}
-
-	result := make([]*pbresource.Resource, 0)
-	for _, resource := range resources {
-		// Filter out non-matching GroupVersion.
-		if resource.Id.Type.GroupVersion != req.Type.GroupVersion {
-			continue
-		}
-
-		// Need to rebuild authorizer per resource since wildcard inputs may
-		// result in different tenancies. Consider caching per tenancy if this
-		// is deemed expensive.
-		entMeta = v2TenancyToV1EntMeta(resource.Id.Tenancy)
-		authz, authzContext, err = s.getAuthorizer(token, entMeta)
-		if err != nil {
-			return nil, err
-		}
-
-		// Filter out items that don't pass read ACLs.
-		err = reg.ACLs.Read(authz, authzContext, resource.Id, resource)
-		switch {
-		case acl.IsErrPermissionDenied(err):
-			continue
-		case err != nil:
-			return nil, status.Errorf(codes.Internal, "failed read acl: %v", err)
-		}
-		result = append(result, resource)
-	}
-	return &pbresource.ListResponse{Resources: result}, nil
-}
-
-func (s *Server) validateListRequest(req *pbresource.ListRequest) (*resource.Registration, error) {
-	var field string
-	switch {
-	case req.Type == nil:
-		field = "type"
-	case req.Tenancy == nil:
-		field = "tenancy"
-	}
-
-	if field != "" {
-		return nil, status.Errorf(codes.InvalidArgument, "%s is required", field)
-	}
-
-	// Check type exists.
-	reg, err := s.resolveType(req.Type)
-	if err != nil {
-		return nil, err
-	}
-
-	// Lowercase
-	resource.Normalize(req.Tenancy)
-
-	// Error when partition scoped and namespace not empty.
-	if reg.Scope == resource.ScopePartition && req.Tenancy.Namespace != "" {
-		return nil, status.Errorf(
-			codes.InvalidArgument,
-			"partition scoped type %s cannot have a namespace. got: %s",
-			resource.ToGVK(req.Type),
-			req.Tenancy.Namespace,
-		)
-	}
-
-	return reg, nil
-}
diff --git a/agent/grpc-external/services/resource/list_by_owner.go b/agent/grpc-external/services/resource/list_by_owner.go
deleted file mode 100644
index 2310a5b50eda2..0000000000000
--- a/agent/grpc-external/services/resource/list_by_owner.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func (s *Server) ListByOwner(ctx context.Context, req *pbresource.ListByOwnerRequest) (*pbresource.ListByOwnerResponse, error) {
-	reg, err := s.validateListByOwnerRequest(req)
-	if err != nil {
-		return nil, err
-	}
-
-	// Convert v2 request tenancy to v1 for ACL subsystem.
-	entMeta := v2TenancyToV1EntMeta(req.Owner.Tenancy)
-	token := tokenFromContext(ctx)
-
-	// Fill entMeta with token tenancy when empty.
-	authz, authzContext, err := s.getAuthorizer(token, entMeta)
-	if err != nil {
-		return nil, err
-	}
-
-	// Handle defaulting empty tenancy units from request.
-	v1EntMetaToV2Tenancy(reg, entMeta, req.Owner.Tenancy)
-
-	// Check list ACL before verifying tenancy exists to not leak tenancy existence.
-	err = reg.ACLs.List(authz, authzContext)
-	switch {
-	case acl.IsErrPermissionDenied(err):
-		return nil, status.Error(codes.PermissionDenied, err.Error())
-	case err != nil:
-		return nil, status.Errorf(codes.Internal, "failed list acl: %v", err)
-	}
-
-	// Check v1 tenancy exists for the v2 resource.
-	if err = v1TenancyExists(reg, s.TenancyBridge, req.Owner.Tenancy, codes.InvalidArgument); err != nil {
-		return nil, err
-	}
-
-	// Get owned resources.
-	children, err := s.Backend.ListByOwner(ctx, req.Owner)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed list by owner: %v", err)
-	}
-
-	result := make([]*pbresource.Resource, 0)
-	for _, child := range children {
-		// Retrieve child type's registration to access read ACL hook.
-		childReg, err := s.resolveType(child.Id.Type)
-		if err != nil {
-			return nil, err
-		}
-
-		// Rebuild authorizer if tenancy not identical between owner and child (child scope
-		// may be narrower).
-		childAuthz := authz
-		childAuthzContext := authzContext
-		if !resource.EqualTenancy(req.Owner.Tenancy, child.Id.Tenancy) {
-			childEntMeta := v2TenancyToV1EntMeta(child.Id.Tenancy)
-			childAuthz, childAuthzContext, err = s.getAuthorizer(token, childEntMeta)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		// Filter out children that fail real ACL.
-		err = childReg.ACLs.Read(childAuthz, childAuthzContext, child.Id, child)
-		switch {
-		case acl.IsErrPermissionDenied(err):
-			continue
-		case err != nil:
-			return nil, status.Errorf(codes.Internal, "failed read acl: %v", err)
-		}
-
-		result = append(result, child)
-	}
-	return &pbresource.ListByOwnerResponse{Resources: result}, nil
-}
-
-func (s *Server) validateListByOwnerRequest(req *pbresource.ListByOwnerRequest) (*resource.Registration, error) {
-	if req.Owner == nil {
-		return nil, status.Errorf(codes.InvalidArgument, "owner is required")
-	}
-
-	if err := validateId(req.Owner, "owner"); err != nil {
-		return nil, err
-	}
-
-	if req.Owner.Uid == "" {
-		return nil, status.Errorf(codes.InvalidArgument, "owner uid is required")
-	}
-
-	reg, err := s.resolveType(req.Owner.Type)
-	if err != nil {
-		return nil, err
-	}
-
-	// Lowercase
-	resource.Normalize(req.Owner.Tenancy)
-
-	// Error when partition scoped and namespace not empty.
-	if reg.Scope == resource.ScopePartition && req.Owner.Tenancy.Namespace != "" {
-		return nil, status.Errorf(
-			codes.InvalidArgument,
-			"partition scoped type %s cannot have a namespace. got: %s",
-			resource.ToGVK(req.Owner.Type),
-			req.Owner.Tenancy.Namespace,
-		)
-	}
-
-	return reg, nil
-}
diff --git a/agent/grpc-external/services/resource/list_by_owner_test.go b/agent/grpc-external/services/resource/list_by_owner_test.go
deleted file mode 100644
index 11c6027c0b642..0000000000000
--- a/agent/grpc-external/services/resource/list_by_owner_test.go
+++ /dev/null
@@ -1,279 +0,0 @@
-// // Copyright (c) HashiCorp, Inc.
-// // SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
-)
-
-func TestListByOwner_InputValidation(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-	demo.RegisterTypes(server.Registry)
-
-	testCases := map[string]func(artistId, recordlabelId *pbresource.ID) *pbresource.ID{
-		"no owner": func(artistId, recordLabelId *pbresource.ID) *pbresource.ID {
-			return nil
-		},
-		"no type": func(artistId, _ *pbresource.ID) *pbresource.ID {
-			artistId.Type = nil
-			return artistId
-		},
-		"no name": func(artistId, _ *pbresource.ID) *pbresource.ID {
-			artistId.Name = ""
-			return artistId
-		},
-		"no uid": func(artistId, _ *pbresource.ID) *pbresource.ID {
-			artistId.Uid = ""
-			return artistId
-		},
-		"partition scope with non-empty namespace": func(_, recordLabelId *pbresource.ID) *pbresource.ID {
-			recordLabelId.Tenancy.Namespace = "ishouldnothaveanamespace"
-			return recordLabelId
-		},
-	}
-	for desc, modFn := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
-			require.NoError(t, err)
-
-			// Each test case picks which resource to use based on the resource type's scope.
-			req := &pbresource.ListByOwnerRequest{Owner: modFn(artist.Id, recordLabel.Id)}
-
-			_, err = client.ListByOwner(testContext(t), req)
-			require.Error(t, err)
-			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-		})
-	}
-}
-
-func TestListByOwner_TypeNotRegistered(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	_, err := client.ListByOwner(context.Background(), &pbresource.ListByOwnerRequest{
-		Owner: &pbresource.ID{
-			Type:    demo.TypeV2Artist,
-			Tenancy: resource.DefaultNamespacedTenancy(),
-			Uid:     "bogus",
-			Name:    "bogus",
-		},
-	})
-	require.Error(t, err)
-	require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-	require.Contains(t, err.Error(), "resource type demo.v2.Artist not registered")
-}
-
-func TestListByOwner_Empty(t *testing.T) {
-	server := testServer(t)
-	demo.RegisterTypes(server.Registry)
-	client := testClient(t, server)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	rsp2, err := client.ListByOwner(testContext(t), &pbresource.ListByOwnerRequest{Owner: rsp1.Resource.Id})
-	require.NoError(t, err)
-	require.Empty(t, rsp2.Resources)
-}
-
-func TestListByOwner_Many(t *testing.T) {
-	server := testServer(t)
-	demo.RegisterTypes(server.Registry)
-	client := testClient(t, server)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	artist := rsp1.Resource
-	require.NoError(t, err)
-
-	albums := make([]*pbresource.Resource, 10)
-	for i := 0; i < len(albums); i++ {
-		album, err := demo.GenerateV2Album(artist.Id)
-		require.NoError(t, err)
-
-		// Prevent test flakes if the generated names collide.
-		album.Id.Name = fmt.Sprintf("%s-%d", artist.Id.Name, i)
-
-		rsp2, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: album})
-		require.NoError(t, err)
-		albums[i] = rsp2.Resource
-	}
-
-	rsp3, err := client.ListByOwner(testContext(t), &pbresource.ListByOwnerRequest{
-		Owner: artist.Id,
-	})
-	require.NoError(t, err)
-	prototest.AssertElementsMatch(t, albums, rsp3.Resources)
-}
-
-func TestListByOwner_OwnerTenancyDoesNotExist(t *testing.T) {
-	tenancyCases := map[string]func(artistId, recordlabelId *pbresource.ID) *pbresource.ID{
-		"partition not found when namespace scoped": func(artistId, _ *pbresource.ID) *pbresource.ID {
-			id := clone(artistId)
-			id.Uid = "doesnotmatter"
-			id.Tenancy.Partition = "boguspartition"
-			return id
-		},
-		"namespace not found when namespace scoped": func(artistId, _ *pbresource.ID) *pbresource.ID {
-			id := clone(artistId)
-			id.Uid = "doesnotmatter"
-			id.Tenancy.Namespace = "bogusnamespace"
-			return id
-		},
-		"partition not found when partition scoped": func(_, recordLabelId *pbresource.ID) *pbresource.ID {
-			id := clone(recordLabelId)
-			id.Uid = "doesnotmatter"
-			id.Tenancy.Partition = "boguspartition"
-			return id
-		},
-	}
-	for desc, modFn := range tenancyCases {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			demo.RegisterTypes(server.Registry)
-			client := testClient(t, server)
-
-			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
-			require.NoError(t, err)
-			recordLabel, err = server.Backend.WriteCAS(testContext(t), recordLabel)
-			require.NoError(t, err)
-
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-			artist, err = server.Backend.WriteCAS(testContext(t), artist)
-			require.NoError(t, err)
-
-			// Verify non-existant tenancy units in owner err with not found.
-			_, err = client.ListByOwner(testContext(t), &pbresource.ListByOwnerRequest{Owner: modFn(artist.Id, recordLabel.Id)})
-			require.Error(t, err)
-			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-			require.Contains(t, err.Error(), "resource not found")
-		})
-	}
-}
-
-func TestListByOwner_Tenancy_Defaults_And_Normalization(t *testing.T) {
-	for tenancyDesc, modFn := range tenancyCases() {
-		t.Run(tenancyDesc, func(t *testing.T) {
-			server := testServer(t)
-			demo.RegisterTypes(server.Registry)
-			client := testClient(t, server)
-
-			// Create partition scoped recordLabel.
-			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
-			require.NoError(t, err)
-			rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: recordLabel})
-			require.NoError(t, err)
-			recordLabel = rsp1.Resource
-
-			// Create namespace scoped artist.
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-			rsp2, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: artist})
-			require.NoError(t, err)
-			artist = rsp2.Resource
-
-			// Owner will be either partition scoped (recordLabel) or namespace scoped (artist) based on testcase.
-			moddedOwnerId := modFn(artist.Id, recordLabel.Id)
-			var ownerId *pbresource.ID
-
-			// Avoid using the modded id when linking owner to child.
-			switch {
-			case proto.Equal(moddedOwnerId.Type, demo.TypeV2Artist):
-				ownerId = artist.Id
-			case proto.Equal(moddedOwnerId.Type, demo.TypeV1RecordLabel):
-				ownerId = recordLabel.Id
-			default:
-				require.Fail(t, "unexpected resource type")
-			}
-
-			// Link owner to child.
-			album, err := demo.GenerateV2Album(ownerId)
-			require.NoError(t, err)
-			rsp3, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: album})
-			require.NoError(t, err)
-			album = rsp3.Resource
-
-			// Test
-			listRsp, err := client.ListByOwner(testContext(t), &pbresource.ListByOwnerRequest{
-				Owner: moddedOwnerId,
-			})
-			require.NoError(t, err)
-
-			// Verify child album always returned.
-			prototest.AssertDeepEqual(t, album, listRsp.Resources[0])
-		})
-	}
-}
-
-func TestListByOwner_ACL_PerTypeDenied(t *testing.T) {
-	authz := AuthorizerFrom(t, `key_prefix "resource/demo.v2.Album/" { policy = "deny" }`, demo.ArtistV2ListPolicy)
-	_, rsp, err := roundTripListByOwner(t, authz)
-
-	// verify resource filtered out, hence no results
-	require.NoError(t, err)
-	require.Empty(t, rsp.Resources)
-}
-
-func TestListByOwner_ACL_PerTypeAllowed(t *testing.T) {
-	authz := AuthorizerFrom(t, `key_prefix "resource/demo.v2.Album/" { policy = "read" }`, demo.ArtistV2ListPolicy)
-	album, rsp, err := roundTripListByOwner(t, authz)
-
-	// verify resource not filtered out
-	require.NoError(t, err)
-	require.Len(t, rsp.Resources, 1)
-	prototest.AssertDeepEqual(t, album, rsp.Resources[0])
-}
-
-// roundtrip a ListByOwner which attempts to return a single resource
-func roundTripListByOwner(t *testing.T, authz acl.Authorizer) (*pbresource.Resource, *pbresource.ListByOwnerResponse, error) {
-	server := testServer(t)
-	client := testClient(t, server)
-	demo.RegisterTypes(server.Registry)
-
-	artist, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: artist})
-	artist = rsp1.Resource
-	require.NoError(t, err)
-
-	album, err := demo.GenerateV2Album(artist.Id)
-	require.NoError(t, err)
-
-	rsp2, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: album})
-	album = rsp2.Resource
-	require.NoError(t, err)
-
-	mockACLResolver := &MockACLResolver{}
-	mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
-		Return(authz, nil)
-	server.ACLResolver = mockACLResolver
-
-	rsp3, err := client.ListByOwner(testContext(t), &pbresource.ListByOwnerRequest{Owner: artist.Id})
-	return album, rsp3, err
-}
diff --git a/agent/grpc-external/services/resource/list_test.go b/agent/grpc-external/services/resource/list_test.go
deleted file mode 100644
index 64026b7d34e59..0000000000000
--- a/agent/grpc-external/services/resource/list_test.go
+++ /dev/null
@@ -1,295 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/grpc-external/testutils"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/status"
-)
-
-func TestList_InputValidation(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	testCases := map[string]func(*pbresource.ListRequest){
-		"no type":    func(req *pbresource.ListRequest) { req.Type = nil },
-		"no tenancy": func(req *pbresource.ListRequest) { req.Tenancy = nil },
-		"partitioned resource provides non-empty namespace": func(req *pbresource.ListRequest) {
-			req.Type = demo.TypeV1RecordLabel
-			req.Tenancy.Namespace = "bad"
-		},
-	}
-	for desc, modFn := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			req := &pbresource.ListRequest{
-				Type:    demo.TypeV2Album,
-				Tenancy: resource.DefaultNamespacedTenancy(),
-			}
-			modFn(req)
-
-			_, err := client.List(testContext(t), req)
-			require.Error(t, err)
-			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-		})
-	}
-}
-
-func TestList_TypeNotFound(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	_, err := client.List(context.Background(), &pbresource.ListRequest{
-		Type:       demo.TypeV2Artist,
-		Tenancy:    resource.DefaultNamespacedTenancy(),
-		NamePrefix: "",
-	})
-	require.Error(t, err)
-	require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-	require.Contains(t, err.Error(), "resource type demo.v2.Artist not registered")
-}
-
-func TestList_Empty(t *testing.T) {
-	for desc, tc := range listTestCases() {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			demo.RegisterTypes(server.Registry)
-			client := testClient(t, server)
-
-			rsp, err := client.List(tc.ctx, &pbresource.ListRequest{
-				Type:       demo.TypeV1Artist,
-				Tenancy:    resource.DefaultNamespacedTenancy(),
-				NamePrefix: "",
-			})
-			require.NoError(t, err)
-			require.Empty(t, rsp.Resources)
-		})
-	}
-}
-
-func TestList_Many(t *testing.T) {
-	for desc, tc := range listTestCases() {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			demo.RegisterTypes(server.Registry)
-			client := testClient(t, server)
-
-			resources := make([]*pbresource.Resource, 10)
-			for i := 0; i < len(resources); i++ {
-				artist, err := demo.GenerateV2Artist()
-				require.NoError(t, err)
-
-				// Prevent test flakes if the generated names collide.
-				artist.Id.Name = fmt.Sprintf("%s-%d", artist.Id.Name, i)
-
-				rsp, err := client.Write(tc.ctx, &pbresource.WriteRequest{Resource: artist})
-				require.NoError(t, err)
-
-				resources[i] = rsp.Resource
-			}
-
-			rsp, err := client.List(tc.ctx, &pbresource.ListRequest{
-				Type:       demo.TypeV2Artist,
-				Tenancy:    resource.DefaultNamespacedTenancy(),
-				NamePrefix: "",
-			})
-			require.NoError(t, err)
-			prototest.AssertElementsMatch(t, resources, rsp.Resources)
-		})
-	}
-}
-
-func TestList_Tenancy_Defaults_And_Normalization(t *testing.T) {
-	// Test units of tenancy get defaulted correctly when empty.
-	ctx := context.Background()
-	for desc, tc := range wildcardTenancyCases() {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			demo.RegisterTypes(server.Registry)
-			client := testClient(t, server)
-
-			// Write partition scoped record label
-			recordLabel, err := demo.GenerateV1RecordLabel("LooneyTunes")
-			require.NoError(t, err)
-			recordLabelRsp, err := client.Write(ctx, &pbresource.WriteRequest{Resource: recordLabel})
-			require.NoError(t, err)
-
-			// Write namespace scoped artist
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-			artistRsp, err := client.Write(ctx, &pbresource.WriteRequest{Resource: artist})
-			require.NoError(t, err)
-
-			// List and verify correct resource returned for empty tenancy units.
-			listRsp, err := client.List(ctx, &pbresource.ListRequest{
-				Type:    tc.typ,
-				Tenancy: tc.tenancy,
-			})
-			require.NoError(t, err)
-			require.Len(t, listRsp.Resources, 1)
-			if tc.typ == demo.TypeV1RecordLabel {
-				prototest.AssertDeepEqual(t, recordLabelRsp.Resource, listRsp.Resources[0])
-			} else {
-				prototest.AssertDeepEqual(t, artistRsp.Resource, listRsp.Resources[0])
-			}
-		})
-
-	}
-}
-
-func TestList_GroupVersionMismatch(t *testing.T) {
-	for desc, tc := range listTestCases() {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			demo.RegisterTypes(server.Registry)
-			client := testClient(t, server)
-
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			_, err = server.Backend.WriteCAS(tc.ctx, artist)
-			require.NoError(t, err)
-
-			rsp, err := client.List(tc.ctx, &pbresource.ListRequest{
-				Type:       demo.TypeV1Artist,
-				Tenancy:    artist.Id.Tenancy,
-				NamePrefix: "",
-			})
-			require.NoError(t, err)
-			require.Empty(t, rsp.Resources)
-		})
-	}
-}
-
-func TestList_VerifyReadConsistencyArg(t *testing.T) {
-	// Uses a mockBackend instead of the inmem Backend to verify the ReadConsistency argument is set correctly.
-	for desc, tc := range listTestCases() {
-		t.Run(desc, func(t *testing.T) {
-			mockBackend := NewMockBackend(t)
-			server := testServer(t)
-			server.Backend = mockBackend
-			demo.RegisterTypes(server.Registry)
-
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			mockBackend.On("List", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
-				Return([]*pbresource.Resource{artist}, nil)
-			client := testClient(t, server)
-
-			rsp, err := client.List(tc.ctx, &pbresource.ListRequest{Type: artist.Id.Type, Tenancy: artist.Id.Tenancy, NamePrefix: ""})
-			require.NoError(t, err)
-			prototest.AssertDeepEqual(t, artist, rsp.Resources[0])
-			mockBackend.AssertCalled(t, "List", mock.Anything, tc.consistency, mock.Anything, mock.Anything, mock.Anything)
-		})
-	}
-}
-
-// N.B. Uses key ACLs for now. See demo.RegisterTypes()
-func TestList_ACL_ListDenied(t *testing.T) {
-	t.Parallel()
-
-	// deny all
-	_, _, err := roundTripList(t, testutils.ACLNoPermissions(t))
-
-	// verify key:list denied
-	require.Error(t, err)
-	require.Equal(t, codes.PermissionDenied.String(), status.Code(err).String())
-	require.Contains(t, err.Error(), "lacks permission 'key:list'")
-}
-
-// N.B. Uses key ACLs for now. See demo.RegisterTypes()
-func TestList_ACL_ListAllowed_ReadDenied(t *testing.T) {
-	t.Parallel()
-
-	// allow list, deny read
-	authz := AuthorizerFrom(t, demo.ArtistV2ListPolicy,
-		`key_prefix "resource/demo.v2.Artist/" { policy = "deny" }`)
-	_, rsp, err := roundTripList(t, authz)
-
-	// verify resource filtered out by key:read denied hence no results
-	require.NoError(t, err)
-	require.Empty(t, rsp.Resources)
-}
-
-// N.B. Uses key ACLs for now. See demo.RegisterTypes()
-func TestList_ACL_ListAllowed_ReadAllowed(t *testing.T) {
-	t.Parallel()
-
-	// allow list, allow read
-	authz := AuthorizerFrom(t, demo.ArtistV2ListPolicy, demo.ArtistV2ReadPolicy)
-	artist, rsp, err := roundTripList(t, authz)
-
-	// verify resource not filtered out by acl
-	require.NoError(t, err)
-	require.Len(t, rsp.Resources, 1)
-	prototest.AssertDeepEqual(t, artist, rsp.Resources[0])
-}
-
-// roundtrip a List which attempts to return a single resource
-func roundTripList(t *testing.T, authz acl.Authorizer) (*pbresource.Resource, *pbresource.ListResponse, error) {
-	server := testServer(t)
-	client := testClient(t, server)
-	ctx := testContext(t)
-
-	mockACLResolver := &MockACLResolver{}
-	mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
-		Return(authz, nil)
-	server.ACLResolver = mockACLResolver
-	demo.RegisterTypes(server.Registry)
-
-	artist, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	artist, err = server.Backend.WriteCAS(ctx, artist)
-	require.NoError(t, err)
-
-	rsp, err := client.List(
-		ctx,
-		&pbresource.ListRequest{
-			Type:       artist.Id.Type,
-			Tenancy:    artist.Id.Tenancy,
-			NamePrefix: "",
-		},
-	)
-
-	return artist, rsp, err
-}
-
-type listTestCase struct {
-	consistency storage.ReadConsistency
-	ctx         context.Context
-}
-
-func listTestCases() map[string]listTestCase {
-	return map[string]listTestCase{
-		"eventually consistent read": {
-			consistency: storage.EventualConsistency,
-			ctx:         context.Background(),
-		},
-		"strongly consistent read": {
-			consistency: storage.StrongConsistency,
-			ctx: metadata.NewOutgoingContext(
-				context.Background(),
-				metadata.New(map[string]string{"x-consul-consistency-mode": "consistent"}),
-			),
-		},
-	}
-}
diff --git a/agent/grpc-external/services/resource/mock_ACLResolver.go b/agent/grpc-external/services/resource/mock_ACLResolver.go
deleted file mode 100644
index 5e596085059ea..0000000000000
--- a/agent/grpc-external/services/resource/mock_ACLResolver.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Code generated by mockery v2.20.0. DO NOT EDIT.
-
-package resource
-
-import (
-	acl "github.com/hashicorp/consul/acl"
-	mock "github.com/stretchr/testify/mock"
-
-	resolver "github.com/hashicorp/consul/acl/resolver"
-)
-
-// MockACLResolver is an autogenerated mock type for the ACLResolver type
-type MockACLResolver struct {
-	mock.Mock
-}
-
-// ResolveTokenAndDefaultMeta provides a mock function with given fields: _a0, _a1, _a2
-func (_m *MockACLResolver) ResolveTokenAndDefaultMeta(_a0 string, _a1 *acl.EnterpriseMeta, _a2 *acl.AuthorizerContext) (resolver.Result, error) {
-	ret := _m.Called(_a0, _a1, _a2)
-
-	var r0 resolver.Result
-	var r1 error
-	if rf, ok := ret.Get(0).(func(string, *acl.EnterpriseMeta, *acl.AuthorizerContext) (resolver.Result, error)); ok {
-		return rf(_a0, _a1, _a2)
-	}
-	if rf, ok := ret.Get(0).(func(string, *acl.EnterpriseMeta, *acl.AuthorizerContext) resolver.Result); ok {
-		r0 = rf(_a0, _a1, _a2)
-	} else {
-		r0 = ret.Get(0).(resolver.Result)
-	}
-
-	if rf, ok := ret.Get(1).(func(string, *acl.EnterpriseMeta, *acl.AuthorizerContext) error); ok {
-		r1 = rf(_a0, _a1, _a2)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-type mockConstructorTestingTNewMockACLResolver interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewMockACLResolver creates a new instance of MockACLResolver. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewMockACLResolver(t mockConstructorTestingTNewMockACLResolver) *MockACLResolver {
-	mock := &MockACLResolver{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/agent/grpc-external/services/resource/mock_Backend.go b/agent/grpc-external/services/resource/mock_Backend.go
deleted file mode 100644
index fbc88a592bb41..0000000000000
--- a/agent/grpc-external/services/resource/mock_Backend.go
+++ /dev/null
@@ -1,176 +0,0 @@
-// Code generated by mockery v2.20.0. DO NOT EDIT.
-
-package resource
-
-import (
-	context "context"
-
-	pbresource "github.com/hashicorp/consul/proto-public/pbresource"
-	mock "github.com/stretchr/testify/mock"
-
-	storage "github.com/hashicorp/consul/internal/storage"
-)
-
-// MockBackend is an autogenerated mock type for the Backend type
-type MockBackend struct {
-	mock.Mock
-}
-
-// DeleteCAS provides a mock function with given fields: ctx, id, version
-func (_m *MockBackend) DeleteCAS(ctx context.Context, id *pbresource.ID, version string) error {
-	ret := _m.Called(ctx, id, version)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, *pbresource.ID, string) error); ok {
-		r0 = rf(ctx, id, version)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// List provides a mock function with given fields: ctx, consistency, resType, tenancy, namePrefix
-func (_m *MockBackend) List(ctx context.Context, consistency storage.ReadConsistency, resType storage.UnversionedType, tenancy *pbresource.Tenancy, namePrefix string) ([]*pbresource.Resource, error) {
-	ret := _m.Called(ctx, consistency, resType, tenancy, namePrefix)
-
-	var r0 []*pbresource.Resource
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, storage.ReadConsistency, storage.UnversionedType, *pbresource.Tenancy, string) ([]*pbresource.Resource, error)); ok {
-		return rf(ctx, consistency, resType, tenancy, namePrefix)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, storage.ReadConsistency, storage.UnversionedType, *pbresource.Tenancy, string) []*pbresource.Resource); ok {
-		r0 = rf(ctx, consistency, resType, tenancy, namePrefix)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]*pbresource.Resource)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, storage.ReadConsistency, storage.UnversionedType, *pbresource.Tenancy, string) error); ok {
-		r1 = rf(ctx, consistency, resType, tenancy, namePrefix)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// ListByOwner provides a mock function with given fields: ctx, id
-func (_m *MockBackend) ListByOwner(ctx context.Context, id *pbresource.ID) ([]*pbresource.Resource, error) {
-	ret := _m.Called(ctx, id)
-
-	var r0 []*pbresource.Resource
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *pbresource.ID) ([]*pbresource.Resource, error)); ok {
-		return rf(ctx, id)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, *pbresource.ID) []*pbresource.Resource); ok {
-		r0 = rf(ctx, id)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]*pbresource.Resource)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, *pbresource.ID) error); ok {
-		r1 = rf(ctx, id)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// Read provides a mock function with given fields: ctx, consistency, id
-func (_m *MockBackend) Read(ctx context.Context, consistency storage.ReadConsistency, id *pbresource.ID) (*pbresource.Resource, error) {
-	ret := _m.Called(ctx, consistency, id)
-
-	var r0 *pbresource.Resource
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, storage.ReadConsistency, *pbresource.ID) (*pbresource.Resource, error)); ok {
-		return rf(ctx, consistency, id)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, storage.ReadConsistency, *pbresource.ID) *pbresource.Resource); ok {
-		r0 = rf(ctx, consistency, id)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*pbresource.Resource)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, storage.ReadConsistency, *pbresource.ID) error); ok {
-		r1 = rf(ctx, consistency, id)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// WatchList provides a mock function with given fields: ctx, resType, tenancy, namePrefix
-func (_m *MockBackend) WatchList(ctx context.Context, resType storage.UnversionedType, tenancy *pbresource.Tenancy, namePrefix string) (storage.Watch, error) {
-	ret := _m.Called(ctx, resType, tenancy, namePrefix)
-
-	var r0 storage.Watch
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, storage.UnversionedType, *pbresource.Tenancy, string) (storage.Watch, error)); ok {
-		return rf(ctx, resType, tenancy, namePrefix)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, storage.UnversionedType, *pbresource.Tenancy, string) storage.Watch); ok {
-		r0 = rf(ctx, resType, tenancy, namePrefix)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(storage.Watch)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, storage.UnversionedType, *pbresource.Tenancy, string) error); ok {
-		r1 = rf(ctx, resType, tenancy, namePrefix)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// WriteCAS provides a mock function with given fields: ctx, res
-func (_m *MockBackend) WriteCAS(ctx context.Context, res *pbresource.Resource) (*pbresource.Resource, error) {
-	ret := _m.Called(ctx, res)
-
-	var r0 *pbresource.Resource
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *pbresource.Resource) (*pbresource.Resource, error)); ok {
-		return rf(ctx, res)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, *pbresource.Resource) *pbresource.Resource); ok {
-		r0 = rf(ctx, res)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*pbresource.Resource)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, *pbresource.Resource) error); ok {
-		r1 = rf(ctx, res)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-type mockConstructorTestingTNewMockBackend interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewMockBackend creates a new instance of MockBackend. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewMockBackend(t mockConstructorTestingTNewMockBackend) *MockBackend {
-	mock := &MockBackend{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/agent/grpc-external/services/resource/mock_Registry.go b/agent/grpc-external/services/resource/mock_Registry.go
deleted file mode 100644
index 288e8bcde8b67..0000000000000
--- a/agent/grpc-external/services/resource/mock_Registry.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Code generated by mockery v2.20.0. DO NOT EDIT.
-
-package resource
-
-import (
-	internalresource "github.com/hashicorp/consul/internal/resource"
-	mock "github.com/stretchr/testify/mock"
-
-	pbresource "github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// MockRegistry is an autogenerated mock type for the Registry type
-type MockRegistry struct {
-	mock.Mock
-}
-
-// Register provides a mock function with given fields: reg
-func (_m *MockRegistry) Register(reg internalresource.Registration) {
-	_m.Called(reg)
-}
-
-// Resolve provides a mock function with given fields: typ
-func (_m *MockRegistry) Resolve(typ *pbresource.Type) (internalresource.Registration, bool) {
-	ret := _m.Called(typ)
-
-	var r0 internalresource.Registration
-	var r1 bool
-	if rf, ok := ret.Get(0).(func(*pbresource.Type) (internalresource.Registration, bool)); ok {
-		return rf(typ)
-	}
-	if rf, ok := ret.Get(0).(func(*pbresource.Type) internalresource.Registration); ok {
-		r0 = rf(typ)
-	} else {
-		r0 = ret.Get(0).(internalresource.Registration)
-	}
-
-	if rf, ok := ret.Get(1).(func(*pbresource.Type) bool); ok {
-		r1 = rf(typ)
-	} else {
-		r1 = ret.Get(1).(bool)
-	}
-
-	return r0, r1
-}
-
-type mockConstructorTestingTNewMockRegistry interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewMockRegistry creates a new instance of MockRegistry. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewMockRegistry(t mockConstructorTestingTNewMockRegistry) *MockRegistry {
-	mock := &MockRegistry{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/agent/grpc-external/services/resource/mock_TenancyBridge.go b/agent/grpc-external/services/resource/mock_TenancyBridge.go
deleted file mode 100644
index 662b4004b99f7..0000000000000
--- a/agent/grpc-external/services/resource/mock_TenancyBridge.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Code generated by mockery v2.20.0. DO NOT EDIT.
-
-package resource
-
-import mock "github.com/stretchr/testify/mock"
-
-// MockTenancyBridge is an autogenerated mock type for the TenancyBridge type
-type MockTenancyBridge struct {
-	mock.Mock
-}
-
-// IsNamespaceMarkedForDeletion provides a mock function with given fields: partition, namespace
-func (_m *MockTenancyBridge) IsNamespaceMarkedForDeletion(partition string, namespace string) (bool, error) {
-	ret := _m.Called(partition, namespace)
-
-	var r0 bool
-	var r1 error
-	if rf, ok := ret.Get(0).(func(string, string) (bool, error)); ok {
-		return rf(partition, namespace)
-	}
-	if rf, ok := ret.Get(0).(func(string, string) bool); ok {
-		r0 = rf(partition, namespace)
-	} else {
-		r0 = ret.Get(0).(bool)
-	}
-
-	if rf, ok := ret.Get(1).(func(string, string) error); ok {
-		r1 = rf(partition, namespace)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// IsPartitionMarkedForDeletion provides a mock function with given fields: partition
-func (_m *MockTenancyBridge) IsPartitionMarkedForDeletion(partition string) (bool, error) {
-	ret := _m.Called(partition)
-
-	var r0 bool
-	var r1 error
-	if rf, ok := ret.Get(0).(func(string) (bool, error)); ok {
-		return rf(partition)
-	}
-	if rf, ok := ret.Get(0).(func(string) bool); ok {
-		r0 = rf(partition)
-	} else {
-		r0 = ret.Get(0).(bool)
-	}
-
-	if rf, ok := ret.Get(1).(func(string) error); ok {
-		r1 = rf(partition)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// NamespaceExists provides a mock function with given fields: partition, namespace
-func (_m *MockTenancyBridge) NamespaceExists(partition string, namespace string) (bool, error) {
-	ret := _m.Called(partition, namespace)
-
-	var r0 bool
-	var r1 error
-	if rf, ok := ret.Get(0).(func(string, string) (bool, error)); ok {
-		return rf(partition, namespace)
-	}
-	if rf, ok := ret.Get(0).(func(string, string) bool); ok {
-		r0 = rf(partition, namespace)
-	} else {
-		r0 = ret.Get(0).(bool)
-	}
-
-	if rf, ok := ret.Get(1).(func(string, string) error); ok {
-		r1 = rf(partition, namespace)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// PartitionExists provides a mock function with given fields: partition
-func (_m *MockTenancyBridge) PartitionExists(partition string) (bool, error) {
-	ret := _m.Called(partition)
-
-	var r0 bool
-	var r1 error
-	if rf, ok := ret.Get(0).(func(string) (bool, error)); ok {
-		return rf(partition)
-	}
-	if rf, ok := ret.Get(0).(func(string) bool); ok {
-		r0 = rf(partition)
-	} else {
-		r0 = ret.Get(0).(bool)
-	}
-
-	if rf, ok := ret.Get(1).(func(string) error); ok {
-		r1 = rf(partition)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-type mockConstructorTestingTNewMockTenancyBridge interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewMockTenancyBridge creates a new instance of MockTenancyBridge. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewMockTenancyBridge(t mockConstructorTestingTNewMockTenancyBridge) *MockTenancyBridge {
-	mock := &MockTenancyBridge{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/agent/grpc-external/services/resource/read.go b/agent/grpc-external/services/resource/read.go
deleted file mode 100644
index 351a503856559..0000000000000
--- a/agent/grpc-external/services/resource/read.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-	"errors"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func (s *Server) Read(ctx context.Context, req *pbresource.ReadRequest) (*pbresource.ReadResponse, error) {
-	// Light first pass validation based on what user passed in and not much more.
-	reg, err := s.validateReadRequest(req)
-	if err != nil {
-		return nil, err
-	}
-
-	// acl.EnterpriseMeta acl.AuthorizerContext follow rules for V1 resources since they integrate with the V1 acl subsystem.
-	// pbresource.Tenacy follows rules for V2 resources and the Resource service.
-	// Example:
-	//
-	//    A CE namespace scoped resource:
-	//      V1: EnterpriseMeta{}
-	//      V2: Tenancy {Partition: "default", Namespace: "default"}
-	//
-	//   An ENT namespace scoped resource:
-	//      V1: EnterpriseMeta{Partition: "default", Namespace: "default"}
-	//      V2: Tenancy {Partition: "default", Namespace: "default"}
-	//
-	// It is necessary to convert back and forth depending on which component supports which version, V1 or V2.
-	entMeta := v2TenancyToV1EntMeta(req.Id.Tenancy)
-	authz, authzContext, err := s.getAuthorizer(tokenFromContext(ctx), entMeta)
-	if err != nil {
-		return nil, err
-	}
-
-	v1EntMetaToV2Tenancy(reg, entMeta, req.Id.Tenancy)
-
-	// ACL check usually comes before tenancy existence checks to not leak
-	// tenancy "existence", unless the ACL check requires the data payload
-	// to function.
-	authzNeedsData := false
-	err = reg.ACLs.Read(authz, authzContext, req.Id, nil)
-	switch {
-	case errors.Is(err, resource.ErrNeedData):
-		authzNeedsData = true
-		err = nil
-	case acl.IsErrPermissionDenied(err):
-		return nil, status.Error(codes.PermissionDenied, err.Error())
-	case err != nil:
-		return nil, status.Errorf(codes.Internal, "failed read acl: %v", err)
-	}
-
-	// Check V1 tenancy exists for the V2 resource.
-	if err = v1TenancyExists(reg, s.TenancyBridge, req.Id.Tenancy, codes.NotFound); err != nil {
-		return nil, err
-	}
-
-	resource, err := s.Backend.Read(ctx, readConsistencyFrom(ctx), req.Id)
-	switch {
-	case errors.Is(err, storage.ErrNotFound):
-		return nil, status.Error(codes.NotFound, err.Error())
-	case errors.As(err, &storage.GroupVersionMismatchError{}):
-		return nil, status.Error(codes.InvalidArgument, err.Error())
-	case err != nil:
-		return nil, status.Errorf(codes.Internal, "failed read: %v", err)
-	}
-
-	if authzNeedsData {
-		err = reg.ACLs.Read(authz, authzContext, req.Id, resource)
-		switch {
-		case acl.IsErrPermissionDenied(err):
-			return nil, status.Error(codes.PermissionDenied, err.Error())
-		case err != nil:
-			return nil, status.Errorf(codes.Internal, "failed read acl: %v", err)
-		}
-	}
-
-	return &pbresource.ReadResponse{Resource: resource}, nil
-}
-
-func (s *Server) validateReadRequest(req *pbresource.ReadRequest) (*resource.Registration, error) {
-	if req.Id == nil {
-		return nil, status.Errorf(codes.InvalidArgument, "id is required")
-	}
-
-	if err := validateId(req.Id, "id"); err != nil {
-		return nil, err
-	}
-
-	// Check type exists.
-	reg, err := s.resolveType(req.Id.Type)
-	if err != nil {
-		return nil, err
-	}
-
-	// Check scope
-	if reg.Scope == resource.ScopePartition && req.Id.Tenancy.Namespace != "" {
-		return nil, status.Errorf(
-			codes.InvalidArgument,
-			"partition scoped resource %s cannot have a namespace. got: %s",
-			resource.ToGVK(req.Id.Type),
-			req.Id.Tenancy.Namespace,
-		)
-	}
-	if reg.Scope == resource.ScopeCluster {
-		if req.Id.Tenancy.Partition != "" {
-			return nil, status.Errorf(
-				codes.InvalidArgument,
-				"cluster scoped resource %s cannot have a partition: %s",
-				resource.ToGVK(req.Id.Type),
-				req.Id.Tenancy.Partition,
-			)
-		}
-		if req.Id.Tenancy.Namespace != "" {
-			return nil, status.Errorf(
-				codes.InvalidArgument,
-				"cluster scoped resource %s cannot have a namespace: %s",
-				resource.ToGVK(req.Id.Type),
-				req.Id.Tenancy.Namespace,
-			)
-		}
-	}
-	return reg, nil
-}
diff --git a/agent/grpc-external/services/resource/read_test.go b/agent/grpc-external/services/resource/read_test.go
deleted file mode 100644
index 2601689bc6c4b..0000000000000
--- a/agent/grpc-external/services/resource/read_test.go
+++ /dev/null
@@ -1,361 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-	"fmt"
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/acl/resolver"
-	"github.com/hashicorp/consul/agent/grpc-external/testutils"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/internal/tenancy"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestRead_InputValidation(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-	tenancy.RegisterTypes(server.Registry)
-	demo.RegisterTypes(server.Registry)
-
-	testCases := map[string]func(artistId, recordlabelId, executiveId *pbresource.ID) *pbresource.ID{
-		"no id": func(_, _, _ *pbresource.ID) *pbresource.ID { return nil },
-		"no type": func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-			artistId.Type = nil
-			return artistId
-		},
-		"no name": func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-			artistId.Name = ""
-			return artistId
-		},
-		"partition scope with non-empty namespace": func(_, recordLabelId, _ *pbresource.ID) *pbresource.ID {
-			recordLabelId.Tenancy.Namespace = "ishouldnothaveanamespace"
-			return recordLabelId
-		},
-		"cluster scope with non-empty partition": func(_, _, executiveId *pbresource.ID) *pbresource.ID {
-			executiveId.Tenancy = &pbresource.Tenancy{Partition: resource.DefaultPartitionName}
-			return executiveId
-		},
-		"cluster scope with non-empty namespace": func(_, _, executiveId *pbresource.ID) *pbresource.ID {
-			executiveId.Tenancy = &pbresource.Tenancy{Namespace: resource.DefaultNamespaceName}
-			return executiveId
-		},
-	}
-	for desc, modFn := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
-			require.NoError(t, err)
-
-			executive, err := demo.GenerateV1Executive("MusicMan", "CEO")
-			require.NoError(t, err)
-
-			// Each test case picks which resource to use based on the resource type's scope.
-			req := &pbresource.ReadRequest{Id: modFn(artist.Id, recordLabel.Id, executive.Id)}
-
-			_, err = client.Read(testContext(t), req)
-			require.Error(t, err)
-			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-		})
-	}
-}
-
-func TestRead_TypeNotFound(t *testing.T) {
-	server := NewServer(Config{Registry: resource.NewRegistry()})
-	client := testClient(t, server)
-
-	artist, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	_, err = client.Read(context.Background(), &pbresource.ReadRequest{Id: artist.Id})
-	require.Error(t, err)
-	require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-	require.Contains(t, err.Error(), "resource type demo.v2.Artist not registered")
-}
-
-func TestRead_ResourceNotFound(t *testing.T) {
-	for desc, tc := range readTestCases() {
-		t.Run(desc, func(t *testing.T) {
-			tenancyCases := map[string]func(artistId, recordlabelId *pbresource.ID) *pbresource.ID{
-				"resource not found by name": func(artistId, _ *pbresource.ID) *pbresource.ID {
-					artistId.Name = "bogusname"
-					return artistId
-				},
-				"partition not found when namespace scoped": func(artistId, _ *pbresource.ID) *pbresource.ID {
-					id := clone(artistId)
-					id.Tenancy.Partition = "boguspartition"
-					return id
-				},
-				"namespace not found when namespace scoped": func(artistId, _ *pbresource.ID) *pbresource.ID {
-					id := clone(artistId)
-					id.Tenancy.Namespace = "bogusnamespace"
-					return id
-				},
-				"partition not found when partition scoped": func(_, recordLabelId *pbresource.ID) *pbresource.ID {
-					id := clone(recordLabelId)
-					id.Tenancy.Partition = "boguspartition"
-					return id
-				},
-			}
-			for tenancyDesc, modFn := range tenancyCases {
-				t.Run(tenancyDesc, func(t *testing.T) {
-					server := testServer(t)
-					demo.RegisterTypes(server.Registry)
-					client := testClient(t, server)
-
-					recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
-					require.NoError(t, err)
-					recordLabel, err = server.Backend.WriteCAS(tc.ctx, recordLabel)
-					require.NoError(t, err)
-
-					artist, err := demo.GenerateV2Artist()
-					require.NoError(t, err)
-					artist, err = server.Backend.WriteCAS(tc.ctx, artist)
-					require.NoError(t, err)
-
-					// Each tenancy test case picks which resource to use based on the resource type's scope.
-					_, err = client.Read(tc.ctx, &pbresource.ReadRequest{Id: modFn(artist.Id, recordLabel.Id)})
-					require.Error(t, err)
-					require.Equal(t, codes.NotFound.String(), status.Code(err).String())
-					require.Contains(t, err.Error(), "resource not found")
-				})
-			}
-		})
-	}
-}
-
-func TestRead_GroupVersionMismatch(t *testing.T) {
-	for desc, tc := range readTestCases() {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-
-			demo.RegisterTypes(server.Registry)
-			client := testClient(t, server)
-
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			_, err = server.Backend.WriteCAS(tc.ctx, artist)
-			require.NoError(t, err)
-
-			id := clone(artist.Id)
-			id.Type = demo.TypeV1Artist
-
-			_, err = client.Read(tc.ctx, &pbresource.ReadRequest{Id: id})
-			require.Error(t, err)
-			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-			require.Contains(t, err.Error(), "resource was requested with GroupVersion")
-		})
-	}
-}
-
-func TestRead_Success(t *testing.T) {
-	for desc, tc := range readTestCases() {
-		t.Run(desc, func(t *testing.T) {
-			for tenancyDesc, modFn := range tenancyCases() {
-				t.Run(tenancyDesc, func(t *testing.T) {
-					server := testServer(t)
-					demo.RegisterTypes(server.Registry)
-					client := testClient(t, server)
-
-					recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
-					require.NoError(t, err)
-					recordLabel, err = server.Backend.WriteCAS(tc.ctx, recordLabel)
-					require.NoError(t, err)
-
-					artist, err := demo.GenerateV2Artist()
-					require.NoError(t, err)
-					artist, err = server.Backend.WriteCAS(tc.ctx, artist)
-					require.NoError(t, err)
-
-					// Each tenancy test case picks which resource to use based on the resource type's scope.
-					req := &pbresource.ReadRequest{Id: modFn(artist.Id, recordLabel.Id)}
-					rsp, err := client.Read(tc.ctx, req)
-					require.NoError(t, err)
-
-					switch {
-					case proto.Equal(rsp.Resource.Id.Type, demo.TypeV2Artist):
-						prototest.AssertDeepEqual(t, artist, rsp.Resource)
-					case proto.Equal(rsp.Resource.Id.Type, demo.TypeV1RecordLabel):
-						prototest.AssertDeepEqual(t, recordLabel, rsp.Resource)
-					default:
-						require.Fail(t, "unexpected resource type")
-					}
-				})
-			}
-		})
-	}
-}
-
-func TestRead_VerifyReadConsistencyArg(t *testing.T) {
-	// Uses a mockBackend instead of the inmem Backend to verify the ReadConsistency argument is set correctly.
-	for desc, tc := range readTestCases() {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			mockBackend := NewMockBackend(t)
-			server.Backend = mockBackend
-			demo.RegisterTypes(server.Registry)
-
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			mockBackend.On("Read", mock.Anything, mock.Anything, mock.Anything).Return(artist, nil)
-			client := testClient(t, server)
-
-			rsp, err := client.Read(tc.ctx, &pbresource.ReadRequest{Id: artist.Id})
-			require.NoError(t, err)
-			prototest.AssertDeepEqual(t, artist, rsp.Resource)
-			mockBackend.AssertCalled(t, "Read", mock.Anything, tc.consistency, mock.Anything)
-		})
-	}
-}
-
-// N.B. Uses key ACLs for now. See demo.RegisterTypes()
-func TestRead_ACLs(t *testing.T) {
-	type testCase struct {
-		res          *pbresource.Resource
-		authz        resolver.Result
-		codeNotExist codes.Code
-		codeExists   codes.Code
-	}
-
-	artist, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	label, err := demo.GenerateV1RecordLabel("blink1982")
-	require.NoError(t, err)
-
-	testcases := map[string]testCase{
-		"artist-v1/read hook denied": {
-			res:          artist,
-			authz:        AuthorizerFrom(t, demo.ArtistV1ReadPolicy),
-			codeNotExist: codes.PermissionDenied,
-			codeExists:   codes.PermissionDenied,
-		},
-		"artist-v2/read hook allowed": {
-			res:          artist,
-			authz:        AuthorizerFrom(t, demo.ArtistV2ReadPolicy),
-			codeNotExist: codes.NotFound,
-			codeExists:   codes.OK,
-		},
-		// Labels have the read ACL that requires reading the data.
-		"label-v1/read hook denied": {
-			res:          label,
-			authz:        AuthorizerFrom(t, demo.LabelV1ReadPolicy),
-			codeNotExist: codes.NotFound,
-			codeExists:   codes.PermissionDenied,
-		},
-	}
-
-	adminAuthz := AuthorizerFrom(t, `key_prefix "" { policy = "write" }`)
-
-	idx := 0
-	nextTokenContext := func(t *testing.T) context.Context {
-		// Each query should use a distinct token string to avoid caching so we can
-		// change the behavior each call.
-		token := fmt.Sprintf("token-%d", idx)
-		idx++
-		//nolint:staticcheck
-		return context.WithValue(testContext(t), "x-consul-token", token)
-	}
-
-	for desc, tc := range testcases {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			client := testClient(t, server)
-
-			dr := &dummyACLResolver{
-				result: testutils.ACLsDisabled(t),
-			}
-			server.ACLResolver = dr
-
-			demo.RegisterTypes(server.Registry)
-
-			dr.SetResult(tc.authz)
-			testutil.RunStep(t, "does not exist", func(t *testing.T) {
-				_, err = client.Read(nextTokenContext(t), &pbresource.ReadRequest{Id: tc.res.Id})
-				if tc.codeNotExist == codes.OK {
-					require.NoError(t, err)
-				} else {
-					require.Error(t, err)
-				}
-				require.Equal(t, tc.codeNotExist.String(), status.Code(err).String(), "%v", err)
-			})
-
-			// Create it.
-			dr.SetResult(adminAuthz)
-			_, err = client.Write(nextTokenContext(t), &pbresource.WriteRequest{Resource: tc.res})
-			require.NoError(t, err, "could not write resource")
-
-			dr.SetResult(tc.authz)
-			testutil.RunStep(t, "does exist", func(t *testing.T) {
-				// exercise ACL when the data does exist
-				_, err = client.Read(nextTokenContext(t), &pbresource.ReadRequest{Id: tc.res.Id})
-				if tc.codeExists == codes.OK {
-					require.NoError(t, err)
-				} else {
-					require.Error(t, err)
-				}
-				require.Equal(t, tc.codeExists.String(), status.Code(err).String())
-			})
-		})
-	}
-}
-
-type dummyACLResolver struct {
-	lock   sync.Mutex
-	result resolver.Result
-}
-
-var _ ACLResolver = (*dummyACLResolver)(nil)
-
-func (r *dummyACLResolver) SetResult(result resolver.Result) {
-	r.lock.Lock()
-	defer r.lock.Unlock()
-	r.result = result
-}
-
-func (r *dummyACLResolver) ResolveTokenAndDefaultMeta(string, *acl.EnterpriseMeta, *acl.AuthorizerContext) (resolver.Result, error) {
-	r.lock.Lock()
-	defer r.lock.Unlock()
-	return r.result, nil
-}
-
-type readTestCase struct {
-	consistency storage.ReadConsistency
-	ctx         context.Context
-}
-
-func readTestCases() map[string]readTestCase {
-	return map[string]readTestCase{
-		"eventually consistent read": {
-			consistency: storage.EventualConsistency,
-			ctx:         context.Background(),
-		},
-		"strongly consistent read": {
-			consistency: storage.StrongConsistency,
-			ctx: metadata.NewOutgoingContext(
-				context.Background(),
-				metadata.New(map[string]string{"x-consul-consistency-mode": "consistent"}),
-			),
-		},
-	}
-}
diff --git a/agent/grpc-external/services/resource/server.go b/agent/grpc-external/services/resource/server.go
deleted file mode 100644
index 5fc5a01fafd77..0000000000000
--- a/agent/grpc-external/services/resource/server.go
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-
-	"github.com/hashicorp/go-hclog"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/acl/resolver"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type Server struct {
-	Config
-}
-
-type Config struct {
-	Logger   hclog.Logger
-	Registry Registry
-
-	// Backend is the storage backend that will be used for resource persistence.
-	Backend     Backend
-	ACLResolver ACLResolver
-	// TenancyBridge temporarily allows us to use V1 implementations of
-	// partitions and namespaces until V2 implementations are available.
-	TenancyBridge TenancyBridge
-}
-
-//go:generate mockery --name Registry --inpackage
-type Registry interface {
-	resource.Registry
-}
-
-//go:generate mockery --name Backend --inpackage
-type Backend interface {
-	storage.Backend
-}
-
-//go:generate mockery --name ACLResolver --inpackage
-type ACLResolver interface {
-	ResolveTokenAndDefaultMeta(string, *acl.EnterpriseMeta, *acl.AuthorizerContext) (resolver.Result, error)
-}
-
-//go:generate mockery --name TenancyBridge --inpackage
-type TenancyBridge interface {
-	PartitionExists(partition string) (bool, error)
-	IsPartitionMarkedForDeletion(partition string) (bool, error)
-	NamespaceExists(partition, namespace string) (bool, error)
-	IsNamespaceMarkedForDeletion(partition, namespace string) (bool, error)
-}
-
-func NewServer(cfg Config) *Server {
-	return &Server{cfg}
-}
-
-var _ pbresource.ResourceServiceServer = (*Server)(nil)
-
-func (s *Server) Register(grpcServer *grpc.Server) {
-	pbresource.RegisterResourceServiceServer(grpcServer, s)
-}
-
-// Get token from grpc metadata or AnonymounsTokenId if not found
-func tokenFromContext(ctx context.Context) string {
-	md, ok := metadata.FromIncomingContext(ctx)
-	if !ok {
-		return acl.AnonymousTokenID
-	}
-
-	vals := md.Get("x-consul-token")
-	if len(vals) == 0 {
-		return acl.AnonymousTokenID
-	}
-	return vals[0]
-}
-
-func (s *Server) resolveType(typ *pbresource.Type) (*resource.Registration, error) {
-	v, ok := s.Registry.Resolve(typ)
-	if ok {
-		return &v, nil
-	}
-	return nil, status.Errorf(
-		codes.InvalidArgument,
-		"resource type %s not registered", resource.ToGVK(typ),
-	)
-}
-
-func readConsistencyFrom(ctx context.Context) storage.ReadConsistency {
-	md, ok := metadata.FromIncomingContext(ctx)
-	if !ok {
-		return storage.EventualConsistency
-	}
-
-	vals := md.Get("x-consul-consistency-mode")
-	if len(vals) == 0 {
-		return storage.EventualConsistency
-	}
-
-	if vals[0] == "consistent" {
-		return storage.StrongConsistency
-	}
-	return storage.EventualConsistency
-}
-
-func (s *Server) getAuthorizer(token string, entMeta *acl.EnterpriseMeta) (acl.Authorizer, *acl.AuthorizerContext, error) {
-	authzContext := &acl.AuthorizerContext{}
-	authz, err := s.ACLResolver.ResolveTokenAndDefaultMeta(token, entMeta, authzContext)
-	if err != nil {
-		return nil, nil, status.Errorf(codes.Internal, "failed getting authorizer: %v", err)
-	}
-	return authz, authzContext, nil
-}
-
-func isGRPCStatusError(err error) bool {
-	if err == nil {
-		return false
-	}
-	_, ok := status.FromError(err)
-	return ok
-}
-
-func validateId(id *pbresource.ID, errorPrefix string) error {
-	var field string
-	switch {
-	case id.Type == nil:
-		field = "type"
-	case id.Name == "":
-		field = "name"
-	}
-
-	if field != "" {
-		return status.Errorf(codes.InvalidArgument, "%s.%s is required", errorPrefix, field)
-	}
-
-	// Better UX: Allow callers to pass in nil tenancy.  Defaulting and inheritance of tenancy
-	// from the request token will take place further down in the call flow.
-	if id.Tenancy == nil {
-		id.Tenancy = &pbresource.Tenancy{
-			Partition: "",
-			Namespace: "",
-			// TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy
-			PeerName: "local",
-		}
-	}
-
-	resource.Normalize(id.Tenancy)
-
-	return nil
-}
-
-// v1TenancyExists return an error with the passed in gRPC status code when tenancy partition or namespace do not exist.
-func v1TenancyExists(reg *resource.Registration, v1Bridge TenancyBridge, tenancy *pbresource.Tenancy, errCode codes.Code) error {
-	if reg.Scope == resource.ScopePartition || reg.Scope == resource.ScopeNamespace {
-		exists, err := v1Bridge.PartitionExists(tenancy.Partition)
-		switch {
-		case err != nil:
-			return err
-		case !exists:
-			return status.Errorf(errCode, "partition resource not found: %v", tenancy.Partition)
-		}
-	}
-
-	if reg.Scope == resource.ScopeNamespace {
-		exists, err := v1Bridge.NamespaceExists(tenancy.Partition, tenancy.Namespace)
-		switch {
-		case err != nil:
-			return err
-		case !exists:
-			return status.Errorf(errCode, "namespace resource not found: %v", tenancy.Namespace)
-		}
-	}
-	return nil
-}
-
-// v1TenancyMarkedForDeletion returns a gRPC InvalidArgument when either partition or namespace is marked for deletion.
-func v1TenancyMarkedForDeletion(reg *resource.Registration, v1Bridge TenancyBridge, tenancy *pbresource.Tenancy) error {
-	if reg.Scope == resource.ScopePartition || reg.Scope == resource.ScopeNamespace {
-		marked, err := v1Bridge.IsPartitionMarkedForDeletion(tenancy.Partition)
-		switch {
-		case err != nil:
-			return err
-		case marked:
-			return status.Errorf(codes.InvalidArgument, "partition marked for deletion: %v", tenancy.Partition)
-		}
-	}
-
-	if reg.Scope == resource.ScopeNamespace {
-		marked, err := v1Bridge.IsNamespaceMarkedForDeletion(tenancy.Partition, tenancy.Namespace)
-		switch {
-		case err != nil:
-			return err
-		case marked:
-			return status.Errorf(codes.InvalidArgument, "namespace marked for deletion: %v", tenancy.Namespace)
-		}
-	}
-	return nil
-}
-
-func clone[T proto.Message](v T) T { return proto.Clone(v).(T) }
diff --git a/agent/grpc-external/services/resource/server_ce.go b/agent/grpc-external/services/resource/server_ce.go
deleted file mode 100644
index bc48194574131..0000000000000
--- a/agent/grpc-external/services/resource/server_ce.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package resource
-
-import (
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func v2TenancyToV1EntMeta(tenancy *pbresource.Tenancy) *acl.EnterpriseMeta {
-	return acl.DefaultEnterpriseMeta()
-}
-
-func v1EntMetaToV2Tenancy(reg *resource.Registration, entMeta *acl.EnterpriseMeta, tenancy *pbresource.Tenancy) {
-	if (reg.Scope == resource.ScopeNamespace || reg.Scope == resource.ScopePartition) && tenancy.Partition == "" {
-		tenancy.Partition = entMeta.PartitionOrDefault()
-	}
-
-	if reg.Scope == resource.ScopeNamespace && tenancy.Namespace == "" {
-		tenancy.Namespace = entMeta.NamespaceOrDefault()
-	}
-}
diff --git a/agent/grpc-external/services/resource/server_ce_test.go b/agent/grpc-external/services/resource/server_ce_test.go
deleted file mode 100644
index c385b65f3ceb4..0000000000000
--- a/agent/grpc-external/services/resource/server_ce_test.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package resource
-
-import "github.com/hashicorp/consul/acl"
-
-func fillEntMeta(entMeta *acl.EnterpriseMeta) {
-	return
-}
-
-func fillAuthorizerContext(authzContext *acl.AuthorizerContext) {
-	return
-}
diff --git a/agent/grpc-external/services/resource/server_test.go b/agent/grpc-external/services/resource/server_test.go
deleted file mode 100644
index 99add64971218..0000000000000
--- a/agent/grpc-external/services/resource/server_test.go
+++ /dev/null
@@ -1,274 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/go-uuid"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/acl/resolver"
-	"github.com/hashicorp/consul/agent/grpc-external/testutils"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/internal/storage/inmem"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbdemov2 "github.com/hashicorp/consul/proto/private/pbdemo/v2"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func randomACLIdentity(t *testing.T) structs.ACLIdentity {
-	id, err := uuid.GenerateUUID()
-	require.NoError(t, err)
-
-	return &structs.ACLToken{AccessorID: id}
-}
-
-func AuthorizerFrom(t *testing.T, policyStrs ...string) resolver.Result {
-	policies := []*acl.Policy{}
-	for _, policyStr := range policyStrs {
-		policy, err := acl.NewPolicyFromSource(policyStr, nil, nil)
-		require.NoError(t, err)
-		policies = append(policies, policy)
-	}
-
-	authz, err := acl.NewPolicyAuthorizerWithDefaults(acl.DenyAll(), policies, nil)
-	require.NoError(t, err)
-
-	return resolver.Result{
-		Authorizer:  authz,
-		ACLIdentity: randomACLIdentity(t),
-	}
-}
-
-func testServer(t *testing.T) *Server {
-	t.Helper()
-
-	backend, err := inmem.NewBackend()
-	require.NoError(t, err)
-	go backend.Run(testContext(t))
-
-	// Mock the ACL Resolver to "allow all" for testing.
-	mockACLResolver := &MockACLResolver{}
-	mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
-		Return(testutils.ACLsDisabled(t), nil).
-		Run(func(args mock.Arguments) {
-			// Caller expecting passed in tokenEntMeta and authorizerContext to be filled in.
-			tokenEntMeta := args.Get(1).(*acl.EnterpriseMeta)
-			if tokenEntMeta != nil {
-				fillEntMeta(tokenEntMeta)
-			}
-
-			authzContext := args.Get(2).(*acl.AuthorizerContext)
-			if authzContext != nil {
-				fillAuthorizerContext(authzContext)
-			}
-		})
-
-	// Mock the V1 tenancy bridge since we can't use the real thing.
-	mockTenancyBridge := &MockTenancyBridge{}
-	mockTenancyBridge.On("PartitionExists", resource.DefaultPartitionName).Return(true, nil)
-	mockTenancyBridge.On("NamespaceExists", resource.DefaultPartitionName, resource.DefaultNamespaceName).Return(true, nil)
-	mockTenancyBridge.On("PartitionExists", mock.Anything).Return(false, nil)
-	mockTenancyBridge.On("NamespaceExists", mock.Anything, mock.Anything).Return(false, nil)
-	mockTenancyBridge.On("IsPartitionMarkedForDeletion", resource.DefaultPartitionName).Return(false, nil)
-	mockTenancyBridge.On("IsNamespaceMarkedForDeletion", resource.DefaultPartitionName, resource.DefaultNamespaceName).Return(false, nil)
-
-	return NewServer(Config{
-		Logger:        testutil.Logger(t),
-		Registry:      resource.NewRegistry(),
-		Backend:       backend,
-		ACLResolver:   mockACLResolver,
-		TenancyBridge: mockTenancyBridge,
-	})
-}
-
-func testClient(t *testing.T, server *Server) pbresource.ResourceServiceClient {
-	t.Helper()
-
-	addr := testutils.RunTestServer(t, server)
-
-	//nolint:staticcheck
-	conn, err := grpc.DialContext(context.Background(), addr.String(), grpc.WithInsecure())
-	require.NoError(t, err)
-	t.Cleanup(func() {
-		require.NoError(t, conn.Close())
-	})
-
-	return pbresource.NewResourceServiceClient(conn)
-}
-
-func testContext(t *testing.T) context.Context {
-	t.Helper()
-
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-	return ctx
-}
-
-func modifyArtist(t *testing.T, res *pbresource.Resource) *pbresource.Resource {
-	t.Helper()
-
-	var artist pbdemov2.Artist
-	require.NoError(t, res.Data.UnmarshalTo(&artist))
-	artist.Name = fmt.Sprintf("The artist formerly known as %s", artist.Name)
-
-	data, err := anypb.New(&artist)
-	require.NoError(t, err)
-
-	res = clone(res)
-	res.Data = data
-	return res
-}
-
-// wildcardTenancyCases returns permutations of tenancy and type scope used as input
-// to endpoints that accept wildcards for tenancy.
-func wildcardTenancyCases() map[string]struct {
-	typ     *pbresource.Type
-	tenancy *pbresource.Tenancy
-} {
-	return map[string]struct {
-		typ     *pbresource.Type
-		tenancy *pbresource.Tenancy
-	}{
-		"namespaced type with empty partition": {
-			typ: demo.TypeV2Artist,
-			tenancy: &pbresource.Tenancy{
-				Partition: "",
-				Namespace: resource.DefaultNamespaceName,
-				PeerName:  "local",
-			},
-		},
-		"namespaced type with empty namespace": {
-			typ: demo.TypeV2Artist,
-			tenancy: &pbresource.Tenancy{
-				Partition: resource.DefaultPartitionName,
-				Namespace: "",
-				PeerName:  "local",
-			},
-		},
-		"namespaced type with empty partition and namespace": {
-			typ: demo.TypeV2Artist,
-			tenancy: &pbresource.Tenancy{
-				Partition: "",
-				Namespace: "",
-				PeerName:  "local",
-			},
-		},
-		"namespaced type with uppercase partition and namespace": {
-			typ: demo.TypeV2Artist,
-			tenancy: &pbresource.Tenancy{
-				Partition: "DEFAULT",
-				Namespace: "DEFAULT",
-				PeerName:  "local",
-			},
-		},
-		"namespaced type with wildcard partition and empty namespace": {
-			typ: demo.TypeV2Artist,
-			tenancy: &pbresource.Tenancy{
-				Partition: "*",
-				Namespace: "",
-				PeerName:  "local",
-			},
-		},
-		"namespaced type with empty partition and wildcard namespace": {
-			typ: demo.TypeV2Artist,
-			tenancy: &pbresource.Tenancy{
-				Partition: "",
-				Namespace: "*",
-				PeerName:  "local",
-			},
-		},
-		"partitioned type with empty partition": {
-			typ: demo.TypeV1RecordLabel,
-			tenancy: &pbresource.Tenancy{
-				Partition: "",
-				Namespace: "",
-				PeerName:  "local",
-			},
-		},
-		"partitioned type with uppercase partition": {
-			typ: demo.TypeV1RecordLabel,
-			tenancy: &pbresource.Tenancy{
-				Partition: "DEFAULT",
-				Namespace: "",
-				PeerName:  "local",
-			},
-		},
-		"partitioned type with wildcard partition": {
-			typ: demo.TypeV1RecordLabel,
-			tenancy: &pbresource.Tenancy{
-				Partition: "*",
-				PeerName:  "local",
-			},
-		},
-	}
-}
-
-// tenancyCases returns permutations of valid tenancy structs in a resource id to use as inputs.
-// - the id is for a recordLabel when the resource is partition scoped
-// - the id is for an artist when the resource is namespace scoped
-func tenancyCases() map[string]func(artistId, recordlabelId *pbresource.ID) *pbresource.ID {
-	tenancyCases := map[string]func(artistId, recordlabelId *pbresource.ID) *pbresource.ID{
-		"namespaced resource provides nonempty partition and namespace": func(artistId, recordLabelId *pbresource.ID) *pbresource.ID {
-			return artistId
-		},
-		"namespaced resource provides uppercase partition and namespace": func(artistId, _ *pbresource.ID) *pbresource.ID {
-			id := clone(artistId)
-			id.Tenancy.Partition = strings.ToUpper(artistId.Tenancy.Partition)
-			id.Tenancy.Namespace = strings.ToUpper(artistId.Tenancy.Namespace)
-			return id
-		},
-		"namespaced resource inherits tokens partition when empty": func(artistId, _ *pbresource.ID) *pbresource.ID {
-			id := clone(artistId)
-			id.Tenancy.Partition = ""
-			return id
-		},
-		"namespaced resource inherits tokens namespace when empty": func(artistId, _ *pbresource.ID) *pbresource.ID {
-			id := clone(artistId)
-			id.Tenancy.Namespace = ""
-			return id
-		},
-		"namespaced resource inherits tokens partition and namespace when empty": func(artistId, _ *pbresource.ID) *pbresource.ID {
-			id := clone(artistId)
-			id.Tenancy.Partition = ""
-			id.Tenancy.Namespace = ""
-			return id
-		},
-		"namespaced resource inherits tokens partition and namespace when tenacy nil": func(artistId, _ *pbresource.ID) *pbresource.ID {
-			id := clone(artistId)
-			id.Tenancy = nil
-			return id
-		},
-		"partitioned resource provides nonempty partition": func(_, recordLabelId *pbresource.ID) *pbresource.ID {
-			return recordLabelId
-		},
-		"partitioned resource provides uppercase partition": func(_, recordLabelId *pbresource.ID) *pbresource.ID {
-			id := clone(recordLabelId)
-			id.Tenancy.Partition = strings.ToUpper(recordLabelId.Tenancy.Partition)
-			return id
-		},
-		"partitioned resource inherits tokens partition when empty": func(_, recordLabelId *pbresource.ID) *pbresource.ID {
-			id := clone(recordLabelId)
-			id.Tenancy.Partition = ""
-			return id
-		},
-		"partitioned resource inherits tokens partition when tenancy nil": func(_, recordLabelId *pbresource.ID) *pbresource.ID {
-			id := clone(recordLabelId)
-			id.Tenancy = nil
-			return id
-		},
-	}
-	return tenancyCases
-}
diff --git a/agent/grpc-external/services/resource/testing/testing.go b/agent/grpc-external/services/resource/testing/testing.go
deleted file mode 100644
index 16eedd3a966cb..0000000000000
--- a/agent/grpc-external/services/resource/testing/testing.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package testing
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-
-	"github.com/hashicorp/go-uuid"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/acl/resolver"
-	svc "github.com/hashicorp/consul/agent/grpc-external/services/resource"
-	"github.com/hashicorp/consul/agent/grpc-external/testutils"
-	internal "github.com/hashicorp/consul/agent/grpc-internal"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage/inmem"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func randomACLIdentity(t *testing.T) structs.ACLIdentity {
-	id, err := uuid.GenerateUUID()
-	require.NoError(t, err)
-
-	return &structs.ACLToken{AccessorID: id}
-}
-
-func AuthorizerFrom(t *testing.T, policyStrs ...string) resolver.Result {
-	policies := []*acl.Policy{}
-	for _, policyStr := range policyStrs {
-		policy, err := acl.NewPolicyFromSource(policyStr, nil, nil)
-		require.NoError(t, err)
-		policies = append(policies, policy)
-	}
-
-	authz, err := acl.NewPolicyAuthorizerWithDefaults(acl.DenyAll(), policies, nil)
-	require.NoError(t, err)
-
-	return resolver.Result{
-		Authorizer:  authz,
-		ACLIdentity: randomACLIdentity(t),
-	}
-}
-
-// RunResourceService runs a Resource Service for the duration of the test and
-// returns a client to interact with it. ACLs will be disabled and only the
-// default partition and namespace are available.
-func RunResourceService(t *testing.T, registerFns ...func(resource.Registry)) pbresource.ResourceServiceClient {
-	return RunResourceServiceWithConfig(t, svc.Config{}, registerFns...)
-}
-
-// RunResourceServiceWithConfig runs a ResourceService with caller injectable config to ease mocking dependencies.
-// Any nil config field is replaced with a reasonable default with the following behavior:
-//
-// config.Backend - cannot be configured and must be nil
-// config.Registry - empty registry
-// config.TenancyBridge - mock provided with only the default partition and namespace
-// config.ACLResolver - mock provided with ACLs disabled. Fills entMeta and authzContext with default partition and namespace
-func RunResourceServiceWithConfig(t *testing.T, config svc.Config, registerFns ...func(resource.Registry)) pbresource.ResourceServiceClient {
-	t.Helper()
-
-	if config.Backend != nil {
-		panic("backend can not be configured")
-	}
-
-	backend, err := inmem.NewBackend()
-	require.NoError(t, err)
-
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-	go backend.Run(ctx)
-	config.Backend = backend
-
-	if config.Registry == nil {
-		config.Registry = resource.NewRegistry()
-	}
-
-	for _, fn := range registerFns {
-		fn(config.Registry)
-	}
-
-	server := grpc.NewServer()
-
-	if config.TenancyBridge == nil {
-		mockTenancyBridge := &svc.MockTenancyBridge{}
-		mockTenancyBridge.On("PartitionExists", resource.DefaultPartitionName).Return(true, nil)
-		mockTenancyBridge.On("NamespaceExists", resource.DefaultPartitionName, resource.DefaultNamespaceName).Return(true, nil)
-		mockTenancyBridge.On("IsPartitionMarkedForDeletion", resource.DefaultPartitionName).Return(false, nil)
-		mockTenancyBridge.On("IsNamespaceMarkedForDeletion", resource.DefaultPartitionName, resource.DefaultNamespaceName).Return(false, nil)
-		config.TenancyBridge = mockTenancyBridge
-	}
-
-	if config.ACLResolver == nil {
-		// Provide a resolver which will default partition and namespace when not provided. This is similar to user
-		// initiated requests.
-		//
-		// Controllers under test should be providing full tenancy since they will run with the DANGER_NO_AUTH.
-		mockACLResolver := &svc.MockACLResolver{}
-		mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
-			Return(testutils.ACLsDisabled(t), nil).
-			Run(func(args mock.Arguments) {
-				// Caller expecting passed in tokenEntMeta and authorizerContext to be filled in.
-				tokenEntMeta := args.Get(1).(*acl.EnterpriseMeta)
-				if tokenEntMeta != nil {
-					FillEntMeta(tokenEntMeta)
-				}
-
-				authzContext := args.Get(2).(*acl.AuthorizerContext)
-				if authzContext != nil {
-					FillAuthorizerContext(authzContext)
-				}
-			})
-		config.ACLResolver = mockACLResolver
-	}
-
-	if config.Logger == nil {
-		config.Logger = testutil.Logger(t)
-	}
-
-	svc.NewServer(config).Register(server)
-
-	pipe := internal.NewPipeListener()
-	go server.Serve(pipe)
-	t.Cleanup(server.Stop)
-
-	conn, err := grpc.Dial("",
-		grpc.WithTransportCredentials(insecure.NewCredentials()),
-		grpc.WithContextDialer(pipe.DialContext),
-		grpc.WithBlock(),
-	)
-	require.NoError(t, err)
-	t.Cleanup(func() { _ = conn.Close() })
-
-	return pbresource.NewResourceServiceClient(conn)
-}
diff --git a/agent/grpc-external/services/resource/testing/testing_ce.go b/agent/grpc-external/services/resource/testing/testing_ce.go
deleted file mode 100644
index 023fa5189cccc..0000000000000
--- a/agent/grpc-external/services/resource/testing/testing_ce.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package testing
-
-import (
-	"github.com/hashicorp/consul/acl"
-)
-
-func FillEntMeta(entMeta *acl.EnterpriseMeta) {
-	// nothing to to in CE.
-}
-
-func FillAuthorizerContext(authzContext *acl.AuthorizerContext) {
-	// nothing to to in CE.
-}
diff --git a/agent/grpc-external/services/resource/watch.go b/agent/grpc-external/services/resource/watch.go
deleted file mode 100644
index f20d3f00f875a..0000000000000
--- a/agent/grpc-external/services/resource/watch.go
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"errors"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func (s *Server) WatchList(req *pbresource.WatchListRequest, stream pbresource.ResourceService_WatchListServer) error {
-	reg, err := s.validateWatchListRequest(req)
-	if err != nil {
-		return err
-	}
-
-	// v1 ACL subsystem is "wildcard" aware so just pass on through.
-	entMeta := v2TenancyToV1EntMeta(req.Tenancy)
-	token := tokenFromContext(stream.Context())
-	authz, authzContext, err := s.getAuthorizer(token, entMeta)
-	if err != nil {
-		return err
-	}
-
-	// Check list ACL.
-	err = reg.ACLs.List(authz, authzContext)
-	switch {
-	case acl.IsErrPermissionDenied(err):
-		return status.Error(codes.PermissionDenied, err.Error())
-	case err != nil:
-		return status.Errorf(codes.Internal, "failed list acl: %v", err)
-	}
-
-	// Ensure we're defaulting correctly when request tenancy units are empty.
-	v1EntMetaToV2Tenancy(reg, entMeta, req.Tenancy)
-
-	unversionedType := storage.UnversionedTypeFrom(req.Type)
-	watch, err := s.Backend.WatchList(
-		stream.Context(),
-		unversionedType,
-		req.Tenancy,
-		req.NamePrefix,
-	)
-	if err != nil {
-		return err
-	}
-	defer watch.Close()
-
-	for {
-		event, err := watch.Next(stream.Context())
-		switch {
-		case errors.Is(err, storage.ErrWatchClosed):
-			return status.Error(codes.Aborted, "watch closed by the storage backend (possibly due to snapshot restoration)")
-		case err != nil:
-			return status.Errorf(codes.Internal, "failed next: %v", err)
-		}
-
-		// drop group versions that don't match
-		if event.Resource.Id.Type.GroupVersion != req.Type.GroupVersion {
-			continue
-		}
-
-		// Need to rebuild authorizer per resource since wildcard inputs may
-		// result in different tenancies. Consider caching per tenancy if this
-		// is deemed expensive.
-		entMeta = v2TenancyToV1EntMeta(event.Resource.Id.Tenancy)
-		authz, authzContext, err = s.getAuthorizer(token, entMeta)
-		if err != nil {
-			return err
-		}
-
-		// filter out items that don't pass read ACLs
-		err = reg.ACLs.Read(authz, authzContext, event.Resource.Id, event.Resource)
-		switch {
-		case acl.IsErrPermissionDenied(err):
-			continue
-		case err != nil:
-			return status.Errorf(codes.Internal, "failed read acl: %v", err)
-		}
-
-		if err = stream.Send(event); err != nil {
-			return err
-		}
-	}
-}
-
-func (s *Server) validateWatchListRequest(req *pbresource.WatchListRequest) (*resource.Registration, error) {
-	var field string
-	switch {
-	case req.Type == nil:
-		field = "type"
-	case req.Tenancy == nil:
-		field = "tenancy"
-	}
-
-	if field != "" {
-		return nil, status.Errorf(codes.InvalidArgument, "%s is required", field)
-	}
-
-	// Check type exists.
-	reg, err := s.resolveType(req.Type)
-	if err != nil {
-		return nil, err
-	}
-
-	// Lowercase
-	resource.Normalize(req.Tenancy)
-
-	// Error when partition scoped and namespace not empty.
-	if reg.Scope == resource.ScopePartition && req.Tenancy.Namespace != "" {
-		return nil, status.Errorf(
-			codes.InvalidArgument,
-			"partition scoped type %s cannot have a namespace. got: %s",
-			resource.ToGVK(req.Type),
-			req.Tenancy.Namespace,
-		)
-	}
-
-	return reg, nil
-}
diff --git a/agent/grpc-external/services/resource/watch_test.go b/agent/grpc-external/services/resource/watch_test.go
deleted file mode 100644
index 051264441bbc8..0000000000000
--- a/agent/grpc-external/services/resource/watch_test.go
+++ /dev/null
@@ -1,345 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-	"errors"
-	"io"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/grpc-external/testutils"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
-)
-
-func TestWatchList_InputValidation(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	testCases := map[string]func(*pbresource.WatchListRequest){
-		"no type":    func(req *pbresource.WatchListRequest) { req.Type = nil },
-		"no tenancy": func(req *pbresource.WatchListRequest) { req.Tenancy = nil },
-		"partitioned type provides non-empty namespace": func(req *pbresource.WatchListRequest) {
-			req.Type = demo.TypeV1RecordLabel
-			req.Tenancy.Namespace = "bad"
-		},
-	}
-	for desc, modFn := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			req := &pbresource.WatchListRequest{
-				Type:    demo.TypeV2Album,
-				Tenancy: resource.DefaultNamespacedTenancy(),
-			}
-			modFn(req)
-
-			stream, err := client.WatchList(testContext(t), req)
-			require.NoError(t, err)
-
-			_, err = stream.Recv()
-			require.Error(t, err)
-			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-		})
-	}
-}
-
-func TestWatchList_TypeNotFound(t *testing.T) {
-	t.Parallel()
-
-	server := testServer(t)
-	client := testClient(t, server)
-
-	stream, err := client.WatchList(context.Background(), &pbresource.WatchListRequest{
-		Type:       demo.TypeV2Artist,
-		Tenancy:    resource.DefaultNamespacedTenancy(),
-		NamePrefix: "",
-	})
-	require.NoError(t, err)
-	rspCh := handleResourceStream(t, stream)
-
-	err = mustGetError(t, rspCh)
-	require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-	require.Contains(t, err.Error(), "resource type demo.v2.Artist not registered")
-}
-
-func TestWatchList_GroupVersionMatches(t *testing.T) {
-	t.Parallel()
-
-	server := testServer(t)
-	client := testClient(t, server)
-	demo.RegisterTypes(server.Registry)
-	ctx := context.Background()
-
-	// create a watch
-	stream, err := client.WatchList(ctx, &pbresource.WatchListRequest{
-		Type:       demo.TypeV2Artist,
-		Tenancy:    resource.DefaultNamespacedTenancy(),
-		NamePrefix: "",
-	})
-	require.NoError(t, err)
-	rspCh := handleResourceStream(t, stream)
-
-	artist, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	// insert and verify upsert event received
-	r1, err := server.Backend.WriteCAS(ctx, artist)
-	require.NoError(t, err)
-	rsp := mustGetResource(t, rspCh)
-	require.Equal(t, pbresource.WatchEvent_OPERATION_UPSERT, rsp.Operation)
-	prototest.AssertDeepEqual(t, r1, rsp.Resource)
-
-	// update and verify upsert event received
-	r2 := modifyArtist(t, r1)
-	r2, err = server.Backend.WriteCAS(ctx, r2)
-	require.NoError(t, err)
-	rsp = mustGetResource(t, rspCh)
-	require.Equal(t, pbresource.WatchEvent_OPERATION_UPSERT, rsp.Operation)
-	prototest.AssertDeepEqual(t, r2, rsp.Resource)
-
-	// delete and verify delete event received
-	err = server.Backend.DeleteCAS(ctx, r2.Id, r2.Version)
-	require.NoError(t, err)
-	rsp = mustGetResource(t, rspCh)
-	require.Equal(t, pbresource.WatchEvent_OPERATION_DELETE, rsp.Operation)
-}
-
-func TestWatchList_Tenancy_Defaults_And_Normalization(t *testing.T) {
-	// Test units of tenancy get lowercased and defaulted correctly when empty.
-	for desc, tc := range wildcardTenancyCases() {
-		t.Run(desc, func(t *testing.T) {
-			ctx := context.Background()
-			server := testServer(t)
-			client := testClient(t, server)
-			demo.RegisterTypes(server.Registry)
-
-			// Create a watch.
-			stream, err := client.WatchList(ctx, &pbresource.WatchListRequest{
-				Type:       tc.typ,
-				Tenancy:    tc.tenancy,
-				NamePrefix: "",
-			})
-			require.NoError(t, err)
-			rspCh := handleResourceStream(t, stream)
-
-			// Testcase will pick one of recordLabel or artist based on scope of type.
-			recordLabel, err := demo.GenerateV1RecordLabel("LooneyTunes")
-			require.NoError(t, err)
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			// Create and verify upsert event received.
-			recordLabel, err = server.Backend.WriteCAS(ctx, recordLabel)
-			require.NoError(t, err)
-			artist, err = server.Backend.WriteCAS(ctx, artist)
-			require.NoError(t, err)
-
-			var expected *pbresource.Resource
-			switch {
-			case proto.Equal(tc.typ, demo.TypeV1RecordLabel):
-				expected = recordLabel
-			case proto.Equal(tc.typ, demo.TypeV2Artist):
-				expected = artist
-			default:
-				require.Fail(t, "unsupported type", tc.typ)
-			}
-
-			rsp := mustGetResource(t, rspCh)
-			require.Equal(t, pbresource.WatchEvent_OPERATION_UPSERT, rsp.Operation)
-			prototest.AssertDeepEqual(t, expected, rsp.Resource)
-		})
-
-	}
-}
-
-func TestWatchList_GroupVersionMismatch(t *testing.T) {
-	// Given a watch on TypeArtistV1 that only differs from TypeArtistV2 by GroupVersion
-	// When a resource of TypeArtistV2 is created/updated/deleted
-	// Then no watch events should be emitted
-	t.Parallel()
-
-	server := testServer(t)
-	demo.RegisterTypes(server.Registry)
-	client := testClient(t, server)
-	ctx := context.Background()
-
-	// create a watch for TypeArtistV1
-	stream, err := client.WatchList(ctx, &pbresource.WatchListRequest{
-		Type:       demo.TypeV1Artist,
-		Tenancy:    resource.DefaultNamespacedTenancy(),
-		NamePrefix: "",
-	})
-	require.NoError(t, err)
-	rspCh := handleResourceStream(t, stream)
-
-	artist, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	// insert
-	r1, err := server.Backend.WriteCAS(ctx, artist)
-	require.NoError(t, err)
-
-	// update
-	r2 := clone(r1)
-	r2, err = server.Backend.WriteCAS(ctx, r2)
-	require.NoError(t, err)
-
-	// delete
-	err = server.Backend.DeleteCAS(ctx, r2.Id, r2.Version)
-	require.NoError(t, err)
-
-	// verify no events received
-	mustGetNoResource(t, rspCh)
-}
-
-// N.B. Uses key ACLs for now. See demo.RegisterTypes()
-func TestWatchList_ACL_ListDenied(t *testing.T) {
-	t.Parallel()
-
-	// deny all
-	rspCh, _ := roundTripACL(t, testutils.ACLNoPermissions(t))
-
-	// verify key:list denied
-	err := mustGetError(t, rspCh)
-	require.Error(t, err)
-	require.Equal(t, codes.PermissionDenied.String(), status.Code(err).String())
-	require.Contains(t, err.Error(), "lacks permission 'key:list'")
-}
-
-// N.B. Uses key ACLs for now. See demo.RegisterTypes()
-func TestWatchList_ACL_ListAllowed_ReadDenied(t *testing.T) {
-	t.Parallel()
-
-	// allow list, deny read
-	authz := AuthorizerFrom(t, `
-		key_prefix "resource/" { policy = "list" }
-		key_prefix "resource/demo.v2.Artist/" { policy = "deny" }
-		`)
-	rspCh, _ := roundTripACL(t, authz)
-
-	// verify resource filtered out by key:read denied, hence no events
-	mustGetNoResource(t, rspCh)
-}
-
-// N.B. Uses key ACLs for now. See demo.RegisterTypes()
-func TestWatchList_ACL_ListAllowed_ReadAllowed(t *testing.T) {
-	t.Parallel()
-
-	// allow list, allow read
-	authz := AuthorizerFrom(t, `
-		key_prefix "resource/" { policy = "list" }
-		key_prefix "resource/demo.v2.Artist/" { policy = "read" }
-	`)
-	rspCh, artist := roundTripACL(t, authz)
-
-	// verify resource not filtered out by acl
-	event := mustGetResource(t, rspCh)
-	prototest.AssertDeepEqual(t, artist, event.Resource)
-}
-
-// roundtrip a WatchList which attempts to stream back a single write event
-func roundTripACL(t *testing.T, authz acl.Authorizer) (<-chan resourceOrError, *pbresource.Resource) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	mockACLResolver := &MockACLResolver{}
-	mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
-		Return(authz, nil)
-	server.ACLResolver = mockACLResolver
-	demo.RegisterTypes(server.Registry)
-
-	artist, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	stream, err := client.WatchList(testContext(t), &pbresource.WatchListRequest{
-		Type:       artist.Id.Type,
-		Tenancy:    artist.Id.Tenancy,
-		NamePrefix: "",
-	})
-	require.NoError(t, err)
-	rspCh := handleResourceStream(t, stream)
-
-	// induce single watch event
-	artist, err = server.Backend.WriteCAS(context.Background(), artist)
-	require.NoError(t, err)
-
-	// caller to make assertions on the rspCh and written artist
-	return rspCh, artist
-}
-
-func mustGetNoResource(t *testing.T, ch <-chan resourceOrError) {
-	t.Helper()
-
-	select {
-	case rsp := <-ch:
-		require.NoError(t, rsp.err)
-		require.Nil(t, rsp.rsp, "expected nil response with no error")
-	case <-time.After(250 * time.Millisecond):
-		return
-	}
-}
-
-func mustGetResource(t *testing.T, ch <-chan resourceOrError) *pbresource.WatchEvent {
-	t.Helper()
-
-	select {
-	case rsp := <-ch:
-		require.NoError(t, rsp.err)
-		return rsp.rsp
-	case <-time.After(1 * time.Second):
-		t.Fatal("timeout waiting for WatchListResponse")
-		return nil
-	}
-}
-
-func mustGetError(t *testing.T, ch <-chan resourceOrError) error {
-	t.Helper()
-
-	select {
-	case rsp := <-ch:
-		require.Error(t, rsp.err)
-		return rsp.err
-	case <-time.After(2 * time.Second):
-		t.Fatal("timeout waiting for WatchListResponse")
-		return nil
-	}
-}
-
-func handleResourceStream(t *testing.T, stream pbresource.ResourceService_WatchListClient) <-chan resourceOrError {
-	t.Helper()
-
-	rspCh := make(chan resourceOrError)
-	go func() {
-		for {
-			rsp, err := stream.Recv()
-			if errors.Is(err, io.EOF) ||
-				errors.Is(err, context.Canceled) ||
-				errors.Is(err, context.DeadlineExceeded) {
-				return
-			}
-			rspCh <- resourceOrError{
-				rsp: rsp,
-				err: err,
-			}
-		}
-	}()
-	return rspCh
-}
-
-type resourceOrError struct {
-	rsp *pbresource.WatchEvent
-	err error
-}
diff --git a/agent/grpc-external/services/resource/write.go b/agent/grpc-external/services/resource/write.go
deleted file mode 100644
index 7110122313fa3..0000000000000
--- a/agent/grpc-external/services/resource/write.go
+++ /dev/null
@@ -1,308 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-	"errors"
-	"strings"
-	"time"
-
-	"github.com/oklog/ulid/v2"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/lib/retry"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// errUseWriteStatus is returned when the user attempts to modify the resource
-// status using the Write endpoint.
-//
-// We only allow modifications to the status using the WriteStatus endpoint
-// because:
-//
-//   - Setting statuses should only be done by controllers and requires different
-//     permissions.
-//
-//   - Status-only updates shouldn't increment the resource generation.
-//
-// While we could accomplish both in the Write handler, there's seldom need to
-// update the resource body and status at the same time, so it makes more sense
-// to keep them separate.
-var errUseWriteStatus = status.Error(codes.InvalidArgument, "resource.status can only be set using the WriteStatus endpoint")
-
-func (s *Server) Write(ctx context.Context, req *pbresource.WriteRequest) (*pbresource.WriteResponse, error) {
-	reg, err := s.validateWriteRequest(req)
-	if err != nil {
-		return nil, err
-	}
-
-	v1EntMeta := v2TenancyToV1EntMeta(req.Resource.Id.Tenancy)
-	authz, authzContext, err := s.getAuthorizer(tokenFromContext(ctx), v1EntMeta)
-	if err != nil {
-		return nil, err
-	}
-	v1EntMetaToV2Tenancy(reg, v1EntMeta, req.Resource.Id.Tenancy)
-
-	// Check the user sent the correct type of data.
-	if req.Resource.Data != nil && !req.Resource.Data.MessageIs(reg.Proto) {
-		got := strings.TrimPrefix(req.Resource.Data.TypeUrl, "type.googleapis.com/")
-
-		return nil, status.Errorf(
-			codes.InvalidArgument,
-			"resource.data is of wrong type (expected=%q, got=%q)",
-			reg.Proto.ProtoReflect().Descriptor().FullName(),
-			got,
-		)
-	}
-
-	if err = reg.Mutate(req.Resource); err != nil {
-		return nil, status.Errorf(codes.Internal, "failed mutate hook: %v", err.Error())
-	}
-
-	if err = reg.Validate(req.Resource); err != nil {
-		return nil, status.Error(codes.InvalidArgument, err.Error())
-	}
-
-	// ACL check comes before tenancy existence checks to not leak tenancy "existence".
-	err = reg.ACLs.Write(authz, authzContext, req.Resource)
-	switch {
-	case acl.IsErrPermissionDenied(err):
-		return nil, status.Error(codes.PermissionDenied, err.Error())
-	case err != nil:
-		return nil, status.Errorf(codes.Internal, "failed write acl: %v", err)
-	}
-
-	// Check V1 tenancy exists for the V2 resource
-	if err = v1TenancyExists(reg, s.TenancyBridge, req.Resource.Id.Tenancy, codes.InvalidArgument); err != nil {
-		return nil, err
-	}
-
-	// Check V1 tenancy not marked for deletion.
-	if err = v1TenancyMarkedForDeletion(reg, s.TenancyBridge, req.Resource.Id.Tenancy); err != nil {
-		return nil, err
-	}
-
-	// At the storage backend layer, all writes are CAS operations.
-	//
-	// This makes it possible to *safely* do things like keeping the Uid stable
-	// across writes, carrying statuses over, and passing the current version of
-	// the resource to hooks, without restricting ourselves to only using the more
-	// feature-rich storage systems that support "patch" updates etc. natively.
-	//
-	// Although CAS semantics are useful for machine users like controllers, human
-	// users generally don't need them. If the user is performing a non-CAS write,
-	// we read the current version, and automatically retry if the CAS write fails.
-	var result *pbresource.Resource
-	err = s.retryCAS(ctx, req.Resource.Version, func() error {
-		input := clone(req.Resource)
-
-		// We read with EventualConsistency here because:
-		//
-		//	- In the common case, individual resources are written infrequently, and
-		//	  when using the Raft backend followers are generally within a few hundred
-		//	  milliseconds of the leader, so the first read will probably return the
-		//	  current version.
-		//
-		//	- StrongConsistency is expensive. In the Raft backend, it involves a round
-		//	  of heartbeats to verify cluster leadership (in addition to the write's
-		//	  log replication).
-		//
-		//	- CAS failures will be retried by retryCAS anyway. So the read-modify-write
-		//	  cycle should eventually succeed.
-		var mismatchError storage.GroupVersionMismatchError
-		existing, err := s.Backend.Read(ctx, storage.EventualConsistency, input.Id)
-		switch {
-		// Create path.
-		case errors.Is(err, storage.ErrNotFound):
-			input.Id.Uid = ulid.Make().String()
-
-			// Prevent setting statuses in this endpoint.
-			if len(input.Status) != 0 {
-				return errUseWriteStatus
-			}
-
-			// Generally, we expect resources with owners to be created by controllers,
-			// and they should provide the Uid. In cases where no Uid is given (e.g. the
-			// owner is specified in the resource HCL) we'll look up whatever the current
-			// Uid is and use that.
-			//
-			// An important note on consistency:
-			//
-			// We read the owner with StrongConsistency here to reduce the likelihood of
-			// creating a resource pointing to the wrong "incarnation" of the owner in
-			// cases where the owner is deleted and re-created in quick succession.
-			//
-			// That said, there is still a chance that the owner has been deleted by the
-			// time we write this resource. This is not a relational database and we do
-			// not support ACID transactions or real foreign key constraints.
-			if input.Owner != nil && input.Owner.Uid == "" {
-				owner, err := s.Backend.Read(ctx, storage.StrongConsistency, input.Owner)
-				switch {
-				case errors.Is(err, storage.ErrNotFound):
-					return status.Error(codes.InvalidArgument, "resource.owner does not exist")
-				case err != nil:
-					return status.Errorf(codes.Internal, "failed to resolve owner: %v", err)
-				}
-				input.Owner = owner.Id
-			}
-
-			// TODO(spatel): Revisit owner<->resource tenancy rules post-1.16
-
-		// Update path.
-		case err == nil || errors.As(err, &mismatchError):
-			// Allow writes that update GroupVersion.
-			if mismatchError.Stored != nil {
-				existing = mismatchError.Stored
-			}
-			// Use the stored ID because it includes the Uid.
-			//
-			// Generally, users won't provide the Uid but controllers will, because
-			// controllers need to operate on a specific "incarnation" of a resource
-			// as opposed to an older/newer resource with the same name, whereas users
-			// just want to update the current resource.
-			input.Id = existing.Id
-
-			// User is doing a non-CAS write, use the current version.
-			if input.Version == "" {
-				input.Version = existing.Version
-			}
-
-			// Check the stored version matches the user-given version.
-			//
-			// Although CAS operations are implemented "for real" at the storage backend
-			// layer, we must check the version here too to prevent a scenario where:
-			//
-			//	- Current resource version is `v2`
-			//	- User passes version `v2`
-			//	- Read returns stale version `v1`
-			//	- We carry `v1`'s statuses over (effectively overwriting `v2`'s statuses)
-			//	- CAS operation succeeds anyway because user-given version is current
-			if input.Version != existing.Version {
-				return storage.ErrCASFailure
-			}
-
-			// Fill in an empty Owner UID with the existing owner's UID. If other parts
-			// of the owner ID like the type or name have changed then the subsequent
-			// EqualID call will still error as you are not allowed to change the owner.
-			// This is a small UX nicety to repeatedly "apply" a resource that should
-			// have an owner without having to care about the current owners incarnation.
-			if input.Owner != nil && existing.Owner != nil && input.Owner.Uid == "" {
-				input.Owner.Uid = existing.Owner.Uid
-			}
-
-			// Owner can only be set on creation. Enforce immutability.
-			if !resource.EqualID(input.Owner, existing.Owner) {
-				return status.Errorf(codes.InvalidArgument, "owner cannot be changed")
-			}
-
-			// Carry over status and prevent updates
-			if input.Status == nil {
-				input.Status = existing.Status
-			} else if !resource.EqualStatusMap(input.Status, existing.Status) {
-				return errUseWriteStatus
-			}
-
-		default:
-			return err
-		}
-
-		input.Generation = ulid.Make().String()
-		result, err = s.Backend.WriteCAS(ctx, input)
-		return err
-	})
-
-	switch {
-	case errors.Is(err, storage.ErrCASFailure):
-		return nil, status.Error(codes.Aborted, err.Error())
-	case errors.Is(err, storage.ErrWrongUid):
-		return nil, status.Error(codes.FailedPrecondition, err.Error())
-	case isGRPCStatusError(err):
-		return nil, err
-	case err != nil:
-		return nil, status.Errorf(codes.Internal, "failed to write resource: %v", err.Error())
-	}
-	return &pbresource.WriteResponse{Resource: result}, nil
-}
-
-// retryCAS retries the given operation with exponential backoff if the user
-// didn't provide a version. This is intended to hide failures when the user
-// isn't intentionally performing a CAS operation (all writes are, by design,
-// CAS operations at the storage backend layer).
-func (s *Server) retryCAS(ctx context.Context, vsn string, cas func() error) error {
-	if vsn != "" {
-		return cas()
-	}
-
-	const maxAttempts = 5
-
-	// These parameters are fairly arbitrary, so if you find better ones then go
-	// ahead and swap them out! In general, we want to wait long enough to smooth
-	// over small amounts of storage replication lag, but not so long that we make
-	// matters worse by holding onto load.
-	backoff := &retry.Waiter{
-		MinWait: 50 * time.Millisecond,
-		MaxWait: 1 * time.Second,
-		Jitter:  retry.NewJitter(50),
-		Factor:  75 * time.Millisecond,
-	}
-
-	var err error
-	for i := 1; i <= maxAttempts; i++ {
-		if err = cas(); !errors.Is(err, storage.ErrCASFailure) {
-			break
-		}
-		if backoff.Wait(ctx) != nil {
-			break
-		}
-		s.Logger.Trace("retrying failed CAS operation", "failure_count", i)
-	}
-	return err
-}
-
-func (s *Server) validateWriteRequest(req *pbresource.WriteRequest) (*resource.Registration, error) {
-	var field string
-	switch {
-	case req.Resource == nil:
-		field = "resource"
-	case req.Resource.Id == nil:
-		field = "resource.id"
-	}
-
-	if field != "" {
-		return nil, status.Errorf(codes.InvalidArgument, "%s is required", field)
-	}
-
-	if err := validateId(req.Resource.Id, "resource.id"); err != nil {
-		return nil, err
-	}
-
-	if req.Resource.Owner != nil {
-		if err := validateId(req.Resource.Owner, "resource.owner"); err != nil {
-			return nil, err
-		}
-	}
-
-	// Check type exists.
-	reg, err := s.resolveType(req.Resource.Id.Type)
-	if err != nil {
-		return nil, err
-	}
-
-	// Check scope
-	if reg.Scope == resource.ScopePartition && req.Resource.Id.Tenancy.Namespace != "" {
-		return nil, status.Errorf(
-			codes.InvalidArgument,
-			"partition scoped resource %s cannot have a namespace. got: %s",
-			resource.ToGVK(req.Resource.Id.Type),
-			req.Resource.Id.Tenancy.Namespace,
-		)
-	}
-
-	return reg, nil
-}
diff --git a/agent/grpc-external/services/resource/write_status.go b/agent/grpc-external/services/resource/write_status.go
deleted file mode 100644
index 0d3b68bb08766..0000000000000
--- a/agent/grpc-external/services/resource/write_status.go
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/oklog/ulid/v2"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/types/known/timestamppb"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func (s *Server) WriteStatus(ctx context.Context, req *pbresource.WriteStatusRequest) (*pbresource.WriteStatusResponse, error) {
-	reg, err := s.validateWriteStatusRequest(req)
-	if err != nil {
-		return nil, err
-	}
-
-	entMeta := v2TenancyToV1EntMeta(req.Id.Tenancy)
-	authz, authzContext, err := s.getAuthorizer(tokenFromContext(ctx), entMeta)
-	if err != nil {
-		return nil, err
-	}
-
-	// Apply defaults when tenancy units empty.
-	v1EntMetaToV2Tenancy(reg, entMeta, req.Id.Tenancy)
-
-	// Check V1 tenancy exists for the V2 resource. Ignore "marked for deletion" since status updates
-	// should still work regardless.
-	if err = v1TenancyExists(reg, s.TenancyBridge, req.Id.Tenancy, codes.InvalidArgument); err != nil {
-		return nil, err
-	}
-
-	// Retrieve resource since ACL hook requires it.
-	existing, err := s.Backend.Read(ctx, storage.EventualConsistency, req.Id)
-	switch {
-	case errors.Is(err, storage.ErrNotFound):
-		return nil, status.Errorf(codes.NotFound, err.Error())
-	case err != nil:
-		return nil, status.Errorf(codes.Internal, "failed read: %v", err)
-	}
-
-	// Check write ACL.
-	err = reg.ACLs.Write(authz, authzContext, existing)
-	switch {
-	case acl.IsErrPermissionDenied(err):
-		return nil, status.Error(codes.PermissionDenied, err.Error())
-	case err != nil:
-		return nil, status.Errorf(codes.Internal, "failed operator:write allowed acl: %v", err)
-	}
-
-	// At the storage backend layer, all writes are CAS operations.
-	//
-	// See comment in write.go for more information.
-	//
-	// Most controllers *won't* do an explicit CAS write of the status because it
-	// doesn't provide much value, and conflicts are fairly likely in the flurry
-	// of activity after a resource is updated.
-	//
-	// Here's why that's okay:
-	//
-	//	- Controllers should only update their own status (identified by its key)
-	//	  and updating separate statuses is commutative.
-	//
-	//	- Controllers that make writes should be leader-elected singletons (i.e.
-	//	  there should only be one instance of the controller running) so we don't
-	//	  need to worry about multiple instances racing with each other.
-	//
-	//	- Only controllers are supposed to write statuses, so you should never be
-	//	  racing with a user's write of the same status.
-	var result *pbresource.Resource
-	err = s.retryCAS(ctx, req.Version, func() error {
-		resource, err := s.Backend.Read(ctx, storage.EventualConsistency, req.Id)
-		if err != nil {
-			return err
-		}
-
-		if req.Version != "" && req.Version != resource.Version {
-			return storage.ErrCASFailure
-		}
-
-		resource = clone(resource)
-		if resource.Status == nil {
-			resource.Status = make(map[string]*pbresource.Status)
-		}
-
-		status := clone(req.Status)
-		status.UpdatedAt = timestamppb.Now()
-		resource.Status[req.Key] = status
-
-		result, err = s.Backend.WriteCAS(ctx, resource)
-		return err
-	})
-
-	switch {
-	case errors.Is(err, storage.ErrNotFound):
-		return nil, status.Error(codes.NotFound, err.Error())
-	case errors.Is(err, storage.ErrCASFailure):
-		return nil, status.Error(codes.Aborted, err.Error())
-	case err != nil:
-		return nil, status.Errorf(codes.Internal, "failed to write resource: %v", err.Error())
-	}
-
-	return &pbresource.WriteStatusResponse{Resource: result}, nil
-}
-
-func (s *Server) validateWriteStatusRequest(req *pbresource.WriteStatusRequest) (*resource.Registration, error) {
-	var field string
-	switch {
-	case req.Id == nil:
-		field = "id"
-	case req.Id.Type == nil:
-		field = "id.type"
-	case req.Id.Name == "":
-		field = "id.name"
-	case req.Id.Uid == "":
-		// We require Uid because only controllers should write statuses and
-		// controllers should *always* refer to a specific incarnation of a
-		// resource using its Uid.
-		field = "id.uid"
-	case req.Key == "":
-		field = "key"
-	case req.Status == nil:
-		field = "status"
-	case req.Status.ObservedGeneration == "":
-		field = "status.observed_generation"
-	default:
-		for i, condition := range req.Status.Conditions {
-			if condition.Type == "" {
-				field = fmt.Sprintf("status.conditions[%d].type", i)
-				break
-			}
-
-			if condition.Resource != nil {
-				switch {
-				case condition.Resource.Type == nil:
-					field = fmt.Sprintf("status.conditions[%d].resource.type", i)
-					break
-				case condition.Resource.Tenancy == nil:
-					field = fmt.Sprintf("status.conditions[%d].resource.tenancy", i)
-					break
-				case condition.Resource.Name == "":
-					field = fmt.Sprintf("status.conditions[%d].resource.name", i)
-					break
-				}
-			}
-		}
-	}
-	if field != "" {
-		return nil, status.Errorf(codes.InvalidArgument, "%s is required", field)
-	}
-
-	if req.Status.UpdatedAt != nil {
-		return nil, status.Error(codes.InvalidArgument, "status.updated_at is automatically set and cannot be provided")
-	}
-
-	if _, err := ulid.ParseStrict(req.Status.ObservedGeneration); err != nil {
-		return nil, status.Error(codes.InvalidArgument, "status.observed_generation is not valid")
-	}
-
-	// Better UX: Allow callers to pass in nil tenancy.  Defaulting and inheritance of tenancy
-	// from the request token will take place further down in the call flow.
-	if req.Id.Tenancy == nil {
-		req.Id.Tenancy = &pbresource.Tenancy{
-			Partition: "",
-			Namespace: "",
-			// TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy
-			PeerName: "local",
-		}
-	}
-
-	// Lowercase
-	resource.Normalize(req.Id.Tenancy)
-
-	// Check type exists.
-	reg, err := s.resolveType(req.Id.Type)
-	if err != nil {
-		return nil, err
-	}
-
-	// Check scope.
-	if reg.Scope == resource.ScopePartition && req.Id.Tenancy.Namespace != "" {
-		return nil, status.Errorf(
-			codes.InvalidArgument,
-			"partition scoped resource %s cannot have a namespace. got: %s",
-			resource.ToGVK(req.Id.Type),
-			req.Id.Tenancy.Namespace,
-		)
-	}
-
-	return reg, nil
-}
diff --git a/agent/grpc-external/services/resource/write_status_test.go b/agent/grpc-external/services/resource/write_status_test.go
deleted file mode 100644
index 5b71983475d94..0000000000000
--- a/agent/grpc-external/services/resource/write_status_test.go
+++ /dev/null
@@ -1,517 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/oklog/ulid/v2"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/types/known/timestamppb"
-
-	"github.com/hashicorp/consul/acl/resolver"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func TestWriteStatus_ACL(t *testing.T) {
-	type testCase struct {
-		authz       resolver.Result
-		assertErrFn func(error)
-	}
-	testcases := map[string]testCase{
-		"denied": {
-			authz: AuthorizerFrom(t, demo.ArtistV2ReadPolicy),
-			assertErrFn: func(err error) {
-				require.Error(t, err)
-				require.Equal(t, codes.PermissionDenied.String(), status.Code(err).String())
-			},
-		},
-		"allowed": {
-			authz: AuthorizerFrom(t, demo.ArtistV2WritePolicy, `operator = "write"`),
-			assertErrFn: func(err error) {
-				require.NoError(t, err)
-			},
-		},
-	}
-
-	for desc, tc := range testcases {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			client := testClient(t, server)
-			demo.RegisterTypes(server.Registry)
-
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: artist})
-			require.NoError(t, err)
-			artist = rsp.Resource
-
-			// Defer mocking out authz since above write is necessary to set up the test resource.
-			mockACLResolver := &MockACLResolver{}
-			mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
-				Return(tc.authz, nil)
-			server.ACLResolver = mockACLResolver
-
-			// exercise ACL
-			_, err = client.WriteStatus(testContext(t), validWriteStatusRequest(t, artist))
-			tc.assertErrFn(err)
-		})
-	}
-}
-
-func TestWriteStatus_InputValidation(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-	demo.RegisterTypes(server.Registry)
-
-	testCases := map[string]struct {
-		typ   *pbresource.Type
-		modFn func(req *pbresource.WriteStatusRequest)
-	}{
-		"no id": {
-			typ:   demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Id = nil },
-		},
-		"no type": {
-			typ:   demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Id.Type = nil },
-		},
-		"no name": {
-			typ:   demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Id.Name = "" },
-		},
-		"no uid": {
-			typ:   demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Id.Uid = "" },
-		},
-		"no key": {
-			typ:   demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Key = "" },
-		},
-		"no status": {
-			typ:   demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Status = nil },
-		},
-		"no observed generation": {
-			typ:   demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Status.ObservedGeneration = "" },
-		},
-		"bad observed generation": {
-			typ:   demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Status.ObservedGeneration = "bogus" },
-		},
-		"no condition type": {
-			typ:   demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Status.Conditions[0].Type = "" },
-		},
-		"no reference type": {
-			typ:   demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Status.Conditions[0].Resource.Type = nil },
-		},
-		"no reference tenancy": {
-			typ:   demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Status.Conditions[0].Resource.Tenancy = nil },
-		},
-		"no reference name": {
-			typ:   demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Status.Conditions[0].Resource.Name = "" },
-		},
-		"updated at provided": {
-			typ:   demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Status.UpdatedAt = timestamppb.Now() },
-		},
-		"partition scoped type provides namespace in tenancy": {
-			typ:   demo.TypeV1RecordLabel,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Id.Tenancy.Namespace = "bad" },
-		},
-	}
-	for desc, tc := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			var res *pbresource.Resource
-			var err error
-			switch {
-			case resource.EqualType(demo.TypeV2Artist, tc.typ):
-				res, err = demo.GenerateV2Artist()
-			case resource.EqualType(demo.TypeV1RecordLabel, tc.typ):
-				res, err = demo.GenerateV1RecordLabel("Looney Tunes")
-			default:
-				t.Fatal("unsupported type", tc.typ)
-			}
-			require.NoError(t, err)
-
-			res.Id.Uid = ulid.Make().String()
-			res.Generation = ulid.Make().String()
-
-			req := validWriteStatusRequest(t, res)
-			tc.modFn(req)
-
-			_, err = client.WriteStatus(testContext(t), req)
-			require.Error(t, err)
-			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-		})
-	}
-}
-
-func TestWriteStatus_Success(t *testing.T) {
-	for desc, fn := range map[string]func(*pbresource.WriteStatusRequest){
-		"CAS":     func(*pbresource.WriteStatusRequest) {},
-		"Non CAS": func(req *pbresource.WriteStatusRequest) { req.Version = "" },
-	} {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			client := testClient(t, server)
-			demo.RegisterTypes(server.Registry)
-
-			res, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			writeRsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-			require.NoError(t, err)
-			res = writeRsp.Resource
-
-			req := validWriteStatusRequest(t, res)
-			fn(req)
-
-			rsp, err := client.WriteStatus(testContext(t), req)
-			require.NoError(t, err)
-			res = rsp.Resource
-
-			req = validWriteStatusRequest(t, res)
-			req.Key = "consul.io/other-controller"
-			fn(req)
-
-			rsp, err = client.WriteStatus(testContext(t), req)
-			require.NoError(t, err)
-
-			require.Equal(t, rsp.Resource.Generation, res.Generation, "generation should not have changed")
-			require.NotEqual(t, rsp.Resource.Version, res.Version, "version should have changed")
-			require.Contains(t, rsp.Resource.Status, "consul.io/other-controller")
-			require.Contains(t, rsp.Resource.Status, "consul.io/artist-controller")
-			require.NotNil(t, rsp.Resource.Status["consul.io/artist-controller"].UpdatedAt)
-		})
-	}
-}
-
-func TestWriteStatus_Tenancy_Defaults(t *testing.T) {
-	for desc, tc := range map[string]struct {
-		scope resource.Scope
-		modFn func(req *pbresource.WriteStatusRequest)
-	}{
-		"namespaced resource provides nonempty partition and namespace": {
-			scope: resource.ScopeNamespace,
-			modFn: func(req *pbresource.WriteStatusRequest) {},
-		},
-		"namespaced resource provides uppercase partition and namespace": {
-			scope: resource.ScopeNamespace,
-			modFn: func(req *pbresource.WriteStatusRequest) {
-				req.Id.Tenancy.Partition = strings.ToUpper(req.Id.Tenancy.Partition)
-				req.Id.Tenancy.Namespace = strings.ToUpper(req.Id.Tenancy.Namespace)
-			},
-		},
-		"namespaced resource inherits tokens partition when empty": {
-			scope: resource.ScopeNamespace,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Id.Tenancy.Partition = "" },
-		},
-		"namespaced resource inherits tokens namespace when empty": {
-			scope: resource.ScopeNamespace,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Id.Tenancy.Namespace = "" },
-		},
-		"namespaced resource inherits tokens partition and namespace when empty": {
-			scope: resource.ScopeNamespace,
-			modFn: func(req *pbresource.WriteStatusRequest) {
-				req.Id.Tenancy.Partition = ""
-				req.Id.Tenancy.Namespace = ""
-			},
-		},
-		"namespaced resource inherits tokens partition and namespace when tenancy nil": {
-			scope: resource.ScopeNamespace,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Id.Tenancy = nil },
-		},
-		"partitioned resource provides nonempty partition": {
-			scope: resource.ScopePartition,
-			modFn: func(req *pbresource.WriteStatusRequest) {},
-		},
-		"partitioned resource provides uppercase partition": {
-			scope: resource.ScopePartition,
-			modFn: func(req *pbresource.WriteStatusRequest) {
-				req.Id.Tenancy.Partition = strings.ToUpper(req.Id.Tenancy.Partition)
-			},
-		},
-		"partitioned resource inherits tokens partition when empty": {
-			scope: resource.ScopePartition,
-			modFn: func(req *pbresource.WriteStatusRequest) { req.Id.Tenancy.Partition = "" },
-		},
-	} {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			client := testClient(t, server)
-			demo.RegisterTypes(server.Registry)
-
-			// Pick resource based on scope of type in testcase.
-			var res *pbresource.Resource
-			var err error
-			switch tc.scope {
-			case resource.ScopeNamespace:
-				res, err = demo.GenerateV2Artist()
-			case resource.ScopePartition:
-				res, err = demo.GenerateV1RecordLabel("Looney Tunes")
-			}
-			require.NoError(t, err)
-
-			// Write resource so we can update status later.
-			writeRsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-			require.NoError(t, err)
-			res = writeRsp.Resource
-			require.Nil(t, res.Status)
-
-			// Write status with tenancy modded by testcase.
-			req := validWriteStatusRequest(t, res)
-			tc.modFn(req)
-			rsp, err := client.WriteStatus(testContext(t), req)
-			require.NoError(t, err)
-			res = rsp.Resource
-
-			// Re-read resoruce and verify status successfully written (not nil)
-			_, err = client.Read(testContext(t), &pbresource.ReadRequest{Id: res.Id})
-			require.NoError(t, err)
-			res = rsp.Resource
-			require.NotNil(t, res.Status)
-		})
-	}
-}
-
-func TestWriteStatus_Tenancy_NotFound(t *testing.T) {
-	for desc, tc := range map[string]struct {
-		scope       resource.Scope
-		modFn       func(req *pbresource.WriteStatusRequest)
-		errCode     codes.Code
-		errContains string
-	}{
-		"namespaced resource provides nonexistant partition": {
-			scope:       resource.ScopeNamespace,
-			modFn:       func(req *pbresource.WriteStatusRequest) { req.Id.Tenancy.Partition = "bad" },
-			errCode:     codes.InvalidArgument,
-			errContains: "partition",
-		},
-		"namespaced resource provides nonexistant namespace": {
-			scope:       resource.ScopeNamespace,
-			modFn:       func(req *pbresource.WriteStatusRequest) { req.Id.Tenancy.Namespace = "bad" },
-			errCode:     codes.InvalidArgument,
-			errContains: "namespace",
-		},
-		"partitioned resource provides nonexistant partition": {
-			scope:       resource.ScopePartition,
-			modFn:       func(req *pbresource.WriteStatusRequest) { req.Id.Tenancy.Partition = "bad" },
-			errCode:     codes.InvalidArgument,
-			errContains: "partition",
-		},
-	} {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			client := testClient(t, server)
-			demo.RegisterTypes(server.Registry)
-
-			// Pick resource based on scope of type in testcase.
-			var res *pbresource.Resource
-			var err error
-			switch tc.scope {
-			case resource.ScopeNamespace:
-				res, err = demo.GenerateV2Artist()
-			case resource.ScopePartition:
-				res, err = demo.GenerateV1RecordLabel("Looney Tunes")
-			}
-			require.NoError(t, err)
-
-			// Fill in required fields so validation continues until tenancy is checked
-			req := validWriteStatusRequest(t, res)
-			req.Id.Uid = ulid.Make().String()
-			req.Status.ObservedGeneration = ulid.Make().String()
-
-			// Write status with tenancy modded by testcase.
-			tc.modFn(req)
-			_, err = client.WriteStatus(testContext(t), req)
-
-			// Verify non-existant tenancy field is the cause of the error.
-			require.Error(t, err)
-			require.Equal(t, tc.errCode.String(), status.Code(err).String())
-			require.Contains(t, err.Error(), tc.errContains)
-		})
-	}
-}
-
-func TestWriteStatus_CASFailure(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-	res = rsp.Resource
-
-	req := validWriteStatusRequest(t, res)
-	req.Version = "nope"
-
-	_, err = client.WriteStatus(testContext(t), req)
-	require.Error(t, err)
-	require.Equal(t, codes.Aborted.String(), status.Code(err).String())
-}
-
-func TestWriteStatus_TypeNotFound(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-	res.Id.Uid = ulid.Make().String()
-	res.Generation = ulid.Make().String()
-
-	_, err = client.WriteStatus(testContext(t), validWriteStatusRequest(t, res))
-	require.Error(t, err)
-	require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-	require.Contains(t, err.Error(), "resource type demo.v2.Artist not registered")
-}
-
-func TestWriteStatus_ResourceNotFound(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-	res.Id.Uid = ulid.Make().String()
-	res.Generation = ulid.Make().String()
-
-	_, err = client.WriteStatus(testContext(t), validWriteStatusRequest(t, res))
-	require.Error(t, err)
-	require.Equal(t, codes.NotFound.String(), status.Code(err).String())
-}
-
-func TestWriteStatus_WrongUid(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-	res = rsp.Resource
-
-	req := validWriteStatusRequest(t, res)
-	req.Id.Uid = ulid.Make().String()
-
-	_, err = client.WriteStatus(testContext(t), req)
-	require.Error(t, err)
-	require.Equal(t, codes.NotFound.String(), status.Code(err).String())
-}
-
-func TestWriteStatus_NonCASUpdate_Retry(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-	res = rsp.Resource
-
-	// Simulate conflicting writes by blocking the RPC after it has read the
-	// current version of the resource, but before it tries to make a write.
-	backend := &blockOnceBackend{
-		Backend: server.Backend,
-
-		readCh:  make(chan struct{}),
-		blockCh: make(chan struct{}),
-	}
-	server.Backend = backend
-
-	errCh := make(chan error)
-	go func() {
-		req := validWriteStatusRequest(t, res)
-		req.Version = ""
-
-		_, err := client.WriteStatus(testContext(t), req)
-		errCh <- err
-	}()
-
-	// Wait for the read, to ensure the Write in the goroutine above has read the
-	// current version of the resource.
-	<-backend.readCh
-
-	// Update the resource.
-	_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: modifyArtist(t, res)})
-	require.NoError(t, err)
-
-	// Unblock the read.
-	close(backend.blockCh)
-
-	// Check that the write succeeded anyway because of a retry.
-	require.NoError(t, <-errCh)
-}
-
-func validWriteStatusRequest(t *testing.T, res *pbresource.Resource) *pbresource.WriteStatusRequest {
-	t.Helper()
-
-	switch {
-	case resource.EqualType(res.Id.Type, demo.TypeV2Artist):
-		album, err := demo.GenerateV2Album(res.Id)
-		require.NoError(t, err)
-		return &pbresource.WriteStatusRequest{
-			Id:      res.Id,
-			Version: res.Version,
-			Key:     "consul.io/artist-controller",
-			Status: &pbresource.Status{
-				ObservedGeneration: res.Generation,
-				Conditions: []*pbresource.Condition{
-					{
-						Type:     "AlbumCreated",
-						State:    pbresource.Condition_STATE_TRUE,
-						Reason:   "AlbumCreated",
-						Message:  fmt.Sprintf("Album '%s' created", album.Id.Name),
-						Resource: resource.Reference(album.Id, ""),
-					},
-				},
-			},
-		}
-	case resource.EqualType(res.Id.Type, demo.TypeV1RecordLabel):
-		artist, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-		return &pbresource.WriteStatusRequest{
-			Id:      res.Id,
-			Version: res.Version,
-			Key:     "consul.io/recordlabel-controller",
-			Status: &pbresource.Status{
-				ObservedGeneration: res.Generation,
-				Conditions: []*pbresource.Condition{
-					{
-						Type:     "ArtistCreated",
-						State:    pbresource.Condition_STATE_TRUE,
-						Reason:   "ArtistCreated",
-						Message:  fmt.Sprintf("Artist '%s' created", artist.Id.Name),
-						Resource: resource.Reference(artist.Id, ""),
-					},
-				},
-			},
-		}
-	default:
-		t.Fatal("unsupported type", res.Id.Type)
-	}
-	return nil
-}
diff --git a/agent/grpc-external/services/resource/write_test.go b/agent/grpc-external/services/resource/write_test.go
deleted file mode 100644
index 3828ff9753f2d..0000000000000
--- a/agent/grpc-external/services/resource/write_test.go
+++ /dev/null
@@ -1,818 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-	"strings"
-	"sync/atomic"
-	"testing"
-
-	"github.com/oklog/ulid/v2"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/acl/resolver"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbdemov1 "github.com/hashicorp/consul/proto/private/pbdemo/v1"
-	pbdemov2 "github.com/hashicorp/consul/proto/private/pbdemo/v2"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestWrite_InputValidation(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	testCases := map[string]func(artist, recordLabel *pbresource.Resource) *pbresource.Resource{
-		"no resource": func(artist, recordLabel *pbresource.Resource) *pbresource.Resource { return nil },
-		"no id": func(artist, _ *pbresource.Resource) *pbresource.Resource {
-			artist.Id = nil
-			return artist
-		},
-		"no type": func(artist, _ *pbresource.Resource) *pbresource.Resource {
-			artist.Id.Type = nil
-			return artist
-		},
-		"no name": func(artist, _ *pbresource.Resource) *pbresource.Resource {
-			artist.Id.Name = ""
-			return artist
-		},
-		"wrong data type": func(artist, _ *pbresource.Resource) *pbresource.Resource {
-			var err error
-			artist.Data, err = anypb.New(&pbdemov2.Album{})
-			require.NoError(t, err)
-			return artist
-		},
-		"fail validation hook": func(artist, _ *pbresource.Resource) *pbresource.Resource {
-			buffer := &pbdemov2.Artist{}
-			require.NoError(t, artist.Data.UnmarshalTo(buffer))
-			buffer.Name = "" // name cannot be empty
-			require.NoError(t, artist.Data.MarshalFrom(buffer))
-			return artist
-		},
-		"partition scope with non-empty namespace": func(_, recordLabel *pbresource.Resource) *pbresource.Resource {
-			recordLabel.Id.Tenancy.Namespace = "bogus"
-			return recordLabel
-		},
-		// TODO(spatel): add cluster scope tests when we have an actual cluster scoped resource (e.g. partition)
-	}
-	for desc, modFn := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
-			require.NoError(t, err)
-
-			req := &pbresource.WriteRequest{Resource: modFn(artist, recordLabel)}
-			_, err = client.Write(testContext(t), req)
-			require.Error(t, err)
-			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-		})
-	}
-}
-
-func TestWrite_OwnerValidation(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	type testCase struct {
-		modReqFn      func(req *pbresource.WriteRequest)
-		errorContains string
-	}
-	testCases := map[string]testCase{
-		"no owner type": {
-			modReqFn:      func(req *pbresource.WriteRequest) { req.Resource.Owner.Type = nil },
-			errorContains: "resource.owner.type",
-		},
-		"no owner tenancy": {
-			modReqFn:      func(req *pbresource.WriteRequest) { req.Resource.Owner.Tenancy = nil },
-			errorContains: "resource.owner",
-		},
-		"no owner name": {
-			modReqFn:      func(req *pbresource.WriteRequest) { req.Resource.Owner.Name = "" },
-			errorContains: "resource.owner.name",
-		},
-	}
-	for desc, tc := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			album, err := demo.GenerateV2Album(artist.Id)
-			require.NoError(t, err)
-
-			albumReq := &pbresource.WriteRequest{Resource: album}
-			tc.modReqFn(albumReq)
-
-			_, err = client.Write(testContext(t), albumReq)
-			require.Error(t, err)
-			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-			require.ErrorContains(t, err, tc.errorContains)
-		})
-	}
-}
-
-func TestWrite_TypeNotFound(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.Error(t, err)
-	require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-	require.Contains(t, err.Error(), "resource type demo.v2.Artist not registered")
-}
-
-func TestWrite_ACLs(t *testing.T) {
-	type testCase struct {
-		authz       resolver.Result
-		assertErrFn func(error)
-	}
-	testcases := map[string]testCase{
-		"write denied": {
-			authz: AuthorizerFrom(t, demo.ArtistV1WritePolicy),
-			assertErrFn: func(err error) {
-				require.Error(t, err)
-				require.Equal(t, codes.PermissionDenied.String(), status.Code(err).String())
-			},
-		},
-		"write allowed": {
-			authz: AuthorizerFrom(t, demo.ArtistV2WritePolicy),
-			assertErrFn: func(err error) {
-				require.NoError(t, err)
-			},
-		},
-	}
-
-	for desc, tc := range testcases {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			client := testClient(t, server)
-
-			mockACLResolver := &MockACLResolver{}
-			mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
-				Return(tc.authz, nil)
-			server.ACLResolver = mockACLResolver
-			demo.RegisterTypes(server.Registry)
-
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			// exercise ACL
-			_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: artist})
-			tc.assertErrFn(err)
-		})
-	}
-}
-
-func TestWrite_Mutate(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-	demo.RegisterTypes(server.Registry)
-
-	artist, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	artistData := &pbdemov2.Artist{}
-	artist.Data.UnmarshalTo(artistData)
-	require.NoError(t, err)
-
-	// mutate hook sets genre to disco when unspecified
-	artistData.Genre = pbdemov2.Genre_GENRE_UNSPECIFIED
-	artist.Data.MarshalFrom(artistData)
-	require.NoError(t, err)
-
-	rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: artist})
-	require.NoError(t, err)
-
-	// verify mutate hook set genre to disco
-	require.NoError(t, rsp.Resource.Data.UnmarshalTo(artistData))
-	require.Equal(t, pbdemov2.Genre_GENRE_DISCO, artistData.Genre)
-}
-
-func TestWrite_Create_Success(t *testing.T) {
-	testCases := map[string]struct {
-		modFn           func(artist, recordLabel *pbresource.Resource) *pbresource.Resource
-		expectedTenancy *pbresource.Tenancy
-	}{
-		"namespaced resource provides nonempty partition and namespace": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				return artist
-			},
-			expectedTenancy: resource.DefaultNamespacedTenancy(),
-		},
-		"namespaced resource provides uppercase partition and namespace": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Tenancy.Partition = strings.ToUpper(artist.Id.Tenancy.Partition)
-				artist.Id.Tenancy.Namespace = strings.ToUpper(artist.Id.Tenancy.Namespace)
-				return artist
-			},
-			expectedTenancy: resource.DefaultNamespacedTenancy(),
-		},
-		"namespaced resource inherits tokens partition when empty": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Tenancy.Partition = ""
-				return artist
-			},
-			expectedTenancy: resource.DefaultNamespacedTenancy(),
-		},
-		"namespaced resource inherits tokens namespace when empty": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Tenancy.Namespace = ""
-				return artist
-			},
-			expectedTenancy: resource.DefaultNamespacedTenancy(),
-		},
-		"namespaced resource inherits tokens partition and namespace when empty": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Tenancy.Partition = ""
-				artist.Id.Tenancy.Namespace = ""
-				return artist
-			},
-			expectedTenancy: resource.DefaultNamespacedTenancy(),
-		},
-		"namespaced resource inherits tokens partition and namespace when tenancy nil": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Tenancy = nil
-				return artist
-			},
-			expectedTenancy: resource.DefaultNamespacedTenancy(),
-		},
-		// TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy
-		"namespaced resource defaults peername to local when empty": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Tenancy.PeerName = ""
-				return artist
-			},
-			expectedTenancy: resource.DefaultNamespacedTenancy(),
-		},
-		"partitioned resource provides nonempty partition": {
-			modFn: func(_, recordLabel *pbresource.Resource) *pbresource.Resource {
-				return recordLabel
-			},
-			expectedTenancy: resource.DefaultPartitionedTenancy(),
-		},
-		"partitioned resource provides uppercase partition": {
-			modFn: func(_, recordLabel *pbresource.Resource) *pbresource.Resource {
-				recordLabel.Id.Tenancy.Partition = strings.ToUpper(recordLabel.Id.Tenancy.Partition)
-				return recordLabel
-			},
-			expectedTenancy: resource.DefaultPartitionedTenancy(),
-		},
-		"partitioned resource inherits tokens partition when empty": {
-			modFn: func(_, recordLabel *pbresource.Resource) *pbresource.Resource {
-				recordLabel.Id.Tenancy.Partition = ""
-				return recordLabel
-			},
-			expectedTenancy: resource.DefaultPartitionedTenancy(),
-		},
-		"partitioned resource inherits tokens partition when tenancy nil": {
-			modFn: func(_, recordLabel *pbresource.Resource) *pbresource.Resource {
-				recordLabel.Id.Tenancy = nil
-				return recordLabel
-			},
-			expectedTenancy: resource.DefaultPartitionedTenancy(),
-		},
-		// TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy
-		"partitioned resource defaults peername to local when empty": {
-			modFn: func(_, recordLabel *pbresource.Resource) *pbresource.Resource {
-				recordLabel.Id.Tenancy.PeerName = ""
-				return recordLabel
-			},
-			expectedTenancy: resource.DefaultPartitionedTenancy(),
-		},
-		// TODO(spatel): Add cluster scope tests when we have an actual cluster scoped resource (e.g. partition)
-	}
-	for desc, tc := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			client := testClient(t, server)
-			demo.RegisterTypes(server.Registry)
-
-			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
-			require.NoError(t, err)
-
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: tc.modFn(artist, recordLabel)})
-			require.NoError(t, err)
-			require.NotEmpty(t, rsp.Resource.Version, "resource should have version")
-			require.NotEmpty(t, rsp.Resource.Id.Uid, "resource id should have uid")
-			require.NotEmpty(t, rsp.Resource.Generation, "resource should have generation")
-			prototest.AssertDeepEqual(t, tc.expectedTenancy, rsp.Resource.Id.Tenancy)
-		})
-	}
-}
-
-func TestWrite_Create_Tenancy_NotFound(t *testing.T) {
-	testCases := map[string]struct {
-		modFn       func(artist, recordLabel *pbresource.Resource) *pbresource.Resource
-		errCode     codes.Code
-		errContains string
-	}{
-		"namespaced resource provides nonexistant partition": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Tenancy.Partition = "boguspartition"
-				return artist
-			},
-			errCode:     codes.InvalidArgument,
-			errContains: "partition",
-		},
-		"namespaced resource provides nonexistant namespace": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Tenancy.Namespace = "bogusnamespace"
-				return artist
-			},
-			errCode:     codes.InvalidArgument,
-			errContains: "namespace",
-		},
-		"partitioned resource provides nonexistant partition": {
-			modFn: func(_, recordLabel *pbresource.Resource) *pbresource.Resource {
-				recordLabel.Id.Tenancy.Partition = "boguspartition"
-				return recordLabel
-			},
-			errCode:     codes.InvalidArgument,
-			errContains: "partition",
-		},
-	}
-	for desc, tc := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			client := testClient(t, server)
-			demo.RegisterTypes(server.Registry)
-
-			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
-			require.NoError(t, err)
-
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-
-			_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: tc.modFn(artist, recordLabel)})
-			require.Error(t, err)
-			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-			require.Contains(t, err.Error(), tc.errContains)
-		})
-	}
-}
-
-func TestWrite_Tenancy_MarkedForDeletion(t *testing.T) {
-	// Verify resource write fails when its partition or namespace is marked for deletion.
-	testCases := map[string]struct {
-		modFn       func(artist, recordLabel *pbresource.Resource, mockTenancyBridge *MockTenancyBridge) *pbresource.Resource
-		errContains string
-	}{
-		"namespaced resources partition marked for deletion": {
-			modFn: func(artist, _ *pbresource.Resource, mockTenancyBridge *MockTenancyBridge) *pbresource.Resource {
-				mockTenancyBridge.On("IsPartitionMarkedForDeletion", "part1").Return(true, nil)
-				return artist
-			},
-			errContains: "partition marked for deletion",
-		},
-		"namespaced resources namespace marked for deletion": {
-			modFn: func(artist, _ *pbresource.Resource, mockTenancyBridge *MockTenancyBridge) *pbresource.Resource {
-				mockTenancyBridge.On("IsPartitionMarkedForDeletion", "part1").Return(false, nil)
-				mockTenancyBridge.On("IsNamespaceMarkedForDeletion", "part1", "ns1").Return(true, nil)
-				return artist
-			},
-			errContains: "namespace marked for deletion",
-		},
-		"partitioned resources partition marked for deletion": {
-			modFn: func(_, recordLabel *pbresource.Resource, mockTenancyBridge *MockTenancyBridge) *pbresource.Resource {
-				mockTenancyBridge.On("IsPartitionMarkedForDeletion", "part1").Return(true, nil)
-				return recordLabel
-			},
-			errContains: "partition marked for deletion",
-		},
-	}
-	for desc, tc := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			server := testServer(t)
-			client := testClient(t, server)
-			demo.RegisterTypes(server.Registry)
-			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
-			require.NoError(t, err)
-			recordLabel.Id.Tenancy.Partition = "part1"
-
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
-			artist.Id.Tenancy.Partition = "part1"
-			artist.Id.Tenancy.Namespace = "ns1"
-
-			mockTenancyBridge := &MockTenancyBridge{}
-			mockTenancyBridge.On("PartitionExists", "part1").Return(true, nil)
-			mockTenancyBridge.On("NamespaceExists", "part1", "ns1").Return(true, nil)
-			server.TenancyBridge = mockTenancyBridge
-
-			_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: tc.modFn(artist, recordLabel, mockTenancyBridge)})
-			require.Error(t, err)
-			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-			require.Contains(t, err.Error(), tc.errContains)
-		})
-	}
-}
-
-func TestWrite_CASUpdate_Success(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	rsp2, err := client.Write(testContext(t), &pbresource.WriteRequest{
-		Resource: modifyArtist(t, rsp1.Resource),
-	})
-	require.NoError(t, err)
-
-	require.Equal(t, rsp1.Resource.Id.Uid, rsp2.Resource.Id.Uid)
-	require.NotEqual(t, rsp1.Resource.Version, rsp2.Resource.Version)
-	require.NotEqual(t, rsp1.Resource.Generation, rsp2.Resource.Generation)
-}
-
-func TestWrite_ResourceCreation_StatusProvided(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	res.Status = map[string]*pbresource.Status{
-		"consul.io/some-controller": {ObservedGeneration: ulid.Make().String()},
-	}
-
-	_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.Error(t, err)
-	require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-	require.Contains(t, err.Error(), "WriteStatus endpoint")
-}
-
-func TestWrite_CASUpdate_Failure(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	res = modifyArtist(t, rsp1.Resource)
-	res.Version = "wrong-version"
-
-	_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.Error(t, err)
-	require.Equal(t, codes.Aborted.String(), status.Code(err).String())
-	require.Contains(t, err.Error(), "CAS operation failed")
-}
-
-func TestWrite_Update_WrongUid(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	res = modifyArtist(t, rsp1.Resource)
-	res.Id.Uid = "wrong-uid"
-
-	_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.Error(t, err)
-	require.Equal(t, codes.FailedPrecondition.String(), status.Code(err).String())
-	require.Contains(t, err.Error(), "uid doesn't match")
-}
-
-func TestWrite_Update_StatusModified(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	statusRsp, err := client.WriteStatus(testContext(t), validWriteStatusRequest(t, rsp1.Resource))
-	require.NoError(t, err)
-	res = statusRsp.Resource
-
-	// Passing the staus unmodified should be fine.
-	rsp2, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	// Attempting to modify the status should return an error.
-	res = rsp2.Resource
-	res.Status["consul.io/other-controller"] = &pbresource.Status{ObservedGeneration: res.Generation}
-
-	_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.Error(t, err)
-	require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-	require.Contains(t, err.Error(), "WriteStatus endpoint")
-}
-
-func TestWrite_Update_NilStatus(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	statusRsp, err := client.WriteStatus(testContext(t), validWriteStatusRequest(t, rsp1.Resource))
-	require.NoError(t, err)
-
-	// Passing a nil status should be fine (and carry over the old status).
-	res = statusRsp.Resource
-	res.Status = nil
-
-	rsp2, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-	require.NotEmpty(t, rsp2.Resource.Status)
-}
-
-func TestWrite_Update_NoUid(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	res = modifyArtist(t, rsp1.Resource)
-	res.Id.Uid = ""
-
-	_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-}
-
-func TestWrite_Update_GroupVersion(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	res = rsp1.Resource
-	res.Id.Type = demo.TypeV1Artist
-
-	// translate artistV2 to artistV1
-	var artistV2 pbdemov2.Artist
-	require.NoError(t, res.Data.UnmarshalTo(&artistV2))
-	artistV1 := &pbdemov1.Artist{
-		Name:         artistV2.Name,
-		Description:  "some awesome band",
-		Genre:        pbdemov1.Genre_GENRE_JAZZ,
-		GroupMembers: int32(len(artistV2.GroupMembers)),
-	}
-	res.Data.MarshalFrom(artistV1)
-
-	_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-}
-
-func TestWrite_NonCASUpdate_Success(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	res = modifyArtist(t, rsp1.Resource)
-	res.Version = ""
-
-	rsp2, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-	require.NotEmpty(t, rsp2.Resource.Version)
-	require.NotEqual(t, rsp1.Resource.Version, rsp2.Resource.Version)
-}
-
-func TestWrite_NonCASUpdate_Retry(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	// Simulate conflicting writes by blocking the RPC after it has read the
-	// current version of the resource, but before it tries to make a write.
-	backend := &blockOnceBackend{
-		Backend: server.Backend,
-
-		readCh:  make(chan struct{}),
-		blockCh: make(chan struct{}),
-	}
-	server.Backend = backend
-
-	errCh := make(chan error)
-	go func() {
-		res := modifyArtist(t, rsp1.Resource)
-		res.Version = ""
-
-		_, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-		errCh <- err
-	}()
-
-	// Wait for the read, to ensure the Write in the goroutine above has read the
-	// current version of the resource.
-	<-backend.readCh
-
-	// Update the resource.
-	res = modifyArtist(t, rsp1.Resource)
-	_, err = backend.WriteCAS(testContext(t), res)
-	require.NoError(t, err)
-
-	// Unblock the read.
-	close(backend.blockCh)
-
-	// Check that the write succeeded anyway because of a retry.
-	require.NoError(t, <-errCh)
-}
-
-func TestWrite_NoData(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	res, err := demo.GenerateV1Concept("jazz")
-	require.NoError(t, err)
-
-	rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-	require.NotEmpty(t, rsp.Resource.Version)
-	require.Equal(t, rsp.Resource.Id.Name, "jazz")
-}
-
-func TestWrite_Owner_Immutable(t *testing.T) {
-	// Use of proto.Equal(..) in implementation covers all permutations
-	// (nil -> non-nil, non-nil -> nil, owner1 -> owner2) so only the first one
-	// is tested.
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	artist, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-	rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: artist})
-	require.NoError(t, err)
-	artist = rsp1.Resource
-
-	// create album with no owner
-	album, err := demo.GenerateV2Album(rsp1.Resource.Id)
-	require.NoError(t, err)
-	album.Owner = nil
-	rsp2, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: album})
-	require.NoError(t, err)
-
-	// setting owner on update should fail
-	album = rsp2.Resource
-	album.Owner = artist.Id
-	_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: album})
-	require.Error(t, err)
-	require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-	require.ErrorContains(t, err, "owner cannot be changed")
-}
-
-func TestWrite_Owner_Uid(t *testing.T) {
-	server := testServer(t)
-	client := testClient(t, server)
-
-	demo.RegisterTypes(server.Registry)
-
-	t.Run("uid given", func(t *testing.T) {
-		artist, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		album, err := demo.GenerateV2Album(artist.Id)
-		require.NoError(t, err)
-		album.Owner.Uid = ulid.Make().String()
-
-		_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: album})
-		require.NoError(t, err)
-	})
-
-	t.Run("no uid - owner not found", func(t *testing.T) {
-		artist, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		album, err := demo.GenerateV2Album(artist.Id)
-		require.NoError(t, err)
-
-		_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: album})
-		require.Error(t, err)
-		require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-	})
-
-	t.Run("no uid - automatically resolved", func(t *testing.T) {
-		artist, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: artist})
-		require.NoError(t, err)
-		artist = rsp1.Resource
-
-		album, err := demo.GenerateV2Album(clone(artist.Id))
-		require.NoError(t, err)
-
-		// Blank out the owner Uid to check it gets automatically filled in.
-		album.Owner.Uid = ""
-
-		rsp2, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: album})
-		require.NoError(t, err)
-		require.NotEmpty(t, rsp2.Resource.Owner.Uid)
-		require.Equal(t, artist.Id.Uid, rsp2.Resource.Owner.Uid)
-	})
-
-	t.Run("no-uid - update auto resolve", func(t *testing.T) {
-		artist, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		uid := ulid.Make().String()
-		album, err := demo.GenerateV2Album(artist.Id)
-		require.NoError(t, err)
-		album.Owner.Uid = uid
-
-		_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: album})
-		require.NoError(t, err)
-
-		// unset the uid and rewrite the resource
-		album.Owner.Uid = ""
-		rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: album})
-		require.NoError(t, err)
-		require.Equal(t, uid, rsp.GetResource().GetOwner().GetUid())
-	})
-}
-
-type blockOnceBackend struct {
-	storage.Backend
-
-	done    uint32
-	readCh  chan struct{}
-	blockCh chan struct{}
-}
-
-func (b *blockOnceBackend) Read(ctx context.Context, consistency storage.ReadConsistency, id *pbresource.ID) (*pbresource.Resource, error) {
-	res, err := b.Backend.Read(ctx, consistency, id)
-
-	// Block for exactly one call to Read. All subsequent calls (including those
-	// concurrent to the blocked call) will return immediately.
-	if atomic.CompareAndSwapUint32(&b.done, 0, 1) {
-		close(b.readCh)
-		<-b.blockCh
-	}
-
-	return res, err
-}
diff --git a/agent/grpc-external/services/serverdiscovery/server.go b/agent/grpc-external/services/serverdiscovery/server.go
index 99011c6d076ff..c7b2e0e1d4452 100644
--- a/agent/grpc-external/services/serverdiscovery/server.go
+++ b/agent/grpc-external/services/serverdiscovery/server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package serverdiscovery
 
 import (
diff --git a/agent/grpc-external/services/serverdiscovery/server_test.go b/agent/grpc-external/services/serverdiscovery/server_test.go
index a9fd65b7cbdce..35146f554ff41 100644
--- a/agent/grpc-external/services/serverdiscovery/server_test.go
+++ b/agent/grpc-external/services/serverdiscovery/server_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package serverdiscovery
 
 import (
diff --git a/agent/grpc-external/services/serverdiscovery/watch_servers.go b/agent/grpc-external/services/serverdiscovery/watch_servers.go
index 94ed7ac58aef6..a672560b9ce9e 100644
--- a/agent/grpc-external/services/serverdiscovery/watch_servers.go
+++ b/agent/grpc-external/services/serverdiscovery/watch_servers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package serverdiscovery
 
 import (
diff --git a/agent/grpc-external/services/serverdiscovery/watch_servers_test.go b/agent/grpc-external/services/serverdiscovery/watch_servers_test.go
index 0df48f3bb35c4..91570e3954177 100644
--- a/agent/grpc-external/services/serverdiscovery/watch_servers_test.go
+++ b/agent/grpc-external/services/serverdiscovery/watch_servers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package serverdiscovery
 
 import (
@@ -23,7 +20,7 @@ import (
 	"github.com/hashicorp/consul/agent/grpc-external/testutils"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/proto-public/pbserverdiscovery"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
diff --git a/agent/grpc-external/stats_test.go b/agent/grpc-external/stats_test.go
index 798c900148ba0..afe4ddfd0e9cd 100644
--- a/agent/grpc-external/stats_test.go
+++ b/agent/grpc-external/stats_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package external
 
 import (
@@ -21,7 +18,7 @@ import (
 	grpcmiddleware "github.com/hashicorp/consul/agent/grpc-middleware"
 	"github.com/hashicorp/consul/agent/grpc-middleware/testutil"
 	"github.com/hashicorp/consul/agent/grpc-middleware/testutil/testservice"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/prototest"
 )
 
 func TestServer_EmitsStats(t *testing.T) {
diff --git a/agent/grpc-external/testutils/acl.go b/agent/grpc-external/testutils/acl.go
index 72e0897e71fd5..a443a38ca2386 100644
--- a/agent/grpc-external/testutils/acl.go
+++ b/agent/grpc-external/testutils/acl.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package testutils
 
 import (
@@ -84,52 +81,6 @@ func ACLServiceRead(t *testing.T, serviceName string) resolver.Result {
 	}
 }
 
-func ACLUseProvidedPolicy(t *testing.T, aclPolicy *acl.Policy) resolver.Result {
-	t.Helper()
-
-	authz, err := acl.NewPolicyAuthorizerWithDefaults(acl.DenyAll(), []*acl.Policy{aclPolicy}, nil)
-	require.NoError(t, err)
-
-	return resolver.Result{
-		Authorizer:  authz,
-		ACLIdentity: randomACLIdentity(t),
-	}
-}
-
-func ACLOperatorRead(t *testing.T) resolver.Result {
-	t.Helper()
-
-	aclRule := &acl.Policy{
-		PolicyRules: acl.PolicyRules{
-			Operator: acl.PolicyRead,
-		},
-	}
-	authz, err := acl.NewPolicyAuthorizerWithDefaults(acl.DenyAll(), []*acl.Policy{aclRule}, nil)
-	require.NoError(t, err)
-
-	return resolver.Result{
-		Authorizer:  authz,
-		ACLIdentity: randomACLIdentity(t),
-	}
-}
-
-func ACLOperatorWrite(t *testing.T) resolver.Result {
-	t.Helper()
-
-	aclRule := &acl.Policy{
-		PolicyRules: acl.PolicyRules{
-			Operator: acl.PolicyWrite,
-		},
-	}
-	authz, err := acl.NewPolicyAuthorizerWithDefaults(acl.DenyAll(), []*acl.Policy{aclRule}, nil)
-	require.NoError(t, err)
-
-	return resolver.Result{
-		Authorizer:  authz,
-		ACLIdentity: randomACLIdentity(t),
-	}
-}
-
 func randomACLIdentity(t *testing.T) structs.ACLIdentity {
 	id, err := uuid.GenerateUUID()
 	require.NoError(t, err)
diff --git a/agent/grpc-external/testutils/fsm.go b/agent/grpc-external/testutils/fsm.go
index fdec1b109ed36..aea426a4ea1b3 100644
--- a/agent/grpc-external/testutils/fsm.go
+++ b/agent/grpc-external/testutils/fsm.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package testutils
 
 import (
diff --git a/agent/grpc-external/testutils/server.go b/agent/grpc-external/testutils/server.go
index 13cbb985e564e..53d779d9127ab 100644
--- a/agent/grpc-external/testutils/server.go
+++ b/agent/grpc-external/testutils/server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package testutils
 
 import (
diff --git a/agent/grpc-external/utils.go b/agent/grpc-external/utils.go
index 13c84c75c1ce4..bb218ddf0e049 100644
--- a/agent/grpc-external/utils.go
+++ b/agent/grpc-external/utils.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package external
 
 import (
diff --git a/agent/grpc-internal/balancer/balancer.go b/agent/grpc-internal/balancer/balancer.go
index 884c2a1dec3dc..64521d4567fff 100644
--- a/agent/grpc-internal/balancer/balancer.go
+++ b/agent/grpc-internal/balancer/balancer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // package balancer implements a custom gRPC load balancer.
 //
 // Similarly to gRPC's built-in "pick_first" balancer, our balancer will pin the
diff --git a/agent/grpc-internal/balancer/balancer_test.go b/agent/grpc-internal/balancer/balancer_test.go
index f0c6db9f53296..8406e7c7b70a4 100644
--- a/agent/grpc-internal/balancer/balancer_test.go
+++ b/agent/grpc-internal/balancer/balancer_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package balancer
 
 import (
diff --git a/agent/grpc-internal/balancer/registry.go b/agent/grpc-internal/balancer/registry.go
index 53b2e6555ac30..778b2c31c5fbe 100644
--- a/agent/grpc-internal/balancer/registry.go
+++ b/agent/grpc-internal/balancer/registry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package balancer
 
 import (
diff --git a/agent/grpc-internal/client.go b/agent/grpc-internal/client.go
index 1d49bc23cdd31..38010ac24526e 100644
--- a/agent/grpc-internal/client.go
+++ b/agent/grpc-internal/client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package internal
 
 import (
diff --git a/agent/grpc-internal/client_test.go b/agent/grpc-internal/client_test.go
index 134a62aa4aae3..f27808af6f220 100644
--- a/agent/grpc-internal/client_test.go
+++ b/agent/grpc-internal/client_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package internal
 
 import (
@@ -390,7 +387,6 @@ func TestClientConnPool_IntegrationWithGRPCResolver_MultiDC(t *testing.T) {
 	res := resolver.NewServerResolverBuilder(newConfig(t, "dc1", "server"))
 	bb := balancer.NewBuilder(res.Authority(), testutil.Logger(t))
 	registerWithGRPC(t, res, bb)
-
 	pool := NewClientConnPool(ClientConnPoolConfig{
 		Servers:               res,
 		UseTLSForDC:           useTLSForDcAlwaysTrue,
diff --git a/agent/grpc-internal/handler.go b/agent/grpc-internal/handler.go
index b0eeaa8a4f0c2..6d55604234202 100644
--- a/agent/grpc-internal/handler.go
+++ b/agent/grpc-internal/handler.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package internal
 
 import (
@@ -14,10 +11,9 @@ import (
 
 	middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"
+	"github.com/hashicorp/consul/agent/consul/rate"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/keepalive"
-
-	"github.com/hashicorp/consul/agent/consul/rate"
 )
 
 var (
@@ -61,14 +57,15 @@ func NewHandler(logger Logger, addr net.Addr, register func(server *grpc.Server)
 	srv := grpc.NewServer(opts...)
 	register(srv)
 
-	return &Handler{srv: srv, listener: NewListener(addr)}
+	lis := &chanListener{addr: addr, conns: make(chan net.Conn), done: make(chan struct{})}
+	return &Handler{srv: srv, listener: lis}
 }
 
 // Handler implements a handler for the rpc server listener, and the
 // agent.Component interface for managing the lifecycle of the grpc.Server.
 type Handler struct {
 	srv      *grpc.Server
-	listener *Listener
+	listener *chanListener
 }
 
 // Handle the connection by sending it to a channel for the grpc.Server to receive.
@@ -85,6 +82,38 @@ func (h *Handler) Shutdown() error {
 	return nil
 }
 
+// chanListener implements net.Listener for grpc.Server.
+type chanListener struct {
+	conns chan net.Conn
+	addr  net.Addr
+	done  chan struct{}
+}
+
+// Accept blocks until a connection is received from Handle, and then returns the
+// connection. Accept implements part of the net.Listener interface for grpc.Server.
+func (l *chanListener) Accept() (net.Conn, error) {
+	select {
+	case c := <-l.conns:
+		return c, nil
+	case <-l.done:
+		return nil, &net.OpError{
+			Op:   "accept",
+			Net:  l.addr.Network(),
+			Addr: l.addr,
+			Err:  fmt.Errorf("listener closed"),
+		}
+	}
+}
+
+func (l *chanListener) Addr() net.Addr {
+	return l.addr
+}
+
+func (l *chanListener) Close() error {
+	close(l.done)
+	return nil
+}
+
 // NoOpHandler implements the same methods as Handler, but performs no handling.
 // It may be used in place of Handler to disable the grpc server.
 type NoOpHandler struct {
diff --git a/agent/grpc-internal/handler_test.go b/agent/grpc-internal/handler_test.go
index 2027c055866de..c8b2d5fd3feb2 100644
--- a/agent/grpc-internal/handler_test.go
+++ b/agent/grpc-internal/handler_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package internal
 
 import (
diff --git a/agent/grpc-internal/listener.go b/agent/grpc-internal/listener.go
deleted file mode 100644
index a1c226613778c..0000000000000
--- a/agent/grpc-internal/listener.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package internal
-
-import (
-	"fmt"
-	"net"
-)
-
-// Listener implements the net.Listener interface and allows you to manually
-// pass connections to it. This is useful when you need to accept connections
-// and do something with them yourself first (e.g. handling our multiplexing
-// scheme) before giving them to the gRPC server.
-type Listener struct {
-	addr  net.Addr
-	conns chan net.Conn
-	done  chan struct{}
-}
-
-var _ net.Listener = (*Listener)(nil)
-
-// NewListener creates a Listener with the given address.
-func NewListener(addr net.Addr) *Listener {
-	return &Listener{
-		addr:  addr,
-		conns: make(chan net.Conn),
-		done:  make(chan struct{}),
-	}
-
-}
-
-// Handle makes the given connection available to Accept.
-func (l *Listener) Handle(conn net.Conn) {
-	select {
-	case l.conns <- conn:
-	case <-l.done:
-		_ = conn.Close()
-	}
-}
-
-// Accept a connection.
-func (l *Listener) Accept() (net.Conn, error) {
-	select {
-	case c := <-l.conns:
-		return c, nil
-	case <-l.done:
-		return nil, &net.OpError{
-			Op:   "accept",
-			Net:  l.addr.Network(),
-			Addr: l.addr,
-			Err:  fmt.Errorf("listener closed"),
-		}
-	}
-}
-
-// Addr returns the listener's address.
-func (l *Listener) Addr() net.Addr { return l.addr }
-
-// Close the listener.
-func (l *Listener) Close() error {
-	close(l.done)
-	return nil
-}
diff --git a/agent/grpc-internal/pipe.go b/agent/grpc-internal/pipe.go
deleted file mode 100644
index 555f6d2162aa3..0000000000000
--- a/agent/grpc-internal/pipe.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package internal
-
-import (
-	"context"
-	"errors"
-	"net"
-	"sync/atomic"
-)
-
-// ErrPipeClosed is returned when calling Accept or DialContext on a closed
-// PipeListener.
-var ErrPipeClosed = errors.New("pipe listener has been closed")
-
-// PipeListener implements the net.Listener interface using a net.Pipe so that
-// you can interact with a gRPC service in the same process without going over
-// the network.
-type PipeListener struct {
-	conns  chan net.Conn
-	closed atomic.Bool
-	done   chan struct{}
-}
-
-var _ net.Listener = (*PipeListener)(nil)
-
-// NewPipeListener creates a new PipeListener.
-func NewPipeListener() *PipeListener {
-	return &PipeListener{
-		conns: make(chan net.Conn),
-		done:  make(chan struct{}),
-	}
-}
-
-// Accept a connection.
-func (p *PipeListener) Accept() (net.Conn, error) {
-	select {
-	case conn := <-p.conns:
-		return conn, nil
-	case <-p.done:
-		return nil, ErrPipeClosed
-	}
-}
-
-// Close the listener.
-func (p *PipeListener) Close() error {
-	if p.closed.CompareAndSwap(false, true) {
-		close(p.done)
-	}
-	return nil
-}
-
-// DialContext dials the server over an in-process pipe.
-func (p *PipeListener) DialContext(ctx context.Context, _ string) (net.Conn, error) {
-	if p.closed.Load() {
-		return nil, ErrPipeClosed
-	}
-
-	serverConn, clientConn := net.Pipe()
-
-	select {
-	// Send the server connection to whatever is accepting connections from the
-	// PipeListener. This will block until something has accepted the conn.
-	case p.conns <- serverConn:
-		return clientConn, nil
-	case <-ctx.Done():
-		serverConn.Close()
-		clientConn.Close()
-		return nil, ctx.Err()
-	case <-p.done:
-		serverConn.Close()
-		clientConn.Close()
-		return nil, ErrPipeClosed
-	}
-}
-
-// Add returns the listener's address.
-func (*PipeListener) Addr() net.Addr { return pipeAddr{} }
-
-type pipeAddr struct{}
-
-func (pipeAddr) Network() string { return "pipe" }
-func (pipeAddr) String() string  { return "pipe" }
diff --git a/agent/grpc-internal/pipe_test.go b/agent/grpc-internal/pipe_test.go
deleted file mode 100644
index f51d1581292b2..0000000000000
--- a/agent/grpc-internal/pipe_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package internal
-
-import (
-	"bufio"
-	"context"
-	"net"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestPipeListener_RoundTrip(t *testing.T) {
-	lis := NewPipeListener()
-	t.Cleanup(func() { _ = lis.Close() })
-
-	go echoServer(lis)
-
-	conn, err := lis.DialContext(context.Background(), "")
-	require.NoError(t, err)
-	t.Cleanup(func() { _ = conn.Close() })
-
-	input := []byte("Hello World\n")
-	_, err = conn.Write(input)
-	require.NoError(t, err)
-
-	output := make([]byte, len(input))
-	_, err = conn.Read(output)
-	require.NoError(t, err)
-
-	require.Equal(t, string(input), string(output))
-}
-
-func TestPipeListener_Closed(t *testing.T) {
-	lis := NewPipeListener()
-	require.NoError(t, lis.Close())
-
-	_, err := lis.Accept()
-	require.ErrorIs(t, err, ErrPipeClosed)
-
-	_, err = lis.DialContext(context.Background(), "")
-	require.ErrorIs(t, err, ErrPipeClosed)
-}
-
-func echoServer(lis net.Listener) {
-	handleConn := func(conn net.Conn) {
-		defer conn.Close()
-
-		reader := bufio.NewReader(conn)
-		for {
-			msg, err := reader.ReadBytes('\n')
-			if err != nil {
-				return
-			}
-			if _, err := conn.Write(msg); err != nil {
-				return
-			}
-		}
-	}
-
-	for {
-		conn, err := lis.Accept()
-		if err != nil {
-			return
-		}
-		go handleConn(conn)
-	}
-}
diff --git a/agent/grpc-internal/resolver/registry.go b/agent/grpc-internal/resolver/registry.go
index aab369c501314..61e2b8ffe73a0 100644
--- a/agent/grpc-internal/resolver/registry.go
+++ b/agent/grpc-internal/resolver/registry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package resolver
 
 import (
diff --git a/agent/grpc-internal/resolver/resolver.go b/agent/grpc-internal/resolver/resolver.go
index 8d1436bf7aff2..0d43d0a3903e7 100644
--- a/agent/grpc-internal/resolver/resolver.go
+++ b/agent/grpc-internal/resolver/resolver.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package resolver
 
 import (
@@ -96,7 +93,7 @@ func (s *ServerResolverBuilder) Build(target resolver.Target, cc resolver.Client
 	}
 
 	//nolint:staticcheck
-	serverType, datacenter, err := parseEndpoint(target.Endpoint())
+	serverType, datacenter, err := parseEndpoint(target.Endpoint)
 	if err != nil {
 		return nil, err
 	}
diff --git a/agent/grpc-internal/resolver/resolver_test.go b/agent/grpc-internal/resolver/resolver_test.go
index 0914eba147bae..ab6e403d7dee2 100644
--- a/agent/grpc-internal/resolver/resolver_test.go
+++ b/agent/grpc-internal/resolver/resolver_test.go
@@ -1,12 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package resolver
 
 import (
 	"fmt"
 	"net"
-	"net/url"
 	"strings"
 	"testing"
 
@@ -44,7 +40,7 @@ func TestServerResolverBuilder(t *testing.T) {
 		_, err := rs.Build(resolver.Target{
 			Scheme:    "consul",
 			Authority: rs.Authority(),
-			URL:       url.URL{Opaque: endpoint},
+			Endpoint:  endpoint,
 		}, cc, resolver.BuildOptions{})
 		require.NoError(t, err)
 
diff --git a/agent/grpc-internal/server_test.go b/agent/grpc-internal/server_test.go
index 12f420979b6ee..26166c1e0509e 100644
--- a/agent/grpc-internal/server_test.go
+++ b/agent/grpc-internal/server_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package internal
 
 import (
diff --git a/agent/grpc-internal/services/subscribe/logger.go b/agent/grpc-internal/services/subscribe/logger.go
index 11c18f6adfa48..4a494d8c884dc 100644
--- a/agent/grpc-internal/services/subscribe/logger.go
+++ b/agent/grpc-internal/services/subscribe/logger.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package subscribe
 
 import (
@@ -10,7 +7,7 @@ import (
 	"github.com/hashicorp/go-uuid"
 
 	"github.com/hashicorp/consul/agent/consul/stream"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // streamID is used in logs as a unique identifier for a subscription. The value
diff --git a/agent/grpc-internal/services/subscribe/subscribe.go b/agent/grpc-internal/services/subscribe/subscribe.go
index a728b0164c977..b78af0e38cd71 100644
--- a/agent/grpc-internal/services/subscribe/subscribe.go
+++ b/agent/grpc-internal/services/subscribe/subscribe.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package subscribe
 
 import (
@@ -15,7 +12,7 @@ import (
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // Server implements a StateChangeSubscriptionServer for accepting SubscribeRequests,
diff --git a/agent/grpc-internal/services/subscribe/subscribe_test.go b/agent/grpc-internal/services/subscribe/subscribe_test.go
index 910862d4cfbd4..f31169eb94ef4 100644
--- a/agent/grpc-internal/services/subscribe/subscribe_test.go
+++ b/agent/grpc-internal/services/subscribe/subscribe_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package subscribe
 
 import (
@@ -28,10 +25,10 @@ import (
 	grpc "github.com/hashicorp/consul/agent/grpc-internal"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/proto/private/pbservice"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/pbcommon"
+	"github.com/hashicorp/consul/proto/pbservice"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/types"
 )
diff --git a/agent/grpc-internal/stats_test.go b/agent/grpc-internal/stats_test.go
index d14c4c46bc451..49059eaf4a504 100644
--- a/agent/grpc-internal/stats_test.go
+++ b/agent/grpc-internal/stats_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package internal
 
 import (
@@ -20,7 +17,7 @@ import (
 	"github.com/hashicorp/consul/agent/consul/rate"
 	"github.com/hashicorp/consul/agent/grpc-middleware/testutil"
 	"github.com/hashicorp/consul/agent/grpc-middleware/testutil/testservice"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/prototest"
 )
 
 func noopRegister(*grpc.Server) {}
diff --git a/agent/grpc-internal/tracker.go b/agent/grpc-internal/tracker.go
index 251fe48f95399..779e116e8b128 100644
--- a/agent/grpc-internal/tracker.go
+++ b/agent/grpc-internal/tracker.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package internal
 
 import (
diff --git a/agent/grpc-middleware/auth_interceptor.go b/agent/grpc-middleware/auth_interceptor.go
index af85e5c6f94c2..bc9082c75e1fd 100644
--- a/agent/grpc-middleware/auth_interceptor.go
+++ b/agent/grpc-middleware/auth_interceptor.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package middleware
 
 import (
diff --git a/agent/grpc-middleware/auth_interceptor_test.go b/agent/grpc-middleware/auth_interceptor_test.go
index 0c447499bcb2f..512d5ed5501f9 100644
--- a/agent/grpc-middleware/auth_interceptor_test.go
+++ b/agent/grpc-middleware/auth_interceptor_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package middleware
 
 import (
diff --git a/agent/grpc-middleware/handshake.go b/agent/grpc-middleware/handshake.go
index 893421e0e7f1b..8fe4c2739ed8c 100644
--- a/agent/grpc-middleware/handshake.go
+++ b/agent/grpc-middleware/handshake.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package middleware
 
 import (
diff --git a/agent/grpc-middleware/handshake_test.go b/agent/grpc-middleware/handshake_test.go
index 178451a31464c..78f4f4f87a70b 100644
--- a/agent/grpc-middleware/handshake_test.go
+++ b/agent/grpc-middleware/handshake_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package middleware
 
 import (
diff --git a/agent/grpc-middleware/rate.go b/agent/grpc-middleware/rate.go
index bdb63cd244a97..e295757bb5e95 100644
--- a/agent/grpc-middleware/rate.go
+++ b/agent/grpc-middleware/rate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package middleware
 
 import (
@@ -41,7 +38,7 @@ func ServerRateLimiterMiddleware(limiter rate.RequestLimitsHandler, panicHandler
 			return ctx, status.Error(codes.Internal, "gRPC rate limit middleware unable to read peer")
 		}
 
-		operationSpec, ok := rpcRateLimitSpecs[info.FullMethodName]
+		operationType, ok := rpcRateLimitSpecs[info.FullMethodName]
 		if !ok {
 			logger.Warn("failed to determine which rate limit to apply to RPC", "rpc", info.FullMethodName)
 			return ctx, nil
@@ -50,8 +47,7 @@ func ServerRateLimiterMiddleware(limiter rate.RequestLimitsHandler, panicHandler
 		err := limiter.Allow(rate.Operation{
 			Name:       info.FullMethodName,
 			SourceAddr: peer.Addr,
-			Type:       operationSpec.Type,
-			Category:   operationSpec.Category,
+			Type:       operationType,
 		})
 
 		switch {
diff --git a/agent/grpc-middleware/rate_limit_mappings.gen.go b/agent/grpc-middleware/rate_limit_mappings.gen.go
index fc73aa9d9cf29..663d737394235 100644
--- a/agent/grpc-middleware/rate_limit_mappings.gen.go
+++ b/agent/grpc-middleware/rate_limit_mappings.gen.go
@@ -3,36 +3,25 @@ package middleware
 
 import "github.com/hashicorp/consul/agent/consul/rate"
 
-var rpcRateLimitSpecs = map[string]rate.OperationSpec{
-	"/hashicorp.consul.acl.ACLService/Login":                                     {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryACL},
-	"/hashicorp.consul.acl.ACLService/Logout":                                    {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryACL},
-	"/hashicorp.consul.connectca.ConnectCAService/Sign":                          {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryConnectCA},
-	"/hashicorp.consul.connectca.ConnectCAService/WatchRoots":                    {Type: rate.OperationTypeRead, Category: rate.OperationCategoryConnectCA},
-	"/hashicorp.consul.dataplane.DataplaneService/GetEnvoyBootstrapParams":       {Type: rate.OperationTypeRead, Category: rate.OperationCategoryDataPlane},
-	"/hashicorp.consul.dataplane.DataplaneService/GetSupportedDataplaneFeatures": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryDataPlane},
-	"/hashicorp.consul.dns.DNSService/Query":                                     {Type: rate.OperationTypeRead, Category: rate.OperationCategoryDNS},
-	"/hashicorp.consul.internal.operator.OperatorService/TransferLeader":         {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryOperator},
-	"/hashicorp.consul.internal.peering.PeeringService/Establish":                {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryPeering},
-	"/hashicorp.consul.internal.peering.PeeringService/GenerateToken":            {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryPeering},
-	"/hashicorp.consul.internal.peering.PeeringService/PeeringDelete":            {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryPeering},
-	"/hashicorp.consul.internal.peering.PeeringService/PeeringList":              {Type: rate.OperationTypeRead, Category: rate.OperationCategoryPeering},
-	"/hashicorp.consul.internal.peering.PeeringService/PeeringRead":              {Type: rate.OperationTypeRead, Category: rate.OperationCategoryPeering},
-	"/hashicorp.consul.internal.peering.PeeringService/PeeringWrite":             {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryPeering},
-	"/hashicorp.consul.internal.peering.PeeringService/TrustBundleListByService": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryPeering},
-	"/hashicorp.consul.internal.peering.PeeringService/TrustBundleRead":          {Type: rate.OperationTypeRead, Category: rate.OperationCategoryPeering},
-	"/hashicorp.consul.internal.peerstream.PeerStreamService/ExchangeSecret":     {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryPeerStream},
-	"/hashicorp.consul.internal.peerstream.PeerStreamService/StreamResources":    {Type: rate.OperationTypeRead, Category: rate.OperationCategoryPeerStream},
-	"/hashicorp.consul.internal.storage.raft.ForwardingService/Delete":           {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryResource},
-	"/hashicorp.consul.internal.storage.raft.ForwardingService/List":             {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryResource},
-	"/hashicorp.consul.internal.storage.raft.ForwardingService/Read":             {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryResource},
-	"/hashicorp.consul.internal.storage.raft.ForwardingService/Write":            {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryResource},
-	"/hashicorp.consul.resource.ResourceService/Delete":                          {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryResource},
-	"/hashicorp.consul.resource.ResourceService/List":                            {Type: rate.OperationTypeRead, Category: rate.OperationCategoryResource},
-	"/hashicorp.consul.resource.ResourceService/ListByOwner":                     {Type: rate.OperationTypeRead, Category: rate.OperationCategoryResource},
-	"/hashicorp.consul.resource.ResourceService/Read":                            {Type: rate.OperationTypeRead, Category: rate.OperationCategoryResource},
-	"/hashicorp.consul.resource.ResourceService/WatchList":                       {Type: rate.OperationTypeRead, Category: rate.OperationCategoryResource},
-	"/hashicorp.consul.resource.ResourceService/Write":                           {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryResource},
-	"/hashicorp.consul.resource.ResourceService/WriteStatus":                     {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryResource},
-	"/hashicorp.consul.serverdiscovery.ServerDiscoveryService/WatchServers":      {Type: rate.OperationTypeRead, Category: rate.OperationCategoryServerDiscovery},
-	"/subscribe.StateChangeSubscription/Subscribe":                               {Type: rate.OperationTypeRead, Category: rate.OperationCategorySubscribe},
+var rpcRateLimitSpecs = map[string]rate.OperationType{
+	"/hashicorp.consul.acl.ACLService/Login":                                     rate.OperationTypeWrite,
+	"/hashicorp.consul.acl.ACLService/Logout":                                    rate.OperationTypeWrite,
+	"/hashicorp.consul.connectca.ConnectCAService/Sign":                          rate.OperationTypeWrite,
+	"/hashicorp.consul.connectca.ConnectCAService/WatchRoots":                    rate.OperationTypeRead,
+	"/hashicorp.consul.dataplane.DataplaneService/GetEnvoyBootstrapParams":       rate.OperationTypeRead,
+	"/hashicorp.consul.dataplane.DataplaneService/GetSupportedDataplaneFeatures": rate.OperationTypeRead,
+	"/hashicorp.consul.dns.DNSService/Query":                                     rate.OperationTypeRead,
+	"/hashicorp.consul.internal.operator.OperatorService/TransferLeader":         rate.OperationTypeExempt,
+	"/hashicorp.consul.internal.peering.PeeringService/Establish":                rate.OperationTypeWrite,
+	"/hashicorp.consul.internal.peering.PeeringService/GenerateToken":            rate.OperationTypeWrite,
+	"/hashicorp.consul.internal.peering.PeeringService/PeeringDelete":            rate.OperationTypeWrite,
+	"/hashicorp.consul.internal.peering.PeeringService/PeeringList":              rate.OperationTypeRead,
+	"/hashicorp.consul.internal.peering.PeeringService/PeeringRead":              rate.OperationTypeRead,
+	"/hashicorp.consul.internal.peering.PeeringService/PeeringWrite":             rate.OperationTypeWrite,
+	"/hashicorp.consul.internal.peering.PeeringService/TrustBundleListByService": rate.OperationTypeRead,
+	"/hashicorp.consul.internal.peering.PeeringService/TrustBundleRead":          rate.OperationTypeRead,
+	"/hashicorp.consul.internal.peerstream.PeerStreamService/ExchangeSecret":     rate.OperationTypeWrite,
+	"/hashicorp.consul.internal.peerstream.PeerStreamService/StreamResources":    rate.OperationTypeRead,
+	"/hashicorp.consul.serverdiscovery.ServerDiscoveryService/WatchServers":      rate.OperationTypeRead,
+	"/subscribe.StateChangeSubscription/Subscribe":                               rate.OperationTypeRead,
 }
diff --git a/agent/grpc-middleware/rate_test.go b/agent/grpc-middleware/rate_test.go
index 16c84734a9edd..a82b448eabe7a 100644
--- a/agent/grpc-middleware/rate_test.go
+++ b/agent/grpc-middleware/rate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package middleware
 
 import (
diff --git a/agent/grpc-middleware/recovery.go b/agent/grpc-middleware/recovery.go
index 04b918ee9b3a2..c562683ca357b 100644
--- a/agent/grpc-middleware/recovery.go
+++ b/agent/grpc-middleware/recovery.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package middleware
 
 import (
diff --git a/agent/grpc-middleware/stats.go b/agent/grpc-middleware/stats.go
index a6bf1d2c59bec..3a1b3f23e0fd7 100644
--- a/agent/grpc-middleware/stats.go
+++ b/agent/grpc-middleware/stats.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package middleware
 
 import (
diff --git a/agent/grpc-middleware/testutil/fake_sink.go b/agent/grpc-middleware/testutil/fake_sink.go
index be7623c774a2c..7439d78a26242 100644
--- a/agent/grpc-middleware/testutil/fake_sink.go
+++ b/agent/grpc-middleware/testutil/fake_sink.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package testutil
 
 import (
diff --git a/agent/grpc-middleware/testutil/testservice/buf.gen.yaml b/agent/grpc-middleware/testutil/testservice/buf.gen.yaml
index 8d8a6c7dbfc09..c654680d4e7bd 100644
--- a/agent/grpc-middleware/testutil/testservice/buf.gen.yaml
+++ b/agent/grpc-middleware/testutil/testservice/buf.gen.yaml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 version: v1
 managed:
   enabled: true
diff --git a/agent/grpc-middleware/testutil/testservice/fake_service.go b/agent/grpc-middleware/testutil/testservice/fake_service.go
index ca21d286f0b35..f9999cc71f39d 100644
--- a/agent/grpc-middleware/testutil/testservice/fake_service.go
+++ b/agent/grpc-middleware/testutil/testservice/fake_service.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package testservice
 
 import (
diff --git a/agent/grpc-middleware/testutil/testservice/simple.pb.binary.go b/agent/grpc-middleware/testutil/testservice/simple.pb.binary.go
index 7846675951384..1814a991a3847 100644
--- a/agent/grpc-middleware/testutil/testservice/simple.pb.binary.go
+++ b/agent/grpc-middleware/testutil/testservice/simple.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: simple.proto
+// source: agent/grpc-middleware/testutil/testservice/simple.proto
 
 package testservice
 
diff --git a/agent/grpc-middleware/testutil/testservice/simple.pb.go b/agent/grpc-middleware/testutil/testservice/simple.pb.go
index b4f664bf1ca73..96a36fdb53af5 100644
--- a/agent/grpc-middleware/testutil/testservice/simple.pb.go
+++ b/agent/grpc-middleware/testutil/testservice/simple.pb.go
@@ -1,11 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
+// 	protoc-gen-go v1.28.1
 // 	protoc        (unknown)
-// source: simple.proto
+// source: agent/grpc-middleware/testutil/testservice/simple.proto
 
 package testservice
 
@@ -34,7 +31,7 @@ type Req struct {
 func (x *Req) Reset() {
 	*x = Req{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_simple_proto_msgTypes[0]
+		mi := &file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -47,7 +44,7 @@ func (x *Req) String() string {
 func (*Req) ProtoMessage() {}
 
 func (x *Req) ProtoReflect() protoreflect.Message {
-	mi := &file_simple_proto_msgTypes[0]
+	mi := &file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -60,7 +57,7 @@ func (x *Req) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Req.ProtoReflect.Descriptor instead.
 func (*Req) Descriptor() ([]byte, []int) {
-	return file_simple_proto_rawDescGZIP(), []int{0}
+	return file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *Req) GetDatacenter() string {
@@ -82,7 +79,7 @@ type Resp struct {
 func (x *Resp) Reset() {
 	*x = Resp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_simple_proto_msgTypes[1]
+		mi := &file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -95,7 +92,7 @@ func (x *Resp) String() string {
 func (*Resp) ProtoMessage() {}
 
 func (x *Resp) ProtoReflect() protoreflect.Message {
-	mi := &file_simple_proto_msgTypes[1]
+	mi := &file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -108,7 +105,7 @@ func (x *Resp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Resp.ProtoReflect.Descriptor instead.
 func (*Resp) Descriptor() ([]byte, []int) {
-	return file_simple_proto_rawDescGZIP(), []int{1}
+	return file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *Resp) GetServerName() string {
@@ -125,57 +122,62 @@ func (x *Resp) GetDatacenter() string {
 	return ""
 }
 
-var File_simple_proto protoreflect.FileDescriptor
-
-var file_simple_proto_rawDesc = []byte{
-	0x0a, 0x0c, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0b,
-	0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x25, 0x0a, 0x03, 0x52,
-	0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74,
-	0x65, 0x72, 0x22, 0x46, 0x0a, 0x04, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
-	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61,
-	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
-	0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x32, 0x6d, 0x0a, 0x06, 0x53, 0x69,
-	0x6d, 0x70, 0x6c, 0x65, 0x12, 0x32, 0x0a, 0x09, 0x53, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e,
-	0x67, 0x12, 0x10, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
-	0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x2f, 0x0a, 0x04, 0x46, 0x6c, 0x6f, 0x77,
-	0x12, 0x10, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52,
-	0x65, 0x71, 0x1a, 0x11, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x2e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x30, 0x01, 0x42, 0xb2, 0x01, 0x0a, 0x0f, 0x63, 0x6f,
-	0x6d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x0b, 0x53,
-	0x69, 0x6d, 0x70, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f,
-	0x67, 0x72, 0x70, 0x63, 0x2d, 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x77, 0x61, 0x72, 0x65, 0x2f,
-	0x74, 0x65, 0x73, 0x74, 0x75, 0x74, 0x69, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa, 0x02, 0x0b, 0x54, 0x65, 0x73,
-	0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xca, 0x02, 0x0b, 0x54, 0x65, 0x73, 0x74, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xe2, 0x02, 0x17, 0x54, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0xea, 0x02, 0x0b, 0x54, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+var File_agent_grpc_middleware_testutil_testservice_simple_proto protoreflect.FileDescriptor
+
+var file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDesc = []byte{
+	0x0a, 0x37, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2d, 0x6d, 0x69, 0x64,
+	0x64, 0x6c, 0x65, 0x77, 0x61, 0x72, 0x65, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x75, 0x74, 0x69, 0x6c,
+	0x2f, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x73, 0x69, 0x6d,
+	0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0b, 0x74, 0x65, 0x73, 0x74, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x25, 0x0a, 0x03, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a,
+	0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x22, 0x46, 0x0a,
+	0x04, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x65,
+	0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e,
+	0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63,
+	0x65, 0x6e, 0x74, 0x65, 0x72, 0x32, 0x6d, 0x0a, 0x06, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x12,
+	0x32, 0x0a, 0x09, 0x53, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x2e, 0x74,
+	0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x71, 0x1a, 0x11,
+	0x2e, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73,
+	0x70, 0x22, 0x00, 0x12, 0x2f, 0x0a, 0x04, 0x46, 0x6c, 0x6f, 0x77, 0x12, 0x10, 0x2e, 0x74, 0x65,
+	0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e,
+	0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70,
+	0x22, 0x00, 0x30, 0x01, 0x42, 0xdd, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x73,
+	0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x0b, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x71, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2d,
+	0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x77, 0x61, 0x72, 0x65, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x75,
+	0x74, 0x69, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f,
+	0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2d, 0x6d, 0x69, 0x64, 0x64, 0x6c,
+	0x65, 0x77, 0x61, 0x72, 0x65, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x75, 0x74, 0x69, 0x6c, 0x2f, 0x74,
+	0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58,
+	0xaa, 0x02, 0x0b, 0x54, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xca, 0x02,
+	0x0b, 0x54, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xe2, 0x02, 0x17, 0x54,
+	0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0b, 0x54, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_simple_proto_rawDescOnce sync.Once
-	file_simple_proto_rawDescData = file_simple_proto_rawDesc
+	file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescOnce sync.Once
+	file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescData = file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDesc
 )
 
-func file_simple_proto_rawDescGZIP() []byte {
-	file_simple_proto_rawDescOnce.Do(func() {
-		file_simple_proto_rawDescData = protoimpl.X.CompressGZIP(file_simple_proto_rawDescData)
+func file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescGZIP() []byte {
+	file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescOnce.Do(func() {
+		file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescData = protoimpl.X.CompressGZIP(file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescData)
 	})
-	return file_simple_proto_rawDescData
+	return file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDescData
 }
 
-var file_simple_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_simple_proto_goTypes = []interface{}{
+var file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_agent_grpc_middleware_testutil_testservice_simple_proto_goTypes = []interface{}{
 	(*Req)(nil),  // 0: testservice.Req
 	(*Resp)(nil), // 1: testservice.Resp
 }
-var file_simple_proto_depIdxs = []int32{
+var file_agent_grpc_middleware_testutil_testservice_simple_proto_depIdxs = []int32{
 	0, // 0: testservice.Simple.Something:input_type -> testservice.Req
 	0, // 1: testservice.Simple.Flow:input_type -> testservice.Req
 	1, // 2: testservice.Simple.Something:output_type -> testservice.Resp
@@ -187,13 +189,13 @@ var file_simple_proto_depIdxs = []int32{
 	0, // [0:0] is the sub-list for field type_name
 }
 
-func init() { file_simple_proto_init() }
-func file_simple_proto_init() {
-	if File_simple_proto != nil {
+func init() { file_agent_grpc_middleware_testutil_testservice_simple_proto_init() }
+func file_agent_grpc_middleware_testutil_testservice_simple_proto_init() {
+	if File_agent_grpc_middleware_testutil_testservice_simple_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_simple_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Req); i {
 			case 0:
 				return &v.state
@@ -205,7 +207,7 @@ func file_simple_proto_init() {
 				return nil
 			}
 		}
-		file_simple_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Resp); i {
 			case 0:
 				return &v.state
@@ -222,18 +224,18 @@ func file_simple_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_simple_proto_rawDesc,
+			RawDescriptor: file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_simple_proto_goTypes,
-		DependencyIndexes: file_simple_proto_depIdxs,
-		MessageInfos:      file_simple_proto_msgTypes,
+		GoTypes:           file_agent_grpc_middleware_testutil_testservice_simple_proto_goTypes,
+		DependencyIndexes: file_agent_grpc_middleware_testutil_testservice_simple_proto_depIdxs,
+		MessageInfos:      file_agent_grpc_middleware_testutil_testservice_simple_proto_msgTypes,
 	}.Build()
-	File_simple_proto = out.File
-	file_simple_proto_rawDesc = nil
-	file_simple_proto_goTypes = nil
-	file_simple_proto_depIdxs = nil
+	File_agent_grpc_middleware_testutil_testservice_simple_proto = out.File
+	file_agent_grpc_middleware_testutil_testservice_simple_proto_rawDesc = nil
+	file_agent_grpc_middleware_testutil_testservice_simple_proto_goTypes = nil
+	file_agent_grpc_middleware_testutil_testservice_simple_proto_depIdxs = nil
 }
diff --git a/agent/grpc-middleware/testutil/testservice/simple.proto b/agent/grpc-middleware/testutil/testservice/simple.proto
index d005a45aa1138..bcace657ac7ae 100644
--- a/agent/grpc-middleware/testutil/testservice/simple.proto
+++ b/agent/grpc-middleware/testutil/testservice/simple.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 syntax = "proto3";
 
 package testservice;
diff --git a/agent/grpc-middleware/testutil/testservice/simple_grpc.pb.go b/agent/grpc-middleware/testutil/testservice/simple_grpc.pb.go
index 44936be4d3829..39aac241d4d61 100644
--- a/agent/grpc-middleware/testutil/testservice/simple_grpc.pb.go
+++ b/agent/grpc-middleware/testutil/testservice/simple_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             (unknown)
-// source: simple.proto
+// source: agent/grpc-middleware/testutil/testservice/simple.proto
 
 package testservice
 
@@ -163,5 +163,5 @@ var Simple_ServiceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "simple.proto",
+	Metadata: "agent/grpc-middleware/testutil/testservice/simple.proto",
 }
diff --git a/agent/hcp/bootstrap/bootstrap.go b/agent/hcp/bootstrap/bootstrap.go
index 8e544bdec3128..d4235c532fcbe 100644
--- a/agent/hcp/bootstrap/bootstrap.go
+++ b/agent/hcp/bootstrap/bootstrap.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // Package bootstrap handles bootstrapping an agent's config from HCP. It must be a
 // separate package from other HCP components because it has a dependency on
 // agent/config while other components need to be imported and run within the
diff --git a/agent/hcp/bootstrap/bootstrap_test.go b/agent/hcp/bootstrap/bootstrap_test.go
index b475223ff8cf3..74b57e5f50abd 100644
--- a/agent/hcp/bootstrap/bootstrap_test.go
+++ b/agent/hcp/bootstrap/bootstrap_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bootstrap
 
 import (
diff --git a/agent/hcp/bootstrap/testing.go b/agent/hcp/bootstrap/testing.go
index f073d17183444..d06c2d747c4f3 100644
--- a/agent/hcp/bootstrap/testing.go
+++ b/agent/hcp/bootstrap/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bootstrap
 
 import (
diff --git a/agent/hcp/client/client.go b/agent/hcp/client/client.go
index c0526c0e4acf0..f04767e983c7b 100644
--- a/agent/hcp/client/client.go
+++ b/agent/hcp/client/client.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MPL-2.0
 
 package client
 
diff --git a/agent/hcp/client/client_test.go b/agent/hcp/client/client_test.go
index 5571630ad45a3..d4bae2ae4cb52 100644
--- a/agent/hcp/client/client_test.go
+++ b/agent/hcp/client/client_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package client
 
 import (
diff --git a/agent/hcp/client/metrics_client.go b/agent/hcp/client/metrics_client.go
index b3c1c6a6b3dc8..3c5b5c4fb9d69 100644
--- a/agent/hcp/client/metrics_client.go
+++ b/agent/hcp/client/metrics_client.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package client
 
 import (
diff --git a/agent/hcp/client/metrics_client_test.go b/agent/hcp/client/metrics_client_test.go
index 20a5f010ec4cd..4119e326e9dc0 100644
--- a/agent/hcp/client/metrics_client_test.go
+++ b/agent/hcp/client/metrics_client_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package client
 
 import (
diff --git a/agent/hcp/client/mock_CloudConfig.go b/agent/hcp/client/mock_CloudConfig.go
index 574f83e55fd59..5f2ef50046d70 100644
--- a/agent/hcp/client/mock_CloudConfig.go
+++ b/agent/hcp/client/mock_CloudConfig.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package client
 
 import (
diff --git a/agent/hcp/client/telemetry_config.go b/agent/hcp/client/telemetry_config.go
index 0745f1b7c6197..162e1b8061e4e 100644
--- a/agent/hcp/client/telemetry_config.go
+++ b/agent/hcp/client/telemetry_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package client
 
 import (
diff --git a/agent/hcp/client/telemetry_config_test.go b/agent/hcp/client/telemetry_config_test.go
index d43024400779a..659a2ab00333d 100644
--- a/agent/hcp/client/telemetry_config_test.go
+++ b/agent/hcp/client/telemetry_config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package client
 
 import (
diff --git a/agent/hcp/config/config.go b/agent/hcp/config/config.go
index 59977ef46f37d..6e76f9526096a 100644
--- a/agent/hcp/config/config.go
+++ b/agent/hcp/config/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
diff --git a/agent/hcp/deps.go b/agent/hcp/deps.go
index 7bf384747dbd3..1709df50545f9 100644
--- a/agent/hcp/deps.go
+++ b/agent/hcp/deps.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package hcp
 
 import (
diff --git a/agent/hcp/deps_test.go b/agent/hcp/deps_test.go
index 7375dad68cb76..ecf64489a1aac 100644
--- a/agent/hcp/deps_test.go
+++ b/agent/hcp/deps_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package hcp
 
 import (
diff --git a/agent/hcp/discover/discover.go b/agent/hcp/discover/discover.go
index 981400c38b478..f2d109d084ae8 100644
--- a/agent/hcp/discover/discover.go
+++ b/agent/hcp/discover/discover.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package discover
 
 import (
diff --git a/agent/hcp/manager.go b/agent/hcp/manager.go
index a3664b0608dfe..44f722c677306 100644
--- a/agent/hcp/manager.go
+++ b/agent/hcp/manager.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package hcp
 
 import (
diff --git a/agent/hcp/manager_test.go b/agent/hcp/manager_test.go
index 8432e63ed5288..2363739d62065 100644
--- a/agent/hcp/manager_test.go
+++ b/agent/hcp/manager_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package hcp
 
 import (
diff --git a/agent/hcp/scada/capabilities.go b/agent/hcp/scada/capabilities.go
index bbb6ea6266dc3..ab60251f085ea 100644
--- a/agent/hcp/scada/capabilities.go
+++ b/agent/hcp/scada/capabilities.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package scada
 
 import "github.com/hashicorp/hcp-scada-provider/capability"
diff --git a/agent/hcp/scada/scada.go b/agent/hcp/scada/scada.go
index 151e1b6862efa..b74f762b1abf1 100644
--- a/agent/hcp/scada/scada.go
+++ b/agent/hcp/scada/scada.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package scada
 
 import (
diff --git a/agent/hcp/telemetry/custom_metrics.go b/agent/hcp/telemetry/custom_metrics.go
index 39df765b9204b..d691dccde2078 100644
--- a/agent/hcp/telemetry/custom_metrics.go
+++ b/agent/hcp/telemetry/custom_metrics.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package telemetry
 
 // Keys for custom Go Metrics metrics emitted only for the OTEL
diff --git a/agent/hcp/telemetry/doc.go b/agent/hcp/telemetry/doc.go
index d982a37c0f3e5..4ef18f39bd309 100644
--- a/agent/hcp/telemetry/doc.go
+++ b/agent/hcp/telemetry/doc.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // Package telemetry implements functionality to collect, aggregate, convert and export
 // telemetry data in OpenTelemetry Protocol (OTLP) format.
 //
diff --git a/agent/hcp/telemetry/gauge_store.go b/agent/hcp/telemetry/gauge_store.go
index bb7030dae852b..76dfb78066683 100644
--- a/agent/hcp/telemetry/gauge_store.go
+++ b/agent/hcp/telemetry/gauge_store.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package telemetry
 
 import (
diff --git a/agent/hcp/telemetry/gauge_store_test.go b/agent/hcp/telemetry/gauge_store_test.go
index 4ccac624dbd99..1171ee379c325 100644
--- a/agent/hcp/telemetry/gauge_store_test.go
+++ b/agent/hcp/telemetry/gauge_store_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package telemetry
 
 import (
diff --git a/agent/hcp/telemetry/otel_exporter.go b/agent/hcp/telemetry/otel_exporter.go
index 050d5660668d2..2ba32693ab96a 100644
--- a/agent/hcp/telemetry/otel_exporter.go
+++ b/agent/hcp/telemetry/otel_exporter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package telemetry
 
 import (
diff --git a/agent/hcp/telemetry/otel_exporter_test.go b/agent/hcp/telemetry/otel_exporter_test.go
index ebe6486abca85..6082f6fb0e3ab 100644
--- a/agent/hcp/telemetry/otel_exporter_test.go
+++ b/agent/hcp/telemetry/otel_exporter_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package telemetry
 
 import (
diff --git a/agent/hcp/telemetry/otel_sink.go b/agent/hcp/telemetry/otel_sink.go
index 12aae982016c2..6d520f09c8d7b 100644
--- a/agent/hcp/telemetry/otel_sink.go
+++ b/agent/hcp/telemetry/otel_sink.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package telemetry
 
 import (
diff --git a/agent/hcp/telemetry/otel_sink_test.go b/agent/hcp/telemetry/otel_sink_test.go
index 683f33a3a40d6..21987dccdcf2e 100644
--- a/agent/hcp/telemetry/otel_sink_test.go
+++ b/agent/hcp/telemetry/otel_sink_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package telemetry
 
 import (
@@ -334,7 +331,7 @@ func TestLabelsToAttributes(t *testing.T) {
 			sink, err := NewOTELSink(ctx, opts)
 			require.NoError(t, err)
 
-			require.ElementsMatch(t, test.expectedOTELAttributes, sink.labelsToAttributes(test.goMetricsLabels))
+			require.Equal(t, test.expectedOTELAttributes, sink.labelsToAttributes(test.goMetricsLabels))
 		})
 	}
 }
diff --git a/agent/hcp/telemetry/otlp_transform.go b/agent/hcp/telemetry/otlp_transform.go
index 907e7922ad98d..bbe6396ad6547 100644
--- a/agent/hcp/telemetry/otlp_transform.go
+++ b/agent/hcp/telemetry/otlp_transform.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package telemetry
 
 import (
diff --git a/agent/hcp/telemetry/otlp_transform_test.go b/agent/hcp/telemetry/otlp_transform_test.go
index d67df73d83433..fda64c8c6345d 100644
--- a/agent/hcp/telemetry/otlp_transform_test.go
+++ b/agent/hcp/telemetry/otlp_transform_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package telemetry
 
 import (
diff --git a/agent/hcp/telemetry_provider.go b/agent/hcp/telemetry_provider.go
index 22bb0f2f00b81..84b8ae88f3396 100644
--- a/agent/hcp/telemetry_provider.go
+++ b/agent/hcp/telemetry_provider.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package hcp
 
 import (
diff --git a/agent/hcp/telemetry_provider_test.go b/agent/hcp/telemetry_provider_test.go
index a147183df44d6..5eb3c61c45ca1 100644
--- a/agent/hcp/telemetry_provider_test.go
+++ b/agent/hcp/telemetry_provider_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package hcp
 
 import (
@@ -317,8 +314,6 @@ func (m *mockRaceClient) FetchTelemetryConfig(ctx context.Context) (*client.Tele
 }
 
 func TestTelemetryConfigProvider_Race(t *testing.T) {
-	//todo(achooo): address flaky test
-	t.Skip("TODO(flaky): This test fails often in the CI")
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
diff --git a/agent/hcp/testing.go b/agent/hcp/testing.go
index 30f7ba7bcdeb3..10e6a1114a683 100644
--- a/agent/hcp/testing.go
+++ b/agent/hcp/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package hcp
 
 import (
diff --git a/agent/hcp/testserver/main.go b/agent/hcp/testserver/main.go
index e0db7670ef99f..0166d0068247b 100644
--- a/agent/hcp/testserver/main.go
+++ b/agent/hcp/testserver/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package main
 
 import (
diff --git a/agent/health_endpoint.go b/agent/health_endpoint.go
index 3b888988d2730..8060d93bd5dee 100644
--- a/agent/health_endpoint.go
+++ b/agent/health_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/health_endpoint_test.go b/agent/health_endpoint_test.go
index 4c491e9cb2761..8217fca69b4f2 100644
--- a/agent/health_endpoint_test.go
+++ b/agent/health_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -28,25 +25,6 @@ import (
 	"github.com/hashicorp/consul/types"
 )
 
-func TestHealthEndpointsFailInV2(t *testing.T) {
-	t.Parallel()
-
-	a := NewTestAgent(t, `experiments = ["resource-apis"]`)
-
-	checkRequest := func(method, url string) {
-		t.Run(method+" "+url, func(t *testing.T) {
-			assertV1CatalogEndpointDoesNotWorkWithV2(t, a, method, url, "{}")
-		})
-	}
-
-	checkRequest("GET", "/v1/health/node/web")
-	checkRequest("GET", "/v1/health/checks/web")
-	checkRequest("GET", "/v1/health/state/web")
-	checkRequest("GET", "/v1/health/service/web")
-	checkRequest("GET", "/v1/health/connect/web")
-	checkRequest("GET", "/v1/health/ingress/web")
-}
-
 func TestHealthChecksInState(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
@@ -461,21 +439,19 @@ func TestHealthServiceChecks_NodeMetaFilter(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 
-	retry.Run(t, func(r *retry.R) {
-		req, _ = http.NewRequest("GET", "/v1/health/checks/consul?dc=dc1&node-meta=somekey:somevalue", nil)
-		resp = httptest.NewRecorder()
-		obj, err = a.srv.HealthServiceChecks(resp, req)
-		if err != nil {
-			r.Fatalf("err: %v", err)
-		}
-		assertIndex(r, resp)
+	req, _ = http.NewRequest("GET", "/v1/health/checks/consul?dc=dc1&node-meta=somekey:somevalue", nil)
+	resp = httptest.NewRecorder()
+	obj, err = a.srv.HealthServiceChecks(resp, req)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	assertIndex(t, resp)
 
-		// Should be 1 health check for consul
-		nodes = obj.(structs.HealthChecks)
-		if len(nodes) != 1 {
-			r.Fatalf("bad: %v", obj)
-		}
-	})
+	// Should be 1 health check for consul
+	nodes = obj.(structs.HealthChecks)
+	if len(nodes) != 1 {
+		t.Fatalf("bad: %v", obj)
+	}
 }
 
 func TestHealthServiceChecks_Filtering(t *testing.T) {
@@ -1222,7 +1198,6 @@ func TestHealthServiceNodes_NodeMetaFilter(t *testing.T) {
 				require.NoError(t, err)
 
 				assertIndex(t, resp)
-				assert.Equal(t, "MISS", resp.Header().Get("X-Cache"))
 
 				// Should be a non-nil empty list for checks
 				nodes := obj.(structs.CheckServiceNodes)
diff --git a/agent/http.go b/agent/http.go
index e95d36c914f87..b8135b548dbed 100644
--- a/agent/http.go
+++ b/agent/http.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -36,10 +33,9 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/uiserver"
 	"github.com/hashicorp/consul/api"
-	resourcehttp "github.com/hashicorp/consul/internal/resource/http"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/logging"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
+	"github.com/hashicorp/consul/proto/pbcommon"
 )
 
 var HTTPSummaries = []prometheus.SummaryDefinition{
@@ -260,17 +256,6 @@ func (s *HTTPHandlers) handler() http.Handler {
 	handlePProf("/debug/pprof/symbol", pprof.Symbol)
 	handlePProf("/debug/pprof/trace", pprof.Trace)
 
-	mux.Handle("/api/",
-		http.StripPrefix("/api",
-			resourcehttp.NewHandler(
-				s.agent.delegate.ResourceServiceClient(),
-				s.agent.baseDeps.Registry,
-				s.parseToken,
-				s.agent.logger.Named(logging.HTTP),
-			),
-		),
-	)
-
 	if s.IsUIEnabled() {
 		// Note that we _don't_ support reloading ui_config.{enabled, content_dir,
 		// content_path} since this only runs at initial startup.
@@ -394,11 +379,6 @@ func (s *HTTPHandlers) wrap(handler endpoint, methods []string) http.HandlerFunc
 		}
 		logURL = aclEndpointRE.ReplaceAllString(logURL, "$1<hidden>$4")
 
-		rejectCatalogV1Endpoint := false
-		if s.agent.baseDeps.UseV2Resources() {
-			rejectCatalogV1Endpoint = isV1CatalogRequest(logURL)
-		}
-
 		if s.denylist.Block(req.URL.Path) {
 			errMsg := "Endpoint is blocked by agent configuration"
 			httpLogger.Error("Request error",
@@ -460,14 +440,6 @@ func (s *HTTPHandlers) wrap(handler endpoint, methods []string) http.HandlerFunc
 			return strings.Contains(err.Error(), rate.ErrRetryLater.Error())
 		}
 
-		isUsingV2CatalogExperiment := func(err error) bool {
-			if err == nil {
-				return false
-			}
-
-			return structs.IsErrUsingV2CatalogExperiment(err)
-		}
-
 		isMethodNotAllowed := func(err error) bool {
 			_, ok := err.(MethodNotAllowedError)
 			return ok
@@ -503,10 +475,6 @@ func (s *HTTPHandlers) wrap(handler endpoint, methods []string) http.HandlerFunc
 				msg = s.Message()
 			}
 
-			if isUsingV2CatalogExperiment(err) && !isHTTPError(err) {
-				err = newRejectV1RequestWhenV2EnabledError()
-			}
-
 			switch {
 			case isForbidden(err):
 				resp.WriteHeader(http.StatusForbidden)
@@ -583,12 +551,7 @@ func (s *HTTPHandlers) wrap(handler endpoint, methods []string) http.HandlerFunc
 
 			if err == nil {
 				// Invoke the handler
-				if rejectCatalogV1Endpoint {
-					obj = nil
-					err = s.rejectV1RequestWhenV2Enabled()
-				} else {
-					obj, err = handler(resp, req)
-				}
+				obj, err = handler(resp, req)
 			}
 		}
 		contentType := "application/json"
@@ -630,46 +593,6 @@ func (s *HTTPHandlers) wrap(handler endpoint, methods []string) http.HandlerFunc
 	}
 }
 
-func isV1CatalogRequest(logURL string) bool {
-	switch {
-	case strings.HasPrefix(logURL, "/v1/catalog/"),
-		strings.HasPrefix(logURL, "/v1/health/"),
-		strings.HasPrefix(logURL, "/v1/config/"):
-		return true
-
-	case strings.HasPrefix(logURL, "/v1/agent/token/"),
-		logURL == "/v1/agent/self",
-		logURL == "/v1/agent/host",
-		logURL == "/v1/agent/version",
-		logURL == "/v1/agent/reload",
-		logURL == "/v1/agent/monitor",
-		logURL == "/v1/agent/metrics",
-		logURL == "/v1/agent/metrics/stream",
-		logURL == "/v1/agent/members",
-		strings.HasPrefix(logURL, "/v1/agent/join/"),
-		logURL == "/v1/agent/leave",
-		strings.HasPrefix(logURL, "/v1/agent/force-leave/"),
-		logURL == "/v1/agent/connect/authorize",
-		logURL == "/v1/agent/connect/ca/roots",
-		strings.HasPrefix(logURL, "/v1/agent/connect/ca/leaf/"):
-		return false
-
-	case strings.HasPrefix(logURL, "/v1/agent/"):
-		return true
-
-	case logURL == "/v1/internal/acl/authorize",
-		logURL == "/v1/internal/service-virtual-ip",
-		logURL == "/v1/internal/ui/oidc-auth-methods",
-		strings.HasPrefix(logURL, "/v1/internal/ui/metrics-proxy/"):
-		return false
-
-	case strings.HasPrefix(logURL, "/v1/internal/"):
-		return true
-	default:
-		return false
-	}
-}
-
 // marshalJSON marshals the object into JSON, respecting the user's pretty-ness
 // configuration.
 func (s *HTTPHandlers) marshalJSON(req *http.Request, obj interface{}) ([]byte, error) {
@@ -678,9 +601,7 @@ func (s *HTTPHandlers) marshalJSON(req *http.Request, obj interface{}) ([]byte,
 		if err != nil {
 			return nil, err
 		}
-		if ok {
-			buf = append(buf, "\n"...)
-		}
+		buf = append(buf, "\n"...)
 		return buf, nil
 	}
 
@@ -1064,12 +985,9 @@ func parseConsistencyReadRequest(resp http.ResponseWriter, req *http.Request, b
 	}
 }
 
-// parseDC is used to parse the datacenter from the query params.
-// ?datacenter has precedence over ?dc.
+// parseDC is used to parse the ?dc query param
 func (s *HTTPHandlers) parseDC(req *http.Request, dc *string) {
-	if other := req.URL.Query().Get("datacenter"); other != "" {
-		*dc = other
-	} else if other = req.URL.Query().Get("dc"); other != "" {
+	if other := req.URL.Query().Get("dc"); other != "" {
 		*dc = other
 	} else if *dc == "" {
 		*dc = s.agent.config.Datacenter
@@ -1146,20 +1064,6 @@ func (s *HTTPHandlers) parseToken(req *http.Request, token *string) {
 	s.parseTokenWithDefault(req, token)
 }
 
-func (s *HTTPHandlers) rejectV1RequestWhenV2Enabled() error {
-	if s.agent.baseDeps.UseV2Resources() {
-		return newRejectV1RequestWhenV2EnabledError()
-	}
-	return nil
-}
-
-func newRejectV1RequestWhenV2EnabledError() error {
-	return HTTPError{
-		StatusCode: http.StatusBadRequest,
-		Reason:     structs.ErrUsingV2CatalogExperiment.Error(),
-	}
-}
-
 func sourceAddrFromRequest(req *http.Request) string {
 	xff := req.Header.Get("X-Forwarded-For")
 	forwardHosts := strings.Split(xff, ",")
diff --git a/agent/http_ce.go b/agent/http_ce.go
index da6bef7237766..04c14b7f3204f 100644
--- a/agent/http_ce.go
+++ b/agent/http_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
diff --git a/agent/http_ce_test.go b/agent/http_ce_test.go
index ea1d2af61d7a4..b6cb8fe2bbb99 100644
--- a/agent/http_ce_test.go
+++ b/agent/http_ce_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -144,6 +141,7 @@ func TestHTTPAPI_OptionMethod_CE(t *testing.T) {
 			uri := fmt.Sprintf("http://%s%s", a.HTTPAddr(), path)
 			req, _ := http.NewRequest("OPTIONS", uri, nil)
 			resp := httptest.NewRecorder()
+
 			a.enableDebug.Store(true)
 			a.srv.handler().ServeHTTP(resp, req)
 			allMethods := append([]string{"OPTIONS"}, methods...)
@@ -192,7 +190,6 @@ func TestHTTPAPI_AllowedNets_CE(t *testing.T) {
 			req.RemoteAddr = "192.168.1.2:5555"
 			resp := httptest.NewRecorder()
 			a.enableDebug.Store(true)
-
 			a.srv.handler().ServeHTTP(resp, req)
 
 			require.Equal(t, http.StatusForbidden, resp.Code, "%s %s", method, path)
diff --git a/agent/http_decode_test.go b/agent/http_decode_test.go
index 6aece784c0b2d..a11f4ce83116a 100644
--- a/agent/http_decode_test.go
+++ b/agent/http_decode_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 // This file contains tests for JSON unmarshaling.
diff --git a/agent/http_register.go b/agent/http_register.go
index 340f7ef0fe048..5af1e52fe1246 100644
--- a/agent/http_register.go
+++ b/agent/http_register.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 func init() {
@@ -26,13 +23,9 @@ func init() {
 	registerEndpoint("/v1/acl/token", []string{"PUT"}, (*HTTPHandlers).ACLTokenCreate)
 	registerEndpoint("/v1/acl/token/self", []string{"GET"}, (*HTTPHandlers).ACLTokenSelf)
 	registerEndpoint("/v1/acl/token/", []string{"GET", "PUT", "DELETE"}, (*HTTPHandlers).ACLTokenCRUD)
-	registerEndpoint("/v1/acl/templated-policies", []string{"GET"}, (*HTTPHandlers).ACLTemplatedPoliciesList)
-	registerEndpoint("/v1/acl/templated-policy/name/", []string{"GET"}, (*HTTPHandlers).ACLTemplatedPolicyRead)
-	registerEndpoint("/v1/acl/templated-policy/preview/", []string{"POST"}, (*HTTPHandlers).ACLTemplatedPolicyPreview)
 	registerEndpoint("/v1/agent/token/", []string{"PUT"}, (*HTTPHandlers).AgentToken)
 	registerEndpoint("/v1/agent/self", []string{"GET"}, (*HTTPHandlers).AgentSelf)
 	registerEndpoint("/v1/agent/host", []string{"GET"}, (*HTTPHandlers).AgentHost)
-	registerEndpoint("/v1/agent/version", []string{"GET"}, (*HTTPHandlers).AgentVersion)
 	registerEndpoint("/v1/agent/maintenance", []string{"PUT"}, (*HTTPHandlers).AgentNodeMaintenance)
 	registerEndpoint("/v1/agent/reload", []string{"PUT"}, (*HTTPHandlers).AgentReload)
 	registerEndpoint("/v1/agent/monitor", []string{"GET"}, (*HTTPHandlers).AgentMonitor)
@@ -104,7 +97,6 @@ func init() {
 	registerEndpoint("/v1/internal/ui/gateway-intentions/", []string{"GET"}, (*HTTPHandlers).UIGatewayIntentions)
 	registerEndpoint("/v1/internal/ui/service-topology/", []string{"GET"}, (*HTTPHandlers).UIServiceTopology)
 	registerEndpoint("/v1/internal/acl/authorize", []string{"POST"}, (*HTTPHandlers).ACLAuthorize)
-	registerEndpoint("/v1/internal/service-virtual-ip", []string{"PUT"}, (*HTTPHandlers).AssignManualServiceVIPs)
 	registerEndpoint("/v1/kv/", []string{"GET", "PUT", "DELETE"}, (*HTTPHandlers).KVSEndpoint)
 	registerEndpoint("/v1/operator/raft/configuration", []string{"GET"}, (*HTTPHandlers).OperatorRaftConfiguration)
 	registerEndpoint("/v1/operator/raft/transfer-leader", []string{"POST"}, (*HTTPHandlers).OperatorRaftTransferLeader)
diff --git a/agent/http_test.go b/agent/http_test.go
index f2469acc83526..5329f70374991 100644
--- a/agent/http_test.go
+++ b/agent/http_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -486,7 +483,6 @@ func TestHTTPAPI_Ban_Nonprintable_Characters(t *testing.T) {
 	}
 	resp := httptest.NewRecorder()
 	a.enableDebug.Store(true)
-
 	a.srv.handler().ServeHTTP(resp, req)
 	if got, want := resp.Code, http.StatusBadRequest; got != want {
 		t.Fatalf("bad response code got %d want %d", got, want)
@@ -511,7 +507,6 @@ func TestHTTPAPI_Allow_Nonprintable_Characters_With_Flag(t *testing.T) {
 	}
 	resp := httptest.NewRecorder()
 	a.enableDebug.Store(true)
-
 	a.srv.handler().ServeHTTP(resp, req)
 	// Key doesn't actually exist so we should get 404
 	if got, want := resp.Code, http.StatusNotFound; got != want {
@@ -652,7 +647,6 @@ func requireHasHeadersSet(t *testing.T, a *TestAgent, path string) {
 	resp := httptest.NewRecorder()
 	req, _ := http.NewRequest("GET", path, nil)
 	a.enableDebug.Store(true)
-
 	a.srv.handler().ServeHTTP(resp, req)
 
 	hdrs := resp.Header()
@@ -715,7 +709,6 @@ func TestAcceptEncodingGzip(t *testing.T) {
 	// transport, the header has to be set manually
 	req.Header["Accept-Encoding"] = []string{"gzip"}
 	a.enableDebug.Store(true)
-
 	a.srv.handler().ServeHTTP(resp, req)
 	require.Equal(t, 200, resp.Code)
 	require.Equal(t, "", resp.Header().Get("Content-Encoding"))
@@ -724,7 +717,6 @@ func TestAcceptEncodingGzip(t *testing.T) {
 	req, _ = http.NewRequest("GET", "/v1/kv/long", nil)
 	req.Header["Accept-Encoding"] = []string{"gzip"}
 	a.enableDebug.Store(true)
-
 	a.srv.handler().ServeHTTP(resp, req)
 	require.Equal(t, 200, resp.Code)
 	require.Equal(t, "gzip", resp.Header().Get("Content-Encoding"))
@@ -893,15 +885,6 @@ func TestParseSource(t *testing.T) {
 		t.Fatalf("bad: %v", source)
 	}
 
-	// We should follow whatever datacenter parameter was given so that the node is
-	// looked up correctly on the receiving end.
-	req, _ = http.NewRequest("GET", "/v1/catalog/nodes?near=bob&datacenter=foo", nil)
-	source = structs.QuerySource{}
-	a.srv.parseSource(req, &source)
-	if source.Datacenter != "foo" || source.Node != "bob" {
-		t.Fatalf("bad: %v", source)
-	}
-
 	// The magic "_agent" node name will use the agent's local node name.
 	req, _ = http.NewRequest("GET", "/v1/catalog/nodes?near=_agent", nil)
 	source = structs.QuerySource{}
@@ -1182,7 +1165,6 @@ func TestHTTPServer_PProfHandlers_ACLs(t *testing.T) {
 			req, _ := http.NewRequest("GET", fmt.Sprintf("%s?token=%s", c.endpoint, c.token), nil)
 			resp := httptest.NewRecorder()
 			a.enableDebug.Store(true)
-
 			a.srv.handler().ServeHTTP(resp, req)
 			assert.Equal(t, c.code, resp.Code)
 		})
@@ -1494,7 +1476,6 @@ func TestEnableWebUI(t *testing.T) {
 	req, _ := http.NewRequest("GET", "/ui/", nil)
 	resp := httptest.NewRecorder()
 	a.enableDebug.Store(true)
-
 	a.srv.handler().ServeHTTP(resp, req)
 	require.Equal(t, http.StatusOK, resp.Code)
 
@@ -1525,7 +1506,6 @@ func TestEnableWebUI(t *testing.T) {
 		req, _ := http.NewRequest("GET", "/ui/", nil)
 		resp := httptest.NewRecorder()
 		a.enableDebug.Store(true)
-
 		a.srv.handler().ServeHTTP(resp, req)
 		require.Equal(t, http.StatusOK, resp.Code)
 		require.Contains(t, resp.Body.String(), `<!-- CONSUL_VERSION:`)
@@ -1628,10 +1608,8 @@ func TestAllowedNets(t *testing.T) {
 }
 
 // assertIndex tests that X-Consul-Index is set and non-zero
-func assertIndex(t require.TestingT, resp *httptest.ResponseRecorder) {
-	if tt, ok := t.(*testing.T); ok {
-		tt.Helper()
-	}
+func assertIndex(t *testing.T, resp *httptest.ResponseRecorder) {
+	t.Helper()
 	require.NoError(t, checkIndex(resp))
 }
 
diff --git a/agent/intentions_endpoint.go b/agent/intentions_endpoint.go
index 4f0b188a0cc43..7144f026f1dd3 100644
--- a/agent/intentions_endpoint.go
+++ b/agent/intentions_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/intentions_endpoint_ce_test.go b/agent/intentions_endpoint_ce_test.go
index 10a540bf1869c..74163f9fdddde 100644
--- a/agent/intentions_endpoint_ce_test.go
+++ b/agent/intentions_endpoint_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
diff --git a/agent/intentions_endpoint_test.go b/agent/intentions_endpoint_test.go
index b1309feb9d2cd..6bd7a5fec2b8e 100644
--- a/agent/intentions_endpoint_test.go
+++ b/agent/intentions_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/keyring.go b/agent/keyring.go
index f30680774b340..ad4496ead1885 100644
--- a/agent/keyring.go
+++ b/agent/keyring.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/keyring_test.go b/agent/keyring_test.go
index 1a9332a8a7393..26b29b7476181 100644
--- a/agent/keyring_test.go
+++ b/agent/keyring_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/kvs_endpoint.go b/agent/kvs_endpoint.go
index e60567cd5b807..ce65604b556fa 100644
--- a/agent/kvs_endpoint.go
+++ b/agent/kvs_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/kvs_endpoint_test.go b/agent/kvs_endpoint_test.go
index 2b3563000815b..6f4421c6b42e4 100644
--- a/agent/kvs_endpoint_test.go
+++ b/agent/kvs_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/leafcert/cached_roots.go b/agent/leafcert/cached_roots.go
deleted file mode 100644
index 4b0612416a549..0000000000000
--- a/agent/leafcert/cached_roots.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package leafcert
-
-import (
-	"context"
-	"errors"
-
-	"github.com/hashicorp/consul/agent/cacheshim"
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-// NewCachedRootsReader returns a RootsReader that sources data from the agent cache.
-func NewCachedRootsReader(cache cacheshim.Cache, dc string) RootsReader {
-	return &agentCacheRootsReader{
-		cache:      cache,
-		datacenter: dc,
-	}
-}
-
-type agentCacheRootsReader struct {
-	cache      cacheshim.Cache
-	datacenter string
-}
-
-var _ RootsReader = (*agentCacheRootsReader)(nil)
-
-func (r *agentCacheRootsReader) Get() (*structs.IndexedCARoots, error) {
-	// Background is fine here because this isn't a blocking query as no index is set.
-	// Therefore this will just either be a cache hit or return once the non-blocking query returns.
-	rawRoots, _, err := r.cache.Get(context.Background(), cacheshim.ConnectCARootName, &structs.DCSpecificRequest{
-		Datacenter: r.datacenter,
-	})
-	if err != nil {
-		return nil, err
-	}
-	roots, ok := rawRoots.(*structs.IndexedCARoots)
-	if !ok {
-		return nil, errors.New("invalid RootCA response type")
-	}
-	return roots, nil
-}
-
-func (r *agentCacheRootsReader) Notify(ctx context.Context, correlationID string, ch chan<- cacheshim.UpdateEvent) error {
-	return r.cache.Notify(ctx, cacheshim.ConnectCARootName, &structs.DCSpecificRequest{
-		Datacenter: r.datacenter,
-	}, correlationID, ch)
-}
diff --git a/agent/leafcert/cert.go b/agent/leafcert/cert.go
deleted file mode 100644
index b6236a4a14ac1..0000000000000
--- a/agent/leafcert/cert.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package leafcert
-
-import (
-	"sync"
-	"time"
-
-	"golang.org/x/time/rate"
-
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/lib/ttlcache"
-)
-
-// certData tracks all of the metadata about a leaf cert.
-type certData struct {
-	// lock locks access to all fields
-	lock sync.Mutex
-
-	// index is the last raft index associated with an update of the 'value' field
-	index uint64
-
-	// value is the last updated cert contents or nil if not populated initially
-	value *structs.IssuedCert
-
-	// state is metadata related to cert generation
-	state fetchState
-
-	// fetchedAt was the time when 'value' was last updated
-	fetchedAt time.Time
-
-	// refreshing indicates if there is an active request attempting to refresh
-	// the current leaf cert contents.
-	refreshing bool
-
-	// lastFetchErr is the last error encountered when attempting to populate
-	// the 'value' field.
-	lastFetchErr error
-
-	// expiry contains information about the expiration of this
-	// cert. This is a pointer as its shared as a value in the
-	// ExpiryHeap as well.
-	expiry *ttlcache.Entry
-
-	// refreshRateLimiter limits the rate at which the cert can be regenerated
-	refreshRateLimiter *rate.Limiter
-}
-
-func (c *certData) MarkRefreshing(v bool) {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-	c.refreshing = v
-}
-
-func (c *certData) GetValueAndState() (*structs.IssuedCert, fetchState) {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-	return c.value, c.state
-}
-
-func (c *certData) GetError() error {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-	return c.lastFetchErr
-}
-
-// NOTE: this function only has one goroutine in it per key at all times
-func (c *certData) Update(
-	newCert *structs.IssuedCert,
-	newState fetchState,
-	err error,
-) {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	// Importantly, always reset the Error. Having both Error and a Value that
-	// are non-nil is allowed in the cache entry but it indicates that the Error
-	// is _newer_ than the last good value. So if the err is nil then we need to
-	// reset to replace any _older_ errors and avoid them bubbling up. If the
-	// error is non-nil then we need to set it anyway and used to do it in the
-	// code below. See https://github.com/hashicorp/consul/issues/4480.
-	c.lastFetchErr = err
-
-	c.state = newState
-	if newCert != nil {
-		c.index = newCert.ModifyIndex
-		c.value = newCert
-		c.fetchedAt = time.Now()
-	}
-
-	if c.index < 1 {
-		// Less than one is invalid unless there was an error and in this case
-		// there wasn't since a value was returned. If a badly behaved RPC
-		// returns 0 when it has no data, we might get into a busy loop here. We
-		// set this to minimum of 1 which is safe because no valid user data can
-		// ever be written at raft index 1 due to the bootstrap process for
-		// raft. This insure that any subsequent background refresh request will
-		// always block, but allows the initial request to return immediately
-		// even if there is no data.
-		c.index = 1
-	}
-}
-
-// fetchState is some additional metadata we store with each cert in the cache
-// to track things like expiry and coordinate paces root rotations. It's
-// important this doesn't contain any pointer types since we rely on the struct
-// being copied to avoid modifying the actual state in the cache entry during
-// Fetch. Pointers themselves are OK, but if we point to another struct that we
-// call a method or modify in some way that would directly mutate the cache and
-// cause problems. We'd need to deep-clone in that case in Fetch below.
-// time.Time technically contains a pointer to the Location but we ignore that
-// since all times we get from our wall clock should point to the same Location
-// anyway.
-type fetchState struct {
-	// authorityKeyId is the ID of the CA key (whether root or intermediate) that signed
-	// the current cert.  This is just to save parsing the whole cert everytime
-	// we have to check if the root changed.
-	authorityKeyID string
-
-	// forceExpireAfter is used to coordinate renewing certs after a CA rotation
-	// in a staggered way so that we don't overwhelm the servers.
-	forceExpireAfter time.Time
-
-	// activeRootRotationStart is set when the root has changed and we need to get
-	// a new cert but haven't got one yet. forceExpireAfter will be set to the
-	// next scheduled time we should try our CSR, but this is needed to calculate
-	// the retry windows if we are rate limited when we try. See comment on
-	// const caChangeJitterWindow above for more.
-	activeRootRotationStart time.Time
-
-	// consecutiveRateLimitErrs stores how many rate limit errors we've hit. We
-	// use this to choose a new window for the next retry. See comment on
-	// const caChangeJitterWindow above for more.
-	consecutiveRateLimitErrs int
-}
diff --git a/agent/leafcert/generate.go b/agent/leafcert/generate.go
deleted file mode 100644
index 19dbdbbaf4bbb..0000000000000
--- a/agent/leafcert/generate.go
+++ /dev/null
@@ -1,373 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package leafcert
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net"
-	"time"
-
-	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/lib"
-)
-
-// caChangeJitterWindow is the time over which we spread each round of retries
-// when attempting to get a new certificate following a root rotation. It's
-// selected to be a trade-off between not making rotation unnecessarily slow on
-// a tiny cluster while not hammering the servers on a huge cluster
-// unnecessarily hard. Servers rate limit to protect themselves from the
-// expensive crypto work, but in practice have 10k+ RPCs all in the same second
-// will cause a major disruption even on large servers due to downloading the
-// payloads, parsing msgpack etc. Instead we pick a window that for now is fixed
-// but later might be either user configurable (not nice since it would become
-// another hard-to-tune value) or set dynamically by the server based on it's
-// knowledge of how many certs need to be rotated. Currently the server doesn't
-// know that so we pick something that is reasonable. We err on the side of
-// being slower that we need in trivial cases but gentler for large deployments.
-// 30s means that even with a cluster of 10k service instances, the server only
-// has to cope with ~333 RPCs a second which shouldn't be too bad if it's rate
-// limiting the actual expensive crypto work.
-//
-// The actual backoff strategy when we are rate limited is to have each cert
-// only retry once with each window of this size, at a point in the window
-// selected at random. This performs much better than exponential backoff in
-// terms of getting things rotated quickly with more predictable load and so
-// fewer rate limited requests. See the full simulation this is based on at
-// https://github.com/banks/sim-rate-limit-backoff/blob/master/README.md for
-// more detail.
-const caChangeJitterWindow = 30 * time.Second
-
-// NOTE: this function only has one goroutine in it per key at all times
-func (m *Manager) attemptLeafRefresh(
-	req *ConnectCALeafRequest,
-	existing *structs.IssuedCert,
-	state fetchState,
-) (*structs.IssuedCert, fetchState, error) {
-	if req.MaxQueryTime <= 0 {
-		req.MaxQueryTime = DefaultQueryTimeout
-	}
-
-	// Handle brand new request first as it's simplest.
-	if existing == nil {
-		return m.generateNewLeaf(req, state, true)
-	}
-
-	// We have a certificate in cache already. Check it's still valid.
-	now := time.Now()
-	minExpire, maxExpire := calculateSoftExpiry(now, existing)
-	expiresAt := minExpire.Add(lib.RandomStagger(maxExpire.Sub(minExpire)))
-
-	// Check if we have been force-expired by a root update that jittered beyond
-	// the timeout of the query it was running.
-	if !state.forceExpireAfter.IsZero() && state.forceExpireAfter.Before(expiresAt) {
-		expiresAt = state.forceExpireAfter
-	}
-
-	if expiresAt.Equal(now) || expiresAt.Before(now) {
-		// Already expired, just make a new one right away
-		return m.generateNewLeaf(req, state, false)
-	}
-
-	// If we called Get() with MustRevalidate then this call came from a non-blocking query.
-	// Any prior CA rotations should've already expired the cert.
-	// All we need to do is check whether the current CA is the one that signed the leaf. If not, generate a new leaf.
-	// This is not a perfect solution (as a CA rotation update can be missed) but it should take care of instances like
-	// see https://github.com/hashicorp/consul/issues/10871, https://github.com/hashicorp/consul/issues/9862
-	// This seems to me like a hack, so maybe we can revisit the caching/ fetching logic in this case
-	if req.MustRevalidate {
-		roots, err := m.rootsReader.Get()
-		if err != nil {
-			return nil, state, err
-		} else if roots == nil {
-			return nil, state, errors.New("no CA roots")
-		}
-		if activeRootHasKey(roots, state.authorityKeyID) {
-			return nil, state, nil
-		}
-
-		// if we reach here then the current leaf was not signed by the same CAs, just regen
-		return m.generateNewLeaf(req, state, false)
-	}
-
-	// We are about to block and wait for a change or timeout.
-
-	// Make a chan we can be notified of changes to CA roots on. It must be
-	// buffered so we don't miss broadcasts from rootsWatch. It is an edge trigger
-	// so a single buffer element is sufficient regardless of whether we consume
-	// the updates fast enough since as soon as we see an element in it, we will
-	// reload latest CA from cache.
-	rootUpdateCh := make(chan struct{}, 1)
-
-	// The roots may have changed in between blocking calls. We need to verify
-	// that the existing cert was signed by the current root. If it was we still
-	// want to do the whole jitter thing. We could code that again here but it's
-	// identical to the select case below so we just trigger our own update chan
-	// and let the logic below handle checking if the CA actually changed in the
-	// common case where it didn't it is a no-op anyway.
-	rootUpdateCh <- struct{}{}
-
-	// Subscribe our chan to get root update notification.
-	m.rootWatcher.Subscribe(rootUpdateCh)
-	defer m.rootWatcher.Unsubscribe(rootUpdateCh)
-
-	// Setup the timeout chan outside the loop so we don't keep bumping the timeout
-	// later if we loop around.
-	timeoutTimer := time.NewTimer(req.MaxQueryTime)
-	defer timeoutTimer.Stop()
-
-	// Setup initial expiry chan. We may change this if root update occurs in the
-	// loop below.
-	expiresTimer := time.NewTimer(expiresAt.Sub(now))
-	defer func() {
-		// Resolve the timer reference at defer time, so we use the latest one each time.
-		expiresTimer.Stop()
-	}()
-
-	// Current cert is valid so just wait until it expires or we time out.
-	for {
-		select {
-		case <-timeoutTimer.C:
-			// We timed out the request with same cert.
-			return nil, state, nil
-
-		case <-expiresTimer.C:
-			// Cert expired or was force-expired by a root change.
-			return m.generateNewLeaf(req, state, false)
-
-		case <-rootUpdateCh:
-			// A root cache change occurred, reload roots from cache.
-			roots, err := m.rootsReader.Get()
-			if err != nil {
-				return nil, state, err
-			} else if roots == nil {
-				return nil, state, errors.New("no CA roots")
-			}
-
-			// Handle _possibly_ changed roots. We still need to verify the new active
-			// root is not the same as the one our current cert was signed by since we
-			// can be notified spuriously if we are the first request since the
-			// rootsWatcher didn't know about the CA we were signed by. We also rely
-			// on this on every request to do the initial check that the current roots
-			// are the same ones the current cert was signed by.
-			if activeRootHasKey(roots, state.authorityKeyID) {
-				// Current active CA is the same one that signed our current cert so
-				// keep waiting for a change.
-				continue
-			}
-			state.activeRootRotationStart = time.Now()
-
-			// CA root changed. We add some jitter here to avoid a thundering herd.
-			// See docs on caChangeJitterWindow const.
-			delay := m.getJitteredCAChangeDelay()
-
-			// Force the cert to be expired after the jitter - the delay above might
-			// be longer than we have left on our timeout. We set forceExpireAfter in
-			// the cache state so the next request will notice we still need to renew
-			// and do it at the right time. This is cleared once a new cert is
-			// returned by generateNewLeaf.
-			state.forceExpireAfter = state.activeRootRotationStart.Add(delay)
-			// If the delay time is within the current timeout, we want to renew the
-			// as soon as it's up. We change the expire time and chan so that when we
-			// loop back around, we'll wait at most delay until generating a new cert.
-			if state.forceExpireAfter.Before(expiresAt) {
-				expiresAt = state.forceExpireAfter
-				// Stop the former one and create a new one.
-				expiresTimer.Stop()
-				expiresTimer = time.NewTimer(delay)
-			}
-			continue
-		}
-	}
-}
-
-func (m *Manager) getJitteredCAChangeDelay() time.Duration {
-	if m.config.TestOverrideCAChangeInitialDelay > 0 {
-		return m.config.TestOverrideCAChangeInitialDelay
-	}
-	// CA root changed. We add some jitter here to avoid a thundering herd.
-	// See docs on caChangeJitterWindow const.
-	return lib.RandomStagger(caChangeJitterWindow)
-}
-
-func activeRootHasKey(roots *structs.IndexedCARoots, currentSigningKeyID string) bool {
-	for _, ca := range roots.Roots {
-		if ca.Active {
-			return ca.SigningKeyID == currentSigningKeyID
-		}
-	}
-	// Shouldn't be possible since at least one root should be active.
-	return false
-}
-
-// generateNewLeaf does the actual work of creating a new private key,
-// generating a CSR and getting it signed by the servers.
-//
-// NOTE: do not hold the lock while doing the RPC/blocking stuff
-func (m *Manager) generateNewLeaf(
-	req *ConnectCALeafRequest,
-	newState fetchState,
-	firstTime bool,
-) (*structs.IssuedCert, fetchState, error) {
-	// Need to lookup RootCAs response to discover trust domain. This should be a
-	// cache hit.
-	roots, err := m.rootsReader.Get()
-	if err != nil {
-		return nil, newState, err
-	} else if roots == nil {
-		return nil, newState, errors.New("no CA roots")
-	}
-	if roots.TrustDomain == "" {
-		return nil, newState, errors.New("cluster has no CA bootstrapped yet")
-	}
-
-	// Build the cert uri
-	var id connect.CertURI
-	var dnsNames []string
-	var ipAddresses []net.IP
-
-	switch {
-	case req.WorkloadIdentity != "":
-		id = &connect.SpiffeIDWorkloadIdentity{
-			TrustDomain:      roots.TrustDomain,
-			Partition:        req.TargetPartition(),
-			Namespace:        req.TargetNamespace(),
-			WorkloadIdentity: req.WorkloadIdentity,
-		}
-		dnsNames = append(dnsNames, req.DNSSAN...)
-
-	case req.Service != "":
-		id = &connect.SpiffeIDService{
-			Host:       roots.TrustDomain,
-			Datacenter: req.Datacenter,
-			Partition:  req.TargetPartition(),
-			Namespace:  req.TargetNamespace(),
-			Service:    req.Service,
-		}
-		dnsNames = append(dnsNames, req.DNSSAN...)
-
-	case req.Agent != "":
-		id = &connect.SpiffeIDAgent{
-			Host:       roots.TrustDomain,
-			Datacenter: req.Datacenter,
-			Partition:  req.TargetPartition(),
-			Agent:      req.Agent,
-		}
-		dnsNames = append([]string{"localhost"}, req.DNSSAN...)
-		ipAddresses = append([]net.IP{net.ParseIP("127.0.0.1"), net.ParseIP("::1")}, req.IPSAN...)
-
-	case req.Kind == structs.ServiceKindMeshGateway:
-		id = &connect.SpiffeIDMeshGateway{
-			Host:       roots.TrustDomain,
-			Datacenter: req.Datacenter,
-			Partition:  req.TargetPartition(),
-		}
-		dnsNames = append(dnsNames, req.DNSSAN...)
-
-	case req.Kind != "":
-		return nil, newState, fmt.Errorf("unsupported kind: %s", req.Kind)
-
-	case req.Server:
-		if req.Datacenter == "" {
-			return nil, newState, errors.New("datacenter name must be specified")
-		}
-		id = &connect.SpiffeIDServer{
-			Host:       roots.TrustDomain,
-			Datacenter: req.Datacenter,
-		}
-		dnsNames = append(dnsNames, connect.PeeringServerSAN(req.Datacenter, roots.TrustDomain))
-
-	default:
-		return nil, newState, errors.New("URI must be either workload identity, service, agent, server, or kind")
-	}
-
-	// Create a new private key
-
-	// TODO: for now we always generate EC keys on clients regardless of the key
-	// type being used by the active CA. This is fine and allowed in TLS1.2 and
-	// signing EC CSRs with an RSA key is supported by all current CA providers so
-	// it's OK. IFF we ever need to support a CA provider that refuses to sign a
-	// CSR with a different signature algorithm, or if we have compatibility
-	// issues with external PKI systems that require EC certs be signed with ECDSA
-	// from the CA (this was required in TLS1.1 but not in 1.2) then we can
-	// instead intelligently pick the key type we generate here based on the key
-	// type of the active signing CA. We already have that loaded since we need
-	// the trust domain.
-	pk, pkPEM, err := connect.GeneratePrivateKey()
-	if err != nil {
-		return nil, newState, err
-	}
-
-	// Create a CSR.
-	csr, err := connect.CreateCSR(id, pk, dnsNames, ipAddresses)
-	if err != nil {
-		return nil, newState, err
-	}
-
-	// Request signing
-	args := structs.CASignRequest{
-		WriteRequest: structs.WriteRequest{Token: req.Token},
-		Datacenter:   req.Datacenter,
-		CSR:          csr,
-	}
-
-	reply, err := m.certSigner.SignCert(context.Background(), &args)
-	if err != nil {
-		if err.Error() == structs.ErrRateLimited.Error() {
-			if firstTime {
-				// This was a first fetch - we have no good value in cache. In this case
-				// we just return the error to the caller rather than rely on surprising
-				// semi-blocking until the rate limit is appeased or we timeout
-				// behavior. It's likely the caller isn't expecting this to block since
-				// it's an initial fetch. This also massively simplifies this edge case.
-				return nil, newState, err
-			}
-
-			if newState.activeRootRotationStart.IsZero() {
-				// We hit a rate limit error by chance - for example a cert expired
-				// before the root rotation was observed (not triggered by rotation) but
-				// while server is working through high load from a recent rotation.
-				// Just pretend there is a rotation and the retry logic here will start
-				// jittering and retrying in the same way from now.
-				newState.activeRootRotationStart = time.Now()
-			}
-
-			// Increment the errors in the state
-			newState.consecutiveRateLimitErrs++
-
-			delay := m.getJitteredCAChangeDelay()
-
-			// Find the start of the next window we can retry in. See comment on
-			// caChangeJitterWindow for details of why we use this strategy.
-			windowStart := newState.activeRootRotationStart.Add(
-				time.Duration(newState.consecutiveRateLimitErrs) * delay)
-
-			// Pick a random time in that window
-			newState.forceExpireAfter = windowStart.Add(delay)
-
-			// Return a result with the existing cert but the new state - the cache
-			// will see this as no change. Note that we always have an existing result
-			// here due to the nil value check above.
-			return nil, newState, nil
-		}
-		return nil, newState, err
-	}
-	reply.PrivateKeyPEM = pkPEM
-
-	// Reset rotation state
-	newState.forceExpireAfter = time.Time{}
-	newState.consecutiveRateLimitErrs = 0
-	newState.activeRootRotationStart = time.Time{}
-
-	cert, err := connect.ParseCert(reply.CertPEM)
-	if err != nil {
-		return nil, newState, err
-	}
-	// Set the CA key ID so we can easily tell when a active root has changed.
-	newState.authorityKeyID = connect.EncodeSigningKeyID(cert.AuthorityKeyId)
-
-	return reply, newState, nil
-}
diff --git a/agent/leafcert/leafcert.go b/agent/leafcert/leafcert.go
deleted file mode 100644
index 34759b6fdc7a7..0000000000000
--- a/agent/leafcert/leafcert.go
+++ /dev/null
@@ -1,559 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package leafcert
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"sync"
-	"time"
-
-	"github.com/armon/go-metrics"
-	"github.com/hashicorp/go-hclog"
-	"golang.org/x/sync/singleflight"
-	"golang.org/x/time/rate"
-
-	"github.com/hashicorp/consul/agent/cacheshim"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/lib/ttlcache"
-)
-
-const (
-	DefaultLastGetTTL = 72 * time.Hour // reasonable default is days
-
-	// DefaultLeafCertRefreshRate is the default rate at which certs can be refreshed.
-	// This defaults to not being limited
-	DefaultLeafCertRefreshRate = rate.Inf
-
-	// DefaultLeafCertRefreshMaxBurst is the number of cache entry fetches that can
-	// occur in a burst.
-	DefaultLeafCertRefreshMaxBurst = 2
-
-	DefaultLeafCertRefreshBackoffMin = 3               // 3 attempts before backing off
-	DefaultLeafCertRefreshMaxWait    = 1 * time.Minute // maximum backoff wait time
-
-	DefaultQueryTimeout = 10 * time.Minute
-)
-
-type Config struct {
-	// LastGetTTL is the time that the certs returned by this type remain in
-	// the cache after the last get operation. If a cert isn't accessed within
-	// this duration, the certs is purged and background refreshing will cease.
-	LastGetTTL time.Duration
-
-	// LeafCertRefreshMaxBurst max burst size of RateLimit for a single cache entry
-	LeafCertRefreshMaxBurst int
-
-	// LeafCertRefreshRate represents the max calls/sec for a single cache entry
-	LeafCertRefreshRate rate.Limit
-
-	// LeafCertRefreshBackoffMin is the number of attempts to wait before
-	// backing off.
-	//
-	// Mostly configurable just for testing.
-	LeafCertRefreshBackoffMin uint
-
-	// LeafCertRefreshMaxWait is the maximum backoff wait time.
-	//
-	// Mostly configurable just for testing.
-	LeafCertRefreshMaxWait time.Duration
-
-	// TestOverrideCAChangeInitialDelay allows overriding the random jitter
-	// after a root change with a fixed delay. So far ths is only done in
-	// tests. If it's zero the caChangeInitialSpreadDefault maximum jitter will
-	// be used but if set, it overrides and provides a fixed delay. To
-	// essentially disable the delay in tests they can set it to 1 nanosecond.
-	// We may separately allow configuring the jitter limit by users later but
-	// this is different and for tests only since we need to set a
-	// deterministic time delay in order to test the behavior here fully and
-	// determinstically.
-	TestOverrideCAChangeInitialDelay time.Duration
-}
-
-func (c Config) withDefaults() Config {
-	if c.LastGetTTL <= 0 {
-		c.LastGetTTL = DefaultLastGetTTL
-	}
-	if c.LeafCertRefreshRate == 0.0 {
-		c.LeafCertRefreshRate = DefaultLeafCertRefreshRate
-	}
-	if c.LeafCertRefreshMaxBurst == 0 {
-		c.LeafCertRefreshMaxBurst = DefaultLeafCertRefreshMaxBurst
-	}
-	if c.LeafCertRefreshBackoffMin == 0 {
-		c.LeafCertRefreshBackoffMin = DefaultLeafCertRefreshBackoffMin
-	}
-	if c.LeafCertRefreshMaxWait == 0 {
-		c.LeafCertRefreshMaxWait = DefaultLeafCertRefreshMaxWait
-	}
-	return c
-}
-
-type Deps struct {
-	Config Config
-	Logger hclog.Logger
-
-	// RootsReader is an interface to access connect CA roots.
-	RootsReader RootsReader
-
-	// CertSigner is an interface to remotely sign certificates.
-	CertSigner CertSigner
-}
-
-type RootsReader interface {
-	Get() (*structs.IndexedCARoots, error)
-	Notify(ctx context.Context, correlationID string, ch chan<- cacheshim.UpdateEvent) error
-}
-
-type CertSigner interface {
-	SignCert(ctx context.Context, args *structs.CASignRequest) (*structs.IssuedCert, error)
-}
-
-func NewManager(deps Deps) *Manager {
-	deps.Config = deps.Config.withDefaults()
-
-	if deps.Logger == nil {
-		deps.Logger = hclog.NewNullLogger()
-	}
-	if deps.RootsReader == nil {
-		panic("RootsReader is required")
-	}
-	if deps.CertSigner == nil {
-		panic("CertSigner is required")
-	}
-
-	m := &Manager{
-		config:      deps.Config,
-		logger:      deps.Logger,
-		certSigner:  deps.CertSigner,
-		rootsReader: deps.RootsReader,
-		//
-		certs:           make(map[string]*certData),
-		certsExpiryHeap: ttlcache.NewExpiryHeap(),
-	}
-
-	m.ctx, m.ctxCancel = context.WithCancel(context.Background())
-
-	m.rootWatcher = &rootWatcher{
-		ctx:         m.ctx,
-		rootsReader: m.rootsReader,
-	}
-
-	// Start the expiry watcher
-	go m.runExpiryLoop()
-
-	return m
-}
-
-type Manager struct {
-	logger hclog.Logger
-
-	// config contains agent configuration necessary for the cert manager to operate.
-	config Config
-
-	// rootsReader is an interface to access connect CA roots.
-	rootsReader RootsReader
-
-	// certSigner is an interface to remotely sign certificates.
-	certSigner CertSigner
-
-	// rootWatcher helps let multiple requests for leaf certs to coordinate
-	// sharing a single long-lived watch for the root certs. This allows the
-	// leaf cert requests to notice when the roots rotate and trigger their
-	// reissuance.
-	rootWatcher *rootWatcher
-
-	// This is the "top-level" internal context. This is used to cancel
-	// background operations.
-	ctx       context.Context
-	ctxCancel context.CancelFunc
-
-	// lock guards access to certs and certsExpiryHeap
-	lock            sync.RWMutex
-	certs           map[string]*certData
-	certsExpiryHeap *ttlcache.ExpiryHeap
-
-	// certGroup is a singleflight group keyed identically to the certs map.
-	// When the leaf cert itself needs replacement requests will coalesce
-	// together through this chokepoint.
-	certGroup singleflight.Group
-}
-
-func (m *Manager) getCertData(key string) *certData {
-	m.lock.RLock()
-	cd, ok := m.certs[key]
-	m.lock.RUnlock()
-
-	if ok {
-		return cd
-	}
-
-	m.lock.Lock()
-	defer m.lock.Unlock()
-
-	cd, ok = m.certs[key]
-	if !ok {
-		cd = &certData{
-			expiry: m.certsExpiryHeap.Add(key, m.config.LastGetTTL),
-			refreshRateLimiter: rate.NewLimiter(
-				m.config.LeafCertRefreshRate,
-				m.config.LeafCertRefreshMaxBurst,
-			),
-		}
-
-		m.certs[key] = cd
-
-		metrics.SetGauge([]string{"leaf-certs", "entries_count"}, float32(len(m.certs)))
-	}
-	return cd
-}
-
-// Stop stops any background work and frees all resources for the manager.
-// Current fetch requests are allowed to continue to completion and callers may
-// still access the current leaf cert values so coordination isn't needed with
-// callers, however no background activity will continue. It's intended to
-// close the manager at agent shutdown so no further requests should be made,
-// however concurrent or in-flight ones won't break.
-func (m *Manager) Stop() {
-	if m.ctxCancel != nil {
-		m.ctxCancel()
-		m.ctxCancel = nil
-	}
-}
-
-// Get returns the leaf cert for the request. If data satisfying the
-// minimum index is present, it is returned immediately. Otherwise,
-// this will block until the cert is refreshed or the request timeout is
-// reached.
-//
-// Multiple Get calls for the same logical request will block on a single
-// network request.
-//
-// The timeout specified by the request will be the timeout on the cache
-// Get, and does not correspond to the timeout of any background data
-// fetching. If the timeout is reached before data satisfying the minimum
-// index is retrieved, the last known value (maybe nil) is returned. No
-// error is returned on timeout. This matches the behavior of Consul blocking
-// queries.
-func (m *Manager) Get(ctx context.Context, req *ConnectCALeafRequest) (*structs.IssuedCert, cacheshim.ResultMeta, error) {
-	// Lightweight copy this object so that manipulating req doesn't race.
-	dup := *req
-	req = &dup
-
-	// We don't want non-blocking queries to return expired leaf certs
-	// or leaf certs not valid under the current CA. So always revalidate
-	// the leaf cert on non-blocking queries (ie when MinQueryIndex == 0)
-	//
-	// NOTE: This conditional was formerly only in the API endpoint.
-	if req.MinQueryIndex == 0 {
-		req.MustRevalidate = true
-	}
-
-	return m.internalGet(ctx, req)
-}
-
-func (m *Manager) internalGet(ctx context.Context, req *ConnectCALeafRequest) (*structs.IssuedCert, cacheshim.ResultMeta, error) {
-	key := req.Key()
-	if key == "" {
-		return nil, cacheshim.ResultMeta{}, fmt.Errorf("a key is required")
-	}
-
-	if req.MaxQueryTime <= 0 {
-		req.MaxQueryTime = DefaultQueryTimeout
-	}
-	timeoutTimer := time.NewTimer(req.MaxQueryTime)
-	defer timeoutTimer.Stop()
-
-	// First time through
-	first := true
-
-	for {
-		// Get the current value
-		cd := m.getCertData(key)
-
-		cd.lock.Lock()
-		var (
-			existing      = cd.value
-			existingIndex = cd.index
-			refreshing    = cd.refreshing
-			fetchedAt     = cd.fetchedAt
-			lastFetchErr  = cd.lastFetchErr
-			expiry        = cd.expiry
-		)
-		cd.lock.Unlock()
-
-		shouldReplaceCert := certNeedsUpdate(req, existingIndex, existing, refreshing)
-
-		if expiry != nil {
-			// The entry already exists in the TTL heap, touch it to keep it alive since
-			// this Get is still interested in the value. Note that we used to only do
-			// this in the `entryValid` block below but that means that a cache entry
-			// will expire after it's TTL regardless of how many callers are waiting for
-			// updates in this method in a couple of cases:
-			//
-			//  1. If the agent is disconnected from servers for the TTL then the client
-			//     will be in backoff getting errors on each call to Get and since an
-			//     errored cache entry has Valid = false it won't be touching the TTL.
-			//
-			//  2. If the value is just not changing then the client's current index
-			//     will be equal to the entry index and entryValid will be false. This
-			//     is a common case!
-			//
-			// But regardless of the state of the entry, assuming it's already in the
-			// TTL heap, we should touch it every time around here since this caller at
-			// least still cares about the value!
-			m.lock.Lock()
-			m.certsExpiryHeap.Update(expiry.Index(), m.config.LastGetTTL)
-			m.lock.Unlock()
-		}
-
-		if !shouldReplaceCert {
-			meta := cacheshim.ResultMeta{
-				Index: existingIndex,
-			}
-
-			if first {
-				meta.Hit = true
-			}
-
-			// For non-background refresh types, the age is just how long since we
-			// fetched it last.
-			if !fetchedAt.IsZero() {
-				meta.Age = time.Since(fetchedAt)
-			}
-
-			// We purposely do not return an error here since the cache only works with
-			// fetching values that either have a value or have an error, but not both.
-			// The Error may be non-nil in the entry in the case that an error has
-			// occurred _since_ the last good value, but we still want to return the
-			// good value to clients that are not requesting a specific version. The
-			// effect of this is that blocking clients will all see an error immediately
-			// without waiting a whole timeout to see it, but clients that just look up
-			// cache with an older index than the last valid result will still see the
-			// result and not the error here. I.e. the error is not "cached" without a
-			// new fetch attempt occurring, but the last good value can still be fetched
-			// from cache.
-			return existing, meta, nil
-		}
-
-		// If this isn't our first time through and our last value has an error, then
-		// we return the error. This has the behavior that we don't sit in a retry
-		// loop getting the same error for the entire duration of the timeout.
-		// Instead, we make one effort to fetch a new value, and if there was an
-		// error, we return. Note that the invariant is that if both entry.Value AND
-		// entry.Error are non-nil, the error _must_ be more recent than the Value. In
-		// other words valid fetches should reset the error. See
-		// https://github.com/hashicorp/consul/issues/4480.
-		if !first && lastFetchErr != nil {
-			return existing, cacheshim.ResultMeta{Index: existingIndex}, lastFetchErr
-		}
-
-		notifyCh := m.triggerCertRefreshInGroup(req, cd)
-
-		// No longer our first time through
-		first = false
-
-		select {
-		case <-ctx.Done():
-			return nil, cacheshim.ResultMeta{}, ctx.Err()
-		case <-notifyCh:
-			// Our fetch returned, retry the get from the cache.
-			req.MustRevalidate = false
-
-		case <-timeoutTimer.C:
-			// Timeout on the cache read, just return whatever we have.
-			return existing, cacheshim.ResultMeta{Index: existingIndex}, nil
-		}
-	}
-}
-
-func certNeedsUpdate(req *ConnectCALeafRequest, index uint64, value *structs.IssuedCert, refreshing bool) bool {
-	if value == nil {
-		return true
-	}
-
-	if req.MinQueryIndex > 0 && req.MinQueryIndex >= index {
-		// MinIndex was given and matches or is higher than current value so we
-		// ignore the cache and fallthrough to blocking on a new value.
-		return true
-	}
-
-	// Check if re-validate is requested. If so the first time round the
-	// loop is not a hit but subsequent ones should be treated normally.
-	if req.MustRevalidate {
-		// It is important to note that this block ONLY applies when we are not
-		// in indefinite refresh mode (where the underlying goroutine will
-		// continue to re-query for data).
-		//
-		// In this mode goroutines have a 1:1 relationship to RPCs that get
-		// executed, and importantly they DO NOT SLEEP after executing.
-		//
-		// This means that a running goroutine for this cache entry extremely
-		// strongly implies that the RPC has not yet completed, which is why
-		// this check works for the revalidation-avoidance optimization here.
-		if refreshing {
-			// There is an active goroutine performing a blocking query for
-			// this data, which has not returned.
-			//
-			// We can logically deduce that the contents of the cache are
-			// actually current, and we can simply return this while leaving
-			// the blocking query alone.
-			return false
-		} else {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (m *Manager) triggerCertRefreshInGroup(req *ConnectCALeafRequest, cd *certData) <-chan singleflight.Result {
-	// Lightweight copy this object so that manipulating req doesn't race.
-	dup := *req
-	req = &dup
-
-	if req.MaxQueryTime == 0 {
-		req.MaxQueryTime = DefaultQueryTimeout
-	}
-
-	// At this point, we know we either don't have a cert at all or the
-	// cert we have is too old. We need to mint a new one.
-	//
-	// We use a singleflight group to coordinate only one request driving
-	// the async update to the key at once.
-	//
-	// NOTE: this anonymous function only has one goroutine in it per key at all times
-	return m.certGroup.DoChan(req.Key(), func() (any, error) {
-		cd.lock.Lock()
-		var (
-			shouldReplaceCert = certNeedsUpdate(req, cd.index, cd.value, cd.refreshing)
-			rateLimiter       = cd.refreshRateLimiter
-			lastIndex         = cd.index
-		)
-		cd.lock.Unlock()
-
-		if !shouldReplaceCert {
-			// This handles the case where a fetch succeeded after checking for
-			// its existence in Get. This ensures that we don't miss updates
-			// since we don't hold the lock between the read and then the
-			// refresh trigger.
-			return nil, nil
-		}
-
-		if err := rateLimiter.Wait(m.ctx); err != nil {
-			// NOTE: this can only happen when the entire cache is being
-			// shutdown and isn't something that can happen normally.
-			return nil, nil
-		}
-
-		cd.MarkRefreshing(true)
-		defer cd.MarkRefreshing(false)
-
-		req.MinQueryIndex = lastIndex
-
-		// Start building the new entry by blocking on the fetch.
-		m.refreshLeafAndUpdate(req, cd)
-
-		return nil, nil
-	})
-}
-
-// testGet is a way for the test code to do a get but from the middle of the
-// logic stack, skipping some of the caching logic.
-func (m *Manager) testGet(req *ConnectCALeafRequest) (uint64, *structs.IssuedCert, error) {
-	cd := m.getCertData(req.Key())
-
-	m.refreshLeafAndUpdate(req, cd)
-
-	cd.lock.Lock()
-	var (
-		index = cd.index
-		cert  = cd.value
-		err   = cd.lastFetchErr
-	)
-	cd.lock.Unlock()
-
-	if err != nil {
-		return 0, nil, err
-	}
-
-	return index, cert, nil
-}
-
-// refreshLeafAndUpdate will try to refresh the leaf and persist the updated
-// data back to the in-memory store.
-//
-// NOTE: this function only has one goroutine in it per key at all times
-func (m *Manager) refreshLeafAndUpdate(req *ConnectCALeafRequest, cd *certData) {
-	existing, state := cd.GetValueAndState()
-	newCert, updatedState, err := m.attemptLeafRefresh(req, existing, state)
-	cd.Update(newCert, updatedState, err)
-}
-
-// Prepopulate puts a cert in manually. This is useful when the correct initial
-// value is known and the cache shouldn't refetch the same thing on startup. It
-// is used to set AgentLeafCert when AutoEncrypt.TLS is turned on. The manager
-// itself cannot fetch that the first time because it requires a special
-// RPCType. Subsequent runs are fine though.
-func (m *Manager) Prepopulate(
-	ctx context.Context,
-	key string,
-	index uint64,
-	value *structs.IssuedCert,
-	authorityKeyID string,
-) error {
-	if value == nil {
-		return errors.New("value is required")
-	}
-	cd := m.getCertData(key)
-
-	cd.lock.Lock()
-	defer cd.lock.Unlock()
-
-	cd.index = index
-	cd.value = value
-	cd.state = fetchState{
-		authorityKeyID:           authorityKeyID,
-		forceExpireAfter:         time.Time{},
-		consecutiveRateLimitErrs: 0,
-		activeRootRotationStart:  time.Time{},
-	}
-
-	return nil
-}
-
-// runExpiryLoop is a blocking function that watches the expiration
-// heap and invalidates cert entries that have expired.
-func (m *Manager) runExpiryLoop() {
-	for {
-		m.lock.RLock()
-		timer := m.certsExpiryHeap.Next()
-		m.lock.RUnlock()
-
-		select {
-		case <-m.ctx.Done():
-			timer.Stop()
-			return
-		case <-m.certsExpiryHeap.NotifyCh:
-			timer.Stop()
-			continue
-
-		case <-timer.Wait():
-			m.lock.Lock()
-
-			entry := timer.Entry
-
-			// Entry expired! Remove it.
-			delete(m.certs, entry.Key())
-			m.certsExpiryHeap.Remove(entry.Index())
-
-			// Set some metrics
-			metrics.IncrCounter([]string{"leaf-certs", "evict_expired"}, 1)
-			metrics.SetGauge([]string{"leaf-certs", "entries_count"}, float32(len(m.certs)))
-
-			m.lock.Unlock()
-		}
-	}
-}
diff --git a/agent/leafcert/leafcert_test.go b/agent/leafcert/leafcert_test.go
deleted file mode 100644
index f23ecfef62f99..0000000000000
--- a/agent/leafcert/leafcert_test.go
+++ /dev/null
@@ -1,1042 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package leafcert
-
-import (
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/pem"
-	"fmt"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/cacheshim"
-	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-)
-
-// Test that after an initial signing, new CA roots (new ID) will
-// trigger a blocking query to execute.
-func TestManager_changingRoots(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	m, signer := NewTestManager(t, nil)
-
-	caRoot := signer.UpdateCA(t, nil)
-
-	// We'll reuse the fetch options and request
-	req := &ConnectCALeafRequest{
-		Datacenter: "dc1", Service: "web",
-		MinQueryIndex: 0, MaxQueryTime: 10 * time.Second,
-	}
-
-	// First fetch should return immediately
-	getCh := testAsyncGet(t, m, req)
-	var idx uint64
-	select {
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("shouldn't block waiting for fetch")
-	case result := <-getCh:
-		require.NoError(t, result.Err)
-		require.NotNil(t, result.Value)
-		requireLeafValidUnderCA(t, result.Value, caRoot)
-		require.True(t, result.Index > 0)
-
-		idx = result.Index
-	}
-
-	// Second fetch should block with set index
-	req.MinQueryIndex = idx
-	getCh = testAsyncGet(t, m, req)
-	select {
-	case result := <-getCh:
-		t.Fatalf("should not return: %#v", result)
-	case <-time.After(100 * time.Millisecond):
-	}
-
-	// Let's send in new roots, which should trigger the sign req. We need to take
-	// care to set the new root as active
-	caRoot2 := signer.UpdateCA(t, nil)
-	select {
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("shouldn't block waiting for fetch")
-	case result := <-getCh:
-		require.NoError(t, result.Err)
-		require.NotNil(t, result.Value)
-		require.True(t, result.Index > idx)
-		requireLeafValidUnderCA(t, result.Value, caRoot2)
-	}
-
-	// Third fetch should block
-	getCh = testAsyncGet(t, m, req)
-	select {
-	case result := <-getCh:
-		t.Fatalf("should not return: %#v", result)
-	case <-time.After(100 * time.Millisecond):
-	}
-}
-
-// Tests that if the root change jitter is longer than the time left on the
-// timeout, we return normally but then still renew the cert on a subsequent
-// call.
-func TestManager_changingRootsJitterBetweenCalls(t *testing.T) {
-	t.Parallel()
-
-	const TestOverrideCAChangeInitialDelay = 100 * time.Millisecond
-
-	m, signer := NewTestManager(t, func(cfg *Config) {
-		// Override the root-change delay so we will timeout first. We can't set it to
-		// a crazy high value otherwise we'll have to wait that long in the test to
-		// see if it actually happens on subsequent calls. We instead reduce the
-		// timeout in FetchOptions to be much shorter than this.
-		cfg.TestOverrideCAChangeInitialDelay = TestOverrideCAChangeInitialDelay
-	})
-
-	caRoot := signer.UpdateCA(t, nil)
-
-	// We'll reuse the fetch options and request. Timeout must be much shorter
-	// than the initial root delay. 20ms means that if we deliver the root change
-	// during the first blocking call, we should need to block fully for 5 more
-	// calls before the cert is renewed. We pick a timeout that is not an exact
-	// multiple of the 100ms delay above to reduce the chance that timing works
-	// out in a way that makes it hard to tell a timeout from an early return due
-	// to a cert renewal.
-	req := &ConnectCALeafRequest{
-		Datacenter: "dc1", Service: "web",
-		MinQueryIndex: 0, MaxQueryTime: 35 * time.Millisecond,
-	}
-
-	// First fetch should return immediately
-	getCh := testAsyncGet(t, m, req)
-	var (
-		idx    uint64
-		issued *structs.IssuedCert
-	)
-	select {
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("shouldn't block waiting for fetch")
-	case result := <-getCh:
-		require.NoError(t, result.Err)
-		require.NotNil(t, result.Value)
-		require.True(t, result.Index > 0)
-		requireLeafValidUnderCA(t, result.Value, caRoot)
-		idx = result.Index
-		issued = result.Value
-	}
-
-	// Let's send in new roots, which should eventually trigger the sign req. We
-	// need to take care to set the new root as active. Note that this is
-	// implicitly testing that root updates that happen in between leaf blocking
-	// queries are still noticed too. At this point no leaf blocking query is
-	// running so the root watch should be stopped. By pushing this update, the
-	// next blocking query will _immediately_ see the new root which means it
-	// needs to correctly notice that it is not the same one that generated the
-	// current cert and start the rotation. This is good, just not obvious that
-	// the behavior is actually well tested here when it is.
-	caRoot2 := signer.UpdateCA(t, nil)
-	earliestRootDelivery := time.Now()
-
-	// Some number of fetches (2,3,4 likely) should timeout after 20ms and after
-	// 100ms has elapsed total we should see the new cert. Since this is all very
-	// timing dependent, we don't hard code exact numbers here and instead loop
-	// for plenty of time and do as many calls as it takes and just assert on the
-	// time taken and that the call either blocks and returns the cached cert, or
-	// returns the new one.
-	req.MinQueryIndex = idx
-	var shouldExpireAfter time.Time
-	i := 1
-	rootsDelivered := false
-	for rootsDelivered {
-		start := time.Now()
-		getCh = testAsyncGet(t, m, req)
-		select {
-		case result := <-getCh:
-			require.NoError(t, result.Err)
-			timeTaken := time.Since(start)
-
-			// There are two options, either it blocked waiting for the delay after
-			// the rotation or it returned the new CA cert before the timeout was
-			// done. TO be more robust against timing, we take the value as the
-			// decider for which case it is, and assert timing matches our expected
-			// bounds rather than vice versa.
-
-			if result.Index > idx {
-				// Got a new cert
-				require.NotEqual(t, issued, result.Value)
-				require.NotNil(t, result.Value)
-				requireLeafValidUnderCA(t, result.Value, caRoot2)
-				// Should not have been delivered before the delay
-				require.True(t, time.Since(earliestRootDelivery) > TestOverrideCAChangeInitialDelay)
-				// All good. We are done!
-				rootsDelivered = true
-			} else {
-				// Should be the cached cert
-				require.Equal(t, issued, result.Value)
-				require.Equal(t, idx, result.Index)
-				requireLeafValidUnderCA(t, result.Value, caRoot)
-				// Sanity check we blocked for the whole timeout
-				require.Truef(t, timeTaken > req.MaxQueryTime,
-					"should block for at least %s, returned after %s",
-					req.MaxQueryTime, timeTaken)
-				// Sanity check that the forceExpireAfter state was set correctly
-				shouldExpireAfter := testObserveLeafCert(m, req, func(cd *certData) time.Time {
-					return cd.state.forceExpireAfter
-				})
-				require.True(t, shouldExpireAfter.After(time.Now()))
-				require.True(t, shouldExpireAfter.Before(time.Now().Add(TestOverrideCAChangeInitialDelay)))
-			}
-		case <-time.After(50 * time.Millisecond):
-			t.Fatalf("request %d blocked too long", i)
-		}
-		i++
-
-		// Sanity check that we've not gone way beyond the deadline without a
-		// new cert. We give some leeway to make it less brittle.
-		require.Falsef(t, time.Now().After(shouldExpireAfter.Add(100*time.Millisecond)),
-			"waited extra 100ms and delayed CA rotate renew didn't happen")
-	}
-}
-
-func testObserveLeafCert[T any](m *Manager, req *ConnectCALeafRequest, cb func(*certData) T) T {
-	key := req.Key()
-
-	cd := m.getCertData(key)
-
-	cd.lock.Lock()
-	defer cd.lock.Unlock()
-
-	return cb(cd)
-}
-
-// Tests that if the root changes in between blocking calls we still pick it up.
-func TestManager_changingRootsBetweenBlockingCalls(t *testing.T) {
-	t.Parallel()
-
-	m, signer := NewTestManager(t, nil)
-
-	caRoot := signer.UpdateCA(t, nil)
-
-	// We'll reuse the fetch options and request. Short timeout important since we
-	// wait the full timeout before chaning roots.
-	req := &ConnectCALeafRequest{
-		Datacenter: "dc1", Service: "web",
-		MinQueryIndex: 0, MaxQueryTime: 35 * time.Millisecond,
-	}
-
-	// First fetch should return immediately
-	getCh := testAsyncGet(t, m, req)
-	var (
-		idx    uint64
-		issued *structs.IssuedCert
-	)
-	select {
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("shouldn't block waiting for fetch")
-	case result := <-getCh:
-		require.NoError(t, result.Err)
-		require.NotNil(t, result.Value)
-		requireLeafValidUnderCA(t, result.Value, caRoot)
-		require.True(t, result.Index > 0)
-		idx = result.Index
-		issued = result.Value
-	}
-
-	// Next fetch should block for the full timeout
-	start := time.Now()
-	getCh = testAsyncGet(t, m, req)
-	select {
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("shouldn't block for too long waiting for fetch")
-	case result := <-getCh:
-		require.NoError(t, result.Err)
-		require.Equal(t, issued, result.Value)
-		// Still the initial cached result
-		require.Equal(t, idx, result.Index)
-		// Sanity check that it waited
-		require.True(t, time.Since(start) > req.MaxQueryTime)
-	}
-
-	// No active requests, simulate root change now
-	caRoot2 := signer.UpdateCA(t, nil)
-	earliestRootDelivery := time.Now()
-
-	// We should get the new cert immediately on next fetch (since test override
-	// root change jitter to be 1 nanosecond so no delay expected).
-	getCh = testAsyncGet(t, m, req)
-	select {
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("shouldn't block too long waiting for fetch")
-	case result := <-getCh:
-		require.NoError(t, result.Err)
-		require.NotEqual(t, issued, result.Value)
-		requireLeafValidUnderCA(t, result.Value, caRoot2)
-		require.True(t, result.Index > idx)
-		// Sanity check that we didn't wait too long
-		require.True(t, time.Since(earliestRootDelivery) < req.MaxQueryTime)
-	}
-}
-
-func TestManager_CSRRateLimiting(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	m, signer := NewTestManager(t, func(cfg *Config) {
-		// Each jitter window will be only 100 ms long to make testing quick but
-		// highly likely not to fail based on scheduling issues.
-		cfg.TestOverrideCAChangeInitialDelay = 100 * time.Millisecond
-	})
-
-	signer.UpdateCA(t, nil)
-
-	signer.SetSignCallErrors(
-		// First call return rate limit error. This is important as it checks
-		// behavior when cache is empty and we have to return a nil Value but need to
-		// save state to do the right thing for retry.
-		structs.ErrRateLimited, // inc
-		// Then succeed on second call
-		nil,
-		// Then be rate limited again on several further calls
-		structs.ErrRateLimited, // inc
-		structs.ErrRateLimited, // inc
-		// Then fine after that
-	)
-
-	req := &ConnectCALeafRequest{
-		Datacenter:     "dc1",
-		Service:        "web",
-		EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-	}
-
-	// First fetch should return rate limit error directly - client is expected to
-	// backoff itself.
-	getCh := testAsyncGet(t, m, req)
-	select {
-	case <-time.After(200 * time.Millisecond):
-		t.Fatal("shouldn't block longer than one jitter window for success")
-	case result := <-getCh:
-		require.Error(t, result.Err)
-		require.Equal(t, structs.ErrRateLimited.Error(), result.Err.Error())
-	}
-
-	// Second call should return correct cert immediately.
-	getCh = testAsyncGet(t, m, req)
-	var (
-		idx    uint64
-		issued *structs.IssuedCert
-	)
-	select {
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("shouldn't block waiting for fetch")
-	case result := <-getCh:
-		require.NoError(t, result.Err)
-		require.NotNil(t, result.Value)
-		require.True(t, result.Index > 0)
-		idx = result.Index
-		issued = result.Value
-	}
-
-	// Send in new roots, which should trigger the next sign req. We need to take
-	// care to set the new root as active
-	signer.UpdateCA(t, nil)
-	earliestRootDelivery := time.Now()
-
-	// Sanity check state
-	require.Equal(t, uint64(1), signer.GetSignCallErrorCount())
-
-	// After root rotation jitter has been waited out, a new CSR will
-	// be attempted but will fail and return the previous cached result with no
-	// error since we will try again soon.
-	getCh = testAsyncGet(t, m, req)
-	select {
-	case <-time.After(200 * time.Millisecond):
-		t.Fatal("shouldn't block too long waiting for fetch")
-	case result := <-getCh:
-		// We should block for _at least_ one jitter period since we set that to
-		// 100ms and in test override mode we always pick the max jitter not a
-		// random amount.
-		require.True(t, time.Since(earliestRootDelivery) > 100*time.Millisecond)
-		require.Equal(t, uint64(2), signer.GetSignCallErrorCount())
-
-		require.NoError(t, result.Err)
-		require.Equal(t, issued, result.Value)
-		// 1 since this should still be the original cached result as we failed to
-		// get a new cert.
-		require.Equal(t, idx, result.Index)
-	}
-
-	// Root rotation state is now only captured in the opts.LastResult.State so a
-	// subsequent call should also wait for 100ms and then attempt to generate a
-	// new cert since we failed last time.
-	getCh = testAsyncGet(t, m, req)
-	select {
-	case <-time.After(200 * time.Millisecond):
-		t.Fatal("shouldn't block too long waiting for fetch")
-	case result := <-getCh:
-		// We should block for _at least_ two jitter periods now.
-		require.True(t, time.Since(earliestRootDelivery) > 200*time.Millisecond)
-		require.Equal(t, uint64(3), signer.GetSignCallErrorCount())
-
-		require.NoError(t, result.Err)
-		require.Equal(t, issued, result.Value)
-		// 1 since this should still be the original cached result as we failed to
-		// get a new cert.
-		require.Equal(t, idx, result.Index)
-	}
-
-	// Now we've had two rate limit failures and seen root rotation state work
-	// across both the blocking request that observed the rotation and the
-	// subsequent one. The next request should wait out the rest of the backoff
-	// and then actually fetch a new cert at last!
-	getCh = testAsyncGet(t, m, req)
-	select {
-	case <-time.After(200 * time.Millisecond):
-		t.Fatal("shouldn't block too long waiting for fetch")
-	case result := <-getCh:
-		// We should block for _at least_ three jitter periods now.
-		require.True(t, time.Since(earliestRootDelivery) > 300*time.Millisecond)
-		require.Equal(t, uint64(3), signer.GetSignCallErrorCount())
-
-		require.NoError(t, result.Err)
-		require.NotEqual(t, issued, result.Value)
-		// 3 since the rootCA change used 2
-		require.True(t, result.Index > idx)
-	}
-}
-
-// This test runs multiple concurrent callers watching different leaf certs and
-// tries to ensure that the background root watch activity behaves correctly.
-func TestManager_watchRootsDedupingMultipleCallers(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	m, signer := NewTestManager(t, nil)
-
-	caRoot := signer.UpdateCA(t, nil)
-
-	// n is the number of clients we'll run
-	n := 3
-
-	// setup/testDoneCh are used for coordinating clients such that each has
-	// initial cert delivered and is blocking before the root changes. It's not a
-	// wait group since we want to be able to timeout the main test goroutine if
-	// one of the clients gets stuck. Instead it's a buffered chan.
-	setupDoneCh := make(chan error, n)
-	testDoneCh := make(chan error, n)
-	// rootsUpdate is used to coordinate clients so they know when they should
-	// expect to see leaf renewed after root change.
-	rootsUpdatedCh := make(chan struct{})
-
-	// Create a function that models a single client. It should go through the
-	// steps of getting an initial cert and then watching for changes until root
-	// updates.
-	client := func(i int) {
-		// We'll reuse the fetch options and request
-		req := &ConnectCALeafRequest{
-			Datacenter: "dc1", Service: fmt.Sprintf("web-%d", i),
-			MinQueryIndex: 0, MaxQueryTime: 10 * time.Second,
-		}
-
-		// First fetch should return immediately
-		getCh := testAsyncGet(t, m, req)
-		var idx uint64
-		select {
-		case <-time.After(100 * time.Millisecond):
-			setupDoneCh <- fmt.Errorf("shouldn't block waiting for fetch")
-			return
-		case result := <-getCh:
-			require.NoError(t, result.Err)
-			idx = result.Index
-		}
-
-		// Second fetch should block with set index
-		req.MinQueryIndex = idx
-		getCh = testAsyncGet(t, m, req)
-		select {
-		case result := <-getCh:
-			setupDoneCh <- fmt.Errorf("should not return: %#v", result)
-			return
-		case <-time.After(100 * time.Millisecond):
-		}
-
-		// We're done with setup and the blocking call is still blocking in
-		// background.
-		setupDoneCh <- nil
-
-		// Wait until all others are also done and roots change incase there are
-		// stragglers delaying the root update.
-		select {
-		case <-rootsUpdatedCh:
-		case <-time.After(200 * time.Millisecond):
-			testDoneCh <- fmt.Errorf("waited too long for root update")
-			return
-		}
-
-		// Now we should see root update within a short period
-		select {
-		case <-time.After(100 * time.Millisecond):
-			testDoneCh <- fmt.Errorf("shouldn't block waiting for fetch")
-			return
-		case result := <-getCh:
-			require.NoError(t, result.Err)
-			if req.MinQueryIndex == result.Value.CreateIndex {
-				testDoneCh <- fmt.Errorf("index must be different")
-				return
-			}
-		}
-
-		testDoneCh <- nil
-	}
-
-	// Sanity check the roots watcher is not running yet
-	assertRootsWatchCounts(t, m, 0, 0)
-
-	for i := 0; i < n; i++ {
-		go client(i)
-	}
-
-	timeoutCh := time.After(200 * time.Millisecond)
-
-	for i := 0; i < n; i++ {
-		select {
-		case <-timeoutCh:
-			t.Fatal("timed out waiting for clients")
-		case err := <-setupDoneCh:
-			if err != nil {
-				t.Fatalf(err.Error())
-			}
-		}
-	}
-
-	// Should be 3 clients running now, so the roots watcher should have started
-	// once and not stopped.
-	assertRootsWatchCounts(t, m, 1, 0)
-
-	caRootCopy := caRoot.Clone()
-	caRootCopy.Active = false
-
-	// Now we deliver the root update
-	_ = signer.UpdateCA(t, nil)
-	// And notify clients
-	close(rootsUpdatedCh)
-
-	timeoutCh = time.After(200 * time.Millisecond)
-	for i := 0; i < n; i++ {
-		select {
-		case <-timeoutCh:
-			t.Fatalf("timed out waiting for %d of %d clients to renew after root change", n-i, n)
-		case err := <-testDoneCh:
-			if err != nil {
-				t.Fatalf(err.Error())
-			}
-		}
-	}
-
-	// All active requests have returned the new cert so the rootsWatcher should
-	// have stopped. This is timing dependent though so retry a few times
-	retry.RunWith(retry.ThreeTimes(), t, func(r *retry.R) {
-		assertRootsWatchCounts(r, m, 1, 1)
-	})
-}
-
-func assertRootsWatchCounts(t require.TestingT, m *Manager, wantStarts, wantStops int) {
-	if tt, ok := t.(*testing.T); ok {
-		tt.Helper()
-	}
-	starts := atomic.LoadUint32(&m.rootWatcher.testStartCount)
-	stops := atomic.LoadUint32(&m.rootWatcher.testStopCount)
-	require.Equal(t, wantStarts, int(starts))
-	require.Equal(t, wantStops, int(stops))
-}
-
-// Test that after an initial signing, an expiringLeaf will trigger a
-// blocking query to resign.
-func TestManager_expiringLeaf(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	m, signer := NewTestManager(t, nil)
-
-	caRoot := signer.UpdateCA(t, nil)
-
-	signer.SetSignCallErrors(
-		// First call returns expired cert to prime cache with an expired one.
-		ReplyWithExpiredCert,
-	)
-
-	// We'll reuse the fetch options and request
-	req := &ConnectCALeafRequest{
-		Datacenter: "dc1", Service: "web",
-		MinQueryIndex: 0, MaxQueryTime: 10 * time.Second,
-	}
-
-	// First fetch should return immediately
-	getCh := testAsyncGet(t, m, req)
-	var (
-		idx    uint64
-		issued *structs.IssuedCert
-	)
-	select {
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("shouldn't block waiting for fetch")
-	case result := <-getCh:
-		require.NoError(t, result.Err)
-		require.NotNil(t, result.Value)
-		require.True(t, result.Index > 0)
-		idx = result.Index
-		issued = result.Value
-	}
-
-	// Second fetch should return immediately despite there being
-	// no updated CA roots, because we issued an expired cert.
-	getCh = testAsyncGet(t, m, req)
-	select {
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("shouldn't block waiting for fetch")
-	case result := <-getCh:
-		require.NoError(t, result.Err)
-		require.NotEqual(t, issued, result.Value)
-		require.True(t, result.Index > idx)
-		requireLeafValidUnderCA(t, result.Value, caRoot)
-		idx = result.Index
-	}
-
-	// Third fetch should block since the cert is not expiring and
-	// we also didn't update CA certs.
-	req.MinQueryIndex = idx
-	getCh = testAsyncGet(t, m, req)
-	select {
-	case result := <-getCh:
-		t.Fatalf("should not return: %#v", result)
-	case <-time.After(100 * time.Millisecond):
-	}
-}
-
-func TestManager_DNSSANForService(t *testing.T) {
-	t.Parallel()
-
-	m, signer := NewTestManager(t, nil)
-
-	_ = signer.UpdateCA(t, nil)
-
-	req := &ConnectCALeafRequest{
-		Datacenter: "dc1",
-		Service:    "web",
-		DNSSAN:     []string{"test.example.com"},
-	}
-
-	_, _, err := m.Get(context.Background(), req)
-	require.NoError(t, err)
-
-	caReq := signer.GetCapture(0)
-	require.NotNil(t, caReq)
-
-	pemBlock, _ := pem.Decode([]byte(caReq.CSR))
-	csr, err := x509.ParseCertificateRequest(pemBlock.Bytes)
-	require.NoError(t, err)
-	require.Equal(t, csr.DNSNames, []string{"test.example.com"})
-}
-
-func TestManager_workflow_good(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-
-	const TestOverrideCAChangeInitialDelay = 1 * time.Nanosecond
-
-	m, signer := NewTestManager(t, func(cfg *Config) {
-		cfg.TestOverrideCAChangeInitialDelay = TestOverrideCAChangeInitialDelay
-	})
-
-	ca1 := signer.UpdateCA(t, nil)
-
-	req := &ConnectCALeafRequest{
-		Datacenter:     "dc1",
-		Service:        "test",
-		EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-	}
-
-	// List
-	issued, meta, err := m.Get(ctx, req)
-	require.NoError(t, err)
-	require.False(t, meta.Hit)
-	require.NotNil(t, issued)
-
-	// Verify that the cert is signed by the CA
-	requireLeafValidUnderCA(t, issued, ca1)
-
-	// Verify blocking index
-	require.True(t, issued.ModifyIndex > 0)
-	require.Equal(t, issued.ModifyIndex, meta.Index)
-
-	index := meta.Index
-
-	// Fetch it again
-	testutil.RunStep(t, "test you get a cache hit on another read", func(t *testing.T) {
-		req := &ConnectCALeafRequest{
-			Datacenter:     "dc1",
-			Service:        "test",
-			EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-		}
-		issued2, _, err := m.Get(ctx, req)
-		require.NoError(t, err)
-		require.NotNil(t, issued2)
-		require.Equal(t, issued, issued2)
-	})
-
-	type reply struct {
-		cert *structs.IssuedCert
-		meta cacheshim.ResultMeta
-		err  error
-	}
-
-	replyCh := make(chan *reply, 1)
-	go func() {
-		req := &ConnectCALeafRequest{
-			Datacenter:     "dc1",
-			Service:        "test",
-			EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-			MinQueryIndex:  index,
-		}
-
-		issued2, meta2, err := m.Get(ctx, req)
-
-		replyCh <- &reply{issued2, meta2, err}
-	}()
-
-	// Set a new CA
-	ca2 := signer.UpdateCA(t, nil)
-
-	// Issue a blocking query to ensure that the cert gets updated appropriately
-	testutil.RunStep(t, "test blocking queries update leaf cert", func(t *testing.T) {
-		var got *reply
-		select {
-		case got = <-replyCh:
-		case <-time.After(500 * time.Millisecond):
-			t.Fatal("blocking query did not wake up during rotation")
-		}
-
-		issued2, meta2, err := got.cert, got.meta, got.err
-		require.NoError(t, err)
-		require.NotNil(t, issued2)
-
-		require.NotEqual(t, issued.CertPEM, issued2.CertPEM)
-		require.NotEqual(t, issued.PrivateKeyPEM, issued2.PrivateKeyPEM)
-
-		// Verify that the cert is signed by the new CA
-		requireLeafValidUnderCA(t, issued2, ca2)
-
-		// Should not be a cache hit! The data was updated in response to the blocking
-		// query being made.
-		require.False(t, meta2.Hit)
-	})
-
-	testutil.RunStep(t, "test non-blocking queries update leaf cert", func(t *testing.T) {
-		req := &ConnectCALeafRequest{
-			Datacenter:     "dc1",
-			Service:        "test",
-			EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-		}
-
-		issued, _, err := m.Get(ctx, req)
-		require.NoError(t, err)
-		require.NotNil(t, issued)
-
-		// Verify that the cert is signed by the CA
-		requireLeafValidUnderCA(t, issued, ca2)
-
-		// Issue a non blocking query to ensure that the cert gets updated appropriately
-		{
-			// Set a new CA
-			ca3 := signer.UpdateCA(t, nil)
-
-			retry.Run(t, func(r *retry.R) {
-				req := &ConnectCALeafRequest{
-					Datacenter:     "dc1",
-					Service:        "test",
-					EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-				}
-
-				issued2, meta2, err := m.Get(ctx, req)
-				require.NoError(r, err)
-				require.NotNil(r, issued2)
-
-				requireLeafValidUnderCA(r, issued2, ca3)
-
-				// Should not be a cache hit!
-				require.False(r, meta2.Hit)
-
-				require.NotEqual(r, issued.CertPEM, issued2.CertPEM)
-				require.NotEqual(r, issued.PrivateKeyPEM, issued2.PrivateKeyPEM)
-
-				// Verify that the cert is signed by the new CA
-				requireLeafValidUnderCA(r, issued2, ca3)
-			})
-		}
-	})
-}
-
-// Test we can request a leaf cert for a service and witness correct caching,
-// blocking, and update semantics.
-//
-// This test originally was a client agent test in
-// agent.TestAgentConnectCALeafCert_goodNotLocal and was cloned here to
-// increase complex coverage, but the specific naming of the parent test is
-// irrelevant here since there's no notion of the catalog at all at this layer.
-func TestManager_workflow_goodNotLocal(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-
-	const TestOverrideCAChangeInitialDelay = 1 * time.Nanosecond
-
-	m, signer := NewTestManager(t, func(cfg *Config) {
-		cfg.TestOverrideCAChangeInitialDelay = TestOverrideCAChangeInitialDelay
-	})
-
-	ca1 := signer.UpdateCA(t, nil)
-
-	req := &ConnectCALeafRequest{
-		Datacenter:     "dc1",
-		Service:        "test",
-		EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-	}
-
-	// List
-	issued, meta, err := m.Get(ctx, req)
-	require.NoError(t, err)
-	require.False(t, meta.Hit)
-	require.NotNil(t, issued)
-
-	// Verify that the cert is signed by the CA
-	requireLeafValidUnderCA(t, issued, ca1)
-
-	// Verify blocking index
-	require.True(t, issued.ModifyIndex > 0)
-	require.Equal(t, issued.ModifyIndex, meta.Index)
-
-	// Fetch it again
-	testutil.RunStep(t, "test you get a cache hit on another read", func(t *testing.T) {
-		req := &ConnectCALeafRequest{
-			Datacenter:     "dc1",
-			Service:        "test",
-			EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-		}
-		issued2, _, err := m.Get(ctx, req)
-		require.NoError(t, err)
-		require.NotNil(t, issued2)
-		require.Equal(t, issued, issued2)
-	})
-
-	// Test Blocking - see https://github.com/hashicorp/consul/issues/4462
-	testutil.RunStep(t, "test blocking issue 4462", func(t *testing.T) {
-		// Fetch it again
-		req := &ConnectCALeafRequest{
-			Datacenter:     "dc1",
-			Service:        "test",
-			EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-			MinQueryIndex:  issued.ModifyIndex,
-			MaxQueryTime:   125 * time.Millisecond,
-		}
-		var (
-			respCh = make(chan *structs.IssuedCert)
-			errCh  = make(chan error, 1)
-		)
-		go func() {
-			issued2, _, err := m.Get(ctx, req)
-			if err != nil {
-				errCh <- err
-			} else {
-				respCh <- issued2
-			}
-		}()
-
-		select {
-		case <-time.After(500 * time.Millisecond):
-			require.FailNow(t, "Shouldn't block for this long - not respecting wait parameter in the query")
-
-		case err := <-errCh:
-			require.NoError(t, err)
-		case <-respCh:
-		}
-	})
-
-	testutil.RunStep(t, "test that caching is updated in the background", func(t *testing.T) {
-		// Set a new CA
-		ca := signer.UpdateCA(t, nil)
-
-		retry.Run(t, func(r *retry.R) {
-			// Try and sign again (note no index/wait arg since cache should update in
-			// background even if we aren't actively blocking)
-			req := &ConnectCALeafRequest{
-				Datacenter:     "dc1",
-				Service:        "test",
-				EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-			}
-
-			issued2, _, err := m.Get(ctx, req)
-			require.NoError(r, err)
-
-			if issued.CertPEM == issued2.CertPEM {
-				r.Fatalf("leaf has not updated")
-			}
-
-			// Got a new leaf. Sanity check it's a whole new key as well as different
-			// cert.
-			if issued.PrivateKeyPEM == issued2.PrivateKeyPEM {
-				r.Fatalf("new leaf has same private key as before")
-			}
-
-			// Verify that the cert is signed by the new CA
-			requireLeafValidUnderCA(r, issued2, ca)
-
-			require.NotEqual(r, issued, issued2)
-		})
-	})
-}
-
-func TestManager_workflow_nonBlockingQuery_after_blockingQuery_shouldNotBlock(t *testing.T) {
-	// see: https://github.com/hashicorp/consul/issues/12048
-
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-
-	m, signer := NewTestManager(t, nil)
-
-	_ = signer.UpdateCA(t, nil)
-
-	var (
-		serialNumber string
-		index        uint64
-		issued       *structs.IssuedCert
-	)
-	testutil.RunStep(t, "do initial non-blocking query", func(t *testing.T) {
-		req := &ConnectCALeafRequest{
-			Datacenter:     "dc1",
-			Service:        "test",
-			EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-		}
-		issued1, meta, err := m.Get(ctx, req)
-		require.NoError(t, err)
-
-		serialNumber = issued1.SerialNumber
-
-		require.False(t, meta.Hit, "for the leaf cert cache type these are always MISS")
-		index = meta.Index
-		issued = issued1
-	})
-
-	go func() {
-		// launch goroutine for blocking query
-		req := &ConnectCALeafRequest{
-			Datacenter:     "dc1",
-			Service:        "test",
-			EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-			MinQueryIndex:  index,
-		}
-		_, _, _ = m.Get(ctx, req)
-	}()
-
-	// We just need to ensure that the above blocking query is in-flight before
-	// the next step, so do a little sleep.
-	time.Sleep(50 * time.Millisecond)
-
-	// The initial non-blocking query populated the leaf cert cache entry
-	// implicitly. The agent cache doesn't prune entries very often at all, so
-	// in between both of these steps the data should still be there, causing
-	// this to be a HIT that completes in less than 10m (the default inner leaf
-	// cert blocking query timeout).
-	testutil.RunStep(t, "do a non-blocking query that should not block", func(t *testing.T) {
-		req := &ConnectCALeafRequest{
-			Datacenter:     "dc1",
-			Service:        "test",
-			EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-		}
-		issued2, meta2, err := m.Get(ctx, req)
-		require.NoError(t, err)
-
-		require.True(t, meta2.Hit)
-
-		// If this is actually returning a cached result, the serial number
-		// should be unchanged.
-		require.Equal(t, serialNumber, issued2.SerialNumber)
-
-		require.Equal(t, issued, issued2)
-	})
-}
-
-func requireLeafValidUnderCA(t require.TestingT, issued *structs.IssuedCert, ca *structs.CARoot) {
-	require.NotNil(t, issued)
-	require.NotNil(t, ca)
-
-	leaf, intermediates, err := connect.ParseLeafCerts(issued.CertPEM)
-	require.NoError(t, err)
-
-	roots := x509.NewCertPool()
-	require.True(t, roots.AppendCertsFromPEM([]byte(ca.RootCert)))
-
-	_, err = leaf.Verify(x509.VerifyOptions{
-		Roots:         roots,
-		Intermediates: intermediates,
-	})
-	require.NoError(t, err)
-
-	// Verify the private key matches. tls.LoadX509Keypair does this for us!
-	_, err = tls.X509KeyPair([]byte(issued.CertPEM), []byte(issued.PrivateKeyPEM))
-	require.NoError(t, err)
-}
-
-type testGetResult struct {
-	Index uint64
-	Value *structs.IssuedCert
-	Err   error
-}
-
-// testAsyncGet returns a channel that returns the result of the testGet call.
-//
-// This is useful for testing timing and concurrency with testGet calls.
-func testAsyncGet(t *testing.T, m *Manager, req *ConnectCALeafRequest) <-chan testGetResult {
-	ch := make(chan testGetResult)
-	go func() {
-		index, cert, err := m.testGet(req)
-		if err != nil {
-			ch <- testGetResult{Err: err}
-			return
-		}
-
-		ch <- testGetResult{Index: index, Value: cert}
-	}()
-	return ch
-}
diff --git a/agent/leafcert/leafcert_test_helpers.go b/agent/leafcert/leafcert_test_helpers.go
deleted file mode 100644
index 0779033dccfd4..0000000000000
--- a/agent/leafcert/leafcert_test_helpers.go
+++ /dev/null
@@ -1,366 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package leafcert
-
-import (
-	"bytes"
-	"context"
-	"crypto/rand"
-	"crypto/x509"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"math/big"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/consul/agent/cacheshim"
-	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-// NewTestManager returns a *Manager that is pre-configured to use a mock RPC
-// implementation that can sign certs, and an in-memory CA roots reader that
-// interacts well with it.
-func NewTestManager(t *testing.T, mut func(*Config)) (*Manager, *TestSigner) {
-	signer := newTestSigner(t, nil, nil)
-
-	deps := Deps{
-		Logger:      testutil.Logger(t),
-		RootsReader: signer.RootsReader,
-		CertSigner:  signer,
-		Config: Config{
-			// Override the root-change spread so we don't have to wait up to 20 seconds
-			// to see root changes work. Can be changed back for specific tests that
-			// need to test this, Note it's not 0 since that used default but is
-			// effectively the same.
-			TestOverrideCAChangeInitialDelay: 1 * time.Microsecond,
-		},
-	}
-	if mut != nil {
-		mut(&deps.Config)
-	}
-
-	m := NewManager(deps)
-	t.Cleanup(m.Stop)
-
-	return m, signer
-}
-
-// TestSigner implements NetRPC and handles leaf signing operations
-type TestSigner struct {
-	caLock    sync.Mutex
-	ca        *structs.CARoot
-	prevRoots []*structs.CARoot // remember prior ones
-
-	IDGenerator *atomic.Uint64
-	RootsReader *testRootsReader
-
-	signCallLock       sync.Mutex
-	signCallErrors     []error
-	signCallErrorCount uint64
-	signCallCapture    []*structs.CASignRequest
-}
-
-var _ CertSigner = (*TestSigner)(nil)
-
-var ReplyWithExpiredCert = errors.New("reply with expired cert")
-
-func newTestSigner(t *testing.T, idGenerator *atomic.Uint64, rootsReader *testRootsReader) *TestSigner {
-	if idGenerator == nil {
-		idGenerator = &atomic.Uint64{}
-	}
-	if rootsReader == nil {
-		rootsReader = newTestRootsReader(t)
-	}
-	s := &TestSigner{
-		IDGenerator: idGenerator,
-		RootsReader: rootsReader,
-	}
-	return s
-}
-
-func (s *TestSigner) SetSignCallErrors(errs ...error) {
-	s.signCallLock.Lock()
-	defer s.signCallLock.Unlock()
-	s.signCallErrors = append(s.signCallErrors, errs...)
-}
-
-func (s *TestSigner) GetSignCallErrorCount() uint64 {
-	s.signCallLock.Lock()
-	defer s.signCallLock.Unlock()
-	return s.signCallErrorCount
-}
-
-func (s *TestSigner) UpdateCA(t *testing.T, ca *structs.CARoot) *structs.CARoot {
-	if ca == nil {
-		ca = connect.TestCA(t, nil)
-	}
-	roots := &structs.IndexedCARoots{
-		ActiveRootID: ca.ID,
-		TrustDomain:  connect.TestTrustDomain,
-		Roots:        []*structs.CARoot{ca},
-		QueryMeta:    structs.QueryMeta{Index: s.nextIndex()},
-	}
-
-	// Update the signer first.
-	s.caLock.Lock()
-	{
-		s.ca = ca
-		roots.Roots = append(roots.Roots, s.prevRoots...)
-		// Remember for the next rotation.
-		dup := ca.Clone()
-		dup.Active = false
-		s.prevRoots = append(s.prevRoots, dup)
-	}
-	s.caLock.Unlock()
-
-	// Then trigger an event when updating the roots.
-	s.RootsReader.Set(roots)
-
-	return ca
-}
-
-func (s *TestSigner) nextIndex() uint64 {
-	return s.IDGenerator.Add(1)
-}
-
-func (s *TestSigner) getCA() *structs.CARoot {
-	s.caLock.Lock()
-	defer s.caLock.Unlock()
-	return s.ca
-}
-
-func (s *TestSigner) GetCapture(idx int) *structs.CASignRequest {
-	s.signCallLock.Lock()
-	defer s.signCallLock.Unlock()
-	if len(s.signCallCapture) > idx {
-		return s.signCallCapture[idx]
-	}
-
-	return nil
-}
-
-func (s *TestSigner) SignCert(ctx context.Context, req *structs.CASignRequest) (*structs.IssuedCert, error) {
-	useExpiredCert := false
-	s.signCallLock.Lock()
-	s.signCallCapture = append(s.signCallCapture, req)
-	if len(s.signCallErrors) > 0 {
-		err := s.signCallErrors[0]
-		s.signCallErrors = s.signCallErrors[1:]
-		if err == ReplyWithExpiredCert {
-			useExpiredCert = true
-		} else if err != nil {
-			s.signCallErrorCount++
-			s.signCallLock.Unlock()
-			return nil, err
-		}
-	}
-	s.signCallLock.Unlock()
-
-	// parts of this were inlined from CAManager and the connect ca provider
-	ca := s.getCA()
-	if ca == nil {
-		return nil, fmt.Errorf("must call UpdateCA at least once")
-	}
-
-	csr, err := connect.ParseCSR(req.CSR)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing CSR: %w", err)
-	}
-
-	connect.HackSANExtensionForCSR(csr)
-
-	spiffeID, err := connect.ParseCertURI(csr.URIs[0])
-	if err != nil {
-		return nil, fmt.Errorf("error parsing CSR URI: %w", err)
-	}
-
-	var isService bool
-	var serviceID *connect.SpiffeIDService
-	var workloadID *connect.SpiffeIDWorkloadIdentity
-
-	switch spiffeID.(type) {
-	case *connect.SpiffeIDService:
-		isService = true
-		serviceID = spiffeID.(*connect.SpiffeIDService)
-	case *connect.SpiffeIDWorkloadIdentity:
-		workloadID = spiffeID.(*connect.SpiffeIDWorkloadIdentity)
-	default:
-		return nil, fmt.Errorf("unexpected spiffeID type %T", spiffeID)
-	}
-
-	signer, err := connect.ParseSigner(ca.SigningKey)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing CA signing key: %w", err)
-	}
-
-	keyId, err := connect.KeyId(signer.Public())
-	if err != nil {
-		return nil, fmt.Errorf("error forming CA key id from public key: %w", err)
-	}
-
-	subjectKeyID, err := connect.KeyId(csr.PublicKey)
-	if err != nil {
-		return nil, fmt.Errorf("error forming subject key id from public key: %w", err)
-	}
-
-	caCert, err := connect.ParseCert(ca.RootCert)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing CA root cert pem: %w", err)
-	}
-
-	const expiration = 10 * time.Minute
-
-	now := time.Now()
-	template := x509.Certificate{
-		SerialNumber: big.NewInt(int64(s.nextIndex())),
-		URIs:         csr.URIs,
-		Signature:    csr.Signature,
-		// We use the correct signature algorithm for the CA key we are signing with
-		// regardless of the algorithm used to sign the CSR signature above since
-		// the leaf might use a different key type.
-		SignatureAlgorithm:    connect.SigAlgoForKey(signer),
-		PublicKeyAlgorithm:    csr.PublicKeyAlgorithm,
-		PublicKey:             csr.PublicKey,
-		BasicConstraintsValid: true,
-		KeyUsage: x509.KeyUsageDataEncipherment |
-			x509.KeyUsageKeyAgreement |
-			x509.KeyUsageDigitalSignature |
-			x509.KeyUsageKeyEncipherment,
-		ExtKeyUsage: []x509.ExtKeyUsage{
-			x509.ExtKeyUsageClientAuth,
-			x509.ExtKeyUsageServerAuth,
-		},
-		NotAfter:       now.Add(expiration),
-		NotBefore:      now,
-		AuthorityKeyId: keyId,
-		SubjectKeyId:   subjectKeyID,
-		DNSNames:       csr.DNSNames,
-		IPAddresses:    csr.IPAddresses,
-	}
-
-	if useExpiredCert {
-		template.NotBefore = time.Now().Add(-13 * time.Hour)
-		template.NotAfter = time.Now().Add(-1 * time.Hour)
-	}
-
-	// Create the certificate, PEM encode it and return that value.
-	var buf bytes.Buffer
-	bs, err := x509.CreateCertificate(
-		rand.Reader, &template, caCert, csr.PublicKey, signer)
-	if err != nil {
-		return nil, fmt.Errorf("error creating cert pem from CSR: %w", err)
-	}
-
-	err = pem.Encode(&buf, &pem.Block{Type: "CERTIFICATE", Bytes: bs})
-	if err != nil {
-		return nil, fmt.Errorf("error encoding cert pem into text: %w", err)
-	}
-
-	leafPEM := buf.String()
-
-	leafCert, err := connect.ParseCert(leafPEM)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing cert from generated leaf pem: %w", err)
-	}
-
-	index := s.nextIndex()
-	if isService {
-		// Service Spiffe ID case
-		return &structs.IssuedCert{
-			SerialNumber: connect.EncodeSerialNumber(leafCert.SerialNumber),
-			CertPEM:      leafPEM,
-			Service:      serviceID.Service,
-			ServiceURI:   leafCert.URIs[0].String(),
-			ValidAfter:   leafCert.NotBefore,
-			ValidBefore:  leafCert.NotAfter,
-			RaftIndex: structs.RaftIndex{
-				CreateIndex: index,
-				ModifyIndex: index,
-			},
-		}, nil
-	} else {
-		// Workload identity Spiffe ID case
-		return &structs.IssuedCert{
-			SerialNumber:        connect.EncodeSerialNumber(leafCert.SerialNumber),
-			CertPEM:             leafPEM,
-			WorkloadIdentity:    workloadID.WorkloadIdentity,
-			WorkloadIdentityURI: leafCert.URIs[0].String(),
-			ValidAfter:          leafCert.NotBefore,
-			ValidBefore:         leafCert.NotAfter,
-			RaftIndex: structs.RaftIndex{
-				CreateIndex: index,
-				ModifyIndex: index,
-			},
-		}, nil
-	}
-}
-
-type testRootsReader struct {
-	mu      sync.Mutex
-	index   uint64
-	roots   *structs.IndexedCARoots
-	watcher chan struct{}
-}
-
-func newTestRootsReader(t *testing.T) *testRootsReader {
-	r := &testRootsReader{
-		watcher: make(chan struct{}),
-	}
-	t.Cleanup(func() {
-		r.mu.Lock()
-		watcher := r.watcher
-		r.mu.Unlock()
-		close(watcher)
-	})
-	return r
-}
-
-var _ RootsReader = (*testRootsReader)(nil)
-
-func (r *testRootsReader) Set(roots *structs.IndexedCARoots) {
-	r.mu.Lock()
-	oldWatcher := r.watcher
-	r.watcher = make(chan struct{})
-	r.roots = roots
-	if roots == nil {
-		r.index = 1
-	} else {
-		r.index = roots.Index
-	}
-	r.mu.Unlock()
-
-	close(oldWatcher)
-}
-
-func (r *testRootsReader) Get() (*structs.IndexedCARoots, error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	return r.roots, nil
-}
-
-func (r *testRootsReader) Notify(ctx context.Context, correlationID string, ch chan<- cacheshim.UpdateEvent) error {
-	r.mu.Lock()
-	watcher := r.watcher
-	r.mu.Unlock()
-
-	go func() {
-		<-watcher
-
-		r.mu.Lock()
-		defer r.mu.Unlock()
-
-		ch <- cacheshim.UpdateEvent{
-			CorrelationID: correlationID,
-			Result:        r.roots,
-			Meta:          cacheshim.ResultMeta{Index: r.index},
-			Err:           nil,
-		}
-	}()
-	return nil
-}
diff --git a/agent/leafcert/roots.go b/agent/leafcert/roots.go
deleted file mode 100644
index 44fc0ff5b06cb..0000000000000
--- a/agent/leafcert/roots.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package leafcert
-
-import (
-	"context"
-	"sync"
-	"sync/atomic"
-
-	"github.com/hashicorp/consul/agent/cacheshim"
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-// rootWatcher helps let multiple requests for leaf certs to coordinate sharing
-// a single long-lived watch for the root certs. This allows the leaf cert
-// requests to notice when the roots rotate and trigger their reissuance.
-type rootWatcher struct {
-	// This is the "top-level" internal context. This is used to cancel
-	// background operations.
-	ctx context.Context
-
-	// rootsReader is an interface to access connect CA roots.
-	rootsReader RootsReader
-
-	// lock protects access to the subscribers map and cancel
-	lock sync.Mutex
-	// subscribers is a set of chans, one for each currently in-flight
-	// Fetch. These chans have root updates delivered from the root watcher.
-	subscribers map[chan struct{}]struct{}
-	// cancel is a func to call to stop the background root watch if any.
-	// You must hold lock to read (e.g. call) or write the value.
-	cancel func()
-
-	// testStart/StopCount are testing helpers that allow tests to
-	// observe the reference counting behavior that governs the shared root watch.
-	// It's not exactly pretty to expose internals like this, but seems cleaner
-	// than constructing elaborate and brittle test cases that we can infer
-	// correct behavior from, and simpler than trying to probe runtime goroutine
-	// traces to infer correct behavior that way. They must be accessed
-	// atomically.
-	testStartCount uint32
-	testStopCount  uint32
-}
-
-// Subscribe is called on each fetch that is about to block and wait for
-// changes to the leaf. It subscribes a chan to receive updates from the shared
-// root watcher and triggers root watcher if it's not already running.
-func (r *rootWatcher) Subscribe(rootUpdateCh chan struct{}) {
-	r.lock.Lock()
-	defer r.lock.Unlock()
-	// Lazy allocation
-	if r.subscribers == nil {
-		r.subscribers = make(map[chan struct{}]struct{})
-	}
-	// Make sure a root watcher is running. We don't only do this on first request
-	// to be more tolerant of errors that could cause the root watcher to fail and
-	// exit.
-	if r.cancel == nil {
-		ctx, cancel := context.WithCancel(r.ctx)
-		r.cancel = cancel
-		go r.rootWatcher(ctx)
-	}
-	r.subscribers[rootUpdateCh] = struct{}{}
-}
-
-// Unsubscribe is called when a blocking call exits to unsubscribe from root
-// updates and possibly stop the shared root watcher if it's no longer needed.
-// Note that typically root CA is still being watched by clients directly and
-// probably by the ProxyConfigManager so it will stay hot in cache for a while,
-// we are just not monitoring it for updates any more.
-func (r *rootWatcher) Unsubscribe(rootUpdateCh chan struct{}) {
-	r.lock.Lock()
-	defer r.lock.Unlock()
-	delete(r.subscribers, rootUpdateCh)
-	if len(r.subscribers) == 0 && r.cancel != nil {
-		// This was the last request. Stop the root watcher.
-		r.cancel()
-		r.cancel = nil
-	}
-}
-
-func (r *rootWatcher) notifySubscribers() {
-	r.lock.Lock()
-	defer r.lock.Unlock()
-
-	for ch := range r.subscribers {
-		select {
-		case ch <- struct{}{}:
-		default:
-			// Don't block - chans are 1-buffered so this default case
-			// means the subscriber already holds an update signal.
-		}
-	}
-}
-
-// rootWatcher is the shared rootWatcher that runs in a background goroutine
-// while needed by one or more inflight Fetch calls.
-func (r *rootWatcher) rootWatcher(ctx context.Context) {
-	atomic.AddUint32(&r.testStartCount, 1)
-	defer atomic.AddUint32(&r.testStopCount, 1)
-
-	ch := make(chan cacheshim.UpdateEvent, 1)
-
-	if err := r.rootsReader.Notify(ctx, "roots", ch); err != nil {
-		// Trigger all inflight watchers. We don't pass the error, but they will
-		// reload from cache and observe the same error and return it to the caller,
-		// or if it's transient, will continue and the next Fetch will get us back
-		// into the right state. Seems better than busy loop-retrying here given
-		// that almost any error we would see here would also be returned from the
-		// cache get this will trigger.
-		r.notifySubscribers()
-		return
-	}
-
-	var oldRoots *structs.IndexedCARoots
-	// Wait for updates to roots or all requests to stop
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case e := <-ch:
-			// Root response changed in some way. Note this might be the initial
-			// fetch.
-			if e.Err != nil {
-				// See above rationale about the error propagation
-				r.notifySubscribers()
-				continue
-			}
-
-			roots, ok := e.Result.(*structs.IndexedCARoots)
-			if !ok {
-				// See above rationale about the error propagation
-				r.notifySubscribers()
-				continue
-			}
-
-			// Check that the active root is actually different from the last CA
-			// config there are many reasons the config might have changed without
-			// actually updating the CA root that is signing certs in the cluster.
-			// The Fetch calls will also validate this since the first call here we
-			// don't know if it changed or not, but there is no point waking up all
-			// Fetch calls to check this if we know none of them will need to act on
-			// this update.
-			if oldRoots != nil && oldRoots.ActiveRootID == roots.ActiveRootID {
-				continue
-			}
-
-			// Distribute the update to all inflight requests - they will decide
-			// whether or not they need to act on it.
-			r.notifySubscribers()
-			oldRoots = roots
-		}
-	}
-}
diff --git a/agent/leafcert/signer_netrpc.go b/agent/leafcert/signer_netrpc.go
deleted file mode 100644
index 0e1a7a7487f88..0000000000000
--- a/agent/leafcert/signer_netrpc.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package leafcert
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-// NetRPC is an interface that an NetRPC client must implement. This is a helper
-// interface that is implemented by the agent delegate so that Type
-// implementations can request NetRPC access.
-type NetRPC interface {
-	RPC(ctx context.Context, method string, args any, reply any) error
-}
-
-// NewNetRPCCertSigner returns a CertSigner that uses net-rpc to sign certs.
-func NewNetRPCCertSigner(netRPC NetRPC) CertSigner {
-	return &netRPCCertSigner{netRPC: netRPC}
-}
-
-type netRPCCertSigner struct {
-	// NetRPC is an RPC client for remote cert signing requests.
-	netRPC NetRPC
-}
-
-var _ CertSigner = (*netRPCCertSigner)(nil)
-
-func (s *netRPCCertSigner) SignCert(ctx context.Context, args *structs.CASignRequest) (*structs.IssuedCert, error) {
-	var reply structs.IssuedCert
-	err := s.netRPC.RPC(ctx, "ConnectCA.Sign", args, &reply)
-	if err != nil {
-		return nil, err
-	}
-	return &reply, nil
-}
diff --git a/agent/leafcert/structs.go b/agent/leafcert/structs.go
deleted file mode 100644
index 685756c8dc8c5..0000000000000
--- a/agent/leafcert/structs.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package leafcert
-
-import (
-	"fmt"
-	"net"
-	"time"
-
-	"github.com/mitchellh/hashstructure"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/cacheshim"
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-// ConnectCALeafRequest is the cache.Request implementation for the
-// ConnectCALeaf cache type. This is implemented here and not in structs
-// since this is only used for cache-related requests and not forwarded
-// directly to any Consul servers.
-type ConnectCALeafRequest struct {
-	Token         string
-	Datacenter    string
-	DNSSAN        []string
-	IPSAN         []net.IP
-	MinQueryIndex uint64
-	MaxQueryTime  time.Duration
-	acl.EnterpriseMeta
-	MustRevalidate bool
-
-	// The following flags indicate the entity we are requesting a cert for.
-	// Only one of these must be specified.
-	WorkloadIdentity string              // Given a WorkloadIdentity name, the request is for a SpiffeIDWorkload.
-	Service          string              // Given a Service name, not ID, the request is for a SpiffeIDService.
-	Agent            string              // Given an Agent name, not ID, the request is for a SpiffeIDAgent.
-	Kind             structs.ServiceKind // Given "mesh-gateway", the request is for a SpiffeIDMeshGateway. No other kinds supported.
-	Server           bool                // If true, the request is for a SpiffeIDServer.
-}
-
-func (r *ConnectCALeafRequest) Key() string {
-	r.EnterpriseMeta.Normalize()
-
-	switch {
-	case r.WorkloadIdentity != "":
-		v, err := hashstructure.Hash([]any{
-			r.WorkloadIdentity,
-			r.EnterpriseMeta,
-			r.DNSSAN,
-			r.IPSAN,
-		}, nil)
-		if err == nil {
-			return fmt.Sprintf("workloadidentity:%d", v)
-		}
-	case r.Agent != "":
-		v, err := hashstructure.Hash([]any{
-			r.Agent,
-			r.PartitionOrDefault(),
-		}, nil)
-		if err == nil {
-			return fmt.Sprintf("agent:%d", v)
-		}
-	case r.Kind == structs.ServiceKindMeshGateway:
-		v, err := hashstructure.Hash([]any{
-			r.PartitionOrDefault(),
-			r.DNSSAN,
-			r.IPSAN,
-		}, nil)
-		if err == nil {
-			return fmt.Sprintf("kind:%d", v)
-		}
-	case r.Kind != "":
-		// this is not valid
-	case r.Server:
-		v, err := hashstructure.Hash([]any{
-			"server",
-			r.Datacenter,
-		}, nil)
-		if err == nil {
-			return fmt.Sprintf("server:%d", v)
-		}
-	default:
-		v, err := hashstructure.Hash([]any{
-			r.Service,
-			r.EnterpriseMeta,
-			r.DNSSAN,
-			r.IPSAN,
-		}, nil)
-		if err == nil {
-			return fmt.Sprintf("service:%d", v)
-		}
-	}
-
-	// If there is an error, we don't set the key. A blank key forces
-	// no cache for this request so the request is forwarded directly
-	// to the server.
-	return ""
-}
-
-func (req *ConnectCALeafRequest) TargetNamespace() string {
-	return req.NamespaceOrDefault()
-}
-
-func (req *ConnectCALeafRequest) TargetPartition() string {
-	return req.PartitionOrDefault()
-}
-
-func (r *ConnectCALeafRequest) CacheInfo() cacheshim.RequestInfo {
-	return cacheshim.RequestInfo{
-		Token:          r.Token,
-		Key:            r.Key(),
-		Datacenter:     r.Datacenter,
-		MinIndex:       r.MinQueryIndex,
-		Timeout:        r.MaxQueryTime,
-		MustRevalidate: r.MustRevalidate,
-	}
-}
diff --git a/agent/leafcert/structs_test.go b/agent/leafcert/structs_test.go
deleted file mode 100644
index 6a8e034700313..0000000000000
--- a/agent/leafcert/structs_test.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package leafcert
-
-import (
-	"net"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestConnectCALeafRequest_Key(t *testing.T) {
-	key := func(r ConnectCALeafRequest) string {
-		return r.Key()
-	}
-	t.Run("service", func(t *testing.T) {
-		t.Run("name", func(t *testing.T) {
-			r1 := key(ConnectCALeafRequest{Service: "web"})
-			r2 := key(ConnectCALeafRequest{Service: "api"})
-			require.True(t, strings.HasPrefix(r1, "service:"), "Key %s does not start with service:", r1)
-			require.True(t, strings.HasPrefix(r2, "service:"), "Key %s does not start with service:", r2)
-			require.NotEqual(t, r1, r2, "Cache keys for different services should not be equal")
-		})
-		t.Run("dns-san", func(t *testing.T) {
-			r3 := key(ConnectCALeafRequest{Service: "foo", DNSSAN: []string{"a.com"}})
-			r4 := key(ConnectCALeafRequest{Service: "foo", DNSSAN: []string{"b.com"}})
-			require.NotEqual(t, r3, r4, "Cache keys for different DNSSAN should not be equal")
-		})
-		t.Run("ip-san", func(t *testing.T) {
-			r5 := key(ConnectCALeafRequest{Service: "foo", IPSAN: []net.IP{net.ParseIP("192.168.4.139")}})
-			r6 := key(ConnectCALeafRequest{Service: "foo", IPSAN: []net.IP{net.ParseIP("192.168.4.140")}})
-			require.NotEqual(t, r5, r6, "Cache keys for different IPSAN should not be equal")
-		})
-	})
-	t.Run("agent", func(t *testing.T) {
-		t.Run("name", func(t *testing.T) {
-			r1 := key(ConnectCALeafRequest{Agent: "abc"})
-			require.True(t, strings.HasPrefix(r1, "agent:"), "Key %s does not start with agent:", r1)
-		})
-		t.Run("dns-san ignored", func(t *testing.T) {
-			r3 := key(ConnectCALeafRequest{Agent: "foo", DNSSAN: []string{"a.com"}})
-			r4 := key(ConnectCALeafRequest{Agent: "foo", DNSSAN: []string{"b.com"}})
-			require.Equal(t, r3, r4, "DNSSAN is ignored for agent type")
-		})
-		t.Run("ip-san ignored", func(t *testing.T) {
-			r5 := key(ConnectCALeafRequest{Agent: "foo", IPSAN: []net.IP{net.ParseIP("192.168.4.139")}})
-			r6 := key(ConnectCALeafRequest{Agent: "foo", IPSAN: []net.IP{net.ParseIP("192.168.4.140")}})
-			require.Equal(t, r5, r6, "IPSAN is ignored for agent type")
-		})
-	})
-	t.Run("kind", func(t *testing.T) {
-		t.Run("invalid", func(t *testing.T) {
-			r1 := key(ConnectCALeafRequest{Kind: "terminating-gateway"})
-			require.Empty(t, r1)
-		})
-		t.Run("mesh-gateway", func(t *testing.T) {
-			t.Run("normal", func(t *testing.T) {
-				r1 := key(ConnectCALeafRequest{Kind: "mesh-gateway"})
-				require.True(t, strings.HasPrefix(r1, "kind:"), "Key %s does not start with kind:", r1)
-			})
-			t.Run("dns-san", func(t *testing.T) {
-				r3 := key(ConnectCALeafRequest{Kind: "mesh-gateway", DNSSAN: []string{"a.com"}})
-				r4 := key(ConnectCALeafRequest{Kind: "mesh-gateway", DNSSAN: []string{"b.com"}})
-				require.NotEqual(t, r3, r4, "Cache keys for different DNSSAN should not be equal")
-			})
-			t.Run("ip-san", func(t *testing.T) {
-				r5 := key(ConnectCALeafRequest{Kind: "mesh-gateway", IPSAN: []net.IP{net.ParseIP("192.168.4.139")}})
-				r6 := key(ConnectCALeafRequest{Kind: "mesh-gateway", IPSAN: []net.IP{net.ParseIP("192.168.4.140")}})
-				require.NotEqual(t, r5, r6, "Cache keys for different IPSAN should not be equal")
-			})
-		})
-	})
-	t.Run("server", func(t *testing.T) {
-		r1 := key(ConnectCALeafRequest{
-			Server:     true,
-			Datacenter: "us-east",
-		})
-		require.True(t, strings.HasPrefix(r1, "server:"), "Key %s does not start with server:", r1)
-	})
-}
diff --git a/agent/leafcert/util.go b/agent/leafcert/util.go
deleted file mode 100644
index 795aa62ac11c8..0000000000000
--- a/agent/leafcert/util.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package leafcert
-
-import (
-	"time"
-
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-// calculateSoftExpiry encapsulates our logic for when to renew a cert based on
-// it's age. It returns a pair of times min, max which makes it easier to test
-// the logic without non-deterministic jitter to account for. The caller should
-// choose a time randomly in between these.
-//
-// We want to balance a few factors here:
-//   - renew too early and it increases the aggregate CSR rate in the cluster
-//   - renew too late and it risks disruption to the service if a transient
-//     error prevents the renewal
-//   - we want a broad amount of jitter so if there is an outage, we don't end
-//     up with all services in sync and causing a thundering herd every
-//     renewal period. Broader is better for smoothing requests but pushes
-//     both earlier and later tradeoffs above.
-//
-// Somewhat arbitrarily the current strategy looks like this:
-//
-//	         0                              60%             90%
-//	  Issued [------------------------------|===============|!!!!!] Expires
-//	72h TTL: 0                             ~43h            ~65h
-//	 1h TTL: 0                              36m             54m
-//
-// Where |===| is the soft renewal period where we jitter for the first attempt
-// and |!!!| is the danger zone where we just try immediately.
-//
-// In the happy path (no outages) the average renewal occurs half way through
-// the soft renewal region or at 75% of the cert lifetime which is ~54 hours for
-// a 72 hour cert, or 45 mins for a 1 hour cert.
-//
-// If we are already in the softRenewal period, we randomly pick a time between
-// now and the start of the danger zone.
-//
-// We pass in now to make testing easier.
-func calculateSoftExpiry(now time.Time, cert *structs.IssuedCert) (min time.Time, max time.Time) {
-	certLifetime := cert.ValidBefore.Sub(cert.ValidAfter)
-	if certLifetime < 10*time.Minute {
-		// Shouldn't happen as we limit to 1 hour shortest elsewhere but just be
-		// defensive against strange times or bugs.
-		return now, now
-	}
-
-	// Find the 60% mark in diagram above
-	softRenewTime := cert.ValidAfter.Add(time.Duration(float64(certLifetime) * 0.6))
-	hardRenewTime := cert.ValidAfter.Add(time.Duration(float64(certLifetime) * 0.9))
-
-	if now.After(hardRenewTime) {
-		// In the hard renew period, or already expired. Renew now!
-		return now, now
-	}
-
-	if now.After(softRenewTime) {
-		// Already in the soft renew period, make now the lower bound for jitter
-		softRenewTime = now
-	}
-	return softRenewTime, hardRenewTime
-}
diff --git a/agent/leafcert/util_test.go b/agent/leafcert/util_test.go
deleted file mode 100644
index 0716a9af88f24..0000000000000
--- a/agent/leafcert/util_test.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package leafcert
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-func TestCalculateSoftExpire(t *testing.T) {
-	tests := []struct {
-		name     string
-		now      string
-		issued   string
-		lifetime time.Duration
-		wantMin  string
-		wantMax  string
-	}{
-		{
-			name:     "72h just issued",
-			now:      "2018-01-01 00:00:01",
-			issued:   "2018-01-01 00:00:00",
-			lifetime: 72 * time.Hour,
-			// Should jitter between 60% and 90% of the lifetime which is 43.2/64.8
-			// hours after issued
-			wantMin: "2018-01-02 19:12:00",
-			wantMax: "2018-01-03 16:48:00",
-		},
-		{
-			name: "72h in renew range",
-			// This time should be inside the renewal range.
-			now:      "2018-01-02 20:00:20",
-			issued:   "2018-01-01 00:00:00",
-			lifetime: 72 * time.Hour,
-			// Min should be the "now" time
-			wantMin: "2018-01-02 20:00:20",
-			wantMax: "2018-01-03 16:48:00",
-		},
-		{
-			name: "72h in hard renew",
-			// This time should be inside the renewal range.
-			now:      "2018-01-03 18:00:00",
-			issued:   "2018-01-01 00:00:00",
-			lifetime: 72 * time.Hour,
-			// Min and max should both be the "now" time
-			wantMin: "2018-01-03 18:00:00",
-			wantMax: "2018-01-03 18:00:00",
-		},
-		{
-			name: "72h expired",
-			// This time is after expiry
-			now:      "2018-01-05 00:00:00",
-			issued:   "2018-01-01 00:00:00",
-			lifetime: 72 * time.Hour,
-			// Min and max should both be the "now" time
-			wantMin: "2018-01-05 00:00:00",
-			wantMax: "2018-01-05 00:00:00",
-		},
-		{
-			name:     "1h just issued",
-			now:      "2018-01-01 00:00:01",
-			issued:   "2018-01-01 00:00:00",
-			lifetime: 1 * time.Hour,
-			// Should jitter between 60% and 90% of the lifetime which is 36/54 mins
-			// hours after issued
-			wantMin: "2018-01-01 00:36:00",
-			wantMax: "2018-01-01 00:54:00",
-		},
-		{
-			name: "1h in renew range",
-			// This time should be inside the renewal range.
-			now:      "2018-01-01 00:40:00",
-			issued:   "2018-01-01 00:00:00",
-			lifetime: 1 * time.Hour,
-			// Min should be the "now" time
-			wantMin: "2018-01-01 00:40:00",
-			wantMax: "2018-01-01 00:54:00",
-		},
-		{
-			name: "1h in hard renew",
-			// This time should be inside the renewal range.
-			now:      "2018-01-01 00:55:00",
-			issued:   "2018-01-01 00:00:00",
-			lifetime: 1 * time.Hour,
-			// Min and max should both be the "now" time
-			wantMin: "2018-01-01 00:55:00",
-			wantMax: "2018-01-01 00:55:00",
-		},
-		{
-			name: "1h expired",
-			// This time is after expiry
-			now:      "2018-01-01 01:01:01",
-			issued:   "2018-01-01 00:00:00",
-			lifetime: 1 * time.Hour,
-			// Min and max should both be the "now" time
-			wantMin: "2018-01-01 01:01:01",
-			wantMax: "2018-01-01 01:01:01",
-		},
-		{
-			name: "too short lifetime",
-			// This time is after expiry
-			now:      "2018-01-01 01:01:01",
-			issued:   "2018-01-01 00:00:00",
-			lifetime: 1 * time.Minute,
-			// Min and max should both be the "now" time
-			wantMin: "2018-01-01 01:01:01",
-			wantMax: "2018-01-01 01:01:01",
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			now, err := time.Parse("2006-01-02 15:04:05", tc.now)
-			require.NoError(t, err)
-			issued, err := time.Parse("2006-01-02 15:04:05", tc.issued)
-			require.NoError(t, err)
-			wantMin, err := time.Parse("2006-01-02 15:04:05", tc.wantMin)
-			require.NoError(t, err)
-			wantMax, err := time.Parse("2006-01-02 15:04:05", tc.wantMax)
-			require.NoError(t, err)
-
-			min, max := calculateSoftExpiry(now, &structs.IssuedCert{
-				ValidAfter:  issued,
-				ValidBefore: issued.Add(tc.lifetime),
-			})
-
-			require.Equal(t, wantMin, min)
-			require.Equal(t, wantMax, max)
-		})
-	}
-}
diff --git a/agent/leafcert/watch.go b/agent/leafcert/watch.go
deleted file mode 100644
index 93d027b90c124..0000000000000
--- a/agent/leafcert/watch.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package leafcert
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/hashicorp/consul/agent/cacheshim"
-	"github.com/hashicorp/consul/lib"
-)
-
-// Notify registers a desire to be updated about changes to a cache result.
-//
-// It is a helper that abstracts code from performing their own "blocking" query
-// logic against a cache key to watch for changes and to maintain the key in
-// cache actively. It will continue to perform blocking Get requests until the
-// context is canceled.
-//
-// The passed context must be canceled or timeout in order to free resources
-// and stop maintaining the value in cache. Typically request-scoped resources
-// do this but if a long-lived context like context.Background is used, then the
-// caller must arrange for it to be canceled when the watch is no longer
-// needed.
-//
-// The passed chan may be buffered or unbuffered, if the caller doesn't consume
-// fast enough it will block the notification loop. When the chan is later
-// drained, watching resumes correctly. If the pause is longer than the
-// cachetype's TTL, the result might be removed from the local cache. Even in
-// this case though when the chan is drained again, the new Get will re-fetch
-// the entry from servers and resume notification behavior transparently.
-//
-// The chan is passed in to allow multiple cached results to be watched by a
-// single consumer without juggling extra goroutines per watch. The
-// correlationID is opaque and will be returned in all UpdateEvents generated by
-// result of watching the specified request so the caller can set this to any
-// value that allows them to disambiguate between events in the returned chan
-// when sharing a chan between multiple cache entries. If the chan is closed,
-// the notify loop will terminate.
-func (m *Manager) Notify(
-	ctx context.Context,
-	req *ConnectCALeafRequest,
-	correlationID string,
-	ch chan<- cacheshim.UpdateEvent,
-) error {
-	return m.NotifyCallback(ctx, req, correlationID, func(ctx context.Context, event cacheshim.UpdateEvent) {
-		select {
-		case ch <- event:
-		case <-ctx.Done():
-		}
-	})
-}
-
-// NotifyCallback allows you to receive notifications about changes to a cache
-// result in the same way as Notify, but accepts a callback function instead of
-// a channel.
-func (m *Manager) NotifyCallback(
-	ctx context.Context,
-	req *ConnectCALeafRequest,
-	correlationID string,
-	cb cacheshim.Callback,
-) error {
-	if req.Key() == "" {
-		return fmt.Errorf("a key is required")
-	}
-	// Lightweight copy this object so that manipulating req doesn't race.
-	dup := *req
-	req = &dup
-
-	if req.MaxQueryTime <= 0 {
-		req.MaxQueryTime = DefaultQueryTimeout
-	}
-
-	go m.notifyBlockingQuery(ctx, req, correlationID, cb)
-	return nil
-}
-
-func (m *Manager) notifyBlockingQuery(
-	ctx context.Context,
-	req *ConnectCALeafRequest,
-	correlationID string,
-	cb cacheshim.Callback,
-) {
-	// Always start at 0 index to deliver the initial (possibly currently cached
-	// value).
-	index := uint64(0)
-	failures := uint(0)
-
-	for {
-		// Check context hasn't been canceled
-		if ctx.Err() != nil {
-			return
-		}
-
-		// Blocking request
-		req.MinQueryIndex = index
-		newValue, meta, err := m.internalGet(ctx, req)
-
-		// Check context hasn't been canceled
-		if ctx.Err() != nil {
-			return
-		}
-
-		// Check the index of the value returned in the cache entry to be sure it
-		// changed
-		if index == 0 || index < meta.Index {
-			cb(ctx, cacheshim.UpdateEvent{
-				CorrelationID: correlationID,
-				Result:        newValue,
-				Meta:          meta,
-				Err:           err,
-			})
-
-			// Update index for next request
-			index = meta.Index
-		}
-
-		var wait time.Duration
-		// Handle errors with backoff. Badly behaved blocking calls that returned
-		// a zero index are considered as failures since we need to not get stuck
-		// in a busy loop.
-		if err == nil && meta.Index > 0 {
-			failures = 0
-		} else {
-			failures++
-			wait = backOffWait(m.config, failures)
-
-			m.logger.
-				With("error", err).
-				With("index", index).
-				Warn("handling error in Manager.Notify")
-		}
-
-		if wait > 0 {
-			select {
-			case <-time.After(wait):
-			case <-ctx.Done():
-				return
-			}
-		}
-		// Sanity check we always request blocking on second pass
-		if err == nil && index < 1 {
-			index = 1
-		}
-	}
-}
-
-func backOffWait(cfg Config, failures uint) time.Duration {
-	if failures > cfg.LeafCertRefreshBackoffMin {
-		shift := failures - cfg.LeafCertRefreshBackoffMin
-		waitTime := cfg.LeafCertRefreshMaxWait
-		if shift < 31 {
-			waitTime = (1 << shift) * time.Second
-		}
-		if waitTime > cfg.LeafCertRefreshMaxWait {
-			waitTime = cfg.LeafCertRefreshMaxWait
-		}
-		return waitTime + lib.RandomStagger(waitTime)
-	}
-	return 0
-}
diff --git a/agent/local/state.go b/agent/local/state.go
index 67e72aece0b4d..efccdaf681241 100644
--- a/agent/local/state.go
+++ b/agent/local/state.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package local
 
 import (
@@ -62,7 +59,6 @@ type Config struct {
 	DiscardCheckOutput  bool
 	NodeID              types.NodeID
 	NodeName            string
-	NodeLocality        *structs.Locality
 	Partition           string // this defaults if empty
 	TaggedAddresses     map[string]string
 }
@@ -1083,7 +1079,6 @@ func (l *State) updateSyncState() error {
 	// Check if node info needs syncing
 	if svcNode == nil || svcNode.ID != l.config.NodeID ||
 		!reflect.DeepEqual(svcNode.TaggedAddresses, l.config.TaggedAddresses) ||
-		!reflect.DeepEqual(svcNode.Locality, l.config.NodeLocality) ||
 		!reflect.DeepEqual(svcNode.Meta, l.metadata) {
 		l.nodeInfoInSync = false
 	}
@@ -1577,7 +1572,6 @@ func (l *State) syncNodeInfo() error {
 		Node:            l.config.NodeName,
 		Address:         l.config.AdvertiseAddr,
 		TaggedAddresses: l.config.TaggedAddresses,
-		Locality:        l.config.NodeLocality,
 		NodeMeta:        l.metadata,
 		EnterpriseMeta:  l.agentEnterpriseMeta,
 		WriteRequest:    structs.WriteRequest{Token: at},
diff --git a/agent/local/state_internal_test.go b/agent/local/state_internal_test.go
index 61fc2c0273a80..836ac4f9657bc 100644
--- a/agent/local/state_internal_test.go
+++ b/agent/local/state_internal_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package local
 
 import (
diff --git a/agent/local/state_test.go b/agent/local/state_test.go
index ced73201e72bd..fa4d1c6eeacc5 100644
--- a/agent/local/state_test.go
+++ b/agent/local/state_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package local_test
 
 import (
@@ -189,8 +186,7 @@ func TestAgentAntiEntropy_Services(t *testing.T) {
 	id := services.NodeServices.Node.ID
 	addrs := services.NodeServices.Node.TaggedAddresses
 	meta := services.NodeServices.Node.Meta
-	delete(meta, structs.MetaSegmentKey)    // Added later, not in config.
-	delete(meta, structs.MetaConsulVersion) // Added later, not in config.
+	delete(meta, structs.MetaSegmentKey) // Added later, not in config.
 	assert.Equal(t, a.Config.NodeID, id)
 	assert.Equal(t, a.Config.TaggedAddresses, addrs)
 	assert.Equal(t, unNilMap(a.Config.NodeMeta), meta)
@@ -1356,8 +1352,7 @@ func TestAgentAntiEntropy_Checks(t *testing.T) {
 			id := services.NodeServices.Node.ID
 			addrs := services.NodeServices.Node.TaggedAddresses
 			meta := services.NodeServices.Node.Meta
-			delete(meta, structs.MetaSegmentKey)    // Added later, not in config.
-			delete(meta, structs.MetaConsulVersion) // Added later, not in config.
+			delete(meta, structs.MetaSegmentKey) // Added later, not in config.
 			assert.Equal(r, a.Config.NodeID, id)
 			assert.Equal(r, a.Config.TaggedAddresses, addrs)
 			assert.Equal(r, unNilMap(a.Config.NodeMeta), meta)
@@ -1979,10 +1974,6 @@ func TestAgentAntiEntropy_NodeInfo(t *testing.T) {
 		node_id = "40e4a748-2192-161a-0510-9bf59fe950b5"
 		node_meta {
 			somekey = "somevalue"
-		}
-		locality {
-			region = "us-west-1"
-			zone = "us-west-1a"
 		}`}
 	if err := a.Start(t); err != nil {
 		t.Fatal(err)
@@ -2017,13 +2008,10 @@ func TestAgentAntiEntropy_NodeInfo(t *testing.T) {
 	id := services.NodeServices.Node.ID
 	addrs := services.NodeServices.Node.TaggedAddresses
 	meta := services.NodeServices.Node.Meta
-	nodeLocality := services.NodeServices.Node.Locality
-	delete(meta, structs.MetaSegmentKey)    // Added later, not in config.
-	delete(meta, structs.MetaConsulVersion) // Added later, not in config.
+	delete(meta, structs.MetaSegmentKey) // Added later, not in config.
 	require.Equal(t, a.Config.NodeID, id)
 	require.Equal(t, a.Config.TaggedAddresses, addrs)
-	require.Equal(t, a.Config.StructLocality(), nodeLocality)
-	require.Equal(t, unNilMap(a.Config.NodeMeta), meta)
+	assert.Equal(t, unNilMap(a.Config.NodeMeta), meta)
 
 	// Blow away the catalog version of the node info
 	if err := a.RPC(context.Background(), "Catalog.Register", args, &out); err != nil {
@@ -2043,12 +2031,9 @@ func TestAgentAntiEntropy_NodeInfo(t *testing.T) {
 		id := services.NodeServices.Node.ID
 		addrs := services.NodeServices.Node.TaggedAddresses
 		meta := services.NodeServices.Node.Meta
-		nodeLocality := services.NodeServices.Node.Locality
-		delete(meta, structs.MetaSegmentKey)    // Added later, not in config.
-		delete(meta, structs.MetaConsulVersion) // Added later, not in config.
+		delete(meta, structs.MetaSegmentKey) // Added later, not in config.
 		require.Equal(t, nodeID, id)
 		require.Equal(t, a.Config.TaggedAddresses, addrs)
-		require.Equal(t, a.Config.StructLocality(), nodeLocality)
 		require.Equal(t, nodeMeta, meta)
 	}
 }
diff --git a/agent/local/testing.go b/agent/local/testing.go
index 5e9ae15ac3763..283c68c5fd99e 100644
--- a/agent/local/testing.go
+++ b/agent/local/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package local
 
 import (
diff --git a/agent/log-drop/log-drop.go b/agent/log-drop/log-drop.go
index ea08f88d890b0..49991c4e0f108 100644
--- a/agent/log-drop/log-drop.go
+++ b/agent/log-drop/log-drop.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logdrop
 
 import (
diff --git a/agent/log-drop/log-drop_test.go b/agent/log-drop/log-drop_test.go
index c050a734be4a8..aadc8f9a8e111 100644
--- a/agent/log-drop/log-drop_test.go
+++ b/agent/log-drop/log-drop_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logdrop
 
 import (
diff --git a/agent/metadata/build.go b/agent/metadata/build.go
index 76a432d9a380b..721a2a0af073c 100644
--- a/agent/metadata/build.go
+++ b/agent/metadata/build.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package metadata
 
 import (
diff --git a/agent/metadata/build_test.go b/agent/metadata/build_test.go
index 888b9b0210c4b..7b516cf358fae 100644
--- a/agent/metadata/build_test.go
+++ b/agent/metadata/build_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package metadata
 
 import (
diff --git a/agent/metadata/server.go b/agent/metadata/server.go
index 2e626787bdff7..bb0c2633644b1 100644
--- a/agent/metadata/server.go
+++ b/agent/metadata/server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package metadata
 
 import (
@@ -221,13 +218,3 @@ func AddFeatureFlags(tags map[string]string, flags ...string) {
 		tags[featureFlagPrefix+flag] = "1"
 	}
 }
-
-func GetIP(addr net.Addr) []byte {
-	switch a := addr.(type) {
-	case *net.UDPAddr:
-		return []byte(a.IP.String())
-	case *net.TCPAddr:
-		return []byte(a.IP.String())
-	}
-	return []byte{}
-}
diff --git a/agent/metadata/server_internal_test.go b/agent/metadata/server_internal_test.go
index bb0561ab2d193..01c7b411439b3 100644
--- a/agent/metadata/server_internal_test.go
+++ b/agent/metadata/server_internal_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package metadata
 
 import (
diff --git a/agent/metadata/server_test.go b/agent/metadata/server_test.go
index 78b16f2599b2f..6913021224858 100644
--- a/agent/metadata/server_test.go
+++ b/agent/metadata/server_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package metadata_test
 
 import (
diff --git a/agent/metrics.go b/agent/metrics.go
index 58f9e3c829e10..6406f22bf6dce 100644
--- a/agent/metrics.go
+++ b/agent/metrics.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -30,19 +27,17 @@ func tlsCertExpirationMonitor(c *tlsutil.Configurator, logger hclog.Logger) cons
 	return consul.CertExpirationMonitor{
 		Key:    metricsKeyAgentTLSCertExpiry,
 		Logger: logger,
-		Query: func() (time.Duration, time.Duration, error) {
+		Query: func() (time.Duration, error) {
 			raw := c.Cert()
 			if raw == nil {
-				return 0, 0, fmt.Errorf("tls not enabled")
+				return 0, fmt.Errorf("tls not enabled")
 			}
 
 			cert, err := x509.ParseCertificate(raw.Certificate[0])
 			if err != nil {
-				return 0, 0, fmt.Errorf("failed to parse agent tls cert: %w", err)
+				return 0, fmt.Errorf("failed to parse agent tls cert: %w", err)
 			}
-
-			lifetime := time.Since(cert.NotBefore) + time.Until(cert.NotAfter)
-			return lifetime, time.Until(cert.NotAfter), nil
+			return time.Until(cert.NotAfter), nil
 		},
 	}
 }
diff --git a/agent/metrics/testing.go b/agent/metrics/testing.go
index 3663d6834c16d..53dac409e0f6d 100644
--- a/agent/metrics/testing.go
+++ b/agent/metrics/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package metrics
 
 import (
diff --git a/agent/metrics_test.go b/agent/metrics_test.go
index f7e15ca40e3b9..6f75a4d233b38 100644
--- a/agent/metrics_test.go
+++ b/agent/metrics_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -20,7 +17,6 @@ import (
 	"github.com/hashicorp/consul/agent/rpc/middleware"
 	"github.com/hashicorp/consul/lib/retry"
 	"github.com/hashicorp/consul/sdk/testutil"
-	testretry "github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/tlsutil"
 )
@@ -31,16 +27,14 @@ func skipIfShortTesting(t *testing.T) {
 	}
 }
 
-func recordPromMetrics(t require.TestingT, a *TestAgent, respRec *httptest.ResponseRecorder) {
-	if tt, ok := t.(*testing.T); ok {
-		tt.Helper()
-	}
-
+func recordPromMetrics(t *testing.T, a *TestAgent, respRec *httptest.ResponseRecorder) {
+	t.Helper()
 	req, err := http.NewRequest("GET", "/v1/agent/metrics?format=prometheus", nil)
 	require.NoError(t, err, "Failed to generate new http request.")
 
-	a.srv.h.ServeHTTP(respRec, req)
-	require.Equalf(t, 200, respRec.Code, "expected 200, got %d, body: %s", respRec.Code, respRec.Body.String())
+	_, err = a.srv.AgentMetrics(respRec, req)
+	require.NoError(t, err, "Failed to serve agent metrics")
+
 }
 
 func assertMetricExists(t *testing.T, respRec *httptest.ResponseRecorder, metric string) {
@@ -487,24 +481,21 @@ func TestHTTPHandlers_AgentMetrics_WAL_Prometheus(t *testing.T) {
 		defer a.Shutdown()
 		testrpc.WaitForLeader(t, a.RPC, "dc1")
 
-		testretry.Run(t, func(r *testretry.R) {
-			respRec := httptest.NewRecorder()
-			recordPromMetrics(r, a, respRec)
-
-			out := respRec.Body.String()
-			require.Contains(r, out, "agent_5_raft_wal_head_truncations")
-			require.Contains(r, out, "agent_5_raft_wal_last_segment_age_seconds")
-			require.Contains(r, out, "agent_5_raft_wal_log_appends")
-			require.Contains(r, out, "agent_5_raft_wal_log_entries_read")
-			require.Contains(r, out, "agent_5_raft_wal_log_entries_written")
-			require.Contains(r, out, "agent_5_raft_wal_log_entry_bytes_read")
-			require.Contains(r, out, "agent_5_raft_wal_log_entry_bytes_written")
-			require.Contains(r, out, "agent_5_raft_wal_segment_rotations")
-			require.Contains(r, out, "agent_5_raft_wal_stable_gets")
-			require.Contains(r, out, "agent_5_raft_wal_stable_sets")
-			require.Contains(r, out, "agent_5_raft_wal_tail_truncations")
-		})
+		respRec := httptest.NewRecorder()
+		recordPromMetrics(t, a, respRec)
 
+		out := respRec.Body.String()
+		require.Contains(t, out, "agent_5_raft_wal_head_truncations")
+		require.Contains(t, out, "agent_5_raft_wal_last_segment_age_seconds")
+		require.Contains(t, out, "agent_5_raft_wal_log_appends")
+		require.Contains(t, out, "agent_5_raft_wal_log_entries_read")
+		require.Contains(t, out, "agent_5_raft_wal_log_entries_written")
+		require.Contains(t, out, "agent_5_raft_wal_log_entry_bytes_read")
+		require.Contains(t, out, "agent_5_raft_wal_log_entry_bytes_written")
+		require.Contains(t, out, "agent_5_raft_wal_segment_rotations")
+		require.Contains(t, out, "agent_5_raft_wal_stable_gets")
+		require.Contains(t, out, "agent_5_raft_wal_stable_sets")
+		require.Contains(t, out, "agent_5_raft_wal_tail_truncations")
 	})
 
 	t.Run("server without WAL enabled emits no WAL metrics", func(t *testing.T) {
@@ -590,17 +581,15 @@ func TestHTTPHandlers_AgentMetrics_LogVerifier_Prometheus(t *testing.T) {
 		defer a.Shutdown()
 		testrpc.WaitForLeader(t, a.RPC, "dc1")
 
-		testretry.Run(t, func(r *testretry.R) {
-			respRec := httptest.NewRecorder()
-			recordPromMetrics(r, a, respRec)
-
-			out := respRec.Body.String()
-			require.Contains(r, out, "agent_5_raft_logstore_verifier_checkpoints_written")
-			require.Contains(r, out, "agent_5_raft_logstore_verifier_dropped_reports")
-			require.Contains(r, out, "agent_5_raft_logstore_verifier_ranges_verified")
-			require.Contains(r, out, "agent_5_raft_logstore_verifier_read_checksum_failures")
-			require.Contains(r, out, "agent_5_raft_logstore_verifier_write_checksum_failures")
-		})
+		respRec := httptest.NewRecorder()
+		recordPromMetrics(t, a, respRec)
+
+		out := respRec.Body.String()
+		require.Contains(t, out, "agent_5_raft_logstore_verifier_checkpoints_written")
+		require.Contains(t, out, "agent_5_raft_logstore_verifier_dropped_reports")
+		require.Contains(t, out, "agent_5_raft_logstore_verifier_ranges_verified")
+		require.Contains(t, out, "agent_5_raft_logstore_verifier_read_checksum_failures")
+		require.Contains(t, out, "agent_5_raft_logstore_verifier_write_checksum_failures")
 	})
 
 	t.Run("server with verifier disabled emits no extra metrics", func(t *testing.T) {
diff --git a/agent/mock/notify.go b/agent/mock/notify.go
index 00dc9a3864a7b..ccbee20c4ce18 100644
--- a/agent/mock/notify.go
+++ b/agent/mock/notify.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package mock
 
 import (
diff --git a/agent/nodeid.go b/agent/nodeid.go
index c2192fac9123c..4e6f3e8d5f00b 100644
--- a/agent/nodeid.go
+++ b/agent/nodeid.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/nodeid_test.go b/agent/nodeid_test.go
index 73ce601249db3..da9df2bd2358f 100644
--- a/agent/nodeid_test.go
+++ b/agent/nodeid_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/notify.go b/agent/notify.go
index 80a150b19413a..52968c23ee347 100644
--- a/agent/notify.go
+++ b/agent/notify.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/notify_test.go b/agent/notify_test.go
index f256ee319ce7d..de6ff7fb509c1 100644
--- a/agent/notify_test.go
+++ b/agent/notify_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/operator_endpoint.go b/agent/operator_endpoint.go
index f669c13bd5caa..132f9e9a4428d 100644
--- a/agent/operator_endpoint.go
+++ b/agent/operator_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -11,7 +8,7 @@ import (
 
 	"github.com/armon/go-metrics"
 	external "github.com/hashicorp/consul/agent/grpc-external"
-	"github.com/hashicorp/consul/proto/private/pboperator"
+	"github.com/hashicorp/consul/proto/pboperator"
 
 	multierror "github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/raft"
diff --git a/agent/operator_endpoint_ce.go b/agent/operator_endpoint_ce.go
index 3abe7bc9109b0..e31dacae46057 100644
--- a/agent/operator_endpoint_ce.go
+++ b/agent/operator_endpoint_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
diff --git a/agent/operator_endpoint_ce_test.go b/agent/operator_endpoint_ce_test.go
index 7ab918c7cc253..e92f3603c5ac9 100644
--- a/agent/operator_endpoint_ce_test.go
+++ b/agent/operator_endpoint_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
@@ -64,7 +62,6 @@ func TestOperator_Usage(t *testing.T) {
 			},
 			// 4 = 6 total service instances - 1 connect proxy - 1 consul service
 			BillableServiceInstances: 4,
-			Nodes:                    2,
 		},
 	}
 	require.Equal(t, expected, raw.(structs.Usage).Usage)
diff --git a/agent/operator_endpoint_test.go b/agent/operator_endpoint_test.go
index ffe5c1a53abe6..25e3caf75c9dc 100644
--- a/agent/operator_endpoint_test.go
+++ b/agent/operator_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/peering_endpoint.go b/agent/peering_endpoint.go
index 2d5cab92be2e7..42ae160e53f5c 100644
--- a/agent/peering_endpoint.go
+++ b/agent/peering_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -16,7 +13,7 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 // PeeringEndpoint handles GET, DELETE on v1/peering/name
diff --git a/agent/peering_endpoint_ce_test.go b/agent/peering_endpoint_ce_test.go
index 57c3d5289e729..2019791ed80c2 100644
--- a/agent/peering_endpoint_ce_test.go
+++ b/agent/peering_endpoint_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
@@ -15,7 +13,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/testrpc"
 )
 
diff --git a/agent/peering_endpoint_test.go b/agent/peering_endpoint_test.go
index ba3b704b8b5ad..d9c31c9e73321 100644
--- a/agent/peering_endpoint_test.go
+++ b/agent/peering_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -24,7 +21,7 @@ import (
 
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/consul/testrpc"
diff --git a/agent/pool/conn.go b/agent/pool/conn.go
index 24d4c2cba4dc9..cc19171c91a4b 100644
--- a/agent/pool/conn.go
+++ b/agent/pool/conn.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pool
 
 type RPCType byte
@@ -44,14 +41,13 @@ const (
 	// configuration. At the time of writing there is only AutoEncrypt.Sign
 	// that is supported and it might be the only one there
 	// ever is.
-	RPCTLSInsecure    RPCType = 7
-	RPCGRPC           RPCType = 8
-	RPCRaftForwarding RPCType = 9
+	RPCTLSInsecure RPCType = 7
+	RPCGRPC        RPCType = 8
 
 	// RPCMaxTypeValue is the maximum rpc type byte value currently used for the
 	// various protocols riding over our "rpc" port.
 	//
-	// Currently our 0-9 values are mutually exclusive with any valid first byte
+	// Currently our 0-8 values are mutually exclusive with any valid first byte
 	// of a TLS header.  The first TLS header byte will begin with a TLS content
 	// type and the values 0-19 are all explicitly unassigned and marked as
 	// requiring coordination. RFC 7983 does the marking and goes into some
@@ -63,18 +59,17 @@ const (
 	//
 	// NOTE: if you add new RPCTypes beyond this value, you must similarly bump
 	// this value.
-	RPCMaxTypeValue = 9
+	RPCMaxTypeValue = 8
 )
 
 const (
 	// regular old rpc (note there is no equivalent of RPCMultiplex, RPCTLS, or RPCTLSInsecure)
-	ALPN_RPCConsul         = "consul/rpc-single"      // RPCConsul
-	ALPN_RPCRaft           = "consul/raft"            // RPCRaft
-	ALPN_RPCMultiplexV2    = "consul/rpc-multi"       // RPCMultiplexV2
-	ALPN_RPCSnapshot       = "consul/rpc-snapshot"    // RPCSnapshot
-	ALPN_RPCGossip         = "consul/rpc-gossip"      // RPCGossip
-	ALPN_RPCGRPC           = "consul/rpc-grpc"        // RPCGRPC
-	ALPN_RPCRaftForwarding = "consul/raft-forwarding" // RPCRaftForwarding
+	ALPN_RPCConsul      = "consul/rpc-single"   // RPCConsul
+	ALPN_RPCRaft        = "consul/raft"         // RPCRaft
+	ALPN_RPCMultiplexV2 = "consul/rpc-multi"    // RPCMultiplexV2
+	ALPN_RPCSnapshot    = "consul/rpc-snapshot" // RPCSnapshot
+	ALPN_RPCGossip      = "consul/rpc-gossip"   // RPCGossip
+	ALPN_RPCGRPC        = "consul/rpc-grpc"     // RPCGRPC
 	// wan federation additions
 	ALPN_WANGossipPacket = "consul/wan-gossip/packet"
 	ALPN_WANGossipStream = "consul/wan-gossip/stream"
@@ -87,7 +82,6 @@ var RPCNextProtos = []string{
 	ALPN_RPCSnapshot,
 	ALPN_RPCGossip,
 	ALPN_RPCGRPC,
-	ALPN_RPCRaftForwarding,
 	ALPN_WANGossipPacket,
 	ALPN_WANGossipStream,
 }
diff --git a/agent/pool/peek.go b/agent/pool/peek.go
index b631134341d9a..95dadf5669475 100644
--- a/agent/pool/peek.go
+++ b/agent/pool/peek.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pool
 
 import (
diff --git a/agent/pool/peek_test.go b/agent/pool/peek_test.go
index 29fbe9d4ab72e..d510127993660 100644
--- a/agent/pool/peek_test.go
+++ b/agent/pool/peek_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pool
 
 import (
diff --git a/agent/pool/pool.go b/agent/pool/pool.go
index 899cefe2e9740..593838601f6bd 100644
--- a/agent/pool/pool.go
+++ b/agent/pool/pool.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pool
 
 import (
@@ -21,7 +18,7 @@ import (
 
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
+	"github.com/hashicorp/consul/proto/pbcommon"
 	"github.com/hashicorp/consul/tlsutil"
 )
 
diff --git a/agent/prepared_query_endpoint.go b/agent/prepared_query_endpoint.go
index 15ab1005e48b5..2aafb7d964139 100644
--- a/agent/prepared_query_endpoint.go
+++ b/agent/prepared_query_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -19,7 +16,7 @@ type preparedQueryCreateResponse struct {
 }
 
 // preparedQueryCreate makes a new prepared query.
-func (s *HTTPHandlers) preparedQueryCreate(_ http.ResponseWriter, req *http.Request) (interface{}, error) {
+func (s *HTTPHandlers) preparedQueryCreate(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
 	args := structs.PreparedQueryRequest{
 		Op: structs.PreparedQueryCreate,
 	}
diff --git a/agent/prepared_query_endpoint_test.go b/agent/prepared_query_endpoint_test.go
index 07e4b8e68c70e..09012bc2a06f5 100644
--- a/agent/prepared_query_endpoint_test.go
+++ b/agent/prepared_query_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/proxycfg-glue/config_entry.go b/agent/proxycfg-glue/config_entry.go
index 3a79e228277d7..022b9161ca906 100644
--- a/agent/proxycfg-glue/config_entry.go
+++ b/agent/proxycfg-glue/config_entry.go
@@ -1,19 +1,18 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
 	"context"
 	"fmt"
 
+	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/cache"
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
 	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/rpcclient/configentry"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/submatview"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbcommon"
+	"github.com/hashicorp/consul/proto/pbconfigentry"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // CacheConfigEntry satisfies the proxycfg.ConfigEntry interface by sourcing
@@ -73,12 +72,8 @@ func newConfigEntryRequest(req *structs.ConfigEntryQuery, deps ServerDataSourceD
 		topic = pbsubscribe.Topic_InlineCertificate
 	case structs.BoundAPIGateway:
 		topic = pbsubscribe.Topic_BoundAPIGateway
-	case structs.RateLimitIPConfig:
-		topic = pbsubscribe.Topic_IPRateLimit
-	case structs.JWTProvider:
-		topic = pbsubscribe.Topic_JWTProvider
 	default:
-		return nil, fmt.Errorf("cannot map config entry kind: %q to a topic", req.Kind)
+		return nil, fmt.Errorf("cannot map config entry kind: %s to a topic", req.Kind)
 	}
 	return &configEntryRequest{
 		topic: topic,
@@ -98,9 +93,9 @@ func (r *configEntryRequest) CacheInfo() cache.RequestInfo { return r.req.CacheI
 func (r *configEntryRequest) NewMaterializer() (submatview.Materializer, error) {
 	var view submatview.View
 	if r.req.Name == "" {
-		view = configentry.NewConfigEntryListView(r.req.Kind, r.req.EnterpriseMeta)
+		view = newConfigEntryListView(r.req.Kind, r.req.EnterpriseMeta)
 	} else {
-		view = &configentry.ConfigEntryView{}
+		view = &configEntryView{}
 	}
 
 	return submatview.NewLocalMaterializer(submatview.LocalMaterializerDeps{
@@ -140,3 +135,120 @@ func (r *configEntryRequest) Request(index uint64) *pbsubscribe.SubscribeRequest
 
 	return req
 }
+
+// configEntryView implements a submatview.View for a single config entry.
+type configEntryView struct {
+	state structs.ConfigEntry
+}
+
+func (v *configEntryView) Reset() {
+	v.state = nil
+}
+
+func (v *configEntryView) Result(index uint64) any {
+	return &structs.ConfigEntryResponse{
+		QueryMeta: structs.QueryMeta{
+			Index:   index,
+			Backend: structs.QueryBackendStreaming,
+		},
+		Entry: v.state,
+	}
+}
+
+func (v *configEntryView) Update(events []*pbsubscribe.Event) error {
+	for _, event := range events {
+		update := event.GetConfigEntry()
+		if update == nil {
+			continue
+		}
+		switch update.Op {
+		case pbsubscribe.ConfigEntryUpdate_Delete:
+			v.state = nil
+		case pbsubscribe.ConfigEntryUpdate_Upsert:
+			v.state = pbconfigentry.ConfigEntryToStructs(update.ConfigEntry)
+		}
+	}
+	return nil
+}
+
+// configEntryListView implements a submatview.View for a list of config entries
+// that are all of the same kind (name is treated as unique).
+type configEntryListView struct {
+	kind    string
+	entMeta acl.EnterpriseMeta
+	state   map[string]structs.ConfigEntry
+}
+
+func newConfigEntryListView(kind string, entMeta acl.EnterpriseMeta) *configEntryListView {
+	view := &configEntryListView{kind: kind, entMeta: entMeta}
+	view.Reset()
+	return view
+}
+
+func (v *configEntryListView) Reset() {
+	v.state = make(map[string]structs.ConfigEntry)
+}
+
+func (v *configEntryListView) Result(index uint64) any {
+	entries := make([]structs.ConfigEntry, 0, len(v.state))
+	for _, entry := range v.state {
+		entries = append(entries, entry)
+	}
+
+	return &structs.IndexedConfigEntries{
+		Kind:    v.kind,
+		Entries: entries,
+		QueryMeta: structs.QueryMeta{
+			Index:   index,
+			Backend: structs.QueryBackendStreaming,
+		},
+	}
+}
+
+func (v *configEntryListView) Update(events []*pbsubscribe.Event) error {
+	for _, event := range filterByEnterpriseMeta(events, v.entMeta) {
+		update := event.GetConfigEntry()
+		configEntry := pbconfigentry.ConfigEntryToStructs(update.ConfigEntry)
+		name := structs.NewServiceName(configEntry.GetName(), configEntry.GetEnterpriseMeta()).String()
+
+		switch update.Op {
+		case pbsubscribe.ConfigEntryUpdate_Delete:
+			delete(v.state, name)
+		case pbsubscribe.ConfigEntryUpdate_Upsert:
+			v.state[name] = configEntry
+		}
+	}
+	return nil
+}
+
+// filterByEnterpriseMeta filters the given set of events to remove those that
+// don't match the request's enterprise meta - this is necessary because when
+// subscribing to a topic with SubjectWildcard we'll get events for resources
+// in all partitions and namespaces.
+func filterByEnterpriseMeta(events []*pbsubscribe.Event, entMeta acl.EnterpriseMeta) []*pbsubscribe.Event {
+	partition := entMeta.PartitionOrDefault()
+	namespace := entMeta.NamespaceOrDefault()
+
+	filtered := make([]*pbsubscribe.Event, 0, len(events))
+	for _, event := range events {
+		var eventEntMeta *pbcommon.EnterpriseMeta
+		switch payload := event.Payload.(type) {
+		case *pbsubscribe.Event_ConfigEntry:
+			eventEntMeta = payload.ConfigEntry.ConfigEntry.GetEnterpriseMeta()
+		case *pbsubscribe.Event_Service:
+			eventEntMeta = payload.Service.GetEnterpriseMeta()
+		default:
+			continue
+		}
+
+		if partition != acl.WildcardName && !acl.EqualPartitions(partition, eventEntMeta.GetPartition()) {
+			continue
+		}
+		if namespace != acl.WildcardName && !acl.EqualNamespaces(namespace, eventEntMeta.GetNamespace()) {
+			continue
+		}
+
+		filtered = append(filtered, event)
+	}
+	return filtered
+}
diff --git a/agent/proxycfg-glue/config_entry_test.go b/agent/proxycfg-glue/config_entry_test.go
new file mode 100644
index 0000000000000..4b1976f44f192
--- /dev/null
+++ b/agent/proxycfg-glue/config_entry_test.go
@@ -0,0 +1,183 @@
+package proxycfgglue
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/hashicorp/consul/acl"
+	"github.com/hashicorp/consul/agent/structs"
+	"github.com/hashicorp/consul/proto/pbconfigentry"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
+	"github.com/hashicorp/consul/sdk/testutil"
+)
+
+func TestConfigEntryView(t *testing.T) {
+	const index uint64 = 123
+
+	view := &configEntryView{}
+
+	testutil.RunStep(t, "initial state", func(t *testing.T) {
+		result := view.Result(index)
+		resp, ok := result.(*structs.ConfigEntryResponse)
+		require.Truef(t, ok, "expected ConfigEntryResponse, got: %T", result)
+		require.Nil(t, resp.Entry)
+		require.Equal(t, index, resp.QueryMeta.Index)
+	})
+
+	testutil.RunStep(t, "upsert event", func(t *testing.T) {
+		err := view.Update([]*pbsubscribe.Event{
+			{
+				Index: index,
+				Payload: &pbsubscribe.Event_ConfigEntry{
+					ConfigEntry: &pbsubscribe.ConfigEntryUpdate{
+						Op: pbsubscribe.ConfigEntryUpdate_Upsert,
+						ConfigEntry: &pbconfigentry.ConfigEntry{
+							Kind: pbconfigentry.Kind_KindServiceResolver,
+							Name: "web",
+							Entry: &pbconfigentry.ConfigEntry_ServiceResolver{
+								ServiceResolver: &pbconfigentry.ServiceResolver{},
+							},
+						},
+					},
+				},
+			},
+		})
+		require.NoError(t, err)
+
+		result := view.Result(index)
+		resp, ok := result.(*structs.ConfigEntryResponse)
+		require.Truef(t, ok, "expected ConfigEntryResponse, got: %T", result)
+
+		serviceResolver, ok := resp.Entry.(*structs.ServiceResolverConfigEntry)
+		require.Truef(t, ok, "expected ServiceResolverConfigEntry, got: %T", resp.Entry)
+		require.Equal(t, "web", serviceResolver.Name)
+	})
+
+	testutil.RunStep(t, "delete event", func(t *testing.T) {
+		err := view.Update([]*pbsubscribe.Event{
+			{
+				Index: index,
+				Payload: &pbsubscribe.Event_ConfigEntry{
+					ConfigEntry: &pbsubscribe.ConfigEntryUpdate{
+						Op: pbsubscribe.ConfigEntryUpdate_Delete,
+						ConfigEntry: &pbconfigentry.ConfigEntry{
+							Kind: pbconfigentry.Kind_KindServiceResolver,
+							Name: "web",
+							Entry: &pbconfigentry.ConfigEntry_ServiceResolver{
+								ServiceResolver: &pbconfigentry.ServiceResolver{},
+							},
+						},
+					},
+				},
+			},
+		})
+		require.NoError(t, err)
+
+		result := view.Result(index)
+		resp, ok := result.(*structs.ConfigEntryResponse)
+		require.Truef(t, ok, "expected ConfigEntryResponse, got: %T", result)
+		require.Nil(t, resp.Entry)
+	})
+
+	testutil.RunStep(t, "bogus event", func(t *testing.T) {
+		err := view.Update([]*pbsubscribe.Event{
+			{
+				Index:   index,
+				Payload: &pbsubscribe.Event_ServiceHealth{},
+			},
+		})
+		require.NoError(t, err)
+
+		result := view.Result(index)
+		resp, ok := result.(*structs.ConfigEntryResponse)
+		require.Truef(t, ok, "expected ConfigEntryResponse, got: %T", result)
+		require.Nil(t, resp.Entry)
+	})
+}
+
+func TestConfigEntryListView(t *testing.T) {
+	const index uint64 = 123
+
+	view := newConfigEntryListView(structs.ServiceResolver, *acl.DefaultEnterpriseMeta())
+
+	testutil.RunStep(t, "initial state", func(t *testing.T) {
+		result := view.Result(index)
+
+		resp, ok := result.(*structs.IndexedConfigEntries)
+		require.Truef(t, ok, "expected IndexedConfigEntries, got: %T", result)
+		require.Empty(t, resp.Entries)
+		require.Equal(t, index, resp.QueryMeta.Index)
+	})
+
+	testutil.RunStep(t, "upsert events", func(t *testing.T) {
+		err := view.Update([]*pbsubscribe.Event{
+			{
+				Index: index,
+				Payload: &pbsubscribe.Event_ConfigEntry{
+					ConfigEntry: &pbsubscribe.ConfigEntryUpdate{
+						Op: pbsubscribe.ConfigEntryUpdate_Upsert,
+						ConfigEntry: &pbconfigentry.ConfigEntry{
+							Kind: pbconfigentry.Kind_KindServiceResolver,
+							Name: "web",
+							Entry: &pbconfigentry.ConfigEntry_ServiceResolver{
+								ServiceResolver: &pbconfigentry.ServiceResolver{},
+							},
+						},
+					},
+				},
+			},
+			{
+				Index: index,
+				Payload: &pbsubscribe.Event_ConfigEntry{
+					ConfigEntry: &pbsubscribe.ConfigEntryUpdate{
+						Op: pbsubscribe.ConfigEntryUpdate_Upsert,
+						ConfigEntry: &pbconfigentry.ConfigEntry{
+							Kind: pbconfigentry.Kind_KindServiceResolver,
+							Name: "db",
+							Entry: &pbconfigentry.ConfigEntry_ServiceResolver{
+								ServiceResolver: &pbconfigentry.ServiceResolver{},
+							},
+						},
+					},
+				},
+			},
+		})
+		require.NoError(t, err)
+
+		result := view.Result(index)
+		resp, ok := result.(*structs.IndexedConfigEntries)
+		require.Truef(t, ok, "expected IndexedConfigEntries, got: %T", result)
+		require.Len(t, resp.Entries, 2)
+	})
+
+	testutil.RunStep(t, "delete event", func(t *testing.T) {
+		err := view.Update([]*pbsubscribe.Event{
+			{
+				Index: index,
+				Payload: &pbsubscribe.Event_ConfigEntry{
+					ConfigEntry: &pbsubscribe.ConfigEntryUpdate{
+						Op: pbsubscribe.ConfigEntryUpdate_Delete,
+						ConfigEntry: &pbconfigentry.ConfigEntry{
+							Kind: pbconfigentry.Kind_KindServiceResolver,
+							Name: "web",
+							Entry: &pbconfigentry.ConfigEntry_ServiceResolver{
+								ServiceResolver: &pbconfigentry.ServiceResolver{},
+							},
+						},
+					},
+				},
+			},
+		})
+		require.NoError(t, err)
+
+		result := view.Result(index)
+		resp, ok := result.(*structs.IndexedConfigEntries)
+		require.Truef(t, ok, "expected IndexedConfigEntries, got: %T", result)
+		require.Len(t, resp.Entries, 1)
+
+		serviceResolver, ok := resp.Entries[0].(*structs.ServiceResolverConfigEntry)
+		require.Truef(t, ok, "expected ServiceResolverConfigEntry, got: %T", resp.Entries[0])
+		require.Equal(t, "db", serviceResolver.Name)
+	})
+}
diff --git a/agent/proxycfg-glue/discovery_chain.go b/agent/proxycfg-glue/discovery_chain.go
index 518467492d7cc..78e1f1653c071 100644
--- a/agent/proxycfg-glue/discovery_chain.go
+++ b/agent/proxycfg-glue/discovery_chain.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/discovery_chain_test.go b/agent/proxycfg-glue/discovery_chain_test.go
index e4156667d36b7..7207ffaf1dcbd 100644
--- a/agent/proxycfg-glue/discovery_chain_test.go
+++ b/agent/proxycfg-glue/discovery_chain_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/exported_peered_services.go b/agent/proxycfg-glue/exported_peered_services.go
index 1b92600451710..6d7fac302a8b7 100644
--- a/agent/proxycfg-glue/exported_peered_services.go
+++ b/agent/proxycfg-glue/exported_peered_services.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/exported_peered_services_test.go b/agent/proxycfg-glue/exported_peered_services_test.go
index 91b42323fab8a..77341e5157763 100644
--- a/agent/proxycfg-glue/exported_peered_services_test.go
+++ b/agent/proxycfg-glue/exported_peered_services_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
@@ -10,7 +7,7 @@ import (
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/stretchr/testify/require"
 )
diff --git a/agent/proxycfg-glue/federation_state_list_mesh_gateways.go b/agent/proxycfg-glue/federation_state_list_mesh_gateways.go
index c34303552c0a2..ea3640ad9bc02 100644
--- a/agent/proxycfg-glue/federation_state_list_mesh_gateways.go
+++ b/agent/proxycfg-glue/federation_state_list_mesh_gateways.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/federation_state_list_mesh_gateways_test.go b/agent/proxycfg-glue/federation_state_list_mesh_gateways_test.go
index baf477f4340b2..5c716d24c08f2 100644
--- a/agent/proxycfg-glue/federation_state_list_mesh_gateways_test.go
+++ b/agent/proxycfg-glue/federation_state_list_mesh_gateways_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/gateway_services.go b/agent/proxycfg-glue/gateway_services.go
index 555b1d5385359..8c90f949dc8bc 100644
--- a/agent/proxycfg-glue/gateway_services.go
+++ b/agent/proxycfg-glue/gateway_services.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/gateway_services_test.go b/agent/proxycfg-glue/gateway_services_test.go
index ff89a62c92e45..bb20f489dadd9 100644
--- a/agent/proxycfg-glue/gateway_services_test.go
+++ b/agent/proxycfg-glue/gateway_services_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/glue.go b/agent/proxycfg-glue/glue.go
index a4fa538b92859..9730a417f83ad 100644
--- a/agent/proxycfg-glue/glue.go
+++ b/agent/proxycfg-glue/glue.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
@@ -10,6 +7,8 @@ import (
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-memdb"
 
+	"github.com/hashicorp/consul/proto/pbpeering"
+
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/cache"
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
@@ -21,7 +20,6 @@ import (
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/submatview"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
 )
 
 // ServerDataSourceDeps contains the dependencies needed for sourcing data from
@@ -42,7 +40,6 @@ type Store interface {
 	ExportedServicesForAllPeersByName(ws memdb.WatchSet, dc string, entMeta acl.EnterpriseMeta) (uint64, map[string]structs.ServiceList, error)
 	FederationStateList(ws memdb.WatchSet) (uint64, []*structs.FederationState, error)
 	GatewayServices(ws memdb.WatchSet, gateway string, entMeta *acl.EnterpriseMeta) (uint64, structs.GatewayServices, error)
-	IntentionMatchOne(ws memdb.WatchSet, entry structs.IntentionMatchEntry, matchType structs.IntentionMatchType, destinationType structs.IntentionTargetType) (uint64, structs.SimplifiedIntentions, error)
 	IntentionTopology(ws memdb.WatchSet, target structs.ServiceName, downstreams bool, defaultDecision acl.EnforcementDecision, intentionTarget structs.IntentionTargetType) (uint64, structs.ServiceList, error)
 	ReadResolvedServiceConfigEntries(ws memdb.WatchSet, serviceName string, entMeta *acl.EnterpriseMeta, upstreamIDs []structs.ServiceID, proxyMode structs.ProxyMode) (uint64, *configentry.ResolvedServiceConfigSet, error)
 	ServiceDiscoveryChain(ws memdb.WatchSet, serviceName string, entMeta *acl.EnterpriseMeta, req discoverychain.CompileRequest) (uint64, *structs.CompiledDiscoveryChain, *configentry.DiscoveryChainSet, error)
@@ -52,9 +49,6 @@ type Store interface {
 	PeeringTrustBundleList(ws memdb.WatchSet, entMeta acl.EnterpriseMeta) (uint64, []*pbpeering.PeeringTrustBundle, error)
 	TrustBundleListByService(ws memdb.WatchSet, service, dc string, entMeta acl.EnterpriseMeta) (uint64, []*pbpeering.PeeringTrustBundle, error)
 	VirtualIPsForAllImportedServices(ws memdb.WatchSet, entMeta acl.EnterpriseMeta) (uint64, []state.ServiceVirtualIP, error)
-	CheckConnectServiceNodes(ws memdb.WatchSet, serviceName string, entMeta *acl.EnterpriseMeta, peerName string) (uint64, structs.CheckServiceNodes, error)
-	CheckIngressServiceNodes(ws memdb.WatchSet, serviceName string, entMeta *acl.EnterpriseMeta) (uint64, structs.CheckServiceNodes, error)
-	CheckServiceNodes(ws memdb.WatchSet, serviceName string, entMeta *acl.EnterpriseMeta, peerName string) (uint64, structs.CheckServiceNodes, error)
 }
 
 // CacheCARoots satisfies the proxycfg.CARoots interface by sourcing data from
@@ -83,6 +77,17 @@ func CacheServiceGateways(c *cache.Cache) proxycfg.GatewayServices {
 	return &cacheProxyDataSource[*structs.ServiceSpecificRequest]{c, cachetype.ServiceGatewaysName}
 }
 
+// CacheLeafCertificate satisifies the proxycfg.LeafCertificate interface by
+// sourcing data from the agent cache.
+//
+// Note: there isn't a server-local equivalent of this data source because
+// "agentless" proxies obtain certificates via SDS served by consul-dataplane.
+// If SDS is not supported on consul-dataplane, data is sourced from the server agent cache
+// even for "agentless" proxies.
+func CacheLeafCertificate(c *cache.Cache) proxycfg.LeafCertificate {
+	return &cacheProxyDataSource[*cachetype.ConnectCALeafRequest]{c, cachetype.ConnectCALeafName}
+}
+
 // CachePrepraredQuery satisfies the proxycfg.PreparedQuery interface by
 // sourcing data from the agent cache.
 //
diff --git a/agent/proxycfg-glue/health.go b/agent/proxycfg-glue/health.go
index 6acf5b7023026..331c8012b1f83 100644
--- a/agent/proxycfg-glue/health.go
+++ b/agent/proxycfg-glue/health.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/health_blocking.go b/agent/proxycfg-glue/health_blocking.go
deleted file mode 100644
index 8ed384f837efa..0000000000000
--- a/agent/proxycfg-glue/health_blocking.go
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxycfgglue
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/hashicorp/go-bexpr"
-	"github.com/hashicorp/go-memdb"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/consul/watch"
-	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/structs/aclfilter"
-)
-
-// ServerHealthBlocking exists due to a bug with the streaming backend and its interaction with ACLs.
-// Whenever an exported-services config entry is modified, this is effectively an ACL change.
-// Assume the following situation:
-//   - no services are exported
-//   - an upstream watch to service X is spawned
-//   - the streaming backend filters out data for service X (because it's not exported yet)
-//   - service X is finally exported
-//
-// In this situation, the streaming backend does not trigger a refresh of its data.
-// This means that any events that were supposed to have been received prior to the export are NOT backfilled,
-// and the watches never see service X spawning.
-//
-// We currently have decided to not trigger a stream refresh in this situation due to the potential for a
-// thundering herd effect (touching exports would cause a re-fetch of all watches for that partition, potentially).
-// Therefore, this local blocking-query approach exists for agentless.
-//
-// It's also worth noting that the streaming subscription is currently bypassed most of the time with agentful,
-// because proxycfg has a `req.Source.Node != ""` which prevents the `streamingEnabled` check from passing.
-// This means that while agents should technically have this same issue, they don't experience it with mesh health
-// watches.
-func ServerHealthBlocking(deps ServerDataSourceDeps, remoteSource proxycfg.Health) *serverHealthBlocking {
-	return &serverHealthBlocking{deps, remoteSource, 5 * time.Minute}
-}
-
-type serverHealthBlocking struct {
-	deps         ServerDataSourceDeps
-	remoteSource proxycfg.Health
-	watchTimeout time.Duration
-}
-
-// Notify is mostly a copy of the function in `agent/consul/health_endpoint.go` with a few minor tweaks.
-// Most notably, some query features unnecessary for mesh have been stripped out.
-func (h *serverHealthBlocking) Notify(ctx context.Context, args *structs.ServiceSpecificRequest, correlationID string, ch chan<- proxycfg.UpdateEvent) error {
-	if args.Datacenter != h.deps.Datacenter {
-		return h.remoteSource.Notify(ctx, args, correlationID, ch)
-	}
-
-	// Verify the arguments
-	if args.ServiceName == "" {
-		return fmt.Errorf("Must provide service name")
-	}
-	if args.EnterpriseMeta.PartitionOrDefault() == acl.WildcardName {
-		return fmt.Errorf("Wildcards are not allowed in the partition field")
-	}
-
-	// Determine the function we'll call
-	var f func(memdb.WatchSet, Store, *structs.ServiceSpecificRequest) (uint64, structs.CheckServiceNodes, error)
-	switch {
-	case args.Connect:
-		f = serviceNodesConnect
-	case args.Ingress:
-		f = serviceNodesIngress
-	default:
-		f = serviceNodesDefault
-	}
-
-	filter, err := bexpr.CreateFilter(args.Filter, nil, structs.CheckServiceNode{})
-	if err != nil {
-		return err
-	}
-
-	var hadResults bool = false
-	return watch.ServerLocalNotify(ctx, correlationID, h.deps.GetStore,
-		func(ws memdb.WatchSet, store Store) (uint64, *structs.IndexedCheckServiceNodes, error) {
-			// This is necessary so that service export changes are eventually picked up, since
-			// they won't trigger the watch themselves.
-			timeoutCh := make(chan struct{})
-			time.AfterFunc(h.watchTimeout, func() {
-				close(timeoutCh)
-			})
-			ws.Add(timeoutCh)
-
-			authzContext := acl.AuthorizerContext{
-				Peer: args.PeerName,
-			}
-			authz, err := h.deps.ACLResolver.ResolveTokenAndDefaultMeta(args.Token, &args.EnterpriseMeta, &authzContext)
-			if err != nil {
-				return 0, nil, err
-			}
-			// If we're doing a connect or ingress query, we need read access to the service
-			// we're trying to find proxies for, so check that.
-			if args.Connect || args.Ingress {
-				if authz.ServiceRead(args.ServiceName, &authzContext) != acl.Allow {
-					// If access was somehow revoked (via token deletion or unexporting), then we clear the
-					// last-known results before triggering an error. This way, the proxies will actually update
-					// their data, rather than holding onto the last-known list of healthy nodes indefinitely.
-					if hadResults {
-						hadResults = false
-						h.deps.Logger.Debug("serverHealthBlocking emitting zero check-service-nodes due to insufficient ACL privileges",
-							"serviceName", structs.NewServiceName(args.ServiceName, &args.EnterpriseMeta),
-							"correlationID", correlationID,
-							"connect", args.Connect,
-							"ingress", args.Ingress,
-						)
-						return 0, &structs.IndexedCheckServiceNodes{}, watch.ErrorACLResetData
-					}
-					return 0, nil, acl.ErrPermissionDenied
-				}
-			}
-
-			var thisReply structs.IndexedCheckServiceNodes
-			thisReply.Index, thisReply.Nodes, err = f(ws, store, args)
-			if err != nil {
-				return 0, nil, err
-			}
-
-			raw, err := filter.Execute(thisReply.Nodes)
-			if err != nil {
-				return 0, nil, err
-			}
-			thisReply.Nodes = raw.(structs.CheckServiceNodes)
-
-			// Note: we filter the results with ACLs *after* applying the user-supplied
-			// bexpr filter, to ensure QueryMeta.ResultsFilteredByACLs does not include
-			// results that would be filtered out even if the user did have permission.
-			if err := h.filterACL(&authzContext, args.Token, &thisReply); err != nil {
-				return 0, nil, err
-			}
-
-			hadResults = true
-			h.deps.Logger.Trace("serverHealthBlocking emitting check-service-nodes",
-				"serviceName", structs.NewServiceName(args.ServiceName, &args.EnterpriseMeta),
-				"correlationID", correlationID,
-				"connect", args.Connect,
-				"ingress", args.Ingress,
-				"nodes", len(thisReply.Nodes),
-			)
-			return thisReply.Index, &thisReply, nil
-		},
-		dispatchBlockingQueryUpdate[*structs.IndexedCheckServiceNodes](ch),
-	)
-}
-
-func (h *serverHealthBlocking) filterACL(authz *acl.AuthorizerContext, token string, subj *structs.IndexedCheckServiceNodes) error {
-	// Get the ACL from the token
-	var entMeta acl.EnterpriseMeta
-	authorizer, err := h.deps.ACLResolver.ResolveTokenAndDefaultMeta(token, &entMeta, authz)
-	if err != nil {
-		return err
-	}
-	aclfilter.New(authorizer, h.deps.Logger).Filter(subj)
-	return nil
-}
-
-func serviceNodesConnect(ws memdb.WatchSet, s Store, args *structs.ServiceSpecificRequest) (uint64, structs.CheckServiceNodes, error) {
-	return s.CheckConnectServiceNodes(ws, args.ServiceName, &args.EnterpriseMeta, args.PeerName)
-}
-
-func serviceNodesIngress(ws memdb.WatchSet, s Store, args *structs.ServiceSpecificRequest) (uint64, structs.CheckServiceNodes, error) {
-	return s.CheckIngressServiceNodes(ws, args.ServiceName, &args.EnterpriseMeta)
-}
-
-func serviceNodesDefault(ws memdb.WatchSet, s Store, args *structs.ServiceSpecificRequest) (uint64, structs.CheckServiceNodes, error) {
-	return s.CheckServiceNodes(ws, args.ServiceName, &args.EnterpriseMeta, args.PeerName)
-}
diff --git a/agent/proxycfg-glue/health_blocking_test.go b/agent/proxycfg-glue/health_blocking_test.go
deleted file mode 100644
index 3a2d00c2c5d90..0000000000000
--- a/agent/proxycfg-glue/health_blocking_test.go
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxycfgglue
-
-import (
-	"context"
-	"errors"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/consul/state"
-	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/stretchr/testify/require"
-)
-
-func TestServerHealthBlocking(t *testing.T) {
-	t.Run("remote queries are delegated to the remote source", func(t *testing.T) {
-		var (
-			ctx           = context.Background()
-			req           = &structs.ServiceSpecificRequest{Datacenter: "dc2"}
-			correlationID = "correlation-id"
-			ch            = make(chan<- proxycfg.UpdateEvent)
-			result        = errors.New("KABOOM")
-		)
-
-		remoteSource := newMockHealth(t)
-		remoteSource.On("Notify", ctx, req, correlationID, ch).Return(result)
-
-		dataSource := ServerHealthBlocking(ServerDataSourceDeps{Datacenter: "dc1"}, remoteSource)
-		err := dataSource.Notify(ctx, req, correlationID, ch)
-		require.Equal(t, result, err)
-	})
-
-	t.Run("services notify correctly", func(t *testing.T) {
-		const (
-			datacenter  = "dc1"
-			serviceName = "web"
-		)
-
-		ctx, cancel := context.WithCancel(context.Background())
-		t.Cleanup(cancel)
-
-		store := state.NewStateStore(nil)
-		aclResolver := newStaticResolver(acl.ManageAll())
-		dataSource := ServerHealthBlocking(ServerDataSourceDeps{
-			GetStore:    func() Store { return store },
-			Datacenter:  datacenter,
-			ACLResolver: aclResolver,
-			Logger:      testutil.Logger(t),
-		}, nil)
-		dataSource.watchTimeout = 1 * time.Second
-
-		// Watch for all events
-		eventCh := make(chan proxycfg.UpdateEvent)
-		require.NoError(t, dataSource.Notify(ctx, &structs.ServiceSpecificRequest{
-			Datacenter:  datacenter,
-			ServiceName: serviceName,
-		}, "", eventCh))
-
-		// Watch for a subset of events
-		filteredCh := make(chan proxycfg.UpdateEvent)
-		require.NoError(t, dataSource.Notify(ctx, &structs.ServiceSpecificRequest{
-			Datacenter:  datacenter,
-			ServiceName: serviceName,
-			QueryOptions: structs.QueryOptions{
-				Filter: "Service.ID == \"web1\"",
-			},
-		}, "", filteredCh))
-
-		testutil.RunStep(t, "initial state", func(t *testing.T) {
-			result := getEventResult[*structs.IndexedCheckServiceNodes](t, eventCh)
-			require.Empty(t, result.Nodes)
-			result = getEventResult[*structs.IndexedCheckServiceNodes](t, filteredCh)
-			require.Empty(t, result.Nodes)
-		})
-
-		testutil.RunStep(t, "register services", func(t *testing.T) {
-			require.NoError(t, store.EnsureRegistration(10, &structs.RegisterRequest{
-				Datacenter: "dc1",
-				Node:       "foo",
-				Address:    "127.0.0.1",
-				Service: &structs.NodeService{
-					ID:      serviceName + "1",
-					Service: serviceName,
-					Port:    80,
-				},
-			}))
-			result := getEventResult[*structs.IndexedCheckServiceNodes](t, eventCh)
-			require.Len(t, result.Nodes, 1)
-			result = getEventResult[*structs.IndexedCheckServiceNodes](t, filteredCh)
-			require.Len(t, result.Nodes, 1)
-
-			require.NoError(t, store.EnsureRegistration(11, &structs.RegisterRequest{
-				Datacenter: "dc1",
-				Node:       "foo",
-				Address:    "127.0.0.1",
-				Service: &structs.NodeService{
-					ID:      serviceName + "2",
-					Service: serviceName,
-					Port:    81,
-				},
-			}))
-			result = getEventResult[*structs.IndexedCheckServiceNodes](t, eventCh)
-			require.Len(t, result.Nodes, 2)
-			result = getEventResult[*structs.IndexedCheckServiceNodes](t, filteredCh)
-			require.Len(t, result.Nodes, 1)
-			require.Equal(t, "web1", result.Nodes[0].Service.ID)
-		})
-
-		testutil.RunStep(t, "deregister service", func(t *testing.T) {
-			require.NoError(t, store.DeleteService(12, "foo", serviceName+"1", nil, ""))
-			result := getEventResult[*structs.IndexedCheckServiceNodes](t, eventCh)
-			require.Len(t, result.Nodes, 1)
-			result = getEventResult[*structs.IndexedCheckServiceNodes](t, filteredCh)
-			require.Len(t, result.Nodes, 0)
-		})
-
-		testutil.RunStep(t, "acl enforcement", func(t *testing.T) {
-			require.NoError(t, store.EnsureRegistration(11, &structs.RegisterRequest{
-				Datacenter: "dc1",
-				Node:       "foo",
-				Address:    "127.0.0.1",
-				Service: &structs.NodeService{
-					Service: serviceName + "-sidecar-proxy",
-					Kind:    structs.ServiceKindConnectProxy,
-					Proxy: structs.ConnectProxyConfig{
-						DestinationServiceName: serviceName,
-					},
-				},
-			}))
-
-			authzDeny := policyAuthorizer(t, ``)
-			authzAllow := policyAuthorizer(t, `
-				node_prefix "" { policy = "read" }
-				service_prefix "web" { policy = "read" }
-			`)
-
-			// Start a stream where insufficient permissions are denied
-			aclDenyCh := make(chan proxycfg.UpdateEvent)
-			aclResolver.SwapAuthorizer(authzDeny)
-			require.NoError(t, dataSource.Notify(ctx, &structs.ServiceSpecificRequest{
-				Connect:     true,
-				Datacenter:  datacenter,
-				ServiceName: serviceName,
-			}, "", aclDenyCh))
-			require.ErrorContains(t, getEventError(t, aclDenyCh), "Permission denied")
-
-			// Adding ACL permissions will send valid data
-			aclResolver.SwapAuthorizer(authzAllow)
-			time.Sleep(dataSource.watchTimeout)
-			result := getEventResult[*structs.IndexedCheckServiceNodes](t, aclDenyCh)
-			require.Len(t, result.Nodes, 1)
-			require.Equal(t, "web-sidecar-proxy", result.Nodes[0].Service.Service)
-
-			// Start a stream where sufficient permissions are allowed
-			aclAllowCh := make(chan proxycfg.UpdateEvent)
-			aclResolver.SwapAuthorizer(authzAllow)
-			require.NoError(t, dataSource.Notify(ctx, &structs.ServiceSpecificRequest{
-				Connect:     true,
-				Datacenter:  datacenter,
-				ServiceName: serviceName,
-			}, "", aclAllowCh))
-			result = getEventResult[*structs.IndexedCheckServiceNodes](t, aclAllowCh)
-			require.Len(t, result.Nodes, 1)
-			require.Equal(t, "web-sidecar-proxy", result.Nodes[0].Service.Service)
-
-			// Removing ACL permissions will send empty data
-			aclResolver.SwapAuthorizer(authzDeny)
-			time.Sleep(dataSource.watchTimeout)
-			result = getEventResult[*structs.IndexedCheckServiceNodes](t, aclAllowCh)
-			require.Len(t, result.Nodes, 0)
-
-			// Adding ACL permissions will send valid data
-			aclResolver.SwapAuthorizer(authzAllow)
-			time.Sleep(dataSource.watchTimeout)
-			result = getEventResult[*structs.IndexedCheckServiceNodes](t, aclAllowCh)
-			require.Len(t, result.Nodes, 1)
-			require.Equal(t, "web-sidecar-proxy", result.Nodes[0].Service.Service)
-		})
-	})
-}
diff --git a/agent/proxycfg-glue/health_test.go b/agent/proxycfg-glue/health_test.go
index 821e22a789085..b4e6035ee5f2d 100644
--- a/agent/proxycfg-glue/health_test.go
+++ b/agent/proxycfg-glue/health_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
@@ -18,7 +15,7 @@ import (
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/submatview"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
diff --git a/agent/proxycfg-glue/helpers_test.go b/agent/proxycfg-glue/helpers_test.go
index 3c7eb5b7ad153..7a0c67df11450 100644
--- a/agent/proxycfg-glue/helpers_test.go
+++ b/agent/proxycfg-glue/helpers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/intention_upstreams.go b/agent/proxycfg-glue/intention_upstreams.go
index dc6731372271f..e5d5e9959c2e3 100644
--- a/agent/proxycfg-glue/intention_upstreams.go
+++ b/agent/proxycfg-glue/intention_upstreams.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/intention_upstreams_test.go b/agent/proxycfg-glue/intention_upstreams_test.go
index bfaeb55b38646..1a69b1de70525 100644
--- a/agent/proxycfg-glue/intention_upstreams_test.go
+++ b/agent/proxycfg-glue/intention_upstreams_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/intentions.go b/agent/proxycfg-glue/intentions.go
index f3186c6689ab9..69652d922da39 100644
--- a/agent/proxycfg-glue/intentions.go
+++ b/agent/proxycfg-glue/intentions.go
@@ -1,20 +1,17 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
 	"context"
+	"fmt"
 	"sort"
-
-	"github.com/hashicorp/go-memdb"
+	"sync"
 
 	"github.com/hashicorp/consul/agent/cache"
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
-	"github.com/hashicorp/consul/agent/consul/watch"
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/structs/aclfilter"
+	"github.com/hashicorp/consul/agent/submatview"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // CacheIntentions satisfies the proxycfg.Intentions interface by sourcing data
@@ -27,19 +24,17 @@ type cacheIntentions struct {
 	c *cache.Cache
 }
 
-func toIntentionMatchEntry(req *structs.ServiceSpecificRequest) structs.IntentionMatchEntry {
-	return structs.IntentionMatchEntry{
-		Partition: req.PartitionOrDefault(),
-		Namespace: req.NamespaceOrDefault(),
-		Name:      req.ServiceName,
-	}
-}
-
 func (c cacheIntentions) Notify(ctx context.Context, req *structs.ServiceSpecificRequest, correlationID string, ch chan<- proxycfg.UpdateEvent) error {
 	query := &structs.IntentionQueryRequest{
 		Match: &structs.IntentionQueryMatch{
-			Type:    structs.IntentionMatchDestination,
-			Entries: []structs.IntentionMatchEntry{toIntentionMatchEntry(req)},
+			Type: structs.IntentionMatchDestination,
+			Entries: []structs.IntentionMatchEntry{
+				{
+					Partition: req.PartitionOrDefault(),
+					Namespace: req.NamespaceOrDefault(),
+					Name:      req.ServiceName,
+				},
+			},
 		},
 		QueryOptions: structs.QueryOptions{Token: req.QueryOptions.Token},
 	}
@@ -51,9 +46,9 @@ func (c cacheIntentions) Notify(ctx context.Context, req *structs.ServiceSpecifi
 				return
 			}
 
-			var matches structs.SimplifiedIntentions
+			var matches structs.Intentions
 			if len(rsp.Matches) != 0 {
-				matches = structs.SimplifiedIntentions(rsp.Matches[0])
+				matches = rsp.Matches[0]
 			}
 			result = matches
 		}
@@ -76,29 +71,111 @@ type serverIntentions struct {
 }
 
 func (s *serverIntentions) Notify(ctx context.Context, req *structs.ServiceSpecificRequest, correlationID string, ch chan<- proxycfg.UpdateEvent) error {
-	return watch.ServerLocalNotify(ctx, correlationID, s.deps.GetStore,
-		func(ws memdb.WatchSet, store Store) (uint64, structs.SimplifiedIntentions, error) {
-			authz, err := s.deps.ACLResolver.ResolveTokenAndDefaultMeta(req.Token, &req.EnterpriseMeta, nil)
-			if err != nil {
-				return 0, nil, err
+	// We may consume *multiple* streams (to handle wildcard intentions) and merge
+	// them into a single list of intentions.
+	//
+	// An alternative approach would be to consume events for all intentions and
+	// filter out the irrelevant ones. This would remove some complexity here but
+	// at the expense of significant overhead.
+	subjects := s.buildSubjects(req.ServiceName, req.EnterpriseMeta)
+
+	// mu guards state, as the callback functions provided in NotifyCallback below
+	// will be called in different goroutines.
+	var mu sync.Mutex
+	state := make([]*structs.ConfigEntryResponse, len(subjects))
+
+	// buildEvent constructs an event containing the matching intentions received
+	// from NotifyCallback calls below. If we have not received initial snapshots
+	// for all streams yet, the event will be empty and the second return value will
+	// be false (causing no event to be emittied).
+	//
+	// Note: mu must be held when calling this function.
+	buildEvent := func() (proxycfg.UpdateEvent, bool) {
+		intentions := make(structs.Intentions, 0)
+
+		for _, result := range state {
+			if result == nil {
+				return proxycfg.UpdateEvent{}, false
 			}
-			match := toIntentionMatchEntry(req)
-
-			index, ixns, err := store.IntentionMatchOne(ws, match, structs.IntentionMatchDestination, structs.IntentionTargetService)
-			if err != nil {
-				return 0, nil, err
+			si, ok := result.Entry.(*structs.ServiceIntentionsConfigEntry)
+			if !ok {
+				continue
 			}
+			intentions = append(intentions, si.ToIntentions()...)
+		}
+
+		sort.Sort(structs.IntentionPrecedenceSorter(intentions))
+
+		return newUpdateEvent(correlationID, intentions, nil), true
+	}
+
+	for subjectIdx, subject := range subjects {
+		subjectIdx := subjectIdx
 
-			indexedIntentions := &structs.IndexedIntentions{
-				Intentions: structs.Intentions(ixns),
+		storeReq := intentionsRequest{
+			deps:    s.deps,
+			baseReq: req,
+			subject: subject,
+		}
+		err := s.deps.ViewStore.NotifyCallback(ctx, storeReq, correlationID, func(ctx context.Context, cacheEvent cache.UpdateEvent) {
+			mu.Lock()
+			state[subjectIdx] = cacheEvent.Result.(*structs.ConfigEntryResponse)
+			event, ready := buildEvent()
+			mu.Unlock()
+
+			if ready {
+				select {
+				case ch <- event:
+				case <-ctx.Done():
+				}
 			}
 
-			aclfilter.New(authz, s.deps.Logger).Filter(indexedIntentions)
+		})
+		if err != nil {
+			return err
+		}
+	}
 
-			sort.Sort(structs.IntentionPrecedenceSorter(indexedIntentions.Intentions))
+	return nil
+}
 
-			return index, structs.SimplifiedIntentions(indexedIntentions.Intentions), nil
-		},
-		dispatchBlockingQueryUpdate[structs.SimplifiedIntentions](ch),
+type intentionsRequest struct {
+	deps    ServerDataSourceDeps
+	baseReq *structs.ServiceSpecificRequest
+	subject *pbsubscribe.NamedSubject
+}
+
+func (r intentionsRequest) CacheInfo() cache.RequestInfo {
+	info := r.baseReq.CacheInfo()
+	info.Key = fmt.Sprintf("%s/%s/%s/%s",
+		r.subject.PeerName,
+		r.subject.Partition,
+		r.subject.Namespace,
+		r.subject.Key,
 	)
+	return info
 }
+
+func (r intentionsRequest) NewMaterializer() (submatview.Materializer, error) {
+	return submatview.NewLocalMaterializer(submatview.LocalMaterializerDeps{
+		Backend:     r.deps.EventPublisher,
+		ACLResolver: r.deps.ACLResolver,
+		Deps: submatview.Deps{
+			View:    &configEntryView{},
+			Logger:  r.deps.Logger,
+			Request: r.Request,
+		},
+	}), nil
+}
+
+func (r intentionsRequest) Request(index uint64) *pbsubscribe.SubscribeRequest {
+	return &pbsubscribe.SubscribeRequest{
+		Topic:      pbsubscribe.Topic_ServiceIntentions,
+		Index:      index,
+		Datacenter: r.baseReq.Datacenter,
+		Token:      r.baseReq.Token,
+		Subject:    &pbsubscribe.SubscribeRequest_NamedSubject{NamedSubject: r.subject},
+	}
+}
+
+func (r intentionsRequest) Type() string { return "proxycfgglue.ServiceIntentions" }
diff --git a/agent/proxycfg-glue/intentions_ce.go b/agent/proxycfg-glue/intentions_ce.go
index e7efb978dff1c..b19053bcae1b0 100644
--- a/agent/proxycfg-glue/intentions_ce.go
+++ b/agent/proxycfg-glue/intentions_ce.go
@@ -1,14 +1,12 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package proxycfgglue
 
 import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 func (s serverIntentions) buildSubjects(serviceName string, entMeta acl.EnterpriseMeta) []*pbsubscribe.NamedSubject {
diff --git a/agent/proxycfg-glue/intentions_ent_test.go b/agent/proxycfg-glue/intentions_ent_test.go
new file mode 100644
index 0000000000000..00eb37285dbbf
--- /dev/null
+++ b/agent/proxycfg-glue/intentions_ent_test.go
@@ -0,0 +1,80 @@
+package proxycfgglue
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/hashicorp/go-hclog"
+	"github.com/stretchr/testify/require"
+
+	"github.com/hashicorp/consul/acl"
+	"github.com/hashicorp/consul/agent/consul/state"
+	"github.com/hashicorp/consul/agent/consul/stream"
+	"github.com/hashicorp/consul/agent/proxycfg"
+	"github.com/hashicorp/consul/agent/structs"
+	"github.com/hashicorp/consul/agent/submatview"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
+	"github.com/hashicorp/consul/sdk/testutil"
+)
+
+func TestServerIntentions_Enterprise(t *testing.T) {
+	// This test asserts that we also subscribe to the wildcard namespace intention.
+	const (
+		serviceName = "web"
+		index       = 1
+	)
+
+	logger := hclog.NewNullLogger()
+
+	ctx, cancel := context.WithCancel(context.Background())
+	t.Cleanup(cancel)
+
+	store := submatview.NewStore(logger)
+	go store.Run(ctx)
+
+	publisher := stream.NewEventPublisher(10 * time.Second)
+	publisher.RegisterHandler(pbsubscribe.Topic_ServiceIntentions,
+		func(stream.SubscribeRequest, stream.SnapshotAppender) (uint64, error) { return index, nil },
+		false)
+	go publisher.Run(ctx)
+
+	intentions := ServerIntentions(ServerDataSourceDeps{
+		ACLResolver:    newStaticResolver(acl.ManageAll()),
+		ViewStore:      store,
+		EventPublisher: publisher,
+		Logger:         logger,
+	})
+
+	eventCh := make(chan proxycfg.UpdateEvent)
+	require.NoError(t, intentions.Notify(ctx, &structs.ServiceSpecificRequest{
+		EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
+		ServiceName:    serviceName,
+	}, "", eventCh))
+
+	testutil.RunStep(t, "initial snapshot", func(t *testing.T) {
+		getEventResult[structs.Intentions](t, eventCh)
+	})
+
+	testutil.RunStep(t, "publish a namespace-wildcard partition", func(t *testing.T) {
+		publisher.Publish([]stream.Event{
+			{
+				Topic: pbsubscribe.Topic_ServiceIntentions,
+				Index: index + 1,
+				Payload: state.EventPayloadConfigEntry{
+					Op: pbsubscribe.ConfigEntryUpdate_Upsert,
+					Value: &structs.ServiceIntentionsConfigEntry{
+						Name:           structs.WildcardSpecifier,
+						EnterpriseMeta: *acl.WildcardEnterpriseMeta(),
+						Sources: []*structs.SourceIntention{
+							{Name: structs.WildcardSpecifier, Action: structs.IntentionActionAllow, Precedence: 1},
+						},
+					},
+				},
+			},
+		})
+
+		result := getEventResult[structs.Intentions](t, eventCh)
+		require.Len(t, result, 1)
+	})
+}
diff --git a/agent/proxycfg-glue/intentions_test.go b/agent/proxycfg-glue/intentions_test.go
index 0e1ab10918865..5c4701e642d81 100644
--- a/agent/proxycfg-glue/intentions_test.go
+++ b/agent/proxycfg-glue/intentions_test.go
@@ -1,12 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
 	"context"
 	"sync"
 	"testing"
+	"time"
 
 	"github.com/hashicorp/go-hclog"
 	"github.com/stretchr/testify/require"
@@ -14,47 +12,39 @@ import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/acl/resolver"
 	"github.com/hashicorp/consul/agent/consul/state"
+	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
+	"github.com/hashicorp/consul/agent/submatview"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
 func TestServerIntentions(t *testing.T) {
-	nextIndex := indexGenerator()
-
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-
-	store := state.NewStateStore(nil)
-
 	const (
 		serviceName = "web"
 		index       = 1
 	)
-	require.NoError(t, store.SystemMetadataSet(1, &structs.SystemMetadataEntry{
-		Key:   structs.SystemMetadataIntentionFormatKey,
-		Value: structs.SystemMetadataIntentionFormatConfigValue,
-	}))
-	require.NoError(t, store.EnsureConfigEntry(nextIndex(), &structs.ServiceIntentionsConfigEntry{
-		Name: serviceName,
-		Sources: []*structs.SourceIntention{
-			{
-				Name:   "db",
-				Action: structs.IntentionActionAllow,
-			},
-		},
-	}))
-
-	authz := policyAuthorizer(t, `
-		service "web" { policy = "read" }
-	`)
 
 	logger := hclog.NewNullLogger()
 
+	ctx, cancel := context.WithCancel(context.Background())
+	t.Cleanup(cancel)
+
+	store := submatview.NewStore(logger)
+	go store.Run(ctx)
+
+	publisher := stream.NewEventPublisher(10 * time.Second)
+	publisher.RegisterHandler(pbsubscribe.Topic_ServiceIntentions,
+		func(stream.SubscribeRequest, stream.SnapshotAppender) (uint64, error) { return index, nil },
+		false)
+	go publisher.Run(ctx)
+
 	intentions := ServerIntentions(ServerDataSourceDeps{
-		ACLResolver: newStaticResolver(authz),
-		Logger:      logger,
-		GetStore:    func() Store { return store },
+		ACLResolver:    newStaticResolver(acl.ManageAll()),
+		ViewStore:      store,
+		EventPublisher: publisher,
+		Logger:         logger,
 	})
 
 	eventCh := make(chan proxycfg.UpdateEvent)
@@ -64,7 +54,27 @@ func TestServerIntentions(t *testing.T) {
 	}, "", eventCh))
 
 	testutil.RunStep(t, "initial snapshot", func(t *testing.T) {
-		result := getEventResult[structs.SimplifiedIntentions](t, eventCh)
+		getEventResult[structs.Intentions](t, eventCh)
+	})
+
+	testutil.RunStep(t, "publishing an explicit intention", func(t *testing.T) {
+		publisher.Publish([]stream.Event{
+			{
+				Topic: pbsubscribe.Topic_ServiceIntentions,
+				Index: index + 1,
+				Payload: state.EventPayloadConfigEntry{
+					Op: pbsubscribe.ConfigEntryUpdate_Upsert,
+					Value: &structs.ServiceIntentionsConfigEntry{
+						Name: serviceName,
+						Sources: []*structs.SourceIntention{
+							{Name: "db", Action: structs.IntentionActionAllow, Precedence: 1},
+						},
+					},
+				},
+			},
+		})
+
+		result := getEventResult[structs.Intentions](t, eventCh)
 		require.Len(t, result, 1)
 
 		intention := result[0]
@@ -72,85 +82,53 @@ func TestServerIntentions(t *testing.T) {
 		require.Equal(t, intention.SourceName, "db")
 	})
 
-	testutil.RunStep(t, "updating an intention", func(t *testing.T) {
-		require.NoError(t, store.EnsureConfigEntry(nextIndex(), &structs.ServiceIntentionsConfigEntry{
-			Name: serviceName,
-			Sources: []*structs.SourceIntention{
-				{
-					Name:   "api",
-					Action: structs.IntentionActionAllow,
-				},
-				{
-					Name:   "db",
-					Action: structs.IntentionActionAllow,
+	testutil.RunStep(t, "publishing a wildcard intention", func(t *testing.T) {
+		publisher.Publish([]stream.Event{
+			{
+				Topic: pbsubscribe.Topic_ServiceIntentions,
+				Index: index + 2,
+				Payload: state.EventPayloadConfigEntry{
+					Op: pbsubscribe.ConfigEntryUpdate_Upsert,
+					Value: &structs.ServiceIntentionsConfigEntry{
+						Name: structs.WildcardSpecifier,
+						Sources: []*structs.SourceIntention{
+							{Name: structs.WildcardSpecifier, Action: structs.IntentionActionAllow, Precedence: 0},
+						},
+					},
 				},
 			},
-		}))
+		})
 
-		result := getEventResult[structs.SimplifiedIntentions](t, eventCh)
+		result := getEventResult[structs.Intentions](t, eventCh)
 		require.Len(t, result, 2)
 
-		for i, src := range []string{"api", "db"} {
-			intention := result[i]
-			require.Equal(t, intention.DestinationName, serviceName)
-			require.Equal(t, intention.SourceName, src)
-		}
-	})
-
-	testutil.RunStep(t, "publishing a delete event", func(t *testing.T) {
-		require.NoError(t, store.DeleteConfigEntry(nextIndex(), structs.ServiceIntentions, serviceName, nil))
+		a := result[0]
+		require.Equal(t, a.DestinationName, serviceName)
+		require.Equal(t, a.SourceName, "db")
 
-		result := getEventResult[structs.SimplifiedIntentions](t, eventCh)
-		require.Len(t, result, 0)
+		b := result[1]
+		require.Equal(t, b.DestinationName, structs.WildcardSpecifier)
+		require.Equal(t, b.SourceName, structs.WildcardSpecifier)
 	})
-}
-
-func TestServerIntentions_ACLDeny(t *testing.T) {
-	nextIndex := indexGenerator()
 
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-
-	store := state.NewStateStore(nil)
-
-	const (
-		serviceName = "web"
-		index       = 1
-	)
-	require.NoError(t, store.SystemMetadataSet(1, &structs.SystemMetadataEntry{
-		Key:   structs.SystemMetadataIntentionFormatKey,
-		Value: structs.SystemMetadataIntentionFormatConfigValue,
-	}))
-	require.NoError(t, store.EnsureConfigEntry(nextIndex(), &structs.ServiceIntentionsConfigEntry{
-		Name: serviceName,
-		Sources: []*structs.SourceIntention{
+	testutil.RunStep(t, "publishing a delete event", func(t *testing.T) {
+		publisher.Publish([]stream.Event{
 			{
-				Name:   "db",
-				Action: structs.IntentionActionAllow,
+				Topic: pbsubscribe.Topic_ServiceIntentions,
+				Index: index + 3,
+				Payload: state.EventPayloadConfigEntry{
+					Op: pbsubscribe.ConfigEntryUpdate_Delete,
+					Value: &structs.ServiceIntentionsConfigEntry{
+						Name: serviceName,
+					},
+				},
 			},
-		},
-	}))
-
-	authz := policyAuthorizer(t, ``)
+		})
 
-	logger := hclog.NewNullLogger()
-
-	intentions := ServerIntentions(ServerDataSourceDeps{
-		ACLResolver: newStaticResolver(authz),
-		Logger:      logger,
-		GetStore:    func() Store { return store },
+		result := getEventResult[structs.Intentions](t, eventCh)
+		require.Len(t, result, 1)
 	})
 
-	eventCh := make(chan proxycfg.UpdateEvent)
-	require.NoError(t, intentions.Notify(ctx, &structs.ServiceSpecificRequest{
-		ServiceName:    serviceName,
-		EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-	}, "", eventCh))
-
-	testutil.RunStep(t, "initial snapshot", func(t *testing.T) {
-		result := getEventResult[structs.SimplifiedIntentions](t, eventCh)
-		require.Len(t, result, 0)
-	})
 }
 
 type staticResolver struct {
diff --git a/agent/proxycfg-glue/internal_service_dump.go b/agent/proxycfg-glue/internal_service_dump.go
index d1c701083d520..1704da2725d61 100644
--- a/agent/proxycfg-glue/internal_service_dump.go
+++ b/agent/proxycfg-glue/internal_service_dump.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/internal_service_dump_test.go b/agent/proxycfg-glue/internal_service_dump_test.go
index 1eba4c043828c..66245c52a2368 100644
--- a/agent/proxycfg-glue/internal_service_dump_test.go
+++ b/agent/proxycfg-glue/internal_service_dump_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/leafcerts.go b/agent/proxycfg-glue/leafcerts.go
deleted file mode 100644
index b805586a154a3..0000000000000
--- a/agent/proxycfg-glue/leafcerts.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxycfgglue
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/agent/leafcert"
-	"github.com/hashicorp/consul/agent/proxycfg"
-)
-
-// LocalLeafCerts satisfies the proxycfg.LeafCertificate interface by sourcing data from
-// the given leafcert.Manager.
-func LocalLeafCerts(m *leafcert.Manager) proxycfg.LeafCertificate {
-	return &localLeafCerts{m}
-}
-
-type localLeafCerts struct {
-	leafCertManager *leafcert.Manager
-}
-
-func (c *localLeafCerts) Notify(ctx context.Context, req *leafcert.ConnectCALeafRequest, correlationID string, ch chan<- proxycfg.UpdateEvent) error {
-	return c.leafCertManager.NotifyCallback(ctx, req, correlationID, dispatchCacheUpdate(ch))
-}
diff --git a/agent/proxycfg-glue/peered_upstreams.go b/agent/proxycfg-glue/peered_upstreams.go
index f345c26df572e..d87c1046ab0a7 100644
--- a/agent/proxycfg-glue/peered_upstreams.go
+++ b/agent/proxycfg-glue/peered_upstreams.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/peered_upstreams_test.go b/agent/proxycfg-glue/peered_upstreams_test.go
index 026fd67a3455f..e480e805983d3 100644
--- a/agent/proxycfg-glue/peered_upstreams_test.go
+++ b/agent/proxycfg-glue/peered_upstreams_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/peering_list.go b/agent/proxycfg-glue/peering_list.go
index 6e7a78c707f15..559eeba15e614 100644
--- a/agent/proxycfg-glue/peering_list.go
+++ b/agent/proxycfg-glue/peering_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
@@ -14,7 +11,7 @@ import (
 	"github.com/hashicorp/consul/agent/consul/watch"
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 // CachePeeringList satisfies the proxycfg.PeeringList interface by sourcing
diff --git a/agent/proxycfg-glue/peering_list_test.go b/agent/proxycfg-glue/peering_list_test.go
index 575d161b4e5d3..22f5335d3c7eb 100644
--- a/agent/proxycfg-glue/peering_list_test.go
+++ b/agent/proxycfg-glue/peering_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
@@ -13,7 +10,7 @@ import (
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
diff --git a/agent/proxycfg-glue/resolved_service_config.go b/agent/proxycfg-glue/resolved_service_config.go
index 11654cd767b2e..c44d08ff1d612 100644
--- a/agent/proxycfg-glue/resolved_service_config.go
+++ b/agent/proxycfg-glue/resolved_service_config.go
@@ -1,10 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
 	"context"
+	"errors"
 
 	"github.com/hashicorp/go-memdb"
 
@@ -40,6 +38,10 @@ func (s *serverResolvedServiceConfig) Notify(ctx context.Context, req *structs.S
 		return s.remoteSource.Notify(ctx, req, correlationID, ch)
 	}
 
+	if len(req.UpstreamIDs) != 0 {
+		return errors.New("ServerResolvedServiceConfig does not support the legacy UpstreamIDs parameter")
+	}
+
 	return watch.ServerLocalNotify(ctx, correlationID, s.deps.GetStore,
 		func(ws memdb.WatchSet, store Store) (uint64, *structs.ServiceConfigResponse, error) {
 			var authzContext acl.AuthorizerContext
diff --git a/agent/proxycfg-glue/resolved_service_config_test.go b/agent/proxycfg-glue/resolved_service_config_test.go
index 248ab4eab363f..3f165aa555e5b 100644
--- a/agent/proxycfg-glue/resolved_service_config_test.go
+++ b/agent/proxycfg-glue/resolved_service_config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/service_http_checks.go b/agent/proxycfg-glue/service_http_checks.go
index 2d0a9dfcff51f..da62c516749e0 100644
--- a/agent/proxycfg-glue/service_http_checks.go
+++ b/agent/proxycfg-glue/service_http_checks.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/service_http_checks_test.go b/agent/proxycfg-glue/service_http_checks_test.go
index 87bdfc7abe609..d1a6df34f57bc 100644
--- a/agent/proxycfg-glue/service_http_checks_test.go
+++ b/agent/proxycfg-glue/service_http_checks_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
diff --git a/agent/proxycfg-glue/service_list.go b/agent/proxycfg-glue/service_list.go
index f4a9380df715a..14dc13f31b595 100644
--- a/agent/proxycfg-glue/service_list.go
+++ b/agent/proxycfg-glue/service_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
@@ -13,8 +10,8 @@ import (
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/submatview"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbcommon"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // CacheServiceList satisfies the proxycfg.ServiceList interface by sourcing
@@ -125,35 +122,3 @@ func (v *serviceListView) Result(index uint64) any {
 		},
 	}
 }
-
-// filterByEnterpriseMeta filters the given set of events to remove those that
-// don't match the request's enterprise meta - this is necessary because when
-// subscribing to a topic with SubjectWildcard we'll get events for resources
-// in all partitions and namespaces.
-func filterByEnterpriseMeta(events []*pbsubscribe.Event, entMeta acl.EnterpriseMeta) []*pbsubscribe.Event {
-	partition := entMeta.PartitionOrDefault()
-	namespace := entMeta.NamespaceOrDefault()
-
-	filtered := make([]*pbsubscribe.Event, 0, len(events))
-	for _, event := range events {
-		var eventEntMeta *pbcommon.EnterpriseMeta
-		switch payload := event.Payload.(type) {
-		case *pbsubscribe.Event_ConfigEntry:
-			eventEntMeta = payload.ConfigEntry.ConfigEntry.GetEnterpriseMeta()
-		case *pbsubscribe.Event_Service:
-			eventEntMeta = payload.Service.GetEnterpriseMeta()
-		default:
-			continue
-		}
-
-		if partition != acl.WildcardName && !acl.EqualPartitions(partition, eventEntMeta.GetPartition()) {
-			continue
-		}
-		if namespace != acl.WildcardName && !acl.EqualNamespaces(namespace, eventEntMeta.GetNamespace()) {
-			continue
-		}
-
-		filtered = append(filtered, event)
-	}
-	return filtered
-}
diff --git a/agent/proxycfg-glue/service_list_test.go b/agent/proxycfg-glue/service_list_test.go
index c6372aaf4ea1d..eedb211b33041 100644
--- a/agent/proxycfg-glue/service_list_test.go
+++ b/agent/proxycfg-glue/service_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
@@ -18,7 +15,7 @@ import (
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/submatview"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
diff --git a/agent/proxycfg-glue/trust_bundle.go b/agent/proxycfg-glue/trust_bundle.go
index f623d2a5555c9..fbf03bcd4e7f1 100644
--- a/agent/proxycfg-glue/trust_bundle.go
+++ b/agent/proxycfg-glue/trust_bundle.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
@@ -16,7 +13,7 @@ import (
 	"github.com/hashicorp/consul/agent/consul/watch"
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 // CacheTrustBundle satisfies the proxycfg.TrustBundle interface by sourcing
diff --git a/agent/proxycfg-glue/trust_bundle_test.go b/agent/proxycfg-glue/trust_bundle_test.go
index e2082e3d240be..878b42df81da5 100644
--- a/agent/proxycfg-glue/trust_bundle_test.go
+++ b/agent/proxycfg-glue/trust_bundle_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfgglue
 
 import (
@@ -16,7 +13,7 @@ import (
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
diff --git a/agent/proxycfg-sources/catalog/config_source.go b/agent/proxycfg-sources/catalog/config_source.go
index 9ded9aa7fd4ed..3ba1fc83b8bb5 100644
--- a/agent/proxycfg-sources/catalog/config_source.go
+++ b/agent/proxycfg-sources/catalog/config_source.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package catalog
 
 import (
@@ -17,8 +14,6 @@ import (
 	"github.com/hashicorp/consul/agent/local"
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
 const source proxycfg.ProxySource = "catalog"
@@ -50,13 +45,11 @@ func NewConfigSource(cfg Config) *ConfigSource {
 
 // Watch wraps the underlying proxycfg.Manager and dynamically registers
 // services from the catalog with it when requested by the xDS server.
-func (m *ConfigSource) Watch(id *pbresource.ID, nodeName string, token string) (<-chan proxysnapshot.ProxySnapshot, limiter.SessionTerminatedChan, proxysnapshot.CancelFunc, error) {
-	// Create service ID
-	serviceID := structs.NewServiceID(id.Name, GetEnterpriseMetaFromResourceID(id))
+func (m *ConfigSource) Watch(serviceID structs.ServiceID, nodeName string, token string) (<-chan *proxycfg.ConfigSnapshot, limiter.SessionTerminatedChan, proxycfg.CancelFunc, error) {
 	// If the service is registered to the local agent, use the LocalConfigSource
 	// rather than trying to configure it from the catalog.
 	if nodeName == m.NodeName && m.LocalState.ServiceExists(serviceID) {
-		return m.LocalConfigSource.Watch(id, nodeName, token)
+		return m.LocalConfigSource.Watch(serviceID, nodeName, token)
 	}
 
 	// Begin a session with the xDS session concurrency limiter.
@@ -280,7 +273,7 @@ type Config struct {
 
 //go:generate mockery --name ConfigManager --inpackage
 type ConfigManager interface {
-	Watch(req proxycfg.ProxyID) (<-chan proxysnapshot.ProxySnapshot, proxysnapshot.CancelFunc)
+	Watch(req proxycfg.ProxyID) (<-chan *proxycfg.ConfigSnapshot, proxycfg.CancelFunc)
 	Register(proxyID proxycfg.ProxyID, service *structs.NodeService, source proxycfg.ProxySource, token string, overwrite bool) error
 	Deregister(proxyID proxycfg.ProxyID, source proxycfg.ProxySource)
 }
@@ -293,11 +286,10 @@ type Store interface {
 
 //go:generate mockery --name Watcher --inpackage
 type Watcher interface {
-	Watch(proxyID *pbresource.ID, nodeName string, token string) (<-chan proxysnapshot.ProxySnapshot, limiter.SessionTerminatedChan, proxysnapshot.CancelFunc, error)
+	Watch(proxyID structs.ServiceID, nodeName string, token string) (<-chan *proxycfg.ConfigSnapshot, limiter.SessionTerminatedChan, proxycfg.CancelFunc, error)
 }
 
 //go:generate mockery --name SessionLimiter --inpackage
 type SessionLimiter interface {
 	BeginSession() (limiter.Session, error)
-	Run(ctx context.Context)
 }
diff --git a/agent/proxycfg-sources/catalog/config_source_oss.go b/agent/proxycfg-sources/catalog/config_source_oss.go
deleted file mode 100644
index 233ad64cee8fa..0000000000000
--- a/agent/proxycfg-sources/catalog/config_source_oss.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package catalog
-
-import (
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func GetEnterpriseMetaFromResourceID(id *pbresource.ID) *acl.EnterpriseMeta {
-	return acl.DefaultEnterpriseMeta()
-}
diff --git a/agent/proxycfg-sources/catalog/config_source_test.go b/agent/proxycfg-sources/catalog/config_source_test.go
index 94d939e8cad5e..c6c0e9d8b60ef 100644
--- a/agent/proxycfg-sources/catalog/config_source_test.go
+++ b/agent/proxycfg-sources/catalog/config_source_test.go
@@ -1,10 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package catalog
 
 import (
-	"context"
 	"errors"
 	"testing"
 	"time"
@@ -20,9 +16,6 @@ import (
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/token"
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
 )
 
 func TestConfigSource_Success(t *testing.T) {
@@ -79,15 +72,15 @@ func TestConfigSource_Success(t *testing.T) {
 	})
 	t.Cleanup(mgr.Shutdown)
 
-	snapCh, termCh, cancelWatch1, err := mgr.Watch(rtest.Resource(pbmesh.ProxyConfigurationType, serviceID.ID).ID(), nodeName, token)
+	snapCh, termCh, cancelWatch1, err := mgr.Watch(serviceID, nodeName, token)
 	require.NoError(t, err)
 	require.Equal(t, session1TermCh, termCh)
 
 	// Expect Register to have been called with the proxy's inital port.
 	select {
 	case snap := <-snapCh:
-		require.Equal(t, 9999, snap.(*proxycfg.ConfigSnapshot).Port)
-		require.Equal(t, token, snap.(*proxycfg.ConfigSnapshot).ProxyID.Token)
+		require.Equal(t, 9999, snap.Port)
+		require.Equal(t, token, snap.ProxyID.Token)
 	case <-time.After(100 * time.Millisecond):
 		t.Fatal("timeout waiting for snapshot")
 	}
@@ -111,7 +104,7 @@ func TestConfigSource_Success(t *testing.T) {
 	// Expect Register to have been called again with the proxy's new port.
 	select {
 	case snap := <-snapCh:
-		require.Equal(t, 8888, snap.(*proxycfg.ConfigSnapshot).Port)
+		require.Equal(t, 8888, snap.Port)
 	case <-time.After(100 * time.Millisecond):
 		t.Fatal("timeout waiting for snapshot")
 	}
@@ -130,13 +123,13 @@ func TestConfigSource_Success(t *testing.T) {
 		require.Equal(t, map[string]any{
 			"local_connect_timeout_ms": 123,
 			"max_inbound_connections":  321,
-		}, snap.(*proxycfg.ConfigSnapshot).Proxy.Config)
+		}, snap.Proxy.Config)
 	case <-time.After(100 * time.Millisecond):
 		t.Fatal("timeout waiting for snapshot")
 	}
 
 	// Start another watch.
-	_, termCh2, cancelWatch2, err := mgr.Watch(rtest.Resource(pbmesh.ProxyConfigurationType, serviceID.ID).ID(), nodeName, token)
+	_, termCh2, cancelWatch2, err := mgr.Watch(serviceID, nodeName, token)
 	require.NoError(t, err)
 	require.Equal(t, session2TermCh, termCh2)
 
@@ -170,7 +163,6 @@ func TestConfigSource_Success(t *testing.T) {
 
 func TestConfigSource_LocallyManagedService(t *testing.T) {
 	serviceID := structs.NewServiceID("web-sidecar-proxy-1", nil)
-	proxyID := rtest.Resource(pbmesh.ProxyConfigurationType, serviceID.ID).ID()
 	nodeName := "node-1"
 	token := "token"
 
@@ -178,8 +170,8 @@ func TestConfigSource_LocallyManagedService(t *testing.T) {
 	localState.AddServiceWithChecks(&structs.NodeService{ID: serviceID.ID}, nil, "", false)
 
 	localWatcher := NewMockWatcher(t)
-	localWatcher.On("Watch", proxyID, nodeName, token).
-		Return(make(<-chan proxysnapshot.ProxySnapshot), nil, proxysnapshot.CancelFunc(func() {}), nil)
+	localWatcher.On("Watch", serviceID, nodeName, token).
+		Return(make(<-chan *proxycfg.ConfigSnapshot), nil, proxycfg.CancelFunc(func() {}), nil)
 
 	mgr := NewConfigSource(Config{
 		NodeName:          nodeName,
@@ -191,7 +183,7 @@ func TestConfigSource_LocallyManagedService(t *testing.T) {
 	})
 	t.Cleanup(mgr.Shutdown)
 
-	_, _, _, err := mgr.Watch(proxyID, nodeName, token)
+	_, _, _, err := mgr.Watch(serviceID, nodeName, token)
 	require.NoError(t, err)
 }
 
@@ -213,12 +205,12 @@ func TestConfigSource_ErrorRegisteringService(t *testing.T) {
 	}))
 
 	var canceledWatch bool
-	cancel := proxysnapshot.CancelFunc(func() { canceledWatch = true })
+	cancel := proxycfg.CancelFunc(func() { canceledWatch = true })
 
 	cfgMgr := NewMockConfigManager(t)
 
 	cfgMgr.On("Watch", mock.Anything).
-		Return(make(<-chan proxysnapshot.ProxySnapshot), cancel)
+		Return(make(<-chan *proxycfg.ConfigSnapshot), cancel)
 
 	cfgMgr.On("Register", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
 		Return(errors.New("KABOOM"))
@@ -238,7 +230,7 @@ func TestConfigSource_ErrorRegisteringService(t *testing.T) {
 	})
 	t.Cleanup(mgr.Shutdown)
 
-	_, _, _, err := mgr.Watch(rtest.Resource(pbmesh.ProxyConfigurationType, serviceID.ID).ID(), nodeName, token)
+	_, _, _, err := mgr.Watch(serviceID, nodeName, token)
 	require.Error(t, err)
 	require.True(t, canceledWatch, "watch should've been canceled")
 
@@ -263,12 +255,12 @@ func TestConfigSource_NotProxyService(t *testing.T) {
 	}))
 
 	var canceledWatch bool
-	cancel := proxysnapshot.CancelFunc(func() { canceledWatch = true })
+	cancel := proxycfg.CancelFunc(func() { canceledWatch = true })
 
 	cfgMgr := NewMockConfigManager(t)
 
 	cfgMgr.On("Watch", mock.Anything).
-		Return(make(<-chan proxysnapshot.ProxySnapshot), cancel)
+		Return(make(<-chan *proxycfg.ConfigSnapshot), cancel)
 
 	mgr := NewConfigSource(Config{
 		Manager:        cfgMgr,
@@ -279,7 +271,7 @@ func TestConfigSource_NotProxyService(t *testing.T) {
 	})
 	t.Cleanup(mgr.Shutdown)
 
-	_, _, _, err := mgr.Watch(rtest.Resource(pbmesh.ProxyConfigurationType, serviceID.ID).ID(), nodeName, token)
+	_, _, _, err := mgr.Watch(serviceID, nodeName, token)
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "must be a sidecar proxy or gateway")
 	require.True(t, canceledWatch, "watch should've been canceled")
@@ -296,7 +288,7 @@ func TestConfigSource_SessionLimiterError(t *testing.T) {
 	t.Cleanup(src.Shutdown)
 
 	_, _, _, err := src.Watch(
-		rtest.Resource(pbmesh.ProxyConfigurationType, "web-sidecar-proxy-1").ID(),
+		structs.NewServiceID("web-sidecar-proxy-1", nil),
 		"node-name",
 		"token",
 	)
@@ -314,9 +306,9 @@ func testConfigManager(t *testing.T, serviceID structs.ServiceID, nodeName strin
 		Token:     token,
 	}
 
-	snapCh := make(chan proxysnapshot.ProxySnapshot, 1)
+	snapCh := make(chan *proxycfg.ConfigSnapshot, 1)
 	cfgMgr.On("Watch", proxyID).
-		Return((<-chan proxysnapshot.ProxySnapshot)(snapCh), proxysnapshot.CancelFunc(func() {}), nil)
+		Return((<-chan *proxycfg.ConfigSnapshot)(snapCh), proxycfg.CancelFunc(func() {}), nil)
 
 	cfgMgr.On("Register", mock.Anything, mock.Anything, source, token, false).
 		Run(func(args mock.Arguments) {
@@ -360,8 +352,6 @@ func (nullSessionLimiter) BeginSession() (limiter.Session, error) {
 	return nullSession{}, nil
 }
 
-func (nullSessionLimiter) Run(ctx context.Context) {}
-
 type nullSession struct{}
 
 func (nullSession) End() {}
diff --git a/agent/proxycfg-sources/catalog/mock_ConfigManager.go b/agent/proxycfg-sources/catalog/mock_ConfigManager.go
index 37deffb022d8e..3ae51c5f6a95f 100644
--- a/agent/proxycfg-sources/catalog/mock_ConfigManager.go
+++ b/agent/proxycfg-sources/catalog/mock_ConfigManager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.33.1. DO NOT EDIT.
+// Code generated by mockery v2.15.0. DO NOT EDIT.
 
 package catalog
 
@@ -6,8 +6,6 @@ import (
 	proxycfg "github.com/hashicorp/consul/agent/proxycfg"
 	mock "github.com/stretchr/testify/mock"
 
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
-
 	structs "github.com/hashicorp/consul/agent/structs"
 )
 
@@ -36,39 +34,37 @@ func (_m *MockConfigManager) Register(proxyID proxycfg.ProxyID, service *structs
 }
 
 // Watch provides a mock function with given fields: req
-func (_m *MockConfigManager) Watch(req proxycfg.ProxyID) (<-chan proxysnapshot.ProxySnapshot, proxysnapshot.CancelFunc) {
+func (_m *MockConfigManager) Watch(req proxycfg.ProxyID) (<-chan *proxycfg.ConfigSnapshot, proxycfg.CancelFunc) {
 	ret := _m.Called(req)
 
-	var r0 <-chan proxysnapshot.ProxySnapshot
-	var r1 proxysnapshot.CancelFunc
-	if rf, ok := ret.Get(0).(func(proxycfg.ProxyID) (<-chan proxysnapshot.ProxySnapshot, proxysnapshot.CancelFunc)); ok {
-		return rf(req)
-	}
-	if rf, ok := ret.Get(0).(func(proxycfg.ProxyID) <-chan proxysnapshot.ProxySnapshot); ok {
+	var r0 <-chan *proxycfg.ConfigSnapshot
+	if rf, ok := ret.Get(0).(func(proxycfg.ProxyID) <-chan *proxycfg.ConfigSnapshot); ok {
 		r0 = rf(req)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(<-chan proxysnapshot.ProxySnapshot)
+			r0 = ret.Get(0).(<-chan *proxycfg.ConfigSnapshot)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(proxycfg.ProxyID) proxysnapshot.CancelFunc); ok {
+	var r1 proxycfg.CancelFunc
+	if rf, ok := ret.Get(1).(func(proxycfg.ProxyID) proxycfg.CancelFunc); ok {
 		r1 = rf(req)
 	} else {
 		if ret.Get(1) != nil {
-			r1 = ret.Get(1).(proxysnapshot.CancelFunc)
+			r1 = ret.Get(1).(proxycfg.CancelFunc)
 		}
 	}
 
 	return r0, r1
 }
 
-// NewMockConfigManager creates a new instance of MockConfigManager. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockConfigManager(t interface {
+type mockConstructorTestingTNewMockConfigManager interface {
 	mock.TestingT
 	Cleanup(func())
-}) *MockConfigManager {
+}
+
+// NewMockConfigManager creates a new instance of MockConfigManager. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+func NewMockConfigManager(t mockConstructorTestingTNewMockConfigManager) *MockConfigManager {
 	mock := &MockConfigManager{}
 	mock.Mock.Test(t)
 
diff --git a/agent/proxycfg-sources/catalog/mock_SessionLimiter.go b/agent/proxycfg-sources/catalog/mock_SessionLimiter.go
index 39cd430f06d3d..3b7147cb064c6 100644
--- a/agent/proxycfg-sources/catalog/mock_SessionLimiter.go
+++ b/agent/proxycfg-sources/catalog/mock_SessionLimiter.go
@@ -1,10 +1,8 @@
-// Code generated by mockery v2.33.1. DO NOT EDIT.
+// Code generated by mockery v2.15.0. DO NOT EDIT.
 
 package catalog
 
 import (
-	context "context"
-
 	limiter "github.com/hashicorp/consul/agent/grpc-external/limiter"
 	mock "github.com/stretchr/testify/mock"
 )
@@ -19,10 +17,6 @@ func (_m *MockSessionLimiter) BeginSession() (limiter.Session, error) {
 	ret := _m.Called()
 
 	var r0 limiter.Session
-	var r1 error
-	if rf, ok := ret.Get(0).(func() (limiter.Session, error)); ok {
-		return rf()
-	}
 	if rf, ok := ret.Get(0).(func() limiter.Session); ok {
 		r0 = rf()
 	} else {
@@ -31,6 +25,7 @@ func (_m *MockSessionLimiter) BeginSession() (limiter.Session, error) {
 		}
 	}
 
+	var r1 error
 	if rf, ok := ret.Get(1).(func() error); ok {
 		r1 = rf()
 	} else {
@@ -40,17 +35,13 @@ func (_m *MockSessionLimiter) BeginSession() (limiter.Session, error) {
 	return r0, r1
 }
 
-// Run provides a mock function with given fields: ctx
-func (_m *MockSessionLimiter) Run(ctx context.Context) {
-	_m.Called(ctx)
+type mockConstructorTestingTNewMockSessionLimiter interface {
+	mock.TestingT
+	Cleanup(func())
 }
 
 // NewMockSessionLimiter creates a new instance of MockSessionLimiter. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockSessionLimiter(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockSessionLimiter {
+func NewMockSessionLimiter(t mockConstructorTestingTNewMockSessionLimiter) *MockSessionLimiter {
 	mock := &MockSessionLimiter{}
 	mock.Mock.Test(t)
 
diff --git a/agent/proxycfg-sources/catalog/mock_Watcher.go b/agent/proxycfg-sources/catalog/mock_Watcher.go
index b77be5d98ea8f..d5ca046a40602 100644
--- a/agent/proxycfg-sources/catalog/mock_Watcher.go
+++ b/agent/proxycfg-sources/catalog/mock_Watcher.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.33.1. DO NOT EDIT.
+// Code generated by mockery v2.15.0. DO NOT EDIT.
 
 package catalog
 
@@ -6,9 +6,9 @@ import (
 	limiter "github.com/hashicorp/consul/agent/grpc-external/limiter"
 	mock "github.com/stretchr/testify/mock"
 
-	pbresource "github.com/hashicorp/consul/proto-public/pbresource"
+	proxycfg "github.com/hashicorp/consul/agent/proxycfg"
 
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
+	structs "github.com/hashicorp/consul/agent/structs"
 )
 
 // MockWatcher is an autogenerated mock type for the Watcher type
@@ -17,25 +17,20 @@ type MockWatcher struct {
 }
 
 // Watch provides a mock function with given fields: proxyID, nodeName, token
-func (_m *MockWatcher) Watch(proxyID *pbresource.ID, nodeName string, token string) (<-chan proxysnapshot.ProxySnapshot, limiter.SessionTerminatedChan, proxysnapshot.CancelFunc, error) {
+func (_m *MockWatcher) Watch(proxyID structs.ServiceID, nodeName string, token string) (<-chan *proxycfg.ConfigSnapshot, limiter.SessionTerminatedChan, proxycfg.CancelFunc, error) {
 	ret := _m.Called(proxyID, nodeName, token)
 
-	var r0 <-chan proxysnapshot.ProxySnapshot
-	var r1 limiter.SessionTerminatedChan
-	var r2 proxysnapshot.CancelFunc
-	var r3 error
-	if rf, ok := ret.Get(0).(func(*pbresource.ID, string, string) (<-chan proxysnapshot.ProxySnapshot, limiter.SessionTerminatedChan, proxysnapshot.CancelFunc, error)); ok {
-		return rf(proxyID, nodeName, token)
-	}
-	if rf, ok := ret.Get(0).(func(*pbresource.ID, string, string) <-chan proxysnapshot.ProxySnapshot); ok {
+	var r0 <-chan *proxycfg.ConfigSnapshot
+	if rf, ok := ret.Get(0).(func(structs.ServiceID, string, string) <-chan *proxycfg.ConfigSnapshot); ok {
 		r0 = rf(proxyID, nodeName, token)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(<-chan proxysnapshot.ProxySnapshot)
+			r0 = ret.Get(0).(<-chan *proxycfg.ConfigSnapshot)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(*pbresource.ID, string, string) limiter.SessionTerminatedChan); ok {
+	var r1 limiter.SessionTerminatedChan
+	if rf, ok := ret.Get(1).(func(structs.ServiceID, string, string) limiter.SessionTerminatedChan); ok {
 		r1 = rf(proxyID, nodeName, token)
 	} else {
 		if ret.Get(1) != nil {
@@ -43,15 +38,17 @@ func (_m *MockWatcher) Watch(proxyID *pbresource.ID, nodeName string, token stri
 		}
 	}
 
-	if rf, ok := ret.Get(2).(func(*pbresource.ID, string, string) proxysnapshot.CancelFunc); ok {
+	var r2 proxycfg.CancelFunc
+	if rf, ok := ret.Get(2).(func(structs.ServiceID, string, string) proxycfg.CancelFunc); ok {
 		r2 = rf(proxyID, nodeName, token)
 	} else {
 		if ret.Get(2) != nil {
-			r2 = ret.Get(2).(proxysnapshot.CancelFunc)
+			r2 = ret.Get(2).(proxycfg.CancelFunc)
 		}
 	}
 
-	if rf, ok := ret.Get(3).(func(*pbresource.ID, string, string) error); ok {
+	var r3 error
+	if rf, ok := ret.Get(3).(func(structs.ServiceID, string, string) error); ok {
 		r3 = rf(proxyID, nodeName, token)
 	} else {
 		r3 = ret.Error(3)
@@ -60,12 +57,13 @@ func (_m *MockWatcher) Watch(proxyID *pbresource.ID, nodeName string, token stri
 	return r0, r1, r2, r3
 }
 
-// NewMockWatcher creates a new instance of MockWatcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockWatcher(t interface {
+type mockConstructorTestingTNewMockWatcher interface {
 	mock.TestingT
 	Cleanup(func())
-}) *MockWatcher {
+}
+
+// NewMockWatcher creates a new instance of MockWatcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+func NewMockWatcher(t mockConstructorTestingTNewMockWatcher) *MockWatcher {
 	mock := &MockWatcher{}
 	mock.Mock.Test(t)
 
diff --git a/agent/proxycfg-sources/local/config_source.go b/agent/proxycfg-sources/local/config_source.go
index 7b3a835fb819d..903ad7a6b1907 100644
--- a/agent/proxycfg-sources/local/config_source.go
+++ b/agent/proxycfg-sources/local/config_source.go
@@ -1,15 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package local
 
 import (
 	"github.com/hashicorp/consul/agent/grpc-external/limiter"
 	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/proxycfg-sources/catalog"
 	structs "github.com/hashicorp/consul/agent/structs"
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
 // ConfigSource wraps a proxycfg.Manager to create watches on services
@@ -23,9 +17,7 @@ func NewConfigSource(cfgMgr ConfigManager) *ConfigSource {
 	return &ConfigSource{cfgMgr}
 }
 
-func (m *ConfigSource) Watch(proxyID *pbresource.ID, nodeName string, _ string) (<-chan proxysnapshot.ProxySnapshot,
-	limiter.SessionTerminatedChan, proxysnapshot.CancelFunc, error) {
-	serviceID := structs.NewServiceID(proxyID.Name, catalog.GetEnterpriseMetaFromResourceID(proxyID))
+func (m *ConfigSource) Watch(serviceID structs.ServiceID, nodeName string, _ string) (<-chan *proxycfg.ConfigSnapshot, limiter.SessionTerminatedChan, proxycfg.CancelFunc, error) {
 	watchCh, cancelWatch := m.manager.Watch(proxycfg.ProxyID{
 		ServiceID: serviceID,
 		NodeName:  nodeName,
diff --git a/agent/proxycfg-sources/local/local.go b/agent/proxycfg-sources/local/local.go
index 44867eb067515..2cdc2875169e6 100644
--- a/agent/proxycfg-sources/local/local.go
+++ b/agent/proxycfg-sources/local/local.go
@@ -1,5 +1,2 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // Package local integrates the proxycfg Manager with the agent's local state.
 package local
diff --git a/agent/proxycfg-sources/local/mock_ConfigManager.go b/agent/proxycfg-sources/local/mock_ConfigManager.go
index e3b2d3a445872..8f2c8fc6c836c 100644
--- a/agent/proxycfg-sources/local/mock_ConfigManager.go
+++ b/agent/proxycfg-sources/local/mock_ConfigManager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.33.1. DO NOT EDIT.
+// Code generated by mockery v2.15.0. DO NOT EDIT.
 
 package local
 
@@ -6,8 +6,6 @@ import (
 	proxycfg "github.com/hashicorp/consul/agent/proxycfg"
 	mock "github.com/stretchr/testify/mock"
 
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
-
 	structs "github.com/hashicorp/consul/agent/structs"
 )
 
@@ -52,39 +50,37 @@ func (_m *MockConfigManager) RegisteredProxies(source proxycfg.ProxySource) []pr
 }
 
 // Watch provides a mock function with given fields: id
-func (_m *MockConfigManager) Watch(id proxycfg.ProxyID) (<-chan proxysnapshot.ProxySnapshot, proxysnapshot.CancelFunc) {
+func (_m *MockConfigManager) Watch(id proxycfg.ProxyID) (<-chan *proxycfg.ConfigSnapshot, proxycfg.CancelFunc) {
 	ret := _m.Called(id)
 
-	var r0 <-chan proxysnapshot.ProxySnapshot
-	var r1 proxysnapshot.CancelFunc
-	if rf, ok := ret.Get(0).(func(proxycfg.ProxyID) (<-chan proxysnapshot.ProxySnapshot, proxysnapshot.CancelFunc)); ok {
-		return rf(id)
-	}
-	if rf, ok := ret.Get(0).(func(proxycfg.ProxyID) <-chan proxysnapshot.ProxySnapshot); ok {
+	var r0 <-chan *proxycfg.ConfigSnapshot
+	if rf, ok := ret.Get(0).(func(proxycfg.ProxyID) <-chan *proxycfg.ConfigSnapshot); ok {
 		r0 = rf(id)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(<-chan proxysnapshot.ProxySnapshot)
+			r0 = ret.Get(0).(<-chan *proxycfg.ConfigSnapshot)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(proxycfg.ProxyID) proxysnapshot.CancelFunc); ok {
+	var r1 proxycfg.CancelFunc
+	if rf, ok := ret.Get(1).(func(proxycfg.ProxyID) proxycfg.CancelFunc); ok {
 		r1 = rf(id)
 	} else {
 		if ret.Get(1) != nil {
-			r1 = ret.Get(1).(proxysnapshot.CancelFunc)
+			r1 = ret.Get(1).(proxycfg.CancelFunc)
 		}
 	}
 
 	return r0, r1
 }
 
-// NewMockConfigManager creates a new instance of MockConfigManager. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockConfigManager(t interface {
+type mockConstructorTestingTNewMockConfigManager interface {
 	mock.TestingT
 	Cleanup(func())
-}) *MockConfigManager {
+}
+
+// NewMockConfigManager creates a new instance of MockConfigManager. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+func NewMockConfigManager(t mockConstructorTestingTNewMockConfigManager) *MockConfigManager {
 	mock := &MockConfigManager{}
 	mock.Mock.Test(t)
 
diff --git a/agent/proxycfg-sources/local/sync.go b/agent/proxycfg-sources/local/sync.go
index b5583db43a3df..5702d2f36841a 100644
--- a/agent/proxycfg-sources/local/sync.go
+++ b/agent/proxycfg-sources/local/sync.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package local
 
 import (
 	"context"
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
 	"time"
 
 	"github.com/hashicorp/go-hclog"
@@ -136,7 +132,7 @@ func sync(cfg SyncConfig) {
 
 //go:generate mockery --name ConfigManager --inpackage
 type ConfigManager interface {
-	Watch(id proxycfg.ProxyID) (<-chan proxysnapshot.ProxySnapshot, proxysnapshot.CancelFunc)
+	Watch(id proxycfg.ProxyID) (<-chan *proxycfg.ConfigSnapshot, proxycfg.CancelFunc)
 	Register(proxyID proxycfg.ProxyID, service *structs.NodeService, source proxycfg.ProxySource, token string, overwrite bool) error
 	Deregister(proxyID proxycfg.ProxyID, source proxycfg.ProxySource)
 	RegisteredProxies(source proxycfg.ProxySource) []proxycfg.ProxyID
diff --git a/agent/proxycfg-sources/local/sync_test.go b/agent/proxycfg-sources/local/sync_test.go
index 5aa030db4cfc2..c41f7fd9ad9d9 100644
--- a/agent/proxycfg-sources/local/sync_test.go
+++ b/agent/proxycfg-sources/local/sync_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package local
 
 import (
diff --git a/agent/proxycfg/api_gateway.go b/agent/proxycfg/api_gateway.go
index 43798239a3535..315fc11029ea1 100644
--- a/agent/proxycfg/api_gateway.go
+++ b/agent/proxycfg/api_gateway.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -8,10 +5,10 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/leafcert"
+	cachetype "github.com/hashicorp/consul/agent/cache-types"
 	"github.com/hashicorp/consul/agent/proxycfg/internal/watch"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 var _ kindHandler = (*handlerAPIGateway)(nil)
@@ -54,11 +51,6 @@ func (h *handlerAPIGateway) initialize(ctx context.Context) (ConfigSnapshot, err
 		return snap, err
 	}
 
-	err = watchJWTProviders(ctx, h)
-	if err != nil {
-		return snap, err
-	}
-
 	snap.APIGateway.Listeners = make(map[string]structs.APIGatewayListener)
 	snap.APIGateway.BoundListeners = make(map[string]structs.BoundAPIGatewayListener)
 	snap.APIGateway.HTTPRoutes = watch.NewMap[structs.ResourceReference, *structs.HTTPRouteConfigEntry]()
@@ -102,40 +94,32 @@ func (h *handlerAPIGateway) handleUpdate(ctx context.Context, u UpdateEvent, sna
 		return fmt.Errorf("error filling agent cache: %v", u.Err)
 	}
 
-	switch u.CorrelationID {
-	case rootsWatchID:
+	switch {
+	case u.CorrelationID == rootsWatchID:
 		// Handle change in the CA roots
 		if err := h.handleRootCAUpdate(u, snap); err != nil {
 			return err
 		}
-	case apiGatewayConfigWatchID, boundGatewayConfigWatchID:
+	case u.CorrelationID == apiGatewayConfigWatchID || u.CorrelationID == boundGatewayConfigWatchID:
 		// Handle change in the api-gateway or bound-api-gateway config entry
 		if err := h.handleGatewayConfigUpdate(ctx, u, snap, u.CorrelationID); err != nil {
 			return err
 		}
-	case inlineCertificateConfigWatchID:
+	case u.CorrelationID == inlineCertificateConfigWatchID:
 		// Handle change in an attached inline-certificate config entry
 		if err := h.handleInlineCertConfigUpdate(ctx, u, snap); err != nil {
 			return err
 		}
-	case routeConfigWatchID:
+	case u.CorrelationID == routeConfigWatchID:
 		// Handle change in an attached http-route or tcp-route config entry
 		if err := h.handleRouteConfigUpdate(ctx, u, snap); err != nil {
 			return err
 		}
-	case jwtProviderID:
-		err := setJWTProvider(u, snap)
-		if err != nil {
-			return err
-		}
-
 	default:
-		if err := (*handlerUpstreams)(h).handleUpdateUpstreams(ctx, u, snap); err != nil {
-			return err
-		}
+		return (*handlerUpstreams)(h).handleUpdateUpstreams(ctx, u, snap)
 	}
 
-	return h.recompileDiscoveryChains(snap)
+	return nil
 }
 
 // handleRootCAUpdate responds to changes in the watched root CA for a gateway
@@ -332,6 +316,7 @@ func (h *handlerAPIGateway) handleRouteConfigUpdate(ctx context.Context, u Updat
 						DestinationNamespace: service.NamespaceOrDefault(),
 						DestinationPartition: service.PartitionOrDefault(),
 						LocalBindPort:        listener.Port,
+						// TODO IngressHosts:         g.Hosts,
 						// Pass the protocol that was configured on the listener in order
 						// to force that protocol on the Envoy listener.
 						Config: map[string]interface{}{
@@ -339,7 +324,7 @@ func (h *handlerAPIGateway) handleRouteConfigUpdate(ctx context.Context, u Updat
 						},
 					}
 
-					listenerKey := APIGatewayListenerKeyFromListener(listener)
+					listenerKey := APIGatewayListenerKey{Protocol: string(listener.Protocol), Port: listener.Port}
 					upstreams[listenerKey] = append(upstreams[listenerKey], upstream)
 				}
 
@@ -393,7 +378,7 @@ func (h *handlerAPIGateway) handleRouteConfigUpdate(ctx context.Context, u Updat
 					},
 				}
 
-				listenerKey := APIGatewayListenerKeyFromListener(listener)
+				listenerKey := APIGatewayListenerKey{Protocol: string(listener.Protocol), Port: listener.Port}
 				upstreams[listenerKey] = append(upstreams[listenerKey], upstream)
 			}
 
@@ -418,6 +403,8 @@ func (h *handlerAPIGateway) handleRouteConfigUpdate(ctx context.Context, u Updat
 		snap.APIGateway.Upstreams.set(ref, listener, set)
 	}
 	snap.APIGateway.UpstreamsSet.set(ref, seenUpstreamIDs)
+	// snap.APIGateway.Hosts = TODO
+	snap.APIGateway.AreHostsSet = true
 
 	// Stop watching any upstreams and discovery chains that have become irrelevant
 	for upstreamID, cancelDiscoChain := range snap.APIGateway.WatchedDiscoveryChains {
@@ -443,46 +430,6 @@ func (h *handlerAPIGateway) handleRouteConfigUpdate(ctx context.Context, u Updat
 	return nil
 }
 
-func (h *handlerAPIGateway) recompileDiscoveryChains(snap *ConfigSnapshot) error {
-	synthesizedChains := map[UpstreamID]*structs.CompiledDiscoveryChain{}
-
-	for name, listener := range snap.APIGateway.Listeners {
-		boundListener, ok := snap.APIGateway.BoundListeners[name]
-		if !(ok && snap.APIGateway.GatewayConfig.ListenerIsReady(name)) {
-			// Skip any listeners that don't have a bound listener. Once the bound listener is created, this will be run again.
-			// skip any listeners that might be in an invalid state
-			continue
-		}
-
-		// Create a synthesized discovery chain for each service.
-		services, upstreams, compiled, err := snap.APIGateway.synthesizeChains(h.source.Datacenter, listener, boundListener)
-		if err != nil {
-			return err
-		}
-
-		if len(upstreams) == 0 {
-			// skip if we can't construct any upstreams
-			continue
-		}
-
-		for i, service := range services {
-			id := NewUpstreamIDFromServiceName(structs.NewServiceName(service.Name, &service.EnterpriseMeta))
-
-			if compiled[i].ServiceName != service.Name {
-				return fmt.Errorf("Compiled Discovery chain for %s does not match service %s", compiled[i].ServiceName, id)
-			}
-			synthesizedChains[id] = compiled[i]
-		}
-	}
-
-	// Merge in additional discovery chains
-	for id, chain := range synthesizedChains {
-		snap.APIGateway.DiscoveryChain[id] = chain
-	}
-
-	return nil
-}
-
 // referenceIsForListener returns whether the provided structs.ResourceReference
 // targets the provided structs.APIGatewayListener. For this to be true, the kind
 // and name must match the structs.APIGatewayConfigEntry containing the listener,
@@ -512,7 +459,7 @@ func (h *handlerAPIGateway) watchIngressLeafCert(ctx context.Context, snap *Conf
 		snap.APIGateway.LeafCertWatchCancel()
 	}
 	ctx, cancel := context.WithCancel(ctx)
-	err := h.dataSources.LeafCertificate.Notify(ctx, &leafcert.ConnectCALeafRequest{
+	err := h.dataSources.LeafCertificate.Notify(ctx, &cachetype.ConnectCALeafRequest{
 		Datacenter:     h.source.Datacenter,
 		Token:          h.token,
 		Service:        h.service,
diff --git a/agent/proxycfg/api_gateway_ce.go b/agent/proxycfg/api_gateway_ce.go
deleted file mode 100644
index c9ef2383979ef..0000000000000
--- a/agent/proxycfg/api_gateway_ce.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package proxycfg
-
-import "context"
-
-func watchJWTProviders(cxt context.Context, h *handlerAPIGateway) error {
-	return nil
-}
-
-func setJWTProvider(u UpdateEvent, snap *ConfigSnapshot) error {
-	return nil
-}
diff --git a/agent/proxycfg/config_snapshot_glue.go b/agent/proxycfg/config_snapshot_glue.go
deleted file mode 100644
index 6355e0595ec69..0000000000000
--- a/agent/proxycfg/config_snapshot_glue.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxycfg
-
-import (
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/logging"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-)
-
-// The below functions are added to ConfigSnapshot to allow it to conform to
-// the ProxySnapshot interface.
-func (s *ConfigSnapshot) AllowEmptyListeners() bool {
-	// Ingress and API gateways are allowed to inform LDS of no listeners.
-	return s.Kind == structs.ServiceKindIngressGateway ||
-		s.Kind == structs.ServiceKindAPIGateway
-}
-
-func (s *ConfigSnapshot) AllowEmptyRoutes() bool {
-	// Ingress and API gateways are allowed to inform RDS of no routes.
-	return s.Kind == structs.ServiceKindIngressGateway ||
-		s.Kind == structs.ServiceKindAPIGateway
-}
-
-func (s *ConfigSnapshot) AllowEmptyClusters() bool {
-	// Mesh, Ingress, API and Terminating gateways are allowed to inform CDS of no clusters.
-	return s.Kind == structs.ServiceKindMeshGateway ||
-		s.Kind == structs.ServiceKindTerminatingGateway ||
-		s.Kind == structs.ServiceKindIngressGateway ||
-		s.Kind == structs.ServiceKindAPIGateway
-}
-
-func (s *ConfigSnapshot) Authorize(authz acl.Authorizer) error {
-	var authzContext acl.AuthorizerContext
-	switch s.Kind {
-	case structs.ServiceKindConnectProxy:
-		s.ProxyID.EnterpriseMeta.FillAuthzContext(&authzContext)
-		if err := authz.ToAllowAuthorizer().ServiceWriteAllowed(s.Proxy.DestinationServiceName, &authzContext); err != nil {
-			return status.Errorf(codes.PermissionDenied, err.Error())
-		}
-	case structs.ServiceKindMeshGateway, structs.ServiceKindTerminatingGateway, structs.ServiceKindIngressGateway, structs.ServiceKindAPIGateway:
-		s.ProxyID.EnterpriseMeta.FillAuthzContext(&authzContext)
-		if err := authz.ToAllowAuthorizer().ServiceWriteAllowed(s.Service, &authzContext); err != nil {
-			return status.Errorf(codes.PermissionDenied, err.Error())
-		}
-	default:
-		return status.Errorf(codes.Internal, "Invalid service kind")
-	}
-
-	// Authed OK!
-	return nil
-}
-
-func (s *ConfigSnapshot) LoggerName() string {
-	switch s.Kind {
-	case structs.ServiceKindConnectProxy:
-	case structs.ServiceKindTerminatingGateway:
-		return logging.TerminatingGateway
-	case structs.ServiceKindMeshGateway:
-		return logging.MeshGateway
-	case structs.ServiceKindIngressGateway:
-		return logging.IngressGateway
-	}
-
-	return ""
-}
diff --git a/agent/proxycfg/config_snapshot_glue_test.go b/agent/proxycfg/config_snapshot_glue_test.go
deleted file mode 100644
index ed7a9afc1ffbe..0000000000000
--- a/agent/proxycfg/config_snapshot_glue_test.go
+++ /dev/null
@@ -1,315 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxycfg
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-func TestConfigSnapshot_AllowEmptyClusters(t *testing.T) {
-	type testCase struct {
-		description    string
-		cfgSnapshot    *ConfigSnapshot
-		expectedResult bool
-	}
-	testsCases := []testCase{
-		{
-			description:    "Mesh proxies are not allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindConnectProxy},
-			expectedResult: false,
-		},
-		{
-			description:    "Ingress gateways are allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindIngressGateway},
-			expectedResult: true,
-		},
-		{
-			description:    "Terminating gateways are allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindTerminatingGateway},
-			expectedResult: true,
-		},
-		{
-			description:    "API Gateways are allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindAPIGateway},
-			expectedResult: true,
-		},
-		{
-			description:    "Mesh Gateways are allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindMeshGateway},
-			expectedResult: true,
-		},
-	}
-	for _, tc := range testsCases {
-		t.Run(tc.description, func(t *testing.T) {
-			require.Equal(t, tc.expectedResult, tc.cfgSnapshot.AllowEmptyClusters())
-		})
-	}
-}
-
-func TestConfigSnapshot_AllowEmptyListeners(t *testing.T) {
-	type testCase struct {
-		description    string
-		cfgSnapshot    *ConfigSnapshot
-		expectedResult bool
-	}
-	testsCases := []testCase{
-		{
-			description:    "Mesh proxies are not allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindConnectProxy},
-			expectedResult: false,
-		},
-		{
-			description:    "Ingress gateways are allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindIngressGateway},
-			expectedResult: true,
-		},
-		{
-			description:    "Terminating gateways are not allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindTerminatingGateway},
-			expectedResult: false,
-		},
-		{
-			description:    "API Gateways are allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindAPIGateway},
-			expectedResult: true,
-		},
-		{
-			description:    "Mesh Gateways are not allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindMeshGateway},
-			expectedResult: false,
-		},
-	}
-	for _, tc := range testsCases {
-		t.Run(tc.description, func(t *testing.T) {
-			require.Equal(t, tc.expectedResult, tc.cfgSnapshot.AllowEmptyListeners())
-		})
-	}
-}
-
-func TestConfigSnapshot_AllowEmptyRoutes(t *testing.T) {
-	type testCase struct {
-		description    string
-		cfgSnapshot    *ConfigSnapshot
-		expectedResult bool
-	}
-	testsCases := []testCase{
-		{
-			description:    "Mesh proxies are not allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindConnectProxy},
-			expectedResult: false,
-		},
-		{
-			description:    "Ingress gateways are allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindIngressGateway},
-			expectedResult: true,
-		},
-		{
-			description:    "Terminating gateways are not allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindTerminatingGateway},
-			expectedResult: false,
-		},
-		{
-			description:    "API Gateways are allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindAPIGateway},
-			expectedResult: true,
-		},
-		{
-			description:    "Mesh Gateways are not allowed",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindMeshGateway},
-			expectedResult: false,
-		},
-	}
-	for _, tc := range testsCases {
-		t.Run(tc.description, func(t *testing.T) {
-			require.Equal(t, tc.expectedResult, tc.cfgSnapshot.AllowEmptyRoutes())
-		})
-	}
-}
-
-func TestConfigSnapshot_LoggerName(t *testing.T) {
-	type testCase struct {
-		description    string
-		cfgSnapshot    *ConfigSnapshot
-		expectedResult string
-	}
-	testsCases := []testCase{
-		{
-			description:    "Mesh proxies have a logger named ''",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindConnectProxy},
-			expectedResult: "",
-		},
-		{
-			description:    "Ingress gateways have a logger named 'ingress_gateway'",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindIngressGateway},
-			expectedResult: "ingress_gateway",
-		},
-		{
-			description:    "Terminating gateways have a logger named 'terminating_gateway'",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindTerminatingGateway},
-			expectedResult: "terminating_gateway",
-		},
-		{
-			description:    "API Gateways have a logger named ''",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindAPIGateway},
-			expectedResult: "",
-		},
-		{
-			description:    "Mesh Gateways have a logger named 'mesh_gateway'",
-			cfgSnapshot:    &ConfigSnapshot{Kind: structs.ServiceKindMeshGateway},
-			expectedResult: "mesh_gateway",
-		},
-	}
-	for _, tc := range testsCases {
-		t.Run(tc.description, func(t *testing.T) {
-			require.Equal(t, tc.expectedResult, tc.cfgSnapshot.LoggerName())
-		})
-	}
-}
-
-func TestConfigSnapshot_Authorize(t *testing.T) {
-	type testCase struct {
-		description          string
-		cfgSnapshot          *ConfigSnapshot
-		configureAuthorizer  func(authorizer *acl.MockAuthorizer)
-		expectedErrorMessage string
-	}
-	testsCases := []testCase{
-		{
-			description: "ConnectProxy - if service write is allowed for the DestinationService then allow.",
-			cfgSnapshot: &ConfigSnapshot{
-				Kind: structs.ServiceKindConnectProxy,
-				Proxy: structs.ConnectProxyConfig{
-					DestinationServiceName: "DestinationServiceName",
-				},
-			},
-			expectedErrorMessage: "",
-			configureAuthorizer: func(authz *acl.MockAuthorizer) {
-				authz.On("ServiceWrite", "DestinationServiceName", mock.Anything).Return(acl.Allow)
-			},
-		},
-		{
-			description: "ConnectProxy - if service write is not allowed for the DestinationService then deny.",
-			cfgSnapshot: &ConfigSnapshot{
-				Kind: structs.ServiceKindConnectProxy,
-				Proxy: structs.ConnectProxyConfig{
-					DestinationServiceName: "DestinationServiceName",
-				},
-			},
-			expectedErrorMessage: "rpc error: code = PermissionDenied desc = Permission denied: token with AccessorID '' lacks permission 'service:write' on \"DestinationServiceName\"",
-			configureAuthorizer: func(authz *acl.MockAuthorizer) {
-				authz.On("ServiceWrite", "DestinationServiceName", mock.Anything).Return(acl.Deny)
-			},
-		},
-		{
-			description: "Mesh Gateway - if service write is allowed for the Service then allow.",
-			cfgSnapshot: &ConfigSnapshot{
-				Kind:    structs.ServiceKindMeshGateway,
-				Service: "Service",
-			},
-			expectedErrorMessage: "",
-			configureAuthorizer: func(authz *acl.MockAuthorizer) {
-				authz.On("ServiceWrite", "Service", mock.Anything).Return(acl.Allow)
-			},
-		},
-		{
-			description: "Mesh Gateway - if service write is not allowed for the Service then deny.",
-			cfgSnapshot: &ConfigSnapshot{
-				Kind:    structs.ServiceKindMeshGateway,
-				Service: "Service",
-			},
-			expectedErrorMessage: "rpc error: code = PermissionDenied desc = Permission denied: token with AccessorID '' lacks permission 'service:write' on \"Service\"",
-			configureAuthorizer: func(authz *acl.MockAuthorizer) {
-				authz.On("ServiceWrite", "Service", mock.Anything).Return(acl.Deny)
-			},
-		},
-		{
-			description: "Terminating Gateway - if service write is allowed for the Service then allow.",
-			cfgSnapshot: &ConfigSnapshot{
-				Kind:    structs.ServiceKindTerminatingGateway,
-				Service: "Service",
-			},
-			expectedErrorMessage: "rpc error: code = PermissionDenied desc = Permission denied: token with AccessorID '' lacks permission 'service:write' on \"Service\"",
-			configureAuthorizer: func(authz *acl.MockAuthorizer) {
-				authz.On("ServiceWrite", "Service", mock.Anything).Return(acl.Deny)
-			},
-		},
-		{
-			description: "Terminating Gateway - if service write is not allowed for the Service then deny.",
-			cfgSnapshot: &ConfigSnapshot{
-				Kind:    structs.ServiceKindTerminatingGateway,
-				Service: "Service",
-			},
-			expectedErrorMessage: "rpc error: code = PermissionDenied desc = Permission denied: token with AccessorID '' lacks permission 'service:write' on \"Service\"",
-			configureAuthorizer: func(authz *acl.MockAuthorizer) {
-				authz.On("ServiceWrite", "Service", mock.Anything).Return(acl.Deny)
-			},
-		},
-		{
-			description: "Ingress Gateway - if service write is allowed for the Service then allow.",
-			cfgSnapshot: &ConfigSnapshot{
-				Kind:    structs.ServiceKindIngressGateway,
-				Service: "Service",
-			},
-			expectedErrorMessage: "rpc error: code = PermissionDenied desc = Permission denied: token with AccessorID '' lacks permission 'service:write' on \"Service\"",
-			configureAuthorizer: func(authz *acl.MockAuthorizer) {
-				authz.On("ServiceWrite", "Service", mock.Anything).Return(acl.Deny)
-			},
-		},
-		{
-			description: "Ingress Gateway - if service write is not allowed for the Service then deny.",
-			cfgSnapshot: &ConfigSnapshot{
-				Kind:    structs.ServiceKindIngressGateway,
-				Service: "Service",
-			},
-			expectedErrorMessage: "rpc error: code = PermissionDenied desc = Permission denied: token with AccessorID '' lacks permission 'service:write' on \"Service\"",
-			configureAuthorizer: func(authz *acl.MockAuthorizer) {
-				authz.On("ServiceWrite", "Service", mock.Anything).Return(acl.Deny)
-			},
-		},
-		{
-			description: "API Gateway - if service write is allowed for the Service then allow.",
-			cfgSnapshot: &ConfigSnapshot{
-				Kind:    structs.ServiceKindAPIGateway,
-				Service: "Service",
-			},
-			expectedErrorMessage: "rpc error: code = PermissionDenied desc = Permission denied: token with AccessorID '' lacks permission 'service:write' on \"Service\"",
-			configureAuthorizer: func(authz *acl.MockAuthorizer) {
-				authz.On("ServiceWrite", "Service", mock.Anything).Return(acl.Deny)
-			},
-		},
-		{
-			description: "API Gateway - if service write is not allowed for the Service then deny.",
-			cfgSnapshot: &ConfigSnapshot{
-				Kind:    structs.ServiceKindAPIGateway,
-				Service: "Service",
-			},
-			expectedErrorMessage: "rpc error: code = PermissionDenied desc = Permission denied: token with AccessorID '' lacks permission 'service:write' on \"Service\"",
-			configureAuthorizer: func(authz *acl.MockAuthorizer) {
-				authz.On("ServiceWrite", "Service", mock.Anything).Return(acl.Deny)
-			},
-		},
-	}
-	for _, tc := range testsCases {
-		t.Run(tc.description, func(t *testing.T) {
-			authz := &acl.MockAuthorizer{}
-			authz.On("ToAllow").Return(acl.AllowAuthorizer{Authorizer: authz})
-			tc.configureAuthorizer(authz)
-			err := tc.cfgSnapshot.Authorize(authz)
-			errMsg := ""
-			if err != nil {
-				errMsg = err.Error()
-			}
-			// using contains because Enterprise tests append the parition and namespace
-			// information to the message.
-			require.True(t, strings.Contains(errMsg, tc.expectedErrorMessage))
-		})
-	}
-}
diff --git a/agent/proxycfg/connect_proxy.go b/agent/proxycfg/connect_proxy.go
index 0a8c1737923ee..e56d98d090aad 100644
--- a/agent/proxycfg/connect_proxy.go
+++ b/agent/proxycfg/connect_proxy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -11,15 +8,13 @@ import (
 	"path"
 	"strings"
 
-	"github.com/mitchellh/mapstructure"
-
 	"github.com/hashicorp/consul/acl"
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/proxycfg/internal/watch"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/mitchellh/mapstructure"
 )
 
 type handlerConnectProxy struct {
@@ -71,7 +66,7 @@ func (s *handlerConnectProxy) initialize(ctx context.Context) (ConfigSnapshot, e
 	}
 
 	// Watch the leaf cert
-	err = s.dataSources.LeafCertificate.Notify(ctx, &leafcert.ConnectCALeafRequest{
+	err = s.dataSources.LeafCertificate.Notify(ctx, &cachetype.ConnectCALeafRequest{
 		Datacenter:     s.source.Datacenter,
 		Token:          s.token,
 		Service:        s.proxyCfg.DestinationServiceName,
@@ -92,20 +87,6 @@ func (s *handlerConnectProxy) initialize(ctx context.Context) (ConfigSnapshot, e
 		return snap, err
 	}
 
-	// Watch for JWT provider updates.
-	// While we could optimize by only watching providers referenced by intentions,
-	// this should be okay because we expect few JWT providers and infrequent JWT
-	// provider updates.
-	err = s.dataSources.ConfigEntryList.Notify(ctx, &structs.ConfigEntryQuery{
-		Kind:           structs.JWTProvider,
-		Datacenter:     s.source.Datacenter,
-		QueryOptions:   structs.QueryOptions{Token: s.token},
-		EnterpriseMeta: *structs.DefaultEnterpriseMetaInPartition(s.proxyID.PartitionOrDefault()),
-	}, jwtProviderID, s.ch)
-	if err != nil {
-		return snap, err
-	}
-
 	// Get information about the entire service mesh.
 	err = s.dataSources.ConfigEntry.Notify(ctx, &structs.ConfigEntryQuery{
 		Kind:           structs.MeshConfig,
@@ -331,30 +312,13 @@ func (s *handlerConnectProxy) handleUpdate(ctx context.Context, u UpdateEvent, s
 		snap.ConnectProxy.InboundPeerTrustBundlesSet = true
 
 	case u.CorrelationID == intentionsWatchID:
-		resp, ok := u.Result.(structs.SimplifiedIntentions)
+		resp, ok := u.Result.(structs.Intentions)
 		if !ok {
 			return fmt.Errorf("invalid type for response: %T", u.Result)
 		}
 		snap.ConnectProxy.Intentions = resp
 		snap.ConnectProxy.IntentionsSet = true
 
-	case u.CorrelationID == jwtProviderID:
-		resp, ok := u.Result.(*structs.IndexedConfigEntries)
-
-		if !ok {
-			return fmt.Errorf("invalid type for response: %T", u.Result)
-		}
-
-		providers := make(map[string]*structs.JWTProviderConfigEntry, len(resp.Entries))
-		for _, entry := range resp.Entries {
-			jwtEntry, ok := entry.(*structs.JWTProviderConfigEntry)
-			if !ok {
-				return fmt.Errorf("invalid type for response: %T", entry)
-			}
-			providers[jwtEntry.Name] = jwtEntry
-		}
-
-		snap.JWTProviders = providers
 	case u.CorrelationID == peeredUpstreamsID:
 		resp, ok := u.Result.(*structs.IndexedPeeredServiceList)
 		if !ok {
diff --git a/agent/proxycfg/data_sources.go b/agent/proxycfg/data_sources.go
index dfb9a70f357b8..0327a45a026df 100644
--- a/agent/proxycfg/data_sources.go
+++ b/agent/proxycfg/data_sources.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -8,7 +5,6 @@ import (
 	"errors"
 
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/structs"
 )
 
@@ -213,7 +209,7 @@ type InternalServiceDump interface {
 // LeafCertificate is the interface used to consume updates about a service's
 // leaf certificate.
 type LeafCertificate interface {
-	Notify(ctx context.Context, req *leafcert.ConnectCALeafRequest, correlationID string, ch chan<- UpdateEvent) error
+	Notify(ctx context.Context, req *cachetype.ConnectCALeafRequest, correlationID string, ch chan<- UpdateEvent) error
 }
 
 // PeeredUpstreams is the interface used to consume updates about upstreams
diff --git a/agent/proxycfg/data_sources_ce.go b/agent/proxycfg/data_sources_ce.go
index fce4830d84cea..e5e23d17734fe 100644
--- a/agent/proxycfg/data_sources_ce.go
+++ b/agent/proxycfg/data_sources_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package proxycfg
 
diff --git a/agent/proxycfg/deep-copy.sh b/agent/proxycfg/deep-copy.sh
index 2e1f361dd7101..3e3f07ec2d899 100755
--- a/agent/proxycfg/deep-copy.sh
+++ b/agent/proxycfg/deep-copy.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 readonly PACKAGE_DIR="$(dirname "${BASH_SOURCE[0]}")"
 cd $PACKAGE_DIR
diff --git a/agent/proxycfg/ingress_gateway.go b/agent/proxycfg/ingress_gateway.go
index 3ab5828add40a..f9a8f285b1449 100644
--- a/agent/proxycfg/ingress_gateway.go
+++ b/agent/proxycfg/ingress_gateway.go
@@ -1,16 +1,13 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/consul/agent/leafcert"
+	cachetype "github.com/hashicorp/consul/agent/cache-types"
 	"github.com/hashicorp/consul/agent/proxycfg/internal/watch"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 type handlerIngressGateway struct {
@@ -226,7 +223,7 @@ func (s *handlerIngressGateway) watchIngressLeafCert(ctx context.Context, snap *
 		snap.IngressGateway.LeafCertWatchCancel()
 	}
 	ctx, cancel := context.WithCancel(ctx)
-	err := s.dataSources.LeafCertificate.Notify(ctx, &leafcert.ConnectCALeafRequest{
+	err := s.dataSources.LeafCertificate.Notify(ctx, &cachetype.ConnectCALeafRequest{
 		Datacenter:     s.source.Datacenter,
 		Token:          s.token,
 		Service:        s.service,
diff --git a/agent/proxycfg/internal/watch/watchmap.go b/agent/proxycfg/internal/watch/watchmap.go
index d4fba2ea03eb8..b5827423ee002 100644
--- a/agent/proxycfg/internal/watch/watchmap.go
+++ b/agent/proxycfg/internal/watch/watchmap.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package watch
 
 import "context"
diff --git a/agent/proxycfg/internal/watch/watchmap_test.go b/agent/proxycfg/internal/watch/watchmap_test.go
index 54fb51d4df9ba..2e0f5b7908bc9 100644
--- a/agent/proxycfg/internal/watch/watchmap_test.go
+++ b/agent/proxycfg/internal/watch/watchmap_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package watch
 
 import (
diff --git a/agent/proxycfg/manager.go b/agent/proxycfg/manager.go
index 71b6270fefc41..d21ff4f1ea5bd 100644
--- a/agent/proxycfg/manager.go
+++ b/agent/proxycfg/manager.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -12,7 +9,6 @@ import (
 	"golang.org/x/time/rate"
 
 	"github.com/hashicorp/consul/agent/structs"
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
 	"github.com/hashicorp/consul/tlsutil"
 )
 
@@ -37,6 +33,10 @@ type ProxyID struct {
 // from overwriting each other's registrations.
 type ProxySource string
 
+// CancelFunc is a type for a returned function that can be called to cancel a
+// watch.
+type CancelFunc func()
+
 // Manager provides an API with which proxy services can be registered, and
 // coordinates the fetching (and refreshing) of intentions, upstreams, discovery
 // chain, certificates etc.
@@ -52,7 +52,7 @@ type Manager struct {
 
 	mu         sync.Mutex
 	proxies    map[ProxyID]*state
-	watchers   map[ProxyID]map[uint64]chan proxysnapshot.ProxySnapshot
+	watchers   map[ProxyID]map[uint64]chan *ConfigSnapshot
 	maxWatchID uint64
 }
 
@@ -103,7 +103,7 @@ func NewManager(cfg ManagerConfig) (*Manager, error) {
 	m := &Manager{
 		ManagerConfig: cfg,
 		proxies:       make(map[ProxyID]*state),
-		watchers:      make(map[ProxyID]map[uint64]chan proxysnapshot.ProxySnapshot),
+		watchers:      make(map[ProxyID]map[uint64]chan *ConfigSnapshot),
 		rateLimiter:   rate.NewLimiter(cfg.UpdateRateLimit, 1),
 	}
 	return m, nil
@@ -259,7 +259,7 @@ func (m *Manager) notify(snap *ConfigSnapshot) {
 // it will drain the chan and then re-attempt delivery so that a slow consumer
 // gets the latest config earlier. This MUST be called from a method where m.mu
 // is held to be safe since it assumes we are the only goroutine sending on ch.
-func (m *Manager) deliverLatest(snap *ConfigSnapshot, ch chan proxysnapshot.ProxySnapshot) {
+func (m *Manager) deliverLatest(snap *ConfigSnapshot, ch chan *ConfigSnapshot) {
 	// Send if chan is empty
 	select {
 	case ch <- snap:
@@ -296,16 +296,16 @@ OUTER:
 // will not fail, but no updates will be delivered until the proxy is
 // registered. If there is already a valid snapshot in memory, it will be
 // delivered immediately.
-func (m *Manager) Watch(id ProxyID) (<-chan proxysnapshot.ProxySnapshot, proxysnapshot.CancelFunc) {
+func (m *Manager) Watch(id ProxyID) (<-chan *ConfigSnapshot, CancelFunc) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
 	// This buffering is crucial otherwise we'd block immediately trying to
 	// deliver the current snapshot below if we already have one.
-	ch := make(chan proxysnapshot.ProxySnapshot, 1)
+	ch := make(chan *ConfigSnapshot, 1)
 	watchers, ok := m.watchers[id]
 	if !ok {
-		watchers = make(map[uint64]chan proxysnapshot.ProxySnapshot)
+		watchers = make(map[uint64]chan *ConfigSnapshot)
 	}
 	watchID := m.maxWatchID
 	m.maxWatchID++
diff --git a/agent/proxycfg/manager_test.go b/agent/proxycfg/manager_test.go
index feaa4e431d033..cad98796f7377 100644
--- a/agent/proxycfg/manager_test.go
+++ b/agent/proxycfg/manager_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -10,15 +7,13 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/configentry"
+	cachetype "github.com/hashicorp/consul/agent/cache-types"
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/consul/discoverychain"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/proxycfg/internal/watch"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
@@ -59,20 +54,21 @@ func TestManager_BasicLifecycle(t *testing.T) {
 	roots, leaf := TestCerts(t)
 
 	dbDefaultChain := func() *structs.CompiledDiscoveryChain {
-		set := configentry.NewDiscoveryChainSet()
-		set.AddEntries(&structs.ServiceResolverConfigEntry{
-			Kind: structs.ServiceResolver,
-			Name: "db",
-		})
 		return discoverychain.TestCompileConfigEntries(t, "db", "default", "default", "dc1", connect.TestClusterID+".consul", func(req *discoverychain.CompileRequest) {
 			// This is because structs.TestUpstreams uses an opaque config
 			// to override connect timeouts.
 			req.OverrideConnectTimeout = 1 * time.Second
-		}, set)
+		}, &structs.ServiceResolverConfigEntry{
+			Kind: structs.ServiceResolver,
+			Name: "db",
+		})
 	}
 	dbSplitChain := func() *structs.CompiledDiscoveryChain {
-		set := configentry.NewDiscoveryChainSet()
-		set.AddEntries(&structs.ProxyConfigEntry{
+		return discoverychain.TestCompileConfigEntries(t, "db", "default", "default", "dc1", "trustdomain.consul", func(req *discoverychain.CompileRequest) {
+			// This is because structs.TestUpstreams uses an opaque config
+			// to override connect timeouts.
+			req.OverrideConnectTimeout = 1 * time.Second
+		}, &structs.ProxyConfigEntry{
 			Kind: structs.ProxyDefaults,
 			Name: structs.ProxyConfigGlobal,
 			Config: map[string]interface{}{
@@ -97,11 +93,6 @@ func TestManager_BasicLifecycle(t *testing.T) {
 				{Weight: 40, ServiceSubset: "v2"},
 			},
 		})
-		return discoverychain.TestCompileConfigEntries(t, "db", "default", "default", "dc1", "trustdomain.consul", func(req *discoverychain.CompileRequest) {
-			// This is because structs.TestUpstreams uses an opaque config
-			// to override connect timeouts.
-			req.OverrideConnectTimeout = 1 * time.Second
-		}, set)
 	}
 
 	upstreams := structs.TestUpstreams(t, false)
@@ -131,7 +122,7 @@ func TestManager_BasicLifecycle(t *testing.T) {
 		Datacenter:   "dc1",
 		QueryOptions: structs.QueryOptions{Token: "my-token"},
 	}
-	leafReq := &leafcert.ConnectCALeafRequest{
+	leafReq := &cachetype.ConnectCALeafRequest{
 		Datacenter: "dc1",
 		Token:      "my-token",
 		Service:    "web",
@@ -359,7 +350,7 @@ func testManager_BasicLifecycle(
 	t *testing.T,
 	dataSources *TestDataSources,
 	rootsReq *structs.DCSpecificRequest,
-	leafReq *leafcert.ConnectCALeafRequest,
+	leafReq *cachetype.ConnectCALeafRequest,
 	roots *structs.IndexedCARoots,
 	webProxy *structs.NodeService,
 	expectSnap *ConfigSnapshot,
@@ -470,7 +461,7 @@ func testManager_BasicLifecycle(
 	require.Len(t, m.watchers, 0)
 }
 
-func assertWatchChanBlocks(t *testing.T, ch <-chan proxysnapshot.ProxySnapshot) {
+func assertWatchChanBlocks(t *testing.T, ch <-chan *ConfigSnapshot) {
 	t.Helper()
 
 	select {
@@ -480,7 +471,7 @@ func assertWatchChanBlocks(t *testing.T, ch <-chan proxysnapshot.ProxySnapshot)
 	}
 }
 
-func assertWatchChanRecvs(t *testing.T, ch <-chan proxysnapshot.ProxySnapshot, expect proxysnapshot.ProxySnapshot) {
+func assertWatchChanRecvs(t *testing.T, ch <-chan *ConfigSnapshot, expect *ConfigSnapshot) {
 	t.Helper()
 
 	select {
@@ -518,7 +509,7 @@ func TestManager_deliverLatest(t *testing.T) {
 	}
 
 	// test 1 buffered chan
-	ch1 := make(chan proxysnapshot.ProxySnapshot, 1)
+	ch1 := make(chan *ConfigSnapshot, 1)
 
 	// Sending to an unblocked chan should work
 	m.deliverLatest(snap1, ch1)
@@ -534,7 +525,7 @@ func TestManager_deliverLatest(t *testing.T) {
 	require.Equal(t, snap2, <-ch1)
 
 	// Same again for 5-buffered chan
-	ch5 := make(chan proxysnapshot.ProxySnapshot, 5)
+	ch5 := make(chan *ConfigSnapshot, 5)
 
 	// Sending to an unblocked chan should work
 	m.deliverLatest(snap1, ch5)
@@ -644,7 +635,7 @@ func TestManager_SyncState_No_Notify(t *testing.T) {
 	// update the intentions
 	notifyCH <- UpdateEvent{
 		CorrelationID: intentionsWatchID,
-		Result:        structs.SimplifiedIntentions{},
+		Result:        structs.Intentions{},
 		Err:           nil,
 	}
 
diff --git a/agent/proxycfg/mesh_gateway.go b/agent/proxycfg/mesh_gateway.go
index 0237e84232905..33b982cc44d9b 100644
--- a/agent/proxycfg/mesh_gateway.go
+++ b/agent/proxycfg/mesh_gateway.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -15,13 +12,13 @@ import (
 	"github.com/hashicorp/go-hclog"
 
 	"github.com/hashicorp/consul/acl"
+
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/proxycfg/internal/watch"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib/maps"
 	"github.com/hashicorp/consul/logging"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 type handlerMeshGateway struct {
@@ -393,7 +390,7 @@ func (s *handlerMeshGateway) handleUpdate(ctx context.Context, u UpdateEvent, sn
 		if hasExports && snap.MeshGateway.LeafCertWatchCancel == nil {
 			// no watch and we need one
 			ctx, cancel := context.WithCancel(ctx)
-			err := s.dataSources.LeafCertificate.Notify(ctx, &leafcert.ConnectCALeafRequest{
+			err := s.dataSources.LeafCertificate.Notify(ctx, &cachetype.ConnectCALeafRequest{
 				Datacenter:     s.source.Datacenter,
 				Token:          s.token,
 				Kind:           structs.ServiceKindMeshGateway,
diff --git a/agent/proxycfg/mesh_gateway_ce.go b/agent/proxycfg/mesh_gateway_ce.go
index 1c1156232d71c..143eff76fe263 100644
--- a/agent/proxycfg/mesh_gateway_ce.go
+++ b/agent/proxycfg/mesh_gateway_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package proxycfg
 
diff --git a/agent/proxycfg/naming.go b/agent/proxycfg/naming.go
index a9bd5fd8c0ca4..ec8a3d5992acc 100644
--- a/agent/proxycfg/naming.go
+++ b/agent/proxycfg/naming.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
diff --git a/agent/proxycfg/naming_ce.go b/agent/proxycfg/naming_ce.go
index 7a375b6df944e..c6a3db10de1d0 100644
--- a/agent/proxycfg/naming_ce.go
+++ b/agent/proxycfg/naming_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package proxycfg
 
diff --git a/agent/proxycfg/naming_test.go b/agent/proxycfg/naming_test.go
index 0615a81281824..2c4f5173a845b 100644
--- a/agent/proxycfg/naming_test.go
+++ b/agent/proxycfg/naming_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
diff --git a/agent/proxycfg/proxycfg.deepcopy.go b/agent/proxycfg/proxycfg.deepcopy.go
index ebe052d1088f6..8c0b465a2bd75 100644
--- a/agent/proxycfg/proxycfg.deepcopy.go
+++ b/agent/proxycfg/proxycfg.deepcopy.go
@@ -5,7 +5,7 @@ package proxycfg
 import (
 	"context"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/types"
 	"time"
 )
@@ -13,10 +13,6 @@ import (
 // DeepCopy generates a deep copy of *ConfigSnapshot
 func (o *ConfigSnapshot) DeepCopy() *ConfigSnapshot {
 	var cp ConfigSnapshot = *o
-	if o.ServiceLocality != nil {
-		cp.ServiceLocality = new(structs.Locality)
-		*cp.ServiceLocality = *o.ServiceLocality
-	}
 	if o.ServiceMeta != nil {
 		cp.ServiceMeta = make(map[string]string, len(o.ServiceMeta))
 		for k2, v2 := range o.ServiceMeta {
@@ -33,97 +29,6 @@ func (o *ConfigSnapshot) DeepCopy() *ConfigSnapshot {
 		retV := o.Proxy.DeepCopy()
 		cp.Proxy = *retV
 	}
-	if o.JWTProviders != nil {
-		cp.JWTProviders = make(map[string]*structs.JWTProviderConfigEntry, len(o.JWTProviders))
-		for k2, v2 := range o.JWTProviders {
-			var cp_JWTProviders_v2 *structs.JWTProviderConfigEntry
-			if v2 != nil {
-				cp_JWTProviders_v2 = new(structs.JWTProviderConfigEntry)
-				*cp_JWTProviders_v2 = *v2
-				if v2.JSONWebKeySet != nil {
-					cp_JWTProviders_v2.JSONWebKeySet = new(structs.JSONWebKeySet)
-					*cp_JWTProviders_v2.JSONWebKeySet = *v2.JSONWebKeySet
-					if v2.JSONWebKeySet.Local != nil {
-						cp_JWTProviders_v2.JSONWebKeySet.Local = new(structs.LocalJWKS)
-						*cp_JWTProviders_v2.JSONWebKeySet.Local = *v2.JSONWebKeySet.Local
-					}
-					if v2.JSONWebKeySet.Remote != nil {
-						cp_JWTProviders_v2.JSONWebKeySet.Remote = new(structs.RemoteJWKS)
-						*cp_JWTProviders_v2.JSONWebKeySet.Remote = *v2.JSONWebKeySet.Remote
-						if v2.JSONWebKeySet.Remote.RetryPolicy != nil {
-							cp_JWTProviders_v2.JSONWebKeySet.Remote.RetryPolicy = new(structs.JWKSRetryPolicy)
-							*cp_JWTProviders_v2.JSONWebKeySet.Remote.RetryPolicy = *v2.JSONWebKeySet.Remote.RetryPolicy
-							if v2.JSONWebKeySet.Remote.RetryPolicy.RetryPolicyBackOff != nil {
-								cp_JWTProviders_v2.JSONWebKeySet.Remote.RetryPolicy.RetryPolicyBackOff = new(structs.RetryPolicyBackOff)
-								*cp_JWTProviders_v2.JSONWebKeySet.Remote.RetryPolicy.RetryPolicyBackOff = *v2.JSONWebKeySet.Remote.RetryPolicy.RetryPolicyBackOff
-							}
-						}
-						if v2.JSONWebKeySet.Remote.JWKSCluster != nil {
-							cp_JWTProviders_v2.JSONWebKeySet.Remote.JWKSCluster = new(structs.JWKSCluster)
-							*cp_JWTProviders_v2.JSONWebKeySet.Remote.JWKSCluster = *v2.JSONWebKeySet.Remote.JWKSCluster
-							if v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates != nil {
-								cp_JWTProviders_v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates = new(structs.JWKSTLSCertificate)
-								*cp_JWTProviders_v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates = *v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates
-								if v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates.CaCertificateProviderInstance != nil {
-									cp_JWTProviders_v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates.CaCertificateProviderInstance = new(structs.JWKSTLSCertProviderInstance)
-									*cp_JWTProviders_v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates.CaCertificateProviderInstance = *v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates.CaCertificateProviderInstance
-								}
-								if v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates.TrustedCA != nil {
-									cp_JWTProviders_v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates.TrustedCA = new(structs.JWKSTLSCertTrustedCA)
-									*cp_JWTProviders_v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates.TrustedCA = *v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates.TrustedCA
-									if v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates.TrustedCA.InlineBytes != nil {
-										cp_JWTProviders_v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates.TrustedCA.InlineBytes = make([]byte, len(v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates.TrustedCA.InlineBytes))
-										copy(cp_JWTProviders_v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates.TrustedCA.InlineBytes, v2.JSONWebKeySet.Remote.JWKSCluster.TLSCertificates.TrustedCA.InlineBytes)
-									}
-								}
-							}
-						}
-					}
-				}
-				if v2.Audiences != nil {
-					cp_JWTProviders_v2.Audiences = make([]string, len(v2.Audiences))
-					copy(cp_JWTProviders_v2.Audiences, v2.Audiences)
-				}
-				if v2.Locations != nil {
-					cp_JWTProviders_v2.Locations = make([]*structs.JWTLocation, len(v2.Locations))
-					copy(cp_JWTProviders_v2.Locations, v2.Locations)
-					for i5 := range v2.Locations {
-						if v2.Locations[i5] != nil {
-							cp_JWTProviders_v2.Locations[i5] = new(structs.JWTLocation)
-							*cp_JWTProviders_v2.Locations[i5] = *v2.Locations[i5]
-							if v2.Locations[i5].Header != nil {
-								cp_JWTProviders_v2.Locations[i5].Header = new(structs.JWTLocationHeader)
-								*cp_JWTProviders_v2.Locations[i5].Header = *v2.Locations[i5].Header
-							}
-							if v2.Locations[i5].QueryParam != nil {
-								cp_JWTProviders_v2.Locations[i5].QueryParam = new(structs.JWTLocationQueryParam)
-								*cp_JWTProviders_v2.Locations[i5].QueryParam = *v2.Locations[i5].QueryParam
-							}
-							if v2.Locations[i5].Cookie != nil {
-								cp_JWTProviders_v2.Locations[i5].Cookie = new(structs.JWTLocationCookie)
-								*cp_JWTProviders_v2.Locations[i5].Cookie = *v2.Locations[i5].Cookie
-							}
-						}
-					}
-				}
-				if v2.Forwarding != nil {
-					cp_JWTProviders_v2.Forwarding = new(structs.JWTForwardingConfig)
-					*cp_JWTProviders_v2.Forwarding = *v2.Forwarding
-				}
-				if v2.CacheConfig != nil {
-					cp_JWTProviders_v2.CacheConfig = new(structs.JWTCacheConfig)
-					*cp_JWTProviders_v2.CacheConfig = *v2.CacheConfig
-				}
-				if v2.Meta != nil {
-					cp_JWTProviders_v2.Meta = make(map[string]string, len(v2.Meta))
-					for k5, v5 := range v2.Meta {
-						cp_JWTProviders_v2.Meta[k5] = v5
-					}
-				}
-			}
-			cp.JWTProviders[k2] = cp_JWTProviders_v2
-		}
-	}
 	if o.Roots != nil {
 		cp.Roots = o.Roots.DeepCopy()
 	}
@@ -351,6 +256,10 @@ func (o *configSnapshotAPIGateway) DeepCopy() *configSnapshotAPIGateway {
 	if o.BoundGatewayConfig != nil {
 		cp.BoundGatewayConfig = o.BoundGatewayConfig.DeepCopy()
 	}
+	if o.Hosts != nil {
+		cp.Hosts = make([]string, len(o.Hosts))
+		copy(cp.Hosts, o.Hosts)
+	}
 	if o.Upstreams != nil {
 		cp.Upstreams = make(map[structs.ResourceReference]listenerUpstreamMap, len(o.Upstreams))
 		for k2, v2 := range o.Upstreams {
@@ -402,6 +311,23 @@ func (o *configSnapshotAPIGateway) DeepCopy() *configSnapshotAPIGateway {
 			cp.Listeners[k2] = cp_Listeners_v2
 		}
 	}
+	if o.ListenerCertificates != nil {
+		cp.ListenerCertificates = make(map[IngressListenerKey][]structs.InlineCertificateConfigEntry, len(o.ListenerCertificates))
+		for k2, v2 := range o.ListenerCertificates {
+			var cp_ListenerCertificates_v2 []structs.InlineCertificateConfigEntry
+			if v2 != nil {
+				cp_ListenerCertificates_v2 = make([]structs.InlineCertificateConfigEntry, len(v2))
+				copy(cp_ListenerCertificates_v2, v2)
+				for i3 := range v2 {
+					{
+						retV := v2[i3].DeepCopy()
+						cp_ListenerCertificates_v2[i3] = *retV
+					}
+				}
+			}
+			cp.ListenerCertificates[k2] = cp_ListenerCertificates_v2
+		}
+	}
 	if o.BoundListeners != nil {
 		cp.BoundListeners = make(map[string]structs.BoundAPIGatewayListener, len(o.BoundListeners))
 		for k2, v2 := range o.BoundListeners {
@@ -718,9 +644,9 @@ func (o *configSnapshotTerminatingGateway) DeepCopy() *configSnapshotTerminating
 		}
 	}
 	if o.Intentions != nil {
-		cp.Intentions = make(map[structs.ServiceName]structs.SimplifiedIntentions, len(o.Intentions))
+		cp.Intentions = make(map[structs.ServiceName]structs.Intentions, len(o.Intentions))
 		for k2, v2 := range o.Intentions {
-			var cp_Intentions_v2 structs.SimplifiedIntentions
+			var cp_Intentions_v2 structs.Intentions
 			if v2 != nil {
 				cp_Intentions_v2 = make([]*structs.Intention, len(v2))
 				copy(cp_Intentions_v2, v2)
diff --git a/agent/proxycfg/proxycfg.go b/agent/proxycfg/proxycfg.go
index 9b71156dfe5aa..b712c4de7ee9c 100644
--- a/agent/proxycfg/proxycfg.go
+++ b/agent/proxycfg/proxycfg.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // Package proxycfg contains components for sourcing the data required to
 // configure Connect proxies. The Manager provides an API with which proxy
 // services can be registered, and coordinates the fetching (and refreshing)
@@ -20,11 +17,11 @@
 //		               | State |                | State Sync |
 //		               +-------+                +-----+------+
 //		                 ▲                            |
-//	    +-------+            |     +---------------+      | 2.
-//	    | envoy |         4. | 4a. | Local         |      |
-//	    +-------+            | +-▶ | Config Source +-+    |
-//		 | stream        | |   +---------------+ |    |
-//		 ▼               | |                     ▼    ▼
+//		                 |     +---------------+      | 2.
+//		              4. | 4a. | Local         |      |
+//		                 | +-▶ | Config Source +-+    |
+//		                 | |   +---------------+ |    |
+//		                 | |                     ▼    ▼
 //		+--------+ 3.  +-+-+-----------+ 6.    +----------+ 2a.  +----------+
 //		| xDS    +---▶ | Catalog       +-----▶ | proxycfg +----▶ | proxycfg |
 //		| Server | ◀---+ Config Source +-----▶ | Manager  +--+   | State    |
@@ -41,11 +38,11 @@
 //	   they are sync'd to the proxycfg.Manager.
 //	   2a. proxycfg.Manager creates a state object for the service and begins
 //	       pre-fetching data (go to 8).
-//	3. Client (i.e., envoy) begins a stream and the xDS server calls Watch on its
-//	   ConfigSource - on a client agent this would be a local config source, on a
-//	   server it would be a catalog config source.
-//	4. On server, the catalog config source will check if service is registered locally.
-//	   4a. If the service *is* registered locally it hands off the local config
+//	3. Client begins a stream and the xDS server calls Watch on its ConfigSource -
+//	   on a client agent this would be a local config source, on a server it would
+//	   be a catalog config source.
+//	4. The catalog config source will check if service is registered locally.
+//	   4a. If the service *is* registered locally it hands off the the local config
 //	      source, which calls Watch on the proxycfg manager (and serves the pre-
 //	      fetched data).
 //	5. Otherwise, it fetches the service from the state store.
diff --git a/agent/proxycfg/snapshot.go b/agent/proxycfg/snapshot.go
index 8d7aebd456e12..cc28561442112 100644
--- a/agent/proxycfg/snapshot.go
+++ b/agent/proxycfg/snapshot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -15,7 +12,7 @@ import (
 	"github.com/hashicorp/consul/agent/proxycfg/internal/watch"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 // TODO(ingress): Can we think of a better for this bag of data?
@@ -153,7 +150,7 @@ type configSnapshotConnectProxy struct {
 	// NOTE: Intentions stores a list of lists as returned by the Intentions
 	// Match RPC. So far we only use the first list as the list of matching
 	// intentions.
-	Intentions    structs.SimplifiedIntentions
+	Intentions    structs.Intentions
 	IntentionsSet bool
 
 	DestinationsUpstream watch.Map[UpstreamID, *structs.ServiceConfigEntry]
@@ -230,7 +227,7 @@ type configSnapshotTerminatingGateway struct {
 	//
 	// A key being present implies that we have gotten at least one watch reply for the
 	// service. This is logically the same as ConnectProxy.IntentionsSet==true
-	Intentions map[structs.ServiceName]structs.SimplifiedIntentions
+	Intentions map[structs.ServiceName]structs.Intentions
 
 	// WatchedLeaves is a map of ServiceName to a cancel function.
 	// This cancel function is tied to the watch of leaf certs for linked services.
@@ -678,10 +675,8 @@ func (r routeUpstreamSet) delete(route structs.ResourceReference) {
 	delete(r, route)
 }
 
-type (
-	listenerUpstreamMap    map[APIGatewayListenerKey]structs.Upstreams
-	listenerRouteUpstreams map[structs.ResourceReference]listenerUpstreamMap
-)
+type listenerUpstreamMap map[APIGatewayListenerKey]structs.Upstreams
+type listenerRouteUpstreams map[structs.ResourceReference]listenerUpstreamMap
 
 func (l listenerRouteUpstreams) set(route structs.ResourceReference, listener APIGatewayListenerKey, upstreams structs.Upstreams) {
 	if _, ok := l[route]; !ok {
@@ -719,9 +714,13 @@ type configSnapshotAPIGateway struct {
 	BoundGatewayConfigLoaded bool
 	BoundGatewayConfig       *structs.BoundAPIGatewayConfigEntry
 
+	// Hosts is the list of extra host entries to add to our leaf cert's DNS SANs
+	Hosts       []string
+	AreHostsSet bool
+
 	// LeafCertWatchCancel is a CancelFunc to use when refreshing this gateway's
 	// leaf cert watch with different parameters.
-	// LeafCertWatchCancel context.CancelFunc
+	//LeafCertWatchCancel context.CancelFunc
 
 	// Upstreams is a list of upstreams this ingress gateway should serve traffic
 	// to. This is constructed from the ingress-gateway config entry, and uses
@@ -744,10 +743,108 @@ type configSnapshotAPIGateway struct {
 	// Listeners is the original listener config from the api-gateway config
 	// entry to save us trying to pass fields through Upstreams
 	Listeners map[string]structs.APIGatewayListener
+	// this acts as an intermediary for inlining certificates
+	ListenerCertificates map[IngressListenerKey][]structs.InlineCertificateConfigEntry
 
 	BoundListeners map[string]structs.BoundAPIGatewayListener
 }
 
+// ToIngress converts a configSnapshotAPIGateway to a configSnapshotIngressGateway.
+// This is temporary, for the sake of re-using existing codepaths when integrating
+// Consul API Gateway into Consul core.
+//
+// FUTURE: Remove when API gateways have custom snapshot generation
+func (c *configSnapshotAPIGateway) ToIngress(datacenter string) (configSnapshotIngressGateway, error) {
+	// Convert API Gateway Listeners to Ingress Listeners.
+	ingressListeners := make(map[IngressListenerKey]structs.IngressListener, len(c.Listeners))
+	ingressUpstreams := make(map[IngressListenerKey]structs.Upstreams, len(c.Listeners))
+	synthesizedChains := map[UpstreamID]*structs.CompiledDiscoveryChain{}
+	watchedUpstreamEndpoints := make(map[UpstreamID]map[string]structs.CheckServiceNodes)
+	watchedGatewayEndpoints := make(map[UpstreamID]map[string]structs.CheckServiceNodes)
+
+	// reset the cached certificates
+	c.ListenerCertificates = make(map[IngressListenerKey][]structs.InlineCertificateConfigEntry)
+
+	for name, listener := range c.Listeners {
+		boundListener, ok := c.BoundListeners[name]
+		if !ok {
+			// Skip any listeners that don't have a bound listener. Once the bound listener is created, this will be run again.
+			continue
+		}
+
+		if !c.GatewayConfig.ListenerIsReady(name) {
+			// skip any listeners that might be in an invalid state
+			continue
+		}
+
+		ingressListener := structs.IngressListener{
+			Port:     listener.Port,
+			Protocol: string(listener.Protocol),
+		}
+
+		// Create a synthesized discovery chain for each service.
+		services, upstreams, compiled, err := c.synthesizeChains(datacenter, listener, boundListener)
+		if err != nil {
+			return configSnapshotIngressGateway{}, err
+		}
+
+		if len(upstreams) == 0 {
+			// skip if we can't construct any upstreams
+			continue
+		}
+
+		ingressListener.Services = services
+		for i, service := range services {
+			id := NewUpstreamIDFromServiceName(structs.NewServiceName(service.Name, &service.EnterpriseMeta))
+			upstreamEndpoints := make(map[string]structs.CheckServiceNodes)
+			gatewayEndpoints := make(map[string]structs.CheckServiceNodes)
+
+			// add the watched endpoints and gateway endpoints under the new upstream
+			for _, endpoints := range c.WatchedUpstreamEndpoints {
+				for targetID, endpoint := range endpoints {
+					upstreamEndpoints[targetID] = endpoint
+				}
+			}
+			for _, endpoints := range c.WatchedGatewayEndpoints {
+				for targetID, endpoint := range endpoints {
+					gatewayEndpoints[targetID] = endpoint
+				}
+			}
+
+			synthesizedChains[id] = compiled[i]
+			watchedUpstreamEndpoints[id] = upstreamEndpoints
+			watchedGatewayEndpoints[id] = gatewayEndpoints
+		}
+
+		key := IngressListenerKey{
+			Port:     listener.Port,
+			Protocol: string(listener.Protocol),
+		}
+
+		// Configure TLS for the ingress listener
+		tls, err := c.toIngressTLS(key, listener, boundListener)
+		if err != nil {
+			return configSnapshotIngressGateway{}, err
+		}
+
+		ingressListener.TLS = tls
+		ingressListeners[key] = ingressListener
+		ingressUpstreams[key] = upstreams
+	}
+
+	snapshotUpstreams := c.DeepCopy().ConfigSnapshotUpstreams
+	snapshotUpstreams.DiscoveryChain = synthesizedChains
+	snapshotUpstreams.WatchedUpstreamEndpoints = watchedUpstreamEndpoints
+	snapshotUpstreams.WatchedGatewayEndpoints = watchedGatewayEndpoints
+
+	return configSnapshotIngressGateway{
+		Upstreams:               ingressUpstreams,
+		ConfigSnapshotUpstreams: snapshotUpstreams,
+		GatewayConfigLoaded:     true,
+		Listeners:               ingressListeners,
+	}, nil
+}
+
 func (c *configSnapshotAPIGateway) synthesizeChains(datacenter string, listener structs.APIGatewayListener, boundListener structs.BoundAPIGatewayListener) ([]structs.IngressService, structs.Upstreams, []*structs.CompiledDiscoveryChain, error) {
 	chains := []*structs.CompiledDiscoveryChain{}
 
@@ -833,6 +930,27 @@ DOMAIN_LOOP:
 	return services, upstreams, compiled, err
 }
 
+func (c *configSnapshotAPIGateway) toIngressTLS(key IngressListenerKey, listener structs.APIGatewayListener, bound structs.BoundAPIGatewayListener) (*structs.GatewayTLSConfig, error) {
+	if len(listener.TLS.Certificates) == 0 {
+		return nil, nil
+	}
+
+	for _, certRef := range bound.Certificates {
+		cert, ok := c.Certificates.Get(certRef)
+		if !ok {
+			continue
+		}
+		c.ListenerCertificates[key] = append(c.ListenerCertificates[key], *cert)
+	}
+
+	return &structs.GatewayTLSConfig{
+		Enabled:       true,
+		TLSMinVersion: listener.TLS.MinVersion,
+		TLSMaxVersion: listener.TLS.MaxVersion,
+		CipherSuites:  listener.TLS.CipherSuites,
+	}, nil
+}
+
 // valid tests for two valid api gateway snapshot states:
 //  1. waiting: the watch on api and bound gateway entries is set, but none were received
 //  2. loaded: both the valid config entries AND the leaf certs are set
@@ -907,10 +1025,6 @@ func (c *configSnapshotIngressGateway) valid() bool {
 
 type APIGatewayListenerKey = IngressListenerKey
 
-func APIGatewayListenerKeyFromListener(l structs.APIGatewayListener) APIGatewayListenerKey {
-	return APIGatewayListenerKey{Protocol: string(l.Protocol), Port: l.Port}
-}
-
 type IngressListenerKey struct {
 	Protocol string
 	Port     int
@@ -934,7 +1048,6 @@ func IngressListenerKeyFromListener(l structs.IngressListener) IngressListenerKe
 type ConfigSnapshot struct {
 	Kind                  structs.ServiceKind
 	Service               string
-	ServiceLocality       *structs.Locality
 	ProxyID               ProxyID
 	Address               string
 	Port                  int
@@ -944,7 +1057,6 @@ type ConfigSnapshot struct {
 	Datacenter            string
 	IntentionDefaultAllow bool
 	Locality              GatewayKey
-	JWTProviders          map[string]*structs.JWTProviderConfigEntry
 
 	ServerSNIFn ServerSNIFunc
 	Roots       *structs.IndexedCARoots
@@ -1047,8 +1159,8 @@ func (s *ConfigSnapshot) Clone() *ConfigSnapshot {
 		snap.APIGateway.WatchedDiscoveryChains = nil
 
 		// only api-gateway
-		// snap.APIGateway.LeafCertWatchCancel = nil
-		// snap.APIGateway.
+		//snap.APIGateway.LeafCertWatchCancel = nil
+		//snap.APIGateway.
 	}
 
 	return snap
diff --git a/agent/proxycfg/snapshot_test.go b/agent/proxycfg/snapshot_test.go
index b4b0ab57c957a..92f2ac19f8e0d 100644
--- a/agent/proxycfg/snapshot_test.go
+++ b/agent/proxycfg/snapshot_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -11,7 +8,10 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	fuzz "github.com/google/gofuzz"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/agent/proxycfg/internal/watch"
+	"github.com/hashicorp/consul/agent/structs"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/stretchr/testify/require"
 )
 
 func TestConfigSnapshot_Clone(t *testing.T) {
@@ -53,3 +53,39 @@ func TestConfigSnapshot_Clone(t *testing.T) {
 		t.FailNow()
 	}
 }
+
+func TestAPIGatewaySnapshotToIngressGatewaySnapshot(t *testing.T) {
+	cases := map[string]struct {
+		apiGatewaySnapshot *configSnapshotAPIGateway
+		expected           configSnapshotIngressGateway
+	}{
+		"default": {
+			apiGatewaySnapshot: &configSnapshotAPIGateway{
+				Listeners: map[string]structs.APIGatewayListener{},
+			},
+			expected: configSnapshotIngressGateway{
+				GatewayConfigLoaded: true,
+				ConfigSnapshotUpstreams: ConfigSnapshotUpstreams{
+					PeerUpstreamEndpoints:    watch.NewMap[UpstreamID, structs.CheckServiceNodes](),
+					WatchedLocalGWEndpoints:  watch.NewMap[string, structs.CheckServiceNodes](),
+					WatchedGatewayEndpoints:  map[UpstreamID]map[string]structs.CheckServiceNodes{},
+					WatchedUpstreamEndpoints: map[UpstreamID]map[string]structs.CheckServiceNodes{},
+					UpstreamPeerTrustBundles: watch.NewMap[string, *pbpeering.PeeringTrustBundle](),
+					DiscoveryChain:           map[UpstreamID]*structs.CompiledDiscoveryChain{},
+				},
+				Listeners: map[IngressListenerKey]structs.IngressListener{},
+				Defaults:  structs.IngressServiceConfig{},
+				Upstreams: map[IngressListenerKey]structs.Upstreams{},
+			},
+		},
+	}
+
+	for name, tc := range cases {
+		t.Run(name, func(t *testing.T) {
+			actual, err := tc.apiGatewaySnapshot.ToIngress("dc1")
+			require.NoError(t, err)
+
+			require.Equal(t, tc.expected, actual)
+		})
+	}
+}
diff --git a/agent/proxycfg/state.go b/agent/proxycfg/state.go
index 853dca5a9f1bf..8c81faad08d17 100644
--- a/agent/proxycfg/state.go
+++ b/agent/proxycfg/state.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -46,7 +43,6 @@ const (
 	serviceResolverIDPrefix            = "service-resolver:"
 	serviceIntentionsIDPrefix          = "service-intentions:"
 	intentionUpstreamsID               = "intention-upstreams"
-	jwtProviderID                      = "jwt-provider"
 	peerServersWatchID                 = "peer-servers"
 	peeredUpstreamsID                  = "peered-upstreams"
 	intentionUpstreamsDestinationID    = "intention-upstreams-destination"
@@ -126,7 +122,6 @@ type serviceInstance struct {
 	taggedAddresses map[string]structs.ServiceAddress
 	proxyCfg        structs.ConnectProxyConfig
 	token           string
-	locality        *structs.Locality
 }
 
 func copyProxyConfig(ns *structs.NodeService) (structs.ConnectProxyConfig, error) {
@@ -247,7 +242,6 @@ func newServiceInstanceFromNodeService(id ProxyID, ns *structs.NodeService, toke
 	return serviceInstance{
 		kind:            ns.Kind,
 		service:         ns.Service,
-		locality:        ns.Locality,
 		proxyID:         id,
 		address:         ns.Address,
 		port:            ns.Port,
@@ -307,7 +301,6 @@ func newConfigSnapshotFromServiceInstance(s serviceInstance, config stateConfig)
 	return ConfigSnapshot{
 		Kind:                  s.kind,
 		Service:               s.service,
-		ServiceLocality:       s.locality,
 		ProxyID:               s.proxyID,
 		Address:               s.address,
 		Port:                  s.port,
diff --git a/agent/proxycfg/state_ce_test.go b/agent/proxycfg/state_ce_test.go
index 61ba1fcc3a536..0034041f740a7 100644
--- a/agent/proxycfg/state_ce_test.go
+++ b/agent/proxycfg/state_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package proxycfg
 
diff --git a/agent/proxycfg/state_test.go b/agent/proxycfg/state_test.go
index 2a6792aa22e93..2b339c79a0cd7 100644
--- a/agent/proxycfg/state_test.go
+++ b/agent/proxycfg/state_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -16,13 +13,11 @@ import (
 
 	"github.com/hashicorp/consul/acl"
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
-	"github.com/hashicorp/consul/agent/configentry"
 	"github.com/hashicorp/consul/agent/consul/discoverychain"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/structs"
 	apimod "github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
@@ -139,7 +134,7 @@ func recordWatches(sc *stateConfig) *watchRecorder {
 		IntentionUpstreams:              typedWatchRecorder[*structs.ServiceSpecificRequest]{wr},
 		IntentionUpstreamsDestination:   typedWatchRecorder[*structs.ServiceSpecificRequest]{wr},
 		InternalServiceDump:             typedWatchRecorder[*structs.ServiceDumpRequest]{wr},
-		LeafCertificate:                 typedWatchRecorder[*leafcert.ConnectCALeafRequest]{wr},
+		LeafCertificate:                 typedWatchRecorder[*cachetype.ConnectCALeafRequest]{wr},
 		PeeringList:                     typedWatchRecorder[*cachetype.PeeringListRequest]{wr},
 		PeeredUpstreams:                 typedWatchRecorder[*structs.PartitionSpecificRequest]{wr},
 		PreparedQuery:                   typedWatchRecorder[*structs.PreparedQueryExecuteRequest]{wr},
@@ -224,7 +219,7 @@ func genVerifyTrustBundleReadWatch(peer string) verifyWatchRequest {
 
 func genVerifyLeafWatchWithDNSSANs(expectedService string, expectedDatacenter string, expectedDNSSANs []string) verifyWatchRequest {
 	return func(t testing.TB, request any) {
-		reqReal, ok := request.(*leafcert.ConnectCALeafRequest)
+		reqReal, ok := request.(*cachetype.ConnectCALeafRequest)
 		reqReal.Token = aclToken
 		require.True(t, ok)
 		require.Equal(t, aclToken, reqReal.Token)
@@ -438,12 +433,6 @@ func upstreamIDForDC2(uid UpstreamID) UpstreamID {
 	return uid
 }
 
-func discoChainSetWithEntries(entries ...structs.ConfigEntry) *configentry.DiscoveryChainSet {
-	set := configentry.NewDiscoveryChainSet()
-	set.AddEntries(entries...)
-	return set
-}
-
 // This test is meant to exercise the various parts of the cache watching done by the state as
 // well as its management of the ConfigSnapshot
 //
@@ -687,7 +676,7 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 						Chain: discoverychain.TestCompileConfigEntries(t, "api", "default", "default", "dc1", "trustdomain.consul",
 							func(req *discoverychain.CompileRequest) {
 								req.OverrideMeshGateway.Mode = meshGatewayProxyConfigValue
-							}, nil),
+							}),
 					},
 					Err: nil,
 				},
@@ -697,7 +686,7 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 						Chain: discoverychain.TestCompileConfigEntries(t, "api-failover-remote", "default", "default", "dc2", "trustdomain.consul",
 							func(req *discoverychain.CompileRequest) {
 								req.OverrideMeshGateway.Mode = structs.MeshGatewayModeRemote
-							}, nil),
+							}),
 					},
 					Err: nil,
 				},
@@ -707,7 +696,7 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 						Chain: discoverychain.TestCompileConfigEntries(t, "api-failover-local", "default", "default", "dc2", "trustdomain.consul",
 							func(req *discoverychain.CompileRequest) {
 								req.OverrideMeshGateway.Mode = structs.MeshGatewayModeLocal
-							}, nil),
+							}),
 					},
 					Err: nil,
 				},
@@ -717,7 +706,7 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 						Chain: discoverychain.TestCompileConfigEntries(t, "api-failover-direct", "default", "default", "dc2", "trustdomain.consul",
 							func(req *discoverychain.CompileRequest) {
 								req.OverrideMeshGateway.Mode = structs.MeshGatewayModeNone
-							}, nil),
+							}),
 					},
 					Err: nil,
 				},
@@ -727,14 +716,14 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 						Chain: discoverychain.TestCompileConfigEntries(t, "api-dc2", "default", "default", "dc1", "trustdomain.consul",
 							func(req *discoverychain.CompileRequest) {
 								req.OverrideMeshGateway.Mode = meshGatewayProxyConfigValue
-							}, discoChainSetWithEntries(&structs.ServiceResolverConfigEntry{
+							}, &structs.ServiceResolverConfigEntry{
 								Kind: structs.ServiceResolver,
 								Name: "api-dc2",
 								Redirect: &structs.ServiceResolverRedirect{
 									Service:    "api",
 									Datacenter: "dc2",
 								},
-							})),
+							}),
 					},
 					Err: nil,
 				},
@@ -744,7 +733,7 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 						Chain: discoverychain.TestCompileConfigEntries(t, "api-failover-to-peer", "default", "default", "dc1", "trustdomain.consul",
 							func(req *discoverychain.CompileRequest) {
 								req.OverrideMeshGateway.Mode = meshGatewayProxyConfigValue
-							}, discoChainSetWithEntries(&structs.ServiceResolverConfigEntry{
+							}, &structs.ServiceResolverConfigEntry{
 								Kind: structs.ServiceResolver,
 								Name: "api-failover-to-peer",
 								Failover: map[string]structs.ServiceResolverFailover{
@@ -754,7 +743,7 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 										},
 									},
 								},
-							})),
+							}),
 					},
 					Err: nil,
 				},
@@ -839,7 +828,7 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 		}
 	}
 
-	dbIxnMatch := structs.SimplifiedIntentions{
+	dbIxnMatch := structs.Intentions{
 		{
 			ID:              "abc-123",
 			SourceNS:        "default",
@@ -1516,7 +1505,7 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 						{
 							CorrelationID: "discovery-chain:" + apiUID.String(),
 							Result: &structs.DiscoveryChainResponse{
-								Chain: discoverychain.TestCompileConfigEntries(t, "api", "default", "default", "dc1", "trustdomain.consul", nil, nil),
+								Chain: discoverychain.TestCompileConfigEntries(t, "api", "default", "default", "dc1", "trustdomain.consul", nil),
 							},
 							Err: nil,
 						},
@@ -2397,13 +2386,13 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 							Result: &structs.DiscoveryChainResponse{
 								Chain: discoverychain.TestCompileConfigEntries(
 									t, "db", "default", "default", "dc1", "trustdomain.consul", nil,
-									discoChainSetWithEntries(&structs.ServiceConfigEntry{
+									&structs.ServiceConfigEntry{
 										Kind: structs.ServiceDefaults,
 										Name: "db",
 										TransparentProxy: structs.TransparentProxyConfig{
 											DialedDirectly: true,
 										},
-									}),
+									},
 								),
 							},
 							Err: nil,
@@ -2576,14 +2565,13 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 						{
 							CorrelationID: "discovery-chain:" + dbUID.String(),
 							Result: &structs.DiscoveryChainResponse{
-								Chain: discoverychain.TestCompileConfigEntries(t, "db", "default", "default", "dc1", "trustdomain.consul", nil,
-									discoChainSetWithEntries(&structs.ServiceResolverConfigEntry{
-										Kind: structs.ServiceResolver,
-										Name: "db",
-										Redirect: &structs.ServiceResolverRedirect{
-											Service: "mysql",
-										},
-									})),
+								Chain: discoverychain.TestCompileConfigEntries(t, "db", "default", "default", "dc1", "trustdomain.consul", nil, &structs.ServiceResolverConfigEntry{
+									Kind: structs.ServiceResolver,
+									Name: "db",
+									Redirect: &structs.ServiceResolverRedirect{
+										Service: "mysql",
+									},
+								}),
 							},
 							Err: nil,
 						},
@@ -3108,7 +3096,7 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 								Chain: discoverychain.TestCompileConfigEntries(t, "db", "default", "default", "dc2", "trustdomain.consul",
 									func(req *discoverychain.CompileRequest) {
 										req.OverrideMeshGateway.Mode = structs.MeshGatewayModeLocal
-									}, nil),
+									}),
 							},
 							Err: nil,
 						},
@@ -3552,7 +3540,7 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 						{
 							CorrelationID: fmt.Sprintf("discovery-chain:%s", apiUID.String()),
 							Result: &structs.DiscoveryChainResponse{
-								Chain: discoverychain.TestCompileConfigEntries(t, "api", "default", "default", "dc1", "trustdomain.consul", nil, nil),
+								Chain: discoverychain.TestCompileConfigEntries(t, "api", "default", "default", "dc1", "trustdomain.consul", nil),
 							},
 							Err: nil,
 						},
@@ -3700,7 +3688,7 @@ func TestState_WatchesAndUpdates(t *testing.T) {
 						{
 							CorrelationID: fmt.Sprintf("discovery-chain:%s", telemetryCollectorUID.String()),
 							Result: &structs.DiscoveryChainResponse{
-								Chain: discoverychain.TestCompileConfigEntries(t, telemetryCollector.Name, "default", "default", "dc1", "trustdomain.consul", nil, nil),
+								Chain: discoverychain.TestCompileConfigEntries(t, telemetryCollector.Name, "default", "default", "dc1", "trustdomain.consul", nil),
 							},
 							Err: nil,
 						},
diff --git a/agent/proxycfg/terminating_gateway.go b/agent/proxycfg/terminating_gateway.go
index a465808390ade..8d37d9fc9b5b4 100644
--- a/agent/proxycfg/terminating_gateway.go
+++ b/agent/proxycfg/terminating_gateway.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -9,9 +6,8 @@ import (
 	"strings"
 
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 type handlerTerminatingGateway struct {
@@ -58,7 +54,7 @@ func (s *handlerTerminatingGateway) initialize(ctx context.Context) (ConfigSnaps
 
 	snap.TerminatingGateway.WatchedServices = make(map[structs.ServiceName]context.CancelFunc)
 	snap.TerminatingGateway.WatchedIntentions = make(map[structs.ServiceName]context.CancelFunc)
-	snap.TerminatingGateway.Intentions = make(map[structs.ServiceName]structs.SimplifiedIntentions)
+	snap.TerminatingGateway.Intentions = make(map[structs.ServiceName]structs.Intentions)
 	snap.TerminatingGateway.WatchedLeaves = make(map[structs.ServiceName]context.CancelFunc)
 	snap.TerminatingGateway.ServiceLeaves = make(map[structs.ServiceName]*structs.IssuedCert)
 	snap.TerminatingGateway.WatchedConfigs = make(map[structs.ServiceName]context.CancelFunc)
@@ -199,7 +195,7 @@ func (s *handlerTerminatingGateway) handleUpdate(ctx context.Context, u UpdateEv
 			// This cert is used to terminate mTLS connections on the service's behalf
 			if _, ok := snap.TerminatingGateway.WatchedLeaves[svc.Service]; !ok {
 				ctx, cancel := context.WithCancel(ctx)
-				err := s.dataSources.LeafCertificate.Notify(ctx, &leafcert.ConnectCALeafRequest{
+				err := s.dataSources.LeafCertificate.Notify(ctx, &cachetype.ConnectCALeafRequest{
 					Datacenter:     s.source.Datacenter,
 					Token:          s.token,
 					Service:        svc.Service.Name,
@@ -403,7 +399,7 @@ func (s *handlerTerminatingGateway) handleUpdate(ctx context.Context, u UpdateEv
 		}
 
 	case strings.HasPrefix(u.CorrelationID, serviceIntentionsIDPrefix):
-		resp, ok := u.Result.(structs.SimplifiedIntentions)
+		resp, ok := u.Result.(structs.Intentions)
 		if !ok {
 			return fmt.Errorf("invalid type for response: %T", u.Result)
 		}
diff --git a/agent/proxycfg/testing.go b/agent/proxycfg/testing.go
index bdd565ec0454e..7c4b85b97124c 100644
--- a/agent/proxycfg/testing.go
+++ b/agent/proxycfg/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -21,10 +18,9 @@ import (
 	"github.com/hashicorp/consul/agent/cache"
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
 	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 func TestPeerTrustBundles(t testing.T) *pbpeering.TrustBundleListByServiceResponse {
@@ -142,8 +138,8 @@ func TestMeshGatewayLeafForCA(t testing.T, ca *structs.CARoot) *structs.IssuedCe
 
 // TestIntentions returns a sample intentions match result useful to
 // mocking service discovery cache results.
-func TestIntentions() structs.SimplifiedIntentions {
-	return structs.SimplifiedIntentions{
+func TestIntentions() structs.Intentions {
+	return structs.Intentions{
 		{
 			ID:              "foo",
 			SourceNS:        "default",
@@ -167,7 +163,7 @@ func TestUpstreamNodes(t testing.T, service string) structs.CheckServiceNodes {
 				Datacenter: "dc1",
 				Partition:  structs.NodeEnterpriseMetaInDefaultPartition().PartitionOrEmpty(),
 			},
-			Service: structs.TestNodeServiceWithName(service),
+			Service: structs.TestNodeServiceWithName(t, service),
 		},
 		structs.CheckServiceNode{
 			Node: &structs.Node{
@@ -177,47 +173,7 @@ func TestUpstreamNodes(t testing.T, service string) structs.CheckServiceNodes {
 				Datacenter: "dc1",
 				Partition:  structs.NodeEnterpriseMetaInDefaultPartition().PartitionOrEmpty(),
 			},
-			Service: structs.TestNodeServiceWithName(service),
-		},
-	}
-}
-
-// TestUpstreamNodesWithServiceSubset returns a sample service discovery result with one instance tagged v1
-// and the other tagged v2
-func TestUpstreamNodesWithServiceSubset(t testing.T, service string) structs.CheckServiceNodes {
-	return structs.CheckServiceNodes{
-		structs.CheckServiceNode{
-			Node: &structs.Node{
-				ID:         "test1",
-				Node:       "test1",
-				Address:    "10.10.1.3",
-				Datacenter: "dc1",
-				Partition:  structs.NodeEnterpriseMetaInDefaultPartition().PartitionOrEmpty(),
-			},
-			Service: &structs.NodeService{
-				Kind:    structs.ServiceKindTypical,
-				Service: service,
-				Port:    8080,
-				Meta:    map[string]string{"Version": "1"},
-				Weights: &structs.Weights{
-					Passing: 300, // Check that this gets normalized to 128
-				},
-			},
-		},
-		structs.CheckServiceNode{
-			Node: &structs.Node{
-				ID:         "test2",
-				Node:       "test2",
-				Address:    "10.10.1.4",
-				Datacenter: "dc1",
-				Partition:  structs.NodeEnterpriseMetaInDefaultPartition().PartitionOrEmpty(),
-			},
-			Service: &structs.NodeService{
-				Kind:    structs.ServiceKindTypical,
-				Service: service,
-				Port:    8080,
-				Meta:    map[string]string{"Version": "2"},
-			},
+			Service: structs.TestNodeServiceWithName(t, service),
 		},
 	}
 }
@@ -271,7 +227,7 @@ func TestUpstreamNodesInStatus(t testing.T, status string) structs.CheckServiceN
 				Address:    "10.10.1.1",
 				Datacenter: "dc1",
 			},
-			Service: structs.TestNodeService(),
+			Service: structs.TestNodeService(t),
 			Checks: structs.HealthChecks{
 				&structs.HealthCheck{
 					Node:        "test1",
@@ -288,7 +244,7 @@ func TestUpstreamNodesInStatus(t testing.T, status string) structs.CheckServiceN
 				Address:    "10.10.1.2",
 				Datacenter: "dc1",
 			},
-			Service: structs.TestNodeService(),
+			Service: structs.TestNodeService(t),
 			Checks: structs.HealthChecks{
 				&structs.HealthCheck{
 					Node:        "test2",
@@ -310,7 +266,7 @@ func TestUpstreamNodesDC2(t testing.T) structs.CheckServiceNodes {
 				Address:    "10.20.1.1",
 				Datacenter: "dc2",
 			},
-			Service: structs.TestNodeService(),
+			Service: structs.TestNodeService(t),
 		},
 		structs.CheckServiceNode{
 			Node: &structs.Node{
@@ -319,7 +275,7 @@ func TestUpstreamNodesDC2(t testing.T) structs.CheckServiceNodes {
 				Address:    "10.20.1.2",
 				Datacenter: "dc2",
 			},
-			Service: structs.TestNodeService(),
+			Service: structs.TestNodeService(t),
 		},
 	}
 }
@@ -333,7 +289,7 @@ func TestUpstreamNodesInStatusDC2(t testing.T, status string) structs.CheckServi
 				Address:    "10.20.1.1",
 				Datacenter: "dc2",
 			},
-			Service: structs.TestNodeService(),
+			Service: structs.TestNodeService(t),
 			Checks: structs.HealthChecks{
 				&structs.HealthCheck{
 					Node:        "test1",
@@ -350,7 +306,7 @@ func TestUpstreamNodesInStatusDC2(t testing.T, status string) structs.CheckServi
 				Address:    "10.20.1.2",
 				Datacenter: "dc2",
 			},
-			Service: structs.TestNodeService(),
+			Service: structs.TestNodeService(t),
 			Checks: structs.HealthChecks{
 				&structs.HealthCheck{
 					Node:        "test2",
@@ -372,7 +328,7 @@ func TestUpstreamNodesAlternate(t testing.T) structs.CheckServiceNodes {
 				Address:    "10.20.1.1",
 				Datacenter: "dc1",
 			},
-			Service: structs.TestNodeService(),
+			Service: structs.TestNodeService(t),
 		},
 		structs.CheckServiceNode{
 			Node: &structs.Node{
@@ -381,7 +337,7 @@ func TestUpstreamNodesAlternate(t testing.T) structs.CheckServiceNodes {
 				Address:    "10.20.1.2",
 				Datacenter: "dc1",
 			},
-			Service: structs.TestNodeService(),
+			Service: structs.TestNodeService(t),
 		},
 	}
 }
@@ -790,7 +746,7 @@ func testConfigSnapshotFixture(
 			IntentionUpstreams:              &noopDataSource[*structs.ServiceSpecificRequest]{},
 			IntentionUpstreamsDestination:   &noopDataSource[*structs.ServiceSpecificRequest]{},
 			InternalServiceDump:             &noopDataSource[*structs.ServiceDumpRequest]{},
-			LeafCertificate:                 &noopDataSource[*leafcert.ConnectCALeafRequest]{},
+			LeafCertificate:                 &noopDataSource[*cachetype.ConnectCALeafRequest]{},
 			PeeringList:                     &noopDataSource[*cachetype.PeeringListRequest]{},
 			PeeredUpstreams:                 &noopDataSource[*structs.PartitionSpecificRequest]{},
 			PreparedQuery:                   &noopDataSource[*structs.PreparedQueryExecuteRequest]{},
@@ -991,11 +947,11 @@ func NewTestDataSources() *TestDataSources {
 		GatewayServices:                 NewTestDataSource[*structs.ServiceSpecificRequest, *structs.IndexedGatewayServices](),
 		Health:                          NewTestDataSource[*structs.ServiceSpecificRequest, *structs.IndexedCheckServiceNodes](),
 		HTTPChecks:                      NewTestDataSource[*cachetype.ServiceHTTPChecksRequest, []structs.CheckType](),
-		Intentions:                      NewTestDataSource[*structs.ServiceSpecificRequest, structs.SimplifiedIntentions](),
+		Intentions:                      NewTestDataSource[*structs.ServiceSpecificRequest, structs.Intentions](),
 		IntentionUpstreams:              NewTestDataSource[*structs.ServiceSpecificRequest, *structs.IndexedServiceList](),
 		IntentionUpstreamsDestination:   NewTestDataSource[*structs.ServiceSpecificRequest, *structs.IndexedServiceList](),
 		InternalServiceDump:             NewTestDataSource[*structs.ServiceDumpRequest, *structs.IndexedCheckServiceNodes](),
-		LeafCertificate:                 NewTestDataSource[*leafcert.ConnectCALeafRequest, *structs.IssuedCert](),
+		LeafCertificate:                 NewTestDataSource[*cachetype.ConnectCALeafRequest, *structs.IssuedCert](),
 		PeeringList:                     NewTestDataSource[*cachetype.PeeringListRequest, *pbpeering.PeeringListResponse](),
 		PreparedQuery:                   NewTestDataSource[*structs.PreparedQueryExecuteRequest, *structs.PreparedQueryExecuteResponse](),
 		ResolvedServiceConfig:           NewTestDataSource[*structs.ServiceConfigRequest, *structs.ServiceConfigResponse](),
@@ -1018,11 +974,11 @@ type TestDataSources struct {
 	ServiceGateways                 *TestDataSource[*structs.ServiceSpecificRequest, *structs.IndexedServiceNodes]
 	Health                          *TestDataSource[*structs.ServiceSpecificRequest, *structs.IndexedCheckServiceNodes]
 	HTTPChecks                      *TestDataSource[*cachetype.ServiceHTTPChecksRequest, []structs.CheckType]
-	Intentions                      *TestDataSource[*structs.ServiceSpecificRequest, structs.SimplifiedIntentions]
+	Intentions                      *TestDataSource[*structs.ServiceSpecificRequest, structs.Intentions]
 	IntentionUpstreams              *TestDataSource[*structs.ServiceSpecificRequest, *structs.IndexedServiceList]
 	IntentionUpstreamsDestination   *TestDataSource[*structs.ServiceSpecificRequest, *structs.IndexedServiceList]
 	InternalServiceDump             *TestDataSource[*structs.ServiceDumpRequest, *structs.IndexedCheckServiceNodes]
-	LeafCertificate                 *TestDataSource[*leafcert.ConnectCALeafRequest, *structs.IssuedCert]
+	LeafCertificate                 *TestDataSource[*cachetype.ConnectCALeafRequest, *structs.IssuedCert]
 	PeeringList                     *TestDataSource[*cachetype.PeeringListRequest, *pbpeering.PeeringListResponse]
 	PeeredUpstreams                 *TestDataSource[*structs.PartitionSpecificRequest, *structs.IndexedPeeredServiceList]
 	PreparedQuery                   *TestDataSource[*structs.PreparedQueryExecuteRequest, *structs.PreparedQueryExecuteResponse]
diff --git a/agent/proxycfg/testing_api_gateway.go b/agent/proxycfg/testing_api_gateway.go
index ddfa17dcf6ab2..9aad3cb9d40f6 100644
--- a/agent/proxycfg/testing_api_gateway.go
+++ b/agent/proxycfg/testing_api_gateway.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -8,9 +5,9 @@ import (
 
 	"github.com/mitchellh/go-testing-interface"
 
-	"github.com/hashicorp/consul/agent/configentry"
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/consul/discoverychain"
+
 	"github.com/hashicorp/consul/agent/structs"
 )
 
@@ -87,15 +84,12 @@ func TestConfigSnapshotAPIGateway(
 			},
 		}
 
-		set := configentry.NewDiscoveryChainSet()
-		set.AddEntries(entries...)
-
 		// Add a discovery chain watch event for each service.
 		for _, serviceName := range route.GetServiceNames() {
 			discoChain := UpdateEvent{
 				CorrelationID: fmt.Sprintf("discovery-chain:%s", UpstreamIDString("", "", serviceName.Name, &serviceName.EnterpriseMeta, "")),
 				Result: &structs.DiscoveryChainResponse{
-					Chain: discoverychain.TestCompileConfigEntries(t, serviceName.Name, "default", "default", "dc1", connect.TestClusterID+".consul", nil, set),
+					Chain: discoverychain.TestCompileConfigEntries(t, serviceName.Name, "default", "default", "dc1", connect.TestClusterID+".consul", nil, entries...),
 				},
 			}
 			baseEvents = append(baseEvents, discoChain)
diff --git a/agent/proxycfg/testing_ce.go b/agent/proxycfg/testing_ce.go
index 97c23d82eb3dd..11f9a6adeb7f2 100644
--- a/agent/proxycfg/testing_ce.go
+++ b/agent/proxycfg/testing_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package proxycfg
 
diff --git a/agent/proxycfg/testing_connect_proxy.go b/agent/proxycfg/testing_connect_proxy.go
index cf6f4a479b1eb..73c3f8cc90e3f 100644
--- a/agent/proxycfg/testing_connect_proxy.go
+++ b/agent/proxycfg/testing_connect_proxy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -23,7 +20,7 @@ func TestConfigSnapshot(t testing.T, nsFn func(ns *structs.NodeService), extraUp
 	roots, leaf := TestCerts(t)
 
 	// no entries implies we'll get a default chain
-	dbChain := discoverychain.TestCompileConfigEntries(t, "db", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+	dbChain := discoverychain.TestCompileConfigEntries(t, "db", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	assert.True(t, dbChain.Default)
 
 	var (
@@ -48,7 +45,7 @@ func TestConfigSnapshot(t testing.T, nsFn func(ns *structs.NodeService), extraUp
 		},
 		{
 			CorrelationID: intentionsWatchID,
-			Result:        structs.SimplifiedIntentions{}, // no intentions defined
+			Result:        structs.Intentions{}, // no intentions defined
 		},
 		{
 			CorrelationID: svcChecksWatchIDPrefix + webSN,
@@ -129,7 +126,7 @@ func TestConfigSnapshotDiscoveryChain(
 		},
 		{
 			CorrelationID: intentionsWatchID,
-			Result:        structs.SimplifiedIntentions{}, // no intentions defined
+			Result:        structs.Intentions{}, // no intentions defined
 		},
 		{
 			CorrelationID: meshConfigEntryID,
@@ -188,7 +185,7 @@ func TestConfigSnapshotExposeConfig(t testing.T, nsFn func(ns *structs.NodeServi
 		},
 		{
 			CorrelationID: intentionsWatchID,
-			Result:        structs.SimplifiedIntentions{}, // no intentions defined
+			Result:        structs.Intentions{}, // no intentions defined
 		},
 		{
 			CorrelationID: svcChecksWatchIDPrefix + webSN,
@@ -227,14 +224,6 @@ func TestConfigSnapshotExposeConfig(t testing.T, nsFn func(ns *structs.NodeServi
 }
 
 func TestConfigSnapshotExposeChecks(t testing.T) *ConfigSnapshot {
-	return testConfigSnapshotExposedChecks(t, false)
-}
-
-func TestConfigSnapshotExposeChecksWithBindOverride(t testing.T) *ConfigSnapshot {
-	return testConfigSnapshotExposedChecks(t, true)
-}
-
-func testConfigSnapshotExposedChecks(t testing.T, overrideBind bool) *ConfigSnapshot {
 	return TestConfigSnapshot(t,
 		func(ns *structs.NodeService) {
 			ns.Address = "1.2.3.4"
@@ -243,12 +232,6 @@ func testConfigSnapshotExposedChecks(t testing.T, overrideBind bool) *ConfigSnap
 			ns.Proxy.Expose = structs.ExposeConfig{
 				Checks: true,
 			}
-			if overrideBind {
-				if ns.Proxy.Config == nil {
-					ns.Proxy.Config = map[string]any{}
-				}
-				ns.Proxy.Config["bind_address"] = "6.7.8.9"
-			}
 		},
 		[]UpdateEvent{
 			{
@@ -267,32 +250,6 @@ func testConfigSnapshotExposedChecks(t testing.T, overrideBind bool) *ConfigSnap
 	)
 }
 
-func TestConfigSnapshotExposeChecksGRPC(t testing.T) *ConfigSnapshot {
-	return TestConfigSnapshot(t,
-		func(ns *structs.NodeService) {
-			ns.Address = "1.2.3.4"
-			ns.Port = 9090
-			ns.Proxy.Upstreams = nil
-			ns.Proxy.Expose = structs.ExposeConfig{
-				Checks: true,
-			}
-		},
-		[]UpdateEvent{
-			{
-				CorrelationID: svcChecksWatchIDPrefix + structs.ServiceIDString("web", nil),
-				Result: []structs.CheckType{{
-					CheckID:   types.CheckID("grpc"),
-					Name:      "grpc",
-					GRPC:      "localhost:9090/v1.Health",
-					ProxyGRPC: "localhost:21501/myservice",
-					Interval:  10 * time.Second,
-					Timeout:   1 * time.Second,
-				}},
-			},
-		},
-	)
-}
-
 func TestConfigSnapshotGRPCExposeHTTP1(t testing.T) *ConfigSnapshot {
 	roots, leaf := TestCerts(t)
 
@@ -333,7 +290,7 @@ func TestConfigSnapshotGRPCExposeHTTP1(t testing.T) *ConfigSnapshot {
 		},
 		{
 			CorrelationID: intentionsWatchID,
-			Result:        structs.SimplifiedIntentions{}, // no intentions defined
+			Result:        structs.Intentions{}, // no intentions defined
 		},
 		{
 			CorrelationID: svcChecksWatchIDPrefix + structs.ServiceIDString("grpc", nil),
@@ -349,7 +306,7 @@ func TestConfigSnapshotTelemetryCollector(t testing.T) *ConfigSnapshot {
 	var (
 		collector      = structs.NewServiceName(api.TelemetryCollectorName, nil)
 		collectorUID   = NewUpstreamIDFromServiceName(collector)
-		collectorChain = discoverychain.TestCompileConfigEntries(t, api.TelemetryCollectorName, "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		collectorChain = discoverychain.TestCompileConfigEntries(t, api.TelemetryCollectorName, "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	)
 
 	return TestConfigSnapshot(t, func(ns *structs.NodeService) {
diff --git a/agent/proxycfg/testing_ingress_gateway.go b/agent/proxycfg/testing_ingress_gateway.go
index 96918a261bd05..4712ea6b04b54 100644
--- a/agent/proxycfg/testing_ingress_gateway.go
+++ b/agent/proxycfg/testing_ingress_gateway.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -10,7 +7,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/configentry"
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/consul/discoverychain"
 	"github.com/hashicorp/consul/agent/structs"
@@ -157,7 +153,6 @@ func TestConfigSnapshotIngressGatewaySDS_GatewayLevel_MixedTLS(t testing.T) *Con
 		"dc1",
 		connect.TestClusterID+".consul",
 		nil,
-		nil,
 	)
 
 	insecureUID := UpstreamIDFromString("insecure")
@@ -169,7 +164,6 @@ func TestConfigSnapshotIngressGatewaySDS_GatewayLevel_MixedTLS(t testing.T) *Con
 		"dc1",
 		connect.TestClusterID+".consul",
 		nil,
-		nil,
 	)
 
 	return TestConfigSnapshotIngressGateway(t, false, "tcp", "default", nil, func(entry *structs.IngressGatewayConfigEntry) {
@@ -279,16 +273,15 @@ func TestConfigSnapshotIngressGatewaySDS_GatewayAndListenerLevel(t testing.T) *C
 }
 
 func TestConfigSnapshotIngressGatewaySDS_GatewayAndListenerLevel_HTTP(t testing.T) *ConfigSnapshot {
-	set := configentry.NewDiscoveryChainSet()
-	set.AddEntries(&structs.ServiceConfigEntry{
-		Kind:     structs.ServiceDefaults,
-		Name:     "http",
-		Protocol: "http",
-	})
 	var (
 		http      = structs.NewServiceName("http", nil)
 		httpUID   = NewUpstreamIDFromServiceName(http)
-		httpChain = discoverychain.TestCompileConfigEntries(t, "http", "default", "default", "dc1", connect.TestClusterID+".consul", nil, set)
+		httpChain = discoverychain.TestCompileConfigEntries(t, "http", "default", "default", "dc1", connect.TestClusterID+".consul", nil,
+			&structs.ServiceConfigEntry{
+				Kind:     structs.ServiceDefaults,
+				Name:     "http",
+				Protocol: "http",
+			})
 	)
 
 	return TestConfigSnapshotIngressGateway(t, false, "http", "default", nil, func(entry *structs.IngressGatewayConfigEntry) {
@@ -349,11 +342,11 @@ func TestConfigSnapshotIngressGatewaySDS_ServiceLevel(t testing.T) *ConfigSnapsh
 	var (
 		s1      = structs.NewServiceName("s1", nil)
 		s1UID   = NewUpstreamIDFromServiceName(s1)
-		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		s2      = structs.NewServiceName("s2", nil)
 		s2UID   = NewUpstreamIDFromServiceName(s2)
-		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	)
 
 	return TestConfigSnapshotIngressGateway(t, false, "tcp", "default", nil, func(entry *structs.IngressGatewayConfigEntry) {
@@ -440,11 +433,11 @@ func TestConfigSnapshotIngressGatewaySDS_ListenerAndServiceLevel(t testing.T) *C
 	var (
 		s1      = structs.NewServiceName("s1", nil)
 		s1UID   = NewUpstreamIDFromServiceName(s1)
-		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		s2      = structs.NewServiceName("s2", nil)
 		s2UID   = NewUpstreamIDFromServiceName(s2)
-		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	)
 
 	return TestConfigSnapshotIngressGateway(t, false, "tcp", "default", nil, func(entry *structs.IngressGatewayConfigEntry) {
@@ -530,11 +523,11 @@ func TestConfigSnapshotIngressGatewaySDS_MixedNoTLS(t testing.T) *ConfigSnapshot
 	var (
 		s1      = structs.NewServiceName("s1", nil)
 		s1UID   = NewUpstreamIDFromServiceName(s1)
-		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		s2      = structs.NewServiceName("s2", nil)
 		s2UID   = NewUpstreamIDFromServiceName(s2)
-		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	)
 
 	return TestConfigSnapshotIngressGateway(t, false, "tcp", "default", nil, func(entry *structs.IngressGatewayConfigEntry) {
@@ -615,11 +608,11 @@ func TestConfigSnapshotIngressGateway_MixedListeners(t testing.T) *ConfigSnapsho
 	var (
 		s1      = structs.NewServiceName("s1", nil)
 		s1UID   = NewUpstreamIDFromServiceName(s1)
-		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		s2      = structs.NewServiceName("s2", nil)
 		s2UID   = NewUpstreamIDFromServiceName(s2)
-		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	)
 
 	return TestConfigSnapshotIngressGateway(t, false, "tcp", "default", nil, func(entry *structs.IngressGatewayConfigEntry) {
@@ -717,25 +710,22 @@ func TestConfigSnapshotIngress_HTTPMultipleServices(t testing.T) *ConfigSnapshot
 		},
 	}
 
-	set := configentry.NewDiscoveryChainSet()
-	set.AddEntries(entries...)
-
 	var (
 		foo      = structs.NewServiceName("foo", nil)
 		fooUID   = NewUpstreamIDFromServiceName(foo)
-		fooChain = discoverychain.TestCompileConfigEntries(t, "foo", "default", "default", "dc1", connect.TestClusterID+".consul", nil, set)
+		fooChain = discoverychain.TestCompileConfigEntries(t, "foo", "default", "default", "dc1", connect.TestClusterID+".consul", nil, entries...)
 
 		bar      = structs.NewServiceName("bar", nil)
 		barUID   = NewUpstreamIDFromServiceName(bar)
-		barChain = discoverychain.TestCompileConfigEntries(t, "bar", "default", "default", "dc1", connect.TestClusterID+".consul", nil, set)
+		barChain = discoverychain.TestCompileConfigEntries(t, "bar", "default", "default", "dc1", connect.TestClusterID+".consul", nil, entries...)
 
 		baz      = structs.NewServiceName("baz", nil)
 		bazUID   = NewUpstreamIDFromServiceName(baz)
-		bazChain = discoverychain.TestCompileConfigEntries(t, "baz", "default", "default", "dc1", connect.TestClusterID+".consul", nil, set)
+		bazChain = discoverychain.TestCompileConfigEntries(t, "baz", "default", "default", "dc1", connect.TestClusterID+".consul", nil, entries...)
 
 		qux      = structs.NewServiceName("qux", nil)
 		quxUID   = NewUpstreamIDFromServiceName(qux)
-		quxChain = discoverychain.TestCompileConfigEntries(t, "qux", "default", "default", "dc1", connect.TestClusterID+".consul", nil, set)
+		quxChain = discoverychain.TestCompileConfigEntries(t, "qux", "default", "default", "dc1", connect.TestClusterID+".consul", nil, entries...)
 	)
 
 	require.False(t, fooChain.Default)
@@ -877,17 +867,14 @@ func TestConfigSnapshotIngress_GRPCMultipleServices(t testing.T) *ConfigSnapshot
 		},
 	}
 
-	set := configentry.NewDiscoveryChainSet()
-	set.AddEntries(entries...)
-
 	var (
 		foo      = structs.NewServiceName("foo", nil)
 		fooUID   = NewUpstreamIDFromServiceName(foo)
-		fooChain = discoverychain.TestCompileConfigEntries(t, "foo", "default", "default", "dc1", connect.TestClusterID+".consul", nil, set)
+		fooChain = discoverychain.TestCompileConfigEntries(t, "foo", "default", "default", "dc1", connect.TestClusterID+".consul", nil, entries...)
 
 		bar      = structs.NewServiceName("bar", nil)
 		barUID   = NewUpstreamIDFromServiceName(bar)
-		barChain = discoverychain.TestCompileConfigEntries(t, "bar", "default", "default", "dc1", connect.TestClusterID+".consul", nil, set)
+		barChain = discoverychain.TestCompileConfigEntries(t, "bar", "default", "default", "dc1", connect.TestClusterID+".consul", nil, entries...)
 	)
 
 	require.False(t, fooChain.Default)
@@ -965,11 +952,11 @@ func TestConfigSnapshotIngress_MultipleListenersDuplicateService(t testing.T) *C
 	var (
 		foo      = structs.NewServiceName("foo", nil)
 		fooUID   = NewUpstreamIDFromServiceName(foo)
-		fooChain = discoverychain.TestCompileConfigEntries(t, "foo", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		fooChain = discoverychain.TestCompileConfigEntries(t, "foo", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		bar      = structs.NewServiceName("bar", nil)
 		barUID   = NewUpstreamIDFromServiceName(bar)
-		barChain = discoverychain.TestCompileConfigEntries(t, "bar", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		barChain = discoverychain.TestCompileConfigEntries(t, "bar", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	)
 
 	return TestConfigSnapshotIngressGateway(t, false, "http", "default", nil, func(entry *structs.IngressGatewayConfigEntry) {
@@ -1241,17 +1228,14 @@ func TestConfigSnapshotIngressGatewayWithChain(
 			},
 		}
 
-		set := configentry.NewDiscoveryChainSet()
-		set.AddEntries(entries...)
-
 		webChain := discoverychain.TestCompileConfigEntries(t, "web",
 			webEntMeta.NamespaceOrDefault(),
 			webEntMeta.PartitionOrDefault(), "dc1",
-			connect.TestClusterID+".consul", nil, set)
+			connect.TestClusterID+".consul", nil, entries...)
 		fooChain := discoverychain.TestCompileConfigEntries(t, "foo",
 			fooEntMeta.NamespaceOrDefault(),
 			fooEntMeta.PartitionOrDefault(), "dc1",
-			connect.TestClusterID+".consul", nil, set)
+			connect.TestClusterID+".consul", nil, entries...)
 
 		updates = []UpdateEvent{
 			{
@@ -1307,19 +1291,19 @@ func TestConfigSnapshotIngressGateway_TLSMinVersionListenersGatewayDefaults(t te
 	var (
 		s1      = structs.NewServiceName("s1", nil)
 		s1UID   = NewUpstreamIDFromServiceName(s1)
-		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		s2      = structs.NewServiceName("s2", nil)
 		s2UID   = NewUpstreamIDFromServiceName(s2)
-		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		s3      = structs.NewServiceName("s3", nil)
 		s3UID   = NewUpstreamIDFromServiceName(s3)
-		s3Chain = discoverychain.TestCompileConfigEntries(t, "s3", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s3Chain = discoverychain.TestCompileConfigEntries(t, "s3", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		s4      = structs.NewServiceName("s4", nil)
 		s4UID   = NewUpstreamIDFromServiceName(s4)
-		s4Chain = discoverychain.TestCompileConfigEntries(t, "s4", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s4Chain = discoverychain.TestCompileConfigEntries(t, "s4", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	)
 
 	return TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil,
@@ -1473,11 +1457,11 @@ func TestConfigSnapshotIngressGateway_SingleTLSListener(t testing.T) *ConfigSnap
 	var (
 		s1      = structs.NewServiceName("s1", nil)
 		s1UID   = NewUpstreamIDFromServiceName(s1)
-		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		s2      = structs.NewServiceName("s2", nil)
 		s2UID   = NewUpstreamIDFromServiceName(s2)
-		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	)
 	return TestConfigSnapshotIngressGateway(t, true, "tcp", "simple", nil,
 		func(entry *structs.IngressGatewayConfigEntry) {
@@ -1552,11 +1536,11 @@ func TestConfigSnapshotIngressGateway_SingleTLSListener_GRPC(t testing.T) *Confi
 	var (
 		s1      = structs.NewServiceName("s1", nil)
 		s1UID   = NewUpstreamIDFromServiceName(s1)
-		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		s2      = structs.NewServiceName("s2", nil)
 		s2UID   = NewUpstreamIDFromServiceName(s2)
-		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	)
 	return TestConfigSnapshotIngressGateway(t, true, "grpc", "simple", nil,
 		func(entry *structs.IngressGatewayConfigEntry) {
@@ -1631,11 +1615,11 @@ func TestConfigSnapshotIngressGateway_SingleTLSListener_HTTP2(t testing.T) *Conf
 	var (
 		s1      = structs.NewServiceName("s1", nil)
 		s1UID   = NewUpstreamIDFromServiceName(s1)
-		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		s2      = structs.NewServiceName("s2", nil)
 		s2UID   = NewUpstreamIDFromServiceName(s2)
-		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	)
 	return TestConfigSnapshotIngressGateway(t, true, "http2", "simple", nil,
 		func(entry *structs.IngressGatewayConfigEntry) {
@@ -1710,11 +1694,11 @@ func TestConfigSnapshotIngressGateway_MultiTLSListener_MixedHTTP2gRPC(t testing.
 	var (
 		s1      = structs.NewServiceName("s1", nil)
 		s1UID   = NewUpstreamIDFromServiceName(s1)
-		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		s2      = structs.NewServiceName("s2", nil)
 		s2UID   = NewUpstreamIDFromServiceName(s2)
-		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	)
 	return TestConfigSnapshotIngressGateway(t, true, "tcp", "simple", nil,
 		func(entry *structs.IngressGatewayConfigEntry) {
@@ -1793,11 +1777,11 @@ func TestConfigSnapshotIngressGateway_GWTLSListener_MixedHTTP2gRPC(t testing.T)
 	var (
 		s1      = structs.NewServiceName("s1", nil)
 		s1UID   = NewUpstreamIDFromServiceName(s1)
-		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		s2      = structs.NewServiceName("s2", nil)
 		s2UID   = NewUpstreamIDFromServiceName(s2)
-		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	)
 	return TestConfigSnapshotIngressGateway(t, true, "tcp", "simple", nil,
 		func(entry *structs.IngressGatewayConfigEntry) {
@@ -1872,15 +1856,15 @@ func TestConfigSnapshotIngressGateway_TLSMixedMinVersionListeners(t testing.T) *
 	var (
 		s1      = structs.NewServiceName("s1", nil)
 		s1UID   = NewUpstreamIDFromServiceName(s1)
-		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		s2      = structs.NewServiceName("s2", nil)
 		s2UID   = NewUpstreamIDFromServiceName(s2)
-		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		s3      = structs.NewServiceName("s3", nil)
 		s3UID   = NewUpstreamIDFromServiceName(s3)
-		s3Chain = discoverychain.TestCompileConfigEntries(t, "s3", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		s3Chain = discoverychain.TestCompileConfigEntries(t, "s3", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	)
 
 	return TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil,
@@ -1888,8 +1872,8 @@ func TestConfigSnapshotIngressGateway_TLSMixedMinVersionListeners(t testing.T) *
 			entry.TLS.Enabled = true
 			entry.TLS.TLSMinVersion = types.TLSv1_2
 
-			// One listener should inherit TLS minimum version from the gateway config,
-			// two others each set explicit TLS minimum versions
+			// One listener disables TLS, one inherits TLS minimum version from the gateway
+			// config, two others set different versions
 			entry.Listeners = []structs.IngressListener{
 				{
 					Port:     8080,
@@ -1925,6 +1909,8 @@ func TestConfigSnapshotIngressGateway_TLSMixedMinVersionListeners(t testing.T) *
 			{
 				CorrelationID: gatewayServicesWatchID,
 				Result: &structs.IndexedGatewayServices{
+					// One listener should inherit TLS minimum version from the gateway config,
+					// two others each set explicit TLS minimum versions
 					Services: []*structs.GatewayService{
 						{
 							Service:  s1,
@@ -1982,208 +1968,3 @@ func TestConfigSnapshotIngressGateway_TLSMixedMinVersionListeners(t testing.T) *
 			},
 		})
 }
-
-func TestConfigSnapshotIngressGateway_TLSMixedMaxVersionListeners(t testing.T) *ConfigSnapshot {
-	var (
-		s1      = structs.NewServiceName("s1", nil)
-		s1UID   = NewUpstreamIDFromServiceName(s1)
-		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
-
-		s2      = structs.NewServiceName("s2", nil)
-		s2UID   = NewUpstreamIDFromServiceName(s2)
-		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
-
-		s3      = structs.NewServiceName("s3", nil)
-		s3UID   = NewUpstreamIDFromServiceName(s3)
-		s3Chain = discoverychain.TestCompileConfigEntries(t, "s3", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
-	)
-
-	return TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil,
-		func(entry *structs.IngressGatewayConfigEntry) {
-			entry.TLS.Enabled = true
-			entry.TLS.TLSMaxVersion = types.TLSv1_2
-
-			// One listener should inherit TLS maximum version from the gateway config,
-			// two others each set explicit TLS maximum versions
-			entry.Listeners = []structs.IngressListener{
-				{
-					Port:     8080,
-					Protocol: "http",
-					Services: []structs.IngressService{
-						{Name: "s1"},
-					},
-				},
-				{
-					Port:     8081,
-					Protocol: "http",
-					Services: []structs.IngressService{
-						{Name: "s2"},
-					},
-					TLS: &structs.GatewayTLSConfig{
-						Enabled:       true,
-						TLSMaxVersion: types.TLSv1_0,
-					},
-				},
-				{
-					Port:     8082,
-					Protocol: "http",
-					Services: []structs.IngressService{
-						{Name: "s3"},
-					},
-					TLS: &structs.GatewayTLSConfig{
-						Enabled:       true,
-						TLSMaxVersion: types.TLSv1_3,
-					},
-				},
-			}
-		}, []UpdateEvent{
-			{
-				CorrelationID: gatewayServicesWatchID,
-				Result: &structs.IndexedGatewayServices{
-					Services: []*structs.GatewayService{
-						{
-							Service:  s1,
-							Port:     8080,
-							Protocol: "http",
-						},
-						{
-							Service:  s2,
-							Port:     8081,
-							Protocol: "http",
-						},
-						{
-							Service:  s3,
-							Port:     8082,
-							Protocol: "http",
-						},
-					},
-				},
-			},
-			{
-				CorrelationID: "discovery-chain:" + s1UID.String(),
-				Result: &structs.DiscoveryChainResponse{
-					Chain: s1Chain,
-				},
-			},
-			{
-				CorrelationID: "discovery-chain:" + s2UID.String(),
-				Result: &structs.DiscoveryChainResponse{
-					Chain: s2Chain,
-				},
-			},
-			{
-				CorrelationID: "discovery-chain:" + s3UID.String(),
-				Result: &structs.DiscoveryChainResponse{
-					Chain: s3Chain,
-				},
-			},
-			{
-				CorrelationID: "upstream-target:" + s1Chain.ID() + ":" + s1UID.String(),
-				Result: &structs.IndexedCheckServiceNodes{
-					Nodes: TestUpstreamNodes(t, "s1"),
-				},
-			},
-			{
-				CorrelationID: "upstream-target:" + s2Chain.ID() + ":" + s2UID.String(),
-				Result: &structs.IndexedCheckServiceNodes{
-					Nodes: TestUpstreamNodes(t, "s2"),
-				},
-			},
-			{
-				CorrelationID: "upstream-target:" + s3Chain.ID() + ":" + s3UID.String(),
-				Result: &structs.IndexedCheckServiceNodes{
-					Nodes: TestUpstreamNodes(t, "s3"),
-				},
-			},
-		})
-}
-
-func TestConfigSnapshotIngressGateway_TLSMixedCipherVersionListeners(t testing.T) *ConfigSnapshot {
-	var (
-		s1      = structs.NewServiceName("s1", nil)
-		s1UID   = NewUpstreamIDFromServiceName(s1)
-		s1Chain = discoverychain.TestCompileConfigEntries(t, "s1", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
-
-		s2      = structs.NewServiceName("s2", nil)
-		s2UID   = NewUpstreamIDFromServiceName(s2)
-		s2Chain = discoverychain.TestCompileConfigEntries(t, "s2", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
-	)
-
-	return TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil,
-		func(entry *structs.IngressGatewayConfigEntry) {
-			entry.TLS.Enabled = true
-			entry.TLS.CipherSuites = []types.TLSCipherSuite{
-				types.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-			}
-
-			// One listener should inherit TLS Ciphers from the gateway config,
-			// the other should be set explicitly from the listener config
-			entry.Listeners = []structs.IngressListener{
-				{
-					Port:     8080,
-					Protocol: "http",
-					Services: []structs.IngressService{
-						{Name: "s1"},
-					},
-				},
-				{
-					Port:     8081,
-					Protocol: "http",
-					Services: []structs.IngressService{
-						{Name: "s2"},
-					},
-					TLS: &structs.GatewayTLSConfig{
-						Enabled: true,
-						CipherSuites: []types.TLSCipherSuite{
-							types.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
-							types.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
-						},
-					},
-				},
-			}
-		}, []UpdateEvent{
-			{
-				CorrelationID: gatewayServicesWatchID,
-				Result: &structs.IndexedGatewayServices{
-					// One listener should inherit TLS minimum version from the gateway config,
-					// two others each set explicit TLS minimum versions
-					Services: []*structs.GatewayService{
-						{
-							Service:  s1,
-							Port:     8080,
-							Protocol: "http",
-						},
-						{
-							Service:  s2,
-							Port:     8081,
-							Protocol: "http",
-						},
-					},
-				},
-			},
-			{
-				CorrelationID: "discovery-chain:" + s1UID.String(),
-				Result: &structs.DiscoveryChainResponse{
-					Chain: s1Chain,
-				},
-			},
-			{
-				CorrelationID: "discovery-chain:" + s2UID.String(),
-				Result: &structs.DiscoveryChainResponse{
-					Chain: s2Chain,
-				},
-			},
-			{
-				CorrelationID: "upstream-target:" + s1Chain.ID() + ":" + s1UID.String(),
-				Result: &structs.IndexedCheckServiceNodes{
-					Nodes: TestUpstreamNodes(t, "s1"),
-				},
-			},
-			{
-				CorrelationID: "upstream-target:" + s2Chain.ID() + ":" + s2UID.String(),
-				Result: &structs.IndexedCheckServiceNodes{
-					Nodes: TestUpstreamNodes(t, "s2"),
-				},
-			},
-		})
-}
diff --git a/agent/proxycfg/testing_mesh_gateway.go b/agent/proxycfg/testing_mesh_gateway.go
index 865e219cd4350..948a14880e7ce 100644
--- a/agent/proxycfg/testing_mesh_gateway.go
+++ b/agent/proxycfg/testing_mesh_gateway.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -12,21 +9,19 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/configentry"
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/consul/discoverychain"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 func TestConfigSnapshotMeshGateway(t testing.T, variant string, nsFn func(ns *structs.NodeService), extraUpdates []UpdateEvent) *ConfigSnapshot {
 	roots, _ := TestCertsForMeshGateway(t)
 
 	var (
-		populateServices      = true
-		useFederationStates   = false
-		deleteCrossDCEntry    = false
-		meshGatewayFederation = false
+		populateServices    = true
+		useFederationStates = false
+		deleteCrossDCEntry  = false
 	)
 
 	switch variant {
@@ -35,11 +30,6 @@ func TestConfigSnapshotMeshGateway(t testing.T, variant string, nsFn func(ns *st
 		populateServices = true
 		useFederationStates = true
 		deleteCrossDCEntry = true
-	case "mesh-gateway-federation":
-		populateServices = true
-		useFederationStates = true
-		deleteCrossDCEntry = true
-		meshGatewayFederation = true
 	case "newer-info-in-federation-states":
 		populateServices = true
 		useFederationStates = true
@@ -453,63 +443,6 @@ func TestConfigSnapshotMeshGateway(t testing.T, variant string, nsFn func(ns *st
 		})
 	}
 
-	var serverSNIFn ServerSNIFunc
-	if meshGatewayFederation {
-
-		// reproduced from tlsutil/config.go
-		serverSNIFn = func(dc, nodeName string) string {
-			// Strip the trailing '.' from the domain if any
-			domain := "consul"
-
-			if nodeName == "" || nodeName == "*" {
-				return "server." + dc + "." + domain
-			}
-
-			return nodeName + ".server." + dc + "." + domain
-		}
-
-		baseEvents = testSpliceEvents(baseEvents, []UpdateEvent{
-			{
-				CorrelationID: consulServerListWatchID,
-				Result: &structs.IndexedCheckServiceNodes{
-					Nodes: structs.CheckServiceNodes{
-						{
-							Node: &structs.Node{
-								Datacenter: "dc1",
-								Node:       "node1",
-								Address:    "127.0.0.1",
-							},
-							Service: &structs.NodeService{
-								ID:      structs.ConsulServiceID,
-								Service: structs.ConsulServiceName,
-								Meta: map[string]string{
-									"grpc_port":     "8502",
-									"grpc_tls_port": "8503",
-								},
-							},
-						},
-						{
-							Node: &structs.Node{
-								Datacenter: "dc1",
-								Node:       "node2",
-								Address:    "127.0.0.2",
-							},
-							Service: &structs.NodeService{
-								ID:      structs.ConsulServiceID,
-								Service: structs.ConsulServiceName,
-								Meta: map[string]string{
-									"grpc_port":     "8502",
-									"grpc_tls_port": "8503",
-								},
-							},
-						},
-					},
-				},
-			},
-		})
-
-	}
-
 	return testConfigSnapshotFixture(t, &structs.NodeService{
 		Kind:    structs.ServiceKindMeshGateway,
 		Service: "mesh-gateway",
@@ -529,7 +462,7 @@ func TestConfigSnapshotMeshGateway(t testing.T, variant string, nsFn func(ns *st
 				Port:    443,
 			},
 		},
-	}, nsFn, serverSNIFn, testSpliceEvents(baseEvents, extraUpdates))
+	}, nsFn, nil, testSpliceEvents(baseEvents, extraUpdates))
 }
 
 func TestConfigSnapshotPeeredMeshGateway(t testing.T, variant string, nsFn func(ns *structs.NodeService), extraUpdates []UpdateEvent) *ConfigSnapshot {
@@ -658,16 +591,14 @@ func TestConfigSnapshotPeeredMeshGateway(t testing.T, variant string, nsFn func(
 		entries = append(entries, proxyDefaults)
 		fallthrough // to-case: "default-services-tcp"
 	case "default-services-tcp":
-		set := configentry.NewDiscoveryChainSet()
-		set.AddEntries(entries...)
 		var (
 			fooSN = structs.NewServiceName("foo", nil)
 			barSN = structs.NewServiceName("bar", nil)
 			girSN = structs.NewServiceName("gir", nil)
 
-			fooChain = discoverychain.TestCompileConfigEntries(t, "foo", "default", "default", "dc1", connect.TestClusterID+".consul", nil, set)
-			barChain = discoverychain.TestCompileConfigEntries(t, "bar", "default", "default", "dc1", connect.TestClusterID+".consul", nil, set)
-			girChain = discoverychain.TestCompileConfigEntries(t, "gir", "default", "default", "dc1", connect.TestClusterID+".consul", nil, set)
+			fooChain = discoverychain.TestCompileConfigEntries(t, "foo", "default", "default", "dc1", connect.TestClusterID+".consul", nil, entries...)
+			barChain = discoverychain.TestCompileConfigEntries(t, "bar", "default", "default", "dc1", connect.TestClusterID+".consul", nil, entries...)
+			girChain = discoverychain.TestCompileConfigEntries(t, "gir", "default", "default", "dc1", connect.TestClusterID+".consul", nil, entries...)
 		)
 
 		assert.True(t, fooChain.Default)
@@ -747,73 +678,6 @@ func TestConfigSnapshotPeeredMeshGateway(t testing.T, variant string, nsFn func(
 				},
 			},
 		)
-	case "mgw-peered-upstream":
-		// This is a modified version of "chain-and-l7-stuff" that adds a peer field to the resolver
-		// and removes some of the extraneous disco-chain testing.
-		entries = []structs.ConfigEntry{
-			&structs.ProxyConfigEntry{
-				Kind: structs.ProxyDefaults,
-				Name: structs.ProxyConfigGlobal,
-				Config: map[string]interface{}{
-					"protocol": "http",
-				},
-			},
-			&structs.ServiceResolverConfigEntry{
-				Kind: structs.ServiceResolver,
-				Name: "db",
-				Redirect: &structs.ServiceResolverRedirect{
-					Service: "alt",
-					Peer:    "peer-b",
-				},
-				ConnectTimeout: 33 * time.Second,
-				RequestTimeout: 33 * time.Second,
-			},
-		}
-		for _, entry := range entries {
-			require.NoError(t, entry.Normalize())
-			require.NoError(t, entry.Validate())
-		}
-
-		set := configentry.NewDiscoveryChainSet()
-		set.AddEntries(entries...)
-
-		var (
-			dbSN  = structs.NewServiceName("db", nil)
-			altSN = structs.NewServiceName("alt", nil)
-
-			dbChain = discoverychain.TestCompileConfigEntries(t, "db", "default", "default", "dc1", connect.TestClusterID+".consul", nil, set)
-		)
-
-		needPeerA = true
-		needLeaf = true
-		discoChains[dbSN] = dbChain
-		endpoints[dbSN] = TestUpstreamNodes(t, "db")
-		endpoints[altSN] = TestUpstreamNodes(t, "alt")
-
-		extraUpdates = append(extraUpdates,
-			UpdateEvent{
-				CorrelationID: datacentersWatchID,
-				Result:        &[]string{"dc1"},
-			},
-			UpdateEvent{
-				CorrelationID: exportedServiceListWatchID,
-				Result: &structs.IndexedExportedServiceList{
-					Services: map[string]structs.ServiceList{
-						"peer-a": []structs.ServiceName{dbSN},
-					},
-				},
-			},
-			UpdateEvent{
-				CorrelationID: serviceListWatchID,
-				Result: &structs.IndexedServiceList{
-					Services: []structs.ServiceName{
-						dbSN,
-						altSN,
-					},
-				},
-			},
-		)
-
 	case "chain-and-l7-stuff":
 		entries = []structs.ConfigEntry{
 			&structs.ProxyConfigEntry{
@@ -833,12 +697,8 @@ func TestConfigSnapshotPeeredMeshGateway(t testing.T, variant string, nsFn func(
 				Kind: structs.ServiceResolver,
 				Name: "api",
 				Subsets: map[string]structs.ServiceResolverSubset{
-					"v1": {
-						Filter: "Service.Meta.Version == 1",
-					},
 					"v2": {
-						Filter:      "Service.Meta.Version == 2",
-						OnlyPassing: true,
+						Filter: "Service.Meta.version == v2",
 					},
 				},
 			},
@@ -882,15 +742,11 @@ func TestConfigSnapshotPeeredMeshGateway(t testing.T, variant string, nsFn func(
 			require.NoError(t, entry.Validate())
 		}
 
-		set := configentry.NewDiscoveryChainSet()
-		set.AddEntries(entries...)
-
 		var (
 			dbSN  = structs.NewServiceName("db", nil)
 			altSN = structs.NewServiceName("alt", nil)
-			apiSN = structs.NewServiceName("api", nil)
 
-			dbChain = discoverychain.TestCompileConfigEntries(t, "db", "default", "default", "dc1", connect.TestClusterID+".consul", nil, set)
+			dbChain = discoverychain.TestCompileConfigEntries(t, "db", "default", "default", "dc1", connect.TestClusterID+".consul", nil, entries...)
 		)
 
 		needPeerA = true
@@ -898,7 +754,6 @@ func TestConfigSnapshotPeeredMeshGateway(t testing.T, variant string, nsFn func(
 		discoChains[dbSN] = dbChain
 		endpoints[dbSN] = TestUpstreamNodes(t, "db")
 		endpoints[altSN] = TestUpstreamNodes(t, "alt")
-		endpoints[apiSN] = TestUpstreamNodesWithServiceSubset(t, "api")
 
 		extraUpdates = append(extraUpdates,
 			UpdateEvent{
@@ -922,29 +777,7 @@ func TestConfigSnapshotPeeredMeshGateway(t testing.T, variant string, nsFn func(
 					},
 				},
 			},
-			UpdateEvent{
-				CorrelationID: serviceResolversWatchID,
-				Result: &structs.IndexedConfigEntries{
-					Kind: structs.ServiceResolver,
-					Entries: []structs.ConfigEntry{
-						&structs.ServiceResolverConfigEntry{
-							Kind: structs.ServiceResolver,
-							Name: "api",
-							Subsets: map[string]structs.ServiceResolverSubset{
-								"v1": {
-									Filter: "Service.Meta.Version == 1",
-								},
-								"v2": {
-									Filter:      "Service.Meta.Version == 2",
-									OnlyPassing: true,
-								},
-							},
-						},
-					},
-				},
-			},
 		)
-
 	case "peer-through-mesh-gateway":
 
 		extraUpdates = append(extraUpdates,
diff --git a/agent/proxycfg/testing_peering.go b/agent/proxycfg/testing_peering.go
index 0af8bafa9f086..ae173afd4a75f 100644
--- a/agent/proxycfg/testing_peering.go
+++ b/agent/proxycfg/testing_peering.go
@@ -1,32 +1,13 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
-	"bytes"
-	"text/template"
-
 	"github.com/mitchellh/go-testing-interface"
-	"github.com/stretchr/testify/require"
 
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 func TestConfigSnapshotPeering(t testing.T) *ConfigSnapshot {
-	return testConfigSnapshot(t, false, false)
-}
-
-func TestConfigSnapshotPeeringWithEscapeOverrides(t testing.T) *ConfigSnapshot {
-	return testConfigSnapshot(t, true, false)
-}
-
-func TestConfigSnapshotPeeringWithHTTP2(t testing.T) *ConfigSnapshot {
-	return testConfigSnapshot(t, false, true)
-}
-
-func testConfigSnapshot(t testing.T, escapeOverride bool, useHTTP2 bool) *ConfigSnapshot {
 	var (
 		paymentsUpstream = structs.Upstream{
 			DestinationName: "payments",
@@ -43,11 +24,6 @@ func testConfigSnapshot(t testing.T, escapeOverride bool, useHTTP2 bool) *Config
 		refundsUID = NewUpstreamID(&refundsUpstream)
 	)
 
-	protocol := "tcp"
-	if useHTTP2 {
-		protocol = "http2"
-	}
-
 	const peerTrustDomain = "1c053652-8512-4373-90cf-5a7f6263a994.consul"
 
 	return TestConfigSnapshot(t, func(ns *structs.NodeService) {
@@ -55,24 +31,6 @@ func testConfigSnapshot(t testing.T, escapeOverride bool, useHTTP2 bool) *Config
 			paymentsUpstream,
 			refundsUpstream,
 		}
-
-		if escapeOverride {
-			if ns.Proxy.Upstreams[0].Config == nil {
-				ns.Proxy.Upstreams[0].Config = map[string]interface{}{}
-			}
-
-			uid := NewUpstreamID(&ns.Proxy.Upstreams[0])
-
-			ns.Proxy.Upstreams[0].Config["envoy_listener_json"] =
-				customListenerJSON(t, customListenerJSONOptions{
-					Name: uid.EnvoyID() + ":custom-upstream",
-				})
-			ns.Proxy.Upstreams[0].Config["envoy_cluster_json"] =
-				customClusterJSON(t, customClusterJSONOptions{
-					Name: uid.EnvoyID() + ":custom-upstream",
-				})
-		}
-
 	}, []UpdateEvent{
 		{
 			CorrelationID: peerTrustBundleIDPrefix + "cloud",
@@ -111,7 +69,7 @@ func testConfigSnapshot(t testing.T, escapeOverride bool, useHTTP2 bool) *Config
 									SpiffeID: []string{
 										"spiffe://" + peerTrustDomain + "/ns/default/dc/cloud-dc/svc/payments",
 									},
-									Protocol: protocol,
+									Protocol: "tcp",
 								},
 							},
 						},
@@ -140,7 +98,7 @@ func testConfigSnapshot(t testing.T, escapeOverride bool, useHTTP2 bool) *Config
 									SpiffeID: []string{
 										"spiffe://" + peerTrustDomain + "/ns/default/dc/cloud-dc/svc/refunds",
 									},
-									Protocol: protocol,
+									Protocol: "tcp",
 								},
 							},
 						},
@@ -419,93 +377,3 @@ func TestConfigSnapshotPeeringLocalMeshGateway(t testing.T) *ConfigSnapshot {
 		},
 	})
 }
-
-var (
-	customListenerJSONTemplate = template.Must(template.New("").Parse(customListenerJSONTpl))
-)
-
-func customListenerJSON(t testing.T, opts customListenerJSONOptions) string {
-	t.Helper()
-	var buf bytes.Buffer
-	require.NoError(t, customListenerJSONTemplate.Execute(&buf, opts))
-	return buf.String()
-}
-
-type customListenerJSONOptions struct {
-	Name       string
-	TLSContext string
-}
-
-const customListenerJSONTpl = `{
-	"@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-	"name": "{{ .Name }}",
-	"address": {
-		"socketAddress": {
-			"address": "11.11.11.11",
-			"portValue": 11111
-		}
-	},
-	"filterChains": [
-		{
-			{{ if .TLSContext -}}
-			"transport_socket": {
-				"name": "tls",
-				"typed_config": {
-					"@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-					{{ .TLSContext }}
-				}
-			},
-			{{- end }}
-			"filters": [
-				{
-					"name": "envoy.filters.network.tcp_proxy",
-					"typedConfig": {
-						"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-							"cluster": "random-cluster",
-							"statPrefix": "foo-stats"
-						}
-				}
-			]
-		}
-	]
-}`
-
-type customClusterJSONOptions struct {
-	Name       string
-	TLSContext string
-}
-
-var customClusterJSONTpl = `{
-	"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-	"name": "{{ .Name }}",
-	"connectTimeout": "15s",
-	"loadAssignment": {
-		"clusterName": "{{ .Name }}",
-		"endpoints": [
-			{
-				"lbEndpoints": [
-					{
-						"endpoint": {
-							"address": {
-								"socketAddress": {
-									"address": "1.2.3.4",
-									"portValue": 8443
-								}
-							}
-						}
-					}
-				]
-			}
-		]
-	}
-}`
-
-var customClusterJSONTemplate = template.Must(template.New("").Parse(customClusterJSONTpl))
-
-func customClusterJSON(t testing.T, opts customClusterJSONOptions) string {
-	t.Helper()
-	var buf bytes.Buffer
-	err := customClusterJSONTemplate.Execute(&buf, opts)
-	require.NoError(t, err)
-	return buf.String()
-}
diff --git a/agent/proxycfg/testing_terminating_gateway.go b/agent/proxycfg/testing_terminating_gateway.go
index 6a718779943f6..a1cc290a47318 100644
--- a/agent/proxycfg/testing_terminating_gateway.go
+++ b/agent/proxycfg/testing_terminating_gateway.go
@@ -1,11 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
-	"time"
-
 	"github.com/mitchellh/go-testing-interface"
 
 	"github.com/hashicorp/consul/agent/structs"
@@ -212,19 +207,19 @@ func TestConfigSnapshotTerminatingGateway(t testing.T, populateServices bool, ns
 			// no intentions defined for these services
 			{
 				CorrelationID: serviceIntentionsIDPrefix + web.String(),
-				Result:        structs.SimplifiedIntentions{},
+				Result:        structs.Intentions{},
 			},
 			{
 				CorrelationID: serviceIntentionsIDPrefix + api.String(),
-				Result:        structs.SimplifiedIntentions{},
+				Result:        structs.Intentions{},
 			},
 			{
 				CorrelationID: serviceIntentionsIDPrefix + db.String(),
-				Result:        structs.SimplifiedIntentions{},
+				Result:        structs.Intentions{},
 			},
 			{
 				CorrelationID: serviceIntentionsIDPrefix + cache.String(),
-				Result:        structs.SimplifiedIntentions{},
+				Result:        structs.Intentions{},
 			},
 			// ========
 			{
@@ -392,23 +387,23 @@ func TestConfigSnapshotTerminatingGatewayDestinations(t testing.T, populateDesti
 			// no intentions defined for these services
 			{
 				CorrelationID: serviceIntentionsIDPrefix + externalIPTCP.String(),
-				Result:        structs.SimplifiedIntentions{},
+				Result:        structs.Intentions{},
 			},
 			{
 				CorrelationID: serviceIntentionsIDPrefix + externalHostnameTCP.String(),
-				Result:        structs.SimplifiedIntentions{},
+				Result:        structs.Intentions{},
 			},
 			{
 				CorrelationID: serviceIntentionsIDPrefix + externalIPHTTP.String(),
-				Result:        structs.SimplifiedIntentions{},
+				Result:        structs.Intentions{},
 			},
 			{
 				CorrelationID: serviceIntentionsIDPrefix + externalHostnameHTTP.String(),
-				Result:        structs.SimplifiedIntentions{},
+				Result:        structs.Intentions{},
 			},
 			{
 				CorrelationID: serviceIntentionsIDPrefix + externalHostnameWithSNI.String(),
-				Result:        structs.SimplifiedIntentions{},
+				Result:        structs.Intentions{},
 			},
 			// ========
 			{
@@ -650,7 +645,6 @@ func testConfigSnapshotTerminatingGatewayLBConfig(t testing.T, variant string) *
 				OnlyPassing: true,
 			},
 		},
-		RequestTimeout: 200 * time.Millisecond,
 		LoadBalancer: &structs.LoadBalancer{
 			Policy: "ring_hash",
 			RingHashConfig: &structs.RingHashConfig{
diff --git a/agent/proxycfg/testing_tproxy.go b/agent/proxycfg/testing_tproxy.go
index 9c1c0934e2b87..7e5e94f4d0325 100644
--- a/agent/proxycfg/testing_tproxy.go
+++ b/agent/proxycfg/testing_tproxy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -10,7 +7,6 @@ import (
 
 	"github.com/mitchellh/go-testing-interface"
 
-	"github.com/hashicorp/consul/agent/configentry"
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/consul/discoverychain"
 	"github.com/hashicorp/consul/agent/structs"
@@ -22,20 +18,11 @@ func TestConfigSnapshotTransparentProxy(t testing.T) *ConfigSnapshot {
 	var (
 		google      = structs.NewServiceName("google", nil)
 		googleUID   = NewUpstreamIDFromServiceName(google)
-		googleChain = discoverychain.TestCompileConfigEntries(t, "google", "default", "default", "dc1", connect.TestClusterID+".consul", func(req *discoverychain.CompileRequest) {
-			req.AutoVirtualIPs = []string{"240.0.0.1"}
-			req.ManualVirtualIPs = []string{"10.0.0.1"}
-		}, nil)
-
-		googleV2      = structs.NewServiceName("google-v2", nil)
-		googleUIDV2   = NewUpstreamIDFromServiceName(googleV2)
-		googleChainV2 = discoverychain.TestCompileConfigEntries(t, "google-v2", "default", "default", "dc1", connect.TestClusterID+".consul", func(req *discoverychain.CompileRequest) {
-			req.ManualVirtualIPs = []string{"10.10.10.10"}
-		}, nil)
+		googleChain = discoverychain.TestCompileConfigEntries(t, "google", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		noEndpoints      = structs.NewServiceName("no-endpoints", nil)
 		noEndpointsUID   = NewUpstreamIDFromServiceName(noEndpoints)
-		noEndpointsChain = discoverychain.TestCompileConfigEntries(t, "no-endpoints", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		noEndpointsChain = discoverychain.TestCompileConfigEntries(t, "no-endpoints", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		db = structs.NewServiceName("db", nil)
 	)
@@ -68,12 +55,6 @@ func TestConfigSnapshotTransparentProxy(t testing.T) *ConfigSnapshot {
 				Chain: googleChain,
 			},
 		},
-		{
-			CorrelationID: "discovery-chain:" + googleUIDV2.String(),
-			Result: &structs.DiscoveryChainResponse{
-				Chain: googleChainV2,
-			},
-		},
 		{
 			CorrelationID: "discovery-chain:" + noEndpointsUID.String(),
 			Result: &structs.DiscoveryChainResponse{
@@ -93,6 +74,10 @@ func TestConfigSnapshotTransparentProxy(t testing.T) *ConfigSnapshot {
 							Service: "google",
 							Address: "9.9.9.9",
 							Port:    9090,
+							TaggedAddresses: map[string]structs.ServiceAddress{
+								"virtual":                      {Address: "10.0.0.1"},
+								structs.TaggedAddressVirtualIP: {Address: "240.0.0.1"},
+							},
 						},
 					},
 				},
@@ -111,6 +96,9 @@ func TestConfigSnapshotTransparentProxy(t testing.T) *ConfigSnapshot {
 						},
 						Service: &structs.NodeService{
 							Service: "google-v2",
+							TaggedAddresses: map[string]structs.ServiceAddress{
+								"virtual": {Address: "10.10.10.10"},
+							},
 						},
 					},
 				},
@@ -138,19 +126,18 @@ func TestConfigSnapshotTransparentProxyHTTPUpstream(t testing.T, additionalEntri
 		},
 	})
 
-	set := configentry.NewDiscoveryChainSet()
-	set.AddEntries(entries...)
-
 	// DiscoveryChain without an UpstreamConfig should yield a
 	// filter chain when in transparent proxy mode
 	var (
 		google      = structs.NewServiceName("google", nil)
 		googleUID   = NewUpstreamIDFromServiceName(google)
-		googleChain = discoverychain.TestCompileConfigEntries(t, "google", "default", "default", "dc1", connect.TestClusterID+".consul", nil, set)
+		googleChain = discoverychain.TestCompileConfigEntries(t, "google", "default", "default", "dc1", connect.TestClusterID+".consul", nil,
+			entries...,
+		)
 
 		noEndpoints      = structs.NewServiceName("no-endpoints", nil)
 		noEndpointsUID   = NewUpstreamIDFromServiceName(noEndpoints)
-		noEndpointsChain = discoverychain.TestCompileConfigEntries(t, "no-endpoints", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		noEndpointsChain = discoverychain.TestCompileConfigEntries(t, "no-endpoints", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		db    = structs.NewServiceName("db", nil)
 		nodes = []structs.CheckServiceNode{
@@ -263,13 +250,11 @@ func TestConfigSnapshotTransparentProxyCatalogDestinationsOnly(t testing.T) *Con
 	var (
 		google      = structs.NewServiceName("google", nil)
 		googleUID   = NewUpstreamIDFromServiceName(google)
-		googleChain = discoverychain.TestCompileConfigEntries(t, "google", "default", "default", "dc1", connect.TestClusterID+".consul", func(req *discoverychain.CompileRequest) {
-			req.ManualVirtualIPs = []string{"10.0.0.1"}
-		}, nil)
+		googleChain = discoverychain.TestCompileConfigEntries(t, "google", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		noEndpoints      = structs.NewServiceName("no-endpoints", nil)
 		noEndpointsUID   = NewUpstreamIDFromServiceName(noEndpoints)
-		noEndpointsChain = discoverychain.TestCompileConfigEntries(t, "no-endpoints", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		noEndpointsChain = discoverychain.TestCompileConfigEntries(t, "no-endpoints", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		db = structs.NewServiceName("db", nil)
 	)
@@ -325,6 +310,9 @@ func TestConfigSnapshotTransparentProxyCatalogDestinationsOnly(t testing.T) *Con
 							Service: "google",
 							Address: "9.9.9.9",
 							Port:    9090,
+							TaggedAddresses: map[string]structs.ServiceAddress{
+								"virtual": {Address: "10.0.0.1"},
+							},
 						},
 					},
 				},
@@ -343,25 +331,20 @@ func TestConfigSnapshotTransparentProxyCatalogDestinationsOnly(t testing.T) *Con
 }
 
 func TestConfigSnapshotTransparentProxyDialDirectly(t testing.T) *ConfigSnapshot {
-	set := configentry.NewDiscoveryChainSet()
-	set.AddEntries(&structs.ServiceResolverConfigEntry{
-		Kind:           structs.ServiceResolver,
-		Name:           "mongo",
-		ConnectTimeout: 33 * time.Second,
-	})
-
 	// DiscoveryChain without an UpstreamConfig should yield a
 	// filter chain when in transparent proxy mode
 	var (
 		kafka      = structs.NewServiceName("kafka", nil)
 		kafkaUID   = NewUpstreamIDFromServiceName(kafka)
-		kafkaChain = discoverychain.TestCompileConfigEntries(t, "kafka", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+		kafkaChain = discoverychain.TestCompileConfigEntries(t, "kafka", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		mongo      = structs.NewServiceName("mongo", nil)
 		mongoUID   = NewUpstreamIDFromServiceName(mongo)
-		mongoChain = discoverychain.TestCompileConfigEntries(t, "mongo", "default", "default", "dc1", connect.TestClusterID+".consul", func(req *discoverychain.CompileRequest) {
-			req.ManualVirtualIPs = []string{"6.6.6.6"}
-		}, set)
+		mongoChain = discoverychain.TestCompileConfigEntries(t, "mongo", "default", "default", "dc1", connect.TestClusterID+".consul", nil, &structs.ServiceResolverConfigEntry{
+			Kind:           structs.ServiceResolver,
+			Name:           "mongo",
+			ConnectTimeout: 33 * time.Second,
+		})
 
 		db = structs.NewServiceName("db", nil)
 	)
@@ -413,6 +396,9 @@ func TestConfigSnapshotTransparentProxyDialDirectly(t testing.T) *ConfigSnapshot
 							Service: "mongo",
 							Address: "10.10.10.10",
 							Port:    27017,
+							TaggedAddresses: map[string]structs.ServiceAddress{
+								"virtual": {Address: "6.6.6.6"},
+							},
 							Proxy: structs.ConnectProxyConfig{
 								TransparentProxy: structs.TransparentProxyConfig{
 									DialedDirectly: true,
@@ -428,6 +414,9 @@ func TestConfigSnapshotTransparentProxyDialDirectly(t testing.T) *ConfigSnapshot
 							Service: "mongo",
 							Address: "10.10.10.12",
 							Port:    27017,
+							TaggedAddresses: map[string]structs.ServiceAddress{
+								"virtual": {Address: "6.6.6.6"},
+							},
 							Proxy: structs.ConnectProxyConfig{
 								TransparentProxy: structs.TransparentProxyConfig{
 									DialedDirectly: true,
@@ -464,26 +453,23 @@ func TestConfigSnapshotTransparentProxyDialDirectly(t testing.T) *ConfigSnapshot
 }
 
 func TestConfigSnapshotTransparentProxyResolverRedirectUpstream(t testing.T) *ConfigSnapshot {
-	set := configentry.NewDiscoveryChainSet()
-	set.AddEntries(&structs.ServiceResolverConfigEntry{
-		Kind: structs.ServiceResolver,
-		Name: "db-redir",
-		Redirect: &structs.ServiceResolverRedirect{
-			Service: "db",
-		},
-	})
 	// Service-Resolver redirect with explicit upstream should spawn an outbound listener.
 	var (
 		db      = structs.NewServiceName("db-redir", nil)
 		dbUID   = NewUpstreamIDFromServiceName(db)
-		dbChain = discoverychain.TestCompileConfigEntries(t, "db-redir", "default", "default", "dc1", connect.TestClusterID+".consul", nil, set)
+		dbChain = discoverychain.TestCompileConfigEntries(t, "db-redir", "default", "default", "dc1", connect.TestClusterID+".consul", nil,
+			&structs.ServiceResolverConfigEntry{
+				Kind: structs.ServiceResolver,
+				Name: "db-redir",
+				Redirect: &structs.ServiceResolverRedirect{
+					Service: "db",
+				},
+			},
+		)
 
 		google      = structs.NewServiceName("google", nil)
 		googleUID   = NewUpstreamIDFromServiceName(google)
-		googleChain = discoverychain.TestCompileConfigEntries(t, "google", "default", "default", "dc1", connect.TestClusterID+".consul", func(req *discoverychain.CompileRequest) {
-			req.AutoVirtualIPs = []string{"240.0.0.1"}
-			req.ManualVirtualIPs = []string{"10.0.0.1"}
-		}, nil)
+		googleChain = discoverychain.TestCompileConfigEntries(t, "google", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 	)
 
 	return TestConfigSnapshot(t, func(ns *structs.NodeService) {
@@ -523,6 +509,10 @@ func TestConfigSnapshotTransparentProxyResolverRedirectUpstream(t testing.T) *Co
 							Service: "google",
 							Address: "9.9.9.9",
 							Port:    9090,
+							TaggedAddresses: map[string]structs.ServiceAddress{
+								"virtual":                      {Address: "10.0.0.1"},
+								structs.TaggedAddressVirtualIP: {Address: "240.0.0.1"},
+							},
 						},
 					},
 				},
@@ -537,15 +527,11 @@ func TestConfigSnapshotTransparentProxyTerminatingGatewayCatalogDestinationsOnly
 	var (
 		google      = structs.NewServiceName("google", nil)
 		googleUID   = NewUpstreamIDFromServiceName(google)
-		googleChain = discoverychain.TestCompileConfigEntries(t, "google", "default", "default", "dc1", connect.TestClusterID+".consul", func(req *discoverychain.CompileRequest) {
-			req.ManualVirtualIPs = []string{"10.0.0.1"}
-		}, nil)
+		googleChain = discoverychain.TestCompileConfigEntries(t, "google", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		kafka      = structs.NewServiceName("kafka", nil)
 		kafkaUID   = NewUpstreamIDFromServiceName(kafka)
-		kafkaChain = discoverychain.TestCompileConfigEntries(t, "kafka", "default", "default", "dc1", connect.TestClusterID+".consul", func(req *discoverychain.CompileRequest) {
-			req.ManualVirtualIPs = []string{"10.0.0.2"}
-		}, nil)
+		kafkaChain = discoverychain.TestCompileConfigEntries(t, "kafka", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 		db = structs.NewServiceName("db", nil)
 	)
@@ -563,6 +549,8 @@ func TestConfigSnapshotTransparentProxyTerminatingGatewayCatalogDestinationsOnly
 			Address: "9.9.9.9",
 			Port:    9090,
 			TaggedAddresses: map[string]structs.ServiceAddress{
+				structs.ServiceGatewayVirtualIPTag(google): {Address: "10.0.0.1"},
+				structs.ServiceGatewayVirtualIPTag(kafka):  {Address: "10.0.0.2"},
 				"virtual": {Address: "6.6.6.6"},
 			},
 		},
diff --git a/agent/proxycfg/testing_upstreams.go b/agent/proxycfg/testing_upstreams.go
index aa8c6c2e04d65..8077bbb12ebe7 100644
--- a/agent/proxycfg/testing_upstreams.go
+++ b/agent/proxycfg/testing_upstreams.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -9,11 +6,10 @@ import (
 	"github.com/mitchellh/go-testing-interface"
 
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/configentry"
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/consul/discoverychain"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 func setupTestVariationConfigEntriesAndSnapshot(
@@ -60,8 +56,7 @@ func setupTestVariationConfigEntriesAndSnapshot(
 	}
 	dbChainID := structs.ChainID(dbOpts)
 	makeChainID := func(opts structs.DiscoveryTargetOpts) string {
-		finalOpts := structs.MergeDiscoveryTargetOpts(dbOpts, opts)
-		return structs.ChainID(finalOpts)
+		return structs.ChainID(structs.MergeDiscoveryTargetOpts(dbOpts, opts))
 	}
 
 	switch variation {
@@ -100,11 +95,6 @@ func setupTestVariationConfigEntriesAndSnapshot(
 			},
 		})
 	case "failover-to-cluster-peer":
-		uid := UpstreamID{
-			Name:           "db",
-			Peer:           "cluster-01",
-			EnterpriseMeta: acl.NewEnterpriseMetaWithPartition(dbUID.PartitionOrDefault(), ""),
-		}
 		events = append(events, UpdateEvent{
 			CorrelationID: "peer-trust-bundle:cluster-01",
 			Result: &pbpeering.TrustBundleReadResponse{
@@ -116,6 +106,10 @@ func setupTestVariationConfigEntriesAndSnapshot(
 				},
 			},
 		})
+		uid := UpstreamID{
+			Name: "db",
+			Peer: "cluster-01",
+		}
 		if enterprise {
 			uid.EnterpriseMeta = acl.NewEnterpriseMetaWithPartition(dbUID.PartitionOrDefault(), "ns9")
 		}
@@ -256,12 +250,9 @@ func setupTestVariationConfigEntriesAndSnapshot(
 	case "chain-and-router":
 	case "lb-resolver":
 	case "register-to-terminating-gateway":
-	case "redirect-to-lb-node":
-	case "resolver-with-lb":
-	case "splitter-overweight":
 	default:
-		extraEvents := extraUpdateEvents(t, variation, dbUID)
-		events = append(events, extraEvents...)
+		t.Fatalf("unexpected variation: %q", variation)
+		return nil
 	}
 
 	return events
@@ -276,7 +267,6 @@ func setupTestVariationDiscoveryChain(
 ) *structs.CompiledDiscoveryChain {
 	// Compile a chain.
 	var (
-		peers        []*pbpeering.Peering
 		entries      []structs.ConfigEntry
 		compileSetup func(req *discoverychain.CompileRequest)
 	)
@@ -583,61 +573,6 @@ func setupTestVariationDiscoveryChain(
 				},
 			},
 		)
-	case "splitter-overweight":
-		entries = append(entries,
-			&structs.ServiceResolverConfigEntry{
-				Kind:           structs.ServiceResolver,
-				Name:           "db",
-				EnterpriseMeta: entMeta,
-				ConnectTimeout: 33 * time.Second,
-				RequestTimeout: 33 * time.Second,
-			},
-			&structs.ProxyConfigEntry{
-				Kind:           structs.ProxyDefaults,
-				Name:           structs.ProxyConfigGlobal,
-				EnterpriseMeta: entMeta,
-				Config: map[string]interface{}{
-					"protocol": "http",
-				},
-			},
-			&structs.ServiceSplitterConfigEntry{
-				Kind:           structs.ServiceSplitter,
-				Name:           "db",
-				EnterpriseMeta: entMeta,
-				Splits: []structs.ServiceSplit{
-					{
-						Weight:  100.0,
-						Service: "big-side",
-						RequestHeaders: &structs.HTTPHeaderModifiers{
-							Set: map[string]string{"x-split-leg": "big"},
-						},
-						ResponseHeaders: &structs.HTTPHeaderModifiers{
-							Set: map[string]string{"x-split-leg": "big"},
-						},
-					},
-					{
-						Weight:  100.0,
-						Service: "goldilocks-side",
-						RequestHeaders: &structs.HTTPHeaderModifiers{
-							Set: map[string]string{"x-split-leg": "goldilocks"},
-						},
-						ResponseHeaders: &structs.HTTPHeaderModifiers{
-							Set: map[string]string{"x-split-leg": "goldilocks"},
-						},
-					},
-					{
-						Weight:  100.0,
-						Service: "lil-bit-side",
-						RequestHeaders: &structs.HTTPHeaderModifiers{
-							Set: map[string]string{"x-split-leg": "small"},
-						},
-						ResponseHeaders: &structs.HTTPHeaderModifiers{
-							Set: map[string]string{"x-split-leg": "small"},
-						},
-					},
-				},
-			},
-		)
 	case "grpc-router":
 		entries = append(entries,
 			&structs.ServiceResolverConfigEntry{
@@ -975,93 +910,24 @@ func setupTestVariationDiscoveryChain(
 							Field:      "header",
 							FieldValue: "x-user-id",
 						},
-						{
-							Field:      "query_parameter",
-							FieldValue: "my-pretty-param",
-						},
 						{
 							SourceIP: true,
 							Terminal: true,
 						},
 					},
 				},
-			})
-	case "redirect-to-lb-node":
-		entries = append(entries,
-			&structs.ProxyConfigEntry{
-				Kind:           structs.ProxyDefaults,
-				Name:           structs.ProxyConfigGlobal,
-				EnterpriseMeta: entMeta,
-				Config: map[string]interface{}{
-					"protocol": "http",
-				},
-			},
-			&structs.ServiceRouterConfigEntry{
-				Kind:           structs.ServiceRouter,
-				Name:           "db",
-				EnterpriseMeta: entMeta,
-				Routes: []structs.ServiceRoute{
-					{
-						Match: httpMatch(&structs.ServiceRouteHTTPMatch{
-							PathPrefix: "/web",
-						}),
-						Destination: toService("web"),
-					},
-				},
-			},
-			&structs.ServiceResolverConfigEntry{
-				Kind:           structs.ServiceResolver,
-				Name:           "web",
-				EnterpriseMeta: entMeta,
-				LoadBalancer: &structs.LoadBalancer{
-					Policy: "ring_hash",
-					RingHashConfig: &structs.RingHashConfig{
-						MinimumRingSize: 20,
-						MaximumRingSize: 30,
-					},
-				},
-			},
-		)
-	case "resolver-with-lb":
-		entries = append(entries,
-			&structs.ProxyConfigEntry{
-				Kind:           structs.ProxyDefaults,
-				Name:           structs.ProxyConfigGlobal,
-				EnterpriseMeta: entMeta,
-				Config: map[string]interface{}{
-					"protocol": "http",
-				},
-			},
-			&structs.ServiceResolverConfigEntry{
-				Kind:           structs.ServiceResolver,
-				Name:           "db",
-				EnterpriseMeta: entMeta,
-				LoadBalancer: &structs.LoadBalancer{
-					Policy: "ring_hash",
-					RingHashConfig: &structs.RingHashConfig{
-						MinimumRingSize: 20,
-						MaximumRingSize: 30,
-					},
-				},
 			},
 		)
 	default:
-		e, p := extraDiscoChainConfig(t, variation, entMeta)
-
-		entries = append(entries, e...)
-		peers = append(peers, p...)
+		t.Fatalf("unexpected variation: %q", variation)
+		return nil
 	}
 
 	if len(additionalEntries) > 0 {
 		entries = append(entries, additionalEntries...)
 	}
 
-	set := configentry.NewDiscoveryChainSet()
-
-	set.AddEntries(entries...)
-	set.AddPeers(peers...)
-
-	return discoverychain.TestCompileConfigEntries(t, "db", entMeta.NamespaceOrDefault(), entMeta.PartitionOrDefault(), "dc1", connect.TestClusterID+".consul", compileSetup, set)
+	return discoverychain.TestCompileConfigEntries(t, "db", entMeta.NamespaceOrDefault(), entMeta.PartitionOrDefault(), "dc1", connect.TestClusterID+".consul", compileSetup, entries...)
 }
 
 func httpMatch(http *structs.ServiceRouteHTTPMatch) *structs.ServiceRouteMatch {
diff --git a/agent/proxycfg/testing_upstreams_ce.go b/agent/proxycfg/testing_upstreams_ce.go
deleted file mode 100644
index bac9bb5ce6d72..0000000000000
--- a/agent/proxycfg/testing_upstreams_ce.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package proxycfg
-
-import (
-	"github.com/mitchellh/go-testing-interface"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-)
-
-func extraDiscoChainConfig(t testing.T, variation string, entMeta acl.EnterpriseMeta) ([]structs.ConfigEntry, []*pbpeering.Peering) {
-	t.Fatalf("unexpected variation: %q", variation)
-	return nil, nil
-}
-
-func extraUpdateEvents(t testing.T, variation string, dbUID UpstreamID) []UpdateEvent {
-	t.Fatalf("unexpected variation: %q", variation)
-	return nil
-}
diff --git a/agent/proxycfg/upstreams.go b/agent/proxycfg/upstreams.go
index fe2d502339c4e..dadec77ec89e7 100644
--- a/agent/proxycfg/upstreams.go
+++ b/agent/proxycfg/upstreams.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxycfg
 
 import (
@@ -14,7 +11,7 @@ import (
 	"github.com/hashicorp/consul/acl"
 	cachetype "github.com/hashicorp/consul/agent/cache-types"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 type handlerUpstreams struct {
@@ -136,10 +133,6 @@ func (s *handlerUpstreams) handleUpdateUpstreams(ctx context.Context, u UpdateEv
 
 		uid := UpstreamIDFromString(uidString)
 
-		s.logger.Debug("upstream-target watch fired",
-			"correlationID", correlationID,
-			"nodes", len(resp.Nodes),
-		)
 		if _, ok := upstreamsSnapshot.WatchedUpstreamEndpoints[uid]; !ok {
 			upstreamsSnapshot.WatchedUpstreamEndpoints[uid] = make(map[string]structs.CheckServiceNodes)
 		}
diff --git a/agent/proxycfg_test.go b/agent/proxycfg_test.go
index c8141e407fafa..11f9b8fe79553 100644
--- a/agent/proxycfg_test.go
+++ b/agent/proxycfg_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -13,11 +10,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/hashicorp/consul/agent/grpc-external/limiter"
+	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
 	"github.com/hashicorp/consul/testrpc"
 )
 
@@ -54,7 +49,7 @@ func TestAgent_local_proxycfg(t *testing.T) {
 
 	// This is a little gross, but this gives us the layered pair of
 	// local/catalog sources for now.
-	cfg := a.xdsServer.ProxyWatcher
+	cfg := a.xdsServer.CfgSrc
 
 	var (
 		timer      = time.After(100 * time.Millisecond)
@@ -64,9 +59,9 @@ func TestAgent_local_proxycfg(t *testing.T) {
 
 	var (
 		firstTime = true
-		ch        <-chan proxysnapshot.ProxySnapshot
+		ch        <-chan *proxycfg.ConfigSnapshot
 		stc       limiter.SessionTerminatedChan
-		cancel    proxysnapshot.CancelFunc
+		cancel    proxycfg.CancelFunc
 	)
 	defer func() {
 		if cancel != nil {
@@ -87,7 +82,7 @@ func TestAgent_local_proxycfg(t *testing.T) {
 			// Prior to fixes in https://github.com/hashicorp/consul/pull/16497
 			// this call to Watch() would deadlock.
 			var err error
-			ch, stc, cancel, err = cfg.Watch(rtest.Resource(pbmesh.ProxyConfigurationType, sid.ID).ID(), a.config.NodeName, token)
+			ch, stc, cancel, err = cfg.Watch(sid, a.config.NodeName, token)
 			require.NoError(t, err)
 		}
 		select {
diff --git a/agent/reload.go b/agent/reload.go
index cf68481621bc5..21a7486a0099d 100644
--- a/agent/reload.go
+++ b/agent/reload.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import "github.com/hashicorp/consul/agent/config"
diff --git a/agent/remote_exec.go b/agent/remote_exec.go
index 876c1898620cd..8519ca485713a 100644
--- a/agent/remote_exec.go
+++ b/agent/remote_exec.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/remote_exec_test.go b/agent/remote_exec_test.go
index f077de895a396..b08f9e14e69fa 100644
--- a/agent/remote_exec_test.go
+++ b/agent/remote_exec_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/retry_join.go b/agent/retry_join.go
index eb010c0c22c47..61825db23c638 100644
--- a/agent/retry_join.go
+++ b/agent/retry_join.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/retry_join_test.go b/agent/retry_join_test.go
index 4184ab0a9f3df..e6e2fac7797b0 100644
--- a/agent/retry_join_test.go
+++ b/agent/retry_join_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/router/grpc.go b/agent/router/grpc.go
index ce3f079e86b97..44600d42ad1d2 100644
--- a/agent/router/grpc.go
+++ b/agent/router/grpc.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package router
 
 import (
diff --git a/agent/router/manager.go b/agent/router/manager.go
index 07d55127f3c8b..8d2e9658eea89 100644
--- a/agent/router/manager.go
+++ b/agent/router/manager.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // Package servers provides a Manager interface for Manager managed
 // metadata.Server objects.  The servers package manages servers from a Consul
 // client's perspective (i.e. a list of servers that a client talks with for
diff --git a/agent/router/manager_internal_test.go b/agent/router/manager_internal_test.go
index 120a5f012c630..640e96a062343 100644
--- a/agent/router/manager_internal_test.go
+++ b/agent/router/manager_internal_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package router
 
 import (
diff --git a/agent/router/manager_test.go b/agent/router/manager_test.go
index 6490164fda10c..e21ab340f40bc 100644
--- a/agent/router/manager_test.go
+++ b/agent/router/manager_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package router_test
 
 import (
diff --git a/agent/router/router.go b/agent/router/router.go
index c261b6ed7cd52..1389a30f6ce73 100644
--- a/agent/router/router.go
+++ b/agent/router/router.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package router
 
 import (
diff --git a/agent/router/router_test.go b/agent/router/router_test.go
index 206b0befe811c..8ccdf825e0a28 100644
--- a/agent/router/router_test.go
+++ b/agent/router/router_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package router
 
 import (
diff --git a/agent/router/serf_adapter.go b/agent/router/serf_adapter.go
index d3a228ca3d5d7..7208fe12368fb 100644
--- a/agent/router/serf_adapter.go
+++ b/agent/router/serf_adapter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package router
 
 import (
diff --git a/agent/router/serf_flooder.go b/agent/router/serf_flooder.go
index 06d59d5c4a89d..7c415db25a5bf 100644
--- a/agent/router/serf_flooder.go
+++ b/agent/router/serf_flooder.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package router
 
 import (
diff --git a/agent/routine-leak-checker/leak_test.go b/agent/routine-leak-checker/leak_test.go
index f6b3c2a74953c..34f0989238851 100644
--- a/agent/routine-leak-checker/leak_test.go
+++ b/agent/routine-leak-checker/leak_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package leakcheck
 
 import (
diff --git a/agent/rpc/middleware/interceptors.go b/agent/rpc/middleware/interceptors.go
index e783254a980d1..8c5d6c15e108f 100644
--- a/agent/rpc/middleware/interceptors.go
+++ b/agent/rpc/middleware/interceptors.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package middleware
 
 import (
@@ -12,10 +9,9 @@ import (
 
 	"github.com/armon/go-metrics"
 	"github.com/armon/go-metrics/prometheus"
-	"github.com/hashicorp/go-hclog"
-
 	"github.com/hashicorp/consul-net-rpc/net/rpc"
 	rpcRate "github.com/hashicorp/consul/agent/consul/rate"
+	"github.com/hashicorp/go-hclog"
 )
 
 // RPCTypeInternal identifies the "RPC" request as coming from some internal
@@ -26,11 +22,9 @@ import (
 // Really what we are measuring here is a "cluster operation". The term we have
 // used for this historically is "RPC", so we continue to use that here.
 const RPCTypeInternal = "internal"
-
 const RPCTypeNetRPC = "net/rpc"
 
 var metricRPCRequest = []string{"rpc", "server", "call"}
-
 var requestLogName = strings.Join(metricRPCRequest, "_")
 
 var OneTwelveRPCSummary = []prometheus.SummaryDefinition{
@@ -179,8 +173,7 @@ func GetNetRPCRateLimitingInterceptor(requestLimitsHandler rpcRate.RequestLimits
 		op := rpcRate.Operation{
 			Name:       reqServiceMethod,
 			SourceAddr: sourceAddr,
-			Type:       rpcRateLimitSpecs[reqServiceMethod].Type,
-			Category:   rpcRateLimitSpecs[reqServiceMethod].Category,
+			Type:       rpcRateLimitSpecs[reqServiceMethod],
 		}
 
 		// net/rpc does not provide a way to encode the nuances of the
@@ -189,20 +182,3 @@ func GetNetRPCRateLimitingInterceptor(requestLimitsHandler rpcRate.RequestLimits
 		return requestLimitsHandler.Allow(op)
 	}
 }
-
-func ChainedRPCPreBodyInterceptor(chain ...rpc.PreBodyInterceptor) rpc.PreBodyInterceptor {
-	if len(chain) == 0 {
-		panic("don't call this with zero interceptors")
-	}
-	if len(chain) == 1 {
-		return chain[0]
-	}
-	return func(reqServiceMethod string, sourceAddr net.Addr) error {
-		for _, interceptor := range chain {
-			if err := interceptor(reqServiceMethod, sourceAddr); err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-}
diff --git a/agent/rpc/middleware/interceptors_test.go b/agent/rpc/middleware/interceptors_test.go
index a8e07c8d4d2ba..fda01199b6f9c 100644
--- a/agent/rpc/middleware/interceptors_test.go
+++ b/agent/rpc/middleware/interceptors_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package middleware
 
 import (
diff --git a/agent/rpc/middleware/rate_limit_mappings.go b/agent/rpc/middleware/rate_limit_mappings.go
index f9ca6a3333018..a0ca13c4c1ebc 100644
--- a/agent/rpc/middleware/rate_limit_mappings.go
+++ b/agent/rpc/middleware/rate_limit_mappings.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package middleware
 
 import "github.com/hashicorp/consul/agent/consul/rate"
@@ -8,145 +5,140 @@ import "github.com/hashicorp/consul/agent/consul/rate"
 // Maps each net/rpc endpoint to a read or write operation type
 // for rate limiting purposes. Please be sure to update this list
 // if a net/rpc endpoint is removed.
-var rpcRateLimitSpecs = map[string]rate.OperationSpec{
-	"ACL.AuthMethodDelete":  {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryACL},
-	"ACL.AuthMethodList":    {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.AuthMethodRead":    {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.AuthMethodSet":     {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryACL},
-	"ACL.Authorize":         {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.BindingRuleDelete": {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryACL},
-	"ACL.BindingRuleList":   {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.BindingRuleRead":   {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.BindingRuleSet":    {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryACL},
-	"ACL.BootstrapTokens":   {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.Login":             {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryACL},
-	"ACL.Logout":            {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryACL},
-	"ACL.PolicyBatchRead":   {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.PolicyDelete":      {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryACL},
-	"ACL.PolicyList":        {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.PolicyRead":        {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.PolicyResolve":     {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.PolicySet":         {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryACL},
-	"ACL.ReplicationStatus": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.RoleBatchRead":     {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.RoleDelete":        {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryACL},
-	"ACL.RoleList":          {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.RoleRead":          {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.RoleResolve":       {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.RoleSet":           {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryACL},
-	"ACL.TokenBatchRead":    {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.TokenClone":        {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.TokenDelete":       {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryACL},
-	"ACL.TokenList":         {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.TokenRead":         {Type: rate.OperationTypeRead, Category: rate.OperationCategoryACL},
-	"ACL.TokenSet":          {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryACL},
-
-	"AutoConfig.InitialConfiguration": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryAutoConfig},
-
-	"AutoEncrypt.Sign": {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryAutoConfig},
-
-	"Catalog.Deregister":          {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryCatalog},
-	"Catalog.GatewayServices":     {Type: rate.OperationTypeRead, Category: rate.OperationCategoryCatalog},
-	"Catalog.ListDatacenters":     {Type: rate.OperationTypeRead, Category: rate.OperationCategoryCatalog},
-	"Catalog.ListNodes":           {Type: rate.OperationTypeRead, Category: rate.OperationCategoryCatalog},
-	"Catalog.ListServices":        {Type: rate.OperationTypeRead, Category: rate.OperationCategoryCatalog},
-	"Catalog.NodeServiceList":     {Type: rate.OperationTypeRead, Category: rate.OperationCategoryCatalog},
-	"Catalog.NodeServices":        {Type: rate.OperationTypeRead, Category: rate.OperationCategoryCatalog},
-	"Catalog.Register":            {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryCatalog},
-	"Catalog.ServiceList":         {Type: rate.OperationTypeRead, Category: rate.OperationCategoryCatalog},
-	"Catalog.ServiceNodes":        {Type: rate.OperationTypeRead, Category: rate.OperationCategoryCatalog},
-	"Catalog.VirtualIPForService": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryCatalog},
-
-	"ConfigEntry.Apply":                {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryConfigEntry},
-	"ConfigEntry.Delete":               {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryConfigEntry},
-	"ConfigEntry.Get":                  {Type: rate.OperationTypeRead, Category: rate.OperationCategoryConfigEntry},
-	"ConfigEntry.List":                 {Type: rate.OperationTypeRead, Category: rate.OperationCategoryConfigEntry},
-	"ConfigEntry.ListAll":              {Type: rate.OperationTypeRead, Category: rate.OperationCategoryConfigEntry},
-	"ConfigEntry.ResolveServiceConfig": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryConfigEntry},
-
-	"ConnectCA.ConfigurationGet": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryConnectCA},
-	"ConnectCA.ConfigurationSet": {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryConnectCA},
-	"ConnectCA.Roots":            {Type: rate.OperationTypeRead, Category: rate.OperationCategoryConnectCA},
-	"ConnectCA.Sign":             {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryConnectCA},
-	"ConnectCA.SignIntermediate": {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryConnectCA},
-
-	"Coordinate.ListDatacenters": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryCoordinate},
-	"Coordinate.ListNodes":       {Type: rate.OperationTypeRead, Category: rate.OperationCategoryCoordinate},
-	"Coordinate.Node":            {Type: rate.OperationTypeRead, Category: rate.OperationCategoryCoordinate},
-	"Coordinate.Update":          {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryCoordinate},
-
-	"DiscoveryChain.Get": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryDiscoveryChain},
-
-	"FederationState.Apply":            {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryFederationState},
-	"FederationState.Delete":           {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryFederationState},
-	"FederationState.Get":              {Type: rate.OperationTypeRead, Category: rate.OperationCategoryFederationState},
-	"FederationState.List":             {Type: rate.OperationTypeRead, Category: rate.OperationCategoryFederationState},
-	"FederationState.ListMeshGateways": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryFederationState},
-
-	"Health.ChecksInState": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryHealth},
-	"Health.NodeChecks":    {Type: rate.OperationTypeRead, Category: rate.OperationCategoryHealth},
-	"Health.ServiceChecks": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryHealth},
-	"Health.ServiceNodes":  {Type: rate.OperationTypeRead, Category: rate.OperationCategoryHealth},
-
-	"Intention.Apply": {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryIntention},
-	"Intention.Check": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryIntention},
-	"Intention.Get":   {Type: rate.OperationTypeRead, Category: rate.OperationCategoryIntention},
-	"Intention.List":  {Type: rate.OperationTypeRead, Category: rate.OperationCategoryIntention},
-	"Intention.Match": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryIntention},
-
-	"Internal.CatalogOverview":               {Type: rate.OperationTypeRead, Category: rate.OperationCategoryInternal},
-	"Internal.EventFire":                     {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryInternal},
-	"Internal.ExportedPeeredServices":        {Type: rate.OperationTypeRead, Category: rate.OperationCategoryInternal},
-	"Internal.ExportedServicesForPeer":       {Type: rate.OperationTypeRead, Category: rate.OperationCategoryInternal},
-	"Internal.GatewayIntentions":             {Type: rate.OperationTypeRead, Category: rate.OperationCategoryInternal},
-	"Internal.GatewayServiceDump":            {Type: rate.OperationTypeRead, Category: rate.OperationCategoryInternal},
-	"Internal.IntentionUpstreams":            {Type: rate.OperationTypeRead, Category: rate.OperationCategoryInternal},
-	"Internal.IntentionUpstreamsDestination": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryInternal},
-	"Internal.KeyringOperation":              {Type: rate.OperationTypeRead, Category: rate.OperationCategoryInternal},
-	"Internal.NodeDump":                      {Type: rate.OperationTypeRead, Category: rate.OperationCategoryInternal},
-	"Internal.NodeInfo":                      {Type: rate.OperationTypeRead, Category: rate.OperationCategoryInternal},
-	"Internal.PeeredUpstreams":               {Type: rate.OperationTypeRead, Category: rate.OperationCategoryInternal},
-	"Internal.ServiceDump":                   {Type: rate.OperationTypeRead, Category: rate.OperationCategoryInternal},
-	"Internal.ServiceGateways":               {Type: rate.OperationTypeRead, Category: rate.OperationCategoryInternal},
-	"Internal.ServiceTopology":               {Type: rate.OperationTypeRead, Category: rate.OperationCategoryInternal},
-
-	"KVS.Apply":    {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryKV},
-	"KVS.Get":      {Type: rate.OperationTypeRead, Category: rate.OperationCategoryKV},
-	"KVS.List":     {Type: rate.OperationTypeRead, Category: rate.OperationCategoryKV},
-	"KVS.ListKeys": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryKV},
-
-	"Operator.AutopilotGetConfiguration": {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryOperator},
-	"Operator.AutopilotSetConfiguration": {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryOperator},
-	"Operator.AutopilotState":            {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryOperator},
-	"Operator.RaftGetConfiguration":      {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryOperator},
-	"Operator.RaftRemovePeerByAddress":   {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryOperator},
-	"Operator.RaftRemovePeerByID":        {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryOperator},
-	"Operator.ServerHealth":              {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryOperator},
-
-	"PreparedQuery.Apply":         {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryPreparedQuery},
-	"PreparedQuery.Execute":       {Type: rate.OperationTypeRead, Category: rate.OperationCategoryPreparedQuery},
-	"PreparedQuery.ExecuteRemote": {Type: rate.OperationTypeRead, Category: rate.OperationCategoryPreparedQuery},
-	"PreparedQuery.Explain":       {Type: rate.OperationTypeRead, Category: rate.OperationCategoryPreparedQuery},
-	"PreparedQuery.Get":           {Type: rate.OperationTypeRead, Category: rate.OperationCategoryPreparedQuery},
-	"PreparedQuery.List":          {Type: rate.OperationTypeRead, Category: rate.OperationCategoryPreparedQuery},
-
-	"Session.Apply":        {Type: rate.OperationTypeWrite, Category: rate.OperationCategorySession},
-	"Session.Check":        {Type: rate.OperationTypeRead, Category: rate.OperationCategorySession},
-	"Session.Get":          {Type: rate.OperationTypeRead, Category: rate.OperationCategorySession},
-	"Session.List":         {Type: rate.OperationTypeRead, Category: rate.OperationCategorySession},
-	"Session.NodeSessions": {Type: rate.OperationTypeRead, Category: rate.OperationCategorySession},
-	"Session.Renew":        {Type: rate.OperationTypeWrite, Category: rate.OperationCategorySession},
-
-	"Status.Leader":    {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryStatus},
-	"Status.Peers":     {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryStatus},
-	"Status.Ping":      {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryStatus},
-	"Status.RaftStats": {Type: rate.OperationTypeExempt, Category: rate.OperationCategoryStatus},
-
-	"Txn.Apply": {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryTxn},
-	"Txn.Read":  {Type: rate.OperationTypeRead, Category: rate.OperationCategoryTxn},
-
-	"Namespace.Write":  {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryPartition},
-	"Namespace.Delete": {Type: rate.OperationTypeWrite, Category: rate.OperationCategoryPartition},
-	"Namespace.List":   {Type: rate.OperationTypeRead, Category: rate.OperationCategoryPartition},
-	"Namespace.Read":   {Type: rate.OperationTypeRead, Category: rate.OperationCategoryPartition},
+var rpcRateLimitSpecs = map[string]rate.OperationType{
+	"ACL.AuthMethodDelete":  rate.OperationTypeWrite,
+	"ACL.AuthMethodList":    rate.OperationTypeRead,
+	"ACL.AuthMethodRead":    rate.OperationTypeRead,
+	"ACL.AuthMethodSet":     rate.OperationTypeWrite,
+	"ACL.Authorize":         rate.OperationTypeRead,
+	"ACL.BindingRuleDelete": rate.OperationTypeWrite,
+	"ACL.BindingRuleList":   rate.OperationTypeRead,
+	"ACL.BindingRuleRead":   rate.OperationTypeRead,
+	"ACL.BindingRuleSet":    rate.OperationTypeWrite,
+	"ACL.BootstrapTokens":   rate.OperationTypeRead,
+	"ACL.Login":             rate.OperationTypeWrite,
+	"ACL.Logout":            rate.OperationTypeWrite,
+	"ACL.PolicyBatchRead":   rate.OperationTypeRead,
+	"ACL.PolicyDelete":      rate.OperationTypeWrite,
+	"ACL.PolicyList":        rate.OperationTypeRead,
+	"ACL.PolicyRead":        rate.OperationTypeRead,
+	"ACL.PolicyResolve":     rate.OperationTypeRead,
+	"ACL.PolicySet":         rate.OperationTypeWrite,
+	"ACL.ReplicationStatus": rate.OperationTypeRead,
+	"ACL.RoleBatchRead":     rate.OperationTypeRead,
+	"ACL.RoleDelete":        rate.OperationTypeWrite,
+	"ACL.RoleList":          rate.OperationTypeRead,
+	"ACL.RoleRead":          rate.OperationTypeRead,
+	"ACL.RoleResolve":       rate.OperationTypeRead,
+	"ACL.RoleSet":           rate.OperationTypeWrite,
+	"ACL.TokenBatchRead":    rate.OperationTypeRead,
+	"ACL.TokenClone":        rate.OperationTypeRead,
+	"ACL.TokenDelete":       rate.OperationTypeWrite,
+	"ACL.TokenList":         rate.OperationTypeRead,
+	"ACL.TokenRead":         rate.OperationTypeRead,
+	"ACL.TokenSet":          rate.OperationTypeWrite,
+
+	"AutoConfig.InitialConfiguration": rate.OperationTypeRead,
+
+	"AutoEncrypt.Sign": rate.OperationTypeWrite,
+
+	"Catalog.Deregister":          rate.OperationTypeWrite,
+	"Catalog.GatewayServices":     rate.OperationTypeRead,
+	"Catalog.ListDatacenters":     rate.OperationTypeRead,
+	"Catalog.ListNodes":           rate.OperationTypeRead,
+	"Catalog.ListServices":        rate.OperationTypeRead,
+	"Catalog.NodeServiceList":     rate.OperationTypeRead,
+	"Catalog.NodeServices":        rate.OperationTypeRead,
+	"Catalog.Register":            rate.OperationTypeWrite,
+	"Catalog.ServiceList":         rate.OperationTypeRead,
+	"Catalog.ServiceNodes":        rate.OperationTypeRead,
+	"Catalog.VirtualIPForService": rate.OperationTypeRead,
+
+	"ConfigEntry.Apply":                rate.OperationTypeWrite,
+	"ConfigEntry.Delete":               rate.OperationTypeWrite,
+	"ConfigEntry.Get":                  rate.OperationTypeRead,
+	"ConfigEntry.List":                 rate.OperationTypeRead,
+	"ConfigEntry.ListAll":              rate.OperationTypeRead,
+	"ConfigEntry.ResolveServiceConfig": rate.OperationTypeRead,
+
+	"ConnectCA.ConfigurationGet": rate.OperationTypeRead,
+	"ConnectCA.ConfigurationSet": rate.OperationTypeWrite,
+	"ConnectCA.Roots":            rate.OperationTypeRead,
+	"ConnectCA.Sign":             rate.OperationTypeWrite,
+	"ConnectCA.SignIntermediate": rate.OperationTypeWrite,
+
+	"Coordinate.ListDatacenters": rate.OperationTypeRead,
+	"Coordinate.ListNodes":       rate.OperationTypeRead,
+	"Coordinate.Node":            rate.OperationTypeRead,
+	"Coordinate.Update":          rate.OperationTypeWrite,
+
+	"DiscoveryChain.Get": rate.OperationTypeRead,
+
+	"FederationState.Apply":            rate.OperationTypeWrite,
+	"FederationState.Delete":           rate.OperationTypeWrite,
+	"FederationState.Get":              rate.OperationTypeRead,
+	"FederationState.List":             rate.OperationTypeRead,
+	"FederationState.ListMeshGateways": rate.OperationTypeRead,
+
+	"Health.ChecksInState": rate.OperationTypeRead,
+	"Health.NodeChecks":    rate.OperationTypeRead,
+	"Health.ServiceChecks": rate.OperationTypeRead,
+	"Health.ServiceNodes":  rate.OperationTypeRead,
+
+	"Intention.Apply": rate.OperationTypeWrite,
+	"Intention.Check": rate.OperationTypeRead,
+	"Intention.Get":   rate.OperationTypeRead,
+	"Intention.List":  rate.OperationTypeRead,
+	"Intention.Match": rate.OperationTypeRead,
+
+	"Internal.CatalogOverview":               rate.OperationTypeRead,
+	"Internal.EventFire":                     rate.OperationTypeWrite,
+	"Internal.ExportedPeeredServices":        rate.OperationTypeRead,
+	"Internal.ExportedServicesForPeer":       rate.OperationTypeRead,
+	"Internal.GatewayIntentions":             rate.OperationTypeRead,
+	"Internal.GatewayServiceDump":            rate.OperationTypeRead,
+	"Internal.IntentionUpstreams":            rate.OperationTypeRead,
+	"Internal.IntentionUpstreamsDestination": rate.OperationTypeRead,
+	"Internal.KeyringOperation":              rate.OperationTypeRead,
+	"Internal.NodeDump":                      rate.OperationTypeRead,
+	"Internal.NodeInfo":                      rate.OperationTypeRead,
+	"Internal.PeeredUpstreams":               rate.OperationTypeRead,
+	"Internal.ServiceDump":                   rate.OperationTypeRead,
+	"Internal.ServiceGateways":               rate.OperationTypeRead,
+	"Internal.ServiceTopology":               rate.OperationTypeRead,
+
+	"KVS.Apply":    rate.OperationTypeWrite,
+	"KVS.Get":      rate.OperationTypeRead,
+	"KVS.List":     rate.OperationTypeRead,
+	"KVS.ListKeys": rate.OperationTypeRead,
+
+	"Operator.AutopilotGetConfiguration": rate.OperationTypeExempt,
+	"Operator.AutopilotSetConfiguration": rate.OperationTypeExempt,
+	"Operator.AutopilotState":            rate.OperationTypeExempt,
+	"Operator.RaftGetConfiguration":      rate.OperationTypeExempt,
+	"Operator.RaftRemovePeerByAddress":   rate.OperationTypeExempt,
+	"Operator.RaftRemovePeerByID":        rate.OperationTypeExempt,
+	"Operator.ServerHealth":              rate.OperationTypeExempt,
+
+	"PreparedQuery.Apply":         rate.OperationTypeWrite,
+	"PreparedQuery.Execute":       rate.OperationTypeRead,
+	"PreparedQuery.ExecuteRemote": rate.OperationTypeRead,
+	"PreparedQuery.Explain":       rate.OperationTypeRead,
+	"PreparedQuery.Get":           rate.OperationTypeRead,
+	"PreparedQuery.List":          rate.OperationTypeRead,
+
+	"Session.Apply":        rate.OperationTypeWrite,
+	"Session.Check":        rate.OperationTypeRead,
+	"Session.Get":          rate.OperationTypeRead,
+	"Session.List":         rate.OperationTypeRead,
+	"Session.NodeSessions": rate.OperationTypeRead,
+	"Session.Renew":        rate.OperationTypeWrite,
+
+	"Status.Leader":    rate.OperationTypeExempt,
+	"Status.Peers":     rate.OperationTypeExempt,
+	"Status.Ping":      rate.OperationTypeExempt,
+	"Status.RaftStats": rate.OperationTypeExempt,
+
+	"Txn.Apply": rate.OperationTypeWrite,
+	"Txn.Read":  rate.OperationTypeRead,
 }
diff --git a/agent/rpc/middleware/recovery.go b/agent/rpc/middleware/recovery.go
index 6c23eb3ed3fa6..f381f0ee2abbc 100644
--- a/agent/rpc/middleware/recovery.go
+++ b/agent/rpc/middleware/recovery.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package middleware
 
 import (
diff --git a/agent/rpc/operator/service.go b/agent/rpc/operator/service.go
index 697b0db254321..cbe876a7f1d6b 100644
--- a/agent/rpc/operator/service.go
+++ b/agent/rpc/operator/service.go
@@ -1,16 +1,12 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package operator
 
 import (
 	"context"
-
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/acl/resolver"
 	external "github.com/hashicorp/consul/agent/grpc-external"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pboperator"
+	"github.com/hashicorp/consul/proto/pboperator"
 	"github.com/hashicorp/go-hclog"
 	"google.golang.org/grpc"
 )
diff --git a/agent/rpc/operator/service_test.go b/agent/rpc/operator/service_test.go
index 3cc9e117d4425..f9d7c52aeb037 100644
--- a/agent/rpc/operator/service_test.go
+++ b/agent/rpc/operator/service_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package operator
 
 import (
@@ -11,13 +8,12 @@ import (
 	"github.com/hashicorp/go-hclog"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-
 	"google.golang.org/grpc"
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/acl/resolver"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pboperator"
+	"github.com/hashicorp/consul/proto/pboperator"
 )
 
 type MockBackend struct {
diff --git a/agent/rpc/peering/service.go b/agent/rpc/peering/service.go
index d57e0378f98c0..46fe5e23af7c0 100644
--- a/agent/rpc/peering/service.go
+++ b/agent/rpc/peering/service.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peering
 
 import (
@@ -31,9 +28,8 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/lib/retry"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/pbpeerstream"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeerstream"
 )
 
 var (
@@ -93,7 +89,6 @@ type Config struct {
 	Datacenter     string
 	ConnectEnabled bool
 	PeeringEnabled bool
-	Locality       *structs.Locality
 
 	// Needed because the stateful components needed to handle blocking queries are mixed in with server goo
 	FSMServer blockingquery.FSMServer
@@ -338,7 +333,6 @@ func (s *Server) GenerateToken(
 		Remote: structs.PeeringTokenRemote{
 			Partition:  req.PartitionOrDefault(),
 			Datacenter: s.Datacenter,
-			Locality:   s.Config.Locality,
 		},
 	}
 
@@ -457,7 +451,6 @@ func (s *Server) Establish(
 		Remote: &pbpeering.RemoteInfo{
 			Partition:  tok.Remote.Partition,
 			Datacenter: tok.Remote.Datacenter,
-			Locality:   pbcommon.LocalityToProto(tok.Remote.Locality),
 		},
 	}
 
diff --git a/agent/rpc/peering/service_ce_test.go b/agent/rpc/peering/service_ce_test.go
index b30a0ff59f7b0..173e018897c18 100644
--- a/agent/rpc/peering/service_ce_test.go
+++ b/agent/rpc/peering/service_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package peering_test
 
@@ -12,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 func TestPeeringService_RejectsPartition(t *testing.T) {
diff --git a/agent/rpc/peering/service_test.go b/agent/rpc/peering/service_test.go
index 8fde278c8b7f8..40de093c905d9 100644
--- a/agent/rpc/peering/service_test.go
+++ b/agent/rpc/peering/service_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peering_test
 
 import (
@@ -15,8 +12,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/internal/resource"
-
 	"github.com/google/tcpproxy"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-uuid"
@@ -46,8 +41,8 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/token"
 	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/pbpeering"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
@@ -1820,7 +1815,7 @@ func newTestServer(t *testing.T, cb func(conf *consul.Config)) testingServer {
 	deps := newDefaultDeps(t, conf)
 	externalGRPCServer := external.NewServer(deps.Logger, nil, deps.TLSConfigurator, rate.NullRequestLimitsHandler())
 
-	server, err := consul.NewServer(conf, deps, externalGRPCServer, nil, deps.Logger, nil)
+	server, err := consul.NewServer(conf, deps, externalGRPCServer, nil, deps.Logger)
 	require.NoError(t, err)
 	t.Cleanup(func() {
 		require.NoError(t, server.Shutdown())
@@ -1952,7 +1947,6 @@ func newDefaultDeps(t *testing.T, c *consul.Config) consul.Deps {
 		NewRequestRecorderFunc:   middleware.NewRequestRecorder,
 		GetNetRPCInterceptorFunc: middleware.GetNetRPCInterceptor,
 		XDSStreamLimiter:         limiter.NewSessionLimiter(),
-		Registry:                 resource.NewRegistry(),
 	}
 }
 
diff --git a/agent/rpc/peering/testing.go b/agent/rpc/peering/testing.go
index 8989950ee29be..577f78229fca5 100644
--- a/agent/rpc/peering/testing.go
+++ b/agent/rpc/peering/testing.go
@@ -1,12 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peering
 
 import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 // same certificate that appears in our connect tests
diff --git a/agent/rpc/peering/testutil_ce_test.go b/agent/rpc/peering/testutil_ce_test.go
index 7d9a0c286d265..4aac92cadd60d 100644
--- a/agent/rpc/peering/testutil_ce_test.go
+++ b/agent/rpc/peering/testutil_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package peering_test
 
diff --git a/agent/rpc/peering/validate.go b/agent/rpc/peering/validate.go
index 2de6684d85ff9..945a6a0dc288b 100644
--- a/agent/rpc/peering/validate.go
+++ b/agent/rpc/peering/validate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peering
 
 import (
diff --git a/agent/rpc/peering/validate_test.go b/agent/rpc/peering/validate_test.go
index 669baf41702fc..eb4882f0b896e 100644
--- a/agent/rpc/peering/validate_test.go
+++ b/agent/rpc/peering/validate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peering
 
 import (
diff --git a/agent/rpcclient/common.go b/agent/rpcclient/common.go
deleted file mode 100644
index 316fb341a9356..0000000000000
--- a/agent/rpcclient/common.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package rpcclient
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/agent/cache"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/submatview"
-	"github.com/hashicorp/go-hclog"
-	"google.golang.org/grpc"
-)
-
-// NetRPC reprents an interface for making RPC requests
-type NetRPC interface {
-	RPC(ctx context.Context, method string, args interface{}, reply interface{}) error
-}
-
-// CacheGetter represents an interface for interacting with the cache
-type CacheGetter interface {
-	Get(ctx context.Context, t string, r cache.Request) (interface{}, cache.ResultMeta, error)
-	NotifyCallback(ctx context.Context, t string, r cache.Request, cID string, cb cache.Callback) error
-}
-
-// MaterializedViewStore represents an interface for interacting with the material view store
-type MaterializedViewStore interface {
-	Get(ctx context.Context, req submatview.Request) (submatview.Result, error)
-	NotifyCallback(ctx context.Context, req submatview.Request, cID string, cb cache.Callback) error
-}
-
-// MaterializerDeps include the dependencies for the materializer
-type MaterializerDeps struct {
-	Conn   *grpc.ClientConn
-	Logger hclog.Logger
-}
-
-// Client represents a rpc client, a new Client is created in each sub-package
-// embedding this object. Methods are therefore implemented in the subpackages
-// as well.
-type Client struct {
-	NetRPC              NetRPC
-	Cache               CacheGetter
-	ViewStore           MaterializedViewStore
-	MaterializerDeps    MaterializerDeps
-	CacheName           string
-	UseStreamingBackend bool
-	QueryOptionDefaults func(options *structs.QueryOptions)
-}
-
-// Close any underlying connections used by the client.
-func (c *Client) Close() error {
-	if c == nil {
-		return nil
-	}
-	return c.MaterializerDeps.Conn.Close()
-}
diff --git a/agent/rpcclient/configentry/configentry.go b/agent/rpcclient/configentry/configentry.go
deleted file mode 100644
index 2b38455beb074..0000000000000
--- a/agent/rpcclient/configentry/configentry.go
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package configentry
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/hashicorp/consul/agent/cache"
-	"github.com/hashicorp/consul/agent/rpcclient"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/submatview"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
-)
-
-// Client provides access to config entry data.
-type Client struct {
-	rpcclient.Client
-}
-
-// GetSamenessGroup returns the sameness group config entry (if possible) given the
-// provided config entry query
-func (c *Client) GetSamenessGroup(
-	ctx context.Context,
-	req *structs.ConfigEntryQuery,
-) (structs.SamenessGroupConfigEntry, cache.ResultMeta, error) {
-	if req.Kind != structs.SamenessGroup {
-		return structs.SamenessGroupConfigEntry{}, cache.ResultMeta{}, fmt.Errorf("wrong kind in query %s, expected %s", req.Kind, structs.SamenessGroup)
-	}
-
-	out, meta, err := c.GetConfigEntry(ctx, req)
-	if err != nil {
-		return structs.SamenessGroupConfigEntry{}, cache.ResultMeta{}, err
-	}
-
-	sg, ok := out.Entry.(*structs.SamenessGroupConfigEntry)
-	if !ok {
-		return structs.SamenessGroupConfigEntry{}, cache.ResultMeta{}, fmt.Errorf("%s config entry with name %s not found", structs.SamenessGroup, req.Name)
-	}
-	return *sg, meta, nil
-}
-
-// GetConfigEntry returns the config entry (if possible) given the
-// provided config entry query
-func (c *Client) GetConfigEntry(
-	ctx context.Context,
-	req *structs.ConfigEntryQuery,
-) (structs.ConfigEntryResponse, cache.ResultMeta, error) {
-	if c.UseStreamingBackend && (req.QueryOptions.UseCache || req.QueryOptions.MinQueryIndex > 0) {
-		c.QueryOptionDefaults(&req.QueryOptions)
-		cfgReq, err := c.newConfigEntryRequest(req)
-		if err != nil {
-			return structs.ConfigEntryResponse{}, cache.ResultMeta{}, err
-		}
-		result, err := c.ViewStore.Get(ctx, cfgReq)
-		if err != nil {
-			return structs.ConfigEntryResponse{}, cache.ResultMeta{}, err
-		}
-		meta := cache.ResultMeta{Index: result.Index, Hit: result.Cached}
-		return *result.Value.(*structs.ConfigEntryResponse), meta, err
-	}
-
-	out, md, err := c.getConfigEntryRPC(ctx, req)
-	if err != nil {
-		return out, md, err
-	}
-
-	if req.QueryOptions.AllowStale && req.QueryOptions.MaxStaleDuration > 0 && out.LastContact > req.MaxStaleDuration {
-		req.AllowStale = false
-		err := c.NetRPC.RPC(ctx, "ConfigEntry.Get", &req, &out)
-		return out, cache.ResultMeta{}, err
-	}
-
-	return out, md, err
-}
-
-func (c *Client) getConfigEntryRPC(
-	ctx context.Context,
-	req *structs.ConfigEntryQuery,
-) (structs.ConfigEntryResponse, cache.ResultMeta, error) {
-	var out structs.ConfigEntryResponse
-	if !req.QueryOptions.UseCache {
-		err := c.NetRPC.RPC(context.Background(), "ConfigEntry.Get", req, &out)
-		return out, cache.ResultMeta{}, err
-	}
-
-	raw, md, err := c.Cache.Get(ctx, c.CacheName, req)
-	if err != nil {
-		return out, md, err
-	}
-
-	value, ok := raw.(*structs.ConfigEntryResponse)
-	if !ok {
-		panic("wrong response type for cachetype.HealthServicesName")
-	}
-
-	return *value, md, nil
-}
-
-var _ submatview.Request = (*configEntryRequest)(nil)
-
-type configEntryRequest struct {
-	Topic pbsubscribe.Topic
-	req   *structs.ConfigEntryQuery
-	deps  rpcclient.MaterializerDeps
-}
-
-func (c *Client) newConfigEntryRequest(req *structs.ConfigEntryQuery) (*configEntryRequest, error) {
-	var topic pbsubscribe.Topic
-	switch req.Kind {
-	case structs.SamenessGroup:
-		topic = pbsubscribe.Topic_SamenessGroup
-	default:
-		return nil, fmt.Errorf("cannot map config entry kind: %q to a topic", req.Kind)
-	}
-	return &configEntryRequest{
-		Topic: topic,
-		req:   req,
-		deps:  c.MaterializerDeps,
-	}, nil
-}
-
-// CacheInfo returns information used for caching the config entry request.
-func (r *configEntryRequest) CacheInfo() cache.RequestInfo {
-	return r.req.CacheInfo()
-}
-
-// Type returns a string which uniquely identifies the config entry of request.
-// The returned value is used as the prefix of the key used to index
-// entries in the Store.
-func (r *configEntryRequest) Type() string {
-	return "agent.rpcclient.configentry.configentryrequest"
-}
-
-// Request creates a new pbsubscribe.SubscribeRequest for a config entry including
-// wildcards and enterprise fields
-func (r *configEntryRequest) Request(index uint64) *pbsubscribe.SubscribeRequest {
-	req := &pbsubscribe.SubscribeRequest{
-		Topic:      r.Topic,
-		Index:      index,
-		Datacenter: r.req.Datacenter,
-		Token:      r.req.QueryOptions.Token,
-	}
-
-	if name := r.req.Name; name == "" {
-		req.Subject = &pbsubscribe.SubscribeRequest_WildcardSubject{
-			WildcardSubject: true,
-		}
-	} else {
-		req.Subject = &pbsubscribe.SubscribeRequest_NamedSubject{
-			NamedSubject: &pbsubscribe.NamedSubject{
-				Key:       name,
-				Partition: r.req.PartitionOrDefault(),
-				Namespace: r.req.NamespaceOrDefault(),
-			},
-		}
-	}
-
-	return req
-}
-
-// NewMaterializer will be called if there is no active materializer to fulfill
-// the request. It returns a Materializer appropriate for streaming
-// data to fulfil the config entry request.
-func (r *configEntryRequest) NewMaterializer() (submatview.Materializer, error) {
-	var view submatview.View
-	if r.req.Name == "" {
-		view = NewConfigEntryListView(r.req.Kind, r.req.EnterpriseMeta)
-	} else {
-		view = &ConfigEntryView{}
-	}
-
-	deps := submatview.Deps{
-		View:    view,
-		Logger:  r.deps.Logger,
-		Request: r.Request,
-	}
-
-	return submatview.NewRPCMaterializer(pbsubscribe.NewStateChangeSubscriptionClient(r.deps.Conn), deps), nil
-}
diff --git a/agent/rpcclient/configentry/configentry_test.go b/agent/rpcclient/configentry/configentry_test.go
deleted file mode 100644
index 92e6f4b3c88ae..0000000000000
--- a/agent/rpcclient/configentry/configentry_test.go
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package configentry
-
-import (
-	"context"
-	"errors"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/consul/agent/rpcclient"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/agent/cache"
-	"github.com/hashicorp/consul/agent/config"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/submatview"
-)
-
-func TestClient_SamenessGroup_BackendRouting(t *testing.T) {
-	type testCase struct {
-		name                string
-		req                 structs.ConfigEntryQuery
-		useStreamingBackend bool
-		expected            func(t *testing.T, c *Client, err error)
-	}
-
-	run := func(t *testing.T, tc testCase) {
-		c := &Client{
-			Client: rpcclient.Client{
-				NetRPC:              &fakeNetRPC{},
-				Cache:               &fakeCache{configEntryType: structs.SamenessGroup, configEntryName: "sg1"},
-				ViewStore:           &fakeViewStore{configEntryType: structs.SamenessGroup, configEntryName: "sg1"},
-				CacheName:           "cache-no-streaming",
-				UseStreamingBackend: tc.useStreamingBackend,
-				QueryOptionDefaults: config.ApplyDefaultQueryOptions(&config.RuntimeConfig{}),
-			},
-		}
-		_, _, err := c.GetSamenessGroup(context.Background(), &tc.req)
-		tc.expected(t, c, err)
-	}
-
-	var testCases = []testCase{
-		{
-			name: "rpc by default",
-			req: structs.ConfigEntryQuery{
-				Kind:       structs.SamenessGroup,
-				Name:       "sg1",
-				Datacenter: "dc1",
-			},
-			useStreamingBackend: true,
-			expected:            useRPC,
-		},
-		{
-			name: "use streaming instead of cache",
-			req: structs.ConfigEntryQuery{
-				Kind:         structs.SamenessGroup,
-				Name:         "sg1",
-				QueryOptions: structs.QueryOptions{UseCache: true},
-				Datacenter:   "dc1",
-			},
-			useStreamingBackend: true,
-			expected:            useStreaming,
-		},
-		{
-			name: "use streaming for MinQueryIndex",
-			req: structs.ConfigEntryQuery{
-				Kind:         structs.SamenessGroup,
-				Name:         "sg1",
-				Datacenter:   "dc1",
-				QueryOptions: structs.QueryOptions{MinQueryIndex: 22},
-			},
-			useStreamingBackend: true,
-			expected:            useStreaming,
-		},
-		{
-			name: "use cache",
-			req: structs.ConfigEntryQuery{
-				Kind:         structs.SamenessGroup,
-				Name:         "sg1",
-				Datacenter:   "dc1",
-				QueryOptions: structs.QueryOptions{UseCache: true},
-			},
-			useStreamingBackend: false,
-			expected:            useCache,
-		},
-		{
-			name: "wrong kind error",
-			req: structs.ConfigEntryQuery{
-				Kind: structs.ServiceDefaults,
-			},
-			expected: expectError,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func TestClient_SamenessGroup_SetsDefaults(t *testing.T) {
-	store := &fakeViewStore{}
-	c := &Client{
-		Client: rpcclient.Client{
-			ViewStore:           store,
-			CacheName:           "cache-no-streaming",
-			UseStreamingBackend: true,
-			QueryOptionDefaults: config.ApplyDefaultQueryOptions(&config.RuntimeConfig{
-				MaxQueryTime:     200 * time.Second,
-				DefaultQueryTime: 100 * time.Second,
-			}),
-		},
-	}
-
-	req := structs.ConfigEntryQuery{
-		Datacenter:   "dc1",
-		Kind:         structs.SamenessGroup,
-		QueryOptions: structs.QueryOptions{MinQueryIndex: 22},
-	}
-
-	_, _, err := c.GetConfigEntry(context.Background(), &req)
-	require.NoError(t, err)
-
-	require.Len(t, store.calls, 1)
-	require.Equal(t, 100*time.Second, store.calls[0].CacheInfo().Timeout)
-}
-
-func useRPC(t *testing.T, c *Client, err error) {
-	t.Helper()
-	require.NoError(t, err)
-
-	rpc, ok := c.NetRPC.(*fakeNetRPC)
-	require.True(t, ok, "test setup error, expected *fakeNetRPC, got %T", c.NetRPC)
-
-	cache, ok := c.Cache.(*fakeCache)
-	require.True(t, ok, "test setup error, expected *fakeCache, got %T", c.Cache)
-
-	store, ok := c.ViewStore.(*fakeViewStore)
-	require.True(t, ok, "test setup error, expected *fakeViewSTore, got %T", c.ViewStore)
-
-	require.Len(t, cache.calls, 0)
-	require.Len(t, store.calls, 0)
-	require.Equal(t, []string{"ConfigEntry.Get"}, rpc.calls)
-}
-
-func useStreaming(t *testing.T, c *Client, err error) {
-	t.Helper()
-
-	require.NoError(t, err)
-
-	rpc, ok := c.NetRPC.(*fakeNetRPC)
-	require.True(t, ok, "test setup error, expected *fakeNetRPC, got %T", c.NetRPC)
-
-	cache, ok := c.Cache.(*fakeCache)
-	require.True(t, ok, "test setup error, expected *fakeCache, got %T", c.Cache)
-
-	store, ok := c.ViewStore.(*fakeViewStore)
-	require.True(t, ok, "test setup error, expected *fakeViewSTore, got %T", c.ViewStore)
-
-	require.Len(t, cache.calls, 0)
-	require.Len(t, rpc.calls, 0)
-	require.Len(t, store.calls, 1)
-}
-
-func useCache(t *testing.T, c *Client, err error) {
-	t.Helper()
-
-	require.NoError(t, err)
-
-	rpc, ok := c.NetRPC.(*fakeNetRPC)
-	require.True(t, ok, "test setup error, expected *fakeNetRPC, got %T", c.NetRPC)
-
-	cache, ok := c.Cache.(*fakeCache)
-	require.True(t, ok, "test setup error, expected *fakeCache, got %T", c.Cache)
-
-	store, ok := c.ViewStore.(*fakeViewStore)
-	require.True(t, ok, "test setup error, expected *fakeViewSTore, got %T", c.ViewStore)
-
-	require.Len(t, rpc.calls, 0)
-	require.Len(t, store.calls, 0)
-	require.Equal(t, []string{"cache-no-streaming"}, cache.calls)
-}
-
-func expectError(t *testing.T, _ *Client, err error) {
-	t.Helper()
-	require.Error(t, err)
-}
-
-var _ rpcclient.CacheGetter = (*fakeCache)(nil)
-
-type fakeCache struct {
-	calls           []string
-	configEntryType string
-	configEntryName string
-}
-
-func (f *fakeCache) Get(_ context.Context, t string, _ cache.Request) (interface{}, cache.ResultMeta, error) {
-	f.calls = append(f.calls, t)
-	result := &structs.ConfigEntryResponse{}
-	switch f.configEntryType {
-	case structs.SamenessGroup:
-		result = &structs.ConfigEntryResponse{
-			Entry: &structs.SamenessGroupConfigEntry{
-				Name: f.configEntryName,
-			},
-		}
-	}
-	return result, cache.ResultMeta{}, nil
-}
-
-func (f *fakeCache) NotifyCallback(_ context.Context, t string, _ cache.Request, _ string, _ cache.Callback) error {
-	f.calls = append(f.calls, t)
-	return nil
-}
-
-var _ rpcclient.NetRPC = (*fakeNetRPC)(nil)
-
-type fakeNetRPC struct {
-	calls []string
-}
-
-func (f *fakeNetRPC) RPC(ctx context.Context, method string, req interface{}, out interface{}) error {
-	f.calls = append(f.calls, method)
-	r, ok := req.(*structs.ConfigEntryQuery)
-	if !ok {
-		return errors.New("not a config entry query")
-	}
-	switch r.Kind {
-	case structs.SamenessGroup:
-		resp := &structs.ConfigEntryResponse{
-			Entry: &structs.SamenessGroupConfigEntry{
-				Name: r.Name,
-			},
-		}
-		*out.(*structs.ConfigEntryResponse) = *resp
-	}
-	return nil
-}
-
-var _ rpcclient.MaterializedViewStore = (*fakeViewStore)(nil)
-
-type fakeViewStore struct {
-	calls           []submatview.Request
-	configEntryType string
-	configEntryName string
-}
-
-func (f *fakeViewStore) Get(_ context.Context, req submatview.Request) (submatview.Result, error) {
-	f.calls = append(f.calls, req)
-	switch f.configEntryType {
-	case structs.SamenessGroup:
-		return submatview.Result{Value: &structs.ConfigEntryResponse{
-			Entry: &structs.SamenessGroupConfigEntry{
-				Name: f.configEntryName,
-			},
-		}}, nil
-	default:
-		return submatview.Result{Value: &structs.ConfigEntryResponse{}}, nil
-	}
-}
-
-func (f *fakeViewStore) NotifyCallback(_ context.Context, req submatview.Request, _ string, _ cache.Callback) error {
-	f.calls = append(f.calls, req)
-	return nil
-}
diff --git a/agent/rpcclient/configentry/view.go b/agent/rpcclient/configentry/view.go
deleted file mode 100644
index 70271a9220e97..0000000000000
--- a/agent/rpcclient/configentry/view.go
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package configentry
-
-import (
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/submatview"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/proto/private/pbconfigentry"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
-)
-
-var _ submatview.View = (*ConfigEntryView)(nil)
-
-// ConfigEntryView implements a submatview.View for a single config entry.
-type ConfigEntryView struct {
-	state structs.ConfigEntry
-}
-
-// Reset resets the state to nil for the ConfigEntryView
-func (v *ConfigEntryView) Reset() {
-	v.state = nil
-}
-
-// Result returns the structs.ConfigEntryResponse stored by this view.
-func (v *ConfigEntryView) Result(index uint64) any {
-	return &structs.ConfigEntryResponse{
-		QueryMeta: structs.QueryMeta{
-			Index:   index,
-			Backend: structs.QueryBackendStreaming,
-		},
-		Entry: v.state,
-	}
-}
-
-// Update updates the state containing a config entry based on events
-func (v *ConfigEntryView) Update(events []*pbsubscribe.Event) error {
-	for _, event := range events {
-		update := event.GetConfigEntry()
-		if update == nil {
-			continue
-		}
-		switch update.Op {
-		case pbsubscribe.ConfigEntryUpdate_Delete:
-			v.state = nil
-		case pbsubscribe.ConfigEntryUpdate_Upsert:
-			v.state = pbconfigentry.ConfigEntryToStructs(update.ConfigEntry)
-		}
-	}
-	return nil
-}
-
-var _ submatview.View = (*ConfigEntryListView)(nil)
-
-// ConfigEntryListView implements a submatview.View for a list of config entries
-// that are all of the same kind (name is treated as unique).
-type ConfigEntryListView struct {
-	kind    string
-	entMeta acl.EnterpriseMeta
-	state   map[string]structs.ConfigEntry
-}
-
-// NewConfigEntryListView contructs a ConfigEntryListView based on the enterprise meta data and the kind
-func NewConfigEntryListView(kind string, entMeta acl.EnterpriseMeta) *ConfigEntryListView {
-	view := &ConfigEntryListView{kind: kind, entMeta: entMeta}
-	view.Reset()
-	return view
-}
-
-// Reset resets the states of the list view to an empty map of Config Entries
-func (v *ConfigEntryListView) Reset() {
-	v.state = make(map[string]structs.ConfigEntry)
-}
-
-// Result returns the structs.IndexedConfigEntries stored by this view.
-func (v *ConfigEntryListView) Result(index uint64) any {
-	entries := make([]structs.ConfigEntry, 0, len(v.state))
-	for _, entry := range v.state {
-		entries = append(entries, entry)
-	}
-
-	return &structs.IndexedConfigEntries{
-		Kind:    v.kind,
-		Entries: entries,
-		QueryMeta: structs.QueryMeta{
-			Index:   index,
-			Backend: structs.QueryBackendStreaming,
-		},
-	}
-}
-
-// Update updates the states containing a config entry based on events
-func (v *ConfigEntryListView) Update(events []*pbsubscribe.Event) error {
-	for _, event := range filterByEnterpriseMeta(events, v.entMeta) {
-		update := event.GetConfigEntry()
-		configEntry := pbconfigentry.ConfigEntryToStructs(update.ConfigEntry)
-		name := structs.NewServiceName(configEntry.GetName(), configEntry.GetEnterpriseMeta()).String()
-
-		switch update.Op {
-		case pbsubscribe.ConfigEntryUpdate_Delete:
-			delete(v.state, name)
-		case pbsubscribe.ConfigEntryUpdate_Upsert:
-			v.state[name] = configEntry
-		}
-	}
-	return nil
-}
-
-// filterByEnterpriseMeta filters the given set of events to remove those that
-// don't match the request's enterprise meta - this is necessary because when
-// subscribing to a topic with SubjectWildcard we'll get events for resources
-// in all partitions and namespaces.
-func filterByEnterpriseMeta(events []*pbsubscribe.Event, entMeta acl.EnterpriseMeta) []*pbsubscribe.Event {
-	partition := entMeta.PartitionOrDefault()
-	namespace := entMeta.NamespaceOrDefault()
-
-	filtered := make([]*pbsubscribe.Event, 0, len(events))
-	for _, event := range events {
-		var eventEntMeta *pbcommon.EnterpriseMeta
-		switch payload := event.Payload.(type) {
-		case *pbsubscribe.Event_ConfigEntry:
-			eventEntMeta = payload.ConfigEntry.ConfigEntry.GetEnterpriseMeta()
-		case *pbsubscribe.Event_Service:
-			eventEntMeta = payload.Service.GetEnterpriseMeta()
-		default:
-			continue
-		}
-
-		if partition != acl.WildcardName && !acl.EqualPartitions(partition, eventEntMeta.GetPartition()) {
-			continue
-		}
-		if namespace != acl.WildcardName && !acl.EqualNamespaces(namespace, eventEntMeta.GetNamespace()) {
-			continue
-		}
-
-		filtered = append(filtered, event)
-	}
-	return filtered
-}
diff --git a/agent/rpcclient/configentry/view_test.go b/agent/rpcclient/configentry/view_test.go
deleted file mode 100644
index 0209c898cafed..0000000000000
--- a/agent/rpcclient/configentry/view_test.go
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package configentry
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbconfigentry"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestConfigEntryView(t *testing.T) {
-	const index uint64 = 123
-
-	view := &ConfigEntryView{}
-
-	testutil.RunStep(t, "initial state", func(t *testing.T) {
-		result := view.Result(index)
-		resp, ok := result.(*structs.ConfigEntryResponse)
-		require.Truef(t, ok, "expected ConfigEntryResponse, got: %T", result)
-		require.Nil(t, resp.Entry)
-		require.Equal(t, index, resp.QueryMeta.Index)
-	})
-
-	testutil.RunStep(t, "upsert event", func(t *testing.T) {
-		err := view.Update([]*pbsubscribe.Event{
-			{
-				Index: index,
-				Payload: &pbsubscribe.Event_ConfigEntry{
-					ConfigEntry: &pbsubscribe.ConfigEntryUpdate{
-						Op: pbsubscribe.ConfigEntryUpdate_Upsert,
-						ConfigEntry: &pbconfigentry.ConfigEntry{
-							Kind: pbconfigentry.Kind_KindServiceResolver,
-							Name: "web",
-							Entry: &pbconfigentry.ConfigEntry_ServiceResolver{
-								ServiceResolver: &pbconfigentry.ServiceResolver{},
-							},
-						},
-					},
-				},
-			},
-		})
-		require.NoError(t, err)
-
-		result := view.Result(index)
-		resp, ok := result.(*structs.ConfigEntryResponse)
-		require.Truef(t, ok, "expected ConfigEntryResponse, got: %T", result)
-
-		serviceResolver, ok := resp.Entry.(*structs.ServiceResolverConfigEntry)
-		require.Truef(t, ok, "expected ServiceResolverConfigEntry, got: %T", resp.Entry)
-		require.Equal(t, "web", serviceResolver.Name)
-	})
-
-	testutil.RunStep(t, "delete event", func(t *testing.T) {
-		err := view.Update([]*pbsubscribe.Event{
-			{
-				Index: index,
-				Payload: &pbsubscribe.Event_ConfigEntry{
-					ConfigEntry: &pbsubscribe.ConfigEntryUpdate{
-						Op: pbsubscribe.ConfigEntryUpdate_Delete,
-						ConfigEntry: &pbconfigentry.ConfigEntry{
-							Kind: pbconfigentry.Kind_KindServiceResolver,
-							Name: "web",
-							Entry: &pbconfigentry.ConfigEntry_ServiceResolver{
-								ServiceResolver: &pbconfigentry.ServiceResolver{},
-							},
-						},
-					},
-				},
-			},
-		})
-		require.NoError(t, err)
-
-		result := view.Result(index)
-		resp, ok := result.(*structs.ConfigEntryResponse)
-		require.Truef(t, ok, "expected ConfigEntryResponse, got: %T", result)
-		require.Nil(t, resp.Entry)
-	})
-
-	testutil.RunStep(t, "bogus event", func(t *testing.T) {
-		err := view.Update([]*pbsubscribe.Event{
-			{
-				Index:   index,
-				Payload: &pbsubscribe.Event_ServiceHealth{},
-			},
-		})
-		require.NoError(t, err)
-
-		result := view.Result(index)
-		resp, ok := result.(*structs.ConfigEntryResponse)
-		require.Truef(t, ok, "expected ConfigEntryResponse, got: %T", result)
-		require.Nil(t, resp.Entry)
-	})
-}
-
-func TestConfigEntryListView(t *testing.T) {
-	const index uint64 = 123
-
-	view := NewConfigEntryListView(structs.ServiceResolver, *acl.DefaultEnterpriseMeta())
-
-	testutil.RunStep(t, "initial state", func(t *testing.T) {
-		result := view.Result(index)
-
-		resp, ok := result.(*structs.IndexedConfigEntries)
-		require.Truef(t, ok, "expected IndexedConfigEntries, got: %T", result)
-		require.Empty(t, resp.Entries)
-		require.Equal(t, index, resp.QueryMeta.Index)
-	})
-
-	testutil.RunStep(t, "upsert events", func(t *testing.T) {
-		err := view.Update([]*pbsubscribe.Event{
-			{
-				Index: index,
-				Payload: &pbsubscribe.Event_ConfigEntry{
-					ConfigEntry: &pbsubscribe.ConfigEntryUpdate{
-						Op: pbsubscribe.ConfigEntryUpdate_Upsert,
-						ConfigEntry: &pbconfigentry.ConfigEntry{
-							Kind: pbconfigentry.Kind_KindServiceResolver,
-							Name: "web",
-							Entry: &pbconfigentry.ConfigEntry_ServiceResolver{
-								ServiceResolver: &pbconfigentry.ServiceResolver{},
-							},
-						},
-					},
-				},
-			},
-			{
-				Index: index,
-				Payload: &pbsubscribe.Event_ConfigEntry{
-					ConfigEntry: &pbsubscribe.ConfigEntryUpdate{
-						Op: pbsubscribe.ConfigEntryUpdate_Upsert,
-						ConfigEntry: &pbconfigentry.ConfigEntry{
-							Kind: pbconfigentry.Kind_KindServiceResolver,
-							Name: "db",
-							Entry: &pbconfigentry.ConfigEntry_ServiceResolver{
-								ServiceResolver: &pbconfigentry.ServiceResolver{},
-							},
-						},
-					},
-				},
-			},
-		})
-		require.NoError(t, err)
-
-		result := view.Result(index)
-		resp, ok := result.(*structs.IndexedConfigEntries)
-		require.Truef(t, ok, "expected IndexedConfigEntries, got: %T", result)
-		require.Len(t, resp.Entries, 2)
-	})
-
-	testutil.RunStep(t, "delete event", func(t *testing.T) {
-		err := view.Update([]*pbsubscribe.Event{
-			{
-				Index: index,
-				Payload: &pbsubscribe.Event_ConfigEntry{
-					ConfigEntry: &pbsubscribe.ConfigEntryUpdate{
-						Op: pbsubscribe.ConfigEntryUpdate_Delete,
-						ConfigEntry: &pbconfigentry.ConfigEntry{
-							Kind: pbconfigentry.Kind_KindServiceResolver,
-							Name: "web",
-							Entry: &pbconfigentry.ConfigEntry_ServiceResolver{
-								ServiceResolver: &pbconfigentry.ServiceResolver{},
-							},
-						},
-					},
-				},
-			},
-		})
-		require.NoError(t, err)
-
-		result := view.Result(index)
-		resp, ok := result.(*structs.IndexedConfigEntries)
-		require.Truef(t, ok, "expected IndexedConfigEntries, got: %T", result)
-		require.Len(t, resp.Entries, 1)
-
-		serviceResolver, ok := resp.Entries[0].(*structs.ServiceResolverConfigEntry)
-		require.Truef(t, ok, "expected ServiceResolverConfigEntry, got: %T", resp.Entries[0])
-		require.Equal(t, "db", serviceResolver.Name)
-	})
-}
-
-func TestConfigEntryListView_Reset(t *testing.T) {
-	view := &ConfigEntryView{state: &structs.SamenessGroupConfigEntry{}}
-	view.Reset()
-	require.Nil(t, view.state)
-}
diff --git a/agent/rpcclient/health/health.go b/agent/rpcclient/health/health.go
index f062d2aac284e..1f1781e1a68e1 100644
--- a/agent/rpcclient/health/health.go
+++ b/agent/rpcclient/health/health.go
@@ -1,23 +1,39 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package health
 
 import (
 	"context"
 
-	"github.com/hashicorp/consul/agent/rpcclient"
 	"google.golang.org/grpc/connectivity"
 
 	"github.com/hashicorp/consul/agent/cache"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/submatview"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // Client provides access to service health data.
 type Client struct {
-	rpcclient.Client
+	NetRPC              NetRPC
+	Cache               CacheGetter
+	ViewStore           MaterializedViewStore
+	MaterializerDeps    MaterializerDeps
+	CacheName           string
+	UseStreamingBackend bool
+	QueryOptionDefaults func(options *structs.QueryOptions)
+}
+
+type NetRPC interface {
+	RPC(ctx context.Context, method string, args interface{}, reply interface{}) error
+}
+
+type CacheGetter interface {
+	Get(ctx context.Context, t string, r cache.Request) (interface{}, cache.ResultMeta, error)
+	NotifyCallback(ctx context.Context, t string, r cache.Request, cID string, cb cache.Callback) error
+}
+
+type MaterializedViewStore interface {
+	Get(ctx context.Context, req submatview.Request) (submatview.Result, error)
+	NotifyCallback(ctx context.Context, req submatview.Request, cID string, cb cache.Callback) error
 }
 
 // IsReadyForStreaming will indicate if the underlying gRPC connection is ready.
@@ -110,11 +126,17 @@ func (c *Client) newServiceRequest(req structs.ServiceSpecificRequest) serviceRe
 	}
 }
 
-var _ submatview.Request = (*serviceRequest)(nil)
+// Close any underlying connections used by the client.
+func (c *Client) Close() error {
+	if c == nil {
+		return nil
+	}
+	return c.MaterializerDeps.Conn.Close()
+}
 
 type serviceRequest struct {
 	structs.ServiceSpecificRequest
-	deps rpcclient.MaterializerDeps
+	deps MaterializerDeps
 }
 
 func (r serviceRequest) CacheInfo() cache.RequestInfo {
diff --git a/agent/rpcclient/health/health_test.go b/agent/rpcclient/health/health_test.go
index 30900bc04cc01..a9cc7a087df1c 100644
--- a/agent/rpcclient/health/health_test.go
+++ b/agent/rpcclient/health/health_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package health
 
 import (
@@ -8,7 +5,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/agent/rpcclient"
 	"github.com/stretchr/testify/require"
 
 	"github.com/hashicorp/consul/agent/cache"
@@ -26,14 +22,12 @@ func TestClient_ServiceNodes_BackendRouting(t *testing.T) {
 
 	run := func(t *testing.T, tc testCase) {
 		c := &Client{
-			Client: rpcclient.Client{
-				NetRPC:              &fakeNetRPC{},
-				Cache:               &fakeCache{},
-				ViewStore:           &fakeViewStore{},
-				CacheName:           "cache-no-streaming",
-				UseStreamingBackend: true,
-				QueryOptionDefaults: config.ApplyDefaultQueryOptions(&config.RuntimeConfig{}),
-			},
+			NetRPC:              &fakeNetRPC{},
+			Cache:               &fakeCache{},
+			ViewStore:           &fakeViewStore{},
+			CacheName:           "cache-no-streaming",
+			UseStreamingBackend: true,
+			QueryOptionDefaults: config.ApplyDefaultQueryOptions(&config.RuntimeConfig{}),
 		}
 
 		_, _, err := c.ServiceNodes(context.Background(), tc.req)
@@ -205,13 +199,11 @@ func TestClient_Notify_BackendRouting(t *testing.T) {
 
 	run := func(t *testing.T, tc testCase) {
 		c := &Client{
-			Client: rpcclient.Client{
-				NetRPC:              &fakeNetRPC{},
-				Cache:               &fakeCache{},
-				ViewStore:           &fakeViewStore{},
-				CacheName:           "cache-no-streaming",
-				UseStreamingBackend: true,
-			},
+			NetRPC:              &fakeNetRPC{},
+			Cache:               &fakeCache{},
+			ViewStore:           &fakeViewStore{},
+			CacheName:           "cache-no-streaming",
+			UseStreamingBackend: true,
 		}
 
 		err := c.Notify(context.Background(), tc.req, "cid", nil)
@@ -258,15 +250,13 @@ func TestClient_Notify_BackendRouting(t *testing.T) {
 func TestClient_ServiceNodes_SetsDefaults(t *testing.T) {
 	store := &fakeViewStore{}
 	c := &Client{
-		Client: rpcclient.Client{
-			ViewStore:           store,
-			CacheName:           "cache-no-streaming",
-			UseStreamingBackend: true,
-			QueryOptionDefaults: config.ApplyDefaultQueryOptions(&config.RuntimeConfig{
-				MaxQueryTime:     200 * time.Second,
-				DefaultQueryTime: 100 * time.Second,
-			}),
-		},
+		ViewStore:           store,
+		CacheName:           "cache-no-streaming",
+		UseStreamingBackend: true,
+		QueryOptionDefaults: config.ApplyDefaultQueryOptions(&config.RuntimeConfig{
+			MaxQueryTime:     200 * time.Second,
+			DefaultQueryTime: 100 * time.Second,
+		}),
 	}
 
 	req := structs.ServiceSpecificRequest{
diff --git a/agent/rpcclient/health/streaming_test.go b/agent/rpcclient/health/streaming_test.go
index 180b61f0eec65..a55fac25b4ebb 100644
--- a/agent/rpcclient/health/streaming_test.go
+++ b/agent/rpcclient/health/streaming_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package health
 
 import (
@@ -8,7 +5,7 @@ import (
 
 	"google.golang.org/grpc"
 
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // streamClient is a mock StreamingClient for testing that allows
diff --git a/agent/rpcclient/health/view.go b/agent/rpcclient/health/view.go
index 8e08ba801e5f1..ce32e801c3359 100644
--- a/agent/rpcclient/health/view.go
+++ b/agent/rpcclient/health/view.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package health
 
 import (
@@ -10,13 +7,20 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/submatview"
-	"github.com/hashicorp/consul/proto/private/pbservice"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
 	"github.com/hashicorp/go-bexpr"
+	"github.com/hashicorp/go-hclog"
+	"google.golang.org/grpc"
+
+	"github.com/hashicorp/consul/agent/structs"
+	"github.com/hashicorp/consul/proto/pbservice"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
+type MaterializerDeps struct {
+	Conn   *grpc.ClientConn
+	Logger hclog.Logger
+}
+
 func NewMaterializerRequest(srvReq structs.ServiceSpecificRequest) func(index uint64) *pbsubscribe.SubscribeRequest {
 	return func(index uint64) *pbsubscribe.SubscribeRequest {
 		req := &pbsubscribe.SubscribeRequest{
@@ -53,8 +57,6 @@ func NewHealthView(req structs.ServiceSpecificRequest) (*HealthView, error) {
 	}, nil
 }
 
-var _ submatview.View = (*HealthView)(nil)
-
 // HealthView implements submatview.View for storing the view state
 // of a service health result. We store it as a map to make updates and
 // deletions a little easier but we could just store a result type
diff --git a/agent/rpcclient/health/view_test.go b/agent/rpcclient/health/view_test.go
index 83eba5ab41a07..982e5dbf3fc7e 100644
--- a/agent/rpcclient/health/view_test.go
+++ b/agent/rpcclient/health/view_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package health
 
 import (
@@ -20,10 +17,10 @@ import (
 
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/submatview"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/proto/private/pbservice"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/pbcommon"
+	"github.com/hashicorp/consul/proto/pbservice"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/types"
 )
@@ -980,12 +977,3 @@ func TestHealthView_SkipFilteringTerminatingGateways(t *testing.T) {
 	require.Equal(t, "127.0.0.1", node.Nodes[0].Service.Address)
 	require.Equal(t, 8443, node.Nodes[0].Service.Port)
 }
-
-func TestConfigEntryListView_Reset(t *testing.T) {
-	emptyMap := make(map[string]structs.CheckServiceNode)
-	view := &HealthView{state: map[string]structs.CheckServiceNode{
-		"test": {},
-	}}
-	view.Reset()
-	require.Equal(t, emptyMap, view.state)
-}
diff --git a/agent/service_checks_test.go b/agent/service_checks_test.go
index 41372cc47dbbe..1e98722192684 100644
--- a/agent/service_checks_test.go
+++ b/agent/service_checks_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/service_manager.go b/agent/service_manager.go
index 355c73eb2c412..784986678d52f 100644
--- a/agent/service_manager.go
+++ b/agent/service_manager.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -148,8 +145,7 @@ func (w *serviceConfigWatch) register(ctx context.Context) error {
 
 	// Merge the local registration with the central defaults and update this service
 	// in the local state.
-	ns := w.registration.Service.WithNormalizedUpstreams()
-	merged, err := configentry.MergeServiceConfig(serviceDefaults, ns)
+	merged, err := configentry.MergeServiceConfig(serviceDefaults, w.registration.Service)
 	if err != nil {
 		return err
 	}
@@ -279,8 +275,7 @@ func (w *serviceConfigWatch) handleUpdate(ctx context.Context, event cache.Updat
 
 	// Merge the local registration with the central defaults and update this service
 	// in the local state.
-	ns := w.registration.Service.WithNormalizedUpstreams()
-	merged, err := configentry.MergeServiceConfig(serviceDefaults, ns)
+	merged, err := configentry.MergeServiceConfig(serviceDefaults, w.registration.Service)
 	if err != nil {
 		return err
 	}
diff --git a/agent/service_manager_test.go b/agent/service_manager_test.go
index 289503a51ede4..097513ea72493 100644
--- a/agent/service_manager_test.go
+++ b/agent/service_manager_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -829,6 +826,9 @@ func fixPersistedServiceConfigForTest(content []byte) ([]byte, error) {
 		return nil, err
 	}
 	// Sort the output, since it's randomized and causes flaky tests otherwise.
+	sort.Slice(parsed.Defaults.UpstreamIDConfigs, func(i, j int) bool {
+		return parsed.Defaults.UpstreamIDConfigs[i].Upstream.ID < parsed.Defaults.UpstreamIDConfigs[j].Upstream.ID
+	})
 	sort.Slice(parsed.Defaults.UpstreamConfigs, func(i, j int) bool {
 		return parsed.Defaults.UpstreamConfigs[i].Upstream.String() < parsed.Defaults.UpstreamConfigs[j].Upstream.String()
 	})
diff --git a/agent/session_endpoint.go b/agent/session_endpoint.go
index 90c3fa32bae7e..2f10b149b2b14 100644
--- a/agent/session_endpoint.go
+++ b/agent/session_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/session_endpoint_test.go b/agent/session_endpoint_test.go
index ae5a492808d7c..a1b011f25f53b 100644
--- a/agent/session_endpoint_test.go
+++ b/agent/session_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/setup.go b/agent/setup.go
index 70770cb7cdf3f..43ed8c74bf218 100644
--- a/agent/setup.go
+++ b/agent/setup.go
@@ -1,11 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"io"
 	"net"
@@ -34,7 +30,6 @@ import (
 	"github.com/hashicorp/consul/agent/grpc-internal/resolver"
 	grpcWare "github.com/hashicorp/consul/agent/grpc-middleware"
 	"github.com/hashicorp/consul/agent/hcp"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/local"
 	"github.com/hashicorp/consul/agent/pool"
 	"github.com/hashicorp/consul/agent/router"
@@ -55,45 +50,17 @@ import (
 type BaseDeps struct {
 	consul.Deps // TODO: un-embed
 
-	RuntimeConfig   *config.RuntimeConfig
-	MetricsConfig   *lib.MetricsConfig
-	AutoConfig      *autoconf.AutoConfig // TODO: use an interface
-	Cache           *cache.Cache
-	LeafCertManager *leafcert.Manager
-	ViewStore       *submatview.Store
-	WatchedFiles    []string
-	NetRPC          *LazyNetRPC
+	RuntimeConfig *config.RuntimeConfig
+	MetricsConfig *lib.MetricsConfig
+	AutoConfig    *autoconf.AutoConfig // TODO: use an interface
+	Cache         *cache.Cache
+	ViewStore     *submatview.Store
+	WatchedFiles  []string
 
 	deregisterBalancer, deregisterResolver func()
 	stopHostCollector                      context.CancelFunc
 }
 
-type NetRPC interface {
-	RPC(ctx context.Context, method string, args any, reply any) error
-}
-
-type LazyNetRPC struct {
-	mu  sync.RWMutex
-	rpc NetRPC
-}
-
-func (r *LazyNetRPC) SetNetRPC(rpc NetRPC) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	r.rpc = rpc
-}
-
-func (r *LazyNetRPC) RPC(ctx context.Context, method string, args any, reply any) error {
-	r.mu.RLock()
-	r2 := r.rpc
-	r.mu.RUnlock()
-
-	if r2 == nil {
-		return errors.New("rpc: initialization ordering error; net-rpc not ready yet")
-	}
-	return r2.RPC(ctx, method, args, reply)
-}
-
 type ConfigLoader func(source config.Source) (config.LoadResult, error)
 
 func NewBaseDeps(configLoader ConfigLoader, logOut io.Writer, providedLogger hclog.InterceptLogger) (BaseDeps, error) {
@@ -103,7 +70,6 @@ func NewBaseDeps(configLoader ConfigLoader, logOut io.Writer, providedLogger hcl
 		return d, err
 	}
 	d.WatchedFiles = result.WatchedFiles
-	d.Experiments = result.RuntimeConfig.Experiments
 	cfg := result.RuntimeConfig
 	logConf := cfg.Logging
 	logConf.Name = logging.Agent
@@ -174,20 +140,6 @@ func NewBaseDeps(configLoader ConfigLoader, logOut io.Writer, providedLogger hcl
 	d.ViewStore = submatview.NewStore(d.Logger.Named("viewstore"))
 	d.ConnPool = newConnPool(cfg, d.Logger, d.TLSConfigurator)
 
-	d.NetRPC = &LazyNetRPC{}
-
-	// TODO: create leafCertManager in BaseDeps once NetRPC is available without Agent
-	d.LeafCertManager = leafcert.NewManager(leafcert.Deps{
-		Logger:      d.Logger.Named("leaf-certs"),
-		CertSigner:  leafcert.NewNetRPCCertSigner(d.NetRPC),
-		RootsReader: leafcert.NewCachedRootsReader(d.Cache, cfg.Datacenter),
-		Config: leafcert.Config{
-			TestOverrideCAChangeInitialDelay: cfg.ConnectTestCALeafRootChangeSpread,
-		},
-	})
-	// Set the leaf cert manager in the embedded deps type so it can be used by consul servers.
-	d.Deps.LeafCertManager = d.LeafCertManager
-
 	agentType := "client"
 	if cfg.ServerMode {
 		agentType = "server"
@@ -245,7 +197,6 @@ func NewBaseDeps(configLoader ConfigLoader, logOut io.Writer, providedLogger hcl
 		ServerProvider:   d.Router,
 		TLSConfigurator:  d.TLSConfigurator,
 		Cache:            d.Cache,
-		LeafCertManager:  d.LeafCertManager,
 		Tokens:           d.Tokens,
 		EnterpriseConfig: initEnterpriseAutoConfig(d.EnterpriseDeps, cfg),
 	}
@@ -262,8 +213,6 @@ func NewBaseDeps(configLoader ConfigLoader, logOut io.Writer, providedLogger hcl
 
 	d.XDSStreamLimiter = limiter.NewSessionLimiter()
 
-	d.Registry = consul.NewTypeRegistry()
-
 	return d, nil
 }
 
@@ -271,7 +220,6 @@ func NewBaseDeps(configLoader ConfigLoader, logOut io.Writer, providedLogger hcl
 // handled by something else (e.g. the agent stop channel).
 func (bd BaseDeps) Close() {
 	bd.AutoConfig.Stop()
-	bd.LeafCertManager.Stop()
 	bd.MetricsConfig.Cancel()
 
 	for _, fn := range []func(){bd.deregisterBalancer, bd.deregisterResolver, bd.stopHostCollector} {
@@ -381,9 +329,7 @@ func getPrometheusDefs(cfg *config.RuntimeConfig, isServer bool) ([]prometheus.G
 		gauges = append(gauges, verifierGauges)
 	}
 
-	if isServer &&
-		(cfg.RaftLogStoreConfig.Backend == consul.LogStoreBackendWAL ||
-			cfg.RaftLogStoreConfig.Backend == consul.LogStoreBackendDefault) {
+	if isServer && cfg.RaftLogStoreConfig.Backend == consul.LogStoreBackendWAL {
 
 		walGauges := make([]prometheus.GaugeDefinition, 0)
 		for _, d := range wal.MetricDefinitions.Gauges {
@@ -454,9 +400,7 @@ func getPrometheusDefs(cfg *config.RuntimeConfig, isServer bool) ([]prometheus.G
 		}
 		counters = append(counters, verifierCounters)
 	}
-	if isServer &&
-		(cfg.RaftLogStoreConfig.Backend == consul.LogStoreBackendWAL ||
-			cfg.RaftLogStoreConfig.Backend == consul.LogStoreBackendDefault) {
+	if isServer && cfg.RaftLogStoreConfig.Backend == consul.LogStoreBackendWAL {
 		walCounters := make([]prometheus.CounterDefinition, 0)
 		for _, d := range wal.MetricDefinitions.Counters {
 			walCounters = append(walCounters, prometheus.CounterDefinition{
diff --git a/agent/setup_ce.go b/agent/setup_ce.go
index 1269e5282c021..9fd22210e287a 100644
--- a/agent/setup_ce.go
+++ b/agent/setup_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
diff --git a/agent/sidecar_service.go b/agent/sidecar_service.go
index 8e57d5930bc11..6cd6d294e532e 100644
--- a/agent/sidecar_service.go
+++ b/agent/sidecar_service.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -81,12 +78,6 @@ func sidecarServiceFromNodeService(ns *structs.NodeService, token string) (*stru
 		sidecar.Tags = append(sidecar.Tags, ns.Tags...)
 	}
 
-	// Copy the locality from the original service if locality was not provided
-	if sidecar.Locality == nil && ns.Locality != nil {
-		tmp := *ns.Locality
-		sidecar.Locality = &tmp
-	}
-
 	// Flag this as a sidecar - this is not persisted in catalog but only needed
 	// in local agent state to disambiguate lineage when deregistering the parent
 	// service later.
diff --git a/agent/sidecar_service_test.go b/agent/sidecar_service_test.go
index fd39a5a284a10..37854298e62e2 100644
--- a/agent/sidecar_service_test.go
+++ b/agent/sidecar_service_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -134,78 +131,25 @@ func TestAgent_sidecarServiceFromNodeService(t *testing.T) {
 			wantToken: "custom-token",
 		},
 		{
-			name: "inherit locality, tags and meta",
+			name: "inherit tags and meta",
 			sd: &structs.ServiceDefinition{
 				ID:   "web1",
 				Name: "web",
 				Port: 1111,
 				Tags: []string{"foo"},
 				Meta: map[string]string{"foo": "bar"},
-				Locality: &structs.Locality{
-					Region: "us-east-1",
-					Zone:   "us-east-1a",
-				},
 				Connect: &structs.ServiceConnect{
 					SidecarService: &structs.ServiceDefinition{},
 				},
 			},
 			wantNS: &structs.NodeService{
-				EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
-				Kind:           structs.ServiceKindConnectProxy,
-				ID:             "web1-sidecar-proxy",
-				Service:        "web-sidecar-proxy",
-				Port:           0,
-				Tags:           []string{"foo"},
-				Meta:           map[string]string{"foo": "bar"},
-				Locality: &structs.Locality{
-					Region: "us-east-1",
-					Zone:   "us-east-1a",
-				},
-				LocallyRegisteredAsSidecar: true,
-				Proxy: structs.ConnectProxyConfig{
-					DestinationServiceName: "web",
-					DestinationServiceID:   "web1",
-					LocalServiceAddress:    "127.0.0.1",
-					LocalServicePort:       1111,
-				},
-			},
-			wantChecks: nil,
-		},
-		{
-			name: "retain locality, tags and meta if explicitly configured",
-			sd: &structs.ServiceDefinition{
-				ID:   "web1",
-				Name: "web",
-				Port: 1111,
-				Tags: []string{"foo"},
-				Meta: map[string]string{"foo": "bar"},
-				Locality: &structs.Locality{
-					Region: "us-east-1",
-					Zone:   "us-east-1a",
-				},
-				Connect: &structs.ServiceConnect{
-					SidecarService: &structs.ServiceDefinition{
-						Tags: []string{"bar"},
-						Meta: map[string]string{"baz": "qux"},
-						Locality: &structs.Locality{
-							Region: "us-east-2",
-							Zone:   "us-east-2a",
-						},
-					},
-				},
-			},
-			wantNS: &structs.NodeService{
-				EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
-				Kind:           structs.ServiceKindConnectProxy,
-				ID:             "web1-sidecar-proxy",
-				Service:        "web-sidecar-proxy",
-				Port:           0,
-				Tags:           []string{"bar"},
-				Meta:           map[string]string{"baz": "qux"},
-				Locality: &structs.Locality{
-					Region: "us-east-2",
-					Zone:   "us-east-2a",
-				},
+				EnterpriseMeta:             *structs.DefaultEnterpriseMetaInDefaultPartition(),
+				Kind:                       structs.ServiceKindConnectProxy,
+				ID:                         "web1-sidecar-proxy",
+				Service:                    "web-sidecar-proxy",
+				Port:                       0,
+				Tags:                       []string{"foo"},
+				Meta:                       map[string]string{"foo": "bar"},
 				LocallyRegisteredAsSidecar: true,
 				Proxy: structs.ConnectProxyConfig{
 					DestinationServiceName: "web",
diff --git a/agent/signal_unix.go b/agent/signal_unix.go
index 173a82b96bd09..a41e16a678dc8 100644
--- a/agent/signal_unix.go
+++ b/agent/signal_unix.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !windows
+// +build !windows
 
 package agent
 
diff --git a/agent/signal_windows.go b/agent/signal_windows.go
index dc6d3cc5461a9..ba3d0fde98198 100644
--- a/agent/signal_windows.go
+++ b/agent/signal_windows.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build windows
+// +build windows
 
 package agent
 
diff --git a/agent/snapshot_endpoint.go b/agent/snapshot_endpoint.go
index 06805ae5f8c19..574b1683a7601 100644
--- a/agent/snapshot_endpoint.go
+++ b/agent/snapshot_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/snapshot_endpoint_test.go b/agent/snapshot_endpoint_test.go
index a534fe0251135..968aa8fe74cdd 100644
--- a/agent/snapshot_endpoint_test.go
+++ b/agent/snapshot_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/status_endpoint.go b/agent/status_endpoint.go
index 4a40ec8910270..0fbd26837b8a4 100644
--- a/agent/status_endpoint.go
+++ b/agent/status_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/status_endpoint_test.go b/agent/status_endpoint_test.go
index db231fbc9b834..93768618c3225 100644
--- a/agent/status_endpoint_test.go
+++ b/agent/status_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/streaming_test.go b/agent/streaming_test.go
index fed1e8126d41d..8af5edc7db67a 100644
--- a/agent/streaming_test.go
+++ b/agent/streaming_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/structs/acl.go b/agent/structs/acl.go
index 4d76dffa4e8e0..80f1c8e29eb98 100644
--- a/agent/structs/acl.go
+++ b/agent/structs/acl.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -9,11 +6,11 @@ import (
 	"errors"
 	"fmt"
 	"hash"
+	"hash/fnv"
 	"sort"
 	"strings"
 	"time"
 
-	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/lib/stringslice"
 
 	"golang.org/x/crypto/blake2b"
@@ -63,10 +60,6 @@ agent_prefix "" {
 event_prefix "" {
 	policy = "%[1]s"
 }
-identity_prefix "" {
-	policy = "%[1]s"
-	intentions = "%[1]s"
-}
 key_prefix "" {
 	policy = "%[1]s"
 }
@@ -130,7 +123,6 @@ type ACLIdentity interface {
 	RoleIDs() []string
 	ServiceIdentityList() []*ACLServiceIdentity
 	NodeIdentityList() []*ACLNodeIdentity
-	TemplatedPolicyList() []*ACLTemplatedPolicy
 	IsExpired(asOf time.Time) bool
 	IsLocal() bool
 	EnterpriseMetadata() *acl.EnterpriseMeta
@@ -182,20 +174,22 @@ func (s *ACLServiceIdentity) EstimateSize() int {
 }
 
 func (s *ACLServiceIdentity) SyntheticPolicy(entMeta *acl.EnterpriseMeta) *ACLPolicy {
-	// use templated policy to generate synthetic policy
-	templatedPolicy := ACLTemplatedPolicy{
-		TemplateID:   ACLTemplatedPolicyServiceID,
-		TemplateName: api.ACLTemplatedPolicyServiceName,
-		Datacenters:  s.Datacenters,
-		TemplateVariables: &ACLTemplatedPolicyVariables{
-			Name: s.ServiceName,
-		},
-	}
-
 	// Given that we validate this string name before persisting, we do not
-	// expect any errors from generating the synthetic policy
-	policy, _ := templatedPolicy.SyntheticPolicy(entMeta)
-
+	// have to escape it before doing the following interpolation.
+	rules := aclServiceIdentityRules(s.ServiceName, entMeta)
+
+	hasher := fnv.New128a()
+	hashID := fmt.Sprintf("%x", hasher.Sum([]byte(rules)))
+
+	policy := &ACLPolicy{}
+	policy.ID = hashID
+	policy.Name = fmt.Sprintf("synthetic-policy-%s", hashID)
+	sn := NewServiceName(s.ServiceName, entMeta)
+	policy.Description = fmt.Sprintf("synthetic policy for service identity %q", sn.String())
+	policy.Rules = rules
+	policy.Datacenters = s.Datacenters
+	policy.EnterpriseMeta.Merge(entMeta)
+	policy.SetHash(true)
 	return policy
 }
 
@@ -252,20 +246,21 @@ func (s *ACLNodeIdentity) EstimateSize() int {
 }
 
 func (s *ACLNodeIdentity) SyntheticPolicy(entMeta *acl.EnterpriseMeta) *ACLPolicy {
-	// use templated policy to generate synthetic policy
-	templatedPolicy := ACLTemplatedPolicy{
-		TemplateID:   ACLTemplatedPolicyNodeID,
-		TemplateName: api.ACLTemplatedPolicyNodeName,
-		Datacenters:  []string{s.Datacenter},
-		TemplateVariables: &ACLTemplatedPolicyVariables{
-			Name: s.NodeName,
-		},
-	}
-
 	// Given that we validate this string name before persisting, we do not
-	// expect any errors from generating the synthetic policy
-	policy, _ := templatedPolicy.SyntheticPolicy(entMeta)
-
+	// have to escape it before doing the following interpolation.
+	rules := aclNodeIdentityRules(s.NodeName, entMeta)
+
+	hasher := fnv.New128a()
+	hashID := fmt.Sprintf("%x", hasher.Sum([]byte(rules)))
+
+	policy := &ACLPolicy{}
+	policy.ID = hashID
+	policy.Name = fmt.Sprintf("synthetic-policy-%s", hashID)
+	policy.Description = fmt.Sprintf("synthetic policy for node identity %q", s.NodeName)
+	policy.Rules = rules
+	policy.Datacenters = []string{s.Datacenter}
+	policy.EnterpriseMeta.Merge(entMeta)
+	policy.SetHash(true)
 	return policy
 }
 
@@ -316,9 +311,6 @@ type ACLToken struct {
 	// The node identities that this token should be allowed to manage.
 	NodeIdentities ACLNodeIdentities `json:",omitempty"`
 
-	// The templated policies to generate synthetic policies for.
-	TemplatedPolicies ACLTemplatedPolicies `json:",omitempty"`
-
 	// Whether this token is DC local. This means that it will not be synced
 	// to the ACL datacenter and replicated to others.
 	Local bool
@@ -399,7 +391,6 @@ func (t *ACLToken) Clone() *ACLToken {
 	t2.Roles = nil
 	t2.ServiceIdentities = nil
 	t2.NodeIdentities = nil
-	t2.TemplatedPolicies = nil
 
 	if len(t.Policies) > 0 {
 		t2.Policies = make([]ACLTokenPolicyLink, len(t.Policies))
@@ -421,12 +412,6 @@ func (t *ACLToken) Clone() *ACLToken {
 			t2.NodeIdentities[i] = n.Clone()
 		}
 	}
-	if len(t.TemplatedPolicies) > 0 {
-		t2.TemplatedPolicies = make([]*ACLTemplatedPolicy, len(t.TemplatedPolicies))
-		for idx, tp := range t.TemplatedPolicies {
-			t2.TemplatedPolicies[idx] = tp.Clone()
-		}
-	}
 
 	return &t2
 }
@@ -535,10 +520,6 @@ func (t *ACLToken) SetHash(force bool) []byte {
 			nodeID.AddToHash(hash)
 		}
 
-		for _, templatedPolicy := range t.TemplatedPolicies {
-			templatedPolicy.AddToHash(hash)
-		}
-
 		t.EnterpriseMeta.AddToHash(hash, false)
 
 		// Finalize the hash
@@ -565,9 +546,6 @@ func (t *ACLToken) EstimateSize() int {
 	for _, nodeID := range t.NodeIdentities {
 		size += nodeID.EstimateSize()
 	}
-	for _, templatedPolicy := range t.TemplatedPolicies {
-		size += templatedPolicy.EstimateSize()
-	}
 	return size + t.EnterpriseMeta.EstimateSize()
 }
 
@@ -582,7 +560,6 @@ type ACLTokenListStub struct {
 	Roles             []ACLTokenRoleLink   `json:",omitempty"`
 	ServiceIdentities ACLServiceIdentities `json:",omitempty"`
 	NodeIdentities    ACLNodeIdentities    `json:",omitempty"`
-	TemplatedPolicies ACLTemplatedPolicies `json:",omitempty"`
 	Local             bool
 	AuthMethod        string     `json:",omitempty"`
 	ExpirationTime    *time.Time `json:",omitempty"`
@@ -605,7 +582,6 @@ func (token *ACLToken) Stub() *ACLTokenListStub {
 		Roles:                       token.Roles,
 		ServiceIdentities:           token.ServiceIdentities,
 		NodeIdentities:              token.NodeIdentities,
-		TemplatedPolicies:           token.TemplatedPolicies,
 		Local:                       token.Local,
 		AuthMethod:                  token.AuthMethod,
 		ExpirationTime:              token.ExpirationTime,
@@ -891,9 +867,6 @@ type ACLRole struct {
 	// List of nodes to generate synthetic policies for.
 	NodeIdentities ACLNodeIdentities `json:",omitempty"`
 
-	// List of templated policies to generate synthethic policies for.
-	TemplatedPolicies ACLTemplatedPolicies `json:",omitempty"`
-
 	// Hash of the contents of the role
 	// This does not take into account the ID (which is immutable)
 	// nor the raft metadata.
@@ -933,7 +906,6 @@ func (r *ACLRole) Clone() *ACLRole {
 	r2.Policies = nil
 	r2.ServiceIdentities = nil
 	r2.NodeIdentities = nil
-	r2.TemplatedPolicies = nil
 
 	if len(r.Policies) > 0 {
 		r2.Policies = make([]ACLRolePolicyLink, len(r.Policies))
@@ -951,12 +923,6 @@ func (r *ACLRole) Clone() *ACLRole {
 			r2.NodeIdentities[i] = n.Clone()
 		}
 	}
-	if len(r.TemplatedPolicies) > 0 {
-		r2.TemplatedPolicies = make([]*ACLTemplatedPolicy, len(r.TemplatedPolicies))
-		for i, n := range r.TemplatedPolicies {
-			r2.TemplatedPolicies[i] = n.Clone()
-		}
-	}
 	return &r2
 }
 
@@ -988,9 +954,6 @@ func (r *ACLRole) SetHash(force bool) []byte {
 		for _, nodeID := range r.NodeIdentities {
 			nodeID.AddToHash(hash)
 		}
-		for _, templatedPolicy := range r.TemplatedPolicies {
-			templatedPolicy.AddToHash(hash)
-		}
 
 		r.EnterpriseMeta.AddToHash(hash, false)
 
@@ -1018,9 +981,6 @@ func (r *ACLRole) EstimateSize() int {
 	for _, nodeID := range r.NodeIdentities {
 		size += nodeID.EstimateSize()
 	}
-	for _, templatedPolicy := range r.TemplatedPolicies {
-		size += templatedPolicy.EstimateSize()
-	}
 
 	return size + r.EnterpriseMeta.EstimateSize()
 }
@@ -1069,21 +1029,6 @@ const (
 	//   }
 	// }
 	BindingRuleBindTypeNode = "node"
-
-	// BindingRuleBindTypeTemplatedPolicy is the binding rule bind type that
-	// assigns a TemplatedPolicy to the token that is created using the value
-	// of the computed BindVars as template variables and BindName as template name like:
-	//
-	// &ACLToken{
-	//   ...other fields...
-	//   TemplatedPolicies: []*ACLTemplatedPolicy{
-	//     &ACLTemplatedPolicy{
-	//       TemplateName: "<BindName>",
-	//       TemplateVariables: &ACLTemplatedPolicyVariables{<computed BindVars>}
-	//     },
-	//   },
-	// }
-	BindingRuleBindTypeTemplatedPolicy = "templated-policy"
 )
 
 type ACLBindingRule struct {
@@ -1103,10 +1048,8 @@ type ACLBindingRule struct {
 	// BindType adjusts how this binding rule is applied at login time.  The
 	// valid values are:
 	//
-	//  - BindingRuleBindTypeService         = "service"
-	//  - BindingRuleBindTypeNode            = "node"
-	//  - BindingRuleBindTypeRole            = "role"
-	//  - BindingRuleBindTypeTemplatedPolicy = "templated-policy"
+	//  - BindingRuleBindTypeService = "service"
+	//  - BindingRuleBindTypeRole    = "role"
 	BindType string
 
 	// BindName is the target of the binding. Can be lightly templated using
@@ -1114,10 +1057,6 @@ type ACLBindingRule struct {
 	// upon the BindType.
 	BindName string
 
-	// BindVars is a the variables used when binding rule type is `templated-policy`. Can be lightly
-	// templated using HIL ${foo} syntax from available field names.
-	BindVars *ACLTemplatedPolicyVariables `json:",omitempty"`
-
 	// Embedded Enterprise ACL metadata
 	acl.EnterpriseMeta `mapstructure:",squash"`
 
@@ -1382,7 +1321,7 @@ type ACLTokenListResponse struct {
 }
 
 // ACLTokenBatchGetRequest is used for reading multiple tokens, this is
-// different from the token list request in that only tokens with the
+// different from the the token list request in that only tokens with the
 // the requested ids are returned
 type ACLTokenBatchGetRequest struct {
 	AccessorIDs []string // List of accessor ids to fetch
@@ -1903,10 +1842,6 @@ func (id *AgentRecoveryTokenIdentity) NodeIdentityList() []*ACLNodeIdentity {
 	return nil
 }
 
-func (id *AgentRecoveryTokenIdentity) TemplatedPolicyList() []*ACLTemplatedPolicy {
-	return nil
-}
-
 func (id *AgentRecoveryTokenIdentity) IsExpired(asOf time.Time) bool {
 	return false
 }
@@ -1955,10 +1890,6 @@ func (i *ACLServerIdentity) NodeIdentityList() []*ACLNodeIdentity {
 	return nil
 }
 
-func (i *ACLServerIdentity) TemplatedPolicyList() []*ACLTemplatedPolicy {
-	return nil
-}
-
 func (i *ACLServerIdentity) IsExpired(asOf time.Time) bool {
 	return false
 }
diff --git a/agent/structs/acl_cache.go b/agent/structs/acl_cache.go
index 15f3a2edc3c26..65e20a1f4fe9b 100644
--- a/agent/structs/acl_cache.go
+++ b/agent/structs/acl_cache.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/acl_cache_test.go b/agent/structs/acl_cache_test.go
index 57e218ff21e32..e0a057d36326e 100644
--- a/agent/structs/acl_cache_test.go
+++ b/agent/structs/acl_cache_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/acl_ce.go b/agent/structs/acl_ce.go
index 166558ae65af8..d47640e2914cf 100644
--- a/agent/structs/acl_ce.go
+++ b/agent/structs/acl_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
diff --git a/agent/structs/acl_templated_policy.go b/agent/structs/acl_templated_policy.go
deleted file mode 100644
index d0da96e4eb4aa..0000000000000
--- a/agent/structs/acl_templated_policy.go
+++ /dev/null
@@ -1,294 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package structs
-
-import (
-	"bytes"
-	_ "embed"
-	"fmt"
-	"hash"
-	"hash/fnv"
-	"html/template"
-
-	"github.com/hashicorp/go-multierror"
-	"github.com/xeipuuv/gojsonschema"
-	"golang.org/x/exp/slices"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/lib/stringslice"
-)
-
-//go:embed acltemplatedpolicy/schemas/node.json
-var ACLTemplatedPolicyNodeSchema string
-
-//go:embed acltemplatedpolicy/schemas/service.json
-var ACLTemplatedPolicyServiceSchema string
-
-//go:embed acltemplatedpolicy/schemas/workload-identity.json
-var ACLTemplatedPolicyWorkloadIdentitySchema string
-
-type ACLTemplatedPolicies []*ACLTemplatedPolicy
-
-const (
-	ACLTemplatedPolicyServiceID          = "00000000-0000-0000-0000-000000000003"
-	ACLTemplatedPolicyNodeID             = "00000000-0000-0000-0000-000000000004"
-	ACLTemplatedPolicyDNSID              = "00000000-0000-0000-0000-000000000005"
-	ACLTemplatedPolicyNomadServerID      = "00000000-0000-0000-0000-000000000006"
-	ACLTemplatedPolicyWorkloadIdentityID = "00000000-0000-0000-0000-000000000007"
-
-	ACLTemplatedPolicyNoRequiredVariablesSchema = "" // catch-all schema for all templated policy that don't require a schema
-)
-
-// ACLTemplatedPolicyBase contains basic information about builtin templated policies
-// template name, id, template code and schema
-type ACLTemplatedPolicyBase struct {
-	TemplateName string
-	TemplateID   string
-	Schema       string
-	Template     string
-}
-
-var (
-	// Note: when adding a new builtin template, ensure you update `command/acl/templatedpolicy/formatter.go`
-	// to handle the new templates required variables and schema.
-	aclTemplatedPoliciesList = map[string]*ACLTemplatedPolicyBase{
-		api.ACLTemplatedPolicyServiceName: {
-			TemplateID:   ACLTemplatedPolicyServiceID,
-			TemplateName: api.ACLTemplatedPolicyServiceName,
-			Schema:       ACLTemplatedPolicyServiceSchema,
-			Template:     ACLTemplatedPolicyService,
-		},
-		api.ACLTemplatedPolicyNodeName: {
-			TemplateID:   ACLTemplatedPolicyNodeID,
-			TemplateName: api.ACLTemplatedPolicyNodeName,
-			Schema:       ACLTemplatedPolicyNodeSchema,
-			Template:     ACLTemplatedPolicyNode,
-		},
-		api.ACLTemplatedPolicyDNSName: {
-			TemplateID:   ACLTemplatedPolicyDNSID,
-			TemplateName: api.ACLTemplatedPolicyDNSName,
-			Schema:       ACLTemplatedPolicyNoRequiredVariablesSchema,
-			Template:     ACLTemplatedPolicyDNS,
-		},
-		api.ACLTemplatedPolicyNomadServerName: {
-			TemplateID:   ACLTemplatedPolicyNomadServerID,
-			TemplateName: api.ACLTemplatedPolicyNomadServerName,
-			Schema:       ACLTemplatedPolicyNoRequiredVariablesSchema,
-			Template:     ACLTemplatedPolicyNomadServer,
-		},
-		api.ACLTemplatedPolicyWorkloadIdentityName: {
-			TemplateID:   ACLTemplatedPolicyWorkloadIdentityID,
-			TemplateName: api.ACLTemplatedPolicyWorkloadIdentityName,
-			Schema:       ACLTemplatedPolicyWorkloadIdentitySchema,
-			Template:     ACLTemplatedPolicyWorkloadIdentity,
-		},
-	}
-)
-
-// ACLTemplatedPolicy represents a template used to generate a `synthetic` policy
-// given some input variables.
-type ACLTemplatedPolicy struct {
-	// TemplateID are hidden from all displays and should not be exposed to the users.
-	TemplateID string `json:",omitempty"`
-
-	// TemplateName is used for display purposes mostly and should not be used for policy rendering.
-	TemplateName string `json:",omitempty"`
-
-	// TemplateVariables are input variables required to render templated policies.
-	TemplateVariables *ACLTemplatedPolicyVariables `json:",omitempty"`
-
-	// Datacenters that the synthetic policy will be valid within.
-	//   - No wildcards allowed
-	//   - If empty then the synthetic policy is valid within all datacenters
-	//
-	// This is kept for legacy reasons to enable us to replace Node/Service Identities by templated policies.
-	//
-	// Only valid for global tokens. It is an error to specify this for local tokens.
-	Datacenters []string `json:",omitempty"`
-}
-
-// ACLTemplatedPolicyVariables are input variables required to render templated policies.
-type ACLTemplatedPolicyVariables struct {
-	Name string `json:"name,omitempty"`
-}
-
-func (tp *ACLTemplatedPolicy) Clone() *ACLTemplatedPolicy {
-	tp2 := *tp
-
-	tp2.TemplateVariables = nil
-	if tp.TemplateVariables != nil {
-		tp2.TemplateVariables = tp.TemplateVariables.Clone()
-	}
-	tp2.Datacenters = stringslice.CloneStringSlice(tp.Datacenters)
-
-	return &tp2
-}
-
-func (tp *ACLTemplatedPolicy) AddToHash(h hash.Hash) {
-	h.Write([]byte(tp.TemplateID))
-	h.Write([]byte(tp.TemplateName))
-
-	if tp.TemplateVariables != nil {
-		tp.TemplateVariables.AddToHash(h)
-	}
-	for _, dc := range tp.Datacenters {
-		h.Write([]byte(dc))
-	}
-}
-
-func (tv *ACLTemplatedPolicyVariables) AddToHash(h hash.Hash) {
-	h.Write([]byte(tv.Name))
-}
-
-func (tv *ACLTemplatedPolicyVariables) Clone() *ACLTemplatedPolicyVariables {
-	tv2 := *tv
-	return &tv2
-}
-
-// validates templated policy variables against schema.
-func (tp *ACLTemplatedPolicy) ValidateTemplatedPolicy(schema string) error {
-	if schema == "" {
-		return nil
-	}
-
-	loader := gojsonschema.NewStringLoader(schema)
-	dataloader := gojsonschema.NewGoLoader(tp.TemplateVariables)
-	res, err := gojsonschema.Validate(loader, dataloader)
-	if err != nil {
-		return fmt.Errorf("failed to load json schema for validation %w", err)
-	}
-
-	if res.Valid() {
-		return nil
-	}
-
-	var merr *multierror.Error
-
-	for _, resultError := range res.Errors() {
-		merr = multierror.Append(merr, fmt.Errorf(resultError.Description()))
-	}
-	return merr.ErrorOrNil()
-}
-
-func (tp *ACLTemplatedPolicy) EstimateSize() int {
-	size := len(tp.TemplateName) + len(tp.TemplateID) + tp.TemplateVariables.EstimateSize()
-	for _, dc := range tp.Datacenters {
-		size += len(dc)
-	}
-
-	return size
-}
-
-func (tv *ACLTemplatedPolicyVariables) EstimateSize() int {
-	return len(tv.Name)
-}
-
-// SyntheticPolicy generates a policy based on templated policies' ID and variables
-//
-// Given that we validate this string name before persisting, we do not
-// have to escape it before doing the following interpolation.
-func (tp *ACLTemplatedPolicy) SyntheticPolicy(entMeta *acl.EnterpriseMeta) (*ACLPolicy, error) {
-	rules, err := tp.aclTemplatedPolicyRules(entMeta)
-	if err != nil {
-		return nil, err
-	}
-	hasher := fnv.New128a()
-	hashID := fmt.Sprintf("%x", hasher.Sum([]byte(rules)))
-
-	policy := &ACLPolicy{
-		Rules:       rules,
-		ID:          hashID,
-		Name:        fmt.Sprintf("synthetic-policy-%s", hashID),
-		Datacenters: tp.Datacenters,
-		Description: fmt.Sprintf("synthetic policy generated from templated policy: %s", tp.TemplateName),
-	}
-	policy.EnterpriseMeta.Merge(entMeta)
-	policy.SetHash(true)
-
-	return policy, nil
-}
-
-func (tp *ACLTemplatedPolicy) aclTemplatedPolicyRules(entMeta *acl.EnterpriseMeta) (string, error) {
-	if entMeta == nil {
-		entMeta = DefaultEnterpriseMetaInDefaultPartition()
-	}
-	entMeta.Normalize()
-
-	tpl := template.New(tp.TemplateName)
-	tmplCode, ok := aclTemplatedPoliciesList[tp.TemplateName]
-	if !ok {
-		return "", fmt.Errorf("acl templated policy does not exist: %s", tp.TemplateName)
-	}
-
-	parsedTpl, err := tpl.Parse(tmplCode.Template)
-	if err != nil {
-		return "", fmt.Errorf("an error occured when parsing template structs: %w", err)
-	}
-	var buf bytes.Buffer
-	err = parsedTpl.Execute(&buf, struct {
-		*ACLTemplatedPolicyVariables
-		Namespace string
-		Partition string
-	}{
-		Namespace:                   entMeta.NamespaceOrDefault(),
-		Partition:                   entMeta.PartitionOrDefault(),
-		ACLTemplatedPolicyVariables: tp.TemplateVariables,
-	})
-	if err != nil {
-		return "", fmt.Errorf("an error occured when executing on templated policy variables: %w", err)
-	}
-
-	return buf.String(), nil
-}
-
-// Deduplicate returns a new list of templated policies without duplicates.
-// compares values of template variables to ensure no duplicates
-func (tps ACLTemplatedPolicies) Deduplicate() ACLTemplatedPolicies {
-	list := make(map[string][]ACLTemplatedPolicyVariables)
-	var out ACLTemplatedPolicies
-
-	for _, tp := range tps {
-		// checks if template name already in the unique list
-		_, found := list[tp.TemplateName]
-		if !found {
-			list[tp.TemplateName] = make([]ACLTemplatedPolicyVariables, 0)
-		}
-		templateSchema := aclTemplatedPoliciesList[tp.TemplateName].Schema
-
-		// if schema is empty, template does not require variables
-		if templateSchema == "" {
-			if !found {
-				out = append(out, tp)
-			}
-			continue
-		}
-
-		if !slices.Contains(list[tp.TemplateName], *tp.TemplateVariables) {
-			list[tp.TemplateName] = append(list[tp.TemplateName], *tp.TemplateVariables)
-			out = append(out, tp)
-		}
-	}
-
-	return out
-}
-
-func GetACLTemplatedPolicyBase(templateName string) (*ACLTemplatedPolicyBase, bool) {
-	if orig, found := aclTemplatedPoliciesList[templateName]; found {
-		copy := *orig
-		return &copy, found
-	}
-
-	return nil, false
-}
-
-// GetACLTemplatedPolicyList returns a copy of the list of templated policies
-func GetACLTemplatedPolicyList() map[string]*ACLTemplatedPolicyBase {
-	m := make(map[string]*ACLTemplatedPolicyBase, len(aclTemplatedPoliciesList))
-	for k, v := range aclTemplatedPoliciesList {
-		m[k] = v
-	}
-
-	return m
-}
diff --git a/agent/structs/acl_templated_policy_ce.go b/agent/structs/acl_templated_policy_ce.go
deleted file mode 100644
index cd9a52248a987..0000000000000
--- a/agent/structs/acl_templated_policy_ce.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package structs
-
-import _ "embed"
-
-//go:embed acltemplatedpolicy/policies/ce/service.hcl
-var ACLTemplatedPolicyService string
-
-//go:embed acltemplatedpolicy/policies/ce/node.hcl
-var ACLTemplatedPolicyNode string
-
-//go:embed acltemplatedpolicy/policies/ce/dns.hcl
-var ACLTemplatedPolicyDNS string
-
-//go:embed acltemplatedpolicy/policies/ce/nomad-server.hcl
-var ACLTemplatedPolicyNomadServer string
-
-//go:embed acltemplatedpolicy/policies/ce/workload-identity.hcl
-var ACLTemplatedPolicyWorkloadIdentity string
-
-func (t *ACLToken) TemplatedPolicyList() []*ACLTemplatedPolicy {
-	if len(t.TemplatedPolicies) == 0 {
-		return nil
-	}
-
-	out := make([]*ACLTemplatedPolicy, 0, len(t.TemplatedPolicies))
-	for _, n := range t.TemplatedPolicies {
-		out = append(out, n.Clone())
-	}
-	return out
-}
-
-func (t *ACLRole) TemplatedPolicyList() []*ACLTemplatedPolicy {
-	if len(t.TemplatedPolicies) == 0 {
-		return nil
-	}
-
-	out := make([]*ACLTemplatedPolicy, 0, len(t.TemplatedPolicies))
-	for _, n := range t.TemplatedPolicies {
-		out = append(out, n.Clone())
-	}
-	return out
-}
diff --git a/agent/structs/acl_templated_policy_ce_test.go b/agent/structs/acl_templated_policy_ce_test.go
deleted file mode 100644
index e160a911cb89a..0000000000000
--- a/agent/structs/acl_templated_policy_ce_test.go
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package structs
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/api"
-)
-
-func TestStructs_ACLTemplatedPolicy_SyntheticPolicy(t *testing.T) {
-	type testCase struct {
-		templatedPolicy *ACLTemplatedPolicy
-		expectedPolicy  *ACLPolicy
-	}
-
-	testCases := map[string]testCase{
-		"service-identity-template": {
-			templatedPolicy: &ACLTemplatedPolicy{
-				TemplateID:   ACLTemplatedPolicyServiceID,
-				TemplateName: api.ACLTemplatedPolicyServiceName,
-				TemplateVariables: &ACLTemplatedPolicyVariables{
-					Name: "api",
-				},
-			},
-			expectedPolicy: &ACLPolicy{
-				Description: "synthetic policy generated from templated policy: builtin/service",
-				Rules: `
-service "api" {
-	policy = "write"
-}
-service "api-sidecar-proxy" {
-	policy = "write"
-}
-service_prefix "" {
-	policy = "read"
-}
-node_prefix "" {
-	policy = "read"
-}`,
-			},
-		},
-		"node-identity-template": {
-			templatedPolicy: &ACLTemplatedPolicy{
-				TemplateID:   ACLTemplatedPolicyNodeID,
-				TemplateName: api.ACLTemplatedPolicyNodeName,
-				TemplateVariables: &ACLTemplatedPolicyVariables{
-					Name: "web",
-				},
-			},
-			expectedPolicy: &ACLPolicy{
-				Description: "synthetic policy generated from templated policy: builtin/node",
-				Rules: `
-node "web" {
-	policy = "write"
-}
-service_prefix "" {
-	policy = "read"
-}`,
-			},
-		},
-		"dns-template": {
-			templatedPolicy: &ACLTemplatedPolicy{
-				TemplateID:   ACLTemplatedPolicyDNSID,
-				TemplateName: api.ACLTemplatedPolicyDNSName,
-			},
-			expectedPolicy: &ACLPolicy{
-				Description: "synthetic policy generated from templated policy: builtin/dns",
-				Rules: `
-node_prefix "" {
-	policy = "read"
-}
-service_prefix "" {
-	policy = "read"
-}
-query_prefix "" {
-	policy = "read"
-}`,
-			},
-		},
-		"workload-identity-template": {
-			templatedPolicy: &ACLTemplatedPolicy{
-				TemplateID:   ACLTemplatedPolicyWorkloadIdentityID,
-				TemplateName: api.ACLTemplatedPolicyWorkloadIdentityName,
-				TemplateVariables: &ACLTemplatedPolicyVariables{
-					Name: "api",
-				},
-			},
-			expectedPolicy: &ACLPolicy{
-				Description: "synthetic policy generated from templated policy: builtin/workload-identity",
-				Rules: `identity "api" {
-	policy = "write"
-}`,
-			},
-		},
-	}
-
-	for name, tcase := range testCases {
-		t.Run(name, func(t *testing.T) {
-			policy, err := tcase.templatedPolicy.SyntheticPolicy(nil)
-
-			require.NoError(t, err)
-			require.Equal(t, tcase.expectedPolicy.Description, policy.Description)
-			require.Equal(t, tcase.expectedPolicy.Rules, policy.Rules)
-			require.Contains(t, policy.Name, "synthetic-policy-")
-			require.NotEmpty(t, policy.Hash)
-			require.NotEmpty(t, policy.ID)
-		})
-	}
-}
diff --git a/agent/structs/acl_templated_policy_test.go b/agent/structs/acl_templated_policy_test.go
deleted file mode 100644
index 5d907ca010bfd..0000000000000
--- a/agent/structs/acl_templated_policy_test.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package structs
-
-import (
-	"testing"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/stretchr/testify/require"
-)
-
-func TestDeduplicate(t *testing.T) {
-	type testCase struct {
-		templatedPolicies ACLTemplatedPolicies
-		expectedCount     int
-	}
-	tcases := map[string]testCase{
-		"multiple-of-the-same-template": {
-			templatedPolicies: ACLTemplatedPolicies{
-				&ACLTemplatedPolicy{
-					TemplateName: api.ACLTemplatedPolicyServiceName,
-					TemplateVariables: &ACLTemplatedPolicyVariables{
-						Name: "api",
-					},
-				},
-				&ACLTemplatedPolicy{
-					TemplateName: api.ACLTemplatedPolicyServiceName,
-					TemplateVariables: &ACLTemplatedPolicyVariables{
-						Name: "api",
-					},
-				},
-			},
-			expectedCount: 1,
-		},
-		"separate-templates-with-matching-variables": {
-			templatedPolicies: ACLTemplatedPolicies{
-				&ACLTemplatedPolicy{
-					TemplateName: api.ACLTemplatedPolicyNodeName,
-					TemplateVariables: &ACLTemplatedPolicyVariables{
-						Name: "api",
-					},
-				},
-				&ACLTemplatedPolicy{
-					TemplateName: api.ACLTemplatedPolicyServiceName,
-					TemplateVariables: &ACLTemplatedPolicyVariables{
-						Name: "api",
-					},
-				},
-			},
-			expectedCount: 2,
-		},
-		"separate-templates-with-multiple-matching-variables": {
-			templatedPolicies: ACLTemplatedPolicies{
-				&ACLTemplatedPolicy{
-					TemplateName: api.ACLTemplatedPolicyServiceName,
-					TemplateVariables: &ACLTemplatedPolicyVariables{
-						Name: "api",
-					},
-				},
-				&ACLTemplatedPolicy{
-					TemplateName: api.ACLTemplatedPolicyNodeName,
-					TemplateVariables: &ACLTemplatedPolicyVariables{
-						Name: "api",
-					},
-				},
-				&ACLTemplatedPolicy{
-					TemplateName: api.ACLTemplatedPolicyNodeName,
-					TemplateVariables: &ACLTemplatedPolicyVariables{
-						Name: "web",
-					},
-				},
-				&ACLTemplatedPolicy{
-					TemplateName: api.ACLTemplatedPolicyServiceName,
-					TemplateVariables: &ACLTemplatedPolicyVariables{
-						Name: "api",
-					},
-				},
-				&ACLTemplatedPolicy{
-					TemplateName: api.ACLTemplatedPolicyDNSName,
-				},
-				&ACLTemplatedPolicy{
-					TemplateName: api.ACLTemplatedPolicyServiceName,
-					TemplateVariables: &ACLTemplatedPolicyVariables{
-						Name: "web",
-					},
-				},
-				&ACLTemplatedPolicy{
-					TemplateName: api.ACLTemplatedPolicyDNSName,
-				},
-			},
-			expectedCount: 5,
-		},
-	}
-
-	for name, tcase := range tcases {
-		t.Run(name, func(t *testing.T) {
-			policies := tcase.templatedPolicies.Deduplicate()
-
-			require.Equal(t, tcase.expectedCount, len(policies))
-		})
-	}
-}
diff --git a/agent/structs/acl_test.go b/agent/structs/acl_test.go
index e1fb35263b95a..d5b083ec5e615 100644
--- a/agent/structs/acl_test.go
+++ b/agent/structs/acl_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/aclfilter/filter.go b/agent/structs/aclfilter/filter.go
index d59bf3c9c403b..a6c5301d1aa7b 100644
--- a/agent/structs/aclfilter/filter.go
+++ b/agent/structs/aclfilter/filter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package aclfilter
 
 import (
@@ -63,9 +60,6 @@ func (f *Filter) Filter(subject any) {
 	case *structs.IndexedIntentions:
 		v.QueryMeta.ResultsFilteredByACLs = f.filterIntentions(&v.Intentions)
 
-	case *structs.IntentionQueryMatch:
-		f.filterIntentionMatch(v)
-
 	case *structs.IndexedNodeDump:
 		if f.filterNodeDump(&v.Dump) {
 			v.QueryMeta.ResultsFilteredByACLs = true
@@ -258,10 +252,7 @@ func (f *Filter) filterServiceNodes(nodes *structs.ServiceNodes) bool {
 			continue
 		}
 		removed = true
-		node.CompoundServiceID()
-		f.logger.Debug("dropping service node from result due to ACLs",
-			"node", structs.NodeNameString(node.Node, &node.EnterpriseMeta),
-			"service", node.CompoundServiceID())
+		f.logger.Debug("dropping node from result due to ACLs", "node", structs.NodeNameString(node.Node, &node.EnterpriseMeta))
 		sn = append(sn[:i], sn[i+1:]...)
 		i--
 	}
@@ -343,9 +334,7 @@ func (f *Filter) filterCheckServiceNodes(nodes *structs.CheckServiceNodes) bool
 		if node.CanRead(f.authorizer) == acl.Allow {
 			continue
 		}
-		f.logger.Debug("dropping check service node from result due to ACLs",
-			"node", structs.NodeNameString(node.Node.Node, node.Node.GetEnterpriseMeta()),
-			"service", node.Service.CompoundServiceID())
+		f.logger.Debug("dropping node from result due to ACLs", "node", structs.NodeNameString(node.Node.Node, node.Node.GetEnterpriseMeta()))
 		removed = true
 		csn = append(csn[:i], csn[i+1:]...)
 		i--
@@ -448,26 +437,6 @@ func (f *Filter) filterIntentions(ixns *structs.Intentions) bool {
 	return removed
 }
 
-// filterIntentionMatch filters IntentionQueryMatch to only exclude all
-// matches when the user doesn't have access to any match.
-func (f *Filter) filterIntentionMatch(args *structs.IntentionQueryMatch) {
-	var authzContext acl.AuthorizerContext
-	authz := f.authorizer.ToAllowAuthorizer()
-	for _, entry := range args.Entries {
-		entry.FillAuthzContext(&authzContext)
-		if prefix := entry.Name; prefix != "" {
-			if err := authz.IntentionReadAllowed(prefix, &authzContext); err != nil {
-				accessorID := authz.AccessorID
-				f.logger.Warn("Operation on intention prefix denied due to ACLs",
-					"prefix", prefix,
-					"accessorID", acl.AliasIfAnonymousToken(accessorID))
-				args.Entries = nil
-				return
-			}
-		}
-	}
-}
-
 // filterNodeDump is used to filter through all parts of a node dump and
 // remove elements the provided ACL token cannot access. Returns true if
 // any elements were removed.
diff --git a/agent/structs/aclfilter/filter_test.go b/agent/structs/aclfilter/filter_test.go
index 98f3bb63f291b..4666b52a33d78 100644
--- a/agent/structs/aclfilter/filter_test.go
+++ b/agent/structs/aclfilter/filter_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package aclfilter
 
 import (
diff --git a/agent/structs/acltemplatedpolicy/policies/ce/dns.hcl b/agent/structs/acltemplatedpolicy/policies/ce/dns.hcl
deleted file mode 100644
index 6627f1c96a5ff..0000000000000
--- a/agent/structs/acltemplatedpolicy/policies/ce/dns.hcl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-node_prefix "" {
-	policy = "read"
-}
-service_prefix "" {
-	policy = "read"
-}
-query_prefix "" {
-	policy = "read"
-}
\ No newline at end of file
diff --git a/agent/structs/acltemplatedpolicy/policies/ce/node.hcl b/agent/structs/acltemplatedpolicy/policies/ce/node.hcl
deleted file mode 100644
index b6b03a2250f02..0000000000000
--- a/agent/structs/acltemplatedpolicy/policies/ce/node.hcl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-node "{{.Name}}" {
-	policy = "write"
-}
-service_prefix "" {
-	policy = "read"
-}
\ No newline at end of file
diff --git a/agent/structs/acltemplatedpolicy/policies/ce/nomad-server.hcl b/agent/structs/acltemplatedpolicy/policies/ce/nomad-server.hcl
deleted file mode 100644
index 7030ff771a199..0000000000000
--- a/agent/structs/acltemplatedpolicy/policies/ce/nomad-server.hcl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-acl = "write"
-agent_prefix "" {
-  policy = "read"
-}
-node_prefix "" {
-  policy = "read"
-}
-service_prefix "" {
-  policy = "write"
-}
\ No newline at end of file
diff --git a/agent/structs/acltemplatedpolicy/policies/ce/service.hcl b/agent/structs/acltemplatedpolicy/policies/ce/service.hcl
deleted file mode 100644
index a8d2faf2791d1..0000000000000
--- a/agent/structs/acltemplatedpolicy/policies/ce/service.hcl
+++ /dev/null
@@ -1,13 +0,0 @@
-
-service "{{.Name}}" {
-	policy = "write"
-}
-service "{{.Name}}-sidecar-proxy" {
-	policy = "write"
-}
-service_prefix "" {
-	policy = "read"
-}
-node_prefix "" {
-	policy = "read"
-}
\ No newline at end of file
diff --git a/agent/structs/acltemplatedpolicy/policies/ce/workload-identity.hcl b/agent/structs/acltemplatedpolicy/policies/ce/workload-identity.hcl
deleted file mode 100644
index ccd1e0564633d..0000000000000
--- a/agent/structs/acltemplatedpolicy/policies/ce/workload-identity.hcl
+++ /dev/null
@@ -1,3 +0,0 @@
-identity "{{.Name}}" {
-	policy = "write"
-}
\ No newline at end of file
diff --git a/agent/structs/acltemplatedpolicy/schemas/node.json b/agent/structs/acltemplatedpolicy/schemas/node.json
deleted file mode 100644
index 8a3d193268217..0000000000000
--- a/agent/structs/acltemplatedpolicy/schemas/node.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"type": "object",
-	"properties": {
-		"name": { "type": "string", "$ref": "#/definitions/min-length-one" }
-	},
-	"required": ["name"],
-	"definitions": {
-		"min-length-one": {
-				"type": "string",
-				"minLength": 1
-		}
-	}
-}
\ No newline at end of file
diff --git a/agent/structs/acltemplatedpolicy/schemas/service.json b/agent/structs/acltemplatedpolicy/schemas/service.json
deleted file mode 100644
index 8a3d193268217..0000000000000
--- a/agent/structs/acltemplatedpolicy/schemas/service.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"type": "object",
-	"properties": {
-		"name": { "type": "string", "$ref": "#/definitions/min-length-one" }
-	},
-	"required": ["name"],
-	"definitions": {
-		"min-length-one": {
-				"type": "string",
-				"minLength": 1
-		}
-	}
-}
\ No newline at end of file
diff --git a/agent/structs/acltemplatedpolicy/schemas/workload-identity.json b/agent/structs/acltemplatedpolicy/schemas/workload-identity.json
deleted file mode 100644
index 31064f36af7f0..0000000000000
--- a/agent/structs/acltemplatedpolicy/schemas/workload-identity.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "type": "object",
-  "properties": {
-    "name": { "type": "string", "$ref": "#/definitions/min-length-one" }
-  },
-  "required": ["name"],
-  "definitions": {
-    "min-length-one": {
-      "type": "string",
-      "minLength": 1
-    }
-  }
-}
\ No newline at end of file
diff --git a/agent/structs/auto_encrypt.go b/agent/structs/auto_encrypt.go
index cce7c4effa1e3..a0611ee386fc5 100644
--- a/agent/structs/auto_encrypt.go
+++ b/agent/structs/auto_encrypt.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 type SignedResponse struct {
diff --git a/agent/structs/autopilot.go b/agent/structs/autopilot.go
index 431e2ad4d374f..abfb7ca0c4cd0 100644
--- a/agent/structs/autopilot.go
+++ b/agent/structs/autopilot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/autopilot_ce.go b/agent/structs/autopilot_ce.go
index f15e28f6a897e..a495c26a07b4e 100644
--- a/agent/structs/autopilot_ce.go
+++ b/agent/structs/autopilot_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
diff --git a/agent/structs/catalog.go b/agent/structs/catalog.go
index 84795ce47898d..94581a45ca9dc 100644
--- a/agent/structs/catalog.go
+++ b/agent/structs/catalog.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -59,15 +56,3 @@ func (h *HealthSummary) Add(status string) {
 		h.Critical++
 	}
 }
-
-type AssignServiceManualVIPsRequest struct {
-	Service    string
-	ManualVIPs []string
-
-	DCSpecificRequest
-}
-
-type AssignServiceManualVIPsResponse struct {
-	Found          bool
-	UnassignedFrom []PeeredServiceName
-}
diff --git a/agent/structs/catalog_ce.go b/agent/structs/catalog_ce.go
index 463f88fcbe2e4..8165ffc42640c 100644
--- a/agent/structs/catalog_ce.go
+++ b/agent/structs/catalog_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
diff --git a/agent/structs/check_definition.go b/agent/structs/check_definition.go
index 0b04290e707d5..1c01a4b422b5b 100644
--- a/agent/structs/check_definition.go
+++ b/agent/structs/check_definition.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -36,7 +33,6 @@ type CheckDefinition struct {
 	Body                           string
 	DisableRedirects               bool
 	TCP                            string
-	TCPUseTLS                      bool
 	UDP                            string
 	Interval                       time.Duration
 	DockerContainerID              string
@@ -77,7 +73,6 @@ func (t *CheckDefinition) UnmarshalJSON(data []byte) (err error) {
 		DockerContainerIDSnake              string      `json:"docker_container_id"`
 		TLSServerNameSnake                  string      `json:"tls_server_name"`
 		TLSSkipVerifySnake                  bool        `json:"tls_skip_verify"`
-		TCPUseTLSSnake                      bool        `json:"tcp_use_tls"`
 		GRPCUseTLSSnake                     bool        `json:"grpc_use_tls"`
 		ServiceIDSnake                      string      `json:"service_id"`
 		H2PingUseTLSSnake                   bool        `json:"h2ping_use_tls"`
@@ -121,9 +116,6 @@ func (t *CheckDefinition) UnmarshalJSON(data []byte) (err error) {
 	if aux.TLSSkipVerifySnake {
 		t.TLSSkipVerify = aux.TLSSkipVerifySnake
 	}
-	if aux.TCPUseTLSSnake {
-		t.TCPUseTLS = aux.TCPUseTLSSnake
-	}
 	if aux.GRPCUseTLSSnake {
 		t.GRPCUseTLS = aux.GRPCUseTLSSnake
 	}
@@ -225,7 +217,6 @@ func (c *CheckDefinition) CheckType() *CheckType {
 		DisableRedirects:               c.DisableRedirects,
 		OutputMaxSize:                  c.OutputMaxSize,
 		TCP:                            c.TCP,
-		TCPUseTLS:                      c.TCPUseTLS,
 		UDP:                            c.UDP,
 		Interval:                       c.Interval,
 		DockerContainerID:              c.DockerContainerID,
diff --git a/agent/structs/check_definition_test.go b/agent/structs/check_definition_test.go
index 5a51f377c0e8f..731de6dbdbc79 100644
--- a/agent/structs/check_definition_test.go
+++ b/agent/structs/check_definition_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/check_type.go b/agent/structs/check_type.go
index 61a5a762f7c54..b4696c65c5710 100644
--- a/agent/structs/check_type.go
+++ b/agent/structs/check_type.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -42,7 +39,6 @@ type CheckType struct {
 	Body                   string
 	DisableRedirects       bool
 	TCP                    string
-	TCPUseTLS              bool
 	UDP                    string
 	Interval               time.Duration
 	AliasNode              string
@@ -88,7 +84,6 @@ func (t *CheckType) UnmarshalJSON(data []byte) (err error) {
 		DockerContainerIDSnake              string      `json:"docker_container_id"`
 		TLSServerNameSnake                  string      `json:"tls_server_name"`
 		TLSSkipVerifySnake                  bool        `json:"tls_skip_verify"`
-		TCPUseTLSSnake                      bool        `json:"tcp_use_tls"`
 		GRPCUseTLSSnake                     bool        `json:"grpc_use_tls"`
 		H2PingUseTLSSnake                   bool        `json:"h2ping_use_tls"`
 
@@ -133,9 +128,6 @@ func (t *CheckType) UnmarshalJSON(data []byte) (err error) {
 	if aux.TLSSkipVerifySnake {
 		t.TLSSkipVerify = aux.TLSSkipVerifySnake
 	}
-	if aux.TCPUseTLSSnake {
-		t.TCPUseTLS = aux.TCPUseTLSSnake
-	}
 	if aux.GRPCUseTLSSnake {
 		t.GRPCUseTLS = aux.GRPCUseTLSSnake
 	}
diff --git a/agent/structs/config_entry.go b/agent/structs/config_entry.go
index a844a9de85450..2d0c190c2e1bd 100644
--- a/agent/structs/config_entry.go
+++ b/agent/structs/config_entry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -37,15 +34,11 @@ const (
 	ServiceIntentions  string = "service-intentions"
 	MeshConfig         string = "mesh"
 	ExportedServices   string = "exported-services"
-	SamenessGroup      string = "sameness-group"
 	APIGateway         string = "api-gateway"
 	BoundAPIGateway    string = "bound-api-gateway"
 	InlineCertificate  string = "inline-certificate"
 	HTTPRoute          string = "http-route"
 	TCPRoute           string = "tcp-route"
-	// TODO: decide if we want to highlight 'ip' keyword in the name of RateLimitIPConfig
-	RateLimitIPConfig string = "control-plane-request-limit"
-	JWTProvider       string = "jwt-provider"
 
 	ProxyConfigGlobal string = "global"
 	MeshConfigMesh    string = "mesh"
@@ -66,14 +59,11 @@ var AllConfigEntryKinds = []string{
 	ServiceIntentions,
 	MeshConfig,
 	ExportedServices,
-	SamenessGroup,
 	APIGateway,
 	BoundAPIGateway,
 	HTTPRoute,
 	TCPRoute,
 	InlineCertificate,
-	RateLimitIPConfig,
-	JWTProvider,
 }
 
 // ConfigEntry is the interface for centralized configuration stored in Raft.
@@ -127,26 +117,6 @@ type WarningConfigEntry interface {
 	ConfigEntry
 }
 
-type MutualTLSMode string
-
-const (
-	MutualTLSModeDefault    MutualTLSMode = ""
-	MutualTLSModeStrict     MutualTLSMode = "strict"
-	MutualTLSModePermissive MutualTLSMode = "permissive"
-)
-
-func (m MutualTLSMode) validate() error {
-	switch m {
-	case MutualTLSModeDefault, MutualTLSModeStrict, MutualTLSModePermissive:
-		return nil
-	}
-	return fmt.Errorf("Invalid MutualTLSMode %q. Must be one of %q, %q, or %q.", m,
-		MutualTLSModeDefault,
-		MutualTLSModeStrict,
-		MutualTLSModePermissive,
-	)
-}
-
 // ServiceConfiguration is the top-level struct for the configuration of a service
 // across the entire cluster.
 type ServiceConfigEntry struct {
@@ -155,7 +125,6 @@ type ServiceConfigEntry struct {
 	Protocol                  string
 	Mode                      ProxyMode              `json:",omitempty"`
 	TransparentProxy          TransparentProxyConfig `json:",omitempty" alias:"transparent_proxy"`
-	MutualTLSMode             MutualTLSMode          `json:",omitempty" alias:"mutual_tls_mode"`
 	MeshGateway               MeshGatewayConfig      `json:",omitempty" alias:"mesh_gateway"`
 	Expose                    ExposeConfig           `json:",omitempty"`
 	ExternalSNI               string                 `json:",omitempty" alias:"external_sni"`
@@ -165,7 +134,6 @@ type ServiceConfigEntry struct {
 	LocalConnectTimeoutMs     int                    `json:",omitempty" alias:"local_connect_timeout_ms"`
 	LocalRequestTimeoutMs     int                    `json:",omitempty" alias:"local_request_timeout_ms"`
 	BalanceInboundConnections string                 `json:",omitempty" alias:"balance_inbound_connections"`
-	RateLimits                *RateLimits            `json:",omitempty" alias:"rate_limits"`
 	EnvoyExtensions           EnvoyExtensions        `json:",omitempty" alias:"envoy_extensions"`
 
 	Meta               map[string]string `json:",omitempty"`
@@ -287,18 +255,10 @@ func (e *ServiceConfigEntry) Validate() error {
 		}
 	}
 
-	if err := validateRatelimit(e.RateLimits); err != nil {
-		validationErr = multierror.Append(validationErr, err)
-	}
-
 	if err := envoyextensions.ValidateExtensions(e.EnvoyExtensions.ToAPI()); err != nil {
 		validationErr = multierror.Append(validationErr, err)
 	}
 
-	if err := e.MutualTLSMode.validate(); err != nil {
-		return err
-	}
-
 	return validationErr
 }
 
@@ -387,66 +347,27 @@ type DestinationConfig struct {
 	Port int `json:",omitempty"`
 }
 
-func IsIP(address string) bool {
+func IsHostname(address string) bool {
 	ip := net.ParseIP(address)
-	return ip != nil
-}
-
-// RateLimits is rate limiting configuration that is applied to
-// inbound traffic for a service.
-// Rate limiting is a Consul enterprise feature.
-type RateLimits struct {
-	InstanceLevel InstanceLevelRateLimits `alias:"instance_level"`
-}
-
-// InstanceLevelRateLimits represents rate limit configuration
-// that are applied per service instance.
-type InstanceLevelRateLimits struct {
-	// RequestsPerSecond is the average number of requests per second that can be
-	// made without being throttled. This field is required if RequestsMaxBurst
-	// is set. The allowed number of requests may exceed RequestsPerSecond up to
-	// the value specified in RequestsMaxBurst.
-	//
-	// Internally, this is the refill rate of the token bucket used for rate limiting.
-	RequestsPerSecond int `alias:"requests_per_second"`
-
-	// RequestsMaxBurst is the maximum number of requests that can be sent
-	// in a burst. Should be equal to or greater than RequestsPerSecond.
-	// If unset, defaults to RequestsPerSecond.
-	//
-	// Internally, this is the maximum size of the token bucket used for rate limiting.
-	RequestsMaxBurst int `alias:"requests_max_burst"`
-
-	// Routes is a list of rate limits applied to specific routes.
-	// Overrides any top-level configuration.
-	Routes []InstanceLevelRouteRateLimits
+	return ip == nil
 }
 
-// InstanceLevelRouteRateLimits represents rate limit configuration
-// applied to a route matching one of PathExact/PathPrefix/PathRegex.
-type InstanceLevelRouteRateLimits struct {
-	PathExact  string `alias:"path_exact"`
-	PathPrefix string `alias:"path_prefix"`
-	PathRegex  string `alias:"path_regex"`
-
-	RequestsPerSecond int `alias:"requests_per_second"`
-	RequestsMaxBurst  int `alias:"requests_max_burst"`
+func IsIP(address string) bool {
+	ip := net.ParseIP(address)
+	return ip != nil
 }
 
 // ProxyConfigEntry is the top-level struct for global proxy configuration defaults.
 type ProxyConfigEntry struct {
-	Kind                 string
-	Name                 string
-	Config               map[string]interface{}
-	Mode                 ProxyMode                            `json:",omitempty"`
-	TransparentProxy     TransparentProxyConfig               `json:",omitempty" alias:"transparent_proxy"`
-	MutualTLSMode        MutualTLSMode                        `json:",omitempty" alias:"mutual_tls_mode"`
-	MeshGateway          MeshGatewayConfig                    `json:",omitempty" alias:"mesh_gateway"`
-	Expose               ExposeConfig                         `json:",omitempty"`
-	AccessLogs           AccessLogsConfig                     `json:",omitempty" alias:"access_logs"`
-	EnvoyExtensions      EnvoyExtensions                      `json:",omitempty" alias:"envoy_extensions"`
-	FailoverPolicy       *ServiceResolverFailoverPolicy       `json:",omitempty" alias:"failover_policy"`
-	PrioritizeByLocality *ServiceResolverPrioritizeByLocality `json:",omitempty" alias:"prioritize_by_locality"`
+	Kind             string
+	Name             string
+	Config           map[string]interface{}
+	Mode             ProxyMode              `json:",omitempty"`
+	TransparentProxy TransparentProxyConfig `json:",omitempty" alias:"transparent_proxy"`
+	MeshGateway      MeshGatewayConfig      `json:",omitempty" alias:"mesh_gateway"`
+	Expose           ExposeConfig           `json:",omitempty"`
+	AccessLogs       AccessLogsConfig       `json:",omitempty" alias:"access_logs"`
+	EnvoyExtensions  EnvoyExtensions        `json:",omitempty" alias:"envoy_extensions"`
 
 	Meta               map[string]string `json:",omitempty"`
 	acl.EnterpriseMeta `hcl:",squash" mapstructure:",squash"`
@@ -517,18 +438,6 @@ func (e *ProxyConfigEntry) Validate() error {
 		return err
 	}
 
-	if err := e.FailoverPolicy.validate(); err != nil {
-		return err
-	}
-
-	if err := e.PrioritizeByLocality.validate(); err != nil {
-		return err
-	}
-
-	if err := e.MutualTLSMode.validate(); err != nil {
-		return err
-	}
-
 	return e.validateEnterpriseMeta()
 }
 
@@ -615,7 +524,7 @@ func (e *ProxyConfigEntry) UnmarshalBinary(data []byte) error {
 // into a concrete type.
 //
 // There is an 'api' variation of this in
-// command/helpers/helpers.go:newDecodeConfigEntry
+// command/config/write/config_write.go:newDecodeConfigEntry
 func DecodeConfigEntry(raw map[string]interface{}) (ConfigEntry, error) {
 	var entry ConfigEntry
 
@@ -741,9 +650,6 @@ func (c *ConfigEntryRequest) UnmarshalBinary(data []byte) error {
 }
 
 func MakeConfigEntry(kind, name string) (ConfigEntry, error) {
-	if configEntry := makeEnterpriseConfigEntry(kind, name); configEntry != nil {
-		return configEntry, nil
-	}
 	switch kind {
 	case ServiceDefaults:
 		return &ServiceConfigEntry{Name: name}, nil
@@ -765,8 +671,6 @@ func MakeConfigEntry(kind, name string) (ConfigEntry, error) {
 		return &MeshConfigEntry{}, nil
 	case ExportedServices:
 		return &ExportedServicesConfigEntry{Name: name}, nil
-	case SamenessGroup:
-		return &SamenessGroupConfigEntry{Name: name}, nil
 	case APIGateway:
 		return &APIGatewayConfigEntry{Name: name}, nil
 	case BoundAPIGateway:
@@ -777,8 +681,6 @@ func MakeConfigEntry(kind, name string) (ConfigEntry, error) {
 		return &HTTPRouteConfigEntry{Name: name}, nil
 	case TCPRoute:
 		return &TCPRouteConfigEntry{Name: name}, nil
-	case JWTProvider:
-		return &JWTProviderConfigEntry{Name: name}, nil
 	default:
 		return nil, fmt.Errorf("invalid config entry kind: %s", kind)
 	}
@@ -859,6 +761,11 @@ type ServiceConfigRequest struct {
 	// UpstreamServiceNames is a list of upstream service names to use for resolving the service config.
 	UpstreamServiceNames []PeeredServiceName
 
+	// DEPRECATED
+	// UpstreamIDs is a list of upstream service names to use for resolving the service config.
+	// This field does not take the peer name into consideration, so it is deprecated.
+	UpstreamIDs []ServiceID
+
 	acl.EnterpriseMeta `hcl:",squash" mapstructure:",squash"`
 	QueryOptions
 }
@@ -867,6 +774,25 @@ func (s *ServiceConfigRequest) RequestDatacenter() string {
 	return s.Datacenter
 }
 
+// GetLocalUpstreamIDs returns the list of non-peer service ids for upstreams defined on this request.
+// This is often used for fetching service-defaults config entries.
+func (s *ServiceConfigRequest) GetLocalUpstreamIDs() []ServiceID {
+	var upstreams []ServiceID
+	if len(s.UpstreamIDs) > 0 {
+		// The legacy mode is mutually exclusive with the new mode, so we don't need
+		// to join the two lists together.
+		upstreams = append(upstreams, s.UpstreamIDs...)
+		return upstreams
+	}
+	for i := range s.UpstreamServiceNames {
+		u := &s.UpstreamServiceNames[i]
+		if u.Peer == "" {
+			upstreams = append(upstreams, u.ServiceName.ToServiceID())
+		}
+	}
+	return upstreams
+}
+
 func (r *ServiceConfigRequest) CacheInfo() cache.RequestInfo {
 	info := cache.RequestInfo{
 		Token:          r.Token,
@@ -886,6 +812,7 @@ func (r *ServiceConfigRequest) CacheInfo() cache.RequestInfo {
 		Name                 string
 		EnterpriseMeta       acl.EnterpriseMeta
 		UpstreamServiceNames []PeeredServiceName `hash:"set"`
+		UpstreamIDs          []ServiceID         `hash:"set"`
 		MeshGatewayConfig    MeshGatewayConfig
 		ProxyMode            ProxyMode
 		Filter               string
@@ -893,6 +820,7 @@ func (r *ServiceConfigRequest) CacheInfo() cache.RequestInfo {
 		Name:                 r.Name,
 		EnterpriseMeta:       r.EnterpriseMeta,
 		UpstreamServiceNames: r.UpstreamServiceNames,
+		UpstreamIDs:          r.UpstreamIDs,
 		ProxyMode:            r.Mode,
 		MeshGatewayConfig:    r.MeshGateway,
 		Filter:               r.QueryOptions.Filter,
@@ -1136,7 +1064,6 @@ type PassiveHealthCheck struct {
 
 	// The maximum % of an upstream cluster that can be ejected due to outlier detection.
 	// Defaults to 10% but will eject at least one host regardless of the value.
-	// TODO: remove me
 	MaxEjectionPercent *uint32 `json:",omitempty" alias:"max_ejection_percent"`
 
 	// The base time that a host is ejected for. The real time is equal to the base time
@@ -1230,6 +1157,12 @@ func (ul UpstreamLimits) Validate() error {
 	return nil
 }
 
+type OpaqueUpstreamConfigDeprecated struct {
+	Upstream ServiceID
+	Config   map[string]interface{}
+}
+type OpaqueUpstreamConfigsDeprecated []OpaqueUpstreamConfigDeprecated
+
 type OpaqueUpstreamConfig struct {
 	Upstream PeeredServiceName
 	Config   map[string]interface{}
@@ -1237,18 +1170,19 @@ type OpaqueUpstreamConfig struct {
 type OpaqueUpstreamConfigs []OpaqueUpstreamConfig
 
 type ServiceConfigResponse struct {
-	ProxyConfig      map[string]interface{}
-	UpstreamConfigs  OpaqueUpstreamConfigs
-	MeshGateway      MeshGatewayConfig      `json:",omitempty"`
-	Expose           ExposeConfig           `json:",omitempty"`
-	TransparentProxy TransparentProxyConfig `json:",omitempty"`
-	MutualTLSMode    MutualTLSMode          `json:",omitempty"`
-	Mode             ProxyMode              `json:",omitempty"`
-	Destination      DestinationConfig      `json:",omitempty"`
-	AccessLogs       AccessLogsConfig       `json:",omitempty"`
-	RateLimits       RateLimits             `json:",omitempty"`
-	Meta             map[string]string      `json:",omitempty"`
-	EnvoyExtensions  []EnvoyExtension       `json:",omitempty"`
+	ProxyConfig map[string]interface{}
+	// DEPRECATED: UpstreamIDConfigs field exists only for backwards-compatibility
+	// during upgrades and should be removed in Consul 1.16.
+	UpstreamIDConfigs OpaqueUpstreamConfigsDeprecated
+	UpstreamConfigs   OpaqueUpstreamConfigs
+	MeshGateway       MeshGatewayConfig      `json:",omitempty"`
+	Expose            ExposeConfig           `json:",omitempty"`
+	TransparentProxy  TransparentProxyConfig `json:",omitempty"`
+	Mode              ProxyMode              `json:",omitempty"`
+	Destination       DestinationConfig      `json:",omitempty"`
+	AccessLogs        AccessLogsConfig       `json:",omitempty"`
+	Meta              map[string]string      `json:",omitempty"`
+	EnvoyExtensions   []EnvoyExtension       `json:",omitempty"`
 	QueryMeta
 }
 
@@ -1292,6 +1226,13 @@ func (r *ServiceConfigResponse) UnmarshalBinary(data []byte) error {
 		return err
 	}
 
+	for k := range r.UpstreamIDConfigs {
+		r.UpstreamIDConfigs[k].Config, err = lib.MapWalk(r.UpstreamIDConfigs[k].Config)
+		if err != nil {
+			return err
+		}
+	}
+
 	for k := range r.UpstreamConfigs {
 		r.UpstreamConfigs[k].Config, err = lib.MapWalk(r.UpstreamConfigs[k].Config)
 		if err != nil {
diff --git a/agent/structs/config_entry_apigw_jwt_ce.go b/agent/structs/config_entry_apigw_jwt_ce.go
deleted file mode 100644
index 61b9db5b16ab9..0000000000000
--- a/agent/structs/config_entry_apigw_jwt_ce.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package structs
-
-// APIGatewayJWTRequirement holds the list of JWT providers to be verified against
-type APIGatewayJWTRequirement struct{}
-
-// JWTFilter holds the JWT Filter configuration for an HTTPRoute
-type JWTFilter struct{}
diff --git a/agent/structs/config_entry_ce.go b/agent/structs/config_entry_ce.go
index d8ca4968ad53f..4bd3a93fcdfff 100644
--- a/agent/structs/config_entry_ce.go
+++ b/agent/structs/config_entry_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
@@ -29,8 +27,6 @@ func validateUnusedKeys(unused []string) error {
 			// to exist on the target.
 		case strings.HasSuffix(strings.ToLower(k), "namespace"):
 			err = multierror.Append(err, fmt.Errorf("invalid config key %q, namespaces are a consul enterprise feature", k))
-		case strings.Contains(strings.ToLower(k), "jwt"):
-			err = multierror.Append(err, fmt.Errorf("invalid config key %q, api-gateway jwt validation is a consul enterprise feature", k))
 		default:
 			err = multierror.Append(err, fmt.Errorf("invalid config key %q", k))
 		}
@@ -48,29 +44,3 @@ func validateExportedServicesName(name string) error {
 	}
 	return nil
 }
-
-func makeEnterpriseConfigEntry(kind, name string) ConfigEntry {
-	return nil
-}
-
-func validateRatelimit(rl *RateLimits) error {
-	if rl != nil {
-		return fmt.Errorf("invalid rate_limits config. Rate limiting is a consul enterprise feature")
-	}
-	return nil
-}
-
-func (rl RateLimits) ToEnvoyExtension() *EnvoyExtension { return nil }
-
-// GetLocalUpstreamIDs returns the list of non-peer service ids for upstreams defined on this request.
-// This is often used for fetching service-defaults config entries.
-func (s *ServiceConfigRequest) GetLocalUpstreamIDs() []ServiceID {
-	var upstreams []ServiceID
-	for _, u := range s.UpstreamServiceNames {
-		if u.Peer != "" {
-			continue
-		}
-		upstreams = append(upstreams, u.ServiceName.ToServiceID())
-	}
-	return upstreams
-}
diff --git a/agent/structs/config_entry_ce_test.go b/agent/structs/config_entry_ce_test.go
index 52ee3240afafe..ed6fedc4e673b 100644
--- a/agent/structs/config_entry_ce_test.go
+++ b/agent/structs/config_entry_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
@@ -101,60 +99,3 @@ func TestDecodeConfigEntry_CE(t *testing.T) {
 		})
 	}
 }
-
-func Test_GetLocalUpstreamIDs(t *testing.T) {
-	cases := map[string]struct {
-		input  *ServiceConfigRequest
-		expect []ServiceID
-	}{
-		"no_upstreams": {
-			input: &ServiceConfigRequest{
-				Name: "svc",
-			},
-			expect: nil,
-		},
-		"upstreams": {
-			input: &ServiceConfigRequest{
-				Name: "svc",
-				UpstreamServiceNames: []PeeredServiceName{
-					{ServiceName: NewServiceName("a", nil)},
-					{ServiceName: NewServiceName("b", nil)},
-					{ServiceName: NewServiceName("c", nil)},
-				},
-			},
-			expect: []ServiceID{
-				{ID: "a"},
-				{ID: "b"},
-				{ID: "c"},
-			},
-		},
-		"peer_upstream": {
-			input: &ServiceConfigRequest{
-				Name: "svc",
-				UpstreamServiceNames: []PeeredServiceName{
-					{Peer: "p", ServiceName: NewServiceName("a", nil)},
-				},
-			},
-			expect: nil,
-		},
-		"mixed_upstreams": {
-			input: &ServiceConfigRequest{
-				Name: "svc",
-				UpstreamServiceNames: []PeeredServiceName{
-					{ServiceName: NewServiceName("a", nil)},
-					{Peer: "p", ServiceName: NewServiceName("b", nil)},
-					{ServiceName: NewServiceName("c", nil)},
-				},
-			},
-			expect: []ServiceID{
-				{ID: "a"},
-				{ID: "c"},
-			},
-		},
-	}
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			require.Equal(t, tc.expect, tc.input.GetLocalUpstreamIDs())
-		})
-	}
-}
diff --git a/agent/structs/config_entry_discoverychain.go b/agent/structs/config_entry_discoverychain.go
index ed81726830ed1..a725faff1b98b 100644
--- a/agent/structs/config_entry_discoverychain.go
+++ b/agent/structs/config_entry_discoverychain.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -22,7 +19,6 @@ import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/cache"
 	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/lib/maps"
 )
 
 const (
@@ -858,10 +854,6 @@ type ServiceResolverConfigEntry struct {
 	// specified here.
 	Failover map[string]ServiceResolverFailover `json:",omitempty"`
 
-	// PrioritizeByLocality controls whether the locality of services within the
-	// local partition will be used to prioritize connectivity.
-	PrioritizeByLocality *ServiceResolverPrioritizeByLocality `json:",omitempty" alias:"prioritize_by_locality"`
-
 	// ConnectTimeout is the timeout for establishing new network connections
 	// to this service.
 	ConnectTimeout time.Duration `json:",omitempty" alias:"connect_timeout"`
@@ -880,26 +872,6 @@ type ServiceResolverConfigEntry struct {
 	RaftIndex
 }
 
-func (e *ServiceResolverConfigEntry) RelatedPeers() []string {
-	peers := make(map[string]struct{})
-
-	if r := e.Redirect; r != nil && r.Peer != "" {
-		peers[r.Peer] = struct{}{}
-	}
-
-	if e.Failover != nil {
-		for _, f := range e.Failover {
-			for _, t := range f.Targets {
-				if t.Peer != "" {
-					peers[t.Peer] = struct{}{}
-				}
-			}
-		}
-	}
-
-	return maps.SliceOfKeys(peers)
-}
-
 func (e *ServiceResolverConfigEntry) MarshalJSON() ([]byte, error) {
 	type Alias ServiceResolverConfigEntry
 	exported := &struct {
@@ -966,8 +938,7 @@ func (e *ServiceResolverConfigEntry) IsDefault() bool {
 		len(e.Failover) == 0 &&
 		e.ConnectTimeout == 0 &&
 		e.RequestTimeout == 0 &&
-		e.LoadBalancer == nil &&
-		e.PrioritizeByLocality == nil
+		e.LoadBalancer == nil
 }
 
 func (e *ServiceResolverConfigEntry) GetKind() string {
@@ -1038,10 +1009,6 @@ func (e *ServiceResolverConfigEntry) Validate() error {
 		return fmt.Errorf("DefaultSubset %q is not a valid subset", e.DefaultSubset)
 	}
 
-	if err := e.PrioritizeByLocality.validate(); err != nil {
-		return err
-	}
-
 	if e.Redirect != nil {
 		if !e.InDefaultPartition() && e.Redirect.Datacenter != "" {
 			return fmt.Errorf("Cross-datacenter redirect is only supported in the default partition")
@@ -1067,12 +1034,6 @@ func (e *ServiceResolverConfigEntry) Validate() error {
 		}
 
 		switch {
-		case r.SamenessGroup != "" && r.ServiceSubset != "":
-			return fmt.Errorf("Redirect.SamenessGroup cannot be set with Redirect.ServiceSubset")
-		case r.SamenessGroup != "" && r.Partition != "":
-			return fmt.Errorf("Redirect.Partition cannot be set with Redirect.SamenessGroup")
-		case r.SamenessGroup != "" && r.Datacenter != "":
-			return fmt.Errorf("Redirect.SamenessGroup cannot be set with Redirect.Datacenter")
 		case r.Peer != "" && r.ServiceSubset != "":
 			return fmt.Errorf("Redirect.Peer cannot be set with Redirect.ServiceSubset")
 		case r.Peer != "" && r.Partition != "":
@@ -1117,15 +1078,7 @@ func (e *ServiceResolverConfigEntry) Validate() error {
 			}
 
 			if f.isEmpty() {
-				return fmt.Errorf(errorPrefix + "one of Service, ServiceSubset, Namespace, Targets, SamenessGroup, or Datacenters is required")
-			}
-
-			if err := f.Policy.ValidateEnterprise(); err != nil {
-				return fmt.Errorf("Bad Failover[%q]: %s", subset, err)
-			}
-
-			if err := f.Policy.validate(); err != nil {
-				return fmt.Errorf("Bad Failover[%q]: %w", subset, err)
+				return fmt.Errorf(errorPrefix + "one of Service, ServiceSubset, Namespace, Targets, or Datacenters is required")
 			}
 
 			if f.ServiceSubset != "" {
@@ -1136,17 +1089,6 @@ func (e *ServiceResolverConfigEntry) Validate() error {
 				}
 			}
 
-			if f.SamenessGroup != "" {
-				switch {
-				case len(f.Datacenters) > 0:
-					return fmt.Errorf("Bad Failover[%q]: SamenessGroup cannot be set with Datacenters", subset)
-				case f.ServiceSubset != "":
-					return fmt.Errorf("Bad Failover[%q]: SamenessGroup cannot be set with ServiceSubset", subset)
-				case len(f.Targets) > 0:
-					return fmt.Errorf("Bad Failover[%q]: SamenessGroup cannot be set with Targets", subset)
-				}
-			}
-
 			if len(f.Datacenters) != 0 && len(f.Targets) != 0 {
 				return fmt.Errorf("Bad Failover[%q]: Targets cannot be set with Datacenters", subset)
 			}
@@ -1372,20 +1314,6 @@ type ServiceResolverRedirect struct {
 	// Peer is the name of the cluster peer to resolve the service from instead
 	// of the current one (optional).
 	Peer string `json:",omitempty"`
-
-	// SamenessGroup is the name of the sameness group to resolve the service from instead
-	// of the local partition.
-	SamenessGroup string `json:",omitempty"`
-}
-
-// ToSamenessDiscoveryTargetOpts returns the options required for sameness failover and redirects.
-// These operations should preserve the service name and namespace.
-func (r *ServiceResolverConfigEntry) ToSamenessDiscoveryTargetOpts() DiscoveryTargetOpts {
-	return DiscoveryTargetOpts{
-		Service:   r.Name,
-		Namespace: r.NamespaceOrDefault(),
-		Partition: r.PartitionOrDefault(),
-	}
 }
 
 func (r *ServiceResolverRedirect) ToDiscoveryTargetOpts() DiscoveryTargetOpts {
@@ -1400,13 +1328,7 @@ func (r *ServiceResolverRedirect) ToDiscoveryTargetOpts() DiscoveryTargetOpts {
 }
 
 func (r *ServiceResolverRedirect) isEmpty() bool {
-	return r.Service == "" &&
-		r.ServiceSubset == "" &&
-		r.Namespace == "" &&
-		r.Partition == "" &&
-		r.Datacenter == "" &&
-		r.Peer == "" &&
-		r.SamenessGroup == ""
+	return r.Service == "" && r.ServiceSubset == "" && r.Namespace == "" && r.Partition == "" && r.Datacenter == "" && r.Peer == ""
 }
 
 // There are some restrictions on what is allowed in here:
@@ -1448,58 +1370,18 @@ type ServiceResolverFailover struct {
 	//
 	// This is a DESTINATION during failover.
 	Targets []ServiceResolverFailoverTarget `json:",omitempty"`
-
-	// Policy specifies the exact mechanism used for failover.
-	Policy *ServiceResolverFailoverPolicy `json:",omitempty"`
-
-	// SamenessGroup specifies the sameness group to failover to.
-	SamenessGroup string `json:",omitempty"`
 }
 
-func (f *ServiceResolverFailover) ToDiscoveryTargetOpts() DiscoveryTargetOpts {
+func (t *ServiceResolverFailover) ToDiscoveryTargetOpts() DiscoveryTargetOpts {
 	return DiscoveryTargetOpts{
-		Service:       f.Service,
-		ServiceSubset: f.ServiceSubset,
-		Namespace:     f.Namespace,
+		Service:       t.Service,
+		ServiceSubset: t.ServiceSubset,
+		Namespace:     t.Namespace,
 	}
 }
 
 func (f *ServiceResolverFailover) isEmpty() bool {
-	return f.Service == "" &&
-		f.ServiceSubset == "" &&
-		f.Namespace == "" &&
-		len(f.Datacenters) == 0 &&
-		len(f.Targets) == 0 &&
-		f.SamenessGroup == ""
-}
-
-type ServiceResolverFailoverPolicy struct {
-	// Mode specifies the type of failover that will be performed. Valid values are
-	// "sequential", "" (equivalent to "sequential") and "order-by-locality".
-	Mode    string   `json:",omitempty"`
-	Regions []string `json:",omitempty"`
-}
-
-func (fp *ServiceResolverFailoverPolicy) validate() error {
-	if fp == nil {
-		return nil
-	}
-
-	switch fp.Mode {
-	case "":
-	case "sequential":
-	case "order-by-locality":
-	default:
-		return fmt.Errorf("Failover-policy mode must be one of '', 'sequential', or 'order-by-locality'")
-	}
-	return nil
-}
-
-type ServiceResolverPrioritizeByLocality struct {
-	// Mode specifies the type of prioritization that will be performed
-	// when selecting nodes in the local partition.
-	// Valid values are: "" (default "none"), "none", and "failover".
-	Mode string `json:",omitempty"`
+	return f.Service == "" && f.ServiceSubset == "" && f.Namespace == "" && len(f.Datacenters) == 0 && len(f.Targets) == 0
 }
 
 type ServiceResolverFailoverTarget struct {
diff --git a/agent/structs/config_entry_discoverychain_ce.go b/agent/structs/config_entry_discoverychain_ce.go
index d7333616d36e1..ef00e39922ca9 100644
--- a/agent/structs/config_entry_discoverychain_ce.go
+++ b/agent/structs/config_entry_discoverychain_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
@@ -40,10 +38,6 @@ func (redir *ServiceResolverRedirect) ValidateEnterprise() error {
 		return fmt.Errorf("Setting Namespace requires Consul Enterprise")
 	}
 
-	if redir.SamenessGroup != "" {
-		return fmt.Errorf("Setting SamenessGroup requires Consul Enterprise")
-	}
-
 	return nil
 }
 
@@ -60,10 +54,6 @@ func (failover *ServiceResolverFailover) ValidateEnterprise() error {
 		return fmt.Errorf("Setting Namespace requires Consul Enterprise")
 	}
 
-	if failover.SamenessGroup != "" {
-		return fmt.Errorf("Setting SamenessGroup requires Consul Enterprise")
-	}
-
 	return nil
 }
 
@@ -98,30 +88,3 @@ func (req *DiscoveryChainRequest) GetEnterpriseMeta() *acl.EnterpriseMeta {
 func (req *DiscoveryChainRequest) WithEnterpriseMeta(_ *acl.EnterpriseMeta) {
 	// do nothing
 }
-
-// ValidateEnterprise validates that enterprise fields are only set
-// with enterprise binaries.
-func (f *ServiceResolverFailoverPolicy) ValidateEnterprise() error {
-	if f == nil {
-		return nil
-	}
-
-	if f.Mode != "" {
-		return fmt.Errorf("Setting failover policies requires Consul Enterprise")
-	}
-
-	return nil
-}
-
-// RelatedSamenessGroups doesn't return anything in community edition.
-func (e *ServiceResolverConfigEntry) RelatedSamenessGroups() []string {
-	return nil
-}
-
-func (pbl *ServiceResolverPrioritizeByLocality) validate() error {
-	var zero ServiceResolverPrioritizeByLocality
-	if pbl == nil || *pbl == zero {
-		return nil
-	}
-	return fmt.Errorf("Prioritize-by-locality requires Consul Enterprise ")
-}
diff --git a/agent/structs/config_entry_discoverychain_ce_test.go b/agent/structs/config_entry_discoverychain_ce_test.go
index b5053774a2ba2..c58448771589f 100644
--- a/agent/structs/config_entry_discoverychain_ce_test.go
+++ b/agent/structs/config_entry_discoverychain_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
@@ -23,19 +21,6 @@ func TestServiceResolverConfigEntry_CE(t *testing.T) {
 	}
 
 	cases := []testcase{
-		{
-			name: "failover with a sameness group on CE",
-			entry: &ServiceResolverConfigEntry{
-				Kind: ServiceResolver,
-				Name: "test",
-				Failover: map[string]ServiceResolverFailover{
-					"*": {
-						SamenessGroup: "ns1",
-					},
-				},
-			},
-			validateErr: `Bad Failover["*"]: Setting SamenessGroup requires Consul Enterprise`,
-		},
 		{
 			name: "failover with a namespace on CE",
 			entry: &ServiceResolverConfigEntry{
@@ -87,28 +72,6 @@ func TestServiceResolverConfigEntry_CE(t *testing.T) {
 			},
 			validateErr: `Bad Failover["*"]: Setting Namespace requires Consul Enterprise`,
 		},
-		{
-			name: "setting failover Namespace on CE",
-			entry: &ServiceResolverConfigEntry{
-				Kind: ServiceResolver,
-				Name: "test",
-				Failover: map[string]ServiceResolverFailover{
-					"*": {Service: "s1", Policy: &ServiceResolverFailoverPolicy{Mode: "something"}},
-				},
-			},
-			validateErr: `Bad Failover["*"]: Setting failover policies requires Consul Enterprise`,
-		},
-		{
-			name: "setting redirect SamenessGroup on CE",
-			entry: &ServiceResolverConfigEntry{
-				Kind: ServiceResolver,
-				Name: "test",
-				Redirect: &ServiceResolverRedirect{
-					SamenessGroup: "group",
-				},
-			},
-			validateErr: `Redirect: Setting SamenessGroup requires Consul Enterprise`,
-		},
 		{
 			name: "setting redirect Namespace on CE",
 			entry: &ServiceResolverConfigEntry{
diff --git a/agent/structs/config_entry_discoverychain_test.go b/agent/structs/config_entry_discoverychain_test.go
index b2547a7ace202..47cb010b3089b 100644
--- a/agent/structs/config_entry_discoverychain_test.go
+++ b/agent/structs/config_entry_discoverychain_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -1409,7 +1406,7 @@ func TestServiceResolverConfigEntry(t *testing.T) {
 					"v1": {},
 				},
 			},
-			validateErr: `Bad Failover["v1"]: one of Service, ServiceSubset, Namespace, Targets, SamenessGroup, or Datacenters is required`,
+			validateErr: `Bad Failover["v1"]: one of Service, ServiceSubset, Namespace, Targets, or Datacenters is required`,
 		},
 		{
 			name: "failover to self using invalid subset",
diff --git a/agent/structs/config_entry_exports.go b/agent/structs/config_entry_exports.go
index 97e33dd6e7059..958e6a241969e 100644
--- a/agent/structs/config_entry_exports.go
+++ b/agent/structs/config_entry_exports.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -41,13 +38,44 @@ type ExportedService struct {
 // At most one of Partition or Peer must be specified.
 type ServiceConsumer struct {
 	// Partition is the admin partition to export the service to.
+	// Deprecated: Peer should be used for both remote peers and local partitions.
 	Partition string `json:",omitempty"`
 
 	// Peer is the name of the peer to export the service to.
 	Peer string `json:",omitempty" alias:"peer_name"`
+}
 
-	// SamenessGroup is the name of the sameness group to export the service to.
-	SamenessGroup string `json:",omitempty" alias:"sameness_group"`
+func (e *ExportedServicesConfigEntry) ToMap() map[string]map[string][]string {
+	resp := make(map[string]map[string][]string)
+	for _, svc := range e.Services {
+		if _, ok := resp[svc.Namespace]; !ok {
+			resp[svc.Namespace] = make(map[string][]string)
+		}
+		if _, ok := resp[svc.Namespace][svc.Name]; !ok {
+			consumers := make([]string, 0, len(svc.Consumers))
+			for _, c := range svc.Consumers {
+				consumers = append(consumers, c.Partition)
+			}
+			resp[svc.Namespace][svc.Name] = consumers
+			resp[svc.Namespace][svc.Name+SidecarProxySuffix] = consumers
+		}
+	}
+	return resp
+}
+
+func (e *ExportedServicesConfigEntry) Clone() *ExportedServicesConfigEntry {
+	e2 := *e
+	e2.Services = make([]ExportedService, len(e.Services))
+	for _, svc := range e.Services {
+		exportedSvc := svc
+		exportedSvc.Consumers = make([]ServiceConsumer, len(svc.Consumers))
+		for _, consumer := range svc.Consumers {
+			exportedSvc.Consumers = append(exportedSvc.Consumers, consumer)
+		}
+		e2.Services = append(e2.Services, exportedSvc)
+	}
+
+	return &e2
 }
 
 func (e *ExportedServicesConfigEntry) GetKind() string {
@@ -92,14 +120,6 @@ func (e *ExportedServicesConfigEntry) Validate() error {
 		return err
 	}
 
-	if err := e.validateServicesEnterprise(); err != nil {
-		return err
-	}
-
-	return e.validateServices()
-}
-
-func (e *ExportedServicesConfigEntry) validateServices() error {
 	for i, svc := range e.Services {
 		if svc.Name == "" {
 			return fmt.Errorf("Services[%d]: service name cannot be empty", i)
@@ -111,18 +131,8 @@ func (e *ExportedServicesConfigEntry) validateServices() error {
 			return fmt.Errorf("Services[%d]: must have at least one consumer", i)
 		}
 		for j, consumer := range svc.Consumers {
-			count := 0
-			if consumer.Peer != "" {
-				count++
-			}
-			if consumer.Partition != "" {
-				count++
-			}
-			if consumer.SamenessGroup != "" {
-				count++
-			}
-			if count > 1 {
-				return fmt.Errorf("Services[%d].Consumers[%d]: must define at most one of Peer, Partition, or SamenessGroup", i, j)
+			if consumer.Peer != "" && consumer.Partition != "" {
+				return fmt.Errorf("Services[%d].Consumers[%d]: must define at most one of Peer or Partition", i, j)
 			}
 			if consumer.Partition == WildcardSpecifier {
 				return fmt.Errorf("Services[%d].Consumers[%d]: exporting to all partitions (wildcard) is not supported", i, j)
diff --git a/agent/structs/config_entry_exports_ce.go b/agent/structs/config_entry_exports_ce.go
deleted file mode 100644
index bf69a2d8d78ba..0000000000000
--- a/agent/structs/config_entry_exports_ce.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package structs
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/acl"
-)
-
-func (e *ExportedServicesConfigEntry) validateServicesEnterprise() error {
-	for i, svc := range e.Services {
-		for j, consumer := range svc.Consumers {
-			if !acl.IsDefaultPartition(consumer.Partition) {
-				return fmt.Errorf("Services[%d].Consumers[%d]: partitions are an enterprise-only feature", i, j)
-			}
-			if consumer.SamenessGroup != "" {
-				return fmt.Errorf("Services[%d].Consumers[%d]: sameness-groups are an enterprise-only feature", i, j)
-			}
-		}
-	}
-	return nil
-}
diff --git a/agent/structs/config_entry_exports_ce_test.go b/agent/structs/config_entry_exports_ce_test.go
index fa66dd7ead329..6a66d2b319471 100644
--- a/agent/structs/config_entry_exports_ce_test.go
+++ b/agent/structs/config_entry_exports_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
@@ -58,22 +56,6 @@ func TestExportedServicesConfigEntry_CE(t *testing.T) {
 			},
 			validateErr: `exported-services Name must be "default"`,
 		},
-		"validate: sameness groups are enterprise only": {
-			entry: &ExportedServicesConfigEntry{
-				Name: "default",
-				Services: []ExportedService{
-					{
-						Name: "web",
-						Consumers: []ServiceConsumer{
-							{
-								SamenessGroup: "sg",
-							},
-						},
-					},
-				},
-			},
-			validateErr: `Services[0].Consumers[0]: sameness-groups are an enterprise-only feature`,
-		},
 	}
 
 	testConfigEntryNormalizeAndValidate(t, cases)
diff --git a/agent/structs/config_entry_exports_test.go b/agent/structs/config_entry_exports_test.go
index 62e5586a0dac2..e1c58cea65749 100644
--- a/agent/structs/config_entry_exports_test.go
+++ b/agent/structs/config_entry_exports_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -89,7 +86,7 @@ func TestExportedServicesConfigEntry(t *testing.T) {
 					},
 				},
 			},
-			validateErr: `Services[0].Consumers[0]: must define at most one of Peer, Partition, or SamenessGroup`,
+			validateErr: `Services[0].Consumers[0]: must define at most one of Peer or Partition`,
 		},
 	}
 
diff --git a/agent/structs/config_entry_gateways.go b/agent/structs/config_entry_gateways.go
index 00c2687d1ec96..32fd966f60003 100644
--- a/agent/structs/config_entry_gateways.go
+++ b/agent/structs/config_entry_gateways.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -887,17 +884,6 @@ type APIGatewayListener struct {
 	Protocol APIGatewayListenerProtocol
 	// TLS is the TLS settings for the listener.
 	TLS APIGatewayTLSConfiguration
-
-	// Override is the policy that overrides all other policy and route specific configuration
-	Override *APIGatewayPolicy `json:",omitempty"`
-	// Default is the policy that is the default for the listener and route, routes can override this behavior
-	Default *APIGatewayPolicy `json:",omitempty"`
-}
-
-// APIGatewayPolicy holds the policy that configures the gateway listener, this is used in the `Override` and `Default` fields of a listener
-type APIGatewayPolicy struct {
-	// JWT holds the JWT configuration for the Listener
-	JWT *APIGatewayJWTRequirement `json:",omitempty"`
 }
 
 func (l APIGatewayListener) GetHostname() string {
@@ -923,11 +909,6 @@ type APIGatewayTLSConfiguration struct {
 	CipherSuites []types.TLSCipherSuite
 }
 
-// IsEmpty returns true if all values in the struct are nil or empty.
-func (a *APIGatewayTLSConfiguration) IsEmpty() bool {
-	return len(a.Certificates) == 0 && len(a.MaxVersion) == 0 && len(a.MinVersion) == 0 && len(a.CipherSuites) == 0
-}
-
 // BoundAPIGatewayConfigEntry manages the configuration for a bound API
 // gateway with the given name. This type is never written from the client.
 // It is only written by the controller in order to represent an API gateway
diff --git a/agent/structs/config_entry_gateways_test.go b/agent/structs/config_entry_gateways_test.go
index f05638ec4d2e2..32976c2c13b55 100644
--- a/agent/structs/config_entry_gateways_test.go
+++ b/agent/structs/config_entry_gateways_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/config_entry_inline_certificate.go b/agent/structs/config_entry_inline_certificate.go
index f397ee2ba16ec..bdbcbc6ae05a1 100644
--- a/agent/structs/config_entry_inline_certificate.go
+++ b/agent/structs/config_entry_inline_certificate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -10,10 +7,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/miekg/dns"
-
 	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/version"
+	"github.com/miekg/dns"
 )
 
 // InlineCertificateConfigEntry manages the configuration for an inline certificate
@@ -44,13 +39,8 @@ func (e *InlineCertificateConfigEntry) GetEnterpriseMeta() *acl.EnterpriseMeta {
 }
 func (e *InlineCertificateConfigEntry) GetRaftIndex() *RaftIndex { return &e.RaftIndex }
 
-// Envoy will silently reject any RSA keys that are less than 2048 bytes long
-// https://github.com/envoyproxy/envoy/blob/main/source/extensions/transport_sockets/tls/context_impl.cc#L238
-const MinKeyLength = 2048
-
 func (e *InlineCertificateConfigEntry) Validate() error {
-	err := validateConfigEntryMeta(e.Meta)
-	if err != nil {
+	if err := validateConfigEntryMeta(e.Meta); err != nil {
 		return err
 	}
 
@@ -59,18 +49,13 @@ func (e *InlineCertificateConfigEntry) Validate() error {
 		return errors.New("failed to parse private key PEM")
 	}
 
-	err = validateKeyLength(privateKeyBlock)
-	if err != nil {
-		return err
-	}
-
 	certificateBlock, _ := pem.Decode([]byte(e.Certificate))
 	if certificateBlock == nil {
 		return errors.New("failed to parse certificate PEM")
 	}
 
 	// make sure we have a valid x509 certificate
-	_, err = x509.ParseCertificate(certificateBlock.Bytes)
+	_, err := x509.ParseCertificate(certificateBlock.Bytes)
 	if err != nil {
 		return fmt.Errorf("failed to parse certificate: %w", err)
 	}
@@ -96,41 +81,6 @@ func (e *InlineCertificateConfigEntry) Validate() error {
 	return nil
 }
 
-func validateKeyLength(privateKeyBlock *pem.Block) error {
-	if privateKeyBlock.Type != "RSA PRIVATE KEY" {
-		return nil
-	}
-
-	key, err := x509.ParsePKCS1PrivateKey(privateKeyBlock.Bytes)
-	if err != nil {
-		return err
-	}
-
-	keyBitLen := key.N.BitLen()
-
-	if version.IsFIPS() {
-		return fipsLenCheck(keyBitLen)
-	}
-
-	return nonFipsLenCheck(keyBitLen)
-}
-
-func nonFipsLenCheck(keyLen int) error {
-	// ensure private key is of the correct length
-	if keyLen < MinKeyLength {
-		return errors.New("key length must be at least 2048 bits")
-	}
-
-	return nil
-}
-
-func fipsLenCheck(keyLen int) error {
-	if keyLen != 2048 && keyLen != 3072 && keyLen != 4096 {
-		return errors.New("key length invalid: only RSA lengths of 2048, 3072, and 4096 are allowed in FIPS mode")
-	}
-	return nil
-}
-
 func (e *InlineCertificateConfigEntry) Hosts() ([]string, error) {
 	certificateBlock, _ := pem.Decode([]byte(e.Certificate))
 	if certificateBlock == nil {
diff --git a/agent/structs/config_entry_inline_certificate_test.go b/agent/structs/config_entry_inline_certificate_test.go
index 3c537c059161b..db46ca92a7dfa 100644
--- a/agent/structs/config_entry_inline_certificate_test.go
+++ b/agent/structs/config_entry_inline_certificate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import "testing"
@@ -117,21 +114,6 @@ NtyHRuD+KYRmjXtyX1yHNqfGN3vOQmwavHq2R8wHYuBSc6LAHHV9vG+j0VsgMELO
 qwxn8SmLkSKbf2+MsQVzLCXXN5u+D8Yv+4py+oKP4EQ5aFZuDEx+r/G/31rTthww
 AAJAMaoXmoYVdgXV+CPuBb2M4XCpuzLu3bcA2PXm5ipSyIgntMKwXV7r
 -----END CERTIFICATE-----`
-	tooShortPrivateKey = `-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCtmK1VjmXJ7vm4CZkkOSjc+kjGNMlyce5rXxwlDRz9LcGGc3Tg
-kwUJesyBpDtxLLVHXQIPr5mWYbX/W/ezQ9sntxrATbDek8pBgoOlARebwkD2ivVW
-BWfVhlryVihWlXApKiJ2n3i0m+OVtdrceC9Bv2hEMhYVOwzxtb3O0YFkbwIDAQAB
-AoGAIxgnipFUEKPIRiVimUkY8ruCdNd9Fi7kNT6wEOl6v9A9PHIg4bm3Hfh+WYMb
-JUEVkMzDuuoUEavFQE+WXt5L8oE1lEBmN2++FQsvllN+MRBTRg2sfw4mUWDI6S4r
-h8+XNTzTIg2sUd2J3o2qNmQoOheYb+iuYDj76IFoEdwwZ0kCQQDYKKs5HAbnrLj1
-UrOp8TyHdFf0YNw5tGdbNTbffq4rlBD6SW70+Sj624i2UqdnYwRiWzdXv3zN08aI
-Vfoh2cGlAkEAzZe5B6BhiX/PcIYutMtuT3K+mysFNlowrutXWoQOpR7gGAkgEt6e
-oCDgx1QJRjsp6NFQxKc6l034Hzs17gqJgwJAcu9U873aUg9+HTuHOoKB28haCCAE
-mU46cr3d2oKCW7uUN3EaZXmid5iJneBfENMOfrnfuHGiC9NiShXlNWCS3QJAO5Ne
-w83+1ahaxUGs4SkeExmuECrcPM7P0rBRxOIFmGWlDHIAgFdQYhiE6l34vghA8b1O
-CV5oRRYL84jl7M/S3wJBALDfL5YXcc8P6scLJJ1biqhLYppvGN5CUwbsJsluvHCW
-XCTVIbPOaS42A0xUfpoiTcdbNSFRvdCzPR5nsGy8Y7g=
------END RSA PRIVATE KEY-----`
 )
 
 func TestInlineCertificate(t *testing.T) {
@@ -155,17 +137,6 @@ func TestInlineCertificate(t *testing.T) {
 			},
 			validateErr: "failed to parse certificate PEM",
 		},
-		"invalid private key length": {
-			entry: &InlineCertificateConfigEntry{
-				Kind:        InlineCertificate,
-				Name:        "cert-two",
-				PrivateKey:  tooShortPrivateKey,
-				Certificate: "foo",
-			},
-			// non-FIPS: "key length must be at least 2048 bits"
-			// FIPS: "key length invalid: only RSA lengths of 2048, 3072, and 4096 are allowed in FIPS mode"
-			validateErr: "key length",
-		},
 		"mismatched certificate": {
 			entry: &InlineCertificateConfigEntry{
 				Kind:        InlineCertificate,
diff --git a/agent/structs/config_entry_intentions.go b/agent/structs/config_entry_intentions.go
index f32aafa9a87d2..205fa33694392 100644
--- a/agent/structs/config_entry_intentions.go
+++ b/agent/structs/config_entry_intentions.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -10,7 +7,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/consul/lib/stringslice"
-	"github.com/hashicorp/go-multierror"
 
 	"github.com/hashicorp/consul/acl"
 )
@@ -21,8 +17,6 @@ type ServiceIntentionsConfigEntry struct {
 
 	Sources []*SourceIntention
 
-	JWT *IntentionJWTRequirement `json:",omitempty"`
-
 	Meta map[string]string `json:",omitempty"` // formerly Intention.Meta
 
 	acl.EnterpriseMeta `hcl:",squash" mapstructure:",squash"` // formerly DestinationNS
@@ -60,10 +54,6 @@ func (e *ServiceIntentionsConfigEntry) Clone() *ServiceIntentionsConfigEntry {
 		e2.Sources[i] = src.Clone()
 	}
 
-	if e.JWT != nil {
-		e2.JWT = e.JWT.Clone()
-	}
-
 	return &e2
 }
 
@@ -134,12 +124,10 @@ func (e *ServiceIntentionsConfigEntry) ToIntention(src *SourceIntention) *Intent
 		ID:                   src.LegacyID,
 		Description:          src.Description,
 		SourcePeer:           src.Peer,
-		SourceSamenessGroup:  src.SamenessGroup,
 		SourcePartition:      src.PartitionOrEmpty(),
 		SourceNS:             src.NamespaceOrDefault(),
 		SourceName:           src.Name,
 		SourceType:           src.Type,
-		JWT:                  e.JWT,
 		Action:               src.Action,
 		Permissions:          src.Permissions,
 		Meta:                 meta,
@@ -275,82 +263,6 @@ type SourceIntention struct {
 
 	// Peer is the name of the remote peer of the source service, if applicable.
 	Peer string `json:",omitempty"`
-
-	// SamenessGroup is the name of the sameness group, if applicable.
-	SamenessGroup string `json:",omitempty" alias:"sameness_group"`
-}
-
-type IntentionJWTRequirement struct {
-	// Providers is a list of providers to consider when verifying a JWT.
-	Providers []*IntentionJWTProvider `json:",omitempty"`
-}
-
-func (e *IntentionJWTRequirement) Clone() *IntentionJWTRequirement {
-	e2 := *e
-
-	e2.Providers = make([]*IntentionJWTProvider, len(e.Providers))
-	for i, src := range e.Providers {
-		e2.Providers[i] = src.Clone()
-	}
-	return &e2
-}
-
-func (p *IntentionJWTProvider) Validate() error {
-	if p.Name == "" {
-		return fmt.Errorf("JWT provider name is required")
-	}
-	return nil
-}
-
-func (e *IntentionJWTRequirement) Validate() error {
-	var result error
-
-	for _, provider := range e.Providers {
-		if err := provider.Validate(); err != nil {
-			result = multierror.Append(result, err)
-		}
-	}
-
-	return result
-}
-
-type IntentionJWTProvider struct {
-	// Name is the name of the JWT provider. There MUST be a corresponding
-	// "jwt-provider" config entry with this name.
-	Name string `json:",omitempty"`
-
-	// VerifyClaims is a list of additional claims to verify in a JWT's payload.
-	VerifyClaims []*IntentionJWTClaimVerification `json:",omitempty" alias:"verify_claims"`
-}
-
-func (e *IntentionJWTProvider) Clone() *IntentionJWTProvider {
-	e2 := *e
-
-	e2.VerifyClaims = make([]*IntentionJWTClaimVerification, len(e.VerifyClaims))
-	for i, src := range e.VerifyClaims {
-		e2.VerifyClaims[i] = src.Clone()
-	}
-	return &e2
-}
-
-type IntentionJWTClaimVerification struct {
-	// Path is the path to the claim in the token JSON.
-	Path []string `json:",omitempty"`
-
-	// Value is the expected value at the given path:
-	// - If the type at the path is a list then we verify
-	//   that this value is contained in the list.
-	//
-	// - If the type at the path is a string then we verify
-	//   that this value matches.
-	Value string `json:",omitempty"`
-}
-
-func (e *IntentionJWTClaimVerification) Clone() *IntentionJWTClaimVerification {
-	e2 := *e
-
-	e2.Path = stringslice.CloneStringSlice(e.Path)
-	return &e2
 }
 
 type IntentionPermission struct {
@@ -366,8 +278,6 @@ type IntentionPermission struct {
 
 	// If we ever add Sentinel support, this is one place we may
 	// wish to add it.
-
-	JWT *IntentionJWTRequirement `json:",omitempty"`
 }
 
 func (p *IntentionPermission) Clone() *IntentionPermission {
@@ -375,21 +285,9 @@ func (p *IntentionPermission) Clone() *IntentionPermission {
 	if p.HTTP != nil {
 		p2.HTTP = p.HTTP.Clone()
 	}
-	if p.JWT != nil {
-		p2.JWT = p.JWT.Clone()
-	}
 	return &p2
 }
 
-func (p *IntentionPermission) Validate() error {
-	var result error
-	if p.JWT != nil {
-		result = p.JWT.Validate()
-	}
-
-	return result
-}
-
 type IntentionHTTPPermission struct {
 	// PathExact, PathPrefix, and PathRegex are mutually exclusive.
 	PathExact  string `json:",omitempty" alias:"path_exact"`
@@ -532,13 +430,13 @@ func (e *ServiceIntentionsConfigEntry) normalize(legacyWrite bool) error {
 		// Normalize the source's namespace and partition.
 		// If the source is not peered, it inherits the destination's
 		// EnterpriseMeta.
-		if src.Peer != "" || src.SamenessGroup != "" {
-			// If the source is peered or a sameness group, normalize the namespace only,
-			// since they are mutually exclusive with partition.
-			src.EnterpriseMeta.NormalizeNamespace()
-		} else {
+		if src.Peer == "" {
 			src.EnterpriseMeta.MergeNoWildcard(&e.EnterpriseMeta)
 			src.EnterpriseMeta.Normalize()
+		} else {
+			// If the source is peered, normalize the namespace only,
+			// since peer is mutually exclusive with partition.
+			src.EnterpriseMeta.NormalizeNamespace()
 		}
 
 		// Compute the precedence only AFTER normalizing namespaces since the
@@ -655,18 +553,12 @@ func (e *ServiceIntentionsConfigEntry) validate(legacyWrite bool) error {
 		return fmt.Errorf("Name is required")
 	}
 
-	if err := validateIntentionWildcards(e.Name, &e.EnterpriseMeta, "", ""); err != nil {
+	if err := validateIntentionWildcards(e.Name, &e.EnterpriseMeta, ""); err != nil {
 		return err
 	}
 
 	destIsWild := e.HasWildcardDestination()
 
-	if e.JWT != nil {
-		if err := e.JWT.Validate(); err != nil {
-			return err
-		}
-	}
-
 	if legacyWrite {
 		if len(e.Meta) > 0 {
 			return fmt.Errorf("Meta must be omitted for legacy intention writes")
@@ -681,23 +573,13 @@ func (e *ServiceIntentionsConfigEntry) validate(legacyWrite bool) error {
 		return fmt.Errorf("At least one source is required")
 	}
 
-	type qualifiedServiceName struct {
-		ServiceName   ServiceName
-		Peer          string
-		SamenessGroup string
-	}
-
-	seenSources := make(map[qualifiedServiceName]struct{})
+	seenSources := make(map[PeeredServiceName]struct{})
 	for i, src := range e.Sources {
 		if src.Name == "" {
 			return fmt.Errorf("Sources[%d].Name is required", i)
 		}
 
-		if err := src.validateSamenessGroup(); err != nil {
-			return fmt.Errorf("Sources[%d].SamenessGroup: %v ", i, err)
-		}
-
-		if err := validateIntentionWildcards(src.Name, &src.EnterpriseMeta, src.Peer, src.SamenessGroup); err != nil {
+		if err := validateIntentionWildcards(src.Name, &src.EnterpriseMeta, src.Peer); err != nil {
 			return fmt.Errorf("Sources[%d].%v", i, err)
 		}
 
@@ -709,14 +591,6 @@ func (e *ServiceIntentionsConfigEntry) validate(legacyWrite bool) error {
 			return fmt.Errorf("Sources[%d].Peer: cannot set Peer and Partition at the same time.", i)
 		}
 
-		if src.SamenessGroup != "" && src.PartitionOrEmpty() != "" {
-			return fmt.Errorf("Sources[%d].SamenessGroup: cannot set SamenessGroup and Partition at the same time", i)
-		}
-
-		if src.SamenessGroup != "" && src.Peer != "" {
-			return fmt.Errorf("Sources[%d].SamenessGroup: cannot set SamenessGroup and Peer at the same time", i)
-		}
-
 		// Length of opaque values
 		if len(src.Description) > metaValueMaxLength {
 			return fmt.Errorf(
@@ -728,10 +602,6 @@ func (e *ServiceIntentionsConfigEntry) validate(legacyWrite bool) error {
 				return fmt.Errorf("Sources[%d].Peer cannot be set by legacy intentions", i)
 			}
 
-			if src.SamenessGroup != "" {
-				return fmt.Errorf("Sources[%d].SamenessGroup cannot be set by legacy intentions", i)
-			}
-
 			if len(src.LegacyMeta) > metaMaxKeyPairs {
 				return fmt.Errorf(
 					"Sources[%d].Meta exceeds maximum element count %d", i, metaMaxKeyPairs)
@@ -889,30 +759,24 @@ func (e *ServiceIntentionsConfigEntry) validate(legacyWrite bool) error {
 			if permParts == 0 {
 				return fmt.Errorf(errorPrefix+" should not be empty", i, j)
 			}
-
-			if err := perm.Validate(); err != nil {
-				return err
-			}
 		}
 
-		qsn := qualifiedServiceName{Peer: src.Peer, SamenessGroup: src.SamenessGroup, ServiceName: src.SourceServiceName()}
-		if _, exists := seenSources[qsn]; exists {
-			if qsn.Peer != "" {
-				return fmt.Errorf("Sources[%d] defines peer(%q) %q more than once", i, qsn.Peer, qsn.ServiceName.String())
-			} else if qsn.SamenessGroup != "" {
-				return fmt.Errorf("Sources[%d] defines sameness-group(%q) %q more than once", i, qsn.SamenessGroup, qsn.ServiceName.String())
+		psn := PeeredServiceName{Peer: src.Peer, ServiceName: src.SourceServiceName()}
+		if _, exists := seenSources[psn]; exists {
+			if psn.Peer != "" {
+				return fmt.Errorf("Sources[%d] defines peer(%q) %q more than once", i, psn.Peer, psn.ServiceName.String())
 			} else {
-				return fmt.Errorf("Sources[%d] defines %q more than once", i, qsn.ServiceName.String())
+				return fmt.Errorf("Sources[%d] defines %q more than once", i, psn.ServiceName.String())
 			}
 		}
-		seenSources[qsn] = struct{}{}
+		seenSources[psn] = struct{}{}
 	}
 
 	return nil
 }
 
 // Wildcard usage verification
-func validateIntentionWildcards(name string, entMeta *acl.EnterpriseMeta, peerName, samenessGroup string) error {
+func validateIntentionWildcards(name string, entMeta *acl.EnterpriseMeta, peerName string) error {
 	ns := entMeta.NamespaceOrDefault()
 	if ns != WildcardSpecifier {
 		if strings.Contains(ns, WildcardSpecifier) {
@@ -934,9 +798,6 @@ func validateIntentionWildcards(name string, entMeta *acl.EnterpriseMeta, peerNa
 	if strings.Contains(peerName, WildcardSpecifier) {
 		return fmt.Errorf("Peer: cannot use wildcard '*' in peer")
 	}
-	if strings.Contains(samenessGroup, WildcardSpecifier) {
-		return fmt.Errorf("SamenessGroup: cannot use wildcard '*' in sameness group")
-	}
 	return nil
 }
 
diff --git a/agent/structs/config_entry_intentions_ce.go b/agent/structs/config_entry_intentions_ce.go
index 83a09765def37..2628951f85bab 100644
--- a/agent/structs/config_entry_intentions_ce.go
+++ b/agent/structs/config_entry_intentions_ce.go
@@ -1,24 +1,12 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
 import (
-	"fmt"
-
 	"github.com/hashicorp/consul/acl"
 )
 
 func validateSourceIntentionEnterpriseMeta(_, _ *acl.EnterpriseMeta) error {
 	return nil
 }
-
-func (s *SourceIntention) validateSamenessGroup() error {
-	if s.SamenessGroup != "" {
-		return fmt.Errorf("Sameness groups are a Consul Enterprise feature.")
-	}
-
-	return nil
-}
diff --git a/agent/structs/config_entry_intentions_ce_test.go b/agent/structs/config_entry_intentions_ce_test.go
deleted file mode 100644
index 2a5f093be70d6..0000000000000
--- a/agent/structs/config_entry_intentions_ce_test.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package structs
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestEnterprise_ServiceIntentionsConfigEntry(t *testing.T) {
-	type testcase struct {
-		entry        *ServiceIntentionsConfigEntry
-		legacy       bool
-		normalizeErr string
-		validateErr  string
-		// check is called between normalize and validate
-		check func(t *testing.T, entry *ServiceIntentionsConfigEntry)
-	}
-
-	cases := map[string]testcase{
-		"No sameness groups": {
-			entry: &ServiceIntentionsConfigEntry{
-				Kind: ServiceIntentions,
-				Name: "test",
-				Sources: []*SourceIntention{
-					{
-						Name:          "foo",
-						SamenessGroup: "blah",
-						Action:        IntentionActionAllow,
-					},
-				},
-			},
-			validateErr: `Sources[0].SamenessGroup: Sameness groups are a Consul Enterprise feature.`,
-		},
-	}
-	for name, tc := range cases {
-		tc := tc
-		t.Run(name, func(t *testing.T) {
-			var err error
-			if tc.legacy {
-				err = tc.entry.LegacyNormalize()
-			} else {
-				err = tc.entry.Normalize()
-			}
-			if tc.normalizeErr != "" {
-				testutil.RequireErrorContains(t, err, tc.normalizeErr)
-				return
-			}
-			require.NoError(t, err)
-
-			if tc.check != nil {
-				tc.check(t, tc.entry)
-			}
-
-			if tc.legacy {
-				err = tc.entry.LegacyValidate()
-			} else {
-				err = tc.entry.Validate()
-			}
-			if tc.validateErr != "" {
-				testutil.RequireErrorContains(t, err, tc.validateErr)
-				return
-			}
-			require.NoError(t, err)
-		})
-	}
-}
diff --git a/agent/structs/config_entry_intentions_test.go b/agent/structs/config_entry_intentions_test.go
index ea8703de05d86..233ecebede207 100644
--- a/agent/structs/config_entry_intentions_test.go
+++ b/agent/structs/config_entry_intentions_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -1265,153 +1262,6 @@ func TestServiceIntentionsConfigEntry(t *testing.T) {
 			},
 			validateErr: `Sources[1] defines peer("peer1") "` + fooName.String() + `" more than once`,
 		},
-		"JWT - missing provider name": {
-			entry: &ServiceIntentionsConfigEntry{
-				Kind: ServiceIntentions,
-				Name: "test",
-				JWT: &IntentionJWTRequirement{
-					Providers: []*IntentionJWTProvider{
-						{
-							VerifyClaims: []*IntentionJWTClaimVerification{
-								{
-									Value: "api.apps.test.com",
-								},
-							},
-						},
-					},
-				},
-			},
-			validateErr: `JWT provider name is required`,
-		},
-		"JWT - missing 1 provider name with multiple providers": {
-			entry: &ServiceIntentionsConfigEntry{
-				Kind: ServiceIntentions,
-				Name: "test",
-				JWT: &IntentionJWTRequirement{
-					Providers: []*IntentionJWTProvider{
-						{
-							VerifyClaims: []*IntentionJWTClaimVerification{
-								{
-									Path:  []string{"aud"},
-									Value: "another-api.test.com",
-								},
-							},
-						},
-						{
-							Name: "okta",
-							VerifyClaims: []*IntentionJWTClaimVerification{
-								{
-									Path:  []string{"aud"},
-									Value: "api.apps.test.com",
-								},
-							},
-						},
-					},
-				},
-			},
-			validateErr: `JWT provider name is required`,
-		},
-		"JWT - missing provider name under permissions": {
-			entry: &ServiceIntentionsConfigEntry{
-				Kind: ServiceIntentions,
-				Name: "test",
-				Sources: []*SourceIntention{
-					{
-						Name: "foo",
-						Permissions: []*IntentionPermission{
-							{
-								Action: IntentionActionAllow,
-								HTTP: &IntentionHTTPPermission{
-									PathPrefix: "/foo",
-									Header: []IntentionHTTPHeaderPermission{
-										{
-											Name:  "x-abc",
-											Exact: "foo",
-										},
-										{
-											Name:    "x-xyz",
-											Present: true,
-											Invert:  true,
-										},
-									},
-									Methods: []string{"POST", "PUT", "GET"},
-								},
-								JWT: &IntentionJWTRequirement{
-									Providers: []*IntentionJWTProvider{
-										{
-											VerifyClaims: []*IntentionJWTClaimVerification{
-												{
-													Path:  []string{"aud"},
-													Value: "another-api.test.com",
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			validateErr: `JWT provider name is required`,
-		},
-		"valid JWTs": {
-			entry: &ServiceIntentionsConfigEntry{
-				Kind: ServiceIntentions,
-				Name: "test",
-				JWT: &IntentionJWTRequirement{
-					Providers: []*IntentionJWTProvider{
-						{
-							Name: "okta",
-							VerifyClaims: []*IntentionJWTClaimVerification{
-								{
-									Path:  []string{"aud"},
-									Value: "another-api.test.com",
-								},
-							},
-						},
-					},
-				},
-				Sources: []*SourceIntention{
-					{
-						Name: "foo",
-						Permissions: []*IntentionPermission{
-							{
-								Action: IntentionActionAllow,
-								HTTP: &IntentionHTTPPermission{
-									PathPrefix: "/foo",
-									Header: []IntentionHTTPHeaderPermission{
-										{
-											Name:  "x-abc",
-											Exact: "foo",
-										},
-										{
-											Name:    "x-xyz",
-											Present: true,
-											Invert:  true,
-										},
-									},
-									Methods: []string{"POST", "PUT", "GET"},
-								},
-								JWT: &IntentionJWTRequirement{
-									Providers: []*IntentionJWTProvider{
-										{
-											Name: "okta",
-											VerifyClaims: []*IntentionJWTClaimVerification{
-												{
-													Path:  []string{"aud"},
-													Value: "another-api.test.com",
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
 	}
 	for name, tc := range cases {
 		tc := tc
diff --git a/agent/structs/config_entry_jwt_provider.go b/agent/structs/config_entry_jwt_provider.go
deleted file mode 100644
index 12bc7c89d9ede..0000000000000
--- a/agent/structs/config_entry_jwt_provider.go
+++ /dev/null
@@ -1,550 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package structs
-
-import (
-	"encoding/base64"
-	"fmt"
-	"net/url"
-	"time"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/go-multierror"
-)
-
-const (
-	DefaultClockSkewSeconds = 30
-
-	DiscoveryTypeStrictDNS   ClusterDiscoveryType = "STRICT_DNS"
-	DiscoveryTypeStatic      ClusterDiscoveryType = "STATIC"
-	DiscoveryTypeLogicalDNS  ClusterDiscoveryType = "LOGICAL_DNS"
-	DiscoveryTypeEDS         ClusterDiscoveryType = "EDS"
-	DiscoveryTypeOriginalDST ClusterDiscoveryType = "ORIGINAL_DST"
-)
-
-type JWTProviderConfigEntry struct {
-	// Kind is the kind of configuration entry and must be "jwt-provider".
-	Kind string `json:",omitempty"`
-
-	// Name is the name of the provider being configured.
-	Name string `json:",omitempty"`
-
-	// JSONWebKeySet defines a JSON Web Key Set, its location on disk, or the
-	// means with which to fetch a key set from a remote server.
-	JSONWebKeySet *JSONWebKeySet `json:",omitempty" alias:"json_web_key_set"`
-
-	// Issuer is the entity that must have issued the JWT.
-	// This value must match the "iss" claim of the token.
-	Issuer string `json:",omitempty"`
-
-	// Audiences is the set of audiences the JWT is allowed to access.
-	// If specified, all JWTs verified with this provider must address
-	// at least one of these to be considered valid.
-	Audiences []string `json:",omitempty"`
-
-	// Locations where the JWT will be present in requests.
-	// Envoy will check all of these locations to extract a JWT.
-	// If no locations are specified Envoy will default to:
-	// 1. Authorization header with Bearer schema:
-	//    "Authorization: Bearer <token>"
-	// 2. access_token query parameter.
-	Locations []*JWTLocation `json:",omitempty"`
-
-	// Forwarding defines rules for forwarding verified JWTs to the backend.
-	Forwarding *JWTForwardingConfig `json:",omitempty"`
-
-	// ClockSkewSeconds specifies the maximum allowable time difference
-	// from clock skew when validating the "exp" (Expiration) and "nbf"
-	// (Not Before) claims.
-	//
-	// Default value is 30 seconds.
-	ClockSkewSeconds int `json:",omitempty" alias:"clock_skew_seconds"`
-
-	// CacheConfig defines configuration for caching the validation
-	// result for previously seen JWTs. Caching results can speed up
-	// verification when individual tokens are expected to be handled
-	// multiple times.
-	CacheConfig *JWTCacheConfig `json:",omitempty" alias:"cache_config"`
-
-	Meta               map[string]string `json:",omitempty"`
-	acl.EnterpriseMeta `hcl:",squash" mapstructure:",squash"`
-	RaftIndex
-}
-
-// JWTLocation is a location where the JWT could be present in requests.
-//
-// Only one of Header, QueryParam, or Cookie can be specified.
-type JWTLocation struct {
-	// Header defines how to extract a JWT from an HTTP request header.
-	Header *JWTLocationHeader `json:",omitempty"`
-
-	// QueryParam defines how to extract a JWT from an HTTP request
-	// query parameter.
-	QueryParam *JWTLocationQueryParam `json:",omitempty" alias:"query_param"`
-
-	// Cookie defines how to extract a JWT from an HTTP request cookie.
-	Cookie *JWTLocationCookie `json:",omitempty"`
-}
-
-func countTrue(vals ...bool) int {
-	var result int
-	for _, v := range vals {
-		if v {
-			result++
-		}
-	}
-	return result
-}
-
-func (location *JWTLocation) Validate() error {
-	hasHeader := location.Header != nil
-	hasQueryParam := location.QueryParam != nil
-	hasCookie := location.Cookie != nil
-
-	if countTrue(hasHeader, hasQueryParam, hasCookie) != 1 {
-		return fmt.Errorf("must set exactly one of: JWT location header, query param or cookie")
-	}
-
-	if hasHeader {
-		return location.Header.Validate()
-	}
-
-	if hasCookie {
-		return location.Cookie.Validate()
-	}
-
-	return location.QueryParam.Validate()
-}
-
-// JWTLocationHeader defines how to extract a JWT from an HTTP
-// request header.
-type JWTLocationHeader struct {
-	// Name is the name of the header containing the token.
-	Name string `json:",omitempty"`
-
-	// ValuePrefix is an optional prefix that precedes the token in the
-	// header value.
-	// For example, "Bearer " is a standard value prefix for a header named
-	// "Authorization", but the prefix is not part of the token itself:
-	// "Authorization: Bearer <token>"
-	ValuePrefix string `json:",omitempty" alias:"value_prefix"`
-
-	// Forward defines whether the header with the JWT should be
-	// forwarded after the token has been verified. If false, the
-	// header will not be forwarded to the backend.
-	//
-	// Default value is false.
-	Forward bool `json:",omitempty"`
-}
-
-// JWTLocationQueryParam defines how to extract a JWT from an HTTP request query parameter.
-type JWTLocationQueryParam struct {
-	// Name is the name of the query param containing the token.
-	Name string `json:",omitempty"`
-}
-
-func (qp *JWTLocationQueryParam) Validate() error {
-	if qp.Name == "" {
-		return fmt.Errorf("JWT location query param name must be specified")
-	}
-	return nil
-}
-
-// JWTLocationCookie defines how to extract a JWT from an HTTP request cookie.
-type JWTLocationCookie struct {
-	// Name is the name of the cookie containing the token.
-	Name string `json:",omitempty"`
-}
-
-type JWTForwardingConfig struct {
-	// HeaderName is a header name to use when forwarding a verified
-	// JWT to the backend. The verified JWT could have been extracted
-	// from any location (query param, header, or cookie).
-	//
-	// The header value will be base64-URL-encoded, and will not be
-	// padded unless PadForwardPayloadHeader is true.
-	HeaderName string `json:",omitempty" alias:"header_name"`
-
-	// PadForwardPayloadHeader determines whether padding should be added
-	// to the base64 encoded token forwarded with ForwardPayloadHeader.
-	//
-	// Default value is false.
-	PadForwardPayloadHeader bool `alias:"pad_forward_payload_header"`
-}
-
-func (fc *JWTForwardingConfig) Validate() error {
-	if fc.HeaderName == "" {
-		return fmt.Errorf("Header name required for forwarding config")
-	}
-
-	return nil
-}
-
-// JSONWebKeySet defines a key set, its location on disk, or the
-// means with which to fetch a key set from a remote server.
-//
-// Exactly one of Local or Remote must be specified.
-type JSONWebKeySet struct {
-	// Local specifies a local source for the key set.
-	Local *LocalJWKS `json:",omitempty"`
-
-	// Remote specifies how to fetch a key set from a remote server.
-	Remote *RemoteJWKS `json:",omitempty"`
-}
-
-// LocalJWKS specifies a location for a local JWKS.
-//
-// Only one of String and Filename can be specified.
-type LocalJWKS struct {
-	// JWKS contains a base64 encoded JWKS.
-	JWKS string `json:",omitempty"`
-
-	// Filename configures a location on disk where the JWKS can be
-	// found. If specified, the file must be present on the disk of ALL
-	// proxies with intentions referencing this provider.
-	Filename string `json:",omitempty"`
-}
-
-func (ks *LocalJWKS) Validate() error {
-	hasFilename := ks.Filename != ""
-	hasJWKS := ks.JWKS != ""
-
-	if countTrue(hasFilename, hasJWKS) != 1 {
-		return fmt.Errorf("must specify exactly one of String or filename for local keyset")
-	}
-
-	if hasJWKS {
-		if _, err := base64.StdEncoding.DecodeString(ks.JWKS); err != nil {
-			return fmt.Errorf("JWKS must be valid base64 encoded string")
-		}
-	}
-
-	return nil
-}
-
-// RemoteJWKS specifies how to fetch a JWKS from a remote server.
-type RemoteJWKS struct {
-	// URI is the URI of the server to query for the JWKS.
-	URI string `json:",omitempty"`
-
-	// RequestTimeoutMs is the number of milliseconds to
-	// time out when making a request for the JWKS.
-	RequestTimeoutMs int `json:",omitempty" alias:"request_timeout_ms"`
-
-	// CacheDuration is the duration after which cached keys
-	// should be expired.
-	//
-	// Default value from envoy is 10 minutes.
-	CacheDuration time.Duration `json:",omitempty" alias:"cache_duration"`
-
-	// FetchAsynchronously indicates that the JWKS should be fetched
-	// when a client request arrives. Client requests will be paused
-	// until the JWKS is fetched.
-	// If false, the proxy listener will wait for the JWKS to be
-	// fetched before being activated.
-	//
-	// Default value is false.
-	FetchAsynchronously bool `json:",omitempty" alias:"fetch_asynchronously"`
-
-	// RetryPolicy defines a retry policy for fetching JWKS.
-	//
-	// There is no retry by default.
-	RetryPolicy *JWKSRetryPolicy `json:",omitempty" alias:"retry_policy"`
-
-	// JWKSCluster defines how the specified Remote JWKS URI is to be fetched.
-	JWKSCluster *JWKSCluster `json:",omitempty" alias:"jwks_cluster"`
-}
-
-func (ks *RemoteJWKS) Validate() error {
-	if ks.URI == "" {
-		return fmt.Errorf("Remote JWKS URI is required")
-	}
-
-	if _, err := url.ParseRequestURI(ks.URI); err != nil {
-		return fmt.Errorf("Remote JWKS URI is invalid: %w, uri: %s", err, ks.URI)
-	}
-
-	if ks.RetryPolicy != nil && ks.RetryPolicy.RetryPolicyBackOff != nil {
-		err := ks.RetryPolicy.RetryPolicyBackOff.Validate()
-		if err != nil {
-			return err
-		}
-	}
-
-	if ks.JWKSCluster != nil {
-		return ks.JWKSCluster.Validate()
-	}
-
-	return nil
-}
-
-type JWKSCluster struct {
-	// DiscoveryType refers to the service discovery type to use for resolving the cluster.
-	//
-	// This defaults to STRICT_DNS.
-	// Other options include STATIC, LOGICAL_DNS, EDS or ORIGINAL_DST.
-	DiscoveryType ClusterDiscoveryType `json:",omitempty" alias:"discovery_type"`
-
-	// TLSCertificates refers to the data containing certificate authority certificates to use
-	// in verifying a presented peer certificate.
-	// If not specified and a peer certificate is presented it will not be verified.
-	//
-	// Must be either CaCertificateProviderInstance or TrustedCA.
-	TLSCertificates *JWKSTLSCertificate `json:",omitempty" alias:"tls_certificates"`
-
-	// The timeout for new network connections to hosts in the cluster.
-	// If not set, a default value of 5s will be used.
-	ConnectTimeout time.Duration `json:",omitempty" alias:"connect_timeout"`
-}
-
-type ClusterDiscoveryType string
-
-func (d ClusterDiscoveryType) Validate() error {
-	switch d {
-	case DiscoveryTypeStatic, DiscoveryTypeStrictDNS, DiscoveryTypeLogicalDNS, DiscoveryTypeEDS, DiscoveryTypeOriginalDST:
-		return nil
-	default:
-		return fmt.Errorf("unsupported jwks cluster discovery type: %q", d)
-	}
-}
-
-func (c *JWKSCluster) Validate() error {
-	if c.DiscoveryType != "" {
-		err := c.DiscoveryType.Validate()
-		if err != nil {
-			return err
-		}
-	}
-
-	if c.TLSCertificates != nil {
-		return c.TLSCertificates.Validate()
-	}
-	return nil
-}
-
-// JWKSTLSCertificate refers to the data containing certificate authority certificates to use
-// in verifying a presented peer certificate.
-// If not specified and a peer certificate is presented it will not be verified.
-//
-// Must be either CaCertificateProviderInstance or TrustedCA.
-type JWKSTLSCertificate struct {
-	// CaCertificateProviderInstance Certificate provider instance for fetching TLS certificates.
-	CaCertificateProviderInstance *JWKSTLSCertProviderInstance `json:",omitempty" alias:"ca_certificate_provider_instance"`
-
-	// TrustedCA defines TLS certificate data containing certificate authority certificates
-	// to use in verifying a presented peer certificate.
-	//
-	// Exactly one of Filename, EnvironmentVariable, InlineString or InlineBytes must be specified.
-	TrustedCA *JWKSTLSCertTrustedCA `json:",omitempty" alias:"trusted_ca"`
-}
-
-func (c *JWKSTLSCertificate) Validate() error {
-	hasProviderInstance := c.CaCertificateProviderInstance != nil
-	hasTrustedCA := c.TrustedCA != nil
-
-	if countTrue(hasProviderInstance, hasTrustedCA) != 1 {
-		return fmt.Errorf("must specify exactly one of: CaCertificateProviderInstance or TrustedCA for JKWS' TLSCertificates")
-	}
-
-	if c.TrustedCA != nil {
-		return c.TrustedCA.Validate()
-	}
-	return nil
-}
-
-type JWKSTLSCertProviderInstance struct {
-	// InstanceName refers to the certificate provider instance name
-	//
-	// The default value is "default".
-	InstanceName string `json:",omitempty" alias:"instance_name"`
-
-	// CertificateName is used to specify certificate instances or types. For example, "ROOTCA" to specify
-	// a root-certificate (validation context) or "example.com" to specify a certificate for a
-	// particular domain.
-	//
-	// The default value is the empty string.
-	CertificateName string `json:",omitempty" alias:"certificate_name"`
-}
-
-// JWKSTLSCertTrustedCA defines TLS certificate data containing certificate authority certificates
-// to use in verifying a presented peer certificate.
-//
-// Exactly one of Filename, EnvironmentVariable, InlineString or InlineBytes must be specified.
-type JWKSTLSCertTrustedCA struct {
-	Filename            string `json:",omitempty" alias:"filename"`
-	EnvironmentVariable string `json:",omitempty" alias:"environment_variable"`
-	InlineString        string `json:",omitempty" alias:"inline_string"`
-	InlineBytes         []byte `json:",omitempty" alias:"inline_bytes"`
-}
-
-func (c *JWKSTLSCertTrustedCA) Validate() error {
-	hasFilename := c.Filename != ""
-	hasEnv := c.EnvironmentVariable != ""
-	hasInlineBytes := len(c.InlineBytes) > 0
-	hasInlineString := c.InlineString != ""
-
-	if countTrue(hasFilename, hasEnv, hasInlineString, hasInlineBytes) != 1 {
-		return fmt.Errorf("must specify exactly one of: Filename, EnvironmentVariable, InlineString or InlineBytes for JWKS' TrustedCA")
-	}
-	return nil
-}
-
-type JWKSRetryPolicy struct {
-	// NumRetries is the number of times to retry fetching the JWKS.
-	// The retry strategy uses jittered exponential backoff with
-	// a base interval of 1s and max of 10s.
-	//
-	// Default value is 0.
-	NumRetries int `json:",omitempty" alias:"num_retries"`
-
-	// Backoff policy
-	//
-	// Defaults to envoy's backoff policy
-	RetryPolicyBackOff *RetryPolicyBackOff `json:",omitempty" alias:"retry_policy_back_off"`
-}
-
-type RetryPolicyBackOff struct {
-	// BaseInterval to be used for the next back off computation
-	//
-	// The default value from envoy is 1s
-	BaseInterval time.Duration `json:",omitempty" alias:"base_interval"`
-
-	// MaxInternal to be used to specify the maximum interval between retries.
-	// Optional but should be greater or equal to BaseInterval.
-	//
-	// Defaults to 10 times BaseInterval
-	MaxInterval time.Duration `json:",omitempty" alias:"max_interval"`
-}
-
-func (r *RetryPolicyBackOff) Validate() error {
-
-	if (r.MaxInterval != 0) && (r.BaseInterval > r.MaxInterval) {
-		return fmt.Errorf("retry policy backoff's MaxInterval should be greater or equal to BaseInterval")
-	}
-
-	return nil
-}
-
-type JWTCacheConfig struct {
-	// Size specifies the maximum number of JWT verification
-	// results to cache.
-	//
-	// Defaults to 0, meaning that JWT caching is disabled.
-	Size int `json:",omitempty"`
-}
-
-func (e *JWTProviderConfigEntry) GetKind() string                        { return JWTProvider }
-func (e *JWTProviderConfigEntry) GetName() string                        { return e.Name }
-func (e *JWTProviderConfigEntry) GetMeta() map[string]string             { return e.Meta }
-func (e *JWTProviderConfigEntry) GetEnterpriseMeta() *acl.EnterpriseMeta { return &e.EnterpriseMeta }
-func (e *JWTProviderConfigEntry) GetRaftIndex() *RaftIndex               { return &e.RaftIndex }
-
-func (e *JWTProviderConfigEntry) CanRead(authz acl.Authorizer) error {
-	var authzContext acl.AuthorizerContext
-	e.FillAuthzContext(&authzContext)
-
-	// allow service-identity tokens the ability to read jwt-providers
-	// this is a workaround to allow sidecar proxies to read the jwt-providers
-	// see issue: https://github.com/hashicorp/consul/issues/17886 for more details
-	err := authz.ToAllowAuthorizer().ServiceWriteAnyAllowed(&authzContext)
-	if err == nil {
-		return err
-	}
-
-	return authz.ToAllowAuthorizer().MeshReadAllowed(&authzContext)
-}
-
-func (e *JWTProviderConfigEntry) CanWrite(authz acl.Authorizer) error {
-	var authzContext acl.AuthorizerContext
-	e.FillAuthzContext(&authzContext)
-	return authz.ToAllowAuthorizer().MeshWriteAllowed(&authzContext)
-}
-
-func (jwks *JSONWebKeySet) Validate() error {
-	hasLocalKeySet := jwks.Local != nil
-	hasRemoteKeySet := jwks.Remote != nil
-
-	if countTrue(hasLocalKeySet, hasRemoteKeySet) != 1 {
-		return fmt.Errorf("must specify exactly one of Local or Remote JSON Web key set")
-	}
-
-	if hasRemoteKeySet {
-		return jwks.Remote.Validate()
-	}
-
-	return jwks.Local.Validate()
-}
-
-func (lh *JWTLocationHeader) Validate() error {
-	if lh.Name == "" {
-		return fmt.Errorf("JWT location header name must be specified")
-	}
-	return nil
-}
-
-func (lc *JWTLocationCookie) Validate() error {
-	if lc.Name == "" {
-		return fmt.Errorf("JWT location cookie name must be specified")
-	}
-	return nil
-}
-
-func validateLocations(locations []*JWTLocation) error {
-	var result error
-	for _, location := range locations {
-		if err := location.Validate(); err != nil {
-			result = multierror.Append(result, err)
-		}
-	}
-	return result
-}
-
-func (e *JWTProviderConfigEntry) Validate() error {
-	if e.Name == "" {
-		return fmt.Errorf("Name is required")
-	}
-
-	if err := validateConfigEntryMeta(e.Meta); err != nil {
-		return err
-	}
-
-	if err := e.validatePartitionAndNamespace(); err != nil {
-		return err
-	}
-
-	if e.JSONWebKeySet == nil {
-		return fmt.Errorf("JSONWebKeySet is required")
-	}
-
-	if err := e.JSONWebKeySet.Validate(); err != nil {
-		return err
-	}
-
-	if err := validateLocations(e.Locations); err != nil {
-		return err
-	}
-
-	if e.Forwarding != nil {
-		if err := e.Forwarding.Validate(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (e *JWTProviderConfigEntry) Normalize() error {
-	if e == nil {
-		return fmt.Errorf("Config entry is nil")
-	}
-
-	e.Kind = JWTProvider
-	e.EnterpriseMeta.Normalize()
-
-	if e.ClockSkewSeconds == 0 {
-		e.ClockSkewSeconds = DefaultClockSkewSeconds
-	}
-
-	return nil
-}
diff --git a/agent/structs/config_entry_jwt_provider_ce.go b/agent/structs/config_entry_jwt_provider_ce.go
deleted file mode 100644
index 4ec86f8ce04c3..0000000000000
--- a/agent/structs/config_entry_jwt_provider_ce.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package structs
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/acl"
-)
-
-func (e *JWTProviderConfigEntry) validatePartitionAndNamespace() error {
-	if !acl.IsDefaultPartition(e.PartitionOrDefault()) {
-		return fmt.Errorf("Partitions are an enterprise only feature")
-	}
-
-	if acl.DefaultNamespaceName != e.NamespaceOrDefault() {
-		return fmt.Errorf("Namespaces are an enterprise only feature")
-	}
-
-	return nil
-}
diff --git a/agent/structs/config_entry_jwt_provider_test.go b/agent/structs/config_entry_jwt_provider_test.go
deleted file mode 100644
index 6a117fe5084f4..0000000000000
--- a/agent/structs/config_entry_jwt_provider_test.go
+++ /dev/null
@@ -1,462 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package structs
-
-import (
-	"testing"
-	"time"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/stretchr/testify/require"
-)
-
-func newTestAuthz(t *testing.T, src string) acl.Authorizer {
-	policy, err := acl.NewPolicyFromSource(src, nil, nil)
-	require.NoError(t, err)
-
-	authorizer, err := acl.NewPolicyAuthorizerWithDefaults(acl.DenyAll(), []*acl.Policy{policy}, nil)
-	require.NoError(t, err)
-	return authorizer
-}
-
-var tenSeconds time.Duration = 10 * time.Second
-var hundredSeconds time.Duration = 100 * time.Second
-var connectTimeout = time.Duration(5) * time.Second
-
-func TestJWTProviderConfigEntry_ValidateAndNormalize(t *testing.T) {
-	defaultMeta := DefaultEnterpriseMetaInDefaultPartition()
-
-	cases := map[string]configEntryTestcase{
-		"valid jwt-provider - local jwks": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "test-jwt-provider",
-				JSONWebKeySet: &JSONWebKeySet{
-					Local: &LocalJWKS{
-						Filename: "jwks.txt",
-					},
-				},
-			},
-			expected: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "test-jwt-provider",
-				JSONWebKeySet: &JSONWebKeySet{
-					Local: &LocalJWKS{
-						Filename: "jwks.txt",
-					},
-				},
-				ClockSkewSeconds: DefaultClockSkewSeconds,
-				EnterpriseMeta:   *defaultMeta,
-			},
-		},
-		"valid jwt-provider - remote jwks defaults": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "test-jwt-provider",
-				JSONWebKeySet: &JSONWebKeySet{
-					Remote: &RemoteJWKS{
-						FetchAsynchronously: true,
-						URI:                 "https://example.com/.well-known/jwks.json",
-					},
-				},
-				Locations: []*JWTLocation{
-					{
-						Header: &JWTLocationHeader{
-							Name: "Authorization",
-						},
-					},
-				},
-				Forwarding: &JWTForwardingConfig{
-					HeaderName: "Some-Header",
-				},
-			},
-			expected: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "test-jwt-provider",
-				JSONWebKeySet: &JSONWebKeySet{
-					Remote: &RemoteJWKS{
-						FetchAsynchronously: true,
-						URI:                 "https://example.com/.well-known/jwks.json",
-					},
-				},
-				Forwarding: &JWTForwardingConfig{
-					HeaderName: "Some-Header",
-				},
-				Locations: []*JWTLocation{
-					{
-						Header: &JWTLocationHeader{
-							Name: "Authorization",
-						},
-					},
-				},
-				ClockSkewSeconds: DefaultClockSkewSeconds,
-				EnterpriseMeta:   *defaultMeta,
-			},
-		},
-		"invalid jwt-provider - no name": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "",
-			},
-			validateErr: "Name is required",
-		},
-		"invalid jwt-provider - no jwks": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "okta",
-			},
-			validateErr: "JSONWebKeySet is required",
-		},
-		"invalid jwt-provider - no jwks local or remote set": {
-			entry: &JWTProviderConfigEntry{
-				Kind:          JWTProvider,
-				Name:          "okta",
-				JSONWebKeySet: &JSONWebKeySet{},
-			},
-			validateErr: "must specify exactly one of Local or Remote JSON Web key set",
-		},
-		"invalid jwt-provider - local jwks with non-encoded base64 jwks": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "okta",
-				JSONWebKeySet: &JSONWebKeySet{
-					Local: &LocalJWKS{
-						JWKS: "not base64 encoded",
-					},
-				},
-			},
-			validateErr: "JWKS must be valid base64 encoded string",
-		},
-		"invalid jwt-provider - both jwks local and remote set": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "okta",
-				JSONWebKeySet: &JSONWebKeySet{
-					Local: &LocalJWKS{
-						Filename: "jwks.txt",
-					},
-					Remote: &RemoteJWKS{},
-				},
-			},
-			validateErr: "must specify exactly one of Local or Remote JSON Web key set",
-		},
-		"invalid jwt-provider - local jwks string and filename both set": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "okta",
-				JSONWebKeySet: &JSONWebKeySet{
-					Local: &LocalJWKS{
-						Filename: "jwks.txt",
-						JWKS:     "d2VhcmV0ZXN0aW5n",
-					},
-				},
-			},
-			validateErr: "must specify exactly one of String or filename for local keyset",
-		},
-		"invalid jwt-provider - remote jwks missing uri": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "okta",
-				JSONWebKeySet: &JSONWebKeySet{
-					Remote: &RemoteJWKS{
-						FetchAsynchronously: true,
-					},
-				},
-			},
-			validateErr: "Remote JWKS URI is required",
-		},
-		"invalid jwt-provider - remote jwks invalid uri": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "okta",
-				JSONWebKeySet: &JSONWebKeySet{
-					Remote: &RemoteJWKS{
-						FetchAsynchronously: true,
-						URI:                 "jibberishUrl",
-					},
-				},
-			},
-			validateErr: "Remote JWKS URI is invalid",
-		},
-		"invalid jwt-provider - JWT location with all fields": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "okta",
-				JSONWebKeySet: &JSONWebKeySet{
-					Remote: &RemoteJWKS{
-						FetchAsynchronously: true,
-						URI:                 "https://example.com/.well-known/jwks.json",
-					},
-				},
-				Locations: []*JWTLocation{
-					{
-						Header: &JWTLocationHeader{
-							Name: "Authorization",
-						},
-						QueryParam: &JWTLocationQueryParam{
-							Name: "TOKEN-QUERY",
-						},
-						Cookie: &JWTLocationCookie{
-							Name: "SomeCookie",
-						},
-					},
-				},
-			},
-			validateErr: "must set exactly one of: JWT location header, query param or cookie",
-		},
-		"invalid jwt-provider - Remote JWKS retry policy maxinterval < baseInterval": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "okta",
-				JSONWebKeySet: &JSONWebKeySet{
-					Remote: &RemoteJWKS{
-						FetchAsynchronously: true,
-						URI:                 "https://example.com/.well-known/jwks.json",
-						RetryPolicy: &JWKSRetryPolicy{
-							RetryPolicyBackOff: &RetryPolicyBackOff{
-								BaseInterval: hundredSeconds,
-								MaxInterval:  tenSeconds,
-							},
-						},
-					},
-				},
-			},
-			validateErr: "retry policy backoff's MaxInterval should be greater or equal to BaseInterval",
-		},
-		"invalid jwt-provider - Remote JWKS cluster wrong discovery type": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "okta",
-				JSONWebKeySet: &JSONWebKeySet{
-					Remote: &RemoteJWKS{
-						FetchAsynchronously: true,
-						URI:                 "https://example.com/.well-known/jwks.json",
-						JWKSCluster: &JWKSCluster{
-							DiscoveryType: "FAKE",
-						},
-					},
-				},
-			},
-			validateErr: "unsupported jwks cluster discovery type: \"FAKE\"",
-		},
-		"invalid jwt-provider - Remote JWKS cluster with both trustedCa and provider instance": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "okta",
-				JSONWebKeySet: &JSONWebKeySet{
-					Remote: &RemoteJWKS{
-						FetchAsynchronously: true,
-						URI:                 "https://example.com/.well-known/jwks.json",
-						JWKSCluster: &JWKSCluster{
-							TLSCertificates: &JWKSTLSCertificate{
-								TrustedCA:                     &JWKSTLSCertTrustedCA{},
-								CaCertificateProviderInstance: &JWKSTLSCertProviderInstance{},
-							},
-						},
-					},
-				},
-			},
-			validateErr: "must specify exactly one of: CaCertificateProviderInstance or TrustedCA for JKWS' TLSCertificates",
-		},
-		"invalid jwt-provider - Remote JWKS cluster with multiple trustedCa options": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "okta",
-				JSONWebKeySet: &JSONWebKeySet{
-					Remote: &RemoteJWKS{
-						FetchAsynchronously: true,
-						URI:                 "https://example.com/.well-known/jwks.json",
-						JWKSCluster: &JWKSCluster{
-							TLSCertificates: &JWKSTLSCertificate{
-								TrustedCA: &JWKSTLSCertTrustedCA{
-									Filename:     "myfile.cert",
-									InlineString: "*****",
-								},
-							},
-						},
-					},
-				},
-			},
-			validateErr: "must specify exactly one of: Filename, EnvironmentVariable, InlineString or InlineBytes for JWKS' TrustedCA",
-		},
-		"invalid jwt-provider - JWT location with 2 fields": {
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "okta",
-				JSONWebKeySet: &JSONWebKeySet{
-					Remote: &RemoteJWKS{
-						FetchAsynchronously: true,
-						URI:                 "https://example.com/.well-known/jwks.json",
-					},
-				},
-				Locations: []*JWTLocation{
-					{
-						Header: &JWTLocationHeader{
-							Name: "Authorization",
-						},
-						QueryParam: &JWTLocationQueryParam{
-							Name: "TOKEN-QUERY",
-						},
-					},
-				},
-			},
-			validateErr: "must set exactly one of: JWT location header, query param or cookie",
-		},
-		"valid jwt-provider - with all possible fields": {
-			entry: &JWTProviderConfigEntry{
-				Kind:      JWTProvider,
-				Name:      "test-jwt-provider",
-				Issuer:    "iss",
-				Audiences: []string{"api", "web"},
-				CacheConfig: &JWTCacheConfig{
-					Size: 30,
-				},
-				JSONWebKeySet: &JSONWebKeySet{
-					Remote: &RemoteJWKS{
-						FetchAsynchronously: true,
-						URI:                 "https://example.com/.well-known/jwks.json",
-						RetryPolicy: &JWKSRetryPolicy{
-							RetryPolicyBackOff: &RetryPolicyBackOff{
-								BaseInterval: tenSeconds,
-								MaxInterval:  hundredSeconds,
-							},
-						},
-						JWKSCluster: &JWKSCluster{
-							DiscoveryType:  "STATIC",
-							ConnectTimeout: connectTimeout,
-							TLSCertificates: &JWKSTLSCertificate{
-								TrustedCA: &JWKSTLSCertTrustedCA{
-									Filename: "myfile.cert",
-								},
-							},
-						},
-					},
-				},
-				Forwarding: &JWTForwardingConfig{
-					HeaderName: "Some-Header",
-				},
-				Locations: []*JWTLocation{
-					{
-						Cookie: &JWTLocationCookie{
-							Name: "SomeCookie",
-						},
-					},
-				},
-				ClockSkewSeconds: 20,
-			},
-			expected: &JWTProviderConfigEntry{
-				Kind:      JWTProvider,
-				Name:      "test-jwt-provider",
-				Issuer:    "iss",
-				Audiences: []string{"api", "web"},
-				CacheConfig: &JWTCacheConfig{
-					Size: 30,
-				},
-				JSONWebKeySet: &JSONWebKeySet{
-					Remote: &RemoteJWKS{
-						FetchAsynchronously: true,
-						URI:                 "https://example.com/.well-known/jwks.json",
-						RetryPolicy: &JWKSRetryPolicy{
-							RetryPolicyBackOff: &RetryPolicyBackOff{
-								BaseInterval: tenSeconds,
-								MaxInterval:  hundredSeconds,
-							},
-						},
-						JWKSCluster: &JWKSCluster{
-							DiscoveryType:  "STATIC",
-							ConnectTimeout: connectTimeout,
-							TLSCertificates: &JWKSTLSCertificate{
-								TrustedCA: &JWKSTLSCertTrustedCA{
-									Filename: "myfile.cert",
-								},
-							},
-						},
-					},
-				},
-				Forwarding: &JWTForwardingConfig{
-					HeaderName: "Some-Header",
-				},
-				Locations: []*JWTLocation{
-					{
-						Cookie: &JWTLocationCookie{
-							Name: "SomeCookie",
-						},
-					},
-				},
-				ClockSkewSeconds: 20,
-				EnterpriseMeta:   *defaultMeta,
-			},
-		},
-	}
-
-	testConfigEntryNormalizeAndValidate(t, cases)
-}
-
-func TestJWTProviderConfigEntry_ACLs(t *testing.T) {
-	cases := []configEntryACLTestCase{
-		{
-			name: "jwt-provider",
-			entry: &JWTProviderConfigEntry{
-				Kind: JWTProvider,
-				Name: "test-provider",
-				JSONWebKeySet: &JSONWebKeySet{
-					Local: &LocalJWKS{
-						Filename: "jwks.txt",
-					},
-				},
-			},
-			expectACLs: []configEntryTestACL{
-				{
-					name:       "no-authz",
-					authorizer: newTestAuthz(t, ``),
-					canRead:    false,
-					canWrite:   false,
-				},
-				{
-					name:       "jwt-provider: any service write",
-					authorizer: newTestAuthz(t, `service "" { policy = "write" }`),
-					canRead:    true,
-					canWrite:   false,
-				},
-				{
-					name:       "jwt-provider: specific service write",
-					authorizer: newTestAuthz(t, `service "web" { policy = "write" }`),
-					canRead:    true,
-					canWrite:   false,
-				},
-				{
-					name:       "jwt-provider: any service prefix write",
-					authorizer: newTestAuthz(t, `service_prefix "" { policy = "write" }`),
-					canRead:    true,
-					canWrite:   false,
-				},
-				{
-					name:       "jwt-provider: mesh read",
-					authorizer: newTestAuthz(t, `mesh = "read"`),
-					canRead:    true,
-					canWrite:   false,
-				},
-				{
-					name:       "jwt-provider: mesh write",
-					authorizer: newTestAuthz(t, `mesh = "write"`),
-					canRead:    true,
-					canWrite:   true,
-				},
-				{
-					name:       "jwt-provider: operator read",
-					authorizer: newTestAuthz(t, `operator = "read"`),
-					canRead:    true,
-					canWrite:   false,
-				},
-				{
-					name:       "jwt-provider: operator write",
-					authorizer: newTestAuthz(t, `operator = "write"`),
-					canRead:    true,
-					canWrite:   true,
-				},
-			},
-		},
-	}
-	testConfigEntries_ListRelatedServices_AndACLs(t, cases)
-}
diff --git a/agent/structs/config_entry_mesh.go b/agent/structs/config_entry_mesh.go
index a531821650d83..b599dbd537fcb 100644
--- a/agent/structs/config_entry_mesh.go
+++ b/agent/structs/config_entry_mesh.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -16,10 +13,6 @@ type MeshConfigEntry struct {
 	// when enabled.
 	TransparentProxy TransparentProxyMeshConfig `alias:"transparent_proxy"`
 
-	// AllowEnablingPermissiveMutualTLS must be true in order to allow setting
-	// MutualTLSMode=permissive in either service-defaults or proxy-defaults.
-	AllowEnablingPermissiveMutualTLS bool `json:",omitempty" alias:"allow_enabling_permissive_mutual_tls"`
-
 	TLS *MeshTLSConfig `json:",omitempty"`
 
 	HTTP *MeshHTTPConfig `json:",omitempty"`
diff --git a/agent/structs/config_entry_mesh_ce.go b/agent/structs/config_entry_mesh_ce.go
index 74c646361a465..087edc8e56002 100644
--- a/agent/structs/config_entry_mesh_ce.go
+++ b/agent/structs/config_entry_mesh_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
diff --git a/agent/structs/config_entry_mesh_test.go b/agent/structs/config_entry_mesh_test.go
index f6eaea9e9c546..b618bf55bdc1d 100644
--- a/agent/structs/config_entry_mesh_test.go
+++ b/agent/structs/config_entry_mesh_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/config_entry_routes.go b/agent/structs/config_entry_routes.go
index 7f764c93c725a..d77c9dc7735f9 100644
--- a/agent/structs/config_entry_routes.go
+++ b/agent/structs/config_entry_routes.go
@@ -1,13 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
 	"errors"
 	"fmt"
 	"strings"
-	"time"
 
 	"github.com/miekg/dns"
 
@@ -343,38 +339,6 @@ type HTTPMatch struct {
 	Query   []HTTPQueryMatch
 }
 
-func (m HTTPMatch) DeepEqual(other HTTPMatch) bool {
-	if m.Method != other.Method {
-		return false
-	}
-
-	if m.Path != other.Path {
-		return false
-	}
-
-	if len(m.Headers) != len(other.Headers) {
-		return false
-	}
-
-	if len(m.Query) != len(other.Query) {
-		return false
-	}
-
-	for i := 0; i < len(m.Headers); i++ {
-		if m.Headers[i] != other.Headers[i] {
-			return false
-		}
-	}
-
-	for i := 0; i < len(m.Query); i++ {
-		if m.Query[i] != other.Query[i] {
-			return false
-		}
-	}
-
-	return true
-}
-
 // HTTPMatchMethod specifies which type of HTTP verb should
 // be used for matching a given request.
 type HTTPMatchMethod string
@@ -450,17 +414,8 @@ type HTTPQueryMatch struct {
 // HTTPFilters specifies a list of filters used to modify a request
 // before it is routed to an upstream.
 type HTTPFilters struct {
-	Headers       []HTTPHeaderFilter
-	URLRewrite    *URLRewrite
-	RetryFilter   *RetryFilter
-	TimeoutFilter *TimeoutFilter
-	JWT           *JWTFilter
-}
-
-// HTTPResponseFilters specifies a list of filters used to modify the
-// response returned by an upstream
-type HTTPResponseFilters struct {
-	Headers []HTTPHeaderFilter
+	Headers    []HTTPHeaderFilter
+	URLRewrite *URLRewrite
 }
 
 // HTTPHeaderFilter specifies how HTTP headers should be modified.
@@ -474,27 +429,12 @@ type URLRewrite struct {
 	Path string
 }
 
-type RetryFilter struct {
-	NumRetries            *uint32
-	RetryOn               []string
-	RetryOnStatusCodes    []uint32
-	RetryOnConnectFailure *bool
-}
-
-type TimeoutFilter struct {
-	RequestTimeout time.Duration
-	IdleTimeout    time.Duration
-}
-
 // HTTPRouteRule specifies the routing rules used to determine what upstream
 // service an HTTP request is routed to.
 type HTTPRouteRule struct {
 	// Filters is a list of HTTP-based filters used to modify a request prior
 	// to routing it to the upstream service
 	Filters HTTPFilters
-	// ResponseFilters is a list of HTTP-based filters used to modify a response
-	// returned by the upstream service
-	ResponseFilters HTTPResponseFilters
 	// Matches specified the matching criteria used in the routing table. If a
 	// request matches the given HTTPMatch configuration, then traffic is routed
 	// to services specified in the Services field.
@@ -514,10 +454,6 @@ type HTTPService struct {
 	// to routing it to the upstream service
 	Filters HTTPFilters
 
-	// ResponseFilters is a list of HTTP-based filters used to modify the
-	// response returned from the upstream service
-	ResponseFilters HTTPResponseFilters
-
 	acl.EnterpriseMeta `hcl:",squash" mapstructure:",squash"`
 }
 
diff --git a/agent/structs/config_entry_routes_test.go b/agent/structs/config_entry_routes_test.go
index 2aac0051a3263..52e18f7195200 100644
--- a/agent/structs/config_entry_routes_test.go
+++ b/agent/structs/config_entry_routes_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -437,476 +434,3 @@ func TestHTTPRoute(t *testing.T) {
 	}
 	testConfigEntryNormalizeAndValidate(t, cases)
 }
-
-func TestHTTPMatch_DeepEqual(t *testing.T) {
-	type fields struct {
-		Headers []HTTPHeaderMatch
-		Method  HTTPMatchMethod
-		Path    HTTPPathMatch
-		Query   []HTTPQueryMatch
-	}
-	type args struct {
-		other HTTPMatch
-	}
-	tests := map[string]struct {
-		match HTTPMatch
-		other HTTPMatch
-		want  bool
-	}{
-		"all fields equal": {
-			match: HTTPMatch{
-				Headers: []HTTPHeaderMatch{
-					{
-						Match: HTTPHeaderMatchExact,
-						Name:  "h1",
-						Value: "a",
-					},
-					{
-						Match: HTTPHeaderMatchPrefix,
-						Name:  "h2",
-						Value: "b",
-					},
-				},
-				Method: HTTPMatchMethodGet,
-				Path: HTTPPathMatch{
-					Match: HTTPPathMatchType(HTTPHeaderMatchPrefix),
-					Value: "/bender",
-				},
-				Query: []HTTPQueryMatch{
-					{
-						Match: HTTPQueryMatchExact,
-						Name:  "q",
-						Value: "nibbler",
-					},
-					{
-						Match: HTTPQueryMatchPresent,
-						Name:  "ship",
-						Value: "planet express",
-					},
-				},
-			},
-			other: HTTPMatch{
-				Headers: []HTTPHeaderMatch{
-					{
-						Match: HTTPHeaderMatchExact,
-						Name:  "h1",
-						Value: "a",
-					},
-					{
-						Match: HTTPHeaderMatchPrefix,
-						Name:  "h2",
-						Value: "b",
-					},
-				},
-				Method: HTTPMatchMethodGet,
-				Path: HTTPPathMatch{
-					Match: HTTPPathMatchType(HTTPHeaderMatchPrefix),
-					Value: "/bender",
-				},
-				Query: []HTTPQueryMatch{
-					{
-						Match: HTTPQueryMatchExact,
-						Name:  "q",
-						Value: "nibbler",
-					},
-					{
-						Match: HTTPQueryMatchPresent,
-						Name:  "ship",
-						Value: "planet express",
-					},
-				},
-			},
-			want: true,
-		},
-		"differing number of header matches": {
-			match: HTTPMatch{
-				Headers: []HTTPHeaderMatch{
-					{
-						Match: HTTPHeaderMatchExact,
-						Name:  "h1",
-						Value: "a",
-					},
-					{
-						Match: HTTPHeaderMatchPrefix,
-						Name:  "h2",
-						Value: "b",
-					},
-				},
-				Method: HTTPMatchMethodGet,
-				Path: HTTPPathMatch{
-					Match: HTTPPathMatchType(HTTPHeaderMatchPrefix),
-					Value: "/bender",
-				},
-				Query: []HTTPQueryMatch{
-					{
-						Match: HTTPQueryMatchExact,
-						Name:  "q",
-						Value: "nibbler",
-					},
-					{
-						Match: HTTPQueryMatchPresent,
-						Name:  "ship",
-						Value: "planet express",
-					},
-				},
-			},
-			other: HTTPMatch{
-				Headers: []HTTPHeaderMatch{
-					{
-						Match: HTTPHeaderMatchExact,
-						Name:  "h1",
-						Value: "a",
-					},
-				},
-				Method: HTTPMatchMethodGet,
-				Path: HTTPPathMatch{
-					Match: HTTPPathMatchType(HTTPHeaderMatchPrefix),
-					Value: "/bender",
-				},
-				Query: []HTTPQueryMatch{
-					{
-						Match: HTTPQueryMatchExact,
-						Name:  "q",
-						Value: "nibbler",
-					},
-					{
-						Match: HTTPQueryMatchPresent,
-						Name:  "ship",
-						Value: "planet express",
-					},
-				},
-			},
-			want: false,
-		},
-		"differing header matches": {
-			match: HTTPMatch{
-				Headers: []HTTPHeaderMatch{
-					{
-						Match: HTTPHeaderMatchExact,
-						Name:  "h4",
-						Value: "a",
-					},
-					{
-						Match: HTTPHeaderMatchPrefix,
-						Name:  "h2",
-						Value: "b",
-					},
-				},
-				Method: HTTPMatchMethodGet,
-				Path: HTTPPathMatch{
-					Match: HTTPPathMatchType(HTTPHeaderMatchPrefix),
-					Value: "/bender",
-				},
-				Query: []HTTPQueryMatch{
-					{
-						Match: HTTPQueryMatchExact,
-						Name:  "q",
-						Value: "nibbler",
-					},
-					{
-						Match: HTTPQueryMatchPresent,
-						Name:  "ship",
-						Value: "planet express",
-					},
-				},
-			},
-			other: HTTPMatch{
-				Headers: []HTTPHeaderMatch{
-					{
-						Match: HTTPHeaderMatchExact,
-						Name:  "h1",
-						Value: "a",
-					},
-					{
-						Match: HTTPHeaderMatchPrefix,
-						Name:  "h2",
-						Value: "b",
-					},
-				},
-				Method: HTTPMatchMethodGet,
-				Path: HTTPPathMatch{
-					Match: HTTPPathMatchType(HTTPHeaderMatchPrefix),
-					Value: "/bender",
-				},
-				Query: []HTTPQueryMatch{
-					{
-						Match: HTTPQueryMatchExact,
-						Name:  "q",
-						Value: "nibbler",
-					},
-					{
-						Match: HTTPQueryMatchPresent,
-						Name:  "ship",
-						Value: "planet express",
-					},
-				},
-			},
-			want: false,
-		},
-		"different path matching": {
-			match: HTTPMatch{
-				Headers: []HTTPHeaderMatch{
-					{
-						Match: HTTPHeaderMatchExact,
-						Name:  "h1",
-						Value: "a",
-					},
-					{
-						Match: HTTPHeaderMatchPrefix,
-						Name:  "h2",
-						Value: "b",
-					},
-				},
-				Method: HTTPMatchMethodGet,
-				Path: HTTPPathMatch{
-					Match: HTTPPathMatchType(HTTPHeaderMatchPrefix),
-					Value: "/zoidberg",
-				},
-				Query: []HTTPQueryMatch{
-					{
-						Match: HTTPQueryMatchExact,
-						Name:  "q",
-						Value: "nibbler",
-					},
-					{
-						Match: HTTPQueryMatchPresent,
-						Name:  "ship",
-						Value: "planet express",
-					},
-				},
-			},
-			other: HTTPMatch{
-				Headers: []HTTPHeaderMatch{
-					{
-						Match: HTTPHeaderMatchExact,
-						Name:  "h1",
-						Value: "a",
-					},
-					{
-						Match: HTTPHeaderMatchPrefix,
-						Name:  "h2",
-						Value: "b",
-					},
-				},
-				Method: HTTPMatchMethodGet,
-				Path: HTTPPathMatch{
-					Match: HTTPPathMatchType(HTTPHeaderMatchPrefix),
-					Value: "/bender",
-				},
-				Query: []HTTPQueryMatch{
-					{
-						Match: HTTPQueryMatchExact,
-						Name:  "q",
-						Value: "nibbler",
-					},
-					{
-						Match: HTTPQueryMatchPresent,
-						Name:  "ship",
-						Value: "planet express",
-					},
-				},
-			},
-			want: false,
-		},
-		"differing methods": {
-			match: HTTPMatch{
-				Headers: []HTTPHeaderMatch{
-					{
-						Match: HTTPHeaderMatchExact,
-						Name:  "h1",
-						Value: "a",
-					},
-					{
-						Match: HTTPHeaderMatchPrefix,
-						Name:  "h2",
-						Value: "b",
-					},
-				},
-				Method: HTTPMatchMethodConnect,
-				Path: HTTPPathMatch{
-					Match: HTTPPathMatchType(HTTPHeaderMatchPrefix),
-					Value: "/bender",
-				},
-				Query: []HTTPQueryMatch{
-					{
-						Match: HTTPQueryMatchExact,
-						Name:  "q",
-						Value: "nibbler",
-					},
-					{
-						Match: HTTPQueryMatchPresent,
-						Name:  "ship",
-						Value: "planet express",
-					},
-				},
-			},
-			other: HTTPMatch{
-				Headers: []HTTPHeaderMatch{
-					{
-						Match: HTTPHeaderMatchExact,
-						Name:  "h1",
-						Value: "a",
-					},
-					{
-						Match: HTTPHeaderMatchPrefix,
-						Name:  "h2",
-						Value: "b",
-					},
-				},
-				Method: HTTPMatchMethodGet,
-				Path: HTTPPathMatch{
-					Match: HTTPPathMatchType(HTTPHeaderMatchPrefix),
-					Value: "/bender",
-				},
-				Query: []HTTPQueryMatch{
-					{
-						Match: HTTPQueryMatchExact,
-						Name:  "q",
-						Value: "nibbler",
-					},
-					{
-						Match: HTTPQueryMatchPresent,
-						Name:  "ship",
-						Value: "planet express",
-					},
-				},
-			},
-			want: false,
-		},
-		"differing number of query matches": {
-			match: HTTPMatch{
-				Headers: []HTTPHeaderMatch{
-					{
-						Match: HTTPHeaderMatchExact,
-						Name:  "h1",
-						Value: "a",
-					},
-					{
-						Match: HTTPHeaderMatchPrefix,
-						Name:  "h2",
-						Value: "b",
-					},
-				},
-				Method: HTTPMatchMethodGet,
-				Path: HTTPPathMatch{
-					Match: HTTPPathMatchType(HTTPHeaderMatchPrefix),
-					Value: "/bender",
-				},
-				Query: []HTTPQueryMatch{
-					{
-						Match: HTTPQueryMatchPresent,
-						Name:  "ship",
-						Value: "planet express",
-					},
-				},
-			},
-			other: HTTPMatch{
-				Headers: []HTTPHeaderMatch{
-					{
-						Match: HTTPHeaderMatchExact,
-						Name:  "h1",
-						Value: "a",
-					},
-					{
-						Match: HTTPHeaderMatchPrefix,
-						Name:  "h2",
-						Value: "b",
-					},
-				},
-				Method: HTTPMatchMethodGet,
-				Path: HTTPPathMatch{
-					Match: HTTPPathMatchType(HTTPHeaderMatchPrefix),
-					Value: "/bender",
-				},
-				Query: []HTTPQueryMatch{
-					{
-						Match: HTTPQueryMatchExact,
-						Name:  "q",
-						Value: "nibbler",
-					},
-					{
-						Match: HTTPQueryMatchPresent,
-						Name:  "ship",
-						Value: "planet express",
-					},
-				},
-			},
-			want: false,
-		},
-		"different query matches": {
-			match: HTTPMatch{
-				Headers: []HTTPHeaderMatch{
-					{
-						Match: HTTPHeaderMatchExact,
-						Name:  "h1",
-						Value: "a",
-					},
-					{
-						Match: HTTPHeaderMatchPrefix,
-						Name:  "h2",
-						Value: "b",
-					},
-				},
-				Method: HTTPMatchMethodGet,
-				Path: HTTPPathMatch{
-					Match: HTTPPathMatchType(HTTPHeaderMatchPrefix),
-					Value: "/bender",
-				},
-				Query: []HTTPQueryMatch{
-					{
-						Match: HTTPQueryMatchExact,
-						Name:  "q",
-						Value: "another",
-					},
-					{
-						Match: HTTPQueryMatchPresent,
-						Name:  "ship",
-						Value: "planet express",
-					},
-				},
-			},
-			other: HTTPMatch{
-				Headers: []HTTPHeaderMatch{
-					{
-						Match: HTTPHeaderMatchExact,
-						Name:  "h1",
-						Value: "a",
-					},
-					{
-						Match: HTTPHeaderMatchPrefix,
-						Name:  "h2",
-						Value: "b",
-					},
-				},
-				Method: HTTPMatchMethodGet,
-				Path: HTTPPathMatch{
-					Match: HTTPPathMatchType(HTTPHeaderMatchPrefix),
-					Value: "/bender",
-				},
-				Query: []HTTPQueryMatch{
-					{
-						Match: HTTPQueryMatchExact,
-						Name:  "q",
-						Value: "nibbler",
-					},
-					{
-						Match: HTTPQueryMatchPresent,
-						Name:  "ship",
-						Value: "planet express",
-					},
-				},
-			},
-			want: false,
-		},
-	}
-	for name, tt := range tests {
-		name := name
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-			if got := tt.match.DeepEqual(tt.other); got != tt.want {
-				t.Errorf("HTTPMatch.DeepEqual() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
diff --git a/agent/structs/config_entry_sameness_group.go b/agent/structs/config_entry_sameness_group.go
deleted file mode 100644
index dd1b84aa85ed3..0000000000000
--- a/agent/structs/config_entry_sameness_group.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package structs
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/hashicorp/consul/acl"
-)
-
-type SamenessGroupConfigEntry struct {
-	Name               string
-	DefaultForFailover bool `json:",omitempty" alias:"default_for_failover"`
-	IncludeLocal       bool `json:",omitempty" alias:"include_local"`
-	Members            []SamenessGroupMember
-	Meta               map[string]string `json:",omitempty"`
-	acl.EnterpriseMeta `hcl:",squash" mapstructure:",squash"`
-	RaftIndex
-}
-
-func (s *SamenessGroupConfigEntry) GetKind() string            { return SamenessGroup }
-func (s *SamenessGroupConfigEntry) GetName() string            { return s.Name }
-func (s *SamenessGroupConfigEntry) GetMeta() map[string]string { return s.Meta }
-func (s *SamenessGroupConfigEntry) GetCreateIndex() uint64     { return s.CreateIndex }
-func (s *SamenessGroupConfigEntry) GetModifyIndex() uint64     { return s.ModifyIndex }
-
-func (s *SamenessGroupConfigEntry) GetRaftIndex() *RaftIndex {
-	if s == nil {
-		return &RaftIndex{}
-	}
-	return &s.RaftIndex
-}
-
-func (s *SamenessGroupConfigEntry) GetEnterpriseMeta() *acl.EnterpriseMeta {
-	if s == nil {
-		return nil
-	}
-	return &s.EnterpriseMeta
-}
-
-func (s *SamenessGroupConfigEntry) Normalize() error {
-	if s == nil {
-		return fmt.Errorf("config entry is nil")
-	}
-	s.EnterpriseMeta.Normalize()
-	return nil
-}
-
-func (s *SamenessGroupConfigEntry) CanRead(authz acl.Authorizer) error {
-	return nil
-}
-
-func (s *SamenessGroupConfigEntry) CanWrite(authz acl.Authorizer) error {
-	var authzContext acl.AuthorizerContext
-	s.FillAuthzContext(&authzContext)
-	return authz.ToAllowAuthorizer().MeshWriteAllowed(&authzContext)
-}
-
-func (s *SamenessGroupConfigEntry) MarshalJSON() ([]byte, error) {
-	type Alias SamenessGroupConfigEntry
-	source := &struct {
-		Kind string
-		*Alias
-	}{
-		Kind:  SamenessGroup,
-		Alias: (*Alias)(s),
-	}
-	return json.Marshal(source)
-}
-
-type SamenessGroupMember struct {
-	Partition string `json:",omitempty"`
-	Peer      string `json:",omitempty"`
-}
diff --git a/agent/structs/config_entry_sameness_group_ce.go b/agent/structs/config_entry_sameness_group_ce.go
deleted file mode 100644
index c201ac8b429a3..0000000000000
--- a/agent/structs/config_entry_sameness_group_ce.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package structs
-
-import "fmt"
-
-// Validate assures that the sameness-groups are an enterprise only feature
-func (s *SamenessGroupConfigEntry) Validate() error {
-	return fmt.Errorf("sameness-groups are an enterprise-only feature")
-}
-
-// RelatedPeers is an CE placeholder noop
-func (s *SamenessGroupConfigEntry) RelatedPeers() []string {
-	return nil
-}
-
-// AllMembers is an CE placeholder noop
-func (s *SamenessGroupConfigEntry) AllMembers() []SamenessGroupMember {
-	return nil
-}
-
-// ToServiceResolverFailoverTargets is an CE placeholder noop
-func (s *SamenessGroupConfigEntry) ToServiceResolverFailoverTargets() []ServiceResolverFailoverTarget {
-	return nil
-}
-
-// ToQueryFailoverTargets is an CE placeholder noop
-func (s *SamenessGroupConfigEntry) ToQueryFailoverTargets(namespace string) []QueryFailoverTarget {
-	return nil
-}
diff --git a/agent/structs/config_entry_status.go b/agent/structs/config_entry_status.go
index 749ba1596868d..1e17c4179697f 100644
--- a/agent/structs/config_entry_status.go
+++ b/agent/structs/config_entry_status.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/config_entry_test.go b/agent/structs/config_entry_test.go
index 9151ef815b158..9aa4ea0c6a98f 100644
--- a/agent/structs/config_entry_test.go
+++ b/agent/structs/config_entry_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -350,7 +347,6 @@ func TestDecodeConfigEntry(t *testing.T) {
 				mesh_gateway {
 					mode = "remote"
 				}
-				mutual_tls_mode = "permissive"
 			`,
 			camel: `
 				Kind = "proxy-defaults"
@@ -370,7 +366,6 @@ func TestDecodeConfigEntry(t *testing.T) {
 				MeshGateway {
 					Mode = "remote"
 				}
-				MutualTLSMode = "permissive"
 			`,
 			expect: &ProxyConfigEntry{
 				Kind: "proxy-defaults",
@@ -390,7 +385,6 @@ func TestDecodeConfigEntry(t *testing.T) {
 				MeshGateway: MeshGatewayConfig{
 					Mode: MeshGatewayModeRemote,
 				},
-				MutualTLSMode: MutualTLSModePermissive,
 			},
 		},
 		{
@@ -407,7 +401,6 @@ func TestDecodeConfigEntry(t *testing.T) {
 				mesh_gateway {
 					mode = "remote"
 				}
-				mutual_tls_mode = "permissive"
 				balance_inbound_connections = "exact_balance"
 				upstream_config {
 					overrides = [
@@ -454,7 +447,6 @@ func TestDecodeConfigEntry(t *testing.T) {
 				MeshGateway {
 					Mode = "remote"
 				}
-				MutualTLSMode = "permissive"
 				BalanceInboundConnections = "exact_balance"
 				UpstreamConfig {
 					Overrides = [
@@ -501,7 +493,6 @@ func TestDecodeConfigEntry(t *testing.T) {
 				MeshGateway: MeshGatewayConfig{
 					Mode: MeshGatewayModeRemote,
 				},
-				MutualTLSMode:             MutualTLSModePermissive,
 				BalanceInboundConnections: "exact_balance",
 				UpstreamConfig: &UpstreamConfiguration{
 					Overrides: []*UpstreamConfig{
@@ -1826,7 +1817,6 @@ func TestDecodeConfigEntry(t *testing.T) {
 				transparent_proxy {
 					mesh_destinations_only = true
 				}
-				allow_enabling_permissive_mutual_tls = true
 				tls {
 					incoming {
 						tls_min_version = "TLSv1_1"
@@ -1861,7 +1851,6 @@ func TestDecodeConfigEntry(t *testing.T) {
 				TransparentProxy {
 					MeshDestinationsOnly = true
 				}
-				AllowEnablingPermissiveMutualTLS = true
 				TLS {
 					Incoming {
 						TLSMinVersion = "TLSv1_1"
@@ -1895,7 +1884,6 @@ func TestDecodeConfigEntry(t *testing.T) {
 				TransparentProxy: TransparentProxyMeshConfig{
 					MeshDestinationsOnly: true,
 				},
-				AllowEnablingPermissiveMutualTLS: true,
 				TLS: &MeshTLSConfig{
 					Incoming: &MeshDirectionalTLSConfig{
 						TLSMinVersion: types.TLSv1_1,
@@ -2164,6 +2152,13 @@ func TestDecodeConfigEntry(t *testing.T) {
 
 func TestServiceConfigRequest(t *testing.T) {
 
+	makeLegacyUpstreamIDs := func(services ...string) []ServiceID {
+		u := make([]ServiceID, 0, len(services))
+		for _, s := range services {
+			u = append(u, NewServiceID(s, acl.DefaultEnterpriseMeta()))
+		}
+		return u
+	}
 	tests := []struct {
 		name     string
 		req      ServiceConfigRequest
@@ -2193,18 +2188,40 @@ func TestServiceConfigRequest(t *testing.T) {
 			},
 			wantSame: false,
 		},
+		{
+			name: "legacy upstreams should be different",
+			req: ServiceConfigRequest{
+				Name:        "web",
+				UpstreamIDs: makeLegacyUpstreamIDs("foo"),
+			},
+			mutate: func(req *ServiceConfigRequest) {
+				req.UpstreamIDs = makeLegacyUpstreamIDs("foo", "bar")
+			},
+			wantSame: false,
+		},
+		{
+			name: "legacy upstreams should not depend on order",
+			req: ServiceConfigRequest{
+				Name:        "web",
+				UpstreamIDs: makeLegacyUpstreamIDs("bar", "foo"),
+			},
+			mutate: func(req *ServiceConfigRequest) {
+				req.UpstreamIDs = makeLegacyUpstreamIDs("foo", "bar")
+			},
+			wantSame: true,
+		},
 		{
 			name: "upstreams should be different",
 			req: ServiceConfigRequest{
 				Name: "web",
-				UpstreamServiceNames: []PeeredServiceName{
-					{ServiceName: NewServiceName("foo", nil)},
+				UpstreamIDs: []ServiceID{
+					NewServiceID("foo", nil),
 				},
 			},
 			mutate: func(req *ServiceConfigRequest) {
-				req.UpstreamServiceNames = []PeeredServiceName{
-					{ServiceName: NewServiceName("foo", nil)},
-					{ServiceName: NewServiceName("bar", nil)},
+				req.UpstreamIDs = []ServiceID{
+					NewServiceID("foo", nil),
+					NewServiceID("bar", nil),
 				}
 			},
 			wantSame: false,
@@ -2213,15 +2230,15 @@ func TestServiceConfigRequest(t *testing.T) {
 			name: "upstreams should not depend on order",
 			req: ServiceConfigRequest{
 				Name: "web",
-				UpstreamServiceNames: []PeeredServiceName{
-					{ServiceName: NewServiceName("foo", nil)},
-					{ServiceName: NewServiceName("bar", nil)},
+				UpstreamIDs: []ServiceID{
+					NewServiceID("bar", nil),
+					NewServiceID("foo", nil),
 				},
 			},
 			mutate: func(req *ServiceConfigRequest) {
-				req.UpstreamServiceNames = []PeeredServiceName{
-					{ServiceName: NewServiceName("foo", nil)},
-					{ServiceName: NewServiceName("bar", nil)},
+				req.UpstreamIDs = []ServiceID{
+					NewServiceID("foo", nil),
+					NewServiceID("bar", nil),
 				}
 			},
 			wantSame: true,
@@ -2891,22 +2908,6 @@ func TestServiceConfigEntry(t *testing.T) {
 				},
 			},
 		},
-		"validate: invalid MutualTLSMode in service-defaults": {
-			entry: &ServiceConfigEntry{
-				Kind:          ServiceDefaults,
-				Name:          "web",
-				MutualTLSMode: MutualTLSMode("invalid-mtls-mode"),
-			},
-			validateErr: `Invalid MutualTLSMode "invalid-mtls-mode". Must be one of "", "strict", or "permissive".`,
-		},
-		"validate: invalid MutualTLSMode in proxy-defaults": {
-			entry: &ServiceConfigEntry{
-				Kind:          ProxyDefaults,
-				Name:          ProxyConfigGlobal,
-				MutualTLSMode: MutualTLSMode("invalid-mtls-mode"),
-			},
-			validateErr: `Invalid MutualTLSMode "invalid-mtls-mode". Must be one of "", "strict", or "permissive".`,
-		},
 	}
 	testConfigEntryNormalizeAndValidate(t, cases)
 }
@@ -2932,8 +2933,8 @@ func TestUpstreamConfig_MergeInto(t *testing.T) {
 					MaxConcurrentRequests: intPointer(5),
 				},
 				PassiveHealthCheck: &PassiveHealthCheck{
-					Interval:                2 * time.Second,
 					MaxFailures:             3,
+					Interval:                2 * time.Second,
 					EnforcingConsecutive5xx: uintPointer(4),
 					MaxEjectionPercent:      uintPointer(5),
 					BaseEjectionTime:        durationPointer(6 * time.Second),
@@ -2953,8 +2954,8 @@ func TestUpstreamConfig_MergeInto(t *testing.T) {
 					MaxConcurrentRequests: intPointer(5),
 				},
 				"passive_health_check": &PassiveHealthCheck{
-					Interval:                2 * time.Second,
 					MaxFailures:             3,
+					Interval:                2 * time.Second,
 					EnforcingConsecutive5xx: uintPointer(4),
 					MaxEjectionPercent:      uintPointer(5),
 					BaseEjectionTime:        durationPointer(6 * time.Second),
@@ -2976,8 +2977,8 @@ func TestUpstreamConfig_MergeInto(t *testing.T) {
 					MaxConcurrentRequests: intPointer(5),
 				},
 				PassiveHealthCheck: &PassiveHealthCheck{
-					Interval:                2 * time.Second,
 					MaxFailures:             3,
+					Interval:                2 * time.Second,
 					EnforcingConsecutive5xx: uintPointer(4),
 					MaxEjectionPercent:      uintPointer(5),
 					BaseEjectionTime:        durationPointer(6 * time.Second),
@@ -2996,11 +2997,8 @@ func TestUpstreamConfig_MergeInto(t *testing.T) {
 					MaxConcurrentRequests: intPointer(12),
 				},
 				"passive_health_check": &PassiveHealthCheck{
-					MaxFailures:             13,
-					Interval:                14 * time.Second,
-					EnforcingConsecutive5xx: uintPointer(15),
-					MaxEjectionPercent:      uintPointer(16),
-					BaseEjectionTime:        durationPointer(17 * time.Second),
+					MaxFailures: 13,
+					Interval:    14 * time.Second,
 				},
 				"mesh_gateway": MeshGatewayConfig{Mode: MeshGatewayModeLocal},
 			},
@@ -3016,8 +3014,8 @@ func TestUpstreamConfig_MergeInto(t *testing.T) {
 					MaxConcurrentRequests: intPointer(5),
 				},
 				"passive_health_check": &PassiveHealthCheck{
-					Interval:                2 * time.Second,
 					MaxFailures:             3,
+					Interval:                2 * time.Second,
 					EnforcingConsecutive5xx: uintPointer(4),
 					MaxEjectionPercent:      uintPointer(5),
 					BaseEjectionTime:        durationPointer(6 * time.Second),
@@ -3270,25 +3268,6 @@ func TestProxyConfigEntry(t *testing.T) {
 			},
 			validateErr: "Config: envoy_hcp_metrics_bind_socket_dir length 71 exceeds max",
 		},
-		"proxy config has invalid failover policy": {
-			entry: &ProxyConfigEntry{
-				Name:           "global",
-				FailoverPolicy: &ServiceResolverFailoverPolicy{Mode: "bad"},
-			},
-			validateErr: `Failover-policy mode must be one of '', 'sequential', or 'order-by-locality'`,
-		},
-		"proxy config with valid failover policy": {
-			entry: &ProxyConfigEntry{
-				Name:           "global",
-				FailoverPolicy: &ServiceResolverFailoverPolicy{Mode: "order-by-locality"},
-			},
-			expected: &ProxyConfigEntry{
-				Name:           ProxyConfigGlobal,
-				Kind:           ProxyDefaults,
-				FailoverPolicy: &ServiceResolverFailoverPolicy{Mode: "order-by-locality"},
-				EnterpriseMeta: *acl.DefaultEnterpriseMeta(),
-			},
-		},
 		"proxy config has invalid access log type": {
 			entry: &ProxyConfigEntry{
 				Name: "global",
@@ -3443,18 +3422,6 @@ func testConfigEntryNormalizeAndValidate(t *testing.T, cases map[string]configEn
 	}
 }
 
-func intPointer(i int) *int {
-	return &i
-}
-
-func uintPointer(v uint32) *uint32 {
-	return &v
-}
-
-func durationPointer(d time.Duration) *time.Duration {
-	return &d
-}
-
 func TestValidateOpaqueConfigMap(t *testing.T) {
 	tt := map[string]struct {
 		input     map[string]interface{}
@@ -3484,3 +3451,15 @@ func TestValidateOpaqueConfigMap(t *testing.T) {
 		})
 	}
 }
+
+func intPointer(i int) *int {
+	return &i
+}
+
+func uintPointer(v uint32) *uint32 {
+	return &v
+}
+
+func durationPointer(d time.Duration) *time.Duration {
+	return &d
+}
diff --git a/agent/structs/connect.go b/agent/structs/connect.go
index 4a6033efab57c..9edf744a1363e 100644
--- a/agent/structs/connect.go
+++ b/agent/structs/connect.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import "github.com/hashicorp/consul/acl"
diff --git a/agent/structs/connect_ca.go b/agent/structs/connect_ca.go
index 267aeba5e63d9..9f319ad09fee3 100644
--- a/agent/structs/connect_ca.go
+++ b/agent/structs/connect_ca.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -217,11 +214,6 @@ type IssuedCert struct {
 	// PrivateKeyPEM is the PEM encoded private key associated with CertPEM.
 	PrivateKeyPEM string `json:",omitempty"`
 
-	// WorkloadIdentity is the name of the workload identity for which the cert was issued.
-	WorkloadIdentity string `json:",omitempty"`
-	// WorkloadIdentityURI is the cert URI value.
-	WorkloadIdentityURI string `json:",omitempty"`
-
 	// Service is the name of the service for which the cert was issued.
 	Service string `json:",omitempty"`
 	// ServiceURI is the cert URI value.
@@ -252,12 +244,6 @@ type IssuedCert struct {
 	RaftIndex
 }
 
-func (i *IssuedCert) Key() string {
-	return fmt.Sprintf("%s",
-		i.SerialNumber,
-	)
-}
-
 // CAOp is the operation for a request related to intentions.
 type CAOp string
 
diff --git a/agent/structs/connect_ca_test.go b/agent/structs/connect_ca_test.go
index 5f224e04f76a6..1609b07565f0f 100644
--- a/agent/structs/connect_ca_test.go
+++ b/agent/structs/connect_ca_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/connect_ce.go b/agent/structs/connect_ce.go
index 98d930939b3e3..ac4a6405f450e 100644
--- a/agent/structs/connect_ce.go
+++ b/agent/structs/connect_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
diff --git a/agent/structs/connect_proxy_config.go b/agent/structs/connect_proxy_config.go
index d84953e1b0e7e..b127b1ce101af 100644
--- a/agent/structs/connect_proxy_config.go
+++ b/agent/structs/connect_proxy_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -11,7 +8,6 @@ import (
 
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/lib"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
 )
 
 const (
@@ -181,39 +177,6 @@ type AccessLogsConfig struct {
 	TextFormat string `json:",omitempty" alias:"text_format"`
 }
 
-func (c *AccessLogsConfig) GetEnabled() bool {
-	return c.Enabled
-}
-
-func (c *AccessLogsConfig) GetDisableListenerLogs() bool {
-	return c.DisableListenerLogs
-}
-
-func (c *AccessLogsConfig) GetType() pbmesh.LogSinkType {
-	switch c.Type {
-	case FileLogSinkType:
-		return pbmesh.LogSinkType_LOG_SINK_TYPE_FILE
-	case StdErrLogSinkType:
-		return pbmesh.LogSinkType_LOG_SINK_TYPE_STDERR
-	case StdOutLogSinkType:
-		return pbmesh.LogSinkType_LOG_SINK_TYPE_STDOUT
-	}
-
-	return pbmesh.LogSinkType_LOG_SINK_TYPE_DEFAULT
-}
-
-func (c *AccessLogsConfig) GetPath() string {
-	return c.Path
-}
-
-func (c *AccessLogsConfig) GetJsonFormat() string {
-	return c.JSONFormat
-}
-
-func (c *AccessLogsConfig) GetTextFormat() string {
-	return c.TextFormat
-}
-
 func (c *AccessLogsConfig) IsZero() bool {
 	if c == nil {
 		return true
@@ -323,9 +286,6 @@ type ConnectProxyConfig struct {
 	// transparent mode.
 	TransparentProxy TransparentProxyConfig `json:",omitempty" alias:"transparent_proxy"`
 
-	// MutualTLSMode allows configuring the proxy to allow non-mTLS traffic.
-	MutualTLSMode MutualTLSMode `json:"-" bexpr:"-"`
-
 	// AccessLogs configures the output and format of Envoy access logs
 	AccessLogs AccessLogsConfig `json:",omitempty" alias:"access_logs"`
 }
@@ -839,12 +799,3 @@ func (e *ExposeConfig) Finalize() {
 		}
 	}
 }
-
-type AccessLogs interface {
-	GetEnabled() bool
-	GetDisableListenerLogs() bool
-	GetType() pbmesh.LogSinkType
-	GetPath() string
-	GetJsonFormat() string
-	GetTextFormat() string
-}
diff --git a/agent/structs/connect_proxy_config_ce.go b/agent/structs/connect_proxy_config_ce.go
index 7b6bee851da9b..320d7c4700e7c 100644
--- a/agent/structs/connect_proxy_config_ce.go
+++ b/agent/structs/connect_proxy_config_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
diff --git a/agent/structs/connect_proxy_config_test.go b/agent/structs/connect_proxy_config_test.go
index be16d17be6a3c..f55ba1d2b9b19 100644
--- a/agent/structs/connect_proxy_config_test.go
+++ b/agent/structs/connect_proxy_config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/deep-copy.sh b/agent/structs/deep-copy.sh
index cbc1bdc42ae5d..f0e5c91fb1d6a 100755
--- a/agent/structs/deep-copy.sh
+++ b/agent/structs/deep-copy.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 readonly PACKAGE_DIR="$(dirname "${BASH_SOURCE[0]}")"
 cd $PACKAGE_DIR
@@ -23,7 +20,6 @@ deep-copy \
   -type DiscoveryRoute \
   -type DiscoverySplit \
   -type ExposeConfig \
-  -type ExportedServicesConfigEntry \
   -type GatewayService \
   -type GatewayServiceTLSConfig \
   -type HTTPHeaderModifiers \
diff --git a/agent/structs/discovery_chain.go b/agent/structs/discovery_chain.go
index c81dd1ec0836e..75ae6c25dbbad 100644
--- a/agent/structs/discovery_chain.go
+++ b/agent/structs/discovery_chain.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -57,10 +54,6 @@ type CompiledDiscoveryChain struct {
 
 	// Targets is a list of all targets used in this chain.
 	Targets map[string]*DiscoveryTarget `json:",omitempty"`
-
-	// VirtualIPs is a list of virtual IPs associated with the service.
-	AutoVirtualIPs   []string
-	ManualVirtualIPs []string
 }
 
 // ID returns an ID that encodes the service, namespace, partition, and datacenter.
@@ -185,23 +178,7 @@ type DiscoverySplit struct {
 
 // compiled form of ServiceResolverFailover
 type DiscoveryFailover struct {
-	Targets []string                       `json:",omitempty"`
-	Policy  *ServiceResolverFailoverPolicy `json:",omitempty"`
-	Regions []string                       `json:",omitempty"`
-}
-
-// compiled form of ServiceResolverPrioritizeByLocality
-type DiscoveryPrioritizeByLocality struct {
-	Mode string `json:",omitempty"`
-}
-
-func (pbl *ServiceResolverPrioritizeByLocality) ToDiscovery() *DiscoveryPrioritizeByLocality {
-	if pbl == nil {
-		return nil
-	}
-	return &DiscoveryPrioritizeByLocality{
-		Mode: pbl.Mode,
-	}
+	Targets []string `json:",omitempty"`
 }
 
 // DiscoveryTarget represents all of the inputs necessary to use a resolver
@@ -212,13 +189,12 @@ type DiscoveryTarget struct {
 	// chain. It should be treated as a per-compile opaque string.
 	ID string `json:",omitempty"`
 
-	Service       string    `json:",omitempty"`
-	ServiceSubset string    `json:",omitempty"`
-	Namespace     string    `json:",omitempty"`
-	Partition     string    `json:",omitempty"`
-	Datacenter    string    `json:",omitempty"`
-	Peer          string    `json:",omitempty"`
-	Locality      *Locality `json:",omitempty"`
+	Service       string `json:",omitempty"`
+	ServiceSubset string `json:",omitempty"`
+	Namespace     string `json:",omitempty"`
+	Partition     string `json:",omitempty"`
+	Datacenter    string `json:",omitempty"`
+	Peer          string `json:",omitempty"`
 
 	MeshGateway      MeshGatewayConfig      `json:",omitempty"`
 	Subset           ServiceResolverSubset  `json:",omitempty"`
@@ -237,8 +213,6 @@ type DiscoveryTarget struct {
 	// balancer objects.  This has a structure similar to SNI, but will not be
 	// affected by SNI customizations.
 	Name string `json:",omitempty"`
-
-	PrioritizeByLocality *DiscoveryPrioritizeByLocality `json:",omitempty"`
 }
 
 func (t *DiscoveryTarget) MarshalJSON() ([]byte, error) {
@@ -278,46 +252,40 @@ func (t *DiscoveryTarget) UnmarshalJSON(data []byte) error {
 }
 
 type DiscoveryTargetOpts struct {
-	Service              string
-	ServiceSubset        string
-	Namespace            string
-	Partition            string
-	Datacenter           string
-	Peer                 string
-	PrioritizeByLocality *DiscoveryPrioritizeByLocality
+	Service       string
+	ServiceSubset string
+	Namespace     string
+	Partition     string
+	Datacenter    string
+	Peer          string
 }
 
-func MergeDiscoveryTargetOpts(opts ...DiscoveryTargetOpts) DiscoveryTargetOpts {
-	var final DiscoveryTargetOpts
-	for _, o := range opts {
-		if o.Service != "" {
-			final.Service = o.Service
-		}
+func MergeDiscoveryTargetOpts(o1 DiscoveryTargetOpts, o2 DiscoveryTargetOpts) DiscoveryTargetOpts {
+	if o2.Service != "" {
+		o1.Service = o2.Service
+	}
 
-		if o.ServiceSubset != "" {
-			final.ServiceSubset = o.ServiceSubset
-		}
+	if o2.ServiceSubset != "" {
+		o1.ServiceSubset = o2.ServiceSubset
+	}
 
-		// default should override the existing value
-		if o.Namespace != "" {
-			final.Namespace = o.Namespace
-		}
+	if o2.Namespace != "" {
+		o1.Namespace = o2.Namespace
+	}
 
-		// default should override the existing value
-		if o.Partition != "" {
-			final.Partition = o.Partition
-		}
+	if o2.Partition != "" {
+		o1.Partition = o2.Partition
+	}
 
-		if o.Datacenter != "" {
-			final.Datacenter = o.Datacenter
-		}
+	if o2.Datacenter != "" {
+		o1.Datacenter = o2.Datacenter
+	}
 
-		if o.Peer != "" {
-			final.Peer = o.Peer
-		}
+	if o2.Peer != "" {
+		o1.Peer = o2.Peer
 	}
 
-	return final
+	return o1
 }
 
 func NewDiscoveryTarget(opts DiscoveryTargetOpts) *DiscoveryTarget {
diff --git a/agent/structs/discovery_chain_ce.go b/agent/structs/discovery_chain_ce.go
index b769bf8c2e084..cdabdf6b35945 100644
--- a/agent/structs/discovery_chain_ce.go
+++ b/agent/structs/discovery_chain_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
diff --git a/agent/structs/envoy_extension.go b/agent/structs/envoy_extension.go
index ab9988bf21bc8..efef63076f2d1 100644
--- a/agent/structs/envoy_extension.go
+++ b/agent/structs/envoy_extension.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -9,11 +6,9 @@ import (
 
 // EnvoyExtension has configuration for an extension that patches Envoy resources.
 type EnvoyExtension struct {
-	Name          string
-	Required      bool
-	Arguments     map[string]interface{} `bexpr:"-"`
-	ConsulVersion string
-	EnvoyVersion  string
+	Name      string
+	Required  bool
+	Arguments map[string]interface{} `bexpr:"-"`
 }
 
 type EnvoyExtensions []EnvoyExtension
@@ -22,11 +17,9 @@ func (es EnvoyExtensions) ToAPI() []api.EnvoyExtension {
 	extensions := make([]api.EnvoyExtension, len(es))
 	for i, e := range es {
 		extensions[i] = api.EnvoyExtension{
-			Name:          e.Name,
-			Required:      e.Required,
-			Arguments:     e.Arguments,
-			EnvoyVersion:  e.EnvoyVersion,
-			ConsulVersion: e.ConsulVersion,
+			Name:      e.Name,
+			Required:  e.Required,
+			Arguments: e.Arguments,
 		}
 	}
 	return extensions
diff --git a/agent/structs/errors.go b/agent/structs/errors.go
index 31a818bd62f23..25d2a6d6e9f6d 100644
--- a/agent/structs/errors.go
+++ b/agent/structs/errors.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -19,11 +16,6 @@ const (
 	errServiceNotFound            = "Service not found: "
 	errQueryNotFound              = "Query not found"
 	errLeaderNotTracked           = "Raft leader not found in server lookup mapping"
-	errConnectNotEnabled          = "Connect must be enabled in order to use this endpoint"
-	errRateLimited                = "Rate limit reached, try again later" // Note: we depend on this error message in the gRPC ConnectCA.Sign endpoint (see: isRateLimitError).
-	errNotPrimaryDatacenter       = "not the primary datacenter"
-	errStateReadOnly              = "CA Provider State is read-only"
-	errUsingV2CatalogExperiment   = "V1 catalog is disabled when V2 is enabled"
 )
 
 var (
@@ -36,11 +28,6 @@ var (
 	ErrDCNotAvailable             = errors.New(errDCNotAvailable)
 	ErrQueryNotFound              = errors.New(errQueryNotFound)
 	ErrLeaderNotTracked           = errors.New(errLeaderNotTracked)
-	ErrConnectNotEnabled          = errors.New(errConnectNotEnabled)
-	ErrRateLimited                = errors.New(errRateLimited) // Note: we depend on this error message in the gRPC ConnectCA.Sign endpoint (see: isRateLimitError).
-	ErrNotPrimaryDatacenter       = errors.New(errNotPrimaryDatacenter)
-	ErrStateReadOnly              = errors.New(errStateReadOnly)
-	ErrUsingV2CatalogExperiment   = errors.New(errUsingV2CatalogExperiment)
 )
 
 func IsErrNoDCPath(err error) bool {
@@ -62,7 +49,3 @@ func IsErrRPCRateExceeded(err error) bool {
 func IsErrServiceNotFound(err error) bool {
 	return err != nil && strings.Contains(err.Error(), errServiceNotFound)
 }
-
-func IsErrUsingV2CatalogExperiment(err error) bool {
-	return err != nil && strings.Contains(err.Error(), errUsingV2CatalogExperiment)
-}
diff --git a/agent/structs/federation_state.go b/agent/structs/federation_state.go
index 5a0e8eef6d04d..74ea10c9a509e 100644
--- a/agent/structs/federation_state.go
+++ b/agent/structs/federation_state.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/identity.go b/agent/structs/identity.go
index b55f6bb7ae51d..d0bfd62ec2175 100644
--- a/agent/structs/identity.go
+++ b/agent/structs/identity.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import "github.com/hashicorp/consul/acl"
diff --git a/agent/structs/intention.go b/agent/structs/intention.go
index 3bbc2584f70fc..eb70ba1ee8c46 100644
--- a/agent/structs/intention.go
+++ b/agent/structs/intention.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -65,11 +62,6 @@ type Intention struct {
 	// same level of tenancy (partition is local to cluster, peer is remote).
 	SourcePeer string `json:",omitempty"`
 
-	// SourceSamenessGroup cannot be a wildcard "*" and is not compatible with legacy
-	// intentions. Cannot be used with SourcePartition, as both represent the
-	// same level of tenancy (sameness group includes both partitions and cluster peers).
-	SourceSamenessGroup string `json:",omitempty"`
-
 	// SourceType is the type of the value for the source.
 	SourceType IntentionSourceType
 
@@ -83,9 +75,6 @@ type Intention struct {
 	// service-intentions config entry directly.
 	Permissions []*IntentionPermission `bexpr:"-" json:",omitempty"`
 
-	// JWT specifies JWT authn that applies to incoming requests.
-	JWT *IntentionJWTRequirement `bexpr:"-" json:",omitempty"`
-
 	// DefaultAddr is not used.
 	// Deprecated: DefaultAddr is not used and may be removed in a future version.
 	DefaultAddr string `bexpr:"-" codec:",omitempty" json:",omitempty"`
@@ -420,9 +409,6 @@ func (x *Intention) String() string {
 	if x.SourcePeer != "" {
 		srcClusterPart = "peer(" + x.SourcePeer + ")/"
 	}
-	if x.SourceSamenessGroup != "" {
-		srcClusterPart = "sameness-group(" + x.SourceSamenessGroup + ")/"
-	}
 
 	var dstPartitionPart string
 	if x.DestinationPartition != "" {
@@ -487,7 +473,6 @@ func (x *Intention) ToSourceIntention(legacy bool) *SourceIntention {
 		Name:             x.SourceName,
 		EnterpriseMeta:   *x.SourceEnterpriseMeta(),
 		Peer:             x.SourcePeer,
-		SamenessGroup:    x.SourceSamenessGroup,
 		Action:           x.Action,
 		Permissions:      nil, // explicitly not symmetric with the old APIs
 		Precedence:       0,   // Ignore, let it be computed.
@@ -681,9 +666,8 @@ func (q *IntentionQueryRequest) CacheInfo() cache.RequestInfo {
 // IntentionQueryMatch are the parameters for performing a match request
 // against the state store.
 type IntentionQueryMatch struct {
-	Type               IntentionMatchType
-	Entries            []IntentionMatchEntry
-	WithSamenessGroups bool
+	Type    IntentionMatchType
+	Entries []IntentionMatchEntry
 }
 
 // IntentionMatchEntry is a single entry for matching an intention.
@@ -746,8 +730,7 @@ type IntentionQueryExact struct {
 	SourcePartition      string `json:",omitempty"`
 	DestinationPartition string `json:",omitempty"`
 
-	SourcePeer          string `json:",omitempty"`
-	SourceSamenessGroup string `json:",omitempty"`
+	SourcePeer string `json:",omitempty"`
 }
 
 // Validate is used to ensure all 4 required parameters are specified.
@@ -780,9 +763,6 @@ func (r *IntentionListRequest) RequestDatacenter() string {
 	return r.Datacenter
 }
 
-// SimplifiedIntentions contains expanded sameness groups.
-type SimplifiedIntentions Intentions
-
 // IntentionPrecedenceSorter takes a list of intentions and sorts them
 // based on the match precedence rules for intentions. The intentions
 // closer to the head of the list have higher precedence. i.e. index 0 has
@@ -802,16 +782,13 @@ func (s IntentionPrecedenceSorter) Less(i, j int) bool {
 
 	// Tie break on lexicographic order of the tuple in canonical form:
 	//
-	//   (SrcSamenessGroup, SrcPeer, SrcPxn, SrcNS, Src, DstPxn, DstNS, Dst)
+	//   (SrcPeer, SrcPxn, SrcNS, Src, DstPxn, DstNS, Dst)
 	//
 	// This is arbitrary but it keeps sorting deterministic which is a nice
 	// property for consistency. It is arguably open to abuse if implementations
 	// rely on this however by definition the order among same-precedence rules
 	// is arbitrary and doesn't affect whether an allow or deny rule is acted on
 	// since all applicable rules are checked.
-	if a.SourceSamenessGroup != b.SourceSamenessGroup {
-		return a.SourceSamenessGroup < b.SourceSamenessGroup
-	}
 	if a.SourcePeer != b.SourcePeer {
 		return a.SourcePeer < b.SourcePeer
 	}
diff --git a/agent/structs/intention_ce.go b/agent/structs/intention_ce.go
index d417a63f5964e..fbae3b4099767 100644
--- a/agent/structs/intention_ce.go
+++ b/agent/structs/intention_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
@@ -77,7 +75,3 @@ func (ixn *Intention) FillPartitionAndNamespace(entMeta *acl.EnterpriseMeta, fil
 	ixn.SourcePartition = ""
 	ixn.DestinationPartition = ""
 }
-
-func (ixn *Intention) SourcePartitionOrDefault() string {
-	return "default"
-}
diff --git a/agent/structs/intention_test.go b/agent/structs/intention_test.go
index 077bef0f200d2..ef6e4c00d25dd 100644
--- a/agent/structs/intention_test.go
+++ b/agent/structs/intention_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -246,12 +243,11 @@ func TestIntentionValidate(t *testing.T) {
 
 func TestIntentionPrecedenceSorter(t *testing.T) {
 	type fields struct {
-		SrcSamenessGroup string
-		SrcPeer          string
-		SrcNS            string
-		SrcN             string
-		DstNS            string
-		DstN             string
+		SrcPeer string
+		SrcNS   string
+		SrcN    string
+		DstNS   string
+		DstN    string
 	}
 	cases := []struct {
 		Name     string
@@ -261,16 +257,6 @@ func TestIntentionPrecedenceSorter(t *testing.T) {
 		{
 			"exhaustive list",
 			[]fields{
-				// Sameness fields
-				{SrcSamenessGroup: "group", SrcNS: "*", SrcN: "*", DstNS: "exact", DstN: "*"},
-				{SrcSamenessGroup: "group", SrcNS: "*", SrcN: "*", DstNS: "*", DstN: "*"},
-				{SrcSamenessGroup: "group", SrcNS: "exact", SrcN: "*", DstNS: "exact", DstN: "exact"},
-				{SrcSamenessGroup: "group", SrcNS: "*", SrcN: "*", DstNS: "exact", DstN: "exact"},
-				{SrcSamenessGroup: "group", SrcNS: "exact", SrcN: "exact", DstNS: "*", DstN: "*"},
-				{SrcSamenessGroup: "group", SrcNS: "exact", SrcN: "exact", DstNS: "exact", DstN: "exact"},
-				{SrcSamenessGroup: "group", SrcNS: "exact", SrcN: "exact", DstNS: "exact", DstN: "*"},
-				{SrcSamenessGroup: "group", SrcNS: "exact", SrcN: "*", DstNS: "exact", DstN: "*"},
-				{SrcSamenessGroup: "group", SrcNS: "exact", SrcN: "*", DstNS: "*", DstN: "*"},
 				// Peer fields
 				{SrcPeer: "peer", SrcNS: "*", SrcN: "*", DstNS: "exact", DstN: "*"},
 				{SrcPeer: "peer", SrcNS: "*", SrcN: "*", DstNS: "*", DstN: "*"},
@@ -295,31 +281,22 @@ func TestIntentionPrecedenceSorter(t *testing.T) {
 			[]fields{
 				{SrcPeer: "", SrcNS: "exact", SrcN: "exact", DstNS: "exact", DstN: "exact"},
 				{SrcPeer: "peer", SrcNS: "exact", SrcN: "exact", DstNS: "exact", DstN: "exact"},
-				{SrcSamenessGroup: "group", SrcNS: "exact", SrcN: "exact", DstNS: "exact", DstN: "exact"},
 				{SrcPeer: "", SrcNS: "exact", SrcN: "*", DstNS: "exact", DstN: "exact"},
 				{SrcPeer: "peer", SrcNS: "exact", SrcN: "*", DstNS: "exact", DstN: "exact"},
-				{SrcSamenessGroup: "group", SrcNS: "exact", SrcN: "*", DstNS: "exact", DstN: "exact"},
 				{SrcPeer: "", SrcNS: "*", SrcN: "*", DstNS: "exact", DstN: "exact"},
 				{SrcPeer: "peer", SrcNS: "*", SrcN: "*", DstNS: "exact", DstN: "exact"},
-				{SrcSamenessGroup: "group", SrcNS: "*", SrcN: "*", DstNS: "exact", DstN: "exact"},
 				{SrcPeer: "", SrcNS: "exact", SrcN: "exact", DstNS: "exact", DstN: "*"},
 				{SrcPeer: "peer", SrcNS: "exact", SrcN: "exact", DstNS: "exact", DstN: "*"},
-				{SrcSamenessGroup: "group", SrcNS: "exact", SrcN: "exact", DstNS: "exact", DstN: "*"},
 				{SrcPeer: "", SrcNS: "exact", SrcN: "*", DstNS: "exact", DstN: "*"},
 				{SrcPeer: "peer", SrcNS: "exact", SrcN: "*", DstNS: "exact", DstN: "*"},
-				{SrcSamenessGroup: "group", SrcNS: "exact", SrcN: "*", DstNS: "exact", DstN: "*"},
 				{SrcPeer: "", SrcNS: "*", SrcN: "*", DstNS: "exact", DstN: "*"},
 				{SrcPeer: "peer", SrcNS: "*", SrcN: "*", DstNS: "exact", DstN: "*"},
-				{SrcSamenessGroup: "group", SrcNS: "*", SrcN: "*", DstNS: "exact", DstN: "*"},
 				{SrcPeer: "", SrcNS: "exact", SrcN: "exact", DstNS: "*", DstN: "*"},
 				{SrcPeer: "peer", SrcNS: "exact", SrcN: "exact", DstNS: "*", DstN: "*"},
-				{SrcSamenessGroup: "group", SrcNS: "exact", SrcN: "exact", DstNS: "*", DstN: "*"},
 				{SrcPeer: "", SrcNS: "exact", SrcN: "*", DstNS: "*", DstN: "*"},
 				{SrcPeer: "peer", SrcNS: "exact", SrcN: "*", DstNS: "*", DstN: "*"},
-				{SrcSamenessGroup: "group", SrcNS: "exact", SrcN: "*", DstNS: "*", DstN: "*"},
 				{SrcPeer: "", SrcNS: "*", SrcN: "*", DstNS: "*", DstN: "*"},
 				{SrcPeer: "peer", SrcNS: "*", SrcN: "*", DstNS: "*", DstN: "*"},
-				{SrcSamenessGroup: "group", SrcNS: "*", SrcN: "*", DstNS: "*", DstN: "*"},
 			},
 		},
 		{
@@ -354,12 +331,11 @@ func TestIntentionPrecedenceSorter(t *testing.T) {
 			var input Intentions
 			for _, v := range tc.Input {
 				input = append(input, &Intention{
-					SourceSamenessGroup: v.SrcSamenessGroup,
-					SourcePeer:          v.SrcPeer,
-					SourceNS:            v.SrcNS,
-					SourceName:          v.SrcN,
-					DestinationNS:       v.DstNS,
-					DestinationName:     v.DstN,
+					SourcePeer:      v.SrcPeer,
+					SourceNS:        v.SrcNS,
+					SourceName:      v.SrcN,
+					DestinationNS:   v.DstNS,
+					DestinationName: v.DstN,
 				})
 			}
 
@@ -375,12 +351,11 @@ func TestIntentionPrecedenceSorter(t *testing.T) {
 			var actual []fields
 			for _, v := range input {
 				actual = append(actual, fields{
-					SrcSamenessGroup: v.SourceSamenessGroup,
-					SrcPeer:          v.SourcePeer,
-					SrcNS:            v.SourceNS,
-					SrcN:             v.SourceName,
-					DstNS:            v.DestinationNS,
-					DstN:             v.DestinationName,
+					SrcPeer: v.SourcePeer,
+					SrcNS:   v.SourceNS,
+					SrcN:    v.SourceName,
+					DstNS:   v.DestinationNS,
+					DstN:    v.DestinationName,
 				})
 			}
 			assert.Equal(t, tc.Expected, actual)
@@ -506,15 +481,6 @@ func TestIntention_String(t *testing.T) {
 			},
 			`peer(billing)/default/foo => ` + partitionPrefix + `default/bar (Precedence: 9, Action: ALLOW)`,
 		},
-		"L4 allow with source sameness group": {
-			&Intention{
-				SourceName:          "foo",
-				SourceSamenessGroup: "group-1",
-				DestinationName:     "bar",
-				Action:              IntentionActionAllow,
-			},
-			`sameness-group(group-1)/default/foo => ` + partitionPrefix + `default/bar (Precedence: 9, Action: ALLOW)`,
-		},
 	}
 
 	for name, tc := range cases {
diff --git a/agent/structs/operator.go b/agent/structs/operator.go
index 9d78cb92143f8..5cb1a92ca935d 100644
--- a/agent/structs/operator.go
+++ b/agent/structs/operator.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/peering.go b/agent/structs/peering.go
index 927efabb34c25..714a442e8f77b 100644
--- a/agent/structs/peering.go
+++ b/agent/structs/peering.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 // PeeringToken identifies a peer in order for a connection to be established.
@@ -17,7 +14,6 @@ type PeeringToken struct {
 type PeeringTokenRemote struct {
 	Partition  string
 	Datacenter string
-	Locality   *Locality
 }
 
 type IndexedExportedServiceList struct {
diff --git a/agent/structs/prepared_query.go b/agent/structs/prepared_query.go
index 1c851c476ef00..b46145113e49e 100644
--- a/agent/structs/prepared_query.go
+++ b/agent/structs/prepared_query.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -44,22 +41,12 @@ func (f *QueryFailoverOptions) AsTargets() []QueryFailoverTarget {
 	return f.Targets
 }
 
-// IsEmpty returns true if the QueryFailoverOptions are empty (not set), false otherwise
-func (f *QueryFailoverOptions) IsEmpty() bool {
-	if f == nil || (f.NearestN == 0 && len(f.Datacenters) == 0 && len(f.Targets) == 0) {
-		return true
-	}
-	return false
-}
-
 type QueryFailoverTarget struct {
 	// Peer specifies a peer to try during failover.
 	Peer string
 
 	// Datacenter specifies a datacenter to try during failover.
 	Datacenter string
-
-	acl.EnterpriseMeta
 }
 
 // QueryDNSOptions controls settings when query results are served over DNS.
@@ -74,11 +61,6 @@ type ServiceQuery struct {
 	// Service is the service to query.
 	Service string
 
-	// SamenessGroup specifies a sameness group to query. The first member of the Sameness Group will
-	// be targeted first on PQ execution and subsequent members will be targeted during failover scenarios.
-	// This field is mutually exclusive with Failover.
-	SamenessGroup string
-
 	// Failover controls what we do if there are no healthy nodes in the
 	// local datacenter.
 	Failover QueryFailoverOptions
@@ -341,7 +323,7 @@ type PreparedQueryExecuteRemoteRequest struct {
 	Connect bool
 
 	// QueryOptions (unfortunately named here) controls the consistency
-	// settings for the service lookups.
+	// settings for the the service lookups.
 	QueryOptions
 }
 
diff --git a/agent/structs/prepared_query_test.go b/agent/structs/prepared_query_test.go
index 537c6b043818a..d77ba3578bf70 100644
--- a/agent/structs/prepared_query_test.go
+++ b/agent/structs/prepared_query_test.go
@@ -1,12 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
 	"testing"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func TestStructs_PreparedQuery_GetACLPrefix(t *testing.T) {
@@ -38,54 +33,3 @@ func TestPreparedQueryExecuteRequest_CacheInfoKey(t *testing.T) {
 	ignored := []string{"Agent", "QueryOptions"}
 	assertCacheInfoKeyIsComplete(t, &PreparedQueryExecuteRequest{}, ignored...)
 }
-
-func TestQueryFailoverOptions_IsEmpty(t *testing.T) {
-	tests := []struct {
-		name            string
-		query           QueryFailoverOptions
-		isExpectedEmpty bool
-	}{
-		{
-			name:            "expect empty",
-			query:           QueryFailoverOptions{},
-			isExpectedEmpty: true,
-		},
-		{
-			name: "expect not empty NearestN",
-			query: QueryFailoverOptions{
-				NearestN: 1,
-			},
-			isExpectedEmpty: false,
-		},
-		{
-			name: "expect not empty NearestN negative",
-			query: QueryFailoverOptions{
-				NearestN: -1,
-			},
-			isExpectedEmpty: false,
-		},
-		{
-			name: "expect not empty datacenters",
-			query: QueryFailoverOptions{
-				Datacenters: []string{"dc"},
-			},
-			isExpectedEmpty: false,
-		},
-		{
-			name: "expect not empty targets",
-			query: QueryFailoverOptions{
-				Targets: []QueryFailoverTarget{
-					{
-						Peer: "peer",
-					},
-				},
-			},
-			isExpectedEmpty: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			assert.Equal(t, tt.isExpectedEmpty, tt.query.IsEmpty())
-		})
-	}
-}
diff --git a/agent/structs/protobuf_compat.go b/agent/structs/protobuf_compat.go
index c52d85a32c29f..b2f9cbdcb83fb 100644
--- a/agent/structs/protobuf_compat.go
+++ b/agent/structs/protobuf_compat.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/service_definition.go b/agent/structs/service_definition.go
index 9b9fec89e9540..d506c15f98473 100644
--- a/agent/structs/service_definition.go
+++ b/agent/structs/service_definition.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -29,7 +26,6 @@ type ServiceDefinition struct {
 	Weights           *Weights
 	Token             string
 	EnableTagOverride bool
-	Locality          *Locality
 
 	// Proxy is the configuration set for Kind = connect-proxy. It is mandatory in
 	// that case and an error to be set for any other kind. This config is part of
@@ -80,7 +76,6 @@ func (s *ServiceDefinition) NodeService() *NodeService {
 		Weights:           s.Weights,
 		EnableTagOverride: s.EnableTagOverride,
 		EnterpriseMeta:    s.EnterpriseMeta,
-		Locality:          s.Locality,
 	}
 	ns.EnterpriseMeta.Normalize()
 
diff --git a/agent/structs/service_definition_test.go b/agent/structs/service_definition_test.go
index ec6d4fc5374e9..d5a68f6672f18 100644
--- a/agent/structs/service_definition_test.go
+++ b/agent/structs/service_definition_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/snapshot.go b/agent/structs/snapshot.go
index 3d71fb093d3c6..933e6e1d4dd6a 100644
--- a/agent/structs/snapshot.go
+++ b/agent/structs/snapshot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 type SnapshotOp int
diff --git a/agent/structs/structs.deepcopy.go b/agent/structs/structs.deepcopy.go
index 8a2b95f2964a5..8062815af3ca2 100644
--- a/agent/structs/structs.deepcopy.go
+++ b/agent/structs/structs.deepcopy.go
@@ -1,4 +1,4 @@
-// generated by deep-copy -pointer-receiver -o ./structs.deepcopy.go -type APIGatewayListener -type BoundAPIGatewayListener -type CARoot -type CheckServiceNode -type CheckType -type CompiledDiscoveryChain -type ConnectProxyConfig -type DiscoveryFailover -type DiscoveryGraphNode -type DiscoveryResolver -type DiscoveryRoute -type DiscoverySplit -type ExposeConfig -type ExportedServicesConfigEntry -type GatewayService -type GatewayServiceTLSConfig -type HTTPHeaderModifiers -type HTTPRouteConfigEntry -type HashPolicy -type HealthCheck -type IndexedCARoots -type IngressListener -type InlineCertificateConfigEntry -type Intention -type IntentionPermission -type LoadBalancer -type MeshConfigEntry -type MeshDirectionalTLSConfig -type MeshTLSConfig -type Node -type NodeService -type PeeringServiceMeta -type ServiceConfigEntry -type ServiceConfigResponse -type ServiceConnect -type ServiceDefinition -type ServiceResolverConfigEntry -type ServiceResolverFailover -type ServiceRoute -type ServiceRouteDestination -type ServiceRouteMatch -type TCPRouteConfigEntry -type Upstream -type UpstreamConfiguration -type Status -type BoundAPIGatewayConfigEntry ./; DO NOT EDIT.
+// generated by deep-copy -pointer-receiver -o ./structs.deepcopy.go -type APIGatewayListener -type BoundAPIGatewayListener -type CARoot -type CheckServiceNode -type CheckType -type CompiledDiscoveryChain -type ConnectProxyConfig -type DiscoveryFailover -type DiscoveryGraphNode -type DiscoveryResolver -type DiscoveryRoute -type DiscoverySplit -type ExposeConfig -type GatewayService -type GatewayServiceTLSConfig -type HTTPHeaderModifiers -type HTTPRouteConfigEntry -type HashPolicy -type HealthCheck -type IndexedCARoots -type IngressListener -type InlineCertificateConfigEntry -type Intention -type IntentionPermission -type LoadBalancer -type MeshConfigEntry -type MeshDirectionalTLSConfig -type MeshTLSConfig -type Node -type NodeService -type PeeringServiceMeta -type ServiceConfigEntry -type ServiceConfigResponse -type ServiceConnect -type ServiceDefinition -type ServiceResolverConfigEntry -type ServiceResolverFailover -type ServiceRoute -type ServiceRouteDestination -type ServiceRouteMatch -type TCPRouteConfigEntry -type Upstream -type UpstreamConfiguration -type Status -type BoundAPIGatewayConfigEntry ./; DO NOT EDIT.
 
 package structs
 
@@ -18,20 +18,6 @@ func (o *APIGatewayListener) DeepCopy() *APIGatewayListener {
 		cp.TLS.CipherSuites = make([]types.TLSCipherSuite, len(o.TLS.CipherSuites))
 		copy(cp.TLS.CipherSuites, o.TLS.CipherSuites)
 	}
-	if o.Override != nil {
-		cp.Override = new(APIGatewayPolicy)
-		*cp.Override = *o.Override
-		if o.Override.JWT != nil {
-			cp.Override.JWT = o.Override.JWT.DeepCopy()
-		}
-	}
-	if o.Default != nil {
-		cp.Default = new(APIGatewayPolicy)
-		*cp.Default = *o.Default
-		if o.Default.JWT != nil {
-			cp.Default.JWT = o.Default.JWT.DeepCopy()
-		}
-	}
 	return &cp
 }
 
@@ -139,26 +125,10 @@ func (o *CompiledDiscoveryChain) DeepCopy() *CompiledDiscoveryChain {
 			if v2 != nil {
 				cp_Targets_v2 = new(DiscoveryTarget)
 				*cp_Targets_v2 = *v2
-				if v2.Locality != nil {
-					cp_Targets_v2.Locality = new(Locality)
-					*cp_Targets_v2.Locality = *v2.Locality
-				}
-				if v2.PrioritizeByLocality != nil {
-					cp_Targets_v2.PrioritizeByLocality = new(DiscoveryPrioritizeByLocality)
-					*cp_Targets_v2.PrioritizeByLocality = *v2.PrioritizeByLocality
-				}
 			}
 			cp.Targets[k2] = cp_Targets_v2
 		}
 	}
-	if o.AutoVirtualIPs != nil {
-		cp.AutoVirtualIPs = make([]string, len(o.AutoVirtualIPs))
-		copy(cp.AutoVirtualIPs, o.AutoVirtualIPs)
-	}
-	if o.ManualVirtualIPs != nil {
-		cp.ManualVirtualIPs = make([]string, len(o.ManualVirtualIPs))
-		copy(cp.ManualVirtualIPs, o.ManualVirtualIPs)
-	}
 	return &cp
 }
 
@@ -207,18 +177,6 @@ func (o *DiscoveryFailover) DeepCopy() *DiscoveryFailover {
 		cp.Targets = make([]string, len(o.Targets))
 		copy(cp.Targets, o.Targets)
 	}
-	if o.Policy != nil {
-		cp.Policy = new(ServiceResolverFailoverPolicy)
-		*cp.Policy = *o.Policy
-		if o.Policy.Regions != nil {
-			cp.Policy.Regions = make([]string, len(o.Policy.Regions))
-			copy(cp.Policy.Regions, o.Policy.Regions)
-		}
-	}
-	if o.Regions != nil {
-		cp.Regions = make([]string, len(o.Regions))
-		copy(cp.Regions, o.Regions)
-	}
 	return &cp
 }
 
@@ -296,28 +254,6 @@ func (o *ExposeConfig) DeepCopy() *ExposeConfig {
 	return &cp
 }
 
-// DeepCopy generates a deep copy of *ExportedServicesConfigEntry
-func (o *ExportedServicesConfigEntry) DeepCopy() *ExportedServicesConfigEntry {
-	var cp ExportedServicesConfigEntry = *o
-	if o.Services != nil {
-		cp.Services = make([]ExportedService, len(o.Services))
-		copy(cp.Services, o.Services)
-		for i2 := range o.Services {
-			if o.Services[i2].Consumers != nil {
-				cp.Services[i2].Consumers = make([]ServiceConsumer, len(o.Services[i2].Consumers))
-				copy(cp.Services[i2].Consumers, o.Services[i2].Consumers)
-			}
-		}
-	}
-	if o.Meta != nil {
-		cp.Meta = make(map[string]string, len(o.Meta))
-		for k2, v2 := range o.Meta {
-			cp.Meta[k2] = v2
-		}
-	}
-	return &cp
-}
-
 // DeepCopy generates a deep copy of *GatewayService
 func (o *GatewayService) DeepCopy() *GatewayService {
 	var cp GatewayService = *o
@@ -397,55 +333,6 @@ func (o *HTTPRouteConfigEntry) DeepCopy() *HTTPRouteConfigEntry {
 				cp.Rules[i2].Filters.URLRewrite = new(URLRewrite)
 				*cp.Rules[i2].Filters.URLRewrite = *o.Rules[i2].Filters.URLRewrite
 			}
-			if o.Rules[i2].Filters.RetryFilter != nil {
-				cp.Rules[i2].Filters.RetryFilter = new(RetryFilter)
-				*cp.Rules[i2].Filters.RetryFilter = *o.Rules[i2].Filters.RetryFilter
-				if o.Rules[i2].Filters.RetryFilter.NumRetries != nil {
-					cp.Rules[i2].Filters.RetryFilter.NumRetries = new(uint32)
-					*cp.Rules[i2].Filters.RetryFilter.NumRetries = *o.Rules[i2].Filters.RetryFilter.NumRetries
-				}
-				if o.Rules[i2].Filters.RetryFilter.RetryOn != nil {
-					cp.Rules[i2].Filters.RetryFilter.RetryOn = make([]string, len(o.Rules[i2].Filters.RetryFilter.RetryOn))
-					copy(cp.Rules[i2].Filters.RetryFilter.RetryOn, o.Rules[i2].Filters.RetryFilter.RetryOn)
-				}
-				if o.Rules[i2].Filters.RetryFilter.RetryOnStatusCodes != nil {
-					cp.Rules[i2].Filters.RetryFilter.RetryOnStatusCodes = make([]uint32, len(o.Rules[i2].Filters.RetryFilter.RetryOnStatusCodes))
-					copy(cp.Rules[i2].Filters.RetryFilter.RetryOnStatusCodes, o.Rules[i2].Filters.RetryFilter.RetryOnStatusCodes)
-				}
-				if o.Rules[i2].Filters.RetryFilter.RetryOnConnectFailure != nil {
-					cp.Rules[i2].Filters.RetryFilter.RetryOnConnectFailure = new(bool)
-					*cp.Rules[i2].Filters.RetryFilter.RetryOnConnectFailure = *o.Rules[i2].Filters.RetryFilter.RetryOnConnectFailure
-				}
-			}
-			if o.Rules[i2].Filters.TimeoutFilter != nil {
-				cp.Rules[i2].Filters.TimeoutFilter = new(TimeoutFilter)
-				*cp.Rules[i2].Filters.TimeoutFilter = *o.Rules[i2].Filters.TimeoutFilter
-			}
-			if o.Rules[i2].Filters.JWT != nil {
-				cp.Rules[i2].Filters.JWT = o.Rules[i2].Filters.JWT.DeepCopy()
-			}
-			if o.Rules[i2].ResponseFilters.Headers != nil {
-				cp.Rules[i2].ResponseFilters.Headers = make([]HTTPHeaderFilter, len(o.Rules[i2].ResponseFilters.Headers))
-				copy(cp.Rules[i2].ResponseFilters.Headers, o.Rules[i2].ResponseFilters.Headers)
-				for i5 := range o.Rules[i2].ResponseFilters.Headers {
-					if o.Rules[i2].ResponseFilters.Headers[i5].Add != nil {
-						cp.Rules[i2].ResponseFilters.Headers[i5].Add = make(map[string]string, len(o.Rules[i2].ResponseFilters.Headers[i5].Add))
-						for k7, v7 := range o.Rules[i2].ResponseFilters.Headers[i5].Add {
-							cp.Rules[i2].ResponseFilters.Headers[i5].Add[k7] = v7
-						}
-					}
-					if o.Rules[i2].ResponseFilters.Headers[i5].Remove != nil {
-						cp.Rules[i2].ResponseFilters.Headers[i5].Remove = make([]string, len(o.Rules[i2].ResponseFilters.Headers[i5].Remove))
-						copy(cp.Rules[i2].ResponseFilters.Headers[i5].Remove, o.Rules[i2].ResponseFilters.Headers[i5].Remove)
-					}
-					if o.Rules[i2].ResponseFilters.Headers[i5].Set != nil {
-						cp.Rules[i2].ResponseFilters.Headers[i5].Set = make(map[string]string, len(o.Rules[i2].ResponseFilters.Headers[i5].Set))
-						for k7, v7 := range o.Rules[i2].ResponseFilters.Headers[i5].Set {
-							cp.Rules[i2].ResponseFilters.Headers[i5].Set[k7] = v7
-						}
-					}
-				}
-			}
 			if o.Rules[i2].Matches != nil {
 				cp.Rules[i2].Matches = make([]HTTPMatch, len(o.Rules[i2].Matches))
 				copy(cp.Rules[i2].Matches, o.Rules[i2].Matches)
@@ -490,55 +377,6 @@ func (o *HTTPRouteConfigEntry) DeepCopy() *HTTPRouteConfigEntry {
 						cp.Rules[i2].Services[i4].Filters.URLRewrite = new(URLRewrite)
 						*cp.Rules[i2].Services[i4].Filters.URLRewrite = *o.Rules[i2].Services[i4].Filters.URLRewrite
 					}
-					if o.Rules[i2].Services[i4].Filters.RetryFilter != nil {
-						cp.Rules[i2].Services[i4].Filters.RetryFilter = new(RetryFilter)
-						*cp.Rules[i2].Services[i4].Filters.RetryFilter = *o.Rules[i2].Services[i4].Filters.RetryFilter
-						if o.Rules[i2].Services[i4].Filters.RetryFilter.NumRetries != nil {
-							cp.Rules[i2].Services[i4].Filters.RetryFilter.NumRetries = new(uint32)
-							*cp.Rules[i2].Services[i4].Filters.RetryFilter.NumRetries = *o.Rules[i2].Services[i4].Filters.RetryFilter.NumRetries
-						}
-						if o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOn != nil {
-							cp.Rules[i2].Services[i4].Filters.RetryFilter.RetryOn = make([]string, len(o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOn))
-							copy(cp.Rules[i2].Services[i4].Filters.RetryFilter.RetryOn, o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOn)
-						}
-						if o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnStatusCodes != nil {
-							cp.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnStatusCodes = make([]uint32, len(o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnStatusCodes))
-							copy(cp.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnStatusCodes, o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnStatusCodes)
-						}
-						if o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnConnectFailure != nil {
-							cp.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnConnectFailure = new(bool)
-							*cp.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnConnectFailure = *o.Rules[i2].Services[i4].Filters.RetryFilter.RetryOnConnectFailure
-						}
-					}
-					if o.Rules[i2].Services[i4].Filters.TimeoutFilter != nil {
-						cp.Rules[i2].Services[i4].Filters.TimeoutFilter = new(TimeoutFilter)
-						*cp.Rules[i2].Services[i4].Filters.TimeoutFilter = *o.Rules[i2].Services[i4].Filters.TimeoutFilter
-					}
-					if o.Rules[i2].Services[i4].Filters.JWT != nil {
-						cp.Rules[i2].Services[i4].Filters.JWT = o.Rules[i2].Services[i4].Filters.JWT.DeepCopy()
-					}
-					if o.Rules[i2].Services[i4].ResponseFilters.Headers != nil {
-						cp.Rules[i2].Services[i4].ResponseFilters.Headers = make([]HTTPHeaderFilter, len(o.Rules[i2].Services[i4].ResponseFilters.Headers))
-						copy(cp.Rules[i2].Services[i4].ResponseFilters.Headers, o.Rules[i2].Services[i4].ResponseFilters.Headers)
-						for i7 := range o.Rules[i2].Services[i4].ResponseFilters.Headers {
-							if o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Add != nil {
-								cp.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Add = make(map[string]string, len(o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Add))
-								for k9, v9 := range o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Add {
-									cp.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Add[k9] = v9
-								}
-							}
-							if o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Remove != nil {
-								cp.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Remove = make([]string, len(o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Remove))
-								copy(cp.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Remove, o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Remove)
-							}
-							if o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Set != nil {
-								cp.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Set = make(map[string]string, len(o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Set))
-								for k9, v9 := range o.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Set {
-									cp.Rules[i2].Services[i4].ResponseFilters.Headers[i7].Set[k9] = v9
-								}
-							}
-						}
-					}
 				}
 			}
 		}
@@ -693,34 +531,6 @@ func (o *Intention) DeepCopy() *Intention {
 			}
 		}
 	}
-	if o.JWT != nil {
-		cp.JWT = new(IntentionJWTRequirement)
-		*cp.JWT = *o.JWT
-		if o.JWT.Providers != nil {
-			cp.JWT.Providers = make([]*IntentionJWTProvider, len(o.JWT.Providers))
-			copy(cp.JWT.Providers, o.JWT.Providers)
-			for i4 := range o.JWT.Providers {
-				if o.JWT.Providers[i4] != nil {
-					cp.JWT.Providers[i4] = new(IntentionJWTProvider)
-					*cp.JWT.Providers[i4] = *o.JWT.Providers[i4]
-					if o.JWT.Providers[i4].VerifyClaims != nil {
-						cp.JWT.Providers[i4].VerifyClaims = make([]*IntentionJWTClaimVerification, len(o.JWT.Providers[i4].VerifyClaims))
-						copy(cp.JWT.Providers[i4].VerifyClaims, o.JWT.Providers[i4].VerifyClaims)
-						for i7 := range o.JWT.Providers[i4].VerifyClaims {
-							if o.JWT.Providers[i4].VerifyClaims[i7] != nil {
-								cp.JWT.Providers[i4].VerifyClaims[i7] = new(IntentionJWTClaimVerification)
-								*cp.JWT.Providers[i4].VerifyClaims[i7] = *o.JWT.Providers[i4].VerifyClaims[i7]
-								if o.JWT.Providers[i4].VerifyClaims[i7].Path != nil {
-									cp.JWT.Providers[i4].VerifyClaims[i7].Path = make([]string, len(o.JWT.Providers[i4].VerifyClaims[i7].Path))
-									copy(cp.JWT.Providers[i4].VerifyClaims[i7].Path, o.JWT.Providers[i4].VerifyClaims[i7].Path)
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
 	if o.Meta != nil {
 		cp.Meta = make(map[string]string, len(o.Meta))
 		for k2, v2 := range o.Meta {
@@ -749,34 +559,6 @@ func (o *IntentionPermission) DeepCopy() *IntentionPermission {
 			copy(cp.HTTP.Methods, o.HTTP.Methods)
 		}
 	}
-	if o.JWT != nil {
-		cp.JWT = new(IntentionJWTRequirement)
-		*cp.JWT = *o.JWT
-		if o.JWT.Providers != nil {
-			cp.JWT.Providers = make([]*IntentionJWTProvider, len(o.JWT.Providers))
-			copy(cp.JWT.Providers, o.JWT.Providers)
-			for i4 := range o.JWT.Providers {
-				if o.JWT.Providers[i4] != nil {
-					cp.JWT.Providers[i4] = new(IntentionJWTProvider)
-					*cp.JWT.Providers[i4] = *o.JWT.Providers[i4]
-					if o.JWT.Providers[i4].VerifyClaims != nil {
-						cp.JWT.Providers[i4].VerifyClaims = make([]*IntentionJWTClaimVerification, len(o.JWT.Providers[i4].VerifyClaims))
-						copy(cp.JWT.Providers[i4].VerifyClaims, o.JWT.Providers[i4].VerifyClaims)
-						for i7 := range o.JWT.Providers[i4].VerifyClaims {
-							if o.JWT.Providers[i4].VerifyClaims[i7] != nil {
-								cp.JWT.Providers[i4].VerifyClaims[i7] = new(IntentionJWTClaimVerification)
-								*cp.JWT.Providers[i4].VerifyClaims[i7] = *o.JWT.Providers[i4].VerifyClaims[i7]
-								if o.JWT.Providers[i4].VerifyClaims[i7].Path != nil {
-									cp.JWT.Providers[i4].VerifyClaims[i7].Path = make([]string, len(o.JWT.Providers[i4].VerifyClaims[i7].Path))
-									copy(cp.JWT.Providers[i4].VerifyClaims[i7].Path, o.JWT.Providers[i4].VerifyClaims[i7].Path)
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
 	return &cp
 }
 
@@ -864,10 +646,6 @@ func (o *Node) DeepCopy() *Node {
 			cp.Meta[k2] = v2
 		}
 	}
-	if o.Locality != nil {
-		cp.Locality = new(Locality)
-		*cp.Locality = *o.Locality
-	}
 	return &cp
 }
 
@@ -894,10 +672,6 @@ func (o *NodeService) DeepCopy() *NodeService {
 		cp.Weights = new(Weights)
 		*cp.Weights = *o.Weights
 	}
-	if o.Locality != nil {
-		cp.Locality = new(Locality)
-		*cp.Locality = *o.Locality
-	}
 	{
 		retV := o.Proxy.DeepCopy()
 		cp.Proxy = *retV
@@ -941,14 +715,6 @@ func (o *ServiceConfigEntry) DeepCopy() *ServiceConfigEntry {
 			copy(cp.Destination.Addresses, o.Destination.Addresses)
 		}
 	}
-	if o.RateLimits != nil {
-		cp.RateLimits = new(RateLimits)
-		*cp.RateLimits = *o.RateLimits
-		if o.RateLimits.InstanceLevel.Routes != nil {
-			cp.RateLimits.InstanceLevel.Routes = make([]InstanceLevelRouteRateLimits, len(o.RateLimits.InstanceLevel.Routes))
-			copy(cp.RateLimits.InstanceLevel.Routes, o.RateLimits.InstanceLevel.Routes)
-		}
-	}
 	if o.EnvoyExtensions != nil {
 		cp.EnvoyExtensions = make([]EnvoyExtension, len(o.EnvoyExtensions))
 		copy(cp.EnvoyExtensions, o.EnvoyExtensions)
@@ -979,6 +745,18 @@ func (o *ServiceConfigResponse) DeepCopy() *ServiceConfigResponse {
 			cp.ProxyConfig[k2] = v2
 		}
 	}
+	if o.UpstreamIDConfigs != nil {
+		cp.UpstreamIDConfigs = make([]OpaqueUpstreamConfigDeprecated, len(o.UpstreamIDConfigs))
+		copy(cp.UpstreamIDConfigs, o.UpstreamIDConfigs)
+		for i2 := range o.UpstreamIDConfigs {
+			if o.UpstreamIDConfigs[i2].Config != nil {
+				cp.UpstreamIDConfigs[i2].Config = make(map[string]interface{}, len(o.UpstreamIDConfigs[i2].Config))
+				for k4, v4 := range o.UpstreamIDConfigs[i2].Config {
+					cp.UpstreamIDConfigs[i2].Config[k4] = v4
+				}
+			}
+		}
+	}
 	if o.UpstreamConfigs != nil {
 		cp.UpstreamConfigs = make([]OpaqueUpstreamConfig, len(o.UpstreamConfigs))
 		copy(cp.UpstreamConfigs, o.UpstreamConfigs)
@@ -999,10 +777,6 @@ func (o *ServiceConfigResponse) DeepCopy() *ServiceConfigResponse {
 		cp.Destination.Addresses = make([]string, len(o.Destination.Addresses))
 		copy(cp.Destination.Addresses, o.Destination.Addresses)
 	}
-	if o.RateLimits.InstanceLevel.Routes != nil {
-		cp.RateLimits.InstanceLevel.Routes = make([]InstanceLevelRouteRateLimits, len(o.RateLimits.InstanceLevel.Routes))
-		copy(cp.RateLimits.InstanceLevel.Routes, o.RateLimits.InstanceLevel.Routes)
-	}
 	if o.Meta != nil {
 		cp.Meta = make(map[string]string, len(o.Meta))
 		for k2, v2 := range o.Meta {
@@ -1072,10 +846,6 @@ func (o *ServiceDefinition) DeepCopy() *ServiceDefinition {
 		cp.Weights = new(Weights)
 		*cp.Weights = *o.Weights
 	}
-	if o.Locality != nil {
-		cp.Locality = new(Locality)
-		*cp.Locality = *o.Locality
-	}
 	if o.Proxy != nil {
 		cp.Proxy = o.Proxy.DeepCopy()
 	}
@@ -1109,10 +879,6 @@ func (o *ServiceResolverConfigEntry) DeepCopy() *ServiceResolverConfigEntry {
 			cp.Failover[k2] = cp_Failover_v2
 		}
 	}
-	if o.PrioritizeByLocality != nil {
-		cp.PrioritizeByLocality = new(ServiceResolverPrioritizeByLocality)
-		*cp.PrioritizeByLocality = *o.PrioritizeByLocality
-	}
 	if o.LoadBalancer != nil {
 		cp.LoadBalancer = o.LoadBalancer.DeepCopy()
 	}
@@ -1136,14 +902,6 @@ func (o *ServiceResolverFailover) DeepCopy() *ServiceResolverFailover {
 		cp.Targets = make([]ServiceResolverFailoverTarget, len(o.Targets))
 		copy(cp.Targets, o.Targets)
 	}
-	if o.Policy != nil {
-		cp.Policy = new(ServiceResolverFailoverPolicy)
-		*cp.Policy = *o.Policy
-		if o.Policy.Regions != nil {
-			cp.Policy.Regions = make([]string, len(o.Policy.Regions))
-			copy(cp.Policy.Regions, o.Policy.Regions)
-		}
-	}
 	return &cp
 }
 
diff --git a/agent/structs/structs.deepcopy_ce.go b/agent/structs/structs.deepcopy_ce.go
deleted file mode 100644
index 71f20d7632d55..0000000000000
--- a/agent/structs/structs.deepcopy_ce.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package structs
-
-// DeepCopy generates a deep copy of *APIGatewayJWTRequirement
-func (o *APIGatewayJWTRequirement) DeepCopy() *APIGatewayJWTRequirement {
-	return new(APIGatewayJWTRequirement)
-}
-
-// DeepCopy generates a deep copy of *JWTFilter
-func (o *JWTFilter) DeepCopy() *JWTFilter {
-	return new(JWTFilter)
-}
diff --git a/agent/structs/structs.go b/agent/structs/structs.go
index 5a6fd95118920..9e46c3b18f6c1 100644
--- a/agent/structs/structs.go
+++ b/agent/structs/structs.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -87,8 +84,6 @@ const (
 	PeeringTrustBundleDeleteType                = 39
 	PeeringSecretsWriteType                     = 40
 	RaftLogVerifierCheckpoint                   = 41 // Only used for log verifier, no-op on FSM.
-	ResourceOperationType                       = 42
-	UpdateVirtualIPRequestType                  = 43
 )
 
 const (
@@ -156,8 +151,6 @@ var requestTypeStrings = map[MessageType]string{
 	PeeringTrustBundleDeleteType:    "PeeringTrustBundleDelete",
 	PeeringSecretsWriteType:         "PeeringSecret",
 	RaftLogVerifierCheckpoint:       "RaftLogVerifierCheckpoint",
-	ResourceOperationType:           "Resource",
-	UpdateVirtualIPRequestType:      "UpdateManualVirtualIPRequestType",
 }
 
 const (
@@ -220,9 +213,6 @@ const (
 	// WildcardSpecifier is the string which should be used for specifying a wildcard
 	// The exact semantics of the wildcard is left up to the code where its used.
 	WildcardSpecifier = "*"
-
-	// MetaConsulVersion is the node metadata key used to store the node's consul version
-	MetaConsulVersion = "consul-version"
 )
 
 var allowedConsulMetaKeysForMeshGateway = map[string]struct{}{MetaWANFederationKey: {}}
@@ -483,7 +473,6 @@ type RegisterRequest struct {
 	Service         *NodeService
 	Check           *HealthCheck
 	Checks          HealthChecks
-	Locality        *Locality
 
 	// SkipNodeUpdate can be used when a register request is intended for
 	// updating a service and/or checks, but doesn't want to overwrite any
@@ -528,8 +517,7 @@ func (r *RegisterRequest) ChangesNode(node *Node) bool {
 		r.Address != node.Address ||
 		r.Datacenter != node.Datacenter ||
 		!reflect.DeepEqual(r.TaggedAddresses, node.TaggedAddresses) ||
-		!reflect.DeepEqual(r.NodeMeta, node.Meta) ||
-		!reflect.DeepEqual(r.Locality, node.Locality) {
+		!reflect.DeepEqual(r.NodeMeta, node.Meta) {
 		return true
 	}
 
@@ -898,7 +886,6 @@ type Node struct {
 	PeerName        string `json:",omitempty"`
 	TaggedAddresses map[string]string
 	Meta            map[string]string
-	Locality        *Locality `json:",omitempty" bexpr:"-"`
 
 	RaftIndex `bexpr:"-"`
 }
@@ -1069,7 +1056,6 @@ type ServiceNode struct {
 	ServiceEnableTagOverride bool
 	ServiceProxy             ConnectProxyConfig
 	ServiceConnect           ServiceConnect
-	ServiceLocality          *Locality `bexpr:"-"`
 
 	// If not empty, PeerName represents the peer that this ServiceNode was imported from.
 	PeerName string `json:",omitempty"`
@@ -1128,7 +1114,6 @@ func (s *ServiceNode) PartialClone() *ServiceNode {
 		ServiceEnableTagOverride: s.ServiceEnableTagOverride,
 		ServiceProxy:             s.ServiceProxy,
 		ServiceConnect:           s.ServiceConnect,
-		ServiceLocality:          s.ServiceLocality,
 		RaftIndex: RaftIndex{
 			CreateIndex: s.CreateIndex,
 			ModifyIndex: s.ModifyIndex,
@@ -1156,7 +1141,6 @@ func (s *ServiceNode) ToNodeService() *NodeService {
 		Connect:           s.ServiceConnect,
 		PeerName:          s.PeerName,
 		EnterpriseMeta:    s.EnterpriseMeta,
-		Locality:          s.ServiceLocality,
 		RaftIndex: RaftIndex{
 			CreateIndex: s.CreateIndex,
 			ModifyIndex: s.ModifyIndex,
@@ -1303,7 +1287,6 @@ type NodeService struct {
 	SocketPath        string `json:",omitempty"` // TODO This might be integrated into Address somehow, but not sure about the ergonomics. Only one of (address,port) or socketpath can be defined.
 	Weights           *Weights
 	EnableTagOverride bool
-	Locality          *Locality `json:",omitempty" bexpr:"-"`
 
 	// Proxy is the configuration set for Kind = connect-proxy. It is mandatory in
 	// that case and an error to be set for any other kind. This config is part of
@@ -1483,10 +1466,6 @@ func (s *NodeService) IsGateway() bool {
 func (s *NodeService) Validate() error {
 	var result error
 
-	if err := s.Locality.Validate(); err != nil {
-		result = multierror.Append(result, err)
-	}
-
 	if s.Kind == ServiceKindConnectProxy {
 		if s.Port == 0 && s.SocketPath == "" {
 			result = multierror.Append(result, fmt.Errorf("Port or SocketPath must be set for a %s", s.Kind))
@@ -1694,7 +1673,6 @@ func (s *NodeService) IsSame(other *NodeService) bool {
 		!reflect.DeepEqual(s.TaggedAddresses, other.TaggedAddresses) ||
 		!reflect.DeepEqual(s.Weights, other.Weights) ||
 		!reflect.DeepEqual(s.Meta, other.Meta) ||
-		!reflect.DeepEqual(s.Locality, other.Locality) ||
 		s.EnableTagOverride != other.EnableTagOverride ||
 		s.Kind != other.Kind ||
 		!reflect.DeepEqual(s.Proxy, other.Proxy) ||
@@ -1770,7 +1748,6 @@ func (s *NodeService) ToServiceNode(node string) *ServiceNode {
 		ServiceEnableTagOverride: s.EnableTagOverride,
 		ServiceProxy:             s.Proxy,
 		ServiceConnect:           s.Connect,
-		ServiceLocality:          s.Locality,
 		EnterpriseMeta:           s.EnterpriseMeta,
 		PeerName:                 s.PeerName,
 		RaftIndex: RaftIndex{
@@ -1879,7 +1856,6 @@ type HealthCheckDefinition struct {
 	Body                           string              `json:",omitempty"`
 	DisableRedirects               bool                `json:",omitempty"`
 	TCP                            string              `json:",omitempty"`
-	TCPUseTLS                      bool                `json:",omitempty"`
 	UDP                            string              `json:",omitempty"`
 	H2PING                         string              `json:",omitempty"`
 	OSService                      string              `json:",omitempty"`
@@ -2032,7 +2008,6 @@ func (c *HealthCheck) CheckType() *CheckType {
 		Body:                           c.Definition.Body,
 		DisableRedirects:               c.Definition.DisableRedirects,
 		TCP:                            c.Definition.TCP,
-		TCPUseTLS:                      c.Definition.TCPUseTLS,
 		UDP:                            c.Definition.UDP,
 		H2PING:                         c.Definition.H2PING,
 		OSService:                      c.Definition.OSService,
@@ -2100,18 +2075,6 @@ func (csn *CheckServiceNode) CanRead(authz acl.Authorizer) acl.EnforcementDecisi
 	return acl.Allow
 }
 
-func (csn *CheckServiceNode) Locality() *Locality {
-	if csn.Service != nil && csn.Service.Locality != nil {
-		return csn.Service.Locality
-	}
-
-	if csn.Node != nil && csn.Node.Locality != nil {
-		return csn.Node.Locality
-	}
-
-	return nil
-}
-
 type CheckServiceNodes []CheckServiceNode
 
 func (csns CheckServiceNodes) DeepCopy() CheckServiceNodes {
@@ -2329,7 +2292,6 @@ type ServiceUsage struct {
 	ServiceInstances         int
 	ConnectServiceInstances  map[string]int
 	BillableServiceInstances int
-	Nodes                    int
 	EnterpriseServiceUsage
 }
 
@@ -2343,11 +2305,6 @@ func (psn PeeredServiceName) String() string {
 	return fmt.Sprintf("%v:%v", psn.ServiceName.String(), psn.Peer)
 }
 
-type ServiceNameWithSamenessGroup struct {
-	SamenessGroup string
-	ServiceName
-}
-
 type ServiceName struct {
 	Name               string
 	acl.EnterpriseMeta `mapstructure:",squash"`
@@ -3105,43 +3062,3 @@ func TimeToProto(s time.Time) *timestamppb.Timestamp {
 func IsZeroProtoTime(t *timestamppb.Timestamp) bool {
 	return t.Seconds == 0 && t.Nanos == 0
 }
-
-// Locality identifies where a given entity is running.
-type Locality struct {
-	// Region is region the zone belongs to.
-	Region string `json:",omitempty"`
-
-	// Zone is the zone the entity is running in.
-	Zone string `json:",omitempty"`
-}
-
-// ToAPI converts a struct Locality to an API Locality.
-func (l *Locality) ToAPI() *api.Locality {
-	if l == nil {
-		return nil
-	}
-
-	return &api.Locality{
-		Region: l.Region,
-		Zone:   l.Zone,
-	}
-}
-
-func (l *Locality) GetRegion() string {
-	if l == nil {
-		return ""
-	}
-	return l.Region
-}
-
-func (l *Locality) Validate() error {
-	if l == nil {
-		return nil
-	}
-
-	if l.Region == "" && l.Zone != "" {
-		return fmt.Errorf("zone cannot be set without region")
-	}
-
-	return nil
-}
diff --git a/agent/structs/structs_ce.go b/agent/structs/structs_ce.go
index 2fa039032c23b..dcb1641aa0a5d 100644
--- a/agent/structs/structs_ce.go
+++ b/agent/structs/structs_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
@@ -173,13 +171,3 @@ func (s *ServiceNode) NodeIdentity() Identity {
 }
 
 type EnterpriseServiceUsage struct{}
-
-// WithNormalizedUpstreams returns a deep copy of the NodeService with no modifications to
-// data for CE versions.
-func (ns *NodeService) WithNormalizedUpstreams() *NodeService {
-	// Simply return a copy for CE, since it doesn't have partitions or namespaces.
-	if ns == nil {
-		return nil
-	}
-	return ns.DeepCopy()
-}
diff --git a/agent/structs/structs_ce_test.go b/agent/structs/structs_ce_test.go
index 67e3825f24f9c..54bbb0f2f9022 100644
--- a/agent/structs/structs_ce_test.go
+++ b/agent/structs/structs_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package structs
 
diff --git a/agent/structs/structs_ext_test.go b/agent/structs/structs_ext_test.go
index 3b1cd6b6df1cf..185f586906886 100644
--- a/agent/structs/structs_ext_test.go
+++ b/agent/structs/structs_ext_test.go
@@ -1,13 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs_test
 
 import (
 	"testing"
 
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/agent/structs/structs_filtering_test.go b/agent/structs/structs_filtering_test.go
index 3750adb16ce1f..cdc84db15292e 100644
--- a/agent/structs/structs_filtering_test.go
+++ b/agent/structs/structs_filtering_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -197,16 +194,6 @@ var expectedFieldConfigEnvoyExtensions bexpr.FieldConfigurations = bexpr.FieldCo
 		CoerceFn:            bexpr.CoerceBool,
 		SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual},
 	},
-	"ConsulVersion": &bexpr.FieldConfiguration{
-		StructFieldName:     "ConsulVersion",
-		CoerceFn:            bexpr.CoerceString,
-		SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual, bexpr.MatchIn, bexpr.MatchNotIn, bexpr.MatchMatches, bexpr.MatchNotMatches},
-	},
-	"EnvoyVersion": &bexpr.FieldConfiguration{
-		StructFieldName:     "EnvoyVersion",
-		CoerceFn:            bexpr.CoerceString,
-		SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual, bexpr.MatchIn, bexpr.MatchNotIn, bexpr.MatchMatches, bexpr.MatchNotMatches},
-	},
 }
 var expectedFieldConfigUpstreams bexpr.FieldConfigurations = bexpr.FieldConfigurations{
 	"DestinationType": &bexpr.FieldConfiguration{
@@ -754,11 +741,6 @@ var expectedFieldConfigIntention bexpr.FieldConfigurations = bexpr.FieldConfigur
 		CoerceFn:            bexpr.CoerceString,
 		SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual, bexpr.MatchIn, bexpr.MatchNotIn, bexpr.MatchMatches, bexpr.MatchNotMatches},
 	},
-	"SourceSamenessGroup": &bexpr.FieldConfiguration{
-		StructFieldName:     "SourceSamenessGroup",
-		CoerceFn:            bexpr.CoerceString,
-		SupportedOperations: []bexpr.MatchOperator{bexpr.MatchEqual, bexpr.MatchNotEqual, bexpr.MatchIn, bexpr.MatchNotIn, bexpr.MatchMatches, bexpr.MatchNotMatches},
-	},
 	"SourcePartition": &bexpr.FieldConfiguration{
 		StructFieldName:     "SourcePartition",
 		CoerceFn:            bexpr.CoerceString,
diff --git a/agent/structs/structs_test.go b/agent/structs/structs_test.go
index bf909aa41903e..cc3e70fe7925f 100644
--- a/agent/structs/structs_test.go
+++ b/agent/structs/structs_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
@@ -592,43 +589,6 @@ func TestStructs_ServiceNode_Conversions(t *testing.T) {
 	}
 }
 
-func TestStructs_Locality_Validate(t *testing.T) {
-	type testCase struct {
-		locality *Locality
-		err      string
-	}
-	cases := map[string]testCase{
-		"nil": {
-			nil,
-			"",
-		},
-		"region only": {
-			&Locality{Region: "us-west-1"},
-			"",
-		},
-		"region and zone": {
-			&Locality{Region: "us-west-1", Zone: "us-west-1a"},
-			"",
-		},
-		"zone only": {
-			&Locality{Zone: "us-west-1a"},
-			"zone cannot be set without region",
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			err := tc.locality.Validate()
-			if tc.err == "" {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				require.Contains(t, err.Error(), tc.err)
-			}
-		})
-	}
-}
-
 func TestStructs_NodeService_ValidateMeshGateway(t *testing.T) {
 	type testCase struct {
 		Modify func(*NodeService)
@@ -1189,13 +1149,6 @@ func TestStructs_NodeService_ValidateConnectProxy(t *testing.T) {
 			},
 			"",
 		},
-		{
-			"connect-proxy: invalid locality",
-			func(x *NodeService) {
-				x.Locality = &Locality{Zone: "bad"}
-			},
-			"zone cannot be set without region",
-		},
 	}
 
 	for _, tc := range cases {
@@ -1358,7 +1311,7 @@ func TestStructs_NodeService_ValidateSidecarService(t *testing.T) {
 }
 
 func TestStructs_NodeService_ConnectNativeEmptyPortError(t *testing.T) {
-	ns := TestNodeService()
+	ns := TestNodeService(t)
 	ns.Connect.Native = true
 	ns.Port = 0
 	err := ns.Validate()
diff --git a/agent/structs/system_metadata.go b/agent/structs/system_metadata.go
index 555756201a5d2..2c038872bf11b 100644
--- a/agent/structs/system_metadata.go
+++ b/agent/structs/system_metadata.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 // SystemMetadataOp is the operation for a request related to system metadata.
diff --git a/agent/structs/testing.go b/agent/structs/testing.go
index 527da21c4e890..5d42cf7e3d86d 100644
--- a/agent/structs/testing.go
+++ b/agent/structs/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/testing_catalog.go b/agent/structs/testing_catalog.go
index 8047695bba564..dfc108adb70c7 100644
--- a/agent/structs/testing_catalog.go
+++ b/agent/structs/testing_catalog.go
@@ -1,14 +1,10 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
 	"fmt"
 
-	"github.com/mitchellh/go-testing-interface"
-
 	"github.com/hashicorp/consul/acl"
+	"github.com/mitchellh/go-testing-interface"
 )
 
 // TestRegisterRequest returns a RegisterRequest for registering a typical service.
@@ -48,11 +44,11 @@ func TestRegisterIngressGateway(t testing.T) *RegisterRequest {
 }
 
 // TestNodeService returns a *NodeService representing a valid regular service: "web".
-func TestNodeService() *NodeService {
-	return TestNodeServiceWithName("web")
+func TestNodeService(t testing.T) *NodeService {
+	return TestNodeServiceWithName(t, "web")
 }
 
-func TestNodeServiceWithName(name string) *NodeService {
+func TestNodeServiceWithName(t testing.T, name string) *NodeService {
 	return &NodeService{
 		Kind:    ServiceKindTypical,
 		Service: name,
diff --git a/agent/structs/testing_connect_proxy_config.go b/agent/structs/testing_connect_proxy_config.go
index 971e355fba2da..0021612e9e84e 100644
--- a/agent/structs/testing_connect_proxy_config.go
+++ b/agent/structs/testing_connect_proxy_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/testing_intention.go b/agent/structs/testing_intention.go
index 974a103de1bd4..c8a42d7916908 100644
--- a/agent/structs/testing_intention.go
+++ b/agent/structs/testing_intention.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/testing_service_definition.go b/agent/structs/testing_service_definition.go
index da51014f43115..1e4938da83be8 100644
--- a/agent/structs/testing_service_definition.go
+++ b/agent/structs/testing_service_definition.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/structs/txn.go b/agent/structs/txn.go
index efb11aa891eae..6e0804a713b0f 100644
--- a/agent/structs/txn.go
+++ b/agent/structs/txn.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/agent/submatview/handler.go b/agent/submatview/handler.go
index f33746a7f324c..8f03fbfd4f95c 100644
--- a/agent/submatview/handler.go
+++ b/agent/submatview/handler.go
@@ -1,10 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package submatview
 
 import (
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // eventHandler is a function which performs some operation on the received
diff --git a/agent/submatview/local_materializer.go b/agent/submatview/local_materializer.go
index 4ee06a3640298..b3d4480bdaca9 100644
--- a/agent/submatview/local_materializer.go
+++ b/agent/submatview/local_materializer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package submatview
 
 import (
@@ -12,7 +9,7 @@ import (
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/lib/retry"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // LocalMaterializer is a materializer for a stream of events
diff --git a/agent/submatview/local_materializer_test.go b/agent/submatview/local_materializer_test.go
index fa7a01845034b..3e6f522f1d589 100644
--- a/agent/submatview/local_materializer_test.go
+++ b/agent/submatview/local_materializer_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package submatview
 
 import (
@@ -16,7 +13,7 @@ import (
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 func TestLocalMaterializer(t *testing.T) {
diff --git a/agent/submatview/materializer.go b/agent/submatview/materializer.go
index 42754c914da08..cc8f6311995fd 100644
--- a/agent/submatview/materializer.go
+++ b/agent/submatview/materializer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package submatview
 
 import (
@@ -11,7 +8,7 @@ import (
 	"github.com/hashicorp/go-hclog"
 
 	"github.com/hashicorp/consul/lib/retry"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // View receives events from, and return results to, Materializer. A view is
diff --git a/agent/submatview/rpc_materializer.go b/agent/submatview/rpc_materializer.go
index dfeb90172a695..3b379d4e843a9 100644
--- a/agent/submatview/rpc_materializer.go
+++ b/agent/submatview/rpc_materializer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package submatview
 
 import (
@@ -10,7 +7,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 // RPCMaterializer is a materializer for a streaming cache type
diff --git a/agent/submatview/store.go b/agent/submatview/store.go
index ccfc319e2f4cc..dacf2d8bae2d4 100644
--- a/agent/submatview/store.go
+++ b/agent/submatview/store.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package submatview
 
 import (
@@ -110,7 +107,7 @@ func (s *Store) Run(ctx context.Context) {
 // fields are ignored (ex: MaxAge, and MustRevalidate).
 type Request interface {
 	cache.Request
-	// NewMaterializer will be called if there is no active materializer to fulfill
+	// NewMaterializer will be called if there is no active materializer to fulfil
 	// the request. It should return a Materializer appropriate for streaming
 	// data to fulfil this request.
 	NewMaterializer() (Materializer, error)
diff --git a/agent/submatview/store_integration_test.go b/agent/submatview/store_integration_test.go
index 45ba11d3cc3cf..0e3fb3c6307ed 100644
--- a/agent/submatview/store_integration_test.go
+++ b/agent/submatview/store_integration_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package submatview_test
 
 import (
@@ -16,7 +13,6 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/hashicorp/consul/agent/rpcclient"
 	"github.com/hashicorp/go-hclog"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
@@ -30,7 +26,7 @@ import (
 	"github.com/hashicorp/consul/agent/rpcclient/health"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/submatview"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 )
 
 func TestStore_IntegrationWithBackend(t *testing.T) {
@@ -304,13 +300,11 @@ func newConsumer(t *testing.T, addr net.Addr, store *submatview.Store, srv strin
 	require.NoError(t, err)
 
 	c := &health.Client{
-		Client: rpcclient.Client{
-			UseStreamingBackend: true,
-			ViewStore:           store,
-			MaterializerDeps: rpcclient.MaterializerDeps{
-				Conn:   conn,
-				Logger: hclog.New(nil),
-			},
+		UseStreamingBackend: true,
+		ViewStore:           store,
+		MaterializerDeps: health.MaterializerDeps{
+			Conn:   conn,
+			Logger: hclog.New(nil),
 		},
 	}
 
diff --git a/agent/submatview/store_test.go b/agent/submatview/store_test.go
index c878654d89be9..aab0995998620 100644
--- a/agent/submatview/store_test.go
+++ b/agent/submatview/store_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package submatview
 
 import (
@@ -14,9 +11,9 @@ import (
 
 	"github.com/hashicorp/consul/agent/cache"
 	"github.com/hashicorp/consul/lib/ttlcache"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/proto/private/pbservice"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbcommon"
+	"github.com/hashicorp/consul/proto/pbservice"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 )
diff --git a/agent/submatview/streaming_test.go b/agent/submatview/streaming_test.go
index 54b28d1abe6bc..7d87e63f1d959 100644
--- a/agent/submatview/streaming_test.go
+++ b/agent/submatview/streaming_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package submatview
 
 import (
@@ -8,12 +5,12 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/hashicorp/consul/proto/private/pbcommon"
+	"github.com/hashicorp/consul/proto/pbcommon"
 
 	"google.golang.org/grpc"
 
-	"github.com/hashicorp/consul/proto/private/pbservice"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
+	"github.com/hashicorp/consul/proto/pbservice"
+	"github.com/hashicorp/consul/proto/pbsubscribe"
 	"github.com/hashicorp/consul/types"
 )
 
diff --git a/agent/systemd/notify.go b/agent/systemd/notify.go
index 60c71947dc8a4..445d0ecb2d38c 100644
--- a/agent/systemd/notify.go
+++ b/agent/systemd/notify.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package systemd
 
 import (
diff --git a/agent/testagent.go b/agent/testagent.go
index 037bdc76da688..f81b56314f9cf 100644
--- a/agent/testagent.go
+++ b/agent/testagent.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -17,9 +14,9 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/armon/go-metrics"
+	metrics "github.com/armon/go-metrics"
 	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-uuid"
+	uuid "github.com/hashicorp/go-uuid"
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/config"
@@ -286,22 +283,6 @@ func (a *TestAgent) waitForUp() error {
 			continue // fail, try again
 		}
 		if a.Config.Bootstrap && a.Config.ServerMode {
-			if a.baseDeps.UseV2Resources() {
-				args := structs.DCSpecificRequest{
-					Datacenter: "dc1",
-				}
-				var leader string
-				if err := a.RPC(context.Background(), "Status.Leader", args, &leader); err != nil {
-					retErr = fmt.Errorf("Status.Leader failed: %v", err)
-					continue // fail, try again
-				}
-				if leader == "" {
-					retErr = fmt.Errorf("No leader")
-					continue // fail, try again
-				}
-				return nil // success
-			}
-
 			// Ensure we have a leader and a node registration.
 			args := &structs.DCSpecificRequest{
 				Datacenter: a.Config.Datacenter,
@@ -421,19 +402,6 @@ func (a *TestAgent) consulConfig() *consul.Config {
 	return c
 }
 
-// Using sdk/freeport with *retry.R is not possible without changing
-// function signatures. We use this shim instead to save the headache
-// of syncing sdk submodule updates.
-type retryShim struct {
-	*retry.R
-
-	name string
-}
-
-func (r *retryShim) Name() string {
-	return r.name
-}
-
 // pickRandomPorts selects random ports from fixed size random blocks of
 // ports. This does not eliminate the chance for port conflict but
 // reduces it significantly with little overhead. Furthermore, asking
@@ -443,15 +411,12 @@ func (r *retryShim) Name() string {
 // Instead of relying on one set of ports to be sufficient we retry
 // starting the agent with different ports on port conflict.
 func randomPortsSource(t *testing.T, useHTTPS bool) string {
-	var ports []int
-	retry.RunWith(retry.TwoSeconds(), t, func(r *retry.R) {
-		ports = freeport.GetN(&retryShim{r, t.Name()}, 7)
-	})
+	ports := freeport.GetN(t, 8)
 
 	var http, https int
 	if useHTTPS {
 		http = -1
-		https = ports[1]
+		https = ports[2]
 	} else {
 		http = ports[1]
 		https = -1
@@ -462,11 +427,11 @@ func randomPortsSource(t *testing.T, useHTTPS bool) string {
 			dns = ` + strconv.Itoa(ports[0]) + `
 			http = ` + strconv.Itoa(http) + `
 			https = ` + strconv.Itoa(https) + `
-			serf_lan = ` + strconv.Itoa(ports[2]) + `
-			serf_wan = ` + strconv.Itoa(ports[3]) + `
-			server = ` + strconv.Itoa(ports[4]) + `
-			grpc = ` + strconv.Itoa(ports[5]) + `
-			grpc_tls = ` + strconv.Itoa(ports[6]) + `
+			serf_lan = ` + strconv.Itoa(ports[3]) + `
+			serf_wan = ` + strconv.Itoa(ports[4]) + `
+			server = ` + strconv.Itoa(ports[5]) + `
+			grpc = ` + strconv.Itoa(ports[6]) + `
+			grpc_tls = ` + strconv.Itoa(ports[7]) + `
 		}
 	`
 }
@@ -561,7 +526,6 @@ type TestACLConfigParams struct {
 	DefaultToken           string
 	AgentRecoveryToken     string
 	ReplicationToken       string
-	DNSToken               string
 	EnableTokenReplication bool
 }
 
@@ -580,8 +544,7 @@ func (p *TestACLConfigParams) HasConfiguredTokens() bool {
 		p.AgentToken != "" ||
 		p.DefaultToken != "" ||
 		p.AgentRecoveryToken != "" ||
-		p.ReplicationToken != "" ||
-		p.DNSToken != ""
+		p.ReplicationToken != ""
 }
 
 func TestACLConfigNew() string {
@@ -591,7 +554,6 @@ func TestACLConfigNew() string {
 		InitialManagementToken: "root",
 		AgentToken:             "root",
 		AgentRecoveryToken:     "towel",
-		DNSToken:               "dns",
 	})
 }
 
diff --git a/agent/testagent_test.go b/agent/testagent_test.go
index 266b6e864cc36..39e91a2a69610 100644
--- a/agent/testagent_test.go
+++ b/agent/testagent_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/token/persistence.go b/agent/token/persistence.go
index 1a3898e12e8d4..49e41e3dd2a7d 100644
--- a/agent/token/persistence.go
+++ b/agent/token/persistence.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package token
 
 import (
@@ -26,7 +23,6 @@ type Config struct {
 	ACLAgentRecoveryToken          string
 	ACLReplicationToken            string
 	ACLConfigFileRegistrationToken string
-	ACLDNSToken                    string
 
 	EnterpriseConfig
 }
@@ -78,7 +74,6 @@ type persistedTokens struct {
 	Default                string `json:"default,omitempty"`
 	Agent                  string `json:"agent,omitempty"`
 	ConfigFileRegistration string `json:"config_file_service_registration,omitempty"`
-	DNS                    string `json:"dns,omitempty"`
 }
 
 type fileStore struct {
@@ -146,16 +141,6 @@ func loadTokens(s *Store, cfg Config, tokens persistedTokens, logger Logger) {
 		s.UpdateConfigFileRegistrationToken(cfg.ACLConfigFileRegistrationToken, TokenSourceConfig)
 	}
 
-	if tokens.DNS != "" {
-		s.UpdateDNSToken(tokens.DNS, TokenSourceAPI)
-
-		if cfg.ACLDNSToken != "" {
-			logger.Warn("\"dns\" token present in both the configuration and persisted token store, using the persisted token")
-		}
-	} else {
-		s.UpdateDNSToken(cfg.ACLDNSToken, TokenSourceConfig)
-	}
-
 	loadEnterpriseTokens(s, cfg)
 }
 
@@ -218,10 +203,6 @@ func (p *fileStore) saveToFile(s *Store) error {
 		tokens.ConfigFileRegistration = tok
 	}
 
-	if tok, source := s.DNSTokenAndSource(); tok != "" && source == TokenSourceAPI {
-		tokens.DNS = tok
-	}
-
 	data, err := json.Marshal(tokens)
 	if err != nil {
 		p.logger.Warn("failed to persist tokens", "error", err)
diff --git a/agent/token/persistence_test.go b/agent/token/persistence_test.go
index 4351efd1358e3..2f9fe427c0b68 100644
--- a/agent/token/persistence_test.go
+++ b/agent/token/persistence_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package token
 
 import (
@@ -8,10 +5,9 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/go-hclog"
 	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/sdk/testutil"
 )
 
 func TestStore_Load(t *testing.T) {
@@ -28,7 +24,6 @@ func TestStore_Load(t *testing.T) {
 			ACLDefaultToken:                "charlie",
 			ACLReplicationToken:            "delta",
 			ACLConfigFileRegistrationToken: "echo",
-			ACLDNSToken:                    "foxtrot",
 		}
 		require.NoError(t, store.Load(cfg, logger))
 		require.Equal(t, "alfa", store.AgentToken())
@@ -36,69 +31,62 @@ func TestStore_Load(t *testing.T) {
 		require.Equal(t, "charlie", store.UserToken())
 		require.Equal(t, "delta", store.ReplicationToken())
 		require.Equal(t, "echo", store.ConfigFileRegistrationToken())
-		require.Equal(t, "foxtrot", store.DNSToken())
 	})
 
 	t.Run("updated from Config", func(t *testing.T) {
 		cfg := Config{
 			DataDir:                        dataDir,
-			ACLDefaultToken:                "sierra",
-			ACLAgentToken:                  "tango",
-			ACLAgentRecoveryToken:          "uniform",
-			ACLReplicationToken:            "victor",
-			ACLConfigFileRegistrationToken: "xray",
-			ACLDNSToken:                    "zulu",
+			ACLDefaultToken:                "echo",
+			ACLAgentToken:                  "foxtrot",
+			ACLAgentRecoveryToken:          "golf",
+			ACLReplicationToken:            "hotel",
+			ACLConfigFileRegistrationToken: "india",
 		}
 		// ensures no error for missing persisted tokens file
 		require.NoError(t, store.Load(cfg, logger))
-		require.Equal(t, "sierra", store.UserToken())
-		require.Equal(t, "tango", store.AgentToken())
-		require.Equal(t, "uniform", store.AgentRecoveryToken())
-		require.Equal(t, "victor", store.ReplicationToken())
-		require.Equal(t, "xray", store.ConfigFileRegistrationToken())
-		require.Equal(t, "zulu", store.DNSToken())
+		require.Equal(t, "echo", store.UserToken())
+		require.Equal(t, "foxtrot", store.AgentToken())
+		require.Equal(t, "golf", store.AgentRecoveryToken())
+		require.Equal(t, "hotel", store.ReplicationToken())
+		require.Equal(t, "india", store.ConfigFileRegistrationToken())
 	})
 
 	t.Run("with persisted tokens", func(t *testing.T) {
 		cfg := Config{
 			DataDir:                        dataDir,
-			ACLDefaultToken:                "alpha",
-			ACLAgentToken:                  "bravo",
-			ACLAgentRecoveryToken:          "charlie",
-			ACLReplicationToken:            "delta",
-			ACLConfigFileRegistrationToken: "echo",
-			ACLDNSToken:                    "foxtrot",
+			ACLDefaultToken:                "echo",
+			ACLAgentToken:                  "foxtrot",
+			ACLAgentRecoveryToken:          "golf",
+			ACLReplicationToken:            "hotel",
+			ACLConfigFileRegistrationToken: "delta",
 		}
 
 		tokens := `{
-			"agent" : "golf",
-			"agent_recovery" : "hotel",
-			"default": "india",
-			"replication": "juliet",
-			"config_file_service_registration": "kilo",
-			"dns": "lima"
+			"agent" : "india",
+			"agent_recovery" : "juliett",
+			"default": "kilo",
+			"replication": "lima",
+			"config_file_service_registration": "mike"
 		}`
 
 		require.NoError(t, os.WriteFile(tokenFile, []byte(tokens), 0600))
 		require.NoError(t, store.Load(cfg, logger))
 
 		// no updates since token persistence is not enabled
-		require.Equal(t, "alpha", store.UserToken())
-		require.Equal(t, "bravo", store.AgentToken())
-		require.Equal(t, "charlie", store.AgentRecoveryToken())
-		require.Equal(t, "delta", store.ReplicationToken())
-		require.Equal(t, "echo", store.ConfigFileRegistrationToken())
-		require.Equal(t, "foxtrot", store.DNSToken())
+		require.Equal(t, "echo", store.UserToken())
+		require.Equal(t, "foxtrot", store.AgentToken())
+		require.Equal(t, "golf", store.AgentRecoveryToken())
+		require.Equal(t, "hotel", store.ReplicationToken())
+		require.Equal(t, "delta", store.ConfigFileRegistrationToken())
 
 		cfg.EnablePersistence = true
 		require.NoError(t, store.Load(cfg, logger))
 
-		require.Equal(t, "golf", store.AgentToken())
-		require.Equal(t, "hotel", store.AgentRecoveryToken())
-		require.Equal(t, "india", store.UserToken())
-		require.Equal(t, "juliet", store.ReplicationToken())
-		require.Equal(t, "kilo", store.ConfigFileRegistrationToken())
-		require.Equal(t, "lima", store.DNSToken())
+		require.Equal(t, "india", store.AgentToken())
+		require.Equal(t, "juliett", store.AgentRecoveryToken())
+		require.Equal(t, "kilo", store.UserToken())
+		require.Equal(t, "lima", store.ReplicationToken())
+		require.Equal(t, "mike", store.ConfigFileRegistrationToken())
 
 		// check store persistence was enabled
 		require.NotNil(t, store.persistence)
@@ -124,8 +112,7 @@ func TestStore_Load(t *testing.T) {
 			"agent_recovery" : "november",
 			"default": "oscar",
 			"replication" : "papa",
-			"config_file_service_registration" : "lima",
-			"dns": "kilo"
+			"config_file_service_registration" : "lima"
 		}`
 
 		cfg := Config{
@@ -136,7 +123,6 @@ func TestStore_Load(t *testing.T) {
 			ACLAgentRecoveryToken:          "sierra",
 			ACLReplicationToken:            "tango",
 			ACLConfigFileRegistrationToken: "uniform",
-			ACLDNSToken:                    "victor",
 		}
 
 		require.NoError(t, os.WriteFile(tokenFile, []byte(tokens), 0600))
@@ -147,48 +133,43 @@ func TestStore_Load(t *testing.T) {
 		require.Equal(t, "oscar", store.UserToken())
 		require.Equal(t, "papa", store.ReplicationToken())
 		require.Equal(t, "lima", store.ConfigFileRegistrationToken())
-		require.Equal(t, "kilo", store.DNSToken())
 	})
 
 	t.Run("with some persisted tokens", func(t *testing.T) {
 		tokens := `{
-			"agent" : "xray",
-			"agent_recovery" : "zulu"
+			"agent" : "uniform",
+			"agent_recovery" : "victor"
 		}`
 
 		cfg := Config{
 			EnablePersistence:              true,
 			DataDir:                        dataDir,
-			ACLDefaultToken:                "alpha",
-			ACLAgentToken:                  "bravo",
-			ACLAgentRecoveryToken:          "charlie",
-			ACLReplicationToken:            "delta",
-			ACLConfigFileRegistrationToken: "echo",
-			ACLDNSToken:                    "foxtrot",
+			ACLDefaultToken:                "whiskey",
+			ACLAgentToken:                  "xray",
+			ACLAgentRecoveryToken:          "yankee",
+			ACLReplicationToken:            "zulu",
+			ACLConfigFileRegistrationToken: "victor",
 		}
 
 		require.NoError(t, os.WriteFile(tokenFile, []byte(tokens), 0600))
 		require.NoError(t, store.Load(cfg, logger))
 
-		require.Equal(t, "xray", store.AgentToken())
-		require.Equal(t, "zulu", store.AgentRecoveryToken())
-
-		require.Equal(t, "alpha", store.UserToken())
-		require.Equal(t, "delta", store.ReplicationToken())
-		require.Equal(t, "echo", store.ConfigFileRegistrationToken())
-		require.Equal(t, "foxtrot", store.DNSToken())
+		require.Equal(t, "uniform", store.AgentToken())
+		require.Equal(t, "victor", store.AgentRecoveryToken())
+		require.Equal(t, "whiskey", store.UserToken())
+		require.Equal(t, "zulu", store.ReplicationToken())
+		require.Equal(t, "victor", store.ConfigFileRegistrationToken())
 	})
 
 	t.Run("persisted file contains invalid data", func(t *testing.T) {
 		cfg := Config{
 			EnablePersistence:              true,
 			DataDir:                        dataDir,
-			ACLDefaultToken:                "alpha",
-			ACLAgentToken:                  "bravo",
-			ACLAgentRecoveryToken:          "charlie",
-			ACLReplicationToken:            "delta",
-			ACLConfigFileRegistrationToken: "echo",
-			ACLDNSToken:                    "foxtrot",
+			ACLDefaultToken:                "one",
+			ACLAgentToken:                  "two",
+			ACLAgentRecoveryToken:          "three",
+			ACLReplicationToken:            "four",
+			ACLConfigFileRegistrationToken: "five",
 		}
 
 		require.NoError(t, os.WriteFile(tokenFile, []byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}, 0600))
@@ -196,12 +177,11 @@ func TestStore_Load(t *testing.T) {
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "failed to decode tokens file")
 
-		require.Equal(t, "alpha", store.UserToken())
-		require.Equal(t, "bravo", store.AgentToken())
-		require.Equal(t, "charlie", store.AgentRecoveryToken())
-		require.Equal(t, "delta", store.ReplicationToken())
-		require.Equal(t, "echo", store.ConfigFileRegistrationToken())
-		require.Equal(t, "foxtrot", store.DNSToken())
+		require.Equal(t, "one", store.UserToken())
+		require.Equal(t, "two", store.AgentToken())
+		require.Equal(t, "three", store.AgentRecoveryToken())
+		require.Equal(t, "four", store.ReplicationToken())
+		require.Equal(t, "five", store.ConfigFileRegistrationToken())
 	})
 
 	t.Run("persisted file contains invalid json", func(t *testing.T) {
@@ -211,9 +191,8 @@ func TestStore_Load(t *testing.T) {
 			ACLDefaultToken:                "alfa",
 			ACLAgentToken:                  "bravo",
 			ACLAgentRecoveryToken:          "charlie",
-			ACLReplicationToken:            "delta",
-			ACLConfigFileRegistrationToken: "echo",
-			ACLDNSToken:                    "foxtrot",
+			ACLReplicationToken:            "foxtrot",
+			ACLConfigFileRegistrationToken: "golf",
 		}
 
 		require.NoError(t, os.WriteFile(tokenFile, []byte("[1,2,3]"), 0600))
@@ -224,31 +203,23 @@ func TestStore_Load(t *testing.T) {
 		require.Equal(t, "alfa", store.UserToken())
 		require.Equal(t, "bravo", store.AgentToken())
 		require.Equal(t, "charlie", store.AgentRecoveryToken())
-		require.Equal(t, "delta", store.ReplicationToken())
-		require.Equal(t, "echo", store.ConfigFileRegistrationToken())
-		require.Equal(t, "foxtrot", store.DNSToken())
+		require.Equal(t, "foxtrot", store.ReplicationToken())
+		require.Equal(t, "golf", store.ConfigFileRegistrationToken())
 	})
 }
 
 func TestStore_WithPersistenceLock(t *testing.T) {
-	// ACLDefaultToken:                 alpha   --> sierra
-	// ACLAgentToken:                   bravo   --> tango
-	// ACLAgentRecoveryToken:           charlie --> uniform
-	// ACLReplicationToken:             delta   --> victor
-	// ACLConfigFileRegistrationToken:  echo    --> xray
-	// ACLDNSToken:                     foxtrot --> zulu
 	setupStore := func() (string, *Store) {
 		dataDir := testutil.TempDir(t, "datadir")
 		store := new(Store)
 		cfg := Config{
 			EnablePersistence:              true,
 			DataDir:                        dataDir,
-			ACLDefaultToken:                "alpha",
-			ACLAgentToken:                  "bravo",
-			ACLAgentRecoveryToken:          "charlie",
-			ACLReplicationToken:            "delta",
-			ACLConfigFileRegistrationToken: "echo",
-			ACLDNSToken:                    "foxtrot",
+			ACLDefaultToken:                "default-token",
+			ACLAgentToken:                  "agent-token",
+			ACLAgentRecoveryToken:          "recovery-token",
+			ACLReplicationToken:            "replication-token",
+			ACLConfigFileRegistrationToken: "registration-token",
 		}
 		err := store.Load(cfg, hclog.New(nil))
 		require.NoError(t, err)
@@ -266,39 +237,37 @@ func TestStore_WithPersistenceLock(t *testing.T) {
 	t.Run("persist some tokens", func(t *testing.T) {
 		dataDir, store := setupStore()
 		err := store.WithPersistenceLock(func() error {
-			require.True(t, store.UpdateUserToken("sierra", TokenSourceAPI))
-			require.True(t, store.UpdateAgentRecoveryToken("tango", TokenSourceAPI))
+			require.True(t, store.UpdateUserToken("the-new-default-token", TokenSourceAPI))
+			require.True(t, store.UpdateAgentRecoveryToken("the-new-recovery-token", TokenSourceAPI))
 			return nil
 		})
 		require.NoError(t, err)
 
 		// Only API-sourced tokens are persisted.
 		requirePersistedTokens(t, dataDir, persistedTokens{
-			Default:       "sierra",
-			AgentRecovery: "tango",
+			Default:       "the-new-default-token",
+			AgentRecovery: "the-new-recovery-token",
 		})
 	})
 
 	t.Run("persist all tokens", func(t *testing.T) {
 		dataDir, store := setupStore()
 		err := store.WithPersistenceLock(func() error {
-			require.True(t, store.UpdateUserToken("sierra", TokenSourceAPI))
-			require.True(t, store.UpdateAgentToken("tango", TokenSourceAPI))
-			require.True(t, store.UpdateAgentRecoveryToken("uniform", TokenSourceAPI))
-			require.True(t, store.UpdateReplicationToken("victor", TokenSourceAPI))
-			require.True(t, store.UpdateConfigFileRegistrationToken("xray", TokenSourceAPI))
-			require.True(t, store.UpdateDNSToken("zulu", TokenSourceAPI))
+			require.True(t, store.UpdateUserToken("the-new-default-token", TokenSourceAPI))
+			require.True(t, store.UpdateAgentToken("the-new-agent-token", TokenSourceAPI))
+			require.True(t, store.UpdateAgentRecoveryToken("the-new-recovery-token", TokenSourceAPI))
+			require.True(t, store.UpdateReplicationToken("the-new-replication-token", TokenSourceAPI))
+			require.True(t, store.UpdateConfigFileRegistrationToken("the-new-registration-token", TokenSourceAPI))
 			return nil
 		})
 		require.NoError(t, err)
 
 		requirePersistedTokens(t, dataDir, persistedTokens{
-			Default:                "sierra",
-			Agent:                  "tango",
-			AgentRecovery:          "uniform",
-			Replication:            "victor",
-			ConfigFileRegistration: "xray",
-			DNS:                    "zulu",
+			Default:                "the-new-default-token",
+			Agent:                  "the-new-agent-token",
+			AgentRecovery:          "the-new-recovery-token",
+			Replication:            "the-new-replication-token",
+			ConfigFileRegistration: "the-new-registration-token",
 		})
 	})
 
diff --git a/agent/token/store.go b/agent/token/store.go
index 848d539a2a806..80123e3675eef 100644
--- a/agent/token/store.go
+++ b/agent/token/store.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package token
 
 import (
@@ -24,7 +21,6 @@ const (
 	TokenKindUser
 	TokenKindReplication
 	TokenKindConfigFileRegistration
-	TokenKindDNS
 )
 
 type watcher struct {
@@ -53,7 +49,7 @@ type Store struct {
 	// also be used for agent operations if the agent token isn't set.
 	userToken string
 
-	// userTokenSource indicates where this token originated from.
+	// userTokenSource indicates where this token originated from
 	userTokenSource TokenSource
 
 	// agentToken is used for internal agent operations like self-registering
@@ -61,7 +57,7 @@ type Store struct {
 	// user-initiated operations.
 	agentToken string
 
-	// agentTokenSource indicates where this token originated from.
+	// agentTokenSource indicates where this token originated from
 	agentTokenSource TokenSource
 
 	// agentRecoveryToken is a special token that's only used locally for
@@ -69,30 +65,23 @@ type Store struct {
 	// available.
 	agentRecoveryToken string
 
-	// agentRecoveryTokenSource indicates where this token originated from.
+	// agentRecoveryTokenSource indicates where this token originated from
 	agentRecoveryTokenSource TokenSource
 
 	// replicationToken is a special token that's used by servers to
 	// replicate data from the primary datacenter.
 	replicationToken string
 
-	// replicationTokenSource indicates where this token originated from.
+	// replicationTokenSource indicates where this token originated from
 	replicationTokenSource TokenSource
 
 	// configFileRegistrationToken is used to register services and checks
 	// that are defined in configuration files.
 	configFileRegistrationToken string
 
-	// configFileRegistrationTokenSource indicates where this token originated from.
+	// configFileRegistrationTokenSource indicates where this token originated from
 	configFileRegistrationTokenSource TokenSource
 
-	// dnsToken is a special token that is used as the implicit token for DNS requests
-	// as well as for DNS-specific RPC requests.
-	dnsToken string
-
-	// dnsTokenSource indicates where the dnsToken originated from.
-	dnsTokenSource TokenSource
-
 	watchers     map[int]watcher
 	watcherIndex int
 
@@ -212,12 +201,6 @@ func (t *Store) UpdateConfigFileRegistrationToken(token string, source TokenSour
 		&t.configFileRegistrationTokenSource, TokenKindConfigFileRegistration)
 }
 
-// UpdateDNSToken replaces the current DNS token in the store.
-// Returns true if it was changed.
-func (t *Store) UpdateDNSToken(token string, source TokenSource) bool {
-	return t.updateToken(token, source, &t.dnsToken, &t.dnsTokenSource, TokenKindDNS)
-}
-
 func (t *Store) updateToken(token string, source TokenSource, dstToken *string, dstSource *TokenSource, kind TokenKind) bool {
 	t.l.Lock()
 	changed := *dstToken != token || *dstSource != source
@@ -275,13 +258,6 @@ func (t *Store) ConfigFileRegistrationToken() string {
 	return t.configFileRegistrationToken
 }
 
-func (t *Store) DNSToken() string {
-	t.l.RLock()
-	defer t.l.RUnlock()
-
-	return t.dnsToken
-}
-
 // UserToken returns the best token to use for user operations.
 func (t *Store) UserTokenAndSource() (string, TokenSource) {
 	t.l.RLock()
@@ -320,14 +296,6 @@ func (t *Store) ConfigFileRegistrationTokenAndSource() (string, TokenSource) {
 	return t.configFileRegistrationToken, t.configFileRegistrationTokenSource
 }
 
-// DNSTokenAndSource returns the best token to use for DNS-specific RPC requests and DNS requests
-func (t *Store) DNSTokenAndSource() (string, TokenSource) {
-	t.l.RLock()
-	defer t.l.RUnlock()
-
-	return t.dnsToken, t.dnsTokenSource
-}
-
 // IsAgentRecoveryToken checks to see if a given token is the agent recovery token.
 // This will never match an empty token for safety.
 func (t *Store) IsAgentRecoveryToken(token string) bool {
diff --git a/agent/token/store_ce.go b/agent/token/store_ce.go
index af7732a902088..5cc2b011765f0 100644
--- a/agent/token/store_ce.go
+++ b/agent/token/store_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package token
 
diff --git a/agent/token/store_test.go b/agent/token/store_test.go
index 2f91614085c4f..45bf82d5d5f9f 100644
--- a/agent/token/store_test.go
+++ b/agent/token/store_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package token
 
 import (
@@ -21,8 +18,6 @@ func TestStore_RegularTokens(t *testing.T) {
 		replSource         TokenSource
 		registration       string
 		registrationSource TokenSource
-		dns                string
-		dnsSource          TokenSource
 	}
 
 	tests := []struct {
@@ -97,23 +92,11 @@ func TestStore_RegularTokens(t *testing.T) {
 			raw:       tokens{registration: "G", registrationSource: TokenSourceAPI},
 			effective: tokens{registration: "G"},
 		},
-		{
-			name:      "set dns - config",
-			set:       tokens{dns: "D", dnsSource: TokenSourceConfig},
-			raw:       tokens{dns: "D", dnsSource: TokenSourceConfig},
-			effective: tokens{dns: "D"},
-		},
-		{
-			name:      "set dns - api",
-			set:       tokens{dns: "D", dnsSource: TokenSourceAPI},
-			raw:       tokens{dns: "D", dnsSource: TokenSourceAPI},
-			effective: tokens{dns: "D"},
-		},
 		{
 			name:      "set all",
-			set:       tokens{user: "U", agent: "A", repl: "R", recovery: "M", registration: "G", dns: "D"},
-			raw:       tokens{user: "U", agent: "A", repl: "R", recovery: "M", registration: "G", dns: "D"},
-			effective: tokens{user: "U", agent: "A", repl: "R", recovery: "M", registration: "G", dns: "D"},
+			set:       tokens{user: "U", agent: "A", repl: "R", recovery: "M", registration: "G"},
+			raw:       tokens{user: "U", agent: "A", repl: "R", recovery: "M", registration: "G"},
+			effective: tokens{user: "U", agent: "A", repl: "R", recovery: "M", registration: "G"},
 		},
 	}
 	for _, tt := range tests {
@@ -139,24 +122,18 @@ func TestStore_RegularTokens(t *testing.T) {
 				require.True(t, s.UpdateConfigFileRegistrationToken(tt.set.registration, tt.set.registrationSource))
 			}
 
-			if tt.set.dns != "" {
-				require.True(t, s.UpdateDNSToken(tt.set.dns, tt.set.dnsSource))
-			}
-
 			// If they don't change then they return false.
 			require.False(t, s.UpdateUserToken(tt.set.user, tt.set.userSource))
 			require.False(t, s.UpdateAgentToken(tt.set.agent, tt.set.agentSource))
 			require.False(t, s.UpdateReplicationToken(tt.set.repl, tt.set.replSource))
 			require.False(t, s.UpdateAgentRecoveryToken(tt.set.recovery, tt.set.recoverySource))
 			require.False(t, s.UpdateConfigFileRegistrationToken(tt.set.registration, tt.set.registrationSource))
-			require.False(t, s.UpdateDNSToken(tt.set.dns, tt.set.dnsSource))
 
 			require.Equal(t, tt.effective.user, s.UserToken())
 			require.Equal(t, tt.effective.agent, s.AgentToken())
 			require.Equal(t, tt.effective.recovery, s.AgentRecoveryToken())
 			require.Equal(t, tt.effective.repl, s.ReplicationToken())
 			require.Equal(t, tt.effective.registration, s.ConfigFileRegistrationToken())
-			require.Equal(t, tt.effective.dns, s.DNSToken())
 
 			tok, src := s.UserTokenAndSource()
 			require.Equal(t, tt.raw.user, tok)
@@ -177,10 +154,6 @@ func TestStore_RegularTokens(t *testing.T) {
 			tok, src = s.ConfigFileRegistrationTokenAndSource()
 			require.Equal(t, tt.raw.registration, tok)
 			require.Equal(t, tt.raw.registrationSource, src)
-
-			tok, src = s.DNSTokenAndSource()
-			require.Equal(t, tt.raw.dns, tok)
-			require.Equal(t, tt.raw.dnsSource, src)
 		})
 	}
 }
@@ -235,7 +208,6 @@ func TestStore_Notify(t *testing.T) {
 	replicationNotifier := newNotification(t, s, TokenKindReplication)
 	replicationNotifier2 := newNotification(t, s, TokenKindReplication)
 	registrationNotifier := newNotification(t, s, TokenKindConfigFileRegistration)
-	dnsNotifier := newNotification(t, s, TokenKindDNS)
 
 	// perform an update of the user token
 	require.True(t, s.UpdateUserToken("edcae2a2-3b51-4864-b412-c7a568f49cb1", TokenSourceConfig))
@@ -249,7 +221,6 @@ func TestStore_Notify(t *testing.T) {
 	requireNotNotified(t, agentRecoveryNotifier.Ch)
 	requireNotNotified(t, replicationNotifier2.Ch)
 	requireNotNotified(t, registrationNotifier.Ch)
-	requireNotNotified(t, dnsNotifier.Ch)
 
 	// update the agent token which should send a notification to the agent notifier.
 	require.True(t, s.UpdateAgentToken("5d748ec2-d536-461f-8e2a-1f7eae98d559", TokenSourceAPI))
@@ -260,7 +231,6 @@ func TestStore_Notify(t *testing.T) {
 	requireNotNotified(t, agentRecoveryNotifier.Ch)
 	requireNotNotified(t, replicationNotifier2.Ch)
 	requireNotNotified(t, registrationNotifier.Ch)
-	requireNotNotified(t, dnsNotifier.Ch)
 
 	// update the agent recovery token which should send a notification to the agent recovery notifier.
 	require.True(t, s.UpdateAgentRecoveryToken("789badc8-f850-43e1-8742-9b9f484957cc", TokenSourceAPI))
@@ -271,7 +241,6 @@ func TestStore_Notify(t *testing.T) {
 	requireNotifiedOnce(t, agentRecoveryNotifier.Ch)
 	requireNotNotified(t, replicationNotifier2.Ch)
 	requireNotNotified(t, registrationNotifier.Ch)
-	requireNotNotified(t, dnsNotifier.Ch)
 
 	// update the replication token which should send a notification to the replication notifier.
 	require.True(t, s.UpdateReplicationToken("789badc8-f850-43e1-8742-9b9f484957cc", TokenSourceAPI))
@@ -282,7 +251,6 @@ func TestStore_Notify(t *testing.T) {
 	requireNotNotified(t, agentRecoveryNotifier.Ch)
 	requireNotifiedOnce(t, replicationNotifier2.Ch)
 	requireNotNotified(t, registrationNotifier.Ch)
-	requireNotNotified(t, dnsNotifier.Ch)
 
 	s.StopNotify(replicationNotifier2)
 
@@ -295,7 +263,6 @@ func TestStore_Notify(t *testing.T) {
 	requireNotNotified(t, agentRecoveryNotifier.Ch)
 	requireNotNotified(t, replicationNotifier2.Ch)
 	requireNotNotified(t, registrationNotifier.Ch)
-	requireNotNotified(t, dnsNotifier.Ch)
 
 	// update the config file registration token which should send a notification to the replication notifier.
 	require.True(t, s.UpdateConfigFileRegistrationToken("82fe7362-7d83-4f43-bb27-c35f1f15083c", TokenSourceAPI))
@@ -306,18 +273,6 @@ func TestStore_Notify(t *testing.T) {
 	requireNotNotified(t, agentRecoveryNotifier.Ch)
 	requireNotNotified(t, replicationNotifier2.Ch)
 	requireNotifiedOnce(t, registrationNotifier.Ch)
-	requireNotNotified(t, dnsNotifier.Ch)
-
-	// update the dns token which should send a notification to the replication notifier.
-	require.True(t, s.UpdateDNSToken("ce8e829f-dc45-4ba7-9dd3-1dbbe070f573", TokenSourceAPI))
-
-	requireNotNotified(t, agentNotifier.Ch)
-	requireNotNotified(t, userNotifier.Ch)
-	requireNotNotified(t, replicationNotifier.Ch)
-	requireNotNotified(t, agentRecoveryNotifier.Ch)
-	requireNotNotified(t, replicationNotifier2.Ch)
-	requireNotNotified(t, registrationNotifier.Ch)
-	requireNotifiedOnce(t, dnsNotifier.Ch)
 
 	// request updates that are not changes
 	require.False(t, s.UpdateAgentToken("5d748ec2-d536-461f-8e2a-1f7eae98d559", TokenSourceAPI))
@@ -325,7 +280,6 @@ func TestStore_Notify(t *testing.T) {
 	require.False(t, s.UpdateUserToken("47788919-f944-476a-bda5-446d64be1df8", TokenSourceAPI))
 	require.False(t, s.UpdateReplicationToken("eb0b56b9-fa65-4ae1-902a-c64457c62ac6", TokenSourceAPI))
 	require.False(t, s.UpdateConfigFileRegistrationToken("82fe7362-7d83-4f43-bb27-c35f1f15083c", TokenSourceAPI))
-	require.False(t, s.UpdateDNSToken("ce8e829f-dc45-4ba7-9dd3-1dbbe070f573", TokenSourceAPI))
 
 	// ensure that notifications were not sent
 	requireNotNotified(t, agentNotifier.Ch)
@@ -333,5 +287,4 @@ func TestStore_Notify(t *testing.T) {
 	requireNotNotified(t, replicationNotifier.Ch)
 	requireNotNotified(t, agentRecoveryNotifier.Ch)
 	requireNotNotified(t, registrationNotifier.Ch)
-	requireNotNotified(t, dnsNotifier.Ch)
 }
diff --git a/agent/translate_addr.go b/agent/translate_addr.go
index 1c0f8a4003058..7967347ec12f3 100644
--- a/agent/translate_addr.go
+++ b/agent/translate_addr.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/txn_endpoint.go b/agent/txn_endpoint.go
index 04dcd7fa39022..1eeb4b6d49bab 100644
--- a/agent/txn_endpoint.go
+++ b/agent/txn_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -313,7 +310,6 @@ func (s *HTTPHandlers) convertOps(resp http.ResponseWriter, req *http.Request) (
 							Method:                         check.Definition.Method,
 							Body:                           check.Definition.Body,
 							TCP:                            check.Definition.TCP,
-							TCPUseTLS:                      check.Definition.TCPUseTLS,
 							GRPC:                           check.Definition.GRPC,
 							GRPCUseTLS:                     check.Definition.GRPCUseTLS,
 							OSService:                      check.Definition.OSService,
diff --git a/agent/txn_endpoint_test.go b/agent/txn_endpoint_test.go
index fe19ed825301c..ce94b5c3e63b3 100644
--- a/agent/txn_endpoint_test.go
+++ b/agent/txn_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/ui_endpoint.go b/agent/ui_endpoint.go
index d0cc8a5be8329..aaeb7003e6e24 100644
--- a/agent/ui_endpoint.go
+++ b/agent/ui_endpoint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -13,12 +10,9 @@ import (
 	"strings"
 
 	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/serf/serf"
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/config"
-	"github.com/hashicorp/consul/agent/consul"
-	"github.com/hashicorp/consul/agent/metadata"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/logging"
@@ -113,18 +107,7 @@ RPC:
 		return nil, err
 	}
 
-	// Get version info for all serf members into a map of key-address,value-version.
-	// This logic of calling 'AgentMembersMapAddrVer()' and inserting version info in this func
-	// can be discarded in future releases ( may be after 3 or 4 minor releases),
-	// when all the nodes are registered with consul-version in nodemeta.
-	var err error
-	mapAddrVer, err := AgentMembersMapAddrVer(s, req)
-	if err != nil {
-		return nil, err
-	}
-
 	// Use empty list instead of nil
-	// Also check if consul-version exists in Meta, else add it
 	for _, info := range out.Dump {
 		if info.Services == nil {
 			info.Services = make([]*structs.NodeService, 0)
@@ -132,24 +115,12 @@ RPC:
 		if info.Checks == nil {
 			info.Checks = make([]*structs.HealthCheck, 0)
 		}
-		// Check if Node Meta - 'consul-version' already exists by virtue of adding
-		// 'consul-version' during node registration itself.
-		// If not, get it from mapAddrVer.
-		if _, ok := info.Meta[structs.MetaConsulVersion]; !ok {
-			if _, okver := mapAddrVer[info.Address]; okver {
-				if info.Meta == nil {
-					info.Meta = make(map[string]string)
-				}
-				info.Meta[structs.MetaConsulVersion] = mapAddrVer[info.Address]
-			}
-		}
 	}
 	if out.Dump == nil {
 		out.Dump = make(structs.NodeDump, 0)
 	}
 
 	// Use empty list instead of nil
-	// Also check if consul-version exists in Meta, else add it
 	for _, info := range out.ImportedDump {
 		if info.Services == nil {
 			info.Services = make([]*structs.NodeService, 0)
@@ -157,63 +128,11 @@ RPC:
 		if info.Checks == nil {
 			info.Checks = make([]*structs.HealthCheck, 0)
 		}
-		// Check if Node Meta - 'consul-version' already exists by virtue of adding
-		// 'consul-version' during node registration itself.
-		// If not, get it from mapAddrVer.
-		if _, ok := info.Meta[structs.MetaConsulVersion]; !ok {
-			if _, okver := mapAddrVer[info.Address]; okver {
-				if info.Meta == nil {
-					info.Meta = make(map[string]string)
-				}
-				info.Meta[structs.MetaConsulVersion] = mapAddrVer[info.Address]
-			}
-		}
 	}
 
 	return append(out.Dump, out.ImportedDump...), nil
 }
 
-// AgentMembersMapAddrVer is used to get version info from  all serf members into a
-// map of key-address,value-version.
-func AgentMembersMapAddrVer(s *HTTPHandlers, req *http.Request) (map[string]string, error) {
-	var members []serf.Member
-
-	//Get WAN Members
-	wanMembers := s.agent.WANMembers()
-
-	//Get LAN Members
-	//Get the request partition and default to that of the agent.
-	entMeta := s.agent.AgentEnterpriseMeta()
-	if err := s.parseEntMetaPartition(req, entMeta); err != nil {
-		return nil, err
-	}
-	filter := consul.LANMemberFilter{
-		Partition: entMeta.PartitionOrDefault(),
-	}
-	if acl.IsDefaultPartition(filter.Partition) {
-		filter.AllSegments = true
-	}
-
-	lanMembers, err := s.agent.delegate.LANMembers(filter)
-	if err != nil {
-		return nil, err
-	}
-
-	//aggregate members
-	members = append(wanMembers, lanMembers...)
-
-	//create a map with key as IPv4 address and value as consul-version
-	mapAddrVer := make(map[string]string, len(members))
-	for i := range members {
-		buildVersion, err := metadata.Build(&members[i])
-		if err == nil {
-			mapAddrVer[members[i].Addr.String()] = buildVersion.String()
-		}
-	}
-
-	return mapAddrVer, nil
-}
-
 // UINodeInfo is used to get info on a single node in a given datacenter. We return a
 // NodeInfo which provides overview information for the node
 func (s *HTTPHandlers) UINodeInfo(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
@@ -250,16 +169,6 @@ RPC:
 		return nil, err
 	}
 
-	// Get version info for all serf members into a map of key-address,value-version.
-	// This logic of calling 'AgentMembersMapAddrVer()' and inserting version info in this func
-	// can be discarded in future releases ( may be after 3 or 4 minor releases),
-	// when all the nodes are registered with consul-version in nodemeta.
-	var err error
-	mapAddrVer, err := AgentMembersMapAddrVer(s, req)
-	if err != nil {
-		return nil, err
-	}
-
 	// Return only the first entry
 	if len(out.Dump) > 0 {
 		info := out.Dump[0]
@@ -269,17 +178,6 @@ RPC:
 		if info.Checks == nil {
 			info.Checks = make([]*structs.HealthCheck, 0)
 		}
-		// Check if Node Meta - 'consul-version' already exists by virtue of adding
-		// 'consul-version' during node registration itself.
-		// If not, get it from mapAddrVer.
-		if _, ok := info.Meta[structs.MetaConsulVersion]; !ok {
-			if _, okver := mapAddrVer[info.Address]; okver {
-				if info.Meta == nil {
-					info.Meta = make(map[string]string)
-				}
-				info.Meta[structs.MetaConsulVersion] = mapAddrVer[info.Address]
-			}
-		}
 		return info, nil
 	}
 
@@ -563,25 +461,11 @@ func summarizeServices(dump structs.ServiceDump, cfg *config.RuntimeConfig, dc s
 		sum := getService(psn)
 
 		svc := csn.Service
-
-		found := false
-		for _, existing := range sum.Nodes {
-			if existing == csn.Node.Node {
-				found = true
-				break
-			}
-		}
-		if !found {
-			sum.Nodes = append(sum.Nodes, csn.Node.Node)
-		}
-
+		sum.Nodes = append(sum.Nodes, csn.Node.Node)
 		sum.Kind = svc.Kind
 		sum.Datacenter = csn.Node.Datacenter
 		sum.InstanceCount += 1
-		// Consider a service connect native once at least one instance is
-		if svc.Connect.Native {
-			sum.ConnectNative = svc.Connect.Native
-		}
+		sum.ConnectNative = svc.Connect.Native
 		if svc.Kind == structs.ServiceKindConnectProxy {
 			sn := structs.NewServiceName(svc.Proxy.DestinationServiceName, &svc.EnterpriseMeta)
 			psn := structs.PeeredServiceName{Peer: peerName, ServiceName: sn}
diff --git a/agent/ui_endpoint_ce_test.go b/agent/ui_endpoint_ce_test.go
index 2cb3f905e28b0..8ba8d2c518db8 100644
--- a/agent/ui_endpoint_ce_test.go
+++ b/agent/ui_endpoint_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package agent
 
@@ -58,7 +56,6 @@ func TestUIEndpoint_MetricsProxy_ACLDeny(t *testing.T) {
 	defer a.Shutdown()
 
 	a.enableDebug.Store(true)
-
 	h := a.srv.handler()
 
 	testrpc.WaitForLeader(t, a.RPC, "dc1")
diff --git a/agent/ui_endpoint_test.go b/agent/ui_endpoint_test.go
index dd1c6d8134b2f..362a27dbb3be4 100644
--- a/agent/ui_endpoint_test.go
+++ b/agent/ui_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -25,35 +22,13 @@ import (
 	"github.com/hashicorp/consul/agent/config"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/consul/types"
 )
 
-func TestUIEndpointsFailInV2(t *testing.T) {
-	t.Parallel()
-
-	a := NewTestAgent(t, `experiments = ["resource-apis"]`)
-
-	checkRequest := func(method, url string) {
-		t.Run(method+" "+url, func(t *testing.T) {
-			assertV1CatalogEndpointDoesNotWorkWithV2(t, a, method, url, "{}")
-		})
-	}
-
-	checkRequest("GET", "/v1/internal/ui/nodes")
-	checkRequest("GET", "/v1/internal/ui/node/web")
-	checkRequest("GET", "/v1/internal/ui/services")
-	checkRequest("GET", "/v1/internal/ui/exported-services")
-	checkRequest("GET", "/v1/internal/ui/catalog-overview")
-	checkRequest("GET", "/v1/internal/ui/gateway-services-nodes/web")
-	checkRequest("GET", "/v1/internal/ui/gateway-intentions/web")
-	checkRequest("GET", "/v1/internal/ui/service-topology/web")
-	checkRequest("PUT", "/v1/internal/service-virtual-ip")
-}
-
 func TestUIIndex(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
@@ -184,9 +159,6 @@ func TestUINodes(t *testing.T) {
 	require.Len(t, nodes[2].Services, 0)
 	require.NotNil(t, nodes[1].Checks)
 	require.Len(t, nodes[2].Services, 0)
-
-	// check for consul-version in node meta
-	require.Equal(t, nodes[0].Meta[structs.MetaConsulVersion], a.Config.Version)
 }
 
 func TestUINodes_Filter(t *testing.T) {
@@ -285,9 +257,6 @@ func TestUINodeInfo(t *testing.T) {
 		node.Checks == nil || len(node.Checks) != 0 {
 		t.Fatalf("bad: %v", node)
 	}
-
-	// check for consul-version in node meta
-	require.Equal(t, node.Meta[structs.MetaConsulVersion], a.Config.Version)
 }
 
 func TestUIServices(t *testing.T) {
@@ -1709,43 +1678,19 @@ func TestUIServiceTopology(t *testing.T) {
 				SkipNodeUpdate: true,
 				Service: &structs.NodeService{
 					Kind:    structs.ServiceKindTypical,
-					ID:      "cproxy-https",
+					ID:      "cproxy",
 					Service: "cproxy",
 					Port:    1111,
 					Address: "198.18.1.70",
-					Tags:    []string{"https"},
 					Connect: structs.ServiceConnect{Native: true},
 				},
 				Checks: structs.HealthChecks{
 					&structs.HealthCheck{
 						Node:        "cnative",
-						CheckID:     "cnative:cproxy-https",
+						CheckID:     "cnative:cproxy",
 						Name:        "cproxy-liveness",
 						Status:      api.HealthPassing,
-						ServiceID:   "cproxy-https",
-						ServiceName: "cproxy",
-					},
-				},
-			},
-			"Service cproxy/http on cnative": {
-				Datacenter:     "dc1",
-				Node:           "cnative",
-				SkipNodeUpdate: true,
-				Service: &structs.NodeService{
-					Kind:    structs.ServiceKindTypical,
-					ID:      "cproxy-http",
-					Service: "cproxy",
-					Port:    1112,
-					Address: "198.18.1.70",
-					Tags:    []string{"http"},
-				},
-				Checks: structs.HealthChecks{
-					&structs.HealthCheck{
-						Node:        "cnative",
-						CheckID:     "cnative:cproxy-http",
-						Name:        "cproxy-liveness",
-						Status:      api.HealthPassing,
-						ServiceID:   "cproxy-http",
+						ServiceID:   "cproxy",
 						ServiceName: "cproxy",
 					},
 				},
@@ -2171,42 +2116,6 @@ func TestUIServiceTopology(t *testing.T) {
 				FilteredByACLs: false,
 			},
 		},
-		{
-			name: "cbackend",
-			httpReq: func() *http.Request {
-				req, _ := http.NewRequest("GET", "/v1/internal/ui/service-topology/cbackend?kind=", nil)
-				return req
-			}(),
-			want: &ServiceTopology{
-				Protocol:         "http",
-				TransparentProxy: false,
-				Upstreams:        []*ServiceTopologySummary{},
-				Downstreams: []*ServiceTopologySummary{
-					{
-						ServiceSummary: ServiceSummary{
-							Name:           "cproxy",
-							Datacenter:     "dc1",
-							Tags:           []string{"http", "https"},
-							Nodes:          []string{"cnative"},
-							InstanceCount:  2,
-							ChecksPassing:  3,
-							ChecksWarning:  0,
-							ChecksCritical: 0,
-							ConnectNative:  true,
-							EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
-						},
-						Intention: structs.IntentionDecisionSummary{
-							DefaultAllow:   true,
-							Allowed:        true,
-							HasPermissions: false,
-							HasExact:       true,
-						},
-						Source: structs.TopologySourceSpecificIntention,
-					},
-				},
-				FilteredByACLs: false,
-			},
-		},
 	}
 
 	for _, tc := range tcs {
diff --git a/agent/uiserver/buf_index_fs.go b/agent/uiserver/buf_index_fs.go
index 283616c36eda6..71066d8722c13 100644
--- a/agent/uiserver/buf_index_fs.go
+++ b/agent/uiserver/buf_index_fs.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package uiserver
 
 import (
diff --git a/agent/uiserver/buffered_file.go b/agent/uiserver/buffered_file.go
index daa30c610d29f..f5ebf0cf5555e 100644
--- a/agent/uiserver/buffered_file.go
+++ b/agent/uiserver/buffered_file.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package uiserver
 
 import (
diff --git a/agent/uiserver/dist/assets/chunk.143.ff39f0b820a97e2c6d5d.js b/agent/uiserver/dist/assets/chunk.143.ff39f0b820a97e2c6d5d.js
deleted file mode 100644
index 343ded1152bc2..0000000000000
--- a/agent/uiserver/dist/assets/chunk.143.ff39f0b820a97e2c6d5d.js
+++ /dev/null
@@ -1,52 +0,0 @@
-var __ember_auto_import__;(()=>{var e,r,t,n,o,i={6466:(e,r,t)=>{var n,o
-e.exports=(n=_eai_d,o=_eai_r,window.emberAutoImportDynamic=function(e){return 1===arguments.length?o("_eai_dyn_"+e):o("_eai_dynt_"+e)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(e){return o("_eai_sync_"+e)(Array.prototype.slice.call(arguments,1))},n("@hashicorp/flight-icons/svg",[],(function(){return t(218)})),n("@lit/reactive-element",[],(function(){return t(3493)})),n("@xstate/fsm",[],(function(){return t(9454)})),n("a11y-dialog",[],(function(){return t(6313)})),n("base64-js",[],(function(){return t(3305)})),n("clipboard",[],(function(){return t(2309)})),n("d3-array",[],(function(){return t(1286)})),n("d3-scale",[],(function(){return t(113)})),n("d3-scale-chromatic",[],(function(){return t(9677)})),n("d3-selection",[],(function(){return t(1058)})),n("d3-shape",[],(function(){return t(6736)})),n("dayjs",[],(function(){return t(4434)})),n("dayjs/plugin/calendar",[],(function(){return t(9379)})),n("dayjs/plugin/relativeTime",[],(function(){return t(8275)})),n("deepmerge",[],(function(){return t(2999)})),n("ember-focus-trap/modifiers/focus-trap.js",[],(function(){return t(6673)})),n("ember-keyboard/helpers/if-key.js",[],(function(){return t(6866)})),n("ember-keyboard/helpers/on-key.js",[],(function(){return t(9930)})),n("ember-keyboard/modifiers/on-key.js",[],(function(){return t(6222)})),n("ember-keyboard/services/keyboard.js",[],(function(){return t(6918)})),n("fast-deep-equal",[],(function(){return t(7889)})),n("fast-memoize",[],(function(){return t(4564)})),n("flat",[],(function(){return t(8581)})),n("intersection-observer-admin",[],(function(){return t(2914)})),n("intl-messageformat",[],(function(){return t(4143)})),n("intl-messageformat-parser",[],(function(){return t(4857)})),n("mnemonist/multi-map",[],(function(){return t(6196)})),n("mnemonist/set",[],(function(){return t(3333)})),n("ngraph.graph",[],(function(){return t(1832)})),n("parse-duration",[],(function(){return t(1813)})),n("pretty-ms",[],(function(){return t(3385)})),n("raf-pool",[],(function(){return t(7114)})),n("tippy.js",[],(function(){return t(1499)})),n("validated-changeset",[],(function(){return t(6530)})),n("wayfarer",[],(function(){return t(6841)})),n("_eai_dyn_dialog-polyfill",[],(function(){return t.e(83).then(t.bind(t,7083))})),void n("_eai_dyn_dialog-polyfill-css",[],(function(){return t.e(744).then(t.bind(t,7744))})))},6760:function(e,r){window._eai_r=require,window._eai_d=define},1292:e=>{"use strict"
-e.exports=require("@ember/application")},8797:e=>{"use strict"
-e.exports=require("@ember/component/helper")},3353:e=>{"use strict"
-e.exports=require("@ember/debug")},9341:e=>{"use strict"
-e.exports=require("@ember/destroyable")},4927:e=>{"use strict"
-e.exports=require("@ember/modifier")},7219:e=>{"use strict"
-e.exports=require("@ember/object")},8773:e=>{"use strict"
-e.exports=require("@ember/runloop")},8574:e=>{"use strict"
-e.exports=require("@ember/service")},1866:e=>{"use strict"
-e.exports=require("@ember/utils")},5831:e=>{"use strict"
-e.exports=require("ember-modifier")}},u={}
-function a(e){var r=u[e]
-if(void 0!==r)return r.exports
-var t=u[e]={exports:{}}
-return i[e].call(t.exports,t,t.exports,a),t.exports}a.m=i,e=[],a.O=(r,t,n,o)=>{if(!t){var i=1/0
-for(l=0;l<e.length;l++){for(var[t,n,o]=e[l],u=!0,s=0;s<t.length;s++)(!1&o||i>=o)&&Object.keys(a.O).every((e=>a.O[e](t[s])))?t.splice(s--,1):(u=!1,o<i&&(i=o))
-if(u){e.splice(l--,1)
-var c=n()
-void 0!==c&&(r=c)}}return r}o=o||0
-for(var l=e.length;l>0&&e[l-1][2]>o;l--)e[l]=e[l-1]
-e[l]=[t,n,o]},a.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e
-return a.d(r,{a:r}),r},a.d=(e,r)=>{for(var t in r)a.o(r,t)&&!a.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},a.f={},a.e=e=>Promise.all(Object.keys(a.f).reduce(((r,t)=>(a.f[t](e,r),r)),[])),a.u=e=>"chunk."+e+"."+{83:"85cc25a28afe28f711a3",744:"c0eb6726020fc4af8d3f"}[e]+".js",a.miniCssF=e=>"chunk."+e+".c0eb6726020fc4af8d3f.css",a.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},t="__ember_auto_import__:",a.l=(e,n,o,i)=>{if(r[e])r[e].push(n)
-else{var u,s
-if(void 0!==o)for(var c=document.getElementsByTagName("script"),l=0;l<c.length;l++){var f=c[l]
-if(f.getAttribute("src")==e||f.getAttribute("data-webpack")==t+o){u=f
-break}}u||(s=!0,(u=document.createElement("script")).charset="utf-8",u.timeout=120,a.nc&&u.setAttribute("nonce",a.nc),u.setAttribute("data-webpack",t+o),u.src=e),r[e]=[n]
-var d=(t,n)=>{u.onerror=u.onload=null,clearTimeout(p)
-var o=r[e]
-if(delete r[e],u.parentNode&&u.parentNode.removeChild(u),o&&o.forEach((e=>e(n))),t)return t(n)},p=setTimeout(d.bind(null,void 0,{type:"timeout",target:u}),12e4)
-u.onerror=d.bind(null,u.onerror),u.onload=d.bind(null,u.onload),s&&document.head.appendChild(u)}},a.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.p="{{.ContentPath}}assets/",n=e=>new Promise(((r,t)=>{var n=a.miniCssF(e),o=a.p+n
-if(((e,r)=>{for(var t=document.getElementsByTagName("link"),n=0;n<t.length;n++){var o=(u=t[n]).getAttribute("data-href")||u.getAttribute("href")
-if("stylesheet"===u.rel&&(o===e||o===r))return u}var i=document.getElementsByTagName("style")
-for(n=0;n<i.length;n++){var u
-if((o=(u=i[n]).getAttribute("data-href"))===e||o===r)return u}})(n,o))return r();((e,r,t,n)=>{var o=document.createElement("link")
-o.rel="stylesheet",o.type="text/css",o.onerror=o.onload=i=>{if(o.onerror=o.onload=null,"load"===i.type)t()
-else{var u=i&&("load"===i.type?"missing":i.type),a=i&&i.target&&i.target.href||r,s=new Error("Loading CSS chunk "+e+" failed.\n("+a+")")
-s.code="CSS_CHUNK_LOAD_FAILED",s.type=u,s.request=a,o.parentNode.removeChild(o),n(s)}},o.href=r,document.head.appendChild(o)})(e,o,r,t)})),o={143:0},a.f.miniCss=(e,r)=>{o[e]?r.push(o[e]):0!==o[e]&&{744:1}[e]&&r.push(o[e]=n(e).then((()=>{o[e]=0}),(r=>{throw delete o[e],r})))},(()=>{var e={143:0}
-a.f.j=(r,t)=>{var n=a.o(e,r)?e[r]:void 0
-if(0!==n)if(n)t.push(n[2])
-else{var o=new Promise(((t,o)=>n=e[r]=[t,o]))
-t.push(n[2]=o)
-var i=a.p+a.u(r),u=new Error
-a.l(i,(t=>{if(a.o(e,r)&&(0!==(n=e[r])&&(e[r]=void 0),n)){var o=t&&("load"===t.type?"missing":t.type),i=t&&t.target&&t.target.src
-u.message="Loading chunk "+r+" failed.\n("+o+": "+i+")",u.name="ChunkLoadError",u.type=o,u.request=i,n[1](u)}}),"chunk-"+r,r)}},a.O.j=r=>0===e[r]
-var r=(r,t)=>{var n,o,[i,u,s]=t,c=0
-if(i.some((r=>0!==e[r]))){for(n in u)a.o(u,n)&&(a.m[n]=u[n])
-if(s)var l=s(a)}for(r&&r(t);c<i.length;c++)o=i[c],a.o(e,o)&&e[o]&&e[o][0](),e[o]=0
-return a.O(l)},t=globalThis.webpackChunk_ember_auto_import_=globalThis.webpackChunk_ember_auto_import_||[]
-t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),a.O(void 0,[412],(()=>a(6760)))
-var s=a.O(void 0,[412],(()=>a(6466)))
-s=a.O(s),__ember_auto_import__=s})()
diff --git a/agent/uiserver/dist/assets/chunk.178.00380c6ad3fa678e07b6.js b/agent/uiserver/dist/assets/chunk.178.00380c6ad3fa678e07b6.js
deleted file mode 100644
index 884e5a3cb9138..0000000000000
--- a/agent/uiserver/dist/assets/chunk.178.00380c6ad3fa678e07b6.js
+++ /dev/null
@@ -1,21 +0,0 @@
-var __ember_auto_import__;(()=>{var r,e={6760:function(r,e){window._eai_r=require,window._eai_d=define},4593:(r,e,t)=>{var o,n
-r.exports=(o=_eai_d,n=_eai_r,window.emberAutoImportDynamic=function(r){return 1===arguments.length?n("_eai_dyn_"+r):n("_eai_dynt_"+r)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(r){return n("_eai_sync_"+r)(Array.prototype.slice.call(arguments,1))},o("lodash.castarray",[],(function(){return t(5665)})),o("lodash.last",[],(function(){return t(66)})),o("lodash.omit",[],(function(){return t(9254)})),o("qunit",[],(function(){return t(3409)})),void o("yadda",[],(function(){return t(409)})))},9265:()=>{},3642:()=>{}},t={}
-function o(r){var n=t[r]
-if(void 0!==n)return n.exports
-var i=t[r]={id:r,loaded:!1,exports:{}}
-return e[r].call(i.exports,i,i.exports,o),i.loaded=!0,i.exports}o.m=e,r=[],o.O=(e,t,n,i)=>{if(!t){var a=1/0
-for(c=0;c<r.length;c++){for(var[t,n,i]=r[c],u=!0,l=0;l<t.length;l++)(!1&i||a>=i)&&Object.keys(o.O).every((r=>o.O[r](t[l])))?t.splice(l--,1):(u=!1,i<a&&(a=i))
-if(u){r.splice(c--,1)
-var _=n()
-void 0!==_&&(e=_)}}return e}i=i||0
-for(var c=r.length;c>0&&r[c-1][2]>i;c--)r[c]=r[c-1]
-r[c]=[t,n,i]},o.g=function(){if("object"==typeof globalThis)return globalThis
-try{return this||new Function("return this")()}catch(r){if("object"==typeof window)return window}}(),o.o=(r,e)=>Object.prototype.hasOwnProperty.call(r,e),o.nmd=r=>(r.paths=[],r.children||(r.children=[]),r),(()=>{var r={178:0}
-o.O.j=e=>0===r[e]
-var e=(e,t)=>{var n,i,[a,u,l]=t,_=0
-if(a.some((e=>0!==r[e]))){for(n in u)o.o(u,n)&&(o.m[n]=u[n])
-if(l)var c=l(o)}for(e&&e(t);_<a.length;_++)i=a[_],o.o(r,i)&&r[i]&&r[i][0](),r[i]=0
-return o.O(c)},t=globalThis.webpackChunk_ember_auto_import_=globalThis.webpackChunk_ember_auto_import_||[]
-t.forEach(e.bind(null,0)),t.push=e.bind(null,t.push.bind(t))})(),o.O(void 0,[336],(()=>o(6760)))
-var n=o.O(void 0,[336],(()=>o(4593)))
-n=o.O(n),__ember_auto_import__=n})()
diff --git a/agent/uiserver/dist/assets/chunk.336.f5cb05e551aa08eb7125.js b/agent/uiserver/dist/assets/chunk.336.f5cb05e551aa08eb7125.js
deleted file mode 100644
index b4ef3eadadc13..0000000000000
--- a/agent/uiserver/dist/assets/chunk.336.f5cb05e551aa08eb7125.js
+++ /dev/null
@@ -1,908 +0,0 @@
-/*! For license information please see chunk.336.f5cb05e551aa08eb7125.js.LICENSE.txt */
-(globalThis.webpackChunk_ember_auto_import_=globalThis.webpackChunk_ember_auto_import_||[]).push([[336],{3409:(e,t,n)=>{var r
-e=n.nmd(e),function(){"use strict"
-function i(e){return i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},i(e)}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function s(e,t){for(var n=0;n<t.length;n++){var r=t[n]
-r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function a(e,t,n){return t&&s(e.prototype,t),n&&s(e,n),Object.defineProperty(e,"prototype",{writable:!1}),e}function u(e,t){return function(e){if(Array.isArray(e))return e}(e)||function(e,t){var n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"]
-if(null!=n){var r,i,o=[],s=!0,a=!1
-try{for(n=n.call(e);!(s=(r=n.next()).done)&&(o.push(r.value),!t||o.length!==t);s=!0);}catch(e){a=!0,i=e}finally{try{s||null==n.return||n.return()}finally{if(a)throw i}}return o}}(e,t)||l(e,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function c(e){return function(e){if(Array.isArray(e))return f(e)}(e)||function(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}(e)||l(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function l(e,t){if(e){if("string"==typeof e)return f(e,t)
-var n=Object.prototype.toString.call(e).slice(8,-1)
-return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?f(e,t):void 0}}function f(e,t){(null==t||t>e.length)&&(t=e.length)
-for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n]
-return r}var h=function(){if("undefined"!=typeof globalThis)return globalThis
-if("undefined"!=typeof self)return self
-if(void 0!==d)return d
-if(void 0!==n.g)return n.g
-throw new Error("Unable to locate global object")}(),d=h.window,p=h.console,g=h.setTimeout,v=h.clearTimeout,m=d&&d.document,y=d&&d.navigator,b=function(){var e="qunit-test-string"
-try{return h.sessionStorage.setItem(e,e),h.sessionStorage.removeItem(e),h.sessionStorage}catch(e){return}}(),w="function"==typeof h.Map&&"function"==typeof h.Map.prototype.keys&&"function"==typeof h.Symbol&&"symbol"===i(h.Symbol.iterator)?h.Map:function(e){var t=this,n=Object.create(null),r=Object.prototype.hasOwnProperty
-this.has=function(e){return r.call(n,e)},this.get=function(e){return n[e]},this.set=function(e,t){return r.call(n,e)||this.size++,n[e]=t,this},this.delete=function(e){r.call(n,e)&&(delete n[e],this.size--)},this.forEach=function(e){for(var t in n)e(n[t],t)},this.keys=function(){return Object.keys(n)},this.clear=function(){n=Object.create(null),this.size=0},this.size=0,e&&e.forEach((function(e,n){t.set(n,e)}))},x={warn:p?Function.prototype.bind.call(p.warn||p.log,p):function(){}},k=Object.prototype.toString,E=Object.prototype.hasOwnProperty,_=d&&void 0!==d.performance&&"function"==typeof d.performance.mark&&"function"==typeof d.performance.measure?d.performance:void 0,S={now:_?_.now.bind(_):Date.now,measure:_?function(e,t,n){try{_.measure(e,t,n)}catch(e){x.warn("performance.measure could not be executed because of ",e.message)}}:function(){},mark:_?_.mark.bind(_):function(){}}
-function C(e,t){for(var n=e.slice(),r=0;r<n.length;r++)for(var i=0;i<t.length;i++)if(n[r]===t[i]){n.splice(r,1),r--
-break}return n}function T(e,t){return-1!==t.indexOf(e)}function j(e){var t=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],n=t&&q("array",e)?[]:{}
-for(var r in e)if(E.call(e,r)){var i=e[r]
-n[r]=i===Object(i)?j(i,t):i}return n}function N(e,t){if(e!==Object(e))return e
-var n={}
-for(var r in t)E.call(t,r)&&E.call(e,r)&&(n[r]=N(e[r],t[r]))
-return n}function M(e,t,n){for(var r in t)E.call(t,r)&&(void 0===t[r]?delete e[r]:n&&void 0!==e[r]||(e[r]=t[r]))
-return e}function O(e){if(void 0===e)return"undefined"
-if(null===e)return"null"
-var t=k.call(e).match(/^\[object\s(.*)\]$/),n=t&&t[1]
-switch(n){case"Number":return isNaN(e)?"nan":"number"
-case"String":case"Boolean":case"Array":case"Set":case"Map":case"Date":case"RegExp":case"Function":case"Symbol":return n.toLowerCase()
-default:return i(e)}}function q(e,t){return O(t)===e}function A(e,t){for(var n=e+""+t,r=0,i=0;i<n.length;i++)r=(r<<5)-r+n.charCodeAt(i),r|=0
-var o=(4294967296+r).toString(16)
-return o.length<8&&(o="0000000"+o),o.slice(-8)}function R(e){var t=String(e)
-return"[object"===t.slice(0,7)?(e.name||"Error")+(e.message?": ".concat(e.message):""):t}var I=function(){var e=[]
-function t(e,t){return"object"===i(e)&&(e=e.valueOf()),"object"===i(t)&&(t=t.valueOf()),e===t}function n(e){return"flags"in e?e.flags:e.toString().match(/[gimuy]*$/)[0]}function r(t,n){return t===n||(-1===["object","array","map","set"].indexOf(O(t))?s(t,n):(e.every((function(e){return e.a!==t||e.b!==n}))&&e.push({a:t,b:n}),!0))}var o={string:t,boolean:t,number:t,null:t,undefined:t,symbol:t,date:t,nan:function(){return!0},regexp:function(e,t){return e.source===t.source&&n(e)===n(t)},function:function(){return!1},array:function(e,t){var n=e.length
-if(n!==t.length)return!1
-for(var i=0;i<n;i++)if(!r(e[i],t[i]))return!1
-return!0},set:function(t,n){if(t.size!==n.size)return!1
-var r=!0
-return t.forEach((function(t){if(r){var i=!1
-n.forEach((function(n){if(!i){var r=e
-a(n,t)&&(i=!0),e=r}})),i||(r=!1)}})),r},map:function(t,n){if(t.size!==n.size)return!1
-var r=!0
-return t.forEach((function(t,i){if(r){var o=!1
-n.forEach((function(n,r){if(!o){var s=e
-a([n,r],[t,i])&&(o=!0),e=s}})),o||(r=!1)}})),r},object:function(e,t){if(!1===function(e,t){var n=Object.getPrototypeOf(e),r=Object.getPrototypeOf(t)
-return e.constructor===t.constructor||(n&&null===n.constructor&&(n=null),r&&null===r.constructor&&(r=null),null===n&&r===Object.prototype||null===r&&n===Object.prototype)}(e,t))return!1
-var n=[],i=[]
-for(var o in e)if(n.push(o),(e.constructor===Object||void 0===e.constructor||"function"!=typeof e[o]||"function"!=typeof t[o]||e[o].toString()!==t[o].toString())&&!r(e[o],t[o]))return!1
-for(var a in t)i.push(a)
-return s(n.sort(),i.sort())}}
-function s(e,t){var n=O(e)
-return O(t)===n&&o[n](e,t)}function a(t,n){if(arguments.length<2)return!0
-e=[{a:t,b:n}]
-for(var r=0;r<e.length;r++){var i=e[r]
-if(i.a!==i.b&&!s(i.a,i.b))return!1}return 2===arguments.length||a.apply(this,[].slice.call(arguments,1))}return function(){var t=a.apply(void 0,arguments)
-return e.length=0,t}}(),F={altertitle:!0,collapse:!0,failOnZeroTests:!0,filter:void 0,maxDepth:5,module:void 0,moduleId:void 0,reorder:!0,requireExpects:!1,scrolltop:!0,storage:b,testId:void 0,urlConfig:[],currentModule:{name:"",tests:[],childModules:[],testsRun:0,testsIgnored:0,hooks:{before:[],beforeEach:[],afterEach:[],after:[]}},globalHooks:{},blocking:!0,callbacks:{},modules:[],queue:[],stats:{all:0,bad:0,testCount:0}},P=h&&h.QUnit&&!h.QUnit.version&&h.QUnit.config
-P&&M(F,P),F.modules.push(F.currentModule)
-var D=function(){function e(e){return'"'+e.toString().replace(/\\/g,"\\\\").replace(/"/g,'\\"')+'"'}function t(e){return e+""}function n(e,t,n){var r=s.separator(),i=s.indent(1)
-return t.join&&(t=t.join(","+r+i)),t?[e,i+t,s.indent()+n].join(r):e+n}function r(e,t){if(s.maxDepth&&s.depth>s.maxDepth)return"[object Array]"
-this.up()
-for(var r=e.length,i=new Array(r);r--;)i[r]=this.parse(e[r],void 0,t)
-return this.down(),n("[",i,"]")}var o=/^function (\w+)/,s={parse:function(e,t,n){var r=(n=n||[]).indexOf(e)
-if(-1!==r)return"recursion(".concat(r-n.length,")")
-t=t||this.typeOf(e)
-var o=this.parsers[t],s=i(o)
-if("function"===s){n.push(e)
-var a=o.call(this,e,n)
-return n.pop(),a}return"string"===s?o:"[ERROR: Missing QUnit.dump formatter for type "+t+"]"},typeOf:function(e){var t
-return t=null===e?"null":void 0===e?"undefined":q("regexp",e)?"regexp":q("date",e)?"date":q("function",e)?"function":void 0!==e.setInterval&&void 0!==e.document&&void 0===e.nodeType?"window":9===e.nodeType?"document":e.nodeType?"node":function(e){return"[object Array]"===k.call(e)||"number"==typeof e.length&&void 0!==e.item&&(e.length?e.item(0)===e[0]:null===e.item(0)&&void 0===e[0])}(e)?"array":e.constructor===Error.prototype.constructor?"error":i(e),t},separator:function(){return this.multiline?this.HTML?"<br />":"\n":this.HTML?"&#160;":" "},indent:function(e){if(!this.multiline)return""
-var t=this.indentChar
-return this.HTML&&(t=t.replace(/\t/g,"   ").replace(/ /g,"&#160;")),new Array(this.depth+(e||0)).join(t)},up:function(e){this.depth+=e||1},down:function(e){this.depth-=e||1},setParser:function(e,t){this.parsers[e]=t},quote:e,literal:t,join:n,depth:1,maxDepth:F.maxDepth,parsers:{window:"[Window]",document:"[Document]",error:function(e){return'Error("'+e.message+'")'},unknown:"[Unknown]",null:"null",undefined:"undefined",function:function(e){var t="function",r="name"in e?e.name:(o.exec(e)||[])[1]
-return r&&(t+=" "+r),n(t=[t+="(",s.parse(e,"functionArgs"),"){"].join(""),s.parse(e,"functionCode"),"}")},array:r,nodelist:r,arguments:r,object:function(e,t){var r=[]
-if(s.maxDepth&&s.depth>s.maxDepth)return"[object Object]"
-s.up()
-var i=[]
-for(var o in e)i.push(o)
-var a=["message","name"]
-for(var u in a){var c=a[u]
-c in e&&!T(c,i)&&i.push(c)}i.sort()
-for(var l=0;l<i.length;l++){var f=i[l],h=e[f]
-r.push(s.parse(f,"key")+": "+s.parse(h,void 0,t))}return s.down(),n("{",r,"}")},node:function(e){var t=s.HTML?"&lt;":"<",n=s.HTML?"&gt;":">",r=e.nodeName.toLowerCase(),i=t+r,o=e.attributes
-if(o)for(var a=0;a<o.length;a++){var u=o[a].nodeValue
-u&&"inherit"!==u&&(i+=" "+o[a].nodeName+"="+s.parse(u,"attribute"))}return i+=n,3!==e.nodeType&&4!==e.nodeType||(i+=e.nodeValue),i+t+"/"+r+n},functionArgs:function(e){var t=e.length
-if(!t)return""
-for(var n=new Array(t);t--;)n[t]=String.fromCharCode(97+t)
-return" "+n.join(", ")+" "},key:e,functionCode:"[code]",attribute:e,string:e,date:e,regexp:t,number:t,boolean:t,symbol:function(e){return e.toString()}},HTML:!1,indentChar:"  ",multiline:!0}
-return s}(),L=function(){function e(t,n){o(this,e),this.name=t,this.fullName=n?n.fullName.concat(t):[],this.globalFailureCount=0,this.tests=[],this.childSuites=[],n&&n.pushChildSuite(this)}return a(e,[{key:"start",value:function(e){if(e){this._startTime=S.now()
-var t=this.fullName.length
-S.mark("qunit_suite_".concat(t,"_start"))}return{name:this.name,fullName:this.fullName.slice(),tests:this.tests.map((function(e){return e.start()})),childSuites:this.childSuites.map((function(e){return e.start()})),testCounts:{total:this.getTestCounts().total}}}},{key:"end",value:function(e){if(e){this._endTime=S.now()
-var t=this.fullName.length,n=this.fullName.join(" – ")
-S.mark("qunit_suite_".concat(t,"_end")),S.measure(0===t?"QUnit Test Run":"QUnit Test Suite: ".concat(n),"qunit_suite_".concat(t,"_start"),"qunit_suite_".concat(t,"_end"))}return{name:this.name,fullName:this.fullName.slice(),tests:this.tests.map((function(e){return e.end()})),childSuites:this.childSuites.map((function(e){return e.end()})),testCounts:this.getTestCounts(),runtime:this.getRuntime(),status:this.getStatus()}}},{key:"pushChildSuite",value:function(e){this.childSuites.push(e)}},{key:"pushTest",value:function(e){this.tests.push(e)}},{key:"getRuntime",value:function(){return Math.round(this._endTime-this._startTime)}},{key:"getTestCounts",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{passed:0,failed:0,skipped:0,todo:0,total:0}
-return e.failed+=this.globalFailureCount,e.total+=this.globalFailureCount,e=this.tests.reduce((function(e,t){return t.valid&&(e[t.getStatus()]++,e.total++),e}),e),this.childSuites.reduce((function(e,t){return t.getTestCounts(e)}),e)}},{key:"getStatus",value:function(){var e=this.getTestCounts(),t=e.total,n=e.failed,r=e.skipped,i=e.todo
-return n?"failed":r===t?"skipped":i===t?"todo":"passed"}}]),e}(),B=[],U=new L
-function H(e,t,n){var r=B.length?B.slice(-1)[0]:null,i=null!==r?[r.name,e].join(" > "):e,o=r?r.suiteReport:U,s=null!==r&&r.skip||n.skip,a=null!==r&&r.todo||n.todo,u={}
-r&&M(u,r.testEnvironment),M(u,t)
-var c={name:i,parentModule:r,hooks:{before:[],beforeEach:[],afterEach:[],after:[]},testEnvironment:u,tests:[],moduleId:A(i),testsRun:0,testsIgnored:0,childModules:[],suiteReport:new L(e,o),stats:null,skip:s,todo:!s&&a,ignored:n.ignored||!1}
-return r&&r.childModules.push(c),F.modules.push(c),c}function z(e,t,n){var r=t[n]
-"function"==typeof r&&e[n].push(r),delete t[n]}function $(e,t){return function(n){F.currentModule!==e&&x.warn("The `"+t+"` hook was called inside the wrong module (`"+F.currentModule.name+"`). Instead, use hooks provided by the callback to the containing module (`"+e.name+"`). This will become an error in QUnit 3.0."),e.hooks[t].push(n)}}function Q(e,t,n){var r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{}
-"function"==typeof t&&(n=t,t=void 0)
-var i=H(e,t,r),o=i.testEnvironment,s=i.hooks
-z(s,o,"before"),z(s,o,"beforeEach"),z(s,o,"afterEach"),z(s,o,"after")
-var a={before:$(i,"before"),beforeEach:$(i,"beforeEach"),afterEach:$(i,"afterEach"),after:$(i,"after")},u=F.currentModule
-if(F.currentModule=i,"function"==typeof n){B.push(i)
-try{var c=n.call(i.testEnvironment,a)
-c&&"function"==typeof c.then&&x.warn("Returning a promise from a module callback is not supported. Instead, use hooks for async behavior. This will become an error in QUnit 3.0.")}finally{B.pop(),F.currentModule=i.parentModule||u}}}var G=!1
-function W(e,t,n){var r,i=G&&(r=F.modules.filter((function(e){return!e.ignored})).map((function(e){return e.moduleId})),!B.some((function(e){return r.includes(e.moduleId)})))
-Q(e,t,n,{ignored:i})}W.only=function(){G||(F.modules.length=0,F.queue.length=0,F.currentModule.ignored=!0),G=!0,Q.apply(void 0,arguments)},W.skip=function(e,t,n){G||Q(e,t,n,{skip:!0})},W.todo=function(e,t,n){G||Q(e,t,n,{todo:!0})}
-var Y=(J(0)||"").replace(/(:\d+)+\)?/,"").replace(/.+[/\\]/,"")
-function V(e,t){if(t=void 0===t?4:t,e&&e.stack){var n=e.stack.split("\n")
-if(/^error$/i.test(n[0])&&n.shift(),Y){for(var r=[],i=t;i<n.length&&-1===n[i].indexOf(Y);i++)r.push(n[i])
-if(r.length)return r.join("\n")}return n[t]}}function J(e){var t=new Error
-if(!t.stack)try{throw t}catch(e){t=e}return V(t,e)}var X=function(){function e(t){o(this,e),this.test=t}return a(e,[{key:"timeout",value:function(e){if("number"!=typeof e)throw new Error("You must pass a number as the duration to assert.timeout")
-this.test.timeout=e,F.timeout&&(v(F.timeout),F.timeout=null,F.timeoutHandler&&this.test.timeout>0&&this.test.internalResetTimeout(this.test.timeout))}},{key:"step",value:function(e){var t=e,n=!!e
-this.test.steps.push(e),void 0===e||""===e?t="You must provide a message to assert.step":"string"!=typeof e&&(t="You must provide a string value to assert.step",n=!1),this.pushResult({result:n,message:t})}},{key:"verifySteps",value:function(e,t){var n=this.test.steps.slice()
-this.deepEqual(n,e,t),this.test.steps.length=0}},{key:"expect",value:function(e){if(1!==arguments.length)return this.test.expected
-this.test.expected=e}},{key:"async",value:function(e){var t=void 0===e?1:e
-return this.test.internalStop(t)}},{key:"push",value:function(t,n,r,i,o){return x.warn("assert.push is deprecated and will be removed in QUnit 3.0. Please use assert.pushResult instead (https://api.qunitjs.com/assert/pushResult)."),(this instanceof e?this:F.current.assert).pushResult({result:t,actual:n,expected:r,message:i,negative:o})}},{key:"pushResult",value:function(t){var n=this,r=n instanceof e&&n.test||F.current
-if(!r)throw new Error("assertion outside test context, in "+J(2))
-return n instanceof e||(n=r.assert),n.test.pushResult(t)}},{key:"ok",value:function(e,t){t||(t=e?"okay":"failed, expected argument to be truthy, was: ".concat(D.parse(e))),this.pushResult({result:!!e,actual:e,expected:!0,message:t})}},{key:"notOk",value:function(e,t){t||(t=e?"failed, expected argument to be falsy, was: ".concat(D.parse(e)):"okay"),this.pushResult({result:!e,actual:e,expected:!1,message:t})}},{key:"true",value:function(e,t){this.pushResult({result:!0===e,actual:e,expected:!0,message:t})}},{key:"false",value:function(e,t){this.pushResult({result:!1===e,actual:e,expected:!1,message:t})}},{key:"equal",value:function(e,t,n){var r=t==e
-this.pushResult({result:r,actual:e,expected:t,message:n})}},{key:"notEqual",value:function(e,t,n){var r=t!=e
-this.pushResult({result:r,actual:e,expected:t,message:n,negative:!0})}},{key:"propEqual",value:function(e,t,n){e=j(e),t=j(t),this.pushResult({result:I(e,t),actual:e,expected:t,message:n})}},{key:"notPropEqual",value:function(e,t,n){e=j(e),t=j(t),this.pushResult({result:!I(e,t),actual:e,expected:t,message:n,negative:!0})}},{key:"propContains",value:function(e,t,n){e=N(e,t),t=j(t,!1),this.pushResult({result:I(e,t),actual:e,expected:t,message:n})}},{key:"notPropContains",value:function(e,t,n){e=N(e,t),t=j(t),this.pushResult({result:!I(e,t),actual:e,expected:t,message:n,negative:!0})}},{key:"deepEqual",value:function(e,t,n){this.pushResult({result:I(e,t),actual:e,expected:t,message:n})}},{key:"notDeepEqual",value:function(e,t,n){this.pushResult({result:!I(e,t),actual:e,expected:t,message:n,negative:!0})}},{key:"strictEqual",value:function(e,t,n){this.pushResult({result:t===e,actual:e,expected:t,message:n})}},{key:"notStrictEqual",value:function(e,t,n){this.pushResult({result:t!==e,actual:e,expected:t,message:n,negative:!0})}},{key:"throws",value:function(t,n,r){var i=u(Z(n,r,"throws"),2)
-n=i[0],r=i[1]
-var o=this instanceof e&&this.test||F.current
-if("function"==typeof t){var s,a=!1
-o.ignoreGlobalErrors=!0
-try{t.call(o.testEnvironment)}catch(e){s=e}if(o.ignoreGlobalErrors=!1,s){var c=u(K(s,n,r),3)
-a=c[0],n=c[1],r=c[2]}o.assert.pushResult({result:a,actual:s&&R(s),expected:n,message:r})}else{var l='The value provided to `assert.throws` in "'+o.testName+'" was not a function.'
-o.assert.pushResult({result:!1,actual:t,message:l})}}},{key:"rejects",value:function(t,n,r){var i=u(Z(n,r,"rejects"),2)
-n=i[0],r=i[1]
-var o=this instanceof e&&this.test||F.current,s=t&&t.then
-if("function"==typeof s){var a=this.async()
-return s.call(t,(function(){var e='The promise returned by the `assert.rejects` callback in "'+o.testName+'" did not reject.'
-o.assert.pushResult({result:!1,message:e,actual:t}),a()}),(function(e){var t,i=u(K(e,n,r),3)
-t=i[0],n=i[1],r=i[2],o.assert.pushResult({result:t,actual:e&&R(e),expected:n,message:r}),a()}))}var c='The value provided to `assert.rejects` in "'+o.testName+'" was not a promise.'
-o.assert.pushResult({result:!1,message:c,actual:t})}}]),e}()
-function Z(e,t,n){var r=O(e)
-if("string"===r){if(void 0===t)return t=e,[e=void 0,t]
-throw new Error("assert."+n+" does not accept a string value for the expected argument.\nUse a non-string object value (e.g. RegExp or validator function) instead if necessary.")}if(e&&"regexp"!==r&&"function"!==r&&"object"!==r)throw new Error("Invalid expected value type ("+r+") provided to assert."+n+".")
-return[e,t]}function K(e,t,n){var r=!1,i=O(t)
-if(t){if("regexp"===i)r=t.test(R(e)),t=String(t)
-else if("function"===i&&void 0!==t.prototype&&e instanceof t)r=!0
-else if("object"===i)r=e instanceof t.constructor&&e.name===t.name&&e.message===t.message,t=R(t)
-else if("function"===i)try{r=!0===t.call({},e),t=null}catch(e){t=R(e)}}else r=!0
-return[r,t,n]}X.prototype.raises=X.prototype.throws
-var ee=Object.create(null),te=["error","runStart","suiteStart","testStart","assertion","testEnd","suiteEnd","runEnd"]
-function ne(e,t){if("string"!=typeof e)throw new TypeError("eventName must be a string when emitting an event")
-for(var n=ee[e],r=n?c(n):[],i=0;i<r.length;i++)r[i](t)}var re="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:void 0!==n.g?n.g:"undefined"!=typeof self?self:{},ie={exports:{}}
-!function(){var e=function(){if("undefined"!=typeof globalThis)return globalThis
-if("undefined"!=typeof self)return self
-if("undefined"!=typeof window)return window
-if(void 0!==re)return re
-throw new Error("unable to locate global object")}()
-if("function"!=typeof e.Promise){var t=setTimeout
-o.prototype.catch=function(e){return this.then(null,e)},o.prototype.then=function(e,t){var n=new this.constructor(r)
-return s(this,new l(e,t,n)),n},o.prototype.finally=function(e){var t=this.constructor
-return this.then((function(n){return t.resolve(e()).then((function(){return n}))}),(function(n){return t.resolve(e()).then((function(){return t.reject(n)}))}))},o.all=function(e){return new o((function(t,r){if(!n(e))return r(new TypeError("Promise.all accepts an array"))
-var o=Array.prototype.slice.call(e)
-if(0===o.length)return t([])
-var s=o.length
-function a(e,n){try{if(n&&("object"===i(n)||"function"==typeof n)){var u=n.then
-if("function"==typeof u)return void u.call(n,(function(t){a(e,t)}),r)}o[e]=n,0==--s&&t(o)}catch(e){r(e)}}for(var u=0;u<o.length;u++)a(u,o[u])}))},o.allSettled=function(e){return new this((function(t,n){if(!e||void 0===e.length)return n(new TypeError(i(e)+" "+e+" is not iterable(cannot read property Symbol(Symbol.iterator))"))
-var r=Array.prototype.slice.call(e)
-if(0===r.length)return t([])
-var o=r.length
-function s(e,n){if(n&&("object"===i(n)||"function"==typeof n)){var a=n.then
-if("function"==typeof a)return void a.call(n,(function(t){s(e,t)}),(function(n){r[e]={status:"rejected",reason:n},0==--o&&t(r)}))}r[e]={status:"fulfilled",value:n},0==--o&&t(r)}for(var a=0;a<r.length;a++)s(a,r[a])}))},o.resolve=function(e){return e&&"object"===i(e)&&e.constructor===o?e:new o((function(t){t(e)}))},o.reject=function(e){return new o((function(t,n){n(e)}))},o.race=function(e){return new o((function(t,r){if(!n(e))return r(new TypeError("Promise.race accepts an array"))
-for(var i=0,s=e.length;i<s;i++)o.resolve(e[i]).then(t,r)}))},o._immediateFn="function"==typeof setImmediate&&function(e){setImmediate(e)}||function(e){t(e,0)},o._unhandledRejectionFn=function(e){"undefined"!=typeof console&&console&&console.warn("Possible Unhandled Promise Rejection:",e)},ie.exports=o}else ie.exports=e.Promise
-function n(e){return Boolean(e&&void 0!==e.length)}function r(){}function o(e){if(!(this instanceof o))throw new TypeError("Promises must be constructed via new")
-if("function"!=typeof e)throw new TypeError("not a function")
-this._state=0,this._handled=!1,this._value=void 0,this._deferreds=[],f(e,this)}function s(e,t){for(;3===e._state;)e=e._value
-0!==e._state?(e._handled=!0,o._immediateFn((function(){var n=1===e._state?t.onFulfilled:t.onRejected
-if(null!==n){var r
-try{r=n(e._value)}catch(e){return void u(t.promise,e)}a(t.promise,r)}else(1===e._state?a:u)(t.promise,e._value)}))):e._deferreds.push(t)}function a(e,t){try{if(t===e)throw new TypeError("A promise cannot be resolved with itself.")
-if(t&&("object"===i(t)||"function"==typeof t)){var n=t.then
-if(t instanceof o)return e._state=3,e._value=t,void c(e)
-if("function"==typeof n)return void f((r=n,s=t,function(){r.apply(s,arguments)}),e)}e._state=1,e._value=t,c(e)}catch(t){u(e,t)}var r,s}function u(e,t){e._state=2,e._value=t,c(e)}function c(e){2===e._state&&0===e._deferreds.length&&o._immediateFn((function(){e._handled||o._unhandledRejectionFn(e._value)}))
-for(var t=0,n=e._deferreds.length;t<n;t++)s(e,e._deferreds[t])
-e._deferreds=null}function l(e,t,n){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.promise=n}function f(e,t){var n=!1
-try{e((function(e){n||(n=!0,a(t,e))}),(function(e){n||(n=!0,u(t,e))}))}catch(e){if(n)return
-n=!0,u(t,e)}}}()
-var oe=ie.exports
-function se(e,t){var n=F.callbacks[e]
-if("log"!==e){var r=oe.resolve()
-return n.forEach((function(e){r=r.then((function(){return oe.resolve(e(t))}))})),r}n.map((function(e){return e(t)}))}var ae,ue=0,ce=[]
-function le(){var e,t
-e=S.now(),F.depth=(F.depth||0)+1,fe(e),F.depth--,ce.length||F.blocking||F.current||(F.blocking||F.queue.length||0!==F.depth?(t=F.queue.shift()(),ce.push.apply(ce,c(t)),ue>0&&ue--,le()):function(){var e
-if(0===F.stats.testCount&&!0===F.failOnZeroTests)return e=F.filter&&F.filter.length?new Error('No tests matched the filter "'.concat(F.filter,'".')):F.module&&F.module.length?new Error('No tests matched the module "'.concat(F.module,'".')):F.moduleId&&F.moduleId.length?new Error('No tests matched the moduleId "'.concat(F.moduleId,'".')):F.testId&&F.testId.length?new Error('No tests matched the testId "'.concat(F.testId,'".')):new Error("No tests were run."),we("global failure",M((function(t){t.pushResult({result:!1,message:e.message,source:e.stack})}),{validTest:!0})),void le()
-var t=F.storage,n=Math.round(S.now()-F.started),r=F.stats.all-F.stats.bad
-he.finished=!0,ne("runEnd",U.end(!0)),se("done",{passed:r,failed:F.stats.bad,total:F.stats.all,runtime:n}).then((function(){if(t&&0===F.stats.bad)for(var e=t.length-1;e>=0;e--){var n=t.key(e)
-0===n.indexOf("qunit-test-")&&t.removeItem(n)}}))}())}function fe(e){if(ce.length&&!F.blocking){var t=S.now()-e
-if(!g||F.updateRate<=0||t<F.updateRate){var n=ce.shift()
-oe.resolve(n()).then((function(){ce.length?fe(e):le()}))}else g(le)}}var he={finished:!1,add:function(e,t,n){if(t)F.queue.splice(ue++,0,e)
-else if(n){ae||(ae=function(e){var t=parseInt(A(e),16)||-1
-return function(){return t^=t<<13,t^=t>>>17,(t^=t<<5)<0&&(t+=4294967296),t/4294967296}}(n))
-var r=Math.floor(ae()*(F.queue.length-ue+1))
-F.queue.splice(ue+r,0,e)}else F.queue.push(e)},advance:le,taskCount:function(){return ce.length}},de=function(){function e(t,n,r){o(this,e),this.name=t,this.suiteName=n.name,this.fullName=n.fullName.concat(t),this.runtime=0,this.assertions=[],this.skipped=!!r.skip,this.todo=!!r.todo,this.valid=r.valid,this._startTime=0,this._endTime=0,n.pushTest(this)}return a(e,[{key:"start",value:function(e){return e&&(this._startTime=S.now(),S.mark("qunit_test_start")),{name:this.name,suiteName:this.suiteName,fullName:this.fullName.slice()}}},{key:"end",value:function(e){if(e&&(this._endTime=S.now(),S)){S.mark("qunit_test_end")
-var t=this.fullName.join(" – ")
-S.measure("QUnit Test: ".concat(t),"qunit_test_start","qunit_test_end")}return M(this.start(),{runtime:this.getRuntime(),status:this.getStatus(),errors:this.getFailedAssertions(),assertions:this.getAssertions()})}},{key:"pushAssertion",value:function(e){this.assertions.push(e)}},{key:"getRuntime",value:function(){return Math.round(this._endTime-this._startTime)}},{key:"getStatus",value:function(){return this.skipped?"skipped":(this.getFailedAssertions().length>0?this.todo:!this.todo)?this.todo?"todo":"passed":"failed"}},{key:"getFailedAssertions",value:function(){return this.assertions.filter((function(e){return!e.passed}))}},{key:"getAssertions",value:function(){return this.assertions.slice()}},{key:"slimAssertions",value:function(){this.assertions=this.assertions.map((function(e){return delete e.actual,delete e.expected,e}))}}]),e}()
-function pe(e){if(this.expected=null,this.assertions=[],this.module=F.currentModule,this.steps=[],this.timeout=void 0,this.data=void 0,this.withData=!1,this.pauses=new w,this.nextPauseId=1,this.stackOffset=3,M(this,e),this.module.skip?(this.skip=!0,this.todo=!1):this.module.todo&&!this.skip&&(this.todo=!0),he.finished)x.warn("Unexpected test after runEnd. This is unstable and will fail in QUnit 3.0.")
-else{if(!this.skip&&"function"!=typeof this.callback){var t=this.todo?"QUnit.todo":"QUnit.test"
-throw new TypeError("You must provide a callback to ".concat(t,'("').concat(this.testName,'")'))}++pe.count,this.errorForStack=new Error,this.callback&&this.callback.validTest&&(this.errorForStack.stack=void 0),this.testReport=new de(this.testName,this.module.suiteReport,{todo:this.todo,skip:this.skip,valid:this.valid()})
-for(var n=0,r=this.module.tests;n<r.length;n++)this.module.tests[n].name===this.testName&&(this.testName+=" ")
-this.testId=A(this.module.name,this.testName),this.module.tests.push({name:this.testName,testId:this.testId,skip:!!this.skip}),this.skip?(this.callback=function(){},this.async=!1,this.expected=0):this.assert=new X(this)}}function ge(){if(!F.current)throw new Error("pushFailure() assertion outside test context, in "+J(2))
-var e=F.current
-return e.pushFailure.apply(e,arguments)}function ve(){if(F.pollution=[],F.noglobals)for(var e in h)if(E.call(h,e)){if(/^qunit-test-output/.test(e))continue
-F.pollution.push(e)}}pe.count=0,pe.prototype={get stack(){return V(this.errorForStack,this.stackOffset)},before:function(){var e=this,t=this.module,n=function(e){for(var t=e,n=[];t&&0===t.testsRun;)n.push(t),t=t.parentModule
-return n.reverse()}(t),r=oe.resolve()
-return n.forEach((function(e){r=r.then((function(){return e.stats={all:0,bad:0,started:S.now()},ne("suiteStart",e.suiteReport.start(!0)),se("moduleStart",{name:e.name,tests:e.tests})}))})),r.then((function(){return F.current=e,e.testEnvironment=M({},t.testEnvironment),e.started=S.now(),ne("testStart",e.testReport.start(!0)),se("testStart",{name:e.testName,module:t.name,testId:e.testId,previousFailure:e.previousFailure}).then((function(){F.pollution||ve()}))}))},run:function(){if(F.current=this,F.notrycatch)e(this)
-else try{e(this)}catch(e){this.pushFailure("Died on test #"+(this.assertions.length+1)+": "+(e.message||e)+"\n"+this.stack,V(e,0)),ve(),F.blocking&&Ee(this)}function e(e){var t
-t=e.withData?e.callback.call(e.testEnvironment,e.assert,e.data):e.callback.call(e.testEnvironment,e.assert),e.resolvePromise(t),0===e.timeout&&e.pauses.size>0&&ge("Test did not finish synchronously even though assert.timeout( 0 ) was used.",J(2))}},after:function(){!function(){var e=F.pollution
-ve()
-var t=C(F.pollution,e)
-t.length>0&&ge("Introduced global variable(s): "+t.join(", "))
-var n=C(e,F.pollution)
-n.length>0&&ge("Deleted global variable(s): "+n.join(", "))}()},queueGlobalHook:function(e,t){var n=this
-return function(){var r
-if(F.current=n,F.notrycatch)r=e.call(n.testEnvironment,n.assert)
-else try{r=e.call(n.testEnvironment,n.assert)}catch(e){return void n.pushFailure("Global "+t+" failed on "+n.testName+": "+R(e),V(e,0))}n.resolvePromise(r,t)}},queueHook:function(e,t,n){var r=this,i=function(){var n=e.call(r.testEnvironment,r.assert)
-r.resolvePromise(n,t)}
-return function(){if("before"===t){if(0!==n.testsRun)return
-r.preserveEnvironment=!0}if("after"!==t||function(e){return e.testsRun===Se(e).filter((function(e){return!e.skip})).length-1}(n)||!(F.queue.length>0||he.taskCount()>2))if(F.current=r,F.notrycatch)i()
-else try{i()}catch(e){r.pushFailure(t+" failed on "+r.testName+": "+(e.message||e),V(e,0))}}},hooks:function(e){var t=[]
-return this.skip||(function(n){if(("beforeEach"===e||"afterEach"===e)&&F.globalHooks[e])for(var r=0;r<F.globalHooks[e].length;r++)t.push(n.queueGlobalHook(F.globalHooks[e][r],e))}(this),function n(r,i){if(i.parentModule&&n(r,i.parentModule),i.hooks[e].length)for(var o=0;o<i.hooks[e].length;o++)t.push(r.queueHook(i.hooks[e][o],e,i))}(this,this.module)),t},finish:function(){if(F.current=this,this.callback=void 0,this.steps.length){var e=this.steps.join(", ")
-this.pushFailure("Expected assert.verifySteps() to be called before end of test "+"after using assert.step(). Unverified steps: ".concat(e),this.stack)}F.requireExpects&&null===this.expected?this.pushFailure("Expected number of assertions to be defined, but expect() was not called.",this.stack):null!==this.expected&&this.expected!==this.assertions.length?this.pushFailure("Expected "+this.expected+" assertions, but "+this.assertions.length+" were run",this.stack):null!==this.expected||this.assertions.length||this.pushFailure("Expected at least one assertion, but none were run - call expect(0) to accept zero assertions.",this.stack)
-var t=this.module,n=t.name,r=this.testName,i=!!this.skip,o=!!this.todo,s=0,a=F.storage
-this.runtime=Math.round(S.now()-this.started),F.stats.all+=this.assertions.length,F.stats.testCount+=1,t.stats.all+=this.assertions.length
-for(var u=0;u<this.assertions.length;u++)this.assertions[u].result||(s++,F.stats.bad++,t.stats.bad++)
-i?Te(t):function(e){for(e.testsRun++;e=e.parentModule;)e.testsRun++}(t),a&&(s?a.setItem("qunit-test-"+n+"-"+r,s):a.removeItem("qunit-test-"+n+"-"+r)),ne("testEnd",this.testReport.end(!0)),this.testReport.slimAssertions()
-var l=this
-return se("testDone",{name:r,module:n,skipped:i,todo:o,failed:s,passed:this.assertions.length-s,total:this.assertions.length,runtime:i?0:this.runtime,assertions:this.assertions,testId:this.testId,get source(){return l.stack}}).then((function(){if(Ce(t)){for(var e=[t],n=t.parentModule;n&&Ce(n);)e.push(n),n=n.parentModule
-var r=oe.resolve()
-return e.forEach((function(e){r=r.then((function(){return function(e){for(var t=[e];t.length;){var n=t.shift()
-n.hooks={},t.push.apply(t,c(n.childModules))}return ne("suiteEnd",e.suiteReport.end(!0)),se("moduleDone",{name:e.name,tests:e.tests,failed:e.stats.bad,passed:e.stats.all-e.stats.bad,total:e.stats.all,runtime:Math.round(S.now()-e.stats.started)})}(e)}))})),r}})).then((function(){F.current=void 0}))},preserveTestEnvironment:function(){this.preserveEnvironment&&(this.module.testEnvironment=this.testEnvironment,this.testEnvironment=M({},this.module.testEnvironment))},queue:function(){var e=this
-if(this.valid()){var t=F.storage&&+F.storage.getItem("qunit-test-"+this.module.name+"-"+this.testName),n=F.reorder&&!!t
-this.previousFailure=!!t,he.add((function(){return[function(){return e.before()}].concat(c(e.hooks("before")),[function(){e.preserveTestEnvironment()}],c(e.hooks("beforeEach")),[function(){e.run()}],c(e.hooks("afterEach").reverse()),c(e.hooks("after").reverse()),[function(){e.after()},function(){return e.finish()}])}),n,F.seed)}else Te(this.module)},pushResult:function(e){if(this!==F.current){var t=e&&e.message||"",n=this&&this.testName||""
-throw new Error("Assertion occurred after test finished.\n> Test: "+n+"\n> Message: "+t+"\n")}var r={module:this.module.name,name:this.testName,result:e.result,message:e.message,actual:e.actual,testId:this.testId,negative:e.negative||!1,runtime:Math.round(S.now()-this.started),todo:!!this.todo}
-if(E.call(e,"expected")&&(r.expected=e.expected),!e.result){var i=e.source||J()
-i&&(r.source=i)}this.logAssertion(r),this.assertions.push({result:!!e.result,message:e.message})},pushFailure:function(e,t,n){if(!(this instanceof pe))throw new Error("pushFailure() assertion outside test context, was "+J(2))
-this.pushResult({result:!1,message:e||"error",actual:n||null,source:t})},logAssertion:function(e){se("log",e)
-var t={passed:e.result,actual:e.actual,expected:e.expected,message:e.message,stack:e.source,todo:e.todo}
-this.testReport.pushAssertion(t),ne("assertion",t)},internalResetTimeout:function(e){v(F.timeout),F.timeout=g(F.timeoutHandler(e),e)},internalStop:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:1
-F.blocking=!0
-var t,n=this,r=this.nextPauseId++,i={cancelled:!1,remaining:e}
-function o(){if(!i.cancelled){if(void 0===F.current)throw new Error("Unexpected release of async pause after tests finished.\n"+"> Test: ".concat(n.testName," [async #").concat(r,"]"))
-if(F.current!==n)throw new Error("Unexpected release of async pause during a different test.\n"+"> Test: ".concat(n.testName," [async #").concat(r,"]"))
-if(i.remaining<=0)throw new Error("Tried to release async pause that was already released.\n"+"> Test: ".concat(n.testName," [async #").concat(r,"]"))
-i.remaining--,0===i.remaining&&n.pauses.delete(r),_e(n)}}return n.pauses.set(r,i),g&&("number"==typeof n.timeout?t=n.timeout:"number"==typeof F.testTimeout&&(t=F.testTimeout),"number"==typeof t&&t>0&&(F.timeoutHandler=function(e){return function(){F.timeout=null,i.cancelled=!0,n.pauses.delete(r),n.pushFailure("Test took longer than ".concat(e,"ms; test timed out."),J(2)),_e(n)}},v(F.timeout),F.timeout=g(F.timeoutHandler(t),t))),o},resolvePromise:function(e,t){if(null!=e){var n=this,r=e.then
-if("function"==typeof r){var i=n.internalStop(),o=function(){i()}
-F.notrycatch?r.call(e,o):r.call(e,o,(function(e){var r="Promise rejected "+(t?t.replace(/Each$/,""):"during")+' "'+n.testName+'": '+(e&&e.message||e)
-n.pushFailure(r,V(e,0)),ve(),Ee(n)}))}}},valid:function(){if(this.callback&&this.callback.validTest)return!0
-if(!function e(t,n){return!n||!n.length||T(t.moduleId,n)||t.parentModule&&e(t.parentModule,n)}(this.module,F.moduleId))return!1
-if(F.testId&&F.testId.length&&!T(this.testId,F.testId))return!1
-var e=F.module&&F.module.toLowerCase()
-if(!function e(t,n){return!n||(t.name?t.name.toLowerCase():null)===n||!!t.parentModule&&e(t.parentModule,n)}(this.module,e))return!1
-var t=F.filter
-if(!t)return!0
-var n=/^(!?)\/([\w\W]*)\/(i?$)/.exec(t),r=this.module.name+": "+this.testName
-return n?this.regexFilter(!!n[1],n[2],n[3],r):this.stringFilter(t,r)},regexFilter:function(e,t,n,r){return new RegExp(t,n).test(r)!==e},stringFilter:function(e,t){e=e.toLowerCase(),t=t.toLowerCase()
-var n="!"!==e.charAt(0)
-return n||(e=e.slice(1)),-1!==t.indexOf(e)?n:!n}}
-var me=!1
-function ye(e){me||F.currentModule.ignored||new pe(e).queue()}function be(e){F.currentModule.ignored||(me||(F.queue.length=0,me=!0),new pe(e).queue())}function we(e,t){ye({testName:e,callback:t})}function xe(e,t){return"".concat(e," [").concat(t,"]")}function ke(e,t){if(Array.isArray(e))for(var n=0;n<e.length;n++)t(e[n],n)
-else{if("object"!==i(e)||null===e)throw new Error("test.each() expects an array or object as input, but\nfound ".concat(i(e)," instead."))
-for(var r in e)t(e[r],r)}}function Ee(e){e.pauses.forEach((function(e){e.cancelled=!0})),e.pauses.clear(),_e(e)}function _e(e){e.pauses.size>0||(g?(v(F.timeout),F.timeout=g((function(){e.pauses.size>0||(v(F.timeout),F.timeout=null,F.blocking=!1,he.advance())}))):(F.blocking=!1,he.advance()))}function Se(e){for(var t=[].concat(e.tests),n=c(e.childModules);n.length;){var r=n.shift()
-t.push.apply(t,r.tests),n.push.apply(n,c(r.childModules))}return t}function Ce(e){return e.testsRun+e.testsIgnored===Se(e).length}function Te(e){for(e.testsIgnored++;e=e.parentModule;)e.testsIgnored++}M(we,{todo:function(e,t){ye({testName:e,callback:t,todo:!0})},skip:function(e){ye({testName:e,skip:!0})},only:function(e,t){be({testName:e,callback:t})},each:function(e,t,n){ke(t,(function(t,r){ye({testName:xe(e,r),callback:n,withData:!0,stackOffset:5,data:t})}))}}),we.todo.each=function(e,t,n){ke(t,(function(t,r){ye({testName:xe(e,r),callback:n,todo:!0,withData:!0,stackOffset:5,data:t})}))},we.skip.each=function(e,t){ke(t,(function(t,n){ye({testName:xe(e,n),stackOffset:5,skip:!0})}))},we.only.each=function(e,t,n){ke(t,(function(t,r){be({testName:xe(e,r),callback:n,withData:!0,stackOffset:5,data:t})}))}
-var je,Ne,Me,Oe,qe=function(){function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-o(this,e),this.log=n.log||Function.prototype.bind.call(p.log,p),t.on("error",this.onError.bind(this)),t.on("runStart",this.onRunStart.bind(this)),t.on("testStart",this.onTestStart.bind(this)),t.on("testEnd",this.onTestEnd.bind(this)),t.on("runEnd",this.onRunEnd.bind(this))}return a(e,[{key:"onError",value:function(e){this.log("error",e)}},{key:"onRunStart",value:function(e){this.log("runStart",e)}},{key:"onTestStart",value:function(e){this.log("testStart",e)}},{key:"onTestEnd",value:function(e){this.log("testEnd",e)}},{key:"onRunEnd",value:function(e){this.log("runEnd",e)}}],[{key:"init",value:function(t,n){return new e(t,n)}}]),e}(),Ae=!0
-if("undefined"!=typeof process){var Re=process.env
-je=Re.FORCE_COLOR,Ne=Re.NODE_DISABLE_COLORS,Me=Re.NO_COLOR,Oe=Re.TERM,Ae=process.stdout&&process.stdout.isTTY}var Ie={enabled:!Ne&&null==Me&&"dumb"!==Oe&&(null!=je&&"0"!==je||Ae),reset:Pe(0,0),bold:Pe(1,22),dim:Pe(2,22),italic:Pe(3,23),underline:Pe(4,24),inverse:Pe(7,27),hidden:Pe(8,28),strikethrough:Pe(9,29),black:Pe(30,39),red:Pe(31,39),green:Pe(32,39),yellow:Pe(33,39),blue:Pe(34,39),magenta:Pe(35,39),cyan:Pe(36,39),white:Pe(37,39),gray:Pe(90,39),grey:Pe(90,39),bgBlack:Pe(40,49),bgRed:Pe(41,49),bgGreen:Pe(42,49),bgYellow:Pe(43,49),bgBlue:Pe(44,49),bgMagenta:Pe(45,49),bgCyan:Pe(46,49),bgWhite:Pe(47,49)}
-function Fe(e,t){for(var n,r=0,i="",o="";r<e.length;r++)i+=(n=e[r]).open,o+=n.close,~t.indexOf(n.close)&&(t=t.replace(n.rgx,n.close+n.open))
-return i+t+o}function Pe(e,t){var n={open:"[".concat(e,"m"),close:"[".concat(t,"m"),rgx:new RegExp("\\x1b\\[".concat(t,"m"),"g")}
-return function(t){return void 0!==this&&void 0!==this.has?(~this.has.indexOf(e)||(this.has.push(e),this.keys.push(n)),void 0===t?this:Ie.enabled?Fe(this.keys,t+""):t+""):void 0===t?((r={has:[e],keys:[n]}).reset=Ie.reset.bind(r),r.bold=Ie.bold.bind(r),r.dim=Ie.dim.bind(r),r.italic=Ie.italic.bind(r),r.underline=Ie.underline.bind(r),r.inverse=Ie.inverse.bind(r),r.hidden=Ie.hidden.bind(r),r.strikethrough=Ie.strikethrough.bind(r),r.black=Ie.black.bind(r),r.red=Ie.red.bind(r),r.green=Ie.green.bind(r),r.yellow=Ie.yellow.bind(r),r.blue=Ie.blue.bind(r),r.magenta=Ie.magenta.bind(r),r.cyan=Ie.cyan.bind(r),r.white=Ie.white.bind(r),r.gray=Ie.gray.bind(r),r.grey=Ie.grey.bind(r),r.bgBlack=Ie.bgBlack.bind(r),r.bgRed=Ie.bgRed.bind(r),r.bgGreen=Ie.bgGreen.bind(r),r.bgYellow=Ie.bgYellow.bind(r),r.bgBlue=Ie.bgBlue.bind(r),r.bgMagenta=Ie.bgMagenta.bind(r),r.bgCyan=Ie.bgCyan.bind(r),r.bgWhite=Ie.bgWhite.bind(r),r):Ie.enabled?Fe([n],t+""):t+""
-var r}}var De=Object.prototype.hasOwnProperty
-function Le(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:4
-if(void 0===e&&(e=String(e)),"number"!=typeof e||isFinite(e)||(e=String(e)),"number"==typeof e)return JSON.stringify(e)
-if("string"==typeof e){var n=/['"\\/[{}\]\r\n]/,r=/[-?:,[\]{}#&*!|=>'"%@`]/,i=/(^\s|\s$)/,o=/^[\d._-]+$/,s=/^(true|false|y|n|yes|no|on|off)$/i
-if(""===e||n.test(e)||r.test(e[0])||i.test(e)||o.test(e)||s.test(e)){if(!/\n/.test(e))return JSON.stringify(e)
-var a=new Array(t+1).join(" "),u=e.match(/\n+$/),c=u?u[0].length:0
-if(1===c){var l=e.replace(/\n$/,"").split("\n").map((function(e){return a+e}))
-return"|\n"+l.join("\n")}var f=e.split("\n").map((function(e){return a+e}))
-return"|+\n"+f.join("\n")}return e}return JSON.stringify(Be(e),null,2)}function Be(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[]
-if(-1!==t.indexOf(e))return"[Circular]"
-var n,r=Object.prototype.toString.call(e).replace(/^\[.+\s(.+?)]$/,"$1").toLowerCase()
-switch(r){case"array":t.push(e),n=e.map((function(e){return Be(e,t)})),t.pop()
-break
-case"object":t.push(e),n={},Object.keys(e).forEach((function(r){n[r]=Be(e[r],t)})),t.pop()
-break
-default:n=e}return n}var Ue=function(){function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-o(this,e),this.log=n.log||Function.prototype.bind.call(p.log,p),this.testCount=0,this.ended=!1,this.bailed=!1,t.on("error",this.onError.bind(this)),t.on("runStart",this.onRunStart.bind(this)),t.on("testEnd",this.onTestEnd.bind(this)),t.on("runEnd",this.onRunEnd.bind(this))}return a(e,[{key:"onRunStart",value:function(e){this.log("TAP version 13")}},{key:"onError",value:function(e){this.bailed||(this.bailed=!0,this.ended||(this.testCount=this.testCount+1,this.log(Ie.red("not ok ".concat(this.testCount," global failure"))),this.logError(e)),this.log("Bail out! "+R(e).split("\n")[0]),this.ended&&this.logError(e))}},{key:"onTestEnd",value:function(e){var t=this
-this.testCount=this.testCount+1,"passed"===e.status?this.log("ok ".concat(this.testCount," ").concat(e.fullName.join(" > "))):"skipped"===e.status?this.log(Ie.yellow("ok ".concat(this.testCount," # SKIP ").concat(e.fullName.join(" > ")))):"todo"===e.status?(this.log(Ie.cyan("not ok ".concat(this.testCount," # TODO ").concat(e.fullName.join(" > ")))),e.errors.forEach((function(e){return t.logAssertion(e,"todo")}))):(this.log(Ie.red("not ok ".concat(this.testCount," ").concat(e.fullName.join(" > ")))),e.errors.forEach((function(e){return t.logAssertion(e)})))}},{key:"onRunEnd",value:function(e){this.ended=!0,this.log("1..".concat(e.testCounts.total)),this.log("# pass ".concat(e.testCounts.passed)),this.log(Ie.yellow("# skip ".concat(e.testCounts.skipped))),this.log(Ie.cyan("# todo ".concat(e.testCounts.todo))),this.log(Ie.red("# fail ".concat(e.testCounts.failed)))}},{key:"logAssertion",value:function(e,t){var n="  ---"
-n+="\n  message: ".concat(Le(e.message||"failed")),n+="\n  severity: ".concat(Le(t||"failed")),De.call(e,"actual")&&(n+="\n  actual  : ".concat(Le(e.actual))),De.call(e,"expected")&&(n+="\n  expected: ".concat(Le(e.expected))),e.stack&&(n+="\n  stack: ".concat(Le(e.stack+"\n"))),n+="\n  ...",this.log(n)}},{key:"logError",value:function(e){var t="  ---"
-t+="\n  message: ".concat(Le(R(e))),t+="\n  severity: ".concat(Le("failed")),e&&e.stack&&(t+="\n  stack: ".concat(Le(e.stack+"\n"))),t+="\n  ...",this.log(t)}}],[{key:"init",value:function(t,n){return new e(t,n)}}]),e}(),He={console:qe,tap:Ue}
-function ze(e){return function(t){F.globalHooks[e]||(F.globalHooks[e]=[]),F.globalHooks[e].push(t)}}var $e={beforeEach:ze("beforeEach"),afterEach:ze("afterEach")}
-function Qe(e){F.current?F.current.assert.pushResult({result:!1,message:"global failure: ".concat(R(e)),source:e&&e.stack||J(2)}):(U.globalFailureCount++,F.stats.bad++,F.stats.all++,ne("error",e))}var Ge={}
-F.currentModule.suiteReport=U
-var We=!1,Ye=!1
-function Ve(){Ye=!0,g?g((function(){Xe()})):Xe()}function Je(){F.blocking=!1,he.advance()}function Xe(){if(F.started)Je()
-else{F.started=S.now(),""===F.modules[0].name&&0===F.modules[0].tests.length&&F.modules.shift()
-for(var e=[],t=0;t<F.modules.length;t++)""!==F.modules[t].name&&e.push({name:F.modules[t].name,moduleId:F.modules[t].moduleId,tests:F.modules[t].tests})
-ne("runStart",U.start(!0)),se("begin",{totalTests:pe.count,modules:e}).then(Je)}}Ge.isLocal=d&&d.location&&"file:"===d.location.protocol,Ge.version="2.19.1",M(Ge,{config:F,dump:D,equiv:I,reporters:He,hooks:$e,is:q,objectType:O,on:function(e,t){if("string"!=typeof e)throw new TypeError("eventName must be a string when registering a listener")
-if(!T(e,te)){var n=te.join(", ")
-throw new Error('"'.concat(e,'" is not a valid event; must be one of: ').concat(n,"."))}if("function"!=typeof t)throw new TypeError("callback must be a function when registering a listener")
-ee[e]||(ee[e]=[]),T(t,ee[e])||ee[e].push(t)},onError:function(e){if(x.warn("QUnit.onError is deprecated and will be removed in QUnit 3.0. Please use QUnit.onUncaughtException instead."),F.current&&F.current.ignoreGlobalErrors)return!0
-var t=new Error(e.message)
-return t.stack=e.stacktrace||e.fileName+":"+e.lineNumber,Qe(t),!1},onUncaughtException:Qe,pushFailure:ge,assert:X.prototype,module:W,test:we,todo:we.todo,skip:we.skip,only:we.only,start:function(e){if(F.current)throw new Error("QUnit.start cannot be called inside a test context.")
-var t=We
-if(We=!0,Ye)throw new Error("Called start() while test already started running")
-if(t||e>1)throw new Error("Called start() outside of a test context too many times")
-if(F.autostart)throw new Error("Called start() outside of a test context when QUnit.config.autostart was true")
-if(!F.pageLoaded)return F.autostart=!0,void(m||Ge.load())
-Ve()},onUnhandledRejection:function(e){x.warn("QUnit.onUnhandledRejection is deprecated and will be removed in QUnit 3.0. Please use QUnit.onUncaughtException instead."),Qe(e)},extend:function(){x.warn("QUnit.extend is deprecated and will be removed in QUnit 3.0. Please use Object.assign instead.")
-for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n]
-return M.apply(this,t)},load:function(){F.pageLoaded=!0,M(F,{started:0,updateRate:1e3,autostart:!0,filter:""},!0),Ye||(F.blocking=!1,F.autostart&&Ve())},stack:function(e){return J(e=(e||0)+2)}}),function(e){var t=["begin","done","log","testStart","testDone","moduleStart","moduleDone"]
-function n(e){return function(t){if("function"!=typeof t)throw new Error("Callback parameter must be a function")
-F.callbacks[e].push(t)}}for(var r=0;r<t.length;r++){var i=t[r]
-void 0===F.callbacks[i]&&(F.callbacks[i]=[]),e[i]=n(i)}}(Ge),function(i){if(d&&m){if(d.QUnit&&d.QUnit.version)throw new Error("QUnit has already been defined.")
-d.QUnit=i}e&&e.exports&&(e.exports=i,e.exports.QUnit=i),t&&(t.QUnit=i),void 0===(r=function(){return i}.call(t,n,t,e))||(e.exports=r),i.config.autostart=!1}(Ge),function(){if(d&&m){var e=Ge.config,t=Object.prototype.hasOwnProperty
-Ge.begin((function(){if(!t.call(e,"fixture")){var n=m.getElementById("qunit-fixture")
-n&&(e.fixture=n.cloneNode(!0))}})),Ge.testStart((function(){if(null!=e.fixture){var t=m.getElementById("qunit-fixture")
-if("string"===i(e.fixture)){var n=m.createElement("div")
-n.setAttribute("id","qunit-fixture"),n.innerHTML=e.fixture,t.parentNode.replaceChild(n,t)}else{var r=e.fixture.cloneNode(!0)
-t.parentNode.replaceChild(r,t)}}}))}}(),function(){var e=void 0!==d&&d.location
-if(e){var t=function(){for(var t=Object.create(null),r=e.search.slice(1).split("&"),i=r.length,o=0;o<i;o++)if(r[o]){var s=r[o].split("="),a=n(s[0]),u=1===s.length||n(s.slice(1).join("="))
-t[a]=a in t?[].concat(t[a],u):u}return t}()
-Ge.urlParams=t,Ge.config.filter=t.filter,Ge.config.module=t.module,Ge.config.moduleId=[].concat(t.moduleId||[]),Ge.config.testId=[].concat(t.testId||[]),!0===t.seed?Ge.config.seed=Math.random().toString(36).slice(2):t.seed&&(Ge.config.seed=t.seed),Ge.config.urlConfig.push({id:"hidepassed",label:"Hide passed tests",tooltip:"Only show tests and assertions that fail. Stored as query-strings."},{id:"noglobals",label:"Check for Globals",tooltip:"Enabling this will test if any test introduces new properties on the global object (`window` in Browsers). Stored as query-strings."},{id:"notrycatch",label:"No try-catch",tooltip:"Enabling this will run tests outside of a try-catch block. Makes debugging exceptions in IE reasonable. Stored as query-strings."}),Ge.begin((function(){for(var e=Ge.config.urlConfig,n=0;n<e.length;n++){var r=Ge.config.urlConfig[n]
-"string"!=typeof r&&(r=r.id),void 0===Ge.config[r]&&(Ge.config[r]=t[r])}}))}function n(e){return decodeURIComponent(e.replace(/\+/g,"%20"))}}()
-var Ze={exports:{}}
-!function(e){var t,n
-t=re,n=function(){var e="undefined"==typeof window,t="function"==typeof Map?Map:function(){var e=Object.create(null)
-this.get=function(t){return e[t]},this.set=function(t,n){return e[t]=n,this},this.clear=function(){e=Object.create(null)}},n=new t,r=new t,o=[]
-o.total=0
-var s=[],a=[]
-function u(){n.clear(),r.clear(),s=[],a=[]}function c(e){for(var t=-9007199254740991,n=e.length-1;n>=0;--n){var r=e[n]
-if(null!==r){var i=r.score
-i>t&&(t=i)}}return-9007199254740991===t?null:t}function l(e,t){var n=e[t]
-if(void 0!==n)return n
-var r=t
-Array.isArray(t)||(r=t.split("."))
-for(var i=r.length,o=-1;e&&++o<i;)e=e[r[o]]
-return e}function f(e){return"object"===i(e)}var h=function(){var e=[],t=0,n={}
-function r(){for(var n=0,r=e[n],i=1;i<t;){var o=i+1
-n=i,o<t&&e[o].score<e[i].score&&(n=o),e[n-1>>1]=e[n],i=1+(n<<1)}for(var s=n-1>>1;n>0&&r.score<e[s].score;s=(n=s)-1>>1)e[n]=e[s]
-e[n]=r}return n.add=function(n){var r=t
-e[t++]=n
-for(var i=r-1>>1;r>0&&n.score<e[i].score;i=(r=i)-1>>1)e[r]=e[i]
-e[r]=n},n.poll=function(){if(0!==t){var n=e[0]
-return e[0]=e[--t],r(),n}},n.peek=function(n){if(0!==t)return e[0]},n.replaceTop=function(t){e[0]=t,r()},n},d=h()
-return function t(i){var p={single:function(e,t,n){return"farzher"==e?{target:"farzher was here (^-^*)/",score:0,indexes:[0,1,2,3,4,5,6]}:e?(f(e)||(e=p.getPreparedSearch(e)),t?(f(t)||(t=p.getPrepared(t)),((n&&void 0!==n.allowTypo?n.allowTypo:!i||void 0===i.allowTypo||i.allowTypo)?p.algorithm:p.algorithmNoTypo)(e,t,e[0])):null):null},go:function(e,t,n){if("farzher"==e)return[{target:"farzher was here (^-^*)/",score:0,indexes:[0,1,2,3,4,5,6],obj:t?t[0]:null}]
-if(!e)return o
-var r=(e=p.prepareSearch(e))[0],s=n&&n.threshold||i&&i.threshold||-9007199254740991,a=n&&n.limit||i&&i.limit||9007199254740991,u=(n&&void 0!==n.allowTypo?n.allowTypo:!i||void 0===i.allowTypo||i.allowTypo)?p.algorithm:p.algorithmNoTypo,h=0,g=0,v=t.length
-if(n&&n.keys)for(var m=n.scoreFn||c,y=n.keys,b=y.length,w=v-1;w>=0;--w){for(var x=t[w],k=new Array(b),E=b-1;E>=0;--E)(C=l(x,S=y[E]))?(f(C)||(C=p.getPrepared(C)),k[E]=u(e,C,r)):k[E]=null
-k.obj=x
-var _=m(k)
-null!==_&&(_<s||(k.score=_,h<a?(d.add(k),++h):(++g,_>d.peek().score&&d.replaceTop(k))))}else if(n&&n.key){var S=n.key
-for(w=v-1;w>=0;--w)(C=l(x=t[w],S))&&(f(C)||(C=p.getPrepared(C)),null!==(T=u(e,C,r))&&(T.score<s||(T={target:T.target,_targetLowerCodes:null,_nextBeginningIndexes:null,score:T.score,indexes:T.indexes,obj:x},h<a?(d.add(T),++h):(++g,T.score>d.peek().score&&d.replaceTop(T)))))}else for(w=v-1;w>=0;--w){var C,T;(C=t[w])&&(f(C)||(C=p.getPrepared(C)),null!==(T=u(e,C,r))&&(T.score<s||(h<a?(d.add(T),++h):(++g,T.score>d.peek().score&&d.replaceTop(T)))))}if(0===h)return o
-var j=new Array(h)
-for(w=h-1;w>=0;--w)j[w]=d.poll()
-return j.total=h+g,j},goAsync:function(t,n,r){var s=!1,a=new Promise((function(a,u){if("farzher"==t)return a([{target:"farzher was here (^-^*)/",score:0,indexes:[0,1,2,3,4,5,6],obj:n?n[0]:null}])
-if(!t)return a(o)
-var d=(t=p.prepareSearch(t))[0],g=h(),v=n.length-1,m=r&&r.threshold||i&&i.threshold||-9007199254740991,y=r&&r.limit||i&&i.limit||9007199254740991,b=(r&&void 0!==r.allowTypo?r.allowTypo:!i||void 0===i.allowTypo||i.allowTypo)?p.algorithm:p.algorithmNoTypo,w=0,x=0
-function k(){if(s)return u("canceled")
-var i=Date.now()
-if(r&&r.keys)for(var h=r.scoreFn||c,E=r.keys,_=E.length;v>=0;--v){if(v%1e3==0&&Date.now()-i>=10)return void(e?setImmediate(k):setTimeout(k))
-for(var S=n[v],C=new Array(_),T=_-1;T>=0;--T)(M=l(S,N=E[T]))?(f(M)||(M=p.getPrepared(M)),C[T]=b(t,M,d)):C[T]=null
-C.obj=S
-var j=h(C)
-null!==j&&(j<m||(C.score=j,w<y?(g.add(C),++w):(++x,j>g.peek().score&&g.replaceTop(C))))}else if(r&&r.key)for(var N=r.key;v>=0;--v){if(v%1e3==0&&Date.now()-i>=10)return void(e?setImmediate(k):setTimeout(k));(M=l(S=n[v],N))&&(f(M)||(M=p.getPrepared(M)),null!==(O=b(t,M,d))&&(O.score<m||(O={target:O.target,_targetLowerCodes:null,_nextBeginningIndexes:null,score:O.score,indexes:O.indexes,obj:S},w<y?(g.add(O),++w):(++x,O.score>g.peek().score&&g.replaceTop(O)))))}else for(;v>=0;--v){if(v%1e3==0&&Date.now()-i>=10)return void(e?setImmediate(k):setTimeout(k))
-var M,O;(M=n[v])&&(f(M)||(M=p.getPrepared(M)),null!==(O=b(t,M,d))&&(O.score<m||(w<y?(g.add(O),++w):(++x,O.score>g.peek().score&&g.replaceTop(O)))))}if(0===w)return a(o)
-for(var q=new Array(w),A=w-1;A>=0;--A)q[A]=g.poll()
-q.total=w+x,a(q)}e?setImmediate(k):k()}))
-return a.cancel=function(){s=!0},a},highlight:function(e,t,n){if("function"==typeof t)return p.highlightCallback(e,t)
-if(null===e)return null
-void 0===t&&(t="<b>"),void 0===n&&(n="</b>")
-for(var r="",i=0,o=!1,s=e.target,a=s.length,u=e.indexes,c=0;c<a;++c){var l=s[c]
-if(u[i]===c){if(o||(o=!0,r+=t),++i===u.length){r+=l+n+s.substr(c+1)
-break}}else o&&(o=!1,r+=n)
-r+=l}return r},highlightCallback:function(e,t){if(null===e)return null
-for(var n=e.target,r=n.length,i=e.indexes,o="",s=0,a=0,u=!1,c=(e=[],0);c<r;++c){var l=n[c]
-if(i[a]===c){if(++a,u||(u=!0,e.push(o),o=""),a===i.length){o+=l,e.push(t(o,s++)),o="",e.push(n.substr(c+1))
-break}}else u&&(u=!1,e.push(t(o,s++)),o="")
-o+=l}return e},prepare:function(e){return e?{target:e,_targetLowerCodes:p.prepareLowerCodes(e),_nextBeginningIndexes:null,score:null,indexes:null,obj:null}:{target:"",_targetLowerCodes:[0],_nextBeginningIndexes:null,score:null,indexes:null,obj:null}},prepareSlow:function(e){return e?{target:e,_targetLowerCodes:p.prepareLowerCodes(e),_nextBeginningIndexes:p.prepareNextBeginningIndexes(e),score:null,indexes:null,obj:null}:{target:"",_targetLowerCodes:[0],_nextBeginningIndexes:null,score:null,indexes:null,obj:null}},prepareSearch:function(e){return e||(e=""),p.prepareLowerCodes(e)},getPrepared:function(e){if(e.length>999)return p.prepare(e)
-var t=n.get(e)
-return void 0!==t||(t=p.prepare(e),n.set(e,t)),t},getPreparedSearch:function(e){if(e.length>999)return p.prepareSearch(e)
-var t=r.get(e)
-return void 0!==t||(t=p.prepareSearch(e),r.set(e,t)),t},algorithm:function(e,t,n){for(var r=t._targetLowerCodes,i=e.length,o=r.length,u=0,c=0,l=0,f=0;;){if(n===r[c]){if(s[f++]=c,++u===i)break
-n=e[0===l?u:l===u?u+1:l===u-1?u-1:u]}if(++c>=o)for(;;){if(u<=1)return null
-if(0===l){if(n===e[--u])continue
-l=u}else{if(1===l)return null
-if((n=e[1+(u=--l)])===e[u])continue}c=s[(f=u)-1]+1
-break}}u=0
-var h=0,d=!1,g=0,v=t._nextBeginningIndexes
-null===v&&(v=t._nextBeginningIndexes=p.prepareNextBeginningIndexes(t.target))
-var m=c=0===s[0]?0:v[s[0]-1]
-if(c!==o)for(;;)if(c>=o){if(u<=0){if(++h>i-2)break
-if(e[h]===e[h+1])continue
-c=m
-continue}--u,c=v[a[--g]]}else if(e[0===h?u:h===u?u+1:h===u-1?u-1:u]===r[c]){if(a[g++]=c,++u===i){d=!0
-break}++c}else c=v[c]
-if(d)var y=a,b=g
-else y=s,b=f
-for(var w=0,x=-1,k=0;k<i;++k)x!==(c=y[k])-1&&(w-=c),x=c
-for(d?0!==h&&(w+=-20):(w*=1e3,0!==l&&(w+=-20)),w-=o-i,t.score=w,t.indexes=new Array(b),k=b-1;k>=0;--k)t.indexes[k]=y[k]
-return t},algorithmNoTypo:function(e,t,n){for(var r=t._targetLowerCodes,i=e.length,o=r.length,u=0,c=0,l=0;;){if(n===r[c]){if(s[l++]=c,++u===i)break
-n=e[u]}if(++c>=o)return null}u=0
-var f=!1,h=0,d=t._nextBeginningIndexes
-if(null===d&&(d=t._nextBeginningIndexes=p.prepareNextBeginningIndexes(t.target)),(c=0===s[0]?0:d[s[0]-1])!==o)for(;;)if(c>=o){if(u<=0)break;--u,c=d[a[--h]]}else if(e[u]===r[c]){if(a[h++]=c,++u===i){f=!0
-break}++c}else c=d[c]
-if(f)var g=a,v=h
-else g=s,v=l
-for(var m=0,y=-1,b=0;b<i;++b)y!==(c=g[b])-1&&(m-=c),y=c
-for(f||(m*=1e3),m-=o-i,t.score=m,t.indexes=new Array(v),b=v-1;b>=0;--b)t.indexes[b]=g[b]
-return t},prepareLowerCodes:function(e){for(var t=e.length,n=[],r=e.toLowerCase(),i=0;i<t;++i)n[i]=r.charCodeAt(i)
-return n},prepareBeginningIndexes:function(e){for(var t=e.length,n=[],r=0,i=!1,o=!1,s=0;s<t;++s){var a=e.charCodeAt(s),u=a>=65&&a<=90,c=u||a>=97&&a<=122||a>=48&&a<=57,l=u&&!i||!o||!c
-i=u,o=c,l&&(n[r++]=s)}return n},prepareNextBeginningIndexes:function(e){for(var t=e.length,n=p.prepareBeginningIndexes(e),r=[],i=n[0],o=0,s=0;s<t;++s)i>s?r[s]=i:(i=n[++o],r[s]=void 0===i?t:i)
-return r},cleanup:u,new:t}
-return p}()},e.exports?e.exports=n():t.fuzzysort=n()}(Ze)
-var Ke=Ze.exports,et={failedTests:[],defined:0,completed:0}
-function tt(e){return e?(""+e).replace(/['"<>&]/g,(function(e){switch(e){case"'":return"&#039;"
-case'"':return"&quot;"
-case"<":return"&lt;"
-case">":return"&gt;"
-case"&":return"&amp;"}})):""}!function(){if(d&&m){var e=Ge.config,t=[],n=!1,r=Object.prototype.hasOwnProperty,i=j({filter:void 0,module:void 0,moduleId:void 0,testId:void 0}),o=null
-Ge.on("runStart",(function(e){et.defined=e.testCounts.total})),Ge.begin((function(t){!function(t){var n,s,a,u,l,f,p,b,E=_("qunit")
-E&&(E.setAttribute("role","main"),E.innerHTML="<h1 id='qunit-header'>"+tt(m.title)+"</h1><h2 id='qunit-banner'></h2><div id='qunit-testrunner-toolbar' role='navigation'></div>"+(!(n=Ge.config.testId)||n.length<=0?"":"<div id='qunit-filteredTest'>Rerunning selected tests: "+tt(n.join(", "))+" <a id='qunit-clearFilter' href='"+tt(i)+"'>Run all tests</a></div>")+"<h2 id='qunit-userAgent'></h2><ol id='qunit-tests'></ol>"),(s=_("qunit-header"))&&(s.innerHTML="<a href='"+tt(i)+"'>"+s.innerHTML+"</a> "),(a=_("qunit-banner"))&&(a.className=""),p=_("qunit-tests"),(b=_("qunit-testresult"))&&b.parentNode.removeChild(b),p&&(p.innerHTML="",(b=m.createElement("p")).id="qunit-testresult",b.className="result",p.parentNode.insertBefore(b,p),b.innerHTML='<div id="qunit-testresult-display">Running...<br />&#160;</div><div id="qunit-testresult-controls"></div><div class="clearfix"></div>',l=_("qunit-testresult-controls")),l&&l.appendChild(((f=m.createElement("button")).id="qunit-abort-tests-button",f.innerHTML="Abort",h(f,"click",S),f)),(u=_("qunit-userAgent"))&&(u.innerHTML="",u.appendChild(m.createTextNode("QUnit "+Ge.version+"; "+y.userAgent))),function(t){var n,i,s,a,u,l=_("qunit-testrunner-toolbar")
-if(l){l.appendChild(((u=m.createElement("span")).innerHTML=function(){for(var t=!1,n=e.urlConfig,i="",o=0;o<n.length;o++){var s=e.urlConfig[o]
-"string"==typeof s&&(s={id:s,label:s})
-var a=tt(s.id),u=tt(s.tooltip)
-if(s.value&&"string"!=typeof s.value){if(i+="<label for='qunit-urlconfig-"+a+"' title='"+u+"'>"+s.label+": </label><select id='qunit-urlconfig-"+a+"' name='"+a+"' title='"+u+"'><option></option>",Array.isArray(s.value))for(var c=0;c<s.value.length;c++)i+="<option value='"+(a=tt(s.value[c]))+"'"+(e[s.id]===s.value[c]?(t=!0)&&" selected='selected'":"")+">"+a+"</option>"
-else for(var l in s.value)r.call(s.value,l)&&(i+="<option value='"+tt(l)+"'"+(e[s.id]===l?(t=!0)&&" selected='selected'":"")+">"+tt(s.value[l])+"</option>")
-e[s.id]&&!t&&(i+="<option value='"+(a=tt(e[s.id]))+"' selected='selected' disabled='disabled'>"+a+"</option>"),i+="</select>"}else i+="<label for='qunit-urlconfig-"+a+"' title='"+u+"'><input id='qunit-urlconfig-"+a+"' name='"+a+"' type='checkbox'"+(s.value?" value='"+tt(s.value)+"'":"")+(e[s.id]?" checked='checked'":"")+" title='"+u+"' />"+tt(s.label)+"</label>"}return i}(),x(u,"qunit-url-config"),v(u.getElementsByTagName("input"),"change",T),v(u.getElementsByTagName("select"),"change",T),u))
-var f=m.createElement("span")
-f.id="qunit-toolbar-filters",f.appendChild((n=m.createElement("form"),i=m.createElement("label"),s=m.createElement("input"),a=m.createElement("button"),x(n,"qunit-filter"),i.innerHTML="Filter: ",s.type="text",s.value=e.filter||"",s.name="filter",s.id="qunit-filter-input",a.innerHTML="Go",i.appendChild(s),n.appendChild(i),n.appendChild(m.createTextNode(" ")),n.appendChild(a),h(n,"submit",C),n)),f.appendChild(function(t){var n=null
-if(o={options:t.modules.slice(),selectedMap:new w,isDirty:function(){return c(o.selectedMap.keys()).sort().join(",")!==c(n.keys()).sort().join(",")}},e.moduleId.length)for(var r=0;r<t.modules.length;r++){var i=t.modules[r];-1!==e.moduleId.indexOf(i.moduleId)&&o.selectedMap.set(i.moduleId,i.name)}n=new w(o.selectedMap)
-var s=m.createElement("input")
-s.id="qunit-modulefilter-search",s.autocomplete="off",h(s,"input",S),h(s,"input",_),h(s,"focus",_),h(s,"click",_)
-var a=m.createElement("label")
-a.htmlFor="qunit-modulefilter-search",a.textContent="Module:"
-var u=m.createElement("span")
-u.id="qunit-modulefilter-search-container",u.appendChild(s)
-var l=m.createElement("button")
-l.textContent="Apply",l.title="Re-run the selected test modules",h(l,"click",N)
-var f=m.createElement("button")
-f.textContent="Reset",f.type="reset",f.title="Restore the previous module selection"
-var p=m.createElement("button")
-p.textContent="Select none",p.type="button",p.title="Clear the current module selection",h(p,"click",(function(){o.selectedMap.clear(),T(),S()}))
-var v=m.createElement("span")
-v.id="qunit-modulefilter-actions",v.appendChild(l),v.appendChild(f),n.size&&v.appendChild(p)
-var y=m.createElement("ul")
-y.id="qunit-modulefilter-dropdown-list"
-var b=m.createElement("div")
-b.id="qunit-modulefilter-dropdown",b.style.display="none",b.appendChild(v),b.appendChild(y),h(b,"change",T),u.appendChild(b),T()
-var x,E=m.createElement("form")
-function _(){function e(t){var n=E.contains(t.target)
-27!==t.keyCode&&n||(27===t.keyCode&&n&&s.focus(),b.style.display="none",g(m,"click",e),g(m,"keydown",e),s.value="",S())}"none"===b.style.display&&(S(),b.style.display="block",h(m,"click",e),h(m,"keydown",e))}function S(){d.clearTimeout(x),x=d.setTimeout((function(){y.innerHTML=function(e){return function(e){var t=""
-o.selectedMap.forEach((function(e,n){t+=O(n,e,!0)}))
-for(var n=0;n<e.length;n++){var r=e[n].obj
-o.selectedMap.has(r.moduleId)||(t+=O(r.moduleId,r.name,!1))}return t}(""===e?o.options.slice(0,20).map((function(e){return{obj:e}})):Ke.go(e,o.options,{limit:20,key:"name",allowTypo:!0}))}(s.value)}))}function T(e){var t=e&&e.target||null
-t&&(t.checked?o.selectedMap.set(t.value,t.parentNode.textContent):o.selectedMap.delete(t.value),k(t.parentNode,"checked",t.checked))
-var n=o.selectedMap.size?o.selectedMap.size+" "+(1===o.selectedMap.size?"module":"modules"):"All modules"
-s.placeholder=n,s.title="Type to search through and reduce the list.",f.disabled=!o.isDirty(),p.style.display=o.selectedMap.size?"":"none"}return E.id="qunit-modulefilter",E.appendChild(a),E.appendChild(m.createTextNode(" ")),E.appendChild(u),h(E,"submit",C),h(E,"reset",(function(){o.selectedMap=new w(n),T(),S()})),E}(t))
-var p=m.createElement("div")
-p.className="clearfix",l.appendChild(f),l.appendChild(p)}}(t)}(t)})),Ge.on("runEnd",(function(t){var n,r,i,o=_("qunit-banner"),s=_("qunit-tests"),a=_("qunit-abort-tests-button"),u=e.stats.all-e.stats.bad,c=[t.testCounts.total," tests completed in ",t.runtime," milliseconds, with ",t.testCounts.failed," failed, ",t.testCounts.skipped," skipped, and ",t.testCounts.todo," todo.<br />","<span class='passed'>",u,"</span> assertions of <span class='total'>",e.stats.all,"</span> passed, <span class='failed'>",e.stats.bad,"</span> failed.",A(et.failedTests)].join("")
-if(a&&a.disabled){c="Tests aborted after "+t.runtime+" milliseconds."
-for(var l=0;l<s.children.length;l++)""!==(n=s.children[l]).className&&"running"!==n.className||(n.className="aborted",i=n.getElementsByTagName("ol")[0],(r=m.createElement("li")).className="fail",r.innerHTML="Test aborted.",i.appendChild(r))}!o||a&&!1!==a.disabled||(o.className="failed"===t.status?"qunit-fail":"qunit-pass"),a&&a.parentNode.removeChild(a),s&&(_("qunit-testresult-display").innerHTML=c),e.altertitle&&m.title&&(m.title=["failed"===t.status?"✖":"✔",m.title.replace(/^[\u2714\u2716] /i,"")].join(" ")),e.scrolltop&&d.scrollTo&&d.scrollTo(0,0)})),Ge.testStart((function(e){var t,n
-q(e.name,e.testId,e.module),(t=_("qunit-testresult-display"))&&(x(t,"running"),n=Ge.config.reorder&&e.previousFailure,t.innerHTML=[F(et),n?"Rerunning previously failed test: <br />":"Running: ",I(e.name,e.module),A(et.failedTests)].join(""))})),Ge.log((function(e){var t=_("qunit-test-output-"+e.testId)
-if(t){var n,i,o,s=tt(e.message)||(e.result?"okay":"failed")
-s="<span class='test-message'>"+s+"</span>",s+="<span class='runtime'>@ "+e.runtime+" ms</span>"
-var a=!1
-!e.result&&r.call(e,"expected")?(n=e.negative?"NOT "+Ge.dump.parse(e.expected):Ge.dump.parse(e.expected),i=Ge.dump.parse(e.actual),s+="<table><tr class='test-expected'><th>Expected: </th><td><pre>"+tt(n)+"</pre></td></tr>",i!==n?(s+="<tr class='test-actual'><th>Result: </th><td><pre>"+tt(i)+"</pre></td></tr>","number"==typeof e.actual&&"number"==typeof e.expected?isNaN(e.actual)||isNaN(e.expected)||(a=!0,o=((o=e.actual-e.expected)>0?"+":"")+o):"boolean"!=typeof e.actual&&"boolean"!=typeof e.expected&&(a=P(o=Ge.diff(n,i)).length!==P(n).length+P(i).length),a&&(s+="<tr class='test-diff'><th>Diff: </th><td><pre>"+o+"</pre></td></tr>")):-1!==n.indexOf("[object Array]")||-1!==n.indexOf("[object Object]")?s+="<tr class='test-message'><th>Message: </th><td>Diff suppressed as the depth of object is more than current max depth ("+Ge.config.maxDepth+").<p>Hint: Use <code>QUnit.dump.maxDepth</code> to  run with a higher max depth or <a href='"+tt(j({maxDepth:-1}))+"'>Rerun</a> without max depth.</p></td></tr>":s+="<tr class='test-message'><th>Message: </th><td>Diff suppressed as the expected and actual results have an equivalent serialization</td></tr>",e.source&&(s+="<tr class='test-source'><th>Source: </th><td><pre>"+tt(e.source)+"</pre></td></tr>"),s+="</table>"):!e.result&&e.source&&(s+="<table><tr class='test-source'><th>Source: </th><td><pre>"+tt(e.source)+"</pre></td></tr></table>")
-var u=t.getElementsByTagName("ol")[0],c=m.createElement("li")
-c.className=e.result?"pass":"fail",c.innerHTML=s,u.appendChild(c)}})),Ge.testDone((function(r){var i=_("qunit-tests"),o=_("qunit-test-output-"+r.testId)
-if(i&&o){var s
-E(o,"running"),s=r.failed>0?"failed":r.todo?"todo":r.skipped?"skipped":"passed"
-var a=o.getElementsByTagName("ol")[0],u=r.passed,c=r.failed,l=r.failed>0?r.todo:!r.todo
-l?x(a,"qunit-collapsed"):(et.failedTests.push(r.testId),e.collapse&&(n?x(a,"qunit-collapsed"):n=!0))
-var f=o.firstChild,d=c?"<b class='failed'>"+c+"</b>, <b class='passed'>"+u+"</b>, ":""
-if(f.innerHTML+=" <b class='counts'>("+d+r.assertions.length+")</b>",et.completed++,r.skipped){o.className="skipped"
-var p=m.createElement("em")
-p.className="qunit-skipped-label",p.innerHTML="skipped",o.insertBefore(p,f)}else{if(h(f,"click",(function(){k(a,"qunit-collapsed")})),o.className=l?"pass":"fail",r.todo){var g=m.createElement("em")
-g.className="qunit-todo-label",g.innerHTML="todo",o.className+=" todo",o.insertBefore(g,f)}var v=m.createElement("span")
-v.className="runtime",v.innerHTML=r.runtime+" ms",o.insertBefore(v,a)}if(r.source){var y=m.createElement("p")
-y.innerHTML="<strong>Source: </strong>"+tt(r.source),x(y,"qunit-source"),l&&x(y,"qunit-collapsed"),h(f,"click",(function(){k(y,"qunit-collapsed")})),o.appendChild(y)}e.hidepassed&&("passed"===s||r.skipped)&&(t.push(o),i.removeChild(o))}})),Ge.on("error",(function(e){var t=q("global failure")
-if(t){var n=tt(R(e))
-n="<span class='test-message'>"+n+"</span>",e&&e.stack&&(n+="<table><tr class='test-source'><th>Source: </th><td><pre>"+tt(e.stack)+"</pre></td></tr></table>")
-var r=t.getElementsByTagName("ol")[0],i=m.createElement("li")
-i.className="fail",i.innerHTML=n,r.appendChild(i),t.className="fail"}}))
-var s,a=(s=d.phantom)&&s.version&&s.version.major>0
-a&&p.warn("Support for PhantomJS is deprecated and will be removed in QUnit 3.0."),a||"complete"!==m.readyState?h(d,"load",Ge.load):Ge.load()
-var u=d.onerror
-d.onerror=function(t,n,r,i,o){var s=!1
-if(u){for(var a=arguments.length,c=new Array(a>5?a-5:0),l=5;l<a;l++)c[l-5]=arguments[l]
-s=u.call.apply(u,[this,t,n,r,i,o].concat(c))}if(!0!==s){if(e.current&&e.current.ignoreGlobalErrors)return!0
-var f=o||new Error(t)
-!f.stack&&n&&r&&(f.stack="".concat(n,":").concat(r)),Ge.onUncaughtException(f)}return s},d.addEventListener("unhandledrejection",(function(e){Ge.onUncaughtException(e.reason)}))}function f(e){return"function"==typeof e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")}function h(e,t,n){e.addEventListener(t,n,!1)}function g(e,t,n){e.removeEventListener(t,n,!1)}function v(e,t,n){for(var r=e.length;r--;)h(e[r],t,n)}function b(e,t){return(" "+e.className+" ").indexOf(" "+t+" ")>=0}function x(e,t){b(e,t)||(e.className+=(e.className?" ":"")+t)}function k(e,t,n){n||void 0===n&&!b(e,t)?x(e,t):E(e,t)}function E(e,t){for(var n=" "+e.className+" ";n.indexOf(" "+t+" ")>=0;)n=n.replace(" "+t+" "," ")
-e.className=f(n)}function _(e){return m.getElementById&&m.getElementById(e)}function S(){var e=_("qunit-abort-tests-button")
-return e&&(e.disabled=!0,e.innerHTML="Aborting..."),Ge.config.queue.length=0,!1}function C(e){var t=_("qunit-filter-input")
-return t.value=f(t.value),N(),e&&e.preventDefault&&e.preventDefault(),!1}function T(){var n,r=this,i={}
-n="selectedIndex"in r?r.options[r.selectedIndex].value||void 0:r.checked?r.defaultValue||!0:void 0,i[r.name]=n
-var o=j(i)
-if("hidepassed"===r.name&&"replaceState"in d.history){Ge.urlParams[r.name]=n,e[r.name]=n||!1
-var s=_("qunit-tests")
-if(s){var a=s.children.length,u=s.children
-if(r.checked){for(var c=0;c<a;c++){var f=u[c],h=f?f.className:"",p=h.indexOf("pass")>-1,g=h.indexOf("skipped")>-1;(p||g)&&t.push(f)}var v,m=function(e,t){var n="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"]
-if(!n){if(Array.isArray(e)||(n=l(e))){n&&(e=n)
-var r=0,i=function(){}
-return{s:i,n:function(){return r>=e.length?{done:!0}:{done:!1,value:e[r++]}},e:function(e){throw e},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,s=!0,a=!1
-return{s:function(){n=n.call(e)},n:function(){var e=n.next()
-return s=e.done,e},e:function(e){a=!0,o=e},f:function(){try{s||null==n.return||n.return()}finally{if(a)throw o}}}}(t)
-try{for(m.s();!(v=m.n()).done;){var y=v.value
-s.removeChild(y)}}catch(e){m.e(e)}finally{m.f()}}else for(var b;null!=(b=t.pop());)s.appendChild(b)}d.history.replaceState(null,"",o)}else d.location=o}function j(e){var t="?",n=d.location
-for(var i in e=M(M({},Ge.urlParams),e))if(r.call(e,i)&&void 0!==e[i])for(var o=[].concat(e[i]),s=0;s<o.length;s++)t+=encodeURIComponent(i),!0!==o[s]&&(t+="="+encodeURIComponent(o[s])),t+="&"
-return n.protocol+"//"+n.host+n.pathname+t.slice(0,-1)}function N(){var e=_("qunit-filter-input").value
-d.location=j({filter:""===e?void 0:e,moduleId:c(o.selectedMap.keys()),module:void 0,testId:void 0})}function O(e,t,n){return'<li><label class="clickable'+(n?" checked":"")+'"><input type="checkbox" value="'+tt(e)+'"'+(n?' checked="checked"':"")+" />"+tt(t)+"</label></li>"}function q(e,t,n){var r=_("qunit-tests")
-if(r){var i=m.createElement("strong")
-i.innerHTML=I(e,n)
-var o=m.createElement("li")
-if(o.appendChild(i),void 0!==t){var s=m.createElement("a")
-s.innerHTML="Rerun",s.href=j({testId:t}),o.id="qunit-test-output-"+t,o.appendChild(s)}var a=m.createElement("ol")
-return a.className="qunit-assert-list",o.appendChild(a),r.appendChild(o),o}}function A(e){return 0===e.length?"":["<br /><a href='"+tt(j({testId:e}))+"'>",1===e.length?"Rerun 1 failed test":"Rerun "+e.length+" failed tests","</a>"].join("")}function I(e,t){var n=""
-return t&&(n="<span class='module-name'>"+tt(t)+"</span>: "),n+"<span class='test-name'>"+tt(e)+"</span>"}function F(e){return[e.completed," / ",e.defined," tests completed.<br />"].join("")}function P(e){return e.replace(/<\/?[^>]+(>|$)/g,"").replace(/&quot;/g,"").replace(/\s+/g,"")}}(),Ge.diff=function(){function e(){}var t=-1,n=Object.prototype.hasOwnProperty
-return e.prototype.DiffMain=function(e,t,n){var r,i,o,s,a,u
-if(r=(new Date).getTime()+1e3,null===e||null===t)throw new Error("Null input. (DiffMain)")
-return e===t?e?[[0,e]]:[]:(void 0===n&&(n=!0),i=n,o=this.diffCommonPrefix(e,t),s=e.substring(0,o),e=e.substring(o),t=t.substring(o),o=this.diffCommonSuffix(e,t),a=e.substring(e.length-o),e=e.substring(0,e.length-o),t=t.substring(0,t.length-o),u=this.diffCompute(e,t,i,r),s&&u.unshift([0,s]),a&&u.push([0,a]),this.diffCleanupMerge(u),u)},e.prototype.diffCleanupEfficiency=function(e){var n,r,i,o,s,a,u,c,l
-for(n=!1,r=[],i=0,o=null,s=0,a=!1,u=!1,c=!1,l=!1;s<e.length;)0===e[s][0]?(e[s][1].length<4&&(c||l)?(r[i++]=s,a=c,u=l,o=e[s][1]):(i=0,o=null),c=l=!1):(e[s][0]===t?l=!0:c=!0,o&&(a&&u&&c&&l||o.length<2&&a+u+c+l===3)&&(e.splice(r[i-1],0,[t,o]),e[r[i-1]+1][0]=1,i--,o=null,a&&u?(c=l=!0,i=0):(s=--i>0?r[i-1]:-1,c=l=!1),n=!0)),s++
-n&&this.diffCleanupMerge(e)},e.prototype.diffPrettyHtml=function(e){for(var n=[],r=0;r<e.length;r++){var i=e[r][0],o=e[r][1]
-switch(i){case 1:n[r]="<ins>"+tt(o)+"</ins>"
-break
-case t:n[r]="<del>"+tt(o)+"</del>"
-break
-case 0:n[r]="<span>"+tt(o)+"</span>"}}return n.join("")},e.prototype.diffCommonPrefix=function(e,t){var n,r,i,o
-if(!e||!t||e.charAt(0)!==t.charAt(0))return 0
-for(i=0,n=r=Math.min(e.length,t.length),o=0;i<n;)e.substring(o,n)===t.substring(o,n)?o=i=n:r=n,n=Math.floor((r-i)/2+i)
-return n},e.prototype.diffCommonSuffix=function(e,t){var n,r,i,o
-if(!e||!t||e.charAt(e.length-1)!==t.charAt(t.length-1))return 0
-for(i=0,n=r=Math.min(e.length,t.length),o=0;i<n;)e.substring(e.length-n,e.length-o)===t.substring(t.length-n,t.length-o)?o=i=n:r=n,n=Math.floor((r-i)/2+i)
-return n},e.prototype.diffCompute=function(e,n,r,i){var o,s,a,u,c,l,f,h,d,p,g,v
-return e?n?(s=e.length>n.length?e:n,a=e.length>n.length?n:e,-1!==(u=s.indexOf(a))?(o=[[1,s.substring(0,u)],[0,a],[1,s.substring(u+a.length)]],e.length>n.length&&(o[0][0]=o[2][0]=t),o):1===a.length?[[t,e],[1,n]]:(c=this.diffHalfMatch(e,n))?(l=c[0],h=c[1],f=c[2],d=c[3],p=c[4],g=this.DiffMain(l,f,r,i),v=this.DiffMain(h,d,r,i),g.concat([[0,p]],v)):r&&e.length>100&&n.length>100?this.diffLineMode(e,n,i):this.diffBisect(e,n,i)):[[t,e]]:[[1,n]]},e.prototype.diffHalfMatch=function(e,t){var n,r,i,o,s,a,u,c,l,f
-if(n=e.length>t.length?e:t,r=e.length>t.length?t:e,n.length<4||2*r.length<n.length)return null
-function h(e,t,n){var r,o,s,a,u,c,l,f,h
-for(r=e.substring(n,n+Math.floor(e.length/4)),o=-1,s="";-1!==(o=t.indexOf(r,o+1));)a=i.diffCommonPrefix(e.substring(n),t.substring(o)),u=i.diffCommonSuffix(e.substring(0,n),t.substring(0,o)),s.length<u+a&&(s=t.substring(o-u,o)+t.substring(o,o+a),c=e.substring(0,n-u),l=e.substring(n+a),f=t.substring(0,o-u),h=t.substring(o+a))
-return 2*s.length>=e.length?[c,l,f,h,s]:null}return i=this,c=h(n,r,Math.ceil(n.length/4)),l=h(n,r,Math.ceil(n.length/2)),c||l?(f=l?c&&c[4].length>l[4].length?c:l:c,e.length>t.length?(o=f[0],u=f[1],a=f[2],s=f[3]):(a=f[0],s=f[1],o=f[2],u=f[3]),[o,u,a,s,f[4]]):null},e.prototype.diffLineMode=function(e,n,r){var i,o,s,a,u,c,l,f,h
-for(e=(i=this.diffLinesToChars(e,n)).chars1,n=i.chars2,s=i.lineArray,o=this.DiffMain(e,n,!1,r),this.diffCharsToLines(o,s),this.diffCleanupSemantic(o),o.push([0,""]),a=0,c=0,u=0,f="",l="";a<o.length;){switch(o[a][0]){case 1:u++,l+=o[a][1]
-break
-case t:c++,f+=o[a][1]
-break
-case 0:if(c>=1&&u>=1){for(o.splice(a-c-u,c+u),a=a-c-u,h=(i=this.DiffMain(f,l,!1,r)).length-1;h>=0;h--)o.splice(a,0,i[h])
-a+=i.length}u=0,c=0,f="",l=""}a++}return o.pop(),o},e.prototype.diffBisect=function(e,n,r){var i,o,s,a,u,c,l,f,h,d,p,g,v,m,y,b,w,x,k,E,_,S,C
-for(i=e.length,o=n.length,a=s=Math.ceil((i+o)/2),u=2*s,c=new Array(u),l=new Array(u),f=0;f<u;f++)c[f]=-1,l[f]=-1
-for(c[a+1]=0,l[a+1]=0,d=(h=i-o)%2!=0,p=0,g=0,v=0,m=0,_=0;_<s&&!((new Date).getTime()>r);_++){for(S=-_+p;S<=_-g;S+=2){for(b=a+S,k=(w=S===-_||S!==_&&c[b-1]<c[b+1]?c[b+1]:c[b-1]+1)-S;w<i&&k<o&&e.charAt(w)===n.charAt(k);)w++,k++
-if(c[b]=w,w>i)g+=2
-else if(k>o)p+=2
-else if(d&&(y=a+h-S)>=0&&y<u&&-1!==l[y]&&w>=(x=i-l[y]))return this.diffBisectSplit(e,n,w,k,r)}for(C=-_+v;C<=_-m;C+=2){for(y=a+C,E=(x=C===-_||C!==_&&l[y-1]<l[y+1]?l[y+1]:l[y-1]+1)-C;x<i&&E<o&&e.charAt(i-x-1)===n.charAt(o-E-1);)x++,E++
-if(l[y]=x,x>i)m+=2
-else if(E>o)v+=2
-else if(!d&&(b=a+h-C)>=0&&b<u&&-1!==c[b]&&(k=a+(w=c[b])-b,w>=(x=i-x)))return this.diffBisectSplit(e,n,w,k,r)}}return[[t,e],[1,n]]},e.prototype.diffBisectSplit=function(e,t,n,r,i){var o,s,a,u,c,l
-return o=e.substring(0,n),a=t.substring(0,r),s=e.substring(n),u=t.substring(r),c=this.DiffMain(o,a,!1,i),l=this.DiffMain(s,u,!1,i),c.concat(l)},e.prototype.diffCleanupSemantic=function(e){var n,r,i,o,s,a,u,c,l,f,h,d,p
-for(n=!1,r=[],i=0,o=null,s=0,c=0,l=0,a=0,u=0;s<e.length;)0===e[s][0]?(r[i++]=s,c=a,l=u,a=0,u=0,o=e[s][1]):(1===e[s][0]?a+=e[s][1].length:u+=e[s][1].length,o&&o.length<=Math.max(c,l)&&o.length<=Math.max(a,u)&&(e.splice(r[i-1],0,[t,o]),e[r[i-1]+1][0]=1,i--,s=--i>0?r[i-1]:-1,c=0,l=0,a=0,u=0,o=null,n=!0)),s++
-for(n&&this.diffCleanupMerge(e),s=1;s<e.length;)e[s-1][0]===t&&1===e[s][0]&&(f=e[s-1][1],h=e[s][1],(d=this.diffCommonOverlap(f,h))>=(p=this.diffCommonOverlap(h,f))?(d>=f.length/2||d>=h.length/2)&&(e.splice(s,0,[0,h.substring(0,d)]),e[s-1][1]=f.substring(0,f.length-d),e[s+1][1]=h.substring(d),s++):(p>=f.length/2||p>=h.length/2)&&(e.splice(s,0,[0,f.substring(0,p)]),e[s-1][0]=1,e[s-1][1]=h.substring(0,h.length-p),e[s+1][0]=t,e[s+1][1]=f.substring(p),s++),s++),s++},e.prototype.diffCommonOverlap=function(e,t){var n,r,i,o,s,a,u
-if(n=e.length,r=t.length,0===n||0===r)return 0
-if(n>r?e=e.substring(n-r):n<r&&(t=t.substring(0,n)),i=Math.min(n,r),e===t)return i
-for(o=0,s=1;;){if(a=e.substring(i-s),-1===(u=t.indexOf(a)))return o
-s+=u,0!==u&&e.substring(i-s)!==t.substring(0,s)||(o=s,s++)}},e.prototype.diffLinesToChars=function(e,t){var r,i
-function o(e){for(var t="",o=0,s=-1,a=r.length;s<e.length-1;){-1===(s=e.indexOf("\n",o))&&(s=e.length-1)
-var u=e.substring(o,s+1)
-o=s+1,n.call(i,u)?t+=String.fromCharCode(i[u]):(t+=String.fromCharCode(a),i[u]=a,r[a++]=u)}return t}return i={},(r=[])[0]="",{chars1:o(e),chars2:o(t),lineArray:r}},e.prototype.diffCharsToLines=function(e,t){var n,r,i,o
-for(n=0;n<e.length;n++){for(r=e[n][1],i=[],o=0;o<r.length;o++)i[o]=t[r.charCodeAt(o)]
-e[n][1]=i.join("")}},e.prototype.diffCleanupMerge=function(e){var n,r,i,o,s,a,u,c
-for(e.push([0,""]),n=0,r=0,i=0,s="",o="";n<e.length;)switch(e[n][0]){case 1:i++,o+=e[n][1],n++
-break
-case t:r++,s+=e[n][1],n++
-break
-case 0:r+i>1?(0!==r&&0!==i&&(0!==(a=this.diffCommonPrefix(o,s))&&(n-r-i>0&&0===e[n-r-i-1][0]?e[n-r-i-1][1]+=o.substring(0,a):(e.splice(0,0,[0,o.substring(0,a)]),n++),o=o.substring(a),s=s.substring(a)),0!==(a=this.diffCommonSuffix(o,s))&&(e[n][1]=o.substring(o.length-a)+e[n][1],o=o.substring(0,o.length-a),s=s.substring(0,s.length-a))),0===r?e.splice(n-i,r+i,[1,o]):0===i?e.splice(n-r,r+i,[t,s]):e.splice(n-r-i,r+i,[t,s],[1,o]),n=n-r-i+(r?1:0)+(i?1:0)+1):0!==n&&0===e[n-1][0]?(e[n-1][1]+=e[n][1],e.splice(n,1)):n++,i=0,r=0,s="",o=""}for(""===e[e.length-1][1]&&e.pop(),u=!1,n=1;n<e.length-1;)0===e[n-1][0]&&0===e[n+1][0]&&((c=e[n][1]).substring(c.length-e[n-1][1].length)===e[n-1][1]?(e[n][1]=e[n-1][1]+e[n][1].substring(0,e[n][1].length-e[n-1][1].length),e[n+1][1]=e[n-1][1]+e[n+1][1],e.splice(n-1,1),u=!0):c.substring(0,e[n+1][1].length)===e[n+1][1]&&(e[n-1][1]+=e[n+1][1],e[n][1]=e[n][1].substring(e[n+1][1].length)+e[n+1][1],e.splice(n+1,1),u=!0)),n++
-u&&this.diffCleanupMerge(e)},function(t,n){var r,i
-return i=(r=new e).DiffMain(t,n),r.diffCleanupEfficiency(i),r.diffPrettyHtml(i)}}()}()},5665:e=>{var t=Array.isArray
-e.exports=function(){if(!arguments.length)return[]
-var e=arguments[0]
-return t(e)?e:[e]}},66:e=>{e.exports=function(e){var t=e?e.length:0
-return t?e[t-1]:void 0}},9254:(e,t,n)=>{var r="__lodash_hash_undefined__",i=9007199254740991,o=/^\[object .+?Constructor\]$/,s=/^(?:0|[1-9]\d*)$/,a="object"==typeof n.g&&n.g&&n.g.Object===Object&&n.g,u="object"==typeof self&&self&&self.Object===Object&&self,c=a||u||Function("return this")()
-function l(e,t,n){switch(n.length){case 0:return e.call(t)
-case 1:return e.call(t,n[0])
-case 2:return e.call(t,n[0],n[1])
-case 3:return e.call(t,n[0],n[1],n[2])}return e.apply(t,n)}function f(e,t){return!(!e||!e.length)&&function(e,t,n){if(t!=t)return function(e,t,n,r){for(var i=e.length,o=-1;++o<i;)if(t(e[o],o,e))return o
-return-1}(e,d)
-for(var r=-1,i=e.length;++r<i;)if(e[r]===t)return r
-return-1}(e,t)>-1}function h(e,t){for(var n=-1,r=t.length,i=e.length;++n<r;)e[i+n]=t[n]
-return e}function d(e){return e!=e}function p(e,t){return e.has(t)}function g(e,t){return function(n){return e(t(n))}}var v,m=Array.prototype,y=Function.prototype,b=Object.prototype,w=c["__core-js_shared__"],x=(v=/[^.]+$/.exec(w&&w.keys&&w.keys.IE_PROTO||""))?"Symbol(src)_1."+v:"",k=y.toString,E=b.hasOwnProperty,_=b.toString,S=RegExp("^"+k.call(E).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),C=c.Symbol,T=g(Object.getPrototypeOf,Object),j=b.propertyIsEnumerable,N=m.splice,M=C?C.isConcatSpreadable:void 0,O=Object.getOwnPropertySymbols,q=Math.max,A=H(c,"Map"),R=H(Object,"create")
-function I(e){var t=-1,n=e?e.length:0
-for(this.clear();++t<n;){var r=e[t]
-this.set(r[0],r[1])}}function F(e){var t=-1,n=e?e.length:0
-for(this.clear();++t<n;){var r=e[t]
-this.set(r[0],r[1])}}function P(e){var t=-1,n=e?e.length:0
-for(this.clear();++t<n;){var r=e[t]
-this.set(r[0],r[1])}}function D(e){var t=-1,n=e?e.length:0
-for(this.__data__=new P;++t<n;)this.add(e[t])}function L(e,t){for(var n,r,i=e.length;i--;)if((n=e[i][0])===(r=t)||n!=n&&r!=r)return i
-return-1}function B(e,t,n,r,i){var o=-1,s=e.length
-for(n||(n=Q),i||(i=[]);++o<s;){var a=e[o]
-t>0&&n(a)?t>1?B(a,t-1,n,r,i):h(i,a):r||(i[i.length]=a)}return i}function U(e,t){var n,r,i=e.__data__
-return("string"==(r=typeof(n=t))||"number"==r||"symbol"==r||"boolean"==r?"__proto__"!==n:null===n)?i["string"==typeof t?"string":"hash"]:i.map}function H(e,t){var n=function(e,t){return null==e?void 0:e[t]}(e,t)
-return function(e){if(!Z(e)||x&&x in e)return!1
-var t=X(e)||function(e){var t=!1
-if(null!=e&&"function"!=typeof e.toString)try{t=!!(e+"")}catch(e){}return t}(e)?S:o
-return t.test(function(e){if(null!=e){try{return k.call(e)}catch(e){}try{return e+""}catch(e){}}return""}(e))}(n)?n:void 0}I.prototype.clear=function(){this.__data__=R?R(null):{}},I.prototype.delete=function(e){return this.has(e)&&delete this.__data__[e]},I.prototype.get=function(e){var t=this.__data__
-if(R){var n=t[e]
-return n===r?void 0:n}return E.call(t,e)?t[e]:void 0},I.prototype.has=function(e){var t=this.__data__
-return R?void 0!==t[e]:E.call(t,e)},I.prototype.set=function(e,t){return this.__data__[e]=R&&void 0===t?r:t,this},F.prototype.clear=function(){this.__data__=[]},F.prototype.delete=function(e){var t=this.__data__,n=L(t,e)
-return!(n<0||(n==t.length-1?t.pop():N.call(t,n,1),0))},F.prototype.get=function(e){var t=this.__data__,n=L(t,e)
-return n<0?void 0:t[n][1]},F.prototype.has=function(e){return L(this.__data__,e)>-1},F.prototype.set=function(e,t){var n=this.__data__,r=L(n,e)
-return r<0?n.push([e,t]):n[r][1]=t,this},P.prototype.clear=function(){this.__data__={hash:new I,map:new(A||F),string:new I}},P.prototype.delete=function(e){return U(this,e).delete(e)},P.prototype.get=function(e){return U(this,e).get(e)},P.prototype.has=function(e){return U(this,e).has(e)},P.prototype.set=function(e,t){return U(this,e).set(e,t),this},D.prototype.add=D.prototype.push=function(e){return this.__data__.set(e,r),this},D.prototype.has=function(e){return this.__data__.has(e)}
-var z=O?g(O,Object):ie,$=O?function(e){for(var t=[];e;)h(t,z(e)),e=T(e)
-return t}:ie
-function Q(e){return V(e)||Y(e)||!!(M&&e&&e[M])}function G(e,t){return!!(t=null==t?i:t)&&("number"==typeof e||s.test(e))&&e>-1&&e%1==0&&e<t}function W(e){if("string"==typeof e||function(e){return"symbol"==typeof e||K(e)&&"[object Symbol]"==_.call(e)}(e))return e
-var t=e+""
-return"0"==t&&1/e==-1/0?"-0":t}function Y(e){return function(e){return K(e)&&J(e)}(e)&&E.call(e,"callee")&&(!j.call(e,"callee")||"[object Arguments]"==_.call(e))}var V=Array.isArray
-function J(e){return null!=e&&function(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=i}(e.length)&&!X(e)}function X(e){var t=Z(e)?_.call(e):""
-return"[object Function]"==t||"[object GeneratorFunction]"==t}function Z(e){var t=typeof e
-return!!e&&("object"==t||"function"==t)}function K(e){return!!e&&"object"==typeof e}function ee(e){return J(e)?function(e,t){var n=V(e)||Y(e)?function(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n)
-return r}(e.length,String):[],r=n.length,i=!!r
-for(var o in e)i&&("length"==o||G(o,r))||n.push(o)
-return n}(e):function(e){if(!Z(e))return function(e){var t=[]
-if(null!=e)for(var n in Object(e))t.push(n)
-return t}(e)
-var t,n,r=(n=(t=e)&&t.constructor,t===("function"==typeof n&&n.prototype||b)),i=[]
-for(var o in e)("constructor"!=o||!r&&E.call(e,o))&&i.push(o)
-return i}(e)}var te,ne,re=(te=function(e,t){return null==e?{}:(t=function(e,t){for(var n=-1,r=e?e.length:0,i=Array(r);++n<r;)i[n]=t(e[n],n,e)
-return i}(B(t,1),W),function(e,t){return function(e,t,n){for(var r=-1,i=t.length,o={};++r<i;){var s=t[r],a=e[s]
-n(0,s)&&(o[s]=a)}return o}(e=Object(e),t,(function(t,n){return n in e}))}(e,function(e,t,n,r){var i=-1,o=f,s=!0,a=e.length,u=[],c=t.length
-if(!a)return u
-t.length>=200&&(o=p,s=!1,t=new D(t))
-e:for(;++i<a;){var l=e[i],h=l
-if(l=0!==l?l:0,s&&h==h){for(var d=c;d--;)if(t[d]===h)continue e
-u.push(l)}else o(t,h,undefined)||u.push(l)}return u}(function(e){return function(e,t,n){var r=t(e)
-return V(e)?r:h(r,n(e))}(e,ee,$)}(e),t)))},ne=q(void 0===ne?te.length-1:ne,0),function(){for(var e=arguments,t=-1,n=q(e.length-ne,0),r=Array(n);++t<n;)r[t]=e[ne+t]
-t=-1
-for(var i=Array(ne+1);++t<ne;)i[t]=e[t]
-return i[ne]=r,l(te,this,i)})
-function ie(){return[]}e.exports=re},3143:(e,t,n)=>{"use strict"
-var r=n(526)
-e.exports=function(e){function t(e){var t=e?[].concat(e):[]
-return t.in_array=r.curry(t,n,t),t.each=r.curry(t,o,t),t.each_async=r.curry(t,s,t),t.collect=r.curry(t,a,t),t.collect_async=r.curry(t,u,t),t.flatten=r.curry(t,i,t),t.inject=r.curry(t,c,t),t.push_all=r.curry(t,l,t),t.fill=r.curry(t,f,t),t.find_all=r.curry(t,h,t),t.find=r.curry(t,d,t),t.last=r.curry(t,p,t),t.naked=r.curry(t,g,t),t}function n(e,t){for(var n=0;n<e.length;n++)if(e[n]===t)return!0}function i(e){if(!function(e){return"[object Array]"===Object.prototype.toString.call(e)}(e))return[e]
-if(0===e.length)return e
-var n=i(e[0]),r=i(e.slice(1))
-return t(n.concat(r))}function o(e,t){for(var n,r=0;r<e.length;r++)n=t(e[r],r)
-return n}function s(e,t,n){if(n=n||r.noop,!e.length)return n()
-var i=0,o=function(){t(e[i],i,(function(t,r){return t?n(t):++i>=e.length?n(null,r):void o()}))}
-o()}function a(e,n){for(var r=t(),i=0;i<e.length;i++)r.push(n(e[i],i))
-return r}function u(e,n,r){var i=t()
-s(e,(function(e,t,r){n(e,t,(function(e){if(e)return r(e)
-i.push_all(Array.prototype.splice.call(arguments,1)),r()}))}),(function(e){if(e)return r(e)
-r(null,i)}))}function c(e,t,n){for(var r=t,i=0;i<e.length;i++)r=n(r,e[i])
-return r}function l(e,t){t=t?[].concat(t):[]
-for(var n=0;n<t.length;n++)e.push(t[n])
-return e}function f(e,t,n){for(var r=0;r<n;r++)e.push(t)
-return e}function h(e,n){for(var r=t(),i=0;i<e.length;i++)n(e[i],i)&&r.push(e[i])
-return r}function d(e,t){for(var n,r=0;r<e.length;r++)if(t(e[r],r)){n=e[r]
-break}return n}function p(e){return e[e.length-1]}function g(e){return[].concat(e)}return t(e)}},8071:(e,t,n)=>{"use strict"
-var r=n(4633),i=n(5901),o=n(6882),s=n(3143)
-e.exports=function(e,t,n){var a=[]
-function u(){return 0===a.length}function c(){return a.length>1&&a[0].score.equals(a[1].score)}function l(){return a.find_all(h).collect(d).join(", ")}function f(e,t){return t.score.compare(e.score)}function h(e){return e.score.equals(a[0].score)}function d(e){return e.macro.toString()}this.validate=function(){return u()?{step:e,valid:!1,reason:"Undefined Step"}:c()?{step:e,valid:!1,reason:"Ambiguous Step (Patterns ["+l()+"] are all equally good candidates)"}:{step:e,valid:!0,winner:this.winner()}},this.clear_winner=function(){if(u())throw new Error("Undefined Step: ["+e+"]")
-if(c())throw new Error("Ambiguous Step: ["+e+"]. Patterns ["+l()+"] match equally well.")
-return this.winner()},this.winner=function(){return a[0].macro},function(e,t){a=t.collect((function(t){return{macro:t,score:new o([new r(e,t.levenshtein_signature()),new i(t,n)])}})).sort(f)}(e,s(t))}},9174:e=>{"use strict"
-var t=function(e){this.pTFUHht733hM6wfnruGLgAu6Uqvy7MVp=!0,this.properties={},this.merge=function(e){return e&&e.pTFUHht733hM6wfnruGLgAu6Uqvy7MVp?this.merge(e.properties):new t(this.properties)._merge(e)},this._merge=function(e){for(var t in e)this.properties[t]=e[t]
-return this},this._merge(e)}
-e.exports=t},3591:(e,t,n)=>{"use strict"
-var r=n(3143),i=n(6690),o=n(9076),s=function(e){e=e||"$"
-var t={},n=new i(new RegExp("(?:^|[^\\\\])\\"+e+"(\\w+)","g")),a=new RegExp("(\\"+e+"\\w+)"),u=this
-function c(t,n){return l(t).each((function(r){if(n.in_array(r))throw new Error("Circular Definition: ["+n.join(", ")+"]")
-var i=f(r,n)
-return t=t.replace(e+r,i)}))}function l(e){return n.groups(e)}function f(e,n){var r=t[e]?t[e].pattern:"(.+)"
-return p(r)?u.expand(r,n.concat(e)).pattern:r}function h(e){return e.toString().replace(/^\/|\/$/g,"")}function d(e){return!!t[e]}function p(e){return n.test(e)}function g(e){return r(e.split(a)).inject(r(),(function(e,n){return e.push_all(p(n)?function(e){return l(e).inject(r(),(function(e,n){return d(n)?e.push_all(t[n].converters):e.push_all(g(f(n,[])))}))}(n):v(n))}))}function v(e){return r().fill(o,m(e))}function m(e){return new RegExp(e+"|").exec("").length-1}this.define=function(e,n,i){if(d(e))throw new Error("Duplicate term: ["+e+"]")
-if(i&&p(n))throw new Error("Expandable terms cannot use converters: ["+e+"]")
-if(i&&!function(e,t){return function(e){return r(e).inject(0,(function(e,t){return e+t.length-1}))}(e)===m(t)}(i,n))throw new Error("Wrong number of converters for: ["+e+"]")
-return p(n)||i||(i=v(n)),t[e]={pattern:h(n),converters:r(i)},this},this.merge=function(t){if(t._prefix()!==this._prefix())throw new Error("Cannot merge dictionaries with different prefixes")
-return new s(e)._merge(this)._merge(t)},this._merge=function(e){return e.each((function(e,t){u.define(e,t.pattern)})),this},this._prefix=function(){return e},this.each=function(e){for(var n in t)e(n,t[n])},this.expand=function(e,t){var n=h(e)
-return p(n)?{pattern:c(n,r(t)),converters:g(n)}:{pattern:n,converters:g(n)}}}
-e.exports=s},7453:(e,t,n)=>{"use strict"
-var r=n(3143),i=n(526),o=new function(){var e=r()
-this.send=function(e,n,r){return 1===arguments.length?this.send(e,{}):2===arguments.length&&i.is_function(n)?this.send(e,{},n):(t(e,n),r&&r(),this)},this.on=function(t,n){return e.push({pattern:t,callback:n}),this}
-var t=function(e,t){n(e).each((function(n){n({name:e,data:t})}))},n=function(t){return e.find_all((function(e){return new RegExp(e.pattern).test(t)})).collect((function(e){return e.callback}))}}
-e.exports={instance:function(){return o},ON_SCENARIO:"__ON_SCENARIO__",ON_STEP:"__ON_STEP__",ON_EXECUTE:"__ON_EXECUTE__",ON_DEFINE:"__ON_DEFINE__"}},8392:(e,t,n)=>{"use strict"
-var r=n(3527),i=function(e){this.constructor(e,/.*\.(?:feature|spec|specification)$/)}
-i.prototype=new r,e.exports=i},3527:(e,t,n)=>{"use strict"
-var r=n(9782),i=r.path,o=r.fs,s=n(3143)
-e.exports=function(e,t){t=t||/.*/,this.each=function(e){this.list().forEach(e)},this.list=function(){return s(e).inject(s(),(function(e,t){return e.concat(n(t).find_all(f))}))}
-var n=function(e){return s(r(e).concat(a(e)))},r=function(e){return u(e).find_all(c)},a=function(e){return u(e).find_all(l).inject(s(),(function(e,t){return e.concat(n(t))}))},u=function(e){return o.existsSync(e)?s(o.readdirSync(e)).collect((function(t){return i.join(e,t)})):s()},c=function(e){return!l(e)},l=function(e){return o.statSync(e).isDirectory()},f=function(e){return s(t).find((function(t){return new RegExp(t).test(e)}))}}},4404:(e,t,n)=>{"use strict"
-var r=n(8071),i=n(9174),o=n(7453),s=n(3143),a=n(526)
-e.exports=function(e){e=s(e)
-var t,n=o.instance(),u=this
-function c(e){return!e.valid}function l(e){return e.step+(e.valid?"":" <-- "+e.reason)}this.requires=function(t){return e.push_all(t),this},this.validate=function(e){var n=s(e).collect((function(e){var n=u.rank_macros(e).validate()
-return t=n.winner,n}))
-if(n.find(c))throw new Error("Scenario cannot be interpreted\n"+n.collect(l).join("\n"))},this.interpret=function(e,t,r){t=(new i).merge(t),n.send(o.ON_SCENARIO,{scenario:e,ctx:t.properties})
-var a=f(t,r)
-s(e).each_async(a,r)}
-var f=function(e,t){var n=function(t,n,r){u.interpret_step(t,e,r)}
-return t?n:a.asynchronize(null,n)}
-this.interpret_step=function(e,r,s){var a=(new i).merge(r)
-n.send(o.ON_STEP,{step:e,ctx:a.properties})
-var u=this.rank_macros(e).clear_winner()
-t=u,u.interpret(e,a||{},s)},this.rank_macros=function(e){return new r(e,h(e),t)}
-var h=function(t){return e.inject([],(function(e,n){return e.concat(n.find_compatible_macros(t))}))}}},6877:(e,t,n)=>{"use strict"
-var r=n(386),i=n(3591),o=n(3143)
-e.exports=function(e){e=e||new i
-var t=o(),n=this
-this.define=function(e,t,n,r){return o(e).each((function(e){s(e,t,n,r)})),this}
-var s=function(i,o,s,a){if(n.get_macro(i))throw new Error("Duplicate macro: ["+i+"]")
-t.push(new r(i,e.expand(i),o,s,n,a))}
-this.get_macro=function(e){return t.find((function(t){return t.is_identified_by(e)}))},this.find_compatible_macros=function(e){return t.find_all((function(t){return t.can_interpret(e)}))}}},386:(e,t,n)=>{"use strict"
-var r=n(526),i=n(3143),o=n(9174),s=n(6690),a=n(7453)
-e.exports=function(e,t,n,u,c,l){e=p(e)
-var f=new s(t.pattern),h=(n=n||r.async_noop,a.instance())
-function d(e){return l.mode?"sync"===l.mode:n!==r.async_noop&&n.length!==e.length+1}function p(e){return new RegExp(e).toString()}l=l||{},this.library=c,this.is_identified_by=function(t){return e===p(t)},this.can_interpret=function(e){return f.test(e)},this.interpret=function(e,s,c){var p=new o({step:e}).merge(u).merge(s)
-!function(e,n){var r=0
-i(t.converters).collect((function(t){return function(n){t.apply(null,e.slice(r,r+=t.length-1).concat(n))}})).collect_async((function(e,t,n){e(n)}),n)}(f.groups(e),(function(t,i){if(t)return c(t)
-var o
-h.send(a.ON_EXECUTE,{step:e,ctx:p.properties,pattern:f.toString(),args:i})
-try{o=r.invoke(n,p.properties,d(i)?i:i.concat(c))}catch(t){if(c)return c(t)
-throw t}return function(e){return l.mode?"promise"===l.mode:e&&e.then}(o)?o.then(r.noargs(c)).catch(c):d(i)?c&&c():void 0}))},this.is_sibling=function(e){return e&&e.defined_in(c)},this.defined_in=function(e){return c===e},this.levenshtein_signature=function(){return f.without_expressions()},this.toString=function(){return e},h.send(a.ON_DEFINE,{signature:e,pattern:f.toString()})}},886:(e,t,n)=>{"use strict"
-e.exports=function(){function e(){return"undefined"!=typeof process&&void 0!==n.g&&!0}function t(){return"undefined"!=typeof window}function r(){return"undefined"!=typeof phantom}return{get_container:function(){return t()?window:r()?phantom:e()?n.g:void 0},is_node:e,is_browser:t,is_phantom:r,is_karma:function(){return"undefined"!=typeof window&&void 0!==window.__karma__}}}},6690:(e,t,n)=>{"use strict"
-var r=n(3143)
-e.exports=function(e){var t=/(^|[^\\\\])\(.*?\)/g,n=/(^|[^\\\\])\[.*?\]/g,i=/(^|[^\\\\])\{.*?\}/g,o=/(^|[^\\\\])\\./g,s=/[^\w\s]/g,a=new RegExp(e)
-this.test=function(e){var t=a.test(e)
-return this.reset(),t},this.groups=function(e){for(var t=r(),n=a.exec(e);n;){var i=n.slice(1,n.length)
-t.push(i),n=a.global&&a.exec(e)}return this.reset(),t.flatten()},this.reset=function(){return a.lastIndex=0,this},this.without_expressions=function(){return a.source.replace(t,"$1").replace(n,"$1").replace(i,"$1").replace(o,"$1").replace(s,"")},this.equals=function(e){return this.toString()===e.toString()},this.toString=function(){return"/"+a.source+"/"}}},6007:e=>{"use strict"
-e.exports={trim:function(e){return e.replace(/^\s+|\s+$/g,"")},rtrim:function(e){return e.replace(/\s+$/g,"")},isBlank:function(e){return/^\s*$/g.test(e)},isNotBlank:function(e){return!this.isBlank(e)},indentation:function(e){var t=/^(\s*)/.exec(e)
-return t&&t[0].length||0}}},5682:(e,t,n)=>{"use strict"
-var r=n(4404),i=n(9174),o=n(526),s=function(e,t){if(!(this instanceof s))return new s(e,t)
-this.interpreter=new r(e),this.requires=function(e){return this.interpreter.requires(e),this},this.yadda=function(e,n,r){return 0===arguments.length?this:2===arguments.length&&o.is_function(n)?this.yadda(e,{},n):(this.interpreter.validate(e),void this.interpreter.interpret(e,(new i).merge(t).merge(n),r))},this.run=this.yadda,this.toString=function(){return"Yadda 2.1.0 Copyright 2010 Stephen Cresswell / Energized Work Ltd"}}
-e.exports=s},7182:e=>{"use strict"
-e.exports=function(e,t){var n=Date.parse(e)
-return isNaN(n)?t(new Error("Cannot convert ["+e+"] to a date")):t(null,new Date(n))}},3986:e=>{"use strict"
-e.exports=function(e,t){var n=parseFloat(e)
-return isNaN(n)?t(new Error("Cannot convert ["+e+"] to a float")):t(null,n)}},2453:(e,t,n)=>{"use strict"
-e.exports={date:n(7182),integer:n(7444),float:n(3986),list:n(3488),table:n(3337),pass_through:n(9076)}},7444:e=>{"use strict"
-e.exports=function(e,t){var n=parseInt(e)
-return isNaN(n)?t(new Error("Cannot convert ["+e+"] to an integer")):t(null,n)}},3488:e=>{"use strict"
-e.exports=function(e,t){return t(null,e.split(/\n/))}},9076:e=>{"use strict"
-e.exports=function(e,t){return t(null,e)}},3337:(e,t,n)=>{"use strict"
-var r=n(3143),i=n(6007),o=/[\|\u2506]/,s=/^[\|\u2506]|[\|\u2506]$/g,a=/^[\\|\u2506]?-{3,}/
-e.exports=function(e,t){var n,u=e.split(/\n/),c=(n=u.shift(),r(n.replace(s,"").split(o)).collect((function(e){return{text:i.trim(e),indentation:i.indentation(e)}})).naked()),l=h(u[0])?function(e){if(h(e))return d()
-p(e)}:function(e){if(h(e))throw new Error("Dashes are unexpected at this time")
-d(),p(e)},f=r()
-try{r(u).each(l),t(null,function(e){return e.collect((function(e){var t={}
-for(var n in e)t[n]=e[n].join("\n")
-return t})).naked()}(f))}catch(e){t(e)}function h(e){return a.test(e)}function d(){f.push({})}function p(e){var t=f.last()
-r(e.replace(s,"").split(o)).each((function(e,n){var r=c[n].text,o=c[n].indentation,s=i.rtrim(e.substr(o))
-if(i.isNotBlank(e)&&i.indentation(e)<o)throw new Error("Indentation error")
-t[r]=(t[r]||[]).concat(s)}))}}},526:e=>{"use strict"
-e.exports=function(){var e=Array.prototype.slice
-function t(){}function n(t,n){return function(){var r=e.call(arguments,arguments.length-1)[0],i=e.call(arguments,0,arguments.length-2)
-n.apply(t,i),r&&r()}}return{noop:t,noargs:function(e){return function(){return e()}},async_noop:n(null,t),asynchronize:n,is_function:function(e){return e&&"[object Function]"==={}.toString.call(e)},curry:function(t,n){var r=e.call(arguments,2)
-return function(){return n.apply(t,r.concat(e.call(arguments)))}},invoke:function(e,t,n){return e.apply(t,n)}}}()},409:(e,t,n)=>{"use strict"
-var r={Yadda:n(5682),EventBus:n(7453),Interpreter:n(4404),Context:n(9174),Library:n(6877),Dictionary:n(3591),FeatureFileSearch:n(8392),FileSearch:n(3527),Platform:n(886),localisation:n(5534),converters:n(2453),parsers:n(3574),plugins:n(918),shims:n(9782),createInstance:function(){return r.Yadda.apply(null,Array.prototype.slice.call(arguments,0))}}
-e.exports=r},2889:(e,t,n)=>{"use strict"
-var r=n(8271)
-e.exports=new r("Chinese",{feature:"[Ff]eature|功能",scenario:"(?:[Ss]cenario|[Ss]cenario [Oo]utline|场景|剧本|(?:场景|剧本)?大纲)",examples:"(?:[Ee]xamples|[Ww]here|例子|示例|举例|样例)",pending:"(?:[Pp]ending|[Tt]odo|待定|待做|待办|暂停|暂缓)",only:"(?:[Oo]nly|仅仅?)",background:"[Bb]ackground|背景|前提",given:"(?:[Gg]iven|[Ww]ith|[Aa]nd|[Bb]ut|[Ee]xcept|假如|假设|假定|并且|而且|同时|但是)",when:"(?:[Ww]hen|[Ii]f|[Aa]nd|[Bb]ut|当|如果|并且|而且|同时|但是)",then:"(?:[Tt]hen|[Ee]xpect|[Aa]nd|[Bb]ut|那么|期望|并且|而且|同时|但是)",_steps:["given","when","then"]})},8555:(e,t,n)=>{"use strict"
-var r=n(8271)
-e.exports=new r("Dutch",{feature:"(?:[Ff]eature|[Ff]unctionaliteit|[Ee]igenschap)",scenario:"(?:[Ss]cenario|[Gg|eval)",examples:"(?:[Vv]oorbeelden?)",pending:"(?:[Tt]odo|[Mm]oet nog)",only:"(?:[Aa]lleen)",background:"(?:[Aa]chtergrond)",given:"(?:[Ss]tel|[Gg]egeven(?:\\sdat)?|[Ee]n|[Mm]aar)",when:"(?:[Aa]ls|[Ww]anneer|[Ee]n|[Mm]aar)",then:"(?:[Dd]an|[Vv]ervolgens|[Ee]n|[Mm]aar)",_steps:["given","when","then"]})},9307:(e,t,n)=>{"use strict"
-var r=n(8271)
-e.exports=new r("English",{feature:"[Ff]eature",scenario:"(?:[Ss]cenario|[Ss]cenario [Oo]utline)",examples:"(?:[Ee]xamples|[Ww]here)",pending:"(?:[Pp]ending|[Tt]odo)",only:"(?:[Oo]nly)",background:"[Bb]ackground",given:"(?:[Gg]iven|[Ww]ith|[Aa]nd|[Bb]ut|[Ee]xcept)",when:"(?:[Ww]hen|[Ii]f|[Aa]nd|[Bb]ut)",then:"(?:[Tt]hen|[Ee]xpect|[Aa]nd|[Bb]ut)",_steps:["given","when","then"]})},298:(e,t,n)=>{"use strict"
-var r=n(8271)
-e.exports=new r("French",{feature:"(?:[Ff]onctionnalité)",scenario:"(?:[Ss]cénario|[Pp]lan [Dd]u [Ss]cénario)",examples:"(?:[Ee]xemples|[Ee]xemple|[Oo][uù])",pending:"(?:[Ee]n attente|[Ee]n cours|[Tt]odo)",only:"(?:[Ss]eulement])",background:"(?:[Cc]ontexte)",given:"(?:[Ss]oit|[ÉéEe]tant données|[ÉéEe]tant donnée|[ÉéEe]tant donnés|[ÉéEe]tant donné|[Aa]vec|[Ee]t|[Mm]ais|[Aa]ttendre)",when:"(?:[Qq]uand|[Ll]orsqu'|[Ll]orsque|[Ss]i|[Ee]t|[Mm]ais)",then:"(?:[Aa]lors|[Aa]ttendre|[Ee]t|[Mm]ais)",_steps:["given","when","then","soit","etantdonnees","etantdonnee","etantdonne","quand","lorsque","alors"],get soit(){return this.given},get etantdonnees(){return this.given},get etantdonnee(){return this.given},get etantdonne(){return this.given},get quand(){return this.when},get lorsque(){return this.when},get alors(){return this.then}})},4430:(e,t,n)=>{"use strict"
-var r=n(8271)
-e.exports=new r("German",{feature:"(?:[Ff]unktionalität|[Ff]eature|[Aa]spekt|[Uu]secase|[Aa]nwendungsfall)",scenario:"(?:[Ss]zenario|[Ss]zenario( g|G)rundriss|[Gg]eschehnis)",examples:"(?:[Bb]eispiele?)",pending:"(?:[Tt]odo|[Oo]ffen)",only:"(?:[Nn]ur|[Ee]inzig)",background:"(?:[Gg]rundlage|[Hh]intergrund|[Ss]etup|[Vv]orausgesetzt)",given:"(?:[Aa]ngenommen|[Gg]egeben( sei(en)?)?|[Mm]it|[Uu]nd|[Aa]ber|[Aa]ußer)",when:"(?:[Ww]enn|[Ff]alls|[Uu]nd|[Aa]ber)",then:"(?:[Dd]ann|[Ff]olglich|[Aa]ußer|[Uu]nd|[Aa]ber)",_steps:["given","when","then"]})},8271:(e,t,n)=>{"use strict"
-var r=n(6877),i=n(3143)
-e.exports=function(e,t){var n=this
-this.is_language=!0,this.library=function(e){return n.localise_library(new r(e))},this.localise_library=function(e){return i(t._steps).each((function(t){e[t]=function(r,s,a,u){return i(r).each((function(r){return r=o(n.localise(t),r),e.define(r,s,a,u)}))}})),e}
-var o=function(e,t){var n=new RegExp("^/|/$","g"),r=new RegExp(/^(?:\^)?/)
-return t.toString().replace(n,"").replace(r,"^(?:\\s)*"+e+"\\s+")}
-this.localise=function(n){if(void 0===t[n])throw new Error('Keyword "'+n+'" has not been translated into '+e+".")
-return t[n]}}},5821:(e,t,n)=>{"use strict"
-var r=n(8271)
-e.exports=new r("Norwegian",{feature:"[Ee]genskap",scenario:"[Ss]cenario",examples:"[Ee]ksempler",pending:"[Aa]vventer",only:"[Bb]are",background:"[Bb]akgrunn",given:"(?:[Gg]itt|[Mm]ed|[Oo]g|[Mm]en|[Uu]nntatt)",when:"(?:[Nn]år|[Oo]g|[Mm]en)",then:"(?:[Ss]å|[Ff]forvent|[Oo]g|[Mm]en)",_steps:["given","when","then","gitt","når","så"],get gitt(){return this.given},get"når"(){return this.when},get"så"(){return this.then}})},3040:(e,t,n)=>{"use strict"
-var r=n(8271)
-e.exports=new r("Pirate",{feature:"(?:[Tt]ale|[Yy]arn)",scenario:"(?:[Aa]dventure|[Ss]ortie)",examples:"[Ww]herest",pending:"[Bb]rig",only:"[Bb]lack [Ss]pot",background:"[Aa]ftground",given:"(?:[Gg]iveth|[Ww]ith|[Aa]nd|[Bb]ut|[Ee]xcept)",when:"(?:[Ww]hence|[Ii]f|[Aa]nd|[Bb]ut)",then:"(?:[Tt]hence|[Ee]xpect|[Aa]nd|[Bb]ut)",_steps:["given","when","then","giveth","whence","thence"],get giveth(){return this.given},get whence(){return this.when},get thence(){return this.then}})},5991:(e,t,n)=>{"use strict"
-var r=n(8271)
-e.exports=new r("Polish",{feature:"(?:[Ww]łaściwość|[Ff]unkcja|[Aa]spekt|[Pp]otrzeba [Bb]iznesowa)",scenario:"(?:[Ss]cenariusz|[Ss]zablon [Ss]cenariusza)",examples:"[Pp]rzykłady",pending:"(?:[Oo]czekujący|[Nn]iezweryfikowany|[Tt]odo)",only:"[Tt]ylko",background:"[Zz]ałożenia",given:"(?:[Zz]akładając|[Mm]ając|[Oo]raz|[Ii]|[Aa]le)",when:"(?:[Jj]eżeli|[Jj]eśli|[Gg]dy|[Kk]iedy|[Oo]raz|[Ii]|[Aa]le)",then:"(?:[Ww]tedy|[Oo]raz|[Ii]|[Aa]le)",_steps:["given","when","then","zakladajac","majac","jezeli","jesli","gdy","kiedy","wtedy"],get zakladajac(){return this.given},get majac(){return this.given},get jezeli(){return this.when},get jesli(){return this.when},get gdy(){return this.when},get kiedy(){return this.when},get wtedy(){return this.then}})},2482:(e,t,n)=>{"use strict"
-var r=n(8271)
-e.exports=new r("Portuguese",{feature:"(?:[Ff]uncionalidade|[Cc]aracter[íi]stica)",scenario:"(?:[Cc]en[aá]rio|[Cc]aso)",examples:"(?:[Ee]xemplos|[Ee]xemplo)",pending:"[Pp]endente",only:"[S][óo]",background:"[Ff]undo",given:"(?:[Ss]eja|[Ss]ejam|[Dd]ado|[Dd]ada|[Dd]ados|[Dd]adas|[Ee]|[Mm]as)",when:"(?:[Qq]uando|[Ss]e|[Qq]ue|[Ee]|[Mm]as)",then:"(?:[Ee]nt[aã]o|[Ee]|[Mm]as)",_steps:["given","when","then","seja","sejam","dado","dada","dados","dadas","quando","se","entao"],get seja(){return this.given},get sejam(){return this.given},get dado(){return this.given},get dada(){return this.given},get dados(){return this.given},get dadas(){return this.given},get quando(){return this.when},get se(){return this.when},get entao(){return this.then}})},9494:(e,t,n)=>{"use strict"
-var r=n(8271)
-e.exports=new r("Russian",{feature:"(?:[Фф]ункция|[Фф]ункционал|[Сс]войство)",scenario:"Сценарий",examples:"Примеры?",pending:"(?:[Ww]ip|[Tt]odo)",only:"Только",background:"(?:[Пп]редыстория|[Кк]онтекст)",given:"(?:[Дд]опустим|[Дд]ано|[Пп]усть|[Ии]|[Н]о)(?:\\s[Яя])?",when:"(?:[Ее]сли|[Кк]огда|[Ии]|[Н]о)(?:\\s[Яя])?",then:"(?:[Тт]о|[Тт]огда|[Ии]|[Н]о)(?:\\s[Яя])?",_steps:["given","when","then"]})},4029:(e,t,n)=>{"use strict"
-var r=n(8271)
-e.exports=new r("Spanish",{feature:"(?:[Ff]uncionalidad|[Cc]aracterística)",scenario:"(?:[Ee]scenario|[Cc]aso)",examples:"(?:[Ee]jemplos|[Ee]jemplo)",pending:"[Pp]endiente",only:"[S]ólo",background:"[Ff]ondo",given:"(?:[Ss]ea|[Ss]ean|[Dd]ado|[Dd]ada|[Dd]ados|[Dd]adas)",when:"(?:[Cc]uando|[Ss]i|[Qq]ue)",then:"(?:[Ee]ntonces)",_steps:["given","when","then","sea","sean","dado","dada","dados","dadas","cuando","si","entonces"],get sea(){return this.given},get sean(){return this.given},get dado(){return this.given},get dada(){return this.given},get dados(){return this.given},get dadas(){return this.given},get cuando(){return this.when},get si(){return this.when},get entonces(){return this.then}})},6076:(e,t,n)=>{"use strict"
-var r=n(8271)
-e.exports=new r("Ukrainian",{feature:"(?:[Фф]ункція|[Фф]ункціонал|[Пп]отреба|[Аа]спект|[Оо]собливість|[Вв]ластивість)",scenario:"(?:[Сс]ценарій|[Шш]аблон)",examples:"[Пп]риклади",pending:"(?:[Нн]еперевірений|[Чч]екаючий|[Pp]ending|[Tt]odo)",only:"[Тт]ільки",background:"[Кк]онтекст",given:"(?:[Дд]ано|[Пп]ри|[Нн]ехай|[Іі]|[Тт]а|[Аа]ле)",when:"(?:[Яя]кщо|[Дд]е|[Кк]оли|[Іі]|[Тт]а|[Аа]ле)",then:"(?:[Тт]оді|[Іі]|[Тт]а|[Аа]ле)",_steps:["given","when","then"]})},5534:(e,t,n)=>{"use strict"
-e.exports={Chinese:n(2889),English:n(9307),French:n(298),German:n(4430),Dutch:n(8555),Norwegian:n(5821),Pirate:n(3040),Ukrainian:n(6076),Polish:n(5991),Spanish:n(4029),Russian:n(9494),Portuguese:n(2482),default:n(9307),Language:n(8271)}},5070:(e,t,n)=>{"use strict"
-e.exports=function(e){var t=n(9782).fs,r=new(n(3610))(e)
-this.parse=function(e,n){var i=t.readFileSync(e,"utf8"),o=r.parse(i)
-return n&&n(o)||o}}},3610:(e,t,n)=>{"use strict"
-var r=n(3143),i=n(526),o=n(6007),s=n(5534)
-e.exports=function(e){var t,n,a={language:s.default,leftPlaceholderChar:"[",rightPlaceholderChar:"]"},u=(e=e&&e.is_language?{language:e}:e||a).language||a.language,c=e.leftPlaceholderChar||a.leftPlaceholderChar,l=e.rightPlaceholderChar||a.rightPlaceholderChar,f=new RegExp("^\\s*"+u.localise("feature")+":\\s*(.*)","i"),h=new RegExp("^\\s*"+u.localise("scenario")+":\\s*(.*)","i"),d=new RegExp("^\\s*"+u.localise("background")+":\\s*(.*)","i"),p=new RegExp("^\\s*"+u.localise("examples")+":","i"),g=new RegExp("^(.*)$","i"),v=new RegExp("^\\s*#"),m=new RegExp("^\\s*#{3,}"),y=new RegExp("^(\\s*)$"),b=new RegExp("(^\\s*[\\|┆]?-{3,})"),w=new RegExp("^\\s*@([^=]*)$"),x=new RegExp("^\\s*@([^=]*)=(.*)$")
-function k(e,r){var i,s=r+1
-try{if(i=m.test(e))return n=!n
-if(n)return
-if(i=v.test(e))return
-if(i=w.exec(e))return t.handle("Annotation",{key:o.trim(i[1]),value:!0},s)
-if(i=x.exec(e))return t.handle("Annotation",{key:o.trim(i[1]),value:o.trim(i[2])},s)
-if(i=f.exec(e))return t.handle("Feature",i[1],s)
-if(i=h.exec(e))return t.handle("Scenario",i[1],s)
-if(i=d.exec(e))return t.handle("Background",i[1],s)
-if(i=p.exec(e))return t.handle("Examples",s)
-if(i=y.exec(e))return t.handle("Blank",i[0],s)
-if(i=b.exec(e))return t.handle("Dash",i[1],s)
-if(i=g.exec(e))return t.handle("Text",i[1],s)}catch(t){throw t.message="Error parsing line "+s+', "'+e+'".\nOriginal error was: '+t.message,t}}this.parse=function(e,i){return t=new _,n=!1,function(e){return r(e.split(/\r\n|\n/))}(e).each(k),i&&i(t.export())||t.export()}
-var E=function(e){e=e||{},this.register=function(t,n){e[t]=n},this.unregister=function(){r(Array.prototype.slice.call(arguments)).each((function(t){delete e[t]}))},this.find=function(t){if(!e[t.toLowerCase()])throw new Error(t+" is unexpected at this time")
-return{handle:e[t.toLowerCase()]}}},_=function(){var e,t=this,n=new S,r=new E({text:i.noop,blank:i.noop,annotation:function(e,t){r.unregister("background"),n.stash(t.key,t.value)},feature:function(t,r){return e=new C(r,n,new S)},scenario:o,background:s})
-function o(t,r,i){return(e=new C(r,new S,n)).on(t,r,i)}var s=o
-this.handle=function(e,n,r){t=t.on(e,n,r)},this.on=function(e,t,n){return r.find(e).handle(e,t,n)||this},this.export=function(){if(!e)throw new Error("A feature must contain one or more scenarios")
-return e.export()}},S=function(){var e={}
-this.stash=function(t,n){if(/\s/.test(t))throw new Error("Invalid annotation: "+t)
-e[t.toLowerCase()]=n},this.export=function(){return e}},C=function(e,t,n){var s=[],a=[],u=new j,c=new E({text:function(e,t){s.push(o.trim(t))},blank:i.noop,annotation:function(e,t){c.unregister("background","text"),n.stash(t.key,t.value)},scenario:function(e,t){var r=new N(t,u,n,l)
-return a.push(r),n=new S,r},background:function(e,t){return u=new T(t,l),n=new S,u}}),l=this
-this.on=function(e,t,n){return c.find(e).handle(e,t,n)||this},this.export=function(){return function(){if(0===a.length)throw new Error("Feature requires one or more scenarios")}(),{title:e,annotations:t.export(),description:s,scenarios:r(a).collect((function(e){return e.export()})).flatten().naked()}}},T=function(e,t){var n=[],r=[],s=0,a=new E({text:u,blank:i.noop,annotation:v,scenario:m})
-function u(e,t,r){a.register("dash",c),n.push(o.trim(t))}function c(e,t,n){a.unregister("dash","annotation","scenario"),a.register("text",l),a.register("blank",h),s=o.indentation(t)}function l(e,t,n){a.register("dash",p),a.register("text",f),a.register("blank",h),a.register("annotation",v),a.register("scenario",m),g(t,"\n")}function f(e,t,n){d(),g(t,"\n")}function h(e,t,n){r.push(t)}function d(){r.length&&(g(r.join("\n"),"\n"),r=[])}function p(e,t,n){a.unregister("dash"),a.register("text",u),a.register("blank",i.noop),d()}function g(e,t){if(o.isNotBlank(e)&&o.indentation(e)<s)throw new Error("Indentation error")
-n[n.length-1]=n[n.length-1]+t+o.rtrim(e.substr(s))}function v(e,n,r){return y(),t.on(e,n,r)}function m(e,n,r){return y(),t.on(e,n,r)}function y(){if(0===n.length)throw new Error("Background requires one or more steps")}this.on=function(e,t,n){return a.find(e).handle(e,t,n)||this},this.export=function(){return y(),{steps:n}}},j=function(){var e=new E
-this.on=function(t,n,r){return e.find(t).handle(t,n,r)||this},this.export=function(){return{steps:[]}}},N=function(e,t,n,r){var s,a=[],u=[],c=[],l=0,f=new E({text:d,blank:i.noop,annotation:x,scenario:x,examples:k}),h=this
-function d(e,t,n){f.register("dash",p),u.push(o.trim(t))}function p(e,t,n){f.unregister("dash","annotation","scenario","examples"),f.register("text",g),f.register("blank",m),l=o.indentation(t)}function g(e,t,n){f.register("dash",b),f.register("text",v),f.register("blank",m),f.register("annotation",x),f.register("scenario",x),f.register("examples",k),w(t,"\n")}function v(e,t,n){y(),w(t,"\n")}function m(e,t,n){c.push(t)}function y(){c.length&&(w(c.join("\n"),"\n"),c=[])}function b(e,t,n){f.unregister("dash"),f.register("text",d),f.register("blank",i.noop),y()}function w(e,t){if(o.isNotBlank(e)&&o.indentation(e)<l)throw new Error("Indentation error")
-u[u.length-1]=u[u.length-1]+t+o.rtrim(e.substr(l))}function x(e,t,n){return _(),r.on(e,t,n)}function k(e,t,n){return _(),s=new M(h)}function _(){if(0===u.length)throw new Error("Scenario requires one or more steps")}this.on=function(e,t,n){return f.find(e).handle(e,t,n)||this},this.export=function(){_()
-var r={title:e,annotations:n.export(),description:a,steps:t.export().steps.concat(u)}
-return s?s.expand(r):r}},M=function(e){var t=[],n=r(),s=new S,a=new E({blank:i.noop,dash:function(e,t,n){a.unregister("blank","dash")},text:function(e,n,r){a.register("annotation",u),a.register("text",f),a.register("dash",h)
-var i=1
-t=b(n).collect((function(e){var t={text:o.trim(e),left:i,indentation:o.indentation(e)}
-return i+=e.length+1,t})).naked()}})
-function u(e,t,n){a.unregister("blank","dash"),s.stash(t.key,t.value)}function f(e,t,r){a.register("dash",v),a.register("blank",v),n.push({annotations:s,fields:y(t,{})}),m(r),s=new S}function h(e,t,n){a.register("text",d),a.register("dash",g)}function d(e,t,r){a.register("text",p),a.register("dash",g),a.register("blank",v),n.push({annotations:s,fields:y(t,{})}),m(r)}function p(e,t,r){y(t,n.last().fields)}function g(e,t,n){a.register("text",d),s=new S}function v(e,t,n){a.unregister("text","dash"),a.register("blank",i.noop),a.register("annotation",w),a.register("scenario",w)}function m(e){var i=n.last().fields
-r(t).each((function(t){i[t.text+".index"]=[n.length],i[t.text+".start.line"]=[e],i[t.text+".start.column"]=[t.left+t.indentation]}))}function y(e,n){return b(e,t.length).each((function(e,r){var i=t[r].text,s=t[r].indentation,a=o.rtrim(e.substr(s))
-if(o.isNotBlank(e)&&o.indentation(e)<s)throw new Error("Indentation error")
-n[i]=(n[i]||[]).concat(a)})),n}function b(e,t){var n=e.indexOf("┆")>=0?"┆":"|",i=r(e.split(n))
-if(void 0!==t&&t!==i.length)throw new Error("Incorrect number of fields in example table. Expected "+t+" but found "+i.length)
-return i}function w(t,n,r){return x(),e.on(t,n,r)}function x(){if(0===t.length)throw new Error("Examples table requires one or more headings")
-if(0===n.length)throw new Error("Examples table requires one or more rows")}function k(){var e={}
-return r(Array.prototype.slice.call(arguments)).each((function(t){for(var n in t)e[n]=t[n]})),e}function _(e,t){return r(t).collect((function(t){return C(e,t)})).naked()}function C(e,t){for(var n in e)t=t.replace(new RegExp("\\"+c+"\\s*"+n+"\\s*\\"+l,"g"),o.rtrim(e[n].join("\n")))
-return t}this.on=function(e,t,n){return a.find(e).handle(e,t,n)||this},this.expand=function(e){return x(),n.collect((function(t){return{title:C(t.fields,e.title),annotations:k(t.annotations.export(),e.annotations),description:_(t,e.description),steps:_(t.fields,e.steps)}})).naked()}}}},7724:(e,t,n)=>{"use strict"
-var r=n(3143)
-e.exports=function(){var e=/[^\s]/
-this.parse=function(e,r){var i=t(e).find_all(n)
-return r&&r(i)||i}
-var t=function(e){return r(e.split(/\n/))},n=function(t){return t&&e.test(t)}}},3574:(e,t,n)=>{"use strict"
-e.exports={StepParser:n(7724),FeatureParser:n(3610),FeatureFileParser:n(5070)}},8418:(e,t,n)=>{"use strict"
-if(!(e=n.nmd(e)).client){var r=n(9782).fs
-n.g.process=n.g.process||{cwd:function(){return r.workingDirectory}}}e.exports=function(e,t){var r=n(409).EventBus
-e.interpreter.interpret_step=function(e,n,i){var o=this
-t.then((function(){t.test.info(e),r.instance().send(r.ON_STEP,{step:e,ctx:n}),o.rank_macros(e).clear_winner().interpret(e,n,i)}))},t.yadda=function(t,n){if(void 0===t)return this
-e.run(t,n)}}},918:(e,t,n)=>{"use strict"
-e.exports={casper:n(8418),mocha:{ScenarioLevelPlugin:n(616),StepLevelPlugin:n(2271)},get jasmine(){return this.mocha}}},749:(e,t,n)=>{"use strict"
-var r=n(5534),i=n(886),o=n(5070),s=n(3143)
-e.exports.create=function(e){var t=new i,n=e.language||r.default,a=e.parser||new o(n),u=e.container||t.get_container()
-function c(e,t){s(e).each((function(e){l(e.title,e,t)}))}function l(e,t,n){var r;(h(r=t.annotations,"pending")?u.xdescribe:h(r,"only")?u.describe.only||u.fdescribe||u.ddescribe:u.describe)(e,(function(){n(t)}))}function f(e,t){return h(e,"pending")?u.xit:h(e,"only")?u.it.only||u.fit||u.iit:u.it}function h(e,t){var r=new RegExp("^"+n.localise(t)+"$","i")
-for(var i in e)if(r.test(i))return!0}return{featureFiles:function(e,t){s(e).each((function(e){c(a.parse(e),t)}))},features:c,describe:l,it_async:function(e,t,n){f(t.annotations)(e,(function(e){n(this,t,e)}))},it_sync:function(e,t,n){f(t.annotations)(e,(function(){n(this,t)}))}}}},616:(e,t,n)=>{"use strict"
-var r=n(3143),i=n(886),o=n(749)
-e.exports.init=function(e){e=e||{}
-var t=new i,n=e.container||t.get_container(),s=o.create(e)
-n.featureFiles=n.featureFile=s.featureFiles,n.features=n.feature=s.features,n.scenarios=n.scenario=function(e,t){r(e).each((function(e){(1===t.length?s.it_sync:s.it_async)(e.title,e,(function(e,n,r){t(n,r)}))}))}}},2271:(e,t,n)=>{"use strict"
-var r=n(3143),i=n(886),o=n(749)
-e.exports.init=function(e){e=e||{}
-var t=new i,n=e.container||t.get_container(),s=o.create(e)
-n.featureFiles=n.featureFile=s.featureFiles,n.features=n.feature=s.features,n.scenarios=n.scenario=function(e,t){r(e).each((function(e){s.describe(e.title,e,t)}))},n.steps=function(e,t){var n=!1
-function i(e,t){s.it_async(e,e,(function(e,r,i){if(n)return e.skip?e.skip():i()
-n=!0,t.bind(e)(r,(function(e){if(e)return(i.fail||i)(e)
-n=!1,i()}))}))}function o(e,t){s.it_sync(e,e,(function(e,r){if(n)return e.skip&&e.skip()
-n=!0,t.bind(e)(r),n=!1}))}r(e).each((function(e){(1===t.length?o:i)(e,t)}))}}},4633:e=>{"use strict"
-e.exports=function(e,t){var n
-this.value,this.type="LevenshteinDistanceScore"
-var r=this
-this.compare=function(e){return e.value-this.value},this.equals=function(e){return!!e&&this.type===e.type&&this.value===e.value},function(){var r=e.length,i=t.length
-n=new Array(r+1)
-for(var o=0;o<=r;o++)n[o]=new Array(i+1)
-for(o=0;o<=r;o++)for(var s=0;s<=i;s++)n[o][s]=0
-for(o=0;o<=r;o++)n[o][0]=o
-for(s=0;s<=i;s++)n[0][s]=s}(),function(){if(e===t)return r.value=0
-for(var i=0;i<t.length;i++)for(var o=0;o<e.length;o++)if(e[o]===t[i])n[o+1][i+1]=n[o][i]
-else{var s=n[o][i+1]+1,a=n[o+1][i]+1,u=n[o][i]+1
-n[o+1][i+1]=Math.min(u,s,a)}r.value=n[e.length][t.length]}()}},6882:(e,t,n)=>{"use strict"
-var r=n(3143)
-e.exports=function(e){this.scores=r(e),this.type="MultiScore",this.compare=function(e){for(var t=0;t<this.scores.length;t++){var n=this.scores[t].compare(e.scores[t])
-if(n)return n}return 0},this.equals=function(e){return!!e&&this.type===e.type&&0===this.compare(e)}}},5901:e=>{"use strict"
-e.exports=function(e,t){this.value=e.is_sibling(t)?1:0,this.type="SameLibraryScore",this.compare=function(e){return this.value-e.value},this.equals=function(e){return!!e&&this.type===e.type&&this.value===e.value}}},9782:(e,t,n)=>{"use strict"
-var r,i,o,s,a=n(886)
-e.exports=(i=function(){return{fs:n(9265),path:n(3642),process:process}},o=function(){return{fs:n(4044),path:n(4152),process:n(5284)}},s=function(){return{fs:n(2459),path:n(8281),process:n(7804)}},(r=new a).is_phantom()?o():r.is_browser()&&r.is_karma()?s():r.is_node()?i():{})},2459:(e,t,n)=>{e.exports=function(){"use strict"
-var e=n(8281)
-function t(t){return e.resolve(e.normalize(t.split("\\").join("/")))}var r=function(){this.registry=new i,this.converter=new o("/base/","/"),this.reader=new s(this.converter)
-var e=Object.keys(window.__karma__.files)
-this.converter.parseUris(e).forEach(this.registry.addFile,this.registry)}
-r.prototype={constructor:r,workingDirectory:"/",existsSync:function(e){return this.registry.exists(e)},readdirSync:function(e){return this.registry.getContent(e)},statSync:function(e){return{isDirectory:function(){return this.registry.isDirectory(e)}.bind(this)}},readFileSync:function(e,t){if("utf8"!==t)throw new Error("This fs.readFileSync() shim does not support other than utf8 encoding.")
-if(!this.registry.isFile(e))throw new Error("File does not exist: "+e)
-return this.reader.readFile(e)}}
-var i=function(){this.paths={}}
-i.prototype={constructor:i,addFile:function(n){n=t(n),this.paths[n]=i.TYPE_FILE
-var r=e.dirname(n)
-this.addDirectory(r)},addDirectory:function(n){n=t(n),this.paths[n]=i.TYPE_DIRECTORY
-var r=e.dirname(n)
-r!==n&&this.addDirectory(r)},isFile:function(e){return e=t(e),this.exists(e)&&this.paths[e]===i.TYPE_FILE},isDirectory:function(e){return e=t(e),this.exists(e)&&this.paths[e]===i.TYPE_DIRECTORY},exists:function(e){return e=t(e),this.paths.hasOwnProperty(e)},getContent:function(n){if(!this.isDirectory(n))throw new Error("Not a directory: "+n)
-return n=t(n),Object.keys(this.paths).filter((function(t){return t!==n&&e.dirname(t)===n}),this).map((function(t){return e.basename(t)}))}},i.TYPE_FILE=0,i.TYPE_DIRECTORY=1
-var o=function(e,t){this.workingDirectory=t,this.workingDirectoryPattern=this.patternFromBase(t),this.baseUri=e,this.baseUriPattern=this.patternFromBase(e)}
-o.prototype={constructor:o,patternFromBase:function(e,t){var n="^"+e.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")
-return new RegExp(n,t)},parseUris:function(e){return e.filter((function(e){return this.baseUriPattern.test(e)}),this).map((function(e){return e.replace(this.baseUriPattern,this.workingDirectory)}),this)},buildUri:function(e){if(e=t(e),!this.workingDirectoryPattern.test(e))throw new Error("Path is not in working directory: "+e)
-return e.replace(this.workingDirectoryPattern,this.baseUri)}}
-var s=function(e){this.converter=e}
-return s.prototype={constructor:s,readFile:function(e){var t=this.converter.buildUri(e),n=new XMLHttpRequest
-return n.open("get",t,!1),n.send(),n.responseText}},new r}()},8281:(e,t,n)=>{e.exports=function(){"use strict"
-var e={}
-try{e=n(3642)}catch(e){throw new Error("The environment does not support the path module, it's probably not using browserify.")}if("function"!=typeof e.normalize||"function"!=typeof e.dirname)throw new Error("The path module emulation does not contain implementations of required functions.")
-return e}()},7804:(e,t,n)=>{e.exports=function(){"use strict"
-var e=n(2459)
-return{cwd:function(){return e.workingDirectory}}}()},4044:(e,t,n)=>{"use strict";(e=n.nmd(e)).exports=function(){if(e.client)return{}
-var t=n(9265)
-return t.existsSync=t.existsSync||t.exists,t.readdirSync=t.readdirSync||function(e){return t.list(e).filter((function(e){return"."!==e&&".."!==e}))},t.statSync=t.statSync||function(e){return{isDirectory:function(){return t.isDirectory(e)}}},t}()},4152:(e,t,n)=>{"use strict";(e=n.nmd(e)).exports=function(){if(e.client)return{}
-var t=n(9265),r={}
-try{r=n(3642)}catch(e){}return r.join=r.join||function(){return Array.prototype.join.call(arguments,t.separator)},r.relative=r.relative||function(e,n){return e+t.separator+n},r}()},5284:(e,t,n)=>{"use strict";(e=n.nmd(e)).exports=function(){if(e.client)return{}
-var t=n(9265),r=void 0!==r?r:{}
-return r.cwd=function(){return t.workingDirectory},r}()}}])
diff --git a/agent/uiserver/dist/assets/chunk.336.f5cb05e551aa08eb7125.js.LICENSE.txt b/agent/uiserver/dist/assets/chunk.336.f5cb05e551aa08eb7125.js.LICENSE.txt
deleted file mode 100644
index 54e228a74b610..0000000000000
--- a/agent/uiserver/dist/assets/chunk.336.f5cb05e551aa08eb7125.js.LICENSE.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-/*!
- * QUnit 2.19.1
- * https://qunitjs.com/
- *
- * Copyright OpenJS Foundation and other contributors
- * Released under the MIT license
- * https://jquery.org/license
- */
diff --git a/agent/uiserver/dist/assets/chunk.412.2df22e4bf69d8f15ebdb.js b/agent/uiserver/dist/assets/chunk.412.2df22e4bf69d8f15ebdb.js
deleted file mode 100644
index eaf09b0c7c704..0000000000000
--- a/agent/uiserver/dist/assets/chunk.412.2df22e4bf69d8f15ebdb.js
+++ /dev/null
@@ -1,2276 +0,0 @@
-/*! For license information please see chunk.412.2df22e4bf69d8f15ebdb.js.LICENSE.txt */
-(globalThis.webpackChunk_ember_auto_import_=globalThis.webpackChunk_ember_auto_import_||[]).push([[412],{218:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{iconNames:()=>r})
-const r=["loading","running","apple","apple-color","alibaba","alibaba-color","amazon-ecs","amazon-ecs-color","amazon-eks","amazon-eks-color","auth0","auth0-color","aws","aws-color","aws-cloudwatch","aws-cloudwatch-color","aws-ec2","aws-ec2-color","aws-lambda","aws-lambda-color","aws-s3","aws-s3-color","azure","azure-color","azure-aks","azure-aks-color","azure-blob-storage","azure-blob-storage-color","azure-devops","azure-devops-color","azure-vms","azure-vms-color","bitbucket","bitbucket-color","bridgecrew","bridgecrew-color","cisco","cisco-color","codepen","codepen-color","datadog","datadog-color","digital-ocean","digital-ocean-color","docker","docker-color","f5","f5-color","facebook","facebook-color","figma","figma-color","gcp","gcp-color","gitlab","gitlab-color","github","github-color","google","google-color","grafana","grafana-color","helm","helm-color","infracost","infracost-color","kubernetes","kubernetes-color","lightlytics","lightlytics-color","linkedin","linkedin-color","linode","linode-color","linux","linux-color","loom","loom-color","microsoft","microsoft-color","microsoft-teams","microsoft-teams-color","okta","okta-color","oracle","oracle-color","opa","opa-color","pack","pack-color","saml","saml-color","slack","slack-color","snyk","snyk-color","splunk","splunk-color","twitch","twitch-color","twitter","twitter-color","vantage","vantage-color","vmware","vmware-color","youtube","youtube-color","boundary","boundary-color","consul","consul-color","nomad","nomad-color","packer","packer-color","terraform","terraform-color","vagrant","vagrant-color","vault","vault-color","waypoint","waypoint-color","hashicorp","hashicorp-color","hcp","hcp-color","activity","alert-circle","alert-circle-fill","alert-diamond","alert-diamond-fill","alert-triangle","alert-triangle-fill","alert-octagon","alert-octagon-fill","align-center","align-justify","align-left","align-right","api","archive","arrow-down","arrow-down-circle","arrow-down-left","arrow-down-right","arrow-left","arrow-left-circle","arrow-right","arrow-right-circle","arrow-up","arrow-up-circle","arrow-up-left","arrow-up-right","at-sign","award","auto-apply","bank-vault","bar-chart","bar-chart-alt","battery","battery-charging","beaker","bell","bell-active-fill","bell-active","bell-off","bookmark","bookmark-fill","bookmark-add","bookmark-add-fill","bookmark-remove","bookmark-remove-fill","bottom","box","briefcase","bug","build","bulb","calendar","camera","camera-off","caret","cast","certificate","change","change-circle","change-square","check","check-circle","check-circle-fill","check-diamond","check-diamond-fill","check-hexagon","check-hexagon-fill","check-square","check-square-fill","chevron-down","chevron-left","chevron-right","chevron-up","chevrons-down","chevrons-left","chevrons-right","chevrons-up","circle","circle-dot","circle-fill","circle-half","clipboard","clipboard-checked","clipboard-copy","clock","clock-filled","cloud","closed-caption","cloud-check","cloud-download","cloud-lightning","cloud-lock","cloud-off","cloud-upload","cloud-x","code","collections","command","compass","connection","connection-gateway","corner-down-left","corner-down-right","corner-left-down","corner-left-up","corner-right-down","corner-right-up","corner-up-left","corner-up-right","cpu","credit-card","crop","crosshair","dashboard","database","delay","delete","diamond","diamond-fill","disc","discussion-circle","discussion-square","docs","docs-download","docs-link","dollar-sign","dot","dot-half","download","droplet","duplicate","edit","enterprise","entry-point","exit-point","external-link","event","eye","eye-off","fast-forward","file","file-check","file-change","file-diff","file-minus","file-plus","file-source","file-text","file-x","files","film","filter","filter-circle","filter-fill","fingerprint","flag","folder","folder-fill","folder-minus","folder-minus-fill","folder-plus","folder-plus-fill","folder-star","folder-users","frown","gateway","gift","git-branch","git-commit","git-merge","git-pull-request","git-repo","globe","globe-private","government","grid","grid-alt","guide","guide-link","hammer","handshake","hard-drive","hash","headphones","heart","heart-fill","heart-off","help","hexagon","hexagon-fill","history","home","hourglass","identity-user","identity-service","image","inbox","info","info-fill","jump-link","key","keychain","key-values","labyrinth","layers","layout","learn","learn-link","line-chart","line-chart-up","link","list","load-balancer","lock","lock-fill","lock-off","logs","mail","mail-open","mainframe","map","map-pin","maximize","maximize-alt","meh","menu","mesh","message-circle","message-circle-fill","message-square","message-square-fill","mic","mic-off","migrate","minimize","minimize-alt","minus","minus-circle","minus-square","minus-square-fill","minus-plus","minus-plus-circle","minus-plus-square","module","monitor","moon","more-horizontal","more-vertical","mouse-pointer","move","music","navigation","navigation-alt","network","network-alt","newspaper","node","octagon","org","outline","package","paperclip","path","pause","pause-circle","pen-tool","pencil-tool","phone","phone-call","phone-off","pie-chart","pin","pipeline","play","play-circle","plug","plus","plus-circle","plus-square","power","printer","provider","queue","radio","random","redirect","reload","repeat","replication-direct","replication-perf","rewind","rocket","rotate-cw","rotate-ccw","rss","save","scissors","search","send","server","serverless","server-cluster","settings","service","share","shield","shield-alert","shield-check","shield-off","shield-x","shopping-bag","shopping-cart","shuffle","sidebar","sidebar-hide","sidebar-show","sign-in","sign-out","skip","skip-forward","skip-back","slash","slash-square","sliders","smartphone","smile","socket","sort-asc","sort-desc","speaker","square","square-fill","star","star-circle","star-fill","star-off","step","stop-circle","sun","support","swap-horizontal","swap-vertical","switcher","sync","sync-alert","sync-reverse","tablet","tag","target","terminal","terminal-screen","test","thumbs-up","thumbs-down","toggle-left","toggle-right","token","tools","top","trash","trend-down","trend-up","triangle","triangle-fill","truck","tv","type","unfold-open","unfold-close","unlock","upload","user","user-check","user-circle","user-circle-fill","user-minus","user-plus","user-x","users","verified","video","video-off","volume","volume-down","volume-2","volume-x","wall","wand","watch","webhook","wifi","wifi-off","wrench","x","x-circle","x-circle-fill","x-diamond","x-diamond-fill","x-hexagon","x-hexagon-fill","x-square","x-square-fill","zap","zap-off","zoom-in","zoom-out"]},9454:(t,e,n)=>{"use strict"
-function r(t,e){var n="function"==typeof Symbol&&t[Symbol.iterator]
-if(!n)return t
-var r,i,o=n.call(t),a=[]
-try{for(;(void 0===e||e-- >0)&&!(r=o.next()).done;)a.push(r.value)}catch(t){i={error:t}}finally{try{r&&!r.done&&(n=o.return)&&n.call(o)}finally{if(i)throw i.error}}return a}var i
-n.r(e),n.d(e,{InterpreterStatus:()=>i,assign:()=>u,createMachine:()=>d,interpret:()=>y}),function(t){t[t.NotStarted=0]="NotStarted",t[t.Running=1]="Running",t[t.Stopped=2]="Stopped"}(i||(i={}))
-var o={type:"xstate.init"}
-function a(t){return void 0===t?[]:[].concat(t)}function u(t){return{type:"xstate.assign",assignment:t}}function c(t,e){return"string"==typeof(t="string"==typeof t&&e&&e[t]?e[t]:t)?{type:t}:"function"==typeof t?{type:t.name,exec:t}:t}function s(t){return function(e){return t===e}}function f(t){return"string"==typeof t?{type:t}:t}function l(t,e){return{value:t,context:e,actions:[],changed:!1,matches:s(t)}}function h(t,e,n){var r=e,i=!1
-return[t.filter((function(t){if("xstate.assign"===t.type){i=!0
-var e=Object.assign({},r)
-return"function"==typeof t.assignment?e=t.assignment(r,n):Object.keys(t.assignment).forEach((function(i){e[i]="function"==typeof t.assignment[i]?t.assignment[i](r,n):t.assignment[i]})),r=e,!1}return!0})),r,i]}function d(t,e){void 0===e&&(e={})
-var n=r(h(a(t.states[t.initial].entry).map((function(t){return c(t,e.actions)})),t.context,o),2),i=n[0],u=n[1],d={config:t,_options:e,initialState:{value:t.initial,actions:i,context:u,matches:s(t.initial)},transition:function(e,n){var i,o,u="string"==typeof e?{value:e,context:t.context}:e,p=u.value,y=u.context,b=f(n),v=t.states[p]
-if(v.on){var g=a(v.on[b.type])
-try{for(var m=function(t){var e="function"==typeof Symbol&&Symbol.iterator,n=e&&t[e],r=0
-if(n)return n.call(t)
-if(t&&"number"==typeof t.length)return{next:function(){return t&&r>=t.length&&(t=void 0),{value:t&&t[r++],done:!t}}}
-throw new TypeError(e?"Object is not iterable.":"Symbol.iterator is not defined.")}(g),_=m.next();!_.done;_=m.next()){var w=_.value
-if(void 0===w)return l(p,y)
-var x="string"==typeof w?{target:w}:w,A=x.target,E=x.actions,k=void 0===E?[]:E,D=x.cond,C=void 0===A
-if((void 0===D?function(){return!0}:D)(y,b)){var O=t.states[null!=A?A:p],S=r(h((C?a(k):[].concat(v.exit,k,O.entry).filter((function(t){return t}))).map((function(t){return c(t,d._options.actions)})),y,b),3),M=S[0],F=S[1],T=S[2],B=null!=A?A:p
-return{value:B,context:F,actions:M,changed:A!==p||M.length>0||T,matches:s(B)}}}}catch(t){i={error:t}}finally{try{_&&!_.done&&(o=m.return)&&o.call(m)}finally{if(i)throw i.error}}}return l(p,y)}}
-return d}var p=function(t,e){return t.actions.forEach((function(n){var r=n.exec
-return r&&r(t.context,e)}))}
-function y(t){var e=t.initialState,n=i.NotStarted,r=new Set,a={_machine:t,send:function(o){n===i.Running&&(e=t.transition(e,o),p(e,f(o)),r.forEach((function(t){return t(e)})))},subscribe:function(t){return r.add(t),t(e),{unsubscribe:function(){return r.delete(t)}}},start:function(r){if(r){var u="object"==typeof r?r:{context:t.config.context,value:r}
-e={value:u.value,actions:[],context:u.context,matches:s(u.value)}}return n=i.Running,p(e,o),a},stop:function(){return n=i.Stopped,r.clear(),a},get state(){return e},get status(){return n}}
-return a}},6313:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{default:()=>f})
-var r=['a[href]:not([tabindex^="-"])','area[href]:not([tabindex^="-"])','input:not([type="hidden"]):not([type="radio"]):not([disabled]):not([tabindex^="-"])','input[type="radio"]:not([disabled]):not([tabindex^="-"]):checked','select:not([disabled]):not([tabindex^="-"])','textarea:not([disabled]):not([tabindex^="-"])','button:not([disabled]):not([tabindex^="-"])','iframe:not([tabindex^="-"])','audio[controls]:not([tabindex^="-"])','video[controls]:not([tabindex^="-"])','[contenteditable]:not([tabindex^="-"])','[tabindex]:not([tabindex^="-"])']
-function i(t,e){this._show=this.show.bind(this),this._hide=this.hide.bind(this),this._maintainFocus=this._maintainFocus.bind(this),this._bindKeypress=this._bindKeypress.bind(this),this._previouslyFocused=null,this.container=t,this.dialog=t.querySelector('dialog, [role="dialog"], [role="alertdialog"]'),this.role=this.dialog.getAttribute("role")||"dialog",this.useDialog="show"in this.dialog,this._listeners={},this.create(e)}function o(t){return Array.prototype.slice.call(t)}function a(t,e){return o((e||document).querySelectorAll(t))}function u(t){var e=c(t),n=t.querySelector("[autofocus]")||e[0]
-n&&n.focus()}function c(t){return a(r.join(","),t).filter((function(t){return!!(t.offsetWidth||t.offsetHeight||t.getClientRects().length)}))}function s(){a("[data-a11y-dialog]").forEach((function(t){new i(t,t.getAttribute("data-a11y-dialog")||void 0)}))}i.prototype.create=function(t){var e,n,r
-return this._targets=this._targets||(r=t,NodeList.prototype.isPrototypeOf(r)?o(r):Element.prototype.isPrototypeOf(r)?[r]:"string"==typeof r?a(r):void 0)||((n=o((e=this.container).parentNode.childNodes).filter((function(t){return 1===t.nodeType}))).splice(n.indexOf(e),1),n),this.shown=this.dialog.hasAttribute("open"),this.dialog.setAttribute("role",this.role),this.useDialog?(this.container.setAttribute("data-a11y-dialog-native",""),this.container.removeAttribute("aria-hidden")):this.shown?this.container.removeAttribute("aria-hidden"):this.container.setAttribute("aria-hidden",!0),this._openers=a('[data-a11y-dialog-show="'+this.container.id+'"]'),this._openers.forEach(function(t){t.addEventListener("click",this._show)}.bind(this)),this._closers=a("[data-a11y-dialog-hide]",this.container).concat(a('[data-a11y-dialog-hide="'+this.container.id+'"]')),this._closers.forEach(function(t){t.addEventListener("click",this._hide)}.bind(this)),this._fire("create"),this},i.prototype.show=function(t){return this.shown||(this.shown=!0,this._previouslyFocused=document.activeElement,this.useDialog?this.dialog.showModal(t instanceof Event?void 0:t):(this.dialog.setAttribute("open",""),this.container.removeAttribute("aria-hidden"),this._targets.forEach((function(t){t.hasAttribute("aria-hidden")&&t.setAttribute("data-a11y-dialog-original-aria-hidden",t.getAttribute("aria-hidden")),t.setAttribute("aria-hidden","true")}))),u(this.dialog),document.body.addEventListener("focus",this._maintainFocus,!0),document.addEventListener("keydown",this._bindKeypress),this._fire("show",t)),this},i.prototype.hide=function(t){return this.shown?(this.shown=!1,this.useDialog?this.dialog.close(t instanceof Event?void 0:t):(this.dialog.removeAttribute("open"),this.container.setAttribute("aria-hidden","true"),this._targets.forEach((function(t){t.hasAttribute("data-a11y-dialog-original-aria-hidden")?(t.setAttribute("aria-hidden",t.getAttribute("data-a11y-dialog-original-aria-hidden")),t.removeAttribute("data-a11y-dialog-original-aria-hidden")):t.removeAttribute("aria-hidden")}))),this._previouslyFocused&&this._previouslyFocused.focus&&this._previouslyFocused.focus(),document.body.removeEventListener("focus",this._maintainFocus,!0),document.removeEventListener("keydown",this._bindKeypress),this._fire("hide",t),this):this},i.prototype.destroy=function(){return this.hide(),this._openers.forEach(function(t){t.removeEventListener("click",this._show)}.bind(this)),this._closers.forEach(function(t){t.removeEventListener("click",this._hide)}.bind(this)),this._fire("destroy"),this._listeners={},this},i.prototype.on=function(t,e){return void 0===this._listeners[t]&&(this._listeners[t]=[]),this._listeners[t].push(e),this},i.prototype.off=function(t,e){var n=(this._listeners[t]||[]).indexOf(e)
-return n>-1&&this._listeners[t].splice(n,1),this},i.prototype._fire=function(t,e){(this._listeners[t]||[]).forEach(function(t){t(this.container,e)}.bind(this))},i.prototype._bindKeypress=function(t){this.dialog.contains(document.activeElement)&&(this.shown&&27===t.which&&"alertdialog"!==this.role&&(t.preventDefault(),this.hide(t)),this.shown&&9===t.which&&function(t,e){var n=c(t),r=n.indexOf(document.activeElement)
-e.shiftKey&&0===r?(n[n.length-1].focus(),e.preventDefault()):e.shiftKey||r!==n.length-1||(n[0].focus(),e.preventDefault())}(this.dialog,t))},i.prototype._maintainFocus=function(t){var e=t.target.getAttribute("data-a11y-dialog-show")
-this.shown&&!this.container.contains(t.target)&&e===this.container.id&&u(this.container)},"undefined"!=typeof document&&("loading"===document.readyState?document.addEventListener("DOMContentLoaded",s):window.requestAnimationFrame?window.requestAnimationFrame(s):window.setTimeout(s,16))
-const f=i},3305:(t,e)=>{"use strict"
-e.byteLength=function(t){var e=c(t),n=e[0],r=e[1]
-return 3*(n+r)/4-r},e.toByteArray=function(t){var e,n,o=c(t),a=o[0],u=o[1],s=new i(function(t,e,n){return 3*(e+n)/4-n}(0,a,u)),f=0,l=u>0?a-4:a
-for(n=0;n<l;n+=4)e=r[t.charCodeAt(n)]<<18|r[t.charCodeAt(n+1)]<<12|r[t.charCodeAt(n+2)]<<6|r[t.charCodeAt(n+3)],s[f++]=e>>16&255,s[f++]=e>>8&255,s[f++]=255&e
-return 2===u&&(e=r[t.charCodeAt(n)]<<2|r[t.charCodeAt(n+1)]>>4,s[f++]=255&e),1===u&&(e=r[t.charCodeAt(n)]<<10|r[t.charCodeAt(n+1)]<<4|r[t.charCodeAt(n+2)]>>2,s[f++]=e>>8&255,s[f++]=255&e),s},e.fromByteArray=function(t){for(var e,r=t.length,i=r%3,o=[],a=16383,u=0,c=r-i;u<c;u+=a)o.push(s(t,u,u+a>c?c:u+a))
-return 1===i?(e=t[r-1],o.push(n[e>>2]+n[e<<4&63]+"==")):2===i&&(e=(t[r-2]<<8)+t[r-1],o.push(n[e>>10]+n[e>>4&63]+n[e<<2&63]+"=")),o.join("")}
-for(var n=[],r=[],i="undefined"!=typeof Uint8Array?Uint8Array:Array,o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",a=0,u=o.length;a<u;++a)n[a]=o[a],r[o.charCodeAt(a)]=a
-function c(t){var e=t.length
-if(e%4>0)throw new Error("Invalid string. Length must be a multiple of 4")
-var n=t.indexOf("=")
-return-1===n&&(n=e),[n,n===e?0:4-n%4]}function s(t,e,r){for(var i,o,a=[],u=e;u<r;u+=3)i=(t[u]<<16&16711680)+(t[u+1]<<8&65280)+(255&t[u+2]),a.push(n[(o=i)>>18&63]+n[o>>12&63]+n[o>>6&63]+n[63&o])
-return a.join("")}r["-".charCodeAt(0)]=62,r["_".charCodeAt(0)]=63},2309:function(t){var e
-e=function(){return function(){var t={134:function(t,e,n){"use strict"
-n.d(e,{default:function(){return m}})
-var r=n(279),i=n.n(r),o=n(370),a=n.n(o),u=n(817),c=n.n(u)
-function s(t){return s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},s(t)}var f=function(){function t(e){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.resolveOptions(e),this.initSelection()}var n
-return n=[{key:"resolveOptions",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-this.action=t.action,this.container=t.container,this.emitter=t.emitter,this.target=t.target,this.text=t.text,this.trigger=t.trigger,this.selectedText=""}},{key:"initSelection",value:function(){this.text?this.selectFake():this.target&&this.selectTarget()}},{key:"createFakeElement",value:function(){var t="rtl"===document.documentElement.getAttribute("dir")
-this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[t?"right":"left"]="-9999px"
-var e=window.pageYOffset||document.documentElement.scrollTop
-return this.fakeElem.style.top="".concat(e,"px"),this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,this.fakeElem}},{key:"selectFake",value:function(){var t=this,e=this.createFakeElement()
-this.fakeHandlerCallback=function(){return t.removeFake()},this.fakeHandler=this.container.addEventListener("click",this.fakeHandlerCallback)||!0,this.container.appendChild(e),this.selectedText=c()(e),this.copyText(),this.removeFake()}},{key:"removeFake",value:function(){this.fakeHandler&&(this.container.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(this.container.removeChild(this.fakeElem),this.fakeElem=null)}},{key:"selectTarget",value:function(){this.selectedText=c()(this.target),this.copyText()}},{key:"copyText",value:function(){var t
-try{t=document.execCommand(this.action)}catch(e){t=!1}this.handleResult(t)}},{key:"handleResult",value:function(t){this.emitter.emit(t?"success":"error",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})}},{key:"clearSelection",value:function(){this.trigger&&this.trigger.focus(),document.activeElement.blur(),window.getSelection().removeAllRanges()}},{key:"destroy",value:function(){this.removeFake()}},{key:"action",set:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"copy"
-if(this._action=t,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function(){return this._action}},{key:"target",set:function(t){if(void 0!==t){if(!t||"object"!==s(t)||1!==t.nodeType)throw new Error('Invalid "target" value, use a valid Element')
-if("copy"===this.action&&t.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute')
-if("cut"===this.action&&(t.hasAttribute("readonly")||t.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes')
-this._target=t}},get:function(){return this._target}}],n&&function(t,e){for(var n=0;n<e.length;n++){var r=e[n]
-r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}(t.prototype,n),t}(),l=f
-function h(t){return h="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},h(t)}function d(t,e){for(var n=0;n<e.length;n++){var r=e[n]
-r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function p(t,e){return p=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t},p(t,e)}function y(t,e){return!e||"object"!==h(e)&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called")
-return t}(t):e}function b(t){return b=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)},b(t)}function v(t,e){var n="data-clipboard-".concat(t)
-if(e.hasAttribute(n))return e.getAttribute(n)}var g=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function")
-t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&p(t,e)}(c,t)
-var e,n,r,i,o,u=(i=c,o=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1
-if(Reflect.construct.sham)return!1
-if("function"==typeof Proxy)return!0
-try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}(),function(){var t,e=b(i)
-if(o){var n=b(this).constructor
-t=Reflect.construct(e,arguments,n)}else t=e.apply(this,arguments)
-return y(this,t)})
-function c(t,e){var n
-return function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,c),(n=u.call(this)).resolveOptions(e),n.listenClick(t),n}return e=c,n=[{key:"resolveOptions",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-this.action="function"==typeof t.action?t.action:this.defaultAction,this.target="function"==typeof t.target?t.target:this.defaultTarget,this.text="function"==typeof t.text?t.text:this.defaultText,this.container="object"===h(t.container)?t.container:document.body}},{key:"listenClick",value:function(t){var e=this
-this.listener=a()(t,"click",(function(t){return e.onClick(t)}))}},{key:"onClick",value:function(t){var e=t.delegateTarget||t.currentTarget
-this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new l({action:this.action(e),target:this.target(e),text:this.text(e),container:this.container,trigger:e,emitter:this})}},{key:"defaultAction",value:function(t){return v("action",t)}},{key:"defaultTarget",value:function(t){var e=v("target",t)
-if(e)return document.querySelector(e)}},{key:"defaultText",value:function(t){return v("text",t)}},{key:"destroy",value:function(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)}}],r=[{key:"isSupported",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:["copy","cut"],e="string"==typeof t?[t]:t,n=!!document.queryCommandSupported
-return e.forEach((function(t){n=n&&!!document.queryCommandSupported(t)})),n}}],n&&d(e.prototype,n),r&&d(e,r),c}(i()),m=g},828:function(t){if("undefined"!=typeof Element&&!Element.prototype.matches){var e=Element.prototype
-e.matches=e.matchesSelector||e.mozMatchesSelector||e.msMatchesSelector||e.oMatchesSelector||e.webkitMatchesSelector}t.exports=function(t,e){for(;t&&9!==t.nodeType;){if("function"==typeof t.matches&&t.matches(e))return t
-t=t.parentNode}}},438:function(t,e,n){var r=n(828)
-function i(t,e,n,r,i){var a=o.apply(this,arguments)
-return t.addEventListener(n,a,i),{destroy:function(){t.removeEventListener(n,a,i)}}}function o(t,e,n,i){return function(n){n.delegateTarget=r(n.target,e),n.delegateTarget&&i.call(t,n)}}t.exports=function(t,e,n,r,o){return"function"==typeof t.addEventListener?i.apply(null,arguments):"function"==typeof n?i.bind(null,document).apply(null,arguments):("string"==typeof t&&(t=document.querySelectorAll(t)),Array.prototype.map.call(t,(function(t){return i(t,e,n,r,o)})))}},879:function(t,e){e.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},e.nodeList=function(t){var n=Object.prototype.toString.call(t)
-return void 0!==t&&("[object NodeList]"===n||"[object HTMLCollection]"===n)&&"length"in t&&(0===t.length||e.node(t[0]))},e.string=function(t){return"string"==typeof t||t instanceof String},e.fn=function(t){return"[object Function]"===Object.prototype.toString.call(t)}},370:function(t,e,n){var r=n(879),i=n(438)
-t.exports=function(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments")
-if(!r.string(e))throw new TypeError("Second argument must be a String")
-if(!r.fn(n))throw new TypeError("Third argument must be a Function")
-if(r.node(t))return function(t,e,n){return t.addEventListener(e,n),{destroy:function(){t.removeEventListener(e,n)}}}(t,e,n)
-if(r.nodeList(t))return function(t,e,n){return Array.prototype.forEach.call(t,(function(t){t.addEventListener(e,n)})),{destroy:function(){Array.prototype.forEach.call(t,(function(t){t.removeEventListener(e,n)}))}}}(t,e,n)
-if(r.string(t))return function(t,e,n){return i(document.body,t,e,n)}(t,e,n)
-throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList")}},817:function(t){t.exports=function(t){var e
-if("SELECT"===t.nodeName)t.focus(),e=t.value
-else if("INPUT"===t.nodeName||"TEXTAREA"===t.nodeName){var n=t.hasAttribute("readonly")
-n||t.setAttribute("readonly",""),t.select(),t.setSelectionRange(0,t.value.length),n||t.removeAttribute("readonly"),e=t.value}else{t.hasAttribute("contenteditable")&&t.focus()
-var r=window.getSelection(),i=document.createRange()
-i.selectNodeContents(t),r.removeAllRanges(),r.addRange(i),e=r.toString()}return e}},279:function(t){function e(){}e.prototype={on:function(t,e,n){var r=this.e||(this.e={})
-return(r[t]||(r[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){var r=this
-function i(){r.off(t,i),e.apply(n,arguments)}return i._=e,this.on(t,i,n)},emit:function(t){for(var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),r=0,i=n.length;r<i;r++)n[r].fn.apply(n[r].ctx,e)
-return this},off:function(t,e){var n=this.e||(this.e={}),r=n[t],i=[]
-if(r&&e)for(var o=0,a=r.length;o<a;o++)r[o].fn!==e&&r[o].fn._!==e&&i.push(r[o])
-return i.length?n[t]=i:delete n[t],this}},t.exports=e,t.exports.TinyEmitter=e}},e={}
-function n(r){if(e[r])return e[r].exports
-var i=e[r]={exports:{}}
-return t[r](i,i.exports,n),i.exports}return n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t}
-return n.d(e,{a:e}),e},n.d=function(t,e){for(var r in e)n.o(e,r)&&!n.o(t,r)&&Object.defineProperty(t,r,{enumerable:!0,get:e[r]})},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n(134)}().default},t.exports=e()},7604:(t,e,n)=>{"use strict"
-function r(t,e){return t<e?-1:t>e?1:t>=e?0:NaN}n.d(e,{Z:()=>r})},4376:(t,e,n)=>{"use strict"
-n.d(e,{Nw:()=>c,ZP:()=>f,ZR:()=>s,ml:()=>u})
-var r=n(7604),i=n(9354),o=n(9750)
-const a=(0,i.Z)(r.Z),u=a.right,c=a.left,s=(0,i.Z)(o.Z).center,f=u},9354:(t,e,n)=>{"use strict"
-n.d(e,{Z:()=>i})
-var r=n(7604)
-function i(t){let e=t,n=t
-function i(t,e,r,i){for(null==r&&(r=0),null==i&&(i=t.length);r<i;){const o=r+i>>>1
-n(t[o],e)<0?r=o+1:i=o}return r}return 1===t.length&&(e=(e,n)=>t(e)-n,n=function(t){return(e,n)=>(0,r.Z)(t(e),n)}(t)),{left:i,center:function(t,n,r,o){null==r&&(r=0),null==o&&(o=t.length)
-const a=i(t,n,r,o-1)
-return a>r&&e(t[a-1],n)>-e(t[a],n)?a-1:a},right:function(t,e,r,i){for(null==r&&(r=0),null==i&&(i=t.length);r<i;){const o=r+i>>>1
-n(t[o],e)>0?i=o:r=o+1}return r}}}},1286:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{Adder:()=>v,InternMap:()=>_,InternSet:()=>w,ascending:()=>i.Z,bin:()=>q,bisect:()=>r.ZP,bisectCenter:()=>r.ZR,bisectLeft:()=>r.Nw,bisectRight:()=>r.ml,bisector:()=>o.Z,count:()=>a,cross:()=>l,cumsum:()=>h,descending:()=>d,deviation:()=>y,difference:()=>xt,disjoint:()=>At,every:()=>bt,extent:()=>b,fcumsum:()=>m,filter:()=>gt,fsum:()=>g,greatest:()=>ut,greatestIndex:()=>ct,group:()=>C,groupSort:()=>R,groups:()=>O,histogram:()=>q,index:()=>F,indexes:()=>T,intersection:()=>kt,least:()=>ot,leastIndex:()=>at,map:()=>mt,max:()=>G.Z,maxIndex:()=>K,mean:()=>W,median:()=>X,merge:()=>J,min:()=>Q.Z,minIndex:()=>tt,nice:()=>z,pairs:()=>et,permute:()=>j,quantile:()=>V.Z,quantileSorted:()=>V.s,quickselect:()=>rt.Z,range:()=>it.Z,reduce:()=>_t,reverse:()=>wt,rollup:()=>S,rollups:()=>M,scan:()=>st,shuffle:()=>ft,shuffler:()=>lt,some:()=>vt,sort:()=>N,subset:()=>Ct,sum:()=>ht,superset:()=>Dt,thresholdFreedmanDiaconis:()=>H,thresholdScott:()=>Y,thresholdSturges:()=>Z,tickIncrement:()=>U.G9,tickStep:()=>U.ly,ticks:()=>U.ZP,transpose:()=>dt,union:()=>Ot,variance:()=>p,zip:()=>yt})
-var r=n(4376),i=n(7604),o=n(9354)
-function a(t,e){let n=0
-if(void 0===e)for(let r of t)null!=r&&(r=+r)>=r&&++n
-else{let r=-1
-for(let i of t)null!=(i=e(i,++r,t))&&(i=+i)>=i&&++n}return n}function u(t){return 0|t.length}function c(t){return!(t>0)}function s(t){return"object"!=typeof t||"length"in t?t:Array.from(t)}function f(t){return e=>t(...e)}function l(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n]
-const r="function"==typeof e[e.length-1]&&f(e.pop()),i=(e=e.map(s)).map(u),o=e.length-1,a=new Array(o+1).fill(0),l=[]
-if(o<0||i.some(c))return l
-for(;;){l.push(a.map(((t,n)=>e[n][t])))
-let t=o
-for(;++a[t]===i[t];){if(0===t)return r?l.map(r):l
-a[t--]=0}}}function h(t,e){var n=0,r=0
-return Float64Array.from(t,void 0===e?t=>n+=+t||0:i=>n+=+e(i,r++,t)||0)}function d(t,e){return e<t?-1:e>t?1:e>=t?0:NaN}function p(t,e){let n,r=0,i=0,o=0
-if(void 0===e)for(let a of t)null!=a&&(a=+a)>=a&&(n=a-i,i+=n/++r,o+=n*(a-i))
-else{let a=-1
-for(let u of t)null!=(u=e(u,++a,t))&&(u=+u)>=u&&(n=u-i,i+=n/++r,o+=n*(u-i))}if(r>1)return o/(r-1)}function y(t,e){const n=p(t,e)
-return n?Math.sqrt(n):n}function b(t,e){let n,r
-if(void 0===e)for(const i of t)null!=i&&(void 0===n?i>=i&&(n=r=i):(n>i&&(n=i),r<i&&(r=i)))
-else{let i=-1
-for(let o of t)null!=(o=e(o,++i,t))&&(void 0===n?o>=o&&(n=r=o):(n>o&&(n=o),r<o&&(r=o)))}return[n,r]}class v{constructor(){this._partials=new Float64Array(32),this._n=0}add(t){const e=this._partials
-let n=0
-for(let r=0;r<this._n&&r<32;r++){const i=e[r],o=t+i,a=Math.abs(t)<Math.abs(i)?t-(o-i):i-(o-t)
-a&&(e[n++]=a),t=o}return e[n]=t,this._n=n+1,this}valueOf(){const t=this._partials
-let e,n,r,i=this._n,o=0
-if(i>0){for(o=t[--i];i>0&&(e=o,n=t[--i],o=e+n,r=n-(o-e),!r););i>0&&(r<0&&t[i-1]<0||r>0&&t[i-1]>0)&&(n=2*r,e=o+n,n==e-o&&(o=e))}return o}}function g(t,e){const n=new v
-if(void 0===e)for(let r of t)(r=+r)&&n.add(r)
-else{let r=-1
-for(let i of t)(i=+e(i,++r,t))&&n.add(i)}return+n}function m(t,e){const n=new v
-let r=-1
-return Float64Array.from(t,void 0===e?t=>n.add(+t||0):i=>n.add(+e(i,++r,t)||0))}class _ extends Map{constructor(t){let e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:k
-if(super(),Object.defineProperties(this,{_intern:{value:new Map},_key:{value:e}}),null!=t)for(const[n,r]of t)this.set(n,r)}get(t){return super.get(x(this,t))}has(t){return super.has(x(this,t))}set(t,e){return super.set(A(this,t),e)}delete(t){return super.delete(E(this,t))}}class w extends Set{constructor(t){let e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:k
-if(super(),Object.defineProperties(this,{_intern:{value:new Map},_key:{value:e}}),null!=t)for(const n of t)this.add(n)}has(t){return super.has(x(this,t))}add(t){return super.add(A(this,t))}delete(t){return super.delete(E(this,t))}}function x(t,e){let{_intern:n,_key:r}=t
-const i=r(e)
-return n.has(i)?n.get(i):e}function A(t,e){let{_intern:n,_key:r}=t
-const i=r(e)
-return n.has(i)?n.get(i):(n.set(i,e),e)}function E(t,e){let{_intern:n,_key:r}=t
-const i=r(e)
-return n.has(i)&&(e=n.get(e),n.delete(i)),e}function k(t){return null!==t&&"object"==typeof t?t.valueOf():t}function D(t){return t}function C(t){for(var e=arguments.length,n=new Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r]
-return P(t,D,D,n)}function O(t){for(var e=arguments.length,n=new Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r]
-return P(t,Array.from,D,n)}function S(t,e){for(var n=arguments.length,r=new Array(n>2?n-2:0),i=2;i<n;i++)r[i-2]=arguments[i]
-return P(t,D,e,r)}function M(t,e){for(var n=arguments.length,r=new Array(n>2?n-2:0),i=2;i<n;i++)r[i-2]=arguments[i]
-return P(t,Array.from,e,r)}function F(t){for(var e=arguments.length,n=new Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r]
-return P(t,D,B,n)}function T(t){for(var e=arguments.length,n=new Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r]
-return P(t,Array.from,B,n)}function B(t){if(1!==t.length)throw new Error("duplicate key")
-return t[0]}function P(t,e,n,r){return function t(i,o){if(o>=r.length)return n(i)
-const a=new _,u=r[o++]
-let c=-1
-for(const e of i){const t=u(e,++c,i),n=a.get(t)
-n?n.push(e):a.set(t,[e])}for(const[e,n]of a)a.set(e,t(n,o))
-return e(a)}(t,0)}function j(t,e){return Array.from(e,(e=>t[e]))}function N(t){for(var e=arguments.length,n=new Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r]
-if("function"!=typeof t[Symbol.iterator])throw new TypeError("values is not iterable")
-t=Array.from(t)
-let[o=i.Z]=n
-if(1===o.length||n.length>1){const e=Uint32Array.from(t,((t,e)=>e))
-return n.length>1?(n=n.map((e=>t.map(e))),e.sort(((t,e)=>{for(const r of n){const n=(0,i.Z)(r[t],r[e])
-if(n)return n}}))):(o=t.map(o),e.sort(((t,e)=>(0,i.Z)(o[t],o[e])))),j(t,e)}return t.sort(o)}function R(t,e,n){return(1===e.length?N(S(t,e,n),((t,e)=>{let[n,r]=t,[o,a]=e
-return(0,i.Z)(r,a)||(0,i.Z)(n,o)})):N(C(t,n),((t,n)=>{let[r,o]=t,[a,u]=n
-return e(o,u)||(0,i.Z)(r,a)}))).map((t=>{let[e]=t
-return e}))}var L=Array.prototype,I=L.slice
-function $(t){return function(){return t}}L.map
-var U=n(458)
-function z(t,e,n){let r
-for(;;){const i=(0,U.G9)(t,e,n)
-if(i===r||0===i||!isFinite(i))return[t,e]
-i>0?(t=Math.floor(t/i)*i,e=Math.ceil(e/i)*i):i<0&&(t=Math.ceil(t*i)/i,e=Math.floor(e*i)/i),r=i}}function Z(t){return Math.ceil(Math.log(a(t))/Math.LN2)+1}function q(){var t=D,e=b,n=Z
-function i(i){Array.isArray(i)||(i=Array.from(i))
-var o,a,u=i.length,c=new Array(u)
-for(o=0;o<u;++o)c[o]=t(i[o],o,i)
-var s=e(c),f=s[0],l=s[1],h=n(c,f,l)
-if(!Array.isArray(h)){const t=l,n=+h
-if(e===b&&([f,l]=z(f,l,n)),(h=(0,U.ZP)(f,l,n))[h.length-1]>=l)if(t>=l&&e===b){const t=(0,U.G9)(f,l,n)
-isFinite(t)&&(t>0?l=(Math.floor(l/t)+1)*t:t<0&&(l=(Math.ceil(l*-t)+1)/-t))}else h.pop()}for(var d=h.length;h[0]<=f;)h.shift(),--d
-for(;h[d-1]>l;)h.pop(),--d
-var p,y=new Array(d+1)
-for(o=0;o<=d;++o)(p=y[o]=[]).x0=o>0?h[o-1]:f,p.x1=o<d?h[o]:l
-for(o=0;o<u;++o)f<=(a=c[o])&&a<=l&&y[(0,r.ZP)(h,a,0,d)].push(i[o])
-return y}return i.value=function(e){return arguments.length?(t="function"==typeof e?e:$(e),i):t},i.domain=function(t){return arguments.length?(e="function"==typeof t?t:$([t[0],t[1]]),i):e},i.thresholds=function(t){return arguments.length?(n="function"==typeof t?t:Array.isArray(t)?$(I.call(t)):$(t),i):n},i}var V=n(801)
-function H(t,e,n){return Math.ceil((n-e)/(2*((0,V.Z)(t,.75)-(0,V.Z)(t,.25))*Math.pow(a(t),-1/3)))}function Y(t,e,n){return Math.ceil((n-e)/(3.5*y(t)*Math.pow(a(t),-1/3)))}var G=n(2368)
-function K(t,e){let n,r=-1,i=-1
-if(void 0===e)for(const o of t)++i,null!=o&&(n<o||void 0===n&&o>=o)&&(n=o,r=i)
-else for(let o of t)null!=(o=e(o,++i,t))&&(n<o||void 0===n&&o>=o)&&(n=o,r=i)
-return r}function W(t,e){let n=0,r=0
-if(void 0===e)for(let i of t)null!=i&&(i=+i)>=i&&(++n,r+=i)
-else{let i=-1
-for(let o of t)null!=(o=e(o,++i,t))&&(o=+o)>=o&&(++n,r+=o)}if(n)return r/n}function X(t,e){return(0,V.Z)(t,.5,e)}function J(t){return Array.from(function*(t){for(const e of t)yield*e}(t))}var Q=n(4007)
-function tt(t,e){let n,r=-1,i=-1
-if(void 0===e)for(const o of t)++i,null!=o&&(n>o||void 0===n&&o>=o)&&(n=o,r=i)
-else for(let o of t)null!=(o=e(o,++i,t))&&(n>o||void 0===n&&o>=o)&&(n=o,r=i)
-return r}function et(t){let e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:nt
-const n=[]
-let r,i=!1
-for(const o of t)i&&n.push(e(r,o)),r=o,i=!0
-return n}function nt(t,e){return[t,e]}var rt=n(3767),it=n(1204)
-function ot(t){let e,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:i.Z,r=!1
-if(1===n.length){let o
-for(const a of t){const t=n(a);(r?(0,i.Z)(t,o)<0:0===(0,i.Z)(t,t))&&(e=a,o=t,r=!0)}}else for(const i of t)(r?n(i,e)<0:0===n(i,i))&&(e=i,r=!0)
-return e}function at(t){let e,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:i.Z
-if(1===n.length)return tt(t,n)
-let r=-1,o=-1
-for(const i of t)++o,(r<0?0===n(i,i):n(i,e)<0)&&(e=i,r=o)
-return r}function ut(t){let e,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:i.Z,r=!1
-if(1===n.length){let o
-for(const a of t){const t=n(a);(r?(0,i.Z)(t,o)>0:0===(0,i.Z)(t,t))&&(e=a,o=t,r=!0)}}else for(const i of t)(r?n(i,e)>0:0===n(i,i))&&(e=i,r=!0)
-return e}function ct(t){let e,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:i.Z
-if(1===n.length)return K(t,n)
-let r=-1,o=-1
-for(const i of t)++o,(r<0?0===n(i,i):n(i,e)>0)&&(e=i,r=o)
-return r}function st(t,e){const n=at(t,e)
-return n<0?void 0:n}const ft=lt(Math.random)
-function lt(t){return function(e){let n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:e.length,i=r-(n=+n)
-for(;i;){const r=t()*i--|0,o=e[i+n]
-e[i+n]=e[r+n],e[r+n]=o}return e}}function ht(t,e){let n=0
-if(void 0===e)for(let r of t)(r=+r)&&(n+=r)
-else{let r=-1
-for(let i of t)(i=+e(i,++r,t))&&(n+=i)}return n}function dt(t){if(!(i=t.length))return[]
-for(var e=-1,n=(0,Q.Z)(t,pt),r=new Array(n);++e<n;)for(var i,o=-1,a=r[e]=new Array(i);++o<i;)a[o]=t[o][e]
-return r}function pt(t){return t.length}function yt(){return dt(arguments)}function bt(t,e){if("function"!=typeof e)throw new TypeError("test is not a function")
-let n=-1
-for(const r of t)if(!e(r,++n,t))return!1
-return!0}function vt(t,e){if("function"!=typeof e)throw new TypeError("test is not a function")
-let n=-1
-for(const r of t)if(e(r,++n,t))return!0
-return!1}function gt(t,e){if("function"!=typeof e)throw new TypeError("test is not a function")
-const n=[]
-let r=-1
-for(const i of t)e(i,++r,t)&&n.push(i)
-return n}function mt(t,e){if("function"!=typeof t[Symbol.iterator])throw new TypeError("values is not iterable")
-if("function"!=typeof e)throw new TypeError("mapper is not a function")
-return Array.from(t,((n,r)=>e(n,r,t)))}function _t(t,e,n){if("function"!=typeof e)throw new TypeError("reducer is not a function")
-const r=t[Symbol.iterator]()
-let i,o,a=-1
-if(arguments.length<3){if(({done:i,value:n}=r.next()),i)return;++a}for(;({done:i,value:o}=r.next()),!i;)n=e(n,o,++a,t)
-return n}function wt(t){if("function"!=typeof t[Symbol.iterator])throw new TypeError("values is not iterable")
-return Array.from(t).reverse()}function xt(t){t=new Set(t)
-for(var e=arguments.length,n=new Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r]
-for(const i of n)for(const e of i)t.delete(e)
-return t}function At(t,e){const n=e[Symbol.iterator](),r=new Set
-for(const i of t){if(r.has(i))return!1
-let t,e
-for(;({value:t,done:e}=n.next())&&!e;){if(Object.is(i,t))return!1
-r.add(t)}}return!0}function Et(t){return t instanceof Set?t:new Set(t)}function kt(t){for(var e=arguments.length,n=new Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r]
-t=new Set(t),n=n.map(Et)
-t:for(const i of t)for(const e of n)if(!e.has(i)){t.delete(i)
-continue t}return t}function Dt(t,e){const n=t[Symbol.iterator](),r=new Set
-for(const i of e){if(r.has(i))continue
-let t,e
-for(;({value:t,done:e}=n.next());){if(e)return!1
-if(r.add(t),Object.is(i,t))break}}return!0}function Ct(t,e){return Dt(e,t)}function Ot(){const t=new Set
-for(var e=arguments.length,n=new Array(e),r=0;r<e;r++)n[r]=arguments[r]
-for(const i of n)for(const e of i)t.add(e)
-return t}},2368:(t,e,n)=>{"use strict"
-function r(t,e){let n
-if(void 0===e)for(const r of t)null!=r&&(n<r||void 0===n&&r>=r)&&(n=r)
-else{let r=-1
-for(let i of t)null!=(i=e(i,++r,t))&&(n<i||void 0===n&&i>=i)&&(n=i)}return n}n.d(e,{Z:()=>r})},4007:(t,e,n)=>{"use strict"
-function r(t,e){let n
-if(void 0===e)for(const r of t)null!=r&&(n>r||void 0===n&&r>=r)&&(n=r)
-else{let r=-1
-for(let i of t)null!=(i=e(i,++r,t))&&(n>i||void 0===n&&i>=i)&&(n=i)}return n}n.d(e,{Z:()=>r})},9750:(t,e,n)=>{"use strict"
-function r(t){return null===t?NaN:+t}function*i(t,e){if(void 0===e)for(let n of t)null!=n&&(n=+n)>=n&&(yield n)
-else{let n=-1
-for(let r of t)null!=(r=e(r,++n,t))&&(r=+r)>=r&&(yield r)}}n.d(e,{K:()=>i,Z:()=>r})},801:(t,e,n)=>{"use strict"
-n.d(e,{Z:()=>u,s:()=>c})
-var r=n(2368),i=n(4007),o=n(3767),a=n(9750)
-function u(t,e,n){if(u=(t=Float64Array.from((0,a.K)(t,n))).length){if((e=+e)<=0||u<2)return(0,i.Z)(t)
-if(e>=1)return(0,r.Z)(t)
-var u,c=(u-1)*e,s=Math.floor(c),f=(0,r.Z)((0,o.Z)(t,s).subarray(0,s+1))
-return f+((0,i.Z)(t.subarray(s+1))-f)*(c-s)}}function c(t,e){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:a.Z
-if(r=t.length){if((e=+e)<=0||r<2)return+n(t[0],0,t)
-if(e>=1)return+n(t[r-1],r-1,t)
-var r,i=(r-1)*e,o=Math.floor(i),u=+n(t[o],o,t),c=+n(t[o+1],o+1,t)
-return u+(c-u)*(i-o)}}},3767:(t,e,n)=>{"use strict"
-n.d(e,{Z:()=>i})
-var r=n(7604)
-function i(t,e){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0,a=arguments.length>3&&void 0!==arguments[3]?arguments[3]:t.length-1,u=arguments.length>4&&void 0!==arguments[4]?arguments[4]:r.Z
-for(;a>n;){if(a-n>600){const r=a-n+1,o=e-n+1,c=Math.log(r),s=.5*Math.exp(2*c/3),f=.5*Math.sqrt(c*s*(r-s)/r)*(o-r/2<0?-1:1)
-i(t,e,Math.max(n,Math.floor(e-o*s/r+f)),Math.min(a,Math.floor(e+(r-o)*s/r+f)),u)}const r=t[e]
-let c=n,s=a
-for(o(t,n,e),u(t[a],r)>0&&o(t,n,a);c<s;){for(o(t,c,s),++c,--s;u(t[c],r)<0;)++c
-for(;u(t[s],r)>0;)--s}0===u(t[n],r)?o(t,n,s):(++s,o(t,s,a)),s<=e&&(n=s+1),e<=s&&(a=s-1)}return t}function o(t,e,n){const r=t[e]
-t[e]=t[n],t[n]=r}},1204:(t,e,n)=>{"use strict"
-function r(t,e,n){t=+t,e=+e,n=(i=arguments.length)<2?(e=t,t=0,1):i<3?1:+n
-for(var r=-1,i=0|Math.max(0,Math.ceil((e-t)/n)),o=new Array(i);++r<i;)o[r]=t+r*n
-return o}n.d(e,{Z:()=>r})},458:(t,e,n)=>{"use strict"
-n.d(e,{G9:()=>u,ZP:()=>a,ly:()=>c})
-var r=Math.sqrt(50),i=Math.sqrt(10),o=Math.sqrt(2)
-function a(t,e,n){var r,i,o,a,c=-1
-if(n=+n,(t=+t)==(e=+e)&&n>0)return[t]
-if((r=e<t)&&(i=t,t=e,e=i),0===(a=u(t,e,n))||!isFinite(a))return[]
-if(a>0)for(t=Math.ceil(t/a),e=Math.floor(e/a),o=new Array(i=Math.ceil(e-t+1));++c<i;)o[c]=(t+c)*a
-else for(a=-a,t=Math.ceil(t*a),e=Math.floor(e*a),o=new Array(i=Math.ceil(e-t+1));++c<i;)o[c]=(t+c)/a
-return r&&o.reverse(),o}function u(t,e,n){var a=(e-t)/Math.max(0,n),u=Math.floor(Math.log(a)/Math.LN10),c=a/Math.pow(10,u)
-return u>=0?(c>=r?10:c>=i?5:c>=o?2:1)*Math.pow(10,u):-Math.pow(10,-u)/(c>=r?10:c>=i?5:c>=o?2:1)}function c(t,e,n){var a=Math.abs(e-t)/Math.max(0,n),u=Math.pow(10,Math.floor(Math.log(a)/Math.LN10)),c=a/u
-return c>=r?u*=10:c>=i?u*=5:c>=o&&(u*=2),e<t?-u:u}},7128:(t,e,n)=>{"use strict"
-n.d(e,{B8:()=>E,Il:()=>i,J5:()=>a,SU:()=>A,Ss:()=>k,ZP:()=>_,xV:()=>o})
-var r=n(1572)
-function i(){}var o=.7,a=1/o,u="\\s*([+-]?\\d+)\\s*",c="\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)\\s*",s="\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)%\\s*",f=/^#([0-9a-f]{3,8})$/,l=new RegExp("^rgb\\("+[u,u,u]+"\\)$"),h=new RegExp("^rgb\\("+[s,s,s]+"\\)$"),d=new RegExp("^rgba\\("+[u,u,u,c]+"\\)$"),p=new RegExp("^rgba\\("+[s,s,s,c]+"\\)$"),y=new RegExp("^hsl\\("+[c,s,s]+"\\)$"),b=new RegExp("^hsla\\("+[c,s,s,c]+"\\)$"),v={aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074}
-function g(){return this.rgb().formatHex()}function m(){return this.rgb().formatRgb()}function _(t){var e,n
-return t=(t+"").trim().toLowerCase(),(e=f.exec(t))?(n=e[1].length,e=parseInt(e[1],16),6===n?w(e):3===n?new k(e>>8&15|e>>4&240,e>>4&15|240&e,(15&e)<<4|15&e,1):8===n?x(e>>24&255,e>>16&255,e>>8&255,(255&e)/255):4===n?x(e>>12&15|e>>8&240,e>>8&15|e>>4&240,e>>4&15|240&e,((15&e)<<4|15&e)/255):null):(e=l.exec(t))?new k(e[1],e[2],e[3],1):(e=h.exec(t))?new k(255*e[1]/100,255*e[2]/100,255*e[3]/100,1):(e=d.exec(t))?x(e[1],e[2],e[3],e[4]):(e=p.exec(t))?x(255*e[1]/100,255*e[2]/100,255*e[3]/100,e[4]):(e=y.exec(t))?S(e[1],e[2]/100,e[3]/100,1):(e=b.exec(t))?S(e[1],e[2]/100,e[3]/100,e[4]):v.hasOwnProperty(t)?w(v[t]):"transparent"===t?new k(NaN,NaN,NaN,0):null}function w(t){return new k(t>>16&255,t>>8&255,255&t,1)}function x(t,e,n,r){return r<=0&&(t=e=n=NaN),new k(t,e,n,r)}function A(t){return t instanceof i||(t=_(t)),t?new k((t=t.rgb()).r,t.g,t.b,t.opacity):new k}function E(t,e,n,r){return 1===arguments.length?A(t):new k(t,e,n,null==r?1:r)}function k(t,e,n,r){this.r=+t,this.g=+e,this.b=+n,this.opacity=+r}function D(){return"#"+O(this.r)+O(this.g)+O(this.b)}function C(){var t=this.opacity
-return(1===(t=isNaN(t)?1:Math.max(0,Math.min(1,t)))?"rgb(":"rgba(")+Math.max(0,Math.min(255,Math.round(this.r)||0))+", "+Math.max(0,Math.min(255,Math.round(this.g)||0))+", "+Math.max(0,Math.min(255,Math.round(this.b)||0))+(1===t?")":", "+t+")")}function O(t){return((t=Math.max(0,Math.min(255,Math.round(t)||0)))<16?"0":"")+t.toString(16)}function S(t,e,n,r){return r<=0?t=e=n=NaN:n<=0||n>=1?t=e=NaN:e<=0&&(t=NaN),new F(t,e,n,r)}function M(t){if(t instanceof F)return new F(t.h,t.s,t.l,t.opacity)
-if(t instanceof i||(t=_(t)),!t)return new F
-if(t instanceof F)return t
-var e=(t=t.rgb()).r/255,n=t.g/255,r=t.b/255,o=Math.min(e,n,r),a=Math.max(e,n,r),u=NaN,c=a-o,s=(a+o)/2
-return c?(u=e===a?(n-r)/c+6*(n<r):n===a?(r-e)/c+2:(e-n)/c+4,c/=s<.5?a+o:2-a-o,u*=60):c=s>0&&s<1?0:u,new F(u,c,s,t.opacity)}function F(t,e,n,r){this.h=+t,this.s=+e,this.l=+n,this.opacity=+r}function T(t,e,n){return 255*(t<60?e+(n-e)*t/60:t<180?n:t<240?e+(n-e)*(240-t)/60:e)}(0,r.Z)(i,_,{copy:function(t){return Object.assign(new this.constructor,this,t)},displayable:function(){return this.rgb().displayable()},hex:g,formatHex:g,formatHsl:function(){return M(this).formatHsl()},formatRgb:m,toString:m}),(0,r.Z)(k,E,(0,r.l)(i,{brighter:function(t){return t=null==t?a:Math.pow(a,t),new k(this.r*t,this.g*t,this.b*t,this.opacity)},darker:function(t){return t=null==t?o:Math.pow(o,t),new k(this.r*t,this.g*t,this.b*t,this.opacity)},rgb:function(){return this},displayable:function(){return-.5<=this.r&&this.r<255.5&&-.5<=this.g&&this.g<255.5&&-.5<=this.b&&this.b<255.5&&0<=this.opacity&&this.opacity<=1},hex:D,formatHex:D,formatRgb:C,toString:C})),(0,r.Z)(F,(function(t,e,n,r){return 1===arguments.length?M(t):new F(t,e,n,null==r?1:r)}),(0,r.l)(i,{brighter:function(t){return t=null==t?a:Math.pow(a,t),new F(this.h,this.s,this.l*t,this.opacity)},darker:function(t){return t=null==t?o:Math.pow(o,t),new F(this.h,this.s,this.l*t,this.opacity)},rgb:function(){var t=this.h%360+360*(this.h<0),e=isNaN(t)||isNaN(this.s)?0:this.s,n=this.l,r=n+(n<.5?n:1-n)*e,i=2*n-r
-return new k(T(t>=240?t-240:t+120,i,r),T(t,i,r),T(t<120?t+240:t-120,i,r),this.opacity)},displayable:function(){return(0<=this.s&&this.s<=1||isNaN(this.s))&&0<=this.l&&this.l<=1&&0<=this.opacity&&this.opacity<=1},formatHsl:function(){var t=this.opacity
-return(1===(t=isNaN(t)?1:Math.max(0,Math.min(1,t)))?"hsl(":"hsla(")+(this.h||0)+", "+100*(this.s||0)+"%, "+100*(this.l||0)+"%"+(1===t?")":", "+t+")")}}))},1572:(t,e,n)=>{"use strict"
-function r(t,e,n){t.prototype=e.prototype=n,n.constructor=t}function i(t,e){var n=Object.create(t.prototype)
-for(var r in e)n[r]=e[r]
-return n}n.d(e,{Z:()=>r,l:()=>i})},901:(t,e,n)=>{"use strict"
-n.d(e,{ZP:()=>u,wx:()=>o,yi:()=>a})
-var r=n(6436)
-function i(t,e){return function(n){return t+n*e}}function o(t,e){var n=e-t
-return n?i(t,n>180||n<-180?n-360*Math.round(n/360):n):(0,r.Z)(isNaN(t)?e:t)}function a(t){return 1==(t=+t)?u:function(e,n){return n-e?function(t,e,n){return t=Math.pow(t,n),e=Math.pow(e,n)-t,n=1/n,function(r){return Math.pow(t+r*e,n)}}(e,n,t):(0,r.Z)(isNaN(e)?n:e)}}function u(t,e){var n=e-t
-return n?i(t,n):(0,r.Z)(isNaN(t)?e:t)}},6436:(t,e,n)=>{"use strict"
-n.d(e,{Z:()=>r})
-const r=t=>()=>t},9663:(t,e,n)=>{"use strict"
-n.d(e,{ZP:()=>a,hD:()=>c})
-var r=n(7128)
-function i(t,e,n,r,i){var o=t*t,a=o*t
-return((1-3*t+3*o-a)*e+(4-6*o+3*a)*n+(1+3*t+3*o-3*a)*r+a*i)/6}var o=n(901)
-const a=function t(e){var n=(0,o.yi)(e)
-function i(t,e){var i=n((t=(0,r.B8)(t)).r,(e=(0,r.B8)(e)).r),a=n(t.g,e.g),u=n(t.b,e.b),c=(0,o.ZP)(t.opacity,e.opacity)
-return function(e){return t.r=i(e),t.g=a(e),t.b=u(e),t.opacity=c(e),t+""}}return i.gamma=t,i}(1)
-function u(t){return function(e){var n,i,o=e.length,a=new Array(o),u=new Array(o),c=new Array(o)
-for(n=0;n<o;++n)i=(0,r.B8)(e[n]),a[n]=i.r||0,u[n]=i.g||0,c[n]=i.b||0
-return a=t(a),u=t(u),c=t(c),i.opacity=1,function(t){return i.r=a(t),i.g=u(t),i.b=c(t),i+""}}}var c=u((function(t){var e=t.length-1
-return function(n){var r=n<=0?n=0:n>=1?(n=1,e-1):Math.floor(n*e),o=t[r],a=t[r+1],u=r>0?t[r-1]:2*o-a,c=r<e-1?t[r+2]:2*a-o
-return i((n-r/e)*e,u,o,a,c)}}))
-u((function(t){var e=t.length
-return function(n){var r=Math.floor(((n%=1)<0?++n:n)*e),o=t[(r+e-1)%e],a=t[r%e],u=t[(r+1)%e],c=t[(r+2)%e]
-return i((n-r/e)*e,o,a,u,c)}}))},9677:(t,e,n)=>{"use strict"
-function r(t){for(var e=t.length/6|0,n=new Array(e),r=0;r<e;)n[r]="#"+t.slice(6*r,6*++r)
-return n}n.r(e),n.d(e,{interpolateBlues:()=>ot,interpolateBrBG:()=>v,interpolateBuGn:()=>j,interpolateBuPu:()=>R,interpolateCividis:()=>bt,interpolateCool:()=>Rt,interpolateCubehelixDefault:()=>jt,interpolateGnBu:()=>I,interpolateGreens:()=>ut,interpolateGreys:()=>st,interpolateInferno:()=>Gt,interpolateMagma:()=>Yt,interpolateOrRd:()=>U,interpolateOranges:()=>yt,interpolatePRGn:()=>m,interpolatePiYG:()=>w,interpolatePlasma:()=>Kt,interpolatePuBu:()=>V,interpolatePuBuGn:()=>Z,interpolatePuOr:()=>A,interpolatePuRd:()=>Y,interpolatePurples:()=>lt,interpolateRainbow:()=>It,interpolateRdBu:()=>k,interpolateRdGy:()=>C,interpolateRdPu:()=>K,interpolateRdYlBu:()=>S,interpolateRdYlGn:()=>F,interpolateReds:()=>dt,interpolateSinebow:()=>Zt,interpolateSpectral:()=>B,interpolateTurbo:()=>qt,interpolateViridis:()=>Ht,interpolateWarm:()=>Nt,interpolateYlGn:()=>Q,interpolateYlGnBu:()=>X,interpolateYlOrBr:()=>et,interpolateYlOrRd:()=>rt,schemeAccent:()=>o,schemeBlues:()=>it,schemeBrBG:()=>b,schemeBuGn:()=>P,schemeBuPu:()=>N,schemeCategory10:()=>i,schemeDark2:()=>a,schemeGnBu:()=>L,schemeGreens:()=>at,schemeGreys:()=>ct,schemeOrRd:()=>$,schemeOranges:()=>pt,schemePRGn:()=>g,schemePaired:()=>u,schemePastel1:()=>c,schemePastel2:()=>s,schemePiYG:()=>_,schemePuBu:()=>q,schemePuBuGn:()=>z,schemePuOr:()=>x,schemePuRd:()=>H,schemePurples:()=>ft,schemeRdBu:()=>E,schemeRdGy:()=>D,schemeRdPu:()=>G,schemeRdYlBu:()=>O,schemeRdYlGn:()=>M,schemeReds:()=>ht,schemeSet1:()=>f,schemeSet2:()=>l,schemeSet3:()=>h,schemeSpectral:()=>T,schemeTableau10:()=>d,schemeYlGn:()=>J,schemeYlGnBu:()=>W,schemeYlOrBr:()=>tt,schemeYlOrRd:()=>nt})
-const i=r("1f77b4ff7f0e2ca02cd627289467bd8c564be377c27f7f7fbcbd2217becf"),o=r("7fc97fbeaed4fdc086ffff99386cb0f0027fbf5b17666666"),a=r("1b9e77d95f027570b3e7298a66a61ee6ab02a6761d666666"),u=r("a6cee31f78b4b2df8a33a02cfb9a99e31a1cfdbf6fff7f00cab2d66a3d9affff99b15928"),c=r("fbb4aeb3cde3ccebc5decbe4fed9a6ffffcce5d8bdfddaecf2f2f2"),s=r("b3e2cdfdcdaccbd5e8f4cae4e6f5c9fff2aef1e2cccccccc"),f=r("e41a1c377eb84daf4a984ea3ff7f00ffff33a65628f781bf999999"),l=r("66c2a5fc8d628da0cbe78ac3a6d854ffd92fe5c494b3b3b3"),h=r("8dd3c7ffffb3bebadafb807280b1d3fdb462b3de69fccde5d9d9d9bc80bdccebc5ffed6f"),d=r("4e79a7f28e2ce1575976b7b259a14fedc949af7aa1ff9da79c755fbab0ab")
-var p=n(9663)
-const y=t=>(0,p.hD)(t[t.length-1])
-var b=new Array(3).concat("d8b365f5f5f55ab4ac","a6611adfc27d80cdc1018571","a6611adfc27df5f5f580cdc1018571","8c510ad8b365f6e8c3c7eae55ab4ac01665e","8c510ad8b365f6e8c3f5f5f5c7eae55ab4ac01665e","8c510abf812ddfc27df6e8c3c7eae580cdc135978f01665e","8c510abf812ddfc27df6e8c3f5f5f5c7eae580cdc135978f01665e","5430058c510abf812ddfc27df6e8c3c7eae580cdc135978f01665e003c30","5430058c510abf812ddfc27df6e8c3f5f5f5c7eae580cdc135978f01665e003c30").map(r)
-const v=y(b)
-var g=new Array(3).concat("af8dc3f7f7f77fbf7b","7b3294c2a5cfa6dba0008837","7b3294c2a5cff7f7f7a6dba0008837","762a83af8dc3e7d4e8d9f0d37fbf7b1b7837","762a83af8dc3e7d4e8f7f7f7d9f0d37fbf7b1b7837","762a839970abc2a5cfe7d4e8d9f0d3a6dba05aae611b7837","762a839970abc2a5cfe7d4e8f7f7f7d9f0d3a6dba05aae611b7837","40004b762a839970abc2a5cfe7d4e8d9f0d3a6dba05aae611b783700441b","40004b762a839970abc2a5cfe7d4e8f7f7f7d9f0d3a6dba05aae611b783700441b").map(r)
-const m=y(g)
-var _=new Array(3).concat("e9a3c9f7f7f7a1d76a","d01c8bf1b6dab8e1864dac26","d01c8bf1b6daf7f7f7b8e1864dac26","c51b7de9a3c9fde0efe6f5d0a1d76a4d9221","c51b7de9a3c9fde0eff7f7f7e6f5d0a1d76a4d9221","c51b7dde77aef1b6dafde0efe6f5d0b8e1867fbc414d9221","c51b7dde77aef1b6dafde0eff7f7f7e6f5d0b8e1867fbc414d9221","8e0152c51b7dde77aef1b6dafde0efe6f5d0b8e1867fbc414d9221276419","8e0152c51b7dde77aef1b6dafde0eff7f7f7e6f5d0b8e1867fbc414d9221276419").map(r)
-const w=y(_)
-var x=new Array(3).concat("998ec3f7f7f7f1a340","5e3c99b2abd2fdb863e66101","5e3c99b2abd2f7f7f7fdb863e66101","542788998ec3d8daebfee0b6f1a340b35806","542788998ec3d8daebf7f7f7fee0b6f1a340b35806","5427888073acb2abd2d8daebfee0b6fdb863e08214b35806","5427888073acb2abd2d8daebf7f7f7fee0b6fdb863e08214b35806","2d004b5427888073acb2abd2d8daebfee0b6fdb863e08214b358067f3b08","2d004b5427888073acb2abd2d8daebf7f7f7fee0b6fdb863e08214b358067f3b08").map(r)
-const A=y(x)
-var E=new Array(3).concat("ef8a62f7f7f767a9cf","ca0020f4a58292c5de0571b0","ca0020f4a582f7f7f792c5de0571b0","b2182bef8a62fddbc7d1e5f067a9cf2166ac","b2182bef8a62fddbc7f7f7f7d1e5f067a9cf2166ac","b2182bd6604df4a582fddbc7d1e5f092c5de4393c32166ac","b2182bd6604df4a582fddbc7f7f7f7d1e5f092c5de4393c32166ac","67001fb2182bd6604df4a582fddbc7d1e5f092c5de4393c32166ac053061","67001fb2182bd6604df4a582fddbc7f7f7f7d1e5f092c5de4393c32166ac053061").map(r)
-const k=y(E)
-var D=new Array(3).concat("ef8a62ffffff999999","ca0020f4a582bababa404040","ca0020f4a582ffffffbababa404040","b2182bef8a62fddbc7e0e0e09999994d4d4d","b2182bef8a62fddbc7ffffffe0e0e09999994d4d4d","b2182bd6604df4a582fddbc7e0e0e0bababa8787874d4d4d","b2182bd6604df4a582fddbc7ffffffe0e0e0bababa8787874d4d4d","67001fb2182bd6604df4a582fddbc7e0e0e0bababa8787874d4d4d1a1a1a","67001fb2182bd6604df4a582fddbc7ffffffe0e0e0bababa8787874d4d4d1a1a1a").map(r)
-const C=y(D)
-var O=new Array(3).concat("fc8d59ffffbf91bfdb","d7191cfdae61abd9e92c7bb6","d7191cfdae61ffffbfabd9e92c7bb6","d73027fc8d59fee090e0f3f891bfdb4575b4","d73027fc8d59fee090ffffbfe0f3f891bfdb4575b4","d73027f46d43fdae61fee090e0f3f8abd9e974add14575b4","d73027f46d43fdae61fee090ffffbfe0f3f8abd9e974add14575b4","a50026d73027f46d43fdae61fee090e0f3f8abd9e974add14575b4313695","a50026d73027f46d43fdae61fee090ffffbfe0f3f8abd9e974add14575b4313695").map(r)
-const S=y(O)
-var M=new Array(3).concat("fc8d59ffffbf91cf60","d7191cfdae61a6d96a1a9641","d7191cfdae61ffffbfa6d96a1a9641","d73027fc8d59fee08bd9ef8b91cf601a9850","d73027fc8d59fee08bffffbfd9ef8b91cf601a9850","d73027f46d43fdae61fee08bd9ef8ba6d96a66bd631a9850","d73027f46d43fdae61fee08bffffbfd9ef8ba6d96a66bd631a9850","a50026d73027f46d43fdae61fee08bd9ef8ba6d96a66bd631a9850006837","a50026d73027f46d43fdae61fee08bffffbfd9ef8ba6d96a66bd631a9850006837").map(r)
-const F=y(M)
-var T=new Array(3).concat("fc8d59ffffbf99d594","d7191cfdae61abdda42b83ba","d7191cfdae61ffffbfabdda42b83ba","d53e4ffc8d59fee08be6f59899d5943288bd","d53e4ffc8d59fee08bffffbfe6f59899d5943288bd","d53e4ff46d43fdae61fee08be6f598abdda466c2a53288bd","d53e4ff46d43fdae61fee08bffffbfe6f598abdda466c2a53288bd","9e0142d53e4ff46d43fdae61fee08be6f598abdda466c2a53288bd5e4fa2","9e0142d53e4ff46d43fdae61fee08bffffbfe6f598abdda466c2a53288bd5e4fa2").map(r)
-const B=y(T)
-var P=new Array(3).concat("e5f5f999d8c92ca25f","edf8fbb2e2e266c2a4238b45","edf8fbb2e2e266c2a42ca25f006d2c","edf8fbccece699d8c966c2a42ca25f006d2c","edf8fbccece699d8c966c2a441ae76238b45005824","f7fcfde5f5f9ccece699d8c966c2a441ae76238b45005824","f7fcfde5f5f9ccece699d8c966c2a441ae76238b45006d2c00441b").map(r)
-const j=y(P)
-var N=new Array(3).concat("e0ecf49ebcda8856a7","edf8fbb3cde38c96c688419d","edf8fbb3cde38c96c68856a7810f7c","edf8fbbfd3e69ebcda8c96c68856a7810f7c","edf8fbbfd3e69ebcda8c96c68c6bb188419d6e016b","f7fcfde0ecf4bfd3e69ebcda8c96c68c6bb188419d6e016b","f7fcfde0ecf4bfd3e69ebcda8c96c68c6bb188419d810f7c4d004b").map(r)
-const R=y(N)
-var L=new Array(3).concat("e0f3dba8ddb543a2ca","f0f9e8bae4bc7bccc42b8cbe","f0f9e8bae4bc7bccc443a2ca0868ac","f0f9e8ccebc5a8ddb57bccc443a2ca0868ac","f0f9e8ccebc5a8ddb57bccc44eb3d32b8cbe08589e","f7fcf0e0f3dbccebc5a8ddb57bccc44eb3d32b8cbe08589e","f7fcf0e0f3dbccebc5a8ddb57bccc44eb3d32b8cbe0868ac084081").map(r)
-const I=y(L)
-var $=new Array(3).concat("fee8c8fdbb84e34a33","fef0d9fdcc8afc8d59d7301f","fef0d9fdcc8afc8d59e34a33b30000","fef0d9fdd49efdbb84fc8d59e34a33b30000","fef0d9fdd49efdbb84fc8d59ef6548d7301f990000","fff7ecfee8c8fdd49efdbb84fc8d59ef6548d7301f990000","fff7ecfee8c8fdd49efdbb84fc8d59ef6548d7301fb300007f0000").map(r)
-const U=y($)
-var z=new Array(3).concat("ece2f0a6bddb1c9099","f6eff7bdc9e167a9cf02818a","f6eff7bdc9e167a9cf1c9099016c59","f6eff7d0d1e6a6bddb67a9cf1c9099016c59","f6eff7d0d1e6a6bddb67a9cf3690c002818a016450","fff7fbece2f0d0d1e6a6bddb67a9cf3690c002818a016450","fff7fbece2f0d0d1e6a6bddb67a9cf3690c002818a016c59014636").map(r)
-const Z=y(z)
-var q=new Array(3).concat("ece7f2a6bddb2b8cbe","f1eef6bdc9e174a9cf0570b0","f1eef6bdc9e174a9cf2b8cbe045a8d","f1eef6d0d1e6a6bddb74a9cf2b8cbe045a8d","f1eef6d0d1e6a6bddb74a9cf3690c00570b0034e7b","fff7fbece7f2d0d1e6a6bddb74a9cf3690c00570b0034e7b","fff7fbece7f2d0d1e6a6bddb74a9cf3690c00570b0045a8d023858").map(r)
-const V=y(q)
-var H=new Array(3).concat("e7e1efc994c7dd1c77","f1eef6d7b5d8df65b0ce1256","f1eef6d7b5d8df65b0dd1c77980043","f1eef6d4b9dac994c7df65b0dd1c77980043","f1eef6d4b9dac994c7df65b0e7298ace125691003f","f7f4f9e7e1efd4b9dac994c7df65b0e7298ace125691003f","f7f4f9e7e1efd4b9dac994c7df65b0e7298ace125698004367001f").map(r)
-const Y=y(H)
-var G=new Array(3).concat("fde0ddfa9fb5c51b8a","feebe2fbb4b9f768a1ae017e","feebe2fbb4b9f768a1c51b8a7a0177","feebe2fcc5c0fa9fb5f768a1c51b8a7a0177","feebe2fcc5c0fa9fb5f768a1dd3497ae017e7a0177","fff7f3fde0ddfcc5c0fa9fb5f768a1dd3497ae017e7a0177","fff7f3fde0ddfcc5c0fa9fb5f768a1dd3497ae017e7a017749006a").map(r)
-const K=y(G)
-var W=new Array(3).concat("edf8b17fcdbb2c7fb8","ffffcca1dab441b6c4225ea8","ffffcca1dab441b6c42c7fb8253494","ffffccc7e9b47fcdbb41b6c42c7fb8253494","ffffccc7e9b47fcdbb41b6c41d91c0225ea80c2c84","ffffd9edf8b1c7e9b47fcdbb41b6c41d91c0225ea80c2c84","ffffd9edf8b1c7e9b47fcdbb41b6c41d91c0225ea8253494081d58").map(r)
-const X=y(W)
-var J=new Array(3).concat("f7fcb9addd8e31a354","ffffccc2e69978c679238443","ffffccc2e69978c67931a354006837","ffffccd9f0a3addd8e78c67931a354006837","ffffccd9f0a3addd8e78c67941ab5d238443005a32","ffffe5f7fcb9d9f0a3addd8e78c67941ab5d238443005a32","ffffe5f7fcb9d9f0a3addd8e78c67941ab5d238443006837004529").map(r)
-const Q=y(J)
-var tt=new Array(3).concat("fff7bcfec44fd95f0e","ffffd4fed98efe9929cc4c02","ffffd4fed98efe9929d95f0e993404","ffffd4fee391fec44ffe9929d95f0e993404","ffffd4fee391fec44ffe9929ec7014cc4c028c2d04","ffffe5fff7bcfee391fec44ffe9929ec7014cc4c028c2d04","ffffe5fff7bcfee391fec44ffe9929ec7014cc4c02993404662506").map(r)
-const et=y(tt)
-var nt=new Array(3).concat("ffeda0feb24cf03b20","ffffb2fecc5cfd8d3ce31a1c","ffffb2fecc5cfd8d3cf03b20bd0026","ffffb2fed976feb24cfd8d3cf03b20bd0026","ffffb2fed976feb24cfd8d3cfc4e2ae31a1cb10026","ffffccffeda0fed976feb24cfd8d3cfc4e2ae31a1cb10026","ffffccffeda0fed976feb24cfd8d3cfc4e2ae31a1cbd0026800026").map(r)
-const rt=y(nt)
-var it=new Array(3).concat("deebf79ecae13182bd","eff3ffbdd7e76baed62171b5","eff3ffbdd7e76baed63182bd08519c","eff3ffc6dbef9ecae16baed63182bd08519c","eff3ffc6dbef9ecae16baed64292c62171b5084594","f7fbffdeebf7c6dbef9ecae16baed64292c62171b5084594","f7fbffdeebf7c6dbef9ecae16baed64292c62171b508519c08306b").map(r)
-const ot=y(it)
-var at=new Array(3).concat("e5f5e0a1d99b31a354","edf8e9bae4b374c476238b45","edf8e9bae4b374c47631a354006d2c","edf8e9c7e9c0a1d99b74c47631a354006d2c","edf8e9c7e9c0a1d99b74c47641ab5d238b45005a32","f7fcf5e5f5e0c7e9c0a1d99b74c47641ab5d238b45005a32","f7fcf5e5f5e0c7e9c0a1d99b74c47641ab5d238b45006d2c00441b").map(r)
-const ut=y(at)
-var ct=new Array(3).concat("f0f0f0bdbdbd636363","f7f7f7cccccc969696525252","f7f7f7cccccc969696636363252525","f7f7f7d9d9d9bdbdbd969696636363252525","f7f7f7d9d9d9bdbdbd969696737373525252252525","fffffff0f0f0d9d9d9bdbdbd969696737373525252252525","fffffff0f0f0d9d9d9bdbdbd969696737373525252252525000000").map(r)
-const st=y(ct)
-var ft=new Array(3).concat("efedf5bcbddc756bb1","f2f0f7cbc9e29e9ac86a51a3","f2f0f7cbc9e29e9ac8756bb154278f","f2f0f7dadaebbcbddc9e9ac8756bb154278f","f2f0f7dadaebbcbddc9e9ac8807dba6a51a34a1486","fcfbfdefedf5dadaebbcbddc9e9ac8807dba6a51a34a1486","fcfbfdefedf5dadaebbcbddc9e9ac8807dba6a51a354278f3f007d").map(r)
-const lt=y(ft)
-var ht=new Array(3).concat("fee0d2fc9272de2d26","fee5d9fcae91fb6a4acb181d","fee5d9fcae91fb6a4ade2d26a50f15","fee5d9fcbba1fc9272fb6a4ade2d26a50f15","fee5d9fcbba1fc9272fb6a4aef3b2ccb181d99000d","fff5f0fee0d2fcbba1fc9272fb6a4aef3b2ccb181d99000d","fff5f0fee0d2fcbba1fc9272fb6a4aef3b2ccb181da50f1567000d").map(r)
-const dt=y(ht)
-var pt=new Array(3).concat("fee6cefdae6be6550d","feeddefdbe85fd8d3cd94701","feeddefdbe85fd8d3ce6550da63603","feeddefdd0a2fdae6bfd8d3ce6550da63603","feeddefdd0a2fdae6bfd8d3cf16913d948018c2d04","fff5ebfee6cefdd0a2fdae6bfd8d3cf16913d948018c2d04","fff5ebfee6cefdd0a2fdae6bfd8d3cf16913d94801a636037f2704").map(r)
-const yt=y(pt)
-function bt(t){return t=Math.max(0,Math.min(1,t)),"rgb("+Math.max(0,Math.min(255,Math.round(-4.54-t*(35.34-t*(2381.73-t*(6402.7-t*(7024.72-2710.57*t)))))))+", "+Math.max(0,Math.min(255,Math.round(32.49+t*(170.73+t*(52.82-t*(131.46-t*(176.58-67.37*t)))))))+", "+Math.max(0,Math.min(255,Math.round(81.24+t*(442.36-t*(2482.43-t*(6167.24-t*(6614.94-2475.67*t)))))))+")"}var vt=n(1572),gt=n(7128)
-const mt=Math.PI/180,_t=180/Math.PI
-var wt=-.14861,xt=1.78277,At=-.29227,Et=-.90649,kt=1.97294,Dt=kt*Et,Ct=kt*xt,Ot=xt*At-Et*wt
-function St(t){if(t instanceof Ft)return new Ft(t.h,t.s,t.l,t.opacity)
-t instanceof gt.Ss||(t=(0,gt.SU)(t))
-var e=t.r/255,n=t.g/255,r=t.b/255,i=(Ot*r+Dt*e-Ct*n)/(Ot+Dt-Ct),o=r-i,a=(kt*(n-i)-At*o)/Et,u=Math.sqrt(a*a+o*o)/(kt*i*(1-i)),c=u?Math.atan2(a,o)*_t-120:NaN
-return new Ft(c<0?c+360:c,u,i,t.opacity)}function Mt(t,e,n,r){return 1===arguments.length?St(t):new Ft(t,e,n,null==r?1:r)}function Ft(t,e,n,r){this.h=+t,this.s=+e,this.l=+n,this.opacity=+r}(0,vt.Z)(Ft,Mt,(0,vt.l)(gt.Il,{brighter:function(t){return t=null==t?gt.J5:Math.pow(gt.J5,t),new Ft(this.h,this.s,this.l*t,this.opacity)},darker:function(t){return t=null==t?gt.xV:Math.pow(gt.xV,t),new Ft(this.h,this.s,this.l*t,this.opacity)},rgb:function(){var t=isNaN(this.h)?0:(this.h+120)*mt,e=+this.l,n=isNaN(this.s)?0:this.s*e*(1-e),r=Math.cos(t),i=Math.sin(t)
-return new gt.Ss(255*(e+n*(wt*r+xt*i)),255*(e+n*(At*r+Et*i)),255*(e+n*(kt*r)),this.opacity)}}))
-var Tt=n(901)
-function Bt(t){return function e(n){function r(e,r){var i=t((e=Mt(e)).h,(r=Mt(r)).h),o=(0,Tt.ZP)(e.s,r.s),a=(0,Tt.ZP)(e.l,r.l),u=(0,Tt.ZP)(e.opacity,r.opacity)
-return function(t){return e.h=i(t),e.s=o(t),e.l=a(Math.pow(t,n)),e.opacity=u(t),e+""}}return n=+n,r.gamma=e,r}(1)}Bt(Tt.wx)
-var Pt=Bt(Tt.ZP)
-const jt=Pt(Mt(300,.5,0),Mt(-240,.5,1))
-var Nt=Pt(Mt(-100,.75,.35),Mt(80,1.5,.8)),Rt=Pt(Mt(260,.75,.35),Mt(80,1.5,.8)),Lt=Mt()
-function It(t){(t<0||t>1)&&(t-=Math.floor(t))
-var e=Math.abs(t-.5)
-return Lt.h=360*t-100,Lt.s=1.5-1.5*e,Lt.l=.8-.9*e,Lt+""}var $t=(0,gt.B8)(),Ut=Math.PI/3,zt=2*Math.PI/3
-function Zt(t){var e
-return t=(.5-t)*Math.PI,$t.r=255*(e=Math.sin(t))*e,$t.g=255*(e=Math.sin(t+Ut))*e,$t.b=255*(e=Math.sin(t+zt))*e,$t+""}function qt(t){return t=Math.max(0,Math.min(1,t)),"rgb("+Math.max(0,Math.min(255,Math.round(34.61+t*(1172.33-t*(10793.56-t*(33300.12-t*(38394.49-14825.05*t)))))))+", "+Math.max(0,Math.min(255,Math.round(23.31+t*(557.33+t*(1225.33-t*(3574.96-t*(1073.77+707.56*t)))))))+", "+Math.max(0,Math.min(255,Math.round(27.2+t*(3211.1-t*(15327.97-t*(27814-t*(22569.18-6838.66*t)))))))+")"}function Vt(t){var e=t.length
-return function(n){return t[Math.max(0,Math.min(e-1,Math.floor(n*e)))]}}const Ht=Vt(r("44015444025645045745055946075a46085c460a5d460b5e470d60470e6147106347116447136548146748166848176948186a481a6c481b6d481c6e481d6f481f70482071482173482374482475482576482677482878482979472a7a472c7a472d7b472e7c472f7d46307e46327e46337f463480453581453781453882443983443a83443b84433d84433e85423f854240864241864142874144874045884046883f47883f48893e49893e4a893e4c8a3d4d8a3d4e8a3c4f8a3c508b3b518b3b528b3a538b3a548c39558c39568c38588c38598c375a8c375b8d365c8d365d8d355e8d355f8d34608d34618d33628d33638d32648e32658e31668e31678e31688e30698e306a8e2f6b8e2f6c8e2e6d8e2e6e8e2e6f8e2d708e2d718e2c718e2c728e2c738e2b748e2b758e2a768e2a778e2a788e29798e297a8e297b8e287c8e287d8e277e8e277f8e27808e26818e26828e26828e25838e25848e25858e24868e24878e23888e23898e238a8d228b8d228c8d228d8d218e8d218f8d21908d21918c20928c20928c20938c1f948c1f958b1f968b1f978b1f988b1f998a1f9a8a1e9b8a1e9c891e9d891f9e891f9f881fa0881fa1881fa1871fa28720a38620a48621a58521a68522a78522a88423a98324aa8325ab8225ac8226ad8127ad8128ae8029af7f2ab07f2cb17e2db27d2eb37c2fb47c31b57b32b67a34b67935b77937b87838b9773aba763bbb753dbc743fbc7340bd7242be7144bf7046c06f48c16e4ac16d4cc26c4ec36b50c46a52c56954c56856c66758c7655ac8645cc8635ec96260ca6063cb5f65cb5e67cc5c69cd5b6ccd5a6ece5870cf5773d05675d05477d1537ad1517cd2507fd34e81d34d84d44b86d54989d5488bd6468ed64590d74393d74195d84098d83e9bd93c9dd93ba0da39a2da37a5db36a8db34aadc32addc30b0dd2fb2dd2db5de2bb8de29bade28bddf26c0df25c2df23c5e021c8e020cae11fcde11dd0e11cd2e21bd5e21ad8e219dae319dde318dfe318e2e418e5e419e7e419eae51aece51befe51cf1e51df4e61ef6e620f8e621fbe723fde725"))
-var Yt=Vt(r("00000401000501010601010802010902020b02020d03030f03031204041405041606051806051a07061c08071e0907200a08220b09240c09260d0a290e0b2b100b2d110c2f120d31130d34140e36150e38160f3b180f3d19103f1a10421c10441d11471e114920114b21114e22115024125325125527125829115a2a115c2c115f2d11612f116331116533106734106936106b38106c390f6e3b0f703d0f713f0f72400f74420f75440f764510774710784910784a10794c117a4e117b4f127b51127c52137c54137d56147d57157e59157e5a167e5c167f5d177f5f187f601880621980641a80651a80671b80681c816a1c816b1d816d1d816e1e81701f81721f817320817521817621817822817922827b23827c23827e24828025828125818326818426818627818827818928818b29818c29818e2a81902a81912b81932b80942c80962c80982d80992d809b2e7f9c2e7f9e2f7fa02f7fa1307ea3307ea5317ea6317da8327daa337dab337cad347cae347bb0357bb2357bb3367ab5367ab73779b83779ba3878bc3978bd3977bf3a77c03a76c23b75c43c75c53c74c73d73c83e73ca3e72cc3f71cd4071cf4070d0416fd2426fd3436ed5446dd6456cd8456cd9466bdb476adc4869de4968df4a68e04c67e24d66e34e65e44f64e55064e75263e85362e95462ea5661eb5760ec5860ed5a5fee5b5eef5d5ef05f5ef1605df2625df2645cf3655cf4675cf4695cf56b5cf66c5cf66e5cf7705cf7725cf8745cf8765cf9785df9795df97b5dfa7d5efa7f5efa815ffb835ffb8560fb8761fc8961fc8a62fc8c63fc8e64fc9065fd9266fd9467fd9668fd9869fd9a6afd9b6bfe9d6cfe9f6dfea16efea36ffea571fea772fea973feaa74feac76feae77feb078feb27afeb47bfeb67cfeb77efeb97ffebb81febd82febf84fec185fec287fec488fec68afec88cfeca8dfecc8ffecd90fecf92fed194fed395fed597fed799fed89afdda9cfddc9efddea0fde0a1fde2a3fde3a5fde5a7fde7a9fde9aafdebacfcecaefceeb0fcf0b2fcf2b4fcf4b6fcf6b8fcf7b9fcf9bbfcfbbdfcfdbf")),Gt=Vt(r("00000401000501010601010802010a02020c02020e03021004031204031405041706041907051b08051d09061f0a07220b07240c08260d08290e092b10092d110a30120a32140b34150b37160b39180c3c190c3e1b0c411c0c431e0c451f0c48210c4a230c4c240c4f260c51280b53290b552b0b572d0b592f0a5b310a5c320a5e340a5f3609613809623909633b09643d09653e0966400a67420a68440a68450a69470b6a490b6a4a0c6b4c0c6b4d0d6c4f0d6c510e6c520e6d540f6d550f6d57106e59106e5a116e5c126e5d126e5f136e61136e62146e64156e65156e67166e69166e6a176e6c186e6d186e6f196e71196e721a6e741a6e751b6e771c6d781c6d7a1d6d7c1d6d7d1e6d7f1e6c801f6c82206c84206b85216b87216b88226a8a226a8c23698d23698f24699025689225689326679526679727669827669a28659b29649d29649f2a63a02a63a22b62a32c61a52c60a62d60a82e5fa92e5eab2f5ead305dae305cb0315bb1325ab3325ab43359b63458b73557b93556ba3655bc3754bd3853bf3952c03a51c13a50c33b4fc43c4ec63d4dc73e4cc83f4bca404acb4149cc4248ce4347cf4446d04545d24644d34743d44842d54a41d74b3fd84c3ed94d3dda4e3cdb503bdd513ade5238df5337e05536e15635e25734e35933e45a31e55c30e65d2fe75e2ee8602de9612bea632aeb6429eb6628ec6726ed6925ee6a24ef6c23ef6e21f06f20f1711ff1731df2741cf3761bf37819f47918f57b17f57d15f67e14f68013f78212f78410f8850ff8870ef8890cf98b0bf98c0af98e09fa9008fa9207fa9407fb9606fb9706fb9906fb9b06fb9d07fc9f07fca108fca309fca50afca60cfca80dfcaa0ffcac11fcae12fcb014fcb216fcb418fbb61afbb81dfbba1ffbbc21fbbe23fac026fac228fac42afac62df9c72ff9c932f9cb35f8cd37f8cf3af7d13df7d340f6d543f6d746f5d949f5db4cf4dd4ff4df53f4e156f3e35af3e55df2e661f2e865f2ea69f1ec6df1ed71f1ef75f1f179f2f27df2f482f3f586f3f68af4f88ef5f992f6fa96f8fb9af9fc9dfafda1fcffa4")),Kt=Vt(r("0d088710078813078916078a19068c1b068d1d068e20068f2206902406912605912805922a05932c05942e05952f059631059733059735049837049938049a3a049a3c049b3e049c3f049c41049d43039e44039e46039f48039f4903a04b03a14c02a14e02a25002a25102a35302a35502a45601a45801a45901a55b01a55c01a65e01a66001a66100a76300a76400a76600a76700a86900a86a00a86c00a86e00a86f00a87100a87201a87401a87501a87701a87801a87a02a87b02a87d03a87e03a88004a88104a78305a78405a78606a68707a68808a68a09a58b0aa58d0ba58e0ca48f0da4910ea3920fa39410a29511a19613a19814a099159f9a169f9c179e9d189d9e199da01a9ca11b9ba21d9aa31e9aa51f99a62098a72197a82296aa2395ab2494ac2694ad2793ae2892b02991b12a90b22b8fb32c8eb42e8db52f8cb6308bb7318ab83289ba3388bb3488bc3587bd3786be3885bf3984c03a83c13b82c23c81c33d80c43e7fc5407ec6417dc7427cc8437bc9447aca457acb4679cc4778cc4977cd4a76ce4b75cf4c74d04d73d14e72d24f71d35171d45270d5536fd5546ed6556dd7566cd8576bd9586ada5a6ada5b69db5c68dc5d67dd5e66de5f65de6164df6263e06363e16462e26561e26660e3685fe4695ee56a5de56b5de66c5ce76e5be76f5ae87059e97158e97257ea7457eb7556eb7655ec7754ed7953ed7a52ee7b51ef7c51ef7e50f07f4ff0804ef1814df1834cf2844bf3854bf3874af48849f48948f58b47f58c46f68d45f68f44f79044f79143f79342f89441f89540f9973ff9983ef99a3efa9b3dfa9c3cfa9e3bfb9f3afba139fba238fca338fca537fca636fca835fca934fdab33fdac33fdae32fdaf31fdb130fdb22ffdb42ffdb52efeb72dfeb82cfeba2cfebb2bfebd2afebe2afec029fdc229fdc328fdc527fdc627fdc827fdca26fdcb26fccd25fcce25fcd025fcd225fbd324fbd524fbd724fad824fada24f9dc24f9dd25f8df25f8e125f7e225f7e425f6e626f6e826f5e926f5eb27f4ed27f3ee27f3f027f2f227f1f426f1f525f0f724f0f921"))},113:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{scaleBand:()=>c,scaleDiverging:()=>ur,scaleDivergingLog:()=>cr,scaleDivergingPow:()=>fr,scaleDivergingSqrt:()=>lr,scaleDivergingSymlog:()=>sr,scaleIdentity:()=>J,scaleImplicit:()=>a,scaleLinear:()=>X,scaleLog:()=>ut,scaleOrdinal:()=>u,scalePoint:()=>f,scalePow:()=>bt,scaleQuantile:()=>At,scaleQuantize:()=>Et,scaleRadial:()=>_t,scaleSequential:()=>Qn,scaleSequentialLog:()=>tr,scaleSequentialPow:()=>nr,scaleSequentialQuantile:()=>ir,scaleSequentialSqrt:()=>rr,scaleSequentialSymlog:()=>er,scaleSqrt:()=>vt,scaleSymlog:()=>lt,scaleThreshold:()=>kt,scaleTime:()=>Zn,scaleUtc:()=>Wn,tickFormat:()=>K})
-var r=n(1204)
-function i(t,e){switch(arguments.length){case 0:break
-case 1:this.range(t)
-break
-default:this.range(e).domain(t)}return this}function o(t,e){switch(arguments.length){case 0:break
-case 1:"function"==typeof t?this.interpolator(t):this.range(t)
-break
-default:this.domain(t),"function"==typeof e?this.interpolator(e):this.range(e)}return this}const a=Symbol("implicit")
-function u(){var t=new Map,e=[],n=[],r=a
-function o(i){var o=i+"",u=t.get(o)
-if(!u){if(r!==a)return r
-t.set(o,u=e.push(i))}return n[(u-1)%n.length]}return o.domain=function(n){if(!arguments.length)return e.slice()
-e=[],t=new Map
-for(const r of n){const n=r+""
-t.has(n)||t.set(n,e.push(r))}return o},o.range=function(t){return arguments.length?(n=Array.from(t),o):n.slice()},o.unknown=function(t){return arguments.length?(r=t,o):r},o.copy=function(){return u(e,n).unknown(r)},i.apply(o,arguments),o}function c(){var t,e,n=u().unknown(void 0),o=n.domain,a=n.range,s=0,f=1,l=!1,h=0,d=0,p=.5
-function y(){var n=o().length,i=f<s,u=i?f:s,c=i?s:f
-t=(c-u)/Math.max(1,n-h+2*d),l&&(t=Math.floor(t)),u+=(c-u-t*(n-h))*p,e=t*(1-h),l&&(u=Math.round(u),e=Math.round(e))
-var y=(0,r.Z)(n).map((function(e){return u+t*e}))
-return a(i?y.reverse():y)}return delete n.unknown,n.domain=function(t){return arguments.length?(o(t),y()):o()},n.range=function(t){return arguments.length?([s,f]=t,s=+s,f=+f,y()):[s,f]},n.rangeRound=function(t){return[s,f]=t,s=+s,f=+f,l=!0,y()},n.bandwidth=function(){return e},n.step=function(){return t},n.round=function(t){return arguments.length?(l=!!t,y()):l},n.padding=function(t){return arguments.length?(h=Math.min(1,d=+t),y()):h},n.paddingInner=function(t){return arguments.length?(h=Math.min(1,t),y()):h},n.paddingOuter=function(t){return arguments.length?(d=+t,y()):d},n.align=function(t){return arguments.length?(p=Math.max(0,Math.min(1,t)),y()):p},n.copy=function(){return c(o(),[s,f]).round(l).paddingInner(h).paddingOuter(d).align(p)},i.apply(y(),arguments)}function s(t){var e=t.copy
-return t.padding=t.paddingOuter,delete t.paddingInner,delete t.paddingOuter,t.copy=function(){return s(e())},t}function f(){return s(c.apply(null,arguments).paddingInner(1))}var l=n(458),h=n(4376),d=n(7128),p=n(9663)
-function y(t,e){var n,r=e?e.length:0,i=t?Math.min(r,t.length):0,o=new Array(i),a=new Array(r)
-for(n=0;n<i;++n)o[n]=E(t[n],e[n])
-for(;n<r;++n)a[n]=e[n]
-return function(t){for(n=0;n<i;++n)a[n]=o[n](t)
-return a}}function b(t,e){var n=new Date
-return t=+t,e=+e,function(r){return n.setTime(t*(1-r)+e*r),n}}function v(t,e){return t=+t,e=+e,function(n){return t*(1-n)+e*n}}function g(t,e){var n,r={},i={}
-for(n in null!==t&&"object"==typeof t||(t={}),null!==e&&"object"==typeof e||(e={}),e)n in t?r[n]=E(t[n],e[n]):i[n]=e[n]
-return function(t){for(n in r)i[n]=r[n](t)
-return i}}var m=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,_=new RegExp(m.source,"g")
-function w(t,e){var n,r,i,o=m.lastIndex=_.lastIndex=0,a=-1,u=[],c=[]
-for(t+="",e+="";(n=m.exec(t))&&(r=_.exec(e));)(i=r.index)>o&&(i=e.slice(o,i),u[a]?u[a]+=i:u[++a]=i),(n=n[0])===(r=r[0])?u[a]?u[a]+=r:u[++a]=r:(u[++a]=null,c.push({i:a,x:v(n,r)})),o=_.lastIndex
-return o<e.length&&(i=e.slice(o),u[a]?u[a]+=i:u[++a]=i),u.length<2?c[0]?function(t){return function(e){return t(e)+""}}(c[0].x):function(t){return function(){return t}}(e):(e=c.length,function(t){for(var n,r=0;r<e;++r)u[(n=c[r]).i]=n.x(t)
-return u.join("")})}var x=n(6436)
-function A(t,e){e||(e=[])
-var n,r=t?Math.min(e.length,t.length):0,i=e.slice()
-return function(o){for(n=0;n<r;++n)i[n]=t[n]*(1-o)+e[n]*o
-return i}}function E(t,e){var n,r,i=typeof e
-return null==e||"boolean"===i?(0,x.Z)(e):("number"===i?v:"string"===i?(n=(0,d.ZP)(e))?(e=n,p.ZP):w:e instanceof d.ZP?p.ZP:e instanceof Date?b:(r=e,!ArrayBuffer.isView(r)||r instanceof DataView?Array.isArray(e)?y:"function"!=typeof e.valueOf&&"function"!=typeof e.toString||isNaN(e)?g:v:A))(t,e)}function k(t,e){return t=+t,e=+e,function(n){return Math.round(t*(1-n)+e*n)}}function D(t){return+t}var C=[0,1]
-function O(t){return t}function S(t,e){return(e-=t=+t)?function(n){return(n-t)/e}:(n=isNaN(e)?NaN:.5,function(){return n})
-var n}function M(t,e,n){var r=t[0],i=t[1],o=e[0],a=e[1]
-return i<r?(r=S(i,r),o=n(a,o)):(r=S(r,i),o=n(o,a)),function(t){return o(r(t))}}function F(t,e,n){var r=Math.min(t.length,e.length)-1,i=new Array(r),o=new Array(r),a=-1
-for(t[r]<t[0]&&(t=t.slice().reverse(),e=e.slice().reverse());++a<r;)i[a]=S(t[a],t[a+1]),o[a]=n(e[a],e[a+1])
-return function(e){var n=(0,h.ZP)(t,e,1,r)-1
-return o[n](i[n](e))}}function T(t,e){return e.domain(t.domain()).range(t.range()).interpolate(t.interpolate()).clamp(t.clamp()).unknown(t.unknown())}function B(){var t,e,n,r,i,o,a=C,u=C,c=E,s=O
-function f(){var t,e,n,c=Math.min(a.length,u.length)
-return s!==O&&(t=a[0],e=a[c-1],t>e&&(n=t,t=e,e=n),s=function(n){return Math.max(t,Math.min(e,n))}),r=c>2?F:M,i=o=null,l}function l(e){return isNaN(e=+e)?n:(i||(i=r(a.map(t),u,c)))(t(s(e)))}return l.invert=function(n){return s(e((o||(o=r(u,a.map(t),v)))(n)))},l.domain=function(t){return arguments.length?(a=Array.from(t,D),f()):a.slice()},l.range=function(t){return arguments.length?(u=Array.from(t),f()):u.slice()},l.rangeRound=function(t){return u=Array.from(t),c=k,f()},l.clamp=function(t){return arguments.length?(s=!!t||O,f()):s!==O},l.interpolate=function(t){return arguments.length?(c=t,f()):c},l.unknown=function(t){return arguments.length?(n=t,l):n},function(n,r){return t=n,e=r,f()}}function P(){return B()(O,O)}var j,N=/^(?:(.)?([<>=^]))?([+\-( ])?([$#])?(0)?(\d+)?(,)?(\.\d+)?(~)?([a-z%])?$/i
-function R(t){if(!(e=N.exec(t)))throw new Error("invalid format: "+t)
-var e
-return new L({fill:e[1],align:e[2],sign:e[3],symbol:e[4],zero:e[5],width:e[6],comma:e[7],precision:e[8]&&e[8].slice(1),trim:e[9],type:e[10]})}function L(t){this.fill=void 0===t.fill?" ":t.fill+"",this.align=void 0===t.align?">":t.align+"",this.sign=void 0===t.sign?"-":t.sign+"",this.symbol=void 0===t.symbol?"":t.symbol+"",this.zero=!!t.zero,this.width=void 0===t.width?void 0:+t.width,this.comma=!!t.comma,this.precision=void 0===t.precision?void 0:+t.precision,this.trim=!!t.trim,this.type=void 0===t.type?"":t.type+""}function I(t,e){if((n=(t=e?t.toExponential(e-1):t.toExponential()).indexOf("e"))<0)return null
-var n,r=t.slice(0,n)
-return[r.length>1?r[0]+r.slice(2):r,+t.slice(n+1)]}function $(t){return(t=I(Math.abs(t)))?t[1]:NaN}function U(t,e){var n=I(t,e)
-if(!n)return t+""
-var r=n[0],i=n[1]
-return i<0?"0."+new Array(-i).join("0")+r:r.length>i+1?r.slice(0,i+1)+"."+r.slice(i+1):r+new Array(i-r.length+2).join("0")}R.prototype=L.prototype,L.prototype.toString=function(){return this.fill+this.align+this.sign+this.symbol+(this.zero?"0":"")+(void 0===this.width?"":Math.max(1,0|this.width))+(this.comma?",":"")+(void 0===this.precision?"":"."+Math.max(0,0|this.precision))+(this.trim?"~":"")+this.type}
-const z={"%":(t,e)=>(100*t).toFixed(e),b:t=>Math.round(t).toString(2),c:t=>t+"",d:function(t){return Math.abs(t=Math.round(t))>=1e21?t.toLocaleString("en").replace(/,/g,""):t.toString(10)},e:(t,e)=>t.toExponential(e),f:(t,e)=>t.toFixed(e),g:(t,e)=>t.toPrecision(e),o:t=>Math.round(t).toString(8),p:(t,e)=>U(100*t,e),r:U,s:function(t,e){var n=I(t,e)
-if(!n)return t+""
-var r=n[0],i=n[1],o=i-(j=3*Math.max(-8,Math.min(8,Math.floor(i/3))))+1,a=r.length
-return o===a?r:o>a?r+new Array(o-a+1).join("0"):o>0?r.slice(0,o)+"."+r.slice(o):"0."+new Array(1-o).join("0")+I(t,Math.max(0,e+o-1))[0]},X:t=>Math.round(t).toString(16).toUpperCase(),x:t=>Math.round(t).toString(16)}
-function Z(t){return t}var q,V,H,Y=Array.prototype.map,G=["y","z","a","f","p","n","µ","m","","k","M","G","T","P","E","Z","Y"]
-function K(t,e,n,r){var i,o=(0,l.ly)(t,e,n)
-switch((r=R(null==r?",f":r)).type){case"s":var a=Math.max(Math.abs(t),Math.abs(e))
-return null!=r.precision||isNaN(i=function(t,e){return Math.max(0,3*Math.max(-8,Math.min(8,Math.floor($(e)/3)))-$(Math.abs(t)))}(o,a))||(r.precision=i),H(r,a)
-case"":case"e":case"g":case"p":case"r":null!=r.precision||isNaN(i=function(t,e){return t=Math.abs(t),e=Math.abs(e)-t,Math.max(0,$(e)-$(t))+1}(o,Math.max(Math.abs(t),Math.abs(e))))||(r.precision=i-("e"===r.type))
-break
-case"f":case"%":null!=r.precision||isNaN(i=function(t){return Math.max(0,-$(Math.abs(t)))}(o))||(r.precision=i-2*("%"===r.type))}return V(r)}function W(t){var e=t.domain
-return t.ticks=function(t){var n=e()
-return(0,l.ZP)(n[0],n[n.length-1],null==t?10:t)},t.tickFormat=function(t,n){var r=e()
-return K(r[0],r[r.length-1],null==t?10:t,n)},t.nice=function(n){null==n&&(n=10)
-var r,i,o=e(),a=0,u=o.length-1,c=o[a],s=o[u],f=10
-for(s<c&&(i=c,c=s,s=i,i=a,a=u,u=i);f-- >0;){if((i=(0,l.G9)(c,s,n))===r)return o[a]=c,o[u]=s,e(o)
-if(i>0)c=Math.floor(c/i)*i,s=Math.ceil(s/i)*i
-else{if(!(i<0))break
-c=Math.ceil(c*i)/i,s=Math.floor(s*i)/i}r=i}return t},t}function X(){var t=P()
-return t.copy=function(){return T(t,X())},i.apply(t,arguments),W(t)}function J(t){var e
-function n(t){return isNaN(t=+t)?e:t}return n.invert=n,n.domain=n.range=function(e){return arguments.length?(t=Array.from(e,D),n):t.slice()},n.unknown=function(t){return arguments.length?(e=t,n):e},n.copy=function(){return J(t).unknown(e)},t=arguments.length?Array.from(t,D):[0,1],W(n)}function Q(t,e){var n,r=0,i=(t=t.slice()).length-1,o=t[r],a=t[i]
-return a<o&&(n=r,r=i,i=n,n=o,o=a,a=n),t[r]=e.floor(o),t[i]=e.ceil(a),t}function tt(t){return Math.log(t)}function et(t){return Math.exp(t)}function nt(t){return-Math.log(-t)}function rt(t){return-Math.exp(-t)}function it(t){return isFinite(t)?+("1e"+t):t<0?0:t}function ot(t){return function(e){return-t(-e)}}function at(t){var e,n,r=t(tt,et),i=r.domain,o=10
-function a(){return e=function(t){return t===Math.E?Math.log:10===t&&Math.log10||2===t&&Math.log2||(t=Math.log(t),function(e){return Math.log(e)/t})}(o),n=function(t){return 10===t?it:t===Math.E?Math.exp:function(e){return Math.pow(t,e)}}(o),i()[0]<0?(e=ot(e),n=ot(n),t(nt,rt)):t(tt,et),r}return r.base=function(t){return arguments.length?(o=+t,a()):o},r.domain=function(t){return arguments.length?(i(t),a()):i()},r.ticks=function(t){var r,a=i(),u=a[0],c=a[a.length-1];(r=c<u)&&(d=u,u=c,c=d)
-var s,f,h,d=e(u),p=e(c),y=null==t?10:+t,b=[]
-if(!(o%1)&&p-d<y){if(d=Math.floor(d),p=Math.ceil(p),u>0){for(;d<=p;++d)for(f=1,s=n(d);f<o;++f)if(!((h=s*f)<u)){if(h>c)break
-b.push(h)}}else for(;d<=p;++d)for(f=o-1,s=n(d);f>=1;--f)if(!((h=s*f)<u)){if(h>c)break
-b.push(h)}2*b.length<y&&(b=(0,l.ZP)(u,c,y))}else b=(0,l.ZP)(d,p,Math.min(p-d,y)).map(n)
-return r?b.reverse():b},r.tickFormat=function(t,i){if(null==i&&(i=10===o?".0e":","),"function"!=typeof i&&(i=V(i)),t===1/0)return i
-null==t&&(t=10)
-var a=Math.max(1,o*t/r.ticks().length)
-return function(t){var r=t/n(Math.round(e(t)))
-return r*o<o-.5&&(r*=o),r<=a?i(t):""}},r.nice=function(){return i(Q(i(),{floor:function(t){return n(Math.floor(e(t)))},ceil:function(t){return n(Math.ceil(e(t)))}}))},r}function ut(){var t=at(B()).domain([1,10])
-return t.copy=function(){return T(t,ut()).base(t.base())},i.apply(t,arguments),t}function ct(t){return function(e){return Math.sign(e)*Math.log1p(Math.abs(e/t))}}function st(t){return function(e){return Math.sign(e)*Math.expm1(Math.abs(e))*t}}function ft(t){var e=1,n=t(ct(e),st(e))
-return n.constant=function(n){return arguments.length?t(ct(e=+n),st(e)):e},W(n)}function lt(){var t=ft(B())
-return t.copy=function(){return T(t,lt()).constant(t.constant())},i.apply(t,arguments)}function ht(t){return function(e){return e<0?-Math.pow(-e,t):Math.pow(e,t)}}function dt(t){return t<0?-Math.sqrt(-t):Math.sqrt(t)}function pt(t){return t<0?-t*t:t*t}function yt(t){var e=t(O,O),n=1
-function r(){return 1===n?t(O,O):.5===n?t(dt,pt):t(ht(n),ht(1/n))}return e.exponent=function(t){return arguments.length?(n=+t,r()):n},W(e)}function bt(){var t=yt(B())
-return t.copy=function(){return T(t,bt()).exponent(t.exponent())},i.apply(t,arguments),t}function vt(){return bt.apply(null,arguments).exponent(.5)}function gt(t){return Math.sign(t)*t*t}function mt(t){return Math.sign(t)*Math.sqrt(Math.abs(t))}function _t(){var t,e=P(),n=[0,1],r=!1
-function o(n){var i=mt(e(n))
-return isNaN(i)?t:r?Math.round(i):i}return o.invert=function(t){return e.invert(gt(t))},o.domain=function(t){return arguments.length?(e.domain(t),o):e.domain()},o.range=function(t){return arguments.length?(e.range((n=Array.from(t,D)).map(gt)),o):n.slice()},o.rangeRound=function(t){return o.range(t).round(!0)},o.round=function(t){return arguments.length?(r=!!t,o):r},o.clamp=function(t){return arguments.length?(e.clamp(t),o):e.clamp()},o.unknown=function(e){return arguments.length?(t=e,o):t},o.copy=function(){return _t(e.domain(),n).round(r).clamp(e.clamp()).unknown(t)},i.apply(o,arguments),W(o)}q=function(t){var e,n,r=void 0===t.grouping||void 0===t.thousands?Z:(e=Y.call(t.grouping,Number),n=t.thousands+"",function(t,r){for(var i=t.length,o=[],a=0,u=e[0],c=0;i>0&&u>0&&(c+u+1>r&&(u=Math.max(1,r-c)),o.push(t.substring(i-=u,i+u)),!((c+=u+1)>r));)u=e[a=(a+1)%e.length]
-return o.reverse().join(n)}),i=void 0===t.currency?"":t.currency[0]+"",o=void 0===t.currency?"":t.currency[1]+"",a=void 0===t.decimal?".":t.decimal+"",u=void 0===t.numerals?Z:function(t){return function(e){return e.replace(/[0-9]/g,(function(e){return t[+e]}))}}(Y.call(t.numerals,String)),c=void 0===t.percent?"%":t.percent+"",s=void 0===t.minus?"−":t.minus+"",f=void 0===t.nan?"NaN":t.nan+""
-function l(t){var e=(t=R(t)).fill,n=t.align,l=t.sign,h=t.symbol,d=t.zero,p=t.width,y=t.comma,b=t.precision,v=t.trim,g=t.type
-"n"===g?(y=!0,g="g"):z[g]||(void 0===b&&(b=12),v=!0,g="g"),(d||"0"===e&&"="===n)&&(d=!0,e="0",n="=")
-var m="$"===h?i:"#"===h&&/[boxX]/.test(g)?"0"+g.toLowerCase():"",_="$"===h?o:/[%p]/.test(g)?c:"",w=z[g],x=/[defgprs%]/.test(g)
-function A(t){var i,o,c,h=m,A=_
-if("c"===g)A=w(t)+A,t=""
-else{var E=(t=+t)<0||1/t<0
-if(t=isNaN(t)?f:w(Math.abs(t),b),v&&(t=function(t){t:for(var e,n=t.length,r=1,i=-1;r<n;++r)switch(t[r]){case".":i=e=r
-break
-case"0":0===i&&(i=r),e=r
-break
-default:if(!+t[r])break t
-i>0&&(i=0)}return i>0?t.slice(0,i)+t.slice(e+1):t}(t)),E&&0==+t&&"+"!==l&&(E=!1),h=(E?"("===l?l:s:"-"===l||"("===l?"":l)+h,A=("s"===g?G[8+j/3]:"")+A+(E&&"("===l?")":""),x)for(i=-1,o=t.length;++i<o;)if(48>(c=t.charCodeAt(i))||c>57){A=(46===c?a+t.slice(i+1):t.slice(i))+A,t=t.slice(0,i)
-break}}y&&!d&&(t=r(t,1/0))
-var k=h.length+t.length+A.length,D=k<p?new Array(p-k+1).join(e):""
-switch(y&&d&&(t=r(D+t,D.length?p-A.length:1/0),D=""),n){case"<":t=h+t+A+D
-break
-case"=":t=h+D+t+A
-break
-case"^":t=D.slice(0,k=D.length>>1)+h+t+A+D.slice(k)
-break
-default:t=D+h+t+A}return u(t)}return b=void 0===b?6:/[gprs]/.test(g)?Math.max(1,Math.min(21,b)):Math.max(0,Math.min(20,b)),A.toString=function(){return t+""},A}return{format:l,formatPrefix:function(t,e){var n=l(((t=R(t)).type="f",t)),r=3*Math.max(-8,Math.min(8,Math.floor($(e)/3))),i=Math.pow(10,-r),o=G[8+r/3]
-return function(t){return n(i*t)+o}}}}({thousands:",",grouping:[3],currency:["$",""]}),V=q.format,H=q.formatPrefix
-var wt=n(801),xt=n(7604)
-function At(){var t,e=[],n=[],r=[]
-function o(){var t=0,i=Math.max(1,n.length)
-for(r=new Array(i-1);++t<i;)r[t-1]=(0,wt.s)(e,t/i)
-return a}function a(e){return isNaN(e=+e)?t:n[(0,h.ZP)(r,e)]}return a.invertExtent=function(t){var i=n.indexOf(t)
-return i<0?[NaN,NaN]:[i>0?r[i-1]:e[0],i<r.length?r[i]:e[e.length-1]]},a.domain=function(t){if(!arguments.length)return e.slice()
-e=[]
-for(let n of t)null==n||isNaN(n=+n)||e.push(n)
-return e.sort(xt.Z),o()},a.range=function(t){return arguments.length?(n=Array.from(t),o()):n.slice()},a.unknown=function(e){return arguments.length?(t=e,a):t},a.quantiles=function(){return r.slice()},a.copy=function(){return At().domain(e).range(n).unknown(t)},i.apply(a,arguments)}function Et(){var t,e=0,n=1,r=1,o=[.5],a=[0,1]
-function u(e){return e<=e?a[(0,h.ZP)(o,e,0,r)]:t}function c(){var t=-1
-for(o=new Array(r);++t<r;)o[t]=((t+1)*n-(t-r)*e)/(r+1)
-return u}return u.domain=function(t){return arguments.length?([e,n]=t,e=+e,n=+n,c()):[e,n]},u.range=function(t){return arguments.length?(r=(a=Array.from(t)).length-1,c()):a.slice()},u.invertExtent=function(t){var i=a.indexOf(t)
-return i<0?[NaN,NaN]:i<1?[e,o[0]]:i>=r?[o[r-1],n]:[o[i-1],o[i]]},u.unknown=function(e){return arguments.length?(t=e,u):u},u.thresholds=function(){return o.slice()},u.copy=function(){return Et().domain([e,n]).range(a).unknown(t)},i.apply(W(u),arguments)}function kt(){var t,e=[.5],n=[0,1],r=1
-function o(i){return i<=i?n[(0,h.ZP)(e,i,0,r)]:t}return o.domain=function(t){return arguments.length?(e=Array.from(t),r=Math.min(e.length,n.length-1),o):e.slice()},o.range=function(t){return arguments.length?(n=Array.from(t),r=Math.min(e.length,n.length-1),o):n.slice()},o.invertExtent=function(t){var r=n.indexOf(t)
-return[e[r-1],e[r]]},o.unknown=function(e){return arguments.length?(t=e,o):t},o.copy=function(){return kt().domain(e).range(n).unknown(t)},i.apply(o,arguments)}var Dt=n(9354),Ct=new Date,Ot=new Date
-function St(t,e,n,r){function i(e){return t(e=0===arguments.length?new Date:new Date(+e)),e}return i.floor=function(e){return t(e=new Date(+e)),e},i.ceil=function(n){return t(n=new Date(n-1)),e(n,1),t(n),n},i.round=function(t){var e=i(t),n=i.ceil(t)
-return t-e<n-t?e:n},i.offset=function(t,n){return e(t=new Date(+t),null==n?1:Math.floor(n)),t},i.range=function(n,r,o){var a,u=[]
-if(n=i.ceil(n),o=null==o?1:Math.floor(o),!(n<r&&o>0))return u
-do{u.push(a=new Date(+n)),e(n,o),t(n)}while(a<n&&n<r)
-return u},i.filter=function(n){return St((function(e){if(e>=e)for(;t(e),!n(e);)e.setTime(e-1)}),(function(t,r){if(t>=t)if(r<0)for(;++r<=0;)for(;e(t,-1),!n(t););else for(;--r>=0;)for(;e(t,1),!n(t););}))},n&&(i.count=function(e,r){return Ct.setTime(+e),Ot.setTime(+r),t(Ct),t(Ot),Math.floor(n(Ct,Ot))},i.every=function(t){return t=Math.floor(t),isFinite(t)&&t>0?t>1?i.filter(r?function(e){return r(e)%t==0}:function(e){return i.count(0,e)%t==0}):i:null}),i}var Mt=St((function(t){t.setMonth(0,1),t.setHours(0,0,0,0)}),(function(t,e){t.setFullYear(t.getFullYear()+e)}),(function(t,e){return e.getFullYear()-t.getFullYear()}),(function(t){return t.getFullYear()}))
-Mt.every=function(t){return isFinite(t=Math.floor(t))&&t>0?St((function(e){e.setFullYear(Math.floor(e.getFullYear()/t)*t),e.setMonth(0,1),e.setHours(0,0,0,0)}),(function(e,n){e.setFullYear(e.getFullYear()+n*t)})):null}
-const Ft=Mt
-Mt.range
-var Tt=St((function(t){t.setDate(1),t.setHours(0,0,0,0)}),(function(t,e){t.setMonth(t.getMonth()+e)}),(function(t,e){return e.getMonth()-t.getMonth()+12*(e.getFullYear()-t.getFullYear())}),(function(t){return t.getMonth()}))
-const Bt=Tt
-Tt.range
-var Pt=1e3,jt=6e4,Nt=36e5,Rt=864e5,Lt=6048e5
-function It(t){return St((function(e){e.setDate(e.getDate()-(e.getDay()+7-t)%7),e.setHours(0,0,0,0)}),(function(t,e){t.setDate(t.getDate()+7*e)}),(function(t,e){return(e-t-(e.getTimezoneOffset()-t.getTimezoneOffset())*jt)/Lt}))}var $t=It(0),Ut=It(1),zt=It(2),Zt=It(3),qt=It(4),Vt=It(5),Ht=It(6),Yt=($t.range,Ut.range,zt.range,Zt.range,qt.range,Vt.range,Ht.range,St((t=>t.setHours(0,0,0,0)),((t,e)=>t.setDate(t.getDate()+e)),((t,e)=>(e-t-(e.getTimezoneOffset()-t.getTimezoneOffset())*jt)/Rt),(t=>t.getDate()-1)))
-const Gt=Yt
-Yt.range
-var Kt=St((function(t){t.setTime(t-t.getMilliseconds()-t.getSeconds()*Pt-t.getMinutes()*jt)}),(function(t,e){t.setTime(+t+e*Nt)}),(function(t,e){return(e-t)/Nt}),(function(t){return t.getHours()}))
-const Wt=Kt
-Kt.range
-var Xt=St((function(t){t.setTime(t-t.getMilliseconds()-t.getSeconds()*Pt)}),(function(t,e){t.setTime(+t+e*jt)}),(function(t,e){return(e-t)/jt}),(function(t){return t.getMinutes()}))
-const Jt=Xt
-Xt.range
-var Qt=St((function(t){t.setTime(t-t.getMilliseconds())}),(function(t,e){t.setTime(+t+e*Pt)}),(function(t,e){return(e-t)/Pt}),(function(t){return t.getUTCSeconds()}))
-const te=Qt
-Qt.range
-var ee=St((function(){}),(function(t,e){t.setTime(+t+e)}),(function(t,e){return e-t}))
-ee.every=function(t){return t=Math.floor(t),isFinite(t)&&t>0?t>1?St((function(e){e.setTime(Math.floor(e/t)*t)}),(function(e,n){e.setTime(+e+n*t)}),(function(e,n){return(n-e)/t})):ee:null}
-const ne=ee
-function re(t){return St((function(e){e.setUTCDate(e.getUTCDate()-(e.getUTCDay()+7-t)%7),e.setUTCHours(0,0,0,0)}),(function(t,e){t.setUTCDate(t.getUTCDate()+7*e)}),(function(t,e){return(e-t)/Lt}))}ee.range
-var ie=re(0),oe=re(1),ae=re(2),ue=re(3),ce=re(4),se=re(5),fe=re(6),le=(ie.range,oe.range,ae.range,ue.range,ce.range,se.range,fe.range,St((function(t){t.setUTCHours(0,0,0,0)}),(function(t,e){t.setUTCDate(t.getUTCDate()+e)}),(function(t,e){return(e-t)/Rt}),(function(t){return t.getUTCDate()-1})))
-const he=le
-le.range
-var de=St((function(t){t.setUTCMonth(0,1),t.setUTCHours(0,0,0,0)}),(function(t,e){t.setUTCFullYear(t.getUTCFullYear()+e)}),(function(t,e){return e.getUTCFullYear()-t.getUTCFullYear()}),(function(t){return t.getUTCFullYear()}))
-de.every=function(t){return isFinite(t=Math.floor(t))&&t>0?St((function(e){e.setUTCFullYear(Math.floor(e.getUTCFullYear()/t)*t),e.setUTCMonth(0,1),e.setUTCHours(0,0,0,0)}),(function(e,n){e.setUTCFullYear(e.getUTCFullYear()+n*t)})):null}
-const pe=de
-function ye(t){if(0<=t.y&&t.y<100){var e=new Date(-1,t.m,t.d,t.H,t.M,t.S,t.L)
-return e.setFullYear(t.y),e}return new Date(t.y,t.m,t.d,t.H,t.M,t.S,t.L)}function be(t){if(0<=t.y&&t.y<100){var e=new Date(Date.UTC(-1,t.m,t.d,t.H,t.M,t.S,t.L))
-return e.setUTCFullYear(t.y),e}return new Date(Date.UTC(t.y,t.m,t.d,t.H,t.M,t.S,t.L))}function ve(t,e,n){return{y:t,m:e,d:n,H:0,M:0,S:0,L:0}}de.range
-var ge,me,_e,we={"-":"",_:" ",0:"0"},xe=/^\s*\d+/,Ae=/^%/,Ee=/[\\^$*+?|[\]().{}]/g
-function ke(t,e,n){var r=t<0?"-":"",i=(r?-t:t)+"",o=i.length
-return r+(o<n?new Array(n-o+1).join(e)+i:i)}function De(t){return t.replace(Ee,"\\$&")}function Ce(t){return new RegExp("^(?:"+t.map(De).join("|")+")","i")}function Oe(t){return new Map(t.map(((t,e)=>[t.toLowerCase(),e])))}function Se(t,e,n){var r=xe.exec(e.slice(n,n+1))
-return r?(t.w=+r[0],n+r[0].length):-1}function Me(t,e,n){var r=xe.exec(e.slice(n,n+1))
-return r?(t.u=+r[0],n+r[0].length):-1}function Fe(t,e,n){var r=xe.exec(e.slice(n,n+2))
-return r?(t.U=+r[0],n+r[0].length):-1}function Te(t,e,n){var r=xe.exec(e.slice(n,n+2))
-return r?(t.V=+r[0],n+r[0].length):-1}function Be(t,e,n){var r=xe.exec(e.slice(n,n+2))
-return r?(t.W=+r[0],n+r[0].length):-1}function Pe(t,e,n){var r=xe.exec(e.slice(n,n+4))
-return r?(t.y=+r[0],n+r[0].length):-1}function je(t,e,n){var r=xe.exec(e.slice(n,n+2))
-return r?(t.y=+r[0]+(+r[0]>68?1900:2e3),n+r[0].length):-1}function Ne(t,e,n){var r=/^(Z)|([+-]\d\d)(?::?(\d\d))?/.exec(e.slice(n,n+6))
-return r?(t.Z=r[1]?0:-(r[2]+(r[3]||"00")),n+r[0].length):-1}function Re(t,e,n){var r=xe.exec(e.slice(n,n+1))
-return r?(t.q=3*r[0]-3,n+r[0].length):-1}function Le(t,e,n){var r=xe.exec(e.slice(n,n+2))
-return r?(t.m=r[0]-1,n+r[0].length):-1}function Ie(t,e,n){var r=xe.exec(e.slice(n,n+2))
-return r?(t.d=+r[0],n+r[0].length):-1}function $e(t,e,n){var r=xe.exec(e.slice(n,n+3))
-return r?(t.m=0,t.d=+r[0],n+r[0].length):-1}function Ue(t,e,n){var r=xe.exec(e.slice(n,n+2))
-return r?(t.H=+r[0],n+r[0].length):-1}function ze(t,e,n){var r=xe.exec(e.slice(n,n+2))
-return r?(t.M=+r[0],n+r[0].length):-1}function Ze(t,e,n){var r=xe.exec(e.slice(n,n+2))
-return r?(t.S=+r[0],n+r[0].length):-1}function qe(t,e,n){var r=xe.exec(e.slice(n,n+3))
-return r?(t.L=+r[0],n+r[0].length):-1}function Ve(t,e,n){var r=xe.exec(e.slice(n,n+6))
-return r?(t.L=Math.floor(r[0]/1e3),n+r[0].length):-1}function He(t,e,n){var r=Ae.exec(e.slice(n,n+1))
-return r?n+r[0].length:-1}function Ye(t,e,n){var r=xe.exec(e.slice(n))
-return r?(t.Q=+r[0],n+r[0].length):-1}function Ge(t,e,n){var r=xe.exec(e.slice(n))
-return r?(t.s=+r[0],n+r[0].length):-1}function Ke(t,e){return ke(t.getDate(),e,2)}function We(t,e){return ke(t.getHours(),e,2)}function Xe(t,e){return ke(t.getHours()%12||12,e,2)}function Je(t,e){return ke(1+Gt.count(Ft(t),t),e,3)}function Qe(t,e){return ke(t.getMilliseconds(),e,3)}function tn(t,e){return Qe(t,e)+"000"}function en(t,e){return ke(t.getMonth()+1,e,2)}function nn(t,e){return ke(t.getMinutes(),e,2)}function rn(t,e){return ke(t.getSeconds(),e,2)}function on(t){var e=t.getDay()
-return 0===e?7:e}function an(t,e){return ke($t.count(Ft(t)-1,t),e,2)}function un(t){var e=t.getDay()
-return e>=4||0===e?qt(t):qt.ceil(t)}function cn(t,e){return t=un(t),ke(qt.count(Ft(t),t)+(4===Ft(t).getDay()),e,2)}function sn(t){return t.getDay()}function fn(t,e){return ke(Ut.count(Ft(t)-1,t),e,2)}function ln(t,e){return ke(t.getFullYear()%100,e,2)}function hn(t,e){return ke((t=un(t)).getFullYear()%100,e,2)}function dn(t,e){return ke(t.getFullYear()%1e4,e,4)}function pn(t,e){var n=t.getDay()
-return ke((t=n>=4||0===n?qt(t):qt.ceil(t)).getFullYear()%1e4,e,4)}function yn(t){var e=t.getTimezoneOffset()
-return(e>0?"-":(e*=-1,"+"))+ke(e/60|0,"0",2)+ke(e%60,"0",2)}function bn(t,e){return ke(t.getUTCDate(),e,2)}function vn(t,e){return ke(t.getUTCHours(),e,2)}function gn(t,e){return ke(t.getUTCHours()%12||12,e,2)}function mn(t,e){return ke(1+he.count(pe(t),t),e,3)}function _n(t,e){return ke(t.getUTCMilliseconds(),e,3)}function wn(t,e){return _n(t,e)+"000"}function xn(t,e){return ke(t.getUTCMonth()+1,e,2)}function An(t,e){return ke(t.getUTCMinutes(),e,2)}function En(t,e){return ke(t.getUTCSeconds(),e,2)}function kn(t){var e=t.getUTCDay()
-return 0===e?7:e}function Dn(t,e){return ke(ie.count(pe(t)-1,t),e,2)}function Cn(t){var e=t.getUTCDay()
-return e>=4||0===e?ce(t):ce.ceil(t)}function On(t,e){return t=Cn(t),ke(ce.count(pe(t),t)+(4===pe(t).getUTCDay()),e,2)}function Sn(t){return t.getUTCDay()}function Mn(t,e){return ke(oe.count(pe(t)-1,t),e,2)}function Fn(t,e){return ke(t.getUTCFullYear()%100,e,2)}function Tn(t,e){return ke((t=Cn(t)).getUTCFullYear()%100,e,2)}function Bn(t,e){return ke(t.getUTCFullYear()%1e4,e,4)}function Pn(t,e){var n=t.getUTCDay()
-return ke((t=n>=4||0===n?ce(t):ce.ceil(t)).getUTCFullYear()%1e4,e,4)}function jn(){return"+0000"}function Nn(){return"%"}function Rn(t){return+t}function Ln(t){return Math.floor(+t/1e3)}ge=function(t){var e=t.dateTime,n=t.date,r=t.time,i=t.periods,o=t.days,a=t.shortDays,u=t.months,c=t.shortMonths,s=Ce(i),f=Oe(i),l=Ce(o),h=Oe(o),d=Ce(a),p=Oe(a),y=Ce(u),b=Oe(u),v=Ce(c),g=Oe(c),m={a:function(t){return a[t.getDay()]},A:function(t){return o[t.getDay()]},b:function(t){return c[t.getMonth()]},B:function(t){return u[t.getMonth()]},c:null,d:Ke,e:Ke,f:tn,g:hn,G:pn,H:We,I:Xe,j:Je,L:Qe,m:en,M:nn,p:function(t){return i[+(t.getHours()>=12)]},q:function(t){return 1+~~(t.getMonth()/3)},Q:Rn,s:Ln,S:rn,u:on,U:an,V:cn,w:sn,W:fn,x:null,X:null,y:ln,Y:dn,Z:yn,"%":Nn},_={a:function(t){return a[t.getUTCDay()]},A:function(t){return o[t.getUTCDay()]},b:function(t){return c[t.getUTCMonth()]},B:function(t){return u[t.getUTCMonth()]},c:null,d:bn,e:bn,f:wn,g:Tn,G:Pn,H:vn,I:gn,j:mn,L:_n,m:xn,M:An,p:function(t){return i[+(t.getUTCHours()>=12)]},q:function(t){return 1+~~(t.getUTCMonth()/3)},Q:Rn,s:Ln,S:En,u:kn,U:Dn,V:On,w:Sn,W:Mn,x:null,X:null,y:Fn,Y:Bn,Z:jn,"%":Nn},w={a:function(t,e,n){var r=d.exec(e.slice(n))
-return r?(t.w=p.get(r[0].toLowerCase()),n+r[0].length):-1},A:function(t,e,n){var r=l.exec(e.slice(n))
-return r?(t.w=h.get(r[0].toLowerCase()),n+r[0].length):-1},b:function(t,e,n){var r=v.exec(e.slice(n))
-return r?(t.m=g.get(r[0].toLowerCase()),n+r[0].length):-1},B:function(t,e,n){var r=y.exec(e.slice(n))
-return r?(t.m=b.get(r[0].toLowerCase()),n+r[0].length):-1},c:function(t,n,r){return E(t,e,n,r)},d:Ie,e:Ie,f:Ve,g:je,G:Pe,H:Ue,I:Ue,j:$e,L:qe,m:Le,M:ze,p:function(t,e,n){var r=s.exec(e.slice(n))
-return r?(t.p=f.get(r[0].toLowerCase()),n+r[0].length):-1},q:Re,Q:Ye,s:Ge,S:Ze,u:Me,U:Fe,V:Te,w:Se,W:Be,x:function(t,e,r){return E(t,n,e,r)},X:function(t,e,n){return E(t,r,e,n)},y:je,Y:Pe,Z:Ne,"%":He}
-function x(t,e){return function(n){var r,i,o,a=[],u=-1,c=0,s=t.length
-for(n instanceof Date||(n=new Date(+n));++u<s;)37===t.charCodeAt(u)&&(a.push(t.slice(c,u)),null!=(i=we[r=t.charAt(++u)])?r=t.charAt(++u):i="e"===r?" ":"0",(o=e[r])&&(r=o(n,i)),a.push(r),c=u+1)
-return a.push(t.slice(c,u)),a.join("")}}function A(t,e){return function(n){var r,i,o=ve(1900,void 0,1)
-if(E(o,t,n+="",0)!=n.length)return null
-if("Q"in o)return new Date(o.Q)
-if("s"in o)return new Date(1e3*o.s+("L"in o?o.L:0))
-if(e&&!("Z"in o)&&(o.Z=0),"p"in o&&(o.H=o.H%12+12*o.p),void 0===o.m&&(o.m="q"in o?o.q:0),"V"in o){if(o.V<1||o.V>53)return null
-"w"in o||(o.w=1),"Z"in o?(i=(r=be(ve(o.y,0,1))).getUTCDay(),r=i>4||0===i?oe.ceil(r):oe(r),r=he.offset(r,7*(o.V-1)),o.y=r.getUTCFullYear(),o.m=r.getUTCMonth(),o.d=r.getUTCDate()+(o.w+6)%7):(i=(r=ye(ve(o.y,0,1))).getDay(),r=i>4||0===i?Ut.ceil(r):Ut(r),r=Gt.offset(r,7*(o.V-1)),o.y=r.getFullYear(),o.m=r.getMonth(),o.d=r.getDate()+(o.w+6)%7)}else("W"in o||"U"in o)&&("w"in o||(o.w="u"in o?o.u%7:"W"in o?1:0),i="Z"in o?be(ve(o.y,0,1)).getUTCDay():ye(ve(o.y,0,1)).getDay(),o.m=0,o.d="W"in o?(o.w+6)%7+7*o.W-(i+5)%7:o.w+7*o.U-(i+6)%7)
-return"Z"in o?(o.H+=o.Z/100|0,o.M+=o.Z%100,be(o)):ye(o)}}function E(t,e,n,r){for(var i,o,a=0,u=e.length,c=n.length;a<u;){if(r>=c)return-1
-if(37===(i=e.charCodeAt(a++))){if(i=e.charAt(a++),!(o=w[i in we?e.charAt(a++):i])||(r=o(t,n,r))<0)return-1}else if(i!=n.charCodeAt(r++))return-1}return r}return m.x=x(n,m),m.X=x(r,m),m.c=x(e,m),_.x=x(n,_),_.X=x(r,_),_.c=x(e,_),{format:function(t){var e=x(t+="",m)
-return e.toString=function(){return t},e},parse:function(t){var e=A(t+="",!1)
-return e.toString=function(){return t},e},utcFormat:function(t){var e=x(t+="",_)
-return e.toString=function(){return t},e},utcParse:function(t){var e=A(t+="",!0)
-return e.toString=function(){return t},e}}}({dateTime:"%x, %X",date:"%-m/%-d/%Y",time:"%-I:%M:%S %p",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]}),me=ge.format,ge.parse,_e=ge.utcFormat,ge.utcParse
-var In=31536e6
-function $n(t){return new Date(t)}function Un(t){return t instanceof Date?+t:+new Date(+t)}function zn(t,e,n,r,i,o,a,u,c){var s=P(),f=s.invert,h=s.domain,d=c(".%L"),p=c(":%S"),y=c("%I:%M"),b=c("%I %p"),v=c("%a %d"),g=c("%b %d"),m=c("%B"),_=c("%Y"),w=[[a,1,1e3],[a,5,5e3],[a,15,15e3],[a,30,3e4],[o,1,6e4],[o,5,3e5],[o,15,9e5],[o,30,18e5],[i,1,36e5],[i,3,108e5],[i,6,216e5],[i,12,432e5],[r,1,864e5],[r,2,1728e5],[n,1,6048e5],[e,1,2592e6],[e,3,7776e6],[t,1,In]]
-function x(u){return(a(u)<u?d:o(u)<u?p:i(u)<u?y:r(u)<u?b:e(u)<u?n(u)<u?v:g:t(u)<u?m:_)(u)}function A(e,n,r){if(null==e&&(e=10),"number"==typeof e){var i,o=Math.abs(r-n)/e,a=(0,Dt.Z)((function(t){return t[2]})).right(w,o)
-return a===w.length?(i=(0,l.ly)(n/In,r/In,e),e=t):a?(i=(a=w[o/w[a-1][2]<w[a][2]/o?a-1:a])[1],e=a[0]):(i=Math.max((0,l.ly)(n,r,e),1),e=u),e.every(i)}return e}return s.invert=function(t){return new Date(f(t))},s.domain=function(t){return arguments.length?h(Array.from(t,Un)):h().map($n)},s.ticks=function(t){var e,n=h(),r=n[0],i=n[n.length-1],o=i<r
-return o&&(e=r,r=i,i=e),e=(e=A(t,r,i))?e.range(r,i+1):[],o?e.reverse():e},s.tickFormat=function(t,e){return null==e?x:c(e)},s.nice=function(t){var e=h()
-return(t=A(t,e[0],e[e.length-1]))?h(Q(e,t)):s},s.copy=function(){return T(s,zn(t,e,n,r,i,o,a,u,c))},s}function Zn(){return i.apply(zn(Ft,Bt,$t,Gt,Wt,Jt,te,ne,me).domain([new Date(2e3,0,1),new Date(2e3,0,2)]),arguments)}var qn=St((function(t){t.setUTCDate(1),t.setUTCHours(0,0,0,0)}),(function(t,e){t.setUTCMonth(t.getUTCMonth()+e)}),(function(t,e){return e.getUTCMonth()-t.getUTCMonth()+12*(e.getUTCFullYear()-t.getUTCFullYear())}),(function(t){return t.getUTCMonth()}))
-const Vn=qn
-qn.range
-var Hn=St((function(t){t.setUTCMinutes(0,0,0)}),(function(t,e){t.setTime(+t+e*Nt)}),(function(t,e){return(e-t)/Nt}),(function(t){return t.getUTCHours()}))
-const Yn=Hn
-Hn.range
-var Gn=St((function(t){t.setUTCSeconds(0,0)}),(function(t,e){t.setTime(+t+e*jt)}),(function(t,e){return(e-t)/jt}),(function(t){return t.getUTCMinutes()}))
-const Kn=Gn
-function Wn(){return i.apply(zn(pe,Vn,ie,he,Yn,Kn,te,ne,_e).domain([Date.UTC(2e3,0,1),Date.UTC(2e3,0,2)]),arguments)}function Xn(){var t,e,n,r,i,o=0,a=1,u=O,c=!1
-function s(e){return isNaN(e=+e)?i:u(0===n?.5:(e=(r(e)-t)*n,c?Math.max(0,Math.min(1,e)):e))}function f(t){return function(e){var n,r
-return arguments.length?([n,r]=e,u=t(n,r),s):[u(0),u(1)]}}return s.domain=function(i){return arguments.length?([o,a]=i,t=r(o=+o),e=r(a=+a),n=t===e?0:1/(e-t),s):[o,a]},s.clamp=function(t){return arguments.length?(c=!!t,s):c},s.interpolator=function(t){return arguments.length?(u=t,s):u},s.range=f(E),s.rangeRound=f(k),s.unknown=function(t){return arguments.length?(i=t,s):i},function(i){return r=i,t=i(o),e=i(a),n=t===e?0:1/(e-t),s}}function Jn(t,e){return e.domain(t.domain()).interpolator(t.interpolator()).clamp(t.clamp()).unknown(t.unknown())}function Qn(){var t=W(Xn()(O))
-return t.copy=function(){return Jn(t,Qn())},o.apply(t,arguments)}function tr(){var t=at(Xn()).domain([1,10])
-return t.copy=function(){return Jn(t,tr()).base(t.base())},o.apply(t,arguments)}function er(){var t=ft(Xn())
-return t.copy=function(){return Jn(t,er()).constant(t.constant())},o.apply(t,arguments)}function nr(){var t=yt(Xn())
-return t.copy=function(){return Jn(t,nr()).exponent(t.exponent())},o.apply(t,arguments)}function rr(){return nr.apply(null,arguments).exponent(.5)}function ir(){var t=[],e=O
-function n(n){if(!isNaN(n=+n))return e(((0,h.ZP)(t,n,1)-1)/(t.length-1))}return n.domain=function(e){if(!arguments.length)return t.slice()
-t=[]
-for(let n of e)null==n||isNaN(n=+n)||t.push(n)
-return t.sort(xt.Z),n},n.interpolator=function(t){return arguments.length?(e=t,n):e},n.range=function(){return t.map(((n,r)=>e(r/(t.length-1))))},n.quantiles=function(e){return Array.from({length:e+1},((n,r)=>(0,wt.Z)(t,r/e)))},n.copy=function(){return ir(e).domain(t)},o.apply(n,arguments)}function or(t,e){void 0===e&&(e=t,t=E)
-for(var n=0,r=e.length-1,i=e[0],o=new Array(r<0?0:r);n<r;)o[n]=t(i,i=e[++n])
-return function(t){var e=Math.max(0,Math.min(r-1,Math.floor(t*=r)))
-return o[e](t-e)}}function ar(){var t,e,n,r,i,o,a,u=0,c=.5,s=1,f=1,l=O,h=!1
-function d(t){return isNaN(t=+t)?a:(t=.5+((t=+o(t))-e)*(f*t<f*e?r:i),l(h?Math.max(0,Math.min(1,t)):t))}function p(t){return function(e){var n,r,i
-return arguments.length?([n,r,i]=e,l=or(t,[n,r,i]),d):[l(0),l(.5),l(1)]}}return d.domain=function(a){return arguments.length?([u,c,s]=a,t=o(u=+u),e=o(c=+c),n=o(s=+s),r=t===e?0:.5/(e-t),i=e===n?0:.5/(n-e),f=e<t?-1:1,d):[u,c,s]},d.clamp=function(t){return arguments.length?(h=!!t,d):h},d.interpolator=function(t){return arguments.length?(l=t,d):l},d.range=p(E),d.rangeRound=p(k),d.unknown=function(t){return arguments.length?(a=t,d):a},function(a){return o=a,t=a(u),e=a(c),n=a(s),r=t===e?0:.5/(e-t),i=e===n?0:.5/(n-e),f=e<t?-1:1,d}}function ur(){var t=W(ar()(O))
-return t.copy=function(){return Jn(t,ur())},o.apply(t,arguments)}function cr(){var t=at(ar()).domain([.1,1,10])
-return t.copy=function(){return Jn(t,cr()).base(t.base())},o.apply(t,arguments)}function sr(){var t=ft(ar())
-return t.copy=function(){return Jn(t,sr()).constant(t.constant())},o.apply(t,arguments)}function fr(){var t=yt(ar())
-return t.copy=function(){return Jn(t,fr()).exponent(t.exponent())},o.apply(t,arguments)}function lr(){return fr.apply(null,arguments).exponent(.5)}Gn.range},1058:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{create:()=>gt,creator:()=>c,local:()=>_t,matcher:()=>p,namespace:()=>o,namespaces:()=>i,pointer:()=>At,pointers:()=>Et,select:()=>vt,selectAll:()=>kt,selection:()=>bt,selector:()=>f,selectorAll:()=>d,style:()=>R,window:()=>B})
-var r="http://www.w3.org/1999/xhtml"
-const i={svg:"http://www.w3.org/2000/svg",xhtml:r,xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"}
-function o(t){var e=t+="",n=e.indexOf(":")
-return n>=0&&"xmlns"!==(e=t.slice(0,n))&&(t=t.slice(n+1)),i.hasOwnProperty(e)?{space:i[e],local:t}:t}function a(t){return function(){var e=this.ownerDocument,n=this.namespaceURI
-return n===r&&e.documentElement.namespaceURI===r?e.createElement(t):e.createElementNS(n,t)}}function u(t){return function(){return this.ownerDocument.createElementNS(t.space,t.local)}}function c(t){var e=o(t)
-return(e.local?u:a)(e)}function s(){}function f(t){return null==t?s:function(){return this.querySelector(t)}}function l(t){return"object"==typeof t&&"length"in t?t:Array.from(t)}function h(){return[]}function d(t){return null==t?h:function(){return this.querySelectorAll(t)}}function p(t){return function(){return this.matches(t)}}function y(t){return function(e){return e.matches(t)}}var b=Array.prototype.find
-function v(){return this.firstElementChild}var g=Array.prototype.filter
-function m(){return this.children}function _(t){return new Array(t.length)}function w(t,e){this.ownerDocument=t.ownerDocument,this.namespaceURI=t.namespaceURI,this._next=null,this._parent=t,this.__data__=e}function x(t){return function(){return t}}function A(t,e,n,r,i,o){for(var a,u=0,c=e.length,s=o.length;u<s;++u)(a=e[u])?(a.__data__=o[u],r[u]=a):n[u]=new w(t,o[u])
-for(;u<c;++u)(a=e[u])&&(i[u]=a)}function E(t,e,n,r,i,o,a){var u,c,s,f=new Map,l=e.length,h=o.length,d=new Array(l)
-for(u=0;u<l;++u)(c=e[u])&&(d[u]=s=a.call(c,c.__data__,u,e)+"",f.has(s)?i[u]=c:f.set(s,c))
-for(u=0;u<h;++u)s=a.call(t,o[u],u,o)+"",(c=f.get(s))?(r[u]=c,c.__data__=o[u],f.delete(s)):n[u]=new w(t,o[u])
-for(u=0;u<l;++u)(c=e[u])&&f.get(d[u])===c&&(i[u]=c)}function k(t){return t.__data__}function D(t,e){return t<e?-1:t>e?1:t>=e?0:NaN}function C(t){return function(){this.removeAttribute(t)}}function O(t){return function(){this.removeAttributeNS(t.space,t.local)}}function S(t,e){return function(){this.setAttribute(t,e)}}function M(t,e){return function(){this.setAttributeNS(t.space,t.local,e)}}function F(t,e){return function(){var n=e.apply(this,arguments)
-null==n?this.removeAttribute(t):this.setAttribute(t,n)}}function T(t,e){return function(){var n=e.apply(this,arguments)
-null==n?this.removeAttributeNS(t.space,t.local):this.setAttributeNS(t.space,t.local,n)}}function B(t){return t.ownerDocument&&t.ownerDocument.defaultView||t.document&&t||t.defaultView}function P(t){return function(){this.style.removeProperty(t)}}function j(t,e,n){return function(){this.style.setProperty(t,e,n)}}function N(t,e,n){return function(){var r=e.apply(this,arguments)
-null==r?this.style.removeProperty(t):this.style.setProperty(t,r,n)}}function R(t,e){return t.style.getPropertyValue(e)||B(t).getComputedStyle(t,null).getPropertyValue(e)}function L(t){return function(){delete this[t]}}function I(t,e){return function(){this[t]=e}}function $(t,e){return function(){var n=e.apply(this,arguments)
-null==n?delete this[t]:this[t]=n}}function U(t){return t.trim().split(/^|\s+/)}function z(t){return t.classList||new Z(t)}function Z(t){this._node=t,this._names=U(t.getAttribute("class")||"")}function q(t,e){for(var n=z(t),r=-1,i=e.length;++r<i;)n.add(e[r])}function V(t,e){for(var n=z(t),r=-1,i=e.length;++r<i;)n.remove(e[r])}function H(t){return function(){q(this,t)}}function Y(t){return function(){V(this,t)}}function G(t,e){return function(){(e.apply(this,arguments)?q:V)(this,t)}}function K(){this.textContent=""}function W(t){return function(){this.textContent=t}}function X(t){return function(){var e=t.apply(this,arguments)
-this.textContent=null==e?"":e}}function J(){this.innerHTML=""}function Q(t){return function(){this.innerHTML=t}}function tt(t){return function(){var e=t.apply(this,arguments)
-this.innerHTML=null==e?"":e}}function et(){this.nextSibling&&this.parentNode.appendChild(this)}function nt(){this.previousSibling&&this.parentNode.insertBefore(this,this.parentNode.firstChild)}function rt(){return null}function it(){var t=this.parentNode
-t&&t.removeChild(this)}function ot(){var t=this.cloneNode(!1),e=this.parentNode
-return e?e.insertBefore(t,this.nextSibling):t}function at(){var t=this.cloneNode(!0),e=this.parentNode
-return e?e.insertBefore(t,this.nextSibling):t}function ut(t){return t.trim().split(/^|\s+/).map((function(t){var e="",n=t.indexOf(".")
-return n>=0&&(e=t.slice(n+1),t=t.slice(0,n)),{type:t,name:e}}))}function ct(t){return function(){var e=this.__on
-if(e){for(var n,r=0,i=-1,o=e.length;r<o;++r)n=e[r],t.type&&n.type!==t.type||n.name!==t.name?e[++i]=n:this.removeEventListener(n.type,n.listener,n.options);++i?e.length=i:delete this.__on}}}function st(t,e,n){return function(){var r,i=this.__on,o=function(t){return function(e){t.call(this,e,this.__data__)}}(e)
-if(i)for(var a=0,u=i.length;a<u;++a)if((r=i[a]).type===t.type&&r.name===t.name)return this.removeEventListener(r.type,r.listener,r.options),this.addEventListener(r.type,r.listener=o,r.options=n),void(r.value=e)
-this.addEventListener(t.type,o,n),r={type:t.type,name:t.name,value:e,listener:o,options:n},i?i.push(r):this.__on=[r]}}function ft(t,e,n){var r=B(t),i=r.CustomEvent
-"function"==typeof i?i=new i(e,n):(i=r.document.createEvent("Event"),n?(i.initEvent(e,n.bubbles,n.cancelable),i.detail=n.detail):i.initEvent(e,!1,!1)),t.dispatchEvent(i)}function lt(t,e){return function(){return ft(this,t,e)}}function ht(t,e){return function(){return ft(this,t,e.apply(this,arguments))}}w.prototype={constructor:w,appendChild:function(t){return this._parent.insertBefore(t,this._next)},insertBefore:function(t,e){return this._parent.insertBefore(t,e)},querySelector:function(t){return this._parent.querySelector(t)},querySelectorAll:function(t){return this._parent.querySelectorAll(t)}},Z.prototype={add:function(t){this._names.indexOf(t)<0&&(this._names.push(t),this._node.setAttribute("class",this._names.join(" ")))},remove:function(t){var e=this._names.indexOf(t)
-e>=0&&(this._names.splice(e,1),this._node.setAttribute("class",this._names.join(" ")))},contains:function(t){return this._names.indexOf(t)>=0}}
-var dt=[null]
-function pt(t,e){this._groups=t,this._parents=e}function yt(){return new pt([[document.documentElement]],dt)}pt.prototype=yt.prototype={constructor:pt,select:function(t){"function"!=typeof t&&(t=f(t))
-for(var e=this._groups,n=e.length,r=new Array(n),i=0;i<n;++i)for(var o,a,u=e[i],c=u.length,s=r[i]=new Array(c),l=0;l<c;++l)(o=u[l])&&(a=t.call(o,o.__data__,l,u))&&("__data__"in o&&(a.__data__=o.__data__),s[l]=a)
-return new pt(r,this._parents)},selectAll:function(t){t="function"==typeof t?function(t){return function(){var e=t.apply(this,arguments)
-return null==e?[]:l(e)}}(t):d(t)
-for(var e=this._groups,n=e.length,r=[],i=[],o=0;o<n;++o)for(var a,u=e[o],c=u.length,s=0;s<c;++s)(a=u[s])&&(r.push(t.call(a,a.__data__,s,u)),i.push(a))
-return new pt(r,i)},selectChild:function(t){return this.select(null==t?v:function(t){return function(){return b.call(this.children,t)}}("function"==typeof t?t:y(t)))},selectChildren:function(t){return this.selectAll(null==t?m:function(t){return function(){return g.call(this.children,t)}}("function"==typeof t?t:y(t)))},filter:function(t){"function"!=typeof t&&(t=p(t))
-for(var e=this._groups,n=e.length,r=new Array(n),i=0;i<n;++i)for(var o,a=e[i],u=a.length,c=r[i]=[],s=0;s<u;++s)(o=a[s])&&t.call(o,o.__data__,s,a)&&c.push(o)
-return new pt(r,this._parents)},data:function(t,e){if(!arguments.length)return Array.from(this,k)
-var n=e?E:A,r=this._parents,i=this._groups
-"function"!=typeof t&&(t=x(t))
-for(var o=i.length,a=new Array(o),u=new Array(o),c=new Array(o),s=0;s<o;++s){var f=r[s],h=i[s],d=h.length,p=l(t.call(f,f&&f.__data__,s,r)),y=p.length,b=u[s]=new Array(y),v=a[s]=new Array(y),g=c[s]=new Array(d)
-n(f,h,b,v,g,p,e)
-for(var m,_,w=0,D=0;w<y;++w)if(m=b[w]){for(w>=D&&(D=w+1);!(_=v[D])&&++D<y;);m._next=_||null}}return(a=new pt(a,r))._enter=u,a._exit=c,a},enter:function(){return new pt(this._enter||this._groups.map(_),this._parents)},exit:function(){return new pt(this._exit||this._groups.map(_),this._parents)},join:function(t,e,n){var r=this.enter(),i=this,o=this.exit()
-return r="function"==typeof t?t(r):r.append(t+""),null!=e&&(i=e(i)),null==n?o.remove():n(o),r&&i?r.merge(i).order():i},merge:function(t){if(!(t instanceof pt))throw new Error("invalid merge")
-for(var e=this._groups,n=t._groups,r=e.length,i=n.length,o=Math.min(r,i),a=new Array(r),u=0;u<o;++u)for(var c,s=e[u],f=n[u],l=s.length,h=a[u]=new Array(l),d=0;d<l;++d)(c=s[d]||f[d])&&(h[d]=c)
-for(;u<r;++u)a[u]=e[u]
-return new pt(a,this._parents)},selection:function(){return this},order:function(){for(var t=this._groups,e=-1,n=t.length;++e<n;)for(var r,i=t[e],o=i.length-1,a=i[o];--o>=0;)(r=i[o])&&(a&&4^r.compareDocumentPosition(a)&&a.parentNode.insertBefore(r,a),a=r)
-return this},sort:function(t){function e(e,n){return e&&n?t(e.__data__,n.__data__):!e-!n}t||(t=D)
-for(var n=this._groups,r=n.length,i=new Array(r),o=0;o<r;++o){for(var a,u=n[o],c=u.length,s=i[o]=new Array(c),f=0;f<c;++f)(a=u[f])&&(s[f]=a)
-s.sort(e)}return new pt(i,this._parents).order()},call:function(){var t=arguments[0]
-return arguments[0]=this,t.apply(null,arguments),this},nodes:function(){return Array.from(this)},node:function(){for(var t=this._groups,e=0,n=t.length;e<n;++e)for(var r=t[e],i=0,o=r.length;i<o;++i){var a=r[i]
-if(a)return a}return null},size:function(){let t=0
-for(const e of this)++t
-return t},empty:function(){return!this.node()},each:function(t){for(var e=this._groups,n=0,r=e.length;n<r;++n)for(var i,o=e[n],a=0,u=o.length;a<u;++a)(i=o[a])&&t.call(i,i.__data__,a,o)
-return this},attr:function(t,e){var n=o(t)
-if(arguments.length<2){var r=this.node()
-return n.local?r.getAttributeNS(n.space,n.local):r.getAttribute(n)}return this.each((null==e?n.local?O:C:"function"==typeof e?n.local?T:F:n.local?M:S)(n,e))},style:function(t,e,n){return arguments.length>1?this.each((null==e?P:"function"==typeof e?N:j)(t,e,null==n?"":n)):R(this.node(),t)},property:function(t,e){return arguments.length>1?this.each((null==e?L:"function"==typeof e?$:I)(t,e)):this.node()[t]},classed:function(t,e){var n=U(t+"")
-if(arguments.length<2){for(var r=z(this.node()),i=-1,o=n.length;++i<o;)if(!r.contains(n[i]))return!1
-return!0}return this.each(("function"==typeof e?G:e?H:Y)(n,e))},text:function(t){return arguments.length?this.each(null==t?K:("function"==typeof t?X:W)(t)):this.node().textContent},html:function(t){return arguments.length?this.each(null==t?J:("function"==typeof t?tt:Q)(t)):this.node().innerHTML},raise:function(){return this.each(et)},lower:function(){return this.each(nt)},append:function(t){var e="function"==typeof t?t:c(t)
-return this.select((function(){return this.appendChild(e.apply(this,arguments))}))},insert:function(t,e){var n="function"==typeof t?t:c(t),r=null==e?rt:"function"==typeof e?e:f(e)
-return this.select((function(){return this.insertBefore(n.apply(this,arguments),r.apply(this,arguments)||null)}))},remove:function(){return this.each(it)},clone:function(t){return this.select(t?at:ot)},datum:function(t){return arguments.length?this.property("__data__",t):this.node().__data__},on:function(t,e,n){var r,i,o=ut(t+""),a=o.length
-if(!(arguments.length<2)){for(u=e?st:ct,r=0;r<a;++r)this.each(u(o[r],e,n))
-return this}var u=this.node().__on
-if(u)for(var c,s=0,f=u.length;s<f;++s)for(r=0,c=u[s];r<a;++r)if((i=o[r]).type===c.type&&i.name===c.name)return c.value},dispatch:function(t,e){return this.each(("function"==typeof e?ht:lt)(t,e))},[Symbol.iterator]:function*(){for(var t=this._groups,e=0,n=t.length;e<n;++e)for(var r,i=t[e],o=0,a=i.length;o<a;++o)(r=i[o])&&(yield r)}}
-const bt=yt
-function vt(t){return"string"==typeof t?new pt([[document.querySelector(t)]],[document.documentElement]):new pt([[t]],dt)}function gt(t){return vt(c(t).call(document.documentElement))}var mt=0
-function _t(){return new wt}function wt(){this._="@"+(++mt).toString(36)}function xt(t){let e
-for(;e=t.sourceEvent;)t=e
-return t}function At(t,e){if(t=xt(t),void 0===e&&(e=t.currentTarget),e){var n=e.ownerSVGElement||e
-if(n.createSVGPoint){var r=n.createSVGPoint()
-return r.x=t.clientX,r.y=t.clientY,[(r=r.matrixTransform(e.getScreenCTM().inverse())).x,r.y]}if(e.getBoundingClientRect){var i=e.getBoundingClientRect()
-return[t.clientX-i.left-e.clientLeft,t.clientY-i.top-e.clientTop]}}return[t.pageX,t.pageY]}function Et(t,e){return t.target&&(t=xt(t),void 0===e&&(e=t.currentTarget),t=t.touches||[t]),Array.from(t,(t=>At(t,e)))}function kt(t){return"string"==typeof t?new pt([document.querySelectorAll(t)],[document.documentElement]):new pt([null==t?[]:l(t)],dt)}wt.prototype=_t.prototype={constructor:wt,get:function(t){for(var e=this._;!(e in t);)if(!(t=t.parentNode))return
-return t[e]},set:function(t,e){return t[this._]=e},remove:function(t){return this._ in t&&delete t[this._]},toString:function(){return this._}}},6736:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{arc:()=>F,area:()=>I,areaRadial:()=>G,curveBasis:()=>Ct,curveBasisClosed:()=>St,curveBasisOpen:()=>Ft,curveBumpX:()=>Bt,curveBumpY:()=>Pt,curveBundle:()=>Nt,curveCardinal:()=>It,curveCardinalClosed:()=>Ut,curveCardinalOpen:()=>Zt,curveCatmullRom:()=>Ht,curveCatmullRomClosed:()=>Gt,curveCatmullRomOpen:()=>Wt,curveLinear:()=>j,curveLinearClosed:()=>Jt,curveMonotoneX:()=>ae,curveMonotoneY:()=>ue,curveNatural:()=>fe,curveStep:()=>he,curveStepAfter:()=>pe,curveStepBefore:()=>de,line:()=>L,lineRadial:()=>Y,linkHorizontal:()=>nt,linkRadial:()=>it,linkVertical:()=>rt,pie:()=>z,pointRadial:()=>K,radialArea:()=>G,radialLine:()=>Y,stack:()=>me,stackOffsetDiverging:()=>we,stackOffsetExpand:()=>_e,stackOffsetNone:()=>ye,stackOffsetSilhouette:()=>xe,stackOffsetWiggle:()=>Ae,stackOrderAppearance:()=>Ee,stackOrderAscending:()=>De,stackOrderDescending:()=>Oe,stackOrderInsideOut:()=>Se,stackOrderNone:()=>be,stackOrderReverse:()=>Me,symbol:()=>At,symbolCircle:()=>ot,symbolCross:()=>at,symbolDiamond:()=>st,symbolSquare:()=>pt,symbolStar:()=>dt,symbolTriangle:()=>bt,symbolWye:()=>wt,symbols:()=>xt})
-const r=Math.PI,i=2*r,o=1e-6,a=i-o
-function u(){this._x0=this._y0=this._x1=this._y1=null,this._=""}function c(){return new u}u.prototype=c.prototype={constructor:u,moveTo:function(t,e){this._+="M"+(this._x0=this._x1=+t)+","+(this._y0=this._y1=+e)},closePath:function(){null!==this._x1&&(this._x1=this._x0,this._y1=this._y0,this._+="Z")},lineTo:function(t,e){this._+="L"+(this._x1=+t)+","+(this._y1=+e)},quadraticCurveTo:function(t,e,n,r){this._+="Q"+ +t+","+ +e+","+(this._x1=+n)+","+(this._y1=+r)},bezierCurveTo:function(t,e,n,r,i,o){this._+="C"+ +t+","+ +e+","+ +n+","+ +r+","+(this._x1=+i)+","+(this._y1=+o)},arcTo:function(t,e,n,i,a){t=+t,e=+e,n=+n,i=+i,a=+a
-var u=this._x1,c=this._y1,s=n-t,f=i-e,l=u-t,h=c-e,d=l*l+h*h
-if(a<0)throw new Error("negative radius: "+a)
-if(null===this._x1)this._+="M"+(this._x1=t)+","+(this._y1=e)
-else if(d>o)if(Math.abs(h*s-f*l)>o&&a){var p=n-u,y=i-c,b=s*s+f*f,v=p*p+y*y,g=Math.sqrt(b),m=Math.sqrt(d),_=a*Math.tan((r-Math.acos((b+d-v)/(2*g*m)))/2),w=_/m,x=_/g
-Math.abs(w-1)>o&&(this._+="L"+(t+w*l)+","+(e+w*h)),this._+="A"+a+","+a+",0,0,"+ +(h*p>l*y)+","+(this._x1=t+x*s)+","+(this._y1=e+x*f)}else this._+="L"+(this._x1=t)+","+(this._y1=e)},arc:function(t,e,n,u,c,s){t=+t,e=+e,s=!!s
-var f=(n=+n)*Math.cos(u),l=n*Math.sin(u),h=t+f,d=e+l,p=1^s,y=s?u-c:c-u
-if(n<0)throw new Error("negative radius: "+n)
-null===this._x1?this._+="M"+h+","+d:(Math.abs(this._x1-h)>o||Math.abs(this._y1-d)>o)&&(this._+="L"+h+","+d),n&&(y<0&&(y=y%i+i),y>a?this._+="A"+n+","+n+",0,1,"+p+","+(t-f)+","+(e-l)+"A"+n+","+n+",0,1,"+p+","+(this._x1=h)+","+(this._y1=d):y>o&&(this._+="A"+n+","+n+",0,"+ +(y>=r)+","+p+","+(this._x1=t+n*Math.cos(c))+","+(this._y1=e+n*Math.sin(c))))},rect:function(t,e,n,r){this._+="M"+(this._x0=this._x1=+t)+","+(this._y0=this._y1=+e)+"h"+ +n+"v"+ +r+"h"+-n+"Z"},toString:function(){return this._}}
-const s=c
-function f(t){return function(){return t}}var l=Math.abs,h=Math.atan2,d=Math.cos,p=Math.max,y=Math.min,b=Math.sin,v=Math.sqrt,g=1e-12,m=Math.PI,_=m/2,w=2*m
-function x(t){return t>1?0:t<-1?m:Math.acos(t)}function A(t){return t>=1?_:t<=-1?-_:Math.asin(t)}function E(t){return t.innerRadius}function k(t){return t.outerRadius}function D(t){return t.startAngle}function C(t){return t.endAngle}function O(t){return t&&t.padAngle}function S(t,e,n,r,i,o,a,u){var c=n-t,s=r-e,f=a-i,l=u-o,h=l*c-f*s
-if(!(h*h<g))return[t+(h=(f*(e-o)-l*(t-i))/h)*c,e+h*s]}function M(t,e,n,r,i,o,a){var u=t-n,c=e-r,s=(a?o:-o)/v(u*u+c*c),f=s*c,l=-s*u,h=t+f,d=e+l,y=n+f,b=r+l,g=(h+y)/2,m=(d+b)/2,_=y-h,w=b-d,x=_*_+w*w,A=i-o,E=h*b-y*d,k=(w<0?-1:1)*v(p(0,A*A*x-E*E)),D=(E*w-_*k)/x,C=(-E*_-w*k)/x,O=(E*w+_*k)/x,S=(-E*_+w*k)/x,M=D-g,F=C-m,T=O-g,B=S-m
-return M*M+F*F>T*T+B*B&&(D=O,C=S),{cx:D,cy:C,x01:-f,y01:-l,x11:D*(i/A-1),y11:C*(i/A-1)}}function F(){var t=E,e=k,n=f(0),r=null,i=D,o=C,a=O,u=null
-function c(){var c,f,p=+t.apply(this,arguments),E=+e.apply(this,arguments),k=i.apply(this,arguments)-_,D=o.apply(this,arguments)-_,C=l(D-k),O=D>k
-if(u||(u=c=s()),E<p&&(f=E,E=p,p=f),E>g)if(C>w-g)u.moveTo(E*d(k),E*b(k)),u.arc(0,0,E,k,D,!O),p>g&&(u.moveTo(p*d(D),p*b(D)),u.arc(0,0,p,D,k,O))
-else{var F,T,B=k,P=D,j=k,N=D,R=C,L=C,I=a.apply(this,arguments)/2,$=I>g&&(r?+r.apply(this,arguments):v(p*p+E*E)),U=y(l(E-p)/2,+n.apply(this,arguments)),z=U,Z=U
-if($>g){var q=A($/p*b(I)),V=A($/E*b(I));(R-=2*q)>g?(j+=q*=O?1:-1,N-=q):(R=0,j=N=(k+D)/2),(L-=2*V)>g?(B+=V*=O?1:-1,P-=V):(L=0,B=P=(k+D)/2)}var H=E*d(B),Y=E*b(B),G=p*d(N),K=p*b(N)
-if(U>g){var W,X=E*d(P),J=E*b(P),Q=p*d(j),tt=p*b(j)
-if(C<m&&(W=S(H,Y,Q,tt,X,J,G,K))){var et=H-W[0],nt=Y-W[1],rt=X-W[0],it=J-W[1],ot=1/b(x((et*rt+nt*it)/(v(et*et+nt*nt)*v(rt*rt+it*it)))/2),at=v(W[0]*W[0]+W[1]*W[1])
-z=y(U,(p-at)/(ot-1)),Z=y(U,(E-at)/(ot+1))}}L>g?Z>g?(F=M(Q,tt,H,Y,E,Z,O),T=M(X,J,G,K,E,Z,O),u.moveTo(F.cx+F.x01,F.cy+F.y01),Z<U?u.arc(F.cx,F.cy,Z,h(F.y01,F.x01),h(T.y01,T.x01),!O):(u.arc(F.cx,F.cy,Z,h(F.y01,F.x01),h(F.y11,F.x11),!O),u.arc(0,0,E,h(F.cy+F.y11,F.cx+F.x11),h(T.cy+T.y11,T.cx+T.x11),!O),u.arc(T.cx,T.cy,Z,h(T.y11,T.x11),h(T.y01,T.x01),!O))):(u.moveTo(H,Y),u.arc(0,0,E,B,P,!O)):u.moveTo(H,Y),p>g&&R>g?z>g?(F=M(G,K,X,J,p,-z,O),T=M(H,Y,Q,tt,p,-z,O),u.lineTo(F.cx+F.x01,F.cy+F.y01),z<U?u.arc(F.cx,F.cy,z,h(F.y01,F.x01),h(T.y01,T.x01),!O):(u.arc(F.cx,F.cy,z,h(F.y01,F.x01),h(F.y11,F.x11),!O),u.arc(0,0,p,h(F.cy+F.y11,F.cx+F.x11),h(T.cy+T.y11,T.cx+T.x11),O),u.arc(T.cx,T.cy,z,h(T.y11,T.x11),h(T.y01,T.x01),!O))):u.arc(0,0,p,N,j,O):u.lineTo(G,K)}else u.moveTo(0,0)
-if(u.closePath(),c)return u=null,c+""||null}return c.centroid=function(){var n=(+t.apply(this,arguments)+ +e.apply(this,arguments))/2,r=(+i.apply(this,arguments)+ +o.apply(this,arguments))/2-m/2
-return[d(r)*n,b(r)*n]},c.innerRadius=function(e){return arguments.length?(t="function"==typeof e?e:f(+e),c):t},c.outerRadius=function(t){return arguments.length?(e="function"==typeof t?t:f(+t),c):e},c.cornerRadius=function(t){return arguments.length?(n="function"==typeof t?t:f(+t),c):n},c.padRadius=function(t){return arguments.length?(r=null==t?null:"function"==typeof t?t:f(+t),c):r},c.startAngle=function(t){return arguments.length?(i="function"==typeof t?t:f(+t),c):i},c.endAngle=function(t){return arguments.length?(o="function"==typeof t?t:f(+t),c):o},c.padAngle=function(t){return arguments.length?(a="function"==typeof t?t:f(+t),c):a},c.context=function(t){return arguments.length?(u=null==t?null:t,c):u},c}var T=Array.prototype.slice
-function B(t){return"object"==typeof t&&"length"in t?t:Array.from(t)}function P(t){this._context=t}function j(t){return new P(t)}function N(t){return t[0]}function R(t){return t[1]}function L(t,e){var n=f(!0),r=null,i=j,o=null
-function a(a){var u,c,f,l=(a=B(a)).length,h=!1
-for(null==r&&(o=i(f=s())),u=0;u<=l;++u)!(u<l&&n(c=a[u],u,a))===h&&((h=!h)?o.lineStart():o.lineEnd()),h&&o.point(+t(c,u,a),+e(c,u,a))
-if(f)return o=null,f+""||null}return t="function"==typeof t?t:void 0===t?N:f(t),e="function"==typeof e?e:void 0===e?R:f(e),a.x=function(e){return arguments.length?(t="function"==typeof e?e:f(+e),a):t},a.y=function(t){return arguments.length?(e="function"==typeof t?t:f(+t),a):e},a.defined=function(t){return arguments.length?(n="function"==typeof t?t:f(!!t),a):n},a.curve=function(t){return arguments.length?(i=t,null!=r&&(o=i(r)),a):i},a.context=function(t){return arguments.length?(null==t?r=o=null:o=i(r=t),a):r},a}function I(t,e,n){var r=null,i=f(!0),o=null,a=j,u=null
-function c(c){var f,l,h,d,p,y=(c=B(c)).length,b=!1,v=new Array(y),g=new Array(y)
-for(null==o&&(u=a(p=s())),f=0;f<=y;++f){if(!(f<y&&i(d=c[f],f,c))===b)if(b=!b)l=f,u.areaStart(),u.lineStart()
-else{for(u.lineEnd(),u.lineStart(),h=f-1;h>=l;--h)u.point(v[h],g[h])
-u.lineEnd(),u.areaEnd()}b&&(v[f]=+t(d,f,c),g[f]=+e(d,f,c),u.point(r?+r(d,f,c):v[f],n?+n(d,f,c):g[f]))}if(p)return u=null,p+""||null}function l(){return L().defined(i).curve(a).context(o)}return t="function"==typeof t?t:void 0===t?N:f(+t),e="function"==typeof e?e:f(void 0===e?0:+e),n="function"==typeof n?n:void 0===n?R:f(+n),c.x=function(e){return arguments.length?(t="function"==typeof e?e:f(+e),r=null,c):t},c.x0=function(e){return arguments.length?(t="function"==typeof e?e:f(+e),c):t},c.x1=function(t){return arguments.length?(r=null==t?null:"function"==typeof t?t:f(+t),c):r},c.y=function(t){return arguments.length?(e="function"==typeof t?t:f(+t),n=null,c):e},c.y0=function(t){return arguments.length?(e="function"==typeof t?t:f(+t),c):e},c.y1=function(t){return arguments.length?(n=null==t?null:"function"==typeof t?t:f(+t),c):n},c.lineX0=c.lineY0=function(){return l().x(t).y(e)},c.lineY1=function(){return l().x(t).y(n)},c.lineX1=function(){return l().x(r).y(e)},c.defined=function(t){return arguments.length?(i="function"==typeof t?t:f(!!t),c):i},c.curve=function(t){return arguments.length?(a=t,null!=o&&(u=a(o)),c):a},c.context=function(t){return arguments.length?(null==t?o=u=null:u=a(o=t),c):o},c}function $(t,e){return e<t?-1:e>t?1:e>=t?0:NaN}function U(t){return t}function z(){var t=U,e=$,n=null,r=f(0),i=f(w),o=f(0)
-function a(a){var u,c,s,f,l,h=(a=B(a)).length,d=0,p=new Array(h),y=new Array(h),b=+r.apply(this,arguments),v=Math.min(w,Math.max(-w,i.apply(this,arguments)-b)),g=Math.min(Math.abs(v)/h,o.apply(this,arguments)),m=g*(v<0?-1:1)
-for(u=0;u<h;++u)(l=y[p[u]=u]=+t(a[u],u,a))>0&&(d+=l)
-for(null!=e?p.sort((function(t,n){return e(y[t],y[n])})):null!=n&&p.sort((function(t,e){return n(a[t],a[e])})),u=0,s=d?(v-h*m)/d:0;u<h;++u,b=f)c=p[u],f=b+((l=y[c])>0?l*s:0)+m,y[c]={data:a[c],index:u,value:l,startAngle:b,endAngle:f,padAngle:g}
-return y}return a.value=function(e){return arguments.length?(t="function"==typeof e?e:f(+e),a):t},a.sortValues=function(t){return arguments.length?(e=t,n=null,a):e},a.sort=function(t){return arguments.length?(n=t,e=null,a):n},a.startAngle=function(t){return arguments.length?(r="function"==typeof t?t:f(+t),a):r},a.endAngle=function(t){return arguments.length?(i="function"==typeof t?t:f(+t),a):i},a.padAngle=function(t){return arguments.length?(o="function"==typeof t?t:f(+t),a):o},a}P.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._point=0},lineEnd:function(){(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,e):this._context.moveTo(t,e)
-break
-case 1:this._point=2
-default:this._context.lineTo(t,e)}}}
-var Z=V(j)
-function q(t){this._curve=t}function V(t){function e(e){return new q(t(e))}return e._curve=t,e}function H(t){var e=t.curve
-return t.angle=t.x,delete t.x,t.radius=t.y,delete t.y,t.curve=function(t){return arguments.length?e(V(t)):e()._curve},t}function Y(){return H(L().curve(Z))}function G(){var t=I().curve(Z),e=t.curve,n=t.lineX0,r=t.lineX1,i=t.lineY0,o=t.lineY1
-return t.angle=t.x,delete t.x,t.startAngle=t.x0,delete t.x0,t.endAngle=t.x1,delete t.x1,t.radius=t.y,delete t.y,t.innerRadius=t.y0,delete t.y0,t.outerRadius=t.y1,delete t.y1,t.lineStartAngle=function(){return H(n())},delete t.lineX0,t.lineEndAngle=function(){return H(r())},delete t.lineX1,t.lineInnerRadius=function(){return H(i())},delete t.lineY0,t.lineOuterRadius=function(){return H(o())},delete t.lineY1,t.curve=function(t){return arguments.length?e(V(t)):e()._curve},t}function K(t,e){return[(e=+e)*Math.cos(t-=Math.PI/2),e*Math.sin(t)]}function W(t){return t.source}function X(t){return t.target}function J(t){var e=W,n=X,r=N,i=R,o=null
-function a(){var a,u=T.call(arguments),c=e.apply(this,u),f=n.apply(this,u)
-if(o||(o=a=s()),t(o,+r.apply(this,(u[0]=c,u)),+i.apply(this,u),+r.apply(this,(u[0]=f,u)),+i.apply(this,u)),a)return o=null,a+""||null}return a.source=function(t){return arguments.length?(e=t,a):e},a.target=function(t){return arguments.length?(n=t,a):n},a.x=function(t){return arguments.length?(r="function"==typeof t?t:f(+t),a):r},a.y=function(t){return arguments.length?(i="function"==typeof t?t:f(+t),a):i},a.context=function(t){return arguments.length?(o=null==t?null:t,a):o},a}function Q(t,e,n,r,i){t.moveTo(e,n),t.bezierCurveTo(e=(e+r)/2,n,e,i,r,i)}function tt(t,e,n,r,i){t.moveTo(e,n),t.bezierCurveTo(e,n=(n+i)/2,r,n,r,i)}function et(t,e,n,r,i){var o=K(e,n),a=K(e,n=(n+i)/2),u=K(r,n),c=K(r,i)
-t.moveTo(o[0],o[1]),t.bezierCurveTo(a[0],a[1],u[0],u[1],c[0],c[1])}function nt(){return J(Q)}function rt(){return J(tt)}function it(){var t=J(et)
-return t.angle=t.x,delete t.x,t.radius=t.y,delete t.y,t}q.prototype={areaStart:function(){this._curve.areaStart()},areaEnd:function(){this._curve.areaEnd()},lineStart:function(){this._curve.lineStart()},lineEnd:function(){this._curve.lineEnd()},point:function(t,e){this._curve.point(e*Math.sin(t),e*-Math.cos(t))}}
-const ot={draw:function(t,e){var n=Math.sqrt(e/m)
-t.moveTo(n,0),t.arc(0,0,n,0,w)}},at={draw:function(t,e){var n=Math.sqrt(e/5)/2
-t.moveTo(-3*n,-n),t.lineTo(-n,-n),t.lineTo(-n,-3*n),t.lineTo(n,-3*n),t.lineTo(n,-n),t.lineTo(3*n,-n),t.lineTo(3*n,n),t.lineTo(n,n),t.lineTo(n,3*n),t.lineTo(-n,3*n),t.lineTo(-n,n),t.lineTo(-3*n,n),t.closePath()}}
-var ut=Math.sqrt(1/3),ct=2*ut
-const st={draw:function(t,e){var n=Math.sqrt(e/ct),r=n*ut
-t.moveTo(0,-n),t.lineTo(r,0),t.lineTo(0,n),t.lineTo(-r,0),t.closePath()}}
-var ft=Math.sin(m/10)/Math.sin(7*m/10),lt=Math.sin(w/10)*ft,ht=-Math.cos(w/10)*ft
-const dt={draw:function(t,e){var n=Math.sqrt(.8908130915292852*e),r=lt*n,i=ht*n
-t.moveTo(0,-n),t.lineTo(r,i)
-for(var o=1;o<5;++o){var a=w*o/5,u=Math.cos(a),c=Math.sin(a)
-t.lineTo(c*n,-u*n),t.lineTo(u*r-c*i,c*r+u*i)}t.closePath()}},pt={draw:function(t,e){var n=Math.sqrt(e),r=-n/2
-t.rect(r,r,n,n)}}
-var yt=Math.sqrt(3)
-const bt={draw:function(t,e){var n=-Math.sqrt(e/(3*yt))
-t.moveTo(0,2*n),t.lineTo(-yt*n,-n),t.lineTo(yt*n,-n),t.closePath()}}
-var vt=-.5,gt=Math.sqrt(3)/2,mt=1/Math.sqrt(12),_t=3*(mt/2+1)
-const wt={draw:function(t,e){var n=Math.sqrt(e/_t),r=n/2,i=n*mt,o=r,a=n*mt+n,u=-o,c=a
-t.moveTo(r,i),t.lineTo(o,a),t.lineTo(u,c),t.lineTo(vt*r-gt*i,gt*r+vt*i),t.lineTo(vt*o-gt*a,gt*o+vt*a),t.lineTo(vt*u-gt*c,gt*u+vt*c),t.lineTo(vt*r+gt*i,vt*i-gt*r),t.lineTo(vt*o+gt*a,vt*a-gt*o),t.lineTo(vt*u+gt*c,vt*c-gt*u),t.closePath()}}
-var xt=[ot,at,st,pt,dt,bt,wt]
-function At(t,e){var n=null
-function r(){var r
-if(n||(n=r=s()),t.apply(this,arguments).draw(n,+e.apply(this,arguments)),r)return n=null,r+""||null}return t="function"==typeof t?t:f(t||ot),e="function"==typeof e?e:f(void 0===e?64:+e),r.type=function(e){return arguments.length?(t="function"==typeof e?e:f(e),r):t},r.size=function(t){return arguments.length?(e="function"==typeof t?t:f(+t),r):e},r.context=function(t){return arguments.length?(n=null==t?null:t,r):n},r}function Et(){}function kt(t,e,n){t._context.bezierCurveTo((2*t._x0+t._x1)/3,(2*t._y0+t._y1)/3,(t._x0+2*t._x1)/3,(t._y0+2*t._y1)/3,(t._x0+4*t._x1+e)/6,(t._y0+4*t._y1+n)/6)}function Dt(t){this._context=t}function Ct(t){return new Dt(t)}function Ot(t){this._context=t}function St(t){return new Ot(t)}function Mt(t){this._context=t}function Ft(t){return new Mt(t)}Dt.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=NaN,this._point=0},lineEnd:function(){switch(this._point){case 3:kt(this,this._x1,this._y1)
-case 2:this._context.lineTo(this._x1,this._y1)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,e):this._context.moveTo(t,e)
-break
-case 1:this._point=2
-break
-case 2:this._point=3,this._context.lineTo((5*this._x0+this._x1)/6,(5*this._y0+this._y1)/6)
-default:kt(this,t,e)}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=e}},Ot.prototype={areaStart:Et,areaEnd:Et,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._y0=this._y1=this._y2=this._y3=this._y4=NaN,this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x2,this._y2),this._context.closePath()
-break
-case 2:this._context.moveTo((this._x2+2*this._x3)/3,(this._y2+2*this._y3)/3),this._context.lineTo((this._x3+2*this._x2)/3,(this._y3+2*this._y2)/3),this._context.closePath()
-break
-case 3:this.point(this._x2,this._y2),this.point(this._x3,this._y3),this.point(this._x4,this._y4)}},point:function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1,this._x2=t,this._y2=e
-break
-case 1:this._point=2,this._x3=t,this._y3=e
-break
-case 2:this._point=3,this._x4=t,this._y4=e,this._context.moveTo((this._x0+4*this._x1+t)/6,(this._y0+4*this._y1+e)/6)
-break
-default:kt(this,t,e)}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=e}},Mt.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=NaN,this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1
-break
-case 1:this._point=2
-break
-case 2:this._point=3
-var n=(this._x0+4*this._x1+t)/6,r=(this._y0+4*this._y1+e)/6
-this._line?this._context.lineTo(n,r):this._context.moveTo(n,r)
-break
-case 3:this._point=4
-default:kt(this,t,e)}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=e}}
-class Tt{constructor(t,e){this._context=t,this._x=e}areaStart(){this._line=0}areaEnd(){this._line=NaN}lineStart(){this._point=0}lineEnd(){(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line}point(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,e):this._context.moveTo(t,e)
-break
-case 1:this._point=2
-default:this._x?this._context.bezierCurveTo(this._x0=(this._x0+t)/2,this._y0,this._x0,e,t,e):this._context.bezierCurveTo(this._x0,this._y0=(this._y0+e)/2,t,this._y0,t,e)}this._x0=t,this._y0=e}}function Bt(t){return new Tt(t,!0)}function Pt(t){return new Tt(t,!1)}function jt(t,e){this._basis=new Dt(t),this._beta=e}jt.prototype={lineStart:function(){this._x=[],this._y=[],this._basis.lineStart()},lineEnd:function(){var t=this._x,e=this._y,n=t.length-1
-if(n>0)for(var r,i=t[0],o=e[0],a=t[n]-i,u=e[n]-o,c=-1;++c<=n;)r=c/n,this._basis.point(this._beta*t[c]+(1-this._beta)*(i+r*a),this._beta*e[c]+(1-this._beta)*(o+r*u))
-this._x=this._y=null,this._basis.lineEnd()},point:function(t,e){this._x.push(+t),this._y.push(+e)}}
-const Nt=function t(e){function n(t){return 1===e?new Dt(t):new jt(t,e)}return n.beta=function(e){return t(+e)},n}(.85)
-function Rt(t,e,n){t._context.bezierCurveTo(t._x1+t._k*(t._x2-t._x0),t._y1+t._k*(t._y2-t._y0),t._x2+t._k*(t._x1-e),t._y2+t._k*(t._y1-n),t._x2,t._y2)}function Lt(t,e){this._context=t,this._k=(1-e)/6}Lt.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x2,this._y2)
-break
-case 3:Rt(this,this._x1,this._y1)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,e):this._context.moveTo(t,e)
-break
-case 1:this._point=2,this._x1=t,this._y1=e
-break
-case 2:this._point=3
-default:Rt(this,t,e)}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=e}}
-const It=function t(e){function n(t){return new Lt(t,e)}return n.tension=function(e){return t(+e)},n}(0)
-function $t(t,e){this._context=t,this._k=(1-e)/6}$t.prototype={areaStart:Et,areaEnd:Et,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN,this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x3,this._y3),this._context.closePath()
-break
-case 2:this._context.lineTo(this._x3,this._y3),this._context.closePath()
-break
-case 3:this.point(this._x3,this._y3),this.point(this._x4,this._y4),this.point(this._x5,this._y5)}},point:function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1,this._x3=t,this._y3=e
-break
-case 1:this._point=2,this._context.moveTo(this._x4=t,this._y4=e)
-break
-case 2:this._point=3,this._x5=t,this._y5=e
-break
-default:Rt(this,t,e)}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=e}}
-const Ut=function t(e){function n(t){return new $t(t,e)}return n.tension=function(e){return t(+e)},n}(0)
-function zt(t,e){this._context=t,this._k=(1-e)/6}zt.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1
-break
-case 1:this._point=2
-break
-case 2:this._point=3,this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2)
-break
-case 3:this._point=4
-default:Rt(this,t,e)}this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=e}}
-const Zt=function t(e){function n(t){return new zt(t,e)}return n.tension=function(e){return t(+e)},n}(0)
-function qt(t,e,n){var r=t._x1,i=t._y1,o=t._x2,a=t._y2
-if(t._l01_a>g){var u=2*t._l01_2a+3*t._l01_a*t._l12_a+t._l12_2a,c=3*t._l01_a*(t._l01_a+t._l12_a)
-r=(r*u-t._x0*t._l12_2a+t._x2*t._l01_2a)/c,i=(i*u-t._y0*t._l12_2a+t._y2*t._l01_2a)/c}if(t._l23_a>g){var s=2*t._l23_2a+3*t._l23_a*t._l12_a+t._l12_2a,f=3*t._l23_a*(t._l23_a+t._l12_a)
-o=(o*s+t._x1*t._l23_2a-e*t._l12_2a)/f,a=(a*s+t._y1*t._l23_2a-n*t._l12_2a)/f}t._context.bezierCurveTo(r,i,o,a,t._x2,t._y2)}function Vt(t,e){this._context=t,this._alpha=e}Vt.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x2,this._y2)
-break
-case 3:this.point(this._x2,this._y2)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,e){if(t=+t,e=+e,this._point){var n=this._x2-t,r=this._y2-e
-this._l23_a=Math.sqrt(this._l23_2a=Math.pow(n*n+r*r,this._alpha))}switch(this._point){case 0:this._point=1,this._line?this._context.lineTo(t,e):this._context.moveTo(t,e)
-break
-case 1:this._point=2
-break
-case 2:this._point=3
-default:qt(this,t,e)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=e}}
-const Ht=function t(e){function n(t){return e?new Vt(t,e):new Lt(t,0)}return n.alpha=function(e){return t(+e)},n}(.5)
-function Yt(t,e){this._context=t,this._alpha=e}Yt.prototype={areaStart:Et,areaEnd:Et,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x3,this._y3),this._context.closePath()
-break
-case 2:this._context.lineTo(this._x3,this._y3),this._context.closePath()
-break
-case 3:this.point(this._x3,this._y3),this.point(this._x4,this._y4),this.point(this._x5,this._y5)}},point:function(t,e){if(t=+t,e=+e,this._point){var n=this._x2-t,r=this._y2-e
-this._l23_a=Math.sqrt(this._l23_2a=Math.pow(n*n+r*r,this._alpha))}switch(this._point){case 0:this._point=1,this._x3=t,this._y3=e
-break
-case 1:this._point=2,this._context.moveTo(this._x4=t,this._y4=e)
-break
-case 2:this._point=3,this._x5=t,this._y5=e
-break
-default:qt(this,t,e)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=e}}
-const Gt=function t(e){function n(t){return e?new Yt(t,e):new $t(t,0)}return n.alpha=function(e){return t(+e)},n}(.5)
-function Kt(t,e){this._context=t,this._alpha=e}Kt.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,e){if(t=+t,e=+e,this._point){var n=this._x2-t,r=this._y2-e
-this._l23_a=Math.sqrt(this._l23_2a=Math.pow(n*n+r*r,this._alpha))}switch(this._point){case 0:this._point=1
-break
-case 1:this._point=2
-break
-case 2:this._point=3,this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2)
-break
-case 3:this._point=4
-default:qt(this,t,e)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=t,this._y0=this._y1,this._y1=this._y2,this._y2=e}}
-const Wt=function t(e){function n(t){return e?new Kt(t,e):new zt(t,0)}return n.alpha=function(e){return t(+e)},n}(.5)
-function Xt(t){this._context=t}function Jt(t){return new Xt(t)}function Qt(t){return t<0?-1:1}function te(t,e,n){var r=t._x1-t._x0,i=e-t._x1,o=(t._y1-t._y0)/(r||i<0&&-0),a=(n-t._y1)/(i||r<0&&-0),u=(o*i+a*r)/(r+i)
-return(Qt(o)+Qt(a))*Math.min(Math.abs(o),Math.abs(a),.5*Math.abs(u))||0}function ee(t,e){var n=t._x1-t._x0
-return n?(3*(t._y1-t._y0)/n-e)/2:e}function ne(t,e,n){var r=t._x0,i=t._y0,o=t._x1,a=t._y1,u=(o-r)/3
-t._context.bezierCurveTo(r+u,i+u*e,o-u,a-u*n,o,a)}function re(t){this._context=t}function ie(t){this._context=new oe(t)}function oe(t){this._context=t}function ae(t){return new re(t)}function ue(t){return new ie(t)}function ce(t){this._context=t}function se(t){var e,n,r=t.length-1,i=new Array(r),o=new Array(r),a=new Array(r)
-for(i[0]=0,o[0]=2,a[0]=t[0]+2*t[1],e=1;e<r-1;++e)i[e]=1,o[e]=4,a[e]=4*t[e]+2*t[e+1]
-for(i[r-1]=2,o[r-1]=7,a[r-1]=8*t[r-1]+t[r],e=1;e<r;++e)n=i[e]/o[e-1],o[e]-=n,a[e]-=n*a[e-1]
-for(i[r-1]=a[r-1]/o[r-1],e=r-2;e>=0;--e)i[e]=(a[e]-i[e+1])/o[e]
-for(o[r-1]=(t[r]+i[r-1])/2,e=0;e<r-1;++e)o[e]=2*t[e+1]-i[e+1]
-return[i,o]}function fe(t){return new ce(t)}function le(t,e){this._context=t,this._t=e}function he(t){return new le(t,.5)}function de(t){return new le(t,0)}function pe(t){return new le(t,1)}function ye(t,e){if((i=t.length)>1)for(var n,r,i,o=1,a=t[e[0]],u=a.length;o<i;++o)for(r=a,a=t[e[o]],n=0;n<u;++n)a[n][1]+=a[n][0]=isNaN(r[n][1])?r[n][0]:r[n][1]}function be(t){for(var e=t.length,n=new Array(e);--e>=0;)n[e]=e
-return n}function ve(t,e){return t[e]}function ge(t){const e=[]
-return e.key=t,e}function me(){var t=f([]),e=be,n=ye,r=ve
-function i(i){var o,a,u=Array.from(t.apply(this,arguments),ge),c=u.length,s=-1
-for(const t of i)for(o=0,++s;o<c;++o)(u[o][s]=[0,+r(t,u[o].key,s,i)]).data=t
-for(o=0,a=B(e(u));o<c;++o)u[a[o]].index=o
-return n(u,a),u}return i.keys=function(e){return arguments.length?(t="function"==typeof e?e:f(Array.from(e)),i):t},i.value=function(t){return arguments.length?(r="function"==typeof t?t:f(+t),i):r},i.order=function(t){return arguments.length?(e=null==t?be:"function"==typeof t?t:f(Array.from(t)),i):e},i.offset=function(t){return arguments.length?(n=null==t?ye:t,i):n},i}function _e(t,e){if((r=t.length)>0){for(var n,r,i,o=0,a=t[0].length;o<a;++o){for(i=n=0;n<r;++n)i+=t[n][o][1]||0
-if(i)for(n=0;n<r;++n)t[n][o][1]/=i}ye(t,e)}}function we(t,e){if((u=t.length)>0)for(var n,r,i,o,a,u,c=0,s=t[e[0]].length;c<s;++c)for(o=a=0,n=0;n<u;++n)(i=(r=t[e[n]][c])[1]-r[0])>0?(r[0]=o,r[1]=o+=i):i<0?(r[1]=a,r[0]=a+=i):(r[0]=0,r[1]=i)}function xe(t,e){if((n=t.length)>0){for(var n,r=0,i=t[e[0]],o=i.length;r<o;++r){for(var a=0,u=0;a<n;++a)u+=t[a][r][1]||0
-i[r][1]+=i[r][0]=-u/2}ye(t,e)}}function Ae(t,e){if((i=t.length)>0&&(r=(n=t[e[0]]).length)>0){for(var n,r,i,o=0,a=1;a<r;++a){for(var u=0,c=0,s=0;u<i;++u){for(var f=t[e[u]],l=f[a][1]||0,h=(l-(f[a-1][1]||0))/2,d=0;d<u;++d){var p=t[e[d]]
-h+=(p[a][1]||0)-(p[a-1][1]||0)}c+=l,s+=h*l}n[a-1][1]+=n[a-1][0]=o,c&&(o-=s/c)}n[a-1][1]+=n[a-1][0]=o,ye(t,e)}}function Ee(t){var e=t.map(ke)
-return be(t).sort((function(t,n){return e[t]-e[n]}))}function ke(t){for(var e,n=-1,r=0,i=t.length,o=-1/0;++n<i;)(e=+t[n][1])>o&&(o=e,r=n)
-return r}function De(t){var e=t.map(Ce)
-return be(t).sort((function(t,n){return e[t]-e[n]}))}function Ce(t){for(var e,n=0,r=-1,i=t.length;++r<i;)(e=+t[r][1])&&(n+=e)
-return n}function Oe(t){return De(t).reverse()}function Se(t){var e,n,r=t.length,i=t.map(Ce),o=Ee(t),a=0,u=0,c=[],s=[]
-for(e=0;e<r;++e)n=o[e],a<u?(a+=i[n],c.push(n)):(u+=i[n],s.push(n))
-return s.reverse().concat(c)}function Me(t){return be(t).reverse()}Xt.prototype={areaStart:Et,areaEnd:Et,lineStart:function(){this._point=0},lineEnd:function(){this._point&&this._context.closePath()},point:function(t,e){t=+t,e=+e,this._point?this._context.lineTo(t,e):(this._point=1,this._context.moveTo(t,e))}},re.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=this._t0=NaN,this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x1,this._y1)
-break
-case 3:ne(this,this._t0,ee(this,this._t0))}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(t,e){var n=NaN
-if(e=+e,(t=+t)!==this._x1||e!==this._y1){switch(this._point){case 0:this._point=1,this._line?this._context.lineTo(t,e):this._context.moveTo(t,e)
-break
-case 1:this._point=2
-break
-case 2:this._point=3,ne(this,ee(this,n=te(this,t,e)),n)
-break
-default:ne(this,this._t0,n=te(this,t,e))}this._x0=this._x1,this._x1=t,this._y0=this._y1,this._y1=e,this._t0=n}}},(ie.prototype=Object.create(re.prototype)).point=function(t,e){re.prototype.point.call(this,e,t)},oe.prototype={moveTo:function(t,e){this._context.moveTo(e,t)},closePath:function(){this._context.closePath()},lineTo:function(t,e){this._context.lineTo(e,t)},bezierCurveTo:function(t,e,n,r,i,o){this._context.bezierCurveTo(e,t,r,n,o,i)}},ce.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x=[],this._y=[]},lineEnd:function(){var t=this._x,e=this._y,n=t.length
-if(n)if(this._line?this._context.lineTo(t[0],e[0]):this._context.moveTo(t[0],e[0]),2===n)this._context.lineTo(t[1],e[1])
-else for(var r=se(t),i=se(e),o=0,a=1;a<n;++o,++a)this._context.bezierCurveTo(r[0][o],i[0][o],r[1][o],i[1][o],t[a],e[a]);(this._line||0!==this._line&&1===n)&&this._context.closePath(),this._line=1-this._line,this._x=this._y=null},point:function(t,e){this._x.push(+t),this._y.push(+e)}},le.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x=this._y=NaN,this._point=0},lineEnd:function(){0<this._t&&this._t<1&&2===this._point&&this._context.lineTo(this._x,this._y),(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line>=0&&(this._t=1-this._t,this._line=1-this._line)},point:function(t,e){switch(t=+t,e=+e,this._point){case 0:this._point=1,this._line?this._context.lineTo(t,e):this._context.moveTo(t,e)
-break
-case 1:this._point=2
-default:if(this._t<=0)this._context.lineTo(this._x,e),this._context.lineTo(t,e)
-else{var n=this._x*(1-this._t)+t*this._t
-this._context.lineTo(n,this._y),this._context.lineTo(n,e)}}this._x=t,this._y=e}}},4434:function(t){t.exports=function(){"use strict"
-var t="millisecond",e="second",n="minute",r="hour",i="day",o="week",a="month",u="quarter",c="year",s="date",f=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[^0-9]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,l=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,h={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_")},d=function(t,e,n){var r=String(t)
-return!r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},p={s:d,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60
-return(e<=0?"+":"-")+d(r,2,"0")+":"+d(i,2,"0")},m:function t(e,n){if(e.date()<n.date())return-t(n,e)
-var r=12*(n.year()-e.year())+(n.month()-e.month()),i=e.clone().add(r,a),o=n-i<0,u=e.clone().add(r+(o?-1:1),a)
-return+(-(r+(n-i)/(o?i-u:u-i))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(f){return{M:a,y:c,w:o,d:i,D:s,h:r,m:n,s:e,ms:t,Q:u}[f]||String(f||"").toLowerCase().replace(/s$/,"")},u:function(t){return void 0===t}},y="en",b={}
-b[y]=h
-var v=function(t){return t instanceof w},g=function(t,e,n){var r
-if(!t)return y
-if("string"==typeof t)b[t]&&(r=t),e&&(b[t]=e,r=t)
-else{var i=t.name
-b[i]=t,r=i}return!n&&r&&(y=r),r||!n&&y},m=function(t,e){if(v(t))return t.clone()
-var n="object"==typeof e?e:{}
-return n.date=t,n.args=arguments,new w(n)},_=p
-_.l=g,_.i=v,_.w=function(t,e){return m(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})}
-var w=function(){function h(t){this.$L=g(t.locale,null,!0),this.parse(t)}var d=h.prototype
-return d.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc
-if(null===e)return new Date(NaN)
-if(_.u(e))return new Date
-if(e instanceof Date)return new Date(e)
-if("string"==typeof e&&!/Z$/i.test(e)){var r=e.match(f)
-if(r){var i=r[2]-1||0,o=(r[7]||"0").substring(0,3)
-return n?new Date(Date.UTC(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,o)):new Date(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,o)}}return new Date(e)}(t),this.$x=t.x||{},this.init()},d.init=function(){var t=this.$d
-this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},d.$utils=function(){return _},d.isValid=function(){return!("Invalid Date"===this.$d.toString())},d.isSame=function(t,e){var n=m(t)
-return this.startOf(e)<=n&&n<=this.endOf(e)},d.isAfter=function(t,e){return m(t)<this.startOf(e)},d.isBefore=function(t,e){return this.endOf(e)<m(t)},d.$g=function(t,e,n){return _.u(t)?this[e]:this.set(n,t)},d.unix=function(){return Math.floor(this.valueOf()/1e3)},d.valueOf=function(){return this.$d.getTime()},d.startOf=function(t,u){var f=this,l=!!_.u(u)||u,h=_.p(t),d=function(t,e){var n=_.w(f.$u?Date.UTC(f.$y,e,t):new Date(f.$y,e,t),f)
-return l?n:n.endOf(i)},p=function(t,e){return _.w(f.toDate()[t].apply(f.toDate("s"),(l?[0,0,0,0]:[23,59,59,999]).slice(e)),f)},y=this.$W,b=this.$M,v=this.$D,g="set"+(this.$u?"UTC":"")
-switch(h){case c:return l?d(1,0):d(31,11)
-case a:return l?d(1,b):d(0,b+1)
-case o:var m=this.$locale().weekStart||0,w=(y<m?y+7:y)-m
-return d(l?v-w:v+(6-w),b)
-case i:case s:return p(g+"Hours",0)
-case r:return p(g+"Minutes",1)
-case n:return p(g+"Seconds",2)
-case e:return p(g+"Milliseconds",3)
-default:return this.clone()}},d.endOf=function(t){return this.startOf(t,!1)},d.$set=function(o,u){var f,l=_.p(o),h="set"+(this.$u?"UTC":""),d=(f={},f[i]=h+"Date",f[s]=h+"Date",f[a]=h+"Month",f[c]=h+"FullYear",f[r]=h+"Hours",f[n]=h+"Minutes",f[e]=h+"Seconds",f[t]=h+"Milliseconds",f)[l],p=l===i?this.$D+(u-this.$W):u
-if(l===a||l===c){var y=this.clone().set(s,1)
-y.$d[d](p),y.init(),this.$d=y.set(s,Math.min(this.$D,y.daysInMonth())).$d}else d&&this.$d[d](p)
-return this.init(),this},d.set=function(t,e){return this.clone().$set(t,e)},d.get=function(t){return this[_.p(t)]()},d.add=function(t,u){var s,f=this
-t=Number(t)
-var l=_.p(u),h=function(e){var n=m(f)
-return _.w(n.date(n.date()+Math.round(e*t)),f)}
-if(l===a)return this.set(a,this.$M+t)
-if(l===c)return this.set(c,this.$y+t)
-if(l===i)return h(1)
-if(l===o)return h(7)
-var d=(s={},s[n]=6e4,s[r]=36e5,s[e]=1e3,s)[l]||1,p=this.$d.getTime()+t*d
-return _.w(p,this)},d.subtract=function(t,e){return this.add(-1*t,e)},d.format=function(t){var e=this
-if(!this.isValid())return"Invalid Date"
-var n=t||"YYYY-MM-DDTHH:mm:ssZ",r=_.z(this),i=this.$locale(),o=this.$H,a=this.$m,u=this.$M,c=i.weekdays,s=i.months,f=function(t,r,i,o){return t&&(t[r]||t(e,n))||i[r].substr(0,o)},h=function(t){return _.s(o%12||12,t,"0")},d=i.meridiem||function(t,e,n){var r=t<12?"AM":"PM"
-return n?r.toLowerCase():r},p={YY:String(this.$y).slice(-2),YYYY:this.$y,M:u+1,MM:_.s(u+1,2,"0"),MMM:f(i.monthsShort,u,s,3),MMMM:f(s,u),D:this.$D,DD:_.s(this.$D,2,"0"),d:String(this.$W),dd:f(i.weekdaysMin,this.$W,c,2),ddd:f(i.weekdaysShort,this.$W,c,3),dddd:c[this.$W],H:String(o),HH:_.s(o,2,"0"),h:h(1),hh:h(2),a:d(o,a,!0),A:d(o,a,!1),m:String(a),mm:_.s(a,2,"0"),s:String(this.$s),ss:_.s(this.$s,2,"0"),SSS:_.s(this.$ms,3,"0"),Z:r}
-return n.replace(l,(function(t,e){return e||p[t]||r.replace(":","")}))},d.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},d.diff=function(t,s,f){var l,h=_.p(s),d=m(t),p=6e4*(d.utcOffset()-this.utcOffset()),y=this-d,b=_.m(this,d)
-return b=(l={},l[c]=b/12,l[a]=b,l[u]=b/3,l[o]=(y-p)/6048e5,l[i]=(y-p)/864e5,l[r]=y/36e5,l[n]=y/6e4,l[e]=y/1e3,l)[h]||y,f?b:_.a(b)},d.daysInMonth=function(){return this.endOf(a).$D},d.$locale=function(){return b[this.$L]},d.locale=function(t,e){if(!t)return this.$L
-var n=this.clone(),r=g(t,e,!0)
-return r&&(n.$L=r),n},d.clone=function(){return _.w(this.$d,this)},d.toDate=function(){return new Date(this.valueOf())},d.toJSON=function(){return this.isValid()?this.toISOString():null},d.toISOString=function(){return this.$d.toISOString()},d.toString=function(){return this.$d.toUTCString()},h}(),x=w.prototype
-return m.prototype=x,[["$ms",t],["$s",e],["$m",n],["$H",r],["$W",i],["$M",a],["$y",c],["$D",s]].forEach((function(t){x[t[1]]=function(e){return this.$g(e,t[0],t[1])}})),m.extend=function(t,e){return t.$i||(t(e,w,m),t.$i=!0),m},m.locale=g,m.isDayjs=v,m.unix=function(t){return m(1e3*t)},m.en=b[y],m.Ls=b,m.p={},m}()},9379:function(t){t.exports=function(){"use strict"
-return function(t,e,n){var r="h:mm A",i={lastDay:"[Yesterday at] "+r,sameDay:"[Today at] "+r,nextDay:"[Tomorrow at] "+r,nextWeek:"dddd [at] "+r,lastWeek:"[Last] dddd [at] "+r,sameElse:"MM/DD/YYYY"}
-e.prototype.calendar=function(t,e){var r=e||this.$locale().calendar||i,o=n(t||void 0).startOf("d"),a=this.diff(o,"d",!0),u=a<-6?"sameElse":a<-1?"lastWeek":a<0?"lastDay":a<1?"sameDay":a<2?"nextDay":a<7?"nextWeek":"sameElse",c=r[u]||i[u]
-return"function"==typeof c?c.call(this,n()):this.format(c)}}}()},8275:function(t){t.exports=function(){"use strict"
-return function(t,e,n){t=t||{}
-var r=e.prototype,i={future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"}
-function o(t,e,n,i){return r.fromToBase(t,e,n,i)}n.en.relativeTime=i,r.fromToBase=function(e,r,o,a,u){for(var c,s,f,l=o.$locale().relativeTime||i,h=t.thresholds||[{l:"s",r:44,d:"second"},{l:"m",r:89},{l:"mm",r:44,d:"minute"},{l:"h",r:89},{l:"hh",r:21,d:"hour"},{l:"d",r:35},{l:"dd",r:25,d:"day"},{l:"M",r:45},{l:"MM",r:10,d:"month"},{l:"y",r:17},{l:"yy",d:"year"}],d=h.length,p=0;p<d;p+=1){var y=h[p]
-y.d&&(c=a?n(e).diff(o,y.d,!0):o.diff(e,y.d,!0))
-var b=(t.rounding||Math.round)(Math.abs(c))
-if(f=c>0,b<=y.r||!y.r){b<=1&&p>0&&(y=h[p-1])
-var v=l[y.l]
-u&&(b=u(""+b)),s="string"==typeof v?v.replace("%d",b):v(b,r,y.l,f)
-break}}if(r)return s
-var g=f?l.future:l.past
-return"function"==typeof g?g(s):g.replace("%s",s)},r.to=function(t,e){return o(t,e,this,!0)},r.from=function(t,e){return o(t,e,this)}
-var a=function(t){return t.$u?n.utc():n()}
-r.toNow=function(t){return this.to(a(this),t)},r.fromNow=function(t){return this.from(a(this),t)}}}()},2999:t=>{"use strict"
-var e=function(t){return function(t){return!!t&&"object"==typeof t}(t)&&!function(t){var e=Object.prototype.toString.call(t)
-return"[object RegExp]"===e||"[object Date]"===e||function(t){return t.$$typeof===n}(t)}(t)},n="function"==typeof Symbol&&Symbol.for?Symbol.for("react.element"):60103
-function r(t,e){return!1!==e.clone&&e.isMergeableObject(t)?u((n=t,Array.isArray(n)?[]:{}),t,e):t
-var n}function i(t,e,n){return t.concat(e).map((function(t){return r(t,n)}))}function o(t){return Object.keys(t).concat(function(t){return Object.getOwnPropertySymbols?Object.getOwnPropertySymbols(t).filter((function(e){return t.propertyIsEnumerable(e)})):[]}(t))}function a(t,e){try{return e in t}catch(t){return!1}}function u(t,n,c){(c=c||{}).arrayMerge=c.arrayMerge||i,c.isMergeableObject=c.isMergeableObject||e,c.cloneUnlessOtherwiseSpecified=r
-var s=Array.isArray(n)
-return s===Array.isArray(t)?s?c.arrayMerge(t,n,c):function(t,e,n){var i={}
-return n.isMergeableObject(t)&&o(t).forEach((function(e){i[e]=r(t[e],n)})),o(e).forEach((function(o){(function(t,e){return a(t,e)&&!(Object.hasOwnProperty.call(t,e)&&Object.propertyIsEnumerable.call(t,e))})(t,o)||(a(t,o)&&n.isMergeableObject(e[o])?i[o]=function(t,e){if(!e.customMerge)return u
-var n=e.customMerge(t)
-return"function"==typeof n?n:u}(o,n)(t[o],e[o],n):i[o]=r(e[o],n))})),i}(t,n,c):r(n,c)}u.all=function(t,e){if(!Array.isArray(t))throw new Error("first argument should be an array")
-return t.reduce((function(t,n){return u(t,n,e)}),{})}
-var c=u
-t.exports=c},6673:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{default:()=>P})
-var r=n(4927),i=["input","select","textarea","a[href]","button","[tabindex]:not(slot)","audio[controls]","video[controls]",'[contenteditable]:not([contenteditable="false"])',"details>summary:first-of-type","details"],o=i.join(","),a="undefined"==typeof Element,u=a?function(){}:Element.prototype.matches||Element.prototype.msMatchesSelector||Element.prototype.webkitMatchesSelector,c=!a&&Element.prototype.getRootNode?function(t){return t.getRootNode()}:function(t){return t.ownerDocument},s=function(t,e,n){var r=Array.prototype.slice.apply(t.querySelectorAll(o))
-return e&&u.call(t,o)&&r.unshift(t),r.filter(n)},f=function t(e,n,r){for(var i=[],a=Array.from(e);a.length;){var c=a.shift()
-if("SLOT"===c.tagName){var s=c.assignedElements(),f=t(s.length?s:c.children,!0,r)
-r.flatten?i.push.apply(i,f):i.push({scope:c,candidates:f})}else{u.call(c,o)&&r.filter(c)&&(n||!e.includes(c))&&i.push(c)
-var l=c.shadowRoot||"function"==typeof r.getShadowRoot&&r.getShadowRoot(c),h=!r.shadowRootFilter||r.shadowRootFilter(c)
-if(l&&h){var d=t(!0===l?c.children:l.children,!0,r)
-r.flatten?i.push.apply(i,d):i.push({scope:c,candidates:d})}else a.unshift.apply(a,c.children)}}return i},l=function(t,e){return t.tabIndex<0&&(e||/^(AUDIO|VIDEO|DETAILS)$/.test(t.tagName)||t.isContentEditable)&&isNaN(parseInt(t.getAttribute("tabindex"),10))?0:t.tabIndex},h=function(t,e){return t.tabIndex===e.tabIndex?t.documentOrder-e.documentOrder:t.tabIndex-e.tabIndex},d=function(t){return"INPUT"===t.tagName},p=function(t){var e=t.getBoundingClientRect(),n=e.width,r=e.height
-return 0===n&&0===r},y=function(t,e){return!(e.disabled||function(t){return d(t)&&"hidden"===t.type}(e)||function(t,e){var n=e.displayCheck,r=e.getShadowRoot
-if("hidden"===getComputedStyle(t).visibility)return!0
-var i=u.call(t,"details>summary:first-of-type")?t.parentElement:t
-if(u.call(i,"details:not([open]) *"))return!0
-var o=c(t).host,a=(null==o?void 0:o.ownerDocument.contains(o))||t.ownerDocument.contains(t)
-if(n&&"full"!==n){if("non-zero-area"===n)return p(t)}else{if("function"==typeof r){for(var s=t;t;){var f=t.parentElement,l=c(t)
-if(f&&!f.shadowRoot&&!0===r(f))return p(t)
-t=t.assignedSlot?t.assignedSlot:f||l===t.ownerDocument?f:l.host}t=s}if(a)return!t.getClientRects().length}return!1}(e,t)||function(t){return"DETAILS"===t.tagName&&Array.prototype.slice.apply(t.children).some((function(t){return"SUMMARY"===t.tagName}))}(e)||function(t){if(/^(INPUT|BUTTON|SELECT|TEXTAREA)$/.test(t.tagName))for(var e=t.parentElement;e;){if("FIELDSET"===e.tagName&&e.disabled){for(var n=0;n<e.children.length;n++){var r=e.children.item(n)
-if("LEGEND"===r.tagName)return!!u.call(e,"fieldset[disabled] *")||!r.contains(t)}return!0}e=e.parentElement}return!1}(e))},b=function(t,e){return!(function(t){return function(t){return d(t)&&"radio"===t.type}(t)&&!function(t){if(!t.name)return!0
-var e,n=t.form||c(t),r=function(t){return n.querySelectorAll('input[type="radio"][name="'+t+'"]')}
-if("undefined"!=typeof window&&void 0!==window.CSS&&"function"==typeof window.CSS.escape)e=r(window.CSS.escape(t.name))
-else try{e=r(t.name)}catch(t){return console.error("Looks like you have a radio button with a name attribute containing invalid CSS selector characters and need the CSS.escape polyfill: %s",t.message),!1}var i=function(t,e){for(var n=0;n<t.length;n++)if(t[n].checked&&t[n].form===e)return t[n]}(e,t.form)
-return!i||i===t}(t)}(e)||l(e)<0||!y(t,e))},v=function(t){var e=parseInt(t.getAttribute("tabindex"),10)
-return!!(isNaN(e)||e>=0)},g=function t(e){var n=[],r=[]
-return e.forEach((function(e,i){var o=!!e.scope,a=o?e.scope:e,u=l(a,o),c=o?t(e.candidates):a
-0===u?o?n.push.apply(n,c):n.push(a):r.push({documentOrder:i,tabIndex:u,item:e,isScope:o,content:c})})),r.sort(h).reduce((function(t,e){return e.isScope?t.push.apply(t,e.content):t.push(e.content),t}),[]).concat(n)},m=function(t,e){var n
-return n=(e=e||{}).getShadowRoot?f([t],e.includeContainer,{filter:b.bind(null,e),flatten:!1,getShadowRoot:e.getShadowRoot,shadowRootFilter:v}):s(t,e.includeContainer,b.bind(null,e)),g(n)},_=function(t,e){if(e=e||{},!t)throw new Error("No node provided")
-return!1!==u.call(t,o)&&b(e,t)},w=i.concat("iframe").join(","),x=function(t,e){if(e=e||{},!t)throw new Error("No node provided")
-return!1!==u.call(t,w)&&y(e,t)}
-function A(t,e){var n=Object.keys(t)
-if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t)
-e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,r)}return n}function E(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{}
-e%2?A(Object(n),!0).forEach((function(e){k(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):A(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}function k(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}var D,C=(D=[],{activateTrap:function(t){if(D.length>0){var e=D[D.length-1]
-e!==t&&e.pause()}var n=D.indexOf(t);-1===n||D.splice(n,1),D.push(t)},deactivateTrap:function(t){var e=D.indexOf(t);-1!==e&&D.splice(e,1),D.length>0&&D[D.length-1].unpause()}}),O=function(t){return setTimeout(t,0)},S=function(t,e){var n=-1
-return t.every((function(t,r){return!e(t)||(n=r,!1)})),n},M=function(t){for(var e=arguments.length,n=new Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r]
-return"function"==typeof t?t.apply(void 0,n):t},F=function(t){return t.target.shadowRoot&&"function"==typeof t.composedPath?t.composedPath()[0]:t.target},T=function(t,e){var n,r=(null==e?void 0:e.document)||document,i=E({returnFocusOnDeactivate:!0,escapeDeactivates:!0,delayInitialFocus:!0},e),o={containers:[],containerGroups:[],tabbableGroups:[],nodeFocusedBeforeActivation:null,mostRecentlyFocusedNode:null,active:!1,paused:!1,delayInitialFocusTimer:void 0},a=function(t,e,n){return t&&void 0!==t[e]?t[e]:i[n||e]},u=function(t){return o.containerGroups.findIndex((function(e){var n=e.container,r=e.tabbableNodes
-return n.contains(t)||r.find((function(e){return e===t}))}))},c=function(t){var e=i[t]
-if("function"==typeof e){for(var n=arguments.length,o=new Array(n>1?n-1:0),a=1;a<n;a++)o[a-1]=arguments[a]
-e=e.apply(void 0,o)}if(!0===e&&(e=void 0),!e){if(void 0===e||!1===e)return e
-throw new Error("`".concat(t,"` was specified but was not a node, or did not return a node"))}var u=e
-if("string"==typeof e&&!(u=r.querySelector(e)))throw new Error("`".concat(t,"` as selector refers to no known node"))
-return u},l=function(){var t=c("initialFocus")
-if(!1===t)return!1
-if(void 0===t)if(u(r.activeElement)>=0)t=r.activeElement
-else{var e=o.tabbableGroups[0]
-t=e&&e.firstTabbableNode||c("fallbackFocus")}if(!t)throw new Error("Your focus-trap needs to have at least one focusable element")
-return t},h=function(){if(o.containerGroups=o.containers.map((function(t){var e,n,r=m(t,i.tabbableOptions),o=(e=t,(n=(n=i.tabbableOptions)||{}).getShadowRoot?f([e],n.includeContainer,{filter:y.bind(null,n),flatten:!0,getShadowRoot:n.getShadowRoot}):s(e,n.includeContainer,y.bind(null,n)))
-return{container:t,tabbableNodes:r,focusableNodes:o,firstTabbableNode:r.length>0?r[0]:null,lastTabbableNode:r.length>0?r[r.length-1]:null,nextTabbableNode:function(t){var e=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],n=o.findIndex((function(e){return e===t}))
-if(!(n<0))return e?o.slice(n+1).find((function(t){return _(t,i.tabbableOptions)})):o.slice(0,n).reverse().find((function(t){return _(t,i.tabbableOptions)}))}}})),o.tabbableGroups=o.containerGroups.filter((function(t){return t.tabbableNodes.length>0})),o.tabbableGroups.length<=0&&!c("fallbackFocus"))throw new Error("Your focus-trap must have at least one container with at least one tabbable node in it at all times")},d=function t(e){!1!==e&&e!==r.activeElement&&(e&&e.focus?(e.focus({preventScroll:!!i.preventScroll}),o.mostRecentlyFocusedNode=e,function(t){return t.tagName&&"input"===t.tagName.toLowerCase()&&"function"==typeof t.select}(e)&&e.select()):t(l()))},p=function(t){var e=c("setReturnFocus",t)
-return e||!1!==e&&t},b=function(t){var e=F(t)
-u(e)>=0||(M(i.clickOutsideDeactivates,t)?n.deactivate({returnFocus:i.returnFocusOnDeactivate&&!x(e,i.tabbableOptions)}):M(i.allowOutsideClick,t)||t.preventDefault())},v=function(t){var e=F(t),n=u(e)>=0
-n||e instanceof Document?n&&(o.mostRecentlyFocusedNode=e):(t.stopImmediatePropagation(),d(o.mostRecentlyFocusedNode||l()))},g=function(t){if(function(t){return"Escape"===t.key||"Esc"===t.key||27===t.keyCode}(t)&&!1!==M(i.escapeDeactivates,t))return t.preventDefault(),void n.deactivate();(function(t){return"Tab"===t.key||9===t.keyCode})(t)&&function(t){var e=F(t)
-h()
-var n=null
-if(o.tabbableGroups.length>0){var r=u(e),a=r>=0?o.containerGroups[r]:void 0
-if(r<0)n=t.shiftKey?o.tabbableGroups[o.tabbableGroups.length-1].lastTabbableNode:o.tabbableGroups[0].firstTabbableNode
-else if(t.shiftKey){var s=S(o.tabbableGroups,(function(t){var n=t.firstTabbableNode
-return e===n}))
-if(s<0&&(a.container===e||x(e,i.tabbableOptions)&&!_(e,i.tabbableOptions)&&!a.nextTabbableNode(e,!1))&&(s=r),s>=0){var f=0===s?o.tabbableGroups.length-1:s-1
-n=o.tabbableGroups[f].lastTabbableNode}}else{var l=S(o.tabbableGroups,(function(t){var n=t.lastTabbableNode
-return e===n}))
-if(l<0&&(a.container===e||x(e,i.tabbableOptions)&&!_(e,i.tabbableOptions)&&!a.nextTabbableNode(e))&&(l=r),l>=0){var p=l===o.tabbableGroups.length-1?0:l+1
-n=o.tabbableGroups[p].firstTabbableNode}}}else n=c("fallbackFocus")
-n&&(t.preventDefault(),d(n))}(t)},w=function(t){var e=F(t)
-u(e)>=0||M(i.clickOutsideDeactivates,t)||M(i.allowOutsideClick,t)||(t.preventDefault(),t.stopImmediatePropagation())},A=function(){if(o.active)return C.activateTrap(n),o.delayInitialFocusTimer=i.delayInitialFocus?O((function(){d(l())})):d(l()),r.addEventListener("focusin",v,!0),r.addEventListener("mousedown",b,{capture:!0,passive:!1}),r.addEventListener("touchstart",b,{capture:!0,passive:!1}),r.addEventListener("click",w,{capture:!0,passive:!1}),r.addEventListener("keydown",g,{capture:!0,passive:!1}),n},k=function(){if(o.active)return r.removeEventListener("focusin",v,!0),r.removeEventListener("mousedown",b,!0),r.removeEventListener("touchstart",b,!0),r.removeEventListener("click",w,!0),r.removeEventListener("keydown",g,!0),n}
-return(n={get active(){return o.active},get paused(){return o.paused},activate:function(t){if(o.active)return this
-var e=a(t,"onActivate"),n=a(t,"onPostActivate"),i=a(t,"checkCanFocusTrap")
-i||h(),o.active=!0,o.paused=!1,o.nodeFocusedBeforeActivation=r.activeElement,e&&e()
-var u=function(){i&&h(),A(),n&&n()}
-return i?(i(o.containers.concat()).then(u,u),this):(u(),this)},deactivate:function(t){if(!o.active)return this
-var e=E({onDeactivate:i.onDeactivate,onPostDeactivate:i.onPostDeactivate,checkCanReturnFocus:i.checkCanReturnFocus},t)
-clearTimeout(o.delayInitialFocusTimer),o.delayInitialFocusTimer=void 0,k(),o.active=!1,o.paused=!1,C.deactivateTrap(n)
-var r=a(e,"onDeactivate"),u=a(e,"onPostDeactivate"),c=a(e,"checkCanReturnFocus"),s=a(e,"returnFocus","returnFocusOnDeactivate")
-r&&r()
-var f=function(){O((function(){s&&d(p(o.nodeFocusedBeforeActivation)),u&&u()}))}
-return s&&c?(c(p(o.nodeFocusedBeforeActivation)).then(f,f),this):(f(),this)},pause:function(){return o.paused||!o.active||(o.paused=!0,k()),this},unpause:function(){return o.paused&&o.active?(o.paused=!1,h(),A(),this):this},updateContainerElements:function(t){var e=[].concat(t).filter(Boolean)
-return o.containers=e.map((function(t){return"string"==typeof t?r.querySelector(t):t})),o.active&&h(),this}}).updateContainerElements(t),n}
-let B
-try{B=(0,r.capabilities)("3.22")}catch{B=(0,r.capabilities)("3.13")}var P=(0,r.setModifierManager)((()=>({capabilities:B,createModifier:()=>({focusTrapOptions:void 0,isActive:!0,isPaused:!1,shouldSelfFocus:!1,focusTrap:void 0}),installModifier(t,e,n){let{named:{isActive:r,isPaused:i,shouldSelfFocus:o,focusTrapOptions:a,_createFocusTrap:u}}=n
-t.focusTrapOptions={...a}||{},void 0!==r&&(t.isActive=r),void 0!==i&&(t.isPaused=i),t.focusTrapOptions&&void 0===t.focusTrapOptions.initialFocus&&o&&(t.focusTrapOptions.initialFocus=e)
-let c=T
-u&&(c=u),!1!==t.focusTrapOptions.returnFocusOnDeactivate&&(t.focusTrapOptions.returnFocusOnDeactivate=!0),t.focusTrap=c(e,t.focusTrapOptions),t.isActive&&t.focusTrap.activate(),t.isPaused&&t.focusTrap.pause()},updateModifier(t,e){let{named:n}=e
-const r=n.focusTrapOptions||{}
-if(t.isActive&&!n.isActive){const{returnFocusOnDeactivate:e}=r,n=void 0===e
-t.focusTrap.deactivate({returnFocus:n})}else!t.isActive&&n.isActive&&t.focusTrap.activate()
-t.isPaused&&!n.isPaused?t.focusTrap.unpause():!t.isPaused&&n.isPaused&&t.focusTrap.pause(),t.focusTrapOptions=r,void 0!==n.isActive&&(t.isActive=n.isActive),void 0!==n.isPaused&&(t.isPaused=n.isPaused)},destroyModifier(t){let{focusTrap:e}=t
-e.deactivate()}})),class{})},7889:t=>{"use strict"
-var e=Array.isArray,n=Object.keys,r=Object.prototype.hasOwnProperty
-t.exports=function t(i,o){if(i===o)return!0
-if(i&&o&&"object"==typeof i&&"object"==typeof o){var a,u,c,s=e(i),f=e(o)
-if(s&&f){if((u=i.length)!=o.length)return!1
-for(a=u;0!=a--;)if(!t(i[a],o[a]))return!1
-return!0}if(s!=f)return!1
-var l=i instanceof Date,h=o instanceof Date
-if(l!=h)return!1
-if(l&&h)return i.getTime()==o.getTime()
-var d=i instanceof RegExp,p=o instanceof RegExp
-if(d!=p)return!1
-if(d&&p)return i.toString()==o.toString()
-var y=n(i)
-if((u=y.length)!==n(o).length)return!1
-for(a=u;0!=a--;)if(!r.call(o,y[a]))return!1
-for(a=u;0!=a--;)if(!t(i[c=y[a]],o[c]))return!1
-return!0}return i!=i&&o!=o}},9763:(t,e,n)=>{"use strict"
-function r(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e,n,r){n&&Object.defineProperty(t,e,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function o(t,e,n,r,i){var o={}
-return Object.keys(r).forEach((function(t){o[t]=r[t]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=n.slice().reverse().reduce((function(n,r){return r(t,e,n)||n}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(t,e,o),o=null),o}n.d(e,{_:()=>r,a:()=>o,b:()=>i})},5989:(t,e,n)=>{"use strict"
-n.d(e,{Bq:()=>i,sd:()=>o,zA:()=>r})
-const r={A:"a",B:"b",C:"c",D:"d",E:"e",F:"f",G:"g",H:"h",I:"i",J:"j",K:"k",L:"l",M:"m",N:"n",O:"o",P:"p",Q:"q",R:"r",S:"s",T:"t",U:"u",V:"v",W:"w",X:"x",Y:"y",Z:"z","!":"1","@":"2","#":"3",$:"4","%":"5","^":"6","&":"7","*":"8","(":"9",")":"0",_:"-","+":"=","<":",",">":".","?":"/",":":";",'"':"'","~":"`","{":"[","}":"]","|":"\\"},i={"å":"a",b:"b","ç":"c","∂":"d","ƒ":"f","©":"g","˙":"h","∆":"j","˚":"k","¬":"l","µ":"m","ø":"o","π":"p","œ":"q","®":"r","ß":"s","†":"t","√":"v","∑":"w","≈":"x","¥":"y","Ω":"z","¡":"1","™":"2","£":"3","¢":"4","∞":"5","§":"6","¶":"7","•":"8","ª":"9","º":"0","–":"-","≠":"=","≤":",","≥":".","÷":"/","…":";","æ":"'","“":"[","‘":"]","«":"\\"},o={"Å":"a","ı":"b","Î":"d","Ï":"f","˝":"g","Ó":"h","ˆ":"i","Ô":"j","":"k","Ò":"l","Â":"m","˜":"n","Ø":"o","Œ":"q","‰":"r","Í":"s","ˇ":"t","¨":"u","◊":"v","„":"w","˛":"x","Á":"y","¸":"z","⁄":"1","€":"2","‹":"3","›":"4","fi":"5","fl":"6","‡":"7","°":"8","·":"9","‚":"0","—":"-","±":"=","¯":",","˘":".","¿":"/","Ú":";","Æ":"'","`":"`","”":"[","’":"]","»":"\\"}},6866:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{default:()=>u})
-var r=n(8797),i=n(3353),o=n(4784),a=n(1377),u=(n(5780),n(2001),n(5989),n(2995),n(1866),(0,r.helper)((function(t){let[e,n]=t
-return function(t){(0,i.assert)("ember-keyboard: You must pass a function as the second argument to the `if-key` helper","function"==typeof n),(0,i.assert)("ember-keyboard: The `if-key` helper expects to be invoked with a KeyboardEvent",t instanceof KeyboardEvent),(0,o.Z)((0,a.Z)(t.type,e),t)&&n(t)}})))},9930:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{default:()=>l})
-var r,i,o=n(9763),a=n(8797),u=n.n(a),c=n(3353),s=n(8574),f=n(1377)
-let l=(r=class extends(u()){constructor(){super(...arguments),(0,o.b)(this,"keyboard",i,this),(0,o._)(this,"keyCombo",void 0),(0,o._)(this,"callback",void 0),(0,o._)(this,"keyboardActivated",!0),(0,o._)(this,"keyboardPriority",0),(0,o._)(this,"eventName","keydown"),(0,o._)(this,"keyboardHandlers",void 0)}compute(t,e){let[n,r]=t,{event:i="keydown",activated:o=!0,priority:a=0}=e;(0,c.assert)("ember-keyboard: You must pass a function as the second argument to the `on-key` helper","function"==typeof r),this.keyCombo=n,this.callback=r,this.eventName=i,this.keyboardActivated=o,this.keyboardPriority=a,this.keyboardHandlers={},this.keyboardHandlers[(0,f.Z)(i,n)]=r,this.keyboard.register(this)}willDestroy(){this.keyboard.unregister(this),super.willDestroy(...arguments)}},i=(0,o.a)(r.prototype,"keyboard",[s.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),r)},6222:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{default:()=>y})
-var r=n(9763),i=n(5831),o=n.n(i),a=n(8574),u=n(7219),c=n(9341),s=n(1377),f=n(4784)
-n(5780),n(2001),n(3353),n(5989),n(2995),n(1866)
-const l=["input","select","textarea"]
-let h
-var d,p
-d=class extends(o()){constructor(t,e){super(t,e),(0,r.b)(this,"keyboard",p,this),(0,r._)(this,"element",void 0),(0,r._)(this,"keyboardPriority",0),(0,r._)(this,"activatedParamValue",!0),(0,r._)(this,"eventName","keydown"),(0,r._)(this,"onlyWhenFocused",!0),(0,r._)(this,"listenerName",void 0),(0,r._)(this,"removeEventListeners",(()=>{this.onlyWhenFocused&&(this.element.removeEventListener("click",this.onFocus,!0),this.element.removeEventListener("focus",this.onFocus,!0),this.element.removeEventListener("focusout",this.onFocusOut,!0))})),this.keyboard.register(this),(0,c.registerDestructor)(this,(()=>{this.removeEventListeners(),this.keyboard.unregister(this)}))}modify(t,e,n){this.element=t,this.removeEventListeners(),this.setupProperties(e,n),this.onlyWhenFocused&&this.addEventListeners()}setupProperties(t,e){let[n,r]=t,{activated:i,event:o,priority:a,onlyWhenFocused:u}=e
-this.keyCombo=n,this.callback=r,this.eventName=o||"keydown",this.activatedParamValue="activated"in e?!!i:void 0,this.keyboardPriority=a?parseInt(a,10):0,this.listenerName=(0,s.Z)(this.eventName,this.keyCombo),this.onlyWhenFocused=void 0!==u?u:l.includes(this.element.tagName.toLowerCase())}addEventListeners(){this.element.addEventListener("click",this.onFocus,!0),this.element.addEventListener("focus",this.onFocus,!0),this.element.addEventListener("focusout",this.onFocusOut,!0)}onFocus(){this.isFocused=!0}onFocusOut(){this.isFocused=!1}get keyboardActivated(){return!1!==this.activatedParamValue&&(!this.onlyWhenFocused||this.isFocused)}get keyboardFirstResponder(){return!!this.onlyWhenFocused&&this.isFocused}canHandleKeyboardEvent(t){return(0,f.Z)(this.listenerName,t)}handleKeyboardEvent(t,e){(0,f.Z)(this.listenerName,t)&&(this.callback?this.callback(t,e):this.element.click())}},p=(0,r.a)(d.prototype,"keyboard",[a.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),(0,r.a)(d.prototype,"onFocus",[u.action],Object.getOwnPropertyDescriptor(d.prototype,"onFocus"),d.prototype),(0,r.a)(d.prototype,"onFocusOut",[u.action],Object.getOwnPropertyDescriptor(d.prototype,"onFocusOut"),d.prototype),h=d
-var y=h},6918:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{default:()=>p})
-var r,i=n(9763),o=n(8574),a=n.n(o),u=n(1292),c=n(7219),s=n(8773),f=n(1377),l=n(4784)
-function h(t,e){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:null
-if(t.handleKeyboardEvent){if(t.canHandleKeyboardEvent&&!t.canHandleKeyboardEvent(e))return
-t.handleKeyboardEvent(e,n)}else{if(!t.keyboardHandlers)throw new Error("A responder registered with the ember-keyboard service must implement either `keyboardHandlers` (property returning a dictionary of listenerNames to handler functions), or `handleKeyboardEvent(event)`)")
-Object.keys(t.keyboardHandlers).forEach((r=>{(0,l.Z)(r,e)&&(n?t.keyboardHandlers[r](e,n):t.keyboardHandlers[r](e))}))}}function d(t,e,n,r){return function(t,e){let n=t-e
-return(n>0)-(n<0)}(r?r((0,c.get)(t,n)):(0,c.get)(t,n),r?r((0,c.get)(e,n)):(0,c.get)(e,n))}n(5780),n(2001),n(3353),n(5989),n(2995),n(1866)
-let p=(r=class extends(a()){get activeResponders(){let{registeredResponders:t}=this
-return Array.from(t).filter((t=>t.keyboardActivated))}get sortedResponders(){return this.activeResponders.sort(((t,e)=>function(t,e,n){return d(e,t,n,arguments.length>3&&void 0!==arguments[3]?arguments[3]:null)}(t,e,"keyboardPriority")))}get firstResponders(){return this.sortedResponders.filter((t=>t.keyboardFirstResponder))}get normalResponders(){return this.sortedResponders.filter((t=>!t.keyboardFirstResponder))}constructor(){if(super(...arguments),(0,i._)(this,"registeredResponders",new Set),"undefined"!=typeof FastBoot)return
-let t=((0,u.getOwner)(this).resolveRegistration("config:environment")||{}).emberKeyboard||{}
-t.disableOnInputFields&&(this._disableOnInput=!0),this._listeners=t.listeners||["keyUp","keyDown","keyPress"],this._listeners=this._listeners.map((t=>t.toLowerCase())),this._listeners.forEach((t=>{document.addEventListener(t,this._respond)}))}willDestroy(){super.willDestroy(...arguments),"undefined"==typeof FastBoot&&this._listeners.forEach((t=>{document.removeEventListener(t,this._respond)}))}_respond(t){if(this._disableOnInput&&t.target){var e
-const n=null!==(e=t.composedPath()[0])&&void 0!==e?e:t.target,r=n.tagName
-if(n.getAttribute&&null!=n.getAttribute("contenteditable")||"TEXTAREA"===r||"INPUT"===r)return}(0,s.run)((()=>{let{firstResponders:e,normalResponders:n}=this
-!function(t,e){let{firstResponders:n,normalResponders:r}=e,i=!1,o=!1
-const a={stopImmediatePropagation(){i=!0},stopPropagation(){o=!0}}
-for(const c of n)if(h(c,t,a),i)break
-if(o)return
-i=!1
-let u=Number.POSITIVE_INFINITY
-for(const c of r){const e=Number(c.keyboardPriority)
-if(!i||e!==u){if(e<u){if(o)return
-i=!1,u=e}h(c,t,a)}}}(t,{firstResponders:e,normalResponders:n})}))}register(t){this.registeredResponders.add(t)}unregister(t){this.registeredResponders.delete(t)}keyDown(){return function(t){return(0,f.Z)("keydown",t)}(...arguments)}keyPress(){return function(t){return(0,f.Z)("keypress",t)}(...arguments)}keyUp(){return function(t){return(0,f.Z)("keyup",t)}(...arguments)}},(0,i.a)(r.prototype,"_respond",[c.action],Object.getOwnPropertyDescriptor(r.prototype,"_respond"),r.prototype),r)},2995:(t,e,n)=>{"use strict"
-n.d(e,{Z:()=>i})
-var r=n(1866)
-function i(t){if(!(0,r.isNone)(t))switch(t){case 0:return"left"
-case 1:return"middle"
-case 2:return"right"}}},4784:(t,e,n)=>{"use strict"
-n.d(e,{Z:()=>c})
-var r=n(5780),i=n(2001),o=n(5989),a=n(2995)
-n(3353),n(1866)
-const u="_all"
-function c(t,e){let n,o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:(0,i.Z)()
-if(t instanceof r.Z)n=t
-else{if("string"!=typeof t)throw new Error("Expected a `string` or `KeyCombo` as `keyComboOrKeyComboString` argument to `isKey`")
-n=r.Z.parse(t,o)}return n.type===e.type&&(!!s(n)||!(!f(n,e)||!l(n,e)&&!h(n,e))||d(n,e,o))}function s(t){return t.keyOrCode===u&&!1===t.altKey&&!1===t.ctrlKey&&!1===t.metaKey&&!1===t.shiftKey}function f(t,e){return t.type===e.type&&t.altKey===e.altKey&&t.ctrlKey===e.ctrlKey&&t.metaKey===e.metaKey&&t.shiftKey===e.shiftKey}function l(t,e){return e instanceof KeyboardEvent&&(t.keyOrCode===u||t.keyOrCode===e.code||t.keyOrCode===e.key)}function h(t,e){return e instanceof MouseEvent&&(t.keyOrCode===u||t.keyOrCode===(0,a.Z)(e.button))}function d(t,e,n){return y([],t)&&y(["shift"],e)?e.key===t.keyOrCode:y(["shift"],t)&&y(["shift"],e)?(r=e.key,(o.zA[r]||r)===t.keyOrCode):"Macintosh"===n&&y(["alt"],t)&&y(["alt"],e)?function(t){return o.Bq[t]||t}(e.key)===t.keyOrCode:!("Macintosh"!==n||!y(["shift","alt"],t)||!y(["shift","alt"],e))&&function(t){return o.sd[t]||t}(e.key)===t.keyOrCode
-var r}const p=["alt","ctrl","meta","shift","cmd"].filter((t=>"cmd"!=t))
-function y(t,e){for(let n of p){if(t.includes(n)&&!e[`${n}Key`])return!1
-if(!t.includes(n)&&e[`${n}Key`])return!1}return!0}},5780:(t,e,n)=>{"use strict"
-n.d(e,{Z:()=>f})
-var r=n(9763),i=n(2001)
-n(3353)
-const o=/^alt$/i,a=/^shift$/i,u=/^ctrl$/i,c=/^meta$/i,s=/^cmd$/i
-class f{constructor(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:(0,i.Z)();(0,r._)(this,"type",void 0),(0,r._)(this,"altKey",!1),(0,r._)(this,"ctrlKey",!1),(0,r._)(this,"shiftKey",!1),(0,r._)(this,"metaKey",!1),(0,r._)(this,"keyOrCode",void 0),(0,r._)(this,"platform",void 0),this.platform=t}static parse(t){let e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:(0,i.Z)(),n=new f(e),[r,l]=t.split(":")
-return n.type=r,"+"===l?(n.keyOrCode=l,n):(l.split("+").forEach((t=>{o.test(t)?n.altKey=!0:u.test(t)?n.ctrlKey=!0:c.test(t)?n.metaKey=!0:a.test(t)?n.shiftKey=!0:s.test(t)?e.indexOf("Mac")>-1?n.metaKey=!0:n.ctrlKey=!0:n.keyOrCode=t})),n)}createMatchingKeyboardEvent(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-return new KeyboardEvent(this.type,Object.assign({key:this.keyOrCode,code:this.keyOrCode,altKey:this.altKey,ctrlKey:this.ctrlKey,metaKey:this.metaKey,shiftKey:this.shiftKey},t))}}},1377:(t,e,n)=>{"use strict"
-function r(t){if("undefined"==typeof FastBoot)return void 0===t&&(t=navigator.platform),t.indexOf("Mac")>-1?"meta":"ctrl"}function i(t){return t.sort().join("+")}function o(t){let e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[],n=e
-"string"==typeof e&&(n=e.split("+")),n.indexOf("cmd")>-1&&(n[n.indexOf("cmd")]=r())
-let o=i(n||[])
-return""===o&&(o="_all"),`${t}:${o}`}n.d(e,{Z:()=>o})},2001:(t,e,n)=>{"use strict"
-n.d(e,{Z:()=>o})
-var r=n(3353)
-let i
-function o(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:navigator.userAgent
-if((0,r.runInDebug)((()=>{i=null})),!i){let e="Unknown OS";-1!=t.indexOf("Win")&&(e="Windows"),-1!=t.indexOf("Mac")&&(e="Macintosh"),-1!=t.indexOf("Linux")&&(e="Linux"),-1!=t.indexOf("Android")&&(e="Android"),-1!=t.indexOf("like Mac")&&(e="iOS"),i=e}return i}},4564:t=>{function e(t,e,n,r){var i,o=null==(i=r)||"number"==typeof i||"boolean"==typeof i?r:n(r),a=e.get(o)
-return void 0===a&&(a=t.call(this,r),e.set(o,a)),a}function n(t,e,n){var r=Array.prototype.slice.call(arguments,3),i=n(r),o=e.get(i)
-return void 0===o&&(o=t.apply(this,r),e.set(i,o)),o}function r(t,e,n,r,i){return n.bind(e,t,r,i)}function i(t,i){return r(t,this,1===t.length?e:n,i.cache.create(),i.serializer)}function o(){return JSON.stringify(arguments)}function a(){this.cache=Object.create(null)}a.prototype.has=function(t){return t in this.cache},a.prototype.get=function(t){return this.cache[t]},a.prototype.set=function(t,e){this.cache[t]=e}
-var u={create:function(){return new a}}
-t.exports=function(t,e){var n=e&&e.cache?e.cache:u,r=e&&e.serializer?e.serializer:o
-return(e&&e.strategy?e.strategy:i)(t,{cache:n,serializer:r})},t.exports.strategies={variadic:function(t,e){return r(t,this,n,e.cache.create(),e.serializer)},monadic:function(t,n){return r(t,this,e,n.cache.create(),n.serializer)}}},8581:t=>{function e(t){return t&&t.constructor&&"function"==typeof t.constructor.isBuffer&&t.constructor.isBuffer(t)}function n(t){return t}function r(t,r){const i=(r=r||{}).delimiter||".",o=r.maxDepth,a=r.transformKey||n,u={}
-return function t(n,c,s){s=s||1,Object.keys(n).forEach((function(f){const l=n[f],h=r.safe&&Array.isArray(l),d=Object.prototype.toString.call(l),p=e(l),y="[object Object]"===d||"[object Array]"===d,b=c?c+i+a(f):a(f)
-if(!h&&!p&&y&&Object.keys(l).length&&(!r.maxDepth||s<o))return t(l,b,s+1)
-u[b]=l}))}(t),u}t.exports=r,r.flatten=r,r.unflatten=function t(i,o){const a=(o=o||{}).delimiter||".",u=o.overwrite||!1,c=o.transformKey||n,s={}
-if(e(i)||"[object Object]"!==Object.prototype.toString.call(i))return i
-function f(t){const e=Number(t)
-return isNaN(e)||-1!==t.indexOf(".")||o.object?t:e}return i=Object.keys(i).reduce((function(t,e){const n=Object.prototype.toString.call(i[e])
-return"[object Object]"!==n&&"[object Array]"!==n||function(t){const e=Object.prototype.toString.call(t),n="[object Object]"===e
-return!t||("[object Array]"===e?!t.length:n?!Object.keys(t).length:void 0)}(i[e])?(t[e]=i[e],t):function(t,e,n){return Object.keys(n).reduce((function(e,r){return e[t+a+r]=n[r],e}),e)}(e,t,r(i[e],o))}),{}),Object.keys(i).forEach((function(e){const n=e.split(a).map(c)
-let r=f(n.shift()),l=f(n[0]),h=s
-for(;void 0!==l;){if("__proto__"===r)return
-const t=Object.prototype.toString.call(h[r]),e="[object Object]"===t||"[object Array]"===t
-if(!u&&!e&&void 0!==h[r])return;(u&&!e||!u&&null==h[r])&&(h[r]="number"!=typeof l||o.object?{}:[]),h=h[r],n.length>0&&(r=f(n.shift()),l=f(n[0]))}h[r]=t(i[e],o)})),s}},2914:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{default:()=>s})
-var r,i=function(){function t(){this.registry=new WeakMap}return t.prototype.elementExists=function(t){return this.registry.has(t)},t.prototype.getElement=function(t){return this.registry.get(t)},t.prototype.addElement=function(t,e){t&&this.registry.set(t,e||{})},t.prototype.removeElement=function(t){this.registry.delete(t)},t.prototype.destroyRegistry=function(){this.registry=new WeakMap},t}(),o=function(){}
-!function(t){t.enter="enter",t.exit="exit"}(r||(r={}))
-var a,u=function(){function t(){this.registry=new i}return t.prototype.addCallback=function(t,e,n){var i,o,a
-t===r.enter?((i={})[r.enter]=n,a=i):((o={})[r.exit]=n,a=o),this.registry.addElement(e,Object.assign({},this.registry.getElement(e),a))},t.prototype.dispatchCallback=function(t,e,n){if(t===r.enter){var i=this.registry.getElement(e).enter;(void 0===i?o:i)(n)}else{var a=this.registry.getElement(e).exit;(void 0===a?o:a)(n)}},t}(),c=(a=function(t,e){return a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])},a(t,e)},function(t,e){function n(){this.constructor=t}a(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)})
-const s=function(t){function e(){var e=t.call(this)||this
-return e.elementRegistry=new i,e}return c(e,t),e.prototype.observe=function(t,e){void 0===e&&(e={}),t&&(this.elementRegistry.addElement(t,e),this.setupObserver(t,e))},e.prototype.unobserve=function(t,e){var n=this.findMatchingRootEntry(e)
-n&&n.intersectionObserver.unobserve(t)},e.prototype.addEnterCallback=function(t,e){this.addCallback(r.enter,t,e)},e.prototype.addExitCallback=function(t,e){this.addCallback(r.exit,t,e)},e.prototype.dispatchEnterCallback=function(t,e){this.dispatchCallback(r.enter,t,e)},e.prototype.dispatchExitCallback=function(t,e){this.dispatchCallback(r.exit,t,e)},e.prototype.destroy=function(){this.elementRegistry.destroyRegistry()},e.prototype.setupOnIntersection=function(t){var e=this
-return function(n){return e.onIntersection(t,n)}},e.prototype.setupObserver=function(t,e){var n,r,i=e.root,o=void 0===i?window:i,a=this.findRootFromRegistry(o)
-if(a&&(r=this.determineMatchingElements(e,a)),r){var u=r.elements,c=r.intersectionObserver
-u.push(t),c&&c.observe(t)}else{var s={elements:[t],intersectionObserver:c=this.newObserver(t,e),options:e},f=this.stringifyOptions(e)
-a?a[f]=s:this.elementRegistry.addElement(o,((n={})[f]=s,n))}},e.prototype.newObserver=function(t,e){var n=e.root,r=e.rootMargin,i=e.threshold,o=new IntersectionObserver(this.setupOnIntersection(e).bind(this),{root:n,rootMargin:r,threshold:i})
-return o.observe(t),o},e.prototype.onIntersection=function(t,e){var n=this
-e.forEach((function(e){var r=e.isIntersecting,i=e.intersectionRatio,o=t.threshold||0
-Array.isArray(o)&&(o=o[o.length-1])
-var a=n.findMatchingRootEntry(t)
-r||i>o?a&&a.elements.some((function(t){return!(!t||t!==e.target||(n.dispatchEnterCallback(t,e),0))})):a&&a.elements.some((function(t){return!(!t||t!==e.target||(n.dispatchExitCallback(t,e),0))}))}))},e.prototype.findRootFromRegistry=function(t){if(this.elementRegistry)return this.elementRegistry.getElement(t)},e.prototype.findMatchingRootEntry=function(t){var e=t.root,n=void 0===e?window:e,r=this.findRootFromRegistry(n)
-if(r)return r[this.stringifyOptions(t)]},e.prototype.determineMatchingElements=function(t,e){var n=this,r=Object.keys(e).filter((function(r){var i=e[r].options
-return n.areOptionsSame(t,i)}))[0]
-return e[r]},e.prototype.areOptionsSame=function(t,e){if(t===e)return!0
-var n=Object.prototype.toString.call(t),r=Object.prototype.toString.call(e)
-if(n!==r)return!1
-if("[object Object]"!==n&&"[object Object]"!==r)return t===e
-if(t&&e&&"object"==typeof t&&"object"==typeof e)for(var i in t)if(Object.prototype.hasOwnProperty.call(t,i)&&!1===this.areOptionsSame(t[i],e[i]))return!1
-return!0},e.prototype.stringifyOptions=function(t){var e=t.root
-return JSON.stringify(t,(function(t,n){if("root"===t&&e){var r=Array.prototype.slice.call(e.classList).reduce((function(t,e){return t+e}),"")
-return e.id+"-"+r}return n}))},e}(u)},4857:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{SKELETON_TYPE:()=>i.aV,SyntaxError:()=>y,TYPE:()=>i.wD,createLiteralElement:()=>i.mD,createNumberElement:()=>i.qx,isArgumentElement:()=>i.VG,isDateElement:()=>i.rp,isDateTimeSkeleton:()=>i.Ii,isLiteralElement:()=>i.O4,isNumberElement:()=>i.uf,isNumberSkeleton:()=>i.Wh,isPluralElement:()=>i.Jo,isPoundElement:()=>i.yx,isSelectElement:()=>i.Wi,isTagElement:()=>i.HI,isTimeElement:()=>i.pe,parse:()=>m,pegParse:()=>b})
-var r=n(2247),i=n(8131),o=/(?:[Eec]{1,6}|G{1,5}|[Qq]{1,5}|(?:[yYur]+|U{1,5})|[ML]{1,5}|d{1,2}|D{1,3}|F{1}|[abB]{1,5}|[hkHK]{1,2}|w{1,2}|W{1}|m{1,2}|s{1,2}|[zZOvVxX]{1,4})(?=([^']*'[^']*')*[^']*$)/g,a=/^\.(?:(0+)(\*)?|(#+)|(0+)(#+))$/g,u=/^(@+)?(\+|#+)?$/g,c=/(\*)(0+)|(#+)(0+)|(0+)/g,s=/^(0+)$/
-function f(t){var e={}
-return t.replace(u,(function(t,n,r){return"string"!=typeof r?(e.minimumSignificantDigits=n.length,e.maximumSignificantDigits=n.length):"+"===r?e.minimumSignificantDigits=n.length:"#"===n[0]?e.maximumSignificantDigits=n.length:(e.minimumSignificantDigits=n.length,e.maximumSignificantDigits=n.length+("string"==typeof r?r.length:0)),""})),e}function l(t){switch(t){case"sign-auto":return{signDisplay:"auto"}
-case"sign-accounting":case"()":return{currencySign:"accounting"}
-case"sign-always":case"+!":return{signDisplay:"always"}
-case"sign-accounting-always":case"()!":return{signDisplay:"always",currencySign:"accounting"}
-case"sign-except-zero":case"+?":return{signDisplay:"exceptZero"}
-case"sign-accounting-except-zero":case"()?":return{signDisplay:"exceptZero",currencySign:"accounting"}
-case"sign-never":case"+_":return{signDisplay:"never"}}}function h(t){var e
-if("E"===t[0]&&"E"===t[1]?(e={notation:"engineering"},t=t.slice(2)):"E"===t[0]&&(e={notation:"scientific"},t=t.slice(1)),e){var n=t.slice(0,2)
-if("+!"===n?(e.signDisplay="always",t=t.slice(2)):"+?"===n&&(e.signDisplay="exceptZero",t=t.slice(2)),!s.test(t))throw new Error("Malformed concise eng/scientific notation")
-e.minimumIntegerDigits=t.length}return e}function d(t){return l(t)||{}}function p(t){for(var e={},n=0,i=t;n<i.length;n++){var o=i[n]
-switch(o.stem){case"percent":case"%":e.style="percent"
-continue
-case"%x100":e.style="percent",e.scale=100
-continue
-case"currency":e.style="currency",e.currency=o.options[0]
-continue
-case"group-off":case",_":e.useGrouping=!1
-continue
-case"precision-integer":case".":e.maximumFractionDigits=0
-continue
-case"measure-unit":case"unit":e.style="unit",e.unit=o.options[0].replace(/^(.*?)-/,"")
-continue
-case"compact-short":case"K":e.notation="compact",e.compactDisplay="short"
-continue
-case"compact-long":case"KK":e.notation="compact",e.compactDisplay="long"
-continue
-case"scientific":e=(0,r.pi)((0,r.pi)((0,r.pi)({},e),{notation:"scientific"}),o.options.reduce((function(t,e){return(0,r.pi)((0,r.pi)({},t),d(e))}),{}))
-continue
-case"engineering":e=(0,r.pi)((0,r.pi)((0,r.pi)({},e),{notation:"engineering"}),o.options.reduce((function(t,e){return(0,r.pi)((0,r.pi)({},t),d(e))}),{}))
-continue
-case"notation-simple":e.notation="standard"
-continue
-case"unit-width-narrow":e.currencyDisplay="narrowSymbol",e.unitDisplay="narrow"
-continue
-case"unit-width-short":e.currencyDisplay="code",e.unitDisplay="short"
-continue
-case"unit-width-full-name":e.currencyDisplay="name",e.unitDisplay="long"
-continue
-case"unit-width-iso-code":e.currencyDisplay="symbol"
-continue
-case"scale":e.scale=parseFloat(o.options[0])
-continue
-case"integer-width":if(o.options.length>1)throw new RangeError("integer-width stems only accept a single optional option")
-o.options[0].replace(c,(function(t,n,r,i,o,a){if(n)e.minimumIntegerDigits=r.length
-else{if(i&&o)throw new Error("We currently do not support maximum integer digits")
-if(a)throw new Error("We currently do not support exact integer digits")}return""}))
-continue}if(s.test(o.stem))e.minimumIntegerDigits=o.stem.length
-else if(a.test(o.stem)){if(o.options.length>1)throw new RangeError("Fraction-precision stems only accept a single optional option")
-o.stem.replace(a,(function(t,n,r,i,o,a){return"*"===r?e.minimumFractionDigits=n.length:i&&"#"===i[0]?e.maximumFractionDigits=i.length:o&&a?(e.minimumFractionDigits=o.length,e.maximumFractionDigits=o.length+a.length):(e.minimumFractionDigits=n.length,e.maximumFractionDigits=n.length),""})),o.options.length&&(e=(0,r.pi)((0,r.pi)({},e),f(o.options[0])))}else if(u.test(o.stem))e=(0,r.pi)((0,r.pi)({},e),f(o.stem))
-else{var p=l(o.stem)
-p&&(e=(0,r.pi)((0,r.pi)({},e),p))
-var y=h(o.stem)
-y&&(e=(0,r.pi)((0,r.pi)({},e),y))}}return e}var y=function(t){function e(n,r,i,o){var a=t.call(this)||this
-return a.message=n,a.expected=r,a.found=i,a.location=o,a.name="SyntaxError","function"==typeof Error.captureStackTrace&&Error.captureStackTrace(a,e),a}return(0,r.ZT)(e,t),e.buildMessage=function(t,e){function n(t){return t.charCodeAt(0).toString(16).toUpperCase()}function r(t){return t.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,(function(t){return"\\x0"+n(t)})).replace(/[\x10-\x1F\x7F-\x9F]/g,(function(t){return"\\x"+n(t)}))}function i(t){return t.replace(/\\/g,"\\\\").replace(/\]/g,"\\]").replace(/\^/g,"\\^").replace(/-/g,"\\-").replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,(function(t){return"\\x0"+n(t)})).replace(/[\x10-\x1F\x7F-\x9F]/g,(function(t){return"\\x"+n(t)}))}function o(t){switch(t.type){case"literal":return'"'+r(t.text)+'"'
-case"class":var e=t.parts.map((function(t){return Array.isArray(t)?i(t[0])+"-"+i(t[1]):i(t)}))
-return"["+(t.inverted?"^":"")+e+"]"
-case"any":return"any character"
-case"end":return"end of input"
-case"other":return t.description}}return"Expected "+function(t){var e,n,r=t.map(o)
-if(r.sort(),r.length>0){for(e=1,n=1;e<r.length;e++)r[e-1]!==r[e]&&(r[n]=r[e],n++)
-r.length=n}switch(r.length){case 1:return r[0]
-case 2:return r[0]+" or "+r[1]
-default:return r.slice(0,-1).join(", ")+", or "+r[r.length-1]}}(t)+" but "+((a=e)?'"'+r(a)+'"':"end of input")+" found."
-var a},e}(Error),b=function(t,e){e=void 0!==e?e:{}
-var n,a={},u={start:qt},c=qt,s="<",f=Lt("<",!1),l=function(t){return t.join("")},h=Lt("#",!1),d=$t("tagElement"),b=Lt("/>",!1),v=Lt(">",!1),g=Lt("</",!1),m=$t("argumentElement"),_="{",w=Lt("{",!1),x="}",A=Lt("}",!1),E=$t("numberSkeletonId"),k=/^['\/{}]/,D=It(["'","/","{","}"],!1,!1),C={type:"any"},O=$t("numberSkeletonTokenOption"),S=Lt("/",!1),M=$t("numberSkeletonToken"),F="::",T=Lt("::",!1),B=function(t){return be.pop(),t.replace(/\s*$/,"")},P=",",j=Lt(",",!1),N="number",R=Lt("number",!1),L=function(t,e,n){return(0,r.pi)({type:"number"===e?i.wD.number:"date"===e?i.wD.date:i.wD.time,style:n&&n[2],value:t},ge())},I="'",$=Lt("'",!1),U=/^[^']/,z=It(["'"],!0,!1),Z=/^[^a-zA-Z'{}]/,q=It([["a","z"],["A","Z"],"'","{","}"],!0,!1),V=/^[a-zA-Z]/,H=It([["a","z"],["A","Z"]],!1,!1),Y="date",G=Lt("date",!1),K="time",W=Lt("time",!1),X="plural",J=Lt("plural",!1),Q="selectordinal",tt=Lt("selectordinal",!1),et="offset:",nt=Lt("offset:",!1),rt="select",it=Lt("select",!1),ot=Lt("=",!1),at=$t("whitespace"),ut=/^[\t-\r \x85\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000]/,ct=It([["\t","\r"]," ","…"," "," ",[" "," "],"\u2028","\u2029"," "," ","　"],!1,!1),st=$t("syntax pattern"),ft=/^[!-\/:-@[-\^`{-~\xA1-\xA7\xA9\xAB\xAC\xAE\xB0\xB1\xB6\xBB\xBF\xD7\xF7\u2010-\u2027\u2030-\u203E\u2041-\u2053\u2055-\u205E\u2190-\u245F\u2500-\u2775\u2794-\u2BFF\u2E00-\u2E7F\u3001-\u3003\u3008-\u3020\u3030\uFD3E\uFD3F\uFE45\uFE46]/,lt=It([["!","/"],[":","@"],["[","^"],"`",["{","~"],["¡","§"],"©","«","¬","®","°","±","¶","»","¿","×","÷",["‐","‧"],["‰","‾"],["⁁","⁓"],["⁕","⁞"],["←","⑟"],["─","❵"],["➔","⯿"],["⸀","⹿"],["、","〃"],["〈","〠"],"〰","﴾","﴿","﹅","﹆"],!1,!1),ht=$t("optional whitespace"),dt=$t("number"),pt=Lt("-",!1),yt=($t("apostrophe"),$t("double apostrophes")),bt="''",vt=Lt("''",!1),gt=Lt("\n",!1),mt=$t("argNameOrNumber"),_t=$t("validTag"),wt=$t("argNumber"),xt=Lt("0",!1),At=/^[1-9]/,Et=It([["1","9"]],!1,!1),kt=/^[0-9]/,Dt=It([["0","9"]],!1,!1),Ct=$t("argName"),Ot=$t("tagName"),St=0,Mt=0,Ft=[{line:1,column:1}],Tt=0,Bt=[],Pt=0
-if(void 0!==e.startRule){if(!(e.startRule in u))throw new Error("Can't start parsing from rule \""+e.startRule+'".')
-c=u[e.startRule]}function jt(){return t.substring(Mt,St)}function Nt(){return zt(Mt,St)}function Rt(t,e){throw function(t,e){return new y(t,[],"",e)}(t,e=void 0!==e?e:zt(Mt,St))}function Lt(t,e){return{type:"literal",text:t,ignoreCase:e}}function It(t,e,n){return{type:"class",parts:t,inverted:e,ignoreCase:n}}function $t(t){return{type:"other",description:t}}function Ut(e){var n,r=Ft[e]
-if(r)return r
-for(n=e-1;!Ft[n];)n--
-for(r={line:(r=Ft[n]).line,column:r.column};n<e;)10===t.charCodeAt(n)?(r.line++,r.column=1):r.column++,n++
-return Ft[e]=r,r}function zt(t,e){var n=Ut(t),r=Ut(e)
-return{start:{offset:t,line:n.line,column:n.column},end:{offset:e,line:r.line,column:r.column}}}function Zt(t){St<Tt||(St>Tt&&(Tt=St,Bt=[]),Bt.push(t))}function qt(){return Vt()}function Vt(){var t,e
-for(t=[],e=Ht();e!==a;)t.push(e),e=Ht()
-return t}function Ht(){var e,n
-return e=St,Mt=St,(xe?a:void 0)!==a?(n=function(){var t,e,n,o,u,c,s
-return Pt++,(t=Kt())===a&&(t=St,(e=Wt())!==a&&(n=Vt())!==a&&(o=Xt())!==a?(Mt=t,c=n,(u=e)!==(s=o)&&Rt('Mismatch tag "'+u+'" !== "'+s+'"',Nt()),t=e=(0,r.pi)({type:i.wD.tag,value:u,children:c},ge())):(St=t,t=a)),Pt--,t===a&&(e=a,0===Pt&&Zt(d)),t}(),n!==a?(Mt=e,e=n):(St=e,e=a)):(St=e,e=a),e===a&&(e=function(){var t,e,n
-return t=St,(e=Yt())!==a&&(Mt=t,n=e,e=(0,r.pi)({type:i.wD.literal,value:n},ge())),e}())===a&&(e=function(){var e,n,o,u,c
-return Pt++,e=St,123===t.charCodeAt(St)?(n=_,St++):(n=a,0===Pt&&Zt(w)),n!==a&&ue()!==a&&(o=he())!==a&&ue()!==a?(125===t.charCodeAt(St)?(u=x,St++):(u=a,0===Pt&&Zt(A)),u!==a?(Mt=e,c=o,e=n=(0,r.pi)({type:i.wD.argument,value:c},ge())):(St=e,e=a)):(St=e,e=a),Pt--,e===a&&(n=a,0===Pt&&Zt(m)),e}())===a&&(e=function(){var e
-return e=function(){var e,n,o,u,c,s,f,l,h
-return e=St,123===t.charCodeAt(St)?(n=_,St++):(n=a,0===Pt&&Zt(w)),n!==a&&ue()!==a&&(o=he())!==a&&ue()!==a?(44===t.charCodeAt(St)?(u=P,St++):(u=a,0===Pt&&Zt(j)),u!==a&&ue()!==a?(t.substr(St,6)===N?(c=N,St+=6):(c=a,0===Pt&&Zt(R)),c!==a&&ue()!==a?(s=St,44===t.charCodeAt(St)?(f=P,St++):(f=a,0===Pt&&Zt(j)),f!==a&&(l=ue())!==a?(h=function(){var e,n,o
-return e=St,t.substr(St,2)===F?(n=F,St+=2):(n=a,0===Pt&&Zt(T)),n!==a?(o=function(){var t,e,n,o
-if(t=St,e=[],(n=te())!==a)for(;n!==a;)e.push(n),n=te()
-else e=a
-return e!==a&&(Mt=t,o=e,e=(0,r.pi)({type:i.aV.number,tokens:o,parsedOptions:Ae?p(o):{}},ge())),e}(),o!==a?(Mt=e,e=n=o):(St=e,e=a)):(St=e,e=a),e===a&&(e=St,Mt=St,be.push("numberArgStyle"),(n=(n=!0)?void 0:a)!==a&&(o=Yt())!==a?(Mt=e,e=n=B(o)):(St=e,e=a)),e}(),h!==a?s=f=[f,l,h]:(St=s,s=a)):(St=s,s=a),s===a&&(s=null),s!==a&&(f=ue())!==a?(125===t.charCodeAt(St)?(l=x,St++):(l=a,0===Pt&&Zt(A)),l!==a?(Mt=e,e=n=L(o,c,s)):(St=e,e=a)):(St=e,e=a)):(St=e,e=a)):(St=e,e=a)):(St=e,e=a),e}(),e===a&&(e=function(){var e,n,u,c,s,f,l,h,d
-return e=St,123===t.charCodeAt(St)?(n=_,St++):(n=a,0===Pt&&Zt(w)),n!==a&&ue()!==a&&(u=he())!==a&&ue()!==a?(44===t.charCodeAt(St)?(c=P,St++):(c=a,0===Pt&&Zt(j)),c!==a&&ue()!==a?(t.substr(St,4)===Y?(s=Y,St+=4):(s=a,0===Pt&&Zt(G)),s===a&&(t.substr(St,4)===K?(s=K,St+=4):(s=a,0===Pt&&Zt(W))),s!==a&&ue()!==a?(f=St,44===t.charCodeAt(St)?(l=P,St++):(l=a,0===Pt&&Zt(j)),l!==a&&(h=ue())!==a?(d=function(){var e,n,u
-return e=St,t.substr(St,2)===F?(n=F,St+=2):(n=a,0===Pt&&Zt(T)),n!==a?(u=function(){var e,n,u,c,s,f,l
-if(e=St,n=St,u=[],(c=ee())===a&&(c=ne()),c!==a)for(;c!==a;)u.push(c),(c=ee())===a&&(c=ne())
-else u=a
-return(n=u!==a?t.substring(n,St):u)!==a&&(Mt=e,s=n,n=(0,r.pi)({type:i.aV.dateTime,pattern:s,parsedOptions:Ae?(f=s,l={},f.replace(o,(function(t){var e=t.length
-switch(t[0]){case"G":l.era=4===e?"long":5===e?"narrow":"short"
-break
-case"y":l.year=2===e?"2-digit":"numeric"
-break
-case"Y":case"u":case"U":case"r":throw new RangeError("`Y/u/U/r` (year) patterns are not supported, use `y` instead")
-case"q":case"Q":throw new RangeError("`q/Q` (quarter) patterns are not supported")
-case"M":case"L":l.month=["numeric","2-digit","short","long","narrow"][e-1]
-break
-case"w":case"W":throw new RangeError("`w/W` (week) patterns are not supported")
-case"d":l.day=["numeric","2-digit"][e-1]
-break
-case"D":case"F":case"g":throw new RangeError("`D/F/g` (day) patterns are not supported, use `d` instead")
-case"E":l.weekday=4===e?"short":5===e?"narrow":"short"
-break
-case"e":if(e<4)throw new RangeError("`e..eee` (weekday) patterns are not supported")
-l.weekday=["short","long","narrow","short"][e-4]
-break
-case"c":if(e<4)throw new RangeError("`c..ccc` (weekday) patterns are not supported")
-l.weekday=["short","long","narrow","short"][e-4]
-break
-case"a":l.hour12=!0
-break
-case"b":case"B":throw new RangeError("`b/B` (period) patterns are not supported, use `a` instead")
-case"h":l.hourCycle="h12",l.hour=["numeric","2-digit"][e-1]
-break
-case"H":l.hourCycle="h23",l.hour=["numeric","2-digit"][e-1]
-break
-case"K":l.hourCycle="h11",l.hour=["numeric","2-digit"][e-1]
-break
-case"k":l.hourCycle="h24",l.hour=["numeric","2-digit"][e-1]
-break
-case"j":case"J":case"C":throw new RangeError("`j/J/C` (hour) patterns are not supported, use `h/H/K/k` instead")
-case"m":l.minute=["numeric","2-digit"][e-1]
-break
-case"s":l.second=["numeric","2-digit"][e-1]
-break
-case"S":case"A":throw new RangeError("`S/A` (second) patterns are not supported, use `s` instead")
-case"z":l.timeZoneName=e<4?"short":"long"
-break
-case"Z":case"O":case"v":case"V":case"X":case"x":throw new RangeError("`Z/O/v/V/X/x` (timeZone) patterns are not supported, use `z` instead")}return""})),l):{}},ge())),n}(),u!==a?(Mt=e,e=n=u):(St=e,e=a)):(St=e,e=a),e===a&&(e=St,Mt=St,be.push("dateOrTimeArgStyle"),(n=(n=!0)?void 0:a)!==a&&(u=Yt())!==a?(Mt=e,e=n=B(u)):(St=e,e=a)),e}(),d!==a?f=l=[l,h,d]:(St=f,f=a)):(St=f,f=a),f===a&&(f=null),f!==a&&(l=ue())!==a?(125===t.charCodeAt(St)?(h=x,St++):(h=a,0===Pt&&Zt(A)),h!==a?(Mt=e,e=n=L(u,s,f)):(St=e,e=a)):(St=e,e=a)):(St=e,e=a)):(St=e,e=a)):(St=e,e=a),e}()),e}(),e===a&&(e=function(){var e,n,o,u,c,s,f,l,h,d,p
-if(e=St,123===t.charCodeAt(St)?(n=_,St++):(n=a,0===Pt&&Zt(w)),n!==a)if(ue()!==a)if((o=he())!==a)if(ue()!==a)if(44===t.charCodeAt(St)?(u=P,St++):(u=a,0===Pt&&Zt(j)),u!==a)if(ue()!==a)if(t.substr(St,6)===X?(c=X,St+=6):(c=a,0===Pt&&Zt(J)),c===a&&(t.substr(St,13)===Q?(c=Q,St+=13):(c=a,0===Pt&&Zt(tt))),c!==a)if(ue()!==a)if(44===t.charCodeAt(St)?(s=P,St++):(s=a,0===Pt&&Zt(j)),s!==a)if(ue()!==a)if(f=St,t.substr(St,7)===et?(l=et,St+=7):(l=a,0===Pt&&Zt(nt)),l!==a&&(h=ue())!==a&&(d=ce())!==a?f=l=[l,h,d]:(St=f,f=a),f===a&&(f=null),f!==a)if((l=ue())!==a){if(h=[],(d=ie())!==a)for(;d!==a;)h.push(d),d=ie()
-else h=a
-h!==a&&(d=ue())!==a?(125===t.charCodeAt(St)?(p=x,St++):(p=a,0===Pt&&Zt(A)),p!==a?(Mt=e,n=function(t,e,n,o){return(0,r.pi)({type:i.wD.plural,pluralType:"plural"===e?"cardinal":"ordinal",value:t,offset:n?n[2]:0,options:o.reduce((function(t,e){var n=e.id,r=e.value,i=e.location
-return n in t&&Rt('Duplicate option "'+n+'" in plural element: "'+jt()+'"',Nt()),t[n]={value:r,location:i},t}),{})},ge())}(o,c,f,h),e=n):(St=e,e=a)):(St=e,e=a)}else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-return e}(),e===a&&(e=function(){var e,n,o,u,c,s,f,l,h
-if(e=St,123===t.charCodeAt(St)?(n=_,St++):(n=a,0===Pt&&Zt(w)),n!==a)if(ue()!==a)if((o=he())!==a)if(ue()!==a)if(44===t.charCodeAt(St)?(u=P,St++):(u=a,0===Pt&&Zt(j)),u!==a)if(ue()!==a)if(t.substr(St,6)===rt?(c=rt,St+=6):(c=a,0===Pt&&Zt(it)),c!==a)if(ue()!==a)if(44===t.charCodeAt(St)?(s=P,St++):(s=a,0===Pt&&Zt(j)),s!==a)if(ue()!==a){if(f=[],(l=re())!==a)for(;l!==a;)f.push(l),l=re()
-else f=a
-f!==a&&(l=ue())!==a?(125===t.charCodeAt(St)?(h=x,St++):(h=a,0===Pt&&Zt(A)),h!==a?(Mt=e,n=function(t,e){return(0,r.pi)({type:i.wD.select,value:t,options:e.reduce((function(t,e){var n=e.id,r=e.value,i=e.location
-return n in t&&Rt('Duplicate option "'+n+'" in select element: "'+jt()+'"',Nt()),t[n]={value:r,location:i},t}),{})},ge())}(o,f),e=n):(St=e,e=a)):(St=e,e=a)}else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-else St=e,e=a
-return e}(),e===a&&(e=function(){var e,n
-return e=St,35===t.charCodeAt(St)?(n="#",St++):(n=a,0===Pt&&Zt(h)),n!==a&&(Mt=e,n=(0,r.pi)({type:i.wD.pound},ge())),n}())))),e}function Yt(){var e,n,r,i
-if(e=St,Mt=St,(n=(n=xe)?void 0:a)!==a){if(r=[],(i=se())===a&&(i=fe())===a&&(i=le())===a&&(60===t.charCodeAt(St)?(i=s,St++):(i=a,0===Pt&&Zt(f))),i!==a)for(;i!==a;)r.push(i),(i=se())===a&&(i=fe())===a&&(i=le())===a&&(60===t.charCodeAt(St)?(i=s,St++):(i=a,0===Pt&&Zt(f)))
-else r=a
-r!==a?(Mt=e,e=n=l(r)):(St=e,e=a)}else St=e,e=a
-if(e===a){if(e=St,n=[],(r=se())===a&&(r=fe())===a&&(r=le())===a&&(r=Gt()),r!==a)for(;r!==a;)n.push(r),(r=se())===a&&(r=fe())===a&&(r=le())===a&&(r=Gt())
-else n=a
-n!==a&&(Mt=e,n=l(n)),e=n}return e}function Gt(){var e,n,r
-return e=St,n=St,Pt++,(r=Wt())===a&&(r=Xt())===a&&(r=Kt()),Pt--,r===a?n=void 0:(St=n,n=a),n!==a?(60===t.charCodeAt(St)?(r=s,St++):(r=a,0===Pt&&Zt(f)),r!==a?(Mt=e,e=n="<"):(St=e,e=a)):(St=e,e=a),e}function Kt(){var e,n,o,u,c,l,h
-return e=St,n=St,60===t.charCodeAt(St)?(o=s,St++):(o=a,0===Pt&&Zt(f)),o!==a&&(u=de())!==a&&(c=ue())!==a?("/>"===t.substr(St,2)?(l="/>",St+=2):(l=a,0===Pt&&Zt(b)),l!==a?n=o=[o,u,c,l]:(St=n,n=a)):(St=n,n=a),n!==a&&(Mt=e,h=n,n=(0,r.pi)({type:i.wD.literal,value:h.join("")},ge())),n}function Wt(){var e,n,r,i
-return e=St,60===t.charCodeAt(St)?(n=s,St++):(n=a,0===Pt&&Zt(f)),n!==a&&(r=de())!==a?(62===t.charCodeAt(St)?(i=">",St++):(i=a,0===Pt&&Zt(v)),i!==a?(Mt=e,e=n=r):(St=e,e=a)):(St=e,e=a),e}function Xt(){var e,n,r,i
-return e=St,"</"===t.substr(St,2)?(n="</",St+=2):(n=a,0===Pt&&Zt(g)),n!==a&&(r=de())!==a?(62===t.charCodeAt(St)?(i=">",St++):(i=a,0===Pt&&Zt(v)),i!==a?(Mt=e,e=n=r):(St=e,e=a)):(St=e,e=a),e}function Jt(){var e,n,r,i,o
-if(Pt++,e=St,n=[],r=St,i=St,Pt++,(o=oe())===a&&(k.test(t.charAt(St))?(o=t.charAt(St),St++):(o=a,0===Pt&&Zt(D))),Pt--,o===a?i=void 0:(St=i,i=a),i!==a?(t.length>St?(o=t.charAt(St),St++):(o=a,0===Pt&&Zt(C)),o!==a?r=i=[i,o]:(St=r,r=a)):(St=r,r=a),r!==a)for(;r!==a;)n.push(r),r=St,i=St,Pt++,(o=oe())===a&&(k.test(t.charAt(St))?(o=t.charAt(St),St++):(o=a,0===Pt&&Zt(D))),Pt--,o===a?i=void 0:(St=i,i=a),i!==a?(t.length>St?(o=t.charAt(St),St++):(o=a,0===Pt&&Zt(C)),o!==a?r=i=[i,o]:(St=r,r=a)):(St=r,r=a)
-else n=a
-return e=n!==a?t.substring(e,St):n,Pt--,e===a&&(n=a,0===Pt&&Zt(E)),e}function Qt(){var e,n,r
-return Pt++,e=St,47===t.charCodeAt(St)?(n="/",St++):(n=a,0===Pt&&Zt(S)),n!==a&&(r=Jt())!==a?(Mt=e,e=n=r):(St=e,e=a),Pt--,e===a&&(n=a,0===Pt&&Zt(O)),e}function te(){var t,e,n,r,i
-if(Pt++,t=St,(e=ue())!==a)if((n=Jt())!==a){for(r=[],i=Qt();i!==a;)r.push(i),i=Qt()
-r!==a?(Mt=t,e=function(t,e){return{stem:t,options:e}}(n,r),t=e):(St=t,t=a)}else St=t,t=a
-else St=t,t=a
-return Pt--,t===a&&(e=a,0===Pt&&Zt(M)),t}function ee(){var e,n,r,i
-if(e=St,39===t.charCodeAt(St)?(n=I,St++):(n=a,0===Pt&&Zt($)),n!==a){if(r=[],(i=se())===a&&(U.test(t.charAt(St))?(i=t.charAt(St),St++):(i=a,0===Pt&&Zt(z))),i!==a)for(;i!==a;)r.push(i),(i=se())===a&&(U.test(t.charAt(St))?(i=t.charAt(St),St++):(i=a,0===Pt&&Zt(z)))
-else r=a
-r!==a?(39===t.charCodeAt(St)?(i=I,St++):(i=a,0===Pt&&Zt($)),i!==a?e=n=[n,r,i]:(St=e,e=a)):(St=e,e=a)}else St=e,e=a
-if(e===a)if(e=[],(n=se())===a&&(Z.test(t.charAt(St))?(n=t.charAt(St),St++):(n=a,0===Pt&&Zt(q))),n!==a)for(;n!==a;)e.push(n),(n=se())===a&&(Z.test(t.charAt(St))?(n=t.charAt(St),St++):(n=a,0===Pt&&Zt(q)))
-else e=a
-return e}function ne(){var e,n
-if(e=[],V.test(t.charAt(St))?(n=t.charAt(St),St++):(n=a,0===Pt&&Zt(H)),n!==a)for(;n!==a;)e.push(n),V.test(t.charAt(St))?(n=t.charAt(St),St++):(n=a,0===Pt&&Zt(H))
-else e=a
-return e}function re(){var e,n,i,o,u,c,s
-return e=St,ue()!==a&&(n=ye())!==a&&ue()!==a?(123===t.charCodeAt(St)?(i=_,St++):(i=a,0===Pt&&Zt(w)),i!==a?(Mt=St,be.push("select"),void 0!==a&&(o=Vt())!==a?(125===t.charCodeAt(St)?(u=x,St++):(u=a,0===Pt&&Zt(A)),u!==a?(Mt=e,c=n,s=o,be.pop(),e=(0,r.pi)({id:c,value:s},ge())):(St=e,e=a)):(St=e,e=a)):(St=e,e=a)):(St=e,e=a),e}function ie(){var e,n,i,o,u,c,s
-return e=St,ue()!==a?(n=function(){var e,n,r,i
-return e=St,n=St,61===t.charCodeAt(St)?(r="=",St++):(r=a,0===Pt&&Zt(ot)),r!==a&&(i=ce())!==a?n=r=[r,i]:(St=n,n=a),(e=n!==a?t.substring(e,St):n)===a&&(e=ye()),e}(),n!==a&&ue()!==a?(123===t.charCodeAt(St)?(i=_,St++):(i=a,0===Pt&&Zt(w)),i!==a?(Mt=St,be.push("plural"),void 0!==a&&(o=Vt())!==a?(125===t.charCodeAt(St)?(u=x,St++):(u=a,0===Pt&&Zt(A)),u!==a?(Mt=e,c=n,s=o,be.pop(),e=(0,r.pi)({id:c,value:s},ge())):(St=e,e=a)):(St=e,e=a)):(St=e,e=a)):(St=e,e=a)):(St=e,e=a),e}function oe(){var e
-return Pt++,ut.test(t.charAt(St))?(e=t.charAt(St),St++):(e=a,0===Pt&&Zt(ct)),Pt--,e===a&&0===Pt&&Zt(at),e}function ae(){var e
-return Pt++,ft.test(t.charAt(St))?(e=t.charAt(St),St++):(e=a,0===Pt&&Zt(lt)),Pt--,e===a&&0===Pt&&Zt(st),e}function ue(){var e,n,r
-for(Pt++,e=St,n=[],r=oe();r!==a;)n.push(r),r=oe()
-return e=n!==a?t.substring(e,St):n,Pt--,e===a&&(n=a,0===Pt&&Zt(ht)),e}function ce(){var e,n,r,i
-return Pt++,e=St,45===t.charCodeAt(St)?(n="-",St++):(n=a,0===Pt&&Zt(pt)),n===a&&(n=null),n!==a&&(r=pe())!==a?(Mt=e,e=n=(i=r)?n?-i:i:0):(St=e,e=a),Pt--,e===a&&(n=a,0===Pt&&Zt(dt)),e}function se(){var e,n
-return Pt++,e=St,t.substr(St,2)===bt?(n=bt,St+=2):(n=a,0===Pt&&Zt(vt)),n!==a&&(Mt=e,n="'"),Pt--,(e=n)===a&&(n=a,0===Pt&&Zt(yt)),e}function fe(){var e,n,r,i,o,u
-if(e=St,39===t.charCodeAt(St)?(n=I,St++):(n=a,0===Pt&&Zt($)),n!==a)if(r=function(){var e,n,r,i,o
-return e=St,n=St,t.length>St?(r=t.charAt(St),St++):(r=a,0===Pt&&Zt(C)),r!==a?(Mt=St,(i=(i="<"===(o=r)||">"===o||"{"===o||"}"===o||ve()&&"#"===o)?void 0:a)!==a?n=r=[r,i]:(St=n,n=a)):(St=n,n=a),n!==a?t.substring(e,St):n}(),r!==a){for(i=St,o=[],t.substr(St,2)===bt?(u=bt,St+=2):(u=a,0===Pt&&Zt(vt)),u===a&&(U.test(t.charAt(St))?(u=t.charAt(St),St++):(u=a,0===Pt&&Zt(z)));u!==a;)o.push(u),t.substr(St,2)===bt?(u=bt,St+=2):(u=a,0===Pt&&Zt(vt)),u===a&&(U.test(t.charAt(St))?(u=t.charAt(St),St++):(u=a,0===Pt&&Zt(z)));(i=o!==a?t.substring(i,St):o)!==a?(39===t.charCodeAt(St)?(o=I,St++):(o=a,0===Pt&&Zt($)),o===a&&(o=null),o!==a?(Mt=e,e=n=r+i.replace("''","'")):(St=e,e=a)):(St=e,e=a)}else St=e,e=a
-else St=e,e=a
-return e}function le(){var e,n,r,i,o
-return e=St,n=St,t.length>St?(r=t.charAt(St),St++):(r=a,0===Pt&&Zt(C)),r!==a?(Mt=St,(i=(i=!("<"===(o=r)||"{"===o||ve()&&"#"===o||be.length>1&&"}"===o))?void 0:a)!==a?n=r=[r,i]:(St=n,n=a)):(St=n,n=a),n===a&&(10===t.charCodeAt(St)?(n="\n",St++):(n=a,0===Pt&&Zt(gt))),n!==a?t.substring(e,St):n}function he(){var e,n
-return Pt++,e=St,(n=pe())===a&&(n=ye()),e=n!==a?t.substring(e,St):n,Pt--,e===a&&(n=a,0===Pt&&Zt(mt)),e}function de(){var e,n
-return Pt++,e=St,(n=pe())===a&&(n=function(){var e,n,r,i,o
-if(Pt++,e=St,n=[],45===t.charCodeAt(St)?(r="-",St++):(r=a,0===Pt&&Zt(pt)),r===a&&(r=St,i=St,Pt++,(o=oe())===a&&(o=ae()),Pt--,o===a?i=void 0:(St=i,i=a),i!==a?(t.length>St?(o=t.charAt(St),St++):(o=a,0===Pt&&Zt(C)),o!==a?r=i=[i,o]:(St=r,r=a)):(St=r,r=a)),r!==a)for(;r!==a;)n.push(r),45===t.charCodeAt(St)?(r="-",St++):(r=a,0===Pt&&Zt(pt)),r===a&&(r=St,i=St,Pt++,(o=oe())===a&&(o=ae()),Pt--,o===a?i=void 0:(St=i,i=a),i!==a?(t.length>St?(o=t.charAt(St),St++):(o=a,0===Pt&&Zt(C)),o!==a?r=i=[i,o]:(St=r,r=a)):(St=r,r=a))
-else n=a
-return e=n!==a?t.substring(e,St):n,Pt--,e===a&&(n=a,0===Pt&&Zt(Ot)),e}()),e=n!==a?t.substring(e,St):n,Pt--,e===a&&(n=a,0===Pt&&Zt(_t)),e}function pe(){var e,n,r,i,o
-if(Pt++,e=St,48===t.charCodeAt(St)?(n="0",St++):(n=a,0===Pt&&Zt(xt)),n!==a&&(Mt=e,n=0),(e=n)===a){if(e=St,n=St,At.test(t.charAt(St))?(r=t.charAt(St),St++):(r=a,0===Pt&&Zt(Et)),r!==a){for(i=[],kt.test(t.charAt(St))?(o=t.charAt(St),St++):(o=a,0===Pt&&Zt(Dt));o!==a;)i.push(o),kt.test(t.charAt(St))?(o=t.charAt(St),St++):(o=a,0===Pt&&Zt(Dt))
-i!==a?n=r=[r,i]:(St=n,n=a)}else St=n,n=a
-n!==a&&(Mt=e,n=parseInt(n.join(""),10)),e=n}return Pt--,e===a&&(n=a,0===Pt&&Zt(wt)),e}function ye(){var e,n,r,i,o
-if(Pt++,e=St,n=[],r=St,i=St,Pt++,(o=oe())===a&&(o=ae()),Pt--,o===a?i=void 0:(St=i,i=a),i!==a?(t.length>St?(o=t.charAt(St),St++):(o=a,0===Pt&&Zt(C)),o!==a?r=i=[i,o]:(St=r,r=a)):(St=r,r=a),r!==a)for(;r!==a;)n.push(r),r=St,i=St,Pt++,(o=oe())===a&&(o=ae()),Pt--,o===a?i=void 0:(St=i,i=a),i!==a?(t.length>St?(o=t.charAt(St),St++):(o=a,0===Pt&&Zt(C)),o!==a?r=i=[i,o]:(St=r,r=a)):(St=r,r=a)
-else n=a
-return e=n!==a?t.substring(e,St):n,Pt--,e===a&&(n=a,0===Pt&&Zt(Ct)),e}var be=["root"]
-function ve(){return"plural"===be[be.length-1]}function ge(){return e&&e.captureLocation?{location:Nt()}:{}}var me,_e,we,xe=e&&e.ignoreTag,Ae=e&&e.shouldParseSkeleton
-if((n=c())!==a&&St===t.length)return n
-throw n!==a&&St<t.length&&Zt({type:"end"}),me=Bt,_e=Tt<t.length?t.charAt(Tt):null,we=Tt<t.length?zt(Tt,Tt+1):zt(Tt,Tt),new y(y.buildMessage(me,_e),me,_e,we)},v=/(^|[^\\])#/g
-function g(t){t.forEach((function(t){((0,i.Jo)(t)||(0,i.Wi)(t))&&Object.keys(t.options).forEach((function(e){for(var n,o=t.options[e],a=-1,u=void 0,c=0;c<o.value.length;c++){var s=o.value[c]
-if((0,i.O4)(s)&&v.test(s.value)){a=c,u=s
-break}}if(u){var f=u.value.replace(v,"$1{"+t.value+", number}"),l=b(f);(n=o.value).splice.apply(n,(0,r.ev)([a,1],l))}g(o.value)}))}))}function m(t,e){e=(0,r.pi)({normalizeHashtagInPlural:!0,shouldParseSkeleton:!0},e||{})
-var n=b(t,e)
-return e.normalizeHashtagInPlural&&g(n),n}},8131:(t,e,n)=>{"use strict"
-var r,i
-function o(t){return t.type===r.literal}function a(t){return t.type===r.argument}function u(t){return t.type===r.number}function c(t){return t.type===r.date}function s(t){return t.type===r.time}function f(t){return t.type===r.select}function l(t){return t.type===r.plural}function h(t){return t.type===r.pound}function d(t){return t.type===r.tag}function p(t){return!(!t||"object"!=typeof t||t.type!==i.number)}function y(t){return!(!t||"object"!=typeof t||t.type!==i.dateTime)}function b(t){return{type:r.literal,value:t}}function v(t,e){return{type:r.number,value:t,style:e}}n.d(e,{HI:()=>d,Ii:()=>y,Jo:()=>l,O4:()=>o,VG:()=>a,Wh:()=>p,Wi:()=>f,aV:()=>i,mD:()=>b,pe:()=>s,qx:()=>v,rp:()=>c,uf:()=>u,wD:()=>r,yx:()=>h}),function(t){t[t.literal=0]="literal",t[t.argument=1]="argument",t[t.number=2]="number",t[t.date=3]="date",t[t.time=4]="time",t[t.select=5]="select",t[t.plural=6]="plural",t[t.pound=7]="pound",t[t.tag=8]="tag"}(r||(r={})),function(t){t[t.number=0]="number",t[t.dateTime=1]="dateTime"}(i||(i={}))},4143:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{ErrorCode:()=>r,FormatError:()=>f,IntlMessageFormat:()=>g,InvalidValueError:()=>l,InvalidValueTypeError:()=>h,MissingValueError:()=>d,PART_TYPE:()=>s,default:()=>m,formatToParts:()=>y,isFormatXMLElementFn:()=>p})
-var r,i=n(2247),o=n(4857),a=n(4564),u=n.n(a),c=n(8131)
-!function(t){t.MISSING_VALUE="MISSING_VALUE",t.INVALID_VALUE="INVALID_VALUE",t.MISSING_INTL_API="MISSING_INTL_API"}(r||(r={}))
-var s,f=function(t){function e(e,n,r){var i=t.call(this,e)||this
-return i.code=n,i.originalMessage=r,i}return(0,i.ZT)(e,t),e.prototype.toString=function(){return"[formatjs Error: "+this.code+"] "+this.message},e}(Error),l=function(t){function e(e,n,i,o){return t.call(this,'Invalid values for "'+e+'": "'+n+'". Options are "'+Object.keys(i).join('", "')+'"',r.INVALID_VALUE,o)||this}return(0,i.ZT)(e,t),e}(f),h=function(t){function e(e,n,i){return t.call(this,'Value for "'+e+'" must be of type '+n,r.INVALID_VALUE,i)||this}return(0,i.ZT)(e,t),e}(f),d=function(t){function e(e,n){return t.call(this,'The intl string context variable "'+e+'" was not provided to the string "'+n+'"',r.MISSING_VALUE,n)||this}return(0,i.ZT)(e,t),e}(f)
-function p(t){return"function"==typeof t}function y(t,e,n,i,o,a,u){if(1===t.length&&(0,c.O4)(t[0]))return[{type:s.literal,value:t[0].value}]
-for(var b=[],v=0,g=t;v<g.length;v++){var m=g[v]
-if((0,c.O4)(m))b.push({type:s.literal,value:m.value})
-else if((0,c.yx)(m))"number"==typeof a&&b.push({type:s.literal,value:n.getNumberFormat(e).format(a)})
-else{var _=m.value
-if(!o||!(_ in o))throw new d(_,u)
-var w=o[_]
-if((0,c.VG)(m))w&&"string"!=typeof w&&"number"!=typeof w||(w="string"==typeof w||"number"==typeof w?String(w):""),b.push({type:"string"==typeof w?s.literal:s.object,value:w})
-else if((0,c.rp)(m)){var x="string"==typeof m.style?i.date[m.style]:(0,c.Ii)(m.style)?m.style.parsedOptions:void 0
-b.push({type:s.literal,value:n.getDateTimeFormat(e,x).format(w)})}else if((0,c.pe)(m))x="string"==typeof m.style?i.time[m.style]:(0,c.Ii)(m.style)?m.style.parsedOptions:void 0,b.push({type:s.literal,value:n.getDateTimeFormat(e,x).format(w)})
-else if((0,c.uf)(m))(x="string"==typeof m.style?i.number[m.style]:(0,c.Wh)(m.style)?m.style.parsedOptions:void 0)&&x.scale&&(w*=x.scale||1),b.push({type:s.literal,value:n.getNumberFormat(e,x).format(w)})
-else{if((0,c.HI)(m)){var A=m.children,E=m.value,k=o[E]
-if(!p(k))throw new h(E,"function",u)
-var D=k(y(A,e,n,i,o,a).map((function(t){return t.value})))
-Array.isArray(D)||(D=[D]),b.push.apply(b,D.map((function(t){return{type:"string"==typeof t?s.literal:s.object,value:t}})))}if((0,c.Wi)(m)){if(!(C=m.options[w]||m.options.other))throw new l(m.value,w,Object.keys(m.options),u)
-b.push.apply(b,y(C.value,e,n,i,o))}else if((0,c.Jo)(m)){var C
-if(!(C=m.options["="+w])){if(!Intl.PluralRules)throw new f('Intl.PluralRules is not available in this environment.\nTry polyfilling it using "@formatjs/intl-pluralrules"\n',r.MISSING_INTL_API,u)
-var O=n.getPluralRules(e,{type:m.pluralType}).select(w-(m.offset||0))
-C=m.options[O]||m.options.other}if(!C)throw new l(m.value,w,Object.keys(m.options),u)
-b.push.apply(b,y(C.value,e,n,i,o,w-(m.offset||0)))}}}}return(S=b).length<2?S:S.reduce((function(t,e){var n=t[t.length-1]
-return n&&n.type===s.literal&&e.type===s.literal?n.value+=e.value:t.push(e),t}),[])
-var S}function b(t){return{create:function(){return{has:function(e){return e in t},get:function(e){return t[e]},set:function(e,n){t[e]=n}}}}}!function(t){t[t.literal=0]="literal",t[t.object=1]="object"}(s||(s={}))
-var v=u()||a,g=function(){function t(e,n,r,o){var a,u,c,f=this
-if(void 0===n&&(n=t.defaultLocale),this.formatterCache={number:{},dateTime:{},pluralRules:{}},this.format=function(t){var e=f.formatToParts(t)
-if(1===e.length)return e[0].value
-var n=e.reduce((function(t,e){return t.length&&e.type===s.literal&&"string"==typeof t[t.length-1]?t[t.length-1]+=e.value:t.push(e.value),t}),[])
-return n.length<=1?n[0]||"":n},this.formatToParts=function(t){return y(f.ast,f.locales,f.formatters,f.formats,t,void 0,f.message)},this.resolvedOptions=function(){return{locale:Intl.NumberFormat.supportedLocalesOf(f.locales)[0]}},this.getAst=function(){return f.ast},"string"==typeof e){if(this.message=e,!t.__parse)throw new TypeError("IntlMessageFormat.__parse must be set to process `message` of type `string`")
-this.ast=t.__parse(e,{normalizeHashtagInPlural:!1,ignoreTag:null==o?void 0:o.ignoreTag})}else this.ast=e
-if(!Array.isArray(this.ast))throw new TypeError("A message must be provided as a String or AST.")
-this.formats=(u=t.formats,(c=r)?Object.keys(u).reduce((function(t,e){var n,r
-return t[e]=(n=u[e],(r=c[e])?(0,i.pi)((0,i.pi)((0,i.pi)({},n||{}),r||{}),Object.keys(n).reduce((function(t,e){return t[e]=(0,i.pi)((0,i.pi)({},n[e]),r[e]||{}),t}),{})):n),t}),(0,i.pi)({},u)):u),this.locales=n,this.formatters=o&&o.formatters||(void 0===(a=this.formatterCache)&&(a={number:{},dateTime:{},pluralRules:{}}),{getNumberFormat:v((function(){for(var t,e=[],n=0;n<arguments.length;n++)e[n]=arguments[n]
-return new((t=Intl.NumberFormat).bind.apply(t,(0,i.ev)([void 0],e)))}),{cache:b(a.number),strategy:v.strategies.variadic}),getDateTimeFormat:v((function(){for(var t,e=[],n=0;n<arguments.length;n++)e[n]=arguments[n]
-return new((t=Intl.DateTimeFormat).bind.apply(t,(0,i.ev)([void 0],e)))}),{cache:b(a.dateTime),strategy:v.strategies.variadic}),getPluralRules:v((function(){for(var t,e=[],n=0;n<arguments.length;n++)e[n]=arguments[n]
-return new((t=Intl.PluralRules).bind.apply(t,(0,i.ev)([void 0],e)))}),{cache:b(a.pluralRules),strategy:v.strategies.variadic})})}return Object.defineProperty(t,"defaultLocale",{get:function(){return t.memoizedDefaultLocale||(t.memoizedDefaultLocale=(new Intl.NumberFormat).resolvedOptions().locale),t.memoizedDefaultLocale},enumerable:!1,configurable:!0}),t.memoizedDefaultLocale=null,t.__parse=o.parse,t.formats={number:{currency:{style:"currency"},percent:{style:"percent"}},date:{short:{month:"numeric",day:"numeric",year:"2-digit"},medium:{month:"short",day:"numeric",year:"numeric"},long:{month:"long",day:"numeric",year:"numeric"},full:{weekday:"long",month:"long",day:"numeric",year:"numeric"}},time:{short:{hour:"numeric",minute:"numeric"},medium:{hour:"numeric",minute:"numeric",second:"numeric"},long:{hour:"numeric",minute:"numeric",second:"numeric",timeZoneName:"short"},full:{hour:"numeric",minute:"numeric",second:"numeric",timeZoneName:"short"}}},t}()
-const m=g},6196:(t,e,n)=>{var r=n(1219),i=n(2251)
-function o(t){this.Container=t||Array,this.items=new Map,this.clear(),Object.defineProperty(this.items,"constructor",{value:o,enumerable:!1})}o.prototype.clear=function(){this.size=0,this.dimension=0,this.items.clear()},o.prototype.set=function(t,e){var n,r=this.items.get(t)
-return r||(this.dimension++,r=new this.Container,this.items.set(t,r)),this.Container===Set?(n=r.size,r.add(e),n<r.size&&this.size++):(r.push(e),this.size++),this},o.prototype.delete=function(t){var e=this.items.get(t)
-return!!e&&(this.size-=this.Container===Set?e.size:e.length,this.dimension--,this.items.delete(t),!0)},o.prototype.remove=function(t,e){var n,r,i=this.items.get(t)
-return!!i&&(this.Container===Set?((n=i.delete(e))&&this.size--,0===i.size&&(this.items.delete(t),this.dimension--),n):-1!==(r=i.indexOf(e))&&(this.size--,1===i.length?(this.items.delete(t),this.dimension--,!0):(i.splice(r,1),!0)))},o.prototype.has=function(t){return this.items.has(t)},o.prototype.get=function(t){return this.items.get(t)},o.prototype.multiplicity=function(t){var e=this.items.get(t)
-return void 0===e?0:this.Container===Set?e.size:e.length},o.prototype.count=o.prototype.multiplicity,o.prototype.forEach=function(t,e){var n
-function r(r){t.call(e,r,n)}e=arguments.length>1?e:this,this.items.forEach((function(t,e){n=e,t.forEach(r)}))},o.prototype.forEachAssociation=function(t,e){e=arguments.length>1?e:this,this.items.forEach(t,e)},o.prototype.keys=function(){return this.items.keys()},o.prototype.values=function(){var t,e,n,i,o=this.items.values(),a=!1
-return this.Container===Set?new r((function n(){if(!a){if((e=o.next()).done)return{done:!0}
-a=!0,t=e.value.values()}return(e=t.next()).done?(a=!1,n()):{done:!1,value:e.value}})):new r((function r(){if(!a){if((e=o.next()).done)return{done:!0}
-a=!0,t=e.value,n=0,i=t.length}return n>=i?(a=!1,r()):{done:!1,value:t[n++]}}))},o.prototype.entries=function(){var t,e,n,i,o,a=this.items.entries(),u=!1
-return this.Container===Set?new r((function r(){if(!u){if((e=a.next()).done)return{done:!0}
-u=!0,n=e.value[0],t=e.value[1].values()}return(e=t.next()).done?(u=!1,r()):{done:!1,value:[n,e.value]}})):new r((function r(){if(!u){if((e=a.next()).done)return{done:!0}
-u=!0,n=e.value[0],t=e.value[1],i=0,o=t.length}return i>=o?(u=!1,r()):{done:!1,value:[n,t[i++]]}}))},o.prototype.containers=function(){return this.items.values()},o.prototype.associations=function(){return this.items.entries()},"undefined"!=typeof Symbol&&(o.prototype[Symbol.iterator]=o.prototype.entries),o.prototype.inspect=function(){return this.items},"undefined"!=typeof Symbol&&(o.prototype[Symbol.for("nodejs.util.inspect.custom")]=o.prototype.inspect),o.prototype.toJSON=function(){return this.items},o.from=function(t,e){var n=new o(e)
-return i(t,(function(t,e){n.set(e,t)})),n},t.exports=o},3333:(t,e)=>{e.intersection=function(){if(arguments.length<2)throw new Error("mnemonist/Set.intersection: needs at least two arguments.")
-var t,e,n=new Set,r=1/0,i=null,o=arguments.length
-for(e=0;e<o;e++){if(0===(t=arguments[e]).size)return n
-t.size<r&&(r=t.size,i=t)}for(var a,u,c,s,f=i.values();!(a=f.next()).done;){for(u=a.value,c=!0,e=0;e<o;e++)if((s=arguments[e])!==i&&!s.has(u)){c=!1
-break}c&&n.add(u)}return n},e.union=function(){if(arguments.length<2)throw new Error("mnemonist/Set.union: needs at least two arguments.")
-var t,e,n,r=new Set,i=arguments.length
-for(t=0;t<i;t++)for(e=arguments[t].values();!(n=e.next()).done;)r.add(n.value)
-return r},e.difference=function(t,e){if(!t.size)return new Set
-if(!e.size)return new Set(t)
-for(var n,r=new Set,i=t.values();!(n=i.next()).done;)e.has(n.value)||r.add(n.value)
-return r},e.symmetricDifference=function(t,e){for(var n,r=new Set,i=t.values();!(n=i.next()).done;)e.has(n.value)||r.add(n.value)
-for(i=e.values();!(n=i.next()).done;)t.has(n.value)||r.add(n.value)
-return r},e.isSubset=function(t,e){var n,r=t.values()
-if(t===e)return!0
-if(t.size>e.size)return!1
-for(;!(n=r.next()).done;)if(!e.has(n.value))return!1
-return!0},e.isSuperset=function(t,n){return e.isSubset(n,t)},e.add=function(t,e){for(var n,r=e.values();!(n=r.next()).done;)t.add(n.value)},e.subtract=function(t,e){for(var n,r=e.values();!(n=r.next()).done;)t.delete(n.value)},e.intersect=function(t,e){for(var n,r=t.values();!(n=r.next()).done;)e.has(n.value)||t.delete(n.value)},e.disjunct=function(t,e){for(var n,r=t.values(),i=[];!(n=r.next()).done;)e.has(n.value)&&i.push(n.value)
-for(r=e.values();!(n=r.next()).done;)t.has(n.value)||t.add(n.value)
-for(var o=0,a=i.length;o<a;o++)t.delete(i[o])},e.intersectionSize=function(t,e){var n
-if(t.size>e.size&&(n=t,t=e,e=n),0===t.size)return 0
-if(t===e)return t.size
-for(var r,i=t.values(),o=0;!(r=i.next()).done;)e.has(r.value)&&o++
-return o},e.unionSize=function(t,n){var r=e.intersectionSize(t,n)
-return t.size+n.size-r},e.jaccard=function(t,n){var r=e.intersectionSize(t,n)
-return 0===r?0:r/(t.size+n.size-r)},e.overlap=function(t,n){var r=e.intersectionSize(t,n)
-return 0===r?0:r/Math.min(t.size,n.size)}},260:t=>{function e(t,e){if(!t)throw new Error(e||"AssertionError")}e.notEqual=function(t,n,r){e(t!=n,r)},e.notOk=function(t,n){e(!t,n)},e.equal=function(t,n,r){e(t==n,r)},e.ok=e,t.exports=e},4662:t=>{t.exports=function(t){!function(t){if(!t)throw new Error("Eventify cannot use falsy object as events subject")
-for(var e=["on","fire","off"],n=0;n<e.length;++n)if(t.hasOwnProperty(e[n]))throw new Error("Subject cannot be eventified, since it already has property '"+e[n]+"'")}(t)
-var e=function(t){var e=Object.create(null)
-return{on:function(n,r,i){if("function"!=typeof r)throw new Error("callback is expected to be a function")
-var o=e[n]
-return o||(o=e[n]=[]),o.push({callback:r,ctx:i}),t},off:function(n,r){if(void 0===n)return e=Object.create(null),t
-if(e[n])if("function"!=typeof r)delete e[n]
-else for(var i=e[n],o=0;o<i.length;++o)i[o].callback===r&&i.splice(o,1)
-return t},fire:function(n){var r,i=e[n]
-if(!i)return t
-arguments.length>1&&(r=Array.prototype.splice.call(arguments,1))
-for(var o=0;o<i.length;++o){var a=i[o]
-a.callback.apply(a.ctx,r)}return t}}}(t)
-return t.on=e.on,t.off=e.off,t.fire=e.fire,t}},1832:(t,e,n)=>{t.exports=function(t){if("uniqueLinkId"in(t=t||{})&&(console.warn("ngraph.graph: Starting from version 0.14 `uniqueLinkId` is deprecated.\nUse `multigraph` option instead\n","\n","Note: there is also change in default behavior: From now on each graph\nis considered to be not a multigraph by default (each edge is unique)."),t.multigraph=t.uniqueLinkId),void 0===t.multigraph&&(t.multigraph=!1),"function"!=typeof Map)throw new Error("ngraph.graph requires `Map` to be defined. Please polyfill it before using ngraph")
-var e,n=new Map,s=[],f={},l=0,h=t.multigraph?function(t,e,n){var r=c(t,e),i=f.hasOwnProperty(r)
-if(i||C(t,e)){i||(f[r]=0)
-var o="@"+ ++f[r]
-r=c(t+o,e+o)}return new u(t,e,n,r)}:function(t,e,n){return new u(t,e,n,c(t,e))},d=[],p=O,y=O,b=O,v=O,g={addNode:w,addLink:function(t,e,n){b()
-var r=x(t)||w(t),i=x(e)||w(e),o=h(t,e,n)
-return s.push(o),a(r,o),t!==e&&a(i,o),p(o,"add"),v(),o},removeLink:D,removeNode:A,getNode:x,getNodeCount:E,getLinkCount:k,getLinksCount:k,getNodesCount:E,getLinks:function(t){var e=x(t)
-return e?e.links:null},forEachNode:F,forEachLinkedNode:function(t,e,r){var i=x(t)
-if(i&&i.links&&"function"==typeof e)return r?function(t,e,r){for(var i=0;i<t.length;++i){var o=t[i]
-if(o.fromId===e&&r(n.get(o.toId),o))return!0}}(i.links,t,e):function(t,e,r){for(var i=0;i<t.length;++i){var o=t[i],a=o.fromId===e?o.toId:o.fromId
-if(r(n.get(a),o))return!0}}(i.links,t,e)},forEachLink:function(t){var e,n
-if("function"==typeof t)for(e=0,n=s.length;e<n;++e)t(s[e])},beginUpdate:b,endUpdate:v,clear:function(){b(),F((function(t){A(t.id)})),v()},hasLink:C,hasNode:x,getLink:C}
-return r(g),e=g.on,g.on=function(){return g.beginUpdate=b=S,g.endUpdate=v=M,p=m,y=_,g.on=e,e.apply(g,arguments)},g
-function m(t,e){d.push({link:t,changeType:e})}function _(t,e){d.push({node:t,changeType:e})}function w(t,e){if(void 0===t)throw new Error("Invalid node identifier")
-b()
-var r=x(t)
-return r?(r.data=e,y(r,"update")):(r=new o(t,e),y(r,"add")),n.set(t,r),v(),r}function x(t){return n.get(t)}function A(t){var e=x(t)
-if(!e)return!1
-b()
-var r=e.links
-if(r){e.links=null
-for(var i=0;i<r.length;++i)D(r[i])}return n.delete(t),y(e,"remove"),v(),!0}function E(){return n.size}function k(){return s.length}function D(t){if(!t)return!1
-var e=i(t,s)
-if(e<0)return!1
-b(),s.splice(e,1)
-var n=x(t.fromId),r=x(t.toId)
-return n&&(e=i(t,n.links))>=0&&n.links.splice(e,1),r&&(e=i(t,r.links))>=0&&r.links.splice(e,1),p(t,"remove"),v(),!0}function C(t,e){var n,r=x(t)
-if(!r||!r.links)return null
-for(n=0;n<r.links.length;++n){var i=r.links[n]
-if(i.fromId===t&&i.toId===e)return i}return null}function O(){}function S(){l+=1}function M(){0==(l-=1)&&d.length>0&&(g.fire("changed",d),d.length=0)}function F(t){if("function"!=typeof t)throw new Error("Function is expected to iterate over graph nodes. You passed "+t)
-for(var e=n.values(),r=e.next();!r.done;){if(t(r.value))return!0
-r=e.next()}}}
-var r=n(4662)
-function i(t,e){if(!e)return-1
-if(e.indexOf)return e.indexOf(t)
-var n,r=e.length
-for(n=0;n<r;n+=1)if(e[n]===t)return n
-return-1}function o(t,e){this.id=t,this.links=null,this.data=e}function a(t,e){t.links?t.links.push(e):t.links=[e]}function u(t,e,n,r){this.fromId=t,this.toId=e,this.data=n,this.id=r}function c(t,e){return t.toString()+"👉 "+e.toString()}},2251:t=>{var e="undefined"!=typeof ArrayBuffer,n="undefined"!=typeof Symbol
-function r(t,r){var i,o,a,u,c
-if(!t)throw new Error("obliterator/forEach: invalid iterable.")
-if("function"!=typeof r)throw new Error("obliterator/forEach: expecting a callback.")
-if(Array.isArray(t)||e&&ArrayBuffer.isView(t)||"string"==typeof t||"[object Arguments]"===t.toString())for(a=0,u=t.length;a<u;a++)r(t[a],a)
-else if("function"!=typeof t.forEach)if(n&&Symbol.iterator in t&&"function"!=typeof t.next&&(t=t[Symbol.iterator]()),"function"!=typeof t.next)for(o in t)t.hasOwnProperty(o)&&r(t[o],o)
-else for(i=t,a=0;!0!==(c=i.next()).done;)r(c.value,a),a++
-else t.forEach(r)}r.forEachWithNullKeys=function(t,r){var i,o,a,u,c
-if(!t)throw new Error("obliterator/forEachWithNullKeys: invalid iterable.")
-if("function"!=typeof r)throw new Error("obliterator/forEachWithNullKeys: expecting a callback.")
-if(Array.isArray(t)||e&&ArrayBuffer.isView(t)||"string"==typeof t||"[object Arguments]"===t.toString())for(a=0,u=t.length;a<u;a++)r(t[a],null)
-else if(t instanceof Set)t.forEach((function(t){r(t,null)}))
-else if("function"!=typeof t.forEach)if(n&&Symbol.iterator in t&&"function"!=typeof t.next&&(t=t[Symbol.iterator]()),"function"!=typeof t.next)for(o in t)t.hasOwnProperty(o)&&r(t[o],o)
-else for(i=t,a=0;!0!==(c=i.next()).done;)r(c.value,null),a++
-else t.forEach(r)},t.exports=r},1219:t=>{function e(t){Object.defineProperty(this,"_next",{writable:!1,enumerable:!1,value:t}),this.done=!1}e.prototype.next=function(){if(this.done)return{done:!0}
-var t=this._next()
-return t.done&&(this.done=!0),t},"undefined"!=typeof Symbol&&(e.prototype[Symbol.iterator]=function(){return this}),e.of=function(){var t=arguments,n=t.length,r=0
-return new e((function(){return r>=n?{done:!0}:{done:!1,value:t[r++]}}))},e.empty=function(){var t=new e(null)
-return t.done=!0,t},e.is=function(t){return t instanceof e||"object"==typeof t&&null!==t&&"function"==typeof t.next},t.exports=e},1813:t=>{"use strict"
-var e=/(\x2D?(?:\d+\.?\d*|\d*\.?\d+)(?:e[-+]?\d+)?)\s*([A-Za-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u05D0-\u05EA\u05EF-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u0870-\u0887\u0889-\u088E\u08A0-\u08C9\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C5D\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D04-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E86-\u0E8A\u0E8C-\u0EA3\u0EA5\u0EA7-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16F1-\u16F8\u1700-\u1711\u171F-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1878\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4C\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CE9-\u1CEC\u1CEE-\u1CF3\u1CF5\u1CF6\u1CFA\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u31A0-\u31BF\u31F0-\u31FF\u3400-\u4DBF\u4E00-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA7CA\uA7D0\uA7D1\uA7D3\uA7D5-\uA7D9\uA7F2-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA8FE\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB69\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC\u{10000}-\u{1000B}\u{1000D}-\u{10026}\u{10028}-\u{1003A}\u{1003C}\u{1003D}\u{1003F}-\u{1004D}\u{10050}-\u{1005D}\u{10080}-\u{100FA}\u{10280}-\u{1029C}\u{102A0}-\u{102D0}\u{10300}-\u{1031F}\u{1032D}-\u{10340}\u{10342}-\u{10349}\u{10350}-\u{10375}\u{10380}-\u{1039D}\u{103A0}-\u{103C3}\u{103C8}-\u{103CF}\u{10400}-\u{1049D}\u{104B0}-\u{104D3}\u{104D8}-\u{104FB}\u{10500}-\u{10527}\u{10530}-\u{10563}\u{10570}-\u{1057A}\u{1057C}-\u{1058A}\u{1058C}-\u{10592}\u{10594}\u{10595}\u{10597}-\u{105A1}\u{105A3}-\u{105B1}\u{105B3}-\u{105B9}\u{105BB}\u{105BC}\u{10600}-\u{10736}\u{10740}-\u{10755}\u{10760}-\u{10767}\u{10780}-\u{10785}\u{10787}-\u{107B0}\u{107B2}-\u{107BA}\u{10800}-\u{10805}\u{10808}\u{1080A}-\u{10835}\u{10837}\u{10838}\u{1083C}\u{1083F}-\u{10855}\u{10860}-\u{10876}\u{10880}-\u{1089E}\u{108E0}-\u{108F2}\u{108F4}\u{108F5}\u{10900}-\u{10915}\u{10920}-\u{10939}\u{10980}-\u{109B7}\u{109BE}\u{109BF}\u{10A00}\u{10A10}-\u{10A13}\u{10A15}-\u{10A17}\u{10A19}-\u{10A35}\u{10A60}-\u{10A7C}\u{10A80}-\u{10A9C}\u{10AC0}-\u{10AC7}\u{10AC9}-\u{10AE4}\u{10B00}-\u{10B35}\u{10B40}-\u{10B55}\u{10B60}-\u{10B72}\u{10B80}-\u{10B91}\u{10C00}-\u{10C48}\u{10C80}-\u{10CB2}\u{10CC0}-\u{10CF2}\u{10D00}-\u{10D23}\u{10E80}-\u{10EA9}\u{10EB0}\u{10EB1}\u{10F00}-\u{10F1C}\u{10F27}\u{10F30}-\u{10F45}\u{10F70}-\u{10F81}\u{10FB0}-\u{10FC4}\u{10FE0}-\u{10FF6}\u{11003}-\u{11037}\u{11071}\u{11072}\u{11075}\u{11083}-\u{110AF}\u{110D0}-\u{110E8}\u{11103}-\u{11126}\u{11144}\u{11147}\u{11150}-\u{11172}\u{11176}\u{11183}-\u{111B2}\u{111C1}-\u{111C4}\u{111DA}\u{111DC}\u{11200}-\u{11211}\u{11213}-\u{1122B}\u{11280}-\u{11286}\u{11288}\u{1128A}-\u{1128D}\u{1128F}-\u{1129D}\u{1129F}-\u{112A8}\u{112B0}-\u{112DE}\u{11305}-\u{1130C}\u{1130F}\u{11310}\u{11313}-\u{11328}\u{1132A}-\u{11330}\u{11332}\u{11333}\u{11335}-\u{11339}\u{1133D}\u{11350}\u{1135D}-\u{11361}\u{11400}-\u{11434}\u{11447}-\u{1144A}\u{1145F}-\u{11461}\u{11480}-\u{114AF}\u{114C4}\u{114C5}\u{114C7}\u{11580}-\u{115AE}\u{115D8}-\u{115DB}\u{11600}-\u{1162F}\u{11644}\u{11680}-\u{116AA}\u{116B8}\u{11700}-\u{1171A}\u{11740}-\u{11746}\u{11800}-\u{1182B}\u{118A0}-\u{118DF}\u{118FF}-\u{11906}\u{11909}\u{1190C}-\u{11913}\u{11915}\u{11916}\u{11918}-\u{1192F}\u{1193F}\u{11941}\u{119A0}-\u{119A7}\u{119AA}-\u{119D0}\u{119E1}\u{119E3}\u{11A00}\u{11A0B}-\u{11A32}\u{11A3A}\u{11A50}\u{11A5C}-\u{11A89}\u{11A9D}\u{11AB0}-\u{11AF8}\u{11C00}-\u{11C08}\u{11C0A}-\u{11C2E}\u{11C40}\u{11C72}-\u{11C8F}\u{11D00}-\u{11D06}\u{11D08}\u{11D09}\u{11D0B}-\u{11D30}\u{11D46}\u{11D60}-\u{11D65}\u{11D67}\u{11D68}\u{11D6A}-\u{11D89}\u{11D98}\u{11EE0}-\u{11EF2}\u{11FB0}\u{12000}-\u{12399}\u{12480}-\u{12543}\u{12F90}-\u{12FF0}\u{13000}-\u{1342E}\u{14400}-\u{14646}\u{16800}-\u{16A38}\u{16A40}-\u{16A5E}\u{16A70}-\u{16ABE}\u{16AD0}-\u{16AED}\u{16B00}-\u{16B2F}\u{16B40}-\u{16B43}\u{16B63}-\u{16B77}\u{16B7D}-\u{16B8F}\u{16E40}-\u{16E7F}\u{16F00}-\u{16F4A}\u{16F50}\u{16F93}-\u{16F9F}\u{16FE0}\u{16FE1}\u{16FE3}\u{17000}-\u{187F7}\u{18800}-\u{18CD5}\u{18D00}-\u{18D08}\u{1AFF0}-\u{1AFF3}\u{1AFF5}-\u{1AFFB}\u{1AFFD}\u{1AFFE}\u{1B000}-\u{1B122}\u{1B150}-\u{1B152}\u{1B164}-\u{1B167}\u{1B170}-\u{1B2FB}\u{1BC00}-\u{1BC6A}\u{1BC70}-\u{1BC7C}\u{1BC80}-\u{1BC88}\u{1BC90}-\u{1BC99}\u{1D400}-\u{1D454}\u{1D456}-\u{1D49C}\u{1D49E}\u{1D49F}\u{1D4A2}\u{1D4A5}\u{1D4A6}\u{1D4A9}-\u{1D4AC}\u{1D4AE}-\u{1D4B9}\u{1D4BB}\u{1D4BD}-\u{1D4C3}\u{1D4C5}-\u{1D505}\u{1D507}-\u{1D50A}\u{1D50D}-\u{1D514}\u{1D516}-\u{1D51C}\u{1D51E}-\u{1D539}\u{1D53B}-\u{1D53E}\u{1D540}-\u{1D544}\u{1D546}\u{1D54A}-\u{1D550}\u{1D552}-\u{1D6A5}\u{1D6A8}-\u{1D6C0}\u{1D6C2}-\u{1D6DA}\u{1D6DC}-\u{1D6FA}\u{1D6FC}-\u{1D714}\u{1D716}-\u{1D734}\u{1D736}-\u{1D74E}\u{1D750}-\u{1D76E}\u{1D770}-\u{1D788}\u{1D78A}-\u{1D7A8}\u{1D7AA}-\u{1D7C2}\u{1D7C4}-\u{1D7CB}\u{1DF00}-\u{1DF1E}\u{1E100}-\u{1E12C}\u{1E137}-\u{1E13D}\u{1E14E}\u{1E290}-\u{1E2AD}\u{1E2C0}-\u{1E2EB}\u{1E7E0}-\u{1E7E6}\u{1E7E8}-\u{1E7EB}\u{1E7ED}\u{1E7EE}\u{1E7F0}-\u{1E7FE}\u{1E800}-\u{1E8C4}\u{1E900}-\u{1E943}\u{1E94B}\u{1EE00}-\u{1EE03}\u{1EE05}-\u{1EE1F}\u{1EE21}\u{1EE22}\u{1EE24}\u{1EE27}\u{1EE29}-\u{1EE32}\u{1EE34}-\u{1EE37}\u{1EE39}\u{1EE3B}\u{1EE42}\u{1EE47}\u{1EE49}\u{1EE4B}\u{1EE4D}-\u{1EE4F}\u{1EE51}\u{1EE52}\u{1EE54}\u{1EE57}\u{1EE59}\u{1EE5B}\u{1EE5D}\u{1EE5F}\u{1EE61}\u{1EE62}\u{1EE64}\u{1EE67}-\u{1EE6A}\u{1EE6C}-\u{1EE72}\u{1EE74}-\u{1EE77}\u{1EE79}-\u{1EE7C}\u{1EE7E}\u{1EE80}-\u{1EE89}\u{1EE8B}-\u{1EE9B}\u{1EEA1}-\u{1EEA3}\u{1EEA5}-\u{1EEA9}\u{1EEAB}-\u{1EEBB}\u{20000}-\u{2A6DF}\u{2A700}-\u{2B738}\u{2B740}-\u{2B81D}\u{2B820}-\u{2CEA1}\u{2CEB0}-\u{2EBE0}\u{2F800}-\u{2FA1D}\u{30000}-\u{3134A}]*)/giu
-function n(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"ms"
-var i=null
-return t=(t+"").replace(/(\d)[,_](\d)/g,"$1$2"),t.replace(e,(function(t,e,n){(n=r(n))&&(i=(i||0)+parseFloat(e,10)*n)})),i&&i/(r(n)||1)}function r(t){return n[t]||n[t.toLowerCase().replace(/s$/,"")]}t.exports=n,t.exports.default=n,n.nanosecond=n.ns=1e-6,n["µs"]=n["μs"]=n.us=n.microsecond=.001,n.millisecond=n.ms=n[""]=1,n.second=n.sec=n.s=1e3*n.ms,n.minute=n.min=n.m=60*n.s,n.hour=n.hr=n.h=60*n.m,n.day=n.d=24*n.h,n.week=n.wk=n.w=7*n.d,n.month=n.b=30.4375*n.d,n.year=n.yr=n.y=365.25*n.d},2610:t=>{"use strict"
-t.exports=t=>{if("number"!=typeof t)throw new TypeError("Expected a number")
-const e=t>0?Math.floor:Math.ceil
-return{days:e(t/864e5),hours:e(t/36e5)%24,minutes:e(t/6e4)%60,seconds:e(t/1e3)%60,milliseconds:e(t)%1e3,microseconds:e(1e3*t)%1e3,nanoseconds:e(1e6*t)%1e3}}},3385:(t,e,n)=>{"use strict"
-const r=n(2610),i=(t,e)=>1===e?t:`${t}s`
-t.exports=function(t){let e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-if(!Number.isFinite(t))throw new TypeError("Expected a finite number")
-e.colonNotation&&(e.compact=!1,e.formatSubMilliseconds=!1,e.separateMilliseconds=!1,e.verbose=!1),e.compact&&(e.secondsDecimalDigits=0,e.millisecondsDecimalDigits=0)
-const n=[],o=(t,e)=>{const n=Math.floor(t*10**e+1e-7)
-return(Math.round(n)/10**e).toFixed(e)},a=(t,r,o,a)=>{if(!(0!==n.length&&e.colonNotation||0!==t||e.colonNotation&&"m"===o))return
-let u,c
-if(a=(a||t||"0").toString(),e.colonNotation){u=n.length>0?":":"",c=""
-const t=a.includes(".")?a.split(".")[0].length:a.length,e=n.length>0?2:1
-a="0".repeat(Math.max(0,e-t))+a}else u="",c=e.verbose?" "+i(r,t):o
-n.push(u+a+c)},u=r(t)
-if(a(Math.trunc(u.days/365),"year","y"),a(u.days%365,"day","d"),a(u.hours,"hour","h"),a(u.minutes,"minute","m"),e.separateMilliseconds||e.formatSubMilliseconds||!e.colonNotation&&t<1e3)if(a(u.seconds,"second","s"),e.formatSubMilliseconds)a(u.milliseconds,"millisecond","ms"),a(u.microseconds,"microsecond","µs"),a(u.nanoseconds,"nanosecond","ns")
-else{const t=u.milliseconds+u.microseconds/1e3+u.nanoseconds/1e6,n="number"==typeof e.millisecondsDecimalDigits?e.millisecondsDecimalDigits:0,r=t>=1?Math.round(t):Math.ceil(t),i=n?t.toFixed(n):r
-a(Number.parseFloat(i,10),"millisecond","ms",i)}else{const n=o(t/1e3%60,"number"==typeof e.secondsDecimalDigits?e.secondsDecimalDigits:1),r=e.keepDecimalsOnWholeSeconds?n:n.replace(/\.0+$/,"")
-a(Number.parseFloat(r,10),"second","s",r)}if(0===n.length)return"0"+(e.verbose?" milliseconds":"ms")
-if(e.compact)return n[0]
-if("number"==typeof e.unitCount){const t=e.colonNotation?"":" "
-return n.slice(0,Math.max(e.unitCount,1)).join(t)}return e.colonNotation?n.join(""):n.join(" ")}},7114:(t,e,n)=>{"use strict"
-var r
-n.r(e),n.d(e,{default:()=>i})
-const i=function(){function t(){this.pool=[],this.flush()}return t.prototype.flush=function(){var t=this
-r=window.requestAnimationFrame((function(){var e=t.pool
-t.reset(),e.forEach((function(t){t[Object.keys(t)[0]]()})),t.flush()}))},t.prototype.add=function(t,e){var n
-return this.pool.push(((n={})[t]=e,n)),e},t.prototype.remove=function(t){this.pool=this.pool.filter((function(e){return!e[t]}))},t.prototype.reset=function(){this.pool=[]},t.prototype.stop=function(){window.cancelAnimationFrame(r)},t}()},1499:(t,e,n)=>{"use strict"
-function r(t){var e=t.getBoundingClientRect()
-return{width:e.width,height:e.height,top:e.top,right:e.right,bottom:e.bottom,left:e.left,x:e.left,y:e.top}}function i(t){if(null==t)return window
-if("[object Window]"!==t.toString()){var e=t.ownerDocument
-return e&&e.defaultView||window}return t}function o(t){var e=i(t)
-return{scrollLeft:e.pageXOffset,scrollTop:e.pageYOffset}}function a(t){return t instanceof i(t).Element||t instanceof Element}function u(t){return t instanceof i(t).HTMLElement||t instanceof HTMLElement}function c(t){return"undefined"!=typeof ShadowRoot&&(t instanceof i(t).ShadowRoot||t instanceof ShadowRoot)}function s(t){return t?(t.nodeName||"").toLowerCase():null}function f(t){return((a(t)?t.ownerDocument:t.document)||window.document).documentElement}function l(t){return r(f(t)).left+o(t).scrollLeft}function h(t){return i(t).getComputedStyle(t)}function d(t){var e=h(t),n=e.overflow,r=e.overflowX,i=e.overflowY
-return/auto|scroll|overlay|hidden/.test(n+i+r)}function p(t,e,n){void 0===n&&(n=!1)
-var a,c,h=f(e),p=r(t),y=u(e),b={scrollLeft:0,scrollTop:0},v={x:0,y:0}
-return(y||!y&&!n)&&(("body"!==s(e)||d(h))&&(b=(a=e)!==i(a)&&u(a)?{scrollLeft:(c=a).scrollLeft,scrollTop:c.scrollTop}:o(a)),u(e)?((v=r(e)).x+=e.clientLeft,v.y+=e.clientTop):h&&(v.x=l(h))),{x:p.left+b.scrollLeft-v.x,y:p.top+b.scrollTop-v.y,width:p.width,height:p.height}}function y(t){var e=r(t),n=t.offsetWidth,i=t.offsetHeight
-return Math.abs(e.width-n)<=1&&(n=e.width),Math.abs(e.height-i)<=1&&(i=e.height),{x:t.offsetLeft,y:t.offsetTop,width:n,height:i}}function b(t){return"html"===s(t)?t:t.assignedSlot||t.parentNode||(c(t)?t.host:null)||f(t)}function v(t){return["html","body","#document"].indexOf(s(t))>=0?t.ownerDocument.body:u(t)&&d(t)?t:v(b(t))}function g(t,e){var n
-void 0===e&&(e=[])
-var r=v(t),o=r===(null==(n=t.ownerDocument)?void 0:n.body),a=i(r),u=o?[a].concat(a.visualViewport||[],d(r)?r:[]):r,c=e.concat(u)
-return o?c:c.concat(g(b(u)))}function m(t){return["table","td","th"].indexOf(s(t))>=0}function _(t){return u(t)&&"fixed"!==h(t).position?t.offsetParent:null}function w(t){for(var e=i(t),n=_(t);n&&m(n)&&"static"===h(n).position;)n=_(n)
-return n&&("html"===s(n)||"body"===s(n)&&"static"===h(n).position)?e:n||function(t){for(var e=-1!==navigator.userAgent.toLowerCase().indexOf("firefox"),n=b(t);u(n)&&["html","body"].indexOf(s(n))<0;){var r=h(n)
-if("none"!==r.transform||"none"!==r.perspective||"paint"===r.contain||-1!==["transform","perspective"].indexOf(r.willChange)||e&&"filter"===r.willChange||e&&r.filter&&"none"!==r.filter)return n
-n=n.parentNode}return null}(t)||e}n.r(e),n.d(e,{animateFill:()=>oe,createSingleton:()=>ne,default:()=>de,delegate:()=>ie,followCursor:()=>se,hideAll:()=>te,inlinePositioning:()=>fe,roundArrow:()=>lt,sticky:()=>le})
-var x="top",A="bottom",E="right",k="left",D="auto",C=[x,A,E,k],O="start",S="end",M="viewport",F="popper",T=C.reduce((function(t,e){return t.concat([e+"-"+O,e+"-"+S])}),[]),B=[].concat(C,[D]).reduce((function(t,e){return t.concat([e,e+"-"+O,e+"-"+S])}),[]),P=["beforeRead","read","afterRead","beforeMain","main","afterMain","beforeWrite","write","afterWrite"]
-function j(t){var e=new Map,n=new Set,r=[]
-function i(t){n.add(t.name),[].concat(t.requires||[],t.requiresIfExists||[]).forEach((function(t){if(!n.has(t)){var r=e.get(t)
-r&&i(r)}})),r.push(t)}return t.forEach((function(t){e.set(t.name,t)})),t.forEach((function(t){n.has(t.name)||i(t)})),r}var N={placement:"bottom",modifiers:[],strategy:"absolute"}
-function R(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n]
-return!e.some((function(t){return!(t&&"function"==typeof t.getBoundingClientRect)}))}var L={passive:!0}
-const I={name:"eventListeners",enabled:!0,phase:"write",fn:function(){},effect:function(t){var e=t.state,n=t.instance,r=t.options,o=r.scroll,a=void 0===o||o,u=r.resize,c=void 0===u||u,s=i(e.elements.popper),f=[].concat(e.scrollParents.reference,e.scrollParents.popper)
-return a&&f.forEach((function(t){t.addEventListener("scroll",n.update,L)})),c&&s.addEventListener("resize",n.update,L),function(){a&&f.forEach((function(t){t.removeEventListener("scroll",n.update,L)})),c&&s.removeEventListener("resize",n.update,L)}},data:{}}
-function $(t){return t.split("-")[0]}function U(t){return t.split("-")[1]}function z(t){return["top","bottom"].indexOf(t)>=0?"x":"y"}function Z(t){var e,n=t.reference,r=t.element,i=t.placement,o=i?$(i):null,a=i?U(i):null,u=n.x+n.width/2-r.width/2,c=n.y+n.height/2-r.height/2
-switch(o){case x:e={x:u,y:n.y-r.height}
-break
-case A:e={x:u,y:n.y+n.height}
-break
-case E:e={x:n.x+n.width,y:c}
-break
-case k:e={x:n.x-r.width,y:c}
-break
-default:e={x:n.x,y:n.y}}var s=o?z(o):null
-if(null!=s){var f="y"===s?"height":"width"
-switch(a){case O:e[s]=e[s]-(n[f]/2-r[f]/2)
-break
-case S:e[s]=e[s]+(n[f]/2-r[f]/2)}}return e}const q={name:"popperOffsets",enabled:!0,phase:"read",fn:function(t){var e=t.state,n=t.name
-e.modifiersData[n]=Z({reference:e.rects.reference,element:e.rects.popper,strategy:"absolute",placement:e.placement})},data:{}}
-var V=Math.max,H=Math.min,Y=Math.round,G={top:"auto",right:"auto",bottom:"auto",left:"auto"}
-function K(t){var e,n=t.popper,r=t.popperRect,o=t.placement,a=t.offsets,u=t.position,c=t.gpuAcceleration,s=t.adaptive,l=t.roundOffsets,d=!0===l?function(t){var e=t.x,n=t.y,r=window.devicePixelRatio||1
-return{x:Y(Y(e*r)/r)||0,y:Y(Y(n*r)/r)||0}}(a):"function"==typeof l?l(a):a,p=d.x,y=void 0===p?0:p,b=d.y,v=void 0===b?0:b,g=a.hasOwnProperty("x"),m=a.hasOwnProperty("y"),_=k,D=x,C=window
-if(s){var O=w(n),S="clientHeight",M="clientWidth"
-O===i(n)&&"static"!==h(O=f(n)).position&&(S="scrollHeight",M="scrollWidth"),o===x&&(D=A,v-=O[S]-r.height,v*=c?1:-1),o===k&&(_=E,y-=O[M]-r.width,y*=c?1:-1)}var F,T=Object.assign({position:u},s&&G)
-return c?Object.assign({},T,((F={})[D]=m?"0":"",F[_]=g?"0":"",F.transform=(C.devicePixelRatio||1)<2?"translate("+y+"px, "+v+"px)":"translate3d("+y+"px, "+v+"px, 0)",F)):Object.assign({},T,((e={})[D]=m?v+"px":"",e[_]=g?y+"px":"",e.transform="",e))}const W={name:"applyStyles",enabled:!0,phase:"write",fn:function(t){var e=t.state
-Object.keys(e.elements).forEach((function(t){var n=e.styles[t]||{},r=e.attributes[t]||{},i=e.elements[t]
-u(i)&&s(i)&&(Object.assign(i.style,n),Object.keys(r).forEach((function(t){var e=r[t]
-!1===e?i.removeAttribute(t):i.setAttribute(t,!0===e?"":e)})))}))},effect:function(t){var e=t.state,n={popper:{position:e.options.strategy,left:"0",top:"0",margin:"0"},arrow:{position:"absolute"},reference:{}}
-return Object.assign(e.elements.popper.style,n.popper),e.styles=n,e.elements.arrow&&Object.assign(e.elements.arrow.style,n.arrow),function(){Object.keys(e.elements).forEach((function(t){var r=e.elements[t],i=e.attributes[t]||{},o=Object.keys(e.styles.hasOwnProperty(t)?e.styles[t]:n[t]).reduce((function(t,e){return t[e]="",t}),{})
-u(r)&&s(r)&&(Object.assign(r.style,o),Object.keys(i).forEach((function(t){r.removeAttribute(t)})))}))}},requires:["computeStyles"]}
-var X={left:"right",right:"left",bottom:"top",top:"bottom"}
-function J(t){return t.replace(/left|right|bottom|top/g,(function(t){return X[t]}))}var Q={start:"end",end:"start"}
-function tt(t){return t.replace(/start|end/g,(function(t){return Q[t]}))}function et(t,e){var n=e.getRootNode&&e.getRootNode()
-if(t.contains(e))return!0
-if(n&&c(n)){var r=e
-do{if(r&&t.isSameNode(r))return!0
-r=r.parentNode||r.host}while(r)}return!1}function nt(t){return Object.assign({},t,{left:t.x,top:t.y,right:t.x+t.width,bottom:t.y+t.height})}function rt(t,e){return e===M?nt(function(t){var e=i(t),n=f(t),r=e.visualViewport,o=n.clientWidth,a=n.clientHeight,u=0,c=0
-return r&&(o=r.width,a=r.height,/^((?!chrome|android).)*safari/i.test(navigator.userAgent)||(u=r.offsetLeft,c=r.offsetTop)),{width:o,height:a,x:u+l(t),y:c}}(t)):u(e)?function(t){var e=r(t)
-return e.top=e.top+t.clientTop,e.left=e.left+t.clientLeft,e.bottom=e.top+t.clientHeight,e.right=e.left+t.clientWidth,e.width=t.clientWidth,e.height=t.clientHeight,e.x=e.left,e.y=e.top,e}(e):nt(function(t){var e,n=f(t),r=o(t),i=null==(e=t.ownerDocument)?void 0:e.body,a=V(n.scrollWidth,n.clientWidth,i?i.scrollWidth:0,i?i.clientWidth:0),u=V(n.scrollHeight,n.clientHeight,i?i.scrollHeight:0,i?i.clientHeight:0),c=-r.scrollLeft+l(t),s=-r.scrollTop
-return"rtl"===h(i||n).direction&&(c+=V(n.clientWidth,i?i.clientWidth:0)-a),{width:a,height:u,x:c,y:s}}(f(t)))}function it(t){return Object.assign({},{top:0,right:0,bottom:0,left:0},t)}function ot(t,e){return e.reduce((function(e,n){return e[n]=t,e}),{})}function at(t,e){void 0===e&&(e={})
-var n=e,i=n.placement,o=void 0===i?t.placement:i,c=n.boundary,l=void 0===c?"clippingParents":c,d=n.rootBoundary,p=void 0===d?M:d,y=n.elementContext,v=void 0===y?F:y,m=n.altBoundary,_=void 0!==m&&m,k=n.padding,D=void 0===k?0:k,O=it("number"!=typeof D?D:ot(D,C)),S=v===F?"reference":F,T=t.elements.reference,B=t.rects.popper,P=t.elements[_?S:v],j=function(t,e,n){var r="clippingParents"===e?function(t){var e=g(b(t)),n=["absolute","fixed"].indexOf(h(t).position)>=0&&u(t)?w(t):t
-return a(n)?e.filter((function(t){return a(t)&&et(t,n)&&"body"!==s(t)})):[]}(t):[].concat(e),i=[].concat(r,[n]),o=i[0],c=i.reduce((function(e,n){var r=rt(t,n)
-return e.top=V(r.top,e.top),e.right=H(r.right,e.right),e.bottom=H(r.bottom,e.bottom),e.left=V(r.left,e.left),e}),rt(t,o))
-return c.width=c.right-c.left,c.height=c.bottom-c.top,c.x=c.left,c.y=c.top,c}(a(P)?P:P.contextElement||f(t.elements.popper),l,p),N=r(T),R=Z({reference:N,element:B,strategy:"absolute",placement:o}),L=nt(Object.assign({},B,R)),I=v===F?L:N,$={top:j.top-I.top+O.top,bottom:I.bottom-j.bottom+O.bottom,left:j.left-I.left+O.left,right:I.right-j.right+O.right},U=t.modifiersData.offset
-if(v===F&&U){var z=U[o]
-Object.keys($).forEach((function(t){var e=[E,A].indexOf(t)>=0?1:-1,n=[x,A].indexOf(t)>=0?"y":"x"
-$[t]+=z[n]*e}))}return $}function ut(t,e,n){return V(t,H(e,n))}function ct(t,e,n){return void 0===n&&(n={x:0,y:0}),{top:t.top-e.height-n.y,right:t.right-e.width+n.x,bottom:t.bottom-e.height+n.y,left:t.left-e.width-n.x}}function st(t){return[x,E,A,k].some((function(e){return t[e]>=0}))}var ft=function(t){void 0===t&&(t={})
-var e=t,n=e.defaultModifiers,r=void 0===n?[]:n,i=e.defaultOptions,o=void 0===i?N:i
-return function(t,e,n){void 0===n&&(n=o)
-var i,u,c={placement:"bottom",orderedModifiers:[],options:Object.assign({},N,o),modifiersData:{},elements:{reference:t,popper:e},attributes:{},styles:{}},s=[],f=!1,l={state:c,setOptions:function(n){h(),c.options=Object.assign({},o,c.options,n),c.scrollParents={reference:a(t)?g(t):t.contextElement?g(t.contextElement):[],popper:g(e)}
-var i,u,f=function(t){var e=j(t)
-return P.reduce((function(t,n){return t.concat(e.filter((function(t){return t.phase===n})))}),[])}((i=[].concat(r,c.options.modifiers),u=i.reduce((function(t,e){var n=t[e.name]
-return t[e.name]=n?Object.assign({},n,e,{options:Object.assign({},n.options,e.options),data:Object.assign({},n.data,e.data)}):e,t}),{}),Object.keys(u).map((function(t){return u[t]}))))
-return c.orderedModifiers=f.filter((function(t){return t.enabled})),c.orderedModifiers.forEach((function(t){var e=t.name,n=t.options,r=void 0===n?{}:n,i=t.effect
-if("function"==typeof i){var o=i({state:c,name:e,instance:l,options:r})
-s.push(o||function(){})}})),l.update()},forceUpdate:function(){if(!f){var t=c.elements,e=t.reference,n=t.popper
-if(R(e,n)){c.rects={reference:p(e,w(n),"fixed"===c.options.strategy),popper:y(n)},c.reset=!1,c.placement=c.options.placement,c.orderedModifiers.forEach((function(t){return c.modifiersData[t.name]=Object.assign({},t.data)}))
-for(var r=0;r<c.orderedModifiers.length;r++)if(!0!==c.reset){var i=c.orderedModifiers[r],o=i.fn,a=i.options,u=void 0===a?{}:a,s=i.name
-"function"==typeof o&&(c=o({state:c,options:u,name:s,instance:l})||c)}else c.reset=!1,r=-1}}},update:(i=function(){return new Promise((function(t){l.forceUpdate(),t(c)}))},function(){return u||(u=new Promise((function(t){Promise.resolve().then((function(){u=void 0,t(i())}))}))),u}),destroy:function(){h(),f=!0}}
-if(!R(t,e))return l
-function h(){s.forEach((function(t){return t()})),s=[]}return l.setOptions(n).then((function(t){!f&&n.onFirstUpdate&&n.onFirstUpdate(t)})),l}}({defaultModifiers:[I,q,{name:"computeStyles",enabled:!0,phase:"beforeWrite",fn:function(t){var e=t.state,n=t.options,r=n.gpuAcceleration,i=void 0===r||r,o=n.adaptive,a=void 0===o||o,u=n.roundOffsets,c=void 0===u||u,s={placement:$(e.placement),popper:e.elements.popper,popperRect:e.rects.popper,gpuAcceleration:i}
-null!=e.modifiersData.popperOffsets&&(e.styles.popper=Object.assign({},e.styles.popper,K(Object.assign({},s,{offsets:e.modifiersData.popperOffsets,position:e.options.strategy,adaptive:a,roundOffsets:c})))),null!=e.modifiersData.arrow&&(e.styles.arrow=Object.assign({},e.styles.arrow,K(Object.assign({},s,{offsets:e.modifiersData.arrow,position:"absolute",adaptive:!1,roundOffsets:c})))),e.attributes.popper=Object.assign({},e.attributes.popper,{"data-popper-placement":e.placement})},data:{}},W,{name:"offset",enabled:!0,phase:"main",requires:["popperOffsets"],fn:function(t){var e=t.state,n=t.options,r=t.name,i=n.offset,o=void 0===i?[0,0]:i,a=B.reduce((function(t,n){return t[n]=function(t,e,n){var r=$(t),i=[k,x].indexOf(r)>=0?-1:1,o="function"==typeof n?n(Object.assign({},e,{placement:t})):n,a=o[0],u=o[1]
-return a=a||0,u=(u||0)*i,[k,E].indexOf(r)>=0?{x:u,y:a}:{x:a,y:u}}(n,e.rects,o),t}),{}),u=a[e.placement],c=u.x,s=u.y
-null!=e.modifiersData.popperOffsets&&(e.modifiersData.popperOffsets.x+=c,e.modifiersData.popperOffsets.y+=s),e.modifiersData[r]=a}},{name:"flip",enabled:!0,phase:"main",fn:function(t){var e=t.state,n=t.options,r=t.name
-if(!e.modifiersData[r]._skip){for(var i=n.mainAxis,o=void 0===i||i,a=n.altAxis,u=void 0===a||a,c=n.fallbackPlacements,s=n.padding,f=n.boundary,l=n.rootBoundary,h=n.altBoundary,d=n.flipVariations,p=void 0===d||d,y=n.allowedAutoPlacements,b=e.options.placement,v=$(b),g=c||(v!==b&&p?function(t){if($(t)===D)return[]
-var e=J(t)
-return[tt(t),e,tt(e)]}(b):[J(b)]),m=[b].concat(g).reduce((function(t,n){return t.concat($(n)===D?function(t,e){void 0===e&&(e={})
-var n=e,r=n.placement,i=n.boundary,o=n.rootBoundary,a=n.padding,u=n.flipVariations,c=n.allowedAutoPlacements,s=void 0===c?B:c,f=U(r),l=f?u?T:T.filter((function(t){return U(t)===f})):C,h=l.filter((function(t){return s.indexOf(t)>=0}))
-0===h.length&&(h=l)
-var d=h.reduce((function(e,n){return e[n]=at(t,{placement:n,boundary:i,rootBoundary:o,padding:a})[$(n)],e}),{})
-return Object.keys(d).sort((function(t,e){return d[t]-d[e]}))}(e,{placement:n,boundary:f,rootBoundary:l,padding:s,flipVariations:p,allowedAutoPlacements:y}):n)}),[]),_=e.rects.reference,w=e.rects.popper,S=new Map,M=!0,F=m[0],P=0;P<m.length;P++){var j=m[P],N=$(j),R=U(j)===O,L=[x,A].indexOf(N)>=0,I=L?"width":"height",z=at(e,{placement:j,boundary:f,rootBoundary:l,altBoundary:h,padding:s}),Z=L?R?E:k:R?A:x
-_[I]>w[I]&&(Z=J(Z))
-var q=J(Z),V=[]
-if(o&&V.push(z[N]<=0),u&&V.push(z[Z]<=0,z[q]<=0),V.every((function(t){return t}))){F=j,M=!1
-break}S.set(j,V)}if(M)for(var H=function(t){var e=m.find((function(e){var n=S.get(e)
-if(n)return n.slice(0,t).every((function(t){return t}))}))
-if(e)return F=e,"break"},Y=p?3:1;Y>0&&"break"!==H(Y);Y--);e.placement!==F&&(e.modifiersData[r]._skip=!0,e.placement=F,e.reset=!0)}},requiresIfExists:["offset"],data:{_skip:!1}},{name:"preventOverflow",enabled:!0,phase:"main",fn:function(t){var e=t.state,n=t.options,r=t.name,i=n.mainAxis,o=void 0===i||i,a=n.altAxis,u=void 0!==a&&a,c=n.boundary,s=n.rootBoundary,f=n.altBoundary,l=n.padding,h=n.tether,d=void 0===h||h,p=n.tetherOffset,b=void 0===p?0:p,v=at(e,{boundary:c,rootBoundary:s,padding:l,altBoundary:f}),g=$(e.placement),m=U(e.placement),_=!m,D=z(g),C="x"===D?"y":"x",S=e.modifiersData.popperOffsets,M=e.rects.reference,F=e.rects.popper,T="function"==typeof b?b(Object.assign({},e.rects,{placement:e.placement})):b,B={x:0,y:0}
-if(S){if(o||u){var P="y"===D?x:k,j="y"===D?A:E,N="y"===D?"height":"width",R=S[D],L=S[D]+v[P],I=S[D]-v[j],Z=d?-F[N]/2:0,q=m===O?M[N]:F[N],Y=m===O?-F[N]:-M[N],G=e.elements.arrow,K=d&&G?y(G):{width:0,height:0},W=e.modifiersData["arrow#persistent"]?e.modifiersData["arrow#persistent"].padding:{top:0,right:0,bottom:0,left:0},X=W[P],J=W[j],Q=ut(0,M[N],K[N]),tt=_?M[N]/2-Z-Q-X-T:q-Q-X-T,et=_?-M[N]/2+Z+Q+J+T:Y+Q+J+T,nt=e.elements.arrow&&w(e.elements.arrow),rt=nt?"y"===D?nt.clientTop||0:nt.clientLeft||0:0,it=e.modifiersData.offset?e.modifiersData.offset[e.placement][D]:0,ot=S[D]+tt-it-rt,ct=S[D]+et-it
-if(o){var st=ut(d?H(L,ot):L,R,d?V(I,ct):I)
-S[D]=st,B[D]=st-R}if(u){var ft="x"===D?x:k,lt="x"===D?A:E,ht=S[C],dt=ht+v[ft],pt=ht-v[lt],yt=ut(d?H(dt,ot):dt,ht,d?V(pt,ct):pt)
-S[C]=yt,B[C]=yt-ht}}e.modifiersData[r]=B}},requiresIfExists:["offset"]},{name:"arrow",enabled:!0,phase:"main",fn:function(t){var e,n=t.state,r=t.name,i=t.options,o=n.elements.arrow,a=n.modifiersData.popperOffsets,u=$(n.placement),c=z(u),s=[k,E].indexOf(u)>=0?"height":"width"
-if(o&&a){var f=function(t,e){return it("number"!=typeof(t="function"==typeof t?t(Object.assign({},e.rects,{placement:e.placement})):t)?t:ot(t,C))}(i.padding,n),l=y(o),h="y"===c?x:k,d="y"===c?A:E,p=n.rects.reference[s]+n.rects.reference[c]-a[c]-n.rects.popper[s],b=a[c]-n.rects.reference[c],v=w(o),g=v?"y"===c?v.clientHeight||0:v.clientWidth||0:0,m=p/2-b/2,_=f[h],D=g-l[s]-f[d],O=g/2-l[s]/2+m,S=ut(_,O,D),M=c
-n.modifiersData[r]=((e={})[M]=S,e.centerOffset=S-O,e)}},effect:function(t){var e=t.state,n=t.options.element,r=void 0===n?"[data-popper-arrow]":n
-null!=r&&("string"!=typeof r||(r=e.elements.popper.querySelector(r)))&&et(e.elements.popper,r)&&(e.elements.arrow=r)},requires:["popperOffsets"],requiresIfExists:["preventOverflow"]},{name:"hide",enabled:!0,phase:"main",requiresIfExists:["preventOverflow"],fn:function(t){var e=t.state,n=t.name,r=e.rects.reference,i=e.rects.popper,o=e.modifiersData.preventOverflow,a=at(e,{elementContext:"reference"}),u=at(e,{altBoundary:!0}),c=ct(a,r),s=ct(u,i,o),f=st(c),l=st(s)
-e.modifiersData[n]={referenceClippingOffsets:c,popperEscapeOffsets:s,isReferenceHidden:f,hasPopperEscaped:l},e.attributes.popper=Object.assign({},e.attributes.popper,{"data-popper-reference-hidden":f,"data-popper-escaped":l})}}]}),lt='<svg width="16" height="6" xmlns="http://www.w3.org/2000/svg"><path d="M0 6s1.796-.013 4.67-3.615C5.851.9 6.93.006 8 0c1.07-.006 2.148.887 3.343 2.385C14.233 6.005 16 6 16 6H0z"></svg>',ht="tippy-content",dt="tippy-backdrop",pt="tippy-arrow",yt="tippy-svg-arrow",bt={passive:!0,capture:!0}
-function vt(t,e,n){if(Array.isArray(t)){var r=t[e]
-return null==r?Array.isArray(n)?n[e]:n:r}return t}function gt(t,e){var n={}.toString.call(t)
-return 0===n.indexOf("[object")&&n.indexOf(e+"]")>-1}function mt(t,e){return"function"==typeof t?t.apply(void 0,e):t}function _t(t,e){return 0===e?t:function(r){clearTimeout(n),n=setTimeout((function(){t(r)}),e)}
-var n}function wt(t,e){var n=Object.assign({},t)
-return e.forEach((function(t){delete n[t]})),n}function xt(t){return[].concat(t)}function At(t,e){-1===t.indexOf(e)&&t.push(e)}function Et(t){return t.split("-")[0]}function kt(t){return[].slice.call(t)}function Dt(){return document.createElement("div")}function Ct(t){return["Element","Fragment"].some((function(e){return gt(t,e)}))}function Ot(t){return gt(t,"MouseEvent")}function St(t){return!(!t||!t._tippy||t._tippy.reference!==t)}function Mt(t,e){t.forEach((function(t){t&&(t.style.transitionDuration=e+"ms")}))}function Ft(t,e){t.forEach((function(t){t&&t.setAttribute("data-state",e)}))}function Tt(t){var e,n=xt(t)[0]
-return(null==n||null==(e=n.ownerDocument)?void 0:e.body)?n.ownerDocument:document}function Bt(t,e,n){var r=e+"EventListener";["transitionend","webkitTransitionEnd"].forEach((function(e){t[r](e,n)}))}var Pt={isTouch:!1},jt=0
-function Nt(){Pt.isTouch||(Pt.isTouch=!0,window.performance&&document.addEventListener("mousemove",Rt))}function Rt(){var t=performance.now()
-t-jt<20&&(Pt.isTouch=!1,document.removeEventListener("mousemove",Rt)),jt=t}function Lt(){var t=document.activeElement
-if(St(t)){var e=t._tippy
-t.blur&&!e.state.isVisible&&t.blur()}}var It="undefined"!=typeof window&&"undefined"!=typeof document?navigator.userAgent:"",$t=/MSIE |Trident\//.test(It),Ut=Object.assign({appendTo:function(){return document.body},aria:{content:"auto",expanded:"auto"},delay:0,duration:[300,250],getReferenceClientRect:null,hideOnClick:!0,ignoreAttributes:!1,interactive:!1,interactiveBorder:2,interactiveDebounce:0,moveTransition:"",offset:[0,10],onAfterUpdate:function(){},onBeforeUpdate:function(){},onCreate:function(){},onDestroy:function(){},onHidden:function(){},onHide:function(){},onMount:function(){},onShow:function(){},onShown:function(){},onTrigger:function(){},onUntrigger:function(){},onClickOutside:function(){},placement:"top",plugins:[],popperOptions:{},render:null,showOnCreate:!1,touch:!0,trigger:"mouseenter focus",triggerTarget:null},{animateFill:!1,followCursor:!1,inlinePositioning:!1,sticky:!1},{},{allowHTML:!1,animation:"fade",arrow:!0,content:"",inertia:!1,maxWidth:350,role:"tooltip",theme:"",zIndex:9999}),zt=Object.keys(Ut)
-function Zt(t){var e=(t.plugins||[]).reduce((function(e,n){var r=n.name,i=n.defaultValue
-return r&&(e[r]=void 0!==t[r]?t[r]:i),e}),{})
-return Object.assign({},t,{},e)}function qt(t,e){var n=Object.assign({},e,{content:mt(e.content,[t])},e.ignoreAttributes?{}:function(t,e){return(e?Object.keys(Zt(Object.assign({},Ut,{plugins:e}))):zt).reduce((function(e,n){var r=(t.getAttribute("data-tippy-"+n)||"").trim()
-if(!r)return e
-if("content"===n)e[n]=r
-else try{e[n]=JSON.parse(r)}catch(t){e[n]=r}return e}),{})}(t,e.plugins))
-return n.aria=Object.assign({},Ut.aria,{},n.aria),n.aria={expanded:"auto"===n.aria.expanded?e.interactive:n.aria.expanded,content:"auto"===n.aria.content?e.interactive?null:"describedby":n.aria.content},n}function Vt(t,e){t.innerHTML=e}function Ht(t){var e=Dt()
-return!0===t?e.className=pt:(e.className=yt,Ct(t)?e.appendChild(t):Vt(e,t)),e}function Yt(t,e){Ct(e.content)?(Vt(t,""),t.appendChild(e.content)):"function"!=typeof e.content&&(e.allowHTML?Vt(t,e.content):t.textContent=e.content)}function Gt(t){var e=t.firstElementChild,n=kt(e.children)
-return{box:e,content:n.find((function(t){return t.classList.contains(ht)})),arrow:n.find((function(t){return t.classList.contains(pt)||t.classList.contains(yt)})),backdrop:n.find((function(t){return t.classList.contains(dt)}))}}function Kt(t){var e=Dt(),n=Dt()
-n.className="tippy-box",n.setAttribute("data-state","hidden"),n.setAttribute("tabindex","-1")
-var r=Dt()
-function i(n,r){var i=Gt(e),o=i.box,a=i.content,u=i.arrow
-r.theme?o.setAttribute("data-theme",r.theme):o.removeAttribute("data-theme"),"string"==typeof r.animation?o.setAttribute("data-animation",r.animation):o.removeAttribute("data-animation"),r.inertia?o.setAttribute("data-inertia",""):o.removeAttribute("data-inertia"),o.style.maxWidth="number"==typeof r.maxWidth?r.maxWidth+"px":r.maxWidth,r.role?o.setAttribute("role",r.role):o.removeAttribute("role"),n.content===r.content&&n.allowHTML===r.allowHTML||Yt(a,t.props),r.arrow?u?n.arrow!==r.arrow&&(o.removeChild(u),o.appendChild(Ht(r.arrow))):o.appendChild(Ht(r.arrow)):u&&o.removeChild(u)}return r.className=ht,r.setAttribute("data-state","hidden"),Yt(r,t.props),e.appendChild(n),n.appendChild(r),i(t.props,t.props),{popper:e,onUpdate:i}}Kt.$$tippy=!0
-var Wt=1,Xt=[],Jt=[]
-function Qt(t,e){void 0===e&&(e={})
-var n=Ut.plugins.concat(e.plugins||[])
-document.addEventListener("touchstart",Nt,bt),window.addEventListener("blur",Lt)
-var r,i=Object.assign({},e,{plugins:n}),o=(r=t,Ct(r)?[r]:function(t){return gt(t,"NodeList")}(r)?kt(r):Array.isArray(r)?r:kt(document.querySelectorAll(r))).reduce((function(t,e){var n=e&&function(t,e){var n,r,i,o,a,u,c,s,f,l=qt(t,Object.assign({},Ut,{},Zt((n=e,Object.keys(n).reduce((function(t,e){return void 0!==n[e]&&(t[e]=n[e]),t}),{}))))),h=!1,d=!1,p=!1,y=!1,b=[],v=_t(G,l.interactiveDebounce),g=Wt++,m=(f=l.plugins).filter((function(t,e){return f.indexOf(t)===e})),_={id:g,reference:t,popper:Dt(),popperInstance:null,props:l,state:{isEnabled:!0,isVisible:!1,isDestroyed:!1,isMounted:!1,isShown:!1},plugins:m,clearDelayTimeouts:function(){clearTimeout(r),clearTimeout(i),cancelAnimationFrame(o)},setProps:function(e){if(!_.state.isDestroyed){P("onBeforeUpdate",[_,e]),H()
-var n=_.props,r=qt(t,Object.assign({},_.props,{},e,{ignoreAttributes:!0}))
-_.props=r,V(),n.interactiveDebounce!==r.interactiveDebounce&&(R(),v=_t(G,r.interactiveDebounce)),n.triggerTarget&&!r.triggerTarget?xt(n.triggerTarget).forEach((function(t){t.removeAttribute("aria-expanded")})):r.triggerTarget&&t.removeAttribute("aria-expanded"),N(),B(),A&&A(n,r),_.popperInstance&&(J(),tt().forEach((function(t){requestAnimationFrame(t._tippy.popperInstance.forceUpdate)}))),P("onAfterUpdate",[_,e])}},setContent:function(t){_.setProps({content:t})},show:function(){var t=_.state.isVisible,e=_.state.isDestroyed,n=!_.state.isEnabled,r=Pt.isTouch&&!_.props.touch,i=vt(_.props.duration,0,Ut.duration)
-if(!(t||e||n||r||S().hasAttribute("disabled")||(P("onShow",[_],!1),!1===_.props.onShow(_)))){if(_.state.isVisible=!0,O()&&(x.style.visibility="visible"),B(),U(),_.state.isMounted||(x.style.transition="none"),O()){var o=F()
-Mt([o.box,o.content],0)}var a,u,s
-c=function(){var t
-if(_.state.isVisible&&!y){if(y=!0,x.offsetHeight,x.style.transition=_.props.moveTransition,O()&&_.props.animation){var e=F(),n=e.box,r=e.content
-Mt([n,r],i),Ft([n,r],"visible")}j(),N(),At(Jt,_),null==(t=_.popperInstance)||t.forceUpdate(),_.state.isMounted=!0,P("onMount",[_]),_.props.animation&&O()&&function(t,e){Z(t,(function(){_.state.isShown=!0,P("onShown",[_])}))}(i)}},u=_.props.appendTo,s=S(),(a=_.props.interactive&&u===Ut.appendTo||"parent"===u?s.parentNode:mt(u,[s])).contains(x)||a.appendChild(x),J()}},hide:function(){var t=!_.state.isVisible,e=_.state.isDestroyed,n=!_.state.isEnabled,r=vt(_.props.duration,1,Ut.duration)
-if(!(t||e||n)&&(P("onHide",[_],!1),!1!==_.props.onHide(_))){if(_.state.isVisible=!1,_.state.isShown=!1,y=!1,h=!1,O()&&(x.style.visibility="hidden"),R(),z(),B(),O()){var i=F(),o=i.box,a=i.content
-_.props.animation&&(Mt([o,a],r),Ft([o,a],"hidden"))}j(),N(),_.props.animation?O()&&function(t,e){Z(t,(function(){!_.state.isVisible&&x.parentNode&&x.parentNode.contains(x)&&e()}))}(r,_.unmount):_.unmount()}},hideWithInteractivity:function(t){M().addEventListener("mousemove",v),At(Xt,v),v(t)},enable:function(){_.state.isEnabled=!0},disable:function(){_.hide(),_.state.isEnabled=!1},unmount:function(){_.state.isVisible&&_.hide(),_.state.isMounted&&(Q(),tt().forEach((function(t){t._tippy.unmount()})),x.parentNode&&x.parentNode.removeChild(x),Jt=Jt.filter((function(t){return t!==_})),_.state.isMounted=!1,P("onHidden",[_]))},destroy:function(){_.state.isDestroyed||(_.clearDelayTimeouts(),_.unmount(),H(),delete t._tippy,_.state.isDestroyed=!0,P("onDestroy",[_]))}}
-if(!l.render)return _
-var w=l.render(_),x=w.popper,A=w.onUpdate
-x.setAttribute("data-tippy-root",""),x.id="tippy-"+_.id,_.popper=x,t._tippy=_,x._tippy=_
-var E=m.map((function(t){return t.fn(_)})),k=t.hasAttribute("aria-expanded")
-return V(),N(),B(),P("onCreate",[_]),l.showOnCreate&&et(),x.addEventListener("mouseenter",(function(){_.props.interactive&&_.state.isVisible&&_.clearDelayTimeouts()})),x.addEventListener("mouseleave",(function(t){_.props.interactive&&_.props.trigger.indexOf("mouseenter")>=0&&(M().addEventListener("mousemove",v),v(t))})),_
-function D(){var t=_.props.touch
-return Array.isArray(t)?t:[t,0]}function C(){return"hold"===D()[0]}function O(){var t
-return!!(null==(t=_.props.render)?void 0:t.$$tippy)}function S(){return s||t}function M(){var t=S().parentNode
-return t?Tt(t):document}function F(){return Gt(x)}function T(t){return _.state.isMounted&&!_.state.isVisible||Pt.isTouch||a&&"focus"===a.type?0:vt(_.props.delay,t?0:1,Ut.delay)}function B(){x.style.pointerEvents=_.props.interactive&&_.state.isVisible?"":"none",x.style.zIndex=""+_.props.zIndex}function P(t,e,n){var r
-void 0===n&&(n=!0),E.forEach((function(n){n[t]&&n[t].apply(void 0,e)})),n&&(r=_.props)[t].apply(r,e)}function j(){var e=_.props.aria
-if(e.content){var n="aria-"+e.content,r=x.id
-xt(_.props.triggerTarget||t).forEach((function(t){var e=t.getAttribute(n)
-if(_.state.isVisible)t.setAttribute(n,e?e+" "+r:r)
-else{var i=e&&e.replace(r,"").trim()
-i?t.setAttribute(n,i):t.removeAttribute(n)}}))}}function N(){!k&&_.props.aria.expanded&&xt(_.props.triggerTarget||t).forEach((function(t){_.props.interactive?t.setAttribute("aria-expanded",_.state.isVisible&&t===S()?"true":"false"):t.removeAttribute("aria-expanded")}))}function R(){M().removeEventListener("mousemove",v),Xt=Xt.filter((function(t){return t!==v}))}function L(t){if(!(Pt.isTouch&&(p||"mousedown"===t.type)||_.props.interactive&&x.contains(t.target))){if(S().contains(t.target)){if(Pt.isTouch)return
-if(_.state.isVisible&&_.props.trigger.indexOf("click")>=0)return}else P("onClickOutside",[_,t])
-!0===_.props.hideOnClick&&(_.clearDelayTimeouts(),_.hide(),d=!0,setTimeout((function(){d=!1})),_.state.isMounted||z())}}function I(){p=!0}function $(){p=!1}function U(){var t=M()
-t.addEventListener("mousedown",L,!0),t.addEventListener("touchend",L,bt),t.addEventListener("touchstart",$,bt),t.addEventListener("touchmove",I,bt)}function z(){var t=M()
-t.removeEventListener("mousedown",L,!0),t.removeEventListener("touchend",L,bt),t.removeEventListener("touchstart",$,bt),t.removeEventListener("touchmove",I,bt)}function Z(t,e){var n=F().box
-function r(t){t.target===n&&(Bt(n,"remove",r),e())}if(0===t)return e()
-Bt(n,"remove",u),Bt(n,"add",r),u=r}function q(e,n,r){void 0===r&&(r=!1),xt(_.props.triggerTarget||t).forEach((function(t){t.addEventListener(e,n,r),b.push({node:t,eventType:e,handler:n,options:r})}))}function V(){var t
-C()&&(q("touchstart",Y,{passive:!0}),q("touchend",K,{passive:!0})),(t=_.props.trigger,t.split(/\s+/).filter(Boolean)).forEach((function(t){if("manual"!==t)switch(q(t,Y),t){case"mouseenter":q("mouseleave",K)
-break
-case"focus":q($t?"focusout":"blur",W)
-break
-case"focusin":q("focusout",W)}}))}function H(){b.forEach((function(t){var e=t.node,n=t.eventType,r=t.handler,i=t.options
-e.removeEventListener(n,r,i)})),b=[]}function Y(t){var e,n=!1
-if(_.state.isEnabled&&!X(t)&&!d){var r="focus"===(null==(e=a)?void 0:e.type)
-a=t,s=t.currentTarget,N(),!_.state.isVisible&&Ot(t)&&Xt.forEach((function(e){return e(t)})),"click"===t.type&&(_.props.trigger.indexOf("mouseenter")<0||h)&&!1!==_.props.hideOnClick&&_.state.isVisible?n=!0:et(t),"click"===t.type&&(h=!n),n&&!r&&nt(t)}}function G(t){var e=t.target,n=S().contains(e)||x.contains(e)
-if("mousemove"!==t.type||!n){var r=tt().concat(x).map((function(t){var e,n=null==(e=t._tippy.popperInstance)?void 0:e.state
-return n?{popperRect:t.getBoundingClientRect(),popperState:n,props:l}:null})).filter(Boolean);(function(t,e){var n=e.clientX,r=e.clientY
-return t.every((function(t){var e=t.popperRect,i=t.popperState,o=t.props.interactiveBorder,a=Et(i.placement),u=i.modifiersData.offset
-if(!u)return!0
-var c="bottom"===a?u.top.y:0,s="top"===a?u.bottom.y:0,f="right"===a?u.left.x:0,l="left"===a?u.right.x:0,h=e.top-r+c>o,d=r-e.bottom-s>o,p=e.left-n+f>o,y=n-e.right-l>o
-return h||d||p||y}))})(r,t)&&(R(),nt(t))}}function K(t){X(t)||_.props.trigger.indexOf("click")>=0&&h||(_.props.interactive?_.hideWithInteractivity(t):nt(t))}function W(t){_.props.trigger.indexOf("focusin")<0&&t.target!==S()||_.props.interactive&&t.relatedTarget&&x.contains(t.relatedTarget)||nt(t)}function X(t){return!!Pt.isTouch&&C()!==t.type.indexOf("touch")>=0}function J(){Q()
-var e=_.props,n=e.popperOptions,r=e.placement,i=e.offset,o=e.getReferenceClientRect,a=e.moveTransition,u=O()?Gt(x).arrow:null,s=o?{getBoundingClientRect:o,contextElement:o.contextElement||S()}:t,f=[{name:"offset",options:{offset:i}},{name:"preventOverflow",options:{padding:{top:2,bottom:2,left:5,right:5}}},{name:"flip",options:{padding:5}},{name:"computeStyles",options:{adaptive:!a}},{name:"$$tippy",enabled:!0,phase:"beforeWrite",requires:["computeStyles"],fn:function(t){var e=t.state
-if(O()){var n=F().box;["placement","reference-hidden","escaped"].forEach((function(t){"placement"===t?n.setAttribute("data-placement",e.placement):e.attributes.popper["data-popper-"+t]?n.setAttribute("data-"+t,""):n.removeAttribute("data-"+t)})),e.attributes.popper={}}}}]
-O()&&u&&f.push({name:"arrow",options:{element:u,padding:3}}),f.push.apply(f,(null==n?void 0:n.modifiers)||[]),_.popperInstance=ft(s,x,Object.assign({},n,{placement:r,onFirstUpdate:c,modifiers:f}))}function Q(){_.popperInstance&&(_.popperInstance.destroy(),_.popperInstance=null)}function tt(){return kt(x.querySelectorAll("[data-tippy-root]"))}function et(t){_.clearDelayTimeouts(),t&&P("onTrigger",[_,t]),U()
-var e=T(!0),n=D(),i=n[0],o=n[1]
-Pt.isTouch&&"hold"===i&&o&&(e=o),e?r=setTimeout((function(){_.show()}),e):_.show()}function nt(t){if(_.clearDelayTimeouts(),P("onUntrigger",[_,t]),_.state.isVisible){if(!(_.props.trigger.indexOf("mouseenter")>=0&&_.props.trigger.indexOf("click")>=0&&["mouseleave","mousemove"].indexOf(t.type)>=0&&h)){var e=T(!1)
-e?i=setTimeout((function(){_.state.isVisible&&_.hide()}),e):o=requestAnimationFrame((function(){_.hide()}))}}else z()}}(e,i)
-return n&&t.push(n),t}),[])
-return Ct(t)?o[0]:o}Qt.defaultProps=Ut,Qt.setDefaultProps=function(t){Object.keys(t).forEach((function(e){Ut[e]=t[e]}))},Qt.currentInput=Pt
-var te=function(t){var e=void 0===t?{}:t,n=e.exclude,r=e.duration
-Jt.forEach((function(t){var e=!1
-if(n&&(e=St(n)?t.reference===n:t.popper===n.popper),!e){var i=t.props.duration
-t.setProps({duration:r}),t.hide(),t.state.isDestroyed||t.setProps({duration:i})}}))},ee=Object.assign({},W,{effect:function(t){var e=t.state,n={popper:{position:e.options.strategy,left:"0",top:"0",margin:"0"},arrow:{position:"absolute"},reference:{}}
-Object.assign(e.elements.popper.style,n.popper),e.styles=n,e.elements.arrow&&Object.assign(e.elements.arrow.style,n.arrow)}}),ne=function(t,e){var n
-void 0===e&&(e={})
-var r,i=t,o=[],a=e.overrides,u=[],c=!1
-function s(){o=i.map((function(t){return t.reference}))}function f(t){i.forEach((function(e){t?e.enable():e.disable()}))}function l(t){return i.map((function(e){var n=e.setProps
-return e.setProps=function(i){n(i),e.reference===r&&t.setProps(i)},function(){e.setProps=n}}))}function h(t,e){var n=o.indexOf(e)
-if(e!==r){r=e
-var u=(a||[]).concat("content").reduce((function(t,e){return t[e]=i[n].props[e],t}),{})
-t.setProps(Object.assign({},u,{getReferenceClientRect:"function"==typeof u.getReferenceClientRect?u.getReferenceClientRect:function(){return e.getBoundingClientRect()}}))}}f(!1),s()
-var d={fn:function(){return{onDestroy:function(){f(!0)},onHidden:function(){r=null},onClickOutside:function(t){t.props.showOnCreate&&!c&&(c=!0,r=null)},onShow:function(t){t.props.showOnCreate&&!c&&(c=!0,h(t,o[0]))},onTrigger:function(t,e){h(t,e.currentTarget)}}}},p=Qt(Dt(),Object.assign({},wt(e,["overrides"]),{plugins:[d].concat(e.plugins||[]),triggerTarget:o,popperOptions:Object.assign({},e.popperOptions,{modifiers:[].concat((null==(n=e.popperOptions)?void 0:n.modifiers)||[],[ee])})})),y=p.show
-p.show=function(t){if(y(),!r&&null==t)return h(p,o[0])
-if(!r||null!=t){if("number"==typeof t)return o[t]&&h(p,o[t])
-if(i.includes(t)){var e=t.reference
-return h(p,e)}return o.includes(t)?h(p,t):void 0}},p.showNext=function(){var t=o[0]
-if(!r)return p.show(0)
-var e=o.indexOf(r)
-p.show(o[e+1]||t)},p.showPrevious=function(){var t=o[o.length-1]
-if(!r)return p.show(t)
-var e=o.indexOf(r),n=o[e-1]||t
-p.show(n)}
-var b=p.setProps
-return p.setProps=function(t){a=t.overrides||a,b(t)},p.setInstances=function(t){f(!0),u.forEach((function(t){return t()})),i=t,f(!1),s(),l(p),p.setProps({triggerTarget:o})},u=l(p),p},re={mouseover:"mouseenter",focusin:"focus",click:"click"}
-function ie(t,e){var n=[],r=[],i=!1,o=e.target,a=wt(e,["target"]),u=Object.assign({},a,{trigger:"manual",touch:!1}),c=Object.assign({},a,{showOnCreate:!0}),s=Qt(t,u)
-function f(t){if(t.target&&!i){var n=t.target.closest(o)
-if(n){var a=n.getAttribute("data-tippy-trigger")||e.trigger||Ut.trigger
-if(!n._tippy&&!("touchstart"===t.type&&"boolean"==typeof c.touch||"touchstart"!==t.type&&a.indexOf(re[t.type])<0)){var u=Qt(n,c)
-u&&(r=r.concat(u))}}}}function l(t,e,r,i){void 0===i&&(i=!1),t.addEventListener(e,r,i),n.push({node:t,eventType:e,handler:r,options:i})}return xt(s).forEach((function(t){var e=t.destroy,o=t.enable,a=t.disable
-t.destroy=function(t){void 0===t&&(t=!0),t&&r.forEach((function(t){t.destroy()})),r=[],n.forEach((function(t){var e=t.node,n=t.eventType,r=t.handler,i=t.options
-e.removeEventListener(n,r,i)})),n=[],e()},t.enable=function(){o(),r.forEach((function(t){return t.enable()})),i=!1},t.disable=function(){a(),r.forEach((function(t){return t.disable()})),i=!0},function(t){var e=t.reference
-l(e,"touchstart",f,bt),l(e,"mouseover",f),l(e,"focusin",f),l(e,"click",f)}(t)})),s}var oe={name:"animateFill",defaultValue:!1,fn:function(t){var e
-if(!(null==(e=t.props.render)?void 0:e.$$tippy))return{}
-var n=Gt(t.popper),r=n.box,i=n.content,o=t.props.animateFill?function(){var t=Dt()
-return t.className=dt,Ft([t],"hidden"),t}():null
-return{onCreate:function(){o&&(r.insertBefore(o,r.firstElementChild),r.setAttribute("data-animatefill",""),r.style.overflow="hidden",t.setProps({arrow:!1,animation:"shift-away"}))},onMount:function(){if(o){var t=r.style.transitionDuration,e=Number(t.replace("ms",""))
-i.style.transitionDelay=Math.round(e/10)+"ms",o.style.transitionDuration=t,Ft([o],"visible")}},onShow:function(){o&&(o.style.transitionDuration="0ms")},onHide:function(){o&&Ft([o],"hidden")}}}},ae={clientX:0,clientY:0},ue=[]
-function ce(t){var e=t.clientX,n=t.clientY
-ae={clientX:e,clientY:n}}var se={name:"followCursor",defaultValue:!1,fn:function(t){var e=t.reference,n=Tt(t.props.triggerTarget||e),r=!1,i=!1,o=!0,a=t.props
-function u(){return"initial"===t.props.followCursor&&t.state.isVisible}function c(){n.addEventListener("mousemove",l)}function s(){n.removeEventListener("mousemove",l)}function f(){r=!0,t.setProps({getReferenceClientRect:null}),r=!1}function l(n){var r=!n.target||e.contains(n.target),i=t.props.followCursor,o=n.clientX,a=n.clientY,u=e.getBoundingClientRect(),c=o-u.left,s=a-u.top
-!r&&t.props.interactive||t.setProps({getReferenceClientRect:function(){var t=e.getBoundingClientRect(),n=o,r=a
-"initial"===i&&(n=t.left+c,r=t.top+s)
-var u="horizontal"===i?t.top:r,f="vertical"===i?t.right:n,l="horizontal"===i?t.bottom:r,h="vertical"===i?t.left:n
-return{width:f-h,height:l-u,top:u,right:f,bottom:l,left:h}}})}function h(){t.props.followCursor&&(ue.push({instance:t,doc:n}),function(t){t.addEventListener("mousemove",ce)}(n))}function d(){0===(ue=ue.filter((function(e){return e.instance!==t}))).filter((function(t){return t.doc===n})).length&&function(t){t.removeEventListener("mousemove",ce)}(n)}return{onCreate:h,onDestroy:d,onBeforeUpdate:function(){a=t.props},onAfterUpdate:function(e,n){var o=n.followCursor
-r||void 0!==o&&a.followCursor!==o&&(d(),o?(h(),!t.state.isMounted||i||u()||c()):(s(),f()))},onMount:function(){t.props.followCursor&&!i&&(o&&(l(ae),o=!1),u()||c())},onTrigger:function(t,e){Ot(e)&&(ae={clientX:e.clientX,clientY:e.clientY}),i="focus"===e.type},onHidden:function(){t.props.followCursor&&(f(),s(),o=!0)}}}},fe={name:"inlinePositioning",defaultValue:!1,fn:function(t){var e,n=t.reference,r=-1,i=!1,o={name:"tippyInlinePositioning",enabled:!0,phase:"afterWrite",fn:function(i){var o=i.state
-t.props.inlinePositioning&&(e!==o.placement&&t.setProps({getReferenceClientRect:function(){return function(t){return function(t,e,n,r){if(n.length<2||null===t)return e
-if(2===n.length&&r>=0&&n[0].left>n[1].right)return n[r]||e
-switch(t){case"top":case"bottom":var i=n[0],o=n[n.length-1],a="top"===t,u=i.top,c=o.bottom,s=a?i.left:o.left,f=a?i.right:o.right
-return{top:u,bottom:c,left:s,right:f,width:f-s,height:c-u}
-case"left":case"right":var l=Math.min.apply(Math,n.map((function(t){return t.left}))),h=Math.max.apply(Math,n.map((function(t){return t.right}))),d=n.filter((function(e){return"left"===t?e.left===l:e.right===h})),p=d[0].top,y=d[d.length-1].bottom
-return{top:p,bottom:y,left:l,right:h,width:h-l,height:y-p}
-default:return e}}(Et(t),n.getBoundingClientRect(),kt(n.getClientRects()),r)}(o.placement)}}),e=o.placement)}}
-function a(){var e
-i||(e=function(t,e){var n
-return{popperOptions:Object.assign({},t.popperOptions,{modifiers:[].concat(((null==(n=t.popperOptions)?void 0:n.modifiers)||[]).filter((function(t){return t.name!==e.name})),[e])})}}(t.props,o),i=!0,t.setProps(e),i=!1)}return{onCreate:a,onAfterUpdate:a,onTrigger:function(e,n){if(Ot(n)){var i=kt(t.reference.getClientRects()),o=i.find((function(t){return t.left-2<=n.clientX&&t.right+2>=n.clientX&&t.top-2<=n.clientY&&t.bottom+2>=n.clientY}))
-r=i.indexOf(o)}},onUntrigger:function(){r=-1}}}},le={name:"sticky",defaultValue:!1,fn:function(t){var e=t.reference,n=t.popper
-function r(e){return!0===t.props.sticky||t.props.sticky===e}var i=null,o=null
-function a(){var u=r("reference")?(t.popperInstance?t.popperInstance.state.elements.reference:e).getBoundingClientRect():null,c=r("popper")?n.getBoundingClientRect():null;(u&&he(i,u)||c&&he(o,c))&&t.popperInstance&&t.popperInstance.update(),i=u,o=c,t.state.isMounted&&requestAnimationFrame(a)}return{onMount:function(){t.props.sticky&&a()}}}}
-function he(t,e){return!t||!e||t.top!==e.top||t.right!==e.right||t.bottom!==e.bottom||t.left!==e.left}Qt.setDefaultProps({render:Kt})
-const de=Qt},2247:(t,e,n)=>{"use strict"
-n.d(e,{ZT:()=>i,ev:()=>a,pi:()=>o})
-var r=function(t,e){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])},r(t,e)}
-function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null")
-function n(){this.constructor=t}r(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)}var o=function(){return o=Object.assign||function(t){for(var e,n=1,r=arguments.length;n<r;n++)for(var i in e=arguments[n])Object.prototype.hasOwnProperty.call(e,i)&&(t[i]=e[i])
-return t},o.apply(this,arguments)}
-function a(t,e){for(var n=0,r=e.length,i=t.length;n<r;n++,i++)t[i]=e[n]
-return t}Object.create,Object.create},6530:(t,e,n)=>{"use strict"
-function r(t){return null!==t&&"object"==typeof t&&!(t instanceof Date||t instanceof RegExp)&&!Array.isArray(t)}n.r(e),n.d(e,{BufferedChangeset:()=>vt,CHANGESET:()=>F,Change:()=>o,Changeset:()=>_t,Err:()=>c,ValidatedChangeset:()=>mt,buildOldValues:()=>q,changeset:()=>gt,getChangeValue:()=>u,getDeep:()=>y,getKeyValues:()=>l,isChange:()=>a,isChangeset:()=>T,isObject:()=>r,isPromise:()=>d,keyInObject:()=>B,lookupValidator:()=>b,mergeDeep:()=>J,mergeNested:()=>Z,normalizeObject:()=>E,objectWithout:()=>rt,propertyIsUnsafe:()=>K,pureAssign:()=>D,setDeep:()=>U,take:()=>it})
-var i=Symbol("__value__"),o=function(t){this[i]=t},a=function(t){return r(t)&&i in t}
-function u(t){if(a(t))return t[i]}var c=function(t,e){this.value=t,this.validation=e},s=function(t,e){var n="function"==typeof Symbol&&t[Symbol.iterator]
-if(!n)return t
-var r,i,o=n.call(t),a=[]
-try{for(;(void 0===e||e-- >0)&&!(r=o.next()).done;)a.push(r.value)}catch(t){i={error:t}}finally{try{r&&!r.done&&(n=o.return)&&n.call(o)}finally{if(i)throw i.error}}return a},f=function(){for(var t=[],e=0;e<arguments.length;e++)t=t.concat(s(arguments[e]))
-return t}
-function l(t,e){void 0===e&&(e=[])
-var n=[]
-for(var i in t)t[i]&&r(t[i])&&(a(t[i])?n.push({key:f(e,[i]).join("."),value:u(t[i])}):n.push.apply(n,f(l(t[i],f(e,[i])))))
-return n}function h(t,e){void 0===e&&(e=[])
-var n=[]
-for(var i in t)t[i]&&r(t[i])&&(Object.prototype.hasOwnProperty.call(t[i],"value")&&t[i]instanceof c?n.push({key:f(e,[i]).join("."),validation:t[i].validation,value:t[i].value}):"value"!==i&&n.push.apply(n,f(h(t[i],f(e,[i])))))
-return n}function d(t){return r(t)&&function(t){return!!(t&&t.then&&t.catch&&t.finally&&"function"==typeof t.then&&"function"==typeof t.catch&&"function"==typeof t.finally)}(t)}function p(t){return e=this,void 0,r=function(){var e,n
-return function(t,e){var n,r,i,o,a={label:0,sent:function(){if(1&i[0])throw i[1]
-return i[1]},trys:[],ops:[]}
-return o={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o
-function u(o){return function(u){return function(o){if(n)throw new TypeError("Generator is already executing.")
-for(;a;)try{if(n=1,r&&(i=2&o[0]?r.return:o[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i
-switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o
-break
-case 4:return a.label++,{value:o[1],done:!1}
-case 5:a.label++,r=o[1],o=[0]
-continue
-case 7:o=a.ops.pop(),a.trys.pop()
-continue
-default:if(!((i=(i=a.trys).length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){a=0
-continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){a.label=o[1]
-break}if(6===o[0]&&a.label<i[1]){a.label=i[1],i=o
-break}if(i&&a.label<i[2]){a.label=i[2],a.ops.push(o)
-break}i[2]&&a.ops.pop(),a.trys.pop()
-continue}o=e.call(t,a)}catch(t){o=[6,t],r=0}finally{n=i=0}if(5&o[0])throw o[1]
-return{value:o[0]?o[1]:void 0,done:!0}}([o,u])}}}(this,(function(r){switch(r.label){case 0:return r.trys.push([0,2,,3]),[4,Promise.all(t)]
-case 1:return e=r.sent(),[2,0===(n=e.filter((function(t){return"boolean"!=typeof t&&t}))).length||n]
-case 2:return[2,r.sent()]
-case 3:return[2]}}))},new((n=void 0)||(n=Promise))((function(t,i){function o(t){try{u(r.next(t))}catch(t){i(t)}}function a(t){try{u(r.throw(t))}catch(t){i(t)}}function u(e){var r
-e.done?t(e.value):(r=e.value,r instanceof n?r:new n((function(t){t(r)}))).then(o,a)}u((r=r.apply(e,[])).next())}))
-var e,n,r}function y(t,e){var n=t
-if(-1===e.indexOf("."))return n[e]
-for(var r="string"==typeof e?e.split("."):e,i=0;i<r.length;i++){if(null==n)return
-n=n[r[i]]}return n}function b(t){return function(e){var n,i=e.key,o=e.newValue,a=e.oldValue,u=e.changes,c=e.content,s=y(t||{},i)
-return s&&s.validate&&(s=s.validate.bind(s)),!(s&&!r(s))||(n=Array.isArray(s)?function(t,e){var n=e.key,r=e.newValue,i=e.oldValue,o=e.changes,a=e.content,u=Array.from(t.map((function(t){return t&&t.validate&&(t=t.validate.bind(t)),t(n,r,i,o,a)})))
-return u.some(d)?Promise.all(u).then(p):function(t){var e=t.filter((function(t){return"boolean"!=typeof t&&t}))
-return 0===e.length||e}(u)}(s,{key:i,newValue:o,oldValue:a,changes:u,content:c}):s(i,o,a,u,c),d(n)?n.then((function(t){return t})):n)}}var v=function(t,e){var n="function"==typeof Symbol&&t[Symbol.iterator]
-if(!n)return t
-var r,i,o=n.call(t),a=[]
-try{for(;(void 0===e||e-- >0)&&!(r=o.next()).done;)a.push(r.value)}catch(t){i={error:t}}finally{try{r&&!r.done&&(n=o.return)&&n.call(o)}finally{if(i)throw i.error}}return a},g=function(){for(var t=[],e=0;e<arguments.length;e++)t=t.concat(v(arguments[e]))
-return t},m=function(){function t(){this.listeners=[]}return t.prototype.addListener=function(t){var e=this
-return this.listeners.push(t),function(){return e.removeListener(t)}},t.prototype.removeListener=function(t){for(var e=0;e<this.listeners.length;e++)if(this.listeners[e]===t)return void this.listeners.splice(e,1)},t.prototype.trigger=function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e]
-this.listeners.forEach((function(e){return e.apply(void 0,g(t))}))},t}()
-function _(t,e){void 0===t._eventedNotifiers&&(t._eventedNotifiers={})
-var n=t._eventedNotifiers[e]
-return n||(n=t._eventedNotifiers[e]=new m),n}var w,x=function(t){var e="function"==typeof Symbol&&Symbol.iterator,n=e&&t[e],r=0
-if(n)return n.call(t)
-if(t&&"number"==typeof t.length)return{next:function(){return t&&r>=t.length&&(t=void 0),{value:t&&t[r++],done:!t}}}
-throw new TypeError(e?"Object is not iterable.":"Symbol.iterator is not defined.")},A=function(){return A=Object.assign||function(t){for(var e,n=1,r=arguments.length;n<r;n++)for(var i in e=arguments[n])Object.prototype.hasOwnProperty.call(e,i)&&(t[i]=e[i])
-return t},A.apply(this,arguments)}
-function E(t,e){if(void 0===e&&(e=r),!t||!e(t))return t
-if(a(t))return u(t)
-var n=A({},t)
-for(var i in n){var o=n[i]
-if(o&&e(o))if(a(o))n[i]=u(o)
-else{try{JSON.stringify(o)}catch(t){break}n[i]=E(o)}}return n}function k(t){for(var e in t){if(a(t[e]))return!0
-if(r(t[e])){var n=k(t[e])
-if(n)return n}}return!1}function D(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e]
-return t.reduce((function(t,e){return Object.defineProperties(t,w(e))}),{})}w=void 0!==Object.getOwnPropertyDescriptors?Object.getOwnPropertyDescriptors:function(t){var e={}
-return Object.keys(t).forEach((function(n){e[n]=Object.getOwnPropertyDescriptor(t,n)})),e}
-var C=function(t,e){var n="function"==typeof Symbol&&t[Symbol.iterator]
-if(!n)return t
-var r,i,o=n.call(t),a=[]
-try{for(;(void 0===e||e-- >0)&&!(r=o.next()).done;)a.push(r.value)}catch(t){i={error:t}}finally{try{r&&!r.done&&(n=o.return)&&n.call(o)}finally{if(i)throw i.error}}return a},O=function(){for(var t=[],e=0;e<arguments.length;e++)t=t.concat(C(arguments[e]))
-return t}
-function S(t,e,n,i){var o,a
-void 0===i&&(i=[])
-try{for(var u=function(t){var e="function"==typeof Symbol&&Symbol.iterator,n=e&&t[e],r=0
-if(n)return n.call(t)
-if(t&&"number"==typeof t.length)return{next:function(){return t&&r>=t.length&&(t=void 0),{value:t&&t[r++],done:!t}}}
-throw new TypeError(e?"Object is not iterable.":"Symbol.iterator is not defined.")}(n),c=u.next();!c.done;c=u.next()){var s=c.value,f=t[s]
-"function"==typeof f.validate?e[s]=f:r(f)?S(f,e,Object.keys(f),O(i,[s])):("function"==typeof f||Array.isArray(f)&&f.every((function(t){return"function"==typeof t||"function"==typeof t.validate})))&&(e[O(i,[s]).join(".")]=f)}}catch(t){o={error:t}}finally{try{c&&!c.done&&(a=u.return)&&a.call(u)}finally{if(o)throw o.error}}return e}function M(t){return t?S(t,{},Object.keys(t)):{}}var F="__CHANGESET__"
-function T(t){return t&&t.__changeset__===F}function B(t,e){var n=function(t,e){var n="function"==typeof Symbol&&t[Symbol.iterator]
-if(!n)return t
-var r,i,o=n.call(t),a=[]
-try{for(;(void 0===e||e-- >0)&&!(r=o.next()).done;)a.push(r.value)}catch(t){i={error:t}}finally{try{r&&!r.done&&(n=o.return)&&n.call(o)}finally{if(i)throw i.error}}return a}(e.split(".")),r=n[0],i=n.slice(1)
-if(!r||!(r in t))return!1
-if(!i.length)return r in t
-var o=t[r]
-return null!==o&&"object"==typeof o&&B(t[r],i.join("."))}var P=function(t,e){var n="function"==typeof Symbol&&t[Symbol.iterator]
-if(!n)return t
-var r,i,o=n.call(t),a=[]
-try{for(;(void 0===e||e-- >0)&&!(r=o.next()).done;)a.push(r.value)}catch(t){i={error:t}}finally{try{r&&!r.done&&(n=o.return)&&n.call(o)}finally{if(i)throw i.error}}return a}
-function j(t){return!!t&&Object.keys(t).every((function(t){return Number.isInteger(parseInt(t,10))}))}function N(t){return t.reduce((function(t,e,n){return t[n]=e,t}),{})}function R(t){var e,n,r=[]
-try{for(var i=function(t){var e="function"==typeof Symbol&&Symbol.iterator,n=e&&t[e],r=0
-if(n)return n.call(t)
-if(t&&"number"==typeof t.length)return{next:function(){return t&&r>=t.length&&(t=void 0),{value:t&&t[r++],done:!t}}}
-throw new TypeError(e?"Object is not iterable.":"Symbol.iterator is not defined.")}(Object.entries(t)),o=i.next();!o.done;o=i.next()){var a=P(o.value,2),u=a[0],c=a[1]
-r[parseInt(u,10)]=c}}catch(t){e={error:t}}finally{try{o&&!o.done&&(n=i.return)&&n.call(i)}finally{if(e)throw e.error}}return r}var L=function(){return L=Object.assign||function(t){for(var e,n=1,r=arguments.length;n<r;n++)for(var i in e=arguments[n])Object.prototype.hasOwnProperty.call(e,i)&&(t[i]=e[i])
-return t},L.apply(this,arguments)}
-function I(t,e){var n=function(t,e){var n="function"==typeof Symbol&&t[Symbol.iterator]
-if(!n)return t
-var r,i,o=n.call(t),a=[]
-try{for(;(void 0===e||e-- >0)&&!(r=o.next()).done;)a.push(r.value)}catch(t){i={error:t}}finally{try{r&&!r.done&&(n=o.return)&&n.call(o)}finally{if(i)throw i.error}}return a}(e.slice(-1),1)[0],r=Object.keys(t).filter((function(t){return t!==n})).reduce((function(e,n){return e[n]=t[n],e}),Object.create(null))
-return L({},r)}function $(t){return"__proto__"!==t&&"constructor"!==t&&"prototype"!==t}function U(t,e,n,i){void 0===i&&(i={safeSet:void 0,safeGet:void 0})
-var c=function(t){return t.split(".")}(e).filter($),s=t
-if(i.safeSet=i.safeSet||function(t,e,n){return t[e]=n},i.safeGet=i.safeGet||function(t,e){return t?t[e]:t},1===c.length)return i.safeSet(t,e,n),t
-for(var f=0;f<c.length;f++){var l=c[f]
-if(Array.isArray(t)&&parseInt(l,10)<0)throw new Error("Negative indices are not allowed as arrays do not serialize values at negative indices")
-var h=r(i.safeGet(t,l)),d=Array.isArray(i.safeGet(t,l)),p=h||d
-if(p){if(p&&a(i.safeGet(t,l))){var y=u(i.safeGet(t,l))
-if(r(y)){var b,v=I(y,c),g=a(n)?u(n):n,m=Array.isArray(t)||j(t),_=m?c.slice(f+1,c.length).join("."):c.slice(1,c.length).join(".")
-b=m&&void 0===g||f===c.length-1?g:U(v,_,g,i),i.safeSet(t,l,new o(b))
-break}i.safeSet(t,l,{})}}else i.safeSet(t,l,{})
-if(f===c.length-1){i.safeSet(t,l,n)
-break}t=i.safeGet(t,l)}return s}var z=Object.keys
-function Z(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e]
-var n={}
-return t.forEach((function(t){return z(t).forEach((function(e){return U(n,e,t[e])}))})),n}function q(t,e,n){var r,i,o=Object.create(null)
-try{for(var a=function(t){var e="function"==typeof Symbol&&Symbol.iterator,n=e&&t[e],r=0
-if(n)return n.call(t)
-if(t&&"number"==typeof t.length)return{next:function(){return t&&r>=t.length&&(t=void 0),{value:t&&t[r++],done:!t}}}
-throw new TypeError(e?"Object is not iterable.":"Symbol.iterator is not defined.")}(e),u=a.next();!u.done;u=a.next()){var c=u.value
-o[c.key]=n(t,c.key)}}catch(t){r={error:t}}finally{try{u&&!u.done&&(i=a.return)&&i.call(a)}finally{if(r)throw r.error}}return o}var V=function(t,e){var n="function"==typeof Symbol&&t[Symbol.iterator]
-if(!n)return t
-var r,i,o=n.call(t),a=[]
-try{for(;(void 0===e||e-- >0)&&!(r=o.next()).done;)a.push(r.value)}catch(t){i={error:t}}finally{try{r&&!r.done&&(n=o.return)&&n.call(o)}finally{if(i)throw i.error}}return a},H=function(){for(var t=[],e=0;e<arguments.length;e++)t=t.concat(V(arguments[e]))
-return t}
-function Y(t){return Object.keys(t).concat(function(t){return Object.getOwnPropertySymbols?Object.getOwnPropertySymbols(t).filter((function(e){return t.propertyIsEnumerable(e)})):[]}(t))}function G(t,e){try{return e in t}catch(t){return!1}}function K(t,e){return G(t,e)&&!(Object.hasOwnProperty.call(t,e)&&Object.propertyIsEnumerable.call(t,e))}function W(t,e,n,r){return Object.keys(t).forEach((function(i){var o=t[i]
-o&&a(o)?n[H(r,[i]).join(".")]=u(o):o&&"object"==typeof o&&W(o,e,n,H(r,[i]))})),n}function X(t,e,n){return n.getKeys(e).forEach((function(r){if(n.propertyIsUnsafe(t,r)){if(n.safeSet){var i=W(e,n,{},[])
-if(Object.keys(i).length>0)for(r in i){var o=i[r]
-n.safeSet(t,r,o)}}}else{if(!G(t,r)||!function(t){return!!t&&"object"==typeof t}(s=e[r])||function(t){var e=Object.prototype.toString.call(t)
-return"[object RegExp]"===e||"[object Date]"===e}(s)||a(e[r])){var c=e[r]
-return c&&a(c)?n.safeSet(t,r,u(c)):n.safeSet(t,r,E(c))}n.safeSet(t,r,J(n.safeGet(t,r),n.safeGet(e,r),n))}var s})),t}function J(t,e,n){void 0===n&&(n={safeGet:void 0,safeSet:void 0,propertyIsUnsafe:void 0,getKeys:void 0}),n.getKeys=n.getKeys||Y,n.propertyIsUnsafe=n.propertyIsUnsafe||K,n.safeGet=n.safeGet||function(t,e){return t[e]},n.safeSet=n.safeSet||function(t,e,n){return t[e]=n}
-var r=Array.isArray(e),i=Array.isArray(t)
-if(r===i)return r||null==t?e:X(t,e,n)
-var o=j(e)
-return i&&o?R(X(N(t),e,n)):e}var Q=function(){return Q=Object.assign||function(t){for(var e,n=1,r=arguments.length;n<r;n++)for(var i in e=arguments[n])Object.prototype.hasOwnProperty.call(e,i)&&(t[i]=e[i])
-return t},Q.apply(this,arguments)},tt={get:function(t,e){if("symbol"!=typeof e){var n=t.safeGet(t.changes,e)
-if(a(n))return u(n)
-if(r(n)){var i=t.children[e]
-if(void 0===i&&t.content){var o=t.safeGet(t.content,e)
-i=t.children[e]=new nt(n,o,t.safeGet)}if(i)return i.proxy}if(void 0!==n)return n
-if(t.content){var c=t.content
-if(t.safeGet(c,e))return t.safeGet(c,e)}return"function"==typeof t[e]||t.hasOwnProperty(e)?t[e]:void 0}},ownKeys:function(t){return Reflect.ownKeys(t.changes)},getOwnPropertyDescriptor:function(t,e){return Reflect.getOwnPropertyDescriptor(t.changes,e)},has:function(t,e){return Reflect.has(t.changes,e)},set:function(t,e,n){return e.startsWith("_")?Reflect.set(t,e,n):Reflect.set(t.changes,e,new o(n))}}
-function et(t,e){return t[e]}var nt=function(){function t(t,e,n,r){void 0===t&&(t={}),void 0===e&&(e={}),void 0===n&&(n=et),this.safeGet=n,this.isObject=r,this.changes=t,this.content=e,this.proxy=new Proxy(this,tt),this.children=Object.create(null)}return t.prototype.get=function(t){return this.safeGet(this.changes,t)},t.prototype.set=function(t,e){return U(this.changes,t,e)},t.prototype.unwrap=function(){var t=this.changes
-if(r(t)){t=E(t,this.isObject)
-var e=this.content
-if(r(e))return t=E(t,this.isObject),Q(Q({},e),t)
-if(Array.isArray(e))return t=E(t,this.isObject),R(J(N(e),t))}return t},t}()
-function rt(t){for(var e=[],n=1;n<arguments.length;n++)e[n-1]=arguments[n]
-return e.reduce((function(e,n){return Object.keys(n).filter((function(e){return-1===t.indexOf(e)||!n.hasOwnProperty(e)})).forEach((function(t){return e[t]=n[t]})),e}),{})}function it(t,e){void 0===t&&(t={}),void 0===e&&(e=[])
-var n={}
-for(var r in t)-1!==e.indexOf(r)&&(n[r]=t[r])
-return n}var ot=function(){return ot=Object.assign||function(t){for(var e,n=1,r=arguments.length;n<r;n++)for(var i in e=arguments[n])Object.prototype.hasOwnProperty.call(e,i)&&(t[i]=e[i])
-return t},ot.apply(this,arguments)},at=function(t,e,n,r){return new(n||(n=Promise))((function(i,o){function a(t){try{c(r.next(t))}catch(t){o(t)}}function u(t){try{c(r.throw(t))}catch(t){o(t)}}function c(t){var e
-t.done?i(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(a,u)}c((r=r.apply(t,e||[])).next())}))},ut=function(t,e){var n,r,i,o,a={label:0,sent:function(){if(1&i[0])throw i[1]
-return i[1]},trys:[],ops:[]}
-return o={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o
-function u(o){return function(u){return function(o){if(n)throw new TypeError("Generator is already executing.")
-for(;a;)try{if(n=1,r&&(i=2&o[0]?r.return:o[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i
-switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o
-break
-case 4:return a.label++,{value:o[1],done:!1}
-case 5:a.label++,r=o[1],o=[0]
-continue
-case 7:o=a.ops.pop(),a.trys.pop()
-continue
-default:if(!((i=(i=a.trys).length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){a=0
-continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){a.label=o[1]
-break}if(6===o[0]&&a.label<i[1]){a.label=i[1],i=o
-break}if(i&&a.label<i[2]){a.label=i[2],a.ops.push(o)
-break}i[2]&&a.ops.pop(),a.trys.pop()
-continue}o=e.call(t,a)}catch(t){o=[6,t],r=0}finally{n=i=0}if(5&o[0])throw o[1]
-return{value:o[0]?o[1]:void 0,done:!0}}([o,u])}}},ct=function(t,e){var n="function"==typeof Symbol&&t[Symbol.iterator]
-if(!n)return t
-var r,i,o=n.call(t),a=[]
-try{for(;(void 0===e||e-- >0)&&!(r=o.next()).done;)a.push(r.value)}catch(t){i={error:t}}finally{try{r&&!r.done&&(n=o.return)&&n.call(o)}finally{if(i)throw i.error}}return a},st=function(){for(var t=[],e=0;e<arguments.length;e++)t=t.concat(ct(arguments[e]))
-return t},ft=Object.keys,lt="_changes",ht="_errors",dt="afterValidation",pt=function(){return!0},yt={skipValidate:!1}
-function bt(t){return t}var vt=function(){function t(t,e,n,i){void 0===e&&(e=pt),void 0===n&&(n={}),void 0===i&&(i={}),this.validateFn=e,this.validationMap=n,this.__changeset__=F,this._eventedNotifiers={},this.isObject=r,this.maybeUnwrapProxy=bt,this.setDeep=U,this.getDeep=y,this.mergeDeep=J,this._content=t,this._previousContent=void 0,this._changes={},this._errors={},this._errorsCache={},this._validator=e,this._options=D(yt,JSON.parse(JSON.stringify(i))),this._runningValidations={}}return t.prototype.on=function(t,e){return _(this,t).addListener(e)},t.prototype.off=function(t,e){return _(this,t).removeListener(e)},t.prototype.trigger=function(t){for(var e=[],n=1;n<arguments.length;n++)e[n-1]=arguments[n]
-var r=_(this,t)
-r&&r.trigger.apply(r,st(e))},t.prototype.safeGet=function(t,e){return t[e]},t.prototype.safeSet=function(t,e,n){return t[e]=n},Object.defineProperty(t.prototype,"_bareChanges",{get:function(){return l(this._changes).reduce((function(t,e){var n=e.key,r=e.value
-return t[n]=r,t}),Object.create(null))},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"changes",{get:function(){return l(this._changes)},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"errors",{get:function(){return h(this._errors)},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"change",{get:function(){var t=this._changes
-return k(this._changes)?E(t):{}},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"error",{get:function(){return this._errors},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"data",{get:function(){return this._content},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"isValid",{get:function(){return 0===h(this._errors).length},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"isPristine",{get:function(){var t=Object.keys(this._changes),e=this._options.changesetKeys
-return Array.isArray(e)&&e.length&&(t=t.filter((function(t){return e.includes(t)}))),0===t.length||!k(this._changes)},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"isInvalid",{get:function(){return!this.isValid},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"isDirty",{get:function(){return!this.isPristine},enumerable:!1,configurable:!0}),t.prototype.setUnknownProperty=function(t,e){var n=this._options,r=n.changesetKeys
-if(!(Array.isArray(r)&&r.length>0)||r.find((function(e){return t.match(e)}))){var i=this._content,o=this.safeGet(i,t)
-if(n.skipValidate)return this._setProperty({key:t,value:e,oldValue:o}),void this._handleValidation(!0,{key:t,value:e})
-this._setProperty({key:t,value:e,oldValue:o}),this._validateKey(t,e)}},Object.defineProperty(t.prototype,Symbol.toStringTag,{get:function(){return"changeset:"+D(this._content,{}).toString()},enumerable:!1,configurable:!0}),t.prototype.toString=function(){return"changeset:"+D(this._content,{}).toString()},t.prototype.prepare=function(t){var e=t(this._bareChanges)
-if(this.isObject(e),this.isObject(e)){var n=ft(e).reduce((function(t,n){return t[n]=new o(e[n]),t}),{})
-this._changes=n}return this},t.prototype.execute=function(){var t
-if(this.isValid&&this.isDirty){var e=this._content,n=this._changes
-t=q(e,this.changes,this.getDeep),this._content=this.mergeDeep(e,n)}return this.trigger("execute"),this._changes={},this._previousContent=t,this},t.prototype.unexecute=function(){return this._previousContent&&(this._content=this.mergeDeep(this._content,this._previousContent,{safeGet:this.safeGet,safeSet:this.safeSet})),this},t.prototype.save=function(t){return at(this,void 0,void 0,(function(){var e,n,r,i
-return ut(this,(function(o){switch(o.label){case 0:e=this._content,n=Promise.resolve(this),this.execute(),"function"==typeof e.save?n=e.save(t):"function"==typeof this.safeGet(e,"save")&&(r=this.maybeUnwrapProxy(e).save())&&(n=r),o.label=1
-case 1:return o.trys.push([1,3,,4]),[4,n]
-case 2:return i=o.sent(),this.rollback(),[2,i]
-case 3:throw o.sent()
-case 4:return[2]}}))}))},t.prototype.merge=function(t){var e=this._content
-if(T(t),t._content,this.isPristine&&t.isPristine)return this
-var n=this._changes,r=t._changes,i=this._errors,o=t._errors,a=new mt(e,this._validator),u=rt(ft(r),i),c=rt(ft(o),n),s=Z(u,o),f=Z(c,r)
-return a._errors=s,a._changes=f,a._notifyVirtualProperties(),a},t.prototype.rollback=function(){var t=this._rollbackKeys()
-return this._changes={},this._errors={},this._errorsCache={},this._notifyVirtualProperties(t),this.trigger("afterRollback"),this},t.prototype.rollbackInvalid=function(t){var e=this,n=ft(this._errors)
-return t?(this._notifyVirtualProperties([t]),this._errors=this._deleteKey(ht,t),this._errorsCache=this._errors,n.indexOf(t)>-1&&(this._changes=this._deleteKey(lt,t))):(this._notifyVirtualProperties(),this._errors={},this._errorsCache=this._errors,n.forEach((function(t){e._changes=e._deleteKey(lt,t)}))),this},t.prototype.rollbackProperty=function(t){return this._changes=this._deleteKey(lt,t),this._errors=this._deleteKey(ht,t),this._errorsCache=this._errors,this},t.prototype.validate=function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e]
-return at(this,void 0,void 0,(function(){var e,n=this
-return ut(this,(function(r){return 0!==ft(this.validationMap).length||t.length?(t=t.length>0?t:ft(M(this.validationMap)),e=t.map((function(t){var e=n[t],r=e instanceof nt?e.unwrap():e
-return n._validateKey(t,r)})),[2,Promise.all(e)]):[2,Promise.resolve(null)]}))}))},t.prototype.addError=function(t,e){var n,r=this
-if(function(t){return r.isObject(t)&&!Array.isArray(t)}(e))e.hasOwnProperty("value")||e.value,e.hasOwnProperty("validation"),n=new c(e.value,e.validation)
-else{var i=this[t]
-n=new c(i,e)}var o=this._errors
-return this._errors=this.setDeep(o,t,n,{safeSet:this.safeSet}),this._errorsCache=this._errors,e},t.prototype.pushErrors=function(t){for(var e=[],n=1;n<arguments.length;n++)e[n-1]=arguments[n]
-var r=this._errors,i=this.getDeep(r,t)||new c(null,[]),o=i.validation,a=this[t]
-!Array.isArray(o)&&Boolean(o)&&(i.validation=[o])
-var u=i.validation
-o=st(u,e)
-var s=new c(a,o)
-return this._errors=this.setDeep(r,t,s,{safeSet:this.safeSet}),this._errorsCache=this._errors,{value:a,validation:o}},t.prototype.snapshot=function(){var t=this._changes,e=this._errors
-return{changes:ft(t).reduce((function(e,n){return e[n]=u(t[n]),e}),{}),errors:ft(e).reduce((function(t,n){var r=e[n]
-return t[n]={value:r.value,validation:r.validation},t}),{})}},t.prototype.restore=function(t){var e=t.changes,n=t.errors,r=ft(e).reduce((function(t,n){return t[n]=new o(e[n]),t}),{}),i=ft(n).reduce((function(t,e){var r=n[e]
-return t[e]=new c(r.value,r.validation),t}),{})
-return this._changes=r,this._errors=i,this._errorsCache=this._errors,this._notifyVirtualProperties(),this},t.prototype.cast=function(t){void 0===t&&(t=[])
-var e=this._changes
-if(Array.isArray(t)&&0===t.length)return this
-var n=it(e,ft(e).filter((function(e){return t.includes(e)})))
-return this._changes=n,this},t.prototype.isValidating=function(t){var e=this._runningValidations,n=ft(e)
-return t?n.includes(t):n.length>0},t.prototype._validateKey=function(t,e){var n=this,r=this._content,i=this.getDeep(r,t),o=this._validate(t,e,i)
-if(this.trigger("beforeValidation",t),d(o)){this._setIsValidating(t,o)
-var a=this._runningValidations,u=Object.entries(a)
-return Promise.all(u).then((function(){return o.then((function(r){return delete a[t],n._handleValidation(r,{key:t,value:e})})).then((function(e){return n.trigger(dt,t),e}))}))}var c=this._handleValidation(o,{key:t,value:e})
-return this.trigger(dt,t),c},t.prototype._handleValidation=function(t,e){var n=e.key,r=e.value,i=!0===t||Array.isArray(t)&&1===t.length&&!0===t[0]
-return this._errors=this._deleteKey("_errorsCache",n),i?r:this.addError(n,{value:r,validation:t})},t.prototype._validate=function(t,e,n){var r=this._validator,i=this._content
-if("function"==typeof r){var o=r({key:t,newValue:e,oldValue:n,changes:this.change,content:i})
-return void 0===o||o}return!0},t.prototype._setProperty=function(t){var e,n,r=t.key,i=t.value,a=t.oldValue,u=this._changes
-if(n=a,((e=i)instanceof Date&&n instanceof Date?e.getTime()===n.getTime():e===n)&&void 0!==a)B(u,r)&&(this._changes=this._deleteKey(lt,r))
-else{var c=this.setDeep(u,r,new o(i),{safeSet:this.safeSet})
-this._changes=c}},t.prototype._setIsValidating=function(t,e){var n=this._runningValidations
-this.setDeep(n,t,e)},t.prototype._notifyVirtualProperties=function(t){return t||(t=this._rollbackKeys()),t},t.prototype._rollbackKeys=function(){var t=this._changes,e=this._errors
-return st(new Set(st(ft(t),ft(e))))},t.prototype._deleteKey=function(t,e){void 0===e&&(e="")
-var n=this[t],r=e.split(".")
-if(1===r.length&&n.hasOwnProperty(e))delete n[e]
-else if(n[r[0]])for(var i=ct(r),o=i[0],u=i.slice(1),c=n,s=n[o],f=o;this.isObject(s)&&f;){var l=s;(a(l)||void 0!==l.value||l.validation)&&delete c[f],c=s,(f=u.shift())&&(s=s[f])}return n},t.prototype.get=function(t){var e=ct(t.split(".")),n=e[0],i=e.slice(1),o=this._changes,c=this._content
-if(Object.prototype.hasOwnProperty.call(o,n)){var s=this.getDeep(o,t)
-if(!this.isObject(s)&&void 0!==s)return s}if(Object.prototype.hasOwnProperty.call(o,n)&&k(o)){var f=o[n],l=E(f)
-if(this.isObject(l)){var h=this.maybeUnwrapProxy(this.getDeep(l,i.join(".")))
-if(void 0===h&&function(t,e,n){var r,i
-if(a(t))return!1
-var o=e.split("."),u=t
-try{for(var c=x(o),s=c.next();!s.done;s=c.next()){var f=s.value
-if(!u)return!1
-if(o[o.length-1]!==f&&a(n(u,f)))return!0
-u=n(u,f)}}catch(t){r={error:t}}finally{try{s&&!s.done&&(i=c.return)&&i.call(c)}finally{if(r)throw r.error}}return!1}(o,t,this.safeGet)&&!function(t,e,n){var r,i,o=e.split("."),c=t
-try{for(var s=x(o),f=s.next();!f.done;f=s.next()){var l=f.value
-if(!c||!Object.prototype.hasOwnProperty.call(c,l))return!1
-c=n(c,l),a(c)&&(c=u(c))}}catch(t){r={error:t}}finally{try{f&&!f.done&&(i=s.return)&&i.call(s)}finally{if(r)throw r.error}}return!0}(o,t,this.safeGet)&&this.getDeep(c,t))return
-if(this.isObject(h)){if(a(h))return u(h)
-var d=this.safeGet(c,n)||{},p=this.getDeep(d,i.join(".")),y=function(t,e){var n=t
-if(-1===e.indexOf("."))return n[e]
-for(var r="string"==typeof e?e.split("."):e,i=0;i<r.length;i++){if(null==n)return
-n=a(n[r[i]])?u(n[r[i]]):n[r[i]]}return n}(o,t)
-return new nt(y,p,this.getDeep,this.isObject).proxy}if(void 0!==h)return h}if(a(f)&&0===i.length)return u(f)}if(n in this||t in this)return this.getDeep(this,t)
-var b=this.maybeUnwrapProxy(this.getDeep(c,t))
-if(this.isObject(b))return(y=this.getDeep(o,t))||(y=this.getDeep(this.setDeep(o,t,{}),t)),new nt(y,b,this.getDeep,this.isObject).proxy
-if(Array.isArray(b)){if(!(y=this.getDeep(o,t)))return b
-if(r(y)){if(r(b))return y=E(y,this.isObject),ot(ot({},b),y)
-if(Array.isArray(b))return y=E(y,this.isObject),R(J(N(b),y))}return y}return b},t.prototype.set=function(t,e){this.hasOwnProperty(t)||B(this,t)?this[t]=e:this.setUnknownProperty(t,e)},t}()
-function gt(t,e,n,r){return new vt(t,e,n,r)}var mt=function(t,e,n,r){var i=gt(t,e,n,r)
-return new Proxy(i,{get:function(t,e){return t.get(e.toString())},set:function(t,e,n){return t.set(e.toString(),n),!0}})}
-function _t(t,e,n,r){var i=gt(t,e,n,r)
-return new Proxy(i,{get:function(t,e){return t.get(e.toString())},set:function(t,e,n){return t.set(e.toString(),n),!0}})}},6841:(t,e,n)=>{var r=n(260),i=n(8806)
-t.exports=function t(e){if(!(this instanceof t))return new t(e)
-var n=(e||"").replace(/^\//,""),o=i()
-return a._trie=o,a.on=function(t,e){if(r.equal(typeof t,"string"),r.equal(typeof e,"function"),t=t||"/",e._wayfarer&&e._trie)o.mount(t,e._trie.trie)
-else{var n=o.create(t)
-n.cb=e,n.route=t}return a},a.emit=a,a.match=u,a._wayfarer=!0,a
-function a(t){var e=u(t),n=new Array(arguments.length)
-n[0]=e.params
-for(var r=1;r<n.length;r++)n[r]=arguments[r]
-return e.cb.apply(e.cb,n)}function u(t){r.notEqual(t,void 0,"'route' must be defined")
-var e=o.match(t)
-if(e&&e.cb)return new c(e)
-var i=o.match(n)
-if(i&&i.cb)return new c(i)
-throw new Error("route '"+t+"' did not match")}function c(t){this.cb=t.cb,this.route=t.route,this.params=t.params}}},8806:(t,e,n)=>{var r=n(260)
-function i(){if(!(this instanceof i))return new i
-this.trie={nodes:{}}}function o(t,e){return Object.prototype.hasOwnProperty.call(t,e)}t.exports=i,i.prototype.create=function(t){r.equal(typeof t,"string","route should be a string")
-var e=t.replace(/^\//,"").split("/")
-return function t(n,r){var i=o(e,n)&&e[n]
-if(!1===i)return r
-var a=null
-return/^:|^\*/.test(i)?(o(r.nodes,"$$")?a=r.nodes.$$:(a={nodes:{}},r.nodes.$$=a),"*"===i[0]&&(r.wildcard=!0),r.name=i.replace(/^:|^\*/,"")):o(r.nodes,i)?a=r.nodes[i]:(a={nodes:{}},r.nodes[i]=a),t(n+1,a)}(0,this.trie)},i.prototype.match=function(t){r.equal(typeof t,"string","route should be a string")
-var e=t.replace(/^\//,"").split("/"),n={},i=function t(r,i){if(void 0!==i){var a=e[r]
-if(void 0===a)return i
-if(o(i.nodes,a))return t(r+1,i.nodes[a])
-if(i.name){try{n[i.name]=decodeURIComponent(a)}catch(e){return t(r,void 0)}return t(r+1,i.nodes.$$)}if(i.wildcard){try{n.wildcard=decodeURIComponent(e.slice(r).join("/"))}catch(e){return t(r,void 0)}return i.nodes.$$}return t(r+1)}}(0,this.trie)
-if(i)return(i=Object.assign({},i)).params=n,i},i.prototype.mount=function(t,e){r.equal(typeof t,"string","route should be a string"),r.equal(typeof e,"object","trie should be a object")
-var n=t.replace(/^\//,"").split("/"),i=null,o=null
-if(1===n.length)o=n[0],i=this.create(o)
-else{var a=n.join("/")
-o=n[0],i=this.create(a)}Object.assign(i.nodes,e.nodes),e.name&&(i.name=e.name),i.nodes[""]&&(Object.keys(i.nodes[""]).forEach((function(t){"nodes"!==t&&(i[t]=i.nodes[""][t])})),Object.assign(i.nodes,i.nodes[""].nodes),delete i.nodes[""].nodes)}},3493:(t,e,n)=>{"use strict"
-n.r(e),n.d(e,{CSSResult:()=>a,ReactiveElement:()=>g,adoptStyles:()=>s,css:()=>c,defaultConverter:()=>y,getCompatibleStyle:()=>f,notEqual:()=>b,supportsAdoptingStyleSheets:()=>r,unsafeCSS:()=>u})
-const r=window.ShadowRoot&&(void 0===window.ShadyCSS||window.ShadyCSS.nativeShadow)&&"adoptedStyleSheets"in Document.prototype&&"replace"in CSSStyleSheet.prototype,i=Symbol(),o=new Map
-class a{constructor(t,e){if(this._$cssResult$=!0,e!==i)throw Error("CSSResult is not constructable. Use `unsafeCSS` or `css` instead.")
-this.cssText=t}get styleSheet(){let t=o.get(this.cssText)
-return r&&void 0===t&&(o.set(this.cssText,t=new CSSStyleSheet),t.replaceSync(this.cssText)),t}toString(){return this.cssText}}const u=t=>new a("string"==typeof t?t:t+"",i),c=function(t){for(var e=arguments.length,n=new Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r]
-const o=1===t.length?t[0]:n.reduce(((e,n,r)=>e+(t=>{if(!0===t._$cssResult$)return t.cssText
-if("number"==typeof t)return t
-throw Error("Value passed to 'css' function must be a 'css' function result: "+t+". Use 'unsafeCSS' to pass non-literal values, but take care to ensure page security.")})(n)+t[r+1]),t[0])
-return new a(o,i)},s=(t,e)=>{r?t.adoptedStyleSheets=e.map((t=>t instanceof CSSStyleSheet?t:t.styleSheet)):e.forEach((e=>{const n=document.createElement("style"),r=window.litNonce
-void 0!==r&&n.setAttribute("nonce",r),n.textContent=e.cssText,t.appendChild(n)}))},f=r?t=>t:t=>t instanceof CSSStyleSheet?(t=>{let e=""
-for(const n of t.cssRules)e+=n.cssText
-return u(e)})(t):t
-var l
-const h=window.trustedTypes,d=h?h.emptyScript:"",p=window.reactiveElementPolyfillSupport,y={toAttribute(t,e){switch(e){case Boolean:t=t?d:null
-break
-case Object:case Array:t=null==t?t:JSON.stringify(t)}return t},fromAttribute(t,e){let n=t
-switch(e){case Boolean:n=null!==t
-break
-case Number:n=null===t?null:Number(t)
-break
-case Object:case Array:try{n=JSON.parse(t)}catch(t){n=null}}return n}},b=(t,e)=>e!==t&&(e==e||t==t),v={attribute:!0,type:String,converter:y,reflect:!1,hasChanged:b}
-class g extends HTMLElement{constructor(){super(),this._$Et=new Map,this.isUpdatePending=!1,this.hasUpdated=!1,this._$Ei=null,this.o()}static addInitializer(t){var e
-null!==(e=this.l)&&void 0!==e||(this.l=[]),this.l.push(t)}static get observedAttributes(){this.finalize()
-const t=[]
-return this.elementProperties.forEach(((e,n)=>{const r=this._$Eh(n,e)
-void 0!==r&&(this._$Eu.set(r,n),t.push(r))})),t}static createProperty(t){let e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:v
-if(e.state&&(e.attribute=!1),this.finalize(),this.elementProperties.set(t,e),!e.noAccessor&&!this.prototype.hasOwnProperty(t)){const n="symbol"==typeof t?Symbol():"__"+t,r=this.getPropertyDescriptor(t,n,e)
-void 0!==r&&Object.defineProperty(this.prototype,t,r)}}static getPropertyDescriptor(t,e,n){return{get(){return this[e]},set(r){const i=this[t]
-this[e]=r,this.requestUpdate(t,i,n)},configurable:!0,enumerable:!0}}static getPropertyOptions(t){return this.elementProperties.get(t)||v}static finalize(){if(this.hasOwnProperty("finalized"))return!1
-this.finalized=!0
-const t=Object.getPrototypeOf(this)
-if(t.finalize(),this.elementProperties=new Map(t.elementProperties),this._$Eu=new Map,this.hasOwnProperty("properties")){const t=this.properties,e=[...Object.getOwnPropertyNames(t),...Object.getOwnPropertySymbols(t)]
-for(const n of e)this.createProperty(n,t[n])}return this.elementStyles=this.finalizeStyles(this.styles),!0}static finalizeStyles(t){const e=[]
-if(Array.isArray(t)){const n=new Set(t.flat(1/0).reverse())
-for(const t of n)e.unshift(f(t))}else void 0!==t&&e.push(f(t))
-return e}static _$Eh(t,e){const n=e.attribute
-return!1===n?void 0:"string"==typeof n?n:"string"==typeof t?t.toLowerCase():void 0}o(){var t
-this._$Ep=new Promise((t=>this.enableUpdating=t)),this._$AL=new Map,this._$Em(),this.requestUpdate(),null===(t=this.constructor.l)||void 0===t||t.forEach((t=>t(this)))}addController(t){var e,n;(null!==(e=this._$Eg)&&void 0!==e?e:this._$Eg=[]).push(t),void 0!==this.renderRoot&&this.isConnected&&(null===(n=t.hostConnected)||void 0===n||n.call(t))}removeController(t){var e
-null===(e=this._$Eg)||void 0===e||e.splice(this._$Eg.indexOf(t)>>>0,1)}_$Em(){this.constructor.elementProperties.forEach(((t,e)=>{this.hasOwnProperty(e)&&(this._$Et.set(e,this[e]),delete this[e])}))}createRenderRoot(){var t
-const e=null!==(t=this.shadowRoot)&&void 0!==t?t:this.attachShadow(this.constructor.shadowRootOptions)
-return s(e,this.constructor.elementStyles),e}connectedCallback(){var t
-void 0===this.renderRoot&&(this.renderRoot=this.createRenderRoot()),this.enableUpdating(!0),null===(t=this._$Eg)||void 0===t||t.forEach((t=>{var e
-return null===(e=t.hostConnected)||void 0===e?void 0:e.call(t)}))}enableUpdating(t){}disconnectedCallback(){var t
-null===(t=this._$Eg)||void 0===t||t.forEach((t=>{var e
-return null===(e=t.hostDisconnected)||void 0===e?void 0:e.call(t)}))}attributeChangedCallback(t,e,n){this._$AK(t,n)}_$ES(t,e){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:v
-var r,i
-const o=this.constructor._$Eh(t,n)
-if(void 0!==o&&!0===n.reflect){const a=(null!==(i=null===(r=n.converter)||void 0===r?void 0:r.toAttribute)&&void 0!==i?i:y.toAttribute)(e,n.type)
-this._$Ei=t,null==a?this.removeAttribute(o):this.setAttribute(o,a),this._$Ei=null}}_$AK(t,e){var n,r,i
-const o=this.constructor,a=o._$Eu.get(t)
-if(void 0!==a&&this._$Ei!==a){const t=o.getPropertyOptions(a),u=t.converter,c=null!==(i=null!==(r=null===(n=u)||void 0===n?void 0:n.fromAttribute)&&void 0!==r?r:"function"==typeof u?u:null)&&void 0!==i?i:y.fromAttribute
-this._$Ei=a,this[a]=c(e,t.type),this._$Ei=null}}requestUpdate(t,e,n){let r=!0
-void 0!==t&&(((n=n||this.constructor.getPropertyOptions(t)).hasChanged||b)(this[t],e)?(this._$AL.has(t)||this._$AL.set(t,e),!0===n.reflect&&this._$Ei!==t&&(void 0===this._$E_&&(this._$E_=new Map),this._$E_.set(t,n))):r=!1),!this.isUpdatePending&&r&&(this._$Ep=this._$EC())}async _$EC(){this.isUpdatePending=!0
-try{await this._$Ep}catch(t){Promise.reject(t)}const t=this.scheduleUpdate()
-return null!=t&&await t,!this.isUpdatePending}scheduleUpdate(){return this.performUpdate()}performUpdate(){var t
-if(!this.isUpdatePending)return
-this.hasUpdated,this._$Et&&(this._$Et.forEach(((t,e)=>this[e]=t)),this._$Et=void 0)
-let e=!1
-const n=this._$AL
-try{e=this.shouldUpdate(n),e?(this.willUpdate(n),null===(t=this._$Eg)||void 0===t||t.forEach((t=>{var e
-return null===(e=t.hostUpdate)||void 0===e?void 0:e.call(t)})),this.update(n)):this._$EU()}catch(t){throw e=!1,this._$EU(),t}e&&this._$AE(n)}willUpdate(t){}_$AE(t){var e
-null===(e=this._$Eg)||void 0===e||e.forEach((t=>{var e
-return null===(e=t.hostUpdated)||void 0===e?void 0:e.call(t)})),this.hasUpdated||(this.hasUpdated=!0,this.firstUpdated(t)),this.updated(t)}_$EU(){this._$AL=new Map,this.isUpdatePending=!1}get updateComplete(){return this.getUpdateComplete()}getUpdateComplete(){return this._$Ep}shouldUpdate(t){return!0}update(t){void 0!==this._$E_&&(this._$E_.forEach(((t,e)=>this._$ES(e,this[e],t))),this._$E_=void 0),this._$EU()}updated(t){}firstUpdated(t){}}g.finalized=!0,g.elementProperties=new Map,g.elementStyles=[],g.shadowRootOptions={mode:"open"},null==p||p({ReactiveElement:g}),(null!==(l=globalThis.reactiveElementVersions)&&void 0!==l?l:globalThis.reactiveElementVersions=[]).push("1.2.1")}}])
diff --git a/agent/uiserver/dist/assets/chunk.412.2df22e4bf69d8f15ebdb.js.LICENSE.txt b/agent/uiserver/dist/assets/chunk.412.2df22e4bf69d8f15ebdb.js.LICENSE.txt
deleted file mode 100644
index b25e5082df0fb..0000000000000
--- a/agent/uiserver/dist/assets/chunk.412.2df22e4bf69d8f15ebdb.js.LICENSE.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
- * clipboard.js v2.0.8
- * https://clipboardjs.com/
- *
- * Licensed MIT © Zeno Rocha
- */
-
-/*!
-* focus-trap 6.9.4
-* @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE
-*/
-
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-/**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: BSD-3-Clause
- */
diff --git a/agent/uiserver/dist/assets/chunk.744.c0eb6726020fc4af8d3f.css b/agent/uiserver/dist/assets/chunk.744.c0eb6726020fc4af8d3f.css
deleted file mode 100644
index cf28e28e68b55..0000000000000
--- a/agent/uiserver/dist/assets/chunk.744.c0eb6726020fc4af8d3f.css
+++ /dev/null
@@ -1,39 +0,0 @@
-dialog {
-  position: absolute;
-  left: 0; right: 0;
-  width: -moz-fit-content;
-  width: -webkit-fit-content;
-  width: fit-content;
-  height: -moz-fit-content;
-  height: -webkit-fit-content;
-  height: fit-content;
-  margin: auto;
-  border: solid;
-  padding: 1em;
-  background: white;
-  color: black;
-  display: block;
-}
-
-dialog:not([open]) {
-  display: none;
-}
-
-dialog + .backdrop {
-  position: fixed;
-  top: 0; right: 0; bottom: 0; left: 0;
-  background: rgba(0,0,0,0.1);
-}
-
-._dialog_overlay {
-  position: fixed;
-  top: 0; right: 0; bottom: 0; left: 0;
-}
-
-dialog.fixed {
-  position: fixed;
-  top: 50%;
-  transform: translate(0, -50%);
-}
-
-/*# sourceMappingURL=chunk.744.c0eb6726020fc4af8d3f.css-e0c9c028789323db3f70d794b7d8bdc8.map*/
\ No newline at end of file
diff --git a/agent/uiserver/dist/assets/chunk.744.c0eb6726020fc4af8d3f.js b/agent/uiserver/dist/assets/chunk.744.c0eb6726020fc4af8d3f.js
deleted file mode 100644
index 4a5274a4aa33e..0000000000000
--- a/agent/uiserver/dist/assets/chunk.744.c0eb6726020fc4af8d3f.js
+++ /dev/null
@@ -1 +0,0 @@
-"use strict";(globalThis.webpackChunk_ember_auto_import_=globalThis.webpackChunk_ember_auto_import_||[]).push([[744],{7744:(_,e,a)=>{a.r(e)}}])
diff --git a/agent/uiserver/dist/assets/chunk.83.85cc25a28afe28f711a3.js b/agent/uiserver/dist/assets/chunk.83.85cc25a28afe28f711a3.js
deleted file mode 100644
index d49ebc2f6d6ff..0000000000000
--- a/agent/uiserver/dist/assets/chunk.83.85cc25a28afe28f711a3.js
+++ /dev/null
@@ -1,65 +0,0 @@
-"use strict";(globalThis.webpackChunk_ember_auto_import_=globalThis.webpackChunk_ember_auto_import_||[]).push([[83],{7083:(e,t,o)=>{o.r(t),o.d(t,{default:()=>_})
-var i=window.CustomEvent
-function n(e,t){var o="on"+t.type.toLowerCase()
-return"function"==typeof e[o]&&e[o](t),e.dispatchEvent(t)}function a(e){for(;e;){if("dialog"===e.localName)return e
-e=e.parentElement?e.parentElement:e.parentNode?e.parentNode.host:null}return null}function r(e){for(;e&&e.shadowRoot&&e.shadowRoot.activeElement;)e=e.shadowRoot.activeElement
-e&&e.blur&&e!==document.body&&e.blur()}function l(e,t){for(var o=0;o<e.length;++o)if(e[o]===t)return!0
-return!1}function s(e){return!(!e||!e.hasAttribute("method"))&&"dialog"===e.getAttribute("method").toLowerCase()}function d(e){var t=["button","input","keygen","select","textarea"].map((function(e){return e+":not([disabled])"}))
-t.push('[tabindex]:not([disabled]):not([tabindex=""])')
-var o=e.querySelector(t.join(", "))
-if(!o&&"attachShadow"in Element.prototype)for(var i=e.querySelectorAll("*"),n=0;n<i.length&&!(i[n].tagName&&i[n].shadowRoot&&(o=d(i[n].shadowRoot)));n++);return o}function u(e){return e.isConnected||document.body.contains(e)}function c(e){if(e.submitter)return e.submitter
-var t=e.target
-if(!(t instanceof HTMLFormElement))return null
-var o=g.formSubmitter
-if(!o){var i=e.target
-o=("getRootNode"in i&&i.getRootNode()||document).activeElement}return o&&o.form===t?o:null}function h(e){if(!e.defaultPrevented){var t=e.target,o=g.imagemapUseValue,i=c(e)
-null===o&&i&&(o=i.value)
-var n=a(t)
-n&&"dialog"===(i&&i.getAttribute("formmethod")||t.getAttribute("method"))&&(e.preventDefault(),null!=o?n.close(o):n.close())}}function p(e){if(this.dialog_=e,this.replacedStyleTop_=!1,this.openAsModal_=!1,e.hasAttribute("role")||e.setAttribute("role","dialog"),e.show=this.show.bind(this),e.showModal=this.showModal.bind(this),e.close=this.close.bind(this),e.addEventListener("submit",h,!1),"returnValue"in e||(e.returnValue=""),"MutationObserver"in window)new MutationObserver(this.maybeHideModal.bind(this)).observe(e,{attributes:!0,attributeFilter:["open"]})
-else{var t,o=!1,i=function(){o?this.downgradeModal():this.maybeHideModal(),o=!1}.bind(this),n=function(n){if(n.target===e){var a="DOMNodeRemoved"
-o|=n.type.substr(0,a.length)===a,window.clearTimeout(t),t=window.setTimeout(i,0)}};["DOMAttrModified","DOMNodeRemoved","DOMNodeRemovedFromDocument"].forEach((function(t){e.addEventListener(t,n)}))}Object.defineProperty(e,"open",{set:this.setOpen.bind(this),get:e.hasAttribute.bind(e,"open")}),this.backdrop_=document.createElement("div"),this.backdrop_.className="backdrop",this.backdrop_.addEventListener("mouseup",this.backdropMouseEvent_.bind(this)),this.backdrop_.addEventListener("mousedown",this.backdropMouseEvent_.bind(this)),this.backdrop_.addEventListener("click",this.backdropMouseEvent_.bind(this))}i&&"object"!=typeof i||((i=function(e,t){t=t||{}
-var o=document.createEvent("CustomEvent")
-return o.initCustomEvent(e,!!t.bubbles,!!t.cancelable,t.detail||null),o}).prototype=window.Event.prototype),p.prototype={get dialog(){return this.dialog_},maybeHideModal:function(){this.dialog_.hasAttribute("open")&&u(this.dialog_)||this.downgradeModal()},downgradeModal:function(){this.openAsModal_&&(this.openAsModal_=!1,this.dialog_.style.zIndex="",this.replacedStyleTop_&&(this.dialog_.style.top="",this.replacedStyleTop_=!1),this.backdrop_.parentNode&&this.backdrop_.parentNode.removeChild(this.backdrop_),g.dm.removeDialog(this))},setOpen:function(e){e?this.dialog_.hasAttribute("open")||this.dialog_.setAttribute("open",""):(this.dialog_.removeAttribute("open"),this.maybeHideModal())},backdropMouseEvent_:function(e){if(this.dialog_.hasAttribute("tabindex"))this.dialog_.focus()
-else{var t=document.createElement("div")
-this.dialog_.insertBefore(t,this.dialog_.firstChild),t.tabIndex=-1,t.focus(),this.dialog_.removeChild(t)}var o=document.createEvent("MouseEvents")
-o.initMouseEvent(e.type,e.bubbles,e.cancelable,window,e.detail,e.screenX,e.screenY,e.clientX,e.clientY,e.ctrlKey,e.altKey,e.shiftKey,e.metaKey,e.button,e.relatedTarget),this.dialog_.dispatchEvent(o),e.stopPropagation()},focus_:function(){var e=this.dialog_.querySelector("[autofocus]:not([disabled])")
-!e&&this.dialog_.tabIndex>=0&&(e=this.dialog_),e||(e=d(this.dialog_)),r(document.activeElement),e&&e.focus()},updateZIndex:function(e,t){if(e<t)throw new Error("dialogZ should never be < backdropZ")
-this.dialog_.style.zIndex=e,this.backdrop_.style.zIndex=t},show:function(){this.dialog_.open||(this.setOpen(!0),this.focus_())},showModal:function(){if(this.dialog_.hasAttribute("open"))throw new Error("Failed to execute 'showModal' on dialog: The element is already open, and therefore cannot be opened modally.")
-if(!u(this.dialog_))throw new Error("Failed to execute 'showModal' on dialog: The element is not in a Document.")
-if(!g.dm.pushDialog(this))throw new Error("Failed to execute 'showModal' on dialog: There are too many open modal dialogs.");(function(e){for(;e&&e!==document.body;){var t=window.getComputedStyle(e),o=function(e,o){return!(void 0===t[e]||t[e]===o)}
-if(t.opacity<1||o("zIndex","auto")||o("transform","none")||o("mixBlendMode","normal")||o("filter","none")||o("perspective","none")||"isolate"===t.isolation||"fixed"===t.position||"touch"===t.webkitOverflowScrolling)return!0
-e=e.parentElement}return!1})(this.dialog_.parentElement)&&console.warn("A dialog is being shown inside a stacking context. This may cause it to be unusable. For more information, see this link: https://github.com/GoogleChrome/dialog-polyfill/#stacking-context"),this.setOpen(!0),this.openAsModal_=!0,g.needsCentering(this.dialog_)?(g.reposition(this.dialog_),this.replacedStyleTop_=!0):this.replacedStyleTop_=!1,this.dialog_.parentNode.insertBefore(this.backdrop_,this.dialog_.nextSibling),this.focus_()},close:function(e){if(!this.dialog_.hasAttribute("open"))throw new Error("Failed to execute 'close' on dialog: The element does not have an 'open' attribute, and therefore cannot be closed.")
-this.setOpen(!1),void 0!==e&&(this.dialog_.returnValue=e)
-var t=new i("close",{bubbles:!1,cancelable:!1})
-n(this.dialog_,t)}}
-var g={reposition:function(e){var t=document.body.scrollTop||document.documentElement.scrollTop,o=t+(window.innerHeight-e.offsetHeight)/2
-e.style.top=Math.max(t,o)+"px"},isInlinePositionSetByStylesheet:function(e){for(var t=0;t<document.styleSheets.length;++t){var o=document.styleSheets[t],i=null
-try{i=o.cssRules}catch(e){}if(i)for(var n=0;n<i.length;++n){var a=i[n],r=null
-try{r=document.querySelectorAll(a.selectorText)}catch(e){}if(r&&l(r,e)){var s=a.style.getPropertyValue("top"),d=a.style.getPropertyValue("bottom")
-if(s&&"auto"!==s||d&&"auto"!==d)return!0}}}return!1},needsCentering:function(e){return!("absolute"!==window.getComputedStyle(e).position||"auto"!==e.style.top&&""!==e.style.top||"auto"!==e.style.bottom&&""!==e.style.bottom||g.isInlinePositionSetByStylesheet(e))},forceRegisterDialog:function(e){if((window.HTMLDialogElement||e.showModal)&&console.warn("This browser already supports <dialog>, the polyfill may not work correctly",e),"dialog"!==e.localName)throw new Error("Failed to register dialog: The element is not a dialog.")
-new p(e)},registerDialog:function(e){e.showModal||g.forceRegisterDialog(e)},DialogManager:function(){this.pendingDialogStack=[]
-var e=this.checkDOM_.bind(this)
-this.overlay=document.createElement("div"),this.overlay.className="_dialog_overlay",this.overlay.addEventListener("click",function(t){this.forwardTab_=void 0,t.stopPropagation(),e([])}.bind(this)),this.handleKey_=this.handleKey_.bind(this),this.handleFocus_=this.handleFocus_.bind(this),this.zIndexLow_=1e5,this.zIndexHigh_=100150,this.forwardTab_=void 0,"MutationObserver"in window&&(this.mo_=new MutationObserver((function(t){var o=[]
-t.forEach((function(e){for(var t,i=0;t=e.removedNodes[i];++i)t instanceof Element&&("dialog"===t.localName&&o.push(t),o=o.concat(t.querySelectorAll("dialog")))})),o.length&&e(o)})))}}
-if(g.DialogManager.prototype.blockDocument=function(){document.documentElement.addEventListener("focus",this.handleFocus_,!0),document.addEventListener("keydown",this.handleKey_),this.mo_&&this.mo_.observe(document,{childList:!0,subtree:!0})},g.DialogManager.prototype.unblockDocument=function(){document.documentElement.removeEventListener("focus",this.handleFocus_,!0),document.removeEventListener("keydown",this.handleKey_),this.mo_&&this.mo_.disconnect()},g.DialogManager.prototype.updateStacking=function(){for(var e,t=this.zIndexHigh_,o=0;e=this.pendingDialogStack[o];++o)e.updateZIndex(--t,--t),0===o&&(this.overlay.style.zIndex=--t)
-var i=this.pendingDialogStack[0]
-i?(i.dialog.parentNode||document.body).appendChild(this.overlay):this.overlay.parentNode&&this.overlay.parentNode.removeChild(this.overlay)},g.DialogManager.prototype.containedByTopDialog_=function(e){for(;e=a(e);){for(var t,o=0;t=this.pendingDialogStack[o];++o)if(t.dialog===e)return 0===o
-e=e.parentElement}return!1},g.DialogManager.prototype.handleFocus_=function(e){var t=e.composedPath?e.composedPath()[0]:e.target
-if(!this.containedByTopDialog_(t)&&document.activeElement!==document.documentElement&&(e.preventDefault(),e.stopPropagation(),r(t),void 0!==this.forwardTab_)){var o=this.pendingDialogStack[0]
-return o.dialog.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_PRECEDING&&(this.forwardTab_?o.focus_():t!==document.documentElement&&document.documentElement.focus()),!1}},g.DialogManager.prototype.handleKey_=function(e){if(this.forwardTab_=void 0,27===e.keyCode){e.preventDefault(),e.stopPropagation()
-var t=new i("cancel",{bubbles:!1,cancelable:!0}),o=this.pendingDialogStack[0]
-o&&n(o.dialog,t)&&o.dialog.close()}else 9===e.keyCode&&(this.forwardTab_=!e.shiftKey)},g.DialogManager.prototype.checkDOM_=function(e){this.pendingDialogStack.slice().forEach((function(t){-1!==e.indexOf(t.dialog)?t.downgradeModal():t.maybeHideModal()}))},g.DialogManager.prototype.pushDialog=function(e){var t=(this.zIndexHigh_-this.zIndexLow_)/2-1
-return!(this.pendingDialogStack.length>=t||(1===this.pendingDialogStack.unshift(e)&&this.blockDocument(),this.updateStacking(),0))},g.DialogManager.prototype.removeDialog=function(e){var t=this.pendingDialogStack.indexOf(e);-1!==t&&(this.pendingDialogStack.splice(t,1),0===this.pendingDialogStack.length&&this.unblockDocument(),this.updateStacking())},g.dm=new g.DialogManager,g.formSubmitter=null,g.imagemapUseValue=null,void 0===window.HTMLDialogElement){var m=document.createElement("form")
-if(m.setAttribute("method","dialog"),"dialog"!==m.method){var f=Object.getOwnPropertyDescriptor(HTMLFormElement.prototype,"method")
-if(f){var b=f.get
-f.get=function(){return s(this)?"dialog":b.call(this)}
-var v=f.set
-f.set=function(e){return"string"==typeof e&&"dialog"===e.toLowerCase()?this.setAttribute("method",e):v.call(this,e)},Object.defineProperty(HTMLFormElement.prototype,"method",f)}}document.addEventListener("click",(function(e){if(g.formSubmitter=null,g.imagemapUseValue=null,!e.defaultPrevented){var t=e.target
-if("composedPath"in e&&(t=e.composedPath().shift()||t),t&&s(t.form)){if(!("submit"===t.type&&["button","input"].indexOf(t.localName)>-1)){if("input"!==t.localName||"image"!==t.type)return
-g.imagemapUseValue=e.offsetX+","+e.offsetY}a(t)&&(g.formSubmitter=t)}}}),!1),document.addEventListener("submit",(function(e){var t=e.target
-if(!a(t)){var o=c(e)
-"dialog"===(o&&o.getAttribute("formmethod")||t.getAttribute("method"))&&e.preventDefault()}}))
-var y=HTMLFormElement.prototype.submit
-HTMLFormElement.prototype.submit=function(){if(!s(this))return y.call(this)
-var e=a(this)
-e&&e.close()}}const _=g}}])
diff --git a/agent/uiserver/dist/assets/codemirror/mode/javascript/javascript-77218cd1268ea6df75775114ae086566.js b/agent/uiserver/dist/assets/codemirror/mode/javascript/javascript-77218cd1268ea6df75775114ae086566.js
new file mode 100644
index 0000000000000..7d25301561e31
--- /dev/null
+++ b/agent/uiserver/dist/assets/codemirror/mode/javascript/javascript-77218cd1268ea6df75775114ae086566.js
@@ -0,0 +1,138 @@
+var jsonlint=function(){var e={trace:function(){},yy:{},symbols_:{error:2,JSONString:3,STRING:4,JSONNumber:5,NUMBER:6,JSONNullLiteral:7,NULL:8,JSONBooleanLiteral:9,TRUE:10,FALSE:11,JSONText:12,JSONValue:13,EOF:14,JSONObject:15,JSONArray:16,"{":17,"}":18,JSONMemberList:19,JSONMember:20,":":21,",":22,"[":23,"]":24,JSONElementList:25,$accept:0,$end:1},terminals_:{2:"error",4:"STRING",6:"NUMBER",8:"NULL",10:"TRUE",11:"FALSE",14:"EOF",17:"{",18:"}",21:":",22:",",23:"[",24:"]"},productions_:[0,[3,1],[5,1],[7,1],[9,1],[9,1],[12,2],[13,1],[13,1],[13,1],[13,1],[13,1],[13,1],[15,2],[15,3],[20,3],[19,1],[19,3],[16,2],[16,3],[25,1],[25,3]],performAction:function(e,t,r,n,i,a){var s=a.length-1
+switch(i){case 1:this.$=e.replace(/\\(\\|")/g,"$1").replace(/\\n/g,"\n").replace(/\\r/g,"\r").replace(/\\t/g,"\t").replace(/\\v/g,"\v").replace(/\\f/g,"\f").replace(/\\b/g,"\b")
+break
+case 2:this.$=Number(e)
+break
+case 3:this.$=null
+break
+case 4:this.$=!0
+break
+case 5:this.$=!1
+break
+case 6:return this.$=a[s-1]
+case 13:this.$={}
+break
+case 14:this.$=a[s-1]
+break
+case 15:this.$=[a[s-2],a[s]]
+break
+case 16:this.$={},this.$[a[s][0]]=a[s][1]
+break
+case 17:this.$=a[s-2],a[s-2][a[s][0]]=a[s][1]
+break
+case 18:this.$=[]
+break
+case 19:this.$=a[s-1]
+break
+case 20:this.$=[a[s]]
+break
+case 21:this.$=a[s-2],a[s-2].push(a[s])}},table:[{3:5,4:[1,12],5:6,6:[1,13],7:3,8:[1,9],9:4,10:[1,10],11:[1,11],12:1,13:2,15:7,16:8,17:[1,14],23:[1,15]},{1:[3]},{14:[1,16]},{14:[2,7],18:[2,7],22:[2,7],24:[2,7]},{14:[2,8],18:[2,8],22:[2,8],24:[2,8]},{14:[2,9],18:[2,9],22:[2,9],24:[2,9]},{14:[2,10],18:[2,10],22:[2,10],24:[2,10]},{14:[2,11],18:[2,11],22:[2,11],24:[2,11]},{14:[2,12],18:[2,12],22:[2,12],24:[2,12]},{14:[2,3],18:[2,3],22:[2,3],24:[2,3]},{14:[2,4],18:[2,4],22:[2,4],24:[2,4]},{14:[2,5],18:[2,5],22:[2,5],24:[2,5]},{14:[2,1],18:[2,1],21:[2,1],22:[2,1],24:[2,1]},{14:[2,2],18:[2,2],22:[2,2],24:[2,2]},{3:20,4:[1,12],18:[1,17],19:18,20:19},{3:5,4:[1,12],5:6,6:[1,13],7:3,8:[1,9],9:4,10:[1,10],11:[1,11],13:23,15:7,16:8,17:[1,14],23:[1,15],24:[1,21],25:22},{1:[2,6]},{14:[2,13],18:[2,13],22:[2,13],24:[2,13]},{18:[1,24],22:[1,25]},{18:[2,16],22:[2,16]},{21:[1,26]},{14:[2,18],18:[2,18],22:[2,18],24:[2,18]},{22:[1,28],24:[1,27]},{22:[2,20],24:[2,20]},{14:[2,14],18:[2,14],22:[2,14],24:[2,14]},{3:20,4:[1,12],20:29},{3:5,4:[1,12],5:6,6:[1,13],7:3,8:[1,9],9:4,10:[1,10],11:[1,11],13:30,15:7,16:8,17:[1,14],23:[1,15]},{14:[2,19],18:[2,19],22:[2,19],24:[2,19]},{3:5,4:[1,12],5:6,6:[1,13],7:3,8:[1,9],9:4,10:[1,10],11:[1,11],13:31,15:7,16:8,17:[1,14],23:[1,15]},{18:[2,17],22:[2,17]},{18:[2,15],22:[2,15]},{22:[2,21],24:[2,21]}],defaultActions:{16:[2,6]},parseError:function(e){throw new Error(e)},parse:function(e){var t=this,r=[0],n=[null],i=[],a=this.table,s="",o=0,l=0,c=0
+this.lexer.setInput(e),this.lexer.yy=this.yy,this.yy.lexer=this.lexer,void 0===this.lexer.yylloc&&(this.lexer.yylloc={})
+var u=this.lexer.yylloc
+function f(){var e
+return"number"!=typeof(e=t.lexer.lex()||1)&&(e=t.symbols_[e]||e),e}i.push(u),"function"==typeof this.yy.parseError&&(this.parseError=this.yy.parseError)
+for(var h,p,d,y,m,v,g,b,x,k,w={};;){if(d=r[r.length-1],this.defaultActions[d]?y=this.defaultActions[d]:(null==h&&(h=f()),y=a[d]&&a[d][h]),void 0===y||!y.length||!y[0]){if(!c){for(v in x=[],a[d])this.terminals_[v]&&v>2&&x.push("'"+this.terminals_[v]+"'")
+var _=""
+_=this.lexer.showPosition?"Parse error on line "+(o+1)+":\n"+this.lexer.showPosition()+"\nExpecting "+x.join(", ")+", got '"+this.terminals_[h]+"'":"Parse error on line "+(o+1)+": Unexpected "+(1==h?"end of input":"'"+(this.terminals_[h]||h)+"'"),this.parseError(_,{text:this.lexer.match,token:this.terminals_[h]||h,line:this.lexer.yylineno,loc:u,expected:x})}if(3==c){if(1==h)throw new Error(_||"Parsing halted.")
+l=this.lexer.yyleng,s=this.lexer.yytext,o=this.lexer.yylineno,u=this.lexer.yylloc,h=f()}for(;!(2..toString()in a[d]);){if(0==d)throw new Error(_||"Parsing halted.")
+k=1,r.length=r.length-2*k,n.length=n.length-k,i.length=i.length-k,d=r[r.length-1]}p=h,h=2,y=a[d=r[r.length-1]]&&a[d][2],c=3}if(y[0]instanceof Array&&y.length>1)throw new Error("Parse Error: multiple actions possible at state: "+d+", token: "+h)
+switch(y[0]){case 1:r.push(h),n.push(this.lexer.yytext),i.push(this.lexer.yylloc),r.push(y[1]),h=null,p?(h=p,p=null):(l=this.lexer.yyleng,s=this.lexer.yytext,o=this.lexer.yylineno,u=this.lexer.yylloc,c>0&&c--)
+break
+case 2:if(g=this.productions_[y[1]][1],w.$=n[n.length-g],w._$={first_line:i[i.length-(g||1)].first_line,last_line:i[i.length-1].last_line,first_column:i[i.length-(g||1)].first_column,last_column:i[i.length-1].last_column},void 0!==(m=this.performAction.call(w,s,l,o,this.yy,y[1],n,i)))return m
+g&&(r=r.slice(0,-1*g*2),n=n.slice(0,-1*g),i=i.slice(0,-1*g)),r.push(this.productions_[y[1]][0]),n.push(w.$),i.push(w._$),b=a[r[r.length-2]][r[r.length-1]],r.push(b)
+break
+case 3:return!0}}return!0}},t=function(){var e={EOF:1,parseError:function(e,t){if(!this.yy.parseError)throw new Error(e)
+this.yy.parseError(e,t)},setInput:function(e){return this._input=e,this._more=this._less=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this},input:function(){var e=this._input[0]
+return this.yytext+=e,this.yyleng++,this.match+=e,this.matched+=e,e.match(/\n/)&&this.yylineno++,this._input=this._input.slice(1),e},unput:function(e){return this._input=e+this._input,this},more:function(){return this._more=!0,this},less:function(e){this._input=this.match.slice(e)+this._input},pastInput:function(){var e=this.matched.substr(0,this.matched.length-this.match.length)
+return(e.length>20?"...":"")+e.substr(-20).replace(/\n/g,"")},upcomingInput:function(){var e=this.match
+return e.length<20&&(e+=this._input.substr(0,20-e.length)),(e.substr(0,20)+(e.length>20?"...":"")).replace(/\n/g,"")},showPosition:function(){var e=this.pastInput(),t=new Array(e.length+1).join("-")
+return e+this.upcomingInput()+"\n"+t+"^"},next:function(){if(this.done)return this.EOF
+var e,t,r,n,i
+this._input||(this.done=!0),this._more||(this.yytext="",this.match="")
+for(var a=this._currentRules(),s=0;s<a.length&&(!(r=this._input.match(this.rules[a[s]]))||t&&!(r[0].length>t[0].length)||(t=r,n=s,this.options.flex));s++);return t?((i=t[0].match(/\n.*/g))&&(this.yylineno+=i.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:i?i[i.length-1].length-1:this.yylloc.last_column+t[0].length},this.yytext+=t[0],this.match+=t[0],this.yyleng=this.yytext.length,this._more=!1,this._input=this._input.slice(t[0].length),this.matched+=t[0],e=this.performAction.call(this,this.yy,this,a[n],this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),e||void 0):""===this._input?this.EOF:void this.parseError("Lexical error on line "+(this.yylineno+1)+". Unrecognized text.\n"+this.showPosition(),{text:"",token:null,line:this.yylineno})},lex:function(){var e=this.next()
+return void 0!==e?e:this.lex()},begin:function(e){this.conditionStack.push(e)},popState:function(){return this.conditionStack.pop()},_currentRules:function(){return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules},topState:function(){return this.conditionStack[this.conditionStack.length-2]},pushState:function(e){this.begin(e)},options:{},performAction:function(e,t,r){switch(r){case 0:break
+case 1:return 6
+case 2:return t.yytext=t.yytext.substr(1,t.yyleng-2),4
+case 3:return 17
+case 4:return 18
+case 5:return 23
+case 6:return 24
+case 7:return 22
+case 8:return 21
+case 9:return 10
+case 10:return 11
+case 11:return 8
+case 12:return 14
+case 13:return"INVALID"}},rules:[/^(?:\s+)/,/^(?:(-?([0-9]|[1-9][0-9]+))(\.[0-9]+)?([eE][-+]?[0-9]+)?\b)/,/^(?:"(?:\\[\\"bfnrt/]|\\u[a-fA-F0-9]{4}|[^\\\0-\x09\x0a-\x1f"])*")/,/^(?:\{)/,/^(?:\})/,/^(?:\[)/,/^(?:\])/,/^(?:,)/,/^(?::)/,/^(?:true\b)/,/^(?:false\b)/,/^(?:null\b)/,/^(?:$)/,/^(?:.)/],conditions:{INITIAL:{rules:[0,1,2,3,4,5,6,7,8,9,10,11,12,13],inclusive:!0}}}
+return e}()
+return e.lexer=t,e}()
+"undefined"!=typeof require&&"undefined"!=typeof exports&&(exports.parser=jsonlint,exports.parse=function(){return jsonlint.parse.apply(jsonlint,arguments)},exports.main=function(e){if(!e[1])throw new Error("Usage: "+e[0]+" FILE")
+if("undefined"!=typeof process)var t=require("fs").readFileSync(require("path").join(process.cwd(),e[1]),"utf8")
+else t=require("file").path(require("file").cwd()).join(e[1]).read({charset:"utf-8"})
+return exports.parser.parse(t)},"undefined"!=typeof module&&require.main===module&&exports.main("undefined"!=typeof process?process.argv.slice(1):require("system").args)),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}((function(e){"use strict"
+function t(e,t,r){return/^(?:operator|sof|keyword c|case|new|[\[{}\(,;:]|=>)$/.test(t.lastType)||"quasi"==t.lastType&&/\{\s*$/.test(e.string.slice(0,e.pos-(r||0)))}e.defineMode("javascript",(function(r,n){var i,a,s=r.indentUnit,o=n.statementIndent,l=n.jsonld,c=n.json||l,u=n.typescript,f=n.wordCharacters||/[\w$\xa1-\uffff]/,h=function(){function e(e){return{type:e,style:"keyword"}}var t=e("keyword a"),r=e("keyword b"),n=e("keyword c"),i=e("operator"),a={type:"atom",style:"atom"},s={if:e("if"),while:t,with:t,else:r,do:r,try:r,finally:r,return:n,break:n,continue:n,new:e("new"),delete:n,throw:n,debugger:n,var:e("var"),const:e("var"),let:e("var"),function:e("function"),catch:e("catch"),for:e("for"),switch:e("switch"),case:e("case"),default:e("default"),in:i,typeof:i,instanceof:i,true:a,false:a,null:a,undefined:a,NaN:a,Infinity:a,this:e("this"),class:e("class"),super:e("atom"),yield:n,export:e("export"),import:e("import"),extends:n,await:n,async:e("async")}
+if(u){var o={type:"variable",style:"variable-3"},l={interface:e("class"),implements:n,namespace:n,module:e("module"),enum:e("module"),public:e("modifier"),private:e("modifier"),protected:e("modifier"),abstract:e("modifier"),as:i,string:o,number:o,boolean:o,any:o}
+for(var c in l)s[c]=l[c]}return s}(),p=/[+\-*&%=<>!?|~^]/,d=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/
+function y(e,t,r){return i=e,a=r,t}function m(e,r){var n,i=e.next()
+if('"'==i||"'"==i)return r.tokenize=(n=i,function(e,t){var r,i=!1
+if(l&&"@"==e.peek()&&e.match(d))return t.tokenize=m,y("jsonld-keyword","meta")
+for(;null!=(r=e.next())&&(r!=n||i);)i=!i&&"\\"==r
+return i||(t.tokenize=m),y("string","string")}),r.tokenize(e,r)
+if("."==i&&e.match(/^\d+(?:[eE][+\-]?\d+)?/))return y("number","number")
+if("."==i&&e.match(".."))return y("spread","meta")
+if(/[\[\]{}\(\),;\:\.]/.test(i))return y(i)
+if("="==i&&e.eat(">"))return y("=>","operator")
+if("0"==i&&e.eat(/x/i))return e.eatWhile(/[\da-f]/i),y("number","number")
+if("0"==i&&e.eat(/o/i))return e.eatWhile(/[0-7]/i),y("number","number")
+if("0"==i&&e.eat(/b/i))return e.eatWhile(/[01]/i),y("number","number")
+if(/\d/.test(i))return e.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/),y("number","number")
+if("/"==i)return e.eat("*")?(r.tokenize=v,v(e,r)):e.eat("/")?(e.skipToEnd(),y("comment","comment")):t(e,r,1)?(function(e){for(var t,r=!1,n=!1;null!=(t=e.next());){if(!r){if("/"==t&&!n)return
+"["==t?n=!0:n&&"]"==t&&(n=!1)}r=!r&&"\\"==t}}(e),e.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/),y("regexp","string-2")):(e.eatWhile(p),y("operator","operator",e.current()))
+if("`"==i)return r.tokenize=g,g(e,r)
+if("#"==i)return e.skipToEnd(),y("error","error")
+if(p.test(i))return e.eatWhile(p),y("operator","operator",e.current())
+if(f.test(i)){e.eatWhile(f)
+var a=e.current(),s=h.propertyIsEnumerable(a)&&h[a]
+return s&&"."!=r.lastType?y(s.type,s.style,a):y("variable","variable",a)}}function v(e,t){for(var r,n=!1;r=e.next();){if("/"==r&&n){t.tokenize=m
+break}n="*"==r}return y("comment","comment")}function g(e,t){for(var r,n=!1;null!=(r=e.next());){if(!n&&("`"==r||"$"==r&&e.eat("{"))){t.tokenize=m
+break}n=!n&&"\\"==r}return y("quasi","string-2",e.current())}function b(e,t){t.fatArrowAt&&(t.fatArrowAt=null)
+var r=e.string.indexOf("=>",e.start)
+if(!(r<0)){for(var n=0,i=!1,a=r-1;a>=0;--a){var s=e.string.charAt(a),o="([{}])".indexOf(s)
+if(o>=0&&o<3){if(!n){++a
+break}if(0==--n)break}else if(o>=3&&o<6)++n
+else if(f.test(s))i=!0
+else{if(/["'\/]/.test(s))return
+if(i&&!n){++a
+break}}}i&&!n&&(t.fatArrowAt=a)}}var x={atom:!0,number:!0,variable:!0,string:!0,regexp:!0,this:!0,"jsonld-keyword":!0}
+function k(e,t,r,n,i,a){this.indented=e,this.column=t,this.type=r,this.prev=i,this.info=a,null!=n&&(this.align=n)}function w(e,t){for(var r=e.localVars;r;r=r.next)if(r.name==t)return!0
+for(var n=e.context;n;n=n.prev)for(r=n.vars;r;r=r.next)if(r.name==t)return!0}var _={state:null,column:null,marked:null,cc:null}
+function E(){for(var e=arguments.length-1;e>=0;e--)_.cc.push(arguments[e])}function j(){return E.apply(null,arguments),!0}function S(e){function t(t){for(var r=t;r;r=r.next)if(r.name==e)return!0
+return!1}var r=_.state
+if(_.marked="def",r.context){if(t(r.localVars))return
+r.localVars={name:e,next:r.localVars}}else{if(t(r.globalVars))return
+n.globalVars&&(r.globalVars={name:e,next:r.globalVars})}}var I={name:"this",next:{name:"arguments"}}
+function $(){_.state.context={prev:_.state.context,vars:_.state.localVars},_.state.localVars=I}function A(){_.state.localVars=_.state.context.vars,_.state.context=_.state.context.prev}function M(e,t){var r=function(){var r=_.state,n=r.indented
+if("stat"==r.lexical.type)n=r.lexical.indented
+else for(var i=r.lexical;i&&")"==i.type&&i.align;i=i.prev)n=i.indented
+r.lexical=new k(n,_.stream.column(),e,null,r.lexical,t)}
+return r.lex=!0,r}function N(){var e=_.state
+e.lexical.prev&&(")"==e.lexical.type&&(e.indented=e.lexical.indented),e.lexical=e.lexical.prev)}function O(e){return function t(r){return r==e?j():";"==e?E():j(t)}}function V(e,t){return"var"==e?j(M("vardef",t.length),ae,O(";"),N):"keyword a"==e?j(M("form"),T,V,N):"keyword b"==e?j(M("form"),V,N):"{"==e?j(M("}"),ee,N):";"==e?j():"if"==e?("else"==_.state.lexical.info&&_.state.cc[_.state.cc.length-1]==N&&_.state.cc.pop()(),j(M("form"),T,V,N,ue)):"function"==e?j(me):"for"==e?j(M("form"),fe,V,N):"variable"==e?j(M("stat"),D):"switch"==e?j(M("form"),T,M("}","switch"),O("{"),ee,N,N):"case"==e?j(T,O(":")):"default"==e?j(O(":")):"catch"==e?j(M("form"),$,O("("),ve,O(")"),V,N,A):"class"==e?j(M("form"),ge,N):"export"==e?j(M("stat"),we,N):"import"==e?j(M("stat"),_e,N):"module"==e?j(M("form"),se,M("}"),O("{"),ee,N,N):"async"==e?j(V):E(M("stat"),T,O(";"),N)}function T(e){return L(e,!1)}function z(e){return L(e,!0)}function L(e,t){if(_.state.fatArrowAt==_.stream.start){var r=t?W:C
+if("("==e)return j($,M(")"),Y(se,")"),N,O("=>"),r,A)
+if("variable"==e)return E($,se,O("=>"),r,A)}var n=t?F:J
+return x.hasOwnProperty(e)?j(n):"function"==e?j(me,n):"keyword c"==e?j(t?P:q):"("==e?j(M(")"),q,Ae,O(")"),N,n):"operator"==e||"spread"==e?j(t?z:T):"["==e?j(M("]"),Ie,N,n):"{"==e?Z(K,"}",null,n):"quasi"==e?E(U,n):"new"==e?j(function(e){return function(t){return"."==t?j(e?G:B):E(e?z:T)}}(t)):j()}function q(e){return e.match(/[;\}\)\],]/)?E():E(T)}function P(e){return e.match(/[;\}\)\],]/)?E():E(z)}function J(e,t){return","==e?j(T):F(e,t,!1)}function F(e,t,r){var n=0==r?J:F,i=0==r?T:z
+return"=>"==e?j($,r?W:C,A):"operator"==e?/\+\+|--/.test(t)?j(n):"?"==t?j(T,O(":"),i):j(i):"quasi"==e?E(U,n):";"!=e?"("==e?Z(z,")","call",n):"."==e?j(H,n):"["==e?j(M("]"),q,O("]"),N,n):void 0:void 0}function U(e,t){return"quasi"!=e?E():"${"!=t.slice(t.length-2)?j(U):j(T,R)}function R(e){if("}"==e)return _.marked="string-2",_.state.tokenize=g,j(U)}function C(e){return b(_.stream,_.state),E("{"==e?V:T)}function W(e){return b(_.stream,_.state),E("{"==e?V:z)}function B(e,t){if("target"==t)return _.marked="keyword",j(J)}function G(e,t){if("target"==t)return _.marked="keyword",j(F)}function D(e){return":"==e?j(N,V):E(J,O(";"),N)}function H(e){if("variable"==e)return _.marked="property",j()}function K(e,t){return"variable"==e||"keyword"==_.style?(_.marked="property",j("get"==t||"set"==t?Q:X)):"number"==e||"string"==e?(_.marked=l?"property":_.style+" property",j(X)):"jsonld-keyword"==e?j(X):"modifier"==e?j(K):"["==e?j(T,O("]"),X):"spread"==e?j(T):void 0}function Q(e){return"variable"!=e?E(X):(_.marked="property",j(me))}function X(e){return":"==e?j(z):"("==e?E(me):void 0}function Y(e,t){function r(n,i){if(","==n){var a=_.state.lexical
+return"call"==a.info&&(a.pos=(a.pos||0)+1),j(e,r)}return n==t||i==t?j():j(O(t))}return function(n,i){return n==t||i==t?j():E(e,r)}}function Z(e,t,r){for(var n=3;n<arguments.length;n++)_.cc.push(arguments[n])
+return j(M(t,r),Y(e,t),N)}function ee(e){return"}"==e?j():E(V,ee)}function te(e){if(u&&":"==e)return j(ne)}function re(e,t){if("="==t)return j(z)}function ne(e){if("variable"==e)return _.marked="variable-3",j(ie)}function ie(e,t){return"<"==t?j(Y(ne,">"),ie):"["==e?j(O("]"),ie):void 0}function ae(){return E(se,te,le,ce)}function se(e,t){return"modifier"==e?j(se):"variable"==e?(S(t),j()):"spread"==e?j(se):"["==e?Z(se,"]"):"{"==e?Z(oe,"}"):void 0}function oe(e,t){return"variable"!=e||_.stream.match(/^\s*:/,!1)?("variable"==e&&(_.marked="property"),"spread"==e?j(se):"}"==e?E():j(O(":"),se,le)):(S(t),j(le))}function le(e,t){if("="==t)return j(z)}function ce(e){if(","==e)return j(ae)}function ue(e,t){if("keyword b"==e&&"else"==t)return j(M("form","else"),V,N)}function fe(e){if("("==e)return j(M(")"),he,O(")"),N)}function he(e){return"var"==e?j(ae,O(";"),de):";"==e?j(de):"variable"==e?j(pe):E(T,O(";"),de)}function pe(e,t){return"in"==t||"of"==t?(_.marked="keyword",j(T)):j(J,de)}function de(e,t){return";"==e?j(ye):"in"==t||"of"==t?(_.marked="keyword",j(T)):E(T,O(";"),ye)}function ye(e){")"!=e&&j(T)}function me(e,t){return"*"==t?(_.marked="keyword",j(me)):"variable"==e?(S(t),j(me)):"("==e?j($,M(")"),Y(ve,")"),N,te,V,A):void 0}function ve(e){return"spread"==e?j(ve):E(se,te,re)}function ge(e,t){if("variable"==e)return S(t),j(be)}function be(e,t){return"extends"==t?j(T,be):"{"==e?j(M("}"),xe,N):void 0}function xe(e,t){return"variable"==e||"keyword"==_.style?"static"==t?(_.marked="keyword",j(xe)):(_.marked="property","get"==t||"set"==t?j(ke,me,xe):j(me,xe)):"*"==t?(_.marked="keyword",j(xe)):";"==e?j(xe):"}"==e?j():void 0}function ke(e){return"variable"!=e?E():(_.marked="property",j())}function we(e,t){return"*"==t?(_.marked="keyword",j(Se,O(";"))):"default"==t?(_.marked="keyword",j(T,O(";"))):E(V)}function _e(e){return"string"==e?j():E(Ee,Se)}function Ee(e,t){return"{"==e?Z(Ee,"}"):("variable"==e&&S(t),"*"==t&&(_.marked="keyword"),j(je))}function je(e,t){if("as"==t)return _.marked="keyword",j(Ee)}function Se(e,t){if("from"==t)return _.marked="keyword",j(T)}function Ie(e){return"]"==e?j():E(z,$e)}function $e(e){return"for"==e?E(Ae,O("]")):","==e?j(Y(P,"]")):E(Y(z,"]"))}function Ae(e){return"for"==e?j(fe,Ae):"if"==e?j(T,Ae):void 0}return N.lex=!0,{startState:function(e){var t={tokenize:m,lastType:"sof",cc:[],lexical:new k((e||0)-s,0,"block",!1),localVars:n.localVars,context:n.localVars&&{vars:n.localVars},indented:e||0}
+return n.globalVars&&"object"==typeof n.globalVars&&(t.globalVars=n.globalVars),t},token:function(e,t){if(e.sol()&&(t.lexical.hasOwnProperty("align")||(t.lexical.align=!1),t.indented=e.indentation(),b(e,t)),t.tokenize!=v&&e.eatSpace())return null
+var r=t.tokenize(e,t)
+return"comment"==i?r:(t.lastType="operator"!=i||"++"!=a&&"--"!=a?i:"incdec",function(e,t,r,n,i){var a=e.cc
+for(_.state=e,_.stream=i,_.marked=null,_.cc=a,_.style=t,e.lexical.hasOwnProperty("align")||(e.lexical.align=!0);;){if((a.length?a.pop():c?T:V)(r,n)){for(;a.length&&a[a.length-1].lex;)a.pop()()
+return _.marked?_.marked:"variable"==r&&w(e,n)?"variable-2":t}}}(t,r,i,a,e))},indent:function(t,r){if(t.tokenize==v)return e.Pass
+if(t.tokenize!=m)return 0
+var i=r&&r.charAt(0),a=t.lexical
+if(!/^\s*else\b/.test(r))for(var l=t.cc.length-1;l>=0;--l){var c=t.cc[l]
+if(c==N)a=a.prev
+else if(c!=ue)break}"stat"==a.type&&"}"==i&&(a=a.prev),o&&")"==a.type&&"stat"==a.prev.type&&(a=a.prev)
+var u=a.type,f=i==u
+return"vardef"==u?a.indented+("operator"==t.lastType||","==t.lastType?a.info+1:0):"form"==u&&"{"==i?a.indented:"form"==u?a.indented+s:"stat"==u?a.indented+(function(e,t){return"operator"==e.lastType||","==e.lastType||p.test(t.charAt(0))||/[,.]/.test(t.charAt(0))}(t,r)?o||s:0):"switch"!=a.info||f||0==n.doubleIndentSwitch?a.align?a.column+(f?0:1):a.indented+(f?0:s):a.indented+(/^(?:case|default)\b/.test(r)?s:2*s)},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,blockCommentStart:c?null:"/*",blockCommentEnd:c?null:"*/",lineComment:c?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:c?"json":"javascript",jsonldMode:l,jsonMode:c,expressionAllowed:t,skipExpression:function(e){var t=e.cc[e.cc.length-1]
+t!=T&&t!=z||e.cc.pop()}}})),e.registerHelper("wordChars","javascript",/[\w$]/),e.defineMIME("text/javascript","javascript"),e.defineMIME("text/ecmascript","javascript"),e.defineMIME("application/javascript","javascript"),e.defineMIME("application/x-javascript","javascript"),e.defineMIME("application/ecmascript","javascript"),e.defineMIME("application/json",{name:"javascript",json:!0}),e.defineMIME("application/x-json",{name:"javascript",json:!0}),e.defineMIME("application/ld+json",{name:"javascript",jsonld:!0}),e.defineMIME("text/typescript",{name:"javascript",typescript:!0}),e.defineMIME("application/typescript",{name:"javascript",typescript:!0})}))
diff --git a/agent/uiserver/dist/assets/codemirror/mode/javascript/javascript-a5e5d64b0f9ff6b6e21f5f48aa1ef464.js b/agent/uiserver/dist/assets/codemirror/mode/javascript/javascript-a5e5d64b0f9ff6b6e21f5f48aa1ef464.js
deleted file mode 100644
index 4da59f70de85c..0000000000000
--- a/agent/uiserver/dist/assets/codemirror/mode/javascript/javascript-a5e5d64b0f9ff6b6e21f5f48aa1ef464.js
+++ /dev/null
@@ -1,136 +0,0 @@
-var jsonlint=function(){var e={trace:function(){},yy:{},symbols_:{error:2,JSONString:3,STRING:4,JSONNumber:5,NUMBER:6,JSONNullLiteral:7,NULL:8,JSONBooleanLiteral:9,TRUE:10,FALSE:11,JSONText:12,JSONValue:13,EOF:14,JSONObject:15,JSONArray:16,"{":17,"}":18,JSONMemberList:19,JSONMember:20,":":21,",":22,"[":23,"]":24,JSONElementList:25,$accept:0,$end:1},terminals_:{2:"error",4:"STRING",6:"NUMBER",8:"NULL",10:"TRUE",11:"FALSE",14:"EOF",17:"{",18:"}",21:":",22:",",23:"[",24:"]"},productions_:[0,[3,1],[5,1],[7,1],[9,1],[9,1],[12,2],[13,1],[13,1],[13,1],[13,1],[13,1],[13,1],[15,2],[15,3],[20,3],[19,1],[19,3],[16,2],[16,3],[25,1],[25,3]],performAction:function(e,t,r,n,i,a,s){var o=a.length-1
-switch(i){case 1:this.$=e.replace(/\\(\\|")/g,"$1").replace(/\\n/g,"\n").replace(/\\r/g,"\r").replace(/\\t/g,"\t").replace(/\\v/g,"\v").replace(/\\f/g,"\f").replace(/\\b/g,"\b")
-break
-case 2:this.$=Number(e)
-break
-case 3:this.$=null
-break
-case 4:this.$=!0
-break
-case 5:this.$=!1
-break
-case 6:return this.$=a[o-1]
-case 13:this.$={}
-break
-case 14:case 19:this.$=a[o-1]
-break
-case 15:this.$=[a[o-2],a[o]]
-break
-case 16:this.$={},this.$[a[o][0]]=a[o][1]
-break
-case 17:this.$=a[o-2],a[o-2][a[o][0]]=a[o][1]
-break
-case 18:this.$=[]
-break
-case 20:this.$=[a[o]]
-break
-case 21:this.$=a[o-2],a[o-2].push(a[o])}},table:[{3:5,4:[1,12],5:6,6:[1,13],7:3,8:[1,9],9:4,10:[1,10],11:[1,11],12:1,13:2,15:7,16:8,17:[1,14],23:[1,15]},{1:[3]},{14:[1,16]},{14:[2,7],18:[2,7],22:[2,7],24:[2,7]},{14:[2,8],18:[2,8],22:[2,8],24:[2,8]},{14:[2,9],18:[2,9],22:[2,9],24:[2,9]},{14:[2,10],18:[2,10],22:[2,10],24:[2,10]},{14:[2,11],18:[2,11],22:[2,11],24:[2,11]},{14:[2,12],18:[2,12],22:[2,12],24:[2,12]},{14:[2,3],18:[2,3],22:[2,3],24:[2,3]},{14:[2,4],18:[2,4],22:[2,4],24:[2,4]},{14:[2,5],18:[2,5],22:[2,5],24:[2,5]},{14:[2,1],18:[2,1],21:[2,1],22:[2,1],24:[2,1]},{14:[2,2],18:[2,2],22:[2,2],24:[2,2]},{3:20,4:[1,12],18:[1,17],19:18,20:19},{3:5,4:[1,12],5:6,6:[1,13],7:3,8:[1,9],9:4,10:[1,10],11:[1,11],13:23,15:7,16:8,17:[1,14],23:[1,15],24:[1,21],25:22},{1:[2,6]},{14:[2,13],18:[2,13],22:[2,13],24:[2,13]},{18:[1,24],22:[1,25]},{18:[2,16],22:[2,16]},{21:[1,26]},{14:[2,18],18:[2,18],22:[2,18],24:[2,18]},{22:[1,28],24:[1,27]},{22:[2,20],24:[2,20]},{14:[2,14],18:[2,14],22:[2,14],24:[2,14]},{3:20,4:[1,12],20:29},{3:5,4:[1,12],5:6,6:[1,13],7:3,8:[1,9],9:4,10:[1,10],11:[1,11],13:30,15:7,16:8,17:[1,14],23:[1,15]},{14:[2,19],18:[2,19],22:[2,19],24:[2,19]},{3:5,4:[1,12],5:6,6:[1,13],7:3,8:[1,9],9:4,10:[1,10],11:[1,11],13:31,15:7,16:8,17:[1,14],23:[1,15]},{18:[2,17],22:[2,17]},{18:[2,15],22:[2,15]},{22:[2,21],24:[2,21]}],defaultActions:{16:[2,6]},parseError:function(e,t){throw new Error(e)},parse:function(e){var t=this,r=[0],n=[null],i=[],a=this.table,s="",o=0,l=0,c=0
-this.lexer.setInput(e),this.lexer.yy=this.yy,this.yy.lexer=this.lexer,void 0===this.lexer.yylloc&&(this.lexer.yylloc={})
-var u=this.lexer.yylloc
-function f(){var e
-return"number"!=typeof(e=t.lexer.lex()||1)&&(e=t.symbols_[e]||e),e}i.push(u),"function"==typeof this.yy.parseError&&(this.parseError=this.yy.parseError)
-for(var h,p,d,y,m,v,g,x,b,k,w={};;){if(d=r[r.length-1],this.defaultActions[d]?y=this.defaultActions[d]:(null==h&&(h=f()),y=a[d]&&a[d][h]),void 0===y||!y.length||!y[0]){if(!c){for(v in b=[],a[d])this.terminals_[v]&&v>2&&b.push("'"+this.terminals_[v]+"'")
-var _=""
-_=this.lexer.showPosition?"Parse error on line "+(o+1)+":\n"+this.lexer.showPosition()+"\nExpecting "+b.join(", ")+", got '"+this.terminals_[h]+"'":"Parse error on line "+(o+1)+": Unexpected "+(1==h?"end of input":"'"+(this.terminals_[h]||h)+"'"),this.parseError(_,{text:this.lexer.match,token:this.terminals_[h]||h,line:this.lexer.yylineno,loc:u,expected:b})}if(3==c){if(1==h)throw new Error(_||"Parsing halted.")
-l=this.lexer.yyleng,s=this.lexer.yytext,o=this.lexer.yylineno,u=this.lexer.yylloc,h=f()}for(;!(2..toString()in a[d]);){if(0==d)throw new Error(_||"Parsing halted.")
-k=1,r.length=r.length-2*k,n.length=n.length-k,i.length=i.length-k,d=r[r.length-1]}p=h,h=2,y=a[d=r[r.length-1]]&&a[d][2],c=3}if(y[0]instanceof Array&&y.length>1)throw new Error("Parse Error: multiple actions possible at state: "+d+", token: "+h)
-switch(y[0]){case 1:r.push(h),n.push(this.lexer.yytext),i.push(this.lexer.yylloc),r.push(y[1]),h=null,p?(h=p,p=null):(l=this.lexer.yyleng,s=this.lexer.yytext,o=this.lexer.yylineno,u=this.lexer.yylloc,c>0&&c--)
-break
-case 2:if(g=this.productions_[y[1]][1],w.$=n[n.length-g],w._$={first_line:i[i.length-(g||1)].first_line,last_line:i[i.length-1].last_line,first_column:i[i.length-(g||1)].first_column,last_column:i[i.length-1].last_column},void 0!==(m=this.performAction.call(w,s,l,o,this.yy,y[1],n,i)))return m
-g&&(r=r.slice(0,-1*g*2),n=n.slice(0,-1*g),i=i.slice(0,-1*g)),r.push(this.productions_[y[1]][0]),n.push(w.$),i.push(w._$),x=a[r[r.length-2]][r[r.length-1]],r.push(x)
-break
-case 3:return!0}}return!0}},t=function(){var e={EOF:1,parseError:function(e,t){if(!this.yy.parseError)throw new Error(e)
-this.yy.parseError(e,t)},setInput:function(e){return this._input=e,this._more=this._less=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this},input:function(){var e=this._input[0]
-return this.yytext+=e,this.yyleng++,this.match+=e,this.matched+=e,e.match(/\n/)&&this.yylineno++,this._input=this._input.slice(1),e},unput:function(e){return this._input=e+this._input,this},more:function(){return this._more=!0,this},less:function(e){this._input=this.match.slice(e)+this._input},pastInput:function(){var e=this.matched.substr(0,this.matched.length-this.match.length)
-return(e.length>20?"...":"")+e.substr(-20).replace(/\n/g,"")},upcomingInput:function(){var e=this.match
-return e.length<20&&(e+=this._input.substr(0,20-e.length)),(e.substr(0,20)+(e.length>20?"...":"")).replace(/\n/g,"")},showPosition:function(){var e=this.pastInput(),t=new Array(e.length+1).join("-")
-return e+this.upcomingInput()+"\n"+t+"^"},next:function(){if(this.done)return this.EOF
-var e,t,r,n,i
-this._input||(this.done=!0),this._more||(this.yytext="",this.match="")
-for(var a=this._currentRules(),s=0;s<a.length&&(!(r=this._input.match(this.rules[a[s]]))||t&&!(r[0].length>t[0].length)||(t=r,n=s,this.options.flex));s++);return t?((i=t[0].match(/\n.*/g))&&(this.yylineno+=i.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:i?i[i.length-1].length-1:this.yylloc.last_column+t[0].length},this.yytext+=t[0],this.match+=t[0],this.yyleng=this.yytext.length,this._more=!1,this._input=this._input.slice(t[0].length),this.matched+=t[0],e=this.performAction.call(this,this.yy,this,a[n],this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),e||void 0):""===this._input?this.EOF:void this.parseError("Lexical error on line "+(this.yylineno+1)+". Unrecognized text.\n"+this.showPosition(),{text:"",token:null,line:this.yylineno})},lex:function(){var e=this.next()
-return void 0!==e?e:this.lex()},begin:function(e){this.conditionStack.push(e)},popState:function(){return this.conditionStack.pop()},_currentRules:function(){return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules},topState:function(){return this.conditionStack[this.conditionStack.length-2]},pushState:function(e){this.begin(e)},options:{},performAction:function(e,t,r,n){switch(r){case 0:break
-case 1:return 6
-case 2:return t.yytext=t.yytext.substr(1,t.yyleng-2),4
-case 3:return 17
-case 4:return 18
-case 5:return 23
-case 6:return 24
-case 7:return 22
-case 8:return 21
-case 9:return 10
-case 10:return 11
-case 11:return 8
-case 12:return 14
-case 13:return"INVALID"}},rules:[/^(?:\s+)/,/^(?:(-?([0-9]|[1-9][0-9]+))(\.[0-9]+)?([eE][-+]?[0-9]+)?\b)/,/^(?:"(?:\\[\\"bfnrt/]|\\u[a-fA-F0-9]{4}|[^\\\0-\x09\x0a-\x1f"])*")/,/^(?:\{)/,/^(?:\})/,/^(?:\[)/,/^(?:\])/,/^(?:,)/,/^(?::)/,/^(?:true\b)/,/^(?:false\b)/,/^(?:null\b)/,/^(?:$)/,/^(?:.)/],conditions:{INITIAL:{rules:[0,1,2,3,4,5,6,7,8,9,10,11,12,13],inclusive:!0}}}
-return e}()
-return e.lexer=t,e}()
-"undefined"!=typeof require&&"undefined"!=typeof exports&&(exports.parser=jsonlint,exports.parse=function(){return jsonlint.parse.apply(jsonlint,arguments)},exports.main=function(e){if(!e[1])throw new Error("Usage: "+e[0]+" FILE")
-if("undefined"!=typeof process)var t=require("fs").readFileSync(require("path").join(process.cwd(),e[1]),"utf8")
-else t=require("file").path(require("file").cwd()).join(e[1]).read({charset:"utf-8"})
-return exports.parser.parse(t)},"undefined"!=typeof module&&require.main===module&&exports.main("undefined"!=typeof process?process.argv.slice(1):require("system").args)),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}((function(e){"use strict"
-function t(e,t,r){return/^(?:operator|sof|keyword c|case|new|[\[{}\(,;:]|=>)$/.test(t.lastType)||"quasi"==t.lastType&&/\{\s*$/.test(e.string.slice(0,e.pos-(r||0)))}e.defineMode("javascript",(function(r,n){var i,a,s=r.indentUnit,o=n.statementIndent,l=n.jsonld,c=n.json||l,u=n.typescript,f=n.wordCharacters||/[\w$\xa1-\uffff]/,h=function(){function e(e){return{type:e,style:"keyword"}}var t=e("keyword a"),r=e("keyword b"),n=e("keyword c"),i=e("operator"),a={type:"atom",style:"atom"},s={if:e("if"),while:t,with:t,else:r,do:r,try:r,finally:r,return:n,break:n,continue:n,new:e("new"),delete:n,throw:n,debugger:n,var:e("var"),const:e("var"),let:e("var"),function:e("function"),catch:e("catch"),for:e("for"),switch:e("switch"),case:e("case"),default:e("default"),in:i,typeof:i,instanceof:i,true:a,false:a,null:a,undefined:a,NaN:a,Infinity:a,this:e("this"),class:e("class"),super:e("atom"),yield:n,export:e("export"),import:e("import"),extends:n,await:n,async:e("async")}
-if(u){var o={type:"variable",style:"variable-3"},l={interface:e("class"),implements:n,namespace:n,module:e("module"),enum:e("module"),public:e("modifier"),private:e("modifier"),protected:e("modifier"),abstract:e("modifier"),as:i,string:o,number:o,boolean:o,any:o}
-for(var c in l)s[c]=l[c]}return s}(),p=/[+\-*&%=<>!?|~^]/,d=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/
-function y(e,t,r){return i=e,a=r,t}function m(e,r){var n,i=e.next()
-if('"'==i||"'"==i)return r.tokenize=(n=i,function(e,t){var r,i=!1
-if(l&&"@"==e.peek()&&e.match(d))return t.tokenize=m,y("jsonld-keyword","meta")
-for(;null!=(r=e.next())&&(r!=n||i);)i=!i&&"\\"==r
-return i||(t.tokenize=m),y("string","string")}),r.tokenize(e,r)
-if("."==i&&e.match(/^\d+(?:[eE][+\-]?\d+)?/))return y("number","number")
-if("."==i&&e.match(".."))return y("spread","meta")
-if(/[\[\]{}\(\),;\:\.]/.test(i))return y(i)
-if("="==i&&e.eat(">"))return y("=>","operator")
-if("0"==i&&e.eat(/x/i))return e.eatWhile(/[\da-f]/i),y("number","number")
-if("0"==i&&e.eat(/o/i))return e.eatWhile(/[0-7]/i),y("number","number")
-if("0"==i&&e.eat(/b/i))return e.eatWhile(/[01]/i),y("number","number")
-if(/\d/.test(i))return e.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/),y("number","number")
-if("/"==i)return e.eat("*")?(r.tokenize=v,v(e,r)):e.eat("/")?(e.skipToEnd(),y("comment","comment")):t(e,r,1)?(function(e){for(var t,r=!1,n=!1;null!=(t=e.next());){if(!r){if("/"==t&&!n)return
-"["==t?n=!0:n&&"]"==t&&(n=!1)}r=!r&&"\\"==t}}(e),e.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/),y("regexp","string-2")):(e.eatWhile(p),y("operator","operator",e.current()))
-if("`"==i)return r.tokenize=g,g(e,r)
-if("#"==i)return e.skipToEnd(),y("error","error")
-if(p.test(i))return e.eatWhile(p),y("operator","operator",e.current())
-if(f.test(i)){e.eatWhile(f)
-var a=e.current(),s=h.propertyIsEnumerable(a)&&h[a]
-return s&&"."!=r.lastType?y(s.type,s.style,a):y("variable","variable",a)}}function v(e,t){for(var r,n=!1;r=e.next();){if("/"==r&&n){t.tokenize=m
-break}n="*"==r}return y("comment","comment")}function g(e,t){for(var r,n=!1;null!=(r=e.next());){if(!n&&("`"==r||"$"==r&&e.eat("{"))){t.tokenize=m
-break}n=!n&&"\\"==r}return y("quasi","string-2",e.current())}function x(e,t){t.fatArrowAt&&(t.fatArrowAt=null)
-var r=e.string.indexOf("=>",e.start)
-if(!(r<0)){for(var n=0,i=!1,a=r-1;a>=0;--a){var s=e.string.charAt(a),o="([{}])".indexOf(s)
-if(o>=0&&o<3){if(!n){++a
-break}if(0==--n)break}else if(o>=3&&o<6)++n
-else if(f.test(s))i=!0
-else{if(/["'\/]/.test(s))return
-if(i&&!n){++a
-break}}}i&&!n&&(t.fatArrowAt=a)}}var b={atom:!0,number:!0,variable:!0,string:!0,regexp:!0,this:!0,"jsonld-keyword":!0}
-function k(e,t,r,n,i,a){this.indented=e,this.column=t,this.type=r,this.prev=i,this.info=a,null!=n&&(this.align=n)}function w(e,t){for(var r=e.localVars;r;r=r.next)if(r.name==t)return!0
-for(var n=e.context;n;n=n.prev)for(r=n.vars;r;r=r.next)if(r.name==t)return!0}var _={state:null,column:null,marked:null,cc:null}
-function E(){for(var e=arguments.length-1;e>=0;e--)_.cc.push(arguments[e])}function j(){return E.apply(null,arguments),!0}function S(e){function t(t){for(var r=t;r;r=r.next)if(r.name==e)return!0
-return!1}var r=_.state
-if(_.marked="def",r.context){if(t(r.localVars))return
-r.localVars={name:e,next:r.localVars}}else{if(t(r.globalVars))return
-n.globalVars&&(r.globalVars={name:e,next:r.globalVars})}}var I={name:"this",next:{name:"arguments"}}
-function $(){_.state.context={prev:_.state.context,vars:_.state.localVars},_.state.localVars=I}function A(){_.state.localVars=_.state.context.vars,_.state.context=_.state.context.prev}function M(e,t){var r=function(){var r=_.state,n=r.indented
-if("stat"==r.lexical.type)n=r.lexical.indented
-else for(var i=r.lexical;i&&")"==i.type&&i.align;i=i.prev)n=i.indented
-r.lexical=new k(n,_.stream.column(),e,null,r.lexical,t)}
-return r.lex=!0,r}function N(){var e=_.state
-e.lexical.prev&&(")"==e.lexical.type&&(e.indented=e.lexical.indented),e.lexical=e.lexical.prev)}function O(e){return function t(r){return r==e?j():";"==e?E():j(t)}}function V(e,t){return"var"==e?j(M("vardef",t.length),ae,O(";"),N):"keyword a"==e?j(M("form"),T,V,N):"keyword b"==e?j(M("form"),V,N):"{"==e?j(M("}"),ee,N):";"==e?j():"if"==e?("else"==_.state.lexical.info&&_.state.cc[_.state.cc.length-1]==N&&_.state.cc.pop()(),j(M("form"),T,V,N,ue)):"function"==e?j(me):"for"==e?j(M("form"),fe,V,N):"variable"==e?j(M("stat"),D):"switch"==e?j(M("form"),T,M("}","switch"),O("{"),ee,N,N):"case"==e?j(T,O(":")):"default"==e?j(O(":")):"catch"==e?j(M("form"),$,O("("),ve,O(")"),V,N,A):"class"==e?j(M("form"),ge,N):"export"==e?j(M("stat"),we,N):"import"==e?j(M("stat"),_e,N):"module"==e?j(M("form"),se,M("}"),O("{"),ee,N,N):"async"==e?j(V):E(M("stat"),T,O(";"),N)}function T(e){return L(e,!1)}function z(e){return L(e,!0)}function L(e,t){if(_.state.fatArrowAt==_.stream.start){var r=t?W:C
-if("("==e)return j($,M(")"),Y(se,")"),N,O("=>"),r,A)
-if("variable"==e)return E($,se,O("=>"),r,A)}var n=t?F:J
-return b.hasOwnProperty(e)?j(n):"function"==e?j(me,n):"keyword c"==e?j(t?P:q):"("==e?j(M(")"),q,Ae,O(")"),N,n):"operator"==e||"spread"==e?j(t?z:T):"["==e?j(M("]"),Ie,N,n):"{"==e?Z(K,"}",null,n):"quasi"==e?E(U,n):"new"==e?j(function(e){return function(t){return"."==t?j(e?G:B):E(e?z:T)}}(t)):j()}function q(e){return e.match(/[;\}\)\],]/)?E():E(T)}function P(e){return e.match(/[;\}\)\],]/)?E():E(z)}function J(e,t){return","==e?j(T):F(e,t,!1)}function F(e,t,r){var n=0==r?J:F,i=0==r?T:z
-return"=>"==e?j($,r?W:C,A):"operator"==e?/\+\+|--/.test(t)?j(n):"?"==t?j(T,O(":"),i):j(i):"quasi"==e?E(U,n):";"!=e?"("==e?Z(z,")","call",n):"."==e?j(H,n):"["==e?j(M("]"),q,O("]"),N,n):void 0:void 0}function U(e,t){return"quasi"!=e?E():"${"!=t.slice(t.length-2)?j(U):j(T,R)}function R(e){if("}"==e)return _.marked="string-2",_.state.tokenize=g,j(U)}function C(e){return x(_.stream,_.state),E("{"==e?V:T)}function W(e){return x(_.stream,_.state),E("{"==e?V:z)}function B(e,t){if("target"==t)return _.marked="keyword",j(J)}function G(e,t){if("target"==t)return _.marked="keyword",j(F)}function D(e){return":"==e?j(N,V):E(J,O(";"),N)}function H(e){if("variable"==e)return _.marked="property",j()}function K(e,t){return"variable"==e||"keyword"==_.style?(_.marked="property",j("get"==t||"set"==t?Q:X)):"number"==e||"string"==e?(_.marked=l?"property":_.style+" property",j(X)):"jsonld-keyword"==e?j(X):"modifier"==e?j(K):"["==e?j(T,O("]"),X):"spread"==e?j(T):void 0}function Q(e){return"variable"!=e?E(X):(_.marked="property",j(me))}function X(e){return":"==e?j(z):"("==e?E(me):void 0}function Y(e,t){function r(n,i){if(","==n){var a=_.state.lexical
-return"call"==a.info&&(a.pos=(a.pos||0)+1),j(e,r)}return n==t||i==t?j():j(O(t))}return function(n,i){return n==t||i==t?j():E(e,r)}}function Z(e,t,r){for(var n=3;n<arguments.length;n++)_.cc.push(arguments[n])
-return j(M(t,r),Y(e,t),N)}function ee(e){return"}"==e?j():E(V,ee)}function te(e){if(u&&":"==e)return j(ne)}function re(e,t){if("="==t)return j(z)}function ne(e){if("variable"==e)return _.marked="variable-3",j(ie)}function ie(e,t){return"<"==t?j(Y(ne,">"),ie):"["==e?j(O("]"),ie):void 0}function ae(){return E(se,te,le,ce)}function se(e,t){return"modifier"==e?j(se):"variable"==e?(S(t),j()):"spread"==e?j(se):"["==e?Z(se,"]"):"{"==e?Z(oe,"}"):void 0}function oe(e,t){return"variable"!=e||_.stream.match(/^\s*:/,!1)?("variable"==e&&(_.marked="property"),"spread"==e?j(se):"}"==e?E():j(O(":"),se,le)):(S(t),j(le))}function le(e,t){if("="==t)return j(z)}function ce(e){if(","==e)return j(ae)}function ue(e,t){if("keyword b"==e&&"else"==t)return j(M("form","else"),V,N)}function fe(e){if("("==e)return j(M(")"),he,O(")"),N)}function he(e){return"var"==e?j(ae,O(";"),de):";"==e?j(de):"variable"==e?j(pe):E(T,O(";"),de)}function pe(e,t){return"in"==t||"of"==t?(_.marked="keyword",j(T)):j(J,de)}function de(e,t){return";"==e?j(ye):"in"==t||"of"==t?(_.marked="keyword",j(T)):E(T,O(";"),ye)}function ye(e){")"!=e&&j(T)}function me(e,t){return"*"==t?(_.marked="keyword",j(me)):"variable"==e?(S(t),j(me)):"("==e?j($,M(")"),Y(ve,")"),N,te,V,A):void 0}function ve(e){return"spread"==e?j(ve):E(se,te,re)}function ge(e,t){if("variable"==e)return S(t),j(xe)}function xe(e,t){return"extends"==t?j(T,xe):"{"==e?j(M("}"),be,N):void 0}function be(e,t){return"variable"==e||"keyword"==_.style?"static"==t?(_.marked="keyword",j(be)):(_.marked="property","get"==t||"set"==t?j(ke,me,be):j(me,be)):"*"==t?(_.marked="keyword",j(be)):";"==e?j(be):"}"==e?j():void 0}function ke(e){return"variable"!=e?E():(_.marked="property",j())}function we(e,t){return"*"==t?(_.marked="keyword",j(Se,O(";"))):"default"==t?(_.marked="keyword",j(T,O(";"))):E(V)}function _e(e){return"string"==e?j():E(Ee,Se)}function Ee(e,t){return"{"==e?Z(Ee,"}"):("variable"==e&&S(t),"*"==t&&(_.marked="keyword"),j(je))}function je(e,t){if("as"==t)return _.marked="keyword",j(Ee)}function Se(e,t){if("from"==t)return _.marked="keyword",j(T)}function Ie(e){return"]"==e?j():E(z,$e)}function $e(e){return"for"==e?E(Ae,O("]")):","==e?j(Y(P,"]")):E(Y(z,"]"))}function Ae(e){return"for"==e?j(fe,Ae):"if"==e?j(T,Ae):void 0}return N.lex=!0,{startState:function(e){var t={tokenize:m,lastType:"sof",cc:[],lexical:new k((e||0)-s,0,"block",!1),localVars:n.localVars,context:n.localVars&&{vars:n.localVars},indented:e||0}
-return n.globalVars&&"object"==typeof n.globalVars&&(t.globalVars=n.globalVars),t},token:function(e,t){if(e.sol()&&(t.lexical.hasOwnProperty("align")||(t.lexical.align=!1),t.indented=e.indentation(),x(e,t)),t.tokenize!=v&&e.eatSpace())return null
-var r=t.tokenize(e,t)
-return"comment"==i?r:(t.lastType="operator"!=i||"++"!=a&&"--"!=a?i:"incdec",function(e,t,r,n,i){var a=e.cc
-for(_.state=e,_.stream=i,_.marked=null,_.cc=a,_.style=t,e.lexical.hasOwnProperty("align")||(e.lexical.align=!0);;)if((a.length?a.pop():c?T:V)(r,n)){for(;a.length&&a[a.length-1].lex;)a.pop()()
-return _.marked?_.marked:"variable"==r&&w(e,n)?"variable-2":t}}(t,r,i,a,e))},indent:function(t,r){if(t.tokenize==v)return e.Pass
-if(t.tokenize!=m)return 0
-var i=r&&r.charAt(0),a=t.lexical
-if(!/^\s*else\b/.test(r))for(var l=t.cc.length-1;l>=0;--l){var c=t.cc[l]
-if(c==N)a=a.prev
-else if(c!=ue)break}"stat"==a.type&&"}"==i&&(a=a.prev),o&&")"==a.type&&"stat"==a.prev.type&&(a=a.prev)
-var u=a.type,f=i==u
-return"vardef"==u?a.indented+("operator"==t.lastType||","==t.lastType?a.info+1:0):"form"==u&&"{"==i?a.indented:"form"==u?a.indented+s:"stat"==u?a.indented+(function(e,t){return"operator"==e.lastType||","==e.lastType||p.test(t.charAt(0))||/[,.]/.test(t.charAt(0))}(t,r)?o||s:0):"switch"!=a.info||f||0==n.doubleIndentSwitch?a.align?a.column+(f?0:1):a.indented+(f?0:s):a.indented+(/^(?:case|default)\b/.test(r)?s:2*s)},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,blockCommentStart:c?null:"/*",blockCommentEnd:c?null:"*/",lineComment:c?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:c?"json":"javascript",jsonldMode:l,jsonMode:c,expressionAllowed:t,skipExpression:function(e){var t=e.cc[e.cc.length-1]
-t!=T&&t!=z||e.cc.pop()}}})),e.registerHelper("wordChars","javascript",/[\w$]/),e.defineMIME("text/javascript","javascript"),e.defineMIME("text/ecmascript","javascript"),e.defineMIME("application/javascript","javascript"),e.defineMIME("application/x-javascript","javascript"),e.defineMIME("application/ecmascript","javascript"),e.defineMIME("application/json",{name:"javascript",json:!0}),e.defineMIME("application/x-json",{name:"javascript",json:!0}),e.defineMIME("application/ld+json",{name:"javascript",jsonld:!0}),e.defineMIME("text/typescript",{name:"javascript",typescript:!0}),e.defineMIME("application/typescript",{name:"javascript",typescript:!0})}))
diff --git a/agent/uiserver/dist/assets/codemirror/mode/ruby/ruby-2b9a2a4b4d14d9fa6f6edcda84a260e6.js b/agent/uiserver/dist/assets/codemirror/mode/ruby/ruby-ea43ca3a3bdd63a52811e8464d66134b.js
similarity index 100%
rename from agent/uiserver/dist/assets/codemirror/mode/ruby/ruby-2b9a2a4b4d14d9fa6f6edcda84a260e6.js
rename to agent/uiserver/dist/assets/codemirror/mode/ruby/ruby-ea43ca3a3bdd63a52811e8464d66134b.js
diff --git a/agent/uiserver/dist/assets/codemirror/mode/xml/xml-10ec8b8cc61ef0fbd25b27a599fdcd60.js b/agent/uiserver/dist/assets/codemirror/mode/xml/xml-10ec8b8cc61ef0fbd25b27a599fdcd60.js
new file mode 100644
index 0000000000000..74180b6c48159
--- /dev/null
+++ b/agent/uiserver/dist/assets/codemirror/mode/xml/xml-10ec8b8cc61ef0fbd25b27a599fdcd60.js
@@ -0,0 +1,37 @@
+(function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],t):t(CodeMirror)})((function(t){"use strict"
+var e={autoSelfClosers:{area:!0,base:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,menuitem:!0},implicitlyClosed:{dd:!0,li:!0,optgroup:!0,option:!0,p:!0,rp:!0,rt:!0,tbody:!0,td:!0,tfoot:!0,th:!0,tr:!0},contextGrabbers:{dd:{dd:!0,dt:!0},dt:{dd:!0,dt:!0},li:{li:!0},option:{option:!0,optgroup:!0},optgroup:{optgroup:!0},p:{address:!0,article:!0,aside:!0,blockquote:!0,dir:!0,div:!0,dl:!0,fieldset:!0,footer:!0,form:!0,h1:!0,h2:!0,h3:!0,h4:!0,h5:!0,h6:!0,header:!0,hgroup:!0,hr:!0,menu:!0,nav:!0,ol:!0,p:!0,pre:!0,section:!0,table:!0,ul:!0},rp:{rp:!0,rt:!0},rt:{rp:!0,rt:!0},tbody:{tbody:!0,tfoot:!0},td:{td:!0,th:!0},tfoot:{tbody:!0},th:{td:!0,th:!0},thead:{tbody:!0,tfoot:!0},tr:{tr:!0}},doNotIndent:{pre:!0},allowUnquoted:!0,allowMissing:!0,caseFold:!0},n={autoSelfClosers:{},implicitlyClosed:{},contextGrabbers:{},doNotIndent:{},allowUnquoted:!1,allowMissing:!1,caseFold:!1}
+t.defineMode("xml",(function(r,o){var a,i,l=r.indentUnit,u={},d=o.htmlMode?e:n
+for(var c in d)u[c]=d[c]
+for(var c in o)u[c]=o[c]
+function s(t,e){function n(n){return e.tokenize=n,n(t,e)}var r=t.next()
+return"<"==r?t.eat("!")?t.eat("[")?t.match("CDATA[")?n(m("atom","]]>")):null:t.match("--")?n(m("comment","--\x3e")):t.match("DOCTYPE",!0,!0)?(t.eatWhile(/[\w\._\-]/),n(function t(e){return function(n,r){for(var o;null!=(o=n.next());){if("<"==o)return r.tokenize=t(e+1),r.tokenize(n,r)
+if(">"==o){if(1==e){r.tokenize=s
+break}return r.tokenize=t(e-1),r.tokenize(n,r)}}return"meta"}}(1))):null:t.eat("?")?(t.eatWhile(/[\w\._\-]/),e.tokenize=m("meta","?>"),"meta"):(a=t.eat("/")?"closeTag":"openTag",e.tokenize=f,"tag bracket"):"&"==r?(t.eat("#")?t.eat("x")?t.eatWhile(/[a-fA-F\d]/)&&t.eat(";"):t.eatWhile(/[\d]/)&&t.eat(";"):t.eatWhile(/[\w\.\-:]/)&&t.eat(";"))?"atom":"error":(t.eatWhile(/[^&<]/),null)}function f(t,e){var n,r,o=t.next()
+if(">"==o||"/"==o&&t.eat(">"))return e.tokenize=s,a=">"==o?"endTag":"selfcloseTag","tag bracket"
+if("="==o)return a="equals",null
+if("<"==o){e.tokenize=s,e.state=x,e.tagName=e.tagStart=null
+var i=e.tokenize(t,e)
+return i?i+" tag error":"tag error"}return/[\'\"]/.test(o)?(e.tokenize=(n=o,(r=function(t,e){for(;!t.eol();)if(t.next()==n){e.tokenize=f
+break}return"string"}).isInAttribute=!0,r),e.stringStartCol=t.column(),e.tokenize(t,e)):(t.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/),"word")}function m(t,e){return function(n,r){for(;!n.eol();){if(n.match(e)){r.tokenize=s
+break}n.next()}return t}}function g(t,e,n){this.prev=t.context,this.tagName=e,this.indent=t.indented,this.startOfLine=n,(u.doNotIndent.hasOwnProperty(e)||t.context&&t.context.noIndent)&&(this.noIndent=!0)}function p(t){t.context&&(t.context=t.context.prev)}function h(t,e){for(var n;;){if(!t.context)return
+if(n=t.context.tagName,!u.contextGrabbers.hasOwnProperty(n)||!u.contextGrabbers[n].hasOwnProperty(e))return
+p(t)}}function x(t,e,n){return"openTag"==t?(n.tagStart=e.column(),b):"closeTag"==t?k:x}function b(t,e,n){return"word"==t?(n.tagName=e.current(),i="tag",y):(i="error",b)}function k(t,e,n){if("word"==t){var r=e.current()
+return n.context&&n.context.tagName!=r&&u.implicitlyClosed.hasOwnProperty(n.context.tagName)&&p(n),n.context&&n.context.tagName==r||!1===u.matchClosing?(i="tag",w):(i="tag error",v)}return i="error",v}function w(t,e,n){return"endTag"!=t?(i="error",w):(p(n),x)}function v(t,e,n){return i="error",w(t,0,n)}function y(t,e,n){if("word"==t)return i="attribute",z
+if("endTag"==t||"selfcloseTag"==t){var r=n.tagName,o=n.tagStart
+return n.tagName=n.tagStart=null,"selfcloseTag"==t||u.autoSelfClosers.hasOwnProperty(r)?h(n,r):(h(n,r),n.context=new g(n,r,o==n.indented)),x}return i="error",y}function z(t,e,n){return"equals"==t?N:(u.allowMissing||(i="error"),y(t,0,n))}function N(t,e,n){return"string"==t?T:"word"==t&&u.allowUnquoted?(i="string",y):(i="error",y(t,0,n))}function T(t,e,n){return"string"==t?T:y(t,0,n)}return s.isInText=!0,{startState:function(t){var e={tokenize:s,state:x,indented:t||0,tagName:null,tagStart:null,context:null}
+return null!=t&&(e.baseIndent=t),e},token:function(t,e){if(!e.tagName&&t.sol()&&(e.indented=t.indentation()),t.eatSpace())return null
+a=null
+var n=e.tokenize(t,e)
+return(n||a)&&"comment"!=n&&(i=null,e.state=e.state(a||n,t,e),i&&(n="error"==i?n+" error":i)),n},indent:function(e,n,r){var o=e.context
+if(e.tokenize.isInAttribute)return e.tagStart==e.indented?e.stringStartCol+1:e.indented+l
+if(o&&o.noIndent)return t.Pass
+if(e.tokenize!=f&&e.tokenize!=s)return r?r.match(/^(\s*)/)[0].length:0
+if(e.tagName)return!1!==u.multilineTagIndentPastTag?e.tagStart+e.tagName.length+2:e.tagStart+l*(u.multilineTagIndentFactor||1)
+if(u.alignCDATA&&/<!\[CDATA\[/.test(n))return 0
+var a=n&&/^<(\/)?([\w_:\.-]*)/.exec(n)
+if(a&&a[1])for(;o;){if(o.tagName==a[2]){o=o.prev
+break}if(!u.implicitlyClosed.hasOwnProperty(o.tagName))break
+o=o.prev}else if(a)for(;o;){var i=u.contextGrabbers[o.tagName]
+if(!i||!i.hasOwnProperty(a[2]))break
+o=o.prev}for(;o&&o.prev&&!o.startOfLine;)o=o.prev
+return o?o.indent+l:e.baseIndent||0},electricInput:/<\/[\s\w:]+>$/,blockCommentStart:"\x3c!--",blockCommentEnd:"--\x3e",configuration:u.htmlMode?"html":"xml",helperType:u.htmlMode?"html":"xml",skipAttribute:function(t){t.state==N&&(t.state=y)}}})),t.defineMIME("text/xml","xml"),t.defineMIME("application/xml","xml"),t.mimeModes.hasOwnProperty("text/html")||t.defineMIME("text/html",{name:"xml",htmlMode:!0})}))
diff --git a/agent/uiserver/dist/assets/codemirror/mode/xml/xml-80f64aaafa6af7844d14f32f3219bb26.js b/agent/uiserver/dist/assets/codemirror/mode/xml/xml-80f64aaafa6af7844d14f32f3219bb26.js
deleted file mode 100644
index 5e22e0e2c3233..0000000000000
--- a/agent/uiserver/dist/assets/codemirror/mode/xml/xml-80f64aaafa6af7844d14f32f3219bb26.js
+++ /dev/null
@@ -1,37 +0,0 @@
-(function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],t):t(CodeMirror)})((function(t){"use strict"
-var e={autoSelfClosers:{area:!0,base:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,menuitem:!0},implicitlyClosed:{dd:!0,li:!0,optgroup:!0,option:!0,p:!0,rp:!0,rt:!0,tbody:!0,td:!0,tfoot:!0,th:!0,tr:!0},contextGrabbers:{dd:{dd:!0,dt:!0},dt:{dd:!0,dt:!0},li:{li:!0},option:{option:!0,optgroup:!0},optgroup:{optgroup:!0},p:{address:!0,article:!0,aside:!0,blockquote:!0,dir:!0,div:!0,dl:!0,fieldset:!0,footer:!0,form:!0,h1:!0,h2:!0,h3:!0,h4:!0,h5:!0,h6:!0,header:!0,hgroup:!0,hr:!0,menu:!0,nav:!0,ol:!0,p:!0,pre:!0,section:!0,table:!0,ul:!0},rp:{rp:!0,rt:!0},rt:{rp:!0,rt:!0},tbody:{tbody:!0,tfoot:!0},td:{td:!0,th:!0},tfoot:{tbody:!0},th:{td:!0,th:!0},thead:{tbody:!0,tfoot:!0},tr:{tr:!0}},doNotIndent:{pre:!0},allowUnquoted:!0,allowMissing:!0,caseFold:!0},n={autoSelfClosers:{},implicitlyClosed:{},contextGrabbers:{},doNotIndent:{},allowUnquoted:!1,allowMissing:!1,caseFold:!1}
-t.defineMode("xml",(function(r,o){var a,i,l=r.indentUnit,u={},d=o.htmlMode?e:n
-for(var c in d)u[c]=d[c]
-for(var c in o)u[c]=o[c]
-function s(t,e){function n(n){return e.tokenize=n,n(t,e)}var r=t.next()
-return"<"==r?t.eat("!")?t.eat("[")?t.match("CDATA[")?n(m("atom","]]>")):null:t.match("--")?n(m("comment","--\x3e")):t.match("DOCTYPE",!0,!0)?(t.eatWhile(/[\w\._\-]/),n(g(1))):null:t.eat("?")?(t.eatWhile(/[\w\._\-]/),e.tokenize=m("meta","?>"),"meta"):(a=t.eat("/")?"closeTag":"openTag",e.tokenize=f,"tag bracket"):"&"==r?(t.eat("#")?t.eat("x")?t.eatWhile(/[a-fA-F\d]/)&&t.eat(";"):t.eatWhile(/[\d]/)&&t.eat(";"):t.eatWhile(/[\w\.\-:]/)&&t.eat(";"))?"atom":"error":(t.eatWhile(/[^&<]/),null)}function f(t,e){var n,r,o=t.next()
-if(">"==o||"/"==o&&t.eat(">"))return e.tokenize=s,a=">"==o?"endTag":"selfcloseTag","tag bracket"
-if("="==o)return a="equals",null
-if("<"==o){e.tokenize=s,e.state=b,e.tagName=e.tagStart=null
-var i=e.tokenize(t,e)
-return i?i+" tag error":"tag error"}return/[\'\"]/.test(o)?(e.tokenize=(n=o,r=function(t,e){for(;!t.eol();)if(t.next()==n){e.tokenize=f
-break}return"string"},r.isInAttribute=!0,r),e.stringStartCol=t.column(),e.tokenize(t,e)):(t.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/),"word")}function m(t,e){return function(n,r){for(;!n.eol();){if(n.match(e)){r.tokenize=s
-break}n.next()}return t}}function g(t){return function(e,n){for(var r;null!=(r=e.next());){if("<"==r)return n.tokenize=g(t+1),n.tokenize(e,n)
-if(">"==r){if(1==t){n.tokenize=s
-break}return n.tokenize=g(t-1),n.tokenize(e,n)}}return"meta"}}function p(t,e,n){this.prev=t.context,this.tagName=e,this.indent=t.indented,this.startOfLine=n,(u.doNotIndent.hasOwnProperty(e)||t.context&&t.context.noIndent)&&(this.noIndent=!0)}function h(t){t.context&&(t.context=t.context.prev)}function x(t,e){for(var n;;){if(!t.context)return
-if(n=t.context.tagName,!u.contextGrabbers.hasOwnProperty(n)||!u.contextGrabbers[n].hasOwnProperty(e))return
-h(t)}}function b(t,e,n){return"openTag"==t?(n.tagStart=e.column(),k):"closeTag"==t?w:b}function k(t,e,n){return"word"==t?(n.tagName=e.current(),i="tag",z):(i="error",k)}function w(t,e,n){if("word"==t){var r=e.current()
-return n.context&&n.context.tagName!=r&&u.implicitlyClosed.hasOwnProperty(n.context.tagName)&&h(n),n.context&&n.context.tagName==r||!1===u.matchClosing?(i="tag",v):(i="tag error",y)}return i="error",y}function v(t,e,n){return"endTag"!=t?(i="error",v):(h(n),b)}function y(t,e,n){return i="error",v(t,0,n)}function z(t,e,n){if("word"==t)return i="attribute",N
-if("endTag"==t||"selfcloseTag"==t){var r=n.tagName,o=n.tagStart
-return n.tagName=n.tagStart=null,"selfcloseTag"==t||u.autoSelfClosers.hasOwnProperty(r)?x(n,r):(x(n,r),n.context=new p(n,r,o==n.indented)),b}return i="error",z}function N(t,e,n){return"equals"==t?T:(u.allowMissing||(i="error"),z(t,0,n))}function T(t,e,n){return"string"==t?C:"word"==t&&u.allowUnquoted?(i="string",z):(i="error",z(t,0,n))}function C(t,e,n){return"string"==t?C:z(t,0,n)}return s.isInText=!0,{startState:function(t){var e={tokenize:s,state:b,indented:t||0,tagName:null,tagStart:null,context:null}
-return null!=t&&(e.baseIndent=t),e},token:function(t,e){if(!e.tagName&&t.sol()&&(e.indented=t.indentation()),t.eatSpace())return null
-a=null
-var n=e.tokenize(t,e)
-return(n||a)&&"comment"!=n&&(i=null,e.state=e.state(a||n,t,e),i&&(n="error"==i?n+" error":i)),n},indent:function(e,n,r){var o=e.context
-if(e.tokenize.isInAttribute)return e.tagStart==e.indented?e.stringStartCol+1:e.indented+l
-if(o&&o.noIndent)return t.Pass
-if(e.tokenize!=f&&e.tokenize!=s)return r?r.match(/^(\s*)/)[0].length:0
-if(e.tagName)return!1!==u.multilineTagIndentPastTag?e.tagStart+e.tagName.length+2:e.tagStart+l*(u.multilineTagIndentFactor||1)
-if(u.alignCDATA&&/<!\[CDATA\[/.test(n))return 0
-var a=n&&/^<(\/)?([\w_:\.-]*)/.exec(n)
-if(a&&a[1])for(;o;){if(o.tagName==a[2]){o=o.prev
-break}if(!u.implicitlyClosed.hasOwnProperty(o.tagName))break
-o=o.prev}else if(a)for(;o;){var i=u.contextGrabbers[o.tagName]
-if(!i||!i.hasOwnProperty(a[2]))break
-o=o.prev}for(;o&&o.prev&&!o.startOfLine;)o=o.prev
-return o?o.indent+l:e.baseIndent||0},electricInput:/<\/[\s\w:]+>$/,blockCommentStart:"\x3c!--",blockCommentEnd:"--\x3e",configuration:u.htmlMode?"html":"xml",helperType:u.htmlMode?"html":"xml",skipAttribute:function(t){t.state==T&&(t.state=z)}}})),t.defineMIME("text/xml","xml"),t.defineMIME("application/xml","xml"),t.mimeModes.hasOwnProperty("text/html")||t.defineMIME("text/html",{name:"xml",htmlMode:!0})}))
diff --git a/agent/uiserver/dist/assets/codemirror/mode/yaml/yaml-39582b60e653cf0b8d42292ddfabefb2.js b/agent/uiserver/dist/assets/codemirror/mode/yaml/yaml-39582b60e653cf0b8d42292ddfabefb2.js
deleted file mode 100644
index a52cfdfb93fd3..0000000000000
--- a/agent/uiserver/dist/assets/codemirror/mode/yaml/yaml-39582b60e653cf0b8d42292ddfabefb2.js
+++ /dev/null
@@ -1,276 +0,0 @@
-/*! js-yaml 4.0.0 https://github.com/nodeca/js-yaml @license MIT */
-(function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).jsyaml={})})(this,(function(e){"use strict"
-function t(e){return null==e}var n={isNothing:t,isObject:function(e){return"object"==typeof e&&null!==e},toArray:function(e){return Array.isArray(e)?e:t(e)?[]:[e]},repeat:function(e,t){var n,i=""
-for(n=0;n<t;n+=1)i+=e
-return i},isNegativeZero:function(e){return 0===e&&Number.NEGATIVE_INFINITY===1/e},extend:function(e,t){var n,i,r,o
-if(t)for(n=0,i=(o=Object.keys(t)).length;n<i;n+=1)e[r=o[n]]=t[r]
-return e}}
-function i(e,t){var n="",i=e.reason||"(unknown reason)"
-return e.mark?(e.mark.name&&(n+='in "'+e.mark.name+'" '),n+="("+(e.mark.line+1)+":"+(e.mark.column+1)+")",!t&&e.mark.snippet&&(n+="\n\n"+e.mark.snippet),i+" "+n):i}function r(e,t){Error.call(this),this.name="YAMLException",this.reason=e,this.mark=t,this.message=i(this,!1),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=(new Error).stack||""}r.prototype=Object.create(Error.prototype),r.prototype.constructor=r,r.prototype.toString=function(e){return this.name+": "+i(this,e)}
-var o=r
-function a(e,t,n,i,r){var o="",a="",l=Math.floor(r/2)-1
-return i-t>l&&(t=i-l+(o=" ... ").length),n-i>l&&(n=i+l-(a=" ...").length),{str:o+e.slice(t,n).replace(/\t/g,"→")+a,pos:i-t+o.length}}function l(e,t){return n.repeat(" ",t-e.length)+e}var c=function(e,t){if(t=Object.create(t||null),!e.buffer)return null
-t.maxLength||(t.maxLength=79),"number"!=typeof t.indent&&(t.indent=1),"number"!=typeof t.linesBefore&&(t.linesBefore=3),"number"!=typeof t.linesAfter&&(t.linesAfter=2)
-for(var i,r=/\r?\n|\r|\0/g,o=[0],c=[],s=-1;i=r.exec(e.buffer);)c.push(i.index),o.push(i.index+i[0].length),e.position<=i.index&&s<0&&(s=o.length-2)
-s<0&&(s=o.length-1)
-var u,p,f="",d=Math.min(e.line+t.linesAfter,c.length).toString().length,h=t.maxLength-(t.indent+d+3)
-for(u=1;u<=t.linesBefore&&!(s-u<0);u++)p=a(e.buffer,o[s-u],c[s-u],e.position-(o[s]-o[s-u]),h),f=n.repeat(" ",t.indent)+l((e.line-u+1).toString(),d)+" | "+p.str+"\n"+f
-for(p=a(e.buffer,o[s],c[s],e.position,h),f+=n.repeat(" ",t.indent)+l((e.line+1).toString(),d)+" | "+p.str+"\n",f+=n.repeat("-",t.indent+d+3+p.pos)+"^\n",u=1;u<=t.linesAfter&&!(s+u>=c.length);u++)p=a(e.buffer,o[s+u],c[s+u],e.position-(o[s]-o[s+u]),h),f+=n.repeat(" ",t.indent)+l((e.line+u+1).toString(),d)+" | "+p.str+"\n"
-return f.replace(/\n$/,"")},s=["kind","multi","resolve","construct","instanceOf","predicate","represent","representName","defaultStyle","styleAliases"],u=["scalar","sequence","mapping"]
-var p=function(e,t){if(t=t||{},Object.keys(t).forEach((function(t){if(-1===s.indexOf(t))throw new o('Unknown option "'+t+'" is met in definition of "'+e+'" YAML type.')})),this.tag=e,this.kind=t.kind||null,this.resolve=t.resolve||function(){return!0},this.construct=t.construct||function(e){return e},this.instanceOf=t.instanceOf||null,this.predicate=t.predicate||null,this.represent=t.represent||null,this.representName=t.representName||null,this.defaultStyle=t.defaultStyle||null,this.multi=t.multi||!1,this.styleAliases=function(e){var t={}
-return null!==e&&Object.keys(e).forEach((function(n){e[n].forEach((function(e){t[String(e)]=n}))})),t}(t.styleAliases||null),-1===u.indexOf(this.kind))throw new o('Unknown kind "'+this.kind+'" is specified for "'+e+'" YAML type.')}
-function f(e,t,n){var i=[]
-return e[t].forEach((function(e){n.forEach((function(t,n){t.tag===e.tag&&t.kind===e.kind&&t.multi===e.multi&&i.push(n)})),n.push(e)})),n.filter((function(e,t){return-1===i.indexOf(t)}))}function d(e){return this.extend(e)}d.prototype.extend=function(e){var t=[],n=[]
-if(e instanceof p)n.push(e)
-else if(Array.isArray(e))n=n.concat(e)
-else{if(!e||!Array.isArray(e.implicit)&&!Array.isArray(e.explicit))throw new o("Schema.extend argument should be a Type, [ Type ], or a schema definition ({ implicit: [...], explicit: [...] })")
-e.implicit&&(t=t.concat(e.implicit)),e.explicit&&(n=n.concat(e.explicit))}t.forEach((function(e){if(!(e instanceof p))throw new o("Specified list of YAML types (or a single Type object) contains a non-Type object.")
-if(e.loadKind&&"scalar"!==e.loadKind)throw new o("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.")
-if(e.multi)throw new o("There is a multi type in the implicit list of a schema. Multi tags can only be listed as explicit.")})),n.forEach((function(e){if(!(e instanceof p))throw new o("Specified list of YAML types (or a single Type object) contains a non-Type object.")}))
-var i=Object.create(d.prototype)
-return i.implicit=(this.implicit||[]).concat(t),i.explicit=(this.explicit||[]).concat(n),i.compiledImplicit=f(i,"implicit",[]),i.compiledExplicit=f(i,"explicit",[]),i.compiledTypeMap=function(){var e,t,n={scalar:{},sequence:{},mapping:{},fallback:{},multi:{scalar:[],sequence:[],mapping:[],fallback:[]}}
-function i(e){e.multi?(n.multi[e.kind].push(e),n.multi.fallback.push(e)):n[e.kind][e.tag]=n.fallback[e.tag]=e}for(e=0,t=arguments.length;e<t;e+=1)arguments[e].forEach(i)
-return n}(i.compiledImplicit,i.compiledExplicit),i}
-var h=d,m=new h({explicit:[new p("tag:yaml.org,2002:str",{kind:"scalar",construct:function(e){return null!==e?e:""}}),new p("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(e){return null!==e?e:[]}}),new p("tag:yaml.org,2002:map",{kind:"mapping",construct:function(e){return null!==e?e:{}}})]})
-var g=new p("tag:yaml.org,2002:null",{kind:"scalar",resolve:function(e){if(null===e)return!0
-var t=e.length
-return 1===t&&"~"===e||4===t&&("null"===e||"Null"===e||"NULL"===e)},construct:function(){return null},predicate:function(e){return null===e},represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"},empty:function(){return""}},defaultStyle:"lowercase"})
-var y=new p("tag:yaml.org,2002:bool",{kind:"scalar",resolve:function(e){if(null===e)return!1
-var t=e.length
-return 4===t&&("true"===e||"True"===e||"TRUE"===e)||5===t&&("false"===e||"False"===e||"FALSE"===e)},construct:function(e){return"true"===e||"True"===e||"TRUE"===e},predicate:function(e){return"[object Boolean]"===Object.prototype.toString.call(e)},represent:{lowercase:function(e){return e?"true":"false"},uppercase:function(e){return e?"TRUE":"FALSE"},camelcase:function(e){return e?"True":"False"}},defaultStyle:"lowercase"})
-function b(e){return 48<=e&&e<=55}function A(e){return 48<=e&&e<=57}var v=new p("tag:yaml.org,2002:int",{kind:"scalar",resolve:function(e){if(null===e)return!1
-var t,n,i=e.length,r=0,o=!1
-if(!i)return!1
-if("-"!==(t=e[r])&&"+"!==t||(t=e[++r]),"0"===t){if(r+1===i)return!0
-if("b"===(t=e[++r])){for(r++;r<i;r++)if("_"!==(t=e[r])){if("0"!==t&&"1"!==t)return!1
-o=!0}return o&&"_"!==t}if("x"===t){for(r++;r<i;r++)if("_"!==(t=e[r])){if(!(48<=(n=e.charCodeAt(r))&&n<=57||65<=n&&n<=70||97<=n&&n<=102))return!1
-o=!0}return o&&"_"!==t}if("o"===t){for(r++;r<i;r++)if("_"!==(t=e[r])){if(!b(e.charCodeAt(r)))return!1
-o=!0}return o&&"_"!==t}}if("_"===t)return!1
-for(;r<i;r++)if("_"!==(t=e[r])){if(!A(e.charCodeAt(r)))return!1
-o=!0}return!(!o||"_"===t)},construct:function(e){var t,n=e,i=1
-if(-1!==n.indexOf("_")&&(n=n.replace(/_/g,"")),"-"!==(t=n[0])&&"+"!==t||("-"===t&&(i=-1),t=(n=n.slice(1))[0]),"0"===n)return 0
-if("0"===t){if("b"===n[1])return i*parseInt(n.slice(2),2)
-if("x"===n[1])return i*parseInt(n.slice(2),16)
-if("o"===n[1])return i*parseInt(n.slice(2),8)}return i*parseInt(n,10)},predicate:function(e){return"[object Number]"===Object.prototype.toString.call(e)&&e%1==0&&!n.isNegativeZero(e)},represent:{binary:function(e){return e>=0?"0b"+e.toString(2):"-0b"+e.toString(2).slice(1)},octal:function(e){return e>=0?"0o"+e.toString(8):"-0o"+e.toString(8).slice(1)},decimal:function(e){return e.toString(10)},hexadecimal:function(e){return e>=0?"0x"+e.toString(16).toUpperCase():"-0x"+e.toString(16).toUpperCase().slice(1)}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}}),k=new RegExp("^(?:[-+]?(?:[0-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$")
-var w=/^[-+]?[0-9]+e/
-var C=new p("tag:yaml.org,2002:float",{kind:"scalar",resolve:function(e){return null!==e&&!(!k.test(e)||"_"===e[e.length-1])},construct:function(e){var t,n
-return n="-"===(t=e.replace(/_/g,"").toLowerCase())[0]?-1:1,"+-".indexOf(t[0])>=0&&(t=t.slice(1)),".inf"===t?1===n?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:".nan"===t?NaN:n*parseFloat(t,10)},predicate:function(e){return"[object Number]"===Object.prototype.toString.call(e)&&(e%1!=0||n.isNegativeZero(e))},represent:function(e,t){var i
-if(isNaN(e))switch(t){case"lowercase":return".nan"
-case"uppercase":return".NAN"
-case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===e)switch(t){case"lowercase":return".inf"
-case"uppercase":return".INF"
-case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===e)switch(t){case"lowercase":return"-.inf"
-case"uppercase":return"-.INF"
-case"camelcase":return"-.Inf"}else if(n.isNegativeZero(e))return"-0.0"
-return i=e.toString(10),w.test(i)?i.replace("e",".e"):i},defaultStyle:"lowercase"}),x=m.extend({implicit:[g,y,v,C]}),I=x,S=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),O=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$")
-var j=new p("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:function(e){return null!==e&&(null!==S.exec(e)||null!==O.exec(e))},construct:function(e){var t,n,i,r,o,a,l,c,s=0,u=null
-if(null===(t=S.exec(e))&&(t=O.exec(e)),null===t)throw new Error("Date resolve error")
-if(n=+t[1],i=+t[2]-1,r=+t[3],!t[4])return new Date(Date.UTC(n,i,r))
-if(o=+t[4],a=+t[5],l=+t[6],t[7]){for(s=t[7].slice(0,3);s.length<3;)s+="0"
-s=+s}return t[9]&&(u=6e4*(60*+t[10]+ +(t[11]||0)),"-"===t[9]&&(u=-u)),c=new Date(Date.UTC(n,i,r,o,a,l,s)),u&&c.setTime(c.getTime()-u),c},instanceOf:Date,represent:function(e){return e.toISOString()}})
-var T=new p("tag:yaml.org,2002:merge",{kind:"scalar",resolve:function(e){return"<<"===e||null===e}}),E="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r"
-var M=new p("tag:yaml.org,2002:binary",{kind:"scalar",resolve:function(e){if(null===e)return!1
-var t,n,i=0,r=e.length,o=E
-for(n=0;n<r;n++)if(!((t=o.indexOf(e.charAt(n)))>64)){if(t<0)return!1
-i+=6}return i%8==0},construct:function(e){var t,n,i=e.replace(/[\r\n=]/g,""),r=i.length,o=E,a=0,l=[]
-for(t=0;t<r;t++)t%4==0&&t&&(l.push(a>>16&255),l.push(a>>8&255),l.push(255&a)),a=a<<6|o.indexOf(i.charAt(t))
-return 0===(n=r%4*6)?(l.push(a>>16&255),l.push(a>>8&255),l.push(255&a)):18===n?(l.push(a>>10&255),l.push(a>>2&255)):12===n&&l.push(a>>4&255),new Uint8Array(l)},predicate:function(e){return"[object Uint8Array]"===Object.prototype.toString.call(e)},represent:function(e){var t,n,i="",r=0,o=e.length,a=E
-for(t=0;t<o;t++)t%3==0&&t&&(i+=a[r>>18&63],i+=a[r>>12&63],i+=a[r>>6&63],i+=a[63&r]),r=(r<<8)+e[t]
-return 0===(n=o%3)?(i+=a[r>>18&63],i+=a[r>>12&63],i+=a[r>>6&63],i+=a[63&r]):2===n?(i+=a[r>>10&63],i+=a[r>>4&63],i+=a[r<<2&63],i+=a[64]):1===n&&(i+=a[r>>2&63],i+=a[r<<4&63],i+=a[64],i+=a[64]),i}}),L=Object.prototype.hasOwnProperty,N=Object.prototype.toString
-var F=new p("tag:yaml.org,2002:omap",{kind:"sequence",resolve:function(e){if(null===e)return!0
-var t,n,i,r,o,a=[],l=e
-for(t=0,n=l.length;t<n;t+=1){if(i=l[t],o=!1,"[object Object]"!==N.call(i))return!1
-for(r in i)if(L.call(i,r)){if(o)return!1
-o=!0}if(!o)return!1
-if(-1!==a.indexOf(r))return!1
-a.push(r)}return!0},construct:function(e){return null!==e?e:[]}}),_=Object.prototype.toString
-var D=new p("tag:yaml.org,2002:pairs",{kind:"sequence",resolve:function(e){if(null===e)return!0
-var t,n,i,r,o,a=e
-for(o=new Array(a.length),t=0,n=a.length;t<n;t+=1){if(i=a[t],"[object Object]"!==_.call(i))return!1
-if(1!==(r=Object.keys(i)).length)return!1
-o[t]=[r[0],i[r[0]]]}return!0},construct:function(e){if(null===e)return[]
-var t,n,i,r,o,a=e
-for(o=new Array(a.length),t=0,n=a.length;t<n;t+=1)i=a[t],r=Object.keys(i),o[t]=[r[0],i[r[0]]]
-return o}}),U=Object.prototype.hasOwnProperty
-var q=new p("tag:yaml.org,2002:set",{kind:"mapping",resolve:function(e){if(null===e)return!0
-var t,n=e
-for(t in n)if(U.call(n,t)&&null!==n[t])return!1
-return!0},construct:function(e){return null!==e?e:{}}}),Y=I.extend({implicit:[j,T],explicit:[M,F,D,q]}),P=Object.prototype.hasOwnProperty,R=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,$=/[\x85\u2028\u2029]/,B=/[,\[\]\{\}]/,K=/^(?:!|!!|![a-z\-]+!)$/i,W=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i
-function H(e){return Object.prototype.toString.call(e)}function G(e){return 10===e||13===e}function V(e){return 9===e||32===e}function Z(e){return 9===e||32===e||10===e||13===e}function z(e){return 44===e||91===e||93===e||123===e||125===e}function J(e){var t
-return 48<=e&&e<=57?e-48:97<=(t=32|e)&&t<=102?t-97+10:-1}function Q(e){return 48===e?"\0":97===e?"":98===e?"\b":116===e||9===e?"\t":110===e?"\n":118===e?"\v":102===e?"\f":114===e?"\r":101===e?"":32===e?" ":34===e?'"':47===e?"/":92===e?"\\":78===e?"…":95===e?" ":76===e?"\u2028":80===e?"\u2029":""}function X(e){return e<=65535?String.fromCharCode(e):String.fromCharCode(55296+(e-65536>>10),56320+(e-65536&1023))}for(var ee=new Array(256),te=new Array(256),ne=0;ne<256;ne++)ee[ne]=Q(ne)?1:0,te[ne]=Q(ne)
-function ie(e,t){this.input=e,this.filename=t.filename||null,this.schema=t.schema||Y,this.onWarning=t.onWarning||null,this.legacy=t.legacy||!1,this.json=t.json||!1,this.listener=t.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=e.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.firstTabInLine=-1,this.documents=[]}function re(e,t){var n={name:e.filename,buffer:e.input.slice(0,-1),position:e.position,line:e.line,column:e.position-e.lineStart}
-return n.snippet=c(n),new o(t,n)}function oe(e,t){throw re(e,t)}function ae(e,t){e.onWarning&&e.onWarning.call(null,re(e,t))}var le={YAML:function(e,t,n){var i,r,o
-null!==e.version&&oe(e,"duplication of %YAML directive"),1!==n.length&&oe(e,"YAML directive accepts exactly one argument"),null===(i=/^([0-9]+)\.([0-9]+)$/.exec(n[0]))&&oe(e,"ill-formed argument of the YAML directive"),r=parseInt(i[1],10),o=parseInt(i[2],10),1!==r&&oe(e,"unacceptable YAML version of the document"),e.version=n[0],e.checkLineBreaks=o<2,1!==o&&2!==o&&ae(e,"unsupported YAML version of the document")},TAG:function(e,t,n){var i,r
-2!==n.length&&oe(e,"TAG directive accepts exactly two arguments"),i=n[0],r=n[1],K.test(i)||oe(e,"ill-formed tag handle (first argument) of the TAG directive"),P.call(e.tagMap,i)&&oe(e,'there is a previously declared suffix for "'+i+'" tag handle'),W.test(r)||oe(e,"ill-formed tag prefix (second argument) of the TAG directive")
-try{r=decodeURIComponent(r)}catch(o){oe(e,"tag prefix is malformed: "+r)}e.tagMap[i]=r}}
-function ce(e,t,n,i){var r,o,a,l
-if(t<n){if(l=e.input.slice(t,n),i)for(r=0,o=l.length;r<o;r+=1)9===(a=l.charCodeAt(r))||32<=a&&a<=1114111||oe(e,"expected valid JSON character")
-else R.test(l)&&oe(e,"the stream contains non-printable characters")
-e.result+=l}}function se(e,t,i,r){var o,a,l,c
-for(n.isObject(i)||oe(e,"cannot merge mappings; the provided source object is unacceptable"),l=0,c=(o=Object.keys(i)).length;l<c;l+=1)a=o[l],P.call(t,a)||(t[a]=i[a],r[a]=!0)}function ue(e,t,n,i,r,o,a,l,c){var s,u
-if(Array.isArray(r))for(s=0,u=(r=Array.prototype.slice.call(r)).length;s<u;s+=1)Array.isArray(r[s])&&oe(e,"nested arrays are not supported inside keys"),"object"==typeof r&&"[object Object]"===H(r[s])&&(r[s]="[object Object]")
-if("object"==typeof r&&"[object Object]"===H(r)&&(r="[object Object]"),r=String(r),null===t&&(t={}),"tag:yaml.org,2002:merge"===i)if(Array.isArray(o))for(s=0,u=o.length;s<u;s+=1)se(e,t,o[s],n)
-else se(e,t,o,n)
-else e.json||P.call(n,r)||!P.call(t,r)||(e.line=a||e.line,e.lineStart=l||e.lineStart,e.position=c||e.position,oe(e,"duplicated mapping key")),"__proto__"===r?Object.defineProperty(t,r,{configurable:!0,enumerable:!0,writable:!0,value:o}):t[r]=o,delete n[r]
-return t}function pe(e){var t
-10===(t=e.input.charCodeAt(e.position))?e.position++:13===t?(e.position++,10===e.input.charCodeAt(e.position)&&e.position++):oe(e,"a line break is expected"),e.line+=1,e.lineStart=e.position,e.firstTabInLine=-1}function fe(e,t,n){for(var i=0,r=e.input.charCodeAt(e.position);0!==r;){for(;V(r);)9===r&&-1===e.firstTabInLine&&(e.firstTabInLine=e.position),r=e.input.charCodeAt(++e.position)
-if(t&&35===r)do{r=e.input.charCodeAt(++e.position)}while(10!==r&&13!==r&&0!==r)
-if(!G(r))break
-for(pe(e),r=e.input.charCodeAt(e.position),i++,e.lineIndent=0;32===r;)e.lineIndent++,r=e.input.charCodeAt(++e.position)}return-1!==n&&0!==i&&e.lineIndent<n&&ae(e,"deficient indentation"),i}function de(e){var t,n=e.position
-return!(45!==(t=e.input.charCodeAt(n))&&46!==t||t!==e.input.charCodeAt(n+1)||t!==e.input.charCodeAt(n+2)||(n+=3,0!==(t=e.input.charCodeAt(n))&&!Z(t)))}function he(e,t){1===t?e.result+=" ":t>1&&(e.result+=n.repeat("\n",t-1))}function me(e,t){var n,i,r=e.tag,o=e.anchor,a=[],l=!1
-if(-1!==e.firstTabInLine)return!1
-for(null!==e.anchor&&(e.anchorMap[e.anchor]=a),i=e.input.charCodeAt(e.position);0!==i&&(-1!==e.firstTabInLine&&(e.position=e.firstTabInLine,oe(e,"tab characters must not be used in indentation")),45===i)&&Z(e.input.charCodeAt(e.position+1));)if(l=!0,e.position++,fe(e,!0,-1)&&e.lineIndent<=t)a.push(null),i=e.input.charCodeAt(e.position)
-else if(n=e.line,be(e,t,3,!1,!0),a.push(e.result),fe(e,!0,-1),i=e.input.charCodeAt(e.position),(e.line===n||e.lineIndent>t)&&0!==i)oe(e,"bad indentation of a sequence entry")
-else if(e.lineIndent<t)break
-return!!l&&(e.tag=r,e.anchor=o,e.kind="sequence",e.result=a,!0)}function ge(e){var t,n,i,r,o=!1,a=!1
-if(33!==(r=e.input.charCodeAt(e.position)))return!1
-if(null!==e.tag&&oe(e,"duplication of a tag property"),60===(r=e.input.charCodeAt(++e.position))?(o=!0,r=e.input.charCodeAt(++e.position)):33===r?(a=!0,n="!!",r=e.input.charCodeAt(++e.position)):n="!",t=e.position,o){do{r=e.input.charCodeAt(++e.position)}while(0!==r&&62!==r)
-e.position<e.length?(i=e.input.slice(t,e.position),r=e.input.charCodeAt(++e.position)):oe(e,"unexpected end of the stream within a verbatim tag")}else{for(;0!==r&&!Z(r);)33===r&&(a?oe(e,"tag suffix cannot contain exclamation marks"):(n=e.input.slice(t-1,e.position+1),K.test(n)||oe(e,"named tag handle cannot contain such characters"),a=!0,t=e.position+1)),r=e.input.charCodeAt(++e.position)
-i=e.input.slice(t,e.position),B.test(i)&&oe(e,"tag suffix cannot contain flow indicator characters")}i&&!W.test(i)&&oe(e,"tag name cannot contain such characters: "+i)
-try{i=decodeURIComponent(i)}catch(l){oe(e,"tag name is malformed: "+i)}return o?e.tag=i:P.call(e.tagMap,n)?e.tag=e.tagMap[n]+i:"!"===n?e.tag="!"+i:"!!"===n?e.tag="tag:yaml.org,2002:"+i:oe(e,'undeclared tag handle "'+n+'"'),!0}function ye(e){var t,n
-if(38!==(n=e.input.charCodeAt(e.position)))return!1
-for(null!==e.anchor&&oe(e,"duplication of an anchor property"),n=e.input.charCodeAt(++e.position),t=e.position;0!==n&&!Z(n)&&!z(n);)n=e.input.charCodeAt(++e.position)
-return e.position===t&&oe(e,"name of an anchor node must contain at least one character"),e.anchor=e.input.slice(t,e.position),!0}function be(e,t,i,r,o){var a,l,c,s,u,p,f,d,h,m=1,g=!1,y=!1
-if(null!==e.listener&&e.listener("open",e),e.tag=null,e.anchor=null,e.kind=null,e.result=null,a=l=c=4===i||3===i,r&&fe(e,!0,-1)&&(g=!0,e.lineIndent>t?m=1:e.lineIndent===t?m=0:e.lineIndent<t&&(m=-1)),1===m)for(;ge(e)||ye(e);)fe(e,!0,-1)?(g=!0,c=a,e.lineIndent>t?m=1:e.lineIndent===t?m=0:e.lineIndent<t&&(m=-1)):c=!1
-if(c&&(c=g||o),1!==m&&4!==i||(d=1===i||2===i?t:t+1,h=e.position-e.lineStart,1===m?c&&(me(e,h)||function(e,t,n){var i,r,o,a,l,c,s,u=e.tag,p=e.anchor,f={},d=Object.create(null),h=null,m=null,g=null,y=!1,b=!1
-if(-1!==e.firstTabInLine)return!1
-for(null!==e.anchor&&(e.anchorMap[e.anchor]=f),s=e.input.charCodeAt(e.position);0!==s;){if(y||-1===e.firstTabInLine||(e.position=e.firstTabInLine,oe(e,"tab characters must not be used in indentation")),i=e.input.charCodeAt(e.position+1),o=e.line,63!==s&&58!==s||!Z(i)){if(a=e.line,l=e.lineStart,c=e.position,!be(e,n,2,!1,!0))break
-if(e.line===o){for(s=e.input.charCodeAt(e.position);V(s);)s=e.input.charCodeAt(++e.position)
-if(58===s)Z(s=e.input.charCodeAt(++e.position))||oe(e,"a whitespace character is expected after the key-value separator within a block mapping"),y&&(ue(e,f,d,h,m,null,a,l,c),h=m=g=null),b=!0,y=!1,r=!1,h=e.tag,m=e.result
-else{if(!b)return e.tag=u,e.anchor=p,!0
-oe(e,"can not read an implicit mapping pair; a colon is missed")}}else{if(!b)return e.tag=u,e.anchor=p,!0
-oe(e,"can not read a block mapping entry; a multiline key may not be an implicit key")}}else 63===s?(y&&(ue(e,f,d,h,m,null,a,l,c),h=m=g=null),b=!0,y=!0,r=!0):y?(y=!1,r=!0):oe(e,"incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line"),e.position+=1,s=i
-if((e.line===o||e.lineIndent>t)&&(y&&(a=e.line,l=e.lineStart,c=e.position),be(e,t,4,!0,r)&&(y?m=e.result:g=e.result),y||(ue(e,f,d,h,m,g,a,l,c),h=m=g=null),fe(e,!0,-1),s=e.input.charCodeAt(e.position)),(e.line===o||e.lineIndent>t)&&0!==s)oe(e,"bad indentation of a mapping entry")
-else if(e.lineIndent<t)break}return y&&ue(e,f,d,h,m,null,a,l,c),b&&(e.tag=u,e.anchor=p,e.kind="mapping",e.result=f),b}(e,h,d))||function(e,t){var n,i,r,o,a,l,c,s,u,p,f,d,h=!0,m=e.tag,g=e.anchor,y=Object.create(null)
-if(91===(d=e.input.charCodeAt(e.position)))a=93,s=!1,o=[]
-else{if(123!==d)return!1
-a=125,s=!0,o={}}for(null!==e.anchor&&(e.anchorMap[e.anchor]=o),d=e.input.charCodeAt(++e.position);0!==d;){if(fe(e,!0,t),(d=e.input.charCodeAt(e.position))===a)return e.position++,e.tag=m,e.anchor=g,e.kind=s?"mapping":"sequence",e.result=o,!0
-h?44===d&&oe(e,"expected the node content, but found ','"):oe(e,"missed comma between flow collection entries"),f=null,l=c=!1,63===d&&Z(e.input.charCodeAt(e.position+1))&&(l=c=!0,e.position++,fe(e,!0,t)),n=e.line,i=e.lineStart,r=e.position,be(e,t,1,!1,!0),p=e.tag,u=e.result,fe(e,!0,t),d=e.input.charCodeAt(e.position),!c&&e.line!==n||58!==d||(l=!0,d=e.input.charCodeAt(++e.position),fe(e,!0,t),be(e,t,1,!1,!0),f=e.result),s?ue(e,o,y,p,u,f,n,i,r):l?o.push(ue(e,null,y,p,u,f,n,i,r)):o.push(u),fe(e,!0,t),44===(d=e.input.charCodeAt(e.position))?(h=!0,d=e.input.charCodeAt(++e.position)):h=!1}oe(e,"unexpected end of the stream within a flow collection")}(e,d)?y=!0:(l&&function(e,t){var i,r,o,a,l,c=1,s=!1,u=!1,p=t,f=0,d=!1
-if(124===(a=e.input.charCodeAt(e.position)))r=!1
-else{if(62!==a)return!1
-r=!0}for(e.kind="scalar",e.result="";0!==a;)if(43===(a=e.input.charCodeAt(++e.position))||45===a)1===c?c=43===a?3:2:oe(e,"repeat of a chomping mode identifier")
-else{if(!((o=48<=(l=a)&&l<=57?l-48:-1)>=0))break
-0===o?oe(e,"bad explicit indentation width of a block scalar; it cannot be less than one"):u?oe(e,"repeat of an indentation width identifier"):(p=t+o-1,u=!0)}if(V(a)){do{a=e.input.charCodeAt(++e.position)}while(V(a))
-if(35===a)do{a=e.input.charCodeAt(++e.position)}while(!G(a)&&0!==a)}for(;0!==a;){for(pe(e),e.lineIndent=0,a=e.input.charCodeAt(e.position);(!u||e.lineIndent<p)&&32===a;)e.lineIndent++,a=e.input.charCodeAt(++e.position)
-if(!u&&e.lineIndent>p&&(p=e.lineIndent),G(a))f++
-else{if(e.lineIndent<p){3===c?e.result+=n.repeat("\n",s?1+f:f):1===c&&s&&(e.result+="\n")
-break}for(r?V(a)?(d=!0,e.result+=n.repeat("\n",s?1+f:f)):d?(d=!1,e.result+=n.repeat("\n",f+1)):0===f?s&&(e.result+=" "):e.result+=n.repeat("\n",f):e.result+=n.repeat("\n",s?1+f:f),s=!0,u=!0,f=0,i=e.position;!G(a)&&0!==a;)a=e.input.charCodeAt(++e.position)
-ce(e,i,e.position,!1)}}return!0}(e,d)||function(e,t){var n,i,r
-if(39!==(n=e.input.charCodeAt(e.position)))return!1
-for(e.kind="scalar",e.result="",e.position++,i=r=e.position;0!==(n=e.input.charCodeAt(e.position));)if(39===n){if(ce(e,i,e.position,!0),39!==(n=e.input.charCodeAt(++e.position)))return!0
-i=e.position,e.position++,r=e.position}else G(n)?(ce(e,i,r,!0),he(e,fe(e,!1,t)),i=r=e.position):e.position===e.lineStart&&de(e)?oe(e,"unexpected end of the document within a single quoted scalar"):(e.position++,r=e.position)
-oe(e,"unexpected end of the stream within a single quoted scalar")}(e,d)||function(e,t){var n,i,r,o,a,l,c
-if(34!==(l=e.input.charCodeAt(e.position)))return!1
-for(e.kind="scalar",e.result="",e.position++,n=i=e.position;0!==(l=e.input.charCodeAt(e.position));){if(34===l)return ce(e,n,e.position,!0),e.position++,!0
-if(92===l){if(ce(e,n,e.position,!0),G(l=e.input.charCodeAt(++e.position)))fe(e,!1,t)
-else if(l<256&&ee[l])e.result+=te[l],e.position++
-else if((a=120===(c=l)?2:117===c?4:85===c?8:0)>0){for(r=a,o=0;r>0;r--)(a=J(l=e.input.charCodeAt(++e.position)))>=0?o=(o<<4)+a:oe(e,"expected hexadecimal character")
-e.result+=X(o),e.position++}else oe(e,"unknown escape sequence")
-n=i=e.position}else G(l)?(ce(e,n,i,!0),he(e,fe(e,!1,t)),n=i=e.position):e.position===e.lineStart&&de(e)?oe(e,"unexpected end of the document within a double quoted scalar"):(e.position++,i=e.position)}oe(e,"unexpected end of the stream within a double quoted scalar")}(e,d)?y=!0:!function(e){var t,n,i
-if(42!==(i=e.input.charCodeAt(e.position)))return!1
-for(i=e.input.charCodeAt(++e.position),t=e.position;0!==i&&!Z(i)&&!z(i);)i=e.input.charCodeAt(++e.position)
-return e.position===t&&oe(e,"name of an alias node must contain at least one character"),n=e.input.slice(t,e.position),P.call(e.anchorMap,n)||oe(e,'unidentified alias "'+n+'"'),e.result=e.anchorMap[n],fe(e,!0,-1),!0}(e)?function(e,t,n){var i,r,o,a,l,c,s,u,p=e.kind,f=e.result
-if(Z(u=e.input.charCodeAt(e.position))||z(u)||35===u||38===u||42===u||33===u||124===u||62===u||39===u||34===u||37===u||64===u||96===u)return!1
-if((63===u||45===u)&&(Z(i=e.input.charCodeAt(e.position+1))||n&&z(i)))return!1
-for(e.kind="scalar",e.result="",r=o=e.position,a=!1;0!==u;){if(58===u){if(Z(i=e.input.charCodeAt(e.position+1))||n&&z(i))break}else if(35===u){if(Z(e.input.charCodeAt(e.position-1)))break}else{if(e.position===e.lineStart&&de(e)||n&&z(u))break
-if(G(u)){if(l=e.line,c=e.lineStart,s=e.lineIndent,fe(e,!1,-1),e.lineIndent>=t){a=!0,u=e.input.charCodeAt(e.position)
-continue}e.position=o,e.line=l,e.lineStart=c,e.lineIndent=s
-break}}a&&(ce(e,r,o,!1),he(e,e.line-l),r=o=e.position,a=!1),V(u)||(o=e.position+1),u=e.input.charCodeAt(++e.position)}return ce(e,r,o,!1),!!e.result||(e.kind=p,e.result=f,!1)}(e,d,1===i)&&(y=!0,null===e.tag&&(e.tag="?")):(y=!0,null===e.tag&&null===e.anchor||oe(e,"alias node should not have any properties")),null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)):0===m&&(y=c&&me(e,h))),null===e.tag)null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)
-else if("?"===e.tag){for(null!==e.result&&"scalar"!==e.kind&&oe(e,'unacceptable node kind for !<?> tag; it should be "scalar", not "'+e.kind+'"'),s=0,u=e.implicitTypes.length;s<u;s+=1)if((f=e.implicitTypes[s]).resolve(e.result)){e.result=f.construct(e.result),e.tag=f.tag,null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)
-break}}else if("!"!==e.tag){if(P.call(e.typeMap[e.kind||"fallback"],e.tag))f=e.typeMap[e.kind||"fallback"][e.tag]
-else for(f=null,s=0,u=(p=e.typeMap.multi[e.kind||"fallback"]).length;s<u;s+=1)if(e.tag.slice(0,p[s].tag.length)===p[s].tag){f=p[s]
-break}f||oe(e,"unknown tag !<"+e.tag+">"),null!==e.result&&f.kind!==e.kind&&oe(e,"unacceptable node kind for !<"+e.tag+'> tag; it should be "'+f.kind+'", not "'+e.kind+'"'),f.resolve(e.result,e.tag)?(e.result=f.construct(e.result,e.tag),null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)):oe(e,"cannot resolve a node with !<"+e.tag+"> explicit tag")}return null!==e.listener&&e.listener("close",e),null!==e.tag||null!==e.anchor||y}function Ae(e){var t,n,i,r,o=e.position,a=!1
-for(e.version=null,e.checkLineBreaks=e.legacy,e.tagMap=Object.create(null),e.anchorMap=Object.create(null);0!==(r=e.input.charCodeAt(e.position))&&(fe(e,!0,-1),r=e.input.charCodeAt(e.position),!(e.lineIndent>0||37!==r));){for(a=!0,r=e.input.charCodeAt(++e.position),t=e.position;0!==r&&!Z(r);)r=e.input.charCodeAt(++e.position)
-for(i=[],(n=e.input.slice(t,e.position)).length<1&&oe(e,"directive name must not be less than one character in length");0!==r;){for(;V(r);)r=e.input.charCodeAt(++e.position)
-if(35===r){do{r=e.input.charCodeAt(++e.position)}while(0!==r&&!G(r))
-break}if(G(r))break
-for(t=e.position;0!==r&&!Z(r);)r=e.input.charCodeAt(++e.position)
-i.push(e.input.slice(t,e.position))}0!==r&&pe(e),P.call(le,n)?le[n](e,n,i):ae(e,'unknown document directive "'+n+'"')}fe(e,!0,-1),0===e.lineIndent&&45===e.input.charCodeAt(e.position)&&45===e.input.charCodeAt(e.position+1)&&45===e.input.charCodeAt(e.position+2)?(e.position+=3,fe(e,!0,-1)):a&&oe(e,"directives end mark is expected"),be(e,e.lineIndent-1,4,!1,!0),fe(e,!0,-1),e.checkLineBreaks&&$.test(e.input.slice(o,e.position))&&ae(e,"non-ASCII line breaks are interpreted as content"),e.documents.push(e.result),e.position===e.lineStart&&de(e)?46===e.input.charCodeAt(e.position)&&(e.position+=3,fe(e,!0,-1)):e.position<e.length-1&&oe(e,"end of the stream or a document separator is expected")}function ve(e,t){t=t||{},0!==(e=String(e)).length&&(10!==e.charCodeAt(e.length-1)&&13!==e.charCodeAt(e.length-1)&&(e+="\n"),65279===e.charCodeAt(0)&&(e=e.slice(1)))
-var n=new ie(e,t),i=e.indexOf("\0")
-for(-1!==i&&(n.position=i,oe(n,"null byte is not allowed in input")),n.input+="\0";32===n.input.charCodeAt(n.position);)n.lineIndent+=1,n.position+=1
-for(;n.position<n.length-1;)Ae(n)
-return n.documents}var ke={loadAll:function(e,t,n){null!==t&&"object"==typeof t&&void 0===n&&(n=t,t=null)
-var i=ve(e,n)
-if("function"!=typeof t)return i
-for(var r=0,o=i.length;r<o;r+=1)t(i[r])},load:function(e,t){var n=ve(e,t)
-if(0!==n.length){if(1===n.length)return n[0]
-throw new o("expected a single document in the stream, but found more")}}},we=Object.prototype.toString,Ce=Object.prototype.hasOwnProperty,xe=65279,Ie={0:"\\0",7:"\\a",8:"\\b",9:"\\t",10:"\\n",11:"\\v",12:"\\f",13:"\\r",27:"\\e",34:'\\"',92:"\\\\",133:"\\N",160:"\\_",8232:"\\L",8233:"\\P"},Se=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"],Oe=/^[-+]?[0-9_]+(?::[0-9_]+)+(?:\.[0-9_]*)?$/
-function je(e){var t,i,r
-if(t=e.toString(16).toUpperCase(),e<=255)i="x",r=2
-else if(e<=65535)i="u",r=4
-else{if(!(e<=4294967295))throw new o("code point within a string may not be greater than 0xFFFFFFFF")
-i="U",r=8}return"\\"+i+n.repeat("0",r-t.length)+t}function Te(e){this.schema=e.schema||Y,this.indent=Math.max(1,e.indent||2),this.noArrayIndent=e.noArrayIndent||!1,this.skipInvalid=e.skipInvalid||!1,this.flowLevel=n.isNothing(e.flowLevel)?-1:e.flowLevel,this.styleMap=function(e,t){var n,i,r,o,a,l,c
-if(null===t)return{}
-for(n={},r=0,o=(i=Object.keys(t)).length;r<o;r+=1)a=i[r],l=String(t[a]),"!!"===a.slice(0,2)&&(a="tag:yaml.org,2002:"+a.slice(2)),(c=e.compiledTypeMap.fallback[a])&&Ce.call(c.styleAliases,l)&&(l=c.styleAliases[l]),n[a]=l
-return n}(this.schema,e.styles||null),this.sortKeys=e.sortKeys||!1,this.lineWidth=e.lineWidth||80,this.noRefs=e.noRefs||!1,this.noCompatMode=e.noCompatMode||!1,this.condenseFlow=e.condenseFlow||!1,this.quotingType='"'===e.quotingType?2:1,this.forceQuotes=e.forceQuotes||!1,this.replacer="function"==typeof e.replacer?e.replacer:null,this.implicitTypes=this.schema.compiledImplicit,this.explicitTypes=this.schema.compiledExplicit,this.tag=null,this.result="",this.duplicates=[],this.usedDuplicates=null}function Ee(e,t){for(var i,r=n.repeat(" ",t),o=0,a=-1,l="",c=e.length;o<c;)-1===(a=e.indexOf("\n",o))?(i=e.slice(o),o=c):(i=e.slice(o,a+1),o=a+1),i.length&&"\n"!==i&&(l+=r),l+=i
-return l}function Me(e,t){return"\n"+n.repeat(" ",e.indent*t)}function Le(e){return 32===e||9===e}function Ne(e){return 32<=e&&e<=126||161<=e&&e<=55295&&8232!==e&&8233!==e||57344<=e&&e<=65533&&e!==xe||65536<=e&&e<=1114111}function Fe(e){return Ne(e)&&e!==xe&&13!==e&&10!==e}function _e(e,t,n){var i=Fe(e),r=i&&!Le(e)
-return(n?i:i&&44!==e&&91!==e&&93!==e&&123!==e&&125!==e)&&35!==e&&!(58===t&&!r)||Fe(t)&&!Le(t)&&35===e||58===t&&r}function De(e,t){var n,i=e.charCodeAt(t)
-return i>=55296&&i<=56319&&t+1<e.length&&(n=e.charCodeAt(t+1))>=56320&&n<=57343?1024*(i-55296)+n-56320+65536:i}function Ue(e){return/^\n* /.test(e)}function qe(e,t,n,i,r,o,a,l){var c,s,u=0,p=null,f=!1,d=!1,h=-1!==i,m=-1,g=Ne(s=De(e,0))&&s!==xe&&!Le(s)&&45!==s&&63!==s&&58!==s&&44!==s&&91!==s&&93!==s&&123!==s&&125!==s&&35!==s&&38!==s&&42!==s&&33!==s&&124!==s&&61!==s&&62!==s&&39!==s&&34!==s&&37!==s&&64!==s&&96!==s&&function(e){return!Le(e)&&58!==e}(De(e,e.length-1))
-if(t||a)for(c=0;c<e.length;u>=65536?c+=2:c++){if(!Ne(u=De(e,c)))return 5
-g=g&&_e(u,p,l),p=u}else{for(c=0;c<e.length;u>=65536?c+=2:c++){if(10===(u=De(e,c)))f=!0,h&&(d=d||c-m-1>i&&" "!==e[m+1],m=c)
-else if(!Ne(u))return 5
-g=g&&_e(u,p,l),p=u}d=d||h&&c-m-1>i&&" "!==e[m+1]}return f||d?n>9&&Ue(e)?5:a?2===o?5:2:d?4:3:!g||a||r(e)?2===o?5:2:1}function Ye(e,t,n,i,r){e.dump=function(){if(0===t.length)return 2===e.quotingType?'""':"''"
-if(!e.noCompatMode&&(-1!==Se.indexOf(t)||Oe.test(t)))return 2===e.quotingType?'"'+t+'"':"'"+t+"'"
-var a=e.indent*Math.max(1,n),l=-1===e.lineWidth?-1:Math.max(Math.min(e.lineWidth,40),e.lineWidth-a),c=i||e.flowLevel>-1&&n>=e.flowLevel
-switch(qe(t,c,e.indent,l,(function(t){return function(e,t){var n,i
-for(n=0,i=e.implicitTypes.length;n<i;n+=1)if(e.implicitTypes[n].resolve(t))return!0
-return!1}(e,t)}),e.quotingType,e.forceQuotes&&!i,r)){case 1:return t
-case 2:return"'"+t.replace(/'/g,"''")+"'"
-case 3:return"|"+Pe(t,e.indent)+Re(Ee(t,a))
-case 4:return">"+Pe(t,e.indent)+Re(Ee(function(e,t){var n,i,r=/(\n+)([^\n]*)/g,o=(l=e.indexOf("\n"),l=-1!==l?l:e.length,r.lastIndex=l,$e(e.slice(0,l),t)),a="\n"===e[0]||" "===e[0]
-var l
-for(;i=r.exec(e);){var c=i[1],s=i[2]
-n=" "===s[0],o+=c+(a||n||""===s?"":"\n")+$e(s,t),a=n}return o}(t,l),a))
-case 5:return'"'+function(e){for(var t,n="",i=0,r=0;r<e.length;i>=65536?r+=2:r++)i=De(e,r),!(t=Ie[i])&&Ne(i)?(n+=e[r],i>=65536&&(n+=e[r+1])):n+=t||je(i)
-return n}(t)+'"'
-default:throw new o("impossible error: invalid scalar style")}}()}function Pe(e,t){var n=Ue(e)?String(t):"",i="\n"===e[e.length-1]
-return n+(i&&("\n"===e[e.length-2]||"\n"===e)?"+":i?"":"-")+"\n"}function Re(e){return"\n"===e[e.length-1]?e.slice(0,-1):e}function $e(e,t){if(""===e||" "===e[0])return e
-for(var n,i,r=/ [^ ]/g,o=0,a=0,l=0,c="";n=r.exec(e);)(l=n.index)-o>t&&(i=a>o?a:l,c+="\n"+e.slice(o,i),o=i+1),a=l
-return c+="\n",e.length-o>t&&a>o?c+=e.slice(o,a)+"\n"+e.slice(a+1):c+=e.slice(o),c.slice(1)}function Be(e,t,n,i){var r,o,a,l="",c=e.tag
-for(r=0,o=n.length;r<o;r+=1)a=n[r],e.replacer&&(a=e.replacer.call(n,String(r),a)),(We(e,t+1,a,!0,!0,!1,!0)||void 0===a&&We(e,t+1,null,!0,!0,!1,!0))&&(i&&""===l||(l+=Me(e,t)),e.dump&&10===e.dump.charCodeAt(0)?l+="-":l+="- ",l+=e.dump)
-e.tag=c,e.dump=l||"[]"}function Ke(e,t,n){var i,r,a,l,c,s
-for(a=0,l=(r=n?e.explicitTypes:e.implicitTypes).length;a<l;a+=1)if(((c=r[a]).instanceOf||c.predicate)&&(!c.instanceOf||"object"==typeof t&&t instanceof c.instanceOf)&&(!c.predicate||c.predicate(t))){if(n?c.multi&&c.representName?e.tag=c.representName(t):e.tag=c.tag:e.tag="?",c.represent){if(s=e.styleMap[c.tag]||c.defaultStyle,"[object Function]"===we.call(c.represent))i=c.represent(t,s)
-else{if(!Ce.call(c.represent,s))throw new o("!<"+c.tag+'> tag resolver accepts not "'+s+'" style')
-i=c.represent[s](t,s)}e.dump=i}return!0}return!1}function We(e,t,n,i,r,a,l){e.tag=null,e.dump=n,Ke(e,n,!1)||Ke(e,n,!0)
-var c,s=we.call(e.dump),u=i
-i&&(i=e.flowLevel<0||e.flowLevel>t)
-var p,f,d="[object Object]"===s||"[object Array]"===s
-if(d&&(f=-1!==(p=e.duplicates.indexOf(n))),(null!==e.tag&&"?"!==e.tag||f||2!==e.indent&&t>0)&&(r=!1),f&&e.usedDuplicates[p])e.dump="*ref_"+p
-else{if(d&&f&&!e.usedDuplicates[p]&&(e.usedDuplicates[p]=!0),"[object Object]"===s)i&&0!==Object.keys(e.dump).length?(function(e,t,n,i){var r,a,l,c,s,u,p="",f=e.tag,d=Object.keys(n)
-if(!0===e.sortKeys)d.sort()
-else if("function"==typeof e.sortKeys)d.sort(e.sortKeys)
-else if(e.sortKeys)throw new o("sortKeys must be a boolean or a function")
-for(r=0,a=d.length;r<a;r+=1)u="",i&&""===p||(u+=Me(e,t)),c=n[l=d[r]],e.replacer&&(c=e.replacer.call(n,l,c)),We(e,t+1,l,!0,!0,!0)&&((s=null!==e.tag&&"?"!==e.tag||e.dump&&e.dump.length>1024)&&(e.dump&&10===e.dump.charCodeAt(0)?u+="?":u+="? "),u+=e.dump,s&&(u+=Me(e,t)),We(e,t+1,c,!0,s)&&(e.dump&&10===e.dump.charCodeAt(0)?u+=":":u+=": ",p+=u+=e.dump))
-e.tag=f,e.dump=p||"{}"}(e,t,e.dump,r),f&&(e.dump="&ref_"+p+e.dump)):(function(e,t,n){var i,r,o,a,l,c="",s=e.tag,u=Object.keys(n)
-for(i=0,r=u.length;i<r;i+=1)l="",""!==c&&(l+=", "),e.condenseFlow&&(l+='"'),a=n[o=u[i]],e.replacer&&(a=e.replacer.call(n,o,a)),We(e,t,o,!1,!1)&&(e.dump.length>1024&&(l+="? "),l+=e.dump+(e.condenseFlow?'"':"")+":"+(e.condenseFlow?"":" "),We(e,t,a,!1,!1)&&(c+=l+=e.dump))
-e.tag=s,e.dump="{"+c+"}"}(e,t,e.dump),f&&(e.dump="&ref_"+p+" "+e.dump))
-else if("[object Array]"===s)i&&0!==e.dump.length?(e.noArrayIndent&&!l&&t>0?Be(e,t-1,e.dump,r):Be(e,t,e.dump,r),f&&(e.dump="&ref_"+p+e.dump)):(function(e,t,n){var i,r,o,a="",l=e.tag
-for(i=0,r=n.length;i<r;i+=1)o=n[i],e.replacer&&(o=e.replacer.call(n,String(i),o)),(We(e,t,o,!1,!1)||void 0===o&&We(e,t,null,!1,!1))&&(""!==a&&(a+=","+(e.condenseFlow?"":" ")),a+=e.dump)
-e.tag=l,e.dump="["+a+"]"}(e,t,e.dump),f&&(e.dump="&ref_"+p+" "+e.dump))
-else{if("[object String]"!==s){if("[object Undefined]"===s)return!1
-if(e.skipInvalid)return!1
-throw new o("unacceptable kind of an object to dump "+s)}"?"!==e.tag&&Ye(e,e.dump,t,a,u)}null!==e.tag&&"?"!==e.tag&&(c=encodeURI("!"===e.tag[0]?e.tag.slice(1):e.tag).replace(/!/g,"%21"),c="!"===e.tag[0]?"!"+c:"tag:yaml.org,2002:"===c.slice(0,18)?"!!"+c.slice(18):"!<"+c+">",e.dump=c+" "+e.dump)}return!0}function He(e,t){var n,i,r=[],o=[]
-for(Ge(e,r,o),n=0,i=o.length;n<i;n+=1)t.duplicates.push(r[o[n]])
-t.usedDuplicates=new Array(i)}function Ge(e,t,n){var i,r,o
-if(null!==e&&"object"==typeof e)if(-1!==(r=t.indexOf(e)))-1===n.indexOf(r)&&n.push(r)
-else if(t.push(e),Array.isArray(e))for(r=0,o=e.length;r<o;r+=1)Ge(e[r],t,n)
-else for(r=0,o=(i=Object.keys(e)).length;r<o;r+=1)Ge(e[i[r]],t,n)}function Ve(e,t){return function(){throw new Error("Function yaml."+e+" is removed in js-yaml 4. Use yaml."+t+" instead, which is now safe by default.")}}var Ze=p,ze=h,Je=m,Qe=x,Xe=I,et=Y,tt=ke.load,nt=ke.loadAll,it={dump:function(e,t){var n=new Te(t=t||{})
-n.noRefs||He(e,n)
-var i=e
-return n.replacer&&(i=n.replacer.call({"":i},"",i)),We(n,0,i,!0,!0)?n.dump+"\n":""}}.dump,rt=o,ot=Ve("safeLoad","load"),at=Ve("safeLoadAll","loadAll"),lt=Ve("safeDump","dump"),ct={Type:Ze,Schema:ze,FAILSAFE_SCHEMA:Je,JSON_SCHEMA:Qe,CORE_SCHEMA:Xe,DEFAULT_SCHEMA:et,load:tt,loadAll:nt,dump:it,YAMLException:rt,safeLoad:ot,safeLoadAll:at,safeDump:lt}
-e.CORE_SCHEMA=Xe,e.DEFAULT_SCHEMA=et,e.FAILSAFE_SCHEMA=Je,e.JSON_SCHEMA=Qe,e.Schema=ze,e.Type=Ze,e.YAMLException=rt,e.default=ct,e.dump=it,e.load=tt,e.loadAll=nt,e.safeDump=lt,e.safeLoad=ot,e.safeLoadAll=at,Object.defineProperty(e,"__esModule",{value:!0})})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}((function(e){"use strict"
-e.defineMode("yaml",(function(){var e=new RegExp("\\b(("+["true","false","on","off","yes","no"].join(")|(")+"))$","i")
-return{token:function(t,n){var i=t.peek(),r=n.escaped
-if(n.escaped=!1,"#"==i&&(0==t.pos||/\s/.test(t.string.charAt(t.pos-1))))return t.skipToEnd(),"comment"
-if(t.match(/^('([^']|\\.)*'?|"([^"]|\\.)*"?)/))return"string"
-if(n.literal&&t.indentation()>n.keyCol)return t.skipToEnd(),"string"
-if(n.literal&&(n.literal=!1),t.sol()){if(n.keyCol=0,n.pair=!1,n.pairStart=!1,t.match(/---/))return"def"
-if(t.match(/\.\.\./))return"def"
-if(t.match(/\s*-\s+/))return"meta"}if(t.match(/^(\{|\}|\[|\])/))return"{"==i?n.inlinePairs++:"}"==i?n.inlinePairs--:"["==i?n.inlineList++:n.inlineList--,"meta"
-if(n.inlineList>0&&!r&&","==i)return t.next(),"meta"
-if(n.inlinePairs>0&&!r&&","==i)return n.keyCol=0,n.pair=!1,n.pairStart=!1,t.next(),"meta"
-if(n.pairStart){if(t.match(/^\s*(\||\>)\s*/))return n.literal=!0,"meta"
-if(t.match(/^\s*(\&|\*)[a-z0-9\._-]+\b/i))return"variable-2"
-if(0==n.inlinePairs&&t.match(/^\s*-?[0-9\.\,]+\s?$/))return"number"
-if(n.inlinePairs>0&&t.match(/^\s*-?[0-9\.\,]+\s?(?=(,|}))/))return"number"
-if(t.match(e))return"keyword"}return!n.pair&&t.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^,\[\]{}#&*!|>'"%@`])[^#]*?(?=\s*:($|\s))/)?(n.pair=!0,n.keyCol=t.indentation(),"atom"):n.pair&&t.match(/^:\s*/)?(n.pairStart=!0,"meta"):(n.pairStart=!1,n.escaped="\\"==i,t.next(),null)},startState:function(){return{pair:!1,pairStart:!1,keyCol:0,inlinePairs:0,inlineList:0,literal:!1,escaped:!1}}}})),e.defineMIME("text/x-yaml","yaml")}))
diff --git a/agent/uiserver/dist/assets/codemirror/mode/yaml/yaml-3f129a000349e3075be0f65719884b61.js b/agent/uiserver/dist/assets/codemirror/mode/yaml/yaml-3f129a000349e3075be0f65719884b61.js
new file mode 100644
index 0000000000000..b01cbab24186f
--- /dev/null
+++ b/agent/uiserver/dist/assets/codemirror/mode/yaml/yaml-3f129a000349e3075be0f65719884b61.js
@@ -0,0 +1,276 @@
+/*! js-yaml 4.0.0 https://github.com/nodeca/js-yaml @license MIT */
+(function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).jsyaml={})})(this,(function(e){"use strict"
+function t(e){return null==e}var n={isNothing:t,isObject:function(e){return"object"==typeof e&&null!==e},toArray:function(e){return Array.isArray(e)?e:t(e)?[]:[e]},repeat:function(e,t){var n,i=""
+for(n=0;n<t;n+=1)i+=e
+return i},isNegativeZero:function(e){return 0===e&&Number.NEGATIVE_INFINITY===1/e},extend:function(e,t){var n,i,r,o
+if(t)for(n=0,i=(o=Object.keys(t)).length;n<i;n+=1)e[r=o[n]]=t[r]
+return e}}
+function i(e,t){var n="",i=e.reason||"(unknown reason)"
+return e.mark?(e.mark.name&&(n+='in "'+e.mark.name+'" '),n+="("+(e.mark.line+1)+":"+(e.mark.column+1)+")",!t&&e.mark.snippet&&(n+="\n\n"+e.mark.snippet),i+" "+n):i}function r(e,t){Error.call(this),this.name="YAMLException",this.reason=e,this.mark=t,this.message=i(this,!1),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=(new Error).stack||""}r.prototype=Object.create(Error.prototype),r.prototype.constructor=r,r.prototype.toString=function(e){return this.name+": "+i(this,e)}
+var o=r
+function a(e,t,n,i,r){var o="",a="",l=Math.floor(r/2)-1
+return i-t>l&&(t=i-l+(o=" ... ").length),n-i>l&&(n=i+l-(a=" ...").length),{str:o+e.slice(t,n).replace(/\t/g,"→")+a,pos:i-t+o.length}}function l(e,t){return n.repeat(" ",t-e.length)+e}var c=function(e,t){if(t=Object.create(t||null),!e.buffer)return null
+t.maxLength||(t.maxLength=79),"number"!=typeof t.indent&&(t.indent=1),"number"!=typeof t.linesBefore&&(t.linesBefore=3),"number"!=typeof t.linesAfter&&(t.linesAfter=2)
+for(var i,r=/\r?\n|\r|\0/g,o=[0],c=[],s=-1;i=r.exec(e.buffer);)c.push(i.index),o.push(i.index+i[0].length),e.position<=i.index&&s<0&&(s=o.length-2)
+s<0&&(s=o.length-1)
+var u,p,f="",d=Math.min(e.line+t.linesAfter,c.length).toString().length,h=t.maxLength-(t.indent+d+3)
+for(u=1;u<=t.linesBefore&&!(s-u<0);u++)p=a(e.buffer,o[s-u],c[s-u],e.position-(o[s]-o[s-u]),h),f=n.repeat(" ",t.indent)+l((e.line-u+1).toString(),d)+" | "+p.str+"\n"+f
+for(p=a(e.buffer,o[s],c[s],e.position,h),f+=n.repeat(" ",t.indent)+l((e.line+1).toString(),d)+" | "+p.str+"\n",f+=n.repeat("-",t.indent+d+3+p.pos)+"^\n",u=1;u<=t.linesAfter&&!(s+u>=c.length);u++)p=a(e.buffer,o[s+u],c[s+u],e.position-(o[s]-o[s+u]),h),f+=n.repeat(" ",t.indent)+l((e.line+u+1).toString(),d)+" | "+p.str+"\n"
+return f.replace(/\n$/,"")},s=["kind","multi","resolve","construct","instanceOf","predicate","represent","representName","defaultStyle","styleAliases"],u=["scalar","sequence","mapping"]
+var p=function(e,t){if(t=t||{},Object.keys(t).forEach((function(t){if(-1===s.indexOf(t))throw new o('Unknown option "'+t+'" is met in definition of "'+e+'" YAML type.')})),this.tag=e,this.kind=t.kind||null,this.resolve=t.resolve||function(){return!0},this.construct=t.construct||function(e){return e},this.instanceOf=t.instanceOf||null,this.predicate=t.predicate||null,this.represent=t.represent||null,this.representName=t.representName||null,this.defaultStyle=t.defaultStyle||null,this.multi=t.multi||!1,this.styleAliases=function(e){var t={}
+return null!==e&&Object.keys(e).forEach((function(n){e[n].forEach((function(e){t[String(e)]=n}))})),t}(t.styleAliases||null),-1===u.indexOf(this.kind))throw new o('Unknown kind "'+this.kind+'" is specified for "'+e+'" YAML type.')}
+function f(e,t,n){var i=[]
+return e[t].forEach((function(e){n.forEach((function(t,n){t.tag===e.tag&&t.kind===e.kind&&t.multi===e.multi&&i.push(n)})),n.push(e)})),n.filter((function(e,t){return-1===i.indexOf(t)}))}function d(e){return this.extend(e)}d.prototype.extend=function(e){var t=[],n=[]
+if(e instanceof p)n.push(e)
+else if(Array.isArray(e))n=n.concat(e)
+else{if(!e||!Array.isArray(e.implicit)&&!Array.isArray(e.explicit))throw new o("Schema.extend argument should be a Type, [ Type ], or a schema definition ({ implicit: [...], explicit: [...] })")
+e.implicit&&(t=t.concat(e.implicit)),e.explicit&&(n=n.concat(e.explicit))}t.forEach((function(e){if(!(e instanceof p))throw new o("Specified list of YAML types (or a single Type object) contains a non-Type object.")
+if(e.loadKind&&"scalar"!==e.loadKind)throw new o("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.")
+if(e.multi)throw new o("There is a multi type in the implicit list of a schema. Multi tags can only be listed as explicit.")})),n.forEach((function(e){if(!(e instanceof p))throw new o("Specified list of YAML types (or a single Type object) contains a non-Type object.")}))
+var i=Object.create(d.prototype)
+return i.implicit=(this.implicit||[]).concat(t),i.explicit=(this.explicit||[]).concat(n),i.compiledImplicit=f(i,"implicit",[]),i.compiledExplicit=f(i,"explicit",[]),i.compiledTypeMap=function(){var e,t,n={scalar:{},sequence:{},mapping:{},fallback:{},multi:{scalar:[],sequence:[],mapping:[],fallback:[]}}
+function i(e){e.multi?(n.multi[e.kind].push(e),n.multi.fallback.push(e)):n[e.kind][e.tag]=n.fallback[e.tag]=e}for(e=0,t=arguments.length;e<t;e+=1)arguments[e].forEach(i)
+return n}(i.compiledImplicit,i.compiledExplicit),i}
+var h=d,m=new h({explicit:[new p("tag:yaml.org,2002:str",{kind:"scalar",construct:function(e){return null!==e?e:""}}),new p("tag:yaml.org,2002:seq",{kind:"sequence",construct:function(e){return null!==e?e:[]}}),new p("tag:yaml.org,2002:map",{kind:"mapping",construct:function(e){return null!==e?e:{}}})]})
+var g=new p("tag:yaml.org,2002:null",{kind:"scalar",resolve:function(e){if(null===e)return!0
+var t=e.length
+return 1===t&&"~"===e||4===t&&("null"===e||"Null"===e||"NULL"===e)},construct:function(){return null},predicate:function(e){return null===e},represent:{canonical:function(){return"~"},lowercase:function(){return"null"},uppercase:function(){return"NULL"},camelcase:function(){return"Null"},empty:function(){return""}},defaultStyle:"lowercase"})
+var y=new p("tag:yaml.org,2002:bool",{kind:"scalar",resolve:function(e){if(null===e)return!1
+var t=e.length
+return 4===t&&("true"===e||"True"===e||"TRUE"===e)||5===t&&("false"===e||"False"===e||"FALSE"===e)},construct:function(e){return"true"===e||"True"===e||"TRUE"===e},predicate:function(e){return"[object Boolean]"===Object.prototype.toString.call(e)},represent:{lowercase:function(e){return e?"true":"false"},uppercase:function(e){return e?"TRUE":"FALSE"},camelcase:function(e){return e?"True":"False"}},defaultStyle:"lowercase"})
+function b(e){return 48<=e&&e<=55}function A(e){return 48<=e&&e<=57}var v=new p("tag:yaml.org,2002:int",{kind:"scalar",resolve:function(e){if(null===e)return!1
+var t,n,i=e.length,r=0,o=!1
+if(!i)return!1
+if("-"!==(t=e[r])&&"+"!==t||(t=e[++r]),"0"===t){if(r+1===i)return!0
+if("b"===(t=e[++r])){for(r++;r<i;r++)if("_"!==(t=e[r])){if("0"!==t&&"1"!==t)return!1
+o=!0}return o&&"_"!==t}if("x"===t){for(r++;r<i;r++)if("_"!==(t=e[r])){if(!(48<=(n=e.charCodeAt(r))&&n<=57||65<=n&&n<=70||97<=n&&n<=102))return!1
+o=!0}return o&&"_"!==t}if("o"===t){for(r++;r<i;r++)if("_"!==(t=e[r])){if(!b(e.charCodeAt(r)))return!1
+o=!0}return o&&"_"!==t}}if("_"===t)return!1
+for(;r<i;r++)if("_"!==(t=e[r])){if(!A(e.charCodeAt(r)))return!1
+o=!0}return!(!o||"_"===t)},construct:function(e){var t,n=e,i=1
+if(-1!==n.indexOf("_")&&(n=n.replace(/_/g,"")),"-"!==(t=n[0])&&"+"!==t||("-"===t&&(i=-1),t=(n=n.slice(1))[0]),"0"===n)return 0
+if("0"===t){if("b"===n[1])return i*parseInt(n.slice(2),2)
+if("x"===n[1])return i*parseInt(n.slice(2),16)
+if("o"===n[1])return i*parseInt(n.slice(2),8)}return i*parseInt(n,10)},predicate:function(e){return"[object Number]"===Object.prototype.toString.call(e)&&e%1==0&&!n.isNegativeZero(e)},represent:{binary:function(e){return e>=0?"0b"+e.toString(2):"-0b"+e.toString(2).slice(1)},octal:function(e){return e>=0?"0o"+e.toString(8):"-0o"+e.toString(8).slice(1)},decimal:function(e){return e.toString(10)},hexadecimal:function(e){return e>=0?"0x"+e.toString(16).toUpperCase():"-0x"+e.toString(16).toUpperCase().slice(1)}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}}),k=new RegExp("^(?:[-+]?(?:[0-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$")
+var w=/^[-+]?[0-9]+e/
+var C=new p("tag:yaml.org,2002:float",{kind:"scalar",resolve:function(e){return null!==e&&!(!k.test(e)||"_"===e[e.length-1])},construct:function(e){var t,n
+return n="-"===(t=e.replace(/_/g,"").toLowerCase())[0]?-1:1,"+-".indexOf(t[0])>=0&&(t=t.slice(1)),".inf"===t?1===n?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:".nan"===t?NaN:n*parseFloat(t,10)},predicate:function(e){return"[object Number]"===Object.prototype.toString.call(e)&&(e%1!=0||n.isNegativeZero(e))},represent:function(e,t){var i
+if(isNaN(e))switch(t){case"lowercase":return".nan"
+case"uppercase":return".NAN"
+case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===e)switch(t){case"lowercase":return".inf"
+case"uppercase":return".INF"
+case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===e)switch(t){case"lowercase":return"-.inf"
+case"uppercase":return"-.INF"
+case"camelcase":return"-.Inf"}else if(n.isNegativeZero(e))return"-0.0"
+return i=e.toString(10),w.test(i)?i.replace("e",".e"):i},defaultStyle:"lowercase"}),x=m.extend({implicit:[g,y,v,C]}),I=x,S=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),O=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$")
+var j=new p("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:function(e){return null!==e&&(null!==S.exec(e)||null!==O.exec(e))},construct:function(e){var t,n,i,r,o,a,l,c,s=0,u=null
+if(null===(t=S.exec(e))&&(t=O.exec(e)),null===t)throw new Error("Date resolve error")
+if(n=+t[1],i=+t[2]-1,r=+t[3],!t[4])return new Date(Date.UTC(n,i,r))
+if(o=+t[4],a=+t[5],l=+t[6],t[7]){for(s=t[7].slice(0,3);s.length<3;)s+="0"
+s=+s}return t[9]&&(u=6e4*(60*+t[10]+ +(t[11]||0)),"-"===t[9]&&(u=-u)),c=new Date(Date.UTC(n,i,r,o,a,l,s)),u&&c.setTime(c.getTime()-u),c},instanceOf:Date,represent:function(e){return e.toISOString()}})
+var T=new p("tag:yaml.org,2002:merge",{kind:"scalar",resolve:function(e){return"<<"===e||null===e}}),E="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r"
+var M=new p("tag:yaml.org,2002:binary",{kind:"scalar",resolve:function(e){if(null===e)return!1
+var t,n,i=0,r=e.length,o=E
+for(n=0;n<r;n++)if(!((t=o.indexOf(e.charAt(n)))>64)){if(t<0)return!1
+i+=6}return i%8==0},construct:function(e){var t,n,i=e.replace(/[\r\n=]/g,""),r=i.length,o=E,a=0,l=[]
+for(t=0;t<r;t++)t%4==0&&t&&(l.push(a>>16&255),l.push(a>>8&255),l.push(255&a)),a=a<<6|o.indexOf(i.charAt(t))
+return 0===(n=r%4*6)?(l.push(a>>16&255),l.push(a>>8&255),l.push(255&a)):18===n?(l.push(a>>10&255),l.push(a>>2&255)):12===n&&l.push(a>>4&255),new Uint8Array(l)},predicate:function(e){return"[object Uint8Array]"===Object.prototype.toString.call(e)},represent:function(e){var t,n,i="",r=0,o=e.length,a=E
+for(t=0;t<o;t++)t%3==0&&t&&(i+=a[r>>18&63],i+=a[r>>12&63],i+=a[r>>6&63],i+=a[63&r]),r=(r<<8)+e[t]
+return 0===(n=o%3)?(i+=a[r>>18&63],i+=a[r>>12&63],i+=a[r>>6&63],i+=a[63&r]):2===n?(i+=a[r>>10&63],i+=a[r>>4&63],i+=a[r<<2&63],i+=a[64]):1===n&&(i+=a[r>>2&63],i+=a[r<<4&63],i+=a[64],i+=a[64]),i}}),L=Object.prototype.hasOwnProperty,N=Object.prototype.toString
+var F=new p("tag:yaml.org,2002:omap",{kind:"sequence",resolve:function(e){if(null===e)return!0
+var t,n,i,r,o,a=[],l=e
+for(t=0,n=l.length;t<n;t+=1){if(i=l[t],o=!1,"[object Object]"!==N.call(i))return!1
+for(r in i)if(L.call(i,r)){if(o)return!1
+o=!0}if(!o)return!1
+if(-1!==a.indexOf(r))return!1
+a.push(r)}return!0},construct:function(e){return null!==e?e:[]}}),_=Object.prototype.toString
+var D=new p("tag:yaml.org,2002:pairs",{kind:"sequence",resolve:function(e){if(null===e)return!0
+var t,n,i,r,o,a=e
+for(o=new Array(a.length),t=0,n=a.length;t<n;t+=1){if(i=a[t],"[object Object]"!==_.call(i))return!1
+if(1!==(r=Object.keys(i)).length)return!1
+o[t]=[r[0],i[r[0]]]}return!0},construct:function(e){if(null===e)return[]
+var t,n,i,r,o,a=e
+for(o=new Array(a.length),t=0,n=a.length;t<n;t+=1)i=a[t],r=Object.keys(i),o[t]=[r[0],i[r[0]]]
+return o}}),U=Object.prototype.hasOwnProperty
+var q=new p("tag:yaml.org,2002:set",{kind:"mapping",resolve:function(e){if(null===e)return!0
+var t,n=e
+for(t in n)if(U.call(n,t)&&null!==n[t])return!1
+return!0},construct:function(e){return null!==e?e:{}}}),Y=I.extend({implicit:[j,T],explicit:[M,F,D,q]}),P=Object.prototype.hasOwnProperty,R=/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/,$=/[\x85\u2028\u2029]/,B=/[,\[\]\{\}]/,K=/^(?:!|!!|![a-z\-]+!)$/i,W=/^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i
+function H(e){return Object.prototype.toString.call(e)}function G(e){return 10===e||13===e}function V(e){return 9===e||32===e}function Z(e){return 9===e||32===e||10===e||13===e}function z(e){return 44===e||91===e||93===e||123===e||125===e}function J(e){var t
+return 48<=e&&e<=57?e-48:97<=(t=32|e)&&t<=102?t-97+10:-1}function Q(e){return 48===e?"\0":97===e?"":98===e?"\b":116===e||9===e?"\t":110===e?"\n":118===e?"\v":102===e?"\f":114===e?"\r":101===e?"":32===e?" ":34===e?'"':47===e?"/":92===e?"\\":78===e?"…":95===e?" ":76===e?"\u2028":80===e?"\u2029":""}function X(e){return e<=65535?String.fromCharCode(e):String.fromCharCode(55296+(e-65536>>10),56320+(e-65536&1023))}for(var ee=new Array(256),te=new Array(256),ne=0;ne<256;ne++)ee[ne]=Q(ne)?1:0,te[ne]=Q(ne)
+function ie(e,t){this.input=e,this.filename=t.filename||null,this.schema=t.schema||Y,this.onWarning=t.onWarning||null,this.legacy=t.legacy||!1,this.json=t.json||!1,this.listener=t.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=e.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.firstTabInLine=-1,this.documents=[]}function re(e,t){var n={name:e.filename,buffer:e.input.slice(0,-1),position:e.position,line:e.line,column:e.position-e.lineStart}
+return n.snippet=c(n),new o(t,n)}function oe(e,t){throw re(e,t)}function ae(e,t){e.onWarning&&e.onWarning.call(null,re(e,t))}var le={YAML:function(e,t,n){var i,r,o
+null!==e.version&&oe(e,"duplication of %YAML directive"),1!==n.length&&oe(e,"YAML directive accepts exactly one argument"),null===(i=/^([0-9]+)\.([0-9]+)$/.exec(n[0]))&&oe(e,"ill-formed argument of the YAML directive"),r=parseInt(i[1],10),o=parseInt(i[2],10),1!==r&&oe(e,"unacceptable YAML version of the document"),e.version=n[0],e.checkLineBreaks=o<2,1!==o&&2!==o&&ae(e,"unsupported YAML version of the document")},TAG:function(e,t,n){var i,r
+2!==n.length&&oe(e,"TAG directive accepts exactly two arguments"),i=n[0],r=n[1],K.test(i)||oe(e,"ill-formed tag handle (first argument) of the TAG directive"),P.call(e.tagMap,i)&&oe(e,'there is a previously declared suffix for "'+i+'" tag handle'),W.test(r)||oe(e,"ill-formed tag prefix (second argument) of the TAG directive")
+try{r=decodeURIComponent(r)}catch(o){oe(e,"tag prefix is malformed: "+r)}e.tagMap[i]=r}}
+function ce(e,t,n,i){var r,o,a,l
+if(t<n){if(l=e.input.slice(t,n),i)for(r=0,o=l.length;r<o;r+=1)9===(a=l.charCodeAt(r))||32<=a&&a<=1114111||oe(e,"expected valid JSON character")
+else R.test(l)&&oe(e,"the stream contains non-printable characters")
+e.result+=l}}function se(e,t,i,r){var o,a,l,c
+for(n.isObject(i)||oe(e,"cannot merge mappings; the provided source object is unacceptable"),l=0,c=(o=Object.keys(i)).length;l<c;l+=1)a=o[l],P.call(t,a)||(t[a]=i[a],r[a]=!0)}function ue(e,t,n,i,r,o,a,l,c){var s,u
+if(Array.isArray(r))for(s=0,u=(r=Array.prototype.slice.call(r)).length;s<u;s+=1)Array.isArray(r[s])&&oe(e,"nested arrays are not supported inside keys"),"object"==typeof r&&"[object Object]"===H(r[s])&&(r[s]="[object Object]")
+if("object"==typeof r&&"[object Object]"===H(r)&&(r="[object Object]"),r=String(r),null===t&&(t={}),"tag:yaml.org,2002:merge"===i)if(Array.isArray(o))for(s=0,u=o.length;s<u;s+=1)se(e,t,o[s],n)
+else se(e,t,o,n)
+else e.json||P.call(n,r)||!P.call(t,r)||(e.line=a||e.line,e.lineStart=l||e.lineStart,e.position=c||e.position,oe(e,"duplicated mapping key")),"__proto__"===r?Object.defineProperty(t,r,{configurable:!0,enumerable:!0,writable:!0,value:o}):t[r]=o,delete n[r]
+return t}function pe(e){var t
+10===(t=e.input.charCodeAt(e.position))?e.position++:13===t?(e.position++,10===e.input.charCodeAt(e.position)&&e.position++):oe(e,"a line break is expected"),e.line+=1,e.lineStart=e.position,e.firstTabInLine=-1}function fe(e,t,n){for(var i=0,r=e.input.charCodeAt(e.position);0!==r;){for(;V(r);)9===r&&-1===e.firstTabInLine&&(e.firstTabInLine=e.position),r=e.input.charCodeAt(++e.position)
+if(t&&35===r)do{r=e.input.charCodeAt(++e.position)}while(10!==r&&13!==r&&0!==r)
+if(!G(r))break
+for(pe(e),r=e.input.charCodeAt(e.position),i++,e.lineIndent=0;32===r;)e.lineIndent++,r=e.input.charCodeAt(++e.position)}return-1!==n&&0!==i&&e.lineIndent<n&&ae(e,"deficient indentation"),i}function de(e){var t,n=e.position
+return!(45!==(t=e.input.charCodeAt(n))&&46!==t||t!==e.input.charCodeAt(n+1)||t!==e.input.charCodeAt(n+2)||(n+=3,0!==(t=e.input.charCodeAt(n))&&!Z(t)))}function he(e,t){1===t?e.result+=" ":t>1&&(e.result+=n.repeat("\n",t-1))}function me(e,t){var n,i,r=e.tag,o=e.anchor,a=[],l=!1
+if(-1!==e.firstTabInLine)return!1
+for(null!==e.anchor&&(e.anchorMap[e.anchor]=a),i=e.input.charCodeAt(e.position);0!==i&&(-1!==e.firstTabInLine&&(e.position=e.firstTabInLine,oe(e,"tab characters must not be used in indentation")),45===i)&&Z(e.input.charCodeAt(e.position+1));)if(l=!0,e.position++,fe(e,!0,-1)&&e.lineIndent<=t)a.push(null),i=e.input.charCodeAt(e.position)
+else if(n=e.line,be(e,t,3,!1,!0),a.push(e.result),fe(e,!0,-1),i=e.input.charCodeAt(e.position),(e.line===n||e.lineIndent>t)&&0!==i)oe(e,"bad indentation of a sequence entry")
+else if(e.lineIndent<t)break
+return!!l&&(e.tag=r,e.anchor=o,e.kind="sequence",e.result=a,!0)}function ge(e){var t,n,i,r,o=!1,a=!1
+if(33!==(r=e.input.charCodeAt(e.position)))return!1
+if(null!==e.tag&&oe(e,"duplication of a tag property"),60===(r=e.input.charCodeAt(++e.position))?(o=!0,r=e.input.charCodeAt(++e.position)):33===r?(a=!0,n="!!",r=e.input.charCodeAt(++e.position)):n="!",t=e.position,o){do{r=e.input.charCodeAt(++e.position)}while(0!==r&&62!==r)
+e.position<e.length?(i=e.input.slice(t,e.position),r=e.input.charCodeAt(++e.position)):oe(e,"unexpected end of the stream within a verbatim tag")}else{for(;0!==r&&!Z(r);)33===r&&(a?oe(e,"tag suffix cannot contain exclamation marks"):(n=e.input.slice(t-1,e.position+1),K.test(n)||oe(e,"named tag handle cannot contain such characters"),a=!0,t=e.position+1)),r=e.input.charCodeAt(++e.position)
+i=e.input.slice(t,e.position),B.test(i)&&oe(e,"tag suffix cannot contain flow indicator characters")}i&&!W.test(i)&&oe(e,"tag name cannot contain such characters: "+i)
+try{i=decodeURIComponent(i)}catch(l){oe(e,"tag name is malformed: "+i)}return o?e.tag=i:P.call(e.tagMap,n)?e.tag=e.tagMap[n]+i:"!"===n?e.tag="!"+i:"!!"===n?e.tag="tag:yaml.org,2002:"+i:oe(e,'undeclared tag handle "'+n+'"'),!0}function ye(e){var t,n
+if(38!==(n=e.input.charCodeAt(e.position)))return!1
+for(null!==e.anchor&&oe(e,"duplication of an anchor property"),n=e.input.charCodeAt(++e.position),t=e.position;0!==n&&!Z(n)&&!z(n);)n=e.input.charCodeAt(++e.position)
+return e.position===t&&oe(e,"name of an anchor node must contain at least one character"),e.anchor=e.input.slice(t,e.position),!0}function be(e,t,i,r,o){var a,l,c,s,u,p,f,d,h,m=1,g=!1,y=!1
+if(null!==e.listener&&e.listener("open",e),e.tag=null,e.anchor=null,e.kind=null,e.result=null,a=l=c=4===i||3===i,r&&fe(e,!0,-1)&&(g=!0,e.lineIndent>t?m=1:e.lineIndent===t?m=0:e.lineIndent<t&&(m=-1)),1===m)for(;ge(e)||ye(e);)fe(e,!0,-1)?(g=!0,c=a,e.lineIndent>t?m=1:e.lineIndent===t?m=0:e.lineIndent<t&&(m=-1)):c=!1
+if(c&&(c=g||o),1!==m&&4!==i||(d=1===i||2===i?t:t+1,h=e.position-e.lineStart,1===m?c&&(me(e,h)||function(e,t,n){var i,r,o,a,l,c,s,u=e.tag,p=e.anchor,f={},d=Object.create(null),h=null,m=null,g=null,y=!1,b=!1
+if(-1!==e.firstTabInLine)return!1
+for(null!==e.anchor&&(e.anchorMap[e.anchor]=f),s=e.input.charCodeAt(e.position);0!==s;){if(y||-1===e.firstTabInLine||(e.position=e.firstTabInLine,oe(e,"tab characters must not be used in indentation")),i=e.input.charCodeAt(e.position+1),o=e.line,63!==s&&58!==s||!Z(i)){if(a=e.line,l=e.lineStart,c=e.position,!be(e,n,2,!1,!0))break
+if(e.line===o){for(s=e.input.charCodeAt(e.position);V(s);)s=e.input.charCodeAt(++e.position)
+if(58===s)Z(s=e.input.charCodeAt(++e.position))||oe(e,"a whitespace character is expected after the key-value separator within a block mapping"),y&&(ue(e,f,d,h,m,null,a,l,c),h=m=g=null),b=!0,y=!1,r=!1,h=e.tag,m=e.result
+else{if(!b)return e.tag=u,e.anchor=p,!0
+oe(e,"can not read an implicit mapping pair; a colon is missed")}}else{if(!b)return e.tag=u,e.anchor=p,!0
+oe(e,"can not read a block mapping entry; a multiline key may not be an implicit key")}}else 63===s?(y&&(ue(e,f,d,h,m,null,a,l,c),h=m=g=null),b=!0,y=!0,r=!0):y?(y=!1,r=!0):oe(e,"incomplete explicit mapping pair; a key node is missed; or followed by a non-tabulated empty line"),e.position+=1,s=i
+if((e.line===o||e.lineIndent>t)&&(y&&(a=e.line,l=e.lineStart,c=e.position),be(e,t,4,!0,r)&&(y?m=e.result:g=e.result),y||(ue(e,f,d,h,m,g,a,l,c),h=m=g=null),fe(e,!0,-1),s=e.input.charCodeAt(e.position)),(e.line===o||e.lineIndent>t)&&0!==s)oe(e,"bad indentation of a mapping entry")
+else if(e.lineIndent<t)break}return y&&ue(e,f,d,h,m,null,a,l,c),b&&(e.tag=u,e.anchor=p,e.kind="mapping",e.result=f),b}(e,h,d))||function(e,t){var n,i,r,o,a,l,c,s,u,p,f,d,h=!0,m=e.tag,g=e.anchor,y=Object.create(null)
+if(91===(d=e.input.charCodeAt(e.position)))a=93,s=!1,o=[]
+else{if(123!==d)return!1
+a=125,s=!0,o={}}for(null!==e.anchor&&(e.anchorMap[e.anchor]=o),d=e.input.charCodeAt(++e.position);0!==d;){if(fe(e,!0,t),(d=e.input.charCodeAt(e.position))===a)return e.position++,e.tag=m,e.anchor=g,e.kind=s?"mapping":"sequence",e.result=o,!0
+h?44===d&&oe(e,"expected the node content, but found ','"):oe(e,"missed comma between flow collection entries"),f=null,l=c=!1,63===d&&Z(e.input.charCodeAt(e.position+1))&&(l=c=!0,e.position++,fe(e,!0,t)),n=e.line,i=e.lineStart,r=e.position,be(e,t,1,!1,!0),p=e.tag,u=e.result,fe(e,!0,t),d=e.input.charCodeAt(e.position),!c&&e.line!==n||58!==d||(l=!0,d=e.input.charCodeAt(++e.position),fe(e,!0,t),be(e,t,1,!1,!0),f=e.result),s?ue(e,o,y,p,u,f,n,i,r):l?o.push(ue(e,null,y,p,u,f,n,i,r)):o.push(u),fe(e,!0,t),44===(d=e.input.charCodeAt(e.position))?(h=!0,d=e.input.charCodeAt(++e.position)):h=!1}oe(e,"unexpected end of the stream within a flow collection")}(e,d)?y=!0:(l&&function(e,t){var i,r,o,a,l,c=1,s=!1,u=!1,p=t,f=0,d=!1
+if(124===(a=e.input.charCodeAt(e.position)))r=!1
+else{if(62!==a)return!1
+r=!0}for(e.kind="scalar",e.result="";0!==a;)if(43===(a=e.input.charCodeAt(++e.position))||45===a)1===c?c=43===a?3:2:oe(e,"repeat of a chomping mode identifier")
+else{if(!((o=48<=(l=a)&&l<=57?l-48:-1)>=0))break
+0===o?oe(e,"bad explicit indentation width of a block scalar; it cannot be less than one"):u?oe(e,"repeat of an indentation width identifier"):(p=t+o-1,u=!0)}if(V(a)){do{a=e.input.charCodeAt(++e.position)}while(V(a))
+if(35===a)do{a=e.input.charCodeAt(++e.position)}while(!G(a)&&0!==a)}for(;0!==a;){for(pe(e),e.lineIndent=0,a=e.input.charCodeAt(e.position);(!u||e.lineIndent<p)&&32===a;)e.lineIndent++,a=e.input.charCodeAt(++e.position)
+if(!u&&e.lineIndent>p&&(p=e.lineIndent),G(a))f++
+else{if(e.lineIndent<p){3===c?e.result+=n.repeat("\n",s?1+f:f):1===c&&s&&(e.result+="\n")
+break}for(r?V(a)?(d=!0,e.result+=n.repeat("\n",s?1+f:f)):d?(d=!1,e.result+=n.repeat("\n",f+1)):0===f?s&&(e.result+=" "):e.result+=n.repeat("\n",f):e.result+=n.repeat("\n",s?1+f:f),s=!0,u=!0,f=0,i=e.position;!G(a)&&0!==a;)a=e.input.charCodeAt(++e.position)
+ce(e,i,e.position,!1)}}return!0}(e,d)||function(e,t){var n,i,r
+if(39!==(n=e.input.charCodeAt(e.position)))return!1
+for(e.kind="scalar",e.result="",e.position++,i=r=e.position;0!==(n=e.input.charCodeAt(e.position));)if(39===n){if(ce(e,i,e.position,!0),39!==(n=e.input.charCodeAt(++e.position)))return!0
+i=e.position,e.position++,r=e.position}else G(n)?(ce(e,i,r,!0),he(e,fe(e,!1,t)),i=r=e.position):e.position===e.lineStart&&de(e)?oe(e,"unexpected end of the document within a single quoted scalar"):(e.position++,r=e.position)
+oe(e,"unexpected end of the stream within a single quoted scalar")}(e,d)||function(e,t){var n,i,r,o,a,l,c
+if(34!==(l=e.input.charCodeAt(e.position)))return!1
+for(e.kind="scalar",e.result="",e.position++,n=i=e.position;0!==(l=e.input.charCodeAt(e.position));){if(34===l)return ce(e,n,e.position,!0),e.position++,!0
+if(92===l){if(ce(e,n,e.position,!0),G(l=e.input.charCodeAt(++e.position)))fe(e,!1,t)
+else if(l<256&&ee[l])e.result+=te[l],e.position++
+else if((a=120===(c=l)?2:117===c?4:85===c?8:0)>0){for(r=a,o=0;r>0;r--)(a=J(l=e.input.charCodeAt(++e.position)))>=0?o=(o<<4)+a:oe(e,"expected hexadecimal character")
+e.result+=X(o),e.position++}else oe(e,"unknown escape sequence")
+n=i=e.position}else G(l)?(ce(e,n,i,!0),he(e,fe(e,!1,t)),n=i=e.position):e.position===e.lineStart&&de(e)?oe(e,"unexpected end of the document within a double quoted scalar"):(e.position++,i=e.position)}oe(e,"unexpected end of the stream within a double quoted scalar")}(e,d)?y=!0:!function(e){var t,n,i
+if(42!==(i=e.input.charCodeAt(e.position)))return!1
+for(i=e.input.charCodeAt(++e.position),t=e.position;0!==i&&!Z(i)&&!z(i);)i=e.input.charCodeAt(++e.position)
+return e.position===t&&oe(e,"name of an alias node must contain at least one character"),n=e.input.slice(t,e.position),P.call(e.anchorMap,n)||oe(e,'unidentified alias "'+n+'"'),e.result=e.anchorMap[n],fe(e,!0,-1),!0}(e)?function(e,t,n){var i,r,o,a,l,c,s,u,p=e.kind,f=e.result
+if(Z(u=e.input.charCodeAt(e.position))||z(u)||35===u||38===u||42===u||33===u||124===u||62===u||39===u||34===u||37===u||64===u||96===u)return!1
+if((63===u||45===u)&&(Z(i=e.input.charCodeAt(e.position+1))||n&&z(i)))return!1
+for(e.kind="scalar",e.result="",r=o=e.position,a=!1;0!==u;){if(58===u){if(Z(i=e.input.charCodeAt(e.position+1))||n&&z(i))break}else if(35===u){if(Z(e.input.charCodeAt(e.position-1)))break}else{if(e.position===e.lineStart&&de(e)||n&&z(u))break
+if(G(u)){if(l=e.line,c=e.lineStart,s=e.lineIndent,fe(e,!1,-1),e.lineIndent>=t){a=!0,u=e.input.charCodeAt(e.position)
+continue}e.position=o,e.line=l,e.lineStart=c,e.lineIndent=s
+break}}a&&(ce(e,r,o,!1),he(e,e.line-l),r=o=e.position,a=!1),V(u)||(o=e.position+1),u=e.input.charCodeAt(++e.position)}return ce(e,r,o,!1),!!e.result||(e.kind=p,e.result=f,!1)}(e,d,1===i)&&(y=!0,null===e.tag&&(e.tag="?")):(y=!0,null===e.tag&&null===e.anchor||oe(e,"alias node should not have any properties")),null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)):0===m&&(y=c&&me(e,h))),null===e.tag)null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)
+else if("?"===e.tag){for(null!==e.result&&"scalar"!==e.kind&&oe(e,'unacceptable node kind for !<?> tag; it should be "scalar", not "'+e.kind+'"'),s=0,u=e.implicitTypes.length;s<u;s+=1)if((f=e.implicitTypes[s]).resolve(e.result)){e.result=f.construct(e.result),e.tag=f.tag,null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)
+break}}else if("!"!==e.tag){if(P.call(e.typeMap[e.kind||"fallback"],e.tag))f=e.typeMap[e.kind||"fallback"][e.tag]
+else for(f=null,s=0,u=(p=e.typeMap.multi[e.kind||"fallback"]).length;s<u;s+=1)if(e.tag.slice(0,p[s].tag.length)===p[s].tag){f=p[s]
+break}f||oe(e,"unknown tag !<"+e.tag+">"),null!==e.result&&f.kind!==e.kind&&oe(e,"unacceptable node kind for !<"+e.tag+'> tag; it should be "'+f.kind+'", not "'+e.kind+'"'),f.resolve(e.result,e.tag)?(e.result=f.construct(e.result,e.tag),null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)):oe(e,"cannot resolve a node with !<"+e.tag+"> explicit tag")}return null!==e.listener&&e.listener("close",e),null!==e.tag||null!==e.anchor||y}function Ae(e){var t,n,i,r,o=e.position,a=!1
+for(e.version=null,e.checkLineBreaks=e.legacy,e.tagMap=Object.create(null),e.anchorMap=Object.create(null);0!==(r=e.input.charCodeAt(e.position))&&(fe(e,!0,-1),r=e.input.charCodeAt(e.position),!(e.lineIndent>0||37!==r));){for(a=!0,r=e.input.charCodeAt(++e.position),t=e.position;0!==r&&!Z(r);)r=e.input.charCodeAt(++e.position)
+for(i=[],(n=e.input.slice(t,e.position)).length<1&&oe(e,"directive name must not be less than one character in length");0!==r;){for(;V(r);)r=e.input.charCodeAt(++e.position)
+if(35===r){do{r=e.input.charCodeAt(++e.position)}while(0!==r&&!G(r))
+break}if(G(r))break
+for(t=e.position;0!==r&&!Z(r);)r=e.input.charCodeAt(++e.position)
+i.push(e.input.slice(t,e.position))}0!==r&&pe(e),P.call(le,n)?le[n](e,n,i):ae(e,'unknown document directive "'+n+'"')}fe(e,!0,-1),0===e.lineIndent&&45===e.input.charCodeAt(e.position)&&45===e.input.charCodeAt(e.position+1)&&45===e.input.charCodeAt(e.position+2)?(e.position+=3,fe(e,!0,-1)):a&&oe(e,"directives end mark is expected"),be(e,e.lineIndent-1,4,!1,!0),fe(e,!0,-1),e.checkLineBreaks&&$.test(e.input.slice(o,e.position))&&ae(e,"non-ASCII line breaks are interpreted as content"),e.documents.push(e.result),e.position===e.lineStart&&de(e)?46===e.input.charCodeAt(e.position)&&(e.position+=3,fe(e,!0,-1)):e.position<e.length-1&&oe(e,"end of the stream or a document separator is expected")}function ve(e,t){t=t||{},0!==(e=String(e)).length&&(10!==e.charCodeAt(e.length-1)&&13!==e.charCodeAt(e.length-1)&&(e+="\n"),65279===e.charCodeAt(0)&&(e=e.slice(1)))
+var n=new ie(e,t),i=e.indexOf("\0")
+for(-1!==i&&(n.position=i,oe(n,"null byte is not allowed in input")),n.input+="\0";32===n.input.charCodeAt(n.position);)n.lineIndent+=1,n.position+=1
+for(;n.position<n.length-1;)Ae(n)
+return n.documents}var ke={loadAll:function(e,t,n){null!==t&&"object"==typeof t&&void 0===n&&(n=t,t=null)
+var i=ve(e,n)
+if("function"!=typeof t)return i
+for(var r=0,o=i.length;r<o;r+=1)t(i[r])},load:function(e,t){var n=ve(e,t)
+if(0!==n.length){if(1===n.length)return n[0]
+throw new o("expected a single document in the stream, but found more")}}},we=Object.prototype.toString,Ce=Object.prototype.hasOwnProperty,xe={0:"\\0",7:"\\a",8:"\\b",9:"\\t",10:"\\n",11:"\\v",12:"\\f",13:"\\r",27:"\\e",34:'\\"',92:"\\\\",133:"\\N",160:"\\_",8232:"\\L",8233:"\\P"},Ie=["y","Y","yes","Yes","YES","on","On","ON","n","N","no","No","NO","off","Off","OFF"],Se=/^[-+]?[0-9_]+(?::[0-9_]+)+(?:\.[0-9_]*)?$/
+function Oe(e){var t,i,r
+if(t=e.toString(16).toUpperCase(),e<=255)i="x",r=2
+else if(e<=65535)i="u",r=4
+else{if(!(e<=4294967295))throw new o("code point within a string may not be greater than 0xFFFFFFFF")
+i="U",r=8}return"\\"+i+n.repeat("0",r-t.length)+t}function je(e){this.schema=e.schema||Y,this.indent=Math.max(1,e.indent||2),this.noArrayIndent=e.noArrayIndent||!1,this.skipInvalid=e.skipInvalid||!1,this.flowLevel=n.isNothing(e.flowLevel)?-1:e.flowLevel,this.styleMap=function(e,t){var n,i,r,o,a,l,c
+if(null===t)return{}
+for(n={},r=0,o=(i=Object.keys(t)).length;r<o;r+=1)a=i[r],l=String(t[a]),"!!"===a.slice(0,2)&&(a="tag:yaml.org,2002:"+a.slice(2)),(c=e.compiledTypeMap.fallback[a])&&Ce.call(c.styleAliases,l)&&(l=c.styleAliases[l]),n[a]=l
+return n}(this.schema,e.styles||null),this.sortKeys=e.sortKeys||!1,this.lineWidth=e.lineWidth||80,this.noRefs=e.noRefs||!1,this.noCompatMode=e.noCompatMode||!1,this.condenseFlow=e.condenseFlow||!1,this.quotingType='"'===e.quotingType?2:1,this.forceQuotes=e.forceQuotes||!1,this.replacer="function"==typeof e.replacer?e.replacer:null,this.implicitTypes=this.schema.compiledImplicit,this.explicitTypes=this.schema.compiledExplicit,this.tag=null,this.result="",this.duplicates=[],this.usedDuplicates=null}function Te(e,t){for(var i,r=n.repeat(" ",t),o=0,a=-1,l="",c=e.length;o<c;)-1===(a=e.indexOf("\n",o))?(i=e.slice(o),o=c):(i=e.slice(o,a+1),o=a+1),i.length&&"\n"!==i&&(l+=r),l+=i
+return l}function Ee(e,t){return"\n"+n.repeat(" ",e.indent*t)}function Me(e){return 32===e||9===e}function Le(e){return 32<=e&&e<=126||161<=e&&e<=55295&&8232!==e&&8233!==e||57344<=e&&e<=65533&&65279!==e||65536<=e&&e<=1114111}function Ne(e){return Le(e)&&65279!==e&&13!==e&&10!==e}function Fe(e,t,n){var i=Ne(e),r=i&&!Me(e)
+return(n?i:i&&44!==e&&91!==e&&93!==e&&123!==e&&125!==e)&&35!==e&&!(58===t&&!r)||Ne(t)&&!Me(t)&&35===e||58===t&&r}function _e(e,t){var n,i=e.charCodeAt(t)
+return i>=55296&&i<=56319&&t+1<e.length&&(n=e.charCodeAt(t+1))>=56320&&n<=57343?1024*(i-55296)+n-56320+65536:i}function De(e){return/^\n* /.test(e)}function Ue(e,t,n,i,r,o,a,l){var c,s,u=0,p=null,f=!1,d=!1,h=-1!==i,m=-1,g=Le(s=_e(e,0))&&65279!==s&&!Me(s)&&45!==s&&63!==s&&58!==s&&44!==s&&91!==s&&93!==s&&123!==s&&125!==s&&35!==s&&38!==s&&42!==s&&33!==s&&124!==s&&61!==s&&62!==s&&39!==s&&34!==s&&37!==s&&64!==s&&96!==s&&function(e){return!Me(e)&&58!==e}(_e(e,e.length-1))
+if(t||a)for(c=0;c<e.length;u>=65536?c+=2:c++){if(!Le(u=_e(e,c)))return 5
+g=g&&Fe(u,p,l),p=u}else{for(c=0;c<e.length;u>=65536?c+=2:c++){if(10===(u=_e(e,c)))f=!0,h&&(d=d||c-m-1>i&&" "!==e[m+1],m=c)
+else if(!Le(u))return 5
+g=g&&Fe(u,p,l),p=u}d=d||h&&c-m-1>i&&" "!==e[m+1]}return f||d?n>9&&De(e)?5:a?2===o?5:2:d?4:3:!g||a||r(e)?2===o?5:2:1}function qe(e,t,n,i,r){e.dump=function(){if(0===t.length)return 2===e.quotingType?'""':"''"
+if(!e.noCompatMode&&(-1!==Ie.indexOf(t)||Se.test(t)))return 2===e.quotingType?'"'+t+'"':"'"+t+"'"
+var a=e.indent*Math.max(1,n),l=-1===e.lineWidth?-1:Math.max(Math.min(e.lineWidth,40),e.lineWidth-a),c=i||e.flowLevel>-1&&n>=e.flowLevel
+switch(Ue(t,c,e.indent,l,(function(t){return function(e,t){var n,i
+for(n=0,i=e.implicitTypes.length;n<i;n+=1)if(e.implicitTypes[n].resolve(t))return!0
+return!1}(e,t)}),e.quotingType,e.forceQuotes&&!i,r)){case 1:return t
+case 2:return"'"+t.replace(/'/g,"''")+"'"
+case 3:return"|"+Ye(t,e.indent)+Pe(Te(t,a))
+case 4:return">"+Ye(t,e.indent)+Pe(Te(function(e,t){var n,i,r=/(\n+)([^\n]*)/g,o=(l=e.indexOf("\n"),l=-1!==l?l:e.length,r.lastIndex=l,Re(e.slice(0,l),t)),a="\n"===e[0]||" "===e[0]
+var l
+for(;i=r.exec(e);){var c=i[1],s=i[2]
+n=" "===s[0],o+=c+(a||n||""===s?"":"\n")+Re(s,t),a=n}return o}(t,l),a))
+case 5:return'"'+function(e){for(var t,n="",i=0,r=0;r<e.length;i>=65536?r+=2:r++)i=_e(e,r),!(t=xe[i])&&Le(i)?(n+=e[r],i>=65536&&(n+=e[r+1])):n+=t||Oe(i)
+return n}(t)+'"'
+default:throw new o("impossible error: invalid scalar style")}}()}function Ye(e,t){var n=De(e)?String(t):"",i="\n"===e[e.length-1]
+return n+(i&&("\n"===e[e.length-2]||"\n"===e)?"+":i?"":"-")+"\n"}function Pe(e){return"\n"===e[e.length-1]?e.slice(0,-1):e}function Re(e,t){if(""===e||" "===e[0])return e
+for(var n,i,r=/ [^ ]/g,o=0,a=0,l=0,c="";n=r.exec(e);)(l=n.index)-o>t&&(i=a>o?a:l,c+="\n"+e.slice(o,i),o=i+1),a=l
+return c+="\n",e.length-o>t&&a>o?c+=e.slice(o,a)+"\n"+e.slice(a+1):c+=e.slice(o),c.slice(1)}function $e(e,t,n,i){var r,o,a,l="",c=e.tag
+for(r=0,o=n.length;r<o;r+=1)a=n[r],e.replacer&&(a=e.replacer.call(n,String(r),a)),(Ke(e,t+1,a,!0,!0,!1,!0)||void 0===a&&Ke(e,t+1,null,!0,!0,!1,!0))&&(i&&""===l||(l+=Ee(e,t)),e.dump&&10===e.dump.charCodeAt(0)?l+="-":l+="- ",l+=e.dump)
+e.tag=c,e.dump=l||"[]"}function Be(e,t,n){var i,r,a,l,c,s
+for(a=0,l=(r=n?e.explicitTypes:e.implicitTypes).length;a<l;a+=1)if(((c=r[a]).instanceOf||c.predicate)&&(!c.instanceOf||"object"==typeof t&&t instanceof c.instanceOf)&&(!c.predicate||c.predicate(t))){if(n?c.multi&&c.representName?e.tag=c.representName(t):e.tag=c.tag:e.tag="?",c.represent){if(s=e.styleMap[c.tag]||c.defaultStyle,"[object Function]"===we.call(c.represent))i=c.represent(t,s)
+else{if(!Ce.call(c.represent,s))throw new o("!<"+c.tag+'> tag resolver accepts not "'+s+'" style')
+i=c.represent[s](t,s)}e.dump=i}return!0}return!1}function Ke(e,t,n,i,r,a,l){e.tag=null,e.dump=n,Be(e,n,!1)||Be(e,n,!0)
+var c,s=we.call(e.dump),u=i
+i&&(i=e.flowLevel<0||e.flowLevel>t)
+var p,f,d="[object Object]"===s||"[object Array]"===s
+if(d&&(f=-1!==(p=e.duplicates.indexOf(n))),(null!==e.tag&&"?"!==e.tag||f||2!==e.indent&&t>0)&&(r=!1),f&&e.usedDuplicates[p])e.dump="*ref_"+p
+else{if(d&&f&&!e.usedDuplicates[p]&&(e.usedDuplicates[p]=!0),"[object Object]"===s)i&&0!==Object.keys(e.dump).length?(function(e,t,n,i){var r,a,l,c,s,u,p="",f=e.tag,d=Object.keys(n)
+if(!0===e.sortKeys)d.sort()
+else if("function"==typeof e.sortKeys)d.sort(e.sortKeys)
+else if(e.sortKeys)throw new o("sortKeys must be a boolean or a function")
+for(r=0,a=d.length;r<a;r+=1)u="",i&&""===p||(u+=Ee(e,t)),c=n[l=d[r]],e.replacer&&(c=e.replacer.call(n,l,c)),Ke(e,t+1,l,!0,!0,!0)&&((s=null!==e.tag&&"?"!==e.tag||e.dump&&e.dump.length>1024)&&(e.dump&&10===e.dump.charCodeAt(0)?u+="?":u+="? "),u+=e.dump,s&&(u+=Ee(e,t)),Ke(e,t+1,c,!0,s)&&(e.dump&&10===e.dump.charCodeAt(0)?u+=":":u+=": ",p+=u+=e.dump))
+e.tag=f,e.dump=p||"{}"}(e,t,e.dump,r),f&&(e.dump="&ref_"+p+e.dump)):(function(e,t,n){var i,r,o,a,l,c="",s=e.tag,u=Object.keys(n)
+for(i=0,r=u.length;i<r;i+=1)l="",""!==c&&(l+=", "),e.condenseFlow&&(l+='"'),a=n[o=u[i]],e.replacer&&(a=e.replacer.call(n,o,a)),Ke(e,t,o,!1,!1)&&(e.dump.length>1024&&(l+="? "),l+=e.dump+(e.condenseFlow?'"':"")+":"+(e.condenseFlow?"":" "),Ke(e,t,a,!1,!1)&&(c+=l+=e.dump))
+e.tag=s,e.dump="{"+c+"}"}(e,t,e.dump),f&&(e.dump="&ref_"+p+" "+e.dump))
+else if("[object Array]"===s)i&&0!==e.dump.length?(e.noArrayIndent&&!l&&t>0?$e(e,t-1,e.dump,r):$e(e,t,e.dump,r),f&&(e.dump="&ref_"+p+e.dump)):(function(e,t,n){var i,r,o,a="",l=e.tag
+for(i=0,r=n.length;i<r;i+=1)o=n[i],e.replacer&&(o=e.replacer.call(n,String(i),o)),(Ke(e,t,o,!1,!1)||void 0===o&&Ke(e,t,null,!1,!1))&&(""!==a&&(a+=","+(e.condenseFlow?"":" ")),a+=e.dump)
+e.tag=l,e.dump="["+a+"]"}(e,t,e.dump),f&&(e.dump="&ref_"+p+" "+e.dump))
+else{if("[object String]"!==s){if("[object Undefined]"===s)return!1
+if(e.skipInvalid)return!1
+throw new o("unacceptable kind of an object to dump "+s)}"?"!==e.tag&&qe(e,e.dump,t,a,u)}null!==e.tag&&"?"!==e.tag&&(c=encodeURI("!"===e.tag[0]?e.tag.slice(1):e.tag).replace(/!/g,"%21"),c="!"===e.tag[0]?"!"+c:"tag:yaml.org,2002:"===c.slice(0,18)?"!!"+c.slice(18):"!<"+c+">",e.dump=c+" "+e.dump)}return!0}function We(e,t){var n,i,r=[],o=[]
+for(function e(t,n,i){var r,o,a
+if(null!==t&&"object"==typeof t)if(-1!==(o=n.indexOf(t)))-1===i.indexOf(o)&&i.push(o)
+else if(n.push(t),Array.isArray(t))for(o=0,a=t.length;o<a;o+=1)e(t[o],n,i)
+else for(r=Object.keys(t),o=0,a=r.length;o<a;o+=1)e(t[r[o]],n,i)}(e,r,o),n=0,i=o.length;n<i;n+=1)t.duplicates.push(r[o[n]])
+t.usedDuplicates=new Array(i)}function He(e,t){return function(){throw new Error("Function yaml."+e+" is removed in js-yaml 4. Use yaml."+t+" instead, which is now safe by default.")}}var Ge=p,Ve=h,Ze=m,ze=x,Je=I,Qe=Y,Xe=ke.load,et=ke.loadAll,tt={dump:function(e,t){var n=new je(t=t||{})
+n.noRefs||We(e,n)
+var i=e
+return n.replacer&&(i=n.replacer.call({"":i},"",i)),Ke(n,0,i,!0,!0)?n.dump+"\n":""}}.dump,nt=o,it=He("safeLoad","load"),rt=He("safeLoadAll","loadAll"),ot=He("safeDump","dump"),at={Type:Ge,Schema:Ve,FAILSAFE_SCHEMA:Ze,JSON_SCHEMA:ze,CORE_SCHEMA:Je,DEFAULT_SCHEMA:Qe,load:Xe,loadAll:et,dump:tt,YAMLException:nt,safeLoad:it,safeLoadAll:rt,safeDump:ot}
+e.CORE_SCHEMA=Je,e.DEFAULT_SCHEMA=Qe,e.FAILSAFE_SCHEMA=Ze,e.JSON_SCHEMA=ze,e.Schema=Ve,e.Type=Ge,e.YAMLException=nt,e.default=at,e.dump=tt,e.load=Xe,e.loadAll=et,e.safeDump=ot,e.safeLoad=it,e.safeLoadAll=rt,Object.defineProperty(e,"__esModule",{value:!0})})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}((function(e){"use strict"
+e.defineMode("yaml",(function(){var e=new RegExp("\\b(("+["true","false","on","off","yes","no"].join(")|(")+"))$","i")
+return{token:function(t,n){var i=t.peek(),r=n.escaped
+if(n.escaped=!1,"#"==i&&(0==t.pos||/\s/.test(t.string.charAt(t.pos-1))))return t.skipToEnd(),"comment"
+if(t.match(/^('([^']|\\.)*'?|"([^"]|\\.)*"?)/))return"string"
+if(n.literal&&t.indentation()>n.keyCol)return t.skipToEnd(),"string"
+if(n.literal&&(n.literal=!1),t.sol()){if(n.keyCol=0,n.pair=!1,n.pairStart=!1,t.match(/---/))return"def"
+if(t.match(/\.\.\./))return"def"
+if(t.match(/\s*-\s+/))return"meta"}if(t.match(/^(\{|\}|\[|\])/))return"{"==i?n.inlinePairs++:"}"==i?n.inlinePairs--:"["==i?n.inlineList++:n.inlineList--,"meta"
+if(n.inlineList>0&&!r&&","==i)return t.next(),"meta"
+if(n.inlinePairs>0&&!r&&","==i)return n.keyCol=0,n.pair=!1,n.pairStart=!1,t.next(),"meta"
+if(n.pairStart){if(t.match(/^\s*(\||\>)\s*/))return n.literal=!0,"meta"
+if(t.match(/^\s*(\&|\*)[a-z0-9\._-]+\b/i))return"variable-2"
+if(0==n.inlinePairs&&t.match(/^\s*-?[0-9\.\,]+\s?$/))return"number"
+if(n.inlinePairs>0&&t.match(/^\s*-?[0-9\.\,]+\s?(?=(,|}))/))return"number"
+if(t.match(e))return"keyword"}return!n.pair&&t.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^,\[\]{}#&*!|>'"%@`])[^#]*?(?=\s*:($|\s))/)?(n.pair=!0,n.keyCol=t.indentation(),"atom"):n.pair&&t.match(/^:\s*/)?(n.pairStart=!0,"meta"):(n.pairStart=!1,n.escaped="\\"==i,t.next(),null)},startState:function(){return{pair:!1,pairStart:!1,keyCol:0,inlinePairs:0,inlineList:0,literal:!1,escaped:!1}}}})),e.defineMIME("text/x-yaml","yaml")}))
diff --git a/agent/uiserver/dist/assets/consul-acls/routes-0c01f9c463b81fdc3929288f31c23040.js b/agent/uiserver/dist/assets/consul-acls/routes-75a2ac7d38caf09cfee2a4e2bc49dcf7.js
similarity index 100%
rename from agent/uiserver/dist/assets/consul-acls/routes-0c01f9c463b81fdc3929288f31c23040.js
rename to agent/uiserver/dist/assets/consul-acls/routes-75a2ac7d38caf09cfee2a4e2bc49dcf7.js
diff --git a/agent/uiserver/dist/assets/consul-acls/services-70b9e635f1e8e9a316e3773fccadb7c7.js b/agent/uiserver/dist/assets/consul-acls/services-8b6b2b2bea3add7709b8075a5ed5652b.js
similarity index 100%
rename from agent/uiserver/dist/assets/consul-acls/services-70b9e635f1e8e9a316e3773fccadb7c7.js
rename to agent/uiserver/dist/assets/consul-acls/services-8b6b2b2bea3add7709b8075a5ed5652b.js
diff --git a/agent/uiserver/dist/assets/consul-hcp/routes-282630d2b2c8bf766b7e0d4f512828cc.js b/agent/uiserver/dist/assets/consul-hcp/routes-282630d2b2c8bf766b7e0d4f512828cc.js
deleted file mode 100644
index 703c18772062e..0000000000000
--- a/agent/uiserver/dist/assets/consul-hcp/routes-282630d2b2c8bf766b7e0d4f512828cc.js
+++ /dev/null
@@ -1 +0,0 @@
-((e,t=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{t.routes=JSON.stringify(e)})({dc:{show:null}})
diff --git a/agent/uiserver/dist/assets/consul-hcp/services-51af43ae095119987dadf6f2392a59b3.js b/agent/uiserver/dist/assets/consul-hcp/services-51af43ae095119987dadf6f2392a59b3.js
deleted file mode 100644
index dc99739254656..0000000000000
--- a/agent/uiserver/dist/assets/consul-hcp/services-51af43ae095119987dadf6f2392a59b3.js
+++ /dev/null
@@ -1 +0,0 @@
-((e,o=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{o.services=JSON.stringify(e)})({"component:consul/hcp/home":{class:"consul-ui/components/consul/hcp/home"}})
diff --git a/agent/uiserver/dist/assets/consul-lock-sessions/routes-7718d309039e9f8b3b185656b6dd7f05.js b/agent/uiserver/dist/assets/consul-lock-sessions/routes-f2c5ce353830c89f540358e7f174e0bf.js
similarity index 100%
rename from agent/uiserver/dist/assets/consul-lock-sessions/routes-7718d309039e9f8b3b185656b6dd7f05.js
rename to agent/uiserver/dist/assets/consul-lock-sessions/routes-f2c5ce353830c89f540358e7f174e0bf.js
diff --git a/agent/uiserver/dist/assets/consul-lock-sessions/services-70b9e635f1e8e9a316e3773fccadb7c7.js b/agent/uiserver/dist/assets/consul-lock-sessions/services-8b6b2b2bea3add7709b8075a5ed5652b.js
similarity index 100%
rename from agent/uiserver/dist/assets/consul-lock-sessions/services-70b9e635f1e8e9a316e3773fccadb7c7.js
rename to agent/uiserver/dist/assets/consul-lock-sessions/services-8b6b2b2bea3add7709b8075a5ed5652b.js
diff --git a/agent/uiserver/dist/assets/consul-nspaces/routes-71c32de6a0307211d1299dac7688bfbf.js b/agent/uiserver/dist/assets/consul-nspaces/routes-f939ed42e9b83f9d1bbc5256be68e77c.js
similarity index 100%
rename from agent/uiserver/dist/assets/consul-nspaces/routes-71c32de6a0307211d1299dac7688bfbf.js
rename to agent/uiserver/dist/assets/consul-nspaces/routes-f939ed42e9b83f9d1bbc5256be68e77c.js
diff --git a/agent/uiserver/dist/assets/consul-nspaces/services-70b9e635f1e8e9a316e3773fccadb7c7.js b/agent/uiserver/dist/assets/consul-nspaces/services-8b6b2b2bea3add7709b8075a5ed5652b.js
similarity index 100%
rename from agent/uiserver/dist/assets/consul-nspaces/services-70b9e635f1e8e9a316e3773fccadb7c7.js
rename to agent/uiserver/dist/assets/consul-nspaces/services-8b6b2b2bea3add7709b8075a5ed5652b.js
diff --git a/agent/uiserver/dist/assets/consul-partitions/routes-1bdd3b7ae99c7d7ce0425b2412f10d5e.js b/agent/uiserver/dist/assets/consul-partitions/routes-cba490481425519435d142c743bbc3d3.js
similarity index 100%
rename from agent/uiserver/dist/assets/consul-partitions/routes-1bdd3b7ae99c7d7ce0425b2412f10d5e.js
rename to agent/uiserver/dist/assets/consul-partitions/routes-cba490481425519435d142c743bbc3d3.js
diff --git a/agent/uiserver/dist/assets/consul-partitions/services-1a3b6937a8bc5f6e68df884b1650eaf0.js b/agent/uiserver/dist/assets/consul-partitions/services-85621f245f195fe1ce177064bfb04504.js
similarity index 100%
rename from agent/uiserver/dist/assets/consul-partitions/services-1a3b6937a8bc5f6e68df884b1650eaf0.js
rename to agent/uiserver/dist/assets/consul-partitions/services-85621f245f195fe1ce177064bfb04504.js
diff --git a/agent/uiserver/dist/assets/consul-peerings/routes-989d6de4b58a54c8638e37694240f29a.js b/agent/uiserver/dist/assets/consul-peerings/routes-989d6de4b58a54c8638e37694240f29a.js
deleted file mode 100644
index bb683363705cd..0000000000000
--- a/agent/uiserver/dist/assets/consul-peerings/routes-989d6de4b58a54c8638e37694240f29a.js
+++ /dev/null
@@ -1 +0,0 @@
-((e,s=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{s.routes=JSON.stringify(e)})({dc:{peers:{_options:{path:"/peers"},index:{_options:{path:"/",queryParams:{sortBy:"sort",state:"state",searchproperty:{as:"searchproperty",empty:[["Name","ID"]]},search:{as:"filter",replace:!0}}}},show:{_options:{path:"/:name"},imported:{_options:{path:"/imported-services",queryParams:{sortBy:"sort",status:"status",source:"source",kind:"kind",searchproperty:{as:"searchproperty",empty:[["Name","Tags"]]},search:{as:"filter",replace:!0}}}},exported:{_options:{path:"/exported-services",queryParams:{search:{as:"filter",replace:!0}}}},addresses:{_options:{path:"/addresses"}}}}}})
diff --git a/agent/uiserver/dist/assets/consul-peerings/services-e5a754eca7f3fbb406035f10b8dfbb77.js b/agent/uiserver/dist/assets/consul-peerings/services-e5a754eca7f3fbb406035f10b8dfbb77.js
deleted file mode 100644
index 7e9c950c60253..0000000000000
--- a/agent/uiserver/dist/assets/consul-peerings/services-e5a754eca7f3fbb406035f10b8dfbb77.js
+++ /dev/null
@@ -1 +0,0 @@
-((e,o=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{o.services=JSON.stringify(e)})({"component:consul/peer/selector":{class:"consul-ui/components/consul/peer/selector"}})
diff --git a/agent/uiserver/dist/assets/consul-ui-20fef69ea9b73df740a420526b12c7fb.css b/agent/uiserver/dist/assets/consul-ui-20fef69ea9b73df740a420526b12c7fb.css
new file mode 100644
index 0000000000000..20aa05d74bf29
--- /dev/null
+++ b/agent/uiserver/dist/assets/consul-ui-20fef69ea9b73df740a420526b12c7fb.css
@@ -0,0 +1 @@
+@charset "UTF-8";fieldset,hr{border:none}.modal-dialog [role=document] table caption,.modal-dialog [role=document] table thead th,main table caption,main table thead th,table td,table th,td,th{text-align:left}article,aside,figure,footer,header,hgroup,hr,section{display:block}#login-toggle+div footer button,.consul-intention-fieldsets .permissions>button,.empty-state>ul>li>*,.empty-state>ul>li>:active,.empty-state>ul>li>label>button,.empty-state>ul>li>label>button:active,.modal-dialog [role=document] dd a,.modal-dialog [role=document] p a,.oidc-select button.reset,.search-bar-status .remove-all button,a,label.type-dialog,label.type-dialog:active,main dd a,main dd a:active,main p a,main p a:active{text-decoration:none}blockquote,body,dd,dl,dt,fieldset,figure,h1,h2,h3,h4,h5,h6,hr,html,iframe,legend,li,ol,p,pre,textarea,ul{margin:0;padding:0}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:400}ul{list-style:none}table{border-collapse:collapse;border-spacing:0}table td,table th{padding:0}audio,embed,img,object,video{height:auto;max-width:100%}.app-view>div form button[type=button].type-delete,.consul-intention-action-warn-modal button.dangerous,.copy-button button,.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.empty-state div>button,.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button,.informed-action>ul>li>*,.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.modal-dialog .type-delete,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.oidc-select button:not(.reset),.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-select label>*,.topology-notices button,.type-sort.popover-select label>*,.with-confirmation .type-delete,a.type-create,button.type-cancel,button.type-submit,button[type=reset],button[type=submit],header .actions button[type=button]:not(.copy-btn),label span,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.type-reveal input:checked~em{-webkit-touch-callout:default;-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text}a{color:rgb(var(--color-action))}span,strong,td,th{color:inherit}body{color:rgb(var(--tone-gray-900))}html{background-color:rgb(var(--tone-gray-000));font-size:var(--typo-size-000);text-rendering:optimizeLegibility;text-size-adjust:100%;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;overflow-x:hidden;overflow-y:scroll;box-sizing:border-box;min-width:300px}hr{background-color:rgb(var(--tone-gray-200));height:1px;margin:1.5rem 0}button{background-color:var(--transparent)}body,button,input,select,textarea{font-family:var(--typo-family-sans)}.CodeMirror-lint-tooltip,.cm-s-hashi.CodeMirror,code,pre{font-family:var(--typo-family-mono)}strong{font-style:inherit;font-weight:var(--typo-weight-bold)}code,pre{-moz-osx-font-smoothing:auto;-webkit-font-smoothing:auto}pre{-webkit-overflow-scrolling:touch;overflow-x:auto;white-space:pre;word-wrap:normal}*,::after,::before{box-sizing:inherit;animation-play-state:paused;animation-fill-mode:forwards}fieldset{width:100%}a,input[type=checkbox],input[type=radio]{cursor:pointer}input[type=checkbox],input[type=radio]{vertical-align:baseline}td,th{vertical-align:top}button,input,select,textarea{margin:0}iframe{border:0}:root{--decor-radius-000:0;--decor-radius-100:2px;--decor-radius-200:4px;--decor-radius-250:6px;--decor-radius-300:7px;--decor-radius-999:9999px;--decor-radius-full:100%;--decor-border-000:none;--decor-border-100:1px solid;--decor-border-200:2px solid;--decor-border-300:3px solid;--decor-border-400:4px solid;--decor-elevation-000:none;--decor-elevation-100:0 3px 2px rgb(var(--black) / 6%);--decor-elevation-200:0 2px 4px rgb(var(--black) / 10%);--decor-elevation-300:0 5px 1px -2px rgb(var(--black) / 12%);--decor-elevation-400:0 6px 8px -2px rgb(var(--black) / 5%),0 8px 4px -4px rgb(var(--black) / 10%);--decor-elevation-600:0 12px 5px -7px rgb(var(--black) / 8%),0 11px 10px -3px rgb(var(--black) / 10%);--decor-elevation-800:0 16px 6px -10px rgb(var(--black) / 6%),0 16px 16px -4px rgb(var(--black) / 20%);--steel-050:245 246 247;--steel-100:225 228 231;--steel-200:205 211 215;--steel-300:185 193 199;--steel-400:165 176 183;--steel-500:145 159 168;--steel-600:119 131 138;--steel-700:93 102 107;--steel-800:66 73 77;--steel-900:40 44 46;--lemon-050:255 216 20;--lemon-100:255 216 20;--lemon-200:255 216 20;--lemon-300:255 216 20;--lemon-400:255 216 20;--lemon-500:255 216 20;--lemon-600:255 216 20;--lemon-700:255 216 20;--lemon-800:255 216 20;--lemon-900:255 216 20;--magenta-050:249 235 242;--magenta-100:239 196 216;--magenta-200:229 158 190;--magenta-300:218 119 164;--magenta-400:208 80 138;--magenta-500:198 42 113;--magenta-600:158 33 89;--magenta-700:125 26 71;--magenta-800:90 20 52;--magenta-900:54 12 31;--strawberry-010:255 242 248;--strawberry-050:255 242 248;--strawberry-100:248 217 231;--strawberry-200:248 217 231;--strawberry-300:224 126 172;--strawberry-400:224 126 172;--strawberry-500:202 33 113;--strawberry-600:142 19 74;--strawberry-700:142 19 74;--strawberry-800:101 13 52;--strawberry-900:101 13 52;--cobalt-050:240 245 255;--cobalt-100:191 212 255;--cobalt-200:138 177 255;--cobalt-300:91 146 255;--cobalt-400:56 122 255;--cobalt-500:21 99 255;--cobalt-600:15 79 209;--cobalt-700:14 64 163;--cobalt-800:10 45 116;--cobalt-900:6 27 70;--indigo-050:238 237 252;--indigo-100:213 210 247;--indigo-200:174 167 242;--indigo-300:141 131 237;--indigo-400:117 104 232;--indigo-500:92 78 229;--indigo-600:76 64 188;--indigo-700:59 50 146;--indigo-800:42 36 105;--indigo-900:26 22 63;--teal-050:235 248 243;--teal-100:195 236 220;--teal-200:155 223 197;--teal-300:116 211 174;--teal-400:76 198 151;--teal-500:37 186 129;--teal-600:31 153 106;--teal-700:24 119 83;--teal-800:17 85 59;--teal-900:11 51 36;--cyan-050:231 248 255;--cyan-100:185 236 255;--cyan-200:139 224 255;--cyan-300:92 211 255;--cyan-400:46 199 255;--cyan-500:0 187 255;--cyan-600:0 159 217;--cyan-700:0 119 163;--cyan-800:0 85 116;--cyan-900:0 51 70;--gray-010:251 251 252;--gray-050:247 248 250;--gray-100:235 238 242;--gray-150:235 238 242;--gray-200:220 224 230;--gray-300:186 193 204;--gray-400:142 150 163;--gray-500:111 118 130;--gray-600:98 104 115;--gray-700:82 87 97;--gray-800:55 58 66;--gray-850:44 46 51;--gray-900:31 33 36;--gray-950:21 23 28;--green-050:236 247 237;--green-100:198 233 201;--green-200:160 219 165;--green-300:122 204 129;--green-400:84 190 93;--green-500:46 176 57;--green-600:38 145 47;--green-700:30 113 37;--green-800:21 80 26;--green-900:13 48 16;--blue-010:251 252 255;--blue-050:240 245 255;--blue-100:191 212 255;--blue-200:138 177 255;--blue-300:91 146 255;--blue-400:56 122 255;--blue-500:21 99 255;--blue-600:15 79 209;--blue-700:14 64 163;--blue-800:10 45 116;--blue-900:6 27 70;--red-010:253 250 251;--red-050:249 236 238;--red-100:239 199 204;--red-200:229 162 170;--red-300:219 125 136;--red-400:209 88 102;--red-500:199 52 69;--red-600:163 43 57;--red-700:127 34 44;--red-800:91 24 32;--red-900:55 15 19;--orange-050:254 244 236;--orange-100:253 224 200;--orange-200:252 204 164;--orange-300:251 183 127;--orange-400:250 163 91;--orange-500:250 143 55;--orange-600:205 118 46;--orange-700:160 92 35;--orange-800:114 65 25;--orange-900:69 39 15;--yellow-050:255 251 237;--yellow-100:253 238 186;--yellow-200:252 228 140;--yellow-300:251 217 94;--yellow-400:250 206 48;--yellow-500:250 196 2;--yellow-600:205 161 2;--yellow-700:160 125 2;--yellow-800:114 90 1;--yellow-900:69 54 1;--transparent:transparent;--white:255 255 255;--black:0 0 0;--color-primary:var(--tone-blue-500);--color-dangerous:var(--tone-red-500);--color-primary-disabled:var(--tone-blue-500);--color-neutral:var(--tone-gray-500);--color-action:var(--tone-blue-500);--color-info:var(--tone-blue-500);--color-success:var(--tone-green-500);--color-failure:var(--tone-red-500);--color-danger:var(--tone-red-500);--color-warning:var(--tone-yellow-500);--color-alert:var(--tone-orange-500);--typo-family-sans:BlinkMacSystemFont,-apple-system,"Segoe UI","Roboto","Oxygen","Ubuntu","Cantarell","Fira Sans","Droid Sans","Helvetica Neue","Helvetica","Arial",sans-serif;--typo-family-mono:monospace;--typo-size-000:16px;--typo-size-100:3.5rem;--typo-size-200:1.8rem;--typo-size-250:1.750rem;--typo-size-300:1.3rem;--typo-size-400:1.2rem;--typo-size-450:1.125rem;--typo-size-500:1rem;--typo-size-600:0.875rem;--typo-size-700:0.8125rem;--typo-size-800:0.75rem;--typo-weight-light:300;--typo-weight-normal:400;--typo-weight-medium:500;--typo-weight-semibold:600;--typo-weight-bold:700;--typo-lead-000:0;--typo-lead-050:1;--typo-lead-100:1.2;--typo-lead-200:1.25;--typo-lead-300:1.28;--typo-lead-500:1.33;--typo-lead-600:1.4;--typo-lead-700:1.5;--typo-lead-800:1.7;--icon-alert-triangle-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zM8.75 5.75a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z"/><path fill-rule="evenodd" d="M6.953 1.273a2.143 2.143 0 012.874.751l.002.004 5.884 9.774a2.126 2.126 0 01-.768 2.905c-.322.188-.687.289-1.06.293H2.115a2.143 2.143 0 01-1.833-1.074 2.125 2.125 0 01.006-2.124l.006-.01 5.878-9.764.002-.004c.191-.313.46-.571.78-.75zm.502 1.53l-.001.002-5.872 9.754a.626.626 0 00.231.853.644.644 0 00.314.088h11.746a.643.643 0 00.544-.32.626.626 0 000-.62l-5.87-9.755-.002-.001A.635.635 0 008 2.5a.643.643 0 00-.545.304z" clip-rule="evenodd"/></g></svg>');--icon-alert-triangle-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11 17a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1zM12.75 8.75a.75.75 0 00-1.5 0v4.5a.75.75 0 001.5 0v-4.5z"/><path fill-rule="evenodd" d="M10.658 2.366a2.651 2.651 0 012.684 0c.407.239.745.581.984.99l.002.004 8.315 14.46a2.86 2.86 0 01.008 2.758 2.757 2.757 0 01-.976 1.03c-.41.25-.877.386-1.357.392H3.682a2.653 2.653 0 01-1.357-.393 2.757 2.757 0 01-.975-1.029 2.86 2.86 0 01.007-2.758l.006-.01 8.31-14.45.001-.004a2.75 2.75 0 01.984-.99zm.313 1.744v.001L2.665 18.552a1.36 1.36 0 000 1.306c.108.198.262.36.443.47.18.11.382.169.586.172h16.61c.204-.003.406-.061.586-.172.181-.11.335-.272.444-.47a1.361 1.361 0 00-.001-1.306L13.03 4.112l-.001-.002a1.25 1.25 0 00-.446-.45 1.151 1.151 0 00-1.166 0 1.25 1.25 0 00-.446.45z" clip-rule="evenodd"/></g></svg>');--icon-arrow-right-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8.235 4.045a.75.75 0 111.03-1.09l4.5 4.25a.75.75 0 010 1.09l-4.5 4.25a.75.75 0 01-1.03-1.09L11.364 8.5H2.75a.75.75 0 010-1.5h8.614L8.235 4.045z"/></svg>');--icon-arrow-right-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M12.229 5.04a.75.75 0 011.042-1.08l7.5 7.25a.75.75 0 010 1.08l-7.5 7.25a.75.75 0 11-1.042-1.08l6.166-5.96H3.75a.75.75 0 010-1.5h14.645l-6.166-5.96z"/></svg>');--icon-x-square-fill-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M1 3.139C1 1.958 1.958 1 3.139 1h9.722C14.042 1 15 1.958 15 3.139v9.722A2.139 2.139 0 0112.861 15H3.14A2.139 2.139 0 011 12.861V3.14zm4.28 1.08A.75.75 0 004.22 5.28L6.94 8l-2.72 2.72a.75.75 0 101.06 1.06L8 9.06l2.72 2.72a.75.75 0 101.06-1.06L9.06 8l2.72-2.72a.75.75 0 00-1.06-1.06L8 6.94 5.28 4.22z" clip-rule="evenodd"/></svg>');--icon-x-square-fill-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M2 4.806A2.806 2.806 0 014.806 2h14.388A2.806 2.806 0 0122 4.806v14.388A2.806 2.806 0 0119.194 22H4.806A2.806 2.806 0 012 19.194V4.806zM8.28 7.22a.75.75 0 00-1.06 1.06L10.94 12l-3.72 3.72a.75.75 0 101.06 1.06L12 13.06l3.72 3.72a.75.75 0 101.06-1.06L13.06 12l3.72-3.72a.75.75 0 00-1.06-1.06L12 10.94 8.28 7.22z" clip-rule="evenodd"/></svg>');--icon-chevron-down-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.235 5.205a.75.75 0 011.06.03L8 9.158l3.705-3.923a.75.75 0 011.09 1.03l-4.25 4.5a.75.75 0 01-1.09 0l-4.25-4.5a.75.75 0 01.03-1.06z" clip-rule="evenodd"/></svg>');--icon-chevron-down-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.23 8.21a.75.75 0 011.06.02L12 14.168l5.71-5.938a.75.75 0 111.08 1.04l-6.25 6.5a.75.75 0 01-1.08 0l-6.25-6.5a.75.75 0 01.02-1.06z" clip-rule="evenodd"/></svg>');--icon-clipboard-copy-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M3.25 2.5H4v.25C4 3.44 4.56 4 5.25 4h5.5C11.44 4 12 3.44 12 2.75V2.5h.75a.75.75 0 01.75.75v3a.75.75 0 001.5 0v-3A2.25 2.25 0 0012.75 1h-.775c-.116-.57-.62-1-1.225-1h-5.5c-.605 0-1.11.43-1.225 1H3.25A2.25 2.25 0 001 3.25v10.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75v-1a.75.75 0 00-1.5 0v1a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V3.25a.75.75 0 01.75-.75zm2.25-1v1h5v-1h-5z" clip-rule="evenodd"/><path d="M4.75 5.5a.75.75 0 000 1.5h3a.75.75 0 000-1.5h-3zM4 12.25a.75.75 0 01.75-.75h3a.75.75 0 010 1.5h-3a.75.75 0 01-.75-.75zM4.75 8.5a.75.75 0 000 1.5h2a.75.75 0 000-1.5h-2zM16 9.25a.75.75 0 01-.75.75h-4.19l1.22 1.22a.75.75 0 11-1.06 1.06l-2.5-2.5a.752.752 0 010-1.06l2.5-2.5a.75.75 0 111.06 1.06L11.06 8.5h4.19a.75.75 0 01.75.75z"/></g></svg>');--icon-clipboard-copy-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M8.75 1A1.75 1.75 0 007 2.75V3H5.75A2.75 2.75 0 003 5.75v14.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25v-2.5a.75.75 0 00-1.5 0v2.5c0 .69-.56 1.25-1.25 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V5.75c0-.69.56-1.25 1.25-1.25h1.268c.121.848.85 1.5 1.732 1.5h6.5a1.75 1.75 0 001.732-1.5h1.268c.69 0 1.25.56 1.25 1.25v4.5a.75.75 0 001.5 0v-4.5A2.75 2.75 0 0018.25 3H17v-.25A1.75 1.75 0 0015.25 1h-6.5zM8.5 2.75a.25.25 0 01.25-.25h6.5a.25.25 0 01.25.25v1.5a.25.25 0 01-.25.25h-6.5a.25.25 0 01-.25-.25v-1.5z" clip-rule="evenodd"/><path d="M7 9.75A.75.75 0 017.75 9h4.5a.75.75 0 010 1.5h-4.5A.75.75 0 017 9.75zM7 17.75a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5h-4.5a.75.75 0 01-.75-.75zM7.75 13a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5zM22.75 14a.75.75 0 01-.75.75h-6.34l2.1 1.95a.75.75 0 11-1.02 1.1l-3.5-3.25a.747.747 0 01-.24-.533v-.034a.748.748 0 01.227-.521l.014-.013L16.74 10.2a.75.75 0 111.02 1.1l-2.1 1.95H22a.75.75 0 01.75.75z"/></g></svg>');--icon-docs-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M4.25 1A2.25 2.25 0 002 3.25v9.5A2.25 2.25 0 004.25 15h8.5c.69 0 1.25-.56 1.25-1.25V2.25C14 1.56 13.44 1 12.75 1h-8.5zM3.5 12.75c0 .414.336.75.75.75h8.25v-2H4.25a.75.75 0 00-.75.75v.5zm0-2.622c.235-.083.487-.128.75-.128h8.25V2.5H4.25a.75.75 0 00-.75.75v6.878z" clip-rule="evenodd"/></svg>');--icon-docs-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h13.5A1.75 1.75 0 0021 21.25V2.75A1.75 1.75 0 0019.25 1H5.75zM19.5 17.5V2.75a.25.25 0 00-.25-.25H5.75c-.69 0-1.25.56-1.25 1.25V17.8c.375-.192.8-.3 1.25-.3H19.5zm-15 2.75c0 .69.56 1.25 1.25 1.25h13.5a.25.25 0 00.25-.25V19H5.75c-.69 0-1.25.56-1.25 1.25z" clip-rule="evenodd"/></svg>');--icon-external-link-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M9 .75A.75.75 0 019.75 0h4.5c.206 0 .393.083.529.218l.001.002.002.001A.748.748 0 0115 .75v4.5a.75.75 0 01-1.5 0V2.56L7.28 8.78a.75.75 0 01-1.06-1.06l6.22-6.22H9.75A.75.75 0 019 .75z"/><path d="M3.25 3.5a.75.75 0 00-.75.75v7.5c0 .414.336.75.75.75h7.5a.75.75 0 00.75-.75v-4a.75.75 0 011.5 0v4A2.25 2.25 0 0110.75 14h-7.5A2.25 2.25 0 011 11.75v-7.5A2.25 2.25 0 013.25 2h4a.75.75 0 010 1.5h-4z"/></g></svg>');--icon-external-link-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M15 1.75a.75.75 0 01.75-.75h5.5a.748.748 0 01.75.75v5.5a.75.75 0 01-1.5 0V3.56L10.28 13.78a.75.75 0 11-1.06-1.06L19.44 2.5h-3.69a.75.75 0 01-.75-.75z"/><path d="M4.75 5.5c-.69 0-1.25.56-1.25 1.25v11.5c0 .69.56 1.25 1.25 1.25h11.5c.69 0 1.25-.56 1.25-1.25v-6.5a.75.75 0 011.5 0v6.5A2.75 2.75 0 0116.25 21H4.75A2.75 2.75 0 012 18.25V6.75A2.75 2.75 0 014.75 4h6.5a.75.75 0 010 1.5h-6.5z"/></g></svg>');--icon-file-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.25 0A2.25 2.25 0 001 2.25v11.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75V5.457c0-.331-.132-.65-.366-.884L10.427.366A1.25 1.25 0 009.543 0H3.25zM2.5 2.25a.75.75 0 01.75-.75H9v3.75c0 .414.336.75.75.75h3.75v7.75a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V2.25zm9.94 2.25L10.5 2.56V4.5h1.94z" clip-rule="evenodd"/></svg>');--icon-file-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V8.664c0-.464-.184-.909-.513-1.237l-5.914-5.914A1.75 1.75 0 0013.336 1H5.75zM4.5 3.75c0-.69.56-1.25 1.25-1.25H13v5.75c0 .414.336.75.75.75h5.75v11.25c0 .69-.56 1.25-1.25 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V3.75zM18.44 7.5L14.5 3.56V7.5h3.94z" clip-rule="evenodd"/></svg>');--icon-folder-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-7.5A2.25 2.25 0 0013.75 3H9.871a.75.75 0 01-.53-.22L8.22 1.66A2.25 2.25 0 006.629 1H2.25zM1.5 3.25a.75.75 0 01.75-.75h4.379a.75.75 0 01.53.22L8.28 3.84a2.25 2.25 0 001.591.659h3.879a.75.75 0 01.75.75v7.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75V7h10.75a.75.75 0 000-1.5H1.5V3.25z" clip-rule="evenodd"/></svg>');--icon-folder-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M3.75 2A2.75 2.75 0 001 4.75v14.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V6.75A2.75 2.75 0 0020.25 4h-7.172a1.25 1.25 0 01-.883-.366l-.829-.829A2.75 2.75 0 009.422 2H3.75zM2.5 4.75c0-.69.56-1.25 1.25-1.25h5.672c.331 0 .649.132.883.366l.829.829a2.75 2.75 0 001.944.805h7.172c.69 0 1.25.56 1.25 1.25v12.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V8.5h16.75a.75.75 0 000-1.5H2.5V4.75z" clip-rule="evenodd"/></svg>');--icon-activity-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M6.016 1a.75.75 0 01.698.521l3.306 10.33 1.47-4.341A.75.75 0 0112.2 7H15a.75.75 0 010 1.5h-2.262l-2.028 5.99a.75.75 0 01-1.424-.011L5.952 4.06 4.504 8.008A.75.75 0 013.8 8.5H1A.75.75 0 111 7h2.276l2.02-5.508c.11-.301.4-.499.72-.492z" clip-rule="evenodd"/></svg>');--icon-activity-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M9.003 2a.75.75 0 01.71.519l5.278 16.27 2.294-7.265A.75.75 0 0118 11h4a.75.75 0 010 1.5h-3.45l-2.835 8.976a.75.75 0 01-1.428.005L8.99 5.151l-2.278 6.836A.75.75 0 016 12.5H2A.75.75 0 012 11h3.46l2.828-8.487A.75.75 0 019.003 2z" clip-rule="evenodd"/></svg>');--icon-help-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M8.197 4.523a1.532 1.532 0 00-1.051.196c-.318.19-.563.49-.687.85a.75.75 0 01-1.418-.49c.239-.69.71-1.274 1.335-1.648a3.032 3.032 0 012.079-.386 3.057 3.057 0 011.829 1.065 3.13 3.13 0 01.716 2c0 .487-.092.905-.275 1.266-.182.36-.431.62-.679.817-.194.156-.41.291-.581.398l-.096.06a2.507 2.507 0 00-.452.34.643.643 0 00-.172.292.75.75 0 01-1.499-.033c0-.163.035-.324.086-.479.08-.243.232-.543.515-.832.239-.243.505-.419.72-.554.044-.029.086-.056.126-.08.169-.106.296-.186.415-.282a.976.976 0 00.279-.323c.059-.117.113-.296.113-.59v-.002a1.63 1.63 0 00-.372-1.041c-.24-.29-.57-.481-.931-.544z" clip-rule="evenodd"/><path d="M8 11a1 1 0 100 2h.007a1 1 0 100-2H8z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');--icon-help-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M12.349 7.536c-.612-.1-1.24.01-1.77.31s-.926.765-1.125 1.308a.75.75 0 11-1.408-.516A3.995 3.995 0 019.842 6.54a4.212 4.212 0 012.75-.484c.946.156 1.81.63 2.436 1.343.627.715.973 1.624.972 2.569 0 .636-.127 1.168-.369 1.62-.24.449-.569.77-.9 1.021a8.43 8.43 0 01-.804.519l-.144.085c-.294.177-.526.329-.712.507-.185.178-.264.341-.298.441a.62.62 0 00-.028.107l-.001.007a.75.75 0 01-1.5-.025c0-.198.047-.394.111-.58a2.63 2.63 0 01.677-1.032c.318-.304.675-.529.98-.712l.177-.104a6.68 6.68 0 00.636-.409 1.64 1.64 0 00.484-.533c.107-.2.191-.482.191-.913v-.001c0-.573-.21-1.132-.6-1.578a2.628 2.628 0 00-1.551-.852z" clip-rule="evenodd"/><path d="M12 16a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');--icon-learn-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8.316 2.07a.75.75 0 00-.632 0l-7 3.25a.75.75 0 000 1.36l1.434.666A.746.746 0 002 7.75V11a.75.75 0 00.158.46L2.75 11l-.592.46.001.002.001.001.003.004.008.01a1.882 1.882 0 00.103.12c.068.076.165.178.292.299.254.24.63.555 1.132.866C4.706 13.388 6.217 14 8.25 14c2.037 0 3.44-.615 4.345-1.266a5.32 5.32 0 00.977-.902 3.916 3.916 0 00.322-.448l.007-.012.003-.004v-.002h.001c0-.001 0-.002-.655-.366l.655.365A.754.754 0 0014 11V7.75a.747.747 0 00-.118-.404l1.434-.666a.75.75 0 000-1.36l-7-3.25zM12.5 7.988L8.316 9.93a.75.75 0 01-.632 0L3.5 7.988v2.723a5.585 5.585 0 00.99.776c.804.5 2.043 1.013 3.76 1.013 1.713 0 2.81-.51 3.468-.984a3.812 3.812 0 00.782-.745V7.988zM8 8.423L2.781 6 8 3.577 13.219 6 8 8.423z" clip-rule="evenodd"/></svg>');--icon-learn-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12.367 3.096a.75.75 0 00-.734 0l-10.25 5.75a.75.75 0 000 1.308l2.82 1.582A.747.747 0 004 12.25v5a.75.75 0 00.12.407l.63-.407-.63.408.001.001.002.002.003.005.009.013a2.202 2.202 0 00.118.162c.08.1.194.237.348.397.308.321.774.736 1.427 1.147C7.34 20.21 9.378 21 12.345 21c2.968 0 4.854-.79 6.018-1.646a5.597 5.597 0 001.209-1.193 3.945 3.945 0 00.339-.553 1.8 1.8 0 00.02-.043l.007-.016.002-.006.001-.002v-.001s.001-.002-.691-.29l.692.288A.75.75 0 0020 17.25v-5a.747.747 0 00-.203-.514l2.82-1.582a.75.75 0 000-1.308l-10.25-5.75zm6.133 9.368l-6.133 3.44a.75.75 0 01-.734 0L5.5 12.464v4.533c.047.055.107.124.182.202.233.242.605.577 1.144.916 1.072.675 2.833 1.385 5.52 1.385 2.686 0 4.252-.71 5.128-1.354.442-.325.722-.644.887-.87.061-.084.107-.155.139-.21v-4.602zM12 14.39L3.283 9.5 12 4.61l8.717 4.89L12 14.39z" clip-rule="evenodd"/></svg>');--icon-github-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23161514" fill-rule="evenodd" d="M8 1C4.133 1 1 4.13 1 7.993c0 3.09 2.006 5.71 4.787 6.635.35.064.478-.152.478-.337 0-.166-.006-.606-.01-1.19-1.947.423-2.357-.937-2.357-.937-.319-.808-.778-1.023-.778-1.023-.635-.434.048-.425.048-.425.703.05 1.073.72 1.073.72.624 1.07 1.638.76 2.037.582.063-.452.244-.76.444-.935-1.554-.176-3.188-.776-3.188-3.456 0-.763.273-1.388.72-1.876-.072-.177-.312-.888.07-1.85 0 0 .586-.189 1.924.716A6.711 6.711 0 018 4.381c.595.003 1.194.08 1.753.236 1.336-.905 1.923-.717 1.923-.717.382.963.142 1.674.07 1.85.448.49.72 1.114.72 1.877 0 2.686-1.638 3.278-3.197 3.45.251.216.475.643.475 1.296 0 .934-.009 1.688-.009 1.918 0 .187.127.404.482.336A6.996 6.996 0 0015 7.993 6.997 6.997 0 008 1z" clip-rule="evenodd"/></svg>');--icon-github-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23161514" fill-rule="evenodd" d="M12 2C6.477 2 2 6.476 2 11.997c0 4.417 2.865 8.163 6.839 9.485.5.092.682-.216.682-.482 0-.236-.008-.865-.013-1.7-2.782.604-3.369-1.34-3.369-1.34-.454-1.155-1.11-1.462-1.11-1.462-.908-.62.069-.608.069-.608 1.003.07 1.531 1.03 1.531 1.03.892 1.528 2.341 1.087 2.91.831.092-.646.35-1.086.636-1.336-2.22-.252-4.555-1.11-4.555-4.94 0-1.092.39-1.985 1.029-2.683-.103-.253-.446-1.27.098-2.646 0 0 .84-.269 2.75 1.025A9.581 9.581 0 0112 6.834c.85.004 1.705.115 2.504.337 1.909-1.294 2.747-1.025 2.747-1.025.546 1.376.202 2.393.1 2.646.64.698 1.028 1.591 1.028 2.682 0 3.84-2.339 4.686-4.566 4.933.359.309.678.919.678 1.852 0 1.336-.012 2.414-.012 2.741 0 .268.18.58.688.482 3.97-1.325 6.833-5.07 6.833-9.485C22 6.476 17.522 2 12 2z" clip-rule="evenodd"/></svg>');--icon-google-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%234285F4" d="M14.9 8.161c0-.476-.039-.954-.121-1.422h-6.64v2.695h3.802a3.24 3.24 0 01-1.407 2.127v1.75h2.269c1.332-1.22 2.097-3.02 2.097-5.15z"/><path fill="%2334A853" d="M8.14 15c1.898 0 3.499-.62 4.665-1.69l-2.268-1.749c-.631.427-1.446.669-2.395.669-1.836 0-3.393-1.232-3.952-2.888H1.85v1.803A7.044 7.044 0 008.14 15z"/><path fill="%23FBBC04" d="M4.187 9.341a4.17 4.17 0 010-2.68V4.858H1.849a6.97 6.97 0 000 6.287l2.338-1.803z"/><path fill="%23EA4335" d="M8.14 3.77a3.837 3.837 0 012.7 1.05l2.01-1.999a6.786 6.786 0 00-4.71-1.82 7.042 7.042 0 00-6.29 3.858L4.186 6.66c.556-1.658 2.116-2.89 3.952-2.89z"/></svg>');--icon-google-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%234285F4" d="M21.804 12.23c0-.68-.055-1.363-.173-2.032H12.2v3.85h5.4a4.63 4.63 0 01-1.998 3.04v2.498h3.222c1.893-1.742 2.98-4.314 2.98-7.356z"/><path fill="%2334A853" d="M12.2 22c2.697 0 4.971-.886 6.628-2.414l-3.222-2.499c-.897.61-2.054.956-3.402.956-2.61 0-4.821-1.76-5.615-4.127H3.264v2.576A10 10 0 0012.2 22z"/><path fill="%23FBBC04" d="M6.585 13.916a5.99 5.99 0 010-3.828V7.512H3.264a10.008 10.008 0 000 8.98l3.321-2.576z"/><path fill="%23EA4335" d="M12.2 5.958a5.434 5.434 0 013.836 1.499l2.855-2.855A9.61 9.61 0 0012.2 2.001a9.998 9.998 0 00-8.936 5.511l3.321 2.576c.79-2.37 3.006-4.13 5.615-4.13z"/></svg>');--icon-kubernetes-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23326DE6" d="M4.5 14.569c.214.278.539.431.874.431h5.251c.335 0 .66-.165.875-.434l3.258-4.178c.214-.278.288-.633.214-.978l-1.165-5.207a1.128 1.128 0 00-.606-.777l-4.714-2.31A1.062 1.062 0 008.002 1c-.168 0-.335.038-.485.115l-4.715 2.32a1.129 1.129 0 00-.605.777L1.032 9.42c-.084.345 0 .7.214.978L4.5 14.568z"/><path fill="%23fff" fill-rule="evenodd" d="M12.741 9.128c.098.003.196.01.293.024l.058.013.031.008a.308.308 0 01.26.371.306.306 0 01-.396.223h-.004l-.003-.001-.003-.001a1.58 1.58 0 00-.08-.017 2.55 2.55 0 01-.274-.106 2.867 2.867 0 00-.533-.156.243.243 0 00-.171.063 4.656 4.656 0 00-.131-.023 3.971 3.971 0 01-1.764 2.212c.015.042.032.083.051.123a.239.239 0 00-.023.18c.074.17.165.332.271.484.06.078.114.16.164.244l.028.057.012.025a.305.305 0 01-.132.434.31.31 0 01-.354-.066.307.307 0 01-.067-.107l-.01-.021a1.57 1.57 0 01-.028-.058 2.553 2.553 0 01-.089-.28 2.834 2.834 0 00-.21-.512.242.242 0 00-.156-.095 6.199 6.199 0 01-.03-.053l-.035-.064a3.97 3.97 0 01-2.823-.007l-.07.125a.249.249 0 00-.132.064 2.13 2.13 0 00-.237.548 2.518 2.518 0 01-.088.28l-.025.05-.013.027v.001a.306.306 0 01-.421.173.307.307 0 01-.132-.434l.014-.03.026-.052c.05-.085.104-.166.164-.244.108-.156.2-.322.277-.496a.302.302 0 00-.028-.173l.056-.133A3.972 3.972 0 014.22 9.532l-.134.023a.34.34 0 00-.176-.062 2.872 2.872 0 00-.533.156c-.09.04-.181.075-.274.105l-.05.011-.03.007H3.02l-.002.002h-.005a.308.308 0 01-.397-.349.306.306 0 01.261-.245l.005-.001h.002l.006-.002c.024-.006.054-.014.076-.018.097-.013.195-.021.293-.023.186-.013.37-.043.549-.09a.422.422 0 00.131-.133l.128-.037a3.938 3.938 0 01.625-2.752l-.098-.087a.338.338 0 00-.062-.176 2.854 2.854 0 00-.455-.319 2.557 2.557 0 01-.254-.148l-.048-.038-.015-.012-.004-.004a.323.323 0 01-.076-.45.295.295 0 01.244-.107.365.365 0 01.213.08l.022.017c.016.013.034.026.046.037.072.067.139.139.202.213.125.137.263.262.412.372.056.03.121.036.182.018l.11.078a3.938 3.938 0 012.552-1.224l.008-.129a.332.332 0 00.099-.157 2.844 2.844 0 00-.034-.554 2.56 2.56 0 01-.042-.29v-.082-.004A.306.306 0 018 2.82a.308.308 0 01.306.337v.087a2.529 2.529 0 01-.041.29 2.85 2.85 0 00-.035.553.242.242 0 00.1.153v.007l.007.13c.967.087 1.87.522 2.54 1.223l.116-.083a.34.34 0 00.186-.02c.149-.11.287-.235.412-.373.063-.074.13-.146.202-.213l.051-.04.017-.014a.307.307 0 11.381.477l-.024.02c-.015.012-.03.025-.043.034a2.537 2.537 0 01-.254.148 2.87 2.87 0 00-.455.32.241.241 0 00-.058.172l-.05.044-.058.053c.542.806.77 1.783.637 2.745l.123.036c.031.056.077.101.133.132.179.048.363.078.548.09zM7.291 5.24c.107-.024.216-.043.326-.056l-.09 1.6-.008.004a.268.268 0 01-.293.256.27.27 0 01-.135-.05l-.002.001-1.316-.93c.419-.41.945-.696 1.518-.825zm1.618 1.75l1.308-.924a3.182 3.182 0 00-1.833-.882l.09 1.598h.002a.268.268 0 00.294.256.27.27 0 00.135-.05l.004.002zm2.248 1.656l-1.548-.445-.002-.006a.27.27 0 01-.185-.343.27.27 0 01.08-.12L9.5 7.73l1.195-1.067c.366.594.527 1.29.46 1.983zM9.096 9.5l.618 1.49a3.148 3.148 0 001.275-1.598l-1.593-.269-.002.004a.26.26 0 00-.166.022.27.27 0 00-.13.348l-.002.003zm-.385 1.905c-.573.13-1.17.1-1.727-.088l.777-1.4h.001a.27.27 0 01.475-.001h.006l.779 1.402a3.286 3.286 0 01-.311.087zm-2.418-.422l.611-1.474-.004-.006a.268.268 0 00-.297-.37L6.6 9.13l-1.579.267a3.16 3.16 0 001.272 1.586zm-.997-4.32l1.201 1.071-.001.007a.269.269 0 01-.106.462l-.001.005-1.54.443a3.134 3.134 0 01.447-1.988zm2.95 1.154h-.492l-.307.38.11.476.443.213.442-.212.11-.476-.306-.381z" clip-rule="evenodd"/></svg>');--icon-kubernetes-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23326DE6" d="M7 21.384c.306.397.77.616 1.249.616h7.501c.48 0 .944-.236 1.25-.62l4.654-5.969a1.69 1.69 0 00.306-1.397l-1.664-7.439a1.612 1.612 0 00-.865-1.11l-6.736-3.3A1.517 1.517 0 0012.003 2c-.24 0-.48.055-.692.164L4.575 5.48c-.44.22-.759.617-.865 1.11l-1.664 7.438c-.12.494 0 1 .306 1.398L7 21.384z"/><path fill="%23fff" fill-rule="evenodd" d="M18.773 13.612c.14.003.28.014.419.033a1.424 1.424 0 01.127.03.439.439 0 01.294.695.437.437 0 01-.488.155l-.007-.001-.004-.002-.004-.001-.043-.01-.07-.014a3.664 3.664 0 01-.392-.151 4.094 4.094 0 00-.762-.224.346.346 0 00-.245.09 6.82 6.82 0 00-.187-.032 5.674 5.674 0 01-2.52 3.16c.021.06.046.119.074.176a.342.342 0 00-.034.257c.106.243.236.474.388.692.084.111.162.227.234.347l.04.082.017.036a.437.437 0 01-.545.629.44.44 0 01-.245-.257l-.015-.03-.04-.082a3.625 3.625 0 01-.126-.4 4.058 4.058 0 00-.3-.732.346.346 0 00-.223-.135l-.043-.076-.05-.092c-1.3.491-2.736.488-4.034-.01l-.099.179a.356.356 0 00-.188.091 3.044 3.044 0 00-.339.783 3.6 3.6 0 01-.126.4l-.035.073-.019.037v.002a.437.437 0 01-.602.248.439.439 0 01-.188-.621l.02-.043.036-.075c.072-.12.15-.236.235-.348.154-.223.286-.46.395-.709a.432.432 0 00-.039-.246l.08-.19a5.674 5.674 0 01-2.52-3.138l-.191.033a.485.485 0 00-.251-.088c-.261.05-.516.124-.762.223a3.683 3.683 0 01-.392.15l-.071.016c-.015.003-.03.006-.042.01h-.005l-.004.002h-.006a.44.44 0 01-.568-.498.437.437 0 01.374-.35l.006-.002.004-.001.008-.002c.035-.009.077-.02.108-.025.14-.02.28-.03.42-.034.264-.017.527-.06.783-.129a.603.603 0 00.188-.188l.183-.053a5.626 5.626 0 01.892-3.931l-.14-.125a.483.483 0 00-.088-.251 4.077 4.077 0 00-.65-.456 3.655 3.655 0 01-.363-.212 1.61 1.61 0 01-.069-.055l-.02-.017-.008-.005a.462.462 0 01-.107-.642.42.42 0 01.348-.154.522.522 0 01.305.115l.03.024.067.053c.102.096.198.198.288.305.178.195.376.373.589.53.08.042.173.051.26.026.051.037.104.075.157.111A5.626 5.626 0 0111.52 6.82l.01-.184a.474.474 0 00.142-.225c.01-.265-.007-.53-.049-.79a3.644 3.644 0 01-.06-.415l.001-.076V5.089v-.007a.437.437 0 01.615-.444.44.44 0 01.259.444v.046c.001.027.002.056 0 .078-.011.139-.031.277-.059.414a4.063 4.063 0 00-.05.79.345.345 0 00.143.218v.011l.01.184A5.734 5.734 0 0116.11 8.57l.166-.119c.09.016.181.006.265-.028.213-.158.41-.336.59-.532.09-.107.186-.209.288-.305l.073-.058.024-.019a.44.44 0 11.544.682l-.035.028-.061.05a3.634 3.634 0 01-.363.21c-.231.13-.449.283-.65.456a.344.344 0 00-.082.247 8.03 8.03 0 01-.155.138 5.65 5.65 0 01.91 3.922l.177.051a.49.49 0 00.188.19c.257.068.52.11.784.128zm-7.786-5.554a4.64 4.64 0 01.466-.08l-.13 2.285-.01.005a.383.383 0 01-.419.366.386.386 0 01-.192-.072l-.004.003-1.88-1.33a4.505 4.505 0 012.169-1.177zm2.312 2.5l1.867-1.321a4.546 4.546 0 00-2.618-1.26l.13 2.283h.002a.383.383 0 00.42.366.386.386 0 00.192-.072l.007.003zm3.21 2.365l-2.21-.635-.003-.01a.386.386 0 01-.264-.489.385.385 0 01.113-.17v-.005l1.706-1.523a4.56 4.56 0 01.658 2.832zm-2.944 1.22l.883 2.127a4.497 4.497 0 001.822-2.282l-2.275-.383-.004.004a.37.37 0 00-.236.032.385.385 0 00-.187.498l-.003.004zm-.55 2.721a4.531 4.531 0 01-2.466-.126l1.11-2h.001a.386.386 0 01.679-.001h.008l1.113 2.004c-.145.048-.293.089-.445.123zm-3.454-.602l.874-2.106-.007-.009a.383.383 0 00-.424-.528l-.003-.005-2.256.382c.338.934.977 1.73 1.816 2.266zM8.137 10.09l1.716 1.53-.002.01a.384.384 0 01-.151.66l-.002.007-2.2.633c-.11-.991.115-1.99.639-2.84zm4.214 1.648h-.703l-.438.544.157.68.633.303.631-.302.157-.68-.437-.545z" clip-rule="evenodd"/></svg>');--icon-menu-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1 3.75A.75.75 0 011.75 3h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 3.75zM1 7.75A.75.75 0 011.75 7h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 7.75zM1.75 11a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75z"/></g></svg>');--icon-menu-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M2 5.75A.75.75 0 012.75 5h18.5a.75.75 0 010 1.5H2.75A.75.75 0 012 5.75zM2 11.75a.75.75 0 01.75-.75h18.5a.75.75 0 010 1.5H2.75a.75.75 0 01-.75-.75zM2.75 17a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75z"/></g></svg>');--icon-minus-square-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.25 7a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5z"/><path fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zM2.5 3.25a.75.75 0 01.75-.75h9.5a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75v-9.5z" clip-rule="evenodd"/></g></svg>');--icon-minus-square-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.25 11a.75.75 0 000 1.5h7.5a.75.75 0 000-1.5h-7.5z"/><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25h14.5c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25V4.75z" clip-rule="evenodd"/></g></svg>');--icon-more-horizontal-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.5 6.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM8 6.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM12.5 6.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3z"/></g></svg>');--icon-more-horizontal-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M5 10a2 2 0 100 4 2 2 0 000-4zM12 10a2 2 0 100 4 2 2 0 000-4zM19 10a2 2 0 100 4 2 2 0 000-4z"/></g></svg>');--icon-globe-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM6.128 1.774A6.508 6.508 0 001.576 7H4.07a11.095 11.095 0 012.06-5.226zm3.744 0A11.096 11.096 0 0111.932 7h2.492a6.508 6.508 0 00-4.552-5.226zM10.42 7C10.165 5.124 9.333 3.335 8 1.836 6.667 3.335 5.835 5.124 5.58 7h4.84zM5.527 8.5h4.946C10.31 10.557 9.451 12.533 8 14.164 6.55 12.533 5.691 10.557 5.527 8.5zm-1.505 0H1.52a6.505 6.505 0 004.61 5.726C4.896 12.525 4.163 10.555 4.021 8.5zm5.85 5.726c1.231-1.701 1.964-3.671 2.106-5.726h2.503a6.505 6.505 0 01-4.61 5.726z" clip-rule="evenodd"/></svg>');--icon-globe-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm-1.673 1.647A9.506 9.506 0 002.552 11h4.747a16.673 16.673 0 013.028-8.353zm3.346 0A16.673 16.673 0 0116.701 11h4.747a9.506 9.506 0 00-7.775-8.353zM15.196 11A15.149 15.149 0 0012 2.916 15.149 15.149 0 008.804 11h6.392zm-6.427 1.5h6.462A15.16 15.16 0 0112 21.084 15.16 15.16 0 018.769 12.5zm-1.502 0H2.513c.23 4.45 3.525 8.091 7.814 8.853a16.683 16.683 0 01-3.06-8.853zm6.406 8.853a16.683 16.683 0 003.06-8.853h4.754c-.23 4.45-3.525 8.091-7.814 8.853z" clip-rule="evenodd"/></svg>');--icon-search-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M7.25 2a5.25 5.25 0 103.144 9.455l2.326 2.325a.75.75 0 101.06-1.06l-2.325-2.326A5.25 5.25 0 007.25 2zM3.5 7.25a3.75 3.75 0 117.5 0 3.75 3.75 0 01-7.5 0z" clip-rule="evenodd"/></svg>');--icon-search-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M10.5 2a8.5 8.5 0 105.457 15.017l4.763 4.763a.75.75 0 101.06-1.06l-4.763-4.763A8.5 8.5 0 0010.5 2zm-7 8.5a7 7 0 1114 0 7 7 0 01-14 0z" clip-rule="evenodd"/></svg>');--icon-star-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 .5a.75.75 0 01.67.412l2.064 4.094 4.622.662a.75.75 0 01.412 1.285l-3.335 3.18.786 4.488a.75.75 0 01-1.082.796L8 13.287l-4.137 2.13a.75.75 0 01-1.082-.796l.786-4.489-3.335-3.18a.75.75 0 01.412-1.284l4.622-.662L7.33.912A.75.75 0 018 .5zm0 2.416L6.43 6.03a.75.75 0 01-.564.405l-3.48.498 2.507 2.39a.75.75 0 01.22.672l-.594 3.396 3.138-1.616a.75.75 0 01.686 0l3.138 1.616-.595-3.396a.75.75 0 01.221-.672l2.507-2.39-3.48-.498a.75.75 0 01-.563-.405L8 2.916z" clip-rule="evenodd"/></svg>');--icon-star-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1a.75.75 0 01.673.418l2.992 6.065 6.694.978a.75.75 0 01.414 1.28l-4.842 4.717 1.143 6.665a.75.75 0 01-1.089.79L12 18.766l-5.985 3.149a.75.75 0 01-1.089-.79l1.143-6.666-4.842-4.717a.75.75 0 01.415-1.28l6.693-.978 2.992-6.065A.75.75 0 0112 1zm0 2.445L9.505 8.5a.75.75 0 01-.564.41l-5.58.816 4.037 3.933a.75.75 0 01.216.664l-.952 5.556 4.989-2.625a.75.75 0 01.698 0l4.99 2.625-.953-5.556a.75.75 0 01.216-.664l4.037-3.933-5.58-.816a.75.75 0 01-.564-.41L12 3.445z" clip-rule="evenodd"/></svg>');--icon-org-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h6.5A2.25 2.25 0 0112 3.25v2.112l2.05 1.453A2.25 2.25 0 0115 8.65v5.1c0 .69-.56 1.25-1.25 1.25h-2.5a.748.748 0 01-.75-.751v-11a.75.75 0 00-.75-.75h-6.5a.75.75 0 00-.75.75v11a.75.75 0 01-1.5 0v-11zM12 13.5V7.2l1.184.839a.75.75 0 01.316.612v4.85H12z" clip-rule="evenodd"/><path d="M4.75 10.55a.7.7 0 00-.7.7v3a.7.7 0 101.4 0v-2.3h2.1v2.3a.7.7 0 101.4 0v-3a.7.7 0 00-.7-.7h-3.5zM4.25 4.75A.75.75 0 015 4h.25a.75.75 0 010 1.5H5a.75.75 0 01-.75-.75zM7.75 4a.75.75 0 000 1.5H8A.75.75 0 008 4h-.25zM4.25 6.75A.75.75 0 015 6h.25a.75.75 0 010 1.5H5a.75.75 0 01-.75-.75zM7.75 6a.75.75 0 000 1.5H8A.75.75 0 008 6h-.25zM4.25 8.75A.75.75 0 015 8h.25a.75.75 0 010 1.5H5a.75.75 0 01-.75-.75zM7.75 8a.75.75 0 000 1.5H8A.75.75 0 008 8h-.25z"/></g></svg>');--icon-org-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h10.5A2.75 2.75 0 0118 4.75v5.504l2.326.988A2.75 2.75 0 0122 13.773v6.477A1.75 1.75 0 0120.25 22h-3a.746.746 0 01-.622-.33.746.746 0 01-.128-.42V10.769a.81.81 0 010-.039V4.75c0-.69-.56-1.25-1.25-1.25H4.75c-.69 0-1.25.56-1.25 1.25v16.5a.75.75 0 01-1.5 0V4.75zM18 20.5v-8.616l1.739.739c.461.196.76.649.76 1.15v6.477a.25.25 0 01-.25.25H18z" clip-rule="evenodd"/><path d="M8.25 16C7.56 16 7 16.56 7 17.25v4a.75.75 0 001.5 0V17.5h3v3.75a.75.75 0 001.5 0v-4c0-.69-.56-1.25-1.25-1.25h-3.5zM7 6.75A.75.75 0 017.75 6h.5a.75.75 0 010 1.5h-.5A.75.75 0 017 6.75zM11.75 6a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM7 9.75A.75.75 0 017.75 9h.5a.75.75 0 010 1.5h-.5A.75.75 0 017 9.75zM11.75 9a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM7 12.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75zM11.75 12a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/></g></svg>');--icon-user-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M8 1a4 4 0 100 8 4 4 0 000-8zM5.5 5a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z" clip-rule="evenodd"/><path d="M5.25 10a3.75 3.75 0 00-3.75 3.75v.5a.75.75 0 001.5 0v-.5a2.25 2.25 0 012.25-2.25h5.5A2.25 2.25 0 0113 13.75v.5a.75.75 0 001.5 0v-.5A3.75 3.75 0 0010.75 10h-5.5z"/></g></svg>');--icon-user-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M12 3a5 5 0 100 10 5 5 0 000-10zM8.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z" clip-rule="evenodd"/><path d="M7.75 14.5A4.75 4.75 0 003 19.25v1a.75.75 0 001.5 0v-1A3.25 3.25 0 017.75 16h8.5a3.25 3.25 0 013.25 3.25v1a.75.75 0 001.5 0v-1a4.75 4.75 0 00-4.75-4.75h-8.5z"/></g></svg>');--icon-users-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M6 2a3.5 3.5 0 100 7 3.5 3.5 0 000-7zM4 5.5a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/><path d="M4.25 10A3.75 3.75 0 00.5 13.75v.5a.75.75 0 001.5 0v-.5a2.25 2.25 0 012.25-2.25h3.5A2.25 2.25 0 0110 13.75v.5a.75.75 0 001.5 0v-.5A3.75 3.75 0 007.75 10h-3.5zM11.25 10.75A.75.75 0 0112 10h.25a3.25 3.25 0 013.25 3.25v1a.75.75 0 01-1.5 0v-1a1.75 1.75 0 00-1.75-1.75H12a.75.75 0 01-.75-.75zM11.273 2.24a.75.75 0 00-.546 1.396 2.001 2.001 0 010 3.728.75.75 0 00.546 1.397 3.501 3.501 0 000-6.522z"/></g></svg>');--icon-users-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M9 3a5 5 0 100 10A5 5 0 009 3zM5.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z" clip-rule="evenodd"/><path d="M4.75 14.5A4.75 4.75 0 000 19.25v1a.75.75 0 001.5 0v-1A3.25 3.25 0 014.75 16h8.5a3.25 3.25 0 013.25 3.25v1a.75.75 0 001.5 0v-1a4.75 4.75 0 00-4.75-4.75h-8.5zM18.25 15.25a.75.75 0 01.75-.75h.25A4.75 4.75 0 0124 19.25v1a.75.75 0 01-1.5 0v-1A3.25 3.25 0 0019.25 16H19a.75.75 0 01-.75-.75zM15 3a.75.75 0 000 1.5 3.5 3.5 0 110 7 .75.75 0 000 1.5 5 5 0 000-10z"/></g></svg>');--icon-eye-off-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M2.28 1.22a.75.75 0 00-1.06 1.06l1.664 1.665A10.99 10.99 0 00.977 5.994c-.295.41-.524.791-.683 1.103a4.16 4.16 0 00-.194.431A1.4 1.4 0 000 8c0 .155.041.296.067.375a3 3 0 00.122.31c.097.215.234.471.407.751.346.56.854 1.246 1.516 1.914C3.43 12.68 5.422 14 8 14c1.49 0 2.786-.442 3.868-1.071l1.852 1.851a.75.75 0 101.06-1.06l-4.645-4.646a.383.383 0 00-.008-.007v-.001l-3.19-3.19a.555.555 0 00-.014-.014L2.28 1.22zm3.127 5.248L3.95 5.01a9.444 9.444 0 00-1.754 1.857 7.362 7.362 0 00-.566.911c-.046.09-.08.164-.104.221l.03.067c.065.145.17.344.316.58a9.45 9.45 0 001.306 1.647C4.332 11.458 5.964 12.5 8 12.5c1.028 0 1.95-.264 2.763-.677l-1.23-1.23C9.078 10.858 8.552 11 8 11a3 3 0 01-3-3c0-.553.142-1.079.407-1.532zm2.985 2.985L6.547 7.608A1.62 1.62 0 006.5 8 1.5 1.5 0 008 9.5c.137 0 .269-.016.392-.047zM8 3.5c-.306 0-.602.023-.887.067a.75.75 0 11-.226-1.483C7.247 2.029 7.617 2 8 2c2.578 0 4.57 1.32 5.888 2.65.662.668 1.17 1.354 1.516 1.914.173.28.31.536.407.75.048.107.09.212.122.31.026.08.067.221.067.376 0 .21-.079.42-.126.537a4.99 4.99 0 01-.251.524c-.21.384-.515.857-.909 1.355a.75.75 0 11-1.176-.93c.343-.434.6-.836.768-1.144.078-.143.133-.258.168-.342a5.336 5.336 0 00-.346-.648 9.452 9.452 0 00-1.306-1.646C11.668 4.542 10.036 3.5 8 3.5zm6.511 4.604l-.002-.008.001.005.001.003z"/></g></svg>');--icon-eye-off-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M2.28 1.22a.75.75 0 00-1.06 1.06l3.468 3.468C3.294 6.87 2.204 8.154 1.437 9.236a15.323 15.323 0 00-1.02 1.635c-.117.22-.21.415-.277.574-.033.08-.063.16-.086.234A1.102 1.102 0 000 12c0 .116.025.216.037.263.017.06.037.12.058.177.042.113.1.245.17.388.138.289.34.657.599 1.074a18.14 18.14 0 002.285 2.936C5.14 18.912 8.135 21 12 21c2.361 0 4.4-.78 6.08-1.86l3.64 3.64a.75.75 0 101.06-1.06L2.28 1.22zm10.88 13l-3.38-3.38c-.18.345-.28.738-.28 1.16a2.5 2.5 0 002.5 2.5c.422 0 .815-.1 1.16-.28zM8.688 9.75A3.976 3.976 0 008 12a4 4 0 004 4c.835 0 1.609-.25 2.251-.688l2.74 2.74c-1.43.863-3.1 1.448-4.991 1.448-3.295 0-5.925-1.78-7.769-3.701a16.641 16.641 0 01-2.093-2.688c-.236-.38-.41-.701-.523-.934a4.225 4.225 0 01-.08-.177 5.8 5.8 0 01.207-.426c.202-.38.51-.893.919-1.47.733-1.036 1.776-2.253 3.094-3.288l2.933 2.933zM12 4.5c-.813 0-1.583.108-2.31.299a.75.75 0 11-.38-1.451A10.568 10.568 0 0112 3c3.864 0 6.86 2.088 8.85 4.162 1.001 1.043 1.767 2.1 2.286 2.936.26.417.46.785.6 1.074.069.143.127.275.169.388.021.056.041.117.058.177.012.047.037.147.037.263 0 .171-.057.332-.08.396-.034.098-.08.208-.134.326-.109.236-.265.535-.465.874-.4.68-.99 1.551-1.759 2.455a.75.75 0 01-1.142-.973 16.232 16.232 0 001.608-2.242 8.709 8.709 0 00.438-.836 4.03 4.03 0 00-.081-.177 10.392 10.392 0 00-.523-.934 16.639 16.639 0 00-2.093-2.688C17.924 6.28 15.294 4.5 12 4.5zm10.516 7.365z"/></g></svg>');--icon-eye-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 5a3 3 0 100 6 3 3 0 000-6zM6.5 8a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z"/><path d="M8 2C5.422 2 3.43 3.32 2.112 4.65A10.948 10.948 0 00.596 6.564c-.173.28-.31.536-.407.75a3 3 0 00-.122.31C.04 7.705 0 7.846 0 8s.041.296.067.375a3 3 0 00.122.31c.097.215.234.471.407.751.346.56.854 1.246 1.516 1.914C3.43 12.68 5.422 14 8 14s4.57-1.32 5.888-2.65a10.952 10.952 0 001.516-1.914c.173-.28.31-.536.407-.75.048-.107.09-.212.122-.31.026-.08.067-.221.067-.376s-.041-.296-.067-.375a2.978 2.978 0 00-.122-.31 6.777 6.777 0 00-.407-.751 10.952 10.952 0 00-1.516-1.914C12.57 3.32 10.578 2 8 2zM1.556 7.933a2.314 2.314 0 00-.03.067l.03.067c.065.145.17.344.316.58a9.45 9.45 0 001.306 1.647C4.332 11.458 5.964 12.5 8 12.5s3.668-1.042 4.822-2.206a9.45 9.45 0 001.306-1.646A5.336 5.336 0 0014.473 8a5.335 5.335 0 00-.346-.648 9.452 9.452 0 00-1.305-1.646C11.668 4.542 10.036 3.5 8 3.5S4.332 4.542 3.178 5.706a9.45 9.45 0 00-1.306 1.646 5.316 5.316 0 00-.316.58z"/></g></svg>');--icon-eye-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 8a4 4 0 100 8 4 4 0 000-8zm-2.5 4a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z"/><path d="M12 3C8.135 3 5.14 5.088 3.15 7.162c-1.001 1.043-1.767 2.1-2.286 2.936-.26.417-.46.785-.6 1.074-.069.143-.127.275-.169.388a1.952 1.952 0 00-.058.177A1.024 1.024 0 000 12c0 .116.025.216.037.263.017.06.037.12.058.177.042.113.1.245.17.388.138.289.34.657.599 1.074a18.14 18.14 0 002.285 2.936C5.14 18.912 8.135 21 12 21c3.864 0 6.86-2.088 8.85-4.162 1.001-1.043 1.767-2.1 2.286-2.936.26-.417.46-.785.6-1.074.069-.143.127-.275.169-.388a1.98 1.98 0 00.058-.177c.012-.047.037-.147.037-.263 0-.116-.025-.216-.037-.263a1.98 1.98 0 00-.058-.177 4.709 4.709 0 00-.17-.388c-.139-.289-.34-.657-.599-1.074a18.146 18.146 0 00-2.285-2.936C18.86 5.088 15.865 3 12 3zM1.615 12.177a4.225 4.225 0 01-.08-.177c.02-.048.047-.107.08-.177.113-.233.287-.554.523-.934a16.641 16.641 0 012.093-2.688C6.076 6.28 8.705 4.5 12 4.5c3.294 0 5.924 1.78 7.768 3.701a16.639 16.639 0 012.094 2.688c.236.38.41.701.523.934.033.07.06.129.08.177a4.03 4.03 0 01-.08.177c-.113.233-.287.554-.523.934a16.639 16.639 0 01-2.093 2.688C17.924 17.72 15.294 19.5 12 19.5s-5.925-1.78-7.769-3.701a16.641 16.641 0 01-2.093-2.688c-.236-.38-.41-.701-.523-.934z"/></g></svg>');--icon-alert-circle-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 4a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 018 4zM8 10a1 1 0 100 2h.007a1 1 0 100-2H8z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');--icon-alert-circle-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 7a.75.75 0 01.75.75v4.5a.75.75 0 01-1.5 0v-4.5A.75.75 0 0112 7zM12 15a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');--icon-aws-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23252F3E" d="M4.51 7.687c0 .197.02.357.058.475.042.117.096.245.17.384a.233.233 0 01.037.123c0 .053-.032.107-.1.16l-.336.224a.255.255 0 01-.138.048c-.054 0-.107-.026-.16-.074a1.652 1.652 0 01-.192-.251 4.137 4.137 0 01-.165-.315c-.415.491-.936.737-1.564.737-.447 0-.804-.129-1.064-.385-.261-.256-.394-.598-.394-1.025 0-.454.16-.822.484-1.1.325-.278.756-.416 1.304-.416.18 0 .367.016.564.042.197.027.4.07.612.118v-.39c0-.406-.085-.689-.25-.854-.17-.166-.458-.246-.868-.246-.186 0-.377.022-.574.07a4.23 4.23 0 00-.575.181 1.525 1.525 0 01-.186.07.326.326 0 01-.085.016c-.075 0-.112-.054-.112-.166v-.262c0-.085.01-.15.037-.186a.399.399 0 01.15-.113c.185-.096.409-.176.67-.24.26-.07.537-.101.83-.101.633 0 1.096.144 1.394.432.293.288.442.726.442 1.314v1.73h.01zm-2.161.811c.175 0 .356-.032.548-.096.191-.064.362-.182.505-.342a.848.848 0 00.181-.341c.032-.129.054-.283.054-.465V7.03a4.43 4.43 0 00-.49-.09 3.996 3.996 0 00-.5-.033c-.357 0-.618.07-.793.214-.176.144-.26.347-.26.614 0 .25.063.437.196.566.128.133.314.197.559.197zm4.273.577c-.096 0-.16-.016-.202-.054-.043-.032-.08-.106-.112-.208l-1.25-4.127a.938.938 0 01-.049-.214c0-.085.043-.133.128-.133h.522c.1 0 .17.016.207.053.043.032.075.107.107.208l.894 3.535.83-3.535c.026-.106.058-.176.1-.208a.365.365 0 01.214-.053h.425c.102 0 .17.016.213.053.043.032.08.107.101.208l.841 3.578.92-3.578a.458.458 0 01.107-.208.346.346 0 01.208-.053h.495c.085 0 .133.043.133.133 0 .027-.006.054-.01.086a.76.76 0 01-.038.133l-1.283 4.127c-.032.107-.069.177-.111.209a.34.34 0 01-.203.053h-.457c-.101 0-.17-.016-.213-.053-.043-.038-.08-.107-.101-.214L8.213 5.37l-.82 3.439c-.026.107-.058.176-.1.213-.043.038-.118.054-.213.054h-.458zm6.838.144a3.51 3.51 0 01-.82-.096c-.266-.064-.473-.134-.612-.214-.085-.048-.143-.101-.165-.15a.378.378 0 01-.031-.149v-.272c0-.112.042-.166.122-.166a.3.3 0 01.096.016c.032.011.08.032.133.054.18.08.378.144.585.187.213.042.42.064.633.064.336 0 .596-.059.777-.176a.575.575 0 00.277-.508.52.52 0 00-.144-.373c-.095-.102-.276-.193-.537-.278l-.772-.24c-.388-.123-.676-.305-.851-.545a1.275 1.275 0 01-.266-.774c0-.224.048-.422.143-.593.096-.17.224-.32.384-.438.16-.122.34-.213.553-.277.213-.064.436-.091.67-.091.118 0 .24.005.357.021.122.016.234.038.346.06.106.026.208.052.303.085.096.032.17.064.224.096a.46.46 0 01.16.133.289.289 0 01.047.176v.251c0 .112-.042.171-.122.171a.552.552 0 01-.202-.064 2.427 2.427 0 00-1.022-.208c-.303 0-.543.048-.708.15-.165.1-.25.256-.25.475 0 .149.053.277.16.379.106.101.303.202.585.293l.756.24c.383.123.66.294.825.513.165.219.244.47.244.748 0 .23-.047.437-.138.619a1.436 1.436 0 01-.388.47c-.165.133-.362.23-.591.299-.24.075-.49.112-.761.112z"/><g fill="%23F90" fill-rule="evenodd" clip-rule="evenodd"><path d="M14.465 11.813c-1.75 1.297-4.294 1.986-6.481 1.986-3.065 0-5.827-1.137-7.913-3.027-.165-.15-.016-.353.18-.235 2.257 1.313 5.04 2.109 7.92 2.109 1.941 0 4.075-.406 6.039-1.239.293-.133.543.192.255.406z"/><path d="M15.194 10.98c-.223-.287-1.479-.138-2.048-.069-.17.022-.197-.128-.043-.24 1-.705 2.645-.502 2.836-.267.192.24-.053 1.89-.99 2.68-.143.123-.281.06-.218-.1.213-.53.687-1.72.463-2.003z"/></g></svg>');--icon-aws-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23252F3E" d="M6.895 10.085c0 .288.031.521.085.692.063.172.14.359.25.561a.338.338 0 01.054.18c0 .077-.047.155-.148.233l-.49.327a.373.373 0 01-.203.07c-.077 0-.155-.039-.233-.11a2.408 2.408 0 01-.28-.365 6.031 6.031 0 01-.241-.46c-.607.717-1.37 1.075-2.288 1.075-.654 0-1.176-.187-1.557-.56-.381-.374-.576-.873-.576-1.495 0-.662.234-1.2.708-1.605.475-.404 1.105-.607 1.907-.607.265 0 .537.023.825.062.288.04.584.102.895.172v-.569c0-.591-.125-1.004-.366-1.246-.249-.24-.67-.358-1.268-.358a3.54 3.54 0 00-.84.102 6.2 6.2 0 00-.841.264 2.234 2.234 0 01-.273.101.477.477 0 01-.124.024c-.11 0-.164-.078-.164-.242V5.95c0-.125.016-.218.055-.273A.583.583 0 012 5.514c.272-.14.599-.257.98-.35a4.716 4.716 0 011.214-.148c.926 0 1.604.21 2.04.63.427.42.645 1.06.645 1.916v2.522h.016zm-3.16 1.183c.257 0 .522-.047.802-.14.28-.094.529-.265.74-.498.124-.148.217-.312.264-.499.046-.187.078-.412.078-.677v-.327a6.494 6.494 0 00-.716-.133 5.86 5.86 0 00-.732-.046c-.521 0-.903.1-1.16.311-.256.21-.381.506-.381.896 0 .366.093.638.288.825.187.195.46.288.817.288zm6.25.841c-.14 0-.234-.023-.296-.078-.062-.047-.117-.156-.164-.304L7.696 5.71a1.364 1.364 0 01-.07-.312c0-.124.063-.195.187-.195h.763c.148 0 .249.024.303.078.063.047.11.156.156.304l1.308 5.155 1.214-5.155c.039-.156.085-.257.147-.304a.535.535 0 01.312-.078h.622c.148 0 .25.024.312.078.062.047.117.156.148.304l1.23 5.217 1.346-5.217c.046-.156.1-.257.155-.304a.508.508 0 01.304-.078h.724c.124 0 .194.063.194.195 0 .039-.008.078-.015.125a1.104 1.104 0 01-.055.194l-1.876 6.02c-.046.155-.1.256-.163.303a.497.497 0 01-.296.078h-.669c-.148 0-.249-.024-.311-.078-.063-.055-.117-.156-.148-.312l-1.206-5.022-1.199 5.015c-.039.155-.086.257-.148.311-.062.055-.171.078-.311.078h-.67zm10 .21a5.15 5.15 0 01-1.198-.14c-.39-.093-.693-.195-.895-.311-.125-.07-.21-.148-.242-.218a.55.55 0 01-.046-.218v-.398c0-.163.062-.24.179-.24a.44.44 0 01.14.022c.047.016.117.047.194.078.265.117.553.21.857.273.31.062.614.093.926.093.49 0 .871-.085 1.136-.257a.838.838 0 00.404-.74.758.758 0 00-.21-.544c-.14-.148-.404-.28-.786-.405l-1.128-.35c-.568-.18-.988-.445-1.245-.795a1.856 1.856 0 01-.39-1.129c0-.327.07-.615.21-.864.14-.25.328-.467.561-.639a2.47 2.47 0 01.81-.405 3.39 3.39 0 01.98-.132c.171 0 .35.008.521.031.18.024.343.055.506.086.156.039.304.078.444.124.14.047.249.094.327.14a.673.673 0 01.233.195.42.42 0 01.07.257V6.2c0 .164-.062.25-.179.25a.81.81 0 01-.295-.094 3.559 3.559 0 00-1.495-.304c-.443 0-.793.07-1.035.218-.241.148-.365.374-.365.693 0 .218.077.405.233.553.156.148.444.296.856.428l1.105.35c.56.18.965.429 1.207.748.24.32.358.685.358 1.09 0 .335-.07.639-.203.903-.14.265-.327.499-.568.686-.241.194-.53.335-.864.436a3.7 3.7 0 01-1.113.163z"/><g fill="%23F90" fill-rule="evenodd" clip-rule="evenodd"><path d="M21.456 16.103c-2.56 1.892-6.28 2.897-9.48 2.897-4.482 0-8.522-1.659-11.572-4.415-.242-.218-.024-.514.264-.343 3.3 1.916 7.37 3.076 11.58 3.076 2.841 0 5.962-.592 8.834-1.806.428-.195.794.28.374.591z"/><path d="M22.522 14.889c-.327-.42-2.164-.203-2.996-.101-.25.03-.288-.187-.063-.35 1.463-1.029 3.868-.733 4.148-.39.28.35-.077 2.756-1.447 3.909-.21.179-.413.085-.32-.148.312-.771 1.005-2.508.678-2.92z"/></g></svg>');--icon-check-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M14.78 4.28a.75.75 0 00-1.06-1.06l-7.97 7.97-3.47-3.47a.75.75 0 00-1.06 1.06l4 4a.75.75 0 001.06 0l8.5-8.5z"/></svg>');--icon-check-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M21.78 6.28a.75.75 0 00-1.06-1.06L8.75 17.19l-5.47-5.47a.75.75 0 00-1.06 1.06l6 6a.75.75 0 001.06 0l12.5-12.5z"/></svg>');--icon-check-circle-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.78 5.22a.75.75 0 010 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');--icon-check-circle-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M17.78 8.22a.75.75 0 010 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');--icon-check-circle-fill-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zm2.72 5.22a.75.75 0 111.06 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97z" clip-rule="evenodd"/></svg>');--icon-check-circle-fill-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm4.72 7.22a.75.75 0 111.06 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97z" clip-rule="evenodd"/></svg>');--icon-chevron-left-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M10.795 3.235a.75.75 0 01-.03 1.06L6.842 8l3.923 3.705a.75.75 0 01-1.03 1.09l-4.5-4.25a.75.75 0 010-1.09l4.5-4.25a.75.75 0 011.06.03z" clip-rule="evenodd"/></svg>');--icon-chevron-left-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M15.79 18.77a.75.75 0 00-.02-1.06L9.832 12l5.938-5.71a.75.75 0 10-1.04-1.08l-6.5 6.25a.75.75 0 000 1.08l6.5 6.25a.75.75 0 001.06-.02z" clip-rule="evenodd"/></svg>');--icon-chevron-right-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M5.205 3.235a.75.75 0 00.03 1.06L9.158 8l-3.923 3.705a.75.75 0 001.03 1.09l4.5-4.25a.75.75 0 000-1.09l-4.5-4.25a.75.75 0 00-1.06.03z" clip-rule="evenodd"/></svg>');--icon-chevron-right-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M8.21 18.77a.75.75 0 01.02-1.06L14.168 12 8.23 6.29a.75.75 0 111.04-1.08l6.5 6.25a.75.75 0 010 1.08l-6.5 6.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd"/></svg>');--icon-chevron-up-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.235 10.795a.75.75 0 001.06-.03L8 6.842l3.705 3.923a.75.75 0 001.09-1.03l-4.25-4.5a.75.75 0 00-1.09 0l-4.25 4.5a.75.75 0 00.03 1.06z" clip-rule="evenodd"/></svg>');--icon-chevron-up-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.23 15.79a.75.75 0 001.06-.02L12 9.832l5.71 5.938a.75.75 0 101.08-1.04l-6.25-6.5a.75.75 0 00-1.08 0l-6.25 6.5a.75.75 0 00.02 1.06z" clip-rule="evenodd"/></svg>');--icon-delay-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.5 8a6.5 6.5 0 016.744-6.496.75.75 0 10.055-1.499 8 8 0 107.036 11.193.75.75 0 00-1.375-.6 6.722 6.722 0 01-.22.453A6.5 6.5 0 011.5 8zM10.726 1.238a.75.75 0 011.013-.312c.177.094.35.194.518.3a.75.75 0 01-.799 1.27 6.512 6.512 0 00-.42-.244.75.75 0 01-.312-1.014zM13.74 3.508a.75.75 0 011.034.235c.106.168.206.34.3.518a.75.75 0 11-1.326.702 6.452 6.452 0 00-.243-.421.75.75 0 01.235-1.034zM15.217 6.979a.75.75 0 01.777.722 8.034 8.034 0 01.002.552.75.75 0 01-1.5-.047 6.713 6.713 0 000-.45.75.75 0 01.721-.777z"/><path d="M7.75 3a.75.75 0 01.75.75v3.786l2.085 1.043a.75.75 0 11-.67 1.342l-2.5-1.25A.75.75 0 017 8V3.75A.75.75 0 017.75 3z"/></g></svg>');--icon-delay-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 2.5a9.5 9.5 0 100 19 9.5 9.5 0 008.747-5.788.75.75 0 111.382.583c-.072.17-.148.338-.23.506v.002A11 11 0 0112 23C5.925 23 1 18.075 1 12S5.925 1 12 1c.186 0 .371.005.555.014a.75.75 0 01-.079 1.498A9.14 9.14 0 0012 2.5zM14.822 2.136a.75.75 0 01.971-.427c.346.135.683.287 1.01.455a.75.75 0 01-.687 1.334 9.08 9.08 0 00-.866-.39.75.75 0 01-.428-.972zM18.414 4.112a.75.75 0 011.06-.011c.263.257.513.527.749.807a.75.75 0 11-1.147.966 10.025 10.025 0 00-.651-.702.75.75 0 01-.01-1.06zM20.977 7.315a.75.75 0 01.99.381c.149.335.282.677.398 1.026a.75.75 0 11-1.422.476c-.102-.303-.218-.601-.347-.893a.75.75 0 01.38-.99zM22.174 11.239a.75.75 0 01.768.73c.01.368 0 .737-.029 1.107a.75.75 0 01-1.495-.118c.025-.317.033-.634.025-.95a.75.75 0 01.73-.77z"/><path d="M12.5 5.75a.75.75 0 00-1.5 0V12c0 .284.16.544.415.67l4.5 2.25a.75.75 0 10.67-1.34L12.5 11.536V5.75z"/></g></svg>');--icon-docs-link-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M3.5 3.25a.75.75 0 01.75-.75H8A.75.75 0 008 1H4.25A2.25 2.25 0 002 3.25v9.5A2.25 2.25 0 004.25 15h8.5c.69 0 1.25-.56 1.25-1.25V7a.75.75 0 00-1.5 0v3H4.25c-.263 0-.515.045-.75.128V3.25zm0 9v.5c0 .414.336.75.75.75h8.25v-2H4.25a.75.75 0 00-.75.75z" clip-rule="evenodd"/><path d="M12.5 3.56v.69a.75.75 0 001.5 0v-2.5a.75.75 0 00-.75-.75h-2.5a.75.75 0 000 1.5h.69L9.47 4.47a.75.75 0 001.06 1.06l1.97-1.97z"/></g></svg>');--icon-docs-link-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M4.5 3.75c0-.69.56-1.25 1.25-1.25h7.5a.75.75 0 000-1.5h-7.5A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h13.5A1.75 1.75 0 0021 21.25V8.75a.75.75 0 00-1.5 0v8.75H5.75c-.45 0-.875.108-1.25.3V3.75zm0 16.5c0 .69.56 1.25 1.25 1.25h13.5a.25.25 0 00.25-.25V19H5.75c-.69 0-1.25.56-1.25 1.25z" clip-rule="evenodd"/><path d="M19.5 3.56v1.69a.75.75 0 001.5 0v-3.5a.75.75 0 00-.75-.75h-3.5a.75.75 0 000 1.5h1.69l-2.97 2.97a.75.75 0 001.06 1.06l2.97-2.97z"/></g></svg>');--icon-gateway-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.537 5.354c.415-1.153.971-2.12 1.695-2.794C5.938 1.903 6.83 1.5 8 1.5c1.251 0 2.188.46 2.921 1.21.752.768 1.31 1.865 1.71 3.146.802 2.566.901 5.638.862 7.563-.013.594-.508 1.081-1.16 1.081H3.668c-.653 0-1.148-.487-1.16-1.083-.012-.545-.012-1.189.012-1.89a.75.75 0 10-1.499-.053 35.678 35.678 0 00-.013 1.974C1.038 14.916 2.256 16 3.668 16h8.665c1.41 0 2.63-1.082 2.66-2.55.04-1.968-.054-5.238-.93-8.041-.438-1.404-1.09-2.747-2.07-3.749C10.994.64 9.677 0 8 0 6.439 0 5.185.554 4.21 1.462c-.96.893-1.622 2.1-2.084 3.384a.75.75 0 101.411.508z"/><path d="M6.22 4.47a.75.75 0 011.06 0l3.25 3.25.008.008a.75.75 0 01-.008 1.052l-3.25 3.25a.75.75 0 01-1.06-1.06L8.19 9H1a.75.75 0 010-1.5h7.19L6.22 5.53a.75.75 0 010-1.06z"/></g></svg>');--icon-gateway-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M5.052 8.165c.624-1.654 1.469-3.072 2.593-4.071C8.753 3.108 10.164 2.5 12 2.5c2.06 0 3.592.765 4.763 1.987 1.19 1.242 2.03 2.984 2.608 4.946 1.155 3.929 1.19 8.503 1.096 10.985-.023.6-.523 1.082-1.173 1.082H4.706c-.648 0-1.15-.484-1.173-1.086a46.334 46.334 0 01.016-3.879.75.75 0 10-1.498-.07 47.832 47.832 0 00-.017 4.006C2.09 21.924 3.297 23 4.706 23h14.588c1.406 0 2.616-1.07 2.672-2.525.096-2.523.07-7.297-1.156-11.465-.614-2.086-1.545-4.08-2.964-5.561C16.405 1.946 14.488 1 12 1c-2.207 0-3.971.745-5.352 1.973-1.365 1.214-2.324 2.871-3 4.662a.75.75 0 001.404.53z"/><path d="M9.207 6.482a.75.75 0 011.06-.025l5.5 5.25c.14.133.23.322.233.531v.024a.75.75 0 01-.232.53l-5.5 5.25a.75.75 0 01-1.036-1.085L13.378 13H1.75a.75.75 0 010-1.5h11.628L9.232 7.543a.75.75 0 01-.025-1.06z"/></g></svg>');--icon-git-commit-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M10.905 7a3.001 3.001 0 00-5.81 0H2.75a.75.75 0 000 1.5h2.345a3.001 3.001 0 005.81 0h2.345a.75.75 0 000-1.5h-2.345zM8 6.25a1.5 1.5 0 100 3 1.5 1.5 0 000-3z" clip-rule="evenodd"/></svg>');--icon-git-commit-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M15.93 11a4.001 4.001 0 00-7.86 0H3.75a.75.75 0 000 1.5h4.32a4.001 4.001 0 007.86 0h4.32a.75.75 0 000-1.5h-4.32zM12 9.25a2.5 2.5 0 100 5 2.5 2.5 0 000-5z" clip-rule="evenodd"/></svg>');--icon-history-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.5 1.25a.75.75 0 011.5 0v1.851A7 7 0 111 8a.75.75 0 011.5 0 5.5 5.5 0 101.725-4H5.75a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75v-3.5z"/><path d="M8.25 4a.75.75 0 01.75.75v3.763l1.805.802a.75.75 0 01-.61 1.37l-2.25-1A.75.75 0 017.5 9V4.75A.75.75 0 018.25 4z"/></g></svg>');--icon-history-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 3.5c-2.347 0-4.471.95-6.01 2.49A8.55 8.55 0 005.125 7H8.25a.75.75 0 010 1.5h-4.5A.75.75 0 013 7.75v-4.5a.75.75 0 011.5 0v2.135A9.971 9.971 0 0112 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12a.75.75 0 011.5 0A8.5 8.5 0 1012 3.5z"/><path d="M11.75 6a.75.75 0 01.75.75v5.787l4.085 2.042a.75.75 0 11-.67 1.342l-4.5-2.25A.75.75 0 0111 13V6.75a.75.75 0 01.75-.75z"/></g></svg>');--icon-info-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 7a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 018 7zM8 4a1 1 0 000 2h.007a1 1 0 000-2H8z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');--icon-info-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 10.5a.75.75 0 01.75.75v5.5a.75.75 0 01-1.5 0v-5.5a.75.75 0 01.75-.75zM12 7a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');--icon-layers-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M7.656.084a.75.75 0 01.689 0l7.25 3.75a.75.75 0 010 1.332l-7.25 3.75a.75.75 0 01-.69 0l-7.25-3.75a.75.75 0 010-1.332l7.25-3.75zM2.383 4.5L8 7.405 13.617 4.5 8 1.594 2.383 4.5z" clip-rule="evenodd"/><path d="M.093 10.887a.75.75 0 011.02-.294L8 14.393l6.888-3.8a.75.75 0 11.724 1.313l-7.25 4a.75.75 0 01-.724 0l-7.25-4a.75.75 0 01-.295-1.019z"/><path d="M1.112 7.093a.75.75 0 00-.724 1.313l7.25 4a.75.75 0 00.724 0l7.25-4a.75.75 0 00-.724-1.313L8 10.893l-6.888-3.8z"/></g></svg>');--icon-layers-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M11.658 1.082a.75.75 0 01.684 0l10.25 5.25a.75.75 0 010 1.336l-10.25 5.25a.75.75 0 01-.684 0l-10.25-5.25a.75.75 0 010-1.336l10.25-5.25zM3.395 7L12 11.407 20.605 7 12 2.593 3.395 7z" clip-rule="evenodd"/><path d="M1.089 16.395a.75.75 0 011.016-.306L12 21.399l9.895-5.31a.75.75 0 01.71 1.322l-10.25 5.5a.75.75 0 01-.71 0l-10.25-5.5a.75.75 0 01-.306-1.016z"/><path d="M2.105 11.089a.75.75 0 00-.71 1.322l10.25 5.5a.75.75 0 00.71 0l10.25-5.5a.75.75 0 00-.71-1.322L12 16.399l-9.895-5.31z"/></g></svg>');--icon-loading-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" class="hds-flight-icon--animation-loading"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8z" opacity=".2"/><path d="M7.25.75A.75.75 0 018 0a8 8 0 018 8 .75.75 0 01-1.5 0A6.5 6.5 0 008 1.5a.75.75 0 01-.75-.75z"/></g></svg>');--icon-loading-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="hds-flight-icon--animation-loading"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 2.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19zM1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12z" opacity=".2"/><path d="M11.25 1.75A.75.75 0 0112 1c6.075 0 11 4.925 11 11a.75.75 0 01-1.5 0A9.5 9.5 0 0012 2.5a.75.75 0 01-.75-.75z"/></g></svg>');--icon-path-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M13 0a3 3 0 00-1.65 5.506 7.338 7.338 0 01-.78 1.493c-.22.32-.472.635-.8 1.025a1.509 1.509 0 00-.832.085 12.722 12.722 0 00-1.773-1.124c-.66-.34-1.366-.616-2.215-.871a1.5 1.5 0 10-2.708 1.204c-.9 1.935-1.236 3.607-1.409 5.838a1.5 1.5 0 101.497.095c.162-2.07.464-3.55 1.25-5.253.381-.02.725-.183.979-.435.763.23 1.367.471 1.919.756a11.13 11.13 0 011.536.973 1.5 1.5 0 102.899-.296c.348-.415.64-.779.894-1.148.375-.548.665-1.103.964-1.857A3 3 0 1013 0zm-1.5 3a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/></svg>');--icon-path-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M19.5 1a3.5 3.5 0 00-1.668 6.578c-.665 1.8-1.174 2.997-2.267 4.503a2.001 2.001 0 00-1.605.21c-1.859-1.251-3.599-1.917-5.978-2.56A2 2 0 104.48 11.3c-.616 1.268-1.071 2.439-1.406 3.674-.344 1.267-.556 2.585-.694 4.125a2 2 0 101.497.103c.132-1.465.332-2.682.644-3.835.303-1.115.715-2.186 1.29-3.375a1.997 1.997 0 001.8-.806c2.236.605 3.801 1.208 5.454 2.311A2.002 2.002 0 0015 16a2 2 0 001.74-2.986c1.25-1.71 1.815-3.057 2.537-5.021A3.5 3.5 0 1019.5 1zm-2 3.5a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/></svg>');--icon-skip-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 0110.535-5.096l-9.131 9.131A6.472 6.472 0 011.5 8zm2.465 5.096a6.5 6.5 0 009.131-9.131l-9.131 9.131z" clip-rule="evenodd"/></svg>');--icon-skip-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M4.172 19.728a.744.744 0 00.1.1A10.965 10.965 0 0012 23c6.075 0 11-4.925 11-11 0-3.012-1.21-5.742-3.172-7.728a.769.769 0 00-.1-.1A10.965 10.965 0 0012 1C5.925 1 1 5.925 1 12c0 3.012 1.21 5.742 3.172 7.728zM2.5 12A9.5 9.5 0 0112 2.5c2.353 0 4.507.856 6.166 2.273L4.773 18.166A9.462 9.462 0 012.5 12zm16.727-6.166A9.462 9.462 0 0121.5 12a9.5 9.5 0 01-9.5 9.5 9.462 9.462 0 01-6.166-2.273L19.227 5.834z" clip-rule="evenodd"/></svg>');--icon-socket-16:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12 20C16.4183 20 20 16.4183 20 12C20 7.58172 16.4183 4 12 4C7.58172 4 4 7.58172 4 12C4 16.4183 7.58172 20 12 20ZM12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM7 11C7 10.4477 7.44772 10 8 10H10C10.5523 10 11 10.4477 11 11V13C11 13.5523 10.5523 14 10 14H8C7.44772 14 7 13.5523 7 13V11ZM14 10C13.4477 10 13 10.4477 13 11V13C13 13.5523 13.4477 14 14 14H16C16.5523 14 17 13.5523 17 13V11C17 10.4477 16.5523 10 16 10H14Z" fill="%23000"/></svg>');--icon-socket-24:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12 20C16.4183 20 20 16.4183 20 12C20 7.58172 16.4183 4 12 4C7.58172 4 4 7.58172 4 12C4 16.4183 7.58172 20 12 20ZM12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM7 11C7 10.4477 7.44772 10 8 10H10C10.5523 10 11 10.4477 11 11V13C11 13.5523 10.5523 14 10 14H8C7.44772 14 7 13.5523 7 13V11ZM14 10C13.4477 10 13 10.4477 13 11V13C13 13.5523 13.4477 14 14 14H16C16.5523 14 17 13.5523 17 13V11C17 10.4477 16.5523 10 16 10H14Z" fill="%23000"/></svg>');--icon-star-circle-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8.679 2.431a.75.75 0 00-1.358 0L6.023 5.196l-2.887.444a.75.75 0 00-.423 1.265l2.11 2.162-.499 3.062a.75.75 0 001.103.777L8 11.484l2.573 1.422a.75.75 0 001.103-.777l-.5-3.062 2.11-2.162a.75.75 0 00-.422-1.265l-2.887-.444-1.298-2.765zM7.21 6.195L8 4.515l.789 1.68a.75.75 0 00.565.423l1.84.283L9.838 8.29a.75.75 0 00-.203.644l.312 1.912-1.584-.876a.75.75 0 00-.726 0l-1.584.876.312-1.912a.75.75 0 00-.203-.644L4.806 6.9l1.84-.282a.75.75 0 00.565-.423z"/><path d="M8 .05a7.95 7.95 0 100 15.9A7.95 7.95 0 008 .05zM1.45 8a6.55 6.55 0 1113.1 0 6.55 6.55 0 01-13.1 0z"/></g></svg>');--icon-star-circle-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12.669 4.91a.75.75 0 00-1.338 0l-1.91 3.767-4.277.608a.75.75 0 00-.41 1.287l3.082 2.923-.726 4.125a.75.75 0 001.08.798L12 16.457l3.83 1.96a.75.75 0 001.08-.797l-.726-4.125 3.082-2.923a.75.75 0 00-.41-1.287l-4.278-.608L12.67 4.91zm-2.086 4.793L12 6.91l1.417 2.794a.75.75 0 00.563.404l3.128.445-2.25 2.132a.75.75 0 00-.222.675l.535 3.036-2.83-1.448a.75.75 0 00-.683 0l-2.83 1.448.536-3.036a.75.75 0 00-.223-.675l-2.249-2.132 3.128-.445a.75.75 0 00.563-.404z"/><path d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z"/></g></svg>');--icon-star-fill-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8.67.912a.75.75 0 00-1.34 0L5.266 5.006l-4.622.662a.75.75 0 00-.412 1.285l3.335 3.18-.786 4.488a.75.75 0 001.082.796L8 13.287l4.137 2.13a.75.75 0 001.082-.796l-.786-4.488 3.335-3.18a.75.75 0 00-.412-1.285l-4.622-.662L8.67.912z"/></svg>');--icon-star-fill-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M12.673 1.418a.75.75 0 00-1.345 0L8.335 7.483l-6.693.978a.75.75 0 00-.415 1.28l4.842 4.717-1.143 6.665a.75.75 0 001.089.79L12 18.766l5.985 3.149a.75.75 0 001.089-.79l-1.143-6.666 4.842-4.717a.75.75 0 00-.415-1.28l-6.693-.978-2.992-6.065z"/></svg>');--icon-tag-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5 4a1 1 0 000 2h.006a1 1 0 000-2H5z"/><path fill-rule="evenodd" d="M2.25 1C1.56 1 1 1.56 1 2.25v5.246c0 .596.237 1.169.659 1.59l5.383 5.384a2.25 2.25 0 003.182 0l4.246-4.246a2.25 2.25 0 000-3.182L9.087 1.66A2.25 2.25 0 007.496 1H2.25zm.25 6.496V2.5h4.996a.75.75 0 01.53.22l5.383 5.383a.75.75 0 010 1.06L9.163 13.41a.75.75 0 01-1.06 0L2.72 8.026a.75.75 0 01-.22-.53z" clip-rule="evenodd"/></g></svg>');--icon-tag-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M6 5a1 1 0 000 2h.01a1 1 0 000-2H6z"/><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v6.422c0 .729.29 1.428.805 1.944l8 8a2.75 2.75 0 003.89 0l6.421-6.421a2.75 2.75 0 000-3.89l-8-8A2.75 2.75 0 0011.172 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25h6.422c.331 0 .649.132.883.366l8 8a1.25 1.25 0 010 1.768l-6.421 6.421a1.25 1.25 0 01-1.768 0l-8-8a1.25 1.25 0 01-.366-.883V4.75z" clip-rule="evenodd"/></g></svg>');--icon-vault-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23FFD814" d="M0 0l7.971 15.516L16 0H0zm6.732 6.16h-1.27V4.89h1.27v1.27zm0-1.906h-1.27V2.985h1.27v1.269zm1.904 3.81h-1.27v-1.27h1.27v1.27zm0-1.905h-1.27V4.89h1.27v1.27zm0-1.905h-1.27V2.985h1.27v1.269zm1.894 1.905H9.26V4.89h1.27v1.27zM9.26 4.254V2.985h1.27v1.269H9.26z"/></svg>');--icon-vault-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23FFD814" d="M1 1l10.96 21.334L23 1H1zm9.256 8.469H8.51V7.723h1.746v1.746zm0-2.62H8.51V5.105h1.746v1.744zm2.618 5.238h-1.746v-1.746h1.746v1.746zm0-2.618h-1.746V7.723h1.746v1.746zm0-2.62h-1.746V5.105h1.746v1.744zm2.604 2.62h-1.746V7.723h1.746v1.746zm-1.746-2.62V5.105h1.746v1.744h-1.746z"/></svg>');--icon-x-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M12.78 4.28a.75.75 0 00-1.06-1.06L8 6.94 4.28 3.22a.75.75 0 00-1.06 1.06L6.94 8l-3.72 3.72a.75.75 0 101.06 1.06L8 9.06l3.72 3.72a.75.75 0 101.06-1.06L9.06 8l3.72-3.72z"/></svg>');--icon-x-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M18.78 6.28a.75.75 0 00-1.06-1.06L12 10.94 6.28 5.22a.75.75 0 00-1.06 1.06L10.94 12l-5.72 5.72a.75.75 0 101.06 1.06L12 13.06l5.72 5.72a.75.75 0 101.06-1.06L13.06 12l5.72-5.72z"/></svg>');--icon-x-circle-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.28 4.72a.75.75 0 010 1.06L9.06 8l2.22 2.22a.75.75 0 11-1.06 1.06L8 9.06l-2.22 2.22a.75.75 0 01-1.06-1.06L6.94 8 4.72 5.78a.75.75 0 011.06-1.06L8 6.94l2.22-2.22a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M.25 8a7.75 7.75 0 1115.5 0A7.75 7.75 0 01.25 8zM8 1.75a6.25 6.25 0 100 12.5 6.25 6.25 0 000-12.5z" clip-rule="evenodd"/></g></svg>');--icon-x-circle-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M16.78 7.22a.75.75 0 010 1.06L13.06 12l3.72 3.72a.75.75 0 11-1.06 1.06L12 13.06l-3.72 3.72a.75.75 0 01-1.06-1.06L10.94 12 7.22 8.28a.75.75 0 011.06-1.06L12 10.94l3.72-3.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M1.25 12C1.25 6.063 6.063 1.25 12 1.25S22.75 6.063 22.75 12 17.937 22.75 12 22.75 1.25 17.937 1.25 12zM12 2.75a9.25 9.25 0 100 18.5 9.25 9.25 0 000-18.5z" clip-rule="evenodd"/></g></svg>');--icon-cloud-cross-16:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 23 20" xmlns="http://www.w3.org/2000/svg"><path d="M12 13.586l3-3L16.414 12l-3 3 3 3L15 19.414l-3-3-3 3L7.586 18l3-3-2.75-2.75 1.414-1.414 2.75 2.75zM13.905.856c2.706.498 4.595 2.544 4.816 5.64l.234.066c2.46.754 3.884 2.79 3.5 5.036-.445 2.592-2.083 4.371-5.876 4.371v-2c5.054 0 4.868-5.46.23-6.152.242-2.277-1.278-4.628-3.267-4.995-1.789-.33-3.757.564-4.572 2.164-1.629-.727-2.605-.345-3.442.362-.836.706-.527 2.194-.225 2.823-1.089.915-1.901 2.013-2.152 2.987-.101.395-.091 1.014 0 1.212.428.928 1.016 1.6 4.403 1.6v2c-4.117 0-5.672-.96-6.448-2.874-.652-1.61.137-3.457 1.882-5.118-.544-1.734.01-3.297 1.391-4.267a4.89 4.89 0 013.689-.77C9.222 1.26 11.603.431 13.905.855z" fill="%236F7682" fill-rule="nonzero"/></svg>');--icon-loading-motion-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" class="hds-flight-icon--animation-loading"><style>@keyframes hds-flight-icon-animation-rotation {to {transform: rotate(360deg);}}.hds-flight-icon--animation-loading {animation: hds-flight-icon-animation-rotation .7s linear infinite;}.hds-flight-icon--animation-running {animation: hds-flight-icon-animation-rotation .7s linear infinite;}</style><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8z" opacity=".2"/><path d="M7.25.75A.75.75 0 018 0a8 8 0 018 8 .75.75 0 01-1.5 0A6.5 6.5 0 008 1.5a.75.75 0 01-.75-.75z"/></g></svg>');--icon-auth0-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M12.549 1h-4.55l1.407 4.38h4.548l-3.68 2.61 1.406 4.405c2.37-1.725 3.143-4.336 2.274-7.016L12.55 1zM2.045 5.38h4.55L8 1H3.45L2.045 5.38c-.868 2.68-.094 5.29 2.275 7.015L5.725 7.99l-3.68-2.612zm2.275 7.015L8 15l3.68-2.605L8 9.745l-3.68 2.65z"/></svg>');--icon-auth0-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M17.848 3H12l1.807 5.63h5.849l-4.732 3.358 1.807 5.663c3.046-2.218 4.042-5.575 2.925-9.02L17.848 3zM4.344 8.63h5.848L12 3H6.15L4.344 8.63c-1.117 3.446-.122 6.802 2.924 9.02l1.808-5.662-4.732-3.357zm2.924 9.02L12 21l4.731-3.35L12 14.244 7.268 17.65z"/></svg>');--icon-consul-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23E03875"><path d="M8.006 15A7 7 0 1112.74 2.85l-1.66 1.738a4.6 4.6 0 100 6.828l1.66 1.737A6.98 6.98 0 018.006 15zM13.638 11.499a.573.573 0 110-1.147.573.573 0 010 1.147z"/><path d="M7.96 9.517a1.517 1.517 0 11-.012-3.034 1.517 1.517 0 01.013 3.034zM14.296 9.544a.574.574 0 110-1.148.574.574 0 010 1.148zM12.59 9.472a.574.574 0 110-1.148.574.574 0 010 1.148zM14.296 7.61a.574.574 0 110-1.147.574.574 0 010 1.147zM12.59 7.675a.574.574 0 110-1.148.574.574 0 010 1.148zM13.672 5.68a.574.574 0 11-.003-1.147.574.574 0 01.003 1.148z"/></g></svg>');--icon-consul-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23E03875"><path d="M12.009 23a11 11 0 117.442-19.092l-2.61 2.73a7.229 7.229 0 100 10.73l2.61 2.73A10.97 10.97 0 0112.009 23zM20.86 17.498a.901.901 0 110-1.802.901.901 0 010 1.802z"/><path d="M11.939 14.383a2.383 2.383 0 11-.02-4.766 2.383 2.383 0 01.02 4.766zM21.895 14.426a.902.902 0 110-1.805.902.902 0 010 1.805zM19.214 14.313a.902.902 0 110-1.804.902.902 0 010 1.804zM21.895 11.387a.901.901 0 110-1.802.901.901 0 010 1.802zM19.214 11.49a.901.901 0 110-1.803.901.901 0 010 1.803zM20.913 8.355a.901.901 0 11-.004-1.803.901.901 0 01.004 1.803z"/></g></svg>');--icon-logo-ember-circle-color-16:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M64 0c35.346 0 64 28.654 64 64 0 35.346-28.654 64-64 64-35.346 0-64-28.654-64-64C0 28.654 28.654 0 64 0z" fill="%23E05C43" fill-rule="nonzero"/><path d="M65.265 24.128c8.246-.163 14.073 2.073 19.087 9.19 10.934 27.109-28.147 41.1-29.714 41.65l-.049.016s-1.18 7.363 10.028 7.08c13.793 0 28.294-10.691 33.81-15.21a3.293 3.293 0 0 1 4.468.265l4.13 4.29a3.291 3.291 0 0 1 .085 4.491c-3.59 3.997-12.014 12.203-24.696 17.504 0 0-21.16 9.798-35.42.52-8.503-5.53-10.842-12.151-11.793-19.038.005 0-10.324-.524-16.957-3.114-6.635-2.592.049-10.411.049-10.411s2.04-3.233 5.92 0c3.883 3.228 11.13 1.772 11.13 1.772.646-5.099 1.72-11.828 4.884-18.93 6.632-14.885 16.789-19.915 25.038-20.075zm4.853 14.915c-4.369-4.21-16.984 4.202-17.471 23.45 0 0 3.724 1.134 11.97-4.53 8.25-5.661 9.87-14.718 5.501-18.92z" fill="%23FFF"/></g></svg>');--icon-logo-glimmer-color-16:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M256 128c0 70.692-57.308 128-128 128C57.307 256 0 198.692 0 128 0 57.308 57.307 0 128 0c70.692 0 128 57.308 128 128" fill="%23F8835A"/><path d="M78.63 140.37a11.39 11.39 0 0 1-7.951-3.222c-4.533-4.392-4.648-11.627-.256-16.16l77.144-79.619c4.39-4.533 11.626-4.648 16.16-.256 4.532 4.392 4.647 11.628.255 16.161l-77.143 79.62a11.397 11.397 0 0 1-8.21 3.475zm50.31 3.036a11.356 11.356 0 0 1-7.926-3.21c-4.52-4.38-4.633-11.592-.254-16.111L181.687 61.2c4.379-4.52 11.59-4.632 16.11-.254s4.634 11.59.256 16.11l-60.928 62.884a11.363 11.363 0 0 1-8.184 3.465zm-24.69 79.286a11.383 11.383 0 0 1-7.951-3.221c-4.533-4.391-4.648-11.627-.256-16.16L202.61 93.322c4.39-4.532 11.627-4.647 16.16-.255 4.534 4.392 4.648 11.627.255 16.161L112.459 219.216a11.397 11.397 0 0 1-8.21 3.476zm-33.44-19.44c-2.865 0-5.73-1.07-7.95-3.222-4.534-4.392-4.649-11.628-.257-16.16l29.053-29.986c4.393-4.533 11.628-4.648 16.161-.256 4.533 4.393 4.647 11.628.255 16.161L79.02 199.775a11.397 11.397 0 0 1-8.209 3.476zm-23.179-86.764a11.39 11.39 0 0 1-7.952-3.221c-4.533-4.392-4.647-11.627-.255-16.16L68.477 67.12c4.393-4.533 11.628-4.647 16.161-.255 4.533 4.392 4.647 11.627.255 16.16L55.84 113.013a11.398 11.398 0 0 1-8.209 3.476zm149.433 65.295a11.39 11.39 0 0 1-7.95-3.221c-4.534-4.392-4.649-11.627-.257-16.16l13.754-14.195c4.391-4.532 11.627-4.65 16.16-.255 4.533 4.392 4.647 11.627.255 16.16l-13.753 14.195a11.397 11.397 0 0 1-8.209 3.476zm-26.78 28.338c0 6.312-5.117 11.428-11.43 11.428-6.31 0-11.428-5.116-11.428-11.428 0-6.312 5.118-11.429 11.429-11.429 6.312 0 11.429 5.117 11.429 11.43zM61.06 158.925c0 6.312-5.117 11.43-11.43 11.43-6.311 0-11.427-5.118-11.427-11.43 0-6.312 5.116-11.428 11.428-11.428 6.312 0 11.429 5.116 11.429 11.428zm54.284-112.142c0 6.312-5.117 11.428-11.428 11.428-6.312 0-11.429-5.116-11.429-11.428 0-6.312 5.117-11.43 11.429-11.43 6.311 0 11.428 5.118 11.428 11.43z" fill="%23FFF"/></svg>');--icon-logo-jwt-color-16:url('data:image/svg+xml;charset=UTF-8,<svg width="12" height="13" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M6.863 3.805V.667h-1.75v3.138l.875 1.202.875-1.202zM5.113 9.195v3.138h1.75V9.195l-.875-1.202-.875 1.202z" fill="%23fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6.863 9.195l1.844 2.543L10.13 10.7 8.275 8.168l-1.412-.466v1.493zM5.113 3.805L3.27 1.262 1.847 2.3l1.855 2.532 1.411.466V3.805z" fill="%2300F2E6"/><path fill-rule="evenodd" clip-rule="evenodd" d="M3.702 4.832L.715 3.863.167 5.532l2.986.968 1.424-.455-.875-1.213zM7.4 6.955l.875 1.213 2.987.969.548-1.669L8.823 6.5 7.4 6.955z" fill="%2300B9F1"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.823 6.5l2.987-.968-.548-1.669-2.987.969L7.4 6.045l1.423.455zM3.153 6.5l-2.986.968.548 1.669 2.987-.969.875-1.213L3.153 6.5z" fill="%23D63AFF"/><path fill-rule="evenodd" clip-rule="evenodd" d="M3.702 8.168L1.847 10.7l1.423 1.038 1.843-2.543V7.702l-1.411.466zM8.275 4.832L10.13 2.3 8.707 1.262 6.863 3.805v1.493l1.412-.466z" fill="%23FB015B"/></svg>');--icon-microsoft-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23F35325" d="M1 1h6.5v6.5H1V1z"/><path fill="%2381BC06" d="M8.5 1H15v6.5H8.5V1z"/><path fill="%2305A6F0" d="M1 8.5h6.5V15H1V8.5z"/><path fill="%23FFBA08" d="M8.5 8.5H15V15H8.5V8.5z"/></svg>');--icon-microsoft-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23F35325" d="M3 3h8.5v8.5H3V3z"/><path fill="%2381BC06" d="M12.5 3H21v8.5h-8.5V3z"/><path fill="%2305A6F0" d="M3 12.5h8.5V21H3v-8.5z"/><path fill="%23FFBA08" d="M12.5 12.5H21V21h-8.5v-8.5z"/></svg>');--icon-nomad-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%2306D092" d="M8 0L1 4v8l7 4 7-4V4L8 0zm3.119 8.797L9.254 9.863 7.001 8.65v2.549l-2.118 1.33v-5.33l1.68-1.018 2.332 1.216V4.794l2.23-1.322-.006 5.325z"/></svg>');--icon-nomad-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%2306D092" d="M12 .5L2 6.25v11.5l10 5.75 10-5.75V6.25L12 .5zm4.456 12.646l-2.664 1.533-3.22-1.745v3.664l-3.026 1.911v-7.661l2.401-1.463 3.331 1.748v-3.74l3.185-1.902-.008 7.655z"/></svg>');--icon-logo-oidc-color-16:url('data:image/svg+xml;charset=UTF-8,<svg viewbox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M12.833 8.375l-.291-2.625-.846.554c-.788-.496-1.78-.846-2.888-1.02 0 0-.554-.117-1.283-.117-.73 0-1.4.087-1.4.087-2.83.35-4.958 1.954-4.958 3.88 0 1.983 2.187 3.616 5.541 3.908v-1.138c-2.304-.32-3.762-1.4-3.762-2.77 0-1.284 1.341-2.363 3.179-2.713 0 0 1.43-.321 2.683.058.613.146 1.167.35 1.634.642l-1.109.67 3.5.584z" fill="%239E9E9E"/><path d="M6.708 2.833v10.209l1.75-.875V1.958l-1.75.875z" fill="%23000"/><path d="M6.708 2.833v10.209l1.75-.875V1.958l-1.75.875z" fill="%23FF9800"/></svg>');--icon-okta-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23007DC1" d="M8 1C4.143 1 1 4.12 1 8s3.121 7 7 7 7-3.121 7-7-3.143-7-7-7zm0 10.5c-1.94 0-3.5-1.56-3.5-3.5S6.06 4.5 8 4.5s3.5 1.56 3.5 3.5-1.56 3.5-3.5 3.5z"/></svg>');--icon-okta-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23007DC1" d="M12 2C6.49 2 2 6.458 2 12s4.459 10 10 10 10-4.459 10-10S17.51 2 12 2zm0 15c-2.77 0-5-2.23-5-5s2.23-5 5-5 5 2.23 5 5-2.23 5-5 5z"/></svg>');--icon-terraform-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%237B42BC" fill-rule="evenodd" clip-rule="evenodd"><path d="M5.825 2.82l4.35 2.524v5.052L5.825 7.87V2.82zM10.651 5.344v5.052L15 7.87V2.82l-4.349 2.524zM1 0v5.05l4.349 2.527V2.526L1 0zM5.825 13.474L10.174 16v-5.051L5.825 8.423v5.051z"/></g></svg>');--icon-terraform-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%237B42BC" fill-rule="evenodd" clip-rule="evenodd"><path d="M8.893 4.618l6.214 3.597v7.2l-6.214-3.6V4.618zM15.788 8.215v7.2l6.212-3.6V4.618l-6.212 3.597zM2 .6v7.197l6.212 3.6V4.2L2 .6zM8.893 19.8l6.212 3.6v-7.197l-6.212-3.6V19.8z"/></g></svg>');--icon-mesh-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M15.681 10.243A8.001 8.001 0 0016 8a7.97 7.97 0 00-2.047-5.345A1.752 1.752 0 0012.25.5h-.007c-.321 0-.623.087-.882.238A7.97 7.97 0 008 0a7.963 7.963 0 00-4.321 1.266A1.742 1.742 0 002.75 1h-.007a1.75 1.75 0 00-1.48 2.684A7.963 7.963 0 000 8a7.985 7.985 0 002.994 6.24 1.75 1.75 0 001.75 1.71h.006c.353 0 .681-.104.956-.284A8.004 8.004 0 008 16a7.985 7.985 0 006.245-3h.005a1.75 1.75 0 001.431-2.757zM2.573 4.492a1.758 1.758 0 01-.043-.005A6.47 6.47 0 001.5 8c0 1.918.83 3.642 2.152 4.832.112-.09.234-.165.366-.225-.029-3.003-.435-5.146-1.445-8.115zM6.5 14.2c0 .042-.001.084-.004.125.482.114.986.175 1.504.175a6.484 6.484 0 004.858-2.181 1.742 1.742 0 01-.242-1.713 32.908 32.908 0 00-2.306-2.179c-.067.116-.136.232-.205.347-.942 1.56-2.101 3.078-3.71 4.829.068.186.105.387.105.597zm7.826-4.698a1.776 1.776 0 00-.076-.002h-.007a1.75 1.75 0 00-.53.082 33.906 33.906 0 00-2.675-2.503c.484-.967.918-1.976 1.352-3.085a1.74 1.74 0 00.601-.158 6.518 6.518 0 011.335 5.666zM8 1.5c.89 0 1.738.179 2.51.503a1.755 1.755 0 00.476 1.464c-.379.964-.75 1.836-1.152 2.662C8.338 5.013 6.66 3.984 4.499 2.823a1.784 1.784 0 00-.013-.292A6.47 6.47 0 018 1.5zM4.094 4.309c.957 2.878 1.371 5.082 1.42 8.034 1.44-1.591 2.471-2.96 3.306-4.344.105-.174.208-.348.307-.524-1.41-1.072-2.989-2.056-5.033-3.166z" clip-rule="evenodd"/></svg>');--icon-mesh-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M22.56 15.09c.286-.98.44-2.017.44-3.09 0-3.075-1.262-5.855-3.296-7.851A1.75 1.75 0 0018 2h-.01c-.328 0-.635.09-.897.247A10.953 10.953 0 0012 1c-2.448 0-4.709.8-6.536 2.152A1.744 1.744 0 004.75 3h-.01a1.75 1.75 0 00-1.595 2.472A10.95 10.95 0 001 12a10.99 10.99 0 004.99 9.215v.035c0 .966.784 1.75 1.75 1.75h.01c.445 0 .851-.166 1.16-.44.98.286 2.017.44 3.09.44a10.99 10.99 0 009.221-5H21.25a1.75 1.75 0 001.31-2.91zM4.603 6.495a1.745 1.745 0 01-.309-.052A9.457 9.457 0 002.5 12a9.49 9.49 0 004.17 7.865c.106-.082.222-.152.345-.208-.012-4.964-.626-8.255-2.412-13.162zm4.74 14.03c.09.198.144.414.155.642A9.513 9.513 0 0012 21.5a9.49 9.49 0 007.864-4.169 1.743 1.743 0 01-.262-1.697c-1.477-1.49-2.83-2.747-4.193-3.859-1.514 2.857-3.359 5.497-6.065 8.75zm11.824-6.023c-.17.006-.333.037-.487.09-1.61-1.626-3.083-2.986-4.578-4.186.729-1.509 1.393-3.11 2.064-4.914.212-.02.412-.077.595-.166A9.47 9.47 0 0121.5 12a9.51 9.51 0 01-.333 2.502zM12 2.5a9.46 9.46 0 014.257 1.005 1.745 1.745 0 00.496 1.483 55.99 55.99 0 01-1.866 4.483c-2.418-1.785-5-3.234-8.388-4.768a1.75 1.75 0 00-.059-.407A9.457 9.457 0 0112 2.5zM6.077 6.159c1.737 4.813 2.384 8.186 2.435 13.02 2.538-3.084 4.267-5.6 5.697-8.343-2.352-1.763-4.843-3.177-8.132-4.677z" clip-rule="evenodd"/></svg>');--icon-port-16:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M8.35 3.00001C8.35 2.08874 9.08873 1.35001 10 1.35001H14C14.9113 1.35001 15.65 2.08874 15.65 3.00001V7.00001C15.65 7.91128 14.9113 8.65001 14 8.65001H12.5834C12.5836 8.66071 12.5836 8.67147 12.5833 8.68229L12.5329 10.7L21.35 10.7C21.709 10.7 22 10.991 22 11.35C22 11.709 21.709 12 21.35 12H17.5826C17.594 12.0482 17.6 12.0984 17.6 12.15V14.35H19C19.9113 14.35 20.65 15.0887 20.65 16V20C20.65 20.9113 19.9113 21.65 19 21.65H15C14.0887 21.65 13.35 20.9113 13.35 20V16C13.35 15.0887 14.0887 14.35 15 14.35H16.3V12.15C16.3 12.0984 16.306 12.0482 16.3174 12H12.012C11.96 12.012 11.9056 12.0176 11.8498 12.0162C11.8053 12.0151 11.762 12.0096 11.7202 12H7.58261C7.59398 12.0482 7.6 12.0984 7.6 12.15V14.35H9C9.91127 14.35 10.65 15.0887 10.65 16V20C10.65 20.9113 9.91127 21.65 9 21.65H5C4.08873 21.65 3.35 20.9113 3.35 20V16C3.35 15.0887 4.08873 14.35 5 14.35H6.3V12.15C6.3 12.0984 6.30602 12.0482 6.31739 12H2.65C2.29102 12 2 11.709 2 11.35C2 10.991 2.29101 10.7 2.65 10.7L11.2325 10.7L11.2838 8.65001H10C9.08873 8.65001 8.35 7.91128 8.35 7.00001V3.00001ZM10 2.65001C9.8067 2.65001 9.65 2.80671 9.65 3.00001V7.00001C9.65 7.19331 9.8067 7.35001 10 7.35001H14C14.1933 7.35001 14.35 7.19331 14.35 7.00001V3.00001C14.35 2.80671 14.1933 2.65001 14 2.65001H10ZM5 15.65C4.8067 15.65 4.65 15.8067 4.65 16V20C4.65 20.1933 4.8067 20.35 5 20.35H9C9.1933 20.35 9.35 20.1933 9.35 20V16C9.35 15.8067 9.1933 15.65 9 15.65H5ZM14.65 16C14.65 15.8067 14.8067 15.65 15 15.65H19C19.1933 15.65 19.35 15.8067 19.35 16V20C19.35 20.1933 19.1933 20.35 19 20.35H15C14.8067 20.35 14.65 20.1933 14.65 20V16Z" fill="%236F7682"/></svg>');--icon-protocol-16:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12ZM11.8104 19.9978C11.9269 19.8258 12.0639 19.6117 12.212 19.3572C12.5111 18.8431 12.8544 18.1657 13.1663 17.3382C12.9879 17.3233 12.8084 17.3101 12.6278 17.2987C11.9536 17.2562 11.2715 17.2398 10.5929 17.2563C10.8669 18.1335 11.2168 19.0463 11.6554 19.9927C11.7069 19.9949 11.7586 19.9966 11.8104 19.9978ZM9.897 19.7207C9.55842 18.9089 9.28019 18.1195 9.05511 17.354C8.53381 17.4089 8.01993 17.4871 7.51892 17.5915C7.73118 18.0727 7.97418 18.5653 8.25086 19.0689C8.7684 19.344 9.31972 19.5638 9.897 19.7207ZM5.45938 16.6077C5.48104 16.6001 5.50273 16.5925 5.52445 16.585C4.46623 13.3833 4.62347 10.6454 5.21707 8.50224C5.09245 8.46738 4.97167 8.43251 4.85496 8.39777C4.30807 9.4804 4 10.7042 4 12C4 13.7156 4.54003 15.3051 5.45938 16.6077ZM5.69311 7.07772C5.69614 7.07856 5.69918 7.07939 5.70221 7.08023C5.70623 7.07039 5.71025 7.06056 5.71427 7.05076C5.7072 7.05973 5.70015 7.06872 5.69311 7.07772ZM8.96894 4.59417C8.93129 4.63447 8.8765 4.69478 8.80813 4.77455C8.66145 4.94568 8.45292 5.20563 8.21744 5.5491C7.8904 6.02611 7.51351 6.66107 7.17773 7.44022C7.68086 7.54828 8.21954 7.64986 8.78391 7.73875L8.79848 7.68326C9.18148 6.23496 9.70589 5.06597 10.1744 4.20925C9.75921 4.30615 9.35646 4.43539 8.96894 4.59417ZM12.0548 4.00018C11.938 4.17254 11.8005 4.38729 11.6519 4.64277C11.2113 5.40008 10.6747 6.5116 10.2841 7.93527C10.6414 7.97247 11.0048 8.00331 11.3722 8.02649C12.1215 8.07374 12.8805 8.08863 13.6336 8.06207C13.3315 6.79045 12.8705 5.435 12.2062 4.00261C12.1559 4.00133 12.1054 4.00052 12.0548 4.00018ZM15.0311 19.4058C14.5954 19.5843 14.1406 19.7255 13.6705 19.8253C14.0078 19.2125 14.3757 18.4365 14.6998 17.5098C15.227 17.5833 15.7354 17.6688 16.2175 17.7617C16.0682 18.019 15.9209 18.2491 15.7826 18.4509C15.5471 18.7944 15.3386 19.0543 15.1919 19.2255C15.1235 19.3052 15.0687 19.3655 15.0311 19.4058ZM18.4508 16.7325C19.4247 15.4072 20 13.7708 20 12C20 10.7332 19.7056 9.53525 19.1814 8.47072C19.0626 8.52056 18.9428 8.56843 18.8221 8.61438C19.5339 11.495 19.2703 13.9558 18.6676 15.8898C18.5781 16.1768 18.4814 16.4516 18.3797 16.7138C18.4035 16.72 18.4272 16.7262 18.4508 16.7325ZM15.7491 4.93109C16.2637 5.8677 16.6617 6.76614 16.9623 7.6241C16.3749 7.76946 15.7668 7.87585 15.147 7.94868C14.8822 6.77294 14.493 5.53469 13.9502 4.23938C14.5831 4.39792 15.1861 4.63186 15.7491 4.93109ZM6.67301 8.86539C7.23389 8.98964 7.83778 9.10647 8.47251 9.20809C8.16114 11.101 8.13055 13.3457 8.68042 15.8864C8.10403 15.9541 7.53135 16.0491 6.96921 16.176C5.97706 13.2159 6.14482 10.7469 6.67301 8.86539ZM9.9596 9.4091C9.66322 11.1785 9.63171 13.3152 10.1908 15.7687C11.047 15.7336 11.8982 15.7497 12.7222 15.8017C13.0281 15.8209 13.3313 15.8453 13.6308 15.8739C14.0706 14.1822 14.3018 12.0541 13.9234 9.55152C13.0288 9.59288 12.1384 9.57779 11.2778 9.52351C10.8317 9.49538 10.3912 9.45656 9.9596 9.4091ZM16.9025 16.3689C16.3454 16.2539 15.7517 16.1474 15.1319 16.0564C15.5821 14.232 15.7965 12.0001 15.4213 9.42649C16.0858 9.3447 16.7447 9.22621 17.3877 9.06387C18.0053 11.6354 17.7519 13.7864 17.2355 15.4435C17.1337 15.7703 17.0212 16.0789 16.9025 16.3689Z" fill="%236F7682"/></svg>');--icon-redirect-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 3.517a1 1 0 011.62-.784l5.348 4.233a1 1 0 010 1.568l-5.347 4.233A1 1 0 018 11.983v-1.545c-.76-.043-1.484.003-2.254.218-.994.279-2.118.857-3.506 1.99a.993.993 0 01-1.129.096.962.962 0 01-.445-1.099c.415-1.5 1.425-3.141 2.808-4.412C4.69 6.114 6.244 5.241 8 5.042V3.517zm1.5 1.034v1.2a.75.75 0 01-.75.75c-1.586 0-3.066.738-4.261 1.835a8.996 8.996 0 00-1.635 2.014c.878-.552 1.695-.916 2.488-1.138 1.247-.35 2.377-.33 3.49-.207a.75.75 0 01.668.745v1.2l4.042-3.2L9.5 4.55z" clip-rule="evenodd"/></svg>');--icon-redirect-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 5.786c0-1.046 1.209-1.63 2.028-.978l7.45 5.922c.627.498.63 1.45.005 1.952l-7.45 5.997c-.817.659-2.033.077-2.033-.973v-2.754a7.316 7.316 0 00-2.824.427c-1.306.456-2.918 1.342-5.295 2.981-.436.3-.973.287-1.37.029a1.168 1.168 0 01-.479-1.326c.59-2 1.91-4.124 3.743-5.755C7.444 9.824 9.571 8.72 12 8.529V5.786zm1.5.518V9.25a.75.75 0 01-.75.75c-2.296 0-4.35.98-5.978 2.428-1.36 1.21-2.393 2.723-2.994 4.189 2.03-1.357 3.565-2.187 4.903-2.654 1.53-.535 2.769-.584 4.137-.46a.75.75 0 01.682.747v2.933l6.8-5.473-6.8-5.406z" clip-rule="evenodd"/></svg>');--icon-search-color-16:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M15.5 14h-.79l-.28-.27A6.471 6.471 0 0 0 16 9.5 6.5 6.5 0 1 0 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" fill="%231563ff"/></svg>');--icon-sort-desc-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M2.25 3.75A.75.75 0 013 3h10a.75.75 0 010 1.5H3a.75.75 0 01-.75-.75zM3 6a.75.75 0 000 1.5h6A.75.75 0 009 6H3zM11.963 13.943a.747.747 0 00.817-.163l3-3a.75.75 0 10-1.06-1.06L13 11.44V6.75a.75.75 0 00-1.5 0v4.69L9.78 9.72a.75.75 0 00-1.06 1.06l3 3a.748.748 0 00.243.163zM3 9a.75.75 0 000 1.5h3A.75.75 0 006 9H3zM2.25 12.75A.75.75 0 013 12h3a.75.75 0 010 1.5H3a.75.75 0 01-.75-.75z"/></g></svg>');--icon-sort-desc-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3 5.75A.75.75 0 013.75 5h16.5a.75.75 0 010 1.5H3.75A.75.75 0 013 5.75zM3.75 9a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5zM16.963 20.443a.747.747 0 00.817-.163l4-4a.75.75 0 10-1.06-1.06L18 17.94V9.75a.75.75 0 00-1.5 0v8.19l-2.72-2.72a.75.75 0 10-1.06 1.06l4 4a.748.748 0 00.243.163zM3.75 13a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5zM3 17.75a.75.75 0 01.75-.75h3.5a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75z"/></g></svg>');--icon-union-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M0 0V9V10H1H9V9H1L1 0H0Z" fill="%23000"/></svg>');--chrome-width:300px;--chrome-height:64px;--tone-brand-050:var(--tone-magenta-050);--tone-brand-100:var(--tone-strawberry-100);--tone-brand-600:224 56 117;--tone-brand-800:var(--tone-magenta-800);--typo-action-500:rgb(var(--tone-blue-500));--decor-error-500:rgb(var(--tone-red-500));--typo-contrast-999:rgb(var(--tone-gray-999));--typo-brand-050:rgb(var(--tone-brand-050));--typo-brand-600:rgb(var(--tone-brand-600));--decor-brand-600:rgb(var(--tone-brand-600));--swatch-brand-600:rgb(var(--tone-brand-600));--swatch-brand-800:rgb(var(--tone-brand-800));--syntax-light-grey:#dde3e7;--syntax-light-gray:#a4a4a4;--syntax-light-grey-blue:#6c7b81;--syntax-dark-grey:#788290;--syntax-faded-gray:#eaeaea;--syntax-atlas:#127eff;--syntax-vagrant:#2f88f7;--syntax-consul:#69499a;--syntax-terraform:#822ff7;--syntax-serf:#dd4e58;--syntax-packer:#1ddba3;--syntax-gray:lighten(#000, 89%);--syntax-red:#ff3d3d;--syntax-green:#39b54a;--syntax-dark-gray:#535f73;--syntax-gutter-grey:#2a2f36;--syntax-yellow:rgb(var(--tone-yellow-500));--horizontal-kv-list-separator-width:18px;--horizontal-kv-list-key-separator:":";--horizontal-kv-list-key-wrapper-start:"(";--horizontal-kv-list-key-wrapper-end:")";--csv-list-separator:",";--icon-loading:icon-loading-motion}.consul-bucket-list .service,.consul-bucket-list:not([class]) dt:not([class]),.consul-exposed-path-list>ul>li>.detail dl:not([class]) dt:not([class]),.consul-instance-checks:not([class]) dt:not([class]),.consul-lock-session-list dl:not([class]) dt:not([class]),.consul-server-card dt:not(.name),.consul-upstream-instance-list dl.local-bind-address dt,.consul-upstream-instance-list dl.local-bind-socket-path dt,.consul-upstream-instance-list dl:not([class]) dt:not([class]),.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dt:not([class]),.route-title,.tag-list:not([class]) dt:not([class]),section[data-route="dc.show.license"] .validity dl .expired+dd,section[data-route="dc.show.license"] .validity dl:not([class]) dt:not([class]),section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dt:not([class]),td.tags:not([class]) dt:not([class]){position:absolute;overflow:hidden;clip:rect(0 0 0 0);width:1px;height:1px;margin:-1px;padding:0;border:0}.consul-upstream-instance-list dl.local-bind-socket-mode dt,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dt{position:static!important;clip:unset!important;overflow:visible!important;width:auto!important;height:auto!important;margin:0!important;padding:0!important}.animatable.tab-nav ul::after,.app-view>div form button[type=button].type-delete,.app-view>div form button[type=button].type-delete:hover:not(:disabled):not(:active),.consul-auth-method-type,.consul-external-source,.consul-intention-action-warn-modal button.dangerous,.consul-intention-action-warn-modal button.dangerous:disabled,.consul-intention-action-warn-modal button.dangerous:focus,.consul-intention-action-warn-modal button.dangerous:hover:active,.consul-intention-action-warn-modal button.dangerous:hover:not(:disabled):not(:active),.consul-intention-list td.intent- strong,.consul-intention-permission-form button.type-submit,.consul-intention-permission-form button.type-submit:disabled,.consul-intention-permission-form button.type-submit:focus:not(:disabled),.consul-intention-permission-form button.type-submit:hover:not(:disabled),.consul-intention-search-bar .value- span,.consul-kind,.consul-source,.consul-transparent-proxy,.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:first-child,.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:focus:first-child,.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:hover:first-child,.discovery-chain .route-card>header ul li,.empty-state div>button,.empty-state div>button:disabled,.empty-state div>button:focus,.empty-state div>button:hover:active,.empty-state div>button:hover:not(:disabled):not(:active),.informed-action>ul>.dangerous>*,.informed-action>ul>.dangerous>:focus,.informed-action>ul>.dangerous>:hover,.leader,.menu-panel>ul>li.dangerous>:first-child,.menu-panel>ul>li.dangerous>:focus:first-child,.menu-panel>ul>li.dangerous>:hover:first-child,.modal-dialog .type-delete,.modal-dialog .type-delete:hover:active,.modal-dialog .type-delete:hover:not(:disabled):not(:active),.modal-dialog [role=document]>footer,.modal-dialog [role=document]>header,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:first-child,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,.oidc-select button:disabled:not(.reset),.oidc-select button:focus:not(.reset),.oidc-select button:hover:active:not(.reset),.oidc-select button:hover:not(:disabled):not(:active):not(.reset),.oidc-select button:not(.reset),.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:first-child,.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,.tab-nav .selected>*,.topology-metrics-source-type,.with-confirmation .type-delete,.with-confirmation .type-delete:hover:active,.with-confirmation .type-delete:hover:not(:disabled):not(:active),a.type-create,a.type-create:disabled,a.type-create:focus,a.type-create:hover:active,a.type-create:hover:not(:disabled):not(:active),button.type-cancel,button.type-cancel:active,button.type-cancel:focus,button.type-cancel:hover:not(:disabled):not(:active),button.type-submit,button.type-submit:disabled,button.type-submit:focus,button.type-submit:hover:active,button.type-submit:hover:not(:disabled):not(:active),button[type=reset],button[type=reset]:active,button[type=reset]:focus,button[type=reset]:hover:not(:disabled):not(:active),button[type=submit],button[type=submit]:disabled,button[type=submit]:focus,button[type=submit]:hover:active,button[type=submit]:hover:not(:disabled):not(:active),header .actions button[type=button]:hover:not(:disabled):not(:active):not(.copy-btn),header .actions button[type=button]:not(.copy-btn),html[data-route^="dc.acls.index"] main td strong,span.policy-node-identity,span.policy-service-identity,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:first-child,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child{border-style:solid}.animatable.tab-nav ul::after,.app .notifications .app-notification,.tab-nav li>*{transition-duration:.15s;transition-timing-function:ease-out}[role=banner] nav:first-of-type,[role=contentinfo],html body>.brand-loader,main{transition-timing-function:cubic-bezier(.1,.1,.25,.9);transition-duration:.1s}html[data-state]:not(.ember-loading) body>.brand-loader{animation-timing-function:cubic-bezier(.1,.1,.25,.9);animation-duration:.1s;animation-name:remove-from-flow;animation-fill-mode:forwards}@keyframes remove-from-flow{100%{visibility:hidden;overflow:hidden;clip:rect(0 0 0 0)}}@keyframes typo-truncate{100%{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}}.informed-action header>*{font-size:inherit;font-weight:inherit;line-height:inherit;font-style:inherit}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password],.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text],.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea,.modal-dialog [role=document] .type-password [type=password],.modal-dialog [role=document] .type-password [type=text],.modal-dialog [role=document] .type-password textarea,.modal-dialog [role=document] .type-select [type=password],.modal-dialog [role=document] .type-select [type=text],.modal-dialog [role=document] .type-select textarea,.modal-dialog [role=document] .type-text [type=password],.modal-dialog [role=document] .type-text [type=text],.modal-dialog [role=document] .type-text textarea,.modal-dialog [role=document] [role=radiogroup] label [type=password],.modal-dialog [role=document] [role=radiogroup] label [type=text],.modal-dialog [role=document] [role=radiogroup] label textarea,.oidc-select label [type=password],.oidc-select label [type=text],.oidc-select label textarea,.type-toggle [type=password],.type-toggle [type=text],.type-toggle textarea,body,main .type-password [type=password],main .type-password [type=text],main .type-password textarea,main .type-select [type=password],main .type-select [type=text],main .type-select textarea,main .type-text [type=password],main .type-text [type=text],main .type-text textarea{font-size:var(--typo-size-600);font-family:var(--typo-family-sans);line-height:var(--typo-lead-700)}.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.app-view>header .title>:first-child,.consul-auth-method-binding-list h2,.consul-auth-method-view section h2,.consul-health-check-list .health-check-output dt,.consul-health-check-list .health-check-output header>*,.consul-intention-list .notice.allow header>*,.consul-intention-list .notice.deny header>*,.consul-intention-list .notice.permissions header>*,.consul-intention-list td.destination,.consul-intention-list td.source,.consul-intention-permission-form h2,.consul-intention-view h2,.consul-server-card .name+dd,.definition-table dt,.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.empty-state header :first-child,.hashicorp-consul nav .dcs [aria-expanded],.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button,.informed-action header,.informed-action>ul>li>*,.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label>span,.modal-dialog [role=document] form h2,.modal-dialog [role=document] table caption,.modal-dialog [role=document] table td strong,.modal-dialog [role=document] table td:first-child,.modal-dialog [role=document] table th,.modal-dialog [role=document]>header>*,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.notice.error header>*,.notice.highlight header>*,.notice.info header>*,.notice.policy-management header>*,.notice.success header>*,.notice.warning header>*,.oidc-select label>span,.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.radio-card header,.tab-nav,.type-toggle label span,.type-toggle>span,[role=banner] nav:last-of-type [aria-expanded],[role=banner] nav:last-of-type>ul>li>.popover-menu>label>button,[role=banner] nav:last-of-type>ul>li>a,[role=banner] nav:last-of-type>ul>li>button,[role=banner] nav:last-of-type>ul>li>span,fieldset>header,html[data-route^="dc.kv.edit"] h2,html[data-route^="dc.services.instance.metadata"] .tab-section section h2,main .type-password>span,main .type-select>span,main .type-text>span,main form h2,main header nav:first-child ol li>*,main table caption,main table td strong,main table td:first-child,main table th,section[data-route="dc.show.license"] aside header>:first-child,section[data-route="dc.show.license"] h2,section[data-route="dc.show.serverstatus"] .redundancy-zones h3,section[data-route="dc.show.serverstatus"] h2,section[data-route="dc.show.serverstatus"] h3,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{line-height:var(--typo-lead-200)}.app-view>header .title>:first-child{font-weight:var(--typo-weight-bold);font-size:var(--typo-size-200)}.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.consul-auth-method-binding-list h2,.consul-auth-method-view section h2,.consul-health-check-list .health-check-output header>*,.consul-intention-list .notice.allow header>*,.consul-intention-list .notice.deny header>*,.consul-intention-list .notice.permissions header>*,.consul-intention-list td.destination,.consul-intention-list td.source,.consul-intention-permission-form h2,.consul-intention-view h2,.consul-server-card .name+dd,.definition-table dt,.empty-state header :first-child,.hashicorp-consul nav .dcs [aria-expanded],.informed-action header,.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label>span,.modal-dialog [role=document] form h2,.modal-dialog [role=document] table caption,.modal-dialog [role=document] table td:first-child,.modal-dialog [role=document]>header>*,.notice.error header>*,.notice.highlight header>*,.notice.info header>*,.notice.policy-management header>*,.notice.success header>*,.notice.warning header>*,.oidc-select label>span,.radio-card header,.type-toggle>span,[role=banner] nav:last-of-type [aria-expanded],[role=banner] nav:last-of-type>ul>li>.popover-menu>label>button,[role=banner] nav:last-of-type>ul>li>a,[role=banner] nav:last-of-type>ul>li>button,[role=banner] nav:last-of-type>ul>li>span,fieldset>header,html[data-route^="dc.kv.edit"] h2,html[data-route^="dc.services.instance.metadata"] .tab-section section h2,main .type-password>span,main .type-select>span,main .type-text>span,main form h2,main table caption,main table td:first-child,section[data-route="dc.show.license"] aside header>:first-child,section[data-route="dc.show.license"] h2,section[data-route="dc.show.serverstatus"] .redundancy-zones h3,section[data-route="dc.show.serverstatus"] h2,section[data-route="dc.show.serverstatus"] h3{font-weight:var(--typo-weight-semibold)}.consul-health-check-list .health-check-output dt,.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button,.informed-action>ul>li>*,.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.modal-dialog [role=document] table td strong,.modal-dialog [role=document] table th,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.tab-nav,.type-toggle label span,main header nav:first-child ol li>*,main table td strong,main table th,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{font-weight:var(--typo-weight-medium)}.consul-auth-method-binding-list h2,.consul-auth-method-view section h2,.consul-intention-permission-form h2,.consul-intention-view h2,.empty-state header :first-child,.modal-dialog [role=document] form h2,.modal-dialog [role=document]>header>*,html[data-route^="dc.kv.edit"] h2,main form h2,section[data-route="dc.show.license"] h2,section[data-route="dc.show.serverstatus"] h2,section[data-route="dc.show.serverstatus"] h3{font-size:var(--typo-size-300)}.consul-health-check-list .health-check-output header>*,.consul-intention-list .notice.allow header>*,.consul-intention-list .notice.deny header>*,.consul-intention-list .notice.permissions header>*,.consul-server-card .name+dd,.notice.error header>*,.notice.highlight header>*,.notice.info header>*,.notice.policy-management header>*,.notice.success header>*,.notice.warning header>*,html[data-route^="dc.services.instance.metadata"] .tab-section section h2,section[data-route="dc.show.license"] aside header>:first-child,section[data-route="dc.show.serverstatus"] .redundancy-zones h3{font-size:var(--typo-size-500)}.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.consul-intention-list td.destination,.consul-intention-list td.source,.definition-table dt,.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.hashicorp-consul nav .dcs [aria-expanded],.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button,.informed-action header,.informed-action>ul>li>*,.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label>span,.modal-dialog [role=document] table caption,.modal-dialog [role=document] table td:first-child,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.oidc-select label>span,.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.radio-card header,.tab-nav,.type-toggle>span,[role=banner] nav:last-of-type [aria-expanded],[role=banner] nav:last-of-type>ul>li>.popover-menu>label>button,[role=banner] nav:last-of-type>ul>li>a,[role=banner] nav:last-of-type>ul>li>button,[role=banner] nav:last-of-type>ul>li>span,fieldset>header,main .type-password>span,main .type-select>span,main .type-text>span,main header nav:first-child ol li>*,main table caption,main table td:first-child,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{font-size:var(--typo-size-600)}.consul-health-check-list .health-check-output dt,.modal-dialog [role=document] table td strong,.modal-dialog [role=document] table th,.type-toggle label span,main table td strong,main table th{font-size:var(--typo-size-700)}.app-view h1 span.kind-proxy,.app-view>div form button[type=button].type-delete,.app-view>div form:not(.filter-bar) [role=radiogroup] label>em,.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.auth-form em,.auth-profile,.consul-auth-method-view section,.consul-external-source,.consul-health-check-list .health-check-output dl>dd,.consul-intention-action-warn-modal button.dangerous,.consul-intention-fieldsets .permissions>button,.consul-intention-list .notice.allow,.consul-intention-list .notice.allow footer *,.consul-intention-list .notice.allow p,.consul-intention-list .notice.deny,.consul-intention-list .notice.deny footer *,.consul-intention-list .notice.deny p,.consul-intention-list .notice.permissions,.consul-intention-list .notice.permissions footer *,.consul-intention-list .notice.permissions p,.consul-intention-permission-header-list>ul>li dd,.consul-intention-permission-list>ul>li dd,.consul-kind,.consul-source,.copy-button button,.disclosure-menu [aria-expanded]~* [role=separator],.disclosure-menu [aria-expanded]~*>div,.discovery-chain .resolvers>header>*,.discovery-chain .routes>header>*,.discovery-chain .splitters>header>*,.empty-state div>button,.empty-state header :nth-child(2),.empty-state p,.empty-state>ul>li>*,.empty-state>ul>li>label>button,.has-error>strong,.informed-action p,.menu-panel [role=separator],.menu-panel>div,.modal-dialog .type-delete,.modal-dialog [role=document] .type-password>em,.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>em,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text>em,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label>em,.modal-dialog [role=document] [role=radiogroup] label>span,.modal-dialog [role=document] form button+em,.modal-dialog [role=document] p,.modal-dialog [role=document] table td,.modal-dialog [role=document] table td p,.more-popover-menu>[type=checkbox]+label+div [role=separator],.more-popover-menu>[type=checkbox]+label+div>div,.notice.error,.notice.error footer *,.notice.error p,.notice.highlight,.notice.highlight footer *,.notice.highlight p,.notice.info,.notice.info footer *,.notice.info p,.notice.policy-management,.notice.policy-management footer *,.notice.policy-management p,.notice.success,.notice.success footer *,.notice.success p,.notice.warning,.notice.warning footer *,.notice.warning p,.oidc-select button.reset,.oidc-select button:not(.reset),.oidc-select label>em,.oidc-select label>span,.popover-menu>[type=checkbox]+label+div [role=separator],.popover-menu>[type=checkbox]+label+div>div,.popover-select label>*,.tippy-box[data-theme~=tooltip] .tippy-content,.topology-notices button,.type-dialog,.type-sort.popover-select label>*,.type-toggle>em,.type-toggle>span,.with-confirmation .type-delete,[role=banner] nav:first-of-type [role=separator],[role=banner] nav:first-of-type>ul>li>a,[role=banner] nav:first-of-type>ul>li>label,[role=contentinfo],a.type-create,button.type-cancel,button.type-submit,button[type=reset],button[type=submit],header .actions button[type=button]:not(.copy-btn),main .type-password>em,main .type-password>span,main .type-select>em,main .type-select>span,main .type-text>em,main .type-text>span,main form button+em,main p,main table td,main table td p,pre code,section[data-route="dc.show.serverstatus"] .server-failure-tolerance dt,span.label,table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator],table.has-actions tr>.actions>[type=checkbox]+label+div>div,table.with-details tr>.actions>[type=checkbox]+label+div [role=separator],table.with-details tr>.actions>[type=checkbox]+label+div>div{line-height:inherit;font-size:inherit}.consul-auth-method-view section,.consul-external-source,.consul-intention-list .notice.allow,.consul-intention-list .notice.allow p,.consul-intention-list .notice.deny,.consul-intention-list .notice.deny p,.consul-intention-list .notice.permissions,.consul-intention-list .notice.permissions p,.consul-kind,.consul-source,.notice.error,.notice.error p,.notice.highlight,.notice.highlight p,.notice.info,.notice.info p,.notice.policy-management,.notice.policy-management p,.notice.success,.notice.success p,.notice.warning,.notice.warning p,[role=banner] nav:first-of-type>ul>li>a,[role=banner] nav:first-of-type>ul>li>label,pre code{font-size:var(--typo-size-600)}.app-view h1 span.kind-proxy,.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.auth-profile,.consul-health-check-list .health-check-output dl>dd,.consul-intention-fieldsets .permissions>button,.consul-intention-permission-header-list>ul>li dd,.consul-intention-permission-list>ul>li dd,.disclosure-menu [aria-expanded]~*>div,.empty-state>ul>li>*,.empty-state>ul>li>label>button,.informed-action p,.menu-panel>div,.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label>span,.modal-dialog [role=document] table td,.modal-dialog [role=document] table td p,.more-popover-menu>[type=checkbox]+label+div>div,.oidc-select label>span,.popover-menu>[type=checkbox]+label+div>div,.type-dialog,.type-toggle>span,[role=contentinfo],main .type-password>span,main .type-select>span,main .type-text>span,main table td,main table td p,section[data-route="dc.show.serverstatus"] .server-failure-tolerance dt,span.label,table.has-actions tr>.actions>[type=checkbox]+label+div>div,table.with-details tr>.actions>[type=checkbox]+label+div>div{font-size:var(--typo-size-700)}.app-view>div form button[type=button].type-delete,.app-view>div form:not(.filter-bar) [role=radiogroup] label>em,.auth-form em,.consul-intention-action-warn-modal button.dangerous,.consul-intention-list .notice.allow footer *,.consul-intention-list .notice.deny footer *,.consul-intention-list .notice.permissions footer *,.copy-button button,.disclosure-menu [aria-expanded]~* [role=separator],.discovery-chain .resolvers>header>*,.discovery-chain .routes>header>*,.discovery-chain .splitters>header>*,.empty-state div>button,.empty-state header :nth-child(2),.empty-state p,.has-error>strong,.menu-panel [role=separator],.modal-dialog .type-delete,.modal-dialog [role=document] .type-password>em,.modal-dialog [role=document] .type-select>em,.modal-dialog [role=document] .type-text>em,.modal-dialog [role=document] [role=radiogroup] label>em,.modal-dialog [role=document] form button+em,.modal-dialog [role=document] p,.more-popover-menu>[type=checkbox]+label+div [role=separator],.notice.error footer *,.notice.highlight footer *,.notice.info footer *,.notice.policy-management footer *,.notice.success footer *,.notice.warning footer *,.oidc-select button.reset,.oidc-select button:not(.reset),.oidc-select label>em,.popover-menu>[type=checkbox]+label+div [role=separator],.popover-select label>*,.tippy-box[data-theme~=tooltip] .tippy-content,.topology-notices button,.type-sort.popover-select label>*,.type-toggle>em,.with-confirmation .type-delete,[role=banner] nav:first-of-type [role=separator],[role=contentinfo],a.type-create,button.type-cancel,button.type-submit,button[type=reset],button[type=submit],header .actions button[type=button]:not(.copy-btn),main .type-password>em,main .type-select>em,main .type-text>em,main form button+em,main p,table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator],table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]{font-size:var(--typo-size-800)}::after,::before{display:inline-block;vertical-align:text-top;background-repeat:no-repeat;background-position:center;mask-repeat:no-repeat;-webkit-mask-repeat:no-repeat;mask-position:center;-webkit-mask-position:center}::before{animation-name:var(--icon-name-start,var(--icon-name)),var(--icon-size-start,var(--icon-size,icon-000));background-color:var(--icon-color-start,var(--icon-color))}::after{animation-name:var(--icon-name-end,var(--icon-name)),var(--icon-size-end,var(--icon-size,icon-000));background-color:var(--icon-color-end,var(--icon-color))}[style*="--icon-color-start"]::before{color:var(--icon-color-start)}[style*="--icon-color-end"]::after{color:var(--icon-color-end)}[style*="--icon-name-start"]::before,[style*="--icon-name-end"]::after{content:""}@keyframes icon-000{100%{width:1.2em;height:1.2em}}@keyframes icon-100{100%{width:.625rem;height:.625rem}}@keyframes icon-200{100%{width:.75rem;height:.75rem}}@keyframes icon-300{100%{width:1rem;height:1rem}}@keyframes icon-400{100%{width:1.125rem;height:1.125rem}}@keyframes icon-500{100%{width:1.25rem;height:1.25rem}}@keyframes icon-600{100%{width:1.375rem;height:1.375rem}}@keyframes icon-700{100%{width:1.5rem;height:1.5rem}}@keyframes icon-800{100%{width:1.625rem;height:1.625rem}}@keyframes icon-900{100%{width:1.75rem;height:1.75rem}}@keyframes icon-999{100%{width:100%;height:100%}}:root:not(.prefers-color-scheme-dark){--theme-light-none:initial;--icon-aws:icon-aws-color;--icon-vault:icon-vault;--color-vault-500:rgb(var(--black));--tone-gray-000:var(--white);--tone-gray-050:var(--gray-050);--tone-gray-100:var(--gray-100);--tone-gray-150:var(--gray-150);--tone-gray-200:var(--gray-200);--tone-gray-300:var(--gray-300);--tone-gray-400:var(--gray-400);--tone-gray-500:var(--gray-500);--tone-gray-600:var(--gray-600);--tone-gray-700:var(--gray-700);--tone-gray-800:var(--gray-800);--tone-gray-850:var(--gray-850);--tone-gray-900:var(--gray-900);--tone-gray-950:var(--gray-950);--tone-gray-999:var(--black);--tone-green-000:var(--white);--tone-green-050:var(--green-050);--tone-green-100:var(--green-100);--tone-green-150:var(--green-150);--tone-green-200:var(--green-200);--tone-green-300:var(--green-300);--tone-green-400:var(--green-400);--tone-green-500:var(--green-500);--tone-green-600:var(--green-600);--tone-green-700:var(--green-700);--tone-green-800:var(--green-800);--tone-green-850:var(--green-850);--tone-green-900:var(--green-900);--tone-green-950:var(--green-950);--tone-green-999:var(--black);--tone-blue-000:var(--white);--tone-blue-050:var(--blue-050);--tone-blue-100:var(--blue-100);--tone-blue-150:var(--blue-150);--tone-blue-200:var(--blue-200);--tone-blue-300:var(--blue-300);--tone-blue-400:var(--blue-400);--tone-blue-500:var(--blue-500);--tone-blue-600:var(--blue-600);--tone-blue-700:var(--blue-700);--tone-blue-800:var(--blue-800);--tone-blue-850:var(--blue-850);--tone-blue-900:var(--blue-900);--tone-blue-950:var(--blue-950);--tone-blue-999:var(--black);--tone-red-000:var(--white);--tone-red-050:var(--red-050);--tone-red-100:var(--red-100);--tone-red-150:var(--red-150);--tone-red-200:var(--red-200);--tone-red-300:var(--red-300);--tone-red-400:var(--red-400);--tone-red-500:var(--red-500);--tone-red-600:var(--red-600);--tone-red-700:var(--red-700);--tone-red-800:var(--red-800);--tone-red-850:var(--red-850);--tone-red-900:var(--red-900);--tone-red-950:var(--red-950);--tone-red-999:var(--black);--tone-orange-000:var(--white);--tone-orange-050:var(--orange-050);--tone-orange-100:var(--orange-100);--tone-orange-150:var(--orange-150);--tone-orange-200:var(--orange-200);--tone-orange-300:var(--orange-300);--tone-orange-400:var(--orange-400);--tone-orange-500:var(--orange-500);--tone-orange-600:var(--orange-600);--tone-orange-700:var(--orange-700);--tone-orange-800:var(--orange-800);--tone-orange-850:var(--orange-850);--tone-orange-900:var(--orange-900);--tone-orange-950:var(--orange-950);--tone-orange-999:var(--black);--tone-yellow-000:var(--white);--tone-yellow-050:var(--yellow-050);--tone-yellow-100:var(--yellow-100);--tone-yellow-150:var(--yellow-150);--tone-yellow-200:var(--yellow-200);--tone-yellow-300:var(--yellow-300);--tone-yellow-400:var(--yellow-400);--tone-yellow-500:var(--yellow-500);--tone-yellow-600:var(--yellow-600);--tone-yellow-700:var(--yellow-700);--tone-yellow-800:var(--yellow-800);--tone-yellow-850:var(--yellow-850);--tone-yellow-900:var(--yellow-900);--tone-yellow-950:var(--yellow-950);--tone-yellow-999:var(--black);--tone-transparent:var(--transparent);--tone-vault-500:var(--black)}:root.prefers-color-scheme-dark,[role=banner],[role=banner] nav:first-of-type,[role=banner] nav:last-of-type{--theme-dark-none:initial;--icon-aws:icon-aws;--icon-vault:icon-vault;--color-aws-500:rgb(var(--white));--color-vault-500:rgb(var(--tone-lemon-500));--tone-gray-000:var(--black);--tone-gray-050:var(--gray-950);--tone-gray-100:var(--gray-900);--tone-gray-150:var(--gray-850);--tone-gray-200:var(--gray-800);--tone-gray-300:var(--gray-700);--tone-gray-400:var(--gray-600);--tone-gray-500:var(--gray-500);--tone-gray-600:var(--gray-400);--tone-gray-700:var(--gray-300);--tone-gray-800:var(--gray-200);--tone-gray-850:var(--gray-250);--tone-gray-900:var(--gray-100);--tone-gray-950:var(--gray-050);--tone-gray-999:var(--white);--tone-green-000:var(--white);--tone-green-050:var(--green-050);--tone-green-100:var(--green-100);--tone-green-150:var(--green-150);--tone-green-200:var(--green-200);--tone-green-300:var(--green-300);--tone-green-400:var(--green-400);--tone-green-500:var(--green-500);--tone-green-600:var(--green-600);--tone-green-700:var(--green-700);--tone-green-800:var(--green-800);--tone-green-850:var(--green-850);--tone-green-900:var(--green-900);--tone-green-950:var(--green-950);--tone-green-999:var(--black);--tone-blue-000:var(--white);--tone-blue-050:var(--blue-050);--tone-blue-100:var(--blue-100);--tone-blue-150:var(--blue-150);--tone-blue-200:var(--blue-200);--tone-blue-300:var(--blue-300);--tone-blue-400:var(--blue-400);--tone-blue-500:var(--blue-500);--tone-blue-600:var(--blue-600);--tone-blue-700:var(--blue-700);--tone-blue-800:var(--blue-800);--tone-blue-850:var(--blue-850);--tone-blue-900:var(--blue-900);--tone-blue-950:var(--blue-950);--tone-blue-999:var(--black);--tone-red-000:var(--white);--tone-red-050:var(--red-050);--tone-red-100:var(--red-100);--tone-red-150:var(--red-150);--tone-red-200:var(--red-200);--tone-red-300:var(--red-300);--tone-red-400:var(--red-400);--tone-red-500:var(--red-500);--tone-red-600:var(--red-600);--tone-red-700:var(--red-700);--tone-red-800:var(--red-800);--tone-red-850:var(--red-850);--tone-red-900:var(--red-900);--tone-red-950:var(--red-950);--tone-red-999:var(--black);--tone-orange-000:var(--white);--tone-orange-050:var(--orange-050);--tone-orange-100:var(--orange-100);--tone-orange-150:var(--orange-150);--tone-orange-200:var(--orange-200);--tone-orange-300:var(--orange-300);--tone-orange-400:var(--orange-400);--tone-orange-500:var(--orange-500);--tone-orange-600:var(--orange-600);--tone-orange-700:var(--orange-700);--tone-orange-800:var(--orange-800);--tone-orange-850:var(--orange-850);--tone-orange-900:var(--orange-900);--tone-orange-950:var(--orange-950);--tone-orange-999:var(--black);--tone-yellow-000:var(--black);--tone-yellow-050:var(--blue-950);--tone-yellow-100:var(--yellow-900);--tone-yellow-150:var(--yellow-850);--tone-yellow-200:var(--yellow-800);--tone-yellow-300:var(--yellow-700);--tone-yellow-400:var(--yellow-600);--tone-yellow-500:var(--yellow-500);--tone-yellow-600:var(--yellow-400);--tone-yellow-700:var(--yellow-300);--tone-yellow-800:var(--yellow-200);--tone-yellow-850:var(--yellow-250);--tone-yellow-900:var(--yellow-100);--tone-yellow-950:var(--yellow-050);--tone-yellow-999:var(--white);--tone-transparent:var(--transparent);--tone-vault-500:var(--lemon-500)}.consul-intention-permission-header-list dt::before,.consul-intention-permission-list dt::before,.discovery-chain .resolver-card dt,.discovery-chain .route-card section header>::before{font-weight:var(--typo-weight-normal);background-color:rgb(var(--tone-gray-100));visibility:visible;padding:0 4px}#downstream-container .topology-metrics-card .details .group span::before,#downstream-container .topology-metrics-card div .critical::before,#downstream-container .topology-metrics-card div .empty::before,#downstream-container .topology-metrics-card div .health dt::before,#downstream-container .topology-metrics-card div .nspace dt::before,#downstream-container .topology-metrics-card div .partition dt::before,#downstream-container .topology-metrics-card div .passing::before,#downstream-container .topology-metrics-card div .warning::before,#downstream-container>div:first-child span::before,#login-toggle+div footer button::after,#metrics-container .link .config-link::before,#metrics-container .link .metrics-link::before,#metrics-container:hover .sparkline-key-link::before,#upstream-container .topology-metrics-card .details .group span::before,#upstream-container .topology-metrics-card div .critical::before,#upstream-container .topology-metrics-card div .empty::before,#upstream-container .topology-metrics-card div .health dt::before,#upstream-container .topology-metrics-card div .nspace dt::before,#upstream-container .topology-metrics-card div .partition dt::before,#upstream-container .topology-metrics-card div .passing::before,#upstream-container .topology-metrics-card div .warning::before,.animatable.tab-nav ul::after,.certificate button.hide::before,.certificate button.show::before,.consul-auth-method-binding-list dl dt.type+dd span::before,.consul-auth-method-list ul .locality::before,.consul-auth-method-view dl dt.type+dd span::before,.consul-auth-method-view section dl dt.type+dd span::before,.consul-bucket-list .nspace::before,.consul-bucket-list .partition::before,.consul-exposed-path-list>ul>li>.detail .policy-management::before,.consul-exposed-path-list>ul>li>.detail .policy::before,.consul-exposed-path-list>ul>li>.detail .role::before,.consul-exposed-path-list>ul>li>.detail dl.address dt::before,.consul-exposed-path-list>ul>li>.detail dl.behavior dt::before,.consul-exposed-path-list>ul>li>.detail dl.checks dt::before,.consul-exposed-path-list>ul>li>.detail dl.critical dt::before,.consul-exposed-path-list>ul>li>.detail dl.datacenter dt::before,.consul-exposed-path-list>ul>li>.detail dl.empty dt::before,.consul-exposed-path-list>ul>li>.detail dl.lock-delay dt::before,.consul-exposed-path-list>ul>li>.detail dl.mesh dt::before,.consul-exposed-path-list>ul>li>.detail dl.node dt::before,.consul-exposed-path-list>ul>li>.detail dl.nspace dt::before,.consul-exposed-path-list>ul>li>.detail dl.passing dt::before,.consul-exposed-path-list>ul>li>.detail dl.path dt::before,.consul-exposed-path-list>ul>li>.detail dl.port dt::before,.consul-exposed-path-list>ul>li>.detail dl.protocol dt::before,.consul-exposed-path-list>ul>li>.detail dl.socket dt::before,.consul-exposed-path-list>ul>li>.detail dl.ttl dt::before,.consul-exposed-path-list>ul>li>.detail dl.warning dt::before,.consul-exposed-path-list>ul>li>.header .critical dd::before,.consul-exposed-path-list>ul>li>.header .empty dd::before,.consul-exposed-path-list>ul>li>.header .passing dd::before,.consul-exposed-path-list>ul>li>.header .policy-management dd::before,.consul-exposed-path-list>ul>li>.header .warning dd::before,.consul-exposed-path-list>ul>li>.header [rel=me] dd::before,.consul-external-source.consul-api-gateway::before,.consul-external-source.consul::before,.consul-external-source.jwt::before,.consul-external-source.kubernetes::before,.consul-external-source.leader::before,.consul-external-source.nomad::before,.consul-external-source.oidc::before,.consul-external-source.terraform::before,.consul-health-check-list .health-check-output dd em.jwt::before,.consul-health-check-list .health-check-output dd em.kubernetes::before,.consul-health-check-list .health-check-output dd em.oidc::before,.consul-health-check-list .health-check-output::before,.consul-instance-checks dt::before,.consul-intention-fieldsets .value->:last-child::before,.consul-intention-fieldsets .value-allow>:last-child::before,.consul-intention-fieldsets .value-deny>:last-child::before,.consul-intention-list .notice.allow::before,.consul-intention-list .notice.deny::before,.consul-intention-list .notice.permissions::before,.consul-intention-list em span::before,.consul-intention-list td strong.jwt::before,.consul-intention-list td strong.kubernetes::before,.consul-intention-list td strong.oidc::before,.consul-intention-list td.intent- strong::before,.consul-intention-list td.intent-allow strong::before,.consul-intention-list td.intent-deny strong::before,.consul-intention-permission-list .intent-allow::before,.consul-intention-permission-list .intent-deny::before,.consul-intention-permission-list strong.jwt::before,.consul-intention-permission-list strong.kubernetes::before,.consul-intention-permission-list strong.oidc::before,.consul-intention-search-bar .value- span::before,.consul-intention-search-bar .value-allow span::before,.consul-intention-search-bar .value-deny span::before,.consul-intention-search-bar li button span.jwt::before,.consul-intention-search-bar li button span.kubernetes::before,.consul-intention-search-bar li button span.oidc::before,.consul-kind::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .policy-management::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .policy::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .role::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.address dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.behavior dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.checks dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.critical dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.datacenter dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.empty dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.lock-delay dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.mesh dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.node dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.nspace dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.passing dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.path dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.port dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.protocol dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.socket dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.ttl dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.warning dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .critical dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header .empty dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header .passing dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header .policy-management dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header .warning dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header [rel=me] dd::before,.consul-server-card .health-status+dd.jwt::before,.consul-server-card .health-status+dd.kubernetes::before,.consul-server-card .health-status+dd.oidc::before,.consul-upstream-instance-list dl.datacenter dt::before,.consul-upstream-instance-list dl.nspace dt::before,.consul-upstream-instance-list dl.partition dt::before,.consul-upstream-instance-list li>.detail .policy-management::before,.consul-upstream-instance-list li>.detail .policy::before,.consul-upstream-instance-list li>.detail .role::before,.consul-upstream-instance-list li>.detail dl.address dt::before,.consul-upstream-instance-list li>.detail dl.behavior dt::before,.consul-upstream-instance-list li>.detail dl.checks dt::before,.consul-upstream-instance-list li>.detail dl.critical dt::before,.consul-upstream-instance-list li>.detail dl.datacenter dt::before,.consul-upstream-instance-list li>.detail dl.empty dt::before,.consul-upstream-instance-list li>.detail dl.lock-delay dt::before,.consul-upstream-instance-list li>.detail dl.mesh dt::before,.consul-upstream-instance-list li>.detail dl.node dt::before,.consul-upstream-instance-list li>.detail dl.nspace dt::before,.consul-upstream-instance-list li>.detail dl.passing dt::before,.consul-upstream-instance-list li>.detail dl.path dt::before,.consul-upstream-instance-list li>.detail dl.port dt::before,.consul-upstream-instance-list li>.detail dl.protocol dt::before,.consul-upstream-instance-list li>.detail dl.socket dt::before,.consul-upstream-instance-list li>.detail dl.ttl dt::before,.consul-upstream-instance-list li>.detail dl.warning dt::before,.consul-upstream-instance-list li>.header .critical dd::before,.consul-upstream-instance-list li>.header .empty dd::before,.consul-upstream-instance-list li>.header .passing dd::before,.consul-upstream-instance-list li>.header .policy-management dd::before,.consul-upstream-instance-list li>.header .warning dd::before,.consul-upstream-instance-list li>.header [rel=me] dd::before,.consul-upstream-list dl.partition dt::before,.copy-button button::before,.dangerous.informed-action header::before,.disclosure-menu [aria-expanded]~*>ul>li.is-active>::after,.disclosure-menu [aria-expanded]~*>ul>li[aria-checked]>::after,.disclosure-menu [aria-expanded]~*>ul>li[aria-current]>::after,.disclosure-menu [aria-expanded]~*>ul>li[aria-selected]>::after,.discovery-chain .resolvers>header span::after,.discovery-chain .route-card::before,.discovery-chain .route-card>header ul li.jwt::before,.discovery-chain .route-card>header ul li.kubernetes::before,.discovery-chain .route-card>header ul li.oidc::before,.discovery-chain .routes>header span::after,.discovery-chain .splitter-card::before,.discovery-chain .splitters>header span::after,.empty-state li[class*=-link]>::after,.has-error>strong::before,.hashicorp-consul .docs-link a::after,.hashicorp-consul .feedback-link a::after,.hashicorp-consul .learn-link a::after,.hashicorp-consul nav .dcs li.is-local span.jwt::before,.hashicorp-consul nav .dcs li.is-local span.kubernetes::before,.hashicorp-consul nav .dcs li.is-local span.oidc::before,.hashicorp-consul nav .dcs li.is-primary span.jwt::before,.hashicorp-consul nav .dcs li.is-primary span.kubernetes::before,.hashicorp-consul nav .dcs li.is-primary span.oidc::before,.hashicorp-consul nav li.nspaces .disclosure-menu>button::after,.hashicorp-consul nav li.partitions .disclosure-menu>button::after,.info.informed-action header::before,.jwt.consul-auth-method-type::before,.jwt.consul-external-source::before,.jwt.consul-kind::before,.jwt.consul-source::before,.jwt.consul-transparent-proxy::before,.jwt.leader::before,.jwt.topology-metrics-source-type::before,.kubernetes.consul-auth-method-type::before,.kubernetes.consul-external-source::before,.kubernetes.consul-kind::before,.kubernetes.consul-source::before,.kubernetes.consul-transparent-proxy::before,.kubernetes.informed-action header::before,.kubernetes.leader::before,.kubernetes.topology-metrics-source-type::before,.leader::before,.list-collection>button::after,.list-collection>ul>li:not(:first-child)>.detail .policy-management::before,.list-collection>ul>li:not(:first-child)>.detail .policy::before,.list-collection>ul>li:not(:first-child)>.detail .role::before,.list-collection>ul>li:not(:first-child)>.detail dl.address dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.behavior dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.checks dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.critical dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.datacenter dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.empty dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.lock-delay dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.mesh dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.node dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.nspace dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.passing dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.path dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.port dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.protocol dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.socket dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.ttl dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.warning dt::before,.list-collection>ul>li:not(:first-child)>.header .critical dd::before,.list-collection>ul>li:not(:first-child)>.header .empty dd::before,.list-collection>ul>li:not(:first-child)>.header .passing dd::before,.list-collection>ul>li:not(:first-child)>.header .policy-management dd::before,.list-collection>ul>li:not(:first-child)>.header .warning dd::before,.list-collection>ul>li:not(:first-child)>.header [rel=me] dd::before,.menu-panel>ul>li.is-active>::after,.menu-panel>ul>li[aria-checked]>::after,.menu-panel>ul>li[aria-current]>::after,.menu-panel>ul>li[aria-selected]>::after,.modal-dialog [role=document] a[rel*=help]::after,.modal-dialog [role=document] table td.folder::before,.modal-dialog [role=document] table th span::after,.modal-dialog [role=document]>header button::before,.more-popover-menu>[type=checkbox]+label+div>ul>li.is-active>::after,.more-popover-menu>[type=checkbox]+label+div>ul>li[aria-checked]>::after,.more-popover-menu>[type=checkbox]+label+div>ul>li[aria-current]>::after,.more-popover-menu>[type=checkbox]+label+div>ul>li[aria-selected]>::after,.more-popover-menu>[type=checkbox]+label>::after,.notice.error::before,.notice.highlight::before,.notice.info::before,.notice.policy-management::before,.notice.success::before,.notice.warning::before,.oidc-select .auth0-oidc-provider::before,.oidc-select .google-oidc-provider::before,.oidc-select .microsoft-oidc-provider::before,.oidc-select .okta-oidc-provider::before,.oidc.consul-auth-method-type::before,.oidc.consul-external-source::before,.oidc.consul-kind::before,.oidc.consul-source::before,.oidc.consul-transparent-proxy::before,.oidc.leader::before,.oidc.topology-metrics-source-type::before,.popover-menu>[type=checkbox]+label+div>ul>li.is-active>::after,.popover-menu>[type=checkbox]+label+div>ul>li[aria-checked]>::after,.popover-menu>[type=checkbox]+label+div>ul>li[aria-current]>::after,.popover-menu>[type=checkbox]+label+div>ul>li[aria-selected]>::after,.popover-menu>[type=checkbox]+label>::after,.popover-select .consul button::before,.popover-select .consul-api-gateway button::before,.popover-select .jwt button::before,.popover-select .kubernetes button::before,.popover-select .nomad button::before,.popover-select .oidc button::before,.popover-select .terraform button::before,.popover-select .value-critical button::before,.popover-select .value-empty button::before,.popover-select .value-passing button::before,.popover-select .value-warning button::before,.search-bar-status li.jwt:not(.remove-all)::before,.search-bar-status li.kubernetes:not(.remove-all)::before,.search-bar-status li.oidc:not(.remove-all)::before,.search-bar-status li:not(.remove-all) button::before,.sparkline-key h3::before,.tag-list dt::before,.tooltip-panel dd>div::before,.topology-metrics-popover.deny .tippy-arrow::after,.topology-metrics-popover.deny>button::before,.topology-metrics-popover.l7 .tippy-arrow::after,.topology-metrics-popover.l7>button::before,.topology-metrics-popover.not-defined .tippy-arrow::after,.topology-metrics-popover.not-defined>button::before,.topology-metrics-status-error span::before,.topology-metrics-status-loader span::before,.topology-notices button::before,.type-reveal span::before,.type-sort.popover-select label>::before,.type-source.popover-select li.partition button::before,.warning.informed-action header::before,.warning.modal-dialog header::before,[class*=status-].empty-state header::before,a[rel*=external]::after,html[data-route^="dc.acls.index"] main td strong.jwt::before,html[data-route^="dc.acls.index"] main td strong.kubernetes::before,html[data-route^="dc.acls.index"] main td strong.oidc::before,main a[rel*=help]::after,main header nav:first-child ol li:first-child a::before,main table td.folder::before,main table th span::after,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.jwt::before,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.kubernetes::before,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.oidc::before,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em.jwt::before,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em.kubernetes::before,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em.oidc::before,span.jwt.policy-node-identity::before,span.jwt.policy-service-identity::before,span.kubernetes.policy-node-identity::before,span.kubernetes.policy-service-identity::before,span.oidc.policy-node-identity::before,span.oidc.policy-service-identity::before,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.is-active>::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li[aria-checked]>::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li[aria-current]>::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li[aria-selected]>::after,table.has-actions tr>.actions>[type=checkbox]+label>::after,table.with-details td:only-child>div>label::before,table.with-details td>label::before,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.is-active>::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li[aria-checked]>::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li[aria-current]>::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li[aria-selected]>::after,table.with-details tr>.actions>[type=checkbox]+label>::after,td.tags dt::before{content:""}.hashicorp-consul .acls-separator span{box-sizing:border-box;width:12px;height:12px}.hashicorp-consul .acls-separator span::after,.hashicorp-consul .acls-separator span::before{content:"";display:block;width:100%;height:100%;border-radius:100%}.hashicorp-consul .acls-separator span::before{border:1px solid currentColor;opacity:.5}.ember-power-select-trigger,.ember-power-select-trigger--active,.ember-power-select-trigger:focus{border-top:1px solid #aaa;border-bottom:1px solid #aaa;border-right:1px solid #aaa;border-left:1px solid #aaa}.hashicorp-consul .acls-separator span::after{position:absolute;top:2px;left:2px;width:calc(100% - 4px);height:calc(100% - 4px);background-color:currentColor}@keyframes icon-alert-circle-outline{100%{-webkit-mask-image:var(--icon-alert-circle-16);mask-image:var(--icon-alert-circle-16);background-color:var(--icon-color,var(--color-alert-circle-outline-500,currentColor))}}[class*=status-].empty-state header::before{--icon-name:icon-alert-circle-outline;content:""}@keyframes icon-alert-triangle{100%{-webkit-mask-image:var(--icon-alert-triangle-16);mask-image:var(--icon-alert-triangle-16);background-color:var(--icon-color,var(--color-alert-triangle-500,currentColor))}}#downstream-container .topology-metrics-card div .warning::before,#upstream-container .topology-metrics-card div .warning::before,.consul-exposed-path-list>ul>li>.detail dl.warning dt::before,.consul-exposed-path-list>ul>li>.header .warning dd::before,.consul-health-check-list .warning.health-check-output::before,.consul-instance-checks.warning dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.warning dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .warning dd::before,.consul-upstream-instance-list li>.detail dl.warning dt::before,.consul-upstream-instance-list li>.header .warning dd::before,.dangerous.informed-action header::before,.list-collection>ul>li:not(:first-child)>.detail dl.warning dt::before,.list-collection>ul>li:not(:first-child)>.header .warning dd::before,.notice.warning::before,.popover-select .value-warning button::before,.topology-metrics-popover.not-defined .tippy-arrow::after,.topology-metrics-popover.not-defined>button::before,.warning.informed-action header::before,.warning.modal-dialog header::before{--icon-name:icon-alert-triangle;content:""}@keyframes icon-arrow-right{100%{-webkit-mask-image:var(--icon-arrow-right-16);mask-image:var(--icon-arrow-right-16);background-color:var(--icon-color,var(--color-arrow-right-500,currentColor))}}@keyframes icon-cancel-plain{100%{-webkit-mask-image:var(--icon-x-16);mask-image:var(--icon-x-16);background-color:var(--icon-color,var(--color-cancel-plain-500,currentColor))}}.modal-dialog [role=document]>header button::before,.search-bar-status li:not(.remove-all) button::before{--icon-name:icon-cancel-plain;content:""}@keyframes icon-cancel-square-fill{100%{-webkit-mask-image:var(--icon-x-square-fill-16);mask-image:var(--icon-x-square-fill-16);background-color:var(--icon-color,var(--color-cancel-square-fill-500,currentColor))}}#downstream-container .topology-metrics-card div .critical::before,#upstream-container .topology-metrics-card div .critical::before,.consul-exposed-path-list>ul>li>.detail dl.critical dt::before,.consul-exposed-path-list>ul>li>.header .critical dd::before,.consul-health-check-list .critical.health-check-output::before,.consul-instance-checks.critical dt::before,.consul-intention-list .notice.deny::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.critical dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .critical dd::before,.consul-upstream-instance-list li>.detail dl.critical dt::before,.consul-upstream-instance-list li>.header .critical dd::before,.has-error>strong::before,.list-collection>ul>li:not(:first-child)>.detail dl.critical dt::before,.list-collection>ul>li:not(:first-child)>.header .critical dd::before,.notice.error::before,.popover-select .value-critical button::before,.topology-metrics-popover.deny .tippy-arrow::after,.topology-metrics-popover.deny>button::before{--icon-name:icon-cancel-square-fill;content:""}@keyframes icon-check-plain{100%{-webkit-mask-image:var(--icon-check-16);mask-image:var(--icon-check-16);background-color:var(--icon-color,var(--color-check-plain-500,currentColor))}}.disclosure-menu [aria-expanded]~*>ul>li.is-active>::after,.disclosure-menu [aria-expanded]~*>ul>li[aria-checked]>::after,.disclosure-menu [aria-expanded]~*>ul>li[aria-current]>::after,.disclosure-menu [aria-expanded]~*>ul>li[aria-selected]>::after,.menu-panel>ul>li.is-active>::after,.menu-panel>ul>li[aria-checked]>::after,.menu-panel>ul>li[aria-current]>::after,.menu-panel>ul>li[aria-selected]>::after,.more-popover-menu>[type=checkbox]+label+div>ul>li.is-active>::after,.more-popover-menu>[type=checkbox]+label+div>ul>li[aria-checked]>::after,.more-popover-menu>[type=checkbox]+label+div>ul>li[aria-current]>::after,.more-popover-menu>[type=checkbox]+label+div>ul>li[aria-selected]>::after,.popover-menu>[type=checkbox]+label+div>ul>li.is-active>::after,.popover-menu>[type=checkbox]+label+div>ul>li[aria-checked]>::after,.popover-menu>[type=checkbox]+label+div>ul>li[aria-current]>::after,.popover-menu>[type=checkbox]+label+div>ul>li[aria-selected]>::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.is-active>::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li[aria-checked]>::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li[aria-current]>::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li[aria-selected]>::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.is-active>::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li[aria-checked]>::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li[aria-current]>::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li[aria-selected]>::after{--icon-name:icon-check-plain;content:""}@keyframes icon-chevron-down{100%{-webkit-mask-image:var(--icon-chevron-down-16);mask-image:var(--icon-chevron-down-16);background-color:var(--icon-color,var(--color-chevron-down-500,currentColor))}}.hashicorp-consul nav li.nspaces .disclosure-menu>button::after,.hashicorp-consul nav li.partitions .disclosure-menu>button::after,.list-collection>button.closed::after,.more-popover-menu>[type=checkbox]+label>::after,.popover-menu>[type=checkbox]+label>::after,.topology-notices button::before,table.has-actions tr>.actions>[type=checkbox]+label>::after,table.with-details td:only-child>div>label::before,table.with-details td>label::before,table.with-details tr>.actions>[type=checkbox]+label>::after{--icon-name:icon-chevron-down;content:""}@keyframes icon-copy-action{100%{-webkit-mask-image:var(--icon-clipboard-copy-16);mask-image:var(--icon-clipboard-copy-16);background-color:var(--icon-color,var(--color-copy-action-500,currentColor))}}.copy-button button::before{--icon-name:icon-copy-action;content:"";--icon-color:rgb(var(--tone-gray-500))}@keyframes icon-deny-alt{100%{-webkit-mask-image:var(--icon-skip-16);mask-image:var(--icon-skip-16);background-color:var(--icon-color,var(--color-deny-alt-500,currentColor))}}@keyframes icon-deny-default{100%{-webkit-mask-image:var(--icon-skip-16);mask-image:var(--icon-skip-16);background-color:var(--icon-color,var(--color-deny-default-500,currentColor))}}@keyframes icon-disabled{100%{-webkit-mask-image:var(--icon-skip-16);mask-image:var(--icon-skip-16);background-color:var(--icon-color,var(--color-disabled-500,currentColor))}}.status-403.empty-state header::before{--icon-name:icon-disabled;content:""}@keyframes icon-docs{100%{-webkit-mask-image:var(--icon-docs-16);mask-image:var(--icon-docs-16);background-color:var(--icon-color,var(--color-docs-500,currentColor))}}#metrics-container .link .config-link::before,.empty-state .docs-link>::after,.hashicorp-consul .docs-link a::after{--icon-name:icon-docs;content:""}@keyframes icon-exit{100%{-webkit-mask-image:var(--icon-external-link-16);mask-image:var(--icon-external-link-16);background-color:var(--icon-color,var(--color-exit-500,currentColor))}}#metrics-container .link .metrics-link::before,a[rel*=external]::after{--icon-name:icon-exit;content:""}@keyframes icon-file-fill{100%{-webkit-mask-image:var(--icon-file-16);mask-image:var(--icon-file-16);background-color:var(--icon-color,var(--color-file-fill-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail .policy::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .policy::before,.consul-upstream-instance-list li>.detail .policy::before,.list-collection>ul>li:not(:first-child)>.detail .policy::before{--icon-name:icon-file-fill;content:""}@keyframes icon-folder-outline{100%{-webkit-mask-image:var(--icon-folder-16);mask-image:var(--icon-folder-16);background-color:var(--icon-color,var(--color-folder-outline-500,currentColor))}}#downstream-container .topology-metrics-card div .nspace dt::before,#upstream-container .topology-metrics-card div .nspace dt::before,.consul-bucket-list .nspace::before,.consul-exposed-path-list>ul>li>.detail dl.nspace dt::before,.consul-intention-list span[class|=nspace]::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.nspace dt::before,.consul-upstream-instance-list dl.nspace dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.nspace dt::before,.modal-dialog [role=document] table td.folder::before,main table td.folder::before{--icon-name:icon-folder-outline;content:""}@keyframes icon-health{100%{-webkit-mask-image:var(--icon-activity-16);mask-image:var(--icon-activity-16);background-color:var(--icon-color,var(--color-health-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.checks dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.checks dt::before,.consul-upstream-instance-list li>.detail dl.checks dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.checks dt::before{--icon-name:icon-health;content:""}@keyframes icon-help-circle-outline{100%{-webkit-mask-image:var(--icon-help-16);mask-image:var(--icon-help-16);background-color:var(--icon-color,var(--color-help-circle-outline-500,currentColor))}}#downstream-container .topology-metrics-card div .health dt::before,#upstream-container .topology-metrics-card div .health dt::before,.status-404.empty-state header::before{--icon-name:icon-help-circle-outline;content:""}@keyframes icon-info-circle-fill{100%{-webkit-mask-image:var(--icon-info-16);mask-image:var(--icon-info-16);background-color:var(--icon-color,var(--color-info-circle-fill-500,currentColor))}}#metrics-container:hover .sparkline-key-link::before,.consul-intention-list .notice.permissions::before,.info.informed-action header::before,.notice.info::before,.sparkline-key h3::before{--icon-name:icon-info-circle-fill;content:""}@keyframes icon-info-circle-outline{100%{-webkit-mask-image:var(--icon-info-16);mask-image:var(--icon-info-16);background-color:var(--icon-color,var(--color-info-circle-outline-500,currentColor))}}#downstream-container>div:first-child span::before,.consul-auth-method-binding-list dl dt.type+dd span::before,.consul-auth-method-view dl dt.type+dd span::before,.consul-exposed-path-list>ul>li>.detail dl.behavior dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.behavior dt::before,.consul-upstream-instance-list li>.detail dl.behavior dt::before,.discovery-chain .resolvers>header span::after,.discovery-chain .routes>header span::after,.discovery-chain .splitters>header span::after,.list-collection>ul>li:not(:first-child)>.detail dl.behavior dt::before,.modal-dialog [role=document] a[rel*=help]::after,.modal-dialog [role=document] table th span::after,.topology-metrics-status-error span::before,.topology-metrics-status-loader span::before,main a[rel*=help]::after,main table th span::after{--icon-name:icon-info-circle-outline;content:""}@keyframes icon-learn{100%{-webkit-mask-image:var(--icon-learn-16);mask-image:var(--icon-learn-16);background-color:var(--icon-color,var(--color-learn-500,currentColor))}}.empty-state .learn-link>::after,.hashicorp-consul .learn-link a::after{--icon-name:icon-learn;content:""}@keyframes icon-logo-github-monochrome{100%{-webkit-mask-image:var(--icon-github-color-16);mask-image:var(--icon-github-color-16);background-color:var(--icon-color,var(--color-logo-github-monochrome-500,currentColor))}}.hashicorp-consul .feedback-link a::after{--icon-name:icon-logo-github-monochrome;content:""}@keyframes icon-logo-google-color{100%{background-image:var(--icon-google-color-16)}}.oidc-select .google-oidc-provider::before{--icon-name:icon-logo-google-color;content:""}@keyframes icon-logo-kubernetes-color{100%{background-image:var(--icon-kubernetes-color-16)}}.consul-external-source.kubernetes::before,.consul-health-check-list .health-check-output dd em.kubernetes::before,.consul-intention-list td strong.kubernetes::before,.consul-intention-permission-list strong.kubernetes::before,.consul-intention-search-bar li button span.kubernetes::before,.consul-server-card .health-status+dd.kubernetes::before,.discovery-chain .route-card>header ul li.kubernetes::before,.hashicorp-consul nav .dcs li.is-local span.kubernetes::before,.hashicorp-consul nav .dcs li.is-primary span.kubernetes::before,.kubernetes.consul-auth-method-type::before,.kubernetes.consul-kind::before,.kubernetes.consul-source::before,.kubernetes.consul-transparent-proxy::before,.kubernetes.informed-action header::before,.kubernetes.leader::before,.kubernetes.topology-metrics-source-type::before,.notice.crd::before,.popover-select .kubernetes button::before,.search-bar-status li.kubernetes:not(.remove-all)::before,html[data-route^="dc.acls.index"] main td strong.kubernetes::before,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.kubernetes::before,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em.kubernetes::before,span.kubernetes.policy-node-identity::before,span.kubernetes.policy-service-identity::before{--icon-name:icon-logo-kubernetes-color;content:""}@keyframes icon-menu{100%{-webkit-mask-image:var(--icon-menu-16);mask-image:var(--icon-menu-16);background-color:var(--icon-color,var(--color-menu-500,currentColor))}}@keyframes icon-minus-square-fill{100%{-webkit-mask-image:var(--icon-minus-square-16);mask-image:var(--icon-minus-square-16);background-color:var(--icon-color,var(--color-minus-square-fill-500,currentColor))}}#downstream-container .topology-metrics-card div .empty::before,#upstream-container .topology-metrics-card div .empty::before,.consul-exposed-path-list>ul>li>.detail dl.empty dt::before,.consul-exposed-path-list>ul>li>.header .empty dd::before,.consul-instance-checks.empty dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.empty dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .empty dd::before,.consul-upstream-instance-list li>.detail dl.empty dt::before,.consul-upstream-instance-list li>.header .empty dd::before,.list-collection>ul>li:not(:first-child)>.detail dl.empty dt::before,.list-collection>ul>li:not(:first-child)>.header .empty dd::before,.popover-select .value-empty button::before{--icon-name:icon-minus-square-fill;content:""}@keyframes icon-more-horizontal{100%{-webkit-mask-image:var(--icon-more-horizontal-16);mask-image:var(--icon-more-horizontal-16);background-color:var(--icon-color,var(--color-more-horizontal-500,currentColor))}}@keyframes icon-public-default{100%{-webkit-mask-image:var(--icon-globe-16);mask-image:var(--icon-globe-16);background-color:var(--icon-color,var(--color-public-default-500,currentColor))}}.consul-auth-method-list ul .locality::before,.consul-exposed-path-list>ul>li>.detail dl.address dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.address dt::before,.consul-upstream-instance-list li>.detail dl.address dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.address dt::before{--icon-name:icon-public-default;content:""}@keyframes icon-search{100%{-webkit-mask-image:var(--icon-search-16);mask-image:var(--icon-search-16);background-color:var(--icon-color,var(--color-search-500,currentColor))}}@keyframes icon-star-outline{100%{-webkit-mask-image:var(--icon-star-16);mask-image:var(--icon-star-16);background-color:var(--icon-color,var(--color-star-outline-500,currentColor))}}.consul-external-source.leader::before,.leader::before{--icon-name:icon-star-outline;content:""}@keyframes icon-user-organization{100%{-webkit-mask-image:var(--icon-org-16);mask-image:var(--icon-org-16);background-color:var(--icon-color,var(--color-user-organization-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.datacenter dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.datacenter dt::before,.consul-upstream-instance-list dl.datacenter dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.datacenter dt::before{--icon-name:icon-user-organization;content:""}@keyframes icon-user-plain{100%{-webkit-mask-image:var(--icon-user-16);mask-image:var(--icon-user-16);background-color:var(--icon-color,var(--color-user-plain-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail .role::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .role::before,.consul-upstream-instance-list li>.detail .role::before,.list-collection>ul>li:not(:first-child)>.detail .role::before{--icon-name:icon-user-plain;content:""}@keyframes icon-user-team{100%{-webkit-mask-image:var(--icon-users-16);mask-image:var(--icon-users-16);background-color:var(--icon-color,var(--color-user-team-500,currentColor))}}#downstream-container .topology-metrics-card div .partition dt::before,#upstream-container .topology-metrics-card div .partition dt::before,.consul-bucket-list .partition::before,.consul-intention-list span[class|=partition]::before,.consul-upstream-instance-list dl.partition dt::before,.consul-upstream-list dl.partition dt::before,.type-source.popover-select li.partition button::before{--icon-name:icon-user-team;content:""}@keyframes icon-visibility-hide{100%{-webkit-mask-image:var(--icon-eye-off-16);mask-image:var(--icon-eye-off-16);background-color:var(--icon-color,var(--color-visibility-hide-500,currentColor))}}.certificate button.hide::before,.type-reveal input:checked+span::before{--icon-name:icon-visibility-hide;content:""}@keyframes icon-visibility-show{100%{-webkit-mask-image:var(--icon-eye-16);mask-image:var(--icon-eye-16);background-color:var(--icon-color,var(--color-visibility-show-500,currentColor))}}.certificate button.show::before,.type-reveal span::before{--icon-name:icon-visibility-show;content:""}@keyframes icon-alert-circle{100%{-webkit-mask-image:var(--icon-alert-circle-16);mask-image:var(--icon-alert-circle-16);background-color:var(--icon-color,var(--color-alert-circle-500,currentColor))}}@keyframes icon-aws{100%{-webkit-mask-image:var(--icon-aws-color-16);mask-image:var(--icon-aws-color-16);background-color:var(--icon-color,var(--color-aws-500,currentColor))}}@keyframes icon-aws-color{100%{background-image:var(--icon-aws-color-16)}}@keyframes icon-check{100%{-webkit-mask-image:var(--icon-check-16);mask-image:var(--icon-check-16);background-color:var(--icon-color,var(--color-check-500,currentColor))}}@keyframes icon-check-circle{100%{-webkit-mask-image:var(--icon-check-circle-16);mask-image:var(--icon-check-circle-16);background-color:var(--icon-color,var(--color-check-circle-500,currentColor))}}@keyframes icon-check-circle-fill{100%{-webkit-mask-image:var(--icon-check-circle-fill-16);mask-image:var(--icon-check-circle-fill-16);background-color:var(--icon-color,var(--color-check-circle-fill-500,currentColor))}}#downstream-container .topology-metrics-card div .passing::before,#upstream-container .topology-metrics-card div .passing::before,.consul-exposed-path-list>ul>li>.detail dl.passing dt::before,.consul-exposed-path-list>ul>li>.header .passing dd::before,.consul-exposed-path-list>ul>li>.header [rel=me] dd::before,.consul-health-check-list .passing.health-check-output::before,.consul-instance-checks.passing dt::before,.consul-intention-list .notice.allow::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.passing dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .passing dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header [rel=me] dd::before,.consul-upstream-instance-list li>.detail dl.passing dt::before,.consul-upstream-instance-list li>.header .passing dd::before,.consul-upstream-instance-list li>.header [rel=me] dd::before,.list-collection>ul>li:not(:first-child)>.detail dl.passing dt::before,.list-collection>ul>li:not(:first-child)>.header .passing dd::before,.list-collection>ul>li:not(:first-child)>.header [rel=me] dd::before,.notice.success::before,.popover-select .value-passing button::before{--icon-name:icon-check-circle-fill;content:""}@keyframes icon-chevron-left{100%{-webkit-mask-image:var(--icon-chevron-left-16);mask-image:var(--icon-chevron-left-16);background-color:var(--icon-color,var(--color-chevron-left-500,currentColor))}}.empty-state .back-link>::after,main header nav:first-child ol li:first-child a::before{--icon-name:icon-chevron-left;content:""}@keyframes icon-chevron-right{100%{-webkit-mask-image:var(--icon-chevron-right-16);mask-image:var(--icon-chevron-right-16);background-color:var(--icon-color,var(--color-chevron-right-500,currentColor))}}#login-toggle+div footer button::after{--icon-name:icon-chevron-right;content:""}@keyframes icon-chevron-up{100%{-webkit-mask-image:var(--icon-chevron-up-16);mask-image:var(--icon-chevron-up-16);background-color:var(--icon-color,var(--color-chevron-up-500,currentColor))}}.hashicorp-consul nav li.nspaces .disclosure-menu>button[aria-expanded=true]::after,.hashicorp-consul nav li.partitions .disclosure-menu>button[aria-expanded=true]::after,.list-collection>button::after,.more-popover-menu>[type=checkbox]:checked+label>::after,.popover-menu>[type=checkbox]:checked+label>::after,.topology-notices button[aria-expanded=true]::before,table.has-actions tr>.actions>[type=checkbox]:checked+label>::after,table.with-details tr>.actions>[type=checkbox]:checked+label>::after{--icon-name:icon-chevron-up;content:""}@keyframes icon-consul{100%{-webkit-mask-image:var(--icon-consul-color-16);mask-image:var(--icon-consul-color-16);background-color:var(--icon-color,var(--color-consul-500,currentColor))}}@keyframes icon-delay{100%{-webkit-mask-image:var(--icon-delay-16);mask-image:var(--icon-delay-16);background-color:var(--icon-color,var(--color-delay-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.lock-delay dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.lock-delay dt::before,.consul-upstream-instance-list li>.detail dl.lock-delay dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.lock-delay dt::before{--icon-name:icon-delay;content:""}@keyframes icon-docs-link{100%{-webkit-mask-image:var(--icon-docs-link-16);mask-image:var(--icon-docs-link-16);background-color:var(--icon-color,var(--color-docs-link-500,currentColor))}}@keyframes icon-gateway{100%{-webkit-mask-image:var(--icon-gateway-16);mask-image:var(--icon-gateway-16);background-color:var(--icon-color,var(--color-gateway-500,currentColor))}}.consul-kind::before{--icon-name:icon-gateway;content:""}@keyframes icon-git-commit{100%{-webkit-mask-image:var(--icon-git-commit-16);mask-image:var(--icon-git-commit-16);background-color:var(--icon-color,var(--color-git-commit-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.node dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.node dt::before,.consul-upstream-instance-list li>.detail dl.node dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.node dt::before{--icon-name:icon-git-commit;content:""}@keyframes icon-history{100%{-webkit-mask-image:var(--icon-history-16);mask-image:var(--icon-history-16);background-color:var(--icon-color,var(--color-history-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.ttl dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.ttl dt::before,.consul-upstream-instance-list li>.detail dl.ttl dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.ttl dt::before{--icon-name:icon-history;content:""}@keyframes icon-info{100%{-webkit-mask-image:var(--icon-info-16);mask-image:var(--icon-info-16);background-color:var(--icon-color,var(--color-info-500,currentColor))}}@keyframes icon-layers{100%{-webkit-mask-image:var(--icon-layers-16);mask-image:var(--icon-layers-16);background-color:var(--icon-color,var(--color-layers-500,currentColor))}}.topology-metrics-popover.l7 .tippy-arrow::after,.topology-metrics-popover.l7>button::before{--icon-name:icon-layers;content:"";--icon-color:rgb(var(--tone-gray-300))}@keyframes icon-loading{100%{-webkit-mask-image:var(--icon-loading-16);mask-image:var(--icon-loading-16);background-color:var(--icon-color,var(--color-loading-500,currentColor))}}@keyframes icon-path{100%{-webkit-mask-image:var(--icon-path-16);mask-image:var(--icon-path-16);background-color:var(--icon-color,var(--color-path-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.path dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.path dt::before,.consul-upstream-instance-list li>.detail dl.path dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.path dt::before{--icon-name:icon-path;content:""}@keyframes icon-skip{100%{-webkit-mask-image:var(--icon-skip-16);mask-image:var(--icon-skip-16);background-color:var(--icon-color,var(--color-skip-500,currentColor))}}@keyframes icon-socket{100%{-webkit-mask-image:var(--icon-socket-16);mask-image:var(--icon-socket-16);background-color:var(--icon-color,var(--color-socket-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.socket dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.socket dt::before,.consul-upstream-instance-list li>.detail dl.socket dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.socket dt::before{--icon-name:icon-socket;content:""}@keyframes icon-star-circle{100%{-webkit-mask-image:var(--icon-star-circle-16);mask-image:var(--icon-star-circle-16);background-color:var(--icon-color,var(--color-star-circle-500,currentColor))}}@keyframes icon-star-fill{100%{-webkit-mask-image:var(--icon-star-fill-16);mask-image:var(--icon-star-fill-16);background-color:var(--icon-color,var(--color-star-fill-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail .policy-management::before,.consul-exposed-path-list>ul>li>.header .policy-management dd::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .policy-management::before,.consul-lock-session-list ul>li:not(:first-child)>.header .policy-management dd::before,.consul-upstream-instance-list li>.detail .policy-management::before,.consul-upstream-instance-list li>.header .policy-management dd::before,.list-collection>ul>li:not(:first-child)>.detail .policy-management::before,.list-collection>ul>li:not(:first-child)>.header .policy-management dd::before,.notice.highlight::before,.notice.policy-management::before{--icon-name:icon-star-fill;content:""}@keyframes icon-tag{100%{-webkit-mask-image:var(--icon-tag-16);mask-image:var(--icon-tag-16);background-color:var(--icon-color,var(--color-tag-500,currentColor))}}.tag-list dt::before,td.tags dt::before{--icon-name:icon-tag;content:""}@keyframes icon-vault{100%{-webkit-mask-image:var(--icon-vault-color-16);mask-image:var(--icon-vault-color-16);background-color:var(--icon-color,var(--color-vault-500,currentColor))}}@keyframes icon-x{100%{-webkit-mask-image:var(--icon-x-16);mask-image:var(--icon-x-16);background-color:var(--icon-color,var(--color-x-500,currentColor))}}@keyframes icon-x-circle{100%{-webkit-mask-image:var(--icon-x-circle-16);mask-image:var(--icon-x-circle-16);background-color:var(--icon-color,var(--color-x-circle-500,currentColor))}}@keyframes icon-cloud-cross{100%{-webkit-mask-image:var(--icon-cloud-cross-16);mask-image:var(--icon-cloud-cross-16);background-color:var(--icon-color,var(--color-cloud-cross-500,currentColor))}}@keyframes icon-loading-motion{100%{-webkit-mask-image:var(--icon-loading-motion-16);mask-image:var(--icon-loading-motion-16);background-color:var(--icon-color,var(--color-loading-motion-500,currentColor))}}@keyframes icon-logo-auth0-color{100%{background-image:var(--icon-auth0-color-16)}}.oidc-select .auth0-oidc-provider::before{--icon-name:icon-logo-auth0-color;content:""}@keyframes icon-logo-consul-color{100%{background-image:var(--icon-consul-color-16)}}.consul-external-source.consul-api-gateway::before,.consul-external-source.consul::before,.popover-select .consul button::before,.popover-select .consul-api-gateway button::before{--icon-name:icon-logo-consul-color;content:""}@keyframes icon-logo-ember-circle-color{100%{background-image:var(--icon-logo-ember-circle-color-16)}}@keyframes icon-logo-glimmer-color{100%{background-image:var(--icon-logo-glimmer-color-16)}}@keyframes icon-logo-jwt-color{100%{background-image:var(--icon-logo-jwt-color-16)}}.consul-external-source.jwt::before,.consul-health-check-list .health-check-output dd em.jwt::before,.consul-intention-list td strong.jwt::before,.consul-intention-permission-list strong.jwt::before,.consul-intention-search-bar li button span.jwt::before,.consul-server-card .health-status+dd.jwt::before,.discovery-chain .route-card>header ul li.jwt::before,.hashicorp-consul nav .dcs li.is-local span.jwt::before,.hashicorp-consul nav .dcs li.is-primary span.jwt::before,.jwt.consul-auth-method-type::before,.jwt.consul-kind::before,.jwt.consul-source::before,.jwt.consul-transparent-proxy::before,.jwt.leader::before,.jwt.topology-metrics-source-type::before,.popover-select .jwt button::before,.search-bar-status li.jwt:not(.remove-all)::before,html[data-route^="dc.acls.index"] main td strong.jwt::before,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.jwt::before,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em.jwt::before,span.jwt.policy-node-identity::before,span.jwt.policy-service-identity::before{--icon-name:icon-logo-jwt-color;content:""}@keyframes icon-logo-microsoft-color{100%{background-image:var(--icon-microsoft-color-16)}}.oidc-select .microsoft-oidc-provider::before{--icon-name:icon-logo-microsoft-color;content:""}@keyframes icon-logo-nomad-color{100%{background-image:var(--icon-nomad-color-16)}}.consul-external-source.nomad::before,.popover-select .nomad button::before{--icon-name:icon-logo-nomad-color;content:""}@keyframes icon-logo-oidc-color{100%{background-image:var(--icon-logo-oidc-color-16)}}.consul-external-source.oidc::before,.consul-health-check-list .health-check-output dd em.oidc::before,.consul-intention-list td strong.oidc::before,.consul-intention-permission-list strong.oidc::before,.consul-intention-search-bar li button span.oidc::before,.consul-server-card .health-status+dd.oidc::before,.discovery-chain .route-card>header ul li.oidc::before,.hashicorp-consul nav .dcs li.is-local span.oidc::before,.hashicorp-consul nav .dcs li.is-primary span.oidc::before,.oidc.consul-auth-method-type::before,.oidc.consul-kind::before,.oidc.consul-source::before,.oidc.consul-transparent-proxy::before,.oidc.leader::before,.oidc.topology-metrics-source-type::before,.popover-select .oidc button::before,.search-bar-status li.oidc:not(.remove-all)::before,html[data-route^="dc.acls.index"] main td strong.oidc::before,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.oidc::before,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em.oidc::before,span.oidc.policy-node-identity::before,span.oidc.policy-service-identity::before{--icon-name:icon-logo-oidc-color;content:""}@keyframes icon-logo-okta-color{100%{background-image:var(--icon-okta-color-16)}}.oidc-select .okta-oidc-provider::before{--icon-name:icon-logo-okta-color;content:""}@keyframes icon-logo-terraform-color{100%{background-image:var(--icon-terraform-color-16)}}.consul-external-source.terraform::before,.popover-select .terraform button::before{--icon-name:icon-logo-terraform-color;content:""}@keyframes icon-mesh{100%{-webkit-mask-image:var(--icon-mesh-16);mask-image:var(--icon-mesh-16);background-color:var(--icon-color,var(--color-mesh-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.mesh dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.mesh dt::before,.consul-upstream-instance-list li>.detail dl.mesh dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.mesh dt::before{--icon-name:icon-mesh;content:""}@keyframes icon-port{100%{-webkit-mask-image:var(--icon-port-16);mask-image:var(--icon-port-16);background-color:var(--icon-color,var(--color-port-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.port dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.port dt::before,.consul-upstream-instance-list li>.detail dl.port dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.port dt::before{--icon-name:icon-port;content:""}@keyframes icon-protocol{100%{-webkit-mask-image:var(--icon-protocol-16);mask-image:var(--icon-protocol-16);background-color:var(--icon-color,var(--color-protocol-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.protocol dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.protocol dt::before,.consul-upstream-instance-list li>.detail dl.protocol dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.protocol dt::before{--icon-name:icon-protocol;content:""}@keyframes icon-redirect{100%{-webkit-mask-image:var(--icon-redirect-16);mask-image:var(--icon-redirect-16);background-color:var(--icon-color,var(--color-redirect-500,currentColor))}}@keyframes icon-search-color{100%{background-image:var(--icon-search-color-16)}}[for=toolbar-toggle]{--icon-name:icon-search-color;content:""}@keyframes icon-sort{100%{-webkit-mask-image:var(--icon-sort-desc-16);mask-image:var(--icon-sort-desc-16);background-color:var(--icon-color,var(--color-sort-500,currentColor))}}.type-sort.popover-select label>::before{--icon-name:icon-sort;content:""}@keyframes icon-union{100%{-webkit-mask-image:var(--icon-union-16);mask-image:var(--icon-union-16);background-color:var(--icon-color,var(--color-union-500,currentColor))}}#downstream-container .topology-metrics-card .details .group span::before,#upstream-container .topology-metrics-card .details .group span::before{--icon-name:icon-union;content:""}.kubernetes.informed-action header::before{-webkit-mask-image:none;mask-image:none;background-color:var(--transparent)!important}.ember-basic-dropdown{position:relative}.ember-basic-dropdown,.ember-basic-dropdown-content,.ember-basic-dropdown-content *{box-sizing:border-box}.ember-basic-dropdown-content{position:absolute;width:auto;z-index:1000;background-color:#fff}.ember-basic-dropdown-content--left{left:0}.ember-basic-dropdown-content--right{right:0}.ember-basic-dropdown-overlay{position:fixed;background:rgba(0,0,0,.5);width:100%;height:100%;z-index:10;top:0;left:0;pointer-events:none}.ember-basic-dropdown-content-wormhole-origin{display:inline}.ember-power-select-dropdown *{box-sizing:border-box}.ember-power-select-trigger{position:relative;border-radius:4px;background-color:#fff;line-height:1.75;overflow-x:hidden;text-overflow:ellipsis;min-height:1.75em;user-select:none;-webkit-user-select:none;color:inherit}.ember-power-select-trigger:after{content:"";display:table;clear:both}.ember-power-select-trigger--active,.ember-power-select-trigger:focus{box-shadow:none}.ember-basic-dropdown-trigger--below.ember-power-select-trigger[aria-expanded=true],.ember-basic-dropdown-trigger--in-place.ember-power-select-trigger[aria-expanded=true]{border-bottom-left-radius:0;border-bottom-right-radius:0}.ember-basic-dropdown-trigger--above.ember-power-select-trigger[aria-expanded=true]{border-top-left-radius:0;border-top-right-radius:0}.ember-power-select-placeholder{color:#999;display:block;overflow-x:hidden;white-space:nowrap;text-overflow:ellipsis}.ember-power-select-status-icon{position:absolute;display:inline-block;width:0;height:0;top:0;bottom:0;margin:auto;border-style:solid;border-width:7px 4px 0;border-color:#aaa transparent transparent;right:5px}.ember-basic-dropdown-trigger[aria-expanded=true] .ember-power-select-status-icon{transform:rotate(180deg)}.ember-power-select-clear-btn{position:absolute;cursor:pointer;right:25px}.ember-power-select-trigger-multiple-input{font-family:inherit;font-size:inherit;border:none;display:inline-block;line-height:inherit;-webkit-appearance:none;outline:0;padding:0;float:left;background-color:transparent;text-indent:2px}.ember-power-select-trigger-multiple-input:disabled{background-color:#eee}.ember-power-select-trigger-multiple-input::placeholder{opacity:1;color:#999}.ember-power-select-trigger-multiple-input::-webkit-input-placeholder{opacity:1;color:#999}.ember-power-select-trigger-multiple-input::-moz-placeholder{opacity:1;color:#999}.ember-power-select-trigger-multiple-input::-ms-input-placeholder{opacity:1;color:#999}.active.discovery-chain [id*=":"],.discovery-chain path,.ember-power-select-multiple-remove-btn:not(:hover){opacity:.5}.ember-power-select-multiple-options{padding:0;margin:0}.ember-power-select-multiple-option{border:1px solid gray;border-radius:4px;color:#333;background-color:#e4e4e4;padding:0 4px;display:inline-block;line-height:1.45;float:left;margin:2px 0 2px 3px}.ember-power-select-multiple-remove-btn{cursor:pointer}.ember-power-select-search{padding:4px}.ember-power-select-search-input{border:1px solid #aaa;border-radius:0;width:100%;font-size:inherit;line-height:inherit;padding:0 5px}.ember-power-select-search-input:focus{border:1px solid #aaa;box-shadow:none}.ember-power-select-dropdown{border-left:1px solid #aaa;border-right:1px solid #aaa;line-height:1.75;border-radius:4px;box-shadow:none;overflow:hidden;color:inherit}.ember-power-select-dropdown.ember-basic-dropdown-content--above{border-top:1px solid #aaa;border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.ember-power-select-dropdown.ember-basic-dropdown-content--below,.ember-power-select-dropdown.ember-basic-dropdown-content--in-place{border-top:none;border-bottom:1px solid #aaa;border-top-left-radius:0;border-top-right-radius:0}.ember-power-select-dropdown.ember-basic-dropdown-content--in-place{width:100%}.ember-power-select-options{list-style:none;margin:0;padding:0;user-select:none;-webkit-user-select:none}.ember-power-select-placeholder,.ember-power-select-selected-item,a[rel*=external]::after{margin-left:8px}.ember-power-select-options[role=listbox]{overflow-y:auto;-webkit-overflow-scrolling:touch;max-height:12.25em}.ember-power-select-option{cursor:pointer;padding:0 8px}.ember-power-select-group[aria-disabled=true]{color:#999;cursor:not-allowed}.ember-power-select-group[aria-disabled=true] .ember-power-select-option,.ember-power-select-option[aria-disabled=true]{color:#999;pointer-events:none;cursor:not-allowed}.ember-power-select-option[aria-selected=true]{background-color:#ddd}.ember-power-select-option[aria-current=true]{background-color:#5897fb;color:#fff}.ember-power-select-group-name{cursor:default;font-weight:700}.ember-power-select-trigger[aria-disabled=true]{background-color:#eee}.ember-power-select-trigger{padding:0 16px 0 0}.ember-power-select-group .ember-power-select-group .ember-power-select-group-name{padding-left:24px}.ember-power-select-group .ember-power-select-group .ember-power-select-option{padding-left:40px}.ember-power-select-group .ember-power-select-option{padding-left:24px}.ember-power-select-group .ember-power-select-group-name{padding-left:8px}.ember-power-select-trigger[dir=rtl]{padding:0 0 0 16px}.ember-power-select-trigger[dir=rtl] .ember-power-select-placeholder,.ember-power-select-trigger[dir=rtl] .ember-power-select-selected-item{margin-right:8px}.ember-power-select-trigger[dir=rtl] .ember-power-select-multiple-option,.ember-power-select-trigger[dir=rtl] .ember-power-select-trigger-multiple-input{float:right}.ember-power-select-trigger[dir=rtl] .ember-power-select-status-icon{left:5px;right:initial}.ember-power-select-trigger[dir=rtl] .ember-power-select-clear-btn{left:25px;right:initial}.ember-power-select-dropdown[dir=rtl] .ember-power-select-group .ember-power-select-group .ember-power-select-group-name{padding-right:24px}.ember-power-select-dropdown[dir=rtl] .ember-power-select-group .ember-power-select-group .ember-power-select-option{padding-right:40px}.ember-power-select-dropdown[dir=rtl] .ember-power-select-group .ember-power-select-option{padding-right:24px}.ember-power-select-dropdown[dir=rtl] .ember-power-select-group .ember-power-select-group-name{padding-right:8px}#login-toggle+div footer button:focus,#login-toggle+div footer button:hover,.consul-intention-fieldsets .permissions>button:focus,.consul-intention-fieldsets .permissions>button:hover,.empty-state>ul>li>:focus,.empty-state>ul>li>:hover,.empty-state>ul>li>label>button:focus,.empty-state>ul>li>label>button:hover,.modal-dialog [role=document] dd a:focus,.modal-dialog [role=document] dd a:hover,.modal-dialog [role=document] p a:focus,.modal-dialog [role=document] p a:hover,.oidc-select button.reset:focus,.oidc-select button.reset:hover,.search-bar-status .remove-all button:focus,.search-bar-status .remove-all button:hover,label.type-dialog:focus,label.type-dialog:hover,main dd a:focus,main dd a:hover,main p a:focus,main p a:hover{text-decoration:underline}#login-toggle+div footer button,.consul-intention-fieldsets .permissions>button,.empty-state>ul>li>*,.empty-state>ul>li>:active,.empty-state>ul>li>:focus,.empty-state>ul>li>:hover,.empty-state>ul>li>label>button,.empty-state>ul>li>label>button:active,.empty-state>ul>li>label>button:focus,.empty-state>ul>li>label>button:hover,.modal-dialog [role=document] dd a,.modal-dialog [role=document] p a,.oidc-select button.reset,.search-bar-status .remove-all button,label.type-dialog,label.type-dialog:active,label.type-dialog:focus,label.type-dialog:hover,main dd a,main dd a:active,main dd a:focus,main dd a:hover,main p a,main p a:active,main p a:focus,main p a:hover{color:rgb(var(--color-action))}.modal-dialog [role=document] label a[rel*=help],div.with-confirmation p,main label a[rel*=help]{color:rgb(var(--tone-gray-400))}#login-toggle+div footer button,.consul-intention-fieldsets .permissions>button,.empty-state>ul>li>*,.empty-state>ul>li>label>button,.modal-dialog [role=document] dd a,.modal-dialog [role=document] p a,.oidc-select button.reset,.search-bar-status .remove-all button,label.type-dialog,main dd a,main p a{cursor:pointer;background-color:var(--transparent)}#login-toggle+div footer button:active,.consul-intention-fieldsets .permissions>button:active,.empty-state>ul>li>:active,.empty-state>ul>li>label>button:active,.modal-dialog [role=document] dd a:active,.modal-dialog [role=document] p a:active,.oidc-select button.reset:active,.search-bar-status .remove-all button:active,label.type-dialog:active,main dd a:active,main p a:active{outline:0}.modal-dialog [role=document] a[rel*=help]::after,main a[rel*=help]::after{opacity:.4}.modal-dialog [role=document] h2 a,main h2 a{color:rgb(var(--tone-gray-900))}.modal-dialog [role=document] h2 a[rel*=help]::after,main h2 a[rel*=help]::after{font-size:.65em;margin-top:.2em;margin-left:.2em}.tab-section>p:only-child [rel*=help]::after{content:none}.auth-form{width:320px;margin:-20px 25px 0}.auth-form em{color:rgb(var(--tone-gray-500));font-style:normal;display:inline-block;margin-top:1em}.auth-form .oidc-select,.auth-form form{padding-top:1em}.auth-form form{margin-bottom:0!important}.auth-form .ember-basic-dropdown-trigger,.auth-form button:not(.reset){width:100%}.auth-form .progress{margin:0 auto}#login-toggle+div footer button::after{font-size:120%;position:relative;top:-1px;left:-3px}#login-toggle+div footer{border-top:0;padding:10px 42px 20px;background-color:var(--transparent)}#login-toggle+div>div>div>div{padding-bottom:0}.auth-profile{padding:.9em 1em}.auth-profile dt span{font-weight:var(--typo-weight-normal)}.auth-profile dt{font-weight:var(--typo-weight-bold)}.auth-profile dd,.auth-profile dt{color:rgb(var(--tone-gray-800))}.auth-profile dt span{color:rgb(var(--tone-gray-600))}main header nav:first-child ol li a{color:rgb(var(--tone-gray-500));text-decoration:none}main header nav:first-child ol li a:hover{color:rgb(var(--tone-blue-500));text-decoration:underline}main header nav:first-child ol li a::before{text-decoration:none}main header nav:first-child ol>li{list-style-type:none;display:inline-flex}main header nav:first-child ol li:first-child a::before{background-color:rgb(var(--tone-gray-500));margin-right:4px;display:inline-block}main header nav:first-child ol li:not(:first-child) a{margin-left:6px}main header nav:first-child ol li:not(:first-child) a::before{content:"/";color:rgb(var(--tone-gray-500));margin-right:8px;display:inline-block}main header nav:first-child{position:absolute;top:12px}.app-view>div form button[type=button].type-delete,.consul-intention-action-warn-modal button.dangerous,.copy-button button,.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.empty-state div>button,.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button,.informed-action>ul>li>*,.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.modal-dialog .type-delete,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.oidc-select button:not(.reset),.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-select label>*,.topology-notices button,.type-sort.popover-select label>*,.with-confirmation .type-delete,a.type-create,button.type-cancel,button.type-submit,button[type=reset],button[type=submit],header .actions button[type=button]:not(.copy-btn),table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{cursor:pointer;white-space:nowrap;text-decoration:none}.app-view>div form button[type=button].type-delete:disabled,.consul-intention-action-warn-modal button.dangerous:disabled,.copy-button button:disabled,.disclosure-menu [aria-expanded]~*>ul>[role=treeitem]:disabled,.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem]:disabled,.disclosure-menu [aria-expanded]~*>ul>li>[role=option]:disabled,.empty-state div>button:disabled,.hashicorp-consul nav li.nspaces .disclosure-menu>button:disabled,.hashicorp-consul nav li.partitions .disclosure-menu>button:disabled,.informed-action>ul>li>:disabled,.menu-panel>ul>[role=treeitem]:disabled,.menu-panel>ul>li>[role=menuitem]:disabled,.menu-panel>ul>li>[role=option]:disabled,.modal-dialog .type-delete:disabled,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]:disabled,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]:disabled,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option]:disabled,.oidc-select button:disabled:not(.reset),.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]:disabled,.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]:disabled,.popover-menu>[type=checkbox]+label+div>ul>li>[role=option]:disabled,.popover-select label>:disabled,.topology-notices button:disabled,.with-confirmation .type-delete:disabled,a.type-create:disabled,button.type-cancel:disabled,button.type-submit:disabled,button[type=reset]:disabled,button[type=submit]:disabled,header .actions button[type=button]:disabled:not(.copy-btn),table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]:disabled,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]:disabled,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]:disabled,table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]:disabled,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]:disabled,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]:disabled{cursor:default;box-shadow:none}.checkbox-group label,.more-popover-menu>[type=checkbox]~label,.popover-menu>[type=checkbox]~label,html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] label,table.has-actions tr>.actions>[type=checkbox]~label,table.with-details tr>.actions>[type=checkbox]~label{cursor:pointer}.app-view>div form button[type=button].type-delete,.consul-intention-action-warn-modal button.dangerous,.empty-state div>button,.modal-dialog .type-delete,.oidc-select button:not(.reset),.with-confirmation .type-delete,a.type-create,button.type-cancel,button.type-submit,button[type=reset],button[type=submit],header .actions button[type=button]:not(.copy-btn){border-width:1px;border-radius:var(--decor-radius-100);box-shadow:var(--decor-elevation-300)}button.type-cancel:disabled,button[type=reset]:disabled,header .actions button[type=button]:disabled:not(.copy-btn){color:rgb(var(--tone-gray-600))}.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button,.informed-action>ul>li>*,.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{color:rgb(var(--tone-gray-900));background-color:rgb(var(--tone-gray-000))}.disclosure-menu [aria-expanded]~*>ul>[role=treeitem]:focus,.disclosure-menu [aria-expanded]~*>ul>[role=treeitem]:hover,.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem]:focus,.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem]:hover,.disclosure-menu [aria-expanded]~*>ul>li>[role=option]:focus,.disclosure-menu [aria-expanded]~*>ul>li>[role=option]:hover,.hashicorp-consul nav li.nspaces .disclosure-menu>button:focus,.hashicorp-consul nav li.nspaces .disclosure-menu>button:hover,.hashicorp-consul nav li.partitions .disclosure-menu>button:focus,.hashicorp-consul nav li.partitions .disclosure-menu>button:hover,.informed-action>ul>li>:focus,.informed-action>ul>li>:hover,.menu-panel>ul>[role=treeitem]:focus,.menu-panel>ul>[role=treeitem]:hover,.menu-panel>ul>li>[role=menuitem]:focus,.menu-panel>ul>li>[role=menuitem]:hover,.menu-panel>ul>li>[role=option]:focus,.menu-panel>ul>li>[role=option]:hover,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]:focus,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]:hover,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]:focus,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]:hover,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option]:focus,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option]:hover,.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]:focus,.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]:hover,.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]:focus,.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]:hover,.popover-menu>[type=checkbox]+label+div>ul>li>[role=option]:focus,.popover-menu>[type=checkbox]+label+div>ul>li>[role=option]:hover,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]:focus,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]:hover,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]:focus,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]:hover,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]:focus,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]:hover,table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]:focus,table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]:hover,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]:focus,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]:hover,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]:focus,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]:hover{background-color:rgb(var(--tone-gray-050))}.type-sort.popover-select label>::before{position:relative;width:16px;height:16px}.type-sort.popover-select label>::after{top:0!important}.app-view>div form button[type=button].type-delete,.consul-intention-action-warn-modal button.dangerous,.copy-button button,.empty-state div>button,.modal-dialog .type-delete,.oidc-select button:not(.reset),.popover-select label>*,.topology-notices button,.type-sort.popover-select label>*,.with-confirmation .type-delete,a.type-create,button.type-cancel,button.type-submit,button[type=reset],button[type=submit],header .actions button[type=button]:not(.copy-btn){position:relative}.app-view>div form button[type=button].type-delete .progress.indeterminate,.consul-intention-action-warn-modal button.dangerous .progress.indeterminate,.copy-button button .progress.indeterminate,.empty-state div>button .progress.indeterminate,.modal-dialog .type-delete .progress.indeterminate,.oidc-select button:not(.reset) .progress.indeterminate,.popover-select label>* .progress.indeterminate,.topology-notices button .progress.indeterminate,.with-confirmation .type-delete .progress.indeterminate,a.type-create .progress.indeterminate,button.type-cancel .progress.indeterminate,button.type-submit .progress.indeterminate,button[type=reset] .progress.indeterminate,button[type=submit] .progress.indeterminate,header .actions button[type=button]:not(.copy-btn) .progress.indeterminate{position:absolute;top:50%;left:50%;margin-left:-12px;margin-top:-12px}.app-view>div form button[type=button].type-delete:disabled .progress+*,.consul-intention-action-warn-modal button.dangerous:disabled .progress+*,.copy-button button:disabled .progress+*,.empty-state div>button:disabled .progress+*,.modal-dialog .type-delete:disabled .progress+*,.oidc-select button:disabled:not(.reset) .progress+*,.popover-select label>:disabled .progress+*,.topology-notices button:disabled .progress+*,.with-confirmation .type-delete:disabled .progress+*,a.type-create:disabled .progress+*,button.type-cancel:disabled .progress+*,button.type-submit:disabled .progress+*,button[type=reset]:disabled .progress+*,button[type=submit]:disabled .progress+*,header .actions button[type=button]:disabled:not(.copy-btn) .progress+*{visibility:hidden}.app-view>div form button[type=button].type-delete:empty,.consul-intention-action-warn-modal button.dangerous:empty,.copy-button button:empty,.empty-state div>button:empty,.modal-dialog .type-delete:empty,.oidc-select button:empty:not(.reset),.popover-select label>:empty,.topology-notices button:empty,.with-confirmation .type-delete:empty,a.type-create:empty,button.type-cancel:empty,button.type-submit:empty,button[type=reset]:empty,button[type=submit]:empty,header .actions button[type=button]:empty:not(.copy-btn){padding-right:0!important;padding-left:18px!important;margin-right:5px}.app-view>div form button[type=button].type-delete:empty::before,.consul-intention-action-warn-modal button.dangerous:empty::before,.copy-button button:empty::before,.empty-state div>button:empty::before,.modal-dialog .type-delete:empty::before,.oidc-select button:empty:not(.reset)::before,.popover-select label>:empty::before,.topology-notices button:empty::before,.with-confirmation .type-delete:empty::before,a.type-create:empty::before,button.type-cancel:empty::before,button.type-submit:empty::before,button[type=reset]:empty::before,button[type=submit]:empty::before,header .actions button[type=button]:empty:not(.copy-btn)::before{left:1px}.app-view>div form button[type=button].type-delete:not(:empty),.consul-intention-action-warn-modal button.dangerous:not(:empty),.copy-button button:not(:empty),.empty-state div>button:not(:empty),.modal-dialog .type-delete:not(:empty),.oidc-select button:not(:empty):not(.reset),.popover-select label>:not(:empty),.topology-notices button:not(:empty),.with-confirmation .type-delete:not(:empty),a.type-create:not(:empty),button.type-cancel:not(:empty),button.type-submit:not(:empty),button[type=reset]:not(:empty),button[type=submit]:not(:empty),header .actions button[type=button]:not(:empty):not(.copy-btn){display:inline-flex;text-align:center;justify-content:center;align-items:center;padding:calc(.5em - 1px) calc(2.2em - 1px);min-width:100px}.app-view>div form button[type=button].type-delete:not(:last-child),.consul-intention-action-warn-modal button.dangerous:not(:last-child),.copy-button button:not(:last-child),.empty-state div>button:not(:last-child),.modal-dialog .type-delete:not(:last-child),.oidc-select button:not(:last-child):not(.reset),.popover-select label>:not(:last-child),.topology-notices button:not(:last-child),.with-confirmation .type-delete:not(:last-child),a.type-create:not(:last-child),button.type-cancel:not(:last-child),button.type-submit:not(:last-child),button[type=reset]:not(:last-child),button[type=submit]:not(:last-child),header .actions button[type=button]:not(:last-child):not(.copy-btn){margin-right:8px}.app-view>header .actions a,.app-view>header .actions button{padding-top:calc(.4em - 1px)!important;padding-bottom:calc(.4em - 1px)!important}.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button,.informed-action>ul>li>*,.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{padding:.9em 1em;text-align:center;display:inline-block;box-sizing:border-box}.type-sort.popover-select label>*{height:35px!important}.discovery-chain .resolver-card,.discovery-chain .route-card,.discovery-chain .splitter-card{border:var(--decor-border-100);border-radius:var(--decor-radius-100);background-color:rgb(var(--tone-gray-000) /90%);display:block;position:relative}.discovery-chain .resolver-card>section,.discovery-chain .resolver-card>ul>li,.discovery-chain .route-card>section,.discovery-chain .route-card>ul>li,.discovery-chain .splitter-card>section,.discovery-chain .splitter-card>ul>li{border-top:var(--decor-border-100)}.discovery-chain .resolver-card,.discovery-chain .resolver-card>section,.discovery-chain .resolver-card>ul>li,.discovery-chain .route-card,.discovery-chain .route-card>section,.discovery-chain .route-card>ul>li,.discovery-chain .splitter-card,.discovery-chain .splitter-card>section,.discovery-chain .splitter-card>ul>li{border-color:rgb(var(--tone-gray-200))}.discovery-chain .resolver-card:focus,.discovery-chain .resolver-card:hover,.discovery-chain .route-card:focus,.discovery-chain .route-card:hover,.discovery-chain .splitter-card:focus,.discovery-chain .splitter-card:hover{box-shadow:var(--decor-elevation-400)}.discovery-chain .resolver-card>header,.discovery-chain .route-card>header,.discovery-chain .splitter-card>header{padding:10px}.discovery-chain .resolver-card>section,.discovery-chain .resolver-card>ul>li,.discovery-chain .route-card>section,.discovery-chain .route-card>ul>li,.discovery-chain .splitter-card>section,.discovery-chain .splitter-card>ul>li{padding:5px 10px}.discovery-chain .resolver-card ul,.discovery-chain .route-card ul,.discovery-chain .splitter-card ul{list-style-type:none;margin:0;padding:0}.checkbox-group label{margin-right:10px;white-space:nowrap}.checkbox-group span{display:inline-block;margin-left:10px;min-width:50px}.CodeMirror{max-width:1260px;min-height:300px;height:auto;padding-bottom:20px}.CodeMirror-scroll{overflow-x:hidden!important}.CodeMirror-lint-tooltip{background-color:#f9f9fa;border:1px solid var(--syntax-light-gray);border-radius:0;color:#212121;font-size:13px;padding:7px 8px 9px}.cm-s-hashi.CodeMirror{width:100%;background-color:rgb(var(--tone-gray-999))!important;color:#cfd2d1!important;border:none;-webkit-font-smoothing:auto;line-height:1.4}.cm-s-hashi .CodeMirror-gutters{color:var(--syntax-dark-grey);background-color:var(--syntax-gutter-grey);border:none}.cm-s-hashi .CodeMirror-cursor{border-left:solid thin #f8f8f0}.cm-s-hashi .CodeMirror-linenumber{color:#6d8a88}.cm-s-hashi.CodeMirror-focused div.CodeMirror-selected{background:#214283}.cm-s-hashi .CodeMirror-line::selection,.cm-s-hashi .CodeMirror-line>span::selection,.cm-s-hashi .CodeMirror-line>span>span::selection{background:#214283}.cm-s-hashi .CodeMirror-line::-moz-selection,.cm-s-hashi .CodeMirror-line>span::-moz-selection,.cm-s-hashi .CodeMirror-line>span>span::-moz-selection{background:rgb(var(--tone-gray-000) /10%)}.cm-s-hashi span.cm-comment{color:var(--syntax-light-grey)}.cm-s-hashi span.cm-string,.cm-s-hashi span.cm-string-2{color:var(--syntax-packer)}.cm-s-hashi span.cm-number{color:var(--syntax-serf)}.cm-s-hashi span.cm-variable,.cm-s-hashi span.cm-variable-2{color:#9e84c5}.cm-s-hashi span.cm-def{color:var(--syntax-packer)}.cm-s-hashi span.cm-operator{color:var(--syntax-gray)}.cm-s-hashi span.cm-keyword{color:var(--syntax-yellow)}.cm-s-hashi span.cm-atom{color:var(--syntax-serf)}.cm-s-hashi span.cm-meta,.cm-s-hashi span.cm-tag{color:var(--syntax-packer)}.cm-s-hashi span.cm-error{color:var(--syntax-red)}.cm-s-hashi span.cm-attribute,.cm-s-hashi span.cm-qualifier{color:#9fca56}.cm-s-hashi span.cm-property{color:#9e84c5}.cm-s-hashi span.cm-builtin,.cm-s-hashi span.cm-variable-3{color:#9fca56}.cm-s-hashi .CodeMirror-activeline-background{background:#101213}.cm-s-hashi .CodeMirror-matchingbracket{text-decoration:underline;color:rgb(var(--tone-gray-000))!important}.readonly-codemirror .CodeMirror-cursors{display:none}.readonly-codemirror .cm-s-hashi span{color:var(--syntax-light-grey)}.readonly-codemirror .cm-s-hashi span.cm-string,.readonly-codemirror .cm-s-hashi span.cm-string-2{color:var(--syntax-faded-gray)}.readonly-codemirror .cm-s-hashi span.cm-number{color:#a3acbc}.app .skip-links,.readonly-codemirror .cm-s-hashi span.cm-property{color:rgb(var(--tone-gray-000))}.readonly-codemirror .cm-s-hashi span.cm-variable-2{color:var(--syntax-light-grey-blue)}.code-editor .toolbar-container{background:rgb(var(--tone-gray-050));background:linear-gradient(180deg,rgb(var(--tone-gray-050)) 50%,rgb(var(--tone-gray-150)) 100%);border:1px solid;border-bottom-color:rgb(var(--tone-gray-600));border-top-color:rgb(var(--tone-gray-400))}.code-editor .toolbar-container .toolbar .title{color:rgb(var(--tone-gray-900));font-size:14px;font-weight:700;padding:0 8px}.code-editor .toolbar-container .toolbar .toolbar-separator{border-right:1px solid rgb(var(--tone-gray-300))}.code-editor .toolbar-container .ember-power-select-trigger{background-color:rgb(var(--tone-gray-000));color:rgb(var(--tone-gray-999));border-radius:var(--decor-radius-100);border:var(--decor-border-100);border-color:rgb(var(--tone-gray-700))}.code-editor::after,.consul-auth-method-binding-list dl dd .copy-button button::before,.consul-auth-method-view dl dd .copy-button button::before{background-color:rgb(var(--tone-gray-999))}.code-editor{display:block;border:10px;overflow:hidden;position:relative;clear:both}.code-editor::after{position:absolute;bottom:0;width:100%;height:25px;content:"";display:block}.code-editor>pre{display:none}.code-editor .toolbar-container,.code-editor .toolbar-container .toolbar{align-items:center;justify-content:space-between;display:flex}.code-editor .toolbar-container{position:relative;margin-top:4px;height:44px}.code-editor .toolbar-container .toolbar{flex:1;white-space:nowrap}.code-editor .toolbar-container .toolbar .toolbar-separator{height:32px;margin:0 4px;width:0}.code-editor .toolbar-container .toolbar .tools{display:flex;flex-direction:row;margin:0 10px;align-items:center}.code-editor .toolbar-container .toolbar .tools .copy-button{margin-left:10px}.code-editor .toolbar-container .ember-basic-dropdown-trigger{margin:0 8px;width:120px;height:32px;display:flex;align-items:center;flex-direction:row}.consul-exposed-path-list>ul>li,.consul-lock-session-list ul>li:not(:first-child),.consul-upstream-instance-list li,.list-collection>ul>li:not(:first-child){display:grid;grid-template-columns:1fr auto;grid-template-rows:50% 50%;grid-template-areas:"header actions" "detail actions"}.consul-exposed-path-list>ul>li>.header,.consul-lock-session-list ul>li:not(:first-child)>.header,.consul-upstream-instance-list li>.header,.list-collection>ul>li:not(:first-child)>.header{grid-area:header;align-self:start}.consul-exposed-path-list>ul>li>.detail,.consul-lock-session-list ul>li:not(:first-child)>.detail,.consul-upstream-instance-list li>.detail,.list-collection>ul>li:not(:first-child)>.detail{grid-area:detail;align-self:end}.consul-exposed-path-list>ul>li>.detail *,.consul-lock-session-list ul>li:not(:first-child)>.detail *,.consul-upstream-instance-list li>.detail *,.list-collection>ul>li:not(:first-child)>.detail *{flex-wrap:nowrap!important}.consul-exposed-path-list>ul>li>.actions,.consul-lock-session-list ul>li:not(:first-child)>.actions,.consul-upstream-instance-list li>.actions,.list-collection>ul>li:not(:first-child)>.actions{grid-area:actions;display:inline-flex}.consul-nspace-list>ul>li:not(:first-child) dt,.consul-policy-list>ul li:not(:first-child) dl:not(.datacenter) dt,.consul-role-list>ul>li:not(:first-child) dt,.consul-service-instance-list .port dt,.consul-service-instance-list .port dt::before,.consul-token-list>ul>li:not(:first-child) dt{display:none}.consul-exposed-path-list>ul>li>.header:nth-last-child(2),.consul-lock-session-list ul>li:not(:first-child)>.header:nth-last-child(2),.consul-upstream-instance-list li>.header:nth-last-child(2),.list-collection>ul>li:not(:first-child)>.header:nth-last-child(2){grid-column-start:header;grid-column-end:actions}.consul-exposed-path-list>ul>li>.detail:last-child,.consul-lock-session-list ul>li:not(:first-child)>.detail:last-child,.consul-upstream-instance-list li>.detail:last-child,.list-collection>ul>li:not(:first-child)>.detail:last-child{grid-column-start:detail;grid-column-end:actions}.consul-nspace-list>ul>li:not(:first-child) dt+dd,.consul-policy-list>ul li:not(:first-child) dl:not(.datacenter) dt+dd,.consul-role-list>ul>li:not(:first-child) dt+dd,.consul-token-list>ul>li:not(:first-child) dt+dd{margin-left:0!important}.consul-policy-list dl.datacenter dt,.consul-service-list li>div:first-child>dl:first-child dd{margin-top:1px}.app-view>div form:not(.filter-bar) [role=radiogroup] label>em,.consul-exposed-path-list>ul>li>.detail .copy-button,.consul-lock-session-list ul>li:not(:first-child)>.detail .copy-button,.consul-upstream-instance-list li>.detail .copy-button,.list-collection>ul>li:not(:first-child)>.detail .copy-button,.modal-dialog [role=document] .type-password>em,.modal-dialog [role=document] .type-select>em,.modal-dialog [role=document] .type-text>em,.modal-dialog [role=document] [role=radiogroup] label>em,.modal-dialog [role=document] form button+em,.oidc-select label>em,.type-toggle>em,main .type-password>em,main .type-select>em,main .type-text>em,main form button+em{margin-top:2px}.consul-service-instance-list .detail,.consul-service-list .detail{overflow-x:visible!important}.consul-intention-permission-list>ul{border-top:1px solid rgb(var(--tone-gray-200))}.consul-service-instance-list .port .copy-button{margin-right:0}.consul-exposed-path-list>ul>li .copy-button,.consul-lock-session-list ul>li:not(:first-child) .copy-button,.consul-upstream-instance-list li .copy-button,.list-collection>ul>li:not(:first-child) .copy-button{display:inline-flex}.consul-exposed-path-list>ul>li>.header .copy-button,.consul-lock-session-list ul>li:not(:first-child)>.header .copy-button,.consul-upstream-instance-list li>.header .copy-button,.list-collection>ul>li:not(:first-child)>.header .copy-button{margin-left:4px}.consul-exposed-path-list>ul>li .copy-button button,.consul-lock-session-list ul>li:not(:first-child) .copy-button button,.consul-upstream-instance-list li .copy-button button,.list-collection>ul>li:not(:first-child) .copy-button button{padding:0!important;margin:0!important}.consul-exposed-path-list>ul>li>.header .copy-button button,.consul-lock-session-list ul>li:not(:first-child)>.header .copy-button button,.consul-upstream-instance-list li>.header .copy-button button,.list-collection>ul>li:not(:first-child)>.header .copy-button button{display:none}.consul-exposed-path-list>ul>li>.header:hover .copy-button button,.consul-lock-session-list ul>li:not(:first-child)>.header:hover .copy-button button,.consul-upstream-instance-list li>.header:hover .copy-button button,.list-collection>ul>li:not(:first-child)>.header:hover .copy-button button{display:block}.consul-exposed-path-list>ul>li .copy-button button:hover,.consul-lock-session-list ul>li:not(:first-child) .copy-button button:hover,.consul-upstream-instance-list li .copy-button button:hover,.list-collection>ul>li:not(:first-child) .copy-button button:hover{background-color:transparent!important}.consul-exposed-path-list>ul>li>.detail>.consul-external-source:first-child,.consul-exposed-path-list>ul>li>.detail>.consul-kind:first-child,.consul-lock-session-list ul>li:not(:first-child)>.detail>.consul-external-source:first-child,.consul-lock-session-list ul>li:not(:first-child)>.detail>.consul-kind:first-child,.consul-upstream-instance-list li>.detail>.consul-external-source:first-child,.consul-upstream-instance-list li>.detail>.consul-kind:first-child,.list-collection>ul>li:not(:first-child)>.detail>.consul-external-source:first-child,.list-collection>ul>li:not(:first-child)>.detail>.consul-kind:first-child{margin-left:-5px}.consul-exposed-path-list>ul>li>.detail .policy-management::before,.consul-exposed-path-list>ul>li>.detail .policy::before,.consul-exposed-path-list>ul>li>.detail .role::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .policy-management::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .policy::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .role::before,.consul-upstream-instance-list li>.detail .policy-management::before,.consul-upstream-instance-list li>.detail .policy::before,.consul-upstream-instance-list li>.detail .role::before,.list-collection>ul>li:not(:first-child)>.detail .policy-management::before,.list-collection>ul>li:not(:first-child)>.detail .policy::before,.list-collection>ul>li:not(:first-child)>.detail .role::before{margin-right:3px}.consul-exposed-path-list>ul>li>.detail .policy-management::before,.consul-exposed-path-list>ul>li>.header .policy-management dd::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .policy-management::before,.consul-lock-session-list ul>li:not(:first-child)>.header .policy-management dd::before,.consul-upstream-instance-list li>.detail .policy-management::before,.consul-upstream-instance-list li>.header .policy-management dd::before,.list-collection>ul>li:not(:first-child)>.detail .policy-management::before,.list-collection>ul>li:not(:first-child)>.header .policy-management dd::before{--icon-color:rgb(var(--tone-brand-600))}table div.with-confirmation.confirming{background-color:rgb(var(--tone-gray-000))}div.with-confirmation p{margin-right:12px;padding-left:12px;margin-bottom:0!important}div.with-confirmation{float:right;display:flex;align-items:center}table td>div.with-confirmation.confirming{position:absolute;right:0}@media (max-width:420px){div.with-confirmation{float:none;margin-top:1em;display:block}div.with-confirmation p{margin-bottom:1em}}.copy-button button{color:rgb(var(--tone-blue-500));--icon-color:var(--transparent);min-height:17px}.copy-button button::after{--icon-color:rgb(var(--tone-gray-050))}.copy-button button:focus,.copy-button button:hover:not(:disabled):not(:active){color:rgb(var(--tone-blue-500));--icon-color:rgb(var(--tone-gray-050))}.copy-button button:hover::before{--icon-color:rgb(var(--tone-blue-500))}.copy-button button:active{--icon-color:rgb(var(--tone-gray-200))}.copy-button button:empty{padding:0!important;margin-right:0;top:-1px}.copy-button button:empty::after{content:"";display:none;position:absolute;top:-2px;left:-3px;width:20px;height:22px}.copy-button button:empty:hover::after{display:block}.copy-button button:empty::before{position:relative;z-index:1}.copy-button button:not(:empty)::before{margin-right:4px}.consul-bucket-list .copy-button,.consul-exposed-path-list>ul>li>.detail dl .copy-button,.consul-instance-checks .copy-button,.consul-lock-session-list dl .copy-button,.consul-lock-session-list ul>li:not(:first-child)>.detail dl .copy-button,.consul-upstream-instance-list dl .copy-button,.list-collection>ul>li:not(:first-child)>.detail dl .copy-button,.tag-list .copy-button,section[data-route="dc.show.license"] .validity dl .copy-button,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .copy-button,td.tags .copy-button{margin-top:0!important}.consul-bucket-list .copy-btn,.consul-exposed-path-list>ul>li>.detail dl .copy-btn,.consul-instance-checks .copy-btn,.consul-lock-session-list dl .copy-btn,.consul-lock-session-list ul>li:not(:first-child)>.detail dl .copy-btn,.consul-upstream-instance-list dl .copy-btn,.list-collection>ul>li:not(:first-child)>.detail dl .copy-btn,.tag-list .copy-btn,section[data-route="dc.show.license"] .validity dl .copy-btn,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .copy-btn,td.tags .copy-btn{top:0!important}.consul-bucket-list .copy-btn:empty::before,.consul-exposed-path-list>ul>li>.detail dl .copy-btn:empty::before,.consul-instance-checks .copy-btn:empty::before,.consul-lock-session-list dl .copy-btn:empty::before,.consul-upstream-instance-list dl .copy-btn:empty::before,.list-collection>ul>li:not(:first-child)>.detail dl .copy-btn:empty::before,.tag-list .copy-btn:empty::before,section[data-route="dc.show.license"] .validity dl .copy-btn:empty::before,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .copy-btn:empty::before,td.tags .copy-btn:empty::before{left:0!important}.definition-table>dl{display:grid;grid-template-columns:140px auto;grid-gap:.4em 20px;margin-bottom:1.4em}.definition-table>dl>dd>:not(dl){display:inline-block}.disclosure-menu{position:relative}.disclosure-menu [aria-expanded]~*{overflow-y:auto!important;will-change:scrollPosition}.more-popover-menu>[type=checkbox],.more-popover-menu>[type=checkbox]~:not(.animating):not(label),.popover-menu>[type=checkbox],.popover-menu>[type=checkbox]~:not(.animating):not(label),table.has-actions tr>.actions>[type=checkbox],table.has-actions tr>.actions>[type=checkbox]~:not(.animating):not(label),table.with-details tr>.actions>[type=checkbox],table.with-details tr>.actions>[type=checkbox]~:not(.animating):not(label){display:none}.more-popover-menu>[type=checkbox]:checked~:not(label),.popover-menu>[type=checkbox]:checked~:not(label),table.has-actions tr>.actions>[type=checkbox]:checked~:not(label),table.with-details tr>.actions>[type=checkbox]:checked~:not(label){display:block}table.dom-recycling{position:relative}table.dom-recycling tr>*{overflow:hidden}.list-collection-scroll-virtual>ul,table.dom-recycling tbody{overflow-x:hidden!important}table.dom-recycling dd{flex-wrap:nowrap}table.dom-recycling dd>*{margin-bottom:0}.empty-state,.empty-state>div{display:flex;flex-direction:column}.empty-state header :first-child{padding:0;margin:0}.empty-state{margin-top:0!important;padding-bottom:2.8em;color:rgb(var(--tone-gray-500));background-color:rgb(var(--tone-gray-010))}.empty-state>*{width:370px;margin:0 auto}.empty-state button{margin:0 auto;display:inline}.empty-state header :first-child{margin-bottom:-3px;border-bottom:none}.empty-state header{margin-top:1.8em;margin-bottom:.5em}.empty-state>ul{display:flex;justify-content:space-between;margin-top:1em}.empty-state>ul>li>*,.empty-state>ul>li>label>button{display:inline-flex;align-items:center}.empty-state>div:only-child{padding:50px 0 10px;text-align:center}.empty-state header::before{font-size:2.6em;position:relative;top:-3px;float:left;margin-right:10px}.empty-state>ul>li>::before,.empty-state>ul>li>label>button::before{margin-top:-1px;margin-right:.5em;font-size:.9em}.empty-state li[class*=-link]>::after{margin-left:5px}html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup]{border:var(--decor-border-100);border-color:rgb(var(--tone-gray-300));border-radius:var(--decor-radius-100)}html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] input[type=radio]:checked+*,html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] input[type=radio]:focus+*,html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] input[type=radio]:hover+*{box-shadow:var(--decor-elevation-300);background-color:rgb(var(--tone-gray-000))}@media (min-width:996px){html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup]{display:flex}html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] label{flex-grow:1}}html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] input[type=radio]{display:none}.app-view>div form:not(.filter-bar) [role=radiogroup] label,.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea,.app-view>div form:not(.filter-bar) [role=radiogroup] label>em,.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.modal-dialog [role=document] .type-password,.modal-dialog [role=document] .type-password textarea,.modal-dialog [role=document] .type-password>em,.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select,.modal-dialog [role=document] .type-select textarea,.modal-dialog [role=document] .type-select>em,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text,.modal-dialog [role=document] .type-text textarea,.modal-dialog [role=document] .type-text>em,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label,.modal-dialog [role=document] [role=radiogroup] label textarea,.modal-dialog [role=document] [role=radiogroup] label>em,.modal-dialog [role=document] [role=radiogroup] label>span,.modal-dialog [role=document] form button+em,.oidc-select label,.oidc-select label textarea,.oidc-select label>em,.oidc-select label>span,.type-toggle,.type-toggle textarea,.type-toggle>em,.type-toggle>span,html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] label,html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] label span,main .type-password,main .type-password textarea,main .type-password>em,main .type-password>span,main .type-select,main .type-select textarea,main .type-select>em,main .type-select>span,main .type-text,main .type-text textarea,main .type-text>em,main .type-text>span,main form button+em,span.label{display:block}html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup],html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] label,html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] label span{height:100%}html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] label span{padding:5px 14px}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password],.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text],.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea,.modal-dialog [role=document] .type-password [type=password],.modal-dialog [role=document] .type-password [type=text],.modal-dialog [role=document] .type-password textarea,.modal-dialog [role=document] .type-select [type=password],.modal-dialog [role=document] .type-select [type=text],.modal-dialog [role=document] .type-select textarea,.modal-dialog [role=document] .type-text [type=password],.modal-dialog [role=document] .type-text [type=text],.modal-dialog [role=document] .type-text textarea,.modal-dialog [role=document] [role=radiogroup] label [type=password],.modal-dialog [role=document] [role=radiogroup] label [type=text],.modal-dialog [role=document] [role=radiogroup] label textarea,.oidc-select label [type=password],.oidc-select label [type=text],.oidc-select label textarea,.type-toggle [type=password],.type-toggle [type=text],.type-toggle textarea,main .type-password [type=password],main .type-password [type=text],main .type-password textarea,main .type-select [type=password],main .type-select [type=text],main .type-select textarea,main .type-text [type=password],main .type-text [type=text],main .type-text textarea{-moz-appearance:none;-webkit-appearance:none;box-shadow:inset var(--decor-elevation-100);border-radius:var(--decor-radius-100);border:var(--decor-border-100);outline:0}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password]:disabled,.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password]:read-only,.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text]:disabled,.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text]:read-only,.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea:disabled,.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea:read-only,.modal-dialog [role=document] .type-password [type=password]:disabled,.modal-dialog [role=document] .type-password [type=password]:read-only,.modal-dialog [role=document] .type-password [type=text]:disabled,.modal-dialog [role=document] .type-password [type=text]:read-only,.modal-dialog [role=document] .type-password textarea:disabled,.modal-dialog [role=document] .type-password textarea:read-only,.modal-dialog [role=document] .type-select [type=password]:disabled,.modal-dialog [role=document] .type-select [type=password]:read-only,.modal-dialog [role=document] .type-select [type=text]:disabled,.modal-dialog [role=document] .type-select [type=text]:read-only,.modal-dialog [role=document] .type-select textarea:disabled,.modal-dialog [role=document] .type-select textarea:read-only,.modal-dialog [role=document] .type-text [type=password]:disabled,.modal-dialog [role=document] .type-text [type=password]:read-only,.modal-dialog [role=document] .type-text [type=text]:disabled,.modal-dialog [role=document] .type-text [type=text]:read-only,.modal-dialog [role=document] .type-text textarea:disabled,.modal-dialog [role=document] .type-text textarea:read-only,.modal-dialog [role=document] [role=radiogroup] label [type=password]:disabled,.modal-dialog [role=document] [role=radiogroup] label [type=password]:read-only,.modal-dialog [role=document] [role=radiogroup] label [type=text]:disabled,.modal-dialog [role=document] [role=radiogroup] label [type=text]:read-only,.modal-dialog [role=document] [role=radiogroup] label textarea:disabled,.modal-dialog [role=document] [role=radiogroup] label textarea:read-only,.oidc-select label [type=password]:disabled,.oidc-select label [type=password]:read-only,.oidc-select label [type=text]:disabled,.oidc-select label [type=text]:read-only,.oidc-select label textarea:disabled,.oidc-select label textarea:read-only,.type-toggle [type=password]:disabled,.type-toggle [type=password]:read-only,.type-toggle [type=text]:disabled,.type-toggle [type=text]:read-only,.type-toggle textarea:disabled,.type-toggle textarea:read-only,main .type-password [type=password]:disabled,main .type-password [type=password]:read-only,main .type-password [type=text]:disabled,main .type-password [type=text]:read-only,main .type-password textarea:disabled,main .type-password textarea:read-only,main .type-select [type=password]:disabled,main .type-select [type=password]:read-only,main .type-select [type=text]:disabled,main .type-select [type=text]:read-only,main .type-select textarea:disabled,main .type-select textarea:read-only,main .type-text [type=password]:disabled,main .type-text [type=password]:read-only,main .type-text [type=text]:disabled,main .type-text [type=text]:read-only,main .type-text textarea:disabled,main .type-text textarea:read-only,textarea:disabled+.CodeMirror{cursor:not-allowed}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password]::placeholder,.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text]::placeholder,.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea::placeholder,.app-view>div form:not(.filter-bar) [role=radiogroup] label>em,.modal-dialog [role=document] .type-password [type=password]::placeholder,.modal-dialog [role=document] .type-password [type=text]::placeholder,.modal-dialog [role=document] .type-password textarea::placeholder,.modal-dialog [role=document] .type-password>em,.modal-dialog [role=document] .type-select [type=password]::placeholder,.modal-dialog [role=document] .type-select [type=text]::placeholder,.modal-dialog [role=document] .type-select textarea::placeholder,.modal-dialog [role=document] .type-select>em,.modal-dialog [role=document] .type-text [type=password]::placeholder,.modal-dialog [role=document] .type-text [type=text]::placeholder,.modal-dialog [role=document] .type-text textarea::placeholder,.modal-dialog [role=document] .type-text>em,.modal-dialog [role=document] [role=radiogroup] label [type=password]::placeholder,.modal-dialog [role=document] [role=radiogroup] label [type=text]::placeholder,.modal-dialog [role=document] [role=radiogroup] label textarea::placeholder,.modal-dialog [role=document] [role=radiogroup] label>em,.modal-dialog [role=document] form button+em,.modal-dialog [role=document] form fieldset>p,.oidc-select label [type=password]::placeholder,.oidc-select label [type=text]::placeholder,.oidc-select label textarea::placeholder,.oidc-select label>em,.type-toggle [type=password]::placeholder,.type-toggle [type=text]::placeholder,.type-toggle textarea::placeholder,.type-toggle>em,main .type-password [type=password]::placeholder,main .type-password [type=text]::placeholder,main .type-password textarea::placeholder,main .type-password>em,main .type-select [type=password]::placeholder,main .type-select [type=text]::placeholder,main .type-select textarea::placeholder,main .type-select>em,main .type-text [type=password]::placeholder,main .type-text [type=text]::placeholder,main .type-text textarea::placeholder,main .type-text>em,main form button+em,main form fieldset>p{color:rgb(var(--tone-gray-400))}.has-error>input,.has-error>textarea{border-color:var(--decor-error-500,rgb(var(--tone-red-500)))!important}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password],.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text],.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea,.modal-dialog [role=document] .type-password [type=password],.modal-dialog [role=document] .type-password [type=text],.modal-dialog [role=document] .type-password textarea,.modal-dialog [role=document] .type-select [type=password],.modal-dialog [role=document] .type-select [type=text],.modal-dialog [role=document] .type-select textarea,.modal-dialog [role=document] .type-text [type=password],.modal-dialog [role=document] .type-text [type=text],.modal-dialog [role=document] .type-text textarea,.modal-dialog [role=document] [role=radiogroup] label [type=password],.modal-dialog [role=document] [role=radiogroup] label [type=text],.modal-dialog [role=document] [role=radiogroup] label textarea,.oidc-select label [type=password],.oidc-select label [type=text],.oidc-select label textarea,.type-toggle [type=password],.type-toggle [type=text],.type-toggle textarea,main .type-password [type=password],main .type-password [type=text],main .type-password textarea,main .type-select [type=password],main .type-select [type=text],main .type-select textarea,main .type-text [type=password],main .type-text [type=text],main .type-text textarea{color:rgb(var(--tone-gray-500));border-color:rgb(var(--tone-gray-300))}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password]:hover,.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text]:hover,.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea:hover,.modal-dialog [role=document] .type-password [type=password]:hover,.modal-dialog [role=document] .type-password [type=text]:hover,.modal-dialog [role=document] .type-password textarea:hover,.modal-dialog [role=document] .type-select [type=password]:hover,.modal-dialog [role=document] .type-select [type=text]:hover,.modal-dialog [role=document] .type-select textarea:hover,.modal-dialog [role=document] .type-text [type=password]:hover,.modal-dialog [role=document] .type-text [type=text]:hover,.modal-dialog [role=document] .type-text textarea:hover,.modal-dialog [role=document] [role=radiogroup] label [type=password]:hover,.modal-dialog [role=document] [role=radiogroup] label [type=text]:hover,.modal-dialog [role=document] [role=radiogroup] label textarea:hover,.oidc-select label [type=password]:hover,.oidc-select label [type=text]:hover,.oidc-select label textarea:hover,.type-toggle [type=password]:hover,.type-toggle [type=text]:hover,.type-toggle textarea:hover,main .type-password [type=password]:hover,main .type-password [type=text]:hover,main .type-password textarea:hover,main .type-select [type=password]:hover,main .type-select [type=text]:hover,main .type-select textarea:hover,main .type-text [type=password]:hover,main .type-text [type=text]:hover,main .type-text textarea:hover{border-color:rgb(var(--tone-gray-500))}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password]:focus,.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text]:focus,.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea:focus,.modal-dialog [role=document] .type-password [type=password]:focus,.modal-dialog [role=document] .type-password [type=text]:focus,.modal-dialog [role=document] .type-password textarea:focus,.modal-dialog [role=document] .type-select [type=password]:focus,.modal-dialog [role=document] .type-select [type=text]:focus,.modal-dialog [role=document] .type-select textarea:focus,.modal-dialog [role=document] .type-text [type=password]:focus,.modal-dialog [role=document] .type-text [type=text]:focus,.modal-dialog [role=document] .type-text textarea:focus,.modal-dialog [role=document] [role=radiogroup] label [type=password]:focus,.modal-dialog [role=document] [role=radiogroup] label [type=text]:focus,.modal-dialog [role=document] [role=radiogroup] label textarea:focus,.oidc-select label [type=password]:focus,.oidc-select label [type=text]:focus,.oidc-select label textarea:focus,.type-toggle [type=password]:focus,.type-toggle [type=text]:focus,.type-toggle textarea:focus,main .type-password [type=password]:focus,main .type-password [type=text]:focus,main .type-password textarea:focus,main .type-select [type=password]:focus,main .type-select [type=text]:focus,main .type-select textarea:focus,main .type-text [type=password]:focus,main .type-text [type=text]:focus,main .type-text textarea:focus{border-color:var(--typo-action-500,rgb(var(--tone-blue-500)))}.app-view>div form:not(.filter-bar) [role=radiogroup] label a,.modal-dialog [role=document] .type-password a,.modal-dialog [role=document] .type-select a,.modal-dialog [role=document] .type-text a,.modal-dialog [role=document] [role=radiogroup] label a,.oidc-select label a,.type-toggle a,main .type-password a,main .type-select a,main .type-text a{display:inline}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password],.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text],.modal-dialog [role=document] .type-password [type=password],.modal-dialog [role=document] .type-password [type=text],.modal-dialog [role=document] .type-select [type=password],.modal-dialog [role=document] .type-select [type=text],.modal-dialog [role=document] .type-text [type=password],.modal-dialog [role=document] .type-text [type=text],.modal-dialog [role=document] [role=radiogroup] label [type=password],.modal-dialog [role=document] [role=radiogroup] label [type=text],.oidc-select label [type=password],.oidc-select label [type=text],.type-toggle [type=password],.type-toggle [type=text],main .type-password [type=password],main .type-password [type=text],main .type-select [type=password],main .type-select [type=text],main .type-text [type=password],main .type-text [type=text]{display:inline-flex;justify-content:flex-start;max-width:100%;width:100%;height:0;padding:17px 13px}.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea,.modal-dialog [role=document] .type-password textarea,.modal-dialog [role=document] .type-select textarea,.modal-dialog [role=document] .type-text textarea,.modal-dialog [role=document] [role=radiogroup] label textarea,.oidc-select label textarea,.type-toggle textarea,main .type-password textarea,main .type-select textarea,main .type-text textarea{resize:vertical;max-width:100%;min-width:100%;min-height:70px;padding:6px 13px}.app-view>div form:not(.filter-bar) [role=radiogroup],.app-view>div form:not(.filter-bar) [role=radiogroup] label,.checkbox-group,.modal-dialog [role=document] .type-password,.modal-dialog [role=document] .type-select,.modal-dialog [role=document] .type-text,.modal-dialog [role=document] [role=radiogroup],.modal-dialog [role=document] [role=radiogroup] label,.modal-dialog [role=document] form table,.oidc-select label,.type-toggle,main .type-password,main .type-select,main .type-text,main form table{margin-bottom:1.4em}.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label>span,.oidc-select label>span,.type-toggle>span,main .type-password>span,main .type-select>span,main .type-text>span,span.label{color:var(--typo-contrast-999,inherit);margin-bottom:.3em}.app-view>div form:not(.filter-bar) [role=radiogroup] label>span+em,.modal-dialog [role=document] .type-password>span+em,.modal-dialog [role=document] .type-select>span+em,.modal-dialog [role=document] .type-text>span+em,.modal-dialog [role=document] [role=radiogroup] label>span+em,.oidc-select label>span+em,.type-toggle>span+em,main .type-password>span+em,main .type-select>span+em,main .type-text>span+em,span.label+em{margin-top:-.5em;margin-bottom:.5em}label.type-dialog{cursor:pointer;float:right}.type-toggle+.checkbox-group{margin-top:-1em}.consul-exposed-path-list>ul>li,.consul-intention-permission-header-list>ul>li,.consul-intention-permission-list>ul>li,.consul-lock-session-list ul>li:not(:first-child),.consul-upstream-instance-list li,.list-collection>ul>li:not(:first-child){list-style-type:none;border:var(--decor-border-100);border-top-color:var(--transparent);border-bottom-color:rgb(var(--tone-gray-200));border-right-color:var(--transparent);border-left-color:var(--transparent);--horizontal-padding:12px;--vertical-padding:10px;padding:var(--vertical-padding) 0;padding-left:var(--horizontal-padding)}.consul-auth-method-list>ul>li:active:not(:first-child),.consul-auth-method-list>ul>li:focus:not(:first-child),.consul-auth-method-list>ul>li:hover:not(:first-child),.consul-exposed-path-list>ul>li.linkable:active,.consul-exposed-path-list>ul>li.linkable:focus,.consul-exposed-path-list>ul>li.linkable:hover,.consul-intention-permission-list:not(.readonly)>ul>li:active,.consul-intention-permission-list:not(.readonly)>ul>li:focus,.consul-intention-permission-list:not(.readonly)>ul>li:hover,.consul-lock-session-list ul>li.linkable:active:not(:first-child),.consul-lock-session-list ul>li.linkable:focus:not(:first-child),.consul-lock-session-list ul>li.linkable:hover:not(:first-child),.consul-node-list>ul>li:active:not(:first-child),.consul-node-list>ul>li:focus:not(:first-child),.consul-node-list>ul>li:hover:not(:first-child),.consul-policy-list>ul>li:active:not(:first-child),.consul-policy-list>ul>li:focus:not(:first-child),.consul-policy-list>ul>li:hover:not(:first-child),.consul-role-list>ul>li:active:not(:first-child),.consul-role-list>ul>li:focus:not(:first-child),.consul-role-list>ul>li:hover:not(:first-child),.consul-service-instance-list>ul>li:active:not(:first-child),.consul-service-instance-list>ul>li:focus:not(:first-child),.consul-service-instance-list>ul>li:hover:not(:first-child),.consul-token-list>ul>li:active:not(:first-child),.consul-token-list>ul>li:focus:not(:first-child),.consul-token-list>ul>li:hover:not(:first-child),.consul-upstream-instance-list li.linkable:active,.consul-upstream-instance-list li.linkable:focus,.consul-upstream-instance-list li.linkable:hover,.list-collection>ul>li.linkable:active:not(:first-child),.list-collection>ul>li.linkable:focus:not(:first-child),.list-collection>ul>li.linkable:hover:not(:first-child){border-color:rgb(var(--tone-gray-200));box-shadow:0 2px 4px rgb(var(--black) /10%);border-top-color:var(--transparent);cursor:pointer}.radio-card,.tippy-box{box-shadow:var(--decor-elevation-400)}.consul-exposed-path-list>ul>li>.header,.consul-lock-session-list ul>li:not(:first-child)>.header,.consul-upstream-instance-list li>.header,.list-collection>ul>li:not(:first-child)>.header{color:rgb(var(--tone-gray-999))}.consul-exposed-path-list>ul>li>.header *,.consul-lock-session-list ul>li:not(:first-child)>.header *,.consul-upstream-instance-list li>.header *,.list-collection>ul>li:not(:first-child)>.header *{color:inherit}.consul-exposed-path-list>ul>li>.detail,.consul-lock-session-list ul>li:not(:first-child)>.detail,.consul-upstream-instance-list li>.detail,.list-collection>ul>li:not(:first-child)>.detail,.radio-card{color:rgb(var(--tone-gray-500))}.consul-exposed-path-list>ul>li>.detail a,.consul-lock-session-list ul>li:not(:first-child)>.detail a,.consul-upstream-instance-list li>.detail a,.list-collection>ul>li:not(:first-child)>.detail a{color:inherit}.consul-exposed-path-list>ul>li>.detail a:hover,.consul-lock-session-list ul>li:not(:first-child)>.detail a:hover,.consul-upstream-instance-list li>.detail a:hover,.list-collection>ul>li:not(:first-child)>.detail a:hover{color:rgb(var(--color-action));text-decoration:underline}.consul-exposed-path-list>ul>li>.detail,.consul-exposed-path-list>ul>li>.header>dl:first-child,.consul-lock-session-list ul>li:not(:first-child)>.detail,.consul-lock-session-list ul>li:not(:first-child)>.header>dl:first-child,.consul-upstream-instance-list li>.detail,.consul-upstream-instance-list li>.header>dl:first-child,.list-collection>ul>li:not(:first-child)>.detail,.list-collection>ul>li:not(:first-child)>.header>dl:first-child{margin-right:6px}.consul-exposed-path-list>ul>li>.header dt,.consul-lock-session-list ul>li:not(:first-child)>.header dt,.consul-upstream-instance-list li>.header dt,.list-collection>ul>li:not(:first-child)>.header dt{display:none}.consul-exposed-path-list>ul>li>.header dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header dd::before,.consul-upstream-instance-list li>.header dd::before,.list-collection>ul>li:not(:first-child)>.header dd::before{font-size:.9em}.consul-exposed-path-list>ul>li>.detail,.consul-exposed-path-list>ul>li>.header,.consul-lock-session-list ul>li:not(:first-child)>.detail,.consul-lock-session-list ul>li:not(:first-child)>.header,.consul-upstream-instance-list li>.detail,.consul-upstream-instance-list li>.header,.list-collection>ul>li:not(:first-child)>.detail,.list-collection>ul>li:not(:first-child)>.header{display:flex;flex-wrap:nowrap;overflow-x:hidden}.consul-exposed-path-list>ul>li>.detail *,.consul-exposed-path-list>ul>li>.header *,.consul-lock-session-list ul>li:not(:first-child)>.detail *,.consul-lock-session-list ul>li:not(:first-child)>.header *,.consul-upstream-instance-list li>.detail *,.consul-upstream-instance-list li>.header *,.list-collection>ul>li:not(:first-child)>.detail *,.list-collection>ul>li:not(:first-child)>.header *{white-space:nowrap;flex-wrap:nowrap}.consul-exposed-path-list>ul>li>.detail>span,.consul-lock-session-list ul>li:not(:first-child)>.detail>span,.consul-upstream-instance-list li>.detail>span,.list-collection>ul>li:not(:first-child)>.detail>span{margin-right:18px}.consul-intention-permission-header-list>ul>li,.consul-intention-permission-list>ul>li{padding-top:0!important;padding-bottom:0!important}.consul-intention-permission-header-list>ul>li .detail,.consul-intention-permission-list>ul>li .detail{grid-row-start:header!important;grid-row-end:detail!important;align-self:center!important;padding:5px 0}.consul-intention-permission-header-list>ul>li .popover-menu>[type=checkbox]+label,.consul-intention-permission-list>ul>li .popover-menu>[type=checkbox]+label{padding:0}.consul-intention-permission-header-list>ul>li .popover-menu>[type=checkbox]+label+div:not(.above),.consul-intention-permission-list>ul>li .popover-menu>[type=checkbox]+label+div:not(.above){top:30px}.has-error>strong{font-style:normal;font-weight:400;color:inherit;color:rgb(var(--color-failure));position:relative;padding-left:20px}.has-error>strong::before{font-size:14px;color:rgb(var(--tone-red-500));position:absolute;top:50%;left:0;margin-top:-8px}.more-popover-menu .popover-menu>[type=checkbox]+label,table.has-actions tr>.actions .popover-menu>[type=checkbox]+label,table.with-details tr>.actions .popover-menu>[type=checkbox]+label{padding:7px}.more-popover-menu .popover-menu>[type=checkbox]+label>*,table.has-actions tr>.actions .popover-menu>[type=checkbox]+label>*,table.with-details tr>.actions .popover-menu>[type=checkbox]+label>*{background-color:var(--transparent);border-radius:var(--decor-radius-100);width:30px;height:30px;font-size:0}.more-popover-menu .popover-menu>[type=checkbox]+label>::after,table.has-actions tr>.actions .popover-menu>[type=checkbox]+label>::after,table.with-details tr>.actions .popover-menu>[type=checkbox]+label>::after{--icon-name:icon-more-horizontal;--icon-color:rgb(var(--tone-gray-900));--icon-size:icon-300;content:"";position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}.more-popover-menu .popover-menu>[type=checkbox]+label>:active,table.has-actions tr>.actions .popover-menu>[type=checkbox]+label>:active,table.with-details tr>.actions .popover-menu>[type=checkbox]+label>:active{background-color:rgb(var(--tone-gray-100))}.more-popover-menu .popover-menu>[type=checkbox]+label>:focus,.more-popover-menu .popover-menu>[type=checkbox]+label>:hover,.radio-card>:first-child,table.has-actions tr>.actions .popover-menu>[type=checkbox]+label>:focus,table.has-actions tr>.actions .popover-menu>[type=checkbox]+label>:hover,table.with-details tr>.actions .popover-menu>[type=checkbox]+label>:focus,table.with-details tr>.actions .popover-menu>[type=checkbox]+label>:hover{background-color:rgb(var(--tone-gray-050))}.oidc-select [class$=-oidc-provider]::before{width:22px;height:22px;flex:0 0 auto;margin-right:10px}.oidc-select .ember-power-select-trigger,.oidc-select li{margin-bottom:1em}.informed-action header,.radio-card header{margin-bottom:.5em}.oidc-select .ember-power-select-trigger{width:100%}.oidc-select button.reset{float:right}.radio-card{border:var(--decor-border-100);border-radius:var(--decor-radius-100);border-color:rgb(var(--tone-gray-200));cursor:pointer;float:none!important;margin-right:0!important;display:flex!important}.checked.radio-card{border-color:rgb(var(--tone-blue-500))}.checked.radio-card>:first-child{background-color:rgb(var(--tone-blue-050))}.radio-card header{color:rgb(var(--tone-gray-999))}.consul-intention-fieldsets .radio-card>:last-child{padding-left:47px;position:relative}.consul-intention-fieldsets .radio-card>:last-child::before{position:absolute;left:14px;font-size:1rem}.radio-card>:first-child{padding:10px;display:grid;align-items:center;justify-items:center}.radio-card>:last-child{padding:18px}.consul-server-card,.disclosure-menu [aria-expanded]~*,.menu-panel,.more-popover-menu>[type=checkbox]+label+div,.popover-menu>[type=checkbox]+label+div,section[data-route="dc.show.license"] aside,section[data-route="dc.show.serverstatus"] .server-failure-tolerance,table.has-actions tr>.actions>[type=checkbox]+label+div,table.with-details tr>.actions>[type=checkbox]+label+div{--tone-border:var(--tone-gray-300);border:var(--decor-border-100);border-radius:var(--decor-radius-200);box-shadow:var(--decor-elevation-600);color:rgb(var(--tone-gray-900));background-color:rgb(var(--tone-gray-000));--padding-x:14px;--padding-y:14px;position:relative}.consul-auth-method-nspace-list tbody tr:hover,.consul-auth-method-view section table tbody tr:hover,table.consul-metadata-list tbody tr:hover{box-shadow:none}.disclosure-menu [aria-expanded]~* [role=separator],.menu-panel [role=separator],.more-popover-menu>[type=checkbox]+label+div [role=separator],.popover-menu>[type=checkbox]+label+div [role=separator],table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator],table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]{border-top:var(--decor-border-100);margin:0}.consul-server-card,.disclosure-menu [aria-expanded]~*,.disclosure-menu [aria-expanded]~* [role=separator],.menu-panel,.menu-panel [role=separator],.more-popover-menu>[type=checkbox]+label+div,.more-popover-menu>[type=checkbox]+label+div [role=separator],.popover-menu>[type=checkbox]+label+div,.popover-menu>[type=checkbox]+label+div [role=separator],section[data-route="dc.show.license"] aside,section[data-route="dc.show.serverstatus"] .server-failure-tolerance,table.has-actions tr>.actions>[type=checkbox]+label+div,table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator],table.with-details tr>.actions>[type=checkbox]+label+div,table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]{border-color:rgb(var(--tone-border))}.paged-collection-scroll,[style*="--paged-row-height"]{overflow-y:auto!important;will-change:scrollPosition}[style*="--paged-start"]::before{content:"";display:block;height:var(--paged-start)}.consul-auth-method-type,.consul-external-source,.consul-health-check-list .health-check-output dd em,.consul-intention-list td strong,.consul-intention-permission-list strong,.consul-intention-search-bar li button span,.consul-kind,.consul-server-card .health-status+dd,.consul-source,.consul-transparent-proxy,.discovery-chain .route-card>header ul li,.hashicorp-consul nav .dcs li.is-local span,.hashicorp-consul nav .dcs li.is-primary span,.leader,.search-bar-status li:not(.remove-all),.topology-metrics-source-type,html[data-route^="dc.acls.index"] main td strong,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em,span.policy-node-identity,span.policy-service-identity{border-radius:var(--decor-radius-100);display:inline-flex;position:relative;align-items:center;white-space:nowrap}.consul-auth-method-type::before,.consul-external-source::before,.consul-health-check-list .health-check-output dd em::before,.consul-intention-list td strong::before,.consul-intention-permission-list strong::before,.consul-intention-search-bar li button span::before,.consul-kind::before,.consul-server-card .health-status+dd::before,.consul-source::before,.consul-transparent-proxy::before,.discovery-chain .route-card>header ul li::before,.hashicorp-consul nav .dcs li.is-local span::before,.hashicorp-consul nav .dcs li.is-primary span::before,.leader::before,.search-bar-status li:not(.remove-all)::before,.topology-metrics-source-type::before,html[data-route^="dc.acls.index"] main td strong::before,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl::before,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em::before,span.policy-node-identity::before,span.policy-service-identity::before{margin-right:4px}.consul-auth-method-type,.consul-external-source,.consul-kind,.consul-server-card .health-status+dd,.consul-source,.consul-transparent-proxy,.leader,.search-bar-status li:not(.remove-all),.topology-metrics-source-type,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em,span.policy-node-identity,span.policy-service-identity{padding:0 8px;--icon-size:icon-200}.consul-intention-permission-list strong,.discovery-chain .route-card>header ul li,html[data-route^="dc.acls.index"] main td strong,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl{padding:1px 5px}.consul-intention-list td strong,.consul-intention-search-bar li button span{padding:4px 8px}span.policy-node-identity::before,span.policy-service-identity::before{vertical-align:unset}span.policy-node-identity::before{content:"Node Identity: "}span.policy-service-identity::before{content:"Service Identity: "}.aws-iam.consul-auth-method-type::before,.aws-iam.consul-external-source::before,.aws-iam.consul-kind::before,.aws-iam.consul-source::before,.aws-iam.consul-transparent-proxy::before,.aws-iam.leader::before,.aws-iam.topology-metrics-source-type::before,.consul-health-check-list .health-check-output dd em.aws-iam::before,.consul-intention-list td strong.aws-iam::before,.consul-intention-permission-list strong.aws-iam::before,.consul-intention-search-bar li button span.aws-iam::before,.consul-server-card .health-status+dd.aws-iam::before,.discovery-chain .route-card>header ul li.aws-iam::before,.hashicorp-consul nav .dcs li.is-local span.aws-iam::before,.hashicorp-consul nav .dcs li.is-primary span.aws-iam::before,.search-bar-status li.aws-iam:not(.remove-all)::before,html[data-route^="dc.acls.index"] main td strong.aws-iam::before,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.aws-iam::before,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em.aws-iam::before,span.aws-iam.policy-node-identity::before,span.aws-iam.policy-service-identity::before{--icon-name:icon-aws-color;content:""}.more-popover-menu>[type=checkbox]+label>*,.popover-menu>[type=checkbox]+label>*,table.has-actions tr>.actions>[type=checkbox]+label>*,table.with-details tr>.actions>[type=checkbox]+label>*{cursor:pointer}.more-popover-menu>[type=checkbox]+label>::after,.popover-menu>[type=checkbox]+label>::after,table.has-actions tr>.actions>[type=checkbox]+label>::after,table.with-details tr>.actions>[type=checkbox]+label>::after{width:16px;height:16px;position:relative}.more-popover-menu,.popover-menu,table.has-actions tr>.actions,table.with-details tr>.actions{position:relative}.more-popover-menu>[type=checkbox]+label,.popover-menu>[type=checkbox]+label,table.has-actions tr>.actions>[type=checkbox]+label,table.with-details tr>.actions>[type=checkbox]+label{display:block}.more-popover-menu>[type=checkbox]+label+div,.popover-menu>[type=checkbox]+label+div,table.has-actions tr>.actions>[type=checkbox]+label+div,table.with-details tr>.actions>[type=checkbox]+label+div{min-width:192px}.more-popover-menu>[type=checkbox]+label+div:not(.above),.popover-menu>[type=checkbox]+label+div:not(.above),table.has-actions tr>.actions>[type=checkbox]+label+div:not(.above),table.with-details tr>.actions>[type=checkbox]+label+div:not(.above){top:38px}.more-popover-menu>[type=checkbox]+label+div:not(.left),.popover-menu>[type=checkbox]+label+div:not(.left),table.has-actions tr>.actions>[type=checkbox]+label+div:not(.left),table.with-details tr>.actions>[type=checkbox]+label+div:not(.left){right:5px}.popover-menu .menu-panel{position:absolute!important}.type-reveal,.type-toggle label{position:relative}.popover-select label{height:100%}.popover-select label>*{padding:0 8px!important;height:100%!important;justify-content:space-between!important;min-width:auto!important}.popover-select label>::after{margin-left:6px}.popover-select button::before{margin-right:10px}.popover-select .value-passing button::before{color:rgb(var(--tone-green-500))}.popover-select .value-warning button::before{color:rgb(var(--tone-orange-500))}.popover-select .value-critical button::before{color:rgb(var(--tone-red-500))}.popover-select .value-empty button::before{color:rgb(var(--tone-gray-400))}.type-source.popover-select li:not(.partition) button{text-transform:capitalize}.type-source.popover-select li.aws button{text-transform:uppercase}.type-source.popover-select li.partition button::before{color:rgb(var(--tone-gray-500))}.progress.indeterminate{width:100%;display:flex;align-items:center;justify-content:center;--icon-size:icon-700;--icon-name:var(--icon-loading);--icon-color:rgb(var(--tone-gray-500))}.progress.indeterminate::before{content:""}.app-view>div form:not(.filter-bar) [role=radiogroup],.modal-dialog [role=document] [role=radiogroup]{overflow:hidden;padding-left:1px}.app-view>div form:not(.filter-bar) [role=radiogroup] label,.modal-dialog [role=document] [role=radiogroup] label{float:left}.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.modal-dialog [role=document] [role=radiogroup] label>span{float:right;margin-left:1em}.app-view>div form:not(.filter-bar) [role=radiogroup] label:not(:last-child),.modal-dialog [role=document] [role=radiogroup] label:not(:last-child){margin-right:25px}.app-view>div form:not(.filter-bar) [role=radiogroup] label,.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.modal-dialog [role=document] [role=radiogroup] label,.modal-dialog [role=document] [role=radiogroup] label>span{margin-bottom:0!important}.type-reveal{cursor:pointer}.type-reveal input{display:none}.type-reveal input~em{visibility:hidden;font-style:normal}.type-reveal input:checked~em{visibility:visible;cursor:auto}.type-reveal input~em::before{display:inline;visibility:visible;content:"■ ■ ■ ■ ■ ■ ■ ■ ■ ■ ■ ■"}.type-reveal input:checked~em::before,.type-toggle input{display:none}.type-reveal span,[role=banner] nav:not(.in-viewport):first-of-type{visibility:hidden}.type-reveal span{position:absolute;--icon-color:rgb(var(--tone-gray-500))}.type-reveal em{margin-left:22px}.type-reveal span::before{visibility:visible}.type-toggle label span{cursor:pointer}.type-toggle label span::after{border-radius:var(--decor-radius-full)}.type-toggle label span::before{border-radius:7px;left:0;width:24px;height:12px;margin-top:-5px}.type-negative.type-toggle{border:0}.app-view>header .title,.modal-dialog [role=document] table td,.modal-dialog [role=document] table th,main table td,main table th{border-bottom:var(--decor-border-100)}.type-toggle label span::after{background-color:rgb(var(--tone-gray-000));margin-top:-3px;width:8px;height:8px}.type-negative.type-toggle label input+span::before,.type-toggle label input:checked+span::before{background-color:rgb(var(--tone-blue-500))}.type-negative.type-toggle label input:checked+span::before,.type-toggle label span::before{background-color:rgb(var(--tone-gray-300))}.type-toggle label span{color:rgb(var(--tone-gray-900));display:inline-block;padding-left:34px}.type-toggle label span::after,.type-toggle label span::before{position:absolute;display:block;content:"";top:50%}.type-negative.type-toggle label input+span::after,.type-toggle label input:checked+span::after{left:14px}.type-negative.type-toggle label input:checked+span::after,.type-toggle label span::after{left:2px}.modal-dialog [role=document] table th,main table th{border-color:rgb(var(--tone-gray-300));padding:.6em 0}.modal-dialog [role=document] table td,main table td{border-color:rgb(var(--tone-gray-200));color:rgb(var(--tone-gray-500));height:50px;vertical-align:middle}.modal-dialog [role=document] table td strong,.modal-dialog [role=document] table th,main table td strong,main table th{color:rgb(var(--tone-gray-600))}.consul-intention-list td.destination,.consul-intention-list td.source,.modal-dialog [role=document] table a,.modal-dialog [role=document] table td:first-child,main table a,main table td:first-child{color:rgb(var(--tone-gray-900))}.modal-dialog [role=document] table,main table{width:100%;border-collapse:collapse}table.dom-recycling tr{display:flex}table.dom-recycling tr>*{flex:1 1 auto;display:inline-flex;align-items:center}.modal-dialog [role=document] table th.actions input,main table th.actions input{display:none}.modal-dialog [role=document] table th.actions,main table th.actions{text-align:right}.modal-dialog [role=document] table td a,main table td a{display:block}.modal-dialog [role=document] table td.no-actions~.actions,main table td.no-actions~.actions{display:none}.modal-dialog [role=document] table td:not(.actions)>:only-child,main table td:not(.actions)>:only-child{overflow:hidden;text-overflow:ellipsis}.modal-dialog [role=document] table td:not(.actions)>*,main table td:not(.actions)>*{white-space:nowrap}.modal-dialog [role=document] table caption,main table caption{margin-bottom:.8em}.modal-dialog [role=document] table td a,.modal-dialog [role=document] table td:not(.actions),.modal-dialog [role=document] table th:not(.actions),main table td a,main table td:not(.actions),main table th:not(.actions){padding-right:.9em}.modal-dialog [role=document] table tbody td em,main table tbody td em{display:block;font-style:normal;font-weight:400;color:rgb(var(--tone-gray-500))}table.has-actions tr>.actions,table.with-details tr>.actions{width:60px!important;overflow:visible}table.has-actions tr>.actions>[type=checkbox]+label,table.with-details tr>.actions>[type=checkbox]+label{position:absolute;right:5px}table.consul-metadata-list tbody tr{cursor:default}.modal-dialog [role=document] table th span::after,main table th span::after{color:rgb(var(--tone-gray-500));margin-left:4px}.modal-dialog [role=document] table tbody tr,main table tbody tr{cursor:pointer}.modal-dialog [role=document] table td:first-child,main table td:first-child{padding:0}.modal-dialog [role=document] table tbody tr:hover,main table tbody tr:hover{box-shadow:var(--decor-elevation-300)}.modal-dialog [role=document] table td.folder::before,main table td.folder::before{background-color:rgb(var(--tone-gray-300));margin-top:1px;margin-right:5px}@media (max-width:420px){.consul-intention-list tr>:nth-last-child(2),.modal-dialog [role=document] table tr>.actions,main table tr>.actions{display:none}}.voting-status-leader.consul-server-card .name{width:var(--tile-size,3rem);height:var(--tile-size,3rem)}.voting-status-leader.consul-server-card .name::before{display:block;content:"";width:100%;height:100%;border-radius:var(--decor-radius-250);border:var(--decor-border-100);background-image:linear-gradient(135deg,rgb(var(--strawberry-010)) 0,rgb(var(--strawberry-200)) 100%);border-color:rgb(var(--tone-gray-999) /10%)}.voting-status-leader.consul-server-card .name::after{content:"";position:absolute;top:calc(var(--tile-size,3rem)/ 4);left:calc(var(--tile-size,3rem)/ 4);--icon-name:icon-star-fill;--icon-size:icon-700;color:rgb(var(--strawberry-500))}table.with-details td:only-child>div>label,table.with-details td>label{border-radius:var(--decor-radius-100);cursor:pointer;min-width:30px;min-height:30px;display:inline-flex;align-items:center;justify-content:center}table.with-details td:only-child>div>label:focus,table.with-details td:only-child>div>label:hover,table.with-details td>label:focus,table.with-details td>label:hover{background-color:rgb(var(--tone-gray-050))}table.with-details td:only-child>div>label:active,table.with-details td>label:active{background-color:rgb(var(--tone-gray-100))}table.dom-recycling tbody{top:33px!important;width:100%}table.dom-recycling caption~tbody{top:57px!important}table tr>:nth-last-child(2):first-child,table tr>:nth-last-child(2):first-child~*{width:calc(100% / 2)}table tr>:nth-last-child(3):first-child,table tr>:nth-last-child(3):first-child~*{width:calc(100% / 3)}table tr>:nth-last-child(4):first-child,table tr>:nth-last-child(4):first-child~*{width:calc(100% / 4)}table tr>:nth-last-child(5):first-child,table tr>:nth-last-child(5):first-child~*{width:calc(100% / 5)}table.has-actions tr>:nth-last-child(2):first-child,table.has-actions tr>:nth-last-child(2):first-child~*{width:calc(100% - 60px)}table.has-actions tr>:nth-last-child(3):first-child,table.has-actions tr>:nth-last-child(3):first-child~*{width:calc(50% - 30px)}table.has-actions tr>:nth-last-child(4):first-child,table.has-actions tr>:nth-last-child(4):first-child~*{width:calc(33% - 20px)}table.has-actions tr>:nth-last-child(5):first-child,table.has-actions tr>:nth-last-child(5):first-child~*{width:calc(25% - 15px)}html[data-route^="dc.acls.policies"] [role=dialog] table tr>:not(last-child),html[data-route^="dc.acls.policies"] table tr>:not(last-child),html[data-route^="dc.acls.roles"] [role=dialog] table tr>:not(last-child),html[data-route^="dc.acls.roles"] main table.token-list tr>:not(last-child){width:120px}html[data-route^="dc.acls.policies"] table tr>:last-child,html[data-route^="dc.acls.roles"] [role=dialog] table tr>:last-child,html[data-route^="dc.acls.roles"] main table.token-list tr>:last-child{width:calc(100% - 240px)!important}table.with-details td:only-child{cursor:default;border:0}table.with-details td:only-child>div::before,table.with-details td:only-child>div>div,table.with-details td:only-child>div>label{background-color:rgb(var(--tone-gray-000))}table.with-details td:only-child>div>label::before{transform:rotate(180deg)}table.with-details td:only-child>div::before{background:rgb(var(--tone-gray-200));content:"";display:block;height:1px;position:absolute;bottom:-20px;left:10px;width:calc(100% - 20px)}table.with-details tr>.actions{position:relative}table.with-details td:only-child>div>label,table.with-details td>label{pointer-events:auto;position:absolute;top:8px}table.with-details td:only-child>div>label span,table.with-details td>label span{display:none}table.with-details td>label{right:2px}table.with-details tr:nth-child(even) td{height:auto;position:relative;display:table-cell}table.with-details tr:nth-child(even) td>*{display:none}table.with-details td:only-child>div>label{right:11px}table.with-details tr:nth-child(even) td>input:checked+*{display:block}table.with-details td:only-child{overflow:visible;width:100%}table.with-details td:only-child>div{border:1px solid;border-radius:var(--decor-radius-100);box-shadow:var(--decor-elevation-600);margin-bottom:20px;position:relative;left:-10px;right:-10px;width:calc(100% + 20px);margin-top:-51px;pointer-events:none;padding:10px}table.with-details td:only-child>div::after{content:"";display:block;clear:both}table.with-details td:only-child>div>div{pointer-events:auto;margin-top:36px}.consul-auth-method-binding-list dl,.consul-auth-method-view dl,.consul-auth-method-view section dl{display:flex;flex-wrap:wrap}.consul-auth-method-binding-list dl dd,.consul-auth-method-binding-list dl dt,.consul-auth-method-view dl dd,.consul-auth-method-view dl dt{padding:12px 0;margin:0;border-top:1px solid!important}.consul-auth-method-binding-list dl dt,.consul-auth-method-view dl dt{width:20%;font-weight:var(--typo-weight-bold)}.consul-auth-method-binding-list dl dd,.consul-auth-method-view dl dd{margin-left:auto;width:80%;display:flex}.consul-auth-method-binding-list dl dd>ul li,.consul-auth-method-view dl dd>ul li{display:flex}.consul-auth-method-binding-list dl dd>ul li:not(:last-of-type),.consul-auth-method-view dl dd>ul li:not(:last-of-type){padding-bottom:12px}.consul-auth-method-binding-list dl dd .copy-button button,.consul-auth-method-view dl dd .copy-button button{padding:0!important;margin:0 4px 0 0!important}.consul-auth-method-binding-list dl dt.check+dd,.consul-auth-method-view dl dt.check+dd{padding-top:16px}.consul-auth-method-binding-list dl>dd:last-of-type,.consul-auth-method-binding-list dl>dt:last-of-type,.consul-auth-method-view dl>dd:last-of-type,.consul-auth-method-view dl>dt:last-of-type,.consul-auth-method-view section dl>dd:last-of-type,.consul-auth-method-view section dl>dt:last-of-type{border-bottom:1px solid!important;border-color:rgb(var(--tone-gray-300))!important}.consul-auth-method-binding-list dl dd,.consul-auth-method-binding-list dl dt,.consul-auth-method-view dl dd,.consul-auth-method-view dl dt{border-color:rgb(var(--tone-gray-300))!important;color:rgb(var(--tone-gray-999))!important}.consul-auth-method-binding-list dl dt.type+dd span::before,.consul-auth-method-view dl dt.type+dd span::before{margin-left:4px;background-color:rgb(var(--tone-gray-500))}.tooltip-panel dt{cursor:pointer}.tooltip-panel dd>div::before{width:12px;height:12px;background-color:rgb(var(--tone-gray-000));border-top:1px solid rgb(var(--tone-gray-300));border-right:1px solid rgb(var(--tone-gray-300));transform:rotate(-45deg);position:absolute;left:16px;top:-7px}.tooltip-panel,.tooltip-panel dt{display:flex;flex-direction:column}.tooltip-panel dd>div.menu-panel{top:auto;overflow:visible}.tooltip-panel dd{display:none;position:relative;z-index:1;padding-top:10px;margin-bottom:-10px}.tooltip-panel:hover dd{display:block}.tooltip-panel dd>div{width:250px}.app-view>header .title{display:flex;align-items:center;white-space:nowrap;position:relative;z-index:5;padding-bottom:.2em}.app-view>div form:not(.filter-bar) fieldset{border-bottom:var(--decor-border-200)}.app-view>header h1>em{color:rgb(var(--tone-gray-600))}.app-view>header dd>a{color:rgb(var(--tone-gray-999))}.app-view>div div>dl>dd,[role=contentinfo]{color:rgb(var(--tone-gray-400))}.app-view>div form:not(.filter-bar) fieldset,.app-view>header .title{border-color:rgb(var(--tone-gray-200))}.app-view>header .actions{display:flex;align-items:flex-start;margin-left:auto;margin-top:9px}.app-view>header .title>:not(:last-child){margin-right:8px}.app-view>div form:not(.filter-bar) fieldset{padding-bottom:.3em;margin-bottom:2em}[for=toolbar-toggle]{background-position:0 4px;display:inline-block;width:26px;height:26px;cursor:pointer;color:rgb(var(--tone-blue-500))}#toolbar-toggle{display:none}@media (max-width:849px){.app-view>header .actions{margin-top:9px}}@media (min-width:996px){[for=toolbar-toggle]{display:none}}@media (max-width:995px){.app-view>header h1{display:inline-block}html[data-route$="dc.services.instance.show"] h1{display:block}#toolbar-toggle+*{display:none}#toolbar-toggle:checked+*{display:flex}}.brand-loader{position:absolute;top:50%;margin-top:-26px;left:50%}.app .skip-links{outline:solid 1px;background-color:rgb(var(--tone-blue-500));display:flex;flex-direction:column;position:absolute;z-index:10;left:50%;padding:20px;top:-100px;transform:translateX(-50%)}.app .skip-links a,.app .skip-links button{color:inherit}.app .skip-links a,.app .skip-links button,.app .skip-links div{display:block;width:100%;text-align:center;box-sizing:border-box}.app .skip-links:focus-within{top:0}.app .notifications{display:flex;flex-direction:column;align-items:center;position:fixed;z-index:50;top:-45px;left:0;pointer-events:none}.app .notifications .app-notification>*{min-width:400px}.app .notifications .app-notification{transition-property:opacity;width:fit-content;max-width:80%;pointer-events:auto}[role=banner] nav:last-of-type{margin-left:auto}.hashicorp-consul nav .dcs{top:18px}.hashicorp-consul nav .dcs [aria-label]::before{display:none!important}[role=banner] nav:last-of-type [aria-haspopup=menu]~*{position:absolute;right:0;min-width:192px}[role=contentinfo]{position:fixed;z-index:50;width:250px;padding-left:25px;top:calc(100vh - 42px);top:calc(max(100vh,460px) - 42px)}html.has-partitions.has-nspaces .app [role=contentinfo]{top:calc(100vh - 42px);top:calc(max(100vh,640px) - 42px)}[role=banner] nav:first-of-type{z-index:10}[role=banner] nav:first-of-type,[role=contentinfo]{transition-property:left}.app .notifications,main{margin-top:var(--chrome-height,64px);transition-property:margin-left}.app .notifications{transition-property:margin-left,width}@media (min-width:900px){.app>input[id]~main .notifications{width:calc(100% - var(--chrome-width))}.app>input[id]:checked~main .notifications{width:100%}.app>input[id]+header>div>nav:first-of-type,.app>input[id]~footer{left:0}.app>input[id]:checked+header>div>nav:first-of-type,.app>input[id]:checked~footer{left:calc(var(--chrome-width,300px) * -1)}.app>input[id]~main,.app>input[id]~main .notifications{margin-left:var(--chrome-width,300px)}.app>input[id]:checked~main,.app>input[id]:checked~main .notifications{margin-left:0}}@media (max-width:899px){.app>input[id]~main .notifications{width:100%}.app>input[id]:checked+header>div>nav:first-of-type,.app>input[id]:checked~footer{left:0}.app>input[id]+header>div>nav:first-of-type,.app>input[id]~footer{left:calc(var(--chrome-width,300px) * -1)}.app>input[id]~main,.app>input[id]~main .notifications{margin-left:0}}[role=banner]::before{background-color:rgb(var(--tone-gray-000));content:"";position:absolute;z-index:-1;left:0;width:100vw}[role=banner]{display:flex;position:fixed;z-index:50;left:0;padding:0 25px;width:calc(100% - 50px);align-items:center}[role=banner],[role=banner]::before{height:var(--chrome-height)}[role=banner]>a{display:block;line-height:0;font-size:0}.hashicorp-consul nav .dcs [aria-expanded]>a,[role=banner] nav:last-of-type [aria-expanded]>a,[role=banner] nav:last-of-type>ul>li>.popover-menu>label>button>a,[role=banner] nav:last-of-type>ul>li>a>a,[role=banner] nav:last-of-type>ul>li>button>a,[role=banner] nav:last-of-type>ul>li>span>a{color:inherit}.hashicorp-consul nav .dcs [aria-expanded]::after,[role=banner] nav:last-of-type [aria-expanded]::after{--icon-name:icon-chevron-down;content:""}.hashicorp-consul nav .dcs [aria-expanded=true][aria-expanded]::after,[role=banner] nav:last-of-type [aria-expanded=true][aria-expanded]::after{transform:scaleY(-100%)}.app>input[id]{display:none}.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],[role=banner] nav:last-of-type>ul,[role=banner]>div,[role=banner]>label,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{display:flex}[role=banner]>label::before{--icon-name:icon-menu;--icon-color:rgb(var(--tone-gray-800));content:"";cursor:pointer}.hashicorp-consul nav .dcs [aria-expanded],[role=banner] nav:last-of-type .popover-menu [type=checkbox]:checked+label>*,[role=banner] nav:last-of-type [aria-expanded],[role=banner] nav:last-of-type>ul>li>.popover-menu>label>button,[role=banner] nav:last-of-type>ul>li>a,[role=banner] nav:last-of-type>ul>li>button,[role=banner] nav:last-of-type>ul>li>span{color:rgb(var(--tone-gray-600))}[role=banner]>label{align-items:center;height:100%;padding:0 1rem 0 5px}[role=banner]>div{justify-content:space-between;flex-grow:1}[role=banner] nav:last-of-type label+div{z-index:400;left:0;right:auto;top:28px!important}.hashicorp-consul nav .dcs [aria-expanded],[role=banner] nav:last-of-type [aria-expanded],[role=banner] nav:last-of-type>ul>li>.popover-menu>label>button,[role=banner] nav:last-of-type>ul>li>a,[role=banner] nav:last-of-type>ul>li>button,[role=banner] nav:last-of-type>ul>li>span{border-radius:var(--decor-radius-200);cursor:pointer;display:block;padding:5px 12px;white-space:nowrap}[role=banner] nav:last-of-type .popover-menu>label{padding-right:5px}[role=banner] nav:last-of-type .popover-menu>label>*{padding-right:4px!important}[role=banner] nav:last-of-type .popover-menu>label>button::after{top:2px}[role=banner] nav:last-of-type>ul>li>span{cursor:default}[role=banner] nav:first-of-type>ul>li>a>a,[role=banner] nav:first-of-type>ul>li>label>a{color:inherit;font-size:inherit}[role=banner] nav:first-of-type>ul>li>a:focus,[role=banner] nav:first-of-type>ul>li>a:hover,[role=banner] nav:first-of-type>ul>li>label:focus,[role=banner] nav:first-of-type>ul>li>label:hover{text-decoration:underline}.tab-nav li>*,[role=banner] nav:first-of-type>ul>li.is-active>a:focus:not(:active),[role=banner] nav:first-of-type>ul>li.is-active>a:hover:not(:active){text-decoration:none}[role=banner] nav:first-of-type{background-color:rgb(var(--tone-gray-050));color:rgb(var(--tone-gray-700))}[role=banner] nav:first-of-type li:not([role=separator])>span{color:rgb(var(--tone-gray-300))}[role=banner] nav:first-of-type [role=separator]{text-transform:uppercase;font-weight:var(--typo-weight-medium);color:rgb(var(--tone-gray-600))}[role=banner] nav:first-of-type>ul>li>a,[role=banner] nav:first-of-type>ul>li>label{cursor:pointer;border-right:var(--decor-border-400);border-color:var(--transparent);color:rgb(var(--tone-gray-800))}[role=banner] nav:first-of-type>ul>li.is-active>a,[role=banner] nav:first-of-type>ul>li>a:focus,[role=banner] nav:first-of-type>ul>li>a:hover,[role=banner] nav:first-of-type>ul>li>label:focus,[role=banner] nav:first-of-type>ul>li>label:hover,[role=banner] nav:first-of-type>ul>li[aria-label]{color:rgb(var(--tone-gray-999))}[role=banner] nav:first-of-type>ul>li.is-active>a{background-color:rgb(var(--tone-gray-150));border-color:rgb(var(--tone-gray-999))}[role=banner] nav:first-of-type [aria-label]::before{color:rgb(var(--tone-gray-700));content:attr(aria-label);display:block;margin-top:-.5rem;margin-bottom:.5rem}.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button{border:var(--decor-border-100);border-color:rgb(var(--tone-gray-500));border-radius:var(--decor-radius-100);font-weight:inherit;background-color:rgb(var(--tone-gray-050));color:rgb(var(--tone-gray-999))}.hashicorp-consul nav li.nspaces .disclosure-menu>button[aria-expanded=true],.hashicorp-consul nav li.partitions .disclosure-menu>button[aria-expanded=true]{border-bottom-left-radius:var(--decor-radius-000);border-bottom-right-radius:var(--decor-radius-000)}.hashicorp-consul nav li.nspaces .disclosure-menu>button::after,.hashicorp-consul nav li.partitions .disclosure-menu>button::after{width:16px;height:16px;position:relative;float:right}[role=banner] nav:first-of-type{position:absolute;left:0;top:var(--chrome-height,47px);width:var(--chrome-width,300px);height:calc(100vh - var(--chrome-height,47px) - 35px);padding-top:35px;overflow:auto}[role=banner] nav:first-of-type li.nspaces,[role=banner] nav:first-of-type li.partition,[role=banner] nav:first-of-type li.partitions{margin-bottom:25px;padding:0 26px}[role=banner] nav:first-of-type li.dcs{padding:0 18px}[role=banner] nav:first-of-type [role=menuitem]{justify-content:flex-start!important}[role=banner] nav:first-of-type [role=menuitem] span{margin-left:.5rem}[role=banner] nav:first-of-type [role=separator],[role=banner] nav:first-of-type li:not([role=separator])>span,[role=banner] nav:first-of-type>ul>li>a,[role=banner] nav:first-of-type>ul>li>label{display:block;padding:7px 25px}[role=banner] nav:first-of-type [role=separator]{margin-top:.7rem;padding-bottom:0}.hashicorp-consul nav li.nspaces .disclosure,.hashicorp-consul nav li.partitions .disclosure{position:relative}.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button{width:100%;text-align:left;padding:10px}.hashicorp-consul nav li.nspaces .disclosure-menu button+*,.hashicorp-consul nav li.partitions .disclosure-menu button+*{border-top-left-radius:var(--decor-radius-000);border-top-right-radius:var(--decor-radius-000);border-top:var(--decor-border-000);position:absolute;z-index:1;width:calc(100% - 2px)}.hashicorp-consul nav .dcs{visibility:visible;position:fixed;z-index:10;left:100px}.hashicorp-consul nav li.dcs [aria-expanded]~*{min-width:250px;max-height:560px;--paged-row-height:43px}.hashicorp-consul nav li.nspaces [aria-expanded]~*,.hashicorp-consul nav li.partitions [aria-expanded]~*{max-height:360px;--paged-row-height:43px}.hashicorp-consul [role=banner] a svg{fill:rgb(var(--tone-brand-600))}.hashicorp-consul .acls-separator span{color:rgb(var(--tone-red-500));display:inline-block;position:relative;top:2px;margin-left:2px}.disclosure-menu [aria-expanded]~*>div+ul,.menu-panel>div+ul,.more-popover-menu>[type=checkbox]+label+div>div+ul,.popover-menu>[type=checkbox]+label+div>div+ul,table.has-actions tr>.actions>[type=checkbox]+label+div>div+ul,table.with-details tr>.actions>[type=checkbox]+label+div>div+ul{border-top:var(--decor-border-100);border-color:rgb(var(--tone-border,var(--tone-gray-300)))}.disclosure-menu [aria-expanded]~* [role=separator]:first-child:not(:empty),.menu-panel [role=separator]:first-child:not(:empty),.more-popover-menu>[type=checkbox]+label+div [role=separator]:first-child:not(:empty),.popover-menu>[type=checkbox]+label+div [role=separator]:first-child:not(:empty),table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator]:first-child:not(:empty),table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]:first-child:not(:empty){border:none}.disclosure-menu [aria-expanded]~* [role=separator],.menu-panel [role=separator],.more-popover-menu>[type=checkbox]+label+div [role=separator],.popover-menu>[type=checkbox]+label+div [role=separator],table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator],table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]{text-transform:uppercase;font-weight:var(--typo-weight-medium);color:rgb(var(--tone-gray-600))}.disclosure-menu [aria-expanded]~*>ul>li,.menu-panel>ul>li,.more-popover-menu>[type=checkbox]+label+div>ul>li,.popover-menu>[type=checkbox]+label+div>ul>li,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li{list-style-type:none}.disclosure-menu [aria-expanded]~*>ul .informed-action,.menu-panel>ul .informed-action,.more-popover-menu>[type=checkbox]+label+div>ul .informed-action,.popover-menu>[type=checkbox]+label+div>ul .informed-action,table.has-actions tr>.actions>[type=checkbox]+label+div>ul .informed-action,table.with-details tr>.actions>[type=checkbox]+label+div>ul .informed-action{border:0!important}.disclosure-menu [aria-expanded]~*>div,.menu-panel>div,.more-popover-menu>[type=checkbox]+label+div>div,.popover-menu>[type=checkbox]+label+div>div,table.has-actions tr>.actions>[type=checkbox]+label+div>div,table.with-details tr>.actions>[type=checkbox]+label+div>div{padding:.625rem var(--padding-x);white-space:normal;max-width:fit-content}@supports not (max-width:fit-content){.disclosure-menu [aria-expanded]~*>div,.menu-panel>div,.more-popover-menu>[type=checkbox]+label+div>div,.popover-menu>[type=checkbox]+label+div>div,table.has-actions tr>.actions>[type=checkbox]+label+div>div,table.with-details tr>.actions>[type=checkbox]+label+div>div{max-width:200px}}.disclosure-menu [aria-expanded]~*>div::before,.menu-panel>div::before,.more-popover-menu>[type=checkbox]+label+div>div::before,.popover-menu>[type=checkbox]+label+div>div::before,table.has-actions tr>.actions>[type=checkbox]+label+div>div::before,table.with-details tr>.actions>[type=checkbox]+label+div>div::before{position:absolute;left:15px;top:calc(10px + .1em)}.disclosure-menu [aria-expanded]~*>ul>[role=treeitem]+*,.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem]+*,.disclosure-menu [aria-expanded]~*>ul>li>[role=option]+*,.menu-panel-deprecated>ul>li>div[role=menu],.menu-panel>ul>[role=treeitem]+*,.menu-panel>ul>li>[role=menuitem]+*,.menu-panel>ul>li>[role=option]+*,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]+*,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]+*,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option]+*,.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]+*,.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]+*,.popover-menu>[type=checkbox]+label+div>ul>li>[role=option]+*,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]+*,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]+*,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]+*,table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]+*,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]+*,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]+*{position:absolute;top:0;left:calc(100% + 10px)}.disclosure-menu [aria-expanded]~*>ul,.menu-panel>ul,.more-popover-menu>[type=checkbox]+label+div>ul,.popover-menu>[type=checkbox]+label+div>ul,table.has-actions tr>.actions>[type=checkbox]+label+div>ul,table.with-details tr>.actions>[type=checkbox]+label+div>ul{margin:0;padding:calc(var(--padding-y) - .625rem) 0;transition:transform 150ms}.disclosure-menu [aria-expanded]~*>ul,.disclosure-menu [aria-expanded]~*>ul>li,.disclosure-menu [aria-expanded]~*>ul>li>*,.menu-panel>ul,.menu-panel>ul>li,.menu-panel>ul>li>*,.more-popover-menu>[type=checkbox]+label+div>ul,.more-popover-menu>[type=checkbox]+label+div>ul>li,.more-popover-menu>[type=checkbox]+label+div>ul>li>*,.popover-menu>[type=checkbox]+label+div>ul,.popover-menu>[type=checkbox]+label+div>ul>li,.popover-menu>[type=checkbox]+label+div>ul>li>*,table.has-actions tr>.actions>[type=checkbox]+label+div>ul,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>*,table.with-details tr>.actions>[type=checkbox]+label+div>ul,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>*{width:100%}.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li,.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.menu-panel>ul>[role=treeitem],.menu-panel>ul>li,.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li,.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{text-align:left}.hashicorp-consul nav .dcs li.is-local span,.hashicorp-consul nav .dcs li.is-primary span{color:rgb(var(--tone-gray-000));background-color:rgb(var(--tone-gray-500));padding:0 8px;margin-left:.5rem}.disclosure-menu [aria-expanded]~*>ul>[role=treeitem]::after,.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem]::after,.disclosure-menu [aria-expanded]~*>ul>li>[role=option]::after,.menu-panel>ul>[role=treeitem]::after,.menu-panel>ul>li>[role=menuitem]::after,.menu-panel>ul>li>[role=option]::after,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]::after,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]::after,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option]::after,.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]::after,.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]::after,.popover-menu>[type=checkbox]+label+div>ul>li>[role=option]::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]::after{margin-left:auto;padding-right:var(--padding-x);transform:translate(calc(var(--padding-x)/ 2),0)}.disclosure-menu [aria-expanded]~* [role=separator],.menu-panel [role=separator],.more-popover-menu>[type=checkbox]+label+div [role=separator],.popover-menu>[type=checkbox]+label+div [role=separator],table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator],table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]{padding-top:.375rem}.disclosure-menu [aria-expanded]~* [role=separator]:not(:first-child),.menu-panel [role=separator]:not(:first-child),.more-popover-menu>[type=checkbox]+label+div [role=separator]:not(:first-child),.popover-menu>[type=checkbox]+label+div [role=separator]:not(:first-child),table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator]:not(:first-child),table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]:not(:first-child){margin-top:.275rem}.disclosure-menu [aria-expanded]~* [role=separator]:not(:empty),.menu-panel [role=separator]:not(:empty),.more-popover-menu>[type=checkbox]+label+div [role=separator]:not(:empty),.popover-menu>[type=checkbox]+label+div [role=separator]:not(:empty),table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator]:not(:empty),table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]:not(:empty){padding-left:var(--padding-x);padding-right:var(--padding-x);padding-bottom:.125rem}.disclosure-menu [aria-expanded]~.menu-panel-confirming,.menu-panel-confirming.menu-panel,.more-popover-menu>[type=checkbox]+label+div.menu-panel-confirming,.popover-menu>[type=checkbox]+label+div.menu-panel-confirming,table.has-actions tr>.actions>[type=checkbox]+label+div.menu-panel-confirming,table.with-details tr>.actions>[type=checkbox]+label+div.menu-panel-confirming{overflow:hidden}.disclosure-menu [aria-expanded]~.menu-panel-confirming>ul,.menu-panel-confirming.menu-panel>ul,.more-popover-menu>[type=checkbox]+label+div.menu-panel-confirming>ul,.popover-menu>[type=checkbox]+label+div.menu-panel-confirming>ul,table.has-actions tr>.actions>[type=checkbox]+label+div.menu-panel-confirming>ul,table.with-details tr>.actions>[type=checkbox]+label+div.menu-panel-confirming>ul{transform:translateX(calc(-100% - 10px))}.disclosure-menu [aria-expanded]~*,.menu-panel,.more-popover-menu>[type=checkbox]+label+div,.popover-menu>[type=checkbox]+label+div,table.has-actions tr>.actions>[type=checkbox]+label+div,table.with-details tr>.actions>[type=checkbox]+label+div{overflow:hidden}.menu-panel-deprecated{position:absolute;transition:min-height 150ms,max-height 150ms;min-height:0}.menu-panel-deprecated [type=checkbox]{display:none}.menu-panel-deprecated:not(.confirmation) [type=checkbox]~*{transition:transform 150ms}.confirmation.menu-panel-deprecated [role=menu]{min-height:205px!important}.menu-panel-deprecated [type=checkbox]:checked~*{transform:translateX(calc(-100% - 10px));min-height:143px;max-height:143px}.menu-panel-deprecated [id$="-"]:first-child:checked~ul label[for$="-"] * [role=menu],.menu-panel-deprecated [id$="-"]:first-child:checked~ul>li>[role=menu]{display:block}.menu-panel-deprecated>ul>li>:not(div[role=menu]),.tippy-box{position:relative}.menu-panel-deprecated:not(.left){right:0!important;left:auto!important}.left.menu-panel-deprecated{left:0}.menu-panel-deprecated:not(.above){top:28px}.above.menu-panel-deprecated{bottom:42px}.consul-upstream-instance-list dl.local-bind-socket-mode dt::after{display:inline;content:var(--horizontal-kv-list-key-separator)}.consul-bucket-list,.consul-exposed-path-list>ul>li>.detail dl,.consul-instance-checks,.consul-lock-session-list dl,.consul-lock-session-list ul>li:not(:first-child)>.detail dl,.consul-upstream-instance-list dl,.consul-upstream-instance-list li>.detail dl,.list-collection>ul>li:not(:first-child)>.detail dl,.tag-list,section[data-route="dc.show.license"] .validity dl,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl,td.tags{display:inline-flex;flex-wrap:nowrap;align-items:center}.consul-bucket-list:empty,.consul-exposed-path-list>ul>li>.detail dl:empty,.consul-instance-checks:empty,.consul-lock-session-list dl:empty,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:empty,.consul-upstream-instance-list dl:empty,.list-collection>ul>li:not(:first-child)>.detail dl:empty,.tag-list:empty,section[data-route="dc.show.license"] .validity dl:empty,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:empty,td.tags:empty{display:none}.consul-bucket-list>*>*,.consul-exposed-path-list>ul>li>.detail dl>*>*,.consul-instance-checks>*>*,.consul-lock-session-list dl>*>*,.consul-lock-session-list ul>li:not(:first-child)>.detail dl>*>*,.consul-upstream-instance-list dl>*>*,.consul-upstream-instance-list li>.detail dl>*>*,.list-collection>ul>li:not(:first-child)>.detail dl>*>*,.tag-list>*>*,section[data-route="dc.show.license"] .validity dl>*>*,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl>*>*,td.tags>*>*{display:inline-block}.consul-bucket-list>*,.consul-exposed-path-list>ul>li>.detail dl>*,.consul-instance-checks>*,.consul-lock-session-list dl>*,.consul-lock-session-list ul>li:not(:first-child)>.detail dl>*,.consul-upstream-instance-list dl>*,.consul-upstream-instance-list li>.detail dl>*,.list-collection>ul>li:not(:first-child)>.detail dl>*,.tag-list>*,section[data-route="dc.show.license"] .validity dl>*,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl>*,td.tags>*{white-space:nowrap}.consul-bucket-list>dd,.consul-exposed-path-list>ul>li>.detail dl>dd,.consul-instance-checks>dd,.consul-lock-session-list dl>dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl>dd,.consul-upstream-instance-list dl>dd,.consul-upstream-instance-list li>.detail dl>dd,.list-collection>ul>li:not(:first-child)>.detail dl>dd,.tag-list>dd,section[data-route="dc.show.license"] .validity dl>dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl>dd,td.tags>dd{flex-wrap:wrap}.consul-upstream-instance-list dl.local-bind-socket-mode dt{display:inline-flex;min-width:18px;overflow:hidden}.consul-bucket-list .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-bucket-list .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-bucket-list .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.consul-bucket-list .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.consul-bucket-list .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-bucket-list .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-bucket-list .tag-list:not([class]) dd+dt:not([class])+dd,.consul-bucket-list dd+dt,.consul-bucket-list td.tags:not([class]) dd+dt:not([class])+dd,.consul-bucket-list+.consul-bucket-list:not(:first-of-type),.consul-bucket-list+.consul-instance-checks:not(:first-of-type),.consul-bucket-list+.tag-list:not(:first-of-type),.consul-bucket-list+td.tags:not(:first-of-type),.consul-bucket-list:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,.consul-bucket-list:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-bucket-list:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,.consul-bucket-list:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-bucket-list:not([class]) .tag-list dd+dt:not([class])+dd,.consul-bucket-list:not([class]) dd+dt:not([class])+dd,.consul-bucket-list:not([class]) td.tags dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail .consul-bucket-list+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail .consul-instance-checks+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail .consul-lock-session-list dl+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail .consul-upstream-instance-list dl+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.consul-exposed-path-list>ul>li>.detail .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.consul-exposed-path-list>ul>li>.detail .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail .tag-list+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail dl .consul-bucket-list:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl .consul-instance-checks:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl .consul-lock-session-list dl:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl .consul-upstream-instance-list dl:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl .tag-list:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl dd+dt,.consul-exposed-path-list>ul>li>.detail dl section[data-route="dc.show.license"] .validity dl:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl td.tags:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl+.consul-bucket-list:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail dl+.consul-instance-checks:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail dl+.tag-list:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail dl+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail dl+td.tags:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail dl:not([class]) .consul-bucket-list dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) .consul-instance-checks dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) .consul-lock-session-list dl dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) .consul-upstream-instance-list dl dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) .tag-list dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) section[data-route="dc.show.license"] .validity dl dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) td.tags dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail section[data-route="dc.show.license"] .validity dl+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail td.tags+dl:not(:first-of-type),.consul-instance-checks .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-instance-checks .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-instance-checks .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.consul-instance-checks .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.consul-instance-checks .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-instance-checks .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-instance-checks .tag-list:not([class]) dd+dt:not([class])+dd,.consul-instance-checks dd+dt,.consul-instance-checks td.tags:not([class]) dd+dt:not([class])+dd,.consul-instance-checks+.consul-bucket-list:not(:first-of-type),.consul-instance-checks+.consul-instance-checks:not(:first-of-type),.consul-instance-checks+.tag-list:not(:first-of-type),.consul-instance-checks+td.tags:not(:first-of-type),.consul-instance-checks:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,.consul-instance-checks:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-instance-checks:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,.consul-instance-checks:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-instance-checks:not([class]) .tag-list dd+dt:not([class])+dd,.consul-instance-checks:not([class]) dd+dt:not([class])+dd,.consul-instance-checks:not([class]) td.tags dd+dt:not([class])+dd,.consul-lock-session-list .consul-bucket-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .consul-bucket-list+dl:not(:first-of-type),.consul-lock-session-list .consul-bucket-list:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list .consul-exposed-path-list>ul>li>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .consul-exposed-path-list>ul>li>.detail dl+dl:not(:first-of-type),.consul-lock-session-list .consul-exposed-path-list>ul>li>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-lock-session-list .consul-instance-checks ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .consul-instance-checks+dl:not(:first-of-type),.consul-lock-session-list .consul-instance-checks:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list dl li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list dl ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list dl+dl:not(:first-of-type),.consul-lock-session-list .consul-upstream-instance-list dl.local-bind-address dl dd+dt+dd,.consul-lock-session-list .consul-upstream-instance-list dl.local-bind-socket-path dl dd+dt+dd,.consul-lock-session-list .consul-upstream-instance-list dl:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list dl:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list li>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list li>.detail dl+dl:not(:first-of-type),.consul-lock-session-list .consul-upstream-instance-list li>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),.consul-lock-session-list .consul-upstream-instance-list ul>li:not(:first-child)>.detail dl.local-bind-address dd+dt+dd,.consul-lock-session-list .consul-upstream-instance-list ul>li:not(:first-child)>.detail dl.local-bind-socket-path dd+dt+dd,.consul-lock-session-list .consul-upstream-instance-list ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-lock-session-list .list-collection>ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .list-collection>ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),.consul-lock-session-list .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-lock-session-list .list-collection>ul>li:not(:first-child)>.detail ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .tag-list dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .tag-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .tag-list+dl:not(:first-of-type),.consul-lock-session-list .tag-list:not([class]) dl dd+dt:not([class])+dd,.consul-lock-session-list .tag-list:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list dl .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.consul-lock-session-list dl .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.consul-lock-session-list dl .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl .tag-list:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl dd+dt,.consul-lock-session-list dl td.tags:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl+.consul-bucket-list:not(:first-of-type),.consul-lock-session-list dl+.consul-instance-checks:not(:first-of-type),.consul-lock-session-list dl+.tag-list:not(:first-of-type),.consul-lock-session-list dl+dl:not(:first-of-type),.consul-lock-session-list dl+td.tags:not(:first-of-type),.consul-lock-session-list dl:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list dl:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list dl:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list dl:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list dl:not([class]) .tag-list dd+dt:not([class])+dd,.consul-lock-session-list dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl:not([class]) td.tags dd+dt:not([class])+dd,.consul-lock-session-list dl:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list section[data-route="dc.show.license"] .validity dl ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list section[data-route="dc.show.license"] .validity dl+dl:not(:first-of-type),.consul-lock-session-list section[data-route="dc.show.license"] .validity dl:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+dl:not(:first-of-type),.consul-lock-session-list section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list td.tags dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list td.tags ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list td.tags+dl:not(:first-of-type),.consul-lock-session-list td.tags:not([class]) dl dd+dt:not([class])+dd,.consul-lock-session-list td.tags:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail .consul-bucket-list+dl:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail .consul-instance-checks+dl:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail .consul-upstream-instance-list dl+dl:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail .tag-list+dl:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail dl .consul-bucket-list:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl .consul-instance-checks:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl .consul-upstream-instance-list dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl .tag-list:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt,.consul-lock-session-list ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl section[data-route="dc.show.license"] .validity dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl td.tags:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl+.consul-bucket-list:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail dl+.consul-instance-checks:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail dl+.tag-list:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail dl+td.tags:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) .consul-bucket-list dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) .consul-instance-checks dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) .consul-upstream-instance-list dl dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) .tag-list dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) section[data-route="dc.show.license"] .validity dl dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) td.tags dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail section[data-route="dc.show.license"] .validity dl+dl:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+dl:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail td.tags+dl:not(:first-of-type),.consul-upstream-instance-list .consul-bucket-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-bucket-list+dl:not(:first-of-type),.consul-upstream-instance-list .consul-bucket-list:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-exposed-path-list>ul>li>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-exposed-path-list>ul>li>.detail dl+dl:not(:first-of-type),.consul-upstream-instance-list .consul-exposed-path-list>ul>li>.detail dl.local-bind-address dd+dt+dd,.consul-upstream-instance-list .consul-exposed-path-list>ul>li>.detail dl.local-bind-socket-path dd+dt+dd,.consul-upstream-instance-list .consul-exposed-path-list>ul>li>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-instance-checks li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-instance-checks+dl:not(:first-of-type),.consul-upstream-instance-list .consul-instance-checks:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-lock-session-list dl li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-lock-session-list dl+dl:not(:first-of-type),.consul-upstream-instance-list .consul-lock-session-list dl:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-lock-session-list ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-lock-session-list ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),.consul-upstream-instance-list .consul-lock-session-list ul>li:not(:first-child)>.detail dl.local-bind-address dd+dt+dd,.consul-upstream-instance-list .consul-lock-session-list ul>li:not(:first-child)>.detail dl.local-bind-socket-path dd+dt+dd,.consul-upstream-instance-list .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-upstream-instance-list .list-collection>ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .list-collection>ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),.consul-upstream-instance-list .list-collection>ul>li:not(:first-child)>.detail dl.local-bind-address dd+dt+dd,.consul-upstream-instance-list .list-collection>ul>li:not(:first-child)>.detail dl.local-bind-socket-path dd+dt+dd,.consul-upstream-instance-list .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-upstream-instance-list .list-collection>ul>li:not(:first-child)>.detail li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .tag-list dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .tag-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .tag-list+dl:not(:first-of-type),.consul-upstream-instance-list .tag-list:not([class]) dl dd+dt:not([class])+dd,.consul-upstream-instance-list .tag-list:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list dl .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl .tag-list:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl dd+dt,.consul-upstream-instance-list dl li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl td.tags:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl+.consul-bucket-list:not(:first-of-type),.consul-upstream-instance-list dl+.consul-instance-checks:not(:first-of-type),.consul-upstream-instance-list dl+.tag-list:not(:first-of-type),.consul-upstream-instance-list dl+dl:not(:first-of-type),.consul-upstream-instance-list dl+td.tags:not(:first-of-type),.consul-upstream-instance-list dl.local-bind-address .consul-bucket-list dd+dt+dd,.consul-upstream-instance-list dl.local-bind-address .consul-instance-checks dd+dt+dd,.consul-upstream-instance-list dl.local-bind-address .consul-lock-session-list dl dd+dt+dd,.consul-upstream-instance-list dl.local-bind-address .tag-list dd+dt+dd,.consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.consul-upstream-instance-list dl.local-bind-address section[data-route="dc.show.license"] .validity dl dd+dt+dd,.consul-upstream-instance-list dl.local-bind-address section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt+dd,.consul-upstream-instance-list dl.local-bind-address td.tags dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path .consul-bucket-list dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path .consul-instance-checks dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path .consul-lock-session-list dl dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path .tag-list dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path section[data-route="dc.show.license"] .validity dl dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path td.tags dd+dt+dd,.consul-upstream-instance-list dl:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list dl:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list dl:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list dl:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list dl:not([class]) .tag-list dd+dt:not([class])+dd,.consul-upstream-instance-list dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list dl:not([class]) td.tags dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail .consul-bucket-list+dl:not(:first-of-type),.consul-upstream-instance-list li>.detail .consul-instance-checks+dl:not(:first-of-type),.consul-upstream-instance-list li>.detail .consul-lock-session-list dl+dl:not(:first-of-type),.consul-upstream-instance-list li>.detail .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail .tag-list+dl:not(:first-of-type),.consul-upstream-instance-list li>.detail dl .consul-bucket-list:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl .consul-instance-checks:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl .consul-lock-session-list dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl .tag-list:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl dd+dt,.consul-upstream-instance-list li>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl section[data-route="dc.show.license"] .validity dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl td.tags:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl+.consul-bucket-list:not(:first-of-type),.consul-upstream-instance-list li>.detail dl+.consul-instance-checks:not(:first-of-type),.consul-upstream-instance-list li>.detail dl+.tag-list:not(:first-of-type),.consul-upstream-instance-list li>.detail dl+dl:not(:first-of-type),.consul-upstream-instance-list li>.detail dl+td.tags:not(:first-of-type),.consul-upstream-instance-list li>.detail dl.local-bind-address dd+dt+dd,.consul-upstream-instance-list li>.detail dl.local-bind-socket-path dd+dt+dd,.consul-upstream-instance-list li>.detail dl:not([class]) .consul-bucket-list dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) .consul-instance-checks dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) .consul-lock-session-list dl dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) .tag-list dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) section[data-route="dc.show.license"] .validity dl dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) td.tags dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail section[data-route="dc.show.license"] .validity dl+dl:not(:first-of-type),.consul-upstream-instance-list li>.detail section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+dl:not(:first-of-type),.consul-upstream-instance-list li>.detail td.tags+dl:not(:first-of-type),.consul-upstream-instance-list section[data-route="dc.show.license"] .validity dl li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list section[data-route="dc.show.license"] .validity dl+dl:not(:first-of-type),.consul-upstream-instance-list section[data-route="dc.show.license"] .validity dl:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+dl:not(:first-of-type),.consul-upstream-instance-list section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list td.tags dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list td.tags li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list td.tags+dl:not(:first-of-type),.consul-upstream-instance-list td.tags:not([class]) dl dd+dt:not([class])+dd,.consul-upstream-instance-list td.tags:not([class]) li>.detail dl dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail .consul-bucket-list+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail .consul-instance-checks+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail .consul-lock-session-list dl+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail .consul-upstream-instance-list dl+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.list-collection>ul>li:not(:first-child)>.detail .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.list-collection>ul>li:not(:first-child)>.detail .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail .tag-list+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail dl .consul-bucket-list:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl .consul-instance-checks:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl .consul-lock-session-list dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl .consul-upstream-instance-list dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl .tag-list:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl dd+dt,.list-collection>ul>li:not(:first-child)>.detail dl section[data-route="dc.show.license"] .validity dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl td.tags:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl+.consul-bucket-list:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail dl+.consul-instance-checks:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail dl+.tag-list:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail dl+td.tags:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) .consul-bucket-list dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) .consul-instance-checks dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) .consul-lock-session-list dl dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) .consul-upstream-instance-list dl dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) .tag-list dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) section[data-route="dc.show.license"] .validity dl dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) td.tags dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail section[data-route="dc.show.license"] .validity dl+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail td.tags+dl:not(:first-of-type),.tag-list .consul-bucket-list:not([class]) dd+dt:not([class])+dd,.tag-list .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,.tag-list .consul-instance-checks:not([class]) dd+dt:not([class])+dd,.tag-list .consul-lock-session-list dl:not([class]) dd+dt:not([class])+dd,.tag-list .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.tag-list .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.tag-list .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.tag-list .consul-upstream-instance-list dl:not([class]) dd+dt:not([class])+dd,.tag-list .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.tag-list .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.tag-list dd+dt,.tag-list section[data-route="dc.show.license"] .validity dl:not([class]) dd+dt:not([class])+dd,.tag-list section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dd+dt:not([class])+dd,.tag-list td.tags:not([class]) dd+dt:not([class])+dd,.tag-list+.consul-bucket-list:not(:first-of-type),.tag-list+.consul-instance-checks:not(:first-of-type),.tag-list+.tag-list:not(:first-of-type),.tag-list+td.tags:not(:first-of-type),.tag-list:not([class]) .consul-bucket-list dd+dt:not([class])+dd,.tag-list:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,.tag-list:not([class]) .consul-instance-checks dd+dt:not([class])+dd,.tag-list:not([class]) .consul-lock-session-list dl dd+dt:not([class])+dd,.tag-list:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.tag-list:not([class]) .consul-upstream-instance-list dl dd+dt:not([class])+dd,.tag-list:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,.tag-list:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.tag-list:not([class]) dd+dt:not([class])+dd,.tag-list:not([class]) section[data-route="dc.show.license"] .validity dl dd+dt:not([class])+dd,.tag-list:not([class]) section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt:not([class])+dd,.tag-list:not([class]) td.tags dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-bucket-list+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .consul-exposed-path-list>ul>li>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-exposed-path-list>ul>li>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .consul-exposed-path-list>ul>li>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-instance-checks+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .consul-lock-session-list dl ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-lock-session-list dl+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .consul-lock-session-list dl:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-lock-session-list ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-lock-session-list ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-upstream-instance-list dl li>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-upstream-instance-list dl+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .consul-upstream-instance-list dl.local-bind-address dl dd+dt+dd,section[data-route="dc.show.license"] .validity .consul-upstream-instance-list dl.local-bind-socket-path dl dd+dt+dd,section[data-route="dc.show.license"] .validity .consul-upstream-instance-list dl:not([class]) li>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-upstream-instance-list li>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-upstream-instance-list li>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .consul-upstream-instance-list li>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .list-collection>ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .list-collection>ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .tag-list dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .tag-list+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .tag-list:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,section[data-route="dc.show.license"] .validity dl .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,section[data-route="dc.show.license"] .validity dl .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl .tag-list:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl dd+dt,section[data-route="dc.show.license"] .validity dl td.tags:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl+.consul-bucket-list:not(:first-of-type),section[data-route="dc.show.license"] .validity dl+.consul-instance-checks:not(:first-of-type),section[data-route="dc.show.license"] .validity dl+.tag-list:not(:first-of-type),section[data-route="dc.show.license"] .validity dl+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity dl+td.tags:not(:first-of-type),section[data-route="dc.show.license"] .validity dl:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl:not([class]) .tag-list dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl:not([class]) td.tags dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity td.tags dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity td.tags+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity td.tags:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-bucket-list+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-exposed-path-list>ul>li>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-exposed-path-list>ul>li>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-exposed-path-list>ul>li>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-instance-checks+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-lock-session-list dl ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-lock-session-list dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-lock-session-list dl:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-lock-session-list ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-lock-session-list ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list dl li>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list dl.local-bind-address dl dd+dt+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list dl.local-bind-socket-path dl dd+dt+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list dl:not([class]) li>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list li>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list li>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list li>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .list-collection>ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .list-collection>ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .tag-list dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .tag-list+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .tag-list:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .tag-list:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl td.tags:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+.consul-bucket-list:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+.consul-instance-checks:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+.tag-list:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+td.tags:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) .tag-list dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) td.tags dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header td.tags dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header td.tags+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header td.tags:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section[data-route="dc.show.license"] .validity header dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section[data-route="dc.show.license"] header .validity dl+dl:not(:first-of-type),td.tags .consul-bucket-list:not([class]) dd+dt:not([class])+dd,td.tags .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,td.tags .consul-instance-checks:not([class]) dd+dt:not([class])+dd,td.tags .consul-lock-session-list dl:not([class]) dd+dt:not([class])+dd,td.tags .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,td.tags .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,td.tags .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,td.tags .consul-upstream-instance-list dl:not([class]) dd+dt:not([class])+dd,td.tags .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,td.tags .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,td.tags .tag-list:not([class]) dd+dt:not([class])+dd,td.tags dd+dt,td.tags section[data-route="dc.show.license"] .validity dl:not([class]) dd+dt:not([class])+dd,td.tags section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dd+dt:not([class])+dd,td.tags+.consul-bucket-list:not(:first-of-type),td.tags+.consul-instance-checks:not(:first-of-type),td.tags+.tag-list:not(:first-of-type),td.tags+td.tags:not(:first-of-type),td.tags:not([class]) .consul-bucket-list dd+dt:not([class])+dd,td.tags:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,td.tags:not([class]) .consul-instance-checks dd+dt:not([class])+dd,td.tags:not([class]) .consul-lock-session-list dl dd+dt:not([class])+dd,td.tags:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,td.tags:not([class]) .consul-upstream-instance-list dl dd+dt:not([class])+dd,td.tags:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,td.tags:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,td.tags:not([class]) .tag-list dd+dt:not([class])+dd,td.tags:not([class]) dd+dt:not([class])+dd,td.tags:not([class]) section[data-route="dc.show.license"] .validity dl dd+dt:not([class])+dd,td.tags:not([class]) section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt:not([class])+dd{margin-left:var(--horizontal-kv-list-separator-width)}.consul-bucket-list dt+dd,.consul-exposed-path-list>ul>li>.detail dl dt+dd,.consul-instance-checks dt+dd,.consul-lock-session-list dl dt+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl dt+dd,.consul-upstream-instance-list dl dt+dd,.consul-upstream-instance-list li>.detail dl dt+dd,.list-collection>ul>li:not(:first-child)>.detail dl dt+dd,.tag-list dt+dd,section[data-route="dc.show.license"] .validity dl dt+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dt+dd,td.tags dt+dd{margin-left:4px}.consul-bucket-list:not([class]) dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) dt:not([class])+dd,.consul-instance-checks:not([class]) dt:not([class])+dd,.consul-lock-session-list dl:not([class]) dt:not([class])+dd,.consul-upstream-instance-list dl.local-bind-address dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path dt+dd,.consul-upstream-instance-list dl:not([class]) dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dt:not([class])+dd,.tag-list:not([class]) dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl:not([class]) dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dt:not([class])+dd,td.tags:not([class]) dt:not([class])+dd{margin-left:0!important}.consul-lock-session-list .checks dd,.discovery-chain .resolver-card ol,.tag-list dd,td.tags dd{display:flex}.consul-lock-session-list .checks dd>:not(:last-child)::after,.discovery-chain .resolver-card ol>:not(:last-child)::after,.tag-list dd>:not(:last-child)::after,td.tags dd>:not(:last-child)::after{display:inline;content:var(--csv-list-separator);vertical-align:initial;margin-right:.3em}.tag-list dt::before,td.tags dt::before{color:inherit;color:rgb(var(--tone-gray-500))}.consul-exposed-path-list>ul>li>.detail dl>dt>*,.consul-lock-session-list ul>li:not(:first-child)>.detail dl>dt>*,.consul-upstream-instance-list li>.detail dl>dt>*,.list-collection>ul>li:not(:first-child)>.detail dl>dt>*{display:none}.consul-exposed-path-list>ul>li>.detail dl.passing dt::before,.consul-exposed-path-list>ul>li>.header .passing dd::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.passing dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .passing dd::before,.consul-upstream-instance-list li>.detail dl.passing dt::before,.consul-upstream-instance-list li>.header .passing dd::before,.list-collection>ul>li:not(:first-child)>.detail dl.passing dt::before,.list-collection>ul>li:not(:first-child)>.header .passing dd::before{color:rgb(var(--tone-green-500))}.consul-exposed-path-list>ul>li>.detail dl.warning dt::before,.consul-exposed-path-list>ul>li>.header .warning dd::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.warning dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .warning dd::before,.consul-upstream-instance-list li>.detail dl.warning dt::before,.consul-upstream-instance-list li>.header .warning dd::before,.list-collection>ul>li:not(:first-child)>.detail dl.warning dt::before,.list-collection>ul>li:not(:first-child)>.header .warning dd::before{color:rgb(var(--tone-orange-500))}.consul-exposed-path-list>ul>li>.detail dl.critical dt::before,.consul-exposed-path-list>ul>li>.header .critical dd::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.critical dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .critical dd::before,.consul-upstream-instance-list li>.detail dl.critical dt::before,.consul-upstream-instance-list li>.header .critical dd::before,.list-collection>ul>li:not(:first-child)>.detail dl.critical dt::before,.list-collection>ul>li:not(:first-child)>.header .critical dd::before{color:rgb(var(--tone-red-500))}.consul-exposed-path-list>ul>li>.detail dl.empty dt::before,.consul-exposed-path-list>ul>li>.header .empty dd::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.empty dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .empty dd::before,.consul-upstream-instance-list li>.detail dl.empty dt::before,.consul-upstream-instance-list li>.header .empty dd::before,.list-collection>ul>li:not(:first-child)>.detail dl.empty dt::before,.list-collection>ul>li:not(:first-child)>.header .empty dd::before{color:rgb(var(--tone-gray-500))}.consul-exposed-path-list>ul>li>.header [rel=me] dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header [rel=me] dd::before,.consul-upstream-instance-list li>.header [rel=me] dd::before,.list-collection>ul>li:not(:first-child)>.header [rel=me] dd::before{color:rgb(var(--tone-blue-500))}.app-view>div form:not(.filter-bar) [role=radiogroup] label>em>code,.modal-dialog [role=document] .type-password>em>code,.modal-dialog [role=document] .type-select>em>code,.modal-dialog [role=document] .type-text>em>code,.modal-dialog [role=document] [role=radiogroup] label>em>code,.modal-dialog [role=document] form button+em>code,.modal-dialog [role=document] p code,.oidc-select label>em>code,.type-toggle>em>code,main .type-password>em>code,main .type-select>em>code,main .type-text>em>code,main form button+em>code,main p code{border:1px solid;color:rgb(var(--tone-brand-600));background-color:rgb(var(--tone-gray-050));border-color:rgb(var(--tone-gray-200));display:inline-block;padding:0 4px}[data-tippy-root]{max-width:calc(100vw - 10px)}.tippy-box{outline:0;transition-property:transform,visibility,opacity;background-color:rgb(var(--tone-gray-000));border-radius:var(--decor-radius-100)}[data-animation=fade][data-state=hidden].tippy-box{opacity:0}[data-inertia][data-state=visible].tippy-box{transition-timing-function:cubic-bezier(.54,1.5,.38,1.11)}.tippy-box .tippy-arrow{--size:5px}.tippy-box .tippy-arrow::before{content:"";position:absolute}[data-placement^=top].tippy-box>.tippy-arrow{bottom:0}[data-placement^=top].tippy-box>.tippy-arrow::before{left:0;bottom:calc(0px - var(--size));transform-origin:center top}[data-placement^=bottom].tippy-box>.tippy-arrow{top:0}[data-placement^=bottom].tippy-box>.tippy-arrow::before{left:0;top:calc(0px - var(--size));transform-origin:center bottom}[data-placement^=left].tippy-box>.tippy-arrow{right:0}[data-placement^=left].tippy-box>.tippy-arrow::before{right:calc(0px - var(--size));transform-origin:center left}[data-placement^=right].tippy-box>.tippy-arrow{left:0}[data-placement^=right].tippy-box>.tippy-arrow::before{left:calc(0px - var(--size));transform-origin:center right}[data-theme~=square-tail] .tippy-arrow{--size:18px;left:calc(0px - (var(--size)/ 2))!important}[data-theme~=square-tail] .tippy-arrow::before{background-color:rgb(var(--tone-gray-000));width:calc(1px + var(--size));height:calc(1px + var(--size));border:var(--decor-border-100);border-color:rgb(var(--tone-gray-300))}[data-theme~=square-tail] .tippy-arrow::after{position:absolute;left:1px}[data-theme~=square-tail][data-placement^=top]{bottom:-10px}[data-theme~=square-tail][data-placement^=top] .informed-action{border-bottom-left-radius:0!important}[data-theme~=square-tail][data-placement^=top] .tippy-arrow::before{border-bottom-left-radius:var(--decor-radius-200);border-bottom-right-radius:var(--decor-radius-200);border-top:0!important}[data-theme~=square-tail][data-placement^=top] .tippy-arrow::after{bottom:calc(0px - var(--size))}[data-theme~=square-tail][data-placement^=bottom]{top:-10px}[data-theme~=square-tail][data-placement^=bottom] .informed-action{border-top-left-radius:0!important}[data-theme~=square-tail][data-placement^=bottom] .tippy-arrow::before{border-top-left-radius:var(--decor-radius-200);border-top-right-radius:var(--decor-radius-200);border-bottom:0!important}[data-theme~=square-tail][data-placement^=bottom] .tippy-arrow::after{top:calc(0px - var(--size))}.tippy-box[data-theme~=tooltip] .tippy-content{padding:12px;max-width:224px;position:relative;z-index:1}.tippy-box[data-theme~=tooltip]{background-color:rgb(var(--tone-gray-700));color:rgb(var(--tone-gray-000))}.tippy-box[data-theme~=tooltip] .tippy-arrow{--size:5px;color:rgb(var(--tone-gray-700));width:calc(var(--size) * 2);height:calc(var(--size) * 2)}.tippy-box[data-theme~=tooltip] .tippy-arrow::before{border-color:var(--transparent);border-style:solid}.tippy-box[data-theme~=tooltip][data-placement^=top]>.tippy-arrow::before{border-width:var(--size) var(--size) 0;border-top-color:initial}.tippy-box[data-theme~=tooltip][data-placement^=bottom]>.tippy-arrow::before{border-width:0 var(--size) var(--size);border-bottom-color:initial}.tippy-box[data-theme~=tooltip][data-placement^=left]>.tippy-arrow::before{border-width:var(--size) 0 var(--size) var(--size);border-left-color:initial}.tippy-box[data-theme~=tooltip][data-placement^=right]>.tippy-arrow::before{border-width:var(--size) var(--size) var(--size) 0;border-right-color:initial}.consul-intention-list .notice.allow,.consul-intention-list .notice.deny,.consul-intention-list .notice.permissions,.notice.error,.notice.highlight,.notice.info,.notice.policy-management,.notice.success,.notice.warning{border-radius:var(--decor-radius-100);border:var(--decor-border-100);color:rgb(var(--tone-gray-999))}.consul-intention-list .notice.allow footer *,.consul-intention-list .notice.deny footer *,.consul-intention-list .notice.permissions footer *,.notice.error footer *,.notice.highlight footer *,.notice.info footer *,.notice.policy-management footer *,.notice.success footer *,.notice.warning footer *{font-weight:var(--typo-weight-bold)}.consul-intention-list .notice.allow,.notice.success{background-color:rgb(var(--tone-green-050));border-color:rgb(var(--tone-green-500))}.consul-intention-list .notice.allow header *,.notice.success header *{color:rgb(var(--tone-green-800))}.consul-intention-list .notice.permissions,.notice.info{border-color:rgb(var(--tone-blue-100));background-color:rgb(var(--tone-blue-010))}.notice.highlight,.notice.policy-management{background-color:rgb(var(--tone-gray-050));border-color:rgb(var(--tone-gray-300))}.consul-intention-list .notice.permissions header *,.notice.info header *{color:rgb(var(--tone-blue-700))}.notice.warning{border-color:rgb(var(--tone-yellow-100));background-color:rgb(var(--tone-yellow-050))}.notice.warning header *{color:rgb(var(--tone-yellow-800))}.consul-intention-list .notice.deny,.notice.error{background-color:rgb(var(--tone-red-050));border-color:rgb(var(--tone-red-500))}.consul-intention-list .notice.deny header *,.notice.error header *{color:rgb(var(--tone-red-500))}.consul-health-check-list .passing.health-check-output::before,.consul-intention-list .notice.allow::before,.notice.success::before{color:rgb(var(--tone-green-500))}.consul-intention-list .notice.permissions::before,.notice.info::before{color:rgb(var(--tone-blue-500))}.notice.highlight::before,.notice.policy-management::before{color:rgb(var(--tone-yellow-500))}.notice.warning::before{color:rgb(var(--tone-orange-500))}.consul-intention-list .notice.deny::before,.notice.error::before{color:rgb(var(--tone-red-500))}.consul-intention-list .notice.allow header,.consul-intention-list .notice.deny header,.consul-intention-list .notice.permissions header,.notice.error header,.notice.highlight header,.notice.info header,.notice.policy-management header,.notice.success header,.notice.warning header{margin-bottom:.1rem}.consul-intention-list .notice.allow header>*,.consul-intention-list .notice.deny header>*,.consul-intention-list .notice.permissions header>*,.notice.error header>*,.notice.highlight header>*,.notice.info header>*,.notice.policy-management header>*,.notice.success header>*,.notice.warning header>*{margin-bottom:0}.consul-intention-list .notice.allow p,.consul-intention-list .notice.deny p,.consul-intention-list .notice.permissions p,.notice.error p,.notice.highlight p,.notice.info p,.notice.policy-management p,.notice.success p,.notice.warning p{margin-bottom:.3rem;line-height:1.4}.consul-intention-list .notice.allow,.consul-intention-list .notice.deny,.consul-intention-list .notice.permissions,.notice.error,.notice.highlight,.notice.info,.notice.policy-management,.notice.success,.notice.warning{position:relative;padding:.8rem;padding-left:calc(.8rem + 1.4rem);margin:1em 0}.consul-intention-list .notice.allow::before,.consul-intention-list .notice.deny::before,.consul-intention-list .notice.permissions::before,.notice.error::before,.notice.highlight::before,.notice.info::before,.notice.policy-management::before,.notice.success::before,.notice.warning::before{position:absolute;top:.8rem;left:.6rem;font-size:1rem}.notice.crd::before{-webkit-mask-image:none;mask-image:none;background-color:transparent}.warning.modal-dialog header{background-color:rgb(var(--tone-yellow-050));border-color:rgb(var(--tone-yellow-500));color:rgb(var(--tone-yellow-800))}.warning.modal-dialog header>:not(label){font-size:var(--typo-size-500);font-weight:var(--typo-weight-semibold)}.warning.modal-dialog header::before{color:rgb(var(--tone-yellow-500));float:left;margin-top:2px;margin-right:3px}.modal-dialog>div:first-child{background-color:rgb(var(--tone-gray-000) /90%)}.modal-dialog [role=document]{box-shadow:var(--decor-elevation-800);background-color:rgb(var(--tone-gray-000))}.modal-dialog [role=document]>footer,.modal-dialog [role=document]>header,.modal-dialog-body{border-color:rgb(var(--tone-gray-300))}.modal-dialog-body{border-style:solid;border-left-width:1px;border-right-width:1px}.modal-dialog [role=document]>header button::before{margin-left:-7px;margin-top:-3px}.modal-layer{height:0}.modal-dialog [role=document] table{height:150px!important}.modal-dialog [role=document] tbody{max-height:100px}.modal-dialog table{min-height:149px}.modal-dialog,.modal-dialog>div:first-child{position:fixed;top:0;right:0;bottom:0;left:0}.modal-dialog{z-index:500;display:flex;align-items:center;justify-content:center;height:100%}.role-selector [name="role[state]"],.role-selector [name="role[state]"]+*,[aria-hidden=true].modal-dialog{display:none}.modal-dialog [role=document]{margin:auto;z-index:2;max-width:855px;position:relative}.modal-dialog [role=document]>*{padding-left:15px;padding-right:15px}.modal-dialog [role=document]>div{overflow-y:auto;max-height:80vh;padding:20px 23px}.modal-dialog [role=document]>footer,.modal-dialog [role=document]>header{border-width:1px;padding-top:12px;padding-bottom:10px}.modal-dialog [role=document]>header{position:relative}.modal-dialog [role=document]>header button{cursor:pointer;border:var(--decor-border-100);background-color:rgb(var(--tone-gray-050));border-color:rgb(var(--tone-gray-300));border-radius:var(--decor-radius-100);float:right;width:24px;height:24px;margin-top:-3px}.list-collection>ul{border-top:1px solid;border-color:rgb(var(--tone-gray-200))}.list-collection>button{cursor:pointer;background-color:rgb(var(--tone-gray-050));color:rgb(var(--tone-blue-500));width:100%;padding:15px}.list-collection-scroll-virtual,.list-collection>ul>li{position:relative}.list-collection-scroll-virtual{height:500px}.filter-bar{background-color:rgb(var(--tone-gray-010));border-bottom:var(--decor-border-100);border-color:rgb(var(--tone-gray-200));padding:4px 8px}.filter-bar .filters .popover-menu>[type=checkbox]:checked+label button,.filter-bar .sort .popover-menu>[type=checkbox]:checked+label button{color:rgb(var(--tone-blue-500));background-color:rgb(var(--tone-gray-100))}.filter-bar,.filter-bar>div{display:flex}.filter-bar .sort{margin-left:auto}.filter-bar .popover-select{position:relative;z-index:3}.filter-bar .popover-menu>[type=checkbox]+label button{padding-left:1.5rem!important;padding-right:1.5rem!important}.filter-bar .popover-menu [role=menuitem]{justify-content:normal!important}@media (max-width:1379px){.filter-bar,.filter-bar>div{flex-wrap:wrap}.filter-bar .search{position:relative;z-index:4;width:100%;margin-bottom:.3rem}}@media (max-width:995px){.filter-bar .filters,.filter-bar .sort{display:none}}html[data-route^="dc.acls.index"] .filter-bar{color:inherit}.freetext-filter{border:var(--decor-border-100);border-radius:var(--decor-radius-100);background-color:rgb(var(--tone-gray-000));border-color:rgb(var(--tone-gray-200));color:rgb(var(--tone-gray-400))}.freetext-filter:hover,.freetext-filter:hover *{border-color:rgb(var(--tone-gray-400))}.freetext-filter *,.freetext-filter_input::placeholder{cursor:inherit;color:inherit;border-color:inherit}.freetext-filter_input{-webkit-appearance:none;border:none}.freetext-filter_label::after{visibility:visible;--icon-name:icon-search;content:"";position:absolute;top:50%;left:50%;width:16px;height:16px;margin-left:-8px;margin-top:-8px}.freetext-filter .popover-menu{background-color:rgb(var(--tone-gray-050));color:rgb(var(--tone-gray-800));border-left:1px solid;border-color:inherit}.freetext-filter .popover-menu>[type=checkbox]:checked+label button{background-color:rgb(var(--tone-gray-200))}.freetext-filter{--height:2.2rem;display:flex;position:relative;height:var(--height);width:100%}.freetext-filter>label,.freetext-filter_input{flex-grow:1}.freetext-filter_input,.freetext-filter_label{height:100%}.freetext-filter_input{padding:8px 10px;padding-left:var(--height);min-width:12.7rem;width:100%}.freetext-filter_label{visibility:hidden;position:absolute;z-index:1;width:var(--height)}.informed-action{border-radius:var(--decor-radius-200);border:var(--decor-border-100);border-color:rgb(var(--tone-gray-300));background-color:rgb(var(--tone-gray-000));min-width:190px}.informed-action>div{border-top-left-radius:var(--decor-radius-200);border-top-right-radius:var(--decor-radius-200);cursor:default;padding:1rem}.informed-action p{color:rgb(var(--tone-gray-999))}.informed-action>ul>li>:focus,.informed-action>ul>li>:hover{background-color:rgb(var(--tone-gray-100))}.info.informed-action header{color:rgb(var(--tone-blue-700))}.info.informed-action header::before{background-color:rgb(var(--tone-blue-500));margin-right:5px}.info.informed-action>div{background-color:rgb(var(--tone-blue-010))}.dangerous.informed-action header{color:rgb(var(--tone-red-700))}.dangerous.informed-action header::before{background-color:rgb(var(--tone-red-500))}.dangerous.informed-action>div{background-color:rgb(var(--tone-red-010))}.warning.informed-action header{color:rgb(var(--tone-orange-700))}.warning.informed-action header::before{background-color:rgb(var(--tone-yellow-500));margin-right:5px}.warning.informed-action>div{background-color:rgb(var(--tone-yellow-050))}.informed-action>ul>.action>*{color:rgb(var(--tone-blue-500))}.documentation.informed-action{min-width:270px}.informed-action header::before{float:left;margin-right:5px}.informed-action>ul{list-style:none;display:flex;margin:0;padding:4px}.informed-action>ul>li{width:50%}.informed-action>ul>li>*{width:100%}.tab-nav ul{list-style-type:none;display:inline-flex;align-items:center;position:relative;padding:0;margin:0}.tab-nav li>:not(:disabled){cursor:pointer}.tab-nav{border-bottom:var(--decor-border-100)}.animatable.tab-nav ul::after,.tab-nav li>*{border-bottom:var(--decor-border-300)}.tab-nav{border-color:rgb(var(--tone-gray-200));clear:both;overflow:auto;letter-spacing:.03em}.tab-nav li>*{white-space:nowrap;transition-property:background-color,border-color;border-color:var(--transparent);color:rgb(var(--tone-gray-500));display:inline-block;padding:16px 13px}.tab-nav li:not(.selected)>:active,.tab-nav li:not(.selected)>:focus,.tab-nav li:not(.selected)>:hover{background-color:rgb(var(--tone-gray-100))}.tab-nav li:not(.selected)>:focus,.tab-nav li:not(.selected)>:hover{border-color:rgb(var(--tone-gray-300))}.animatable.tab-nav .selected a{border-color:var(--transparent)!important}.animatable.tab-nav ul::after{position:absolute;bottom:0;height:0;border-top:0;width:calc(var(--selected-width,0) * 1px);transform:translate(calc(var(--selected-left,0) * 1px),0);transition-property:transform,width}.search-bar-status{border-bottom:var(--decor-border-100);border-bottom-color:rgb(var(--tone-gray-200));padding:.5rem 0 .5rem .5rem}.search-bar-status li:not(.remove-all) button::before{color:rgb(var(--tone-gray-600));margin-top:1px;margin-right:.2rem}.search-bar-status dt::after{content:":";padding-right:.3rem}.search-bar-status>dl>dt{float:left}.search-bar-status dt{white-space:nowrap}.search-bar-status li{display:inline-flex}.search-bar-status li:not(:last-child){margin-right:.3rem;margin-bottom:.3rem}.search-bar-status li:not(.remove-all){border:var(--decor-border-100);border-color:rgb(var(--tone-gray-200));color:rgb(var(--tone-gray-600));padding:0 .2rem}.search-bar-status li:not(.remove-all) dl{display:flex}.search-bar-status li:not(.remove-all) button{cursor:pointer;padding:0}.certificate{display:flex}.certificate button.visibility{height:fit-content;padding-top:4px;margin-right:4px;cursor:pointer}.certificate code{background-color:rgb(var(--tone-gray-050));overflow-wrap:break-word;max-width:min-content;padding:0 12px}.certificate hr{border:3px dashed;background-color:rgb(var(--tone-gray-000));width:150px;margin:9px auto auto}.consul-loader circle{fill:rgb(var(--tone-brand-100));animation:loader-animation 1.5s infinite ease-in-out;transform-origin:50% 50%}.consul-loader g:nth-last-child(2) circle{animation-delay:.2s}.consul-loader g:nth-last-child(3) circle{animation-delay:.3s}.consul-loader g:nth-last-child(4) circle{animation-delay:.4s}.consul-loader g:nth-last-child(5) circle{animation-delay:.5s}@keyframes loader-animation{0%,100%{transform:scale3D(1,1,1)}33%{transform:scale3D(0,0,1)}}.consul-loader{display:flex;align-items:center;justify-content:center;height:100%;position:absolute;width:100%;top:0;margin-top:0!important}.tomography-graph .background{fill:rgb(var(--tone-gray-050))}.tomography-graph .axis{fill:none;stroke:rgb(var(--tone-gray-300));stroke-dasharray:4 4}.tomography-graph .border{fill:none;stroke:rgb(var(--tone-gray-300))}.tomography-graph .point{stroke:rgb(var(--tone-gray-400));fill:rgb(var(--tone-magenta-600))}.tomography-graph .lines rect{fill:rgb(var(--tone-magenta-600));stroke:transparent;stroke-width:5px}.tomography-graph .lines rect:hover{fill:rgb(var(--tone-gray-300));height:3px;y:-1px}.tomography-graph .tick line{stroke:rgb(var(--tone-gray-300))}.tomography-graph .tick text{font-size:var(--typo-size-600);text-anchor:start;color:rgb(var(--tone-gray-900))}.discovery-chain .resolver-card,.discovery-chain .route-card,.discovery-chain .splitter-card,.discovery-chain path{transition-duration:.1s;transition-timing-function:linear;cursor:pointer}.discovery-chain path{transition-property:stroke;fill:none;stroke:rgb(var(--tone-gray-400));stroke-width:2;vector-effect:non-scaling-stroke}#downstream-lines svg circle,#upstream-lines svg circle,.discovery-chain circle{fill:rgb(var(--tone-gray-000))}.discovery-chain .resolver-card,.discovery-chain .resolver-card a,.discovery-chain .route-card,.discovery-chain .route-card a,.discovery-chain .splitter-card,.discovery-chain .splitter-card a{color:rgb(var(--tone-gray-900))!important}.discovery-chain path:focus,.discovery-chain path:hover{stroke:rgb(var(--tone-gray-900))}.discovery-chain .resolvers,.discovery-chain .routes,.discovery-chain .splitters{border-radius:var(--decor-radius-100);border:1px solid;border-color:rgb(var(--tone-gray-200));background-color:rgb(var(--tone-gray-100));pointer-events:none}.discovery-chain .resolver-card,.discovery-chain .resolvers>header span,.discovery-chain .route-card,.discovery-chain .routes>header span,.discovery-chain .splitter-card,.discovery-chain .splitters>header span{pointer-events:all}.discovery-chain .resolvers>header>*,.discovery-chain .routes>header>*,.discovery-chain .splitters>header>*{text-transform:uppercase}.discovery-chain .resolvers>header span::after,.discovery-chain .routes>header span::after,.discovery-chain .splitters>header span::after{width:1.2em;height:1.2em;opacity:.6}.discovery-chain .resolver-card,.discovery-chain .route-card,.discovery-chain .splitter-card{transition-property:opacity background-color border-color;margin-top:0!important}.discovery-chain [id*=":"]:not(path):hover{opacity:1;background-color:rgb(var(--tone-gray-000));border-color:rgb(var(--tone-gray-500))}.discovery-chain .route-card header:not(.short) dd{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.discovery-chain .route-card section header>*{visibility:hidden}.discovery-chain .route-card .match-headers header ::before{content:"H"}.discovery-chain .route-card .match-queryparams header>::before{content:"Q"}.discovery-chain .resolver-card dt::before{content:"";--icon-size:icon-999}.discovery-chain .resolver-card dl.failover dt::before{--icon-name:icon-cloud-cross}.discovery-chain .resolver-card dl.redirect dt::before{--icon-name:icon-redirect}.discovery-chain circle{stroke-width:2;stroke:rgb(var(--tone-gray-400))}.discovery-chain{position:relative;display:flex;justify-content:space-between}.discovery-chain svg{position:absolute}.discovery-chain .resolvers,.discovery-chain .routes,.discovery-chain .splitters{padding:10px 1%;width:32%}.discovery-chain .resolvers>header,.discovery-chain .routes>header,.discovery-chain .splitters>header{height:18px}.discovery-chain .resolvers>header span,.discovery-chain .routes>header span,.discovery-chain .splitters>header span{position:relative;z-index:1;margin-left:2px}.discovery-chain .resolvers [role=group],.discovery-chain .routes [role=group],.discovery-chain .splitters [role=group]{position:relative;z-index:1;display:flex;flex-direction:column;justify-content:space-around;height:100%}.discovery-chain .resolver-card dl,.discovery-chain .route-card dl,.discovery-chain .splitter-card dl{margin:0;float:none}.discovery-chain .resolver-card,.discovery-chain .route-card,.discovery-chain .splitter-card{margin-bottom:20px}.discovery-chain .route-card header.short dl{display:flex}.discovery-chain .route-card header.short dt::after{content:" ";display:inline-block}.discovery-chain .route-card>header ul{float:right;margin-top:-2px}.discovery-chain .route-card>header ul li{margin-left:5px}.discovery-chain .route-card section{display:flex}.discovery-chain .route-card section header{display:block;width:19px;margin-right:14px}.discovery-chain .resolver-card a{display:block}.discovery-chain .resolver-card dl{display:flex;flex-wrap:wrap;margin-top:5px}.discovery-chain .resolver-card dt{font-size:0;margin-right:6px;margin-top:1px;width:23px;height:20px}.discovery-chain .resolver-card ol{display:flex;flex-wrap:wrap;list-style-type:none}.discovery-chain .route-card,.discovery-chain .splitter-card{position:relative}.discovery-chain .route-card::before,.discovery-chain .splitter-card::before{background-color:rgb(var(--tone-gray-000));border-radius:var(--decor-radius-full);border:2px solid;border-color:rgb(var(--tone-gray-400));position:absolute;z-index:1;right:-5px;top:50%;margin-top:-5px;width:10px;height:10px}.discovery-chain .resolver-inlets,.discovery-chain .splitter-inlets{width:10px;height:100%;z-index:1}.discovery-chain .splitter-inlets{left:50%;margin-left:calc(calc(-32% / 2) + 1% - 3px)}.discovery-chain .resolver-inlets{right:calc(32% - 1% - 7px)}.consul-bucket-list .service+dd{font-weight:var(--typo-weight-semibold)}.consul-bucket-list dd:not(:last-child)::after{display:inline-block;content:"/";margin:0 6px 0 3px}.consul-bucket-list .service+dd,.consul-bucket-list dd+dt{margin-left:0!important}.consul-upstream-instance-list dl.local-bind-socket-mode dt{text-transform:lowercase;font-weight:var(--typo-weight-semibold)}.consul-health-check-list .health-check-output::before{min-width:20px;min-height:20px;margin-right:15px}@media (max-width:650px){.consul-health-check-list .health-check-output::before{min-width:18px;min-height:18px;margin-right:8px}}.consul-health-check-list .health-check-output dd em{background-color:rgb(var(--tone-gray-100));cursor:default;font-style:normal;margin-top:-2px;margin-left:.5em}.consul-health-check-list .warning.health-check-output::before{color:rgb(var(--tone-orange-500))}.consul-health-check-list .critical.health-check-output::before{color:rgb(var(--tone-red-500))}.consul-health-check-list .health-check-output,.consul-health-check-list .health-check-output pre{border-radius:var(--decor-radius-100)}.consul-health-check-list .health-check-output dd:first-of-type{color:rgb(var(--tone-gray-400))}.consul-health-check-list .health-check-output pre{background-color:rgb(var(--tone-gray-050));color:rgb(var(--tone-gray-600))}.consul-health-check-list .health-check-output{border-width:1px 1px 1px 4px;color:rgb(var(--tone-gray-900));border-color:rgb(var(--tone-gray-200));border-style:solid;display:flex;padding:20px 24px 20px 16px}.consul-health-check-list .passing.health-check-output{border-left-color:rgb(var(--tone-green-500))}.consul-health-check-list .warning.health-check-output{border-left-color:rgb(var(--tone-yellow-500))}.consul-health-check-list .critical.health-check-output{border-left-color:rgb(var(--tone-red-500))}.consul-health-check-list .health-check-output:not(:last-child){margin-bottom:24px}.consul-health-check-list .health-check-output dl:last-of-type,.consul-health-check-list .health-check-output header{width:100%}.consul-health-check-list .health-check-output header{margin-bottom:.9em}.consul-health-check-list .health-check-output>div{flex:1 1 auto;width:calc(100% - 26px);display:flex;flex-wrap:wrap;justify-content:space-between}.consul-health-check-list .health-check-output dl{min-width:110px}.consul-health-check-list .health-check-output dl>*{display:block;width:auto;position:static;padding-left:0}.consul-health-check-list .health-check-output dt{margin-bottom:0}.consul-health-check-list .health-check-output dd{position:relative}.consul-health-check-list .health-check-output dl:nth-last-of-type(2){width:50%}.consul-health-check-list .health-check-output dl:last-of-type{margin-top:1em;margin-bottom:0}.consul-health-check-list .health-check-output dl:last-of-type dt{margin-bottom:.3em}.consul-health-check-list .health-check-output pre{padding:12px 40px 12px 12px;white-space:pre-wrap;position:relative}.consul-health-check-list .health-check-output pre code{word-wrap:break-word}.consul-health-check-list .health-check-output .copy-button{position:absolute;right:.5em;top:.7em}@media (max-width:650px){.consul-health-check-list .health-check-output{padding:15px 19px 15px 14px}.consul-health-check-list .health-check-output::before{margin-right:8px}.consul-health-check-list .health-check-output dl:nth-last-of-type(2){width:100%}.consul-health-check-list .health-check-output dl:not(:last-of-type){margin-right:0}}.consul-instance-checks.passing dt::before{color:rgb(var(--tone-green-500))}.consul-instance-checks.warning dt::before{color:rgb(var(--tone-orange-500))}.consul-instance-checks.critical dt::before{color:rgb(var(--tone-red-500))}.consul-instance-checks.empty dt::before{color:rgb(var(--tone-gray-500))}.consul-exposed-path-list>ul{border-top:1px solid rgb(var(--tone-gray-200))}.consul-intention-list td.intent- strong::before,.consul-intention-list td.intent-allow strong::before,.consul-intention-list td.intent-deny strong::before,.consul-intention-permission-list .intent-allow::before,.consul-intention-permission-list .intent-deny::before,.consul-intention-search-bar .value- span::before,.consul-intention-search-bar .value-allow span::before,.consul-intention-search-bar .value-deny span::before{margin-right:5px}.consul-intention-list td.intent- strong,.consul-intention-list td.intent-allow strong,.consul-intention-list td.intent-deny strong,.consul-intention-permission-list .intent-allow,.consul-intention-permission-list .intent-deny,.consul-intention-search-bar .value- span,.consul-intention-search-bar .value-allow span,.consul-intention-search-bar .value-deny span{display:inline-block;font-weight:var(--typo-weight-normal);font-size:var(--typo-size-600)}.consul-intention-list td.intent-allow strong,.consul-intention-permission-list .intent-allow,.consul-intention-search-bar .value-allow span{color:rgb(var(--tone-green-800));background-color:rgb(var(--tone-green-100))}.consul-intention-list td.intent-deny strong,.consul-intention-permission-list .intent-deny,.consul-intention-search-bar .value-deny span{color:rgb(var(--tone-red-800));background-color:rgb(var(--tone-red-100))}.consul-intention-list td.permissions{color:rgb(var(--tone-blue-500))}.consul-intention-list em{--word-spacing:0.25rem}.consul-intention-list em span::before,.consul-intention-list em span:first-child{margin-right:var(--word-spacing)}.consul-intention-list em span:last-child{margin-left:var(--word-spacing)}.consul-intention-list td{height:59px}.consul-intention-list tr>:nth-child(1){width:calc(30% - 50px)}.consul-intention-list tr>:nth-child(2){width:120px}.consul-intention-list tr>:nth-child(3){width:calc(30% - 50px)}.consul-intention-list tr>:nth-child(4){width:calc(40% - 240px)}.consul-intention-list tr>:nth-child(5){width:160px}.consul-intention-list tr>:last-child{width:60px}.consul-intention-list .menu-panel.confirmation{width:200px}@media (max-width:849px){.consul-intention-list tr>:not(.source):not(.destination):not(.intent){display:none}}.consul-intention-action-warn-modal .modal-dialog-window{max-width:450px}.consul-intention-action-warn-modal .modal-dialog-body p{font-size:var(--typo-size-600)}.consul-intention-fieldsets [role=radiogroup]{overflow:visible!important;display:grid;grid-gap:12px;grid-template-columns:repeat(auto-fit,minmax(270px,auto))}.consul-intention-fieldsets .radio-card header>*{display:inline}.consul-intention-fieldsets .permissions>button{float:right}.consul-intention-permission-modal [role=dialog]{width:100%}.consul-intention-permission-list dl.permission-methods dt::before{content:"M"}.consul-intention-permission-list dl.permission-path dt::before{content:"P"}.consul-intention-permission-header-list dt::before,.consul-intention-permission-list dl.permission-header dt::before{content:"H"}.consul-intention-permission-list .detail>div{display:flex;width:100%}.consul-intention-permission-list strong{margin-right:8px}.consul-intention-permission-form h2{border-top:1px solid rgb(var(--tone-blue-500));padding-top:1.4em;margin-top:.2em;margin-bottom:.6em}.consul-intention-permission-form .consul-intention-permission-header-form{margin-top:10px}.consul-intention-permission-form .consul-intention-permission-header-form fieldset>div,.consul-intention-permission-form fieldset:nth-child(2)>div{display:grid;grid-template-columns:repeat(auto-fit,minmax(160px,1fr));grid-gap:12px}.consul-intention-permission-form fieldset:nth-child(2)>div label:last-child{grid-column:span 2}.consul-intention-permission-form .ember-basic-dropdown-trigger{padding:5px}.consul-intention-permission-form .checkbox-group{flex-direction:column}.consul-intention-permission-header-list{max-height:200px;overflow:auto}.consul-lock-session-list button{margin-right:var(--horizontal-padding)}.consul-lock-session-form{overflow:hidden}.consul-server-list ul{display:grid;grid-template-columns:repeat(4,minmax(215px,25%));gap:12px}.consul-server-list a:hover div{box-shadow:var(--decor-elevation-800);--tone-border:var(--tone-gray-500)}.consul-server-card .name+dd{color:rgb(var(--tone-gray-999));animation-name:typo-truncate}.consul-server-card .health-status+dd{font-size:var(--typo-size-700)}.voting-status-non-voter.consul-server-card .health-status+dd{background-color:rgb(var(--tone-gray-100));color:rgb(var(--tone-gray-600))}.consul-server-card:not(.voting-status-non-voter) .health-status.healthy+dd{background-color:rgb(var(--tone-green-050));color:rgb(var(--tone-green-800))}.consul-server-card:not(.voting-status-non-voter) .health-status:not(.healthy)+dd{background-color:rgb(var(--tone-red-050));color:rgb(var(--tone-red-500))}.consul-server-card .health-status+dd::before{--icon-size:icon-000;content:""}.consul-server-card .health-status.healthy+dd::before{--icon-name:icon-check;--icon-color:rgb(var(--tone-green-800))}.consul-server-card .health-status:not(.healthy)+dd::before{--icon-name:icon-x;--icon-color:rgb(var(--tone-red-500))}.consul-server-card{position:relative;overflow:hidden;--padding-x:24px;--padding-y:24px;padding:var(--padding-y) var(--padding-x);--tile-size:3rem}.consul-auth-method-binding-list h2,.consul-auth-method-view section h2{padding-bottom:12px}.voting-status-leader.consul-server-card .name{position:absolute!important}#downstream-lines,#metrics-container div .sparkline-wrapper,#upstream-lines,.consul-auth-method-view section,main{position:relative}.consul-server-card dd:not(:last-of-type){margin-bottom:calc(var(--padding-y)/ 2)}.voting-status-leader.consul-server-card dd{margin-left:calc(var(--tile-size) + 1rem)}.consul-auth-method-list ul .locality::before{margin-right:4px}.consul-auth-method-view{margin-bottom:32px}.consul-auth-method-view section{width:100%;overflow-y:auto}.consul-auth-method-view section table thead td{color:rgb(var(--tone-gray-500));font-weight:var(--typo-weight-semibold);font-size:var(--typo-size-700)}.consul-auth-method-view section table tbody td{font-size:var(--typo-size-600);color:rgb(var(--tone-gray-999))}.consul-auth-method-view section table tbody tr{cursor:default}.consul-auth-method-view section dt{width:30%}.consul-auth-method-view section dd{width:70%}.consul-auth-method-binding-list p{margin-bottom:4px!important}.consul-auth-method-binding-list code{background-color:rgb(var(--tone-gray-050));padding:0 12px}.consul-auth-method-nspace-list thead td{color:rgb(var(--tone-gray-500))!important;font-weight:var(--typo-weight-semibold)!important;font-size:var(--typo-size-700)!important}.consul-auth-method-nspace-list tbody td{font-size:var(--typo-size-600);color:rgb(var(--tone-gray-999))}.consul-auth-method-nspace-list tbody tr{cursor:default}.role-selector [name="role[state]"]:checked+*{display:block}.topology-notices button{color:rgb(var(--tone-blue-500));float:right;margin-top:16px;margin-bottom:32px}#metrics-container .link a,.topology-container{color:rgb(var(--tone-gray-700))}#downstream-container .topology-metrics-card:not(:last-child),#upstream-column #upstream-container:not(:last-child),#upstream-container .topology-metrics-card:not(:last-child){margin-bottom:8px}#downstream-container,#metrics-container,#upstream-container{border-radius:var(--decor-radius-100);border:1px solid;border-color:rgb(var(--tone-gray-200))}#downstream-container,#upstream-container{background-color:rgb(var(--tone-gray-100));padding:12px}#downstream-container>div:first-child{display:inline-flex}#downstream-container>div:first-child span::before{background-color:rgb(var(--tone-gray-500))}#metrics-container div:first-child{background-color:rgb(var(--tone-gray-000));padding:12px;border:none;font-size:16px;font-weight:700}#metrics-container .link{background-color:rgb(var(--tone-gray-100));padding:18px}#metrics-container .link a:hover{color:rgb(var(--color-action))}#downstream-lines svg path,#upstream-lines svg path{fill:var(--transparent)}#downstream-lines svg .allow-arrow,#upstream-lines svg .allow-arrow{fill:rgb(var(--tone-gray-300));stroke-linejoin:round}#downstream-lines svg .allow-arrow,#downstream-lines svg .allow-dot,#downstream-lines svg path,#upstream-lines svg .allow-arrow,#upstream-lines svg .allow-dot,#upstream-lines svg path{stroke:rgb(var(--tone-gray-300));stroke-width:2}#downstream-lines svg path[data-permission=empty],#downstream-lines svg path[data-permission=not-defined],#upstream-lines svg path[data-permission=empty],#upstream-lines svg path[data-permission=not-defined]{stroke-dasharray:4}#downstream-lines svg path[data-permission=deny],#upstream-lines svg path[data-permission=deny]{stroke:rgb(var(--tone-red-500))}#downstream-lines svg .deny-dot,#upstream-lines svg .deny-dot{stroke:rgb(var(--tone-red-500));stroke-width:2}#downstream-lines svg .deny-arrow,#upstream-lines svg .deny-arrow{fill:rgb(var(--tone-red-500));stroke:rgb(var(--tone-red-500));stroke-linejoin:round}.topology-notices{display:flow-root}.topology-container{display:grid;height:100%;align-items:start;grid-template-columns:2fr 1fr 2fr 1fr 2fr;grid-template-rows:50px 1fr 50px;grid-template-areas:"down-cards down-lines . up-lines up-cards" "down-cards down-lines metrics up-lines up-cards" "down-cards down-lines . up-lines up-cards"}#downstream-container{grid-area:down-cards}#downstream-lines{grid-area:down-lines;margin-left:-20px}#upstream-lines{grid-area:up-lines;margin-right:-20px}#upstream-column{grid-area:up-cards}#metrics-container{grid-area:metrics}#metrics-container .link a::before{background-color:rgb(var(--tone-gray-500));margin-right:4px}#downstream-container .topology-metrics-card,#upstream-container .topology-metrics-card{display:block;color:rgb(var(--tone-gray-700));overflow:hidden;background-color:rgb(var(--tone-gray-000));border-radius:var(--decor-radius-100);border:1px solid;border-color:rgb(var(--tone-gray-200))}#downstream-container .topology-metrics-card p,#upstream-container .topology-metrics-card p{padding:12px 12px 0;font-size:var(--typo-size-500);font-weight:var(--typo-weight-semibold);margin-bottom:0!important}#downstream-container .topology-metrics-card p.empty,#upstream-container .topology-metrics-card p.empty{padding:12px!important}#downstream-container .topology-metrics-card div dl,#upstream-container .topology-metrics-card div dl{display:inline-flex;margin-right:8px}#downstream-container .topology-metrics-card div dd,#upstream-container .topology-metrics-card div dd{color:rgb(var(--tone-gray-700))}#downstream-container .topology-metrics-card div span,#upstream-container .topology-metrics-card div span{margin-right:8px}#downstream-container .topology-metrics-card div dt::before,#downstream-container .topology-metrics-card div span::before,#upstream-container .topology-metrics-card div dt::before,#upstream-container .topology-metrics-card div span::before{margin-right:4px}#downstream-container .topology-metrics-card div .health dt::before,#downstream-container .topology-metrics-card div .nspace dt::before,#upstream-container .topology-metrics-card div .health dt::before,#upstream-container .topology-metrics-card div .nspace dt::before{margin-top:2px}#downstream-container .topology-metrics-card div .health dt::before,#downstream-container .topology-metrics-card div .nspace dt::before,#downstream-container .topology-metrics-card div .partition dt::before,#upstream-container .topology-metrics-card div .health dt::before,#upstream-container .topology-metrics-card div .nspace dt::before,#upstream-container .topology-metrics-card div .partition dt::before{--icon-color:rgb(var(--tone-gray-500))}#downstream-container .topology-metrics-card div .passing::before,#upstream-container .topology-metrics-card div .passing::before{--icon-color:rgb(var(--tone-green-500))}#downstream-container .topology-metrics-card div .warning::before,#upstream-container .topology-metrics-card div .warning::before{--icon-color:rgb(var(--tone-orange-500))}#downstream-container .topology-metrics-card div .critical::before,#upstream-container .topology-metrics-card div .critical::before{--icon-color:rgb(var(--tone-red-500))}#downstream-container .topology-metrics-card div .empty::before,#upstream-container .topology-metrics-card div .empty::before{--icon-color:rgb(var(--tone-gray-500))}#downstream-container .topology-metrics-card .details,#upstream-container .topology-metrics-card .details{padding:0 12px 12px}#downstream-container .topology-metrics-card .details>:not(:last-child),#upstream-container .topology-metrics-card .details>:not(:last-child){padding-bottom:6px}#downstream-container .topology-metrics-card .details .group,#upstream-container .topology-metrics-card .details .group{display:grid;grid-template-columns:20px 1fr;grid-template-rows:repeat(2,1fr);grid-template-areas:"partition partition" "union namespace"}#downstream-container .topology-metrics-card .details .group span,#upstream-container .topology-metrics-card .details .group span{display:inline-block;grid-area:union;padding-left:7px;margin-right:0}#downstream-container .topology-metrics-card .details .group span::before,#upstream-container .topology-metrics-card .details .group span::before{margin-right:0;--icon-color:rgb(var(--tone-gray-500))}#downstream-container .topology-metrics-card .details .group dl:first-child,#upstream-container .topology-metrics-card .details .group dl:first-child{grid-area:partition;padding-bottom:6px}#downstream-container .topology-metrics-card .details .group dl:nth-child(2),#upstream-container .topology-metrics-card .details .group dl:nth-child(2){grid-area:namespace}.topology-metrics-source-type{margin:6px 0 6px 12px;display:table}.topology-metrics-popover>button{position:absolute;transform:translate(-50%,-50%);background-color:rgb(var(--tone-gray-000));padding:1px}.topology-metrics-popover>button:hover{cursor:pointer}.topology-metrics-popover>button:disabled,html[data-route^="dc.nodes.show.metadata"] table tr{cursor:default}.topology-metrics-popover>button:active,.topology-metrics-popover>button:focus{outline:0}.topology-metrics-popover.deny .informed-action header::before{display:none}.topology-metrics-popover.deny .tippy-arrow::after,.topology-metrics-popover.deny>button::before{--icon-color:rgb(var(--tone-red-500))}.topology-metrics-popover.not-defined .tippy-arrow::after,.topology-metrics-popover.not-defined>button::before{--icon-color:rgb(var(--tone-yellow-500))}#metrics-container .sparkline-wrapper svg path{stroke-width:0}#metrics-container .sparkline-wrapper .tooltip{padding:0 0 10px;font-size:.875em;line-height:1.5em;font-weight:400;border:1px solid;background:#fff;border-radius:2px;box-sizing:border-box;box-shadow:0 4px 8px rgba(0,0,0,.05),0 4px 4px rgba(0,0,0,.1)}#metrics-container .sparkline-wrapper .tooltip .sparkline-time{padding:8px 10px;font-weight:700;font-size:14px;color:#000;border-bottom:1px solid rgb(var(--tone-gray-200));margin-bottom:4px;text-align:center}#metrics-container .sparkline-wrapper .tooltip .sparkline-tt-legend,#metrics-container .sparkline-wrapper .tooltip .sparkline-tt-sum{border:0;padding:3px 10px 0}#metrics-container .sparkline-wrapper .tooltip .sparkline-tt-sum{border-top:1px solid rgb(var(--tone-gray-200));margin-top:4px;padding:8px 10px 0}#metrics-container .sparkline-wrapper .tooltip .sparkline-tt-legend-color{width:12px;height:12px;border-radius:2px;margin:0 5px 0 0;padding:0}#metrics-container .sparkline-wrapper .tooltip .sparkline-tt-legend-value,#metrics-container .sparkline-wrapper .tooltip .sparkline-tt-sum-value{float:right}#metrics-container .sparkline-wrapper div.tooltip:before{content:"";display:block;position:absolute;width:12px;height:12px;left:15px;bottom:-7px;border:1px solid;border-top:0;border-left:0;background:#fff;transform:rotate(45deg)}.sparkline-key h3::before{margin:2px 3px 0 0;font-size:14px}.sparkline-key h3{color:rgb(var(--tone-gray-900));font-size:16px}.sparkline-key .sparkline-key-content dd,.sparkline-key-link{color:rgb(var(--tone-gray-500))}.sparkline-key-link:hover{color:rgb(var(--tone-blue-500))}#metrics-container:hover .sparkline-key-link::before{margin:1px 3px 0 0;font-size:12px}#metrics-container div .sparkline-wrapper,#metrics-container div .sparkline-wrapper svg.sparkline{width:100%;height:70px;padding:0;margin:0}#metrics-container div .sparkline-wrapper .tooltip{visibility:hidden;position:absolute;z-index:10;bottom:78px;width:217px}#metrics-container div .sparkline-wrapper .sparkline-tt-legend-color{display:inline-block}#metrics-container div .sparkline-wrapper .topology-metrics-error,#metrics-container div .sparkline-wrapper .topology-metrics-loader{padding-top:15px}.sparkline-key .sparkline-key-content{width:500px;min-height:100px}.sparkline-key .sparkline-key-content dl{padding:10px 0 0}.sparkline-key .sparkline-key-content dt{font-weight:600;width:125px;float:left}.sparkline-key .sparkline-key-content dd{margin:0 0 12px 135px}.sparkline-key-link{visibility:hidden;float:right;margin-top:-35px;margin-right:12px}#metrics-container:hover .sparkline-key-link{visibility:visible}.topology-metrics-stats{padding:12px 12px 0;display:flex;flex-flow:row wrap;justify-content:space-between;align-items:stretch;width:100%;border-top:1px solid rgb(var(--tone-gray-200))}.topology-metrics-stats dl{display:flex;padding-bottom:12px}.topology-metrics-stats dt{margin-right:5px;line-height:1.5em!important}.topology-metrics-stats dd{color:rgb(var(--tone-gray-400))!important}.topology-metrics-stats span{padding-bottom:12px}.topology-metrics-status-error,.topology-metrics-status-loader{font-weight:400;font-size:.875rem;color:rgb(var(--tone-gray-500));text-align:center;margin:0 auto!important;display:block}.topology-metrics-status-error span::before,.topology-metrics-status-loader span::before{background-color:rgb(var(--tone-gray-500))}span.topology-metrics-status-loader::after{--icon-name:var(--icon-loading);content:"";margin-left:.5rem}.definition-table dt{line-height:var(--typo-lead-700)}.app-view>div form:not(.filter-bar) [role=radiogroup] label,.modal-dialog [role=document] [role=radiogroup] label{line-height:var(--typo-lead-200)}.app-view>div form button[type=button].type-delete,.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.consul-intention-action-warn-modal button.dangerous,.copy-button button,.empty-state div>button,.modal-dialog .type-delete,.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label>span,.oidc-select button:not(.reset),.oidc-select label>span,.popover-select label>*,.topology-notices button,.type-sort.popover-select label>*,.type-toggle>span,.with-confirmation .type-delete,a.type-create,button.type-cancel,button.type-submit,button[type=reset],button[type=submit],header .actions button[type=button]:not(.copy-btn),main .type-password>span,main .type-select>span,main .type-text>span,span.label{font-weight:var(--typo-weight-semibold)}.discovery-chain .route-card header:not(.short) dd,.discovery-chain .route-card section dt,.discovery-chain .splitter-card>header{font-weight:var(--typo-weight-bold)}.app-view h1 em,.app-view>div form:not(.filter-bar) [role=radiogroup] label>strong,.consul-auth-method-type,.consul-external-source,.consul-health-check-list .health-check-output dd em,.consul-intention-list td strong,.consul-intention-list td.destination em,.consul-intention-list td.source em,.consul-intention-permission-list strong,.consul-intention-search-bar li button span,.consul-kind,.consul-server-card .health-status+dd,.consul-source,.consul-transparent-proxy,.discovery-chain .route-card header dt,.discovery-chain .route-card>header ul li,.empty-state header :nth-child(2),.hashicorp-consul nav .dcs li.is-local span,.hashicorp-consul nav .dcs li.is-primary span,.leader,.modal-dialog [role=document] .type-password>strong,.modal-dialog [role=document] .type-select>strong,.modal-dialog [role=document] .type-text>strong,.modal-dialog [role=document] [role=radiogroup] label>strong,.modal-dialog [role=document] label a[rel*=help],.modal-dialog [role=document] table td:first-child em,.oidc-select label>strong,.search-bar-status li:not(.remove-all),.topology-metrics-source-type,.type-toggle>strong,html[data-route^="dc.acls.index"] main td strong,main .type-password>strong,main .type-select>strong,main .type-text>strong,main label a[rel*=help],main table td:first-child em,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em,span.policy-node-identity,span.policy-service-identity{font-weight:var(--typo-weight-normal)}.app-view h1 em,.app-view>div form:not(.filter-bar) [role=radiogroup] label>em,.consul-intention-list td.destination em,.consul-intention-list td.source em,.modal-dialog [role=document] .type-password>em,.modal-dialog [role=document] .type-select>em,.modal-dialog [role=document] .type-text>em,.modal-dialog [role=document] [role=radiogroup] label>em,.modal-dialog [role=document] form button+em,.modal-dialog [role=document] table td:first-child em,.oidc-select label>em,.type-toggle>em,main .type-password>em,main .type-select>em,main .type-text>em,main form button+em,main table td:first-child em{font-style:normal}.consul-exposed-path-list>ul>li>.header,.consul-lock-session-list ul>li:not(:first-child)>.header,.consul-upstream-instance-list li>.header,.list-collection>ul>li:not(:first-child)>.header{font-size:var(--typo-size-450);font-weight:var(--typo-weight-medium)}.consul-exposed-path-list>ul>li>.header :not(button),.consul-lock-session-list ul>li:not(:first-child)>.header :not(button),.consul-upstream-instance-list li>.header :not(button),.list-collection>ul>li:not(:first-child)>.header :not(button){font-size:inherit;font-weight:inherit}.app-view h1 em{font-size:var(--typo-size-500)}@media (max-width:420px) and (-webkit-min-device-pixel-ratio:0){input{font-size:16px!important}}#wrapper{box-sizing:content-box}#wrapper>footer>*,.modal-dialog>*,main>*{box-sizing:border-box}html[data-route$=create] main,html[data-route$=edit] main{max-width:1260px}fieldset [role=group]{display:flex;flex-wrap:wrap;flex-direction:row}.outlet[data-state=loading],html.ember-loading .view-loader,html:not(.has-nspaces) [class*=nspace-],html:not(.has-partitions) [class*=partition-],html[data-state=idle] .view-loader{display:none}[role=group] fieldset{width:50%}[role=group] fieldset:not(:first-of-type){padding-left:20px;border-left:1px solid;border-left:rgb(var(--tone-gray-500))}[role=group] fieldset:not(:last-of-type){padding-right:20px}.app-view{margin-top:50px}@media (max-width:849px){html:not(.with-breadcrumbs) .app-view{margin-top:10px}}html body>.brand-loader{transition-property:transform,opacity;transform:translate(0,0);opacity:1}html[data-state]:not(.ember-loading) body>.brand-loader{opacity:0}@media (min-width:900px){html[data-state] body>.brand-loader{transform:translate(calc(var(--chrome-width)/ 2),0)}}html[data-route$=create] .app-view>header+div>:first-child,html[data-route$=edit] .app-view>header+div>:first-child{margin-top:1.8em}.app-view>div .container,.app-view>div .tab-section .consul-health-check-list,.app-view>div .tab-section>.search-bar+p,.app-view>div .tab-section>:first-child:not(.filter-bar):not(table){margin-top:1.25em}.consul-upstream-instance-list,html[data-route^="dc.nodes.show.sessions"] .consul-lock-session-list{margin-top:0!important}.consul-auth-method-list ul,.consul-node-list ul,.consul-nspace-list ul,.consul-policy-list ul,.consul-role-list ul,.consul-service-instance-list ul,.consul-token-list ul,html[data-route="dc.services.index"] .consul-service-list ul,html[data-route^="dc.nodes.show.sessions"] .consul-lock-session-list ul{border-top-width:0!important}.notice+.consul-token-list ul{border-top-width:1px!important}#wrapper{padding-left:25px;padding-right:25px;display:flex;min-height:100vh;flex-direction:column}main{flex:1}html:not([data-route$=index]):not([data-route$=instances]) main{margin-bottom:2em}@media (max-width:849px){.actions button.copy-btn{margin-top:-56px;padding:0}}.modal-dialog [role=document] p:not(:last-child),main p:not(:last-child){margin-bottom:1em}.modal-dialog [role=document] form+div .with-confirmation,.modal-dialog [role=document] form:not(.filter-bar),main form+div .with-confirmation,main form:not(.filter-bar){margin-bottom:2em}@media (max-width:420px){main form [type=reset]{float:right;margin-right:0!important}}html[data-route^="dc.services.show"] .app-view .actions .external-dashboard{position:absolute;top:50px;right:0}html[data-route^="dc.services.instance"] .app-view>header dl{float:left;margin-top:19px;margin-bottom:23px;margin-right:50px}html[data-route^="dc.services.instance"] .app-view>header dt{font-weight:var(--typo-weight-bold)}html[data-route^="dc.services.instance"] .tab-nav{border-top:var(--decor-border-100)}html[data-route^="dc.services.instance"] .tab-section section:not(:last-child){border-bottom:var(--decor-border-100);padding-bottom:24px}html[data-route^="dc.services.instance"] .tab-nav,html[data-route^="dc.services.instance"] .tab-section section:not(:last-child){border-color:rgb(var(--tone-gray-200))}html[data-route^="dc.services.instance.metadata"] .tab-section section h2{margin:24px 0 12px}html[data-route^="dc.kv"] .type-toggle{float:right;margin-bottom:0!important}html[data-route^="dc.kv.edit"] h2{border-bottom:var(--decor-border-200);border-color:rgb(var(--tone-gray-200));padding-bottom:.2em;margin-bottom:.5em}html[data-route^="dc.acls.index"] main td strong{margin-right:3px}@media (max-width:420px){html[data-route^="dc.acls.create"] main header .actions,html[data-route^="dc.acls.edit"] main header .actions{float:none;display:flex;justify-content:space-between;margin-bottom:1em}html[data-route^="dc.acls.create"] main header .actions .with-feedback,html[data-route^="dc.acls.edit"] main header .actions .with-feedback{position:absolute;right:0}html[data-route^="dc.acls.create"] main header .actions .with-confirmation,html[data-route^="dc.acls.edit"] main header .actions .with-confirmation{margin-top:0}}html[data-route^="dc.intentions.edit"] .definition-table{margin-bottom:1em}section[data-route="dc.show.serverstatus"] .server-failure-tolerance{box-shadow:var(--decor-elevation-000);padding:var(--padding-y) var(--padding-x);max-width:770px;display:flex;flex-wrap:wrap}section[data-route="dc.show.serverstatus"] .server-failure-tolerance>header{width:100%;padding-bottom:.5rem;margin-bottom:1rem;border-bottom:var(--decor-border-100);border-color:rgb(var(--tone-border))}section[data-route="dc.show.serverstatus"] .server-failure-tolerance>header a{float:right;margin-top:4px;font-weight:var(--typo-weight-semibold)}section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em{font-size:.812rem;background-color:rgb(var(--tone-gray-200));text-transform:uppercase;font-style:normal}section[data-route="dc.show.serverstatus"] .server-failure-tolerance>section{width:50%}section[data-route="dc.show.serverstatus"] .server-failure-tolerance dl,section[data-route="dc.show.serverstatus"] .server-failure-tolerance>section{display:flex;flex-direction:column}section[data-route="dc.show.serverstatus"] .server-failure-tolerance dl{flex-grow:1;justify-content:space-between}section[data-route="dc.show.serverstatus"] .server-failure-tolerance dl.warning dd::before{--icon-name:icon-alert-circle;--icon-size:icon-800;--icon-color:rgb(var(--tone-orange-400));content:"";margin-right:.5rem}section[data-route="dc.show.serverstatus"] .server-failure-tolerance section:first-of-type dl{padding-right:1.5rem}section[data-route="dc.show.serverstatus"] .server-failure-tolerance dt{color:rgb(var(--tone-gray-700))}section[data-route="dc.show.serverstatus"] .server-failure-tolerance dd{display:flex;align-items:center;font-size:var(--typo-size-250);color:rgb(var(--tone-gray-999))}section[data-route="dc.show.serverstatus"] .server-failure-tolerance header span::before{--icon-name:icon-info;--icon-size:icon-300;--icon-color:rgb(var(--tone-gray-500));vertical-align:unset;content:""}section[data-route="dc.show.serverstatus"] section:not([class*=-tolerance]) h2{margin-top:1.5rem;margin-bottom:1.5rem}section[data-route="dc.show.serverstatus"] section:not([class*=-tolerance]) header{margin-top:18px;margin-bottom:18px}section[data-route="dc.show.serverstatus"] .redundancy-zones section header{display:flow-root}section[data-route="dc.show.serverstatus"] .redundancy-zones section header h3{float:left;margin-right:.5rem}section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not(.warning){background-color:rgb(var(--tone-gray-100))}section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.warning{background-color:rgb(var(--tone-orange-100));color:rgb(var(--tone-orange-800))}section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.warning::before{--icon-name:icon-alert-circle;--icon-size:icon-000;margin-right:.312rem;content:""}section[data-route="dc.show.serverstatus"] .redundancy-zones section header dt::after{content:":";display:inline-block;vertical-align:revert;background-color:var(--transparent)}section[data-route="dc.show.license"] .validity p{color:rgb(var(--tone-gray-700))}section[data-route="dc.show.license"] .validity dl{font-size:var(--typo-size-400)}section[data-route="dc.show.license"] .validity dl dt::before{content:"";margin-right:.25rem}section[data-route="dc.show.license"] .validity dl .expired::before{--icon-name:icon-x-circle;--icon-color:rgb(var(--red-500))}section[data-route="dc.show.license"] .validity dl .warning::before{--icon-name:icon-alert-circle;--icon-color:rgb(var(--orange-500))}section[data-route="dc.show.license"] .validity dl .valid:not(.warning)::before{--icon-name:icon-check-circle;--icon-color:rgb(var(--green-500))}section[data-route="dc.show.license"] aside{box-shadow:var(--decor-elevation-000);padding:var(--padding-y) var(--padding-x);width:40%;min-width:413px;margin-top:1rem}section[data-route="dc.show.license"] aside header{margin-bottom:1rem}section[data-route="dc.show.license"] aside li{margin-bottom:.25rem}section[data-route="dc.show.license"] aside a::before{--icon-name:icon-docs-link;content:"";margin-right:.375rem}.prefers-reduced-motion{--icon-loading:icon-loading}@media (prefers-reduced-motion){:root{--icon-loading:icon-loading}}.consul-external-source.vault::before,.popover-select .vault button::before{--icon-name:icon-vault;content:""}.consul-external-source.aws::before,.popover-select .aws button::before{--icon-name:var(--icon-aws);content:""}.consul-external-source.aws::before,.consul-external-source.vault::before{--icon-size:icon-200}.consul-intention-fieldsets .value->:last-child::before,.consul-intention-fieldsets .value-allow>:last-child::before,.consul-intention-fieldsets .value-deny>:last-child::before{--icon-size:icon-500;--icon-resolution:.5}.consul-intention-fieldsets .value-allow>:last-child::before,.consul-intention-list td.intent-allow strong::before,.consul-intention-permission-list .intent-allow::before,.consul-intention-search-bar .value-allow span::before{--icon-name:icon-arrow-right;--icon-color:rgb(var(--tone-green-500))}.consul-intention-fieldsets .value-deny>:last-child::before,.consul-intention-list td.intent-deny strong::before,.consul-intention-permission-list .intent-deny::before,.consul-intention-search-bar .value-deny span::before{--icon-name:icon-skip;--icon-color:rgb(var(--tone-red-500))}.consul-intention-fieldsets .value->:last-child::before,.consul-intention-list td.intent- strong::before,.consul-intention-search-bar .value- span::before{--icon-name:icon-layers}*{border-width:0}.animatable.tab-nav ul::after,.app-view>div form button[type=button].type-delete,.app-view>div form button[type=button].type-delete:disabled,.app-view>div form button[type=button].type-delete:focus,.app-view>div form button[type=button].type-delete:hover:active,.app-view>div form button[type=button].type-delete:hover:not(:disabled):not(:active),.consul-auth-method-type,.consul-external-source,.consul-intention-action-warn-modal button.dangerous,.consul-intention-action-warn-modal button.dangerous:disabled,.consul-intention-action-warn-modal button.dangerous:focus,.consul-intention-action-warn-modal button.dangerous:hover:active,.consul-intention-action-warn-modal button.dangerous:hover:not(:disabled):not(:active),.consul-intention-list td.intent- strong,.consul-intention-permission-form button.type-submit,.consul-intention-permission-form button.type-submit:disabled,.consul-intention-permission-form button.type-submit:focus:not(:disabled),.consul-intention-permission-form button.type-submit:hover:not(:disabled),.consul-intention-search-bar .value- span,.consul-kind,.consul-source,.consul-transparent-proxy,.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:first-child,.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:focus:first-child,.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:hover:first-child,.discovery-chain .route-card>header ul li,.empty-state div>button,.empty-state div>button:disabled,.empty-state div>button:focus,.empty-state div>button:hover:active,.empty-state div>button:hover:not(:disabled):not(:active),.informed-action>ul>.dangerous>*,.informed-action>ul>.dangerous>:focus,.informed-action>ul>.dangerous>:hover,.leader,.menu-panel>ul>li.dangerous>:first-child,.menu-panel>ul>li.dangerous>:focus:first-child,.menu-panel>ul>li.dangerous>:hover:first-child,.modal-dialog .type-delete,.modal-dialog .type-delete:disabled,.modal-dialog .type-delete:focus,.modal-dialog .type-delete:hover:active,.modal-dialog .type-delete:hover:not(:disabled):not(:active),.modal-dialog [role=document]>footer,.modal-dialog [role=document]>header,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:first-child,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,.oidc-select button:disabled:not(.reset),.oidc-select button:focus:not(.reset),.oidc-select button:hover:active:not(.reset),.oidc-select button:hover:not(:disabled):not(:active):not(.reset),.oidc-select button:not(.reset),.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:first-child,.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,.tab-nav .selected>*,.topology-metrics-source-type,.with-confirmation .type-delete,.with-confirmation .type-delete:disabled,.with-confirmation .type-delete:focus,.with-confirmation .type-delete:hover:active,.with-confirmation .type-delete:hover:not(:disabled):not(:active),a.type-create,a.type-create:disabled,a.type-create:focus,a.type-create:hover:active,a.type-create:hover:not(:disabled):not(:active),button.type-cancel,button.type-cancel:active,button.type-cancel:focus,button.type-cancel:hover:not(:disabled):not(:active),button.type-submit,button.type-submit:disabled,button.type-submit:focus,button.type-submit:hover:active,button.type-submit:hover:not(:disabled):not(:active),button[type=reset],button[type=reset]:active,button[type=reset]:focus,button[type=reset]:hover:not(:disabled):not(:active),button[type=submit],button[type=submit]:disabled,button[type=submit]:focus,button[type=submit]:hover:active,button[type=submit]:hover:not(:disabled):not(:active),header .actions button[type=button]:active:not(.copy-btn),header .actions button[type=button]:focus:not(.copy-btn),header .actions button[type=button]:hover:not(:disabled):not(:active):not(.copy-btn),header .actions button[type=button]:not(.copy-btn),html[data-route^="dc.acls.index"] main td strong,span.policy-node-identity,span.policy-service-identity,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:first-child,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child{border-style:solid}button.type-cancel:focus,button.type-cancel:hover:not(:disabled):not(:active),button[type=reset]:focus,button[type=reset]:hover:not(:disabled):not(:active),header .actions button[type=button]:focus:not(.copy-btn),header .actions button[type=button]:hover:not(:disabled):not(:active):not(.copy-btn){background-color:rgb(var(--tone-gray-000));border-color:rgb(var(--tone-gray-700));color:rgb(var(--tone-gray-800))}button.type-cancel,button[type=reset],header .actions button[type=button]:not(.copy-btn){background-color:rgb(var(--tone-gray-050));border-color:rgb(var(--tone-gray-300));color:rgb(var(--tone-gray-800))}.consul-auth-method-type,.consul-external-source,.consul-kind,.consul-source,.consul-transparent-proxy,.leader,.topology-metrics-source-type,span.policy-node-identity,span.policy-service-identity{background-color:rgb(var(--tone-gray-100));border-color:rgb(var(--tone-gray-500));color:rgb(var(--tone-gray-500))}button.type-cancel:active,button[type=reset]:active,header .actions button[type=button]:active:not(.copy-btn){background-color:rgb(var(--tone-gray-200));border-color:rgb(var(--tone-gray-700));color:rgb(var(--tone-gray-800))}.modal-dialog [role=document]>footer,.modal-dialog [role=document]>header{background-color:rgb(var(--tone-gray-050));border-color:rgb(var(--tone-gray-300));color:rgb(var(--tone-gray-900))}.consul-intention-list td.intent- strong,.consul-intention-search-bar .value- span,.discovery-chain .route-card>header ul li,html[data-route^="dc.acls.index"] main td strong{background-color:rgb(var(--tone-gray-100));border-color:rgb(var(--tone-gray-300));color:rgb(var(--tone-gray-900))}.consul-intention-permission-form button.type-submit:disabled{background-color:rgb(var(--tone-gray-000));border-color:rgb(var(--tone-blue-300));color:rgb(var(--tone-blue-300))}.animatable.tab-nav ul::after,.consul-intention-permission-form button.type-submit,.tab-nav .selected>*{background-color:rgb(var(--tone-gray-000));border-color:rgb(var(--tone-blue-500));color:rgb(var(--tone-blue-500))}.consul-intention-permission-form button.type-submit:focus:not(:disabled),.consul-intention-permission-form button.type-submit:hover:not(:disabled){background-color:rgb(var(--tone-blue-050));border-color:rgb(var(--tone-blue-500));color:rgb(var(--tone-blue-800))}.empty-state div>button:disabled,.oidc-select button:disabled:not(.reset),a.type-create:disabled,button.type-submit:disabled,button[type=submit]:disabled{background-color:rgb(var(--tone-blue-200));border-color:rgb(var(--tone-gray-400));color:rgb(var(--tone-blue-050))}.empty-state div>button:focus,.empty-state div>button:hover:not(:disabled):not(:active),.oidc-select button:focus:not(.reset),.oidc-select button:hover:not(:disabled):not(:active):not(.reset),a.type-create:focus,a.type-create:hover:not(:disabled):not(:active),button.type-submit:focus,button.type-submit:hover:not(:disabled):not(:active),button[type=submit]:focus,button[type=submit]:hover:not(:disabled):not(:active){background-color:rgb(var(--tone-blue-400));border-color:rgb(var(--tone-blue-800));color:rgb(var(--tone-gray-000))}.empty-state div>button,.oidc-select button:not(.reset),a.type-create,button.type-submit,button[type=submit]{background-color:rgb(var(--tone-blue-500));border-color:rgb(var(--tone-blue-800));color:rgb(var(--tone-gray-000))}.empty-state div>button:hover:active,.oidc-select button:hover:active:not(.reset),a.type-create:hover:active,button.type-submit:hover:active,button[type=submit]:hover:active{background-color:rgb(var(--tone-blue-700));border-color:rgb(var(--tone-blue-800));color:rgb(var(--tone-gray-000))}.app-view>div form button[type=button].type-delete,.consul-intention-action-warn-modal button.dangerous,.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:first-child,.informed-action>ul>.dangerous>*,.menu-panel>ul>li.dangerous>:first-child,.modal-dialog .type-delete,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:first-child,.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:first-child,.with-confirmation .type-delete,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:first-child{background-color:var(--transparent);border-color:rgb(var(--tone-red-500));color:rgb(var(--tone-red-500))}.app-view>div form button[type=button].type-delete:disabled,.consul-intention-action-warn-modal button.dangerous:disabled,.modal-dialog .type-delete:disabled,.with-confirmation .type-delete:disabled{background-color:rgb(var(--tone-red-200));border-color:rgb(var(--tone-gray-400));color:rgb(var(--tone-gray-000))}.app-view>div form button[type=button].type-delete:focus,.app-view>div form button[type=button].type-delete:hover:not(:disabled):not(:active),.consul-intention-action-warn-modal button.dangerous:focus,.consul-intention-action-warn-modal button.dangerous:hover:not(:disabled):not(:active),.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:focus:first-child,.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:hover:first-child,.informed-action>ul>.dangerous>:focus,.informed-action>ul>.dangerous>:hover,.menu-panel>ul>li.dangerous>:focus:first-child,.menu-panel>ul>li.dangerous>:hover:first-child,.modal-dialog .type-delete:focus,.modal-dialog .type-delete:hover:not(:disabled):not(:active),.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,.with-confirmation .type-delete:focus,.with-confirmation .type-delete:hover:not(:disabled):not(:active),table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child{background-color:rgb(var(--tone-red-500));border-color:rgb(var(--tone-red-800));color:rgb(var(--tone-gray-000))}.app-view>div form button[type=button].type-delete:hover:active,.consul-intention-action-warn-modal button.dangerous:hover:active,.modal-dialog .type-delete:hover:active,.with-confirmation .type-delete:hover:active{background-color:rgb(var(--tone-red-700));border-color:rgb(var(--tone-red-800));color:rgb(var(--tone-gray-000))}:root.prefers-color-scheme-dark,:root:not(.prefers-color-scheme-dark),[role=banner],[role=banner] nav:first-of-type,[role=banner] nav:last-of-type{--tone-magenta-000:var(--white);--tone-magenta-050:var(--magenta-050);--tone-magenta-100:var(--magenta-100);--tone-magenta-150:var(--magenta-150);--tone-magenta-200:var(--magenta-200);--tone-magenta-300:var(--magenta-300);--tone-magenta-400:var(--magenta-400);--tone-magenta-500:var(--magenta-500);--tone-magenta-600:var(--magenta-600);--tone-magenta-700:var(--magenta-700);--tone-magenta-800:var(--magenta-800);--tone-magenta-850:var(--magenta-850);--tone-magenta-900:var(--magenta-900);--tone-magenta-950:var(--magenta-950);--tone-magenta-999:var(--black);--tone-strawberry-000:var(--white);--tone-strawberry-050:var(--strawberry-050);--tone-strawberry-100:var(--strawberry-100);--tone-strawberry-150:var(--strawberry-150);--tone-strawberry-200:var(--strawberry-200);--tone-strawberry-300:var(--strawberry-300);--tone-strawberry-400:var(--strawberry-400);--tone-strawberry-500:var(--strawberry-500);--tone-strawberry-600:var(--strawberry-600);--tone-strawberry-700:var(--strawberry-700);--tone-strawberry-800:var(--strawberry-800);--tone-strawberry-850:var(--strawberry-850);--tone-strawberry-900:var(--strawberry-900);--tone-strawberry-950:var(--strawberry-950);--tone-strawberry-999:var(--black);--tone-lemon-000:var(--white);--tone-lemon-050:var(--lemon-050);--tone-lemon-100:var(--lemon-100);--tone-lemon-150:var(--lemon-150);--tone-lemon-200:var(--lemon-200);--tone-lemon-300:var(--lemon-300);--tone-lemon-400:var(--lemon-400);--tone-lemon-500:var(--lemon-500);--tone-lemon-600:var(--lemon-600);--tone-lemon-700:var(--lemon-700);--tone-lemon-800:var(--lemon-800);--tone-lemon-850:var(--lemon-850);--tone-lemon-900:var(--lemon-900);--tone-lemon-950:var(--lemon-950);--tone-lemon-999:var(--black)}[role=banner] nav:last-of-type .dangerous button:focus,[role=banner] nav:last-of-type .dangerous button:hover{color:rgb(var(--white))!important}[role=banner] nav:first-of-type .menu-panel a:focus,[role=banner] nav:first-of-type .menu-panel a:hover{background-color:rgb(var(--tone-blue-500))}
\ No newline at end of file
diff --git a/agent/uiserver/dist/assets/consul-ui-7444626e95c5ba30e9097f92995f0238.js b/agent/uiserver/dist/assets/consul-ui-7444626e95c5ba30e9097f92995f0238.js
deleted file mode 100644
index f965f9a32133c..0000000000000
--- a/agent/uiserver/dist/assets/consul-ui-7444626e95c5ba30e9097f92995f0238.js
+++ /dev/null
@@ -1,3938 +0,0 @@
-"use strict"
-define("consul-ui/abilities/acl",["exports","consul-ui/abilities/base","@ember/service"],(function(e,t,n){var l,r,i
-function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(l=(0,n.inject)("env"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),o(this,"resource","acl"),o(this,"segmented",!1)}get canAccess(){return!this.env.var("CONSUL_ACLS_ENABLED")||this.canRead}get canRead(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canRead}get canDuplicate(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canWrite}get canDelete(){return this.env.var("CONSUL_ACLS_ENABLED")&&"anonymous"!==this.item.ID&&super.canWrite}get canUse(){return this.env.var("CONSUL_ACLS_ENABLED")}},u=r.prototype,s="env",c=[l],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),i=f,r)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/abilities/auth-method",["exports","consul-ui/abilities/base","@ember/service"],(function(e,t,n){var l,r,i
-function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(l=(0,n.inject)("env"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),o(this,"resource","acl"),o(this,"segmented",!1)}get canRead(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canRead}get canCreate(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canCreate}get canDelete(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canDelete}get canUse(){return this.env.var("CONSUL_SSO_ENABLED")}},u=r.prototype,s="env",c=[l],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),i=f,r)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/abilities/base",["exports","@ember/service","@ember/object","ember-can"],(function(e,t,n,l){var r,i,o
-function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.ACCESS_LIST=e.ACCESS_WRITE=e.ACCESS_READ=void 0
-const u="read"
-e.ACCESS_READ=u
-const s="write"
-e.ACCESS_WRITE=s
-const c="list"
-e.ACCESS_LIST=c
-let d=(r=(0,t.inject)("repository/permission"),i=class extends l.Ability{constructor(){var e,t,n,l
-super(...arguments),e=this,t="permissions",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),a(this,"resource",""),a(this,"segmented",!0)}generate(e){return this.permissions.generate(this.resource,e)}generateForSegment(e){return this.segmented?[this.permissions.generate(this.resource,u,e),this.permissions.generate(this.resource,s,e)]:[]}get isLinkable(){return!0}get isNew(){return this.item.isNew}get isPristine(){return this.item.isPristine}get canRead(){if(void 0!==this.item){const e=((0,n.get)(this,"item.Resources")||[]).find((e=>e.Access===u))
-if(e)return e.Allow}return this.permissions.has(this.generate(u))}get canList(){if(void 0!==this.item){const e=((0,n.get)(this,"item.Resources")||[]).find((e=>e.Access===c))
-if(e)return e.Allow}return this.permissions.has(this.generate(c))}get canWrite(){if(void 0!==this.item){const e=((0,n.get)(this,"item.Resources")||[]).find((e=>e.Access===s))
-if(e)return e.Allow}return this.permissions.has(this.generate(s))}get canCreate(){return this.canWrite}get canDelete(){return this.canWrite}get canUpdate(){return this.canWrite}},p=i.prototype,f="permissions",m=[r],h={configurable:!0,enumerable:!0,writable:!0,initializer:null},y={},Object.keys(h).forEach((function(e){y[e]=h[e]})),y.enumerable=!!y.enumerable,y.configurable=!!y.configurable,("value"in y||y.initializer)&&(y.writable=!0),y=m.slice().reverse().reduce((function(e,t){return t(p,f,e)||e}),y),b&&void 0!==y.initializer&&(y.value=y.initializer?y.initializer.call(b):void 0,y.initializer=void 0),void 0===y.initializer&&(Object.defineProperty(p,f,y),y=null),o=y,i)
-var p,f,m,h,b,y
-e.default=d})),define("consul-ui/abilities/intention",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{constructor(){var e,t,n
-super(...arguments),n="intention",(t="resource")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}get canWrite(){return(void 0===this.item||void 0===this.item.SourcePeer)&&(super.canWrite&&(void 0===this.item||!this.canViewCRD))}get canViewCRD(){return void 0!==this.item&&this.item.IsManagedByCRD}}e.default=n})),define("consul-ui/abilities/kv",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{constructor(){var e,t,n
-super(...arguments),n="key",(t="resource")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}generateForSegment(e){let n=super.generateForSegment(e)
-return e.endsWith("/")&&(n=n.concat(this.permissions.generate(this.resource,t.ACCESS_LIST,e))),n}get canRead(){return!0}get canList(){return!0}get canWrite(){return!0}}e.default=n})),define("consul-ui/abilities/license",["exports","consul-ui/abilities/base","@ember/service"],(function(e,t,n){var l,r,i
-function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(l=(0,n.inject)("env"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),o(this,"resource","operator"),o(this,"segmented",!1),e=this,t="env",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}get canRead(){return this.env.var("CONSUL_NSPACES_ENABLED")&&super.canRead}},u=r.prototype,s="env",c=[l],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),i=f,r)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/abilities/node",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{constructor(){var e,t,n
-super(...arguments),n="node",(t="resource")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}}e.default=n})),define("consul-ui/abilities/nspace",["exports","consul-ui/abilities/base","@ember/service"],(function(e,t,n){var l,r,i
-function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(l=(0,n.inject)("env"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),o(this,"resource","operator"),o(this,"segmented",!1)}get isLinkable(){return!this.item.DeletedAt}get canManage(){return this.canCreate}get canDelete(){return"default"!==this.item.Name&&super.canDelete}get canChoose(){return this.canUse}get canUse(){return this.env.var("CONSUL_NSPACES_ENABLED")}},u=r.prototype,s="env",c=[l],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),i=f,r)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/abilities/overview",["exports","consul-ui/abilities/base","@ember/service"],(function(e,t,n){var l,r,i
-function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(l=(0,n.inject)("env"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),o(this,"resource","operator"),o(this,"segmented",!1)}get canAccess(){return!this.env.var("CONSUL_HCP_ENABLED")&&this.canRead}},u=r.prototype,s="env",c=[l],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),i=f,r)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/abilities/partition",["exports","consul-ui/abilities/base","@ember/service"],(function(e,t,n){var l,r,i,o,a
-function u(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function s(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function c(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let d=(l=(0,n.inject)("env"),r=(0,n.inject)("repository/dc"),i=class extends t.default{constructor(){super(...arguments),u(this,"env",o,this),u(this,"dcs",a,this),s(this,"resource","operator"),s(this,"segmented",!1)}get isLinkable(){return!this.item.DeletedAt}get canManage(){return this.canWrite}get canCreate(){return!(this.dcs.peekAll().length>1)&&super.canCreate}get canDelete(){return"default"!==this.item.Name&&super.canDelete}get canChoose(){return void 0!==this.dc&&(this.canUse&&this.dc.Primary)}get canUse(){return this.env.var("CONSUL_PARTITIONS_ENABLED")}},o=c(i.prototype,"env",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a=c(i.prototype,"dcs",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i)
-e.default=d})),define("consul-ui/abilities/peer",["exports","consul-ui/abilities/base","@ember/service"],(function(e,t,n){var l,r,i
-function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(l=(0,n.inject)("env"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),o(this,"resource","peering"),o(this,"segmented",!1)}get isLinkable(){return this.canDelete}get canDelete(){return!["DELETING"].includes(this.item.State)&&super.canDelete}get canUse(){return this.env.var("CONSUL_PEERINGS_ENABLED")}},u=r.prototype,s="env",c=[l],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),i=f,r)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/abilities/permission",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{get canRead(){return this.permissions.permissions.length>0}}e.default=n})),define("consul-ui/abilities/policy",["exports","consul-ui/abilities/base","@ember/service","consul-ui/helpers/policy/typeof"],(function(e,t,n,l){var r,i,o
-function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let u=(r=(0,n.inject)("env"),i=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),a(this,"resource","acl"),a(this,"segmented",!1)}get canRead(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canRead}get canWrite(){return this.env.var("CONSUL_ACLS_ENABLED")&&(void 0===this.item||"policy-management"!==(0,l.typeOf)([this.item]))&&super.canWrite}get canCreate(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canCreate}get canDelete(){return this.env.var("CONSUL_ACLS_ENABLED")&&(void 0===this.item||"policy-management"!==(0,l.typeOf)([this.item]))&&super.canDelete}},s=i.prototype,c="env",d=[r],p={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(p).forEach((function(e){m[e]=p[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=d.slice().reverse().reduce((function(e,t){return t(s,c,e)||e}),m),f&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(f):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(s,c,m),m=null),o=m,i)
-var s,c,d,p,f,m
-e.default=u})),define("consul-ui/abilities/role",["exports","consul-ui/abilities/base","@ember/service"],(function(e,t,n){var l,r,i
-function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(l=(0,n.inject)("env"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),o(this,"resource","acl"),o(this,"segmented",!1)}get canRead(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canRead}get canCreate(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canCreate}get canDelete(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canDelete}},u=r.prototype,s="env",c=[l],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),i=f,r)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/abilities/server",["exports","consul-ui/abilities/base"],(function(e,t){function n(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{constructor(){super(...arguments),n(this,"resource","operator"),n(this,"segmented",!1)}}e.default=l})),define("consul-ui/abilities/service-instance",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{constructor(){var e,t,n
-super(...arguments),n="service",(t="resource")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}generateForSegment(e){return super.generateForSegment(...arguments).concat([this.permissions.generate("intention",t.ACCESS_READ,e),this.permissions.generate("intention",t.ACCESS_WRITE,e)])}}e.default=n})),define("consul-ui/abilities/session",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{constructor(){var e,t,n
-super(...arguments),n="session",(t="resource")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}}e.default=n})),define("consul-ui/abilities/token",["exports","consul-ui/abilities/base","@ember/service","consul-ui/helpers/token/is-legacy","consul-ui/helpers/token/is-anonymous"],(function(e,t,n,l,r){var i,o,a
-function u(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let s=(i=(0,n.inject)("env"),o=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=a)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),u(this,"resource","acl"),u(this,"segmented",!1)}get canRead(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canRead}get canCreate(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canCreate}get canDelete(){return this.env.var("CONSUL_ACLS_ENABLED")&&!(0,r.isAnonymous)([this.item])&&this.item.AccessorID!==this.token.AccessorID&&super.canDelete}get canDuplicate(){return this.env.var("CONSUL_ACLS_ENABLED")&&!(0,l.isLegacy)([this.item])&&super.canWrite}},c=o.prototype,d="env",p=[i],f={configurable:!0,enumerable:!0,writable:!0,initializer:null},h={},Object.keys(f).forEach((function(e){h[e]=f[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=p.slice().reverse().reduce((function(e,t){return t(c,d,e)||e}),h),m&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(m):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(c,d,h),h=null),a=h,o)
-var c,d,p,f,m,h
-e.default=s})),define("consul-ui/abilities/upstream",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{constructor(){var e,t,n
-super(...arguments),n="upstream",(t="resource")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}get isLinkable(){return this.item.InstanceCount>0}}e.default=n})),define("consul-ui/abilities/zervice",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{constructor(){var e,t,n
-super(...arguments),n="service",(t="resource")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}get isLinkable(){return this.item.InstanceCount>0}get canReadIntention(){if(void 0===this.item||void 0===this.item.Resources)return!1
-return void 0!==this.item.Resources.find((e=>"intention"===e.Resource&&"read"===e.Access&&!0===e.Allow))}get canWriteIntention(){if(void 0===this.item||void 0===this.item.Resources)return!1
-return void 0!==this.item.Resources.find((e=>"intention"===e.Resource&&"write"===e.Access&&!0===e.Allow))}get canCreateIntention(){return this.canWriteIntention}get canUpdateIntention(){return this.canWriteIntention}}e.default=n})),define("consul-ui/abilities/zone",["exports","consul-ui/abilities/base","@ember/service"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,n.inject)("env"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}get canRead(){return this.env.var("CONSUL_NSPACES_ENABLED")}},a=r.prototype,u="env",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/adapters/-json-api",["exports","@ember-data/adapter/json-api"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/adapters/application",["exports","consul-ui/adapters/http","@ember/service"],(function(e,t,n){var l,r,i,o,a
-function u(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function s(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.NSPACE_QUERY_PARAM=e.DATACENTER_QUERY_PARAM=void 0
-e.DATACENTER_QUERY_PARAM="dc"
-e.NSPACE_QUERY_PARAM="ns"
-let c=(l=(0,n.inject)("client/http"),r=(0,n.inject)("env"),i=class extends t.default{constructor(){super(...arguments),u(this,"client",o,this),u(this,"env",a,this)}formatNspace(e){if(this.env.var("CONSUL_NSPACES_ENABLED"))return""!==e?{ns:e}:void 0}formatDatacenter(e){return{dc:e}}},o=s(i.prototype,"client",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a=s(i.prototype,"env",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i)
-e.default=c})),define("consul-ui/adapters/auth-method",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{requestForQuery(e,t){let{dc:n,ns:l,partition:r,index:i,id:o}=t
-return e`
-      GET /v1/acl/auth-methods?${{dc:n}}
-
-      ${{ns:l,partition:r,index:i}}
-    `}requestForQueryRecord(e,t){let{dc:n,ns:l,partition:r,index:i,id:o}=t
-if(void 0===o)throw new Error("You must specify an id")
-return e`
-      GET /v1/acl/auth-method/${o}?${{dc:n}}
-
-      ${{ns:l,partition:r,index:i}}
-    `}}e.default=n})),define("consul-ui/adapters/binding-rule",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{requestForQuery(e,t){let{dc:n,ns:l,partition:r,authmethod:i,index:o}=t
-return e`
-      GET /v1/acl/binding-rules?${{dc:n,authmethod:i}}
-
-      ${{ns:l,partition:r,index:o}}
-    `}}e.default=n})),define("consul-ui/adapters/coordinate",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{requestForQuery(e,t){let{dc:n,partition:l,index:r,uri:i}=t
-return e`
-      GET /v1/coordinate/nodes?${{dc:n}}
-      X-Request-ID: ${i}
-
-      ${{partition:l,index:r}}
-    `}}e.default=n})),define("consul-ui/adapters/discovery-chain",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{requestForQueryRecord(e,t){let{dc:n,ns:l,partition:r,index:i,id:o,uri:a}=t
-if(void 0===o)throw new Error("You must specify an id")
-return e`
-      GET /v1/discovery-chain/${o}?${{dc:n}}
-      X-Request-ID: ${a}
-
-      ${{ns:l,partition:r,index:i}}
-    `}}e.default=n})),define("consul-ui/adapters/http",["exports","@ember/service","@ember-data/adapter","@ember-data/adapter/error"],(function(e,t,n,l){var r,i,o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const a=function(e,t,n){let l=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{}
-return e.rpc((function(e){for(var t=arguments.length,l=new Array(t>1?t-1:0),r=1;r<t;r++)l[r-1]=arguments[r]
-return e[`requestFor${n}`](...l)}),(function(e){for(var t=arguments.length,l=new Array(t>1?t-1:0),r=1;r<t;r++)l[r-1]=arguments[r]
-return e[`respondFor${n}`](...l)}),l,t)},u=function(e,t,n,l){return e.rpc((function(e){for(var t=arguments.length,l=new Array(t>1?t-1:0),r=1;r<t;r++)l[r-1]=arguments[r]
-return e[`requestFor${n}`](...l)}),(function(e){for(var t=arguments.length,l=new Array(t>1?t-1:0),r=1;r<t;r++)l[r-1]=arguments[r]
-return e[`respondFor${n}`](...l)}),l,t)}
-let s=(r=(0,t.inject)("client/http"),i=class extends n.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="client",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}rpc(e,t,n,l){const r=this.client,i=this.store,o=this
-let a,u
-const s=i.serializerFor(l),c=i.modelFor(l)
-return"function"==typeof n.attributes?(a=n.attributes(),u=s.serialize(n,{})):(a=n,u=a),r.request((function(t){return e(o,t,u,a,c)})).catch((function(e){return o.error(e)})).then((function(e){return t(s,e,u,a,c)}))}error(e){if(e instanceof TypeError)throw e
-const t=[{status:`${e.statusCode}`,title:"The backend responded with an error",detail:e.message}]
-let n
-const r=""
-try{switch(e.statusCode){case 0:n=new l.AbortError,n.errors[0].status="0"
-break
-case 401:n=new l.UnauthorizedError(t,r)
-break
-case 403:n=new l.ForbiddenError(t,r)
-break
-case 404:n=new l.NotFoundError(t,r)
-break
-case 408:n=new l.TimeoutError
-break
-case 409:n=new l.ConflictError(t,r)
-break
-case 422:n=new l.InvalidError(t)
-break
-default:n=e.statusCode>=500?new l.ServerError(t,r):new l.default(t,r)}}catch(i){n=i}throw n}query(e,t,n){return a(this,t.modelName,"Query",n)}queryRecord(e,t,n){return a(this,t.modelName,"QueryRecord",n)}findAll(e,t){return a(this,t.modelName,"FindAll")}createRecord(e,t,n){return u(this,t.modelName,"CreateRecord",n)}updateRecord(e,t,n){return u(this,t.modelName,"UpdateRecord",n)}deleteRecord(e,t,n){return u(this,t.modelName,"DeleteRecord",n)}},c=i.prototype,d="client",p=[r],f={configurable:!0,enumerable:!0,writable:!0,initializer:null},h={},Object.keys(f).forEach((function(e){h[e]=f[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=p.slice().reverse().reduce((function(e,t){return t(c,d,e)||e}),h),m&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(m):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(c,d,h),h=null),o=h,i)
-var c,d,p,f,m,h
-e.default=s})),define("consul-ui/adapters/intention",["exports","consul-ui/adapters/application","@ember/object"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{requestForQuery(e,t){let{dc:n,ns:l,partition:r,filter:i,index:o,uri:a}=t
-return e`
-      GET /v1/connect/intentions?${{dc:n}}
-      X-Request-ID: ${a}${void 0!==i?`\n      X-Range: ${i}`:""}
-
-      ${{partition:r,ns:"*",index:o,filter:i}}
-    `}requestForQueryRecord(e,t){let{dc:n,index:l,id:r}=t
-if(void 0===r)throw new Error("You must specify an id")
-if(r.match(/^peer:/)){const[t,i,o,a,u,s,c]=r.split(":").map(decodeURIComponent)
-return e`
-      GET /v1/connect/intentions/exact?${{source:`${t}:${i}/${o}/${a}`,destination:`${u}/${s}/${c}`,dc:n}}
-      Cache-Control: no-store
-
-      ${{index:l}}
-    `}{const[t,i,o,a,u,s]=r.split(":").map(decodeURIComponent)
-return e`
-      GET /v1/connect/intentions/exact?${{source:`${t}/${i}/${o}`,destination:`${a}/${u}/${s}`,dc:n}}
-      Cache-Control: no-store
-
-      ${{index:l}}
-    `}}requestForCreateRecord(e,t,l){const r={SourceName:t.SourceName,DestinationName:t.DestinationName,SourceNS:t.SourceNS,DestinationNS:t.DestinationNS,SourcePartition:t.SourcePartition,DestinationPartition:t.DestinationPartition,SourceType:t.SourceType,Meta:t.Meta,Description:t.Description}
-return(0,n.get)(t,"Action.length")?r.Action=t.Action:t.Permissions&&(r.Permissions=t.Permissions),e`
-      PUT /v1/connect/intentions/exact?${{source:`${l.SourcePartition}/${l.SourceNS}/${l.SourceName}`,destination:`${l.DestinationPartition}/${l.DestinationNS}/${l.DestinationName}`,dc:l.Datacenter}}
-
-      ${r}
-    `}requestForUpdateRecord(e,t,n){return delete t.DestinationName,delete t.DestinationNS,delete t.DestinationPartition,this.requestForCreateRecord(...arguments)}requestForDeleteRecord(e,t,n){return e`
-      DELETE /v1/connect/intentions/exact?${{source:`${n.SourcePartition}/${n.SourceNS}/${n.SourceName}`,destination:`${n.DestinationPartition}/${n.DestinationNS}/${n.DestinationName}`,dc:n.Datacenter}}
-    `}}e.default=l})),define("consul-ui/adapters/kv",["exports","consul-ui/adapters/application","consul-ui/utils/isFolder","consul-ui/utils/keyToArray","consul-ui/models/kv"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class i extends t.default{async requestForQuery(e,t){let{dc:n,ns:r,partition:i,index:o,id:a,separator:u}=t
-if(void 0===a)throw new Error("You must specify an id")
-const s=await(e`
-      GET /v1/kv/${(0,l.default)(a)}?${{keys:null,dc:n,separator:u}}
-
-      ${{ns:r,partition:i,index:o}}
-    `)
-return await s(((e,t)=>delete e["x-consul-index"])),s}async requestForQueryRecord(e,t){let{dc:n,ns:r,partition:i,index:o,id:a}=t
-if(void 0===a)throw new Error("You must specify an id")
-const u=await(e`
-      GET /v1/kv/${(0,l.default)(a)}?${{dc:n}}
-
-      ${{ns:r,partition:i,index:o}}
-    `)
-return await u(((e,t)=>delete e["x-consul-index"])),u}requestForCreateRecord(e,t,n){const i={dc:n.Datacenter,ns:n.Namespace,partition:n.Partition}
-return e`
-      PUT /v1/kv/${(0,l.default)(n[r.SLUG_KEY])}?${i}
-      Content-Type: text/plain; charset=utf-8
-
-      ${t}
-    `}requestForUpdateRecord(e,t,n){const i={dc:n.Datacenter,ns:n.Namespace,partition:n.Partition,flags:n.Flags}
-return e`
-      PUT /v1/kv/${(0,l.default)(n[r.SLUG_KEY])}?${i}
-      Content-Type: text/plain; charset=utf-8
-
-      ${t}
-    `}requestForDeleteRecord(e,t,i){let o;(0,n.default)(i[r.SLUG_KEY])&&(o=null)
-const a={dc:i.Datacenter,ns:i.Namespace,partition:i.Partition,recurse:o}
-return e`
-      DELETE /v1/kv/${(0,l.default)(i[r.SLUG_KEY])}?${a}
-    `}}e.default=i}))
-define("consul-ui/adapters/node",["exports","consul-ui/adapters/application"],(function(e,t){function n(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function l(e){for(var t=1;t<arguments.length;t++){var l=null!=arguments[t]?arguments[t]:{}
-t%2?n(Object(l),!0).forEach((function(t){r(e,t,l[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(l)):n(Object(l)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(l,t))}))}return e}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class i extends t.default{requestForQuery(e,t){let{dc:n,ns:l,partition:r,index:i,id:o,uri:a}=t
-return e`
-      GET /v1/internal/ui/nodes?${{dc:n}}
-      X-Request-ID: ${a}
-
-      ${{ns:l,partition:r,index:i}}
-    `}requestForQueryRecord(e,t){let{dc:n,ns:r,partition:i,index:o,id:a,uri:u,peer:s}=t
-if(void 0===a)throw new Error("You must specify an id")
-let c={ns:r,partition:i,index:o}
-return s&&(c=l(l({},c),{},{peer:s})),e`
-      GET /v1/internal/ui/node/${a}?${{dc:n}}
-      X-Request-ID: ${u}
-
-      ${c}
-    `}requestForQueryLeader(e,t){let{dc:n,uri:l}=t
-return e`
-      GET /v1/status/leader?${{dc:n}}
-      X-Request-ID: ${l}
-      Refresh: 30
-    `}queryLeader(e,t,n,l){return this.rpc((function(e,t,n,l){return e.requestForQueryLeader(t,n,l)}),(function(e,t,n,l){return e.respondForQueryLeader(t,n,l)}),l,t.modelName)}}e.default=i})),define("consul-ui/adapters/nspace",["exports","consul-ui/adapters/application","consul-ui/models/nspace"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{requestForQuery(e,t){let{dc:n,partition:l,index:r,uri:i}=t
-return e`
-      GET /v1/namespaces?${{dc:n}}
-      X-Request-ID: ${i}
-
-      ${{partition:l,index:r}}
-    `}requestForQueryRecord(e,t){let{dc:n,partition:l,index:r,id:i}=t
-if(void 0===i)throw new Error("You must specify an name")
-return e`
-      GET /v1/namespace/${i}?${{dc:n}}
-
-      ${{partition:l,index:r}}
-    `}requestForCreateRecord(e,t,l){return e`
-      PUT /v1/namespace/${l[n.SLUG_KEY]}?${{dc:l.Datacenter,partition:l.Partition}}
-
-      ${{Name:t.Name,Description:t.Description,ACLs:{PolicyDefaults:t.ACLs.PolicyDefaults.map((e=>({ID:e.ID}))),RoleDefaults:t.ACLs.RoleDefaults.map((e=>({ID:e.ID})))}}}
-    `}requestForUpdateRecord(e,t,l){return e`
-      PUT /v1/namespace/${l[n.SLUG_KEY]}?${{dc:l.Datacenter,partition:l.Partition}}
-
-      ${{Description:t.Description,ACLs:{PolicyDefaults:t.ACLs.PolicyDefaults.map((e=>({ID:e.ID}))),RoleDefaults:t.ACLs.RoleDefaults.map((e=>({ID:e.ID})))}}}
-    `}requestForDeleteRecord(e,t,l){return e`
-      DELETE /v1/namespace/${l[n.SLUG_KEY]}?${{dc:l.Datacenter,partition:l.Partition}}
-    `}}e.default=l})),define("consul-ui/adapters/oidc-provider",["exports","consul-ui/adapters/application","@ember/service"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,n.inject)("env"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}requestForQuery(e,t){let{dc:n,ns:l,partition:r,index:i,uri:o}=t
-return e`
-      GET /v1/internal/ui/oidc-auth-methods?${{dc:n}}
-      X-Request-ID: ${o}
-
-      ${{ns:l,partition:r,index:i}}
-    `}requestForQueryRecord(e,t){let{dc:n,ns:l,partition:r,id:i}=t
-if(void 0===i)throw new Error("You must specify an id")
-return e`
-      POST /v1/acl/oidc/auth-url?${{dc:n,ns:l,partition:r}}
-      Cache-Control: no-store
-
-      ${{AuthMethod:i,RedirectURI:`${this.env.var("CONSUL_BASE_UI_URL")}/oidc/callback`}}
-    `}requestForAuthorize(e,t){let{dc:n,ns:l,partition:r,id:i,code:o,state:a}=t
-if(void 0===i)throw new Error("You must specify an id")
-if(void 0===o)throw new Error("You must specify an code")
-if(void 0===a)throw new Error("You must specify an state")
-return e`
-      POST /v1/acl/oidc/callback?${{dc:n,ns:l,partition:r}}
-      Cache-Control: no-store
-
-      ${{AuthMethod:i,Code:o,State:a}}
-    `}requestForLogout(e,t){let{id:n}=t
-if(void 0===n)throw new Error("You must specify an id")
-return e`
-      POST /v1/acl/logout
-      Cache-Control: no-store
-      X-Consul-Token: ${n}
-    `}authorize(e,t,n,l){return this.rpc((function(e,t,n,l){return e.requestForAuthorize(t,n,l)}),(function(e,t,n,l){return e.respondForAuthorize(t,n,l)}),l,t.modelName)}logout(e,t,n,l){return this.rpc((function(e,t,n,l){return e.requestForLogout(t,n,l)}),(function(e,t,n,l){return{}}),l,t.modelName)}},a=r.prototype,u="env",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/adapters/partition",["exports","consul-ui/adapters/application","consul-ui/models/partition"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{async requestForQuery(e,t){let{ns:n,dc:l,index:r}=t
-const i=await(e`
-      GET /v1/partitions?${{dc:l}}
-
-      ${{index:r}}
-    `)
-return await i(((e,t)=>delete e["x-consul-index"])),i}async requestForQueryRecord(e,t){let{ns:n,dc:l,index:r,id:i}=t
-if(void 0===i)throw new Error("You must specify an id")
-const o=await(e`
-      GET /v1/partition/${i}?${{dc:l}}
-
-      ${{index:r}}
-    `)
-return await o(((e,t)=>delete e["x-consul-index"])),o}async requestForCreateRecord(e,t,l){return e`
-      PUT /v1/partition/${l[n.SLUG_KEY]}?${{dc:l.Datacenter}}
-
-      ${{Name:t.Name,Description:t.Description}}
-    `}async requestForUpdateRecord(e,t,l){return e`
-      PUT /v1/partition/${l[n.SLUG_KEY]}?${{dc:l.Datacenter}}
-
-      ${{Description:t.Description}}
-    `}async requestForDeleteRecord(e,t,l){return e`
-      DELETE /v1/partition/${l[n.SLUG_KEY]}?${{dc:l.Datacenter}}
-    `}}e.default=l})),define("consul-ui/adapters/permission",["exports","consul-ui/adapters/application","@ember/service"],(function(e,t,n){var l,r,i,o,a
-function u(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function s(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?u(Object(n),!0).forEach((function(t){d(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):u(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function c(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function d(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function p(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let f=(l=(0,n.inject)("env"),r=(0,n.inject)("settings"),i=class extends t.default{constructor(){super(...arguments),c(this,"env",o,this),c(this,"settings",a,this)}requestForAuthorize(e,t){let{dc:n,ns:l,partition:r,resources:i=[],index:o}=t
-return this.env.var("CONSUL_NSPACES_ENABLED")&&(i=i.map((e=>s(s({},e),{},{Namespace:l})))),this.env.var("CONSUL_PARTITIONS_ENABLED")&&(i=i.map((e=>s(s({},e),{},{Partition:r})))),e`
-      POST /v1/internal/acl/authorize?${{dc:n}}
-
-      ${i}
-    `}authorize(e,t,n,l){return this.rpc((async(e,t,n,l)=>{const r=this.env.var("CONSUL_NSPACES_ENABLED"),i=this.env.var("CONSUL_PARTITIONS_ENABLED")
-if(r||i){const e=await this.settings.findBySlug("token")
-r&&(void 0!==n.ns&&0!==n.ns.length||(n.ns=e.Namespace)),i&&(void 0!==n.partition&&0!==n.partition.length||(n.partition=e.Partition))}return e.requestForAuthorize(t,n)}),(function(e,t,n,l){return t((function(e,t){return t}))}),l,t.modelName)}},o=p(i.prototype,"env",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a=p(i.prototype,"settings",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i)
-e.default=f})),define("consul-ui/adapters/policy",["exports","consul-ui/adapters/application","consul-ui/models/policy"],(function(e,t,n){function l(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function r(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?l(Object(n),!0).forEach((function(t){i(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class o extends t.default{requestForQuery(e,t){let{dc:n,ns:l,partition:r,index:i,id:o}=t
-return e`
-      GET /v1/acl/policies?${{dc:n}}
-
-      ${{ns:l,partition:r,index:i}}
-    `}requestForQueryRecord(e,t){let{dc:n,ns:l,partition:r,index:i,id:o}=t
-if(void 0===o)throw new Error("You must specify an id")
-return e`
-      GET /v1/acl/policy/${o}?${{dc:n}}
-
-      ${{ns:l,partition:r,index:i}}
-    `}requestForCreateRecord(e,t,n){return e`
-      PUT /v1/acl/policy?${r(r({},this.formatDatacenter(n.Datacenter)),{},{ns:n.Namespace,partition:n.Partition})}
-
-      ${{Name:t.Name,Description:t.Description,Rules:t.Rules,Datacenters:t.Datacenters}}
-    `}requestForUpdateRecord(e,t,l){const i=r(r({},this.formatDatacenter(l.Datacenter)),{},{ns:l.Namespace,partition:l.Partition})
-return e`
-      PUT /v1/acl/policy/${l[n.SLUG_KEY]}?${i}
-
-      ${{Name:t.Name,Description:t.Description,Rules:t.Rules,Datacenters:t.Datacenters}}
-    `}requestForDeleteRecord(e,t,l){const i=r(r({},this.formatDatacenter(l.Datacenter)),{},{ns:l.Namespace,partition:l.Partition})
-return e`
-      DELETE /v1/acl/policy/${l[n.SLUG_KEY]}?${i}
-    `}}e.default=o})),define("consul-ui/adapters/proxy",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{requestForQuery(e,t){let{dc:n,ns:l,partition:r,index:i,id:o,uri:a}=t
-if(void 0===o)throw new Error("You must specify an id")
-return e`
-      GET /v1/catalog/connect/${o}?${{dc:n,"merge-central-config":null}}
-      X-Request-ID: ${a}
-      X-Range: ${o}
-
-      ${{ns:l,partition:r,index:i}}
-    `}}e.default=n})),define("consul-ui/adapters/role",["exports","consul-ui/adapters/application","consul-ui/models/role"],(function(e,t,n){function l(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function r(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?l(Object(n),!0).forEach((function(t){i(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class o extends t.default{requestForQuery(e,t){let{dc:n,ns:l,partition:r,index:i,id:o}=t
-return e`
-      GET /v1/acl/roles?${{dc:n}}
-
-      ${{ns:l,partition:r,index:i}}
-    `}requestForQueryRecord(e,t){let{dc:n,ns:l,partition:r,index:i,id:o}=t
-if(void 0===o)throw new Error("You must specify an id")
-return e`
-      GET /v1/acl/role/${o}?${{dc:n}}
-
-      ${{ns:l,partition:r,index:i}}
-    `}requestForCreateRecord(e,t,n){return e`
-      PUT /v1/acl/role?${r(r({},this.formatDatacenter(n.Datacenter)),{},{ns:n.Namespace,partition:n.Partition})}
-
-      ${{Name:t.Name,Description:t.Description,Policies:t.Policies,ServiceIdentities:t.ServiceIdentities,NodeIdentities:t.NodeIdentities}}
-    `}requestForUpdateRecord(e,t,l){const i=r(r({},this.formatDatacenter(l.Datacenter)),{},{ns:l.Namespace,partition:l.Partition})
-return e`
-      PUT /v1/acl/role/${l[n.SLUG_KEY]}?${i}
-
-      ${{Name:t.Name,Description:t.Description,Policies:t.Policies,ServiceIdentities:t.ServiceIdentities,NodeIdentities:t.NodeIdentities}}
-    `}requestForDeleteRecord(e,t,l){const i=r(r({},this.formatDatacenter(l.Datacenter)),{},{ns:l.Namespace,partition:l.Partition})
-return e`
-      DELETE /v1/acl/role/${l[n.SLUG_KEY]}?${i}
-    `}}e.default=o})),define("consul-ui/adapters/service-instance",["exports","consul-ui/adapters/application"],(function(e,t){function n(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function l(e){for(var t=1;t<arguments.length;t++){var l=null!=arguments[t]?arguments[t]:{}
-t%2?n(Object(l),!0).forEach((function(t){r(e,t,l[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(l)):n(Object(l)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(l,t))}))}return e}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class i extends t.default{requestForQuery(e,t){let{dc:n,ns:r,partition:i,index:o,id:a,uri:u,peer:s}=t
-if(void 0===a)throw new Error("You must specify an id")
-let c={ns:r,partition:i,index:o}
-return s&&(c=l(l({},c),{},{peer:s})),e`
-      GET /v1/health/service/${a}?${{dc:n,"merge-central-config":null}}
-      X-Request-ID: ${u}
-      X-Range: ${a}
-
-      ${c}
-    `}requestForQueryRecord(){return this.requestForQuery(...arguments)}}e.default=i})),define("consul-ui/adapters/service",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{requestForQuery(e,t){let{dc:n,ns:l,partition:r,index:i,gateway:o,uri:a,peer:u}=t
-return void 0!==o?e`
-        GET /v1/internal/ui/gateway-services-nodes/${o}?${{dc:n}}
-        X-Range: ${o}
-        X-Request-ID: ${a}
-
-        ${{ns:l,partition:r,index:i}}
-      `:e`
-        GET /v1/internal/ui/services?${{dc:n,peer:u}}
-        X-Request-ID: ${a}
-
-        ${{ns:l,partition:r,index:i,peer:u}}
-    `}requestForQueryRecord(e,t){let{dc:n,ns:l,partition:r,index:i,id:o,uri:a}=t
-if(void 0===o)throw new Error("You must specify an id")
-return e`
-      GET /v1/health/service/${o}?${{dc:n,"merge-central-config":null}}
-      X-Request-ID: ${a}
-
-      ${{ns:l,partition:r,index:i}}
-    `}}e.default=n})),define("consul-ui/adapters/session",["exports","consul-ui/adapters/application","consul-ui/models/session"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{requestForQuery(e,t){let{dc:n,ns:l,partition:r,index:i,id:o,uri:a}=t
-if(void 0===o)throw new Error("You must specify an id")
-return e`
-      GET /v1/session/node/${o}?${{dc:n}}
-      X-Request-ID: ${a}
-
-      ${{ns:l,partition:r,index:i}}
-    `}requestForQueryRecord(e,t){let{dc:n,ns:l,partition:r,index:i,id:o}=t
-if(void 0===o)throw new Error("You must specify an id")
-return e`
-      GET /v1/session/info/${o}?${{dc:n}}
-
-      ${{ns:l,partition:r,index:i}}
-    `}requestForDeleteRecord(e,t,l){const r={dc:l.Datacenter,ns:l.Namespace,partition:l.Partition}
-return e`
-      PUT /v1/session/destroy/${l[n.SLUG_KEY]}?${r}
-    `}}e.default=l})),define("consul-ui/adapters/token",["exports","consul-ui/adapters/application","@ember/service","consul-ui/models/token"],(function(e,t,n,l){var r,i,o
-function a(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function u(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?a(Object(n),!0).forEach((function(t){s(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):a(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function s(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let c=(r=(0,n.inject)("store"),i=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="store",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}requestForQuery(e,t){let{dc:n,ns:l,partition:r,index:i,role:o,policy:a}=t
-return e`
-      GET /v1/acl/tokens?${{role:o,policy:a,dc:n}}
-
-      ${{ns:l,partition:r,index:i}}
-    `}async requestForQueryRecord(e,t){let{dc:n,ns:l,partition:r,index:i,id:o}=t
-if(void 0===o)throw new Error("You must specify an id")
-const a=await(e`
-      GET /v1/acl/token/${o}?${{dc:n}}
-      Cache-Control: no-store
-
-      ${{ns:l,partition:r,index:i}}
-    `)
-return a(((e,t)=>delete e["x-consul-index"])),a}requestForCreateRecord(e,t,n){return e`
-      PUT /v1/acl/token?${u(u({},this.formatDatacenter(n.Datacenter)),{},{ns:n.Namespace,partition:n.Partition})}
-
-      ${{Description:t.Description,Policies:t.Policies,Roles:t.Roles,ServiceIdentities:t.ServiceIdentities,NodeIdentities:t.NodeIdentities,Local:t.Local}}
-    `}requestForUpdateRecord(e,t,n){if(void 0!==n.Rules)return e`
-        PUT /v1/acl/update?${this.formatDatacenter(n.Datacenter)}
-
-        ${t}
-      `
-const r=u(u({},this.formatDatacenter(n.Datacenter)),{},{ns:n.Namespace,partition:n.Partition})
-return e`
-      PUT /v1/acl/token/${n[l.SLUG_KEY]}?${r}
-
-      ${{Description:t.Description,Policies:t.Policies,Roles:t.Roles,ServiceIdentities:t.ServiceIdentities,NodeIdentities:t.NodeIdentities,Local:t.Local}}
-    `}requestForDeleteRecord(e,t,n){const r={dc:n.Datacenter,ns:n.Namespace,partition:n.Partition}
-return e`
-      DELETE /v1/acl/token/${n[l.SLUG_KEY]}?${r}
-    `}requestForSelf(e,t,n){let{dc:l,index:r,secret:i}=n
-return e`
-      GET /v1/acl/token/self?${{dc:l}}
-      X-Consul-Token: ${i}
-      Cache-Control: no-store
-
-      ${{index:r}}
-    `}requestForCloneRecord(e,t,n){const r=n[l.SLUG_KEY]
-if(void 0===r)throw new Error("You must specify an id")
-return e`
-      PUT /v1/acl/token/${r}/clone?${{dc:n.Datacenter,ns:n.Namespace,partition:n.Partition}}
-    `}self(e,t,n,l){return this.rpc((function(e,t,n,l){return e.requestForSelf(t,n,l)}),(function(e,t,n,l){return e.respondForSelf(t,n,l)}),l,t.modelName)}clone(e,t,n,l){return this.rpc((function(e,t,n,l){return e.requestForCloneRecord(t,n,l)}),((e,t,n,l)=>{const r={dc:l.Datacenter,ns:l.Namespace,partition:l.Partition}
-return e.respondForQueryRecord(t,r)}),l,t.modelName)}},d=i.prototype,p="store",f=[r],m={configurable:!0,enumerable:!0,writable:!0,initializer:null},b={},Object.keys(m).forEach((function(e){b[e]=m[e]})),b.enumerable=!!b.enumerable,b.configurable=!!b.configurable,("value"in b||b.initializer)&&(b.writable=!0),b=f.slice().reverse().reduce((function(e,t){return t(d,p,e)||e}),b),h&&void 0!==b.initializer&&(b.value=b.initializer?b.initializer.call(h):void 0,b.initializer=void 0),void 0===b.initializer&&(Object.defineProperty(d,p,b),b=null),o=b,i)
-var d,p,f,m,h,b
-e.default=c})),define("consul-ui/adapters/topology",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{requestForQueryRecord(e,t){let{dc:n,ns:l,partition:r,kind:i,index:o,id:a,uri:u}=t
-if(void 0===a)throw new Error("You must specify an id")
-return e`
-      GET /v1/internal/ui/service-topology/${a}?${{dc:n,kind:i}}
-      X-Request-ID: ${u}
-
-      ${{ns:l,partition:r,index:o}}
-    `}}e.default=n})),define("consul-ui/app",["exports","@ember/application","ember-resolver","ember-load-initializers","consul-ui/config/environment"],(function(e,t,n,l,r){function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class o extends t.default{constructor(){super(...arguments),i(this,"modulePrefix",r.default.modulePrefix),i(this,"podModulePrefix",r.default.podModulePrefix),i(this,"Resolver",n.default)}}e.default=o,(0,l.default)(o,r.default.modulePrefix)})),define("consul-ui/component-managers/glimmer",["exports","@glimmer/component/-private/ember-component-manager"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/-dynamic-element-alt",["exports","@ember/component"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default.extend()
-e.default=n})),define("consul-ui/components/-dynamic-element",["exports","@ember/component"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default.extend()
-e.default=n})),define("consul-ui/components/action/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"YwHFpVZ2",block:'[[[41,[30,1],[[[11,"label"],[16,"for",[30,1]],[17,2],[12],[18,8,null],[13]],[]],[[[41,[30,3],[[[41,[30,4],[[[11,3],[16,6,[30,3]],[24,"target","_blank"],[24,"rel","noopener noreferrer"],[17,2],[12],[18,8,null],[13]],[]],[[[11,3],[16,6,[30,3]],[17,2],[12],[18,8,null],[13]],[]]]],[]],[[[11,"button"],[16,4,[28,[37,2],[[30,5],"button"],null]],[16,"tabindex",[30,6]],[17,2],[4,[38,3],["click",[28,[37,4],[[30,7]],null]],null],[12],[18,8,null],[13]],[]]]],[]]]],["@for","&attrs","@href","@external","@type","@tabindex","@onclick","&default"],false,["if","yield","or","on","optional"]]',moduleName:"consul-ui/components/action/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/anonymous/index",["exports","@ember/component","@ember/template-factory"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,n.createTemplateFactory)({id:"RdtQ4WaT",block:'[[[18,1,null]],["&default"],false,["yield"]]',moduleName:"consul-ui/components/anonymous/index.hbs",isStrictMode:!1})
-var r=(0,t.setComponentTemplate)(l,t.default.extend({tagName:""}))
-e.default=r})),define("consul-ui/components/app-error/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"4rDG/Mn1",block:'[[[8,[39,0],null,null,[["default"],[[[[1,"\\n  "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n    "],[10,"h1"],[12],[1,"\\n      Error "],[1,[30,1,["status"]]],[1,"\\n    "],[13],[1,"\\n  "]],[]]]]],[1,"\\n  "],[8,[39,1],null,[["@name"],["content"]],[["default"],[[[[1,"\\n    "],[8,[39,2],null,[["@error","@login"],[[30,1],[52,[28,[37,4],[[30,1,["status"]],"403"],null],[30,2]]]],null],[1,"\\n  "]],[]]]]],[1,"\\n"]],[]]]]],[1,"\\n"]],["@error","@login"],false,["app-view","block-slot","error-state","if","eq"]]',moduleName:"consul-ui/components/app-error/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/app-view/index",["exports","@ember/component","@ember/template-factory","block-slots"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"JJpdEf6u",block:'[[[11,0],[24,0,"app-view"],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n  "],[10,"header"],[12],[1,"\\n      "],[10,0],[12],[1,"\\n          "],[10,0],[12],[1,"\\n              "],[10,"nav"],[14,"aria-label","Breadcrumb"],[12],[1,"\\n                  "],[8,[39,1],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n                    "],[1,[28,[35,2],null,[["class"],["with-breadcrumbs"]]]],[1,"\\n                    "],[18,2,null],[1,"\\n                  "]],[]]]]],[1,"\\n              "],[13],[1,"\\n              "],[10,0],[14,0,"title"],[12],[1,"\\n                "],[10,0],[14,0,"title-left-container"],[12],[1,"\\n                  "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                      "],[18,2,null],[1,"\\n                  "]],[]]]]],[1,"\\n                "],[13],[1,"\\n                "],[10,0],[14,0,"actions"],[12],[1,"\\n                  "],[8,[39,1],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                    "],[8,[39,3],null,[["@name"],["app-view-actions"]],null],[1,"\\n                    "],[18,2,null],[1,"\\n                  "]],[]]]]],[1,"\\n                "],[13],[1,"\\n              "],[13],[1,"\\n              "],[8,[39,1],null,[["@name"],["nav"]],[["default"],[[[[1,"\\n                "],[18,2,null],[1,"\\n              "]],[]]]]],[1,"\\n          "],[13],[1,"\\n      "],[13],[1,"\\n      "],[8,[39,1],null,[["@name"],["toolbar"]],[["default"],[[[[1,"\\n        "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[1,"\\n        "],[18,2,null],[1,"\\n      "]],[]]]]],[1,"\\n  "],[13],[1,"\\n  "],[10,0],[12],[1,"\\n    "],[8,[39,1],null,[["@name"],["content"]],[["default"],[[[[18,2,null]],[]]]]],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n"]],["&attrs","&default"],false,["yield","yield-slot","document-attrs","portal-target"]]',moduleName:"consul-ui/components/app-view/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,t.default.extend(l.default,{tagName:""}))
-e.default=i})),define("consul-ui/components/app/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/service","@ember/object"],(function(e,t,n,l,r,i){var o,a,u
-function s(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const c=(0,n.createTemplateFactory)({id:"OX4Ky14Q",block:'[[[44,[[28,[37,1],null,[["main","Notification"],[[28,[37,2],[[33,3],"-main"],null],[50,"app/notification",0,null,null]]]]],[[[1,"\\n"],[11,0],[24,0,"app"],[17,2],[12],[1,"\\n\\n  "],[11,0],[24,0,"skip-links"],[4,[38,5],["click",[30,0,["focus"]]],null],[12],[1,"\\n    "],[8,[39,6],null,[["@name","@multiple"],["app-before-skip-links",true]],[["default"],[[[],[]]]]],[1,"\\n    "],[10,3],[15,6,[28,[37,2],["#",[30,1,["main"]]],null]],[12],[1,[28,[35,7],["components.app.skip_to_content"],null]],[13],[1,"\\n"],[1,"    "],[8,[39,6],null,[["@name","@multiple"],["app-after-skip-links",true]],[["default"],[[[],[]]]]],[1,"\\n  "],[13],[1,"\\n\\n  "],[8,[39,8],null,null,null],[1,"\\n\\n  "],[10,"input"],[15,1,[28,[37,2],[[33,3],"-main-nav-toggle"],null]],[14,4,"checkbox"],[12],[13],[1,"\\n  "],[10,"header"],[14,"role","banner"],[12],[1,"\\n    "],[11,"label"],[24,"tabindex","0"],[16,"for",[28,[37,2],[[33,3],"-main-nav-toggle"],null]],[16,"aria-label",[28,[37,7],["components.app.toggle_menu"],null]],[4,[38,5],["keypress",[30,0,["keypressClick"]]],null],[4,[38,5],["mouseup",[30,0,["unfocus"]]],null],[12],[13],[1,"\\n      "],[18,3,[[30,1]]],[1,"\\n      "],[10,0],[12],[1,"\\n"],[1,"        "],[11,"nav"],[16,"aria-label",[28,[37,7],["components.app.main"],null]],[16,0,[52,[30,0,["navInViewport"]],"in-viewport"]],[4,[38,11],null,[["onEnter","onExit","viewportTolerance"],[[28,[37,12],[[30,0],"navInViewport",true],null],[28,[37,12],[[30,0],"navInViewport",false],null],[28,[37,1],null,[["top","bottom","left","right"],[-10,-10,-10,-10]]]]]],[12],[1,"\\n          "],[18,4,[[30,1]]],[1,"\\n        "],[13],[1,"\\n"],[1,"        "],[10,"nav"],[15,"aria-label",[28,[37,7],["components.app.complementary"],null]],[12],[1,"\\n          "],[18,5,[[30,1]]],[1,"\\n        "],[13],[1,"\\n\\n      "],[13],[1,"\\n  "],[13],[1,"\\n  "],[10,"main"],[15,1,[28,[37,2],[[33,3],"-main"],null]],[12],[1,"\\n    "],[10,0],[14,0,"notifications"],[12],[1,"\\n      "],[18,6,[[30,1]]],[1,"\\n      "],[8,[39,6],null,[["@name","@multiple"],["app-notifications",true]],[["default"],[[[],[]]]]],[1,"\\n    "],[13],[1,"\\n    "],[18,7,[[30,1]]],[1,"\\n  "],[13],[1,"\\n  "],[10,"footer"],[14,"role","contentinfo"],[12],[1,"\\n    "],[18,8,[[30,1]]],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n\\n"]],[1]]]],["exported","&attrs","&home-nav","&main-nav","&complementary-nav","&notifications","&main","&content-info"],false,["let","hash","concat","guid","component","on","portal-target","t","modal-layer","yield","if","in-viewport","set"]]',moduleName:"consul-ui/components/app/index.hbs",isStrictMode:!1})
-let d=(o=(0,r.inject)("dom"),a=class extends l.default{constructor(e,t){var n,l,r,i
-super(...arguments),n=this,l="dom",i=this,(r=u)&&Object.defineProperty(n,l,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(i):void 0}),this.guid=this.dom.guid(this)}keypressClick(e){e.target.dispatchEvent(new MouseEvent("click"))}focus(e){const t=e.target.getAttribute("href")
-t.startsWith("#")&&(e.preventDefault(),this.dom.focus(t))}unfocus(e){e.target.blur()}},u=s(a.prototype,"dom",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s(a.prototype,"keypressClick",[i.action],Object.getOwnPropertyDescriptor(a.prototype,"keypressClick"),a.prototype),s(a.prototype,"focus",[i.action],Object.getOwnPropertyDescriptor(a.prototype,"focus"),a.prototype),s(a.prototype,"unfocus",[i.action],Object.getOwnPropertyDescriptor(a.prototype,"unfocus"),a.prototype),a)
-e.default=d,(0,t.setComponentTemplate)(c,d)})),define("consul-ui/components/app/notification/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"OwV217Ed",block:'[[[11,0],[24,0,"app-notification"],[17,1],[4,[38,0],[[28,[37,1],[[28,[37,1],["opacity","1"],null],[28,[37,1],["transition-delay",[28,[37,2],[[30,2],"ms"],null]],null]],null]],null],[4,[38,0],[[28,[37,1],[[28,[37,1],["opacity",[52,[30,3],"1","0"]],null]],null]],[["delay"],[0]]],[12],[1,"\\n  "],[18,4,null],[1,"\\n"],[13],[1,"\\n\\n"]],["&attrs","@delay","@sticky","&default"],false,["style","array","concat","if","yield"]]',moduleName:"consul-ui/components/app/notification/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/aria-menu/index",["exports","@ember/component","@ember/template-factory","@ember/service","@ember/object","@ember/runloop"],(function(e,t,n,l,r,i){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,n.createTemplateFactory)({id:"W/2RN9qq",block:'[[[18,1,[[28,[37,1],[[30,0],"change"],null],[28,[37,1],[[30,0],"keypress"],null],[28,[37,1],[[30,0],"keypressClick"],null],[28,[37,2],null,[["labelledBy","controls","expanded"],[[28,[37,3],["component-aria-menu-trigger-",[33,4]],null],[28,[37,3],["component-aria-menu-menu-",[33,4]],null],[52,[33,6],"true",[27]]]]]]]],["&default"],false,["yield","action","hash","concat","guid","if","expanded"]]',moduleName:"consul-ui/components/aria-menu/index.hbs",isStrictMode:!1}),a=13,u=32,s=38,c=40,d={vertical:{[c]:function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:-1
-return(t+1)%e.length},[s]:function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0
-return 0===t?e.length-1:t-1},36:function(e,t){return 0},35:function(e,t){return e.length-1}},horizontal:{}},p='[role^="menuitem"]'
-var f=(0,t.setComponentTemplate)(o,t.default.extend({tagName:"",dom:(0,l.inject)("dom"),guid:"",expanded:!1,orientation:"vertical",keyboardAccess:!0,init:function(){this._super(...arguments),(0,r.set)(this,"guid",this.dom.guid(this)),this._listeners=this.dom.listeners(),this._routelisteners=this.dom.listeners()},didInsertElement:function(){this.$menu=this.dom.element(`#component-aria-menu-menu-${this.guid}`)
-const e=this.$menu.getAttribute("aria-labelledby")
-this.$trigger=this.dom.element(`#${e}`)},willDestroyElement:function(){this._super(...arguments),this._listeners.remove(),this._routelisteners.remove()},actions:{keypressClick:function(e){e.target.dispatchEvent(new MouseEvent("click"))},keypress:function(e){if(![a,u,s,c].includes(e.keyCode))return
-e.stopPropagation()
-const t=[...this.dom.elements(p,this.$menu)]
-if(e.keyCode===a||e.keyCode===u){let e=this.expanded?void 0:t[0];(0,i.next)((()=>{e=this.expanded?e:this.$trigger,void 0!==e&&e.focus()}))}if(void 0===d[this.orientation][e.keyCode])return
-e.preventDefault()
-const n=this.dom.element(`${p}:focus`,this.$menu)
-let l
-n&&(l=t.findIndex((function(e){return e===n})))
-t[d[this.orientation][e.keyCode](t,l)].focus()},change:function(e){e.target.checked?this.actions.open.apply(this,[e]):this.actions.close.apply(this,[e])},close:function(e){this._listeners.remove(),(0,r.set)(this,"expanded",!1),(0,i.next)((()=>{this.$trigger.removeAttribute("tabindex")}))},open:function(e){(0,r.set)(this,"expanded",!0)
-0===[...this.dom.elements(p,this.$menu)].length&&this.dom.element('input[type="checkbox"]',this.$menu.parentElement).dispatchEvent(new MouseEvent("click")),this.$trigger.setAttribute("tabindex","-1"),this._listeners.add(this.dom.document(),{keydown:e=>{27===e.keyCode&&this.$trigger.focus(),9!==e.keyCode&&27!==e.keyCode?this.keyboardAccess&&this.actions.keypress.apply(this,[e]):this.$trigger.dispatchEvent(new MouseEvent("click"))}})}}}))
-e.default=f})),define("consul-ui/components/auth-dialog/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={id:"auth-dialog",initial:"idle",on:{CHANGE:[{target:"authorized",cond:"hasToken",actions:["login"]},{target:"unauthorized",actions:["logout"]}]},states:{idle:{on:{CHANGE:[{target:"authorized",cond:"hasToken"},{target:"unauthorized"}]}},unauthorized:{},authorized:{}}}})),define("consul-ui/components/auth-dialog/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/service","@ember/object","consul-ui/components/auth-dialog/chart.xstate"],(function(e,t,n,l,r,i,o){var a,u,s
-function c(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const d=(0,n.createTemplateFactory)({id:"Nh7efm+X",block:'[[[8,[39,0],null,[["@src"],[[99,1,["@src"]]]],[["default"],[[[[1,"\\n\\n  "],[8,[30,2],null,[["@name","@cond"],["hasToken",[28,[37,2],[[30,0],"hasToken"],null]]],null],[1,"\\n  "],[8,[30,3],null,[["@name","@exec"],["login",[28,[37,2],[[30,0],"login"],null]]],null],[1,"\\n  "],[8,[30,3],null,[["@name","@exec"],["logout",[28,[37,2],[[30,0],"logout"],null]]],null],[1,"\\n\\n"],[1,"  "],[8,[39,3],null,[["@src","@onchange"],[[30,6],[28,[37,4],[[28,[37,2],[[30,0],[28,[37,5],[[33,6]],null]],[["value"],["data"]]],[28,[37,2],[[30,0],[30,4],"CHANGE"],null],[28,[37,2],[[30,0],[28,[37,5],[[33,7]],null]],[["value"],["data"]]]],null]]],null],[1,"\\n"],[1,"  "],[8,[39,8],null,[["@sink"],[[30,7]]],[["default"],[[[[1,"\\n"],[44,[[28,[37,10],null,[["login","logout","token"],[[28,[37,2],[[30,0],[30,8,["open"]]],null],[28,[37,2],[[30,0],[30,8,["open"]],null],null],[33,6]]]]],[[[1,"\\n      "],[8,[30,1],null,[["@matches"],["authorized"]],[["default"],[[[[1,"\\n        "],[18,10,[[30,9]]],[1,"\\n      "]],[]]]]],[1,"\\n\\n      "],[8,[30,1],null,[["@matches"],["unauthorized"]],[["default"],[[[[1,"\\n        "],[18,11,[[30,9]]],[1,"\\n      "]],[]]]]],[1,"\\n\\n"]],[9]]],[1,"  "]],[8]]]]],[1,"\\n"]],[1,2,3,4,5]]]]],[1,"\\n"]],["State","Guard","Action","dispatch","state","@src","@sink","sink","api","&authorized","&unauthorized"],false,["state-chart","chart","action","data-source","queue","mut","token","previousToken","data-sink","let","hash","yield"]]',moduleName:"consul-ui/components/auth-dialog/index.hbs",isStrictMode:!1})
-let p=(a=(0,r.inject)("repository/oidc-provider"),u=class extends l.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="repo",l=this,(n=s)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),this.chart=o.default}hasToken(){return void 0!==this.token.AccessorID}login(){let e=(0,i.get)(this,"previousToken.AccessorID"),t=(0,i.get)(this,"token.AccessorID")
-null===e&&(e=(0,i.get)(this,"previousToken.SecretID")),null===t&&(t=(0,i.get)(this,"token.SecretID"))
-let n="authorize"
-void 0!==e&&e!==t&&(n="use"),this.args.onchange({data:(0,i.get)(this,"token"),type:n})}logout(){void 0!==(0,i.get)(this,"previousToken.AuthMethod")&&this.repo.logout((0,i.get)(this,"previousToken.SecretID")),this.previousToken=null,this.args.onchange({data:null,type:"logout"})}},s=c(u.prototype,"repo",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c(u.prototype,"hasToken",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"hasToken"),u.prototype),c(u.prototype,"login",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"login"),u.prototype),c(u.prototype,"logout",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"logout"),u.prototype),u)
-e.default=p,(0,t.setComponentTemplate)(d,p)})),define("consul-ui/components/auth-form/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={id:"auth-form",initial:"idle",on:{RESET:[{target:"idle"}],ERROR:[{target:"error"}]},states:{idle:{entry:["clearError"],on:{SUBMIT:[{target:"loading",cond:"hasValue"},{target:"error"}]}},loading:{},error:{exit:["clearError"],on:{TYPING:[{target:"idle"}],SUBMIT:[{target:"loading",cond:"hasValue"},{target:"error"}]}}}}})),define("consul-ui/components/auth-form/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","consul-ui/components/auth-form/chart.xstate","consul-ui/components/auth-form/tabs.xstate"],(function(e,t,n,l,r,i,o){var a
-function u(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const s=(0,n.createTemplateFactory)({id:"35JQNcNu",block:'[[[8,[39,0],null,[["@src"],[[30,0,["chart"]]]],[["default"],[[[[1,"\\n"],[44,[[28,[37,2],null,[["State","Guard","Action","dispatch","state"],[[30,1],[30,2],[30,3],[30,4],[30,5]]]]],[[[44,[[28,[37,2],null,[["reset","focus","disabled","error","submit"],[[28,[37,3],[[30,0],[30,4],"RESET"],null],[30,0,["focus"]],[28,[37,4],[[30,5],"loading"],null],[28,[37,5],[[28,[37,3],[[30,0],[30,4],"ERROR"],null],[28,[37,3],[[30,0],[28,[37,6],[[30,0,["error"]]],null]],[["value"],["error.errors.firstObject"]]]],null],[28,[37,5],[[28,[37,3],[[30,0],[28,[37,6],[[30,0,["value"]]],null]],null],[28,[37,3],[[30,0],[30,4],"SUBMIT"],null]],null]]]]],[[[1,"      "],[8,[30,2],null,[["@name","@cond"],["hasValue",[30,0,["hasValue"]]]],null],[1,"\\n"],[1,"      "],[8,[30,6,["Action"]],null,[["@name","@exec"],["clearError",[28,[37,5],[[28,[37,3],[[30,0],[28,[37,6],[[30,0,["error"]]],null],[27]],null],[28,[37,3],[[30,0],[28,[37,6],[[30,0,["secret"]]],null],[27]],null]],null]]],null],[1,"\\n      "],[11,0],[24,0,"auth-form"],[17,8],[12],[1,"\\n        "],[8,[39,0],null,[["@src"],[[30,0,["tabsChart"]]]],[["default"],[[[[1,"\\n"],[41,[28,[37,8],["use SSO"],null],[[[1,"            "],[8,[39,9],null,[["@items","@onclick"],[[28,[37,10],[[28,[37,2],null,[["label","selected"],["Token",[28,[37,4],[[30,13],"token"],null]]]],[28,[37,2],null,[["label","selected"],["SSO",[28,[37,4],[[30,13],"sso"],null]]]]],null],[28,[37,5],[[28,[37,3],[[30,0],[30,12]],null],[28,[37,3],[[30,0],[30,4],"RESET"],null]],null]]],null],[1,"\\n"]],[]],null],[1,"          "],[8,[30,1],null,[["@matches"],["error"]],[["default"],[[[[1,"\\n"],[41,[30,0,["error","status"]],[[[1,"              "],[8,[39,11],[[24,0,"mb-1 mt-2"]],[["@type","@color"],["inline","critical"]],[["default"],[[[[1,"\\n                "],[8,[30,14,["Title"]],null,null,[["default"],[[[[1,"\\n"],[41,[30,0,["value","Name"]],[[[41,[28,[37,12],[[30,0,["error","status"]],"403"],null],[[[1,"                      Consul login failed\\n"]],[]],[[[41,[28,[37,12],[[30,0,["error","status"]],"401"],null],[[[1,"                      Could not log in to provider\\n"]],[]],[[[41,[28,[37,12],[[30,0,["error","status"]],"499"],null],[[[1,"                      SSO log in window closed\\n"]],[]],[[[1,"                      Error\\n                    "]],[]]]],[]]]],[]]]],[]],[[[41,[28,[37,12],[[30,0,["error","status"]],"403"],null],[[[1,"                      Invalid token\\n"]],[]],[[[41,[28,[37,12],[[30,0,["error","status"]],"404"],null],[[[1,"                      No providers\\n"]],[]],[[[1,"                      Error\\n                    "]],[]]]],[]]]],[]]],[1,"                "]],[]]]]],[1,"\\n                "],[8,[30,14,["Description"]],null,null,[["default"],[[[[1,"\\n"],[41,[30,0,["value","Name"]],[[[41,[28,[37,12],[[30,0,["error","status"]],"403"],null],[[[1,"                      We received a token from your OIDC provider but could not log in to Consul\\n                      with it.\\n"]],[]],[[[41,[28,[37,12],[[30,0,["error","status"]],"401"],null],[[[1,"                      The OIDC provider has rejected this access token. Please have an\\n                      administrator check your auth method configuration.\\n"]],[]],[[[41,[28,[37,12],[[30,0,["error","status"]],"499"],null],[[[1,"                      The OIDC provider window was closed. Please try again.\\n"]],[]],[[[1,"                      "],[1,[30,0,["error","detail"]]],[1,"\\n                    "]],[]]]],[]]]],[]]]],[]],[[[41,[28,[37,12],[[30,0,["error","status"]],"403"],null],[[[1,"                      The token entered does not exist. Please enter a valid token to log in.\\n"]],[]],[[[41,[28,[37,12],[[30,0,["error","status"]],"404"],null],[[[1,"                      No SSO providers are configured for that Partition.\\n"]],[]],[[[1,"                      "],[1,[30,0,["error","detail"]]],[1,"\\n                    "]],[]]]],[]]]],[]]],[1,"                "]],[]]]]],[1,"\\n              "]],[14]]]]],[1,"\\n"]],[]],null],[1,"          "]],[]]]]],[1,"\\n          "],[8,[30,9],null,[["@matches"],["token"]],[["default"],[[[[1,"\\n            "],[10,"form"],[15,"onsubmit",[28,[37,3],[[30,0],[30,4],"SUBMIT"],null]],[12],[1,"\\n              "],[10,"fieldset"],[12],[1,"\\n                "],[10,"label"],[15,0,[28,[37,13],["type-password",[52,[28,[37,14],[[28,[37,4],[[30,5],"error"],null],[28,[37,15],[[30,0,["error","status"]]],null]],null]," has-error"]],null]],[12],[1,"\\n                  "],[10,1],[12],[1,"Log in with a token"],[13],[1,"\\n\\n"],[1,"                  "],[11,"input"],[16,"disabled",[28,[37,4],[[30,5],"loading"],null]],[24,3,"auth[SecretID]"],[24,"placeholder","SecretID"],[16,2,[30,0,["secret"]]],[16,"oninput",[28,[37,5],[[28,[37,3],[[30,0],[28,[37,6],[[30,0,["secret"]]],null]],[["value"],["target.value"]]],[28,[37,3],[[30,0],[28,[37,6],[[30,0,["value"]]],null]],[["value"],["target.value"]]],[28,[37,3],[[30,0],[30,4],"TYPING"],null]],null]],[16,4,[52,[28,[37,12],[[28,[37,16],["environment"],null],"testing"],null],"text","password"]],[4,[38,17],[[28,[37,18],[[30,0],"input"],null]],null],[12],[13],[1,"\\n                  "],[8,[30,1],null,[["@matches"],["error"]],[["default"],[[[[1,"\\n"],[41,[28,[37,15],[[30,0,["error","status"]]],null],[[[1,"                      "],[10,"strong"],[14,"role","alert"],[12],[1,"\\n                        Please enter your secret\\n                      "],[13],[1,"\\n"]],[]],null],[1,"                  "]],[]]]]],[1,"\\n                "],[13],[1,"\\n              "],[13],[1,"\\n              "],[8,[39,19],[[16,"disabled",[28,[37,4],[[30,5],"loading"],null]],[24,4,"submit"]],[["@text"],["Log in"]],null],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n\\n          "],[18,19,[[28,[37,21],[[30,7],[28,[37,2],null,[["Method"],[[30,9]]]]],null]]],[1,"\\n\\n          "],[10,"em"],[12],[1,"\\n            Contact your administrator for login credentials.\\n          "],[13],[1,"\\n        "]],[9,10,11,12,13]]]]],[1,"\\n\\n      "],[13],[1,"\\n      "],[8,[30,1],null,[["@matches"],["loading"]],[["default"],[[[[1,"\\n        "],[8,[39,22],null,[["@dc","@nspace","@partition","@type","@value","@onchange","@onerror"],[[30,15],[28,[37,23],[[30,0,["value","Namespace"]],[30,16]],null],[28,[37,23],[[30,0,["value","Partition"]],[30,17]],null],[52,[30,0,["value","Name"]],"oidc","secret"],[30,0,["value"]],[28,[37,5],[[28,[37,3],[[30,0],[30,4],"RESET"],null],[30,18]],null],[28,[37,5],[[28,[37,3],[[30,0],[28,[37,6],[[30,0,["error"]]],null]],[["value"],["error.errors.firstObject"]]],[28,[37,3],[[30,0],[30,4],"ERROR"],null]],null]]],null],[1,"\\n      "]],[]]]]],[1,"\\n"]],[7]]]],[6]]]],[1,2,3,4,5]]]]],[1,"\\n"]],["State","Guard","ChartAction","dispatch","state","chart","exported","&attrs","TabState","IgnoredGuard","IgnoredAction","tabDispatch","tabState","A","@dc","@nspace","@partition","@onsubmit","&default"],false,["state-chart","let","hash","action","state-matches","queue","mut","if","can","tab-nav","array","hds/alert","eq","concat","and","not","env","did-insert","set","hds/button","yield","assign","token-source","or"]]',moduleName:"consul-ui/components/auth-form/index.hbs",isStrictMode:!1})
-let c=(a=class extends l.default{constructor(){super(...arguments),this.chart=i.default,this.tabsChart=o.default}hasValue(e,t,n){return""!==this.value&&void 0!==this.value}focus(){this.input.focus()}},u(a.prototype,"hasValue",[r.action],Object.getOwnPropertyDescriptor(a.prototype,"hasValue"),a.prototype),u(a.prototype,"focus",[r.action],Object.getOwnPropertyDescriptor(a.prototype,"focus"),a.prototype),a)
-e.default=c,(0,t.setComponentTemplate)(s,c)})),define("consul-ui/components/auth-form/tabs.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={id:"auth-form-tabs",initial:"token",on:{TOKEN:[{target:"token"}],SSO:[{target:"sso"}]},states:{token:{},sso:{}}}})),define("consul-ui/components/auth-profile/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"FSF8r1GE",block:'[[[11,"dl"],[24,0,"auth-profile"],[17,1],[12],[1,"\\n    "],[10,"dt"],[12],[1,"\\n      "],[10,1],[12],[1,"My ACL Token"],[13],[10,"br"],[12],[13],[1,"\\n      AccessorID\\n    "],[13],[1,"\\n    "],[10,"dd"],[12],[1,"\\n      "],[1,[28,[35,0],[[30,2,["AccessorID"]],[28,[37,1],[[30,2,["AccessorID","length"]],8],null]],null]],[1,"\\n    "],[13],[1,"\\n"],[13]],["&attrs","@item"],false,["string-substring","sub"]]',moduleName:"consul-ui/components/auth-profile/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i}))
-define("consul-ui/components/basic-dropdown-content",["exports","ember-basic-dropdown/components/basic-dropdown-content"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/basic-dropdown-optional-tag",["exports","ember-basic-dropdown/components/basic-dropdown-optional-tag"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/basic-dropdown-trigger",["exports","ember-basic-dropdown/components/basic-dropdown-trigger"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/basic-dropdown",["exports","ember-basic-dropdown/components/basic-dropdown"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/block-slot",["exports","block-slots/components/block-slot"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/brand-loader/enterprise",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"DW5EhD40",block:'[[[10,"path"],[14,"data-enterprise-logo",""],[14,"d","M322.099,18.0445001 C319.225,18.0223001 316.427,18.9609001 314.148,20.7112001 L314.016,20.8179001 L313.68,18.5368001 L310.332,18.5368001 L310.332,53.0000001 L314.312,52.4338001 L314.312,42.3164001 L314.435,42.3164001 C316.705,42.7693001 319.012,43.0165001 321.327,43.0549001 C326.554,43.0549001 329.098,40.5029001 329.098,35.2432001 L329.098,25.3802001 C329.073,20.4569001 326.809,18.0445001 322.099,18.0445001 Z M264.971,11.9722001 L260.991,12.5466001 L260.991,18.5284001 L256.708,18.5284001 L256.708,21.8106001 L260.991,21.8106001 L260.991,37.6883001 L260.99344,37.9365729 C261.066744,41.6122056 262.7975,43.1124033 266.915,43.1124033 C268.591,43.1170001 270.255,42.8396001 271.839,42.2915001 L271.363,39.1817001 L270.896229,39.3066643 C269.803094,39.5806719 268.682875,39.7315001 267.555,39.7560001 C265.526625,39.7560001 265.081547,38.9674128 264.991981,37.7056542 L264.97743,37.4176027 L264.97159,37.1147428 L264.971,21.8188001 L271.494,21.8188001 L271.83,18.5366001 L264.971,18.5366001 L264.971,11.9722001 Z M283.556,18.0770001 C277.312,18.0770001 274.144,21.0884001 274.144,27.0374001 L274.144,34.3075001 C274.144,40.3140001 277.164,43.1124894 283.655,43.1124894 C286.526,43.1192001 289.38,42.6620001 292.106,41.7581001 L291.589,38.6154001 C289.116,39.3030001 286.566,39.6779001 283.999,39.7314001 C279.785843,39.7314001 278.500803,38.4772648 278.201322,35.860808 L278.165734,35.4868687 L278.141767,35.0951811 C278.138675,35.0284172 278.136019,34.9609111 278.133774,34.8926614 L278.125037,34.474229 L278.124,32.0756001 L292.582,32.0756001 L292.582,27.1031001 C292.582,21.0064001 289.636,18.0770001 283.556,18.0770001 Z M384.631,18.0768001 C378.412,18.0440001 375.22,21.0554001 375.22,27.0208001 L375.22,34.2909001 C375.22,40.2973001 378.239,43.0955988 384.73,43.0955988 C387.599,43.1033001 390.45,42.6460001 393.173,41.7415001 L392.665,38.5988001 C390.188,39.2815001 387.635,39.6509001 385.066,39.6983001 C380.852843,39.6983001 379.567803,38.4442359 379.268322,35.8278014 L379.232734,35.4538649 L379.208767,35.0621794 C379.205675,34.9954158 379.203019,34.9279099 379.200774,34.8596604 L379.192037,34.4412289 L379.191,32.0754001 L393.657,32.0754001 L393.657,27.1029001 C393.657,21.0062001 390.712,18.0768001 384.631,18.0768001 Z M364.634,18.0441001 C363.881125,18.0441001 363.18736,18.0712813 362.54969,18.1279834 L362.016783,18.1838695 C357.948857,18.6791301 356.371,20.5353768 356.371,24.4608001 L356.371522,24.7155013 L356.376145,25.2052033 L356.386527,25.669464 L356.403852,26.1092746 C356.407384,26.1805939 356.411254,26.2509357 356.415488,26.3203208 L356.445451,26.7253144 L356.485319,27.1083357 C356.756619,29.3425283 357.626845,30.4437319 360.247859,31.3753061 L360.701103,31.529163 C360.779411,31.5545991 360.85912,31.5799457 360.940253,31.6052232 L361.444353,31.7562266 L361.983836,31.9065664 L362.55989,32.0572338 L363.430663,32.2724269 L364.440153,32.5299129 L364.884369,32.6506971 L365.29049,32.7679922 L365.660213,32.8831607 L365.99523,32.9975651 C367.26815,33.4554713 367.748817,33.9277406 367.925217,34.806783 L367.963261,35.0352452 C367.974017,35.1143754 367.982943,35.1965576 367.990321,35.2820187 L368.008092,35.5484662 L368.018269,35.8359502 L368.023,36.3096001 C368.023,36.3683432 368.022674,36.4261667 368.021989,36.4830819 L368.013333,36.8137655 C368.008847,36.9204214 368.002676,37.0235359 367.994568,37.1232009 L367.964177,37.4119383 C367.774513,38.8512264 367.058626,39.4837671 364.875404,39.6510671 L364.43427,39.67773 L363.954974,39.6933243 C363.78868,39.6967387 363.615773,39.6984001 363.436,39.6984001 C361.126,39.6638001 358.83,39.3385001 356.601,38.7302001 L356.051,41.7908001 L356.619468,41.9710684 C358.900888,42.6645722 361.270923,43.0269154 363.658,43.0463001 C369.59355,43.0463001 371.402903,41.3625861 371.812159,38.0405419 L371.854011,37.6421573 C371.859965,37.574501 371.865421,37.5062155 371.870401,37.4373012 L371.894725,37.0162715 L371.908596,36.5801656 C371.911587,36.4322862 371.913,36.2818967 371.913,36.1290001 L371.914417,35.5317322 C371.901583,33.4289389 371.677,32.2649251 370.797,31.3698001 C370.053077,30.6022731 368.787947,30.0494771 366.870096,29.4840145 L366.242608,29.3047611 C366.13436,29.2747269 366.024265,29.2445914 365.912304,29.2143213 L365.218,29.0308209 L364.216102,28.7784328 L363.495981,28.593015 L363.068145,28.4733265 L362.67987,28.3551624 C361.018765,27.8247783 360.501056,27.2986662 360.340522,26.2094051 L360.310407,25.9578465 C360.306262,25.9142982 360.302526,25.8699197 360.29916,25.8246823 L360.283089,25.5427193 L360.273984,25.2387571 L360.269927,24.911412 L360.270221,24.3885398 L360.280627,24.0635689 C360.366727,22.3885604 360.966747,21.6370879 363.248047,21.4645754 L363.695778,21.4389299 L364.184625,21.426349 L364.445,21.4248001 C366.684,21.4608001 368.916,21.6859001 371.117,22.0976001 L371.396,18.8646001 L370.730951,18.7059457 C368.73071,18.2553391 366.686,18.0331201 364.634,18.0441001 Z M351.301,18.5363001 L347.321,18.5363001 L347.321,42.6112001 L351.301,42.6112001 L351.301,18.5363001 Z M307.335,18.0850001 L306.70097,18.3638937 C304.598769,19.3169298 302.610091,20.5031364 300.771,21.9005001 L300.623,22.0236001 L300.369,18.5363001 L296.931,18.5363001 L296.931,42.6112001 L300.91,42.6112001 L300.91,25.9048001 L301.641825,25.3925123 C303.604371,24.0427531 305.654445,22.8240667 307.778,21.7446001 L307.335,18.0850001 Z M344.318,18.0850001 L343.683947,18.3638937 C341.581595,19.3169298 339.592091,20.5031364 337.753,21.9005001 L337.606,22.0236001 L337.351,18.5363001 L333.946,18.5363001 L333.946,42.6112001 L337.926,42.6112001 L337.926,25.9048001 L337.967,25.9048001 L338.701162,25.3884311 C340.669963,24.0279284 342.726556,22.7996223 344.859,21.7118001 L344.318,18.0850001 Z M230.384,9.62500005 L211.109,9.62500005 L211.109,42.6112001 L230.466,42.6112001 L230.466,38.9597001 L215.146,38.9597001 L215.146,27.4720001 L229.293,27.4720001 L229.293,23.8698001 L215.146,23.8698001 L215.146,13.2600001 L230.384,13.2600001 L230.384,9.62500005 Z M248.763,18.0441001 C245.899,18.0441001 241.706,19.3323001 239.047,20.6124001 L238.924,20.6698001 L238.522,18.5282001 L235.322,18.5282001 L235.322,42.5704001 L239.302,42.5704001 L239.302,24.2885001 L239.359,24.2885001 C241.919,22.9674001 245.661,21.8268001 247.524,21.8268001 C249.165,21.8268001 249.985,22.5735001 249.985,24.1736001 L249.985,42.5868001 L253.965,42.5868001 L253.965,24.1161001 C253.932,20.0380001 252.25,18.0523001 248.763,18.0441001 Z M321.229,21.5564001 C323.526,21.5564001 325.061,22.2046001 325.061,25.3966001 L325.094,35.2760001 C325.094,38.3121001 323.887,39.6085001 321.057,39.6085001 C318.81,39.5533001 316.572,39.3035001 314.369,38.8618001 L314.287,38.8618001 L314.287,24.4694001 C316.198,22.7311001 318.649,21.7027001 321.229,21.5564001 Z M283.581,21.3264001 C287.372,21.3264001 288.758,22.8855001 288.758,26.7010001 L288.758,28.7934001 L278.149,28.7934001 L278.149,26.7010001 C278.149,22.9839001 279.79,21.3264001 283.581,21.3264001 Z M384.648,21.3262001 C388.431,21.3262001 389.834,22.8852001 389.834,26.7008001 L389.834,28.7932001 L379.224,28.7932001 L379.224,26.7008001 C379.224,22.9837001 380.865,21.3262001 384.648,21.3262001 Z M351.301,8.63220005 L347.321,8.63220005 L347.321,14.4499001 L351.301,14.4499001 L351.301,8.63220005 Z"],[14,"fill-rule","nonzero"],[12],[13],[1,"\\n\\n"]],[],false,[]]',moduleName:"consul-ui/components/brand-loader/enterprise.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/brand-loader/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"yNoyAgqg",block:'[[[10,0],[14,0,"brand-loader"],[15,5,[29,["margin-left: calc(-",[30,1],"px / 2)"]]],[12],[1,"\\n"],[10,"svg"],[15,"width",[29,[[30,1]]]],[14,"height","53"],[14,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[15,"fill",[29,[[30,2]]]],[12],[1,"\\n      "],[10,"path"],[14,"d","M32.7240001,0.866235051 C28.6239001,-0.218137949 24.3210001,-0.285465949 20.1890001,0.670096051 C16.0569001,1.62566005 12.2205001,3.57523005 9.01276015,6.34960005 C5.80499015,9.12397005 3.32280015,12.6393001 1.78161015,16.5905001 C0.240433148,20.5416001 -0.313157852,24.8092001 0.168892148,29.0228001 C0.650943148,33.2364001 2.15407015,37.2687001 4.54780015,40.7697001 C6.94153015,44.2707001 10.1535001,47.1346001 13.9050001,49.1128001 C17.6565001,51.0910001 21.8341001,52.1238001 26.0752001,52.1214409 C32.6125001,52.1281001 38.9121001,49.6698001 43.7170001,45.2370001 L37.5547001,38.7957001 C35.0952001,41.0133001 32.0454001,42.4701001 28.7748001,42.9898001 C25.5042001,43.5096001 22.1530001,43.0698001 19.1273001,41.7239001 C16.1015001,40.3779001 13.5308001,38.1835001 11.7267001,35.4064001 C9.92260015,32.6294001 8.96239015,29.3888001 8.96239015,26.0771001 C8.96239015,22.7655001 9.92260015,19.5249001 11.7267001,16.7478001 C13.5308001,13.9707001 16.1015001,11.7763001 19.1273001,10.4304001 C22.1530001,9.08444005 25.5042001,8.64470005 28.7748001,9.16441005 C32.0454001,9.68412005 35.0952001,11.1410001 37.5547001,13.3586001 L43.7170001,6.89263005 C40.5976001,4.01926005 36.8241001,1.95061005 32.7240001,0.866235051 Z M46.6320001,34.8572001 C46.2182001,34.9395001 45.8380001,35.1427001 45.5397001,35.4410001 C45.2413001,35.7394001 45.0381001,36.1195001 44.9558001,36.5334001 C44.8735001,36.9472001 44.9157001,37.3762001 45.0772001,37.7660001 C45.2387001,38.1559001 45.5121001,38.4891001 45.8630001,38.7235001 C46.2138001,38.9579001 46.6263001,39.0830001 47.0482001,39.0830001 C47.6141001,39.0830001 48.1567001,38.8583001 48.5568001,38.4582001 C48.9569001,38.0581001 49.1817001,37.5154001 49.1817001,36.9496001 C49.1817001,36.5276001 49.0565001,36.1152001 48.8221001,35.7643001 C48.5877001,35.4135001 48.2545001,35.1400001 47.8647001,34.9786001 C47.4748001,34.8171001 47.0459001,34.7748001 46.6320001,34.8572001 Z M49.0856001,27.5622001 C48.6718001,27.6446001 48.2916001,27.8477001 47.9933001,28.1461001 C47.6949001,28.4445001 47.4917001,28.8246001 47.4094001,29.2385001 C47.3271001,29.6523001 47.3693001,30.0813001 47.5308001,30.4711001 C47.6923001,30.8609001 47.9657001,31.1941001 48.3166001,31.4286001 C48.6674001,31.6630001 49.0799001,31.7881001 49.5018001,31.7881001 C50.0670001,31.7859001 50.6084001,31.5605001 51.0080001,31.1609001 C51.4076001,30.7612001 51.6331001,30.2198001 51.6353001,29.6547001 C51.6353001,29.2327001 51.5102001,28.8202001 51.2757001,28.4694001 C51.0413001,28.1186001 50.7081001,27.8451001 50.3183001,27.6836001 C49.9284001,27.5222001 49.4995001,27.4799001 49.0856001,27.5622001 Z M28.0728001,20.8457001 C27.0412001,20.4185001 25.9061001,20.3067001 24.8110001,20.5245001 C23.7159001,20.7423001 22.7100001,21.2800001 21.9205001,22.0695001 C21.1309001,22.8590001 20.5933001,23.8650001 20.3754001,24.9600001 C20.1576001,26.0551001 20.2694001,27.1902001 20.6967001,28.2218001 C21.1240001,29.2534001 21.8476001,30.1351001 22.7760001,30.7554001 C23.7043001,31.3757001 24.7958001,31.7068001 25.9124001,31.7068001 C27.4096001,31.7068001 28.8455001,31.1120001 29.9043001,30.0533001 C30.9630001,28.9946001 31.5578001,27.5587001 31.5578001,26.0614001 C31.5578001,24.9449001 31.2267001,23.8534001 30.6063001,22.9250001 C29.9860001,21.9966001 29.1043001,21.2730001 28.0728001,20.8457001 Z M43.9670001,27.4378001 C43.5772001,27.2763001 43.1482001,27.2341001 42.7344001,27.3164001 C42.3205001,27.3987001 41.9404001,27.6019001 41.6420001,27.9003001 C41.3437001,28.1986001 41.1405001,28.5788001 41.0581001,28.9926001 C40.9758001,29.4065001 41.0181001,29.8354001 41.1796001,30.2253001 C41.3410001,30.6151001 41.6145001,30.9483001 41.9653001,31.1827001 C42.3162001,31.4171001 42.7286001,31.5423001 43.1506001,31.5423001 C43.7164001,31.5423001 44.2591001,31.3175001 44.6592001,30.9174001 C45.0592001,30.5173001 45.2840001,29.9747001 45.2840001,29.4088001 C45.2840001,28.9869001 45.1589001,28.5744001 44.9245001,28.2236001 C44.6901001,27.8727001 44.3568001,27.5993001 43.9670001,27.4378001 Z M43.9670001,20.7503001 C43.5772001,20.5888001 43.1482001,20.5466001 42.7344001,20.6289001 C42.3205001,20.7112001 41.9404001,20.9144001 41.6420001,21.2128001 C41.3437001,21.5111001 41.1405001,21.8913001 41.0581001,22.3051001 C40.9758001,22.7190001 41.0181001,23.1479001 41.1796001,23.5378001 C41.3410001,23.9276001 41.6145001,24.2608001 41.9653001,24.4952001 C42.3162001,24.7296001 42.7286001,24.8548001 43.1506001,24.8548001 C43.7164001,24.8548001 44.2591001,24.6300001 44.6592001,24.2299001 C45.0592001,23.8298001 45.2840001,23.2871001 45.2840001,22.7213001 C45.2840001,22.2994001 45.1589001,21.8869001 44.9245001,21.5360001 C44.6901001,21.1852001 44.3568001,20.9118001 43.9670001,20.7503001 Z M49.0856001,20.3825001 C48.6718001,20.4649001 48.2916001,20.6681001 47.9933001,20.9664001 C47.6949001,21.2648001 47.4917001,21.6449001 47.4094001,22.0588001 C47.3271001,22.4726001 47.3693001,22.9016001 47.5308001,23.2914001 C47.6923001,23.6813001 47.9657001,24.0144001 48.3166001,24.2489001 C48.6674001,24.4833001 49.0799001,24.6084001 49.5018001,24.6084001 C50.0670001,24.6063001 50.6084001,24.3808001 51.0080001,23.9812001 C51.4076001,23.5815001 51.6331001,23.0401001 51.6353001,22.4750001 C51.6353001,22.0530001 51.5102001,21.6406001 51.2757001,21.2897001 C51.0413001,20.9389001 50.7081001,20.6654001 50.3183001,20.5040001 C49.9284001,20.3425001 49.4995001,20.3002001 49.0856001,20.3825001 Z M46.7554001,13.2026001 C46.3416001,13.2849001 45.9614001,13.4881001 45.6630001,13.7865001 C45.3647001,14.0849001 45.1615001,14.4650001 45.0792001,14.8788001 C44.9969001,15.2927001 45.0391001,15.7217001 45.2006001,16.1115001 C45.3621001,16.5013001 45.6355001,16.8345001 45.9863001,17.0689001 C46.3372001,17.3034001 46.7497001,17.4285001 47.1716001,17.4285001 C47.7374001,17.4285001 48.2801001,17.2037001 48.6802001,16.8036001 C49.0803001,16.4035001 49.3050001,15.8609001 49.3050001,15.2951001 C49.3050001,14.8731001 49.1799001,14.4606001 48.9455001,14.1098001 C48.7111001,13.7589001 48.3779001,13.4855001 47.9880001,13.3240001 C47.5982001,13.1625001 47.1692001,13.1203001 46.7554001,13.2026001 Z"],[14,"fill-rule","nonzero"],[12],[13],[1,"\\n      "],[10,"path"],[14,"d","M83.5385001,9.02612084 C75.3002001,9.02612084 71.7718001,12.5545001 71.7718001,18.6102001 L71.7718001,33.5278001 L71.7744126,33.809806 C71.8842215,39.6928981 75.4612111,43.1118103 83.5385001,43.1118103 C86.5802001,43.1131001 89.6109001,42.7466001 92.5646001,42.0205001 L91.8671001,36.6049001 L90.9760579,36.7631811 C88.5964705,37.1629803 86.1899224,37.3844223 83.7765001,37.4254001 C79.4194001,37.4254001 78.0326001,35.9320001 78.0326001,32.4118001 L78.0326001,19.7261001 L78.0346281,19.4988781 C78.0956946,16.133828 79.5462067,14.7125001 83.7765001,14.7125001 C86.4916001,14.7587001 89.1980001,15.0332001 91.8671001,15.5331001 L92.5646001,10.1175001 L91.8246092,9.94345672 C89.1057071,9.33281156 86.3267251,9.02500229 83.5385001,9.02612084 Z M172.149,18.4131001 L166.094,18.4131001 L166.09588,36.2248122 C166.154955,40.3975255 167.61375,43.1117001 171.55,43.1117001 C174.919,42.9517001 178.218,42.0880001 181.233,40.5762001 L181.832,42.6112001 L186.443,42.6112001 L186.443,18.4131001 L180.388,18.4131001 L180.388,35.1934001 C178.188,36.3339001 175.481,37.2283001 174.086,37.2283001 C172.691,37.2283001 172.149,36.5801001 172.149,35.2918001 L172.149,18.4131001 Z M105.939,17.9127001 C98.2719471,17.9127001 95.7845671,21.8519543 95.4516942,26.3358062 L95.4257941,26.7784774 C95.4225999,26.8525088 95.4199581,26.9266566 95.4178553,27.0009059 L95.4116001,27.4475001 L95.4116001,33.5853001 L95.4178331,34.0318054 C95.5519456,38.7818866 97.886685,43.0872001 105.931,43.0872001 C113.716697,43.0872001 116.15821,39.0467642 116.432186,34.4757046 L116.45204,34.0318054 C116.456473,33.8833653 116.458758,33.734491 116.459,33.5853001 L116.459,27.4475001 L116.457455,27.2221358 C116.453317,26.9220505 116.440796,26.6236441 116.419035,26.3278463 L116.379357,25.8862225 C115.91894,21.5651129 113.355121,17.9127001 105.939,17.9127001 Z M154.345,17.8876515 C147.453,17.8876515 145.319,20.0214001 145.319,24.8873001 L145.319694,25.1343997 L145.325703,25.6107983 L145.338905,26.064173 C145.341773,26.1378641 145.344992,26.2106314 145.348588,26.2824927 L145.374889,26.7029295 C145.380095,26.7712375 145.385729,26.838675 145.391816,26.9052596 L145.433992,27.2946761 C145.714183,29.5082333 146.613236,30.7206123 149.232713,31.693068 L149.698825,31.8575665 C150.021076,31.9658547 150.36662,32.0715774 150.737101,32.1758709 L151.311731,32.3313812 C151.509646,32.3829554 151.714,32.4343143 151.925,32.4856001 L152.205551,32.5543061 L152.728976,32.6899356 L153.204098,32.8237311 L153.633238,32.9563441 C155.53221,33.5734587 156.004908,34.1732248 156.112605,35.0535762 L156.130482,35.2466262 L156.139507,35.448917 L156.142,35.6611001 L156.137247,35.9859786 L156.121298,36.2838969 C156.024263,37.5177444 155.540462,38.0172149 153.741624,38.1073495 L153.302742,38.1210314 L153.065,38.1227001 C150.631,38.0987001 148.21,37.7482001 145.869,37.0807001 L145.049,41.6922001 L145.672496,41.887484 C148.174444,42.639635 150.769923,43.0436231 153.385,43.0871001 C159.627887,43.0871001 161.583469,40.9824692 162.030289,37.4548504 L162.074576,37.049455 C162.087289,36.9123213 162.098004,36.7731979 162.106868,36.6321214 L162.128062,36.2030694 L162.139051,35.7625187 L162.141,35.5380001 C162.141,35.4566181 162.140828,35.3763299 162.14046,35.2971136 L162.131203,34.6125174 L162.117224,34.1865271 L162.095649,33.7836378 L162.065324,33.4027996 L162.025093,33.0429627 L161.973799,32.7030773 C161.659145,30.8866498 160.790109,29.9278873 158.501441,29.0408119 L158.069484,28.8801405 L157.605084,28.7199991 C157.524916,28.6932947 157.443348,28.6665687 157.360357,28.6397991 L156.845127,28.4784845 L156.294565,28.3150754 L155.707516,28.148522 L155.082823,27.9777746 L154.035614,27.7021396 L153.423677,27.5325226 L153.071612,27.4262327 C153.016479,27.4088193 152.963082,27.3915263 152.911366,27.3743086 L152.620815,27.2715428 C151.671458,26.912485 151.415595,26.5466416 151.348761,25.7543883 L151.334373,25.5160648 L151.327658,25.2523603 L151.327351,24.8244501 C151.355827,23.4390475 151.851313,22.8769001 154.403,22.8769001 C156.636,22.9360001 158.861,23.1692001 161.057,23.5744001 L161.591,18.7085001 L160.876597,18.5511522 C158.72872,18.1040608 156.5401,17.8816774 154.345,17.8876515 Z M197.71,7.71350005 L191.654,8.53405005 L191.654,42.6116001 L197.71,42.6116001 L197.71,7.71350005 Z M135.455,17.9211001 C132.086,18.0823001 128.788,18.9459001 125.772,20.4566001 L125.189,18.4135001 L120.57,18.4135001 L120.57,42.6115001 L126.625,42.6115001 L126.625,25.8066001 C128.833,24.6661001 131.549,23.7717001 132.936,23.7717001 C134.322,23.7717001 134.872,24.4199001 134.872,25.7082001 L134.872,42.6115001 L140.919,42.6115001 L140.919,25.0681001 C140.919,20.7520001 139.475,17.9211001 135.455,17.9211001 Z M105.931,23.0740001 C109.156,23.0740001 110.395,24.5592001 110.395,27.2506001 L110.395,33.7494001 L110.392134,33.9740961 C110.325067,36.5604698 109.074195,37.9178001 105.931,37.9178001 C102.698,37.9178001 101.459,36.4818001 101.459,33.7494001 L101.459,27.2506001 L101.461884,27.0258853 C101.529372,24.4390811 102.787806,23.0740001 105.931,23.0740001 Z"],[14,"fill-rule","nonzero"],[12],[13],[1,"\\n      "],[1,[30,3]],[1,"\\n      "],[18,4,null],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n\\n"]],["@width","@color","@subtitle","&default"],false,["yield"]]',moduleName:"consul-ui/components/brand-loader/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/child-selector/index",["exports","@ember/component","@ember/template-factory","@ember/object","@ember/object/computed","@ember/service","ember-concurrency","block-slots"],(function(e,t,n,l,r,i,o,a){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=(0,n.createTemplateFactory)({id:"rQwZ80hm",block:'[[[11,0],[16,0,[29,["child-selector ",[36,0],"-child-selector"]]],[17,1],[12],[1,"\\n"],[18,4,null],[1,"\\n"],[41,[28,[37,3],[[33,4]],null],[[[1,"  "],[8,[39,5],null,[["@name"],["create"]],[["default"],[[[[18,4,null]],[]]]]],[1,"\\n  "],[10,"label"],[14,0,"type-text"],[12],[1,"\\n    "],[10,1],[12],[8,[39,5],null,[["@name"],["label"]],[["default"],[[[[18,4,null]],[]]]]],[13],[1,"\\n"],[41,[33,6],[[[1,"      "],[8,[39,7],null,[["@src","@onchange"],[[28,[37,8],["/${partition}/${nspace}/${dc}/${type}",[28,[37,9],null,[["partition","nspace","dc","type"],[[33,10],[33,11],[33,12],[28,[37,13],[[33,0]],null]]]]],null],[28,[37,14],[[30,0],[28,[37,15],[[33,16]],null]],[["value"],["data"]]]]],null],[1,"\\n"]],[]],null],[1,"    "],[8,[39,17],null,[["@type","@sort","@filters","@items"],[[99,0,["@type"]],"Name:asc",[28,[37,9],null,[["searchproperties"],[[28,[37,18],["Name"],null]]]],[99,19,["@items"]]]],[["default"],[[[[1,"\\n      "],[8,[39,20],null,[["@searchEnabled","@search","@options","@loadingMessage","@searchMessage","@searchPlaceholder","@onOpen","@onClose","@onChange"],[true,[28,[37,14],[[30,0],[30,2,["search"]]],null],[28,[37,21],["Name:asc",[33,19]],null],"Loading...","No possible options",[99,22,["@searchPlaceholder"]],[28,[37,14],[[30,0],[28,[37,15],[[33,6]],null],true],null],[28,[37,14],[[30,0],[28,[37,15],[[33,6]],null],false],null],[28,[37,14],[[30,0],"change","items[]",[33,23]],null]]],[["default"],[[[[1,"\\n        "],[8,[39,5],null,[["@name","@params"],["option",[28,[37,24],[[30,3]],null]]],[["default"],[[[[18,4,null]],[]]]]],[1,"\\n      "]],[3]]]]],[1,"\\n    "]],[2]]]]],[1,"\\n  "],[13],[1,"\\n"]],[]],null],[41,[28,[37,25],[[33,23,["length"]],0],null],[[[1,"  "],[8,[39,5],null,[["@name"],["set"]],[["default"],[[[[18,4,null]],[]]]]],[1,"\\n"]],[]],[[[1,"\\n"]],[]]],[13]],["&attrs","collection","item","&default"],false,["type","yield","if","not","disabled","yield-slot","isOpen","data-source","uri","hash","partition","nspace","dc","pluralize","action","mut","allOptions","data-collection","array","options","power-select","sort-by","placeholder","items","block-params","gt"]]',moduleName:"consul-ui/components/child-selector/index.hbs",isStrictMode:!1})
-var s=(0,t.setComponentTemplate)(u,t.default.extend(a.default,{onchange:function(){},tagName:"",error:function(){},type:"",dom:(0,i.inject)("dom"),formContainer:(0,i.inject)("form"),item:(0,r.alias)("form.data"),selectedOptions:(0,r.alias)("items"),init:function(){this._super(...arguments),this._listeners=this.dom.listeners(),(0,l.set)(this,"form",this.formContainer.form(this.type)),this.form.clear({Datacenter:this.dc,Namespace:this.nspace})},willDestroyElement:function(){this._super(...arguments),this._listeners.remove()},options:(0,l.computed)("selectedOptions.[]","allOptions.[]",(function(){let e=this.allOptions||[]
-const t=this.selectedOptions||[]
-return(0,l.get)(t,"length")>0&&(e=e.filter((e=>!t.findBy("ID",(0,l.get)(e,"ID"))))),e})),save:(0,o.task)((function*(e,t){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:function(){}
-const l=this.repo
-try{e=yield l.persist(e),this.actions.change.apply(this,[{target:{name:"items[]",value:t}},t,e]),n()}catch(r){this.error({error:r})}})),actions:{reset:function(){this.form.clear({Datacenter:this.dc,Namespace:this.nspace,Partition:this.partition})},remove:function(e,t){const n=this.repo.getSlugKey(),r=(0,l.get)(e,n),i=t.findIndex((function(e){return(0,l.get)(e,n)===r}))
-if(-1!==i)return t.removeAt(i,1)
-this.onchange({target:this})},change:function(e,t,n){const r=this.dom.normalizeEvent(...arguments),i=t
-if("items[]"===r.target.name)(0,l.set)(n,"CreateTime",(new Date).getTime()),i.pushObject(n),this.onchange({target:this})}}}))
-e.default=s})),define("consul-ui/components/code-editor/index",["exports","@ember/component","@ember/template-factory","@ember/object","@ember/service"],(function(e,t,n,l,r){function i(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function o(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?i(Object(n),!0).forEach((function(t){a(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):i(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=(0,n.createTemplateFactory)({id:"ifqMCiDm",block:'[[[10,0],[14,0,"toolbar-container"],[12],[1,"\\n  "],[10,0],[14,0,"toolbar"],[12],[1,"\\n    "],[10,"label"],[14,0,"title"],[12],[1,"\\n"],[41,[48,[30,2]],[[[1,"        "],[18,2,null],[1,"\\n"]],[]],null],[1,"    "],[13],[1,"\\n    "],[10,0],[14,0,"tools"],[12],[1,"\\n"],[41,[48,[30,3]],[[[1,"        "],[18,3,null],[1,"\\n"]],[]],[[[41,[28,[37,3],[[28,[37,4],[[33,5]],null],[28,[37,4],[[33,6]],null]],null],[[[1,"          "],[8,[39,7],null,[["@onChange","@selected","@searchEnabled","@options"],[[28,[37,8],[[30,0],"change"],null],[99,9,["@selected"]],false,[99,10,["@options"]]]],[["default"],[[[[1,"\\n            "],[1,[30,1,["name"]]],[1,"\\n          "]],[1]]]]],[1,"\\n          "],[10,0],[14,0,"toolbar-separator"],[12],[13],[1,"\\n          "],[8,[39,11],null,[["@value","@name"],[[99,12,["@value"]],"value"]],null],[1,"\\n"]],[]],null]],[]]],[1,"    "],[13],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n"],[8,[39,13],null,[["@value","@name","@class","@options","@valueUpdated"],[[99,12,["@value"]],[99,14,["@name"]],[99,15,["@class"]],[99,16,["@options"]],[28,[37,8],[[30,0],[33,17]],null]]],null],[1,"\\n"],[10,"pre"],[12],[10,"code"],[12],[41,[48,[30,4]],[[[18,4,null]],[]],[[[1,[34,12]]],[]]],[13],[13],[1,"\\n"]],["mode","&label","&tools","&content"],false,["if","has-block","yield","and","not","readonly","syntax","power-select","action","mode","modes","copy-button","value","ivy-codemirror","name","class","options","onkeyup"]]',moduleName:"consul-ui/components/code-editor/index.hbs",isStrictMode:!1}),s={tabSize:2,lineNumbers:!0,theme:"hashi",showCursorWhenSelecting:!0,gutters:["CodeMirror-lint-markers"],lint:!0}
-var c=(0,t.setComponentTemplate)(u,t.default.extend({settings:(0,r.inject)("settings"),dom:(0,r.inject)("dom"),helper:(0,r.inject)("code-mirror/linter"),classNames:["code-editor"],readonly:!1,syntax:"",onkeyup:function(){},oninput:function(){},init:function(){this._super(...arguments),(0,l.set)(this,"modes",this.helper.modes())},didReceiveAttrs:function(){this._super(...arguments)
-const e=this.editor
-e&&e.setOption("readOnly",this.readonly)},setMode:function(e){let t=o(o({},s),{},{mode:e.mime,readOnly:this.readonly})
-"XML"===e.name&&(t.htmlMode=e.htmlMode,t.matchClosing=e.matchClosing,t.alignCDATA=e.alignCDATA),(0,l.set)(this,"options",t)
-const n=this.editor
-n.setOption("mode",e.mime),this.helper.lint(n,e.mode),(0,l.set)(this,"mode",e)},willDestroyElement:function(){this._super(...arguments),this.observer&&this.observer.disconnect()},didInsertElement:function(){this._super(...arguments)
-const e=this.dom.element("textarea ~ pre code",this.element)
-e.firstChild&&(this.observer=new MutationObserver((e=>{let[t]=e
-this.oninput((0,l.set)(this,"value",t.target.wholeText))})),this.observer.observe(e,{attributes:!1,subtree:!0,childList:!1,characterData:!0}),(0,l.set)(this,"value",e.firstChild.wholeText)),(0,l.set)(this,"editor",this.helper.getEditor(this.element)),this.settings.findBySlug("code-editor").then((e=>{const t=this.modes,n=this.syntax
-n&&(e=t.find((function(e){return e.name.toLowerCase()==n.toLowerCase()}))),e=e||t[0],this.setMode(e)}))},didAppear:function(){this.editor.refresh()},actions:{change:function(e){this.settings.persist({"code-editor":e}),this.setMode(e)}}}))
-e.default=c})),define("consul-ui/components/confirmation-alert/index",["exports","@ember/component","@ember/template-factory"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,n.createTemplateFactory)({id:"fpR2WXW3",block:'[[[18,5,null],[1,"\\n"],[8,[39,1],[[24,0,"confirmation-alert warning"],[17,1]],null,[["header","body","actions"],[[[[1,"\\n    "],[8,[39,2],null,[["@name"],["header"]],[["default"],[[[[18,5,null]],[]]]]],[1,"\\n  "]],[]],[[[1,"\\n    "],[8,[39,2],null,[["@name"],["body"]],[["default"],[[[[18,5,null]],[]]]]],[1,"\\n  "]],[]],[[[1,"\\n    "],[8,[30,2,["Action"]],[[24,0,"dangerous"]],null,[["default"],[[[[1,"\\n      "],[8,[39,2],null,[["@name","@params"],["confirm",[28,[37,3],[[50,"action",0,null,[["onclick","tabindex"],[[28,[37,5],[[30,0],[30,3]],null],"-1"]]]],null]]],[["default"],[[[[1,"\\n        "],[18,5,null],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[30,2,["Action"]],null,null,[["default"],[[[[1,"\\n      "],[8,[39,5],null,[["@for"],[[30,4]]],[["default"],[[[[1,"\\n        Cancel\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[2]]]]]],["&attrs","Actions","@onclick","@name","&default"],false,["yield","informed-action","yield-slot","block-params","component","action"]]',moduleName:"consul-ui/components/confirmation-alert/index.hbs",isStrictMode:!1})
-var r=(0,t.setComponentTemplate)(l,t.default.extend({tagName:""}))
-e.default=r})),define("consul-ui/components/confirmation-dialog/index",["exports","@ember/component","@ember/template-factory","block-slots","@ember/object"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,n.createTemplateFactory)({id:"JwnN2l0u",block:'[[[11,0],[16,0,[28,[37,0],["with-confirmation",[52,[33,2]," confirming",""]],null]],[17,1],[12],[1,"\\n"],[18,2,null],[1,"\\n"],[8,[39,4],null,[["@name","@params"],["action",[28,[37,5],[[28,[37,6],[[30,0],"confirm"],null],[28,[37,6],[[30,0],"cancel"],null]],null]]],[["default"],[[[[1,"\\n"],[41,[28,[37,7],[[33,8],[28,[37,9],[[33,2]],null]],null],[[[1,"    "],[18,2,null],[1,"\\n"]],[]],null]],[]]]]],[1,"\\n"],[8,[39,4],null,[["@name","@params"],["dialog",[28,[37,5],[[28,[37,6],[[30,0],"execute"],null],[28,[37,6],[[30,0],"cancel"],null],[33,10],[33,11]],null]]],[["default"],[[[[1,"\\n"],[41,[33,2],[[[1,"    "],[18,2,null],[1,"\\n"]],[]],null]],[]]]]],[1,"\\n"],[13]],["&attrs","&default"],false,["concat","if","confirming","yield","yield-slot","block-params","action","or","permanent","not","message","actionName"]]',moduleName:"consul-ui/components/confirmation-dialog/index.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,t.default.extend(l.default,{tagName:"",message:"Are you sure?",confirming:!1,permanent:!1,actions:{cancel:function(){(0,r.set)(this,"confirming",!1)},execute:function(){(0,r.set)(this,"confirming",!1),this.sendAction("actionName",...this.arguments)},confirm:function(){const[e,...t]=arguments;(0,r.set)(this,"actionName",e),(0,r.set)(this,"arguments",t),(0,r.set)(this,"confirming",!0)}}}))
-e.default=o})),define("consul-ui/components/consul/acl/disabled/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"jFDvZrXB",block:'[[[8,[39,0],null,null,[["default"],[[[[1,"\\n  "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n    "],[10,"h1"],[12],[1,"\\n      Tokens\\n    "],[13],[1,"\\n  "]],[]]]]],[1,"\\n  "],[8,[39,1],null,[["@name"],["content"]],[["default"],[[[[1,"\\n    "],[8,[39,2],null,null,[["default"],[[[[1,"\\n      "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"h2"],[12],[1,"Welcome to ACLs"],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,1],null,[["@name"],["body"]],[["default"],[[[[1,"\\n        "],[10,2],[12],[1,"\\n          ACLs are not enabled in this Consul cluster. We strongly encourage the use of ACLs in production environments for the best security practices.\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,1],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n        "],[10,"li"],[12],[1,"\\n          "],[8,[39,3],null,[["@text","@href","@icon","@iconPosition","@size"],["Read the documentation",[29,[[28,[37,4],["CONSUL_DOCS_URL"],null],"/acl/index.html"]],"docs-link","trailing","small"]],null],[1,"\\n        "],[13],[1,"\\n        "],[10,"li"],[12],[1,"\\n          "],[8,[39,3],null,[["@text","@href","@icon","@iconPosition","@size"],["Follow the guide",[29,[[28,[37,4],["CONSUL_DOCS_LEARN_URL"],null],"/consul/security-networking/production-acls"]],"learn-link","trailing","small"]],null],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[]]]]],[1,"\\n\\n"]],[],false,["app-view","block-slot","empty-state","hds/link/standalone","env"]]',moduleName:"consul-ui/components/consul/acl/disabled/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/acl/selector/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"uDHL3FS4",block:'[[[10,"li"],[14,0,"acls-separator"],[14,"role","separator"],[12],[1,"\\n  Access Controls\\n"],[41,[28,[37,1],[[28,[37,2],["use acls"],null]],null],[[[1,"  "],[11,1],[4,[38,3],["ACLs are not currently enabled in this cluster"],null],[12],[13],[1,"\\n"]],[]],null],[13],[1,"\\n"],[10,"li"],[15,0,[52,[28,[37,4],["dc.acls.tokens",[30,1,["Name"]]],null],"is-active"]],[12],[1,"\\n    "],[10,3],[15,6,[28,[37,5],["dc.acls.tokens",[30,1,["Name"]]],null]],[12],[1,"\\n      Tokens\\n    "],[13],[1,"\\n"],[13],[1,"\\n"],[41,[28,[37,2],["read acls"],null],[[[10,"li"],[15,0,[52,[28,[37,4],["dc.acls.policies",[30,1,["Name"]]],null],"is-active"]],[12],[1,"\\n    "],[10,3],[15,6,[28,[37,5],["dc.acls.policies",[30,1,["Name"]]],null]],[12],[1,"\\n      Policies\\n    "],[13],[1,"\\n"],[13],[1,"\\n"],[10,"li"],[15,0,[52,[28,[37,4],["dc.acls.roles",[30,1,["Name"]]],null],"is-active"]],[12],[1,"\\n    "],[10,3],[15,6,[28,[37,5],["dc.acls.roles",[30,1,["Name"]]],null]],[12],[1,"\\n      Roles\\n    "],[13],[1,"\\n"],[13],[1,"\\n"],[10,"li"],[15,0,[52,[28,[37,4],["dc.acls.auth-methods",[30,1,["Name"]]],null],"is-active"]],[12],[1,"\\n    "],[10,3],[15,6,[28,[37,5],["dc.acls.auth-methods",[30,1,["Name"]]],null]],[12],[1,"\\n      Auth Methods\\n    "],[13],[1,"\\n"],[13],[1,"\\n"]],[]],[[[41,[28,[37,1],[[28,[37,2],["use acls"],null]],null],[[[10,"li"],[15,0,[52,[28,[37,4],["dc.acls.policies",[30,1,["Name"]]],null],"is-active"]],[12],[1,"\\n    "],[10,1],[12],[1,"\\n      Policies\\n    "],[13],[1,"\\n"],[13],[1,"\\n"],[10,"li"],[15,0,[52,[28,[37,4],["dc.acls.roles",[30,1,["Name"]]],null],"is-active"]],[12],[1,"\\n    "],[10,1],[12],[1,"\\n      Roles\\n    "],[13],[1,"\\n"],[13],[1,"\\n"],[10,"li"],[15,0,[52,[28,[37,4],["dc.acls.auth-methods",[30,1,["Name"]]],null],"is-active"]],[12],[1,"\\n    "],[10,1],[12],[1,"\\n      Auth Methods\\n    "],[13],[1,"\\n"],[13],[1,"\\n"]],[]],null]],[]]],[1,"\\n"]],["@dc"],false,["if","not","can","tooltip","is-href","href-to"]]',moduleName:"consul-ui/components/consul/acl/selector/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/auth-method/binding-list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"tIxrxpUS",block:'[[[10,0],[14,0,"consul-auth-method-binding-list"],[12],[1,"\\n  "],[10,"h2"],[12],[1,[30,1,["BindName"]]],[13],[1,"\\n  "],[10,"dl"],[12],[1,"\\n    "],[10,"dt"],[14,0,"type"],[12],[1,[28,[35,0],["models.binding-rule.BindType"],null]],[13],[1,"\\n    "],[10,"dd"],[12],[1,"\\n      "],[1,[30,1,["BindType"]]],[1,"\\n      "],[10,1],[12],[1,"\\n"],[41,[28,[37,2],[[30,1,["BindType"]],"service"],null],[[[1,"        "],[8,[39,3],null,null,[["default"],[[[[1,"\\n          "],[1,[28,[35,0],["components.consul.auth-method.binding-list.bind-type.service"],null]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],[[[41,[28,[37,2],[[30,1,["BindType"]],"node"],null],[[[1,"        "],[8,[39,3],null,null,[["default"],[[[[1,"\\n          "],[1,[28,[35,0],["components.consul.auth-method.binding-list.bind-type.node"],null]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],[[[41,[28,[37,2],[[30,1,["BindType"]],"role"],null],[[[1,"        "],[8,[39,3],null,null,[["default"],[[[[1,"\\n           "],[1,[28,[35,0],["components.consul.auth-method.binding-list.bind-type.role"],null]],[1,"\\n        "]],[]]]]],[1,"\\n        "]],[]],null]],[]]]],[]]],[1,"      "],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,"dt"],[12],[1,[28,[35,0],["models.binding-rule.Selector"],null]],[13],[1,"\\n    "],[10,"dd"],[12],[10,"code"],[12],[1,[30,1,["Selector"]]],[13],[13],[1,"\\n    "],[10,"dt"],[12],[1,[28,[35,0],["models.binding-rule.Description"],null]],[13],[1,"\\n    "],[10,"dd"],[12],[1,[30,1,["Description"]]],[13],[1,"\\n  "],[13],[1,"\\n"],[13]],["@item"],false,["t","if","eq","tooltip"]]',moduleName:"consul-ui/components/consul/auth-method/binding-list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/auth-method/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"klEqVgSZ",block:'[[[8,[39,0],[[24,0,"consul-auth-method-list"]],[["@items"],[[30,1]]],[["default"],[[[[1,"\\n  "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n"],[41,[28,[37,3],[[30,2,["DisplayName"]],""],null],[[[1,"    "],[10,3],[15,6,[28,[37,4],["dc.acls.auth-methods.show",[30,2,["Name"]]],null]],[12],[1,"\\n      "],[1,[30,2,["DisplayName"]]],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[1,"    "],[10,3],[15,6,[28,[37,4],["dc.acls.auth-methods.show",[30,2,["Name"]]],null]],[12],[1,"\\n      "],[1,[30,2,["Name"]]],[1,"\\n    "],[13],[1,"\\n"]],[]]],[1,"  "]],[]]]]],[1,"\\n  "],[8,[39,1],null,[["@name"],["details"]],[["default"],[[[[1,"\\n    "],[8,[39,5],null,[["@item"],[[30,2]]],null],[1,"\\n"],[41,[28,[37,3],[[30,2,["DisplayName"]],""],null],[[[1,"    "],[10,1],[12],[1,[30,2,["Name"]]],[13],[1,"\\n"]],[]],null],[41,[28,[37,6],[[30,2,["TokenLocality"]],"global"],null],[[[1,"    "],[10,1],[14,0,"locality"],[12],[1,"creates global tokens"],[13],[1,"\\n"]],[]],null],[41,[30,2,["MaxTokenTTL"]],[[[1,"    "],[10,"dl"],[14,0,"ttl"],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        "],[8,[39,7],null,null,[["default"],[[[[1,"\\n          Maximum Time to Live: the maximum life of any token created by this auth method\\n        "]],[]]]]],[1,"\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,[30,2,["MaxTokenTTL"]]],[13],[1,"\\n    "],[13],[1,"\\n"]],[]],null],[1,"  "]],[]]]]],[1,"\\n"]],[2]]]]],[1,"\\n"]],["@items","item"],false,["list-collection","block-slot","if","not-eq","href-to","consul/auth-method/type","eq","tooltip"]]',moduleName:"consul-ui/components/consul/auth-method/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/auth-method/nspace-list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"IaUtLqXB",block:'[[[10,0],[14,0,"consul-auth-method-nspace-list"],[12],[1,"\\n  "],[10,"table"],[12],[1,"\\n    "],[10,"thead"],[12],[1,"\\n      "],[10,"tr"],[12],[1,"\\n        "],[10,"td"],[12],[1,[28,[35,0],["models.auth-method.Selector"],null]],[13],[1,"\\n        "],[10,"td"],[12],[1,[28,[35,0],["models.auth-method.BindNamespace"],null]],[13],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,"tbody"],[12],[1,"\\n"],[42,[28,[37,2],[[28,[37,2],[[30,1]],null]],null],null,[[[1,"      "],[10,"tr"],[12],[1,"\\n        "],[10,"td"],[12],[1,[30,2,["Selector"]]],[13],[1,"\\n        "],[10,"td"],[12],[1,[30,2,["BindNamespace"]]],[13],[1,"\\n      "],[13],[1,"\\n"]],[2]],null],[1,"    "],[13],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n\\n"]],["@items","item"],false,["t","each","-track-array"]]',moduleName:"consul-ui/components/consul/auth-method/nspace-list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/auth-method/search-bar/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"TX/eSrxH",block:'[[[8,[39,0],[[24,0,"consul-auth-method-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","filter","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.auth-method.search-bar.",[30,3,["status","key"]],".name"],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.auth-method.search-bar.",[30,3,["status","key"]],".options.",[30,3,["status","value"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null],[28,[37,3],["common.brand.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n  "]],[3]],[[[1,"\\n    "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,5],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n      "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Optgroup"]],[30,9,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"              "],[8,[30,11],null,[["@value","@selected"],[[30,12],[28,[37,9],[[30,12],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,10],[[30,12]],null]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[12]],null]],[10,11]]],[1,"        "]],[]]]]],[1,"\\n      "]],[9]]]]],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[6]],[[[1,"\\n    "],[8,[30,13,["Select"]],[[24,0,"type-kind"]],[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["kind","change"]]],null],true]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n        "],[10,1],[12],[1,"\\n          "],[1,[28,[35,2],["components.consul.auth-method.search-bar.kind.name"],null]],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,14,["Optgroup"]],[30,14,["Option"]]],[[[1,"          "],[8,[30,16],null,[["@value","@selected"],["kubernetes",[28,[37,9],["kubernetes",[30,2,["kind","value"]]],null]]],[["default"],[[[[1,"\\n            "],[8,[39,11],[[24,0,"mr-2.5"]],[["@name"],["kubernetes-color"]],null],[1,"\\n            Kubernetes\\n          "]],[]]]]],[1,"\\n          "],[8,[30,16],[[24,0,"jwt"]],[["@value","@selected"],["jwt",[28,[37,9],["jwt",[30,2,["kind","value"]]],null]]],[["default"],[[[[1,"JWT"]],[]]]]],[1,"\\n"],[41,[28,[37,13],["CONSUL_SSO_ENABLED"],null],[[[1,"            "],[8,[30,16],[[24,0,"oidc"]],[["@value","@selected"],["oidc",[28,[37,9],["oidc",[30,2,["kind","value"]]],null]]],[["default"],[[[[1,"OIDC"]],[]]]]],[1,"\\n"]],[]],null]],[15,16]]],[1,"      "]],[]]]]],[1,"\\n    "]],[14]]]]],[1,"\\n    "],[8,[30,13,["Select"]],[[24,0,"type-locality"]],[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["source","change"]]],null],true]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n        "],[10,1],[12],[1,"\\n          "],[1,[28,[35,2],["components.consul.auth-method.search-bar.locality.name"],null]],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,17,["Optgroup"]],[30,17,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[28,[37,4],["local","global"],null]],null]],null],null,[[[1,"            "],[8,[30,19],[[16,0,[29,[[30,20]]]]],[["@value","@selected"],[[30,20],[28,[37,9],[[30,20],[30,2,["types"]]],null]]],[["default"],[[[[1,"\\n              "],[1,[28,[35,2],[[28,[37,3],["components.consul.auth-method.search-bar.locality.options.",[30,20]],null]],null]],[1,"\\n            "]],[]]]]],[1,"\\n"]],[20]],null]],[18,19]]],[1,"      "]],[]]]]],[1,"\\n    "]],[17]]]]],[1,"\\n  "]],[13]],[[[1,"\\n    "],[8,[30,21,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,22,["change"]]],null],false,true]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n        "],[10,1],[12],[1,"\\n"],[44,[[28,[37,14],[[28,[37,4],[[28,[37,4],["MethodName:asc",[28,[37,2],["common.sort.alpha.asc"],null]],null],[28,[37,4],["MethodName:desc",[28,[37,2],["common.sort.alpha.desc"],null]],null],[28,[37,4],["TokenTTL:desc",[28,[37,2],["common.sort.duration.asc"],null]],null],[28,[37,4],["TokenTTL:asc",[28,[37,2],["common.sort.duration.desc"],null]],null]],null]],null]],[[[1,"            "],[1,[28,[35,15],[[30,24],[30,22,["value"]]],null]],[1,"\\n"]],[24]]],[1,"        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,23,["Optgroup"]],[30,23,["Option"]]],[[[1,"          "],[8,[30,25],null,[["@label"],[[28,[37,2],["common.ui.name"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,26],null,[["@value","@selected"],["MethodName:asc",[28,[37,16],["MethodName:asc",[30,22,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,26],null,[["@value","@selected"],["MethodName:desc",[28,[37,16],["MethodName:desc",[30,22,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,25],null,[["@label"],[[28,[37,2],["common.ui.maxttl"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,26],null,[["@value","@selected"],["TokenTTL:desc",[28,[37,16],["TokenTTL:desc",[30,22,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.duration.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,26],null,[["@value","@selected"],["TokenTTL:asc",[28,[37,16],["TokenTTL:asc",[30,22,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.duration.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[25,26]]],[1,"      "]],[]]]]],[1,"\\n    "]],[23]]]]],[1,"\\n  "]],[21]]]]],[1,"\\n"]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Optgroup","Option","prop","search","components","Optgroup","Option","components","Optgroup","Option","option","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","action","block-slot","each","-track-array","includes","lowercase","flight-icon","if","env","from-entries","get","eq"]]',moduleName:"consul-ui/components/consul/auth-method/search-bar/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/auth-method/type/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"KzIxa15o",block:'[[[44,[[28,[37,1],[[30,1,["Type"]]],null]],[[[1,"  "],[10,1],[15,0,[29,["consul-auth-method-type ",[52,[51,[30,2]],[30,1,["Type"]]]]]],[12],[1,"\\n"],[41,[30,2],[[[1,"      "],[8,[39,4],[[24,0,"mr-1.5 w-4 h-4"]],[["@name"],[[30,2]]],null],[1,"\\n"]],[]],null],[1,"    "],[1,[28,[35,5],[[28,[37,6],["common.brand.",[30,1,["Type"]]],null]],null]],[1,"\\n  "],[13],[1,"\\n"]],[2]]]],["@item","flightIcon"],false,["let","icon-mapping","unless","if","flight-icon","t","concat"]]',moduleName:"consul-ui/components/consul/auth-method/type/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/auth-method/view/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"4cpKdVK+",block:'[[[1,"  "],[10,0],[14,0,"consul-auth-method-view"],[12],[1,"\\n"],[41,[28,[37,1],[[30,1,["Type"]],"kubernetes"],null],[[[1,"    "],[10,"dl"],[12],[1,"\\n      "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Type"],null]],[13],[1,"\\n      "],[10,"dd"],[12],[8,[39,3],null,[["@item"],[[30,1]]],null],[13],[1,"\\n\\n"],[42,[28,[37,5],[[28,[37,5],[[28,[37,6],["MaxTokenTTL","TokenLocality","DisplayName","Description"],null]],null]],null],null,[[[41,[28,[37,7],[[30,1],[30,2]],null],[[[1,"      "],[10,"dt"],[12],[1,[28,[35,2],[[28,[37,8],["models.auth-method.",[30,2]],null]],null]],[13],[1,"\\n      "],[10,"dd"],[12],[1,[28,[35,7],[[30,1],[30,2]],null]],[13],[1,"\\n"]],[]],null]],[2]],null],[41,[30,1,["Config","Host"]],[[[1,"      "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.Host"],null]],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[8,[39,9],null,[["@value","@name"],[[30,1,["Config","Host"]],[28,[37,2],["models.auth-method.Config.Host"],null]]],null],[1,"\\n      "],[13],[1,"\\n"]],[]],null],[41,[30,1,["Config","CACert"]],[[[1,"      "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.CACert"],null]],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[8,[39,9],null,[["@obfuscated","@value","@name"],[true,[30,1,["Config","CACert"]],[28,[37,2],["models.auth-method.Config.CACert"],null]]],null],[1,"\\n      "],[13],[1,"\\n"]],[]],null],[41,[30,1,["Config","ServiceAccountJWT"]],[[[1,"      "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.ServiceAccountJWT"],null]],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[8,[39,9],null,[["@value","@name"],[[30,1,["Config","ServiceAccountJWT"]],[28,[37,2],["models.auth-method.Config.ServiceAccountJWT"],null]]],null],[1,"\\n      "],[13],[1,"\\n"]],[]],null],[1,"    "],[13],[1,"\\n"]],[]],[[[1,"    "],[10,"section"],[14,0,"meta"],[12],[1,"\\n      "],[10,"dl"],[12],[1,"\\n        "],[10,"dt"],[12],[1,"Type"],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[8,[39,3],null,[["@item"],[[30,1]]],null],[1,"\\n        "],[13],[1,"\\n\\n"],[42,[28,[37,5],[[28,[37,5],[[28,[37,6],["MaxTokenTTL","TokenLocality","DisplayName","Description"],null]],null]],null],null,[[[41,[28,[37,7],[[30,1],[30,3]],null],[[[1,"\\n        "],[10,"dt"],[12],[1,[28,[35,2],[[28,[37,8],["models.auth-method.",[30,3]],null]],null]],[13],[1,"\\n        "],[10,"dd"],[12],[1,[28,[35,7],[[30,1],[30,3]],null]],[13],[1,"\\n\\n"]],[]],null]],[3]],null],[1,"\\n"],[41,[28,[37,1],[[30,1,["Type"]],"aws-iam"],null],[[[1,"\\n"],[44,[[30,1,["Config"]]],[[[42,[28,[37,5],[[28,[37,5],[[28,[37,6],["BoundIAMPrincipalARNs","EnableIAMEntityDetails","IAMEntityTags","IAMEndpoint","MaxRetries","STSEndpoint","STSRegion","AllowedSTSHeaderValues","ServerIDHeaderValue"],null]],null]],null],null,[[[41,[28,[37,7],[[30,4],[30,5]],null],[[[1,"\\n        "],[10,"dt"],[12],[1,[28,[35,2],[[28,[37,8],["models.auth-method.",[30,5]],null]],null]],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n"],[44,[[28,[37,7],[[30,4],[30,5]],null]],[[[41,[28,[37,11],[[30,6]],null],[[[1,"          "],[10,"ul"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[30,6]],null]],null],null,[[[1,"              "],[10,"li"],[12],[1,"\\n                "],[10,1],[12],[1,[30,7]],[13],[1,"\\n              "],[13],[1,"\\n"]],[7]],null],[1,"          "],[13],[1,"\\n"]],[]],[[[1,"          "],[1,[30,6]],[1,"\\n"]],[]]]],[6]]],[1,"        "],[13],[1,"\\n\\n"]],[]],null]],[5]],null],[1,"\\n"]],[4]]],[1,"\\n"]],[]],[[[41,[28,[37,1],[[30,1,["Type"]],"jwt"],null],[[[41,[30,1,["Config","JWKSURL"]],[[[1,"        "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.JWKSURL"],null]],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[8,[39,9],null,[["@value","@name"],[[30,1,["Config","JWKSURL"]],[28,[37,2],["models.auth-method.Config.JWKSURL"],null]]],null],[1,"\\n        "],[13],[1,"\\n        "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.JWKSCACert"],null]],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[8,[39,9],null,[["@obfuscated","@value","@name"],[true,[30,1,["Config","JWKSCACert"]],[28,[37,2],["models.auth-method.Config.JWKSCACert"],null]]],null],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[30,1,["Config","JWTValidationPubKeys"]],[[[1,"        "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.JWTValidationPubKeys"],null]],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[8,[39,9],null,[["@obfuscated","@value","@name"],[true,[30,1,["Config","JWTValidationPubKeys"]],[28,[37,2],["models.auth-method.Config.JWTValidationPubKeys"],null]]],null],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[30,1,["Config","OIDCDiscoveryURL"]],[[[1,"        "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.OIDCDiscoveryURL"],null]],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[8,[39,9],null,[["@value","@name"],[[30,1,["Config","OIDCDiscoveryURL"]],[28,[37,2],["models.auth-method.Config.OIDCDiscoveryURL"],null]]],null],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[30,1,["Config","JWTSupportedAlgs"]],[[[1,"        "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.JWTSupportedAlgs"],null]],[13],[1,"\\n        "],[10,"dd"],[12],[1,[28,[35,12],[", ",[30,1,["Config","JWTSupportedAlgs"]]],null]],[13],[1,"\\n"]],[]],null],[41,[30,1,["Config","BoundAudiences"]],[[[1,"          "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.BoundAudiences"],null]],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[10,"ul"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[30,1,["Config","BoundAudiences"]]],null]],null],null,[[[1,"              "],[10,"li"],[12],[1,"\\n                "],[10,1],[12],[1,[30,8]],[13],[1,"\\n              "],[13],[1,"\\n"]],[8]],null],[1,"            "],[13],[1,"\\n          "],[13],[1,"\\n"]],[]],null],[42,[28,[37,5],[[28,[37,5],[[28,[37,6],["BoundIssuer","ExpirationLeeway","NotBeforeLeeway","ClockSkewLeeway"],null]],null]],null],null,[[[41,[28,[37,7],[[30,1,["Config"]],[30,9]],null],[[[1,"          "],[10,"dt"],[12],[1,[28,[35,2],[[28,[37,8],["models.auth-method.Config.",[30,9]],null]],null]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[28,[35,7],[[30,1,["Config"]],[30,9]],null]],[13],[1,"\\n"]],[]],null]],[9]],null]],[]],[[[41,[28,[37,1],[[30,1,["Type"]],"oidc"],null],[[[41,[30,1,["Config","OIDCDiscoveryURL"]],[[[1,"        "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.OIDCDiscoveryURL"],null]],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[8,[39,9],null,[["@value","@name"],[[30,1,["Config","OIDCDiscoveryURL"]],[28,[37,2],["models.auth-method.Config.OIDCDiscoveryURL"],null]]],null],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[30,1,["Config","OIDCDiscoveryCACert"]],[[[1,"        "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.OIDCDiscoveryCACert"],null]],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[8,[39,9],null,[["@obfuscated","@value","@name"],[true,[30,1,["Config","OIDCDiscoveryCACert"]],[28,[37,2],["models.auth-method.Config.OIDCDiscoveryCACert"],null]]],null],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[30,1,["Config","OIDCClientID"]],[[[1,"          "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.OIDCClientID"],null]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,1,["Config","OIDCClientID"]]],[13],[1,"\\n"]],[]],null],[41,[30,1,["Config","OIDCClientSecret"]],[[[1,"          "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.OIDCClientSecret"],null]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,1,["Config","OIDCClientSecret"]]],[13],[1,"\\n"]],[]],null],[41,[30,1,["Config","AllowedRedirectURIs"]],[[[1,"          "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.AllowedRedirectURIs"],null]],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[10,"ul"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[30,1,["Config","AllowedRedirectURIs"]]],null]],null],null,[[[1,"              "],[10,"li"],[12],[1,"\\n                "],[8,[39,9],null,[["@value","@name"],[[30,10],"Redirect URI"]],null],[1,"\\n              "],[13],[1,"\\n"]],[10]],null],[1,"            "],[13],[1,"\\n          "],[13],[1,"\\n"]],[]],null],[41,[30,1,["Config","BoundAudiences"]],[[[1,"          "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.BoundAudiences"],null]],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[10,"ul"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[30,1,["Config","BoundAudiences"]]],null]],null],null,[[[1,"              "],[10,"li"],[12],[1,"\\n                "],[10,1],[12],[1,[30,11]],[13],[1,"\\n              "],[13],[1,"\\n"]],[11]],null],[1,"            "],[13],[1,"\\n          "],[13],[1,"\\n"]],[]],null],[41,[30,1,["Config","OIDCScopes"]],[[[1,"          "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.OIDCScopes"],null]],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[10,"ul"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[30,1,["Config","OIDCScopes"]]],null]],null],null,[[[1,"              "],[10,"li"],[12],[1,"\\n                "],[10,1],[12],[1,[30,12]],[13],[1,"\\n              "],[13],[1,"\\n"]],[12]],null],[1,"            "],[13],[1,"\\n          "],[13],[1,"\\n"]],[]],null],[41,[30,1,["Config","JWTSupportedAlgs"]],[[[1,"        "],[10,"dt"],[12],[1,[28,[35,2],["models.auth-method.Config.JWTSupportedAlgs"],null]],[13],[1,"\\n        "],[10,"dd"],[12],[1,[28,[35,12],[", ",[30,1,["Config","JWTSupportedAlgs"]]],null]],[13],[1,"\\n"]],[]],null],[41,[30,1,["Config","VerboseOIDCLogging"]],[[[1,"        "],[10,"dt"],[14,0,"check"],[12],[1,[28,[35,2],["models.auth-method.Config.VerboseOIDCLogging"],null]],[13],[1,"\\n        "],[10,"dd"],[12],[10,"input"],[14,"disabled","disabled"],[15,"checked",[30,1,["Config","VerboseOIDCLogging"]]],[14,4,"checkbox"],[12],[13],[13],[1,"\\n"]],[]],null],[1,"      "]],[]],null]],[]]]],[]]],[1,"      "],[13],[1,"\\n    "],[13],[1,"\\n\\n"],[41,[28,[37,13],[[28,[37,1],[[30,1,["Type"]],"aws-iam"],null]],null],[[[1,"    "],[10,"hr"],[12],[13],[1,"\\n\\n    "],[10,"section"],[14,0,"claim-mappings"],[12],[1,"\\n      "],[10,"h2"],[12],[1,"Claim Mappings"],[13],[1,"\\n"],[41,[30,1,["Config","ClaimMappings"]],[[[1,"      "],[10,2],[12],[1,"Use this if the claim you are capturing is singular. When mapped, the values can be any of a number, string, or boolean and will all be stringified when returned."],[13],[1,"\\n      "],[10,"table"],[12],[1,"\\n        "],[10,"thead"],[12],[1,"\\n          "],[10,"tr"],[12],[1,"\\n            "],[10,"td"],[12],[1,"Key"],[13],[1,"\\n            "],[10,"td"],[12],[1,"Value"],[13],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n        "],[10,"tbody"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[28,[37,14],[[30,1,["Config","ClaimMappings"]]],null]],null]],null],null,[[[1,"          "],[10,"tr"],[12],[1,"\\n            "],[10,"td"],[12],[1,[28,[35,7],[[30,13],0],null]],[13],[1,"\\n            "],[10,"td"],[12],[1,[28,[35,7],[[30,13],1],null]],[13],[1,"\\n          "],[13],[1,"\\n"]],[13]],null],[1,"        "],[13],[1,"\\n      "],[13],[1,"\\n"]],[]],[[[1,"      "],[8,[39,15],null,null,[["default"],[[[[1,"\\n        "],[8,[39,16],null,[["@name"],["header"]],[["default"],[[[[1,"\\n          "],[10,"h2"],[12],[1,"No claim mappings"],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,16],null,[["@name"],["body"]],[["default"],[[[[1,"\\n          "],[10,2],[12],[1,"Use this if the claim you are capturing is singular. When mapped, the values can be any of a number, string, or boolean and will all be stringified when returned."],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,16],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n          "],[10,"li"],[14,0,"docs-link"],[12],[1,"\\n"],[41,[28,[37,1],[[30,1,["Type"]],"jwt"],null],[[[1,"            "],[10,3],[15,6,[29,[[28,[37,17],["CONSUL_DOCS_URL"],null],"/security/acl/auth-methods/jwt#claimmappings"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"Read the documentation"],[13],[1,"\\n"]],[]],[[[1,"            "],[10,3],[15,6,[29,[[28,[37,17],["CONSUL_DOCS_URL"],null],"/security/acl/auth-methods/oidc#claimmappings"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"Read the documentation"],[13],[1,"\\n"]],[]]],[1,"          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n      "]],[]]]]],[1,"\\n"]],[]]],[1,"    "],[13],[1,"\\n\\n    "],[10,"hr"],[12],[13],[1,"\\n\\n    "],[10,"section"],[14,0,"list-claim-mappings"],[12],[1,"\\n      "],[10,"h2"],[12],[1,"List Claim Mappings"],[13],[1,"\\n"],[41,[30,1,["Config","ListClaimMappings"]],[[[1,"      "],[10,2],[12],[1,"Use this if the claim you are capturing is list-like (such as groups). When mapped, the values can be any of a number, string, or boolean and will all be stringified when returned."],[13],[1,"\\n      "],[10,"table"],[12],[1,"\\n        "],[10,"thead"],[12],[1,"\\n          "],[10,"tr"],[12],[1,"\\n            "],[10,"td"],[12],[1,"Key"],[13],[1,"\\n            "],[10,"td"],[12],[1,"Value"],[13],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n        "],[10,"tbody"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[28,[37,14],[[30,1,["Config","ListClaimMappings"]]],null]],null]],null],null,[[[1,"          "],[10,"tr"],[12],[1,"\\n            "],[10,"td"],[12],[1,[28,[35,7],[[30,14],0],null]],[13],[1,"\\n            "],[10,"td"],[12],[1,[28,[35,7],[[30,14],1],null]],[13],[1,"\\n          "],[13],[1,"\\n"]],[14]],null],[1,"        "],[13],[1,"\\n      "],[13],[1,"\\n"]],[]],[[[1,"      "],[8,[39,15],null,null,[["default"],[[[[1,"\\n        "],[8,[39,16],null,[["@name"],["header"]],[["default"],[[[[1,"\\n          "],[10,"h2"],[12],[1,"No list claim mappings"],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,16],null,[["@name"],["body"]],[["default"],[[[[1,"\\n          "],[10,2],[12],[1,"Use this if the claim you are capturing is list-like (such as groups). When mapped, the values can be any of a number, string, or boolean and will all be stringified when returned."],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,16],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n          "],[10,"li"],[14,0,"docs-link"],[12],[1,"\\n"],[41,[28,[37,1],[[30,1,["Type"]],"jwt"],null],[[[1,"            "],[10,3],[15,6,[29,[[28,[37,17],["CONSUL_DOCS_URL"],null],"/security/acl/auth-methods/jwt#listclaimmappings"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"Read the documentation"],[13],[1,"\\n"]],[]],[[[1,"            "],[10,3],[15,6,[29,[[28,[37,17],["CONSUL_DOCS_URL"],null],"/security/acl/auth-methods/oidc#listclaimmappings"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"Read the documentation"],[13],[1,"\\n"]],[]]],[1,"          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n      "]],[]]]]],[1,"\\n"]],[]]],[1,"    "],[13],[1,"\\n"]],[]],null]],[]]],[1,"  "],[13]],["@item","value","value","config","value","item","jtem","bond","value","uri","bond","scope","entry","entry"],false,["if","eq","t","consul/auth-method/type","each","-track-array","array","get","concat","copyable-code","let","array-is-array","join","not","entries","empty-state","block-slot","env"]]',moduleName:"consul-ui/components/consul/auth-method/view/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/bucket/list/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/service"],(function(e,t,n,l,r){var i,o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const a=(0,n.createTemplateFactory)({id:"Uns+fzyc",block:'[[[41,[30,0,["itemsToDisplay","length"]],[[[1,"  "],[10,"dl"],[14,0,"consul-bucket-list"],[12],[1,"\\n"],[42,[28,[37,2],[[28,[37,2],[[30,0,["itemsToDisplay"]]],null]],null],null,[[[1,"      "],[11,"dt"],[16,0,[30,1,["type"]]],[4,[38,3],null,null],[12],[1,"\\n        "],[1,[30,1,["label"]]],[1,"\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[1,[30,1,["item"]]],[1,"\\n      "],[13],[1,"\\n"]],[1]],null],[1,"  "],[13],[1,"\\n"]],[]],null]],["item"],false,["if","each","-track-array","tooltip"]]',moduleName:"consul-ui/components/consul/bucket/list/index.hbs",isStrictMode:!1})
-let u=(i=class extends l.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="abilities",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}get itemsToDisplay(){const{peerOrPartitionPart:e,namespacePart:t,servicePart:n}=this
-return[...e,...t,...n]}get peerOrPartitionPart(){const{peerPart:e,partitionPart:t}=this
-return e.length?e:t}get partitionPart(){const{item:e,partition:t}=this.args,{abilities:n}=this
-return t&&n.can("use partitions")&&e.Partition!==t?[{type:"partition",label:"Admin Partition",item:e.Partition}]:[]}get peerPart(){const{item:e}=this.args
-return e.PeerName?[{type:"peer",label:"Peer",item:e.PeerName}]:[]}get namespacePart(){const{item:e,nspace:t}=this.args,{abilities:n,partitionPart:l,peerPart:r}=this,i={type:"nspace",label:"Namespace",item:e.Namespace}
-return l.length||r.length&&n.can("use nspaces")||t&&n.can("use nspaces")&&e.Namespace!==t?[i]:[]}get servicePart(){const{item:e,service:t}=this.args,{partitionPart:n,namespacePart:l}=this
-return(n.length||l.length)&&e.Service&&t?[{type:"service",label:"Service",item:e.Service}]:[]}},s=i.prototype,c="abilities",d=[r.inject],p={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(p).forEach((function(e){m[e]=p[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=d.slice().reverse().reduce((function(e,t){return t(s,c,e)||e}),m),f&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(f):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(s,c,m),m=null),o=m,i)
-var s,c,d,p,f,m
-e.default=u,(0,t.setComponentTemplate)(a,u)})),define("consul-ui/components/consul/datacenter/selector/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"b1hlblXc",block:'[[[10,"li"],[14,0,"dcs"],[12],[1,"\\n"],[41,[28,[37,1],[[30,1,["length"]],1],null],[[[1,"    "],[8,[39,2],[[24,"aria-label","Datacenter"]],[["@items"],[[28,[37,3],["Primary:desc","Local:desc","Name:asc",[30,1]],null]]],[["default"],[[[[1,"\\n      "],[8,[30,2,["Action"]],[[4,[38,4],["click",[30,2,["toggle"]]],null]],null,[["default"],[[[[1,"\\n        "],[1,[30,3,["Name"]]],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[30,2,["Menu"]],null,null,[["default"],[[[[1,"\\n        "],[8,[39,5],null,[["@src","@onchange"],[[28,[37,6],["/*/*/*/datacenters"],null],[28,[37,7],[[30,0],[28,[37,8],[[30,1]],null]],[["value"],["data"]]]]],null],[1,"\\n        "],[10,2],[14,0,"dcs-message"],[12],[1,"\\n          Datacenters shown in this dropdown are available through WAN Federation.\\n        "],[13],[1,"\\n        "],[8,[30,4,["Menu"]],null,null,[["default"],[[[[1,"\\n          "],[8,[30,5,["Separator"]],null,null,[["default"],[[[[1,"\\n            DATACENTERS\\n          "]],[]]]]],[1,"\\n"],[42,[28,[37,10],[[28,[37,10],[[30,5,["items"]]],null]],null],null,[[[1,"            "],[8,[30,5,["Item"]],[[16,"aria-current",[52,[28,[37,11],[[30,3,["Name"]],[30,6,["Name"]]],null],"true"]],[16,0,[28,[37,12],[[28,[37,13],["is-local",[30,6,["Local"]]],null],[28,[37,13],["is-primary",[30,6,["Primary"]]],null]],null]]],null,[["default"],[[[[1,"\\n              "],[8,[30,5,["Action"]],[[4,[38,4],["click",[30,2,["close"]]],null]],[["@href"],[[28,[37,14],["."],[["params"],[[28,[37,15],null,[["dc","partition","nspace"],[[30,6,["Name"]],[27],[52,[28,[37,1],[[30,7,["length"]],0],null],[30,7],[27]]]]]]]]]],[["default"],[[[[1,"\\n                "],[1,[30,6,["Name"]]],[1,"\\n"],[41,[30,6,["Primary"]],[[[1,"                  "],[10,1],[12],[1,"Primary"],[13],[1,"\\n"]],[]],null],[41,[30,6,["Local"]],[[[1,"                  "],[10,1],[12],[1,"Local"],[13],[1,"\\n"]],[]],null],[1,"              "]],[]]]]],[1,"\\n            "]],[]]]]],[1,"\\n"]],[6]],null],[1,"        "]],[5]]]]],[1,"\\n      "]],[4]]]]],[1,"\\n    "]],[2]]]]],[1,"\\n"]],[]],[[[1,"    "],[10,0],[14,0,"dc-name"],[12],[1,"\\n      "],[1,[30,1,["firstObject","Name"]]],[1,"\\n"],[44,[[28,[37,17],["CONSUL_HCP_MANAGED_RUNTIME"],null]],[[[41,[30,8],[[[1,"          "],[10,1],[12],[1,[28,[35,18],[[30,8]],null]],[13],[1,"\\n"]],[]],null]],[8]]],[1,"    "],[13],[1,"\\n"]],[]]],[13]],["@dcs","disclosure","@dc","panel","menu","item","@nspace","managedRuntime"],false,["if","gt","disclosure-menu","sort-by","on","data-source","uri","action","mut","each","-track-array","eq","class-map","array","href-to","hash","let","env","capitalize"]]',moduleName:"consul-ui/components/consul/datacenter/selector/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/discovery-chain/index",["exports","@ember/component","@ember/template-factory","@ember/service","@ember/object","consul-ui/components/consul/discovery-chain/utils"],(function(e,t,n,l,r,i){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,n.createTemplateFactory)({id:"gGEpz1eC",block:'[[[10,"style"],[12],[1,"\\n"],[41,[33,1,["nodes"]],[[[1,"    "],[1,[33,1,["nodes"]]],[1,"\\n    { opacity: 1 !important; background-color: var(--token-color-surface-interactive); border:\\n    var(--decor-border-100); border-radius: var(--decor-radius-200); border-color:\\n    var(--token-color-foreground-faint); box-shadow: var(--token-surface-high-box-shadow); }\\n"]],[]],null],[41,[33,1,["edges"]],[[[1,"    "],[1,[33,1,["edges"]]],[1,"\\n    { opacity: 1; }\\n"]],[]],null],[13],[1,"\\n\\n"],[10,0],[14,0,"routes"],[12],[1,"\\n  "],[10,"header"],[12],[1,"\\n    "],[10,"h2"],[12],[1,"\\n      "],[1,[33,2,["ServiceName"]]],[1,"\\n      Router\\n      "],[11,1],[4,[38,3],["Use routers to intercept traffic using Layer 7 criteria such as path prefixes or http headers."],null],[12],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n  "],[10,0],[14,"role","group"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[33,6]],null]],null],null,[[[1,"      "],[8,[39,7],[[4,[38,9],[[28,[37,10],[[28,[37,11],[[30,1],"rect"],null]],[["from"],[[30,0,["edges"]]]]]],null]],[["@item","@onclick"],[[30,1],[28,[37,8],[[30,0],"click"],null]]],null],[1,"\\n"]],[1]],null],[1,"  "],[13],[1,"\\n"],[13],[1,"\\n\\n"],[10,0],[14,0,"splitters"],[12],[1,"\\n  "],[10,"header"],[12],[1,"\\n    "],[10,"h2"],[12],[1,"\\n      Splitters\\n      "],[11,1],[4,[38,3],["Splitters are configured to split incoming requests across different services or subsets of a single service."],null],[12],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n  "],[10,0],[14,"role","group"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[28,[37,12],["Name",[33,13]],null]],null]],null],null,[[[1,"      "],[8,[39,14],[[4,[38,9],[[28,[37,10],[[28,[37,11],[[30,2],"rect"],null]],[["from"],[[30,0,["edges"]]]]]],null]],[["@item","@onclick"],[[30,2],[28,[37,8],[[30,0],"click"],null]]],null],[1,"\\n"]],[2]],null],[1,"  "],[13],[1,"\\n"],[13],[1,"\\n\\n"],[10,0],[14,0,"resolvers"],[12],[1,"\\n  "],[10,"header"],[12],[1,"\\n    "],[10,"h2"],[12],[1,"\\n      Resolvers\\n      "],[11,1],[4,[38,3],["Resolvers are used to define which instances of a service should satisfy discovery requests."],null],[12],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n  "],[10,0],[14,"role","group"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[28,[37,12],["Name",[33,15]],null]],null]],null],null,[[[1,"      "],[8,[39,16],[[4,[38,9],[[28,[37,10],[[28,[37,11],[[30,3],"rect"],null]],[["from"],[[30,0,["edges"]]]]]],null]],[["@item","@edges","@onclick"],[[30,3],[30,0,["edges"]],[28,[37,8],[[30,0],"click"],null]]],null],[1,"\\n"]],[3]],null],[1,"  "],[13],[1,"\\n"],[13],[1,"\\n\\n"],[1,[34,17]],[1,"\\n\\n"],[11,"svg"],[24,0,"edges"],[24,"width","100%"],[24,"height","100%"],[24,"preserveAspectRatio","none"],[4,[38,18],[[28,[37,11],[[30,0],"edges"],null]],null],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[33,6]],null]],null],null,[[[41,[30,4,["rect"]],[[[44,[[30,4,["rect"]],[30,4,["NextItem","rect"]]],[[[44,[[28,[37,20],[[28,[37,21],null,[["x","y"],[[30,6,["x"]],[28,[37,22],[[30,6,["y"]],[28,[37,23],[[30,6,["height"]],2],null]],null]]]],[28,[37,24],[[30,4,["ID"]]],null]],null]],[[[1,"\\n          "],[10,"path"],[15,1,[28,[37,24],[[30,4,["ID"]],">",[30,4,["NextNode"]]],null]],[15,"d",[28,[37,25],[[28,[37,21],null,[["x","y"],[[30,7,["x"]],[28,[37,26],[[30,7,["y"]],0],null]]]]],[["src"],[[28,[37,21],null,[["x","y"],[[30,5,["right"]],[28,[37,22],[[30,5,["y"]],[28,[37,23],[[30,5,["height"]],2],null]],null]]]]]]]],[12],[13],[1,"\\n\\n"]],[7]]]],[5,6]]]],[]],null]],[4]],null],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[33,13]],null]],null],null,[[[41,[30,8,["rect"]],[[[44,[[30,8,["rect"]]],[[[42,[28,[37,5],[[28,[37,5],[[30,8,["Splits"]]],null]],null],null,[[[44,[[30,10,["NextItem","rect"]]],[[[44,[[28,[37,20],[[28,[37,21],null,[["x","y"],[[30,12,["x"]],[28,[37,22],[[30,12,["y"]],[28,[37,23],[[30,12,["height"]],2],null]],null]]]],[28,[37,24],[[30,8,["ID"]],"-",[30,11]],null]],null]],[[[1,"\\n              "],[11,"path"],[16,1,[28,[37,24],["splitter:",[30,8,["Name"]],">",[30,10,["NextNode"]]],null]],[24,0,"split"],[16,"d",[28,[37,25],[[28,[37,21],null,[["x","y"],[[30,13,["x"]],[30,13,["y"]]]]]],[["src"],[[28,[37,21],null,[["x","y"],[[30,9,["right"]],[28,[37,22],[[30,9,["y"]],[28,[37,23],[[30,9,["height"]],2],null]],null]]]]]]]],[4,[38,3],[[28,[37,24],[[28,[37,27],[[28,[37,28],[[30,10,["Weight"]],0],null]],[["decimals"],[2]]],"%"],null]],[["options"],[[28,[37,21],null,[["followCursor"],[true]]]]]],[12],[13],[1,"\\n\\n"]],[13]]]],[12]]]],[10,11]],null]],[9]]]],[]],null]],[8]],null],[1,"\\n"],[13],[1,"\\n\\n"],[10,"svg"],[14,0,"resolver-inlets"],[14,"height","100%"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[33,6]],null]],null],null,[[[41,[28,[37,29],[[30,14,["NextNode"]],"resolver:"],null],[[[44,[[28,[37,28],[[30,14,["NextItem","rect"]],[28,[37,21],null,[["y","height"],[0,0]]]],null]],[[[1,"        "],[10,"circle"],[14,"r","2.5"],[14,"cx","5"],[15,"cy",[28,[37,22],[[30,15,["y"]],[28,[37,23],[[30,15,["height"]],2],null]],null]],[12],[13],[1,"\\n"]],[15]]]],[]],null]],[14]],null],[42,[28,[37,5],[[28,[37,5],[[33,13]],null]],null],null,[[[42,[28,[37,5],[[28,[37,5],[[30,16,["Splits"]]],null]],null],null,[[[44,[[28,[37,28],[[30,17,["NextItem","rect"]],[28,[37,21],null,[["y","height"],[0,0]]]],null]],[[[1,"        "],[10,"circle"],[14,"r","2.5"],[14,"cx","5"],[15,"cy",[28,[37,22],[[30,18,["y"]],[28,[37,23],[[30,18,["height"]],2],null]],null]],[12],[13],[1,"\\n"]],[18]]]],[17]],null]],[16]],null],[13],[1,"\\n\\n"],[10,"svg"],[14,0,"splitter-inlets"],[14,"height","100%"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[33,6]],null]],null],null,[[[41,[28,[37,29],[[30,19,["NextNode"]],"splitter:"],null],[[[44,[[28,[37,28],[[30,19,["NextItem","rect"]],[28,[37,21],null,[["y","height"],[0,0]]]],null]],[[[1,"        "],[10,"circle"],[14,"r","2.5"],[14,"cx","5"],[15,"cy",[28,[37,22],[[30,20,["y"]],[28,[37,23],[[30,20,["height"]],2],null]],null]],[12],[13],[1,"\\n"]],[20]]]],[]],null]],[19]],null],[13],[1,"\\n"]],["item","item","item","item","src","destRect","dest","splitter","src","item","index","destRect","dest","item","dest","item","item","dest","item","dest"],false,["if","selected","chain","tooltip","each","-track-array","routes","consul/discovery-chain/route-card","action","on-resize","dom-position","set","sort-by","splitters","consul/discovery-chain/splitter-card","resolvers","consul/discovery-chain/resolver-card","nodes","did-insert","let","tween-to","hash","add","div","concat","svg-curve","sub","round","or","string-starts-with"]]',moduleName:"consul-ui/components/consul/discovery-chain/index.hbs",isStrictMode:!1})
-var a=(0,t.setComponentTemplate)(o,t.default.extend({dom:(0,l.inject)("dom"),ticker:(0,l.inject)("ticker"),dataStructs:(0,l.inject)("data-structs"),classNames:["discovery-chain"],classNameBindings:["active"],selectedId:"",init:function(){this._super(...arguments),this._listeners=this.dom.listeners()},didInsertElement:function(){this._listeners.add(this.dom.document(),{click:e=>{this.dom.closest('[class$="-card"]',e.target)||((0,r.set)(this,"active",!1),(0,r.set)(this,"selectedId",""))}})},willDestroyElement:function(){this._super(...arguments),this._listeners.remove(),this.ticker.destroy(this)},splitters:(0,r.computed)("chain.Nodes",(function(){return(0,i.getSplitters)((0,r.get)(this,"chain.Nodes"))})),routes:(0,r.computed)("chain.Nodes",(function(){const e=(0,i.getRoutes)((0,r.get)(this,"chain.Nodes"),this.dom.guid)
-if(!e.find((e=>"/"===(0,r.get)(e,"Definition.Match.HTTP.PathPrefix")))&&!e.find((e=>void 0===e.Definition))){let t
-const n=`resolver:${this.chain.ServiceName}.${this.chain.Namespace}.${this.chain.Partition}.${this.chain.Datacenter}`,l=`splitter:${this.chain.ServiceName}.${this.chain.Namespace}.${this.chain.Partition}`
-if(void 0!==this.chain.Nodes[l]?t=l:void 0!==this.chain.Nodes[n]&&(t=n),void 0!==t){const n={Default:!0,ID:`route:${this.chain.ServiceName}`,Name:this.chain.ServiceName,Definition:{Match:{HTTP:{PathPrefix:"/"}}},NextNode:t}
-e.push((0,i.createRoute)(n,this.chain.ServiceName,this.dom.guid))}}return e})),nodes:(0,r.computed)("routes","splitters","resolvers",(function(){let e=this.resolvers.reduce(((e,t)=>(e[`resolver:${t.ID}`]=t,t.Children.reduce(((e,t)=>(e[`resolver:${t.ID}`]=t,e)),e),e)),{})
-return e=this.splitters.reduce(((e,t)=>(e[t.ID]=t,e)),e),e=this.routes.reduce(((e,t)=>(e[t.ID]=t,e)),e),Object.entries(e).forEach((t=>{let[n,l]=t
-void 0!==l.NextNode&&(l.NextItem=e[l.NextNode]),void 0!==l.Splits&&l.Splits.forEach((t=>{void 0!==t.NextNode&&(t.NextItem=e[t.NextNode])}))})),""})),resolvers:(0,r.computed)("chain.{Nodes,Targets}",(function(){return(0,i.getResolvers)(this.chain.Datacenter,this.chain.Partition,this.chain.Namespace,(0,r.get)(this,"chain.Targets"),(0,r.get)(this,"chain.Nodes"))})),graph:(0,r.computed)("splitters","routes.[]",(function(){const e=this.dataStructs.graph()
-return this.splitters.forEach((t=>{t.Splits.forEach((n=>{e.addLink(t.ID,n.NextNode)}))})),this.routes.forEach(((t,n)=>{e.addLink(t.ID,t.NextNode)})),e})),selected:(0,r.computed)("selectedId","graph",(function(){if(""===this.selectedId||!this.dom.element(`#${this.selectedId}`))return{}
-const e=this.selectedId,t=e.split(":").shift(),n=[e],l=[]
-return this.graph.forEachLinkedNode(e,((e,r)=>{n.push(e.id),l.push(`${r.fromId}>${r.toId}`),this.graph.forEachLinkedNode(e.id,((e,r)=>{const i=e.id.split(":").shift()
-t!==i&&"splitter"!==t&&"splitter"!==i&&(n.push(e.id),l.push(`${r.fromId}>${r.toId}`))}))})),{nodes:n.map((e=>`#${CSS.escape(e)}`)),edges:l.map((e=>`#${CSS.escape(e)}`))}})),actions:{click:function(e){const t=e.currentTarget.getAttribute("id")
-t===this.selectedId?((0,r.set)(this,"active",!1),(0,r.set)(this,"selectedId","")):((0,r.set)(this,"active",!0),(0,r.set)(this,"selectedId",t))}}}))
-e.default=a})),define("consul-ui/components/consul/discovery-chain/resolver-card/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"o/2vY0FQ",block:'[[[10,0],[14,0,"resolver-card"],[12],[1,"\\n  "],[11,"header"],[17,1],[16,"onclick",[28,[37,0],[[30,2]],null]],[16,1,[28,[37,1],["resolver:",[30,3,["ID"]]],null]],[12],[1,"\\n    "],[10,3],[14,3,""],[12],[1,"\\n      "],[10,"h3"],[12],[1,[30,3,["Name"]]],[13],[1,"\\n"],[41,[30,3,["Failover"]],[[[1,"      "],[10,"dl"],[14,0,"failover"],[12],[1,"\\n        "],[11,"dt"],[4,[38,3],[[28,[37,1],[[30,3,["Failover","Type"]]," failover"],null]],null],[12],[1,"\\n          "],[1,[28,[35,1],[[30,3,["Failover","Type"]]," failover"],null]],[1,"\\n        "],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[10,"ol"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[30,3,["Failover","Targets"]]],null]],null],null,[[[1,"            "],[10,"li"],[12],[10,1],[12],[1,[30,4]],[13],[13],[1,"\\n"]],[4]],null],[1,"          "],[13],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n"]],[]],null],[1,"    "],[13],[1,"\\n  "],[13],[1,"\\n"],[41,[28,[37,6],[[30,3,["Children","length"]],0],null],[[[1,"    "],[10,"ul"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[30,3,["Children"]]],null]],null],null,[[[1,"      "],[11,"li"],[16,"onclick",[28,[37,0],[[30,2]],null]],[16,1,[28,[37,1],["resolver:",[30,5,["ID"]]],null]],[4,[38,7],[[28,[37,8],[[28,[37,9],[[30,5],"rect"],null]],[["from"],[[30,6]]]]],null],[12],[1,"\\n        "],[10,3],[14,3,""],[12],[1,"\\n"],[41,[30,5,["Redirect"]],[[[1,"          "],[10,"dl"],[14,0,"redirect"],[12],[1,"\\n            "],[11,"dt"],[4,[38,3],[[28,[37,1],[[30,5,["Redirect"]]," redirect"],null]],null],[12],[1,"\\n              "],[1,[30,5,["Redirect"]]],[1," redirect\\n            "],[13],[1,"\\n            "],[10,"dd"],[12],[1,"\\n              "],[1,[30,5,["Name"]]],[1,"\\n            "],[13],[1,"\\n          "],[13],[1,"\\n"],[41,[30,5,["Failover"]],[[[1,"            "],[10,"dl"],[14,0,"failover"],[12],[1,"\\n              "],[11,"dt"],[4,[38,3],[[28,[37,1],[[30,5,["Failover","Type"]]," failover"],null]],null],[12],[1,"\\n                "],[1,[30,5,["Failover","Type"]]],[1," failover\\n              "],[13],[1,"\\n              "],[10,"dd"],[12],[1,"\\n                "],[10,"ol"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[30,5,["Failover","Targets"]]],null]],null],null,[[[1,"                  "],[10,"li"],[12],[1,"\\n                    "],[10,1],[12],[1,[30,7]],[13],[1,"\\n                  "],[13],[1,"\\n"]],[7]],null],[1,"                "],[13],[1,"\\n              "],[13],[1,"\\n            "],[13],[1,"\\n"]],[]],null]],[]],[[[41,[30,5,["Failover"]],[[[1,"          "],[1,[30,5,["Name"]]],[1,"\\n          "],[10,"dl"],[14,0,"failover"],[12],[1,"\\n            "],[11,"dt"],[4,[38,3],[[28,[37,1],[[30,5,["Failover","Type"]]," failover"],null]],null],[12],[1,"\\n              "],[1,[28,[35,1],[[30,5,["Failover","Type"]]," failover"],null]],[1,"\\n            "],[13],[1,"\\n            "],[10,"dd"],[12],[1,"\\n              "],[10,"ol"],[12],[1,"\\n"],[42,[28,[37,5],[[28,[37,5],[[30,5,["Failover","Targets"]]],null]],null],null,[[[1,"                "],[10,"li"],[12],[1,"\\n                  "],[10,1],[12],[1,[30,8]],[13],[1,"\\n                "],[13],[1,"\\n"]],[8]],null],[1,"              "],[13],[1,"\\n            "],[13],[1,"\\n          "],[13],[1,"\\n"]],[]],[[[1,"          "],[1,[30,5,["Name"]]],[1,"\\n    "]],[]]]],[]]],[1,"        "],[13],[1,"\\n      "],[13],[1,"\\n"]],[5]],null],[1,"    "],[13],[1,"\\n"]],[]],null],[13],[1,"\\n"]],["&attrs","@onclick","@item","item","child","@edges","target","target"],false,["optional","concat","if","tooltip","each","-track-array","gt","on-resize","dom-position","set"]]',moduleName:"consul-ui/components/consul/discovery-chain/resolver-card/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/discovery-chain/route-card/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,n.createTemplateFactory)({id:"fiqUKMeE",block:'[[[11,3],[24,0,"route-card"],[16,"onclick",[30,1]],[16,1,[30,2,["ID"]]],[17,3],[12],[1,"\\n  "],[10,"header"],[15,0,[52,[28,[37,1],[[30,0,["path","value"]],"/"],null],"short"]],[12],[1,"\\n"],[41,[28,[37,2],[[30,2,["Definition","Match","HTTP","Methods","length"]],0],null],[[[1,"    "],[10,"ul"],[14,0,"match-methods"],[12],[1,"\\n"],[42,[28,[37,4],[[28,[37,4],[[30,2,["Definition","Match","HTTP","Methods"]]],null]],null],null,[[[1,"        "],[10,"li"],[12],[1,[30,4]],[13],[1,"\\n"]],[4]],null],[1,"    "],[13],[1,"\\n"]],[]],null],[1,"    "],[10,"dl"],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        "],[1,[30,0,["path","type"]]],[1,"\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[1,[30,0,["path","value"]]],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n"],[41,[28,[37,2],[[30,2,["Definition","Match","HTTP","Header","length"]],0],null],[[[1,"  "],[10,"section"],[14,0,"match-headers"],[12],[1,"\\n    "],[11,"header"],[4,[38,5],["Header"],null],[12],[1,"\\n      "],[10,"h4"],[12],[1,"Headers"],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,"dl"],[12],[1,"\\n"],[42,[28,[37,4],[[28,[37,4],[[30,2,["Definition","Match","HTTP","Header"]]],null]],null],null,[[[1,"      "],[10,"dt"],[12],[1,"\\n        "],[1,[30,5,["Name"]]],[1,"\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[1,[28,[35,6],[[30,5]],null]],[1,"\\n      "],[13],[1,"\\n"]],[5]],null],[1,"    "],[13],[1,"\\n  "],[13],[1,"\\n"]],[]],null],[41,[28,[37,2],[[30,2,["Definition","Match","HTTP","QueryParam","length"]],0],null],[[[1,"  "],[10,"section"],[14,0,"match-queryparams"],[12],[1,"\\n    "],[11,"header"],[4,[38,5],["Query Params"],null],[12],[1,"\\n      "],[10,"h4"],[12],[1,"Query Params"],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,"dl"],[12],[1,"\\n"],[42,[28,[37,4],[[28,[37,4],[[30,2,["Definition","Match","HTTP","QueryParam"]]],null]],null],null,[[[1,"      "],[10,"dt"],[12],[1,"\\n        "],[1,[30,6,["Name"]]],[1,"\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[1,[28,[35,6],[[30,6]],null]],[1,"\\n      "],[13],[1,"\\n"]],[6]],null],[1,"    "],[13],[1,"\\n  "],[13],[1,"\\n"]],[]],null],[13],[1,"\\n"]],["@onclick","@item","&attrs","item","item","item"],false,["if","eq","gt","each","-track-array","tooltip","route-match"]]',moduleName:"consul-ui/components/consul/discovery-chain/route-card/index.hbs",isStrictMode:!1})
-class o extends l.default{get path(){return Object.entries((0,r.get)(this.args.item,"Definition.Match.HTTP")||{}).reduce((function(e,t){let[n,l]=t
-return n.toLowerCase().startsWith("path")?{type:n.replace("Path",""),value:l}:e}),{type:"Prefix",value:"/"})}}e.default=o,(0,t.setComponentTemplate)(i,o)})),define("consul-ui/components/consul/discovery-chain/splitter-card/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"RQh8TKeM",block:'[[[10,0],[12],[1,"\\n  "],[11,3],[17,1],[16,1,[30,2,["ID"]]],[24,0,"splitter-card"],[16,"onclick",[28,[37,0],[[30,3]],null]],[12],[1,"\\n    "],[10,"header"],[12],[1,"\\n      "],[10,"h3"],[12],[1,[30,2,["Name"]]],[13],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n"]],["&attrs","@item","@onclick"],false,["optional"]]',moduleName:"consul-ui/components/consul/discovery-chain/splitter-card/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/discovery-chain/utils",["exports"],(function(e){function t(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function n(e){for(var n=1;n<arguments.length;n++){var r=null!=arguments[n]?arguments[n]:{}
-n%2?t(Object(r),!0).forEach((function(t){l(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):t(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.createRoute=e.getResolvers=e.getRoutes=e.getSplitters=e.getAlternateServices=void 0
-const r=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=arguments.length>1?arguments[1]:void 0
-return Object.values(e).filter((e=>e.Type===t))},i=function(e,t){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"default",l=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"default",r=arguments.length>4?arguments[4]:void 0
-return void 0===e[t]&&(e[t]={ID:`${t}.${n}.${l}.${r}`,Name:t,Children:[]}),e[t]},o=function(e,t){let n
-const l=e.map((function(e){const[l,r]=[t,e].map((e=>e.split(".").reverse())),i=["Datacenter","Partition","Namespace","Service","Subset"]
-return r.find((function(e,t){const r=e!==l[t]
-return r&&(n=i[t]),r}))}))
-return{Type:n,Targets:l}}
-e.getAlternateServices=o
-e.getSplitters=function(e){return r(e,"splitter").map((function(e){const t=e.Name.split(".")
-return t.reverse(),t.shift(),t.shift(),t.reverse(),n(n({},e),{},{ID:`splitter:${e.Name}`,Name:t.join(".")})}))}
-e.getRoutes=function(e,t){return r(e,"router").reduce((function(e,n){return e.concat(n.Routes.map((function(e,l){return a(e,n.Name,t)})))}),[])}
-e.getResolvers=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"default",n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"default",l=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{},r=arguments.length>4&&void 0!==arguments[4]?arguments[4]:{}
-const a={}
-return Object.values(r).filter((e=>"resolver"===e.Type)).forEach((function(l){const r=l.Name.split(".")
-let u
-r.length>4&&(u=r.shift()),r.reverse(),r.shift(),r.shift(),r.shift(),r.reverse()
-const s=r.join("."),c=i(a,s,n,t,e)
-let d
-if(void 0!==l.Resolver.Failover&&(d=o(l.Resolver.Failover.Targets,l.Name)),u){const e={Subset:!0,ID:l.Name,Name:u}
-void 0!==d&&(e.Failover=d),c.Children.push(e)}else void 0!==d&&(c.Failover=d)})),Object.values(l).forEach((l=>{if(void 0!==r[`resolver:${l.ID}`]){const u=o([l.ID],`service.${n}.${t}.${e}`)
-if("Service"!==u.Type){const s=i(a,l.Service,n,t,e),c={Redirect:u.Type,ID:l.ID,Name:l[u.Type]}
-void 0!==r[`resolver:${l.ID}`].Resolver.Failover&&(c.Failover=o(r[`resolver:${l.ID}`].Resolver.Failover.Targets,l.ID)),s.Children.push(c)}}})),Object.values(a)}
-const a=function(e,t,l){return n(n({},e),{},{Default:e.Default||void 0===e.Definition.Match,ID:`route:${t}-${l(e.Definition)}`})}
-e.createRoute=a})),define("consul-ui/components/consul/exposed-path/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"gs8UZz5a",block:'[[[11,0],[24,0,"consul-exposed-path-list"],[17,1],[12],[1,"\\n  "],[10,"ul"],[12],[1,"\\n"],[42,[28,[37,1],[[28,[37,1],[[30,2]],null]],null],null,[[[1,"    "],[10,"li"],[12],[1,"\\n      "],[10,0],[14,0,"header"],[12],[1,"\\n"],[44,[[28,[37,3],[[30,4],":",[30,3,["ListenerPort"]],[30,3,["Path"]]],null]],[[[1,"        "],[10,2],[14,0,"combined-address"],[12],[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[30,5]],[1,"\\n          "],[13],[1,"\\n          "],[8,[39,4],null,[["@value","@name"],[[30,5],"Address"]],null],[1,"\\n        "],[13],[1,"\\n"]],[5]]],[1,"      "],[13],[1,"\\n      "],[10,0],[14,0,"detail"],[12],[1,"\\n"],[41,[30,3,["Protocol"]],[[[1,"        "],[10,"dl"],[14,0,"protocol"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"\\n            "],[8,[39,6],null,null,[["default"],[[[[1,"\\n                Protocol\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[1,[30,3,["Protocol"]]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[30,3,["ListenerPort"]],[[[1,"        "],[10,"dl"],[14,0,"port"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"\\n            "],[8,[39,6],null,null,[["default"],[[[[1,"\\n              Listener Port\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            listening on :"],[1,[30,3,["ListenerPort"]]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[30,3,["LocalPathPort"]],[[[1,"        "],[10,"dl"],[14,0,"port"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"\\n            "],[8,[39,6],null,null,[["default"],[[[[1,"\\n              Local Path Port\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            local port :"],[1,[30,3,["LocalPathPort"]]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[30,3,["Path"]],[[[1,"        "],[10,"dl"],[14,0,"path"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"\\n            "],[8,[39,6],null,null,[["default"],[[[[1,"\\n              Path\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[1,[30,3,["Path"]]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[1,"      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[3]],null],[1,"  "],[13],[1,"\\n"],[13],[1,"\\n"]],["&attrs","@items","path","@address","combinedAddress"],false,["each","-track-array","let","concat","copy-button","if","tooltip"]]',moduleName:"consul-ui/components/consul/exposed-path/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/external-source/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"qg6NqCwn",block:'[[[41,[30,1],[[[44,[[28,[37,2],[[30,1]],null]],[[[41,[28,[37,3],[[30,3],[28,[37,4],[[30,2],"consul-api-gateway"],null]],null],[[[1,"        "],[10,"dl"],[14,0,"tooltip-panel"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"\\n            "],[11,1],[24,0,"consul-external-source"],[17,4],[12],[1,"\\n              "],[8,[39,5],[[24,0,"mr-1.5 w-4 h-4"]],[["@name"],[[28,[37,6],[[30,2]],null]]],null],[1,"\\n              Registered via "],[1,[28,[35,7],[[28,[37,8],["common.brand.",[30,2]],null]],null]],[1,"\\n            "],[13],[1,"\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[8,[39,9],null,[["@position","@menu"],["left",false]],[["default"],[[[[1,"\\n              "],[8,[39,10],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                API Gateways manage north-south traffic from external services to services in the Datacenter. For more information, read our documentation.\\n              "]],[]]]]],[1,"\\n              "],[8,[39,10],null,[["@name"],["menu"]],[["default"],[[[[1,"\\n                "],[10,"li"],[14,"role","separator"],[12],[1,"\\n                  About "],[1,[28,[35,7],[[28,[37,8],["common.brand.",[30,2]],null]],null]],[1,"\\n                "],[13],[1,"\\n                "],[10,"li"],[14,"role","none"],[14,0,"learn-link"],[12],[1,"\\n                  "],[10,3],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[28,[37,8],[[28,[37,11],["CONSUL_DOCS_LEARN_URL"],null]],null]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"\\n                    Learn guides\\n                  "],[13],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],[[[41,[30,2],[[[1,"    "],[11,1],[24,0,"consul-external-source"],[17,4],[12],[1,"\\n      "],[8,[39,5],[[24,0,"mr-1.5 h-4 w-4"]],[["@name","@color"],[[28,[37,6],[[30,2]],null],"var(--token-color-hashicorp-brand)"]],null],[1,"\\n"],[41,[30,5],[[[1,"        "],[1,[30,5]],[1,"\\n"]],[]],[[[1,"        Registered via "],[1,[28,[35,7],[[28,[37,8],["common.brand.",[30,2]],null]],null]],[1,"\\n"]],[]]],[1,"    "],[13],[1,"\\n  "]],[]],null]],[]]]],[2]]]],[]],null]],["@item","externalSource","@withInfo","&attrs","@label"],false,["if","let","service/external-source","and","eq","flight-icon","icon-mapping","t","concat","menu-panel","block-slot","env"]]',moduleName:"consul-ui/components/consul/external-source/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/hcp/home/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"0fh1ph90",block:'[[[11,0],[24,0,"consul-hcp-home"],[17,1],[12],[1,"\\n  "],[10,3],[15,6,[28,[37,0],["CONSUL_HCP_URL"],null]],[14,"data-native-href","true"],[12],[1,"\\n    Back to HCP\\n  "],[13],[1,"\\n"],[13],[1,"\\n"]],["&attrs"],false,["env"]]',moduleName:"consul-ui/components/consul/hcp/home/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/health-check/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"L0W/wK5V",block:'[[[11,0],[24,0,"consul-health-check-list"],[17,1],[12],[1,"\\n  "],[10,"ul"],[12],[1,"\\n"],[42,[28,[37,1],[[28,[37,1],[[30,2]],null]],null],null,[[[1,"    "],[10,"li"],[15,0,[28,[37,2],["health-check-output ",[30,3,["Status"]]],null]],[12],[1,"\\n      "],[10,0],[12],[1,"\\n        "],[10,"header"],[12],[1,"\\n          "],[10,"h2"],[12],[1,[30,3,["Name"]]],[13],[1,"\\n        "],[13],[1,"\\n        "],[10,"dl"],[12],[1,"\\n"],[41,[28,[37,4],[[30,3,["Kind"]],"node"],null],[[[1,"          "],[10,"dt"],[12],[1,"NodeName"],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,3,["Node"]]],[13],[1,"\\n"]],[]],[[[1,"          "],[10,"dt"],[12],[1,"ServiceName"],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,3,["ServiceName"]]],[13],[1,"\\n"]],[]]],[1,"        "],[13],[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"CheckID"],[13],[1,"\\n          "],[10,"dd"],[12],[1,[28,[35,5],[[30,3,["CheckID"]],"-"],null]],[13],[1,"\\n        "],[13],[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"Type"],[13],[1,"\\n          "],[10,"dd"],[14,"data-health-check-type",""],[12],[1,"\\n            "],[1,[30,3,["Type"]]],[1,"\\n"],[41,[30,3,["Exposed"]],[[[1,"            "],[11,"em"],[4,[38,6],["Expose.checks is set to true, so all registered HTTP and gRPC check paths are exposed through Envoy for the Consul agent."],null],[12],[1,"Exposed"],[13],[1,"\\n"]],[]],null],[1,"          "],[13],[1,"\\n        "],[13],[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"Notes"],[13],[1,"\\n          "],[10,"dd"],[12],[1,[28,[35,5],[[30,3,["Notes"]],"-"],null]],[13],[1,"\\n        "],[13],[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"Output"],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n              "],[10,"pre"],[12],[10,"code"],[12],[1,[30,3,["Output"]]],[13],[13],[1,"\\n              "],[8,[39,7],null,[["@value","@name"],[[30,3,["Output"]],"output"]],null],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[3]],null],[1,"  "],[13],[1,"\\n"],[13],[1,"\\n"]],["&attrs","@items","item"],false,["each","-track-array","concat","if","eq","or","tooltip","copy-button"]]',moduleName:"consul-ui/components/consul/health-check/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i}))
-define("consul-ui/components/consul/health-check/search-bar/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"UNgiEnUJ",block:'[[[8,[39,0],[[24,0,"consul-healthcheck-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","filter","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.health-check.search-bar.",[30,3,["status","key"]],".name"],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.health-check.search-bar.",[30,3,["status","key"]],".options.",[30,3,["status","value"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n    "]],[3]],[[[1,"\\n      "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,5],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n"],[41,[30,2,["searchproperty"]],[[[1,"        "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n          "],[8,[39,7],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,"\\n              "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,7],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Optgroup"]],[30,9,["Option"]]],[[[42,[28,[37,9],[[28,[37,9],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"              "],[8,[30,11],null,[["@value","@selected"],[[30,12],[28,[37,10],[[30,12],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,11],[[30,12]],null]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[12]],null]],[10,11]]],[1,"          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n    "]],[6]],[[[1,"\\n      "],[8,[30,13,["Select"]],[[24,0,"type-status"]],[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["status","change"]]],null],true]],[["default"],[[[[1,"\\n        "],[8,[39,7],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[28,[35,2],["common.consul.status"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,7],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,14,["Optgroup"]],[30,14,["Option"]]],[[[42,[28,[37,9],[[28,[37,9],[[28,[37,4],["passing","warning","critical","empty"],null]],null]],null],null,[[[1,"          "],[8,[30,16],[[16,0,[29,["value-",[30,17]]]]],[["@value","@selected"],[[30,17],[28,[37,10],[[30,17],[30,2,["status","value"]]],null]]],[["default"],[[[[1,"\\n            "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[30,17]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,17]],null]],null]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[17]],null]],[15,16]]],[1,"        "]],[]]]]],[1,"\\n      "]],[14]]]]],[1,"\\n"],[41,[30,2,["kind"]],[[[1,"      "],[8,[30,13,["Select"]],[[24,0,"type-kind"]],[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["kind","change"]]],null],true]],[["default"],[[[[1,"\\n        "],[8,[39,7],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[28,[35,2],["components.consul.health-check.search-bar.kind.name"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,7],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,18,["Optgroup"]],[30,18,["Option"]]],[[[42,[28,[37,9],[[28,[37,9],[[28,[37,4],["service","node"],null]],null]],null],null,[[[1,"          "],[8,[30,20],null,[["@value","@selected"],[[30,21],[28,[37,10],[[30,21],[30,2,["kind","value"]]],null]]],[["default"],[[[[1,"\\n            "],[1,[28,[35,2],[[28,[37,3],["components.consul.health-check.search-bar.kind.options.",[30,21]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,21]],null]],null]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[21]],null]],[19,20]]],[1,"        "]],[]]]]],[1,"\\n      "]],[18]]]]],[1,"\\n"]],[]],null],[1,"      "],[8,[30,13,["Select"]],[[24,0,"type-check"]],[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["check","change"]]],null],true]],[["default"],[[[[1,"\\n        "],[8,[39,7],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[28,[35,2],["components.consul.health-check.search-bar.check.name"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,7],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,22,["Optgroup"]],[30,22,["Option"]]],[[[42,[28,[37,9],[[28,[37,9],[[28,[37,4],["alias","docker","grpc","http","script","serf","tcp","ttl"],null]],null]],null],null,[[[1,"          "],[8,[30,24],null,[["@value","@selected"],[[30,25],[28,[37,10],[[30,25],[30,2,["check","value"]]],null]]],[["default"],[[[[1,"\\n            "],[1,[28,[35,2],[[28,[37,3],["components.consul.health-check.search-bar.check.options.",[30,25]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,25]],null]],null]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[25]],null]],[23,24]]],[1,"        "]],[]]]]],[1,"\\n      "]],[22]]]]],[1,"\\n    "]],[13]],[[[1,"\\n      "],[8,[30,26,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,27,["change"]]],null],false,true]],[["default"],[[[[1,"\\n        "],[8,[39,7],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n"],[44,[[28,[37,12],[[28,[37,4],[[28,[37,4],["Name:asc",[28,[37,2],["common.sort.alpha.asc"],null]],null],[28,[37,4],["Name:desc",[28,[37,2],["common.sort.alpha.desc"],null]],null],[28,[37,4],["Status:asc",[28,[37,2],["common.sort.status.asc"],null]],null],[28,[37,4],["Status:desc",[28,[37,2],["common.sort.status.desc"],null]],null],[28,[37,4],["Kind:asc",[28,[37,2],["components.consul.health-check.search-bar.sort.kind.asc"],null]],null],[28,[37,4],["Kind:desc",[28,[37,2],["components.consul.health-check.search-bar.sort.kind.desc"],null]],null]],null]],null]],[[[1,"              "],[1,[28,[35,13],[[30,29],[30,27,["value"]]],null]],[1,"\\n"]],[29]]],[1,"          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,7],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,28,["Optgroup"]],[30,28,["Option"]]],[[[1,"        "],[8,[30,30],null,[["@label"],[[28,[37,2],["common.consul.status"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,31],null,[["@value","@selected"],["Status:asc",[28,[37,14],["Status:asc",[30,27,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.status.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,31],null,[["@value","@selected"],["Status:desc",[28,[37,14],["Status:desc",[30,27,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.status.desc"],null]]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[30,30],null,[["@label"],[[28,[37,2],["components.consul.health-check.search-bar.sort.name.name"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,31],null,[["@value","@selected"],["Name:asc",[28,[37,14],["Name:asc",[30,27,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,31],null,[["@value","@selected"],["Name:desc",[28,[37,14],["Name:desc",[30,27,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[30,30],null,[["@label"],[[28,[37,2],["components.consul.health-check.search-bar.sort.kind.name"],null]]],[["default"],[[[[1,"\\n          "],[8,[30,31],null,[["@value","@selected"],["Kind:asc",[28,[37,14],["Kind:asc",[30,27]],null]]],[["default"],[[[[1,"Service to Node"]],[]]]]],[1,"\\n          "],[8,[30,31],null,[["@value","@selected"],["Kind:desc",[28,[37,14],["Kind:desc",[30,27]],null]]],[["default"],[[[[1,"Node to Service"]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[30,31]]],[1,"        "]],[]]]]],[1,"\\n      "]],[28]]]]],[1,"\\n    "]],[26]]]]]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Optgroup","Option","prop","search","components","Optgroup","Option","state","components","Optgroup","Option","item","components","Optgroup","Option","item","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","action","if","block-slot","each","-track-array","includes","lowercase","from-entries","get","eq"]]',moduleName:"consul-ui/components/consul/health-check/search-bar/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/instance-checks/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"ddRn9Bp0",block:'[[[44,[[28,[37,1],["Status",[28,[37,2],[[30,1],[28,[37,3],null,null]],null]],null]],[[[44,[[28,[37,2],[[52,[28,[37,5],[[30,2,["critical","length"]],0],null],[30,2,["critical"]]],[52,[28,[37,5],[[30,2,["warning","length"]],0],null],[30,2,["warning"]]],[52,[28,[37,5],[[30,2,["passing","length"]],0],null],[30,2,["passing"]]],[28,[37,3],null,null]],null]],[[[44,[[30,3,["firstObject","Status"]]],[[[1,"    "],[11,"dl"],[16,0,[28,[37,6],["consul-instance-checks",[28,[37,3],["empty",[28,[37,7],[[30,3,["length"]],0],null]],null],[28,[37,3],[[30,4],[28,[37,8],[[30,3,["length"]],0],null]],null]],null]],[17,5],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        "],[8,[39,9],null,null,[["default"],[[[[1,"\\n          "],[1,[28,[35,10],[[30,6]],null]],[1," Checks\\n        "]],[]]]]],[1,"\\n      "],[13],[1,"\\n"],[44,[[28,[37,2],[[52,[28,[37,7],[[30,4],"critical"],null],"failing"],[52,[28,[37,7],[[30,4],"warning"],null],"with a warning"],[30,4]],null]],[[[1,"        "],[10,"dd"],[12],[1,"\\n          "],[1,[28,[35,2],[[52,[28,[37,7],[[30,3,["length"]],0],null],[28,[37,11],["No ",[30,6]," checks"],null]],[52,[28,[37,7],[[30,3,["length"]],[30,1,["length"]]],null],[28,[37,11],["All ",[30,6]," checks ",[30,7]],null]],[28,[37,11],[[30,3,["length"]],"/",[30,1,["length"]]," ",[30,6]," checks ",[30,7]],null]],null]],[1,"\\n        "],[13],[1,"\\n"]],[7]]],[1,"    "],[13],[1,"\\n"]],[4]]]],[3]]]],[2]]]],["@items","grouped","checks","status","&attrs","@type","humanized"],false,["let","group-by","or","array","if","gt","class-map","eq","not-eq","tooltip","capitalize","concat"]]',moduleName:"consul-ui/components/consul/instance-checks/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/intention/form/fieldsets/index",["exports","@ember/component","@ember/template-factory"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,n.createTemplateFactory)({id:"fVbLeBz9",block:'[[[11,0],[17,1],[24,0,"consul-intention-fieldsets"],[12],[1,"\\n  "],[10,"fieldset"],[15,"disabled",[36,0]],[12],[1,"\\n    "],[10,0],[14,"role","group"],[12],[1,"\\n      "],[10,"fieldset"],[12],[1,"\\n        "],[10,"h2"],[12],[1,"Source"],[13],[1,"\\n        "],[10,"label"],[15,0,[29,["type-select",[52,[33,2,["error","SourceName"]]," has-error"]]]],[12],[1,"\\n          "],[10,1],[12],[1,"Source Service"],[13],[1,"\\n          "],[8,[39,3],null,[["@disabled","@options","@searchField","@selected","@searchPlaceholder","@buildSuggestion","@showCreateWhen","@onCreate","@onChange"],[[28,[37,4],[[33,5]],null],[99,6,["@options"]],"Name",[99,7,["@selected"]],"Type service name",[28,[37,8],[[30,0],"createNewLabel","Use a Consul Service called \'{{term}}\'"],null],[28,[37,8],[[30,0],"isUnique",[33,6]],null],[28,[37,8],[[30,0],[33,9],"SourceName"],null],[28,[37,8],[[30,0],[33,9],"SourceName"],null]]],[["default"],[[[[1,"\\n"],[41,[28,[37,10],[[30,2,["Name"]],"*"],null],[[[1,"                    * (All Services)\\n"]],[]],[[[1,"                    "],[1,[30,2,["Name"]]],[1,"\\n"]],[]]],[1,"          "]],[2]]]]],[1,"\\n"],[41,[33,5],[[[1,"          "],[10,"em"],[12],[1,"Search for an existing service, or enter any Service name."],[13],[1,"\\n"]],[]],null],[1,"        "],[13],[1,"\\n"],[41,[28,[37,11],["choose nspaces"],null],[[[1,"        "],[10,"label"],[15,0,[29,["type-select",[52,[33,2,["error","SourceNS"]]," has-error"]]]],[12],[1,"\\n          "],[10,1],[12],[1,"Source Namespace"],[13],[1,"\\n          "],[8,[39,3],null,[["@disabled","@options","@selected","@searchPlaceholder","@buildSuggestion","@showCreateWhen","@onCreate","@onChange"],[[28,[37,4],[[33,5]],null],[99,12,["@options"]],[99,13,["@selected"]],"Type namespace name",[28,[37,8],[[30,0],"createNewLabel","Use a Consul Namespace called \'{{term}}\'"],null],[28,[37,8],[[30,0],"isUnique",[33,12]],null],[28,[37,8],[[30,0],[33,9],"SourceNS"],null],[28,[37,8],[[30,0],[33,9],"SourceNS"],null]]],[["default"],[[[[1,"\\n"],[41,[28,[37,10],[[30,3,["Name"]],"*"],null],[[[1,"                  * (All Namespaces)\\n"]],[]],[[[1,"                  "],[1,[30,3,["Name"]]],[1,"\\n"]],[]]],[1,"          "]],[3]]]]],[1,"\\n"],[41,[33,5],[[[1,"          "],[10,"em"],[12],[1,"Search for an existing namespace, or enter any Namespace name."],[13],[1,"\\n"]],[]],null],[1,"        "],[13],[1,"\\n"]],[]],null],[41,[28,[37,11],["choose partitions"],[["dc"],[[30,4]]]],[[[1,"        "],[10,"label"],[15,0,[29,["type-select",[52,[33,2,["error","SourcePartition"]]," has-error"]]]],[12],[1,"\\n          "],[10,1],[12],[1,"Source Partition"],[13],[1,"\\n          "],[8,[39,3],null,[["@disabled","@options","@selected","@searchPlaceholder","@buildSuggestion","@showCreateWhen","@onCreate","@onChange"],[[28,[37,4],[[33,5]],null],[99,14,["@options"]],[99,15,["@selected"]],"Type partition name",[28,[37,8],[[30,0],"createNewLabel","Use a Consul Partition called \'{{term}}\'"],null],[28,[37,8],[[30,0],"isUnique",[33,14]],null],[28,[37,8],[[30,0],[33,9],"SourcePartition"],null],[28,[37,8],[[30,0],[33,9],"SourcePartition"],null]]],[["default"],[[[[1,"\\n                "],[1,[30,5,["Name"]]],[1,"\\n          "]],[5]]]]],[1,"\\n"],[41,[33,5],[[[1,"          "],[10,"em"],[12],[1,"Search for an existing partition, or enter any Partition name."],[13],[1,"\\n"]],[]],null],[1,"        "],[13],[1,"\\n"]],[]],null],[1,"      "],[13],[1,"\\n      "],[10,"fieldset"],[12],[1,"\\n        "],[10,"h2"],[12],[1,"Destination"],[13],[1,"\\n        "],[10,"label"],[15,0,[29,["type-select",[52,[33,2,["error","DestinationName"]]," has-error"]]]],[12],[1,"\\n          "],[10,1],[12],[1,"Destination Service"],[13],[1,"\\n          "],[8,[39,3],null,[["@disabled","@options","@searchField","@selected","@searchPlaceholder","@buildSuggestion","@showCreateWhen","@onCreate","@onChange"],[[28,[37,4],[[33,5]],null],[99,6,["@options"]],"Name",[99,16,["@selected"]],"Type service name",[28,[37,8],[[30,0],"createNewLabel","Use a Consul Service called \'{{term}}\'"],null],[28,[37,8],[[30,0],"isUnique",[33,6]],null],[28,[37,8],[[30,0],[33,9],"DestinationName"],null],[28,[37,8],[[30,0],[33,9],"DestinationName"],null]]],[["default"],[[[[1,"\\n"],[41,[28,[37,10],[[30,6,["Name"]],"*"],null],[[[1,"                    * (All Services)\\n"]],[]],[[[1,"                    "],[1,[30,6,["Name"]]],[1,"\\n"]],[]]],[1,"          "]],[6]]]]],[1,"\\n"],[41,[33,5],[[[1,"          "],[10,"em"],[12],[1,"Search for an existing service, or enter any Service name."],[13],[1,"\\n"]],[]],null],[1,"        "],[13],[1,"\\n"],[41,[28,[37,11],["choose nspaces"],null],[[[1,"        "],[10,"label"],[15,0,[29,["type-select",[52,[33,2,["error","DestinationNS"]]," has-error"]]]],[12],[1,"\\n          "],[10,1],[12],[1,"Destination Namespace"],[13],[1,"\\n          "],[8,[39,3],null,[["@disabled","@options","@searchField","@selected","@searchPlaceholder","@buildSuggestion","@showCreateWhen","@onCreate","@onChange"],[[28,[37,4],[[33,5]],null],[99,12,["@options"]],"Name",[99,17,["@selected"]],"Type namespace name",[28,[37,8],[[30,0],"createNewLabel","Use a future Consul Namespace called \'{{term}}\'"],null],[28,[37,8],[[30,0],"isUnique",[33,12]],null],[28,[37,8],[[30,0],[33,9],"DestinationNS"],null],[28,[37,8],[[30,0],[33,9],"DestinationNS"],null]]],[["default"],[[[[1,"\\n"],[41,[28,[37,10],[[30,7,["Name"]],"*"],null],[[[1,"                    * (All Namespaces)\\n"]],[]],[[[1,"                    "],[1,[30,7,["Name"]]],[1,"\\n"]],[]]],[1,"          "]],[7]]]]],[1,"\\n"],[41,[33,5],[[[1,"          "],[10,"em"],[12],[1,"For the destination, you may choose any namespace for which you have access."],[13],[1,"\\n"]],[]],null],[1,"        "],[13],[1,"\\n"]],[]],null],[41,[28,[37,11],["choose partitions"],[["dc"],[[30,4]]]],[[[1,"        "],[10,"label"],[15,0,[29,["type-select",[52,[33,2,["error","DestinationPartition"]]," has-error"]]]],[12],[1,"\\n          "],[10,1],[12],[1,"Destination Partition"],[13],[1,"\\n          "],[8,[39,3],null,[["@disabled","@options","@searchField","@selected","@searchPlaceholder","@buildSuggestion","@showCreateWhen","@onCreate","@onChange"],[[28,[37,4],[[33,5]],null],[99,14,["@options"]],"Name",[99,18,["@selected"]],"Type partition name",[28,[37,8],[[30,0],"createNewLabel","Use a future Consul Partition called \'{{term}}\'"],null],[28,[37,8],[[30,0],"isUnique",[33,14]],null],[28,[37,8],[[30,0],[33,9],"DestinationPartition"],null],[28,[37,8],[[30,0],[33,9],"DestinationPartition"],null]]],[["default"],[[[[1,"\\n                "],[1,[30,8,["Name"]]],[1,"\\n          "]],[8]]]]],[1,"\\n"],[41,[33,5],[[[1,"          "],[10,"em"],[12],[1,"For the destination, you may choose any partition for which you have access."],[13],[1,"\\n"]],[]],null],[1,"        "],[13],[1,"\\n"]],[]],null],[1,"      "],[13],[1,"\\n    "],[13],[1,"\\n  "],[10,"fieldset"],[12],[1,"\\n    "],[10,"label"],[15,0,[29,["type-text",[52,[33,2,["error","Description"]]," has-error"]]]],[12],[1,"\\n      "],[10,1],[12],[1,"Description (Optional)"],[13],[1,"\\n      "],[10,"input"],[14,3,"Description"],[15,2,[33,2,["Description"]]],[14,"placeholder","Description (Optional)"],[15,"onchange",[28,[37,8],[[30,0],[33,9]],null]],[14,4,"text"],[12],[13],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n    "],[10,0],[12],[1,"\\n      "],[10,1],[14,0,"label"],[12],[1,"Should this source connect to the destination?"],[13],[1,"\\n      "],[10,0],[14,"role","radiogroup"],[15,0,[52,[33,2,["error","Action"]]," has-error"]],[12],[1,"\\n"],[42,[28,[37,20],[[28,[37,20],[[28,[37,21],[[28,[37,22],null,[["intent","header","body"],["allow","Allow","The source service will be allowed to connect to the destination."]]],[28,[37,22],null,[["intent","header","body"],["deny","Deny","The source service will not be allowed to connect to the destination."]]],[28,[37,22],null,[["intent","header","body"],["","Application Aware","The source service may or may not connect to the destination service via unique permissions based on Layer 7 criteria: path, header, or method."]]]],null]],null]],null],null,[[[1,"          "],[8,[39,23],[[16,0,[28,[37,24],["value-",[30,9,["intent"]]],null]]],[["@value","@checked","@onchange","@name"],[[30,9,["intent"]],[52,[28,[37,10],[[28,[37,25],[[33,2,["Action"]],""],null],[30,9,["intent"]]],null],"checked"],[28,[37,8],[[30,0],[33,9]],null],"Action"]],[["default"],[[[[1,"\\n            "],[10,"header"],[12],[1,"\\n              "],[1,[30,9,["header"]]],[1,"\\n            "],[13],[1,"\\n            "],[10,2],[12],[1,"\\n              "],[1,[30,9,["body"]]],[1,"\\n            "],[13],[1,"\\n          "]],[10]]]]],[1,"\\n"]],[9]],null],[1,"      "],[13],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n"],[41,[28,[37,10],[[28,[37,25],[[33,2,["Action"]],""],null],""],null],[[[1,"  "],[10,"fieldset"],[14,0,"permissions"],[12],[1,"\\n    "],[8,[39,26],[[4,[38,27],["click",[28,[37,8],[[30,0],[30,0,["openModal"]]],null]],null]],[["@text","@size","@color","@icon"],["Add permission","small","tertiary","plus"]],null],[1,"\\n    "],[10,"h2"],[12],[1,"Permissions"],[13],[1,"\\n"],[41,[28,[37,28],[[33,2,["Permissions","length"]],0],null],[[[1,"    "],[8,[39,29],null,null,null],[1,"\\n    "],[8,[39,30],null,[["@items","@onclick","@ondelete"],[[33,2,["Permissions"]],[28,[37,31],[[28,[37,8],[[30,0],[28,[37,32],[[33,33]],null]],null],[28,[37,8],[[30,0],[30,0,["openModal"]]],null]],null],[28,[37,8],[[30,0],"delete","Permissions",[33,2]],null]]],null],[1,"\\n"]],[]],[[[1,"    "],[8,[39,34],null,null,[["default"],[[[[1,"\\n      "],[8,[39,35],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"h3"],[12],[1,"\\n          No permissions yet\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,35],null,[["@name"],["body"]],[["default"],[[[[1,"\\n        "],[10,2],[12],[1,"\\n          Permissions intercept an Intention\'s traffic using Layer 7 criteria, such as path prefixes and http headers.\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,35],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n        "],[10,"li"],[12],[1,"\\n          "],[8,[39,36],null,[["@text","@href","@icon","@iconPosition","@size"],["Documentation",[29,[[28,[37,37],["CONSUL_DOCS_URL"],null],"/commands/intention"]],"docs-link","trailing","small"]],null],[1,"\\n        "],[13],[1,"\\n        "],[10,"li"],[12],[1,"\\n          "],[8,[39,36],null,[["@text","@href","@icon","@iconPosition","@size"],["Read the guide",[29,[[28,[37,37],["CONSUL_DOCS_LEARN_URL"],null],"/consul/getting-started/connect"]],"learn-link","trailing","small"]],null],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[]]],[1,"  "],[13],[1,"\\n"]],[]],null],[1,"\\n  "],[8,[39,38],[[24,0,"consul-intention-permission-modal"]],[["@onclose","@aria"],[[28,[37,8],[[30,0],[28,[37,32],[[33,33]],null],[27]],null],[28,[37,22],null,[["label"],["Edit Permission"]]]]],[["default"],[[[[1,"\\n    "],[8,[39,39],null,[["@target","@name","@value"],[[30,0],"modal",[30,11]]],null],[1,"\\n    "],[8,[39,35],null,[["@name"],["header"]],[["default"],[[[[1,"\\n      "],[10,"h3"],[12],[1,"Edit Permission"],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,35],null,[["@name"],["body"]],[["default"],[[[[1,"\\n      "],[8,[39,40],null,[["@item","@onsubmit"],[[99,33,["@item"]],[28,[37,8],[[30,0],"add","Permissions",[33,2]],null]]],[["default"],[[[[1,"\\n        "],[8,[39,39],null,[["@target","@name","@value"],[[30,0],"permissionForm",[30,12]]],null],[1,"\\n      "]],[12]]]]],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,35],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n      "],[8,[39,41],null,null,[["default"],[[[[1,"\\n        "],[8,[39,26],[[16,"disabled",[52,[28,[37,4],[[30,0,["permissionForm","isDirty"]]],null],"disabled"]],[16,"onclick",[28,[37,31],[[28,[37,8],[[30,0],[30,0,["permissionForm","submit"]]],null],[28,[37,8],[[30,0],[30,11,["close"]]],null]],null]]],[["@text","@color"],["Save","primary"]],null],[1,"\\n        "],[8,[39,26],[[16,"onclick",[28,[37,31],[[28,[37,8],[[30,0],[30,0,["permissionForm","reset"]]],null],[28,[37,8],[[30,0],[30,11,["close"]]],null]],null]]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[11]]]]],[1,"\\n\\n"],[13]],["&attrs","service","nspace","@dc","partition","service","nspace","partition","_action","radio","modal","permissionForm"],false,["disabled","if","item","power-select-with-create","not","create","services","SourceName","action","onchange","eq","can","nspaces","SourceNS","partitions","SourcePartition","DestinationName","DestinationNS","DestinationPartition","each","-track-array","array","hash","radio-card","concat","or","hds/button","on","gt","consul/intention/notice/permissions","consul/intention/permission/list","queue","mut","permission","empty-state","block-slot","hds/link/standalone","env","modal-dialog","ref","consul/intention/permission/form","hds/button-set"]]',moduleName:"consul-ui/components/consul/intention/form/fieldsets/index.hbs",isStrictMode:!1})
-var r=(0,t.setComponentTemplate)(l,t.default.extend({tagName:"",shouldShowPermissionForm:!1,openModal(){var e
-null===(e=this.modal)||void 0===e||e.open()},actions:{createNewLabel:function(e,t){return e.replace(/{{term}}/g,t)},isUnique:function(e,t){return!e.findBy("Name",t)},add:function(e,t,n){!(t.get(e)||[]).includes(n)&&n.isNew&&(t.pushObject(e,n),t.validate())},delete:function(e,t,n){(t.get(e)||[]).includes(n)&&(t.removeObject(e,n),t.validate())}}}))
-e.default=r})),define("consul-ui/components/consul/intention/form/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/service","@ember/object","@glimmer/tracking"],(function(e,t,n,l,r,i,o){var a,u,s,c,d,p,f,m,h,b,y,g,v
-function O(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function P(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const x=(0,n.createTemplateFactory)({id:"8yZp6UDg",block:'[[[11,0],[24,0,"consul-intention"],[17,1],[12],[1,"\\n"],[8,[39,0],null,[["@type","@dc","@nspace","@partition","@autofill","@item","@src","@onchange","@onsubmit"],["intention",[30,2,["Name"]],[30,3],[30,4],[30,5],[30,6],[30,7],[28,[37,1],[[30,0],[30,0,["change"]]],null],[28,[37,1],[[30,0],[30,0,["onsubmit"]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,2],null,[["@name"],["error"]],[["default"],[[[[1,"\\n"],[41,[28,[37,4],[[30,8,["error","detail"]],"duplicate intention found:"],null],[[[1,"  "],[8,[39,5],[[4,[38,6],null,[["after"],[[28,[37,1],[[30,0],[30,9]],null]]]]],[["@color"],["critical"]],[["default"],[[[[1,"\\n    "],[8,[30,10,["Title"]],null,null,[["default"],[[[[1,"Intention exists!"]],[]]]]],[1,"\\n    "],[8,[30,10,["Description"]],null,null,[["default"],[[[[1,"\\n      An intention already exists for this Source-Destination pair. Please enter a different combination of Services, or search the intentions to edit an existing intention.\\n    "]],[]]]]],[1,"\\n  "]],[10]]]]],[1,"\\n"]],[]],[[[1,"  "],[8,[39,5],[[4,[38,6],null,[["after"],[[28,[37,1],[[30,0],[30,9]],null]]]]],[["@color"],["critical"]],[["default"],[[[[1,"\\n    "],[8,[30,11,["Title"]],null,null,[["default"],[[[[1,"Error!"]],[]]]]],[1,"\\n    "],[8,[30,11,["Description"]],null,null,[["default"],[[[[1,"\\n      There was an error saving your intention.\\n"],[41,[28,[37,7],[[30,8,["error","status"]],[30,8,["error","detail"]]],null],[[[1,"        "],[10,"br"],[12],[13],[1,[30,8,["error","status"]]],[1,": "],[1,[30,8,["error","detail"]]],[1,"\\n"]],[]],null],[1,"    "]],[]]]]],[1,"\\n  "]],[11]]]]],[1,"\\n"]],[]]],[1,"    "]],[9]]]]],[1,"\\n\\n    "],[8,[39,2],null,[["@name"],["form"]],[["default"],[[[[1,"\\n"],[44,[[30,8,["data"]],[28,[37,9],[[28,[37,10],["write intention"],[["item"],[[30,8,["data"]]]]]],null]],[[[41,[28,[37,9],[[30,13]],null],[[[1,"\\n"],[44,[[28,[37,11],[[30,12],"Action"],null]],[[[1,"      "],[8,[39,12],[[24,0,"consul-intention-action-warn-modal warning"]],[["@aria"],[[28,[37,13],null,[["label"],[[28,[37,14],["Set intention to ",[30,14]],null]]]]]],[["default"],[[[[1,"\\n        "],[8,[39,15],null,[["@target","@name","@value"],[[30,0],"modal",[30,15]]],null],[1,"\\n        "],[8,[39,2],null,[["@name"],["header"]],[["default"],[[[[1,"\\n          "],[10,"h2"],[12],[1,"Set intention to "],[1,[30,14]],[1,"?"],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,2],null,[["@name"],["body"]],[["default"],[[[[1,"\\n          "],[10,2],[12],[1,"\\n            When you change this Intention to "],[1,[30,14]],[1,", you will remove all the Layer 7 policy permissions currently saved to this Intention. Are you sure you want to set it to "],[1,[30,14]],[1,"?\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,2],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n          "],[8,[39,16],null,null,[["default"],[[[[1,"\\n            "],[8,[39,17],[[4,[38,19],["click",[30,8,["submit"]]],null]],[["@text","@color"],[[29,["Set to ",[28,[37,18],[[30,14]],null]]],"critical"]],null],[1,"\\n            "],[8,[39,17],[[16,"onclick",[30,16]]],[["@text","@color"],["No, Cancel","secondary"]],null],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[16]]]]],[1,"\\n      "]],[15]]]]],[1,"\\n"]],[14]]],[1,"\\n      "],[8,[39,20],null,[["@src","@onchange"],[[28,[37,21],["/${partition}/*/${dc}/services",[28,[37,13],null,[["partition","dc"],[[30,4],[30,2,["Name"]]]]]],null],[28,[37,1],[[30,0],[30,0,["createServices"]],[30,12]],null]]],null],[1,"\\n\\n"],[41,[28,[37,10],["use nspaces"],null],[[[1,"        "],[8,[39,20],null,[["@src","@onchange"],[[28,[37,21],["/${partition}/*/${dc}/namespaces",[28,[37,13],null,[["partition","dc"],[[30,4],[30,2,["Name"]]]]]],null],[28,[37,1],[[30,0],[30,0,["createNspaces"]],[30,12]],null]]],null],[1,"\\n"]],[]],null],[1,"\\n"],[41,[28,[37,10],["use partitions"],null],[[[1,"        "],[8,[39,20],null,[["@src","@onchange"],[[28,[37,21],["/*/*/${dc}/partitions",[28,[37,13],null,[["dc"],[[30,2,["Name"]]]]]],null],[28,[37,1],[[30,0],[30,0,["createPartitions"]],[30,12]],null]]],null],[1,"\\n"]],[]],null],[1,"\\n"],[41,[30,8,["isCreate"]],[[[41,[28,[37,7],[[28,[37,10],["use partitions"],null],[28,[37,9],[[28,[37,10],["choose partitions"],[["dc"],[[30,2]]]]],null]],null],[[[1,"        "],[8,[39,22],[[24,0,"mb-3 mt-2"]],[["@type"],["inline"]],[["default"],[[[[1,"\\n          "],[8,[30,17,["Title"]],null,null,[["default"],[[[[1,"Cross-partition communication not supported"]],[]]]]],[1,"\\n          "],[8,[30,17,["Description"]],null,null,[["default"],[[[[1,"Cross-partition communication is not supported outside of the primary datacenter. You will only be able to select namespaces for source and destination services."]],[]]]]],[1,"\\n        "]],[17]]]]],[1,"\\n"]],[]],null],[41,[30,0,["isManagedByCRDs"]],[[[1,"        "],[8,[39,23],null,[["@type"],["warning"]],null],[1,"\\n"]],[]],null]],[]],null],[1,"      "],[11,"form"],[4,[38,19],["submit",[28,[37,24],[[30,0,["submit"]],[30,12],[30,8,["submit"]]],null]],null],[12],[1,"\\n        "],[8,[39,25],null,[["@nspaces","@dc","@partitions","@services","@SourceName","@SourceNS","@SourcePartition","@DestinationName","@DestinationNS","@DestinationPartition","@item","@disabled","@create","@onchange"],[[30,0,["nspaces"]],[30,2],[30,0,["partitions"]],[30,0,["services"]],[30,0,["SourceName"]],[30,0,["SourceNS"]],[30,0,["SourcePartition"]],[30,0,["DestinationName"]],[30,0,["DestinationNS"]],[30,0,["DestinationPartition"]],[30,12],[30,8,["disabled"]],[30,8,["isCreate"]],[30,8,["change"]]]],null],[1,"\\n        "],[10,0],[12],[1,"\\n          "],[8,[39,16],null,null,[["default"],[[[[1,"\\n            "],[8,[39,17],[[16,"disabled",[28,[37,26],[[30,12,["isInvalid"]],[30,8,["disabled"]]],null]],[24,4,"submit"]],[["@text"],["Save"]],null],[1,"\\n            "],[8,[39,17],[[16,"disabled",[30,8,["disabled"]]],[24,4,"reset"],[4,[38,19],["click",[28,[37,24],[[30,0,["oncancel"]],[30,12]],null]],null]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n"],[41,[28,[37,9],[[30,8,["isCreate"]]],null],[[[41,[28,[37,27],[[30,12,["ID"]],"anonymous"],null],[[[1,"          "],[8,[39,28],null,[["@message"],["Are you sure you want to delete this Intention?"]],[["default"],[[[[1,"\\n            "],[8,[39,2],null,[["@name"],["action"]],[["default"],[[[[1,"\\n              "],[8,[39,17],[[16,"disabled",[30,8,["disabled"]]],[4,[38,19],["click",[28,[37,24],[[30,18],[30,8,["delete"]]],null]],null]],[["@text","@color"],["Delete","critical"]],null],[1,"\\n            "]],[18]]]]],[1,"\\n            "],[8,[39,2],null,[["@name"],["dialog"]],[["default"],[[[[1,"\\n              "],[8,[39,29],null,[["@message","@execute","@cancel"],[[30,21],[30,19],[30,20]]],null],[1,"\\n            "]],[19,20,21]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[]],null]],[]],null],[1,"          "]],[]]]]],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n"]],[]],[[[1,"\\n"],[41,[30,12,["IsManagedByCRD"]],[[[1,"      "],[8,[39,22],[[24,0,"mb-3 mt-2"]],[["@type"],["inline"]],[["default"],[[[[1,"\\n        "],[8,[30,22,["Title"]],null,null,[["default"],[[[[1,"Intention Custom Resource"]],[]]]]],[1,"\\n        "],[8,[30,22,["Description"]],null,null,[["default"],[[[[1,"This Intention is view only because it is managed through an Intention Custom Resource in your Kubernetes cluster."]],[]]]]],[1,"\\n        "],[8,[30,22,["Link::Standalone"]],null,[["@text","@href","@icon","@iconPosition"],["Learn more about CRDs",[29,[[28,[37,30],["CONSUL_DOCS_URL"],null],"/k8s/crds"]],"docs-link","trailing"]],null],[1,"\\n      "]],[22]]]]],[1,"\\n"]],[]],null],[1,"\\n    "],[8,[39,31],null,[["@item"],[[30,12]]],null],[1,"\\n"]],[]]]],[12,13]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[8]]]]],[1,"\\n"],[13],[1,"\\n"]],["&attrs","@dc","@nspace","@partition","@autofill","@item","@src","api","after","T","T","item","readonly","newAction","modal","close","A","confirm","execute","cancel","message","A"],false,["data-form","action","block-slot","if","string-starts-with","hds/toast","notification","and","let","not","can","changeset-get","modal-dialog","hash","concat","ref","hds/button-set","hds/button","capitalize","on","data-source","uri","hds/alert","consul/intention/notice/custom-resource","fn","consul/intention/form/fieldsets","or","not-eq","confirmation-dialog","delete-confirmation","env","consul/intention/view"]]',moduleName:"consul-ui/components/consul/intention/form/index.hbs",isStrictMode:!1})
-let w=(a=(0,r.inject)("repository/intention"),u=class extends l.default{constructor(e,t){var n,l,r
-super(...arguments),O(this,"services",s,this),O(this,"SourceName",c,this),O(this,"DestinationName",d,this),O(this,"nspaces",p,this),O(this,"SourceNS",f,this),O(this,"DestinationNS",m,this),O(this,"partitions",h,this),O(this,"SourcePartition",b,this),O(this,"DestinationPartition",y,this),O(this,"isManagedByCRDs",g,this),r=null,(l="modal")in(n=this)?Object.defineProperty(n,l,{value:r,enumerable:!0,configurable:!0,writable:!0}):n[l]=r,O(this,"repo",v,this),this.updateCRDManagement()}ondelete(){this.args.ondelete?this.args.ondelete(...arguments):this.onsubmit(...arguments)}oncancel(){this.args.oncancel?this.args.oncancel(...arguments):this.onsubmit(...arguments)}onsubmit(){this.args.onsubmit&&this.args.onsubmit(...arguments)}updateCRDManagement(){this.isManagedByCRDs=this.repo.isManagedByCRDs()}submit(e,t,n){n.preventDefault(),void 0!==e.change.Action&&void 0===e.data.Action?this.modal.open():t()}createServices(e,t){let n=t.data.uniqBy("Name").toArray().filter((e=>!["connect-proxy","mesh-gateway","terminating-gateway"].includes(e.Kind))).sort(((e,t)=>e.Name.localeCompare(t.Name)))
-n=[{Name:"*"}].concat(n)
-let l=n.findBy("Name",e.SourceName)
-l||(l={Name:e.SourceName},n=[l].concat(n))
-let r=n.findBy("Name",e.DestinationName)
-r||(r={Name:e.DestinationName},n=[r].concat(n)),this.services=n,this.SourceName=l,this.DestinationName=r}createNspaces(e,t){let n=t.data.toArray().sort(((e,t)=>e.Name.localeCompare(t.Name)))
-n=[{Name:"*"}].concat(n)
-let l=n.findBy("Name",e.SourceNS)
-l||(l={Name:e.SourceNS},n=[l].concat(n))
-let r=n.findBy("Name",e.DestinationNS)
-r||(r={Name:e.DestinationNS},n=[r].concat(n)),this.nspaces=n,this.SourceNS=l,this.DestinationNS=r}createPartitions(e,t){let n=t.data.toArray().sort(((e,t)=>e.Name.localeCompare(t.Name))),l=n.findBy("Name",e.SourcePartition)
-l||(l={Name:e.SourcePartition},n=[l].concat(n))
-let r=n.findBy("Name",e.DestinationPartition)
-r||(r={Name:e.DestinationPartition},n=[r].concat(n)),this.partitions=n,this.SourcePartition=l,this.DestinationPartition=r}change(e,t,n){const l=e.target
-let r,i
-switch(l.name){case"SourceName":case"DestinationName":case"SourceNS":case"DestinationNS":case"SourcePartition":case"DestinationPartition":switch(r=i=l.value,"string"!=typeof r&&(r=l.value.Name),l.value=r,l.name){case"SourceName":case"DestinationName":0===this.services.filterBy("Name",r).length&&(i={Name:r},this.services=[i].concat(this.services.toArray()))
-break
-case"SourceNS":case"DestinationNS":0===this.nspaces.filterBy("Name",r).length&&(i={Name:r},this.nspaces=[i].concat(this.nspaces.toArray()))
-break
-case"SourcePartition":case"DestinationPartition":0===this.partitions.filterBy("Name",r).length&&(i={Name:r},this.partitions=[i].concat(this.partitions.toArray()))}this[l.name]=i}t.handleEvent(e)}},s=P(u.prototype,"services",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=P(u.prototype,"SourceName",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=P(u.prototype,"DestinationName",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=P(u.prototype,"nspaces",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=P(u.prototype,"SourceNS",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=P(u.prototype,"DestinationNS",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=P(u.prototype,"partitions",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=P(u.prototype,"SourcePartition",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=P(u.prototype,"DestinationPartition",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=P(u.prototype,"isManagedByCRDs",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=P(u.prototype,"repo",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P(u.prototype,"ondelete",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"ondelete"),u.prototype),P(u.prototype,"oncancel",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"oncancel"),u.prototype),P(u.prototype,"onsubmit",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"onsubmit"),u.prototype),P(u.prototype,"updateCRDManagement",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"updateCRDManagement"),u.prototype),P(u.prototype,"submit",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"submit"),u.prototype),P(u.prototype,"createServices",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"createServices"),u.prototype),P(u.prototype,"createNspaces",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"createNspaces"),u.prototype),P(u.prototype,"createPartitions",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"createPartitions"),u.prototype),P(u.prototype,"change",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"change"),u.prototype),u)
-e.default=w,(0,t.setComponentTemplate)(x,w)})),define("consul-ui/components/consul/intention/list/check/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"R9NJf0hk",block:'[[[44,[[28,[37,1],[[28,[37,2],[[28,[37,2],["allow","Allowed"],null],[28,[37,2],["deny","Denied"],null],[28,[37,2],["","Layer 7 Rules"],null]],null]],null]],[[[11,0],[16,0,[28,[37,3],["consul-intention-list-check ","notice ",[28,[37,4],[[30,2,["Action"]],"permissions"],null]],null]],[17,3],[12],[1,"\\n  "],[10,"h3"],[12],[1,"\\n    "],[1,[28,[35,5],[[30,1],[28,[37,4],[[30,2,["Action"]],""],null]],null]],[1,"\\n  "],[13],[1,"\\n  "],[10,2],[12],[1,"\\n"],[41,[28,[37,7],[[30,2,["Action"]],"allow"],null],[[[1,"    Yes, "],[1,[33,8,["SourceName"]]],[1," is allowed to connect to "],[1,[30,2,["DestinationName"]]],[1," due to the highest precedence intention below:\\n"]],[]],[[[41,[28,[37,7],[[30,2,["Action"]],"deny"],null],[[[1,"    No, "],[1,[30,2,["SourceName"]]],[1," is not allowed to connect to "],[1,[30,2,["DestinationName"]]],[1," due to the highest precedence intention below:\\n"]],[]],[[[1,"    "],[1,[30,2,["SourceName"]]],[1," may or may not be allowed to connect with "],[1,[30,2,["DestinationName"]]],[1," through its Layer 7 rules.\\n  "]],[]]]],[]]],[1,"  "],[13],[1,"\\n"],[13],[1,"\\n"]],[1]]]],["titles","@item","&attrs"],false,["let","from-entries","array","concat","or","get","if","eq","item"]]',moduleName:"consul-ui/components/consul/intention/list/check/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/intention/list/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/service","@ember/object","@glimmer/tracking"],(function(e,t,n,l,r,i,o){var a,u,s,c
-function d(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function p(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const f=(0,n.createTemplateFactory)({id:"t3Jtqz1v",block:'[[[11,0],[24,0,"consul-intention-list"],[17,1],[4,[38,0],[[30,0,["updateCRDManagement"]],[30,2]],null],[12],[1,"\\n"],[18,4,[[28,[37,2],null,[["Table","CheckNotice","CustomResourceNotice"],[[50,"consul/intention/list/table",0,null,[["delete","items"],[[30,3],[30,0,["items"]]]]],[52,[30,0,["checkedItem"]],[50,"consul/intention/list/check",0,null,[["item"],[[30,0,["checkedItem"]]]]],""],[52,[30,0,["isManagedByCRDs"]],[50,"consul/intention/notice/custom-resource",0,null,null],""]]]]]],[1,"\\n"],[13]],["&attrs","@items","@delete","&default"],false,["did-update","yield","hash","component","if"]]',moduleName:"consul-ui/components/consul/intention/list/index.hbs",isStrictMode:!1})
-let m=(a=(0,r.inject)("repository/intention"),u=class extends l.default{constructor(e,t){super(...arguments),d(this,"repo",s,this),d(this,"isManagedByCRDs",c,this),this.updateCRDManagement(t.items)}get items(){return this.args.items||[]}get checkedItem(){return 1===this.items.length&&this.args.check&&this.items[0].SourceName===this.args.check?this.items[0]:null}updateCRDManagement(){this.isManagedByCRDs=this.repo.isManagedByCRDs()}},s=p(u.prototype,"repo",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=p(u.prototype,"isManagedByCRDs",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p(u.prototype,"updateCRDManagement",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"updateCRDManagement"),u.prototype),u)
-e.default=m,(0,t.setComponentTemplate)(f,m)})),define("consul-ui/components/consul/intention/list/table/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"5xWkkvyi",block:'[[[8,[39,0],[[24,0,"consul-intention-list-table"],[17,1]],[["@items","@rowHeight"],[[30,2],59]],[["default"],[[[[1,"\\n  "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n    "],[10,"th"],[14,0,"source"],[12],[1,"Source"],[13],[1,"\\n    "],[10,"th"],[14,0,"intent"],[12],[1," "],[13],[1,"\\n    "],[10,"th"],[14,0,"destination"],[12],[1,"Destination"],[13],[1,"\\n    "],[10,"th"],[14,0,"permissions"],[12],[1,"\\n      Permissions\\n      "],[10,1],[12],[1,"\\n        "],[8,[39,2],null,null,[["default"],[[[[1,"Permissions intercept an Intention\'s traffic using Layer 7 criteria, such as path\\n          prefixes and http headers."]],[]]]]],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,"th"],[14,0,"meta"],[12],[1," "],[13],[1,"\\n  "]],[]]]]],[1,"\\n  "],[8,[39,1],null,[["@name"],["row"]],[["default"],[[[[1,"\\n    "],[10,"td"],[14,0,"source"],[12],[1,"\\n      "],[10,3],[15,6,[28,[37,3],[[28,[37,4],[[30,5],"dc.intentions.edit"],null],[30,3,["ID"]]],null]],[12],[1,"\\n"],[41,[28,[37,6],[[30,3,["SourceName"]],"*"],null],[[[1,"          All Services (*)\\n"]],[]],[[[1,"          "],[1,[30,3,["SourceName"]]],[1,"\\n"]],[]]],[1,"        "],[10,"em"],[14,0,"consul-intention-list-table__meta-info"],[12],[1,"\\n          "],[8,[39,7],null,[["@item","@nspace","@partition"],[[28,[37,8],null,[["Namespace","Partition","PeerName"],[[30,3,["SourceNS"]],[30,3,["SourcePartition"]],[30,3,["SourcePeer"]]]]],"-","-"]],null],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,"td"],[15,0,[29,["intent intent-",[28,[37,9],[[30,3,["Action"]]],null]]]],[12],[1,"\\n      "],[10,"strong"],[12],[1,[28,[35,10],[[28,[37,4],[[30,3,["Action"]],"App aware"],null]],null]],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,"td"],[14,0,"destination"],[12],[1,"\\n      "],[10,1],[12],[1,"\\n"],[41,[28,[37,6],[[30,3,["DestinationName"]],"*"],null],[[[1,"          All Services (*)\\n"]],[]],[[[1,"          "],[1,[30,3,["DestinationName"]]],[1,"\\n"]],[]]],[41,[28,[37,4],[[28,[37,11],["use nspaces"],null],[28,[37,11],["use partitions"],null]],null],[[[1,"          "],[10,"em"],[12],[1,"\\n            "],[10,1],[15,0,[28,[37,12],["partition-",[28,[37,4],[[30,3,["DestinationPartition"]],"default"],null]],null]],[12],[1,[28,[35,4],[[30,3,["DestinationPartition"]],"default"],null]],[13],[1,"\\n            /\\n            "],[10,1],[15,0,[28,[37,12],["nspace-",[28,[37,4],[[30,3,["DestinationNS"]],"default"],null]],null]],[12],[1,[28,[35,4],[[30,3,["DestinationNS"]],"default"],null]],[13],[1,"\\n          "],[13],[1,"\\n"]],[]],null],[1,"      "],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,"td"],[14,0,"permissions"],[12],[1,"\\n"],[41,[28,[37,13],[[30,3,["Permissions","length"]],0],null],[[[1,"        "],[10,1],[12],[1,[28,[35,14],[[30,3,["Permissions","length"]],"Permission"],null]],[13],[1,"\\n"]],[]],null],[1,"    "],[13],[1,"\\n    "],[10,"td"],[14,0,"meta"],[12],[1,"\\n"],[41,[30,3,["IsManagedByCRD"]],[[[1,"        "],[8,[39,15],null,[["@item","@label"],[[30,3],"Managed by CRD"]],null],[1,"\\n"]],[]],null],[1,"    "],[13],[1,"\\n  "]],[]]]]],[1,"\\n  "],[8,[39,1],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n    "],[8,[39,16],null,[["@expanded","@onchange","@keyboardAccess"],[[52,[28,[37,6],[[30,8],[30,6]],null],true,false],[28,[37,17],[[30,0],[30,7],[30,6]],null],false]],[["default"],[[[[1,"\\n      "],[8,[39,1],null,[["@name"],["trigger"]],[["default"],[[[[1,"\\n        More\\n      "]],[]]]]],[1,"\\n      "],[8,[39,1],null,[["@name"],["menu"]],[["default"],[[[[1,"\\n"],[41,[28,[37,11],["write intention"],[["item"],[[30,3]]]],[[[1,"          "],[10,"li"],[14,"role","none"],[12],[1,"\\n            "],[10,3],[14,"role","menuitem"],[14,"tabindex","-1"],[15,6,[28,[37,3],[[28,[37,4],[[33,18],"dc.intentions.edit"],null],[30,3,["ID"]]],null]],[12],[1,"Edit"],[13],[1,"\\n          "],[13],[1,"\\n          "],[10,"li"],[14,"role","none"],[14,0,"dangerous"],[12],[1,"\\n            "],[10,"label"],[15,"for",[30,9]],[14,"role","menuitem"],[14,"tabindex","-1"],[15,"onkeypress",[30,11]],[12],[1,"Delete"],[13],[1,"\\n            "],[10,0],[14,"role","menu"],[12],[1,"\\n              "],[8,[39,19],[[24,0,"warning"]],null,[["header","body","actions"],[[[[1,"\\n                  Confirm Delete\\n                "]],[]],[[[1,"\\n                  "],[10,2],[12],[1,"\\n                    Are you sure you want to delete this intention?\\n                  "],[13],[1,"\\n                "]],[]],[[[1,"\\n                  "],[8,[30,13,["Action"]],[[24,0,"dangerous"]],null,[["default"],[[[[1,"\\n                    "],[8,[39,17],[[24,0,"type-delete"],[24,"tabindex","-1"],[4,[38,20],["click",[28,[37,21],[[28,[37,17],[[30,0],[30,12]],null],[28,[37,17],[[30,0],[30,14],[30,3]],null]],null]],null]],null,[["default"],[[[[1,"\\n                      Delete\\n                    "]],[]]]]],[1,"\\n                  "]],[]]]]],[1,"\\n                  "],[8,[30,13,["Action"]],null,null,[["default"],[[[[1,"\\n                    "],[8,[39,17],null,[["@for"],[[30,9]]],[["default"],[[[[1,"\\n                      Cancel\\n                    "]],[]]]]],[1,"\\n                  "]],[]]]]],[1,"\\n                "]],[13]]]]],[1,"\\n            "],[13],[1,"\\n          "],[13],[1,"\\n"]],[]],[[[41,[28,[37,11],["view CRD intention"],[["item"],[[30,3]]]],[[[1,"          "],[10,"li"],[14,"role","none"],[12],[1,"\\n            "],[10,0],[14,"role","menu"],[12],[1,"\\n              "],[8,[39,19],null,null,[["header","body","actions"],[[[[1,"\\n                  "],[10,1],[14,0,"flex flex-nowrap items-center"],[12],[1,"\\n                    "],[8,[39,22],[[24,0,"mr-1.5"]],[["@name"],["kubernetes-color"]],null],[1,"\\n                    Managed by CRD\\n                  "],[13],[1,"\\n                "]],[]],[[[1,"\\n                  "],[10,2],[12],[1,"\\n                    This intention is being managed through an Intention Custom Resource in your\\n                    Kubernetes cluster. It is view only in the UI.\\n                  "],[13],[1,"\\n                "]],[]],[[[1,"\\n                  "],[8,[30,15,["Action"]],null,null,[["default"],[[[[1,"\\n                    "],[8,[39,17],[[24,"tabindex","-1"],[24,0,"action"]],[["@href"],[[28,[37,3],[[28,[37,4],[[30,5],"dc.intentions.edit"],null],[30,3,["ID"]]],null]]],[["default"],[[[[1,"\\n                      View\\n                    "]],[]]]]],[1,"\\n                  "]],[]]]]],[1,"\\n                  "],[8,[30,15,["Action"]],null,null,[["default"],[[[[1,"\\n                    "],[8,[39,17],null,[["@onclick"],[[28,[37,17],[[30,0],[30,12]],null]]],[["default"],[[[[1,"\\n                      Cancel\\n                    "]],[]]]]],[1,"\\n                  "]],[]]]]],[1,"\\n                "]],[15]]]]],[1,"\\n            "],[13],[1,"\\n          "],[13],[1,"\\n"]],[]],[[[1,"          "],[10,"li"],[14,"role","none"],[12],[1,"\\n            "],[10,3],[14,"role","menuitem"],[14,"tabindex","-1"],[15,6,[28,[37,3],[[28,[37,4],[[33,18],"dc.intentions.edit"],null],[30,3,["ID"]]],null]],[12],[1,"\\n              View\\n            "],[13],[1,"\\n          "],[13],[1,"\\n        "]],[]]]],[]]],[1,"      "]],[9,10,11,12]]]]],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[6,7,8]]]]],[1,"\\n"]],[3,4]]]]],[1,"\\n"]],["&attrs","@items","item","index","@routeName","index","change","checked","confirm","send","keypressClick","change","Actions","@delete","Actions"],false,["tabular-collection","block-slot","tooltip","href-to","or","if","eq","consul/bucket/list","hash","slugify","capitalize","can","concat","gt","pluralize","consul/external-source","popover-menu","action","routeName","informed-action","on","queue","flight-icon"]]',moduleName:"consul-ui/components/consul/intention/list/table/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/intention/notice/custom-resource/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"6ZXsu8uh",block:'[[[8,[39,0],[[24,0,"mb-2 mt-2 consul-intention-notice-custom-resource"]],[["@type","@color"],["inline",[28,[37,1],[[30,1],"neutral"],null]]],[["default"],[[[[1,"\\n  "],[8,[30,2,["Title"]],null,null,[["default"],[[[[1,"Intention Custom Resource"]],[]]]]],[1,"\\n  "],[8,[30,2,["Description"]],null,null,[["default"],[[[[1,"Some of your intentions are being managed through an Intention Custom Resource in your Kubernetes cluster. Those managed intentions will be view only in the UI. Any intentions created in the UI will work but will not be synced to the Custom Resource Definition (CRD) datastore."]],[]]]]],[1,"\\n  "],[8,[30,2,["Link::Standalone"]],null,[["@href","@text","@icon","@iconPosition","@size"],[[29,[[28,[37,2],["CONSUL_DOCS_URL"],null],"/k8s/crds"]],"Learn more about CRDs","docs-link","trailing","small"]],null],[1,"\\n"]],[2]]]]]],["@type","A"],false,["hds/alert","or","env"]]',moduleName:"consul-ui/components/consul/intention/notice/custom-resource/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/intention/notice/permissions/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"DK7vccyg",block:'[[[8,[39,0],[[24,0,"mb-3 mt-2"]],[["@type"],["inline"]],[["default"],[[[[1,"\\n  "],[8,[30,1,["Description"]],null,null,[["default"],[[[[1,[28,[35,1],["components.consul.intention.notice.permissions.body"],null]]],[]]]]],[1,"\\n  "],[8,[30,1,["Link::Standalone"]],null,[["@text","@href","@icon","@iconPosition","@size"],[[28,[37,1],["components.consul.intention.notice.permissions.footer"],null],[29,[[28,[37,2],["CONSUL_DOCS_URL"],null],"/connect/intentions"]],"docs-link","trailing","small"]],null],[1,"\\n"]],[1]]]]]],["A"],false,["hds/alert","t","env"]]',moduleName:"consul-ui/components/consul/intention/notice/permissions/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/intention/notifications/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"qH69B/hI",block:'[[[41,[28,[37,1],[[30,1],"create"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    Your intention has been added.\\n"]],[]],[[[1,"    There was an error adding your intention.\\n"]],[]]]],[]],[[[41,[28,[37,1],[[30,1],"update"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    Your intention has been saved.\\n"]],[]],[[[1,"    There was an error saving your intention.\\n"]],[]]]],[]],[[[41,[28,[37,1],[[30,1],"delete"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    Your intention was deleted.\\n"]],[]],[[[1,"    There was an error deleting your intention.\\n"]],[]]]],[]],null]],[]]]],[]]],[44,[[30,3,["errors","firstObject"]]],[[[41,[30,4,["detail"]],[[[1,"    "],[10,"br"],[12],[13],[1,[28,[35,3],["(",[52,[30,4,["status"]],[28,[37,3],[[30,4,["status"]],": "],null]],[30,4,["detail"]],")"],null]],[1,"\\n"]],[]],null]],[4]]]],["@type","@status","@error","error"],false,["if","eq","let","concat"]]',moduleName:"consul-ui/components/consul/intention/notifications/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/intention/permission/form/index",["exports","@ember/component","@ember/template-factory","@ember/object","@ember/object/computed","@ember/service"],(function(e,t,n,l,r,i){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,n.createTemplateFactory)({id:"9N7+TvqA",block:'[[[11,0],[17,1],[24,0,"consul-intention-permission-form"],[12],[1,"\\n"],[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n\\n  "],[18,11,[[28,[37,3],null,[["submit","reset","isDirty","changeset"],[[28,[37,4],[[30,0],"submit",[33,5]],null],[28,[37,4],[[30,0],"reset",[33,5]],null],[28,[37,6],[[33,5,["isValid"]]],null],[33,5]]]]]],[1,"\\n\\n  "],[10,"fieldset"],[12],[1,"\\n    "],[10,0],[14,"data-property","action"],[12],[1,"\\n      "],[10,1],[14,0,"label"],[12],[1,"\\n        Should this permission allow the source connect to the destination?\\n      "],[13],[1,"\\n      "],[10,0],[14,"role","radiogroup"],[15,0,[52,[33,5,["error","Action"]]," has-error"]],[12],[1,"\\n"],[42,[28,[37,9],[[28,[37,9],[[33,10]],null]],null],null,[[[1,"          "],[10,"label"],[12],[1,"\\n            "],[10,1],[12],[1,[28,[35,11],[[30,3]],null]],[13],[1,"\\n            "],[10,"input"],[14,3,"Action"],[15,2,[30,3]],[15,"checked",[52,[28,[37,12],[[33,5,["Action"]],[30,3]],null],"checked"]],[15,"onchange",[28,[37,4],[[30,0],[28,[37,13],[[33,5],"Action"],null]],[["value"],["target.value"]]]],[14,4,"radio"],[12],[13],[1,"\\n          "],[13],[1,"\\n"]],[3]],null],[1,"      "],[13],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n\\n  "],[10,"fieldset"],[12],[1,"\\n    "],[10,"header"],[12],[1,"\\n      "],[10,"h2"],[12],[1,"Path"],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,0],[12],[1,"\\n        "],[8,[30,2,["Element"]],null,[["@name","@type"],["PathType","select"]],[["default"],[[[[1,"\\n          "],[8,[30,4,["Label"]],null,null,[["default"],[[[[1,"\\n            Path type\\n          "]],[]]]]],[1,"\\n          "],[8,[39,14],null,[["@options","@selected","@onChange"],[[99,15,["@options"]],[99,16,["@selected"]],[28,[37,4],[[30,0],"change","HTTP.PathType",[33,5]],null]]],[["default"],[[[[1,"\\n              "],[1,[28,[35,17],[[33,18],[30,5]],null]],[1,"\\n          "]],[5]]]]],[1,"\\n        "]],[4]]]]],[1,"\\n\\n"],[41,[33,19],[[[1,"        "],[8,[30,2,["Element"]],null,[["@name","@error"],["Path",[28,[37,20],[[33,5],"error.HTTP.Path"],null]]],[["default"],[[[[1,"\\n          "],[8,[30,6,["Label"]],null,null,[["default"],[[[[1,"\\n            "],[1,[28,[35,17],[[33,18],[33,16]],null]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,6,["Text"]],[[16,"oninput",[28,[37,4],[[30,0],"change","HTTP.Path",[33,5]],null]]],[["@value"],[[28,[37,20],[[33,5],"HTTP.Path"],null]]],null],[1,"\\n          "],[8,[39,21],null,[["@state","@matches"],[[30,6,["state"]],"error"]],[["default"],[[[[1,"\\n            "],[8,[30,6,["Error"]],null,null,[["default"],[[[[1,"\\n"],[41,[28,[37,12],[[28,[37,20],[[33,5],"HTTP.Path"],null],"Regex"],null],[[[1,"                Path Regex should not be blank\\n"]],[]],[[[1,"                Path should begin with a \'/\'\\n"]],[]]],[1,"            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[6]]]]],[1,"\\n"]],[]],null],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n\\n  "],[10,"fieldset"],[12],[1,"\\n    "],[10,"h2"],[12],[1,"Methods"],[13],[1,"\\n    "],[10,0],[14,0,"type-toggle"],[12],[1,"\\n      "],[10,1],[12],[1,"All methods are applied by default unless specified"],[13],[1,"\\n      "],[8,[30,2,["Element"]],null,[["@name"],["allMethods"]],[["default"],[[[[1,"\\n        "],[8,[30,7,["Checkbox"]],[[16,"checked",[52,[33,22],"checked"]],[16,"onchange",[28,[37,4],[[30,0],"change","allMethods",[33,5]],null]]],null,null],[1,"\\n        "],[8,[30,7,["Label"]],null,null,[["default"],[[[[1,"\\n          All Methods\\n        "]],[]]]]],[1,"\\n      "]],[7]]]]],[1,"\\n    "],[13],[1,"\\n\\n"],[41,[33,23],[[[1,"    "],[10,0],[14,0,"checkbox-group"],[14,"role","group"],[12],[1,"\\n"],[42,[28,[37,9],[[28,[37,9],[[33,24]],null]],null],null,[[[1,"        "],[10,"label"],[14,0,"type-checkbox"],[12],[1,"\\n          "],[10,"input"],[14,3,"method"],[15,2,[30,8]],[15,"checked",[52,[28,[37,25],[[30,8],[33,5,["HTTP","Methods"]]],null],"checked"]],[15,"onchange",[28,[37,4],[[30,0],"change","method",[33,5]],null]],[14,4,"checkbox"],[12],[13],[1,"\\n          "],[10,1],[12],[1,[30,8]],[13],[1,"\\n        "],[13],[1,"\\n"]],[8]],null],[1,"    "],[13],[1,"\\n"]],[]],null],[1,"  "],[13],[1,"\\n\\n  "],[10,"fieldset"],[12],[1,"\\n    "],[10,"h2"],[12],[1,"Headers"],[13],[1,"\\n\\n    "],[8,[39,26],null,[["@items","@ondelete"],[[28,[37,20],[[33,5],"HTTP.Header"],null],[28,[37,4],[[30,0],"delete","HTTP.Header",[33,5]],null]]],[["default"],[[[[1,"\\n\\n    "]],[9]]]]],[1,"\\n\\n    "],[8,[39,27],null,[["@onsubmit"],[[28,[37,4],[[30,0],"add","HTTP.Header",[33,5]],null]]],[["default"],[[[[1,"\\n      "],[8,[39,28],null,[["@target","@name","@value"],[[30,0],"headerForm",[30,10]]],null],[1,"\\n    "]],[10]]]]],[1,"\\n\\n    "],[8,[39,29],null,null,[["default"],[[[[1,"\\n      "],[8,[39,30],[[16,"disabled",[52,[28,[37,31],[[30,0,["headerForm","isDirty"]]],null],"disabled"]],[16,"onclick",[28,[37,4],[[30,0],[30,0,["headerForm","submit"]]],null]]],[["@text","@color"],[[29,["Add",[52,[28,[37,32],[[28,[37,17],[[28,[37,20],[[33,5],"HTTP.Header"],null],"length"],null],0],null]," another",""]," header"]],"primary"]],null],[1,"\\n      "],[8,[39,30],[[16,"onclick",[28,[37,4],[[30,0],[30,0,["headerForm","reset"]]],null]]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n    "]],[]]]]],[1,"\\n  "],[13],[1,"\\n  "]],[2]]]]],[1,"\\n"],[13]],["&attrs","group","intent","el","Type","el","el","method","headerList","headerForm","&default"],false,["form-group","name","yield","hash","action","changeset","and","if","each","-track-array","intents","capitalize","eq","changeset-set","power-select","pathTypes","pathType","get","pathLabels","shouldShowPathField","changeset-get","state","allMethods","shouldShowMethods","methods","includes","consul/intention/permission/header/list","consul/intention/permission/header/form","ref","hds/button-set","hds/button","not","gt"]]',moduleName:"consul-ui/components/consul/intention/permission/form/index.hbs",isStrictMode:!1}),a="intention-permission"
-var u=(0,t.setComponentTemplate)(o,t.default.extend({tagName:"",name:a,schema:(0,i.inject)("schema"),change:(0,i.inject)("change"),repo:(0,i.inject)(`repository/${a}`),onsubmit:function(){},onreset:function(){},intents:(0,r.alias)(`schema.${a}.Action.allowedValues`),methods:(0,r.alias)(`schema.${a}-http.Methods.allowedValues`),pathProps:(0,r.alias)(`schema.${a}-http.PathType.allowedValues`),pathTypes:(0,l.computed)("pathProps",(function(){return["NoPath"].concat(this.pathProps)})),pathLabels:(0,l.computed)((function(){return{NoPath:"No Path",PathExact:"Exact",PathPrefix:"Prefixed by",PathRegex:"Regular Expression"}})),pathInputLabels:(0,l.computed)((function(){return{PathExact:"Exact Path",PathPrefix:"Path Prefix",PathRegex:"Path Regular Expression"}})),changeset:(0,l.computed)("item",(function(){const e=this.change.changesetFor(a,this.item||this.repo.create())
-return e.isNew&&e.validate(),e})),pathType:(0,l.computed)("changeset._changes.HTTP.PathType","pathTypes.firstObject",(function(){return this.changeset.HTTP.PathType||this.pathTypes.firstObject})),noPathType:(0,r.equal)("pathType","NoPath"),shouldShowPathField:(0,r.not)("noPathType"),allMethods:!1,shouldShowMethods:(0,r.not)("allMethods"),didReceiveAttrs:function(){(0,l.get)(this,"item.HTTP.Methods.length")||(0,l.set)(this,"allMethods",!0)},actions:{change:function(e,t,n){const r=void 0!==(0,l.get)(n,"target.value")?n.target.value:n
-switch(e){case"allMethods":(0,l.set)(this,e,n.target.checked)
-break
-case"method":n.target.checked?this.actions.add.apply(this,["HTTP.Methods",t,r]):this.actions.delete.apply(this,["HTTP.Methods",t,r])
-break
-default:t.set(e,r)}t.validate()},add:function(e,t,n){t.pushObject(e,n),t.validate()},delete:function(e,t,n){t.removeObject(e,n),t.validate()},submit:function(e,t){void 0!==e.changes.find((e=>{let{key:t,value:n}=e
-return"HTTP.PathType"===t||"HTTP.Path"===t}))&&(this.pathProps.forEach((t=>{e.set(`HTTP.${t}`,void 0)})),"NoPath"!==e.HTTP.PathType&&e.set(`HTTP.${e.HTTP.PathType}`,e.HTTP.Path)),this.allMethods&&e.set("HTTP.Methods",null),delete e._changes.HTTP.PathType,delete e._changes.HTTP.Path,this.repo.persist(e),this.onsubmit(e.data)},reset:function(e,t){e.rollback(),this.onreset(e.data)}}}))
-e.default=u})),define("consul-ui/components/consul/intention/permission/header/form/index",["exports","@ember/component","@ember/template-factory","@ember/object","@ember/object/computed","@ember/service"],(function(e,t,n,l,r,i){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,n.createTemplateFactory)({id:"M/AqDx5C",block:'[[[11,0],[17,1],[24,0,"consul-intention-permission-header-form"],[12],[1,"\\n  "],[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n\\n    "],[18,7,[[28,[37,3],null,[["submit","reset","isDirty","changeset"],[[28,[37,4],[[30,0],"submit",[33,5]],null],[28,[37,4],[[30,0],"reset",[33,5]],null],[28,[37,6],[[33,5,["isValid"]],[33,5,["isDirty"]]],null],[33,5]]]]]],[1,"\\n\\n    "],[10,"fieldset"],[12],[1,"\\n      "],[10,0],[12],[1,"\\n        "],[8,[30,2,["Element"]],null,[["@name","@type"],["HeaderType","select"]],[["default"],[[[[1,"\\n          "],[8,[30,3,["Label"]],null,null,[["default"],[[[[1,"Header type"]],[]]]]],[1,"\\n          "],[8,[39,7],null,[["@options","@selected","@onChange"],[[99,8,["@options"]],[99,9,["@selected"]],[28,[37,4],[[30,0],"change","HeaderType",[33,5]],null]]],[["default"],[[[[1,"\\n              "],[1,[28,[35,10],[[33,11],[30,4]],null]],[1,"\\n          "]],[4]]]]],[1,"\\n        "]],[3]]]]],[1,"\\n\\n\\n        "],[8,[30,2,["Element"]],null,[["@name","@error"],["Name",[28,[37,12],[[33,5],"error.Name"],null]]],[["default"],[[[[1,"\\n          "],[8,[30,5,["Label"]],null,null,[["default"],[[[[1,"Header name"]],[]]]]],[1,"\\n          "],[8,[30,5,["Text"]],[[16,"oninput",[28,[37,4],[[30,0],"change","Name",[33,5]],null]]],[["@value"],[[28,[37,12],[[33,5],"Name"],null]]],null],[1,"\\n          "],[8,[39,13],null,[["@state","@matches"],[[30,5,["state"]],"error"]],[["default"],[[[[1,"\\n            "],[8,[30,5,["Error"]],null,null,[["default"],[[[[1,"\\n              "],[1,[28,[35,12],[[33,5],"error.Name.validation"],null]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[5]]]]],[1,"\\n\\n"],[41,[33,15],[[[1,"        "],[8,[30,2,["Element"]],null,[["@name","@error"],["Value",[28,[37,12],[[33,5],"error.Value"],null]]],[["default"],[[[[1,"\\n          "],[8,[30,6,["Label"]],null,null,[["default"],[[[[1,"Header "],[1,[28,[35,16],[[28,[37,10],[[33,11],[33,9]],null]],null]]],[]]]]],[1,"\\n          "],[8,[30,6,["Text"]],[[16,"oninput",[28,[37,4],[[30,0],"change","Value",[33,5]],null]]],[["@value"],[[28,[37,12],[[33,5],"Value"],null]]],null],[1,"\\n          "],[8,[39,13],null,[["@state","@matches"],[[30,6,["state"]],"error"]],[["default"],[[[[1,"\\n            "],[8,[30,6,["Error"]],null,null,[["default"],[[[[1,"\\n              "],[1,[28,[35,12],[[33,5],"error.Value.validation"],null]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[6]]]]],[1,"\\n"]],[]],null],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n  "]],[2]]]]],[1,"\\n"],[13]],["&attrs","group","el","Type","el","el","&default"],false,["form-group","name","yield","hash","action","changeset","and","power-select","headerTypes","headerType","get","headerLabels","changeset-get","state","if","shouldShowValueField","lowercase"]]',moduleName:"consul-ui/components/consul/intention/permission/header/form/index.hbs",isStrictMode:!1}),a="intention-permission-http-header"
-var u=(0,t.setComponentTemplate)(o,t.default.extend({tagName:"",name:a,schema:(0,i.inject)("schema"),change:(0,i.inject)("change"),repo:(0,i.inject)(`repository/${a}`),onsubmit:function(){},onreset:function(){},changeset:(0,l.computed)("item",(function(){return this.change.changesetFor(a,this.item||this.repo.create({HeaderType:this.headerTypes.firstObject}))})),headerTypes:(0,r.alias)(`schema.${a}.HeaderType.allowedValues`),headerLabels:(0,l.computed)((function(){return{Exact:"Exactly Matching",Prefix:"Prefixed by",Suffix:"Suffixed by",Regex:"Regular Expression",Present:"Is present"}})),headerType:(0,l.computed)("changeset.HeaderType","headerTypes.firstObject",(function(){return this.changeset.HeaderType||this.headerTypes.firstObject})),headerTypeEqualsPresent:(0,r.equal)("headerType","Present"),shouldShowValueField:(0,r.not)("headerTypeEqualsPresent"),actions:{change:function(e,t,n){const r=void 0!==(0,l.get)(n,"target.value")?n.target.value:n
-t.set(e,r),t.validate()},submit:function(e){this.headerTypes.forEach((t=>{e.set(t,void 0)}))
-const t="Present"===e.HeaderType||e.Value
-e.set(e.HeaderType,t),delete e._changes.HeaderType,delete e._changes.Value,this.repo.persist(e),this.onsubmit(e.data),(0,l.set)(this,"item",this.repo.create({HeaderType:this.headerType}))},reset:function(e,t){e.rollback()}}}))
-e.default=u})),define("consul-ui/components/consul/intention/permission/header/list/index",["exports","@ember/component","@ember/template-factory"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,n.createTemplateFactory)({id:"3ZH2LwLz",block:'[[[41,[28,[37,1],[[33,2,["length"]],0],null],[[[8,[39,3],[[24,0,"consul-intention-permission-header-list"]],[["@items","@scroll","@cellHeight"],[[99,2,["@items"]],"native",42]],[["default"],[[[[1,"\\n  "],[8,[39,4],null,[["@name"],["details"]],[["default"],[[[[1,"\\n    "],[10,"dl"],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        "],[8,[39,5],null,null,[["default"],[[[[1,"\\n          Header\\n        "]],[]]]]],[1,"\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[1,[30,1,["Name"]]],[1," "],[1,[28,[35,6],[[30,1]],null]],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n  "]],[]]]]],[1,"\\n  "],[8,[39,4],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n    "],[8,[30,2],null,null,[["default"],[[[[1,"\\n      "],[8,[30,3],[[24,0,"dangerous"]],[["@onclick"],[[28,[37,7],[[30,0],[33,8],[30,1]],null]]],[["default"],[[[[1,"\\n        "],[8,[39,4],null,[["@name"],["label"]],[["default"],[[[[1,"\\n          Delete\\n        "]],[]]]]],[1,"\\n        "],[8,[39,4],null,[["@name"],["confirmation"]],[["default"],[[[[1,"\\n          "],[8,[30,4],[[24,0,"warning"]],null,[["default"],[[[[1,"\\n            "],[8,[39,4],null,[["@name"],["header"]],[["default"],[[[[1,"\\n              Confirm delete\\n            "]],[]]]]],[1,"\\n            "],[8,[39,4],null,[["@name"],["body"]],[["default"],[[[[1,"\\n              "],[10,2],[12],[1,"\\n                Are you sure you want to delete this header?\\n              "],[13],[1,"\\n            "]],[]]]]],[1,"\\n            "],[8,[39,4],null,[["@name"],["confirm"]],[["default"],[[[[1,"\\n              "],[8,[30,5],null,null,[["default"],[[[[1,"Delete"]],[]]]]],[1,"\\n            "]],[5]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[4]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[3]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],[]],null]],["item","Actions","Action","Confirmation","Confirm"],false,["if","gt","items","list-collection","block-slot","tooltip","route-match","action","ondelete"]]',moduleName:"consul-ui/components/consul/intention/permission/header/list/index.hbs",isStrictMode:!1})
-var r=(0,t.setComponentTemplate)(l,t.default.extend({tagName:""}))
-e.default=r})),define("consul-ui/components/consul/intention/permission/list/index",["exports","@ember/component","@ember/template-factory"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,n.createTemplateFactory)({id:"nRmkYMml",block:'[[[41,[28,[37,1],[[33,2,["length"]],0],null],[[[8,[39,3],[[16,0,[29,["consul-intention-permission-list",[52,[28,[37,4],[[33,5]],null]," readonly"]]]]],[["@scroll","@items","@partial"],["native",[99,2,["@items"]],5]],[["default"],[[[[1,"\\n  "],[8,[39,6],null,[["@name"],["details"]],[["default"],[[[[1,"\\n    "],[10,0],[15,"onclick",[28,[37,7],[[30,0],[28,[37,8],[[33,5]],null],[30,1]],null]],[12],[1,"\\n      "],[10,"strong"],[15,0,[28,[37,9],["intent-",[30,1,["Action"]]],null]],[12],[1,[28,[35,10],[[30,1,["Action"]]],null]],[13],[1,"\\n"],[41,[28,[37,1],[[30,1,["HTTP","Methods","length"]],0],null],[[[1,"        "],[10,"dl"],[14,0,"permission-methods"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"\\n            "],[8,[39,11],null,null,[["default"],[[[[1,"\\n              Methods\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n"],[42,[28,[37,13],[[28,[37,13],[[30,1,["HTTP","Methods"]]],null]],null],null,[[[1,"            "],[1,[30,2]],[1,"\\n"]],[2]],null],[1,"          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[30,1,["HTTP","Path"]],[[[1,"        "],[10,"dl"],[14,0,"permission-path"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"\\n            "],[8,[39,11],null,null,[["default"],[[[[1,"\\n              "],[1,[30,1,["HTTP","PathType"]]],[1,"\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[1,[30,1,["HTTP","Path"]]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[42,[28,[37,13],[[28,[37,13],[[30,1,["HTTP","Header"]]],null]],null],null,[[[1,"        "],[10,"dl"],[14,0,"permission-header"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"\\n            "],[8,[39,11],null,null,[["default"],[[[[1,"\\n              Header\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[1,[30,3,["Name"]]],[1," "],[1,[28,[35,14],[[30,3]],null]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[3]],null],[1,"    "],[13],[1,"\\n  "]],[]]]]],[1,"\\n"],[41,[33,5],[[[1,"  "],[8,[39,6],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n    "],[8,[30,4],null,null,[["default"],[[[[1,"\\n      "],[8,[30,5],null,[["@onclick","@close"],[[28,[37,7],[[30,0],[28,[37,8],[[33,5]],null],[30,1]],null],true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["label"]],[["default"],[[[[1,"\\n          Edit\\n        "]],[]]]]],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[30,5],[[24,0,"dangerous"]],[["@onclick"],[[28,[37,7],[[30,0],[33,15],[30,1]],null]]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["label"]],[["default"],[[[[1,"\\n          Delete\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["confirmation"]],[["default"],[[[[1,"\\n          "],[8,[30,6],[[24,0,"warning"]],null,[["default"],[[[[1,"\\n            "],[8,[39,6],null,[["@name"],["header"]],[["default"],[[[[1,"\\n              Confirm delete\\n            "]],[]]]]],[1,"\\n            "],[8,[39,6],null,[["@name"],["body"]],[["default"],[[[[1,"\\n              "],[10,2],[12],[1,"\\n                Are you sure you want to delete this permission?\\n              "],[13],[1,"\\n            "]],[]]]]],[1,"\\n            "],[8,[39,6],null,[["@name"],["confirm"]],[["default"],[[[[1,"\\n              "],[8,[30,7],null,null,[["default"],[[[[1,"Delete"]],[]]]]],[1,"\\n            "]],[7]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[6]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[5]]]]],[1,"\\n  "]],[4]]]]],[1,"\\n"]],[]],null]],[1]]]]],[1,"\\n"]],[]],null]],["item","item","item","Actions","Action","Confirmation","Confirm"],false,["if","gt","items","list-collection","not","onclick","block-slot","action","optional","concat","capitalize","tooltip","each","-track-array","route-match","ondelete"]]',moduleName:"consul-ui/components/consul/intention/permission/list/index.hbs",isStrictMode:!1})
-var r=(0,t.setComponentTemplate)(l,t.default.extend({tagName:""}))
-e.default=r})),define("consul-ui/components/consul/intention/search-bar/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"YTLr6u9H",block:'[[[8,[39,0],[[24,0,"consul-intention-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","filter","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.intention.search-bar.",[30,3,["status","key"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.intention.search-bar.",[30,3,["status","value"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n    "]],[3]],[[[1,"\\n      "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,5],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n"],[41,[30,2,["searchproperty"]],[[[1,"        "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n          "],[8,[39,7],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,"\\n              "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,7],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Optgroup"]],[30,9,["Option"]]],[[[42,[28,[37,9],[[28,[37,9],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"              "],[8,[30,11],null,[["@value","@selected"],[[30,12],[28,[37,10],[[30,12],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,11],[[30,12]],null]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[12]],null]],[10,11]]],[1,"          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n    "]],[6]],[[[1,"\\n      "],[8,[30,13,["Select"]],[[24,0,"type-access"]],[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["access","change"]]],null],true]],[["default"],[[[[1,"\\n        "],[8,[39,7],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[28,[35,2],["components.consul.intention.search-bar.access.name"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,7],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,14,["Optgroup"]],[30,14,["Option"]]],[[[42,[28,[37,9],[[28,[37,9],[[28,[37,4],["allow","deny",""],null]],null]],null],null,[[[1,"          "],[8,[30,16],[[16,0,[28,[37,3],["value-",[30,17]],null]]],[["@value","@selected"],[[28,[37,12],[[30,17],"app-aware"],null],[28,[37,10],[[28,[37,12],[[30,17],"app-aware"],null],[30,2,["access","value"]]],null]]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,[28,[35,2],[[28,[37,3],["components.consul.intention.search-bar.access.options.",[28,[37,12],[[30,17],"app-aware"],null]],null]],null]],[13],[1,"\\n          "]],[]]]]],[1,"\\n"]],[17]],null]],[15,16]]],[1,"        "]],[]]]]],[1,"\\n      "]],[14]]]]],[1,"\\n    "]],[13]],[[[1,"\\n      "],[8,[30,18,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,19,["change"]]],null],false,true]],[["default"],[[[[1,"\\n        "],[8,[39,7],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n"],[44,[[28,[37,13],[[28,[37,4],[[28,[37,4],["Action:asc",[28,[37,2],["components.consul.intention.search-bar.sort.access.asc"],null]],null],[28,[37,4],["Action:desc",[28,[37,2],["components.consul.intention.search-bar.sort.access.desc"],null]],null],[28,[37,4],["SourceName:asc",[28,[37,2],["components.consul.intention.search-bar.sort.source-name.asc"],null]],null],[28,[37,4],["SourceName:desc",[28,[37,2],["components.consul.intention.search-bar.sort.source-name.desc"],null]],null],[28,[37,4],["DestinationName:asc",[28,[37,2],["components.consul.intention.search-bar.sort.destination-name.asc"],null]],null],[28,[37,4],["DestinationName:desc",[28,[37,2],["components.consul.intention.search-bar.sort.destination-name.desc"],null]],null],[28,[37,4],["Precedence:asc",[28,[37,2],["common.sort.numeric.asc"],null]],null],[28,[37,4],["Precedence:desc",[28,[37,2],["common.sort.numeric.desc"],null]],null]],null]],null]],[[[1,"              "],[1,[28,[35,14],[[30,21],[30,19,["value"]]],null]],[1,"\\n"]],[21]]],[1,"          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,7],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,20,["Optgroup"]],[30,20,["Option"]]],[[[1,"        "],[8,[30,22],null,[["@label"],[[28,[37,2],["components.consul.intention.search-bar.sort.access.name"],null]]],[["default"],[[[[1,"\\n          "],[8,[30,23],null,[["@value","@selected"],["Action:asc",[28,[37,15],["Action:asc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["components.consul.intention.search-bar.sort.access.asc"],null]]],[]]]]],[1,"\\n          "],[8,[30,23],null,[["@value","@selected"],["Action:desc",[28,[37,15],["Action:desc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["components.consul.intention.search-bar.sort.access.desc"],null]]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[30,22],null,[["@label"],[[28,[37,2],["components.consul.intention.search-bar.sort.source-name.name"],null]]],[["default"],[[[[1,"\\n          "],[8,[30,23],null,[["@value","@selected"],["SourceName:asc",[28,[37,15],["SourceName:asc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n          "],[8,[30,23],null,[["@value","@selected"],["SourceName:desc",[28,[37,15],["SourceName:desc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[30,22],null,[["@label"],[[28,[37,2],["components.consul.intention.search-bar.sort.destination-name.name"],null]]],[["default"],[[[[1,"\\n          "],[8,[30,23],null,[["@value","@selected"],["DestinationName:asc",[28,[37,15],["DestinationName:asc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n          "],[8,[30,23],null,[["@value","@selected"],["DestinationName:desc",[28,[37,15],["DestinationName:desc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[30,22],null,[["@label"],[[28,[37,2],["components.consul.intention.search-bar.sort.precedence.name"],null]]],[["default"],[[[[1,"\\n          "],[8,[30,23],null,[["@value","@selected"],["Precedence:asc",[28,[37,15],["Precedence:asc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.numeric.asc"],null]]],[]]]]],[1,"\\n          "],[8,[30,23],null,[["@value","@selected"],["Precedence:desc",[28,[37,15],["Precedence:desc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.numeric.desc"],null]]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[22,23]]],[1,"        "]],[]]]]],[1,"\\n      "]],[20]]]]],[1,"\\n    "]],[18]]]]]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Optgroup","Option","prop","search","components","Optgroup","Option","item","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","action","if","block-slot","each","-track-array","includes","lowercase","or","from-entries","get","eq"]]',moduleName:"consul-ui/components/consul/intention/search-bar/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/intention/view/index",["exports","@ember/component","@ember/template-factory"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,n.createTemplateFactory)({id:"+zan8Nkf",block:'[[[11,0],[24,0,"consul-intention-view"],[17,1],[12],[1,"\\n\\n  "],[10,0],[14,0,"definition-table"],[12],[1,"\\n      "],[10,"dl"],[12],[1,"\\n        "],[10,"dt"],[12],[1,"Destination"],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[8,[39,0],null,[["@item","@nspace","@partition","@service"],[[28,[37,1],null,[["Namespace","Partition","Service"],[[33,2,["DestinationNS"]],[33,2,["DestinationPartition"]],[33,2,["DestinationName"]]]]],"-","-",true]],null],[1,"\\n        "],[13],[1,"\\n        "],[10,"dt"],[12],[1,"Source"],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[8,[39,0],null,[["@item","@nspace","@partition","@service"],[[28,[37,1],null,[["Namespace","Partition","Service","PeerName"],[[33,2,["SourceNS"]],[33,2,["SourcePartition"]],[33,2,["SourceName"]],[33,2,["SourcePeer"]]]]],"-","-",true]],null],[1,"\\n        "],[13],[1,"\\n"],[41,[33,2,["Action"]],[[[1,"        "],[10,"dt"],[12],[1,"Action"],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[1,[33,2,["Action"]]],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[1,"        "],[10,"dt"],[12],[1,"Description"],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[1,[28,[35,4],[[33,2,["Description"]],"N/A"],null]],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n  "],[13],[1,"\\n\\n"],[41,[28,[37,5],[[33,2,["Permissions","length"]],0],null],[[[1,"  "],[10,"h2"],[12],[1,"Permissions"],[13],[1,"\\n  "],[8,[39,6],null,null,null],[1,"\\n  "],[8,[39,7],null,[["@items"],[[33,2,["Permissions"]]]],null],[1,"\\n"]],[]],null],[1,"\\n"],[13],[1,"\\n"]],["&attrs"],false,["consul/bucket/list","hash","item","if","or","gt","consul/intention/notice/permissions","consul/intention/permission/list"]]',moduleName:"consul-ui/components/consul/intention/view/index.hbs",isStrictMode:!1})
-var r=(0,t.setComponentTemplate)(l,t.default.extend({tagName:""}))
-e.default=r})),define("consul-ui/components/consul/kind/index",["exports","@ember/component","@ember/template-factory","@ember/object","ember-cli-string-helpers/helpers/titleize","ember-cli-string-helpers/helpers/humanize"],(function(e,t,n,l,r,i){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,n.createTemplateFactory)({id:"uD6fm7hf",block:'[[[41,[33,1,["Kind"]],[[[41,[33,2],[[[1,"    "],[10,"dl"],[14,0,"tooltip-panel"],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        "],[10,1],[14,0,"consul-kind"],[12],[1,"\\n          "],[1,[34,3]],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[8,[39,4],null,[["@position"],["left"]],[["default"],[[[[1,"\\n          "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n"],[41,[28,[37,6],[[33,1,["Kind"]],"ingress-gateway"],null],[[[1,"              Ingress gateways enable ingress traffic from services outside the Consul service mesh to services inside the Consul service mesh.\\n"]],[]],[[[41,[28,[37,6],[[33,1,["Kind"]],"terminating-gateway"],null],[[[1,"              Terminating gateways allow connect-enabled services in Consul service mesh to communicate with services outside the service mesh.\\n"]],[]],[[[41,[28,[37,6],[[33,1,["Kind"]],"api-gateway"],null],[[[1,"              API gateways enable ingress traffic from services outside the Consul service mesh to services inside the Consul service mesh.\\n"]],[]],[[[1,"              Mesh gateways enable routing of Connect traffic between different Consul datacenters.\\n            "]],[]]]],[]]]],[]]],[1,"          "]],[]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["menu"]],[["default"],[[[[1,"\\n            "],[10,"li"],[14,"role","separator"],[12],[1,"\\n"],[41,[28,[37,6],[[33,1,["Kind"]],"ingress-gateway"],null],[[[1,"                  About Ingress gateways\\n"]],[]],[[[41,[28,[37,6],[[33,1,["Kind"]],"terminating-gateway"],null],[[[1,"                  About Terminating gateways\\n"]],[]],[[[41,[28,[37,6],[[33,1,["Kind"]],"api-gateway"],null],[[[1,"                  About API gateways\\n"]],[]],[[[1,"                  About Mesh gateways\\n              "]],[]]]],[]]]],[]]],[1,"            "],[13],[1,"\\n"],[44,[[28,[37,8],[[28,[37,9],[[28,[37,9],["ingress-gateway","/consul/developer-mesh/ingress-gateways"],null],[28,[37,9],["terminating-gateway","/consul/developer-mesh/understand-terminating-gateways"],null],[28,[37,9],["mesh-gateway","/consul/developer-mesh/connect-gateways"],null]],null]],null]],[[[1,"            "],[10,"li"],[14,"role","none"],[14,0,"learn-link"],[12],[1,"\\n              "],[10,3],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[28,[37,10],[[28,[37,11],["CONSUL_DOCS_LEARN_URL"],null],[28,[37,12],[[30,1],[33,1,["Kind"]]],null]],null]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"\\n                Learn guides\\n              "],[13],[1,"\\n            "],[13],[1,"\\n"]],[1]]],[44,[[28,[37,8],[[28,[37,9],[[28,[37,9],["ingress-gateway","/connect/gateways/ingress-gateway"],null],[28,[37,9],["terminating-gateway","/connect/gateways/terminating-gateway"],null],[28,[37,9],["api-gateway","/connect/gateways/api-gateway"],null],[28,[37,9],["mesh-gateway","/connect/gateways/mesh-gateway"],null]],null]],null]],[[[1,"            "],[10,"li"],[14,"role","none"],[14,0,"docs-link"],[12],[1,"\\n              "],[10,3],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[28,[37,10],[[28,[37,11],["CONSUL_DOCS_URL"],null],[28,[37,12],[[30,2],[33,1,["Kind"]]],null]],null]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"\\n                Documentation\\n              "],[13],[1,"\\n            "],[13],[1,"\\n            "],[10,"li"],[14,"role","separator"],[12],[1,"\\n              Other gateway types\\n            "],[13],[1,"\\n"],[41,[28,[37,13],[[33,1,["Kind"]],"mesh-gateway"],null],[[[1,"            "],[10,"li"],[14,"role","none"],[14,0,"docs-link"],[12],[1,"\\n              "],[10,3],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[28,[37,10],[[28,[37,11],["CONSUL_DOCS_URL"],null],[28,[37,12],[[30,2],"mesh-gateway"],null]],null]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"\\n                Mesh gateways\\n              "],[13],[1,"\\n            "],[13],[1,"\\n"]],[]],null],[41,[28,[37,13],[[33,1,["Kind"]],"terminating-gateway"],null],[[[1,"            "],[10,"li"],[14,"role","none"],[14,0,"docs-link"],[12],[1,"\\n              "],[10,3],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[28,[37,10],[[28,[37,11],["CONSUL_DOCS_URL"],null],[28,[37,12],[[30,2],"terminating-gateway"],null]],null]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"\\n                Terminating gateways\\n              "],[13],[1,"\\n            "],[13],[1,"\\n"]],[]],null],[41,[28,[37,13],[[33,1,["Kind"]],"ingress-gateway"],null],[[[1,"            "],[10,"li"],[14,"role","none"],[14,0,"docs-link"],[12],[1,"\\n              "],[10,3],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[28,[37,10],[[28,[37,11],["CONSUL_DOCS_URL"],null],[28,[37,12],[[30,2],"ingress-gateway"],null]],null]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"\\n                Ingress gateways\\n              "],[13],[1,"\\n            "],[13],[1,"\\n"]],[]],null],[41,[28,[37,13],[[33,1,["Kind"]],"api-gateway"],null],[[[1,"            "],[10,"li"],[14,"role","none"],[14,0,"docs-link"],[12],[1,"\\n              "],[10,3],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[28,[37,10],[[28,[37,11],["CONSUL_DOCS_URL"],null],[28,[37,12],[[30,2],"api-gateway"],null]],null]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"\\n                API gateways\\n              "],[13],[1,"\\n            "],[13],[1,"\\n"]],[]],null]],[2]]],[1,"          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[1,"    "],[10,1],[14,0,"consul-kind"],[12],[1,"\\n      "],[1,[34,3]],[1,"\\n    "],[13],[1,"\\n"]],[]]]],[]],null]],["link","link"],false,["if","item","withInfo","Name","menu-panel","block-slot","eq","let","from-entries","array","concat","env","get","not-eq"]]',moduleName:"consul-ui/components/consul/kind/index.hbs",isStrictMode:!1}),a={"api-gateway":"API Gateway","mesh-gateway":"Mesh Gateway","ingress-gateway":"Ingress Gateway","terminating-gateway":"Terminating Gateway"}
-var u=(0,t.setComponentTemplate)(o,t.default.extend({tagName:"",Name:(0,l.computed)("item.Kind",(function(){const e=a[this.item.Kind]
-return e||(0,r.titleize)((0,i.humanize)(this.item.Kind))}))}))
-e.default=u})),define("consul-ui/components/consul/kv/form/index",["exports","@ember/component","@ember/template-factory","@ember/object","@ember/service"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,n.createTemplateFactory)({id:"Wsyfh84D",block:'[[[8,[39,0],null,[["@dc","@nspace","@partition","@type","@label","@autofill","@item","@src","@onchange","@onsubmit"],[[99,1,["@dc"]],[99,2,["@nspace"]],[99,3,["@partition"]],"kv","key",[99,4,["@autofill"]],[99,5,["@item"]],[99,6,["@src"]],[28,[37,7],[[30,0],"change"],null],[28,[37,7],[[30,0],[33,8]],null]]],[["default"],[[[[1,"\\n  "],[8,[39,9],null,[["@name"],["content"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,11],["write kv"],[["item"],[[30,1,["data"]]]]]],[[[1,"    "],[10,"form"],[15,"onsubmit",[28,[37,7],[[30,0],[30,1,["submit"]]],null]],[12],[1,"\\n      "],[11,"fieldset"],[4,[38,12],[[28,[37,13],[[30,2],[30,1,["disabled"]]],null]],null],[12],[1,"\\n"],[41,[30,1,["isCreate"]],[[[1,"        "],[10,"label"],[15,0,[29,["type-text",[52,[30,1,["data","error","Key"]]," has-error"]]]],[12],[1,"\\n            "],[10,1],[12],[1,"Key or folder"],[13],[1,"\\n            "],[10,"input"],[14,"autofocus","autofocus"],[15,2,[28,[37,15],[[30,1,["data","Key"]],[33,16]],null]],[14,3,"additional"],[15,"oninput",[28,[37,7],[[30,0],[30,1,["change"]]],null]],[14,"placeholder","Key or folder"],[14,4,"text"],[12],[13],[1,"\\n            "],[10,"em"],[12],[1,"To create a folder, end a key with "],[10,"code"],[12],[1,"/"],[13],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[28,[37,13],[[28,[37,17],[[28,[37,15],[[30,1,["data","Key"]],[33,16]],null],""],null],[28,[37,18],[[28,[37,19],[[30,1,["data","Key"]]],null],"/"],null]],null],[[[1,"        "],[10,0],[12],[1,"\\n            "],[10,0],[14,0,"type-toggle"],[12],[1,"\\n              "],[10,"label"],[12],[1,"\\n                  "],[11,"input"],[24,3,"json"],[16,"checked",[52,[33,20],"checked"]],[16,"onchange",[28,[37,7],[[30,0],[30,1,["change"]]],null]],[24,4,"checkbox"],[4,[38,12],[false],null],[12],[13],[1,"\\n                  "],[10,1],[12],[1,"Code"],[13],[1,"\\n              "],[13],[1,"\\n            "],[13],[1,"\\n\\n            "],[10,"label"],[14,"for",""],[15,0,[29,["type-text",[52,[30,1,["data","error","Value"]]," has-error"]]]],[12],[1,"\\n"],[41,[33,20],[[[1,"                "],[8,[39,21],null,[["@name","@readonly","@value","@onkeyup"],["value",[28,[37,13],[[30,2],[30,1,["disabled"]]],null],[28,[37,22],[[30,1,["data","Value"]]],null],[28,[37,7],[[30,0],[30,1,["change"]],"value"],null]]],[["label"],[[[[1,"Value"]],[]]]]],[1,"\\n"]],[]],[[[1,"                "],[10,1],[12],[1,"Value"],[13],[1,"\\n                "],[11,"textarea"],[16,"autofocus",[28,[37,23],[[30,1,["isCreate"]]],null]],[24,3,"value"],[16,"oninput",[28,[37,7],[[30,0],[30,1,["change"]]],null]],[4,[38,12],[[28,[37,13],[[30,2],[30,1,["disabled"]]],null]],null],[12],[1,[28,[35,22],[[30,1,["data","Value"]]],null]],[13],[1,"\\n"]],[]]],[1,"            "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[1,"      "],[13],[1,"\\n      "],[8,[39,24],null,null,[["default"],[[[[1,"\\n"],[41,[30,1,["isCreate"]],[[[41,[28,[37,23],[[30,2]],null],[[[1,"            "],[8,[39,25],[[16,"disabled",[28,[37,13],[[30,1,["data","isPristine"]],[30,1,["data","isInvalid"]],[30,1,["disabled"]]],null]],[24,4,"submit"]],[["@text"],["Save"]],null],[1,"\\n"]],[]],null],[1,"\\n          "],[8,[39,25],[[16,"disabled",[30,1,["disabled"]]],[16,"onclick",[28,[37,7],[[30,0],[33,26],[30,1,["data"]]],null]],[24,4,"reset"]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n"]],[]],[[[41,[28,[37,23],[[30,2]],null],[[[1,"            "],[8,[39,25],[[16,"disabled",[28,[37,13],[[30,1,["data","isInvalid"]],[30,1,["disabled"]]],null]],[24,4,"submit"]],[["@text"],["Save"]],null],[1,"\\n"]],[]],null],[1,"          "],[8,[39,25],[[16,"disabled",[30,1,["disabled"]]],[16,"onclick",[28,[37,7],[[30,0],[33,26],[30,1,["data"]]],null]],[24,4,"reset"]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n"],[41,[28,[37,23],[[30,2]],null],[[[1,"            "],[8,[39,27],null,[["@message"],["Are you sure you want to delete this key?"]],[["default"],[[[[1,"\\n              "],[8,[39,9],null,[["@name"],["action"]],[["default"],[[[[1,"\\n                "],[8,[39,25],[[16,"disabled",[30,1,["disabled"]]],[4,[38,28],["click",[28,[37,7],[[30,0],[30,3],[30,1,["delete"]]],null]],null]],[["@text","@color"],["Delete","critical"]],null],[1,"\\n              "]],[3]]]]],[1,"\\n              "],[8,[39,9],null,[["@name"],["dialog"]],[["default"],[[[[1,"\\n                "],[8,[39,29],null,[["@message","@execute","@cancel"],[[30,6],[30,4],[30,5]]],null],[1,"\\n              "]],[4,5,6]]]]],[1,"\\n            "]],[]]]]],[1,"\\n"]],[]],null]],[]]],[1,"      "]],[]]]]],[1,"\\n    "],[13],[1,"\\n"]],[2]]],[1,"    "]],[]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["api","disabld","confirm","execute","cancel","message"],false,["data-form","dc","nspace","partition","autofill","item","src","action","onsubmit","block-slot","let","cannot","disabled","or","if","left-trim","parent","eq","not-eq","last","json","code-editor","atob","not","hds/button-set","hds/button","oncancel","confirmation-dialog","on","delete-confirmation"]]',moduleName:"consul-ui/components/consul/kv/form/index.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,t.default.extend({tagName:"",encoder:(0,r.inject)("btoa"),json:!0,ondelete:function(){this.onsubmit(...arguments)},oncancel:function(){this.onsubmit(...arguments)},onsubmit:function(){},actions:{change:function(e,t){const n=t.getData()
-try{t.handleEvent(e)}catch(r){const t=e.target
-let i
-switch(t.name){case"value":(0,l.set)(n,"Value",this.encoder.execute(t.value))
-break
-case"additional":i=(0,l.get)(this,"parent"),(0,l.set)(n,"Key",`${"/"!==i?i:""}${t.value}`)
-break
-case"json":(0,l.set)(this,"json",!this.json)
-break
-default:throw r}}}}}))
-e.default=o})),define("consul-ui/components/consul/kv/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"OYo2s3qR",block:'[[[8,[39,0],[[24,0,"consul-kv-list"],[17,1]],[["@items"],[[30,2]]],[["default"],[[[[1,"\\n  "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n    "],[10,"th"],[12],[1,"Name"],[13],[1,"\\n  "]],[]]]]],[1,"\\n  "],[8,[39,1],null,[["@name"],["row"]],[["default"],[[[[1,"\\n    "],[10,"td"],[15,0,[52,[30,3,["isFolder"]],"folder","file"]],[12],[1,"\\n        "],[10,3],[15,6,[28,[37,3],[[52,[30,3,["isFolder"]],"dc.kv.folder","dc.kv.edit"],[30,3,["Key"]]],null]],[12],[1,[28,[35,4],[[28,[37,5],[[30,3,["Key"]],[30,5,["Key"]]],null],"/"],null]],[13],[1,"\\n    "],[13],[1,"\\n  "]],[]]]]],[1,"\\n  "],[8,[39,1],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n    "],[8,[39,6],null,[["@expanded","@onchange","@keyboardAccess"],[[52,[28,[37,7],[[30,8],[30,6]],null],true,false],[28,[37,8],[[30,0],[30,7],[30,6]],null],false]],[["default"],[[[[1,"\\n      "],[8,[39,1],null,[["@name"],["trigger"]],[["default"],[[[[1,"\\n        More\\n      "]],[]]]]],[1,"\\n      "],[8,[39,1],null,[["@name"],["menu"]],[["default"],[[[[1,"\\n"],[41,[28,[37,9],["write kv"],[["item"],[[30,3]]]],[[[1,"          "],[10,"li"],[14,"role","none"],[12],[1,"\\n            "],[10,3],[14,"role","menuitem"],[14,"tabindex","-1"],[15,6,[28,[37,3],[[52,[30,3,["isFolder"]],"dc.kv.folder","dc.kv.edit"],[30,3,["Key"]]],null]],[12],[1,[52,[30,3,["isFolder"]],"View","Edit"]],[13],[1,"\\n          "],[13],[1,"\\n          "],[10,"li"],[14,"role","none"],[14,0,"dangerous"],[12],[1,"\\n            "],[10,"label"],[15,"for",[30,9]],[14,"role","menuitem"],[14,"tabindex","-1"],[15,"onkeypress",[30,11]],[12],[1,"Delete"],[13],[1,"\\n            "],[10,0],[14,"role","menu"],[12],[1,"\\n              "],[8,[39,10],[[24,0,"warning"]],null,[["header","body","actions"],[[[[1,"\\n                  Confirm Delete\\n                "]],[]],[[[1,"\\n                  "],[10,2],[12],[1,"\\n                    Are you sure you want to delete this KV entry?\\n                  "],[13],[1,"\\n                "]],[]],[[[1,"\\n                  "],[8,[30,12,["Action"]],[[24,0,"dangerous"]],null,[["default"],[[[[1,"\\n                    "],[8,[39,8],[[24,0,"type-delete"],[24,"tabindex","-1"],[4,[38,11],["click",[28,[37,12],[[28,[37,8],[[30,0],[30,7]],null],[28,[37,8],[[30,0],[30,13],[30,3]],null]],null]],null]],null,[["default"],[[[[1,"\\n                      Delete\\n                    "]],[]]]]],[1,"\\n                  "]],[]]]]],[1,"\\n                  "],[8,[30,12,["Action"]],null,null,[["default"],[[[[1,"\\n                    "],[8,[39,8],null,[["@for"],[[30,9]]],[["default"],[[[[1,"\\n                      Cancel\\n                    "]],[]]]]],[1,"\\n                  "]],[]]]]],[1,"\\n                "]],[12]]]]],[1,"\\n            "],[13],[1,"\\n          "],[13],[1,"\\n"]],[]],[[[1,"          "],[10,"li"],[14,"role","none"],[12],[1,"\\n            "],[10,3],[14,"role","menuitem"],[14,"tabindex","-1"],[15,6,[28,[37,3],[[52,[30,3,["isFolder"]],"dc.kv.folder","dc.kv.edit"],[30,3,["Key"]]],null]],[12],[1,"View"],[13],[1,"\\n          "],[13],[1,"\\n"]],[]]],[1,"      "]],[9,10,11]]]]],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[6,7,8]]]]],[1,"\\n"]],[3,4]]]]]],["&attrs","@items","item","index","@parent","index","change","checked","confirm","send","keypressClick","Actions","@delete"],false,["tabular-collection","block-slot","if","href-to","right-trim","left-trim","popover-menu","eq","action","can","informed-action","on","queue"]]',moduleName:"consul-ui/components/consul/kv/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/kv/search-bar/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"sF1xY1/s",block:'[[[8,[39,0],[[24,0,"consul-kv-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","filter","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.kv.search-bar.",[30,3,["status","key"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.kv.search-bar.",[30,3,["status","value"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n    "]],[3]],[[[1,"\\n      "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,5],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n"],[41,[30,2,["searchproperty"]],[[[1,"        "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n          "],[8,[39,7],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,"\\n              "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,7],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Optgroup"]],[30,9,["Option"]]],[[[42,[28,[37,9],[[28,[37,9],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"              "],[8,[30,11],null,[["@value","@selected"],[[30,12],[28,[37,10],[[30,12],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,11],[[30,12]],null]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[12]],null]],[10,11]]],[1,"          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n    "]],[6]],[[[1,"\\n      "],[8,[30,13,["Select"]],[[24,0,"type-kind"]],[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["kind","change"]]],null],true]],[["default"],[[[[1,"\\n        "],[8,[39,7],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[28,[35,2],["components.consul.kv.search-bar.kind.name"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,7],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,14,["Optgroup"]],[30,14,["Option"]]],[[[42,[28,[37,9],[[28,[37,9],[[28,[37,4],["folder","key"],null]],null]],null],null,[[[1,"          "],[8,[30,16],[[24,0,"value-{item}}"]],[["@value","@selected"],[[30,17],[28,[37,10],[[30,17],[30,2,["kind","value"]]],null]]],[["default"],[[[[1,"\\n            "],[1,[28,[35,2],[[28,[37,3],["components.consul.kv.search-bar.kind.options.",[30,17]],null]],null]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[17]],null]],[15,16]]],[1,"        "]],[]]]]],[1,"\\n      "]],[14]]]]],[1,"\\n    "]],[13]],[[[1,"\\n      "],[8,[30,18,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,19,["change"]]],null],false,true]],[["default"],[[[[1,"\\n        "],[8,[39,7],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n"],[44,[[28,[37,12],[[28,[37,4],[[28,[37,4],["Key:asc",[28,[37,2],["common.sort.alpha.asc"],null]],null],[28,[37,4],["Key:desc",[28,[37,2],["common.sort.alpha.desc"],null]],null],[28,[37,4],["Kind:asc",[28,[37,2],["components.consul.kv.search-bar.sort.kind.asc"],null]],null],[28,[37,4],["Kind:desc",[28,[37,2],["components.consul.kv.search-bar.sort.kind.desc"],null]],null]],null]],null]],[[[1,"              "],[1,[28,[35,13],[[30,21],[30,19,["value"]]],null]],[1,"\\n"]],[21]]],[1,"          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,7],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,20,["Optgroup"]],[30,20,["Option"]]],[[[1,"          "],[8,[30,22],null,[["@label"],[[28,[37,2],["common.consul.name"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,23],null,[["@value","@selected"],["Key:asc",[28,[37,14],["Key:asc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,23],null,[["@value","@selected"],["Key:desc",[28,[37,14],["Key:desc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,22],null,[["@label"],[[28,[37,2],["components.consul.kv.search-bar.kind.name"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,23],null,[["@value","@selected"],["Kind:asc",[28,[37,14],["Kind:asc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["components.consul.kv.search-bar.sort.kind.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,23],null,[["@value","@selected"],["Kind:desc",[28,[37,14],["Kind:desc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["components.consul.kv.search-bar.sort.kind.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[22,23]]],[1,"        "]],[]]]]],[1,"\\n      "]],[20]]]]],[1,"\\n    "]],[18]]]]],[1,"\\n"]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Optgroup","Option","prop","search","components","Optgroup","Option","item","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","action","if","block-slot","each","-track-array","includes","lowercase","from-entries","get","eq"]]',moduleName:"consul-ui/components/consul/kv/search-bar/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/loader/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"FSVimMul",block:'[[[11,0],[24,0,"consul-loader"],[17,1],[12],[1,"\\n  "],[10,"svg"],[14,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[14,"xmlns:xlink","http://www.w3.org/1999/xlink","http://www.w3.org/2000/xmlns/"],[14,"width","44px"],[14,"height","44px"],[14,"viewBox","0 0 44 44"],[14,"version","1.1"],[12],[1,"\\n      "],[10,"g"],[12],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","27"],[14,"cy","2"],[14,5,"transform-origin: 27px 2px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","17"],[14,"cy","2"],[14,5,"transform-origin: 17px 2px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","27"],[14,"cy","42"],[14,5,"transform-origin: 27px 42px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","17"],[14,"cy","42"],[14,5,"transform-origin: 17px 42px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","2"],[14,"cy","17"],[14,5,"transform-origin: 2px 17px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","2"],[14,"cy","27"],[14,5,"transform-origin: 2px 27px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","42"],[14,"cy","17"],[14,5,"transform-origin: 42px 17px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","42"],[14,"cy","27"],[14,5,"transform-origin: 42px 27px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","33"],[14,"cy","4"],[14,5,"transform-origin: 33px 4px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","11"],[14,"cy","4"],[14,5,"transform-origin: 11px 4px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","33"],[14,"cy","40"],[14,5,"transform-origin: 33px 40px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","11"],[14,"cy","40"],[14,5,"transform-origin: 11px 40px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","40"],[14,"cy","11"],[14,5,"transform-origin: 40px 11px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","4"],[14,"cy","33"],[14,5,"transform-origin: 4px 33px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","40"],[14,"cy","33"],[14,5,"transform-origin: 40px 33px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","4"],[14,"cy","11"],[14,5,"transform-origin: 4px 11px"],[12],[13],[1,"\\n      "],[13],[1,"\\n      "],[10,"g"],[12],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","22"],[14,"cy","4"],[14,5,"transform-origin: 22px 4px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","22"],[14,"cy","40"],[14,5,"transform-origin: 22px 40px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","4"],[14,"cy","22"],[14,5,"transform-origin: 4px 22px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","40"],[14,"cy","22"],[14,5,"transform-origin: 40px 22px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","9"],[14,"cy","9"],[14,5,"transform-origin: 9px 9px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","35"],[14,"cy","35"],[14,5,"transform-origin: 35px 35px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","35"],[14,"cy","9"],[14,5,"transform-origin: 35px 9px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","9"],[14,"cy","35"],[14,5,"transform-origin: 9px 35px"],[12],[13],[1,"\\n      "],[13],[1,"\\n      "],[10,"g"],[12],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","28"],[14,"cy","8"],[14,5,"transform-origin: 28px 8px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","16"],[14,"cy","8"],[14,5,"transform-origin: 16px 8px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","28"],[14,"cy","36"],[14,5,"transform-origin: 28px 36px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","16"],[14,"cy","36"],[14,5,"transform-origin: 16px 36px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","8"],[14,"cy","28"],[14,5,"transform-origin: 8px 28px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","8"],[14,"cy","16"],[14,5,"transform-origin: 8px 16px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","36"],[14,"cy","28"],[14,5,"transform-origin: 36px 28px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","36"],[14,"cy","16"],[14,5,"transform-origin: 36px 16px"],[12],[13],[1,"\\n      "],[13],[1,"\\n      "],[10,"g"],[12],[1,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","22"],[14,"cy","12"],[14,5,"transform-origin: 22px 12px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","22"],[14,"cy","32"],[14,5,"transform-origin: 22px 32px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","12"],[14,"cy","22"],[14,5,"transform-origin: 12px 22px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","32"],[14,"cy","22"],[14,5,"transform-origin: 32px 22px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","15"],[14,"cy","15"],[14,5,"transform-origin: 15px 15px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","29"],[14,"cy","29"],[14,5,"transform-origin: 29px 29px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","29"],[14,"cy","15"],[14,5,"transform-origin: 29px 15px"],[12],[13],[1,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","15"],[14,"cy","29"],[14,5,"transform-origin: 15px 29px"],[12],[13],[1,"\\n      "],[13],[1,"\\n      "],[10,"g"],[12],[1,"\\n          "],[10,"circle"],[14,"r","9"],[14,"cx","22"],[14,"cy","22"],[14,5,"transform-origin: 22px 22px"],[12],[13],[1,"\\n      "],[13],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n"]],["&attrs"],false,[]]',moduleName:"consul-ui/components/consul/loader/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/lock-session/form/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"Hv2qW8N0",block:'[[[11,0],[24,0,"consul-lock-session-form"],[17,1],[12],[1,"\\n  "],[8,[39,0],null,[["@sink","@type","@label","@ondelete","@onchange"],[[28,[37,1],["/${partition}/${nspace}/${dc}/session",[28,[37,2],null,[["partition","nspace","dc"],[[30,2,["Partition"]],[30,2,["Namespace"]],[30,2,["Datacenter"]]]]]],null],"session","Lock Session",[28,[37,3],[[52,[30,3],[30,3],[30,4]],[30,2]],null],[28,[37,3],[[28,[37,5],[[30,4]],null],[30,2]],null]]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@name"],["removed"]],[["default"],[[[[1,"\\n        "],[8,[39,7],[[4,[38,8],null,[["after"],[[28,[37,9],[[30,0],[30,6]],null]]]]],[["@type"],["remove"]],null],[1,"\\n      "]],[6]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["error"]],[["default"],[[[[1,"\\n        "],[8,[39,7],[[4,[38,8],null,[["after"],[[28,[37,9],[[30,0],[30,7]],null]]]]],[["@type","@error"],["remove",[30,8]]],null],[1,"\\n      "]],[7,8]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["content"]],[["default"],[[[[1,"\\n        "],[10,0],[14,0,"definition-table"],[12],[1,"\\n          "],[10,"dl"],[12],[1,"\\n"],[41,[30,2,["Name"]],[[[1,"            "],[10,"dt"],[12],[1,"Name"],[13],[1,"\\n            "],[10,"dd"],[12],[1,[30,2,["Name"]]],[13],[1,"\\n"]],[]],null],[1,"            "],[10,"dt"],[12],[1,"ID"],[13],[1,"\\n            "],[10,"dd"],[12],[1,[30,2,["ID"]]],[13],[1,"\\n            "],[10,"dt"],[12],[1,"Node"],[13],[1,"\\n            "],[10,"dd"],[12],[1,"\\n              "],[8,[39,10],null,[["@text","@icon","@href","@isHrefExternal","@size","@color"],[[30,2,["Node"]],"git-commit",[28,[37,11],["dc.nodes.show",[30,2,["Node"]]],null],false,"small","tertiary"]],null],[1,"\\n            "],[13],[1,"\\n            "],[10,"dt"],[12],[1,"Delay"],[13],[1,"\\n            "],[10,"dd"],[12],[1,[28,[35,12],[[30,2,["LockDelay"]]],null]],[13],[1,"\\n            "],[10,"dt"],[12],[1,"TTL"],[13],[1,"\\n            "],[10,"dd"],[12],[1,[28,[35,13],[[30,2,["TTL"]],"-"],null]],[13],[1,"\\n            "],[10,"dt"],[12],[1,"Behavior"],[13],[1,"\\n            "],[10,"dd"],[12],[1,[30,2,["Behavior"]]],[13],[1,"\\n"],[44,[[30,2,["checks"]]],[[[1,"            "],[10,"dt"],[12],[1,"Health Checks"],[13],[1,"\\n            "],[10,"dd"],[12],[1,"\\n"],[41,[28,[37,15],[[30,9,["length"]],0],null],[[[1,"                "],[1,[28,[35,16],[", ",[30,9]],null]],[1,"\\n"]],[]],[[[1,"                -\\n"]],[]]],[1,"            "],[13],[1,"\\n"]],[9]]],[1,"          "],[13],[1,"\\n        "],[13],[1,"\\n"],[41,[28,[37,17],["delete session"],[["item"],[[30,2]]]],[[[1,"        "],[8,[39,18],null,[["@message"],["Are you sure you want to invalidate this Lock Session?"]],[["default"],[[[[1,"\\n          "],[8,[39,6],null,[["@name"],["action"]],[["default"],[[[[1,"\\n            "],[8,[39,10],[[4,[38,19],["click",[28,[37,3],[[30,10],[28,[37,3],[[30,5,["delete"]],[30,2]],null]],null]],null]],[["@text","@color"],["Invalidate Session","critical"]],null],[1,"\\n          "]],[10]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["dialog"]],[["default"],[[[[1,"\\n            "],[10,2],[12],[1,"\\n              "],[1,[30,13]],[1,"\\n            "],[13],[1,"\\n            "],[8,[39,20],null,null,[["default"],[[[[1,"\\n              "],[8,[39,10],[[4,[38,19],["click",[28,[37,3],[[30,11]],null]],null]],[["@text","@color"],["Confirm Invalidation","critical"]],null],[1,"\\n              "],[8,[39,10],[[4,[38,19],["click",[28,[37,3],[[30,12]],null]],null]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[11,12,13]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n    "]],[5]]]]],[1,"\\n"],[13]],["&attrs","@item","@ondelete","@onsubmit","writer","after","after","error","checks","confirm","execute","cancel","message"],false,["data-writer","uri","hash","fn","if","optional","block-slot","consul/lock-session/notifications","notification","action","hds/button","href-to","duration-from","or","let","gt","join","can","confirmation-dialog","on","hds/button-set"]]',moduleName:"consul-ui/components/consul/lock-session/form/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/lock-session/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"f75K08ts",block:'[[[8,[39,0],[[24,0,"consul-lock-session-list"],[17,1]],[["@items"],[[30,2]]],[["default"],[[[[1,"\\n  "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n"],[41,[30,3,["Name"]],[[[1,"    "],[10,1],[12],[1,[30,3,["Name"]]],[13],[1,"\\n"]],[]],[[[1,"    "],[10,1],[12],[1,"\\n      "],[1,[30,3,["ID"]]],[1,"\\n      "],[8,[39,3],null,[["@value","@name"],[[30,3,["ID"]],"ID"]],null],[1,"\\n    "],[13],[1,"\\n"]],[]]],[1,"  "]],[]]]]],[1,"\\n  "],[8,[39,1],null,[["@name"],["details"]],[["default"],[[[[1,"\\n"],[41,[30,3,["Name"]],[[[1,"    "],[10,"dl"],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        ID\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[8,[39,3],null,[["@value","@name"],[[30,3,["ID"]],"ID"]],null],[1,"\\n        "],[1,[30,3,["ID"]]],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[]],null],[1,"    "],[10,"dl"],[14,0,"lock-delay"],[12],[1,"\\n      "],[11,"dt"],[4,[38,4],null,null],[12],[1,"\\n        Delay\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,[28,[35,5],[[30,3,["LockDelay"]]],null]],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,"dl"],[14,0,"ttl"],[12],[1,"\\n      "],[11,"dt"],[4,[38,4],null,null],[12],[1,"\\n        TTL\\n      "],[13],[1,"\\n"],[41,[28,[37,6],[[30,3,["TTL"]],""],null],[[[1,"      "],[10,"dd"],[12],[1,"-"],[13],[1,"\\n"]],[]],[[[1,"      "],[10,"dd"],[12],[1,[30,3,["TTL"]]],[13],[1,"\\n"]],[]]],[1,"    "],[13],[1,"\\n    "],[10,"dl"],[14,0,"behavior"],[12],[1,"\\n      "],[11,"dt"],[4,[38,4],null,null],[12],[1,"\\n        Behavior\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,[30,3,["Behavior"]]],[13],[1,"\\n    "],[13],[1,"\\n"],[44,[[28,[37,8],[[30,3,["NodeChecks"]],[30,3,["ServiceChecks"]]],null]],[[[1,"    "],[10,"dl"],[14,0,"checks"],[12],[1,"\\n      "],[11,"dt"],[4,[38,4],null,null],[12],[1,"\\n        Checks\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n"],[41,[28,[37,9],[[30,5,["length"]],0],null],[[[42,[28,[37,11],[[28,[37,11],[[30,5]],null]],null],null,[[[1,"        "],[10,1],[12],[1,[30,6]],[13],[1,"\\n"]],[6]],null]],[]],[[[1,"        -\\n"]],[]]],[1,"      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[5]]],[1,"  "]],[]]]]],[1,"\\n  "],[8,[39,1],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n    "],[8,[39,12],null,[["@message"],["Are you sure you want to invalidate this session?"]],[["default"],[[[[1,"\\n      "],[8,[39,1],null,[["@name"],["action"]],[["default"],[[[[1,"\\n        "],[8,[39,13],[[4,[38,14],["click",[28,[37,15],[[30,7],[28,[37,15],[[30,8],[30,3]],null]],null]],null]],[["@text","@color"],["Invalidate","critical"]],null],[1,"\\n      "]],[7]]]]],[1,"\\n      "],[8,[39,1],null,[["@name"],["dialog"]],[["default"],[[[[1,"\\n        "],[10,2],[12],[1,"\\n          "],[1,[30,11]],[1,"\\n        "],[13],[1,"\\n        "],[8,[39,16],null,null,[["default"],[[[[1,"\\n          "],[8,[39,13],[[4,[38,14],["click",[28,[37,15],[[30,9]],null]],null]],[["@text","@color"],["Confirm Invalidate","critical"]],null],[1,"\\n          "],[8,[39,13],[[4,[38,14],["click",[28,[37,15],[[30,10]],null]],null]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n        "]],[]]]]],[1,"\\n      "]],[9,10,11]]]]],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[3,4]]]]]],["&attrs","@items","item","index","checks","item","confirm","@ondelete","execute","cancel","message"],false,["list-collection","block-slot","if","copy-button","tooltip","duration-from","eq","let","union","gt","each","-track-array","confirmation-dialog","hds/button","on","fn","hds/button-set"]]',moduleName:"consul-ui/components/consul/lock-session/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/lock-session/notifications/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"8UZIF1qV",block:'[[[41,[28,[37,1],[[30,1],"remove"],null],[[[41,[30,2],[[[1,"    "],[8,[39,2],[[17,3]],[["@color"],["critical"]],[["default"],[[[[1,"\\n      "],[8,[30,4,["Title"]],null,null,[["default"],[[[[1,"Error!"]],[]]]]],[1,"\\n      "],[8,[30,4,["Description"]],null,null,[["default"],[[[[1,"\\n        There was an error invalidating the Lock Session.\\n"],[41,[28,[37,3],[[30,2,["status"]],[30,2,["detail"]]],null],[[[1,"          "],[10,"br"],[12],[13],[1,[30,2,["status"]]],[1,": "],[1,[30,2,["detail"]]],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n    "]],[4]]]]],[1,"\\n"]],[]],[[[1,"    "],[8,[39,2],[[17,3]],[["@color"],["success"]],[["default"],[[[[1,"\\n      "],[8,[30,5,["Title"]],null,null,[["default"],[[[[1,"Success!"]],[]]]]],[1,"\\n      "],[8,[30,5,["Description"]],null,null,[["default"],[[[[1,"\\n        Your Lock Session has been invalidated.\\n      "]],[]]]]],[1,"\\n    "]],[5]]]]],[1,"\\n"]],[]]]],[]],[[[41,[28,[37,1],[[30,1],"kv"],null],[[[1,"  "],[8,[39,4],[[24,0,"mb-3"]],[["@type","@color"],["inline","warning"]],[["default"],[[[[1,"\\n    "],[8,[30,6,["Title"]],null,null,[["default"],[[[[1,"Warning"]],[]]]]],[1,"\\n    "],[8,[30,6,["Description"]],null,null,[["default"],[[[[1,"This KV has a lock session. You can edit KV\'s with lock sessions, but we recommend doing so with care, or not doing so at all. It may negatively impact the active node it\'s associated with. See below for more details on the Lock Session."]],[]]]]],[1,"\\n    "],[8,[30,6,["Link::Standalone"]],null,[["@text","@href","@icon","@iconPosition"],["Learn more",[29,[[28,[37,5],["CONSUL_DOCS_URL"],null],"/internals/sessions.html"]],"docs-link","trailing"]],null],[1,"\\n  "]],[6]]]]],[1,"\\n"]],[]],null]],[]]]],["@type","@error","&attrs","T","T","A"],false,["if","eq","hds/toast","and","hds/alert","env"]]',moduleName:"consul-ui/components/consul/lock-session/notifications/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/metadata/list/index",["exports","@ember/component","@ember/template-factory"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,n.createTemplateFactory)({id:"qvPSBKvv",block:'[[[8,[39,0],[[24,0,"consul-metadata-list"]],[["@items"],[[99,1,["@items"]]]],[["default"],[[[[1,"\\n    "],[8,[39,2],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"th"],[12],[1,"Key"],[13],[1,"\\n        "],[10,"th"],[12],[1,"Value"],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,2],null,[["@name"],["row"]],[["default"],[[[[1,"\\n        "],[10,"td"],[12],[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[28,[35,3],[0,[30,1]],null]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n        "],[10,"td"],[12],[1,"\\n          "],[10,1],[12],[1,[28,[35,3],[1,[30,1]],null]],[13],[1,"\\n        "],[13],[1,"\\n    "]],[]]]]],[1,"\\n"]],[1,2]]]]],[1,"\\n"]],["item","index"],false,["tabular-collection","items","block-slot","object-at"]]',moduleName:"consul-ui/components/consul/metadata/list/index.hbs",isStrictMode:!1})
-var r=(0,t.setComponentTemplate)(l,t.default.extend({tagName:""}))
-e.default=r})),define("consul-ui/components/consul/node-identity/template/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"YflZV/pQ",block:'[[[41,[28,[37,1],["use partitions"],null],[[[1,"partition \\""],[1,[28,[35,2],[[30,1],"default"],null]],[1,"\\" {\\n"],[41,[28,[37,1],["use nspaces"],null],[[[1,"  namespace \\"default\\" {\\n    node \\""],[1,[30,2]],[1,"\\" {\\n\\t    policy = \\"write\\"\\n    }\\n  }\\n  namespace_prefix \\"\\" {\\n    service_prefix \\"\\" {\\n\\t    policy = \\"read\\"\\n    }\\n  }\\n"]],[]],[[[1,"  node \\""],[1,[30,2]],[1,"\\" {\\n\\t  policy = \\"write\\"\\n  }\\n  service_prefix \\"\\" {\\n\\t  policy = \\"read\\"\\n  }\\n"]],[]]],[1,"}"]],[]],[[[41,[28,[37,1],["use nspaces"],null],[[[1,"namespace \\"default\\" {\\n  node \\""],[1,[30,2]],[1,"\\" {\\n\\t  policy = \\"write\\"\\n  }\\n}\\nnamespace_prefix \\"\\" {\\n  service_prefix \\"\\" {\\n\\t  policy = \\"read\\"\\n  }\\n}\\n"]],[]],[[[1,"node \\""],[1,[30,2]],[1,"\\" {\\n\\tpolicy = \\"write\\"\\n}\\nservice_prefix \\"\\" {\\n\\tpolicy = \\"read\\"\\n}"]],[]]]],[]]]],["@partition","@name"],false,["if","can","or"]]',moduleName:"consul-ui/components/consul/node-identity/template/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/node/agentless-notice/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","consul-ui/services/local-storage"],(function(e,t,n,l,r,i){var o,a,u
-function s(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const c=(0,n.createTemplateFactory)({id:"639y+0v2",block:'[[[41,[33,1],[[[1,"  "],[8,[39,2],[[24,0,"mb-3 mt-2 agentless-node-notice"]],[["@type"],["inline"]],[["default"],[[[[1,"\\n    "],[8,[30,1,["Title"]],null,null,[["default"],[[[[1,"\\n      "],[10,1],[12],[1,[28,[35,3],["routes.dc.nodes.index.agentless.notice.header"],null]],[13],[1,"\\n      "],[8,[39,4],[[4,[38,5],["click",[30,0,["dismissAgentlessNotice"]]],null]],[["@color","@text","@icon","@size","@isIconOnly"],["secondary","Dismiss notice","x","small",true]],null],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[30,1,["Description"]],null,null,[["default"],[[[[1,[28,[35,3],["routes.dc.nodes.index.agentless.notice.body"],null]]],[]]]]],[1,"\\n    "],[8,[30,1,["Link::Standalone"]],null,[["@href","@text","@icon","@iconPosition"],[[29,[[28,[37,6],["CONSUL_DOCS_DEVELOPER_URL"],null],"/connect/dataplane"]],[28,[37,3],["routes.dc.nodes.index.agentless.notice.footer"],null],"docs-link","trailing"]],null],[1,"\\n  "]],[1]]]]],[1,"\\n"]],[]],null]],["A"],false,["if","isVisible","hds/alert","t","hds/button","on","env"]]',moduleName:"consul-ui/components/consul/node/agentless-notice/index.hbs",isStrictMode:!1})
-let d=(o=(0,i.storageFor)("notices"),a=class extends l.default{constructor(){var e,t,n,l,r,i,o
-super(...arguments),n="nodes-agentless-dismissed",(t="storageKey")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,l=this,r="notices",o=this,(i=u)&&Object.defineProperty(l,r,{enumerable:i.enumerable,configurable:i.configurable,writable:i.writable,value:i.initializer?i.initializer.call(o):void 0}),this.args.postfix&&(this.storageKey=`nodes-agentless-dismissed-${this.args.postfix}`)}get isVisible(){const{items:e,filteredItems:t}=this.args
-return!this.notices.state.includes(this.storageKey)&&e.length>t.length}dismissAgentlessNotice(){this.notices.add(this.storageKey)}},u=s(a.prototype,"notices",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s(a.prototype,"dismissAgentlessNotice",[r.action],Object.getOwnPropertyDescriptor(a.prototype,"dismissAgentlessNotice"),a.prototype),a)
-e.default=d,(0,t.setComponentTemplate)(c,d)})),define("consul-ui/components/consul/node/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"UZddA6ka",block:'[[[8,[39,0],[[24,0,"consul-node-list"]],[["@items"],[[30,1]]],[["default"],[[[[1,"\\n  "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n    "],[10,"dl"],[15,0,[30,2,["Status"]]],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        Health\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[8,[39,2],null,[["@position"],["top-start"]],[["default"],[[[[1,"\\n"],[41,[28,[37,4],["critical",[30,2,["Status"]]],null],[[[1,"            At least one health check on this node is failing.\\n"]],[]],[[[41,[28,[37,4],["warning",[30,2,["Status"]]],null],[[[1,"            At least one health check on this node has a warning.\\n"]],[]],[[[41,[28,[37,4],["passing",[30,2,["Status"]]],null],[[[1,"            All health checks are passing.\\n"]],[]],[[[1,"            There are no health checks.\\n          "]],[]]]],[]]]],[]]],[1,"        "]],[]]]]],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,3],[15,6,[28,[37,5],["dc.nodes.show",[30,2,["Node"]]],[["params"],[[28,[37,6],null,[["peer"],[[30,2,["PeerName"]]]]]]]]],[12],[1,"\\n      "],[1,[30,2,["Node"]]],[1,"\\n    "],[13],[1,"\\n  "]],[]]]]],[1,"\\n  "],[8,[39,1],null,[["@name"],["details"]],[["default"],[[[[1,"\\n    "],[8,[39,7],null,[["@item"],[[30,2]]],null],[1,"\\n"],[41,[28,[37,4],[[30,2,["Address"]],[30,4,["Address"]]],null],[[[1,"      "],[10,1],[14,0,"leader"],[12],[1,"Leader"],[13],[1,"\\n"]],[]],null],[1,"    "],[10,1],[12],[1,"\\n      "],[1,[28,[35,8],[[30,2,["MeshServiceInstances","length"]]],null]],[1," "],[1,[28,[35,9],[[30,2,["MeshServiceInstances","length"]],"Service"],[["without-count"],[true]]]],[1,"\\n    "],[13],[1,"\\n    "],[10,"dl"],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        "],[10,1],[12],[1,"Address"],[13],[1,"\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[8,[39,10],null,[["@value","@name"],[[30,2,["Address"]],"Address"]],null],[1,"\\n        "],[1,[30,2,["Address"]]],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n  "]],[]]]]],[1,"\\n"]],[2,3]]]]],[1,"\\n"]],["@items","item","index","@leader"],false,["list-collection","block-slot","tooltip","if","eq","href-to","hash","consul/node/peer-info","format-number","pluralize","copy-button"]]',moduleName:"consul-ui/components/consul/node/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/node/peer-info/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"7f6XDyqE",block:'[[[41,[30,1,["PeerName"]],[[[1,"  "],[10,1],[14,0,"consul-node-peer-info"],[12],[1,"\\n    "],[11,"svg"],[24,"width","16"],[24,"height","16"],[24,"viewBox","0 0 16 16"],[24,"fill","none"],[24,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[4,[38,1],["Peer"],null],[12],[1,"\\n      "],[10,"path"],[14,"d","M16 8C16 7.80109 15.921 7.61032 15.7803 7.46967L12.2803 3.96967C11.9874 3.67678 11.5126 3.67678 11.2197 3.96967C10.9268 4.26256 10.9268 4.73744 11.2197 5.03033L14.1893 8L11.2197 10.9697C10.9268 11.2626 10.9268 11.7374 11.2197 12.0303C11.5126 12.3232 11.9874 12.3232 12.2803 12.0303L15.7803 8.53033C15.921 8.38968 16 8.19891 16 8Z"],[14,"fill","#77838A"],[12],[13],[1,"\\n      "],[10,"path"],[14,"d","M0.21967 8.53033C-0.0732233 8.23744 -0.0732233 7.76256 0.21967 7.46967L3.71967 3.96967C4.01256 3.67678 4.48744 3.67678 4.78033 3.96967C5.07322 4.26256 5.07322 4.73744 4.78033 5.03033L1.81066 8L4.78033 10.9697C5.07322 11.2626 5.07322 11.7374 4.78033 12.0303C4.48744 12.3232 4.01256 12.3232 3.71967 12.0303L0.21967 8.53033Z"],[14,"fill","#77838A"],[12],[13],[1,"\\n      "],[10,"path"],[14,"d","M5 7C4.44772 7 4 7.44772 4 8C4 8.55229 4.44772 9 5 9H5.01C5.56228 9 6.01 8.55229 6.01 8C6.01 7.44772 5.56228 7 5.01 7H5Z"],[14,"fill","#77838A"],[12],[13],[1,"\\n      "],[10,"path"],[14,"d","M7 8C7 7.44772 7.44772 7 8 7H8.01C8.56228 7 9.01 7.44772 9.01 8C9.01 8.55229 8.56228 9 8.01 9H8C7.44772 9 7 8.55229 7 8Z"],[14,"fill","#77838A"],[12],[13],[1,"\\n      "],[10,"path"],[14,"d","M11 7C10.4477 7 10 7.44772 10 8C10 8.55229 10.4477 9 11 9H11.01C11.5623 9 12.01 8.55229 12.01 8C12.01 7.44772 11.5623 7 11.01 7H11Z"],[14,"fill","#77838A"],[12],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,1],[14,0,"consul-node-peer-info__name"],[12],[1,[30,1,["PeerName"]]],[13],[1,"\\n  "],[13],[1,"\\n"]],[]],null]],["@item"],false,["if","tooltip"]]',moduleName:"consul-ui/components/consul/node/peer-info/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/node/search-bar/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"u8IgeZRe",block:'[[[8,[39,0],[[24,0,"consul-node-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","filter","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.node.search-bar.",[30,3,["status","key"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.node.search-bar.",[30,3,["status","value"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null],[28,[37,3],["common.brand.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n    "]],[3]],[[[1,"\\n      "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,5],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n        "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n          "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,"\\n              "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Optgroup"]],[30,9,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"              "],[8,[30,11],null,[["@value","@selected"],[[30,12],[28,[37,9],[[30,12],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,10],[[30,12]],null]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[12]],null]],[10,11]]],[1,"          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[6]],[[[1,"\\n      "],[8,[30,13,["Select"]],[[24,0,"type-status"]],[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["status","change"]]],null],true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[28,[35,2],["common.consul.status"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,14,["Optgroup"]],[30,14,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[28,[37,4],["passing","warning","critical"],null]],null]],null],null,[[[1,"          "],[8,[30,16],[[16,0,[29,["value-",[30,17]]]]],[["@value","@selected"],[[30,17],[28,[37,9],[[30,17],[30,2,["status","value"]]],null]]],[["default"],[[[[1,"\\n            "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[30,17]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,17]],null]],null]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[17]],null]],[15,16]]],[1,"        "]],[]]]]],[1,"\\n      "]],[14]]]]],[1,"\\n    "]],[13]],[[[1,"\\n      "],[8,[30,18,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,19,["change"]]],null],false,true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n"],[44,[[28,[37,11],[[28,[37,4],[[28,[37,4],["Node:asc",[28,[37,2],["common.sort.alpha.asc"],null]],null],[28,[37,4],["Node:desc",[28,[37,2],["common.sort.alpha.desc"],null]],null],[28,[37,4],["Status:asc",[28,[37,2],["common.sort.status.asc"],null]],null],[28,[37,4],["Status:desc",[28,[37,2],["common.sort.status.desc"],null]],null]],null]],null]],[[[1,"              "],[1,[28,[35,12],[[30,21],[30,19,["value"]]],null]],[1,"\\n"]],[21]]],[1,"          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,20,["Optgroup"]],[30,20,["Option"]]],[[[1,"          "],[8,[30,22],null,[["@label"],[[28,[37,2],["common.consul.status"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,23],null,[["@value","@selected"],["Status:asc",[28,[37,13],["Status:asc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.status.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,23],null,[["@value","@selected"],["Status:desc",[28,[37,13],["Status:desc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.status.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,22],null,[["@label"],[[28,[37,2],["common.consul.node-name"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,23],null,[["@value","@selected"],["Node:asc",[28,[37,13],["Node:asc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,23],null,[["@value","@selected"],["Node:desc",[28,[37,13],["Node:desc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[22,23]]],[1,"        "]],[]]]]],[1,"\\n      "]],[20]]]]],[1,"\\n    "]],[18]]]]]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Optgroup","Option","prop","search","components","Optgroup","Option","state","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","action","block-slot","each","-track-array","includes","lowercase","from-entries","get","eq"]]',moduleName:"consul-ui/components/consul/node/search-bar/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i}))
-define("consul-ui/components/consul/nspace/form/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object"],(function(e,t,n,l,r){var i
-function o(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const a=(0,n.createTemplateFactory)({id:"rgTjBVSE",block:'[[[11,0],[24,0,"consul-nspace-form"],[17,1],[12],[1,"\\n  "],[8,[39,0],null,[["@sink","@type","@label","@ondelete","@onchange"],[[28,[37,1],["/${partition}/${nspace}/${dc}/nspace",[28,[37,2],null,[["partition","nspace","dc"],["","",[30,2,["Datacenter"]]]]]],null],"nspace","Namespace",[28,[37,3],[[30,0,["onDelete"]],[30,2]],null],[28,[37,3],[[30,0,["onSubmit"]],[30,2]],null]]],[["default"],[[[[1,"\\n    "],[8,[39,4],null,[["@name"],["removed"]],[["default"],[[[[1,"\\n      "],[8,[39,5],[[4,[38,6],null,[["after"],[[28,[37,7],[[30,0],[30,4]],null]]]]],[["@type"],["remove"]],null],[1,"\\n    "]],[4]]]]],[1,"\\n\\n    "],[8,[39,4],null,[["@name"],["content"]],[["default"],[[[[1,"\\n\\n"],[44,[[28,[37,9],[[28,[37,10],["write nspaces"],null]],null],[30,2],[28,[37,2],null,[["help","Name"],["Must be a valid DNS hostname. Must contain 1-64 characters (numbers, letters, and hyphens), and must begin with a letter. Once created, this cannot be changed.",[28,[37,11],[[28,[37,2],null,[["test","error"],["^[a-zA-Z0-9]([a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?$","Name must be a valid DNS hostname."]]]],null]]]],[28,[37,2],null,[["Description"],[[28,[37,11],null,null]]]]],[[[1,"        "],[11,"form"],[4,[38,12],["submit",[28,[37,3],[[30,3,["persist"]],[30,6]],null]],null],[4,[38,13],[[30,5]],null],[12],[1,"\\n\\n          "],[8,[39,14],null,[["@src"],[[28,[37,14],["validate"],null]]],[["default"],[[[[1,"\\n\\n            "],[10,"fieldset"],[12],[1,"\\n"],[41,[28,[37,16],["new nspace"],[["item"],[[30,6]]]],[[[1,"                "],[8,[39,17],null,[["@name","@placeholder","@item","@validations","@chart"],["Name","Name",[30,6],[30,7],[28,[37,2],null,[["state","dispatch"],[[30,13],[30,12]]]]]],null],[1,"\\n"]],[]],null],[1,"              "],[8,[39,17],null,[["@expanded","@name","@label","@item","@validations","@chart"],[true,"Description","Description (Optional)",[30,6],[30,8],[28,[37,2],null,[["state","dispatch"],[[30,13],[30,12]]]]]],null],[1,"\\n            "],[13],[1,"\\n"],[41,[28,[37,10],["use acls"],null],[[[1,"              "],[10,"fieldset"],[14,1,"roles"],[12],[1,"\\n                "],[10,"h2"],[12],[1,"Roles"],[13],[1,"\\n                "],[10,2],[12],[1,"\\n"],[41,[28,[37,10],["write nspace"],[["item"],[[30,6]]]],[[[1,"                    By adding roles to this namespaces, you will apply them to\\n                    all tokens created within this namespace.\\n"]],[]],[[[1,"                    The following roles are applied to all tokens created within\\n                    this namespace.\\n"]],[]]],[1,"                "],[13],[1,"\\n                "],[8,[39,18],null,[["@dc","@nspace","@partition","@disabled","@items"],[[30,14],"default",[30,15],[30,5],[30,6,["ACLs","RoleDefaults"]]]],null],[1,"\\n              "],[13],[1,"\\n              "],[10,"fieldset"],[14,1,"policies"],[12],[1,"\\n                "],[10,"h2"],[12],[1,"Policies"],[13],[1,"\\n                "],[10,2],[12],[1,"\\n"],[41,[28,[37,9],[[30,5]],null],[[[1,"                    By adding policies to this namespace, you will apply them to\\n                    all tokens created within this namespace.\\n"]],[]],[[[1,"                    The following policies are applied to all tokens created\\n                    within this namespace.\\n"]],[]]],[1,"                "],[13],[1,"\\n                "],[8,[39,19],null,[["@dc","@nspace","@partition","@disabled","@allowIdentity","@items"],[[30,14],"default",[30,15],[30,5],false,[30,6,["ACLs","PolicyDefaults"]]]],null],[1,"\\n              "],[13],[1,"\\n"]],[]],null],[1,"            "],[10,0],[12],[1,"\\n              "],[8,[39,20],null,null,[["default"],[[[[1,"\\n"],[41,[28,[37,21],[[28,[37,16],["new nspace"],[["item"],[[30,6]]]],[28,[37,10],["create nspaces"],null]],null],[[[1,"                "],[8,[39,22],[[16,"disabled",[28,[37,23],[[28,[37,16],["pristine nspace"],[["item"],[[30,6]]]],[28,[37,24],[[30,13],"error"],null]],null]],[24,4,"submit"]],[["@text"],["Save"]],null],[1,"\\n"]],[]],[[[41,[28,[37,10],["write nspace"],[["item"],[[30,6]]]],[[[1,"                "],[8,[39,22],[[24,4,"submit"]],[["@text"],["Save"]],null],[1,"\\n              "]],[]],null]],[]]],[1,"\\n                "],[8,[39,22],[[24,4,"reset"],[4,[38,12],["click",[28,[37,3],[[30,0,["onCancel"]],[30,6]],null]],null]],[["@color","@text"],["secondary","Cancel"]],null],[1,"\\n\\n"],[41,[28,[37,21],[[28,[37,9],[[28,[37,16],["new nspace"],[["item"],[[30,6]]]]],null],[28,[37,10],["delete nspace"],[["item"],[[30,6]]]]],null],[[[1,"                "],[8,[39,25],null,[["@message"],["Are you sure you want to delete this Namespace?"]],[["default"],[[[[1,"\\n                  "],[8,[39,4],null,[["@name"],["action"]],[["default"],[[[[1,"\\n                    "],[8,[39,22],[[4,[38,12],["click",[28,[37,3],[[30,16],[28,[37,3],[[30,3,["delete"]],[30,6]],null]],null]],null]],[["@color","@text"],["critical","Delete"]],null],[1,"\\n                  "]],[16]]]]],[1,"\\n                  "],[8,[39,4],null,[["@name"],["dialog"]],[["default"],[[[[1,"\\n                    "],[8,[39,26],null,[["@message","@execute","@cancel"],[[30,19],[30,17],[30,18]]],null],[1,"\\n                  "]],[17,18,19]]]]],[1,"\\n                "]],[]]]]],[1,"\\n"]],[]],null],[1,"              "]],[]]]]],[1,"\\n            "],[13],[1,"\\n          "]],[9,10,11,12,13]]]]],[1,"\\n        "],[13],[1,"\\n"]],[5,6,7,8]]],[1,"    "]],[]]]]],[1,"\\n  "]],[3]]]]],[1,"\\n"],[13]],["&attrs","@item","writer","after","readOnly","item","Name","Description","State","Guard","ChartAction","dispatch","state","@dc","@partition","confirm","execute","cancel","message"],false,["data-writer","uri","hash","fn","block-slot","consul/nspace/notifications","notification","action","let","not","can","array","on","disabled","state-chart","if","is","text-input","role-selector","policy-selector","hds/button-set","and","hds/button","or","state-matches","confirmation-dialog","delete-confirmation"]]',moduleName:"consul-ui/components/consul/nspace/form/index.hbs",isStrictMode:!1})
-let u=(o((i=class extends l.default{onSubmit(e){const t=this.args.onsubmit
-if(t)return t(e)}onDelete(e){const{onsubmit:t,ondelete:n}=this.args
-return n?n(e):t?t(e):void 0}onCancel(e){const{oncancel:t,onsubmit:n}=this.args
-return t?t(e):n?n(e):void 0}}).prototype,"onSubmit",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"onSubmit"),i.prototype),o(i.prototype,"onDelete",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"onDelete"),i.prototype),o(i.prototype,"onCancel",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"onCancel"),i.prototype),i)
-e.default=u,(0,t.setComponentTemplate)(a,u)})),define("consul-ui/components/consul/nspace/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"HHDNRExj",block:'[[[8,[39,0],[[24,0,"consul-nspace-list"],[17,1]],[["@items","@linkable"],[[30,2],"linkable nspace"]],[["default"],[[[[1,"\\n    "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n"],[41,[30,3,["DeletedAt"]],[[[1,"    "],[10,2],[12],[1,"\\n      Deleting "],[1,[30,3,["Name"]]],[1,"...\\n    "],[13],[1,"\\n"]],[]],[[[1,"      "],[10,3],[15,6,[28,[37,3],["dc.nspaces.edit",[30,3,["Name"]]],null]],[12],[1,[30,3,["Name"]]],[13],[1,"\\n"]],[]]],[1,"    "]],[]]]]],[1,"\\n    "],[8,[39,1],null,[["@name"],["details"]],[["default"],[[[[1,"\\n"],[41,[30,3,["Description"]],[[[1,"      "],[10,"dl"],[12],[1,"\\n        "],[10,"dt"],[12],[1,"Description"],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[1,[30,3,["Description"]]],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n"]],[]],null],[41,[28,[37,4],["CONSUL_ACLS_ENABLED"],null],[[[1,"      "],[8,[39,5],null,[["@item"],[[30,3]]],null],[1,"\\n"]],[]],null],[1,"    "]],[]]]]],[1,"\\n    "],[8,[39,1],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n"],[41,[28,[37,6],[[30,3,["DeletedAt"]]],null],[[[1,"      "],[8,[30,4],null,null,[["default"],[[[[1,"\\n        "],[8,[30,5],null,[["@href"],[[28,[37,3],["dc.nspaces.edit",[30,3,["Name"]]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n"],[41,[28,[37,7],["write nspace"],[["item"],[[30,3]]]],[[[1,"            Edit\\n"]],[]],[[[1,"            View\\n"]],[]]],[1,"          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"],[41,[28,[37,7],["delete nspace"],[["item"],[[30,3]]]],[[[1,"        "],[8,[30,5],[[24,0,"dangerous"]],[["@onclick"],[[28,[37,8],[[30,0],[30,6],[30,3]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n            Delete\\n          "]],[]]]]],[1,"\\n          "],[8,[39,1],null,[["@name"],["confirmation"]],[["default"],[[[[1,"\\n            "],[8,[30,7],[[24,0,"warning"]],null,[["default"],[[[[1,"\\n              "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                Confirm delete\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[10,2],[12],[1,"\\n                  Are you sure you want to delete this namespace?\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["confirm"]],[["default"],[[[[1,"\\n                "],[8,[30,8],null,null,[["default"],[[[[1,"Delete"]],[]]]]],[1,"\\n              "]],[8]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[7]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[1,"      "]],[5]]]]],[1,"\\n"]],[]],null],[1,"    "]],[4]]]]],[1,"\\n"]],[3]]]]]],["&attrs","@items","item","Actions","Action","@ondelete","Confirmation","Confirm"],false,["list-collection","block-slot","if","href-to","env","consul/token/ruleset/list","not","can","action"]]',moduleName:"consul-ui/components/consul/nspace/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/nspace/notifications/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"re+qR2Bv",block:'[[[41,[28,[37,1],[[30,1],"remove"],null],[[[1,"  "],[8,[39,2],[[17,2]],[["@color"],["success"]],[["default"],[[[[1,"\\n    "],[8,[30,3,["Title"]],null,null,[["default"],[[[[1,"Success!"]],[]]]]],[1,"\\n    "],[8,[30,3,["Description"]],null,null,[["default"],[[[[1,"Your Namespace has been marked for deletion."]],[]]]]],[1,"\\n  "]],[3]]]]],[1,"\\n"]],[]],null]],["@type","&attrs","T"],false,["if","eq","hds/toast"]]',moduleName:"consul-ui/components/consul/nspace/notifications/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/nspace/search-bar/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"+U4p2s4N",block:'[[[8,[39,0],[[24,0,"consul-nspace-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.nspace.search-bar.",[30,3,["status","key"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.nspace.search-bar.",[30,3,["status","value"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null],[28,[37,3],["common.brand.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n    "]],[3]],[[[1,"\\n      "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,5],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n        "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n          "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,"\\n              "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Optgroup"]],[30,9,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"              "],[8,[30,11],null,[["@value","@selected"],[[30,12],[28,[37,9],[[30,12],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,10],[[30,12]],null]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[12]],null]],[10,11]]],[1,"          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[6]],[[[1,"\\n      "],[8,[30,13,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,14,["change"]]],null],false,true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n"],[44,[[28,[37,11],[[28,[37,4],[[28,[37,4],["Name:asc",[28,[37,2],["common.sort.alpha.asc"],null]],null],[28,[37,4],["Name:desc",[28,[37,2],["common.sort.alpha.desc"],null]],null]],null]],null]],[[[1,"              "],[1,[28,[35,12],[[30,16],[30,14,["value"]]],null]],[1,"\\n"]],[16]]],[1,"          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,15,["Optgroup"]],[30,15,["Option"]]],[[[1,"          "],[8,[30,17],null,[["@label"],[[28,[37,2],["common.consul.name"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,18],null,[["@value","@selected"],["Name:asc",[28,[37,13],["Name:asc",[30,14,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,18],null,[["@value","@selected"],["Name:desc",[28,[37,13],["Name:desc",[30,14,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[17,18]]],[1,"        "]],[]]]]],[1,"\\n      "]],[15]]]]],[1,"\\n    "]],[13]]]]]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Optgroup","Option","prop","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","action","block-slot","each","-track-array","includes","lowercase","from-entries","get","eq"]]',moduleName:"consul-ui/components/consul/nspace/search-bar/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/nspace/selector/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"Sn707Mkm",block:'[[[41,[28,[37,1],["use nspaces"],null],[[[41,[28,[37,1],["choose nspaces"],null],[[[44,[[28,[37,3],[[30,1],"default"],null],[28,[37,4],["dc.nspaces",[30,2,["Name"]]],null]],[[[1,"        "],[10,"li"],[14,0,"nspaces"],[12],[1,"\\n          "],[8,[39,5],[[24,"aria-label","Namespace"]],[["@items"],[[28,[37,6],[[28,[37,7],null,[["Name","href"],["Manage Namespaces",[28,[37,8],["dc.nspaces",[30,2,["Name"]]],null]]]],[28,[37,9],["DeletedAt",[30,5]],null]],null]]],[["default"],[[[[1,"\\n            "],[8,[30,6,["Action"]],[[4,[38,10],["click",[30,6,["toggle"]]],null]],null,[["default"],[[[[1,"\\n              "],[1,[52,[30,4],"Manage Namespaces",[30,3]]],[1,"\\n            "]],[]]]]],[1,"\\n            "],[8,[30,6,["Menu"]],null,null,[["default"],[[[[1,"\\n"],[41,[28,[37,11],[[30,5,["length"]],0],null],[[[1,"                "],[8,[39,12],null,[["@src","@onchange"],[[28,[37,13],["/${partition}/*/${dc}/namespaces",[28,[37,7],null,[["partition","dc"],[[30,8],[30,2,["Name"]]]]]],null],[28,[37,14],[[28,[37,15],[[30,9]],null]],null]]],null],[1,"\\n"]],[]],[[[1,"                "],[8,[39,12],null,[["@src","@onchange"],[[28,[37,13],["/${partition}/*/${dc}/namespaces",[28,[37,7],null,[["partition","dc"],[[30,8],[30,2,["Name"]]]]]],null],[28,[37,14],[[28,[37,15],[[30,9]],null]],null]]],null],[1,"\\n"]],[]]],[1,"              "],[8,[30,7,["Menu"]],null,null,[["default"],[[[[1,"\\n"],[42,[28,[37,17],[[28,[37,17],[[30,10,["items"]]],null]],null],null,[[[1,"\\n                  "],[8,[30,10,["Item"]],[[16,"aria-current",[52,[28,[37,3],[[28,[37,18],[[30,4],[30,11,["href"]]],null],[28,[37,18],[[28,[37,19],[[30,4]],null],[28,[37,20],[[30,3],[30,11,["Name"]]],null]],null]],null],"true"]]],null,[["default"],[[[[1,"\\n                    "],[8,[30,10,["Action"]],[[4,[38,10],["click",[30,6,["close"]]],null]],[["@href"],[[52,[30,11,["href"]],[30,11,["href"]],[52,[30,4],[28,[37,8],["dc.services.index"],[["params"],[[28,[37,7],null,[["partition","nspace","dc"],[[52,[28,[37,11],[[30,8,["length"]],0],null],[30,8],[27]],[30,11,["Name"]],[30,2,["Name"]]]]]]]],[28,[37,8],["."],[["params"],[[28,[37,7],null,[["partition","nspace"],[[52,[28,[37,11],[[30,8,["length"]],0],null],[30,8],[27]],[30,11,["Name"]]]]]]]]]]]],[["default"],[[[[1,"\\n                      "],[1,[30,11,["Name"]]],[1,"\\n                    "]],[]]]]],[1,"\\n                  "]],[]]]]],[1,"\\n"]],[11]],null],[1,"              "]],[10]]]]],[1,"\\n            "]],[7]]]]],[1,"\\n          "]],[6]]]]],[1,"\\n        "],[13],[1,"\\n"]],[3,4]]]],[]],null]],[]],null]],["@nspace","@dc","nspace","isManaging","@nspaces","disclosure","panel","@partition","@onchange","menu","item"],false,["if","can","let","or","is-href","disclosure-menu","append","hash","href-to","reject-by","on","gt","data-source","uri","fn","optional","each","-track-array","and","not","eq"]]',moduleName:"consul-ui/components/consul/nspace/selector/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/partition/form/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"+TwrfeYU",block:'[[[11,0],[24,0,"consul-partition-form"],[17,1],[12],[1,"\\n    "],[8,[39,0],null,[["@sink","@type","@label","@ondelete","@onchange"],[[28,[37,1],["/${partition}/${nspace}/${dc}/partition",[28,[37,2],null,[["partition","nspace","dc"],["","",[30,2,["Datacenter"]]]]]],null],"partition","Partition",[28,[37,3],[[52,[30,3],[30,3],[30,4]],[30,2]],null],[28,[37,3],[[28,[37,5],[[30,4]],null],[30,2]],null]]],[["default"],[[[[1,"\\n    "],[8,[39,6],null,[["@name"],["removed"]],[["default"],[[[[1,"\\n      "],[8,[39,7],[[4,[38,8],null,[["after"],[[28,[37,9],[[30,0],[30,6]],null]]]]],[["@type"],["remove"]],null],[1,"\\n    "]],[6]]]]],[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["content"]],[["default"],[[[[1,"\\n\\n"],[44,[[28,[37,11],[[28,[37,12],["write partition"],null]],null],[30,2],[28,[37,2],null,[["help","Name"],["Must be a valid DNS hostname. Must contain 1-64 characters (numbers, letters, and hyphens), and must begin with a letter. Once created, this cannot be changed.",[28,[37,13],[[28,[37,2],null,[["test","error"],["^[a-zA-Z0-9]([a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?$","Name must be a valid DNS hostname."]]]],null]]]],[28,[37,2],null,[["Description"],[[28,[37,13],null,null]]]]],[[[11,"form"],[4,[38,14],["submit",[28,[37,3],[[30,5,["persist"]],[30,8]],null]],null],[4,[38,15],[[30,7]],null],[12],[1,"\\n\\n"],[8,[39,16],null,[["@src"],[[28,[37,16],["validate"],null]]],[["default"],[[[[1,"\\n\\n  "],[10,"fieldset"],[12],[1,"\\n"],[41,[28,[37,17],["new partition"],[["item"],[[30,8]]]],[[[1,"    "],[8,[39,18],null,[["@name","@placeholder","@item","@validations","@chart"],["Name","Name",[30,8],[30,9],[28,[37,2],null,[["state","dispatch"],[[30,15],[30,14]]]]]],null],[1,"\\n"]],[]],null],[1,"    "],[8,[39,18],null,[["@expanded","@name","@label","@item","@validations","@chart"],[true,"Description","Description (Optional)",[30,8],[30,10],[28,[37,2],null,[["state","dispatch"],[[30,15],[30,14]]]]]],null],[1,"\\n  "],[13],[1,"\\n\\n  "],[10,0],[12],[1,"\\n    "],[8,[39,19],null,null,[["default"],[[[[1,"\\n\\n\\n"],[41,[28,[37,20],[[28,[37,17],["new partition"],[["item"],[[30,8]]]],[28,[37,12],["create partitions"],null]],null],[[[1,"  "],[8,[39,21],[[16,"disabled",[28,[37,22],[[28,[37,17],["pristine partition"],[["item"],[[30,8]]]],[28,[37,23],[[30,15],"error"],null]],null]],[24,4,"submit"]],[["@text"],["Save"]],null],[1,"\\n"]],[]],[[[41,[28,[37,11],[[30,7]],null],[[[1,"  "],[8,[39,21],[[24,4,"submit"]],[["@text"],["Save"]],null],[1,"\\n"]],[]],null]],[]]],[1,"      "],[8,[39,21],[[24,4,"reset"],[4,[38,14],["click",[52,[30,16],[28,[37,3],[[28,[37,5],[[30,16],[30,8]],null]],null],[28,[37,3],[[28,[37,5],[[30,4],[30,8]],null]],null]]],null]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n\\n"],[41,[28,[37,20],[[28,[37,11],[[28,[37,17],["new partition"],[["item"],[[30,8]]]]],null],[28,[37,12],["delete partition"],[["item"],[[30,8]]]]],null],[[[1,"      "],[8,[39,24],null,[["@message"],["Are you sure you want to delete this Partition?"]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["action"]],[["default"],[[[[1,"\\n          "],[8,[39,21],[[4,[38,14],["click",[28,[37,3],[[30,17],[28,[37,3],[[30,5,["delete"]],[30,8]],null]],null]],null]],[["@text","@color"],["Delete","critical"]],null],[1,"\\n        "]],[17]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["dialog"]],[["default"],[[[[1,"\\n          "],[8,[39,25],null,[["@message","@execute","@cancel"],[[30,20],[30,18],[30,19]]],null],[1,"\\n        "]],[18,19,20]]]]],[1,"\\n      "]],[]]]]],[1,"\\n"]],[]],null],[1,"    "]],[]]]]],[1,"\\n  "],[13],[1,"\\n\\n"]],[11,12,13,14,15]]]]],[1,"\\n"],[13],[1,"\\n\\n"]],[7,8,9,10]]],[1,"  "]],[]]]]],[1,"\\n"]],[5]]]]],[1,"\\n"],[13],[1,"\\n"]],["&attrs","@item","@ondelete","@onsubmit","writer","after","readOnly","item","Name","Description","State","Guard","ChartAction","dispatch","state","@oncancel","confirm","execute","cancel","message"],false,["data-writer","uri","hash","fn","if","optional","block-slot","consul/partition/notifications","notification","action","let","not","can","array","on","disabled","state-chart","is","text-input","hds/button-set","and","hds/button","or","state-matches","confirmation-dialog","delete-confirmation"]]',moduleName:"consul-ui/components/consul/partition/form/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/partition/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"VkpAwQ51",block:'[[[8,[39,0],[[24,0,"consul-partition-list"],[17,1]],[["@items","@linkable"],[[30,2],"linkable partition"]],[["default"],[[[[1,"\\n    "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n"],[41,[30,3,["DeletedAt"]],[[[1,"    "],[10,2],[12],[1,"\\n      Deleting "],[1,[30,3,["Name"]]],[1,"...\\n    "],[13],[1,"\\n"]],[]],[[[1,"      "],[10,3],[15,6,[28,[37,3],["dc.partitions.edit",[30,3,["Name"]]],null]],[12],[1,[30,3,["Name"]]],[13],[1,"\\n"]],[]]],[1,"    "]],[]]]]],[1,"\\n    "],[8,[39,1],null,[["@name"],["details"]],[["default"],[[[[1,"\\n"],[41,[30,3,["Description"]],[[[1,"      "],[10,"dl"],[12],[1,"\\n        "],[10,"dt"],[12],[1,"Description"],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[1,[30,3,["Description"]]],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n"]],[]],null],[1,"    "]],[]]]]],[1,"\\n    "],[8,[39,1],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n"],[41,[28,[37,4],[[30,3,["DeletedAt"]]],null],[[[1,"      "],[8,[30,4],null,null,[["default"],[[[[1,"\\n        "],[8,[30,5],null,[["@href"],[[28,[37,3],["dc.partitions.edit",[30,3,["Name"]]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n"],[41,[28,[37,5],["write partition"],[["item"],[[30,3]]]],[[[1,"            Edit\\n"]],[]],[[[1,"            View\\n"]],[]]],[1,"          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"],[41,[28,[37,5],["delete partition"],[["item"],[[30,3]]]],[[[1,"        "],[8,[30,5],[[24,0,"dangerous"]],[["@onclick"],[[28,[37,6],[[30,0],[30,6],[30,3]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n            Delete\\n          "]],[]]]]],[1,"\\n          "],[8,[39,1],null,[["@name"],["confirmation"]],[["default"],[[[[1,"\\n            "],[8,[30,7],[[24,0,"warning"]],null,[["default"],[[[[1,"\\n              "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                Confirm delete\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[10,2],[12],[1,"\\n                  Are you sure you want to delete this partition?\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["confirm"]],[["default"],[[[[1,"\\n                "],[8,[30,8],null,null,[["default"],[[[[1,"Delete"]],[]]]]],[1,"\\n              "]],[8]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[7]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[1,"      "]],[5]]]]],[1,"\\n"]],[]],null],[1,"    "]],[4]]]]],[1,"\\n"]],[3]]]]],[1,"\\n"]],["&attrs","@items","item","Actions","Action","@ondelete","Confirmation","Confirm"],false,["list-collection","block-slot","if","href-to","not","can","action"]]',moduleName:"consul-ui/components/consul/partition/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/partition/notifications/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"Rj1t1uFE",block:'[[[41,[28,[37,1],[[30,1],"remove"],null],[[[1,"  "],[8,[39,2],[[17,2]],[["@color"],["success"]],[["default"],[[[[1,"\\n    "],[8,[30,3,["Title"]],null,null,[["default"],[[[[1,"Success!"]],[]]]]],[1,"\\n    "],[8,[30,3,["Description"]],null,null,[["default"],[[[[1,"\\n      Your Partition has been marked for deletion.\\n    "]],[]]]]],[1,"\\n  "]],[3]]]]],[1,"\\n"]],[]],null]],["@type","&attrs","T"],false,["if","eq","hds/toast"]]',moduleName:"consul-ui/components/consul/partition/notifications/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/partition/search-bar/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"zU7wyufj",block:'[[[8,[39,0],[[24,0,"consul-partition-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.nspace.search-bar.",[30,3,["status","key"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.nspace.search-bar.",[30,3,["status","value"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null],[28,[37,3],["common.brand.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n    "]],[3]],[[[1,"\\n      "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,5],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n        "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n          "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,"\\n              "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Optgroup"]],[30,9,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"              "],[8,[30,11],null,[["@value","@selected"],[[30,12],[28,[37,9],[[30,12],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,10],[[30,12]],null]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[12]],null]],[10,11]]],[1,"          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[6]],[[[1,"\\n      "],[8,[30,13,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,14,["change"]]],null],false,true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n"],[44,[[28,[37,11],[[28,[37,4],[[28,[37,4],["Name:asc",[28,[37,2],["common.sort.alpha.asc"],null]],null],[28,[37,4],["Name:desc",[28,[37,2],["common.sort.alpha.desc"],null]],null]],null]],null]],[[[1,"              "],[1,[28,[35,12],[[30,16],[30,14,["value"]]],null]],[1,"\\n"]],[16]]],[1,"          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,15,["Optgroup"]],[30,15,["Option"]]],[[[1,"          "],[8,[30,17],null,[["@label"],[[28,[37,2],["common.consul.name"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,18],null,[["@value","@selected"],["Name:asc",[28,[37,13],["Name:asc",[30,14,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,18],null,[["@value","@selected"],["Name:desc",[28,[37,13],["Name:desc",[30,14,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[17,18]]],[1,"        "]],[]]]]],[1,"\\n      "]],[15]]]]],[1,"\\n    "]],[13]]]]]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Optgroup","Option","prop","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","action","block-slot","each","-track-array","includes","lowercase","from-entries","get","eq"]]',moduleName:"consul-ui/components/consul/partition/search-bar/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/partition/selector/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"GPyi0nAM",block:'[[[44,[[28,[37,1],[[30,1],"default"],null],[28,[37,2],["dc.partitions",[30,2,["Name"]]],null]],[[[41,[28,[37,4],["choose partitions"],[["dc"],[[30,2]]]],[[[1,"    "],[10,"li"],[14,0,"partitions"],[12],[1,"\\n      "],[8,[39,5],[[24,"aria-label","Admin Partition"]],[["@items"],[[28,[37,6],[[28,[37,7],null,[["Name","href"],["Manage Partitions",[28,[37,8],["dc.partitions",[30,2,["Name"]]],null]]]],[28,[37,9],["DeletedAt",[30,5]],null]],null]]],[["default"],[[[[1,"\\n        "],[8,[30,6,["Action"]],[[4,[38,10],["click",[30,6,["toggle"]]],null]],null,[["default"],[[[[1,"\\n          "],[1,[52,[30,4],"Manage Partition",[30,3]]],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[30,6,["Menu"]],null,null,[["default"],[[[[1,"\\n          "],[8,[39,11],null,[["@src","@onchange"],[[28,[37,12],["/*/*/${dc}/partitions",[28,[37,7],null,[["dc"],[[30,2,["Name"]]]]]],null],[28,[37,13],[[28,[37,14],[[30,8]],null]],null]]],null],[1,"\\n          "],[8,[30,7,["Menu"]],null,null,[["default"],[[[[1,"\\n"],[42,[28,[37,16],[[28,[37,16],[[30,9,["items"]]],null]],null],null,[[[1,"              "],[8,[30,9,["Item"]],[[16,"aria-current",[52,[28,[37,1],[[28,[37,17],[[30,4],[30,10,["href"]]],null],[28,[37,17],[[28,[37,18],[[30,4]],null],[28,[37,19],[[30,3],[30,10,["Name"]]],null]],null]],null],"true"]]],null,[["default"],[[[[1,"\\n                "],[8,[30,9,["Action"]],[[4,[38,10],["click",[30,6,["close"]]],null]],[["@href"],[[52,[30,10,["href"]],[30,10,["href"]],[52,[30,4],[28,[37,8],["dc.services.index"],[["params"],[[28,[37,7],null,[["partition","nspace","dc"],[[30,10,["Name"]],[27],[30,2,["Name"]]]]]]]],[28,[37,8],["."],[["params"],[[28,[37,7],null,[["partition","nspace"],[[30,10,["Name"]],[27]]]]]]]]]]],[["default"],[[[[1,"\\n                  "],[1,[30,10,["Name"]]],[1,"\\n                "]],[]]]]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[10]],null],[1,"          "]],[9]]]]],[1,"\\n        "]],[7]]]]],[1,"\\n      "]],[6]]]]],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[1,"    "],[10,"li"],[14,0,"partition"],[14,"aria-label","Admin Partition"],[12],[1,"\\n      "],[1,"default"],[1,"\\n    "],[13],[1,"\\n"]],[]]]],[3,4]]]],["@partition","@dc","partition","isManaging","@partitions","disclosure","panel","@onchange","menu","item"],false,["let","or","is-href","if","can","disclosure-menu","append","hash","href-to","reject-by","on","data-source","uri","fn","optional","each","-track-array","and","not","eq"]]',moduleName:"consul-ui/components/consul/partition/selector/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/address/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"pSmtNtNJ",block:'[[[8,[39,0],null,null,[["default"],[[[[1,"\\n"],[41,[30,1,["data","height"]],[[[1,"    "],[10,0],[15,5,[30,1,["data","fillRemainingHeightStyle"]]],[14,0,"overflow-y-scroll"],[12],[1,"\\n      "],[8,[39,2],null,[["@tagName","@estimateHeight","@items"],["ul",[30,1,["data","height"]],[30,2]]],[["default"],[[[[1,"\\n        "],[10,"li"],[14,0,"px-3 h-12 border-bottom-primary flex items-center justify-between group"],[12],[1,"\\n          "],[10,0],[14,0,"hds-typography-display-300 text-hds-foreground-strong hds-font-weight-semibold"],[12],[1,[30,3]],[13],[1,"\\n          "],[8,[39,3],[[24,0,"opacity-0 group-hover:opacity-100"]],[["@value","@name"],[[30,3],"Address"]],null],[1,"\\n        "],[13],[1,"\\n      "]],[3,4]]]]],[1,"\\n    "],[13],[1,"\\n"]],[]],null]],[1]]]]]],["p","@items","address","index"],false,["providers/dimension","if","vertical-collection","copy-button"]]',moduleName:"consul-ui/components/consul/peer/address/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/bento-box/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"H9CcvCNn",block:'[[[8,[39,0],[[24,0,"mt-6 mb-3"]],[["@level","@hasBorder"],["base",true]],[["default"],[[[[1,"\\n  "],[10,0],[14,0,"flex h-24 p-6 overflow-x-auto space-x-12"],[12],[1,"\\n    "],[10,0],[14,0,"shrink-0"],[12],[1,"\\n      "],[10,0],[14,0,"mb-2 hds-typography-body-200 hds-font-weight-semibold hds-foreground-primary"],[12],[1,"Status"],[13],[1,"\\n      "],[10,0],[14,0,"flex items-center"],[12],[1,"\\n        "],[8,[39,1],null,[["@peering"],[[30,1]]],null],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,0],[14,0,"shrink-0"],[12],[1,"\\n      "],[10,0],[14,0,"hds-typography-body-200 mb-2 hds-font-weight-semibold hds-foreground-primary"],[12],[1,"Latest heartbeat"],[13],[1,"\\n      "],[10,0],[14,0,"flex items-center"],[12],[1,"\\n"],[41,[30,1,["LastHeartbeat"]],[[[44,[[28,[37,4],[[30,1,["LastHeartbeat"]]],null]],[[[1,"            "],[8,[39,5],[[24,0,"mr-0.5"]],[["@name","@color"],["activity","var(--token-color-foreground-faint)"]],null],[1,"\\n"],[41,[30,2,["isNearDate"]],[[[1,"              "],[11,1],[4,[38,6],[[30,2,["friendly"]]],null],[12],[1,[30,2,["relative"]]],[13],[1,"\\n"]],[]],[[[1,"              "],[10,1],[12],[1,[30,2,["friendly"]]],[13],[1,"\\n"]],[]]]],[2]]]],[]],[[[1,"          "],[10,1],[12],[1,"None yet"],[13],[1,"\\n"]],[]]],[1,"      "],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,0],[14,0,"shrink-0"],[12],[1,"\\n      "],[10,0],[14,0,"mb-2 hds-typography-body-200 hds-font-weight-semibold hds-foreground-primary"],[12],[1,"Latest receipt"],[13],[1,"\\n      "],[10,0],[14,0,"flex items-center"],[12],[1,"\\n"],[41,[30,1,["LastReceive"]],[[[44,[[28,[37,4],[[30,1,["LastReceive"]]],null]],[[[41,[30,3,["isNearDate"]],[[[1,"              "],[11,1],[4,[38,6],[[30,3,["friendly"]]],null],[12],[1,[30,3,["relative"]]],[13],[1,"\\n"]],[]],[[[1,"              "],[10,1],[12],[1,[30,3,["friendly"]]],[13],[1,"\\n"]],[]]]],[3]]]],[]],[[[1,"          "],[10,1],[12],[1,"None yet"],[13],[1,"\\n"]],[]]],[1,"      "],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,0],[14,0,"shrink-0"],[12],[1,"\\n      "],[10,0],[14,0,"mb-2 hds-typography-body-200 hds-font-weight-semibold hds-foreground-primary"],[12],[1,"Latest send"],[13],[1,"\\n      "],[10,0],[14,0,"flex items-center"],[12],[1,"\\n"],[41,[30,1,["LastSend"]],[[[44,[[28,[37,4],[[30,1,["LastSend"]]],null]],[[[41,[30,4,["isNearDate"]],[[[1,"              "],[11,1],[4,[38,6],[[30,4,["friendly"]]],null],[12],[1,[30,4,["relative"]]],[13],[1,"\\n"]],[]],[[[1,"              "],[10,1],[12],[1,[30,4,["friendly"]]],[13],[1,"\\n"]],[]]]],[4]]]],[]],[[[1,"          "],[10,1],[12],[1,"None yet"],[13],[1,"\\n"]],[]]],[1,"      "],[13],[1,"\\n\\n    "],[13],[1,"\\n  "],[13],[1,"\\n"]],[]]]]]],["@peering","smartDate","smartDate","smartDate"],false,["hds/card/container","peerings/badge","if","let","smart-date-format","flight-icon","tooltip"]]',moduleName:"consul-ui/components/consul/peer/bento-box/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/form/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={id:"consul-peer-form",initial:"generate",on:{INITIATE:[{target:"initiate"}],GENERATE:[{target:"generate"}]},states:{initiate:{},generate:{}}}})),define("consul-ui/components/consul/peer/form/generate/actions/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"3YYkPKep",block:'[[[8,[39,0],[[16,"form",[30,1]],[24,4,"submit"],[16,"disabled",[28,[37,1],[[28,[37,2],[[30,2,["Name","length"]],0],null]],null]],[17,3]],[["@text"],["Generate token"]],null]],["@id","@item","&attrs"],false,["hds/button","or","eq"]]',moduleName:"consul-ui/components/consul/peer/form/generate/actions/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/form/generate/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={id:"consul-peer-generate-form",initial:"idle",states:{idle:{on:{LOAD:{target:"loading"}}},loading:{on:{SUCCESS:{target:"success"},ERROR:{target:"error"}}},success:{on:{RESET:{target:"idle"}}},error:{}}}})),define("consul-ui/components/consul/peer/form/generate/fieldsets/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object"],(function(e,t,n,l,r){var i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,n.createTemplateFactory)({id:"NcmZNT1t",block:'[[[11,0],[16,0,[28,[37,0],["consul-peer-form-generate-fieldsets"],null]],[17,1],[12],[1,"\\n  "],[8,[39,1],null,[["@src"],[[28,[37,2],["/machines/validate.xstate"],[["from"],["/components/consul/peer/form/generate/fieldsets"]]]]],[["default"],[[[[1,"\\n"],[44,[[28,[37,4],null,[["help","Name"],[[28,[37,5],[[28,[37,6],["common.validations.dns-hostname.help"],null],[28,[37,6],["common.validations.immutable.help"],null]],null],[28,[37,7],[[28,[37,4],null,[["test","error"],[[28,[37,6],["common.validations.dns-hostname.test"],null],[28,[37,6],["common.validations.dns-hostname.error"],[["name"],["Name"]]]]]]],null]]]]],[[[1,"      "],[10,"fieldset"],[12],[1,"\\n        "],[8,[39,8],null,[["@label","@name","@item","@validations","@chart","@oninput"],[[28,[37,6],["components.consul.peer.generate.name"],null],"Name",[30,4],[30,3],[30,2],[28,[37,9],["target.value",[28,[37,10],[[30,4],"Name"],null]],null]]],null],[1,"\\n        "],[18,6,[[28,[37,4],null,[["valid"],[[28,[37,12],[[28,[37,13],[[30,2,["state"]],"error"],null]],null]]]]]],[1,"\\n      "],[13],[1,"\\n\\n"]],[3]]],[1,"\\n"],[44,[[28,[37,4],null,[["help"],[[28,[37,6],["common.validations.server-external-addresses.help"],null]]]]],[[[1,"      "],[10,"fieldset"],[12],[1,"\\n        "],[8,[39,8],null,[["@label","@name","@item","@chart","@validations","@oninput"],[[28,[37,6],["components.consul.peer.generate.addresses"],null],"ServerExternalAddresses",[30,4],[30,2],[30,5],[28,[37,9],["target.value",[30,0,["onInput"]]],null]]],null],[1,"\\n        "],[18,6,[[28,[37,4],null,[["valid"],[[28,[37,12],[[28,[37,13],[[30,2,["state"]],"error"],null]],null]]]]]],[1,"\\n      "],[13],[1,"\\n\\n"]],[5]]],[1,"  "]],[2]]]]],[1,"\\n"],[13],[1,"\\n"]],["&attrs","fsm","Name","@item","ServerExternalAddresses","&default"],false,["class-map","state-machine","require","let","hash","concat","t","array","text-input","pick","set","yield","not","state-matches"]]',moduleName:"consul-ui/components/consul/peer/form/generate/fieldsets/index.hbs",isStrictMode:!1})
-let a=(i=class extends l.default{onInput(e){e=e?e.split(",").map((e=>e.trim())):[],this.args.item.ServerExternalAddresses=e}},u=i.prototype,s="onInput",c=[r.action],d=Object.getOwnPropertyDescriptor(i.prototype,"onInput"),p=i.prototype,f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),i)
-var u,s,c,d,p,f
-e.default=a,(0,t.setComponentTemplate)(o,a)})),define("consul-ui/components/consul/peer/form/generate/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"s3NJojfR",block:'[[[11,0],[16,0,[28,[37,0],["consul-peer-form-generate"],null]],[17,1],[12],[1,"\\n  "],[8,[39,1],null,[["@src","@initial"],[[28,[37,2],["./chart.xstate"],[["from"],["/components/consul/peer/form/generate"]]],[52,[30,2],"loading","idle"]]],[["default"],[[[[1,"\\n\\n"],[44,[[28,[37,5],null,null]],[[[1,"      "],[11,"form"],[16,1,[30,4]],[4,[38,6],["submit",[28,[37,7],[[30,3,["dispatch"]],"LOAD"],null]],null],[12],[1,"\\n\\n        "],[8,[30,3,["State"]],null,[["@matches"],[[28,[37,8],["idle","error"],null]]],[["default"],[[[[1,"\\n          "],[8,[30,3,["State"]],null,[["@matches"],["error"]],[["default"],[[[[1,"\\n            "],[8,[39,9],[[24,0,"mb-3 mt-2"]],[["@type"],["critical"]],[["default"],[[[[1,"\\n              "],[8,[30,6,["Title"]],null,null,[["default"],[[[[1,"Error"]],[]]]]],[1,"\\n              "],[8,[30,6,["Description"]],null,null,[["default"],[[[[1,[30,3,["state","context","error","message"]]]],[]]]]],[1,"\\n            "]],[6]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[18,9,[[28,[37,11],null,[["Fieldsets","Actions"],[[50,"consul/peer/form/generate/fieldsets",0,null,[["item"],[[30,7]]]],[50,"consul/peer/form/generate/actions",0,null,[["item","id"],[[30,7],[30,4]]]]]]]]],[1,"\\n        "]],[]]]]],[1,"\\n\\n        "],[8,[30,3,["State"]],null,[["@matches"],["loading"]],[["default"],[[[[1,"\\n          "],[8,[39,13],null,[["@src","@onchange","@onerror"],[[28,[37,14],["/${partition}/${nspace}/${dc}/peering/token-for/${name}/${externalAddresses}",[28,[37,11],null,[["partition","nspace","dc","name","externalAddresses"],[[30,7,["Partition"]],"",[30,7,["Datacenter"]],[30,7,["Name"]],[30,7,["ServerExternalAddresses"]]]]]],null],[28,[37,15],[[30,8],[28,[37,16],["data",[28,[37,7],[[30,3,["dispatch"]],"SUCCESS"],null]],null]],null],[28,[37,15],[[28,[37,7],[[30,3,["dispatch"]],"ERROR"],null]],null]]],null],[1,"\\n        "]],[]]]]],[1,"\\n\\n        "],[8,[30,3,["State"]],null,[["@matches"],["success"]],[["default"],[[[[1,"\\n          "],[18,9,[[28,[37,11],null,[["Fieldsets","Actions"],[[50,"consul/peer/form/token/fieldsets",0,null,[["item","token","regenerate","onclick"],[[30,7],[30,3,["state","context","PeeringToken"]],[30,2],[28,[37,15],[[28,[37,17],[[30,7],"Name",""],null],[28,[37,7],[[30,3,["dispatch"]],"RESET"],null]],null]]]],[50,"consul/peer/form/token/actions",0,null,[["token","item","id"],[[30,3,["state","context","PeeringToken"]],[30,7],[30,4]]]]]]]]],[1,"\\n        "]],[]]]]],[1,"\\n\\n      "],[13],[1,"\\n"]],[4,5]]],[1,"\\n  "]],[3]]]]],[1,"\\n"],[13],[1,"\\n"]],["&attrs","@regenerate","fsm","id","reset","A","@item","@onchange","&default"],false,["class-map","state-machine","require","if","let","unique-id","on","fn","array","hds/alert","yield","hash","component","data-source","uri","queue","pick","set"]]',moduleName:"consul-ui/components/consul/peer/form/generate/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/form/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"5/r0PDQY",block:'[[[11,0],[16,0,[28,[37,0],["consul-peer-form"],null]],[17,1],[12],[1,"\\n  "],[8,[39,1],null,[["@src"],[[28,[37,2],["./chart.xstate"],[["from"],["/components/consul/peer/form"]]]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,3],null,[["@items","@onTabClicked"],[[28,[37,4],[[28,[37,5],null,[["label","selected","state"],[[28,[37,6],["components.consul.peer.form.generate-label"],null],[28,[37,7],[[30,2,["state"]],"generate"],null],"GENERATE"]]],[28,[37,5],null,[["label","selected","state"],[[28,[37,6],["components.consul.peer.form.establish-label"],null],[28,[37,7],[[30,2,["state"]],"initiate"],null],"INITIATE"]]]],null],[28,[37,8],["state",[30,2,["dispatch"]]],null]]],null],[1,"\\n\\n    "],[8,[30,2,["State"]],null,[["@matches"],[[28,[37,4],["generate"],null]]],[["default"],[[[[1,"\\n\\n      "],[8,[39,9],null,[["@src"],[[28,[37,10],["/${partition}/${nspace}/${dc}/peer-generate/",[30,3]],null]]],[["default"],[[[[1,"\\n        "],[18,6,[[28,[37,5],null,[["Form"],[[50,"consul/peer/form/generate",0,null,[["item"],[[30,4,["data"]]]]]]]]]],[1,"\\n      "]],[4]]]]],[1,"\\n\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[30,2,["State"]],null,[["@matches"],["initiate"]],[["default"],[[[[1,"\\n\\n      "],[8,[39,9],null,[["@src"],[[28,[37,10],["/${partition}/${nspace}/${dc}/peer-initiate/",[30,3]],null]]],[["default"],[[[[1,"\\n        "],[18,6,[[28,[37,5],null,[["Form"],[[50,"consul/peer/form/initiate",0,null,[["item"],[[30,5,["data"]]]]]]]]]],[1,"\\n      "]],[5]]]]],[1,"\\n\\n    "]],[]]]]],[1,"\\n\\n  "]],[2]]]]],[1,"\\n"],[13],[1,"\\n"]],["&attrs","fsm","@params","source","source","&default"],false,["class-map","state-machine","require","tab-nav","array","hash","t","state-matches","pick","data-source","uri","yield","component"]]',moduleName:"consul-ui/components/consul/peer/form/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/form/initiate/actions/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"ShUcgNKi",block:'[[[8,[39,0],[[16,"form",[30,1]],[24,4,"submit"],[17,2]],[["@text"],["Add peer"]],null]],["@id","&attrs"],false,["hds/button"]]',moduleName:"consul-ui/components/consul/peer/form/initiate/actions/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/form/initiate/fieldsets/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"I08SZDBv",block:'[[[11,0],[16,0,[28,[37,0],["consul-peer-form-initiate-fieldsets"],null]],[17,1],[12],[1,"\\n"],[44,[[28,[37,2],null,[["help","Name"],["Enter a name to locally identify the new peer.",[28,[37,3],[[28,[37,2],null,[["test","error"],[[28,[37,4],["common.validations.dns-hostname.test"],null],[28,[37,4],["common.validations.dns-hostname.error"],[["name"],["Name"]]]]]]],null]]]],[28,[37,2],null,[["help","PeeringToken"],["Enter the token received from the operator of the desired peer.",[28,[37,3],null,null]]]]],[[[1,"    "],[10,2],[12],[1,"\\n      Enter a token generated in the desired peer.\\n    "],[13],[1,"\\n      "],[8,[39,5],null,[["@src"],[[28,[37,6],["/machines/validate.xstate"],[["from"],["/components/consul/peer/form/generate/fieldsets"]]]]],[["default"],[[[[1,"\\n\\n      "],[10,"fieldset"],[12],[1,"\\n        "],[8,[39,7],null,[["@name","@label","@item","@validations","@chart"],["Name","Name of peer",[30,5],[30,2],[30,4]]],null],[1,"\\n        "],[8,[39,7],null,[["@expanded","@name","@item","@validations","@chart"],[true,"Token",[30,5],[30,3],[30,4]]],null],[1,"\\n        "],[18,6,[[28,[37,2],null,[["valid"],[[28,[37,9],[[28,[37,10],[[30,4,["state"]],"error"],null]],null]]]]]],[1,"\\n      "],[13],[1,"\\n\\n    "]],[4]]]]],[1,"\\n"]],[2,3]]],[13],[1,"\\n"]],["&attrs","Name","PeeringToken","fsm","@item","&default"],false,["class-map","let","hash","array","t","state-machine","require","text-input","yield","not","state-matches"]]',moduleName:"consul-ui/components/consul/peer/form/initiate/fieldsets/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/form/initiate/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"xAGGr6Ec",block:'[[[11,0],[16,0,[28,[37,0],["consul-peer-form-initiate"],null]],[17,1],[12],[1,"\\n  "],[8,[39,1],null,[["@sink","@type","@label","@onchange"],[[28,[37,2],["/${partition}/${nspace}/${dc}/peer",[28,[37,3],null,[["partition","nspace","dc"],[[28,[37,4],[[30,2,["Partition"]],""],null],[28,[37,4],[[30,2,["Namespace"]],""],null],[28,[37,4],[[30,2,["Datacenter"]],""],null]]]]],null],"peer","peer",[28,[37,5],[[28,[37,6],[[30,3]],null],[30,2]],null]]],[["default"],[[[[1,"\\n    "],[8,[39,7],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,8],[[24,0,"mb-3 mt-2"]],[["@type"],["critical"]],[["default"],[[[[1,"\\n        "],[8,[30,7,["Title"]],null,null,[["default"],[[[[1,"Error"]],[]]]]],[1,"\\n        "],[8,[30,7,["Description"]],null,null,[["default"],[[[[1,[30,6,["message"]]]],[]]]]],[1,"\\n      "]],[7]]]]],[1,"\\n    "]],[5,6]]]]],[1,"\\n    "],[8,[39,7],null,[["@name"],["content"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,10],null,null]],[[[1,"        "],[11,"form"],[16,1,[30,8]],[4,[38,11],["submit",[28,[37,5],[[30,4,["persist"]],[30,2]],null]],null],[12],[1,"\\n          "],[18,9,[[28,[37,3],null,[["Fieldsets","Actions"],[[50,"consul/peer/form/initiate/fieldsets",0,null,[["item"],[[30,2]]]],[50,"consul/peer/form/initiate/actions",0,null,[["item","id"],[[30,2],[30,8]]]]]]]]],[1,"\\n        "],[13],[1,"\\n"]],[8]]],[1,"    "]],[]]]]],[1,"\\n  "]],[4]]]]],[1,"\\n"],[13]],["&attrs","@item","@onsubmit","writer","after","error","A","id","&default"],false,["class-map","data-writer","uri","hash","or","fn","optional","block-slot","hds/alert","let","unique-id","on","yield","component"]]',moduleName:"consul-ui/components/consul/peer/form/initiate/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/form/token/actions/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"flM3VZCN",block:'[[[11,0],[17,1],[12],[1,"\\n  "],[8,[39,0],null,null,[["default"],[[[[1,"\\n    "],[8,[39,1],[[17,1],[4,[38,2],[[30,2]],null]],[["@text","@color"],["Copy token","primary"]],null],[1,"\\n    "],[8,[39,1],[[24,4,"reset"],[4,[38,3],["click",[30,3]],null]],[["@text","@color"],["Close","secondary"]],null],[1,"\\n  "]],[]]]]],[1,"\\n"],[13],[1,"\\n"]],["&attrs","@token","@onclose"],false,["hds/button-set","hds/button","with-copyable","on"]]',moduleName:"consul-ui/components/consul/peer/form/token/actions/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/form/token/fieldsets/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"u1kd86tb",block:'[[[41,[30,1],[[[1,"        "],[10,2],[12],[1,"\\n          Token regenerated! Here’s what’s next:\\n        "],[13],[1,"\\n"]],[]],[[[1,"        "],[10,2],[12],[1,"\\n          Token generated! Here’s what’s next:\\n        "],[13],[1,"\\n"]],[]]],[1,"        "],[10,"ol"],[12],[1,"\\n          "],[10,"li"],[12],[1,"\\n            "],[10,"strong"],[12],[1,"Copy the token"],[13],[10,"br"],[12],[13],[1,"\\n            This token cannot be viewed again after creation.\\n            "],[10,"br"],[12],[13],[1,"\\n            "],[8,[39,1],null,[["@value","@name"],[[30,2],"Token"]],null],[1,"\\n          "],[13],[1,"\\n          "],[10,"li"],[12],[1,"\\n            "],[10,"strong"],[12],[1,"Switch to the peer"],[13],[10,"br"],[12],[13],[1,"\\n            Someone on your team should log into the Datacenter (OSS) or Admin Partition (Enterprise) that you want this one to connect with.\\n          "],[13],[1,"\\n          "],[10,"li"],[12],[1,"\\n            "],[10,"strong"],[12],[1,"Initiate the peering"],[13],[10,"br"],[12],[13],[1,"\\n            From there, initiate a new peering, name it, and paste this token in.\\n          "],[13],[1,"\\n        "],[13],[1,"\\n"],[41,[28,[37,2],[[30,1]],null],[[[1,"  "],[8,[39,3],[[24,4,"reset"],[4,[38,4],["click",[30,3]],null]],[["@text","@color"],["Generate another token","secondary"]],null],[1,"\\n"]],[]],null],[1,"\\n"]],["@regenerate","@token","@onclick"],false,["if","copyable-code","not","hds/button","on"]]',moduleName:"consul-ui/components/consul/peer/form/token/fieldsets/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/info/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"OgBqwHXm",block:'[[[41,[30,1,["PeerName"]],[[[1,"  "],[10,0],[14,0,"consul-peer-info"],[12],[1,"\\n\\n    "],[11,"svg"],[24,"width","16"],[24,"height","16"],[24,"viewBox","0 0 16 16"],[24,"fill","none"],[24,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[4,[38,1],["Peer"],null],[12],[1,"\\n      "],[10,"path"],[14,"d","M16 8C16 7.80109 15.921 7.61032 15.7803 7.46967L12.2803 3.96967C11.9874 3.67678 11.5126 3.67678 11.2197 3.96967C10.9268 4.26256 10.9268 4.73744 11.2197 5.03033L14.1893 8L11.2197 10.9697C10.9268 11.2626 10.9268 11.7374 11.2197 12.0303C11.5126 12.3232 11.9874 12.3232 12.2803 12.0303L15.7803 8.53033C15.921 8.38968 16 8.19891 16 8Z"],[14,"fill","#77838A"],[12],[13],[1,"\\n      "],[10,"path"],[14,"d","M0.21967 8.53033C-0.0732233 8.23744 -0.0732233 7.76256 0.21967 7.46967L3.71967 3.96967C4.01256 3.67678 4.48744 3.67678 4.78033 3.96967C5.07322 4.26256 5.07322 4.73744 4.78033 5.03033L1.81066 8L4.78033 10.9697C5.07322 11.2626 5.07322 11.7374 4.78033 12.0303C4.48744 12.3232 4.01256 12.3232 3.71967 12.0303L0.21967 8.53033Z"],[14,"fill","#77838A"],[12],[13],[1,"\\n      "],[10,"path"],[14,"d","M5 7C4.44772 7 4 7.44772 4 8C4 8.55229 4.44772 9 5 9H5.01C5.56228 9 6.01 8.55229 6.01 8C6.01 7.44772 5.56228 7 5.01 7H5Z"],[14,"fill","#77838A"],[12],[13],[1,"\\n      "],[10,"path"],[14,"d","M7 8C7 7.44772 7.44772 7 8 7H8.01C8.56228 7 9.01 7.44772 9.01 8C9.01 8.55229 8.56228 9 8.01 9H8C7.44772 9 7 8.55229 7 8Z"],[14,"fill","#77838A"],[12],[13],[1,"\\n      "],[10,"path"],[14,"d","M11 7C10.4477 7 10 7.44772 10 8C10 8.55229 10.4477 9 11 9H11.01C11.5623 9 12.01 8.55229 12.01 8C12.01 7.44772 11.5623 7 11.01 7H11Z"],[14,"fill","#77838A"],[12],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,1],[14,0,"consul-peer-info__description"],[12],[1,"Imported from "],[10,1],[12],[1,[30,1,["PeerName"]]],[13],[13],[1,"\\n  "],[13],[1,"\\n"]],[]],null]],["@item"],false,["if","tooltip"]]',moduleName:"consul-ui/components/consul/peer/info/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"P8VyWcGf",block:'[[[8,[39,0],[[24,0,"consul-peer-list"],[17,1]],[["@items","@linkable"],[[30,2],"linkable peers"]],[["default"],[[[[1,"\\n  "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n"],[41,[28,[37,3],["delete peer"],[["item"],[[30,3]]]],[[[1,"      "],[10,3],[15,6,[28,[37,4],["dc.peers.show",[30,3,["Name"]]],null]],[12],[1,"\\n        "],[1,[30,3,["Name"]]],[1,"\\n      "],[13],[1,"\\n"]],[]],[[[1,"      "],[10,2],[12],[1,"\\n        "],[1,[30,3,["Name"]]],[1,"\\n      "],[13],[1,"\\n"]],[]]],[1,"  "]],[]]]]],[1,"\\n  "],[8,[39,1],null,[["@name"],["details"]],[["default"],[[[[1,"\\n    "],[10,0],[14,0,"peers__list__peer-detail"],[12],[1,"\\n      "],[8,[39,5],null,[["@peering"],[[30,3]]],null],[1,"\\n\\n      "],[11,0],[4,[38,6],[[28,[37,7],["routes.dc.peers.index.detail.imported.tooltip"],[["name"],[[30,3,["Name"]]]]]],null],[12],[1,"\\n        "],[1,[28,[35,7],["routes.dc.peers.index.detail.imported.count"],[["count"],[[28,[37,8],[[30,3,["ImportedServiceCount"]]],null]]]]],[1,"\\n      "],[13],[1,"\\n\\n      "],[11,0],[4,[38,6],[[28,[37,7],["routes.dc.peers.index.detail.exported.tooltip"],[["name"],[[30,3,["Name"]]]]]],null],[12],[1,"\\n        "],[1,[28,[35,7],["routes.dc.peers.index.detail.exported.count"],[["count"],[[28,[37,8],[[30,3,["ExportedServiceCount"]]],null]]]]],[1,"\\n      "],[13],[1,"\\n\\n    "],[13],[1,"\\n  "]],[]]]]],[1,"\\n  "],[8,[39,1],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n"],[41,[28,[37,3],["delete peer"],[["item"],[[30,3]]]],[[[1,"\\n      "],[8,[30,5],null,null,[["default"],[[[[1,"\\n"],[41,[28,[37,9],[[28,[37,3],["write peer"],[["item"],[[30,3]]]],[30,3,["isDialer"]]],null],[[[1,"          "],[8,[30,6],[[4,[38,10],["click",[28,[37,11],[[30,7],[30,3]],null]],null]],null,[["default"],[[[[1,"\\n            "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n              Regenerate token\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[]],null],[1,"        "],[8,[30,6],null,[["@href"],[[28,[37,4],["dc.peers.show",[30,3,["Name"]]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n            View\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[30,6],[[24,0,"dangerous"]],[["@onclick"],[[28,[37,11],[[30,8],[30,3]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n            Delete\\n          "]],[]]]]],[1,"\\n          "],[8,[39,1],null,[["@name"],["confirmation"]],[["default"],[[[[1,"\\n            "],[8,[30,9],[[24,0,"warning"]],null,[["default"],[[[[1,"\\n              "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                Confirm delete\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[10,2],[12],[1,"\\n                  Are you sure you want to delete this peer?\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["confirm"]],[["default"],[[[[1,"\\n                "],[8,[30,10],null,null,[["default"],[[[[1,"\\n                  Delete\\n                "]],[]]]]],[1,"\\n              "]],[10]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[9]]]]],[1,"\\n        "]],[]]]]],[1,"\\n      "]],[6]]]]],[1,"\\n"]],[]],null],[1,"  "]],[5]]]]],[1,"\\n"]],[3,4]]]]]],["&attrs","@items","item","index","Actions","Action","@onedit","@ondelete","Confirmation","Confirm"],false,["list-collection","block-slot","if","can","href-to","peerings/badge","tooltip","t","format-number","and","on","fn"]]',moduleName:"consul-ui/components/consul/peer/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/notifications/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"OPH53/LC",block:'[[[41,[28,[37,1],[[30,1],"remove"],null],[[[1,"  "],[8,[39,2],[[17,2]],[["@color"],["success"]],[["default"],[[[[1,"\\n    "],[8,[30,3,["Title"]],null,null,[["default"],[[[[1,"Success!"]],[]]]]],[1,"\\n    "],[8,[30,3,["Description"]],null,null,[["default"],[[[[1,"\\n      Your Peer has been marked for deletion.\\n    "]],[]]]]],[1,"\\n  "]],[3]]]]],[1,"\\n"]],[]],null]],["@type","&attrs","T"],false,["if","eq","hds/toast"]]',moduleName:"consul-ui/components/consul/peer/notifications/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/search-bar/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"pkHcu+gS",block:'[[[8,[39,0],[[24,0,"consul-peer-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","filter","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.peer.search-bar.",[30,3,["status","key"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.peer.search-bar.",[30,3,["status","value"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null],[28,[37,3],["common.brand.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n    "]],[3]],[[[1,"\\n      "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,5],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n        "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n          "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,"\\n              "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Optgroup"]],[30,9,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"              "],[8,[30,11],null,[["@value","@selected"],[[30,12],[28,[37,9],[[30,12],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,10],[[30,12]],null]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[12]],null]],[10,11]]],[1,"          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[6]],[[[1,"\\n      "],[8,[30,13,["Select"]],[[24,0,"type-state"]],[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["state","change"]]],null],true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[28,[35,2],["components.consul.peer.search-bar.state.name"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,14,["Optgroup"]],[30,14,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[28,[37,11],[[28,[37,12],["/models/peer"],[["export","from"],["schema","/components/consul/peer/search-bar"]]],"State.allowedValues"],null]],null]],null],null,[[[44,[[28,[37,13],[[30,17]],null]],[[[1,"          "],[8,[30,16],[[16,0,[29,["value-",[30,18]]]]],[["@value","@selected"],[[30,18],[28,[37,9],[[30,18],[30,2,["state","value"]]],null]]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,"\\n              "],[1,[28,[35,2],[[28,[37,3],["components.consul.peer.search-bar.state.options.",[30,18]],null]],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n"]],[18]]]],[17]],null]],[15,16]]],[1,"        "]],[]]]]],[1,"\\n      "]],[14]]]]],[1,"\\n    "]],[13]],[[[1,"\\n      "],[8,[30,19,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,20,["change"]]],null],false,true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n"],[44,[[28,[37,14],[[28,[37,4],[[28,[37,4],["Name:asc",[28,[37,2],["common.sort.alpha.asc"],null]],null],[28,[37,4],["Name:desc",[28,[37,2],["common.sort.alpha.desc"],null]],null],[28,[37,4],["State:asc",[28,[37,2],["components.consul.peer.search-bar.sort.state.asc"],null]],null],[28,[37,4],["State:desc",[28,[37,2],["components.consul.peer.search-bar.sort.state.desc"],null]],null]],null]],null]],[[[1,"              "],[1,[28,[35,11],[[30,22],[30,20,["value"]]],null]],[1,"\\n"]],[22]]],[1,"          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,21,["Optgroup"]],[30,21,["Option"]]],[[[1,"          "],[8,[30,23],null,[["@label"],[[28,[37,2],["components.consul.peer.search-bar.sort.state.name"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,24],null,[["@value","@selected"],["State:asc",[28,[37,15],["State:asc",[30,20,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["components.consul.peer.search-bar.sort.state.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,24],null,[["@value","@selected"],["State:desc",[28,[37,15],["State:desc",[30,20,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["components.consul.peer.search-bar.sort.state.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,23],null,[["@label"],[[28,[37,2],["common.consul.name"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,24],null,[["@value","@selected"],["Name:asc",[28,[37,15],["Name:asc",[30,20,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,24],null,[["@value","@selected"],["Name:desc",[28,[37,15],["Name:desc",[30,20,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[23,24]]],[1,"        "]],[]]]]],[1,"\\n      "]],[21]]]]],[1,"\\n    "]],[19]]]]],[1,"\\n"]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Optgroup","Option","prop","search","components","Optgroup","Option","upperState","state","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","action","block-slot","each","-track-array","includes","lowercase","get","require","string-to-lower-case","from-entries","eq"]]',moduleName:"consul-ui/components/consul/peer/search-bar/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/peer/selector/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"kl+7MwvJ",block:'[[[11,"li"],[24,0,"peers-separator"],[24,"role","separator"],[17,1],[12],[1,"\\n  Organization\\n"],[13],[1,"\\n"],[10,"li"],[15,0,[52,[28,[37,1],["dc.peers",[30,2,["Name"]]],null],"is-active"]],[12],[1,"\\n    "],[10,3],[15,6,[28,[37,2],["dc.peers",[30,2,["Name"]]],[["params"],[[28,[37,3],null,[["peer"],[[27]]]]]]]],[12],[1,"\\n      Peers\\n    "],[13],[1,"\\n"],[13],[1,"\\n\\n"]],["&attrs","@dc"],false,["if","is-href","href-to","hash"]]',moduleName:"consul-ui/components/consul/peer/selector/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/policy/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"v5u90Yk1",block:'[[[8,[39,0],[[24,0,"consul-policy-list"]],[["@items"],[[30,1]]],[["default"],[[[[1,"\\n    "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n"],[41,[28,[37,3],[[28,[37,4],[[30,2]],null],"policy-management"],null],[[[1,"        "],[10,"dl"],[14,0,"policy-management"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"Type"],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[8,[39,5],null,null,[["default"],[[[[1,"\\n              Global Management Policy\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[1,"      "],[10,3],[15,6,[28,[37,6],["dc.acls.policies.edit",[30,2,["ID"]]],null]],[15,0,[52,[28,[37,3],[[28,[37,4],[[30,2]],null],"policy-management"],null],"is-management"]],[12],[1,[30,2,["Name"]]],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,1],null,[["@name"],["details"]],[["default"],[[[[1,"\\n        "],[10,"dl"],[14,0,"datacenter"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"\\n            "],[8,[39,5],null,null,[["default"],[[[[1,"Datacenters"]],[]]]]],[1,"\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n              "],[1,[28,[35,7],[", ",[28,[37,8],[[30,2]],null]],null]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n        "],[10,"dl"],[14,0,"description"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"Description"],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[1,[30,2,["Description"]]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,1],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n      "],[8,[30,3],null,null,[["default"],[[[[1,"\\n        "],[8,[30,4],null,[["@href"],[[28,[37,6],["dc.acls.policies.edit",[30,2,["ID"]]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n"],[41,[28,[37,9],["write policy"],[["item"],[[30,2]]]],[[[1,"            Edit\\n"]],[]],[[[1,"            View\\n"]],[]]],[1,"          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"],[41,[28,[37,9],["delete policy"],[["item"],[[30,2]]]],[[[1,"        "],[8,[30,4],[[24,0,"dangerous"]],[["@onclick"],[[28,[37,10],[[30,0],[30,5],[30,2]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n            Delete\\n          "]],[]]]]],[1,"\\n          "],[8,[39,1],null,[["@name"],["confirmation"]],[["default"],[[[[1,"\\n            "],[8,[30,6],[[24,0,"warning"]],null,[["default"],[[[[1,"\\n              "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                Confirm delete\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[10,2],[12],[1,"\\n                  Are you sure you want to delete this policy?\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["confirm"]],[["default"],[[[[1,"\\n                "],[8,[30,7],null,null,[["default"],[[[[1,"Delete"]],[]]]]],[1,"\\n              "]],[7]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[6]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[1,"      "]],[4]]]]],[1,"\\n    "]],[3]]]]],[1,"\\n"]],[2]]]]]],["@items","item","Actions","Action","@ondelete","Confirmation","Confirm"],false,["list-collection","block-slot","if","eq","policy/typeof","tooltip","href-to","join","policy/datacenters","can","action"]]',moduleName:"consul-ui/components/consul/policy/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/policy/notifications/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"I7CTnbjl",block:'[[[41,[28,[37,1],[[30,1],"create"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    Your policy has been added.\\n"]],[]],[[[1,"    There was an error adding your policy.\\n"]],[]]]],[]],[[[41,[28,[37,1],[[30,1],"update"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    Your policy has been saved.\\n"]],[]],[[[1,"    There was an error saving your policy.\\n"]],[]]]],[]],[[[41,[28,[37,1],[[30,1],"delete"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    Your policy was deleted.\\n"]],[]],[[[1,"    There was an error deleting your policy.\\n"]],[]]]],[]],null]],[]]]],[]]],[44,[[30,3,["errors","firstObject"]]],[[[41,[30,4,["detail"]],[[[1,"    "],[10,"br"],[12],[13],[1,[28,[35,3],["(",[52,[30,4,["status"]],[28,[37,3],[[30,4,["status"]],": "],null]],[30,4,["detail"]],")"],null]],[1,"\\n"]],[]],null]],[4]]]],["@type","@status","@error","error"],false,["if","eq","let","concat"]]',moduleName:"consul-ui/components/consul/policy/notifications/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i}))
-define("consul-ui/components/consul/policy/search-bar/index",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"rNkB4Q1f",block:'[[[8,[39,0],[[24,0,"consul-policy-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","filter","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.policy.search-bar.",[30,3,["status","key"]],".name"],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.policy.search-bar.",[30,3,["status","key"]],".options.",[30,3,["status","value"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null],[28,[37,3],["common.brand.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[52,[28,[37,6],[[30,3,["status","key"]],"datacenter"],null],[30,3,["status","value"]],[30,5]]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n    "]],[3]],[[[1,"\\n      "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,7],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n        "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,7],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n          "],[8,[39,8],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,"\\n              "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,8],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Optgroup"]],[30,9,["Option"]]],[[[42,[28,[37,10],[[28,[37,10],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"              "],[8,[30,11],null,[["@value","@selected"],[[30,12],[28,[37,11],[[30,12],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,12],[[30,12]],null]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[12]],null]],[10,11]]],[1,"          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[6]],[[[1,"\\n      "],[8,[30,13,["Select"]],[[24,0,"type-datacenter"]],[["@position","@onchange","@multiple"],["left",[28,[37,7],[[30,0],[30,2,["datacenter","change"]]],null],true]],[["default"],[[[[1,"\\n        "],[8,[39,8],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[28,[35,2],["common.consul.datacenter"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,8],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,14,["Optgroup"]],[30,14,["Option"]]],[[[42,[28,[37,10],[[28,[37,10],[[33,13]],null]],null],null,[[[1,"            "],[8,[30,16],null,[["@value","@selected"],[[30,17,["Name"]],[28,[37,11],[[30,17,["Name"]],[30,2,["datacenter","value"]]],null]]],[["default"],[[[[1,[30,17,["Name"]]]],[]]]]],[1,"\\n"]],[17]],null],[1,"            "],[8,[39,14],null,[["@src","@loading","@onchange"],[[28,[37,15],["/${partition}/*/*/datacenters",[28,[37,16],null,[["partition"],[[30,18]]]]],null],"lazy",[28,[37,7],[[30,0],[28,[37,17],[[30,0,["dcs"]]],null]],[["value"],["data"]]]]],null],[1,"\\n"]],[15,16]]],[1,"        "]],[]]]]],[1,"\\n      "]],[14]]]]],[1,"\\n      "],[8,[30,13,["Select"]],[[24,0,"type-kind"]],[["@position","@onchange","@multiple"],["left",[28,[37,7],[[30,0],[30,2,["kind","change"]]],null],true]],[["default"],[[[[1,"\\n        "],[8,[39,8],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[28,[35,2],["components.consul.policy.search-bar.kind.name"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,8],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,19,["Optgroup"]],[30,19,["Option"]]],[[[42,[28,[37,10],[[28,[37,10],[[28,[37,4],["global-management","standard"],null]],null]],null],null,[[[1,"          "],[8,[30,21],[[16,0,[29,["value-",[30,22]]]]],[["@value","@selected"],[[30,22],[28,[37,11],[[30,22],[30,2,["kind","value"]]],null]]],[["default"],[[[[1,"\\n            "],[1,[28,[35,2],[[28,[37,3],["components.consul.policy.search-bar.kind.options.",[30,22]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,22]],null]],null]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[22]],null]],[20,21]]],[1,"        "]],[]]]]],[1,"\\n      "]],[19]]]]],[1,"\\n    "]],[13]],[[[1,"\\n      "],[8,[30,23,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,7],[[30,0],[30,24,["change"]]],null],false,true]],[["default"],[[[[1,"\\n        "],[8,[39,8],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n"],[44,[[28,[37,18],[[28,[37,4],[[28,[37,4],["Name:asc",[28,[37,2],["common.sort.alpha.asc"],null]],null],[28,[37,4],["Name:desc",[28,[37,2],["common.sort.alpha.desc"],null]],null]],null]],null]],[[[1,"              "],[1,[28,[35,19],[[30,26],[30,24,["value"]]],null]],[1,"\\n"]],[26]]],[1,"          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,8],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,25,["Optgroup"]],[30,25,["Option"]]],[[[1,"          "],[8,[30,27],null,[["@label"],[[28,[37,2],["common.ui.name"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,28],null,[["@value","@selected"],["Name:asc",[28,[37,6],["Name:asc",[30,24,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,28],null,[["@value","@selected"],["Name:desc",[28,[37,6],["Name:desc",[30,24,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[27,28]]],[1,"        "]],[]]]]],[1,"\\n      "]],[25]]]]],[1,"\\n    "]],[23]]]]],[1,"\\n"]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Optgroup","Option","prop","search","components","Optgroup","Option","dc","@partition","components","Optgroup","Option","state","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","if","eq","action","block-slot","each","-track-array","includes","lowercase","dcs","data-source","uri","hash","mut","from-entries","get"]]',moduleName:"consul-ui/components/consul/policy/search-bar/index.hbs",isStrictMode:!1})
-class i extends l.default{}e.default=i,(0,t.setComponentTemplate)(r,i)})),define("consul-ui/components/consul/role/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"+f+3clGw",block:'[[[8,[39,0],[[24,0,"consul-role-list"],[17,1]],[["@items"],[[30,2]]],[["default"],[[[[1,"\\n    "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n      "],[10,3],[15,6,[28,[37,2],["dc.acls.roles.edit",[30,3,["ID"]]],null]],[12],[1,[30,3,["Name"]]],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,1],null,[["@name"],["details"]],[["default"],[[[[1,"\\n      "],[8,[39,3],null,[["@item"],[[30,3]]],null],[1,"\\n      "],[10,"dl"],[12],[1,"\\n        "],[10,"dt"],[12],[1,"Description"],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n            "],[1,[30,3,["Description"]]],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,1],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n      "],[8,[30,4],null,null,[["default"],[[[[1,"\\n        "],[8,[30,5],null,[["@href"],[[28,[37,2],["dc.acls.roles.edit",[30,3,["ID"]]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n"],[41,[28,[37,5],["write role"],[["item"],[[30,3]]]],[[[1,"            Edit\\n"]],[]],[[[1,"            View\\n"]],[]]],[1,"          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"],[41,[28,[37,5],["delete role"],[["item"],[[30,3]]]],[[[1,"        "],[8,[30,5],[[24,0,"dangerous"]],[["@onclick"],[[28,[37,6],[[30,0],[30,6],[30,3]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n            Delete\\n          "]],[]]]]],[1,"\\n          "],[8,[39,1],null,[["@name"],["confirmation"]],[["default"],[[[[1,"\\n            "],[8,[30,7],[[24,0,"warning"]],null,[["default"],[[[[1,"\\n              "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                Confirm delete\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[10,2],[12],[1,"\\n                  Are you sure you want to delete this role?\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["confirm"]],[["default"],[[[[1,"\\n                "],[8,[30,8],null,null,[["default"],[[[[1,"Delete"]],[]]]]],[1,"\\n              "]],[8]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[7]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[1,"      "]],[5]]]]],[1,"\\n    "]],[4]]]]],[1,"\\n"]],[3]]]]]],["&attrs","@items","item","Actions","Action","@ondelete","Confirmation","Confirm"],false,["list-collection","block-slot","href-to","consul/token/ruleset/list","if","can","action"]]',moduleName:"consul-ui/components/consul/role/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/role/notifications/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"3IiB4HcR",block:'[[[41,[28,[37,1],[[30,1],"create"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    Your role has been added.\\n"]],[]],[[[1,"    There was an error adding your role.\\n"]],[]]]],[]],[[[41,[28,[37,1],[[30,1],"update"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    Your role has been saved.\\n"]],[]],[[[1,"    There was an error saving your role.\\n"]],[]]]],[]],[[[41,[28,[37,1],[[30,1],"delete"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    Your role was deleted.\\n"]],[]],[[[1,"    There was an error deleting your role.\\n"]],[]]]],[]],null]],[]]]],[]]],[44,[[30,3,["errors","firstObject"]]],[[[41,[30,4,["detail"]],[[[1,"    "],[10,"br"],[12],[13],[1,[28,[35,3],["(",[52,[30,4,["status"]],[28,[37,3],[[30,4,["status"]],": "],null]],[30,4,["detail"]],")"],null]],[1,"\\n"]],[]],null]],[4]]]],["@type","@status","@error","error"],false,["if","eq","let","concat"]]',moduleName:"consul-ui/components/consul/role/notifications/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/role/search-bar/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"aNFJl995",block:'[[[8,[39,0],[[24,0,"consul-role-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.role.search-bar.",[30,3,["status","key"]],".name"],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.role.search-bar.",[30,3,["status","key"]],".options.",[30,3,["status","value"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null],[28,[37,3],["common.brand.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n    "]],[3]],[[[1,"\\n      "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,5],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n        "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n          "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,"\\n              "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Optgroup"]],[30,9,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"              "],[8,[30,11],null,[["@value","@selected"],[[30,12],[28,[37,9],[[30,12],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,10],[[30,12]],null]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[12]],null]],[10,11]]],[1,"          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[6]],[[[1,"\\n      "],[8,[30,13,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,14,["change"]]],null],false,true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n"],[44,[[28,[37,11],[[28,[37,4],[[28,[37,4],["Name:asc",[28,[37,2],["common.sort.alpha.asc"],null]],null],[28,[37,4],["Name:desc",[28,[37,2],["common.sort.alpha.desc"],null]],null],[28,[37,4],["CreateIndex:desc",[28,[37,2],["common.sort.age.desc"],null]],null],[28,[37,4],["CreateIndex:asc",[28,[37,2],["common.sort.age.asc"],null]],null]],null]],null]],[[[1,"              "],[1,[28,[35,12],[[30,16],[30,14,["value"]]],null]],[1,"\\n"]],[16]]],[1,"          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,15,["Optgroup"]],[30,15,["Option"]]],[[[1,"        "],[8,[30,17],null,[["@label"],[[28,[37,2],["common.ui.name"],null]]],[["default"],[[[[1,"\\n          "],[8,[30,18],null,[["@value","@selected"],["Name:asc",[28,[37,13],["Name:asc",[30,14,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n          "],[8,[30,18],null,[["@value","@selected"],["Name:desc",[28,[37,13],["Name:desc",[30,14,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[30,17],null,[["@label"],[[28,[37,2],["common.ui.creation"],null]]],[["default"],[[[[1,"\\n          "],[8,[30,18],null,[["@value","@selected"],["CreateIndex:desc",[28,[37,13],["CreateIndex:desc",[30,14,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.age.desc"],null]]],[]]]]],[1,"\\n          "],[8,[30,18],null,[["@value","@selected"],["CreateIndex:asc",[28,[37,13],["CreateIndex:asc",[30,14,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.age.asc"],null]]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[17,18]]],[1,"        "]],[]]]]],[1,"\\n      "]],[15]]]]],[1,"\\n    "]],[13]]]]],[1,"\\n"]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Optgroup","Option","prop","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","action","block-slot","each","-track-array","includes","lowercase","from-entries","get","eq"]]',moduleName:"consul-ui/components/consul/role/search-bar/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/server/card/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"3gOA2+ED",block:'[[[11,0],[16,0,[28,[37,0],["consul-server-card",[28,[37,1],["voting-status-leader",[28,[37,2],[[30,1,["Status"]],"leader"],null]],null],[28,[37,1],["voting-status-voter",[28,[37,3],[[28,[37,4],[[30,1,["ReadReplica"]]],null],[28,[37,2],[[30,1,["Status"]],"voter"],null]],null]],null],[28,[37,1],["voting-status-non-voter",[28,[37,5],[[30,1,["ReadReplica"]],[28,[37,6],[[30,1,["Status"]],[28,[37,1],["non-voter","staging"],null]],null]],null]],null]],null]],[17,2],[12],[1,"\\n  "],[10,"dl"],[12],[1,"\\n\\n    "],[11,"dt"],[24,0,"name"],[4,[38,7],["Leader"],null],[12],[1,"\\n    "],[13],[1,"\\n    "],[10,"dd"],[12],[1,"\\n      "],[1,[30,1,["Name"]]],[1,"\\n    "],[13],[1,"\\n\\n    "],[10,"dt"],[15,0,[28,[37,0],["health-status",[28,[37,1],["healthy",[30,1,["Healthy"]]],null]],null]],[12],[1,"\\n      Status\\n    "],[13],[1,"\\n    "],[10,"dd"],[12],[1,"\\n      "],[1,[52,[28,[37,6],[[30,1,["Status"]],[28,[37,1],["leader","voter"],null]],null],"Active voter","Backup voter"]],[1,"\\n    "],[13],[1,"\\n\\n  "],[13],[1,"\\n"],[13],[1,"\\n\\n"]],["@item","&attrs"],false,["class-map","array","eq","and","not","or","includes","tooltip","if"]]',moduleName:"consul-ui/components/consul/server/card/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/server/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"L4k4YQfd",block:'[[[11,0],[16,0,[28,[37,0],["consul-server-list"],null]],[17,1],[12],[1,"\\n  "],[10,"ul"],[12],[1,"\\n"],[42,[28,[37,2],[[28,[37,2],[[30,2]],null]],null],null,[[[1,"    "],[10,"li"],[12],[1,"\\n      "],[10,3],[15,6,[28,[37,3],["dc.nodes.show",[30,3,["Name"]]],null]],[12],[1,"\\n        "],[8,[39,4],null,[["@item"],[[30,3]]],null],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[3]],null],[1,"  "],[13],[1,"\\n"],[13],[1,"\\n\\n"]],["&attrs","@items","item"],false,["class-map","each","-track-array","href-to","consul/server/card"]]',moduleName:"consul-ui/components/consul/server/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/service-identity/template/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"/FDJj0m3",block:'[[[41,[28,[37,1],["use partitions"],null],[[[1,"partition \\""],[1,[28,[35,2],[[30,1],"default"],null]],[1,"\\" {\\n"],[41,[28,[37,1],["use nspaces"],null],[[[1,"  namespace \\""],[1,[28,[35,2],[[30,2],"default"],null]],[1,"\\" {\\n    service \\""],[1,[30,3]],[1,"\\" {\\n\\t    policy = \\"write\\"\\n    }\\n    service \\""],[1,[30,3]],[1,"-sidecar-proxy\\" {\\n\\t    policy = \\"write\\"\\n    }\\n    service_prefix \\"\\" {\\n\\t    policy = \\"read\\"\\n    }\\n    node_prefix \\"\\" {\\n\\t    policy = \\"read\\"\\n    }\\n  }\\n"]],[]],[[[1,"  service \\""],[1,[30,3]],[1,"\\" {\\n\\t  policy = \\"write\\"\\n  }\\n  service \\""],[1,[30,3]],[1,"-sidecar-proxy\\" {\\n\\t  policy = \\"write\\"\\n  }\\n  service_prefix \\"\\" {\\n\\t  policy = \\"read\\"\\n  }\\n  node_prefix \\"\\" {\\n\\t  policy = \\"read\\"\\n  }\\n"]],[]]],[1,"}\\n"]],[]],[[[41,[28,[37,1],["use nspaces"],null],[[[1,"namespace \\""],[1,[28,[35,2],[[30,2],"default"],null]],[1,"\\" {\\n  service \\""],[1,[30,3]],[1,"\\" {\\n\\t  policy = \\"write\\"\\n  }\\n  service \\""],[1,[30,3]],[1,"-sidecar-proxy\\" {\\n\\t  policy = \\"write\\"\\n  }\\n  service_prefix \\"\\" {\\n\\t  policy = \\"read\\"\\n  }\\n  node_prefix \\"\\" {\\n\\t  policy = \\"read\\"\\n  }\\n}\\n"]],[]],[[[1,"service \\""],[1,[30,3]],[1,"\\" {\\n\\tpolicy = \\"write\\"\\n}\\nservice \\""],[1,[30,3]],[1,"-sidecar-proxy\\" {\\n\\tpolicy = \\"write\\"\\n}\\nservice_prefix \\"\\" {\\n\\tpolicy = \\"read\\"\\n}\\nnode_prefix \\"\\" {\\n\\tpolicy = \\"read\\"\\n}\\n"]],[]]]],[]]]],["@partition","@nspace","@name"],false,["if","can","or"]]',moduleName:"consul-ui/components/consul/service-identity/template/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/service-instance/list/index",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"MaR0UaLj",block:'[[[44,[[28,[37,1],[[30,1],"Service.Proxy.DestinationServiceID"],null]],[[[8,[39,2],[[24,0,"consul-service-instance-list"],[17,3]],[["@items"],[[30,4]]],[["default"],[[[[1,"\\n  "],[8,[39,3],null,[["@name"],["header"]],[["default"],[[[[1,"\\n"],[41,[28,[37,5],[[30,7],"dc.services.show"],null],[[[1,"      "],[10,3],[15,6,[28,[37,6],[[30,7],[30,5,["Service","Service"]]],null]],[12],[1,"\\n        "],[1,[30,5,["Service","ID"]]],[1,"\\n      "],[13],[1,"\\n"]],[]],[[[1,"      "],[10,3],[15,6,[28,[37,6],[[30,7],[30,5,["Service","Service"]],[30,5,["Node","Node"]],[28,[37,7],[[30,5,["Service","ID"]],[30,5,["Service","Service"]]],null]],null]],[12],[1,"\\n        "],[1,[30,5,["Service","ID"]]],[1,"\\n      "],[13],[1,"\\n"]],[]]],[1,"  "]],[]]]]],[1,"\\n  "],[8,[39,3],null,[["@name"],["details"]],[["default"],[[[[1,"\\n\\n"],[44,[[28,[37,8],[[30,2],[30,5,["Service","ID"]]],null]],[[[44,[[28,[37,9],[[28,[37,10],[[30,5,["Checks"]],[28,[37,7],[[30,8,["Checks"]],[28,[37,10],null,null]],null]],null]],null]],[[[1,"\\n"],[41,[30,10],[[[1,"    "],[8,[39,11],null,[["@item"],[[30,5,["Service"]]]],null],[1,"\\n    "],[8,[39,12],null,[["@type","@items"],["service",[28,[37,13],["ServiceID","",[30,9]],null]]],null],[1,"\\n"]],[]],[[[41,[51,[30,0,["areAllExternalSourcesMatching"]]],[[[1,"      "],[8,[39,11],null,[["@item"],[[30,5,["Service"]]]],null],[1,"\\n"]],[]],null],[1,"\\n    "],[8,[39,12],null,[["@type","@items"],["service",[28,[37,13],["ServiceID","",[30,9]],null]]],null],[1,"\\n\\n"],[41,[51,[30,5,["Node","Meta","synthetic-node"]]],[[[1,"      "],[8,[39,12],null,[["@type","@items"],["node",[28,[37,15],["ServiceID","",[30,9]],null]]],null],[1,"\\n"]],[]],null]],[]]],[41,[30,8],[[[1,"    "],[10,"dl"],[14,0,"mesh"],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        "],[8,[39,16],null,null,[["default"],[[[[1,"\\n          This service uses a proxy for the Consul service mesh\\n        "]],[]]]]],[1,"\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        in service mesh with proxy\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[]],null],[41,[28,[37,17],[[28,[37,18],[[30,10]],null],[28,[37,18],[[30,5,["Node","Meta","synthetic-node"]]],null]],null],[[[1,"    "],[10,"dl"],[14,0,"node"],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        "],[8,[39,16],null,null,[["default"],[[[[1,"\\n          Node\\n        "]],[]]]]],[1,"\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[10,3],[15,6,[28,[37,6],["dc.nodes.show",[30,5,["Node","Node"]]],null]],[12],[1,[30,5,["Node","Node"]]],[13],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[]],null],[41,[30,5,["Service","Port"]],[[[1,"    "],[10,"dl"],[14,0,"address"],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        "],[8,[39,16],null,null,[["default"],[[[[1,"\\n          IP Address and Port\\n        "]],[]]]]],[1,"\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n"],[41,[28,[37,19],[[30,5,["Service","Address"]],""],null],[[[1,"          "],[1,[30,5,["Service","Address"]]],[1,":"],[1,[30,5,["Service","Port"]]],[1,"\\n"]],[]],[[[1,"          "],[1,[30,5,["Node","Address"]]],[1,":"],[1,[30,5,["Service","Port"]]],[1,"\\n"]],[]]],[1,"      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[41,[30,5,["Service","SocketPath"]],[[[1,"    "],[10,"dl"],[14,0,"socket"],[12],[1,"\\n      "],[11,"dt"],[4,[38,16],null,null],[12],[1,"\\n        Socket Path\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[1,[30,5,["Service","SocketPath"]]],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[]],null]],[]]],[1,"    "],[8,[39,20],null,[["@item"],[[30,5,["Service"]]]],null],[1,"\\n\\n"]],[9]]]],[8]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[5,6]]]]],[1,"\\n"]],[2]]]],["@proxies","proxies","&attrs","@items","item","index","@routeName","proxy","checks","@node"],false,["let","to-hash","list-collection","block-slot","if","eq","href-to","or","get","merge-checks","array","consul/external-source","consul/instance-checks","filter-by","unless","reject-by","tooltip","and","not","not-eq","tag-list"]]',moduleName:"consul-ui/components/consul/service-instance/list/index.hbs",isStrictMode:!1})
-class i extends l.default{get areAllExternalSourcesMatching(){var e,t,n
-const l=null===(e=this.args.items[0])||void 0===e||null===(t=e.Service)||void 0===t||null===(n=t.Meta)||void 0===n?void 0:n["external-source"]
-return this.args.items.every((e=>{var t,n
-return(null===(t=e.Service)||void 0===t||null===(n=t.Meta)||void 0===n?void 0:n["external-source"])===l}))}}e.default=i,(0,t.setComponentTemplate)(r,i)})),define("consul-ui/components/consul/service-instance/search-bar/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"sxcYe4gj",block:'[[[8,[39,0],[[24,0,"consul-service-instance-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","filter","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.service-instance.search-bar.",[30,3,["status","key"]],".name"],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.service-instance.search-bar.",[30,3,["status","key"]],".options.",[30,3,["status","value"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null],[28,[37,3],["common.brand.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n  "]],[3]],[[[1,"\\n    "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,5],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n"],[41,[30,2,["searchproperty"]],[[[1,"        "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n          "],[8,[39,7],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,"\\n              "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,7],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Option"]]],[[[42,[28,[37,9],[[28,[37,9],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"                "],[8,[30,10],null,[["@value","@selected"],[[30,11],[28,[37,10],[[30,11],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                  "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,11],[[30,11]],null]],null]],null]],[1,"\\n                "]],[]]]]],[1,"\\n"]],[11]],null]],[10]]],[1,"          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n"]],[]],null],[1,"    "]],[]]]]],[1,"\\n  "]],[6]],[[[1,"\\n    "],[8,[30,12,["Select"]],[[24,0,"type-status"]],[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["status","change"]]],null],true]],[["default"],[[[[1,"\\n      "],[8,[39,7],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n        "],[10,1],[12],[1,"\\n          "],[1,[28,[35,2],["common.consul.status"],null]],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,7],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,13,["Optgroup"]],[30,13,["Option"]]],[[[42,[28,[37,9],[[28,[37,9],[[28,[37,4],["passing","warning","critical","empty"],null]],null]],null],null,[[[1,"            "],[8,[30,15],[[16,0,[29,["value-",[30,16]]]]],[["@value","@selected"],[[30,16],[28,[37,10],[[30,16],[30,2,["status","value"]]],null]]],[["default"],[[[[1,"\\n              "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[30,16]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,16]],null]],null]]]]],[1,"\\n            "]],[]]]]],[1,"\\n"]],[16]],null]],[14,15]]],[1,"      "]],[]]]]],[1,"\\n    "]],[13]]]]],[1,"\\n"],[41,[28,[37,12],[[30,17,["length"]],0],null],[[[1,"      "],[8,[30,12,["Select"]],[[24,0,"type-source"]],[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["source","change"]]],null],true]],[["default"],[[[[1,"\\n        "],[8,[39,13],null,[["@components","@filter","@sources"],[[30,18],[30,2],[30,17]]],null],[1,"\\n      "]],[18]]]]],[1,"\\n"]],[]],null],[1,"  "]],[12]],[[[1,"\\n    "],[8,[30,19,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,20,["change"]]],null],false,true]],[["default"],[[[[1,"\\n      "],[8,[39,7],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n        "],[10,1],[12],[1,"\\n"],[44,[[28,[37,14],[[28,[37,4],[[28,[37,4],["Name:asc",[28,[37,2],["common.sort.alpha.asc"],null]],null],[28,[37,4],["Name:desc",[28,[37,2],["common.sort.alpha.desc"],null]],null],[28,[37,4],["Status:asc",[28,[37,2],["common.sort.status.asc"],null]],null],[28,[37,4],["Status:desc",[28,[37,2],["common.sort.status.desc"],null]],null]],null]],null]],[[[1,"            "],[1,[28,[35,15],[[30,22],[30,20,["value"]]],null]],[1,"\\n"]],[22]]],[1,"        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,7],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,21,["Optgroup"]],[30,21,["Option"]]],[[[1,"          "],[8,[30,23],null,[["@label"],[[28,[37,2],["common.consul.status"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,24],null,[["@value","@selected"],["Status:asc",[28,[37,16],["Status:asc",[30,20,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.status.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,24],null,[["@value","@selected"],["Status:desc",[28,[37,16],["Status:desc",[30,20,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.status.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,23],null,[["@label"],[[28,[37,2],["components.consul.service-instance.search-bar.sort.name.name"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,24],null,[["@value","@selected"],["Name:asc",[28,[37,16],["Name:asc",[30,20,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,24],null,[["@value","@selected"],["Name:desc",[28,[37,16],["Name:desc",[30,20,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[23,24]]],[1,"      "]],[]]]]],[1,"\\n    "]],[21]]]]],[1,"\\n  "]],[19]]]]],[1,"\\n"]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Option","prop","search","components","Optgroup","Option","state","@sources","components","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","action","if","block-slot","each","-track-array","includes","lowercase","gt","consul/sources-select","from-entries","get","eq"]]',moduleName:"consul-ui/components/consul/service-instance/search-bar/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/service/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"SaF5GIVw",block:'[[[8,[39,0],[[24,0,"consul-service-list"],[17,1]],[["@items","@linkable"],[[30,2],"linkable service"]],[["default"],[[[[1,"\\n  "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n    "],[10,"dl"],[15,0,[30,3,["MeshStatus"]]],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        Health\\n      "],[13],[1,"\\n      "],[11,"dd"],[4,[38,2],[[30,3,["healthTooltipText"]]],null],[12],[13],[1,"\\n    "],[13],[1,"\\n"],[41,[28,[37,4],[[30,3,["InstanceCount"]],0],null],[[[1,"      "],[10,3],[15,6,[28,[37,5],["dc.services.show.index",[30,3,["Name"]]],[["params"],[[52,[28,[37,6],[[30,3,["Partition"]],[30,5]],null],[28,[37,7],null,[["partition","nspace","peer"],[[30,3,["Partition"]],[30,3,["Namespace"]],[30,3,["PeerName"]]]]],[28,[37,7],null,[["peer"],[[30,3,["PeerName"]]]]]]]]]],[12],[1,"\\n        "],[1,[30,3,["Name"]]],[1,"\\n      "],[13],[1,"\\n"]],[]],[[[1,"      "],[10,2],[12],[1,"\\n        "],[1,[30,3,["Name"]]],[1,"\\n      "],[13],[1,"\\n"]],[]]],[1,"  "]],[]]]]],[1,"\\n  "],[8,[39,1],null,[["@name"],["details"]],[["default"],[[[[1,"\\n    "],[8,[39,8],null,[["@item"],[[30,3]]],null],[1,"\\n    "],[8,[39,9],null,[["@item"],[[30,3]]],null],[1,"\\n"],[41,[28,[37,10],[[28,[37,6],[[30,3,["InstanceCount"]],0],null],[28,[37,10],[[28,[37,6],[[30,3,["Kind"]],"terminating-gateway"],null],[28,[37,6],[[30,3,["Kind"]],"ingress-gateway"],null]],null]],null],[[[1,"      "],[10,1],[12],[1,"\\n        "],[1,[28,[35,11],[[30,3,["InstanceCount"]]],null]],[1,"\\n        "],[1,[28,[35,12],[[30,3,["InstanceCount"]],"instance"],[["without-count"],[true]]]],[1,"\\n      "],[13],[1,"\\n"]],[]],null],[41,[51,[30,6]],[[[1,"      "],[8,[39,14],null,[["@item","@nspace","@partition"],[[30,3],[30,7],[30,5]]],null],[1,"\\n"]],[]],null],[41,[28,[37,15],[[30,3,["Kind"]],"terminating-gateway"],null],[[[1,"      "],[10,1],[12],[1,"\\n        "],[1,[28,[35,11],[[30,3,["GatewayConfig","AssociatedServiceCount"]]],null]],[1,"\\n        "],[1,[28,[35,12],[[30,3,["GatewayConfig","AssociatedServiceCount"]],"linked service"],[["without-count"],[true]]]],[1,"\\n      "],[13],[1,"\\n"]],[]],[[[41,[28,[37,15],[[30,3,["Kind"]],"ingress-gateway"],null],[[[1,"      "],[10,1],[12],[1,"\\n        "],[1,[28,[35,11],[[30,3,["GatewayConfig","AssociatedServiceCount"]]],null]],[1,"\\n        "],[1,[28,[35,12],[[30,3,["GatewayConfig","AssociatedServiceCount"]],"upstream"],[["without-count"],[true]]]],[1,"\\n      "],[13],[1,"\\n    "]],[]],null]],[]]],[41,[28,[37,16],[[30,3,["ConnectedWithGateway"]],[30,3,["ConnectedWithProxy"]]],null],[[[1,"      "],[10,"dl"],[14,0,"mesh"],[12],[1,"\\n        "],[10,"dt"],[12],[1,"\\n          "],[8,[39,2],null,null,[["default"],[[[[1,"\\n            This service uses a proxy for the Consul service mesh\\n          "]],[]]]]],[1,"\\n        "],[13],[1,"\\n"],[41,[28,[37,10],[[30,3,["ConnectedWithGateway"]],[30,3,["ConnectedWithProxy"]]],null],[[[1,"          "],[10,"dd"],[12],[1,"\\n            in service mesh with proxy and gateway\\n          "],[13],[1,"\\n"]],[]],[[[41,[30,3,["ConnectedWithProxy"]],[[[1,"          "],[10,"dd"],[12],[1,"\\n            in service mesh with proxy\\n          "],[13],[1,"\\n"]],[]],[[[41,[30,3,["ConnectedWithGateway"]],[[[1,"          "],[10,"dd"],[12],[1,"\\n            in service mesh with gateway\\n          "],[13],[1,"\\n        "]],[]],null]],[]]]],[]]],[1,"      "],[13],[1,"\\n"]],[]],null],[1,"    "],[8,[39,17],null,[["@item"],[[30,3]]],null],[1,"\\n  "]],[]]]]],[1,"\\n"]],[3,4]]]]],[1,"\\n"]],["&attrs","@items","item","index","@partition","@isPeerDetail","@nspace"],false,["list-collection","block-slot","tooltip","if","gt","href-to","not-eq","hash","consul/kind","consul/external-source","and","format-number","pluralize","unless","consul/bucket/list","eq","or","tag-list"]]',moduleName:"consul-ui/components/consul/service/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/service/search-bar/index",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"K9snRb1g",block:'[[[8,[39,0],[[24,0,"consul-service-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","filter","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.service.search-bar.",[30,3,["status","key"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.service.search-bar.",[30,3,["status","value"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null],[28,[37,3],["common.brand.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n  "]],[3]],[[[1,"\\n    "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,5],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n      "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Optgroup"]],[30,9,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"              "],[8,[30,11],null,[["@value","@selected"],[[30,12],[28,[37,9],[[30,12],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,10],[[30,12]],null]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[12]],null]],[10,11]]],[1,"        "]],[]]]]],[1,"\\n      "]],[9]]]]],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[6]],[[[1,"\\n    "],[8,[30,13,["Select"]],[[24,0,"type-status"]],[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["status","change"]]],null],true]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n        "],[10,1],[12],[1,"\\n          "],[1,[28,[35,2],["common.consul.status"],null]],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,14,["Optgroup"]],[30,14,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[30,0,["healthStates"]]],null]],null],null,[[[1,"            "],[8,[30,16],[[16,0,[29,["value-",[30,17]]]]],[["@value","@selected"],[[30,17],[28,[37,9],[[30,17],[30,2,["status","value"]]],null]]],[["default"],[[[[1,"\\n              "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[30,17]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,17]],null]],null]]]]],[1,"\\n            "]],[]]]]],[1,"\\n"]],[17]],null]],[15,16]]],[1,"      "]],[]]]]],[1,"\\n    "]],[14]]]]],[1,"\\n    "],[8,[30,13,["Select"]],null,[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["kind","change"]]],null],true]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n        "],[10,1],[12],[1,"\\n          "],[1,[28,[35,2],["components.consul.service.search-bar.kind"],null]],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,18,["Optgroup"]],[30,18,["Option"]]],[[[1,"          "],[8,[30,20],null,[["@value","@selected"],["service",[28,[37,9],["service",[30,2,["kind","value"]]],null]]],[["default"],[[[[1,"\\n            "],[1,[28,[35,2],["common.consul.service"],null]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,19],null,[["@label"],[[28,[37,2],["common.consul.gateway"],null]]],[["default"],[[[[1,"\\n"],[42,[28,[37,8],[[28,[37,8],[[28,[37,4],["api-gateway","ingress-gateway","terminating-gateway","mesh-gateway"],null]],null]],null],null,[[[1,"              "],[8,[30,20],null,[["@value","@selected"],[[30,21],[28,[37,9],[[30,21],[30,2,["kind","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[30,21]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[21]],null],[1,"          "]],[]]]]],[1,"\\n          "],[8,[30,19],null,[["@label"],[[28,[37,2],["common.consul.mesh"],null]]],[["default"],[[[[1,"\\n"],[42,[28,[37,8],[[28,[37,8],[[28,[37,4],["in-mesh","not-in-mesh"],null]],null]],null],null,[[[1,"              "],[8,[30,20],null,[["@value","@selected"],[[30,22],[28,[37,9],[[30,22],[30,2,["kind","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.search.",[30,22]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[22]],null],[1,"          "]],[]]]]],[1,"\\n"]],[19,20]]],[1,"      "]],[]]]]],[1,"\\n    "]],[18]]]]],[1,"\\n"],[41,[28,[37,12],[[30,23,["length"]],0],null],[[[1,"      "],[8,[30,13,["Select"]],[[24,0,"type-source"]],[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["source","change"]]],null],true]],[["default"],[[[[1,"\\n        "],[8,[39,13],null,[["@components","@filter","@sources"],[[30,24],[30,2],[30,0,["sortedSources"]]]],null],[1,"\\n      "]],[24]]]]],[1,"\\n"]],[]],null],[1,"  "]],[13]],[[[1,"\\n    "],[8,[30,25,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,26,["change"]]],null],false,true]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n        "],[10,1],[12],[1,"\\n"],[44,[[28,[37,14],[[28,[37,4],[[28,[37,4],["Name:asc",[28,[37,2],["common.sort.alpha.asc"],null]],null],[28,[37,4],["Name:desc",[28,[37,2],["common.sort.alpha.desc"],null]],null],[28,[37,4],["Status:asc",[28,[37,2],["common.sort.status.asc"],null]],null],[28,[37,4],["Status:desc",[28,[37,2],["common.sort.status.desc"],null]],null]],null]],null]],[[[1,"            "],[1,[28,[35,15],[[30,28],[30,26,["value"]]],null]],[1,"\\n"]],[28]]],[1,"        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,27,["Optgroup"]],[30,27,["Option"]]],[[[1,"          "],[8,[30,29],null,[["@label"],[[28,[37,2],["common.consul.status"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,30],null,[["@value","@selected"],["Status:asc",[28,[37,16],["Status:asc",[30,26,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.status.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,30],null,[["@value","@selected"],["Status:desc",[28,[37,16],["Status:desc",[30,26,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.status.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,29],null,[["@label"],[[28,[37,2],["common.consul.service-name"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,30],null,[["@value","@selected"],["Name:asc",[28,[37,16],["Name:asc",[30,26,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,30],null,[["@value","@selected"],["Name:desc",[28,[37,16],["Name:desc",[30,26,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[29,30]]],[1,"      "]],[]]]]],[1,"\\n    "]],[27]]]]],[1,"\\n  "]],[25]]]]],[1,"\\n"]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Optgroup","Option","prop","search","components","Optgroup","Option","state","components","Optgroup","Option","kind","state","@sources","components","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","action","block-slot","each","-track-array","includes","lowercase","if","gt","consul/sources-select","from-entries","get","eq"]]',moduleName:"consul-ui/components/consul/service/search-bar/index.hbs",isStrictMode:!1})
-class i extends l.default{get healthStates(){return this.args.peer?["passing","warning","critical","unknown","empty"]:["passing","warning","critical","empty"]}get sortedSources(){const e=this.args.sources||[]
-return e.unshift(["consul"]),e.includes("consul-api-gateway")?[...e.filter((e=>"consul-api-gateway"!==e)),"consul-api-gateway"]:e}}e.default=i,(0,t.setComponentTemplate)(r,i)})),define("consul-ui/components/consul/source/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"7cN0Jpki",block:'[[[10,"dl"],[14,0,"tooltip-panel"],[12],[1,"\\n  "],[10,"dt"],[12],[1,"\\n    "],[10,1],[14,0,"consul-source"],[12],[1,"\\n      "],[1,[30,1]],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n  "],[10,"dd"],[12],[1,"\\n    "],[8,[39,0],null,[["@position"],["left"]],[["default"],[[[[1,"\\n      "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[1,[28,[35,2],["components.consul.source.header"],null]],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,1],null,[["@name"],["menu"]],[["default"],[[[[1,"\\n        "],[10,"li"],[14,"role","separator"],[12],[1,"\\n          "],[1,[28,[35,2],["components.consul.source.menu-title"],null]],[1,"\\n        "],[13],[1,"\\n        "],[10,"li"],[14,"role","none"],[14,0,"docs-link"],[12],[1,"\\n          "],[10,3],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[29,[[28,[37,3],["CONSUL_DOCS_URL"],null],"/connect/l7-traffic"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"\\n            "],[1,[28,[35,2],["components.consul.source.links.documentation"],null]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n\\n"]],["@source"],false,["menu-panel","block-slot","t","env"]]',moduleName:"consul-ui/components/consul/source/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/sources-select/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"xQqOlkTv",block:'[[[41,[28,[37,1],[[30,1,["length"]],0],null],[[[1,"  "],[8,[39,2],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n    "],[10,1],[12],[1,"\\n      "],[1,[28,[35,3],["common.search.source"],null]],[1,"\\n    "],[13],[1,"\\n  "]],[]]]]],[1,"\\n  "],[8,[39,2],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,2,["Option"]]],[[[42,[28,[37,6],[[28,[37,6],[[30,1]],null]],null],null,[[[44,[[28,[37,7],[[30,4]],null]],[[[1,"          "],[8,[30,3],[[16,0,[52,[51,[30,5]],[30,4]]]],[["@value","@selected"],[[30,4],[28,[37,9],[[30,4],[30,6,["source","value"]]],null]]],[["default"],[[[[1,"\\n"],[41,[30,5],[[[1,"              "],[8,[39,10],[[24,0,"mr-2.5"]],[["@name"],[[30,5]]],null],[1,"\\n"]],[]],null],[1,"            "],[1,[28,[35,3],[[28,[37,11],["common.brand.",[30,4]],null]],null]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[5]]]],[4]],null]],[3]]],[1,"  "]],[]]]]],[1,"\\n"]],[]],null]],["@sources","@components","Option","source","flightIcon","@filter"],false,["if","gt","block-slot","t","let","each","-track-array","icon-mapping","unless","includes","flight-icon","concat"]]',moduleName:"consul-ui/components/consul/sources-select/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/token/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"nhK5HxA8",block:'[[[8,[39,0],[[24,0,"consul-token-list"]],[["@items"],[[30,1]]],[["default"],[[[[1,"\\n    "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n"],[41,[28,[37,3],[[30,2,["AccessorID"]],[30,3,["AccessorID"]]],null],[[[1,"        "],[10,"dl"],[14,"rel","me"],[12],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[8,[39,4],null,[["@position"],["top-start"]],[["default"],[[[[1,"\\n              Your token\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[1,"        "],[10,3],[15,6,[28,[37,5],["dc.acls.tokens.edit",[30,2,["AccessorID"]]],null]],[12],[1,[28,[35,6],[[30,2,["AccessorID"]],-8],null]],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,1],null,[["@name"],["details"]],[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"Scope"],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n              "],[1,[52,[30,2,["Local"]],"local","global"]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n        "],[8,[39,7],null,[["@item"],[[30,2]]],null],[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"Description"],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n              "],[1,[28,[35,8],[[30,2,["Description"]],[30,2,["Name"]]],null]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,1],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n"],[41,[30,2,["hasSecretID"]],[[[1,"      "],[8,[39,9],null,[["@value","@name"],[[30,2,["SecretID"]],[28,[37,10],["components.consul.token.secretID"],null]]],[["default"],[[[[1,"\\n        "],[1,[28,[35,10],["components.consul.token.secretID"],null]],[1,"\\n      "]],[]]]]],[1,"\\n"]],[]],null],[1,"      "],[8,[30,4],null,null,[["default"],[[[[1,"\\n        "],[8,[30,5],null,[["@href"],[[28,[37,5],["dc.acls.tokens.edit",[30,2,["AccessorID"]]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n"],[41,[28,[37,11],["write token"],[["item"],[[30,2]]]],[[[1,"            Edit\\n"]],[]],[[[1,"            View\\n"]],[]]],[1,"          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"],[41,[28,[37,11],["duplicate token"],[["item"],[[30,2]]]],[[[1,"        "],[8,[30,5],null,[["@onclick"],[[28,[37,12],[[30,0],[30,6],[30,2]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n            Duplicate\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[1,"\\n"],[41,[28,[37,3],[[30,2,["AccessorID"]],[33,13,["AccessorID"]]],null],[[[1,"        "],[8,[30,5],[[24,0,"dangerous"]],[["@onclick"],[[28,[37,12],[[30,0],[30,7],[30,2]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n            Logout\\n          "]],[]]]]],[1,"\\n          "],[8,[39,1],null,[["@name"],["confirmation"]],[["default"],[[[[1,"\\n            "],[8,[30,8],[[24,0,"warning"]],null,[["default"],[[[[1,"\\n              "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                Confirm logout\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[10,2],[12],[1,"\\n                  Are you sure you want to stop using this ACL token? This will log you out.\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["confirm"]],[["default"],[[[[1,"\\n                "],[8,[30,9],null,null,[["default"],[[[[1,"Logout"]],[]]]]],[1,"\\n              "]],[9]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[8]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],[[[1,"        "],[8,[30,5],null,[["@onclick"],[[28,[37,12],[[30,0],[30,10],[30,2]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n            Use\\n          "]],[]]]]],[1,"\\n          "],[8,[39,1],null,[["@name"],["confirmation"]],[["default"],[[[[1,"\\n            "],[8,[30,11],[[24,0,"warning"]],null,[["default"],[[[[1,"\\n              "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                Confirm use\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[10,2],[12],[1,"\\n                  Are you sure you want to use this ACL token?\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["confirm"]],[["default"],[[[[1,"\\n                "],[8,[30,12],null,null,[["default"],[[[[1,"Use"]],[]]]]],[1,"\\n              "]],[12]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[11]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]]],[1,"\\n\\n"],[41,[28,[37,11],["delete token"],[["item","token"],[[30,2],[30,3]]]],[[[1,"        "],[8,[30,5],[[24,0,"dangerous"]],[["@onclick"],[[28,[37,12],[[30,0],[30,13],[30,2]],null]]],[["default"],[[[[1,"\\n          "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n            Delete\\n          "]],[]]]]],[1,"\\n          "],[8,[39,1],null,[["@name"],["confirmation"]],[["default"],[[[[1,"\\n            "],[8,[30,14],[[24,0,"warning"]],null,[["default"],[[[[1,"\\n              "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                Confirm delete\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[10,2],[12],[1,"\\n                  Are you sure you want to delete this token?\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,1],null,[["@name"],["confirm"]],[["default"],[[[[1,"\\n                "],[8,[30,15],null,null,[["default"],[[[[1,"Delete"]],[]]]]],[1,"\\n              "]],[15]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[14]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[1,"\\n      "]],[5]]]]],[1,"\\n    "]],[4]]]]],[1,"\\n"]],[2]]]]]],["@items","item","@token","Actions","Action","@onclone","@onlogout","Confirmation","Confirm","@onuse","Confirmation","Confirm","@ondelete","Confirmation","Confirm"],false,["list-collection","block-slot","if","eq","tooltip","href-to","substr","consul/token/ruleset/list","or","copy-button","t","can","action","token"]]',moduleName:"consul-ui/components/consul/token/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/token/notifications/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"cW0yM/IH",block:'[[[41,[28,[37,1],[[30,1],"create"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    The token has been added.\\n"]],[]],[[[1,"    There was an error adding the token.\\n"]],[]]]],[]],[[[41,[28,[37,1],[[30,1],"update"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    The token has been saved.\\n"]],[]],[[[1,"    There was an error saving the token.\\n"]],[]]]],[]],[[[41,[28,[37,1],[[30,1],"delete"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    The token was deleted.\\n"]],[]],[[[1,"    There was an error deleting the token.\\n"]],[]]]],[]],[[[41,[28,[37,1],[[30,1],"clone"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    The token has been cloned as "],[1,[28,[35,2],[[30,3,["AccessorID"]],8,false],null]],[1,"\\n"]],[]],[[[1,"    There was an error cloning the token.\\n"]],[]]]],[]],[[[41,[28,[37,1],[[30,1],"use"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    You are now using the new ACL token\\n"]],[]],[[[1,"    There was an error using that ACL token.\\n"]],[]]]],[]],null]],[]]]],[]]]],[]]]],[]]],[44,[[30,4,["errors","firstObject"]]],[[[41,[30,5,["detail"]],[[[1,"    "],[10,"br"],[12],[13],[1,[28,[35,4],["(",[52,[30,5,["status"]],[28,[37,4],[[30,5,["status"]],": "],null]],[30,5,["detail"]],")"],null]],[1,"\\n"]],[]],null]],[5]]]],["@type","@status","@item","@error","error"],false,["if","eq","truncate","let","concat"]]',moduleName:"consul-ui/components/consul/token/notifications/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/token/ruleset/list/index",["exports","@ember/component","@ember/template-factory"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,n.createTemplateFactory)({id:"z6qiUtoK",block:'[[[44,[[28,[37,1],[[28,[37,2],[[33,3,["Policies"]],[33,3,["ACLs","PolicyDefaults"]],[28,[37,4],null,null]],null]],null]],[[[44,[[28,[37,5],[[30,1],"management"],null]],[[[41,[28,[37,7],[[30,2,["length"]],0],null],[[[1,"        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"\\n            Management\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n"],[42,[28,[37,9],[[28,[37,9],[[28,[37,5],[[30,1],"management"],null]],null]],null],null,[[[1,"                "],[10,1],[15,0,[28,[37,10],[[30,3]],null]],[12],[1,[30,3,["Name"]]],[13],[1,"\\n"]],[3]],null],[1,"          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null]],[2]]],[44,[[28,[37,5],[[30,1],"identities"],null]],[[[41,[28,[37,7],[[30,4,["length"]],0],null],[[[1,"        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"Identities"],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n"],[42,[28,[37,9],[[28,[37,9],[[30,4]],null]],null],null,[[[1,"                "],[10,1],[15,0,[28,[37,10],[[30,5]],null]],[12],[1,[30,5,["Name"]]],[13],[1,"\\n"]],[5]],null],[1,"          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null]],[4]]],[41,[28,[37,11],[[33,3]],null],[[[1,"        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"Rules"],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n              Legacy tokens have embedded rules.\\n          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],[[[44,[[28,[37,12],[[28,[37,5],[[30,1],"policies"],null],[28,[37,2],[[33,3,["Roles"]],[33,3,["ACLs","RoleDefaults"]],[28,[37,4],null,null]],null]],null]],[[[41,[28,[37,7],[[30,6,["length"]],0],null],[[[1,"        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"Rules"],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n"],[42,[28,[37,9],[[28,[37,9],[[30,6]],null]],null],null,[[[1,"              "],[10,1],[15,0,[28,[37,10],[[30,7]],null]],[12],[1,[30,7,["Name"]]],[13],[1,"\\n"]],[7]],null],[1,"          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null]],[6]]]],[]]]],[1]]]],["policies","management","item","identities","item","policies","item"],false,["let","policy/group","or","item","array","get","if","gt","each","-track-array","policy/typeof","token/is-legacy","append"]]',moduleName:"consul-ui/components/consul/token/ruleset/list/index.hbs",isStrictMode:!1})
-var r=(0,t.setComponentTemplate)(l,t.default.extend({tagName:""}))
-e.default=r})),define("consul-ui/components/consul/token/search-bar/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"81pOiVwr",block:'[[[8,[39,0],[[24,0,"consul-token-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","filter","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.token.search-bar.",[30,3,["status","key"]],".name"],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.token.search-bar.",[30,3,["status","key"]],".options.",[30,3,["status","value"]]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null],[28,[37,3],["common.brand.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n    "]],[3]],[[[1,"\\n      "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,5],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n        "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n          "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,"\\n              "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Optgroup"]],[30,9,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"              "],[8,[30,11],null,[["@value","@selected"],[[30,12],[28,[37,9],[[30,12],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,10],[[30,12]],null]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[12]],null]],[10,11]]],[1,"          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[6]],[[[1,"\\n      "],[8,[30,13,["Select"]],[[24,0,"type-status"]],[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["kind","change"]]],null],true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[28,[35,2],["components.consul.token.search-bar.kind.name"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,14,["Optgroup"]],[30,14,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[28,[37,4],["global-management","global","local"],null]],null]],null],null,[[[1,"          "],[8,[30,16],[[16,0,[29,["value-",[30,17]]]]],[["@value","@selected"],[[30,17],[28,[37,9],[[30,17],[30,2,["kind","value"]]],null]]],[["default"],[[[[1,"\\n            "],[1,[28,[35,2],[[28,[37,3],["components.consul.token.search-bar.kind.options.",[30,17]],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,17]],null]],null]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[17]],null]],[15,16]]],[1,"        "]],[]]]]],[1,"\\n      "]],[14]]]]],[1,"\\n    "]],[13]],[[[1,"\\n      "],[8,[30,18,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,19,["change"]]],null],false,true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n"],[44,[[28,[37,11],[[28,[37,4],[[28,[37,4],["CreateTime:desc",[28,[37,2],["common.sort.age.desc"],null]],null],[28,[37,4],["CreateTime:asc",[28,[37,2],["common.sort.age.asc"],null]],null]],null]],null]],[[[1,"              "],[1,[28,[35,12],[[30,21],[30,19,["value"]]],null]],[1,"\\n"]],[21]]],[1,"          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,20,["Optgroup"]],[30,20,["Option"]]],[[[1,"        "],[8,[30,22],null,[["@label"],[[28,[37,2],["common.ui.creation"],null]]],[["default"],[[[[1,"\\n          "],[8,[30,23],null,[["@value","@selected"],["CreateTime:desc",[28,[37,13],["CreateTime:desc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.age.desc"],null]]],[]]]]],[1,"\\n          "],[8,[30,23],null,[["@value","@selected"],["CreateTime:asc",[28,[37,13],["CreateTime:asc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.age.asc"],null]]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[22,23]]],[1,"        "]],[]]]]],[1,"\\n      "]],[20]]]]],[1,"\\n    "]],[18]]]]],[1,"\\n"]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Optgroup","Option","prop","search","components","Optgroup","Option","state","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","action","block-slot","each","-track-array","includes","lowercase","from-entries","get","eq"]]',moduleName:"consul-ui/components/consul/token/search-bar/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/token/selector/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object"],(function(e,t,n,l,r){var i
-function o(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const a=(0,n.createTemplateFactory)({id:"TUgK5bUH",block:'[[[41,[28,[37,1],["use acls"],null],[[[1,"  "],[10,"li"],[12],[1,"\\n\\n    "],[8,[39,2],null,[["@src","@sink","@onchange"],[[28,[37,3],["settings://consul:token"],null],[28,[37,3],["settings://consul:token"],null],[30,0,["reauthorize"]]]],[["unauthorized","authorized"],[[[[1,"\\n        "],[8,[39,4],null,[["@target"],["app-before-skip-links"]],[["default"],[[[[1,"\\n          "],[8,[39,5],[[4,[38,6],["click",[28,[37,7],[[30,0,["modal","open"]]],null]],null]],null,[["default"],[[[[1,"\\n            Login\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,5],[[4,[38,6],["click",[28,[37,7],[[30,0,["modal","open"]]],null]],null]],null,[["default"],[[[[1,"\\n          Log in\\n        "]],[]]]]],[1,"\\n        "],[8,[39,8],null,[["@name","@onclose","@onopen","@aria"],["login-toggle",[30,0,["close"]],[30,0,["open"]],[28,[37,9],null,[["label"],["Log in to Consul"]]]]],[["default"],[[[[1,"\\n          "],[8,[39,10],null,[["@target","@name","@value"],[[30,0],"modal",[30,2]]],null],[1,"\\n          "],[8,[39,11],null,[["@name"],["header"]],[["default"],[[[[1,"\\n            "],[10,"h2"],[12],[1,"\\n              Log in to Consul\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,11],null,[["@name"],["body"]],[["default"],[[[[1,"\\n            "],[8,[39,12],null,[["@dc","@partition","@nspace","@onsubmit"],[[30,3,["Name"]],[30,4],[30,5],[28,[37,5],[[30,0],[30,1,["login"]]],[["value"],["data"]]]]],[["default"],[[[[1,"\\n              "],[8,[39,10],null,[["@target","@name","@value"],[[30,0],"authForm",[30,6]]],null],[1,"\\n"],[41,[28,[37,1],["use SSO"],null],[[[1,"                "],[8,[30,6,["Method"]],null,[["@matches"],["sso"]],[["default"],[[[[1,"\\n                  "],[8,[39,13],null,[["@dc","@partition","@nspace","@disabled","@onchange","@onerror"],[[30,3,["Name"]],[30,4],[30,5],[30,6,["disabled"]],[30,6,["submit"]],[30,6,["error"]]]],null],[1,"\\n                "]],[]]]]],[1,"\\n"]],[]],null],[1,"            "]],[6]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,11],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n            "],[8,[39,14],[[4,[38,6],["click",[30,2,["close"]]],null]],[["@color","@text"],["secondary","Continue without logging in"]],null],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[2]]]]],[1,"\\n      "]],[1]],[[[1,"\\n        "],[8,[39,8],null,[["@name","@onclose","@onopen","@aria"],["login-toggle",[30,0,["close"]],[30,0,["open"]],[28,[37,9],null,[["label"],["Log in with a different token"]]]]],[["default"],[[[[1,"\\n          "],[8,[39,10],null,[["@target","@name","@value"],[[30,0],"modal",[30,8]]],null],[1,"\\n          "],[8,[39,11],null,[["@name"],["header"]],[["default"],[[[[1,"\\n            "],[10,"h2"],[12],[1,"\\n              Log in with a different token\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,11],null,[["@name"],["body"]],[["default"],[[[[1,"\\n            "],[8,[39,12],null,[["@dc","@nspace","@partition","@onsubmit"],[[30,3,["Name"]],[30,5],[30,4],[28,[37,5],[[30,0],[30,7,["login"]]],[["value"],["data"]]]]],[["default"],[[[[1,"\\n              "],[8,[39,10],null,[["@target","@name","@value"],[[30,0],"authForm",[30,9]]],null],[1,"\\n            "]],[9]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,11],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n            "],[8,[39,14],[[4,[38,6],["click",[30,8,["close"]]],null]],[["@color","@text"],["secondary","Continue without logging in"]],null],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[8]]]]],[1,"\\n        "],[8,[39,4],null,[["@target"],["app-before-skip-links"]],[["default"],[[[[1,"\\n          "],[8,[39,5],[[4,[38,6],["click",[28,[37,7],[[30,7,["logout"]]],null]],null]],null,[["default"],[[[[1,"\\n            Logout\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,15],null,null,[["default"],[[[[1,"\\n          "],[8,[30,10,["Action"]],[[4,[38,6],["click",[30,10,["toggle"]]],null]],null,[["default"],[[[[1,"\\n            Logout\\n          "]],[]]]]],[1,"\\n          "],[8,[30,10,["Menu"]],null,null,[["default"],[[[[1,"\\n"],[41,[30,7,["token","AccessorID"]],[[[1,"            "],[8,[39,16],null,[["@item"],[[30,7,["token"]]]],null],[1,"\\n"]],[]],null],[1,"            "],[8,[30,11,["Menu"]],null,null,[["default"],[[[[1,"\\n              "],[8,[30,12,["Separator"]],null,null,null],[1,"\\n              "],[8,[30,12,["Item"]],[[24,0,"dangerous"]],null,[["default"],[[[[1,"\\n                "],[8,[30,12,["Action"]],[[4,[38,6],["click",[28,[37,7],[[30,7,["logout"]]],null]],null]],null,[["default"],[[[[1,"\\n                  Logout\\n                "]],[]]]]],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[12]]]]],[1,"\\n          "]],[11]]]]],[1,"\\n        "]],[10]]]]],[1,"\\n      "]],[7]]]]],[1,"\\n\\n  "],[13],[1,"\\n"],[18,13,[[28,[37,9],null,[["open","close"],[[30,0,["modal","open"]],[30,0,["model","close"]]]]]]],[1,"\\n"]],[]],null],[1,"\\n"]],["authDialog","modal","@dc","@partition","@nspace","authForm","authDialog","modal","authForm","disclosure","panel","menu","&default"],false,["if","can","auth-dialog","uri","portal","action","on","optional","modal-dialog","hash","ref","block-slot","auth-form","oidc-select","hds/button","disclosure-menu","auth-profile","yield"]]',moduleName:"consul-ui/components/consul/token/selector/index.hbs",isStrictMode:!1})
-let u=(o((i=class extends l.default{open(){this.authForm.focus()}close(){this.authForm.reset()}reauthorize(e){this.modal.close(),this.args.onchange(e)}}).prototype,"open",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"open"),i.prototype),o(i.prototype,"close",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"close"),i.prototype),o(i.prototype,"reauthorize",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"reauthorize"),i.prototype),i)
-e.default=u,(0,t.setComponentTemplate)(a,u)})),define("consul-ui/components/consul/tomography/graph/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking"],(function(e,t,n,l,r){var i,o
-function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=(0,n.createTemplateFactory)({id:"ZXa/jDY4",block:'[[[11,0],[24,0,"tomography-graph"],[17,1],[12],[1,"\\n  "],[10,"svg"],[15,"width",[30,0,["size"]]],[15,"height",[30,0,["size"]]],[12],[1,"\\n      "],[10,"g"],[15,"transform",[29,["translate(",[28,[37,0],[[30,0,["size"]],2],null],", ",[28,[37,0],[[30,0,["size"]],2],null],")"]]],[12],[1,"\\n          "],[10,"g"],[12],[1,"\\n              "],[10,"circle"],[14,0,"background"],[15,"r",[30,0,["circle","0"]]],[12],[13],[1,"\\n              "],[10,"circle"],[14,0,"axis"],[15,"r",[30,0,["circle","1"]]],[12],[13],[1,"\\n              "],[10,"circle"],[14,0,"axis"],[15,"r",[30,0,["circle","2"]]],[12],[13],[1,"\\n              "],[10,"circle"],[14,0,"axis"],[15,"r",[30,0,["circle","3"]]],[12],[13],[1,"\\n              "],[10,"circle"],[14,0,"border"],[15,"r",[30,0,["circle","4"]]],[12],[13],[1,"\\n          "],[13],[1,"\\n          "],[10,"g"],[14,0,"lines"],[12],[1,"\\n"],[42,[28,[37,2],[[28,[37,2],[[30,0,["distances"]]],null]],null],null,[[[1,"          "],[11,"rect"],[16,"transform",[29,["rotate(",[30,2,["rotate"]],")"]]],[16,"width",[30,2,["y2"]]],[24,"height","1"],[4,[38,3],[[28,[37,4],[[30,2,["node"]]," - ",[28,[37,5],[[30,2,["distance"]]],[["maximumFractionDigits"],[2]]],"ms",[52,[30,2,["segment"]],[28,[37,4],["<br />(Segment: ",[30,2,["segment"]],")"],null]]],null]],[["options"],[[28,[37,7],null,[["followCursor","allowHTML"],[true,true]]]]]],[12],[13],[1,"\\n"]],[2]],null],[1,"          "],[13],[1,"\\n          "],[10,"g"],[14,0,"labels"],[12],[1,"\\n              "],[10,"circle"],[14,0,"point"],[14,"r","5"],[12],[13],[1,"\\n              "],[10,"g"],[14,0,"tick"],[15,"transform",[29,["translate(0, ",[30,0,["labels","0"]],")"]]],[12],[1,"\\n                  "],[10,"line"],[14,"x2","70"],[12],[13],[1,"\\n                  "],[10,"text"],[14,"x","75"],[14,"y","0"],[14,"dy",".32em"],[12],[1,[28,[35,5],[[30,0,["milliseconds","0"]]],[["maximumFractionDigits"],[2]]]],[1,"ms"],[13],[1,"\\n              "],[13],[1,"\\n              "],[10,"g"],[14,0,"tick"],[15,"transform",[29,["translate(0, ",[30,0,["labels","1"]],")"]]],[12],[1,"\\n                  "],[10,"line"],[14,"x2","70"],[12],[13],[1,"\\n                  "],[10,"text"],[14,"x","75"],[14,"y","0"],[14,"dy",".32em"],[12],[1,[28,[35,5],[[30,0,["milliseconds","1"]]],[["maximumFractionDigits"],[2]]]],[1,"ms"],[13],[1,"\\n              "],[13],[1,"\\n              "],[10,"g"],[14,0,"tick"],[15,"transform",[29,["translate(0, ",[30,0,["labels","2"]],")"]]],[12],[1,"\\n                  "],[10,"line"],[14,"x2","70"],[12],[13],[1,"\\n                  "],[10,"text"],[14,"x","75"],[14,"y","0"],[14,"dy",".32em"],[12],[1,[28,[35,5],[[30,0,["milliseconds","2"]]],[["maximumFractionDigits"],[2]]]],[1,"ms"],[13],[1,"\\n              "],[13],[1,"\\n              "],[10,"g"],[14,0,"tick"],[15,"transform",[29,["translate(0, ",[30,0,["labels","3"]],")"]]],[12],[1,"\\n                  "],[10,"line"],[14,"x2","70"],[12],[13],[1,"\\n                  "],[10,"text"],[14,"x","75"],[14,"y","0"],[14,"dy",".32em"],[12],[1,[28,[35,5],[[30,0,["milliseconds","3"]]],[["maximumFractionDigits"],[2]]]],[1,"ms"],[13],[1,"\\n              "],[13],[1,"\\n          "],[13],[1,"\\n      "],[13],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n"]],["&attrs","item"],false,["div","each","-track-array","tooltip","concat","format-number","if","hash"]]',moduleName:"consul-ui/components/consul/tomography/graph/index.hbs",isStrictMode:!1}),s=function(e){return 160*e}
-let c=(i=class extends l.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="max",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),a(this,"size",336),a(this,"circle",[s(1),s(.25),s(.5),s(.75),s(1)]),a(this,"labels",[s(-.25),s(-.5),s(-.75),s(-1)])}get milliseconds(){const e=(this.args.distances||[]).reduce(((e,t)=>Math.max(e,t.distance)),this.max)
-return[25,50,75,100].map((t=>function(e,t){return t>0?parseInt(t*e)/100:0}(t,e)))}get distances(){let e=this.args.distances||[]
-const t=e.reduce(((e,t)=>Math.max(e,t.distance)),this.max),n=e.length
-if(n>360){const t=360/n
-e=e.filter((function(e,l){return 0==l||l==n-1||Math.random()<t}))}return e.map(((n,l)=>({rotate:360*l/e.length,y2:n.distance/t*160,node:n.node,distance:n.distance,segment:n.segment})))}},d=i.prototype,p="max",f=[r.tracked],m={configurable:!0,enumerable:!0,writable:!0,initializer:function(){return-999999999}},b={},Object.keys(m).forEach((function(e){b[e]=m[e]})),b.enumerable=!!b.enumerable,b.configurable=!!b.configurable,("value"in b||b.initializer)&&(b.writable=!0),b=f.slice().reverse().reduce((function(e,t){return t(d,p,e)||e}),b),h&&void 0!==b.initializer&&(b.value=b.initializer?b.initializer.call(h):void 0,b.initializer=void 0),void 0===b.initializer&&(Object.defineProperty(d,p,b),b=null),o=b,i)
-var d,p,f,m,h,b
-e.default=c,(0,t.setComponentTemplate)(u,c)})),define("consul-ui/components/consul/transparent-proxy/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"UjBsOCBt",block:'[[[10,1],[14,0,"consul-transparent-proxy"],[12],[1,"\\n  "],[1,[28,[35,0],["components.consul.transparent-proxy"],null]],[1,"\\n"],[13]],[],false,["t"]]',moduleName:"consul-ui/components/consul/transparent-proxy/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/upstream-instance/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"GEohwFqk",block:'[[[11,0],[24,0,"consul-upstream-instance-list"],[17,1],[12],[1,"\\n  "],[10,"ul"],[12],[1,"\\n"],[42,[28,[37,1],[[28,[37,1],[[30,2]],null]],null],null,[[[1,"    "],[10,"li"],[12],[1,"\\n\\n      "],[10,0],[14,0,"header"],[12],[1,"\\n        "],[10,2],[12],[1,"\\n          "],[1,[30,3,["DestinationName"]]],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n\\n      "],[10,0],[14,0,"detail"],[12],[1,"\\n\\n"],[41,[28,[37,3],[[30,3,["DestinationType"]],"prepared_query"],null],[[[1,"        "],[8,[39,4],null,[["@item","@partition","@nspace"],[[28,[37,5],null,[["Namespace","Partition"],[[28,[37,6],[[30,3,["DestinationNamespace"]],[30,4]],null],[28,[37,6],[[30,3,["DestinationPartition"]],[30,5]],null]]]],[30,5],[30,4]]],null],[1,"\\n"]],[]],null],[1,"\\n"],[41,[28,[37,7],[[28,[37,3],[[30,3,["Datacenter"]],[30,6]],null],[28,[37,3],[[30,3,["Datacenter"]],""],null]],null],[[[1,"        "],[10,"dl"],[14,0,"datacenter"],[12],[1,"\\n          "],[11,"dt"],[4,[38,8],null,null],[12],[1,"\\n            Datacenter\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[1,[30,3,["Datacenter"]]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[1,"\\n"],[41,[30,3,["LocalBindSocketPath"]],[[[1,"        "],[10,"dl"],[14,0,"local-bind-socket-path"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"\\n              Local bind socket path\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[8,[39,9],null,[["@value","@name"],[[30,3,["LocalBindSocketPath"]],"Local bind socket path"]],null],[1,"\\n            "],[1,[30,3,["LocalBindSocketPath"]]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n        "],[10,"dl"],[14,0,"local-bind-socket-mode"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"\\n            Mode\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[1,[28,[35,6],[[30,3,["LocalBindSocketMode"]],"-"],null]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],[[[1,"\\n"],[41,[28,[37,10],[[30,3,["LocalBindPort"]],0],null],[[[44,[[28,[37,12],[[28,[37,6],[[30,3,["LocalBindAddress"]],"127.0.0.1"],null],":",[30,3,["LocalBindPort"]]],null]],[[[1,"        "],[10,"dl"],[14,0,"local-bind-address"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"\\n            Address\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n            "],[8,[39,9],null,[["@value","@name"],[[30,7],"Address"]],null],[1,"\\n              "],[1,[30,7]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n"]],[7]]]],[]],null],[1,"\\n"]],[]]],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[3]],null],[1,"  "],[13],[1,"\\n"],[13],[1,"\\n"]],["&attrs","@items","item","@nspace","@partition","@dc","combinedAddress"],false,["each","-track-array","if","not-eq","consul/bucket/list","hash","or","and","tooltip","copy-button","gt","let","concat"]]',moduleName:"consul-ui/components/consul/upstream-instance/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/upstream-instance/search-bar/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"wsZfd7L1",block:'[[[8,[39,0],[[24,0,"consul-upstream-instance-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.upstream-instance.search-bar.",[30,3,["status","key"]],".name"],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.upstream-instance.search-bar.",[30,3,["status","value"]],".name"],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null],[28,[37,3],["common.brand.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n    "]],[3]],[[[1,"\\n      "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,5],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n        "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n          "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,"\\n              "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Optgroup"]],[30,9,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"              "],[8,[30,11],null,[["@value","@selected"],[[30,12],[28,[37,9],[[30,12],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,10],[[30,12]],null]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[12]],null]],[10,11]]],[1,"          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[6]],[[[1,"\\n      "],[8,[30,13,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,14,["change"]]],null],false,true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n"],[44,[[28,[37,11],[[28,[37,4],[[28,[37,4],["DestinationName:asc",[28,[37,2],["common.sort.alpha.asc"],null]],null],[28,[37,4],["DestinationName:desc",[28,[37,2],["common.sort.alpha.desc"],null]],null]],null]],null]],[[[1,"              "],[1,[28,[35,12],[[30,16],[30,14,["value"]]],null]],[1,"\\n"]],[16]]],[1,"          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,15,["Optgroup"]],[30,15,["Option"]]],[[[1,"            "],[8,[30,18],null,[["@value","@selected"],["DestinationName:asc",[28,[37,13],["DestinationName:asc",[30,14,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,18],null,[["@value","@selected"],["DestinationName:desc",[28,[37,13],["DestinationName:desc",[30,14,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n"]],[17,18]]],[1,"        "]],[]]]]],[1,"\\n      "]],[15]]]]],[1,"\\n    "]],[13]]]]],[1,"\\n"]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Optgroup","Option","prop","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","action","block-slot","each","-track-array","includes","lowercase","from-entries","get","eq"]]',moduleName:"consul-ui/components/consul/upstream-instance/search-bar/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/upstream/list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"eZNZsVXh",block:'[[[8,[39,0],[[24,0,"consul-upstream-list"],[17,1]],[["@items","@linkable"],[[30,2],"linkable upstream"]],[["default"],[[[[1,"\\n  "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[1,"\\n"],[41,[28,[37,3],[[30,3,["InstanceCount"]],0],null],[[[1,"    "],[10,"dl"],[15,0,[30,3,["MeshStatus"]]],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        Health\\n      "],[13],[1,"\\n      "],[11,"dd"],[4,[38,4],null,null],[12],[1,"\\n"],[41,[28,[37,5],["critical",[30,3,["MeshStatus"]]],null],[[[1,"            At least one health check on one instance is failing.\\n"]],[]],[[[41,[28,[37,5],["warning",[30,3,["MeshStatus"]]],null],[[[1,"            At least one health check on one instance has a warning.\\n"]],[]],[[[41,[28,[37,5],["passing",[30,3,["MeshStatus"]]],null],[[[1,"            All health checks are passing.\\n"]],[]],[[[1,"            There are no health checks.\\n          "]],[]]]],[]]]],[]]],[1,"      "],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,3],[15,6,[28,[37,6],["dc.services.show",[30,3,["Name"]]],[["params"],[[52,[28,[37,7],[[30,3,["Partition"]],[30,5]],null],[28,[37,8],null,[["partition","nspace"],[[30,3,["Partition"]],[30,3,["Namespace"]]]]],[52,[28,[37,7],[[30,3,["Namespace"]],[30,6]],null],[28,[37,8],null,[["nspace"],[[30,3,["Namespace"]]]]],[28,[37,8],null,null]]]]]]],[12],[1,"\\n      "],[1,[30,3,["Name"]]],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[1,"    "],[10,2],[12],[1,"\\n      "],[1,[30,3,["Name"]]],[1,"\\n    "],[13],[1,"\\n"]],[]]],[1,"  "]],[]]]]],[1,"\\n  "],[8,[39,1],null,[["@name"],["details"]],[["default"],[[[[1,"\\n    "],[8,[39,9],null,[["@item","@nspace","@partition"],[[30,3],[30,6],[30,5]]],null],[1,"\\n"],[42,[28,[37,11],[[28,[37,11],[[30,3,["GatewayConfig","Addresses"]]],null]],null],null,[[[1,"    "],[10,"dl"],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        Address\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[8,[39,12],null,[["@value","@name"],[[30,7],"Address"]],null],[1,"\\n        "],[1,[30,7]],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[7]],null],[1,"  "]],[]]]]],[1,"\\n"]],[3,4]]]]],[1,"\\n"]],["&attrs","@items","item","index","@partition","@nspace","address"],false,["list-collection","block-slot","if","gt","tooltip","eq","href-to","not-eq","hash","consul/bucket/list","each","-track-array","copy-button"]]',moduleName:"consul-ui/components/consul/upstream/list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/consul/upstream/search-bar/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"t4tLfZqU",block:'[[[8,[39,0],[[24,0,"consul-upstream-search-bar"],[17,1]],[["@filter"],[[30,2]]],[["status","search","filter","sort"],[[[[1,"\\n\\n"],[44,[[28,[37,2],[[28,[37,3],["components.consul.upstream.search-bar.",[30,3,["status","key"]],".name"],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","key"]]],null],[28,[37,3],["common.consul.",[30,3,["status","key"]]],null]],null]]]],[28,[37,2],[[28,[37,3],["components.consul.upstream.search-bar.",[30,3,["status","value"]],".name"],null]],[["default"],[[28,[37,4],[[28,[37,3],["common.search.",[30,3,["status","value"]]],null],[28,[37,3],["common.consul.",[30,3,["status","value"]]],null],[28,[37,3],["common.brand.",[30,3,["status","value"]]],null]],null]]]]],[[[1,"      "],[8,[30,3,["RemoveFilter"]],[[16,"aria-label",[28,[37,2],["common.ui.remove"],[["item"],[[28,[37,3],[[30,4]," ",[30,5]],null]]]]]],null,[["default"],[[[[1,"\\n        "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,[30,4]],[13],[1,"\\n          "],[10,"dd"],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[4,5]]],[1,"\\n    "]],[3]],[[[1,"\\n      "],[8,[30,6,["Search"]],null,[["@onsearch","@value","@placeholder"],[[28,[37,5],[[30,0],[30,7]],null],[30,8],[28,[37,2],["common.search.search"],null]]],[["default"],[[[[1,"\\n        "],[8,[30,6,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,2,["searchproperty","change"]]],null],true,true]],[["default"],[[[[1,"\\n          "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n            "],[10,1],[12],[1,"\\n              "],[1,[28,[35,2],["common.search.searchproperty"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,9,["Optgroup"]],[30,9,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[30,2,["searchproperty","default"]]],null]],null],null,[[[1,"              "],[8,[30,11],null,[["@value","@selected"],[[30,12],[28,[37,9],[[30,12],[30,2,["searchproperty","value"]]],null]]],[["default"],[[[[1,"\\n                "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[28,[37,10],[[30,12]],null]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[12]],null]],[10,11]]],[1,"          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[6]],[[[1,"\\n      "],[8,[30,13,["Select"]],null,[["@position","@onchange","@multiple"],["left",[28,[37,5],[[30,0],[30,2,["instance","change"]]],null],true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n            "],[1,[28,[35,2],["components.consul.upstream.search-bar.instance.name"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,14,["Optgroup"]],[30,14,["Option"]]],[[[42,[28,[37,8],[[28,[37,8],[[28,[37,4],["registered","not-registered"],null]],null]],null],null,[[[1,"            "],[8,[30,16],null,[["@value","@selected"],[[30,17],[28,[37,9],[[30,17],[30,2,["instance","value"]]],null]]],[["default"],[[[[1,"\\n              "],[1,[28,[35,2],[[28,[37,3],["common.consul.",[30,17]],null]],null]],[1,"\\n            "]],[]]]]],[1,"\\n"]],[17]],null]],[15,16]]],[1,"        "]],[]]]]],[1,"\\n      "]],[14]]]]],[1,"\\n    "]],[13]],[[[1,"\\n      "],[8,[30,18,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[28,[37,5],[[30,0],[30,19,["change"]]],null],false,true]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n          "],[10,1],[12],[1,"\\n"],[44,[[28,[37,11],[[28,[37,4],[[28,[37,4],["Name:asc",[28,[37,2],["common.sort.alpha.asc"],null]],null],[28,[37,4],["Name:desc",[28,[37,2],["common.sort.alpha.desc"],null]],null],[28,[37,4],["Status:asc",[28,[37,2],["common.sort.status.asc"],null]],null],[28,[37,4],["Status:desc",[28,[37,2],["common.sort.status.desc"],null]],null]],null]],null]],[[[1,"              "],[1,[28,[35,12],[[30,21],[30,19,["value"]]],null]],[1,"\\n"]],[21]]],[1,"          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,6],null,[["@name"],["options"]],[["default"],[[[[1,"\\n"],[44,[[30,20,["Optgroup"]],[30,20,["Option"]]],[[[1,"          "],[8,[30,22],null,[["@label"],[[28,[37,2],["common.consul.status"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,23],null,[["@value","@selected"],["Status:asc",[28,[37,13],["Status:asc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.status.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,23],null,[["@value","@selected"],["Status:desc",[28,[37,13],["Status:desc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.status.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,22],null,[["@label"],[[28,[37,2],["common.consul.service-name"],null]]],[["default"],[[[[1,"\\n            "],[8,[30,23],null,[["@value","@selected"],["Name:asc",[28,[37,13],["Name:asc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.asc"],null]]],[]]]]],[1,"\\n            "],[8,[30,23],null,[["@value","@selected"],["Name:desc",[28,[37,13],["Name:desc",[30,19,["value"]]],null]]],[["default"],[[[[1,[28,[35,2],["common.sort.alpha.desc"],null]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[22,23]]],[1,"        "]],[]]]]],[1,"\\n      "]],[20]]]]],[1,"\\n    "]],[18]]]]],[1,"\\n"]],["&attrs","@filter","search","key","value","search","@onsearch","@search","components","Optgroup","Option","prop","search","components","Optgroup","Option","item","search","@sort","components","selectable","Optgroup","Option"],false,["search-bar","let","t","concat","array","action","block-slot","each","-track-array","includes","lowercase","from-entries","get","eq"]]',moduleName:"consul-ui/components/consul/upstream/search-bar/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/copy-button/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={id:"copy-button",initial:"idle",on:{RESET:[{target:"idle"}]},states:{idle:{on:{SUCCESS:[{target:"success"}],ERROR:[{target:"error"}]}},success:{},error:{}}}})),define("consul-ui/components/copy-button/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","consul-ui/components/copy-button/chart.xstate"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,n.createTemplateFactory)({id:"6RaQJr4m",block:'[[[8,[39,0],null,[["@src"],[[30,0,["chart"]]]],[["default"],[[[[1,"\\n  "],[11,0],[24,0,"copy-button"],[17,6],[12],[1,"\\n"],[44,[[28,[37,2],[[30,4],"SUCCESS"],null],[28,[37,2],[[30,4],"ERROR"],null],[28,[37,2],[[30,4],"RESET"],null]],[[[1,"    "],[11,"button"],[16,"aria-label",[28,[37,3],["components.copy-button.title"],[["name"],[[30,10]]]]],[24,4,"button"],[24,0,"copy-btn"],[17,6],[4,[38,4],[[30,11]],[["success","error"],[[30,7],[30,8]]]],[4,[38,5],[[52,[28,[37,7],[[30,5],"success"],null],[28,[37,3],["components.copy-button.success"],[["name"],[[30,10]]]],[28,[37,3],["components.copy-button.error"],null]]],[["options"],[[28,[37,8],null,[["trigger","showOnCreate","delay","onHidden"],["manual",[28,[37,9],[[28,[37,7],[[30,5],"idle"],null]],null],[28,[37,10],[0,3000],null],[30,9]]]]]]],[12],[18,12,null],[13],[1,"\\n"]],[7,8,9]]],[1,"  "],[13],[1,"\\n"]],[1,2,3,4,5]]]]],[1,"\\n"]],["State","Guard","Action","dispatch","state","&attrs","success","error","reset","@name","@value","&default"],false,["state-chart","let","fn","t","with-copyable","tooltip","if","state-matches","hash","not","array","yield"]]',moduleName:"consul-ui/components/copy-button/index.hbs",isStrictMode:!1})
-class o extends l.default{constructor(){super(...arguments),this.chart=r.default}}e.default=o,(0,t.setComponentTemplate)(i,o)})),define("consul-ui/components/copyable-code/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"Q8iW7hMH",block:'[[[11,0],[16,0,[28,[37,0],["copyable-code",[28,[37,1],["obfuscated",[30,1]],null]],null]],[17,2],[12],[1,"\\n"],[41,[30,1],[[[1,"  "],[8,[39,3],null,null,[["default"],[[[[1,"\\n    "],[8,[30,3,["Action"]],[[16,"aria-label",[52,[33,4,["expanded"]],"Hide","Show"]],[4,[38,5],["click",[30,3,["toggle"]]],null]],null,[["default"],[[[[1,"\\n\\n    "]],[]]]]],[1,"\\n    "],[8,[30,3,["Details"]],null,null,[["default"],[[[[1,"\\n      "],[10,"pre"],[12],[10,"code"],[15,1,[30,4,["id"]]],[12],[1,[30,5]],[13],[13],[1,"\\n    "]],[4]]]]],[1,"\\n    "],[8,[30,3,["Details"]],null,[["@auto"],[false]],[["default"],[[[[1,"\\n"],[41,[28,[37,6],[[30,6,["expanded"]]],null],[[[1,"        "],[10,"hr"],[12],[13],[1,"\\n"]],[]],null],[1,"    "]],[6]]]]],[1,"\\n  "]],[3]]]]],[1,"\\n\\n  "],[8,[39,7],null,[["@value","@name"],[[30,5],[30,7]]],null],[1,"\\n\\n"]],[]],[[[1,"  "],[10,"pre"],[12],[10,"code"],[12],[1,[30,5]],[13],[13],[1,"\\n  "],[8,[39,7],null,[["@value","@name"],[[30,5],[30,7]]],null],[1,"\\n"]],[]]],[1,"\\n"],[13]],["@obfuscated","&attrs","disclosure","details","@value","details","@name"],false,["class-map","array","if","disclosure","details","on","not","copy-button"]]',moduleName:"consul-ui/components/copyable-code/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/data-collection/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/service","@ember/object","@ember/object/computed","@glimmer/tracking"],(function(e,t,n,l,r,i,o,a){var u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j
-function _(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function k(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const S=(0,n.createTemplateFactory)({id:"2flQHkul",block:'[[[1,[28,[35,0],[[28,[37,1],[[30,0],[28,[37,2],[[28,[37,3],[[30,0],"term"],null],""],null],[30,1]],null]],null]],[1,"\\n"],[18,2,[[28,[37,5],null,[["search","items","Collection","Empty"],[[28,[37,1],[[30,0],[30,0,["search"]]],null],[30,0,["items"]],[52,[28,[37,7],[[30,0,["items","length"]],0],null],[50,"anonymous",0,null,null],""],[52,[28,[37,9],[[30,0,["items","length"]],0],null],[50,"anonymous",0,null,null],""]]]]]],[1,"\\n"]],["@search","&default"],false,["did-update","action","fn","set","yield","hash","if","gt","component","eq"]]',moduleName:"consul-ui/components/data-collection/index.hbs",isStrictMode:!1})
-let N=(u=(0,r.inject)("filter"),s=(0,r.inject)("sort"),c=(0,r.inject)("search"),d=(0,o.alias)("searchService.searchables"),p=(0,i.computed)("term","args.search"),f=(0,i.computed)("type","searchMethod","filtered","args.filters"),m=(0,i.computed)("type","args.sort"),h=(0,i.computed)("comparator","searched"),b=(0,i.computed)("searchTerm","searchable","filtered"),y=(0,i.computed)("type","content","args.filters"),g=(0,i.computed)("args.{items.[],items.content.[]}"),v=class extends l.default{constructor(){super(...arguments),_(this,"filter",O,this),_(this,"sort",P,this),_(this,"searchService",x,this),_(this,"term",w,this),_(this,"searchableMap",j,this)}get type(){return this.args.type}get searchMethod(){return this.args.searchable||"exact"}get searchProperties(){return this.args.filters.searchproperties}get searchTerm(){return this.term||this.args.search||""}get searchable(){const e=(0,i.get)(this,"args.filters.searchproperty.value")||(0,i.get)(this,"args.filters.searchproperty")
-return new("string"==typeof this.searchMethod?this.searchableMap[this.searchMethod]:this.args.searchable)(this.filtered,{finders:Object.fromEntries(Object.entries(this.searchService.predicate(this.type)).filter((t=>{let[n,l]=t
-return void 0===e||e.includes(n)})))})}get comparator(){return void 0===this.args.sort?[]:this.sort.comparator(this.type)(this.args.sort)}get items(){let e="comparator"
-return"function"==typeof this.comparator&&(e=this.comparator),(0,i.defineProperty)(this,"sorted",(0,o.sort)("searched",e)),this.sorted}get searched(){return""===this.searchTerm?this.filtered:this.searchable.search(this.searchTerm)}get filtered(){if(void 0===this.args.filters)return this.content.slice()
-const e=this.filter.predicate(this.type)
-if(void 0===e)return this.content.slice()
-const t=Object.entries(this.args.filters).filter((e=>{let[t,n]=e
-return Boolean(n)})).map((e=>{let[t,n]=e
-return[t,"string"!=typeof n?n.value:n]}))
-return this.content.filter(e(Object.fromEntries(t)))}get content(){const e=this.args.items||[]
-return"function"==typeof e.dispatchEvent?e.content:e}search(e){return this.term=e,this.items}},O=k(v.prototype,"filter",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=k(v.prototype,"sort",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=k(v.prototype,"searchService",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=k(v.prototype,"term",[a.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),j=k(v.prototype,"searchableMap",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k(v.prototype,"searchTerm",[p],Object.getOwnPropertyDescriptor(v.prototype,"searchTerm"),v.prototype),k(v.prototype,"searchable",[f],Object.getOwnPropertyDescriptor(v.prototype,"searchable"),v.prototype),k(v.prototype,"comparator",[m],Object.getOwnPropertyDescriptor(v.prototype,"comparator"),v.prototype),k(v.prototype,"items",[h],Object.getOwnPropertyDescriptor(v.prototype,"items"),v.prototype),k(v.prototype,"searched",[b],Object.getOwnPropertyDescriptor(v.prototype,"searched"),v.prototype),k(v.prototype,"filtered",[y],Object.getOwnPropertyDescriptor(v.prototype,"filtered"),v.prototype),k(v.prototype,"content",[g],Object.getOwnPropertyDescriptor(v.prototype,"content"),v.prototype),k(v.prototype,"search",[i.action],Object.getOwnPropertyDescriptor(v.prototype,"search"),v.prototype),v)
-e.default=N,(0,t.setComponentTemplate)(S,N)})),define("consul-ui/components/data-form/index",["exports","@ember/component","@ember/template-factory","@ember/service","@ember/object","block-slots","validated-changeset"],(function(e,t,n,l,r,i,o){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const a=(0,n.createTemplateFactory)({id:"IXfByXKe",block:'[[[8,[39,0],null,[["@items","@src","@onchange","@once"],[[99,1,["@items"]],[28,[37,2],["/${partition}/${nspace}/${dc}/${type}/${src}",[28,[37,3],null,[["partition","nspace","dc","type","src"],[[33,4],[33,5],[33,6],[33,7],[33,8]]]]],null],[28,[37,9],[[30,0],"setData"],null],true]],[["default"],[[[[1,"\\n  "],[8,[39,10],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n\\n    "],[8,[39,11],null,[["@sink","@type","@label","@ondelete","@onchange"],[[28,[37,2],["/${partition}/${nspace}/${dc}/${type}",[28,[37,3],null,[["partition","nspace","dc","type"],[[33,4],[33,5],[28,[37,12],[[33,13,["Datacenter"]],[33,6]],null],[33,7]]]]],null],[99,7,["@type"]],[99,14,["@label"]],[28,[37,9],[[30,0],[33,15]],null],[28,[37,9],[[30,0],[33,16]],null]]],[["default"],[[[[1,"\\n\\n"],[44,[[28,[37,3],null,[["data","change","isCreate","error","disabled","submit","delete"],[[33,13],[28,[37,9],[[30,0],"change"],null],[33,18],[30,1,["error"]],[30,1,["inflight"]],[28,[37,9],[[30,0],[30,1,["persist"]],[33,13]],null],[28,[37,9],[[30,0],[30,1,["delete"]],[33,13]],null]]]]],[[[1,"\\n      "],[18,3,[[30,2]]],[1,"\\n"],[41,[33,21],[[[1,"      "],[8,[39,10],null,[["@name"],["error"]],[["default"],[[[[1,"\\n        "],[8,[39,22],null,[["@name"],["error"]],[["default"],[[[[1,"\\n          "],[18,3,[[30,2]]],[1,"\\n        "]],[]]]]],[1,"\\n      "]],[]]]]],[1,"\\n"]],[]],null],[1,"\\n      "],[8,[39,10],null,[["@name"],["content"]],[["default"],[[[[1,"\\n        "],[8,[39,22],null,[["@name"],["form"]],[["default"],[[[[1,"\\n          "],[18,3,[[30,2]]],[1,"\\n        "]],[]]]]],[1,"\\n      "]],[]]]]],[1,"\\n\\n"]],[2]]],[1,"\\n    "]],[1]]]]],[1,"\\n\\n  "]],[]]]]],[1,"\\n"]],[]]]]]],["writer","api","&default"],false,["data-loader","item","uri","hash","partition","nspace","dc","type","src","action","block-slot","data-writer","or","data","label","ondelete","onsubmit","let","create","yield","if","hasError","yield-slot"]]',moduleName:"consul-ui/components/data-form/index.hbs",isStrictMode:!1})
-var u=(0,t.setComponentTemplate)(a,t.default.extend(i.default,{tagName:"",dom:(0,l.inject)("dom"),builder:(0,l.inject)("form"),create:!1,ondelete:function(){return this.onsubmit(...arguments)},oncancel:function(){return this.onsubmit(...arguments)},onsubmit:function(){},onchange:function(e,t){return t.handleEvent(e)},didReceiveAttrs:function(){this._super(...arguments)
-try{this.form=this.builder.form(this.type)}catch(e){}},willRender:function(){this._super(...arguments),(0,r.set)(this,"hasError",this._isRegistered("error"))},willDestroyElement:function(){this._super(...arguments),(0,r.get)(this,"data.isNew")&&this.data.rollbackAttributes()},actions:{setData:function(e){let t=e
-return(0,o.isChangeset)(e)||void 0===this.form||(t=this.form.setData(e).getData()),(0,r.get)(e,"isNew")&&((0,r.set)(this,"create",!0),t=Object.entries(this.autofill||{}).reduce((function(e,t){let[n,l]=t
-return(0,r.set)(e,n,l),e}),t)),(0,r.set)(this,"data",t),this.data},change:function(e,t,n){this.onchange(this.dom.normalizeEvent(e,t),this.form,this.form.getData())}}}))
-e.default=u})),define("consul-ui/components/data-loader/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={id:"data-loader",initial:"load",on:{OPEN:{target:"load"},ERROR:{target:"disconnected"},LOAD:[{target:"idle",cond:"loaded"},{target:"loading"}]},states:{load:{},loading:{on:{SUCCESS:{target:"idle"},ERROR:{target:"error"}}},idle:{},error:{on:{RETRY:{target:"load"}}},disconnected:{on:{RETRY:{target:"load"}}}}}}))
-define("consul-ui/components/data-loader/index",["exports","@ember/component","@ember/template-factory","@ember/object","block-slots","consul-ui/components/data-loader/chart.xstate"],(function(e,t,n,l,r,i){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,n.createTemplateFactory)({id:"0gYnIceV",block:'[[[18,9,null],[1,"\\n"],[8,[39,1],null,[["@src"],[[99,2,["@src"]]]],[["default"],[[[[1,"\\n  "],[8,[39,3],null,[["@target","@name","@value"],[[30,0],"dispatch",[30,4]]],null],[1,"\\n  "],[8,[30,2],null,[["@name","@cond"],["loaded",[28,[37,4],[[30,0],"isLoaded"],null]]],null],[1,"\\n\\n\\n"],[44,[[28,[37,6],null,[["data","error","invalidate","dispatchError"],[[33,7],[33,8],[30,0,["invalidate"]],[28,[37,9],[[28,[37,4],[[30,0],[28,[37,10],[[33,8]],null]],[["value"],["error.errors.firstObject"]]],[28,[37,4],[[30,0],[30,4],"ERROR"],null]],null]]]]],[[[1,"\\n"],[6,[39,11],null,[["name"],["data"]],[["default","else"],[[[[1,"      "],[18,9,[[30,6]]],[1,"\\n"]],[]],[[[41,[28,[37,13],[[33,14]],null],[[[1,"        "],[8,[30,1],null,[["@notMatches"],[[28,[37,15],["error","disconnected"],null]]],[["default"],[[[[1,"\\n"],[41,[28,[37,16],[[33,17],[28,[37,18],[[28,[37,13],[[33,19]],null],[28,[37,20],[[30,5],"loading"],null]],null]],null],[[[1,"            "],[8,[39,21],null,[["@open","@src","@onchange","@onerror"],[[99,22,["@open"]],[99,17,["@src"]],[28,[37,9],[[28,[37,4],[[30,0],"change"],[["value"],["data"]]],[28,[37,4],[[30,0],[30,4],"SUCCESS"],null]],null],[30,6,["dispatchError"]]]],[["default"],[[[[1,"\\n              "],[1,[28,[35,23],[[28,[37,24],[[30,0],"invalidate",[30,7,["invalidate"]]],null]],null]],[1,"\\n            "]],[7]]]]],[1,"\\n"]],[]],null],[1,"        "]],[]]]]],[1,"\\n"]],[]],null]],[]]]]],[1,"\\n  "],[8,[30,1],null,[["@matches"],["loading"]],[["default"],[[[[1,"\\n"],[6,[39,11],null,[["name"],["loading"]],[["default","else"],[[[[1,"      "],[18,9,[[30,6]]],[1,"\\n"]],[]],[[[1,"      "],[8,[39,25],null,null,null],[1,"\\n"]],[]]]]],[1,"  "]],[]]]]],[1,"\\n\\n  "],[8,[30,1],null,[["@matches"],["error"]],[["default"],[[[[1,"\\n"],[6,[39,11],null,[["name"],["error"]],[["default","else"],[[[[1,"      "],[18,9,[[30,6]]],[1,"\\n"]],[]],[[[1,"      "],[8,[39,26],null,[["@error"],[[99,8,["@error"]]]],null],[1,"\\n"]],[]]]]],[1,"  "]],[]]]]],[1,"\\n\\n  "],[8,[30,1],null,[["@matches"],[[28,[37,15],["idle","disconnected"],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[30,1],null,[["@matches"],["disconnected"]],[["default"],[[[[1,"\\n"],[41,[28,[37,13],[[28,[37,27],[[33,8,["status"]],"401"],null]],null],[[[6,[39,11],null,[["name","params"],["disconnected",[28,[37,28],[[28,[37,4],[[30,0],[30,4],"RESET"],null]],null]]],[["default","else"],[[[[1,"            "],[18,9,[[30,6]]],[1,"\\n"]],[]],[[[1,"          "],[8,[39,29],[[4,[38,30],null,[["sticky"],[true]]]],[["@color"],["warning"]],[["default"],[[[[1,"\\n            "],[8,[30,8,["Title"]],null,null,[["default"],[[[[1,"Warning!"]],[]]]]],[1,"\\n            "],[8,[30,8,["Description"]],null,null,[["default"],[[[[1,"An error was returned whilst loading this data, refresh to try again."]],[]]]]],[1,"\\n          "]],[8]]]]],[1,"\\n"]],[]]]]]],[]],null],[1,"    "]],[]]]]],[1,"\\n"],[41,[28,[37,27],[[33,8,["status"]],"403"],null],[[[6,[39,11],null,[["name"],["error"]],[["default","else"],[[[[1,"        "],[18,9,[[30,6]]],[1,"\\n"]],[]],[[[1,"        "],[8,[39,26],null,[["@error"],[[99,8,["@error"]]]],null],[1,"\\n"]],[]]]]]],[]],[[[1,"      "],[8,[39,11],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n        "],[18,9,[[30,6]]],[1,"\\n      "]],[]]]]],[1,"\\n"]],[]]],[1,"\\n  "]],[]]]]],[1,"\\n\\n"]],[6]]],[1,"  "],[1,[28,[35,31],[[28,[37,32],[[30,4],"LOAD"],null]],[["src"],[[33,17]]]]],[1,"\\n"]],[1,2,3,4,5]]]]]],["State","Guard","Action","dispatch","state","api","source","T","&default"],false,["yield","state-chart","chart","ref","action","let","hash","data","error","queue","mut","yield-slot","if","not","items","array","and","src","or","once","state-matches","data-source","open","did-insert","set","consul/loader","error-state","eq","block-params","hds/toast","notification","did-update","fn"]]',moduleName:"consul-ui/components/data-loader/index.hbs",isStrictMode:!1})
-var a=(0,t.setComponentTemplate)(o,t.default.extend(r.default,{tagName:"",onchange:e=>e,init:function(){this._super(...arguments),this.chart=i.default},didReceiveAttrs:function(){this._super(...arguments),void 0!==this.items&&this.actions.change.apply(this,[this.items])},didInsertElement:function(){this._super(...arguments),this.dispatch("LOAD")},actions:{isLoaded:function(){return void 0!==this.items||void 0===this.src},change:function(e){(0,l.set)(this,"data",this.onchange(e))}}}))
-e.default=a})),define("consul-ui/components/data-sink/index",["exports","@ember/component","@ember/template-factory","@ember/service","@ember/object","consul-ui/utils/dom/event-source"],(function(e,t,n,l,r,i){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,n.createTemplateFactory)({id:"utpO3btI",block:'[[[18,1,[[28,[37,1],null,[["open","state"],[[28,[37,2],[[30,0],"open"],null],[33,3]]]]]],[1,"\\n"]],["&default"],false,["yield","hash","action","state"]]',moduleName:"consul-ui/components/data-sink/index.hbs",isStrictMode:!1})
-var a=(0,t.setComponentTemplate)(o,t.default.extend({tagName:"",service:(0,l.inject)("data-sink/service"),dom:(0,l.inject)("dom"),logger:(0,l.inject)("logger"),onchange:function(e){},onerror:function(e){},state:(0,r.computed)("instance","instance.{dirtyType,isSaving}",(function(){let e
-const t=(0,r.get)(this,"instance.isSaving"),n=(0,r.get)(this,"instance.dirtyType")
-if(void 0===t&&void 0===n)e="idle"
-else{switch(n){case"created":e=t?"creating":"create"
-break
-case"updated":e=t?"updating":"update"
-break
-case"deleted":case void 0:e=t?"removing":"remove"}e=`active.${e}`}return{matches:t=>-1!==e.indexOf(t)}})),init:function(){this._super(...arguments),this._listeners=this.dom.listeners()},willDestroyElement:function(){this._super(...arguments),this._listeners.remove()},source:function(e){const t=(0,i.once)(e),n=e=>{(0,r.set)(this,"instance",void 0)
-try{this.onerror(e),this.logger.execute(e)}catch(e){this.logger.execute(e)}}
-return this._listeners.add(t,{message:e=>{try{(0,r.set)(this,"instance",void 0),this.onchange(e)}catch(t){n(t)}},error:e=>n(e)}),t},didInsertElement:function(){this._super(...arguments),void 0===this.data&&void 0===this.item||this.actions.open.apply(this,[this.data,this.item])},persist:function(e,t){void 0!==e?(0,r.set)(this,"instance",this.service.prepare(this.sink,e,t)):(0,r.set)(this,"instance",t),this.source((()=>this.service.persist(this.sink,this.instance)))},remove:function(e){(0,r.set)(this,"instance",e),this.source((()=>this.service.remove(this.sink,e)))},actions:{open:function(e,t){if(t instanceof Event&&(t=void 0),void 0===e&&void 0===t)throw new Error("You must specify data to save, or null to remove")
-null===e||""===e?this.remove(t):this.persist(e,t)}}}))
-e.default=a})),define("consul-ui/components/data-source/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/service","@glimmer/tracking","@ember/object","@ember/runloop","@ember/debug"],(function(e,t,n,l,r,i,o,a,u){var s,c,d,p,f,m,h,b,y,g
-function v(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function O(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const P=(0,n.createTemplateFactory)({id:"CRu7UTYr",block:'[[[41,[28,[37,1],[[30,0,["disabled"]]],null],[[[41,[28,[37,2],[[30,0,["loading"]],"lazy"],null],[[[1,"    "],[11,"data"],[24,"aria-hidden","true"],[24,5,"width: 0;height: 0;font-size: 0;padding: 0;margin: 0;"],[4,[38,3],[[30,0,["connect"]]],null],[12],[13],[1,"\\n"]],[]],[[[1,"    "],[1,[28,[35,3],[[30,0,["connect"]]],null]],[1,"\\n"]],[]]],[1,"  "],[1,[28,[35,4],[[30,0,["attributeChanged"]],"src",[30,1]],null]],[1,"\\n  "],[1,[28,[35,4],[[30,0,["attributeChanged"]],"loading",[30,2]],null]],[1,"\\n  "],[1,[28,[35,5],[[30,0,["disconnect"]]],null]],[1,"\\n"]],[]],null],[1,[28,[35,4],[[30,0,["attributeChanged"]],"disabled",[30,3]],null]],[1,"\\n"],[18,4,[[28,[37,7],null,[["data","error","invalidate","Source"],[[30,0,["data"]],[30,0,["error"]],[30,0,["invalidate"]],[52,[30,0,["data"]],[50,"data-source",0,null,[["disabled"],[[28,[37,1],[[28,[37,2],[[30,0,["error"]],[27]],null]],null]]]],""]]]]]],[1,"\\n"]],["@src","@loading","@disabled","&default"],false,["if","not","eq","did-insert","did-update","will-destroy","yield","hash","component"]]',moduleName:"consul-ui/components/data-source/index.hbs",isStrictMode:!1}),x=function(e,t,n){let l=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null
-return"function"==typeof e?e():null}
-const r=e[t]
-return r!==n&&l(r,n),e[t]=n},w=()=>{},j=e=>"function"==typeof e?e:w,_=["eager","lazy"]
-let k=(s=(0,r.inject)("data-source/service"),c=(0,r.inject)("dom"),d=(0,r.inject)("logger"),p=class extends l.default{constructor(e,t){super(...arguments),v(this,"dataSource",f,this),v(this,"dom",m,this),v(this,"logger",h,this),v(this,"isIntersecting",b,this),v(this,"data",y,this),v(this,"error",g,this),this._listeners=this.dom.listeners(),this._lazyListeners=this.dom.listeners()}get loading(){return _.includes(this.args.loading)?this.args.loading:_[0]}get disabled(){return void 0!==this.args.disabled&&this.args.disabled}onchange(e){this.error=void 0,this.data=e.data,j(this.args.onchange)(e)}onerror(e){this.error=e.error||e,j(this.args.onerror)(e)}connect(e){Array.isArray(e)?(this._lazyListeners.remove(),this.open()):this._lazyListeners.add(this.dom.isInViewport(e,(e=>{this.isIntersecting=e,this.isIntersecting?this.open():this.close()})))}disconnect(){void 0!==this.data&&void 0===this.data.length&&"function"==typeof this.data.rollbackAttributes&&this.data.rollbackAttributes(),this.close(),this._listeners.remove(),this._lazyListeners.remove()}attributeChanged(e){let[t,n]=e
-if("src"===t)("eager"===this.loading||this.isIntersecting)&&this.open()}open(){const e=this.args.src,t=x(this,"source",this.dataSource.open(e,this,this.open),((e,t)=>{this.dataSource.close(e,this)})),n=e=>{try{const t=(0,o.get)(e,"error.errors.firstObject")||{}
-"429"!==(0,o.get)(t,"status")&&this.onerror(e),this.logger.execute(e)}catch(e){this.logger.execute(e)}},l=this._listeners.add(this.source,{message:e=>{try{this.onchange(e)}catch(t){n(t)}},error:e=>{n(e)}})
-if(x(this,"_remove",l),"function"==typeof t.getCurrentEvent){const e=t.getCurrentEvent()
-if(e){let t
-void 0!==e.error?(t="onerror",this.error=e.error):(this.error=void 0,this.data=e.data,t="onchange"),(0,a.schedule)("afterRender",(()=>{try{this[t](e)}catch(l){n(l)}}))}}}async invalidate(){this.source.readyState=2,this.disconnect(),(0,a.schedule)("afterRender",(()=>{(0,u.runInDebug)((e=>console.debug("Invalidation is only supported for non-lazy data sources. If you want to use this you should fixup support for lazy data sources"))),this.connect([])}))}close(){void 0!==this.source&&(this.dataSource.close(this.source,this),x(this,"_remove",void 0),this.source=void 0)}},f=O(p.prototype,"dataSource",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=O(p.prototype,"dom",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=O(p.prototype,"logger",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=O(p.prototype,"isIntersecting",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),y=O(p.prototype,"data",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=O(p.prototype,"error",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O(p.prototype,"connect",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"connect"),p.prototype),O(p.prototype,"disconnect",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"disconnect"),p.prototype),O(p.prototype,"attributeChanged",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"attributeChanged"),p.prototype),O(p.prototype,"open",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"open"),p.prototype),O(p.prototype,"invalidate",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"invalidate"),p.prototype),O(p.prototype,"close",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"close"),p.prototype),p)
-e.default=k,(0,t.setComponentTemplate)(P,k)})),define("consul-ui/components/data-writer/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={id:"data-writer",initial:"idle",states:{idle:{on:{PERSIST:{target:"persisting"},REMOVE:{target:"removing"}}},removing:{on:{SUCCESS:{target:"removed"},ERROR:{target:"error"}}},persisting:{on:{SUCCESS:{target:"persisted"},ERROR:{target:"error"}}},removed:{on:{RESET:{target:"idle"}}},persisted:{on:{RESET:{target:"idle"}}},error:{on:{RESET:{target:"idle"}}}}}})),define("consul-ui/components/data-writer/index",["exports","@ember/component","@ember/template-factory","@ember/object","block-slots","consul-ui/components/data-writer/chart.xstate"],(function(e,t,n,l,r,i){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,n.createTemplateFactory)({id:"RH49dABa",block:'[[[8,[39,0],null,[["@src"],[[99,1,["@src"]]]],[["default"],[[[[1,"\\n\\n  "],[8,[39,2],null,[["@target","@name","@value"],[[30,0],"dispatch",[30,4]]],null],[1,"\\n\\n"],[44,[[28,[37,4],null,[["data","error","persist","delete","inflight","disabled"],[[33,5],[33,6],[28,[37,7],[[30,0],"persist"],null],[28,[37,8],[[28,[37,7],[[30,0],[28,[37,9],[[33,5]],null]],null],[28,[37,7],[[30,0],[30,4],"REMOVE"],null]],null],[28,[37,10],[[30,5],[28,[37,11],["persisting","removing"],null]],null],[28,[37,10],[[30,5],[28,[37,11],["persisting","removing"],null]],null]]]]],[[[1,"\\n  "],[18,13,[[30,6]]],[1,"\\n\\n  "],[8,[30,1],null,[["@matches"],["removing"]],[["default"],[[[[1,"\\n    "],[8,[39,13],null,[["@sink","@item","@data","@onchange","@onerror"],[[99,14,["@sink"]],[99,5,["@item"]],null,[28,[37,7],[[30,0],[30,4],"SUCCESS"],null],[28,[37,7],[[30,0],"error"],null]]],null],[1,"\\n  "]],[]]]]],[1,"\\n\\n  "],[8,[30,1],null,[["@matches"],["persisting"]],[["default"],[[[[1,"\\n    "],[8,[39,13],null,[["@sink","@item","@onchange","@onerror"],[[99,14,["@sink"]],[99,5,["@item"]],[28,[37,7],[[30,0],[30,4],"SUCCESS"],null],[28,[37,7],[[30,0],"error"],null]]],null],[1,"\\n  "]],[]]]]],[1,"\\n\\n  "],[8,[30,1],null,[["@matches"],["removed"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,8],[[28,[37,7],[[30,0],[30,4],"RESET"],null],[28,[37,7],[[30,0],[33,15]],null]],null]],[[[6,[39,16],null,[["name","params"],["removed",[28,[37,17],[[30,7]],null]]],[["default","else"],[[[[1,"      "],[18,13,[[30,6]]],[1,"\\n"]],[]],[[[1,"      "],[8,[39,18],[[4,[38,19],null,[["after"],[[28,[37,7],[[30,0],[30,7]],null]]]]],[["@color"],["success"]],[["default"],[[[[1,"\\n        "],[8,[30,8,["Title"]],null,null,[["default"],[[[[1,"Success!"]],[]]]]],[1,"\\n        "],[8,[30,8,["Description"]],null,null,[["default"],[[[[1,"Your "],[1,[28,[35,20],[[33,21],[33,22]],null]],[1," has been deleted."]],[]]]]],[1,"\\n      "]],[8]]]]],[1,"\\n"]],[]]]]]],[7]]],[1,"  "]],[]]]]],[1,"\\n\\n  "],[8,[30,1],null,[["@matches"],["persisted"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,7],[[30,0],[33,23]],null]],[[[6,[39,16],null,[["name","params"],["persisted",[28,[37,17],[[30,9]],null]]],[["default","else"],[[[[1,"      "],[18,13,[[30,6]]],[1,"\\n"]],[]],[[[1,"      "],[8,[39,18],[[4,[38,19],null,[["after"],[[28,[37,7],[[30,0],[30,9]],null]]]]],[["@color"],["success"]],[["default"],[[[[1,"\\n        "],[8,[30,10,["Title"]],null,null,[["default"],[[[[1,"Success!"]],[]]]]],[1,"\\n        "],[8,[30,10,["Description"]],null,null,[["default"],[[[[1,"Your "],[1,[28,[35,20],[[33,21],[33,22]],null]],[1," has been saved."]],[]]]]],[1,"\\n      "]],[10]]]]],[1,"\\n"]],[]]]]]],[9]]],[1,"  "]],[]]]]],[1,"\\n\\n  "],[8,[30,1],null,[["@matches"],["error"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,7],[[30,0],[30,4],"RESET"],null]],[[[6,[39,16],null,[["name","params"],["error",[28,[37,17],[[30,11],[30,6,["error"]]],null]]],[["default","else"],[[[[1,"      "],[18,13,[[30,6]]],[1,"\\n"]],[]],[[[1,"      "],[8,[39,18],[[4,[38,19],null,[["after"],[[28,[37,7],[[30,0],[30,11]],null]]]]],[["@color"],["critical"]],[["default"],[[[[1,"\\n        "],[8,[30,12,["Title"]],null,null,[["default"],[[[[1,"Error!"]],[]]]]],[1,"\\n        "],[8,[30,12,["Description"]],null,null,[["default"],[[[[1,"There was an error saving your "],[1,[28,[35,20],[[33,21],[33,22]],null]],[1,".\\n"],[41,[28,[37,25],[[30,6,["error","status"]],[30,6,["error","detail"]]],null],[[[1,"            "],[10,"br"],[12],[13],[1,[30,6,["error","status"]]],[1,": "],[1,[30,6,["error","detail"]]],[1,"\\n"]],[]],[[[41,[30,6,["error","message"]],[[[1,"            "],[10,"br"],[12],[13],[1,[30,6,["error","message"]]],[1,"\\n          "]],[]],null]],[]]],[1,"        "]],[]]]]],[1,"\\n      "]],[12]]]]],[1,"\\n"]],[]]]]]],[11]]],[1,"  "]],[]]]]],[1,"\\n\\n  "],[8,[39,16],null,[["@name"],["content"]],[["default"],[[[[1,"\\n    "],[18,13,[[30,6]]],[1,"\\n  "]],[]]]]],[1,"\\n\\n"]],[6]]]],[1,2,3,4,5]]]]]],["State","Guard","Action","dispatch","state","api","after","T","after","T","after","T","&default"],false,["state-chart","chart","ref","let","hash","data","error","action","queue","mut","state-matches","array","yield","data-sink","sink","ondelete","yield-slot","block-params","hds/toast","notification","or","label","type","onchange","if","and"]]',moduleName:"consul-ui/components/data-writer/index.hbs",isStrictMode:!1})
-var a=(0,t.setComponentTemplate)(o,t.default.extend(r.default,{tagName:"",ondelete:function(){return this.onchange(...arguments)},onchange:function(){},init:function(){this._super(...arguments),this.chart=i.default},actions:{persist:function(e,t){t&&"function"==typeof t.preventDefault&&t.preventDefault(),(0,l.set)(this,"data",e),this.dispatch("PERSIST")},error:function(e,t){t&&"function"==typeof t.preventDefault&&t.preventDefault(),(0,l.set)(this,"error",void 0!==e.error.errors?e.error.errors.firstObject:e.error),this.dispatch("ERROR")}}}))
-e.default=a})),define("consul-ui/components/debug/navigation/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"gn00CoAo",block:"[[],[],false,[]]",moduleName:"consul-ui/components/debug/navigation/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/delete-confirmation/index",["exports","@ember/component","@ember/template-factory"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,n.createTemplateFactory)({id:"2MbSBAzB",block:'[[[10,2],[12],[1,"\\n  "],[1,[34,0]],[1,"\\n"],[13],[1,"\\n"],[8,[39,1],null,null,[["default"],[[[[1,"\\n  "],[8,[39,2],[[16,"onclick",[28,[37,3],[[30,0],[33,4]],null]]],[["@text","@color"],["Confirm Delete","critical"]],null],[1,"\\n  "],[8,[39,2],[[16,"onclick",[28,[37,3],[[30,0],[33,5]],null]]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n"]],[]]]]]],[],false,["message","hds/button-set","hds/button","action","execute","cancel"]]',moduleName:"consul-ui/components/delete-confirmation/index.hbs",isStrictMode:!1})
-var r=(0,t.setComponentTemplate)(l,t.default.extend({tagName:"",execute:function(){},cancel:function(){}}))
-e.default=r})),define("consul-ui/components/disclosure-menu/action/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"kVsFG9Z2",block:'[[[8,[30,1,["Action"]],[[24,"aria-haspopup","menu"],[17,2]],null,[["default"],[[[[1,"\\n  "],[18,3,null],[1,"\\n"]],[]]]]],[1,"\\n"]],["@disclosure","&attrs","&default"],false,["yield"]]',moduleName:"consul-ui/components/disclosure-menu/action/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/disclosure-menu/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"fLNl+IoV",block:'[[[11,0],[16,0,[28,[37,0],["disclosure-menu"],null]],[17,1],[12],[1,"\\n  "],[8,[39,1],null,[["@expanded"],[[30,2]]],[["default"],[[[[1,"\\n    "],[18,6,[[28,[37,3],null,[["Action","Menu","disclosure","toggle","close","open","expanded"],[[50,"disclosure-menu/action",0,null,[["disclosure"],[[30,3]]]],[50,"disclosure-menu/menu",0,null,[["disclosure","items","rowHeight"],[[30,3],[30,4],[30,5]]]],[30,3],[30,3,["toggle"]],[30,3,["close"]],[30,3,["open"]],[30,3,["expanded"]]]]]]],[1,"\\n  "]],[3]]]]],[1,"\\n"],[13],[1,"\\n"]],["&attrs","@expanded","disclosure","@items","@rowHeight","&default"],false,["class-map","disclosure","yield","hash","component"]]',moduleName:"consul-ui/components/disclosure-menu/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/disclosure-menu/menu/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"ezjH7NRj",block:'[[[8,[30,1,["Details"]],null,null,[["default"],[[[[1,"\\n  "],[8,[39,0],null,[["@items"],[[28,[37,1],[[30,3],[28,[37,2],null,null]],null]]],[["default"],[[[[1,"\\n    "],[11,0],[16,0,[28,[37,3],[[28,[37,2],["paged-collection-scroll",[28,[37,4],[[30,4,["type"]],[28,[37,2],["virtual-scroll","native-scroll"],null]],null]],null]],null]],[17,5],[4,[38,5],["click",[30,1,["close"]]],null],[4,[38,6],[[30,4,["viewport"]]],null],[4,[38,7],[[30,4,["resize"]]],null],[4,[38,8],["--paged-row-height"],[["returns"],[[30,4,["rowHeight"]]]]],[4,[38,8],["max-height"],[["returns"],[[30,4,["maxHeight"]]]]],[12],[1,"\\n      "],[18,6,[[28,[37,10],null,[["Menu"],[[50,"menu",0,null,[["disclosure","pager"],[[30,1],[30,4]]]]]]]]],[1,"\\n    "],[13],[1,"\\n  "]],[4]]]]],[1,"\\n"]],[2]]]]],[1,"\\n\\n"]],["@disclosure","details","@items","pager","&attrs","&default"],false,["paged-collection","or","array","class-map","includes","on-outside","did-insert","on-resize","css-prop","yield","hash","component"]]',moduleName:"consul-ui/components/disclosure-menu/menu/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/disclosure/action/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"h7+iNKLY",block:'[[[8,[39,0],[[16,"aria-expanded",[52,[30,1,["expanded"]],"true","false"]],[16,"aria-controls",[30,1,["controls"]]],[17,2]],null,[["default"],[[[[1,"\\n  "],[18,3,null],[1,"\\n"]],[]]]]],[1,"\\n"]],["@disclosure","&attrs","&default"],false,["action","if","yield"]]',moduleName:"consul-ui/components/disclosure/action/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/disclosure/details/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"VadZ+kad",block:'[[[44,[[28,[37,1],null,null]],[[[41,[28,[37,3],[[28,[37,4],[[28,[37,5],[[30,2],[27]],null],[30,3,["expanded"]]],null],[28,[37,4],[[28,[37,6],[[30,2],[27]],null],[28,[37,5],[[30,2],false],null]],null]],null],[[[18,4,[[28,[37,8],null,[["id","expanded"],[[30,1],[30,3,["expanded"]]]]]]],[1,"\\n"]],[]],null],[1,[28,[35,9],[[28,[37,10],[[30,3,["add"]],[30,1]],null]],null]],[1,"\\n"],[1,[28,[35,11],[[28,[37,10],[[30,3,["remove"]],[30,1]],null]],null]],[1,"\\n"]],[1]]]],["id","@auto","@disclosure","&default"],false,["let","unique-id","if","or","and","eq","not-eq","yield","hash","did-insert","fn","will-destroy"]]',moduleName:"consul-ui/components/disclosure/details/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/disclosure/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object","@ember/runloop"],(function(e,t,n,l,r,i,o){var a,u
-function s(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const c=(0,n.createTemplateFactory)({id:"iAc3HX8Q",block:'[[[8,[39,0],null,[["@src","@initial"],[[28,[37,0],["boolean"],null],[52,[30,1],"true","false"]]],[["default"],[[[[1,"\\n"],[44,[[28,[37,3],null,[["toggle","close","open","expanded","event","button","controls"],[[28,[37,4],[[30,5],"TOGGLE"],null],[28,[37,4],[[30,5],"FALSE"],null],[28,[37,4],[[30,5],"TRUE"],null],[28,[37,5],[[30,6],"true"],null],[30,6,["context"]],[28,[37,6],null,null],[30,0,["ids"]]]]]],[[[44,[[28,[37,7],[[30,7],[28,[37,3],null,[["Action","Details"],[[50,"disclosure/action",0,null,[["disclosure"],[[30,7]]]],[50,"disclosure/details",0,null,[["disclosure"],[[28,[37,3],null,[["add","remove","expanded"],[[30,0,["add"]],[30,0,["remove"]],[28,[37,5],[[30,6],"true"],null]]]]]]]]]]],null]],[[[1,"    "],[18,9,[[30,8]]],[1,"\\n"]],[8]]]],[7]]]],[2,3,4,5,6]]]]]],["@expanded","State","Guard","Action","dispatch","state","_api","api","&default"],false,["state-chart","if","let","hash","fn","state-matches","unique-id","assign","component","yield"]]',moduleName:"consul-ui/components/disclosure/index.hbs",isStrictMode:!1})
-let d=(a=class extends l.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="ids",l=this,(n=u)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}add(e){(0,o.schedule)("afterRender",(()=>{this.ids=`${this.ids}${this.ids.length>0?" ":""}${e}`}))}remove(e){this.ids=this.ids.split(" ").filter((t=>t!==e)).join(" ")}},u=s(a.prototype,"ids",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),s(a.prototype,"add",[i.action],Object.getOwnPropertyDescriptor(a.prototype,"add"),a.prototype),s(a.prototype,"remove",[i.action],Object.getOwnPropertyDescriptor(a.prototype,"remove"),a.prototype),a)
-e.default=d,(0,t.setComponentTemplate)(c,d)})),define("consul-ui/components/ember-collection",["exports","ember-collection/components/ember-collection"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/ember-native-scrollable",["exports","ember-collection/components/ember-native-scrollable"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/empty-state/index",["exports","@ember/component","@ember/template-factory","@ember/object","block-slots"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,n.createTemplateFactory)({id:"MevuN2Uz",block:'[[[18,2,null],[1,"\\n"],[11,0],[24,0,"empty-state"],[17,1],[12],[1,"\\n"],[41,[33,2],[[[1,"  "],[10,"header"],[12],[1,"\\n"],[6,[39,3],null,[["name"],["header"]],[["default"],[[[[1,"      "],[18,2,null],[1,"\\n"]],[]]]]],[6,[39,3],null,[["name"],["subheader"]],[["default"],[[[[1,"      "],[18,2,null],[1,"\\n"]],[]]]]],[1,"  "],[13],[1,"\\n"]],[]],null],[6,[39,3],null,[["name"],["body"]],[["default"],[[[[1,"    "],[10,0],[12],[1,"\\n      "],[18,2,null],[1,"\\n"],[41,[33,4],[[[1,"        "],[8,[39,5],[[4,[38,7],["click",[33,4]],null]],[["@color","@text"],["primary",[52,[33,6,["AccessorID"]],"Log in with a different token","Log in"]]],[["default"],[[[[1,"\\n          "],[8,[39,8],null,[["@src","@onchange"],[[28,[37,9],["settings://consul:token"],null],[28,[37,10],[[30,0],[28,[37,11],[[33,6]],null]],[["value"],["data"]]]]],null],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[1,"    "],[13],[1,"\\n"]],[]]]]],[6,[39,3],null,[["name"],["actions"]],[["default"],[[[[1,"    "],[10,"ul"],[12],[1,"\\n      "],[18,2,null],[1,"\\n    "],[13],[1,"\\n"]],[]]]]],[13]],["&attrs","&default"],false,["yield","if","hasHeader","yield-slot","login","hds/button","token","on","data-source","uri","action","mut"]]',moduleName:"consul-ui/components/empty-state/index.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,t.default.extend(r.default,{tagName:"",willRender:function(){this._super(...arguments),(0,l.set)(this,"hasHeader",this._isRegistered("header")||this._isRegistered("subheader"))}}))
-e.default=o})),define("consul-ui/components/error-state/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"qh3oSZcW",block:'[[[41,[28,[37,1],[[30,1,["status"]],"403"],null],[[[1,"  "],[8,[39,2],[[16,0,[28,[37,3],["status-",[30,1,["status"]]],null]]],[["@login"],[[30,2]]],[["default"],[[[[1,"\\n    "],[8,[39,4],null,[["@name"],["header"]],[["default"],[[[[1,"\\n      "],[10,"h2"],[12],[1,"\\n        "],[1,[28,[35,5],[[30,1,["message"]],"Consul returned an error"],null]],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n"],[41,[30,1,["status"]],[[[1,"    "],[8,[39,4],null,[["@name"],["subheader"]],[["default"],[[[[1,"\\n      "],[10,"h3"],[12],[1,"\\n        Error "],[1,[30,1,["status"]]],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n"]],[]],null],[1,"    "],[8,[39,4],null,[["@name"],["body"]],[["default"],[[[[1,"\\n      "],[10,2],[12],[1,"\\n"],[41,[30,1,["detail"]],[[[1,"          "],[1,[30,1,["detail"]]],[1,"\\n"]],[]],[[[1,"          You may have visited a URL that is loading an unknown resource, so you can try going back to the root or try re-submitting your ACL Token/SecretID by going back to ACLs.\\n"]],[]]],[1,"      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,4],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n      "],[10,"li"],[12],[1,"\\n        "],[8,[39,6],null,[["@route","@text","@icon","@iconPosition","@size"],["index","Go back","chevron-left","trailing","small"]],null],[1,"\\n      "],[13],[1,"\\n      "],[10,"li"],[12],[1,"\\n        "],[8,[39,6],null,[["@text","@href","@iconPosition","@icon","@size"],["Read the documentation",[29,[[28,[37,7],["CONSUL_DOCS_URL"],null]]],"trailing","docs-link","small"]],null],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[]],[[[1,"  "],[8,[39,2],[[16,0,[28,[37,3],["status-",[30,1,["status"]]],null]]],[["@login"],[[30,2]]],[["default"],[[[[1,"\\n    "],[8,[39,4],null,[["@name"],["header"]],[["default"],[[[[1,"\\n      "],[10,"h2"],[12],[1,"\\n        You are not authorized\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,4],null,[["@name"],["subheader"]],[["default"],[[[[1,"\\n      "],[10,"h3"],[12],[1,"\\n        Error "],[1,[30,1,["status"]]],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,4],null,[["@name"],["body"]],[["default"],[[[[1,"\\n      "],[10,2],[12],[1,"\\n        You must be granted permissions to view this data. Ask your administrator if you think you should have access.\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,4],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n      "],[10,"li"],[12],[1,"\\n        "],[8,[39,6],null,[["@text","@href","@icon","@iconPosition","@size"],["Read the documentation",[29,[[28,[37,7],["CONSUL_DOCS_URL"],null],"/acl/index.html"]],"docs-link","trailing","small"]],null],[1,"\\n      "],[13],[1,"\\n      "],[10,"li"],[12],[1,"\\n        "],[8,[39,6],null,[["@text","@href","@icon","@iconPosition","@size"],["Follow the guide",[29,[[28,[37,7],["CONSUL_DOCS_LEARN_URL"],null],"/consul/security-networking/production-acls"]],"learn-link","trailing","small"]],null],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[]]]],["@error","@login"],false,["if","not-eq","empty-state","concat","block-slot","or","hds/link/standalone","env"]]',moduleName:"consul-ui/components/error-state/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/event-source/index",["exports","@ember/component","@ember/template-factory","@ember/service","@ember/object"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,n.createTemplateFactory)({id:"OA0g9tPL",block:'[[[18,1,[[28,[37,1],null,[["close"],[[28,[37,2],[[30,0],"close"],null]]]]]],[1,"\\n"]],["&default"],false,["yield","hash","action"]]',moduleName:"consul-ui/components/event-source/index.hbs",isStrictMode:!1}),o=function(e,t,n){let l=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null
-return"function"==typeof e?e():null}
-const i=e[t]
-return i!==n&&l(i,n),(0,r.set)(e,t,n)}
-var a=(0,t.setComponentTemplate)(i,t.default.extend({tagName:"",dom:(0,l.inject)("dom"),logger:(0,l.inject)("logger"),data:(0,l.inject)("data-source/service"),closeOnDestroy:!0,onerror:function(e){this.logger.execute(e.error)},init:function(){this._super(...arguments),this._listeners=this.dom.listeners()},willDestroyElement:function(){this.closeOnDestroy&&this.actions.close.apply(this,[]),this._listeners.remove(),this._super(...arguments)},didReceiveAttrs:function(){this._super(...arguments),(0,r.get)(this,"src.configuration.uri")!==(0,r.get)(this,"source.configuration.uri")&&this.actions.open.apply(this,[])},actions:{open:function(){o(this,"source",this.data.open(this.src,this),((e,t)=>{void 0!==e&&this.data.close(e,this)})),o(this,"proxy",this.src,((e,t)=>{void 0!==e&&e.destroy()}))
-const e=e=>{try{const t=(0,r.get)(e,"error.errors.firstObject")
-"429"!==(0,r.get)(t||{},"status")&&this.onerror(e),this.logger.execute(e)}catch(e){this.logger.execute(e)}},t=this._listeners.add(this.source,{error:t=>{e(t)}})
-o(this,"_remove",t)},close:function(){void 0!==this.source&&(this.data.close(this.source,this),o(this,"_remove",void 0),(0,r.set)(this,"source",void 0)),void 0!==this.proxy&&this.proxy.destroy()}}}))
-e.default=a})),define("consul-ui/components/flash-message",["exports","ember-cli-flash/components/flash-message"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/flight-icon",["exports","@hashicorp/ember-flight-icons/components/flight-icon"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/form-component/index",["exports","@ember/component","@ember/template-factory","block-slots","@ember/service","@ember/object/computed"],(function(e,t,n,l,r,i){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,n.createTemplateFactory)({id:"etKAawDq",block:'[[[18,1,null]],["&default"],false,["yield"]]',moduleName:"consul-ui/components/form-component/index.hbs",isStrictMode:!1}),a=/([^[\]])+/g
-var u=(0,t.setComponentTemplate)(o,t.default.extend(l.default,{tagName:"",onreset:function(){},onchange:function(){},onerror:function(){},onsuccess:function(){},data:(0,i.alias)("form.data"),item:(0,i.alias)("form.data"),dom:(0,r.inject)("dom"),container:(0,r.inject)("form"),actions:{change:function(e,t,n){let l=this.dom.normalizeEvent(e,t)
-const r=[...l.target.name.matchAll(a)],i=r[r.length-1][0]
-let o
-o=-1===i.indexOf("[")?`${this.type}[${i}]`:i,this.form.handleEvent(l,o),this.onchange({target:this})}}}))
-e.default=u})),define("consul-ui/components/form-group/element/checkbox/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"4jry83Gq",block:'[[[11,"input"],[24,4,"checkbox"],[16,3,[30,1]],[16,2,[30,2]],[17,3],[4,[38,0],[[28,[37,1],[[30,4]],null]],null],[4,[38,2],["change",[28,[37,1],[[30,5]],null]],null],[12],[13],[1,"\\n"]],["@name","@value","&attrs","@didinsert","@onchange"],false,["did-insert","optional","on"]]',moduleName:"consul-ui/components/form-group/element/checkbox/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/form-group/element/error/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"dGEGUftb",block:'[[[11,"strong"],[24,"role","alert"],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13],[1,"\\n"]],["&attrs","&default"],false,["yield"]]',moduleName:"consul-ui/components/form-group/element/error/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/form-group/element/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object"],(function(e,t,n,l,r,i){var o,a,u
-function s(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function c(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const d=(0,n.createTemplateFactory)({id:"Qn2u34/P",block:'[[[44,[[28,[37,1],null,[["Element","Text","Checkbox","Radio","Label","Error","state"],[[50,"form-group/element",0,null,[["group","name"],[[30,1],[30,2]]]],[50,"form-group/element/text",0,null,[["didinsert","name","oninput"],[[28,[37,3],[[30,0],[30,0,["connect"]]],null],[30,0,["name"]],[28,[37,3],[[30,0],[28,[37,4],[[30,0,["touched"]]],null],true],null]]]],[50,"form-group/element/checkbox",0,null,[["didinsert","name","onchange"],[[28,[37,3],[[30,0],[30,0,["connect"]]],null],[30,0,["name"]],[28,[37,3],[[30,0],[28,[37,4],[[30,0,["touched"]]],null],true],null]]]],[50,"form-group/element/radio",0,null,[["didinsert","name","onchange"],[[28,[37,3],[[30,0],[30,0,["connect"]]],null],[30,0,["name"]],[28,[37,3],[[30,0],[28,[37,4],[[30,0,["touched"]]],null],true],null]]]],[50,"form-group/element/label",0,null,null],[50,"form-group/element/error",0,null,null],[33,5]]]]],[[[41,[28,[37,7],[[30,0,["type"]],[28,[37,8],["radiogroup","checkbox-group","checkboxgroup"],null]],null],[[[1,"    "],[11,0],[16,"data-property",[30,0,["prop"]]],[16,0,[29,["type-",[30,0,["type"]],[52,[28,[37,9],[[33,5],"error"],null]," has-error"]]]],[17,4],[12],[1,"\\n      "],[18,5,[[30,3]]],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[1,"    "],[11,"label"],[16,"data-property",[30,0,["prop"]]],[16,0,[29,["type-",[30,0,["type"]],[52,[28,[37,9],[[33,5],"error"],null]," has-error"]]]],[17,4],[12],[1,"\\n      "],[18,5,[[30,3]]],[1,"\\n    "],[13],[1,"\\n"]],[]]]],[3]]]],["@group","@name","el","&attrs","&default"],false,["let","hash","component","action","mut","state","if","includes","array","state-matches","yield"]]',moduleName:"consul-ui/components/form-group/element/index.hbs",isStrictMode:!1})
-let p=(o=class extends l.default{constructor(){super(...arguments),s(this,"el",a,this),s(this,"touched",u,this)}get type(){return void 0!==this.el?this.el.dataset.type||this.el.getAttribute("type")||this.el.getAttribute("role"):this.args.type}get name(){return void 0!==this.args.group?`${this.args.group.name}[${this.args.name}]`:this.args.name}get prop(){return`${this.args.name.toLowerCase().split(".").join("-")}`}get state(){const e=this.touched&&this.args.error
-return{matches:t=>"error"===t&&e}}connect(e){this.el=e}},a=c(o.prototype,"el",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=c(o.prototype,"touched",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),c(o.prototype,"connect",[i.action],Object.getOwnPropertyDescriptor(o.prototype,"connect"),o.prototype),o)
-e.default=p,(0,t.setComponentTemplate)(d,p)})),define("consul-ui/components/form-group/element/label/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"qfCtMXFx",block:'[[[11,1],[24,0,"form-elements-label label"],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13],[1,"\\n"]],["&attrs","&default"],false,["yield"]]',moduleName:"consul-ui/components/form-group/element/label/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/form-group/element/radio/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"Ir+FjtQH",block:'[[[11,"input"],[24,4,"radio"],[16,3,[30,1]],[16,2,[30,2]],[17,3],[4,[38,0],[[28,[37,1],[[30,4]],null]],null],[4,[38,2],["change",[28,[37,1],[[30,5]],null]],null],[12],[13],[1,"\\n"]],["@name","@value","&attrs","@didinsert","@onchange"],false,["did-insert","optional","on"]]',moduleName:"consul-ui/components/form-group/element/radio/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/form-group/element/text/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"auOoQIU/",block:'[[[11,"input"],[24,4,"text"],[16,3,[30,1]],[16,2,[30,2]],[17,3],[4,[38,0],[[28,[37,1],[[30,4]],null]],null],[4,[38,2],["input",[28,[37,1],[[30,5]],null]],null],[12],[13],[1,"\\n"]],["@name","@value","&attrs","@didinsert","@oninput"],false,["did-insert","optional","on"]]',moduleName:"consul-ui/components/form-group/element/text/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/form-group/index",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"7XOStkey",block:'[[[18,1,[[28,[37,1],null,[["Element"],[[50,"form-group/element",0,null,[["group"],[[30,0]]]]]]]]],[1,"\\n"]],["&default"],false,["yield","hash","component"]]',moduleName:"consul-ui/components/form-group/index.hbs",isStrictMode:!1})
-class i extends l.default{get name(){return this.args.name}}e.default=i,(0,t.setComponentTemplate)(r,i)})),define("consul-ui/components/form-input/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"m+IBH13K",block:'[[[11,"label"],[16,0,[28,[37,0],["form-input",[52,[28,[37,2],[[30,1,["state","context","errors"]],[30,2]],null]," has-error"]],null]],[17,3],[12],[1,"\\n  "],[10,1],[12],[1,"\\n    "],[18,7,null],[1,"\\n  "],[13],[1,"\\n  "],[18,8,null],[1,"\\n"],[44,[[28,[37,5],[[30,4,["help"]],[30,5]],null]],[[[41,[30,6],[[[1,"    "],[10,"em"],[12],[1,"\\n      "],[1,[30,6]],[1,"\\n    "],[13],[1,"\\n"]],[]],null]],[6]]],[1,"  "],[8,[39,6],null,[["@state","@matches"],[[30,1,["state"]],"error"]],[["default"],[[[[1,"\\n"],[1,"    "],[10,"strong"],[14,"role","alert"],[12],[1,[28,[35,2],[[28,[37,2],[[30,1,["state","context","errors"]],[30,2]],null],"message"],null]],[13],[1,"\\n  "]],[]]]]],[1,"\\n"],[13],[1,"\\n"]],["@chart","@name","&attrs","@validations","@help","help","&label","&input"],false,["concat","if","get","yield","let","or","state"]]',moduleName:"consul-ui/components/form-input/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/freetext-filter/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object"],(function(e,t,n,l,r){var i
-function o(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const a=(0,n.createTemplateFactory)({id:"oIN1v5pq",block:'[[[11,0],[24,0,"freetext-filter"],[17,1],[12],[1,"\\n  "],[10,"label"],[14,0,"type-search"],[12],[1,"\\n    "],[10,1],[14,0,"freetext-filter_label"],[12],[1,"Search"],[13],[1,"\\n    "],[10,"input"],[14,0,"freetext-filter_input"],[15,"onsearch",[28,[37,0],[[30,0],[30,0,["change"]]],null]],[15,"oninput",[28,[37,0],[[30,0],[30,0,["change"]]],null]],[15,"onkeydown",[28,[37,0],[[30,0],[30,0,["keydown"]]],null]],[14,3,"s"],[15,2,[30,2]],[15,"placeholder",[30,0,["placeholder"]]],[14,"autofocus","autofocus"],[14,4,"search"],[12],[13],[1,"\\n  "],[13],[1,"\\n  "],[18,3,null],[1,"\\n"],[13]],["&attrs","@value","&default"],false,["action","yield"]]',moduleName:"consul-ui/components/freetext-filter/index.hbs",isStrictMode:!1})
-let u=(o((i=class extends l.default{get placeholder(){return this.args.placeholder||"Search"}get onsearch(){return this.args.onsearch||(()=>{})}change(e){this.onsearch(e)}keydown(e){13===e.keyCode&&e.preventDefault()}}).prototype,"change",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"change"),i.prototype),o(i.prototype,"keydown",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"keydown"),i.prototype),i)
-e.default=u,(0,t.setComponentTemplate)(a,u)}))
-define("consul-ui/components/hashicorp-consul/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/service"],(function(e,t,n,l,r){var i,o,a
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=(0,n.createTemplateFactory)({id:"wUVRiBq4",block:'[[[8,[39,0],[[24,0,"hashicorp-consul"],[17,1]],null,[["notifications","home-nav","main-nav","complementary-nav","main","content-info"],[[[[1,"\\n"],[42,[28,[37,2],[[28,[37,2],[[33,3,["queue"]]],null]],null],null,[[[1,"      "],[8,[30,2,["Notification"]],null,[["@delay","@sticky"],[[28,[37,4],[[30,3,["timeout"]],[30,3,["extendedTimeout"]]],null],[30,3,["sticky"]]]],[["default"],[[[[1,"\\n"],[41,[30,3,["dom"]],[[[1,"          "],[2,[30,3,["dom"]]],[1,"\\n"]],[]],[[[44,[[28,[37,7],[[30,3,["type"]]],null],[28,[37,7],[[30,3,["action"]]],null]],[[[1,"            "],[8,[39,8],[[24,"data-notification",""]],[["@color"],[[52,[28,[37,9],[[30,4],"error"],null],"critical",[30,4]]]],[["default"],[[[[1,"\\n              "],[8,[30,6,["Title"]],null,null,[["default"],[[[[1,[28,[35,10],[[30,4]],null]],[1,"!"]],[]]]]],[1,"\\n              "],[8,[30,6,["Description"]],null,null,[["default"],[[[[1,"\\n"],[41,[28,[37,9],[[30,5],"logout"],null],[[[41,[28,[37,9],[[30,4],"success"],null],[[[1,"                    You are now logged out.\\n"]],[]],[[[1,"                    There was an error logging out.\\n"]],[]]]],[]],[[[41,[28,[37,9],[[30,5],"authorize"],null],[[[41,[28,[37,9],[[30,4],"success"],null],[[[1,"                    You are now logged in.\\n"]],[]],[[[1,"                    There was an error, please check your SecretID/Token\\n"]],[]]]],[]],[[[41,[28,[37,11],[[28,[37,9],[[30,5],"use"],null],[28,[37,9],[[30,3,["model"]],"token"],null]],null],[[[1,"                    "],[8,[39,12],null,[["@type","@status","@item","@error"],[[30,5],[30,4],[30,3,["item"]],[30,3,["error"]]]],null],[1,"\\n"]],[]],[[[41,[28,[37,9],[[30,3,["model"]],"intention"],null],[[[1,"                    "],[8,[39,13],null,[["@type","@status","@item","@error"],[[30,5],[30,4],[30,3,["item"]],[30,3,["error"]]]],null],[1,"\\n"]],[]],[[[41,[28,[37,9],[[30,3,["model"]],"role"],null],[[[1,"                    "],[8,[39,14],null,[["@type","@status","@item","@error"],[[30,5],[30,4],[30,3,["item"]],[30,3,["error"]]]],null],[1,"\\n"]],[]],[[[41,[28,[37,9],[[30,3,["model"]],"policy"],null],[[[1,"                    "],[8,[39,15],null,[["@type","@status","@item","@error"],[[30,5],[30,4],[30,3,["item"]],[30,3,["error"]]]],null],[1,"\\n                  "]],[]],null]],[]]]],[]]]],[]]],[1,"                "]],[]]]],[]]],[1,"              "]],[]]]]],[1,"\\n            "]],[6]]]]],[1,"\\n\\n"]],[4,5]]]],[]]],[1,"      "]],[]]]]],[1,"\\n"]],[3]],null],[1,"\\n  "]],[2]],[[[1,"\\n    "],[10,3],[14,0,"w-8 h-8"],[15,6,[28,[37,16],["index"],[["params"],[[28,[37,17],null,[["peer"],[[27]]]]]]]],[12],[1,"\\n      "],[8,[39,18],null,[["@size","@name","@stretched"],["24","consul-color",true]],null],[1,"\\n    "],[13],[1,"\\n  "]],[]],[[[1,"\\n    "],[8,[39,19],null,null,null],[1,"\\n    "],[10,"ul"],[12],[1,"\\n      "],[8,[39,20],null,[["@dc","@partition","@nspace","@dcs"],[[30,7],[30,8],[30,9],[30,10]]],null],[1,"\\n      "],[8,[39,21],null,[["@dc","@partition","@nspace","@partitions","@onchange"],[[30,7],[30,8],[30,9],[30,0,["partitions"]],[28,[37,22],[[30,0],[28,[37,23],[[30,0,["partitions"]]],null]],[["value"],["data"]]]]],null],[1,"\\n      "],[8,[39,24],null,[["@dc","@partition","@nspace","@nspaces","@onchange"],[[30,7],[30,8],[30,9],[30,0,["nspaces"]],[28,[37,22],[[30,0],[28,[37,23],[[30,0,["nspaces"]]],null]],[["value"],["data"]]]]],null],[1,"\\n"],[41,[28,[37,25],["access overview"],null],[[[1,"        "],[10,"li"],[15,0,[28,[37,26],[[28,[37,27],["is-active",[28,[37,28],["dc.show",[30,7,["Name"]]],null]],null]],null]],[12],[1,"\\n          "],[8,[39,22],null,[["@href"],[[28,[37,16],["dc.show",[30,7,["Name"]]],[["params"],[[28,[37,17],null,[["peer"],[[27]]]]]]]]],[["default"],[[[[1,"\\n            Overview\\n          "]],[]]]]],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[28,[37,25],["read services"],null],[[[1,"        "],[10,"li"],[15,0,[52,[28,[37,28],["dc.services",[30,7,["Name"]]],null],"is-active"]],[12],[1,"\\n          "],[10,3],[15,6,[28,[37,16],["dc.services",[30,7,["Name"]]],[["params"],[[28,[37,17],null,[["peer"],[[27]]]]]]]],[12],[1,"Services"],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[28,[37,25],["read nodes"],null],[[[1,"        "],[10,"li"],[15,0,[52,[28,[37,28],["dc.nodes",[30,7,["Name"]]],null],"is-active"]],[12],[1,"\\n          "],[10,3],[15,6,[28,[37,16],["dc.nodes",[30,7,["Name"]]],[["params"],[[28,[37,17],null,[["peer"],[[27]]]]]]]],[12],[1,"Nodes"],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[28,[37,25],["read kv"],null],[[[1,"        "],[10,"li"],[15,0,[52,[28,[37,28],["dc.kv",[30,7,["Name"]]],null],"is-active"]],[12],[1,"\\n          "],[10,3],[15,6,[28,[37,16],["dc.kv",[30,7,["Name"]]],[["params"],[[28,[37,17],null,[["peer"],[[27]]]]]]]],[12],[1,"Key/Value"],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[28,[37,25],["read intentions"],null],[[[1,"        "],[10,"li"],[15,0,[52,[28,[37,28],["dc.intentions",[30,7,["Name"]]],null],"is-active"]],[12],[1,"\\n          "],[10,3],[15,6,[28,[37,16],["dc.intentions",[30,7,["Name"]]],[["params"],[[28,[37,17],null,[["peer"],[[27]]]]]]]],[12],[1,"Intentions"],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[1,"      "],[8,[39,29],null,[["@dc","@partition","@nspace"],[[30,7],[30,8],[30,9]]],null],[1,"\\n      "],[8,[39,30],null,[["@dc","@partition","@nspace"],[[30,7],[30,8],[30,9]]],null],[1,"\\n    "],[13],[1,"\\n  "]],[]],[[[1,"\\n    "],[10,"ul"],[12],[1,"\\n      "],[8,[39,31],null,null,null],[1,"\\n      "],[10,"li"],[12],[1,"\\n        "],[8,[39,32],null,null,[["default"],[[[[1,"\\n          "],[8,[30,11,["Action"]],[[4,[38,33],["click",[30,11,["toggle"]]],null]],null,[["default"],[[[[1,"\\n            Help\\n          "]],[]]]]],[1,"\\n          "],[8,[30,11,["Menu"]],null,null,[["default"],[[[[1,"\\n            "],[8,[30,12,["Menu"]],null,null,[["default"],[[[[1,"\\n              "],[8,[30,13,["Separator"]],null,null,[["default"],[[[[1,"\\n                Consul v"],[1,[28,[35,34],["CONSUL_VERSION"],null]],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[30,13,["Item"]],[[24,0,"docs-link"]],null,[["default"],[[[[1,"\\n                "],[8,[30,13,["Action"]],null,[["@href","@external"],[[28,[37,34],["CONSUL_DOCS_URL"],null],true]],[["default"],[[[[1,"\\n                  Documentation\\n                "]],[]]]]],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[30,13,["Item"]],[[24,0,"learn-link"]],null,[["default"],[[[[1,"\\n                "],[8,[30,13,["Action"]],null,[["@href","@external"],[[28,[37,35],[[28,[37,34],["CONSUL_DOCS_LEARN_URL"],null],"/consul"],null],true]],[["default"],[[[[1,"\\n                  HashiCorp Learn\\n                "]],[]]]]],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[30,13,["Separator"]],null,null,null],[1,"\\n              "],[8,[30,13,["Item"]],[[24,0,"feedback-link"]],null,[["default"],[[[[1,"\\n                "],[8,[30,13,["Action"]],null,[["@href","@external"],[[28,[37,34],["CONSUL_REPO_ISSUES_URL"],null],true]],[["default"],[[[[1,"\\n                  Provide Feedback\\n                "]],[]]]]],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[13]]]]],[1,"\\n          "]],[12]]]]],[1,"\\n        "]],[11]]]]],[1,"\\n      "],[13],[1,"\\n      "],[10,"li"],[15,0,[52,[28,[37,28],["settings"],null],"is-active"]],[12],[1,"\\n        "],[10,3],[15,6,[28,[37,16],["settings"],[["params"],[[28,[37,17],null,[["nspace","partition"],[[27],[27]]]]]]]],[12],[1,"\\n          Settings\\n        "],[13],[1,"\\n      "],[13],[1,"\\n      "],[8,[39,36],null,[["@dc","@partition","@nspace","@onchange"],[[30,7],[30,8],[30,9],[30,14]]],[["default"],[[[[1,"\\n        "],[8,[39,37],null,[["@target","@name","@value"],[[30,0],"tokenSelector",[30,15]]],null],[1,"\\n      "]],[15]]]]],[1,"\\n    "],[13],[1,"\\n  "]],[]],[[[1,"\\n    "],[18,16,[[28,[37,17],null,[["login"],[[52,[30,0,["tokenSelector"]],[30,0,["tokenSelector"]],[28,[37,17],null,[["open","close"],[[27],[27]]]]]]]]]],[1,"\\n  "]],[]],[[[1,"\\n    "],[10,2],[12],[1,"\\n      Consul v"],[1,[28,[35,34],["CONSUL_VERSION"],null]],[1,"\\n    "],[13],[1,"\\n    "],[2,[28,[37,35],["\x3c!-- ",[28,[37,34],["CONSUL_GIT_SHA"],null],"--\x3e"],null]],[1,"\\n  "]],[]]]]],[1,"\\n"]],["&attrs","app","flash","status","type","T","@dc","@partition","@nspace","@dcs","disclosure","panel","menu","@onchange","selector","&default"],false,["app","each","-track-array","flashMessages","sub","if","let","lowercase","hds/toast","eq","capitalize","or","consul/token/notifications","consul/intention/notifications","consul/role/notifications","consul/policy/notifications","href-to","hash","flight-icon","consul/hcp/home","consul/datacenter/selector","consul/partition/selector","action","mut","consul/nspace/selector","can","class-map","array","is-href","consul/acl/selector","consul/peer/selector","debug/navigation","disclosure-menu","on","env","concat","consul/token/selector","ref","yield"]]',moduleName:"consul-ui/components/hashicorp-consul/index.hbs",isStrictMode:!1})
-let s=(i=(0,r.inject)("flashMessages"),o=class extends l.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="flashMessages",l=this,(n=a)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}},c=o.prototype,d="flashMessages",p=[i],f={configurable:!0,enumerable:!0,writable:!0,initializer:null},h={},Object.keys(f).forEach((function(e){h[e]=f[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=p.slice().reverse().reduce((function(e,t){return t(c,d,e)||e}),h),m&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(m):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(c,d,h),h=null),a=h,o)
-var c,d,p,f,m,h
-e.default=s,(0,t.setComponentTemplate)(u,s)})),define("consul-ui/components/hds/alert/description",["exports","@hashicorp/design-system-components/components/hds/alert/description"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/alert/index",["exports","@hashicorp/design-system-components/components/hds/alert/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/alert/title",["exports","@hashicorp/design-system-components/components/hds/alert/title"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/avatar/index",["exports","@hashicorp/design-system-components/components/hds/avatar/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/badge-count/index",["exports","@hashicorp/design-system-components/components/hds/badge-count/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/badge/index",["exports","@hashicorp/design-system-components/components/hds/badge/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/breadcrumb/index",["exports","@hashicorp/design-system-components/components/hds/breadcrumb/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/breadcrumb/item",["exports","@hashicorp/design-system-components/components/hds/breadcrumb/item"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/breadcrumb/truncation",["exports","@hashicorp/design-system-components/components/hds/breadcrumb/truncation"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/button-set/index",["exports","@hashicorp/design-system-components/components/hds/button-set/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/button/index",["exports","@hashicorp/design-system-components/components/hds/button/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/card/container",["exports","@hashicorp/design-system-components/components/hds/card/container"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/disclosure/index",["exports","@hashicorp/design-system-components/components/hds/disclosure/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/dismiss-button/index",["exports","@hashicorp/design-system-components/components/hds/dismiss-button/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/dropdown/index",["exports","@hashicorp/design-system-components/components/hds/dropdown/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/dropdown/list-item/copy-item",["exports","@hashicorp/design-system-components/components/hds/dropdown/list-item/copy-item"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/dropdown/list-item/description",["exports","@hashicorp/design-system-components/components/hds/dropdown/list-item/description"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/dropdown/list-item/generic",["exports","@hashicorp/design-system-components/components/hds/dropdown/list-item/generic"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/dropdown/list-item/interactive",["exports","@hashicorp/design-system-components/components/hds/dropdown/list-item/interactive"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/dropdown/list-item/separator",["exports","@hashicorp/design-system-components/components/hds/dropdown/list-item/separator"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/dropdown/list-item/title",["exports","@hashicorp/design-system-components/components/hds/dropdown/list-item/title"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/dropdown/toggle/button",["exports","@hashicorp/design-system-components/components/hds/dropdown/toggle/button"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/dropdown/toggle/icon",["exports","@hashicorp/design-system-components/components/hds/dropdown/toggle/icon"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/empty-state/body",["exports","@hashicorp/design-system-components/components/hds/empty-state/body"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/empty-state/footer",["exports","@hashicorp/design-system-components/components/hds/empty-state/footer"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/empty-state/header",["exports","@hashicorp/design-system-components/components/hds/empty-state/header"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/empty-state/index",["exports","@hashicorp/design-system-components/components/hds/empty-state/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/flyout/body",["exports","@hashicorp/design-system-components/components/hds/flyout/body"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/flyout/description",["exports","@hashicorp/design-system-components/components/hds/flyout/description"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
-define("consul-ui/components/hds/flyout/header",["exports","@hashicorp/design-system-components/components/hds/flyout/header"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/flyout/index",["exports","@hashicorp/design-system-components/components/hds/flyout/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/checkbox/base",["exports","@hashicorp/design-system-components/components/hds/form/checkbox/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/checkbox/field",["exports","@hashicorp/design-system-components/components/hds/form/checkbox/field"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/checkbox/group",["exports","@hashicorp/design-system-components/components/hds/form/checkbox/group"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/error/index",["exports","@hashicorp/design-system-components/components/hds/form/error/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/error/message",["exports","@hashicorp/design-system-components/components/hds/form/error/message"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/field/index",["exports","@hashicorp/design-system-components/components/hds/form/field/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/fieldset/index",["exports","@hashicorp/design-system-components/components/hds/form/fieldset/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/helper-text/index",["exports","@hashicorp/design-system-components/components/hds/form/helper-text/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/indicator/index",["exports","@hashicorp/design-system-components/components/hds/form/indicator/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/label/index",["exports","@hashicorp/design-system-components/components/hds/form/label/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/legend/index",["exports","@hashicorp/design-system-components/components/hds/form/legend/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/radio-card/description",["exports","@hashicorp/design-system-components/components/hds/form/radio-card/description"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/radio-card/group",["exports","@hashicorp/design-system-components/components/hds/form/radio-card/group"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/radio-card/index",["exports","@hashicorp/design-system-components/components/hds/form/radio-card/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/radio-card/label",["exports","@hashicorp/design-system-components/components/hds/form/radio-card/label"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/radio/base",["exports","@hashicorp/design-system-components/components/hds/form/radio/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/radio/field",["exports","@hashicorp/design-system-components/components/hds/form/radio/field"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/radio/group",["exports","@hashicorp/design-system-components/components/hds/form/radio/group"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/select/base",["exports","@hashicorp/design-system-components/components/hds/form/select/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/select/field",["exports","@hashicorp/design-system-components/components/hds/form/select/field"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/text-input/base",["exports","@hashicorp/design-system-components/components/hds/form/text-input/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/text-input/field",["exports","@hashicorp/design-system-components/components/hds/form/text-input/field"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/textarea/base",["exports","@hashicorp/design-system-components/components/hds/form/textarea/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/textarea/field",["exports","@hashicorp/design-system-components/components/hds/form/textarea/field"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/toggle/base",["exports","@hashicorp/design-system-components/components/hds/form/toggle/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/toggle/field",["exports","@hashicorp/design-system-components/components/hds/form/toggle/field"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/form/toggle/group",["exports","@hashicorp/design-system-components/components/hds/form/toggle/group"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/icon-tile/index",["exports","@hashicorp/design-system-components/components/hds/icon-tile/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
-define("consul-ui/components/hds/interactive/index",["exports","@hashicorp/design-system-components/components/hds/interactive/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/link/inline",["exports","@hashicorp/design-system-components/components/hds/link/inline"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/link/standalone",["exports","@hashicorp/design-system-components/components/hds/link/standalone"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/modal/body",["exports","@hashicorp/design-system-components/components/hds/modal/body"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/modal/footer",["exports","@hashicorp/design-system-components/components/hds/modal/footer"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/modal/header",["exports","@hashicorp/design-system-components/components/hds/modal/header"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/modal/index",["exports","@hashicorp/design-system-components/components/hds/modal/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/pagination/compact/index",["exports","@hashicorp/design-system-components/components/hds/pagination/compact/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/pagination/info",["exports","@hashicorp/design-system-components/components/hds/pagination/info"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/pagination/nav/arrow",["exports","@hashicorp/design-system-components/components/hds/pagination/nav/arrow"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/pagination/nav/ellipsis",["exports","@hashicorp/design-system-components/components/hds/pagination/nav/ellipsis"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/pagination/nav/number",["exports","@hashicorp/design-system-components/components/hds/pagination/nav/number"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/pagination/numbered/index",["exports","@hashicorp/design-system-components/components/hds/pagination/numbered/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/pagination/size-selector",["exports","@hashicorp/design-system-components/components/hds/pagination/size-selector"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/stepper/step/indicator",["exports","@hashicorp/design-system-components/components/hds/stepper/step/indicator"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/stepper/task/indicator",["exports","@hashicorp/design-system-components/components/hds/stepper/task/indicator"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/table/index",["exports","@hashicorp/design-system-components/components/hds/table/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/table/td",["exports","@hashicorp/design-system-components/components/hds/table/td"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/table/th-sort",["exports","@hashicorp/design-system-components/components/hds/table/th-sort"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/table/th",["exports","@hashicorp/design-system-components/components/hds/table/th"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/table/tr",["exports","@hashicorp/design-system-components/components/hds/table/tr"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/tabs/index",["exports","@hashicorp/design-system-components/components/hds/tabs/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/tabs/panel",["exports","@hashicorp/design-system-components/components/hds/tabs/panel"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/tabs/tab",["exports","@hashicorp/design-system-components/components/hds/tabs/tab"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/tag/index",["exports","@hashicorp/design-system-components/components/hds/tag/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/toast/index",["exports","@hashicorp/design-system-components/components/hds/toast/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/hds/yield/index",["exports","@hashicorp/design-system-components/components/hds/yield/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/informed-action/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"NfQBR0Ol",block:'[[[11,0],[24,0,"informed-action"],[17,1],[12],[1,"\\n  "],[10,0],[12],[1,"\\n    "],[10,"header"],[12],[1,"\\n      "],[18,2,null],[1,"\\n    "],[13],[1,"\\n    "],[18,3,null],[1,"\\n  "],[13],[1,"\\n  "],[10,"ul"],[12],[1,"\\n    "],[18,4,[[28,[37,1],null,[["Action"],[[50,"anonymous",0,null,[["tagName"],["li"]]]]]]]],[1,"\\n  "],[13],[1,"\\n"],[13]],["&attrs","&header","&body","&actions"],false,["yield","hash","component"]]',moduleName:"consul-ui/components/informed-action/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/ivy-codemirror",["exports","ivy-codemirror/components/ivy-codemirror"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/jwt-source/index",["exports","@glimmer/component","@ember/service","consul-ui/utils/dom/event-source"],(function(e,t,n,l){var r,i,o,a,u
-function s(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function c(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let d=(r=(0,n.inject)("repository/oidc-provider"),i=(0,n.inject)("dom"),o=class extends t.default{constructor(){super(...arguments),s(this,"repo",a,this),s(this,"dom",u,this),this.source&&this.source.close(),this._listeners=this.dom.listeners(),this.source=(0,l.fromPromise)(this.repo.findCodeByURL(this.args.src)),this._listeners.add(this.source,{message:e=>this.onchange(e),error:e=>this.onerror(e)})}onchange(e){"function"==typeof this.args.onchange&&this.args.onchange(...arguments)}onerror(e){"function"==typeof this.args.onerror&&this.args.onerror(...arguments)}willDestroy(){super.willDestroy(...arguments),this.source&&this.source.close(),this.repo.close(),this._listeners.remove()}},a=c(o.prototype,"repo",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=c(o.prototype,"dom",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o)
-e.default=d}))
-define("consul-ui/components/list-collection/index",["exports","@ember/component","@ember/template-factory","@ember/service","@ember/object","ember-collection/components/ember-collection","ember-collection/layouts/percentage-columns","block-slots"],(function(e,t,n,l,r,i,o,a){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=(0,n.createTemplateFactory)({id:"DfcTL8bI",block:'[[[11,0],[16,0,[29,["list-collection list-collection-scroll-",[36,0]]]],[23,5,[28,[37,1],["height:",[33,2,["height"]],"px"],null]],[16,1,[36,3]],[17,1],[12],[1,"\\n"],[18,7,null],[1,"\\n"],[41,[28,[37,6],[[33,0],"virtual"],null],[[[1,"  "],[1,[28,[35,7],["resize",[28,[37,8],[[30,0],"resize"],null]],null]],[1,"\\n  "],[8,[39,9],null,[["@tagName","@content-size","@scroll-left","@scroll-top","@scrollChange","@clientSizeChange"],["ul",[99,10,["@content-size"]],[99,11,["@scroll-left"]],[99,12,["@scroll-top"]],[28,[37,8],[[30,0],"scrollChange"],null],[28,[37,8],[[30,0],"clientSizeChange"],null]]],[["default"],[[[[1,"\\n      "],[10,"li"],[12],[13],[42,[28,[37,14],[[28,[37,14],[[33,15]],null]],null],null,[[[10,"li"],[15,"onclick",[28,[37,8],[[30,0],"click"],null]],[22,5,[30,2,["style"]]],[15,0,[52,[33,16],[52,[28,[37,17],[[33,16]],[["item"],[[30,2,["item"]]]]],"linkable"]]],[12],[1,"\\n        "],[8,[39,18],null,[["@name"],["header"]],[["default"],[[[[10,0],[14,0,"header"],[12],[18,7,[[30,2,["item"]],[30,2,["index"]]]],[13]],[]]]]],[1,"\\n        "],[8,[39,18],null,[["@name"],["details"]],[["default"],[[[[10,0],[14,0,"detail"],[12],[18,7,[[30,2,["item"]],[30,2,["index"]]]],[13]],[]]]]],[1,"\\n        "],[8,[39,18],null,[["@name","@params"],["actions",[28,[37,19],[[50,"more-popover-menu",0,null,[["expanded","onchange"],[[52,[28,[37,6],[[33,21],[30,2,["index"]]],null],true,false],[28,[37,8],[[30,0],"change",[30,2,["index"]]],null]]]]],null]]],[["default"],[[[[1,"\\n          "],[10,0],[14,0,"actions"],[12],[1,"\\n            "],[18,7,[[30,2,["item"]],[30,2,["index"]]]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n      "],[13]],[2]],null]],[]]]]],[1,"\\n"]],[]],[[[44,[[52,[28,[37,23],[[33,24],[28,[37,25],[[30,0,["expand"]]],null]],null],[28,[37,26],[0,[33,24],[33,27]],null],[33,27]]],[[[1,"  "],[10,"ul"],[12],[1,"\\n    "],[10,"li"],[14,5,"display: none;"],[12],[13],[42,[28,[37,14],[[28,[37,14],[[30,3]],null]],null],null,[[[10,"li"],[15,"onclick",[28,[37,8],[[30,0],"click"],null]],[15,0,[52,[28,[37,25],[[33,16]],null],"linkable",[52,[28,[37,17],[[33,16]],[["item"],[[33,28,["item"]]]]],"linkable"]]],[12],[1,"\\n        "],[8,[39,18],null,[["@name"],["header"]],[["default"],[[[[10,0],[14,0,"header"],[12],[18,7,[[30,4],[30,5]]],[13]],[]]]]],[1,"\\n        "],[8,[39,18],null,[["@name"],["details"]],[["default"],[[[[10,0],[14,0,"detail"],[12],[18,7,[[30,4],[30,5]]],[13]],[]]]]],[1,"\\n        "],[8,[39,18],null,[["@name","@params"],["actions",[28,[37,19],[[50,"more-popover-menu",0,null,[["onchange"],[[28,[37,8],[[30,0],"change",[30,5]],null]]]]],null]]],[["default"],[[[[1,"\\n          "],[10,0],[14,0,"actions"],[12],[1,"\\n            "],[18,7,[[30,4],[30,5]]],[1,"\\n          "],[13],[1,"\\n        "]],[]]]]],[1,"\\n      "],[13]],[4,5]],null],[13],[1,"\\n"],[41,[28,[37,23],[[33,24],[28,[37,29],[[33,27,["length"]],[33,24]],null]],null],[[[44,[[28,[37,30],[[30,3,["length"]],[33,27,["length"]]],null]],[[[1,"  "],[10,"button"],[15,0,[52,[30,6],"closed"]],[15,"onclick",[28,[37,8],[[30,0],[28,[37,31],[[30,0,["expand"]]],null],[30,6]],null]],[14,4,"button"],[12],[1,"\\n"],[41,[30,6],[[[1,"      View "],[1,[28,[35,32],[[33,27,["length"]],[30,3,["length"]]],null]],[1," more\\n"]],[]],[[[1,"      View less\\n"]],[]]],[1,"  "],[13],[1,"\\n"]],[6]]]],[]],null]],[3]]],[1,"\\n"]],[]]],[13]],["&attrs","cell","slice","item","index","more","&default"],false,["scroll","concat","style","guid","yield","if","eq","on-window","action","ember-native-scrollable","_contentSize","_scrollLeft","_scrollTop","each","-track-array","_cells","linkable","is","yield-slot","block-params","component","checked","let","and","partial","not","slice","items","cell","gt","not-eq","mut","sub"]]',moduleName:"consul-ui/components/list-collection/index.hbs",isStrictMode:!1}),s=o.default.prototype.formatItemStyle
-var c=(0,t.setComponentTemplate)(u,i.default.extend(a.default,{dom:(0,l.inject)("dom"),tagName:"",height:500,cellHeight:70,checked:null,scroll:"virtual",init:function(){this._super(...arguments),this.columns=[100],this.guid=this.dom.guid(this)},didInsertElement:function(){this._super(...arguments),this.$element=this.dom.element(`#${this.guid}`),"virtual"===this.scroll&&this.actions.resize.apply(this,[{target:this.dom.viewport()}])},didReceiveAttrs:function(){this._super(...arguments),this._cellLayout=this["cell-layout"]=new o.default((0,r.get)(this,"items.length"),(0,r.get)(this,"columns"),(0,r.get)(this,"cellHeight"))
-const e=this
-this["cell-layout"].formatItemStyle=function(t){let n=s.apply(this,arguments)
-return e.checked===t&&(n=`${n};z-index: 1`),n}},style:(0,r.computed)("height",(function(){return"virtual"!==this.scroll?{}:{height:(0,r.get)(this,"height")}})),actions:{resize:function(e){const t=(0,r.get)(this,"dom").element('footer[role="contentinfo"]')
-if(t){const n=1,l=this.$element.getBoundingClientRect().top+t.clientHeight+n,r=e.target.innerHeight-l
-this.set("height",Math.max(0,r)),this.updateItems(),this.updateScrollPosition()}},click:function(e){return this.dom.clickFirstAnchor(e,".list-collection > ul > li")},change:function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-if(t.target.checked&&e!==(0,r.get)(this,"checked")){(0,r.set)(this,"checked",parseInt(e)),this.$row=this.dom.closest("li",t.target),this.$row.style.zIndex=1
-const n=this.dom.sibling(t.target,"div")
-n.getBoundingClientRect().top+n.clientHeight>this.dom.element('footer[role="contentinfo"]').getBoundingClientRect().top?n.classList.add("above"):n.classList.remove("above")}else{this.dom.sibling(t.target,"div").classList.remove("above"),(0,r.set)(this,"checked",null),this.$row.style.zIndex=null}}}}))
-e.default=c})),define("consul-ui/components/maybe-in-element",["exports","ember-maybe-in-element/components/maybe-in-element"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/menu-panel/index",["exports","@ember/component","@ember/template-factory","@ember/service","@ember/runloop","@ember/object","block-slots"],(function(e,t,n,l,r,i,o){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const a=(0,n.createTemplateFactory)({id:"wAfNxT0t",block:'[[[18,3,null],[1,"\\n"],[44,[[28,[37,2],null,[["change"],[[28,[37,3],[[30,0],"change"],null]]]]],[[[11,0],[16,0,[28,[37,4],[[28,[37,5],["menu-panel"],null],[28,[37,5],["menu-panel-deprecated"],null],[28,[37,5],[[33,6]],null],[28,[37,5],[[33,7],"confirmation"],null]],null]],[4,[38,8],[[28,[37,3],[[30,0],"connect"],null]],null],[12],[1,"\\n  "],[8,[39,9],null,[["@name"],["controls"]],[["default"],[[[[1,"\\n    "],[18,3,[[30,1]]],[1,"\\n  "]],[]]]]],[1,"\\n"],[6,[39,9],null,[["name"],["header"]],[["default","else"],[[[[1,"    "],[10,0],[12],[1,"\\n      "],[18,3,[[30,1]]],[1,"\\n    "],[13],[1,"\\n"]],[]],[[],[]]]]],[1,"  "],[11,"ul"],[24,"role","menu"],[17,2],[12],[1,"\\n    "],[8,[39,9],null,[["@name"],["menu"]],[["default"],[[[[1,"\\n      "],[18,3,[[30,1]]],[1,"\\n    "]],[]]]]],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n"]],[1]]]],["api","&attrs","&default"],false,["yield","let","hash","action","class-map","array","position","isConfirmation","did-insert","yield-slot"]]',moduleName:"consul-ui/components/menu-panel/index.hbs",isStrictMode:!1})
-var u=(0,t.setComponentTemplate)(a,t.default.extend(o.default,{tagName:"",dom:(0,l.inject)("dom"),isConfirmation:!1,actions:{connect:function(e){(0,r.next)((()=>{if(!this.isDestroyed){const t=this.dom.element('li:only-child > [role="menu"]:first-child',e);(0,i.set)(this,"isConfirmation",void 0!==t)}}))},change:function(e){const t=e.target.getAttribute("id"),n=this.dom.element(`[for='${t}']`),l=this.dom.element("[role=menu]",n.parentElement),r=this.dom.closest(".menu-panel",l)
-if(e.target.checked){l.style.display="block"
-const e=l.offsetHeight+2
-r.style.maxHeight=r.style.minHeight=`${e}px`}else l.style.display=null,r.style.maxHeight=null,r.style.minHeight="0"}}}))
-e.default=u})),define("consul-ui/components/menu/action/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"tJ7CAUii",block:'[[[8,[39,0],[[24,"role","menuitem"],[17,1],[4,[38,1],["click",[52,[30,2],[30,4,["close"]],[28,[37,3],null,null]]],null]],[["@href","@external"],[[30,2],[30,3]]],[["default"],[[[[1,"\\n  "],[18,5,null],[1,"\\n"]],[]]]]],[1,"\\n"]],["&attrs","@href","@external","@disclosure","&default"],false,["action","on","if","noop","yield"]]',moduleName:"consul-ui/components/menu/action/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/menu/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"6Fvyg+h9",block:'[[[11,"ul"],[24,"role","menu"],[23,5,[28,[37,0],[[28,[37,1],["height",[52,[28,[37,3],[[30,1],[28,[37,4],[[30,1,["type"]],"native-scroll"],null]],null],[30,1,["totalHeight"]]],"px"],null],[28,[37,1],["--paged-start",[52,[28,[37,3],[[30,1],[28,[37,4],[[30,1,["type"]],"native-scroll"],null]],null],[30,1,["startHeight"]]],"px"],null]],null]],[4,[38,5],[[28,[37,6],[[30,1,["pane"]]],null]],null],[4,[38,7],null,[["onclose","openEvent"],[[28,[37,8],[[30,2],[30,3,["close"]]],null],[28,[37,8],[[30,4],[30,3,["event"]]],null]]]],[12],[1,"\\n  "],[18,5,[[28,[37,10],null,[["Action","Item","Separator","items"],[[50,"menu/action",0,null,[["disclosure"],[[30,3]]]],[50,"menu/item",0,null,null],[50,"menu/separator",0,null,null],[30,1,["items"]]]]]]],[1,"\\n"],[13]],["@pager","@onclose","@disclosure","@event","&default"],false,["style-map","array","if","and","not-eq","did-insert","optional","aria-menu","or","yield","hash","component"]]',moduleName:"consul-ui/components/menu/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/menu/item/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"xyqbyNJ6",block:'[[[11,"li"],[24,"role","none"],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13],[1,"\\n\\n"]],["&attrs","&default"],false,["yield"]]',moduleName:"consul-ui/components/menu/item/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/menu/separator/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"5tMGOxru",block:'[[[11,"li"],[24,"role","separator"],[17,1],[12],[18,2,null],[13],[1,"\\n"]],["&attrs","&default"],false,["yield"]]',moduleName:"consul-ui/components/menu/separator/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/modal-dialog/index",["exports","@ember/component","@ember/template-factory","@ember/object","block-slots","a11y-dialog","@ember/runloop"],(function(e,t,n,l,r,i,o){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const a=(0,n.createTemplateFactory)({id:"LycjAwp+",block:'[[[44,[[28,[37,1],null,[["labelledby"],[[28,[37,2],null,null]]]]],[[[1,"  "],[8,[39,3],null,[["@target"],["modal"]],[["default"],[[[[1,"\\n    "],[18,4,null],[1,"\\n    "],[11,0],[24,0,"modal-dialog"],[24,"aria-hidden","true"],[17,2],[4,[38,5],[[28,[37,6],[[30,0],"connect"],null]],null],[4,[38,7],[[28,[37,6],[[30,0],"disconnect"],null]],null],[12],[1,"\\n      "],[10,0],[14,"tabindex","-1"],[14,"data-a11y-dialog-hide",""],[12],[13],[1,"\\n      "],[10,0],[14,0,"modal-dialog-modal"],[14,"role","dialog"],[15,"aria-label",[30,3,["label"]]],[12],[1,"\\n        "],[10,0],[14,"role","document"],[12],[1,"\\n          "],[10,"header"],[14,0,"modal-dialog-header"],[12],[1,"\\n            "],[8,[39,8],[[24,"data-a11y-dialog-hide",""]],[["@text","@color","@icon","@size","@isIconOnly"],["Close dialog","secondary","x","small",true]],null],[1,"\\n            "],[8,[39,9],null,[["@name"],["header"]],[["default"],[[[[1,"\\n              "],[18,4,[[28,[37,1],null,[["open","close","opened","aria"],[[28,[37,6],[[30,0],"open"],null],[28,[37,6],[[30,0],"close"],null],[30,0,["isOpen"]],[30,1]]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n          "],[10,0],[14,0,"modal-dialog-body"],[12],[1,"\\n            "],[8,[39,9],null,[["@name"],["body"]],[["default"],[[[[1,"\\n              "],[18,4,[[28,[37,1],null,[["open","close","opened","aria"],[[28,[37,6],[[30,0],"open"],null],[28,[37,6],[[30,0],"close"],null],[30,0,["isOpen"]],[30,1]]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n          "],[10,"footer"],[14,0,"modal-dialog-footer"],[12],[1,"\\n            "],[8,[39,9],null,[["@name","@params"],["actions",[28,[37,10],[[28,[37,6],[[30,0],"close"],null]],null]]],[["default"],[[[[1,"\\n              "],[18,4,[[28,[37,1],null,[["open","close","opened","aria"],[[28,[37,6],[[30,0],"open"],null],[28,[37,6],[[30,0],"close"],null],[30,0,["isOpen"]],[30,1]]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n  "]],[]]]]],[1,"\\n"]],[1]]]],["aria","&attrs","@aria","&default"],false,["let","hash","unique-id","portal","yield","did-insert","action","will-destroy","hds/button","yield-slot","block-params"]]',moduleName:"consul-ui/components/modal-dialog/index.hbs",isStrictMode:!1})
-var u=(0,t.setComponentTemplate)(a,t.default.extend(r.default,{tagName:"",onclose:function(){},onopen:function(){},isOpen:!1,actions:{connect:function(e){this.dialog=new i.default(e),this.dialog.on("hide",(()=>{(0,o.schedule)("afterRender",(e=>(0,l.set)(this,"isOpen",!1))),this.onclose({target:e})})),this.dialog.on("show",(()=>{(0,l.set)(this,"isOpen",!0),this.onopen({target:e})})),this.open&&this.actions.open.apply(this,[])},disconnect:function(e){this.dialog.destroy()},open:function(){this.dialog.show()},close:function(){this.dialog.hide()}}}))
-e.default=u})),define("consul-ui/components/modal-layer/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"6vWxczPc",block:'[[[11,0],[24,0,"modal-layer"],[17,1],[12],[1,"\\n  "],[8,[39,0],null,[["@name","@multiple"],["modal",true]],null],[1,"\\n"],[13],[1,"\\n"]],["&attrs"],false,["portal-target"]]',moduleName:"consul-ui/components/modal-layer/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/more-popover-menu/index",["exports","@ember/component","@ember/template-factory"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,n.createTemplateFactory)({id:"9USQK1Le",block:'[[[11,0],[24,0,"more-popover-menu"],[17,1],[12],[1,"\\n  "],[8,[39,0],null,[["@expanded","@onchange","@keyboardAccess"],[[99,1,["@expanded"]],[28,[37,2],[[30,0],[33,3]],null],false]],[["default"],[[[[1,"\\n    "],[8,[39,4],null,[["@name"],["trigger"]],[["default"],[[[[1,"\\n      More\\n    "]],[]]]]],[1,"\\n    "],[8,[39,4],null,[["@name"],["menu"]],[["default"],[[[[1,"\\n      "],[18,4,[[30,2,["MenuItem"]]]],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[2,3]]]]],[1,"\\n"],[13],[1,"\\n"]],["&attrs","components","api","&default"],false,["popover-menu","expanded","action","onchange","block-slot","yield"]]',moduleName:"consul-ui/components/more-popover-menu/index.hbs",isStrictMode:!1})
-var r=(0,t.setComponentTemplate)(l,t.default.extend({tagName:""}))
-e.default=r})),define("consul-ui/components/oidc-select/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={id:"oidc-select",initial:"idle",on:{RESET:[{target:"idle"}]},states:{idle:{on:{LOAD:[{target:"loading"}]}},loaded:{},loading:{on:{SUCCESS:[{target:"loaded"}]}}}}})),define("consul-ui/components/oidc-select/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","consul-ui/components/oidc-select/chart.xstate"],(function(e,t,n,l,r,i){var o,a
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=(0,n.createTemplateFactory)({id:"1JjkWJfY",block:'[[[8,[39,0],null,[["@src"],[[99,1,["@src"]]]],[["default"],[[[[1,"\\n"],[44,[[28,[37,3],null,[["State","Guard","Action","dispatch","state"],[[30,1],[30,2],[30,3],[30,4],[30,5]]]]],[[[1,"\\n    "],[11,0],[24,0,"oidc-select"],[17,7],[12],[1,"\\n      "],[8,[30,1],null,[["@notMatches"],["idle"]],[["default"],[[[[1,"\\n        "],[8,[39,4],null,[["@src","@onchange","@onerror"],[[28,[37,5],["/${partition}/${nspace}/${dc}/oidc/providers",[28,[37,3],null,[["partition","nspace","dc"],[[30,0,["partition"]],[30,8],[30,9]]]]],null],[28,[37,6],[[28,[37,7],[[30,0],[28,[37,8],[[30,0,["items"]]],null]],[["value"],["data"]]],[28,[37,9],[[30,4],"SUCCESS"],null]],null],[28,[37,6],[[28,[37,9],[[30,4],"RESET"],null],[30,10]],null]]],null],[1,"\\n      "]],[]]]]],[1,"\\n\\n      "],[8,[30,1],null,[["@matches"],["loaded"]],[["default"],[[[[1,"\\n        "],[8,[39,7],[[24,0,"reset"],[4,[38,10],["click",[28,[37,6],[[28,[37,11],[[30,0],"partition",""],null],[28,[37,9],[[30,4],"RESET"],null]],null]],null]],null,[["default"],[[[[1,"\\n          Choose different Partition\\n        "]],[]]]]],[1,"\\n      "]],[]]]]],[1,"\\n\\n      "],[8,[39,0],null,[["@src"],[[28,[37,0],["validate"],null]]],[["default"],[[[[1,"\\n        "],[8,[39,12],null,[["@name","@label","@item","@validations","@placeholder","@oninput","@chart"],["partition","Admin Partition",[30,0],[28,[37,3],null,[["partition"],[[28,[37,13],[[28,[37,3],null,[["test","error"],["^[a-zA-Z0-9]([a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?$","Name must be a valid DNS hostname."]]]],null]]]],"Enter your Partition",[28,[37,7],[[30,0],[28,[37,8],[[30,0,["partition"]]],null]],[["value"],["target.value"]]],[28,[37,3],null,[["state","dispatch"],[[30,15],[30,14]]]]]],null],[1,"\\n\\n"],[1,"        "],[8,[30,1],null,[["@matches"],["idle"]],[["default"],[[[[1,"\\n          "],[8,[39,14],[[16,"disabled",[28,[37,15],[[28,[37,16],[[30,0,["partition","length"]],1],null],[28,[37,17],[[30,15],"error"],null]],null]],[24,4,"submit"],[4,[38,10],["click",[28,[37,9],[[30,4],"LOAD"],null]],null]],[["@text"],["Choose provider"]],null],[1,"\\n        "]],[]]]]],[1,"\\n\\n      "]],[11,12,13,14,15]]]]],[1,"\\n\\n      "],[8,[30,1],null,[["@matches"],["loading"]],[["default"],[[[[1,"\\n        "],[8,[39,18],[[24,"aria-label","Loading"]],null,null],[1,"\\n      "]],[]]]]],[1,"\\n\\n      "],[8,[30,1],null,[["@matches"],["loaded"]],[["default"],[[[[1,"\\n"],[41,[28,[37,16],[[30,0,["items","length"]],3],null],[[[1,"\\n          "],[10,"ul"],[12],[1,"\\n"],[42,[28,[37,21],[[28,[37,21],[[30,0,["items"]]],null]],null],null,[[[1,"              "],[10,"li"],[12],[1,"\\n                "],[8,[39,7],[[16,0,[28,[37,22],[[30,16,["Kind"]],"-oidc-provider"],null]],[16,"disabled",[30,17]],[4,[38,10],["click",[28,[37,9],[[30,18],[30,16]],null]],null]],[["@type"],["button"]],[["default"],[[[[1,"\\n                  Continue with\\n                  "],[1,[28,[35,15],[[30,16,["DisplayName"]],[30,16,["Name"]]],null]],[41,[28,[37,23],[[30,16,["Namespace"]],"default"],null],[[[1,"\\n                    ("],[1,[30,16,["Namespace"]]],[1,")"]],[]],null],[1,"\\n                "]],[]]]]],[1,"\\n              "],[13],[1,"\\n"]],[16]],null],[1,"          "],[13],[1,"\\n\\n"]],[]],[[[1,"\\n"],[44,[[28,[37,15],[[30,0,["provider"]],[28,[37,24],[0,[30,0,["items"]]],null]],null]],[[[1,"\\n            "],[8,[39,25],null,[["@label","@name","@item","@selected","@items","@onchange","@disabled"],["SSO Provider","provider",[30,0],[30,19],[30,0,["items"]],[28,[37,7],[[30,0],[28,[37,8],[[30,0,["provider"]]],null]],null],[30,17]]],[["option"],[[[[1,"\\n                "],[10,1],[15,0,[28,[37,22],[[30,20,["item","Kind"]],"-oidc-provider"],null]],[12],[1,"\\n                  "],[1,[28,[35,15],[[30,20,["item","DisplayName"]],[30,20,["item","Name"]]],null]],[41,[28,[37,23],[[30,20,["item","Namespace"]],"default"],null],[[[1," ("],[1,[30,20,["item","Namespace"]]],[1,")"]],[]],null],[1,"\\n                "],[13],[1,"\\n              "]],[20]]]]],[1,"\\n\\n          "],[8,[39,14],[[16,"disabled",[30,17]],[4,[38,10],["click",[28,[37,9],[[30,18],[30,19]],null]],null]],[["@color","@text"],["primary","Log in"]],null],[1,"\\n"]],[19]]]],[]]],[1,"      "]],[]]]]],[1,"\\n    "],[13],[1,"\\n"]],[6]]]],[1,2,3,4,5]]]]],[1,"\\n"]],["State","Guard","ChartAction","dispatch","state","chart","&attrs","@nspace","@dc","@onerror","ignoredState","ignoredGuard","ignoredAction","formDispatch","state","item","@disabled","@onchange","item","option"],false,["state-chart","chart","let","hash","data-source","uri","queue","action","mut","fn","on","set","text-input","array","hds/button","or","lt","state-matches","progress","if","each","-track-array","concat","not-eq","object-at","option-input"]]',moduleName:"consul-ui/components/oidc-select/index.hbs",isStrictMode:!1})
-let s=(o=class extends l.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="partition",l=this,(n=a)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),this.chart=i.default,this.args.partition&&(this.partition=this.args.partition)}},c=o.prototype,d="partition",p=[r.tracked],f={configurable:!0,enumerable:!0,writable:!0,initializer:function(){return"default"}},h={},Object.keys(f).forEach((function(e){h[e]=f[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=p.slice().reverse().reduce((function(e,t){return t(c,d,e)||e}),h),m&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(m):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(c,d,h),h=null),a=h,o)
-var c,d,p,f,m,h
-e.default=s,(0,t.setComponentTemplate)(u,s)})),define("consul-ui/components/option-input/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"hk9fkczL",block:'[[[8,[39,0],[[24,0,"option-input type-select"],[17,1]],[["@item","@placeholder","@name","@label","@help","@validations","@chart"],[[30,2],[30,3],[30,4],[30,5],[30,6],[30,7],[30,8]]],[["label","input"],[[[[1,"\\n"],[1,"    "],[1,[28,[35,1],[[30,5],[30,4]],null]],[1,"\\n  "]],[]],[[[1,"\\n"],[41,[30,9],[[[41,[30,10],[[],[]],[[],[]]]],[]],[[[1,"      "],[8,[39,3],null,[["@disabled","@onChange","@selected","@searchEnabled","@options"],[[30,11],[30,12],[30,13],false,[30,14]]],[["default"],[[[[1,"\\n        "],[18,16,[[28,[37,5],null,[["item"],[[30,15]]]]]],[1,"\\n      "]],[15]]]]],[1,"\\n"]],[]]],[1,"  "]],[]]]]],[1,"\\n"]],["&attrs","@item","@placeholder","@name","@label","@help","@validations","@chart","@expanded","@multiple","@disabled","@onchange","@selected","@items","item","&option"],false,["form-input","or","if","power-select","yield","hash"]]',moduleName:"consul-ui/components/option-input/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/outlet/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object","@ember/service"],(function(e,t,n,l,r,i,o){var a,u,s,c,d,p,f,m,h,b,y
-function g(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function v(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const O=(0,n.createTemplateFactory)({id:"X7pi+rvm",block:'[[[1,[28,[35,0],[[30,0,["connect"]]],null]],[1,"\\n"],[1,[28,[35,1],[[30,0,["disconnect"]]],null]],[1,"\\n"],[11,"section"],[24,0,"outlet"],[16,"data-outlet",[30,1]],[16,"data-route",[30,0,["routeName"]]],[16,"data-state",[30,0,["state","name"]]],[16,"data-transition",[28,[37,2],[[30,0,["previousState","name"]]," ",[30,0,["state","name"]]],null]],[4,[38,0],[[28,[37,3],[[30,0,["attributeChanged"]],"element"],null]],null],[4,[38,4],[[28,[37,3],[[30,0,["attributeChanged"]],"model",[30,2]],null]],null],[4,[38,5],["transitionend",[30,0,["transitionEnd"]]],null],[12],[1,"\\n  "],[18,3,[[28,[37,7],null,[["state","previousState","route"],[[30,0,["state"]],[30,0,["previousState"]],[30,0,["route"]]]]]]],[1,"\\n"],[13]],["@name","@model","&default"],false,["did-insert","will-destroy","concat","fn","did-update","on","yield","hash"]]',moduleName:"consul-ui/components/outlet/index.hbs",isStrictMode:!1})
-class P{constructor(e){this.name=e}matches(e){return this.name===e}}let x=(a=(0,o.inject)("routlet"),u=(0,o.inject)("router"),s=class extends l.default{constructor(){super(...arguments),g(this,"routlet",c,this),g(this,"router",d,this),g(this,"element",p,this),g(this,"routeName",f,this),g(this,"state",m,this),g(this,"previousState",h,this),g(this,"endTransition",b,this),g(this,"route",y,this)}get model(){return this.args.model||{}}get name(){return this.args.name}setAppRoute(e){if("loading"!==e||"oidc-provider-debug"===e){const t=this.element.ownerDocument.documentElement
-t.classList.contains("ember-loading")&&t.classList.remove("ember-loading"),t.dataset.route=e,this.setAppState("idle")}}setAppState(e){this.element.ownerDocument.documentElement.dataset.state=e}attributeChanged(e,t){switch(e){case"element":this.element=t,"application"===this.args.name&&(this.setAppState("loading"),this.setAppRoute(this.router.currentRouteName))
-break
-case"model":void 0!==this.route&&(this.route._model=t)}}transitionEnd(e){"function"==typeof this.endTransition&&this.endTransition()}startLoad(e){const t=this.routlet.findOutlet(e.to.name)||"application"
-if(this.args.name===t){let e
-this.previousState=this.state,this.state=new P("loading"),this.endTransition=this.routlet.transition(),e=this.element?window.getComputedStyle(this.element).getPropertyValue("transition-duration"):0,0===parseFloat(e)&&this.endTransition()}"application"===this.args.name&&this.setAppState("loading")}endLoad(e){this.state.matches("loading")&&(this.previousState=this.state,this.state=new P("idle")),"application"===this.args.name&&this.setAppRoute(this.router.currentRouteName)}connect(){this.routlet.addOutlet(this.args.name,this),this.previousState=this.state=new P("idle"),this.router.on("routeWillChange",this.startLoad),this.router.on("routeDidChange",this.endLoad)}disconnect(){this.routlet.removeOutlet(this.args.name),this.router.off("routeWillChange",this.startLoad),this.router.off("routeDidChange",this.endLoad)}},c=v(s.prototype,"routlet",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=v(s.prototype,"router",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=v(s.prototype,"element",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=v(s.prototype,"routeName",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=v(s.prototype,"state",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=v(s.prototype,"previousState",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=v(s.prototype,"endTransition",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=v(s.prototype,"route",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v(s.prototype,"attributeChanged",[i.action],Object.getOwnPropertyDescriptor(s.prototype,"attributeChanged"),s.prototype),v(s.prototype,"transitionEnd",[i.action],Object.getOwnPropertyDescriptor(s.prototype,"transitionEnd"),s.prototype),v(s.prototype,"startLoad",[i.action],Object.getOwnPropertyDescriptor(s.prototype,"startLoad"),s.prototype),v(s.prototype,"endLoad",[i.action],Object.getOwnPropertyDescriptor(s.prototype,"endLoad"),s.prototype),v(s.prototype,"connect",[i.action],Object.getOwnPropertyDescriptor(s.prototype,"connect"),s.prototype),v(s.prototype,"disconnect",[i.action],Object.getOwnPropertyDescriptor(s.prototype,"disconnect"),s.prototype),s)
-e.default=x,(0,t.setComponentTemplate)(O,x)})),define("consul-ui/components/paged-collection/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@glimmer/tracking","@ember/runloop"],(function(e,t,n,l,r,i,o){var a,u,s,c,d,p,f,m
-function h(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function b(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const y=(0,n.createTemplateFactory)({id:"4n2jhP/a",block:'[[[18,2,[[28,[37,1],null,[["items","page","pane","resize","viewport","rowHeight","maxHeight","startHeight","totalHeight","totalPages","Pager"],[[30,0,["items"]],[30,1],[28,[37,2],[[30,0,["setPane"]]],null],[28,[37,2],[[30,0,["resize"]]],null],[28,[37,2],[[30,0,["setViewport"]]],null],[28,[37,2],[[30,0,["setRowHeight"]]],null],[28,[37,2],[[30,0,["setMaxHeight"]]],null],[30,0,["startHeight"]],[30,0,["totalHeight"]],[30,0,["totalPages"]],[52,[28,[37,4],[[33,5],"index"],null],[50,"yield",0,null,null],""]]]]]],[1,"\\n\\n"],[1,[28,[35,7],[[30,0,["disconnect"]]],null]],[1,"\\n"]],["@page","&default"],false,["yield","hash","fn","if","eq","type","component","will-destroy"]]',moduleName:"consul-ui/components/paged-collection/index.hbs",isStrictMode:!1})
-let g=(a=class extends l.default{constructor(){super(...arguments),h(this,"$pane",u,this),h(this,"$viewport",s,this),h(this,"top",c,this),h(this,"visibleItems",d,this),h(this,"overflow",p,this),h(this,"_rowHeight",f,this),h(this,"_type",m,this)}get type(){return this.args.type||this._type}get items(){return this.args.items.slice(this.cursor,this.cursor+this.perPage)}get perPage(){switch(this.type){case"virtual-scroll":return this.visibleItems+2*this.overflow
-case"index":return parseInt(this.args.perPage)}return this.total}get cursor(){switch(this.type){case"virtual-scroll":return this.itemsBefore
-case"index":return(parseInt(this.args.page)-1)*this.perPage}return 0}get itemsBefore(){return void 0===this.$viewport?0:Math.max(0,Math.round(this.top/this.rowHeight)-this.overflow)}get rowHeight(){return parseFloat(this.args.rowHeight||this._rowHeight)}get startHeight(){switch(this.type){case"virtual-scroll":return Math.min(this.totalHeight,this.itemsBefore*this.rowHeight)
-case"index":return 0}return 0}get totalHeight(){return this.total*this.rowHeight}get totalPages(){return Math.ceil(this.total/this.perPage)}get total(){return this.args.items.length}scroll(e){this.top=this.$viewport.scrollTop}resize(){this.$viewport.clientHeight>0&&this.rowHeight>0?this.visibleItems=Math.ceil(this.$viewport.clientHeight/this.rowHeight):this.visibleItems=0}setViewport(e){this.$viewport="html"===e?[...document.getElementsByTagName("html")][0]:e,this.$viewport.addEventListener("scroll",this.scroll),"html"===e&&this.$viewport.addEventListener("resize",this.resize),this.scroll(),this.resize()}setPane(e){this.$pane=e}setRowHeight(e){this._rowHeight=parseFloat(e)}setMaxHeight(e){(0,o.scheduleOnce)("actions",this,"_setMaxHeight")}_setMaxHeight(e){const t=parseFloat(e)
-isNaN(t)||(this._type="virtual-scroll")}disconnect(){this.$viewport.removeEventListener("scroll",this.scroll),this.$viewport.removeEventListener("resize",this.resize)}},u=b(a.prototype,"$pane",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=b(a.prototype,"$viewport",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=b(a.prototype,"top",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return 0}}),d=b(a.prototype,"visibleItems",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return 0}}),p=b(a.prototype,"overflow",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return 10}}),f=b(a.prototype,"_rowHeight",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return 0}}),m=b(a.prototype,"_type",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return"native-scroll"}}),b(a.prototype,"scroll",[r.action],Object.getOwnPropertyDescriptor(a.prototype,"scroll"),a.prototype),b(a.prototype,"resize",[r.action],Object.getOwnPropertyDescriptor(a.prototype,"resize"),a.prototype),b(a.prototype,"setViewport",[r.action],Object.getOwnPropertyDescriptor(a.prototype,"setViewport"),a.prototype),b(a.prototype,"setPane",[r.action],Object.getOwnPropertyDescriptor(a.prototype,"setPane"),a.prototype),b(a.prototype,"setRowHeight",[r.action],Object.getOwnPropertyDescriptor(a.prototype,"setRowHeight"),a.prototype),b(a.prototype,"setMaxHeight",[r.action],Object.getOwnPropertyDescriptor(a.prototype,"setMaxHeight"),a.prototype),b(a.prototype,"_setMaxHeight",[r.action],Object.getOwnPropertyDescriptor(a.prototype,"_setMaxHeight"),a.prototype),b(a.prototype,"disconnect",[r.action],Object.getOwnPropertyDescriptor(a.prototype,"disconnect"),a.prototype),a)
-e.default=g,(0,t.setComponentTemplate)(y,g)})),define("consul-ui/components/panel/index.css",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>e`
-  .panel {
-    --padding-x: 14px;
-    --padding-y: 14px;
-  }
-  .panel {
-    position: relative;
-  }
-  .panel-separator {
-    margin: 0;
-  }
-
-  .panel {
-    --tone-border: var(--token-color-palette-neutral-300);
-    border: var(--decor-border-100);
-    border-radius: var(--decor-radius-200);
-    box-shadow: var(--token-surface-high-box-shadow);
-  }
-  .panel-separator {
-    border: 0;
-    border-top: var(--decor-border-100);
-  }
-  .panel {
-    color: var(--token-color-foreground-strong);
-    background-color: var(--token-color-surface-primary);
-  }
-  .panel,
-  .panel-separator {
-    border-color: var(--tone-border);
-  }
-`})),define("consul-ui/components/peerings/badge/icon/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"gV8UFvY5",block:'[[[41,[28,[37,1],[[28,[37,2],[[30,1],"PENDING"],null],[28,[37,2],[[30,1],"ESTABLISHING"],null]],null],[[[11,"svg"],[24,"width","16"],[24,"height","16"],[24,"viewBox","0 0 16 16"],[24,"fill","none"],[24,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[17,2],[12],[1,"\\n  "],[10,"path"],[14,"fill-rule","evenodd"],[14,"clip-rule","evenodd"],[14,"d","M8 1.5C6.14798 1.5 4.47788 2.27358 3.29301 3.51732C3.0073 3.81723 2.53256 3.82874 2.23266 3.54303C1.93275 3.25732 1.92125 2.78258 2.20696 2.48268C3.66316 0.954124 5.72078 0 8 0C10.2792 0 12.3368 0.954124 13.793 2.48268C14.0788 2.78258 14.0672 3.25732 13.7673 3.54303C13.4674 3.82874 12.9927 3.81723 12.707 3.51732C11.5221 2.27358 9.85202 1.5 8 1.5ZM1.23586 5.27899C1.63407 5.39303 1.86443 5.80828 1.75039 6.20649C1.58749 6.7753 1.5 7.3768 1.5 8C1.5 11.0649 3.62199 13.636 6.47785 14.321C6.88064 14.4176 7.12885 14.8224 7.03225 15.2252C6.93565 15.628 6.53081 15.8762 6.12802 15.7796C2.61312 14.9366 0 11.7744 0 8C0 7.23572 0.107387 6.49527 0.30836 5.79351C0.422401 5.39531 0.837659 5.16494 1.23586 5.27899ZM14.7641 5.27899C15.1623 5.16494 15.5776 5.39531 15.6916 5.79351C15.8926 6.49527 16 7.23572 16 8C16 11.7744 13.3869 14.9366 9.87199 15.7796C9.4692 15.8762 9.06436 15.628 8.96775 15.2252C8.87115 14.8224 9.11936 14.4176 9.52215 14.321C12.378 13.636 14.5 11.0649 14.5 8C14.5 7.3768 14.4125 6.7753 14.2496 6.20649C14.1356 5.80828 14.3659 5.39303 14.7641 5.27899Z"],[14,"fill","#3B3D45"],[12],[13],[1,"\\n  "],[10,"path"],[14,"opacity","0.2"],[14,"fill-rule","evenodd"],[14,"clip-rule","evenodd"],[14,"d","M8 4.5C6.067 4.5 4.5 6.067 4.5 8C4.5 9.933 6.067 11.5 8 11.5C9.933 11.5 11.5 9.933 11.5 8C11.5 6.067 9.933 4.5 8 4.5ZM3 8C3 5.23858 5.23858 3 8 3C10.7614 3 13 5.23858 13 8C13 10.7614 10.7614 13 8 13C5.23858 13 3 10.7614 3 8Z"],[14,"fill","#000001"],[12],[13],[1,"\\n"],[13],[1,"\\n"]],[]],null],[41,[28,[37,2],[[30,1],"ACTIVE"],null],[[[11,"svg"],[24,"width","16"],[24,"height","16"],[24,"viewBox","0 0 16 16"],[24,"fill","none"],[24,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[17,2],[12],[1,"\\n  "],[10,"path"],[14,"d","M14.7803 4.28033C15.0732 3.98744 15.0732 3.51256 14.7803 3.21967C14.4874 2.92678 14.0126 2.92678 13.7197 3.21967L5.75 11.1893L2.28033 7.71967C1.98744 7.42678 1.51256 7.42678 1.21967 7.71967C0.926777 8.01256 0.926777 8.48744 1.21967 8.78033L5.21967 12.7803C5.51256 13.0732 5.98744 13.0732 6.28033 12.7803L14.7803 4.28033Z"],[14,"fill","#00781E"],[12],[13],[1,"\\n"],[13],[1,"\\n"]],[]],null],[41,[28,[37,2],[[30,1],"FAILING"],null],[[[11,"svg"],[24,"width","16"],[24,"height","16"],[24,"viewBox","0 0 16 16"],[24,"fill","none"],[24,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[17,2],[12],[1,"\\n  "],[10,"path"],[14,"d","M12.7803 4.28033C13.0732 3.98744 13.0732 3.51256 12.7803 3.21967C12.4874 2.92678 12.0126 2.92678 11.7197 3.21967L8 6.93934L4.28033 3.21967C3.98744 2.92678 3.51256 2.92678 3.21967 3.21967C2.92678 3.51256 2.92678 3.98744 3.21967 4.28033L6.93934 8L3.21967 11.7197C2.92678 12.0126 2.92678 12.4874 3.21967 12.7803C3.51256 13.0732 3.98744 13.0732 4.28033 12.7803L8 9.06066L11.7197 12.7803C12.0126 13.0732 12.4874 13.0732 12.7803 12.7803C13.0732 12.4874 13.0732 12.0126 12.7803 11.7197L9.06066 8L12.7803 4.28033Z"],[14,"fill","#C00005"],[12],[13],[1,"\\n"],[13],[1,"\\n"]],[]],null],[1,"\\n"],[41,[28,[37,2],[[30,1],"TERMINATED"],null],[[[11,"svg"],[24,"width","16"],[24,"height","17"],[24,"viewBox","0 0 16 17"],[24,"fill","none"],[24,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[17,2],[12],[1,"\\n  "],[10,"path"],[14,"fill-rule","evenodd"],[14,"clip-rule","evenodd"],[14,"d","M3.13889 2.55566C2.78604 2.55566 2.5 2.8417 2.5 3.19455V12.9168C2.5 13.2696 2.78604 13.5557 3.13889 13.5557H12.8611C13.214 13.5557 13.5 13.2696 13.5 12.9168V3.19455C13.5 2.8417 13.214 2.55566 12.8611 2.55566H3.13889ZM1 3.19455C1 2.01328 1.95761 1.05566 3.13889 1.05566H12.8611C14.0424 1.05566 15 2.01328 15 3.19455V12.9168C15 14.0981 14.0424 15.0557 12.8611 15.0557H3.13889C1.95761 15.0557 1 14.0981 1 12.9168V3.19455ZM4.71967 4.77533C5.01256 4.48244 5.48744 4.48244 5.78033 4.77533L8 6.995L10.2197 4.77533C10.5126 4.48244 10.9874 4.48244 11.2803 4.77533C11.5732 5.06823 11.5732 5.5431 11.2803 5.83599L9.06066 8.05566L11.2803 10.2753C11.5732 10.5682 11.5732 11.0431 11.2803 11.336C10.9874 11.6289 10.5126 11.6289 10.2197 11.336L8 9.11632L5.78033 11.336C5.48744 11.6289 5.01256 11.6289 4.71967 11.336C4.42678 11.0431 4.42678 10.5682 4.71967 10.2753L6.93934 8.05566L4.71967 5.83599C4.42678 5.5431 4.42678 5.06823 4.71967 4.77533Z"],[14,"fill","#3B3D45"],[12],[13],[1,"\\n"],[13],[1,"\\n"]],[]],null],[41,[28,[37,2],[[30,1],"UNDEFINED"],null],[[[11,"svg"],[24,"width","16"],[24,"height","16"],[24,"viewBox","0 0 16 16"],[24,"fill","none"],[24,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[17,2],[12],[1,"\\n"],[10,"path"],[14,"fill-rule","evenodd"],[14,"clip-rule","evenodd"],[14,"d","M8.1969 4.52275C7.83582 4.45975 7.46375 4.52849 7.14594 4.7185C6.82781 4.9087 6.58324 5.20915 6.45878 5.56907C6.32341 5.96054 5.89632 6.16815 5.50485 6.03278C5.11338 5.89741 4.90577 5.47032 5.04114 5.07886C5.27962 4.3892 5.75141 3.80461 6.37621 3.43106C7.00132 3.05732 7.73786 2.91999 8.45475 3.04508C9.17148 3.17015 9.81887 3.54878 10.2837 4.11048C10.7481 4.67171 11.0009 5.37994 11 6.10959C10.9999 6.59724 10.9078 7.01534 10.7254 7.37628C10.5432 7.73694 10.2936 7.9952 10.0464 8.19341C9.85239 8.34899 9.63602 8.48431 9.46464 8.59149C9.431 8.61253 9.39909 8.63248 9.36942 8.65129C9.16778 8.77916 9.02667 8.87887 8.91689 8.99055C8.81461 9.0946 8.77388 9.18682 8.75706 9.23816C8.74978 9.26038 8.74659 9.27628 8.74537 9.28347C8.72786 9.68216 8.3991 10 7.9961 10C7.58189 10 7.2461 9.66422 7.2461 9.25C7.24626 9.08689 7.28103 8.92552 7.33163 8.77109C7.41129 8.52797 7.56353 8.22758 7.84718 7.93902C8.0857 7.69637 8.35223 7.52016 8.56613 7.38452C8.61117 7.35596 8.65343 7.32942 8.69337 7.30434C8.8616 7.1987 8.98859 7.11896 9.10803 7.02318C9.24074 6.91676 9.32751 6.81683 9.38666 6.69978C9.44562 6.5831 9.49996 6.4041 9.49996 6.10918L9.49996 6.10808C9.50052 5.72536 9.36781 5.35654 9.12803 5.06677C8.88848 4.77728 8.55813 4.58578 8.1969 4.52275Z"],[14,"fill","#3B3D45"],[12],[13],[1,"\\n"],[10,"path"],[14,"d","M8 11C7.44772 11 7 11.4477 7 12C7 12.5523 7.44772 13 8 13H8.00667C8.55895 13 9.00667 12.5523 9.00667 12C9.00667 11.4477 8.55895 11 8.00667 11H8Z"],[14,"fill","#3B3D45"],[12],[13],[1,"\\n"],[10,"path"],[14,"fill-rule","evenodd"],[14,"clip-rule","evenodd"],[14,"d","M0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8ZM8 1.5C4.41015 1.5 1.5 4.41015 1.5 8C1.5 11.5899 4.41015 14.5 8 14.5C11.5899 14.5 14.5 11.5899 14.5 8C14.5 4.41015 11.5899 1.5 8 1.5Z"],[14,"fill","#3B3D45"],[12],[13],[1,"\\n"],[13],[1,"\\n"]],[]],null],[1,"\\n"],[41,[28,[37,2],[[30,1],"DELETING"],null],[[[10,"svg"],[14,"width","16"],[14,"height","16"],[14,"viewBox","0 0 16 16"],[14,"fill","none"],[14,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[12],[1,"\\n"],[10,"path"],[14,"opacity","0.2"],[14,"fill-rule","evenodd"],[14,"clip-rule","evenodd"],[14,"d","M8 1.5C4.41015 1.5 1.5 4.41015 1.5 8C1.5 11.5899 4.41015 14.5 8 14.5C11.5899 14.5 14.5 11.5899 14.5 8C14.5 4.41015 11.5899 1.5 8 1.5ZM0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8Z"],[14,"fill","#000001"],[12],[13],[1,"\\n"],[10,"path"],[14,"fill-rule","evenodd"],[14,"clip-rule","evenodd"],[14,"d","M7.25 0.75C7.25 0.335786 7.58579 0 8 0C12.4183 0 16 3.58172 16 8C16 8.41421 15.6642 8.75 15.25 8.75C14.8358 8.75 14.5 8.41421 14.5 8C14.5 4.41015 11.5899 1.5 8 1.5C7.58579 1.5 7.25 1.16421 7.25 0.75Z"],[14,"fill","#3B3D45"],[12],[13],[1,"\\n"],[13],[1,"\\n"]],[]],null]],["@state","&attrs"],false,["if","or","eq"]]',moduleName:"consul-ui/components/peerings/badge/icon/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/peerings/badge/index",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"Fxysa+1X",block:'[[[41,[30,1,["State"]],[[[1,"  "],[11,0],[16,0,[29,["peerings-badge ",[28,[37,1],[[30,1,["State"]]],null]]]],[4,[38,2],[[30,0,["tooltip"]]],null],[12],[1,"\\n    "],[8,[39,3],null,[["@state"],[[29,[[30,1,["State"]]]]]],null],[1,"\\n    "],[10,1],[14,0,"peerings-badge__text"],[12],[1,[28,[35,4],[[28,[37,1],[[30,1,["State"]]],null]],null]],[13],[1,"\\n  "],[13],[1,"\\n"]],[]],null]],["@peering"],false,["if","lowercase","tooltip","peerings/badge/icon","capitalize"]]',moduleName:"consul-ui/components/peerings/badge/index.hbs",isStrictMode:!1}),i={ACTIVE:{tooltip:"This peer connection is currently active."},PENDING:{tooltip:"This peering connection has not been established yet."},ESTABLISHING:{tooltip:"This peering connection is in the process of being established."},FAILING:{tooltip:"This peering connection has some intermittent errors (usually network related). It will continue to retry. "},DELETING:{tooltip:"This peer is in the process of being deleted."},TERMINATED:{tooltip:"Someone in the other peer may have deleted this peering connection."},UNDEFINED:{tooltip:""}}
-class o extends l.default{get styles(){const{peering:{State:e}}=this.args
-return i[e]}get tooltip(){return this.styles.tooltip}}e.default=o,(0,t.setComponentTemplate)(r,o)})),define("consul-ui/components/peerings/provider/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/service","@ember/application","consul-ui/components/tab-nav"],(function(e,t,n,l,r,i,o){var a,u,s
-function c(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function d(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?c(Object(n),!0).forEach((function(t){f(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function p(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function f(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function m(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const h=(0,n.createTemplateFactory)({id:"FJRHvfea",block:'[[[18,1,[[28,[37,1],null,[["data"],[[30,0,["data"]]]]]]]],["&default"],false,["yield","hash"]]',moduleName:"consul-ui/components/peerings/provider/index.hbs",isStrictMode:!1})
-let b=(a=class extends l.default{constructor(){super(...arguments),p(this,"router",u,this),p(this,"intl",s,this)}get data(){return{tabs:this.tabs}}get tabs(){const{peer:e}=this.args,{router:t}=this,n=(0,i.getOwner)(this),{isReceiver:l,Name:r}=e
-let a=[{label:"Imported Services",route:"dc.peers.show.imported",tooltip:this.intl.t("routes.dc.peers.index.detail.imported.tab-tooltip",{name:r})},{label:"Exported Services",route:"dc.peers.show.exported",tooltip:this.intl.t("routes.dc.peers.index.detail.exported.tab-tooltip",{name:r})}]
-return l&&(a=[...a,{label:"Server Addresses",route:"dc.peers.show.addresses"}]),a.map((e=>new o.Tab(d(d({},e),{},{currentRouteName:t.currentRouteName,owner:n}))))}},u=m(a.prototype,"router",[r.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=m(a.prototype,"intl",[r.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a)
-e.default=b,(0,t.setComponentTemplate)(h,b)})),define("consul-ui/components/policy-form/index",["exports","@ember/component","@ember/template-factory","consul-ui/components/form-component/index","@ember/object"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,n.createTemplateFactory)({id:"N+FAvdR9",block:'[[[18,6,null],[1,"\\n"],[11,"fieldset"],[24,0,"policy-form"],[16,"disabled",[52,[28,[37,2],[[28,[37,3],["write policy"],[["item"],[[33,4]]]]],null],"disabled"]],[17,1],[12],[1,"\\n"],[6,[39,5],null,[["name"],["template"]],[["default","else"],[[[],[]],[[[1,"    "],[10,"header"],[12],[1,"\\n      Policy"],[1,[52,[33,6]," or identity?",""]],[1,"\\n    "],[13],[1,"\\n"],[41,[33,6],[[[1,"    "],[10,2],[12],[1,"\\n      Identities are default policies with configurable names. They save you some time and effort you\'re using Consul for Connect features.\\n    "],[13],[1,"\\n"],[1,"    "],[10,0],[14,"role","radiogroup"],[15,0,[52,[33,4,["error","Type"]]," has-error"]],[12],[1,"\\n"],[42,[28,[37,8],[[28,[37,8],[[33,9]],null]],null],null,[[[1,"            "],[10,"label"],[12],[1,"\\n              "],[10,1],[12],[1,[30,2,["name"]]],[13],[1,"\\n              "],[10,"input"],[15,3,[28,[37,10],[[33,11],"[template]"],null]],[15,2,[30,2,["template"]]],[15,"checked",[28,[37,12],[[33,4,["template"]],[30,2,["template"]]],null]],[15,"onchange",[28,[37,13],[[30,0],[28,[37,14],[[28,[37,15],[[33,4],"template"],null]],null]],[["value"],["target.value"]]]],[14,4,"radio"],[12],[13],[1,"\\n            "],[13],[1,"\\n"]],[2]],null],[1,"    "],[13],[1,"\\n"]],[]],[[[1,"    "],[10,"input"],[15,3,[28,[37,10],[[33,11],"[template]"],null]],[14,2,""],[14,4,"hidden"],[12],[13],[1,"\\n"]],[]]]],[]]]]],[1,"    "],[10,"label"],[15,0,[29,["type-text",[52,[28,[37,16],[[33,4,["error","Name"]],[28,[37,2],[[33,4,["isPristine"]]],null]],null]," has-error"]]]],[12],[1,"\\n        "],[10,1],[12],[1,"Name"],[13],[1,"\\n        "],[10,"input"],[15,2,[33,4,["Name"]]],[15,3,[29,[[36,11],"[Name]"]]],[14,"autofocus","autofocus"],[15,"oninput",[28,[37,13],[[30,0],"change"],null]],[14,4,"text"],[12],[13],[1,"\\n        "],[10,"em"],[12],[1,"\\n          Maximum 128 characters. May only include letters (uppercase and/or lowercase) and/or numbers. Must be unique.\\n        "],[13],[1,"\\n"],[41,[28,[37,16],[[33,4,["error","Name"]],[28,[37,2],[[33,4,["isPristine"]]],null]],null],[[[1,"          "],[10,"strong"],[12],[1,[33,4,["error","Name","validation"]]],[13],[1,"\\n"]],[]],null],[1,"    "],[13],[1,"\\n    "],[10,"label"],[14,"for",""],[14,0,"type-text"],[12],[1,"\\n"],[41,[28,[37,12],[[33,4,["template"]],"service-identity"],null],[[[1,"        "],[8,[39,17],null,[["@readonly","@name","@syntax","@oninput"],[true,[28,[37,10],[[33,11],"[Rules]"],null],"hcl",[28,[37,13],[[30,0],"change",[28,[37,10],[[33,11],"[Rules]"],null]],null]]],[["label","content"],[[[[1,"\\n            Rules "],[10,3],[15,6,[29,[[28,[37,18],["CONSUL_DOCS_URL"],null],"/guides/acl.html#rule-specification"]]],[14,"rel","help noopener noreferrer"],[14,"target","_blank"],[12],[1,"(HCL Format)"],[13],[1,"\\n          "]],[]],[[[8,[39,19],null,[["@nspace","@partition","@name"],[[99,20,["@nspace"]],[99,21,["@partition"]],[33,4,["Name"]]]],null]],[]]]]],[1,"\\n"]],[]],[[[41,[28,[37,12],[[33,4,["template"]],"node-identity"],null],[[[1,"        "],[8,[39,17],null,[["@readonly","@name","@syntax","@oninput"],[true,[28,[37,10],[[33,11],"[Rules]"],null],"hcl",[28,[37,13],[[30,0],"change",[28,[37,10],[[33,11],"[Rules]"],null]],null]]],[["label","content"],[[[[1,"\\n            Rules "],[10,3],[15,6,[29,[[28,[37,18],["CONSUL_DOCS_URL"],null],"/guides/acl.html#rule-specification"]]],[14,"rel","help noopener noreferrer"],[14,"target","_blank"],[12],[1,"(HCL Format)"],[13],[1,"\\n          "]],[]],[[[8,[39,22],null,[["@name","@partition"],[[33,4,["Name"]],[99,21,["@partition"]]]],null]],[]]]]],[1,"\\n"]],[]],[[[1,"        "],[8,[39,17],null,[["@syntax","@class","@name","@value","@onkeyup"],["hcl",[52,[33,4,["error","Rules"]],"error"],[28,[37,10],[[33,11],"[Rules]"],null],[33,4,["Rules"]],[28,[37,13],[[30,0],"change",[28,[37,10],[[33,11],"[Rules]"],null]],null]]],[["label"],[[[[1,"\\n            Rules "],[10,3],[15,6,[29,[[28,[37,18],["CONSUL_DOCS_URL"],null],"/guides/acl.html#rule-specification"]]],[14,"rel","help noopener noreferrer"],[14,"target","_blank"],[12],[1,"(HCL Format)"],[13],[1,"\\n          "]],[]]]]],[1,"\\n"],[41,[33,4,["error","Rules"]],[[[1,"          "],[10,"strong"],[12],[1,[33,4,["error","Rules","validation"]]],[13],[1,"\\n"]],[]],null]],[]]]],[]]],[1,"    "],[13],[1,"\\n"],[41,[28,[37,12],[[33,4,["template"]],"node-identity"],null],[[[1,"\\n    "],[8,[39,23],null,[["@src","@onchange"],[[28,[37,24],["/*/*/*/datacenters"],null],[28,[37,13],[[30,0],[28,[37,25],[[33,26]],null]],[["value"],["data"]]]]],null],[1,"\\n    "],[10,"label"],[14,0,"type-select"],[12],[1,"\\n      "],[10,1],[12],[1,"Datacenter"],[13],[1,"\\n      "],[8,[39,27],null,[["@options","@searchField","@selected","@searchPlaceholder","@onChange"],[[28,[37,28],["Name",[33,26]],null],"Name",[28,[37,29],[[33,4,["Datacenter"]],[33,30]],null],"Type a datacenter name",[28,[37,13],[[30,0],"change","Datacenter"],null]]],[["default"],[[[[1,"\\n            "],[1,[30,3]],[1,"\\n      "]],[3]]]]],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[41,[28,[37,12],[[28,[37,29],[[33,21],"default"],null],"default"],null],[[[1,"    "],[10,0],[14,0,"type-toggle"],[12],[1,"\\n      "],[10,1],[12],[1,"Valid datacenters"],[13],[1,"\\n      "],[10,"label"],[12],[1,"\\n        "],[10,"input"],[15,3,[29,[[36,11],"[isScoped]"]]],[15,"checked",[52,[28,[37,2],[[33,31]],null],"checked"]],[15,"onchange",[28,[37,13],[[30,0],"change"],null]],[14,4,"checkbox"],[12],[13],[1,"\\n        "],[10,1],[12],[1,"All"],[13],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[]],null],[41,[33,31],[[[1,"    "],[8,[39,23],null,[["@src","@onchange"],[[28,[37,24],["/*/*/*/datacenters"],null],[28,[37,13],[[30,0],[28,[37,25],[[33,26]],null]],[["value"],["data"]]]]],null],[1,"\\n\\n    "],[10,0],[14,0,"checkbox-group"],[14,"role","group"],[12],[1,"\\n"],[42,[28,[37,8],[[28,[37,8],[[33,26]],null]],null],null,[[[1,"        "],[10,"label"],[14,0,"type-checkbox"],[12],[1,"\\n          "],[10,"input"],[15,3,[29,[[36,11],"[Datacenters]"]]],[15,2,[30,4,["Name"]]],[15,"checked",[52,[28,[37,32],[[30,4,["Name"]],[33,4,["Datacenters"]]],null],"checked"]],[15,"onchange",[28,[37,13],[[30,0],"change"],null]],[14,4,"checkbox"],[12],[13],[1,"\\n          "],[10,1],[12],[1,[30,4,["Name"]]],[13],[1,"\\n        "],[13],[1,"\\n"]],[4]],null],[42,[28,[37,8],[[28,[37,8],[[33,4,["Datacenters"]]],null]],null],null,[[[41,[28,[37,2],[[28,[37,33],["Name",[30,5],[33,26]],null]],null],[[[1,"        "],[10,"label"],[14,0,"type-checkbox"],[12],[1,"\\n          "],[10,"input"],[15,3,[29,[[36,11],"[Datacenters]"]]],[15,2,[30,5]],[14,"checked","checked"],[15,"onchange",[28,[37,13],[[30,0],"change"],null]],[14,4,"checkbox"],[12],[13],[1,"\\n          "],[10,1],[12],[1,[30,5]],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null]],[5]],null],[1,"    "],[13],[1,"\\n\\n\\n"]],[]],null]],[]]],[41,[28,[37,12],[[33,4,["template"]],""],null],[[[1,"  "],[10,"label"],[14,0,"type-text"],[12],[1,"\\n    "],[10,1],[12],[1,"Description (Optional)"],[13],[1,"\\n    "],[10,"textarea"],[15,3,[29,[[36,11],"[Description]"]]],[15,2,[33,4,["Description"]]],[15,"oninput",[28,[37,13],[[30,0],"change"],null]],[12],[13],[1,"\\n  "],[13],[1,"\\n"]],[]],null],[13],[1,"\\n\\n"]],["&attrs","template","Name","dc","dc","&default"],false,["yield","if","not","can","item","yield-slot","allowIdentity","each","-track-array","templates","concat","name","eq","action","optional","changeset-set","and","code-editor","env","consul/service-identity/template","nspace","partition","consul/node-identity/template","data-source","uri","mut","datacenters","power-select","map-by","or","dc","isScoped","includes","find-by"]]',moduleName:"consul-ui/components/policy-form/index.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,l.default.extend({type:"policy",name:"policy",allowIdentity:!0,classNames:["policy-form"],isScoped:!1,init:function(){this._super(...arguments),(0,r.set)(this,"isScoped",(0,r.get)(this,"item.Datacenters.length")>0),this.templates=[{name:"Policy",template:""},{name:"Service Identity",template:"service-identity"},{name:"Node Identity",template:"node-identity"}]},actions:{change:function(e){try{this._super(...arguments)}catch(t){const e=this.isScoped
-if("policy[isScoped]"===t.target.name)e?((0,r.set)(this,"previousDatacenters",(0,r.get)(this.item,"Datacenters")),(0,r.set)(this.item,"Datacenters",null)):((0,r.set)(this.item,"Datacenters",this.previousDatacenters),(0,r.set)(this,"previousDatacenters",null)),(0,r.set)(this,"isScoped",!e)
-else this.onerror(t)
-this.onchange({target:this.form})}}}}))
-e.default=o})),define("consul-ui/components/policy-selector/index",["exports","@ember/component","@ember/template-factory","consul-ui/components/child-selector/index","@ember/object","@ember/service"],(function(e,t,n,l,r,i){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,n.createTemplateFactory)({id:"7xWCYtBV",block:'[[[8,[39,0],[[17,1]],[["@disabled","@repo","@dc","@partition","@nspace","@type","@placeholder","@items"],[[99,1,["@disabled"]],[99,2,["@repo"]],[99,3,["@dc"]],[99,4,["@partition"]],[99,5,["@nspace"]],"policy","Search for policy",[99,6,["@items"]]]],[["default"],[[[[1,"\\n  "],[18,11,null],[1,"\\n  "],[8,[39,8],null,[["@name"],["label"]],[["default"],[[[[1,"\\n    Apply an existing policy\\n  "]],[]]]]],[1,"\\n  "],[8,[39,8],null,[["@name"],["create"]],[["default"],[[[[1,"\\n"],[6,[39,9],null,[["name"],["trigger"]],[["default","else"],[[[[1,"      "],[18,11,null],[1,"\\n"]],[]],[[[1,"      "],[8,[39,10],[[24,0,"type-dialog"],[4,[38,11],["click",[28,[37,12],[[30,0],[30,0,["openModal"]]],null]],null]],[["@text","@size","@color","@icon"],["Create new policy","small","tertiary","plus"]],null],[1,"\\n"],[1,"      "],[8,[39,13],[[24,1,"new-policy"]],[["@onopen","@aria"],[[28,[37,12],[[30,0],"open"],null],[28,[37,14],null,[["label"],["New Policy"]]]]],[["default"],[[[[1,"\\n        "],[8,[39,15],null,[["@target","@name","@value"],[[30,0],"modal",[30,2]]],null],[1,"\\n        "],[8,[39,8],null,[["@name"],["header"]],[["default"],[[[[1,"\\n          "],[10,"h2"],[12],[1,"New Policy"],[13],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,8],null,[["@name"],["body"]],[["default"],[[[[1,"\\n          "],[8,[39,16],null,[["@form","@nspace","@partition","@dc","@allowServiceIdentity"],[[99,17,["@form"]],[99,5,["@nspace"]],[99,4,["@partition"]],[99,3,["@dc"]],[99,18,["@allowServiceIdentity"]]]],null],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[39,8],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n          "],[8,[39,19],null,null,[["default"],[[[[1,"\\n            "],[8,[39,10],[[16,"onclick",[28,[37,20],[[30,0,["save"]],[33,21],[33,6],[28,[37,22],[[28,[37,12],[[30,0],[30,3]],null],[28,[37,12],[[30,0],"reset"],null]],null]],null]],[16,"disabled",[52,[28,[37,24],[[33,21,["isSaving"]],[33,21,["isPristine"]],[33,21,["isInvalid"]]],null],"disabled"]],[24,4,"submit"]],[["@isLoading","@text"],[[33,21,["isSaving"]],"Create and apply"]],null],[1,"\\n            "],[8,[39,10],[[16,"disabled",[52,[33,21,["isSaving"]],"disabled"]],[24,4,"reset"],[4,[38,11],["click",[28,[37,12],[[30,0],[28,[37,22],[[28,[37,12],[[30,0],[30,3]],null],[28,[37,12],[[30,0],"reset"],null]],null]],null]],null]],[["@color","@text"],["secondary","Cancel"]],null],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[3]]]]],[1,"\\n      "]],[2]]]]],[1,"\\n"]],[]]]]],[1,"  "]],[]]]]],[1,"\\n  "],[8,[39,8],null,[["@name"],["option"]],[["default"],[[[[1,"\\n    "],[1,[30,4,["Name"]]],[1,"\\n  "]],[4]]]]],[1,"\\n  "],[8,[39,8],null,[["@name"],["set"]],[["default"],[[[[1,"\\n    "],[8,[39,25],null,[["@onchange","@items"],[[28,[37,12],[[30,0],"open"],null],[28,[37,26],["CreateTime:desc","Name:asc",[33,6]],null]]],[["default"],[[[[1,"\\n      "],[8,[39,8],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"th"],[12],[1,"Name"],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,8],null,[["@name"],["row"]],[["default"],[[[[1,"\\n        "],[10,"td"],[15,0,[28,[37,27],[[30,5]],null]],[12],[1,"\\n"],[41,[30,5,["ID"]],[[[1,"          "],[10,3],[15,6,[28,[37,28],["dc.acls.policies.edit",[30,5,["ID"]]],null]],[12],[1,[30,5,["Name"]]],[13],[1,"\\n"]],[]],[[[1,"          "],[10,3],[15,3,[30,5,["Name"]]],[12],[1,[30,5,["Name"]]],[13],[1,"\\n"]],[]]],[1,"        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,8],null,[["@name"],["details"]],[["default"],[[[[1,"\\n"],[41,[28,[37,29],[[30,5,["template"]],""],null],[[[1,"        "],[8,[39,30],null,[["@src","@onchange","@loading"],[[28,[37,31],["/${partition}/${nspace}/${dc}/policy/${id}",[28,[37,14],null,[["partition","nspace","dc","id"],[[33,4],[33,5],[33,3],[30,5,["ID"]]]]]],null],[28,[37,12],[[30,0],[28,[37,32],[[33,33]],null]],[["value"],["data"]]],"lazy"]],null],[1,"\\n"]],[]],null],[41,[28,[37,29],[[30,5,["template"]],"node-identity"],null],[[[1,"          "],[10,"dl"],[12],[1,"\\n            "],[10,"dt"],[12],[1,"Datacenter:"],[13],[1,"\\n            "],[10,"dd"],[12],[1,"\\n              "],[1,[30,5,["Datacenter"]]],[1,"\\n            "],[13],[1,"\\n          "],[13],[1,"\\n"]],[]],[[[1,"          "],[10,"dl"],[12],[1,"\\n            "],[10,"dt"],[12],[1,"Datacenters:"],[13],[1,"\\n            "],[10,"dd"],[12],[1,"\\n              "],[1,[28,[35,34],[", ",[28,[37,35],[[28,[37,24],[[33,33],[30,5]],null]],null]],null]],[1,"\\n            "],[13],[1,"\\n          "],[13],[1,"\\n"]],[]]],[1,"          "],[10,"label"],[14,0,"type-text"],[12],[1,"\\n"],[41,[28,[37,29],[[30,5,["template"]],"service-identity"],null],[[[1,"            "],[8,[39,36],null,[["@syntax","@readonly"],["hcl",true]],[["label","content"],[[[[1,"\\n                Rules "],[10,3],[15,6,[29,[[28,[37,37],["CONSUL_DOCS_URL"],null],"/guides/acl.html#rule-specification"]]],[14,"rel","help noopener noreferrer"],[14,"target","_blank"],[12],[1,"(HCL Format)"],[13],[1,"\\n              "]],[]],[[[1,"\\n                "],[8,[39,38],null,[["@nspace","@partition","@name"],[[99,5,["@nspace"]],[99,4,["@partition"]],[30,5,["Name"]]]],null],[1,"\\n              "]],[]]]]],[1,"\\n"]],[]],[[[41,[28,[37,29],[[30,5,["template"]],"node-identity"],null],[[[1,"            "],[8,[39,36],null,[["@syntax","@readonly"],["hcl",true]],[["label","content"],[[[[1,"\\n                Rules "],[10,3],[15,6,[29,[[28,[37,37],["CONSUL_DOCS_URL"],null],"/guides/acl.html#rule-specification"]]],[14,"rel","help noopener noreferrer"],[14,"target","_blank"],[12],[1,"(HCL Format)"],[13],[1,"\\n              "]],[]],[[[1,"\\n                "],[8,[39,39],null,[["@name","@partition"],[[30,5,["Name"]],[99,4,["@partition"]]]],null],[1,"\\n              "]],[]]]]],[1,"\\n"]],[]],[[[1,"            "],[8,[39,36],null,[["@syntax","@readonly","@value"],["hcl",true,[28,[37,24],[[33,33,["Rules"]],[30,5,["Rules"]]],null]]],[["label"],[[[[1,"\\n                Rules "],[10,3],[15,6,[29,[[28,[37,37],["CONSUL_DOCS_URL"],null],"/guides/acl.html#rule-specification"]]],[14,"rel","help noopener noreferrer"],[14,"target","_blank"],[12],[1,"(HCL Format)"],[13],[1,"\\n              "]],[]]]]],[1,"\\n"]],[]]]],[]]],[1,"          "],[13],[1,"\\n"],[41,[28,[37,40],[[33,1]],null],[[[1,"          "],[10,0],[12],[1,"\\n            "],[8,[39,41],null,[["@message"],["Are you sure you want to remove this policy from this token?"]],[["default"],[[[[1,"\\n              "],[8,[39,8],null,[["@name"],["action"]],[["default"],[[[[1,"\\n                "],[8,[39,10],[[4,[38,12],[[30,0],[30,7],"remove",[30,5],[33,6]],null]],[["@text","@color","@size"],["Remove","critical","small"]],null],[1,"\\n              "]],[7]]]]],[1,"\\n              "],[8,[39,8],null,[["@name"],["dialog"]],[["default"],[[[[1,"\\n                "],[10,2],[12],[1,"\\n                  "],[1,[30,10]],[1,"\\n                "],[13],[1,"\\n                "],[8,[39,19],null,null,[["default"],[[[[1,"\\n                  "],[8,[39,10],[[4,[38,12],[[30,0],[30,8]],null]],[["@text","@color","@size"],["Confirm remove","critical","small"]],null],[1,"\\n                  "],[8,[39,10],[[4,[38,12],[[30,0],[30,9]],null]],[["@text","@color","@size"],["Cancel","secondary","small"]],null],[1,"\\n                "]],[]]]]],[1,"\\n              "]],[8,9,10]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n    "]],[5,6]]]]],[1,"\\n\\n  "]],[]]]]],[1,"\\n"]],[]]]]],[1,"\\n"]],["&attrs","modal","close","option","item","index","confirm","execute","cancel","message","&default"],false,["child-selector","disabled","repo","dc","partition","nspace","items","yield","block-slot","yield-slot","hds/button","on","action","modal-dialog","hash","ref","policy-form","form","allowServiceIdentity","hds/button-set","perform","item","queue","if","or","tabular-details","sort-by","policy/typeof","href-to","eq","data-source","uri","mut","loadedItem","join","policy/datacenters","code-editor","env","consul/service-identity/template","consul/node-identity/template","not","confirmation-dialog"]]',moduleName:"consul-ui/components/policy-selector/index.hbs",isStrictMode:!1}),a="Invalid Policy: A Policy with Name"
-var u=(0,t.setComponentTemplate)(o,l.default.extend({repo:(0,i.inject)("repository/policy"),name:"policy",type:"policy",allowIdentity:!0,classNames:["policy-selector"],init:function(){this._super(...arguments)
-const e=this.source
-e&&this._listeners.add(e,{save:e=>{this.save.perform(...e.data)}})},reset:function(e){this._super(...arguments),(0,r.set)(this,"isScoped",!1)},refreshCodeEditor:function(e,t){this.dom.component(".code-editor",t).didAppear()},error:function(e){const t=this.item,n=e.error
-if(void 0===n.errors)throw n
-{const e=n.errors[0]
-let l="Rules",r=e.detail
-switch(!0){case 0===r.indexOf("Failed to parse ACL rules"):case 0===r.indexOf("Invalid service policy"):l="Rules",r=e.detail
-break
-case 0===r.indexOf(a):l="Name",r=r.substr(a.indexOf(":")+1)}l&&t.addError(l,r)}},openModal:function(){const{modal:e}=this
-e&&e.open()},actions:{open:function(e){this.refreshCodeEditor(e,e.target.parentElement)}}}))
-e.default=u})),define("consul-ui/components/popover-menu/index",["exports","@ember/component","@ember/template-factory","@ember/service","block-slots","@ember/object"],(function(e,t,n,l,r,i){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,n.createTemplateFactory)({id:"yEAcBvbt",block:'[[[18,11,null],[1,"\\n"],[11,0],[24,0,"popover-menu"],[17,1],[12],[1,"\\n  "],[8,[39,1],null,[["@keyboardAccess"],[[99,2,["@keyboardAccess"]]]],[["default"],[[[[1,"\\n\\n"],[44,[[28,[37,4],null,[["MenuItem","MenuSeparator"],[[50,"popover-menu/menu-item",0,null,[["menu"],[[28,[37,4],null,[["addSubmenu","removeSubmenu","confirm","clickTrigger","keypressClick"],[[28,[37,6],[[30,0],"addSubmenu"],null],[28,[37,6],[[30,0],"removeSubmenu"],null],[28,[37,7],["popover-menu-",[33,8],"-"],null],[30,0,["toggle","click"]],[30,4]]]]]]],[50,"popover-menu/menu-separator",0,null,null]]]]],[[[44,[[28,[37,4],null,[["toggle"],[[30,0,["toggle","click"]]]]]],[[[1,"\\n    "],[8,[39,9],null,[["@checked","@onchange"],[[52,[33,2],[30,5,["expanded"]],[33,11]],[28,[37,12],[[30,2],[28,[37,6],[[30,0],"change"],null]],null]]],[["default"],[[[[1,"\\n      "],[8,[39,13],null,[["@target","@name","@value"],[[30,0],"toggle",[30,8]]],null],[1,"\\n      "],[10,"button"],[14,"aria-haspopup","menu"],[15,"onkeydown",[30,3]],[15,"onclick",[30,0,["toggle","click"]]],[15,1,[30,5,["labelledBy"]]],[15,"aria-controls",[30,5,["controls"]]],[14,4,"button"],[12],[1,"\\n        "],[8,[39,14],null,[["@name"],["trigger"]],[["default"],[[[[1,"\\n          "],[18,11,[[30,6],[30,7]]],[1,"\\n        "]],[]]]]],[1,"\\n      "],[13],[1,"\\n    "]],[8]]]]],[1,"\\n\\n    "],[8,[39,15],[[16,1,[30,5,["controls"]]],[16,"aria-labelledby",[30,5,["labelledBy"]]],[16,"aria-expanded",[30,5,["expanded"]]]],[["@position"],[[99,16,["@position"]]]],[["default"],[[[[1,"\\n      "],[8,[39,13],null,[["@target","@name","@value"],[[30,0],"menu",[30,9]]],null],[1,"\\n      "],[8,[39,17],null,[["@name"],["controls"]],[["default"],[[[[1,"\\n        "],[10,"input"],[15,1,[28,[37,7],["popover-menu-",[33,8],"-"],null]],[14,4,"checkbox"],[12],[13],[1,"\\n"],[42,[28,[37,19],[[28,[37,19],[[33,20]],null]],null],null,[[[1,"        "],[10,"input"],[15,1,[28,[37,7],["popover-menu-",[33,8],"-",[30,10]],null]],[15,"onchange",[30,9,["change"]]],[14,4,"checkbox"],[12],[13],[1,"\\n"]],[10]],null],[1,"      "]],[]]]]],[1,"\\n"],[41,[33,21],[[[1,"        "],[8,[39,17],null,[["@name"],["header"]],[["default"],[[[[1,"\\n          "],[18,11,[[30,6],[30,7]]],[1,"\\n          "],[6,[39,14],null,[["name"],["header"]],[["default","else"],[[[],[]],[[],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[1,"      "],[8,[39,17],null,[["@name"],["menu"]],[["default"],[[[[1,"\\n        "],[8,[39,14],null,[["@name","@params"],["menu",[28,[37,22],[[28,[37,7],["popover-menu-",[33,8],"-"],null],[33,23],[30,4],[30,0,["toggle","click"]]],null]]],[["default"],[[[[1,"\\n          "],[18,11,[[30,6],[30,7]]],[1,"\\n        "]],[]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[9]]]]],[1,"\\n\\n"]],[7]]]],[6]]],[1,"\\n  "]],[2,3,4,5]]]]],[1,"\\n"],[13]],["&attrs","change","keypress","keypressClick","aria","components","api","toggle","menu","sub","&default"],false,["yield","aria-menu","keyboardAccess","let","hash","component","action","concat","guid","toggle-button","if","expanded","queue","ref","yield-slot","menu-panel","position","block-slot","each","-track-array","submenus","hasHeader","block-params","send"]]',moduleName:"consul-ui/components/popover-menu/index.hbs",isStrictMode:!1})
-var a=(0,t.setComponentTemplate)(o,t.default.extend(r.default,{tagName:"",dom:(0,l.inject)("dom"),expanded:!1,keyboardAccess:!0,onchange:function(){},position:"",init:function(){this._super(...arguments),this.guid=this.dom.guid(this),this.submenus=[]},willRender:function(){(0,i.set)(this,"hasHeader",this._isRegistered("header"))},actions:{addSubmenu:function(e){(0,i.set)(this,"submenus",this.submenus.concat(e))},removeSubmenu:function(e){const t=this.submenus.indexOf(e);-1!==t&&(this.submenus.splice(t,1),(0,i.set)(this,"submenus",this.submenus))},change:function(e){e.target.checked||[...this.dom.elements(`[id^=popover-menu-${this.guid}]`)].forEach((function(e){e.checked=!1})),this.onchange(e)},send:function(){this.sendAction(...arguments)}}}))
-e.default=a})),define("consul-ui/components/popover-menu/menu-item/index",["exports","@ember/component","@ember/template-factory","@ember/service","@ember/object","block-slots"],(function(e,t,n,l,r,i){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,n.createTemplateFactory)({id:"2GW+NBsb",block:'[[[18,3,null],[1,"\\n"],[11,"li"],[24,"role","none"],[17,1],[12],[1,"\\n"],[41,[33,2],[[[1,"  "],[10,"label"],[15,"for",[28,[37,3],[[33,4,["confirm"]],[33,5]],null]],[14,"role","menuitem"],[14,"tabindex","-1"],[15,"onkeypress",[33,4,["keypressClick"]]],[12],[1,"\\n    "],[8,[39,6],null,[["@name"],["label"]],[["default"],[[[[18,3,null]],[]]]]],[1,"\\n  "],[13],[1,"\\n  "],[10,0],[14,"role","menu"],[12],[1,"\\n    "],[8,[39,6],null,[["@name","@params"],["confirmation",[28,[37,7],[[50,"confirmation-alert",0,null,[["onclick","name"],[[28,[37,9],[[28,[37,10],[[30,0],[33,4,["clickTrigger"]]],null],[28,[37,10],[[30,0],[33,11]],null]],null],[28,[37,3],[[33,4,["confirm"]],[33,5]],null]]]]],null]]],[["default"],[[[[18,3,null]],[]]]]],[1,"\\n  "],[13],[1,"\\n"]],[]],[[[41,[33,12],[[[44,[[28,[37,14],[[33,12],"://"],null]],[[[1,"  "],[10,3],[14,"role","menuitem"],[14,"tabindex","-1"],[15,"onclick",[28,[37,10],[[30,0],[33,4,["clickTrigger"]]],null]],[15,6,[36,12]],[15,"target",[52,[30,2],"_blank"]],[15,"rel",[52,[30,2],"noopener noreferrer"]],[12],[1,"\\n    "],[8,[39,6],null,[["@name"],["label"]],[["default"],[[[[1,"\\n    "],[18,3,null],[1,"\\n    "]],[]]]]],[1,"\\n  "],[13],[1,"\\n"]],[2]]]],[]],[[[10,"button"],[14,"role","menuitem"],[15,"aria-selected",[52,[33,15],"true"]],[14,"tabindex","-1"],[15,"onclick",[28,[37,9],[[28,[37,10],[[30,0],[28,[37,16],[[30,0,["onclick"]],[28,[37,17],null,null]],null]],null],[28,[37,10],[[30,0],[52,[30,0,["close"]],[33,4,["clickTrigger"]],[28,[37,17],null,null]]],null]],null]],[14,4,"button"],[12],[1,"\\n    "],[8,[39,6],null,[["@name"],["label"]],[["default"],[[[[1,"\\n      "],[18,3,null],[1,"\\n    "]],[]]]]],[1,"\\n  "],[13],[1,"\\n"]],[]]]],[]]],[13],[1,"\\n\\n"]],["&attrs","external","&default"],false,["yield","if","hasConfirmation","concat","menu","guid","yield-slot","block-params","component","queue","action","onclick","href","let","string-includes","selected","or","noop"]]',moduleName:"consul-ui/components/popover-menu/menu-item/index.hbs",isStrictMode:!1})
-var a=(0,t.setComponentTemplate)(o,t.default.extend(i.default,{tagName:"",dom:(0,l.inject)("dom"),init:function(){this._super(...arguments),this.guid=this.dom.guid(this)},didInsertElement:function(){this._super(...arguments),this.menu.addSubmenu(this.guid)},didDestroyElement:function(){this._super(...arguments),this.menu.removeSubmenu(this.guid)},willRender:function(){this._super(...arguments),(0,r.set)(this,"hasConfirmation",this._isRegistered("confirmation"))}}))
-e.default=a})),define("consul-ui/components/popover-menu/menu-separator/index",["exports","@ember/component","@ember/template-factory","block-slots"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"n5s/eW+J",block:'[[[18,1,null],[1,"\\n"],[10,"li"],[14,"role","separator"],[12],[1,"\\n  "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[18,1,null]],[]]]]],[1,"\\n"],[13],[1,"\\n"]],["&default"],false,["yield","yield-slot"]]',moduleName:"consul-ui/components/popover-menu/menu-separator/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,t.default.extend(l.default,{tagName:""}))
-e.default=i})),define("consul-ui/components/popover-select/index",["exports","@ember/component","@ember/template-factory","@ember/service","block-slots"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,n.createTemplateFactory)({id:"MCbyGl1m",block:'[[[8,[39,0],[[24,0,"popover-select"],[17,1]],[["@position"],[[28,[37,1],[[33,2],"left"],null]]],[["default"],[[[[1,"\\n  "],[18,6,null],[1,"\\n"],[44,[[50,"popover-select/optgroup",0,null,[["components"],[[30,2]]]],[50,"popover-select/option",0,null,[["select","components","onclick"],[[30,0],[30,2],[28,[37,6],[[28,[37,7],[[30,0],"click"],null],[52,[33,9],[28,[37,10],null,null],[30,3,["toggle"]]]],null]]]]],[[[1,"    "],[8,[39,11],null,[["@name"],["trigger"]],[["default"],[[[[1,"\\n      "],[8,[39,12],null,[["@name"],["selected"]],[["default"],[[[[1,"\\n        "],[18,6,[[28,[37,13],null,[["Optgroup","Option"],[[30,4],[30,5]]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,11],null,[["@name"],["menu"]],[["default"],[[[[1,"\\n      "],[8,[39,12],null,[["@name"],["options"]],[["default"],[[[[1,"\\n        "],[18,6,[[28,[37,13],null,[["Optgroup","Option"],[[30,4],[30,5]]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[4,5]]]],[2,3]]]]],[1,"\\n"]],["&attrs","components","menu","Optgroup","Option","&default"],false,["popover-menu","or","position","yield","let","component","pipe","action","if","multiple","noop","block-slot","yield-slot","hash"]]',moduleName:"consul-ui/components/popover-select/index.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,t.default.extend(r.default,{tagName:"",dom:(0,l.inject)("dom"),multiple:!1,required:!1,onchange:function(){},addOption:function(e){void 0===this._options&&(this._options=new Set),this._options.add(e)},removeOption:function(e){this._options.delete(e)},actions:{click:function(e,t){if(this.multiple){if(e.selected&&this.required){if(![...this._options].find((t=>t!==e&&t.selected)))return t}}else{if(e.selected&&this.required)return t;[...this._options].filter((t=>t!==e)).forEach((e=>{e.selected=!1}))}return e.selected=!e.selected,this.onchange(this.dom.setEventTargetProperties(t,{selected:t=>e.args.value,selectedItems:e=>[...this._options].filter((e=>e.selected)).map((e=>e.args.value)).join(",")})),t}}}))
-e.default=o})),define("consul-ui/components/popover-select/optgroup/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"GuHT6dz2",block:'[[[44,[[30,1,["MenuSeparator"]]],[[[8,[30,2],null,null,[["default"],[[[[1,"\\n  "],[8,[39,1],null,[["@name"],["label"]],[["default"],[[[[1,"\\n    "],[1,[30,3]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[]]]]],[1,"\\n"],[18,4,null],[1,"\\n"]],[2]]]],["@components","MenuSeparator","@label","&default"],false,["let","block-slot","yield"]]',moduleName:"consul-ui/components/popover-select/optgroup/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/popover-select/option/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object"],(function(e,t,n,l,r,i){var o,a
-function u(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const s=(0,n.createTemplateFactory)({id:"gE0Zhut+",block:'[[[44,[[30,1,["MenuItem"]]],[[[1,"  "],[8,[30,2],[[16,0,[52,[30,0,["selected"]],"is-active"]],[17,3],[4,[38,3],[[30,0,["connect"]]],null],[4,[38,3],[[28,[37,4],[[30,0],"selected",[30,5]],null]],null],[4,[38,5],[[28,[37,4],[[30,0],"selected",[30,5]],null]],null],[4,[38,6],[[30,0,["disconnect"]]],null]],[["@onclick","@selected"],[[28,[37,2],[[30,0],[30,4],[30,0]],null],[30,0,["selected"]]]],[["default"],[[[[1,"\\n    "],[8,[39,7],null,[["@name"],["label"]],[["default"],[[[[1,"\\n      "],[18,6,null],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[2]]]],["@components","MenuItem","&attrs","@onclick","@selected","&default"],false,["let","if","action","did-insert","set","did-update","will-destroy","block-slot","yield"]]',moduleName:"consul-ui/components/popover-select/option/index.hbs",isStrictMode:!1})
-let c=(o=class extends l.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="selected",l=this,(n=a)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}connect(){this.args.select.addOption(this)}disconnect(){this.args.select.removeOption(this)}},a=u(o.prototype,"selected",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u(o.prototype,"connect",[i.action],Object.getOwnPropertyDescriptor(o.prototype,"connect"),o.prototype),u(o.prototype,"disconnect",[i.action],Object.getOwnPropertyDescriptor(o.prototype,"disconnect"),o.prototype),o)
-e.default=c,(0,t.setComponentTemplate)(s,c)})),define("consul-ui/components/portal-target",["exports","ember-stargate/components/portal-target"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/portal",["exports","ember-stargate/components/portal"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select-multiple-with-create",["exports","ember-power-select-with-create/components/power-select-multiple-with-create"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
-define("consul-ui/components/power-select-multiple",["exports","ember-power-select/components/power-select-multiple"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select-multiple/trigger",["exports","ember-power-select/components/power-select-multiple/trigger"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select-with-create",["exports","ember-power-select-with-create/components/power-select-with-create"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select-with-create/suggested-option",["exports","ember-power-select-with-create/components/power-select-with-create/suggested-option"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select",["exports","ember-power-select/components/power-select"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select/before-options",["exports","ember-power-select/components/power-select/before-options"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select/no-matches-message",["exports","ember-power-select/components/power-select/no-matches-message"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select/options",["exports","ember-power-select/components/power-select/options"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select/placeholder",["exports","ember-power-select/components/power-select/placeholder"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select/power-select-group",["exports","ember-power-select/components/power-select/power-select-group"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select/search-message",["exports","ember-power-select/components/power-select/search-message"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select/trigger",["exports","ember-power-select/components/power-select/trigger"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/progress/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"0deDvA3Z",block:'[[[11,0],[24,0,"progress indeterminate"],[24,"role","progressbar"],[17,1],[12],[13],[1,"\\n"]],["&attrs"],false,[]]',moduleName:"consul-ui/components/progress/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/providers/dimension/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object","ember-ref-bucket","@ember/template"],(function(e,t,n,l,r,i,o,a){var u,s,c,d
-function p(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function f(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const m=(0,n.createTemplateFactory)({id:"BXV/pZSO",block:'[[[11,0],[4,[38,0],["element"],[["debugName","bucket"],["create-ref",[30,0]]]],[4,[38,1],[[30,0,["measureDimensions"]]],null],[12],[1,"\\n  "],[1,[28,[35,2],["resize",[30,0,["handleWindowResize"]]],null]],[1,"\\n  "],[18,1,[[28,[37,4],null,[["data"],[[30,0,["data"]]]]]]],[1,"\\n"],[13]],["&default"],false,["create-ref","did-insert","on-window","yield","hash"]]',moduleName:"consul-ui/components/providers/dimension/index.hbs",isStrictMode:!1})
-let h=(u=(0,o.ref)("element"),s=class extends l.default{constructor(){super(...arguments),p(this,"element",c,this),p(this,"height",d,this)}get data(){const{height:e,fillRemainingHeightStyle:t}=this
-return{height:e,fillRemainingHeightStyle:t}}get fillRemainingHeightStyle(){return(0,a.htmlSafe)(`height: ${this.height}px;`)}get bottomBoundary(){return document.querySelector(this.args.bottomBoundary)||this.footer}get footer(){return document.querySelector('footer[role="contentinfo"]')}measureDimensions(e){const t=this.bottomBoundary.getBoundingClientRect(),n=e.getBoundingClientRect()
-this.height=t.top+t.height-n.top}handleWindowResize(){const{element:e}=this
-this.measureDimensions(e)}},c=f(s.prototype,"element",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=f(s.prototype,"height",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f(s.prototype,"measureDimensions",[i.action],Object.getOwnPropertyDescriptor(s.prototype,"measureDimensions"),s.prototype),f(s.prototype,"handleWindowResize",[i.action],Object.getOwnPropertyDescriptor(s.prototype,"handleWindowResize"),s.prototype),s)
-e.default=h,(0,t.setComponentTemplate)(m,h)})),define("consul-ui/components/providers/search/index",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"nGR80lz+",block:'[[[18,1,[[28,[37,1],null,[["data"],[[30,0,["data"]]]]]]]],["&default"],false,["yield","hash"]]',moduleName:"consul-ui/components/providers/search/index.hbs",isStrictMode:!1})
-class i extends l.default{get _search(){return this.args.search||""}get items(){const{items:e,searchProperties:t}=this.args,{_search:n}=this
-return n.length>0?e.filter((e=>t.reduce(((t,l)=>{const r=-1!==e[l].indexOf(n)
-return r?[...t,r]:t}),[]).length>0)):e}get data(){const{items:e}=this
-return{items:e}}}e.default=i,(0,t.setComponentTemplate)(r,i)})),define("consul-ui/components/radio-card/index",["exports","@ember/component","@ember/template-factory"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,n.createTemplateFactory)({id:"o/1nwT6X",block:'[[[11,"label"],[17,1],[16,0,[29,["radio-card",[52,[33,1]," checked"]]]],[12],[1,"\\n  "],[10,0],[12],[1,"\\n"],[41,[28,[37,2],[[33,3,["length"]],0],null],[[[1,"      "],[10,"input"],[15,3,[36,4]],[15,2,[36,3]],[15,"checked",[36,1]],[15,"onchange",[28,[37,5],[[30,0],[33,6]],null]],[14,4,"radio"],[12],[13],[1,"\\n"]],[]],[[[1,"      "],[10,"input"],[15,3,[36,4]],[14,2,""],[15,"checked",[36,1]],[15,"onchange",[28,[37,5],[[30,0],[33,6]],null]],[14,4,"radio"],[12],[13],[1,"\\n"]],[]]],[1,"  "],[13],[1,"\\n  "],[10,0],[12],[1,"\\n    "],[18,2,null],[1,"\\n  "],[13],[1,"\\n"],[13]],["&attrs","&default"],false,["if","checked","gt","value","name","action","onchange","yield"]]',moduleName:"consul-ui/components/radio-card/index.hbs",isStrictMode:!1})
-var r=(0,t.setComponentTemplate)(l,t.default.extend({tagName:""}))
-e.default=r})),define("consul-ui/components/radio-group/index",["exports","@ember/component","@ember/template-factory","@ember/service"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"Ud+ETI/C",block:'[[[10,"fieldset"],[12],[1,"\\n  "],[10,0],[14,"role","radiogroup"],[15,1,[29,["radiogroup_",[36,0]]]],[12],[1,"\\n"],[42,[28,[37,2],[[28,[37,2],[[33,3]],null]],null],null,[[[44,[[52,[28,[37,6],[[30,1,["key"]],[27]],null],[30,1,["key"]],[30,1,["value"]]],[28,[37,7],[[30,1,["label"]],[30,1,["value"]]],null]],[[[1,"    "],[10,"label"],[15,"tabindex",[52,[33,8],"0"]],[15,"onkeydown",[52,[33,8],[28,[37,9],[[30,0],"keydown"],null]]],[15,0,[29,["type-radio value-",[30,2]]]],[12],[1," "],[1,"\\n      "],[10,"input"],[15,3,[36,0]],[15,2,[30,2]],[15,"checked",[52,[28,[37,10],[[28,[37,11],[[33,12]],null],[30,2]],null],"checked"]],[15,"onchange",[28,[37,9],[[30,0],"change"],null]],[14,4,"radio"],[12],[13],[1,"\\n      "],[10,1],[12],[1,[30,3]],[13],[1,"\\n    "],[13],[1,"\\n"]],[2,3]]]],[1]],null],[1,"  "],[13],[1,"\\n"],[13],[1,"\\n"]],["item","_key","_value"],false,["name","each","-track-array","items","let","if","not-eq","or","keyboardAccess","action","eq","concat","value"]]',moduleName:"consul-ui/components/radio-group/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,t.default.extend({tagName:"",keyboardAccess:!1,dom:(0,l.inject)("dom"),init:function(){this._super(...arguments),this.name=this.dom.guid(this)},actions:{keydown:function(e){13===e.keyCode&&e.target.dispatchEvent(new MouseEvent("click"))},change:function(e){this.onchange(this.dom.setEventTargetProperty(e,"value",(e=>""===e?void 0:e)))}}}))
-e.default=i})),define("consul-ui/components/ref/index",["exports","@ember/component","@ember/object"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l=t.default.extend({tagName:"",didReceiveAttrs:function(){(0,n.set)(this.target,this.name,this.value)}})
-e.default=l})),define("consul-ui/components/role-form/index",["exports","@ember/component","@ember/template-factory","consul-ui/components/form-component/index"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"0/f8kKT6",block:'[[[18,2,null],[1,"\\n"],[11,"fieldset"],[24,0,"role-form"],[16,"disabled",[52,[28,[37,2],[[28,[37,3],["write role"],[["item"],[[33,4]]]]],null],"disabled"]],[17,1],[12],[1,"\\n    "],[10,"label"],[15,0,[29,["type-text",[52,[33,4,["error","Name"]]," has-error"]]]],[12],[1,"\\n        "],[10,1],[12],[1,"Name"],[13],[1,"\\n        "],[10,"input"],[15,2,[33,4,["Name"]]],[14,3,"role[Name]"],[14,"autofocus","autofocus"],[15,"oninput",[28,[37,5],[[30,0],"change"],null]],[14,4,"text"],[12],[13],[1,"\\n        "],[10,"em"],[12],[1,"\\n          Maximum 256 characters. May only include letters (uppercase and/or lowercase) and/or numbers. Must be unique.\\n        "],[13],[1,"\\n"],[41,[33,4,["error","Name"]],[[[1,"          "],[10,"strong"],[12],[1,[33,4,["error","Name","validation"]]],[13],[1,"\\n"]],[]],null],[1,"    "],[13],[1,"\\n  "],[10,"label"],[14,0,"type-text"],[12],[1,"\\n    "],[10,1],[12],[1,"Description (Optional)"],[13],[1,"\\n    "],[10,"textarea"],[14,3,"role[Description]"],[15,2,[33,4,["Description"]]],[15,"oninput",[28,[37,5],[[30,0],"change"],null]],[12],[13],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n"],[10,"fieldset"],[14,1,"policies"],[14,0,"policies"],[12],[1,"\\n  "],[10,"h2"],[12],[1,"Policies"],[13],[1,"\\n"],[6,[39,6],null,[["name","params"],["policy",[28,[37,7],[[33,4]],null]]],[["default","else"],[[[[1,"    "],[18,2,null],[1,"\\n"]],[]],[[[1,"    "],[8,[39,8],null,[["@disabled","@dc","@partition","@nspace","@items"],[[28,[37,2],[[28,[37,3],["write role"],[["item"],[[33,4]]]]],null],[99,9,["@dc"]],[99,10,["@partition"]],[99,11,["@nspace"]],[33,4,["Policies"]]]],null],[1,"\\n"]],[]]]]],[13],[1,"\\n"]],["&attrs","&default"],false,["yield","if","not","can","item","action","yield-slot","block-params","policy-selector","dc","partition","nspace"]]',moduleName:"consul-ui/components/role-form/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,l.default.extend({type:"role",name:"role",classNames:["role-form"]}))
-e.default=i})),define("consul-ui/components/role-selector/index",["exports","@ember/component","@ember/template-factory","consul-ui/components/child-selector/index","@ember/service","@ember/object","@ember/object/computed","consul-ui/utils/dom/event-source"],(function(e,t,n,l,r,i,o,a){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=(0,n.createTemplateFactory)({id:"6ZRIYR2n",block:'[[[8,[39,0],[[24,0,"role-selector"],[24,1,"new-role"]],[["@onclose","@aria"],[[28,[37,1],[[30,0],[28,[37,2],[[33,3]],null],"role"],null],[28,[37,4],null,[["label"],[[52,[28,[37,6],[[33,3],"role"],null],"New Role","New Policy"]]]]]],[["default"],[[[[1,"\\n  "],[8,[39,7],null,[["@target","@name","@value"],[[30,0],"modal",[30,1]]],null],[1,"\\n  "],[8,[39,8],null,[["@name"],["header"]],[["default"],[[[[1,"\\n"],[41,[28,[37,6],[[33,3],"role"],null],[[[1,"    "],[10,"h2"],[12],[1,"New Role"],[13],[1,"\\n"]],[]],[[[1,"    "],[10,"h2"],[12],[1,"New Policy"],[13],[1,"\\n"]],[]]],[1,"  "]],[]]]]],[1,"\\n  "],[8,[39,8],null,[["@name"],["body"]],[["default"],[[[[1,"\\n\\n  "],[10,"input"],[15,1,[29,[[36,9],"_state_role"]]],[15,3,[29,[[36,9],"[state]"]]],[14,2,"role"],[15,"checked",[52,[28,[37,6],[[33,3],"role"],null],"checked"]],[15,"onchange",[28,[37,1],[[30,0],"change"],null]],[14,4,"radio"],[12],[13],[1,"\\n    "],[8,[39,10],null,[["@form","@dc","@nspace","@partition"],[[99,11,["@form"]],[99,12,["@dc"]],[99,13,["@nspace"]],[99,14,["@partition"]]]],[["default"],[[[[1,"\\n      "],[8,[39,8],null,[["@name"],["policy"]],[["default"],[[[[1,"\\n\\n        "],[8,[39,15],null,[["@source","@dc","@partition","@nspace","@items"],[[99,16,["@source"]],[99,12,["@dc"]],[99,14,["@partition"]],[99,13,["@nspace"]],[33,17,["Policies"]]]],[["default"],[[[[1,"\\n          "],[8,[39,8],null,[["@name"],["trigger"]],[["default"],[[[[1,"\\n            "],[8,[39,18],[[24,0,"type-dialog"],[4,[38,1],[[30,0],"triggerStateCheckboxChange"],null]],[["@text","@size","@color","@icon"],["Create new policy","small","tertiary","plus"]],null],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[10,"input"],[15,1,[29,[[36,9],"_state_policy"]]],[15,3,[29,[[36,9],"[state]"]]],[14,2,"policy"],[15,"checked",[52,[28,[37,6],[[33,3],"policy"],null],"checked"]],[15,"onchange",[28,[37,1],[[30,0],"change"],null]],[14,4,"radio"],[12],[13],[1,"\\n    "],[8,[39,19],null,[["@name","@form","@dc","@nspace","@partition"],["role[policy]",[99,20,["@form"]],[99,12,["@dc"]],[99,13,["@nspace"]],[99,14,["@partition"]]]],null],[1,"\\n\\n  "]],[]]]]],[1,"\\n  "],[8,[39,8],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n\\n    "],[8,[39,21],null,null,[["default"],[[[[1,"\\n"],[41,[28,[37,6],[[33,3],"role"],null],[[[1,"        "],[8,[39,18],[[16,"onclick",[28,[37,22],[[30,0,["save"]],[33,17],[33,23],[28,[37,24],[[28,[37,1],[[30,0],[30,2]],null],[28,[37,1],[[30,0],"reset"],null]],null]],null]],[16,"disabled",[52,[28,[37,25],[[33,17,["isSaving"]],[33,17,["isPristine"]],[33,17,["isInvalid"]]],null],"disabled"]],[24,4,"submit"]],[["@text","@isLoading"],["Create and apply",[33,17,["isSaving"]]]],null],[1,"\\n        "],[8,[39,18],[[16,"disabled",[52,[33,17,["isSaving"]],"disabled"]],[24,4,"reset"],[4,[38,26],["click",[28,[37,1],[[30,0],[28,[37,24],[[28,[37,1],[[30,0],[30,2]],null],[28,[37,1],[[30,0],"reset"],null]],null]],null]],null]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n\\n"]],[]],[[[1,"        "],[8,[39,18],[[16,"disabled",[52,[28,[37,25],[[33,27,["isSaving"]],[33,27,["isPristine"]],[33,27,["isInvalid"]]],null],"disabled"]],[24,4,"submit"],[4,[38,1],[[30,0],"dispatch","save",[28,[37,28],[[33,27],[33,17,["Policies"]],[28,[37,1],[[30,0],[28,[37,2],[[33,3]],null],"role"],null]],null]],null]],[["@text","@isLoading"],["Create and apply",[33,27,["isSaving"]]]],null],[1,"\\n        "],[8,[39,18],[[16,"disabled",[52,[33,27,["isSaving"]],"disabled"]],[24,4,"reset"],[4,[38,26],["click",[28,[37,1],[[30,0],[28,[37,2],[[33,3]],null],"role"],null]],null]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n"]],[]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n\\n"],[8,[39,29],null,[["@disabled","@repo","@dc","@partition","@nspace","@type","@placeholder","@items"],[[99,30,["@disabled"]],[99,31,["@repo"]],[99,12,["@dc"]],[99,14,["@partition"]],[99,13,["@nspace"]],"role","Search for role",[99,23,["@items"]]]],[["default"],[[[[1,"\\n  "],[8,[39,8],null,[["@name"],["label"]],[["default"],[[[[1,"\\n    Apply an existing role\\n  "]],[]]]]],[1,"\\n  "],[8,[39,8],null,[["@name"],["create"]],[["default"],[[[[1,"\\n    "],[8,[39,18],[[24,0,"type-dialog"],[4,[38,26],["click",[28,[37,32],[[30,0,["modal","open"]]],null]],null]],[["@text","@size","@color","@icon"],["Create new role","small","tertiary","plus"]],null],[1,"\\n  "]],[]]]]],[1,"\\n  "],[8,[39,8],null,[["@name"],["option"]],[["default"],[[[[1,"\\n    "],[1,[30,3,["Name"]]],[1,"\\n  "]],[3]]]]],[1,"\\n  "],[8,[39,8],null,[["@name"],["set"]],[["default"],[[[[1,"\\n    "],[8,[39,33],null,[["@rows","@items"],[5,[28,[37,34],["CreateTime:desc","Name:asc",[33,23]],null]]],[["default"],[[[[1,"\\n      "],[8,[39,8],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"th"],[12],[1,"Name"],[13],[1,"\\n        "],[10,"th"],[12],[1,"Description"],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,8],null,[["@name"],["row"]],[["default"],[[[[1,"\\n        "],[10,"td"],[12],[1,"\\n          "],[10,3],[15,6,[28,[37,35],["dc.acls.roles.edit",[30,4,["ID"]]],null]],[12],[1,[30,4,["Name"]]],[13],[1,"\\n        "],[13],[1,"\\n        "],[10,"td"],[12],[1,"\\n          "],[1,[30,4,["Description"]]],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,8],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n        "],[8,[39,36],null,[["@expanded","@onchange","@keyboardAccess"],[[52,[28,[37,6],[[30,8],[30,6]],null],true,false],[28,[37,1],[[30,0],[30,7],[30,6]],null],false]],[["default"],[[[[1,"\\n          "],[8,[39,8],null,[["@name"],["trigger"]],[["default"],[[[[1,"\\n            More\\n          "]],[]]]]],[1,"\\n          "],[8,[39,8],null,[["@name"],["menu"]],[["default"],[[[[1,"\\n              "],[10,"li"],[14,"role","none"],[12],[1,"\\n                "],[10,3],[14,"role","menuitem"],[14,"tabindex","-1"],[15,6,[28,[37,35],["dc.acls.roles.edit",[30,4,["ID"]]],null]],[12],[1,"\\n"],[41,[28,[37,37],["edit role"],[["item"],[[30,4]]]],[[[1,"                  Edit\\n"]],[]],[[[1,"                  View\\n"]],[]]],[1,"                "],[13],[1,"\\n              "],[13],[1,"\\n"],[41,[28,[37,38],[[33,30]],null],[[[1,"              "],[10,"li"],[14,"role","none"],[14,0,"dangerous"],[12],[1,"\\n                "],[10,"label"],[15,"for",[30,9]],[14,"role","menuitem"],[14,"tabindex","-1"],[15,"onkeypress",[30,11]],[12],[1,"Remove"],[13],[1,"\\n                "],[10,0],[14,"role","menu"],[12],[1,"\\n                  "],[8,[39,39],[[24,0,"warning"]],null,[["header","body","actions"],[[[[1,"\\n                      Confirm Remove\\n                    "]],[]],[[[1,"\\n                      "],[10,2],[12],[1,"\\n                        Are you sure you want to remove this role?\\n                      "],[13],[1,"\\n                    "]],[]],[[[1,"\\n                      "],[8,[30,12,["Action"]],[[24,0,"dangerous"]],null,[["default"],[[[[1,"\\n                        "],[8,[39,1],[[24,"tabindex","-1"],[4,[38,26],["click",[28,[37,1],[[30,0],[30,10],"remove",[30,4],[33,23]],null]],null]],null,[["default"],[[[[1,"\\n                          Remove\\n                        "]],[]]]]],[1,"\\n                      "]],[]]]]],[1,"\\n                      "],[8,[30,12,["Action"]],null,null,[["default"],[[[[1,"\\n                        "],[8,[39,1],null,[["@for"],[[30,9]]],[["default"],[[[[1,"\\n                          Cancel\\n                        "]],[]]]]],[1,"\\n                      "]],[]]]]],[1,"\\n                    "]],[12]]]]],[1,"\\n                "],[13],[1,"\\n              "],[13],[1,"\\n"]],[]],null],[1,"          "]],[9,10,11]]]]],[1,"\\n        "]],[]]]]],[1,"\\n      "]],[6,7,8]]]]],[1,"\\n    "]],[4,5]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[]]]]],[1,"\\n"]],["modal","close","option","item","index","index","change","checked","confirm","send","keypressClick","Actions"],false,["modal-dialog","action","mut","state","hash","if","eq","ref","block-slot","name","role-form","form","dc","nspace","partition","policy-selector","source","item","hds/button","policy-form","policyForm","hds/button-set","perform","items","queue","or","on","policy","array","child-selector","disabled","repo","optional","tabular-collection","sort-by","href-to","popover-menu","can","not","informed-action"]]',moduleName:"consul-ui/components/role-selector/index.hbs",isStrictMode:!1})
-var s=(0,t.setComponentTemplate)(u,l.default.extend({repo:(0,r.inject)("repository/role"),dom:(0,r.inject)("dom"),name:"role",type:"role",classNames:["role-selector"],state:"role",policy:(0,o.alias)("policyForm.data"),init:function(){this._super(...arguments),(0,i.set)(this,"policyForm",this.formContainer.form("policy")),this.source=new a.CallableEventSource},actions:{reset:function(e){this._super(...arguments),this.policyForm.clear({Datacenter:this.dc})},dispatch:function(e,t){this.source.dispatchEvent({type:e,data:t})},change:function(){const e=this.dom.normalizeEvent(...arguments),t=e.target
-if("role[state]"===t.name)(0,i.set)(this,"state",t.value),"policy"===t.value&&this.dom.component(".code-editor",t.nextElementSibling).didAppear()
-else this._super(...arguments)},triggerStateCheckboxChange(){let e=document.getElementById(`${this.name}_state_policy`)
-e&&e.dispatchEvent(new Event("change"))}}}))
-e.default=s})),define("consul-ui/components/route/announcer/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"othmimN0",block:'[[[1,[28,[35,0],[[30,1]],[["separator"],[[28,[37,1],[[30,2]," - "],null]]]]],[1,"\\n"],[8,[39,2],null,[["@name"],["route-announcer"]],null],[1,"\\n\\n"]],["@title","@separator"],false,["page-title","or","portal-target"]]',moduleName:"consul-ui/components/route/announcer/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/route/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/service","@ember/object","@glimmer/tracking"],(function(e,t,n,l,r,i,o){var a,u,s,c,d,p,f,m,h,b
-function y(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function g(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const v=(0,n.createTemplateFactory)({id:"aUe64HGf",block:'[[[1,[28,[35,0],[[30,0,["connect"]]],null]],[1,"\\n"],[1,[28,[35,1],[[30,0,["disconnect"]]],null]],[1,"\\n"],[18,1,[[28,[37,3],null,[["model","params","currentName","refresh","t","exists","Title","Announcer"],[[30,0,["model"]],[30,0,["params"]],[30,0,["router","currentRoute","name"]],[30,0,["refresh"]],[30,0,["t"]],[30,0,["exists"]],[50,"route/title",0,null,null],[50,"route/announcer",0,null,null]]]]]]],["&default"],false,["did-insert","will-destroy","yield","hash","component"]]',moduleName:"consul-ui/components/route/index.hbs",isStrictMode:!1}),O=/\${([A-Za-z.0-9_-]+)}/g
-let P=(a=(0,r.inject)("routlet"),u=(0,r.inject)("router"),s=(0,r.inject)("intl"),c=(0,r.inject)("encoder"),d=class extends l.default{constructor(){super(...arguments),y(this,"routlet",p,this),y(this,"router",f,this),y(this,"intl",m,this),y(this,"encoder",h,this),y(this,"_model",b,this),this.intlKey=this.encoder.createRegExpEncoder(O,(e=>e))}get params(){return this.routlet.paramsFor(this.args.name)}get model(){if(this._model)return this._model
-if(this.args.name){const e=this.routlet.outletFor(this.args.name)
-if(e)return this.routlet.modelFor(e.name)}}exists(e){return this.routlet.exists(`${this.args.name}.${e}`)}t(e,t){return e.includes("${")&&(e=this.intlKey(e,t)),this.intl.t(`routes.${this.args.name}.${e}`,t)}connect(){this.routlet.addRoute(this.args.name,this)}disconnect(){this.routlet.removeRoute(this.args.name,this)}},p=g(d.prototype,"routlet",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=g(d.prototype,"router",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=g(d.prototype,"intl",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=g(d.prototype,"encoder",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=g(d.prototype,"_model",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g(d.prototype,"exists",[i.action],Object.getOwnPropertyDescriptor(d.prototype,"exists"),d.prototype),g(d.prototype,"t",[i.action],Object.getOwnPropertyDescriptor(d.prototype,"t"),d.prototype),g(d.prototype,"connect",[i.action],Object.getOwnPropertyDescriptor(d.prototype,"connect"),d.prototype),g(d.prototype,"disconnect",[i.action],Object.getOwnPropertyDescriptor(d.prototype,"disconnect"),d.prototype),d)
-e.default=P,(0,t.setComponentTemplate)(v,P)})),define("consul-ui/components/route/title/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"SU19CA8/",block:'[[[1,[28,[35,0],[[30,1]],[["separator"],[[30,2]]]]],[1,"\\n"],[41,[28,[37,2],[[30,3],false],null],[[[1,[30,1]],[1,"\\n"]],[]],null],[8,[39,3],null,[["@target"],["route-announcer"]],[["default"],[[[[1,"\\n"],[11,0],[24,0,"route-title"],[17,4],[24,"aria-live","assertive"],[24,"aria-atomic","true"],[12],[1,"\\n"],[1,"  "],[1,[28,[35,4],["Navigated to ",[30,1]],null]],[1,"\\n"],[13],[1,"\\n"]],[]]]]],[1,"\\n"]],["@title","@separator","@render","&attrs"],false,["page-title","if","not-eq","portal","concat"]]',moduleName:"consul-ui/components/route/title/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/search-bar/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","consul-ui/components/search-bar/utils"],(function(e,t,n,l,r,i){var o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const a=(0,n.createTemplateFactory)({id:"ltULr+gR",block:'[[[11,0],[24,0,"search-bar"],[17,1],[12],[1,"\\n  "],[10,"form"],[14,0,"filter-bar"],[12],[1,"\\n    "],[10,0],[14,0,"search"],[12],[1,"\\n      "],[18,4,[[28,[37,1],null,[["Search","Select"],[[50,"freetext-filter",0,null,null],[50,"popover-select",0,null,null]]]]]],[1,"\\n    "],[13],[1,"\\n    "],[10,0],[14,0,"filters"],[12],[1,"\\n      "],[18,5,[[28,[37,1],null,[["Search","Select"],[[50,"freetext-filter",0,null,null],[50,"popover-select",0,null,null]]]]]],[1,"\\n    "],[13],[1,"\\n    "],[10,0],[14,0,"sort"],[12],[1,"\\n      "],[18,6,[[28,[37,1],null,[["Search","Select"],[[50,"freetext-filter",0,null,null],[50,"popover-select",0,null,null]]]]]],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n"],[41,[30,0,["isFiltered"]],[[[1,"  "],[10,0],[14,0,"search-bar-status"],[12],[1,"\\n    "],[10,"dl"],[12],[1,"\\n      "],[10,"dt"],[12],[1,[28,[35,4],[[28,[37,5],["component.search-bar.header"],[["default","item"],["common.ui.filtered-by",""]]]],null]],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[10,"ul"],[12],[1,"\\n"],[42,[28,[37,7],[[28,[37,7],[[30,0,["filters"]]],null]],null],null,[[[1,"          "],[18,7,[[28,[37,1],null,[["RemoveFilter","status"],[[50,"search-bar/remove-filter",0,null,[["onclick"],[[28,[37,8],[[30,0],[28,[37,9],[[28,[37,9],[[30,3],[30,2,["key"]]],null],"change"],null],[28,[37,1],null,[["target"],[[28,[37,1],null,[["selectedItems"],[[28,[37,10],[[30,2,["selected"]],","],null]]]]]]]],null]]]],[28,[37,1],null,[["key","value"],[[30,2,["key"]],[28,[37,11],[[30,2,["value"]]],null]]]]]]]]],[1,"\\n"]],[2]],null],[1,"          "],[10,"li"],[14,0,"remove-all"],[12],[1,"\\n            "],[8,[39,8],[[4,[38,12],["click",[30,0,["removeAllFilters"]]],null]],null,[["default"],[[[[1,"\\n              Remove filters\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n"]],[]],null],[13],[1,"\\n"]],["&attrs","filter","@filter","&search","&filter","&sort","&status"],false,["yield","hash","component","if","string-trim","t","each","-track-array","action","get","join","lowercase","on"]]',moduleName:"consul-ui/components/search-bar/index.hbs",isStrictMode:!1})
-let u=(o=class extends l.default{get isFiltered(){const e=this.args.filter.searchproperty||{default:[],value:[]}
-return(0,i.diff)(e.default,e.value).length>0||Object.entries(this.args.filter).some((e=>{let[t,n]=e
-return"searchproperty"!==t&&void 0!==n.value}))}get filters(){return(0,i.filters)(this.args.filter)}removeAllFilters(){Object.values(this.args.filter).forEach(((e,t)=>{setTimeout((()=>e.change(e.default||[])),1*t)}))}},s=o.prototype,c="removeAllFilters",d=[r.action],p=Object.getOwnPropertyDescriptor(o.prototype,"removeAllFilters"),f=o.prototype,m={},Object.keys(p).forEach((function(e){m[e]=p[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=d.slice().reverse().reduce((function(e,t){return t(s,c,e)||e}),m),f&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(f):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(s,c,m),m=null),o)
-var s,c,d,p,f,m
-e.default=u,(0,t.setComponentTemplate)(a,u)})),define("consul-ui/components/search-bar/remove-filter/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"euFx6j52",block:'[[[10,"li"],[12],[1,"\\n  "],[8,[39,0],[[17,1],[4,[38,1],["click",[30,2]],null]],null,null],[1,"\\n  "],[18,3,null],[1,"\\n"],[13],[1,"\\n"]],["&attrs","@onclick","&default"],false,["action","on","yield"]]',moduleName:"consul-ui/components/search-bar/remove-filter/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/search-bar/utils",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.filters=e.diff=void 0
-const t=(e,t)=>e.filter((e=>!t.includes(e)))
-e.diff=t
-e.filters=e=>Object.entries(e).filter((e=>{let[n,l]=e
-return"searchproperty"===n?t(l.default,l.value).length>0:(l.value||[]).length>0})).reduce(((e,n)=>{let[l,r]=n
-return e.concat(r.value.map((e=>{const n={key:l,value:e}
-return n.selected="searchproperty"!==l?t(r.value,[e]):1===r.value.length?r.default:t(r.value,[e]),n})))}),[])})),define("consul-ui/components/state-chart/action/index",["exports","@ember/component","@ember/template-factory"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,n.createTemplateFactory)({id:"ryQhDcxm",block:'[[[18,1,null]],["&default"],false,["yield"]]',moduleName:"consul-ui/components/state-chart/action/index.hbs",isStrictMode:!1})
-var r=(0,t.setComponentTemplate)(l,t.default.extend({tagName:"",didInsertElement:function(){this._super(...arguments),this.chart.addAction(this.name,((e,t)=>this.exec(e,t)))},willDestroy:function(){this._super(...arguments),this.chart.removeAction(this.type)}}))
-e.default=r})),define("consul-ui/components/state-chart/guard/index",["exports","@ember/component","@ember/template-factory"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,n.createTemplateFactory)({id:"nyWRsZoG",block:'[[[18,1,null]],["&default"],false,["yield"]]',moduleName:"consul-ui/components/state-chart/guard/index.hbs",isStrictMode:!1})
-var r=(0,t.setComponentTemplate)(l,t.default.extend({tagName:"",didInsertElement:function(){this._super(...arguments)
-const e=this
-this.chart.addGuard(this.name,(function(){return"function"==typeof e.cond?e.cond(...arguments):e.cond}))},willDestroyElement:function(){this._super(...arguments),this.chart.removeGuard(this.name)}}))
-e.default=r})),define("consul-ui/components/state-chart/index",["exports","@ember/component","@ember/template-factory","@ember/service","@ember/object"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,n.createTemplateFactory)({id:"4gS2sdh2",block:'[[[18,1,[[50,"state",0,null,[["state"],[[33,2]]]],[50,"state-chart/guard",0,null,[["chart"],[[30,0]]]],[50,"state-chart/action",0,null,[["chart"],[[30,0]]]],[28,[37,3],[[30,0],"dispatch"],null],[33,2]]]],["&default"],false,["yield","component","state","action"]]',moduleName:"consul-ui/components/state-chart/index.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,t.default.extend({chart:(0,l.inject)("state"),tagName:"",ontransition:function(e){},init:function(){this._super(...arguments),this._actions={},this._guards={}},didReceiveAttrs:function(){var e=this
-void 0!==this.machine&&this.machine.stop(),void 0!==this.initial&&(this.src.initial=this.initial),this.machine=this.chart.interpret(this.src,{onTransition:e=>{const t=new CustomEvent("transition",{detail:e})
-this.ontransition(t),t.defaultPrevented||e.actions.forEach((t=>{"function"==typeof this._actions[t.type]&&this._actions[t.type](t.type,e.context,e.event)})),(0,r.set)(this,"state",e)},onGuard:function(t){for(var n=arguments.length,l=new Array(n>1?n-1:0),r=1;r<n;r++)l[r-1]=arguments[r]
-return e._guards[t](...l)}})},didInsertElement:function(){this._super(...arguments),(0,r.set)(this,"state",this.machine.initialState||this.machine.state),this.machine.start()},willDestroy:function(){this._super(...arguments),this.machine.stop()},addAction:function(e,t){this._actions[e]=t},removeAction:function(e){delete this._actions[e]},addGuard:function(e,t){this._guards[e]=t},removeGuard:function(e){delete this._guards[e]},dispatch:function(e,t){this.machine.state.context=t,this.machine.send({type:e})},actions:{dispatch:function(e,t){t&&t.preventDefault&&(void 0!==t.target.nodeName&&"a"===t.target.nodeName.toLowerCase()||t.preventDefault()),this.dispatch(e,t)}}}))
-e.default=o})),define("consul-ui/components/state-machine/index",["exports","@ember/component","@ember/template-factory","consul-ui/components/state-chart/index"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"aih0QG1V",block:'[[[18,1,[[28,[37,1],null,[["State","dispatch","state"],[[50,"state",0,null,[["state"],[[30,0,["state"]]]]],[28,[37,3],[[30,0],"dispatch"],null],[30,0,["state"]]]]]]],[1,"\\n"]],["&default"],false,["yield","hash","component","action"]]',moduleName:"consul-ui/components/state-machine/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,l.default.extend({}))
-e.default=i}))
-define("consul-ui/components/state/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object","@ember/service"],(function(e,t,n,l,r,i,o){var a,u,s,c
-function d(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function p(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const f=(0,n.createTemplateFactory)({id:"eD5/pCYw",block:'[[[1,[28,[35,0],[[30,0,["attributeChanged"]],[30,1],[30,2],[30,3]],null]],[1,"\\n"],[1,[28,[35,1],[[30,0,["attributeChanged"]],[30,1],[30,2],[30,3]],null]],[1,"\\n"],[41,[33,3],[[[1,"  "],[18,4,null],[1,"\\n"]],[]],null]],["@state","@matches","@notMatches","&default"],false,["did-insert","did-update","if","render","yield"]]',moduleName:"consul-ui/components/state/index.hbs",isStrictMode:!1})
-let m=(a=(0,o.inject)("state"),u=class extends l.default{constructor(){super(...arguments),d(this,"state",s,this),d(this,"render",c,this)}attributeChanged(e){let[t,n,l]=e
-void 0!==t&&(this.render=void 0!==n?this.state.matches(t,n):!this.state.matches(t,l))}},s=p(u.prototype,"state",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=p(u.prototype,"render",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),p(u.prototype,"attributeChanged",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"attributeChanged"),u.prototype),u)
-e.default=m,(0,t.setComponentTemplate)(f,m)})),define("consul-ui/components/tab-nav/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","consul-ui/helpers/href-to"],(function(e,t,n,l,r,i){var o,a,u,s,c
-function d(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function p(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.Tab=void 0
-const f=(0,n.createTemplateFactory)({id:"JKjao0kM",block:'[[[44,[[28,[37,1],[[28,[37,2],[[30,0],"style"],null]],[["offset"],[true]]],"tab"],[[[1,"  "],[11,"nav"],[23,5,[52,[30,0,["style"]],[28,[37,4],["--selected-width:",[30,0,["style","width"]],";","--selected-left:",[30,0,["style","left"]],";","--selected-height:",[30,0,["style","height"]],";","--selected-top:",[30,0,["style","top"]]],null],[27]]],[24,"aria-label","Secondary"],[16,0,[28,[37,4],["tab-nav"," animatable"],null]],[17,3],[12],[1,"\\n    "],[10,"ul"],[12],[1,"\\n"],[42,[28,[37,6],[[28,[37,6],[[30,4]],null]],null],null,[[[1,"        "],[11,"li"],[16,0,[52,[28,[37,7],[[30,5,["selected"]],[28,[37,8],[[33,9],[52,[30,5,["label"]],[28,[37,10],[[30,5,["label"]]],null],[28,[37,10],[[30,5]],null]]],null]],null],"selected"]],[4,[38,11],["click",[28,[37,12],[[30,1]],null]],null],[4,[38,13],[[52,[30,5,["selected"]],[28,[37,12],[[30,1]],null],[28,[37,14],null,null]],[30,4,["length"]]],null],[12],[1,"\\n          "],[8,[39,15],[[4,[38,11],["click",[28,[37,12],[[30,0,["onClick"]],[28,[37,16],[[30,5,["label"]]],null]],null]],null],[4,[38,11],["click",[28,[37,12],[[30,0,["onTabClicked"]],[30,5]],null]],null]],[["@href"],[[30,5,["href"]]]],[["default"],[[[[1,"\\n"],[41,[30,5,["tooltip"]],[[[1,"              "],[11,1],[4,[38,17],[[30,5,["tooltip"]]],null],[12],[1,[30,5,["label"]]],[13],[1,"\\n"]],[]],[[[1,"              "],[1,[30,5,["label"]]],[1,"\\n"]],[]]],[1,"          "]],[]]]]],[1,"\\n        "],[13],[1,"\\n"]],[5]],null],[1,"    "],[13],[1,"\\n  "],[13],[1,"\\n"]],[1,2]]]],["select","name","&attrs","@items","item"],false,["let","dom-position","set","if","concat","each","-track-array","or","eq","selected","slugify","on","fn","did-upsert","noop","action","uppercase","tooltip"]]',moduleName:"consul-ui/components/tab-nav/index.hbs",isStrictMode:!1})
-let m=(a=p((o=class{constructor(e){d(this,"route",a,this),d(this,"label",u,this),d(this,"tooltip",s,this),d(this,"currentRouteName",c,this)
-const{currentRouteName:t,route:n,label:l,tooltip:r,owner:i}=e
-this.currentRouteName=t,this.owner=i,this.route=n,this.label=l,this.tooltip=r}get selected(){return this.currentRouteName===this.route}get href(){return(0,i.hrefTo)(this.owner,[this.route])}}).prototype,"route",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=p(o.prototype,"label",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=p(o.prototype,"tooltip",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=p(o.prototype,"currentRouteName",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o)
-function h(){}e.Tab=m
-class b extends l.default{get onClick(){return this.args.onclick||h}get onTabClicked(){return this.args.onTabClicked||h}}e.default=b,(0,t.setComponentTemplate)(f,b)})),define("consul-ui/components/tabular-collection/index",["exports","@ember/component","@ember/template-factory","@ember/service","@ember/object","ember-collection/components/ember-collection","ember-collection/utils/needs-revalidate","ember-collection/layouts/grid","block-slots"],(function(e,t,n,l,r,i,o,a,u){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const s=(0,n.createTemplateFactory)({id:"LvcbSCcD",block:'[[[11,"table"],[16,0,[29,["tabular-collection dom-recycling ",[52,[33,1],"has-actions",""]]]],[16,1,[36,2]],[23,5,[28,[37,3],["height:",[33,4,["height"]],"px"],null]],[17,1],[12],[1,"\\n"],[1,[28,[35,5],["resize",[28,[37,6],[[30,0],"resize"],null]],null]],[1,"\\n"],[18,4,null],[1,"\\n"],[41,[33,8],[[[1,"  "],[10,"caption"],[12],[8,[39,9],null,[["@name"],["caption"]],[["default"],[[[[18,4,null]],[]]]]],[13],[1,"\\n"]],[]],null],[1,"  "],[10,"thead"],[12],[1,"\\n    "],[10,"tr"],[12],[1,"\\n      "],[8,[39,9],null,[["@name"],["header"]],[["default"],[[[[18,4,null]],[]]]]],[1,"\\n"],[41,[33,1],[[[1,"      "],[10,"th"],[14,0,"actions"],[12],[1,"Actions"],[13],[1,"\\n"]],[]],null],[1,"    "],[13],[1,"\\n  "],[13],[1,"\\n  "],[8,[39,10],null,[["@tagName","@content-size","@scroll-left","@scroll-top","@scrollChange","@clientSizeChange"],["tbody",[99,11,["@content-size"]],[99,12,["@scroll-left"]],[99,13,["@scroll-top"]],[28,[37,6],[[30,0],"scrollChange"],null],[28,[37,6],[[30,0],"clientSizeChange"],null]]],[["default"],[[[[1,"\\n    "],[10,"tr"],[12],[13],[42,[28,[37,15],[[28,[37,15],[[33,16]],null]],null],null,[[[10,"tr"],[22,5,[30,2,["style"]]],[15,"onclick",[28,[37,6],[[30,0],"click"],null]],[12],[1,"\\n      "],[8,[39,9],null,[["@name"],["row"]],[["default"],[[[[18,4,[[30,2,["item"]],[30,3]]]],[]]]]],[1,"\\n"],[41,[33,1],[[[1,"      "],[10,"td"],[14,0,"actions"],[12],[1,"\\n        "],[8,[39,9],null,[["@name","@params"],["actions",[28,[37,17],[[30,2,["index"]],[28,[37,6],[[30,0],"change"],null],[33,18]],null]]],[["default"],[[[[1,"\\n          "],[18,4,[[30,2,["item"]],[30,3]]],[1,"\\n        "]],[]]]]],[1,"\\n      "],[13],[1,"\\n"]],[]],null],[1,"    "],[13]],[2,3]],null]],[]]]]],[1,"\\n"],[13]],["&attrs","cell","index","&default"],false,["if","hasActions","guid","concat","style","on-window","action","yield","hasCaption","yield-slot","ember-native-scrollable","_contentSize","_scrollLeft","_scrollTop","each","-track-array","_cells","block-params","checked"]]',moduleName:"consul-ui/components/tabular-collection/index.hbs",isStrictMode:!1}),c=a.default.prototype.formatItemStyle
-var d=(0,t.setComponentTemplate)(s,i.default.extend(u.default,{tagName:"",dom:(0,l.inject)("dom"),width:1150,rowHeight:50,maxHeight:500,checked:null,hasCaption:!1,init:function(){this._super(...arguments),this.guid=this.dom.guid(this)
-const e=this
-this["cell-layout"]=new a.default((0,r.get)(this,"width"),(0,r.get)(this,"rowHeight")),this["cell-layout"].formatItemStyle=function(t){let n=c.apply(this,arguments)
-return e.checked===t&&(n=`${n};z-index: 1`),n}},didInsertElement:function(){this._super(...arguments),this.$element=this.dom.element(`#${this.guid}`),this.actions.resize.apply(this,[{target:this.dom.viewport()}])},style:(0,r.computed)("rowHeight","_items","maxRows","maxHeight",(function(){const e=(0,r.get)(this,"rows")
-let t=(0,r.get)(this,"maxHeight")
-if(e){let n=Math.max(3,(0,r.get)(this._items||[],"length"))
-n=Math.min(e,n),t=(0,r.get)(this,"rowHeight")*n+29}return{height:t}})),willRender:function(){this._super(...arguments),(0,r.set)(this,"hasCaption",this._isRegistered("caption")),(0,r.set)(this,"hasActions",this._isRegistered("actions"))},_needsRevalidate:function(){this.isDestroyed||this.isDestroying||(this._isGlimmer2()?this.rerender():(0,o.default)(this))},actions:{resize:function(e){const t=this.$element,n=this.dom.element(".app-view")
-if(n){const l=1,i=t.getBoundingClientRect(),o=this.dom.element('footer[role="contentinfo"]'),u=i.top+o.clientHeight+l,s=e.target.innerHeight-u
-this.set("maxHeight",Math.max(0,s)),this["cell-layout"]=new a.default(n.clientWidth,(0,r.get)(this,"rowHeight"))
-const d=this
-this["cell-layout"].formatItemStyle=function(e){let t=c.apply(this,arguments)
-return d.checked===e&&(t=`${t};z-index: 1`),t},this.updateItems(),this.updateScrollPosition()}},click:function(e){return this.dom.clickFirstAnchor(e)},change:function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-if(this.$tr&&(this.$tr.style.zIndex=null),t.target&&t.target.checked&&e!==(0,r.get)(this,"checked")){(0,r.set)(this,"checked",parseInt(e))
-const n=t.target,l=this.dom.closest("tr",n),i=this.dom.sibling(n,"div")
-i.getBoundingClientRect().top+i.clientHeight>this.dom.element('footer[role="contentinfo"]').getBoundingClientRect().top?i.classList.add("above"):i.classList.remove("above"),l.style.zIndex=1,this.$tr=l}else(0,r.set)(this,"checked",null)}}}))
-e.default=d})),define("consul-ui/components/tabular-details/index",["exports","@ember/component","@ember/template-factory","@ember/service","block-slots"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,n.createTemplateFactory)({id:"+Q2oF2tj",block:'[[[18,4,null],[1,"\\n"],[10,"table"],[14,0,"with-details has-actions"],[12],[1,"\\n  "],[10,"thead"],[12],[1,"\\n    "],[10,"tr"],[12],[1,"\\n      "],[8,[39,1],null,[["@name"],["header"]],[["default"],[[[[18,4,null]],[]]]]],[1,"\\n      "],[10,"th"],[14,0,"actions"],[12],[1,"Actions"],[13],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n  "],[10,"tbody"],[12],[1,"\\n"],[44,[[28,[37,3],["tabular-details-",[33,4],"-toggle-",[33,5],"_"],null]],[[[42,[28,[37,7],[[28,[37,7],[[33,8]],null]],null],null,[[[1,"      "],[10,"tr"],[15,"onclick",[28,[37,9],[[30,0],"click"],null]],[12],[1,"\\n          "],[8,[39,1],null,[["@name"],["row"]],[["default"],[[[[18,4,[[30,2],[30,3]]]],[]]]]],[1,"\\n          "],[10,"td"],[14,0,"actions"],[12],[1,"\\n            "],[10,"label"],[15,"for",[28,[37,3],[[30,1],[30,3]],null]],[12],[10,1],[12],[1,"Show details"],[13],[13],[1,"\\n          "],[13],[1,"\\n      "],[13],[1,"\\n      "],[10,"tr"],[12],[1,"\\n        "],[10,"td"],[14,"colspan","3"],[12],[1,"\\n          "],[10,"input"],[15,"checked",[28,[37,10],[[28,[37,11],[[30,2,["closed"]]],null]],null]],[15,2,[30,3]],[15,3,[36,4]],[15,1,[28,[37,3],[[30,1],[30,3]],null]],[15,"onchange",[28,[37,9],[[30,0],"change",[30,2],[33,8]],null]],[14,4,"checkbox"],[12],[13],[1,"\\n          "],[10,0],[12],[1,"\\n            "],[10,"label"],[15,"for",[28,[37,3],[[30,1],[30,3]],null]],[12],[10,1],[12],[1,"Hide details"],[13],[13],[1,"\\n            "],[10,0],[12],[1,"\\n              "],[8,[39,1],null,[["@name"],["details"]],[["default"],[[[[1,"\\n                "],[18,4,[[30,2],[30,3]]],[1,"\\n              "]],[]]]]],[1,"\\n            "],[13],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n"]],[2,3]],null]],[1]]],[1,"  "],[13],[1,"\\n"],[13],[1,"\\n"]],["inputId","item","index","&default"],false,["yield","yield-slot","let","concat","name","guid","each","-track-array","items","action","not","is-empty"]]',moduleName:"consul-ui/components/tabular-details/index.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,t.default.extend(r.default,{dom:(0,l.inject)("dom"),onchange:function(){},init:function(){this._super(...arguments),this.guid=this.dom.guid(this)},actions:{click:function(e){this.dom.clickFirstAnchor(e)},change:function(e,t,n){this.onchange(n,e,t)}}}))
-e.default=o})),define("consul-ui/components/tag-list/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"6itZIEFp",block:'[[[44,[[28,[37,1],[[28,[37,2],[[30,1,["Tags"]],[28,[37,3],null,null]],null],[28,[37,2],[[30,2],[28,[37,3],null,null]],null]],null]],[[[41,[28,[37,5],[[30,3,["length"]],0],null],[[[41,[48,[30,6]],[[[1,"      "],[18,6,[[50,"tag-list",0,null,[["item"],[[30,1]]]]]],[1,"\\n"]],[]],[[[11,"dl"],[24,0,"tag-list"],[17,4],[12],[1,"\\n  "],[11,"dt"],[4,[38,9],null,null],[12],[1,"\\n    "],[1,[28,[35,10],["components.tag-list.title"],[["default"],[[28,[37,3],["common.consul.tags"],null]]]]],[1,"\\n  "],[13],[1,"\\n  "],[10,"dd"],[12],[1,"\\n"],[42,[28,[37,12],[[28,[37,12],[[30,3]],null]],null],null,[[[1,"      "],[10,1],[12],[1,[30,5]],[13],[1,"\\n"]],[5]],null],[1,"  "],[13],[1,"\\n"],[13],[1,"\\n"]],[]]]],[]],null]],[3]]]],["@item","@tags","tags","&attrs","item","&default"],false,["let","union","or","array","if","gt","has-block","yield","component","tooltip","t","each","-track-array"]]',moduleName:"consul-ui/components/tag-list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/text-input/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"CVQgbzbo",block:'[[[8,[39,0],[[16,0,[28,[37,1],["text-input"," type-text"],null]],[17,1]],[["@item","@placeholder","@name","@label","@help","@validations","@chart"],[[30,2],[30,3],[30,4],[30,5],[30,6],[30,7],[30,8]]],[["label","input"],[[[[1,"\\n"],[1,"    "],[1,[28,[35,2],[[30,5],[30,4]],null]],[1,"\\n  "]],[]],[[[1,"\\n"],[41,[30,9],[[[1,"    "],[11,"textarea"],[16,3,[30,4]],[4,[38,4],[[30,2]],[["validations","chart"],[[30,7],[30,8]]]],[4,[38,5],["input",[28,[37,6],[[30,10]],null]],null],[12],[1,[28,[35,2],[[30,11],[28,[37,7],[[30,2],[30,4]],null]],null]],[13],[1,"\\n"]],[]],[[[1,"    "],[11,"input"],[16,2,[28,[37,2],[[30,11],[28,[37,7],[[30,2],[30,4]],null]],null]],[16,3,[30,4]],[16,"placeholder",[28,[37,2],[[30,3]],null]],[24,4,"text"],[4,[38,4],[[30,2]],[["validations","chart"],[[30,7],[30,8]]]],[4,[38,5],["input",[28,[37,6],[[30,10]],null]],null],[12],[13],[1,"\\n"]],[]]],[1,"  "]],[]]]]],[1,"\\n"]],["&attrs","@item","@placeholder","@name","@label","@help","@validations","@chart","@expanded","@oninput","@value"],false,["form-input","concat","or","if","validate","on","optional","get"]]',moduleName:"consul-ui/components/text-input/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/toggle-button/index",["exports","@ember/component","@ember/template-factory","@ember/service"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"DglTzUFT",block:'[[[11,"input"],[17,1],[24,4,"checkbox"],[16,"checked",[52,[33,1],"checked",[27]]],[16,1,[28,[37,2],["toggle-button-",[33,3]],null]],[16,"onchange",[28,[37,4],[[30,0],"change"],null]],[4,[38,5],[[28,[37,6],[[30,0],"input"],null]],null],[12],[13],[1,"\\n"],[11,"label"],[16,"for",[28,[37,2],["toggle-button-",[33,3]],null]],[4,[38,5],[[28,[37,6],[[30,0],"label"],null]],null],[12],[1,"\\n  "],[18,2,[[28,[37,8],null,[["click"],[[28,[37,4],[[30,0],"click"],null]]]]]],[1,"\\n"],[13]],["&attrs","&default"],false,["if","checked","concat","guid","action","did-insert","set","yield","hash"]]',moduleName:"consul-ui/components/toggle-button/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,t.default.extend({dom:(0,l.inject)("dom"),tagName:"",checked:!1,onchange:function(){},onblur:function(){},init:function(){this._super(...arguments),this.guid=this.dom.guid(this),this._listeners=this.dom.listeners()},willDestroyElement:function(){this._super(...arguments),this._listeners.remove()},didReceiveAttrs:function(){this._super(...arguments),this.checked?this.addClickOutsideListener():this._listeners.remove()},addClickOutsideListener:function(){this._listeners.remove(),this._listeners.add(this.dom.document(),"click",(e=>{this.dom.isOutside(this.label,e.target)&&this.dom.isOutside(this.label.nextElementSibling,e.target)&&(this.input.checked&&(this.input.checked=!1,this.onchange({target:this.input})),this._listeners.remove())}))},actions:{click:function(e){-1===(e.target.rel||"").indexOf("noopener")&&e.preventDefault(),this.input.checked=!this.input.checked,0!==e.detail&&e.target.blur(),this.actions.change.apply(this,[e])},change:function(e){this.input.checked&&this.addClickOutsideListener(),this.onchange({target:this.input})}}}))
-e.default=i})),define("consul-ui/components/token-list/index",["exports","@ember/component","@ember/template-factory","block-slots"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"YY0PAiL0",block:'[[[18,3,null],[1,"\\n"],[41,[28,[37,2],[[33,3,["length"]],0],null],[[[1,"  "],[8,[39,4],[[24,0,"token-list"]],[["@rows","@items"],[5,[28,[37,5],["AccessorID:asc",[33,3]],null]]],[["default"],[[[[1,"\\n"],[41,[33,6],[[[1,"    "],[8,[39,7],null,[["@name"],["caption"]],[["default"],[[[[1,[34,6]]],[]]]]],[1,"\\n"]],[]],null],[1,"      "],[8,[39,7],null,[["@name"],["header"]],[["default"],[[[[1,"\\n          "],[10,"th"],[12],[1,"AccessorID"],[13],[1,"\\n          "],[10,"th"],[12],[1,"Scope"],[13],[1,"\\n          "],[10,"th"],[12],[1,"Description"],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,7],null,[["@name"],["row"]],[["default"],[[[[1,"\\n          "],[10,"td"],[12],[1,"\\n            "],[10,3],[15,6,[28,[37,8],["dc.acls.tokens.edit",[30,1,["AccessorID"]]],null]],[15,"target",[28,[37,9],[[33,10],""],null]],[12],[1,[28,[35,11],[[30,1,["AccessorID"]],8,false],null]],[13],[1,"\\n          "],[13],[1,"\\n          "],[10,"td"],[12],[1,"\\n            "],[1,[52,[30,1,["Local"]],"local","global"]],[1,"\\n          "],[13],[1,"\\n          "],[10,"td"],[12],[1,"\\n            "],[10,2],[12],[1,[30,1,["Description"]]],[13],[1,"\\n          "],[13],[1,"\\n      "]],[]]]]],[1,"\\n  "]],[1,2]]]]],[1,"\\n"]],[]],null]],["item","index","&default"],false,["yield","if","gt","items","tabular-collection","sort-by","caption","block-slot","href-to","or","target","truncate"]]',moduleName:"consul-ui/components/token-list/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,t.default.extend(l.default,{tagName:""}))
-e.default=i})),define("consul-ui/components/token-source/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={id:"token-source",initial:"idle",on:{RESTART:[{target:"secret",cond:"isSecret"},{target:"provider"}]},states:{idle:{},secret:{},provider:{on:{SUCCESS:"jwt"}},jwt:{on:{SUCCESS:"token"}},token:{}}}})),define("consul-ui/components/token-source/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@glimmer/tracking","consul-ui/components/token-source/chart.xstate"],(function(e,t,n,l,r,i,o){var a,u,s
-function c(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function d(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function p(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function f(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const m=(0,n.createTemplateFactory)({id:"49zN7wYk",block:'[[[8,[39,0],null,[["@src","@initial"],[[30,0,["chart"]],[52,[28,[37,2],[[30,1],"oidc"],null],"provider","secret"]]],[["default"],[[[[1,"\\n  "],[8,[30,3],null,[["@name","@cond"],["isSecret",[30,0,["isSecret"]]]],null],[1,"\\n"],[44,[[28,[37,4],["/${partition}/${nspace}/${dc}",[28,[37,5],null,[["partition","nspace","dc"],[[28,[37,6],[[30,7,["Partition"]],[30,8]],null],[28,[37,6],[[30,7,["Namespace"]],[30,9]],null],[30,10]]]]],null]],[[[1,"    "],[8,[30,2],null,[["@matches"],["secret"]],[["default"],[[[[1,"\\n      "],[8,[39,7],null,[["@src","@onchange","@onerror"],[[28,[37,4],[[28,[37,8],[[30,11],"/token/self/${value}"],null],[28,[37,5],null,[["value"],[[30,7]]]]],null],[30,0,["change"]],[30,12]]],null],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[30,2],null,[["@matches"],["provider"]],[["default"],[[[[1,"\\n      "],[8,[39,7],null,[["@src","@onchange","@onerror"],[[28,[37,4],[[28,[37,8],[[30,11],"/oidc/provider/${value}"],null],[28,[37,5],null,[["value"],[[30,7,["Name"]]]]]],null],[28,[37,9],[[28,[37,10],[[30,0],[28,[37,11],[[30,0,["provider"]]],null]],[["value"],["data"]]],[28,[37,10],[[30,0],[30,5],"SUCCESS"],null]],null],[30,12]]],null],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[30,2],null,[["@matches"],["jwt"]],[["default"],[[[[1,"\\n      "],[8,[39,12],null,[["@src","@onchange","@onerror"],[[30,0,["provider","AuthURL"]],[28,[37,9],[[28,[37,10],[[30,0],[28,[37,11],[[30,0,["jwt"]]],null]],[["value"],["data"]]],[28,[37,10],[[30,0],[30,5],"SUCCESS"],null]],null],[30,12]]],null],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[30,2],null,[["@matches"],["token"]],[["default"],[[[[1,"\\n      "],[8,[39,7],null,[["@src","@onchange","@onerror"],[[28,[37,4],[[28,[37,8],[[30,11],"/oidc/authorize/${provider}/${code}/${state}"],null],[28,[37,5],null,[["provider","code","state"],[[30,0,["provider","Name"]],[30,0,["jwt","authorizationCode"]],[28,[37,6],[[30,0,["jwt","authorizationState"]],""],null]]]]],null],[30,0,["change"]],[30,12]]],null],[1,"\\n    "]],[]]]]],[1,"\\n"]],[11]]]],[2,3,4,5,6]]]]]],["@type","State","Guard","Action","dispatch","state","@value","@partition","@nspace","@dc","path","@onerror"],false,["state-chart","if","eq","let","uri","hash","or","data-source","concat","queue","action","mut","jwt-source"]]',moduleName:"consul-ui/components/token-source/index.hbs",isStrictMode:!1})
-let h=(a=class extends l.default{constructor(){super(...arguments),d(this,"provider",u,this),d(this,"jwt",s,this),this.chart=o.default}isSecret(){return"secret"===this.args.type}change(e){e.data.toJSON=function(){return function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?c(Object(n),!0).forEach((function(t){p(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({AccessorID:this.AccessorID,SecretID:this.SecretID,Namespace:this.Namespace,Partition:this.Partition},{AuthMethod:void 0!==this.AuthMethod?this.AuthMethod:void 0})},"function"==typeof this.args.onchange&&this.args.onchange(e)}},u=f(a.prototype,"provider",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=f(a.prototype,"jwt",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f(a.prototype,"isSecret",[r.action],Object.getOwnPropertyDescriptor(a.prototype,"isSecret"),a.prototype),f(a.prototype,"change",[r.action],Object.getOwnPropertyDescriptor(a.prototype,"change"),a.prototype),a)
-e.default=h,(0,t.setComponentTemplate)(m,h)})),define("consul-ui/components/tooltip/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"jqmSqAnI",block:'[[[11,0],[24,0,"tooltip"],[17,1],[4,[38,0],null,[["options"],[[28,[37,1],null,[["triggerTarget"],["parentNode"]]]]]],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13],[1,"\\n"]],["&attrs","&default"],false,["tooltip","hash","yield"]]',moduleName:"consul-ui/components/tooltip/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/topology-metrics/card/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,n.createTemplateFactory)({id:"c/ycqEdD",block:'[[[41,[28,[37,1],[[30,1,["Datacenter"]],""],null],[[[10,3],[14,0,"topology-metrics-card"],[15,6,[28,[37,2],["dc.services.index"],null]],[15,"data-permission",[28,[37,3],[[30,1]],null]],[12],[1,"\\n  "],[10,2],[14,0,"empty"],[12],[1,"\\n    "],[1,[30,1,["Name"]]],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n"]],[]],[[[10,3],[14,0,"topology-metrics-card"],[15,6,[52,[28,[37,4],[[28,[37,5],["CONSUL_NSPACES_ENABLED"],null],[28,[37,6],[[30,1,["Namespace"]],[30,2,["Namespace"]]],null]],null],[28,[37,2],[[30,0,["hrefPath"]],[30,1,["Datacenter"]],[30,1,["Name"]]],[["params"],[[28,[37,7],null,[["nspace"],[[30,1,["Namespace"]]]]]]]],[28,[37,2],[[30,0,["hrefPath"]],[30,1,["Name"]]],null]]],[15,"data-permission",[28,[37,3],[[30,1]],null]],[15,1,[29,[[30,1,["Namespace"]],[30,1,["Name"]]]]],[12],[1,"\\n  "],[10,2],[12],[1,"\\n    "],[1,[30,1,["Name"]]],[1,"\\n  "],[13],[1,"\\n"],[41,[28,[37,1],[[30,1,["Source"]],"proxy-registration"],null],[[[1,"    "],[8,[39,8],null,[["@source"],["proxy-registration"]],null],[1,"\\n"]],[]],null],[41,[28,[37,1],[[30,1,["Source"]],"routing-config"],null],[[[1,"    "],[8,[39,8],null,[["@source"],["routing-config"]],null],[1,"\\n"]],[]],null],[1,"  "],[10,0],[14,0,"details"],[12],[1,"\\n"],[41,[28,[37,4],[[28,[37,9],["use partitions"],null],[28,[37,9],["use nspaces"],null]],null],[[[1,"    "],[10,0],[15,0,[52,[28,[37,6],[[30,1,["Partition"]],[30,2,["Partition"]]],null],"group"]],[12],[1,"\\n"],[41,[28,[37,6],[[30,1,["Partition"]],[30,2,["Partition"]]],null],[[[1,"      "],[10,"dl"],[14,0,"partition"],[12],[1,"\\n        "],[10,"dt"],[12],[1,"\\n          "],[8,[39,10],null,null,[["default"],[[[[1,"\\n              Admin Partition\\n          "]],[]]]]],[1,"\\n        "],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[1,[30,1,["Partition"]]],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n"]],[]],null],[1,"      "],[10,1],[12],[13],[1,"\\n"],[41,[28,[37,11],[[28,[37,6],[[30,1,["Partition"]],[30,2,["Partition"]]],null],[28,[37,6],[[30,1,["Namespace"]],[30,2,["Namespace"]]],null]],null],[[[1,"      "],[10,"dl"],[14,0,"nspace"],[12],[1,"\\n        "],[10,"dt"],[12],[1,"\\n          "],[8,[39,10],null,null,[["default"],[[[[1,"\\n              Namespace\\n          "]],[]]]]],[1,"\\n        "],[13],[1,"\\n        "],[10,"dd"],[12],[1,"\\n          "],[1,[30,1,["Namespace"]]],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n"]],[]],null],[1,"    "],[13],[1,"\\n"]],[]],null],[1,"\\n"],[41,[28,[37,6],[[30,1,["Source"]],"routing-config"],null],[[[1,"\\n"],[41,[28,[37,1],[[30,1,["Datacenter"]],[30,3]],null],[[[44,[[28,[37,13],[[30,1]],null]],[[[41,[28,[37,1],[[30,4],""],null],[[[1,"    "],[10,1],[14,0,"empty"],[12],[1,"No health checks"],[13],[1,"\\n"]],[]],[[[41,[28,[37,6],[[30,4,["passing"]],0],null],[[[1,"      "],[10,1],[14,0,"passing"],[12],[1,[30,4,["passing"]]],[1,"%"],[13],[1,"\\n"]],[]],null],[41,[28,[37,6],[[30,4,["warning"]],0],null],[[[1,"      "],[10,1],[14,0,"warning"],[12],[1,[30,4,["warning"]]],[1,"%"],[13],[1,"\\n"]],[]],null],[41,[28,[37,6],[[30,4,["critical"]],0],null],[[[1,"      "],[10,1],[14,0,"critical"],[12],[1,[30,4,["critical"]]],[1,"%"],[13],[1,"\\n"]],[]],null]],[]]]],[4]]]],[]],[[[1,"    "],[10,"dl"],[14,0,"health"],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        "],[8,[39,10],null,null,[["default"],[[[[1,"\\n            We are unable to determine the health status of services in remote datacenters.\\n        "]],[]]]]],[1,"\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        Health\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[]]],[1,"\\n"]],[]],null],[1,"  "],[13],[1,"\\n  "],[18,5,null],[1,"\\n"],[13],[1,"\\n"]],[]]]],["@item","@service","@dc","percentage","&default"],false,["if","eq","href-to","service/card-permissions","and","env","not-eq","hash","topology-metrics/source-type","can","tooltip","or","let","service/health-percentage","yield"]]',moduleName:"consul-ui/components/topology-metrics/card/index.hbs",isStrictMode:!1})
-class o extends l.default{get hrefPath(){return"routing-config"===(0,r.get)(this.args.item,"Source")?"dc.routing-config":"dc.services.show.index"}}e.default=o,(0,t.setComponentTemplate)(i,o)})),define("consul-ui/components/topology-metrics/down-lines/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object","@ember/service"],(function(e,t,n,l,r,i,o){var a,u,s,c
-function d(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function p(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const f=(0,n.createTemplateFactory)({id:"PeAVld7e",block:'[[[41,[28,[37,1],[[30,1,["length"]],0],null],[[[1,"  "],[11,"svg"],[16,"viewBox",[28,[37,2],[[30,2,["x"]]," ",[30,2,["y"]]," ",[30,2,["width"]]," ",[30,2,["height"]]],null]],[24,"preserveAspectRatio","none"],[4,[38,3],[[30,0,["getIconPositions"]]],null],[4,[38,4],[[30,0,["getIconPositions"]],[30,1]],null],[12],[1,"\\n    "],[10,"defs"],[12],[1,"\\n      "],[10,"marker"],[15,1,[28,[37,2],[[30,0,["guid"]],"-allow-dot"],null]],[14,0,"allow-dot"],[14,"viewBox","-2 -2 15 15"],[14,"refX","6"],[14,"refY","6"],[14,"markerWidth","6"],[14,"markerHeight","6"],[12],[1,"\\n        "],[10,"circle"],[14,"cx","6"],[14,"cy","6"],[14,"r","6"],[12],[13],[1,"\\n      "],[13],[1,"\\n      "],[10,"marker"],[15,1,[28,[37,2],[[30,0,["guid"]],"-allow-arrow"],null]],[14,0,"allow-arrow"],[14,"viewBox","-1 -1 12 12"],[14,"refX","5"],[14,"refY","5"],[14,"markerWidth","6"],[14,"markerHeight","6"],[14,"orient","auto-start-reverse"],[12],[1,"\\n        "],[10,"polygon"],[14,"points","0 0 10 5 0 10"],[12],[13],[1,"\\n      "],[13],[1,"\\n      "],[10,"marker"],[15,1,[28,[37,2],[[30,0,["guid"]],"-deny-dot"],null]],[14,0,"deny-dot"],[14,"viewBox","-2 -2 15 15"],[14,"refX","6"],[14,"refY","6"],[14,"markerWidth","6"],[14,"markerHeight","6"],[12],[1,"\\n        "],[10,"circle"],[14,"cx","6"],[14,"cy","6"],[14,"r","6"],[12],[13],[1,"\\n      "],[13],[1,"\\n      "],[10,"marker"],[15,1,[28,[37,2],[[30,0,["guid"]],"-deny-arrow"],null]],[14,0,"deny-arrow"],[14,"viewBox","-1 -1 12 12"],[14,"refX","5"],[14,"refY","5"],[14,"markerWidth","6"],[14,"markerHeight","6"],[14,"orient","auto-start-reverse"],[12],[1,"\\n        "],[10,"polygon"],[14,"points","0 0 10 5 0 10"],[12],[13],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"],[42,[28,[37,6],[[28,[37,6],[[30,1]],null]],null],null,[[[41,[28,[37,7],[[30,3,["permission"]],"deny"],null],[[[1,"    "],[10,"path"],[15,1,[28,[37,2],[[30,0,["guid"]],[30,3,["id"]]],null]],[15,"d",[28,[37,8],[[30,3,["dest"]]],[["src"],[[30,3,["src"]]]]]],[15,"marker-start",[28,[37,2],["url(#",[30,0,["guid"]],"-deny-dot)"],null]],[15,"marker-end",[28,[37,2],["url(#",[30,0,["guid"]],"-deny-arrow)"],null]],[15,"data-permission",[30,3,["permission"]]],[12],[13],[1,"\\n"]],[]],[[[1,"     "],[10,"path"],[15,1,[28,[37,2],[[30,0,["guid"]],[30,3,["id"]]],null]],[15,"d",[28,[37,8],[[30,3,["dest"]]],[["src"],[[30,3,["src"]]]]]],[15,"marker-start",[28,[37,2],["url(#",[30,0,["guid"]],"-allow-dot)"],null]],[15,"marker-end",[28,[37,2],["url(#",[30,0,["guid"]],"-allow-arrow)"],null]],[15,"data-permission",[30,3,["permission"]]],[12],[13],[1,"\\n"]],[]]]],[3]],null],[1,"  "],[13],[1,"\\n"]],[]],null],[1,"\\n"],[44,[[28,[37,10],[[28,[37,11],["update intention for service"],[["item"],[[30,4,["Service"]]]]]],null]],[[[42,[28,[37,6],[[28,[37,6],[[30,6]],null]],null],null,[[[41,[28,[37,12],[[28,[37,13],[[30,7,["Datacenter"]],""],null],[28,[37,14],[[28,[37,10],[[30,7,["Intention","Allowed"]]],null],[30,7,["Intention","HasPermissions"]]],null]],null],[[[1,"    "],[8,[39,15],null,[["@type","@position","@item","@disabled","@oncreate"],[[52,[30,7,["Intention","HasPermissions"]],"l7","deny"],[28,[37,16],["id",[28,[37,2],[[30,0,["guid"]],[30,7,["Namespace"]],[30,7,["Name"]]],null],[30,0,["iconPositions"]]],null],[30,7],[30,5],[28,[37,17],[[30,0],[30,8],[30,7],[30,4]],null]]],null],[1,"\\n"]],[]],[[[41,[28,[37,12],[[28,[37,13],[[30,7,["Datacenter"]],""],null],[30,7,["Intention","Allowed"]],[28,[37,10],[[30,7,["TransparentProxy"]]],null],[28,[37,10],[[30,7,["ConnectNative"]]],null],[28,[37,7],[[30,7,["Source"]],"specific-intention"],null]],null],[[[1,"    "],[8,[39,15],null,[["@type","@service","@position","@item","@disabled","@oncreate"],["not-defined",[30,4],[28,[37,16],["id",[28,[37,2],[[30,0,["guid"]],[30,7,["Namespace"]],[30,7,["Name"]]],null],[30,0,["iconPositions"]]],null],[30,7],[30,5],[28,[37,17],[[30,0],[30,8],[30,7],[30,4]],null]]],null],[1,"\\n  "]],[]],null]],[]]]],[7]],null]],[5]]],[1,"\\n"]],["@lines","@view","line","@service","disabled","@items","item","@oncreate"],false,["if","gt","concat","did-insert","did-update","each","-track-array","eq","svg-curve","let","not","can","and","not-eq","or","topology-metrics/popover","find-by","action"]]',moduleName:"consul-ui/components/topology-metrics/down-lines/index.hbs",isStrictMode:!1})
-let m=(a=(0,o.inject)("dom"),u=class extends l.default{constructor(){super(...arguments),d(this,"iconPositions",s,this),d(this,"dom",c,this)}get guid(){return this.dom.guid(this)}getIconPositions(){const e=this.args.view,t=[...document.querySelectorAll("#downstream-lines path")]
-this.iconPositions=t.map((t=>{const n=parseFloat(t.getTotalLength()),l=t.getPointAtLength(Math.ceil(n/3))
-return{id:t.id,x:Math.round(l.x-e.x),y:Math.round(l.y-e.y)}}))}},s=p(u.prototype,"iconPositions",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=p(u.prototype,"dom",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p(u.prototype,"getIconPositions",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"getIconPositions"),u.prototype),u)
-e.default=m,(0,t.setComponentTemplate)(f,m)})),define("consul-ui/components/topology-metrics/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object","@ember/service"],(function(e,t,n,l,r,i,o){var a,u,s,c,d,p,f,m,h,b,y
-function g(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function v(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const O=(0,n.createTemplateFactory)({id:"/n9s2uNC",block:'[[[11,0],[24,0,"topology-container consul-topology-metrics"],[4,[38,0],[[30,0,["calculate"]]],null],[12],[1,"\\n"],[41,[28,[37,2],[[30,0,["downstreams","length"]],0],null],[[[1,"  "],[11,0],[24,1,"downstream-container"],[4,[38,3],[[30,0,["setHeight"]],"downstream-lines"],null],[4,[38,4],[[30,0,["setHeight"]],"downstream-lines",[30,0,["downstreams"]]],null],[12],[1,"\\n"],[41,[28,[37,5],[[30,0,["emptyColumn"]]],null],[[[1,"    "],[10,0],[12],[1,"\\n      "],[10,2],[12],[1,[30,1,["Name"]]],[13],[1,"\\n      "],[10,1],[12],[1,"\\n        "],[8,[39,6],null,null,[["default"],[[[[1,"\\n          Only showing downstreams within the current datacenter for "],[1,[30,2,["Service","Service"]]],[1,".\\n        "]],[]]]]],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[]],null],[42,[28,[37,8],[[28,[37,8],[[30,0,["downstreams"]]],null]],null],null,[[[1,"    "],[8,[39,9],null,[["@nspace","@dc","@service","@item","@hasMetricsProvider","@noMetricsReason"],[[30,4],[30,1,["Name"]],[30,2,["Service"]],[30,3],[30,5],[30,0,["noMetricsReason"]]]],[["default"],[[[[1,"\\n"],[41,[28,[37,10],[[30,5],[30,0,["mainNotIngressService"]],[28,[37,11],[[30,3,["Kind"]],"ingress-gateway"],null]],null],[[[1,"      "],[8,[39,12],null,[["@nspace","@partition","@dc","@endpoint","@service","@item","@noMetricsReason"],[[28,[37,13],[[30,3,["Namespace"]],"default"],null],[28,[37,13],[[30,3,["Partition"]],"default"],null],[30,3,["Datacenter"]],"downstream-summary-for-service",[30,2,["Service","Service"]],[30,3,["Name"]],[30,0,["noMetricsReason"]]]],null],[1,"\\n"]],[]],null],[1,"    "]],[]]]]],[1,"\\n"]],[3]],null],[1,"  "],[13],[1,"\\n"]],[]],null],[1,"  "],[10,0],[14,1,"metrics-container"],[12],[1,"\\n    "],[10,0],[14,0,"metrics-header"],[12],[1,"\\n      "],[1,[30,2,["Service","Service"]]],[1,"\\n    "],[13],[1,"\\n"],[41,[28,[37,11],[[30,2,["Service","Meta","external-source"]],"consul-api-gateway"],null],[[[41,[30,5],[[[1,"      "],[8,[39,14],null,[["@nspace","@partition","@dc","@service","@protocol","@noMetricsReason"],[[28,[37,13],[[30,2,["Service","Namespace"]],"default"],null],[28,[37,13],[[33,15,["Service","Partition"]],"default"],null],[30,1,["Name"]],[30,2,["Service","Service"]],[30,6,["Protocol"]],[30,0,["noMetricsReason"]]]],null],[1,"\\n"],[41,[30,0,["mainNotIngressService"]],[[[1,"      "],[8,[39,12],null,[["@nspace","@partition","@dc","@endpoint","@service","@protocol","@noMetricsReason"],[[28,[37,13],[[30,2,["Service","Namespace"]],"default"],null],[28,[37,13],[[33,15,["Service","Partition"]],"default"],null],[30,1,["Name"]],"summary-for-service",[30,2,["Service","Service"]],[30,6,["Protocol"]],[30,0,["noMetricsReason"]]]],null],[1,"\\n"]],[]],null]],[]],null],[1,"    "],[10,0],[14,0,"link"],[12],[1,"\\n"],[41,[30,7],[[[1,"      "],[10,3],[14,0,"metrics-link"],[15,6,[30,7]],[14,"target","_blank"],[14,"rel","noopener noreferrer"],[12],[1,"Open dashboard"],[13],[1,"\\n"]],[]],[[[1,"      "],[10,3],[14,0,"config-link"],[15,6,[29,[[28,[37,16],["CONSUL_DOCS_URL"],null],"/connect/observability/ui-visualization"]]],[14,"target","_blank"],[14,"rel","noopener noreferrer"],[12],[1,"Configure dashboard"],[13],[1,"\\n"]],[]]],[1,"    "],[13],[1,"\\n"]],[]],null],[1,"  "],[13],[1,"\\n  "],[10,0],[14,1,"downstream-lines"],[12],[1,"\\n    "],[8,[39,17],null,[["@type","@service","@view","@center","@lines","@items","@oncreate"],["downstream",[30,2],[30,0,["downView"]],[30,0,["centerDimensions"]],[30,0,["downLines"]],[30,0,["downstreams"]],[28,[37,18],[[30,0],[30,8]],null]]],null],[1,"\\n  "],[13],[1,"\\n"],[41,[28,[37,2],[[30,0,["upstreams","length"]],0],null],[[[1,"  "],[10,0],[14,1,"upstream-column"],[12],[1,"\\n"],[42,[28,[37,19],[[28,[37,20],["PeerOrDatacenter",[30,0,["upstreams"]]],null]],null],null,[[[1,"    "],[11,0],[24,1,"upstream-container"],[4,[38,3],[[30,0,["setHeight"]],"upstream-lines"],null],[4,[38,4],[[30,0,["setHeight"]],"upstream-lines",[30,0,["upstreams"]]],null],[12],[1,"\\n"],[41,[30,10],[[[1,"      "],[10,2],[12],[1,[30,10]],[13],[1,"\\n"]],[]],null],[42,[28,[37,8],[[28,[37,8],[[30,9]],null]],null],null,[[[1,"      "],[8,[39,9],null,[["@dc","@item","@service"],[[30,1,["Name"]],[30,11],[30,2,["Service"]]]],[["default"],[[[[1,"\\n"],[41,[28,[37,10],[[30,5],[30,0,["mainNotIngressService"]],[28,[37,11],[[30,11,["Kind"]],"ingress-gateway"],null]],null],[[[1,"        "],[8,[39,12],null,[["@nspace","@partition","@dc","@endpoint","@service","@item","@noMetricsReason"],[[28,[37,13],[[30,11,["Namespace"]],"default"],null],[28,[37,13],[[30,11,["Partition"]],"default"],null],[30,11,["Datacenter"]],"upstream-summary-for-service",[30,2,["Service","Service"]],[30,11,["Name"]],[30,0,["noMetricsReason"]]]],null],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n"]],[11]],null],[1,"    "],[13],[1,"\\n"]],[9,10]],null],[1,"  "],[13],[1,"\\n"]],[]],null],[1,"  "],[10,0],[14,1,"upstream-lines"],[12],[1,"\\n    "],[8,[39,21],null,[["@type","@service","@view","@center","@lines","@items","@oncreate"],["upstream",[30,2],[30,0,["upView"]],[30,0,["centerDimensions"]],[30,0,["upLines"]],[30,0,["upstreams"]],[28,[37,18],[[30,0],[30,8]],null]]],null],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n"]],["@dc","@service","item","@nspace","@hasMetricsProvider","@topology","@metricsHref","@oncreate","upstreams","dc","item"],false,["on-resize","if","gt","did-insert","did-update","not","tooltip","each","-track-array","topology-metrics/card","and","not-eq","topology-metrics/stats","or","topology-metrics/series","service","env","topology-metrics/down-lines","action","-each-in","group-by","topology-metrics/up-lines"]]',moduleName:"consul-ui/components/topology-metrics/index.hbs",isStrictMode:!1})
-let P=(a=(0,o.inject)("env"),u=(0,o.inject)(),s=class extends l.default{constructor(){super(...arguments),g(this,"env",c,this),g(this,"abilities",d,this),g(this,"centerDimensions",p,this),g(this,"downView",f,this),g(this,"downLines",m,this),g(this,"upView",h,this),g(this,"upLines",b,this),g(this,"noMetricsReason",y,this)}drawDownLines(e){const t=["allow","deny"],n={x:this.centerDimensions.x-7,y:this.centerDimensions.y+this.centerDimensions.height/2}
-return e.map((e=>{const t=e.getBoundingClientRect(),l={x:t.x+t.width,y:t.y+t.height/2}
-return{id:e.id,permission:e.getAttribute("data-permission"),dest:n,src:l}})).sort(((e,n)=>t.indexOf(e.permission)-t.indexOf(n.permission)))}drawUpLines(e){const t=["allow","deny"],n={x:this.centerDimensions.x+5.5,y:this.centerDimensions.y+this.centerDimensions.height/2}
-return e.map((e=>{const t=e.getBoundingClientRect(),l={x:t.x-t.width-25,y:t.y+t.height/2}
-return{id:e.id,permission:e.getAttribute("data-permission"),dest:l,src:n}})).sort(((e,n)=>t.indexOf(e.permission)-t.indexOf(n.permission)))}emptyColumn(){const e=(0,i.get)(this.args.topology,"noDependencies")
-return!this.env.var("CONSUL_ACLS_ENABLED")||e}get downstreams(){const e=(0,i.get)(this.args.topology,"Downstreams")||[],t=[...e],n=(0,i.get)(this.args.topology,"noDependencies")
-if(!this.env.var("CONSUL_ACLS_ENABLED")&&n)t.push({Name:"Downstreams unknown.",Empty:!0,Datacenter:"",Namespace:""})
-else if(0===e.length){const e=this.abilities.can("use peers")
-t.push({Name:e?"No downstreams, or the downstreams are imported services.":"No downstreams.",Datacenter:"",Namespace:""})}return t}get upstreams(){const e=(0,i.get)(this.args.topology,"Upstreams")||[]
-e.forEach((e=>{e.PeerOrDatacenter=e.PeerName||e.Datacenter}))
-const t=[...e],n=(0,i.get)(this.args.dc,"DefaultACLPolicy"),l=(0,i.get)(this.args.topology,"wildcardIntention"),r=(0,i.get)(this.args.topology,"noDependencies")
-return!this.env.var("CONSUL_ACLS_ENABLED")&&r?t.push({Name:"Upstreams unknown.",Datacenter:"",PeerOrDatacenter:"",Namespace:""}):"allow"===n||l?t.push({Name:"* (All Services)",Datacenter:"",PeerOrDatacenter:"",Namespace:""}):0===e.length&&t.push({Name:"No upstreams.",Datacenter:"",PeerOrDatacenter:"",Namespace:""}),t}get mainNotIngressService(){return"ingress-gateway"!==((0,i.get)(this.args.service.Service,"Kind")||"")}setHeight(e,t){if(e){const n=e.getBoundingClientRect()
-document.getElementById(`${t[0]}`).setAttribute("style",`height:${n.height}px`)}this.calculate()}calculate(){this.args.isRemoteDC?this.noMetricsReason="remote-dc":"ingress-gateway"===this.args.service.Service.Kind?this.noMetricsReason="ingress-gateway":this.noMetricsReason=null
-const e=document.getElementById("downstream-lines").getBoundingClientRect(),t=document.getElementById("upstream-lines").getBoundingClientRect(),n=document.getElementById("upstream-column")
-this.emptyColumn?this.downView={x:e.x,y:e.y,width:e.width,height:e.height+10}:this.downView=e,n&&(this.upView={x:t.x,y:t.y,width:t.width,height:n.getBoundingClientRect().height+10})
-const l=[...document.querySelectorAll("#downstream-container .topology-metrics-card")],r=document.querySelector(".metrics-header"),i=[...document.querySelectorAll("#upstream-column .topology-metrics-card")]
-this.centerDimensions=r.getBoundingClientRect(),this.downLines=this.drawDownLines(l),this.upLines=this.drawUpLines(i)}},c=v(s.prototype,"env",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=v(s.prototype,"abilities",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=v(s.prototype,"centerDimensions",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=v(s.prototype,"downView",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=v(s.prototype,"downLines",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return[]}}),h=v(s.prototype,"upView",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=v(s.prototype,"upLines",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return[]}}),y=v(s.prototype,"noMetricsReason",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v(s.prototype,"setHeight",[i.action],Object.getOwnPropertyDescriptor(s.prototype,"setHeight"),s.prototype),v(s.prototype,"calculate",[i.action],Object.getOwnPropertyDescriptor(s.prototype,"calculate"),s.prototype),s)
-e.default=P,(0,t.setComponentTemplate)(O,P)})),define("consul-ui/components/topology-metrics/notifications/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"PrGtFY8+",block:'[[[41,[28,[37,1],[[30,1],"create"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    Your intention has been added.\\n"]],[]],[[[1,"    There was an error adding your intention.\\n"]],[]]]],[]],[[[41,[28,[37,1],[[30,1],"update"],null],[[[41,[28,[37,1],[[30,2],"success"],null],[[[1,"    Your intention has been saved.\\n"]],[]],[[[1,"    There was an error saving your intention.\\n"]],[]]]],[]],null]],[]]],[44,[[30,3,["errors","firstObject"]]],[[[41,[30,4,["detail"]],[[[1,"    "],[10,"br"],[12],[13],[1,[28,[35,3],["(",[52,[30,4,["status"]],[28,[37,3],[[30,4,["status"]],": "],null]],[30,4,["detail"]],")"],null]],[1,"\\n"]],[]],null]],[4]]],[1,"\\n"]],["@type","@status","@error","error"],false,["if","eq","let","concat"]]',moduleName:"consul-ui/components/topology-metrics/notifications/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/topology-metrics/popover/index",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"2ZmfKieE",block:'[[[11,0],[16,0,[29,["topology-metrics-popover ",[30,1]]]],[17,2],[12],[1,"\\n"],[44,[[28,[37,1],["top:",[30,3,["y"]],"px;left:",[30,3,["x"]],"px;"],null],[52,[28,[37,3],[[30,1],"deny"],null],"Add intention","View intention"]],[[[41,[28,[37,4],[[30,6]],null],[[[41,[28,[37,3],[[30,1],"deny"],null],[[[1,"      "],[8,[39,5],[[24,0,"dangerous"],[4,[38,6],[[28,[37,7],[[30,0],"popover"],null]],null]],null,[["header","body","actions"],[[[[1,"\\n          "],[10,"h3"],[12],[1,"\\n            "],[1,[28,[35,8],["components.consul.topology-metrics.popover.deny.header"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]],[[[1,"\\n          "],[10,2],[12],[1,"\\n"],[41,[30,7,["Intention","HasExact"]],[[[1,"              "],[1,[28,[35,8],["components.consul.topology-metrics.popover.deny.body.isExact"],null]],[1,"\\n"]],[]],[[[1,"              "],[1,[28,[35,8],["components.consul.topology-metrics.popover.deny.body.notExact"],null]],[1,"\\n"]],[]]],[1,"          "],[13],[1,"\\n        "]],[]],[[[1,"\\n          "],[8,[30,8,["Action"]],[[24,0,"action"]],null,[["default"],[[[[1,"\\n            "],[11,"button"],[24,4,"button"],[4,[38,9],["click",[30,9]],null],[12],[1,"\\n"],[41,[30,7,["Intention","HasExact"]],[[[1,"                "],[1,[28,[35,8],["components.consul.topology-metrics.popover.deny.action.isExact"],null]],[1,"\\n"]],[]],[[[1,"                "],[1,[28,[35,8],["components.consul.topology-metrics.popover.deny.action.notExact"],null]],[1,"\\n"]],[]]],[1,"            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,8,["Action"]],null,null,[["default"],[[[[1,"\\n            "],[11,"button"],[24,0,"cancel"],[24,4,"button"],[4,[38,9],["click",[28,[37,10],[[28,[37,11],[[30,0,["popoverController","hide"]]],null]],null]],null],[12],[1,"\\n              Cancel\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[8]]]]],[1,"\\n"]],[]],[[[41,[28,[37,3],[[30,1],"not-defined"],null],[[[1,"      "],[8,[39,5],[[24,0,"warning documentation"],[4,[38,6],[[28,[37,7],[[30,0],"popover"],null]],null]],null,[["header","body","actions"],[[[[1,"\\n          "],[10,"h3"],[12],[1,"\\n            "],[1,[28,[35,8],["components.consul.topology-metrics.popover.not-defined.header"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]],[[[1,"\\n          "],[10,2],[12],[1,"\\n            "],[1,[28,[35,8],["components.consul.topology-metrics.popover.not-defined.body"],[["downstream","upstream"],[[30,7,["Name"]],[30,10,["Name"]]]]]],[1,"\\n          "],[13],[1,"\\n        "]],[]],[[[1,"\\n          "],[8,[30,11,["Action"]],[[24,0,"action"]],null,[["default"],[[[[1,"\\n            "],[10,3],[15,6,[29,[[28,[37,12],["CONSUL_DOCS_URL"],null],"/connect/registration/service-registration#upstreams"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"\\n              "],[1,[28,[35,8],["components.consul.topology-metrics.popover.not-defined.action"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,11,["Action"]],null,null,[["default"],[[[[1,"\\n            "],[11,"button"],[24,0,"cancel"],[24,4,"button"],[4,[38,9],["click",[28,[37,10],[[28,[37,11],[[30,0,["popoverController","hide"]]],null]],null]],null],[12],[1,"\\n              Close\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[11]]]]],[1,"\\n"]],[]],[[[1,"      "],[8,[39,5],[[24,0,"info"],[4,[38,6],[[28,[37,7],[[30,0],"popover"],null]],null]],null,[["header","body","actions"],[[[[1,"\\n          "],[10,"h3"],[12],[1,"\\n            "],[1,[28,[35,8],["components.consul.topology-metrics.popover.l7.header"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]],[[[1,"\\n          "],[10,2],[12],[1,"\\n            "],[1,[28,[35,8],["components.consul.topology-metrics.popover.l7.body"],null]],[1,"\\n          "],[13],[1,"\\n        "]],[]],[[[1,"\\n          "],[8,[30,12,["Action"]],[[24,0,"action"]],null,[["default"],[[[[1,"\\n            "],[10,3],[15,6,[28,[37,13],["dc.services.show.intentions.edit",[28,[37,1],[[30,7,["Intention","ID"]]],null]],null]],[12],[1,"\\n              "],[1,[28,[35,8],["components.consul.topology-metrics.popover.l7.action"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,12,["Action"]],null,null,[["default"],[[[[1,"\\n            "],[11,"button"],[24,0,"cancel"],[24,4,"button"],[4,[38,9],["click",[28,[37,10],[[28,[37,11],[[30,0,["popoverController","hide"]]],null]],null]],null],[12],[1,"\\n              Close\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[12]]]]],[1,"\\n    "]],[]]]],[]]],[1,"    "],[11,"button"],[23,5,[30,4]],[16,"aria-label",[30,5]],[24,4,"button"],[4,[38,14],[[30,0,["popover"]]],[["options","returns"],[[28,[37,15],null,[["theme","placement"],["square-tail","bottom-start"]]],[28,[37,7],[[30,0],"popoverController"],null]]]],[4,[38,9],["click",[28,[37,10],[[28,[37,11],[[30,0,["popoverController","show"]]],null]],null]],null],[12],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[1,"    "],[11,"button"],[23,5,[30,4]],[16,"aria-label",[30,5]],[24,4,"button"],[4,[38,16],[true],null],[12],[1,"\\n    "],[13],[1,"\\n"]],[]]]],[4,5]]],[13],[1,"\\n"]],["@type","&attrs","@position","style","label","@disabled","@item","Actions","@oncreate","@service","Actions","Actions"],false,["let","concat","if","eq","not","informed-action","did-insert","set","t","on","fn","optional","env","href-to","with-overlay","hash","disabled"]]',moduleName:"consul-ui/components/topology-metrics/popover/index.hbs",isStrictMode:!1})
-class i extends l.default{}e.default=i,(0,t.setComponentTemplate)(r,i)})),define("consul-ui/components/topology-metrics/series/index",["exports","@ember/component","@ember/template-factory","dayjs","dayjs/plugin/calendar","d3-selection","d3-scale","d3-scale-chromatic","d3-shape","d3-array","@ember/object"],(function(e,t,n,l,r,i,o,a,u,s,c){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const d=(0,n.createTemplateFactory)({id:"AXSuGOoT",block:'[[[41,[28,[37,1],[[30,1]],null],[[[1,"  "],[8,[39,2],null,[["@src","@onchange","@onerror"],[[28,[37,3],["/${partition}/${nspace}/${dc}/metrics/summary-for-service/${service}/${protocol}",[28,[37,4],null,[["nspace","partition","dc","service","protocol"],[[30,2],[30,3],[30,4],[30,5],[30,6]]]]],null],[28,[37,5],[[30,0],"change"],null],[28,[37,5],[[30,0],[28,[37,6],[[33,7]],null]],[["value"],["error"]]]]],null],[1,"\\n"]],[]],null],[1,"\\n"],[1,[28,[35,8],["resize",[28,[37,5],[[30,0],"redraw"],null]],null]],[1,"\\n"],[1,[28,[35,9],[[28,[37,5],[[30,0],"redraw"],null]],null]],[1,"\\n\\n"],[41,[28,[37,1],[[33,10]],null],[[[41,[33,11,["labels"]],[[[1,"    "],[11,3],[24,0,"sparkline-key-link"],[4,[38,12],["click",[28,[37,13],[[30,0,["modal","open"]]],null]],null],[12],[1,"\\n      Key\\n    "],[13],[1,"\\n"]],[]],null]],[]],null],[1,"\\n"],[10,0],[14,0,"sparkline-wrapper"],[12],[1,"\\n  "],[10,0],[14,0,"tooltip"],[12],[1,"\\n    "],[10,0],[14,0,"sparkline-time"],[12],[1,"Timestamp"],[13],[1,"\\n  "],[13],[1,"\\n"],[41,[33,10],[[[1,"    "],[8,[39,14],null,[["@noMetricsReason","@error"],[[30,1],[99,7,["@error"]]]],null],[1,"\\n"]],[]],null],[1,"  "],[10,"svg"],[14,0,"sparkline"],[12],[13],[1,"\\n"],[13],[1,"\\n\\n"],[8,[39,15],[[24,0,"sparkline-key"]],[["@aria"],[[28,[37,4],null,[["label"],["Metrics Key"]]]]],[["default"],[[[[1,"\\n    "],[8,[39,16],null,[["@target","@name","@value"],[[30,0],"modal",[30,7]]],null],[1,"\\n    "],[8,[39,17],null,[["@name"],["header"]],[["default"],[[[[1,"\\n      "],[10,"h3"],[12],[1,"Metrics Key"],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,17],null,[["@name"],["body"]],[["default"],[[[[1,"\\n      "],[10,0],[14,0,"sparkline-key-content"],[12],[1,"\\n        "],[10,2],[12],[1,"This key describes the metrics corresponding to the graph tooltip labels in more detail."],[13],[1,"\\n        "],[10,"dl"],[12],[1,"\\n"],[42,[28,[37,19],[[33,11,["labels"]]],null],null,[[[1,"            "],[10,"dt"],[12],[1,[30,9]],[13],[1,"\\n            "],[10,"dd"],[12],[1,[30,8]],[13],[1,"\\n"]],[8,9]],null],[1,"        "],[13],[1,"\\n"],[41,[51,[33,11,["labels"]]],[[[1,"          "],[10,1],[14,0,"no-data"],[12],[1,"No metrics loaded."],[13],[1,"\\n"]],[]],null],[1,"      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,17],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n      "],[10,"button"],[14,0,"type-cancel"],[15,"onclick",[28,[37,5],[[30,0],[30,7,["close"]]],null]],[14,4,"button"],[12],[1,"\\n        Close\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n"]],[7]]]]]],["@noMetricsReason","@nspace","@partition","@dc","@service","@protocol","modal","desc","label"],false,["if","not","data-source","uri","hash","action","mut","error","on-window","did-insert","empty","data","on","optional","topology-metrics/status","modal-dialog","ref","block-slot","each","-each-in","unless"]]',moduleName:"consul-ui/components/topology-metrics/series/index.hbs",isStrictMode:!1})
-l.default.extend(r.default)
-var p=(0,t.setComponentTemplate)(d,t.default.extend({data:null,empty:!1,actions:{redraw:function(e){this.drawGraphs()},change:function(e){this.set("data",e.data.series),this.drawGraphs(),this.rerender()}},drawGraphs:function(){if(!this.data)return void(0,c.set)(this,"empty",!0)
-let e=this.svg=(0,i.select)(this.element.querySelector("svg.sparkline"))
-e.on("mouseover mousemove mouseout",null),e.selectAll("path").remove(),e.selectAll("rect").remove()
-let t=e.node().getBoundingClientRect(),n=t.width,l=t.height,r=this.data||{},d=r.data||[],p=r.labels||{},f=r.unitSuffix||"",m=Object.keys(p).filter((e=>"Total"!=e))
-if(0==d.length||0==m.length)return void(0,c.set)(this,"empty",!0);(0,c.set)(this,"empty",!1)
-let h=(0,u.stack)().keys(m).order(u.stackOrderReverse)(d),b=d.map((e=>{let t=0
-return m.forEach((n=>{t+=e[n]})),t})),y=(0,o.scaleTime)().domain((0,s.extent)(d,(e=>e.time))).range([0,n]),g=(0,o.scaleLinear)().domain([0,(0,s.max)(b)]).range([l,0]),v=(0,u.area)().x((e=>y(e.data.time))).y1((e=>g(e[0]))).y0((e=>g(e[1]))),O=["#DCE0E6","#C73445"].concat(a.schemeTableau10)
-m.includes("Outbound")&&(O=["#DCE0E6","#0E40A3"].concat(a.schemeTableau10))
-let P=(0,o.scaleOrdinal)(O).domain(m)
-e.selectAll("path").data(h).join("path").attr("fill",(e=>{let{key:t}=e
-return P(t)})).attr("stroke",(e=>{let{key:t}=e
-return P(t)})).attr("d",v)
-let x=e.append("rect").attr("class","cursor").style("visibility","hidden").attr("width",1).attr("height",l).attr("x",0).attr("y",0),w=(0,i.select)(this.element.querySelector(".tooltip"))
-for(var j of(w.selectAll(".sparkline-tt-legend").remove(),w.selectAll(".sparkline-tt-sum").remove(),m)){let e=w.append("div").attr("class","sparkline-tt-legend")
-e.append("div").attr("class","sparkline-tt-legend-color").style("background-color",P(j)),e.append("span").text(j).append("span").attr("class","sparkline-tt-legend-value")}let _=w.selectAll(".sparkline-tt-legend-value")
-m.length>1&&w.append("div").attr("class","sparkline-tt-sum").append("span").text("Total").append("span").attr("class","sparkline-tt-sum-value")
-let k=this
-e.on("mouseover",(function(e){w.style("visibility","visible"),x.style("visibility","visible"),k.updateTooltip(e,d,h,b,f,y,w,_,x)})).on("mousemove",(function(e){k.updateTooltip(e,d,h,b,f,y,w,_,x)})).on("mouseout",(function(e){w.style("visibility","hidden"),x.style("visibility","hidden")}))},willDestroyElement:function(){this._super(...arguments),void 0!==this.svg&&this.svg.on("mouseover mousemove mouseout",null)},updateTooltip:function(e,t,n,r,o,a,u,c,d){let[p]=(0,i.pointer)(e)
-d.attr("x",p)
-let m=a.invert(p)
-var h=(0,s.bisector)((function(e){return e.time})).left
-let b=h(t,m)
-var y
-u.style("left",p-22+"px").select(".sparkline-time").text((y=m,(0,l.default)(y).calendar(null,{sameDay:"[Today at] h:mm:ss A",lastDay:"[Yesterday at] h:mm:ss A",lastWeek:"[Last] dddd at h:mm:ss A",sameElse:"MMM DD at h:mm:ss A"}))),u.select(".sparkline-tt-sum-value").text(`${f(r[b])}${o}`),c.nodes().forEach(((e,t)=>{let l=n[t][b][1]-n[t][b][0];(0,i.select)(e).text(`${f(l)}${o}`)})),d.attr("x",p)}}))
-function f(e){return e<1e3?Number.isInteger(e)?""+e:Number(e>=100?e.toPrecision(3):e<1?e.toFixed(2):e.toPrecision(2)):e>=1e3&&e<1e6?+(e/1e3).toPrecision(3)+"k":e>=1e6&&e<1e9?+(e/1e6).toPrecision(3)+"m":e>=1e9&&e<1e12?+(e/1e9).toPrecision(3)+"g":e>=1e12?+(e/1e12).toFixed(0)+"t":void 0}e.default=p})),define("consul-ui/components/topology-metrics/source-type/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"wl8kyvfj",block:'[[[11,1],[24,0,"topology-metrics-source-type"],[4,[38,0],[[28,[37,1],[[28,[37,2],["components.consul.topology-metrics.source-type.",[30,1],".tooltip"],null]],null]],null],[12],[1,"\\n  "],[1,[28,[35,1],[[28,[37,2],["components.consul.topology-metrics.source-type.",[30,1],".text"],null]],null]],[1,"\\n"],[13]],["@source"],false,["tooltip","t","concat"]]',moduleName:"consul-ui/components/topology-metrics/source-type/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/topology-metrics/stats/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object"],(function(e,t,n,l,r,i){var o,a,u
-function s(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function c(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const d=(0,n.createTemplateFactory)({id:"OvZgaKFU",block:'[[[41,[28,[37,1],[[30,1]],null],[[[1,"  "],[8,[39,2],null,[["@src","@onchange","@onerror"],[[28,[37,3],["/${partition}/${nspace}/${dc}/metrics/${endpoint}/${service}/${protocol}",[28,[37,4],null,[["nspace","partition","dc","endpoint","service","protocol"],[[30,2],[30,3],[30,4],[30,5],[30,6],[28,[37,5],[[30,7],""],null]]]]],null],[28,[37,6],[[30,0],"statsUpdate"],null],[28,[37,6],[[30,0],[28,[37,7],[[33,8]],null]],[["value"],["error"]]]]],null],[1,"\\n"]],[]],null],[1,"\\n"],[11,0],[17,8],[24,0,"topology-metrics-stats"],[12],[1,"\\n"],[41,[33,9],[[[42,[28,[37,11],[[28,[37,11],[[33,12]],null]],null],null,[[[1,"    "],[11,"dl"],[4,[38,13],[[30,9,["desc"]]],[["options"],[[28,[37,4],null,[["allowHTML"],[true]]]]]],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        "],[1,[30,9,["value"]]],[1,"\\n      "],[13],[1,"\\n      "],[10,"dd"],[12],[1,"\\n        "],[1,[30,9,["label"]]],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[9]],[[[1,"      "],[10,1],[12],[1,"No Metrics Available"],[13],[1,"\\n"]],[]]]],[]],[[[1,"    "],[8,[39,14],null,[["@noMetricsReason","@error"],[[30,1],[99,8,["@error"]]]],null],[1,"\\n"]],[]]],[13]],["@noMetricsReason","@nspace","@partition","@dc","@endpoint","@service","@protocol","&attrs","stat"],false,["if","not","data-source","uri","hash","or","action","mut","error","hasLoaded","each","-track-array","stats","tooltip","topology-metrics/status"]]',moduleName:"consul-ui/components/topology-metrics/stats/index.hbs",isStrictMode:!1})
-let p=(o=class extends l.default{constructor(){super(...arguments),s(this,"stats",a,this),s(this,"hasLoaded",u,this)}statsUpdate(e){if("summary-for-service"==this.args.endpoint)this.stats=e.data.stats
-else{let t=this.args.nspace||""
-0===t.length&&(t="default")
-let n=`${this.args.item}.${t}.${this.args.dc}`
-this.stats=e.data.stats[n]}this.stats=(this.stats||[]).slice(0,4),this.hasLoaded=!0}},a=c(o.prototype,"stats",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return null}}),u=c(o.prototype,"hasLoaded",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),c(o.prototype,"statsUpdate",[i.action],Object.getOwnPropertyDescriptor(o.prototype,"statsUpdate"),o.prototype),o)
-e.default=p,(0,t.setComponentTemplate)(d,p)})),define("consul-ui/components/topology-metrics/status/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"weO6aWlc",block:'[[[41,[28,[37,1],[[30,1],[30,2]],null],[[[1,"  "],[10,1],[14,0,"topology-metrics-status-error"],[12],[1,"\\n"],[41,[28,[37,2],[[30,1],"ingress-gateway"],null],[[[1,"      "],[1,[28,[35,3],["components.consul.topology-metrics.status.ingress-gateway"],null]],[1,"\\n"]],[]],[[[41,[28,[37,2],[[30,1],"remote-dc"],null],[[[1,"      "],[1,[28,[35,3],["components.consul.topology-metrics.status.error"],null]],[1,"\\n      "],[11,1],[4,[38,4],[[28,[37,3],["components.consul.topology-metrics.status.remote-dc"],null]],null],[12],[13],[1,"\\n"]],[]],[[[41,[30,2],[[[1,"      "],[1,[28,[35,3],["components.consul.topology-metrics.status.error"],null]],[1,"\\n    "]],[]],null]],[]]]],[]]],[1,"  "],[13],[1,"\\n"]],[]],[[[1,"  "],[10,1],[14,0,"topology-metrics-status-loader"],[12],[1,[28,[35,3],["components.consul.topology-metrics.status.loading"],null]],[13],[1,"\\n"]],[]]]],["@noMetricsReason","@error"],false,["if","or","eq","t","tooltip"]]',moduleName:"consul-ui/components/topology-metrics/status/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/components/topology-metrics/up-lines/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object","@ember/service"],(function(e,t,n,l,r,i,o){var a,u,s,c
-function d(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function p(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const f=(0,n.createTemplateFactory)({id:"MfMA5Fce",block:'[[[41,[28,[37,1],[[30,1,["length"]],0],null],[[[1,"  "],[11,"svg"],[16,"viewBox",[28,[37,2],[[30,2,["x"]]," ",[30,3,["y"]]," ",[30,3,["width"]]," ",[30,3,["height"]]],null]],[24,"preserveAspectRatio","none"],[4,[38,3],[[30,0,["getIconPositions"]]],null],[4,[38,4],[[30,0,["getIconPositions"]],[30,1]],null],[12],[1,"\\n    "],[10,"defs"],[12],[1,"\\n      "],[10,"marker"],[15,1,[28,[37,2],[[30,0,["guid"]],"-allow-dot"],null]],[14,0,"allow-dot"],[14,"viewBox","-2 -2 15 15"],[14,"refX","6"],[14,"refY","6"],[14,"markerWidth","6"],[14,"markerHeight","6"],[12],[1,"\\n        "],[10,"circle"],[14,"cx","6"],[14,"cy","6"],[14,"r","6"],[12],[13],[1,"\\n      "],[13],[1,"\\n      "],[10,"marker"],[15,1,[28,[37,2],[[30,0,["guid"]],"-allow-arrow"],null]],[14,0,"allow-arrow"],[14,"viewBox","-1 -1 12 12"],[14,"refX","5"],[14,"refY","5"],[14,"markerWidth","6"],[14,"markerHeight","6"],[14,"orient","auto-start-reverse"],[12],[1,"\\n        "],[10,"polygon"],[14,"points","0 0 10 5 0 10"],[12],[13],[1,"\\n      "],[13],[1,"\\n      "],[10,"marker"],[15,1,[28,[37,2],[[30,0,["guid"]],"-deny-dot"],null]],[14,0,"deny-dot"],[14,"viewBox","-2 -2 15 15"],[14,"refX","6"],[14,"refY","6"],[14,"markerWidth","6"],[14,"markerHeight","6"],[12],[1,"\\n        "],[10,"circle"],[14,"cx","6"],[14,"cy","6"],[14,"r","6"],[12],[13],[1,"\\n      "],[13],[1,"\\n      "],[10,"marker"],[15,1,[28,[37,2],[[30,0,["guid"]],"-deny-arrow"],null]],[14,0,"deny-arrow"],[14,"viewBox","-1 -1 12 12"],[14,"refX","5"],[14,"refY","5"],[14,"markerWidth","6"],[14,"markerHeight","6"],[14,"orient","auto-start-reverse"],[12],[1,"\\n        "],[10,"polygon"],[14,"points","0 0 10 5 0 10"],[12],[13],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"],[42,[28,[37,6],[[28,[37,6],[[30,1]],null]],null],null,[[[41,[28,[37,7],[[30,4,["permission"]],"deny"],null],[[[1,"    "],[10,"path"],[15,1,[28,[37,2],[[30,0,["guid"]],[30,4,["id"]]],null]],[15,"d",[28,[37,8],[[30,4,["dest"]]],[["src"],[[30,4,["src"]]]]]],[15,"marker-start",[28,[37,2],["url(#",[30,0,["guid"]],"-deny-dot)"],null]],[15,"marker-end",[28,[37,2],["url(#",[30,0,["guid"]],"-deny-arrow)"],null]],[15,"data-permission",[30,4,["permission"]]],[12],[13],[1,"\\n"]],[]],[[[1,"     "],[10,"path"],[15,1,[28,[37,2],[[30,0,["guid"]],[30,4,["id"]]],null]],[15,"d",[28,[37,8],[[30,4,["dest"]]],[["src"],[[30,4,["src"]]]]]],[15,"marker-start",[28,[37,2],["url(#",[30,0,["guid"]],"-allow-dot)"],null]],[15,"marker-end",[28,[37,2],["url(#",[30,0,["guid"]],"-allow-arrow)"],null]],[15,"data-permission",[30,4,["permission"]]],[12],[13],[1,"\\n"]],[]]]],[4]],null],[1,"  "],[13],[1,"\\n"]],[]],null],[42,[28,[37,6],[[28,[37,6],[[30,5]],null]],null],null,[[[41,[28,[37,9],[[28,[37,10],[[30,6,["Datacenter"]],""],null],[28,[37,11],[[28,[37,12],[[30,6,["Intention","Allowed"]]],null],[30,6,["Intention","HasPermissions"]]],null]],null],[[[1,"    "],[8,[39,13],null,[["@type","@position","@item","@disabled","@oncreate"],[[52,[30,6,["Intention","HasPermissions"]],"l7","deny"],[28,[37,14],["id",[28,[37,2],[[30,0,["guid"]],[30,6,["Namespace"]],[30,6,["Name"]]],null],[30,0,["iconPositions"]]],null],[30,6],false,[28,[37,15],[[30,0],[30,7],[30,8],[30,6]],null]]],null],[1,"\\n"]],[]],null]],[6]],null]],["@lines","@center","@view","line","@items","item","@oncreate","@service"],false,["if","gt","concat","did-insert","did-update","each","-track-array","eq","svg-curve","and","not-eq","or","not","topology-metrics/popover","find-by","action"]]',moduleName:"consul-ui/components/topology-metrics/up-lines/index.hbs",isStrictMode:!1})
-let m=(a=(0,o.inject)("dom"),u=class extends l.default{constructor(){super(...arguments),d(this,"iconPositions",s,this),d(this,"dom",c,this)}get guid(){return this.dom.guid(this)}getIconPositions(){const e=this.args.center,t=this.args.view,n=[...document.querySelectorAll("#upstream-lines path")]
-this.iconPositions=n.map((n=>{const l=parseFloat(n.getTotalLength()),r=n.getPointAtLength(Math.ceil(.666*l))
-return{id:n.id,x:Math.round(r.x-e.x),y:Math.round(r.y-t.y)}}))}},s=p(u.prototype,"iconPositions",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=p(u.prototype,"dom",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p(u.prototype,"getIconPositions",[i.action],Object.getOwnPropertyDescriptor(u.prototype,"getIconPositions"),u.prototype),u)
-e.default=m,(0,t.setComponentTemplate)(f,m)})),define("consul-ui/components/torii-iframe-placeholder",["exports","torii/components/torii-iframe-placeholder"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default
-e.default=n})),define("consul-ui/components/vertical-collection",["exports","@html-next/vertical-collection/components/vertical-collection/component"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/watcher/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@glimmer/tracking","@ember/runloop","@ember/service"],(function(e,t,n,l,r,i,o,a){var u,s,c,d
-function p(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function f(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const m=(0,n.createTemplateFactory)({id:"WK8VbrJT",block:'[[[18,1,[[28,[37,1],null,[["fns"],[[28,[37,1],null,[["start","stop"],[[30,0,["start"]],[30,0,["stop"]]]]]]]]]],[1,"\\n"]],["&default"],false,["yield","hash"]]',moduleName:"consul-ui/components/watcher/index.hbs",isStrictMode:!1})
-let h=(u=class extends l.default{constructor(){super(...arguments),p(this,"env",s,this),p(this,"_isPolling",c,this),p(this,"cancel",d,this)}get timeout(){return this.isTesting?300:this.args.timeout||1e4}get isTesting(){return"testing"===this.env.var("environment")}get isPolling(){const{isTesting:e,_isPolling:t}=this
-return!e&&t}start(){this._isPolling=!0,this.watchTask()}stop(){this._isPolling=!1,(0,o.cancel)(this.cancel)}watchTask(){const e=(0,o.later)(this,(()=>{var e,t
-null===(e=(t=this.args).watch)||void 0===e||e.call(t),this.isPolling&&this.watchTask()}),this.timeout)
-this.cancel=e}},s=f(u.prototype,"env",[a.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=f(u.prototype,"_isPolling",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),d=f(u.prototype,"cancel",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return null}}),f(u.prototype,"start",[r.action],Object.getOwnPropertyDescriptor(u.prototype,"start"),u.prototype),f(u.prototype,"stop",[r.action],Object.getOwnPropertyDescriptor(u.prototype,"stop"),u.prototype),u)
-e.default=h,(0,t.setComponentTemplate)(m,h)})),define("consul-ui/components/yield-slot",["exports","block-slots/components/yield-slot"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/yield/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.createTemplateFactory)({id:"uvrXCen3",block:'[[[18,1,null],[1,"\\n"]],["&default"],false,["yield"]]',moduleName:"consul-ui/components/yield/index.hbs",isStrictMode:!1})
-var i=(0,t.setComponentTemplate)(r,(0,l.default)())
-e.default=i})),define("consul-ui/controllers/_peered-resource",["exports","@ember/controller","@ember/service"],(function(e,t,n){var l,r
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let i=(l=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="abilities",l=this,(n=r)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}get _searchProperties(){const{searchProperties:e}=this
-return this.abilities.can("use peers")?e:e.filter((e=>"PeerName"!==e))}},o=l.prototype,a="abilities",u=[n.inject],s={configurable:!0,enumerable:!0,writable:!0,initializer:null},d={},Object.keys(s).forEach((function(e){d[e]=s[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=u.slice().reverse().reduce((function(e,t){return t(o,a,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(o,a,d),d=null),r=d,l)
-var o,a,u,s,c,d
-e.default=i})),define("consul-ui/controllers/application",["exports","@ember/service","@ember/controller","@ember/application","@ember/object","consul-ui/utils/routing/transitionable"],(function(e,t,n,l,r,i){var o,a,u,s,c,d,p
-function f(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function m(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let h=(o=(0,t.inject)("router"),a=(0,t.inject)("store"),u=(0,t.inject)("feedback"),s=class extends n.default{constructor(){super(...arguments),f(this,"router",c,this),f(this,"store",d,this),f(this,"feedback",p,this)}reauthorize(e){this.feedback.execute((()=>{this.store.invalidate()
-const t={}
-if(e.data){const n=e.data
-if(void 0!==this.nspace){const e=(0,r.get)(n,"Namespace")||this.nspace.Name
-e!==this.nspace.Name&&(t.nspace=`${e}`)}}const n=(0,l.getOwner)(this),o=this.router.currentRoute.name,a=n.lookup(`route:${o}`)
-return n.lookup("route:application").refresh().promise.catch((function(e){})).then((e=>o!==this.router.currentRouteName||void 0!==t.nspace?a.transitionTo(...(0,i.default)(this.router.currentRoute,t,n)):e))}),e.type,(function(e,t){return e}),{})}},c=m(s.prototype,"router",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=m(s.prototype,"store",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=m(s.prototype,"feedback",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m(s.prototype,"reauthorize",[r.action],Object.getOwnPropertyDescriptor(s.prototype,"reauthorize"),s.prototype),s)
-e.default=h})),define("consul-ui/controllers/dc/acls/policies/create",["exports","consul-ui/controllers/dc/acls/policies/edit"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{}e.default=n})),define("consul-ui/controllers/dc/acls/policies/edit",["exports","@ember/service","@ember/controller"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,t.inject)("form"),r=class extends n.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="builder",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}init(){super.init(...arguments),this.form=this.builder.form("policy")}setProperties(e){super.setProperties(Object.keys(e).reduce(((e,t,n)=>{if("item"===t)e[t]=this.form.setData(e[t]).getData()
-return e}),e))}},a=r.prototype,u="builder",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o}))
-define("consul-ui/controllers/dc/acls/roles/create",["exports","consul-ui/controllers/dc/acls/roles/edit"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{}e.default=n})),define("consul-ui/controllers/dc/acls/roles/edit",["exports","@ember/service","@ember/controller"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,t.inject)("form"),r=class extends n.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="builder",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}init(){super.init(...arguments),this.form=this.builder.form("role")}setProperties(e){super.setProperties(Object.keys(e).reduce(((e,t,n)=>{if("item"===t)e[t]=this.form.setData(e[t]).getData()
-return e}),e))}},a=r.prototype,u="builder",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/controllers/dc/acls/tokens/create",["exports","consul-ui/controllers/dc/acls/tokens/edit"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{}e.default=n})),define("consul-ui/controllers/dc/acls/tokens/edit",["exports","@ember/controller","@ember/service"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l=t.default.extend({dom:(0,n.inject)("dom"),builder:(0,n.inject)("form"),isScoped:!1,init:function(){this._super(...arguments),this.form=this.builder.form("token")},setProperties:function(e){this._super(Object.keys(e).reduce(((e,t,n)=>{if("item"===t)e[t]=this.form.setData(e[t]).getData()
-return e}),e))},actions:{change:function(e,t,n){const l=this.dom.normalizeEvent(e,t),r=this.form
-try{r.handleEvent(l)}catch(i){throw l.target.name,i}}}})
-e.default=l})),define("consul-ui/controllers/dc/nodes/index",["exports","consul-ui/controllers/_peered-resource"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{}e.default=n})),define("consul-ui/controllers/dc/peers/index",["exports","@ember/controller","@ember/service"],(function(e,t,n){var l,r
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let i=(l=class extends t.default{constructor(){var e,t,n,l,i,o,a
-super(...arguments),e=this,t="router",l=this,(n=r)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),a=(e,t)=>{null==e||e(),this.router.transitionTo("dc.peers.show",t.Name)},(o="redirectToPeerShow")in(i=this)?Object.defineProperty(i,o,{value:a,enumerable:!0,configurable:!0,writable:!0}):i[o]=a}},o=l.prototype,a="router",u=[n.inject],s={configurable:!0,enumerable:!0,writable:!0,initializer:null},d={},Object.keys(s).forEach((function(e){d[e]=s[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=u.slice().reverse().reduce((function(e,t){return t(o,a,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(o,a,d),d=null),r=d,l)
-var o,a,u,s,c,d
-e.default=i})),define("consul-ui/controllers/dc/peers/show/exported",["exports","@ember/controller","@glimmer/tracking","@ember/object"],(function(e,t,n,l){var r,i
-function o(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(r=class extends t.default{constructor(){var e,t,n,l,r,o,a
-super(...arguments),n={search:{as:"filter"}},(t="queryParams")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,l=this,r="search",a=this,(o=i)&&Object.defineProperty(l,r,{enumerable:o.enumerable,configurable:o.configurable,writable:o.writable,value:o.initializer?o.initializer.call(a):void 0})}updateSearch(e){this.search=e}},i=o(r.prototype,"search",[n.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),o(r.prototype,"updateSearch",[l.action],Object.getOwnPropertyDescriptor(r.prototype,"updateSearch"),r.prototype),r)
-e.default=a})),define("consul-ui/controllers/dc/peers/show/index",["exports","@ember/controller","@ember/service","@ember/object"],(function(e,t,n,l){var r,i
-function o(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="router",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}transitionToImported(){this.router.replaceWith("dc.peers.show.imported")}},i=o(r.prototype,"router",[n.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o(r.prototype,"transitionToImported",[l.action],Object.getOwnPropertyDescriptor(r.prototype,"transitionToImported"),r.prototype),r)
-e.default=a})),define("consul-ui/controllers/dc/services/index",["exports","consul-ui/controllers/_peered-resource"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{}e.default=n})),define("consul-ui/controllers/dc/services/instance/healthchecks",["exports","@ember/controller","@ember/object"],(function(e,t,n){var l
-function r(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let i=(r((l=class extends t.default{syntheticNodeSearchPropertyFilter(e,t){var n
-return!(null!==(n=e.Node.Meta)&&void 0!==n&&n["synthetic-node"]&&"Node"===t)}syntheticNodeHealthCheckFilter(e,t,n,l){var r
-return!(null!==(r=e.Node.Meta)&&void 0!==r&&r["synthetic-node"]&&"node"===(null==t?void 0:t.Kind))}}).prototype,"syntheticNodeSearchPropertyFilter",[n.action],Object.getOwnPropertyDescriptor(l.prototype,"syntheticNodeSearchPropertyFilter"),l.prototype),r(l.prototype,"syntheticNodeHealthCheckFilter",[n.action],Object.getOwnPropertyDescriptor(l.prototype,"syntheticNodeHealthCheckFilter"),l.prototype),l)
-e.default=i})),define("consul-ui/data-adapter",["exports","@ember-data/debug"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/decorators/data-source",["exports","@ember/debug","wayfarer"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.match=e.default=void 0
-const l=(0,n.default)(),r={}
-e.default=e=>(n,i,o)=>((0,t.runInDebug)((()=>{r[e]={cls:n,method:i}})),l.on(e,(function(e,t,l){const r=t.lookup("service:container").get(n)
-return t=>o.value.apply(r,[e,t,l])})),o)
-e.match=e=>l.match(e),(0,t.runInDebug)((()=>{window.DataSourceRoutes=()=>{const e=window.ConsulUi.__container__.lookup("service:container"),t=window.open("","_blank")
-t.document.write(`\n<body>\n  <pre>\n${Object.entries(r).map((t=>{let[n,l]=t,r=e.keyForClass(l.cls).split("/").pop()
-return r=r.split("-").map((e=>`${e[0].toUpperCase()}${e.substr(1)}`)).join(""),`${n}\n      ${r}Repository.${l.method}(params)\n\n`})).join("")}\n  </pre>\n</body>\n    `),t.focus()}}))})),define("consul-ui/decorators/replace",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.nullValue=e.replace=void 0
-const t=(e,t)=>(n,l,r)=>({get:function(){const n=r.get.apply(this,arguments)
-return n===e?t:n},set:function(){return r.set.apply(this,arguments)}})
-e.replace=t
-e.nullValue=function(e){return t(null,e)}
-var n=t
-e.default=n})),define("consul-ui/env",["exports","consul-ui/config/environment","consul-ui/utils/get-environment"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.env=void 0
-const l=(0,n.default)(t.default,window,document)
-e.env=l})),define("consul-ui/filter/predicates/auth-method",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={kind:{kubernetes:(e,t)=>e.Type===t,jwt:(e,t)=>e.Type===t,oidc:(e,t)=>e.Type===t},source:{local:(e,t)=>e.TokenLocality===t,global:(e,t)=>e.TokenLocality===t}}})),define("consul-ui/filter/predicates/health-check",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={status:{passing:(e,t)=>e.Status===t,warning:(e,t)=>e.Status===t,critical:(e,t)=>e.Status===t},kind:{service:(e,t)=>e.Kind===t,node:(e,t)=>e.Kind===t},check:{serf:(e,t)=>e.Type===t,script:(e,t)=>e.Type===t,http:(e,t)=>e.Type===t,tcp:(e,t)=>e.Type===t,ttl:(e,t)=>e.Type===t,docker:(e,t)=>e.Type===t,grpc:(e,t)=>e.Type===t,alias:(e,t)=>e.Type===t}}})),define("consul-ui/filter/predicates/intention",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={access:{allow:(e,t)=>e.Action===t,deny:(e,t)=>e.Action===t,"app-aware":(e,t)=>void 0===e.Action}}})),define("consul-ui/filter/predicates/kv",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={kind:{folder:(e,t)=>e.isFolder,key:(e,t)=>!e.isFolder}}})),define("consul-ui/filter/predicates/node",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={status:{passing:(e,t)=>e.Status===t,warning:(e,t)=>e.Status===t,critical:(e,t)=>e.Status===t}}})),define("consul-ui/filter/predicates/peer",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={state:{pending:(e,t)=>e.State.toLowerCase()===t,establishing:(e,t)=>e.State.toLowerCase()===t,active:(e,t)=>e.State.toLowerCase()===t,failing:(e,t)=>e.State.toLowerCase()===t,terminated:(e,t)=>e.State.toLowerCase()===t,deleting:(e,t)=>e.State.toLowerCase()===t}}})),define("consul-ui/filter/predicates/policy",["exports","mnemonist/set"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n={kind:{"global-management":(e,t)=>e.isGlobalManagement,standard:(e,t)=>!e.isGlobalManagement},datacenter:(e,n)=>void 0===e.Datacenters||t.default.intersectionSize(n,new Set(e.Datacenters))>0}
-e.default=n})),define("consul-ui/filter/predicates/service-instance",["exports","mnemonist/set"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n={status:{passing:(e,t)=>e.Status===t,warning:(e,t)=>e.Status===t,critical:(e,t)=>e.Status===t,empty:(e,t)=>0===e.ServiceChecks.length},source:(e,n)=>0!==t.default.intersectionSize(n,new Set(e.ExternalSources||[]))}
-e.default=n})),define("consul-ui/filter/predicates/service",["exports","mnemonist/set"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n={kind:{"api-gateway":(e,t)=>e.Kind===t,"ingress-gateway":(e,t)=>e.Kind===t,"terminating-gateway":(e,t)=>e.Kind===t,"mesh-gateway":(e,t)=>e.Kind===t,service:(e,t)=>!e.Kind,"in-mesh":(e,t)=>e.InMesh,"not-in-mesh":(e,t)=>!e.InMesh},status:{passing:(e,t)=>e.MeshStatus===t,warning:(e,t)=>e.MeshStatus===t,critical:(e,t)=>e.MeshStatus===t,empty:(e,t)=>0===e.MeshChecksTotal,unknown:e=>e.peerIsFailing||e.isZeroCountButPeered},instance:{registered:(e,t)=>e.InstanceCount>0,"not-registered":(e,t)=>0===e.InstanceCount},source:(e,n)=>{let l=!1
-return n.includes("consul")&&(l=!e.ExternalSources||0===e.ExternalSources.length||1===e.ExternalSources.length&&""===e.ExternalSources[0]||e.PeerName),0!==t.default.intersectionSize(n,new Set(e.ExternalSources||[]))||n.includes(e.Partition)||l}}
-e.default=n})),define("consul-ui/filter/predicates/token",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={kind:{"global-management":(e,t)=>e.isGlobalManagement,global:(e,t)=>!e.Local,local:(e,t)=>e.Local}}})),define("consul-ui/flash/object",["exports","ember-cli-flash/flash/object"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/formats",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={time:{hhmmss:{hour:"numeric",minute:"numeric",second:"numeric"}},date:{hhmmss:{hour:"numeric",minute:"numeric",second:"numeric"}},number:{compact:{notation:"compact"},EUR:{style:"currency",currency:"EUR",minimumFractionDigits:2,maximumFractionDigits:2},USD:{style:"currency",currency:"USD",minimumFractionDigits:2,maximumFractionDigits:2}}}})),define("consul-ui/forms/intention",["exports","consul-ui/validations/intention","consul-ui/utils/form/builder"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:t.default,i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:l
-return i(n,{}).setValidators(r)}
-const l=(0,n.default)()})),define("consul-ui/forms/kv",["exports","consul-ui/validations/kv","consul-ui/utils/form/builder"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:t.default,i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:l
-return i(n,{}).setValidators(r)}
-const l=(0,n.default)()})),define("consul-ui/forms/policy",["exports","consul-ui/validations/policy","consul-ui/utils/form/builder"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"policy",r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:t.default,i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:l
-return i(n,{Datacenters:{type:"array"}}).setValidators(r)}
-const l=(0,n.default)()})),define("consul-ui/forms/role",["exports","consul-ui/validations/role","consul-ui/utils/form/builder"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"role",r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:t.default,i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:l
-return i(n,{}).setValidators(r).add(e.form("policy"))}
-const l=(0,n.default)()}))
-define("consul-ui/forms/token",["exports","consul-ui/validations/token","consul-ui/utils/form/builder"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:t.default,i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:l
-return i(n,{}).setValidators(r).add(e.form("policy")).add(e.form("role"))}
-const l=(0,n.default)()})),define("consul-ui/helpers/-element",["exports","ember-element-helper/helpers/-element"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/abs",["exports","ember-math-helpers/helpers/abs"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"abs",{enumerable:!0,get:function(){return t.abs}})})),define("consul-ui/helpers/acos",["exports","ember-math-helpers/helpers/acos"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"acos",{enumerable:!0,get:function(){return t.acos}})})),define("consul-ui/helpers/acosh",["exports","ember-math-helpers/helpers/acosh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"acosh",{enumerable:!0,get:function(){return t.acosh}})})),define("consul-ui/helpers/add",["exports","ember-math-helpers/helpers/add"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"add",{enumerable:!0,get:function(){return t.add}})})),define("consul-ui/helpers/adopt-styles",["exports","@ember/component/helper","@ember/debug","@lit/reactive-element"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{compute(e,t){let[n,r]=e
-Array.isArray(r)||(r=[r]),(0,l.adoptStyles)(n,r)}}e.default=r})),define("consul-ui/helpers/and",["exports","ember-truth-helpers/helpers/and"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"and",{enumerable:!0,get:function(){return t.and}})})),define("consul-ui/helpers/app-version",["exports","@ember/component/helper","consul-ui/config/environment","ember-cli-app-version/utils/regexp"],(function(e,t,n,l){function r(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-const r=n.default.APP.version
-let i=t.versionOnly||t.hideSha,o=t.shaOnly||t.hideVersion,a=null
-return i&&(t.showExtended&&(a=r.match(l.versionExtendedRegExp)),a||(a=r.match(l.versionRegExp))),o&&(a=r.match(l.shaRegExp)),a?a[0]:r}Object.defineProperty(e,"__esModule",{value:!0}),e.appVersion=r,e.default=void 0
-var i=(0,t.helper)(r)
-e.default=i})),define("consul-ui/helpers/append",["exports","ember-composable-helpers/helpers/append"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"append",{enumerable:!0,get:function(){return t.append}})})),define("consul-ui/helpers/array-concat",["exports","ember-array-fns/helpers/array-concat"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayConcat",{enumerable:!0,get:function(){return t.arrayConcat}})})),define("consul-ui/helpers/array-every",["exports","ember-array-fns/helpers/array-every"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayEvery",{enumerable:!0,get:function(){return t.arrayEvery}})})),define("consul-ui/helpers/array-filter",["exports","ember-array-fns/helpers/array-filter"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayFilter",{enumerable:!0,get:function(){return t.arrayFilter}})})),define("consul-ui/helpers/array-find-index",["exports","ember-array-fns/helpers/array-find-index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayFindIndex",{enumerable:!0,get:function(){return t.arrayFindIndex}})})),define("consul-ui/helpers/array-find",["exports","ember-array-fns/helpers/array-find"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayFind",{enumerable:!0,get:function(){return t.arrayFind}})})),define("consul-ui/helpers/array-includes",["exports","ember-array-fns/helpers/array-includes"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayIncludes",{enumerable:!0,get:function(){return t.arrayIncludes}})})),define("consul-ui/helpers/array-index-of",["exports","ember-array-fns/helpers/array-index-of"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayIndexOf",{enumerable:!0,get:function(){return t.arrayIndexOf}})})),define("consul-ui/helpers/array-is-array",["exports","ember-array-fns/helpers/array-is-array"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayIsArray",{enumerable:!0,get:function(){return t.arrayIsArray}})})),define("consul-ui/helpers/array-is-first-element",["exports","ember-array-fns/helpers/array-is-first-element"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayIsFirstElement",{enumerable:!0,get:function(){return t.arrayIsFirstElement}})})),define("consul-ui/helpers/array-is-last-element",["exports","ember-array-fns/helpers/array-is-last-element"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayIsLastElement",{enumerable:!0,get:function(){return t.arrayIsLastElement}})})),define("consul-ui/helpers/array-join",["exports","ember-array-fns/helpers/array-join"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayJoin",{enumerable:!0,get:function(){return t.arrayJoin}})})),define("consul-ui/helpers/array-last-index-of",["exports","ember-array-fns/helpers/array-last-index-of"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayLastIndexOf",{enumerable:!0,get:function(){return t.arrayLastIndexOf}})})),define("consul-ui/helpers/array-map",["exports","ember-array-fns/helpers/array-map"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayMap",{enumerable:!0,get:function(){return t.arrayMap}})})),define("consul-ui/helpers/array-reduce",["exports","ember-array-fns/helpers/array-reduce"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayReduce",{enumerable:!0,get:function(){return t.arrayReduce}})})),define("consul-ui/helpers/array-reverse",["exports","ember-array-fns/helpers/array-reverse"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayReverse",{enumerable:!0,get:function(){return t.arrayReverse}})})),define("consul-ui/helpers/array-slice",["exports","ember-array-fns/helpers/array-slice"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arraySlice",{enumerable:!0,get:function(){return t.arraySlice}})})),define("consul-ui/helpers/array-some",["exports","ember-array-fns/helpers/array-some"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arraySome",{enumerable:!0,get:function(){return t.arraySome}})})),define("consul-ui/helpers/array-sort",["exports","ember-array-fns/helpers/array-sort"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arraySort",{enumerable:!0,get:function(){return t.arraySort}})})),define("consul-ui/helpers/array-splice",["exports","ember-array-fns/helpers/array-splice"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arraySplice",{enumerable:!0,get:function(){return t.arraySplice}})})),define("consul-ui/helpers/asin",["exports","ember-math-helpers/helpers/asin"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"asin",{enumerable:!0,get:function(){return t.asin}})}))
-define("consul-ui/helpers/asinh",["exports","ember-math-helpers/helpers/asinh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"asinh",{enumerable:!0,get:function(){return t.asinh}})})),define("consul-ui/helpers/assign",["exports","ember-assign-helper/helpers/assign"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"assign",{enumerable:!0,get:function(){return t.assign}})})),define("consul-ui/helpers/atan",["exports","ember-math-helpers/helpers/atan"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"atan",{enumerable:!0,get:function(){return t.atan}})})),define("consul-ui/helpers/atan2",["exports","ember-math-helpers/helpers/atan2"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"atan2",{enumerable:!0,get:function(){return t.atan2}})})),define("consul-ui/helpers/atanh",["exports","ember-math-helpers/helpers/atanh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"atanh",{enumerable:!0,get:function(){return t.atanh}})})),define("consul-ui/helpers/atob",["exports","@ember/component/helper","consul-ui/utils/atob"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l=(0,t.helper)((function(e){let[t=""]=e
-return(0,n.default)(t)}))
-e.default=l})),define("consul-ui/helpers/block-params",["exports","block-slots/helpers/block-params"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/cached-model",["exports","@ember/component/helper","@ember/application"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{compute(e,t){let[l,r]=e
-return(0,n.getOwner)(this).lookup(`service:repository/${l}`).cached(r)}}e.default=l})),define("consul-ui/helpers/call",["exports","ember-composable-helpers/helpers/call"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"call",{enumerable:!0,get:function(){return t.call}})})),define("consul-ui/helpers/can",["exports","ember-can/helpers/can"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/cancel-all",["exports","ember-concurrency/helpers/cancel-all"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/cannot",["exports","ember-can/helpers/cannot"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/capitalize",["exports","ember-cli-string-helpers/helpers/capitalize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"capitalize",{enumerable:!0,get:function(){return t.capitalize}})})),define("consul-ui/helpers/cbrt",["exports","ember-math-helpers/helpers/cbrt"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"cbrt",{enumerable:!0,get:function(){return t.cbrt}})})),define("consul-ui/helpers/ceil",["exports","ember-math-helpers/helpers/ceil"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"ceil",{enumerable:!0,get:function(){return t.ceil}})})),define("consul-ui/helpers/changeset-get",["exports","ember-changeset/helpers/changeset-get"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/changeset-set",["exports","ember-changeset/helpers/changeset-set"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"changesetSet",{enumerable:!0,get:function(){return t.changesetSet}})})),define("consul-ui/helpers/changeset",["exports","ember-changeset-validations/helpers/changeset"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"changeset",{enumerable:!0,get:function(){return t.changeset}})})),define("consul-ui/helpers/chunk",["exports","ember-composable-helpers/helpers/chunk"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"chunk",{enumerable:!0,get:function(){return t.chunk}})})),define("consul-ui/helpers/class-map",["exports","@ember/component/helper"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.helper)((e=>{const t=e.filter(Boolean).filter((e=>"string"==typeof e||e[e.length-1])).map((e=>"string"==typeof e?e:e[0])).join(" ")
-return t.length>0?t:void 0}))
-e.default=n})),define("consul-ui/helpers/classify",["exports","ember-cli-string-helpers/helpers/classify"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"classify",{enumerable:!0,get:function(){return t.classify}})})),define("consul-ui/helpers/clz32",["exports","ember-math-helpers/helpers/clz32"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"clz32",{enumerable:!0,get:function(){return t.clz32}})})),define("consul-ui/helpers/collection",["exports","@ember/component/helper","@ember/object","consul-ui/models/service","consul-ui/models/service-instance"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i={service:l.Collection,"service-instance":r.Collection}
-class o{}class a extends t.default{compute(e,t){let[l,r]=e
-if(l.length>0){const e=(0,n.get)(l,"firstObject")._internalModel.modelName
-return new(0,i[e])(l)}return new o}}e.default=a})),define("consul-ui/helpers/compact",["exports","ember-composable-helpers/helpers/compact"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/compute",["exports","ember-composable-helpers/helpers/compute"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"compute",{enumerable:!0,get:function(){return t.compute}})})),define("consul-ui/helpers/contains",["exports","ember-composable-helpers/helpers/contains"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"contains",{enumerable:!0,get:function(){return t.contains}})})),define("consul-ui/helpers/cos",["exports","ember-math-helpers/helpers/cos"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"cos",{enumerable:!0,get:function(){return t.cos}})})),define("consul-ui/helpers/cosh",["exports","ember-math-helpers/helpers/cosh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"cosh",{enumerable:!0,get:function(){return t.cosh}})})),define("consul-ui/helpers/css-map",["exports","@ember/component/helper","@lit/reactive-element"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l=(0,t.helper)((e=>e.filter((e=>e instanceof n.CSSResult||e[e.length-1])).map((e=>e instanceof n.CSSResult?e:e[0]))))
-e.default=l})),define("consul-ui/helpers/css",["exports","@ember/component/helper","@lit/reactive-element"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{compute(e,t){let[l]=e
-return(0,n.css)([l])}}e.default=l}))
-define("consul-ui/helpers/dec",["exports","ember-composable-helpers/helpers/dec"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"dec",{enumerable:!0,get:function(){return t.dec}})})),define("consul-ui/helpers/did-insert",["exports","ember-render-helpers/helpers/did-insert"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/did-update",["exports","ember-render-helpers/helpers/did-update"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/div",["exports","ember-math-helpers/helpers/div"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"div",{enumerable:!0,get:function(){return t.div}})})),define("consul-ui/helpers/document-attrs",["exports","@ember/component/helper","@ember/service","@ember/debug","mnemonist/multi-map"],(function(e,t,n,l,r){var i,o,a
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=new Map,s=new WeakMap
-let c=(i=(0,n.inject)("-document"),o=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="document",l=this,(n=a)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}compute(e,t){this.synchronize(this.document.documentElement,t)}willDestroy(){this.synchronize(this.document.documentElement),s.delete(this)}synchronize(e,t){const n=s.get(this)
-return n&&Object.entries(n).forEach((e=>{let[t,n]=e,l=u.get(t)
-void 0!==l&&[...new Set(n.split(" "))].map((e=>l.remove(e,this)))})),t&&(s.set(this,t),[...Object.entries(t)].forEach((e=>{let[t,n]=e,l=u.get(t)
-void 0===l&&(l=new r.default(Set),u.set(t,l)),[...new Set(n.split(" "))].map((e=>{0===l.count(e)&&l.set(e,null),l.set(e,this)}))}))),[...u.entries()].forEach((t=>{let[n,r]=t,i="attr"
-"class"===n?i=n:n.startsWith("data-")&&(i="data"),[...r.keys()].forEach((t=>{if(1===r.count(t)){if("class"===i)e.classList.remove(t)
-else(0,l.runInDebug)((()=>{throw new Error(`${i} is not implemented yet`)}))
-r.delete(t),0===r.size&&u.delete(n)}else if("class"===i)e.classList.add(t)
-else(0,l.runInDebug)((()=>{throw new Error(`${i} is not implemented yet`)}))}))})),u}},d=o.prototype,p="document",f=[i],m={configurable:!0,enumerable:!0,writable:!0,initializer:null},b={},Object.keys(m).forEach((function(e){b[e]=m[e]})),b.enumerable=!!b.enumerable,b.configurable=!!b.configurable,("value"in b||b.initializer)&&(b.writable=!0),b=f.slice().reverse().reduce((function(e,t){return t(d,p,e)||e}),b),h&&void 0!==b.initializer&&(b.value=b.initializer?b.initializer.call(h):void 0,b.initializer=void 0),void 0===b.initializer&&(Object.defineProperty(d,p,b),b=null),a=b,o)
-var d,p,f,m,h,b
-e.default=c})),define("consul-ui/helpers/dom-position",["exports","@ember/component/helper"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{compute(e,t){let[n]=e,{from:l,offset:r=!1}=t
-return e=>{if("function"==typeof n){let t,i
-if(r)i=e.currentTarget,t={width:i.offsetWidth,left:i.offsetLeft,height:i.offsetHeight,top:i.offsetTop}
-else if(i=e.target,t=i.getBoundingClientRect(),void 0!==l){const e=l.getBoundingClientRect()
-t.x=t.x-e.x,t.y=t.y-e.y}return n(t)}{const t=e.target,l=t.getBoundingClientRect()
-n.forEach((e=>{let[n,r]=e
-t.style[r]=`${l[n]}px`}))}}}}e.default=n})),define("consul-ui/helpers/drop",["exports","ember-composable-helpers/helpers/drop"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/duration-from",["exports","@ember/component/helper","@ember/service"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,n.inject)("temporal"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="temporal",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}compute(e,t){let[n]=e
-return this.temporal.durationFrom(n)}},a=r.prototype,u="temporal",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/helpers/element",["exports","ember-element-helper/helpers/element"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/ember-power-select-is-group",["exports","ember-power-select/helpers/ember-power-select-is-group"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"emberPowerSelectIsGroup",{enumerable:!0,get:function(){return t.emberPowerSelectIsGroup}})})),define("consul-ui/helpers/ember-power-select-is-selected",["exports","ember-power-select/helpers/ember-power-select-is-selected"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"emberPowerSelectIsSelected",{enumerable:!0,get:function(){return t.emberPowerSelectIsSelected}})})),define("consul-ui/helpers/ensure-safe-component",["exports","@embroider/util"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.EnsureSafeComponentHelper}})})),define("consul-ui/helpers/entries",["exports","ember-composable-helpers/helpers/entries"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"entries",{enumerable:!0,get:function(){return t.entries}})})),define("consul-ui/helpers/env",["exports","@ember/component/helper","@ember/service"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,n.inject)("env"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}compute(e,t){let[n,l=""]=e
-const r=this.env.var(n)
-return null!=r?r:l}},a=r.prototype,u="env",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/helpers/eq",["exports","ember-truth-helpers/helpers/equal"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"equal",{enumerable:!0,get:function(){return t.equal}})})),define("consul-ui/helpers/exp",["exports","ember-math-helpers/helpers/exp"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"exp",{enumerable:!0,get:function(){return t.exp}})})),define("consul-ui/helpers/expm1",["exports","ember-math-helpers/helpers/expm1"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"expm1",{enumerable:!0,get:function(){return t.expm1}})})),define("consul-ui/helpers/filter-by",["exports","ember-composable-helpers/helpers/filter-by"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/filter",["exports","ember-composable-helpers/helpers/filter"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/find-by",["exports","ember-composable-helpers/helpers/find-by"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/fixed-grid-layout",["exports","@ember/component/helper","ember-collection/layouts/grid"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l=(0,t.helper)((function(e){return new n.default(e[0],e[1])}))
-e.default=l})),define("consul-ui/helpers/flatten-property",["exports","@ember/component/helper"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.helper)((function e(t,n){let[l,r]=t
-const i=n.pages||[]
-return i.push(...l.pages),l.children.forEach((t=>e([t],{pages:i}))),i}))
-e.default=n})),define("consul-ui/helpers/flatten",["exports","ember-composable-helpers/helpers/flatten"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"flatten",{enumerable:!0,get:function(){return t.flatten}})})),define("consul-ui/helpers/floor",["exports","ember-math-helpers/helpers/floor"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"floor",{enumerable:!0,get:function(){return t.floor}})})),define("consul-ui/helpers/format-date",["exports","ember-intl/helpers/format-date"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/format-message",["exports","ember-intl/helpers/format-message"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/format-number",["exports","ember-intl/helpers/format-number"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/format-relative",["exports","ember-intl/helpers/format-relative"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/format-short-time",["exports","@ember/component/helper"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.helper)((function(e,t){let n,l,r,i,[o]=e
-i=Math.floor(o/1e3),r=Math.floor(i/60),i%=60,l=Math.floor(r/60),r%=60,n=Math.floor(l/24),l%=24
-const a=n,u=l,s=r,c=i
-switch(!0){case 0!==a:return a+"d"
-case 0!==u:return u+"h"
-case 0!==s:return s+"m"
-default:return c+"s"}}))
-e.default=n})),define("consul-ui/helpers/format-time",["exports","ember-intl/helpers/format-time"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
-define("consul-ui/helpers/from-entries",["exports","ember-composable-helpers/helpers/from-entries"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"fromEntries",{enumerable:!0,get:function(){return t.fromEntries}})})),define("consul-ui/helpers/fround",["exports","ember-math-helpers/helpers/fround"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"fround",{enumerable:!0,get:function(){return t.fround}})})),define("consul-ui/helpers/gcd",["exports","ember-math-helpers/helpers/gcd"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"gcd",{enumerable:!0,get:function(){return t.gcd}})})),define("consul-ui/helpers/group-by",["exports","ember-composable-helpers/helpers/group-by"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/gt",["exports","ember-truth-helpers/helpers/gt"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"gt",{enumerable:!0,get:function(){return t.gt}})})),define("consul-ui/helpers/gte",["exports","ember-truth-helpers/helpers/gte"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"gte",{enumerable:!0,get:function(){return t.gte}})})),define("consul-ui/helpers/has-next",["exports","ember-composable-helpers/helpers/has-next"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"hasNext",{enumerable:!0,get:function(){return t.hasNext}})})),define("consul-ui/helpers/has-previous",["exports","ember-composable-helpers/helpers/has-previous"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"hasPrevious",{enumerable:!0,get:function(){return t.hasPrevious}})})),define("consul-ui/helpers/hds-link-to-models",["exports","@hashicorp/design-system-components/helpers/hds-link-to-models"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/hds-link-to-query",["exports","@hashicorp/design-system-components/helpers/hds-link-to-query"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/href-to",["exports","@ember/component/helper","@ember/service","@ember/object","@ember/application","consul-ui/utils/routing/transitionable","consul-ui/utils/routing/wildcard","consul-ui/router"],(function(e,t,n,l,r,i,o,a){var u,s,c
-function d(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.hrefTo=void 0
-const p=(0,o.default)(a.routes),f=function(e,t){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{}
-const l=e.lookup("router:main").location,r=e.lookup("service:router")
-let o=t.slice(0),a=o.shift(),u=n.params||{}
-"."===a&&(o=(0,i.default)(r.currentRoute,u,e),a=o.shift())
-try{return p(a)&&(o=o.map(((e,t)=>e.split("/").map(encodeURIComponent).join("/")))),l.hrefTo(a,o,u)}catch(s){throw s.constructor===Error&&(s.message=`${s.message} For "${t[0]}:${JSON.stringify(t.slice(1))}"`),s}}
-e.hrefTo=f
-let m=(u=(0,n.inject)("router"),s=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="router",l=this,(n=c)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}init(){super.init(...arguments),this.router.on("routeWillChange",this.routeWillChange)}compute(e,t){return f((0,r.getOwner)(this),e,t)}routeWillChange(e){this.recompute()}willDestroy(){this.router.off("routeWillChange",this.routeWillChange),super.willDestroy()}},c=d(s.prototype,"router",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d(s.prototype,"routeWillChange",[l.action],Object.getOwnPropertyDescriptor(s.prototype,"routeWillChange"),s.prototype),s)
-e.default=m})),define("consul-ui/helpers/humanize",["exports","ember-cli-string-helpers/helpers/humanize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"humanize",{enumerable:!0,get:function(){return t.humanize}})})),define("consul-ui/helpers/hypot",["exports","ember-math-helpers/helpers/hypot"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"hypot",{enumerable:!0,get:function(){return t.hypot}})})),define("consul-ui/helpers/icon-mapping",["exports","@ember/component/helper"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const n={kubernetes:"kubernetes-color",terraform:"terraform-color",nomad:"nomad-color",consul:"consul-color","consul-api-gateway":"consul-color",vault:"vault",aws:"aws-color","aws-iam":"aws-color",lambda:"aws-lambda-color"}
-var l=(0,t.helper)((function(e){let[t]=e
-return n[t]}))
-e.default=l})),define("consul-ui/helpers/if-key",["exports","ember-keyboard/helpers/if-key.js"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/imul",["exports","ember-math-helpers/helpers/imul"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"imul",{enumerable:!0,get:function(){return t.imul}})})),define("consul-ui/helpers/inc",["exports","ember-composable-helpers/helpers/inc"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"inc",{enumerable:!0,get:function(){return t.inc}})})),define("consul-ui/helpers/includes",["exports","ember-composable-helpers/helpers/includes"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"includes",{enumerable:!0,get:function(){return t.includes}})})),define("consul-ui/helpers/intersect",["exports","ember-composable-helpers/helpers/intersect"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/invoke",["exports","ember-composable-helpers/helpers/invoke"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"invoke",{enumerable:!0,get:function(){return t.invoke}})})),define("consul-ui/helpers/is-active",["exports","ember-router-helpers/helpers/is-active"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"isActive",{enumerable:!0,get:function(){return t.isActive}})})),define("consul-ui/helpers/is-array",["exports","ember-truth-helpers/helpers/is-array"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"isArray",{enumerable:!0,get:function(){return t.isArray}})})),define("consul-ui/helpers/is-empty",["exports","ember-truth-helpers/helpers/is-empty"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/is-equal",["exports","ember-truth-helpers/helpers/is-equal"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"isEqual",{enumerable:!0,get:function(){return t.isEqual}})})),define("consul-ui/helpers/is-href",["exports","@ember/component/helper","@ember/service","@ember/object"],(function(e,t,n,l){var r,i,o
-function a(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let u=(r=(0,n.inject)("router"),i=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="router",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}init(){super.init(...arguments),this.router.on("routeWillChange",this.routeWillChange)}compute(e){let[t,...n]=e
-return this.router.currentRouteName.startsWith("nspace.")&&t.startsWith("dc.")&&(t=`nspace.${t}`),void 0!==this.next&&"loading"!==this.next?this.next.startsWith(t):this.router.isActive(t,...n)}routeWillChange(e){this.next=e.to.name.replace(".index",""),this.recompute()}willDestroy(){this.router.off("routeWillChange",this.routeWillChange),super.willDestroy()}},o=a(i.prototype,"router",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a(i.prototype,"routeWillChange",[l.action],Object.getOwnPropertyDescriptor(i.prototype,"routeWillChange"),i.prototype),i)
-e.default=u})),define("consul-ui/helpers/is",["exports","ember-can/helpers/can","@ember/object","@ember/string"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.is=void 0
-const r=(e,t,r)=>{let[i,o]=t,{abilityName:a,propertyName:u}=e.abilities.parse(i),s=e.abilities.abilityFor(a,o,r)
-return u="function"==typeof s.getCharacteristicProperty?s.getCharacteristicProperty(u):(0,l.camelize)(`is-${u}`),(0,n.get)(s,u)}
-e.is=r
-class i extends t.default{compute(e,t){let[n,l]=e
-return r(this,[n,l],t)}}e.default=i})),define("consul-ui/helpers/join",["exports","ember-composable-helpers/helpers/join"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/json-stringify",["exports","@ember/component/helper"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.helper)((function(e,t){try{return JSON.stringify(...e)}catch(n){return e[0].map((t=>JSON.stringify(t,e[1],e[2])))}}))
-e.default=n})),define("consul-ui/helpers/keys",["exports","ember-composable-helpers/helpers/keys"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"keys",{enumerable:!0,get:function(){return t.keys}})})),define("consul-ui/helpers/last",["exports","@ember/component/helper"],(function(e,t){function n(e,t){let[n=""]=e
-if(!0==("string"==typeof n))return n.substr(-1)}Object.defineProperty(e,"__esModule",{value:!0}),e.last=n,e.default=void 0
-var l=(0,t.helper)(n)
-e.default=l}))
-define("consul-ui/helpers/lcm",["exports","ember-math-helpers/helpers/lcm"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"lcm",{enumerable:!0,get:function(){return t.lcm}})})),define("consul-ui/helpers/left-trim",["exports","@ember/component/helper","consul-ui/utils/left-trim"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l=(0,t.helper)((function(e,t){let[l="",r=""]=e
-return(0,n.default)(l,r)}))
-e.default=l})),define("consul-ui/helpers/loc",["exports","@ember/string/helpers/loc"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"loc",{enumerable:!0,get:function(){return t.loc}})})),define("consul-ui/helpers/log-e",["exports","ember-math-helpers/helpers/log-e"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"logE",{enumerable:!0,get:function(){return t.logE}})})),define("consul-ui/helpers/log10",["exports","ember-math-helpers/helpers/log10"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"log10",{enumerable:!0,get:function(){return t.log10}})})),define("consul-ui/helpers/log1p",["exports","ember-math-helpers/helpers/log1p"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"log1p",{enumerable:!0,get:function(){return t.log1p}})})),define("consul-ui/helpers/log2",["exports","ember-math-helpers/helpers/log2"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"log2",{enumerable:!0,get:function(){return t.log2}})})),define("consul-ui/helpers/lowercase",["exports","ember-cli-string-helpers/helpers/lowercase"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"lowercase",{enumerable:!0,get:function(){return t.lowercase}})})),define("consul-ui/helpers/lt",["exports","ember-truth-helpers/helpers/lt"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"lt",{enumerable:!0,get:function(){return t.lt}})})),define("consul-ui/helpers/lte",["exports","ember-truth-helpers/helpers/lte"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"lte",{enumerable:!0,get:function(){return t.lte}})})),define("consul-ui/helpers/map-by",["exports","ember-composable-helpers/helpers/map-by"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/map",["exports","ember-composable-helpers/helpers/map"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/max",["exports","ember-math-helpers/helpers/max"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"max",{enumerable:!0,get:function(){return t.max}})})),define("consul-ui/helpers/merge-checks",["exports","@ember/component/helper","consul-ui/utils/merge-checks"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l=(0,t.helper)((function(e,t){let[l,r]=e
-return(0,n.default)(l,r)}))
-e.default=l})),define("consul-ui/helpers/min",["exports","ember-math-helpers/helpers/min"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"min",{enumerable:!0,get:function(){return t.min}})})),define("consul-ui/helpers/mixed-grid-layout",["exports","@ember/component/helper","ember-collection/layouts/mixed-grid"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l=(0,t.helper)((function(e){return new n.default(e[0])}))
-e.default=l})),define("consul-ui/helpers/mod",["exports","ember-math-helpers/helpers/mod"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"mod",{enumerable:!0,get:function(){return t.mod}})})),define("consul-ui/helpers/mult",["exports","ember-math-helpers/helpers/mult"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"mult",{enumerable:!0,get:function(){return t.mult}})})),define("consul-ui/helpers/next",["exports","ember-composable-helpers/helpers/next"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"next",{enumerable:!0,get:function(){return t.next}})})),define("consul-ui/helpers/noop",["exports","ember-composable-helpers/helpers/noop"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"noop",{enumerable:!0,get:function(){return t.noop}})})),define("consul-ui/helpers/not-eq",["exports","ember-truth-helpers/helpers/not-equal"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"notEqualHelper",{enumerable:!0,get:function(){return t.notEqualHelper}})})),define("consul-ui/helpers/not",["exports","ember-truth-helpers/helpers/not"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"not",{enumerable:!0,get:function(){return t.not}})})),define("consul-ui/helpers/object-at",["exports","ember-composable-helpers/helpers/object-at"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"objectAt",{enumerable:!0,get:function(){return t.objectAt}})})),define("consul-ui/helpers/on-document",["exports","ember-on-helper/helpers/on-document"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/on-key",["exports","ember-keyboard/helpers/on-key.js"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/on-window",["exports","ember-on-helper/helpers/on-window"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/on",["exports","ember-on-helper/helpers/on"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/optional",["exports","ember-composable-helpers/helpers/optional"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"optional",{enumerable:!0,get:function(){return t.optional}})})),define("consul-ui/helpers/or",["exports","ember-truth-helpers/helpers/or"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"or",{enumerable:!0,get:function(){return t.or}})})),define("consul-ui/helpers/page-title",["exports","ember-page-title/helpers/page-title"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default
-e.default=n}))
-define("consul-ui/helpers/percentage-columns-layout",["exports","@ember/component/helper","ember-collection/layouts/percentage-columns"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l=(0,t.helper)((function(e){return new n.default(e[0],e[1],e[2])}))
-e.default=l})),define("consul-ui/helpers/percentage-of",["exports","@ember/component/helper"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.helper)((function(e,t){let[n,l]=e
-const r=n/l*100
-return isNaN(r)?0:r.toFixed(2)}))
-e.default=n})),define("consul-ui/helpers/perform",["exports","ember-concurrency/helpers/perform"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/pick",["exports","ember-composable-helpers/helpers/pick"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"pick",{enumerable:!0,get:function(){return t.pick}})})),define("consul-ui/helpers/pipe-action",["exports","ember-composable-helpers/helpers/pipe-action"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/pipe",["exports","ember-composable-helpers/helpers/pipe"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"pipe",{enumerable:!0,get:function(){return t.pipe}})})),define("consul-ui/helpers/pluralize",["exports","ember-inflector/lib/helpers/pluralize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default
-e.default=n})),define("consul-ui/helpers/policy/datacenters",["exports","@ember/component/helper","@ember/object"],(function(e,t,n){function l(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-const l=(0,n.get)(e[0],"Datacenters")
-return Array.isArray(l)&&0!==l.length?(0,n.get)(e[0],"Datacenters"):[t.global||"All"]}Object.defineProperty(e,"__esModule",{value:!0}),e.datacenters=l,e.default=void 0
-var r=(0,t.helper)(l)
-e.default=r})),define("consul-ui/helpers/policy/group",["exports","@ember/component/helper","@ember/object","consul-ui/models/policy"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.helper)((function(e){let[t]=e
-return t.reduce((function(e,t){let r
-switch(!0){case(0,n.get)(t,"ID")===l.MANAGEMENT_ID:r="management"
-break
-case""!==(0,n.get)(t,"template"):r="identities"
-break
-default:r="policies"}return e[r].push(t),e}),{management:[],identities:[],policies:[]})}))
-e.default=r})),define("consul-ui/helpers/policy/typeof",["exports","@ember/component/helper","@ember/object"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.typeOf=l,e.default=void 0
-function l(e,t){const l=e[0],r=(0,n.get)(l,"template")
-switch(!0){case void 0===r:return"role"
-case"service-identity"===r:return"policy-service-identity"
-case"node-identity"===r:return"policy-node-identity"
-case"00000000-0000-0000-0000-000000000001"===(0,n.get)(l,"ID"):return"policy-management"
-default:return"policy"}}var r=(0,t.helper)(l)
-e.default=r})),define("consul-ui/helpers/pow",["exports","ember-math-helpers/helpers/pow"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"pow",{enumerable:!0,get:function(){return t.pow}})})),define("consul-ui/helpers/previous",["exports","ember-composable-helpers/helpers/previous"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"previous",{enumerable:!0,get:function(){return t.previous}})})),define("consul-ui/helpers/queue",["exports","ember-composable-helpers/helpers/queue"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"queue",{enumerable:!0,get:function(){return t.queue}})})),define("consul-ui/helpers/random",["exports","ember-math-helpers/helpers/random"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"random",{enumerable:!0,get:function(){return t.random}})})),define("consul-ui/helpers/range",["exports","ember-composable-helpers/helpers/range"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"range",{enumerable:!0,get:function(){return t.range}})})),define("consul-ui/helpers/reduce",["exports","ember-composable-helpers/helpers/reduce"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/ref-to",["exports","ember-ref-bucket/helpers/ref-to"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"refTo",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/refresh-route",["exports","@ember/component/helper","@ember/service","@ember/application"],(function(e,t,n,l){var r,i,o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(r=(0,n.inject)("router"),i=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="router",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}compute(e,t){return()=>{const e=(0,l.getOwner)(this),t=this.router.currentRoute.name
-return e.lookup(`route:${t}`).refresh()}}},u=i.prototype,s="router",c=[r],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),o=f,i)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/helpers/reject-by",["exports","ember-composable-helpers/helpers/reject-by"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/render-template",["exports","@ember/component/helper","@ember/service"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=/{{([A-Za-z.0-9_-]+)}}/g
-let a,u=(l=(0,n.inject)("encoder"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="encoder",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),"function"!=typeof a&&(a=this.encoder.createRegExpEncoder(o,encodeURIComponent,!1))}compute(e){let[t,n]=e
-return a(t,n)}},s=r.prototype,c="encoder",d=[l],p={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(p).forEach((function(e){m[e]=p[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=d.slice().reverse().reduce((function(e,t){return t(s,c,e)||e}),m),f&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(f):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(s,c,m),m=null),i=m,r)
-var s,c,d,p,f,m
-e.default=u})),define("consul-ui/helpers/repeat",["exports","ember-composable-helpers/helpers/repeat"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"repeat",{enumerable:!0,get:function(){return t.repeat}})})),define("consul-ui/helpers/require",["exports","@ember/component/helper","require","@lit/reactive-element","consul-ui/utils/path/resolve"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=new Map
-var o=(0,t.helper)(((e,t)=>{let o,[a=""]=e,u=(0,r.default)(`consul-ui${t.from}`,a)
-if("/"===a.charAt(0)&&(u=`consul-ui${u}`),!n.default.has(u))throw new Error(`Unable to resolve '${u}' does the file exist?`)
-switch(o=(0,n.default)(u)[t.export||"default"],!0){case u.endsWith(".css"):return o(l.css)
-case u.endsWith(".xstate"):return o
-case u.endsWith(".element"):{if(i.has(u))return i.get(u)
-const e=o(HTMLElement)
-return i.set(u,e),e}default:return o}}))
-e.default=o})),define("consul-ui/helpers/reverse",["exports","ember-composable-helpers/helpers/reverse"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/right-trim",["exports","@ember/component/helper","consul-ui/utils/right-trim"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l=(0,t.helper)((function(e,t){let[l="",r=""]=e
-return(0,n.default)(l,r)}))
-e.default=l})),define("consul-ui/helpers/root-url",["exports","ember-router-helpers/helpers/root-url"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"rootUrl",{enumerable:!0,get:function(){return t.rootUrl}})})),define("consul-ui/helpers/round",["exports","ember-math-helpers/helpers/round"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"round",{enumerable:!0,get:function(){return t.round}})})),define("consul-ui/helpers/route-action",["exports","ember-route-action-helper/helpers/route-action"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/route-match",["exports","@ember/component/helper"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.helper)((function(e,t){let[n]=e
-switch(["Present","Exact","Prefix","Suffix","Regex"].find((e=>void 0!==n[e]))){case"Present":return(n.Invert?"NOT ":"")+"present"
-case"Exact":return`${n.Invert?"NOT ":""}exactly matching "${n.Exact}"`
-case"Prefix":return`${n.Invert?"NOT ":""}prefixed by "${n.Prefix}"`
-case"Suffix":return`${n.Invert?"NOT ":""}suffixed by "${n.Suffix}"`
-case"Regex":return`${n.Invert?"NOT ":""}matching the regex "${n.Regex}"`}return""}))
-e.default=n})),define("consul-ui/helpers/route-params",["exports","ember-router-helpers/helpers/route-params"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"routeParams",{enumerable:!0,get:function(){return t.routeParams}})})),define("consul-ui/helpers/service/card-permissions",["exports","@ember/component/helper"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.helper)((function(e){let[t]=e
-if(""===t.Datacenter)return"empty"
-{const e=t.Intention.HasPermissions,n=t.Intention.Allowed,l="specific-intention"===t.Source&&!t.TransparentProxy
-switch(!0){case e:return"allow"
-case!n&&!e:return"deny"
-case n&&l:return"not-defined"
-default:return"allow"}}}))
-e.default=n}))
-define("consul-ui/helpers/service/external-source",["exports","@ember/component/helper","@ember/object"],(function(e,t,n){function l(e,t){let l=(0,n.get)(e[0],"ExternalSources.firstObject")
-l||(l=(0,n.get)(e[0],"Meta.external-source"))
-const r=void 0===t.prefix?"":t.prefix
-if(l&&["consul-api-gateway","vault","kubernetes","terraform","nomad","consul","aws","lambda"].includes(l))return`${r}${l}`}Object.defineProperty(e,"__esModule",{value:!0}),e.serviceExternalSource=l,e.default=void 0
-var r=(0,t.helper)(l)
-e.default=r})),define("consul-ui/helpers/service/health-percentage",["exports","@ember/component/helper"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.helper)((function(e){let[t]=e
-const n=t.ChecksCritical+t.ChecksPassing+t.ChecksWarning
-return 0===n?"":{passing:Math.round(t.ChecksPassing/n*100),warning:Math.round(t.ChecksWarning/n*100),critical:Math.round(t.ChecksCritical/n*100)}}))
-e.default=n})),define("consul-ui/helpers/set",["exports","ember-set-helper/helpers/set"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/shuffle",["exports","ember-composable-helpers/helpers/shuffle"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"shuffle",{enumerable:!0,get:function(){return t.shuffle}})})),define("consul-ui/helpers/sign",["exports","ember-math-helpers/helpers/sign"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"sign",{enumerable:!0,get:function(){return t.sign}})})),define("consul-ui/helpers/sin",["exports","ember-math-helpers/helpers/sin"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"sin",{enumerable:!0,get:function(){return t.sin}})})),define("consul-ui/helpers/singularize",["exports","ember-inflector/lib/helpers/singularize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default
-e.default=n})),define("consul-ui/helpers/slice",["exports","ember-composable-helpers/helpers/slice"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/slugify",["exports","@ember/component/helper"],(function(e,t){function n(e,t){let[n=""]=e
-return n.replace(/ /g,"-").toLowerCase()}Object.defineProperty(e,"__esModule",{value:!0}),e.slugify=n,e.default=void 0
-var l=(0,t.helper)(n)
-e.default=l})),define("consul-ui/helpers/smart-date-format",["exports","@ember/component/helper","@ember/service"],(function(e,t,n){var l,r,i
-function o(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function a(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=6048e5
-function s(e){const t=new Date
-return e>=+t-u&&e<=+t+u}let c=(l=class extends t.default{constructor(){super(...arguments),o(this,"temporal",r,this),o(this,"intl",i,this)}compute(e,t){let[n]=e
-return{isNearDate:s(n),relative:`${this.temporal.format(n)} ago`,friendly:this.intl.formatTime(n,{month:"short",day:"numeric",year:"numeric",hour:"numeric",minute:"numeric",second:"numeric",hourCycle:"h24"})}}},r=a(l.prototype,"temporal",[n.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i=a(l.prototype,"intl",[n.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),l)
-e.default=c})),define("consul-ui/helpers/sort-by",["exports","ember-composable-helpers/helpers/sort-by"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/split",["exports","@ember/component/helper"],(function(e,t){function n(e,t){let[n="",l=","]=e
-return n.split(l)}Object.defineProperty(e,"__esModule",{value:!0}),e.split=n,e.default=void 0
-var l=(0,t.helper)(n)
-e.default=l})),define("consul-ui/helpers/sqrt",["exports","ember-math-helpers/helpers/sqrt"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"sqrt",{enumerable:!0,get:function(){return t.sqrt}})})),define("consul-ui/helpers/state-chart",["exports","@ember/component/helper","@ember/service"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,n.inject)("state"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="state",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}compute(e,t){let[n]=e
-return this.state.stateChart(n)}},a=r.prototype,u="state",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/helpers/state-matches",["exports","@ember/component/helper","@ember/service"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,n.inject)("state"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="state",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}compute(e,t){let[n,l]=e
-return this.state.matches(n,l)}},a=r.prototype,u="state",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/helpers/string-char-at",["exports","ember-string-fns/helpers/string-char-at"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringCharAt",{enumerable:!0,get:function(){return t.stringCharAt}})})),define("consul-ui/helpers/string-char-code-at",["exports","ember-string-fns/helpers/string-char-code-at"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringCharCodeAt",{enumerable:!0,get:function(){return t.stringCharCodeAt}})})),define("consul-ui/helpers/string-code-point-at",["exports","ember-string-fns/helpers/string-code-point-at"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringCodePointAt",{enumerable:!0,get:function(){return t.stringCodePointAt}})})),define("consul-ui/helpers/string-concat",["exports","ember-string-fns/helpers/string-concat"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringConcat",{enumerable:!0,get:function(){return t.stringConcat}})})),define("consul-ui/helpers/string-ends-with",["exports","ember-string-fns/helpers/string-ends-with"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringEndsWith",{enumerable:!0,get:function(){return t.stringEndsWith}})})),define("consul-ui/helpers/string-equals",["exports","ember-string-fns/helpers/string-equals"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringEquals",{enumerable:!0,get:function(){return t.stringEquals}})})),define("consul-ui/helpers/string-from-char-code",["exports","ember-string-fns/helpers/string-from-char-code"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringFromCharCode",{enumerable:!0,get:function(){return t.stringFromCharCode}})})),define("consul-ui/helpers/string-from-code-point",["exports","ember-string-fns/helpers/string-from-code-point"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringFromCodePoint",{enumerable:!0,get:function(){return t.stringFromCodePoint}})})),define("consul-ui/helpers/string-html-safe",["exports","@ember/component/helper","@ember/string"],(function(e,t,n){function l(e){let[t=""]=e
-return(0,n.htmlSafe)(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringHtmlSafe=l,e.default=void 0
-var r=(0,t.helper)(l)
-e.default=r})),define("consul-ui/helpers/string-includes",["exports","ember-string-fns/helpers/string-includes"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringIncludes",{enumerable:!0,get:function(){return t.stringIncludes}})})),define("consul-ui/helpers/string-index-of",["exports","ember-string-fns/helpers/string-index-of"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringIndexOf",{enumerable:!0,get:function(){return t.stringIndexOf}})})),define("consul-ui/helpers/string-last-index-of",["exports","ember-string-fns/helpers/string-last-index-of"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringLastIndexOf",{enumerable:!0,get:function(){return t.stringLastIndexOf}})})),define("consul-ui/helpers/string-not-equals",["exports","ember-string-fns/helpers/string-not-equals"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringNotEquals",{enumerable:!0,get:function(){return t.stringNotEquals}})})),define("consul-ui/helpers/string-pad-end",["exports","ember-string-fns/helpers/string-pad-end"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringPadEnd",{enumerable:!0,get:function(){return t.stringPadEnd}})})),define("consul-ui/helpers/string-pad-start",["exports","ember-string-fns/helpers/string-pad-start"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringPadStart",{enumerable:!0,get:function(){return t.stringPadStart}})}))
-define("consul-ui/helpers/string-repeat",["exports","ember-string-fns/helpers/string-repeat"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringRepeat",{enumerable:!0,get:function(){return t.stringRepeat}})})),define("consul-ui/helpers/string-replace-all",["exports","ember-string-fns/helpers/string-replace-all"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringReplaceAll",{enumerable:!0,get:function(){return t.stringReplaceAll}})})),define("consul-ui/helpers/string-replace",["exports","ember-string-fns/helpers/string-replace"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringReplace",{enumerable:!0,get:function(){return t.stringReplace}})})),define("consul-ui/helpers/string-slice",["exports","ember-string-fns/helpers/string-slice"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringSlice",{enumerable:!0,get:function(){return t.stringSlice}})})),define("consul-ui/helpers/string-split",["exports","ember-string-fns/helpers/string-split"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringSplit",{enumerable:!0,get:function(){return t.stringSplit}})})),define("consul-ui/helpers/string-starts-with",["exports","ember-string-fns/helpers/string-starts-with"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringStartsWith",{enumerable:!0,get:function(){return t.stringStartsWith}})})),define("consul-ui/helpers/string-substring",["exports","ember-string-fns/helpers/string-substring"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringSubstring",{enumerable:!0,get:function(){return t.stringSubstring}})})),define("consul-ui/helpers/string-to-camel-case",["exports","ember-string-fns/helpers/string-to-camel-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToCamelCase",{enumerable:!0,get:function(){return t.stringToCamelCase}})})),define("consul-ui/helpers/string-to-kebab-case",["exports","ember-string-fns/helpers/string-to-kebab-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToKebabCase",{enumerable:!0,get:function(){return t.stringToKebabCase}})})),define("consul-ui/helpers/string-to-lower-case",["exports","ember-string-fns/helpers/string-to-lower-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToLowerCase",{enumerable:!0,get:function(){return t.stringToLowerCase}})})),define("consul-ui/helpers/string-to-pascal-case",["exports","ember-string-fns/helpers/string-to-pascal-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToPascalCase",{enumerable:!0,get:function(){return t.stringToPascalCase}})})),define("consul-ui/helpers/string-to-sentence-case",["exports","ember-string-fns/helpers/string-to-sentence-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToSentenceCase",{enumerable:!0,get:function(){return t.stringToSentenceCase}})})),define("consul-ui/helpers/string-to-snake-case",["exports","ember-string-fns/helpers/string-to-snake-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToSnakeCase",{enumerable:!0,get:function(){return t.stringToSnakeCase}})})),define("consul-ui/helpers/string-to-title-case",["exports","ember-string-fns/helpers/string-to-title-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToTitleCase",{enumerable:!0,get:function(){return t.stringToTitleCase}})})),define("consul-ui/helpers/string-to-upper-case",["exports","ember-string-fns/helpers/string-to-upper-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToUpperCase",{enumerable:!0,get:function(){return t.stringToUpperCase}})})),define("consul-ui/helpers/string-trim-end",["exports","ember-string-fns/helpers/string-trim-end"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringTrimEnd",{enumerable:!0,get:function(){return t.stringTrimEnd}})})),define("consul-ui/helpers/string-trim-start",["exports","ember-string-fns/helpers/string-trim-start"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringTrimStart",{enumerable:!0,get:function(){return t.stringTrimStart}})})),define("consul-ui/helpers/string-trim",["exports","ember-string-fns/helpers/string-trim"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringTrim",{enumerable:!0,get:function(){return t.stringTrim}})})),define("consul-ui/helpers/style-map",["exports","@ember/component/helper"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.helper)((function(e){const t=e.reduce(((e,t)=>{let[n,l,r=""]=t
-return null==l?e:`${e}${n}:${l.toString()}${r};`}),"")
-return t.length>0?t:void 0}))
-e.default=n})),define("consul-ui/helpers/sub",["exports","ember-math-helpers/helpers/sub"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"sub",{enumerable:!0,get:function(){return t.sub}})})),define("consul-ui/helpers/substr",["exports","@ember/component/helper"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.helper)((function(e,t){let[n="",l=0,r]=e
-return n.substr(l,r)}))
-e.default=n})),define("consul-ui/helpers/svg-curve",["exports","@ember/component/helper"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.helper)((function(e,t){let[n]=e
-const l=t.src||{x:0,y:0},r=t.type||"cubic"
-let i=[n,{x:(l.x+n.x)/2,y:l.y}]
-return"cubic"===r&&i.push({x:i[1].x,y:n.y}),`${o=l,`\n    M ${o.x} ${o.y}\n  `}${function(){const e=[...arguments]
-return`${arguments.length>2?"C":"Q"} ${e.concat(e.shift()).map((e=>Object.values(e).join(" "))).join(",")}`}(...i)}`
-var o}))
-e.default=n})),define("consul-ui/helpers/t",["exports","ember-intl/helpers/t"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/take",["exports","ember-composable-helpers/helpers/take"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/tan",["exports","ember-math-helpers/helpers/tan"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"tan",{enumerable:!0,get:function(){return t.tan}})})),define("consul-ui/helpers/tanh",["exports","ember-math-helpers/helpers/tanh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"tanh",{enumerable:!0,get:function(){return t.tanh}})})),define("consul-ui/helpers/task",["exports","ember-concurrency/helpers/task"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/temporal-format",["exports","@ember/component/helper","@ember/service"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,n.inject)("temporal"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="temporal",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}compute(e,t){let[n]=e
-return this.temporal.format(n,t)}},a=r.prototype,u="temporal",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/helpers/temporal-within",["exports","@ember/component/helper","@ember/service"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,n.inject)("temporal"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="temporal",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}compute(e,t){return this.temporal.within(e,t)}},a=r.prototype,u="temporal",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/helpers/test",["exports","consul-ui/helpers/can","consul-ui/helpers/is"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{compute(e,t){let[l,r]=e
-switch(!0){case l.startsWith("can "):return super.compute([l.substr(4),r],t)
-case l.startsWith("is "):return(0,n.is)(this,[l.substr(3),r],t)}throw new Error(`${l} is not supported by the 'test' helper.`)}}e.default=l}))
-define("consul-ui/helpers/titleize",["exports","ember-cli-string-helpers/helpers/titleize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"titleize",{enumerable:!0,get:function(){return t.titleize}})})),define("consul-ui/helpers/to-hash",["exports","@ember/component/helper","@ember/object"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l=(0,t.helper)(((e,t)=>{let[l=[],r]=e
-return Array.isArray(l)||(l=l.toArray()),l.reduce(((e,t,l)=>(e[(0,n.get)(t,r)]=t,e)),{})}))
-e.default=l})),define("consul-ui/helpers/to-route",["exports","@ember/component/helper","@ember/service"],(function(e,t,n){var l,r,i,o,a
-function u(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function s(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let c=(l=(0,n.inject)("router"),r=(0,n.inject)("env"),i=class extends t.default{constructor(){super(...arguments),u(this,"router",o,this),u(this,"env",a,this)}compute(e){let[t]=e
-return this.router.recognize(`${this.env.var("rootURL")}${t}`).name}},o=s(i.prototype,"router",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a=s(i.prototype,"env",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i)
-e.default=c})),define("consul-ui/helpers/toggle-action",["exports","ember-composable-helpers/helpers/toggle-action"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/toggle",["exports","ember-composable-helpers/helpers/toggle"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"toggle",{enumerable:!0,get:function(){return t.toggle}})})),define("consul-ui/helpers/token/is-anonymous",["exports","@ember/component/helper","@ember/object"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.isAnonymous=l,e.default=void 0
-function l(e,t){return"00000000-0000-0000-0000-000000000002"===(0,n.get)(e[0],"AccessorID")}var r=(0,t.helper)(l)
-e.default=r})),define("consul-ui/helpers/token/is-legacy",["exports","@ember/component/helper","@ember/object"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.isLegacy=r,e.default=void 0
-const l=function(e){const t=(0,n.get)(e,"Rules")
-if(null!=t)return""!==t.trim()
-const l=(0,n.get)(e,"Legacy")
-return void 0!==l&&l}
-function r(e,t){const n=e[0]
-return void 0!==n.length?n.find((function(e){return l(e)})):l(n)}var i=(0,t.helper)(r)
-e.default=i})),define("consul-ui/helpers/transition-to",["exports","ember-router-helpers/helpers/transition-to"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"transitionTo",{enumerable:!0,get:function(){return t.transitionTo}})})),define("consul-ui/helpers/trunc",["exports","ember-math-helpers/helpers/trunc"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"trunc",{enumerable:!0,get:function(){return t.trunc}})})),define("consul-ui/helpers/truncate",["exports","ember-cli-string-helpers/helpers/truncate"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"truncate",{enumerable:!0,get:function(){return t.truncate}})})),define("consul-ui/helpers/tween-to",["exports","@ember/component/helper","@ember/service"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,n.inject)("ticker"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="ticker",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}compute(e,t){let[n,l]=e
-return this.ticker.tweenTo(n,l)}},a=r.prototype,u="ticker",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/helpers/union",["exports","ember-composable-helpers/helpers/union"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/uniq-by",["exports","@ember/component/helper","@ember/utils","@ember/array"],(function(e,t,n,l){function r(e){let[t,r]=e
-return(0,n.isEmpty)(t)?[]:(0,l.A)(r).uniqBy(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.uniqBy=r,e.default=void 0
-var i=(0,t.helper)(r)
-e.default=i})),define("consul-ui/helpers/unique-id",["exports","@ember/component/helper","@ember/service"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,n.inject)("dom"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="dom",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}compute(e,t){return this.dom.guid({})}},a=r.prototype,u="dom",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/helpers/uppercase",["exports","ember-cli-string-helpers/helpers/uppercase"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"uppercase",{enumerable:!0,get:function(){return t.uppercase}})})),define("consul-ui/helpers/uri",["exports","@ember/component/helper","@ember/service"],(function(e,t,n){var l,r,i,o,a
-function u(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function s(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const c=/\${([A-Za-z.0-9_-]+)}/g
-let d,p=(l=(0,n.inject)("encoder"),r=(0,n.inject)("data-source/service"),i=class extends t.default{constructor(){super(...arguments),u(this,"encoder",o,this),u(this,"data",a,this),"function"!=typeof d&&(d=this.encoder.createRegExpEncoder(c,encodeURIComponent))}compute(e){let[t,n]=e
-return this.data.uri(d(t,n))}},o=s(i.prototype,"encoder",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a=s(i.prototype,"data",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i)
-e.default=p})),define("consul-ui/helpers/url-for",["exports","ember-router-helpers/helpers/url-for"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"urlFor",{enumerable:!0,get:function(){return t.urlFor}})})),define("consul-ui/helpers/values",["exports","ember-composable-helpers/helpers/values"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"values",{enumerable:!0,get:function(){return t.values}})})),define("consul-ui/helpers/will-destroy",["exports","ember-render-helpers/helpers/will-destroy"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/without",["exports","ember-composable-helpers/helpers/without"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"without",{enumerable:!0,get:function(){return t.without}})})),define("consul-ui/helpers/xor",["exports","ember-truth-helpers/helpers/xor"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"xor",{enumerable:!0,get:function(){return t.xor}})})),define("consul-ui/initializers/app-version",["exports","ember-cli-app-version/initializer-factory","consul-ui/config/environment"],(function(e,t,n){let l,r
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,n.default.APP&&(l=n.default.APP.name,r=n.default.APP.version)
-var i={name:"App Version",initialize:(0,t.default)(l,r)}
-e.default=i})),define("consul-ui/initializers/container-debug-adapter",["exports","ember-resolver/resolvers/classic/container-debug-adapter"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n={name:"container-debug-adapter",initialize(){(arguments[1]||arguments[0]).register("container-debug-adapter:main",t.default)}}
-e.default=n})),define("consul-ui/initializers/ember-data-data-adapter",["exports","@ember-data/debug/setup"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/initializers/ember-data",["exports","ember-data","ember-data/setup-container"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l={name:"ember-data",initialize:n.default}
-e.default=l})),define("consul-ui/initializers/export-application-global",["exports","ember","consul-ui/config/environment"],(function(e,t,n){function l(){var e=arguments[1]||arguments[0]
-if(!1!==n.default.exportApplicationGlobal){var l
-if("undefined"!=typeof window)l=window
-else if("undefined"!=typeof global)l=global
-else{if("undefined"==typeof self)return
-l=self}var r,i=n.default.exportApplicationGlobal
-r="string"==typeof i?i:t.default.String.classify(n.default.modulePrefix),l[r]||(l[r]=e,e.reopen({willDestroy:function(){this._super.apply(this,arguments),delete l[r]}}))}}Object.defineProperty(e,"__esModule",{value:!0}),e.initialize=l,e.default=void 0
-var r={name:"export-application-global",initialize:l}
-e.default=r})),define("consul-ui/initializers/flash-messages",["exports","consul-ui/config/environment","@ember/application/deprecations","ember-cli-flash/utils/flash-message-options"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.initialize=r,e.default=void 0
-function r(){const e=arguments[1]||arguments[0],{flashMessageDefaults:n}=t.default||{},{injectionFactories:r}=n||[],i=(0,l.default)(n)
-r&&r.length
-i.injectionFactories.forEach((t=>{e.inject(t,"flashMessages","service:flash-messages")}))}var i={name:"flash-messages",initialize:r}
-e.default=i})),define("consul-ui/initializers/initialize-torii-callback",["exports","consul-ui/config/environment","torii/redirect-handler"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l={name:"torii-callback",before:"torii",initialize(e){arguments[1]&&(e=arguments[1]),t.default.torii&&t.default.torii.disableRedirectInitializer||(e.deferReadiness(),n.default.handle(window).catch((function(){e.advanceReadiness()})))}}
-e.default=l})),define("consul-ui/initializers/initialize-torii-session",["exports","torii/bootstrap/session","torii/configuration"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l={name:"torii-session",after:"torii",initialize(e){arguments[1]&&(e=arguments[1])
-const l=(0,n.getConfiguration)()
-l.sessionServiceName&&(0,t.default)(e,l.sessionServiceName)}}
-e.default=l})),define("consul-ui/initializers/initialize-torii",["exports","torii/bootstrap/torii","torii/configuration","consul-ui/config/environment"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r={name:"torii",initialize(e){arguments[1]&&(e=arguments[1]),(0,n.configure)(l.default.torii||{}),(0,t.default)(e)}},i=r
-e.default=i}))
-define("consul-ui/initializers/model-fragments",["exports","ember-data-model-fragments","ember-data-model-fragments/ext"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l={name:"fragmentTransform",after:"ember-data",initialize(){}}
-e.default=l})),define("consul-ui/initializers/setup-ember-can",["exports","ember-can/initializers/setup-ember-can"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"initialize",{enumerable:!0,get:function(){return t.initialize}})})),define("consul-ui/initializers/viewport-config",["exports","ember-in-viewport/initializers/viewport-config"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"initialize",{enumerable:!0,get:function(){return t.initialize}})})),define("consul-ui/instance-initializers/container",["exports","@ember/debug","require","deepmerge"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.services=void 0
-const r=document,i=l.default.all([...r.querySelectorAll("script[data-services]")].map((e=>JSON.parse(e.dataset.services))))
-e.services=i
-var o={name:"container",initialize(e){(function(e,t){Object.entries(t).forEach((t=>{let[l,r]=t
-if(1==("string"==typeof r.class)){if(!n.default.has(r.class))throw new Error(`Unable to locate '${r.class}'`)
-e.register(l.replace("auth-provider:","torii-provider:"),(0,n.default)(r.class).default)}}))})(e,i)
-const l=e.lookup("service:container")
-let r=l.get("container-debug-adapter:main").catalogEntriesByType("service").filter((e=>e.startsWith("repository/")||"ui-config"===e));(0,t.runInDebug)((()=>r=r.filter((e=>!e.endsWith("-test"))))),r.push("repository/service"),r.forEach((e=>{const t=`service:${e}`
-l.set(t,l.resolveRegistration(t))}))}}
-e.default=o})),define("consul-ui/instance-initializers/ember-data",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t={name:"ember-data",initialize(){}}
-e.default=t})),define("consul-ui/instance-initializers/href-to",["exports","@ember/routing/link-component"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.HrefTo=void 0
-class n{constructor(e,t){this.applicationInstance=e,this.target=t
-const n=this.target.attributes.href
-this.url=n&&n.value}handle(e){this.shouldHandle(e)&&(e.preventDefault(),this.applicationInstance.lookup("router:main").location.transitionTo(this.url))}shouldHandle(e){return this.isUnmodifiedLeftClick(e)&&!this.isIgnored(this.target)&&!this.isExternal(this.target)&&!this.hasActionHelper(this.target)&&!this.hasDownload(this.target)&&!this.isLinkComponent(this.target)}isUnmodifiedLeftClick(e){return!(void 0!==e.which&&1!==e.which||e.ctrlKey||e.metaKey)}isExternal(e){return"_blank"===e.getAttribute("target")}isIgnored(e){return e.dataset.nativeHref}hasActionHelper(e){return e.dataset.emberAction}hasDownload(e){return e.hasAttribute("download")}isLinkComponent(e){let n=!1
-const l=e.id
-if(l){const e=this.applicationInstance.lookup("-view-registry:main")[l]
-n=e&&e instanceof t.default}return n}recognizeUrl(e){let t=!1
-if(e){const n=this._getRouter(),l=this._getRootUrl(),r=0===e.indexOf(l),i=this.getUrlWithoutRoot(),o=n._router._routerMicrolib||n._router.router
-t=r&&o.recognizer.recognize(i)}return t}getUrlWithoutRoot(){const e=this.applicationInstance.lookup("router:main").location
-let t=e.getURL.apply({getHash:()=>"",location:{pathname:this.url},baseURL:e.baseURL,rootURL:e.rootURL,env:e.env},[])
-const n=t.indexOf("?")
-return-1!==n&&(t=t.substr(0,n-1)),t}_getRouter(){return this.applicationInstance.lookup("service:router")}_getRootUrl(){let e=this._getRouter().get("rootURL")
-return"/"!==e.charAt(e.length-1)&&(e+="/"),e}}e.HrefTo=n
-var l={name:"href-to",initialize(e){if("undefined"==typeof FastBoot){const t=e.lookup("service:dom").document(),l=t=>{const l="A"===t.target.tagName?t.target:function(e){if(e.closest)return e.closest("a")
-for(e=e.parentElement;e&&"A"!==e.tagName;)e=e.parentElement
-return e}(t.target)
-if(l){new n(e,l).handle(t)}}
-t.body.addEventListener("click",l),e.reopen({willDestroy(){return t.body.removeEventListener("click",l),this._super(...arguments)}})}}}
-e.default=l})),define("consul-ui/instance-initializers/ivy-codemirror",["exports"],(function(e){function t(e){const t=e.application.name,n=e.lookup("service:-document"),l=new Map(Object.entries(JSON.parse(n.querySelector(`[data-${t}-fs]`).textContent)))
-CodeMirror.modeURL={replace:function(e,t){switch(t.trim()){case"javascript":return l.get(["codemirror","mode","javascript","javascript.js"].join("/"))
-case"ruby":return l.get(["codemirror","mode","ruby","ruby.js"].join("/"))
-case"yaml":return l.get(["codemirror","mode","yaml","yaml.js"].join("/"))
-case"xml":return l.get(["codemirror","mode","xml","xml.js"].join("/"))}}}
-e.resolveRegistration("component:ivy-codemirror").reopen({attributeBindings:["name"]})}Object.defineProperty(e,"__esModule",{value:!0}),e.initialize=t,e.default=void 0
-var n={initialize:t}
-e.default=n})),define("consul-ui/instance-initializers/selection",["exports","consul-ui/env"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n={name:"selection",initialize(e){if((0,t.env)("CONSUL_UI_DISABLE_ANCHOR_SELECTION"))return
-const n=e.lookup("service:dom"),l=n.document(),r=l.getElementsByTagName("html")[0],i=function(e){return"A"===e.tagName?e:n.closest("a",e)},o=function(e){if(r.classList.contains("is-debug"))return
-const t=i(e.target)
-if(t){if(void 0!==e.button&&2===e.button){const e=t.dataset.href
-return void(e&&t.setAttribute("href",e))}const n=t.getAttribute("href")
-n&&(t.dataset.href=n,t.removeAttribute("href"))}},a=function(e){if(r.classList.contains("is-debug"))return
-const t=i(e.target)
-if(t){const n=t.dataset.href
-!function(){const t=(arguments.length>0&&void 0!==arguments[0]?arguments[0]:window).getSelection()
-let n=!1
-try{n="isCollapsed"in t&&!t.isCollapsed&&t.toString().length>1}catch(e){}return n}()&&n&&t.setAttribute("href",n)}}
-l.body.addEventListener("mousedown",o),l.body.addEventListener("mouseup",a),e.reopen({willDestroy:function(){return l.body.removeEventListener("mousedown",o),l.body.removeEventListener("mouseup",a),this._super(...arguments)}})}}
-e.default=n})),define("consul-ui/instance-initializers/setup-routes",["exports","ember","torii/bootstrap/routing","torii/configuration","torii/compat/get-router-instance","torii/compat/get-router-lib","torii/router-dsl-ext"],(function(e,t,n,l,r,i,o){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var a={name:"torii-setup-routes",initialize(e){if(!(0,l.getConfiguration)().sessionServiceName)return
-let o=(0,r.default)(e)
-const a=e.lookup("service:router")
-var u=function(){var l=(0,i.default)(o).authenticatedRoutes
-!t.default.isEmpty(l)&&(0,n.default)(e,l),a.off("routeWillChange",u)}
-a.on("routeWillChange",u)}}
-e.default=a})),define("consul-ui/instance-initializers/walk-providers",["exports","torii/lib/container-utils","torii/configuration"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l={name:"torii-walk-providers",initialize(e){let l=(0,n.getConfiguration)()
-for(var r in l.providers)l.providers.hasOwnProperty(r)&&(0,t.lookup)(e,"torii-provider:"+r)}}
-e.default=l})),define("consul-ui/locations/fsm-with-optional-test",["exports","consul-ui/locations/fsm-with-optional","consul-ui/locations/fsm","@ember/test-helpers"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{static create(){return new this(...arguments)}constructor(){var e,t,l
-super(...arguments),l="fsm-with-optional-test",(t="implementation")in(e=this)?Object.defineProperty(e,t,{value:l,enumerable:!0,configurable:!0,writable:!0}):e[t]=l,this.location=new n.Location,this.machine=new n.FSM(this.location),this.doc={defaultView:{addEventListener:(e,t)=>{this.machine=new n.FSM(this.location,t)},removeEventListener:(e,t)=>{this.machine=new n.FSM}}}}visit(e){const t=this.container,n=this.container.lookup("router:main"),r=async e=>(await(0,l.settled)(),new Promise((e=>setTimeout(e(t),0)))),i=e=>{if(e.error)throw e.error
-if("TransitionAborted"===e.name&&n._routerMicrolib.activeTransition)return n._routerMicrolib.activeTransition.then(r,i)
-throw"TransitionAborted"===e.name?new Error(e.message):e}
-return""===this.location.pathname?(this.rootURL=n.rootURL.replace(/\/$/,""),this.machine.state.path=this.location.pathname=`${this.rootURL}${e}`,this.path=this.getURL(),t.handleURL(`${this.path}`).then(r,i)):this.transitionTo(e).then(r,i)}}e.default=r})),define("consul-ui/locations/fsm-with-optional",["exports","consul-ui/env"],(function(e,t){function n(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function l(e){for(var t=1;t<arguments.length;t++){var l=null!=arguments[t]?arguments[t]:{}
-t%2?n(Object(l),!0).forEach((function(t){r(e,t,l[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(l)):n(Object(l)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(l,t))}))}return e}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i={};(0,t.env)("CONSUL_PARTITIONS_ENABLED")&&(i.partition=/^_([a-zA-Z0-9]([a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?)$/),(0,t.env)("CONSUL_NSPACES_ENABLED")&&(i.nspace=/^~([a-zA-Z0-9]([a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?)$/),i.peer=/^:([a-zA-Z0-9]([a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?)$/
-const o=/\/$/,a=function(e){const t=e.state.path,n=this.getURLForTransition(t)
-if(n===this._previousURL){if(t===this._previousPath)return
-this._previousPath=e.state.path,this.container.lookup("route:application").refresh()}"function"==typeof this.callback&&this.callback(n),this._previousURL=n,this._previousPath=e.state.path}
-e.default=class{static create(){return new this(...arguments)}constructor(e,t,n){r(this,"implementation","fsm-with-optional"),r(this,"baseURL",""),r(this,"rootURL","/"),r(this,"path","/"),r(this,"cancelRouterSetup",!1),r(this,"optional",{}),this.container=Object.entries(e)[0][1],this.route=a.bind(this),this.doc=void 0===t?this.container.lookup("service:-document"):t,this.env=void 0===n?this.container.lookup("service:env"):n
-const l=this.doc.querySelector("base[href]")
-null!==l&&(this.baseURL=l.getAttribute("href"))}initState(){this.location=this.location||this.doc.defaultView.location,this.machine=this.machine||this.doc.defaultView.history,this.doc.defaultView.addEventListener("popstate",this.route)
-const e=this.machine.state,t=this.getURL(),n=this.formatURL(t)
-e&&e.path===n?(this._previousPath=n,this._previousURL=t):this.dispatch("replace",n)}getURLFrom(e){return e=e||this.location.pathname,this.rootURL=this.rootURL.replace(o,""),this.baseURL=this.baseURL.replace(o,""),e.replace(new RegExp(`^${this.baseURL}(?=/|$)`),"").replace(new RegExp(`^${this.rootURL}(?=/|$)`),"")}getURLForTransition(e){return this.optional={},e=this.getURLFrom(e).split("/").filter(((e,t)=>{if(t<3){let t=!1
-return Object.entries(i).reduce(((n,l)=>{let[r,i]=l
-const o=i.exec(e)
-return null!==o&&(n[r]={value:e,match:o[1]},t=!0),n}),this.optional),!t}return!0})).join("/")}optionalParams(){let e=this.optional||{}
-return["partition","nspace","peer"].reduce(((t,n)=>{let l=""
-return void 0!==e[n]&&(l=e[n].match),t[n]=l,t}),{})}visit(){return this.transitionTo(...arguments)}hrefTo(e,n,r){const i=l({},r)
-void 0!==i.dc&&delete i.dc,void 0!==i.nspace&&(i.nspace=`~${i.nspace}`),void 0!==i.partition&&(i.partition=`_${i.partition}`),void 0!==i.peer&&(i.peer=`:${i.peer}`),void 0===this.router&&(this.router=this.container.lookup("router:main"))
-let o=!0
-switch(!0){case"settings"===e:case e.startsWith("docs."):o=!1}if(this.router.currentRouteName.startsWith("docs.")&&(n.unshift((0,t.env)("CONSUL_DATACENTER_PRIMARY")),e.startsWith("dc")))return`console://${e} <= ${JSON.stringify(n)}`
-const a=this.router._routerMicrolib
-let u
-try{u=a.generate(e,...n,{queryParams:{}})}catch(s){n=Object.values(a.oldState.params).reduce(((e,t)=>e.concat(Object.keys(t).length>0?t:[])),[]),u=a.generate(e,...n)}return this.formatURL(u,i,o)}transitionTo(e){if(this.router.currentRouteName.startsWith("docs")&&e.startsWith("console://"))return console.info(`location.transitionTo: ${e.substr(10)}`),!0
-const t=Object.entries(this.optionalParams()),n=this.getURLForTransition(e)
-if(this._previousURL===n)return this.dispatch("push",e),Promise.resolve()
-{const l=this.optionalParams()
-return t.some((e=>{let[t,n]=e
-return l[t]!==n}))&&this.dispatch("push",e),this.container.lookup("router:main").transitionTo(n)}}getURL(){const e=this.location.search||""
-let t=""
-void 0!==this.location.hash&&(t=this.location.hash.substr(0))
-return`${this.getURLForTransition(this.location.pathname)}${e}${t}`}formatURL(e,t){let n=!(arguments.length>2&&void 0!==arguments[2])||arguments[2]
-if(""!==e?(this.rootURL=this.rootURL.replace(o,""),this.baseURL=this.baseURL.replace(o,"")):"/"===this.baseURL[0]&&"/"===this.rootURL[0]&&(this.baseURL=this.baseURL.replace(o,"")),n){const n=e.split("/")
-t=l(l({},this.optional),t||{}),t=Object.values(t).filter((e=>Boolean(e))).map((e=>e.value||e),[]),n.splice(...[1,0].concat(t)),e=n.join("/")}return`${this.baseURL}${this.rootURL}${e}`}changeURL(e,t){this.path=t
-const n=this.machine.state
-t=this.formatURL(t),n&&n.path===t||this.dispatch(e,t)}setURL(e){this.changeURL("push",e)}replaceURL(e){this.changeURL("replace",e)}onUpdateURL(e){this.callback=e}dispatch(e,t){const n={path:t,uuid:"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,(e=>{const t=16*Math.random()|0
-return("x"===e?t:3&t|8).toString(16)}))}
-this.machine[`${e}State`](n,null,t),this.route({state:n})}willDestroy(){this.doc.defaultView.removeEventListener("popstate",this.route)}}})),define("consul-ui/locations/fsm",["exports"],(function(e){function t(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.Location=e.FSM=void 0
-e.FSM=class{constructor(e){let n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:()=>{}
-t(this,"state",{}),this.listener=n,this.location=e}pushState(e,t,n){this.state=e,this.location.pathname=n,this.listener({state:this.state})}replaceState(){return this.pushState(...arguments)}}
-e.Location=class{constructor(){t(this,"pathname",""),t(this,"search",""),t(this,"hash","")}}
-e.default=class{static create(){return new this(...arguments)}constructor(e){t(this,"implementation","fsm"),this.container=Object.entries(e)[0][1]}visit(){return this.transitionTo(...arguments)}hrefTo(){}transitionTo(){}}})),define("consul-ui/machines/boolean.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={id:"boolean",initial:"false",states:{true:{on:{TOGGLE:[{target:"false"}],FALSE:[{target:"false"}]}},false:{on:{TOGGLE:[{target:"true"}],TRUE:[{target:"true"}]}}}}})),define("consul-ui/machines/validate.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={id:"form",initial:"idle",on:{RESET:[{target:"idle"}]},states:{idle:{on:{SUCCESS:[{target:"success"}],ERROR:[{target:"error"}]}},success:{},error:{}}}})),define("consul-ui/mixins/policy/as-many",["exports","@ember/object/mixin","@ember/object","consul-ui/utils/minimizeModel"],(function(e,t,n,l){function r(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=function(e,t,n,l){return(e||[]).map((function(e){const r={template:t,Name:e[n]}
-return void 0!==e[l]&&(r[l]=e[l]),r}))},a=function(e){return(e||[]).map((function(e){return function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?r(Object(n),!0).forEach((function(t){i(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):r(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({template:""},e)}))},u=function(e,t,l,r){return e.filter((function(e){return(0,n.get)(e,"template")===t})).map((function(e){const t={[l]:(0,n.get)(e,"Name")}
-return void 0!==(0,n.get)(e,r)&&(t[r]=(0,n.get)(e,r)),t}))},s=function(e){return e.filter((function(e){return""===(0,n.get)(e,"template")}))}
-var c=t.default.create({respondForQueryRecord:function(e,t){return this._super((function(t){return e(((e,n)=>(n.Policies=a(n.Policies).concat(o(n.ServiceIdentities,"service-identity","ServiceName","Datacenters")).concat(o(n.NodeIdentities,"node-identity","NodeName","Datacenter")),t(e,n))))}),t)},respondForQuery:function(e,t){return this._super((function(t){return e((function(e,n){return t(e,n.map((function(e){return e.Policies=a(e.Policies).concat(o(e.ServiceIdentities,"service-identity","ServiceName","Datacenters")).concat(o(e.NodeIdentities,"node-identity","NodeName","Datacenter")),e})))}))}),t)},serialize:function(e,t){const n=this._super(...arguments)
-return n.ServiceIdentities=u(n.Policies,"service-identity","ServiceName","Datacenters"),n.NodeIdentities=u(n.Policies,"node-identity","NodeName","Datacenter"),n.Policies=(0,l.default)(s(n.Policies)),n}})
-e.default=c})),define("consul-ui/mixins/role/as-many",["exports","@ember/object/mixin","consul-ui/utils/minimizeModel"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l=t.default.create({respondForQueryRecord:function(e,t){return this._super((function(t){return e(((e,n)=>(n.Roles=void 0===n.Roles||null===n.Roles?[]:n.Roles,t(e,n))))}),t)},respondForQuery:function(e,t){return this._super((function(t){return e((function(e,n){return t(e,n.map((function(e){return e.Roles=void 0===e.Roles||null===e.Roles?[]:e.Roles,e})))}))}),t)},serialize:function(e,t){const l=this._super(...arguments)
-return l.Roles=(0,n.default)(l.Roles),l}})
-e.default=l})),define("consul-ui/mixins/slots",["exports","block-slots/mixins/slots"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/mixins/with-blocking-actions",["exports","@ember/object/mixin","@ember/service","@ember/object","ember-inflector"],(function(e,t,n,l,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=t.default.create({_feedback:(0,n.inject)("feedback"),settings:(0,n.inject)("settings"),init:function(){this._super(...arguments)
-const e=this._feedback,t=this;(0,l.set)(this,"feedback",{execute:function(n,l,i){const o=t.routeName.split(".")
-o.pop()
-const a=(0,r.singularize)(o.pop())
-return e.execute(n,l,i,a)}})},afterCreate:function(e){return this.afterUpdate(...arguments)},afterUpdate:function(e){const t=this.routeName.split(".")
-return t.pop(),this.transitionTo(t.join("."))},afterDelete:function(e){const t=this.routeName.split(".")
-return"index"===t.pop()?this.refresh():this.transitionTo(t.join("."))},errorCreate:function(e,t){return e},errorUpdate:function(e,t){return e},errorDelete:function(e,t){return e},actions:{cancel:function(){return this.afterUpdate(...arguments)},create:function(e,t){return t.preventDefault(),this.feedback.execute((()=>this.repo.persist(e).then((e=>this.afterCreate(...arguments)))),"create",((e,t)=>this.errorCreate(e,t)))},update:function(e,t){return t.preventDefault(),this.feedback.execute((()=>this.repo.persist(e).then((()=>this.afterUpdate(...arguments)))),"update",((e,t)=>this.errorUpdate(e,t)))},delete:function(e){return this.feedback.execute((()=>this.repo.remove(e).then((()=>this.afterDelete(...arguments)))),"delete",((e,t)=>this.errorDelete(e,t)))},use:function(e){return this.repo.findBySlug({dc:(0,l.get)(e,"Datacenter"),ns:(0,l.get)(e,"Namespace"),partition:(0,l.get)(e,"Partition"),id:(0,l.get)(e,"AccessorID")}).then((e=>this.settings.persist({token:{AccessorID:(0,l.get)(e,"AccessorID"),SecretID:(0,l.get)(e,"SecretID"),Namespace:(0,l.get)(e,"Namespace"),Partition:(0,l.get)(e,"Partition")}})))},logout:function(e){return this.settings.delete("token")},clone:function(e){let t
-return this.feedback.execute((()=>this.repo.clone(e).then((e=>(t=e,this.afterDelete(...arguments)))).then((function(){return t}))),"clone")}}})
-e.default=i})),define("consul-ui/models/auth-method",["exports","@ember-data/model","@ember/object/computed","parse-duration","@ember/object"],(function(e,t,n,l,r){var i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k,S,N,C,z,M,D,T,E,L,A,R,I,$,F
-function U(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function B(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="Name"
-let q=(i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("string"),u=(0,t.attr)("string"),s=(0,t.attr)("string"),c=(0,t.attr)("string",{defaultValue:()=>""}),d=(0,t.attr)("string",{defaultValue:()=>""}),p=(0,t.attr)("string",{defaultValue:()=>"local"}),f=(0,t.attr)("string"),m=(0,t.attr)(),h=(0,n.or)("DisplayName","Name"),b=(0,t.attr)(),y=(0,t.attr)("string"),g=(0,t.attr)("number"),v=(0,t.attr)("number"),O=(0,t.attr)(),P=(0,t.attr)(),x=(0,r.computed)("MaxTokenTTL"),w=class extends t.default{constructor(){super(...arguments),U(this,"uid",j,this),U(this,"Name",_,this),U(this,"Datacenter",k,this),U(this,"Namespace",S,this),U(this,"Partition",N,this),U(this,"Description",C,this),U(this,"DisplayName",z,this),U(this,"TokenLocality",M,this),U(this,"Type",D,this),U(this,"NamespaceRules",T,this),U(this,"MethodName",E,this),U(this,"Config",L,this),U(this,"MaxTokenTTL",A,this),U(this,"CreateIndex",R,this),U(this,"ModifyIndex",I,this),U(this,"Datacenters",$,this),U(this,"meta",F,this)}get TokenTTL(){return(0,l.default)(this.MaxTokenTTL)}},j=B(w.prototype,"uid",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=B(w.prototype,"Name",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=B(w.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=B(w.prototype,"Namespace",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=B(w.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=B(w.prototype,"Description",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=B(w.prototype,"DisplayName",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=B(w.prototype,"TokenLocality",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=B(w.prototype,"Type",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=B(w.prototype,"NamespaceRules",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=B(w.prototype,"MethodName",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=B(w.prototype,"Config",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=B(w.prototype,"MaxTokenTTL",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=B(w.prototype,"CreateIndex",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=B(w.prototype,"ModifyIndex",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),$=B(w.prototype,"Datacenters",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=B(w.prototype,"meta",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),B(w.prototype,"TokenTTL",[x],Object.getOwnPropertyDescriptor(w.prototype,"TokenTTL"),w.prototype),w)
-e.default=q})),define("consul-ui/models/binding-rule",["exports","@ember-data/model"],(function(e,t){var n,l,r,i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k
-function S(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function N(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="ID"
-let C=(n=(0,t.attr)("string"),l=(0,t.attr)("string"),r=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("string",{defaultValue:()=>""}),u=(0,t.attr)("string"),s=(0,t.attr)("string",{defaultValue:()=>""}),c=(0,t.attr)("string"),d=(0,t.attr)("string"),p=(0,t.attr)("number"),f=(0,t.attr)("number"),m=class extends t.default{constructor(){super(...arguments),S(this,"uid",h,this),S(this,"ID",b,this),S(this,"Datacenter",y,this),S(this,"Namespace",g,this),S(this,"Partition",v,this),S(this,"Description",O,this),S(this,"AuthMethod",P,this),S(this,"Selector",x,this),S(this,"BindType",w,this),S(this,"BindName",j,this),S(this,"CreateIndex",_,this),S(this,"ModifyIndex",k,this)}},h=N(m.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=N(m.prototype,"ID",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=N(m.prototype,"Datacenter",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=N(m.prototype,"Namespace",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=N(m.prototype,"Partition",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=N(m.prototype,"Description",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=N(m.prototype,"AuthMethod",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=N(m.prototype,"Selector",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=N(m.prototype,"BindType",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=N(m.prototype,"BindName",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=N(m.prototype,"CreateIndex",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=N(m.prototype,"ModifyIndex",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m)
-e.default=C})),define("consul-ui/models/coordinate",["exports","@ember-data/model"],(function(e,t){var n,l,r,i,o,a,u,s,c,d,p,f,m,h,b
-function y(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function g(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="Node"
-let v=(n=(0,t.attr)("string"),l=(0,t.attr)("string"),r=(0,t.attr)(),i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("string"),u=(0,t.attr)("number"),s=class extends t.default{constructor(){super(...arguments),y(this,"uid",c,this),y(this,"Node",d,this),y(this,"Coord",p,this),y(this,"Segment",f,this),y(this,"Datacenter",m,this),y(this,"Partition",h,this),y(this,"SyncTime",b,this)}},c=g(s.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=g(s.prototype,"Node",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=g(s.prototype,"Coord",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=g(s.prototype,"Segment",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=g(s.prototype,"Datacenter",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=g(s.prototype,"Partition",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=g(s.prototype,"SyncTime",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s)
-e.default=v})),define("consul-ui/models/dc",["exports","@ember-data/model"],(function(e,t){var n,l,r,i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k,S,N,C,z,M,D
-function T(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function E(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.FOREIGN_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.FOREIGN_KEY="Datacenter"
-e.SLUG_KEY="Name"
-let L=(n=(0,t.attr)("string"),l=(0,t.attr)("string"),r=(0,t.attr)("boolean"),i=(0,t.attr)("number"),o=(0,t.attr)("number"),a=(0,t.attr)("string"),u=(0,t.attr)(),s=(0,t.attr)(),c=(0,t.attr)(),d=(0,t.attr)(),p=(0,t.attr)(),f=(0,t.attr)("boolean"),m=(0,t.attr)("boolean"),h=(0,t.attr)("string"),b=(0,t.attr)("boolean",{defaultValue:()=>!0}),y=class extends t.default{constructor(){super(...arguments),T(this,"uri",g,this),T(this,"Name",v,this),T(this,"Healthy",O,this),T(this,"FailureTolerance",P,this),T(this,"OptimisticFailureTolerance",x,this),T(this,"Leader",w,this),T(this,"Voters",j,this),T(this,"Servers",_,this),T(this,"RedundancyZones",k,this),T(this,"Default",S,this),T(this,"ReadReplicas",N,this),T(this,"Local",C,this),T(this,"Primary",z,this),T(this,"DefaultACLPolicy",M,this),T(this,"MeshEnabled",D,this)}},g=E(y.prototype,"uri",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=E(y.prototype,"Name",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=E(y.prototype,"Healthy",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=E(y.prototype,"FailureTolerance",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=E(y.prototype,"OptimisticFailureTolerance",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=E(y.prototype,"Leader",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=E(y.prototype,"Voters",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=E(y.prototype,"Servers",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=E(y.prototype,"RedundancyZones",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=E(y.prototype,"Default",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=E(y.prototype,"ReadReplicas",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=E(y.prototype,"Local",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=E(y.prototype,"Primary",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=E(y.prototype,"DefaultACLPolicy",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=E(y.prototype,"MeshEnabled",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y)
-e.default=L})),define("consul-ui/models/discovery-chain",["exports","@ember-data/model"],(function(e,t){var n,l,r,i,o,a,u,s,c,d,p,f,m,h,b
-function y(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function g(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="ServiceName"
-let v=(n=(0,t.attr)("string"),l=(0,t.attr)("string"),r=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)(),u=(0,t.attr)(),s=class extends t.default{constructor(){super(...arguments),y(this,"uid",c,this),y(this,"ServiceName",d,this),y(this,"Datacenter",p,this),y(this,"Partition",f,this),y(this,"Namespace",m,this),y(this,"Chain",h,this),y(this,"meta",b,this)}},c=g(s.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=g(s.prototype,"ServiceName",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=g(s.prototype,"Datacenter",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=g(s.prototype,"Partition",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=g(s.prototype,"Namespace",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=g(s.prototype,"Chain",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=g(s.prototype,"meta",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s)
-e.default=v})),define("consul-ui/models/gateway-config",["exports","ember-data-model-fragments/fragment","ember-data-model-fragments/attributes","@ember-data/model"],(function(e,t,n,l){var r,i,o,a,u
-function s(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function c(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let d=(r=(0,l.attr)("number",{defaultValue:()=>0}),i=(0,n.array)("string",{defaultValue:()=>[]}),o=class extends t.default{constructor(){super(...arguments),s(this,"AssociatedServiceCount",a,this),s(this,"Addresses",u,this)}},a=c(o.prototype,"AssociatedServiceCount",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=c(o.prototype,"Addresses",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o)
-e.default=d})),define("consul-ui/models/health-check",["exports","ember-data-model-fragments/fragment","ember-data-model-fragments/attributes","@ember-data/model","@ember/object","consul-ui/decorators/replace"],(function(e,t,n,l,r,i){var o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k,S,N,C,z,M,D,T,E
-function L(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function A(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.schema=void 0
-e.schema={Status:{allowedValues:["passing","warning","critical"]},Type:{allowedValues:["serf","script","http","tcp","ttl","docker","grpc","alias"]}}
-let R=(o=(0,l.attr)("string"),a=(0,l.attr)("string"),u=(0,i.replace)("","serf"),s=(0,l.attr)("string"),c=(0,l.attr)("string"),d=(0,l.attr)("string"),p=(0,l.attr)("string"),f=(0,l.attr)("string"),m=(0,l.attr)("string"),h=(0,l.attr)("string"),b=(0,i.nullValue)([]),y=(0,n.array)("string"),g=(0,l.attr)(),v=(0,l.attr)("boolean"),O=(0,r.computed)("ServiceID"),P=(0,r.computed)("Type"),x=class extends t.default{constructor(){super(...arguments),L(this,"Name",w,this),L(this,"CheckID",j,this),L(this,"Type",_,this),L(this,"Status",k,this),L(this,"Notes",S,this),L(this,"Output",N,this),L(this,"ServiceName",C,this),L(this,"ServiceID",z,this),L(this,"Node",M,this),L(this,"ServiceTags",D,this),L(this,"Definition",T,this),L(this,"Exposed",E,this)}get Kind(){return""===this.ServiceID?"node":"service"}get Exposable(){return["http","grpc"].includes(this.Type)}},w=A(x.prototype,"Name",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=A(x.prototype,"CheckID",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=A(x.prototype,"Type",[u,s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=A(x.prototype,"Status",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=A(x.prototype,"Notes",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=A(x.prototype,"Output",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=A(x.prototype,"ServiceName",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=A(x.prototype,"ServiceID",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=A(x.prototype,"Node",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=A(x.prototype,"ServiceTags",[b,y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=A(x.prototype,"Definition",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=A(x.prototype,"Exposed",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A(x.prototype,"Kind",[O],Object.getOwnPropertyDescriptor(x.prototype,"Kind"),x.prototype),A(x.prototype,"Exposable",[P],Object.getOwnPropertyDescriptor(x.prototype,"Exposable"),x.prototype),x)
-e.default=R})),define("consul-ui/models/intention-permission-http-header",["exports","ember-data-model-fragments/fragment","@ember-data/model","@ember/object","@ember/object/computed"],(function(e,t,n,l,r){var i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O
-function P(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function x(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.schema=void 0
-const w={Name:{required:!0},HeaderType:{allowedValues:["Exact","Prefix","Suffix","Regex","Present"]}}
-e.schema=w
-let j=(i=(0,n.attr)("string"),o=(0,n.attr)("string"),a=(0,n.attr)("string"),u=(0,n.attr)("string"),s=(0,n.attr)("string"),c=(0,n.attr)(),d=(0,r.or)(...w.HeaderType.allowedValues),p=(0,l.computed)(...w.HeaderType.allowedValues),f=class extends t.default{constructor(){super(...arguments),P(this,"Name",m,this),P(this,"Exact",h,this),P(this,"Prefix",b,this),P(this,"Suffix",y,this),P(this,"Regex",g,this),P(this,"Present",v,this),P(this,"Value",O,this)}get HeaderType(){return w.HeaderType.allowedValues.find((e=>void 0!==this[e]))}},m=x(f.prototype,"Name",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=x(f.prototype,"Exact",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=x(f.prototype,"Prefix",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=x(f.prototype,"Suffix",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=x(f.prototype,"Regex",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=x(f.prototype,"Present",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=x(f.prototype,"Value",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x(f.prototype,"HeaderType",[p],Object.getOwnPropertyDescriptor(f.prototype,"HeaderType"),f.prototype),f)
-e.default=j})),define("consul-ui/models/intention-permission-http",["exports","ember-data-model-fragments/fragment","ember-data-model-fragments/attributes","@ember-data/model","@ember/object","@ember/object/computed"],(function(e,t,n,l,r,i){var o,a,u,s,c,d,p,f,m,h,b,y,g,v
-function O(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function P(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.schema=void 0
-const x={PathType:{allowedValues:["PathPrefix","PathExact","PathRegex"]},Methods:{allowedValues:["GET","HEAD","POST","PUT","DELETE","CONNECT","OPTIONS","TRACE","PATCH"]}}
-e.schema=x
-let w=(o=(0,l.attr)("string"),a=(0,l.attr)("string"),u=(0,l.attr)("string"),s=(0,n.fragmentArray)("intention-permission-http-header"),c=(0,n.array)("string"),d=(0,i.or)(...x.PathType.allowedValues),p=(0,r.computed)(...x.PathType.allowedValues),f=class extends t.default{constructor(){super(...arguments),O(this,"PathExact",m,this),O(this,"PathPrefix",h,this),O(this,"PathRegex",b,this),O(this,"Header",y,this),O(this,"Methods",g,this),O(this,"Path",v,this)}get PathType(){return x.PathType.allowedValues.find((e=>"string"==typeof this[e]))}},m=P(f.prototype,"PathExact",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=P(f.prototype,"PathPrefix",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=P(f.prototype,"PathRegex",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=P(f.prototype,"Header",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=P(f.prototype,"Methods",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=P(f.prototype,"Path",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P(f.prototype,"PathType",[p],Object.getOwnPropertyDescriptor(f.prototype,"PathType"),f.prototype),f)
-e.default=w})),define("consul-ui/models/intention-permission",["exports","ember-data-model-fragments/fragment","ember-data-model-fragments/attributes","@ember-data/model"],(function(e,t,n,l){var r,i,o,a,u
-function s(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function c(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.schema=void 0
-const d={Action:{defaultValue:"allow",allowedValues:["allow","deny"]}}
-e.schema=d
-let p=(r=(0,l.attr)("string",{defaultValue:()=>d.Action.defaultValue}),i=(0,n.fragment)("intention-permission-http"),o=class extends t.default{constructor(){super(...arguments),s(this,"Action",a,this),s(this,"HTTP",u,this)}},a=c(o.prototype,"Action",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=c(o.prototype,"HTTP",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o)
-e.default=p})),define("consul-ui/models/intention",["exports","@ember-data/model","@ember/object","ember-data-model-fragments/attributes","consul-ui/decorators/replace"],(function(e,t,n,l,r){var i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k,S,N,C,z,M,D,T,E,L,A,R,I,$,F,U,B,q,K,H,Y,G,V,W,Z,Q,J,X,ee,te,ne
-function le(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function re(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="ID"
-let ie=(i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("string"),u=(0,t.attr)("string"),s=(0,r.default)("",void 0),c=(0,t.attr)("string"),d=(0,t.attr)("string",{defaultValue:()=>"*"}),p=(0,t.attr)("string",{defaultValue:()=>"*"}),f=(0,t.attr)("string",{defaultValue:()=>"default"}),m=(0,t.attr)("string",{defaultValue:()=>"default"}),h=(0,t.attr)("string",{defaultValue:()=>"default"}),b=(0,t.attr)("string",{defaultValue:()=>"default"}),y=(0,t.attr)("number"),g=(0,t.attr)("string",{defaultValue:()=>"consul"}),v=(0,r.nullValue)(void 0),O=(0,t.attr)("string"),P=(0,t.attr)("string"),x=(0,t.attr)("boolean",{defaultValue:()=>!0}),w=(0,t.attr)("number"),j=(0,t.attr)("date"),_=(0,t.attr)("date"),k=(0,t.attr)("number"),S=(0,t.attr)("number"),N=(0,t.attr)(),C=(0,t.attr)({defaultValue:()=>[]}),z=(0,l.fragmentArray)("intention-permission"),M=(0,n.computed)("Meta"),D=class extends t.default{constructor(){super(...arguments),le(this,"uid",T,this),le(this,"ID",E,this),le(this,"Datacenter",L,this),le(this,"Description",A,this),le(this,"SourcePeer",R,this),le(this,"SourceName",I,this),le(this,"DestinationName",$,this),le(this,"SourceNS",F,this),le(this,"DestinationNS",U,this),le(this,"SourcePartition",B,this),le(this,"DestinationPartition",q,this),le(this,"Precedence",K,this),le(this,"SourceType",H,this),le(this,"Action",Y,this),le(this,"LegacyID",G,this),le(this,"Legacy",V,this),le(this,"SyncTime",W,this),le(this,"CreatedAt",Z,this),le(this,"UpdatedAt",Q,this),le(this,"CreateIndex",J,this),le(this,"ModifyIndex",X,this),le(this,"Meta",ee,this),le(this,"Resources",te,this),le(this,"Permissions",ne,this)}get IsManagedByCRD(){return void 0!==Object.entries(this.Meta||{}).find((e=>{let[t,n]=e
-return"external-source"===t&&"kubernetes"===n}))}},T=re(D.prototype,"uid",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=re(D.prototype,"ID",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=re(D.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=re(D.prototype,"Description",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=re(D.prototype,"SourcePeer",[s,c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=re(D.prototype,"SourceName",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),$=re(D.prototype,"DestinationName",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=re(D.prototype,"SourceNS",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),U=re(D.prototype,"DestinationNS",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),B=re(D.prototype,"SourcePartition",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),q=re(D.prototype,"DestinationPartition",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),K=re(D.prototype,"Precedence",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),H=re(D.prototype,"SourceType",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Y=re(D.prototype,"Action",[v,O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),G=re(D.prototype,"LegacyID",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),V=re(D.prototype,"Legacy",[x],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),W=re(D.prototype,"SyncTime",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Z=re(D.prototype,"CreatedAt",[j],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Q=re(D.prototype,"UpdatedAt",[_],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),J=re(D.prototype,"CreateIndex",[k],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),X=re(D.prototype,"ModifyIndex",[S],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ee=re(D.prototype,"Meta",[N],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),te=re(D.prototype,"Resources",[C],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ne=re(D.prototype,"Permissions",[z],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),re(D.prototype,"IsManagedByCRD",[M],Object.getOwnPropertyDescriptor(D.prototype,"IsManagedByCRD"),D.prototype),D)
-e.default=ie}))
-define("consul-ui/models/kv",["exports","@ember-data/model","@ember/object","consul-ui/utils/isFolder","consul-ui/decorators/replace"],(function(e,t,n,l,r){var i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k,S,N,C,z,M,D,T,E,L,A
-function R(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function I(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="Key"
-let $=(i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("number"),u=(0,t.attr)(),s=(0,t.attr)("string"),c=(0,t.attr)("string"),d=(0,t.attr)("string"),p=(0,t.attr)("number"),f=(0,t.attr)("number"),m=(0,r.nullValue)(void 0),h=(0,t.attr)("string"),b=(0,t.attr)("number"),y=(0,t.attr)("number"),g=(0,t.attr)("string"),v=(0,t.attr)({defaultValue:()=>[]}),O=(0,n.computed)("isFolder"),P=(0,n.computed)("Key"),x=class extends t.default{constructor(){super(...arguments),R(this,"uid",w,this),R(this,"Key",j,this),R(this,"SyncTime",_,this),R(this,"meta",k,this),R(this,"Datacenter",S,this),R(this,"Namespace",N,this),R(this,"Partition",C,this),R(this,"LockIndex",z,this),R(this,"Flags",M,this),R(this,"Value",D,this),R(this,"CreateIndex",T,this),R(this,"ModifyIndex",E,this),R(this,"Session",L,this),R(this,"Resources",A,this)}get Kind(){return this.isFolder?"folder":"key"}get isFolder(){return(0,l.default)(this.Key||"")}},w=I(x.prototype,"uid",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=I(x.prototype,"Key",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=I(x.prototype,"SyncTime",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=I(x.prototype,"meta",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=I(x.prototype,"Datacenter",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=I(x.prototype,"Namespace",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=I(x.prototype,"Partition",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=I(x.prototype,"LockIndex",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=I(x.prototype,"Flags",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=I(x.prototype,"Value",[m,h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=I(x.prototype,"CreateIndex",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=I(x.prototype,"ModifyIndex",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=I(x.prototype,"Session",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=I(x.prototype,"Resources",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I(x.prototype,"Kind",[O],Object.getOwnPropertyDescriptor(x.prototype,"Kind"),x.prototype),I(x.prototype,"isFolder",[P],Object.getOwnPropertyDescriptor(x.prototype,"isFolder"),x.prototype),x)
-e.default=$})),define("consul-ui/models/license",["exports","@ember-data/model"],(function(e,t){var n,l,r,i,o,a,u,s,c,d,p,f,m,h,b,y,g
-function v(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function O(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uri"
-let P=(n=(0,t.attr)("string"),l=(0,t.attr)("boolean"),r=(0,t.attr)("number"),i=(0,t.attr)(),o=(0,t.attr)("string"),a=(0,t.attr)("string"),u=(0,t.attr)("string"),s=(0,t.attr)(),c=class extends t.default{constructor(){super(...arguments),v(this,"uri",d,this),v(this,"Valid",p,this),v(this,"SyncTime",f,this),v(this,"meta",m,this),v(this,"Datacenter",h,this),v(this,"Namespace",b,this),v(this,"Partition",y,this),v(this,"License",g,this)}},d=O(c.prototype,"uri",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=O(c.prototype,"Valid",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=O(c.prototype,"SyncTime",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=O(c.prototype,"meta",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=O(c.prototype,"Datacenter",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=O(c.prototype,"Namespace",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=O(c.prototype,"Partition",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=O(c.prototype,"License",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c)
-e.default=P})),define("consul-ui/models/node",["exports","@ember-data/model","@ember/object","@ember/object/computed","ember-data-model-fragments/attributes"],(function(e,t,n,l,r){var i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k,S,N,C,z,M,D,T,E,L,A,R,I,$,F,U,B,q,K,H,Y,G
-function V(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function W(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="ID"
-let Z=(i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("string"),u=(0,t.attr)("string"),s=(0,t.attr)("string"),c=(0,t.attr)("string"),d=(0,t.attr)("string"),p=(0,t.attr)("number"),f=(0,t.attr)("number"),m=(0,t.attr)("number"),h=(0,t.attr)(),b=(0,t.attr)(),y=(0,t.attr)(),g=(0,t.attr)({defaultValue:()=>[]}),v=(0,t.hasMany)("service-instance"),O=(0,r.fragmentArray)("health-check"),P=(0,l.filter)("Services",(e=>"connect-proxy"!==e.Service.Kind)),x=(0,l.filter)("Services",(e=>"connect-proxy"===e.Service.Kind)),w=(0,l.filter)("Checks",(e=>""===e.ServiceID)),j=(0,n.computed)("ChecksCritical","ChecksPassing","ChecksWarning"),_=(0,n.computed)("NodeChecks.[]"),k=(0,n.computed)("NodeChecks.[]"),S=(0,n.computed)("NodeChecks.[]"),N=class extends t.default{constructor(){super(...arguments),V(this,"uid",C,this),V(this,"ID",z,this),V(this,"Datacenter",M,this),V(this,"PeerName",D,this),V(this,"Partition",T,this),V(this,"Address",E,this),V(this,"Node",L,this),V(this,"SyncTime",A,this),V(this,"CreateIndex",R,this),V(this,"ModifyIndex",I,this),V(this,"meta",$,this),V(this,"Meta",F,this),V(this,"TaggedAddresses",U,this),V(this,"Resources",B,this),V(this,"Services",q,this),V(this,"Checks",K,this),V(this,"MeshServiceInstances",H,this),V(this,"ProxyServiceInstances",Y,this),V(this,"NodeChecks",G,this)}get Status(){switch(!0){case 0!==this.ChecksCritical:return"critical"
-case 0!==this.ChecksWarning:return"warning"
-case 0!==this.ChecksPassing:return"passing"
-default:return"empty"}}get ChecksCritical(){return this.NodeChecks.filter((e=>"critical"===e.Status)).length}get ChecksPassing(){return this.NodeChecks.filter((e=>"passing"===e.Status)).length}get ChecksWarning(){return this.NodeChecks.filter((e=>"warning"===e.Status)).length}},C=W(N.prototype,"uid",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=W(N.prototype,"ID",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=W(N.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=W(N.prototype,"PeerName",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=W(N.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=W(N.prototype,"Address",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=W(N.prototype,"Node",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=W(N.prototype,"SyncTime",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=W(N.prototype,"CreateIndex",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=W(N.prototype,"ModifyIndex",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),$=W(N.prototype,"meta",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=W(N.prototype,"Meta",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),U=W(N.prototype,"TaggedAddresses",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),B=W(N.prototype,"Resources",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),q=W(N.prototype,"Services",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),K=W(N.prototype,"Checks",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),H=W(N.prototype,"MeshServiceInstances",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Y=W(N.prototype,"ProxyServiceInstances",[x],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),G=W(N.prototype,"NodeChecks",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),W(N.prototype,"Status",[j],Object.getOwnPropertyDescriptor(N.prototype,"Status"),N.prototype),W(N.prototype,"ChecksCritical",[_],Object.getOwnPropertyDescriptor(N.prototype,"ChecksCritical"),N.prototype),W(N.prototype,"ChecksPassing",[k],Object.getOwnPropertyDescriptor(N.prototype,"ChecksPassing"),N.prototype),W(N.prototype,"ChecksWarning",[S],Object.getOwnPropertyDescriptor(N.prototype,"ChecksWarning"),N.prototype),N)
-e.default=Z})),define("consul-ui/models/nspace",["exports","@ember-data/model"],(function(e,t){var n,l,r,i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x
-function w(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function j(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.NSPACE_KEY=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="Name"
-e.NSPACE_KEY="Namespace"
-let _=(n=(0,t.attr)("string"),l=(0,t.attr)("string"),r=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("number"),u=(0,t.attr)("string",{defaultValue:()=>""}),s=(0,t.attr)({defaultValue:()=>[]}),c=(0,t.attr)("string"),d=(0,t.attr)({defaultValue:()=>({PolicyDefaults:[],RoleDefaults:[]})}),p=class extends t.default{constructor(){super(...arguments),w(this,"uid",f,this),w(this,"Name",m,this),w(this,"Datacenter",h,this),w(this,"Partition",b,this),w(this,"Namespace",y,this),w(this,"SyncTime",g,this),w(this,"Description",v,this),w(this,"Resources",O,this),w(this,"DeletedAt",P,this),w(this,"ACLs",x,this)}},f=j(p.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=j(p.prototype,"Name",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=j(p.prototype,"Datacenter",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=j(p.prototype,"Partition",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=j(p.prototype,"Namespace",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=j(p.prototype,"SyncTime",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=j(p.prototype,"Description",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=j(p.prototype,"Resources",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=j(p.prototype,"DeletedAt",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=j(p.prototype,"ACLs",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p)
-e.default=_})),define("consul-ui/models/oidc-provider",["exports","@ember-data/model"],(function(e,t){var n,l,r,i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O
-function P(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function x(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="Name"
-let w=(n=(0,t.attr)("string"),l=(0,t.attr)("string"),r=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("string"),u=(0,t.attr)("string"),s=(0,t.attr)("string"),c=(0,t.attr)(),d=class extends t.default{constructor(){super(...arguments),P(this,"uid",p,this),P(this,"Name",f,this),P(this,"Datacenter",m,this),P(this,"Namespace",h,this),P(this,"Partition",b,this),P(this,"Kind",y,this),P(this,"AuthURL",g,this),P(this,"DisplayName",v,this),P(this,"meta",O,this)}},p=x(d.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=x(d.prototype,"Name",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=x(d.prototype,"Datacenter",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=x(d.prototype,"Namespace",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=x(d.prototype,"Partition",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=x(d.prototype,"Kind",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=x(d.prototype,"AuthURL",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=x(d.prototype,"DisplayName",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=x(d.prototype,"meta",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d)
-e.default=w})),define("consul-ui/models/partition",["exports","ember-data/model","ember-data/attr"],(function(e,t,n){var l,r,i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P
-function x(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function w(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.PARTITION_KEY=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="Name"
-e.PARTITION_KEY="Partition"
-let j=(l=(0,n.default)("string"),r=(0,n.default)("string"),i=(0,n.default)("string"),o=(0,n.default)("string"),a=(0,n.default)("string"),u=(0,n.default)("string"),s=(0,n.default)("string"),c=(0,n.default)("number"),d=(0,n.default)(),p=class extends t.default{constructor(){super(...arguments),x(this,"uid",f,this),x(this,"Name",m,this),x(this,"Description",h,this),x(this,"DeletedAt",b,this),x(this,"Datacenter",y,this),x(this,"Namespace",g,this),x(this,"Partition",v,this),x(this,"SyncTime",O,this),x(this,"meta",P,this)}},f=w(p.prototype,"uid",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=w(p.prototype,"Name",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=w(p.prototype,"Description",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=w(p.prototype,"DeletedAt",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=w(p.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=w(p.prototype,"Namespace",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=w(p.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=w(p.prototype,"SyncTime",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=w(p.prototype,"meta",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p)
-e.default=j})),define("consul-ui/models/peer",["exports","@ember-data/model","consul-ui/decorators/replace"],(function(e,t,n){var l,r,i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k,S,N,C,z,M,D,T,E,L,A,R,I
-function $(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function F(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.schema=void 0
-e.schema={State:{defaultValue:"PENDING",allowedValues:["PENDING","ESTABLISHING","ACTIVE","FAILING","TERMINATED","DELETING"]}}
-let U=(l=(0,t.attr)("string"),r=(0,t.attr)(),i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("string"),u=(0,t.attr)("string"),s=(0,t.attr)("string"),c=(0,t.attr)("string"),d=(0,n.nullValue)([]),p=(0,t.attr)(),f=(0,t.attr)("string"),m=(0,t.attr)(),h=(0,n.nullValue)([]),b=(0,t.attr)(),y=(0,n.nullValue)([]),g=(0,t.attr)(),v=(0,t.attr)("date"),O=(0,t.attr)("date"),P=(0,t.attr)("date"),x=class extends t.default{constructor(){super(...arguments),$(this,"uri",w,this),$(this,"meta",j,this),$(this,"Datacenter",_,this),$(this,"Partition",k,this),$(this,"Name",S,this),$(this,"State",N,this),$(this,"ID",C,this),$(this,"ServerExternalAddresses",z,this),$(this,"ServerExternalAddresses",M,this),$(this,"PeerID",D,this),$(this,"PeerServerAddresses",T,this),$(this,"ImportedServices",E,this),$(this,"ExportedServices",L,this),$(this,"LastHeartbeat",A,this),$(this,"LastReceive",R,this),$(this,"LastSend",I,this)}get ImportedServiceCount(){return this.ImportedServices.length}get ExportedServiceCount(){return this.ExportedServices.length}get isReceiver(){return this.PeerID}get isDialer(){return!this.isReceiver}},w=F(x.prototype,"uri",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=F(x.prototype,"meta",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=F(x.prototype,"Datacenter",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=F(x.prototype,"Partition",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=F(x.prototype,"Name",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=F(x.prototype,"State",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=F(x.prototype,"ID",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=F(x.prototype,"ServerExternalAddresses",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=F(x.prototype,"ServerExternalAddresses",[d,p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=F(x.prototype,"PeerID",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=F(x.prototype,"PeerServerAddresses",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=F(x.prototype,"ImportedServices",[h,b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=F(x.prototype,"ExportedServices",[y,g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=F(x.prototype,"LastHeartbeat",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=F(x.prototype,"LastReceive",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=F(x.prototype,"LastSend",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x)
-e.default=U})),define("consul-ui/models/permission",["exports","@ember-data/model"],(function(e,t){var n,l,r,i,o,a,u,s,c
-function d(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function p(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let f=(n=(0,t.attr)("string"),l=(0,t.attr)("string"),r=(0,t.attr)("string"),i=(0,t.attr)("boolean"),o=class extends t.default{constructor(){super(...arguments),d(this,"Resource",a,this),d(this,"Segment",u,this),d(this,"Access",s,this),d(this,"Allow",c,this)}},a=p(o.prototype,"Resource",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=p(o.prototype,"Segment",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=p(o.prototype,"Access",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=p(o.prototype,"Allow",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o)
-e.default=f})),define("consul-ui/models/policy",["exports","@ember-data/model","@ember/object"],(function(e,t,n){var l,r,i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k,S,N,C,z,M,D,T,E
-function L(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function A(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=e.MANAGEMENT_ID=void 0
-const R="00000000-0000-0000-0000-000000000001"
-e.MANAGEMENT_ID=R
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="ID"
-let I=(l=(0,t.attr)("string"),r=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("string"),u=(0,t.attr)("string",{defaultValue:()=>""}),s=(0,t.attr)("string",{defaultValue:()=>""}),c=(0,t.attr)("string",{defaultValue:()=>""}),d=(0,t.attr)("number"),p=(0,t.attr)("number"),f=(0,t.attr)("number"),m=(0,t.attr)(),h=(0,t.attr)(),b=(0,t.attr)("string",{defaultValue:()=>""}),y=(0,t.attr)("number",{defaultValue:()=>(new Date).getTime()}),g=(0,n.computed)("ID"),v=class extends t.default{constructor(){super(...arguments),L(this,"uid",O,this),L(this,"ID",P,this),L(this,"Datacenter",x,this),L(this,"Namespace",w,this),L(this,"Partition",j,this),L(this,"Name",_,this),L(this,"Description",k,this),L(this,"Rules",S,this),L(this,"SyncTime",N,this),L(this,"CreateIndex",C,this),L(this,"ModifyIndex",z,this),L(this,"Datacenters",M,this),L(this,"meta",D,this),L(this,"template",T,this),L(this,"CreateTime",E,this)}get isGlobalManagement(){return this.ID===R}},O=A(v.prototype,"uid",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=A(v.prototype,"ID",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=A(v.prototype,"Datacenter",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=A(v.prototype,"Namespace",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=A(v.prototype,"Partition",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=A(v.prototype,"Name",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=A(v.prototype,"Description",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=A(v.prototype,"Rules",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=A(v.prototype,"SyncTime",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=A(v.prototype,"CreateIndex",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=A(v.prototype,"ModifyIndex",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=A(v.prototype,"Datacenters",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=A(v.prototype,"meta",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=A(v.prototype,"template",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=A(v.prototype,"CreateTime",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A(v.prototype,"isGlobalManagement",[g],Object.getOwnPropertyDescriptor(v.prototype,"isGlobalManagement"),v.prototype),v)
-e.default=I})),define("consul-ui/models/proxy",["exports","@ember-data/model","consul-ui/models/service-instance"],(function(e,t,n){var l,r,i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w
-function j(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function _(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="Node,ServiceID"
-let k=(l=(0,t.attr)("string"),r=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("string"),u=(0,t.attr)("string"),s=(0,t.attr)("string"),c=(0,t.attr)("string"),d=(0,t.attr)("number"),p=(0,t.attr)(),f=class extends n.default{constructor(){super(...arguments),j(this,"uid",m,this),j(this,"ID",h,this),j(this,"Datacenter",b,this),j(this,"Namespace",y,this),j(this,"Partition",g,this),j(this,"ServiceName",v,this),j(this,"ServiceID",O,this),j(this,"NodeName",P,this),j(this,"SyncTime",x,this),j(this,"ServiceProxy",w,this)}},m=_(f.prototype,"uid",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=_(f.prototype,"ID",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=_(f.prototype,"Datacenter",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=_(f.prototype,"Namespace",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=_(f.prototype,"Partition",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=_(f.prototype,"ServiceName",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=_(f.prototype,"ServiceID",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=_(f.prototype,"NodeName",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=_(f.prototype,"SyncTime",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=_(f.prototype,"ServiceProxy",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f)
-e.default=k})),define("consul-ui/models/role",["exports","@ember-data/model"],(function(e,t){var n,l,r,i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k,S,N,C,z,M,D,T,E
-function L(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function A(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="ID"
-let R=(n=(0,t.attr)("string"),l=(0,t.attr)("string"),r=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("string",{defaultValue:()=>""}),u=(0,t.attr)("string",{defaultValue:()=>""}),s=(0,t.attr)({defaultValue:()=>[]}),c=(0,t.attr)({defaultValue:()=>[]}),d=(0,t.attr)({defaultValue:()=>[]}),p=(0,t.attr)("number"),f=(0,t.attr)("number"),m=(0,t.attr)("number"),h=(0,t.attr)("number"),b=(0,t.attr)(),y=(0,t.attr)("string"),g=class extends t.default{constructor(){super(...arguments),L(this,"uid",v,this),L(this,"ID",O,this),L(this,"Datacenter",P,this),L(this,"Namespace",x,this),L(this,"Partition",w,this),L(this,"Name",j,this),L(this,"Description",_,this),L(this,"Policies",k,this),L(this,"ServiceIdentities",S,this),L(this,"NodeIdentities",N,this),L(this,"SyncTime",C,this),L(this,"CreateIndex",z,this),L(this,"ModifyIndex",M,this),L(this,"CreateTime",D,this),L(this,"Datacenters",T,this),L(this,"Hash",E,this)}},v=A(g.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=A(g.prototype,"ID",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=A(g.prototype,"Datacenter",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=A(g.prototype,"Namespace",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=A(g.prototype,"Partition",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=A(g.prototype,"Name",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=A(g.prototype,"Description",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=A(g.prototype,"Policies",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=A(g.prototype,"ServiceIdentities",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=A(g.prototype,"NodeIdentities",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=A(g.prototype,"SyncTime",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=A(g.prototype,"CreateIndex",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=A(g.prototype,"ModifyIndex",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=A(g.prototype,"CreateTime",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=A(g.prototype,"Datacenters",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=A(g.prototype,"Hash",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g)
-e.default=R})),define("consul-ui/models/service-instance",["exports","@ember-data/model","ember-data-model-fragments/attributes","@ember/object","@ember/object/computed","@glimmer/tracking"],(function(e,t,n,l,r,i){var o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k,S,N,C,z,M,D,T,E,L,A,R,I,$,F,U,B,q,K,H,Y,G,V,W,Z,Q,J,X,ee,te,ne,le
-function re(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function ie(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.Collection=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="Node.Node,Service.ID"
-const oe=(a=ie((o=class{constructor(e){re(this,"items",a,this),this.items=e}get ExternalSources(){const e=this.items.reduce((function(e,t){return e.concat(t.ExternalSources||[])}),[])
-return[...new Set(e)].filter(Boolean).sort()}}).prototype,"items",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o)
-e.Collection=oe
-let ae=(u=(0,t.attr)("string"),s=(0,t.attr)("string"),c=(0,t.attr)(),d=(0,t.attr)(),p=(0,t.attr)(),f=(0,n.fragmentArray)("health-check"),m=(0,t.attr)("number"),h=(0,t.attr)(),b=(0,t.attr)({defaultValue:()=>[]}),y=(0,r.alias)("Service.Service"),g=(0,r.or)("Service.{ID,Service}"),v=(0,r.or)("Service.Address","Node.Service"),O=(0,t.attr)("string"),P=(0,r.alias)("Service.Tags"),x=(0,r.alias)("Service.Meta"),w=(0,r.alias)("Service.Namespace"),j=(0,r.alias)("Service.Partition"),_=(0,r.filter)("Checks.@each.Kind",((e,t,n)=>"service"===e.Kind)),k=(0,r.filter)("Checks.@each.Kind",((e,t,n)=>"node"===e.Kind)),S=(0,l.computed)("Service.Meta"),N=(0,l.computed)("Service.Kind"),C=(0,l.computed)("Service.Kind"),z=(0,l.computed)("IsOrigin"),M=(0,l.computed)("ChecksPassing","ChecksWarning","ChecksCritical"),D=(0,l.computed)("Checks.[]"),T=(0,l.computed)("Checks.[]"),E=(0,l.computed)("Checks.[]"),L=(0,l.computed)("Checks.[]","ChecksPassing"),A=(0,l.computed)("Checks.[]","ChecksWarning"),R=(0,l.computed)("Checks.[]","ChecksCritical"),I=class extends t.default{constructor(){super(...arguments),re(this,"uid",$,this),re(this,"Datacenter",F,this),re(this,"Proxy",U,this),re(this,"Node",B,this),re(this,"Service",q,this),re(this,"Checks",K,this),re(this,"SyncTime",H,this),re(this,"meta",Y,this),re(this,"Resources",G,this),re(this,"Name",V,this),re(this,"ID",W,this),re(this,"Address",Z,this),re(this,"SocketPath",Q,this),re(this,"Tags",J,this),re(this,"Meta",X,this),re(this,"Namespace",ee,this),re(this,"Partition",te,this),re(this,"ServiceChecks",ne,this),re(this,"NodeChecks",le,this)}get ExternalSources(){const e=Object.entries(this.Service.Meta||{}).filter((e=>{let[t,n]=e
-return"external-source"===t})).map((e=>{let[t,n]=e
-return n}))
-return[...new Set(e)]}get IsProxy(){return["connect-proxy","mesh-gateway","ingress-gateway","terminating-gateway","api-gateway"].includes(this.Service.Kind)}get IsOrigin(){return!["connect-proxy","mesh-gateway"].includes(this.Service.Kind)}get IsMeshOrigin(){return this.IsOrigin&&!["terminating-gateway"].includes(this.Service.Kind)}get Status(){switch(!0){case 0!==this.ChecksCritical.length:return"critical"
-case 0!==this.ChecksWarning.length:return"warning"
-case 0!==this.ChecksPassing.length:return"passing"
-default:return"empty"}}get ChecksPassing(){return this.Checks.filter((e=>"passing"===e.Status))}get ChecksWarning(){return this.Checks.filter((e=>"warning"===e.Status))}get ChecksCritical(){return this.Checks.filter((e=>"critical"===e.Status))}get PercentageChecksPassing(){return this.ChecksPassing.length/this.Checks.length*100}get PercentageChecksWarning(){return this.ChecksWarning.length/this.Checks.length*100}get PercentageChecksCritical(){return this.ChecksCritical.length/this.Checks.length*100}},$=ie(I.prototype,"uid",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=ie(I.prototype,"Datacenter",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),U=ie(I.prototype,"Proxy",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),B=ie(I.prototype,"Node",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),q=ie(I.prototype,"Service",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),K=ie(I.prototype,"Checks",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),H=ie(I.prototype,"SyncTime",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Y=ie(I.prototype,"meta",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),G=ie(I.prototype,"Resources",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),V=ie(I.prototype,"Name",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),W=ie(I.prototype,"ID",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Z=ie(I.prototype,"Address",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Q=ie(I.prototype,"SocketPath",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),J=ie(I.prototype,"Tags",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),X=ie(I.prototype,"Meta",[x],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ee=ie(I.prototype,"Namespace",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),te=ie(I.prototype,"Partition",[j],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ne=ie(I.prototype,"ServiceChecks",[_],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),le=ie(I.prototype,"NodeChecks",[k],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ie(I.prototype,"ExternalSources",[S],Object.getOwnPropertyDescriptor(I.prototype,"ExternalSources"),I.prototype),ie(I.prototype,"IsProxy",[N],Object.getOwnPropertyDescriptor(I.prototype,"IsProxy"),I.prototype),ie(I.prototype,"IsOrigin",[C],Object.getOwnPropertyDescriptor(I.prototype,"IsOrigin"),I.prototype),ie(I.prototype,"IsMeshOrigin",[z],Object.getOwnPropertyDescriptor(I.prototype,"IsMeshOrigin"),I.prototype),ie(I.prototype,"Status",[M],Object.getOwnPropertyDescriptor(I.prototype,"Status"),I.prototype),ie(I.prototype,"ChecksPassing",[D],Object.getOwnPropertyDescriptor(I.prototype,"ChecksPassing"),I.prototype),ie(I.prototype,"ChecksWarning",[T],Object.getOwnPropertyDescriptor(I.prototype,"ChecksWarning"),I.prototype),ie(I.prototype,"ChecksCritical",[E],Object.getOwnPropertyDescriptor(I.prototype,"ChecksCritical"),I.prototype),ie(I.prototype,"PercentageChecksPassing",[L],Object.getOwnPropertyDescriptor(I.prototype,"PercentageChecksPassing"),I.prototype),ie(I.prototype,"PercentageChecksWarning",[A],Object.getOwnPropertyDescriptor(I.prototype,"PercentageChecksWarning"),I.prototype),ie(I.prototype,"PercentageChecksCritical",[R],Object.getOwnPropertyDescriptor(I.prototype,"PercentageChecksCritical"),I.prototype),I)
-e.default=ae})),define("consul-ui/models/service",["exports","@ember-data/model","@ember/object","@glimmer/tracking","ember-data-model-fragments/attributes","consul-ui/decorators/replace"],(function(e,t,n,l,r,i){var o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k,S,N,C,z,M,D,T,E,L,A,R,I,$,F,U,B,q,K,H,Y,G,V,W,Z,Q,J,X,ee,te,ne,le,re,ie,oe,ae,ue,se,ce,de,pe,fe,me,he,be,ye,ge
-function ve(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function Oe(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.Collection=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="Name,PeerName"
-const Pe=(a=Oe((o=class{constructor(e){ve(this,"items",a,this),this.items=e}get ExternalSources(){const e=this.items.reduce((function(e,t){return e.concat(t.ExternalSources||[])}),[])
-return[...new Set(e)].filter(Boolean).sort()}get Partitions(){return[...new Set(this.items.map((e=>e.Partition)))].sort()}}).prototype,"items",[l.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o)
-e.Collection=Pe
-let xe=(u=(0,t.attr)("string"),s=(0,t.attr)("string"),c=(0,t.attr)("string"),d=(0,t.attr)("string"),p=(0,t.attr)("string"),f=(0,t.attr)("string"),m=(0,i.default)("",void 0),h=(0,t.attr)("string"),b=(0,t.attr)("number"),y=(0,t.attr)("number"),g=(0,t.attr)("number"),v=(0,t.attr)("number"),O=(0,t.attr)("boolean"),P=(0,t.attr)("boolean"),x=(0,t.attr)({defaultValue:()=>[]}),w=(0,t.attr)("number"),j=(0,t.attr)("number"),_=(0,t.attr)("number"),k=(0,i.nullValue)([]),S=(0,t.attr)({defaultValue:()=>[]}),N=(0,t.attr)(),C=(0,t.attr)(),z=(0,r.fragment)("gateway-config"),M=(0,i.nullValue)([]),D=(0,t.attr)(),T=(0,t.attr)(),E=(0,t.attr)(),L=(0,t.belongsTo)({async:!1}),A=(0,n.computed)("peer","InstanceCount"),R=(0,n.computed)("peer.State"),I=(0,n.computed)("ChecksPassing","ChecksWarning","ChecksCritical"),$=(0,n.computed)("MeshChecksPassing","MeshChecksWarning","MeshChecksCritical"),F=(0,n.computed)("ConnectedWithProxy","ConnectedWithGateway"),U=(0,n.computed)("MeshEnabled","Kind"),B=(0,n.computed)("MeshChecksPassing","MeshChecksWarning","MeshChecksCritical","isZeroCountButPeered","peerIsFailing"),q=(0,n.computed)("isZeroCountButPeered","peerIsFailing","MeshStatus"),K=(0,n.computed)("ChecksPassing","Proxy.ChecksPassing"),H=(0,n.computed)("ChecksWarning","Proxy.ChecksWarning"),Y=(0,n.computed)("ChecksCritical","Proxy.ChecksCritical"),G=class extends t.default{constructor(){super(...arguments),ve(this,"uid",V,this),ve(this,"Name",W,this),ve(this,"Datacenter",Z,this),ve(this,"Namespace",Q,this),ve(this,"Partition",J,this),ve(this,"Kind",X,this),ve(this,"PeerName",ee,this),ve(this,"ChecksPassing",te,this),ve(this,"ChecksCritical",ne,this),ve(this,"ChecksWarning",le,this),ve(this,"InstanceCount",re,this),ve(this,"ConnectedWithGateway",ie,this),ve(this,"ConnectedWithProxy",oe,this),ve(this,"Resources",ae,this),ve(this,"SyncTime",ue,this),ve(this,"CreateIndex",se,this),ve(this,"ModifyIndex",ce,this),ve(this,"Tags",de,this),ve(this,"Nodes",pe,this),ve(this,"Proxy",fe,this),ve(this,"GatewayConfig",me,this),ve(this,"ExternalSources",he,this),ve(this,"Meta",be,this),ve(this,"meta",ye,this),ve(this,"peer",ge,this)}get isZeroCountButPeered(){return this.peer&&0===this.InstanceCount}get peerIsFailing(){return this.peer&&"FAILING"===this.peer.State}get ChecksTotal(){return this.ChecksPassing+this.ChecksWarning+this.ChecksCritical}get MeshChecksTotal(){return this.MeshChecksPassing+this.MeshChecksWarning+this.MeshChecksCritical}get MeshEnabled(){return this.ConnectedWithProxy||this.ConnectedWithGateway}get InMesh(){return this.MeshEnabled||(this.Kind||"").length>0}get MeshStatus(){switch(!0){case this.isZeroCountButPeered:case this.peerIsFailing:return"unknown"
-case 0!==this.MeshChecksCritical:return"critical"
-case 0!==this.MeshChecksWarning:return"warning"
-case 0!==this.MeshChecksPassing:return"passing"
-default:return"empty"}}get healthTooltipText(){const{MeshStatus:e,isZeroCountButPeered:t,peerIsFailing:n}=this
-return t?"This service currently has 0 instances. Check with the operator of its peer to make sure this is expected behavior.":n?"This peer is out of sync, so the current health statuses of its services are unknown.":"critical"===e?"At least one health check on one instance is failing.":"warning"===e?"At least one health check on one instance has a warning.":"passing"==e?"All health checks are passing.":"There are no health checks"}get MeshChecksPassing(){let e=0
-return void 0!==this.Proxy&&(e=this.Proxy.ChecksPassing),this.ChecksPassing+e}get MeshChecksWarning(){let e=0
-return void 0!==this.Proxy&&(e=this.Proxy.ChecksWarning),this.ChecksWarning+e}get MeshChecksCritical(){let e=0
-return void 0!==this.Proxy&&(e=this.Proxy.ChecksCritical),this.ChecksCritical+e}},V=Oe(G.prototype,"uid",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),W=Oe(G.prototype,"Name",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Z=Oe(G.prototype,"Datacenter",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Q=Oe(G.prototype,"Namespace",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),J=Oe(G.prototype,"Partition",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),X=Oe(G.prototype,"Kind",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ee=Oe(G.prototype,"PeerName",[m,h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),te=Oe(G.prototype,"ChecksPassing",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ne=Oe(G.prototype,"ChecksCritical",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),le=Oe(G.prototype,"ChecksWarning",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),re=Oe(G.prototype,"InstanceCount",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ie=Oe(G.prototype,"ConnectedWithGateway",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),oe=Oe(G.prototype,"ConnectedWithProxy",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ae=Oe(G.prototype,"Resources",[x],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ue=Oe(G.prototype,"SyncTime",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),se=Oe(G.prototype,"CreateIndex",[j],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ce=Oe(G.prototype,"ModifyIndex",[_],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),de=Oe(G.prototype,"Tags",[k,S],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),pe=Oe(G.prototype,"Nodes",[N],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),fe=Oe(G.prototype,"Proxy",[C],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),me=Oe(G.prototype,"GatewayConfig",[z],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),he=Oe(G.prototype,"ExternalSources",[M,D],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),be=Oe(G.prototype,"Meta",[T],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ye=Oe(G.prototype,"meta",[E],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ge=Oe(G.prototype,"peer",[L],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Oe(G.prototype,"isZeroCountButPeered",[A],Object.getOwnPropertyDescriptor(G.prototype,"isZeroCountButPeered"),G.prototype),Oe(G.prototype,"peerIsFailing",[R],Object.getOwnPropertyDescriptor(G.prototype,"peerIsFailing"),G.prototype),Oe(G.prototype,"ChecksTotal",[I],Object.getOwnPropertyDescriptor(G.prototype,"ChecksTotal"),G.prototype),Oe(G.prototype,"MeshChecksTotal",[$],Object.getOwnPropertyDescriptor(G.prototype,"MeshChecksTotal"),G.prototype),Oe(G.prototype,"MeshEnabled",[F],Object.getOwnPropertyDescriptor(G.prototype,"MeshEnabled"),G.prototype),Oe(G.prototype,"InMesh",[U],Object.getOwnPropertyDescriptor(G.prototype,"InMesh"),G.prototype),Oe(G.prototype,"MeshStatus",[B],Object.getOwnPropertyDescriptor(G.prototype,"MeshStatus"),G.prototype),Oe(G.prototype,"healthTooltipText",[q],Object.getOwnPropertyDescriptor(G.prototype,"healthTooltipText"),G.prototype),Oe(G.prototype,"MeshChecksPassing",[K],Object.getOwnPropertyDescriptor(G.prototype,"MeshChecksPassing"),G.prototype),Oe(G.prototype,"MeshChecksWarning",[H],Object.getOwnPropertyDescriptor(G.prototype,"MeshChecksWarning"),G.prototype),Oe(G.prototype,"MeshChecksCritical",[Y],Object.getOwnPropertyDescriptor(G.prototype,"MeshChecksCritical"),G.prototype),G)
-e.default=xe})),define("consul-ui/models/session",["exports","@ember-data/model","@ember/object","consul-ui/decorators/replace"],(function(e,t,n,l){var r,i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k,S,N,C,z,M,D,T,E,L,A,R,I,$
-function F(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function U(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="ID"
-let B=(r=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("string"),u=(0,t.attr)("string"),s=(0,t.attr)("string"),c=(0,t.attr)("string"),d=(0,t.attr)("string"),p=(0,t.attr)("string"),f=(0,t.attr)("number"),m=(0,t.attr)("number"),h=(0,t.attr)("number"),b=(0,t.attr)("number"),y=(0,l.nullValue)([]),g=(0,t.attr)({defaultValue:()=>[]}),v=(0,l.nullValue)([]),O=(0,t.attr)({defaultValue:()=>[]}),P=(0,t.attr)({defaultValue:()=>[]}),x=(0,n.computed)("NodeChecks","ServiceChecks"),w=class extends t.default{constructor(){super(...arguments),F(this,"uid",j,this),F(this,"ID",_,this),F(this,"Name",k,this),F(this,"Datacenter",S,this),F(this,"Namespace",N,this),F(this,"Partition",C,this),F(this,"Node",z,this),F(this,"Behavior",M,this),F(this,"TTL",D,this),F(this,"LockDelay",T,this),F(this,"SyncTime",E,this),F(this,"CreateIndex",L,this),F(this,"ModifyIndex",A,this),F(this,"NodeChecks",R,this),F(this,"ServiceChecks",I,this),F(this,"Resources",$,this)}get checks(){return[...this.NodeChecks,...this.ServiceChecks.map((e=>{let{ID:t}=e
-return t}))]}},j=U(w.prototype,"uid",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=U(w.prototype,"ID",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=U(w.prototype,"Name",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=U(w.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=U(w.prototype,"Namespace",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=U(w.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=U(w.prototype,"Node",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=U(w.prototype,"Behavior",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=U(w.prototype,"TTL",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=U(w.prototype,"LockDelay",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=U(w.prototype,"SyncTime",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=U(w.prototype,"CreateIndex",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=U(w.prototype,"ModifyIndex",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=U(w.prototype,"NodeChecks",[y,g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=U(w.prototype,"ServiceChecks",[v,O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),$=U(w.prototype,"Resources",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),U(w.prototype,"checks",[x],Object.getOwnPropertyDescriptor(w.prototype,"checks"),w.prototype),w)
-e.default=B})),define("consul-ui/models/token",["exports","@ember-data/model","@ember/object","consul-ui/models/policy"],(function(e,t,n,l){var r,i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k,S,N,C,z,M,D,T,E,L,A,R,I,$,F,U,B,q,K,H,Y,G,V,W,Z
-function Q(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function J(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="AccessorID"
-let X=(r=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("string"),u=(0,t.attr)("string"),s=(0,t.attr)("string"),c=(0,t.attr)("string"),d=(0,t.attr)("boolean"),p=(0,t.attr)("boolean"),f=(0,t.attr)("string",{defaultValue:()=>""}),m=(0,t.attr)(),h=(0,t.attr)({defaultValue:()=>[]}),b=(0,t.attr)({defaultValue:()=>[]}),y=(0,t.attr)({defaultValue:()=>[]}),g=(0,t.attr)({defaultValue:()=>[]}),v=(0,t.attr)("date"),O=(0,t.attr)("string"),P=(0,t.attr)("number"),x=(0,t.attr)("number"),w=(0,t.attr)("string"),j=(0,t.attr)("string",{defaultValue:()=>""}),_=(0,t.attr)("string"),k=(0,n.computed)("Policies.[]"),S=(0,n.computed)("SecretID"),N=class extends t.default{constructor(){super(...arguments),Q(this,"uid",C,this),Q(this,"AccessorID",z,this),Q(this,"Datacenter",M,this),Q(this,"Namespace",D,this),Q(this,"Partition",T,this),Q(this,"IDPName",E,this),Q(this,"SecretID",L,this),Q(this,"Legacy",A,this),Q(this,"Local",R,this),Q(this,"Description",I,this),Q(this,"meta",$,this),Q(this,"Policies",F,this),Q(this,"Roles",U,this),Q(this,"ServiceIdentities",B,this),Q(this,"NodeIdentities",q,this),Q(this,"CreateTime",K,this),Q(this,"Hash",H,this),Q(this,"CreateIndex",Y,this),Q(this,"ModifyIndex",G,this),Q(this,"Type",V,this),Q(this,"Name",W,this),Q(this,"Rules",Z,this)}get isGlobalManagement(){return(this.Policies||[]).find((e=>e.ID===l.MANAGEMENT_ID))}get hasSecretID(){return""!==this.SecretID&&"<hidden>"!==this.SecretID}},C=J(N.prototype,"uid",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=J(N.prototype,"AccessorID",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=J(N.prototype,"Datacenter",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=J(N.prototype,"Namespace",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=J(N.prototype,"Partition",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=J(N.prototype,"IDPName",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=J(N.prototype,"SecretID",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=J(N.prototype,"Legacy",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=J(N.prototype,"Local",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=J(N.prototype,"Description",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),$=J(N.prototype,"meta",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=J(N.prototype,"Policies",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),U=J(N.prototype,"Roles",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),B=J(N.prototype,"ServiceIdentities",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),q=J(N.prototype,"NodeIdentities",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),K=J(N.prototype,"CreateTime",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),H=J(N.prototype,"Hash",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Y=J(N.prototype,"CreateIndex",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),G=J(N.prototype,"ModifyIndex",[x],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),V=J(N.prototype,"Type",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),W=J(N.prototype,"Name",[j],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Z=J(N.prototype,"Rules",[_],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),J(N.prototype,"isGlobalManagement",[k],Object.getOwnPropertyDescriptor(N.prototype,"isGlobalManagement"),N.prototype),J(N.prototype,"hasSecretID",[S],Object.getOwnPropertyDescriptor(N.prototype,"hasSecretID"),N.prototype),N)
-e.default=X})),define("consul-ui/models/topology",["exports","@ember-data/model","@ember/object"],(function(e,t,n){var l,r,i,o,a,u,s,c,d,p,f,m,h,b,y,g,v,O,P,x,w,j,_,k,S,N,C,z
-function M(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function D(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
-e.PRIMARY_KEY="uid"
-e.SLUG_KEY="ServiceName"
-let T=(l=(0,t.attr)("string"),r=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),a=(0,t.attr)("string"),u=(0,t.attr)("string"),s=(0,t.attr)("boolean"),c=(0,t.attr)("boolean"),d=(0,t.attr)("boolean"),p=(0,t.attr)(),f=(0,t.attr)(),m=(0,t.attr)(),h=(0,n.computed)("Downstreams"),b=(0,n.computed)("Downstreams","Upstreams"),y=(0,n.computed)("Downstreams","Upstreams"),g=class extends t.default{constructor(){super(...arguments),M(this,"uid",v,this),M(this,"ServiceName",O,this),M(this,"Datacenter",P,this),M(this,"Namespace",x,this),M(this,"Partition",w,this),M(this,"Protocol",j,this),M(this,"FilteredByACLs",_,this),M(this,"TransparentProxy",k,this),M(this,"ConnectNative",S,this),M(this,"Upstreams",N,this),M(this,"Downstreams",C,this),M(this,"meta",z,this)}get notDefinedIntention(){let e=!1
-return e=0!==this.Downstreams.filter((e=>"specific-intention"===e.Source&&!e.TransparentProxy&&!e.ConnectNative&&e.Intention.Allowed)).length,e}get wildcardIntention(){const e=0!==this.Downstreams.filter((e=>!e.Intention.HasExact&&e.Intention.Allowed)).length,t=0!==this.Upstreams.filter((e=>!e.Intention.HasExact&&e.Intention.Allowed)).length
-return e||t}get noDependencies(){return 0===this.Upstreams.length&&0===this.Downstreams.length}},v=D(g.prototype,"uid",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=D(g.prototype,"ServiceName",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=D(g.prototype,"Datacenter",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=D(g.prototype,"Namespace",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=D(g.prototype,"Partition",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=D(g.prototype,"Protocol",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=D(g.prototype,"FilteredByACLs",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=D(g.prototype,"TransparentProxy",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=D(g.prototype,"ConnectNative",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=D(g.prototype,"Upstreams",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=D(g.prototype,"Downstreams",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=D(g.prototype,"meta",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D(g.prototype,"notDefinedIntention",[h],Object.getOwnPropertyDescriptor(g.prototype,"notDefinedIntention"),g.prototype),D(g.prototype,"wildcardIntention",[b],Object.getOwnPropertyDescriptor(g.prototype,"wildcardIntention"),g.prototype),D(g.prototype,"noDependencies",[y],Object.getOwnPropertyDescriptor(g.prototype,"noDependencies"),g.prototype),g)
-e.default=T})),define("consul-ui/modifiers/aria-menu",["exports","ember-modifier","@ember/service","@ember/object"],(function(e,t,n,l){var r,i,o
-function a(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u={vertical:{40:function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:-1
-return(t+1)%e.length},38:function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0
-return 0===t?e.length-1:t-1},36:(e,t)=>0,35:(e,t)=>e.length-1},horizontal:{}}
-let s=(r=(0,n.inject)("-document"),i=class extends t.default{constructor(){var e,t,n,l,r,i,a
-super(...arguments),e=this,t="doc",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),a="vertical",(i="orientation")in(r=this)?Object.defineProperty(r,i,{value:a,enumerable:!0,configurable:!0,writable:!0}):r[i]=a}async keydown(e){if(27===e.keyCode)return this.options.onclose(e),void this.$trigger.focus()
-const t=[...this.element.querySelectorAll('[role^="menuitem"]')],n=t.findIndex((e=>e===this.doc.activeElement))
-9!==e.keyCode?void 0!==u[this.orientation][e.keyCode]&&(t[u[this.orientation][e.keyCode](t,n)].focus(),e.stopPropagation(),e.preventDefault()):e.shiftKey?0===n&&(this.options.onclose(e),this.$trigger.focus()):n===t.length-1&&(await new Promise((e=>setTimeout(e,0))),this.options.onclose(e))}async focus(e){""===e.pointerType&&(await Promise.resolve(),this.keydown({keyCode:36,stopPropagation:()=>{},preventDefault:()=>{}}))}connect(e,t){this.$trigger=this.doc.getElementById(this.element.getAttribute("aria-labelledby")),void 0!==t.openEvent&&this.focus(t.openEvent),this.doc.addEventListener("keydown",this.keydown)}disconnect(){this.doc.removeEventListener("keydown",this.keydown)}didReceiveArguments(){this.params=this.args.positional,this.options=this.args.named}didInstall(){this.connect(this.args.positional,this.args.named)}willRemove(){this.disconnect()}},o=a(i.prototype,"doc",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a(i.prototype,"keydown",[l.action],Object.getOwnPropertyDescriptor(i.prototype,"keydown"),i.prototype),a(i.prototype,"focus",[l.action],Object.getOwnPropertyDescriptor(i.prototype,"focus"),i.prototype),i)
-e.default=s})),define("consul-ui/modifiers/create-ref",["exports","ember-ref-bucket/modifiers/create-ref"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/modifiers/css-prop",["exports","ember-modifier","@ember/service"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,n.inject)("-document"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="doc",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}didReceiveArguments(){const e=this.args.positional,t=this.args.named;(e[1]||t.returns)(this.doc.defaultView.getComputedStyle(this.element).getPropertyValue(e[0]))}},a=r.prototype,u="doc",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/modifiers/css-props",["exports","ember-modifier"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const n=Object.fromEntries([...document.styleSheets].reduce(((e,t)=>e.concat([...t.cssRules].filter((e=>1===e.type)).reduce(((e,t)=>[...e,...[...t.style].filter((e=>e.startsWith("--"))).map((e=>[e.trim(),t.style.getPropertyValue(e).trim()]))]),[]))),[]))
-var l=(0,t.modifier)((function(e,t,l){let[r]=t
-const i=new RegExp(`^--${l.prefix||"."}${l.group||""}+`),o={}
-Object.entries(n).forEach((e=>{let[t,n]=e
-const r=t.match(i)
-if(r){let e=r[0]
-"-"===e.charAt(e.length-1)&&(e=e.substr(0,e.length-1)),l.group?(void 0===o[e]&&(o[e]={}),o[e][t]=n):o[t]=n}})),r(o)}))
-e.default=l})),define("consul-ui/modifiers/did-insert",["exports","@ember/render-modifiers/modifiers/did-insert"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/modifiers/did-update",["exports","@ember/render-modifiers/modifiers/did-update"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/modifiers/did-upsert",["exports","@ember/modifier"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const n=e=>({target:e.element,currentTarget:e.element})
-var l=(0,t.setModifierManager)((()=>({capabilities:(0,t.capabilities)("3.22",{disableAutoTracking:!0}),createModifier:()=>({element:null}),installModifier(e,t,l){e.element=t,l.positional.forEach((()=>{})),l.named&&Object.values(l.named)
-const[r,...i]=l.positional
-r(n(e),i,l.named)},updateModifier(e,t){t.positional.forEach((()=>{})),t.named&&Object.values(t.named)
-const[l,...r]=t.positional
-l(n(e),r,t.named)},destroyModifier(){}})),class{})
-e.default=l})),define("consul-ui/modifiers/disabled",["exports","ember-modifier"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.modifier)((function(e,t,n){let[l=!0]=t
-if(["input","textarea","select","button"].includes(e.nodeName.toLowerCase()))l?(e.setAttribute("disabled",l),e.setAttribute("aria-disabled",l)):(e.dataset.disabled=!1,e.removeAttribute("disabled"),e.removeAttribute("aria-disabled"))
-else for(const r of e.querySelectorAll("input,textarea,button"))l&&"false"!==r.dataset.disabled?(e.setAttribute("disabled",l),e.setAttribute("aria-disabled",l)):(e.removeAttribute("disabled"),e.removeAttribute("aria-disabled"))}))
-e.default=n})),define("consul-ui/modifiers/focus-trap",["exports","ember-focus-trap/modifiers/focus-trap.js"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/modifiers/in-viewport",["exports","ember-in-viewport/modifiers/in-viewport"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/modifiers/notification",["exports","ember-modifier","@ember/service"],(function(e,t,n){var l,r,i
-function o(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let u=(l=(0,n.inject)("flashMessages"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="notify",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}didInstall(){this.element.setAttribute("role","alert"),this.element.dataset.notification=null
-const e=function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?o(Object(n),!0).forEach((function(t){a(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):o(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({timeout:6e3,extendedTimeout:300},this.args.named)
-e.dom=this.element.outerHTML,this.element.remove(),this.notify.clearMessages(),"function"==typeof e.after?Promise.resolve().then((t=>e.after())).catch((e=>{if("TransitionAborted"!==e.name)throw e})).then((t=>{this.notify.add(e)})):this.notify.add(e)}willDestroy(){this.args.named.sticky&&this.notify.clearMessages()}},s=r.prototype,c="notify",d=[l],p={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(p).forEach((function(e){m[e]=p[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=d.slice().reverse().reduce((function(e,t){return t(s,c,e)||e}),m),f&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(f):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(s,c,m),m=null),i=m,r)
-var s,c,d,p,f,m
-e.default=u})),define("consul-ui/modifiers/on-key",["exports","ember-keyboard/modifiers/on-key.js"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/modifiers/on-outside",["exports","ember-modifier","@ember/object","@ember/service"],(function(e,t,n,l){var r,i,o
-function a(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let u=(r=(0,l.inject)("dom"),i=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="dom",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),this.doc=this.dom.document()}async connect(e,t){await new Promise((e=>setTimeout(e,0)))
-try{this.doc.addEventListener(e[0],this.listen)}catch(n){}}listen(e){if(this.dom.isOutside(this.element,e.target)){("function"==typeof this.params[1]?this.params[1]:e=>{}).apply(this.element,[e])}}disconnect(){this.doc.removeEventListener("click",this.listen)}didReceiveArguments(){this.params=this.args.positional,this.options=this.args.named}didInstall(){this.connect(this.args.positional,this.args.named)}willRemove(){this.disconnect()}},o=a(i.prototype,"dom",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a(i.prototype,"listen",[n.action],Object.getOwnPropertyDescriptor(i.prototype,"listen"),i.prototype),i)
-e.default=u})),define("consul-ui/modifiers/on-resize",["exports","ember-on-resize-modifier/modifiers/on-resize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
-define("consul-ui/modifiers/style",["exports","ember-modifier","@ember/debug"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{setStyles(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[]
-const t=this._oldStyles||new Set
-Array.isArray(e)||(e=Object.entries(e)),e.forEach((e=>{let[n,l]=e,r=""
-l.length>0&&l.includes("!important")&&(r="important",l=l.replace("!important","")),this.element.style.setProperty(n,l,r),t.delete(n)})),t.forEach((e=>this.element.style.removeProperty(e))),this._oldStyles=new Set(e.map((e=>e[0])))}didReceiveArguments(){void 0!==this.args.named.delay?setTimeout((e=>{typeof this!==this.args.positional[0]&&this.setStyles(this.args.positional[0])}),this.args.named.delay):this.setStyles(this.args.positional[0])}}e.default=l})),define("consul-ui/modifiers/tooltip",["exports","ember-modifier","tippy.js"],(function(e,t,n){function l(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function r(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?l(Object(n),!0).forEach((function(t){i(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var o=(0,t.modifier)((function(e,t){let[l]=t,i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{}
-if("string"==typeof l&&""===l.trim())return
-const o=i.options||{}
-let a,u=e
-if("string"==typeof o.triggerTarget){const e=u
-if("parentNode"===o.triggerTarget)u=u.parentNode
-else u=u.querySelectorAll(o.triggerTarget)
-l=u.cloneNode(!0),e.remove(),i.options.triggerTarget=void 0}if(void 0===l&&(l=u.innerHTML,u.innerHTML=""),"manual"===o.trigger){const e=o.delay||[]
-void 0!==e[1]&&(i.options.onShown=t=>{clearInterval(a),a=setTimeout((()=>{t.hide()}),e[1])})}let s=u,c=!1
-s.hasAttribute("tabindex")||(c=!0,s.setAttribute("tabindex","0"))
-const d=(0,n.default)(u,r({theme:"tooltip",triggerTarget:s,content:e=>l,plugins:[void 0!==o.followCursor?n.followCursor:void 0].filter((e=>Boolean(e)))},i.options))
-return()=>{c&&s.removeAttribute("tabindex"),clearInterval(a),d.destroy()}}))
-e.default=o})),define("consul-ui/modifiers/validate",["exports","ember-modifier","@ember/object"],(function(e,t,n){var l
-function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function i(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class o extends Error{}let a=(l=class extends t.default{constructor(){super(...arguments),r(this,"item",null),r(this,"hash",null)}validate(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-if(0===Object.keys(t).length)return
-const n={}
-Object.entries(this.hash.validations).filter((e=>{let[t,n]=e
-return"string"!=typeof n})).forEach((t=>{let[l,r]=t
-this.item&&(this.item[l]=e),(r||[]).forEach((t=>{new RegExp(t.test).test(e)||(n[l]=new o(t.error))}))}))
-const l=this.hash.chart.state||{}
-null==l.context&&(l.context={}),Object.keys(n).length>0?(l.context.errors=n,this.hash.chart.dispatch("ERROR",l.context)):(l.context.errors=null,this.hash.chart.dispatch("RESET",l.context))}reset(e){if(0===e.target.value.length){const e=this.hash.chart.state
-e.context||(e.context={}),e.context.errors||(e.context.errors={}),Object.entries(this.hash.validations).filter((e=>{let[t,n]=e
-return"string"!=typeof n})).forEach((t=>{let[n,l]=t
-void 0!==e.context.errors[n]&&delete e.context.errors[n]})),0===Object.keys(e.context.errors).length&&(e.context.errors=null,this.hash.chart.dispatch("RESET",e.context))}}async connect(e,t){let[n]=e
-this.element.addEventListener("input",this.listen),this.element.addEventListener("blur",this.reset),this.element.value.length>0&&(await Promise.resolve(),this&&this.element&&this.validate(this.element.value,this.hash.validations))}listen(e){this.validate(e.target.value,this.hash.validations)}disconnect(){this.item=null,this.hash=null,this.element.removeEventListener("input",this.listen),this.element.removeEventListener("blur",this.reset)}didReceiveArguments(){const[e]=this.args.positional,t=this.args.named
-this.item=e,this.hash=t,void 0===t.chart&&(this.hash.chart={state:{context:{}},dispatch:e=>{switch(e){case"ERROR":t.onchange(this.hash.chart.state.context.errors)
-break
-case"RESET":t.onchange()}}})}didInstall(){this.connect(this.args.positional,this.args.named)}willRemove(){this.disconnect()}},i(l.prototype,"reset",[n.action],Object.getOwnPropertyDescriptor(l.prototype,"reset"),l.prototype),i(l.prototype,"listen",[n.action],Object.getOwnPropertyDescriptor(l.prototype,"listen"),l.prototype),l)
-e.default=a})),define("consul-ui/modifiers/will-destroy",["exports","@ember/render-modifiers/modifiers/will-destroy"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/modifiers/with-copyable",["exports","ember-modifier","@ember/service","@ember/debug"],(function(e,t,n,l){var r,i,o
-function a(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function u(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const s=(e,t,n)=>typeof t===e?t:n
-let c=(r=(0,n.inject)("clipboard/os"),i=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="clipboard",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),u(this,"hash",null),u(this,"source",null)}connect(e,t){let[n]=e
-n=s("string",n,this.element.innerText)
-const r={success:e=>((0,l.runInDebug)((e=>console.info(`with-copyable: Copied \`${n}\``))),s("function",t.success,(()=>{}))(e)),error:e=>((0,l.runInDebug)((e=>console.info(`with-copyable: Error copying \`${n}\``))),s("function",t.error,(()=>{}))(e))}
-this.source=this.clipboard.execute(this.element,function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?a(Object(n),!0).forEach((function(t){u(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):a(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({text:e=>n},r.options)).on("success",r.success).on("error",r.error),this.hash=r}disconnect(){this.source&&this.hash&&(this.source.off("success",this.hash.success).off("error",this.hash.error),this.source.destroy(),this.hash=null,this.source=null)}didReceiveArguments(){this.disconnect(),this.connect(this.args.positional,this.args.named)}willRemove(){this.disconnect()}},d=i.prototype,p="clipboard",f=[r],m={configurable:!0,enumerable:!0,writable:!0,initializer:null},b={},Object.keys(m).forEach((function(e){b[e]=m[e]})),b.enumerable=!!b.enumerable,b.configurable=!!b.configurable,("value"in b||b.initializer)&&(b.writable=!0),b=f.slice().reverse().reduce((function(e,t){return t(d,p,e)||e}),b),h&&void 0!==b.initializer&&(b.value=b.initializer?b.initializer.call(h):void 0,b.initializer=void 0),void 0===b.initializer&&(Object.defineProperty(d,p,b),b=null),o=b,i)
-var d,p,f,m,h,b
-e.default=c})),define("consul-ui/modifiers/with-overlay",["exports","ember-modifier","tippy.js"],(function(e,t,n){function l(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function r(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?l(Object(n),!0).forEach((function(t){i(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var o=(0,t.modifier)((function(e,t){let[l]=t,i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{}
-const o=i.options||{}
-let a,u=e
-if("string"==typeof o.triggerTarget){const e=u
-if("parentNode"===o.triggerTarget)u=u.parentNode
-else u=u.querySelectorAll(o.triggerTarget)
-l=u.cloneNode(!0),e.remove(),i.options.triggerTarget=void 0}if(void 0===l&&(l=u.innerHTML,u.innerHTML=""),i.returns&&(o.trigger="manual"),"manual"===o.trigger){const e=o.delay||[]
-void 0!==e[1]&&(o.onShown=t=>{clearInterval(a),a=setTimeout((()=>{t.hide()}),e[1])})}let s=u
-const c=(0,n.default)(u,r({triggerTarget:s,content:e=>l,interactive:!0,plugins:[void 0!==o.followCursor?n.followCursor:void 0].filter((e=>Boolean(e)))},o))
-return i.returns&&i.returns(c),()=>{clearInterval(a),c.destroy()}}))
-e.default=o})),define("consul-ui/router",["exports","@ember/routing/router","consul-ui/config/environment","@ember/debug","deepmerge","consul-ui/env","consul-ui/utils/routing/walk"],(function(e,t,n,l,r,i,o){function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.routes=void 0
-const u=document,s=n.default.modulePrefix,c=r.default.all([...u.querySelectorAll("script[data-routes]")].map((e=>JSON.parse(e.dataset.routes))))
-e.routes=c,(0,l.runInDebug)((()=>{const e=requirejs.entries[`${s}/docfy-output`]
-if(void 0!==e){const t={}
-e.callback(t),function e(t,n){"/"!==n.name&&(t=t[n.name]={_options:{path:n.name}}),n.pages.forEach((e=>{const n=e.relativeUrl
-"string"==typeof n&&""!==n&&(t[n]={_options:{path:n}})})),n.children.forEach((n=>{e(t,n)}))}(c,t.default.nested)}})),(0,l.runInDebug)((()=>{window.Routes=function(){let e,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:(0,i.env)("DEBUG_ROUTES_ENDPOINT")
-t||(t="data:,%s")
-const n=(0,o.dump)(c)
-t.startsWith("data:,")?(e=window.open("","_blank"),e.document.write(`<body><pre>${n}</pre></body>`)):e=window.open(t.replace("%s",encodeURIComponent(n)),"_blank"),e.focus()}}))
-class d extends t.default{constructor(){super(...arguments),a(this,"location",(0,i.env)("locationType")),a(this,"rootURL",(0,i.env)("rootURL"))}}e.default=d,d.map((0,o.default)(c))})),define("consul-ui/routes/application",["exports","consul-ui/routing/route","@ember/object","@ember/service","consul-ui/mixins/with-blocking-actions"],(function(e,t,n,l,r){var i,o,a,u,s,c,d
-function p(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function f(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let m=(i=(0,l.inject)("client/http"),o=(0,l.inject)("env"),a=(0,l.inject)(),u=class extends(t.default.extend(r.default)){constructor(){var e,t,n
-super(...arguments),p(this,"client",s,this),p(this,"env",c,this),p(this,"hcp",d,this),n=void 0,(t="data")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}async model(){return this.env.var("CONSUL_ACLS_ENABLED")&&await this.hcp.updateTokenIfNecessary(this.env.var("CONSUL_HTTP_TOKEN")),{}}onClientChanged(e){let t=e.data
-""===t&&(t={blocking:!0}),void 0!==this.data?(!0===this.data.blocking&&!1===t.blocking&&this.client.abort(),this.data=Object.assign({},t)):this.data=Object.assign({},t)}error(e,t){let n={status:e.code||e.statusCode||"",message:e.message||e.detail||"Error"}
-return e.errors&&e.errors[0]&&(n=e.errors[0],n.message=n.message||n.title||n.detail||"Error"),""===n.status&&(n.message="Error"),this.controllerFor("application").setProperties({error:n}),!0}},s=f(u.prototype,"client",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=f(u.prototype,"env",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=f(u.prototype,"hcp",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f(u.prototype,"onClientChanged",[n.action],Object.getOwnPropertyDescriptor(u.prototype,"onClientChanged"),u.prototype),f(u.prototype,"error",[n.action],Object.getOwnPropertyDescriptor(u.prototype,"error"),u.prototype),u)
-e.default=m})),define("consul-ui/routes/dc",["exports","@ember/service","consul-ui/routing/route"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,t.inject)("repository/permission"),r=class extends n.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="permissionsRepo",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}async model(e){const t=await this.permissionsRepo.findAll({dc:e.dc,ns:this.optionalParams().nspace,partition:this.optionalParams().partition})
-return this.controllerFor("application").setProperties({permissions:t}),{permissions:t}}},a=r.prototype,u="permissionsRepo",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/routes/dc/acls/auth-methods/index",["exports","consul-ui/routing/route"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{constructor(){var e,t,n
-super(...arguments),n={sortBy:"sort",source:"source",kind:"kind",searchproperty:{as:"searchproperty",empty:[["Name","DisplayName"]]},search:{as:"filter",replace:!0}},(t="queryParams")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}}e.default=n})),define("consul-ui/routes/dc/acls/auth-methods/show/index",["exports","consul-ui/routing/route","consul-ui/utils/routing/redirect-to"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{constructor(){var e,t,l
-super(...arguments),e=this,t="redirect",l=(0,n.default)("auth-method"),t in e?Object.defineProperty(e,t,{value:l,enumerable:!0,configurable:!0,writable:!0}):e[t]=l}}e.default=l})),define("consul-ui/routes/dc/acls/policies/create",["exports","consul-ui/routes/dc/acls/policies/edit"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{constructor(){var e,t,n
-super(...arguments),n="dc/acls/policies/edit",(t="templateName")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}}e.default=n})),define("consul-ui/routes/dc/acls/policies/edit",["exports","@ember/service","consul-ui/routing/route","consul-ui/mixins/with-blocking-actions"],(function(e,t,n,l){var r,i,o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(r=(0,t.inject)("repository/policy"),i=class extends(n.default.extend(l.default)){constructor(){var e,t,n,l
-super(...arguments),e=this,t="repo",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}},u=i.prototype,s="repo",c=[r],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),o=f,i)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/routes/dc/acls/policies/index",["exports","consul-ui/routing/route","@ember/service","consul-ui/mixins/with-blocking-actions"],(function(e,t,n,l){var r,i,o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(r=(0,n.inject)("repository/policy"),i=class extends(t.default.extend(l.default)){constructor(){var e,t,n,l,r,i,a
-super(...arguments),e=this,t="repo",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),a={sortBy:"sort",datacenter:{as:"dc"},kind:"kind",searchproperty:{as:"searchproperty",empty:[["Name","Description"]]},search:{as:"filter",replace:!0}},(i="queryParams")in(r=this)?Object.defineProperty(r,i,{value:a,enumerable:!0,configurable:!0,writable:!0}):r[i]=a}},u=i.prototype,s="repo",c=[r],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),o=f,i)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/routes/dc/acls/roles/create",["exports","consul-ui/routes/dc/acls/roles/edit"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{constructor(){var e,t,n
-super(...arguments),n="dc/acls/roles/edit",(t="templateName")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}}e.default=n})),define("consul-ui/routes/dc/acls/roles/edit",["exports","@ember/service","consul-ui/routing/route","consul-ui/mixins/with-blocking-actions"],(function(e,t,n,l){var r,i,o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(r=(0,t.inject)("repository/role"),i=class extends(n.default.extend(l.default)){constructor(){var e,t,n,l
-super(...arguments),e=this,t="repo",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}},u=i.prototype,s="repo",c=[r],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),o=f,i)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/routes/dc/acls/roles/index",["exports","consul-ui/routing/route","@ember/service","consul-ui/mixins/with-blocking-actions"],(function(e,t,n,l){var r,i,o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(r=(0,n.inject)("repository/role"),i=class extends(t.default.extend(l.default)){constructor(){var e,t,n,l,r,i,a
-super(...arguments),e=this,t="repo",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),a={sortBy:"sort",searchproperty:{as:"searchproperty",empty:[["Name","Description","Policy"]]},search:{as:"filter",replace:!0}},(i="queryParams")in(r=this)?Object.defineProperty(r,i,{value:a,enumerable:!0,configurable:!0,writable:!0}):r[i]=a}},u=i.prototype,s="repo",c=[r],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),o=f,i)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/routes/dc/acls/tokens/create",["exports","consul-ui/routes/dc/acls/tokens/edit"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{constructor(){var e,t,n
-super(...arguments),n="dc/acls/tokens/edit",(t="templateName")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}}e.default=n})),define("consul-ui/routes/dc/acls/tokens/edit",["exports","@ember/service","consul-ui/routing/route","consul-ui/mixins/with-blocking-actions"],(function(e,t,n,l){var r,i,o,a,u
-function s(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function c(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let d=(r=(0,t.inject)("repository/token"),i=(0,t.inject)("settings"),o=class extends(n.default.extend(l.default)){constructor(){super(...arguments),s(this,"repo",a,this),s(this,"settings",u,this)}async model(e,t){return{token:await this.settings.findBySlug("token")}}},a=c(o.prototype,"repo",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=c(o.prototype,"settings",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o)
-e.default=d})),define("consul-ui/routes/dc/acls/tokens/index",["exports","consul-ui/routing/route","@ember/service","consul-ui/mixins/with-blocking-actions"],(function(e,t,n,l){var r,i,o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(r=(0,n.inject)("repository/token"),i=class extends(t.default.extend(l.default)){constructor(){var e,t,n,l,r,i,a
-super(...arguments),e=this,t="repo",l=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),a={sortBy:"sort",kind:"kind",searchproperty:{as:"searchproperty",empty:[["AccessorID","Description","Role","Policy"]]},search:{as:"filter",replace:!0}},(i="queryParams")in(r=this)?Object.defineProperty(r,i,{value:a,enumerable:!0,configurable:!0,writable:!0}):r[i]=a}},u=i.prototype,s="repo",c=[r],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),o=f,i)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/routes/dc/kv/folder",["exports","consul-ui/routes/dc/kv/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{beforeModel(e){super.beforeModel(...arguments)
-const t=this.paramsFor("dc.kv.folder")
-if("/"===t.key||null==t.key)return this.transitionTo("dc.kv.index")}}e.default=n})),define("consul-ui/routes/dc/kv/index",["exports","consul-ui/routing/route","@ember/object","consul-ui/utils/isFolder"],(function(e,t,n,l){var r
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let i=(r=class extends t.default{beforeModel(){const e=this.paramsFor(this.routeName).key||"/"
-if(!(0,l.default)(e))return this.replaceWith(this.routeName,e+"/")}error(e){return!e.errors||!e.errors[0]||"404"!=e.errors[0].status||this.transitionTo("dc.kv.index")}},o=r.prototype,a="error",u=[n.action],s=Object.getOwnPropertyDescriptor(r.prototype,"error"),c=r.prototype,d={},Object.keys(s).forEach((function(e){d[e]=s[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=u.slice().reverse().reduce((function(e,t){return t(o,a,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(o,a,d),d=null),r)
-var o,a,u,s,c,d
-e.default=i})),define("consul-ui/routes/dc/services/notfound",["exports","consul-ui/routing/route"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{redirect(e,t){this.replaceWith("dc.services.instance",e.name,e.node,e.id)}}e.default=n})),define("consul-ui/routes/dc/services/show/topology",["exports","consul-ui/routing/route","@ember/service","@ember/object"],(function(e,t,n,l){var r,i,o,a,u,s,c
-function d(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function p(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?d(Object(n),!0).forEach((function(t){m(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):d(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function f(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function m(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function h(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let b=(r=(0,n.inject)("data-source/service"),i=(0,n.inject)("repository/intention"),o=(0,n.inject)("feedback"),a=class extends t.default{constructor(){super(...arguments),f(this,"data",u,this),f(this,"repo",s,this),f(this,"feedback",c,this)}async createIntention(e,t){let n=this.feedback.notification("create","intention")
-try{let r=(await this.intentions).find((n=>n.Datacenter===e.Datacenter&&n.SourceName===e.Name&&n.SourceNS===e.Namespace&&n.SourcePartition===e.Partition&&n.DestinationName===t.Name&&n.DestinationNS===t.Namespace&&n.DestinationPartition===t.Partition))
-void 0===r?r=this.repo.create({Datacenter:e.Datacenter,SourceName:e.Name,SourceNS:e.Namespace||"default",SourcePartition:e.Partition||"default",DestinationName:t.Name,DestinationNS:t.Namespace||"default",DestinationPartition:t.Partition||"default"}):n=this.feedback.notification("update","intention"),(0,l.set)(r,"Action","allow"),await this.repo.persist(r),n.success(r)}catch(r){n.error(r)}this.refresh()}afterModel(e,t){const n=p(p(p({},this.optionalParams()),this.paramsFor("dc")),this.paramsFor("dc.services.show"))
-this.intentions=this.data.source((e=>e`/${n.partition}/${n.nspace}/${n.dc}/intentions/for-service/${n.name}`))}async deactivate(e){(await this.intentions).destroy()}},u=h(a.prototype,"data",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=h(a.prototype,"repo",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=h(a.prototype,"feedback",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h(a.prototype,"createIntention",[l.action],Object.getOwnPropertyDescriptor(a.prototype,"createIntention"),a.prototype),a)
-e.default=b})),define("consul-ui/routing/route",["exports","@ember/routing/route","@ember/object","@ember/service","consul-ui/utils/path/resolve","consul-ui/router"],(function(e,t,n,l,r,i){var o,a,u,s,c,d,p,f,m,h,b
-function y(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function g(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?y(Object(n),!0).forEach((function(t){O(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):y(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function v(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function O(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function P(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let x=(o=(0,l.inject)("container"),a=(0,l.inject)("env"),u=(0,l.inject)("repository/permission"),s=(0,l.inject)("router"),c=(0,l.inject)("routlet"),d=class extends t.default{constructor(){super(...arguments),v(this,"container",p,this),v(this,"env",f,this),v(this,"permissions",m,this),v(this,"router",h,this),v(this,"routlet",b,this)}_setRouteName(){super._setRouteName(...arguments)
-const e=(0,n.get)(i.routes,`${this.routeName}._options.template`)
-void 0!==e&&(this.templateName=(0,r.default)(this.routeName.split(".").join("/"),e))
-const t=(0,n.get)(i.routes,`${this.routeName}._options.queryParams`)
-void 0!==t&&(this.queryParams=t)}redirect(e,t){let l=(0,n.get)(i.routes,`${this.routeName}._options.redirect`)
-void 0!==l&&this.replaceWith((0,r.default)(this.routeName.split(".").join("/"),l).split("/").join("."),e)}serializeQueryParam(e,t,l){if(void 0!==e){const l=(0,n.get)(this,`queryParams.${t}.empty`)
-if(void 0===l)""===e&&(e=void 0)
-else{const t=l[0]
-let n=e
-Array.isArray(n)&&(n=n.split(","))
-0===t.filter((e=>!n.includes(e))).length&&(e=void 0)}}return e}model(){const e={}
-return void 0!==this.queryParams&&void 0!==this.queryParams.searchproperty&&(e.searchProperties=this.queryParams.searchproperty.empty[0]),e}setupController(e,t){(0,n.setProperties)(e,g(g({},t),{},{routeName:this.routeName})),super.setupController(...arguments)}optionalParams(){return this.container.get(`location:${this.env.var("locationType")}`).optionalParams()}paramsFor(e){return this.routlet.normalizeParamsFor(this.routeName,super.paramsFor(...arguments))}async replaceWith(e,t){await Promise.resolve()
-let n=[]
-return"string"==typeof t&&(n=[t]),void 0===t||Array.isArray(t)||"string"==typeof t||(n=Object.values(t)),super.replaceWith(e,...n)}async transitionTo(e,t){await Promise.resolve()
-let n=[]
-return"string"==typeof t&&(n=[t]),void 0===t||Array.isArray(t)||"string"==typeof t||(n=Object.values(t)),super.transitionTo(e,...n)}},p=P(d.prototype,"container",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=P(d.prototype,"env",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=P(d.prototype,"permissions",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=P(d.prototype,"router",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=P(d.prototype,"routlet",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P(d.prototype,"replaceWith",[n.action],Object.getOwnPropertyDescriptor(d.prototype,"replaceWith"),d.prototype),P(d.prototype,"transitionTo",[n.action],Object.getOwnPropertyDescriptor(d.prototype,"transitionTo"),d.prototype),d)
-e.default=x})),define("consul-ui/routing/single",["exports","consul-ui/routing/route","@ember/debug","rsvp"],(function(e,t,n,l){function r(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function i(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?r(Object(n),!0).forEach((function(t){o(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):r(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var a=t.default.extend({isCreate:function(e,t){return"create"===t.targetName.split(".").pop()},model:function(e,t){const n=this.repo,r=this.modelFor("dc").dc.Name,o=this.optionalParams().nspace,a=this.optionalParams().partition,u=this.isCreate(...arguments)
-return(0,l.hash)(i({dc:r,partition:a,nspace:o,create:u},n.status({item:u?l.Promise.resolve(n.create({Datacenter:r,Namespace:o,Partition:a})):n.findBySlug({partition:a,ns:o,dc:r,id:e.id})})))}})
-e.default=a})),define("consul-ui/search/predicates/acl",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={ID:e=>e.ID,Name:e=>e.Name}})),define("consul-ui/search/predicates/auth-method",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={Name:e=>e.Name,DisplayName:e=>e.DisplayName}})),define("consul-ui/search/predicates/health-check",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t={Name:e=>e.Name,Node:e=>e.Node,Service:e=>e.ServiceName,CheckID:e=>e.CheckID||"",ID:e=>e.Service.ID||"",Notes:e=>e.Notes,Output:e=>e.Output,ServiceTags:e=>{return t=e.ServiceTags,Array.isArray(t)?t:t.toArray()
-var t}}
-e.default=t})),define("consul-ui/search/predicates/intention",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const t="All Services (*)"
-var n={SourceName:e=>[e.SourceName,"*"===e.SourceName?t:void 0].filter(Boolean),DestinationName:e=>[e.DestinationName,"*"===e.DestinationName?t:void 0].filter(Boolean)}
-e.default=n}))
-define("consul-ui/search/predicates/kv",["exports","consul-ui/utils/right-trim"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n={Key:e=>(0,t.default)(e.Key.toLowerCase()).split("/").filter((e=>Boolean(e))).pop()}
-e.default=n})),define("consul-ui/search/predicates/node",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t={Node:e=>e.Node,Address:e=>e.Address,PeerName:e=>e.PeerName,Meta:e=>Object.entries(e.Meta||{}).reduce(((e,t)=>e.concat(t)),[])}
-e.default=t})),define("consul-ui/search/predicates/nspace",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={Name:e=>e.Name,Description:e=>e.Description,Role:e=>((e.ACLs||{}).RoleDefaults||[]).map((e=>e.Name)),Policy:e=>((e.ACLs||{}).PolicyDefaults||[]).map((e=>e.Name))}})),define("consul-ui/search/predicates/peer",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={Name:e=>e.Name,ID:e=>e.ID}})),define("consul-ui/search/predicates/policy",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={Name:e=>e.Name,Description:e=>e.Description}})),define("consul-ui/search/predicates/role",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={Name:e=>e.Name,Description:e=>e.Description,Policy:e=>(e.Policies||[]).map((e=>e.Name)).concat((e.ServiceIdentities||[]).map((e=>e.ServiceName))).concat((e.NodeIdentities||[]).map((e=>e.NodeName)))}})),define("consul-ui/search/predicates/service-instance",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t={Name:e=>e.Name,Node:e=>e.Node.Node,Tags:e=>e.Service.Tags||[],ID:e=>e.Service.ID||"",Address:e=>e.Address||"",Port:e=>(e.Service.Port||"").toString(),"Service.Meta":e=>Object.entries(e.Service.Meta||{}).reduce(((e,t)=>e.concat(t)),[]),"Node.Meta":e=>Object.entries(e.Node.Meta||{}).reduce(((e,t)=>e.concat(t)),[])}
-e.default=t})),define("consul-ui/search/predicates/service",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={Name:e=>e.Name,Tags:e=>e.Tags||[],PeerName:e=>e.PeerName,Partition:e=>e.Partition}})),define("consul-ui/search/predicates/token",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={Name:e=>e.Name,Description:e=>e.Description,AccessorID:e=>e.AccessorID,Role:e=>(e.Roles||[]).map((e=>e.Name)),Policy:e=>(e.Policies||[]).map((e=>e.Name)).concat((e.ServiceIdentities||[]).map((e=>e.ServiceName))).concat((e.NodeIdentities||[]).map((e=>e.NodeName)))}})),define("consul-ui/search/predicates/upstream-instance",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={DestinationName:(e,t)=>e.DestinationName,LocalBindAddress:(e,t)=>e.LocalBindAddress,LocalBindPort:(e,t)=>e.LocalBindPort.toString()}})),define("consul-ui/serializers/-default",["exports","@ember-data/serializer/json"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/serializers/-json-api",["exports","@ember-data/serializer/json-api"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/serializers/-rest",["exports","@ember-data/serializer/rest"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/serializers/application",["exports","consul-ui/serializers/http","@ember/object","consul-ui/utils/http/consul","consul-ui/utils/http/headers","consul-ui/models/dc","consul-ui/models/nspace","consul-ui/models/partition","consul-ui/utils/create-fingerprinter"],(function(e,t,n,l,r,i,o,a,u){function s(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const c=function(e,t){const n={}
-return Object.keys(e).forEach((function(t){n[t.toLowerCase()]=e[t]})),t[l.HEADERS_SYMBOL]=n,t}
-class d extends t.default{constructor(){super(...arguments),s(this,"attachHeaders",c),s(this,"fingerprint",(0,u.default)(i.FOREIGN_KEY,o.NSPACE_KEY,a.PARTITION_KEY))}respondForQuery(e,t){return e(((e,n)=>{return c(e,(r=n,i=this.fingerprint(this.primaryKey,this.slugKey,t.dc,e[l.HEADERS_NAMESPACE],e[l.HEADERS_PARTITION]),Array.isArray(r)?r.map(i):[r].map(i)[0]),t)
-var r,i}))}respondForQueryRecord(e,t){return e(((e,n)=>c(e,this.fingerprint(this.primaryKey,this.slugKey,t.dc,e[l.HEADERS_NAMESPACE],e[l.HEADERS_PARTITION])(n),t)))}respondForCreateRecord(e,t,n){const r=this.slugKey,o=this.primaryKey
-return e(((e,t)=>(!0===t&&(t=n),this.fingerprint(o,r,n[i.FOREIGN_KEY],e[l.HEADERS_NAMESPACE],n.Partition)(t))))}respondForUpdateRecord(e,t,n){const r=this.slugKey,o=this.primaryKey
-return e(((e,t)=>(!0===t&&(t=n),this.fingerprint(o,r,n[i.FOREIGN_KEY],e[l.HEADERS_NAMESPACE],e[l.HEADERS_PARTITION])(t))))}respondForDeleteRecord(e,t,n){const r=this.slugKey,u=this.primaryKey
-return e(((e,t)=>({[u]:this.fingerprint(u,r,n[i.FOREIGN_KEY],e[l.HEADERS_NAMESPACE],e[l.HEADERS_PARTITION])({[r]:n[r],[o.NSPACE_KEY]:n[o.NSPACE_KEY],[a.PARTITION_KEY]:n[a.PARTITION_KEY]})[u]})))}normalizeResponse(e,t,n,l,r){const i=this.normalizePayload(n,l,r),o=this.normalizeMeta(e,t,i,l,r)
-"query"!==r&&(i.meta=o)
-const a=super.normalizeResponse(e,t,{meta:o,[t.modelName]:i},l,r)
-return void 0===a?n:a}timestamp(){return(new Date).getTime()}normalizeMeta(e,t,i,o,a){const u=i[l.HEADERS_SYMBOL]||{}
-delete i[l.HEADERS_SYMBOL]
-const s={cacheControl:u[r.CACHE_CONTROL.toLowerCase()],cursor:u[l.HEADERS_INDEX.toLowerCase()],dc:u[l.HEADERS_DATACENTER.toLowerCase()],nspace:u[l.HEADERS_NAMESPACE.toLowerCase()],partition:u[l.HEADERS_PARTITION.toLowerCase()]}
-return void 0!==u["x-range"]&&(s.range=u["x-range"]),void 0!==u.refresh&&(s.interval=1e3*u.refresh),"query"===a&&(s.date=this.timestamp(),i.forEach((function(e){(0,n.set)(e,"SyncTime",s.date)}))),s}normalizePayload(e,t,n){return e}}e.default=d})),define("consul-ui/serializers/auth-method",["exports","consul-ui/serializers/application","consul-ui/models/auth-method"],(function(e,t,n){function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{constructor(){super(...arguments),l(this,"primaryKey",n.PRIMARY_KEY),l(this,"slugKey",n.SLUG_KEY)}}e.default=r})),define("consul-ui/serializers/binding-rule",["exports","consul-ui/serializers/application","consul-ui/models/binding-rule"],(function(e,t,n){function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{constructor(){super(...arguments),l(this,"primaryKey",n.PRIMARY_KEY),l(this,"slugKey",n.SLUG_KEY)}}e.default=r})),define("consul-ui/serializers/coordinate",["exports","consul-ui/serializers/application","consul-ui/models/coordinate"],(function(e,t,n){function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{constructor(){super(...arguments),l(this,"primaryKey",n.PRIMARY_KEY),l(this,"slugKey",n.SLUG_KEY)}}e.default=r})),define("consul-ui/serializers/discovery-chain",["exports","consul-ui/serializers/application","consul-ui/models/discovery-chain"],(function(e,t,n){function l(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function r(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?l(Object(n),!0).forEach((function(t){i(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class o extends t.default{constructor(){super(...arguments),i(this,"primaryKey",n.PRIMARY_KEY),i(this,"slugKey",n.SLUG_KEY)}respondForQueryRecord(e,t){return super.respondForQueryRecord((function(t){return e((function(e,l){return t(e,r(r({},l),{},{[n.SLUG_KEY]:l.Chain[n.SLUG_KEY]}))}))}),t)}}e.default=o})),define("consul-ui/serializers/http",["exports","@ember-data/serializer/rest"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{transformBelongsToResponse(e,t,n,l){return l}transformHasManyResponse(e,t,n,l){return l}respondForQuery(e,t){return e(((e,t)=>t))}respondForQueryRecord(e,t){return e(((e,t)=>t))}respondForFindAll(e,t){return e(((e,t)=>t))}respondForCreateRecord(e,t){return e(((e,t)=>t))}respondForUpdateRecord(e,t){return e(((e,t)=>t))}respondForDeleteRecord(e,t){return e(((e,t)=>t))}}e.default=n})),define("consul-ui/serializers/intention",["exports","consul-ui/serializers/application","@ember/service","@ember/object","consul-ui/models/intention"],(function(e,t,n,l,r){var i,o,a
-function u(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let s=(i=(0,n.inject)("encoder"),o=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="encoder",l=this,(n=a)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),u(this,"primaryKey",r.PRIMARY_KEY),u(this,"slugKey",r.SLUG_KEY)}init(){super.init(...arguments),this.uri=this.encoder.uriTag()}ensureID(e){return(0,l.get)(e,"ID.length")?(e.Legacy=!0,e.LegacyID=e.ID):e.Legacy=!1,e.SourcePeer?e.ID=this.uri`peer:${e.SourcePeer}:${e.SourceNS}:${e.SourceName}:${e.DestinationPartition}:${e.DestinationNS}:${e.DestinationName}`:e.ID=this.uri`${e.SourcePartition}:${e.SourceNS}:${e.SourceName}:${e.DestinationPartition}:${e.DestinationNS}:${e.DestinationName}`,e}respondForQuery(e,t){return super.respondForQuery((t=>e(((e,n)=>t(e,n.map((e=>this.ensureID(e))))))),t)}respondForQueryRecord(e,t){return super.respondForQueryRecord((t=>e(((e,n)=>(n=this.ensureID(n),t(e,n))))),t)}respondForCreateRecord(e,t,n){const l=this.slugKey,r=this.primaryKey
-return e(((e,i)=>((i=n).ID=this.uri`${t.SourcePartition}:${t.SourceNS}:${t.SourceName}:${t.DestinationPartition}:${t.DestinationNS}:${t.DestinationName}`,this.fingerprint(r,l,i.Datacenter)(i))))}respondForUpdateRecord(e,t,n){const l=this.slugKey,r=this.primaryKey
-return e(((e,i)=>((i=n).LegacyID=i.ID,i.ID=t.ID,this.fingerprint(r,l,i.Datacenter)(i))))}},c=o.prototype,d="encoder",p=[i],f={configurable:!0,enumerable:!0,writable:!0,initializer:null},h={},Object.keys(f).forEach((function(e){h[e]=f[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=p.slice().reverse().reduce((function(e,t){return t(c,d,e)||e}),h),m&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(m):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(c,d,h),h=null),a=h,o)
-var c,d,p,f,m,h
-e.default=s})),define("consul-ui/serializers/kv",["exports","consul-ui/serializers/application","@ember/service","consul-ui/models/kv"],(function(e,t,n,l){var r,i,o
-function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let u=(r=(0,n.inject)("atob"),i=class extends t.default{constructor(){var e,t,n,r
-super(...arguments),e=this,t="decoder",r=this,(n=o)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0}),a(this,"primaryKey",l.PRIMARY_KEY),a(this,"slugKey",l.SLUG_KEY)}serialize(e,t){const n=e.attr("Value")
-return"string"==typeof n?this.decoder.execute(n):null}respondForQueryRecord(e,t){return super.respondForQueryRecord((t=>e(((e,n)=>(void 0===n[0].Session&&(n[0].Session=""),t(e,n[0]))))),t)}respondForQuery(e,t){return super.respondForQuery((t=>e(((e,n)=>t(e,n.map((e=>({[this.slugKey]:e}))))))),t)}},s=i.prototype,c="decoder",d=[r],p={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(p).forEach((function(e){m[e]=p[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=d.slice().reverse().reduce((function(e,t){return t(s,c,e)||e}),m),f&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(f):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(s,c,m),m=null),o=m,i)
-var s,c,d,p,f,m
-e.default=u})),define("consul-ui/serializers/node",["exports","consul-ui/serializers/application","@ember-data/serializer/rest","consul-ui/models/node","@ember/string"],(function(e,t,n,l,r){function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=function(e){return""===e[l.SLUG_KEY]&&(e[l.SLUG_KEY]=e.Node),e}
-class a extends(t.default.extend(n.EmbeddedRecordsMixin)){constructor(){super(...arguments),i(this,"primaryKey",l.PRIMARY_KEY),i(this,"slugKey",l.SLUG_KEY),i(this,"attrs",{Services:{embedded:"always"}})}transformHasManyResponse(e,t,n){let l,r={}
-return"Services"===t.key?((n.Checks||[]).filter((e=>""!==e.ServiceID)).forEach((e=>{void 0===r[e.ServiceID]&&(r[e.ServiceID]=[]),r[e.ServiceID].push(e)})),""===n.PeerName&&(n.PeerName=void 0),l=this.store.serializerFor(t.type),n.Services=n.Services.map((e=>l.transformHasManyResponseFromNode(n,e,r))),n):super.transformHasManyResponse(...arguments)}respondForQuery(e,t,n,l){const i=super.respondForQuery((t=>e(((e,n)=>t(e,n.map(o))))),t)
-return l.eachRelationship(((e,t)=>{i.forEach((e=>this[`transform${(0,r.classify)(t.kind)}Response`](this.store,t,e,i)))})),i}respondForQueryRecord(e,t,n,l){const i=super.respondForQueryRecord((t=>e(((e,n)=>t(e,o(n))))),t)
-return l.eachRelationship(((e,t)=>{this[`transform${(0,r.classify)(t.kind)}Response`](this.store,t,i)})),i}respondForQueryLeader(e,t){return e(((e,n)=>{const l=n.split(":"),r=l.pop(),i=l.join(":")
-return this.attachHeaders(e,{Address:i,Port:r},t)}))}}e.default=a})),define("consul-ui/serializers/nspace",["exports","consul-ui/serializers/application","@ember/object","consul-ui/models/nspace"],(function(e,t,n,l){function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=e=>((0,n.get)(e,"ACLs.PolicyDefaults")&&(e.ACLs.PolicyDefaults=e.ACLs.PolicyDefaults.map((function(e){return void 0===e.template&&(e.template=""),e}))),["PolicyDefaults","RoleDefaults"].forEach((function(t){void 0===e.ACLs&&(e.ACLs=[]),void 0===e.ACLs[t]&&(e.ACLs[t]=[])})),e)
-class o extends t.default{constructor(){super(...arguments),r(this,"primaryKey",l.PRIMARY_KEY),r(this,"slugKey",l.SLUG_KEY)}respondForQuery(e,t,n,l){return super.respondForQuery((n=>e(((e,l)=>n(e,l.map((function(e){return e.Namespace="*",e.Datacenter=t.dc,i(e)})))))),t)}respondForQueryRecord(e,t,n){return super.respondForQuery((n=>e(((e,l)=>(l.Datacenter=t.dc,l.Namespace="*",n(e,i(l)))))),t,n)}respondForCreateRecord(e,t,n){return super.respondForCreateRecord((n=>e(((e,l)=>(l.Datacenter=t.dc,l.Namespace="*",n(e,i(l)))))),t,n)}respondForUpdateRecord(e,t,n){return e(((e,t)=>i(t)))}}e.default=o})),define("consul-ui/serializers/oidc-provider",["exports","consul-ui/serializers/application","consul-ui/models/oidc-provider"],(function(e,t,n){function l(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class i extends t.default{constructor(){super(...arguments),r(this,"primaryKey",n.PRIMARY_KEY),r(this,"slugKey",n.SLUG_KEY)}respondForAuthorize(e,t,n){return e(((e,t)=>this.attachHeaders(e,t,n)))}respondForQueryRecord(e,t){return super.respondForQueryRecord((n=>e(((e,i)=>n(e,function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?l(Object(n),!0).forEach((function(t){r(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({Name:t.id,Namespace:t.ns,Partition:t.partition},i))))),t)}}e.default=i})),define("consul-ui/serializers/partition",["exports","consul-ui/serializers/application","consul-ui/models/partition"],(function(e,t,n){function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{constructor(){super(...arguments),l(this,"primaryKey",n.PRIMARY_KEY),l(this,"slugKey",n.SLUG_KEY)}respondForQuery(e,t,n,l){return super.respondForQuery((t=>e(((e,n)=>t(e,n.map((e=>(e.Partition="*",e.Namespace="*",e))))))),t)}}e.default=r})),define("consul-ui/serializers/permission",["exports","consul-ui/serializers/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{}e.default=n})),define("consul-ui/serializers/policy",["exports","consul-ui/serializers/application","consul-ui/models/policy"],(function(e,t,n){function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{constructor(){super(...arguments),l(this,"primaryKey",n.PRIMARY_KEY),l(this,"slugKey",n.SLUG_KEY)}}e.default=r})),define("consul-ui/serializers/proxy",["exports","consul-ui/serializers/application","consul-ui/models/proxy"],(function(e,t,n){function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{constructor(){super(...arguments),l(this,"primaryKey",n.PRIMARY_KEY),l(this,"slugKey",n.SLUG_KEY),l(this,"attrs",{NodeName:"Node"})}}e.default=r})),define("consul-ui/serializers/role",["exports","consul-ui/serializers/application","consul-ui/models/role","consul-ui/mixins/policy/as-many"],(function(e,t,n,l){function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class i extends(t.default.extend(l.default)){constructor(){super(...arguments),r(this,"primaryKey",n.PRIMARY_KEY),r(this,"slugKey",n.SLUG_KEY)}}e.default=i})),define("consul-ui/serializers/service-instance",["exports","consul-ui/serializers/application","consul-ui/models/service-instance"],(function(e,t,n){function l(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function r(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?l(Object(n),!0).forEach((function(t){i(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class o extends t.default{constructor(){super(...arguments),i(this,"primaryKey",n.PRIMARY_KEY),i(this,"slugKey",n.SLUG_KEY),i(this,"hash",JSON.stringify)}extractUid(e){return this.hash([e.Partition||"default",e.Namespace||"default",e.Datacenter,e.Node.Node,e.Service.ID])}transformHasManyResponseFromNode(e,t,n){const l=n[t.ID]||[],i=l.reduce(((e,t)=>{switch(t.Status){case"passing":e.ChecksPassing.push(t)
-break
-case"warning":e.ChecksWarning.push(t)
-break
-case"critical":e.ChecksCritical.push(t)}return e}),{ChecksPassing:[],ChecksWarning:[],ChecksCritical:[]}),o=r(r({},i),{},{Service:t,Checks:l,Node:{Datacenter:e.Datacenter,Namespace:e.Namespace,Partition:e.Partition,ID:e.ID,Node:e.Node,Address:e.Address,TaggedAddresses:e.TaggedAddresses,Meta:e.Meta}})
-return o.uid=this.extractUid(o),o}respondForQuery(e,t){return super.respondForQuery((n=>e(((e,l)=>{if(0===l.length){const e=new Error
-throw e.errors=[{status:"404",title:"Not found"}],e}return l.forEach((e=>{e.Datacenter=t.dc,e.Namespace=t.ns||"default",e.Partition=t.partition||"default",e.uid=this.extractUid(e)})),n(e,l)}))),t)}respondForQueryRecord(e,t){return super.respondForQueryRecord((n=>e(((e,l)=>{if(l.forEach((e=>{e.Datacenter=t.dc,e.Namespace=t.ns||"default",e.Partition=t.partition||"default",e.uid=this.extractUid(e)})),void 0===(l=l.find((function(e){return e.Node.Node===t.node&&e.Service.ID===t.serviceId})))){const e=new Error
-throw e.errors=[{status:"404",title:"Not found"}],e}return l.Namespace=l.Service.Namespace,l.Partition=l.Service.Partition,n(e,l)}))),t)}}e.default=o}))
-define("consul-ui/serializers/service",["exports","consul-ui/serializers/application","consul-ui/models/service","@ember/object","consul-ui/utils/http/consul"],(function(e,t,n,l,r){function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class o extends t.default{constructor(){super(...arguments),i(this,"primaryKey",n.PRIMARY_KEY),i(this,"slugKey",n.SLUG_KEY)}respondForQuery(e,t){return super.respondForQuery((t=>e(((e,n)=>t(e,this._transformServicesPayload(n))))),t)}respondForQueryRecord(e,t){return super.respondForQueryRecord((n=>e(((e,r)=>n(e,{Name:t.id,Namespace:(0,l.get)(r,"firstObject.Service.Namespace"),Nodes:r})))),t)}createJSONApiDocumentFromServicesPayload(e,t,n){const{primaryKey:l,slugKey:i,fingerprint:o}=this
-return{data:this._transformServicesPayload(t).map(o(l,i,n,e[r.HEADERS_NAMESPACE],e[r.HEADERS_PARTITION])).map((e=>({id:e.uid,type:"service",attributes:e})))}}_transformServicesPayload(e){const t={}
-return e.filter((function(e){return"connect-proxy"!==e.Kind})).forEach((e=>{t[e.Name]=e})),e.filter((function(e){return"connect-proxy"===e.Kind})).forEach((e=>{e.ProxyFor&&e.ProxyFor.forEach((n=>{void 0!==t[n]&&(t[n].Proxy=e)}))})),e}}e.default=o})),define("consul-ui/serializers/session",["exports","consul-ui/serializers/application","consul-ui/models/session"],(function(e,t,n){function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{constructor(){super(...arguments),l(this,"primaryKey",n.PRIMARY_KEY),l(this,"slugKey",n.SLUG_KEY)}respondForQueryRecord(e,t){return super.respondForQueryRecord((t=>e(((e,n)=>{if(0===n.length){const e=new Error
-throw e.errors=[{status:"404",title:"Not found"}],e}return t(e,n[0])}))),t)}}e.default=r})),define("consul-ui/serializers/token",["exports","consul-ui/serializers/application","@ember/object","consul-ui/models/token","consul-ui/mixins/policy/as-many","consul-ui/mixins/role/as-many"],(function(e,t,n,l,r,i){function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class a extends(t.default.extend(r.default,i.default)){constructor(){super(...arguments),o(this,"primaryKey",l.PRIMARY_KEY),o(this,"slugKey",l.SLUG_KEY)}serialize(e,t){let n=super.serialize(...arguments)
-return null!==n.Rules&&(n={ID:n.SecretID,Name:n.Description,Type:n.Type,Rules:n.Rules}),n&&delete n.SecretID,n}respondForSelf(e,t){return this.respondForQueryRecord(e,t)}respondForUpdateRecord(e,t,l){return super.respondForUpdateRecord((t=>e(((e,l)=>{if(void 0!==l.Policies&&null!==l.Policies||(l.Policies=[]),void 0!==l.ID){const e=this.store.peekAll("token").findBy("SecretID",l.ID)
-e&&(l.SecretID=l.ID,l.AccessorID=(0,n.get)(e,"AccessorID"))}return t(e,l)}))),t,l)}}e.default=a})),define("consul-ui/serializers/topology",["exports","consul-ui/serializers/application","consul-ui/models/topology","@ember/service"],(function(e,t,n,l){var r,i,o
-function a(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function u(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?a(Object(n),!0).forEach((function(t){s(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):a(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function s(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let c=(r=(0,l.inject)("store"),i=class extends t.default{constructor(){var e,t,l,r
-super(...arguments),e=this,t="store",r=this,(l=o)&&Object.defineProperty(e,t,{enumerable:l.enumerable,configurable:l.configurable,writable:l.writable,value:l.initializer?l.initializer.call(r):void 0}),s(this,"primaryKey",n.PRIMARY_KEY),s(this,"slugKey",n.SLUG_KEY)}respondForQueryRecord(e,t){const l=this.store.serializerFor("intention")
-return super.respondForQueryRecord((function(r){return e((function(e,i){return i.Downstreams.forEach((e=>{e.Intention.SourceName=e.Name,e.Intention.SourceNS=e.Namespace,e.Intention.DestinationName=t.id,e.Intention.DestinationNS=t.ns||"default",l.ensureID(e.Intention)})),i.Upstreams.forEach((e=>{e.Intention.SourceName=t.id,e.Intention.SourceNS=t.ns||"default",e.Intention.DestinationName=e.Name,e.Intention.DestinationNS=e.Namespace,l.ensureID(e.Intention)})),r(e,u(u({},i),{},{[n.SLUG_KEY]:t.id}))}))}),t)}},d=i.prototype,p="store",f=[r],m={configurable:!0,enumerable:!0,writable:!0,initializer:null},b={},Object.keys(m).forEach((function(e){b[e]=m[e]})),b.enumerable=!!b.enumerable,b.configurable=!!b.configurable,("value"in b||b.initializer)&&(b.writable=!0),b=f.slice().reverse().reduce((function(e,t){return t(d,p,e)||e}),b),h&&void 0!==b.initializer&&(b.value=b.initializer?b.initializer.call(h):void 0,b.initializer=void 0),void 0===b.initializer&&(Object.defineProperty(d,p,b),b=null),o=b,i)
-var d,p,f,m,h,b
-e.default=c})),define("consul-ui/services/-ensure-registered",["exports","@embroider/util/services/ensure-registered"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/-portal",["exports","ember-stargate/services/-portal"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/abilities",["exports","ember-can/services/can"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{parse(e){return super.parse(e.replace("use SSO","use authMethods").replace("service","zervice"))}}e.default=n})),define("consul-ui/services/atob",["exports","@ember/service","consul-ui/utils/atob"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{execute(){return(0,n.default)(...arguments)}}e.default=l})),define("consul-ui/services/auth-providers/oauth2-code-with-url-provider",["exports","torii/providers/oauth2-code","@ember/debug"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{constructor(){var e,t,n
-super(...arguments),n="oidc-with-url",(t="name")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}buildUrl(){return this.baseUrl}open(e){const t=this.get("name"),l=this.buildUrl()
-return this.get("popup").open(l,["state","code"],e).then((function(e){const l={authorizationState:e.state,authorizationCode:decodeURIComponent(e.code),provider:t}
-return(0,n.runInDebug)((e=>console.info("Retrieved the following creds from the OAuth Provider",l))),l}))}close(){const e=this.get("popup.remote")||{}
-if("function"==typeof e.close)return e.close()}}e.default=l})),define("consul-ui/services/btoa",["exports","@ember/service","consul-ui/utils/btoa"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{execute(){return(0,n.default)(...arguments)}}e.default=l})),define("consul-ui/services/can",["exports","ember-can/services/abilities"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/change",["exports","@ember/service","ember-changeset-validations","ember-changeset","consul-ui/utils/form/changeset","consul-ui/validations/intention-permission","consul-ui/validations/intention-permission-http-header"],(function(e,t,n,l,r,i,o){var a,u,s
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const c={"intention-permission":i.default,"intention-permission-http-header":o.default}
-let d=(a=(0,t.inject)("schema"),u=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="schema",l=this,(n=s)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}init(){super.init(...arguments),this._validators=new Map}willDestroy(){this._validators=null}changesetFor(e,t){let i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{}
-const o=this.validatorFor(e,i)
-let a
-if(o){let e=o
-"function"!=typeof o&&(e=(0,n.default)(o)),a=(0,l.Changeset)(t,e,o,{changeset:r.default})}else a=(0,l.Changeset)(t)
-return a}validatorFor(e){if(!this._validators.has(e)){const t=c[e]
-let n
-void 0!==t&&(n=t(this.schema)),this._validators.set(e,n)}return this._validators.get(e)}},p=u.prototype,f="schema",m=[a],h={configurable:!0,enumerable:!0,writable:!0,initializer:null},y={},Object.keys(h).forEach((function(e){y[e]=h[e]})),y.enumerable=!!y.enumerable,y.configurable=!!y.configurable,("value"in y||y.initializer)&&(y.writable=!0),y=m.slice().reverse().reduce((function(e,t){return t(p,f,e)||e}),y),b&&void 0!==y.initializer&&(y.value=y.initializer?y.initializer.call(b):void 0,y.initializer=void 0),void 0===y.initializer&&(Object.defineProperty(p,f,y),y=null),s=y,u)
-var p,f,m,h,b,y
-e.default=d})),define("consul-ui/services/client/connections",["exports","@ember/service"],(function(e,t){var n,l,r,i,o,a,u
-function s(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function c(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let d=(n=(0,t.inject)("dom"),l=(0,t.inject)("env"),r=(0,t.inject)("data-source/service"),i=class extends t.default{constructor(){super(...arguments),s(this,"dom",o,this),s(this,"env",a,this),s(this,"data",u,this)}init(){super.init(...arguments),this._listeners=this.dom.listeners(),this.connections=new Set,this.addVisibilityChange()}willDestroy(){this._listeners.remove(),this.purge(),super.willDestroy(...arguments)}addVisibilityChange(){this._listeners.add(this.dom.document(),{visibilitychange:e=>{e.target.hidden&&this.purge(-1)}})}whenAvailable(e){const t=this.dom.document()
-return t.hidden?new Promise((n=>{const l=this._listeners.add(t,{visibilitychange:function(t){l(),n(e)}})})):Promise.resolve(e)}purge(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0;[...this.connections].forEach((function(t){t.abort(e)})),this.connections=new Set}acquire(e){if(this.connections.size>=this.env.var("CONSUL_HTTP_MAX_CONNECTIONS")){const t=this.data.closed()
-let n=[...this.connections].find((e=>!!e.headers()["x-request-id"]&&t.includes(e.headers()["x-request-id"])))
-void 0===n&&"text/event-stream"===e.headers()["content-type"]&&(n=this.connections.values().next().value),void 0!==n&&(this.release(n),n.abort(429))}this.connections.add(e)}release(e){this.connections.delete(e)}},o=c(i.prototype,"dom",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a=c(i.prototype,"env",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=c(i.prototype,"data",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i)
-e.default=d})),define("consul-ui/services/client/http",["exports","@ember/service","@ember/object","@ember/runloop","consul-ui/utils/http/headers","consul-ui/utils/http/consul","consul-ui/utils/http/create-url","consul-ui/utils/http/create-headers","consul-ui/utils/http/create-query-params"],(function(e,t,n,l,r,i,o,a,u){var s,c,d,p,f,m,h,b,y,g,v,O,P,x,w
-function j(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function _(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}function k(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function S(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?k(Object(n),!0).forEach((function(t){N(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):k(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function N(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.restartWhenAvailable=void 0
-e.restartWhenAvailable=function(e){return function(t){if("-1"===(0,n.get)(t,"errors.firstObject.status"))return e.whenAvailable(t)
-throw t}}
-const C={stringify:(0,u.default)(encodeURIComponent)},z=(0,a.default)(),M=[r.CACHE_CONTROL,"X-Request-ID","X-Range","Refresh"]
-let D=(s=(0,t.inject)("dom"),c=(0,t.inject)("env"),d=(0,t.inject)("client/connections"),p=(0,t.inject)("client/transports/xhr"),f=(0,t.inject)("settings"),m=(0,t.inject)("encoder"),h=(0,t.inject)("store"),b=class extends t.default{constructor(){super(...arguments),j(this,"dom",y,this),j(this,"env",g,this),j(this,"connections",v,this),j(this,"transport",O,this),j(this,"settings",P,this),j(this,"encoder",x,this),j(this,"store",w,this)}init(){super.init(...arguments),this._listeners=this.dom.listeners(),this.parseURL=(0,o.default)(encodeURIComponent,(e=>C.stringify(this.sanitize(e))))
-const e=this.encoder.uriTag()
-this.cache=(t,n)=>(t.uri=n(e),t.SyncTime=(new Date).getTime(),this.store.push({data:{id:t.uri,type:new URL(t.uri).protocol.slice(0,-1),attributes:t}}))}sanitize(e){return this.env.var("CONSUL_NSPACES_ENABLED")&&void 0!==e.ns&&null!==e.ns&&""!==e.ns||delete e.ns,this.env.var("CONSUL_PARTITIONS_ENABLED")&&void 0!==e.partition&&null!==e.partition&&""!==e.partition||delete e.partition,e}willDestroy(){this._listeners.remove(),super.willDestroy(...arguments)}url(){return this.parseURL(...arguments)}body(){const e=function(e){let t={}
-const n=e.reduce((function(e,t,n){return-1!==(t=t.split("\n").map((e=>e.trim())).join("\n")).indexOf("\n\n")?n:e}),-1)
-for(var l=arguments.length,r=new Array(l>1?l-1:0),i=1;i<l;i++)r[i-1]=arguments[i]
-return-1!==n&&(t=r.splice(n).reduce((function(e,t,n){switch(!0){case Array.isArray(t):return 0===n&&(e=[]),e.concat(t)
-case"string"!=typeof t:return S(S({},e),t)
-default:return t}}),t)),[t,...r]}(...arguments)
-return this.sanitize(e[0]),e}requestParams(e){for(var t=arguments.length,n=new Array(t>1?t-1:0),l=1;l<t;l++)n[l-1]=arguments[l]
-const[i,...o]=this.body(...arguments),[a,...u]=this.url(e,...o).split(" "),[s,...c]=u.join(" ").split("\n"),d={url:s.trim(),method:a.trim(),headers:S({[r.CONTENT_TYPE]:"application/json; charset=utf-8"},z(c)),body:null,data:i}
-if(d.clientHeaders=M.reduce((function(e,t){return void 0!==d.headers[t]&&(e[t.toLowerCase()]=d.headers[t],delete d.headers[t]),e}),{}),void 0!==i)if("GET"!==d.method)-1!==d.headers[r.CONTENT_TYPE].indexOf("json")?d.body=JSON.stringify(d.data):("string"==typeof d.data&&d.data.length>0||Object.keys(d.data).length>0)&&(d.body=d.data)
-else{const e=C.stringify(d.data)
-e.length>0&&(-1!==d.url.indexOf("?")?d.url=`${d.url}&${e}`:d.url=`${d.url}?${e}`)}return d.headers[r.CONTENT_TYPE]="application/json; charset=utf-8",d.url=`${this.env.var("CONSUL_API_PREFIX")}${d.url}`,d}fetchWithToken(e,t){return this.settings.findBySlug("token").then((n=>fetch(`${this.env.var("CONSUL_API_PREFIX")}${e}`,S(S({},t),{},{credentials:"include",headers:S({"X-Consul-Token":void 0===n.SecretID?"":n.SecretID},t.headers)}))))}request(e){const t=this,n=this.cache
-return e((function(e){for(var r=arguments.length,o=new Array(r>1?r-1:0),a=1;a<r;a++)o[a-1]=arguments[a]
-const u=t.requestParams(...arguments)
-return t.settings.findBySlug("token").then((e=>{const r=S(S({},u),{},{headers:S({[i.HEADERS_TOKEN]:void 0===e.SecretID?"":e.SecretID},u.headers)}),o=t.transport.request(r)
-return new Promise(((r,a)=>{const s=t._listeners.add(o,{open:e=>{t.acquire(e.target)},message:t=>{const o=S(S(S({},Object.entries(t.data.headers).reduce((function(e,t,n){let[l,r]=t
-return M.includes(l)||(e[l]=r),e}),{})),u.clientHeaders),{},{[i.HEADERS_DATACENTER]:u.data.dc,[i.HEADERS_NAMESPACE]:u.data.ns||e.Namespace||"default",[i.HEADERS_PARTITION]:u.data.partition||e.Partition||"default"}),a=function(e){let l=e(o,t.data.response,n)
-const r=l.meta||{}
-return 2===r.version&&(Array.isArray(l.body)?l=new Proxy(l.body,{get:(e,t)=>"meta"===t?r:e[t]}):(l=l.body,l.meta=r)),l};(0,l.next)((()=>r(a)))},error:e=>{(0,l.next)((()=>a(e.error)))},close:e=>{t.release(e.target),s()}})
-o.fetch()}))}))}))}whenAvailable(e){return this.connections.whenAvailable(e)}abort(){return this.connections.purge(...arguments)}acquire(){return this.connections.acquire(...arguments)}release(){return this.connections.release(...arguments)}},y=_(b.prototype,"dom",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=_(b.prototype,"env",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=_(b.prototype,"connections",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=_(b.prototype,"transport",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=_(b.prototype,"settings",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=_(b.prototype,"encoder",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=_(b.prototype,"store",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b)
-e.default=D})),define("consul-ui/services/client/transports/xhr",["exports","@ember/service","consul-ui/utils/http/create-headers","consul-ui/utils/http/xhr","consul-ui/utils/http/request","consul-ui/utils/http/error"],(function(e,t,n,l,r,i){function o(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function a(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?o(Object(n),!0).forEach((function(t){u(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):o(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function u(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const s=(0,l.default)((0,n.default)())
-class c extends t.default{xhr(e){return s(e)}request(e){const t=new r.default(e.method,e.url,{"x-request-id":e.clientHeaders["x-request-id"],body:e.data||{}}),n=a(a({},e),{},{beforeSend:function(e){t.open(e)},converters:{"text json":function(e){try{return JSON.parse(e)}catch(t){return e}}},success:function(e,n,l,r){t.respond({headers:e,response:n,status:l,statusText:r})},error:function(e,n,l,r,o){let a
-a=o instanceof Error?o:new i.default(l,n),t.error(a)},complete:function(e){t.close()}})
-return t.fetch=()=>(this.xhr(n),t),t}}e.default=c})),define("consul-ui/services/clipboard/local-storage",["exports","@ember/service","clipboard"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class o extends n.default{constructor(e,t,n){super(e,t),this._cb=n}onClick(e){this._cb(this.text(e.delegateTarget||e.currentTarget)),this.emit("success",{})}}let a=(l=(0,t.inject)("-document"),r=class extends t.default{constructor(){var e,t,n,l,r,o,a
-super(...arguments),e=this,t="doc",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),a="clipboard",(o="key")in(r=this)?Object.defineProperty(r,o,{value:a,enumerable:!0,configurable:!0,writable:!0}):r[o]=a}execute(e,t){return new o(e,t,(e=>{this.doc.defaultView.localStorage.setItem(this.key,e)}))}},u=r.prototype,s="doc",c=[l],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),i=f,r)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/services/clipboard/os",["exports","@ember/service","clipboard"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{execute(){return new n.default(...arguments)}}e.default=l})),define("consul-ui/services/code-mirror",["exports","ivy-codemirror/services/code-mirror"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/code-mirror/linter",["exports","@ember/service","consul-ui/utils/editor/lint"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=[{name:"JSON",mime:"application/json",mode:"javascript",ext:["json","map"],alias:["json5"]},{name:"HCL",mime:"text/x-ruby",mode:"ruby",ext:["rb"],alias:["jruby","macruby","rake","rb","rbx"]},{name:"YAML",mime:"text/x-yaml",mode:"yaml",ext:["yaml","yml"],alias:["yml"]},{name:"XML",mime:"application/xml",mode:"xml",htmlMode:!1,matchClosing:!0,alignCDATA:!1,ext:["xml"],alias:["xml"]}]
-let a=(l=(0,t.inject)("dom"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="dom",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}modes(){return o}lint(){return(0,n.default)(...arguments)}getEditor(e){return this.dom.element("textarea + div",e).CodeMirror}},u=r.prototype,s="dom",c=[l],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(d).forEach((function(e){f[e]=d[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce((function(e,t){return t(u,s,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,s,f),f=null),i=f,r)
-var u,s,c,d,p,f
-e.default=a})),define("consul-ui/services/container",["exports","@ember/service"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{constructor(e){super(...arguments),this._owner=e,this._wm=new WeakMap}set(e,t){this._wm.set(t,e)}keyForClass(e){return this._wm.get(e)}get(e){return"string"!=typeof e&&(e=this.keyForClass(e)),this.lookup(e)}lookup(e){return this._owner.lookup(e)}resolveRegistration(e){return this._owner.resolveRegistration(e).prototype}}e.default=n})),define("consul-ui/services/data-sink/protocols/http",["exports","@ember/service","@ember/object"],(function(e,t,n){var l,r,i,o,a,u,s,c,d,p,f,m,h,b,y,g,v
-function O(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function P(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let x=(l=(0,t.inject)("client/http"),r=(0,t.inject)("settings"),i=(0,t.inject)("repository/intention"),o=(0,t.inject)("repository/kv"),a=(0,t.inject)("repository/nspace"),u=(0,t.inject)("repository/partition"),s=(0,t.inject)("repository/peer"),c=(0,t.inject)("repository/session"),d=class extends t.default{constructor(){super(...arguments),O(this,"client",p,this),O(this,"settings",f,this),O(this,"intention",m,this),O(this,"kv",h,this),O(this,"nspace",b,this),O(this,"partition",y,this),O(this,"peer",g,this),O(this,"session",v,this)}prepare(e,t,l){return(0,n.setProperties)(l,t)}persist(e,t){const[,,,,n]=e.split("/"),l=this[n]
-return this.client.request((e=>l.persist(t,e)))}remove(e,t){const[,,,,n]=e.split("/"),l=this[n]
-return this.client.request((e=>l.remove(t,e)))}},p=P(d.prototype,"client",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=P(d.prototype,"settings",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=P(d.prototype,"intention",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=P(d.prototype,"kv",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=P(d.prototype,"nspace",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=P(d.prototype,"partition",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=P(d.prototype,"peer",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=P(d.prototype,"session",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d)
-e.default=x})),define("consul-ui/services/data-sink/protocols/local-storage",["exports","@ember/service","@ember/object"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,t.inject)("settings"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="settings",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}prepare(e,t){let l=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{}
-return null===t||""===t?l:(0,n.setProperties)(l,t)}persist(e,t){const n=e.split(":").pop()
-return this.settings.persist({[n]:t})}remove(e,t){const n=e.split(":").pop()
-return this.settings.delete(n)}},a=r.prototype,u="settings",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/services/data-sink/service",["exports","@ember/service"],(function(e,t){var n,l,r,i,o
-function a(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function u(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const s=function(e){return-1===(e=e.toString()).indexOf("://")&&(e=`consul://${e}`),e.split("://")}
-let c=(n=(0,t.inject)("data-sink/protocols/http"),l=(0,t.inject)("data-sink/protocols/local-storage"),r=class extends t.default{constructor(){super(...arguments),a(this,"consul",i,this),a(this,"settings",o,this)}prepare(e,t,n){const[l,r]=s(e)
-return this[l].prepare(r,t,n)}persist(e,t){const[n,l]=s(e)
-return this[n].persist(l,t)}remove(e,t){const[n,l]=s(e)
-return this[n].remove(l,t)}},i=u(r.prototype,"consul",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o=u(r.prototype,"settings",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),r)
-e.default=c})),define("consul-ui/services/data-source/protocols/http",["exports","@ember/service","@ember/application","consul-ui/decorators/data-source"],(function(e,t,n,l){var r,i,o,a,u
-function s(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function c(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let d=(r=(0,t.inject)("client/http"),i=(0,t.inject)("data-source/protocols/http/blocking"),o=class extends t.default{constructor(){super(...arguments),s(this,"client",a,this),s(this,"type",u,this)}source(e,t){const r=(0,l.match)(e)
-let i
-return this.client.request((e=>{i=r.cb(r.params,(0,n.getOwner)(this),e)})),this.type.source(i,t)}},a=c(o.prototype,"client",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=c(o.prototype,"type",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o)
-e.default=d})),define("consul-ui/services/data-source/protocols/http/blocking",["exports","@ember/service","@ember/object","consul-ui/utils/dom/event-source","consul-ui/services/settings","consul-ui/services/client/http","consul-ui/utils/maybe-call"],(function(e,t,n,l,r,i,o){var a,u,s,c,d
-function p(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function f(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let m=(a=(0,t.inject)("client/http"),u=(0,t.inject)("settings"),s=class extends t.default{constructor(){super(...arguments),p(this,"client",c,this),p(this,"settings",d,this)}source(e,t){return new l.BlockingEventSource(((t,l)=>{const a=l.close.bind(l)
-return(0,o.default)((()=>t.cursor=void 0),(0,r.ifNotBlocking)(this.settings))().then((()=>e(t).then((0,o.default)(a,(0,r.ifNotBlocking)(this.settings))).then((function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-const t=(0,n.get)(e,"meta")||{}
-return void 0===t.cursor&&void 0===t.interval&&a(),e})).catch((0,i.restartWhenAvailable)(this.client))))}),t)}},c=f(s.prototype,"client",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=f(s.prototype,"settings",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s)
-e.default=m})),define("consul-ui/services/data-source/protocols/http/promise",["exports","@ember/service","consul-ui/utils/dom/event-source"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{source(e,t){return(0,n.once)(e,t)}}e.default=l})),define("consul-ui/services/data-source/protocols/local-storage",["exports","@ember/service","consul-ui/utils/dom/event-source"],(function(e,t,n){var l,r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(l=(0,t.inject)("settings"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="repo",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}source(e,t){const l=e.split(":").pop()
-return new n.StorageEventSource((e=>this.repo.findBySlug(l)),{key:e,uri:t.uri})}},a=r.prototype,u="repo",s=[l],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i=p,r)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/services/data-source/service",["exports","@ember/service","@ember/debug","consul-ui/utils/dom/event-source","@ember/runloop","mnemonist/multi-map"],(function(e,t,n,l,r,i){var o,a,u,s,c,d,p,f,m
-function h(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function b(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let y=null,g=null,v=null
-class O{constructor(e){this.uri=e}toString(){return this.uri}}let P=(o=(0,t.inject)("dom"),a=(0,t.inject)("encoder"),u=(0,t.inject)("data-source/protocols/http"),s=(0,t.inject)("data-source/protocols/local-storage"),c=class extends t.default{constructor(){super(...arguments),h(this,"dom",d,this),h(this,"encoder",p,this),h(this,"consul",f,this),h(this,"settings",m,this)}init(){super.init(...arguments),y=new Map,g=new Map,v=new i.default(Set),this._listeners=this.dom.listeners()}resetCache(){y=new Map}willDestroy(){(0,r.schedule)("afterRender",(()=>{this._listeners.remove(),g.forEach((function(e){e.close()})),y=null,g=null,v.clear(),v=null}))}source(e,t){const n=e(this.encoder.uriTag())
-return new Promise(((e,t)=>{const r={},i=this.open(n,r,!0)
-i.configuration.ref=r
-const o=this._listeners.add(i,{message:t=>{o(),e((0,l.proxy)(t.target,t.data))},error:e=>{o(),this.close(i,r),t(e.error)}})
-void 0!==i.getCurrentEvent()&&i.dispatchEvent(i.getCurrentEvent())}))}unwrap(e,t){const n=e._source
-return v.set(n,t),v.remove(n,n.configuration.ref),delete n.configuration.ref,n}uri(e){return new O(e)}open(e,t){let l,r=arguments.length>2&&void 0!==arguments[2]&&arguments[2]
-if(!(e instanceof O)&&"string"!=typeof e)return this.unwrap(e,t);(0,n.runInDebug)((t=>{e instanceof O||console.error(new Error(`DataSource '${e}' does not use the uri helper. Please ensure you use the uri helper to ensure correct encoding`))})),-1===(e=e.toString()).indexOf("://")&&(e=`consul://${e}`)
-let[i,o]=e.split("://")
-const a=this[i]
-if(g.has(e))l=g.get(e),g.delete(e),g.set(e,l)
-else{let t={}
-y.has(e)&&(t=y.get(e)),t.uri=e,l=a.source(o,t)
-const n=this._listeners.add(l,{close:t=>{const l=t.target,r=l.getCurrentEvent(),i=l.configuration.cursor
-void 0!==r&&void 0!==i&&t.errors&&"401"!==t.errors[0].status&&y.set(e,{currentEvent:r,cursor:i}),v.has(l)||g.delete(e),n()}})
-g.set(e,l)}return(!v.has(l)||l.readyState>1||r)&&l.open(),v.set(l,t),l}close(e,t){e&&(v.remove(e,t),v.has(e)||(e.close(),2===e.readyState&&g.delete(e.configuration.uri)))}closed(){return[...g.entries()].filter((e=>{let[t,n]=e
-return n.readyState>1})).map((e=>e[0]))}},d=b(c.prototype,"dom",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=b(c.prototype,"encoder",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=b(c.prototype,"consul",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=b(c.prototype,"settings",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c)
-e.default=P})),define("consul-ui/services/data-structs",["exports","@ember/service","ngraph.graph"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{graph(){return(0,n.default)()}}e.default=l})),define("consul-ui/services/dom",["exports","@ember/service","@ember/object/internals","consul-ui/utils/dom/qsa-factory","consul-ui/utils/dom/sibling","consul-ui/utils/dom/closest","consul-ui/utils/dom/is-outside","consul-ui/utils/dom/get-component-factory","consul-ui/utils/dom/normalize-event","consul-ui/utils/dom/create-listeners","consul-ui/utils/dom/click-first-anchor"],(function(e,t,n,l,r,i,o,a,u,s,c){var d,p,f
-function m(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const h=(0,l.default)()
-let b,y
-const g=(0,c.default)(i.default)
-let v=(d=(0,t.inject)("-document"),p=class extends t.default{constructor(e){var t,n,l,c
-super(...arguments),t=this,n="doc",c=this,(l=f)&&Object.defineProperty(t,n,{enumerable:l.enumerable,configurable:l.configurable,writable:l.writable,value:l.initializer?l.initializer.call(c):void 0}),m(this,"clickFirstAnchor",g),m(this,"closest",i.default),m(this,"sibling",r.default),m(this,"isOutside",o.default),m(this,"normalizeEvent",u.default),m(this,"listeners",s.default),y=new WeakMap,b=(0,a.default)(e)}willDestroy(){super.willDestroy(...arguments),y=null,b=null}document(){return this.doc}viewport(){return this.doc.defaultView}guid(e){return(0,n.guidFor)(e)}focus(e){if("string"==typeof e&&(e=this.element(e)),void 0!==e){let t=e.getAttribute("tabindex")
-e.setAttribute("tabindex","0"),e.focus(),null===t?e.removeAttribute("tabindex"):e.setAttribute("tabindex",t)}}setEventTargetProperty(e,t,n){const l=e.target
-return new Proxy(e,{get:function(r,i,o){return"target"===i?new Proxy(l,{get:function(r,i,o){return i===t?n(e.target[t]):l[i]}}):Reflect.get(...arguments)}})}setEventTargetProperties(e,t){const n=e.target
-return new Proxy(e,{get:function(l,r,i){return"target"===r?new Proxy(n,{get:function(l,r,i){return void 0!==t[r]?t[r](e.target):n[r]}}):Reflect.get(...arguments)}})}root(){return this.doc.documentElement}elementById(e){return this.doc.getElementById(e)}elementsByTagName(e,t){return(t=void 0===t?this.doc:t).getElementsByTagName(e)}elements(e,t){return h(e,t)}element(e,t){return"#"===e.substr(0,1)?this.elementById(e.substr(1)):[...h(e,t)][0]}component(e,t){return b("string"!=typeof e?e:this.element(e,t))}components(e,t){return[...this.elements(e,t)].map((function(e){return b(e)})).filter((function(e){return null!=e}))}isInViewport(e,t){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0
-y.set(e,t)
-let l=new IntersectionObserver(((e,t)=>{e.map((e=>{const t=y.get(e.target)
-"function"==typeof t&&t(e.isIntersecting)}))}),{rootMargin:"0px",threshold:n})
-return l.observe(e),()=>{l.unobserve(e),y&&y.delete(e),l.disconnect(),l=null}}},O=p.prototype,P="doc",x=[d],w={configurable:!0,enumerable:!0,writable:!0,initializer:null},_={},Object.keys(w).forEach((function(e){_[e]=w[e]})),_.enumerable=!!_.enumerable,_.configurable=!!_.configurable,("value"in _||_.initializer)&&(_.writable=!0),_=x.slice().reverse().reduce((function(e,t){return t(O,P,e)||e}),_),j&&void 0!==_.initializer&&(_.value=_.initializer?_.initializer.call(j):void 0,_.initializer=void 0),void 0===_.initializer&&(Object.defineProperty(O,P,_),_=null),f=_,p)
-var O,P,x,w,j,_
-e.default=v}))
-define("consul-ui/services/encoder",["exports","@ember/service","@ember/object","@ember/debug","consul-ui/utils/atob","consul-ui/utils/btoa"],(function(e,t,n,l,r,i){function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class a extends t.default{constructor(){super(...arguments),o(this,"uriComponent",encodeURIComponent),o(this,"joiner",(function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:""
-return(l,r)=>(r||Array(l.length).fill(t)).reduce(((t,r,i)=>`${t}${r}${e(l[i]||n)}`),"")}))}createRegExpEncoder(e,t){return function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:e=>e,r=!(arguments.length>2&&void 0!==arguments[2])||arguments[2]
-return function(){let i=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return""!==i?i.replace(e,((e,a)=>{const u=(0,n.get)(o,a)
-return(0,l.runInDebug)((()=>{r&&void 0===u&&console.error(new Error(`${a} is undefined in ${i}`))})),t(u||"")})):""}}(e,t)}atob(){return(0,r.default)(...arguments)}btoa(){return(0,i.default)(...arguments)}uriJoin(){return this.joiner(this.uriComponent,"/","")(...arguments)}uriTag(){return this.tag(this.uriJoin.bind(this))}tag(e){return function(t){for(var n=arguments.length,l=new Array(n>1?n-1:0),r=1;r<n;r++)l[r-1]=arguments[r]
-return e(l,t)}}}e.default=a})),define("consul-ui/services/env",["exports","@ember/service","consul-ui/env"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.setupTestEnv=function(e,t){e.register("service:env",class extends r{constructor(){super(...arguments),function(e,t,n){t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}(this,"stubEnv",t)}})},e.EnvStub=e.default=void 0
-class l extends t.default{env(e){return this.var(e)}var(e){return(0,n.env)(e)}}e.default=l
-class r extends l{var(e){const{stubEnv:t}=this,n=t[e]
-return n||super.var(...arguments)}}e.EnvStub=r})),define("consul-ui/services/feedback",["exports","@ember/service","consul-ui/utils/callable-type"],(function(e,t,n){var l,r,i,o,a
-function u(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function s(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?u(Object(n),!0).forEach((function(t){d(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):u(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function c(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function d(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function p(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const f="success",m=function(e,t){return e}
-let h=(l=(0,t.inject)("flashMessages"),r=(0,t.inject)("logger"),i=class extends t.default{constructor(){super(...arguments),c(this,"notify",o,this),c(this,"logger",a,this)}notification(e,t){return{success:n=>this.success(n,e,void 0,t),error:n=>this.error(n,e,void 0,t)}}success(e,t){let l=arguments.length>2&&void 0!==arguments[2]?arguments[2]:m,r=arguments.length>3?arguments[3]:void 0
-const i=(0,n.default)(t),o=(0,n.default)(l)
-!1!==e&&(this.notify.clearMessages(),this.notify.add(s(s({},{timeout:6e3,extendedTimeout:300,destroyOnClick:!0}),{},{type:o(f),action:i(),item:e,model:r})))}error(e,t){let l=arguments.length>2&&void 0!==arguments[2]?arguments[2]:m,r=arguments.length>3?arguments[3]:void 0
-const i=(0,n.default)(t),o=(0,n.default)(l)
-this.notify.clearMessages(),this.logger.execute(e),"TransitionAborted"===e.name?this.notify.add(s(s({},{timeout:6e3,extendedTimeout:300,destroyOnClick:!0}),{},{type:o(f),action:i(),model:r})):this.notify.add(s(s({},{timeout:6e3,extendedTimeout:300,destroyOnClick:!0}),{},{type:o("error",e),action:i(),error:e,model:r}))}async execute(e,t,n,l){let r
-try{r=await e(),this.success(r,t,n,l)}catch(i){this.error(i,t,n,l)}}},o=p(i.prototype,"notify",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a=p(i.prototype,"logger",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i)
-e.default=h})),define("consul-ui/services/filter",["exports","@ember/service","consul-ui/utils/filter","consul-ui/filter/predicates/service","consul-ui/filter/predicates/service-instance","consul-ui/filter/predicates/health-check","consul-ui/filter/predicates/node","consul-ui/filter/predicates/kv","consul-ui/filter/predicates/intention","consul-ui/filter/predicates/token","consul-ui/filter/predicates/policy","consul-ui/filter/predicates/auth-method","consul-ui/filter/predicates/peer"],(function(e,t,n,l,r,i,o,a,u,s,c,d,p){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const f={service:(0,n.andOr)(l.default),"service-instance":(0,n.andOr)(r.default),"health-check":(0,n.andOr)(i.default),"auth-method":(0,n.andOr)(d.default),node:(0,n.andOr)(o.default),kv:(0,n.andOr)(a.default),intention:(0,n.andOr)(u.default),token:(0,n.andOr)(s.default),policy:(0,n.andOr)(c.default),peer:(0,n.andOr)(p.default)}
-class m extends t.default{predicate(e){return f[e]}}e.default=m})),define("consul-ui/services/flash-messages",["exports","ember-cli-flash/services/flash-messages"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/form",["exports","@ember/service","consul-ui/utils/form/builder","consul-ui/forms/kv","consul-ui/forms/token","consul-ui/forms/policy","consul-ui/forms/role","consul-ui/forms/intention"],(function(e,t,n,l,r,i,o,a){var u,s,c,d,p
-function f(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function m(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const h=(0,n.default)(),b={kv:l.default,token:r.default,policy:i.default,role:o.default,intention:a.default}
-let y=(u=(0,t.inject)("repository/role"),s=(0,t.inject)("repository/policy"),c=class extends t.default{constructor(){var e,t,n
-super(...arguments),f(this,"role",d,this),f(this,"policy",p,this),n=[],(t="forms")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}build(e,t){return h(...arguments)}form(e){let t=this.forms[e]
-if(void 0===t&&(t=this.forms[e]=b[e](this),"role"===e||"policy"===e)){const n=this[e]
-t.clear((function(e){return n.create(e)})),t.submit((function(e){return n.persist(e)}))}return t}},d=m(c.prototype,"role",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=m(c.prototype,"policy",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c)
-e.default=y})),define("consul-ui/services/hcp",["exports","@ember/service","@ember/debug"],(function(e,t,n){var l,r,i,o,a,u,s
-function c(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function d(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let p=(l=(0,t.inject)("env"),r=(0,t.inject)("repository/token"),i=(0,t.inject)("settings"),o=class extends t.default{constructor(){super(...arguments),c(this,"env",a,this),c(this,"tokenRepo",u,this),c(this,"settings",s,this)}async updateTokenIfNecessary(e){if(e){const l=await this.settings.findBySlug("token")
-if(e&&e!==l.SecretID)try{const t=await this.tokenRepo.self({secret:e,dc:this.env.var("CONSUL_DATACENTER_LOCAL")})
-await this.settings.persist({token:{AccessorID:t.AccessorID,SecretID:t.SecretID,Namespace:t.Namespace,Partition:t.Partition}})}catch(t){(0,n.runInDebug)((e=>console.error(t)))}}}},a=d(o.prototype,"env",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=d(o.prototype,"tokenRepo",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=d(o.prototype,"settings",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o)
-e.default=p})),define("consul-ui/services/i18n",["exports","ember-intl/services/intl","@ember/service"],(function(e,t,n){var l,r,i
-function o(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function a(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?o(Object(n),!0).forEach((function(t){u(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):o(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function u(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.formatOptionsSymbol=void 0
-const s=Symbol()
-e.formatOptionsSymbol=s
-let c=(l=(0,n.inject)("env"),r=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=i)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}formatMessage(e,t){return t=this[s](t),super.formatMessage(e,t)}[s](e){const t=["CONSUL_HOME_URL","CONSUL_REPO_ISSUES_URL","CONSUL_DOCS_URL","CONSUL_DOCS_LEARN_URL","CONSUL_DOCS_API_URL","CONSUL_COPYRIGHT_URL"].reduce(((e,t)=>(e[t]=this.env.var(t),e)),{})
-return a(a({},e),t)}},d=r.prototype,p="env",f=[l],m={configurable:!0,enumerable:!0,writable:!0,initializer:null},b={},Object.keys(m).forEach((function(e){b[e]=m[e]})),b.enumerable=!!b.enumerable,b.configurable=!!b.configurable,("value"in b||b.initializer)&&(b.writable=!0),b=f.slice().reverse().reduce((function(e,t){return t(d,p,e)||e}),b),h&&void 0!==b.initializer&&(b.value=b.initializer?b.initializer.call(h):void 0,b.initializer=void 0),void 0===b.initializer&&(Object.defineProperty(d,p,b),b=null),i=b,r)
-var d,p,f,m,h,b
-e.default=c})),define("consul-ui/services/in-viewport",["exports","ember-in-viewport/services/in-viewport"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/intl",["exports","ember-intl/services/intl"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/keyboard",["exports","ember-keyboard/services/keyboard.js"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/local-storage",["exports","@ember/service","@ember/application","consul-ui/config/environment"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.storageFor=function(e){return function(){return{get(){return(0,n.getOwner)(this).lookup("service:localStorage").getBucket(e)}}}},e.default=void 0
-class r{constructor(){this.data=new Map}getItem(e){return this.data.get(e)}setItem(e,t){return this.data.set(e,t.toString())}seed(e){const t=new Map
-Object.keys(e).forEach((n=>{t.set(n,e[n].toString())})),this.data=t}}class i extends t.default{constructor(){super(...arguments),this.storage="test"===l.default.environment?new r:window.localStorage,this.buckets=new Map}getBucket(e){const t=this.buckets.get(e)
-return t||this._setupBucket(e)}_setupBucket(e){const t=new(0,(0,n.getOwner)(this).factoryFor(`storage:${e}`).class)(e,this.storage)
-return this.buckets.set(e,t),t}}e.default=i})),define("consul-ui/services/logger",["exports","@ember/service","@ember/debug"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends t.default{execute(e){(0,n.runInDebug)((()=>{(e=void 0!==e.error?e.error:e)instanceof Error?console.error(e):console.log(e)}))}}e.default=l})),define("consul-ui/services/page-title-list",["exports","ember-page-title/services/page-title-list"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/page-title",["exports","ember-page-title/services/page-title"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/popup",["exports","torii/services/popup"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/repository",["exports","@ember/service","@ember/debug","@ember/utils","@ember/object","validated-changeset","consul-ui/utils/http/error","consul-ui/abilities/base"],(function(e,t,n,l,r,i,o,a){var u,s,c,d,p,f,m
-function h(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function b(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.softDelete=void 0
-e.softDelete=(e,t)=>e.store.adapterFor(e.getModelName()).rpc(((e,t,n,l)=>e.requestForDeleteRecord(t,n,l)),((e,n,l,r)=>t),t,e.getModelName())
-let y=(u=(0,t.inject)("store"),s=(0,t.inject)("env"),c=(0,t.inject)("repository/permission"),d=class extends t.default{constructor(){super(...arguments),h(this,"store",p,this),h(this,"env",f,this),h(this,"permissions",m,this)}getModelName(){}getPrimaryKey(){}getSlugKey(){}async authorizeBySlug(e,t,n){return n.resources=await this.permissions.findBySlug(n,this.getModelName()),this.validatePermissions(e,t,n)}async authorizeByPermissions(e,t,n){return n.resources=await this.permissions.authorize(n),this.validatePermissions(e,t,n)}async validatePermissions(e,t,n){if(n.resources.length>0){const e=n.resources.find((e=>e.Access===t))
-if(e&&!1===e.Allow){const e=new o.default(403)
-throw e.errors=[{status:"403"}],e}}const l=await e(n.resources)
-return(0,r.get)(l,"Resources")&&(0,r.set)(l,"Resources",n.resources),l}shouldReconcile(e,t){if((0,r.get)(e,"Datacenter")!==t.dc)return!1
-if(this.env.var("CONSUL_NSPACES_ENABLED")){const n=(0,r.get)(e,"Namespace")
-if(void 0!==n&&n!==t.ns)return!1}if(this.env.var("CONSUL_PARTITIONS_ENABLED")){const n=(0,r.get)(e,"Partition")
-if(void 0!==n&&n!==t.partition)return!1}return!0}reconcile(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-void 0!==e.date&&this.store.peekAll(this.getModelName()).forEach((n=>{const l=(0,r.get)(n,"SyncTime")
-!n.isDeleted&&void 0!==l&&l!=e.date&&this.shouldReconcile(n,t)&&this.store.unloadRecord(n)}))}peekOne(e){return this.store.peekRecord(this.getModelName(),e)}peekAll(){return this.store.peekAll(this.getModelName())}cached(e){const t=Object.entries(e)
-return this.store.peekAll(this.getModelName()).filter((e=>t.every((t=>{let[n,l]=t
-return e[n]===l}))))}async findAllByDatacenter(e){return this.findAll(...arguments)}async findAll(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.query(e)}async query(){let e,t,n,l=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},i=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-try{n=await this.store.query(this.getModelName(),l),t=n.meta}catch(o){switch((0,r.get)(o,"errors.firstObject.status")){case"404":case"403":t={date:Number.POSITIVE_INFINITY},e=o
-break
-default:throw o}}if(void 0!==t&&this.reconcile(t,l,i),void 0!==e)throw e
-return n}async findBySlug(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return""===e.id?this.create({Datacenter:e.dc,Namespace:e.ns,Partition:e.partition}):(void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.authorizeBySlug((()=>this.store.queryRecord(this.getModelName(),e)),a.ACCESS_READ,e))}create(e){return this.store.createRecord(this.getModelName(),e)}persist(e){return(0,i.isChangeset)(e)&&(e.execute(),e=e.data),(0,r.set)(e,"SyncTime",void 0),e.save()}remove(e){let t=e
-return void 0===e.destroyRecord&&(t=e.get("data")),"object"===(0,l.typeOf)(t)&&(t=this.store.peekRecord(this.getModelName(),t[this.getPrimaryKey()])),t.destroyRecord().then((e=>this.store.unloadRecord(e)))}invalidate(){this.store.unloadAll(this.getModelName())}},p=b(d.prototype,"store",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=b(d.prototype,"env",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=b(d.prototype,"permissions",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d)
-e.default=y})),define("consul-ui/services/repository/auth-method",["exports","consul-ui/services/repository","consul-ui/models/auth-method","consul-ui/decorators/data-source"],(function(e,t,n,l){var r,i,o
-function a(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let u=(r=(0,l.default)("/:partition/:ns/:dc/auth-methods"),i=(0,l.default)("/:partition/:ns/:dc/auth-method/:id"),o=class extends t.default{getModelName(){return"auth-method"}getPrimaryKey(){return n.PRIMARY_KEY}getSlugKey(){return n.SLUG_KEY}async findAllByDatacenter(){return super.findAllByDatacenter(...arguments)}async findBySlug(){return super.findBySlug(...arguments)}},a(o.prototype,"findAllByDatacenter",[r],Object.getOwnPropertyDescriptor(o.prototype,"findAllByDatacenter"),o.prototype),a(o.prototype,"findBySlug",[i],Object.getOwnPropertyDescriptor(o.prototype,"findBySlug"),o.prototype),o)
-e.default=u})),define("consul-ui/services/repository/binding-rule",["exports","consul-ui/services/repository","consul-ui/models/binding-rule","consul-ui/decorators/data-source"],(function(e,t,n,l){var r,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(r=(0,l.default)("/:partition/:ns/:dc/binding-rules/for-auth-method/:authmethod"),i=class extends t.default{getModelName(){return"binding-rule"}getPrimaryKey(){return n.PRIMARY_KEY}getSlugKey(){return n.SLUG_KEY}async findAllByAuthMethod(){return super.findAll(...arguments)}},a=i.prototype,u="findAllByAuthMethod",s=[r],c=Object.getOwnPropertyDescriptor(i.prototype,"findAllByAuthMethod"),d=i.prototype,p={},Object.keys(c).forEach((function(e){p[e]=c[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=s.slice().reverse().reduce((function(e,t){return t(a,u,e)||e}),p),d&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(d):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(a,u,p),p=null),i)
-var a,u,s,c,d,p
-e.default=o})),define("consul-ui/services/repository/coordinate",["exports","consul-ui/services/repository","consul-ui/decorators/data-source","consul-ui/utils/tomography","consul-ui/utils/distance"],(function(e,t,n,l,r){var i,o,a
-function u(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const s=(0,l.default)(r.default)
-let c=(i=(0,n.default)("/:partition/:ns/:dc/coordinates"),o=(0,n.default)("/:partition/:ns/:dc/coordinates/for-node/:id"),a=class extends t.default{getModelName(){return"coordinate"}async findAllByDatacenter(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.store.query(this.getModelName(),e)}async findAllByNode(e,t){const n=await this.findAllByDatacenter(e,t)
-let l={}
-return n.length>1&&(l=s(e.id,n)),l.meta=n.meta,l}},u(a.prototype,"findAllByDatacenter",[i],Object.getOwnPropertyDescriptor(a.prototype,"findAllByDatacenter"),a.prototype),u(a.prototype,"findAllByNode",[o],Object.getOwnPropertyDescriptor(a.prototype,"findAllByNode"),a.prototype),a)
-e.default=c})),define("consul-ui/services/repository/dc",["exports","@ember/error","@ember/service","consul-ui/services/repository","consul-ui/decorators/data-source","consul-ui/utils/http/consul"],(function(e,t,n,l,r,i){var o,a,u,s,c,d,p
-function f(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}function m(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function h(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?m(Object(n),!0).forEach((function(t){b(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):m(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function b(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const y="dc",g={Total:0,Passing:0,Warning:0,Critical:0}
-let v=(o=(0,n.inject)("env"),a=(0,r.default)("/:partition/:ns/:dc/datacenters"),u=(0,r.default)("/:partition/:ns/:dc/datacenter"),s=(0,r.default)("/:partition/:ns/:dc/catalog/health"),c=(0,r.default)("/:partition/:ns/:dc/datacenter-cache/:name"),d=class extends l.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=p)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}getModelName(){return y}async fetchAll(e,t,n){let{partition:l,ns:r,dc:o}=e,{uri:a}=t
-const u=this.env.var("CONSUL_DATACENTER_LOCAL"),s=this.env.var("CONSUL_DATACENTER_PRIMARY")
-return(await(n`
-      GET /v1/catalog/datacenters
-      X-Request-ID: ${a}
-    `))(((e,t,n)=>{const l=Object.entries(e).find((e=>{let[t,n]=e
-return t.toLowerCase()===i.HEADERS_DEFAULT_ACL_POLICY.toLowerCase()}))[1]||"allow"
-return{meta:{version:2,uri:a},body:t.map((e=>n({Name:e,Datacenter:"",Local:e===u,Primary:e===s,DefaultACLPolicy:l},(t=>t`${y}:///${""}/${""}/${e}/datacenter`))))}}))}async fetch(e,t,n){let{partition:l,ns:r,dc:i}=e,{uri:o}=t
-return(await(n`
-      GET /v1/operator/autopilot/state?${{dc:i}}
-      X-Request-ID: ${o}
-    `))(((e,t,n)=>{const l=Object.values(t.Servers),r=[]
-return{meta:{version:2,uri:o},body:n(h(h({},t),{},{Servers:l,RedundancyZones:Object.entries(t.RedundancyZones||{}).map((e=>{let[n,l]=e
-return h(h({},l),{},{Name:n,Healthy:!0,Servers:l.Servers.reduce(((e,n)=>{const l=t.Servers[n]
-return r.push(l.ID),e.push(l),e}),[])})})),ReadReplicas:(t.ReadReplicas||[]).map((e=>(r.push(e),t.Servers[e]))),Default:{Servers:l.filter((e=>!r.includes(e.ID)))}}),(e=>e`${y}:///${""}/${""}/${i}/datacenter`))}}))}async fetchCatalogHealth(e,t,n){let{partition:l,ns:r,dc:i}=e,{uri:o}=t
-return(await(n`
-      GET /v1/internal/ui/catalog-overview?${{dc:i,stale:null}}
-      X-Request-ID: ${o}
-    `))(((e,t,n)=>{const l=["Nodes","Services","Checks"].reduce(((e,n)=>((e,t,n)=>t[n].reduce(((e,t)=>(["Partition","Namespace"].forEach((l=>{let r=e[l][t[l]]
-void 0===r&&(r=e[l][t[l]]={Name:t[l]}),void 0===r[n]&&(r[n]=h({},g)),r[n].Total+=t.Total,r[n].Passing+=t.Passing,r[n].Warning+=t.Warning,r[n].Critical+=t.Critical})),e.Datacenter[n].Total+=t.Total,e.Datacenter[n].Passing+=t.Passing,e.Datacenter[n].Warning+=t.Warning,e.Datacenter[n].Critical+=t.Critical,e)),e))(e,t,n)),{Datacenter:{Name:i,Nodes:h({},g),Services:h({},g),Checks:h({},g)},Partition:{},Namespace:{}})
-return{meta:{version:2,uri:o,interval:3e4},body:h({Datacenter:l.Datacenter,Partitions:Object.values(l.Partition),Namespaces:Object.values(l.Namespace)},t)}}))}async find(e){const n=this.store.peekAll("dc").findBy("Name",e.name)
-if(void 0===n){const e=new t.default("Page not found")
-throw e.status="404",{errors:[e]}}return n}},p=f(d.prototype,"env",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f(d.prototype,"fetchAll",[a],Object.getOwnPropertyDescriptor(d.prototype,"fetchAll"),d.prototype),f(d.prototype,"fetch",[u],Object.getOwnPropertyDescriptor(d.prototype,"fetch"),d.prototype),f(d.prototype,"fetchCatalogHealth",[s],Object.getOwnPropertyDescriptor(d.prototype,"fetchCatalogHealth"),d.prototype),f(d.prototype,"find",[c],Object.getOwnPropertyDescriptor(d.prototype,"find"),d.prototype),d)
-e.default=v})),define("consul-ui/services/repository/discovery-chain",["exports","@ember/service","@ember/object","consul-ui/services/repository","consul-ui/decorators/data-source"],(function(e,t,n,l,r){var i,o,a,u
-function s(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let c=(i=(0,t.inject)("repository/dc"),o=(0,r.default)("/:partition/:ns/:dc/discovery-chain/:id"),a=class extends l.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="dcs",l=this,(n=u)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}getModelName(){return"discovery-chain"}findBySlug(e){const t=this.dcs.peekAll().findBy("Name",e.dc)
-return void 0===t||(0,n.get)(t,"MeshEnabled")?super.findBySlug(...arguments).catch((e=>{const l=(0,n.get)(e,"errors.firstObject.status"),r=((0,n.get)(e,"errors.firstObject.detail")||"").trim()
-if("500"!==l)throw e
-void 0!==t&&r.endsWith("Connect must be enabled in order to use this endpoint")&&(0,n.set)(t,"MeshEnabled",!1)})):Promise.resolve()}},u=s(a.prototype,"dcs",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s(a.prototype,"findBySlug",[o],Object.getOwnPropertyDescriptor(a.prototype,"findBySlug"),a.prototype),a)
-e.default=c})),define("consul-ui/services/repository/intention-permission-http-header",["exports","consul-ui/services/repository"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{getModelName(){return"intention-permission-http-header"}create(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-return this.store.createFragment(this.getModelName(),e)}persist(e){return e.execute()}}e.default=n})),define("consul-ui/services/repository/intention-permission",["exports","consul-ui/services/repository"],(function(e,t){function n(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function l(e){for(var t=1;t<arguments.length;t++){var l=null!=arguments[t]?arguments[t]:{}
-t%2?n(Object(l),!0).forEach((function(t){r(e,t,l[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(l)):n(Object(l)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(l,t))}))}return e}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class i extends t.default{getModelName(){return"intention-permission"}create(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-return this.store.createFragment(this.getModelName(),l(l({},e),{},{HTTP:this.store.createFragment("intention-permission-http",e.HTTP||{})}))}persist(e){return e.execute()}}e.default=i})),define("consul-ui/services/repository/intention",["exports","@ember/object","@ember/service","consul-ui/services/repository","consul-ui/models/intention","consul-ui/decorators/data-source"],(function(e,t,n,l,r,i){var o,a,u,s,c,d
-function p(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function f(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function m(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let h=(o=(0,n.inject)("env"),a=(0,i.default)("/:partition/:ns/:dc/intentions"),u=(0,i.default)("/:partition/:ns/:dc/intention/:id"),s=(0,i.default)("/:partition/:ns/:dc/intentions/for-service/:id"),c=class extends l.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=d)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0}),f(this,"managedByCRDs",!1)}getModelName(){return"intention"}getPrimaryKey(){return r.PRIMARY_KEY}create(e){return delete e.Namespace,super.create(function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?p(Object(n),!0).forEach((function(t){f(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):p(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({Action:"allow"},e))}isManagedByCRDs(){return this.managedByCRDs||(this.managedByCRDs=this.store.peekAll(this.getModelName()).toArray().some((e=>e.IsManagedByCRD))),this.managedByCRDs}async authorizeBySlug(e,t,n){const[,l,,r]=n.id.split(":"),i=this.permissions.abilityFor(this.getModelName())
-return n.resources=i.generateForSegment(l).concat(i.generateForSegment(r)),this.authorizeByPermissions(e,t,n)}async persist(e){const n=await super.persist(...arguments)
-return(0,t.get)(n,"Action.length")&&(0,t.set)(n,"Permissions",[]),n}async findAll(){return super.findAll(...arguments)}async findBySlug(e){let t
-if(""===e.id){const n=this.env.var("CONSUL_NSPACES_ENABLED")?"*":"default",l="default"
-t=await this.create({SourceNS:e.nspace||n,DestinationNS:e.nspace||n,SourcePartition:e.partition||l,DestinationPartition:e.partition||l,Datacenter:e.dc,Partition:e.partition})}else t=super.findBySlug(...arguments)
-return t}async findByService(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-const n={dc:e.dc,nspace:e.nspace,filter:`SourceName == "${e.id}" or DestinationName == "${e.id}" or SourceName == "*" or DestinationName == "*"`}
-return void 0!==t.cursor&&(n.index=t.cursor,n.uri=t.uri),this.store.query(this.getModelName(),n)}},d=m(c.prototype,"env",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m(c.prototype,"findAll",[a],Object.getOwnPropertyDescriptor(c.prototype,"findAll"),c.prototype),m(c.prototype,"findBySlug",[u],Object.getOwnPropertyDescriptor(c.prototype,"findBySlug"),c.prototype),m(c.prototype,"findByService",[s],Object.getOwnPropertyDescriptor(c.prototype,"findByService"),c.prototype),c)
-e.default=h})),define("consul-ui/services/repository/kv",["exports","consul-ui/services/repository","consul-ui/utils/isFolder","@ember/object","consul-ui/models/kv","consul-ui/decorators/data-source"],(function(e,t,n,l,r,i){var o,a,u
-function s(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let c=(o=(0,i.default)("/:partition/:ns/:dc/kv/:id"),a=(0,i.default)("/:partition/:ns/:dc/kvs/:id"),u=class extends t.default{getModelName(){return"kv"}getPrimaryKey(){return r.PRIMARY_KEY}shouldReconcile(e,t){return super.shouldReconcile(...arguments)&&e.Key.startsWith(t.id)}async findBySlug(e){let t
-if((0,n.default)(e.id)){const n=JSON.stringify([e.partition,e.ns,e.dc,e.id])
-t=this.store.peekRecord(this.getModelName(),n),t||(t=await this.create({Key:e.id,Datacenter:e.dc,Namespace:e.ns,Partition:e.partition}))}else t=""===e.id?await this.create({Datacenter:e.dc,Namespace:e.ns,Partition:e.partition}):await super.findBySlug(...arguments)
-return t}async findAllBySlug(e){e.separator="/","/"===e.id&&(e.id="")
-let t=await this.findAll(...arguments)
-const n=t.meta
-return t=t.filter((t=>e.id!==(0,l.get)(t,"Key"))),t.meta=n,t}},s(u.prototype,"findBySlug",[o],Object.getOwnPropertyDescriptor(u.prototype,"findBySlug"),u.prototype),s(u.prototype,"findAllBySlug",[a],Object.getOwnPropertyDescriptor(u.prototype,"findAllBySlug"),u.prototype),u)
-e.default=c})),define("consul-ui/services/repository/license",["exports","consul-ui/services/repository","consul-ui/decorators/data-source"],(function(e,t,n){var l,r
-function i(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function o(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?i(Object(n),!0).forEach((function(t){a(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):i(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=function(e,t){let{dc:n,ns:l="default",partition:r="default"}=t
-return o(o({},e),{},{Datacenter:n,Namespace:void 0===e.Namespace?l:e.Namespace,Partition:void 0===e.Partition?r:e.Partition})}
-let s=(l=(0,n.default)("/:partition/:ns/:dc/license"),r=class extends t.default{async find(e,t,n){let{partition:l,ns:r,dc:i}=e,{uri:o}=t
-return(await(n`
-      GET /v1/operator/license?${{dc:i}}
-      X-Request-ID: ${o}
-    `))(((e,t,n)=>({meta:{version:2,uri:o,interval:3e4},body:n(u(t,{dc:i}),(e=>e`${"license"}:///${l}/${r}/${i}/license/${t.License.license_id}`))})))}},c=r.prototype,d="find",p=[l],f=Object.getOwnPropertyDescriptor(r.prototype,"find"),m=r.prototype,h={},Object.keys(f).forEach((function(e){h[e]=f[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=p.slice().reverse().reduce((function(e,t){return t(c,d,e)||e}),h),m&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(m):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(c,d,h),h=null),r)
-var c,d,p,f,m,h
-e.default=s})),define("consul-ui/services/repository/metrics",["exports","@ember/service","consul-ui/services/repository","consul-ui/decorators/data-source"],(function(e,t,n,l){var r,i,o,a,u,s,c,d,p,f
-function m(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function h(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let b=(r=(0,t.inject)("ui-config"),i=(0,t.inject)("env"),o=(0,t.inject)("client/http"),a=(0,l.default)("/:partition/:ns/:dc/metrics/summary-for-service/:slug/:protocol"),u=(0,l.default)("/:partition/:ns/:dc/metrics/upstream-summary-for-service/:slug/:protocol"),s=(0,l.default)("/:partition/:ns/:dc/metrics/downstream-summary-for-service/:slug/:protocol"),c=class extends n.default{constructor(){var e,t,n
-super(...arguments),m(this,"config",d,this),m(this,"env",p,this),m(this,"client",f,this),n=null,(t="error")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}getModelName(){return"metrics"}init(){super.init(...arguments)
-const e=this.config.getSync(),t=e.metrics_provider_options||{}
-t.metrics_proxy_enabled=e.metrics_proxy_enabled
-const n=e.metrics_provider||"prometheus"
-t.fetch=(e,t)=>this.client.fetchWithToken(`/v1/internal/ui/metrics-proxy${e}`,t)
-try{this.provider=window.consul.getMetricsProvider(n,t)}catch(l){this.error=new Error(`metrics provider not initialized: ${l}`),console.error(this.error)}}findServiceSummary(e){if(this.error)return Promise.reject(this.error)
-const t=[this.provider.serviceRecentSummarySeries(e.slug,e.dc,e.ns,e.protocol,{}),this.provider.serviceRecentSummaryStats(e.slug,e.dc,e.ns,e.protocol,{})]
-return Promise.all(t).then((e=>({meta:{interval:this.env.var("CONSUL_METRICS_POLL_INTERVAL")||1e4},series:e[0],stats:e[1].stats})))}findUpstreamSummary(e){return this.error?Promise.reject(this.error):this.provider.upstreamRecentSummaryStats(e.slug,e.dc,e.ns,{}).then((e=>(e.meta={interval:this.env.var("CONSUL_METRICS_POLL_INTERVAL")||1e4},e)))}findDownstreamSummary(e){return this.error?Promise.reject(this.error):this.provider.downstreamRecentSummaryStats(e.slug,e.dc,e.ns,{}).then((e=>(e.meta={interval:this.env.var("CONSUL_METRICS_POLL_INTERVAL")||1e4},e)))}},d=h(c.prototype,"config",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=h(c.prototype,"env",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=h(c.prototype,"client",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h(c.prototype,"findServiceSummary",[a],Object.getOwnPropertyDescriptor(c.prototype,"findServiceSummary"),c.prototype),h(c.prototype,"findUpstreamSummary",[u],Object.getOwnPropertyDescriptor(c.prototype,"findUpstreamSummary"),c.prototype),h(c.prototype,"findDownstreamSummary",[s],Object.getOwnPropertyDescriptor(c.prototype,"findDownstreamSummary"),c.prototype),c)
-e.default=b})),define("consul-ui/services/repository/node",["exports","consul-ui/services/repository","consul-ui/decorators/data-source"],(function(e,t,n){var l,r,i,o
-function a(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let u=(l=(0,n.default)("/:partition/:ns/:dc/nodes"),r=(0,n.default)("/:partition/:ns/:dc/node/:id/:peer"),i=(0,n.default)("/:partition/:ns/:dc/leader"),o=class extends t.default{getModelName(){return"node"}async findAllByDatacenter(){return super.findAllByDatacenter(...arguments)}async findBySlug(){return super.findBySlug(...arguments)}findLeader(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return void 0!==t.refresh&&(e.uri=t.uri),this.store.queryLeader(this.getModelName(),e)}},a(o.prototype,"findAllByDatacenter",[l],Object.getOwnPropertyDescriptor(o.prototype,"findAllByDatacenter"),o.prototype),a(o.prototype,"findBySlug",[r],Object.getOwnPropertyDescriptor(o.prototype,"findBySlug"),o.prototype),a(o.prototype,"findLeader",[i],Object.getOwnPropertyDescriptor(o.prototype,"findLeader"),o.prototype),o)
-e.default=u})),define("consul-ui/services/repository/nspace",["exports","@ember/service","@ember/debug","consul-ui/services/repository","consul-ui/models/nspace","consul-ui/decorators/data-source","consul-ui/utils/form/builder"],(function(e,t,n,l,r,i,o){var a,u,s,c,d,p,f,m,h,b,y,g,v,O,P
-function x(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function w(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let j=(a=(0,t.inject)("router"),u=(0,t.inject)("container"),s=(0,t.inject)("env"),c=(0,t.inject)("form"),d=(0,t.inject)("settings"),p=(0,t.inject)("repository/permission"),f=(0,i.default)("/:partition/:ns/:dc/namespaces"),m=(0,i.default)("/:partition/:ns/:dc/namespace/:id"),h=class extends l.default{constructor(){super(...arguments),x(this,"router",b,this),x(this,"container",y,this),x(this,"env",g,this),x(this,"form",v,this),x(this,"settings",O,this),x(this,"permissions",P,this)}getPrimaryKey(){return r.PRIMARY_KEY}getSlugKey(){return r.SLUG_KEY}getModelName(){return"nspace"}async findAll(){return this.permissions.can("use nspaces")?super.findAll(...arguments).catch((()=>[])):[]}async findBySlug(e){let t
-return t=""===e.id?await this.create({Datacenter:e.dc,Partition:e.partition,ACLs:{PolicyDefaults:[],RoleDefaults:[]}}):await super.findBySlug(...arguments),(0,o.defaultChangeset)(t)}remove(e){return(0,l.softDelete)(this,e)}authorize(e,t){return this.env.var("CONSUL_ACLS_ENABLED")?this.store.authorize(this.getModelName(),{dc:e,ns:t}).catch((function(e){return[]})):Promise.resolve([{Resource:"operator",Access:"write",Allow:!0}])}async getActive(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:""
-if(this.permissions.can("use nspaces"))return{Name:"default"}
-const t=this.store.peekAll("nspace").toArray()
-if(0===e.length){e=(await this.settings.findBySlug("token")).Namespace||"default"}return 1===t.length?t[0]:function(e,t){let l=e.find((function(e){return e.Name===t.Name}))
-return void 0===l&&((0,n.runInDebug)((n=>console.info(`${t.Name} not found in [${e.map((e=>e.Name)).join(", ")}]`))),l=e.find((function(e){return"default"===e.Name})),void 0===l&&(l=e[0])),l}(t,{Name:e})}},b=w(h.prototype,"router",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=w(h.prototype,"container",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=w(h.prototype,"env",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=w(h.prototype,"form",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=w(h.prototype,"settings",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=w(h.prototype,"permissions",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w(h.prototype,"findAll",[f],Object.getOwnPropertyDescriptor(h.prototype,"findAll"),h.prototype),w(h.prototype,"findBySlug",[m],Object.getOwnPropertyDescriptor(h.prototype,"findBySlug"),h.prototype),h)
-e.default=j}))
-define("consul-ui/services/repository/oidc-provider",["exports","@ember/service","consul-ui/services/repository","@ember/application","@ember/object","consul-ui/decorators/data-source"],(function(e,t,n,l,r,i){var o,a,u,s,c,d,p,f
-function m(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function h(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const b="oidc-with-url"
-let y=(o=(0,t.inject)("torii"),a=(0,t.inject)("settings"),u=(0,i.default)("/:partition/:ns/:dc/oidc/providers"),s=(0,i.default)("/:partition/:ns/:dc/oidc/provider/:id"),c=(0,i.default)("/:partition/:ns/:dc/oidc/authorize/:id/:code/:state"),d=class extends n.default{constructor(){super(...arguments),m(this,"manager",p,this),m(this,"settings",f,this)}init(){super.init(...arguments),this.provider=(0,l.getOwner)(this).lookup("torii-provider:oidc-with-url")}getModelName(){return"oidc-provider"}async findAllByDatacenter(){const e=await super.findAllByDatacenter(...arguments)
-if(0===e.length){const e=new Error("Not found")
-return e.statusCode=404,void this.store.adapterFor(this.getModelName()).error(e)}return e}async findBySlug(e){const t=await this.settings.findBySlug("token")||{}
-return super.findBySlug({ns:e.ns||t.Namespace||"default",partition:e.partition||t.Partition||"default",dc:e.dc,id:e.id})}authorize(e){return this.store.authorize(this.getModelName(),e)}logout(e,t,n,l,r){const i={id:e}
-return this.store.logout(this.getModelName(),i)}close(){this.manager.close(b)}findCodeByURL(e){return(0,r.set)(this.provider,"baseUrl",e),this.manager.open(b,{}).catch((e=>{let t
-if(!0===e.message.startsWith("remote was closed"))t=new Error("Remote was closed"),t.statusCode=499
-else t=new Error(e.message),t.statusCode=500
-this.store.adapterFor(this.getModelName()).error(t)}))}},p=h(d.prototype,"manager",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=h(d.prototype,"settings",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h(d.prototype,"findAllByDatacenter",[u],Object.getOwnPropertyDescriptor(d.prototype,"findAllByDatacenter"),d.prototype),h(d.prototype,"findBySlug",[s],Object.getOwnPropertyDescriptor(d.prototype,"findBySlug"),d.prototype),h(d.prototype,"authorize",[c],Object.getOwnPropertyDescriptor(d.prototype,"authorize"),d.prototype),d)
-e.default=y})),define("consul-ui/services/repository/partition",["exports","@ember/service","@ember/debug","consul-ui/services/repository","consul-ui/models/partition","consul-ui/decorators/data-source","consul-ui/utils/form/builder"],(function(e,t,n,l,r,i,o){var a,u,s,c,d,p,f,m,h
-function b(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function y(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let g=(a=(0,t.inject)("settings"),u=(0,t.inject)("form"),s=(0,t.inject)("repository/permission"),c=(0,i.default)("/:partition/:ns/:dc/partitions"),d=(0,i.default)("/:partition/:ns/:dc/partition/:id"),p=class extends l.default{constructor(){super(...arguments),b(this,"settings",f,this),b(this,"form",m,this),b(this,"permissions",h,this)}getModelName(){return"partition"}getPrimaryKey(){return r.PRIMARY_KEY}getSlugKey(){return r.SLUG_KEY}async findAll(){return this.permissions.can("use partitions")?super.findAll(...arguments).catch((()=>[])):[]}async findBySlug(e){let t
-return t=""===e.id?await this.create({Datacenter:e.dc,Partition:""}):await super.findBySlug(...arguments),(0,o.defaultChangeset)(t)}remove(e){return(0,l.softDelete)(this,e)}async getActive(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:""
-const t=this.store.peekAll("partition").toArray()
-if(0===e.length){e=(await this.settings.findBySlug("token")).Partition||"default"}return 1===t.length?t[0]:function(e,t){let l=e.find((function(e){return e.Name===t.Name}))
-return void 0===l&&((0,n.runInDebug)((n=>console.info(`${t.Name} not found in [${e.map((e=>e.Name)).join(", ")}]`))),l=e.find((function(e){return"default"===e.Name})),void 0===l&&(l=e[0])),l}(t,{Name:e})}},f=y(p.prototype,"settings",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=y(p.prototype,"form",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=y(p.prototype,"permissions",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y(p.prototype,"findAll",[c],Object.getOwnPropertyDescriptor(p.prototype,"findAll"),p.prototype),y(p.prototype,"findBySlug",[d],Object.getOwnPropertyDescriptor(p.prototype,"findBySlug"),p.prototype),p)
-e.default=g})),define("consul-ui/services/repository/peer",["exports","consul-ui/services/repository","consul-ui/decorators/data-source","@ember/service"],(function(e,t,n,l){var r,i,o,a,u,s,c,d
-function p(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}function f(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function m(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?f(Object(n),!0).forEach((function(t){h(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):f(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function h(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function b(e,t,n){const{StreamStatus:{LastHeartbeat:l,LastReceive:r,LastSend:i,ImportedServices:o,ExportedServices:a}}=e
-return m(m({},e),{},{LastHeartbeat:l,LastReceive:r,LastSend:i,ImportedServices:o,ExportedServices:a,Datacenter:t,Partition:n})}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let y=(r=(0,n.default)("/:partition/:ns/:ds/exported-services/:name"),i=(0,n.default)("/:partition/:ns/:dc/peering/token-for/:name/:externalAddresses"),o=(0,n.default)("/:partition/:ns/:dc/peers"),a=(0,n.default)("/:partition/:ns/:dc/peer-generate/"),u=(0,n.default)("/:partition/:ns/:dc/peer-initiate/"),s=(0,n.default)("/:partition/:ns/:dc/peer/:name"),c=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="store",l=this,(n=d)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}getModelName(){return"peer"}async fetchExportedServices(e,t,n){let{dc:l,ns:r,partition:i,name:o}=e
-return(await(n`
-      GET /v1/internal/ui/exported-services
-
-      ${{peer:o}}
-    `))(((e,t,n)=>{const r=this.store.serializerFor("service")
-return this.store.push(r.createJSONApiDocumentFromServicesPayload(e,t,l))}))}async fetchToken(e,t,n){let{dc:l,ns:r,partition:i,name:o,externalAddresses:a}=e
-const u=(null==a?void 0:a.length)>0?a.split(","):[]
-return(await(n`
-      POST /v1/peering/token
-
-      ${{PeerName:o,Partition:i||void 0,ServerExternalAddresses:u}}
-    `))(((e,t,n)=>t))}async fetchAll(e,t,n){let{dc:l,ns:r,partition:i}=e,{uri:o}=t
-return(await(n`
-      GET /v1/peerings
-
-      ${{partition:i}}
-    `))(((e,t,n)=>({meta:{version:2,interval:1e4,uri:o},body:t.map((e=>n(b(e,l,i),(t=>t`peer:///${i}/${r}/${l}/peer/${e.Name}`))))})))}async fetchOne(e,t,n){let{partition:l,ns:r,dc:i,name:o}=e,{uri:a}=t
-if(void 0===o||""===o){const e=this.create({Datacenter:i,Namespace:"",Partition:l})
-return e.meta={cacheControl:"no-store"},e}return(await(n`
-      GET /v1/peering/${o}
-
-      ${{partition:l}}
-    `))(((e,t,n)=>{const{StreamStatus:o}=t
-return o&&(o.LastHeartbeat&&(o.LastHeartbeat=new Date(o.LastHeartbeat)),o.LastReceive&&(o.LastReceive=new Date(o.LastReceive)),o.LastSend&&(o.LastSend=new Date(o.LastSend))),{meta:{version:2,interval:1e4,uri:a},body:n(b(t,i,l),(e=>e`peer:///${l}/${r}/${i}/peer/${t.Name}`))}}))}async persist(e,t){return(await(t`
-      POST /v1/peering/establish
-
-      ${{PeerName:e.Name,PeeringToken:e.PeeringToken,Partition:e.Partition||void 0}}
-    `))(((t,n,l)=>{const r=e.Partition,i=e.Namespace,o=e.Datacenter
-return{meta:{version:2},body:l(m(m({},e),{},{State:"ESTABLISHING"}),(t=>t`peer:///${r}/${i}/${o}/peer/${e.Name}`))}}))}async remove(e,t){return(await(t`
-      DELETE /v1/peering/${e.Name}
-    `))(((t,n,l)=>{const r=e.Partition,i=e.Namespace,o=e.Datacenter
-return{meta:{version:2},body:l(m(m({},e),{},{State:"DELETING"}),(t=>t`peer:///${r}/${i}/${o}/peer/${e.Name}`))}}))}},d=p(c.prototype,"store",[l.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p(c.prototype,"fetchExportedServices",[r],Object.getOwnPropertyDescriptor(c.prototype,"fetchExportedServices"),c.prototype),p(c.prototype,"fetchToken",[i],Object.getOwnPropertyDescriptor(c.prototype,"fetchToken"),c.prototype),p(c.prototype,"fetchAll",[o],Object.getOwnPropertyDescriptor(c.prototype,"fetchAll"),c.prototype),p(c.prototype,"fetchOne",[a,u,s],Object.getOwnPropertyDescriptor(c.prototype,"fetchOne"),c.prototype),c)
-e.default=y})),define("consul-ui/services/repository/permission",["exports","consul-ui/services/repository","@ember/service","@glimmer/tracking","@ember/debug","consul-ui/decorators/data-source"],(function(e,t,n,l,r,i){var o,a,u,s,c,d,p
-function f(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function m(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?f(Object(n),!0).forEach((function(t){b(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):f(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function h(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function b(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function y(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const g=[{Resource:"operator",Access:"write"},{Resource:"operator",Access:"read"},{Resource:"service",Access:"read"},{Resource:"node",Access:"read"},{Resource:"session",Access:"read"},{Resource:"session",Access:"write"},{Resource:"key",Access:"read"},{Resource:"key",Access:"write"},{Resource:"intention",Access:"read"},{Resource:"intention",Access:"write"},{Resource:"acl",Access:"read"},{Resource:"acl",Access:"write"}],v=[{Resource:"peering",Access:"read"},{Resource:"peering",Access:"write"}]
-let O=(o=(0,n.inject)("env"),a=(0,n.inject)("abilities"),u=(0,i.default)("/:partition/:nspace/:dc/permissions"),s=class extends t.default{constructor(){super(...arguments),h(this,"env",c,this),h(this,"_can",d,this),h(this,"permissions",p,this)}getModelName(){return"permission"}has(e){const t=Object.keys(e)
-return this.permissions.some((n=>t.every((t=>n[t]===e[t]))&&!0===n.Allow))}can(e){return this._can.can(e)}abilityFor(e){return this._can.abilityFor(e)}generate(e,t,n){const l={Resource:e,Access:t}
-return void 0!==n&&(l.Segment=n),l}async authorize(e){if(this.env.var("CONSUL_ACLS_ENABLED")){let n=[]
-try{n=await this.store.authorize("permission",e)}catch(t){(0,r.runInDebug)((()=>console.error(t)))}return n}return e.resources.map((e=>m(m({},e),{},{Allow:!0})))}async findBySlug(e,t){let n
-try{n=this._can.abilityFor(t)}catch(r){return[]}const l=n.generateForSegment(e.id.toString())
-return 0===l.length?[]:(e.resources=l,this.authorize(e))}async findByPermissions(e){return this.authorize(e)}async findAll(e){return e.resources=this.permissionsToRequest,this.permissions=await this.findByPermissions(e),this.permissions.forEach((e=>{["key","node","service","intention","session"].includes(e.Resource)&&(e.Allow=!0)})),this.permissions}get permissionsToRequest(){return this._can.can("use peers")?[...g,...v]:g}},c=y(s.prototype,"env",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=y(s.prototype,"_can",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=y(s.prototype,"permissions",[l.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return[]}}),y(s.prototype,"findAll",[u],Object.getOwnPropertyDescriptor(s.prototype,"findAll"),s.prototype),s)
-e.default=O})),define("consul-ui/services/repository/policy",["exports","consul-ui/services/repository","@ember/object","@ember/service","consul-ui/models/policy","consul-ui/decorators/data-source"],(function(e,t,n,l,r,i){var o,a,u,s,c
-function d(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let p=(o=(0,l.inject)("form"),a=(0,i.default)("/:partition/:ns/:dc/policies"),u=(0,i.default)("/:partition/:ns/:dc/policy/:id"),s=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="form",l=this,(n=c)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}getModelName(){return"policy"}getPrimaryKey(){return r.PRIMARY_KEY}getSlugKey(){return r.SLUG_KEY}async findAllByDatacenter(){return super.findAllByDatacenter(...arguments)}async findBySlug(e){let t
-return t=""===e.id?await this.create({Datacenter:e.dc,Partition:e.partition,Namespace:e.ns}):await super.findBySlug(...arguments),this.form.form(this.getModelName()).setData(t).getData()}persist(e){return""===(0,n.get)(e,"template")?e.save():Promise.resolve(e)}translate(e){return this.store.translate("policy",(0,n.get)(e,"Rules"))}},c=d(s.prototype,"form",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d(s.prototype,"findAllByDatacenter",[a],Object.getOwnPropertyDescriptor(s.prototype,"findAllByDatacenter"),s.prototype),d(s.prototype,"findBySlug",[u],Object.getOwnPropertyDescriptor(s.prototype,"findBySlug"),s.prototype),s)
-e.default=p})),define("consul-ui/services/repository/proxy",["exports","consul-ui/services/repository","consul-ui/models/proxy","@ember/object","consul-ui/decorators/data-source"],(function(e,t,n,l,r){var i,o,a
-function u(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let s=(i=(0,r.default)("/:partition/:ns/:dc/proxies/for-service/:id"),o=(0,r.default)("/:partition/:ns/:dc/proxy-instance/:serviceId/:node/:id"),a=class extends t.default{getModelName(){return"proxy"}getPrimaryKey(){return n.PRIMARY_KEY}findAllBySlug(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.store.query(this.getModelName(),e).then((e=>(e.forEach((e=>{const t=JSON.parse(e.uid)
-t.pop(),t.push(e.ServiceProxy.DestinationServiceID)
-const n=this.store.peekRecord("service-instance",JSON.stringify(t))
-n&&(0,l.set)(n,"ProxyInstance",e)})),e)))}async findInstanceBySlug(e,t){const n=await this.findAllBySlug(e,t)
-let r={}
-if((0,l.get)(n,"length")>0){let t=n.filterBy("ServiceProxy.DestinationServiceID",e.serviceId).findBy("NodeName",e.node)
-t?r=t:(t=n.findBy("ServiceProxy.DestinationServiceName",e.id),t&&(r=t))}return(0,l.set)(r,"meta",(0,l.get)(n,"meta")),r}},u(a.prototype,"findAllBySlug",[i],Object.getOwnPropertyDescriptor(a.prototype,"findAllBySlug"),a.prototype),u(a.prototype,"findInstanceBySlug",[o],Object.getOwnPropertyDescriptor(a.prototype,"findInstanceBySlug"),a.prototype),a)
-e.default=s})),define("consul-ui/services/repository/role",["exports","consul-ui/services/repository","@ember/service","consul-ui/models/role","consul-ui/decorators/data-source"],(function(e,t,n,l,r){var i,o,a,u,s
-function c(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let d=(i=(0,n.inject)("form"),o=(0,r.default)("/:partition/:ns/:dc/roles"),a=(0,r.default)("/:partition/:ns/:dc/role/:id"),u=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="form",l=this,(n=s)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}getModelName(){return"role"}getPrimaryKey(){return l.PRIMARY_KEY}getSlugKey(){return l.SLUG_KEY}async findAll(){return super.findAll(...arguments)}async findBySlug(e){let t
-return t=""===e.id?await this.create({Datacenter:e.dc,Partition:e.partition,Namespace:e.ns}):await super.findBySlug(...arguments),this.form.form(this.getModelName()).setData(t).getData()}},s=c(u.prototype,"form",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c(u.prototype,"findAll",[o],Object.getOwnPropertyDescriptor(u.prototype,"findAll"),u.prototype),c(u.prototype,"findBySlug",[a],Object.getOwnPropertyDescriptor(u.prototype,"findBySlug"),u.prototype),u)
-e.default=d})),define("consul-ui/services/repository/service-instance",["exports","consul-ui/services/repository","@ember/object","consul-ui/abilities/base","consul-ui/decorators/data-source"],(function(e,t,n,l,r){var i,o,a
-function u(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let s=(i=(0,r.default)("/:partition/:ns/:dc/service-instances/for-service/:id/:peer"),o=(0,r.default)("/:partition/:ns/:dc/service-instance/:serviceId/:node/:id/:peer"),a=class extends t.default{getModelName(){return"service-instance"}shouldReconcile(e,t){return super.shouldReconcile(...arguments)&&e.Service.Service===t.id}async findByService(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.authorizeBySlug((async t=>{const l=await this.query(e)
-return(0,n.set)(l,"firstObject.Service.Resources",t),l}),l.ACCESS_READ,e)}async findBySlug(e){return super.findBySlug(...arguments)}},u(a.prototype,"findByService",[i],Object.getOwnPropertyDescriptor(a.prototype,"findByService"),a.prototype),u(a.prototype,"findBySlug",[o],Object.getOwnPropertyDescriptor(a.prototype,"findBySlug"),a.prototype),a)
-e.default=s})),define("consul-ui/services/repository/service",["exports","consul-ui/services/repository","consul-ui/decorators/data-source","@ember/service"],(function(e,t,n,l){var r,i,o,a,u
-function s(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let c=(r=(0,n.default)("/:partition/:ns/:dc/services"),i=(0,n.default)("/:partition/:ns/:dc/services/:peer/:peerId"),o=(0,n.default)("/:partition/:ns/:dc/gateways/for-service/:gateway"),a=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="store",l=this,(n=u)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}getModelName(){return"service"}async findAllByDatacenter(){return super.findAll(...arguments)}async findAllImportedServices(e,t){const{peerId:n}=e
-return delete e.peerId,super.findAll(e,t).then((e=>{const t=this.store.peekRecord("peer",n)
-return e.forEach((e=>e.peer=t)),e}))}findGatewayBySlug(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.store.query(this.getModelName(),e)}},u=s(a.prototype,"store",[l.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s(a.prototype,"findAllByDatacenter",[r],Object.getOwnPropertyDescriptor(a.prototype,"findAllByDatacenter"),a.prototype),s(a.prototype,"findAllImportedServices",[i],Object.getOwnPropertyDescriptor(a.prototype,"findAllImportedServices"),a.prototype),s(a.prototype,"findGatewayBySlug",[o],Object.getOwnPropertyDescriptor(a.prototype,"findGatewayBySlug"),a.prototype),a)
-e.default=c})),define("consul-ui/services/repository/session",["exports","@ember/service","consul-ui/services/repository","consul-ui/decorators/data-source"],(function(e,t,n,l){var r,i,o,a,u
-function s(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let c=(r=(0,t.inject)("store"),i=(0,l.default)("/:partition/:ns/:dc/sessions/for-node/:id"),o=(0,l.default)("/:partition/:ns/:dc/sessions/for-key/:id"),a=class extends n.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="store",l=this,(n=u)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}getModelName(){return"session"}findByNode(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.store.query(this.getModelName(),e)}findByKey(e){return this.findBySlug(...arguments)}},u=s(a.prototype,"store",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s(a.prototype,"findByNode",[i],Object.getOwnPropertyDescriptor(a.prototype,"findByNode"),a.prototype),s(a.prototype,"findByKey",[o],Object.getOwnPropertyDescriptor(a.prototype,"findByKey"),a.prototype),a)
-e.default=c})),define("consul-ui/services/repository/token",["exports","consul-ui/services/repository","@ember/object","@ember/service","consul-ui/models/token","consul-ui/decorators/data-source"],(function(e,t,n,l,r,i){var o,a,u,s,c,d,p,f
-function m(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let h=(o=(0,l.inject)("form"),a=(0,i.default)("/:partition/:ns/:dc/tokens"),u=(0,i.default)("/:partition/:ns/:dc/token/:id"),s=(0,i.default)("/:partition/:ns/:dc/token/self/:secret"),c=(0,i.default)("/:partition/:ns/:dc/tokens/for-policy/:policy"),d=(0,i.default)("/:partition/:ns/:dc/tokens/for-role/:role"),p=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="form",l=this,(n=f)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}getModelName(){return"token"}getPrimaryKey(){return r.PRIMARY_KEY}getSlugKey(){return r.SLUG_KEY}async findAll(){return super.findAll(...arguments)}async findBySlug(e){let t
-return t=""===e.id?await this.create({Datacenter:e.dc,Partition:e.partition,Namespace:e.ns}):await super.findBySlug(...arguments),this.form.form(this.getModelName()).setData(t).getData()}self(e){return this.store.self(this.getModelName(),{secret:e.secret,dc:e.dc}).catch((e=>Promise.reject(e)))}clone(e){return this.store.clone(this.getModelName(),(0,n.get)(e,r.PRIMARY_KEY))}findByPolicy(e){return this.findAll(...arguments)}findByRole(){return this.findAll(...arguments)}},f=m(p.prototype,"form",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m(p.prototype,"findAll",[a],Object.getOwnPropertyDescriptor(p.prototype,"findAll"),p.prototype),m(p.prototype,"findBySlug",[u],Object.getOwnPropertyDescriptor(p.prototype,"findBySlug"),p.prototype),m(p.prototype,"self",[s],Object.getOwnPropertyDescriptor(p.prototype,"self"),p.prototype),m(p.prototype,"findByPolicy",[c],Object.getOwnPropertyDescriptor(p.prototype,"findByPolicy"),p.prototype),m(p.prototype,"findByRole",[d],Object.getOwnPropertyDescriptor(p.prototype,"findByRole"),p.prototype),p)
-e.default=h})),define("consul-ui/services/repository/topology",["exports","@ember/service","consul-ui/services/repository","@ember/object","consul-ui/decorators/data-source"],(function(e,t,n,l,r){var i,o,a,u
-function s(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let c=(i=(0,t.inject)("repository/dc"),o=(0,r.default)("/:partition/:ns/:dc/topology/:id/:kind"),a=class extends n.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="dcs",l=this,(n=u)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}getModelName(){return"topology"}findBySlug(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-const n=this.dcs.peekOne(e.dc)
-return null===n||(0,l.get)(n,"MeshEnabled")?(void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.store.queryRecord(this.getModelName(),e).catch((e=>{const t=(0,l.get)(e,"errors.firstObject.status"),r=((0,l.get)(e,"errors.firstObject.detail")||"").trim()
-if("500"!==t)throw e
-null!==n&&r.endsWith("Connect must be enabled in order to use this endpoint")&&(0,l.set)(n,"MeshEnabled",!1)}))):Promise.resolve()}},u=s(a.prototype,"dcs",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s(a.prototype,"findBySlug",[o],Object.getOwnPropertyDescriptor(a.prototype,"findBySlug"),a.prototype),a)
-e.default=c})),define("consul-ui/services/resize-observer",["exports","ember-resize-observer-service/services/resize-observer"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/routlet",["exports","@ember/service","@ember/runloop","@ember/object","consul-ui/utils/routing/wildcard","consul-ui/router"],(function(e,t,n,l,r,i){var o,a,u,s,c,d,p,f,m
-function h(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function b(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
-t%2?h(Object(n),!0).forEach((function(t){g(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):h(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function y(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function g(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function v(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const O=(0,r.default)(i.routes)
-const P=new class{constructor(){this.map=new Map,this.sorted=[]}sort(){this.sorted=[...this.map.keys()],this.sorted.sort(((e,t)=>{if("application"===e)return 1
-if("application"===t)return-1
-const n=e.split(".").length,l=t.split(".").length
-switch(!0){case n>l:return-1
-case n<l:return 1
-default:return 0}}))}set(e,t){this.map.set(e,t),this.sort()}get(e){return this.map.get(e)}delete(e){this.map.delete(e),this.sort()}keys(){return this.sorted}}
-let x=(o=(0,t.inject)("container"),a=(0,t.inject)("env"),u=(0,t.inject)("router"),s=(0,t.inject)("repository/permission"),c=class extends t.default{constructor(){super(...arguments),y(this,"container",d,this),y(this,"env",p,this),y(this,"router",f,this),y(this,"permissions",m,this)}ready(){return this._transition}exists(e){return!!(0,l.get)(i.routes,e)&&this.allowed(e)}allowed(e){const t=(0,l.get)(i.routes,`${e}._options.abilities`)||[]
-return!(t.length>0&&!t.every((e=>this.permissions.can(e))))}transition(){let e
-return this._transition=new Promise((t=>{e=t})),e}findOutlet(e){return[...P.keys()].find((t=>-1!==e.indexOf(t)))}outletFor(e){const t=[...P.keys()],n=t.indexOf(e)+1
-return P.get(t[n])}normalizeParamsFor(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return O(e)?Object.keys(t).reduce((function(e,n){return void 0!==t[n]?e[n]=decodeURIComponent(t[n]):e[n]=t[n],e}),{}):t}paramsFor(e){let t={}
-const n=P.get(e)
-void 0!==n&&void 0!==n.args.params&&(t=n.args.params)
-let l=this.router.currentRoute
-null===l&&(l=this.container.lookup("route:application"))
-let r,i=l,o=this.normalizeParamsFor(e,i.params)
-for(;r=i.parent;)o=b(b({},this.normalizeParamsFor(r.name,r.params)),o),i=r
-return b(b(b({},this.container.get(`location:${this.env.var("locationType")}`).optionalParams()),o),t)}modelFor(e){const t=P.get(e)
-if(void 0!==t)return t.model}addRoute(e,t){const l=this.outletFor(e)
-void 0!==l&&(l.route=t,(0,n.schedule)("afterRender",(()=>{l.routeName=e})))}removeRoute(e,t){const l=this.outletFor(e)
-t._model=void 0,void 0!==l&&(0,n.schedule)("afterRender",(()=>{l.route=void 0}))}addOutlet(e,t){P.set(e,t)}removeOutlet(e){(0,n.schedule)("afterRender",(()=>{P.delete(e)}))}},d=v(c.prototype,"container",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=v(c.prototype,"env",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=v(c.prototype,"router",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=v(c.prototype,"permissions",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c)
-e.default=x})),define("consul-ui/services/schema",["exports","@ember/service","consul-ui/models/intention-permission","consul-ui/models/intention-permission-http","consul-ui/models/intention-permission-http-header"],(function(e,t,n,l,r){function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class o extends t.default{constructor(){super(...arguments),i(this,"intention-permission",n.schema),i(this,"intention-permission-http",l.schema),i(this,"intention-permission-http-header",r.schema)}}e.default=o})),define("consul-ui/services/search",["exports","@ember/service","consul-ui/utils/search/exact","consul-ui/search/predicates/intention","consul-ui/search/predicates/upstream-instance","consul-ui/search/predicates/service-instance","consul-ui/search/predicates/health-check","consul-ui/search/predicates/acl","consul-ui/search/predicates/service","consul-ui/search/predicates/node","consul-ui/search/predicates/kv","consul-ui/search/predicates/token","consul-ui/search/predicates/role","consul-ui/search/predicates/policy","consul-ui/search/predicates/auth-method","consul-ui/search/predicates/nspace","consul-ui/search/predicates/peer"],(function(e,t,n,l,r,i,o,a,u,s,c,d,p,f,m,h,b){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const y={intention:l.default,service:u.default,"service-instance":i.default,"upstream-instance":r.default,"health-check":o.default,"auth-method":m.default,node:s.default,kv:c.default,acl:a.default,token:d.default,role:p.default,policy:f.default,nspace:h.default,peer:b.default}
-class g extends t.default{constructor(){var e,t,l
-super(...arguments),e=this,t="searchables",l={exact:n.default},t in e?Object.defineProperty(e,t,{value:l,enumerable:!0,configurable:!0,writable:!0}):e[t]=l}predicate(e){return y[e]}}e.default=g})),define("consul-ui/services/settings",["exports","@ember/service","consul-ui/utils/storage/local-storage"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.ifNotBlocking=void 0
-const l=(0,n.default)("consul")
-e.ifNotBlocking=function(e){return e.findBySlug("client").then((function(e){return void 0!==e.blocking&&!e.blocking}))}
-class r extends t.default{constructor(){var e,t,n
-super(...arguments),n=l,(t="storage")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}findAll(e){return Promise.resolve(this.storage.all())}findBySlug(e){return Promise.resolve(this.storage.getValue(e))}persist(e){const t=this.storage
-return Object.keys(e).forEach(((n,l)=>{t.setValue(n,e[n])})),Promise.resolve(e)}delete(e){Array.isArray(e)||(e=[e])
-const t=this.storage,n=e.reduce((function(e,n,l,r){return t.removeValue(n),e}),{})
-return Promise.resolve(n)}}e.default=r})),define("consul-ui/services/sort",["exports","@ember/service","consul-ui/sort/comparators/service","consul-ui/sort/comparators/service-instance","consul-ui/sort/comparators/upstream-instance","consul-ui/sort/comparators/kv","consul-ui/sort/comparators/health-check","consul-ui/sort/comparators/intention","consul-ui/sort/comparators/token","consul-ui/sort/comparators/role","consul-ui/sort/comparators/policy","consul-ui/sort/comparators/auth-method","consul-ui/sort/comparators/nspace","consul-ui/sort/comparators/peer","consul-ui/sort/comparators/node"],(function(e,t,n,l,r,i,o,a,u,s,c,d,p,f,m){Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.properties=void 0
-const h=e=>e.reduce(((e,t)=>e.concat([`${t}:asc`,`${t}:desc`])),[]),b=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[]
-return t=>{const n=h(e)
-return[n.find((e=>e===t))||n[0]]}}
-e.properties=b
-const y={properties:b,directionify:h},g={service:(0,n.default)(y),"service-instance":(0,l.default)(y),"upstream-instance":(0,r.default)(y),"health-check":(0,o.default)(y),"auth-method":(0,d.default)(y),kv:(0,i.default)(y),intention:(0,a.default)(y),token:(0,u.default)(y),role:(0,s.default)(y),policy:(0,c.default)(y),nspace:(0,p.default)(y),peer:(0,f.default)(y),node:(0,m.default)(y)}
-class v extends t.default{comparator(e){return g[e]}}e.default=v})),define("consul-ui/services/state-with-charts",["exports","consul-ui/services/state","consul-ui/machines/validate.xstate","consul-ui/machines/boolean.xstate"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{constructor(){var e,t,r
-super(...arguments),e=this,t="stateCharts",r={validate:n.default,boolean:l.default},t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r}}e.default=r})),define("consul-ui/services/state",["exports","@ember/service","@ember/object","flat","@xstate/fsm"],(function(e,t,n,l,r){var i,o,a
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let u=(i=(0,t.inject)("logger"),o=class extends t.default{constructor(){var e,t,n,l,r,i,o
-super(...arguments),n={},(t="stateCharts")in(e=this)?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,l=this,r="logger",o=this,(i=a)&&Object.defineProperty(l,r,{enumerable:i.enumerable,configurable:i.configurable,writable:i.writable,value:i.initializer?i.initializer.call(o):void 0})}log(e,t){}stateChart(e){return this.stateCharts[e]}addGuards(e,t){return this.guards(e).forEach((function(l){let[r,i]=l;(0,n.set)(e,r,(function(){return!!t.onGuard(i,...arguments)}))})),[e,t]}machine(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return(0,r.createMachine)(...this.addGuards(e,t))}prepareChart(e){return void 0!==(e=JSON.parse(JSON.stringify(e))).on&&Object.values(e.states).forEach((function(t){void 0===t.on?t.on=e.on:Object.keys(e.on).forEach((function(n){void 0===t.on[n]&&(t.on[n]=e.on[n])}))})),e}matches(e,t){if(void 0===e)return!1
-return(Array.isArray(t)?t:[t]).some((t=>e.matches(t)))}state(e){return{matches:e}}interpret(e,t){e=this.prepareChart(e)
-const n=(0,r.interpret)(this.machine(e,t))
-return n.subscribe((n=>{n.changed&&(this.log(e,n),t.onTransition(n))})),n}guards(e){return Object.entries((0,l.default)(e)).filter((e=>{let[t]=e
-return t.endsWith(".cond")}))}},s=o.prototype,c="logger",d=[i],p={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(p).forEach((function(e){m[e]=p[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=d.slice().reverse().reduce((function(e,t){return t(s,c,e)||e}),m),f&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(f):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(s,c,m),m=null),a=m,o)
-var s,c,d,p,f,m
-e.default=u})),define("consul-ui/services/store",["exports","@ember/service","@ember-data/store"],(function(e,t,n){var l,r,i,o,a
-function u(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}function s(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let c=(l=(0,t.inject)("data-source/service"),r=(0,t.inject)("client/http"),i=class extends n.default{constructor(){super(...arguments),u(this,"dataSource",o,this),u(this,"client",a,this)}invalidate(){this.client.abort(401),this.dataSource.resetCache(),this.init()}clear(){this.invalidate(0)}clone(e,t){return this.adapterFor(e).clone(this,{modelName:e},t,this._internalModelForId(e,t).createSnapshot({}))}self(e,t){const n=this.adapterFor(e),l=this.serializerFor(e),r={modelName:e}
-return n.self(this,r,t.secret,t).then((e=>l.normalizeResponse(this,r,e,t,"self")))}queryLeader(e,t){const n=this.adapterFor(e),l=this.serializerFor(e),r={modelName:e}
-return n.queryLeader(this,r,null,t).then((e=>(e.meta=l.normalizeMeta(this,r,e,null,"leader"),e)))}authorize(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-const n=this.adapterFor(e),l=this.serializerFor(e),r={modelName:e}
-return n.authorize(this,r,null,t).then((e=>l.normalizeResponse(this,r,e,void 0,"authorize")))}logout(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-const n={modelName:e}
-return this.adapterFor(e).logout(this,n,t.id,t)}},o=s(i.prototype,"dataSource",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a=s(i.prototype,"client",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i)
-e.default=c})),define("consul-ui/services/temporal",["exports","pretty-ms","parse-duration","@ember/debug","dayjs","dayjs/plugin/relativeTime","@ember/service"],(function(e,t,n,l,r,i,o){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,r.default.extend(i.default)
-class a extends o.default{format(e,t){const n=(0,r.default)(e)
-return(0,r.default)().isBefore(n)?(0,r.default)().to(n,!0):(0,r.default)().from(n,!0)}within(e,t){let[n,l]=e
-return(0,r.default)(n).isBefore((0,r.default)().add(l,"ms"))}parse(e,t){return(0,n.default)(e)}durationFrom(e){return!0==("number"==typeof e)?0===e?"0":(0,t.default)(e/1e6,{formatSubMilliseconds:!0}).split(" ").join(""):e}}e.default=a})),define("consul-ui/services/text-measurer",["exports","ember-text-measurer/services/text-measurer"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/ticker",["exports","@ember/service","consul-ui/utils/ticker"],(function(e,t,n){let l
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{init(){super.init(...arguments),this.reset()}tweenTo(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",r=arguments.length>2?arguments[2]:void 0,i=arguments.length>3?arguments[3]:void 0
-const o=t
-return l.has(o)?(t=l.get(o),t instanceof n.Tween&&(t=t.stop().getTarget()),l.set(o,n.Tween.to(t,e,r,i)),t):(l.set(o,e),e)}destroy(e){return this.reset(),n.Tween.destroy()}reset(){l=new Map}}e.default=r})),define("consul-ui/services/timeout",["exports","@ember/service","consul-ui/utils/promisedTimeout","@ember/runloop"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=(0,n.default)(Promise)
-class i extends t.default{execute(e,t){return r(e,t)}tick(){return new Promise((function(e,t){(0,l.next)(e)}))}}e.default=i})),define("consul-ui/services/torii-session",["exports","torii/services/torii-session"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/torii",["exports","torii/services/torii"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/ui-config",["exports","@ember/service","@ember/object","consul-ui/decorators/data-source"],(function(e,t,n,l){var r,i,o,a,u,s
-function c(e,t,n,l,r){var i={}
-return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumerable,i.configurable=!!i.configurable,("value"in i||i.initializer)&&(i.writable=!0),i=n.slice().reverse().reduce((function(n,l){return l(e,t,n)||n}),i),r&&void 0!==i.initializer&&(i.value=i.initializer?i.initializer.call(r):void 0,i.initializer=void 0),void 0===i.initializer&&(Object.defineProperty(e,t,i),i=null),i}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let d=(r=(0,t.inject)("env"),i=(0,l.default)("/:partition/:nspace/:dc/ui-config/:path"),o=(0,l.default)("/:partition/:nspace/:dc/notfound/:path"),a=(0,l.default)("/:partition/:nspace/:dc/ui-config"),u=class extends t.default{constructor(){var e,t,n,l
-super(...arguments),e=this,t="env",l=this,(n=s)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(l):void 0})}async findByPath(e){return(0,n.get)(this.get(),e.path)}async parsePath(e){return e.path.split("/").reduce(((e,t,n)=>{switch(!0){case t.startsWith("~"):e.nspace=t.substr(1)
-break
-case t.startsWith("_"):e.partition=t.substr(1)
-break
-case void 0===e.dc:e.dc=t}return e}),{})}async get(){return this.env.var("CONSUL_UI_CONFIG")}getSync(){return this.env.var("CONSUL_UI_CONFIG")}},s=c(u.prototype,"env",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c(u.prototype,"findByPath",[i],Object.getOwnPropertyDescriptor(u.prototype,"findByPath"),u.prototype),c(u.prototype,"parsePath",[o],Object.getOwnPropertyDescriptor(u.prototype,"parsePath"),u.prototype),c(u.prototype,"get",[a],Object.getOwnPropertyDescriptor(u.prototype,"get"),u.prototype),u)
-e.default=d})),define("consul-ui/sort/comparators/auth-method",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>{let{properties:t}=e
-return function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"MethodName:asc"
-return t(["MethodName","TokenTTL"])(e)}}})),define("consul-ui/sort/comparators/health-check",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>{let{properties:t}=e
-return function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"Status:asc"
-return e.startsWith("Status:")?function(t,n){const[,l]=e.split(":")
-let r,i
-"asc"===l?(r=t,i=n):(i=t,r=n)
-const o=r.Status,a=i.Status
-switch(o){case"passing":return"passing"===a?0:1
-case"critical":return"critical"===a?0:-1
-case"warning":switch(a){case"passing":return-1
-case"critical":return 1
-default:return 0}}return 0}:t(["Name","Kind"])(e)}}}))
-define("consul-ui/sort/comparators/intention",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=()=>e=>[e]})),define("consul-ui/sort/comparators/kv",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>{let{properties:t}=e
-return e=>t(["Key","Kind"])(e)}})),define("consul-ui/sort/comparators/node",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>{let{properties:t}=e
-return function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"Name:asc"
-return e.startsWith("Status:")?function(t,n){const[,l]=e.split(":")
-let r,i
-switch("asc"===l?(i=t,r=n):(r=t,i=n),!0){case r.ChecksCritical>i.ChecksCritical:return 1
-case r.ChecksCritical<i.ChecksCritical:return-1
-default:switch(!0){case r.ChecksWarning>i.ChecksWarning:return 1
-case r.ChecksWarning<i.ChecksWarning:return-1
-default:switch(!0){case r.ChecksPassing<i.ChecksPassing:return 1
-case r.ChecksPassing>i.ChecksPassing:return-1}}return 0}}:t(["Node"])(e)}}})),define("consul-ui/sort/comparators/nspace",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>{let{properties:t}=e
-return e=>t(["Name"])(e)}})),define("consul-ui/sort/comparators/partition",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>{let{properties:t}=e
-return e=>t(["Name"])(e)}})),define("consul-ui/sort/comparators/peer",["exports","consul-ui/models/peer"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>{let{properties:n}=e
-return function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"State:asc"
-return e.startsWith("State:")?function(n,l){const[,r]=e.split(":")
-let i,o
-switch("asc"===r?(o=n,i=l):(i=n,o=l),!0){case t.schema.State.allowedValues.indexOf(i.State)<t.schema.State.allowedValues.indexOf(o.State):return 1
-case t.schema.State.allowedValues.indexOf(i.State)>t.schema.State.allowedValues.indexOf(o.State):return-1
-case t.schema.State.allowedValues.indexOf(i.State)===t.schema.State.allowedValues.indexOf(o.State):return 0}}:n(["Name"])(e)}}})),define("consul-ui/sort/comparators/policy",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>{let{properties:t}=e
-return function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"Name:asc"
-return t(["Name"])(e)}}})),define("consul-ui/sort/comparators/role",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>{let{properties:t}=e
-return function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"Name:asc"
-return t(["Name","CreateIndex"])(e)}}})),define("consul-ui/sort/comparators/service-instance",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>{let{properties:t}=e
-return e=>{if(e.startsWith("Status:")){const[,t]=e.split(":"),n=["PercentageChecksPassing","PercentageChecksWarning","PercentageChecksCritical"]
-return"asc"===t&&n.reverse(),function(e,t){for(let l in n){let r=n[l]
-if(e[r]!==t[r])return e[r]>t[r]?-1:1}}}return t(["Name"])(e)}}})),define("consul-ui/sort/comparators/service",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>{let{properties:t}=e
-return function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"Status:asc"
-return e.startsWith("Status:")?function(t,n){const[,l]=e.split(":")
-let r,i
-switch("asc"===l?(i=t,r=n):(r=t,i=n),!0){case r.MeshChecksCritical>i.MeshChecksCritical:return 1
-case r.MeshChecksCritical<i.MeshChecksCritical:return-1
-default:switch(!0){case r.MeshChecksWarning>i.MeshChecksWarning:return 1
-case r.MeshChecksWarning<i.MeshChecksWarning:return-1
-default:switch(!0){case r.MeshChecksPassing<i.MeshChecksPassing:return 1
-case r.MeshChecksPassing>i.MeshChecksPassing:return-1}}return 0}}:t(["Name"])(e)}}})),define("consul-ui/sort/comparators/token",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>{let{properties:t}=e
-return e=>t(["CreateTime"])(e)}})),define("consul-ui/sort/comparators/upstream-instance",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>{let{properties:t}=e
-return function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"DestinationName:asc"
-return t(["DestinationName"])(e)}}})),define("consul-ui/storages/base",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=class{constructor(e,t){this.key=e,this.storage=t,this.state=this.initState(this.key,this.storage)}initState(){const{key:e,storage:t}=this
-return t.getItem(e)}}})),define("consul-ui/storages/notices",["exports","tracked-built-ins","consul-ui/storages/base"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends n.default{initState(){const{key:e,storage:n}=this,l=n.getItem(e)
-return l?new t.TrackedArray(l.split(",")):new t.TrackedArray}add(e){const{key:t,storage:n,state:l}=this
-l.push(e),n.setItem(t,[...l])}}e.default=l})),define("consul-ui/styles/base/decoration/visually-hidden.css",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>e`
-    @keyframes visually-hidden {
-      100% {
-        position: absolute;
-        overflow: hidden;
-        clip: rect(0 0 0 0);
-        width: 1px;
-        height: 1px;
-        margin: -1px;
-        padding: 0;
-        border: 0;
-      }
-    }
-  `})),define("consul-ui/styles/base/icons/base-keyframes.css",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>e`
-  *::before,
-  *::after {
-    display: inline-block;
-    animation-play-state: paused;
-    animation-fill-mode: forwards;
-    animation-iteration-count: var(--icon-resolution, 1);
-    vertical-align: text-top;
-  }
-  *::before {
-    animation-name: var(--icon-name-start, var(--icon-name)),
-      var(--icon-size-start, var(--icon-size, icon-000));
-    background-color: var(--icon-color-start, var(--icon-color));
-  }
-  *::after {
-    animation-name: var(--icon-name-end, var(--icon-name)),
-      var(--icon-size-end, var(--icon-size, icon-000));
-    background-color: var(--icon-color-end, var(--icon-color));
-  }
-
-  [style*='--icon-color-start']::before {
-    color: var(--icon-color-start);
-  }
-  [style*='--icon-color-end']::after {
-    color: var(--icon-color-end);
-  }
-  [style*='--icon-name-start']::before,
-  [style*='--icon-name-end']::after {
-    content: '';
-  }
-
-  @keyframes icon-000 {
-    100% {
-      width: 1.2em;
-      height: 1.2em;
-    }
-  }
-  @keyframes icon-100 {
-    100% {
-      width: 0.625rem; /* 10px */
-      height: 0.625rem; /* 10px */
-    }
-  }
-  @keyframes icon-200 {
-    100% {
-      width: 0.75rem; /* 12px */
-      height: 0.75rem; /* 12px */
-    }
-  }
-  @keyframes icon-300 {
-    100% {
-      width: 1rem; /* 16px */
-      height: 1rem; /* 16px */
-    }
-  }
-  @keyframes icon-400 {
-    100% {
-      width: 1.125rem; /* 18px */
-      height: 1.125rem; /* 18px */
-    }
-  }
-  @keyframes icon-500 {
-    100% {
-      width: 1.25rem; /* 20px */
-      height: 1.25rem; /* 20px */
-    }
-  }
-  @keyframes icon-600 {
-    100% {
-      width: 1.375rem; /* 22px */
-      height: 1.375rem; /* 22px */
-    }
-  }
-  @keyframes icon-700 {
-    100% {
-      width: 1.5rem; /* 24px */
-      height: 1.5rem; /* 24px */
-    }
-  }
-  @keyframes icon-800 {
-    100% {
-      width: 1.625rem; /* 26px */
-      height: 1.625rem; /* 26px */
-    }
-  }
-  @keyframes icon-900 {
-    100% {
-      width: 1.75rem; /* 28px */
-      height: 1.75rem; /* 28px */
-    }
-  }
-`})),define("consul-ui/templates/application",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"JXqlDmpZ",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n\\n"],[1,"  "],[8,[30,1,["Announcer"]],null,[["@title"],["Consul"]],null],[1,"\\n"],[41,[28,[37,3],["use acls"],null],[[[1,"    "],[1,[28,[35,4],null,[["class"],["has-acls"]]]],[1,"\\n"]],[]],null],[41,[28,[37,3],["use nspaces"],null],[[[1,"    "],[1,[28,[35,4],null,[["class"],["has-nspaces"]]]],[1,"\\n"]],[]],null],[41,[28,[37,3],["use partitions"],null],[[[1,"    "],[1,[28,[35,4],null,[["class"],["has-partitions"]]]],[1,"\\n"]],[]],null],[1,"\\n"],[1,"  "],[8,[39,5],null,[["@src","@onchange"],[[28,[37,6],["settings://consul:client"],null],[28,[37,7],["onClientChanged"],null]]],null],[1,"\\n\\n"],[1,"  "],[8,[39,5],null,[["@src"],[[28,[37,6],["settings://consul:theme"],null]]],[["default"],[[[[1,"\\n"],[42,[28,[37,9],[[30,2,["data"]]],null],null,[[[41,[28,[37,10],[[30,3],[28,[37,11],[[30,4],[28,[37,12],["color-scheme","contrast"],null]],null]],null],[[[1,"        "],[1,[28,[35,4],null,[["class"],[[28,[37,13],["prefers-",[30,4],"-",[30,3]],null]]]]],[1,"\\n"]],[]],null]],[3,4]],null],[1,"  "]],[2]]]]],[1,"\\n\\n"],[41,[28,[37,3],["use acls"],null],[[[1,"    "],[8,[39,5],null,[["@src","@onchange"],[[28,[37,6],["settings://consul:token"],null],[28,[37,14],[[30,0],[28,[37,15],[[33,16]],null]],[["value"],["data"]]]]],null],[1,"\\n"]],[]],null],[1,"\\n"],[41,[28,[37,17],[[30,1,["currentName"]],"oauth-provider-debug"],null],[[[1,"\\n"],[41,[28,[37,18],[[30,1,["currentName"]],"index"],null],[[[1,"\\n"],[1,"      "],[1,[28,[35,19],[[28,[37,7],["replaceWith","dc.services.index",[28,[37,20],null,[["dc"],[[28,[37,21],["CONSUL_DATACENTER_LOCAL"],null]]]]],null]],null]],[1,"\\n"]],[]],[[[41,[28,[37,18],[[30,1,["currentName"]],"notfound"],null],[[[1,"        "],[8,[39,5],null,[["@src","@onchange"],[[28,[37,6],["/*/*/*/notfound/${path}",[28,[37,20],null,[["path"],[[30,1,["params","notfound"]]]]]],null],[28,[37,14],[[30,0],[28,[37,15],[[33,22]],null]],[["value"],["data"]]]]],null],[1,"\\n"]],[]],null],[1,"\\n"],[44,[[52,[28,[37,3],["use partitions"],null],[28,[37,24],[[30,1,["params","partition"]],[33,22,["partition"]],[33,16,["Partition"]],""],null],""],[52,[28,[37,3],["use nspaces"],null],[28,[37,24],[[30,1,["params","nspace"]],[33,22,["nspace"]],[33,16,["Namespace"]],""],null],""]],[[[1,"\\n"],[1,"        "],[8,[39,5],null,[["@src"],[[28,[37,6],["/*/*/*/datacenters"],null]]],[["default"],[[[[1,"\\n"],[44,[[28,[37,24],[[52,[33,25,["dc"]],[28,[37,26],[0,[28,[37,27],["dc",[28,[37,20],null,[["Name"],[[33,22,["dc"]]]]]],null]],null]],[28,[37,26],[0,[28,[37,27],["dc",[28,[37,20],null,[["Name"],[[30,1,["params","dc"]]]]]],null]],null],[28,[37,20],null,[["Name"],[[28,[37,21],["CONSUL_DATACENTER_LOCAL"],null]]]]],null],[30,7,["data"]]],[[[41,[28,[37,10],[[28,[37,28],[[30,8,["Name","length"]],0],null],[30,9]],null],[[[1,"\\n"],[1,"              "],[8,[39,5],null,[["@src"],[[28,[37,6],["/${partition}/*/${dc}/datacenter-cache/${name}",[28,[37,20],null,[["dc","partition","name"],[[30,8,["Name"]],[30,5],[30,8,["Name"]]]]]],null]]],[["default"],[[[[1,"\\n"],[41,[30,10,["data"]],[[[1,"                  "],[8,[39,29],[[24,1,"wrapper"]],[["@dcs","@dc","@partition","@nspace","@user","@onchange"],[[30,9],[30,10,["data"]],[30,5],[30,6],[28,[37,20],null,[["token"],[[33,16]]]],[28,[37,14],[[30,0],"reauthorize"],null]]],[["default"],[[[[1,"\\n\\n"],[41,[33,30],[[[1,"                      "],[8,[39,31],null,[["@error","@login"],[[99,30,["@error"]],[30,11,["login","open"]]]],null],[1,"\\n"]],[]],[[[1,"                      "],[8,[39,32],null,[["@name","@model"],["application",[28,[37,20],null,[["app","user","dc","dcs"],[[30,11],[28,[37,20],null,[["token"],[[33,16]]]],[30,10,["data"]],[30,9]]]]]],[["default"],[[[[1,"\\n                        "],[46,[28,[37,34],null,null],null,null,null],[1,"\\n                      "]],[12]]]]],[1,"\\n\\n"],[1,"                      "],[8,[39,35],[[24,0,"view-loader"]],null,null],[1,"\\n"]],[]]],[1,"\\n                  "]],[11]]]]],[1,"\\n"]],[]],null],[1,"              "]],[10]]]]],[1,"\\n"]],[]],null]],[8,9]]],[1,"        "]],[7]]]]],[1,"\\n"]],[5,6]]]],[]]]],[]],[[[1,"    "],[8,[39,32],null,[["@name","@model"],["application",[28,[37,20],null,[["user"],[[28,[37,20],null,[["token"],[[33,16]]]]]]]]],[["default"],[[[[1,"\\n      "],[46,[28,[37,34],null,null],null,null,null],[1,"\\n    "]],[13]]]]],[1,"\\n"]],[]]]],[1]]]]],[1,"\\n"]],["route","source","value","key","partition","nspace","dcs","dc","dcs","dc","consul","o","o"],false,["route","routeName","if","can","document-attrs","data-source","uri","route-action","each","-each-in","and","includes","array","concat","action","mut","token","not-eq","eq","did-insert","hash","env","notfound","let","or","nofound","object-at","cached-model","gt","hashicorp-consul","error","app-error","outlet","component","-outlet","consul/loader"]]',moduleName:"consul-ui/templates/application.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/components/basic-dropdown-content",["exports","ember-basic-dropdown/templates/components/basic-dropdown-content"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/templates/components/basic-dropdown-optional-tag",["exports","ember-basic-dropdown/templates/components/basic-dropdown-optional-tag"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/templates/components/basic-dropdown-trigger",["exports","ember-basic-dropdown/templates/components/basic-dropdown-trigger"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/templates/components/basic-dropdown",["exports","ember-basic-dropdown/templates/components/basic-dropdown"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/templates/dc",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"zSQnZ2jK",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@name","@model"],[[99,1,["@name"]],[30,1,["model"]]]],[["default"],[[[[1,"\\n    "],[46,[28,[37,4],null,null],null,null,null],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","o"],false,["route","routeName","outlet","component","-outlet"]]',moduleName:"consul-ui/templates/dc.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"U8Va7GUq",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@name","@model"],[[99,1,["@name"]],[30,1,["model"]]]],[["default"],[[[[1,"\\n    "],[46,[28,[37,4],null,null],null,null,null],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","o"],false,["route","routeName","outlet","component","-outlet"]]',moduleName:"consul-ui/templates/dc/acls.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/auth-methods/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"RVzHvzAb",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/auth-methods",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n"],[41,[28,[37,7],[[30,2,["error","status"]],"401"],null],[[[1,"      "],[8,[39,8],null,null,null],[1,"\\n"]],[]],[[[1,"      "],[8,[39,9],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n"]],[]]],[1,"    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,11],[[33,12],"MethodName:asc"],null],[28,[37,13],[[30,0],[28,[37,14],[[33,12]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["kind","source","searchproperty"],[[28,[37,4],null,[["value","change"],[[52,[33,15],[28,[37,16],[[33,15],","],null],[27]],[28,[37,13],[[30,0],[28,[37,14],[[33,15]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change"],[[52,[33,17],[28,[37,16],[[33,17],","],null],[27]],[28,[37,13],[[30,0],[28,[37,14],[[33,17]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change","default"],[[52,[28,[37,18],[[33,19],[27]],null],[28,[37,16],[[33,19],","],null],[33,20]],[28,[37,13],[[30,0],[28,[37,14],[[33,19]],null]],[["value"],["target.selectedItems"]]],[33,20]]]]]]],[30,2,["data"]]],[[[1,"\\n\\n    "],[8,[39,21],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n      "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"h1"],[12],[1,"\\n          "],[8,[30,1,["Title"]],null,[["@title"],["Auth Methods"]],null],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["toolbar"]],[["default"],[[[[1,"\\n"],[41,[28,[37,22],[[30,5,["length"]],0],null],[[[1,"        "],[8,[39,23],null,[["@search","@onsearch","@sort","@filter"],[[99,24,["@search"]],[28,[37,13],[[30,0],[28,[37,14],[[33,24]],null]],[["value"],["target.value"]]],[30,3],[30,4]]],null],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n        "],[8,[39,25],null,[["@type","@sort","@filters","@search","@items"],["auth-method",[30,3,["value"]],[30,4],[99,24,["@search"]],[30,5]]],[["default"],[[[[1,"\\n          "],[8,[30,6,["Collection"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,26],null,[["@items"],[[30,6,["items"]]]],null],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,6,["Empty"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,27],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n              "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                "],[10,"h2"],[12],[1,"\\n                  "],[1,[28,[35,28],["routes.dc.acls.auth-methods.index.empty.header"],[["items"],[[30,5,["length"]]]]]],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[1,[28,[35,28],["routes.dc.acls.auth-methods.index.empty.body"],[["items","htmlSafe"],[[30,5,["length"]],true]]]],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                "],[10,"li"],[12],[1,"\\n                  "],[8,[39,29],null,[["@text","@href","@icon","@iconPosition","@size"],["Documentation on auth methods",[29,[[28,[37,30],["CONSUL_DOCS_URL"],null],"/security/acl/auth-methods"]],"docs-link","trailing","small"]],null],[1,"\\n                "],[13],[1,"\\n                "],[10,"li"],[12],[1,"\\n                  "],[8,[39,29],null,[["@text","@href","@icon","@iconPosition","@size"],["Read the API Docs",[29,[[28,[37,30],["CONSUL_DOCS_API_URL"],null],"/acl/auth-methods.html"]],"learn-link","trailing","small"]],null],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[6]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[3,4,5]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","loader","sort","filters","items","collection"],false,["route","routeName","data-loader","uri","hash","block-slot","if","eq","consul/acl/disabled","app-error","let","or","sortBy","action","mut","kind","split","source","not-eq","searchproperty","searchProperties","app-view","gt","consul/auth-method/search-bar","search","data-collection","consul/auth-method/list","empty-state","t","hds/link/standalone","env"]]',moduleName:"consul-ui/templates/dc/acls/auth-methods/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/auth-methods/show",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"HUExCiVZ",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/auth-method/${name}",[28,[37,4],null,[["partition","nspace","dc","name"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","id"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n"],[41,[28,[37,7],[[30,2,["error","status"]],"401"],null],[[[1,"        "],[8,[39,8],null,null,null],[1,"\\n"]],[]],[[[1,"        "],[8,[39,9],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n"]],[]]],[1,"    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,2,["data"]]],[[[1,"  "],[8,[39,11],null,null,[["default"],[[[[1,"\\n      "],[8,[39,5],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n          "],[10,"ol"],[12],[1,"\\n              "],[10,"li"],[12],[10,3],[15,6,[28,[37,12],["dc.acls.auth-methods"],null]],[12],[1,"All Auth Methods"],[13],[13],[1,"\\n          "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"h1"],[12],[1,"\\n          "],[8,[30,1,["Title"]],null,[["@title"],[[30,3,["Name"]]]],null],[1,"\\n        "],[13],[1,"\\n        "],[8,[39,13],null,[["@item"],[[30,3]]],null],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["nav"]],[["default"],[[[[1,"\\n        "],[8,[39,14],null,[["@items"],[[28,[37,15],[[28,[37,16],[[28,[37,4],null,[["label","href","selected"],["General info",[28,[37,12],["dc.acls.auth-methods.show.auth-method"],null],[28,[37,17],["dc.acls.auth-methods.show.auth-method"],null]]]],[52,[28,[37,18],["use nspaces"],null],[28,[37,4],null,[["label","href","selected"],["Namespace rules",[28,[37,12],["dc.acls.auth-methods.show.nspace-rules"],null],[28,[37,17],["dc.acls.auth-methods.show.nspace-rules"],null]]]],""],[28,[37,4],null,[["label","href","selected"],["Binding rules",[28,[37,12],["dc.acls.auth-methods.show.binding-rules"],null],[28,[37,17],["dc.acls.auth-methods.show.binding-rules"],null]]]]],null]],null]]],null],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n        "],[8,[39,19],null,[["@name","@model"],[[99,1,["@name"]],[28,[37,4],null,[["item"],[[30,3]]]]]],[["default"],[[[[1,"\\n          "],[46,[28,[37,21],null,null],null,null,null],[1,"\\n        "]],[4]]]]],[1,"\\n      "]],[]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[3]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]]],["route","loader","item","o"],false,["route","routeName","data-loader","uri","hash","block-slot","if","eq","consul/acl/disabled","app-error","let","app-view","href-to","consul/auth-method/type","tab-nav","compact","array","is-href","can","outlet","component","-outlet"]]',moduleName:"consul-ui/templates/dc/acls/auth-methods/show.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/auth-methods/show/auth-method",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"eqP++7Wz",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[10,0],[14,0,"tab-section"],[12],[1,"\\n    "],[8,[39,2],null,[["@item"],[[30,1,["model","item"]]]],null],[1,"\\n  "],[13],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route"],false,["route","routeName","consul/auth-method/view"]]',moduleName:"consul-ui/templates/dc/acls/auth-methods/show/auth-method.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/auth-methods/show/binding-rules",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"P/K1HFfv",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/binding-rules/for-auth-method/${name}",[28,[37,4],null,[["partition","nspace","dc","name"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","id"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,2,["data"]]],[[[1,"\\n  "],[10,0],[14,0,"tab-section"],[12],[1,"\\n"],[41,[28,[37,9],[[30,3,["length"]],0],null],[[[1,"    "],[10,2],[12],[1,"\\n      Binding rules allow an operator to express a systematic way of automatically linking roles and service identities to newly created tokens without operator intervention.\\n    "],[13],[1,"\\n    "],[10,2],[12],[1,"\\n      Successful authentication with an auth method returns a set of trusted identity attributes corresponding to the authenticated identity. Those attributes are matched against all configured binding rules for that auth method to determine what privileges to grant the Consul ACL token it will ultimately create.\\n    "],[13],[1,"\\n    "],[10,"hr"],[12],[13],[1,"\\n"],[42,[28,[37,11],[[28,[37,11],[[30,3]],null]],null],null,[[[1,"      "],[8,[39,12],null,[["@item"],[[30,4]]],null],[1,"\\n      "],[10,"hr"],[12],[13],[1,"\\n"]],[4]],null]],[]],[[[1,"    "],[8,[39,13],null,null,[["default"],[[[[1,"\\n      "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"h2"],[12],[1,"\\n          "],[1,[28,[35,14],["routes.dc.acls.auth-methods.show.binding-rules.index.empty.header"],null]],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n        "],[1,[28,[35,14],["routes.dc.acls.auth-methods.show.binding-rules.index.empty.body"],[["htmlSafe"],[true]]]],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n        "],[10,"li"],[14,0,"docs-link"],[12],[1,"\\n          "],[10,3],[15,6,[29,[[28,[37,15],["CONSUL_DOCS_API_URL"],null],"/acl/binding-rules"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"Read the documentation"],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[]]],[1,"  "],[13],[1,"\\n"]],[3]]],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","loader","items","item"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","let","if","gt","each","-track-array","consul/auth-method/binding-list","empty-state","t","env"]]',moduleName:"consul-ui/templates/dc/acls/auth-methods/show/binding-rules.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/auth-methods/show/nspace-rules",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"L5CJq4k2",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n"],[44,[[30,1,["model","item"]]],[[[1,"  "],[10,0],[14,0,"tab-section"],[12],[1,"\\n"],[41,[28,[37,4],[[30,2,["NamespaceRules","length"]],0],null],[[[1,"    "],[10,2],[12],[1,"\\n      A set of rules that can control which namespace tokens created via this auth method will be created within. Unlike binding rules, the first matching namespace rule wins.\\n    "],[13],[1,"\\n    "],[8,[39,5],null,[["@items"],[[30,2,["NamespaceRules"]]]],null],[1,"\\n"]],[]],[[[1,"    "],[8,[39,6],null,null,[["default"],[[[[1,"\\n      "],[8,[39,7],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"h2"],[12],[1,"\\n          "],[1,[28,[35,8],[[28,[37,9],[[30,1,["t"]],"empty.header"],null]],null]],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,7],null,[["@name"],["body"]],[["default"],[[[[1,"\\n        "],[1,[28,[35,8],[[28,[37,9],[[30,1,["t"]],"empty.body",[28,[37,10],null,[["htmlSafe"],[true]]]],null]],null]],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,7],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n        "],[10,"li"],[14,0,"docs-link"],[12],[1,"\\n          "],[10,3],[15,6,[29,[[28,[37,11],["CONSUL_DOCS_API_URL"],null],"/acl/auth-methods#namespacerules"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[1,"Read the documentation"],[13],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[]]],[1,"  "],[13],[1,"\\n"]],[2]]]],[1]]]]],[1,"\\n"]],["route","item"],false,["route","routeName","let","if","gt","consul/auth-method/nspace-list","empty-state","block-slot","compute","fn","hash","env"]]',moduleName:"consul-ui/templates/dc/acls/auth-methods/show/nspace-rules.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"kWA9U8QS",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[1,[28,[35,2],[[28,[37,3],["replaceWith","dc.acls.tokens"],null]],null]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route"],false,["route","routeName","did-insert","route-action"]]',moduleName:"consul-ui/templates/dc/acls/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/policies/-form",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"k8B3pmJI",block:'[[[10,"form"],[12],[1,"\\n  "],[8,[39,0],null,[["@form","@partition","@nspace","@item"],[[99,1,["@form"]],[99,2,["@partition"]],[99,3,["@nspace"]],[99,4,["@item"]]]],[["default"],[[[[1,"\\n"],[1,"    "],[8,[39,5],null,[["@name"],["template"]],null],[1,"\\n  "]],[]]]]],[1,"\\n"],[41,[28,[37,7],[[33,8]],null],[[[1,"    "],[8,[39,9],null,[["@src","@onchange"],[[28,[37,10],["/${partition}/${nspace}/${dc}/tokens/for-policy/${id}",[28,[37,11],null,[["partition","nspace","dc","id"],[[33,2],[33,3],[33,12],[28,[37,13],[[33,14],""],null]]]]],null],[28,[37,15],[[30,0],[28,[37,16],[[33,17]],null]],[["value"],["data"]]]]],null],[1,"\\n"],[41,[28,[37,18],[[33,17,["length"]],0],null],[[[1,"      "],[8,[39,19],null,[["@caption","@items"],["Applied to the following tokens:",[99,17,["@items"]]]],null],[1,"\\n"]],[]],null]],[]],null],[1,"    "],[10,0],[12],[1,"\\n      "],[8,[39,20],null,null,[["default"],[[[[1,"\\n"],[41,[28,[37,21],[[33,8],[28,[37,22],["create tokens"],null]],null],[[[1,"          "],[8,[39,23],[[16,"disabled",[52,[28,[37,13],[[33,4,["isPristine"]],[33,4,["isInvalid"]],[28,[37,24],[[33,4,["Name"]],""],null]],null],"disabled"]],[24,4,"submit"],[4,[38,25],["click",[28,[37,26],["create",[33,4]],null]],null]],[["@text"],["Save"]],null],[1,"\\n"]],[]],[[[41,[28,[37,22],["write policy"],[["item"],[[33,4]]]],[[[1,"            "],[8,[39,23],[[16,"disabled",[52,[33,4,["isInvalid"]],"disabled"]],[24,4,"submit"],[4,[38,25],["click",[28,[37,26],["update",[33,4]],null]],null]],[["@text"],["Save"]],null],[1,"\\n"]],[]],null]],[]]],[1,"        "],[8,[39,23],[[24,4,"reset"],[4,[38,15],[[30,0],"cancel",[33,4]],null]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n"],[41,[28,[37,21],[[28,[37,7],[[33,8]],null],[28,[37,22],["delete policy"],[["item"],[[33,4]]]]],null],[[[1,"          "],[8,[39,27],null,[["@message"],["Are you sure you want to delete this Policy?"]],[["default"],[[[[1,"\\n            "],[8,[39,5],null,[["@name"],["action"]],[["default"],[[[[1,"\\n              "],[8,[39,23],[[4,[38,15],[[30,0],[30,1],"delete",[33,4]],null]],[["@text","@color"],["Delete","critical"]],null],[1,"\\n            "]],[1]]]]],[1,"\\n            "],[8,[39,5],null,[["@name"],["dialog"]],[["default"],[[[[1,"\\n"],[41,[28,[37,18],[[33,17,["length"]],0],null],[[[1,"                "],[8,[39,28],null,[["@onclose","@open","@aria"],[[28,[37,15],[[30,0],[30,3]],null],true,[28,[37,11],null,[["label"],["Policy in Use"]]]]],[["default"],[[[[1,"\\n                  "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                    "],[10,"h2"],[12],[1,"Policy in Use"],[13],[1,"\\n                  "]],[]]]]],[1,"\\n                  "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                    "],[10,2],[12],[1,"\\n                      This Policy is currently in use. If you choose to delete this Policy, it will be removed from the\\n                      following "],[10,"strong"],[12],[1,[33,17,["length"]]],[1," Tokens"],[13],[1,":\\n                    "],[13],[1,"\\n                    "],[8,[39,19],null,[["@items","@target"],[[99,17,["@items"]],"_blank"]],null],[1,"\\n                    "],[10,2],[12],[1,"\\n                      This action cannot be undone. "],[1,[30,4]],[1,"\\n                    "],[13],[1,"\\n                  "]],[]]]]],[1,"\\n                  "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                    "],[8,[39,20],null,null,[["default"],[[[[1,"\\n                      "],[8,[39,23],[[4,[38,15],[[30,0],[30,2]],null]],[["@text","@color"],["Yes, Delete","critical"]],null],[1,"\\n                      "],[8,[39,23],[[4,[38,15],[[30,0],[30,5]],null]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n                    "]],[]]]]],[1,"\\n                  "]],[5]]]]],[1,"\\n                "]],[]]]]],[1,"\\n"]],[]],[[[1,"                "],[8,[39,29],null,[["@message","@execute","@cancel"],[[30,4],[30,2],[30,3]]],null],[1,"\\n"]],[]]],[1,"            "]],[2,3,4]]]]],[1,"\\n          "]],[]]]]],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n    "],[13],[1,"\\n"],[13],[1,"\\n"]],["confirm","execute","cancel","message","close"],false,["policy-form","form","partition","nspace","item","block-slot","if","not","create","data-source","uri","hash","dc","or","id","action","mut","items","gt","token-list","hds/button-set","and","can","hds/button","eq","on","route-action","confirmation-dialog","modal-dialog","delete-confirmation"]]',moduleName:"consul-ui/templates/dc/acls/policies/-form.hbs",isStrictMode:!1})
-e.default=n}))
-define("consul-ui/templates/dc/acls/policies/edit",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"zMcjLQlh",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/policy/${id}",[28,[37,4],null,[["partition","nspace","dc","id"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[28,[37,5],[[30,1,["params","id"]],""],null]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["error"]],[["default"],[[[[1,"\\n"],[41,[28,[37,8],[[30,2,["error","status"]],"401"],null],[[[1,"        "],[8,[39,9],null,null,null],[1,"\\n"]],[]],[[[1,"        "],[8,[39,10],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n"]],[]]],[1,"    "]],[]]]]],[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,1,["params","dc"]],[30,1,["params","partition"]],[30,1,["params","nspace"]],[28,[37,5],[[30,1,["params","id"]],""],null],[30,2,["data"]],[30,2,["data","isNew"]]],[[[1,"  "],[8,[39,12],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n          "],[10,"ol"],[12],[1,"\\n              "],[10,"li"],[12],[10,3],[15,6,[28,[37,13],["dc.acls.policies"],null]],[12],[1,"All Policies"],[13],[13],[1,"\\n          "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["header"]],[["default"],[[[[1,"\\n          "],[10,"h1"],[12],[1,"\\n"],[41,[30,8],[[[1,"            "],[8,[30,1,["Title"]],null,[["@title"],["New Policy"]],null],[1,"\\n"]],[]],[[[41,[28,[37,14],["write policy"],[["item"],[[30,7]]]],[[[1,"            "],[8,[30,1,["Title"]],null,[["@title"],["Edit Policy"]],null],[1,"\\n"]],[]],[[[1,"            "],[8,[30,1,["Title"]],null,[["@title"],["View Policy"]],null],[1,"\\n"]],[]]]],[]]],[1,"          "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["content"]],[["default"],[[[[1,"\\n"],[41,[28,[37,15],[[30,8]],null],[[[1,"        "],[10,0],[14,0,"definition-table"],[12],[1,"\\n            "],[10,"dl"],[12],[1,"\\n              "],[10,"dt"],[12],[1,"Policy ID"],[13],[1,"\\n              "],[10,"dd"],[12],[1,"\\n                "],[8,[39,16],null,[["@value","@name"],[[30,7,["ID"]],"Policy ID"]],null],[1,"\\n              "],[13],[1,"\\n            "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[41,[28,[37,8],[[28,[37,17],[[30,7]],null],"policy-management"],null],[[[1,"    "],[8,[39,18],[[24,0,"mb-3 mt-2"]],[["@type","@icon"],["inline","star-fill"]],[["default"],[[[[1,"\\n      "],[8,[30,9,["Title"]],null,null,[["default"],[[[[1,"Management"]],[]]]]],[1,"\\n      "],[8,[30,9,["Description"]],null,null,[["default"],[[[[1,"This global-management token is built into Consul\'s policy system. You can apply this special policy to tokens for full access. This policy is not editable or removeable, but can be ignored by not applying it to any tokens."]],[]]]]],[1,"\\n      "],[8,[30,9,["Link::Standalone"]],null,[["@text","@href","@icon","@iconPosition"],["Learn more",[29,[[28,[37,19],["CONSUL_DOCS_URL"],null],"/guides/acl.html#builtin-policies"]],"docs-link","trailing"]],null],[1,"\\n    "]],[9]]]]],[1,"\\n    "],[10,0],[14,0,"definition-table"],[12],[1,"\\n      "],[10,"dl"],[12],[1,"\\n        "],[10,"dt"],[12],[1,"Name"],[13],[1,"\\n        "],[10,"dd"],[12],[1,[30,7,["Name"]]],[13],[1,"\\n        "],[10,"dt"],[12],[1,"Valid Datacenters"],[13],[1,"\\n        "],[10,"dd"],[12],[1,[28,[35,20],[", ",[28,[37,21],[[30,7]],null]],null]],[13],[1,"\\n        "],[10,"dt"],[12],[1,"Description"],[13],[1,"\\n        "],[10,"dd"],[12],[1,[30,7,["Description"]]],[13],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n    "],[8,[39,22],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/tokens/for-policy/${id}",[28,[37,4],null,[["partition","nspace","dc","id"],[[30,4],[30,5],[30,3],[30,6]]]]],null]]],[["default"],[[[[1,"\\n"],[41,[28,[37,23],[[30,10,["data","length"]],0],null],[[[1,"      "],[8,[39,24],null,[["@caption","@items"],["Applied to the following tokens:",[30,10,["data"]]]],null],[1,"\\n"]],[]],null],[1,"    "]],[10]]]]],[1,"\\n"]],[]],[[[1,"        "],[19,"dc/acls/policies/form",[1,2,3,4,5,6,7,8]],[1,"\\n"]],[]]],[1,"      "]],[]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[3,4,5,6,7,8]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]]],["route","loader","dc","partition","nspace","id","item","create","A","loader"],true,["route","routeName","data-loader","uri","hash","or","block-slot","if","eq","consul/acl/disabled","app-error","let","app-view","href-to","can","not","copyable-code","policy/typeof","hds/alert","env","join","policy/datacenters","data-source","gt","token-list","partial"]]',moduleName:"consul-ui/templates/dc/acls/policies/edit.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/policies/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"gfKx11yz",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/policies",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n"],[41,[28,[37,7],[[30,2,["error","status"]],"401"],null],[[[1,"      "],[8,[39,8],null,null,null],[1,"\\n"]],[]],[[[1,"      "],[8,[39,9],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n"]],[]]],[1,"    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,11],[[33,12],"Name:asc"],null],[28,[37,13],[[30,0],[28,[37,14],[[33,12]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["kind","datacenter","searchproperty"],[[28,[37,4],null,[["value","change"],[[52,[33,15],[28,[37,16],[[33,15],","],null],[27]],[28,[37,13],[[30,0],[28,[37,14],[[33,15]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change"],[[52,[33,17],[28,[37,16],[[33,17],","],null],[27]],[28,[37,13],[[30,0],[28,[37,14],[[33,17]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change","default"],[[52,[28,[37,18],[[33,19],[27]],null],[28,[37,16],[[33,19],","],null],[33,20]],[28,[37,13],[[30,0],[28,[37,14],[[33,19]],null]],[["value"],["target.selectedItems"]]],[33,20]]]]]]],[30,2,["data"]]],[[[1,"    "],[8,[39,21],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n      "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"h1"],[12],[1,"\\n          "],[8,[30,1,["Title"]],null,[["@title"],["Policies"]],null],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n"],[41,[28,[37,22],["create policies"],null],[[[1,"    "],[8,[39,23],null,[["@text","@route"],["Create","dc.acls.policies.create"]],null],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["toolbar"]],[["default"],[[[[1,"\\n"],[41,[28,[37,24],[[30,5,["length"]],0],null],[[[1,"        "],[8,[39,25],null,[["@partition","@search","@onsearch","@sort","@filter"],[[30,1,["params","partition"]],[99,26,["@search"]],[28,[37,13],[[30,0],[28,[37,14],[[33,26]],null]],[["value"],["target.value"]]],[30,3],[30,4]]],null],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n        "],[8,[39,27],null,[["@type","@sort","@filters","@search","@items"],["policy",[30,3,["value"]],[30,4],[99,26,["@search"]],[30,5]]],[["default"],[[[[1,"\\n          "],[8,[30,6,["Collection"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,28],null,[["@items","@ondelete"],[[30,6,["items"]],[28,[37,29],["delete"],null]]],null],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,6,["Empty"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,30],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n              "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                "],[10,"h2"],[12],[1,"\\n                  "],[1,[28,[35,31],["routes.dc.acls.policies.index.empty.header"],[["items"],[[30,5,["length"]]]]]],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[1,[28,[35,31],["routes.dc.acls.policies.index.empty.body"],[["items","htmlSafe"],[[30,5,["length"]],true]]]],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                "],[10,"li"],[12],[1,"\\n                  "],[8,[39,32],null,[["@text","@href","@icon","@iconPosition","@size"],["Documentation on policies",[29,[[28,[37,33],["CONSUL_DOCS_URL"],null],"/commands/acl/policy"]],"docs-link","trailing","small"]],null],[1,"\\n                "],[13],[1,"\\n                "],[10,"li"],[12],[1,"\\n                  "],[8,[39,32],null,[["@text","@href","@icon","@iconPosition","@size"],["Take the tutorial",[29,[[28,[37,33],["CONSUL_LEARN_URL"],null],"/consul/security-networking/managing-acl-policies"]],"learn-link","trailing","small"]],null],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[6]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n\\n"]],[3,4,5]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]]],["route","loader","sort","filters","items","collection"],false,["route","routeName","data-loader","uri","hash","block-slot","if","eq","consul/acl/disabled","app-error","let","or","sortBy","action","mut","kind","split","datacenter","not-eq","searchproperty","searchProperties","app-view","can","hds/button","gt","consul/policy/search-bar","search","data-collection","consul/policy/list","route-action","empty-state","t","hds/link/standalone","env"]]',moduleName:"consul-ui/templates/dc/acls/policies/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/roles/-form",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"V+NwcqN9",block:'[[[10,"form"],[12],[1,"\\n  "],[8,[39,0],null,[["@form","@item","@dc","@nspace","@partition"],[[99,1,["@form"]],[99,2,["@item"]],[99,3,["@dc"]],[99,4,["@nspace"]],[99,5,["@partition"]]]],null],[1,"\\n"],[41,[28,[37,7],[[33,8]],null],[[[1,"    "],[8,[39,9],null,[["@src"],[[28,[37,10],["/${partition}/${nspace}/${dc}/tokens/for-role/${id}",[28,[37,11],null,[["partition","nspace","dc","id"],[[33,5],[33,4],[33,3],[28,[37,12],[[33,13],""],null]]]]],null]]],[["default"],[[[[1,"\\n"],[41,[28,[37,14],[[30,1,["data","length"]],0],null],[[[1,"        "],[10,"h2"],[12],[1,"Where is this role used?"],[13],[1,"\\n        "],[10,2],[12],[1,"\\n          We\'re only able to show information for the primary datacenter and the current datacenter. This list may not\\n          show every case where this role is applied.\\n        "],[13],[1,"\\n        "],[8,[39,15],null,[["@caption","@items"],["Tokens",[30,1,["data"]]]],null],[1,"\\n"]],[]],null],[1,"    "]],[1]]]]],[1,"\\n"]],[]],null],[1,"  "],[10,0],[12],[1,"\\n    "],[8,[39,16],null,null,[["default"],[[[[1,"\\n"],[41,[28,[37,17],[[33,8],[28,[37,18],["create roles"],null]],null],[[[1,"        "],[8,[39,19],[[16,"disabled",[28,[37,12],[[33,2,["isPristine"]],[33,2,["isInvalid"]],[28,[37,20],[[33,2,["Name"]],""],null]],null]],[24,4,"submit"],[4,[38,21],["click",[28,[37,22],["create",[33,2]],null]],null]],[["@text"],["Save"]],null],[1,"\\n"]],[]],[[[41,[28,[37,18],["write role"],[["item"],[[33,2]]]],[[[1,"          "],[8,[39,19],[[16,"disabled",[33,2,["isInvalid"]]],[24,4,"submit"],[4,[38,21],["click",[28,[37,22],["update",[33,2]],null]],null]],[["@text"],["Save"]],null],[1,"\\n"]],[]],null]],[]]],[1,"      "],[8,[39,19],[[24,4,"reset"],[4,[38,23],[[30,0],"cancel",[33,2]],null]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n\\n"],[41,[28,[37,17],[[28,[37,7],[[33,8]],null],[28,[37,18],["delete role"],[["item"],[[33,2]]]]],null],[[[1,"        "],[8,[39,24],null,[["@message"],["Are you sure you want to delete this Role?"]],[["default"],[[[[1,"\\n          "],[8,[39,25],null,[["@name"],["action"]],[["default"],[[[[1,"\\n            "],[8,[39,19],[[4,[38,23],[[30,0],[30,2],"delete",[33,2]],null]],[["@text","@color"],["Delete","critical"]],null],[1,"\\n          "]],[2]]]]],[1,"\\n          "],[8,[39,25],null,[["@name"],["dialog"]],[["default"],[[[[1,"\\n"],[41,[28,[37,14],[[33,26,["length"]],0],null],[[[1,"              "],[8,[39,27],null,[["@onclose","@aria"],[[28,[37,23],[[30,0],[30,4]],null],[28,[37,11],null,[["label"],["Role in Use"]]]]],[["default"],[[[[1,"\\n                "],[8,[39,25],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                  "],[10,"h2"],[12],[1,"Role in Use"],[13],[1,"\\n                "]],[]]]]],[1,"\\n                "],[8,[39,25],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                  "],[10,2],[12],[1,"\\n                    This Role is currently in use. If you choose to delete this Role, it will be removed from the\\n                    following "],[10,"strong"],[12],[1,[33,26,["length"]]],[1," Tokens"],[13],[1,":\\n                  "],[13],[1,"\\n                  "],[8,[39,15],null,[["@items","@target"],[[99,26,["@items"]],"_blank"]],null],[1,"\\n                  "],[10,2],[12],[1,"\\n                    This action cannot be undone. "],[1,[30,5]],[1,"\\n                  "],[13],[1,"\\n                "]],[]]]]],[1,"\\n                "],[8,[39,25],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                  "],[8,[39,16],null,null,[["default"],[[[[1,"\\n                    "],[8,[39,19],[[4,[38,23],[[30,0],[30,3]],null]],[["@text","@color"],["Yes, Delete","critical"]],null],[1,"\\n                    "],[8,[39,19],[[4,[38,23],[[30,0],[30,6]],null]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n                  "]],[]]]]],[1,"\\n                "]],[6]]]]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[]],[[[1,"              "],[8,[39,28],null,[["@message","@execute","@cancel"],[[30,5],[30,3],[30,4]]],null],[1,"\\n"]],[]]],[1,"          "]],[3,4,5]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[1,"    "]],[]]]]],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n"]],["loader","confirm","execute","cancel","message","close"],false,["role-form","form","item","dc","nspace","partition","if","not","create","data-source","uri","hash","or","id","gt","token-list","hds/button-set","and","can","hds/button","eq","on","route-action","action","confirmation-dialog","block-slot","items","modal-dialog","delete-confirmation"]]',moduleName:"consul-ui/templates/dc/acls/roles/-form.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/roles/edit",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"J3r9dfLo",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/role/${id}",[28,[37,4],null,[["partition","nspace","dc","id"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[28,[37,5],[[30,1,["params","id"]],""],null]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["error"]],[["default"],[[[[1,"\\n"],[41,[28,[37,8],[[30,2,["error","status"]],"401"],null],[[[1,"        "],[8,[39,9],null,null,null],[1,"\\n"]],[]],[[[1,"        "],[8,[39,10],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n"]],[]]],[1,"    "]],[]]]]],[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,1,["params","dc"]],[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,2,["data"]],[30,2,["data","isNew"]]],[[[1,"  "],[8,[39,12],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n          "],[10,"ol"],[12],[1,"\\n              "],[10,"li"],[12],[10,3],[15,6,[28,[37,13],["dc.acls.roles"],null]],[12],[1,"All Roles"],[13],[13],[1,"\\n          "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["header"]],[["default"],[[[[1,"\\n          "],[10,"h1"],[12],[1,"\\n"],[41,[30,7],[[[1,"              "],[8,[30,1,["Title"]],null,[["@title"],["New Role"]],null],[1,"\\n"]],[]],[[[1,"              "],[8,[30,1,["Title"]],null,[["@title"],["Edit Role"]],null],[1,"\\n"]],[]]],[1,"          "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["content"]],[["default"],[[[[1,"\\n"],[41,[28,[37,14],[[30,7]],null],[[[1,"        "],[10,0],[14,0,"definition-table"],[12],[1,"\\n            "],[10,"dl"],[12],[1,"\\n              "],[10,"dt"],[12],[1,"Role ID"],[13],[1,"\\n              "],[10,"dd"],[12],[1,"\\n                "],[8,[39,15],null,[["@value","@name"],[[30,6,["ID"]],"Role ID"]],null],[1,"\\n              "],[13],[1,"\\n            "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[1,"        "],[19,"dc/acls/roles/form",[1,2,3,4,5,6,7]],[1,"\\n      "]],[]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[3,4,5,6,7]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]]],["route","loader","dc","partition","nspace","item","create"],true,["route","routeName","data-loader","uri","hash","or","block-slot","if","eq","consul/acl/disabled","app-error","let","app-view","href-to","not","copyable-code","partial"]]',moduleName:"consul-ui/templates/dc/acls/roles/edit.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/roles/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"nMIoNCst",block:'[[[8,[39,0],null,[["@name","@title"],[[99,1,["@name"]],"Roles"]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/roles",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n"],[41,[28,[37,7],[[30,2,["error","status"]],"401"],null],[[[1,"      "],[8,[39,8],null,null,null],[1,"\\n"]],[]],[[[1,"      "],[8,[39,9],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n"]],[]]],[1,"    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,11],[[33,12],"Name:asc"],null],[28,[37,13],[[30,0],[28,[37,14],[[33,12]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["searchproperty"],[[28,[37,4],null,[["value","change","default"],[[52,[28,[37,15],[[33,16],[27]],null],[28,[37,17],[[33,16],","],null],[33,18]],[28,[37,13],[[30,0],[28,[37,14],[[33,16]],null]],[["value"],["target.selectedItems"]]],[33,18]]]]]]],[30,2,["data"]]],[[[1,"\\n    "],[8,[39,19],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n      "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"h1"],[12],[1,"\\n          "],[8,[30,1,["Title"]],null,[["@title"],["Roles"]],null],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n"],[41,[28,[37,20],["create roles"],null],[[[1,"      "],[8,[39,21],null,[["@text","@route"],["Create","dc.acls.roles.create"]],null],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["toolbar"]],[["default"],[[[[1,"\\n"],[41,[28,[37,22],[[30,5,["length"]],0],null],[[[1,"        "],[8,[39,23],null,[["@search","@onsearch","@sort","@filter"],[[99,24,["@search"]],[28,[37,13],[[30,0],[28,[37,14],[[33,24]],null]],[["value"],["target.value"]]],[30,3],[30,4]]],null],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n        "],[8,[39,25],null,[["@type","@sort","@filters","@search","@items"],["role",[30,3,["value"]],[30,4],[99,24,["@search"]],[30,5]]],[["default"],[[[[1,"\\n          "],[8,[30,6,["Collection"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,26],null,[["@items","@ondelete"],[[30,6,["items"]],[28,[37,27],["delete"],null]]],null],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,6,["Empty"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,28],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n              "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                "],[10,"h2"],[12],[1,"\\n                  "],[1,[28,[35,29],["routes.dc.acls.roles.index.empty.header"],[["items"],[[30,5,["length"]]]]]],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[1,[28,[35,29],["routes.dc.acls.roles.index.empty.body"],[["items","htmlSafe"],[[30,5,["length"]],true]]]],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                "],[10,"li"],[12],[1,"\\n                  "],[8,[39,30],null,[["@text","@href","@icon","@iconPosition","@size"],["Documentation on roles",[29,[[28,[37,31],["CONSUL_DOCS_URL"],null],"/commands/acl/role"]],"docs-link","trailing","small"]],null],[1,"\\n                "],[13],[1,"\\n                "],[10,"li"],[12],[1,"\\n                  "],[8,[39,30],null,[["@text","@href","@icon","@iconPosition","@size"],["Read the API Docs",[29,[[28,[37,31],["CONSUL_DOCS_API_URL"],null],"/acl/roles.html"]],"learn-link","trailing","small"]],null],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[6]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[3,4,5]]],[1,"  "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]]],["route","loader","sort","filters","items","collection"],false,["route","routeName","data-loader","uri","hash","block-slot","if","eq","consul/acl/disabled","app-error","let","or","sortBy","action","mut","not-eq","searchproperty","split","searchProperties","app-view","can","hds/button","gt","consul/role/search-bar","search","data-collection","consul/role/list","route-action","empty-state","t","hds/link/standalone","env"]]',moduleName:"consul-ui/templates/dc/acls/roles/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/tokens/-fieldsets-legacy",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"igHmo1ap",block:'[[[1,"    "],[10,"fieldset"],[15,"disabled",[52,[28,[37,1],[[28,[37,2],["write token"],[["item"],[[33,3]]]]],null],"disabled"]],[12],[1,"\\n        "],[10,"label"],[15,0,[29,["type-text",[52,[33,3,["error","Name"]]," has-error"]]]],[12],[1,"\\n            "],[10,1],[12],[1,"Name"],[13],[1,"\\n            "],[8,[39,4],null,[["@value","@name","@autofocus"],[[33,3,["Description"]],"name","autofocus"]],null],[1,"\\n        "],[13],[1,"\\n"],[41,false,[[[1,"        "],[10,0],[14,"role","radiogroup"],[15,0,[52,[33,3,["error","Type"]]," has-error"]],[12],[1,"\\n"],[42,[28,[37,6],[[28,[37,6],[[28,[37,7],["management","client"],null]],null]],null],null,[[[1,"                "],[10,"label"],[12],[1,"\\n                    "],[10,1],[12],[1,[28,[35,8],[[30,1]],null]],[13],[1,"\\n                    "],[10,"input"],[14,3,"Type"],[15,2,[29,[[30,1]]]],[15,"checked",[52,[28,[37,9],[[33,3,["Type"]],[30,1]],null],"checked"]],[15,"onchange",[28,[37,10],[[30,0],"change"],null]],[14,4,"radio"],[12],[13],[1,"\\n                "],[13],[1,"\\n"]],[1]],null],[1,"        "],[13],[1,"\\n"]],[]],null],[1,"        "],[10,"label"],[14,0,"type-text"],[12],[1,"\\n            "],[8,[39,11],null,[["@class","@name","@syntax","@value","@onkeyup"],[[52,[33,3,["error","Rules"]],"error"],"Rules","hcl",[33,3,["Rules"]],[28,[37,10],[[30,0],"change","Rules"],null]]],[["label"],[[[[1,"\\n                    Rules "],[10,3],[15,6,[29,[[28,[37,12],["CONSUL_DOCS_URL"],null],"/guides/acl.html#rule-specification"]]],[14,"rel","help noopener noreferrer"],[14,"target","_blank"],[12],[1,"(HCL Format)"],[13],[1,"\\n                "]],[]]]]],[1,"\\n        "],[13],[1,"\\n"],[41,[33,13],[[[1,"        "],[10,"label"],[14,0,"type-text"],[12],[1,"\\n            "],[10,1],[12],[1,"ID"],[13],[1,"\\n            "],[8,[39,4],null,[["@value"],[[33,3,["ID"]]]],null],[1,"\\n            "],[10,"em"],[12],[1,"We\'ll generate a UUID if this field is left empty."],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[1,"    "],[13],[1,"\\n\\n"]],["type"],false,["if","not","can","item","input","each","-track-array","array","capitalize","eq","action","code-editor","env","create"]]',moduleName:"consul-ui/templates/dc/acls/tokens/-fieldsets-legacy.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/tokens/-fieldsets",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"DwYj+qxa",block:'[[[10,"fieldset"],[15,"disabled",[52,[28,[37,1],[[28,[37,2],["write token"],[["item"],[[33,3]]]]],null],"disabled"]],[12],[1,"\\n"],[41,[33,4],[[[1,"  "],[10,0],[14,0,"type-toggle"],[12],[1,"\\n    "],[10,"label"],[12],[1,"\\n      "],[10,"input"],[14,3,"Local"],[15,"checked",[52,[33,5],"checked"]],[15,"onchange",[28,[37,6],[[30,0],"change"],null]],[14,4,"checkbox"],[12],[13],[1,"\\n      "],[10,1],[12],[1,"Restrict this token to a local datacenter?"],[13],[1,"\\n    "],[13],[1,"\\n    "],[10,"em"],[12],[1,"Local tokens get set in the Raft store of the local DC and do not ever get transmitted to the primary DC or replicated to any other DC."],[13],[1,"\\n  "],[13],[1,"\\n"]],[]],null],[1,"  "],[10,"label"],[14,0,"type-text validate-optional"],[12],[1,"\\n    "],[10,1],[12],[1,"Description (Optional)"],[13],[1,"\\n    "],[10,"textarea"],[14,3,"Description"],[15,"oninput",[28,[37,6],[[30,0],"change"],null]],[12],[1,[33,3,["Description"]]],[13],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n"],[10,"fieldset"],[14,1,"roles"],[12],[1,"\\n  "],[10,"h2"],[12],[1,"Roles"],[13],[1,"\\n  "],[8,[39,7],null,[["@disabled","@dc","@partition","@nspace","@items"],[[28,[37,1],[[28,[37,2],["write token"],[["item"],[[33,3]]]]],null],[99,8,["@dc"]],[99,9,["@partition"]],[99,10,["@nspace"]],[33,3,["Roles"]]]],null],[1,"\\n"],[13],[1,"\\n"],[10,"fieldset"],[14,1,"policies"],[12],[1,"\\n  "],[10,"h2"],[12],[1,"Policies"],[13],[1,"\\n  "],[8,[39,11],null,[["@disabled","@dc","@partition","@nspace","@items"],[[28,[37,1],[[28,[37,2],["write token"],[["item"],[[33,3]]]]],null],[99,8,["@dc"]],[99,9,["@partition"]],[99,10,["@nspace"]],[33,3,["Policies"]]]],null],[1,"\\n"],[13],[1,"\\n"]],[],false,["if","not","can","item","create","Local","action","role-selector","dc","partition","nspace","policy-selector"]]',moduleName:"consul-ui/templates/dc/acls/tokens/-fieldsets.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/tokens/-form",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"3VM7Ab9v",block:'[[[10,"form"],[12],[1,"\\n"],[41,[28,[37,1],[[28,[37,2],[[33,3]],null]],null],[[[1,"    "],[19,"dc/acls/tokens/fieldsets",[]],[1,"\\n"]],[]],[[[1,"    "],[19,"dc/acls/tokens/fieldsets-legacy",[]],[1,"\\n"]],[]]],[1,"  "],[10,0],[12],[1,"\\n    "],[8,[39,5],null,null,[["default"],[[[[1,"\\n"],[41,[28,[37,6],[[33,7],[28,[37,8],["create tokens"],null]],null],[[[1,"        "],[8,[39,9],[[16,"disabled",[52,[28,[37,10],[[28,[37,6],[[28,[37,2],[[33,3]],null],[33,3,["isPristine"]]],null],[33,3,["isInvalid"]]],null],"disabled"]],[24,4,"submit"],[4,[38,11],["click",[28,[37,12],["create",[33,3]],null]],null]],[["@text"],["Save"]],null],[1,"\\n"]],[]],[[[41,[28,[37,8],["write token"],[["item"],[[33,3]]]],[[[1,"          "],[8,[39,9],[[16,"disabled",[52,[33,3,["isInvalid"]],"disabled"]],[24,4,"submit"],[4,[38,11],["click",[28,[37,12],["update",[33,3]],null]],null]],[["@text"],["Save"]],null],[1,"\\n"]],[]],null]],[]]],[1,"      "],[8,[39,9],[[24,4,"reset"],[4,[38,13],[[30,0],"cancel",[33,3]],null]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n"],[41,[28,[37,6],[[28,[37,1],[[33,7]],null],[28,[37,8],["delete token"],[["item","token"],[[33,3],[33,14]]]]],null],[[[1,"        "],[8,[39,15],null,[["@message"],["Are you sure you want to delete this Token?"]],[["default"],[[[[1,"\\n          "],[8,[39,16],null,[["@name"],["action"]],[["default"],[[[[1,"\\n            "],[8,[39,9],[[4,[38,13],[[30,0],[30,1],"delete",[33,3]],null]],[["@text","@color"],["Delete","critical"]],null],[1,"\\n          "]],[1]]]]],[1,"\\n          "],[8,[39,16],null,[["@name"],["dialog"]],[["default"],[[[[1,"\\n            "],[8,[39,17],null,[["@message","@execute","@cancel"],[[30,4],[30,2],[30,3]]],null],[1,"\\n          "]],[2,3,4]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[1,"    "]],[]]]]],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n"]],["confirm","execute","cancel","message"],true,["if","not","token/is-legacy","item","partial","hds/button-set","and","create","can","hds/button","or","on","route-action","action","token","confirmation-dialog","block-slot","delete-confirmation"]]',moduleName:"consul-ui/templates/dc/acls/tokens/-form.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/tokens/edit",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"VqbRsph6",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/token/${id}",[28,[37,4],null,[["partition","nspace","dc","id"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[28,[37,5],[[30,1,["params","id"]],""],null]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["error"]],[["default"],[[[[1,"\\n"],[41,[28,[37,8],[[30,2,["error","status"]],"401"],null],[[[1,"        "],[8,[39,9],null,null,null],[1,"\\n"]],[]],[[[1,"        "],[8,[39,10],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n"]],[]]],[1,"    "]],[]]]]],[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,1,["params","dc"]],[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,2,["data"]],[30,2,["data","isNew"]]],[[[1,"  "],[8,[39,12],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n          "],[10,"ol"],[12],[1,"\\n              "],[10,"li"],[12],[10,3],[15,6,[28,[37,13],["dc.acls.tokens"],null]],[12],[1,"All Tokens"],[13],[13],[1,"\\n          "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["header"]],[["default"],[[[[1,"\\n          "],[10,"h1"],[12],[1,"\\n"],[41,[30,7],[[[1,"              "],[8,[30,1,["Title"]],null,[["@title"],["New Token"]],null],[1,"\\n"]],[]],[[[1,"              "],[8,[30,1,["Title"]],null,[["@title"],["Edit Token"]],null],[1,"\\n"]],[]]],[1,"          "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n"],[41,[28,[37,14],[[30,7]],null],[[[1,"    "],[8,[39,15],null,null,[["default"],[[[[1,"\\n"],[41,[28,[37,16],[[30,6,["AccessorID"]],[33,17,["AccessorID"]]],null],[[[1,"        "],[8,[39,18],null,[["@message"],["Are you sure you want to use this ACL token?"]],[["default"],[[[[1,"\\n          "],[8,[39,6],null,[["@name"],["action"]],[["default"],[[[[1,"\\n            "],[8,[39,19],[[4,[38,20],[[30,0],[30,8],"use",[30,6]],null]],[["@text","@color"],["Use","secondary"]],null],[1,"\\n          "]],[8]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["dialog"]],[["default"],[[[[1,"\\n            "],[10,2],[12],[1,"\\n                "],[1,[30,11]],[1,"\\n            "],[13],[1,"\\n            "],[8,[39,15],null,null,[["default"],[[[[1,"\\n              "],[8,[39,19],[[4,[38,20],[[30,0],[30,9]],null]],[["@text","@color"],["Confirm Use","critical"]],null],[1,"\\n              "],[8,[39,19],[[4,[38,20],[[30,0],[30,10]],null]],[["@text","@color"],["Cancel","secondary"]],null],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[9,10,11]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[41,[28,[37,21],["duplicate token"],[["item"],[[30,6]]]],[[[1,"      "],[8,[39,19],[[4,[38,20],[[30,0],"clone",[30,6]],null]],[["@text","@color"],["Duplicate","secondary"]],null],[1,"\\n"]],[]],null],[1,"    "]],[]]]]],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["content"]],[["default"],[[[[1,"\\n"],[41,[28,[37,22],[[30,6]],null],[[[1,"            "],[8,[39,23],[[24,0,"mb-6"]],[["@type"],["inline"]],[["default"],[[[[1,"\\n              "],[8,[30,12,["Title"]],null,null,[["default"],[[[[1,"Update"]],[]]]]],[1,"\\n              "],[8,[30,12,["Description"]],null,null,[["default"],[[[[1,"We have upgraded our ACL system by allowing you to create reusable policies which you can then apply to tokens. Don\'t worry, even though this token was written in the old style, it is still valid. However, we do recommend upgrading your old tokens to the new style."]],[]]]]],[1,"\\n              "],[8,[30,12,["Link::Standalone"]],null,[["@text","@href","@icon","@iconPosition"],["Learn more",[29,[[28,[37,24],["CONSUL_DOCS_URL"],null],"/guides/acl-migrate-tokens.html"]],"docs-link","trailing"]],null],[1,"\\n            "]],[12]]]]],[1,"\\n"]],[]],null],[41,[28,[37,14],[[30,7]],null],[[[1,"        "],[10,0],[14,0,"definition-table"],[12],[1,"\\n            "],[10,"dl"],[12],[1,"\\n              "],[10,"dt"],[12],[1,"AccessorID"],[13],[1,"\\n              "],[10,"dd"],[12],[1,"\\n                "],[8,[39,25],null,[["@value","@name"],[[30,6,["AccessorID"]],"AccessorID"]],null],[1,"\\n              "],[13],[1,"\\n              "],[10,"dt"],[12],[1,"Token"],[13],[1,"\\n              "],[10,"dd"],[12],[1,"\\n                "],[8,[39,25],null,[["@obfuscated","@value","@name"],[true,[30,6,["SecretID"]],"Token"]],null],[1,"\\n              "],[13],[1,"\\n"],[41,[28,[37,26],[[28,[37,14],[[28,[37,22],[[30,6]],null]],null],[28,[37,14],[[30,7]],null]],null],[[[1,"              "],[10,"dt"],[12],[1,"Scope"],[13],[1,"\\n              "],[10,"dd"],[12],[1,"\\n                "],[1,[52,[30,6,["Local"]],"local","global"]],[1,"\\n              "],[13],[1,"\\n"]],[]],null],[1,"            "],[13],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[1,"          "],[19,"dc/acls/tokens/form",[1,2,3,4,5,6,7]],[1,"\\n      "]],[]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[3,4,5,6,7]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]]],["route","loader","dc","partition","nspace","item","create","confirm","execute","cancel","message","A"],true,["route","routeName","data-loader","uri","hash","or","block-slot","if","eq","consul/acl/disabled","app-error","let","app-view","href-to","not","hds/button-set","not-eq","token","confirmation-dialog","hds/button","action","can","token/is-legacy","hds/alert","env","copyable-code","and","partial"]]',moduleName:"consul-ui/templates/dc/acls/tokens/edit.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/acls/tokens/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"vndZHRNu",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/tokens",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n"],[41,[28,[37,7],[[30,2,["error","status"]],"401"],null],[[[1,"      "],[8,[39,8],null,null,null],[1,"\\n"]],[]],[[[1,"      "],[8,[39,9],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n"]],[]]],[1,"    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,11],[[33,12],"CreateTime:desc"],null],[28,[37,13],[[30,0],[28,[37,14],[[33,12]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["kind","searchproperty"],[[28,[37,4],null,[["value","change"],[[52,[33,15],[28,[37,16],[[33,15],","],null],[27]],[28,[37,13],[[30,0],[28,[37,14],[[33,15]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change","default"],[[52,[28,[37,17],[[33,18],[27]],null],[28,[37,16],[[33,18],","],null],[33,19]],[28,[37,13],[[30,0],[28,[37,14],[[33,18]],null]],[["value"],["target.selectedItems"]]],[33,19]]]]]]],[30,2,["data"]]],[[[1,"\\n    "],[8,[39,20],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n      "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"h1"],[12],[1,"\\n          "],[8,[30,1,["Title"]],null,[["@title"],["Tokens"]],null],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n"],[41,[28,[37,21],["create tokens"],null],[[[1,"    "],[8,[39,22],null,[["@text","@route"],["Create","dc.acls.tokens.create"]],null],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["toolbar"]],[["default"],[[[[1,"\\n"],[41,[28,[37,23],[[30,5,["length"]],0],null],[[[1,"        "],[8,[39,24],null,[["@search","@onsearch","@sort","@filter"],[[99,25,["@search"]],[28,[37,13],[[30,0],[28,[37,14],[[33,25]],null]],[["value"],["target.value"]]],[30,3],[30,4]]],null],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n"],[41,[28,[37,26],[[30,5]],null],[[[1,"      "],[8,[39,27],[[24,0,"mb-3 mt-3"]],[["@type"],["inline"]],[["default"],[[[[1,"\\n        "],[8,[30,6,["Title"]],null,null,[["default"],[[[[1,"Update"]],[]]]]],[1,"\\n        "],[8,[30,6,["Description"]],null,null,[["default"],[[[[1,"We have upgraded our ACL System to allow the creation of reusable policies that can be applied to tokens. Read more about the changes and how to upgrade legacy tokens."]],[]]]]],[1,"\\n        "],[8,[30,6,["Link::Standalone"]],null,[["@text","@href","@icon","@iconPosition"],["Learn more",[29,[[28,[37,28],["CONSUL_DOCS_URL"],null],"/guides/acl-migrate-tokens.html"]],"docs-link","trailing"]],null],[1,"\\n      "]],[6]]]]],[1,"\\n"]],[]],null],[1,"        "],[8,[39,29],null,[["@type","@sort","@filters","@search","@items"],["token",[30,3,["value"]],[30,4],[99,25,["@search"]],[30,5]]],[["default"],[[[[1,"\\n          "],[8,[30,7,["Collection"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,30],null,[["@items","@token","@onuse","@ondelete","@onlogout","@onclone"],[[30,7,["items"]],[30,1,["model","user","token"]],[28,[37,31],["use"],null],[28,[37,31],["delete"],null],[28,[37,31],["logout"],null],[28,[37,31],["clone"],null]]],null],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,7,["Empty"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,32],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n              "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                "],[10,"h2"],[12],[1,"\\n                  "],[1,[28,[35,33],["routes.dc.acls.tokens.index.empty.header"],[["items"],[[30,5,["length"]]]]]],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[1,[28,[35,33],["routes.dc.acls.tokens.index.empty.body"],[["items","htmlSafe"],[[30,5,["length"]],true]]]],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[7]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[3,4,5]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","loader","sort","filters","items","A","collection"],false,["route","routeName","data-loader","uri","hash","block-slot","if","eq","consul/acl/disabled","app-error","let","or","sortBy","action","mut","kind","split","not-eq","searchproperty","searchProperties","app-view","can","hds/button","gt","consul/token/search-bar","search","token/is-legacy","hds/alert","env","data-collection","consul/token/list","route-action","empty-state","t"]]',moduleName:"consul-ui/templates/dc/acls/tokens/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/intentions/edit",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"APCDJQ0j",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/intention/${id}",[28,[37,4],null,[["partition","nspace","dc","id"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[28,[37,5],[[30,1,["params","intention_id"]],""],null]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["error"]],[["default"],[[[[1,"\\n        "],[8,[39,7],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,2,["data"]],[28,[37,9],[[28,[37,10],["write intention"],[["item"],[[30,2,["data"]]]]]],null]],[[[1,"  "],[8,[39,11],null,null,[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n          "],[10,"ol"],[12],[1,"\\n            "],[10,"li"],[12],[10,3],[15,6,[28,[37,12],["dc.intentions"],null]],[12],[1,"All Intentions"],[13],[13],[1,"\\n          "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["header"]],[["default"],[[[[1,"\\n          "],[10,"h1"],[12],[1,"\\n"],[41,[28,[37,9],[[30,4]],null],[[[41,[30,3,["ID"]],[[[1,"            "],[8,[30,1,["Title"]],null,[["@title"],["Edit Intention"]],null],[1,"\\n"]],[]],[[[1,"            "],[8,[30,1,["Title"]],null,[["@title"],["New Intention"]],null],[1,"\\n"]],[]]]],[]],[[[1,"            "],[8,[30,1,["Title"]],null,[["@title"],["View Intention"]],null],[1,"\\n"]],[]]],[1,"          "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["content"]],[["default"],[[[[1,"\\n        "],[8,[39,14],null,[["@readonly","@item","@dc","@nspace","@partition","@onsubmit"],[[30,4],[30,3],[30,1,["model","dc"]],[30,1,["params","nspace"]],[30,1,["params","partition"]],[28,[37,15],["transitionTo","dc.intentions.index",[28,[37,4],null,[["dc"],[[30,1,["params","dc"]]]]]],null]]],null],[1,"\\n      "]],[]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[3,4]]],[1,"  "]],[]]]]],[1,"\\n"]],[2]]]]],[1,"\\n"]],[1]]]]]],["route","loader","item","readOnly"],false,["route","routeName","data-loader","uri","hash","or","block-slot","app-error","let","not","can","app-view","href-to","if","consul/intention/form","route-action"]]',moduleName:"consul-ui/templates/dc/intentions/edit.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/intentions/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"MRCKg8a1",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/intentions",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,8],[[33,9],"Action:asc"],null],[28,[37,10],[[30,0],[28,[37,11],[[33,9]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["access","searchproperty"],[[28,[37,4],null,[["value","change"],[[52,[33,13],[28,[37,14],[[33,13],","],null],[27]],[28,[37,10],[[30,0],[28,[37,11],[[33,13]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change","default"],[[52,[28,[37,15],[[33,16],[27]],null],[28,[37,14],[[33,16],","],null],[33,17]],[28,[37,10],[[30,0],[28,[37,11],[[33,16]],null]],[["value"],["target.selectedItems"]]],[33,17]]]]]]],[30,2,["data"]]],[[[1,"\\n    "],[8,[39,18],null,null,[["default"],[[[[1,"\\n      "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n          "],[10,"h1"],[12],[1,"\\n            "],[8,[30,1,["Title"]],null,[["@title"],["Intentions"]],null],[1," "],[10,"em"],[12],[1,[28,[35,19],[[30,5,["length"]]],null]],[1," total"],[13],[1,"\\n          "],[13],[1,"\\n          "],[10,"label"],[14,"for","toolbar-toggle"],[12],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n"],[41,[28,[37,20],["create intentions"],null],[[[1,"    "],[8,[39,21],null,[["@text","@route"],["Create","dc.intentions.create"]],null],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["toolbar"]],[["default"],[[[[1,"\\n\\n"],[41,[28,[37,22],[[30,5,["length"]],0],null],[[[1,"        "],[8,[39,23],null,[["@search","@onsearch","@sort","@filter"],[[99,24,["@search"]],[28,[37,10],[[30,0],[28,[37,11],[[33,24]],null]],[["value"],["target.value"]]],[30,3],[30,4]]],null],[1,"\\n"]],[]],null],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n        "],[8,[39,25],null,[["@sink","@type","@ondelete"],[[28,[37,3],["/${partition}/${dc}/${nspace}/intention/",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null],"intention",[99,26,["@ondelete"]]]],[["default"],[[[[1,"\\n          "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n            "],[8,[39,27],null,[["@type","@sort","@filters","@search","@items"],["intention",[30,3,["value"]],[30,4],[99,24,["@search"]],[30,5]]],[["default"],[[[[1,"\\n              "],[8,[30,7,["Collection"]],null,null,[["default"],[[[[1,"\\n                "],[8,[39,28],null,[["@items","@delete"],[[30,7,["items"]],[30,6,["delete"]]]],[["default"],[[[[1,"\\n                    "],[8,[30,8,["CustomResourceNotice"]],null,null,null],[1,"\\n                    "],[8,[30,8,["Table"]],null,null,null],[1,"\\n                "]],[8]]]]],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[30,7,["Empty"]],null,null,[["default"],[[[[1,"\\n                "],[8,[39,29],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n                  "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                    "],[10,"h2"],[12],[1,"\\n                      "],[1,[28,[35,30],["routes.dc.intentions.index.empty.header"],[["items"],[[30,5,["length"]]]]]],[1,"\\n                    "],[13],[1,"\\n                  "]],[]]]]],[1,"\\n                  "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                    "],[1,[28,[35,30],["routes.dc.intentions.index.empty.body"],[["items","canUseACLs","htmlSafe"],[[30,5,["length"]],[28,[37,20],["use acls"],null],true]]]],[1,"\\n                  "]],[]]]]],[1,"\\n                  "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                    "],[10,"li"],[12],[1,"\\n                      "],[8,[39,31],null,[["@text","@href","@icon","@iconPosition","@size"],["Documentation on intentions",[29,[[28,[37,32],["CONSUL_DOCS_URL"],null],"/commands/intention"]],"docs-link","trailing","small"]],null],[1,"\\n                    "],[13],[1,"\\n                    "],[10,"li"],[12],[1,"\\n                      "],[8,[39,31],null,[["@text","@href","@icon","@iconPosition","@size"],["Take the tutorial",[29,[[28,[37,32],["CONSUL_DOCS_LEARN_URL"],null],"/consul/getting-started/connect"]],"learn-link","trailing","small"]],null],[1,"\\n                    "],[13],[1,"\\n                  "]],[]]]]],[1,"\\n                "]],[]]]]],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[7]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[6]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n\\n"]],[3,4,5]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]]],["route","api","sort","filters","items","writer","collection","list"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","let","or","sortBy","action","mut","if","access","split","not-eq","searchproperty","searchProperties","app-view","format-number","can","hds/button","gt","consul/intention/search-bar","search","data-writer","refresh-route","data-collection","consul/intention/list","empty-state","t","hds/link/standalone","env"]]',moduleName:"consul-ui/templates/dc/intentions/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/kv/edit",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"OKjbKUH/",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n\\n"],[44,["/"],[[[1,"\\n"],[44,[[28,[37,3],[[28,[37,4],[[30,2],[28,[37,5],[0,-1,[28,[37,6],[[30,1,["params","key"]],[30,2]],null]],null]],null],[30,2]],null]],[[[1,"\\n  "],[8,[39,7],null,[["@src"],[[28,[37,8],["/${partition}/${nspace}/${dc}/kv/${key}",[28,[37,9],null,[["partition","nspace","dc","key"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[52,[28,[37,11],[[33,1],"create"],null],"",[30,1,["params","key"]]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,12],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,13],null,[["@error","@login"],[[30,4,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,12],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,1,["params","dc"]],[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,4,["data"]]],[[[1,"\\n  "],[8,[39,14],null,null,[["default"],[[[[1,"\\n\\n    "],[8,[39,12],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n      "],[10,"ol"],[12],[1,"\\n        "],[10,"li"],[12],[1,"\\n          "],[8,[39,15],null,[["@href"],[[28,[37,16],["dc.kv.index"],null]]],[["default"],[[[[1,"\\n            Key / Values\\n          "]],[]]]]],[1,"\\n        "],[13],[1,"\\n"],[41,[28,[37,17],[[30,3],[30,2]],null],[[[1,"\\n"],[44,[[28,[37,6],[[30,3],[30,2]],null]],[[[1,"\\n"],[42,[28,[37,19],[[28,[37,19],[[30,9]],null]],null],null,[[[41,[28,[37,20],[[30,10,["length"]],0],null],[[[1,"          "],[10,"li"],[12],[1,"\\n            "],[8,[39,15],[[4,[38,15],[[30,0],[30,10]],null]],[["@href"],[[28,[37,16],["dc.kv.folder",[28,[37,4],["/",[28,[37,21],[[28,[37,5],[0,[28,[37,22],[[30,11],1],null],[30,9]],null],""],null]],null]],null]]],[["default"],[[[[1,"\\n              "],[1,[30,10]],[1,"\\n            "]],[]]]]],[1,"\\n          "],[13],[1,"\\n"]],[]],null]],[10,11]],null]],[9]]],[1,"\\n"]],[]],null],[1,"      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,12],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"h1"],[12],[1,"\\n"],[41,[28,[37,23],[[30,8,["Key"]],[28,[37,17],[[30,8,["Key"]],[30,3]],null]],null],[[[1,"          "],[8,[30,1,["Title"]],null,[["@title","@render"],["Edit Key / Value",false]],null],[1,"\\n          "],[1,[28,[35,24],[[30,8,["Key"]],[30,3]],null]],[1,"\\n"]],[]],[[[1,"          "],[8,[30,1,["Title"]],null,[["@title","@render"],["New Key / Value",true]],null],[1,"\\n"]],[]]],[1,"        "],[13],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,12],null,[["@name"],["content"]],[["default"],[[[[1,"\\n\\n"],[41,[30,8,["Session"]],[[[1,"    "],[8,[39,25],null,[["@type"],["kv"]],null],[1,"\\n"]],[]],null],[1,"\\n      "],[8,[39,26],null,[["@item","@dc","@nspace","@partition","@onsubmit","@parent"],[[30,8],[30,1,["params","dc"]],[30,1,["params","nspace"]],[30,1,["params","partition"]],[52,[28,[37,27],[[30,3],[30,2]],null],[28,[37,28],["dc.kv.index"],null],[28,[37,28],["dc.kv.folder",[30,3]],null]],[30,3]]],null],[1,"\\n\\n\\n"],[41,[28,[37,23],[[30,8,["Session"]]],null],[[[1,"      "],[8,[39,29],null,[["@src","@onchange"],[[28,[37,8],["/${partition}/${nspace}/${dc}/sessions/for-key/${id}",[28,[37,9],null,[["partition","nspace","dc","id"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,8,["Session"]]]]]],null],[28,[37,15],[[30,0],[28,[37,30],[[33,31]],null]],[["value"],["data"]]]]],null],[1,"\\n      "],[10,"h2"],[12],[1,"\\n        "],[8,[39,15],[[24,"rel","help"]],[["@href","@external"],[[28,[37,3],[[28,[37,32],["CONSUL_DOCS_URL"],null],"/internals/sessions.html#session-design"],null],true]],[["default"],[[[[1,"\\n          Lock Session\\n        "]],[]]]]],[1,"\\n      "],[13],[1,"\\n"],[41,[33,31,["ID"]],[[[1,"      "],[8,[39,33],null,[["@item","@ondelete"],[[99,31,["@item"]],[30,4,["invalidate"]]]],null],[1,"\\n"]],[]],null]],[]],null],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[5,6,7,8]]],[1,"    "]],[]]]]],[1,"\\n  "]],[4]]]]],[1,"\\n"]],[3]]]],[2]]]],[1]]]]],[1,"\\n"]],["route","separator","parentKey","loader","dc","partition","nspace","item","parts","breadcrumb","index"],false,["route","routeName","let","concat","join","slice","split","data-loader","uri","hash","if","string-ends-with","block-slot","app-error","app-view","action","href-to","not-eq","each","-track-array","gt","append","add","and","left-trim","consul/lock-session/notifications","consul/kv/form","eq","transition-to","data-source","mut","session","env","consul/lock-session/form"]]',moduleName:"consul-ui/templates/dc/kv/edit.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/kv/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"Vj7yxEy8",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src","@onchange"],[[28,[37,3],["/${partition}/${nspace}/${dc}/kv/${key}",[28,[37,4],null,[["partition","nspace","dc","key"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[28,[37,5],[[30,1,["params","key"]],"/"],null]]]]],null],[28,[37,6],[[30,0],[28,[37,7],[[33,8]],null]],[["value"],["data"]]]]],null],[1,"\\n  "],[8,[39,9],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/kvs/${key}",[28,[37,4],null,[["partition","nspace","dc","key"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[28,[37,5],[[30,1,["params","key"]],"/"],null]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,10],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,11],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n      "],[8,[39,10],null,[["@name"],["disconnected"]],[["default"],[[[[1,"\\n"],[41,[28,[37,13],[[30,2,["error","status"]],"404"],null],[[[1,"          "],[8,[39,14],[[4,[38,15],null,[["sticky"],[true]]]],[["@color"],["warning"]],[["default"],[[[[1,"\\n            "],[8,[30,4,["Title"]],null,null,[["default"],[[[[1,"Warning!"]],[]]]]],[1,"\\n            "],[8,[30,4,["Description"]],null,null,[["default"],[[[[1,"\\n              This KV or parent of this KV was deleted.\\n            "]],[]]]]],[1,"\\n          "]],[4]]]]],[1,"\\n"]],[]],[[[41,[28,[37,13],[[30,2,["error","status"]],"403"],null],[[[1,"          "],[8,[39,14],[[4,[38,15],null,[["sticky"],[true]]]],[["@color"],["critical"]],[["default"],[[[[1,"\\n            "],[8,[30,5,["Title"]],null,null,[["default"],[[[[1,"Error!"]],[]]]]],[1,"\\n            "],[8,[30,5,["Description"]],null,null,[["default"],[[[[1,"\\n              You no longer have access to this KV.\\n            "]],[]]]]],[1,"\\n          "]],[5]]]]],[1,"\\n"]],[]],[[[1,"          "],[8,[39,14],[[4,[38,15],null,[["sticky"],[true]]]],[["@color"],["warning"]],[["default"],[[[[1,"\\n            "],[8,[30,6,["Title"]],null,null,[["default"],[[[[1,"Warning!"]],[]]]]],[1,"\\n            "],[8,[30,6,["Description"]],null,null,[["default"],[[[[1,"\\n              An error was returned whilst loading this data, refresh to try again.\\n            "]],[]]]]],[1,"\\n          "]],[6]]]]],[1,"\\n        "]],[]]]],[]]],[1,"      "]],[3]]]]],[1,"\\n\\n    "],[8,[39,10],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,5],[[33,17],"Kind:asc"],null],[28,[37,6],[[30,0],[28,[37,7],[[33,17]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["kind"],[[28,[37,4],null,[["value","change"],[[52,[33,18],[28,[37,19],[[33,18],","],null],[27]],[28,[37,6],[[30,0],[28,[37,7],[[33,18]],null]],[["value"],["target.selectedItems"]]]]]]]]],[33,8],[30,2,["data"]]],[[[1,"    "],[8,[39,20],null,null,[["default"],[[[[1,"\\n"],[41,[28,[37,21],[[30,9,["Key"]],"/"],null],[[[1,"      "],[8,[39,10],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n        "],[10,"ol"],[12],[1,"\\n          "],[10,"li"],[12],[10,3],[15,6,[28,[37,22],["dc.kv"],null]],[12],[1,"Key / Values"],[13],[13],[1,"\\n"],[42,[28,[37,24],[[28,[37,24],[[28,[37,25],[0,-2,[28,[37,19],[[30,9,["Key"]],"/"],null]],null]],null]],null],null,[[[1,"          "],[10,"li"],[12],[11,3],[16,6,[28,[37,22],["dc.kv.folder",[28,[37,26],["/",[28,[37,27],[[28,[37,25],[0,[28,[37,28],[[30,12],1],null],[28,[37,19],[[30,9,["Key"]],"/"],null]],null],""],null]],null]],null]],[4,[38,29],[[30,11]],null],[12],[1,[30,11]],[13],[13],[1,"\\n"]],[11,12]],null],[1,"        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n"]],[]],null],[1,"      "],[8,[39,10],null,[["@name"],["header"]],[["default"],[[[[1,"\\n          "],[10,"h1"],[12],[1,"\\n"],[41,[28,[37,13],[[30,9,["Key"]],"/"],null],[[[1,"              "],[8,[30,1,["Title"]],null,[["@title"],["Key / Value"]],null],[1,"\\n"]],[]],[[[1,"              "],[8,[30,1,["Title"]],null,[["@title"],[[28,[37,30],[1,[28,[37,31],[1,[28,[37,32],[[28,[37,19],[[30,9,["Key"]],"/"],null]],null]],null]],null]]],null],[1,"\\n"]],[]]],[1,"          "],[13],[1,"\\n          "],[10,"label"],[14,"for","toolbar-toggle"],[12],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,10],null,[["@name"],["toolbar"]],[["default"],[[[[1,"\\n"],[41,[28,[37,33],[[30,10,["length"]],0],null],[[[1,"        "],[8,[39,34],null,[["@search","@onsearch","@sort","@filter"],[[99,35,["@search"]],[28,[37,6],[[30,0],[28,[37,7],[[33,35]],null]],[["value"],["target.value"]]],[30,7],[30,8]]],null],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,10],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n"],[41,[28,[37,36],["create kvs"],null],[[[41,[28,[37,37],[[30,9,["Key"]],[28,[37,21],[[30,9,["Key"]],"/"],null]],null],[[[1,"      "],[8,[39,38],null,[["@text","@isHrefExternal","@href"],["Create",false,[29,[[28,[37,22],["dc.kv.create",[30,9,["Key"]]],null]]]]],null],[1,"\\n"]],[]],[[[1,"      "],[8,[39,38],null,[["@text","@route"],["Create","dc.kv.root-create"]],null],[1,"\\n"]],[]]]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,10],null,[["@name"],["content"]],[["default"],[[[[1,"\\n        "],[8,[39,39],null,[["@sink","@type","@label","@ondelete"],[[28,[37,3],["/${partition}/${nspace}/${dc}/kv/",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null],"kv","key",[99,40,["@ondelete"]]]],[["default"],[[[[1,"\\n          "],[8,[39,10],null,[["@name"],["content"]],[["default"],[[[[1,"\\n            "],[8,[39,41],null,[["@type","@sort","@filters","@search","@items"],["kv",[30,7,["value"]],[30,8],[99,35,["@search"]],[30,10]]],[["default"],[[[[1,"\\n              "],[8,[30,14,["Collection"]],null,null,[["default"],[[[[1,"\\n                "],[8,[39,42],null,[["@items","@parent","@delete"],[[30,14,["items"]],[30,9],[30,13,["delete"]]]],null],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[30,14,["Empty"]],null,null,[["default"],[[[[1,"\\n                "],[8,[39,43],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n                  "],[8,[39,10],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                    "],[10,"h2"],[12],[1,"\\n                      "],[1,[28,[35,44],["routes.dc.kv.index.empty.header"],[["items"],[[30,10,["length"]]]]]],[1,"\\n                    "],[13],[1,"\\n                  "]],[]]]]],[1,"\\n                  "],[8,[39,10],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                    "],[1,[28,[35,44],["routes.dc.kv.index.empty.body"],[["items","canUseACLs","htmlSafe"],[[30,10,["length"]],[28,[37,36],["use acls"],null],true]]]],[1,"\\n                  "]],[]]]]],[1,"\\n                  "],[8,[39,10],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                    "],[10,"li"],[12],[1,"\\n                      "],[8,[39,45],null,[["@text","@href","@icon","@iconPosition","@size"],["Documentation on K/V",[29,[[28,[37,46],["CONSUL_DOCS_URL"],null],"/agent/kv"]],"docs-link","trailing","small"]],null],[1,"\\n                    "],[13],[1,"\\n                    "],[10,"li"],[12],[1,"\\n                      "],[8,[39,45],null,[["@text","@href","@icon","@iconPosition","@size"],["Take the tutorial",[29,[[28,[37,46],["CONSUL_DOCS_LEARN_URL"],null],"/consul/getting-started/kv"]],"learn-link","trailing","small"]],null],[1,"\\n                    "],[13],[1,"\\n                  "]],[]]]]],[1,"\\n                "]],[]]]]],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[14]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[13]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[7,8,9,10]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","loader","after","T","T","T","sort","filters","parent","items","breadcrumb","index","writer","collection"],false,["route","routeName","data-source","uri","hash","or","action","mut","parent","data-loader","block-slot","app-error","if","eq","hds/toast","notification","let","sortBy","kind","split","app-view","not-eq","href-to","each","-track-array","slice","join","append","add","tooltip","take","drop","reverse","gt","consul/kv/search-bar","search","can","and","hds/button","data-writer","refresh-route","data-collection","consul/kv/list","empty-state","t","hds/link/standalone","env"]]',moduleName:"consul-ui/templates/dc/kv/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/nodes/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"vxNtRU5K",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/leader",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/nodes",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n\\n      "],[8,[39,6],null,[["@name"],["error"]],[["default"],[[[[1,"\\n        "],[8,[39,7],null,[["@error","@login"],[[30,3,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n      "]],[]]]]],[1,"\\n\\n      "],[8,[39,6],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,9],[[33,10],"Status:asc"],null],[28,[37,11],[[30,0],[28,[37,12],[[33,10]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["status","searchproperty"],[[28,[37,4],null,[["value","change"],[[52,[33,14],[28,[37,15],[[33,14],","],null],[27]],[28,[37,11],[[30,0],[28,[37,12],[[33,14]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change","default"],[[52,[28,[37,16],[[33,17],[27]],null],[28,[37,15],[[33,17],","],null],[30,0,["_searchProperties"]]],[28,[37,11],[[30,0],[28,[37,12],[[33,17]],null]],[["value"],["target.selectedItems"]]],[30,0,["_searchProperties"]]]]]]]],[30,3,["data"]],[30,2,["data"]]],[[[44,[[28,[37,18],["Meta.synthetic-node",[30,6]],null]],[[[1,"            "],[8,[39,19],null,null,[["default"],[[[[1,"\\n              "],[8,[39,6],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                "],[10,"h1"],[12],[1,"\\n                  "],[8,[30,1,["Title"]],null,[["@title"],["Nodes"]],null],[1,"\\n                  "],[10,"em"],[12],[1,[28,[35,20],[[30,6,["length"]]],null]],[1," total"],[13],[1,"\\n                "],[13],[1,"\\n                "],[10,"label"],[14,"for","toolbar-toggle"],[12],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,6],null,[["@name"],["toolbar"]],[["default"],[[[[1,"\\n"],[41,[28,[37,21],[[30,8,["length"]],0],null],[[[1,"                  "],[8,[39,22],null,[["@search","@onsearch","@sort","@filter"],[[99,23,["@search"]],[28,[37,11],[[30,0],[28,[37,12],[[33,23]],null]],[["value"],["target.value"]]],[30,4],[30,5]]],null],[1,"\\n"]],[]],null],[1,"              "]],[]]]]],[1,"\\n              "],[8,[39,6],null,[["@name"],["content"]],[["default"],[[[[1,"\\n                "],[8,[39,24],null,[["@items","@filteredItems","@postfix"],[[30,6],[30,8],[28,[37,25],[[30,1,["params","partition"]],[30,1,["params","dc"]]],null]]],null],[1,"\\n                "],[8,[39,26],null,[["@type","@sort","@filters","@search","@items"],["node",[30,4,["value"]],[30,5],[99,23,["@search"]],[30,8]]],[["default"],[[[[1,"\\n                  "],[8,[30,9,["Collection"]],null,null,[["default"],[[[[1,"\\n                    "],[8,[39,27],null,[["@items","@leader"],[[30,9,["items"]],[30,7]]],null],[1,"\\n                  "]],[]]]]],[1,"\\n                  "],[8,[30,9,["Empty"]],null,null,[["default"],[[[[1,"\\n                    "],[8,[39,28],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n                      "],[8,[39,6],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                        "],[10,"h2"],[12],[1,"\\n                          "],[1,[28,[35,29],["routes.dc.nodes.index.empty.header"],[["items"],[[30,6,["length"]]]]]],[1,"\\n                        "],[13],[1,"\\n                      "]],[]]]]],[1,"\\n                      "],[8,[39,6],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                        "],[1,[28,[35,29],["routes.dc.nodes.index.empty.body"],[["items","canUseACLs","htmlSafe"],[[30,6,["length"]],[28,[37,30],["use acls"],null],true]]]],[1,"\\n                      "]],[]]]]],[1,"\\n                      "],[8,[39,6],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                        "],[10,"li"],[12],[1,"\\n                          "],[8,[39,31],null,[["@text","@href","@color","@icon","@iconPosition","@size"],[[28,[37,29],["routes.dc.nodes.index.empty.documentation"],null],[29,[[28,[37,32],["CONSUL_DOCS_DEVELOPER_URL"],null],"/agent"]],"tertiary","docs-link","trailing","small"]],null],[1,"\\n                        "],[13],[1,"\\n                        "],[10,"li"],[12],[1,"\\n                          "],[8,[39,31],null,[["@text","@href","@color","@icon","@iconPosition","@size"],[[28,[37,29],["routes.dc.nodes.index.empty.learn"],null],[29,[[28,[37,32],["CONSUL_DOCS_LEARN_URL"],null],"/tutorials/consul/deployment-guide?in=consul/production-deploy#configure-consul-agents"]],"tertiary","learn-link","trailing","small"]],null],[1,"\\n                        "],[13],[1,"\\n                      "]],[]]]]],[1,"\\n                    "]],[]]]]],[1,"\\n                  "]],[]]]]],[1,"\\n                "]],[9]]]]],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[]]]]],[1,"\\n"]],[8]]]],[4,5,6,7]]],[1,"      "]],[]]]]],[1,"\\n    "]],[3]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","leader","api","sort","filters","items","leader","filtered","collection"],false,["route","routeName","data-source","uri","hash","data-loader","block-slot","app-error","let","or","sortBy","action","mut","if","status","split","not-eq","searchproperty","reject-by","app-view","format-number","gt","consul/node/search-bar","search","consul/node/agentless-notice","concat","data-collection","consul/node/list","empty-state","t","can","hds/button","env"]]',moduleName:"consul-ui/templates/dc/nodes/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/nodes/show",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"14xgVgV5",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/coordinates/for-node/${name}",[28,[37,4],null,[["partition","nspace","dc","name"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","name"]]]]]],null]]],[["default"],[[[[1,"\\n  "],[8,[39,5],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/node/${name}/${peer}",[28,[37,4],null,[["partition","nspace","dc","name","peer"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","name"]],[30,1,["params","peer"]]]]]],null]]],[["default"],[[[[1,"\\n    "],[8,[39,6],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,7],null,[["@error","@login"],[[30,3,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["disconnected"]],[["default"],[[[[1,"\\n"],[41,[28,[37,9],[[30,3,["error","status"]],"404"],null],[[[1,"        "],[8,[39,10],[[4,[38,11],null,[["sticky"],[true]]]],[["@color"],["warning"]],[["default"],[[[[1,"\\n          "],[8,[30,5,["Title"]],null,null,[["default"],[[[[1,"Warning!"]],[]]]]],[1,"\\n          "],[8,[30,5,["Description"]],null,null,[["default"],[[[[1,"This node no longer exists in the catalog."]],[]]]]],[1,"\\n        "]],[5]]]]],[1,"\\n"]],[]],[[[41,[28,[37,9],[[30,3,["error","status"]],"403"],null],[[[1,"        "],[8,[39,10],[[4,[38,11],null,[["sticky"],[true]]]],[["@color"],["critical"]],[["default"],[[[[1,"\\n          "],[8,[30,6,["Title"]],null,null,[["default"],[[[[1,"Error!"]],[]]]]],[1,"\\n          "],[8,[30,6,["Description"]],null,null,[["default"],[[[[1,"You no longer have access to this node."]],[]]]]],[1,"\\n        "]],[6]]]]],[1,"\\n"]],[]],[[[1,"        "],[8,[39,10],[[4,[38,11],null,[["sticky"],[true]]]],[["@color"],["warning"]],[["default"],[[[[1,"\\n          "],[8,[30,7,["Title"]],null,null,[["default"],[[[[1,"Warning!"]],[]]]]],[1,"\\n          "],[8,[30,7,["Description"]],null,null,[["default"],[[[[1,"An error was returned whilst loading this data, refresh to try again."]],[]]]]],[1,"\\n        "]],[7]]]]],[1,"\\n      "]],[]]]],[]]],[1,"    "]],[4]]]]],[1,"\\n    "],[8,[39,6],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,3,["data"]],[30,2,["data"]]],[[[1,"      "],[8,[39,13],null,null,[["default"],[[[[1,"\\n          "],[8,[39,6],null,[["@name"],["notification"]],[["default"],[[[[1,"\\n            "],[8,[39,14],null,[["@type","@status"],[[30,11],[30,10]]],null],[1,"\\n          "]],[10,11]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n              "],[10,"ol"],[12],[1,"\\n                  "],[10,"li"],[12],[10,3],[15,6,[28,[37,15],["dc.nodes"],[["params"],[[28,[37,4],null,[["peer"],[[27]]]]]]]],[12],[1,"All Nodes"],[13],[13],[1,"\\n              "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["header"]],[["default"],[[[[1,"\\n              "],[10,"h1"],[12],[1,"\\n                "],[8,[30,1,["Title"]],null,[["@title"],[[30,8,["Node"]]]],null],[1,"\\n              "],[13],[1,"\\n              "],[10,"label"],[14,"for","toolbar-toggle"],[12],[13],[1,"\\n              "],[8,[39,16],null,[["@item"],[[30,8]]],null],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["nav"]],[["default"],[[[[1,"\\n            "],[8,[39,17],null,[["@items"],[[28,[37,18],[[28,[37,19],[[28,[37,4],null,[["label","href","selected"],[[28,[37,20],["routes.dc.nodes.show.healthchecks.title"],null],[28,[37,15],["dc.nodes.show.healthchecks"],null],[28,[37,21],["dc.nodes.show.healthchecks"],null]]]],[28,[37,4],null,[["label","href","selected"],[[28,[37,20],["routes.dc.nodes.show.services.title"],null],[28,[37,15],["dc.nodes.show.services"],null],[28,[37,21],["dc.nodes.show.services"],null]]]],[52,[30,9,["distances"]],[28,[37,4],null,[["label","href","selected"],[[28,[37,20],["routes.dc.nodes.show.rtt.title"],null],[28,[37,15],["dc.nodes.show.rtt"],null],[28,[37,21],["dc.nodes.show.rtt"],null]]]],""],[52,[28,[37,22],["read sessions"],null],[28,[37,4],null,[["label","href","selected"],[[28,[37,20],["routes.dc.nodes.show.sessions.title"],null],[28,[37,15],["dc.nodes.show.sessions"],null],[28,[37,21],["dc.nodes.show.sessions"],null]]]],""],[28,[37,4],null,[["label","href","selected"],[[28,[37,20],["routes.dc.nodes.show.metadata.title"],null],[28,[37,15],["dc.nodes.show.metadata"],null],[28,[37,21],["dc.nodes.show.metadata"],null]]]]],null]],null]]],null],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n            "],[8,[39,23],null,[["@value","@name"],[[30,8,["Address"]],"Address"]],[["default"],[[[[1,[30,8,["Address"]]]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,6],null,[["@name"],["content"]],[["default"],[[[[1,"\\n            "],[8,[39,24],null,[["@name","@model"],[[99,1,["@name"]],[28,[37,25],[[28,[37,4],null,[["item","tomography"],[[30,8],[30,9]]]],[30,1,["model"]]],null]]],[["default"],[[[[1,"\\n              "],[46,[28,[37,27],null,null],null,null,null],[1,"\\n            "]],[12]]]]],[1,"\\n          "]],[]]]]],[1,"\\n      "]],[]]]]],[1,"\\n"]],[8,9]]],[1,"    "]],[]]]]],[1,"\\n  "]],[3]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","tomography","loader","after","T","T","T","item","tomography","status","type","o"],false,["route","routeName","data-source","uri","hash","data-loader","block-slot","app-error","if","eq","hds/toast","notification","let","app-view","consul/lock-session/notifications","href-to","consul/peer/info","tab-nav","compact","array","t","is-href","can","copy-button","outlet","assign","component","-outlet"]]',moduleName:"consul-ui/templates/dc/nodes/show.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/nodes/show/healthchecks",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"i+D+Qmra",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n"],[44,[[28,[37,3],null,[["value","change"],[[28,[37,4],[[33,5],"Status:asc"],null],[28,[37,6],[[30,0],[28,[37,7],[[33,5]],null]],[["value"],["target.selected"]]]]]],[28,[37,3],null,[["status","kind","check","searchproperty"],[[28,[37,3],null,[["value","change"],[[52,[33,9],[28,[37,10],[[33,9],","],null],[27]],[28,[37,6],[[30,0],[28,[37,7],[[33,9]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,3],null,[["value","change"],[[52,[33,11],[28,[37,10],[[33,11],","],null],[27]],[28,[37,6],[[30,0],[28,[37,7],[[33,11]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,3],null,[["value","change"],[[52,[33,12],[28,[37,10],[[33,12],","],null],[27]],[28,[37,6],[[30,0],[28,[37,7],[[33,12]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,3],null,[["value","change","default"],[[52,[28,[37,13],[[33,14],[27]],null],[28,[37,10],[[33,14],","],null],[33,15]],[28,[37,6],[[30,0],[28,[37,7],[[33,14]],null]],[["value"],["target.selectedItems"]]],[33,15]]]]]]],[30,1,["model","item","Checks"]]],[[[1,"      "],[10,0],[14,0,"tab-section"],[12],[1,"\\n"],[41,[28,[37,16],[[30,4,["length"]],0],null],[[[1,"            "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[1,"\\n            "],[8,[39,17],null,[["@search","@onsearch","@sort","@filter"],[[99,18,["@search"]],[28,[37,6],[[30,0],[28,[37,7],[[33,18]],null]],[["value"],["target.value"]]],[30,2],[30,3]]],null],[1,"\\n"]],[]],null],[44,[[28,[37,19],["Type","serf",[30,4]],null]],[[[41,[28,[37,20],[[30,5],[28,[37,21],[[30,5,["Status"]],"critical"],null]],null],[[[1,"              "],[8,[39,22],[[24,0,"mb-3 mt-2"]],[["@type","@color"],["inline","warning"]],[["default"],[[[[1,"\\n                "],[8,[30,6,["Title"]],null,null,[["default"],[[[[1,[28,[35,23],["routes.dc.nodes.show.healthchecks.critical-serf-notice.header"],null]]],[]]]]],[1,"\\n                "],[8,[30,6,["Description"]],null,null,[["default"],[[[[1,[28,[35,23],["routes.dc.nodes.show.healthchecks.critical-serf-notice.body"],null]]],[]]]]],[1,"\\n              "]],[6]]]]],[1,"\\n"]],[]],null]],[5]]],[1,"          "],[8,[39,24],null,[["@type","@sort","@filters","@search","@items"],["health-check",[30,2,["value"]],[30,3],[99,18,["@search"]],[30,4]]],[["default"],[[[[1,"\\n            "],[8,[30,7,["Collection"]],null,null,[["default"],[[[[1,"\\n              "],[8,[39,25],null,[["@items"],[[30,7,["items"]]]],null],[1,"\\n            "]],[]]]]],[1,"\\n            "],[8,[30,7,["Empty"]],null,null,[["default"],[[[[1,"\\n              "],[8,[39,26],null,null,[["default"],[[[[1,"\\n                "],[8,[39,27],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                  "],[1,[28,[35,23],["routes.dc.nodes.show.healthchecks.empty"],[["items","htmlSafe"],[[30,4,["length"]],true]]]],[1,"\\n                "]],[]]]]],[1,"\\n              "]],[]]]]],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[7]]]]],[1,"\\n      "],[13],[1,"\\n"]],[2,3,4]]]],[1]]]]]],["route","sort","filters","items","serf","A","collection"],false,["route","routeName","let","hash","or","sortBy","action","mut","if","status","split","kind","check","not-eq","searchproperty","searchProperties","gt","consul/health-check/search-bar","search","find-by","and","eq","hds/alert","t","data-collection","consul/health-check/list","empty-state","block-slot"]]',moduleName:"consul-ui/templates/dc/nodes/show/healthchecks.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/nodes/show/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"qL7XyD9+",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n"],[41,[28,[37,3],[[30,1,["model","item","Checks","length"]],0],null],[[[1,"  "],[1,[28,[35,4],[[28,[37,5],["replaceWith","dc.nodes.show.services"],null]],null]],[1,"\\n"]],[]],[[[1,"  "],[1,[28,[35,4],[[28,[37,5],["replaceWith","dc.nodes.show.healthchecks"],null]],null]],[1,"\\n"]],[]]]],[1]]]]],[1,"\\n"]],["route"],false,["route","routeName","if","eq","did-insert","route-action"]]',moduleName:"consul-ui/templates/dc/nodes/show/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/nodes/show/metadata",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"II5xvxvi",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[10,0],[14,0,"tab-section"],[12],[1,"\\n"],[41,[30,1,["model","item","Meta"]],[[[1,"    "],[8,[39,3],null,[["@items"],[[28,[37,4],[[30,1,["model","item","Meta"]]],null]]],null],[1,"\\n"]],[]],[[[1,"    "],[8,[39,5],null,null,[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@name"],["body"]],[["default"],[[[[1,"\\n        "],[10,2],[12],[1,"\\n          This node has no metadata.\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[]]],[1,"  "],[13],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route"],false,["route","routeName","if","consul/metadata/list","entries","empty-state","block-slot"]]',moduleName:"consul-ui/templates/dc/nodes/show/metadata.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/nodes/show/rtt",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"dQ8VTTOG",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n"],[44,[[30,1,["model","tomography"]]],[[[41,[28,[37,4],[[30,2,["distances"]]],null],[[[1,"  "],[1,[28,[35,5],[[28,[37,6],["replaceWith","dc.nodes.show"],null]],null]],[1,"\\n"]],[]],[[[1,"  "],[10,0],[14,0,"tab-section"],[12],[1,"\\n    "],[10,0],[14,0,"definition-table"],[12],[1,"\\n      "],[10,"dl"],[12],[1,"\\n          "],[10,"dt"],[12],[1,"\\n              Minimum\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n              "],[1,[28,[35,7],[[30,2,["min"]]],[["maximumFractionDigits"],[2]]]],[1,"ms\\n          "],[13],[1,"\\n          "],[10,"dt"],[12],[1,"\\n              Median\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n              "],[1,[28,[35,7],[[30,2,["median"]]],[["maximumFractionDigits"],[2]]]],[1,"ms\\n          "],[13],[1,"\\n          "],[10,"dt"],[12],[1,"\\n              Maximum\\n          "],[13],[1,"\\n          "],[10,"dd"],[12],[1,"\\n              "],[1,[28,[35,7],[[30,2,["max"]]],[["maximumFractionDigits"],[2]]]],[1,"ms\\n          "],[13],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n    "],[8,[39,8],null,[["@distances"],[[30,2,["distances"]]]],null],[1,"\\n  "],[13],[1,"\\n"]],[]]]],[2]]]],[1]]]]],[1,"\\n"]],["route","tomography"],false,["route","routeName","let","if","not","did-insert","route-action","format-number","consul/tomography/graph"]]',moduleName:"consul-ui/templates/dc/nodes/show/rtt.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/nodes/show/services",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"3xjsHJKx",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n"],[44,[[28,[37,3],null,[["value","change"],[[28,[37,4],[[33,5],"Status:asc"],null],[28,[37,6],[[30,0],[28,[37,7],[[33,5]],null]],[["value"],["target.selected"]]]]]],[28,[37,3],null,[["status","source","searchproperty"],[[28,[37,3],null,[["value","change"],[[52,[33,9],[28,[37,10],[[33,9],","],null],[27]],[28,[37,6],[[30,0],[28,[37,7],[[33,9]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,3],null,[["value","change"],[[52,[33,11],[28,[37,10],[[33,11],","],null],[27]],[28,[37,6],[[30,0],[28,[37,7],[[33,11]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,3],null,[["value","change","default"],[[52,[28,[37,12],[[33,13],[27]],null],[28,[37,10],[[33,13],","],null],[33,14]],[28,[37,6],[[30,0],[28,[37,7],[[33,13]],null]],[["value"],["target.selectedItems"]]],[33,14]]]]]]],[30,1,["model","item","MeshServiceInstances"]],[30,1,["model","item","ProxyServiceInstances"]]],[[[1,"  "],[10,0],[14,0,"tab-section"],[12],[1,"\\n"],[41,[28,[37,15],[[30,4,["length"]],0],null],[[[1,"      "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[1,"\\n      "],[8,[39,16],null,[["@sources","@search","@onsearch","@searchproperties","@sort","@filter"],[[28,[37,17],[[28,[37,18],[[30,4]],null],"ExternalSources"],null],[99,19,["@search"]],[28,[37,6],[[30,0],[28,[37,7],[[33,19]],null]],[["value"],["target.value"]]],[99,14,["@searchproperties"]],[30,2],[30,3]]],null],[1,"\\n"]],[]],null],[1,"      "],[8,[39,20],null,[["@type","@sort","@filters","@search","@items"],["service-instance",[30,2,["value"]],[30,3],[99,19,["@search"]],[30,4]]],[["default"],[[[[1,"\\n        "],[8,[30,6,["Collection"]],null,null,[["default"],[[[[1,"\\n          "],[8,[39,21],null,[["@node","@routeName","@items","@proxies"],[[30,1,["model","item"]],"dc.services.show",[30,6,["items"]],[30,5]]],null],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[30,6,["Empty"]],null,null,[["default"],[[[[1,"\\n          "],[8,[39,22],null,null,[["default"],[[[[1,"\\n            "],[8,[39,23],null,[["@name"],["body"]],[["default"],[[[[1,"\\n              "],[1,[28,[35,24],["routes.dc.nodes.show.services.empty"],[["items","htmlSafe"],[[30,4,["length"]],true]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n      "]],[6]]]]],[1,"\\n  "],[13],[1,"\\n"]],[2,3,4,5]]]],[1]]]]]],["route","sort","filters","items","proxies","collection"],false,["route","routeName","let","hash","or","sortBy","action","mut","if","status","split","source","not-eq","searchproperty","searchProperties","gt","consul/service-instance/search-bar","get","collection","search","data-collection","consul/service-instance/list","empty-state","block-slot","t"]]',moduleName:"consul-ui/templates/dc/nodes/show/services.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/nodes/show/sessions",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"sY17bdHd",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/sessions/for-node/${node}",[28,[37,4],null,[["partition","nspace","dc","node"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","name"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,2,["data"]]],[[[1,"    "],[10,0],[14,0,"tab-section"],[12],[1,"\\n      "],[8,[39,8],null,[["@sink","@type","@label","@ondelete"],[[28,[37,3],["/${partition}/${dc}/${nspace}/session/",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null],"session","Lock Session",[99,9,["@ondelete"]]]],[["default"],[[[[1,"\\n\\n        "],[8,[39,5],null,[["@name"],["removed"]],[["default"],[[[[1,"\\n          "],[8,[39,10],[[4,[38,11],null,[["after"],[[28,[37,12],[[30,0],[30,5]],null]]]]],[["@type"],["remove"]],null],[1,"\\n        "]],[5]]]]],[1,"\\n\\n        "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n          "],[8,[39,10],[[4,[38,11],null,[["after"],[[28,[37,12],[[30,0],[30,6]],null]]]]],[["@type","@error"],["remove",[30,7]]],null],[1,"\\n        "]],[6,7]]]]],[1,"\\n\\n        "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n\\n          "],[8,[39,13],null,[["@type","@items"],["session",[30,3]]],[["default"],[[[[1,"\\n\\n            "],[8,[30,8,["Collection"]],null,null,[["default"],[[[[1,"\\n              "],[8,[39,14],null,[["@items","@ondelete"],[[30,8,["items"]],[30,4,["delete"]]]],null],[1,"\\n            "]],[]]]]],[1,"\\n\\n            "],[8,[30,8,["Empty"]],null,null,[["default"],[[[[1,"\\n              "],[8,[39,15],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n              "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                "],[10,"h2"],[12],[1,"\\n                  "],[1,[28,[35,16],["routes.dc.nodes.show.sessions.empty.header"],[["items"],[[30,3,["length"]]]]]],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[1,[28,[35,16],["routes.dc.nodes.show.sessions.empty.body"],[["canUseACLs","htmlSafe"],[[28,[37,17],["use acls"],null],true]]]],[1,"\\n              "]],[]]]]],[1,"\\n\\n                "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                  "],[10,"li"],[12],[1,"\\n                    "],[8,[39,18],null,[["@text","@href","@icon","@iconPosition","@size"],["Documentation on Lock Sessions",[29,[[28,[37,19],["CONSUL_DOCS_URL"],null],"/internals/sessions.html"]],"docs-link","trailing","small"]],null],[1,"\\n                  "],[13],[1,"\\n                  "],[10,"li"],[12],[1,"\\n                    "],[8,[39,18],null,[["@text","@href","@icon","@iconPosition","@size"],["Take the tutorial",[29,[[28,[37,19],["CONSUL_DOCS_LEARN_URL"],null],"/tutorials/consul/distributed-semaphore"]],"learn-link","trailing","small"]],null],[1,"\\n                  "],[13],[1,"\\n                "]],[]]]]],[1,"\\n\\n              "]],[]]]]],[1,"\\n            "]],[]]]]],[1,"\\n\\n          "]],[8]]]]],[1,"\\n\\n        "]],[]]]]],[1,"\\n      "]],[4]]]]],[1,"\\n    "],[13],[1,"\\n"]],[3]]],[1,"  "]],[]]]]],[1,"\\n"]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","api","items","writer","after","after","error","collection"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","let","data-writer","refresh-route","consul/lock-session/notifications","notification","action","data-collection","consul/lock-session/list","empty-state","t","can","hds/link/standalone","env"]]',moduleName:"consul-ui/templates/dc/nodes/show/sessions.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/nspaces/edit",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"kT+yvkgU",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/namespace/${id}",[28,[37,4],null,[["partition","nspace","dc","id"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[28,[37,5],[[30,1,["params","name"]],""],null]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,7],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,1,["params","dc"]],[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,2,["data"]],[30,2,["data","isNew"]]],[[[1,"  "],[8,[39,9],null,null,[["default"],[[[[1,"\\n    "],[8,[39,6],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n      "],[10,"ol"],[12],[1,"\\n          "],[10,"li"],[12],[10,3],[15,6,[28,[37,10],["dc.nspaces"],null]],[12],[1,"All Namespaces"],[13],[13],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,6],null,[["@name"],["header"]],[["default"],[[[[1,"\\n      "],[10,"h1"],[12],[1,"\\n        "],[8,[30,1,["Title"]],null,[["@title"],[[52,[30,7],"New Namespace",[28,[37,12],["Edit ",[30,6,["Name"]]],null]]]],null],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,6],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,6],null,[["@name"],["content"]],[["default"],[[[[1,"\\n      "],[8,[39,13],null,[["@item","@dc","@nspace","@partition","@onsubmit"],[[30,6],[30,1,["params","dc"]],[30,1,["params","nspace"]],[30,1,["params","partition"]],[28,[37,14],["dc.nspaces.index"],null]]],null],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[3,4,5,6,7]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","loader","dc","partition","nspace","item","create"],false,["route","routeName","data-loader","uri","hash","or","block-slot","app-error","let","app-view","href-to","if","concat","consul/nspace/form","transition-to"]]',moduleName:"consul-ui/templates/dc/nspaces/edit.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/nspaces/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"sVU/Q7Zh",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/namespaces",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,8],[[33,9],"Name:asc"],null],[28,[37,10],[[30,0],[28,[37,11],[[33,9]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["searchproperty"],[[28,[37,4],null,[["value","change","default"],[[52,[28,[37,13],[[33,14],[27]],null],[28,[37,15],[[33,14],","],null],[33,16]],[28,[37,10],[[30,0],[28,[37,11],[[33,14]],null]],[["value"],["target.selectedItems"]]],[33,16]]]]]]],[30,2,["data"]]],[[[1,"\\n    "],[8,[39,17],null,null,[["default"],[[[[1,"\\n      "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"h1"],[12],[1,"\\n          "],[8,[30,1,["Title"]],null,[["@title"],["Namespaces"]],null],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n"],[41,[28,[37,18],["create nspaces"],null],[[[1,"    "],[8,[39,19],null,[["@text","@route"],["Create","dc.nspaces.create"]],null],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["toolbar"]],[["default"],[[[[1,"\\n"],[41,[28,[37,20],[[30,5,["length"]],0],null],[[[1,"        "],[8,[39,21],null,[["@search","@onsearch","@sort","@filter"],[[99,22,["@search"]],[28,[37,10],[[30,0],[28,[37,11],[[33,22]],null]],[["value"],["target.value"]]],[30,3],[30,4]]],null],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n        "],[8,[39,23],null,[["@sink","@type","@label","@ondelete"],[[28,[37,3],["/${partition}/${dc}/${nspace}/nspace/",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null],"nspace","Namespace",[99,24,["@ondelete"]]]],[["default"],[[[[1,"\\n          "],[8,[39,5],null,[["@name"],["removed"]],[["default"],[[[[1,"\\n            "],[8,[39,25],[[4,[38,26],null,[["after"],[[28,[37,10],[[30,0],[30,7]],null]]]]],[["@type"],["remove"]],null],[1,"\\n          "]],[7]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n        "],[8,[39,27],null,[["@type","@sort","@filters","@search","@items"],["nspace",[30,3,["value"]],[30,4],[99,22,["@search"]],[30,5]]],[["default"],[[[[1,"\\n          "],[8,[30,8,["Collection"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,28],null,[["@items","@ondelete"],[[30,8,["items"]],[30,6,["delete"]]]],null],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,8,["Empty"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,29],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n              "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                "],[10,"h2"],[12],[1,"\\n                  "],[1,[28,[35,30],["routes.dc.namespaces.index.empty.header"],[["items"],[[30,5,["length"]]]]]],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[10,2],[12],[1,"\\n                  "],[1,[28,[35,30],["routes.dc.namespaces.index.empty.body"],[["items","canUseACLs"],[[30,5,["length"]],[28,[37,18],["use acls"],null]]]]],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                "],[10,"li"],[12],[1,"\\n                  "],[8,[39,31],null,[["@text","@href","@icon","@iconPosition","@size"],["Documentation on namespaces",[29,[[28,[37,32],["CONSUL_DOCS_URL"],null],"/commands/namespace"]],"docs-link","trailing","small"]],null],[1,"\\n                "],[13],[1,"\\n                "],[10,"li"],[12],[1,"\\n                  "],[8,[39,31],null,[["@text","@href","@icon","@iconPosition","@size"],["Read the guide",[29,[[28,[37,32],["CONSUL_DOCS_LEARN_URL"],null],"/consul/namespaces/secure-namespaces"]],"learn-link","trailing","small"]],null],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[8]]]]],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[6]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[3,4,5]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","loader","sort","filters","items","writer","after","collection"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","let","or","sortBy","action","mut","if","not-eq","searchproperty","split","searchProperties","app-view","can","hds/button","gt","consul/nspace/search-bar","search","data-writer","refresh-route","consul/nspace/notifications","notification","data-collection","consul/nspace/list","empty-state","t","hds/link/standalone","env"]]',moduleName:"consul-ui/templates/dc/nspaces/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/partitions/edit",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"4dMfLoFT",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/partition/${id}",[28,[37,4],null,[["partition","nspace","dc","id"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[28,[37,5],[[30,1,["params","name"]],""],null]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,7],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,1,["params","dc"]],[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,2,["data"]]],[[[1,"  "],[8,[39,9],null,null,[["default"],[[[[1,"\\n    "],[8,[39,6],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n      "],[10,"ol"],[12],[1,"\\n          "],[10,"li"],[12],[10,3],[15,6,[28,[37,10],["dc.partitions"],null]],[12],[1,"All Admin Partitions"],[13],[13],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,6],null,[["@name"],["header"]],[["default"],[[[[1,"\\n      "],[10,"h1"],[12],[1,"\\n        "],[8,[30,1,["Title"]],null,[["@title"],[[52,[28,[37,12],["new partition"],[["item"],[[30,6]]]],"New Partition",[28,[37,13],["Edit ",[30,6,["Name"]]],null]]]],null],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,6],null,[["@name"],["content"]],[["default"],[[[[1,"\\n\\n      "],[8,[39,14],null,[["@item","@dc","@nspace","@partition","@onsubmit"],[[30,6],[30,1,["params","dc"]],[30,1,["params","nspace"]],[30,1,["params","partition"]],[28,[37,15],["dc.partitions.index"],null]]],null],[1,"\\n\\n    "]],[]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[3,4,5,6]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","loader","dc","partition","nspace","item"],false,["route","routeName","data-loader","uri","hash","or","block-slot","app-error","let","app-view","href-to","if","is","concat","consul/partition/form","transition-to"]]',moduleName:"consul-ui/templates/dc/partitions/edit.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/partitions/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"h9pu8svr",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/partitions",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,8],[[33,9],"Name:asc"],null],[28,[37,10],[[30,0],[28,[37,11],[[33,9]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["searchproperty"],[[28,[37,4],null,[["value","change","default"],[[52,[28,[37,13],[[33,14],[27]],null],[28,[37,15],[[33,14],","],null],[33,16]],[28,[37,10],[[30,0],[28,[37,11],[[33,14]],null]],[["value"],["target.selectedItems"]]],[33,16]]]]]]],[30,2,["data"]]],[[[1,"\\n    "],[8,[39,17],null,null,[["default"],[[[[1,"\\n      "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"h1"],[12],[1,"\\n          "],[8,[30,1,["Title"]],null,[["@title"],["Admin Partitions"]],null],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n"],[41,[28,[37,18],["create partitions"],null],[[[1,"  "],[8,[39,19],null,[["@text","@route"],["Create","dc.partitions.create"]],null],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["toolbar"]],[["default"],[[[[1,"\\n"],[41,[28,[37,20],[[30,5,["length"]],0],null],[[[1,"        "],[8,[39,21],null,[["@search","@onsearch","@sort","@filter"],[[99,22,["@search"]],[28,[37,10],[[30,0],[28,[37,11],[[33,22]],null]],[["value"],["target.value"]]],[30,3],[30,4]]],null],[1,"\\n"]],[]],null],[1,"      "]],[]]]]],[1,"\\n      "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n        "],[8,[39,23],null,[["@sink","@type","@label","@ondelete"],[[28,[37,3],["/${partition}/${dc}/${nspace}/partition/",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null],"partition","Partition",[99,24,["@ondelete"]]]],[["default"],[[[[1,"\\n          "],[8,[39,5],null,[["@name"],["removed"]],[["default"],[[[[1,"\\n            "],[8,[39,25],[[4,[38,26],null,[["after"],[[28,[37,10],[[30,0],[30,7]],null]]]]],[["@type"],["remove"]],null],[1,"\\n          "]],[7]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n        "],[8,[39,27],null,[["@type","@sort","@filters","@search","@items"],["nspace",[30,3,["value"]],[30,4],[99,22,["@search"]],[30,5]]],[["default"],[[[[1,"\\n          "],[8,[30,8,["Collection"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,28],null,[["@items","@ondelete"],[[30,8,["items"]],[30,6,["delete"]]]],null],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,8,["Empty"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,29],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n              "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                "],[10,"h2"],[12],[1,"\\n                  "],[1,[28,[35,30],["routes.dc.partitions.index.empty.header"],[["items"],[[30,5,["length"]]]]]],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[10,2],[12],[1,"\\n                  "],[1,[28,[35,30],["routes.dc.partitions.index.empty.body"],[["items","canUseACLs"],[[30,5,["length"]],[28,[37,18],["use acls"],null]]]]],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                "],[10,"li"],[14,0,"docs-link"],[12],[1,"\\n                  "],[8,[39,10],null,[["@href","@external"],[[29,[[28,[37,31],["CONSUL_DOCS_URL"],null],"/enterprise/admin-partitions"]],true]],[["default"],[[[[1,"\\n                    Documentation on Admin Partitions\\n                  "]],[]]]]],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[8]]]]],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[6]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[3,4,5]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","loader","sort","filters","items","writer","after","collection"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","let","or","sortBy","action","mut","if","not-eq","searchproperty","split","searchProperties","app-view","can","hds/button","gt","consul/partition/search-bar","search","data-writer","refresh-route","consul/partition/notifications","notification","data-collection","consul/partition/list","empty-state","t","env"]]',moduleName:"consul-ui/templates/dc/partitions/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/peers/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"mLlJfy/N",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/peers",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,8],[[33,9],"State:asc"],null],[28,[37,10],[[30,0],[28,[37,11],[[33,9]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["state","searchproperty"],[[28,[37,4],null,[["value","change"],[[52,[33,13],[28,[37,14],[[33,13],","],null],[27]],[28,[37,10],[[30,0],[28,[37,11],[[33,13]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change","default"],[[52,[28,[37,15],[[33,16],[27]],null],[28,[37,14],[[33,16],","],null],[33,17]],[28,[37,10],[[30,0],[28,[37,11],[[33,16]],null]],[["value"],["target.selectedItems"]]],[33,17]]]]]]],[30,2,["data"]]],[[[1,"        "],[8,[39,18],null,null,[["default"],[[[[1,"\\n          "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n            "],[10,"h1"],[12],[1,"\\n              "],[8,[30,1,["Title"]],null,[["@title"],["Peers"]],null],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["toolbar"]],[["default"],[[[[1,"\\n\\n"],[41,[28,[37,19],[[30,5,["length"]],0],null],[[[1,"              "],[8,[39,20],null,[["@search","@onsearch","@sort","@filter"],[[99,21,["@search"]],[28,[37,10],[[30,0],[28,[37,11],[[33,21]],null]],[["value"],["target.value"]]],[30,3],[30,4]]],null],[1,"\\n"]],[]],null],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n\\n            "],[8,[39,22],[[24,0,"peer-create-modal"]],[["@aria"],[[28,[37,4],null,[["label"],["Add peer connection"]]]]],[["default"],[[[[1,"\\n              "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                "],[1,[28,[35,23],[[28,[37,24],[[30,0],"create",[30,6]],null]],null]],[1,"\\n                "],[10,"h2"],[12],[1,"\\n                  Add peer connection\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n\\n"],[41,[30,6,["opened"]],[[[1,"                  "],[8,[39,25],null,[["@params"],[[30,1,["params"]]]],[["default"],[[[[1,"\\n                    "],[8,[30,7,["Form"]],null,[["@onchange","@onsubmit"],[[30,2,["invalidate"]],[28,[37,26],[[30,0,["redirectToPeerShow"]],[30,6,["close"]]],null]]],[["default"],[[[[1,"\\n                      "],[1,[28,[35,23],[[28,[37,24],[[30,0],"form",[30,8]],null]],null]],[1,"\\n                      "],[8,[30,8,["Fieldsets"]],null,null,null],[1,"\\n                    "]],[8]]]]],[1,"\\n                  "]],[7]]]]],[1,"\\n"]],[]],null],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                "],[8,[30,0,["form","Actions"]],null,[["@onclose"],[[30,0,["create","close"]]]],null],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[6]]]]],[1,"\\n            "],[8,[39,27],[[4,[38,28],["click",[28,[37,29],[[30,0,["create","open"]]],null]],null]],[["@color","@text"],["primary","Add peer connection"]],null],[1,"\\n\\n          "]],[]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n\\n            "],[8,[39,30],null,[["@sink","@type","@label"],[[28,[37,3],["/${partition}/${dc}/${nspace}/peer/",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null],"peer","Peer"]],[["default"],[[[[1,"\\n\\n              "],[8,[39,5],null,[["@name"],["removed"]],[["default"],[[[[1,"\\n                "],[8,[39,31],[[4,[38,32],null,[["after"],[[28,[37,10],[[30,0],[30,10]],null]]]]],[["@type"],["remove"]],null],[1,"\\n              "]],[10]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n\\n                "],[8,[39,22],null,[["@aria","@onclose"],[[28,[37,4],null,[["label"],["Regenerate token"]]],[28,[37,24],[[30,0],"item",[27]],null]]],[["default"],[[[[1,"\\n                  "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                    "],[1,[28,[35,23],[[28,[37,24],[[30,0],"regenerate",[30,11]],null]],null]],[1,"\\n                    "],[10,"h2"],[12],[1,"\\n                      Regenerate token\\n                    "],[13],[1,"\\n                  "]],[]]]]],[1,"\\n                  "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n"],[41,[30,0,["item"]],[[[1,"                      "],[8,[39,33],null,[["@item","@onchange","@regenerate"],[[30,0,["item"]],[30,2,["invalidate"]],true]],[["default"],[[[[1,"\\n                        "],[1,[28,[35,23],[[28,[37,24],[[30,0],"regenerateForm",[30,12]],null]],null]],[1,"\\n                        "],[8,[30,12,["Fieldsets"]],null,null,null],[1,"\\n                      "]],[12]]]]],[1,"\\n"]],[]],null],[1,"                  "]],[]]]]],[1,"\\n                  "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                    "],[8,[30,0,["regenerateForm","Actions"]],null,[["@onclose"],[[30,0,["regenerate","close"]]]],null],[1,"\\n                  "]],[]]]]],[1,"\\n                "]],[11]]]]],[1,"\\n\\n                "],[8,[39,34],null,[["@type","@sort","@filters","@search","@items"],["peer",[30,3,["value"]],[30,4],[99,21,["@search"]],[30,5]]],[["default"],[[[[1,"\\n                  "],[8,[30,13,["Collection"]],null,null,[["default"],[[[[1,"\\n\\n                    "],[8,[39,35],null,[["@items","@onedit","@ondelete"],[[30,13,["items"]],[28,[37,36],[[28,[37,24],[[30,0],"item"],null],[30,0,["regenerate","open"]]],null],[30,9,["delete"]]]],null],[1,"\\n\\n                  "]],[]]]]],[1,"\\n                  "],[8,[30,13,["Empty"]],null,null,[["default"],[[[[1,"\\n"],[1,"                    "],[8,[39,37],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n                      "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                        "],[10,"h2"],[12],[1,"\\n                          "],[1,[28,[35,38],["routes.dc.peers.index.empty.header"],[["items"],[[30,5,["length"]]]]]],[1,"\\n                        "],[13],[1,"\\n                      "]],[]]]]],[1,"\\n                      "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                        "],[10,2],[12],[1,"\\n                          "],[1,[28,[35,38],["routes.dc.peers.index.empty.body"],[["items","canUsePartitions","canUseACLs","htmlSafe"],[[30,5,["length"]],[28,[37,39],["use partitions"],null],[28,[37,39],["use acls"],null],true]]]],[1,"\\n                        "],[13],[1,"\\n                      "]],[]]]]],[1,"\\n                      "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                        "],[10,"li"],[12],[1,"\\n"],[1,"                          "],[8,[39,40],null,[["@text","@href","@icon","@iconPosition","@size"],["Documentation on Peers",[29,[[28,[37,41],["CONSUL_DOCS_URL"],null],"/connect/cluster-peering"]],"docs-link","trailing","small"]],null],[1,"\\n                        "],[13],[1,"\\n                        "],[10,"li"],[12],[1,"\\n                          "],[8,[39,40],null,[["@text","@href","@icon","@iconPosition","@size"],["Take the tutorial",[29,[[28,[37,41],["CONSUL_DOCS_URL"],null],"/connect/cluster-peering/create-manage-peering"]],"learn-link","trailing","small"]],null],[1,"\\n                        "],[13],[1,"\\n                      "]],[]]]]],[1,"\\n                    "]],[]]]]],[1,"\\n                  "]],[]]]]],[1,"\\n                "]],[13]]]]],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[9]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[3,4,5]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]]],["route","loader","sort","filters","items","modal","form","form","writer","after","modal","form","collection"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","let","or","sortBy","action","mut","if","state","split","not-eq","searchproperty","searchProperties","app-view","gt","consul/peer/search-bar","search","modal-dialog","did-insert","set","consul/peer/form","fn","hds/button","on","optional","data-writer","consul/peer/notifications","notification","consul/peer/form/generate","data-collection","consul/peer/list","queue","empty-state","t","can","hds/link/standalone","env"]]',moduleName:"consul-ui/templates/dc/peers/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/peers/show",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"Omb1G6/B",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/peer/${name}",[28,[37,4],null,[["partition","nspace","dc","name"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","name"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,1,["params","dc"]],[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,2,["data"]]],[[[1,"        "],[8,[39,8],null,null,[["default"],[[[[1,"\\n          "],[8,[39,5],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n            "],[10,"ol"],[12],[1,"\\n              "],[10,"li"],[12],[10,3],[15,6,[28,[37,9],["dc.peers"],null]],[12],[1,"All Peers"],[13],[13],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n            "],[10,"h1"],[12],[1,"\\n              "],[8,[30,1,["Title"]],null,[["@title"],[[30,6,["Name"]]]],null],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n            "],[8,[39,10],null,[["@peering"],[[30,6]]],null],[1,"\\n            "],[8,[39,11],null,[["@peer"],[[30,6]]],[["default"],[[[[1,"\\n              "],[8,[39,12],null,[["@items"],[[30,7,["data","tabs"]]]],null],[1,"\\n\\n            "]],[7]]]]],[1,"\\n            "],[8,[39,13],null,[["@name","@model"],[[99,1,["@name"]],[28,[37,14],[[28,[37,4],null,[["items","peer"],[[30,6,["PeerServerAddresses"]],[30,6]]]],[30,1,["model"]]],null]]],[["default"],[[[[1,"\\n              "],[46,[28,[37,16],null,null],null,null,null],[1,"\\n            "]],[8]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[3,4,5,6]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]]],["route","loader","dc","partition","nspace","item","peering","o"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","let","app-view","href-to","consul/peer/bento-box","peerings/provider","tab-nav","outlet","assign","component","-outlet"]]',moduleName:"consul-ui/templates/dc/peers/show.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/peers/show/addresses",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"An6ASLD6",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n"],[41,[28,[37,3],[[30,1,["model","items","length"]],0],null],[[[1,"    "],[8,[39,4],null,[["@items"],[[30,1,["model","items"]]]],null],[1,"\\n"]],[]],[[[1,"    "],[8,[39,5],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"h2"],[12],[1,"\\n          "],[1,[28,[35,7],["routes.dc.peers.show.addresses.empty.header"],null]],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["body"]],[["default"],[[[[1,"\\n        "],[1,[28,[35,7],["routes.dc.peers.show.addresses.empty.body"],[["htmlSafe"],[true]]]],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[39,6],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n        "],[10,"li"],[12],[1,"\\n          "],[8,[39,8],null,[["@text","@href","@icon","@iconPosition","@size"],["Documentation on Peers",[29,[[28,[37,9],["CONSUL_DOCS_URL"],null],"/connect/cluster-peering"]],"docs-link","trailing","small"]],null],[1,"\\n        "],[13],[1,"\\n        "],[10,"li"],[12],[1,"\\n          "],[8,[39,8],null,[["@text","@href","@icon","@iconPosition","@size"],["Take the tutorial",[29,[[28,[37,9],["CONSUL_DOCS_URL"],null],"/connect/cluster-peering/create-manage-peering"]],"learn-link","trailing","small"]],null],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[]]]],[1]]]]]],["route"],false,["route","routeName","if","gt","consul/peer/address/list","empty-state","block-slot","t","hds/link/standalone","env"]]',moduleName:"consul-ui/templates/dc/peers/show/addresses.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/peers/show/exported",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"nW3ZeYXo",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/exported-services/${name}",[28,[37,4],null,[["partition","nspace","dc","name"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["model","peer","Name"]]]]]],null]]],[["default"],[[[[1,"\\n"],[44,[[28,[37,6],[[30,1,["params","partition"]],[30,1,["model","user","token","Partition"]],"default"],null],[30,2,["data"]]],[[[1,"\\n      "],[8,[39,7],null,[["@name"],["error"]],[["default"],[[[[1,"\\n        "],[8,[39,8],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n      "]],[]]]]],[1,"\\n\\n      "],[8,[39,7],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[41,[30,4,["length"]],[[[1,"          "],[10,0],[14,0,"search-bar"],[12],[1,"\\n            "],[10,"form"],[14,0,"filter-bar"],[12],[1,"\\n              "],[8,[39,10],[[24,0,"!w-80"]],[["@onsearch","@value","@placeholder"],[[28,[37,11],["target.value",[30,0,["updateSearch"]]],null],[30,0,["search"]],"Search"]],null],[1,"\\n            "],[13],[1,"\\n          "],[13],[1,"\\n"]],[]],null],[1,"        "],[8,[39,12],null,[["@items","@search","@searchProperties"],[[30,4],[30,0,["search"]],[28,[37,13],["Name"],null]]],[["default"],[[[[1,"\\n          "],[8,[39,14],null,null,[["default"],[[[[1,"\\n"],[41,[30,6,["data","height"]],[[[1,"              "],[10,0],[15,5,[30,6,["data","fillRemainingHeightStyle"]]],[14,0,"overflow-y-scroll"],[12],[1,"\\n"],[41,[30,5,["data","items","length"]],[[[1,"                  "],[8,[39,15],null,[["@tagName","@estimateHeight","@items"],["ul",[30,6,["data","height"]],[30,5,["data","items"]]]],[["default"],[[[[1,"\\n                    "],[10,"li"],[14,0,"px-3 h-12 border-bottom-primary"],[12],[1,"\\n                      "],[10,3],[14,0,"hds-typography-display-300 hds-foreground-strong hds-font-weight-semibold h-full w-full flex items-center"],[15,6,[28,[37,16],["dc.services.show.index",[30,7,["Name"]]],[["params"],[[52,[28,[37,17],[[30,7,["Partition"]],[30,3]],null],[28,[37,4],null,[["partition","nspace","peer"],[[30,7,["Partition"]],[30,7,["Namespace"]],[30,7,["PeerName"]]]]],[28,[37,4],null,[["peer"],[[30,7,["PeerName"]]]]]]]]]],[12],[1,"\\n                        "],[1,[30,7,["Name"]]],[1,"\\n                      "],[13],[1,"\\n                    "],[13],[1,"\\n                  "]],[7,8]]]]],[1,"\\n"]],[]],[[[1,"                  "],[8,[39,18],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n                    "],[8,[39,7],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                      "],[10,"h2"],[12],[1,"\\n                        "],[1,[28,[35,19],["routes.dc.peers.show.exported.empty.header"],[["name"],[[30,1,["model","peer","Name"]]]]]],[1,"\\n                      "],[13],[1,"\\n                    "]],[]]]]],[1,"\\n                    "],[8,[39,7],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                      "],[1,[28,[35,19],["routes.dc.peers.show.exported.empty.body"],[["items","name","htmlSafe"],[[30,4,["length"]],[30,1,["model","peer","Name"]],true]]]],[1,"\\n                    "]],[]]]]],[1,"\\n                    "],[8,[39,7],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                      "],[10,"li"],[12],[1,"\\n                        "],[8,[39,20],null,[["@text","@href","@icon","@iconPosition","@size"],["Documentation on Peers",[29,[[28,[37,21],["CONSUL_DOCS_URL"],null],"/connect/cluster-peering"]],"docs-link","trailing","small"]],null],[1,"\\n                      "],[13],[1,"\\n                      "],[10,"li"],[12],[1,"\\n                        "],[8,[39,20],null,[["@text","@href","@icon","@iconPosition","@size"],["Take the tutorial",[29,[[28,[37,21],["CONSUL_DOCS_URL"],null],"/connect/cluster-peering/create-manage-peering"]],"learn-link","trailing","small"]],null],[1,"\\n                      "],[13],[1,"\\n                    "]],[]]]]],[1,"\\n                  "]],[]]]]],[1,"\\n"]],[]]],[1,"              "],[13],[1,"\\n"]],[]],null],[1,"          "]],[6]]]]],[1,"\\n\\n        "]],[5]]]]],[1,"\\n      "]],[]]]]],[1,"\\n"]],[3,4]]],[1,"  "]],[2]]]]],[1,"\\n\\n"]],[1]]]]]],["route","api","partition","items","search","p","service","index"],false,["route","routeName","data-loader","uri","hash","let","or","block-slot","app-error","if","freetext-filter","pick","providers/search","array","providers/dimension","vertical-collection","href-to","not-eq","empty-state","t","hds/link/standalone","env"]]',moduleName:"consul-ui/templates/dc/peers/show/exported.hbs",isStrictMode:!1})
-e.default=n}))
-define("consul-ui/templates/dc/peers/show/imported",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"LzFp9Hrp",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/services/${peer}/${peerId}",[28,[37,4],null,[["partition","nspace","dc","peer","peerId"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["model","peer","Name"]],[30,1,["model","peer","id"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,8],[[33,9],"Status:asc"],null],[28,[37,10],[[30,0],[28,[37,11],[[33,9]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["status","kind","source","searchproperty"],[[28,[37,4],null,[["value","change"],[[52,[33,13],[28,[37,14],[[33,13],","],null],[27]],[28,[37,10],[[30,0],[28,[37,11],[[33,13]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change"],[[52,[33,15],[28,[37,14],[[33,15],","],null],[27]],[28,[37,10],[[30,0],[28,[37,11],[[33,15]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change"],[[52,[33,16],[28,[37,14],[[33,16],","],null],[27]],[28,[37,10],[[30,0],[28,[37,11],[[33,16]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change","default"],[[52,[28,[37,17],[[33,18],[27]],null],[28,[37,14],[[33,18],","],null],[30,0,["searchProperties"]]],[28,[37,10],[[30,0],[28,[37,11],[[33,18]],null]],[["value"],["target.selectedItems"]]],[30,0,["searchProperties"]]]]]]]],[28,[37,19],["Kind","connect-proxy",[30,2,["data"]]],null],[28,[37,8],[[30,1,["params","partition"]],[30,1,["model","user","token","Partition"]],"default"],null],[28,[37,8],[[30,1,["params","nspace"]],[30,1,["model","user","token","Namespace"]],"default"],null]],[[[1,"\\n"],[41,[28,[37,20],[[30,5,["length"]],0],null],[[[44,[[28,[37,21],[[30,5]],null]],[[[1,"            "],[8,[39,22],null,[["@sources","@partitions","@partition","@search","@onsearch","@sort","@filter","@peer"],[[28,[37,23],[[30,8],"ExternalSources"],null],[28,[37,23],[[30,8],"Partitions"],null],[30,6],[99,24,["@search"]],[28,[37,10],[[30,0],[28,[37,11],[[33,24]],null]],[["value"],["target.value"]]],[30,3],[30,4],[30,1,["model","peer"]]]],null],[1,"\\n"]],[8]]]],[]],null],[1,"        "],[8,[39,25],null,[["@type","@sort","@filters","@search","@items"],["service",[30,3,["value"]],[30,4],[99,24,["@search"]],[30,5]]],[["default"],[[[[1,"\\n          "],[8,[30,9,["Collection"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,26],null,[["@items","@partition","@isPeerDetail"],[[30,9,["items"]],[30,6],true]],null],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,9,["Empty"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,27],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n              "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                "],[10,"h2"],[12],[1,"\\n                  "],[1,[28,[35,28],["routes.dc.peers.show.imported.empty.header"],[["name"],[[30,1,["model","peer","Name"]]]]]],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[1,[28,[35,28],["routes.dc.peers.show.imported.empty.body"],[["items","name","htmlSafe"],[[30,5,["length"]],[30,1,["model","peer","Name"]],true]]]],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                "],[10,"li"],[12],[1,"\\n"],[1,"                  "],[8,[39,29],null,[["@text","@href","@icon","@iconPosition","@size"],["Documentation on Peers",[29,[[28,[37,30],["CONSUL_DOCS_URL"],null],"/connect/cluster-peering"]],"docs-link","trailing","small"]],null],[1,"\\n                "],[13],[1,"\\n                "],[10,"li"],[12],[1,"\\n                  "],[8,[39,29],null,[["@text","@href","@icon","@iconPosition","@size"],["Take the tutorial",[29,[[28,[37,30],["CONSUL_DOCS_URL"],null],"/connect/cluster-peering/create-manage-peering"]],"learn-link","trailing","small"]],null],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n"]],[3,4,5,6,7]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]]],["route","api","sort","filters","items","partition","nspace","items","collection"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","let","or","sortBy","action","mut","if","status","split","kind","source","not-eq","searchproperty","reject-by","gt","collection","consul/service/search-bar","get","search","data-collection","consul/service/list","empty-state","t","hds/link/standalone","env"]]',moduleName:"consul-ui/templates/dc/peers/show/imported.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/peers/show/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"gn6gS8WU",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[1,[28,[35,2],[[30,0,["transitionToImported"]]],null]],[1,"\\n"]],[1]]]]]],["route"],false,["route","routeName","did-insert"]]',moduleName:"consul-ui/templates/dc/peers/show/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/routing-config",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"wffPe0l/",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/discovery-chain/${name}",[28,[37,4],null,[["partition","nspace","dc","name"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","name"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,2,["data"]]],[[[8,[39,8],null,null,[["default"],[[[[1,"\\n  "],[8,[39,5],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n    "],[10,"ol"],[12],[1,"\\n        "],[10,"li"],[12],[10,3],[15,6,[28,[37,9],["dc.services"],null]],[12],[1,"All Services"],[13],[13],[1,"\\n    "],[13],[1,"\\n  "]],[]]]]],[1,"\\n  "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n    "],[10,"h1"],[12],[1,"\\n      "],[8,[30,1,["Title"]],null,[["@title"],[[30,3,["Chain","ServiceName"]]]],null],[1,"\\n    "],[13],[1,"\\n    "],[8,[39,10],null,[["@source","@withInfo"],[[28,[37,11],["routes.dc.routing-config.source"],null],true]],null],[1,"\\n  "]],[]]]]],[1,"\\n  "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n    "],[10,0],[14,0,"container"],[12],[1,"\\n      "],[8,[39,12],null,[["@chain"],[[30,3,["Chain"]]]],null],[1,"\\n    "],[13],[1,"\\n  "]],[]]]]],[1,"\\n"]],[]]]]],[1,"\\n"]],[3]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","loader","item"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","let","app-view","href-to","consul/source","t","consul/discovery-chain"]]',moduleName:"consul-ui/templates/dc/routing-config.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"ixFFtisJ",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/services",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,8],[[33,9],"Status:asc"],null],[28,[37,10],[[30,0],[28,[37,11],[[33,9]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["status","kind","source","searchproperty"],[[28,[37,4],null,[["value","change"],[[52,[33,13],[28,[37,14],[[33,13],","],null],[27]],[28,[37,10],[[30,0],[28,[37,11],[[33,13]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change"],[[52,[33,15],[28,[37,14],[[33,15],","],null],[27]],[28,[37,10],[[30,0],[28,[37,11],[[33,15]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change"],[[52,[33,16],[28,[37,14],[[33,16],","],null],[27]],[28,[37,10],[[30,0],[28,[37,11],[[33,16]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change","default"],[[52,[28,[37,17],[[33,18],[27]],null],[28,[37,14],[[33,18],","],null],[30,0,["_searchProperties"]]],[28,[37,10],[[30,0],[28,[37,11],[[33,18]],null]],[["value"],["target.selectedItems"]]],[30,0,["_searchProperties"]]]]]]]],[28,[37,19],["Kind","connect-proxy",[30,2,["data"]]],null],[28,[37,8],[[30,1,["params","partition"]],[30,1,["model","user","token","Partition"]],"default"],null],[28,[37,8],[[30,1,["params","nspace"]],[30,1,["model","user","token","Namespace"]],"default"],null]],[[[1,"\\n  "],[8,[39,20],null,null,[["default"],[[[[1,"\\n    "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n        "],[10,"h1"],[12],[1,"\\n          "],[8,[30,1,["Title"]],null,[["@title"],["Services"]],null],[1," "],[10,"em"],[12],[1,[28,[35,21],[[30,5,["length"]]],null]],[1," total"],[13],[1,"\\n        "],[13],[1,"\\n        "],[10,"label"],[14,"for","toolbar-toggle"],[12],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,5],null,[["@name"],["toolbar"]],[["default"],[[[[1,"\\n"],[41,[28,[37,22],[[30,5,["length"]],0],null],[[[44,[[28,[37,23],[[30,5]],null]],[[[1,"        "],[8,[39,24],null,[["@sources","@partitions","@partition","@search","@onsearch","@sort","@filter"],[[28,[37,25],[[30,8],"ExternalSources"],null],[28,[37,25],[[30,8],"Partitions"],null],[30,6],[99,26,["@search"]],[28,[37,10],[[30,0],[28,[37,11],[[33,26]],null]],[["value"],["target.value"]]],[30,3],[30,4]]],null],[1,"\\n"]],[8]]]],[]],null],[1,"    "]],[]]]]],[1,"\\n    "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n      "],[8,[39,27],null,[["@type","@sort","@filters","@search","@items"],["service",[30,3,["value"]],[30,4],[99,26,["@search"]],[30,5]]],[["default"],[[[[1,"\\n        "],[8,[30,9,["Collection"]],null,null,[["default"],[[[[1,"\\n          "],[8,[39,28],null,[["@items","@partition"],[[30,9,["items"]],[30,6]]],[["default"],[[[[1,"\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[30,9,["Empty"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,29],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n              "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                "],[10,"h2"],[12],[1,"\\n                  "],[1,[28,[35,30],["routes.dc.services.index.empty.header"],[["items"],[[30,5,["length"]]]]]],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[1,[28,[35,30],["routes.dc.services.index.empty.body"],[["items","canUseACLs","htmlSafe"],[[30,5,["length"]],[28,[37,31],["use acls"],null],true]]]],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                "],[10,"li"],[12],[1,"\\n                  "],[8,[39,32],null,[["@text","@href","@icon","@iconPosition","@size"],["Documentation on Services",[29,[[28,[37,33],["CONSUL_DOCS_URL"],null],"/commands/services"]],"docs-link","trailing","small"]],null],[1,"\\n                "],[13],[1,"\\n                "],[10,"li"],[12],[1,"\\n                  "],[8,[39,32],null,[["@text","@href","@icon","@iconPosition","@size"],["Take the tutorial",[29,[[28,[37,33],["CONSUL_DOCS_LEARN_URL"],null],"/consul/getting-started/services"]],"learn-link","trailing","small"]],null],[1,"\\n                "],[13],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n    "]],[]]]]],[1,"\\n\\n  "]],[]]]]],[1,"\\n\\n"]],[3,4,5,6,7]]],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","api","sort","filters","items","partition","nspace","items","collection"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","let","or","sortBy","action","mut","if","status","split","kind","source","not-eq","searchproperty","reject-by","app-view","format-number","gt","collection","consul/service/search-bar","get","search","data-collection","consul/service/list","empty-state","t","can","hds/link/standalone","env"]]',moduleName:"consul-ui/templates/dc/services/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/instance",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"qYqPny+P",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/service-instance/${id}/${node}/${name}/${peer}",[28,[37,4],null,[["partition","nspace","dc","id","node","name","peer"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","id"]],[30,1,["params","node"]],[30,1,["params","name"]],[30,1,["params","peer"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["disconnected"]],[["default"],[[[[1,"\\n"],[41,[28,[37,8],[[30,2,["error","status"]],"404"],null],[[[1,"        "],[8,[39,9],[[4,[38,10],null,[["sticky"],[true]]]],[["@color"],["warning"]],[["default"],[[[[1,"\\n          "],[8,[30,4,["Title"]],null,null,[["default"],[[[[1,"Warning!"]],[]]]]],[1,"\\n          "],[8,[30,4,["Description"]],null,null,[["default"],[[[[1,"\\n            This service has been deregistered and no longer exists in the catalog.\\n          "]],[]]]]],[1,"\\n        "]],[4]]]]],[1,"\\n"]],[]],[[[41,[28,[37,8],[[30,2,["error","status"]],"403"],null],[[[1,"        "],[8,[39,9],[[4,[38,10],null,[["sticky"],[true]]]],[["@color"],["critical"]],[["default"],[[[[1,"\\n          "],[8,[30,5,["Title"]],null,null,[["default"],[[[[1,"Error!"]],[]]]]],[1,"\\n          "],[8,[30,5,["Description"]],null,null,[["default"],[[[[1,"\\n            You no longer have access to this service.\\n          "]],[]]]]],[1,"\\n        "]],[5]]]]],[1,"\\n"]],[]],[[[1,"        "],[8,[39,9],[[4,[38,10],null,[["sticky"],[true]]]],[["@color"],["critical"]],[["default"],[[[[1,"\\n          "],[8,[30,6,["Title"]],null,null,[["default"],[[[[1,"Warning!"]],[]]]]],[1,"\\n          "],[8,[30,6,["Description"]],null,null,[["default"],[[[[1,"\\n            An error was returned whilst loading this data, refresh to try again.\\n          "]],[]]]]],[1,"\\n        "]],[6]]]]],[1,"\\n      "]],[]]]],[]]],[1,"    "]],[3]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,2,["data"]]],[[[41,[30,7,["IsOrigin"]],[[[1,"          "],[8,[39,12],null,[["@src","@onchange"],[[28,[37,3],["/${partition}/${nspace}/${dc}/proxy-instance/${id}/${node}/${name}",[28,[37,4],null,[["partition","nspace","dc","id","node","name"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","id"]],[30,1,["params","node"]],[30,1,["params","name"]]]]]],null],[28,[37,13],[[30,0],[28,[37,14],[[33,15]],null]],[["value"],["data"]]]]],[["default"],[[[[1,"\\n"],[41,[30,8,["data","ServiceID"]],[[[1,"              "],[8,[39,12],null,[["@src","@onchange"],[[28,[37,3],["/${partition}/${nspace}/${dc}/service-instance/${id}/${node}/${name}/${peer}",[28,[37,4],null,[["partition","nspace","dc","id","node","name","peer"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,8,["data","ServiceID"]],[30,8,["data","NodeName"]],[30,8,["data","ServiceName"]],[30,1,["params","peer"]]]]]],null],[28,[37,13],[[30,0],[28,[37,14],[[33,16]],null]],[["value"],["data"]]]]],null],[1,"\\n"]],[]],null],[1,"          "]],[8]]]]],[1,"\\n"]],[]],null],[1,"        "],[8,[39,17],null,null,[["default"],[[[[1,"\\n          "],[8,[39,5],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n            "],[10,"ol"],[12],[1,"\\n              "],[10,"li"],[12],[10,3],[15,6,[28,[37,18],["dc.services"],[["params"],[[28,[37,4],null,[["peer"],[[27]]]]]]]],[12],[1,"All Services"],[13],[13],[1,"\\n              "],[10,"li"],[12],[11,3],[16,6,[28,[37,18],["dc.services.show"],null]],[4,[38,19],[[28,[37,20],["Service (",[30,7,["Service","Service"]],")"],null]],null],[12],[1,"\\n                  Service ("],[1,[30,7,["Service","Service"]]],[1,")\\n                "],[13],[13],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n            "],[10,"h1"],[12],[1,"\\n              "],[8,[30,1,["Title"]],null,[["@title"],[[30,7,["Service","ID"]]]],null],[1,"\\n            "],[13],[1,"\\n            "],[8,[39,21],null,[["@item","@withInfo"],[[30,7],true]],null],[1,"\\n            "],[8,[39,22],null,[["@item","@withInfo"],[[30,7],true]],null],[1,"\\n"],[41,[28,[37,8],[[33,15,["ServiceProxy","Mode"]],"transparent"],null],[[[1,"              "],[8,[39,23],null,null,null],[1,"\\n"]],[]],null],[1,"          "]],[]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["nav"]],[["default"],[[[[1,"\\n            "],[10,"dl"],[12],[1,"\\n              "],[10,"dt"],[12],[1,"Service Name"],[13],[1,"\\n              "],[10,"dd"],[12],[10,3],[15,6,[29,[[28,[37,18],["dc.services.show",[30,7,["Service","Service"]]],null]]]],[12],[1,[30,7,["Service","Service"]]],[13],[13],[1,"\\n            "],[13],[1,"\\n"],[41,[51,[30,7,["Node","Meta","synthetic-node"]]],[[[1,"              "],[10,"dl"],[12],[1,"\\n                "],[10,"dt"],[12],[1,"Node Name"],[13],[1,"\\n                "],[10,"dd"],[12],[10,3],[15,6,[29,[[28,[37,18],["dc.nodes.show",[30,7,["Node","Node"]]],null]]]],[12],[1,[30,7,["Node","Node"]]],[13],[13],[1,"\\n              "],[13],[1,"\\n"]],[]],null],[41,[30,7,["Service","PeerName"]],[[[1,"              "],[10,"dl"],[12],[1,"\\n                "],[10,"dt"],[12],[1,"Peer Name"],[13],[1,"\\n                "],[10,"dd"],[12],[10,3],[15,6,[28,[37,18],["dc.peers.show",[30,7,["Service","PeerName"]]],[["params"],[[28,[37,4],null,[["peer"],[[27]]]]]]]],[12],[1,[30,7,["Service","PeerName"]]],[13],[13],[1,"\\n              "],[13],[1,"\\n"]],[]],null],[1,"          "]],[]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,25],[[30,7,["Service","Address"]],[30,7,["Node","Address"]]],null]],[[[1,"              "],[8,[39,26],null,[["@value","@name"],[[30,9],"Address"]],[["default"],[[[[1,[30,9]]],[]]]]],[1,"\\n"]],[9]]],[1,"          "]],[]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n            "],[8,[39,27],null,[["@items"],[[28,[37,28],[[28,[37,29],[[28,[37,4],null,[["label","href","selected"],["Health Checks",[28,[37,18],["dc.services.instance.healthchecks"],null],[28,[37,30],["dc.services.instance.healthchecks"],null]]]],[52,[28,[37,8],[[30,7,["Service","Kind"]],"mesh-gateway"],null],[28,[37,4],null,[["label","href","selected"],["Addresses",[28,[37,18],["dc.services.instance.addresses"],null],[28,[37,30],["dc.services.instance.addresses"],null]]]]],[52,[33,16],[28,[37,4],null,[["label","href","selected"],["Upstreams",[28,[37,18],["dc.services.instance.upstreams"],null],[28,[37,30],["dc.services.instance.upstreams"],null]]]]],[52,[33,16],[28,[37,4],null,[["label","href","selected"],["Exposed Paths",[28,[37,18],["dc.services.instance.exposedpaths"],null],[28,[37,30],["dc.services.instance.exposedpaths"],null]]]]],[28,[37,4],null,[["label","href","selected"],["Tags & Meta",[28,[37,18],["dc.services.instance.metadata"],null],[28,[37,30],["dc.services.instance.metadata"],null]]]]],null]],null]]],null],[1,"\\n            "],[8,[39,31],null,[["@name","@model"],[[99,1,["@name"]],[28,[37,32],[[28,[37,4],null,[["proxy","meta","item"],[[33,16],[33,15],[30,7]]]],[30,1,["model"]]],null]]],[["default"],[[[[1,"\\n              "],[46,[28,[37,34],null,null],null,null,null],[1,"\\n            "]],[10]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[7]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]]],["route","loader","after","T","T","T","item","meta","address","o"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","if","eq","hds/toast","notification","let","data-source","action","mut","meta","proxy","app-view","href-to","tooltip","concat","consul/external-source","consul/kind","consul/transparent-proxy","unless","or","copy-button","tab-nav","compact","array","is-href","outlet","assign","component","-outlet"]]',moduleName:"consul-ui/templates/dc/services/instance.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/instance/addresses",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"OEv9mr5t",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n"],[44,[[28,[37,3],[[30,1,["model","item","Service","TaggedAddresses"]]],null]],[[[1,"  "],[10,0],[14,0,"tab-section"],[12],[1,"\\n"],[41,[28,[37,5],[[30,2,["length"]],0],null],[[[1,"      "],[8,[39,6],[[24,0,"consul-tagged-addresses"]],[["@items"],[[30,2]]],[["default"],[[[[1,"\\n          "],[8,[39,7],null,[["@name"],["header"]],[["default"],[[[[1,"\\n            "],[10,"th"],[12],[1,"Tag"],[13],[1,"\\n            "],[10,"th"],[12],[1,"Address"],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,7],null,[["@name"],["row"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,8],[1,[30,3]],null]],[[[41,[30,5],[[[1,"            "],[10,"td"],[12],[1,"\\n              "],[1,[28,[35,8],[0,[30,3]],null]],[41,[28,[37,9],[[28,[37,10],[[30,5,["Address"]],[33,11,["Address"]]],null],[28,[37,10],[[30,5,["Port"]],[33,11,["Port"]]],null]],null],[[[1," "],[10,"em"],[12],[1,"(default)"],[13]],[]],null],[1,"\\n            "],[13],[1,"\\n            "],[10,"td"],[12],[1,"\\n              "],[1,[30,5,["Address"]]],[1,":"],[1,[30,5,["Port"]]],[1,"\\n            "],[13],[1,"\\n"]],[]],null]],[5]]],[1,"          "]],[]]]]],[1,"\\n      "]],[3,4]]]]],[1,"\\n"]],[]],[[[1,"      "],[10,2],[12],[1,"\\n        There are no additional addresses.\\n      "],[13],[1,"\\n"]],[]]],[1,"  "],[13],[1,"\\n"]],[2]]]],[1]]]]],[1,"\\n"]],["route","items","taggedAddress","index","address"],false,["route","routeName","let","entries","if","gt","tabular-collection","block-slot","object-at","and","eq","item"]]',moduleName:"consul-ui/templates/dc/services/instance/addresses.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/instance/exposedpaths",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"bKwLyBQ8",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n"],[44,[[30,1,["model","proxy"]],[30,1,["model","meta"]]],[[[1,"  "],[10,0],[14,0,"tab-section"],[12],[1,"\\n"],[41,[28,[37,4],[[30,3,["ServiceProxy","Expose","Paths","length"]],0],null],[[[1,"    "],[1,[28,[35,5],["routes.dc.services.instance.exposedpaths.intro"],[["htmlSafe"],[true]]]],[1,"\\n    "],[8,[39,6],null,[["@items","@address"],[[30,3,["ServiceProxy","Expose","Paths"]],[28,[37,7],[[30,2,["Service","Address"]],[30,2,["Node","Address"]]],null]]],null],[1,"\\n"]],[]],[[[1,"    "],[8,[39,8],null,null,[["default"],[[[[1,"\\n      "],[8,[39,9],null,[["@name"],["body"]],[["default"],[[[[1,"\\n        "],[1,[28,[35,5],["routes.dc.services.instance.exposedpaths.empty.body"],[["htmlSafe"],[true]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[]]],[1,"  "],[13],[1,"\\n"]],[2,3]]]],[1]]]]]],["route","item","proxy"],false,["route","routeName","let","if","gt","t","consul/exposed-path/list","or","empty-state","block-slot"]]',moduleName:"consul-ui/templates/dc/services/instance/exposedpaths.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/instance/healthchecks",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"c8iqBcKE",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n"],[44,[[28,[37,3],[[28,[37,4],[[30,0],"syntheticNodeSearchPropertyFilter",[30,1,["model","item"]]],null],[33,5]],null]],[[[44,[[28,[37,6],null,[["value","change"],[[28,[37,7],[[33,8],"Status:asc"],null],[28,[37,4],[[30,0],[28,[37,9],[[33,8]],null]],[["value"],["target.selected"]]]]]],[28,[37,6],null,[["status","check","searchproperty"],[[28,[37,6],null,[["value","change"],[[52,[33,11],[28,[37,12],[[33,11],","],null],[27]],[28,[37,4],[[30,0],[28,[37,9],[[33,11]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,6],null,[["value","change"],[[52,[33,13],[28,[37,12],[[33,13],","],null],[27]],[28,[37,4],[[30,0],[28,[37,9],[[33,13]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,6],null,[["value","change","default"],[[52,[28,[37,14],[[33,15],[27]],null],[28,[37,12],[[33,15],","],null],[30,2]],[28,[37,4],[[30,0],[28,[37,9],[[33,15]],null]],[["value"],["target.selectedItems"]]],[30,2]]]]]]],[28,[37,3],[[28,[37,4],[[30,0],"syntheticNodeHealthCheckFilter",[30,1,["model","item"]]],null],[28,[37,16],[[28,[37,17],[[30,1,["model","item","Checks"]],[30,1,["model","proxy","Checks"]]],null],[30,1,["model","proxy","ServiceProxy","Expose","Checks"]]],null]],null]],[[[1,"      "],[10,0],[14,0,"tab-section"],[12],[1,"\\n\\n"],[41,[28,[37,18],[[30,5,["length"]],0],null],[[[1,"          "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[1,"\\n          "],[8,[39,19],null,[["@search","@onsearch","@sort","@filter"],[[99,20,["@search"]],[28,[37,4],[[30,0],[28,[37,9],[[33,20]],null]],[["value"],["target.value"]]],[30,3],[30,4]]],null],[1,"\\n"]],[]],null],[1,"\\n"],[44,[[28,[37,21],["Type","serf",[30,5]],null]],[[[41,[28,[37,22],[[30,6],[28,[37,23],[[30,6,["Status"]],"critical"],null]],null],[[[1,"            "],[8,[39,24],[[24,0,"mb-3 mt-2"]],[["@type","@color"],["inline","warning"]],[["default"],[[[[1,"\\n              "],[8,[30,7,["Title"]],null,null,[["default"],[[[[1,[28,[35,25],["routes.dc.services.instance.healthchecks.critical-serf-notice.header"],null]]],[]]]]],[1,"\\n              "],[8,[30,7,["Description"]],null,null,[["default"],[[[[1,[28,[35,25],["routes.dc.services.instance.healthchecks.critical-serf-notice.body"],[["htmlSafe"],[true]]]]],[]]]]],[1,"\\n            "]],[7]]]]],[1,"\\n"]],[]],null]],[6]]],[1,"        "],[8,[39,26],null,[["@type","@sort","@filters","@search","@items"],["health-check",[30,3,["value"]],[30,4],[99,20,["@search"]],[30,5]]],[["default"],[[[[1,"\\n          "],[8,[30,8,["Collection"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,27],null,[["@items"],[[30,8,["items"]]]],null],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,8,["Empty"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,28],null,null,[["default"],[[[[1,"\\n              "],[8,[39,29],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[1,[28,[35,25],["routes.dc.services.instance.healthchecks.empty"],[["items","htmlSafe"],[[30,5,["length"]],true]]]],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[8]]]]],[1,"\\n\\n      "],[13],[1,"\\n"]],[3,4,5]]]],[2]]]],[1]]]]],[1,"\\n"]],["route","filteredSearchProperties","sort","filters","items","serf","A","collection"],false,["route","routeName","let","filter","action","searchProperties","hash","or","sortBy","mut","if","status","split","check","not-eq","searchproperty","merge-checks","array","gt","consul/health-check/search-bar","search","find-by","and","eq","hds/alert","t","data-collection","consul/health-check/list","empty-state","block-slot"]]',moduleName:"consul-ui/templates/dc/services/instance/healthchecks.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/instance/metadata",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"TS1cbRDj",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n"],[44,[[30,1,["model","item"]]],[[[1,"  "],[10,0],[14,0,"tab-section"],[12],[1,"\\n      "],[10,"section"],[14,0,"tags"],[12],[1,"\\n        "],[10,"h2"],[12],[1,"Tags"],[13],[1,"\\n"],[41,[28,[37,4],[[30,2,["Tags","length"]],0],null],[[[1,"        "],[8,[39,5],null,[["@item"],[[30,2]]],null],[1,"\\n"]],[]],[[[1,"        "],[8,[39,6],null,null,[["default"],[[[[1,"\\n          "],[8,[39,7],null,[["@name"],["body"]],[["default"],[[[[1,"\\n            "],[10,2],[12],[1,"\\n              There are no tags.\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]]],[1,"      "],[13],[1,"\\n      "],[10,"section"],[14,0,"metadata"],[12],[1,"\\n        "],[10,"h2"],[12],[1,"Meta"],[13],[1,"\\n"],[41,[30,2,["Meta"]],[[[1,"        "],[8,[39,8],null,[["@items"],[[28,[37,9],[[30,2,["Meta"]]],null]]],null],[1,"\\n"]],[]],[[[1,"        "],[8,[39,6],null,null,[["default"],[[[[1,"\\n          "],[8,[39,7],null,[["@name"],["body"]],[["default"],[[[[1,"\\n            "],[10,2],[12],[1,"\\n              This instance has no metadata.\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]]],[1,"      "],[13],[1,"\\n  "],[13],[1,"\\n"]],[2]]]],[1]]]]],[1,"\\n"]],["route","item"],false,["route","routeName","let","if","gt","tag-list","empty-state","block-slot","consul/metadata/list","entries"]]',moduleName:"consul-ui/templates/dc/services/instance/metadata.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/instance/upstreams",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"2fQZNDmw",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[10,0],[14,0,"tab-section"],[12],[1,"\\n"],[44,[[28,[37,3],null,[["value","change"],[[28,[37,4],[[33,5],"DestinationName:asc"],null],[28,[37,6],[[30,0],[28,[37,7],[[33,5]],null]],[["value"],["target.selected"]]]]]],[28,[37,3],null,[["searchproperty"],[[28,[37,3],null,[["value","change","default"],[[52,[28,[37,9],[[33,10],[27]],null],[28,[37,11],[[33,10],","],null],[33,12]],[28,[37,6],[[30,0],[28,[37,7],[[33,10]],null]],[["value"],["target.selectedItems"]]],[33,12]]]]]]],[28,[37,4],[[30,1,["params","partition"]],[30,1,["model","user","token","Partition"]],"default"],null],[28,[37,4],[[30,1,["params","nspace"]],[30,1,["model","user","token","Namespace"]],"default"],null],[30,1,["params","dc"]],[30,1,["model","proxy"]],[30,1,["model","meta"]],[30,1,["model","proxy","Service","Proxy","Upstreams"]]],[[[41,[28,[37,13],[[30,9,["length"]],0],null],[[[1,"        "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[1,"\\n        "],[8,[39,14],null,[["@search","@onsearch","@searchproperties","@sort","@filter"],[[99,15,["@search"]],[28,[37,6],[[30,0],[28,[37,7],[[33,15]],null]],[["value"],["target.value"]]],[99,12,["@searchproperties"]],[30,2],[30,3]]],null],[1,"\\n"]],[]],null],[41,[28,[37,16],[[30,8,["ServiceProxy","Mode"]],"transparent"],null],[[[1,"        "],[8,[39,17],[[24,0,"mb-3 mt-2"]],[["@type","@color"],["inline","warning"]],[["default"],[[[[1,"\\n          "],[8,[30,10,["Title"]],null,null,[["default"],[[[[1,[28,[35,18],["routes.dc.services.instance.upstreams.tproxy-mode.header"],null]]],[]]]]],[1,"\\n          "],[8,[30,10,["Description"]],null,null,[["default"],[[[[1,"\\n            "],[1,[28,[35,18],["routes.dc.services.instance.upstreams.tproxy-mode.body"],null]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,10,["Link::Standalone"]],null,[["@text","@href","@icon","@iconPosition","@size"],[[28,[37,18],["routes.dc.services.instance.upstreams.tproxy-mode.footer.text"],null],[29,[[28,[37,19],[[28,[37,20],["CONSUL_DOCS_URL"],null],[28,[37,18],["routes.dc.services.instance.upstreams.tproxy-mode.footer.link"],null]],null]]],"docs-link","trailing","small"]],null],[1,"\\n        "]],[10]]]]],[1,"\\n"]],[]],null],[1,"      "],[8,[39,21],null,[["@type","@sort","@filters","@search","@items"],["upstream-instance",[30,2,["value"]],[30,3],[99,15,["@search"]],[30,9]]],[["default"],[[[[1,"\\n        "],[8,[30,11,["Collection"]],null,null,[["default"],[[[[1,"\\n          "],[8,[39,22],null,[["@items","@dc","@nspace","@partition"],[[30,11,["items"]],[30,6],[30,5],[30,4]]],null],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[30,11,["Empty"]],null,null,[["default"],[[[[1,"\\n          "],[8,[39,23],null,null,[["default"],[[[[1,"\\n            "],[8,[39,24],null,[["@name"],["body"]],[["default"],[[[[1,"\\n              "],[1,[28,[35,18],["routes.dc.services.instance.upstreams.empty"],[["items","htmlSafe"],[[30,9,["length"]],true]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n      "]],[11]]]]],[1,"\\n"]],[2,3,4,5,6,7,8,9]]],[1,"  "],[13],[1,"\\n"]],[1]]]]]],["route","sort","filters","partition","nspace","dc","proxy","meta","items","A","collection"],false,["route","routeName","let","hash","or","sortBy","action","mut","if","not-eq","searchproperty","split","searchProperties","gt","consul/upstream-instance/search-bar","search","eq","hds/alert","t","concat","env","data-collection","consul/upstream-instance/list","empty-state","block-slot"]]',moduleName:"consul-ui/templates/dc/services/instance/upstreams.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/show",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"ep8WMqyL",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n    "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/service-instances/for-service/${name}/${peer}",[28,[37,4],null,[["partition","nspace","dc","name","peer"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","name"]],[30,1,["params","peer"]]]]]],null]]],[["default"],[[[[1,"\\n\\n      "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n        "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n      "]],[]]]]],[1,"\\n\\n      "],[8,[39,5],null,[["@name"],["disconnected"]],[["default"],[[[[1,"\\n"],[41,[28,[37,8],[[30,2,["error","status"]],"404"],null],[[[1,"          "],[8,[39,9],[[4,[38,10],null,[["sticky"],[true]]]],[["@color"],["warning"]],[["default"],[[[[1,"\\n            "],[8,[30,4,["Title"]],null,null,[["default"],[[[[1,"Warning!"]],[]]]]],[1,"\\n            "],[8,[30,4,["Description"]],null,null,[["default"],[[[[1,"This service has been deregistered and no longer exists in the catalog."]],[]]]]],[1,"\\n          "]],[4]]]]],[1,"\\n"]],[]],[[[41,[28,[37,8],[[30,2,["error","status"]],"403"],null],[[[1,"          "],[8,[39,9],[[4,[38,10],null,[["sticky"],[true]]]],[["@color"],["critical"]],[["default"],[[[[1,"\\n            "],[8,[30,5,["Title"]],null,null,[["default"],[[[[1,"Error!"]],[]]]]],[1,"\\n            "],[8,[30,5,["Description"]],null,null,[["default"],[[[[1,"You no longer have access to this service."]],[]]]]],[1,"\\n          "]],[5]]]]],[1,"\\n"]],[]],[[[1,"          "],[8,[39,9],[[4,[38,10],null,[["sticky"],[true]]]],[["@color"],["warning"]],[["default"],[[[[1,"\\n            "],[8,[30,6,["Title"]],null,null,[["default"],[[[[1,"Warning!"]],[]]]]],[1,"\\n            "],[8,[30,6,["Description"]],null,null,[["default"],[[[[1,"An error was returned whilst loading this data, refresh to try again."]],[]]]]],[1,"\\n          "]],[6]]]]],[1,"\\n        "]],[]]]],[]]],[1,"      "]],[3]]]]],[1,"\\n\\n      "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,2,["data"]],[30,2,["data","firstObject"]],[30,1,["model","dc"]]],[[[1,"\\n"],[41,[30,8,["IsOrigin"]],[[[1,"      "],[8,[39,12],null,[["@src","@onchange"],[[28,[37,3],["/${partition}/${nspace}/${dc}/proxies/for-service/${name}",[28,[37,4],null,[["partition","nspace","dc","name"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","name"]]]]]],null],[28,[37,13],[[30,0],[28,[37,14],[[33,15]],null]],[["value"],["data"]]]]],null],[1,"\\n"],[41,[28,[37,16],[[33,17]],null],[[[1,"          "],[8,[39,12],null,[["@src","@onchange"],[[28,[37,3],["/${partition}/${nspace}/${dc}/discovery-chain/${name}",[28,[37,4],null,[["partition","nspace","dc","name"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","name"]]]]]],null],[28,[37,13],[[30,0],[28,[37,14],[[33,17]],null]],[["value"],["data"]]]]],null],[1,"\\n"]],[]],null],[1,"        "],[1,[28,[35,18],[[28,[37,19],[[30,0],"chain",[27]],null],[30,1,["params","dc"]]],null]],[1,"\\n"]],[]],null],[44,[[28,[37,4],null,[["topology","services","upstreams","instances","intentions","routing","tags"],[[28,[37,20],[[30,9,["MeshEnabled"]],[30,8,["IsMeshOrigin"]],[28,[37,21],[[28,[37,22],[[33,15,["length"]],0],null],[28,[37,8],[[30,8,["Service","Kind"]],"ingress-gateway"],null]],null],[28,[37,16],[[30,8,["Service","PeerName"]]],null]],null],[28,[37,20],[[28,[37,8],[[30,8,["Service","Kind"]],"terminating-gateway"],null],[28,[37,16],[[30,8,["Service","PeerName"]]],null]],null],[28,[37,20],[[28,[37,8],[[30,8,["Service","Kind"]],"ingress-gateway"],null],[28,[37,16],[[30,8,["Service","PeerName"]]],null]],null],true,[28,[37,20],[[28,[37,23],[[30,8,["Service","Kind"]],"terminating-gateway"],null],[28,[37,24],["read intention for service"],[["item"],[[30,8,["Service"]]]]],[28,[37,16],[[30,8,["Service","PeerName"]]],null]],null],[28,[37,20],[[30,9,["MeshEnabled"]],[30,8,["IsOrigin"]],[28,[37,16],[[30,8,["Service","PeerName"]]],null]],null],true]]]],[[[1,"        "],[8,[39,25],null,null,[["default"],[[[[1,"\\n          "],[8,[39,5],null,[["@name"],["notification"]],[["default"],[[[[1,"\\n            "],[8,[39,26],null,[["@type","@status","@error"],[[30,12],[30,11],[30,14]]],null],[1,"\\n          "]],[11,12,13,14]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["breadcrumbs"]],[["default"],[[[[1,"\\n            "],[10,"ol"],[12],[1,"\\n              "],[10,"li"],[12],[10,3],[15,6,[28,[37,27],["dc.services"],[["params"],[[28,[37,4],null,[["peer"],[[27]]]]]]]],[12],[1,"All Services"],[13],[13],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n              "],[10,"h1"],[12],[1,"\\n                "],[8,[30,1,["Title"]],null,[["@title"],[[30,8,["Service","Service"]]]],null],[1,"\\n              "],[13],[1,"\\n              "],[8,[39,28],null,[["@item","@withInfo"],[[30,8,["Service"]],true]],null],[1,"\\n              "],[8,[39,29],null,[["@item","@withInfo"],[[30,8,["Service"]],true]],null],[1,"\\n              "],[8,[39,30],null,[["@item"],[[30,8,["Service"]]]],null],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["nav"]],[["default"],[[[[1,"\\n"],[41,[28,[37,23],[[30,8,["Service","Kind"]],"mesh-gateway"],null],[[[1,"              "],[8,[39,31],null,[["@items"],[[28,[37,32],[[28,[37,33],[[52,[30,10,["topology"]],[28,[37,4],null,[["label","href","selected"],["Topology",[28,[37,27],["dc.services.show.topology"],null],[28,[37,34],["dc.services.show.topology"],null]]]],""],[52,[30,10,["services"]],[28,[37,4],null,[["label","href","selected"],["Linked Services",[28,[37,27],["dc.services.show.services"],null],[28,[37,34],["dc.services.show.services"],null]]]],""],[52,[30,10,["upstreams"]],[28,[37,4],null,[["label","href","selected"],["Upstreams",[28,[37,27],["dc.services.show.upstreams"],null],[28,[37,34],["dc.services.show.upstreams"],null]]]],""],[52,[30,10,["instances"]],[28,[37,4],null,[["label","href","selected"],["Instances",[28,[37,27],["dc.services.show.instances"],null],[28,[37,34],["dc.services.show.instances"],null]]]],""],[52,[30,10,["intentions"]],[28,[37,4],null,[["label","href","selected"],["Intentions",[28,[37,27],["dc.services.show.intentions"],null],[28,[37,34],["dc.services.show.intentions"],null]]]],""],[52,[30,10,["routing"]],[28,[37,4],null,[["label","href","selected"],["Routing",[28,[37,27],["dc.services.show.routing"],null],[28,[37,34],["dc.services.show.routing"],null]]]],""],[52,[30,10,["tags"]],[28,[37,4],null,[["label","href","selected"],["Tags",[28,[37,27],["dc.services.show.tags"],null],[28,[37,34],["dc.services.show.tags"],null]]]],""]],null]],null]]],null],[1,"\\n"]],[]],null],[1,"          "]],[]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n            "],[8,[39,12],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/ui-config",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n"],[41,[30,15,["data","dashboard_url_templates","service"]],[[[1,"              "],[8,[39,13],[[24,0,"external-dashboard"]],[["@href","@external"],[[28,[37,35],[[30,15,["data","dashboard_url_templates","service"]],[28,[37,4],null,[["Datacenter","Service"],[[30,9,["Name"]],[28,[37,4],null,[["Name","Namespace","Partition"],[[30,8,["Service","Service"]],[28,[37,21],[[30,8,["Service","Namespace"]],""],null],[28,[37,21],[[30,8,["Service","Partition"]],""],null]]]]]]]],null],true]],[["default"],[[[[1,"\\n                Open dashboard\\n              "]],[]]]]],[1,"\\n"]],[]],null],[1,"            "]],[15]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n"],[41,[28,[37,21],[[28,[37,16],[[30,8,["IsOrigin"]]],null],[33,17]],null],[[[1,"            "],[8,[39,36],null,[["@name","@model"],[[99,1,["@name"]],[28,[37,37],[[28,[37,4],null,[["items","proxies","item","tabs"],[[30,7],[33,15],[30,8],[30,10]]]],[30,1,["model"]]],null]]],[["default"],[[[[1,"\\n              "],[46,[28,[37,39],null,null],null,null,null],[1,"\\n            "]],[16]]]]],[1,"\\n"]],[]],null],[1,"          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[10]]]],[7,8,9]]],[1,"      "]],[]]]]],[1,"\\n    "]],[2]]]]],[1,"\\n"]],[1]]]]]],["route","loader","after","T","T","T","items","item","dc","tabs","status","type","item","error","config","o"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","if","eq","hds/toast","notification","let","data-source","action","mut","proxies","not","chain","did-insert","set","and","or","gt","not-eq","can","app-view","topology-metrics/notifications","href-to","consul/external-source","consul/kind","consul/peer/info","tab-nav","compact","array","is-href","render-template","outlet","assign","component","-outlet"]]',moduleName:"consul-ui/templates/dc/services/show.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/show/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"och8aDuk",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n"],[41,[30,1,["model","tabs","topology"]],[[[1,"  "],[1,[28,[35,3],[[28,[37,4],["replaceWith","dc.services.show.topology"],null]],null]],[1,"\\n"]],[]],[[[41,[30,1,["model","tabs","upstreams"]],[[[1,"  "],[1,[28,[35,3],[[28,[37,4],["replaceWith","dc.services.show.upstreams"],null]],null]],[1,"\\n"]],[]],[[[41,[30,1,["model","tabs","services"]],[[[1,"  "],[1,[28,[35,3],[[28,[37,4],["replaceWith","dc.services.show.services"],null]],null]],[1,"\\n"]],[]],[[[1,"  "],[1,[28,[35,3],[[28,[37,4],["replaceWith","dc.services.show.instances"],null]],null]],[1,"\\n"]],[]]]],[]]]],[]]]],[1]]]]],[1,"\\n"]],["route"],false,["route","routeName","if","did-insert","route-action"]]',moduleName:"consul-ui/templates/dc/services/show/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/show/instances",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"QmKK5Mhb",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n"],[10,0],[14,0,"tab-section"],[12],[1,"\\n"],[44,[[28,[37,3],null,[["value","change"],[[28,[37,4],[[33,5],"Status:asc"],null],[28,[37,6],[[30,0],[28,[37,7],[[33,5]],null]],[["value"],["target.selected"]]]]]],[28,[37,3],null,[["status","source","searchproperty"],[[28,[37,3],null,[["value","change"],[[52,[33,9],[28,[37,10],[[33,9],","],null],[27]],[28,[37,6],[[30,0],[28,[37,7],[[33,9]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,3],null,[["value","change"],[[52,[33,11],[28,[37,10],[[33,11],","],null],[27]],[28,[37,6],[[30,0],[28,[37,7],[[33,11]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,3],null,[["value","change","default"],[[52,[28,[37,12],[[33,13],[27]],null],[28,[37,10],[[33,13],","],null],[33,14]],[28,[37,6],[[30,0],[28,[37,7],[[33,13]],null]],[["value"],["target.selectedItems"]]],[33,14]]]]]]],[30,1,["model","items"]],[30,1,["model","proxies","firstObject"]]],[[[41,[28,[37,15],[[30,4,["length"]],0],null],[[[1,"    "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[1,"\\n    "],[8,[39,16],null,[["@sources","@search","@onsearch","@sort","@filter"],[[28,[37,17],[[28,[37,18],[[30,4]],null],"ExternalSources"],null],[99,19,["@search"]],[28,[37,6],[[30,0],[28,[37,7],[[33,19]],null]],[["value"],["target.value"]]],[30,2],[30,3]]],null],[1,"\\n"]],[]],null],[41,[30,5,["ServiceName"]],[[[1,"      "],[8,[39,20],null,[["@src","@onchange"],[[28,[37,21],["/${partition}/${nspace}/${dc}/service-instances/for-service/${name}/${peer}",[28,[37,3],null,[["partition","nspace","dc","name","peer"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,5,["ServiceName"]],[30,1,["params","peer"]]]]]],null],[28,[37,6],[[30,0],[28,[37,7],[[33,22]],null]],[["value"],["data"]]]]],null],[1,"\\n"]],[]],null],[1,"    "],[8,[39,23],null,[["@type","@sort","@filters","@search","@items"],["service-instance",[30,2,["value"]],[30,3],[99,19,["@search"]],[30,4]]],[["default"],[[[[1,"\\n      "],[8,[30,6,["Collection"]],null,null,[["default"],[[[[1,"\\n        "],[8,[39,24],null,[["@routeName","@items","@proxies"],["dc.services.instance",[30,6,["items"]],[99,22,["@proxies"]]]],null],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[30,6,["Empty"]],null,null,[["default"],[[[[1,"\\n        "],[8,[39,25],null,null,[["default"],[[[[1,"\\n          "],[8,[39,26],null,[["@name"],["body"]],[["default"],[[[[1,"\\n            "],[1,[28,[35,27],["routes.dc.services.show.instances.empty"],[["items","htmlSafe"],[[30,4,["length"]],true]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[6]]]]],[1,"\\n"]],[2,3,4,5]]],[13],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","sort","filters","items","proxyMeta","collection"],false,["route","routeName","let","hash","or","sortBy","action","mut","if","status","split","source","not-eq","searchproperty","searchProperties","gt","consul/service-instance/search-bar","get","collection","search","data-source","uri","proxies","data-collection","consul/service-instance/list","empty-state","block-slot","t"]]',moduleName:"consul-ui/templates/dc/services/show/instances.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/show/intentions",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"sF5zClCb",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@name","@model"],[[99,1,["@name"]],[30,1,["model"]]]],[["default"],[[[[1,"\\n    "],[46,[28,[37,4],null,null],null,null,null],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","o"],false,["route","routeName","outlet","component","-outlet"]]',moduleName:"consul-ui/templates/dc/services/show/intentions.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/show/intentions/edit",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"FjErs42E",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n"],[44,[[28,[37,3],[[28,[37,4],["write intention for service"],[["item"],[[33,5,["Service"]]]]]],null]],[[[1,"  "],[8,[39,6],null,[["@src"],[[28,[37,7],["/${partition}/${nspace}/${dc}/intention/${id}",[28,[37,8],null,[["partition","nspace","dc","id"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[28,[37,9],[[30,1,["params","intention_id"]],""],null]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,10],null,[["@name"],["error"]],[["default"],[[[[1,"\\n        "],[8,[39,11],null,[["@error","@login"],[[30,3,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,10],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,3,["data"]]],[[[1,"        "],[8,[39,12],null,[["@readonly","@item","@dc","@nspace","@partition","@autofill","@onsubmit"],[[30,2],[30,4],[30,1,["model","dc"]],[30,1,["params","nspace"]],[30,1,["params","partition"]],[28,[37,8],null,[["DestinationName"],[[30,1,["params","name"]]]]],[28,[37,13],["dc.services.show.intentions.index"],null]]],null],[1,"\\n"]],[4]]],[1,"  "]],[]]]]],[1,"\\n"]],[3]]]]],[1,"\\n"]],[2]]]],[1]]]]],[1,"\\n"]],["route","readOnly","loader","item"],false,["route","routeName","let","not","can","item","data-loader","uri","hash","or","block-slot","error-state","consul/intention/form","transition-to"]]',moduleName:"consul-ui/templates/dc/services/show/intentions/edit.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/show/intentions/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"R5ukfGXO",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/intentions/for-service/${slug}",[28,[37,4],null,[["partition","nspace","dc","slug"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","name"]]]]]],null]]],[["default"],[[[[1,"\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error"],[[30,2,["error"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,8],[[33,9],"Action:asc"],null],[28,[37,10],[[30,0],[28,[37,11],[[33,9]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["access","searchproperty"],[[28,[37,4],null,[["value","change"],[[52,[33,13],[28,[37,14],[[33,13],","],null],[27]],[28,[37,10],[[30,0],[28,[37,11],[[33,13]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change","default"],[[52,[28,[37,15],[[33,16],[27]],null],[28,[37,14],[[33,16],","],null],[33,17]],[28,[37,10],[[30,0],[28,[37,11],[[33,16]],null]],[["value"],["target.selectedItems"]]],[33,17]]]]]]],[30,2,["data"]],[30,1,["model","item"]]],[[[1,"    "],[10,0],[14,0,"tab-section"],[12],[1,"\\n"],[41,[28,[37,18],["create intention for service"],[["item"],[[30,6,["Service"]]]]],[[[1,"        "],[8,[39,19],null,[["@target"],["app-view-actions"]],[["default"],[[[[1,"\\n          "],[8,[39,20],null,[["@text","@route"],["Create","dc.services.show.intentions.create"]],null],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[41,[28,[37,21],[[30,5,["length"]],0],null],[[[1,"        "],[8,[39,22],null,[["@search","@onsearch","@sort","@filter"],[[99,23,["@search"]],[28,[37,10],[[30,0],[28,[37,11],[[33,23]],null]],[["value"],["target.value"]]],[30,3],[30,4]]],null],[1,"\\n"]],[]],null],[1,"        "],[8,[39,24],null,[["@sink","@type","@ondelete"],[[28,[37,3],["/${partition}/${dc}/${nspace}/intention/",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null],"intention",[99,25,["@ondelete"]]]],[["default"],[[[[1,"\\n          "],[8,[39,5],null,[["@name"],["content"]],[["default"],[[[[1,"\\n            "],[8,[39,26],null,[["@type","@sort","@filters","@search","@items"],["intention",[30,3,["value"]],[30,4],[99,23,["@search"]],[30,5]]],[["default"],[[[[1,"\\n              "],[8,[30,8,["Collection"]],null,null,[["default"],[[[[1,"\\n                "],[8,[39,27],null,[["@items","@check","@delete"],[[30,8,["items"]],[99,23,["@check"]],[30,7,["delete"]]]],[["default"],[[[[1,"\\n                  "],[8,[30,9,["CustomResourceNotice"]],null,null,null],[1,"\\n                  "],[8,[30,9,["CheckNotice"]],null,null,null],[1,"\\n                  "],[8,[30,9,["Table"]],null,[["@routeName"],["dc.services.show.intentions.edit"]],null],[1,"\\n                "]],[9]]]]],[1,"\\n              "]],[]]]]],[1,"\\n              "],[8,[30,8,["Empty"]],null,null,[["default"],[[[[1,"\\n                "],[8,[39,28],null,[["@login"],[[30,1,["model","app","login","open"]]]],[["default"],[[[[1,"\\n                  "],[8,[39,5],null,[["@name"],["header"]],[["default"],[[[[1,"\\n                    "],[10,"h2"],[12],[1,"\\n                      "],[1,[28,[35,29],["routes.dc.services.show.intentions.index.empty.header"],[["items"],[[30,5,["length"]]]]]],[1,"\\n                    "],[13],[1,"\\n                  "]],[]]]]],[1,"\\n                  "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                    "],[1,[28,[35,29],["routes.dc.services.show.intentions.index.empty.body"],[["items","canUseACLs","htmlSafe"],[[30,5,["length"]],[28,[37,18],["use acls"],null],true]]]],[1,"\\n                  "]],[]]]]],[1,"\\n                  "],[8,[39,5],null,[["@name"],["actions"]],[["default"],[[[[1,"\\n                    "],[10,"li"],[12],[1,"\\n                      "],[8,[39,30],null,[["@text","@href","@icon","@iconPosition","@size"],["Documentation on intentions",[29,[[28,[37,31],["CONSUL_DOCS_URL"],null],"/commands/intention"]],"docs-link","trailing","small"]],null],[1,"\\n                    "],[13],[1,"\\n                    "],[10,"li"],[12],[1,"\\n                      "],[8,[39,30],null,[["@text","@href","@icon","@iconPosition","@size"],["Take the tutorial",[29,[[28,[37,31],["CONSUL_DOCS_LEARN_URL"],null],"/consul/getting-started/connect"]],"learn-link","trailing","small"]],null],[1,"\\n                    "],[13],[1,"\\n                  "]],[]]]]],[1,"\\n                "]],[]]]]],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[8]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[7]]]]],[1,"\\n    "],[13],[1,"\\n"]],[3,4,5,6]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","api","sort","filters","items","item","writer","collection","list"],false,["route","routeName","data-loader","uri","hash","block-slot","error-state","let","or","sortBy","action","mut","if","access","split","not-eq","searchproperty","searchProperties","can","portal","hds/button","gt","consul/intention/search-bar","search","data-writer","refresh-route","data-collection","consul/intention/list","empty-state","t","hds/link/standalone","env"]]',moduleName:"consul-ui/templates/dc/services/show/intentions/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/show/routing",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"LPaSV3FN",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/discovery-chain/${name}",[28,[37,4],null,[["partition","nspace","dc","name"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","name"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n      "],[10,0],[14,0,"tab-section"],[12],[1,"\\n        "],[8,[39,7],null,[["@chain"],[[30,2,["data","Chain"]]]],null],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","loader"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","consul/discovery-chain"]]',moduleName:"consul-ui/templates/dc/services/show/routing.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/show/services",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"9lMQo36C",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/gateways/for-service/${name}",[28,[37,4],null,[["partition","nspace","dc","name"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","name"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n  "],[10,0],[14,0,"tab-section"],[12],[1,"\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,8],[[33,9],"Status:asc"],null],[28,[37,10],[[30,0],[28,[37,11],[[33,9]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["instance","searchproperty"],[[28,[37,4],null,[["value","change"],[[52,[33,13],[28,[37,14],[[33,13],","],null],[27]],[28,[37,10],[[30,0],[28,[37,11],[[33,13]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change","default"],[[52,[28,[37,15],[[33,16],[27]],null],[28,[37,14],[[33,16],","],null],[33,17]],[28,[37,10],[[30,0],[28,[37,11],[[33,16]],null]],[["value"],["target.selectedItems"]]],[33,17]]]]]]],[30,2,["data"]]],[[[41,[28,[37,18],[[30,5,["length"]],0],null],[[[1,"      "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[1,"\\n      "],[8,[39,19],null,[["@search","@onsearch","@sort","@filter"],[[99,20,["@search"]],[28,[37,10],[[30,0],[28,[37,11],[[33,20]],null]],[["value"],["target.value"]]],[30,3],[30,4]]],null],[1,"\\n"]],[]],null],[1,"      "],[8,[39,21],null,[["@type","@sort","@filters","@search","@items"],["service",[30,3,["value"]],[30,4],[99,20,["@search"]],[30,5]]],[["default"],[[[[1,"\\n        "],[8,[30,6,["Collection"]],null,null,[["default"],[[[[1,"\\n          "],[1,[28,[35,22],["routes.dc.services.show.services.intro"],[["htmlSafe"],[true]]]],[1,"\\n          "],[8,[39,23],null,[["@nspace","@partition","@items"],[[28,[37,8],[[30,1,["params","nspace"]],[30,1,["model","user","token","Namespace"]],"default"],null],[28,[37,8],[[30,1,["params","partition"]],[30,1,["model","user","token","Partition"]],"default"],null],[30,6,["items"]]]],[["default"],[[[[1,"\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n        "],[8,[30,6,["Empty"]],null,null,[["default"],[[[[1,"\\n          "],[8,[39,24],null,null,[["default"],[[[[1,"\\n            "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n              "],[1,[28,[35,22],["routes.dc.services.show.services.empty"],[["items","htmlSafe"],[[30,5,["length"]],true]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n      "]],[6]]]]],[1,"\\n"]],[3,4,5]]],[1,"  "],[13],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","loader","sort","filters","items","collection"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","let","or","sortBy","action","mut","if","instance","split","not-eq","searchproperty","searchProperties","gt","consul/upstream/search-bar","search","data-collection","t","consul/service/list","empty-state"]]',moduleName:"consul-ui/templates/dc/services/show/services.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/show/tags",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"QPrKCkNR",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[10,0],[14,0,"tab-section"],[12],[1,"\\n"],[44,[[28,[37,3],[[28,[37,4],["Tags",[30,1,["model","items"]]],null]],null]],[[[41,[28,[37,6],[[30,2,["length"]],0],null],[[[1,"        "],[8,[39,7],null,[["@item"],[[28,[37,8],null,[["Tags"],[[30,2]]]]]],null],[1,"\\n"]],[]],[[[1,"        "],[8,[39,9],null,null,[["default"],[[[[1,"\\n          "],[8,[39,10],null,[["@name"],["header"]],[["default"],[[[[1,"\\n            "],[10,"h2"],[12],[1,"\\n              "],[1,[28,[35,11],["routes.dc.services.show.tags.empty.header"],null]],[1,"\\n            "],[13],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[39,10],null,[["@name"],["body"]],[["default"],[[[[1,"\\n            "],[1,[28,[35,11],["routes.dc.services.show.tags.empty.body"],[["htmlSafe"],[true]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]]]],[2]]],[1,"  "],[13],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","tags"],false,["route","routeName","let","flatten","map-by","if","gt","tag-list","hash","empty-state","block-slot","t"]]',moduleName:"consul-ui/templates/dc/services/show/tags.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/show/topology",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"ZLtuX5vP",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/topology/${name}/${kind}",[28,[37,4],null,[["partition","nspace","dc","name","kind"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","name"]],[28,[37,5],[[30,1,["model","items","firstObject","Service","Kind"]],""],null]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,7],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[30,1,["params","nspace"]],[30,1,["model","dc"]],[30,1,["model","items"]],[30,2,["data"]]],[[[1,"  "],[10,0],[14,0,"tab-section"],[12],[1,"\\n\\n    "],[10,0],[14,0,"topology-notices"],[12],[1,"\\n      "],[8,[39,9],null,[["@expanded"],[true]],[["default"],[[[[1,"\\n"],[44,[[28,[37,10],[[28,[37,11],[[28,[37,11],["filtered-by-acls",[28,[37,5],[false,[30,6,["FilteredByACLs"]]],null]],null],[28,[37,11],["default-allow",[28,[37,5],[false,[28,[37,12],[[30,4,["DefaultACLPolicy"]],"allow"],null]],null]],null],[28,[37,11],["wildcard-intention",[28,[37,5],[false,[30,6,["wildcardIntention"]]],null]],null],[28,[37,11],["not-defined-intention",[28,[37,5],[false,[30,6,["notDefinedIntention"]]],null]],null],[28,[37,11],["no-dependencies",[28,[37,5],[false,[28,[37,13],[[30,6,["noDependencies"]],[28,[37,14],["use acls"],null]],null]],null]],null],[28,[37,11],["acls-disabled",[28,[37,5],[false,[28,[37,13],[[30,6,["noDependencies"]],[28,[37,15],[[28,[37,14],["use acls"],null]],null]],null]],null]],null]],null]],null]],[[[1,"\\n"],[44,[[28,[37,16],[false,[28,[37,17],[[30,8]],null]],null]],[[[1,"\\n"],[42,[28,[37,19],[[30,8]],null],null,[[[41,[30,10],[[[1,"                "],[8,[30,7,["Details"]],null,[["@auto"],[false]],[["default"],[[[[1,"\\n                  "],[8,[39,21],[[16,1,[30,12,["id"]]],[24,0,"mb-3 mt-2 topology-metrics-notice"]],[["@type","@color"],["inline",[52,[28,[37,22],[[30,11],[28,[37,11],["filtered-by-acls","no-dependencies"],null]],null],"neutral","warning"]]],[["default"],[[[[1,"\\n                    "],[8,[30,13,["Title"]],null,null,[["default"],[[[[1,"\\n                      "],[1,[28,[35,23],[[28,[37,24],[[30,1,["t"]],"notice.${prop}.header",[28,[37,4],null,[["prop"],[[30,11]]]]],null]],null]],[1,"\\n                    "]],[]]]]],[1,"\\n"],[41,[30,7,["expanded"]],[[[1,"                      "],[8,[30,13,["Description"]],null,null,[["default"],[[[[1,"\\n                        "],[1,[28,[35,23],[[28,[37,24],[[30,1,["t"]],"notice.${prop}.body",[28,[37,4],null,[["prop"],[[30,11]]]]],null]],null]],[1,"\\n                      "]],[]]]]],[1,"\\n"]],[]],null],[41,[28,[37,13],[[30,7,["expanded"]],[28,[37,25],[[30,11],"filtered-by-acls"],null]],null],[[[41,[28,[37,22],[[30,11],[28,[37,11],["wildcard-intention","default-allow","no-intentions"],null]],null],[[[1,"                        "],[8,[30,13,["Button"]],null,[["@color","@size","@route","@text","@icon"],["secondary","small","dc.services.show.intentions",[28,[37,23],[[28,[37,24],[[30,1,["t"]],"notice.${prop}.footer.link-text",[28,[37,4],null,[["prop"],[[30,11]]]]],null]],null],[28,[37,23],[[28,[37,24],[[30,1,["t"]],"notice.${prop}.footer.icon",[28,[37,4],null,[["prop"],[[30,11]]]]],null]],null]]],null],[1,"\\n"]],[]],[[[1,"                        "],[8,[30,13,["Link::Standalone"]],null,[["@text","@href","@icon","@iconPosition"],[[28,[37,23],[[28,[37,24],[[30,1,["t"]],"notice.${prop}.footer.link-text",[28,[37,4],null,[["prop"],[[30,11]]]]],null]],null],[28,[37,23],[[28,[37,24],[[30,1,["t"]],"notice.${prop}.footer.link",[28,[37,4],null,[["prop"],[[30,11]]]]],null]],null],"docs-link","trailing"]],null],[1,"\\n"]],[]]]],[]],null],[1,"                  "]],[13]]]]],[1,"\\n                "]],[12]]]]],[1,"\\n"]],[]],null]],[10,11]],null],[1,"\\n"],[41,[28,[37,26],[[30,9,["length"]],2],null],[[[1,"              "],[8,[30,7,["Action"]],[[4,[38,27],["click",[30,7,["toggle"]]],null]],null,[["default"],[[[[1,"\\n              "],[1,[28,[35,23],[[28,[37,24],[[30,1,["t"]],"notices.${expanded}",[28,[37,4],null,[["expanded"],[[52,[30,7,["expanded"]],"close","open"]]]]],null]],null]],[1,"\\n              "]],[]]]]],[1,"\\n"]],[]],null],[1,"\\n"]],[9]]]],[8]]],[1,"      "]],[7]]]]],[1,"\\n\\n    "],[13],[1,"\\n\\n\\n    "],[8,[39,28],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/ui-config",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n"],[41,[30,14,["data"]],[[[1,"\\n      "],[8,[39,29],null,[["@nspace","@dc","@service","@topology","@metricsHref","@isRemoteDC","@hasMetricsProvider","@oncreate"],[[30,3],[30,4],[30,5,["firstObject"]],[30,6],[28,[37,30],[[30,14,["data","dashboard_url_templates","service"]],[28,[37,4],null,[["Datacenter","Service"],[[30,4,["Name"]],[28,[37,4],null,[["Name","Namespace","Partition"],[[30,5,["firstObject","Name"]],[28,[37,5],[[30,5,["firstObject","Namespace"]],""],null],[28,[37,5],[[30,5,["firstObject","Partition"]],""],null]]]]]]]],null],[28,[37,15],[[30,4,["Local"]]],null],[28,[37,26],[[30,14,["data","metrics_provider","length"]],0],null],[28,[37,31],["createIntention"],null]]],null],[1,"\\n\\n"]],[]],null],[1,"    "]],[14]]]]],[1,"\\n  "],[13],[1,"\\n"]],[3,4,5,6]]],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","loader","nspace","dc","items","topology","disclosure","notices","noticesEnabled","enabled","prop","details","A","config"],false,["route","routeName","data-loader","uri","hash","or","block-slot","app-error","let","disclosure","from-entries","array","eq","and","can","not","without","values","each","-each-in","if","hds/alert","includes","compute","fn","not-eq","gt","on","data-source","topology-metrics","render-template","route-action"]]',moduleName:"consul-ui/templates/dc/services/show/topology.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/services/show/upstreams",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"edRsEgtL",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/gateways/for-service/${name}",[28,[37,4],null,[["partition","nspace","dc","name"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]],[30,1,["params","name"]]]]]],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,6],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,5],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n  "],[10,0],[14,0,"tab-section"],[12],[1,"\\n"],[44,[[28,[37,4],null,[["value","change"],[[28,[37,8],[[33,9],"Status:asc"],null],[28,[37,10],[[30,0],[28,[37,11],[[33,9]],null]],[["value"],["target.selected"]]]]]],[28,[37,4],null,[["instance","searchproperty"],[[28,[37,4],null,[["value","change"],[[52,[33,13],[28,[37,14],[[33,13],","],null],[27]],[28,[37,10],[[30,0],[28,[37,11],[[33,13]],null]],[["value"],["target.selectedItems"]]]]]],[28,[37,4],null,[["value","change","default"],[[52,[28,[37,15],[[33,16],[27]],null],[28,[37,14],[[33,16],","],null],[33,17]],[28,[37,10],[[30,0],[28,[37,11],[[33,16]],null]],[["value"],["target.selectedItems"]]],[33,17]]]]]]],[28,[37,8],[[30,1,["params","partition"]],[30,1,["model","user","token","Partition"]],"default"],null],[28,[37,8],[[30,1,["params","nspace"]],[30,1,["model","user","token","Namespace"]],"default"],null],[30,1,["params","dc"]],[30,2,["data"]]],[[[41,[28,[37,18],[[30,8,["length"]],0],null],[[[1,"      "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[1,"\\n      "],[8,[39,19],null,[["@search","@onsearch","@sort","@filter"],[[99,20,["@search"]],[28,[37,10],[[30,0],[28,[37,11],[[33,20]],null]],[["value"],["target.value"]]],[30,3],[30,4]]],null],[1,"\\n"]],[]],null],[1,"        "],[1,[28,[35,21],["routes.dc.services.show.upstreams.intro"],[["htmlSafe"],[true]]]],[1,"\\n        "],[8,[39,22],null,[["@type","@sort","@filters","@search","@items"],["service",[30,3,["value"]],[30,4],[99,20,["@search"]],[30,8]]],[["default"],[[[[1,"\\n          "],[8,[30,9,["Collection"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,23],null,[["@items","@dc","@nspace","@partition"],[[30,9,["items"]],[30,7],[30,6],[30,5]]],[["default"],[[[[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[8,[30,9,["Empty"]],null,null,[["default"],[[[[1,"\\n            "],[8,[39,24],null,null,[["default"],[[[[1,"\\n              "],[8,[39,5],null,[["@name"],["body"]],[["default"],[[[[1,"\\n                "],[1,[28,[35,21],["routes.dc.services.show.upstreams.empty"],[["items","htmlSafe"],[[30,8,["length"]],true]]]],[1,"\\n              "]],[]]]]],[1,"\\n            "]],[]]]]],[1,"\\n          "]],[]]]]],[1,"\\n        "]],[9]]]]],[1,"\\n"]],[3,4,5,6,7,8]]],[1,"  "],[13],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","loader","sort","filters","partition","nspace","dc","items","collection"],false,["route","routeName","data-loader","uri","hash","block-slot","app-error","let","or","sortBy","action","mut","if","instance","split","not-eq","searchproperty","searchProperties","gt","consul/upstream/search-bar","search","t","data-collection","consul/upstream/list","empty-state"]]',moduleName:"consul-ui/templates/dc/services/show/upstreams.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/show",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"FQ+sKuK+",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,null,[["default"],[[[[1,"\\n    "],[8,[39,3],null,[["@name"],["header"]],[["default"],[[[[1,"\\n      "],[10,"h1"],[12],[1,"\\n        "],[8,[30,1,["Title"]],null,[["@title"],[[28,[37,4],[[28,[37,5],[[30,1,["t"]],"title"],null]],null]]],null],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,3],null,[["@name"],["toolbar"]],[["default"],[[[[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,3],null,[["@name"],["nav"]],[["default"],[[[[1,"\\n\\n"],[44,[[28,[37,7],[[28,[37,8],[[28,[37,8],["serverstatus",[28,[37,4],[[28,[37,5],[[30,1,["exists"]],"serverstatus"],null]],null]],null],[28,[37,8],["cataloghealth",false],null],[28,[37,8],["license",[28,[37,4],[[28,[37,5],[[30,1,["exists"]],"license"],null]],null]],null]],null]],null]],[[[1,"\\n"],[44,[[28,[37,9],[false,[28,[37,10],[[30,2]],null]],null]],[[[1,"\\n"],[41,[28,[37,12],[[30,3,["length"]],1],null],[[[1,"      "],[8,[39,13],null,[["@items"],[[28,[37,14],[[28,[37,8],[[52,[30,2,["serverstatus"]],[28,[37,15],null,[["label","href","selected"],[[28,[37,4],[[28,[37,5],[[30,1,["t"]],"serverstatus.title"],null]],null],[28,[37,16],["dc.show.serverstatus"],null],[28,[37,17],["dc.show.serverstatus"],null]]]],""],[52,[30,2,["cataloghealth"]],[28,[37,15],null,[["label","href","selected"],[[28,[37,4],[[28,[37,5],[[30,1,["t"]],"cataloghealth.title"],null]],null],[28,[37,16],["dc.show.cataloghealth"],null],[28,[37,17],["dc.show.cataloghealth"],null]]]],""],[52,[30,2,["license"]],[28,[37,15],null,[["label","href","selected"],[[28,[37,4],[[28,[37,5],[[30,1,["t"]],"license.title"],null]],null],[28,[37,16],["dc.show.license"],null],[28,[37,17],["dc.show.license"],null]]]]],""],null]],null]]],null],[1,"\\n"]],[]],null],[1,"\\n"]],[3]]]],[2]]],[1,"    "]],[]]]]],[1,"\\n    "],[8,[39,3],null,[["@name"],["content"]],[["default"],[[[[1,"\\n      "],[8,[39,18],null,[["@name","@model"],[[99,1,["@name"]],[30,1,["model"]]]],[["default"],[[[[1,"\\n        "],[46,[28,[37,20],null,null],null,null,null],[1,"\\n      "]],[4]]]]],[1,"\\n    "]],[]]]]],[1,"\\n\\n  "]],[]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","tabs","tabsEnabled","o"],false,["route","routeName","app-view","block-slot","compute","fn","let","from-entries","array","without","values","if","gt","tab-nav","compact","hash","href-to","is-href","outlet","component","-outlet"]]',moduleName:"consul-ui/templates/dc/show.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/show/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"ZLphbwyJ",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[1,[28,[35,2],[[28,[37,3],["replaceWith",[52,[28,[37,5],["access overview"],null],"dc.show.serverstatus","dc.services.index"]],null]],null]],[1,"\\n"]],[1]]]]],[1,"\\n\\n"]],["route"],false,["route","routeName","did-insert","route-action","if","can"]]',moduleName:"consul-ui/templates/dc/show/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/show/license",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"NAOKWgT+",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/license",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n\\n"],[44,[[30,2,["data"]]],[[[1,"    "],[8,[39,6],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,7],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["disconnected"]],[["default"],[[[[1,"\\n"],[41,[28,[37,9],[[30,2,["error","status"]],"404"],null],[[[1,"        "],[8,[39,10],[[4,[38,11],null,[["sticky"],[true]]]],[["@color"],["warning"]],[["default"],[[[[1,"\\n          "],[8,[30,5,["Title"]],null,null,[["default"],[[[[1,"Warning!"]],[]]]]],[1,"\\n          "],[8,[30,5,["Description"]],null,null,[["default"],[[[[1,"This service has been deregistered and no longer exists in the catalog."]],[]]]]],[1,"\\n        "]],[5]]]]],[1,"\\n"]],[]],[[[41,[28,[37,9],[[30,2,["error","status"]],"403"],null],[[[1,"        "],[8,[39,10],[[4,[38,11],null,[["sticky"],[true]]]],[["@color"],["critical"]],[["default"],[[[[1,"\\n          "],[8,[30,6,["Title"]],null,null,[["default"],[[[[1,"Error!"]],[]]]]],[1,"\\n          "],[8,[30,6,["Description"]],null,null,[["default"],[[[[1,"You no longer have access to this service."]],[]]]]],[1,"\\n        "]],[6]]]]],[1,"\\n"]],[]],[[[1,"        "],[8,[39,10],[[4,[38,11],null,[["sticky"],[true]]]],[["@color"],["warning"]],[["default"],[[[[1,"\\n          "],[8,[30,7,["Title"]],null,null,[["default"],[[[[1,"Warning!"]],[]]]]],[1,"\\n          "],[8,[30,7,["Description"]],null,null,[["default"],[[[[1,"An error was returned whilst loading this data, refresh to try again."]],[]]]]],[1,"\\n        "]],[7]]]]],[1,"\\n      "]],[]]]],[]]],[1,"    "]],[4]]]]],[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n      "],[10,0],[14,0,"tab-section"],[12],[1,"\\n        "],[10,"section"],[15,0,[28,[37,12],["validity",[28,[37,13],["valid",[30,3,["Valid"]]],null]],null]],[12],[1,"\\n          "],[10,"header"],[12],[1,"\\n            "],[10,"h2"],[12],[1,"\\n              "],[1,[28,[35,14],[[28,[37,15],[[30,1,["t"]],"expiry.header"],null]],null]],[1,"\\n            "],[13],[1,"\\n          "],[13],[1,"\\n\\n          "],[10,2],[12],[1,"\\n            "],[1,[28,[35,14],[[28,[37,15],[[30,1,["t"]],"expiry.${type}.body",[28,[37,4],null,[["type","date","time","htmlSafe"],[[52,[30,3,["Valid"]],"valid","expired"],[28,[37,16],[[30,3,["License","expiration_time"]]],[["year","month","day"],["numeric","long","numeric"]]],[28,[37,16],[[30,3,["License","expiration_time"]]],[["hour12","hour","hourCycle","minute","second","timeZoneName"],[true,"numeric","h12","numeric","numeric","short"]]],true]]]],null]],null]],[1,"\\n          "],[13],[1,"\\n\\n          "],[10,"dl"],[12],[1,"\\n            "],[10,"dt"],[15,0,[28,[37,12],[[28,[37,13],["valid",[30,3,["Valid"]]],null],[28,[37,13],["expired",[28,[37,17],[[30,3,["Valid"]]],null]],null],[28,[37,13],["warning",[28,[37,18],[[30,3,["License","expiration_time"]],2629800000],null]],null]],null]],[12],[1,"\\n              "],[1,[28,[35,14],[[28,[37,15],[[30,1,["t"]],"expiry.${type}.header",[28,[37,4],null,[["type"],[[52,[30,3,["Valid"]],"valid","expired"]]]]],null]],null]],[1,"\\n            "],[13],[1,"\\n            "],[10,"dd"],[12],[1,"\\n              "],[1,[28,[35,19],[[30,3,["License","expiration_time"]]],null]],[1,"\\n            "],[13],[1,"\\n          "],[13],[1,"\\n\\n          "],[10,"aside"],[12],[1,"\\n            "],[10,"header"],[12],[1,"\\n              "],[10,"h3"],[12],[1,"\\n                "],[1,[28,[35,14],[[28,[37,15],[[30,1,["t"]],"documentation.title"],null]],null]],[1,"\\n              "],[13],[1,"\\n            "],[13],[1,"\\n            "],[10,0],[14,0,"flex gap-1.5 flex-col"],[12],[1,"\\n              "],[8,[39,20],null,[["@text","@href","@icon"],[[28,[37,14],[[28,[37,15],[[30,1,["t"]],"documentation.links.license-expiration.text"],null]],null],[29,[[28,[37,21],[[28,[37,22],["CONSUL_DOCS_URL"],null],[28,[37,14],[[28,[37,15],[[30,1,["t"]],"documentation.links.license-expiration.link"],null]],null]],null]]],"docs-link"]],null],[1,"\\n              "],[8,[39,20],null,[["@text","@href","@icon"],[[28,[37,14],[[28,[37,15],[[30,1,["t"]],"documentation.links.renewing-license.text"],null]],null],[29,[[28,[37,21],[[28,[37,22],["CONSUL_DOCS_URL"],null],[28,[37,14],[[28,[37,15],[[30,1,["t"]],"documentation.links.renewing-license.link"],null]],null]],null]]],"docs-link"]],null],[1,"\\n              "],[8,[39,20],null,[["@text","@href","@icon"],[[28,[37,14],[[28,[37,15],[[30,1,["t"]],"documentation.links.applying-new-license.text"],null]],null],[29,[[28,[37,21],[[28,[37,22],["CONSUL_DOCS_URL"],null],[28,[37,14],[[28,[37,15],[[30,1,["t"]],"documentation.links.applying-new-license.link"],null]],null]],null]]],"docs-link"]],null],[1,"\\n            "],[13],[1,"\\n          "],[13],[1,"\\n\\n        "],[13],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n"]],[3]]],[1,"  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n\\n"]],["route","loader","item","after","T","T","T"],false,["route","routeName","data-loader","uri","hash","let","block-slot","error-state","if","eq","hds/toast","notification","class-map","array","compute","fn","format-time","not","temporal-within","temporal-format","hds/link/standalone","concat","env"]]',moduleName:"consul-ui/templates/dc/show/license.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/dc/show/serverstatus",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"UCwnBDmO",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["/${partition}/${nspace}/${dc}/datacenter",[28,[37,4],null,[["partition","nspace","dc"],[[30,1,["params","partition"]],[30,1,["params","nspace"]],[30,1,["params","dc"]]]]]],null]]],[["default"],[[[[1,"\\n\\n"],[44,[[30,2,["data"]]],[[[1,"    "],[8,[39,6],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,7],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["disconnected"]],[["default"],[[[[1,"\\n"],[41,[28,[37,9],[[30,2,["error","status"]],"404"],null],[[[1,"        "],[8,[39,10],[[4,[38,11],null,[["sticky"],[true]]]],[["@color"],["warning"]],[["default"],[[[[1,"\\n          "],[8,[30,5,["Title"]],null,null,[["default"],[[[[1,"Warning!"]],[]]]]],[1,"\\n          "],[8,[30,5,["Description"]],null,null,[["default"],[[[[1,"This service has been deregistered and no longer exists in the catalog."]],[]]]]],[1,"\\n        "]],[5]]]]],[1,"\\n"]],[]],[[[41,[28,[37,9],[[30,2,["error","status"]],"403"],null],[[[1,"        "],[8,[39,10],[[4,[38,11],null,[["sticky"],[true]]]],[["@color"],["critical"]],[["default"],[[[[1,"\\n          "],[8,[30,6,["Title"]],null,null,[["default"],[[[[1,"Error!"]],[]]]]],[1,"\\n          "],[8,[30,6,["Description"]],null,null,[["default"],[[[[1,"You no longer have access to this service."]],[]]]]],[1,"\\n        "]],[6]]]]],[1,"\\n"]],[]],[[[1,"        "],[8,[39,10],[[4,[38,11],null,[["sticky"],[true]]]],[["@color"],["warning"]],[["default"],[[[[1,"\\n          "],[8,[30,7,["Title"]],null,null,[["default"],[[[[1,"Warning!"]],[]]]]],[1,"\\n          "],[8,[30,7,["Description"]],null,null,[["default"],[[[[1,"An error was returned whilst loading this data, refresh to try again."]],[]]]]],[1,"\\n        "]],[7]]]]],[1,"\\n      "]],[]]]],[]]],[1,"    "]],[4]]]]],[1,"\\n\\n    "],[8,[39,6],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n      "],[10,0],[14,0,"tab-section"],[12],[1,"\\n\\n          "],[10,"section"],[15,0,[28,[37,12],["server-failure-tolerance"],null]],[12],[1,"\\n\\n            "],[10,"header"],[12],[1,"\\n              "],[10,"h2"],[12],[1,"\\n                "],[1,[28,[35,13],[[28,[37,14],[[30,1,["t"]],"tolerance.header"],null]],null]],[1,"\\n              "],[13],[1,"\\n              "],[8,[39,15],null,[["@icon","@iconPosition","@text","@href"],["docs-link","trailing",[28,[37,13],[[28,[37,14],[[30,1,["t"]],"tolerance.link-text"],null]],null],[29,[[28,[37,16],[[28,[37,17],["CONSUL_DOCS_URL"],null],[28,[37,13],[[28,[37,14],[[30,1,["t"]],"tolerance.link"],null]],null]],null]]]]],null],[1,"\\n            "],[13],[1,"\\n\\n            "],[10,"section"],[15,0,[28,[37,12],[[28,[37,18],["immediate-tolerance"],null]],null]],[12],[1,"\\n              "],[10,"header"],[12],[1,"\\n                "],[10,"h3"],[12],[1,"\\n                  "],[1,[28,[35,13],[[28,[37,14],[[30,1,["t"]],"tolerance.immediate.header"],null]],null]],[1,"\\n                "],[13],[1,"\\n              "],[13],[1,"\\n              "],[10,"dl"],[15,0,[28,[37,12],[[28,[37,18],["warning",[28,[37,19],[[28,[37,9],[[30,3,["FailureTolerance"]],0],null],[28,[37,9],[[30,3,["OptimisticFailureTolerance"]],0],null]],null]],null]],null]],[12],[1,"\\n                "],[10,"dt"],[12],[1,"\\n                  "],[1,[28,[35,13],[[28,[37,14],[[30,1,["t"]],"tolerance.immediate.body"],null]],null]],[1,"\\n                "],[13],[1,"\\n                "],[10,"dd"],[12],[1,"\\n                  "],[1,[30,3,["FailureTolerance"]]],[1,"\\n                "],[13],[1,"\\n              "],[13],[1,"\\n            "],[13],[1,"\\n\\n"],[41,[28,[37,20],["read zones"],null],[[[1,"            "],[10,"section"],[15,0,[28,[37,12],[[28,[37,18],["optimistic-tolerance"],null]],null]],[12],[1,"\\n              "],[10,"header"],[12],[1,"\\n                "],[10,"h3"],[12],[1,"\\n                  "],[1,[28,[35,13],[[28,[37,14],[[30,1,["t"]],"tolerance.optimistic.header"],null]],null]],[1,"\\n                  "],[11,1],[4,[38,21],["With > 30 seconds between server failures, Consul can restore the Immediate Fault Tolerance by replacing failed active voters with healthy back-up voters when using redundancy zones."],null],[12],[1,"\\n                  "],[13],[1,"\\n                "],[13],[1,"\\n              "],[13],[1,"\\n              "],[10,"dl"],[15,0,[28,[37,12],[[28,[37,18],["warning",[28,[37,9],[[30,3,["OptimisticFailureTolerance"]],0],null]],null]],null]],[12],[1,"\\n                "],[10,"dt"],[12],[1,"\\n                  "],[1,[28,[35,13],[[28,[37,14],[[30,1,["t"]],"tolerance.optimistic.body"],null]],null]],[1,"\\n                "],[13],[1,"\\n                "],[10,"dd"],[12],[1,"\\n                  "],[1,[30,3,["OptimisticFailureTolerance"]]],[1,"\\n                "],[13],[1,"\\n              "],[13],[1,"\\n\\n            "],[13],[1,"\\n"]],[]],null],[1,"          "],[13],[1,"\\n\\n"],[41,[28,[37,22],[[30,3,["RedundancyZones","length"]],0],null],[[[1,"          "],[10,"section"],[15,0,[28,[37,12],["redundancy-zones"],null]],[12],[1,"\\n            "],[10,"header"],[12],[1,"\\n              "],[10,"h2"],[12],[1,"\\n                "],[1,[28,[35,23],[[28,[37,24],["common.consul.redundancyzone"],null]],null]],[1,"\\n              "],[13],[1,"\\n            "],[13],[1,"\\n\\n"],[42,[28,[37,26],[[28,[37,26],[[30,3,["RedundancyZones"]]],null]],null],null,[[[41,[28,[37,22],[[30,8,["Servers","length"]],0],null],[[[1,"              "],[10,"section"],[12],[1,"\\n                "],[10,"header"],[12],[1,"\\n                  "],[10,"h3"],[12],[1,"\\n                    "],[1,[30,8,["Name"]]],[1,"\\n                  "],[13],[1,"\\n                  "],[10,"dl"],[15,0,[28,[37,12],[[28,[37,18],["warning",[28,[37,9],[[30,8,["FailureTolerance"]],0],null]],null]],null]],[12],[1,"\\n                      "],[10,"dt"],[12],[1,[28,[35,24],["common.consul.failuretolerance"],null]],[13],[1,"\\n                      "],[10,"dd"],[12],[1,[30,8,["FailureTolerance"]]],[13],[1,"\\n                  "],[13],[1,"\\n                "],[13],[1,"\\n                "],[8,[39,27],null,[["@items"],[[30,8,["Servers"]]]],null],[1,"\\n              "],[13],[1,"\\n"]],[]],null]],[8]],null],[1,"\\n"],[41,[28,[37,22],[[30,3,["Default","Servers","length"]],0],null],[[[1,"              "],[10,"section"],[12],[1,"\\n                "],[10,"header"],[12],[1,"\\n                  "],[10,"h3"],[12],[1,"\\n                    "],[1,[28,[35,13],[[28,[37,14],[[30,1,["t"]],"unassigned"],null]],null]],[1,"\\n                  "],[13],[1,"\\n                "],[13],[1,"\\n                "],[8,[39,27],null,[["@items"],[[30,3,["Default","Servers"]]]],null],[1,"\\n              "],[13],[1,"\\n"]],[]],null],[1,"\\n          "],[13],[1,"\\n"]],[]],[[[1,"          "],[10,"section"],[12],[1,"\\n            "],[10,"header"],[12],[1,"\\n              "],[10,"h2"],[12],[1,"\\n                "],[1,[28,[35,13],[[28,[37,14],[[30,1,["t"]],"servers"],null]],null]],[1,"\\n              "],[13],[1,"\\n            "],[13],[1,"\\n            "],[8,[39,27],null,[["@items"],[[30,3,["Default","Servers"]]]],null],[1,"\\n          "],[13],[1,"\\n"]],[]]],[1,"\\n"],[41,[28,[37,22],[[30,3,["ReadReplicas","length"]],0],null],[[[1,"          "],[10,"section"],[12],[1,"\\n            "],[10,"header"],[12],[1,"\\n              "],[10,"h2"],[12],[1,"\\n                "],[1,[28,[35,23],[[28,[37,24],["common.consul.readreplica"],null]],null]],[1,"\\n              "],[13],[1,"\\n            "],[13],[1,"\\n\\n            "],[8,[39,27],null,[["@items"],[[30,3,["ReadReplicas"]]]],null],[1,"\\n          "],[13],[1,"\\n"]],[]],null],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n"]],[3]]],[1,"  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n\\n"]],["route","loader","item","after","T","T","T","item"],false,["route","routeName","data-loader","uri","hash","let","block-slot","error-state","if","eq","hds/toast","notification","class-map","compute","fn","hds/link/standalone","concat","env","array","and","can","tooltip","gt","pluralize","t","each","-track-array","consul/server/list"]]',moduleName:"consul-ui/templates/dc/show/serverstatus.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/error",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"fBHiRsbk",block:'[[[41,[33,1],[[[8,[39,2],null,[["@error"],[[99,1,["@error"]]]],null],[1,"\\n"]],[]],null]],[],false,["if","error","app-error"]]',moduleName:"consul-ui/templates/error.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/index",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"GYFZBIFL",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@name","@model"],[[99,1,["@name"]],[30,1,["model"]]]],[["default"],[[[[1,"\\n    "],[46,[28,[37,4],null,null],null,null,null],[1,"\\n  "]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","o"],false,["route","routeName","outlet","component","-outlet"]]',moduleName:"consul-ui/templates/index.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/loading",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"bxrEoh3x",block:"[[],[],false,[]]",moduleName:"consul-ui/templates/loading.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/notfound",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"3oarGPY0",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@login","@error"],[[30,1,["model","app","login","open"]],[28,[37,3],null,[["status","message"],[404,"Unable to find that page"]]]]],null],[1,"\\n"]],[1]]]]],[1,"\\n\\n"]],["route"],false,["route","routeName","app-error","hash"]]',moduleName:"consul-ui/templates/notfound.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/templates/oauth-provider-debug",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"8VyAGRf6",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n"],[10,0],[14,5,"width: 50%;margin: 0 auto;"],[12],[1,"\\n  "],[10,"h1"],[12],[8,[30,1,["Title"]],null,[["@title"],["Mock OAuth Provider"]],null],[13],[1,"\\n  "],[10,"main"],[12],[1,"\\n    "],[10,"form"],[14,"method","GET"],[15,"action",[36,2]],[12],[1,"\\n"],[44,[[28,[37,4],null,[["state","code"],["state-123456789/abcdefghijklmnopqrstuvwxyz","code-abcdefghijklmnopqrstuvwxyz/123456789"]]]],[[[1,"      "],[8,[39,5],null,[["@name","@label","@item","@help"],["state","State",[30,2],"The OIDC state value that will get passed through to Consul"]],null],[1,"\\n      "],[8,[39,5],null,[["@name","@label","@item","@help"],["code","Code",[30,2],"The OIDC code value that will get passed through to Consul"]],null],[1,"\\n"]],[2]]],[1,"      "],[8,[39,6],null,[["@type"],["submit"]],[["default"],[[[[1,"\\n        Login\\n      "]],[]]]]],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n"],[13],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","item"],false,["route","routeName","redirect_uri","let","hash","text-input","action"]]',moduleName:"consul-ui/templates/oauth-provider-debug.hbs",isStrictMode:!1})
-e.default=n}))
-define("consul-ui/templates/settings",["exports","@ember/template-factory"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.createTemplateFactory)({id:"cNZzwPnu",block:'[[[8,[39,0],null,[["@name"],[[99,1,["@name"]]]],[["default"],[[[[1,"\\n  "],[8,[39,2],null,[["@src"],[[28,[37,3],["settings://consul:client"],null]]],[["default"],[[[[1,"\\n\\n    "],[8,[39,4],null,[["@name"],["error"]],[["default"],[[[[1,"\\n      "],[8,[39,5],null,[["@error","@login"],[[30,2,["error"]],[30,1,["model","app","login","open"]]]],null],[1,"\\n    "]],[]]]]],[1,"\\n\\n    "],[8,[39,4],null,[["@name"],["loaded"]],[["default"],[[[[1,"\\n"],[44,[[28,[37,7],[[30,2,["data"]],[28,[37,8],null,[["blocking"],[true]]]],null]],[[[1,"  "],[8,[39,9],null,null,[["default"],[[[[1,"\\n    "],[8,[39,4],null,[["@name"],["header"]],[["default"],[[[[1,"\\n      "],[10,"h1"],[12],[1,"\\n        "],[8,[30,1,["Title"]],null,[["@title"],["Settings"]],null],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n    "],[8,[39,4],null,[["@name"],["content"]],[["default"],[[[[1,"\\n      "],[8,[39,10],[[24,0,"mb-3 mt-2"]],[["@type"],["inline"]],[["default"],[[[[1,"\\n        "],[8,[30,4,["Title"]],null,null,[["default"],[[[[1,"Local Storage"]],[]]]]],[1,"\\n        "],[8,[30,4,["Description"]],null,null,[["default"],[[[[1,"These settings are immediately saved to local storage and persisted through browser usage."]],[]]]]],[1,"\\n      "]],[4]]]]],[1,"\\n      "],[10,"form"],[12],[1,"\\n"],[41,[28,[37,12],[[28,[37,13],["CONSUL_UI_DISABLE_REALTIME"],null]],null],[[[1,"      "],[8,[39,14],null,null,[["default"],[[[[1,"\\n        "],[8,[30,5,["Details"]],null,null,[["default"],[[[[1,"\\n          "],[8,[39,15],null,[["@data","@sink","@onchange"],[[30,3],"settings://consul:client",[28,[37,16],[[30,0],[28,[37,17],[[30,5,["close"]]],null]],null]]],null],[1,"\\n        "]],[]]]]],[1,"\\n        "],[10,"fieldset"],[12],[1,"\\n          "],[10,"h2"],[12],[1,"Blocking Queries"],[13],[1,"\\n          "],[10,2],[12],[1,"Keep catalog info up-to-date without refreshing the page. Any changes made to services, nodes and intentions would be reflected in real time."],[13],[1,"\\n          "],[10,0],[14,0,"type-toggle"],[12],[1,"\\n            "],[10,"label"],[12],[1,"\\n              "],[11,"input"],[24,3,"client[blocking]"],[16,"checked",[52,[30,3,["blocking"]],"checked"]],[24,4,"checkbox"],[4,[38,18],["change",[28,[37,19],[[28,[37,20],[[30,3],"blocking",[28,[37,12],[[30,3,["blocking"]]],null]],null],[28,[37,17],[[30,5,["open"]]],null]],null]],null],[12],[13],[1,"\\n              "],[10,1],[12],[1,[52,[30,3,["blocking"]],"On","Off"]],[13],[1,"\\n            "],[13],[1,"\\n          "],[13],[1,"\\n        "],[13],[1,"\\n      "]],[5]]]]],[1,"\\n"]],[]],null],[1,"      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[3]]],[1,"  "]],[]]]]],[1,"\\n"]],[2]]]]],[1,"\\n"]],[1]]]]],[1,"\\n"]],["route","loader","item","A","disclosure"],false,["route","routeName","data-loader","uri","block-slot","app-error","let","or","hash","app-view","hds/alert","if","not","env","disclosure","data-sink","action","fn","on","queue","set"]]',moduleName:"consul-ui/templates/settings.hbs",isStrictMode:!1})
-e.default=n})),define("consul-ui/transforms/array",["exports","ember-data-model-fragments/transforms/array"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default
-e.default=n})),define("consul-ui/transforms/boolean",["exports","@ember-data/serializer/-private"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.BooleanTransform}})})),define("consul-ui/transforms/date",["exports","@ember-data/serializer/-private"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.DateTransform}})})),define("consul-ui/transforms/fragment-array",["exports","ember-data-model-fragments/transforms/fragment-array"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default
-e.default=n})),define("consul-ui/transforms/fragment",["exports","ember-data-model-fragments/transforms/fragment"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default
-e.default=n})),define("consul-ui/transforms/number",["exports","@ember-data/serializer/-private"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.NumberTransform}})})),define("consul-ui/transforms/string",["exports","@ember-data/serializer/-private"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.StringTransform}})})),define("consul-ui/utils/ascend",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){const n=e.split("/")
-return n.length>t?n.slice(0,-t).concat("").join("/"):""}})),define("consul-ui/utils/atob",["exports","base64-js"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"utf-8"
-const l=t.default.toByteArray(e)
-return new TextDecoder(n).decode(l)}})),define("consul-ui/utils/btoa",["exports","base64-js"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){const n=(new TextEncoder).encode(e)
-return t.default.fromByteArray(n)}})),define("consul-ui/utils/calculate-position",["exports","ember-basic-dropdown/utils/calculate-position"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/utils/callable-type",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return"function"!=typeof e?function(){return e}:e}})),define("consul-ui/utils/create-fingerprinter",["exports","@ember/object","@ember/utils"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,l,r){let i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:JSON.stringify
-return function(o,a,u,s,c){return function(d){if(null==(u=null==u?d[e]:u))throw new Error(`Unable to create fingerprint, missing foreignKey value. Looking for value in \`${e}\` got \`${u}\``)
-const p=a.split(",").map((function(e){const l=(0,t.get)(d,e)
-if((0,n.isEmpty)(l)){if("PeerName"===e)return
-throw new Error(`Unable to create fingerprint, missing slug. Looking for value in \`${e}\` got \`${l}\``)}return l})).compact()
-return void 0===d[l]&&("*"===s&&(s="default"),d[l]=s),void 0===d[r]&&("*"===c&&(c="default"),d[r]=c),void 0===d[e]&&(d[e]=u),void 0===d[o]&&(d[o]=i([d[r],d[l],u].concat(p))),d}}}})),define("consul-ui/utils/distance",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){e=e.Coord,t=t.Coord
-let n=0
-for(let o=0;o<e.Vec.length;o++){var l=e.Vec[o]-t.Vec[o]
-n+=l*l}let r=Math.sqrt(n)+e.Height+t.Height
-const i=r+e.Adjustment+t.Adjustment
-i>0&&(r=i)
-return Math.round(1e5*r)/100}})),define("consul-ui/utils/dom/click-first-anchor",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:t
-return function(t){let l=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"tr"
-const r=t.target.nodeName.toLowerCase()
-switch(r){case"input":case"label":case"a":case"button":return}const i=e(l,t.target).querySelector("a")
-i&&n(i)}}
-const t=function(e){["mousedown","mouseup","click"].map((function(e){return new MouseEvent(e,{bubbles:!0,cancelable:!0,view:window})})).forEach((function(t){e.dispatchEvent(t)}))}})),define("consul-ui/utils/dom/closest",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){try{return t.closest(e)}catch(n){return}}})),define("consul-ui/utils/dom/create-listeners",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[]
-return new t(e)}
-class t{constructor(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[]
-this.listeners=e}add(e,n,l){let r
-if("function"==typeof e)r=e
-else if(e instanceof t)r=e.remove.bind(e)
-else{let t="addEventListener",i="removeEventListener"
-void 0===e[t]&&(t="on",i="off")
-let o=n
-"string"==typeof o&&(o={[n]:l})
-const a=Object.keys(o).map((function(n){return function(n,l){return e[t](n,l),function(){return e[i](n,l),l}}(n,o[n])}))
-r=()=>a.map((e=>e()))}return this.listeners.push(r),()=>{const e=this.listeners.findIndex((function(e){return e===r}))
-return this.listeners.splice(e,1)[0]()}}remove(){const e=this.listeners.map((e=>e()))
-return this.listeners.splice(0,this.listeners.length),e}}})),define("consul-ui/utils/dom/event-source/blocking",["exports","@ember/object"],(function(e,t){function n(e,t){if(null==e)return{}
-var n,l,r=function(e,t){if(null==e)return{}
-var n,l,r={},i=Object.keys(e)
-for(l=0;l<i.length;l++)n=i[l],t.indexOf(n)>=0||(r[n]=e[n])
-return r}(e,t)
-if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(e)
-for(l=0;l<i.length;l++)n=i[l],t.indexOf(n)>=0||Object.prototype.propertyIsEnumerable.call(e,n)&&(r[n]=e[n])}return r}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let a=arguments.length>1&&void 0!==arguments[1]?arguments[1]:l()
-const u=function(l){let u=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-const{currentEvent:s}=u,c=n(u,["currentEvent"])
-e.apply(this,[e=>{const{createEvent:u}=e,s=n(e,["createEvent"])
-return l.apply(this,[s,this]).catch(a).then((n=>{if(n instanceof Error)return n
-let l=("function"==typeof u?u:o)(n,e)
-l.type||(l={type:"message",data:l})
-const a=(0,t.get)(l.data||{},"meta")
-a&&(e.cursor=r(a.cursor,e.cursor),e.cacheControl=a.cacheControl,e.interval=a.interval),-1===(e.cacheControl||"").indexOf("no-store")&&(this.currentEvent=l),this.dispatchEvent(l)
-const s=i(e,l,this.previousEvent)
-return this.previousEvent=this.currentEvent,s(n)}))},c]),void 0!==s&&(this.currentEvent=s),this.addEventListener("open",(e=>{const t=e.target.getCurrentEvent()
-void 0!==t&&this.dispatchEvent(t)}))}
-return u.prototype=Object.assign(Object.create(e.prototype,{constructor:{value:e,configurable:!0,writable:!0}}),{getCurrentEvent:function(){return this.currentEvent},getPreviousEvent:function(){return this.previousEvent}}),u},e.validateCursor=e.createErrorBackoff=void 0
-const l=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:3e3,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:Promise,l=arguments.length>2&&void 0!==arguments[2]?arguments[2]:setTimeout
-return function(r){let i=(0,t.get)(r,"errors.firstObject.status")||(0,t.get)(r,"statusCode")
-if(void 0!==i)switch(i=i.toString(),!0){case 0===i.indexOf("5")&&3===i.length&&"500"!==i:case"0"===i:return new n((function(t){l((function(){t(r)}),e)}))}throw r}}
-e.createErrorBackoff=l
-const r=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null,n=parseInt(e)
-if(!isNaN(n))return null!==t&&n<t&&(n=0),Math.max(n,1)}
-e.validateCursor=r
-const i=function(e,t,n){return function(t){return new Promise((function(n,l){setTimeout((function(){n(t)}),e.interval||2e3)}))}},o=function(e,t){return{type:"message",data:e}}})),define("consul-ui/utils/dom/event-source/cache",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:Promise
-return function(l){return function(r,i){const o=i.key
-if(void 0!==l[o]&&i.settings.enabled)return void 0===l[o].configuration&&(l[o].configuration={}),l[o].configuration.settings=i.settings,e(l[o])
-{const a=i.type||t,u=l[o]=new a(r,i)
-return e(u).catch((function(e){return delete l[o],n.reject(e)})).then((function(e){return void 0===e.configuration.cursor&&(e.close(),delete l[o]),e}))}}}}})),define("consul-ui/utils/dom/event-source/callable",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:Promise,i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:t,o=arguments.length>3&&void 0!==arguments[3]?arguments[3]:n
-const a=function(t){let n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-e.call(this),this.readyState=2,this.source="function"!=typeof t?function(e,t){return this.close(),r.resolve()}:t,this.readyState=0,r.resolve().then((()=>{if(!(this.readyState>1))return this.readyState=1,this.dispatchEvent({type:"open"}),i(this,n,l)})).catch((e=>{this.dispatchEvent(o(e)),this.readyState=2,this.dispatchEvent({type:"close",error:e})})).then((()=>{this.readyState=2}))}
-return a.prototype=Object.assign(Object.create(e.prototype,{constructor:{value:a,configurable:!0,writable:!0}}),{close:function(){switch(this.readyState){case 0:case 2:this.readyState=2
-break
-default:this.readyState=3}return this}}),a},e.defaultRunner=void 0
-const t=function(e,n,l){if(!l(e))return e.source.bind(e)(n,e).then((function(r){return t(e,n,l)}))
-e.dispatchEvent({type:"close"})}
-e.defaultRunner=t
-const n=function(e){return new ErrorEvent("error",{error:e,message:e.message})},l=function(e){switch(e.readyState){case 2:case 3:return!0}return!1}})),define("consul-ui/utils/dom/event-source/index",["exports","@ember/object/proxy","@ember/array/proxy","consul-ui/utils/dom/create-listeners","consul-ui/utils/dom/event-target/rsvp","consul-ui/utils/dom/event-source/cache","consul-ui/utils/dom/event-source/proxy","consul-ui/utils/dom/event-source/resolver","consul-ui/utils/dom/event-source/callable","consul-ui/utils/dom/event-source/openable","consul-ui/utils/dom/event-source/blocking","consul-ui/utils/dom/event-source/storage","@ember/object","ember-concurrency","consul-ui/env"],(function(e,t,n,l,r,i,o,a,u,s,c,d,p,f,m){let h
-switch(Object.defineProperty(e,"__esModule",{value:!0}),e.once=e.toPromise=e.fromPromise=e.cache=e.source=e.resolve=e.proxy=e.StorageEventSource=e.BlockingEventSource=e.OpenableEventSource=e.CallableEventSource=void 0,(0,m.env)("CONSUL_UI_REALTIME_RUNNER")){case"ec":h=function(e,t,n){return p.default.extend({task:(0,f.task)((function*(){for(;!n(e);)yield e.source.bind(e)(t)}))}).create().get("task").perform()}
-break
-case"generator":h=async function(e,t,n){const l=function*(){for(;!n(e);)yield e.source.bind(e)(t)}
-let r,i=l().next()
-for(;!i.done;)r=await i.value,i=l().next()
-return r}
-break
-case"async":h=async function(e,t,n){let l
-for(;!n(e);)l=await e.source.bind(e)(t)
-return l}}const b=(0,u.default)(r.default,Promise,h)
-e.CallableEventSource=b
-const y=(0,s.default)(b)
-e.OpenableEventSource=y
-const g=(0,c.default)(y)
-e.BlockingEventSource=g
-const v=(0,d.default)(r.default,Promise)
-e.StorageEventSource=v
-const O=(0,o.default)(t.default,n.default,l.default)
-e.proxy=O
-const P=(0,a.default)(Promise)
-e.resolve=P
-const x=function(e){return P(e,(0,l.default)()).then((function(t){return O(e,t)}))}
-e.source=x
-const w=(0,i.default)(x,g,Promise)
-e.cache=w
-e.fromPromise=function(e){return new b((function(t){const n=this.dispatchEvent.bind(this),l=()=>{this.close()}
-return e.then((function(e){l(),n({type:"message",data:e})})).catch((function(e){l(),n(function(e){return new ErrorEvent("error",{error:e,message:e.message})}(e))}))}))}
-e.toPromise=function(e,t){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"message",l=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"error"
-return new Promise((function(r,i){const o=function(e){r(e.data)},a=function(e){i(e.error)}
-e.addEventListener(n,o),e.addEventListener(l,a),t((function(){"function"==typeof e.close&&e.close(),e.removeEventListener(n,o),e.removeEventListener(l,a)}))}))}
-e.once=function(e,t){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:y
-return new n((function(t,n){return e(t,n).then((function(e){n.dispatchEvent({type:"message",data:e}),n.close()})).catch((function(e){n.dispatchEvent({type:"error",error:e}),n.close()}))}),t)}})),define("consul-ui/utils/dom/event-source/openable",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:EventSource
-const t=function(t){let n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-e.apply(this,arguments),this.configuration=n}
-return t.prototype=Object.assign(Object.create(e.prototype,{constructor:{value:t,configurable:!0,writable:!0}}),{open:function(){switch(this.readyState){case 3:this.readyState=1
-break
-case 2:e.apply(this,[this.source,this.configuration])}return this}}),t}})),define("consul-ui/utils/dom/event-source/proxy",["exports","@ember/object"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,l,r){return function(i){let o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[],a=e,u="object"
-return"string"!=typeof o&&void 0!==(0,t.get)(o,"length")&&(a=l,u="array",o=o.filter((function(e){return!(0,t.get)(e,"isDestroyed")&&!(0,t.get)(e,"isDeleted")&&(0,t.get)(e,"isLoaded")}))),void 0===n[u]&&(n[u]=a.extend({init:function(){this.listeners=r(),this.listeners.add(this._source,"message",(e=>(0,t.set)(this,"content",e.data))),this._super(...arguments)},addEventListener:function(e,t){this.listeners.add(this._source,e,t)},getCurrentEvent:function(){return this._source.getCurrentEvent(...arguments)},removeEventListener:function(){return this._source.removeEventListener(...arguments)},dispatchEvent:function(){return this._source.dispatchEvent(...arguments)},close:function(){return this._source.close(...arguments)},open:function(){return this._source.open(...arguments)},willDestroy:function(){this._super(...arguments),this.close(),this.listeners.remove()}})),n[u].create({content:o,_source:i,configuration:i.configuration})}}
-const n={}})),define("consul-ui/utils/dom/event-source/resolver",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:Promise
-return function(t,n){let l
-return"function"==typeof t.getCurrentEvent&&(l=t.getCurrentEvent()),null!=l?e.resolve(l.data).then((function(e){return t.open(),e})):new e((function(e,l){n.add(t,"error",(function(e){n.remove(),e.target.close(),l(e.error)})),n.add(t,"message",(function(t){n.remove(),e(t.data)}))}))}}})),define("consul-ui/utils/dom/event-source/storage",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:Promise
-const n=function(e){if((void 0===e||e.key===this.configuration.key)&&1===this.readyState){const e=this.source(this.configuration)
-t.resolve(e).then((e=>{this.configuration.cursor++,this._currentEvent={type:"message",data:e},this.dispatchEvent({type:"message",data:e})}))}}
-return class extends e{constructor(e,t){super(...arguments),this.readyState=2,this.target=t.target||window,this.name="storage",this.source=e,this.handler=n.bind(this),this.configuration=t,this.configuration.cursor=1,this.open()}dispatchEvent(){if(1===this.readyState)return super.dispatchEvent(...arguments)}close(){this.target.removeEventListener(this.name,this.handler),this.readyState=2}getCurrentEvent(){return this._currentEvent}open(){const e=this.readyState
-this.readyState=1,1!==e&&(this.target.addEventListener(this.name,this.handler),this.handler())}}}})),define("consul-ui/utils/dom/event-target/event-target-shim/event",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.wrapEvent=function(e,t){return new(u(Object.getPrototypeOf(t)))(e,t)},e.isStopped=function(e){return l(e).immediateStopped},e.setEventPhase=function(e,t){l(e).eventPhase=t},e.setCurrentTarget=function(e,t){l(e).currentTarget=t},e.setPassiveListener=function(e,t){l(e).passiveListener=t}
-const t=new WeakMap,n=new WeakMap
-function l(e){const n=t.get(e)
-return console.assert(null!=n,"'this' is expected an Event object, but got",e),n}function r(e){null==e.passiveListener?e.event.cancelable&&(e.canceled=!0,"function"==typeof e.event.preventDefault&&e.event.preventDefault()):"undefined"!=typeof console&&"function"==typeof console.error&&console.error("Unable to preventDefault inside passive event listener invocation.",e.passiveListener)}function i(e,n){t.set(this,{eventTarget:e,event:n,eventPhase:2,currentTarget:e,canceled:!1,stopped:!1,immediateStopped:!1,passiveListener:null,timeStamp:n.timeStamp||Date.now()}),Object.defineProperty(this,"isTrusted",{value:!1,enumerable:!0})
-const l=Object.keys(n)
-for(let t=0;t<l.length;++t){const e=l[t]
-e in this||Object.defineProperty(this,e,o(e))}}function o(e){return{get(){return l(this).event[e]},set(t){l(this).event[e]=t},configurable:!0,enumerable:!0}}function a(e){return{value(){const t=l(this).event
-return t[e].apply(t,arguments)},configurable:!0,enumerable:!0}}function u(e){if(null==e||e===Object.prototype)return i
-let t=n.get(e)
-return null==t&&(t=function(e,t){const n=Object.keys(t)
-if(0===n.length)return e
-function l(t,n){e.call(this,t,n)}l.prototype=Object.create(e.prototype,{constructor:{value:l,configurable:!0,writable:!0}})
-for(let r=0;r<n.length;++r){const i=n[r]
-if(!(i in e.prototype)){const e="function"==typeof Object.getOwnPropertyDescriptor(t,i).value
-Object.defineProperty(l.prototype,i,e?a(i):o(i))}}return l}(u(Object.getPrototypeOf(e)),e),n.set(e,t)),t}i.prototype={get type(){return l(this).event.type},get target(){return l(this).eventTarget},get currentTarget(){return l(this).currentTarget},composedPath(){const e=l(this).currentTarget
-return null==e?[]:[e]},get NONE(){return 0},get CAPTURING_PHASE(){return 1},get AT_TARGET(){return 2},get BUBBLING_PHASE(){return 3},get eventPhase(){return l(this).eventPhase},stopPropagation(){const e=l(this)
-e.stopped=!0,"function"==typeof e.event.stopPropagation&&e.event.stopPropagation()},stopImmediatePropagation(){const e=l(this)
-e.stopped=!0,e.immediateStopped=!0,"function"==typeof e.event.stopImmediatePropagation&&e.event.stopImmediatePropagation()},get bubbles(){return Boolean(l(this).event.bubbles)},get cancelable(){return Boolean(l(this).event.cancelable)},preventDefault(){r(l(this))},get defaultPrevented(){return l(this).canceled},get composed(){return Boolean(l(this).event.composed)},get timeStamp(){return l(this).timeStamp},get srcElement(){return l(this).eventTarget},get cancelBubble(){return l(this).stopped},set cancelBubble(e){if(!e)return
-const t=l(this)
-t.stopped=!0,"boolean"==typeof t.event.cancelBubble&&(t.event.cancelBubble=!0)},get returnValue(){return!l(this).canceled},set returnValue(e){e||r(l(this))},initEvent(){}},Object.defineProperty(i.prototype,"constructor",{value:i,configurable:!0,writable:!0}),"undefined"!=typeof window&&void 0!==window.Event&&(Object.setPrototypeOf(i.prototype,window.Event.prototype),n.set(window.Event.prototype,i))})),define("consul-ui/utils/dom/event-target/rsvp",["exports","rsvp","consul-ui/utils/dom/event-target/event-target-shim/event"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=function(){}
-l.prototype=Object.assign(Object.create(Object.prototype,{constructor:{value:l,configurable:!0,writable:!0}}),{dispatchEvent:function(e){const t=(0,n.wrapEvent)(this,e);(0,n.setCurrentTarget)(t,null)
-const l=e.type,r=t
-let i=function(e){let t=e._promiseCallbacks
-return t||(t=e._promiseCallbacks={}),t}(this),o=i[l]
-if(o){let e
-for(let t=0;t<o.length;t++)e=o[t],e.bind(this)(r)}},addEventListener:function(e,t){this.on(e,t)},removeEventListener:function(e,t){try{this.off(e,t)}catch(n){}}}),t.default.EventTarget.mixin(l.prototype)
-var r=l
-e.default=r})),define("consul-ui/utils/dom/get-component-factory",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"-view-registry:main"
-const n=e.lookup(t)
-return function(e){const t=e.getAttribute("id")
-if(t)return n[t]}}})),define("consul-ui/utils/dom/is-outside",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:document
-if(e){const l=!t||!n.contains(t),r=e===t||e.contains(t)
-return!l&&!r}return!1}}))
-define("consul-ui/utils/dom/normalize-event",["exports"],(function(e){function t(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function n(e){for(var n=1;n<arguments.length;n++){var r=null!=arguments[n]?arguments[n]:{}
-n%2?t(Object(r),!0).forEach((function(t){l(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):t(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){let l=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{}
-if(void 0!==e.target)return e
-return{target:n(n({},l),{name:e,value:t})}}})),define("consul-ui/utils/dom/qsa-factory",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:document
-return function(t){let n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:e
-return n.querySelectorAll(t)}}})),define("consul-ui/utils/dom/sibling",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){let n=e
-for(;n=n.nextSibling;)if(1===n.nodeType&&n.nodeName.toLowerCase()===t)return n}})),define("consul-ui/utils/editor/lint",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){n(e,t,(function(){e.getValue().trim().length&&e.performLint()}))},e.createLoader=void 0
-const t=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:document.getElementsByTagName.bind(document),t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:CodeMirror
-return t.registerHelper("lint","ruby",(function(e){return[]})),function(n,l,r){let i=[...e("script")]
-const o=i.find((function(e){return-1!==e.src.indexOf(`/codemirror/mode/${l}/${l}.js`)}))
-t.autoLoadMode(n,l),o?r():(i=[...e("script")],t.on(i[0],"load",(function(){r()})))}}
-e.createLoader=t
-const n=t()})),define("consul-ui/utils/filter/index",["exports","mnemonist/set"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.andOr=void 0
-e.andOr=e=>{const n=function(e){return Object.entries(e).reduce(((e,t)=>{let[n,l]=t
-return e[n]="function"!=typeof l?new Set(Object.keys(l)):null,e}),{})}(e)
-return l=>(l=function(e,n){return Object.keys(n).reduce(((l,r)=>{const i=void 0===e[r]?[]:e[r]
-return i.length>0&&(null!==n[r]?l[r]=[...t.default.intersection(n[r],new Set(i))]:l[r]=[...new Set(i)]),l}),{})}(l,n),t=>function(e,t,n){return Object.entries(t).every((t=>{let[l,r]=t,i=n[l]
-return"function"==typeof i?i(e,r):r.some((t=>i[t](e,t)))}))}(t,l,e))}})),define("consul-ui/utils/form/builder",["exports","@ember/object","ember-changeset","consul-ui/utils/form/changeset","ember-changeset-validations","consul-ui/utils/get-form-name-property"],(function(e,t,n,l,r,i){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:o,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:i.default
-return function(){let l=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-const i={}
-let o=null
-const a={data:null,name:l,getName:function(){return this.name},setData:function(n){return o&&!Array.isArray(n)&&(n=e(n,o)),(0,t.set)(this,"data",n),this},getData:function(){return this.data},add:function(e){return i[e.getName()]=e,this},handleEvent:function(e,l){const i=e.target,o=n(l||i.name),a=o[0],u=o[1]
-let s=r
-if(a!==this.getName()){if(this.has(a))return this.form(a).handleEvent(e)
-s=s[a]}const c=this.getData(),d="function"==typeof c.toJSON?c.toJSON():(0,t.get)(c,"data").toJSON()
-if(!Object.keys(d).includes(u)){const e=new Error(`${u} property doesn't exist`)
-throw e.target=i,e}let p=(0,t.get)(c,u)
-if(Array.isArray(p)||void 0!==s[u]&&"string"==typeof s[u].type&&"array"===s[u].type.toLowerCase()){null==p&&(p=[])
-p[i.checked?"pushObject":"removeObject"](i.value),(0,t.set)(c,u,p)}else void 0===i.checked||"on"!==i.value.toLowerCase()&&"off"!==i.value.toLowerCase()?(0,t.set)(c,u,i.value):(0,t.set)(c,u,i.checked)
-return this.validate()},reset:function(){return"function"==typeof this.getData().rollbackAttributes&&this.getData().rollbackAttributes(),this},clear:function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-return"function"==typeof e?this.clearer=e:this.setData(this.clearer(e)).getData()},submit:function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-if("function"==typeof e)return this.submitter=e
-this.submitter(this.getData())},setValidators:function(e){return o=e,this},validate:function(){const e=this.getData()
-return"function"==typeof e.validate&&e.validate(),this},addError:function(e,t){const n=this.getData()
-"function"==typeof n.addError&&n.addError(...arguments)},form:function(e){return null==e?this:i[e]},has:function(e){return void 0!==i[e]}}
-return a.submit=a.submit.bind(a),a.reset=a.reset.bind(a),a}},e.defaultChangeset=void 0
-const o=function(e,t){return(0,n.Changeset)(e,(0,r.default)(t),t,{changeset:l.default})}
-e.defaultChangeset=o})),define("consul-ui/utils/form/changeset",["exports","@ember/object","ember-changeset"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class l extends n.EmberChangeset{pushObject(e,n){let l
-void 0===(0,t.get)(this,`_changes.${e}`)?(l=(0,t.get)(this,`data.${e}`),l=l?l.toArray():[]):l=this.get(e).slice(0),l.push(n),this.set(`${e}`,l)}removeObject(e,n){let l
-void 0===(0,t.get)(this,`_changes.${e}`)?(l=(0,t.get)(this,`data.${e}`),l=void 0===l?[]:l.toArray()):l=this.get(e).slice(0)
-const r=l.indexOf(n);-1!==r&&l.splice(r,1),this.set(`${e}`,l)}}e.default=l})),define("consul-ui/utils/get-environment",["exports","@ember/debug"],(function(e,t){function n(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function l(e){for(var t=1;t<arguments.length;t++){var l=null!=arguments[t]?arguments[t]:{}
-t%2?n(Object(l),!0).forEach((function(t){r(e,t,l[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(l)):n(Object(l)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(l,t))}))}return e}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:window,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:document;(0,t.runInDebug)((()=>{const e=function(e){return e.split(";").map((e=>e.trim())).filter((e=>""!==e)).filter((e=>e.split("=").shift().startsWith("CONSUL_")))}
-n.Scenario=function(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:""
-if(t.length>0)e(t).forEach((e=>{if(e.startsWith("CONSUL_COLOR_SCHEME=")){const[,l]=e.split("=")
-let r
-try{r=JSON.parse(n.localStorage.getItem("consul:theme"))}catch(t){r={"color-scheme":"light"}}n.localStorage.setItem("consul:theme",`{"color-scheme": "${"!"===l?"light"===r["color-scheme"]?"dark":"light":l}"}`)}else r.cookie=`${e};Path=/`})),n.location.hash="",location.reload()
-else{t=e(r.cookie).join(";")
-n.open("","_blank").document.write(`<body><pre>${location.href}#${t}</pre><br /><a href="javascript:Scenario('${t}')">Scenario</a></body>`)}},void 0!==n.location&&"string"==typeof n.location.hash&&n.location.hash.length>0&&n.Scenario(n.location.hash.substr(1))}))
-const i=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:r.cookie
-return e.split(";").filter((e=>""!==e)).map((e=>{const[t,...n]=e.trim().split("=")
-return[t,n.join("=")]}))},o=function(e){const t=n.localStorage.getItem(e)
-return null===t?void 0:t},a=function(e){try{return n.performance.getEntriesByType("resource").find((t=>"script"===t.initiatorType&&e===t.name))||{}}catch(t){return{}}},u=l(l({},e.operatorConfig),JSON.parse(r.querySelector(`[data-${e.modulePrefix}-config]`).textContent)),s=u.UIConfig||{},c=r.getElementsByTagName("script"),d=c[c.length-1].src
-let p
-const f=function(e,t){let n,l,r,i
-switch(e){case"CONSUL_NSPACES_ENABLED":return void 0!==u.NamespacesEnabled&&u.NamespacesEnabled
-case"CONSUL_SSO_ENABLED":return void 0!==u.SSOEnabled&&u.SSOEnabled
-case"CONSUL_ACLS_ENABLED":return void 0!==u.ACLsEnabled&&u.ACLsEnabled
-case"CONSUL_PARTITIONS_ENABLED":return void 0!==u.PartitionsEnabled&&u.PartitionsEnabled
-case"CONSUL_PEERINGS_ENABLED":return void 0!==u.PeeringEnabled&&u.PeeringEnabled
-case"CONSUL_HCP_ENABLED":return void 0!==u.HCPEnabled&&u.HCPEnabled
-case"CONSUL_DATACENTER_LOCAL":return u.LocalDatacenter
-case"CONSUL_DATACENTER_PRIMARY":return u.PrimaryDatacenter
-case"CONSUL_HCP_MANAGED_RUNTIME":return u.HCPManagedRuntime
-case"CONSUL_API_PREFIX":return u.APIPrefix
-case"CONSUL_HCP_URL":return u.HCPURL
-case"CONSUL_UI_CONFIG":return l={service:void 0},r=t("CONSUL_METRICS_PROVIDER"),i=t("CONSUL_METRICS_PROXY_ENABLED"),l.service=t("CONSUL_SERVICE_DASHBOARD_URL"),r&&(s.metrics_provider=r),i&&(s.metrics_proxy_enabled=i),l.service&&(s.dashboard_url_templates=l),s
-case"CONSUL_BASE_UI_URL":return d.split("/").slice(0,-2).join("/")
-case"CONSUL_HTTP_PROTOCOL":return void 0===p&&(p=a(d)),p.nextHopProtocol||"http/1.1"
-case"CONSUL_HTTP_MAX_CONNECTIONS":switch(n=t("CONSUL_HTTP_PROTOCOL"),!0){case 0===n.indexOf("h2"):case 0===n.indexOf("hq"):case 0===n.indexOf("spdy"):return
-default:return 5}}},m=function(t){let n={}
-switch(e.environment){case"development":case"staging":case"coverage":case"test":n=i().reduce((function(e,t){let[n,l]=t
-switch(n){case"CONSUL_INTL_LOCALE":e.CONSUL_INTL_LOCALE=String(l).toLowerCase()
-break
-case"CONSUL_INTL_DEBUG":e.CONSUL_INTL_DEBUG=!!JSON.parse(String(l).toLowerCase())
-break
-case"CONSUL_ACLS_ENABLE":e.CONSUL_ACLS_ENABLED=!!JSON.parse(String(l).toLowerCase())
-break
-case"CONSUL_AGENTLESS_ENABLE":e.CONSUL_AGENTLESS_ENABLED=!!JSON.parse(String(l).toLowerCase())
-break
-case"CONSUL_NSPACES_ENABLE":e.CONSUL_NSPACES_ENABLED=!!JSON.parse(String(l).toLowerCase())
-break
-case"CONSUL_SSO_ENABLE":e.CONSUL_SSO_ENABLED=!!JSON.parse(String(l).toLowerCase())
-break
-case"CONSUL_PARTITIONS_ENABLE":e.CONSUL_PARTITIONS_ENABLED=!!JSON.parse(String(l).toLowerCase())
-break
-case"CONSUL_METRICS_PROXY_ENABLE":e.CONSUL_METRICS_PROXY_ENABLED=!!JSON.parse(String(l).toLowerCase())
-break
-case"CONSUL_PEERINGS_ENABLE":e.CONSUL_PEERINGS_ENABLED=!!JSON.parse(String(l).toLowerCase())
-break
-case"CONSUL_HCP_ENABLE":e.CONSUL_HCP_ENABLED=!!JSON.parse(String(l).toLowerCase())
-break
-case"CONSUL_UI_CONFIG":e.CONSUL_UI_CONFIG=JSON.parse(l)
-break
-case"TokenSecretID":e.CONSUL_HTTP_TOKEN=l
-break
-default:e[n]=l}return e}),{})
-break
-case"production":n=i().reduce((function(e,t){let[n,l]=t
-if("TokenSecretID"===n)e.CONSUL_HTTP_TOKEN=l
-return e}),{})}return void 0!==n[t]?n[t]:e[t]}
-return function e(t){switch(t){case"CONSUL_UI_DISABLE_REALTIME":case"CONSUL_UI_DISABLE_ANCHOR_SELECTION":return!!JSON.parse(String(o(t)||0).toLowerCase())||m(t)
-case"CONSUL_UI_REALTIME_RUNNER":return o(t)||m(t)
-case"CONSUL_UI_CONFIG":case"CONSUL_DATACENTER_LOCAL":case"CONSUL_DATACENTER_PRIMARY":case"CONSUL_HCP_MANAGED_RUNTIME":case"CONSUL_API_PREFIX":case"CONSUL_HCP_URL":case"CONSUL_ACLS_ENABLED":case"CONSUL_NSPACES_ENABLED":case"CONSUL_PEERINGS_ENABLED":case"CONSUL_AGENTLESS_ENABLED":case"CONSUL_HCP_ENABLED":case"CONSUL_SSO_ENABLED":case"CONSUL_PARTITIONS_ENABLED":case"CONSUL_METRICS_PROVIDER":case"CONSUL_METRICS_PROXY_ENABLE":case"CONSUL_SERVICE_DASHBOARD_URL":case"CONSUL_BASE_UI_URL":case"CONSUL_HTTP_PROTOCOL":case"CONSUL_HTTP_MAX_CONNECTIONS":{const n=m(t)
-return void 0!==n?n:f(t,e)}default:return m(t)}}}})),define("consul-ui/utils/get-form-name-property",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){if(-1!==e.indexOf("["))return e.match(/(.*)\[(.*)\]/).slice(1)
-return["",e]}})),define("consul-ui/utils/helpers/call-if-type",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return function(t){return function(n){let l=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return typeof n[0]!==e?n[0]:t(n[0],l)}}}})),define("consul-ui/utils/http/consul",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.HEADERS_SYMBOL=e.HEADERS_DIGEST=e.HEADERS_TOKEN=e.HEADERS_INDEX=e.HEADERS_DEFAULT_ACL_POLICY=e.HEADERS_DATACENTER=e.HEADERS_NAMESPACE=e.HEADERS_PARTITION=void 0
-e.HEADERS_PARTITION="X-Consul-Partition"
-e.HEADERS_NAMESPACE="X-Consul-Namespace"
-e.HEADERS_DATACENTER="X-Consul-Datacenter"
-e.HEADERS_DEFAULT_ACL_POLICY="X-Consul-Default-Acl-Policy"
-e.HEADERS_INDEX="X-Consul-Index"
-e.HEADERS_TOKEN="X-Consul-Token"
-e.HEADERS_DIGEST="X-Consul-ContentHash"
-e.HEADERS_SYMBOL="__consul_ui_http_headers__"})),define("consul-ui/utils/http/create-headers",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){return function(e){return e.reduce((function(e,t){const[n,...l]=t.split(":")
-return l.length>0&&(e[n.trim()]=l.join(":").trim()),e}),{})}}})),define("consul-ui/utils/http/create-query-params",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:encodeURIComponent
-return function t(n,l){return Object.entries(n).reduce((function(n,r,i){let[o,a]=r
-if(void 0===a)return n
-let u=e(o)
-return void 0!==l&&(u=`${l}[${u}]`),null===a?n.concat(u):"object"==typeof a?n.concat(t(a,u)):n.concat(`${u}=${e(a)}`)}),[]).join("&")}}})),define("consul-ui/utils/http/create-url",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){return function(n){for(var l=arguments.length,r=new Array(l>1?l-1:0),i=1;i<l;i++)r[i-1]=arguments[i]
-let o=1
-return n.map((function(n,l,i){0===l&&(n=n.trimStart()),-1!==n.indexOf("?")&&1===o&&(o=2),-1!==n.indexOf("\n\n")&&(o=4),-1!==n.indexOf("\n")&&4!==o&&(o=3)
-let a=void 0!==r[l]?r[l]:""
-switch(o){case 1:switch(!0){case"string"==typeof a:a=e(a)
-break
-case Array.isArray(a):a=a.map((function(t){return`${e(t)}`}),"").join("/")}break
-case 2:switch(!0){case"string"==typeof a:a=e(a)
-break
-case"object"==typeof a:a=t(a)}break
-case 4:return n.split("\n\n")[0]}return`${n}${a}`})).join("").trim()}}})),define("consul-ui/utils/http/error",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class t extends Error{constructor(e,t){super(t),this.statusCode=e}}e.default=t})),define("consul-ui/utils/http/headers",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.CONTENT_TYPE=e.CACHE_CONTROL=void 0
-e.CACHE_CONTROL="Cache-Control"
-e.CONTENT_TYPE="Content-Type"})),define("consul-ui/utils/http/method",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.POST=e.DELETE=e.PUT=void 0
-e.PUT="PUT"
-e.DELETE="DELETE"
-e.POST="POST"})),define("consul-ui/utils/http/request",["exports","consul-ui/utils/dom/event-target/rsvp"],(function(e,t){function n(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function l(e){for(var t=1;t<arguments.length;t++){var l=null!=arguments[t]?arguments[t]:{}
-t%2?n(Object(l),!0).forEach((function(t){r(e,t,l[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(l)):n(Object(l)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(l,t))}))}return e}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class i extends t.default{constructor(e,t,n){super(),this._url=t,this._method=e,this._headers=n,this._headers=l(l({},n),{},{"content-type":"application/json"}),void 0!==this._headers.body.index&&(this._headers["content-type"]="text/event-stream")}headers(){return this._headers}open(e){this._xhr=e,this.dispatchEvent({type:"open"})}respond(e){this.dispatchEvent({type:"message",data:e})}error(e){0===e.statusCode&&void 0!==this.statusCode&&(e.statusCode=this.statusCode),this.dispatchEvent({type:"error",error:e})}close(){this.dispatchEvent({type:"close"})}connection(){return this._xhr}abort(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0
-if("text/event-stream"===this.headers()["content-type"]){this.statusCode=e
-const t=this.connection()
-if(t.readyState)switch(t.readyState){case 0:case 1:t.abort()}}}}e.default=i})),define("consul-ui/utils/http/status",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.INTERNAL_SERVER_ERROR=e.FORBIDDEN=e.UNAUTHORIZED=e.OK=void 0
-e.OK=200
-e.UNAUTHORIZED=401
-e.FORBIDDEN=403
-e.INTERNAL_SERVER_ERROR=500})),define("consul-ui/utils/http/xhr",["exports"],(function(e){function t(e,t){var n=Object.keys(e)
-if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
-t&&(l=l.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,l)}return n}function n(e){for(var n=1;n<arguments.length;n++){var r=null!=arguments[n]?arguments[n]:{}
-n%2?t(Object(r),!0).forEach((function(t){l(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):t(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){return function(l){const r=new(t||XMLHttpRequest)
-r.onreadystatechange=function(){if(4===this.readyState){const t=e(this.getAllResponseHeaders().split("\n"))
-if(this.status>=200&&this.status<400){const e=l.converters["text json"](this.response)
-l.success(t,e,this.status,this.statusText)}else l.error(t,this.responseText,this.status,this.statusText,this.error)
-l.complete(this.status)}}
-let i=l.url
-i.endsWith("?")&&(i=i.substr(0,i.length-1)),r.open(l.method,i,!0),void 0===l.headers&&(l.headers={})
-const o=n(n({},l.headers),{},{"X-Requested-With":"XMLHttpRequest"})
-return Object.entries(o).forEach((e=>{let[t,n]=e
-return r.setRequestHeader(t,n)})),l.beforeSend(r),r.withCredentials=!0,r.send(l.body),r}}})),define("consul-ui/utils/intl/missing-message",["exports","@ember/debug"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n){(0,t.runInDebug)((t=>console.debug(`Translation key not found: ${e}`)))
-const l=e.split(".").pop().split("-").join(" ")
-return`${l.substr(0,1).toUpperCase()}${l.substr(1)}`}})),define("consul-ui/utils/isFolder",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:""
-return"/"===e.slice(-1)}})),define("consul-ui/utils/keyToArray",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"/"
-return(e===t?"":e).split(t)}})),define("consul-ui/utils/left-trim",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:""
-return 0===e.indexOf(t)?e.substr(t.length):e}})),define("consul-ui/utils/maybe-call",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){return function(n){return t.then((function(t){return t&&e(),n}))}}})),define("consul-ui/utils/merge-checks",["exports","@ember/object","mnemonist/multi-map"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],l=arguments.length>1&&void 0!==arguments[1]&&arguments[1],r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:n.default
-const i=new r,o=e.shift(),a=o.map((e=>(""===e.ServiceName&&i.set(e.Node,e.CheckID),e))).concat(e.reduce(((e,t)=>void 0===t?e:e.concat(t.reduce(((e,t)=>{if(""===t.ServiceName){if((i.get(t.Node)||[]).includes(t.CheckID))return e
-i.set(t.Node,t.CheckID)}return e.push(t),e}),[]))),[]))
-return l&&a.filter((e=>(0,t.get)(e,"Exposable"))).forEach((e=>{(0,t.set)(e,"Exposed",l)})),a}})),define("consul-ui/utils/minimizeModel",["exports","@ember/object"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){if(Array.isArray(e))return e.filter((function(e){return!(0,t.get)(e,"isNew")})).map((function(e){return{ID:(0,t.get)(e,"ID"),Name:(0,t.get)(e,"Name")}}))}})),define("consul-ui/utils/non-empty-set",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return function(t){return null==t||""===t?{}:{[e]:t}}}})),define("consul-ui/utils/path/resolve",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=(e,t)=>0===t.indexOf("/")?t:t.split("/").reduce(((e,t,n,l)=>("."!==t&&(".."===t?e.pop():""===t&&n!==l.length-1||e.push(t)),e)),e.split("/")).join("/")})),define("consul-ui/utils/promisedTimeout",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:Promise,t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:setTimeout
-return function(n){let l=arguments.length>1&&void 0!==arguments[1]?arguments[1]:function(){}
-return new e(((e,r)=>{l(t((function(){e(n)}),n))}))}}}))
-define("consul-ui/utils/right-trim",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:""
-const n=e.length-t.length
-if(n>=0)return e.lastIndexOf(t)===n?e.substr(0,n):e
-return e}})),define("consul-ui/utils/routing/redirect-to",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){return function(t,n){const l=this.routeName.split(".").slice(0,-1).join(".")
-this.replaceWith(`${l}.${e}`,t)}}})),define("consul-ui/utils/routing/transitionable",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let l=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=arguments.length>2?arguments[2]:void 0
-null===e&&(e=r.lookup("route:application"))
-let i,o=n(e,l),a=e
-for(;i=a.parent;)o=o.concat(n(i,l)),a=i
-return o.reverse(),t(e.name||"application",o,l)}
-const t=function(e,t,n){return[e,...t]},n=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return(e.paramNames||[]).map((function(n){return void 0!==t[n]?t[n]:e.params[n]})).reverse()}})),define("consul-ui/utils/routing/walk",["exports","@ember/debug"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return function(){n.apply(this,[e])}},e.dump=e.walk=void 0
-const n=function(e){Object.keys(e).forEach(((t,l)=>{if("_options"===t)return
-if(null===e[t])return
-const r=e[t]._options
-let i
-Object.keys(e[t]).length>1&&(i=function(){n.apply(this,[e[t]])}),this.route(t,r,i)})),void 0===e.index&&(e.index={_options:{path:""}})}
-e.walk=n
-let l=e=>{}
-e.dump=l,(0,t.runInDebug)((()=>{const t=function(e){return Array(e).fill("  ",0,e).join("")}
-e.dump=l=function(e){let l=2
-const r={out:"",route:function(e,n,r){this.out+=`${t(l)}this.route('${e}', ${JSON.stringify(n)}`,r?(l++,this.out+=", function() {\n",r.apply(this,[]),l--,this.out+=`${t(l)}});\n`):this.out+=");",this.out+="\n"}}
-return n.apply(r,[e]),`Router.map(\n  function() {\n${r.out}\n  }\n);`}}))})),define("consul-ui/utils/routing/wildcard",["exports","@ember/object"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return function(n){let l=!1
-try{l=-1!==(0,t.get)(e,n)._options.path.indexOf("*")}catch(r){}return l}}})),define("consul-ui/utils/search/exact",["exports","consul-ui/utils/search/predicate"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{predicate(e){return e=e.toLowerCase(),function(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:""
-return-1!==t.toString().toLowerCase().indexOf(e)}}}e.default=n})),define("consul-ui/utils/search/fuzzy",["exports","fuse.js"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=class{constructor(e,n){this.fuse=new t.default(e,{includeMatches:!0,shouldSort:!1,threshold:.4,keys:Object.keys(n.finders)||[],getFn:(e,t)=>(n.finders[t[0]](e)||[]).toString()})}search(e){return this.fuse.search(e).map((e=>e.item))}}})),define("consul-ui/utils/search/predicate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=class{constructor(e,t){this.items=e,this.options=t}search(e){const t=this.predicate(e)
-return this.items.filter((e=>Object.entries(this.options.finders).some((n=>{let[l,r]=n
-const i=r(e)
-return Array.isArray(i)?i.some(t):t(i)}))))}}})),define("consul-ui/utils/search/regexp",["exports","consul-ui/utils/search/predicate"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{predicate(e){let t
-try{t=new RegExp(e,"i")}catch(n){return()=>!1}return e=>t.test(e)}}e.default=n})),define("consul-ui/utils/storage/local-storage",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:window.localStorage,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:JSON.stringify,l=arguments.length>3&&void 0!==arguments[3]?arguments[3]:JSON.parse,r=arguments.length>4&&void 0!==arguments[4]?arguments[4]:function(e){window.dispatchEvent(new StorageEvent("storage",{key:e}))}
-const i=`${e}:`
-return{getValue:function(e){let n=t.getItem(`${i}${e}`)
-"string"!=typeof n&&(n='""')
-try{n=l(n)}catch(r){n=""}return n},setValue:function(e,l){if(null===l)return this.removeValue(e)
-try{l=n(l)}catch(a){l='""'}const o=t.setItem(`${i}${e}`,l)
-return r(`${i}${e}`),o},removeValue:function(e){const n=t.removeItem(`${i}${e}`)
-return r(`${i}${e}`),n},all:function(){return Object.keys(t).reduce(((e,t,n,l)=>{if(0===t.indexOf(`${i}`)){const n=t.substr(i.length)
-e[n]=this.getValue(n)}return e}),{})}}}})),define("consul-ui/utils/templatize",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[]
-return e.map((e=>`template-${e}`))}})),define("consul-ui/utils/ticker/index",["exports","consul-ui/utils/dom/event-target/rsvp","@ember/object"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.Tween=e.Ticker=void 0
-const l=class extends t.default{constructor(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:1e3/60
-super(),this.setRate(e)}tick(){this.dispatchEvent({type:"tick",target:this})}setRate(e){clearInterval(this._interval),this._interval=setInterval((()=>this.tick()),e)}destroy(){clearInterval(this._interval)}},r=class extends t.default{static destroy(){void 0!==r.defaultTickerGroup&&(r.defaultTickerGroup.destroy(),delete r.defaultTickerGroup)}constructor(e){super(),this.setTickable(e)}tick(){this._tickable.tick()}setTickable(e){this._tickable=e,void 0===this._tickable.getTicker&&(this._tickable.getTicker=()=>this),this.tick=this._tickable.tick.bind(this._tickable)}getTickable(){return this._tickable}isAlive(){return this._isAlive}start(){this._isAlive=!0,this.getTickerGroup().addEventListener("tick",this.tick),this.dispatchEvent({type:"start",target:this})}stop(){this._isAlive=!1,this.getTickerGroup().removeEventListener("tick",this.tick),this.dispatchEvent({type:"stop",target:this})}activeCount(){return this.getTickerGroup().activeCount()}setTickerGroup(e){this._group=e}getTickerGroup(){return void 0===this._group&&(void 0===r.defaultTickerGroup&&(r.defaultTickerGroup=new o),this._group=r.defaultTickerGroup),this._group}}
-e.Ticker=r
-const i={easeOut:function(e,t,n,l){return e/=l,n*(--e*e*e+1)+t}},o=l,a=class extends class{constructor(){this._currentframe=1,this.setIncrement(1)}isAtStart(){return this._currentframe<=1}isAtEnd(){return this._currentframe>=this._totalframes}addEventListener(){return this.getTicker().addEventListener(...arguments)}removeEventListener(){return this.getTicker().removeEventListener(...arguments)}stop(){return this.gotoAndStop(this._currentframe)}play(){return this.gotoAndPlay(this._currentframe)}start(){return this.gotoAndPlay(this._currentframe)}gotoAndStop(e){this._currentframe=e
-const t=this.getTicker()
-return t.isAlive()&&t.stop(),this}gotoAndPlay(e){this._currentframe=e
-const t=this.getTicker()
-return t.isAlive()||t.start(),this}getTicker(){return void 0===this._ticker&&(this._ticker=new r(this)),this._ticker}setFrames(e){return this._totalframes=e,this}setIncrement(e){return this._increment=e,this}}{static destroy(){r.destroy()}static to(e,t,n,l){return Object.keys(t).forEach((function(n){t[n]-=e[n]})),new a(e,t,n,l).play()}constructor(e,t){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:12,l=arguments.length>3&&void 0!==arguments[3]?arguments[3]:i.easeOut
-super(),this.setMethod(l),this.setProps(t),this.setTarget(e),this.setFrames(n),this.tick=this.forwards}_process(){Object.keys(this._props).forEach((e=>{const t=this._method(this._currentframe,this._initialstate[e],this._props[e],this._totalframes);(0,n.set)(this._target,e,t)}))}forwards(){this._currentframe<=this._totalframes?(this._process(),this._currentframe+=this._increment):(this._currentframe=this._totalframes,this.getTicker().stop())}backwards(){this._currentframe-=this._increment,this._currentframe>=0?this._process():(this.run=this.forwards,this._currentframe=1,this.getTicker().stop())}gotoAndPlay(){return void 0===this._initialstate&&(this._initialstate={},Object.keys(this._props).forEach((e=>{this._initialstate[e]=this._target[e]}))),super.gotoAndPlay(...arguments)}setTarget(e){this._target=e}getTarget(e){return this._target}setProps(e){return this._props=e,this}setMethod(e){this._method=e}}
-e.Tween=a})),define("consul-ui/utils/titleize",["exports","ember-cli-string-helpers/utils/titleize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/utils/tomography",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return function(t,n){var l=999999999,r=-999999999,i=[]
-n.forEach((function(o){if(t==o.Node){var a=o.Segment
-n.forEach((function(t){if(o.Node!=t.Node&&t.Segment==a){var n=e(o,t)
-i.push({node:t.Node,distance:n,segment:a}),n<l&&(l=n),n>r&&(r=n)}})),i.sort((function(e,t){return e.distance-t.distance}))}}))
-var o,a=i.length,u=Math.floor(a/2)
-return a>0?o=a%2?i[u].distance:(i[u-1].distance+i[u].distance)/2:(o=0,l=0,r=0),{distances:i,min:Math.trunc(100*l)/100,median:Math.trunc(100*o)/100,max:Math.trunc(100*r)/100}}}})),define("consul-ui/utils/ucfirst",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return`${e.substr(0,1).toUpperCase()}${e.substr(1)}`}})),define("consul-ui/utils/update-array-object",["exports","@ember/object","@ember/object/proxy"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,l,r,i){i=void 0===i?(0,t.get)(l,r):i
-const o=e.findIndex((function(e){return(0,t.get)(e,r)===i}));-1!==o&&(l instanceof n.default&&(0,t.set)(l,"content",e.objectAt(o)),e.replace(o,1,[l]))
-return l}})),define("consul-ui/validations/intention-permission-http-header",["exports","ember-changeset-validations/validators","consul-ui/validations/sometimes"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>({Name:[(0,t.validatePresence)(!0)],Value:[(0,n.default)((0,t.validatePresence)(!0),(function(){return"Present"!==this.get("HeaderType")}))]})})),define("consul-ui/validations/intention-permission",["exports","ember-changeset-validations/validators","consul-ui/validations/sometimes"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=e=>({"*":[(0,n.default)((0,t.validatePresence)(!0),(function(){const e=this.get("HTTP.Methods")||[],t=this.get("HTTP.Header")||[],n=this.get("HTTP.PathType")||"NoPath",l=this.get("HTTP.Path")||""
-return![0!==e.length,0!==t.length,"NoPath"!==n&&""!==l].includes(!0)}))],Action:[(0,t.validateInclusion)({in:e["intention-permission"].Action.allowedValues})],HTTP:{Path:[(0,n.default)((0,t.validateFormat)({regex:/^\//}),(function(){const e=this.get("HTTP.PathType")
-return void 0!==e&&"NoPath"!==e}))]}})})),define("consul-ui/validations/intention",["exports","ember-changeset-validations/validators","consul-ui/validations/sometimes"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l={"*":[(0,n.default)((0,t.validatePresence)(!0),(function(){const e=this.get("Action")||"",t=this.get("Permissions")||[]
-return""===e&&0===t.length}))],SourceName:[(0,t.validatePresence)(!0),(0,t.validateLength)({min:1})],DestinationName:[(0,t.validatePresence)(!0),(0,t.validateLength)({min:1})],Permissions:[(0,n.default)((0,t.validateLength)({min:1}),(function(e,t){return!this.get("Action")}))]}
-e.default=l})),define("consul-ui/validations/kv",["exports","ember-changeset-validations/validators"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n={Key:[(0,t.validatePresence)(!0),(0,t.validateLength)({min:1})]}
-e.default=n})),define("consul-ui/validations/policy",["exports","ember-changeset-validations/validators"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n={Name:(0,t.validateFormat)({regex:/^[A-Za-z0-9\-_]{1,128}$/})}
-e.default=n})),define("consul-ui/validations/role",["exports","ember-changeset-validations/validators"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n={Name:(0,t.validateFormat)({regex:/^[A-Za-z0-9\-_]{1,256}$/})}
-e.default=n})),define("consul-ui/validations/sometimes",["exports","@ember/object"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n){return function(e){return function(l,r,i,o,a){let u={get(e){if(e.includes(".")){let n=(0,t.get)(o,e)
-if(void 0!==n)return n
-let l=e.split("."),r=l.pop(),i=l.join("."),u=(0,t.get)(o,i)
-return u&&u.hasOwnProperty&&u.hasOwnProperty(r)?n:(0,t.get)(a,e)}return o.hasOwnProperty(e)?(0,t.get)(o,e):(0,t.get)(a,e)}}
-return!n.call(u,o,a)||e(l,r,i,o,a)}}(e)}})),define("consul-ui/validations/token",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={}})),define("consul-ui/config/environment",[],(function(){try{var e="consul-ui/config/environment",t=document.querySelector('meta[name="'+e+'"]').getAttribute("content"),n={default:JSON.parse(decodeURIComponent(t))}
-return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(l){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("consul-ui/app").default.create({name:"consul-ui",version:"2.2.0+63204b51"})
diff --git a/agent/uiserver/dist/assets/consul-ui-e58b85f0a8e1fb15ded242e5b25b171c.js b/agent/uiserver/dist/assets/consul-ui-e58b85f0a8e1fb15ded242e5b25b171c.js
new file mode 100644
index 0000000000000..ad0150bba14d9
--- /dev/null
+++ b/agent/uiserver/dist/assets/consul-ui-e58b85f0a8e1fb15ded242e5b25b171c.js
@@ -0,0 +1,3507 @@
+"use strict"
+define("consul-ui/abilities/acl",["exports","consul-ui/abilities/base"],(function(e,t){var n,r,a
+function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let s=(n=Ember.inject.service("env"),r=class extends t.default{constructor(...e){var t,n,r,s
+super(...e),t=this,n="env",s=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(s):void 0}),l(this,"resource","acl"),l(this,"segmented",!1)}get canAccess(){return!this.env.var("CONSUL_ACLS_ENABLED")||this.canRead}get canRead(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canRead}get canDuplicate(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canWrite}get canDelete(){return this.env.var("CONSUL_ACLS_ENABLED")&&"anonymous"!==this.item.ID&&super.canWrite}get canUse(){return this.env.var("CONSUL_ACLS_ENABLED")}},i=r.prototype,o="env",u=[n],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),a=m,r)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/abilities/auth-method",["exports","consul-ui/abilities/base"],(function(e,t){var n,r,a
+function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let s=(n=Ember.inject.service("env"),r=class extends t.default{constructor(...e){var t,n,r,s
+super(...e),t=this,n="env",s=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(s):void 0}),l(this,"resource","acl"),l(this,"segmented",!1)}get canRead(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canRead}get canCreate(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canCreate}get canDelete(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canDelete}get canUse(){return this.env.var("CONSUL_SSO_ENABLED")}},i=r.prototype,o="env",u=[n],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),a=m,r)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/abilities/base",["exports","ember-can"],(function(e,t){var n,r,a
+function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.ACCESS_LIST=e.ACCESS_WRITE=e.ACCESS_READ=void 0
+e.ACCESS_READ="read"
+e.ACCESS_WRITE="write"
+e.ACCESS_LIST="list"
+let s=(n=Ember.inject.service("repository/permission"),r=class extends t.Ability{constructor(...e){var t,n,r,s
+super(...e),t=this,n="permissions",s=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(s):void 0}),l(this,"resource",""),l(this,"segmented",!0)}generate(e){return this.permissions.generate(this.resource,e)}generateForSegment(e){return this.segmented?[this.permissions.generate(this.resource,"read",e),this.permissions.generate(this.resource,"write",e)]:[]}get isLinkable(){return!0}get isNew(){return this.item.isNew}get isPristine(){return this.item.isPristine}get canRead(){if(void 0!==this.item){const e=(Ember.get(this,"item.Resources")||[]).find(e=>"read"===e.Access)
+if(e)return e.Allow}return this.permissions.has(this.generate("read"))}get canList(){if(void 0!==this.item){const e=(Ember.get(this,"item.Resources")||[]).find(e=>"list"===e.Access)
+if(e)return e.Allow}return this.permissions.has(this.generate("list"))}get canWrite(){if(void 0!==this.item){const e=(Ember.get(this,"item.Resources")||[]).find(e=>"write"===e.Access)
+if(e)return e.Allow}return this.permissions.has(this.generate("write"))}get canCreate(){return this.canWrite}get canDelete(){return this.canWrite}get canUpdate(){return this.canWrite}},i=r.prototype,o="permissions",u=[n],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),a=m,r)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/abilities/hcp",["exports","consul-ui/abilities/base"],(function(e,t){var n,r,a
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let l=(n=Ember.inject.service("env"),r=class extends t.default{constructor(...e){var t,n,r,l
+super(...e),t=this,n="env",l=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(l):void 0})}get is(){return!1}},s=r.prototype,i="env",o=[n],u={configurable:!0,enumerable:!0,writable:!0,initializer:null},d={},Object.keys(u).forEach((function(e){d[e]=u[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=o.slice().reverse().reduce((function(e,t){return t(s,i,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(s,i,d),d=null),a=d,r)
+var s,i,o,u,c,d
+e.default=l})),define("consul-ui/abilities/intention",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{constructor(...e){var t,n,r
+super(...e),r="intention",(n="resource")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r}get canWrite(){return super.canWrite&&(void 0===this.item||!this.canViewCRD)}get canViewCRD(){return void 0!==this.item&&this.item.IsManagedByCRD}}e.default=n})),define("consul-ui/abilities/kv",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{constructor(...e){var t,n,r
+super(...e),r="key",(n="resource")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r}generateForSegment(e){let n=super.generateForSegment(e)
+return e.endsWith("/")&&(n=n.concat(this.permissions.generate(this.resource,t.ACCESS_LIST,e))),n}get canRead(){return!0}get canList(){return!0}get canWrite(){return!0}}e.default=n})),define("consul-ui/abilities/license",["exports","consul-ui/abilities/base"],(function(e,t){var n,r,a
+function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let s=(n=Ember.inject.service("env"),r=class extends t.default{constructor(...e){var t,n,r,s
+super(...e),l(this,"resource","operator"),l(this,"segmented",!1),t=this,n="env",s=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(s):void 0})}get canRead(){return this.env.var("CONSUL_NSPACES_ENABLED")&&super.canRead}},i=r.prototype,o="env",u=[n],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),a=m,r)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/abilities/node",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{constructor(...e){var t,n,r
+super(...e),r="node",(n="resource")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r}}e.default=n})),define("consul-ui/abilities/nspace",["exports","consul-ui/abilities/base"],(function(e,t){var n,r,a
+function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let s=(n=Ember.inject.service("env"),r=class extends t.default{constructor(...e){var t,n,r,s
+super(...e),t=this,n="env",s=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(s):void 0}),l(this,"resource","operator"),l(this,"segmented",!1)}get isLinkable(){return!this.item.DeletedAt}get canManage(){return this.canCreate}get canDelete(){return"default"!==this.item.Name&&super.canDelete}get canChoose(){return this.canUse}get canUse(){return this.env.var("CONSUL_NSPACES_ENABLED")}},i=r.prototype,o="env",u=[n],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),a=m,r)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/abilities/overview",["exports","consul-ui/abilities/base"],(function(e,t){function n(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends t.default{constructor(...e){super(...e),n(this,"resource","operator"),n(this,"segmented",!1)}get canAccess(){return this.canRead}}e.default=r})),define("consul-ui/abilities/partition",["exports","consul-ui/abilities/base"],(function(e,t){var n,r,a,l,s
+function i(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function u(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let c=(n=Ember.inject.service("env"),r=Ember.inject.service("repository/dc"),a=class extends t.default{constructor(...e){super(...e),i(this,"env",l,this),i(this,"dcs",s,this),o(this,"resource","operator"),o(this,"segmented",!1)}get isLinkable(){return!this.item.DeletedAt}get canManage(){return this.canWrite}get canCreate(){return!(this.dcs.peekAll().length>1)&&super.canCreate}get canDelete(){return"default"!==this.item.Name&&super.canDelete}get canChoose(){return void 0!==this.dc&&(this.canUse&&this.dc.Primary)}get canUse(){return this.env.var("CONSUL_PARTITIONS_ENABLED")}},l=u(a.prototype,"env",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=u(a.prototype,"dcs",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a)
+e.default=c})),define("consul-ui/abilities/permission",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{get canRead(){return this.permissions.permissions.length>0}}e.default=n})),define("consul-ui/abilities/policy",["exports","consul-ui/abilities/base","consul-ui/helpers/policy/typeof"],(function(e,t,n){var r,a,l
+function s(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let i=(r=Ember.inject.service("env"),a=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="env",a=this,(r=l)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0}),s(this,"resource","acl"),s(this,"segmented",!1)}get canRead(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canRead}get canWrite(){return this.env.var("CONSUL_ACLS_ENABLED")&&(void 0===this.item||"policy-management"!==(0,n.typeOf)([this.item]))&&super.canWrite}get canCreate(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canCreate}get canDelete(){return this.env.var("CONSUL_ACLS_ENABLED")&&(void 0===this.item||"policy-management"!==(0,n.typeOf)([this.item]))&&super.canDelete}},o=a.prototype,u="env",c=[r],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(d).forEach((function(e){p[e]=d[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=c.slice().reverse().reduce((function(e,t){return t(o,u,e)||e}),p),m&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(m):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(o,u,p),p=null),l=p,a)
+var o,u,c,d,m,p
+e.default=i})),define("consul-ui/abilities/role",["exports","consul-ui/abilities/base"],(function(e,t){var n,r,a
+function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let s=(n=Ember.inject.service("env"),r=class extends t.default{constructor(...e){var t,n,r,s
+super(...e),t=this,n="env",s=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(s):void 0}),l(this,"resource","acl"),l(this,"segmented",!1)}get canRead(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canRead}get canCreate(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canCreate}get canDelete(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canDelete}},i=r.prototype,o="env",u=[n],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),a=m,r)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/abilities/service-instance",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{constructor(...e){var t,n,r
+super(...e),r="service",(n="resource")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r}generateForSegment(e){return super.generateForSegment(...arguments).concat([this.permissions.generate("intention",t.ACCESS_READ,e),this.permissions.generate("intention",t.ACCESS_WRITE,e)])}}e.default=n})),define("consul-ui/abilities/session",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{constructor(...e){var t,n,r
+super(...e),r="session",(n="resource")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r}}e.default=n})),define("consul-ui/abilities/token",["exports","consul-ui/abilities/base","consul-ui/helpers/token/is-legacy","consul-ui/helpers/token/is-anonymous"],(function(e,t,n,r){var a,l,s
+function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let o=(a=Ember.inject.service("env"),l=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="env",a=this,(r=s)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0}),i(this,"resource","acl"),i(this,"segmented",!1)}get canRead(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canRead}get canCreate(){return this.env.var("CONSUL_ACLS_ENABLED")&&super.canCreate}get canDelete(){return this.env.var("CONSUL_ACLS_ENABLED")&&!(0,r.isAnonymous)([this.item])&&this.item.AccessorID!==this.token.AccessorID&&super.canDelete}get canDuplicate(){return this.env.var("CONSUL_ACLS_ENABLED")&&!(0,n.isLegacy)([this.item])&&super.canWrite}},u=l.prototype,c="env",d=[a],m={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(m).forEach((function(e){f[e]=m[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=d.slice().reverse().reduce((function(e,t){return t(u,c,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,c,f),f=null),s=f,l)
+var u,c,d,m,p,f
+e.default=o})),define("consul-ui/abilities/upstream",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{constructor(...e){var t,n,r
+super(...e),r="upstream",(n="resource")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r}get isLinkable(){return this.item.InstanceCount>0}}e.default=n})),define("consul-ui/abilities/zervice",["exports","consul-ui/abilities/base"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{constructor(...e){var t,n,r
+super(...e),r="service",(n="resource")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r}get isLinkable(){return this.item.InstanceCount>0}get canReadIntention(){if(void 0===this.item||void 0===this.item.Resources)return!1
+return void 0!==this.item.Resources.find(e=>"intention"===e.Resource&&"read"===e.Access&&!0===e.Allow)}get canWriteIntention(){if(void 0===this.item||void 0===this.item.Resources)return!1
+return void 0!==this.item.Resources.find(e=>"intention"===e.Resource&&"write"===e.Access&&!0===e.Allow)}get canCreateIntention(){return this.canWriteIntention}get canUpdateIntention(){return this.canWriteIntention}}e.default=n})),define("consul-ui/abilities/zone",["exports","consul-ui/abilities/base"],(function(e,t){var n,r,a
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let l=(n=Ember.inject.service("env"),r=class extends t.default{constructor(...e){var t,n,r,l
+super(...e),t=this,n="env",l=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(l):void 0})}get canRead(){return this.env.var("CONSUL_NSPACES_ENABLED")}},s=r.prototype,i="env",o=[n],u={configurable:!0,enumerable:!0,writable:!0,initializer:null},d={},Object.keys(u).forEach((function(e){d[e]=u[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=o.slice().reverse().reduce((function(e,t){return t(s,i,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(s,i,d),d=null),a=d,r)
+var s,i,o,u,c,d
+e.default=l})),define("consul-ui/adapters/-json-api",["exports","@ember-data/adapter/json-api"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/adapters/application",["exports","consul-ui/adapters/http"],(function(e,t){var n,r,a,l,s
+function i(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function o(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.NSPACE_QUERY_PARAM=e.DATACENTER_QUERY_PARAM=void 0
+e.DATACENTER_QUERY_PARAM="dc"
+e.NSPACE_QUERY_PARAM="ns"
+let u=(n=Ember.inject.service("client/http"),r=Ember.inject.service("env"),a=class extends t.default{constructor(...e){super(...e),i(this,"client",l,this),i(this,"env",s,this)}formatNspace(e){if(this.env.var("CONSUL_NSPACES_ENABLED"))return""!==e?{ns:e}:void 0}formatDatacenter(e){return{dc:e}}},l=o(a.prototype,"client",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=o(a.prototype,"env",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a)
+e.default=u})),define("consul-ui/adapters/auth-method",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{requestForQuery(e,{dc:t,ns:n,partition:r,index:a,id:l}){return e`
+      GET /v1/acl/auth-methods?${{dc:t}}
+
+      ${{ns:n,partition:r,index:a}}
+    `}requestForQueryRecord(e,{dc:t,ns:n,partition:r,index:a,id:l}){if(void 0===l)throw new Error("You must specify an id")
+return e`
+      GET /v1/acl/auth-method/${l}?${{dc:t}}
+
+      ${{ns:n,partition:r,index:a}}
+    `}}e.default=n})),define("consul-ui/adapters/binding-rule",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{requestForQuery(e,{dc:t,ns:n,partition:r,authmethod:a,index:l}){return e`
+      GET /v1/acl/binding-rules?${{dc:t,authmethod:a}}
+
+      ${{ns:n,partition:r,index:l}}
+    `}}e.default=n})),define("consul-ui/adapters/coordinate",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{requestForQuery(e,{dc:t,partition:n,index:r,uri:a}){return e`
+      GET /v1/coordinate/nodes?${{dc:t}}
+      X-Request-ID: ${a}
+
+      ${{partition:n,index:r}}
+    `}}e.default=n})),define("consul-ui/adapters/discovery-chain",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{requestForQueryRecord(e,{dc:t,ns:n,partition:r,index:a,id:l,uri:s}){if(void 0===l)throw new Error("You must specify an id")
+return e`
+      GET /v1/discovery-chain/${l}?${{dc:t}}
+      X-Request-ID: ${s}
+
+      ${{ns:n,partition:r,index:a}}
+    `}}e.default=n})),define("consul-ui/adapters/http",["exports","@ember-data/adapter","@ember-data/adapter/error"],(function(e,t,n){var r,a,l
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const s=function(e,t,n,r={}){return e.rpc((function(e,...t){return e["requestFor"+n](...t)}),(function(e,...t){return e["respondFor"+n](...t)}),r,t)},i=function(e,t,n,r){return e.rpc((function(e,...t){return e["requestFor"+n](...t)}),(function(e,...t){return e["respondFor"+n](...t)}),r,t)}
+let o=(r=Ember.inject.service("client/http"),a=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="client",a=this,(r=l)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}rpc(e,t,n,r){const a=this.client,l=this.store,s=this
+let i,o
+const u=l.serializerFor(r),c=l.modelFor(r)
+return"function"==typeof n.attributes?(i=n.attributes(),o=u.serialize(n,{})):(i=n,o=i),a.request((function(t){return e(s,t,o,i,c)})).catch((function(e){return s.error(e)})).then((function(e){return t(u,e,o,i,c)}))}error(e){if(e instanceof TypeError)throw e
+const t=[{status:""+e.statusCode,title:"The backend responded with an error",detail:e.message}]
+let r
+try{switch(e.statusCode){case 0:r=new n.AbortError,r.errors[0].status="0"
+break
+case 401:r=new n.UnauthorizedError(t,"")
+break
+case 403:r=new n.ForbiddenError(t,"")
+break
+case 404:r=new n.NotFoundError(t,"")
+break
+case 408:r=new n.TimeoutError
+break
+case 409:r=new n.ConflictError(t,"")
+break
+case 422:r=new n.InvalidError(t)
+break
+default:r=e.statusCode>=500?new n.ServerError(t,""):new n.default(t,"")}}catch(a){r=a}throw r}query(e,t,n){return s(this,t.modelName,"Query",n)}queryRecord(e,t,n){return s(this,t.modelName,"QueryRecord",n)}findAll(e,t){return s(this,t.modelName,"FindAll")}createRecord(e,t,n){return i(this,t.modelName,"CreateRecord",n)}updateRecord(e,t,n){return i(this,t.modelName,"UpdateRecord",n)}deleteRecord(e,t,n){return i(this,t.modelName,"DeleteRecord",n)}},u=a.prototype,c="client",d=[r],m={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(m).forEach((function(e){f[e]=m[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=d.slice().reverse().reduce((function(e,t){return t(u,c,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,c,f),f=null),l=f,a)
+var u,c,d,m,p,f
+e.default=o})),define("consul-ui/adapters/intention",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{requestForQuery(e,{dc:t,ns:n,partition:r,filter:a,index:l,uri:s}){return e`
+      GET /v1/connect/intentions?${{dc:t}}
+      X-Request-ID: ${s}${void 0!==a?"\n      X-Range: "+a:""}
+
+      ${{partition:r,ns:"*",index:l,filter:a}}
+    `}requestForQueryRecord(e,{dc:t,index:n,id:r}){if(void 0===r)throw new Error("You must specify an id")
+const[a,l,s,i,o,u]=r.split(":").map(decodeURIComponent)
+return e`
+      GET /v1/connect/intentions/exact?${{source:`${a}/${l}/${s}`,destination:`${i}/${o}/${u}`,dc:t}}
+      Cache-Control: no-store
+
+      ${{index:n}}
+    `}requestForCreateRecord(e,t,n){const r={SourceName:t.SourceName,DestinationName:t.DestinationName,SourceNS:t.SourceNS,DestinationNS:t.DestinationNS,SourcePartition:t.SourcePartition,DestinationPartition:t.DestinationPartition,SourceType:t.SourceType,Meta:t.Meta,Description:t.Description}
+return Ember.get(t,"Action.length")?r.Action=t.Action:t.Permissions&&(r.Permissions=t.Permissions),e`
+      PUT /v1/connect/intentions/exact?${{source:`${n.SourcePartition}/${n.SourceNS}/${n.SourceName}`,destination:`${n.DestinationPartition}/${n.DestinationNS}/${n.DestinationName}`,dc:n.Datacenter}}
+
+      ${r}
+    `}requestForUpdateRecord(e,t,n){return delete t.DestinationName,delete t.DestinationNS,delete t.DestinationPartition,this.requestForCreateRecord(...arguments)}requestForDeleteRecord(e,t,n){return e`
+      DELETE /v1/connect/intentions/exact?${{source:`${n.SourcePartition}/${n.SourceNS}/${n.SourceName}`,destination:`${n.DestinationPartition}/${n.DestinationNS}/${n.DestinationName}`,dc:n.Datacenter}}
+    `}}e.default=n})),define("consul-ui/adapters/kv",["exports","consul-ui/adapters/application","consul-ui/utils/isFolder","consul-ui/utils/keyToArray","consul-ui/models/kv"],(function(e,t,n,r,a){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class l extends t.default{async requestForQuery(e,{dc:t,ns:n,partition:a,index:l,id:s,separator:i}){if(void 0===s)throw new Error("You must specify an id")
+const o=await(e`
+      GET /v1/kv/${(0,r.default)(s)}?${{keys:null,dc:t,separator:i}}
+
+      ${{ns:n,partition:a,index:l}}
+    `)
+return await o(e=>delete e["x-consul-index"]),o}async requestForQueryRecord(e,{dc:t,ns:n,partition:a,index:l,id:s}){if(void 0===s)throw new Error("You must specify an id")
+const i=await(e`
+      GET /v1/kv/${(0,r.default)(s)}?${{dc:t}}
+
+      ${{ns:n,partition:a,index:l}}
+    `)
+return await i(e=>delete e["x-consul-index"]),i}requestForCreateRecord(e,t,n){const l={dc:n.Datacenter,ns:n.Namespace,partition:n.Partition}
+return e`
+      PUT /v1/kv/${(0,r.default)(n[a.SLUG_KEY])}?${l}
+      Content-Type: text/plain; charset=utf-8
+
+      ${t}
+    `}requestForUpdateRecord(e,t,n){const l={dc:n.Datacenter,ns:n.Namespace,partition:n.Partition,flags:n.Flags}
+return e`
+      PUT /v1/kv/${(0,r.default)(n[a.SLUG_KEY])}?${l}
+      Content-Type: text/plain; charset=utf-8
+
+      ${t}
+    `}requestForDeleteRecord(e,t,l){let s;(0,n.default)(l[a.SLUG_KEY])&&(s=null)
+const i={dc:l.Datacenter,ns:l.Namespace,partition:l.Partition,recurse:s}
+return e`
+      DELETE /v1/kv/${(0,r.default)(l[a.SLUG_KEY])}?${i}
+    `}}e.default=l})),define("consul-ui/adapters/node",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{requestForQuery(e,{dc:t,ns:n,partition:r,index:a,id:l,uri:s}){return e`
+      GET /v1/internal/ui/nodes?${{dc:t}}
+      X-Request-ID: ${s}
+
+      ${{ns:n,partition:r,index:a}}
+    `}requestForQueryRecord(e,{dc:t,ns:n,partition:r,index:a,id:l,uri:s}){if(void 0===l)throw new Error("You must specify an id")
+return e`
+      GET /v1/internal/ui/node/${l}?${{dc:t}}
+      X-Request-ID: ${s}
+
+      ${{ns:n,partition:r,index:a}}
+    `}requestForQueryLeader(e,{dc:t,uri:n}){return e`
+      GET /v1/status/leader?${{dc:t}}
+      X-Request-ID: ${n}
+      Refresh: 30
+    `}queryLeader(e,t,n,r){return this.rpc((function(e,t,n,r){return e.requestForQueryLeader(t,n,r)}),(function(e,t,n,r){return e.respondForQueryLeader(t,n,r)}),r,t.modelName)}}e.default=n}))
+define("consul-ui/adapters/nspace",["exports","consul-ui/adapters/application","consul-ui/models/nspace"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends t.default{requestForQuery(e,{dc:t,partition:n,index:r,uri:a}){return e`
+      GET /v1/namespaces?${{dc:t}}
+      X-Request-ID: ${a}
+
+      ${{partition:n,index:r}}
+    `}requestForQueryRecord(e,{dc:t,partition:n,index:r,id:a}){if(void 0===a)throw new Error("You must specify an name")
+return e`
+      GET /v1/namespace/${a}?${{dc:t}}
+
+      ${{partition:n,index:r}}
+    `}requestForCreateRecord(e,t,r){return e`
+      PUT /v1/namespace/${r[n.SLUG_KEY]}?${{dc:r.Datacenter,partition:r.Partition}}
+
+      ${{Name:t.Name,Description:t.Description,ACLs:{PolicyDefaults:t.ACLs.PolicyDefaults.map(e=>({ID:e.ID})),RoleDefaults:t.ACLs.RoleDefaults.map(e=>({ID:e.ID}))}}}
+    `}requestForUpdateRecord(e,t,r){return e`
+      PUT /v1/namespace/${r[n.SLUG_KEY]}?${{dc:r.Datacenter,partition:r.Partition}}
+
+      ${{Description:t.Description,ACLs:{PolicyDefaults:t.ACLs.PolicyDefaults.map(e=>({ID:e.ID})),RoleDefaults:t.ACLs.RoleDefaults.map(e=>({ID:e.ID}))}}}
+    `}requestForDeleteRecord(e,t,r){return e`
+      DELETE /v1/namespace/${r[n.SLUG_KEY]}?${{dc:r.Datacenter,partition:r.Partition}}
+    `}}e.default=r})),define("consul-ui/adapters/oidc-provider",["exports","consul-ui/adapters/application"],(function(e,t){var n,r,a
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let l=(n=Ember.inject.service("env"),r=class extends t.default{constructor(...e){var t,n,r,l
+super(...e),t=this,n="env",l=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(l):void 0})}requestForQuery(e,{dc:t,ns:n,partition:r,index:a,uri:l}){return e`
+      GET /v1/internal/ui/oidc-auth-methods?${{dc:t}}
+      X-Request-ID: ${l}
+
+      ${{ns:n,partition:r,index:a}}
+    `}requestForQueryRecord(e,{dc:t,ns:n,partition:r,id:a}){if(void 0===a)throw new Error("You must specify an id")
+return e`
+      POST /v1/acl/oidc/auth-url?${{dc:t,ns:n,partition:r}}
+      Cache-Control: no-store
+
+      ${{AuthMethod:a,RedirectURI:this.env.var("CONSUL_BASE_UI_URL")+"/oidc/callback"}}
+    `}requestForAuthorize(e,{dc:t,ns:n,partition:r,id:a,code:l,state:s}){if(void 0===a)throw new Error("You must specify an id")
+if(void 0===l)throw new Error("You must specify an code")
+if(void 0===s)throw new Error("You must specify an state")
+return e`
+      POST /v1/acl/oidc/callback?${{dc:t,ns:n,partition:r}}
+      Cache-Control: no-store
+
+      ${{AuthMethod:a,Code:l,State:s}}
+    `}requestForLogout(e,{id:t}){if(void 0===t)throw new Error("You must specify an id")
+return e`
+      POST /v1/acl/logout
+      Cache-Control: no-store
+      X-Consul-Token: ${t}
+    `}authorize(e,t,n,r){return this.rpc((function(e,t,n,r){return e.requestForAuthorize(t,n,r)}),(function(e,t,n,r){return e.respondForAuthorize(t,n,r)}),r,t.modelName)}logout(e,t,n,r){return this.rpc((function(e,t,n,r){return e.requestForLogout(t,n,r)}),(function(){return{}}),r,t.modelName)}},s=r.prototype,i="env",o=[n],u={configurable:!0,enumerable:!0,writable:!0,initializer:null},d={},Object.keys(u).forEach((function(e){d[e]=u[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=o.slice().reverse().reduce((function(e,t){return t(s,i,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(s,i,d),d=null),a=d,r)
+var s,i,o,u,c,d
+e.default=l})),define("consul-ui/adapters/partition",["exports","consul-ui/adapters/application","consul-ui/models/partition"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends t.default{async requestForQuery(e,{ns:t,dc:n,index:r}){const a=await(e`
+      GET /v1/partitions?${{dc:n}}
+
+      ${{index:r}}
+    `)
+return await a(e=>delete e["x-consul-index"]),a}async requestForQueryRecord(e,{ns:t,dc:n,index:r,id:a}){if(void 0===a)throw new Error("You must specify an id")
+const l=await(e`
+      GET /v1/partition/${a}?${{dc:n}}
+
+      ${{index:r}}
+    `)
+return await l(e=>delete e["x-consul-index"]),l}async requestForCreateRecord(e,t,r){return e`
+      PUT /v1/partition/${r[n.SLUG_KEY]}?${{dc:r.Datacenter}}
+
+      ${{Name:t.Name,Description:t.Description}}
+    `}async requestForUpdateRecord(e,t,r){return e`
+      PUT /v1/partition/${r[n.SLUG_KEY]}?${{dc:r.Datacenter}}
+
+      ${{Description:t.Description}}
+    `}async requestForDeleteRecord(e,t,r){return e`
+      DELETE /v1/partition/${r[n.SLUG_KEY]}?${{dc:r.Datacenter}}
+    `}}e.default=r})),define("consul-ui/adapters/permission",["exports","consul-ui/adapters/application"],(function(e,t){var n,r,a,l,s
+function i(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function o(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?i(Object(n),!0).forEach((function(t){c(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):i(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function u(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function c(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function d(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let m=(n=Ember.inject.service("env"),r=Ember.inject.service("settings"),a=class extends t.default{constructor(...e){super(...e),u(this,"env",l,this),u(this,"settings",s,this)}requestForAuthorize(e,{dc:t,ns:n,partition:r,resources:a=[],index:l}){return this.env.var("CONSUL_NSPACES_ENABLED")&&(a=a.map(e=>o(o({},e),{},{Namespace:n}))),this.env.var("CONSUL_PARTITIONS_ENABLED")&&(a=a.map(e=>o(o({},e),{},{Partition:r}))),e`
+      POST /v1/internal/acl/authorize?${{dc:t}}
+
+      ${a}
+    `}authorize(e,t,n,r){return this.rpc(async(e,t,n)=>{const r=this.env.var("CONSUL_NSPACES_ENABLED"),a=this.env.var("CONSUL_PARTITIONS_ENABLED")
+if(r||a){const e=await this.settings.findBySlug("token")
+r&&(void 0!==n.ns&&0!==n.ns.length||(n.ns=e.Namespace)),a&&(void 0!==n.partition&&0!==n.partition.length||(n.partition=e.Partition))}return e.requestForAuthorize(t,n)},(function(e,t){return t((function(e,t){return t}))}),r,t.modelName)}},l=d(a.prototype,"env",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=d(a.prototype,"settings",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a)
+e.default=m})),define("consul-ui/adapters/policy",["exports","consul-ui/adapters/application","consul-ui/models/policy"],(function(e,t,n){function r(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function a(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?r(Object(n),!0).forEach((function(t){l(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):r(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class s extends t.default{requestForQuery(e,{dc:t,ns:n,partition:r,index:a,id:l}){return e`
+      GET /v1/acl/policies?${{dc:t}}
+
+      ${{ns:n,partition:r,index:a}}
+    `}requestForQueryRecord(e,{dc:t,ns:n,partition:r,index:a,id:l}){if(void 0===l)throw new Error("You must specify an id")
+return e`
+      GET /v1/acl/policy/${l}?${{dc:t}}
+
+      ${{ns:n,partition:r,index:a}}
+    `}requestForCreateRecord(e,t,n){return e`
+      PUT /v1/acl/policy?${a(a({},this.formatDatacenter(n.Datacenter)),{},{ns:n.Namespace,partition:n.Partition})}
+
+      ${{Name:t.Name,Description:t.Description,Rules:t.Rules,Datacenters:t.Datacenters}}
+    `}requestForUpdateRecord(e,t,r){const l=a(a({},this.formatDatacenter(r.Datacenter)),{},{ns:r.Namespace,partition:r.Partition})
+return e`
+      PUT /v1/acl/policy/${r[n.SLUG_KEY]}?${l}
+
+      ${{Name:t.Name,Description:t.Description,Rules:t.Rules,Datacenters:t.Datacenters}}
+    `}requestForDeleteRecord(e,t,r){const l=a(a({},this.formatDatacenter(r.Datacenter)),{},{ns:r.Namespace,partition:r.Partition})
+return e`
+      DELETE /v1/acl/policy/${r[n.SLUG_KEY]}?${l}
+    `}}e.default=s})),define("consul-ui/adapters/proxy",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{requestForQuery(e,{dc:t,ns:n,partition:r,index:a,id:l,uri:s}){if(void 0===l)throw new Error("You must specify an id")
+return e`
+      GET /v1/catalog/connect/${l}?${{dc:t}}
+      X-Request-ID: ${s}
+      X-Range: ${l}
+
+      ${{ns:n,partition:r,index:a}}
+    `}}e.default=n})),define("consul-ui/adapters/role",["exports","consul-ui/adapters/application","consul-ui/models/role"],(function(e,t,n){function r(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function a(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?r(Object(n),!0).forEach((function(t){l(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):r(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class s extends t.default{requestForQuery(e,{dc:t,ns:n,partition:r,index:a,id:l}){return e`
+      GET /v1/acl/roles?${{dc:t}}
+
+      ${{ns:n,partition:r,index:a}}
+    `}requestForQueryRecord(e,{dc:t,ns:n,partition:r,index:a,id:l}){if(void 0===l)throw new Error("You must specify an id")
+return e`
+      GET /v1/acl/role/${l}?${{dc:t}}
+
+      ${{ns:n,partition:r,index:a}}
+    `}requestForCreateRecord(e,t,n){return e`
+      PUT /v1/acl/role?${a(a({},this.formatDatacenter(n.Datacenter)),{},{ns:n.Namespace,partition:n.Partition})}
+
+      ${{Name:t.Name,Description:t.Description,Policies:t.Policies,ServiceIdentities:t.ServiceIdentities,NodeIdentities:t.NodeIdentities}}
+    `}requestForUpdateRecord(e,t,r){const l=a(a({},this.formatDatacenter(r.Datacenter)),{},{ns:r.Namespace,partition:r.Partition})
+return e`
+      PUT /v1/acl/role/${r[n.SLUG_KEY]}?${l}
+
+      ${{Name:t.Name,Description:t.Description,Policies:t.Policies,ServiceIdentities:t.ServiceIdentities,NodeIdentities:t.NodeIdentities}}
+    `}requestForDeleteRecord(e,t,r){const l=a(a({},this.formatDatacenter(r.Datacenter)),{},{ns:r.Namespace,partition:r.Partition})
+return e`
+      DELETE /v1/acl/role/${r[n.SLUG_KEY]}?${l}
+    `}}e.default=s})),define("consul-ui/adapters/service-instance",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{requestForQuery(e,{dc:t,ns:n,partition:r,index:a,id:l,uri:s}){if(void 0===l)throw new Error("You must specify an id")
+return e`
+      GET /v1/health/service/${l}?${{dc:t}}
+      X-Request-ID: ${s}
+      X-Range: ${l}
+
+      ${{ns:n,partition:r,index:a}}
+    `}requestForQueryRecord(){return this.requestForQuery(...arguments)}}e.default=n})),define("consul-ui/adapters/service",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{requestForQuery(e,{dc:t,ns:n,partition:r,index:a,gateway:l,uri:s}){return void 0!==l?e`
+        GET /v1/internal/ui/gateway-services-nodes/${l}?${{dc:t}}
+        X-Range: ${l}
+        X-Request-ID: ${s}
+
+        ${{ns:n,partition:r,index:a}}
+      `:e`
+        GET /v1/internal/ui/services?${{dc:t}}
+        X-Request-ID: ${s}
+
+        ${{ns:n,partition:r,index:a}}
+    `}requestForQueryRecord(e,{dc:t,ns:n,partition:r,index:a,id:l,uri:s}){if(void 0===l)throw new Error("You must specify an id")
+return e`
+      GET /v1/health/service/${l}?${{dc:t}}
+      X-Request-ID: ${s}
+
+      ${{ns:n,partition:r,index:a}}
+    `}}e.default=n})),define("consul-ui/adapters/session",["exports","consul-ui/adapters/application","consul-ui/models/session"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends t.default{requestForQuery(e,{dc:t,ns:n,partition:r,index:a,id:l,uri:s}){if(void 0===l)throw new Error("You must specify an id")
+return e`
+      GET /v1/session/node/${l}?${{dc:t}}
+      X-Request-ID: ${s}
+
+      ${{ns:n,partition:r,index:a}}
+    `}requestForQueryRecord(e,{dc:t,ns:n,partition:r,index:a,id:l}){if(void 0===l)throw new Error("You must specify an id")
+return e`
+      GET /v1/session/info/${l}?${{dc:t}}
+
+      ${{ns:n,partition:r,index:a}}
+    `}requestForDeleteRecord(e,t,r){const a={dc:r.Datacenter,ns:r.Namespace,partition:r.Partition}
+return e`
+      PUT /v1/session/destroy/${r[n.SLUG_KEY]}?${a}
+    `}}e.default=r})),define("consul-ui/adapters/token",["exports","consul-ui/adapters/application","consul-ui/models/token"],(function(e,t,n){var r,a,l
+function s(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function i(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?s(Object(n),!0).forEach((function(t){o(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):s(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let u=(r=Ember.inject.service("store"),a=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="store",a=this,(r=l)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}requestForQuery(e,{dc:t,ns:n,partition:r,index:a,role:l,policy:s}){return e`
+      GET /v1/acl/tokens?${{role:l,policy:s,dc:t}}
+
+      ${{ns:n,partition:r,index:a}}
+    `}async requestForQueryRecord(e,{dc:t,ns:n,partition:r,index:a,id:l}){if(void 0===l)throw new Error("You must specify an id")
+const s=await(e`
+      GET /v1/acl/token/${l}?${{dc:t}}
+      Cache-Control: no-store
+
+      ${{ns:n,partition:r,index:a}}
+    `)
+return s(e=>delete e["x-consul-index"]),s}requestForCreateRecord(e,t,n){return e`
+      PUT /v1/acl/token?${i(i({},this.formatDatacenter(n.Datacenter)),{},{ns:n.Namespace,partition:n.Partition})}
+
+      ${{Description:t.Description,Policies:t.Policies,Roles:t.Roles,ServiceIdentities:t.ServiceIdentities,NodeIdentities:t.NodeIdentities,Local:t.Local}}
+    `}requestForUpdateRecord(e,t,r){if(void 0!==r.Rules)return e`
+        PUT /v1/acl/update?${this.formatDatacenter(r.Datacenter)}
+
+        ${t}
+      `
+const a=i(i({},this.formatDatacenter(r.Datacenter)),{},{ns:r.Namespace,partition:r.Partition})
+return e`
+      PUT /v1/acl/token/${r[n.SLUG_KEY]}?${a}
+
+      ${{Description:t.Description,Policies:t.Policies,Roles:t.Roles,ServiceIdentities:t.ServiceIdentities,NodeIdentities:t.NodeIdentities,Local:t.Local}}
+    `}requestForDeleteRecord(e,t,r){const a={dc:r.Datacenter,ns:r.Namespace,partition:r.Partition}
+return e`
+      DELETE /v1/acl/token/${r[n.SLUG_KEY]}?${a}
+    `}requestForSelf(e,t,{dc:n,index:r,secret:a}){return e`
+      GET /v1/acl/token/self?${{dc:n}}
+      X-Consul-Token: ${a}
+      Cache-Control: no-store
+
+      ${{index:r}}
+    `}requestForCloneRecord(e,t,r){const a=r[n.SLUG_KEY]
+if(void 0===a)throw new Error("You must specify an id")
+return e`
+      PUT /v1/acl/token/${a}/clone?${{dc:r.Datacenter,ns:r.Namespace,partition:r.Partition}}
+    `}self(e,t,n,r){return this.rpc((function(e,t,n,r){return e.requestForSelf(t,n,r)}),(function(e,t,n,r){return e.respondForSelf(t,n,r)}),r,t.modelName)}clone(e,t,n,r){return this.rpc((function(e,t,n,r){return e.requestForCloneRecord(t,n,r)}),(e,t,n,r)=>{const a={dc:r.Datacenter,ns:r.Namespace,partition:r.Partition}
+return e.respondForQueryRecord(t,a)},r,t.modelName)}},c=a.prototype,d="store",m=[r],p={configurable:!0,enumerable:!0,writable:!0,initializer:null},b={},Object.keys(p).forEach((function(e){b[e]=p[e]})),b.enumerable=!!b.enumerable,b.configurable=!!b.configurable,("value"in b||b.initializer)&&(b.writable=!0),b=m.slice().reverse().reduce((function(e,t){return t(c,d,e)||e}),b),f&&void 0!==b.initializer&&(b.value=b.initializer?b.initializer.call(f):void 0,b.initializer=void 0),void 0===b.initializer&&(Object.defineProperty(c,d,b),b=null),l=b,a)
+var c,d,m,p,f,b
+e.default=u})),define("consul-ui/adapters/topology",["exports","consul-ui/adapters/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{requestForQueryRecord(e,{dc:t,ns:n,partition:r,kind:a,index:l,id:s,uri:i}){if(void 0===s)throw new Error("You must specify an id")
+return e`
+      GET /v1/internal/ui/service-topology/${s}?${{dc:t,kind:a}}
+      X-Request-ID: ${i}
+
+      ${{ns:n,partition:r,index:l}}
+    `}}e.default=n})),define("consul-ui/app",["exports","ember-resolver","ember-load-initializers","consul-ui/config/environment"],(function(e,t,n,r){function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class l extends Ember.Application{constructor(...e){super(...e),a(this,"modulePrefix",r.default.modulePrefix),a(this,"podModulePrefix",r.default.podModulePrefix),a(this,"Resolver",t.default)}}e.default=l,(0,n.default)(l,r.default.modulePrefix)})),define("consul-ui/component-managers/glimmer",["exports","@glimmer/component/-private/ember-component-manager"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/-dynamic-element-alt",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Component.extend()
+e.default=t})),define("consul-ui/components/-dynamic-element",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Component.extend()
+e.default=t})),define("consul-ui/components/action/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"ZOGNH+Kw",block:'{"symbols":["@tabindex","&attrs","@type","@onclick","&default","@href","@external","@for"],"statements":[[6,[37,3],[[32,8]],null,[["default","else"],[{"statements":[[11,"label"],[16,"for",[32,8]],[17,2],[12],[18,5,null],[13]],"parameters":[]},{"statements":[[6,[37,3],[[32,6]],null,[["default","else"],[{"statements":[[6,[37,3],[[32,7]],null,[["default","else"],[{"statements":[[11,"a"],[16,6,[32,6]],[24,"target","_blank"],[24,"rel","noopener noreferrer"],[17,2],[12],[18,5,null],[13]],"parameters":[]},{"statements":[[11,"a"],[16,6,[32,6]],[17,2],[12],[18,5,null],[13]],"parameters":[]}]]]],"parameters":[]},{"statements":[[11,"button"],[16,"tabindex",[32,1]],[17,2],[16,4,[30,[36,0],[[32,3],"button"],null]],[4,[38,2],["click",[30,[36,1],[[32,4]],null]],null],[12],[18,5,null],[13]],"parameters":[]}]]]],"parameters":[]}]]]],"hasEval":false,"upvars":["or","optional","on","if"]}',meta:{moduleName:"consul-ui/components/action/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/anonymous/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"U7xNhMne",block:'{"symbols":["&default"],"statements":[[18,1,null]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/anonymous/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:""}))
+e.default=n})),define("consul-ui/components/app-error/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"dYVazy5r",block:'{"symbols":["@error","@login"],"statements":[[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n    "],[10,"h1"],[12],[2,"\\n      Error "],[1,[32,1,["status"]]],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n    "],[8,"error-state",[],[["@error","@login"],[[32,1],[30,[36,1],[[30,[36,0],[[32,1,["status"]],"403"],null],[32,2]],null]]],null],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"]],"hasEval":false,"upvars":["eq","if"]}',meta:{moduleName:"consul-ui/components/app-error/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/app-view/index",["exports","block-slots"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"xz4Gi6kv",block:'{"symbols":["&attrs","&default"],"statements":[[11,"div"],[24,0,"app-view"],[17,1],[12],[2,"\\n  "],[18,2,null],[2,"\\n  "],[10,"header"],[12],[2,"\\n      "],[10,"div"],[12],[2,"\\n          "],[10,"div"],[12],[2,"\\n              "],[10,"nav"],[14,"aria-label","Breadcrumb"],[12],[2,"\\n                  "],[8,"yield-slot",[],[["@name"],["breadcrumbs"]],[["default"],[{"statements":[[2,"\\n                    "],[1,[30,[36,0],null,[["class"],["with-breadcrumbs"]]]],[2,"\\n                    "],[18,2,null],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n              "],[13],[2,"\\n              "],[10,"div"],[14,0,"title"],[12],[2,"\\n                "],[8,"yield-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                    "],[18,2,null],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n                "],[10,"div"],[14,0,"actions"],[12],[2,"\\n                    "],[8,"yield-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n                      "],[8,"portal-target",[],[["@name"],["app-view-actions"]],null],[2,"\\n                      "],[18,2,null],[2,"\\n                    "]],"parameters":[]}]]],[2,"\\n                "],[13],[2,"\\n              "],[13],[2,"\\n              "],[8,"yield-slot",[],[["@name"],["nav"]],[["default"],[{"statements":[[2,"\\n                "],[18,2,null],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n      "],[13],[2,"\\n      "],[8,"yield-slot",[],[["@name"],["toolbar"]],[["default"],[{"statements":[[2,"\\n        "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[2,"\\n        "],[18,2,null],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n  "],[13],[2,"\\n  "],[10,"div"],[12],[2,"\\n    "],[8,"yield-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[18,2,null]],"parameters":[]}]]],[2,"\\n  "],[13],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["document-attrs"]}',meta:{moduleName:"consul-ui/components/app-view/index.hbs"}})
+var r=Ember._setComponentTemplate(n,Ember.Component.extend(t.default,{tagName:""}))
+e.default=r})),define("consul-ui/components/app/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s,i
+function o(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const u=Ember.HTMLBars.template({id:"/jM8p8BN",block:'{"symbols":["exported","&attrs","&default"],"statements":[[6,[37,10],[[30,[36,6],null,[["main","Notification"],[[30,[36,1],[[35,3],"-main"],null],[30,[36,9],["app/notification"],null]]]]],null,[["default"],[{"statements":[[2,"\\n"],[11,"div"],[24,0,"app"],[17,2],[12],[2,"\\n\\n  "],[11,"div"],[24,0,"skip-links"],[4,[38,0],["click",[32,0,["focus"]]],null],[12],[2,"\\n    "],[8,"portal-target",[],[["@name","@multiple"],["app-before-skip-links",true]],[["default"],[{"statements":[],"parameters":[]}]]],[2,"\\n    "],[10,"a"],[15,6,[30,[36,1],["#",[32,1,["main"]]],null]],[12],[1,[30,[36,2],["components.app.skip_to_content"],null]],[13],[2,"\\n"],[2,"    "],[8,"portal-target",[],[["@name","@multiple"],["app-after-skip-links",true]],[["default"],[{"statements":[],"parameters":[]}]]],[2,"\\n  "],[13],[2,"\\n\\n  "],[8,"modal-layer",[],[[],[]],null],[2,"\\n\\n  "],[10,"input"],[15,1,[30,[36,1],[[35,3],"-main-nav-toggle"],null]],[14,4,"checkbox"],[12],[13],[2,"\\n  "],[10,"header"],[14,"role","banner"],[12],[2,"\\n    "],[11,"label"],[24,"tabindex","0"],[16,"for",[30,[36,1],[[35,3],"-main-nav-toggle"],null]],[16,"aria-label",[30,[36,2],["components.app.toggle_menu"],null]],[4,[38,0],["keypress",[32,0,["keypressClick"]]],null],[4,[38,0],["mouseup",[32,0,["unfocus"]]],null],[12],[13],[2,"\\n      "],[18,3,[[30,[36,4],["home-nav"],null],[32,1]]],[2,"\\n      "],[10,"div"],[12],[2,"\\n"],[2,"        "],[11,"nav"],[16,"aria-label",[30,[36,2],["components.app.main"],null]],[16,0,[30,[36,5],[[32,0,["navInViewport"]],"in-viewport"],null]],[4,[38,8],null,[["onEnter","onExit","viewportTolerance"],[[30,[36,7],[[32,0],"navInViewport",true],null],[30,[36,7],[[32,0],"navInViewport",false],null],[30,[36,6],null,[["top","bottom","left","right"],[-10,-10,-10,-10]]]]]],[12],[2,"\\n          "],[18,3,[[30,[36,4],["main-nav"],null],[32,1]]],[2,"\\n        "],[13],[2,"\\n"],[2,"        "],[10,"nav"],[15,"aria-label",[30,[36,2],["components.app.complementary"],null]],[12],[2,"\\n          "],[18,3,[[30,[36,4],["complementary-nav"],null],[32,1]]],[2,"\\n        "],[13],[2,"\\n\\n      "],[13],[2,"\\n  "],[13],[2,"\\n  "],[10,"main"],[15,1,[30,[36,1],[[35,3],"-main"],null]],[12],[2,"\\n    "],[10,"div"],[14,0,"notifications"],[12],[2,"\\n      "],[18,3,[[30,[36,4],["notifications"],null],[32,1]]],[2,"\\n      "],[8,"portal-target",[],[["@name","@multiple"],["app-notifications",true]],[["default"],[{"statements":[],"parameters":[]}]]],[2,"\\n    "],[13],[2,"\\n    "],[18,3,[[30,[36,4],["main"],null],[32,1]]],[2,"\\n  "],[13],[2,"\\n  "],[10,"footer"],[14,"role","contentinfo"],[12],[2,"\\n    "],[18,3,[[30,[36,4],["content-info"],null],[32,1]]],[2,"\\n  "],[13],[2,"\\n"],[13],[2,"\\n\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["on","concat","t","guid","-named-block-invocation","if","hash","set","in-viewport","component","let"]}',meta:{moduleName:"consul-ui/components/app/index.hbs"}})
+let c=(n=Ember.inject.service("dom"),r=Ember._action,a=Ember._action,l=Ember._action,s=class extends t.default{constructor(e,t){var n,r,a,l
+super(...arguments),n=this,r="dom",l=this,(a=i)&&Object.defineProperty(n,r,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(l):void 0}),this.guid=this.dom.guid(this)}keypressClick(e){e.target.dispatchEvent(new MouseEvent("click"))}focus(e){const t=e.target.getAttribute("href")
+t.startsWith("#")&&(e.preventDefault(),this.dom.focus(t))}unfocus(e){e.target.blur()}},i=o(s.prototype,"dom",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o(s.prototype,"keypressClick",[r],Object.getOwnPropertyDescriptor(s.prototype,"keypressClick"),s.prototype),o(s.prototype,"focus",[a],Object.getOwnPropertyDescriptor(s.prototype,"focus"),s.prototype),o(s.prototype,"unfocus",[l],Object.getOwnPropertyDescriptor(s.prototype,"unfocus"),s.prototype),s)
+e.default=c,Ember._setComponentTemplate(u,c)})),define("consul-ui/components/app/notification/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"litSWzOO",block:'{"symbols":["&attrs","@delay","@sticky","&default"],"statements":[[11,"div"],[24,0,"app-notification"],[17,1],[4,[38,2],[[30,[36,1],[[30,[36,1],["opacity","1"],null],[30,[36,1],["transition-delay",[30,[36,0],[[32,2],"ms"],null]],null]],null]],null],[4,[38,2],[[30,[36,1],[[30,[36,1],["opacity",[30,[36,3],[[32,3],"1","0"],null]],null]],null]],[["delay"],[0]]],[12],[2,"\\n  "],[18,4,null],[2,"\\n"],[13],[2,"\\n\\n"]],"hasEval":false,"upvars":["concat","array","style","if"]}',meta:{moduleName:"consul-ui/components/app/notification/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/aria-menu/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"IOWpioIP",block:'{"symbols":["&default"],"statements":[[18,1,[[30,[36,5],[[32,0],"change"],null],[30,[36,5],[[32,0],"keypress"],null],[30,[36,5],[[32,0],"keypressClick"],null],[30,[36,4],null,[["labelledBy","controls","expanded"],[[30,[36,3],["component-aria-menu-trigger-",[35,2]],null],[30,[36,3],["component-aria-menu-menu-",[35,2]],null],[30,[36,1],[[35,0],"true",[29]],null]]]]]]],"hasEval":false,"upvars":["expanded","if","guid","concat","hash","action"]}',meta:{moduleName:"consul-ui/components/aria-menu/index.hbs"}}),n=13,r=32,a=38,l=40,s={vertical:{[l]:function(e,t=-1){return(t+1)%e.length},[a]:function(e,t=0){return 0===t?e.length-1:t-1},36:function(){return 0},35:function(e){return e.length-1}},horizontal:{}}
+var i=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:"",dom:Ember.inject.service("dom"),guid:"",expanded:!1,orientation:"vertical",keyboardAccess:!0,init:function(){this._super(...arguments),Ember.set(this,"guid",this.dom.guid(this)),this._listeners=this.dom.listeners(),this._routelisteners=this.dom.listeners()},didInsertElement:function(){this.$menu=this.dom.element("#component-aria-menu-menu-"+this.guid)
+const e=this.$menu.getAttribute("aria-labelledby")
+this.$trigger=this.dom.element("#"+e)},willDestroyElement:function(){this._super(...arguments),this._listeners.remove(),this._routelisteners.remove()},actions:{keypressClick:function(e){e.target.dispatchEvent(new MouseEvent("click"))},keypress:function(e){if(![n,r,a,l].includes(e.keyCode))return
+e.stopPropagation()
+const t=[...this.dom.elements('[role^="menuitem"]',this.$menu)]
+if(e.keyCode===n||e.keyCode===r){let e=this.expanded?void 0:t[0]
+Ember.run.next(()=>{e=this.expanded?e:this.$trigger,void 0!==e&&e.focus()})}if(void 0===s[this.orientation][e.keyCode])return
+e.preventDefault()
+const i=this.dom.element('[role^="menuitem"]:focus',this.$menu)
+let o
+i&&(o=t.findIndex((function(e){return e===i})))
+t[s[this.orientation][e.keyCode](t,o)].focus()},change:function(e){e.target.checked?this.actions.open.apply(this,[e]):this.actions.close.apply(this,[e])},close:function(){this._listeners.remove(),Ember.set(this,"expanded",!1),Ember.run.next(()=>{this.$trigger.removeAttribute("tabindex")})},open:function(){Ember.set(this,"expanded",!0)
+0===[...this.dom.elements('[role^="menuitem"]',this.$menu)].length&&this.dom.element('input[type="checkbox"]',this.$menu.parentElement).dispatchEvent(new MouseEvent("click")),this.$trigger.setAttribute("tabindex","-1"),this._listeners.add(this.dom.document(),{keydown:e=>{27===e.keyCode&&this.$trigger.focus(),9!==e.keyCode&&27!==e.keyCode?this.keyboardAccess&&this.actions.keypress.apply(this,[e]):this.$trigger.dispatchEvent(new MouseEvent("click"))}})}}}))
+e.default=i})),define("consul-ui/components/auth-dialog/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={id:"auth-dialog",initial:"idle",on:{CHANGE:[{target:"authorized",cond:"hasToken",actions:["login"]},{target:"unauthorized",actions:["logout"]}]},states:{idle:{on:{CHANGE:[{target:"authorized",cond:"hasToken"},{target:"unauthorized"}]}},unauthorized:{},authorized:{}}}})),define("consul-ui/components/auth-dialog/index",["exports","@glimmer/component","consul-ui/components/auth-dialog/chart.xstate"],(function(e,t,n){var r,a,l,s,i,o
+function u(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const c=Ember.HTMLBars.template({id:"h+KHm0qM",block:'{"symbols":["State","Guard","Action","dispatch","state","sink","api","&default","@src","@sink"],"statements":[[8,"state-chart",[],[["@src"],[[34,1]]],[["default"],[{"statements":[[2,"\\n\\n  "],[8,[32,2],[],[["@name","@cond"],["hasToken",[30,[36,2],[[32,0],"hasToken"],null]]],null],[2,"\\n  "],[8,[32,3],[],[["@name","@exec"],["login",[30,[36,2],[[32,0],"login"],null]]],null],[2,"\\n  "],[8,[32,3],[],[["@name","@exec"],["logout",[30,[36,2],[[32,0],"logout"],null]]],null],[2,"\\n\\n"],[2,"  "],[8,"data-source",[],[["@src","@onchange"],[[32,9],[30,[36,6],[[30,[36,2],[[32,0],[30,[36,4],[[35,5]],null]],[["value"],["data"]]],[30,[36,2],[[32,0],[32,4],"CHANGE"],null],[30,[36,2],[[32,0],[30,[36,4],[[35,3]],null]],[["value"],["data"]]]],null]]],null],[2,"\\n"],[2,"  "],[8,"data-sink",[],[["@sink"],[[32,10]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,8],[[30,[36,7],null,[["login","logout","token"],[[30,[36,2],[[32,0],[32,6,["open"]]],null],[30,[36,2],[[32,0],[32,6,["open"]],null],null],[35,5]]]]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,1],[],[["@matches"],["authorized"]],[["default"],[{"statements":[[2,"\\n        "],[18,8,[[30,[36,0],["authorized"],null],[32,7]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n\\n      "],[8,[32,1],[],[["@matches"],["unauthorized"]],[["default"],[{"statements":[[2,"\\n        "],[18,8,[[30,[36,0],["unauthorized"],null],[32,7]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n\\n"]],"parameters":[7]}]]],[2,"  "]],"parameters":[6]}]]],[2,"\\n"]],"parameters":[1,2,3,4,5]}]]],[2,"\\n"]],"hasEval":false,"upvars":["-named-block-invocation","chart","action","previousToken","mut","token","queue","hash","let"]}',meta:{moduleName:"consul-ui/components/auth-dialog/index.hbs"}})
+let d=(r=Ember.inject.service("repository/oidc-provider"),a=Ember._action,l=Ember._action,s=Ember._action,i=class extends t.default{constructor(){var e,t,r,a
+super(...arguments),e=this,t="repo",a=this,(r=o)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0}),this.chart=n.default}hasToken(){return void 0!==this.token.AccessorID}login(){let e=Ember.get(this,"previousToken.AccessorID"),t=Ember.get(this,"token.AccessorID")
+null===e&&(e=Ember.get(this,"previousToken.SecretID")),null===t&&(t=Ember.get(this,"token.SecretID"))
+let n="authorize"
+void 0!==e&&e!==t&&(n="use"),this.args.onchange({data:Ember.get(this,"token"),type:n})}logout(){void 0!==Ember.get(this,"previousToken.AuthMethod")&&this.repo.logout(Ember.get(this,"previousToken.SecretID")),this.previousToken=null,this.args.onchange({data:null,type:"logout"})}},o=u(i.prototype,"repo",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u(i.prototype,"hasToken",[a],Object.getOwnPropertyDescriptor(i.prototype,"hasToken"),i.prototype),u(i.prototype,"login",[l],Object.getOwnPropertyDescriptor(i.prototype,"login"),i.prototype),u(i.prototype,"logout",[s],Object.getOwnPropertyDescriptor(i.prototype,"logout"),i.prototype),i)
+e.default=d,Ember._setComponentTemplate(c,d)})),define("consul-ui/components/auth-form/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={id:"auth-form",initial:"idle",on:{RESET:[{target:"idle"}],ERROR:[{target:"error"}]},states:{idle:{entry:["clearError"],on:{SUBMIT:[{target:"loading",cond:"hasValue"},{target:"error"}]}},loading:{},error:{exit:["clearError"],on:{TYPING:[{target:"idle"}],SUBMIT:[{target:"loading",cond:"hasValue"},{target:"error"}]}}}}})),define("consul-ui/components/auth-form/index",["exports","@glimmer/component","consul-ui/components/auth-form/chart.xstate","consul-ui/components/auth-form/tabs.xstate"],(function(e,t,n,r){var a,l,s
+function i(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const o=Ember.HTMLBars.template({id:"3tojTMnY",block:'{"symbols":["State","Guard","ChartAction","dispatch","state","chart","exported","TabState","IgnoredGuard","IgnoredAction","tabDispatch","tabState","notice","&attrs","&default","@dc","@nspace","@partition","@onsubmit"],"statements":[[8,"state-chart",[],[["@src"],[[32,0,["chart"]]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,17],[[30,[36,3],null,[["State","Guard","Action","dispatch","state"],[[32,1],[32,2],[32,3],[32,4],[32,5]]]]],null,[["default"],[{"statements":[[6,[37,17],[[30,[36,3],null,[["reset","focus","disabled","error","submit"],[[30,[36,5],[[32,0],[32,4],"RESET"],null],[32,0,["focus"]],[30,[36,2],[[32,5],"loading"],null],[30,[36,6],[[30,[36,5],[[32,0],[32,4],"ERROR"],null],[30,[36,5],[[32,0],[30,[36,7],[[32,0,["error"]]],null]],[["value"],["error.errors.firstObject"]]]],null],[30,[36,6],[[30,[36,5],[[32,0],[30,[36,7],[[32,0,["value"]]],null]],null],[30,[36,5],[[32,0],[32,4],"SUBMIT"],null]],null]]]]],null,[["default"],[{"statements":[[2,"  "],[8,[32,2],[],[["@name","@cond"],["hasValue",[32,0,["hasValue"]]]],null],[2,"\\n"],[2,"  "],[8,[32,6,["Action"]],[],[["@name","@exec"],["clearError",[30,[36,6],[[30,[36,5],[[32,0],[30,[36,7],[[32,0,["error"]]],null],[29]],null],[30,[36,5],[[32,0],[30,[36,7],[[32,0,["secret"]]],null],[29]],null]],null]]],null],[2,"\\n  "],[11,"div"],[24,0,"auth-form"],[17,14],[12],[2,"\\n"],[8,"state-chart",[],[["@src"],[[32,0,["tabsChart"]]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[30,[36,8],["use SSO"],null]],null,[["default"],[{"statements":[[2,"    "],[8,"tab-nav",[],[["@items","@onclick"],[[30,[36,4],[[30,[36,3],null,[["label","selected"],["Token",[30,[36,2],[[32,12],"token"],null]]]],[30,[36,3],null,[["label","selected"],["SSO",[30,[36,2],[[32,12],"sso"],null]]]]],null],[30,[36,6],[[30,[36,5],[[32,0],[32,11]],null],[30,[36,5],[[32,0],[32,4],"RESET"],null]],null]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[8,[32,1],[],[["@matches"],["error"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[32,0,["error","status"]]],null,[["default"],[{"statements":[[2,"        "],[8,"notice",[[24,"role","alert"]],[["@type"],["error"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,13,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n"],[6,[37,1],[[32,0,["value","Name"]]],null,[["default","else"],[{"statements":[[6,[37,1],[[30,[36,0],[[32,0,["error","status"]],"403"],null]],null,[["default","else"],[{"statements":[[2,"                  "],[10,"strong"],[12],[2,"Consul login failed"],[13],[10,"br"],[12],[13],[2,"\\n                  We received a token from your OIDC provider but could not log in to Consul with it.\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,0],[[32,0,["error","status"]],"401"],null]],null,[["default","else"],[{"statements":[[2,"                  "],[10,"strong"],[12],[2,"Could not log in to provider"],[13],[10,"br"],[12],[13],[2,"\\n                  The OIDC provider has rejected this access token. Please have an administrator check your auth method configuration.\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,0],[[32,0,["error","status"]],"499"],null]],null,[["default","else"],[{"statements":[[2,"                  "],[10,"strong"],[12],[2,"SSO log in window closed"],[13],[10,"br"],[12],[13],[2,"\\n                  The OIDC provider window was closed. Please try again.\\n"]],"parameters":[]},{"statements":[[2,"                  "],[10,"strong"],[12],[2,"Error"],[13],[10,"br"],[12],[13],[2,"\\n                  "],[1,[32,0,["error","detail"]]],[2,"\\n                "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,0],[[32,0,["error","status"]],"403"],null]],null,[["default","else"],[{"statements":[[2,"                  "],[10,"strong"],[12],[2,"Invalid token"],[13],[10,"br"],[12],[13],[2,"\\n                  The token entered does not exist. Please enter a valid token to log in.\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,0],[[32,0,["error","status"]],"404"],null]],null,[["default","else"],[{"statements":[[2,"                  "],[10,"strong"],[12],[2,"No providers"],[13],[10,"br"],[12],[13],[2,"\\n                  No SSO providers are configured for that Partition.\\n"]],"parameters":[]},{"statements":[[2,"                  "],[10,"strong"],[12],[2,"Error"],[13],[10,"br"],[12],[13],[2,"\\n                  "],[1,[32,0,["error","detail"]]],[2,"\\n                "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[2,"            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[13]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n"],[8,[32,8],[],[["@matches"],["token"]],[["default"],[{"statements":[[2,"\\n    "],[10,"form"],[15,"onsubmit",[30,[36,5],[[32,0],[32,4],"SUBMIT"],null]],[12],[2,"\\n      "],[10,"fieldset"],[12],[2,"\\n        "],[10,"label"],[15,0,[30,[36,11],["type-password",[30,[36,1],[[30,[36,10],[[30,[36,2],[[32,5],"error"],null],[30,[36,9],[[32,0,["error","status"]]],null]],null]," has-error"],null]],null]],[12],[2,"\\n          "],[10,"span"],[12],[2,"Log in with a token"],[13],[2,"\\n\\n"],[2,"          "],[11,"input"],[16,"disabled",[30,[36,2],[[32,5],"loading"],null]],[24,3,"auth[SecretID]"],[24,"placeholder","SecretID"],[16,2,[32,0,["secret"]]],[16,"oninput",[30,[36,6],[[30,[36,5],[[32,0],[30,[36,7],[[32,0,["secret"]]],null]],[["value"],["target.value"]]],[30,[36,5],[[32,0],[30,[36,7],[[32,0,["value"]]],null]],[["value"],["target.value"]]],[30,[36,5],[[32,0],[32,4],"TYPING"],null]],null]],[16,4,[30,[36,1],[[30,[36,0],[[30,[36,12],["environment"],null],"testing"],null],"text","password"],null]],[4,[38,14],[[30,[36,13],[[32,0],"input"],null]],null],[12],[13],[2,"\\n          "],[8,[32,1],[],[["@matches"],["error"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[30,[36,9],[[32,0,["error","status"]]],null]],null,[["default"],[{"statements":[[2,"              "],[10,"strong"],[14,"role","alert"],[12],[2,"\\n                Please enter your secret\\n              "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "],[13],[2,"\\n      "],[13],[2,"\\n      "],[8,"action",[[16,"disabled",[30,[36,2],[[32,5],"loading"],null]]],[["@type"],["submit"]],[["default"],[{"statements":[[2,"\\n        Log in\\n      "]],"parameters":[]}]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n\\n"],[18,15,[[30,[36,15],[[32,7],[30,[36,3],null,[["Method"],[[32,8]]]]],null]]],[2,"\\n\\n      "],[10,"em"],[12],[2,"\\n        Contact your administrator for login credentials.\\n      "],[13],[2,"\\n"]],"parameters":[8,9,10,11,12]}]]],[2,"\\n\\n\\n  "],[13],[2,"\\n  "],[8,[32,1],[],[["@matches"],["loading"]],[["default"],[{"statements":[[2,"\\n    "],[8,"token-source",[],[["@dc","@nspace","@partition","@type","@value","@onchange","@onerror"],[[32,16],[30,[36,16],[[32,0,["value","Namespace"]],[32,17]],null],[30,[36,16],[[32,0,["value","Partition"]],[32,18]],null],[30,[36,1],[[32,0,["value","Name"]],"oidc","secret"],null],[32,0,["value"]],[30,[36,6],[[30,[36,5],[[32,0],[32,4],"RESET"],null],[32,19]],null],[30,[36,6],[[30,[36,5],[[32,0],[30,[36,7],[[32,0,["error"]]],null]],[["value"],["error.errors.firstObject"]]],[30,[36,5],[[32,0],[32,4],"ERROR"],null]],null]]],null],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[7]}]]]],"parameters":[6]}]]]],"parameters":[1,2,3,4,5]}]]]],"hasEval":false,"upvars":["eq","if","state-matches","hash","array","action","queue","mut","can","not","and","concat","env","set","did-insert","assign","or","let"]}',meta:{moduleName:"consul-ui/components/auth-form/index.hbs"}})
+let u=(a=Ember._action,l=Ember._action,i((s=class extends t.default{constructor(){super(...arguments),this.chart=n.default,this.tabsChart=r.default}hasValue(e,t,n){return""!==this.value&&void 0!==this.value}focus(){this.input.focus()}}).prototype,"hasValue",[a],Object.getOwnPropertyDescriptor(s.prototype,"hasValue"),s.prototype),i(s.prototype,"focus",[l],Object.getOwnPropertyDescriptor(s.prototype,"focus"),s.prototype),s)
+e.default=u,Ember._setComponentTemplate(o,u)})),define("consul-ui/components/auth-form/tabs.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={id:"auth-form-tabs",initial:"token",on:{TOKEN:[{target:"token"}],SSO:[{target:"sso"}]},states:{token:{},sso:{}}}})),define("consul-ui/components/auth-profile/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"NskkZ4lP",block:'{"symbols":["&attrs","@item"],"statements":[[11,"dl"],[24,0,"auth-profile"],[17,1],[12],[2,"\\n    "],[10,"dt"],[12],[2,"\\n      "],[10,"span"],[12],[2,"My ACL Token"],[13],[10,"br"],[12],[13],[2,"\\n      AccessorID\\n    "],[13],[2,"\\n    "],[10,"dd"],[12],[2,"\\n      "],[1,[30,[36,1],[[32,2,["AccessorID"]],[30,[36,0],[[32,2,["AccessorID","length"]],8],null]],null]],[2,"\\n    "],[13],[2,"\\n"],[13]],"hasEval":false,"upvars":["sub","string-substring"]}',meta:{moduleName:"consul-ui/components/auth-profile/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/basic-dropdown-content",["exports","ember-basic-dropdown/components/basic-dropdown-content"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
+define("consul-ui/components/basic-dropdown-optional-tag",["exports","ember-basic-dropdown/components/basic-dropdown-optional-tag"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/basic-dropdown-trigger",["exports","ember-basic-dropdown/components/basic-dropdown-trigger"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/basic-dropdown",["exports","ember-basic-dropdown/components/basic-dropdown"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/block-slot",["exports","block-slots/components/block-slot"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/brand-loader/enterprise",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"3HLvt6Sl",block:'{"symbols":[],"statements":[[10,"path"],[14,"data-enterprise-logo",""],[14,"d","M322.099,18.0445001 C319.225,18.0223001 316.427,18.9609001 314.148,20.7112001 L314.016,20.8179001 L313.68,18.5368001 L310.332,18.5368001 L310.332,53.0000001 L314.312,52.4338001 L314.312,42.3164001 L314.435,42.3164001 C316.705,42.7693001 319.012,43.0165001 321.327,43.0549001 C326.554,43.0549001 329.098,40.5029001 329.098,35.2432001 L329.098,25.3802001 C329.073,20.4569001 326.809,18.0445001 322.099,18.0445001 Z M264.971,11.9722001 L260.991,12.5466001 L260.991,18.5284001 L256.708,18.5284001 L256.708,21.8106001 L260.991,21.8106001 L260.991,37.6883001 L260.99344,37.9365729 C261.066744,41.6122056 262.7975,43.1124033 266.915,43.1124033 C268.591,43.1170001 270.255,42.8396001 271.839,42.2915001 L271.363,39.1817001 L270.896229,39.3066643 C269.803094,39.5806719 268.682875,39.7315001 267.555,39.7560001 C265.526625,39.7560001 265.081547,38.9674128 264.991981,37.7056542 L264.97743,37.4176027 L264.97159,37.1147428 L264.971,21.8188001 L271.494,21.8188001 L271.83,18.5366001 L264.971,18.5366001 L264.971,11.9722001 Z M283.556,18.0770001 C277.312,18.0770001 274.144,21.0884001 274.144,27.0374001 L274.144,34.3075001 C274.144,40.3140001 277.164,43.1124894 283.655,43.1124894 C286.526,43.1192001 289.38,42.6620001 292.106,41.7581001 L291.589,38.6154001 C289.116,39.3030001 286.566,39.6779001 283.999,39.7314001 C279.785843,39.7314001 278.500803,38.4772648 278.201322,35.860808 L278.165734,35.4868687 L278.141767,35.0951811 C278.138675,35.0284172 278.136019,34.9609111 278.133774,34.8926614 L278.125037,34.474229 L278.124,32.0756001 L292.582,32.0756001 L292.582,27.1031001 C292.582,21.0064001 289.636,18.0770001 283.556,18.0770001 Z M384.631,18.0768001 C378.412,18.0440001 375.22,21.0554001 375.22,27.0208001 L375.22,34.2909001 C375.22,40.2973001 378.239,43.0955988 384.73,43.0955988 C387.599,43.1033001 390.45,42.6460001 393.173,41.7415001 L392.665,38.5988001 C390.188,39.2815001 387.635,39.6509001 385.066,39.6983001 C380.852843,39.6983001 379.567803,38.4442359 379.268322,35.8278014 L379.232734,35.4538649 L379.208767,35.0621794 C379.205675,34.9954158 379.203019,34.9279099 379.200774,34.8596604 L379.192037,34.4412289 L379.191,32.0754001 L393.657,32.0754001 L393.657,27.1029001 C393.657,21.0062001 390.712,18.0768001 384.631,18.0768001 Z M364.634,18.0441001 C363.881125,18.0441001 363.18736,18.0712813 362.54969,18.1279834 L362.016783,18.1838695 C357.948857,18.6791301 356.371,20.5353768 356.371,24.4608001 L356.371522,24.7155013 L356.376145,25.2052033 L356.386527,25.669464 L356.403852,26.1092746 C356.407384,26.1805939 356.411254,26.2509357 356.415488,26.3203208 L356.445451,26.7253144 L356.485319,27.1083357 C356.756619,29.3425283 357.626845,30.4437319 360.247859,31.3753061 L360.701103,31.529163 C360.779411,31.5545991 360.85912,31.5799457 360.940253,31.6052232 L361.444353,31.7562266 L361.983836,31.9065664 L362.55989,32.0572338 L363.430663,32.2724269 L364.440153,32.5299129 L364.884369,32.6506971 L365.29049,32.7679922 L365.660213,32.8831607 L365.99523,32.9975651 C367.26815,33.4554713 367.748817,33.9277406 367.925217,34.806783 L367.963261,35.0352452 C367.974017,35.1143754 367.982943,35.1965576 367.990321,35.2820187 L368.008092,35.5484662 L368.018269,35.8359502 L368.023,36.3096001 C368.023,36.3683432 368.022674,36.4261667 368.021989,36.4830819 L368.013333,36.8137655 C368.008847,36.9204214 368.002676,37.0235359 367.994568,37.1232009 L367.964177,37.4119383 C367.774513,38.8512264 367.058626,39.4837671 364.875404,39.6510671 L364.43427,39.67773 L363.954974,39.6933243 C363.78868,39.6967387 363.615773,39.6984001 363.436,39.6984001 C361.126,39.6638001 358.83,39.3385001 356.601,38.7302001 L356.051,41.7908001 L356.619468,41.9710684 C358.900888,42.6645722 361.270923,43.0269154 363.658,43.0463001 C369.59355,43.0463001 371.402903,41.3625861 371.812159,38.0405419 L371.854011,37.6421573 C371.859965,37.574501 371.865421,37.5062155 371.870401,37.4373012 L371.894725,37.0162715 L371.908596,36.5801656 C371.911587,36.4322862 371.913,36.2818967 371.913,36.1290001 L371.914417,35.5317322 C371.901583,33.4289389 371.677,32.2649251 370.797,31.3698001 C370.053077,30.6022731 368.787947,30.0494771 366.870096,29.4840145 L366.242608,29.3047611 C366.13436,29.2747269 366.024265,29.2445914 365.912304,29.2143213 L365.218,29.0308209 L364.216102,28.7784328 L363.495981,28.593015 L363.068145,28.4733265 L362.67987,28.3551624 C361.018765,27.8247783 360.501056,27.2986662 360.340522,26.2094051 L360.310407,25.9578465 C360.306262,25.9142982 360.302526,25.8699197 360.29916,25.8246823 L360.283089,25.5427193 L360.273984,25.2387571 L360.269927,24.911412 L360.270221,24.3885398 L360.280627,24.0635689 C360.366727,22.3885604 360.966747,21.6370879 363.248047,21.4645754 L363.695778,21.4389299 L364.184625,21.426349 L364.445,21.4248001 C366.684,21.4608001 368.916,21.6859001 371.117,22.0976001 L371.396,18.8646001 L370.730951,18.7059457 C368.73071,18.2553391 366.686,18.0331201 364.634,18.0441001 Z M351.301,18.5363001 L347.321,18.5363001 L347.321,42.6112001 L351.301,42.6112001 L351.301,18.5363001 Z M307.335,18.0850001 L306.70097,18.3638937 C304.598769,19.3169298 302.610091,20.5031364 300.771,21.9005001 L300.623,22.0236001 L300.369,18.5363001 L296.931,18.5363001 L296.931,42.6112001 L300.91,42.6112001 L300.91,25.9048001 L301.641825,25.3925123 C303.604371,24.0427531 305.654445,22.8240667 307.778,21.7446001 L307.335,18.0850001 Z M344.318,18.0850001 L343.683947,18.3638937 C341.581595,19.3169298 339.592091,20.5031364 337.753,21.9005001 L337.606,22.0236001 L337.351,18.5363001 L333.946,18.5363001 L333.946,42.6112001 L337.926,42.6112001 L337.926,25.9048001 L337.967,25.9048001 L338.701162,25.3884311 C340.669963,24.0279284 342.726556,22.7996223 344.859,21.7118001 L344.318,18.0850001 Z M230.384,9.62500005 L211.109,9.62500005 L211.109,42.6112001 L230.466,42.6112001 L230.466,38.9597001 L215.146,38.9597001 L215.146,27.4720001 L229.293,27.4720001 L229.293,23.8698001 L215.146,23.8698001 L215.146,13.2600001 L230.384,13.2600001 L230.384,9.62500005 Z M248.763,18.0441001 C245.899,18.0441001 241.706,19.3323001 239.047,20.6124001 L238.924,20.6698001 L238.522,18.5282001 L235.322,18.5282001 L235.322,42.5704001 L239.302,42.5704001 L239.302,24.2885001 L239.359,24.2885001 C241.919,22.9674001 245.661,21.8268001 247.524,21.8268001 C249.165,21.8268001 249.985,22.5735001 249.985,24.1736001 L249.985,42.5868001 L253.965,42.5868001 L253.965,24.1161001 C253.932,20.0380001 252.25,18.0523001 248.763,18.0441001 Z M321.229,21.5564001 C323.526,21.5564001 325.061,22.2046001 325.061,25.3966001 L325.094,35.2760001 C325.094,38.3121001 323.887,39.6085001 321.057,39.6085001 C318.81,39.5533001 316.572,39.3035001 314.369,38.8618001 L314.287,38.8618001 L314.287,24.4694001 C316.198,22.7311001 318.649,21.7027001 321.229,21.5564001 Z M283.581,21.3264001 C287.372,21.3264001 288.758,22.8855001 288.758,26.7010001 L288.758,28.7934001 L278.149,28.7934001 L278.149,26.7010001 C278.149,22.9839001 279.79,21.3264001 283.581,21.3264001 Z M384.648,21.3262001 C388.431,21.3262001 389.834,22.8852001 389.834,26.7008001 L389.834,28.7932001 L379.224,28.7932001 L379.224,26.7008001 C379.224,22.9837001 380.865,21.3262001 384.648,21.3262001 Z M351.301,8.63220005 L347.321,8.63220005 L347.321,14.4499001 L351.301,14.4499001 L351.301,8.63220005 Z"],[14,"fill-rule","nonzero"],[12],[13],[2,"\\n\\n"]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/brand-loader/enterprise.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/brand-loader/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"fT5BqeI8",block:'{"symbols":["@width","@color","@subtitle","&default"],"statements":[[10,"div"],[14,0,"brand-loader"],[15,5,[31,["margin-left: calc(-",[32,1],"px / 2)"]]],[12],[2,"\\n"],[10,"svg"],[15,"width",[31,[[32,1]]]],[14,"height","53"],[14,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[15,"fill",[31,[[32,2]]]],[12],[2,"\\n      "],[10,"path"],[14,"d","M32.7240001,0.866235051 C28.6239001,-0.218137949 24.3210001,-0.285465949 20.1890001,0.670096051 C16.0569001,1.62566005 12.2205001,3.57523005 9.01276015,6.34960005 C5.80499015,9.12397005 3.32280015,12.6393001 1.78161015,16.5905001 C0.240433148,20.5416001 -0.313157852,24.8092001 0.168892148,29.0228001 C0.650943148,33.2364001 2.15407015,37.2687001 4.54780015,40.7697001 C6.94153015,44.2707001 10.1535001,47.1346001 13.9050001,49.1128001 C17.6565001,51.0910001 21.8341001,52.1238001 26.0752001,52.1214409 C32.6125001,52.1281001 38.9121001,49.6698001 43.7170001,45.2370001 L37.5547001,38.7957001 C35.0952001,41.0133001 32.0454001,42.4701001 28.7748001,42.9898001 C25.5042001,43.5096001 22.1530001,43.0698001 19.1273001,41.7239001 C16.1015001,40.3779001 13.5308001,38.1835001 11.7267001,35.4064001 C9.92260015,32.6294001 8.96239015,29.3888001 8.96239015,26.0771001 C8.96239015,22.7655001 9.92260015,19.5249001 11.7267001,16.7478001 C13.5308001,13.9707001 16.1015001,11.7763001 19.1273001,10.4304001 C22.1530001,9.08444005 25.5042001,8.64470005 28.7748001,9.16441005 C32.0454001,9.68412005 35.0952001,11.1410001 37.5547001,13.3586001 L43.7170001,6.89263005 C40.5976001,4.01926005 36.8241001,1.95061005 32.7240001,0.866235051 Z M46.6320001,34.8572001 C46.2182001,34.9395001 45.8380001,35.1427001 45.5397001,35.4410001 C45.2413001,35.7394001 45.0381001,36.1195001 44.9558001,36.5334001 C44.8735001,36.9472001 44.9157001,37.3762001 45.0772001,37.7660001 C45.2387001,38.1559001 45.5121001,38.4891001 45.8630001,38.7235001 C46.2138001,38.9579001 46.6263001,39.0830001 47.0482001,39.0830001 C47.6141001,39.0830001 48.1567001,38.8583001 48.5568001,38.4582001 C48.9569001,38.0581001 49.1817001,37.5154001 49.1817001,36.9496001 C49.1817001,36.5276001 49.0565001,36.1152001 48.8221001,35.7643001 C48.5877001,35.4135001 48.2545001,35.1400001 47.8647001,34.9786001 C47.4748001,34.8171001 47.0459001,34.7748001 46.6320001,34.8572001 Z M49.0856001,27.5622001 C48.6718001,27.6446001 48.2916001,27.8477001 47.9933001,28.1461001 C47.6949001,28.4445001 47.4917001,28.8246001 47.4094001,29.2385001 C47.3271001,29.6523001 47.3693001,30.0813001 47.5308001,30.4711001 C47.6923001,30.8609001 47.9657001,31.1941001 48.3166001,31.4286001 C48.6674001,31.6630001 49.0799001,31.7881001 49.5018001,31.7881001 C50.0670001,31.7859001 50.6084001,31.5605001 51.0080001,31.1609001 C51.4076001,30.7612001 51.6331001,30.2198001 51.6353001,29.6547001 C51.6353001,29.2327001 51.5102001,28.8202001 51.2757001,28.4694001 C51.0413001,28.1186001 50.7081001,27.8451001 50.3183001,27.6836001 C49.9284001,27.5222001 49.4995001,27.4799001 49.0856001,27.5622001 Z M28.0728001,20.8457001 C27.0412001,20.4185001 25.9061001,20.3067001 24.8110001,20.5245001 C23.7159001,20.7423001 22.7100001,21.2800001 21.9205001,22.0695001 C21.1309001,22.8590001 20.5933001,23.8650001 20.3754001,24.9600001 C20.1576001,26.0551001 20.2694001,27.1902001 20.6967001,28.2218001 C21.1240001,29.2534001 21.8476001,30.1351001 22.7760001,30.7554001 C23.7043001,31.3757001 24.7958001,31.7068001 25.9124001,31.7068001 C27.4096001,31.7068001 28.8455001,31.1120001 29.9043001,30.0533001 C30.9630001,28.9946001 31.5578001,27.5587001 31.5578001,26.0614001 C31.5578001,24.9449001 31.2267001,23.8534001 30.6063001,22.9250001 C29.9860001,21.9966001 29.1043001,21.2730001 28.0728001,20.8457001 Z M43.9670001,27.4378001 C43.5772001,27.2763001 43.1482001,27.2341001 42.7344001,27.3164001 C42.3205001,27.3987001 41.9404001,27.6019001 41.6420001,27.9003001 C41.3437001,28.1986001 41.1405001,28.5788001 41.0581001,28.9926001 C40.9758001,29.4065001 41.0181001,29.8354001 41.1796001,30.2253001 C41.3410001,30.6151001 41.6145001,30.9483001 41.9653001,31.1827001 C42.3162001,31.4171001 42.7286001,31.5423001 43.1506001,31.5423001 C43.7164001,31.5423001 44.2591001,31.3175001 44.6592001,30.9174001 C45.0592001,30.5173001 45.2840001,29.9747001 45.2840001,29.4088001 C45.2840001,28.9869001 45.1589001,28.5744001 44.9245001,28.2236001 C44.6901001,27.8727001 44.3568001,27.5993001 43.9670001,27.4378001 Z M43.9670001,20.7503001 C43.5772001,20.5888001 43.1482001,20.5466001 42.7344001,20.6289001 C42.3205001,20.7112001 41.9404001,20.9144001 41.6420001,21.2128001 C41.3437001,21.5111001 41.1405001,21.8913001 41.0581001,22.3051001 C40.9758001,22.7190001 41.0181001,23.1479001 41.1796001,23.5378001 C41.3410001,23.9276001 41.6145001,24.2608001 41.9653001,24.4952001 C42.3162001,24.7296001 42.7286001,24.8548001 43.1506001,24.8548001 C43.7164001,24.8548001 44.2591001,24.6300001 44.6592001,24.2299001 C45.0592001,23.8298001 45.2840001,23.2871001 45.2840001,22.7213001 C45.2840001,22.2994001 45.1589001,21.8869001 44.9245001,21.5360001 C44.6901001,21.1852001 44.3568001,20.9118001 43.9670001,20.7503001 Z M49.0856001,20.3825001 C48.6718001,20.4649001 48.2916001,20.6681001 47.9933001,20.9664001 C47.6949001,21.2648001 47.4917001,21.6449001 47.4094001,22.0588001 C47.3271001,22.4726001 47.3693001,22.9016001 47.5308001,23.2914001 C47.6923001,23.6813001 47.9657001,24.0144001 48.3166001,24.2489001 C48.6674001,24.4833001 49.0799001,24.6084001 49.5018001,24.6084001 C50.0670001,24.6063001 50.6084001,24.3808001 51.0080001,23.9812001 C51.4076001,23.5815001 51.6331001,23.0401001 51.6353001,22.4750001 C51.6353001,22.0530001 51.5102001,21.6406001 51.2757001,21.2897001 C51.0413001,20.9389001 50.7081001,20.6654001 50.3183001,20.5040001 C49.9284001,20.3425001 49.4995001,20.3002001 49.0856001,20.3825001 Z M46.7554001,13.2026001 C46.3416001,13.2849001 45.9614001,13.4881001 45.6630001,13.7865001 C45.3647001,14.0849001 45.1615001,14.4650001 45.0792001,14.8788001 C44.9969001,15.2927001 45.0391001,15.7217001 45.2006001,16.1115001 C45.3621001,16.5013001 45.6355001,16.8345001 45.9863001,17.0689001 C46.3372001,17.3034001 46.7497001,17.4285001 47.1716001,17.4285001 C47.7374001,17.4285001 48.2801001,17.2037001 48.6802001,16.8036001 C49.0803001,16.4035001 49.3050001,15.8609001 49.3050001,15.2951001 C49.3050001,14.8731001 49.1799001,14.4606001 48.9455001,14.1098001 C48.7111001,13.7589001 48.3779001,13.4855001 47.9880001,13.3240001 C47.5982001,13.1625001 47.1692001,13.1203001 46.7554001,13.2026001 Z"],[14,"fill-rule","nonzero"],[12],[13],[2,"\\n      "],[10,"path"],[14,"d","M83.5385001,9.02612084 C75.3002001,9.02612084 71.7718001,12.5545001 71.7718001,18.6102001 L71.7718001,33.5278001 L71.7744126,33.809806 C71.8842215,39.6928981 75.4612111,43.1118103 83.5385001,43.1118103 C86.5802001,43.1131001 89.6109001,42.7466001 92.5646001,42.0205001 L91.8671001,36.6049001 L90.9760579,36.7631811 C88.5964705,37.1629803 86.1899224,37.3844223 83.7765001,37.4254001 C79.4194001,37.4254001 78.0326001,35.9320001 78.0326001,32.4118001 L78.0326001,19.7261001 L78.0346281,19.4988781 C78.0956946,16.133828 79.5462067,14.7125001 83.7765001,14.7125001 C86.4916001,14.7587001 89.1980001,15.0332001 91.8671001,15.5331001 L92.5646001,10.1175001 L91.8246092,9.94345672 C89.1057071,9.33281156 86.3267251,9.02500229 83.5385001,9.02612084 Z M172.149,18.4131001 L166.094,18.4131001 L166.09588,36.2248122 C166.154955,40.3975255 167.61375,43.1117001 171.55,43.1117001 C174.919,42.9517001 178.218,42.0880001 181.233,40.5762001 L181.832,42.6112001 L186.443,42.6112001 L186.443,18.4131001 L180.388,18.4131001 L180.388,35.1934001 C178.188,36.3339001 175.481,37.2283001 174.086,37.2283001 C172.691,37.2283001 172.149,36.5801001 172.149,35.2918001 L172.149,18.4131001 Z M105.939,17.9127001 C98.2719471,17.9127001 95.7845671,21.8519543 95.4516942,26.3358062 L95.4257941,26.7784774 C95.4225999,26.8525088 95.4199581,26.9266566 95.4178553,27.0009059 L95.4116001,27.4475001 L95.4116001,33.5853001 L95.4178331,34.0318054 C95.5519456,38.7818866 97.886685,43.0872001 105.931,43.0872001 C113.716697,43.0872001 116.15821,39.0467642 116.432186,34.4757046 L116.45204,34.0318054 C116.456473,33.8833653 116.458758,33.734491 116.459,33.5853001 L116.459,27.4475001 L116.457455,27.2221358 C116.453317,26.9220505 116.440796,26.6236441 116.419035,26.3278463 L116.379357,25.8862225 C115.91894,21.5651129 113.355121,17.9127001 105.939,17.9127001 Z M154.345,17.8876515 C147.453,17.8876515 145.319,20.0214001 145.319,24.8873001 L145.319694,25.1343997 L145.325703,25.6107983 L145.338905,26.064173 C145.341773,26.1378641 145.344992,26.2106314 145.348588,26.2824927 L145.374889,26.7029295 C145.380095,26.7712375 145.385729,26.838675 145.391816,26.9052596 L145.433992,27.2946761 C145.714183,29.5082333 146.613236,30.7206123 149.232713,31.693068 L149.698825,31.8575665 C150.021076,31.9658547 150.36662,32.0715774 150.737101,32.1758709 L151.311731,32.3313812 C151.509646,32.3829554 151.714,32.4343143 151.925,32.4856001 L152.205551,32.5543061 L152.728976,32.6899356 L153.204098,32.8237311 L153.633238,32.9563441 C155.53221,33.5734587 156.004908,34.1732248 156.112605,35.0535762 L156.130482,35.2466262 L156.139507,35.448917 L156.142,35.6611001 L156.137247,35.9859786 L156.121298,36.2838969 C156.024263,37.5177444 155.540462,38.0172149 153.741624,38.1073495 L153.302742,38.1210314 L153.065,38.1227001 C150.631,38.0987001 148.21,37.7482001 145.869,37.0807001 L145.049,41.6922001 L145.672496,41.887484 C148.174444,42.639635 150.769923,43.0436231 153.385,43.0871001 C159.627887,43.0871001 161.583469,40.9824692 162.030289,37.4548504 L162.074576,37.049455 C162.087289,36.9123213 162.098004,36.7731979 162.106868,36.6321214 L162.128062,36.2030694 L162.139051,35.7625187 L162.141,35.5380001 C162.141,35.4566181 162.140828,35.3763299 162.14046,35.2971136 L162.131203,34.6125174 L162.117224,34.1865271 L162.095649,33.7836378 L162.065324,33.4027996 L162.025093,33.0429627 L161.973799,32.7030773 C161.659145,30.8866498 160.790109,29.9278873 158.501441,29.0408119 L158.069484,28.8801405 L157.605084,28.7199991 C157.524916,28.6932947 157.443348,28.6665687 157.360357,28.6397991 L156.845127,28.4784845 L156.294565,28.3150754 L155.707516,28.148522 L155.082823,27.9777746 L154.035614,27.7021396 L153.423677,27.5325226 L153.071612,27.4262327 C153.016479,27.4088193 152.963082,27.3915263 152.911366,27.3743086 L152.620815,27.2715428 C151.671458,26.912485 151.415595,26.5466416 151.348761,25.7543883 L151.334373,25.5160648 L151.327658,25.2523603 L151.327351,24.8244501 C151.355827,23.4390475 151.851313,22.8769001 154.403,22.8769001 C156.636,22.9360001 158.861,23.1692001 161.057,23.5744001 L161.591,18.7085001 L160.876597,18.5511522 C158.72872,18.1040608 156.5401,17.8816774 154.345,17.8876515 Z M197.71,7.71350005 L191.654,8.53405005 L191.654,42.6116001 L197.71,42.6116001 L197.71,7.71350005 Z M135.455,17.9211001 C132.086,18.0823001 128.788,18.9459001 125.772,20.4566001 L125.189,18.4135001 L120.57,18.4135001 L120.57,42.6115001 L126.625,42.6115001 L126.625,25.8066001 C128.833,24.6661001 131.549,23.7717001 132.936,23.7717001 C134.322,23.7717001 134.872,24.4199001 134.872,25.7082001 L134.872,42.6115001 L140.919,42.6115001 L140.919,25.0681001 C140.919,20.7520001 139.475,17.9211001 135.455,17.9211001 Z M105.931,23.0740001 C109.156,23.0740001 110.395,24.5592001 110.395,27.2506001 L110.395,33.7494001 L110.392134,33.9740961 C110.325067,36.5604698 109.074195,37.9178001 105.931,37.9178001 C102.698,37.9178001 101.459,36.4818001 101.459,33.7494001 L101.459,27.2506001 L101.461884,27.0258853 C101.529372,24.4390811 102.787806,23.0740001 105.931,23.0740001 Z"],[14,"fill-rule","nonzero"],[12],[13],[2,"\\n      "],[1,[32,3]],[2,"\\n      "],[18,4,null],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n\\n"]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/brand-loader/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/certificate/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l
+function s(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const i=Ember.HTMLBars.template({id:"FAdEcz6O",block:'{"symbols":["@item","@name"],"statements":[[10,"div"],[14,0,"certificate"],[12],[2,"\\n  "],[8,"copy-button",[],[["@value","@name"],[[32,1],[32,2]]],null],[2,"\\n  "],[11,"button"],[16,0,[30,[36,1],["visibility",[30,[36,0],[[32,0,["show"]]," hide"," show"],null]],null]],[24,4,"button"],[4,[38,2],["click",[32,0,["setVisibility"]]],null],[12],[2,"\\n  "],[13],[2,"\\n"],[6,[37,0],[[32,0,["show"]]],null,[["default","else"],[{"statements":[[2,"  "],[10,"code"],[12],[1,[32,1]],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"  "],[10,"hr"],[12],[13],[2,"\\n"]],"parameters":[]}]]],[13]],"hasEval":false,"upvars":["if","concat","on"]}',meta:{moduleName:"consul-ui/components/certificate/index.hbs"}})
+let o=(n=Ember._tracked,r=Ember._action,a=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="show",a=this,(r=l)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}setVisibility(){this.show=!this.show}},l=s(a.prototype,"show",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),s(a.prototype,"setVisibility",[r],Object.getOwnPropertyDescriptor(a.prototype,"setVisibility"),a.prototype),a)
+e.default=o,Ember._setComponentTemplate(i,o)})),define("consul-ui/components/child-selector/index",["exports","ember-concurrency","block-slots"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r=Ember.HTMLBars.template({id:"ounU18qJ",block:'{"symbols":["collection","item","&default","&attrs"],"statements":[[11,"div"],[16,0,[31,["child-selector ",[34,0],"-child-selector"]]],[17,4],[12],[2,"\\n"],[18,3,null],[2,"\\n"],[6,[37,11],[[30,[36,19],[[35,18]],null]],null,[["default"],[{"statements":[[2,"  "],[8,"yield-slot",[],[["@name"],["create"]],[["default"],[{"statements":[[18,3,null]],"parameters":[]}]]],[2,"\\n  "],[10,"label"],[14,0,"type-text"],[12],[2,"\\n    "],[10,"span"],[12],[8,"yield-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[18,3,null]],"parameters":[]}]]],[13],[2,"\\n"],[6,[37,11],[[35,10]],null,[["default"],[{"statements":[[2,"      "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,6],["/${partition}/${nspace}/${dc}/${type}",[30,[36,5],null,[["partition","nspace","dc","type"],[[35,4],[35,3],[35,2],[30,[36,1],[[35,0]],null]]]]],null],[30,[36,9],[[32,0],[30,[36,8],[[35,7]],null]],[["value"],["data"]]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[8,"data-collection",[],[["@type","@sort","@filters","@items"],[[34,0],"Name:asc",[30,[36,5],null,[["searchproperties"],[[30,[36,12],["Name"],null]]]],[34,13]]],[["default"],[{"statements":[[2,"\\n      "],[8,"power-select",[],[["@searchEnabled","@search","@options","@loadingMessage","@searchMessage","@searchPlaceholder","@onOpen","@onClose","@onChange"],[true,[30,[36,9],[[32,0],[32,1,["search"]]],null],[30,[36,14],["Name:asc",[35,13]],null],"Loading...","No possible options",[34,15],[30,[36,9],[[32,0],[30,[36,8],[[35,10]],null],true],null],[30,[36,9],[[32,0],[30,[36,8],[[35,10]],null],false],null],[30,[36,9],[[32,0],"change","items[]",[35,16]],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,"yield-slot",[],[["@name","@params"],["option",[30,[36,17],[[32,2]],null]]],[["default"],[{"statements":[[18,3,null]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[2]}]]],[2,"\\n    "]],"parameters":[1]}]]],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,11],[[30,[36,20],[[35,16,["length"]],0],null]],null,[["default","else"],[{"statements":[[2,"  "],[8,"yield-slot",[],[["@name"],["set"]],[["default"],[{"statements":[[18,3,null]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"\\n"]],"parameters":[]}]]],[13]],"hasEval":false,"upvars":["type","pluralize","dc","nspace","partition","hash","uri","allOptions","mut","action","isOpen","if","array","options","sort-by","placeholder","items","block-params","disabled","not","gt"]}',meta:{moduleName:"consul-ui/components/child-selector/index.hbs"}})
+var a=Ember._setComponentTemplate(r,Ember.Component.extend(n.default,{onchange:function(){},tagName:"",error:function(){},type:"",dom:Ember.inject.service("dom"),formContainer:Ember.inject.service("form"),item:Ember.computed.alias("form.data"),selectedOptions:Ember.computed.alias("items"),init:function(){this._super(...arguments),this._listeners=this.dom.listeners(),this.form=this.formContainer.form(this.type),this.form.clear({Datacenter:this.dc,Namespace:this.nspace})},willDestroyElement:function(){this._super(...arguments),this._listeners.remove()},options:Ember.computed("selectedOptions.[]","allOptions.[]",(function(){let e=this.allOptions||[]
+const t=this.selectedOptions||[]
+return Ember.get(t,"length")>0&&(e=e.filter(e=>!t.findBy("ID",Ember.get(e,"ID")))),e})),save:(0,t.task)((function*(e,t,n=function(){}){const r=this.repo
+try{e=yield r.persist(e),this.actions.change.apply(this,[{target:{name:"items[]",value:t}},t,e]),n()}catch(a){this.error({error:a})}})),actions:{reset:function(){this.form.clear({Datacenter:this.dc,Namespace:this.nspace,Partition:this.partition})},remove:function(e,t){const n=this.repo.getSlugKey(),r=Ember.get(e,n),a=t.findIndex((function(e){return Ember.get(e,n)===r}))
+if(-1!==a)return t.removeAt(a,1)
+this.onchange({target:this})},change:function(e,t,n){const r=this.dom.normalizeEvent(...arguments),a=t
+switch(r.target.name){case"items[]":Ember.set(n,"CreateTime",(new Date).getTime()),a.pushObject(n),this.onchange({target:this})}}}}))
+e.default=a})),define("consul-ui/components/code-editor/index",["exports"],(function(e){function t(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function n(e){for(var n=1;n<arguments.length;n++){var a=null!=arguments[n]?arguments[n]:{}
+n%2?t(Object(a),!0).forEach((function(t){r(e,t,a[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(a)):t(Object(a)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(a,t))}))}return e}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const a=Ember.HTMLBars.template({id:"RfhieGQZ",block:'{"symbols":["mode","&default","@namedBlocksInfo"],"statements":[[10,"div"],[14,0,"toolbar-container"],[12],[2,"\\n  "],[10,"div"],[14,0,"toolbar"],[12],[2,"\\n    "],[10,"label"],[14,0,"title"],[12],[2,"\\n"],[6,[37,9],[[30,[36,10],[[32,3],"label",false],null]],null,[["default"],[{"statements":[[2,"        "],[18,2,[[30,[36,1],["label"],null]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n    "],[10,"div"],[14,0,"tools"],[12],[2,"\\n"],[6,[37,9],[[30,[36,10],[[32,3],"tools",false],null]],null,[["default","else"],[{"statements":[[2,"        "],[18,2,[[30,[36,1],["tools"],null]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,9],[[30,[36,8],[[30,[36,6],[[35,7]],null],[30,[36,6],[[35,5]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,"power-select",[],[["@onChange","@selected","@searchEnabled","@options"],[[30,[36,2],[[32,0],"change"],null],[34,3],false,[34,4]]],[["default"],[{"statements":[[2,"\\n            "],[1,[32,1,["name"]]],[2,"\\n          "]],"parameters":[1]}]]],[2,"\\n          "],[10,"div"],[14,0,"toolbar-separator"],[12],[13],[2,"\\n          "],[8,"copy-button",[],[["@value","@name"],[[34,0],"value"]],null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n  "],[13],[2,"\\n"],[13],[2,"\\n"],[8,"ivy-codemirror",[],[["@value","@name","@class","@options","@valueUpdated"],[[34,0],[34,11],[34,12],[34,13],[30,[36,2],[[32,0],[35,14]],null]]],null],[2,"\\n"],[10,"pre"],[12],[10,"code"],[12],[6,[37,9],[[30,[36,10],[[32,3],"content",false],null]],null,[["default","else"],[{"statements":[[18,2,[[30,[36,1],["content"],null]]]],"parameters":[]},{"statements":[[1,[34,0]]],"parameters":[]}]]],[13],[13],[2,"\\n"]],"hasEval":false,"upvars":["value","-named-block-invocation","action","mode","modes","syntax","not","readonly","and","if","-has-block","name","class","options","onkeyup"]}',meta:{moduleName:"consul-ui/components/code-editor/index.hbs"}}),l={tabSize:2,lineNumbers:!0,theme:"hashi",showCursorWhenSelecting:!0,gutters:["CodeMirror-lint-markers"],lint:!0}
+var s=Ember._setComponentTemplate(a,Ember.Component.extend({settings:Ember.inject.service("settings"),dom:Ember.inject.service("dom"),helper:Ember.inject.service("code-mirror/linter"),classNames:["code-editor"],readonly:!1,syntax:"",onkeyup:function(){},oninput:function(){},init:function(){this._super(...arguments),Ember.set(this,"modes",this.helper.modes())},didReceiveAttrs:function(){this._super(...arguments)
+const e=this.editor
+e&&e.setOption("readOnly",this.readonly)},setMode:function(e){let t=n(n({},l),{},{mode:e.mime,readOnly:this.readonly})
+"XML"===e.name&&(t.htmlMode=e.htmlMode,t.matchClosing=e.matchClosing,t.alignCDATA=e.alignCDATA),Ember.set(this,"options",t)
+const r=this.editor
+r.setOption("mode",e.mime),this.helper.lint(r,e.mode),Ember.set(this,"mode",e)},willDestroyElement:function(){this._super(...arguments),this.observer&&this.observer.disconnect()},didInsertElement:function(){this._super(...arguments)
+const e=this.dom.element("textarea ~ pre code",this.element)
+e.firstChild&&(this.observer=new MutationObserver(([e])=>{this.oninput(Ember.set(this,"value",e.target.wholeText))}),this.observer.observe(e,{attributes:!1,subtree:!0,childList:!1,characterData:!0}),Ember.set(this,"value",e.firstChild.wholeText)),Ember.set(this,"editor",this.helper.getEditor(this.element)),this.settings.findBySlug("code-editor").then(e=>{const t=this.modes,n=this.syntax
+n&&(e=t.find((function(e){return e.name.toLowerCase()==n.toLowerCase()}))),e=e||t[0],this.setMode(e)})},didAppear:function(){this.editor.refresh()},actions:{change:function(e){this.settings.persist({"code-editor":e}),this.setMode(e)}}}))
+e.default=s})),define("consul-ui/components/confirmation-alert/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"Ph3CAF0n",block:'{"symbols":["__arg0","__arg1","Actions","@onclick","&default","@name","&attrs"],"statements":[[18,5,null],[2,"\\n"],[8,"informed-action",[[24,0,"confirmation-alert warning"],[17,7]],[["@namedBlocksInfo"],[[30,[36,6],null,[["header","body","actions"],[0,0,1]]]]],[["default"],[{"statements":[[6,[37,5],[[30,[36,4],[[32,1],"header"],null]],null,[["default","else"],[{"statements":[[2,"\\n    "],[8,"yield-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[18,5,null]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,4],[[32,1],"body"],null]],null,[["default","else"],[{"statements":[[2,"\\n    "],[8,"yield-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[18,5,null]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,4],[[32,1],"actions"],null]],null,[["default"],[{"statements":[[6,[37,3],[[32,2]],null,[["default"],[{"statements":[[2,"\\n    "],[8,[32,3,["Action"]],[[24,0,"dangerous"]],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"yield-slot",[],[["@name","@params"],["confirm",[30,[36,2],[[30,[36,1],["action"],[["onclick","tabindex"],[[30,[36,0],[[32,0],[32,4]],null],"-1"]]]],null]]],[["default"],[{"statements":[[2,"\\n        "],[18,5,null],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,[32,3,["Action"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"action",[],[["@for"],[[32,6]]],[["default"],[{"statements":[[2,"\\n        Cancel\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]]],"hasEval":false,"upvars":["action","component","block-params","let","-is-named-block-invocation","if","hash"]}',meta:{moduleName:"consul-ui/components/confirmation-alert/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:""}))
+e.default=n})),define("consul-ui/components/confirmation-dialog/index",["exports","block-slots"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"hLDc+Wit",block:'{"symbols":["&default","&attrs"],"statements":[[11,"div"],[16,0,[30,[36,2],["with-confirmation",[30,[36,1],[[35,0]," confirming",""],null]],null]],[17,2],[12],[2,"\\n"],[18,1,null],[2,"\\n"],[8,"yield-slot",[],[["@name","@params"],["action",[30,[36,4],[[30,[36,3],[[32,0],"confirm"],null],[30,[36,3],[[32,0],"cancel"],null]],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[30,[36,7],[[35,6],[30,[36,5],[[35,0]],null]],null]],null,[["default"],[{"statements":[[2,"    "],[18,1,null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"\\n"],[8,"yield-slot",[],[["@name","@params"],["dialog",[30,[36,4],[[30,[36,3],[[32,0],"execute"],null],[30,[36,3],[[32,0],"cancel"],null],[35,9],[35,8]],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[35,0]],null,[["default"],[{"statements":[[2,"    "],[18,1,null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"\\n"],[13]],"hasEval":false,"upvars":["confirming","if","concat","action","block-params","not","permanent","or","actionName","message"]}',meta:{moduleName:"consul-ui/components/confirmation-dialog/index.hbs"}})
+var r=Ember._setComponentTemplate(n,Ember.Component.extend(t.default,{tagName:"",message:"Are you sure?",confirming:!1,permanent:!1,actions:{cancel:function(){Ember.set(this,"confirming",!1)},execute:function(){Ember.set(this,"confirming",!1),this.sendAction("actionName",...this.arguments)},confirm:function(){const[e,...t]=arguments
+Ember.set(this,"actionName",e),Ember.set(this,"arguments",t),Ember.set(this,"confirming",!0)}}}))
+e.default=r})),define("consul-ui/components/consul/acl/disabled/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"GJrj4o1x",block:'{"symbols":[],"statements":[[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n    "],[10,"h1"],[12],[2,"\\n      Tokens\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n    "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"h2"],[12],[2,"Welcome to ACLs"],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n        "],[10,"p"],[12],[2,"\\n          ACLs are not enabled in this Consul cluster. We strongly encourage the use of ACLs in production environments for the best security practices.\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n        "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n          "],[10,"a"],[15,6,[31,[[30,[36,0],["CONSUL_DOCS_URL"],null],"/acl/index.html"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Read the documentation"],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"li"],[14,0,"learn-link"],[12],[2,"\\n          "],[10,"a"],[15,6,[31,[[30,[36,0],["CONSUL_DOCS_LEARN_URL"],null],"/consul/security-networking/production-acls"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Follow the guide"],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n\\n"]],"hasEval":false,"upvars":["env"]}',meta:{moduleName:"consul-ui/components/consul/acl/disabled/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/acl/selector/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"CGsTmKTv",block:'{"symbols":["@dc"],"statements":[[10,"li"],[14,0,"acls-separator"],[14,"role","separator"],[12],[2,"\\n  Access Controls\\n"],[6,[37,1],[[30,[36,3],[[30,[36,2],["use acls"],null]],null]],null,[["default"],[{"statements":[[2,"  "],[11,"span"],[4,[38,5],["ACLs are not currently enabled in this cluster"],null],[12],[13],[2,"\\n"]],"parameters":[]}]]],[13],[2,"\\n"],[10,"li"],[15,0,[30,[36,1],[[30,[36,0],["dc.acls.tokens",[32,1,["Name"]]],null],"is-active"],null]],[12],[2,"\\n    "],[10,"a"],[15,6,[30,[36,4],["dc.acls.tokens",[32,1,["Name"]]],null]],[12],[2,"\\n      Tokens\\n    "],[13],[2,"\\n"],[13],[2,"\\n"],[6,[37,1],[[30,[36,2],["read acls"],null]],null,[["default","else"],[{"statements":[[10,"li"],[15,0,[30,[36,1],[[30,[36,0],["dc.acls.policies",[32,1,["Name"]]],null],"is-active"],null]],[12],[2,"\\n    "],[10,"a"],[15,6,[30,[36,4],["dc.acls.policies",[32,1,["Name"]]],null]],[12],[2,"\\n      Policies\\n    "],[13],[2,"\\n"],[13],[2,"\\n"],[10,"li"],[15,0,[30,[36,1],[[30,[36,0],["dc.acls.roles",[32,1,["Name"]]],null],"is-active"],null]],[12],[2,"\\n    "],[10,"a"],[15,6,[30,[36,4],["dc.acls.roles",[32,1,["Name"]]],null]],[12],[2,"\\n      Roles\\n    "],[13],[2,"\\n"],[13],[2,"\\n"],[10,"li"],[15,0,[30,[36,1],[[30,[36,0],["dc.acls.auth-methods",[32,1,["Name"]]],null],"is-active"],null]],[12],[2,"\\n    "],[10,"a"],[15,6,[30,[36,4],["dc.acls.auth-methods",[32,1,["Name"]]],null]],[12],[2,"\\n      Auth Methods\\n    "],[13],[2,"\\n"],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,3],[[30,[36,2],["use acls"],null]],null]],null,[["default"],[{"statements":[[10,"li"],[15,0,[30,[36,1],[[30,[36,0],["dc.acls.policies",[32,1,["Name"]]],null],"is-active"],null]],[12],[2,"\\n    "],[10,"span"],[12],[2,"\\n      Policies\\n    "],[13],[2,"\\n"],[13],[2,"\\n"],[10,"li"],[15,0,[30,[36,1],[[30,[36,0],["dc.acls.roles",[32,1,["Name"]]],null],"is-active"],null]],[12],[2,"\\n    "],[10,"span"],[12],[2,"\\n      Roles\\n    "],[13],[2,"\\n"],[13],[2,"\\n"],[10,"li"],[15,0,[30,[36,1],[[30,[36,0],["dc.acls.auth-methods",[32,1,["Name"]]],null],"is-active"],null]],[12],[2,"\\n    "],[10,"span"],[12],[2,"\\n      Auth Methods\\n    "],[13],[2,"\\n"],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"\\n"]],"hasEval":false,"upvars":["is-href","if","can","not","href-to","tooltip"]}',meta:{moduleName:"consul-ui/components/consul/acl/selector/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/auth-method/binding-list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"9xphbQEM",block:'{"symbols":["@item"],"statements":[[10,"div"],[14,0,"consul-auth-method-binding-list"],[12],[2,"\\n  "],[10,"h2"],[12],[1,[32,1,["BindName"]]],[13],[2,"\\n  "],[10,"dl"],[12],[2,"\\n    "],[10,"dt"],[14,0,"type"],[12],[1,[30,[36,0],["models.binding-rule.BindType"],null]],[13],[2,"\\n    "],[10,"dd"],[12],[2,"\\n      "],[1,[32,1,["BindType"]]],[2,"\\n      "],[10,"span"],[12],[2,"\\n"],[6,[37,2],[[30,[36,1],[[32,1,["BindType"]],"service"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[1,[30,[36,0],["components.consul.auth-method.binding-list.bind-type.service"],null]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,2],[[30,[36,1],[[32,1,["BindType"]],"node"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[1,[30,[36,0],["components.consul.auth-method.binding-list.bind-type.node"],null]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,2],[[30,[36,1],[[32,1,["BindType"]],"role"],null]],null,[["default"],[{"statements":[[2,"        "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n           "],[1,[30,[36,0],["components.consul.auth-method.binding-list.bind-type.role"],null]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n    "],[13],[2,"\\n    "],[10,"dt"],[12],[1,[30,[36,0],["models.binding-rule.Selector"],null]],[13],[2,"\\n    "],[10,"dd"],[12],[10,"code"],[12],[1,[32,1,["Selector"]]],[13],[13],[2,"\\n    "],[10,"dt"],[12],[1,[30,[36,0],["models.binding-rule.Description"],null]],[13],[2,"\\n    "],[10,"dd"],[12],[1,[32,1,["Description"]]],[13],[2,"\\n  "],[13],[2,"\\n"],[13]],"hasEval":false,"upvars":["t","eq","if"]}',meta:{moduleName:"consul-ui/components/consul/auth-method/binding-list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/auth-method/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"Xxbv7lp+",block:'{"symbols":["item","@items"],"statements":[[8,"list-collection",[[24,0,"consul-auth-method-list"]],[["@items"],[[32,2]]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,2],[[30,[36,1],[[32,1,["DisplayName"]],""],null]],null,[["default","else"],[{"statements":[[2,"    "],[10,"a"],[15,6,[30,[36,0],["dc.acls.auth-methods.show",[32,1,["Name"]]],null]],[12],[2,"\\n      "],[1,[32,1,["DisplayName"]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[10,"a"],[15,6,[30,[36,0],["dc.acls.auth-methods.show",[32,1,["Name"]]],null]],[12],[2,"\\n      "],[1,[32,1,["Name"]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n    "],[8,"consul/auth-method/type",[],[["@item"],[[32,1]]],null],[2,"\\n"],[6,[37,2],[[30,[36,1],[[32,1,["DisplayName"]],""],null]],null,[["default"],[{"statements":[[2,"    "],[10,"span"],[12],[1,[32,1,["Name"]]],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[30,[36,3],[[32,1,["TokenLocality"]],"global"],null]],null,[["default"],[{"statements":[[2,"    "],[10,"span"],[14,0,"locality"],[12],[2,"creates global tokens"],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,1,["MaxTokenTTL"]]],null,[["default"],[{"statements":[[2,"    "],[10,"dl"],[14,0,"ttl"],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n          Maximum Time to Live: the maximum life of any token created by this auth method\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[1,[32,1,["MaxTokenTTL"]]],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["href-to","not-eq","if","eq"]}',meta:{moduleName:"consul-ui/components/consul/auth-method/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/auth-method/nspace-list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"Ej9L7VaQ",block:'{"symbols":["item","@items"],"statements":[[10,"div"],[14,0,"consul-auth-method-nspace-list"],[12],[2,"\\n  "],[10,"table"],[12],[2,"\\n    "],[10,"thead"],[12],[2,"\\n      "],[10,"tr"],[12],[2,"\\n        "],[10,"td"],[12],[1,[30,[36,0],["models.auth-method.Selector"],null]],[13],[2,"\\n        "],[10,"td"],[12],[1,[30,[36,0],["models.auth-method.BindNamespace"],null]],[13],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n    "],[10,"tbody"],[12],[2,"\\n"],[6,[37,2],[[30,[36,1],[[30,[36,1],[[32,2]],null]],null]],null,[["default"],[{"statements":[[2,"      "],[10,"tr"],[12],[2,"\\n        "],[10,"td"],[12],[1,[32,1,["Selector"]]],[13],[2,"\\n        "],[10,"td"],[12],[1,[32,1,["BindNamespace"]]],[13],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[1]}]]],[2,"    "],[13],[2,"\\n  "],[13],[2,"\\n"],[13],[2,"\\n\\n"]],"hasEval":false,"upvars":["t","-track-array","each"]}',meta:{moduleName:"consul-ui/components/consul/auth-method/nspace-list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/auth-method/search-bar/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"KCBFWnGq",block:'{"symbols":["__arg0","__arg1","search","components","Optgroup","Option","selectable","search","components","Optgroup","Option","option","components","Optgroup","Option","search","components","Optgroup","Option","prop","search","key","value","@sort","@filter","@onsearch","@search","&attrs"],"statements":[[8,"search-bar",[[24,0,"consul-auth-method-search-bar"],[17,28]],[["@filter","@namedBlocksInfo"],[[32,25],[30,[36,15],null,[["status","search","filter","sort"],[1,1,1,1]]]]],[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"status"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,0],[[30,[36,10],["components.consul.auth-method.search-bar.",[32,21,["status","key"]],".name"],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,21,["status","key"]]],null],[30,[36,10],["common.consul.",[32,21,["status","key"]]],null]],null]]]],[30,[36,0],[[30,[36,10],["components.consul.auth-method.search-bar.",[32,21,["status","key"]],".options.",[32,21,["status","value"]]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,21,["status","value"]]],null],[30,[36,10],["common.consul.",[32,21,["status","value"]]],null],[30,[36,10],["common.brand.",[32,21,["status","value"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,21,["RemoveFilter"]],[[16,"aria-label",[30,[36,0],["common.ui.remove"],[["item"],[[30,[36,10],[[32,22]," ",[32,23]],null]]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[1,[32,22]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,23]],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[22,23]}]]],[2,"\\n    "]],"parameters":[21]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"search"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,16,["Search"]],[],[["@onsearch","@value","@placeholder"],[[30,[36,3],[[32,0],[32,26]],null],[32,27],[30,[36,0],["common.search.search"],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,16,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,25,["searchproperty","change"]]],null],true,true]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[2,"\\n              "],[1,[30,[36,0],["common.search.searchproperty"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,17,["Optgroup"]],[32,17,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[32,25,["searchproperty","default"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,19],[],[["@value","@selected"],[[32,20],[30,[36,9],[[32,20],[32,25,["searchproperty","value"]]],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[30,[36,14],[[32,20]],null]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[20]}]]]],"parameters":[18,19]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[17]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[16]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"filter"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,8,["Select"]],[[24,0,"type-kind"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,25,["kind","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["components.consul.auth-method.search-bar.kind.name"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,13,["Optgroup"]],[32,13,["Option"]]],null,[["default"],[{"statements":[[2,"          "],[8,[32,15],[[24,0,"kubernetes"]],[["@value","@selected"],["kubernetes",[30,[36,9],["kubernetes",[32,25,["kind","value"]]],null]]],[["default"],[{"statements":[[2,"Kubernetes"]],"parameters":[]}]]],[2,"\\n          "],[8,[32,15],[[24,0,"jwt"]],[["@value","@selected"],["jwt",[30,[36,9],["jwt",[32,25,["kind","value"]]],null]]],[["default"],[{"statements":[[2,"JWT"]],"parameters":[]}]]],[2,"\\n"],[6,[37,8],[[30,[36,13],["CONSUL_SSO_ENABLED"],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,15],[[24,0,"oidc"]],[["@value","@selected"],["oidc",[30,[36,9],["oidc",[32,25,["kind","value"]]],null]]],[["default"],[{"statements":[[2,"OIDC"]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[14,15]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[13]}]]],[2,"\\n      "],[8,[32,8,["Select"]],[[24,0,"type-locality"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,25,["source","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["components.consul.auth-method.search-bar.locality.name"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,9,["Optgroup"]],[32,9,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[30,[36,4],["local","global"],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,11],[[16,0,[31,[[32,12]]]]],[["@value","@selected"],[[32,12],[30,[36,9],[[32,12],[32,25,["types"]]],null]]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],[[30,[36,10],["components.consul.auth-method.search-bar.locality.options.",[32,12]],null]],null]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[12]}]]]],"parameters":[10,11]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[9]}]]],[2,"\\n    "]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"sort"],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,24,["change"]]],null],false,true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,4],[[30,[36,4],["MethodName:asc",[30,[36,0],["common.sort.alpha.asc"],null]],null],[30,[36,4],["MethodName:desc",[30,[36,0],["common.sort.alpha.desc"],null]],null],[30,[36,4],["TokenTTL:desc",[30,[36,0],["common.sort.duration.asc"],null]],null],[30,[36,4],["TokenTTL:asc",[30,[36,0],["common.sort.duration.desc"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[1,[30,[36,2],[[32,7],[32,24,["value"]]],null]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,4,["Optgroup"]],[32,4,["Option"]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.ui.name"],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["MethodName:asc",[30,[36,1],["MethodName:asc",[32,24,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.asc"],null]]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["MethodName:desc",[30,[36,1],["MethodName:desc",[32,24,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.desc"],null]]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.ui.maxttl"],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["TokenTTL:desc",[30,[36,1],["TokenTTL:desc",[32,24,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.duration.asc"],null]]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["TokenTTL:asc",[30,[36,1],["TokenTTL:asc",[32,24,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.duration.desc"],null]]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["t","eq","get","action","array","from-entries","let","-is-named-block-invocation","if","contains","concat","-track-array","each","env","lowercase","hash"]}',meta:{moduleName:"consul-ui/components/consul/auth-method/search-bar/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/auth-method/type/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"ikz01KlN",block:'{"symbols":["@item"],"statements":[[10,"span"],[15,0,[31,["consul-auth-method-type ",[32,1,["Type"]]]]],[12],[2,"\\n  "],[1,[30,[36,1],[[30,[36,0],["common.brand.",[32,1,["Type"]]],null]],null]],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["concat","t"]}',meta:{moduleName:"consul-ui/components/consul/auth-method/type/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/auth-method/view/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"Fb1QS0ut",block:'{"symbols":["entry","entry","scope","bond","uri","value","bond","config","value","item","jtem","value","value","@item"],"statements":[[2,"  "],[10,"div"],[14,0,"consul-auth-method-view"],[12],[2,"\\n"],[6,[37,2],[[30,[36,1],[[32,14,["Type"]],"kubernetes"],null]],null,[["default","else"],[{"statements":[[2,"    "],[10,"dl"],[12],[2,"\\n      "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Type"],null]],[13],[2,"\\n      "],[10,"dd"],[12],[8,"consul/auth-method/type",[],[["@item"],[[32,14]]],null],[13],[2,"\\n\\n"],[6,[37,6],[[30,[36,5],[[30,[36,5],[[30,[36,10],["MaxTokenTTL","TokenLocality","DisplayName","Description"],null]],null]],null]],null,[["default"],[{"statements":[[6,[37,2],[[30,[36,3],[[32,14],[32,13]],null]],null,[["default"],[{"statements":[[2,"      "],[10,"dt"],[12],[1,[30,[36,7],[[30,[36,9],["models.auth-method.",[32,13]],null]],null]],[13],[2,"\\n      "],[10,"dd"],[12],[1,[30,[36,3],[[32,14],[32,13]],null]],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[13]}]]],[6,[37,2],[[32,14,["Config","Host"]]],null,[["default"],[{"statements":[[2,"      "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.Host"],null]],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[8,"copy-button",[],[["@value","@name"],[[32,14,["Config","Host"]],[30,[36,7],["models.auth-method.Config.Host"],null]]],null],[2,"\\n        "],[10,"span"],[12],[1,[32,14,["Config","Host"]]],[13],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,14,["Config","CACert"]]],null,[["default"],[{"statements":[[2,"      "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.CACert"],null]],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[8,"certificate",[],[["@item","@name"],[[32,14,["Config","CACert"]],[30,[36,7],["models.auth-method.Config.CACert"],null]]],null],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,14,["Config","ServiceAccountJWT"]]],null,[["default"],[{"statements":[[2,"      "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.ServiceAccountJWT"],null]],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[8,"copy-button",[],[["@value","@name"],[[32,14,["Config","ServiceAccountJWT"]],[30,[36,7],["models.auth-method.Config.ServiceAccountJWT"],null]]],null],[2,"\\n        "],[10,"span"],[12],[2,"\\n          "],[1,[32,14,["Config","ServiceAccountJWT"]]],[2,"\\n        "],[13],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[10,"section"],[14,0,"meta"],[12],[2,"\\n      "],[10,"dl"],[12],[2,"\\n        "],[10,"dt"],[12],[2,"Type"],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[8,"consul/auth-method/type",[],[["@item"],[[32,14]]],null],[2,"\\n        "],[13],[2,"\\n\\n"],[6,[37,6],[[30,[36,5],[[30,[36,5],[[30,[36,10],["MaxTokenTTL","TokenLocality","DisplayName","Description"],null]],null]],null]],null,[["default"],[{"statements":[[6,[37,2],[[30,[36,3],[[32,14],[32,12]],null]],null,[["default"],[{"statements":[[2,"\\n        "],[10,"dt"],[12],[1,[30,[36,7],[[30,[36,9],["models.auth-method.",[32,12]],null]],null]],[13],[2,"\\n        "],[10,"dd"],[12],[1,[30,[36,3],[[32,14],[32,12]],null]],[13],[2,"\\n\\n"]],"parameters":[]}]]]],"parameters":[12]}]]],[2,"\\n"],[6,[37,2],[[30,[36,1],[[32,14,["Type"]],"aws-iam"],null]],null,[["default","else"],[{"statements":[[2,"\\n"],[6,[37,12],[[32,14,["Config"]]],null,[["default"],[{"statements":[[6,[37,6],[[30,[36,5],[[30,[36,5],[[30,[36,10],["BoundIAMPrincipalARNs","EnableIAMEntityDetails","IAMEntityTags","IAMEndpoint","MaxRetries","STSEndpoint","STSRegion","AllowedSTSHeaderValues","ServerIDHeaderValue"],null]],null]],null]],null,[["default"],[{"statements":[[6,[37,2],[[30,[36,3],[[32,8],[32,9]],null]],null,[["default"],[{"statements":[[2,"\\n        "],[10,"dt"],[12],[1,[30,[36,7],[[30,[36,9],["models.auth-method.",[32,9]],null]],null]],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n"],[6,[37,12],[[30,[36,3],[[32,8],[32,9]],null]],null,[["default"],[{"statements":[[6,[37,2],[[30,[36,11],[[32,10]],null]],null,[["default","else"],[{"statements":[[2,"          "],[10,"ul"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,5],[[32,10]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[10,"li"],[12],[2,"\\n                "],[10,"span"],[12],[1,[32,11]],[13],[2,"\\n              "],[13],[2,"\\n"]],"parameters":[11]}]]],[2,"          "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          "],[1,[32,10]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[10]}]]],[2,"        "],[13],[2,"\\n\\n"]],"parameters":[]}]]]],"parameters":[9]}]]],[2,"\\n"]],"parameters":[8]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,2],[[30,[36,1],[[32,14,["Type"]],"jwt"],null]],null,[["default","else"],[{"statements":[[6,[37,2],[[32,14,["Config","JWKSURL"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.JWKSURL"],null]],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[8,"copy-button",[],[["@value","@name"],[[32,14,["Config","JWKSURL"]],[30,[36,7],["models.auth-method.Config.JWKSURL"],null]]],null],[2,"\\n          "],[10,"span"],[12],[1,[32,14,["Config","JWKSURL"]]],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.JWKSCACert"],null]],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[8,"certificate",[],[["@item","@name"],[[32,14,["Config","JWKSCACert"]],[30,[36,7],["models.auth-method.Config.JWKSCACert"],null]]],null],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,14,["Config","JWTValidationPubKeys"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.JWTValidationPubKeys"],null]],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[8,"certificate",[],[["@item","@name"],[[32,14,["Config","JWTValidationPubKeys"]],[30,[36,7],["models.auth-method.Config.JWTValidationPubKeys"],null]]],null],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,14,["Config","OIDCDiscoveryURL"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.OIDCDiscoveryURL"],null]],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[8,"copy-button",[],[["@value","@name"],[[32,14,["Config","OIDCDiscoveryURL"]],[30,[36,7],["models.auth-method.Config.OIDCDiscoveryURL"],null]]],null],[2,"\\n          "],[10,"span"],[12],[1,[32,14,["Config","OIDCDiscoveryURL"]]],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,14,["Config","JWTSupportedAlgs"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.JWTSupportedAlgs"],null]],[13],[2,"\\n        "],[10,"dd"],[12],[1,[30,[36,8],[", ",[32,14,["Config","JWTSupportedAlgs"]]],null]],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,14,["Config","BoundAudiences"]]],null,[["default"],[{"statements":[[2,"          "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.BoundAudiences"],null]],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[10,"ul"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,5],[[32,14,["Config","BoundAudiences"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[10,"li"],[12],[2,"\\n                "],[10,"span"],[12],[1,[32,7]],[13],[2,"\\n              "],[13],[2,"\\n"]],"parameters":[7]}]]],[2,"            "],[13],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,6],[[30,[36,5],[[30,[36,5],[[30,[36,10],["BoundIssuer","ExpirationLeeway","NotBeforeLeeway","ClockSkewLeeway"],null]],null]],null]],null,[["default"],[{"statements":[[6,[37,2],[[30,[36,3],[[32,14,["Config"]],[32,6]],null]],null,[["default"],[{"statements":[[2,"          "],[10,"dt"],[12],[1,[30,[36,7],[[30,[36,9],["models.auth-method.Config.",[32,6]],null]],null]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[30,[36,3],[[32,14,["Config"]],[32,6]],null]],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[6]}]]]],"parameters":[]},{"statements":[[6,[37,2],[[30,[36,1],[[32,14,["Type"]],"oidc"],null]],null,[["default"],[{"statements":[[6,[37,2],[[32,14,["Config","OIDCDiscoveryURL"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.OIDCDiscoveryURL"],null]],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[8,"copy-button",[],[["@value","@name"],[[32,14,["Config","OIDCDiscoveryURL"]],[30,[36,7],["models.auth-method.Config.OIDCDiscoveryURL"],null]]],null],[2,"\\n          "],[10,"span"],[12],[1,[32,14,["Config","OIDCDiscoveryURL"]]],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,14,["Config","OIDCDiscoveryCACert"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.OIDCDiscoveryCACert"],null]],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[8,"certificate",[],[["@item","@name"],[[32,14,["Config","OIDCDiscoveryCACert"]],[30,[36,7],["models.auth-method.Config.OIDCDiscoveryCACert"],null]]],null],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,14,["Config","OIDCClientID"]]],null,[["default"],[{"statements":[[2,"          "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.OIDCClientID"],null]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,14,["Config","OIDCClientID"]]],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,14,["Config","OIDCClientSecret"]]],null,[["default"],[{"statements":[[2,"          "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.OIDCClientSecret"],null]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,14,["Config","OIDCClientSecret"]]],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,14,["Config","AllowedRedirectURIs"]]],null,[["default"],[{"statements":[[2,"          "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.AllowedRedirectURIs"],null]],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[10,"ul"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,5],[[32,14,["Config","AllowedRedirectURIs"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[10,"li"],[12],[2,"\\n                "],[8,"copy-button",[],[["@value","@name"],[[32,5],"Redirect URI"]],null],[2,"\\n                "],[10,"span"],[12],[1,[32,5]],[13],[2,"\\n              "],[13],[2,"\\n"]],"parameters":[5]}]]],[2,"            "],[13],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,14,["Config","BoundAudiences"]]],null,[["default"],[{"statements":[[2,"          "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.BoundAudiences"],null]],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[10,"ul"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,5],[[32,14,["Config","BoundAudiences"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[10,"li"],[12],[2,"\\n                "],[10,"span"],[12],[1,[32,4]],[13],[2,"\\n              "],[13],[2,"\\n"]],"parameters":[4]}]]],[2,"            "],[13],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,14,["Config","OIDCScopes"]]],null,[["default"],[{"statements":[[2,"          "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.OIDCScopes"],null]],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[10,"ul"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,5],[[32,14,["Config","OIDCScopes"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[10,"li"],[12],[2,"\\n                "],[10,"span"],[12],[1,[32,3]],[13],[2,"\\n              "],[13],[2,"\\n"]],"parameters":[3]}]]],[2,"            "],[13],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,14,["Config","JWTSupportedAlgs"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dt"],[12],[1,[30,[36,7],["models.auth-method.Config.JWTSupportedAlgs"],null]],[13],[2,"\\n        "],[10,"dd"],[12],[1,[30,[36,8],[", ",[32,14,["Config","JWTSupportedAlgs"]]],null]],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,14,["Config","VerboseOIDCLogging"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dt"],[14,0,"check"],[12],[1,[30,[36,7],["models.auth-method.Config.VerboseOIDCLogging"],null]],[13],[2,"\\n        "],[10,"dd"],[12],[10,"input"],[14,"disabled","disabled"],[15,"checked",[32,14,["Config","VerboseOIDCLogging"]]],[14,4,"checkbox"],[12],[13],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n    "],[13],[2,"\\n\\n"],[6,[37,2],[[30,[36,13],[[30,[36,1],[[32,14,["Type"]],"aws-iam"],null]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"hr"],[12],[13],[2,"\\n\\n    "],[10,"section"],[14,0,"claim-mappings"],[12],[2,"\\n      "],[10,"h2"],[12],[2,"Claim Mappings"],[13],[2,"\\n"],[6,[37,2],[[32,14,["Config","ClaimMappings"]]],null,[["default","else"],[{"statements":[[2,"      "],[10,"p"],[12],[2,"Use this if the claim you are capturing is singular. When mapped, the values can be any of a number, string, or boolean and will all be stringified when returned."],[13],[2,"\\n      "],[10,"table"],[12],[2,"\\n        "],[10,"thead"],[12],[2,"\\n          "],[10,"tr"],[12],[2,"\\n            "],[10,"td"],[12],[2,"Key"],[13],[2,"\\n            "],[10,"td"],[12],[2,"Value"],[13],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"tbody"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,5],[[30,[36,4],[[32,14,["Config","ClaimMappings"]]],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[10,"tr"],[12],[2,"\\n            "],[10,"td"],[12],[1,[30,[36,3],[[32,2],0],null]],[13],[2,"\\n            "],[10,"td"],[12],[1,[30,[36,3],[[32,2],1],null]],[13],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[2]}]]],[2,"        "],[13],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n          "],[10,"h2"],[12],[2,"No claim mappings"],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n          "],[10,"p"],[12],[2,"Use this if the claim you are capturing is singular. When mapped, the values can be any of a number, string, or boolean and will all be stringified when returned."],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n          "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n"],[6,[37,2],[[30,[36,1],[[32,14,["Type"]],"jwt"],null]],null,[["default","else"],[{"statements":[[2,"            "],[10,"a"],[15,6,[31,[[30,[36,0],["CONSUL_DOCS_URL"],null],"/security/acl/auth-methods/jwt#claimmappings"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Read the documentation"],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"            "],[10,"a"],[15,6,[31,[[30,[36,0],["CONSUL_DOCS_URL"],null],"/security/acl/auth-methods/oidc#claimmappings"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Read the documentation"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n\\n    "],[10,"hr"],[12],[13],[2,"\\n\\n    "],[10,"section"],[14,0,"list-claim-mappings"],[12],[2,"\\n      "],[10,"h2"],[12],[2,"List Claim Mappings"],[13],[2,"\\n"],[6,[37,2],[[32,14,["Config","ListClaimMappings"]]],null,[["default","else"],[{"statements":[[2,"      "],[10,"p"],[12],[2,"Use this if the claim you are capturing is list-like (such as groups). When mapped, the values can be any of a number, string, or boolean and will all be stringified when returned."],[13],[2,"\\n      "],[10,"table"],[12],[2,"\\n        "],[10,"thead"],[12],[2,"\\n          "],[10,"tr"],[12],[2,"\\n            "],[10,"td"],[12],[2,"Key"],[13],[2,"\\n            "],[10,"td"],[12],[2,"Value"],[13],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"tbody"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,5],[[30,[36,4],[[32,14,["Config","ListClaimMappings"]]],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[10,"tr"],[12],[2,"\\n            "],[10,"td"],[12],[1,[30,[36,3],[[32,1],0],null]],[13],[2,"\\n            "],[10,"td"],[12],[1,[30,[36,3],[[32,1],1],null]],[13],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[1]}]]],[2,"        "],[13],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n          "],[10,"h2"],[12],[2,"No list claim mappings"],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n          "],[10,"p"],[12],[2,"Use this if the claim you are capturing is list-like (such as groups). When mapped, the values can be any of a number, string, or boolean and will all be stringified when returned."],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n          "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n"],[6,[37,2],[[30,[36,1],[[32,14,["Type"]],"jwt"],null]],null,[["default","else"],[{"statements":[[2,"            "],[10,"a"],[15,6,[31,[[30,[36,0],["CONSUL_DOCS_URL"],null],"/security/acl/auth-methods/jwt#listclaimmappings"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Read the documentation"],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"            "],[10,"a"],[15,6,[31,[[30,[36,0],["CONSUL_DOCS_URL"],null],"/security/acl/auth-methods/oidc#listclaimmappings"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Read the documentation"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"  "],[13]],"hasEval":false,"upvars":["env","eq","if","get","entries","-track-array","each","t","join","concat","array","array-is-array","let","not"]}',meta:{moduleName:"consul-ui/components/consul/auth-method/view/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/bucket/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"WPJVSna7",block:'{"symbols":["@item","@service","@nspace","@partition"],"statements":[[6,[37,2],[[30,[36,1],[[32,4],[30,[36,4],["use partitions"],null]],null]],null,[["default","else"],[{"statements":[[6,[37,2],[[30,[36,3],[[32,1,["Partition"]],[32,4]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"dl"],[14,0,"consul-bucket-list"],[12],[2,"\\n      "],[11,"dt"],[24,0,"partition"],[4,[38,0],null,null],[12],[2,"\\n        Admin Partition\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[1,[32,1,["Partition"]]],[2,"\\n      "],[13],[2,"\\n      "],[11,"dt"],[24,0,"nspace"],[4,[38,0],null,null],[12],[2,"\\n        Namespace\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[1,[32,1,["Namespace"]]],[2,"\\n      "],[13],[2,"\\n\\n"],[6,[37,2],[[30,[36,1],[[32,2],[32,1,["Service"]]],null]],null,[["default"],[{"statements":[[2,"      "],[10,"dt"],[14,0,"service"],[12],[2,"\\n        Service\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[1,[32,1,["Service"]]],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,2],[[30,[36,1],[[32,3],[30,[36,4],["use nspace"],null]],null]],null,[["default"],[{"statements":[[6,[37,2],[[30,[36,3],[[32,1,["Namespace"]],[32,3]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"dl"],[14,0,"consul-bucket-list"],[12],[2,"\\n      "],[11,"dt"],[24,0,"nspace"],[4,[38,0],null,null],[12],[2,"\\n        Namespace\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[1,[32,1,["Namespace"]]],[2,"\\n      "],[13],[2,"\\n"],[6,[37,2],[[30,[36,1],[[32,2],[32,1,["Service"]]],null]],null,[["default"],[{"statements":[[2,"      "],[10,"dt"],[14,0,"service"],[12],[2,"\\n        Service\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[1,[32,1,["Service"]]],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"hasEval":false,"upvars":["tooltip","and","if","not-eq","can"]}',meta:{moduleName:"consul-ui/components/consul/bucket/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/datacenter/selector/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"5dl+NDsZ",block:'{"symbols":["disclosure","panel","menu","item","@dc","@nspace","@dcs"],"statements":[[10,"li"],[14,0,"dcs"],[12],[2,"\\n  "],[8,"disclosure-menu",[[24,"aria-label","Datacenter"]],[["@items"],[[30,[36,8],["Primary:desc","Local:desc","Name:asc",[32,7]],null]]],[["default"],[{"statements":[[2,"\\n    "],[8,[32,1,["Action"]],[[4,[38,7],["click",[32,1,["toggle"]]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[1,[32,5,["Name"]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,[32,1,["Menu"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,9],["/*/*/*/datacenters"],null],[30,[36,11],[[32,0],[30,[36,10],[[32,7]],null]],[["value"],["data"]]]]],null],[2,"\\n        "],[8,[32,2,["Menu"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n"],[6,[37,13],[[30,[36,12],[[30,[36,12],[[32,3,["items"]]],null]],null]],null,[["default"],[{"statements":[[2,"            "],[8,[32,3,["Item"]],[[16,"aria-current",[30,[36,1],[[30,[36,0],[[32,5,["Name"]],[32,4,["Name"]]],null],"true"],null]],[16,0,[30,[36,3],[[30,[36,2],["is-local",[32,4,["Local"]]],null],[30,[36,2],["is-primary",[32,4,["Primary"]]],null]],null]]],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,[32,3,["Action"]],[[4,[38,7],["click",[32,1,["close"]]],null]],[["@href"],[[30,[36,6],["."],[["params"],[[30,[36,5],null,[["dc","partition","nspace"],[[32,4,["Name"]],[29],[30,[36,1],[[30,[36,4],[[32,6,["length"]],0],null],[32,6],[29]],null]]]]]]]]],[["default"],[{"statements":[[2,"\\n                "],[1,[32,4,["Name"]]],[2,"\\n"],[6,[37,1],[[32,4,["Primary"]]],null,[["default"],[{"statements":[[2,"                "],[10,"span"],[12],[2,"Primary"],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,1],[[32,4,["Local"]]],null,[["default"],[{"statements":[[2,"                "],[10,"span"],[12],[2,"Local"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[4]}]]],[2,"        "]],"parameters":[3]}]]],[2,"\\n    "]],"parameters":[2]}]]],[2,"\\n  "]],"parameters":[1]}]]],[2,"\\n"],[13],[2,"\\n\\n"]],"hasEval":false,"upvars":["eq","if","array","class-map","gt","hash","href-to","on","sort-by","uri","mut","action","-track-array","each"]}',meta:{moduleName:"consul-ui/components/consul/datacenter/selector/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/discovery-chain/index",["exports","consul-ui/components/consul/discovery-chain/utils"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"tgH7XXQj",block:'{"symbols":["item","dest","item","item","dest","item","dest","splitter","src","item","index","destRect","dest","item","src","destRect","dest","item","item","item"],"statements":[[10,"style"],[12],[2,"\\n"],[6,[37,6],[[35,19,["nodes"]]],null,[["default"],[{"statements":[[2,"    "],[1,[35,19,["nodes"]]],[2," {\\n      opacity: 1 !important;\\n\\n      background-color: var(--tone-gray-000);\\n      border: var(--decor-border-100);\\n      border-radius: var(--decor-radius-200);\\n      border-color: rgb(var(--tone-gray-500));\\n      box-shadow: var(--decor-elevation-600);\\n    }\\n"]],"parameters":[]}]]],[6,[37,6],[[35,19,["edges"]]],null,[["default"],[{"statements":[[2,"    "],[1,[35,19,["edges"]]],[2," {\\n      opacity: 1;\\n    }\\n"]],"parameters":[]}]]],[13],[2,"\\n\\n"],[10,"div"],[14,0,"routes"],[12],[2,"\\n  "],[10,"header"],[12],[2,"\\n    "],[10,"h2"],[12],[2,"\\n      "],[1,[35,20,["ServiceName"]]],[2," Router\\n      "],[11,"span"],[4,[38,12],["Use routers to intercept traffic using Layer 7 criteria such as path prefixes or http headers."],null],[12],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n  "],[10,"div"],[14,"role","group"],[12],[2,"\\n"],[6,[37,8],[[30,[36,7],[[30,[36,7],[[35,21]],null]],null]],null,[["default"],[{"statements":[[2,"      "],[8,"consul/discovery-chain/route-card",[[4,[38,18],[[30,[36,17],[[30,[36,16],[[32,20],"rect"],null]],[["from"],[[32,0,["edges"]]]]]],null]],[["@item","@onclick"],[[32,20],[30,[36,15],[[32,0],"click"],null]]],null],[2,"\\n"]],"parameters":[20]}]]],[2,"  "],[13],[2,"\\n"],[13],[2,"\\n\\n"],[10,"div"],[14,0,"splitters"],[12],[2,"\\n  "],[10,"header"],[12],[2,"\\n    "],[10,"h2"],[12],[2,"\\n      Splitters\\n      "],[11,"span"],[4,[38,12],["Splitters are configured to split incoming requests across different services or subsets of a single service."],null],[12],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n  "],[10,"div"],[14,"role","group"],[12],[2,"\\n"],[6,[37,8],[[30,[36,7],[[30,[36,7],[[30,[36,23],["Name",[35,22]],null]],null]],null]],null,[["default"],[{"statements":[[2,"      "],[8,"consul/discovery-chain/splitter-card",[[4,[38,18],[[30,[36,17],[[30,[36,16],[[32,19],"rect"],null]],[["from"],[[32,0,["edges"]]]]]],null]],[["@item","@onclick"],[[32,19],[30,[36,15],[[32,0],"click"],null]]],null],[2,"\\n"]],"parameters":[19]}]]],[2,"  "],[13],[2,"\\n"],[13],[2,"\\n\\n"],[10,"div"],[14,0,"resolvers"],[12],[2,"\\n  "],[10,"header"],[12],[2,"\\n    "],[10,"h2"],[12],[2,"\\n      Resolvers\\n      "],[11,"span"],[4,[38,12],["Resolvers are used to define which instances of a service should satisfy discovery requests."],null],[12],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n  "],[10,"div"],[14,"role","group"],[12],[2,"\\n"],[6,[37,8],[[30,[36,7],[[30,[36,7],[[30,[36,23],["Name",[35,24]],null]],null]],null]],null,[["default"],[{"statements":[[2,"      "],[8,"consul/discovery-chain/resolver-card",[[4,[38,18],[[30,[36,17],[[30,[36,16],[[32,18],"rect"],null]],[["from"],[[32,0,["edges"]]]]]],null]],[["@item","@edges","@onclick"],[[32,18],[32,0,["edges"]],[30,[36,15],[[32,0],"click"],null]]],null],[2,"\\n"]],"parameters":[18]}]]],[2,"  "],[13],[2,"\\n"],[13],[2,"\\n\\n"],[1,[34,25]],[2,"\\n\\n"],[11,"svg"],[24,0,"edges"],[24,"width","100%"],[24,"height","100%"],[24,"preserveAspectRatio","none"],[4,[38,26],[[30,[36,16],[[32,0],"edges"],null]],null],[12],[2,"\\n"],[6,[37,8],[[30,[36,7],[[30,[36,7],[[35,21]],null]],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,14,["rect"]]],null,[["default"],[{"statements":[[6,[37,4],[[32,14,["rect"]],[32,14,["NextItem","rect"]]],null,[["default"],[{"statements":[[6,[37,4],[[30,[36,13],[[30,[36,2],null,[["x","y"],[[32,16,["x"]],[30,[36,1],[[32,16,["y"]],[30,[36,0],[[32,16,["height"]],2],null]],null]]]],[30,[36,9],[[32,14,["ID"]]],null]],null]],null,[["default"],[{"statements":[[2,"\\n    "],[10,"path"],[15,1,[30,[36,9],[[32,14,["ID"]],">",[32,14,["NextNode"]]],null]],[15,"d",[30,[36,10],[[30,[36,2],null,[["x","y"],[[32,17,["x"]],[30,[36,14],[[32,17,["y"]],0],null]]]]],[["src"],[[30,[36,2],null,[["x","y"],[[32,15,["right"]],[30,[36,1],[[32,15,["y"]],[30,[36,0],[[32,15,["height"]],2],null]],null]]]]]]]],[12],[13],[2,"\\n\\n"]],"parameters":[17]}]]]],"parameters":[15,16]}]]]],"parameters":[]}]]]],"parameters":[14]}]]],[2,"\\n"],[6,[37,8],[[30,[36,7],[[30,[36,7],[[35,22]],null]],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,8,["rect"]]],null,[["default"],[{"statements":[[6,[37,4],[[32,8,["rect"]]],null,[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[30,[36,7],[[32,8,["Splits"]]],null]],null]],null,[["default"],[{"statements":[[6,[37,4],[[32,10,["NextItem","rect"]]],null,[["default"],[{"statements":[[6,[37,4],[[30,[36,13],[[30,[36,2],null,[["x","y"],[[32,12,["x"]],[30,[36,1],[[32,12,["y"]],[30,[36,0],[[32,12,["height"]],2],null]],null]]]],[30,[36,9],[[32,8,["ID"]],"-",[32,11]],null]],null]],null,[["default"],[{"statements":[[2,"\\n      "],[11,"path"],[16,1,[30,[36,9],["splitter:",[32,8,["Name"]],">",[32,10,["NextNode"]]],null]],[24,0,"split"],[16,"d",[30,[36,10],[[30,[36,2],null,[["x","y"],[[32,13,["x"]],[32,13,["y"]]]]]],[["src"],[[30,[36,2],null,[["x","y"],[[32,9,["right"]],[30,[36,1],[[32,9,["y"]],[30,[36,0],[[32,9,["height"]],2],null]],null]]]]]]]],[4,[38,12],[[30,[36,9],[[30,[36,11],[[30,[36,3],[[32,10,["Weight"]],0],null]],[["decimals"],[2]]],"%"],null]],[["options"],[[30,[36,2],null,[["followCursor"],[true]]]]]],[12],[13],[2,"\\n\\n"]],"parameters":[13]}]]]],"parameters":[12]}]]]],"parameters":[10,11]}]]]],"parameters":[9]}]]]],"parameters":[]}]]]],"parameters":[8]}]]],[2,"\\n"],[13],[2,"\\n\\n"],[10,"svg"],[14,0,"resolver-inlets"],[14,"height","100%"],[12],[2,"\\n"],[6,[37,8],[[30,[36,7],[[30,[36,7],[[35,21]],null]],null]],null,[["default"],[{"statements":[[6,[37,6],[[30,[36,5],[[32,6,["NextNode"]],"resolver:"],null]],null,[["default"],[{"statements":[[6,[37,4],[[30,[36,3],[[32,6,["NextItem","rect"]],[30,[36,2],null,[["y","height"],[0,0]]]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"circle"],[14,"r","2.5"],[14,"cx","5"],[15,"cy",[30,[36,1],[[32,7,["y"]],[30,[36,0],[[32,7,["height"]],2],null]],null]],[12],[13],[2,"\\n"]],"parameters":[7]}]]]],"parameters":[]}]]]],"parameters":[6]}]]],[6,[37,8],[[30,[36,7],[[30,[36,7],[[35,22]],null]],null]],null,[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[30,[36,7],[[32,3,["Splits"]]],null]],null]],null,[["default"],[{"statements":[[6,[37,4],[[30,[36,3],[[32,4,["NextItem","rect"]],[30,[36,2],null,[["y","height"],[0,0]]]],null]],null,[["default"],[{"statements":[[2,"          "],[10,"circle"],[14,"r","2.5"],[14,"cx","5"],[15,"cy",[30,[36,1],[[32,5,["y"]],[30,[36,0],[[32,5,["height"]],2],null]],null]],[12],[13],[2,"\\n"]],"parameters":[5]}]]]],"parameters":[4]}]]]],"parameters":[3]}]]],[13],[2,"\\n\\n"],[10,"svg"],[14,0,"splitter-inlets"],[14,"height","100%"],[12],[2,"\\n"],[6,[37,8],[[30,[36,7],[[30,[36,7],[[35,21]],null]],null]],null,[["default"],[{"statements":[[6,[37,6],[[30,[36,5],[[32,1,["NextNode"]],"splitter:"],null]],null,[["default"],[{"statements":[[6,[37,4],[[30,[36,3],[[32,1,["NextItem","rect"]],[30,[36,2],null,[["y","height"],[0,0]]]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"circle"],[14,"r","2.5"],[14,"cx","5"],[15,"cy",[30,[36,1],[[32,2,["y"]],[30,[36,0],[[32,2,["height"]],2],null]],null]],[12],[13],[2,"\\n"]],"parameters":[2]}]]]],"parameters":[]}]]]],"parameters":[1]}]]],[13],[2,"\\n"]],"hasEval":false,"upvars":["div","add","hash","or","let","string-starts-with","if","-track-array","each","concat","svg-curve","round","tooltip","tween-to","sub","action","set","dom-position","on-resize","selected","chain","routes","splitters","sort-by","resolvers","nodes","did-insert"]}',meta:{moduleName:"consul-ui/components/consul/discovery-chain/index.hbs"}})
+var r=Ember._setComponentTemplate(n,Ember.Component.extend({dom:Ember.inject.service("dom"),ticker:Ember.inject.service("ticker"),dataStructs:Ember.inject.service("data-structs"),classNames:["discovery-chain"],classNameBindings:["active"],selectedId:"",init:function(){this._super(...arguments),this._listeners=this.dom.listeners()},didInsertElement:function(){this._listeners.add(this.dom.document(),{click:e=>{this.dom.closest('[class$="-card"]',e.target)||(Ember.set(this,"active",!1),Ember.set(this,"selectedId",""))}})},willDestroyElement:function(){this._super(...arguments),this._listeners.remove(),this.ticker.destroy(this)},splitters:Ember.computed("chain.Nodes",(function(){return(0,t.getSplitters)(Ember.get(this,"chain.Nodes"))})),routes:Ember.computed("chain.Nodes",(function(){const e=(0,t.getRoutes)(Ember.get(this,"chain.Nodes"),this.dom.guid)
+if(!e.find(e=>"/"===Ember.get(e,"Definition.Match.HTTP.PathPrefix"))&&!e.find(e=>void 0===e.Definition)){let n
+const r=`resolver:${this.chain.ServiceName}.${this.chain.Namespace}.${this.chain.Partition}.${this.chain.Datacenter}`,a=`splitter:${this.chain.ServiceName}.${this.chain.Namespace}.${this.chain.Partition}`
+if(void 0!==this.chain.Nodes[a]?n=a:void 0!==this.chain.Nodes[r]&&(n=r),void 0!==n){const r={Default:!0,ID:"route:"+this.chain.ServiceName,Name:this.chain.ServiceName,Definition:{Match:{HTTP:{PathPrefix:"/"}}},NextNode:n}
+e.push((0,t.createRoute)(r,this.chain.ServiceName,this.dom.guid))}}return e})),nodes:Ember.computed("routes","splitters","resolvers",(function(){let e=this.resolvers.reduce((e,t)=>(e["resolver:"+t.ID]=t,t.Children.reduce((e,t)=>(e["resolver:"+t.ID]=t,e),e),e),{})
+return e=this.splitters.reduce((e,t)=>(e[t.ID]=t,e),e),e=this.routes.reduce((e,t)=>(e[t.ID]=t,e),e),Object.entries(e).forEach(([t,n])=>{void 0!==n.NextNode&&(n.NextItem=e[n.NextNode]),void 0!==n.Splits&&n.Splits.forEach(t=>{void 0!==t.NextNode&&(t.NextItem=e[t.NextNode])})}),""})),resolvers:Ember.computed("chain.{Nodes,Targets}",(function(){return(0,t.getResolvers)(this.chain.Datacenter,this.chain.Partition,this.chain.Namespace,Ember.get(this,"chain.Targets"),Ember.get(this,"chain.Nodes"))})),graph:Ember.computed("splitters","routes.[]",(function(){const e=this.dataStructs.graph()
+return this.splitters.forEach(t=>{t.Splits.forEach(n=>{e.addLink(t.ID,n.NextNode)})}),this.routes.forEach(t=>{e.addLink(t.ID,t.NextNode)}),e})),selected:Ember.computed("selectedId","graph",(function(){if(""===this.selectedId||!this.dom.element("#"+this.selectedId))return{}
+const e=this.selectedId,t=e.split(":").shift(),n=[e],r=[]
+return this.graph.forEachLinkedNode(e,(e,a)=>{n.push(e.id),r.push(`${a.fromId}>${a.toId}`),this.graph.forEachLinkedNode(e.id,(e,a)=>{const l=e.id.split(":").shift()
+t!==l&&"splitter"!==t&&"splitter"!==l&&(n.push(e.id),r.push(`${a.fromId}>${a.toId}`))})}),{nodes:n.map(e=>"#"+CSS.escape(e)),edges:r.map(e=>"#"+CSS.escape(e))}})),actions:{click:function(e){const t=e.currentTarget.getAttribute("id")
+t===this.selectedId?(Ember.set(this,"active",!1),Ember.set(this,"selectedId","")):(Ember.set(this,"active",!0),Ember.set(this,"selectedId",t))}}}))
+e.default=r})),define("consul-ui/components/consul/discovery-chain/resolver-card/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"2+oC+0pQ",block:'{"symbols":["child","target","target","item","@onclick","@edges","@item","&attrs"],"statements":[[10,"div"],[14,0,"resolver-card"],[12],[2,"\\n  "],[11,"header"],[17,8],[16,"onclick",[30,[36,5],[[32,5]],null]],[16,1,[30,[36,0],["resolver:",[32,7,["ID"]]],null]],[12],[2,"\\n    "],[10,"a"],[14,3,""],[12],[2,"\\n      "],[10,"h3"],[12],[1,[32,7,["Name"]]],[13],[2,"\\n"],[6,[37,4],[[32,7,["Failover"]]],null,[["default"],[{"statements":[[2,"      "],[10,"dl"],[14,0,"failover"],[12],[2,"\\n        "],[11,"dt"],[4,[38,1],[[30,[36,0],[[32,7,["Failover","Type"]]," failover"],null]],null],[12],[2,"\\n          "],[1,[30,[36,0],[[32,7,["Failover","Type"]]," failover"],null]],[2,"\\n        "],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[10,"ol"],[12],[2,"\\n"],[6,[37,3],[[30,[36,2],[[30,[36,2],[[32,7,["Failover","Targets"]]],null]],null]],null,[["default"],[{"statements":[[2,"            "],[10,"li"],[12],[10,"span"],[12],[1,[32,4]],[13],[13],[2,"\\n"]],"parameters":[4]}]]],[2,"          "],[13],[2,"\\n        "],[13],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n  "],[13],[2,"\\n"],[6,[37,4],[[30,[36,9],[[32,7,["Children","length"]],0],null]],null,[["default"],[{"statements":[[2,"    "],[10,"ul"],[12],[2,"\\n"],[6,[37,3],[[30,[36,2],[[30,[36,2],[[32,7,["Children"]]],null]],null]],null,[["default"],[{"statements":[[2,"      "],[11,"li"],[16,"onclick",[30,[36,5],[[32,5]],null]],[16,1,[30,[36,0],["resolver:",[32,1,["ID"]]],null]],[4,[38,8],[[30,[36,7],[[30,[36,6],[[32,1],"rect"],null]],[["from"],[[32,6]]]]],null],[12],[2,"\\n        "],[10,"a"],[14,3,""],[12],[2,"\\n"],[6,[37,4],[[32,1,["Redirect"]]],null,[["default","else"],[{"statements":[[2,"          "],[10,"dl"],[14,0,"redirect"],[12],[2,"\\n            "],[11,"dt"],[4,[38,1],[[30,[36,0],[[32,1,["Redirect"]]," redirect"],null]],null],[12],[2,"\\n              "],[1,[32,1,["Redirect"]]],[2," redirect\\n            "],[13],[2,"\\n            "],[10,"dd"],[12],[2,"\\n              "],[1,[32,1,["Name"]]],[2,"\\n            "],[13],[2,"\\n          "],[13],[2,"\\n"],[6,[37,4],[[32,1,["Failover"]]],null,[["default"],[{"statements":[[2,"            "],[10,"dl"],[14,0,"failover"],[12],[2,"\\n              "],[11,"dt"],[4,[38,1],[[30,[36,0],[[32,1,["Failover","Type"]]," failover"],null]],null],[12],[2,"\\n                "],[1,[32,1,["Failover","Type"]]],[2," failover\\n              "],[13],[2,"\\n              "],[10,"dd"],[12],[2,"\\n                "],[10,"ol"],[12],[2,"\\n"],[6,[37,3],[[30,[36,2],[[30,[36,2],[[32,1,["Failover","Targets"]]],null]],null]],null,[["default"],[{"statements":[[2,"                  "],[10,"li"],[12],[2,"\\n                    "],[10,"span"],[12],[1,[32,3]],[13],[2,"\\n                  "],[13],[2,"\\n"]],"parameters":[3]}]]],[2,"                "],[13],[2,"\\n              "],[13],[2,"\\n            "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,4],[[32,1,["Failover"]]],null,[["default","else"],[{"statements":[[2,"          "],[1,[32,1,["Name"]]],[2,"\\n          "],[10,"dl"],[14,0,"failover"],[12],[2,"\\n            "],[11,"dt"],[4,[38,1],[[30,[36,0],[[32,1,["Failover","Type"]]," failover"],null]],null],[12],[2,"\\n              "],[1,[30,[36,0],[[32,1,["Failover","Type"]]," failover"],null]],[2,"\\n            "],[13],[2,"\\n            "],[10,"dd"],[12],[2,"\\n              "],[10,"ol"],[12],[2,"\\n"],[6,[37,3],[[30,[36,2],[[30,[36,2],[[32,1,["Failover","Targets"]]],null]],null]],null,[["default"],[{"statements":[[2,"                "],[10,"li"],[12],[2,"\\n                  "],[10,"span"],[12],[1,[32,2]],[13],[2,"\\n                "],[13],[2,"\\n"]],"parameters":[2]}]]],[2,"              "],[13],[2,"\\n            "],[13],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          "],[1,[32,1,["Name"]]],[2,"\\n    "]],"parameters":[]}]]]],"parameters":[]}]]],[2,"        "],[13],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[1]}]]],[2,"    "],[13],[2,"\\n"]],"parameters":[]}]]],[13],[2,"\\n"]],"hasEval":false,"upvars":["concat","tooltip","-track-array","each","if","optional","set","dom-position","on-resize","gt"]}',meta:{moduleName:"consul-ui/components/consul/discovery-chain/resolver-card/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/discovery-chain/route-card/index",["exports","@glimmer/component"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"m02p4dNF",block:'{"symbols":["item","item","item","@item","@onclick","&attrs"],"statements":[[11,"a"],[24,0,"route-card"],[16,"onclick",[32,5]],[16,1,[32,4,["ID"]]],[17,6],[12],[2,"\\n  "],[10,"header"],[15,0,[30,[36,5],[[30,[36,4],[[32,0,["path","value"]],"/"],null],"short"],null]],[12],[2,"\\n"],[6,[37,5],[[30,[36,6],[[32,4,["Definition","Match","HTTP","Methods","length"]],0],null]],null,[["default"],[{"statements":[[2,"    "],[10,"ul"],[14,0,"match-methods"],[12],[2,"\\n"],[6,[37,3],[[30,[36,2],[[30,[36,2],[[32,4,["Definition","Match","HTTP","Methods"]]],null]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"li"],[12],[1,[32,3]],[13],[2,"\\n"]],"parameters":[3]}]]],[2,"    "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[10,"dl"],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        "],[1,[32,0,["path","type"]]],[2,"\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[1,[32,0,["path","value"]]],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n"],[6,[37,5],[[30,[36,6],[[32,4,["Definition","Match","HTTP","Header","length"]],0],null]],null,[["default"],[{"statements":[[2,"  "],[10,"section"],[14,0,"match-headers"],[12],[2,"\\n    "],[11,"header"],[4,[38,1],["Header"],null],[12],[2,"\\n      "],[10,"h4"],[12],[2,"Headers"],[13],[2,"\\n    "],[13],[2,"\\n    "],[10,"dl"],[12],[2,"\\n"],[6,[37,3],[[30,[36,2],[[30,[36,2],[[32,4,["Definition","Match","HTTP","Header"]]],null]],null]],null,[["default"],[{"statements":[[2,"      "],[10,"dt"],[12],[2,"\\n        "],[1,[32,2,["Name"]]],[2,"\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[1,[30,[36,0],[[32,2]],null]],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[2]}]]],[2,"    "],[13],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,5],[[30,[36,6],[[32,4,["Definition","Match","HTTP","QueryParam","length"]],0],null]],null,[["default"],[{"statements":[[2,"  "],[10,"section"],[14,0,"match-queryparams"],[12],[2,"\\n    "],[11,"header"],[4,[38,1],["Query Params"],null],[12],[2,"\\n      "],[10,"h4"],[12],[2,"Query Params"],[13],[2,"\\n    "],[13],[2,"\\n    "],[10,"dl"],[12],[2,"\\n"],[6,[37,3],[[30,[36,2],[[30,[36,2],[[32,4,["Definition","Match","HTTP","QueryParam"]]],null]],null]],null,[["default"],[{"statements":[[2,"      "],[10,"dt"],[12],[2,"\\n        "],[1,[32,1,["Name"]]],[2,"\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[1,[30,[36,0],[[32,1]],null]],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[1]}]]],[2,"    "],[13],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]}]]],[13],[2,"\\n"]],"hasEval":false,"upvars":["route-match","tooltip","-track-array","each","eq","if","gt"]}',meta:{moduleName:"consul-ui/components/consul/discovery-chain/route-card/index.hbs"}})
+class r extends t.default{get path(){return Object.entries(Ember.get(this.args.item,"Definition.Match.HTTP")||{}).reduce((function(e,[t,n]){return t.toLowerCase().startsWith("path")?{type:t.replace("Path",""),value:n}:e}),{type:"Prefix",value:"/"})}}e.default=r,Ember._setComponentTemplate(n,r)})),define("consul-ui/components/consul/discovery-chain/splitter-card/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"fGt7Ht9M",block:'{"symbols":["&attrs","@item","@onclick"],"statements":[[10,"div"],[12],[2,"\\n  "],[11,"a"],[17,1],[16,1,[32,2,["ID"]]],[24,0,"splitter-card"],[16,"onclick",[30,[36,0],[[32,3]],null]],[12],[2,"\\n    "],[10,"header"],[12],[2,"\\n      "],[10,"h3"],[12],[1,[32,2,["Name"]]],[13],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["optional"]}',meta:{moduleName:"consul-ui/components/consul/discovery-chain/splitter-card/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/discovery-chain/utils",["exports"],(function(e){function t(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function n(e){for(var n=1;n<arguments.length;n++){var a=null!=arguments[n]?arguments[n]:{}
+n%2?t(Object(a),!0).forEach((function(t){r(e,t,a[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(a)):t(Object(a)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(a,t))}))}return e}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.createRoute=e.getResolvers=e.getRoutes=e.getSplitters=e.getAlternateServices=void 0
+const a=function(e={},t){return Object.values(e).filter(e=>e.Type===t)},l=function(e,t,n="default",r="default",a){return void 0===e[t]&&(e[t]={ID:`${t}.${n}.${r}.${a}`,Name:t,Children:[]}),e[t]},s=function(e,t){let n
+const r=e.map((function(e){const[r,a]=[t,e].map(e=>e.split(".").reverse()),l=["Datacenter","Partition","Namespace","Service","Subset"]
+return a.find((function(e,t){const a=e!==r[t]
+return a&&(n=l[t]),a}))}))
+return{Type:n,Targets:r}}
+e.getAlternateServices=s
+e.getSplitters=function(e){return a(e,"splitter").map((function(e){const t=e.Name.split(".")
+return t.reverse(),t.shift(),t.shift(),t.reverse(),n(n({},e),{},{ID:"splitter:"+e.Name,Name:t.join(".")})}))}
+e.getRoutes=function(e,t){return a(e,"router").reduce((function(e,n){return e.concat(n.Routes.map((function(e){return i(e,n.Name,t)})))}),[])}
+e.getResolvers=function(e,t="default",n="default",r={},a={}){const i={}
+return Object.values(a).filter(e=>"resolver"===e.Type).forEach((function(r){const a=r.Name.split(".")
+let o
+a.length>4&&(o=a.shift()),a.reverse(),a.shift(),a.shift(),a.shift(),a.reverse()
+const u=a.join("."),c=l(i,u,n,t,e)
+let d
+if(void 0!==r.Resolver.Failover&&(d=s(r.Resolver.Failover.Targets,r.Name)),o){const e={Subset:!0,ID:r.Name,Name:o}
+void 0!==d&&(e.Failover=d),c.Children.push(e)}else void 0!==d&&(c.Failover=d)})),Object.values(r).forEach(r=>{if(void 0!==a["resolver:"+r.ID]){const o=s([r.ID],`service.${n}.${t}.${e}`)
+if("Service"!==o.Type){const u=l(i,r.Service,n,t,e),c={Redirect:o.Type,ID:r.ID,Name:r[o.Type]}
+void 0!==a["resolver:"+r.ID].Resolver.Failover&&(c.Failover=s(a["resolver:"+r.ID].Resolver.Failover.Targets,r.ID)),u.Children.push(c)}}}),Object.values(i)}
+const i=function(e,t,r){return n(n({},e),{},{Default:e.Default||void 0===e.Definition.Match,ID:`route:${t}-${r(e.Definition)}`})}
+e.createRoute=i})),define("consul-ui/components/consul/exposed-path/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"JI0j+pbJ",block:'{"symbols":["path","combinedAddress","@address","&attrs","@items"],"statements":[[11,"div"],[24,0,"consul-exposed-path-list"],[17,4],[12],[2,"\\n  "],[10,"ul"],[12],[2,"\\n"],[6,[37,4],[[30,[36,3],[[30,[36,3],[[32,5]],null]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"li"],[12],[2,"\\n      "],[10,"div"],[14,0,"header"],[12],[2,"\\n"],[6,[37,1],[[30,[36,0],[[32,3],":",[32,1,["ListenerPort"]],[32,1,["Path"]]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"p"],[14,0,"combined-address"],[12],[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[32,2]],[2,"\\n          "],[13],[2,"\\n          "],[8,"copy-button",[],[["@value","@name"],[[32,2],"Address"]],null],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[2]}]]],[2,"      "],[13],[2,"\\n      "],[10,"div"],[14,0,"detail"],[12],[2,"\\n"],[6,[37,2],[[32,1,["Protocol"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dl"],[14,0,"protocol"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n            "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n                Protocol\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[1,[32,1,["Protocol"]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,1,["ListenerPort"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dl"],[14,0,"port"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n            "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n              Listener Port\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            listening on :"],[1,[32,1,["ListenerPort"]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,1,["LocalPathPort"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dl"],[14,0,"port"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n            "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n              Local Path Port\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            local port :"],[1,[32,1,["LocalPathPort"]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,2],[[32,1,["Path"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dl"],[14,0,"path"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n            "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n              Path\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[1,[32,1,["Path"]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[1]}]]],[2,"  "],[13],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["concat","let","if","-track-array","each"]}',meta:{moduleName:"consul-ui/components/consul/exposed-path/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/external-source/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"uL9PpB5h",block:'{"symbols":["externalSource","@label","&attrs","@withInfo","@item"],"statements":[[6,[37,2],[[32,5]],null,[["default"],[{"statements":[[6,[37,7],[[30,[36,6],[[32,5]],null]],null,[["default"],[{"statements":[[6,[37,2],[[30,[36,5],[[32,4],[30,[36,4],[[32,1],"consul-api-gateway"],null]],null]],null,[["default","else"],[{"statements":[[2,"        "],[10,"dl"],[14,0,"tooltip-panel"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n            "],[11,"span"],[16,0,[31,["consul-external-source ",[32,1]]]],[17,3],[12],[2,"\\n              Registered via "],[1,[30,[36,1],[[30,[36,0],["common.brand.",[32,1]],null]],null]],[2,"\\n            "],[13],[2,"\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[8,"menu-panel",[],[["@position","@menu"],["left",false]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                API Gateways manage north-south traffic from external services to services in the Datacenter. For more information, read our documentation.\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["menu"]],[["default"],[{"statements":[[2,"\\n                "],[10,"li"],[14,"role","separator"],[12],[2,"\\n                  About "],[1,[30,[36,1],[[30,[36,0],["common.brand.",[32,1]],null]],null]],[2,"\\n                "],[13],[2,"\\n                "],[10,"li"],[14,"role","none"],[14,0,"learn-link"],[12],[2,"\\n                  "],[10,"a"],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[30,[36,0],[[30,[36,3],["CONSUL_DOCS_LEARN_URL"],null]],null]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"\\n                    Learn guides\\n                  "],[13],[2,"\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,2],[[32,1]],null,[["default"],[{"statements":[[2,"    "],[11,"span"],[16,0,[31,["consul-external-source ",[32,1]]]],[17,3],[12],[2,"\\n"],[6,[37,2],[[32,2]],null,[["default","else"],[{"statements":[[2,"        "],[1,[32,2]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        Registered via "],[1,[30,[36,1],[[30,[36,0],["common.brand.",[32,1]],null]],null]],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n  "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1]}]]]],"parameters":[]}]]]],"hasEval":false,"upvars":["concat","t","if","env","eq","and","service/external-source","let"]}',meta:{moduleName:"consul-ui/components/consul/external-source/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/health-check/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"IRYzjPsd",block:'{"symbols":["item","&attrs","@items"],"statements":[[11,"div"],[24,0,"consul-health-check-list"],[17,2],[12],[2,"\\n  "],[10,"ul"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,5],[[32,3]],null]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"li"],[15,0,[30,[36,1],["health-check-output ",[32,1,["Status"]]],null]],[12],[2,"\\n      "],[10,"div"],[12],[2,"\\n        "],[10,"header"],[12],[2,"\\n          "],[10,"h2"],[12],[1,[32,1,["Name"]]],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"dl"],[12],[2,"\\n"],[6,[37,3],[[30,[36,2],[[32,1,["Kind"]],"node"],null]],null,[["default","else"],[{"statements":[[2,"          "],[10,"dt"],[12],[2,"NodeName"],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,1,["Node"]]],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          "],[10,"dt"],[12],[2,"ServiceName"],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,1,["ServiceName"]]],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[13],[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"CheckID"],[13],[2,"\\n          "],[10,"dd"],[12],[1,[30,[36,4],[[32,1,["CheckID"]],"-"],null]],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"Type"],[13],[2,"\\n          "],[10,"dd"],[14,"data-health-check-type",""],[12],[2,"\\n            "],[1,[32,1,["Type"]]],[2,"\\n"],[6,[37,3],[[32,1,["Exposed"]]],null,[["default"],[{"statements":[[2,"            "],[11,"em"],[4,[38,0],["Expose.checks is set to true, so all registered HTTP and gRPC check paths are exposed through Envoy for the Consul agent."],null],[12],[2,"Exposed"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"Notes"],[13],[2,"\\n          "],[10,"dd"],[12],[1,[30,[36,4],[[32,1,["Notes"]],"-"],null]],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"Output"],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n              "],[10,"pre"],[12],[10,"code"],[12],[1,[32,1,["Output"]]],[13],[13],[2,"\\n              "],[8,"copy-button",[],[["@value","@name"],[[32,1,["Output"]],"output"]],null],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[1]}]]],[2,"  "],[13],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["tooltip","concat","eq","if","or","-track-array","each"]}',meta:{moduleName:"consul-ui/components/consul/health-check/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/health-check/search-bar/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"FSYiXBjC",block:'{"symbols":["__arg0","__arg1","search","components","Optgroup","Option","selectable","search","components","Optgroup","Option","item","components","Optgroup","Option","item","components","Optgroup","Option","state","search","components","Optgroup","Option","prop","search","key","value","@sort","@filter","@onsearch","@search","&attrs"],"statements":[[8,"search-bar",[[24,0,"consul-healthcheck-search-bar"],[17,33]],[["@filter","@namedBlocksInfo"],[[32,30],[30,[36,14],null,[["status","search","filter","sort"],[1,1,1,1]]]]],[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"status"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,0],[[30,[36,10],["components.consul.health-check.search-bar.",[32,26,["status","key"]],".name"],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,26,["status","key"]]],null],[30,[36,10],["common.consul.",[32,26,["status","key"]]],null]],null]]]],[30,[36,0],[[30,[36,10],["components.consul.health-check.search-bar.",[32,26,["status","key"]],".options.",[32,26,["status","value"]]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,26,["status","value"]]],null],[30,[36,10],["common.consul.",[32,26,["status","value"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,26,["RemoveFilter"]],[[16,"aria-label",[30,[36,0],["common.ui.remove"],[["item"],[[30,[36,10],[[32,27]," ",[32,28]],null]]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[1,[32,27]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,28]],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[27,28]}]]],[2,"\\n    "]],"parameters":[26]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"search"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,21,["Search"]],[],[["@onsearch","@value","@placeholder"],[[30,[36,3],[[32,0],[32,31]],null],[32,32],[30,[36,0],["common.search.search"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,8],[[32,30,["searchproperty"]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,21,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,30,["searchproperty","change"]]],null],true,true]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[2,"\\n              "],[1,[30,[36,0],["common.search.searchproperty"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,22,["Optgroup"]],[32,22,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[32,30,["searchproperty","default"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,24],[],[["@value","@selected"],[[32,25],[30,[36,9],[[32,25],[32,30,["searchproperty","value"]]],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[30,[36,13],[[32,25]],null]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[25]}]]]],"parameters":[23,24]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[22]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[21]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"filter"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,8,["Select"]],[[24,0,"type-status"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,30,["status","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["common.consul.status"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,17,["Optgroup"]],[32,17,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[30,[36,4],["passing","warning","critical","empty"],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,19],[[16,0,[31,["value-",[32,20]]]]],[["@value","@selected"],[[32,20],[30,[36,9],[[32,20],[32,30,["status","value"]]],null]]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[32,20]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,20]],null]],null]]]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[20]}]]]],"parameters":[18,19]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[17]}]]],[2,"\\n"],[6,[37,8],[[32,30,["kind"]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,8,["Select"]],[[24,0,"type-kind"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,30,["kind","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["components.consul.health-check.search-bar.kind.name"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,13,["Optgroup"]],[32,13,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[30,[36,4],["service","node"],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,15],[],[["@value","@selected"],[[32,16],[30,[36,9],[[32,16],[32,30,["kind","value"]]],null]]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],[[30,[36,10],["components.consul.health-check.search-bar.kind.options.",[32,16]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,16]],null]],null]]]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[16]}]]]],"parameters":[14,15]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[13]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[8,[32,8,["Select"]],[[24,0,"type-check"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,30,["check","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["components.consul.health-check.search-bar.check.name"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,9,["Optgroup"]],[32,9,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[30,[36,4],["alias","docker","grpc","http","script","serf","tcp","ttl"],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,11],[],[["@value","@selected"],[[32,12],[30,[36,9],[[32,12],[32,30,["check","value"]]],null]]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],[[30,[36,10],["components.consul.health-check.search-bar.check.options.",[32,12]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,12]],null]],null]]]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[12]}]]]],"parameters":[10,11]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[9]}]]],[2,"\\n    "]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"sort"],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,29,["change"]]],null],false,true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,4],[[30,[36,4],["Name:asc",[30,[36,0],["common.sort.alpha.asc"],null]],null],[30,[36,4],["Name:desc",[30,[36,0],["common.sort.alpha.desc"],null]],null],[30,[36,4],["Status:asc",[30,[36,0],["common.sort.status.asc"],null]],null],[30,[36,4],["Status:desc",[30,[36,0],["common.sort.status.desc"],null]],null],[30,[36,4],["Kind:asc",[30,[36,0],["components.consul.health-check.search-bar.sort.kind.asc"],null]],null],[30,[36,4],["Kind:desc",[30,[36,0],["components.consul.health-check.search-bar.sort.kind.desc"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[1,[30,[36,2],[[32,7],[32,29,["value"]]],null]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,4,["Optgroup"]],[32,4,["Option"]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.consul.status"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Status:asc",[30,[36,1],["Status:asc",[32,29,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.status.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Status:desc",[30,[36,1],["Status:desc",[32,29,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.status.desc"],null]]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,5],[],[["@label"],[[30,[36,0],["components.consul.health-check.search-bar.sort.name.name"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Name:asc",[30,[36,1],["Name:asc",[32,29,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Name:desc",[30,[36,1],["Name:desc",[32,29,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.desc"],null]]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,5],[],[["@label"],[[30,[36,0],["components.consul.health-check.search-bar.sort.kind.name"],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["Kind:asc",[30,[36,1],["Kind:asc",[32,29]],null]]],[["default"],[{"statements":[[2,"Service to Node"]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["Kind:desc",[30,[36,1],["Kind:desc",[32,29]],null]]],[["default"],[{"statements":[[2,"Node to Service"]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]]],"hasEval":false,"upvars":["t","eq","get","action","array","from-entries","let","-is-named-block-invocation","if","contains","concat","-track-array","each","lowercase","hash"]}',meta:{moduleName:"consul-ui/components/consul/health-check/search-bar/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n}))
+define("consul-ui/components/consul/instance-checks/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"rPbWf6F2",block:'{"symbols":["grouped","checks","status","humanized","@type","@items","&attrs"],"statements":[[6,[37,8],[[30,[36,10],["Status",[30,[36,3],[[32,6],[30,[36,5],null,null]],null]],null]],null,[["default"],[{"statements":[[6,[37,8],[[30,[36,3],[[30,[36,2],[[30,[36,9],[[32,1,["critical","length"]],0],null],[32,1,["critical"]]],null],[30,[36,2],[[30,[36,9],[[32,1,["warning","length"]],0],null],[32,1,["warning"]]],null],[30,[36,2],[[30,[36,9],[[32,1,["passing","length"]],0],null],[32,1,["passing"]]],null],[30,[36,5],null,null]],null]],null,[["default"],[{"statements":[[6,[37,8],[[32,2,["firstObject","Status"]]],null,[["default"],[{"statements":[[2,"    "],[11,"dl"],[16,0,[30,[36,6],["consul-instance-checks",[30,[36,5],["empty",[30,[36,1],[[32,2,["length"]],0],null]],null],[30,[36,5],[[32,3],[30,[36,4],[[32,2,["length"]],0],null]],null]],null]],[17,7],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[1,[30,[36,7],[[32,5]],null]],[2," Checks\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n"],[6,[37,8],[[30,[36,3],[[30,[36,2],[[30,[36,1],[[32,3],"critical"],null],"failing"],null],[30,[36,2],[[30,[36,1],[[32,3],"warning"],null],"with a warning"],null],[32,3]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"dd"],[12],[2,"\\n          "],[1,[30,[36,3],[[30,[36,2],[[30,[36,1],[[32,2,["length"]],0],null],[30,[36,0],["No ",[32,5]," checks"],null]],null],[30,[36,2],[[30,[36,1],[[32,2,["length"]],[32,6,["length"]]],null],[30,[36,0],["All ",[32,5]," checks ",[32,4]],null]],null],[30,[36,0],[[32,2,["length"]],"/",[32,6,["length"]]," ",[32,5]," checks ",[32,4]],null]],null]],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[4]}]]],[2,"    "],[13],[2,"\\n"]],"parameters":[3]}]]]],"parameters":[2]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["concat","eq","if","or","not-eq","array","class-map","capitalize","let","gt","group-by"]}',meta:{moduleName:"consul-ui/components/consul/instance-checks/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/intention/form/fieldsets/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"RvLiSiHb",block:'{"symbols":["modal","permissionForm","_action","radio","partition","nspace","service","partition","nspace","service","&attrs","@dc"],"statements":[[11,"div"],[17,11],[24,0,"consul-intention-fieldsets"],[12],[2,"\\n  "],[10,"fieldset"],[15,"disabled",[34,22]],[12],[2,"\\n    "],[10,"div"],[14,"role","group"],[12],[2,"\\n      "],[10,"fieldset"],[12],[2,"\\n        "],[10,"h2"],[12],[2,"Source"],[13],[2,"\\n        "],[10,"label"],[15,0,[31,["type-select",[30,[36,9],[[35,1,["error","SourceName"]]," has-error"],null]]]],[12],[2,"\\n          "],[10,"span"],[12],[2,"Source Service"],[13],[2,"\\n          "],[8,"power-select-with-create",[],[["@disabled","@options","@searchField","@selected","@searchPlaceholder","@buildSuggestion","@showCreateWhen","@onCreate","@onChange"],[[30,[36,15],[[35,14]],null],[34,23],"Name",[34,24],"Type service name",[30,[36,3],[[32,0],"createNewLabel","Use a Consul Service called \'{{term}}\'"],null],[30,[36,3],[[32,0],"isUnique",[35,23]],null],[30,[36,3],[[32,0],[35,13],"SourceName"],null],[30,[36,3],[[32,0],[35,13],"SourceName"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,9],[[30,[36,12],[[32,10,["Name"]],"*"],null]],null,[["default","else"],[{"statements":[[2,"                    * (All Services)\\n"]],"parameters":[]},{"statements":[[2,"                    "],[1,[32,10,["Name"]]],[2,"\\n"]],"parameters":[]}]]],[2,"          "]],"parameters":[10]}]]],[2,"\\n"],[6,[37,9],[[35,14]],null,[["default"],[{"statements":[[2,"          "],[10,"em"],[12],[2,"Search for an existing service, or enter any Service name."],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[13],[2,"\\n"],[6,[37,9],[[30,[36,25],["choose nspaces"],null]],null,[["default"],[{"statements":[[2,"        "],[10,"label"],[15,0,[31,["type-select",[30,[36,9],[[35,1,["error","SourceNS"]]," has-error"],null]]]],[12],[2,"\\n          "],[10,"span"],[12],[2,"Source Namespace"],[13],[2,"\\n          "],[8,"power-select-with-create",[],[["@disabled","@options","@selected","@searchPlaceholder","@buildSuggestion","@showCreateWhen","@onCreate","@onChange"],[[30,[36,15],[[35,14]],null],[34,18],[34,21],"Type namespace name",[30,[36,3],[[32,0],"createNewLabel","Use a Consul Namespace called \'{{term}}\'"],null],[30,[36,3],[[32,0],"isUnique",[35,18]],null],[30,[36,3],[[32,0],[35,13],"SourceNS"],null],[30,[36,3],[[32,0],[35,13],"SourceNS"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,9],[[30,[36,12],[[32,9,["Name"]],"*"],null]],null,[["default","else"],[{"statements":[[2,"                  * (All Namespaces)\\n"]],"parameters":[]},{"statements":[[2,"                  "],[1,[32,9,["Name"]]],[2,"\\n"]],"parameters":[]}]]],[2,"          "]],"parameters":[9]}]]],[2,"\\n"],[6,[37,9],[[35,14]],null,[["default"],[{"statements":[[2,"          "],[10,"em"],[12],[2,"Search for an existing namespace, or enter any Namespace name."],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,9],[[30,[36,25],["choose partitions"],[["dc"],[[32,12]]]]],null,[["default"],[{"statements":[[2,"        "],[10,"label"],[15,0,[31,["type-select",[30,[36,9],[[35,1,["error","SourcePartition"]]," has-error"],null]]]],[12],[2,"\\n          "],[10,"span"],[12],[2,"Source Partition"],[13],[2,"\\n          "],[8,"power-select-with-create",[],[["@disabled","@options","@selected","@searchPlaceholder","@buildSuggestion","@showCreateWhen","@onCreate","@onChange"],[[30,[36,15],[[35,14]],null],[34,16],[34,20],"Type partition name",[30,[36,3],[[32,0],"createNewLabel","Use a Consul Partition called \'{{term}}\'"],null],[30,[36,3],[[32,0],"isUnique",[35,16]],null],[30,[36,3],[[32,0],[35,13],"SourcePartition"],null],[30,[36,3],[[32,0],[35,13],"SourcePartition"],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[32,8,["Name"]]],[2,"\\n          "]],"parameters":[8]}]]],[2,"\\n"],[6,[37,9],[[35,14]],null,[["default"],[{"statements":[[2,"          "],[10,"em"],[12],[2,"Search for an existing partition, or enter any Partition name."],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n      "],[10,"fieldset"],[12],[2,"\\n        "],[10,"h2"],[12],[2,"Destination"],[13],[2,"\\n        "],[10,"label"],[15,0,[31,["type-select",[30,[36,9],[[35,1,["error","DestinationName"]]," has-error"],null]]]],[12],[2,"\\n          "],[10,"span"],[12],[2,"Destination Service"],[13],[2,"\\n          "],[8,"power-select-with-create",[],[["@disabled","@options","@searchField","@selected","@searchPlaceholder","@buildSuggestion","@showCreateWhen","@onCreate","@onChange"],[[30,[36,15],[[35,14]],null],[34,23],"Name",[34,26],"Type service name",[30,[36,3],[[32,0],"createNewLabel","Use a Consul Service called \'{{term}}\'"],null],[30,[36,3],[[32,0],"isUnique",[35,23]],null],[30,[36,3],[[32,0],[35,13],"DestinationName"],null],[30,[36,3],[[32,0],[35,13],"DestinationName"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,9],[[30,[36,12],[[32,7,["Name"]],"*"],null]],null,[["default","else"],[{"statements":[[2,"                    * (All Services)\\n"]],"parameters":[]},{"statements":[[2,"                    "],[1,[32,7,["Name"]]],[2,"\\n"]],"parameters":[]}]]],[2,"          "]],"parameters":[7]}]]],[2,"\\n"],[6,[37,9],[[35,14]],null,[["default"],[{"statements":[[2,"          "],[10,"em"],[12],[2,"Search for an existing service, or enter any Service name."],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[13],[2,"\\n"],[6,[37,9],[[30,[36,25],["choose nspaces"],null]],null,[["default"],[{"statements":[[2,"        "],[10,"label"],[15,0,[31,["type-select",[30,[36,9],[[35,1,["error","DestinationNS"]]," has-error"],null]]]],[12],[2,"\\n          "],[10,"span"],[12],[2,"Destination Namespace"],[13],[2,"\\n          "],[8,"power-select-with-create",[],[["@disabled","@options","@searchField","@selected","@searchPlaceholder","@buildSuggestion","@showCreateWhen","@onCreate","@onChange"],[[30,[36,15],[[35,14]],null],[34,18],"Name",[34,19],"Type namespace name",[30,[36,3],[[32,0],"createNewLabel","Use a future Consul Namespace called \'{{term}}\'"],null],[30,[36,3],[[32,0],"isUnique",[35,18]],null],[30,[36,3],[[32,0],[35,13],"DestinationNS"],null],[30,[36,3],[[32,0],[35,13],"DestinationNS"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,9],[[30,[36,12],[[32,6,["Name"]],"*"],null]],null,[["default","else"],[{"statements":[[2,"                    * (All Namespaces)\\n"]],"parameters":[]},{"statements":[[2,"                    "],[1,[32,6,["Name"]]],[2,"\\n"]],"parameters":[]}]]],[2,"          "]],"parameters":[6]}]]],[2,"\\n"],[6,[37,9],[[35,14]],null,[["default"],[{"statements":[[2,"          "],[10,"em"],[12],[2,"For the destination, you may choose any namespace for which you have access."],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,9],[[30,[36,25],["choose partitions"],[["dc"],[[32,12]]]]],null,[["default"],[{"statements":[[2,"        "],[10,"label"],[15,0,[31,["type-select",[30,[36,9],[[35,1,["error","DestinationPartition"]]," has-error"],null]]]],[12],[2,"\\n          "],[10,"span"],[12],[2,"Destination Partition"],[13],[2,"\\n          "],[8,"power-select-with-create",[],[["@disabled","@options","@searchField","@selected","@searchPlaceholder","@buildSuggestion","@showCreateWhen","@onCreate","@onChange"],[[30,[36,15],[[35,14]],null],[34,16],"Name",[34,17],"Type partition name",[30,[36,3],[[32,0],"createNewLabel","Use a future Consul Partition called \'{{term}}\'"],null],[30,[36,3],[[32,0],"isUnique",[35,16]],null],[30,[36,3],[[32,0],[35,13],"DestinationPartition"],null],[30,[36,3],[[32,0],[35,13],"DestinationPartition"],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[32,5,["Name"]]],[2,"\\n          "]],"parameters":[5]}]]],[2,"\\n"],[6,[37,9],[[35,14]],null,[["default"],[{"statements":[[2,"          "],[10,"em"],[12],[2,"For the destination, you may choose any partition for which you have access."],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n    "],[13],[2,"\\n  "],[10,"fieldset"],[12],[2,"\\n    "],[10,"label"],[15,0,[31,["type-text",[30,[36,9],[[35,1,["error","Description"]]," has-error"],null]]]],[12],[2,"\\n      "],[10,"span"],[12],[2,"Description (Optional)"],[13],[2,"\\n      "],[10,"input"],[14,3,"Description"],[15,2,[34,1,["Description"]]],[14,"placeholder","Description (Optional)"],[15,"onchange",[30,[36,3],[[32,0],[35,13]],null]],[14,4,"text"],[12],[13],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n    "],[10,"div"],[12],[2,"\\n      "],[10,"span"],[14,0,"label"],[12],[2,"Should this source connect to the destination?"],[13],[2,"\\n      "],[10,"div"],[14,"role","radiogroup"],[15,0,[30,[36,9],[[35,1,["error","Action"]]," has-error"],null]],[12],[2,"\\n"],[6,[37,30],[[30,[36,29],[[30,[36,29],[[30,[36,28],[[30,[36,27],null,[["intent","header","body"],["allow","Allow","The source service will be allowed to connect to the destination."]]],[30,[36,27],null,[["intent","header","body"],["deny","Deny","The source service will not be allowed to connect to the destination."]]],[30,[36,27],null,[["intent","header","body"],["","Application Aware","The source service may or may not connect to the destination service via unique permissions based on Layer 7 criteria: path, header, or method."]]]],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,"radio-card",[[16,0,[30,[36,10],["value-",[32,3,["intent"]]],null]]],[["@value","@checked","@onchange","@name"],[[32,3,["intent"]],[30,[36,9],[[30,[36,12],[[30,[36,11],[[35,1,["Action"]],""],null],[32,3,["intent"]]],null],"checked"],null],[30,[36,3],[[32,0],[35,13]],null],"Action"]],[["default"],[{"statements":[[2,"\\n            "],[10,"header"],[12],[2,"\\n              "],[1,[32,3,["header"]]],[2,"\\n            "],[13],[2,"\\n            "],[10,"p"],[12],[2,"\\n              "],[1,[32,3,["body"]]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[4]}]]],[2,"\\n"]],"parameters":[3]}]]],[2,"      "],[13],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n"],[6,[37,9],[[30,[36,12],[[30,[36,11],[[35,1,["Action"]],""],null],""],null]],null,[["default"],[{"statements":[[2,"  "],[10,"fieldset"],[14,0,"permissions"],[12],[2,"\\n    "],[11,"button"],[24,4,"button"],[4,[38,7],["click",[30,[36,2],[[32,0,["modal","open"]]],null]],null],[12],[2,"\\n      Add permission\\n    "],[13],[2,"\\n    "],[10,"h2"],[12],[2,"Permissions"],[13],[2,"\\n"],[6,[37,9],[[30,[36,8],[[35,1,["Permissions","length"]],0],null]],null,[["default","else"],[{"statements":[[2,"    "],[8,"consul/intention/notice/permissions",[],[[],[]],null],[2,"\\n    "],[8,"consul/intention/permission/list",[],[["@items","@onclick","@ondelete"],[[34,1,["Permissions"]],[30,[36,6],[[30,[36,3],[[32,0],[30,[36,5],[[35,4]],null]],null],[30,[36,3],[[32,0],[30,[36,2],[[32,0,["modal","open"]]],null]],null]],null],[30,[36,3],[[32,0],"delete","Permissions",[35,1]],null]]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"h3"],[12],[2,"\\n          No permissions yet\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n        "],[10,"p"],[12],[2,"\\n          Permissions intercept an Intention\'s traffic using Layer 7 criteria, such as path prefixes and http headers.\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n        "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n          "],[10,"a"],[15,6,[31,[[30,[36,0],["CONSUL_DOCS_URL"],null],"/commands/intention"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Documentation"],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"li"],[14,0,"learn-link"],[12],[2,"\\n          "],[10,"a"],[15,6,[31,[[30,[36,0],["CONSUL_DOCS_LEARN_URL"],null],"/consul/getting-started/connect"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Read the guide"],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n  "],[8,"modal-dialog",[[24,0,"consul-intention-permission-modal"]],[["@onclose","@aria"],[[30,[36,3],[[32,0],[30,[36,5],[[35,4]],null],[29]],null],[30,[36,27],null,[["label"],["Edit Permission"]]]]],[["default"],[{"statements":[[2,"\\n    "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"modal",[32,1]]],null],[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n      "],[10,"h3"],[12],[2,"Edit Permission"],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n      "],[8,"consul/intention/permission/form",[],[["@item","@onsubmit"],[[34,4],[30,[36,3],[[32,0],"add","Permissions",[35,1]],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"permissionForm",[32,2]]],null],[2,"\\n      "]],"parameters":[2]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n      "],[10,"button"],[14,0,"type-submit"],[15,"disabled",[30,[36,9],[[30,[36,15],[[32,0,["permissionForm","isDirty"]]],null],"disabled"],null]],[15,"onclick",[30,[36,6],[[30,[36,3],[[32,0],[32,0,["permissionForm","submit"]]],null],[30,[36,3],[[32,0],[32,1,["close"]]],null]],null]],[14,4,"button"],[12],[2,"\\n        Save\\n      "],[13],[2,"\\n      "],[10,"button"],[14,0,"type-cancel"],[15,"onclick",[30,[36,6],[[30,[36,3],[[32,0],[32,0,["permissionForm","reset"]]],null],[30,[36,3],[[32,0],[32,1,["close"]]],null]],null]],[14,4,"button"],[12],[2,"\\n        Cancel\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[1]}]]],[2,"\\n\\n"],[13]],"hasEval":false,"upvars":["env","item","optional","action","permission","mut","queue","on","gt","if","concat","or","eq","onchange","create","not","partitions","DestinationPartition","nspaces","DestinationNS","SourcePartition","SourceNS","disabled","services","SourceName","can","DestinationName","hash","array","-track-array","each"]}',meta:{moduleName:"consul-ui/components/consul/intention/form/fieldsets/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:"",shouldShowPermissionForm:!1,actions:{createNewLabel:function(e,t){return e.replace(/{{term}}/g,t)},isUnique:function(e,t){return!e.findBy("Name",t)},add:function(e,t,n){!(t.get(e)||[]).includes(n)&&n.isNew&&(t.pushObject(e,n),t.validate())},delete:function(e,t,n){(t.get(e)||[]).includes(n)&&(t.removeObject(e,n),t.validate())}}}))
+e.default=n})),define("consul-ui/components/consul/intention/form/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x,j,C,S,N,z,M,D
+function T(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function L(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const A=Ember.HTMLBars.template({id:"JJOVYubC",block:'{"symbols":["api","item","readonly","notice","execute","cancel","message","confirm","notice","newAction","modal","close","after","notice","notice","@dc","@partition","&attrs","@nspace","@autofill","@item","@src"],"statements":[[11,"div"],[24,0,"consul-intention"],[17,18],[12],[2,"\\n"],[8,"data-form",[],[["@type","@dc","@nspace","@partition","@autofill","@item","@src","@onchange","@onsubmit"],["intention",[32,16,["Name"]],[32,19],[32,17],[32,20],[32,21],[32,22],[30,[36,10],[[32,0],[32,0,["change"]]],null],[30,[36,10],[[32,0],[32,0,["onsubmit"]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[30,[36,17],[[32,1,["error","detail"]],"duplicate intention found:"],null]],null,[["default","else"],[{"statements":[[2,"      "],[8,"notice",[[24,0,"notification-update"],[4,[38,16],null,[["after"],[[30,[36,10],[[32,0],[32,13]],null]]]]],[["@type"],["error"]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,15,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[10,"strong"],[12],[2,"Intention exists!"],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,15,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[10,"p"],[12],[2,"\\n            An intention already exists for this Source-Destination pair. Please enter a different combination of Services, or search the intentions to edit an existing intention.\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[15]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[8,"notice",[[24,0,"notification-update"],[4,[38,16],null,[["after"],[[30,[36,10],[[32,0],[32,13]],null]]]]],[["@type"],["error"]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,14,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[10,"strong"],[12],[2,"Error!"],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,14,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[10,"p"],[12],[2,"\\n            There was an error saving your intention.\\n"],[6,[37,1],[[30,[36,7],[[32,1,["error","status"]],[32,1,["error","detail"]]],null]],null,[["default"],[{"statements":[[2,"            "],[10,"br"],[12],[13],[1,[32,1,["error","status"]]],[2,": "],[1,[32,1,["error","detail"]]],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[14]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[13]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["form"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,14],[[32,1,["data"]],[30,[36,6],[[30,[36,5],["write intention"],[["item"],[[32,1,["data"]]]]]],null]],null,[["default"],[{"statements":[[6,[37,1],[[30,[36,6],[[32,3]],null]],null,[["default","else"],[{"statements":[[2,"\\n"],[6,[37,14],[[30,[36,13],[[32,2],"Action"],null]],null,[["default"],[{"statements":[[2,"      "],[8,"modal-dialog",[[24,0,"consul-intention-action-warn-modal warning"]],[["@aria"],[[30,[36,8],null,[["label"],[[30,[36,11],["Set intention to ",[32,10]],null]]]]]],[["default"],[{"statements":[[2,"\\n        "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"modal",[32,11]]],null],[2,"\\n        "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n          "],[10,"h2"],[12],[2,"Set intention to "],[1,[32,10]],[2,"?"],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n          "],[10,"p"],[12],[2,"\\n            When you change this Intention to "],[1,[32,10]],[2,", you will remove all the Layer 7 policy permissions currently saved to this Intention. Are you sure you want to set it to "],[1,[32,10]],[2,"?\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n          "],[11,"button"],[24,0,"dangerous"],[24,4,"button"],[4,[38,3],["click",[32,1,["submit"]]],null],[12],[2,"\\n            Set to "],[1,[30,[36,12],[[32,10]],null]],[2,"\\n          "],[13],[2,"\\n          "],[10,"button"],[14,0,"type-cancel"],[15,"onclick",[32,12]],[14,4,"button"],[12],[2,"\\n            No, Cancel\\n          "],[13],[2,"\\n        "]],"parameters":[12]}]]],[2,"\\n      "]],"parameters":[11]}]]],[2,"\\n"]],"parameters":[10]}]]],[2,"\\n      "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,9],["/${partition}/*/${dc}/services",[30,[36,8],null,[["partition","dc"],[[32,17],[32,16,["Name"]]]]]],null],[30,[36,10],[[32,0],[32,0,["createServices"]],[32,2]],null]]],null],[2,"\\n\\n"],[6,[37,1],[[30,[36,5],["use nspaces"],null]],null,[["default"],[{"statements":[[2,"        "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,9],["/${partition}/*/${dc}/namespaces",[30,[36,8],null,[["partition","dc"],[[32,17],[32,16,["Name"]]]]]],null],[30,[36,10],[[32,0],[32,0,["createNspaces"]],[32,2]],null]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[6,[37,1],[[30,[36,5],["use partitions"],null]],null,[["default"],[{"statements":[[2,"        "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,9],["/*/*/${dc}/partitions",[30,[36,8],null,[["dc"],[[32,16,["Name"]]]]]],null],[30,[36,10],[[32,0],[32,0,["createPartitions"]],[32,2]],null]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[6,[37,1],[[32,1,["isCreate"]]],null,[["default"],[{"statements":[[6,[37,1],[[30,[36,7],[[30,[36,5],["use partitions"],null],[30,[36,6],[[30,[36,5],["choose partitions"],[["dc"],[[32,16]]]]],null]],null]],null,[["default"],[{"statements":[[2,"        "],[8,"notice",[],[["@type"],["info"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,9,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"h3"],[12],[2,"\\n              Cross-partition communication not supported\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,9,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              Cross-partition communication is not supported outside of the primary datacenter. You will only be able to select namespaces for source and destination services.\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[9]}]]],[2,"\\n"]],"parameters":[]}]]],[6,[37,1],[[32,0,["isManagedByCRDs"]]],null,[["default"],[{"statements":[[2,"        "],[8,"consul/intention/notice/custom-resource",[],[["@type"],["warning"]],null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"      "],[11,"form"],[4,[38,3],["submit",[30,[36,2],[[32,0,["submit"]],[32,2],[32,1,["submit"]]],null]],null],[12],[2,"\\n        "],[8,"consul/intention/form/fieldsets",[],[["@nspaces","@dc","@partitions","@services","@SourceName","@SourceNS","@SourcePartition","@DestinationName","@DestinationNS","@DestinationPartition","@item","@disabled","@create","@onchange"],[[32,0,["nspaces"]],[32,16],[32,0,["partitions"]],[32,0,["services"]],[32,0,["SourceName"]],[32,0,["SourceNS"]],[32,0,["SourcePartition"]],[32,0,["DestinationName"]],[32,0,["DestinationNS"]],[32,0,["DestinationPartition"]],[32,2],[32,1,["disabled"]],[32,1,["isCreate"]],[32,1,["change"]]]],null],[2,"\\n        "],[10,"div"],[12],[2,"\\n          "],[10,"button"],[15,"disabled",[30,[36,15],[[32,2,["isInvalid"]],[32,1,["disabled"]]],null]],[14,4,"submit"],[12],[2,"\\n            Save\\n          "],[13],[2,"\\n          "],[11,"button"],[16,"disabled",[32,1,["disabled"]]],[24,4,"reset"],[4,[38,3],["click",[30,[36,2],[[32,0,["oncancel"]],[32,2]],null]],null],[12],[2,"\\n            Cancel\\n          "],[13],[2,"\\n"],[6,[37,1],[[30,[36,6],[[32,1,["isCreate"]]],null]],null,[["default"],[{"statements":[[6,[37,1],[[30,[36,4],[[32,2,["ID"]],"anonymous"],null]],null,[["default"],[{"statements":[[2,"          "],[8,"confirmation-dialog",[],[["@message"],["Are you sure you want to delete this Intention?"]],[["default"],[{"statements":[[2,"\\n            "],[8,"block-slot",[],[["@name"],["action"]],[["default"],[{"statements":[[2,"\\n              "],[11,"button"],[24,0,"type-delete"],[16,"disabled",[32,1,["disabled"]]],[24,4,"button"],[4,[38,3],["click",[30,[36,2],[[32,8],[32,1,["delete"]]],null]],null],[12],[2,"\\n                Delete\\n              "],[13],[2,"\\n            "]],"parameters":[8]}]]],[2,"\\n            "],[8,"block-slot",[],[["@name"],["dialog"]],[["default"],[{"statements":[[2,"\\n              "],[8,"delete-confirmation",[],[["@message","@execute","@cancel"],[[32,7],[32,5],[32,6]]],null],[2,"\\n            "]],"parameters":[5,6,7]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"        "],[13],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"\\n"],[6,[37,1],[[32,2,["IsManagedByCRD"]]],null,[["default"],[{"statements":[[2,"      "],[8,"notice",[[24,0,"crd"]],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,4,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[10,"h3"],[12],[2,"\\n            Intention Custom Resource\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,4,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[10,"p"],[12],[2,"\\n            This Intention is view only because it is managed through an Intention Custom Resource in your Kubernetes cluster.\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,4,["Footer"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[10,"p"],[12],[2,"\\n            "],[10,"a"],[15,6,[31,[[30,[36,0],["CONSUL_DOCS_URL"],null],"/k8s/crds"]]],[14,"target","_blank"],[14,"rel","noopener noreferrer"],[12],[2,"Learn more about CRDs"],[13],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n    "],[8,"consul/intention/view",[],[["@item"],[[32,2]]],null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[2,3]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["env","if","fn","on","not-eq","can","not","and","hash","uri","action","concat","capitalize","changeset-get","let","or","notification","string-starts-with"]}',meta:{moduleName:"consul-ui/components/consul/intention/form/index.hbs"}})
+let R=(n=Ember._tracked,r=Ember._tracked,a=Ember._tracked,l=Ember._tracked,s=Ember._tracked,i=Ember._tracked,o=Ember._tracked,u=Ember._tracked,c=Ember._tracked,d=Ember._tracked,m=Ember.inject.service("repository/intention"),p=Ember._action,f=Ember._action,b=Ember._action,h=Ember._action,v=Ember._action,y=Ember._action,g=Ember._action,O=Ember._action,_=Ember._action,P=class extends t.default{constructor(e,t){var n,r,a
+super(...arguments),T(this,"services",w,this),T(this,"SourceName",E,this),T(this,"DestinationName",k,this),T(this,"nspaces",x,this),T(this,"SourceNS",j,this),T(this,"DestinationNS",C,this),T(this,"partitions",S,this),T(this,"SourcePartition",N,this),T(this,"DestinationPartition",z,this),T(this,"isManagedByCRDs",M,this),a=null,(r="modal")in(n=this)?Object.defineProperty(n,r,{value:a,enumerable:!0,configurable:!0,writable:!0}):n[r]=a,T(this,"repo",D,this),this.updateCRDManagement()}ondelete(){this.args.ondelete?this.args.ondelete(...arguments):this.onsubmit(...arguments)}oncancel(){this.args.oncancel?this.args.oncancel(...arguments):this.onsubmit(...arguments)}onsubmit(){this.args.onsubmit&&this.args.onsubmit(...arguments)}updateCRDManagement(){this.isManagedByCRDs=this.repo.isManagedByCRDs()}submit(e,t,n){n.preventDefault(),void 0!==e.change.Action&&void 0===e.data.Action?this.modal.open():t()}createServices(e,t){let n=t.data.uniqBy("Name").toArray().filter(e=>!["connect-proxy","mesh-gateway","terminating-gateway"].includes(e.Kind)).sort((e,t)=>e.Name.localeCompare(t.Name))
+n=[{Name:"*"}].concat(n)
+let r=n.findBy("Name",e.SourceName)
+r||(r={Name:e.SourceName},n=[r].concat(n))
+let a=n.findBy("Name",e.DestinationName)
+a||(a={Name:e.DestinationName},n=[a].concat(n)),this.services=n,this.SourceName=r,this.DestinationName=a}createNspaces(e,t){let n=t.data.toArray().sort((e,t)=>e.Name.localeCompare(t.Name))
+n=[{Name:"*"}].concat(n)
+let r=n.findBy("Name",e.SourceNS)
+r||(r={Name:e.SourceNS},n=[r].concat(n))
+let a=n.findBy("Name",e.DestinationNS)
+a||(a={Name:e.DestinationNS},n=[a].concat(n)),this.nspaces=n,this.SourceNS=r,this.DestinationNS=a}createPartitions(e,t){let n=t.data.toArray().sort((e,t)=>e.Name.localeCompare(t.Name)),r=n.findBy("Name",e.SourcePartition)
+r||(r={Name:e.SourcePartition},n=[r].concat(n))
+let a=n.findBy("Name",e.DestinationPartition)
+a||(a={Name:e.DestinationPartition},n=[a].concat(n)),this.partitions=n,this.SourcePartition=r,this.DestinationPartition=a}change(e,t,n){const r=e.target
+let a,l
+switch(r.name){case"SourceName":case"DestinationName":case"SourceNS":case"DestinationNS":case"SourcePartition":case"DestinationPartition":switch(a=l=r.value,"string"!=typeof a&&(a=r.value.Name),r.value=a,r.name){case"SourceName":case"DestinationName":0===this.services.filterBy("Name",a).length&&(l={Name:a},this.services=[l].concat(this.services.toArray()))
+break
+case"SourceNS":case"DestinationNS":0===this.nspaces.filterBy("Name",a).length&&(l={Name:a},this.nspaces=[l].concat(this.nspaces.toArray()))
+break
+case"SourcePartition":case"DestinationPartition":0===this.partitions.filterBy("Name",a).length&&(l={Name:a},this.partitions=[l].concat(this.partitions.toArray()))}this[r.name]=l}t.handleEvent(e)}},w=L(P.prototype,"services",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=L(P.prototype,"SourceName",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=L(P.prototype,"DestinationName",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=L(P.prototype,"nspaces",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=L(P.prototype,"SourceNS",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=L(P.prototype,"DestinationNS",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=L(P.prototype,"partitions",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=L(P.prototype,"SourcePartition",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=L(P.prototype,"DestinationPartition",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=L(P.prototype,"isManagedByCRDs",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=L(P.prototype,"repo",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L(P.prototype,"ondelete",[p],Object.getOwnPropertyDescriptor(P.prototype,"ondelete"),P.prototype),L(P.prototype,"oncancel",[f],Object.getOwnPropertyDescriptor(P.prototype,"oncancel"),P.prototype),L(P.prototype,"onsubmit",[b],Object.getOwnPropertyDescriptor(P.prototype,"onsubmit"),P.prototype),L(P.prototype,"updateCRDManagement",[h],Object.getOwnPropertyDescriptor(P.prototype,"updateCRDManagement"),P.prototype),L(P.prototype,"submit",[v],Object.getOwnPropertyDescriptor(P.prototype,"submit"),P.prototype),L(P.prototype,"createServices",[y],Object.getOwnPropertyDescriptor(P.prototype,"createServices"),P.prototype),L(P.prototype,"createNspaces",[g],Object.getOwnPropertyDescriptor(P.prototype,"createNspaces"),P.prototype),L(P.prototype,"createPartitions",[O],Object.getOwnPropertyDescriptor(P.prototype,"createPartitions"),P.prototype),L(P.prototype,"change",[_],Object.getOwnPropertyDescriptor(P.prototype,"change"),P.prototype),P)
+e.default=R,Ember._setComponentTemplate(A,R)})),define("consul-ui/components/consul/intention/list/check/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"7ITVRz58",block:'{"symbols":["titles","@item","&attrs"],"statements":[[6,[37,8],[[30,[36,7],[[30,[36,6],[[30,[36,6],["allow","Allowed"],null],[30,[36,6],["deny","Denied"],null],[30,[36,6],["","Layer 7 Rules"],null]],null]],null]],null,[["default"],[{"statements":[[11,"div"],[16,0,[30,[36,4],["consul-intention-list-check ","notice ",[30,[36,3],[[32,2,["Action"]],"permissions"],null]],null]],[17,3],[12],[2,"\\n  "],[10,"h3"],[12],[2,"\\n    "],[1,[30,[36,5],[[32,1],[30,[36,3],[[32,2,["Action"]],""],null]],null]],[2,"\\n  "],[13],[2,"\\n  "],[10,"p"],[12],[2,"\\n"],[6,[37,1],[[30,[36,0],[[32,2,["Action"]],"allow"],null]],null,[["default","else"],[{"statements":[[2,"    Yes, "],[1,[35,2,["SourceName"]]],[2," is allowed to connect to "],[1,[32,2,["DestinationName"]]],[2," due to the highest precedence intention below:\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,0],[[32,2,["Action"]],"deny"],null]],null,[["default","else"],[{"statements":[[2,"    No, "],[1,[32,2,["SourceName"]]],[2," is not allowed to connect to "],[1,[32,2,["DestinationName"]]],[2," due to the highest precedence intention below:\\n"]],"parameters":[]},{"statements":[[2,"    "],[1,[32,2,["SourceName"]]],[2," may or may not be allowed to connect with "],[1,[32,2,["DestinationName"]]],[2," through its Layer 7 rules.\\n  "]],"parameters":[]}]]]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n"],[13],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["eq","if","item","or","concat","get","array","from-entries","let"]}',meta:{moduleName:"consul-ui/components/consul/intention/list/check/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/intention/list/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s,i
+function o(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function u(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const c=Ember.HTMLBars.template({id:"npl02ASn",block:'{"symbols":["&attrs","@items","@delete","&default"],"statements":[[11,"div"],[24,0,"consul-intention-list"],[17,1],[4,[38,0],[[32,0,["updateCRDManagement"]],[32,2]],null],[12],[2,"\\n"],[18,4,[[30,[36,3],null,[["Table","CheckNotice","CustomResourceNotice"],[[30,[36,1],["consul/intention/list/table"],[["delete","items"],[[32,3],[32,0,["items"]]]]],[30,[36,2],[[32,0,["checkedItem"]],[30,[36,1],["consul/intention/list/check"],[["item"],[[32,0,["checkedItem"]]]]],""],null],[30,[36,2],[[32,0,["isManagedByCRDs"]],[30,[36,1],["consul/intention/notice/custom-resource"],null],""],null]]]]]],[2,"\\n"],[13]],"hasEval":false,"upvars":["did-update","component","if","hash"]}',meta:{moduleName:"consul-ui/components/consul/intention/list/index.hbs"}})
+let d=(n=Ember.inject.service("repository/intention"),r=Ember._tracked,a=Ember._action,l=class extends t.default{constructor(e,t){super(...arguments),o(this,"repo",s,this),o(this,"isManagedByCRDs",i,this),this.updateCRDManagement(t.items)}get items(){return this.args.items||[]}get checkedItem(){return 1===this.items.length&&this.args.check&&this.items[0].SourceName===this.args.check?this.items[0]:null}updateCRDManagement(){this.isManagedByCRDs=this.repo.isManagedByCRDs()}},s=u(l.prototype,"repo",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i=u(l.prototype,"isManagedByCRDs",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u(l.prototype,"updateCRDManagement",[a],Object.getOwnPropertyDescriptor(l.prototype,"updateCRDManagement"),l.prototype),l)
+e.default=d,Ember._setComponentTemplate(c,d)})),define("consul-ui/components/consul/intention/list/table/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"3cYAAMVS",block:'{"symbols":["item","index","index","change","checked","confirm","send","keypressClick","change","__arg0","__arg1","Actions","__arg0","__arg1","Actions","@routeName","@delete","&attrs","@items"],"statements":[[8,"tabular-collection",[[24,0,"consul-intention-list-table"],[17,18]],[["@items","@rowHeight"],[[32,19],59]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"th"],[14,0,"source"],[12],[2,"Source"],[13],[2,"\\n        "],[10,"th"],[14,0,"intent"],[12],[2," "],[13],[2,"\\n        "],[10,"th"],[14,0,"destination"],[12],[2,"Destination"],[13],[2,"\\n        "],[10,"th"],[14,0,"permissions"],[12],[2,"\\n          Permissions\\n          "],[10,"span"],[12],[2,"\\n            "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"Permissions intercept an Intention\'s traffic using Layer 7 criteria, such as path prefixes and http headers."]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"th"],[14,0,"meta"],[12],[2," "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["row"]],[["default"],[{"statements":[[2,"\\n        "],[10,"td"],[14,0,"source"],[12],[2,"\\n          "],[10,"a"],[15,6,[30,[36,1],[[30,[36,0],[[32,16],"dc.intentions.edit"],null],[32,1,["ID"]]],null]],[12],[2,"\\n"],[6,[37,5],[[30,[36,11],[[32,1,["SourceName"]],"*"],null]],null,[["default","else"],[{"statements":[[2,"              All Services (*)\\n"]],"parameters":[]},{"statements":[[2,"              "],[1,[32,1,["SourceName"]]],[2,"\\n"]],"parameters":[]}]]],[6,[37,5],[[30,[36,0],[[30,[36,7],["use nspaces"],null],[30,[36,7],["use partitions"],null]],null]],null,[["default"],[{"statements":[[2,"            "],[10,"em"],[12],[2,"\\n              "],[10,"span"],[15,0,[30,[36,13],["partition-",[30,[36,0],[[32,1,["SourcePartition"]],"default"],null]],null]],[12],[1,[30,[36,0],[[32,1,["SourcePartition"]],"default"],null]],[13],[2," / "],[10,"span"],[15,0,[30,[36,13],["nspace-",[30,[36,0],[[32,1,["SourceNS"]],"default"],null]],null]],[12],[1,[30,[36,0],[[32,1,["SourceNS"]],"default"],null]],[13],[2,"\\n            "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"td"],[15,0,[31,["intent intent-",[30,[36,14],[[32,1,["Action"]]],null]]]],[12],[2,"\\n          "],[10,"strong"],[12],[1,[30,[36,15],[[30,[36,0],[[32,1,["Action"]],"App aware"],null]],null]],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"td"],[14,0,"destination"],[12],[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,5],[[30,[36,11],[[32,1,["DestinationName"]],"*"],null]],null,[["default","else"],[{"statements":[[2,"              All Services (*)\\n"]],"parameters":[]},{"statements":[[2,"              "],[1,[32,1,["DestinationName"]]],[2,"\\n"]],"parameters":[]}]]],[6,[37,5],[[30,[36,0],[[30,[36,7],["use nspaces"],null],[30,[36,7],["use partitions"],null]],null]],null,[["default"],[{"statements":[[2,"            "],[10,"em"],[12],[2,"\\n              "],[10,"span"],[15,0,[30,[36,13],["partition-",[30,[36,0],[[32,1,["DestinationPartition"]],"default"],null]],null]],[12],[1,[30,[36,0],[[32,1,["DestinationPartition"]],"default"],null]],[13],[2," / "],[10,"span"],[15,0,[30,[36,13],["nspace-",[30,[36,0],[[32,1,["DestinationNS"]],"default"],null]],null]],[12],[1,[30,[36,0],[[32,1,["DestinationNS"]],"default"],null]],[13],[2,"\\n            "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"td"],[14,0,"permissions"],[12],[2,"\\n"],[6,[37,5],[[30,[36,16],[[32,1,["Permissions","length"]],0],null]],null,[["default"],[{"statements":[[2,"            "],[10,"span"],[12],[1,[30,[36,12],[[32,1,["Permissions","length"]],"Permission"],null]],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[13],[2,"\\n        "],[10,"td"],[14,0,"meta"],[12],[2,"\\n"],[6,[37,5],[[32,1,["IsManagedByCRD"]]],null,[["default"],[{"statements":[[2,"          "],[8,"consul/external-source",[],[["@item","@label"],[[32,1],"Managed by CRD"]],null],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"],[6,[37,5],[[30,[36,18],[[30,[36,0],[[30,[36,7],["write intention"],[["item"],[[32,1]]]],[30,[36,7],["view CRD intention"],[["item"],[[32,1]]]]],null],[30,[36,17],[[32,1,["Meta","external-source"]],"consul-api-gateway"],null]],null]],null,[["default"],[{"statements":[[2,"    "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n      "],[8,"popover-menu",[],[["@expanded","@onchange","@keyboardAccess"],[[30,[36,5],[[30,[36,11],[[32,5],[32,3]],null],true,false],null],[30,[36,2],[[32,0],[32,4],[32,3]],null],false]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["trigger"]],[["default"],[{"statements":[[2,"\\n          More\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["menu"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,7],["write intention"],[["item"],[[32,1]]]]],null,[["default","else"],[{"statements":[[2,"            "],[10,"li"],[14,"role","none"],[12],[2,"\\n              "],[10,"a"],[14,"role","menuitem"],[14,"tabindex","-1"],[15,6,[30,[36,1],[[30,[36,0],[[35,10],"dc.intentions.edit"],null],[32,1,["ID"]]],null]],[12],[2,"Edit"],[13],[2,"\\n            "],[13],[2,"\\n            "],[10,"li"],[14,"role","none"],[14,0,"dangerous"],[12],[2,"\\n              "],[10,"label"],[15,"for",[32,6]],[14,"role","menuitem"],[14,"tabindex","-1"],[15,"onkeypress",[32,8]],[12],[2,"Delete"],[13],[2,"\\n              "],[10,"div"],[14,"role","menu"],[12],[2,"\\n                "],[8,"informed-action",[[24,0,"warning"]],[["@namedBlocksInfo"],[[30,[36,6],null,[["header","body","actions"],[0,0,1]]]]],[["default"],[{"statements":[[6,[37,5],[[30,[36,4],[[32,13],"header"],null]],null,[["default","else"],[{"statements":[[2,"\\n                    Confirm Delete\\n                  "]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,4],[[32,13],"body"],null]],null,[["default","else"],[{"statements":[[2,"\\n                    "],[10,"p"],[12],[2,"\\n                      Are you sure you want to delete this intention?\\n                    "],[13],[2,"\\n                  "]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,4],[[32,13],"actions"],null]],null,[["default"],[{"statements":[[6,[37,3],[[32,14]],null,[["default"],[{"statements":[[2,"\\n                    "],[8,[32,15,["Action"]],[[24,0,"dangerous"]],[[],[]],[["default"],[{"statements":[[2,"\\n                      "],[8,"action",[[24,0,"type-delete"],[24,"tabindex","-1"],[4,[38,9],["click",[30,[36,8],[[30,[36,2],[[32,0],[32,9]],null],[30,[36,2],[[32,0],[32,17],[32,1]],null]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n                        Delete\\n                      "]],"parameters":[]}]]],[2,"\\n                    "]],"parameters":[]}]]],[2,"\\n                    "],[8,[32,15,["Action"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                      "],[8,"action",[],[["@for"],[[32,6]]],[["default"],[{"statements":[[2,"\\n                        Cancel\\n                      "]],"parameters":[]}]]],[2,"\\n                    "]],"parameters":[]}]]],[2,"\\n                  "]],"parameters":[15]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[13,14]}]]],[2,"\\n              "],[13],[2,"\\n            "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,7],["view CRD intention"],[["item"],[[32,1]]]]],null,[["default"],[{"statements":[[2,"            "],[10,"li"],[14,"role","none"],[12],[2,"\\n              "],[10,"div"],[14,"role","menu"],[12],[2,"\\n                "],[8,"informed-action",[[24,0,"info kubernetes"]],[["@namedBlocksInfo"],[[30,[36,6],null,[["header","body","actions"],[0,0,1]]]]],[["default"],[{"statements":[[6,[37,5],[[30,[36,4],[[32,10],"header"],null]],null,[["default","else"],[{"statements":[[2,"\\n                    Managed by CRD\\n                  "]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,4],[[32,10],"body"],null]],null,[["default","else"],[{"statements":[[2,"\\n                    "],[10,"p"],[12],[2,"\\n                      This intention is being managed through an Intention Custom Resource in your Kubernetes cluster. It is view only in the UI.\\n                    "],[13],[2,"\\n                  "]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,4],[[32,10],"actions"],null]],null,[["default"],[{"statements":[[6,[37,3],[[32,11]],null,[["default"],[{"statements":[[2,"\\n                    "],[8,[32,12,["Action"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                      "],[8,"action",[[24,"tabindex","-1"],[24,0,"action"]],[["@href"],[[30,[36,1],[[30,[36,0],[[32,16],"dc.intentions.edit"],null],[32,1,["ID"]]],null]]],[["default"],[{"statements":[[2,"\\n                        View\\n                      "]],"parameters":[]}]]],[2,"\\n                    "]],"parameters":[]}]]],[2,"\\n                    "],[8,[32,12,["Action"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                      "],[8,"action",[],[["@onclick"],[[30,[36,2],[[32,0],[32,9]],null]]],[["default"],[{"statements":[[2,"\\n                        Cancel\\n                      "]],"parameters":[]}]]],[2,"\\n                    "]],"parameters":[]}]]],[2,"\\n                  "]],"parameters":[12]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[10,11]}]]],[2,"\\n              "],[13],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]]],"parameters":[]}]]],[2,"        "]],"parameters":[6,7,8,9]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[3,4,5]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["or","href-to","action","let","-is-named-block-invocation","if","hash","can","queue","on","routeName","eq","pluralize","concat","slugify","capitalize","gt","not-eq","and"]}',meta:{moduleName:"consul-ui/components/consul/intention/list/table/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/intention/notice/custom-resource/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"50F/MLBP",block:'{"symbols":["notice","&attrs","@type"],"statements":[[8,"notice",[[24,0,"consul-intention-notice-custom-resource crd"],[17,2]],[["@type"],[[30,[36,0],[[32,3],"info"],null]]],[["default"],[{"statements":[[2,"\\n  "],[8,[32,1,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n    "],[10,"h3"],[12],[2,"\\n      Intention Custom Resource\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,[32,1,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n    "],[10,"p"],[12],[2,"\\n      Some of your intentions are being managed through an Intention Custom Resource in your Kubernetes cluster. Those managed intentions will be view only in the UI. Any intentions created in the UI will work but will not be synced to the Custom Resource Definition (CRD) datastore.\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,[32,1,["Footer"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n    "],[10,"p"],[12],[2,"\\n      "],[10,"a"],[15,6,[31,[[30,[36,1],["CONSUL_DOCS_URL"],null],"/k8s/crds"]]],[14,"target","_blank"],[14,"rel","noopener noreferrer"],[12],[2,"Learn more about CRDs"],[13],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["or","env"]}',meta:{moduleName:"consul-ui/components/consul/intention/notice/custom-resource/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/intention/notice/permissions/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"HoDXcnya",block:'{"symbols":["notice"],"statements":[[8,"notice",[],[["@type"],["info"]],[["default"],[{"statements":[[2,"\\n  "],[8,[32,1,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n    "],[10,"p"],[12],[2,"\\n      "],[1,[30,[36,0],["components.consul.intention.notice.permissions.body"],null]],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,[32,1,["Footer"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n    "],[10,"p"],[12],[2,"\\n      "],[10,"a"],[15,6,[31,[[30,[36,1],["CONSUL_DOCS_URL"],null],"/connect/intentions"]]],[14,"target","_blank"],[14,"rel","noopener noreferrer"],[12],[2,"\\n        "],[1,[30,[36,0],["components.consul.intention.notice.permissions.footer"],null]],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n\\n"]],"hasEval":false,"upvars":["t","env"]}',meta:{moduleName:"consul-ui/components/consul/intention/notice/permissions/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/intention/notifications/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"mgi1y+sM",block:'{"symbols":["error","@status","@type","@error"],"statements":[[6,[37,1],[[30,[36,2],[[32,3],"create"],null]],null,[["default","else"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    Your intention has been added.\\n"]],"parameters":[]},{"statements":[[2,"    There was an error adding your intention.\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,2],[[32,3],"update"],null]],null,[["default","else"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    Your intention has been saved.\\n"]],"parameters":[]},{"statements":[[2,"    There was an error saving your intention.\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,2],[[32,3],"delete"],null]],null,[["default"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    Your intention was deleted.\\n"]],"parameters":[]},{"statements":[[2,"    There was an error deleting your intention.\\n"]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[6,[37,3],[[32,4,["errors","firstObject"]]],null,[["default"],[{"statements":[[6,[37,1],[[32,1,["detail"]]],null,[["default"],[{"statements":[[2,"    "],[10,"br"],[12],[13],[1,[30,[36,0],["(",[30,[36,1],[[32,1,["status"]],[30,[36,0],[[32,1,["status"]],": "],null]],null],[32,1,["detail"]],")"],null]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["concat","if","eq","let"]}',meta:{moduleName:"consul-ui/components/consul/intention/notifications/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/intention/permission/form/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"jlM2y89J",block:'{"symbols":["group","headerForm","headerList","method","el","el","el","Type","intent","&attrs","&default"],"statements":[[11,"div"],[17,10],[24,0,"consul-intention-permission-form"],[12],[2,"\\n"],[8,"form-group",[],[["@name"],[[34,14]]],[["default"],[{"statements":[[2,"\\n\\n  "],[18,11,[[30,[36,16],null,[["submit","reset","isDirty","changeset"],[[30,[36,3],[[32,0],"submit",[35,0]],null],[30,[36,3],[[32,0],"reset",[35,0]],null],[30,[36,15],[[35,0,["isValid"]]],null],[35,0]]]]]],[2,"\\n\\n  "],[10,"fieldset"],[12],[2,"\\n    "],[10,"div"],[14,"data-property","action"],[12],[2,"\\n      "],[10,"span"],[14,0,"label"],[12],[2,"\\n        Should this permission allow the source connect to the destination?\\n      "],[13],[2,"\\n      "],[10,"div"],[14,"role","radiogroup"],[15,0,[30,[36,2],[[35,0,["error","Action"]]," has-error"],null]],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,5],[[35,17]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[10,"label"],[12],[2,"\\n            "],[10,"span"],[12],[1,[30,[36,12],[[32,9]],null]],[13],[2,"\\n            "],[10,"input"],[14,3,"Action"],[15,2,[32,9]],[15,"checked",[30,[36,2],[[30,[36,11],[[35,0,["Action"]],[32,9]],null],"checked"],null]],[15,"onchange",[30,[36,3],[[32,0],[30,[36,13],[[35,0],"Action"],null]],[["value"],["target.value"]]]],[14,4,"radio"],[12],[13],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[9]}]]],[2,"      "],[13],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n\\n  "],[10,"fieldset"],[12],[2,"\\n    "],[10,"header"],[12],[2,"\\n      "],[10,"h2"],[12],[2,"Path"],[13],[2,"\\n    "],[13],[2,"\\n    "],[10,"div"],[12],[2,"\\n        "],[8,[32,1,["Element"]],[],[["@name","@type"],["PathType","select"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,7,["Label"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            Path type\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"power-select",[],[["@options","@selected","@onChange"],[[34,18],[34,8],[30,[36,3],[[32,0],"change","HTTP.PathType",[35,0]],null]]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,10],[[35,9],[32,8]],null]],[2,"\\n          "]],"parameters":[8]}]]],[2,"\\n        "]],"parameters":[7]}]]],[2,"\\n\\n"],[6,[37,2],[[35,19]],null,[["default"],[{"statements":[[2,"        "],[8,[32,1,["Element"]],[],[["@name","@error"],["Path",[30,[36,7],[[35,0],"error.HTTP.Path"],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6,["Label"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,10],[[35,9],[35,8]],null]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6,["Text"]],[[16,"oninput",[30,[36,3],[[32,0],"change","HTTP.Path",[35,0]],null]]],[["@value"],[[30,[36,7],[[35,0],"HTTP.Path"],null]]],null],[2,"\\n          "],[8,"state",[],[["@state","@matches"],[[32,6,["state"]],"error"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6,["Error"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n"],[6,[37,2],[[30,[36,11],[[30,[36,7],[[35,0],"HTTP.Path"],null],"Regex"],null]],null,[["default","else"],[{"statements":[[2,"                Path Regex should not be blank\\n"]],"parameters":[]},{"statements":[[2,"                Path should begin with a \'/\'\\n"]],"parameters":[]}]]],[2,"            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[6]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n\\n  "],[10,"fieldset"],[12],[2,"\\n    "],[10,"h2"],[12],[2,"Methods"],[13],[2,"\\n    "],[10,"div"],[14,0,"type-toggle"],[12],[2,"\\n      "],[10,"span"],[12],[2,"All methods are applied by default unless specified"],[13],[2,"\\n      "],[8,[32,1,["Element"]],[],[["@name"],["allMethods"]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,5,["Checkbox"]],[[16,"checked",[30,[36,2],[[35,20],"checked"],null]],[16,"onchange",[30,[36,3],[[32,0],"change","allMethods",[35,0]],null]]],[[],[]],null],[2,"\\n        "],[8,[32,5,["Label"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          All Methods\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[5]}]]],[2,"\\n    "],[13],[2,"\\n\\n"],[6,[37,2],[[35,21]],null,[["default"],[{"statements":[[2,"    "],[10,"div"],[14,0,"checkbox-group"],[14,"role","group"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,5],[[35,4]],null]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"label"],[14,0,"type-checkbox"],[12],[2,"\\n          "],[10,"input"],[14,3,"method"],[15,2,[32,4]],[15,"checked",[30,[36,2],[[30,[36,1],[[32,4],[35,0,["HTTP","Methods"]]],null],"checked"],null]],[15,"onchange",[30,[36,3],[[32,0],"change","method",[35,0]],null]],[14,4,"checkbox"],[12],[13],[2,"\\n          "],[10,"span"],[12],[1,[32,4]],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[4]}]]],[2,"    "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n\\n  "],[10,"fieldset"],[12],[2,"\\n    "],[10,"h2"],[12],[2,"Headers"],[13],[2,"\\n\\n    "],[8,"consul/intention/permission/header/list",[],[["@items","@ondelete"],[[30,[36,7],[[35,0],"HTTP.Header"],null],[30,[36,3],[[32,0],"delete","HTTP.Header",[35,0]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "]],"parameters":[3]}]]],[2,"\\n\\n    "],[8,"consul/intention/permission/header/form",[],[["@onsubmit"],[[30,[36,3],[[32,0],"add","HTTP.Header",[35,0]],null]]],[["default"],[{"statements":[[2,"\\n      "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"headerForm",[32,2]]],null],[2,"\\n    "]],"parameters":[2]}]]],[2,"\\n\\n    "],[10,"button"],[14,0,"type-submit"],[15,"disabled",[30,[36,2],[[30,[36,22],[[32,0,["headerForm","isDirty"]]],null],"disabled"],null]],[15,"onclick",[30,[36,3],[[32,0],[32,0,["headerForm","submit"]]],null]],[14,4,"button"],[12],[2,"\\n      Add"],[6,[37,2],[[30,[36,23],[[30,[36,10],[[30,[36,7],[[35,0],"HTTP.Header"],null],"length"],null],0],null]],null,[["default"],[{"statements":[[2," another"]],"parameters":[]}]]],[2," header\\n    "],[13],[2,"\\n    "],[10,"button"],[14,0,"type-cancel"],[15,"onclick",[30,[36,3],[[32,0],[32,0,["headerForm","reset"]]],null]],[14,4,"button"],[12],[2,"\\n      Cancel\\n    "],[13],[2,"\\n\\n  "],[13],[2,"\\n  "]],"parameters":[1]}]]],[2,"\\n"],[13]],"hasEval":false,"upvars":["changeset","contains","if","action","methods","-track-array","each","changeset-get","pathType","pathLabels","get","eq","capitalize","changeset-set","name","and","hash","intents","pathTypes","shouldShowPathField","allMethods","shouldShowMethods","not","gt"]}',meta:{moduleName:"consul-ui/components/consul/intention/permission/form/index.hbs"}}),n="intention-permission"
+var r=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:"",name:n,schema:Ember.inject.service("schema"),change:Ember.inject.service("change"),repo:Ember.inject.service("repository/"+n),onsubmit:function(){},onreset:function(){},intents:Ember.computed.alias(`schema.${n}.Action.allowedValues`),methods:Ember.computed.alias(`schema.${n}-http.Methods.allowedValues`),pathProps:Ember.computed.alias(`schema.${n}-http.PathType.allowedValues`),pathTypes:Ember.computed("pathProps",(function(){return["NoPath"].concat(this.pathProps)})),pathLabels:Ember.computed((function(){return{NoPath:"No Path",PathExact:"Exact",PathPrefix:"Prefixed by",PathRegex:"Regular Expression"}})),pathInputLabels:Ember.computed((function(){return{PathExact:"Exact Path",PathPrefix:"Path Prefix",PathRegex:"Path Regular Expression"}})),changeset:Ember.computed("item",(function(){const e=this.change.changesetFor(n,this.item||this.repo.create())
+return e.isNew&&e.validate(),e})),pathType:Ember.computed("changeset._changes.HTTP.PathType","pathTypes.firstObject",(function(){return this.changeset.HTTP.PathType||this.pathTypes.firstObject})),noPathType:Ember.computed.equal("pathType","NoPath"),shouldShowPathField:Ember.computed.not("noPathType"),allMethods:!1,shouldShowMethods:Ember.computed.not("allMethods"),didReceiveAttrs:function(){Ember.get(this,"item.HTTP.Methods.length")||Ember.set(this,"allMethods",!0)},actions:{change:function(e,t,n){const r=void 0!==Ember.get(n,"target.value")?n.target.value:n
+switch(e){case"allMethods":Ember.set(this,e,n.target.checked)
+break
+case"method":n.target.checked?this.actions.add.apply(this,["HTTP.Methods",t,r]):this.actions.delete.apply(this,["HTTP.Methods",t,r])
+break
+default:t.set(e,r)}t.validate()},add:function(e,t,n){t.pushObject(e,n),t.validate()},delete:function(e,t,n){t.removeObject(e,n),t.validate()},submit:function(e){void 0!==e.changes.find(({key:e,value:t})=>"HTTP.PathType"===e||"HTTP.Path"===e)&&(this.pathProps.forEach(t=>{e.set("HTTP."+t,void 0)}),"NoPath"!==e.HTTP.PathType&&e.set("HTTP."+e.HTTP.PathType,e.HTTP.Path)),this.allMethods&&e.set("HTTP.Methods",null),delete e._changes.HTTP.PathType,delete e._changes.HTTP.Path,this.repo.persist(e),this.onsubmit(e.data)},reset:function(e){e.rollback(),this.onreset(e.data)}}}))
+e.default=r})),define("consul-ui/components/consul/intention/permission/header/form/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"iPtOEBL6",block:'{"symbols":["group","el","el","el","Type","&attrs","&default"],"statements":[[11,"div"],[17,6],[24,0,"consul-intention-permission-header-form"],[12],[2,"\\n  "],[8,"form-group",[],[["@name"],[[34,7]]],[["default"],[{"statements":[[2,"\\n\\n    "],[18,7,[[30,[36,9],null,[["submit","reset","isDirty","changeset"],[[30,[36,6],[[32,0],"submit",[35,0]],null],[30,[36,6],[[32,0],"reset",[35,0]],null],[30,[36,8],[[35,0,["isValid"]],[35,0,["isDirty"]]],null],[35,0]]]]]],[2,"\\n\\n    "],[10,"fieldset"],[12],[2,"\\n      "],[10,"div"],[12],[2,"\\n        "],[8,[32,1,["Element"]],[],[["@name","@type"],["HeaderType","select"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,4,["Label"]],[],[[],[]],[["default"],[{"statements":[[2,"Header type"]],"parameters":[]}]]],[2,"\\n          "],[8,"power-select",[],[["@options","@selected","@onChange"],[[34,10],[34,2],[30,[36,6],[[32,0],"change","HeaderType",[35,0]],null]]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,4],[[35,3],[32,5]],null]],[2,"\\n          "]],"parameters":[5]}]]],[2,"\\n        "]],"parameters":[4]}]]],[2,"\\n\\n\\n        "],[8,[32,1,["Element"]],[],[["@name","@error"],["Name",[30,[36,1],[[35,0],"error.Name"],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,3,["Label"]],[],[[],[]],[["default"],[{"statements":[[2,"Header name"]],"parameters":[]}]]],[2,"\\n          "],[8,[32,3,["Text"]],[[16,"oninput",[30,[36,6],[[32,0],"change","Name",[35,0]],null]]],[["@value"],[[30,[36,1],[[35,0],"Name"],null]]],null],[2,"\\n          "],[8,"state",[],[["@state","@matches"],[[32,3,["state"]],"error"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,3,["Error"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,1],[[35,0],"error.Name.validation"],null]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[3]}]]],[2,"\\n\\n"],[6,[37,12],[[35,11]],null,[["default"],[{"statements":[[2,"        "],[8,[32,1,["Element"]],[],[["@name","@error"],["Value",[30,[36,1],[[35,0],"error.Value"],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,2,["Label"]],[],[[],[]],[["default"],[{"statements":[[2,"Header "],[1,[30,[36,5],[[30,[36,4],[[35,3],[35,2]],null]],null]]],"parameters":[]}]]],[2,"\\n          "],[8,[32,2,["Text"]],[[16,"oninput",[30,[36,6],[[32,0],"change","Value",[35,0]],null]]],[["@value"],[[30,[36,1],[[35,0],"Value"],null]]],null],[2,"\\n          "],[8,"state",[],[["@state","@matches"],[[32,2,["state"]],"error"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,2,["Error"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,1],[[35,0],"error.Value.validation"],null]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[1]}]]],[2,"\\n"],[13]],"hasEval":false,"upvars":["changeset","changeset-get","headerType","headerLabels","get","lowercase","action","name","and","hash","headerTypes","shouldShowValueField","if"]}',meta:{moduleName:"consul-ui/components/consul/intention/permission/header/form/index.hbs"}}),n="intention-permission-http-header"
+var r=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:"",name:n,schema:Ember.inject.service("schema"),change:Ember.inject.service("change"),repo:Ember.inject.service("repository/"+n),onsubmit:function(){},onreset:function(){},changeset:Ember.computed("item",(function(){return this.change.changesetFor(n,this.item||this.repo.create({HeaderType:this.headerTypes.firstObject}))})),headerTypes:Ember.computed.alias(`schema.${n}.HeaderType.allowedValues`),headerLabels:Ember.computed((function(){return{Exact:"Exactly Matching",Prefix:"Prefixed by",Suffix:"Suffixed by",Regex:"Regular Expression",Present:"Is present"}})),headerType:Ember.computed("changeset.HeaderType","headerTypes.firstObject",(function(){return this.changeset.HeaderType||this.headerTypes.firstObject})),headerTypeEqualsPresent:Ember.computed.equal("headerType","Present"),shouldShowValueField:Ember.computed.not("headerTypeEqualsPresent"),actions:{change:function(e,t,n){const r=void 0!==Ember.get(n,"target.value")?n.target.value:n
+t.set(e,r),t.validate()},submit:function(e){this.headerTypes.forEach(t=>{e.set(t,void 0)})
+const t="Present"===e.HeaderType||e.Value
+e.set(e.HeaderType,t),delete e._changes.HeaderType,delete e._changes.Value,this.repo.persist(e),this.onsubmit(e.data),Ember.set(this,"item",this.repo.create({HeaderType:this.headerType}))},reset:function(e){e.rollback()}}}))
+e.default=r})),define("consul-ui/components/consul/intention/permission/header/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"GtepE94Y",block:'{"symbols":["item","Actions","Action","Confirmation","Confirm"],"statements":[[6,[37,5],[[30,[36,4],[[35,0,["length"]],0],null]],null,[["default"],[{"statements":[[8,"list-collection",[[24,0,"consul-intention-permission-header-list"]],[["@items","@scroll","@cellHeight"],[[34,0],"native",42]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n    "],[10,"dl"],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n          Header\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[1,[32,1,["Name"]]],[2," "],[1,[30,[36,1],[[32,1]],null]],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n    "],[8,[32,2],[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,[32,3],[[24,0,"dangerous"]],[["@onclick"],[[30,[36,3],[[32,0],[35,2],[32,1]],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n          Delete\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["confirmation"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,4],[[24,0,"warning"]],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n              Confirm delete\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n              "],[10,"p"],[12],[2,"\\n                Are you sure you want to delete this header?\\n              "],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,"block-slot",[],[["@name"],["confirm"]],[["default"],[{"statements":[[2,"\\n              "],[8,[32,5],[],[[],[]],[["default"],[{"statements":[[2,"Delete"]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[5]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[4]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[3]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["items","route-match","ondelete","action","gt","if"]}',meta:{moduleName:"consul-ui/components/consul/intention/permission/header/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:""}))
+e.default=n})),define("consul-ui/components/consul/intention/permission/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"O6TCv5DN",block:'{"symbols":["item","Actions","Action","Confirmation","Confirm","item","item"],"statements":[[6,[37,8],[[30,[36,12],[[35,9,["length"]],0],null]],null,[["default"],[{"statements":[[8,"list-collection",[[16,0,[31,["consul-intention-permission-list",[30,[36,8],[[30,[36,7],[[35,0]],null]," readonly"],null]]]]],[["@scroll","@items","@partial"],["native",[34,9],5]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n    "],[10,"div"],[15,"onclick",[30,[36,2],[[32,0],[30,[36,1],[[35,0]],null],[32,1]],null]],[12],[2,"\\n      "],[10,"strong"],[15,0,[30,[36,10],["intent-",[32,1,["Action"]]],null]],[12],[1,[30,[36,11],[[32,1,["Action"]]],null]],[13],[2,"\\n"],[6,[37,8],[[30,[36,12],[[32,1,["HTTP","Methods","length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[10,"dl"],[14,0,"permission-methods"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n            "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n              Methods\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,5],[[32,1,["HTTP","Methods"]]],null]],null]],null,[["default"],[{"statements":[[2,"            "],[1,[32,7]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,8],[[32,1,["HTTP","Path"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dl"],[14,0,"permission-path"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n            "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[1,[32,1,["HTTP","PathType"]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[1,[32,1,["HTTP","Path"]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,6],[[30,[36,5],[[30,[36,5],[[32,1,["HTTP","Header"]]],null]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"dl"],[14,0,"permission-header"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n            "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n              Header\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[1,[32,6,["Name"]]],[2," "],[1,[30,[36,4],[[32,6]],null]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[6]}]]],[2,"    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"],[6,[37,8],[[35,0]],null,[["default"],[{"statements":[[2,"  "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n    "],[8,[32,2],[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,[32,3],[],[["@onclick","@close"],[[30,[36,2],[[32,0],[30,[36,1],[[35,0]],null],[32,1]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n          Edit\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,[32,3],[[24,0,"dangerous"]],[["@onclick"],[[30,[36,2],[[32,0],[35,3],[32,1]],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n          Delete\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["confirmation"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,4],[[24,0,"warning"]],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n              Confirm delete\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n              "],[10,"p"],[12],[2,"\\n                Are you sure you want to delete this permission?\\n              "],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,"block-slot",[],[["@name"],["confirm"]],[["default"],[{"statements":[[2,"\\n              "],[8,[32,5],[],[[],[]],[["default"],[{"statements":[[2,"Delete"]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[5]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[4]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[3]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["onclick","optional","action","ondelete","route-match","-track-array","each","not","if","items","concat","capitalize","gt"]}',meta:{moduleName:"consul-ui/components/consul/intention/permission/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:""}))
+e.default=n})),define("consul-ui/components/consul/intention/search-bar/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"302KbrGO",block:'{"symbols":["__arg0","__arg1","search","components","Optgroup","Option","selectable","search","components","Optgroup","Option","item","search","components","Optgroup","Option","prop","search","key","value","@sort","@filter","@onsearch","@search","&attrs"],"statements":[[8,"search-bar",[[24,0,"consul-intention-search-bar"],[17,25]],[["@filter","@namedBlocksInfo"],[[32,22],[30,[36,15],null,[["status","search","filter","sort"],[1,1,1,1]]]]],[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"status"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,0],[[30,[36,9],["components.consul.intention.search-bar.",[32,18,["status","key"]]],null]],[["default"],[[30,[36,4],[[30,[36,9],["common.search.",[32,18,["status","key"]]],null],[30,[36,9],["common.consul.",[32,18,["status","key"]]],null]],null]]]],[30,[36,0],[[30,[36,9],["components.consul.intention.search-bar.",[32,18,["status","value"]]],null]],[["default"],[[30,[36,4],[[30,[36,9],["common.search.",[32,18,["status","value"]]],null],[30,[36,9],["common.consul.",[32,18,["status","value"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,18,["RemoveFilter"]],[[16,"aria-label",[30,[36,0],["common.ui.remove"],[["item"],[[30,[36,9],[[32,19]," ",[32,20]],null]]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[1,[32,19]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,20]],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[19,20]}]]],[2,"\\n    "]],"parameters":[18]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"search"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,13,["Search"]],[],[["@onsearch","@value","@placeholder"],[[30,[36,3],[[32,0],[32,23]],null],[32,24],[30,[36,0],["common.search.search"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,8],[[32,22,["searchproperty"]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,13,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,22,["searchproperty","change"]]],null],true,true]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[2,"\\n              "],[1,[30,[36,0],["common.search.searchproperty"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,14,["Optgroup"]],[32,14,["Option"]]],null,[["default"],[{"statements":[[6,[37,13],[[30,[36,12],[[30,[36,12],[[32,22,["searchproperty","default"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,16],[],[["@value","@selected"],[[32,17],[30,[36,11],[[32,17],[32,22,["searchproperty","value"]]],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,0],[[30,[36,9],["common.consul.",[30,[36,14],[[32,17]],null]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[17]}]]]],"parameters":[15,16]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[14]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[13]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"filter"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,8,["Select"]],[[24,0,"type-access"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,22,["access","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["components.consul.intention.search-bar.access.name"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,9,["Optgroup"]],[32,9,["Option"]]],null,[["default"],[{"statements":[[6,[37,13],[[30,[36,12],[[30,[36,12],[[30,[36,4],["allow","deny",""],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,11],[[16,0,[30,[36,9],["value-",[32,12]],null]]],[["@value","@selected"],[[30,[36,10],[[32,12],"app-aware"],null],[30,[36,11],[[30,[36,10],[[32,12],"app-aware"],null],[32,22,["access","value"]]],null]]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[1,[30,[36,0],[[30,[36,9],["components.consul.intention.search-bar.access.options.",[30,[36,10],[[32,12],"app-aware"],null]],null]],null]],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[12]}]]]],"parameters":[10,11]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[9]}]]],[2,"\\n    "]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"sort"],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,21,["change"]]],null],false,true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,4],[[30,[36,4],["Action:asc",[30,[36,0],["components.consul.intention.search-bar.sort.access.asc"],null]],null],[30,[36,4],["Action:desc",[30,[36,0],["components.consul.intention.search-bar.sort.access.desc"],null]],null],[30,[36,4],["SourceName:asc",[30,[36,0],["components.consul.intention.search-bar.sort.source-name.asc"],null]],null],[30,[36,4],["SourceName:desc",[30,[36,0],["components.consul.intention.search-bar.sort.source-name.desc"],null]],null],[30,[36,4],["DestinationName:asc",[30,[36,0],["components.consul.intention.search-bar.sort.destination-name.asc"],null]],null],[30,[36,4],["DestinationName:desc",[30,[36,0],["components.consul.intention.search-bar.sort.destination-name.desc"],null]],null],[30,[36,4],["Precedence:asc",[30,[36,0],["common.sort.numeric.asc"],null]],null],[30,[36,4],["Precedence:desc",[30,[36,0],["common.sort.numeric.desc"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[1,[30,[36,2],[[32,7],[32,21,["value"]]],null]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,4,["Optgroup"]],[32,4,["Option"]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,5],[],[["@label"],[[30,[36,0],["components.consul.intention.search-bar.sort.access.name"],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["Action:asc",[30,[36,1],["Action:asc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["components.consul.intention.search-bar.sort.access.asc"],null]]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["Action:desc",[30,[36,1],["Action:desc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["components.consul.intention.search-bar.sort.access.desc"],null]]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,5],[],[["@label"],[[30,[36,0],["components.consul.intention.search-bar.sort.source-name.name"],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["SourceName:asc",[30,[36,1],["SourceName:asc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.asc"],null]]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["SourceName:desc",[30,[36,1],["SourceName:desc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.desc"],null]]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,5],[],[["@label"],[[30,[36,0],["components.consul.intention.search-bar.sort.destination-name.name"],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["DestinationName:asc",[30,[36,1],["DestinationName:asc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.asc"],null]]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["DestinationName:desc",[30,[36,1],["DestinationName:desc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.desc"],null]]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,5],[],[["@label"],[[30,[36,0],["components.consul.intention.search-bar.sort.precedence.name"],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["Precedence:asc",[30,[36,1],["Precedence:asc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.numeric.asc"],null]]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["Precedence:desc",[30,[36,1],["Precedence:desc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.numeric.desc"],null]]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]]],"hasEval":false,"upvars":["t","eq","get","action","array","from-entries","let","-is-named-block-invocation","if","concat","or","contains","-track-array","each","lowercase","hash"]}',meta:{moduleName:"consul-ui/components/consul/intention/search-bar/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/intention/view/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"FT+AOUhZ",block:'{"symbols":["&attrs"],"statements":[[11,"div"],[24,0,"consul-intention-view"],[17,1],[12],[2,"\\n\\n  "],[10,"div"],[14,0,"definition-table"],[12],[2,"\\n      "],[10,"dl"],[12],[2,"\\n        "],[10,"dt"],[12],[2,"Destination"],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[8,"consul/bucket/list",[],[["@item","@nspace","@partition","@service"],[[30,[36,1],null,[["Namespace","Partition","Service"],[[35,0,["DestinationNS"]],[35,0,["DestinationPartition"]],[35,0,["DestinationName"]]]]],"-","-",true]],null],[2,"\\n        "],[13],[2,"\\n        "],[10,"dt"],[12],[2,"Source"],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[8,"consul/bucket/list",[],[["@item","@nspace","@partition","@service"],[[30,[36,1],null,[["Namespace","Partition","Service"],[[35,0,["SourceNS"]],[35,0,["SourcePartition"]],[35,0,["SourceName"]]]]],"-","-",true]],null],[2,"\\n        "],[13],[2,"\\n"],[6,[37,2],[[35,0,["Action"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dt"],[12],[2,"Action"],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[1,[35,0,["Action"]]],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[10,"dt"],[12],[2,"Description"],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[1,[30,[36,3],[[35,0,["Description"]],"N/A"],null]],[2,"\\n        "],[13],[2,"\\n      "],[13],[2,"\\n  "],[13],[2,"\\n\\n"],[6,[37,2],[[30,[36,4],[[35,0,["Permissions","length"]],0],null]],null,[["default"],[{"statements":[[2,"  "],[10,"h2"],[12],[2,"Permissions"],[13],[2,"\\n  "],[8,"consul/intention/notice/permissions",[],[[],[]],null],[2,"\\n  "],[8,"consul/intention/permission/list",[],[["@items"],[[34,0,["Permissions"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["item","hash","if","or","gt"]}',meta:{moduleName:"consul-ui/components/consul/intention/view/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:""}))
+e.default=n})),define("consul-ui/components/consul/kind/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"z+keWPxf",block:'{"symbols":["Name","link","link"],"statements":[[6,[37,5],[[35,3,["Kind"]]],null,[["default"],[{"statements":[[6,[37,9],[[30,[36,12],[[30,[36,11],[[35,3,["Kind"]]],null]],null]],null,[["default"],[{"statements":[[6,[37,5],[[35,10]],null,[["default","else"],[{"statements":[[2,"        "],[10,"dl"],[14,0,"tooltip-panel"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n            "],[10,"span"],[14,0,"consul-kind"],[12],[2,"\\n              "],[1,[32,1]],[2,"\\n            "],[13],[2,"\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[8,"menu-panel",[],[["@position"],["left"]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,6],[[35,3,["Kind"]],"ingress-gateway"],null]],null,[["default","else"],[{"statements":[[2,"                  Ingress gateways enable ingress traffic from services outside the Consul service mesh to services inside the Consul service mesh.\\n"]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,6],[[35,3,["Kind"]],"terminating-gateway"],null]],null,[["default","else"],[{"statements":[[2,"                  Terminating gateways allow connect-enabled services in Consul service mesh to communicate with services outside the service mesh.\\n"]],"parameters":[]},{"statements":[[2,"                  Mesh gateways enable routing of Connect traffic between different Consul datacenters.\\n                "]],"parameters":[]}]]]],"parameters":[]}]]],[2,"              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["menu"]],[["default"],[{"statements":[[2,"\\n                "],[10,"li"],[14,"role","separator"],[12],[2,"\\n"],[6,[37,5],[[30,[36,6],[[35,3,["Kind"]],"ingress-gateway"],null]],null,[["default","else"],[{"statements":[[2,"                      About Ingress gateways\\n"]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,6],[[35,3,["Kind"]],"terminating-gateway"],null]],null,[["default","else"],[{"statements":[[2,"                      About Terminating gateways\\n"]],"parameters":[]},{"statements":[[2,"                      About Mesh gateways\\n                  "]],"parameters":[]}]]]],"parameters":[]}]]],[2,"                "],[13],[2,"\\n"],[6,[37,9],[[30,[36,8],[[30,[36,7],[[30,[36,7],["ingress-gateway","/consul/developer-mesh/ingress-gateways"],null],[30,[36,7],["terminating-gateway","/consul/developer-mesh/understand-terminating-gateways"],null],[30,[36,7],["mesh-gateway","/consul/developer-mesh/connect-gateways"],null]],null]],null]],null,[["default"],[{"statements":[[2,"                "],[10,"li"],[14,"role","none"],[14,0,"learn-link"],[12],[2,"\\n                  "],[10,"a"],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[30,[36,2],[[30,[36,1],["CONSUL_DOCS_LEARN_URL"],null],[30,[36,0],[[32,3],[35,3,["Kind"]]],null]],null]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"\\n                    Learn guides\\n                  "],[13],[2,"\\n                "],[13],[2,"\\n"]],"parameters":[3]}]]],[6,[37,9],[[30,[36,8],[[30,[36,7],[[30,[36,7],["ingress-gateway","/connect/ingress-gateway"],null],[30,[36,7],["terminating-gateway","/connect/terminating-gateway"],null],[30,[36,7],["mesh-gateway","/connect/mesh-gateway"],null]],null]],null]],null,[["default"],[{"statements":[[2,"                "],[10,"li"],[14,"role","none"],[14,0,"docs-link"],[12],[2,"\\n                  "],[10,"a"],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[30,[36,2],[[30,[36,1],["CONSUL_DOCS_URL"],null],[30,[36,0],[[32,2],[35,3,["Kind"]]],null]],null]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"\\n                    Documentation\\n                  "],[13],[2,"\\n                "],[13],[2,"\\n                "],[10,"li"],[14,"role","separator"],[12],[2,"\\n                  Other gateway types\\n                "],[13],[2,"\\n"],[6,[37,5],[[30,[36,4],[[35,3,["Kind"]],"mesh-gateway"],null]],null,[["default"],[{"statements":[[2,"                "],[10,"li"],[14,"role","none"],[14,0,"docs-link"],[12],[2,"\\n                  "],[10,"a"],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[30,[36,2],[[30,[36,1],["CONSUL_DOCS_URL"],null],[30,[36,0],[[32,2],"mesh-gateway"],null]],null]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"\\n                    Mesh gateways\\n                  "],[13],[2,"\\n                "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,5],[[30,[36,4],[[35,3,["Kind"]],"terminating-gateway"],null]],null,[["default"],[{"statements":[[2,"                "],[10,"li"],[14,"role","none"],[14,0,"docs-link"],[12],[2,"\\n                  "],[10,"a"],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[30,[36,2],[[30,[36,1],["CONSUL_DOCS_URL"],null],[30,[36,0],[[32,2],"terminating-gateway"],null]],null]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"\\n                    Terminating gateways\\n                  "],[13],[2,"\\n                "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,5],[[30,[36,4],[[35,3,["Kind"]],"ingress-gateway"],null]],null,[["default"],[{"statements":[[2,"                "],[10,"li"],[14,"role","none"],[14,0,"docs-link"],[12],[2,"\\n                  "],[10,"a"],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[30,[36,2],[[30,[36,1],["CONSUL_DOCS_URL"],null],[30,[36,0],[[32,2],"ingress-gateway"],null]],null]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"\\n                    Ingress gateways\\n                  "],[13],[2,"\\n                "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[2]}]]],[2,"              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          "],[10,"span"],[14,0,"consul-kind"],[12],[2,"\\n            "],[1,[32,1]],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]]],"parameters":[]}]]]],"hasEval":false,"upvars":["get","env","concat","item","not-eq","if","eq","array","from-entries","let","withInfo","humanize","titleize"]}',meta:{moduleName:"consul-ui/components/consul/kind/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:""}))
+e.default=n})),define("consul-ui/components/consul/kv/form/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"LrzkPXNV",block:'{"symbols":["api","disabld","execute","cancel","message","confirm","__arg0"],"statements":[[8,"data-form",[],[["@dc","@nspace","@partition","@type","@label","@autofill","@item","@src","@onchange","@onsubmit"],[[34,15],[34,16],[34,17],"kv","key",[34,18],[34,19],[34,20],[30,[36,0],[[32,0],"change"],null],[30,[36,0],[[32,0],[35,21]],null]]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,23],[[30,[36,22],["write kv"],[["item"],[[32,1,["data"]]]]]],null,[["default"],[{"statements":[[2,"    "],[10,"form"],[15,"onsubmit",[30,[36,0],[[32,0],[32,1,["submit"]]],null]],[12],[2,"\\n      "],[11,"fieldset"],[4,[38,5],[[30,[36,1],[[32,2],[32,1,["disabled"]]],null]],null],[12],[2,"\\n"],[6,[37,3],[[32,1,["isCreate"]]],null,[["default"],[{"statements":[[2,"        "],[10,"label"],[15,0,[31,["type-text",[30,[36,3],[[32,1,["data","error","Key"]]," has-error"],null]]]],[12],[2,"\\n            "],[10,"span"],[12],[2,"Key or folder"],[13],[2,"\\n            "],[10,"input"],[14,"autofocus","autofocus"],[15,2,[30,[36,11],[[32,1,["data","Key"]],[35,10]],null]],[14,3,"additional"],[15,"oninput",[30,[36,0],[[32,0],[32,1,["change"]]],null]],[14,"placeholder","Key or folder"],[14,4,"text"],[12],[13],[2,"\\n            "],[10,"em"],[12],[2,"To create a folder, end a key with "],[10,"code"],[12],[2,"/"],[13],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,3],[[30,[36,1],[[30,[36,14],[[30,[36,11],[[32,1,["data","Key"]],[35,10]],null],""],null],[30,[36,13],[[30,[36,12],[[32,1,["data","Key"]]],null],"/"],null]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"div"],[12],[2,"\\n            "],[10,"div"],[14,0,"type-toggle"],[12],[2,"\\n              "],[10,"label"],[12],[2,"\\n                  "],[11,"input"],[24,3,"json"],[16,"checked",[30,[36,3],[[35,9],"checked"],null]],[16,"onchange",[30,[36,0],[[32,0],[32,1,["change"]]],null]],[24,4,"checkbox"],[4,[38,5],[false],null],[12],[13],[2,"\\n                  "],[10,"span"],[12],[2,"Code"],[13],[2,"\\n              "],[13],[2,"\\n            "],[13],[2,"\\n\\n            "],[10,"label"],[14,"for",""],[15,0,[31,["type-text",[30,[36,3],[[32,1,["data","error","Value"]]," has-error"],null]]]],[12],[2,"\\n"],[6,[37,3],[[35,9]],null,[["default","else"],[{"statements":[[2,"                "],[8,"code-editor",[],[["@name","@readonly","@value","@onkeyup","@namedBlocksInfo"],["value",[30,[36,1],[[32,2],[32,1,["disabled"]]],null],[30,[36,6],[[32,1,["data","Value"]]],null],[30,[36,0],[[32,0],[32,1,["change"]],"value"],null],[30,[36,7],null,[["label"],[0]]]]],[["default"],[{"statements":[[6,[37,3],[[30,[36,8],[[32,7],"label"],null]],null,[["default"],[{"statements":[[2,"Value"]],"parameters":[]}]]]],"parameters":[7]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"                "],[10,"span"],[12],[2,"Value"],[13],[2,"\\n                "],[11,"textarea"],[16,"autofocus",[30,[36,2],[[32,1,["isCreate"]]],null]],[24,3,"value"],[16,"oninput",[30,[36,0],[[32,0],[32,1,["change"]]],null]],[4,[38,5],[[30,[36,1],[[32,2],[32,1,["disabled"]]],null]],null],[12],[1,[30,[36,6],[[32,1,["data","Value"]]],null]],[13],[2,"\\n"]],"parameters":[]}]]],[2,"            "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n"],[6,[37,3],[[32,1,["isCreate"]]],null,[["default","else"],[{"statements":[[6,[37,3],[[30,[36,2],[[32,2]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"button"],[15,"disabled",[30,[36,1],[[32,1,["data","isPristine"]],[32,1,["data","isInvalid"]],[32,1,["disabled"]]],null]],[14,4,"submit"],[12],[2,"Save"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[10,"button"],[15,"onclick",[30,[36,0],[[32,0],[35,4],[32,1,["data"]]],null]],[15,"disabled",[32,1,["disabled"]]],[14,4,"reset"],[12],[2,"Cancel"],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,3],[[30,[36,2],[[32,2]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"button"],[15,"disabled",[30,[36,1],[[32,1,["data","isInvalid"]],[32,1,["disabled"]]],null]],[14,4,"submit"],[12],[2,"Save"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[10,"button"],[15,"onclick",[30,[36,0],[[32,0],[35,4],[32,1,["data"]]],null]],[15,"disabled",[32,1,["disabled"]]],[14,4,"reset"],[12],[2,"Cancel"],[13],[2,"\\n"],[6,[37,3],[[30,[36,2],[[32,2]],null]],null,[["default"],[{"statements":[[2,"        "],[8,"confirmation-dialog",[],[["@message"],["Are you sure you want to delete this key?"]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["action"]],[["default"],[{"statements":[[2,"\\n            "],[11,"button"],[24,0,"type-delete"],[16,"disabled",[32,1,["disabled"]]],[24,4,"button"],[4,[38,0],[[32,0],[32,6],[32,1,["delete"]]],null],[12],[2,"Delete"],[13],[2,"\\n          "]],"parameters":[6]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["dialog"]],[["default"],[{"statements":[[2,"\\n            "],[8,"delete-confirmation",[],[["@message","@execute","@cancel"],[[32,5],[32,3],[32,4]]],null],[2,"\\n          "]],"parameters":[3,4,5]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n"]],"parameters":[2]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["action","or","not","if","oncancel","disabled","atob","hash","-is-named-block-invocation","json","parent","left-trim","last","not-eq","eq","dc","nspace","partition","autofill","item","src","onsubmit","cannot","let"]}',meta:{moduleName:"consul-ui/components/consul/kv/form/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:"",encoder:Ember.inject.service("btoa"),json:!0,ondelete:function(){this.onsubmit(...arguments)},oncancel:function(){this.onsubmit(...arguments)},onsubmit:function(){},actions:{change:function(e,t){const n=t.getData()
+try{t.handleEvent(e)}catch(r){const t=e.target
+let a
+switch(t.name){case"value":Ember.set(n,"Value",this.encoder.execute(t.value))
+break
+case"additional":a=Ember.get(this,"parent"),Ember.set(n,"Key",`${"/"!==a?a:""}${t.value}`)
+break
+case"json":Ember.set(this,"json",!this.json)
+break
+default:throw r}}}}}))
+e.default=n})),define("consul-ui/components/consul/kv/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"IGQyLUaF",block:'{"symbols":["item","index","index","change","checked","confirm","send","keypressClick","__arg0","__arg1","Actions","@delete","&attrs","@items","@parent"],"statements":[[8,"tabular-collection",[[24,0,"consul-kv-list"],[17,13]],[["@items"],[[32,14]]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n    "],[10,"th"],[12],[2,"Name"],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["row"]],[["default"],[{"statements":[[2,"\\n    "],[10,"td"],[15,0,[30,[36,0],[[32,1,["isFolder"]],"folder","file"],null]],[12],[2,"\\n        "],[10,"a"],[15,6,[30,[36,1],[[30,[36,0],[[32,1,["isFolder"]],"dc.kv.folder","dc.kv.edit"],null],[32,1,["Key"]]],null]],[12],[1,[30,[36,9],[[30,[36,8],[[32,1,["Key"]],[32,15,["Key"]]],null],"/"],null]],[13],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n    "],[8,"popover-menu",[],[["@expanded","@onchange","@keyboardAccess"],[[30,[36,0],[[30,[36,10],[[32,5],[32,3]],null],true,false],null],[30,[36,2],[[32,0],[32,4],[32,3]],null],false]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["trigger"]],[["default"],[{"statements":[[2,"\\n        More\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["menu"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,0],[[30,[36,11],["write kv"],[["item"],[[32,1]]]]],null,[["default","else"],[{"statements":[[2,"          "],[10,"li"],[14,"role","none"],[12],[2,"\\n            "],[10,"a"],[14,"role","menuitem"],[14,"tabindex","-1"],[15,6,[30,[36,1],[[30,[36,0],[[32,1,["isFolder"]],"dc.kv.folder","dc.kv.edit"],null],[32,1,["Key"]]],null]],[12],[1,[30,[36,0],[[32,1,["isFolder"]],"View","Edit"],null]],[13],[2,"\\n          "],[13],[2,"\\n          "],[10,"li"],[14,"role","none"],[14,0,"dangerous"],[12],[2,"\\n            "],[10,"label"],[15,"for",[32,6]],[14,"role","menuitem"],[14,"tabindex","-1"],[15,"onkeypress",[32,8]],[12],[2,"Delete"],[13],[2,"\\n            "],[10,"div"],[14,"role","menu"],[12],[2,"\\n              "],[8,"informed-action",[[24,0,"warning"]],[["@namedBlocksInfo"],[[30,[36,7],null,[["header","body","actions"],[0,0,1]]]]],[["default"],[{"statements":[[6,[37,0],[[30,[36,6],[[32,9],"header"],null]],null,[["default","else"],[{"statements":[[2,"\\n                  Confirm Delete\\n                "]],"parameters":[]},{"statements":[[6,[37,0],[[30,[36,6],[[32,9],"body"],null]],null,[["default","else"],[{"statements":[[2,"\\n                  "],[10,"p"],[12],[2,"\\n                    Are you sure you want to delete this KV entry?\\n                  "],[13],[2,"\\n                "]],"parameters":[]},{"statements":[[6,[37,0],[[30,[36,6],[[32,9],"actions"],null]],null,[["default"],[{"statements":[[6,[37,5],[[32,10]],null,[["default"],[{"statements":[[2,"\\n                  "],[8,[32,11,["Action"]],[[24,0,"dangerous"]],[[],[]],[["default"],[{"statements":[[2,"\\n                    "],[8,"action",[[24,0,"type-delete"],[24,"tabindex","-1"],[4,[38,4],["click",[30,[36,3],[[30,[36,2],[[32,0],[32,4]],null],[30,[36,2],[[32,0],[32,12],[32,1]],null]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n                      Delete\\n                    "]],"parameters":[]}]]],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                  "],[8,[32,11,["Action"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                    "],[8,"action",[],[["@for"],[[32,6]]],[["default"],[{"statements":[[2,"\\n                      Cancel\\n                    "]],"parameters":[]}]]],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                "]],"parameters":[11]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[9,10]}]]],[2,"\\n            "],[13],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          "],[10,"li"],[14,"role","none"],[12],[2,"\\n            "],[10,"a"],[14,"role","menuitem"],[14,"tabindex","-1"],[15,6,[30,[36,1],[[30,[36,0],[[32,1,["isFolder"]],"dc.kv.folder","dc.kv.edit"],null],[32,1,["Key"]]],null]],[12],[2,"View"],[13],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[6,7,8]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[3,4,5]}]]],[2,"\\n"]],"parameters":[1,2]}]]]],"hasEval":false,"upvars":["if","href-to","action","queue","on","let","-is-named-block-invocation","hash","left-trim","right-trim","eq","can"]}',meta:{moduleName:"consul-ui/components/consul/kv/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/kv/search-bar/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"pTbMHFFw",block:'{"symbols":["__arg0","__arg1","search","components","Optgroup","Option","selectable","search","components","Optgroup","Option","item","search","components","Optgroup","Option","prop","search","key","value","@sort","@filter","@onsearch","@search","&attrs"],"statements":[[8,"search-bar",[[24,0,"consul-kv-search-bar"],[17,25]],[["@filter","@namedBlocksInfo"],[[32,22],[30,[36,14],null,[["status","search","filter","sort"],[1,1,1,1]]]]],[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"status"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,0],[[30,[36,10],["components.consul.kv.search-bar.",[32,18,["status","key"]]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,18,["status","key"]]],null],[30,[36,10],["common.consul.",[32,18,["status","key"]]],null]],null]]]],[30,[36,0],[[30,[36,10],["components.consul.kv.search-bar.",[32,18,["status","value"]]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,18,["status","value"]]],null],[30,[36,10],["common.consul.",[32,18,["status","value"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,18,["RemoveFilter"]],[[16,"aria-label",[30,[36,0],["common.ui.remove"],[["item"],[[30,[36,10],[[32,19]," ",[32,20]],null]]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[1,[32,19]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,20]],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[19,20]}]]],[2,"\\n    "]],"parameters":[18]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"search"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,13,["Search"]],[],[["@onsearch","@value","@placeholder"],[[30,[36,3],[[32,0],[32,23]],null],[32,24],[30,[36,0],["common.search.search"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,8],[[32,22,["searchproperty"]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,13,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,22,["searchproperty","change"]]],null],true,true]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[2,"\\n              "],[1,[30,[36,0],["common.search.searchproperty"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,14,["Optgroup"]],[32,14,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[32,22,["searchproperty","default"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,16],[],[["@value","@selected"],[[32,17],[30,[36,9],[[32,17],[32,22,["searchproperty","value"]]],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[30,[36,13],[[32,17]],null]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[17]}]]]],"parameters":[15,16]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[14]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[13]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"filter"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,8,["Select"]],[[24,0,"type-kind"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,22,["kind","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["components.consul.kv.search-bar.kind.name"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,9,["Optgroup"]],[32,9,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[30,[36,4],["folder","key"],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,11],[[24,0,"value-{item}}"]],[["@value","@selected"],[[32,12],[30,[36,9],[[32,12],[32,22,["kind","value"]]],null]]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],[[30,[36,10],["components.consul.kv.search-bar.kind.options.",[32,12]],null]],null]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[12]}]]]],"parameters":[10,11]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[9]}]]],[2,"\\n    "]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"sort"],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,21,["change"]]],null],false,true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,4],[[30,[36,4],["Key:asc",[30,[36,0],["common.sort.alpha.asc"],null]],null],[30,[36,4],["Key:desc",[30,[36,0],["common.sort.alpha.desc"],null]],null],[30,[36,4],["Kind:asc",[30,[36,0],["components.consul.kv.search-bar.sort.kind.asc"],null]],null],[30,[36,4],["Kind:desc",[30,[36,0],["components.consul.kv.search-bar.sort.kind.desc"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[1,[30,[36,2],[[32,7],[32,21,["value"]]],null]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,4,["Optgroup"]],[32,4,["Option"]]],null,[["default"],[{"statements":[[2,"          "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.consul.name"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Key:asc",[30,[36,1],["Key:asc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Key:desc",[30,[36,1],["Key:desc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.desc"],null]]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,5],[],[["@label"],[[30,[36,0],["components.consul.kv.search-bar.kind.name"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Kind:asc",[30,[36,1],["Kind:asc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["components.consul.kv.search-bar.sort.kind.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Kind:desc",[30,[36,1],["Kind:desc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["components.consul.kv.search-bar.sort.kind.desc"],null]]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["t","eq","get","action","array","from-entries","let","-is-named-block-invocation","if","contains","concat","-track-array","each","lowercase","hash"]}',meta:{moduleName:"consul-ui/components/consul/kv/search-bar/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/loader/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"2ziS2H3f",block:'{"symbols":["&attrs"],"statements":[[11,"div"],[24,0,"consul-loader"],[17,1],[12],[2,"\\n  "],[10,"svg"],[14,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[14,"xmlns:xlink","http://www.w3.org/1999/xlink","http://www.w3.org/2000/xmlns/"],[14,"width","44px"],[14,"height","44px"],[14,"viewBox","0 0 44 44"],[14,"version","1.1"],[12],[2,"\\n      "],[10,"g"],[12],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","27"],[14,"cy","2"],[14,5,"transform-origin: 27px 2px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","17"],[14,"cy","2"],[14,5,"transform-origin: 17px 2px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","27"],[14,"cy","42"],[14,5,"transform-origin: 27px 42px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","17"],[14,"cy","42"],[14,5,"transform-origin: 17px 42px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","2"],[14,"cy","17"],[14,5,"transform-origin: 2px 17px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","2"],[14,"cy","27"],[14,5,"transform-origin: 2px 27px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","42"],[14,"cy","17"],[14,5,"transform-origin: 42px 17px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","42"],[14,"cy","27"],[14,5,"transform-origin: 42px 27px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","33"],[14,"cy","4"],[14,5,"transform-origin: 33px 4px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","11"],[14,"cy","4"],[14,5,"transform-origin: 11px 4px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","33"],[14,"cy","40"],[14,5,"transform-origin: 33px 40px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","11"],[14,"cy","40"],[14,5,"transform-origin: 11px 40px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","40"],[14,"cy","11"],[14,5,"transform-origin: 40px 11px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","4"],[14,"cy","33"],[14,5,"transform-origin: 4px 33px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","40"],[14,"cy","33"],[14,5,"transform-origin: 40px 33px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","1"],[14,"cx","4"],[14,"cy","11"],[14,5,"transform-origin: 4px 11px"],[12],[13],[2,"\\n      "],[13],[2,"\\n      "],[10,"g"],[12],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","22"],[14,"cy","4"],[14,5,"transform-origin: 22px 4px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","22"],[14,"cy","40"],[14,5,"transform-origin: 22px 40px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","4"],[14,"cy","22"],[14,5,"transform-origin: 4px 22px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","40"],[14,"cy","22"],[14,5,"transform-origin: 40px 22px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","9"],[14,"cy","9"],[14,5,"transform-origin: 9px 9px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","35"],[14,"cy","35"],[14,5,"transform-origin: 35px 35px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","35"],[14,"cy","9"],[14,5,"transform-origin: 35px 9px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","9"],[14,"cy","35"],[14,5,"transform-origin: 9px 35px"],[12],[13],[2,"\\n      "],[13],[2,"\\n      "],[10,"g"],[12],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","28"],[14,"cy","8"],[14,5,"transform-origin: 28px 8px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","16"],[14,"cy","8"],[14,5,"transform-origin: 16px 8px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","28"],[14,"cy","36"],[14,5,"transform-origin: 28px 36px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","16"],[14,"cy","36"],[14,5,"transform-origin: 16px 36px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","8"],[14,"cy","28"],[14,5,"transform-origin: 8px 28px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","8"],[14,"cy","16"],[14,5,"transform-origin: 8px 16px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","36"],[14,"cy","28"],[14,5,"transform-origin: 36px 28px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","2"],[14,"cx","36"],[14,"cy","16"],[14,5,"transform-origin: 36px 16px"],[12],[13],[2,"\\n      "],[13],[2,"\\n      "],[10,"g"],[12],[2,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","22"],[14,"cy","12"],[14,5,"transform-origin: 22px 12px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","22"],[14,"cy","32"],[14,5,"transform-origin: 22px 32px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","12"],[14,"cy","22"],[14,5,"transform-origin: 12px 22px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","32"],[14,"cy","22"],[14,5,"transform-origin: 32px 22px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","15"],[14,"cy","15"],[14,5,"transform-origin: 15px 15px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","29"],[14,"cy","29"],[14,5,"transform-origin: 29px 29px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","29"],[14,"cy","15"],[14,5,"transform-origin: 29px 15px"],[12],[13],[2,"\\n          "],[10,"circle"],[14,"r","5"],[14,"cx","15"],[14,"cy","29"],[14,5,"transform-origin: 15px 29px"],[12],[13],[2,"\\n      "],[13],[2,"\\n      "],[10,"g"],[12],[2,"\\n          "],[10,"circle"],[14,"r","9"],[14,"cx","22"],[14,"cy","22"],[14,5,"transform-origin: 22px 22px"],[12],[13],[2,"\\n      "],[13],[2,"\\n  "],[13],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/consul/loader/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/lock-session/form/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"4H9hZw6F",block:'{"symbols":["writer","execute","cancel","message","confirm","checks","after","error","after","@item","&attrs","@onsubmit","@ondelete"],"statements":[[11,"div"],[24,0,"consul-lock-session-form"],[17,11],[12],[2,"\\n  "],[8,"data-writer",[],[["@sink","@type","@label","@ondelete","@onchange"],[[30,[36,6],["/${partition}/${nspace}/${dc}/session",[30,[36,5],null,[["partition","nspace","dc"],[[32,10,["Partition"]],[32,10,["Namespace"]],[32,10,["Datacenter"]]]]]],null],"session","Lock Session",[30,[36,0],[[30,[36,4],[[32,13],[32,13],[32,12]],null],[32,10]],null],[30,[36,0],[[30,[36,7],[[32,12]],null],[32,10]],null]]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["removed"]],[["default"],[{"statements":[[2,"\\n        "],[8,"consul/lock-session/notifications",[[4,[38,9],null,[["after"],[[30,[36,8],[[32,0],[32,9]],null]]]]],[["@type"],["remove"]],null],[2,"\\n      "]],"parameters":[9]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n        "],[8,"consul/lock-session/notifications",[[4,[38,9],null,[["after"],[[30,[36,8],[[32,0],[32,7]],null]]]]],[["@type","@error"],["remove",[32,8]]],null],[2,"\\n      "]],"parameters":[7,8]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n        "],[10,"div"],[14,0,"definition-table"],[12],[2,"\\n          "],[10,"dl"],[12],[2,"\\n"],[6,[37,4],[[32,10,["Name"]]],null,[["default"],[{"statements":[[2,"            "],[10,"dt"],[12],[2,"Name"],[13],[2,"\\n            "],[10,"dd"],[12],[1,[32,10,["Name"]]],[13],[2,"\\n"]],"parameters":[]}]]],[2,"            "],[10,"dt"],[12],[2,"ID"],[13],[2,"\\n            "],[10,"dd"],[12],[1,[32,10,["ID"]]],[13],[2,"\\n            "],[10,"dt"],[12],[2,"Node"],[13],[2,"\\n            "],[10,"dd"],[12],[2,"\\n                "],[10,"a"],[15,6,[30,[36,10],["dc.nodes.show",[32,10,["Node"]]],null]],[12],[2,"\\n                  "],[1,[32,10,["Node"]]],[2,"\\n                "],[13],[2,"\\n            "],[13],[2,"\\n            "],[10,"dt"],[12],[2,"Delay"],[13],[2,"\\n            "],[10,"dd"],[12],[1,[30,[36,11],[[32,10,["LockDelay"]]],null]],[13],[2,"\\n            "],[10,"dt"],[12],[2,"TTL"],[13],[2,"\\n            "],[10,"dd"],[12],[1,[30,[36,12],[[32,10,["TTL"]],"-"],null]],[13],[2,"\\n            "],[10,"dt"],[12],[2,"Behavior"],[13],[2,"\\n            "],[10,"dd"],[12],[1,[32,10,["Behavior"]]],[13],[2,"\\n"],[6,[37,13],[[32,10,["checks"]]],null,[["default"],[{"statements":[[2,"            "],[10,"dt"],[12],[2,"Health Checks"],[13],[2,"\\n            "],[10,"dd"],[12],[2,"\\n"],[6,[37,4],[[30,[36,3],[[32,6,["length"]],0],null]],null,[["default","else"],[{"statements":[[2,"                "],[1,[30,[36,2],[", ",[32,6]],null]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"                -\\n"]],"parameters":[]}]]],[2,"            "],[13],[2,"\\n"]],"parameters":[6]}]]],[2,"          "],[13],[2,"\\n        "],[13],[2,"\\n"],[6,[37,4],[[30,[36,14],["delete session"],[["item"],[[32,10]]]]],null,[["default"],[{"statements":[[2,"        "],[8,"confirmation-dialog",[],[["@message"],["Are you sure you want to invalidate this Lock Session?"]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["action"]],[["default"],[{"statements":[[2,"\\n            "],[8,"action",[[24,0,"type-delete"],[4,[38,1],["click",[30,[36,0],[[32,5],[30,[36,0],[[32,1,["delete"]],[32,10]],null]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n              Invalidate Session\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[5]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["dialog"]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              "],[1,[32,4]],[2,"\\n            "],[13],[2,"\\n            "],[8,"action",[[24,0,"type-delete"],[4,[38,1],["click",[30,[36,0],[[32,2]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n              Confirm Invalidation\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,"action",[[24,0,"type-cancel"],[4,[38,1],["click",[30,[36,0],[[32,3]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n              Cancel\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[2,3,4]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[1]}]]],[2,"\\n"],[13]],"hasEval":false,"upvars":["fn","on","join","gt","if","hash","uri","optional","action","notification","href-to","duration-from","or","let","can"]}',meta:{moduleName:"consul-ui/components/consul/lock-session/form/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/lock-session/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"4zmOmXUM",block:'{"symbols":["item","index","execute","cancel","message","confirm","checks","item","&attrs","@items","@ondelete"],"statements":[[8,"list-collection",[[24,0,"consul-lock-session-list"],[17,9]],[["@items"],[[32,10]]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,4],[[32,1,["Name"]]],null,[["default","else"],[{"statements":[[2,"    "],[10,"span"],[12],[1,[32,1,["Name"]]],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[10,"span"],[12],[2,"\\n      "],[1,[32,1,["ID"]]],[2,"\\n      "],[8,"copy-button",[],[["@value","@name"],[[32,1,["ID"]],"ID"]],null],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,4],[[32,1,["Name"]]],null,[["default"],[{"statements":[[2,"    "],[10,"dl"],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        ID\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[8,"copy-button",[],[["@value","@name"],[[32,1,["ID"]],"ID"]],null],[2,"\\n        "],[1,[32,1,["ID"]]],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[10,"dl"],[14,0,"lock-delay"],[12],[2,"\\n      "],[11,"dt"],[4,[38,2],null,null],[12],[2,"\\n        Delay\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[1,[30,[36,5],[[32,1,["LockDelay"]]],null]],[13],[2,"\\n    "],[13],[2,"\\n    "],[10,"dl"],[14,0,"ttl"],[12],[2,"\\n      "],[11,"dt"],[4,[38,2],null,null],[12],[2,"\\n        TTL\\n      "],[13],[2,"\\n"],[6,[37,4],[[30,[36,6],[[32,1,["TTL"]],""],null]],null,[["default","else"],[{"statements":[[2,"      "],[10,"dd"],[12],[2,"-"],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[10,"dd"],[12],[1,[32,1,["TTL"]]],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n    "],[10,"dl"],[14,0,"behavior"],[12],[2,"\\n      "],[11,"dt"],[4,[38,2],null,null],[12],[2,"\\n        Behavior\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[1,[32,1,["Behavior"]]],[13],[2,"\\n    "],[13],[2,"\\n"],[6,[37,8],[[30,[36,7],[[32,1,["NodeChecks"]],[32,1,["ServiceChecks"]]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"dl"],[14,0,"checks"],[12],[2,"\\n      "],[11,"dt"],[4,[38,2],null,null],[12],[2,"\\n        Checks\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n"],[6,[37,4],[[30,[36,3],[[32,7,["length"]],0],null]],null,[["default","else"],[{"statements":[[6,[37,1],[[30,[36,0],[[30,[36,0],[[32,7]],null]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"span"],[12],[1,[32,8]],[13],[2,"\\n"]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[2,"        -\\n"]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[7]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n    "],[8,"confirmation-dialog",[],[["@message"],["Are you sure you want to invalidate this session?"]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["action"]],[["default"],[{"statements":[[2,"\\n        "],[8,"action",[[24,0,"type-delete"],[4,[38,10],["click",[30,[36,9],[[32,6],[30,[36,9],[[32,11],[32,1]],null]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n          Invalidate\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[6]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["dialog"]],[["default"],[{"statements":[[2,"\\n        "],[10,"p"],[12],[2,"\\n          "],[1,[32,5]],[2,"\\n        "],[13],[2,"\\n        "],[8,"action",[[24,0,"type-delete"],[4,[38,10],["click",[30,[36,9],[[32,3]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n          Confirm Invalidate\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"action",[[24,0,"type-cancel"],[4,[38,10],["click",[30,[36,9],[[32,4]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n          Cancel\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[3,4,5]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1,2]}]]]],"hasEval":false,"upvars":["-track-array","each","tooltip","gt","if","duration-from","eq","union","let","fn","on"]}',meta:{moduleName:"consul-ui/components/consul/lock-session/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/lock-session/notifications/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"C5IRTA6J",block:'{"symbols":["notice","notice","notice","@type","&attrs","@error"],"statements":[[6,[37,2],[[30,[36,1],[[32,4],"remove"],null]],null,[["default","else"],[{"statements":[[6,[37,2],[[32,6]],null,[["default","else"],[{"statements":[[2,"    "],[8,"notice",[[24,0,"notification-delete"],[17,5]],[["@type"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"strong"],[12],[2,"Error!"],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,[32,3,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"p"],[12],[2,"\\n          There was an error invalidating the Lock Session.\\n"],[6,[37,2],[[30,[36,3],[[32,6,["status"]],[32,6,["detail"]]],null]],null,[["default"],[{"statements":[[2,"          "],[10,"br"],[12],[13],[1,[32,6,["status"]]],[2,": "],[1,[32,6,["detail"]]],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[3]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[8,"notice",[[24,0,"notification-delete"],[17,5]],[["@type"],["success"]],[["default"],[{"statements":[[2,"\\n      "],[8,[32,2,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"strong"],[12],[2,"Success!"],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,[32,2,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"p"],[12],[2,"\\n          Your Lock Session has been invalidated.\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,2],[[30,[36,1],[[32,4],"kv"],null]],null,[["default"],[{"statements":[[2,"  "],[8,"notice",[],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n    "],[8,[32,1,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[10,"p"],[12],[2,"\\n        "],[10,"strong"],[12],[2,"Warning."],[13],[2," This KV has a lock session. You can edit KV\'s with lock sessions, but we recommend doing so with care, or not doing so at all. It may negatively impact the active node it\'s associated with. See below for more details on the Lock Session and see "],[10,"a"],[15,6,[31,[[30,[36,0],["CONSUL_DOCS_URL"],null],"/internals/sessions.html"]]],[14,"target","_blank"],[14,"rel","noopener noreferrer"],[12],[2,"our documentation"],[13],[2," for more information.\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[1]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]]],"hasEval":false,"upvars":["env","eq","if","and"]}',meta:{moduleName:"consul-ui/components/consul/lock-session/notifications/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/logo/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"VqMopggF",block:'{"symbols":[],"statements":[[10,"svg"],[14,"width","32"],[14,"height","32"],[14,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[14,"fill","currentColor"],[12],[2,"\\n  "],[10,"title"],[12],[2,"Consul"],[13],[2,"\\n  "],[10,"path"],[14,"d","M20.0909311,0.531825836 C17.5736708,-0.133926002 14.9319012,-0.175262092 12.3950559,0.41140611 C9.85814916,0.998075538 7.50278772,2.1950159 5.53339269,3.89834301 C3.56397924,5.60167011 2.04003632,7.75991032 1.09382125,10.1857533 C0.147614161,12.6115349 -0.192263562,15.231632 0.103691496,17.8185758 C0.399647167,20.4055195 1.32249342,22.8811539 2.79212624,25.0305962 C4.26175905,27.1800385 6.2337511,28.9383326 8.5369881,30.1528504 C10.8402251,31.3673682 13.4050666,32.0014567 16.008894,32 C20.0224756,32.0040967 23.890121,30.4948211 26.8400939,27.7732993 L23.056744,23.818657 C21.5467316,25.1801547 19.674304,26.0745584 17.666316,26.3936287 C15.658328,26.7127604 13.6008556,26.4427448 11.7432242,25.6164282 C9.88553137,24.7900502 8.30724765,23.4427963 7.19961874,21.7377931 C6.09198982,20.0328513 5.50246798,18.0432818 5.50246798,16.0100604 C5.50246798,13.9769005 6.09198982,11.987331 7.19961874,10.2823278 C8.30724765,8.57732462 9.88553137,7.23007065 11.7432242,6.40375406 C13.6008556,5.57740063 15.658328,5.30742184 17.666316,5.62649829 C19.674304,5.94557474 21.5467316,6.8400276 23.056744,8.20152524 L26.8400939,4.23173679 C24.9249353,2.46762854 22.6081914,1.1975789 20.0909311,0.531825836 Z M28.629761,21.4006112 C28.3757081,21.4511394 28.1422839,21.5758942 27.9591423,21.7590358 C27.7759394,21.9422387 27.6511845,22.1756015 27.6006564,22.4297158 C27.5501282,22.6837687 27.5760369,22.9471537 27.67519,23.1864717 C27.7743431,23.4258512 27.9421973,23.6304197 28.1576327,23.7743298 C28.3730067,23.9182399 28.6262614,23.9950451 28.8852873,23.9950451 C29.2327222,23.9950451 29.565852,23.8570904 29.8114938,23.6114486 C30.0571355,23.3658068 30.1951517,23.0326156 30.1951517,22.6852422 C30.1951517,22.4261549 30.118285,22.1729615 29.9743749,21.9575261 C29.8304648,21.7421521 29.6258964,21.5742365 29.3865783,21.4751449 C29.1471988,21.3759918 28.8838753,21.3500217 28.629761,21.4006112 Z M30.136151,16.921839 C29.8820981,16.9724286 29.648674,17.097122 29.4655324,17.280325 C29.2823294,17.4635279 29.1575746,17.6968907 29.1070464,17.951005 C29.0565183,18.2050579 29.082427,18.4684429 29.1815801,18.7077609 C29.2807332,18.947079 29.4485873,19.1516475 29.6640227,19.295619 C29.8793967,19.4395291 30.1326515,19.5163343 30.3916774,19.5163343 C30.7386825,19.5149836 31.0710755,19.3765991 31.3164103,19.1312643 C31.5617451,18.8858681 31.7001911,18.5534751 31.7015418,18.2065314 C31.7015418,17.9474441 31.6247365,17.6941893 31.480765,17.4788153 C31.3368549,17.2634413 31.1322864,17.0955257 30.8929684,16.9963726 C30.6535889,16.897281 30.3902653,16.8713108 30.136151,16.921839 Z M17.2353224,12.7982374 C16.6019706,12.5359576 15.9050749,12.4673179 15.2327372,12.6010364 C14.5603995,12.7347549 13.9428262,13.0648763 13.458112,13.5495906 C12.9733363,14.0343049 12.6432763,14.6519395 12.5094963,15.3242158 C12.3757778,15.9965535 12.4444175,16.6934492 12.7067588,17.3268011 C12.9691,17.9601529 13.4133549,18.5014734 13.983347,18.8823072 C14.5532777,19.263141 15.2234051,19.4664201 15.9089428,19.4664201 C16.8281501,19.4664201 17.7097223,19.1012421 18.3597736,18.4512522 C19.0097635,17.8012623 19.3749415,16.9196902 19.3749415,16.0004214 C19.3749415,15.3149452 19.1716623,14.6448177 18.7907672,14.0748256 C18.4099334,13.5048336 17.8686128,13.0605787 17.2353224,12.7982374 Z M26.9935817,16.8454635 C26.7542636,16.7463104 26.4908786,16.7204017 26.2368257,16.7709299 C25.9827114,16.821458 25.7493487,16.9462129 25.5661457,17.1294158 C25.3830041,17.3125574 25.2582493,17.5459815 25.2076597,17.8000344 C25.1571316,18.0541487 25.1831017,18.3174723 25.2822548,18.5568518 C25.3813465,18.7961699 25.549262,19.0007383 25.764636,19.1446484 C25.9800714,19.2885585 26.2332648,19.3654252 26.4923521,19.3654252 C26.8397256,19.3654252 27.1729167,19.227409 27.4185585,18.9817672 C27.6641389,18.7361255 27.8021551,18.4029957 27.8021551,18.0555608 C27.8021551,17.7965349 27.7253498,17.5432802 27.5814397,17.3279062 C27.4375296,17.1124708 27.2328997,16.9446166 26.9935817,16.8454635 Z M26.9935817,12.7396665 C26.7542636,12.6405134 26.4908786,12.6146047 26.2368257,12.6651329 C25.9827114,12.715661 25.7493487,12.8404159 25.5661457,13.0236188 C25.3830041,13.2067604 25.2582493,13.4401845 25.2076597,13.6942374 C25.1571316,13.9483517 25.1831017,14.2116753 25.2822548,14.4510548 C25.3813465,14.6903729 25.549262,14.8949413 25.764636,15.0388514 C25.9800714,15.1827615 26.2332648,15.2596282 26.4923521,15.2596282 C26.8397256,15.2596282 27.1729167,15.121612 27.4185585,14.8759702 C27.6641389,14.6303285 27.8021551,14.2971373 27.8021551,13.9497638 C27.8021551,13.6907379 27.7253498,13.4374832 27.5814397,13.2220478 C27.4375296,13.0066738 27.2328997,12.8388196 26.9935817,12.7396665 Z M30.136151,12.5138553 C29.8820981,12.5644449 29.648674,12.6891997 29.4655324,12.8723413 C29.2823294,13.0555443 29.1575746,13.288907 29.1070464,13.5430213 C29.0565183,13.7970742 29.082427,14.0604592 29.1815801,14.2997773 C29.2807332,14.5391567 29.4485873,14.7436638 29.6640227,14.8876353 C29.8793967,15.0315454 30.1326515,15.1083507 30.3916774,15.1083507 C30.7386825,15.1070614 31.0710755,14.9686154 31.3164103,14.7232806 C31.5617451,14.4778844 31.7001911,14.1454914 31.7015418,13.7985477 C31.7015418,13.5394604 31.6247365,13.286267 31.480765,13.0708316 C31.3368549,12.8554577 31.1322864,12.6875421 30.8929684,12.5884504 C30.6535889,12.4892973 30.3902653,12.4633272 30.136151,12.5138553 Z M28.7055225,8.10574889 C28.4514696,8.15627705 28.2180454,8.28103189 28.0348425,8.46423485 C27.8517009,8.64743782 27.7269461,8.88080057 27.6764179,9.13485348 C27.6258898,9.38896778 27.6517985,9.65235274 27.7509516,9.89167082 C27.8501046,10.1309889 28.0179588,10.3355574 28.2333328,10.4794675 C28.4487682,10.623439 28.702023,10.7002442 28.9610489,10.7002442 C29.3084223,10.7002442 29.6416135,10.5622281 29.8872553,10.3165863 C30.1328971,10.0709445 30.2708519,9.73781471 30.2708519,9.39044126 C30.2708519,9.13135396 30.1940466,8.87809919 30.0501365,8.6627252 C29.9062264,8.44728981 29.7016579,8.27943562 29.4622784,8.18028254 C29.2229604,8.08112946 28.9595754,8.05522073 28.7055225,8.10574889 Z"],[14,"fill-rule","nonzero"],[12],[13],[2,"\\n"],[13]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/consul/logo/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/metadata/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"VbVHYYDc",block:'{"symbols":["item","index"],"statements":[[8,"tabular-collection",[[24,0,"consul-metadata-list"]],[["@items"],[[34,0]]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"th"],[12],[2,"Key"],[13],[2,"\\n        "],[10,"th"],[12],[2,"Value"],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["row"]],[["default"],[{"statements":[[2,"\\n        "],[10,"td"],[12],[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,1],[0,[32,1]],null]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"td"],[12],[2,"\\n          "],[10,"span"],[12],[1,[30,[36,1],[1,[32,1]],null]],[13],[2,"\\n        "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["items","object-at"]}',meta:{moduleName:"consul-ui/components/consul/metadata/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:""}))
+e.default=n})),define("consul-ui/components/consul/node-identity/template/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"f1nRWNk1",block:'{"symbols":["@name","@partition"],"statements":[[6,[37,1],[[30,[36,0],["use partitions"],null]],null,[["default","else"],[{"statements":[[2,"partition \\""],[1,[30,[36,2],[[32,2],"default"],null]],[2,"\\" {\\n"],[6,[37,1],[[30,[36,0],["use nspaces"],null]],null,[["default","else"],[{"statements":[[2,"  namespace \\"default\\" {\\n    node \\""],[1,[32,1]],[2,"\\" {\\n\\t    policy = \\"write\\"\\n    }\\n  }\\n  namespace_prefix \\"\\" {\\n    service_prefix \\"\\" {\\n\\t    policy = \\"read\\"\\n    }\\n  }\\n"]],"parameters":[]},{"statements":[[2,"  node \\""],[1,[32,1]],[2,"\\" {\\n\\t  policy = \\"write\\"\\n  }\\n  service_prefix \\"\\" {\\n\\t  policy = \\"read\\"\\n  }\\n"]],"parameters":[]}]]],[2,"}"]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,0],["use nspaces"],null]],null,[["default","else"],[{"statements":[[2,"namespace \\"default\\" {\\n  node \\""],[1,[32,1]],[2,"\\" {\\n\\t  policy = \\"write\\"\\n  }\\n}\\nnamespace_prefix \\"\\" {\\n  service_prefix \\"\\" {\\n\\t  policy = \\"read\\"\\n  }\\n}\\n"]],"parameters":[]},{"statements":[[2,"node \\""],[1,[32,1]],[2,"\\" {\\n\\tpolicy = \\"write\\"\\n}\\nservice_prefix \\"\\" {\\n\\tpolicy = \\"read\\"\\n}"]],"parameters":[]}]]]],"parameters":[]}]]]],"hasEval":false,"upvars":["can","if","or"]}',meta:{moduleName:"consul-ui/components/consul/node-identity/template/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/node/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"mZ3vKiug",block:'{"symbols":["item","index","@items","@leader"],"statements":[[8,"list-collection",[[24,0,"consul-node-list"]],[["@items"],[[32,3]]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n    "],[10,"dl"],[15,0,[32,1,["Status"]]],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        Health\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[8,"tooltip",[],[["@position"],["top-start"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[30,[36,0],["critical",[32,1,["Status"]]],null]],null,[["default","else"],[{"statements":[[2,"            At least one health check on this node is failing.\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,0],["warning",[32,1,["Status"]]],null]],null,[["default","else"],[{"statements":[[2,"            At least one health check on this node has a warning.\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,0],["passing",[32,1,["Status"]]],null]],null,[["default","else"],[{"statements":[[2,"            All health checks are passing.\\n"]],"parameters":[]},{"statements":[[2,"            There are no health checks.\\n          "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n    "],[10,"a"],[15,6,[30,[36,2],["dc.nodes.show",[32,1,["Node"]]],null]],[12],[2,"\\n      "],[1,[32,1,["Node"]]],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[30,[36,0],[[32,1,["Address"]],[32,4,["Address"]]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"span"],[14,0,"leader"],[12],[2,"Leader"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[10,"span"],[12],[2,"\\n      "],[1,[30,[36,3],[[32,1,["MeshServiceInstances","length"]]],null]],[2," "],[1,[30,[36,4],[[32,1,["MeshServiceInstances","length"]],"Service"],[["without-count"],[true]]]],[2,"\\n    "],[13],[2,"\\n    "],[10,"dl"],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        "],[10,"span"],[12],[2,"Address"],[13],[2,"\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[8,"copy-button",[],[["@value","@name"],[[32,1,["Address"]],"Address"]],null],[2,"\\n        "],[1,[32,1,["Address"]]],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["eq","if","href-to","format-number","pluralize"]}',meta:{moduleName:"consul-ui/components/consul/node/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/node/search-bar/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"iOQYq0d+",block:'{"symbols":["__arg0","__arg1","search","components","Optgroup","Option","selectable","search","components","Optgroup","Option","state","search","components","Optgroup","Option","prop","search","key","value","@sort","@filter","@onsearch","@search","&attrs"],"statements":[[8,"search-bar",[[24,0,"consul-node-search-bar"],[17,25]],[["@filter","@namedBlocksInfo"],[[32,22],[30,[36,14],null,[["status","search","filter","sort"],[1,1,1,1]]]]],[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"status"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,0],[[30,[36,10],["components.consul.node.search-bar.",[32,18,["status","key"]]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,18,["status","key"]]],null],[30,[36,10],["common.consul.",[32,18,["status","key"]]],null]],null]]]],[30,[36,0],[[30,[36,10],["components.consul.node.search-bar.",[32,18,["status","value"]]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,18,["status","value"]]],null],[30,[36,10],["common.consul.",[32,18,["status","value"]]],null],[30,[36,10],["common.brand.",[32,18,["status","value"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,18,["RemoveFilter"]],[[16,"aria-label",[30,[36,0],["common.ui.remove"],[["item"],[[30,[36,10],[[32,19]," ",[32,20]],null]]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[1,[32,19]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,20]],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[19,20]}]]],[2,"\\n    "]],"parameters":[18]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"search"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,13,["Search"]],[],[["@onsearch","@value","@placeholder"],[[30,[36,3],[[32,0],[32,23]],null],[32,24],[30,[36,0],["common.search.search"],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,13,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,22,["searchproperty","change"]]],null],true,true]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[2,"\\n              "],[1,[30,[36,0],["common.search.searchproperty"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,14,["Optgroup"]],[32,14,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[32,22,["searchproperty","default"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,16],[],[["@value","@selected"],[[32,17],[30,[36,9],[[32,17],[32,22,["searchproperty","value"]]],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[30,[36,13],[[32,17]],null]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[17]}]]]],"parameters":[15,16]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[14]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[13]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"filter"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,8,["Select"]],[[24,0,"type-status"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,22,["status","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["common.consul.status"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,9,["Optgroup"]],[32,9,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[30,[36,4],["passing","warning","critical"],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,11],[[16,0,[31,["value-",[32,12]]]]],[["@value","@selected"],[[32,12],[30,[36,9],[[32,12],[32,22,["status","value"]]],null]]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[32,12]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,12]],null]],null]]]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[12]}]]]],"parameters":[10,11]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[9]}]]],[2,"\\n    "]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"sort"],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,21,["change"]]],null],false,true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,4],[[30,[36,4],["Node:asc",[30,[36,0],["common.sort.alpha.asc"],null]],null],[30,[36,4],["Node:desc",[30,[36,0],["common.sort.alpha.desc"],null]],null],[30,[36,4],["Status:asc",[30,[36,0],["common.sort.status.asc"],null]],null],[30,[36,4],["Status:desc",[30,[36,0],["common.sort.status.desc"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[1,[30,[36,2],[[32,7],[32,21,["value"]]],null]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,4,["Optgroup"]],[32,4,["Option"]]],null,[["default"],[{"statements":[[2,"          "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.consul.status"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Status:asc",[30,[36,1],["Status:asc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.status.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Status:desc",[30,[36,1],["Status:desc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.status.desc"],null]]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.consul.node-name"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Node:asc",[30,[36,1],["Node:asc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Node:desc",[30,[36,1],["Node:desc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.desc"],null]]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]]],"hasEval":false,"upvars":["t","eq","get","action","array","from-entries","let","-is-named-block-invocation","if","contains","concat","-track-array","each","lowercase","hash"]}',meta:{moduleName:"consul-ui/components/consul/node/search-bar/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/nspace/form/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"2mV3xg0a",block:'{"symbols":["writer","readOnly","item","Name","Description","State","Guard","ChartAction","dispatch","state","execute","cancel","message","confirm","after","@dc","@partition","@onsubmit","@oncancel","&attrs","@item","@ondelete"],"statements":[[11,"div"],[24,0,"consul-nspace-form"],[17,20],[12],[2,"\\n    "],[8,"data-writer",[],[["@sink","@type","@label","@ondelete","@onchange"],[[30,[36,12],["/${partition}/${nspace}/${dc}/nspace",[30,[36,9],null,[["partition","nspace","dc"],["","",[32,21,["Datacenter"]]]]]],null],"nspace","Namespace",[30,[36,0],[[30,[36,3],[[32,22],[32,22],[32,18]],null],[32,21]],null],[30,[36,0],[[30,[36,13],[[32,18]],null],[32,21]],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["removed"]],[["default"],[{"statements":[[2,"\\n          "],[8,"consul/nspace/notifications",[[4,[38,15],null,[["after"],[[30,[36,14],[[32,0],[32,15]],null]]]]],[["@type"],["remove"]],null],[2,"\\n        "]],"parameters":[15]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,17],[[30,[36,8],[[30,[36,2],["write nspaces"],null]],null],[32,21],[30,[36,9],null,[["help","Name"],["Must be a valid DNS hostname. Must contain 1-64 characters (numbers, letters, and hyphens), and must begin with a letter. Once created, this cannot be changed.",[30,[36,16],[[30,[36,9],null,[["test","error"],["^[a-zA-Z0-9]([a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?$","Name must be a valid DNS hostname."]]]],null]]]],[30,[36,9],null,[["Description"],[[30,[36,16],null,null]]]]],null,[["default"],[{"statements":[[11,"form"],[4,[38,1],["submit",[30,[36,0],[[32,1,["persist"]],[32,3]],null]],null],[4,[38,7],[[32,2]],null],[12],[2,"\\n\\n"],[8,"state-chart",[],[["@src"],[[30,[36,10],["validate"],null]]],[["default"],[{"statements":[[2,"\\n\\n  "],[10,"fieldset"],[12],[2,"\\n"],[6,[37,3],[[30,[36,5],["new nspace"],[["item"],[[32,3]]]]],null,[["default"],[{"statements":[[2,"    "],[8,"text-input",[],[["@name","@placeholder","@item","@validations","@chart"],["Name","Name",[32,3],[32,4],[30,[36,9],null,[["state","dispatch"],[[32,10],[32,9]]]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[8,"text-input",[],[["@expanded","@name","@label","@item","@validations","@chart"],[true,"Description","Description (Optional)",[32,3],[32,5],[30,[36,9],null,[["state","dispatch"],[[32,10],[32,9]]]]]],null],[2,"\\n  "],[13],[2,"\\n"],[6,[37,3],[[30,[36,2],["use acls"],null]],null,[["default"],[{"statements":[[2,"  "],[10,"fieldset"],[14,1,"roles"],[12],[2,"\\n    "],[10,"h2"],[12],[2,"Roles"],[13],[2,"\\n    "],[10,"p"],[12],[2,"\\n"],[6,[37,3],[[30,[36,2],["write nspace"],[["item"],[[32,3]]]]],null,[["default","else"],[{"statements":[[2,"      By adding roles to this namespaces, you will apply them to all tokens created within this namespace.\\n"]],"parameters":[]},{"statements":[[2,"      The following roles are applied to all tokens created within this namespace.\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n    "],[8,"role-selector",[],[["@dc","@nspace","@partition","@disabled","@items"],[[32,16],"default",[32,17],[32,2],[32,3,["ACLs","RoleDefaults"]]]],null],[2,"\\n  "],[13],[2,"\\n  "],[10,"fieldset"],[14,1,"policies"],[12],[2,"\\n    "],[10,"h2"],[12],[2,"Policies"],[13],[2,"\\n    "],[10,"p"],[12],[2,"\\n"],[6,[37,3],[[30,[36,8],[[32,2]],null]],null,[["default","else"],[{"statements":[[2,"      By adding policies to this namespace, you will apply them to all tokens created within this namespace.\\n"]],"parameters":[]},{"statements":[[2,"      The following policies are applied to all tokens created within this namespace.\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n    "],[8,"policy-selector",[],[["@dc","@nspace","@partition","@disabled","@allowIdentity","@items"],[[32,16],"default",[32,17],[32,2],false,[32,3,["ACLs","PolicyDefaults"]]]],null],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[10,"div"],[12],[2,"\\n"],[6,[37,3],[[30,[36,11],[[30,[36,5],["new nspace"],[["item"],[[32,3]]]],[30,[36,2],["create nspaces"],null]],null]],null,[["default","else"],[{"statements":[[2,"      "],[8,"action",[[4,[38,7],[[30,[36,6],[[30,[36,5],["pristine nspace"],[["item"],[[32,3]]]],[30,[36,4],[[32,10],"error"],null]],null]],null]],[["@type"],["submit"]],[["default"],[{"statements":[[2,"\\n        Save\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,3],[[30,[36,2],["write nspace"],[["item"],[[32,3]]]]],null,[["default"],[{"statements":[[2,"      "],[8,"action",[],[["@type"],["submit"]],[["default"],[{"statements":[[2,"Save"]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"\\n      "],[8,"action",[[4,[38,1],["click",[30,[36,3],[[32,19],[30,[36,0],[[32,19],[32,3]],null],[30,[36,0],[[32,18],[32,3]],null]],null]],null]],[["@type"],["reset"]],[["default"],[{"statements":[[2,"\\n        Cancel\\n      "]],"parameters":[]}]]],[2,"\\n\\n"],[6,[37,3],[[30,[36,11],[[30,[36,8],[[30,[36,5],["new nspace"],[["item"],[[32,3]]]]],null],[30,[36,2],["delete nspace"],[["item"],[[32,3]]]]],null]],null,[["default"],[{"statements":[[2,"      "],[8,"confirmation-dialog",[],[["@message"],["Are you sure you want to delete this Namespace?"]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["action"]],[["default"],[{"statements":[[2,"\\n          "],[8,"action",[[24,0,"type-delete"],[4,[38,1],["click",[30,[36,0],[[32,14],[30,[36,0],[[32,1,["delete"]],[32,3]],null]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n            Delete\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[14]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["dialog"]],[["default"],[{"statements":[[2,"\\n          "],[8,"delete-confirmation",[],[["@message","@execute","@cancel"],[[32,13],[32,11],[32,12]]],null],[2,"\\n        "]],"parameters":[11,12,13]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[6,7,8,9,10]}]]],[2,"\\n"],[13],[2,"\\n"]],"parameters":[2,3,4,5]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"],[13],[2,"\\n\\n"]],"hasEval":false,"upvars":["fn","on","can","if","state-matches","is","or","disabled","not","hash","state-chart","and","uri","optional","action","notification","array","let"]}',meta:{moduleName:"consul-ui/components/consul/nspace/form/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/nspace/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"dI19TXfs",block:'{"symbols":["item","Actions","Action","Confirmation","Confirm","@ondelete","&attrs","@items"],"statements":[[8,"list-collection",[[24,0,"consul-nspace-list"],[17,7]],[["@items","@linkable"],[[32,8],"linkable nspace"]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[32,1,["DeletedAt"]]],null,[["default","else"],[{"statements":[[2,"    "],[10,"p"],[12],[2,"\\n      Deleting "],[1,[32,1,["Name"]]],[2,"...\\n    "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[10,"a"],[15,6,[30,[36,1],["dc.nspaces.edit",[32,1,["Name"]]],null]],[12],[1,[32,1,["Name"]]],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[32,1,["Description"]]],null,[["default"],[{"statements":[[2,"      "],[10,"dl"],[12],[2,"\\n        "],[10,"dt"],[12],[2,"Description"],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[1,[32,1,["Description"]]],[2,"\\n        "],[13],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,3],[[30,[36,4],["CONSUL_ACLS_ENABLED"],null]],null,[["default"],[{"statements":[[2,"      "],[8,"consul/token/ruleset/list",[],[["@item"],[[32,1]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[30,[36,5],[[32,1,["DeletedAt"]]],null]],null,[["default"],[{"statements":[[2,"      "],[8,[32,2],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,3],[],[["@href"],[[30,[36,1],["dc.nspaces.edit",[32,1,["Name"]]],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[30,[36,2],["write nspace"],[["item"],[[32,1]]]]],null,[["default","else"],[{"statements":[[2,"            Edit\\n"]],"parameters":[]},{"statements":[[2,"            View\\n"]],"parameters":[]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"],[6,[37,3],[[30,[36,2],["delete nspace"],[["item"],[[32,1]]]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,3],[[24,0,"dangerous"]],[["@onclick"],[[30,[36,0],[[32,0],[32,6],[32,1]],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n            Delete\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["confirmation"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,4],[[24,0,"warning"]],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                Confirm delete\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[10,"p"],[12],[2,"\\n                  Are you sure you want to delete this namespace?\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["confirm"]],[["default"],[{"statements":[[2,"\\n                "],[8,[32,5],[],[[],[]],[["default"],[{"statements":[[2,"Delete"]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[5]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[4]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[3]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["action","href-to","can","if","env","not"]}',meta:{moduleName:"consul-ui/components/consul/nspace/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n}))
+define("consul-ui/components/consul/nspace/notifications/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"LcZiH9cu",block:'{"symbols":["notice","&attrs","@type"],"statements":[[6,[37,1],[[30,[36,0],[[32,3],"remove"],null]],null,[["default"],[{"statements":[[2,"  "],[8,"notice",[[24,0,"notification-delete"],[17,2]],[["@type"],["success"]],[["default"],[{"statements":[[2,"\\n    "],[8,[32,1,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[10,"strong"],[12],[2,"Success!"],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,[32,1,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[10,"p"],[12],[2,"\\n        Your Namespace has been marked for deletion.\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[1]}]]],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["eq","if"]}',meta:{moduleName:"consul-ui/components/consul/nspace/notifications/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/nspace/search-bar/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"zG/SiimO",block:'{"symbols":["__arg0","__arg1","search","components","Optgroup","Option","selectable","search","components","Optgroup","Option","prop","search","key","value","@sort","@filter","@onsearch","@search","&attrs"],"statements":[[8,"search-bar",[[24,0,"consul-nspace-search-bar"],[17,20]],[["@filter","@namedBlocksInfo"],[[32,17],[30,[36,14],null,[["status","search","sort"],[1,1,1]]]]],[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"status"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,0],[[30,[36,11],["components.consul.nspace.search-bar.",[32,13,["status","key"]]],null]],[["default"],[[30,[36,4],[[30,[36,11],["common.search.",[32,13,["status","key"]]],null],[30,[36,11],["common.consul.",[32,13,["status","key"]]],null]],null]]]],[30,[36,0],[[30,[36,11],["components.consul.nspace.search-bar.",[32,13,["status","value"]]],null]],[["default"],[[30,[36,4],[[30,[36,11],["common.search.",[32,13,["status","value"]]],null],[30,[36,11],["common.consul.",[32,13,["status","value"]]],null],[30,[36,11],["common.brand.",[32,13,["status","value"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,13,["RemoveFilter"]],[[16,"aria-label",[30,[36,0],["common.ui.remove"],[["item"],[[30,[36,11],[[32,14]," ",[32,15]],null]]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[1,[32,14]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,15]],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[14,15]}]]],[2,"\\n    "]],"parameters":[13]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"search"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,8,["Search"]],[],[["@onsearch","@value","@placeholder"],[[30,[36,3],[[32,0],[32,18]],null],[32,19],[30,[36,0],["common.search.search"],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,8,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,17,["searchproperty","change"]]],null],true,true]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[2,"\\n              "],[1,[30,[36,0],["common.search.searchproperty"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,9,["Optgroup"]],[32,9,["Option"]]],null,[["default"],[{"statements":[[6,[37,13],[[30,[36,12],[[30,[36,12],[[32,17,["searchproperty","default"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,11],[],[["@value","@selected"],[[32,12],[30,[36,9],[[32,12],[32,17,["searchproperty","value"]]],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,0],[[30,[36,11],["common.consul.",[30,[36,10],[[32,12]],null]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[12]}]]]],"parameters":[10,11]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[9]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"sort"],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,16,["change"]]],null],false,true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,4],[[30,[36,4],["Name:asc",[30,[36,0],["common.sort.alpha.asc"],null]],null],[30,[36,4],["Name:desc",[30,[36,0],["common.sort.alpha.desc"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[1,[30,[36,2],[[32,7],[32,16,["value"]]],null]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,4,["Optgroup"]],[32,4,["Option"]]],null,[["default"],[{"statements":[[2,"          "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.consul.name"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Name:asc",[30,[36,1],["Name:asc",[32,16,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Name:desc",[30,[36,1],["Name:desc",[32,16,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.desc"],null]]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]]],"hasEval":false,"upvars":["t","eq","get","action","array","from-entries","let","-is-named-block-invocation","if","contains","lowercase","concat","-track-array","each","hash"]}',meta:{moduleName:"consul-ui/components/consul/nspace/search-bar/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/nspace/selector/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"M3okNSs+",block:'{"symbols":["nspace","isManaging","disclosure","panel","menu","item","@partition","@dc","@onchange","@nspaces","@nspace"],"statements":[[6,[37,4],[[30,[36,18],["use nspaces"],null]],null,[["default"],[{"statements":[[6,[37,4],[[30,[36,18],["choose nspaces"],null]],null,[["default"],[{"statements":[[6,[37,17],[[30,[36,3],[[32,11],"default"],null],[30,[36,16],["dc.nspaces",[32,8,["Name"]]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"li"],[14,0,"nspaces"],[12],[2,"\\n          "],[8,"disclosure-menu",[[24,"aria-label","Namespace"]],[["@items"],[[30,[36,13],[[30,[36,6],null,[["Name","href"],["Manage Namespaces",[30,[36,7],["dc.nspaces",[32,8,["Name"]]],null]]]],[30,[36,12],["DeletedAt",[32,10]],null]],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,3,["Action"]],[[4,[38,8],["click",[32,3,["toggle"]]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,4],[[32,2],"Manage Namespaces",[32,1]],null]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,[32,3,["Menu"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n"],[6,[37,4],[[30,[36,5],[[32,10,["length"]],0],null]],null,[["default","else"],[{"statements":[[2,"                "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,9],["/${partition}/*/${dc}/namespaces",[30,[36,6],null,[["partition","dc"],[[32,7],[32,8,["Name"]]]]]],null],[30,[36,11],[[30,[36,10],[[32,9]],null]],null]]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"                "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,9],["/${partition}/*/${dc}/namespaces",[30,[36,6],null,[["partition","dc"],[[32,7],[32,8,["Name"]]]]]],null],[30,[36,11],[[30,[36,10],[[32,9]],null]],null]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"              "],[8,[32,4,["Menu"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n"],[6,[37,15],[[30,[36,14],[[30,[36,14],[[32,5,["items"]]],null]],null]],null,[["default"],[{"statements":[[2,"\\n                  "],[8,[32,5,["Item"]],[[16,"aria-current",[30,[36,4],[[30,[36,3],[[30,[36,2],[[32,2],[32,6,["href"]]],null],[30,[36,2],[[30,[36,1],[[32,2]],null],[30,[36,0],[[32,1],[32,6,["Name"]]],null]],null]],null],"true"],null]]],[[],[]],[["default"],[{"statements":[[2,"\\n                    "],[8,[32,5,["Action"]],[[4,[38,8],["click",[32,3,["close"]]],null]],[["@href"],[[30,[36,4],[[32,6,["href"]],[32,6,["href"]],[30,[36,4],[[32,2],[30,[36,7],["dc.services.index"],[["params"],[[30,[36,6],null,[["partition","nspace","dc"],[[30,[36,4],[[30,[36,5],[[32,7,["length"]],0],null],[32,7],[29]],null],[32,6,["Name"]],[32,8,["Name"]]]]]]]],[30,[36,7],["."],[["params"],[[30,[36,6],null,[["partition","nspace"],[[30,[36,4],[[30,[36,5],[[32,7,["length"]],0],null],[32,7],[29]],null],[32,6,["Name"]]]]]]]]],null]],null]]],[["default"],[{"statements":[[2,"\\n                      "],[1,[32,6,["Name"]]],[2,"\\n                    "]],"parameters":[]}]]],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[6]}]]],[2,"              "]],"parameters":[5]}]]],[2,"\\n            "]],"parameters":[4]}]]],[2,"\\n          "]],"parameters":[3]}]]],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[1,2]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"hasEval":false,"upvars":["eq","not","and","or","if","gt","hash","href-to","on","uri","optional","fn","reject-by","append","-track-array","each","is-href","let","can"]}',meta:{moduleName:"consul-ui/components/consul/nspace/selector/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/partition/form/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"XmdLDsy0",block:'{"symbols":["writer","readOnly","item","Name","Description","State","Guard","ChartAction","dispatch","state","execute","cancel","message","confirm","after","@onsubmit","@oncancel","&attrs","@item","@ondelete"],"statements":[[11,"div"],[24,0,"consul-partition-form"],[17,18],[12],[2,"\\n    "],[8,"data-writer",[],[["@sink","@type","@label","@ondelete","@onchange"],[[30,[36,12],["/${partition}/${nspace}/${dc}/partition",[30,[36,8],null,[["partition","nspace","dc"],["","",[32,19,["Datacenter"]]]]]],null],"partition","Partition",[30,[36,0],[[30,[36,3],[[32,20],[32,20],[32,16]],null],[32,19]],null],[30,[36,0],[[30,[36,13],[[32,16]],null],[32,19]],null]]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["removed"]],[["default"],[{"statements":[[2,"\\n      "],[8,"consul/partition/notifications",[[4,[38,15],null,[["after"],[[30,[36,14],[[32,0],[32,15]],null]]]]],[["@type"],["remove"]],null],[2,"\\n    "]],"parameters":[15]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,17],[[30,[36,2],[[30,[36,10],["write partition"],null]],null],[32,19],[30,[36,8],null,[["help","Name"],["Must be a valid DNS hostname. Must contain 1-64 characters (numbers, letters, and hyphens), and must begin with a letter. Once created, this cannot be changed.",[30,[36,16],[[30,[36,8],null,[["test","error"],["^[a-zA-Z0-9]([a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?$","Name must be a valid DNS hostname."]]]],null]]]],[30,[36,8],null,[["Description"],[[30,[36,16],null,null]]]]],null,[["default"],[{"statements":[[11,"form"],[4,[38,1],["submit",[30,[36,0],[[32,1,["persist"]],[32,3]],null]],null],[4,[38,7],[[32,2]],null],[12],[2,"\\n\\n"],[8,"state-chart",[],[["@src"],[[30,[36,9],["validate"],null]]],[["default"],[{"statements":[[2,"\\n\\n  "],[10,"fieldset"],[12],[2,"\\n"],[6,[37,3],[[30,[36,5],["new partition"],[["item"],[[32,3]]]]],null,[["default"],[{"statements":[[2,"    "],[8,"text-input",[],[["@name","@placeholder","@item","@validations","@chart"],["Name","Name",[32,3],[32,4],[30,[36,8],null,[["state","dispatch"],[[32,10],[32,9]]]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[8,"text-input",[],[["@expanded","@name","@label","@item","@validations","@chart"],[true,"Description","Description (Optional)",[32,3],[32,5],[30,[36,8],null,[["state","dispatch"],[[32,10],[32,9]]]]]],null],[2,"\\n  "],[13],[2,"\\n\\n  "],[10,"div"],[12],[2,"\\n"],[6,[37,3],[[30,[36,11],[[30,[36,5],["new partition"],[["item"],[[32,3]]]],[30,[36,10],["create partitions"],null]],null]],null,[["default","else"],[{"statements":[[2,"      "],[8,"action",[[4,[38,7],[[30,[36,6],[[30,[36,5],["pristine partition"],[["item"],[[32,3]]]],[30,[36,4],[[32,10],"error"],null]],null]],null]],[["@type"],["submit"]],[["default"],[{"statements":[[2,"\\n        Save\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,3],[[30,[36,2],[[32,2]],null]],null,[["default"],[{"statements":[[2,"      "],[8,"action",[],[["@type"],["submit"]],[["default"],[{"statements":[[2,"Save"]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"\\n      "],[8,"action",[[4,[38,1],["click",[30,[36,3],[[32,17],[30,[36,0],[[32,17],[32,3]],null],[30,[36,0],[[32,16],[32,3]],null]],null]],null]],[["@type"],["reset"]],[["default"],[{"statements":[[2,"\\n        Cancel\\n      "]],"parameters":[]}]]],[2,"\\n\\n"],[6,[37,3],[[30,[36,11],[[30,[36,2],[[30,[36,5],["new partition"],[["item"],[[32,3]]]]],null],[30,[36,10],["delete partition"],[["item"],[[32,3]]]]],null]],null,[["default"],[{"statements":[[2,"      "],[8,"confirmation-dialog",[],[["@message"],["Are you sure you want to delete this Partition?"]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["action"]],[["default"],[{"statements":[[2,"\\n          "],[8,"action",[[24,0,"type-delete"],[4,[38,1],["click",[30,[36,0],[[32,14],[30,[36,0],[[32,1,["delete"]],[32,3]],null]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n            Delete\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[14]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["dialog"]],[["default"],[{"statements":[[2,"\\n          "],[8,"delete-confirmation",[],[["@message","@execute","@cancel"],[[32,13],[32,11],[32,12]]],null],[2,"\\n        "]],"parameters":[11,12,13]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n  "],[13],[2,"\\n\\n"]],"parameters":[6,7,8,9,10]}]]],[2,"\\n"],[13],[2,"\\n\\n"]],"parameters":[2,3,4,5]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["fn","on","not","if","state-matches","is","or","disabled","hash","state-chart","can","and","uri","optional","action","notification","array","let"]}',meta:{moduleName:"consul-ui/components/consul/partition/form/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/partition/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"r5hj3CrJ",block:'{"symbols":["item","Actions","Action","Confirmation","Confirm","@ondelete","&attrs","@items"],"statements":[[8,"list-collection",[[24,0,"consul-partition-list"],[17,7]],[["@items","@linkable"],[[32,8],"linkable partition"]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[32,1,["DeletedAt"]]],null,[["default","else"],[{"statements":[[2,"    "],[10,"p"],[12],[2,"\\n      Deleting "],[1,[32,1,["Name"]]],[2,"...\\n    "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[10,"a"],[15,6,[30,[36,1],["dc.partitions.edit",[32,1,["Name"]]],null]],[12],[1,[32,1,["Name"]]],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[32,1,["Description"]]],null,[["default"],[{"statements":[[2,"      "],[10,"dl"],[12],[2,"\\n        "],[10,"dt"],[12],[2,"Description"],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[1,[32,1,["Description"]]],[2,"\\n        "],[13],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[30,[36,4],[[32,1,["DeletedAt"]]],null]],null,[["default"],[{"statements":[[2,"      "],[8,[32,2],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,3],[],[["@href"],[[30,[36,1],["dc.partitions.edit",[32,1,["Name"]]],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[30,[36,2],["write partition"],[["item"],[[32,1]]]]],null,[["default","else"],[{"statements":[[2,"            Edit\\n"]],"parameters":[]},{"statements":[[2,"            View\\n"]],"parameters":[]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"],[6,[37,3],[[30,[36,2],["delete partition"],[["item"],[[32,1]]]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,3],[[24,0,"dangerous"]],[["@onclick"],[[30,[36,0],[[32,0],[32,6],[32,1]],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n            Delete\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["confirmation"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,4],[[24,0,"warning"]],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                Confirm delete\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[10,"p"],[12],[2,"\\n                  Are you sure you want to delete this partition?\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["confirm"]],[["default"],[{"statements":[[2,"\\n                "],[8,[32,5],[],[[],[]],[["default"],[{"statements":[[2,"Delete"]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[5]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[4]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[3]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["action","href-to","can","if","not"]}',meta:{moduleName:"consul-ui/components/consul/partition/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/partition/notifications/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"0ydQ0+/V",block:'{"symbols":["notice","&attrs","@type"],"statements":[[6,[37,1],[[30,[36,0],[[32,3],"remove"],null]],null,[["default"],[{"statements":[[2,"  "],[8,"notice",[[24,0,"notification-delete"],[17,2]],[["@type"],["success"]],[["default"],[{"statements":[[2,"\\n    "],[8,[32,1,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[10,"strong"],[12],[2,"Success!"],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,[32,1,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[10,"p"],[12],[2,"\\n        Your Partition has been marked for deletion.\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[1]}]]],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["eq","if"]}',meta:{moduleName:"consul-ui/components/consul/partition/notifications/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/partition/search-bar/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"0zDAbGxg",block:'{"symbols":["__arg0","__arg1","search","components","Optgroup","Option","selectable","search","components","Optgroup","Option","prop","search","key","value","@sort","@filter","@onsearch","@search","&attrs"],"statements":[[8,"search-bar",[[24,0,"consul-partition-search-bar"],[17,20]],[["@filter","@namedBlocksInfo"],[[32,17],[30,[36,14],null,[["status","search","sort"],[1,1,1]]]]],[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"status"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,0],[[30,[36,11],["components.consul.nspace.search-bar.",[32,13,["status","key"]]],null]],[["default"],[[30,[36,4],[[30,[36,11],["common.search.",[32,13,["status","key"]]],null],[30,[36,11],["common.consul.",[32,13,["status","key"]]],null]],null]]]],[30,[36,0],[[30,[36,11],["components.consul.nspace.search-bar.",[32,13,["status","value"]]],null]],[["default"],[[30,[36,4],[[30,[36,11],["common.search.",[32,13,["status","value"]]],null],[30,[36,11],["common.consul.",[32,13,["status","value"]]],null],[30,[36,11],["common.brand.",[32,13,["status","value"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,13,["RemoveFilter"]],[[16,"aria-label",[30,[36,0],["common.ui.remove"],[["item"],[[30,[36,11],[[32,14]," ",[32,15]],null]]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[1,[32,14]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,15]],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[14,15]}]]],[2,"\\n    "]],"parameters":[13]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"search"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,8,["Search"]],[],[["@onsearch","@value","@placeholder"],[[30,[36,3],[[32,0],[32,18]],null],[32,19],[30,[36,0],["common.search.search"],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,8,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,17,["searchproperty","change"]]],null],true,true]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[2,"\\n              "],[1,[30,[36,0],["common.search.searchproperty"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,9,["Optgroup"]],[32,9,["Option"]]],null,[["default"],[{"statements":[[6,[37,13],[[30,[36,12],[[30,[36,12],[[32,17,["searchproperty","default"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,11],[],[["@value","@selected"],[[32,12],[30,[36,9],[[32,12],[32,17,["searchproperty","value"]]],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,0],[[30,[36,11],["common.consul.",[30,[36,10],[[32,12]],null]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[12]}]]]],"parameters":[10,11]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[9]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"sort"],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,16,["change"]]],null],false,true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,4],[[30,[36,4],["Name:asc",[30,[36,0],["common.sort.alpha.asc"],null]],null],[30,[36,4],["Name:desc",[30,[36,0],["common.sort.alpha.desc"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[1,[30,[36,2],[[32,7],[32,16,["value"]]],null]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,4,["Optgroup"]],[32,4,["Option"]]],null,[["default"],[{"statements":[[2,"          "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.consul.name"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Name:asc",[30,[36,1],["Name:asc",[32,16,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Name:desc",[30,[36,1],["Name:desc",[32,16,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.desc"],null]]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]]],"hasEval":false,"upvars":["t","eq","get","action","array","from-entries","let","-is-named-block-invocation","if","contains","lowercase","concat","-track-array","each","hash"]}',meta:{moduleName:"consul-ui/components/consul/partition/search-bar/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/partition/selector/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"AZQPTZYS",block:'{"symbols":["partition","isManaging","disclosure","panel","menu","item","@dc","@partitions","@onchange","@partition"],"statements":[[6,[37,17],[[30,[36,3],[[32,10],"default"],null],[30,[36,16],["dc.partitions",[32,7,["Name"]]],null]],null,[["default"],[{"statements":[[6,[37,4],[[30,[36,15],["choose partitions"],[["dc"],[[32,7]]]]],null,[["default","else"],[{"statements":[[2,"      "],[10,"li"],[14,0,"partitions"],[12],[2,"\\n        "],[8,"disclosure-menu",[[24,"aria-label","Admin Partition"]],[["@items"],[[30,[36,9],[[30,[36,5],null,[["Name","href"],["Manage Partitions",[30,[36,6],["dc.partitions",[32,7,["Name"]]],null]]]],[30,[36,8],["DeletedAt",[32,8]],null]],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,3,["Action"]],[[4,[38,7],["click",[32,3,["toggle"]]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,4],[[32,2],"Manage Partition",[32,1]],null]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,3,["Menu"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,10],["/*/*/${dc}/partitions",[30,[36,5],null,[["dc"],[[32,7,["Name"]]]]]],null],[30,[36,12],[[30,[36,11],[[32,9]],null]],null]]],null],[2,"\\n            "],[8,[32,4,["Menu"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n"],[6,[37,14],[[30,[36,13],[[30,[36,13],[[32,5,["items"]]],null]],null]],null,[["default"],[{"statements":[[2,"                "],[8,[32,5,["Item"]],[[16,"aria-current",[30,[36,4],[[30,[36,3],[[30,[36,2],[[32,2],[32,6,["href"]]],null],[30,[36,2],[[30,[36,1],[[32,2]],null],[30,[36,0],[[32,1],[32,6,["Name"]]],null]],null]],null],"true"],null]]],[[],[]],[["default"],[{"statements":[[2,"\\n                  "],[8,[32,5,["Action"]],[[4,[38,7],["click",[32,3,["close"]]],null]],[["@href"],[[30,[36,4],[[32,6,["href"]],[32,6,["href"]],[30,[36,4],[[32,2],[30,[36,6],["dc.services.index"],[["params"],[[30,[36,5],null,[["partition","nspace","dc"],[[32,6,["Name"]],[29],[32,7,["Name"]]]]]]]],[30,[36,6],["."],[["params"],[[30,[36,5],null,[["partition","nspace"],[[32,6,["Name"]],[29]]]]]]]],null]],null]]],[["default"],[{"statements":[[2,"\\n                    "],[1,[32,6,["Name"]]],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[6]}]]],[2,"            "]],"parameters":[5]}]]],[2,"\\n          "]],"parameters":[4]}]]],[2,"\\n        "]],"parameters":[3]}]]],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[10,"li"],[14,0,"partition"],[14,"aria-label","Admin Partition"],[12],[2,"\\n      "],[1,"default"],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1,2]}]]]],"hasEval":false,"upvars":["eq","not","and","or","if","hash","href-to","on","reject-by","append","uri","optional","fn","-track-array","each","can","is-href","let"]}',meta:{moduleName:"consul-ui/components/consul/partition/selector/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/policy/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"UDg6I3Xb",block:'{"symbols":["item","Actions","Action","Confirmation","Confirm","@ondelete","@items"],"statements":[[8,"list-collection",[[24,0,"consul-policy-list"]],[["@items"],[[32,7]]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[30,[36,2],[[30,[36,1],[[32,1]],null],"policy-management"],null]],null,[["default"],[{"statements":[[2,"        "],[10,"dl"],[14,0,"policy-management"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"Type"],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n              Global Management Policy\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[10,"a"],[15,6,[30,[36,4],["dc.acls.policies.edit",[32,1,["ID"]]],null]],[15,0,[30,[36,3],[[30,[36,2],[[30,[36,1],[[32,1]],null],"policy-management"],null],"is-management"],null]],[12],[1,[32,1,["Name"]]],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[14,0,"datacenter"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n            "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"Datacenters"]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n              "],[1,[30,[36,6],[", ",[30,[36,5],[[32,1]],null]],null]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"dl"],[14,0,"description"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"Description"],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[1,[32,1,["Description"]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n      "],[8,[32,2],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,3],[],[["@href"],[[30,[36,4],["dc.acls.policies.edit",[32,1,["ID"]]],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[30,[36,7],["write policy"],[["item"],[[32,1]]]]],null,[["default","else"],[{"statements":[[2,"            Edit\\n"]],"parameters":[]},{"statements":[[2,"            View\\n"]],"parameters":[]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"],[6,[37,3],[[30,[36,7],["delete policy"],[["item"],[[32,1]]]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,3],[[24,0,"dangerous"]],[["@onclick"],[[30,[36,0],[[32,0],[32,6],[32,1]],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n            Delete\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["confirmation"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,4],[[24,0,"warning"]],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                Confirm delete\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[10,"p"],[12],[2,"\\n                  Are you sure you want to delete this policy?\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["confirm"]],[["default"],[{"statements":[[2,"\\n                "],[8,[32,5],[],[[],[]],[["default"],[{"statements":[[2,"Delete"]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[5]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[4]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[3]}]]],[2,"\\n    "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["action","policy/typeof","eq","if","href-to","policy/datacenters","join","can"]}',meta:{moduleName:"consul-ui/components/consul/policy/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/policy/notifications/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"rB0yLURE",block:'{"symbols":["error","@status","@type","@error"],"statements":[[6,[37,1],[[30,[36,2],[[32,3],"create"],null]],null,[["default","else"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    Your policy has been added.\\n"]],"parameters":[]},{"statements":[[2,"    There was an error adding your policy.\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,2],[[32,3],"update"],null]],null,[["default","else"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    Your policy has been saved.\\n"]],"parameters":[]},{"statements":[[2,"    There was an error saving your policy.\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,2],[[32,3],"delete"],null]],null,[["default"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    Your policy was deleted.\\n"]],"parameters":[]},{"statements":[[2,"    There was an error deleting your policy.\\n"]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[6,[37,3],[[32,4,["errors","firstObject"]]],null,[["default"],[{"statements":[[6,[37,1],[[32,1,["detail"]]],null,[["default"],[{"statements":[[2,"    "],[10,"br"],[12],[13],[1,[30,[36,0],["(",[30,[36,1],[[32,1,["status"]],[30,[36,0],[[32,1,["status"]],": "],null]],null],[32,1,["detail"]],")"],null]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["concat","if","eq","let"]}',meta:{moduleName:"consul-ui/components/consul/policy/notifications/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/policy/search-bar/index",["exports","@glimmer/component"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"v58RpJPi",block:'{"symbols":["__arg0","__arg1","search","components","Optgroup","Option","selectable","search","components","Optgroup","Option","state","components","Optgroup","Option","dc","search","components","Optgroup","Option","prop","search","key","value","@sort","@filter","@partition","@onsearch","@search","&attrs"],"statements":[[8,"search-bar",[[24,0,"consul-policy-search-bar"],[17,30]],[["@filter","@namedBlocksInfo"],[[32,26],[30,[36,14],null,[["status","search","filter","sort"],[1,1,1,1]]]]],[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"status"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,0],[[30,[36,10],["components.consul.policy.search-bar.",[32,22,["status","key"]],".name"],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,22,["status","key"]]],null],[30,[36,10],["common.consul.",[32,22,["status","key"]]],null]],null]]]],[30,[36,0],[[30,[36,10],["components.consul.policy.search-bar.",[32,22,["status","key"]],".options.",[32,22,["status","value"]]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,22,["status","value"]]],null],[30,[36,10],["common.consul.",[32,22,["status","value"]]],null],[30,[36,10],["common.brand.",[32,22,["status","value"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,22,["RemoveFilter"]],[[16,"aria-label",[30,[36,0],["common.ui.remove"],[["item"],[[30,[36,10],[[32,23]," ",[32,24]],null]]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[1,[32,23]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[30,[36,8],[[30,[36,1],[[32,22,["status","key"]],"datacenter"],null],[32,22,["status","value"]],[32,24]],null]],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[23,24]}]]],[2,"\\n    "]],"parameters":[22]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"search"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,17,["Search"]],[],[["@onsearch","@value","@placeholder"],[[30,[36,3],[[32,0],[32,28]],null],[32,29],[30,[36,0],["common.search.search"],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,17,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,26,["searchproperty","change"]]],null],true,true]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[2,"\\n              "],[1,[30,[36,0],["common.search.searchproperty"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,18,["Optgroup"]],[32,18,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[32,26,["searchproperty","default"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,20],[],[["@value","@selected"],[[32,21],[30,[36,9],[[32,21],[32,26,["searchproperty","value"]]],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[30,[36,17],[[32,21]],null]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[21]}]]]],"parameters":[19,20]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[18]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[17]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"filter"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,8,["Select"]],[[24,0,"type-datacenter"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,26,["datacenter","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["common.consul.datacenter"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,13,["Optgroup"]],[32,13,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[35,13]],null]],null]],null,[["default"],[{"statements":[[2,"            "],[8,[32,15],[],[["@value","@selected"],[[32,16,["Name"]],[30,[36,9],[[32,16,["Name"]],[32,26,["datacenter","value"]]],null]]],[["default"],[{"statements":[[1,[32,16,["Name"]]]],"parameters":[]}]]],[2,"\\n"]],"parameters":[16]}]]],[2,"            "],[8,"data-source",[],[["@src","@loading","@onchange"],[[30,[36,15],["/${partition}/*/*/datacenters",[30,[36,14],null,[["partition"],[[32,27]]]]],null],"lazy",[30,[36,3],[[32,0],[30,[36,16],[[32,0,["dcs"]]],null]],[["value"],["data"]]]]],null],[2,"\\n"]],"parameters":[14,15]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[13]}]]],[2,"\\n      "],[8,[32,8,["Select"]],[[24,0,"type-kind"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,26,["kind","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["components.consul.policy.search-bar.kind.name"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,9,["Optgroup"]],[32,9,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[30,[36,4],["global-management","standard"],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,11],[[16,0,[31,["value-",[32,12]]]]],[["@value","@selected"],[[32,12],[30,[36,9],[[32,12],[32,26,["kind","value"]]],null]]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],[[30,[36,10],["components.consul.policy.search-bar.kind.options.",[32,12]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,12]],null]],null]]]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[12]}]]]],"parameters":[10,11]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[9]}]]],[2,"\\n    "]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"sort"],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,25,["change"]]],null],false,true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,4],[[30,[36,4],["Name:asc",[30,[36,0],["common.sort.alpha.asc"],null]],null],[30,[36,4],["Name:desc",[30,[36,0],["common.sort.alpha.desc"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[1,[30,[36,2],[[32,7],[32,25,["value"]]],null]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,4,["Optgroup"]],[32,4,["Option"]]],null,[["default"],[{"statements":[[2,"          "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.ui.name"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Name:asc",[30,[36,1],["Name:asc",[32,25,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Name:desc",[30,[36,1],["Name:desc",[32,25,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.desc"],null]]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["t","eq","get","action","array","from-entries","let","-is-named-block-invocation","if","contains","concat","-track-array","each","dcs","hash","uri","mut","lowercase"]}',meta:{moduleName:"consul-ui/components/consul/policy/search-bar/index.hbs"}})
+class r extends t.default{}e.default=r,Ember._setComponentTemplate(n,r)})),define("consul-ui/components/consul/role/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"qgd++x7w",block:'{"symbols":["item","Actions","Action","Confirmation","Confirm","@ondelete","&attrs","@items"],"statements":[[8,"list-collection",[[24,0,"consul-role-list"],[17,7]],[["@items"],[[32,8]]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n      "],[10,"a"],[15,6,[30,[36,1],["dc.acls.roles.edit",[32,1,["ID"]]],null]],[12],[1,[32,1,["Name"]]],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n      "],[8,"consul/token/ruleset/list",[],[["@item"],[[32,1]]],null],[2,"\\n      "],[10,"dl"],[12],[2,"\\n        "],[10,"dt"],[12],[2,"Description"],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n            "],[1,[32,1,["Description"]]],[2,"\\n        "],[13],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n      "],[8,[32,2],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,3],[],[["@href"],[[30,[36,1],["dc.acls.roles.edit",[32,1,["ID"]]],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[30,[36,2],["write role"],[["item"],[[32,1]]]]],null,[["default","else"],[{"statements":[[2,"            Edit\\n"]],"parameters":[]},{"statements":[[2,"            View\\n"]],"parameters":[]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"],[6,[37,3],[[30,[36,2],["delete role"],[["item"],[[32,1]]]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,3],[[24,0,"dangerous"]],[["@onclick"],[[30,[36,0],[[32,0],[32,6],[32,1]],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n            Delete\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["confirmation"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,4],[[24,0,"warning"]],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                Confirm delete\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[10,"p"],[12],[2,"\\n                  Are you sure you want to delete this role?\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["confirm"]],[["default"],[{"statements":[[2,"\\n                "],[8,[32,5],[],[[],[]],[["default"],[{"statements":[[2,"Delete"]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[5]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[4]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[3]}]]],[2,"\\n    "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["action","href-to","can","if"]}',meta:{moduleName:"consul-ui/components/consul/role/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/role/notifications/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"pmI3em2e",block:'{"symbols":["error","@status","@type","@error"],"statements":[[6,[37,1],[[30,[36,2],[[32,3],"create"],null]],null,[["default","else"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    Your role has been added.\\n"]],"parameters":[]},{"statements":[[2,"    There was an error adding your role.\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,2],[[32,3],"update"],null]],null,[["default","else"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    Your role has been saved.\\n"]],"parameters":[]},{"statements":[[2,"    There was an error saving your role.\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,2],[[32,3],"delete"],null]],null,[["default"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    Your role was deleted.\\n"]],"parameters":[]},{"statements":[[2,"    There was an error deleting your role.\\n"]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[6,[37,3],[[32,4,["errors","firstObject"]]],null,[["default"],[{"statements":[[6,[37,1],[[32,1,["detail"]]],null,[["default"],[{"statements":[[2,"    "],[10,"br"],[12],[13],[1,[30,[36,0],["(",[30,[36,1],[[32,1,["status"]],[30,[36,0],[[32,1,["status"]],": "],null]],null],[32,1,["detail"]],")"],null]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["concat","if","eq","let"]}',meta:{moduleName:"consul-ui/components/consul/role/notifications/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/role/search-bar/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"wPLJBG1T",block:'{"symbols":["__arg0","__arg1","search","components","Optgroup","Option","selectable","search","components","Optgroup","Option","prop","search","key","value","@sort","@filter","@onsearch","@search","&attrs"],"statements":[[8,"search-bar",[[24,0,"consul-role-search-bar"],[17,20]],[["@filter","@namedBlocksInfo"],[[32,17],[30,[36,14],null,[["status","search","sort"],[1,1,1]]]]],[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"status"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,0],[[30,[36,11],["components.consul.role.search-bar.",[32,13,["status","key"]],".name"],null]],[["default"],[[30,[36,4],[[30,[36,11],["common.search.",[32,13,["status","key"]]],null],[30,[36,11],["common.consul.",[32,13,["status","key"]]],null]],null]]]],[30,[36,0],[[30,[36,11],["components.consul.role.search-bar.",[32,13,["status","key"]],".options.",[32,13,["status","value"]]],null]],[["default"],[[30,[36,4],[[30,[36,11],["common.search.",[32,13,["status","value"]]],null],[30,[36,11],["common.consul.",[32,13,["status","value"]]],null],[30,[36,11],["common.brand.",[32,13,["status","value"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,13,["RemoveFilter"]],[[16,"aria-label",[30,[36,0],["common.ui.remove"],[["item"],[[30,[36,11],[[32,14]," ",[32,15]],null]]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[1,[32,14]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,15]],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[14,15]}]]],[2,"\\n    "]],"parameters":[13]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"search"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,8,["Search"]],[],[["@onsearch","@value","@placeholder"],[[30,[36,3],[[32,0],[32,18]],null],[32,19],[30,[36,0],["common.search.search"],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,8,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,17,["searchproperty","change"]]],null],true,true]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[2,"\\n              "],[1,[30,[36,0],["common.search.searchproperty"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,9,["Optgroup"]],[32,9,["Option"]]],null,[["default"],[{"statements":[[6,[37,13],[[30,[36,12],[[30,[36,12],[[32,17,["searchproperty","default"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,11],[],[["@value","@selected"],[[32,12],[30,[36,9],[[32,12],[32,17,["searchproperty","value"]]],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,0],[[30,[36,11],["common.consul.",[30,[36,10],[[32,12]],null]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[12]}]]]],"parameters":[10,11]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[9]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"sort"],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,16,["change"]]],null],false,true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,4],[[30,[36,4],["Name:asc",[30,[36,0],["common.sort.alpha.asc"],null]],null],[30,[36,4],["Name:desc",[30,[36,0],["common.sort.alpha.desc"],null]],null],[30,[36,4],["CreateIndex:desc",[30,[36,0],["common.sort.age.desc"],null]],null],[30,[36,4],["CreateIndex:asc",[30,[36,0],["common.sort.age.asc"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[1,[30,[36,2],[[32,7],[32,16,["value"]]],null]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,4,["Optgroup"]],[32,4,["Option"]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.ui.name"],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["Name:asc",[30,[36,1],["Name:asc",[32,16,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.asc"],null]]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["Name:desc",[30,[36,1],["Name:desc",[32,16,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.desc"],null]]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.ui.creation"],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["CreateIndex:desc",[30,[36,1],["CreateIndex:desc",[32,16,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.age.desc"],null]]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["CreateIndex:asc",[30,[36,1],["CreateIndex:asc",[32,16,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.age.asc"],null]]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["t","eq","get","action","array","from-entries","let","-is-named-block-invocation","if","contains","lowercase","concat","-track-array","each","hash"]}',meta:{moduleName:"consul-ui/components/consul/role/search-bar/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/server/card/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"Ec5kcuWa",block:'{"symbols":["@item","&attrs"],"statements":[[11,"div"],[16,0,[30,[36,6],["consul-server-card",[30,[36,0],["voting-status-leader",[30,[36,3],[[32,1,["Status"]],"leader"],null]],null],[30,[36,0],["voting-status-voter",[30,[36,5],[[30,[36,4],[[32,1,["ReadReplica"]]],null],[30,[36,3],[[32,1,["Status"]],"voter"],null]],null]],null],[30,[36,0],["voting-status-non-voter",[30,[36,2],[[32,1,["ReadReplica"]],[30,[36,1],[[32,1,["Status"]],[30,[36,0],["non-voter","staging"],null]],null]],null]],null]],null]],[17,2],[12],[2,"\\n  "],[10,"dl"],[12],[2,"\\n\\n    "],[11,"dt"],[24,0,"name"],[4,[38,7],["Leader"],null],[12],[2,"\\n    "],[13],[2,"\\n    "],[10,"dd"],[12],[2,"\\n      "],[1,[32,1,["Name"]]],[2,"\\n    "],[13],[2,"\\n\\n    "],[10,"dt"],[15,0,[30,[36,6],["health-status",[30,[36,0],["healthy",[32,1,["Healthy"]]],null]],null]],[12],[2,"\\n      Status\\n    "],[13],[2,"\\n    "],[10,"dd"],[12],[2,"\\n      "],[1,[30,[36,8],[[30,[36,1],[[32,1,["Status"]],[30,[36,0],["leader","voter"],null]],null],"Active voter","Backup voter"],null]],[2,"\\n    "],[13],[2,"\\n\\n  "],[13],[2,"\\n"],[13],[2,"\\n\\n"]],"hasEval":false,"upvars":["array","contains","or","eq","not","and","class-map","tooltip","if"]}',meta:{moduleName:"consul-ui/components/consul/server/card/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/server/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"sOHjodBR",block:'{"symbols":["item","&attrs","@items"],"statements":[[11,"div"],[16,0,[30,[36,1],["consul-server-list"],null]],[17,2],[12],[2,"\\n  "],[10,"ul"],[12],[2,"\\n"],[6,[37,3],[[30,[36,2],[[30,[36,2],[[32,3]],null]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"li"],[12],[2,"\\n      "],[10,"a"],[15,6,[30,[36,0],["dc.nodes.show",[32,1,["Name"]]],null]],[12],[2,"\\n        "],[8,"consul/server/card",[],[["@item"],[[32,1]]],null],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[1]}]]],[2,"  "],[13],[2,"\\n"],[13],[2,"\\n\\n"]],"hasEval":false,"upvars":["href-to","class-map","-track-array","each"]}',meta:{moduleName:"consul-ui/components/consul/server/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/service-identity/template/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"spWJOarV",block:'{"symbols":["@name","@nspace","@partition"],"statements":[[6,[37,2],[[30,[36,1],["use partitions"],null]],null,[["default","else"],[{"statements":[[2,"partition \\""],[1,[30,[36,0],[[32,3],"default"],null]],[2,"\\" {\\n"],[6,[37,2],[[30,[36,1],["use nspaces"],null]],null,[["default","else"],[{"statements":[[2,"  namespace \\""],[1,[30,[36,0],[[32,2],"default"],null]],[2,"\\" {\\n    service \\""],[1,[32,1]],[2,"\\" {\\n\\t    policy = \\"write\\"\\n    }\\n    service \\""],[1,[32,1]],[2,"-sidecar-proxy\\" {\\n\\t    policy = \\"write\\"\\n    }\\n    service_prefix \\"\\" {\\n\\t    policy = \\"read\\"\\n    }\\n    node_prefix \\"\\" {\\n\\t    policy = \\"read\\"\\n    }\\n  }\\n"]],"parameters":[]},{"statements":[[2,"  service \\""],[1,[32,1]],[2,"\\" {\\n\\t  policy = \\"write\\"\\n  }\\n  service \\""],[1,[32,1]],[2,"-sidecar-proxy\\" {\\n\\t  policy = \\"write\\"\\n  }\\n  service_prefix \\"\\" {\\n\\t  policy = \\"read\\"\\n  }\\n  node_prefix \\"\\" {\\n\\t  policy = \\"read\\"\\n  }\\n"]],"parameters":[]}]]],[2,"}\\n"]],"parameters":[]},{"statements":[[6,[37,2],[[30,[36,1],["use nspaces"],null]],null,[["default","else"],[{"statements":[[2,"namespace \\""],[1,[30,[36,0],[[32,2],"default"],null]],[2,"\\" {\\n  service \\""],[1,[32,1]],[2,"\\" {\\n\\t  policy = \\"write\\"\\n  }\\n  service \\""],[1,[32,1]],[2,"-sidecar-proxy\\" {\\n\\t  policy = \\"write\\"\\n  }\\n  service_prefix \\"\\" {\\n\\t  policy = \\"read\\"\\n  }\\n  node_prefix \\"\\" {\\n\\t  policy = \\"read\\"\\n  }\\n}\\n"]],"parameters":[]},{"statements":[[2,"service \\""],[1,[32,1]],[2,"\\" {\\n\\tpolicy = \\"write\\"\\n}\\nservice \\""],[1,[32,1]],[2,"-sidecar-proxy\\" {\\n\\tpolicy = \\"write\\"\\n}\\nservice_prefix \\"\\" {\\n\\tpolicy = \\"read\\"\\n}\\nnode_prefix \\"\\" {\\n\\tpolicy = \\"read\\"\\n}\\n"]],"parameters":[]}]]]],"parameters":[]}]]]],"hasEval":false,"upvars":["or","can","if"]}',meta:{moduleName:"consul-ui/components/consul/service-identity/template/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/service-instance/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"AAaMSxui",block:'{"symbols":["proxies","item","index","proxy","checks","@node","@routeName","&attrs","@items","@proxies"],"statements":[[6,[37,10],[[30,[36,13],[[32,10],"Service.Proxy.DestinationServiceID"],null]],null,[["default"],[{"statements":[[8,"list-collection",[[24,0,"consul-service-instance-list"],[17,8]],[["@items"],[[32,9]]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[30,[36,11],[[32,7],"dc.services.show"],null]],null,[["default","else"],[{"statements":[[2,"      "],[10,"a"],[15,6,[30,[36,3],[[32,7],[32,2,["Service","Service"]]],null]],[12],[2,"\\n        "],[1,[32,2,["Service","ID"]]],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[10,"a"],[15,6,[30,[36,3],[[32,7],[32,2,["Service","Service"]],[32,2,["Node","Node"]],[30,[36,8],[[32,2,["Service","ID"]],[32,2,["Service","Service"]]],null]],null]],[12],[2,"\\n        "],[1,[32,2,["Service","ID"]]],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,10],[[30,[36,12],[[32,1],[32,2,["Service","ID"]]],null]],null,[["default"],[{"statements":[[6,[37,10],[[30,[36,9],[[30,[36,7],[[32,2,["Checks"]],[30,[36,8],[[32,4,["Checks"]],[30,[36,7],null,null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[32,6]],null,[["default","else"],[{"statements":[[2,"    "],[8,"consul/external-source",[],[["@item"],[[32,2,["Service"]]]],null],[2,"\\n    "],[8,"consul/instance-checks",[],[["@type","@items"],["service",[30,[36,4],["ServiceID","",[32,5]],null]]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[8,"consul/external-source",[],[["@item"],[[32,2,["Service"]]]],null],[2,"\\n\\n    "],[8,"consul/instance-checks",[],[["@type","@items"],["service",[30,[36,4],["ServiceID","",[32,5]],null]]],null],[2,"\\n    "],[8,"consul/instance-checks",[],[["@type","@items"],["node",[30,[36,5],["ServiceID","",[32,5]],null]]],null],[2,"\\n"]],"parameters":[]}]]],[6,[37,1],[[32,4]],null,[["default"],[{"statements":[[2,"    "],[10,"dl"],[14,0,"mesh"],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n          This service uses a proxy for the Consul service mesh\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        in service mesh with proxy\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,1],[[30,[36,6],[[32,6]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"dl"],[14,0,"node"],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n          Node\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[10,"a"],[15,6,[30,[36,3],["dc.nodes.show",[32,2,["Node","Node"]]],null]],[12],[1,[32,2,["Node","Node"]]],[13],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,1],[[32,2,["Service","Port"]]],null,[["default","else"],[{"statements":[[2,"    "],[10,"dl"],[14,0,"address"],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n          IP Address and Port\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n"],[6,[37,1],[[30,[36,2],[[32,2,["Service","Address"]],""],null]],null,[["default","else"],[{"statements":[[2,"          "],[1,[32,2,["Service","Address"]]],[2,":"],[1,[32,2,["Service","Port"]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          "],[1,[32,2,["Node","Address"]]],[2,":"],[1,[32,2,["Service","Port"]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[32,2,["Service","SocketPath"]]],null,[["default"],[{"statements":[[2,"    "],[10,"dl"],[14,0,"socket"],[12],[2,"\\n      "],[11,"dt"],[4,[38,0],null,null],[12],[2,"\\n        Socket Path\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[1,[32,2,["Service","SocketPath"]]],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"    "],[8,"tag-list",[],[["@item"],[[32,2,["Service"]]]],null],[2,"\\n\\n"]],"parameters":[5]}]]]],"parameters":[4]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[2,3]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["tooltip","if","not-eq","href-to","filter-by","reject-by","not","array","or","merge-checks","let","eq","get","to-hash"]}',meta:{moduleName:"consul-ui/components/consul/service-instance/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/service-instance/search-bar/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"kLJwzL+X",block:'{"symbols":["__arg0","__arg1","search","components","Optgroup","Option","selectable","search","components","Optgroup","Option","source","components","Optgroup","Option","state","search","components","Optgroup","Option","prop","search","key","value","@sort","@filter","@sources","@onsearch","@search","&attrs"],"statements":[[8,"search-bar",[[24,0,"consul-service-instance-search-bar"],[17,30]],[["@filter","@namedBlocksInfo"],[[32,26],[30,[36,15],null,[["status","search","filter","sort"],[1,1,1,1]]]]],[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"status"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,0],[[30,[36,10],["components.consul.service-instance.search-bar.",[32,22,["status","key"]],".name"],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,22,["status","key"]]],null],[30,[36,10],["common.consul.",[32,22,["status","key"]]],null]],null]]]],[30,[36,0],[[30,[36,10],["components.consul.service-instance.search-bar.",[32,22,["status","key"]],".options.",[32,22,["status","value"]]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,22,["status","value"]]],null],[30,[36,10],["common.consul.",[32,22,["status","value"]]],null],[30,[36,10],["common.brand.",[32,22,["status","value"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,22,["RemoveFilter"]],[[16,"aria-label",[30,[36,0],["common.ui.remove"],[["item"],[[30,[36,10],[[32,23]," ",[32,24]],null]]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[1,[32,23]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,24]],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[23,24]}]]],[2,"\\n    "]],"parameters":[22]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"search"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,17,["Search"]],[],[["@onsearch","@value","@placeholder"],[[30,[36,3],[[32,0],[32,28]],null],[32,29],[30,[36,0],["common.search.search"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,8],[[32,26,["searchproperty"]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,17,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,26,["searchproperty","change"]]],null],true,true]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[2,"\\n              "],[1,[30,[36,0],["common.search.searchproperty"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,18,["Optgroup"]],[32,18,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[32,26,["searchproperty","default"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,20],[],[["@value","@selected"],[[32,21],[30,[36,9],[[32,21],[32,26,["searchproperty","value"]]],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[30,[36,14],[[32,21]],null]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[21]}]]]],"parameters":[19,20]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[18]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[17]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"filter"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,8,["Select"]],[[24,0,"type-status"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,26,["status","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["common.consul.status"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,13,["Optgroup"]],[32,13,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[30,[36,4],["passing","warning","critical","empty"],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,15],[[16,0,[31,["value-",[32,16]]]]],[["@value","@selected"],[[32,16],[30,[36,9],[[32,16],[32,26,["status","value"]]],null]]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[32,16]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,16]],null]],null]]]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[16]}]]]],"parameters":[14,15]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[13]}]]],[2,"\\n"],[6,[37,8],[[30,[36,13],[[32,27,["length"]],0],null]],null,[["default"],[{"statements":[[2,"      "],[8,[32,8,["Select"]],[[24,0,"type-source"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,26,["source","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["common.search.source"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,9,["Optgroup"]],[32,9,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[32,27]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,11],[[16,0,[32,12]]],[["@value","@selected"],[[32,12],[30,[36,9],[[32,12],[32,26,["source","value"]]],null]]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],[[30,[36,10],["common.brand.",[32,12]],null]],null]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[12]}]]]],"parameters":[10,11]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[9]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"sort"],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,25,["change"]]],null],false,true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,4],[[30,[36,4],["Name:asc",[30,[36,0],["common.sort.alpha.asc"],null]],null],[30,[36,4],["Name:desc",[30,[36,0],["common.sort.alpha.desc"],null]],null],[30,[36,4],["Status:asc",[30,[36,0],["common.sort.status.asc"],null]],null],[30,[36,4],["Status:desc",[30,[36,0],["common.sort.status.desc"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[1,[30,[36,2],[[32,7],[32,25,["value"]]],null]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,4,["Optgroup"]],[32,4,["Option"]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.consul.status"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Status:asc",[30,[36,1],["Status:asc",[32,25,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.status.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Status:desc",[30,[36,1],["Status:desc",[32,25,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.status.desc"],null]]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,5],[],[["@label"],[[30,[36,0],["components.consul.service-instance.search-bar.sort.name.name"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Name:asc",[30,[36,1],["Name:asc",[32,25,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Name:desc",[30,[36,1],["Name:desc",[32,25,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.desc"],null]]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["t","eq","get","action","array","from-entries","let","-is-named-block-invocation","if","contains","concat","-track-array","each","gt","lowercase","hash"]}',meta:{moduleName:"consul-ui/components/consul/service-instance/search-bar/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/service/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"zit0hWHY",block:'{"symbols":["item","index","@partition","&attrs","@items","@nspace"],"statements":[[8,"list-collection",[[24,0,"consul-service-list"],[17,4]],[["@items","@linkable"],[[32,5],"linkable service"]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n    "],[10,"dl"],[15,0,[32,1,["MeshStatus"]]],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        Health\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[8,"tooltip",[],[["@position"],["top-start"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,0],[[30,[36,4],["critical",[32,1,["MeshStatus"]]],null]],null,[["default","else"],[{"statements":[[2,"            At least one health check on one instance is failing.\\n"]],"parameters":[]},{"statements":[[6,[37,0],[[30,[36,4],["warning",[32,1,["MeshStatus"]]],null]],null,[["default","else"],[{"statements":[[2,"            At least one health check on one instance has a warning.\\n"]],"parameters":[]},{"statements":[[6,[37,0],[[30,[36,4],["passing",[32,1,["MeshStatus"]]],null]],null,[["default","else"],[{"statements":[[2,"            All health checks are passing.\\n"]],"parameters":[]},{"statements":[[2,"            There are no health checks.\\n          "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"],[6,[37,0],[[30,[36,8],[[32,1,["InstanceCount"]],0],null]],null,[["default","else"],[{"statements":[[2,"  "],[10,"a"],[15,6,[30,[36,7],["dc.services.show.index",[32,1,["Name"]]],[["params"],[[30,[36,0],[[30,[36,6],[[32,1,["Partition"]],[32,3]],null],[30,[36,5],null,[["partition","nspace"],[[32,1,["Partition"]],[32,1,["Namespace"]]]]],[30,[36,5],null,null]],null]]]]],[12],[2,"\\n    "],[1,[32,1,["Name"]]],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"  "],[10,"p"],[12],[2,"\\n      "],[1,[32,1,["Name"]]],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n    "],[8,"consul/kind",[],[["@item"],[[32,1]]],null],[2,"\\n    "],[8,"consul/external-source",[],[["@item"],[[32,1]]],null],[2,"\\n"],[6,[37,0],[[30,[36,1],[[30,[36,6],[[32,1,["InstanceCount"]],0],null],[30,[36,1],[[30,[36,6],[[32,1,["Kind"]],"terminating-gateway"],null],[30,[36,6],[[32,1,["Kind"]],"ingress-gateway"],null]],null]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"span"],[12],[2,"\\n      "],[1,[30,[36,2],[[32,1,["InstanceCount"]]],null]],[2," "],[1,[30,[36,3],[[32,1,["InstanceCount"]],"instance"],[["without-count"],[true]]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,0],[[30,[36,4],[[32,1,["Kind"]],"terminating-gateway"],null]],null,[["default","else"],[{"statements":[[2,"    "],[10,"span"],[12],[2,"\\n      "],[1,[30,[36,2],[[32,1,["GatewayConfig","AssociatedServiceCount"]]],null]],[2," "],[1,[30,[36,3],[[32,1,["GatewayConfig","AssociatedServiceCount"]],"linked service"],[["without-count"],[true]]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,0],[[30,[36,4],[[32,1,["Kind"]],"ingress-gateway"],null]],null,[["default"],[{"statements":[[2,"    "],[10,"span"],[12],[2,"\\n      "],[1,[30,[36,2],[[32,1,["GatewayConfig","AssociatedServiceCount"]]],null]],[2," "],[1,[30,[36,3],[[32,1,["GatewayConfig","AssociatedServiceCount"]],"upstream"],[["without-count"],[true]]]],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]]],"parameters":[]}]]],[6,[37,0],[[30,[36,9],[[32,1,["ConnectedWithGateway"]],[32,1,["ConnectedWithProxy"]]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"dl"],[14,0,"mesh"],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n          This service uses a proxy for the Consul service mesh\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n"],[6,[37,0],[[30,[36,1],[[32,1,["ConnectedWithGateway"]],[32,1,["ConnectedWithProxy"]]],null]],null,[["default","else"],[{"statements":[[2,"        "],[10,"dd"],[12],[2,"\\n          in service mesh with proxy and gateway\\n        "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,0],[[32,1,["ConnectedWithProxy"]]],null,[["default","else"],[{"statements":[[2,"        "],[10,"dd"],[12],[2,"\\n          in service mesh with proxy\\n        "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,0],[[32,1,["ConnectedWithGateway"]]],null,[["default"],[{"statements":[[2,"        "],[10,"dd"],[12],[2,"\\n          in service mesh with gateway\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[8,"consul/bucket/list",[],[["@item","@nspace","@partition"],[[32,1],[32,6],[32,3]]],null],[2,"\\n    "],[8,"tag-list",[],[["@item"],[[32,1]]],null],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1,2]}]]]],"hasEval":false,"upvars":["if","and","format-number","pluralize","eq","hash","not-eq","href-to","gt","or"]}',meta:{moduleName:"consul-ui/components/consul/service/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/service/search-bar/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"tDwWS/Y3",block:'{"symbols":["__arg0","__arg1","search","components","Optgroup","Option","selectable","search","components","Optgroup","Option","source","nonDefaultPartitions","partition","components","Optgroup","Option","state","kind","components","Optgroup","Option","state","search","components","Optgroup","Option","prop","search","key","value","@sort","@filter","@sources","@partitions","@partition","@onsearch","@search","&attrs"],"statements":[[8,"search-bar",[[24,0,"consul-service-search-bar"],[17,39]],[["@filter","@namedBlocksInfo"],[[32,33],[30,[36,16],null,[["status","search","filter","sort"],[1,1,1,1]]]]],[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"status"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,0],[[30,[36,10],["components.consul.service.search-bar.",[32,29,["status","key"]]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,29,["status","key"]]],null],[30,[36,10],["common.consul.",[32,29,["status","key"]]],null]],null]]]],[30,[36,0],[[30,[36,10],["components.consul.service.search-bar.",[32,29,["status","value"]]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,29,["status","value"]]],null],[30,[36,10],["common.consul.",[32,29,["status","value"]]],null],[30,[36,10],["common.brand.",[32,29,["status","value"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,29,["RemoveFilter"]],[[16,"aria-label",[30,[36,0],["common.ui.remove"],[["item"],[[30,[36,10],[[32,30]," ",[32,31]],null]]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[1,[32,30]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,31]],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[30,31]}]]],[2,"\\n    "]],"parameters":[29]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"search"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,24,["Search"]],[],[["@onsearch","@value","@placeholder"],[[30,[36,3],[[32,0],[32,37]],null],[32,38],[30,[36,0],["common.search.search"],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,24,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,33,["searchproperty","change"]]],null],true,true]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[2,"\\n              "],[1,[30,[36,0],["common.search.searchproperty"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,25,["Optgroup"]],[32,25,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[32,33,["searchproperty","default"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,27],[],[["@value","@selected"],[[32,28],[30,[36,9],[[32,28],[32,33,["searchproperty","value"]]],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[30,[36,15],[[32,28]],null]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[28]}]]]],"parameters":[26,27]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[25]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[24]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"filter"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,8,["Select"]],[[24,0,"type-status"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,33,["status","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["common.consul.status"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,20,["Optgroup"]],[32,20,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[30,[36,4],["passing","warning","critical","empty"],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,22],[[16,0,[31,["value-",[32,23]]]]],[["@value","@selected"],[[32,23],[30,[36,9],[[32,23],[32,33,["status","value"]]],null]]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[32,23]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,23]],null]],null]]]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[23]}]]]],"parameters":[21,22]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[20]}]]],[2,"\\n      "],[8,[32,8,["Select"]],[],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,33,["kind","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["components.consul.service.search-bar.kind"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,15,["Optgroup"]],[32,15,["Option"]]],null,[["default"],[{"statements":[[2,"          "],[8,[32,17],[],[["@value","@selected"],["service",[30,[36,9],["service",[32,33,["kind","value"]]],null]]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],["common.consul.service"],null]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,16],[],[["@label"],[[30,[36,0],["common.consul.gateway"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,12],[[30,[36,11],[[30,[36,11],[[30,[36,4],["ingress-gateway","terminating-gateway","mesh-gateway"],null]],null]],null]],null,[["default"],[{"statements":[[2,"            "],[8,[32,17],[],[["@value","@selected"],[[32,19],[30,[36,9],[[32,19],[32,33,["kind","value"]]],null]]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[32,19]],null]],null]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[19]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,16],[],[["@label"],[[30,[36,0],["common.consul.mesh"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,12],[[30,[36,11],[[30,[36,11],[[30,[36,4],["in-mesh","not-in-mesh"],null]],null]],null]],null,[["default"],[{"statements":[[2,"            "],[8,[32,17],[],[["@value","@selected"],[[32,18],[30,[36,9],[[32,18],[32,33,["kind","value"]]],null]]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,0],[[30,[36,10],["common.search.",[32,18]],null]],null]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[18]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[16,17]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[15]}]]],[2,"\\n"],[6,[37,8],[[30,[36,13],[[32,34,["length"]],0],null]],null,[["default"],[{"statements":[[2,"      "],[8,[32,8,["Select"]],[[24,0,"type-source"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,33,["source","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["common.search.source"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,9,["Optgroup"]],[32,9,["Option"]]],null,[["default"],[{"statements":[[6,[37,6],[[30,[36,14],["Partition",[32,36],[32,35]],null]],null,[["default"],[{"statements":[[6,[37,8],[[30,[36,13],[[32,13,["length"]],0],null]],null,[["default"],[{"statements":[[2,"    "],[8,[32,10],[],[["@label"],[[30,[36,0],["common.brand.consul"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,12],[[30,[36,11],[[30,[36,11],[[32,35]],null]],null]],null,[["default"],[{"statements":[[2,"      "],[8,[32,11],[[24,0,"partition"]],[["@value","@selected"],[[32,14],[30,[36,9],[[32,14],[32,33,["source","value"]]],null]]],[["default"],[{"statements":[[2,"\\n        "],[1,[32,14]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[14]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[13]}]]],[2,"\\n"],[6,[37,8],[[30,[36,13],[[32,34,["length"]],0],null]],null,[["default"],[{"statements":[[2,"    "],[8,[32,10],[],[["@label"],[[30,[36,0],["common.search.integrations"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,12],[[30,[36,11],[[30,[36,11],[[32,34]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,11],[[16,0,[32,12]]],[["@value","@selected"],[[32,12],[30,[36,9],[[32,12],[32,33,["source","value"]]],null]]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],[[30,[36,10],["common.brand.",[32,12]],null]],null]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[12]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[10,11]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[9]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"sort"],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,32,["change"]]],null],false,true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,4],[[30,[36,4],["Name:asc",[30,[36,0],["common.sort.alpha.asc"],null]],null],[30,[36,4],["Name:desc",[30,[36,0],["common.sort.alpha.desc"],null]],null],[30,[36,4],["Status:asc",[30,[36,0],["common.sort.status.asc"],null]],null],[30,[36,4],["Status:desc",[30,[36,0],["common.sort.status.desc"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[1,[30,[36,2],[[32,7],[32,32,["value"]]],null]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,4,["Optgroup"]],[32,4,["Option"]]],null,[["default"],[{"statements":[[2,"          "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.consul.status"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Status:asc",[30,[36,1],["Status:asc",[32,32,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.status.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Status:desc",[30,[36,1],["Status:desc",[32,32,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.status.desc"],null]]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.consul.service-name"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Name:asc",[30,[36,1],["Name:asc",[32,32,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Name:desc",[30,[36,1],["Name:desc",[32,32,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.desc"],null]]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["t","eq","get","action","array","from-entries","let","-is-named-block-invocation","if","contains","concat","-track-array","each","gt","reject-by","lowercase","hash"]}',meta:{moduleName:"consul-ui/components/consul/service/search-bar/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/source/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"GdArOCfb",block:'{"symbols":["@source"],"statements":[[10,"dl"],[14,0,"tooltip-panel"],[12],[2,"\\n  "],[10,"dt"],[12],[2,"\\n    "],[10,"span"],[14,0,"consul-source"],[12],[2,"\\n      "],[1,[32,1]],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n  "],[10,"dd"],[12],[2,"\\n    "],[8,"menu-panel",[],[["@position"],["left"]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[1,[30,[36,0],["components.consul.source.header"],null]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["menu"]],[["default"],[{"statements":[[2,"\\n        "],[10,"li"],[14,"role","separator"],[12],[2,"\\n          "],[1,[30,[36,0],["components.consul.source.menu-title"],null]],[2,"\\n        "],[13],[2,"\\n        "],[10,"li"],[14,"role","none"],[14,0,"docs-link"],[12],[2,"\\n          "],[10,"a"],[14,"tabindex","-1"],[14,"role","menuitem"],[15,6,[31,[[30,[36,1],["CONSUL_DOCS_URL"],null],"/connect/l7-traffic"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"\\n            "],[1,[30,[36,0],["components.consul.source.links.documentation"],null]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "],[13],[2,"\\n"],[13],[2,"\\n\\n"]],"hasEval":false,"upvars":["t","env"]}',meta:{moduleName:"consul-ui/components/consul/source/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/token/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"FbsUqUSU",block:'{"symbols":["item","Actions","Action","Confirmation","Confirm","Confirmation","Confirm","Confirmation","Confirm","@ondelete","@onuse","@onlogout","@onclone","@items","@token"],"statements":[[8,"list-collection",[[24,0,"consul-token-list"]],[["@items"],[[32,14]]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[30,[36,2],[[32,1,["AccessorID"]],[32,15,["AccessorID"]]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"dl"],[14,"rel","me"],[12],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[8,"tooltip",[],[["@position"],["top-start"]],[["default"],[{"statements":[[2,"\\n              Your token\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[10,"a"],[15,6,[30,[36,4],["dc.acls.tokens.edit",[32,1,["AccessorID"]]],null]],[12],[1,[30,[36,5],[[32,1,["AccessorID"]],-8],null]],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"Scope"],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n              "],[1,[30,[36,3],[[32,1,["Local"]],"local","global"],null]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n        "],[8,"consul/token/ruleset/list",[],[["@item"],[[32,1]]],null],[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"Description"],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n              "],[1,[30,[36,6],[[32,1,["Description"]],[32,1,["Name"]]],null]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[32,1,["hasSecretID"]]],null,[["default"],[{"statements":[[2,"      "],[8,"copy-button",[],[["@value","@name"],[[32,1,["SecretID"]],[30,[36,1],["components.consul.token.secretID"],null]]],[["default"],[{"statements":[[2,"\\n        "],[1,[30,[36,1],["components.consul.token.secretID"],null]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[8,[32,2],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,3],[],[["@href"],[[30,[36,4],["dc.acls.tokens.edit",[32,1,["AccessorID"]]],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[30,[36,7],["write token"],[["item"],[[32,1]]]]],null,[["default","else"],[{"statements":[[2,"            Edit\\n"]],"parameters":[]},{"statements":[[2,"            View\\n"]],"parameters":[]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"],[6,[37,3],[[30,[36,7],["duplicate token"],[["item"],[[32,1]]]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,3],[],[["@onclick"],[[30,[36,0],[[32,0],[32,13],[32,1]],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n            Duplicate\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[6,[37,3],[[30,[36,2],[[32,1,["AccessorID"]],[35,8,["AccessorID"]]],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,[32,3],[[24,0,"dangerous"]],[["@onclick"],[[30,[36,0],[[32,0],[32,12],[32,1]],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n            Logout\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["confirmation"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,8],[[24,0,"warning"]],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                Confirm logout\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[10,"p"],[12],[2,"\\n                  Are you sure you want to stop using this ACL token? This will log you out.\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["confirm"]],[["default"],[{"statements":[[2,"\\n                "],[8,[32,9],[],[[],[]],[["default"],[{"statements":[[2,"Logout"]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[9]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[8]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,[32,3],[],[["@onclick"],[[30,[36,0],[[32,0],[32,11],[32,1]],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n            Use\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["confirmation"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[[24,0,"warning"]],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                Confirm use\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[10,"p"],[12],[2,"\\n                  Are you sure you want to use this ACL token?\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["confirm"]],[["default"],[{"statements":[[2,"\\n                "],[8,[32,7],[],[[],[]],[["default"],[{"statements":[[2,"Use"]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[7]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[6]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n\\n"],[6,[37,3],[[30,[36,7],["delete token"],[["item","token"],[[32,1],[32,15]]]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,3],[[24,0,"dangerous"]],[["@onclick"],[[30,[36,0],[[32,0],[32,10],[32,1]],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n            Delete\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["confirmation"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,4],[[24,0,"warning"]],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                Confirm delete\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[10,"p"],[12],[2,"\\n                  Are you sure you want to delete this token?\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["confirm"]],[["default"],[{"statements":[[2,"\\n                "],[8,[32,5],[],[[],[]],[["default"],[{"statements":[[2,"Delete"]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[5]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[4]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[3]}]]],[2,"\\n    "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["action","t","eq","if","href-to","substr","or","can","token"]}',meta:{moduleName:"consul-ui/components/consul/token/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/token/notifications/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"8YjZ0J1V",block:'{"symbols":["error","@status","@type","@item","@error"],"statements":[[6,[37,1],[[30,[36,2],[[32,3],"create"],null]],null,[["default","else"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    The token has been added.\\n"]],"parameters":[]},{"statements":[[2,"    There was an error adding the token.\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,2],[[32,3],"update"],null]],null,[["default","else"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    The token has been saved.\\n"]],"parameters":[]},{"statements":[[2,"    There was an error saving the token.\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,2],[[32,3],"delete"],null]],null,[["default","else"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    The token was deleted.\\n"]],"parameters":[]},{"statements":[[2,"    There was an error deleting the token.\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,2],[[32,3],"clone"],null]],null,[["default","else"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    The token has been cloned as "],[1,[30,[36,3],[[32,4,["AccessorID"]],8,false],null]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    There was an error cloning the token.\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,2],[[32,3],"use"],null]],null,[["default"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    You are now using the new ACL token\\n"]],"parameters":[]},{"statements":[[2,"    There was an error using that ACL token.\\n"]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[6,[37,4],[[32,5,["errors","firstObject"]]],null,[["default"],[{"statements":[[6,[37,1],[[32,1,["detail"]]],null,[["default"],[{"statements":[[2,"    "],[10,"br"],[12],[13],[1,[30,[36,0],["(",[30,[36,1],[[32,1,["status"]],[30,[36,0],[[32,1,["status"]],": "],null]],null],[32,1,["detail"]],")"],null]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["concat","if","eq","truncate","let"]}',meta:{moduleName:"consul-ui/components/consul/token/notifications/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/token/ruleset/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"BIcaaAvq",block:'{"symbols":["policies","policies","item","identities","item","management","item"],"statements":[[6,[37,10],[[30,[36,12],[[30,[36,7],[[35,6,["Policies"]],[35,6,["ACLs","PolicyDefaults"]],[30,[36,5],null,null]],null]],null]],null,[["default"],[{"statements":[[6,[37,10],[[30,[36,8],[[32,1],"management"],null]],null,[["default"],[{"statements":[[6,[37,4],[[30,[36,3],[[32,6,["length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n            Management\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n"],[6,[37,2],[[30,[36,1],[[30,[36,1],[[30,[36,8],[[32,1],"management"],null]],null]],null]],null,[["default"],[{"statements":[[2,"                "],[10,"span"],[15,0,[30,[36,0],[[32,7]],null]],[12],[1,[32,7,["Name"]]],[13],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[6]}]]],[6,[37,10],[[30,[36,8],[[32,1],"identities"],null]],null,[["default"],[{"statements":[[6,[37,4],[[30,[36,3],[[32,4,["length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"Identities"],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n"],[6,[37,2],[[30,[36,1],[[30,[36,1],[[32,4]],null]],null]],null,[["default"],[{"statements":[[2,"                "],[10,"span"],[15,0,[30,[36,0],[[32,5]],null]],[12],[1,[32,5,["Name"]]],[13],[2,"\\n"]],"parameters":[5]}]]],[2,"          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[4]}]]],[6,[37,4],[[30,[36,11],[[35,6]],null]],null,[["default","else"],[{"statements":[[2,"        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"Rules"],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n              Legacy tokens have embedded rules.\\n          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,10],[[30,[36,9],[[30,[36,8],[[32,1],"policies"],null],[30,[36,7],[[35,6,["Roles"]],[35,6,["ACLs","RoleDefaults"]],[30,[36,5],null,null]],null]],null]],null,[["default"],[{"statements":[[6,[37,4],[[30,[36,3],[[32,2,["length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"Rules"],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n"],[6,[37,2],[[30,[36,1],[[30,[36,1],[[32,2]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[10,"span"],[15,0,[30,[36,0],[[32,3]],null]],[12],[1,[32,3,["Name"]]],[13],[2,"\\n"]],"parameters":[3]}]]],[2,"          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[2]}]]]],"parameters":[]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["policy/typeof","-track-array","each","gt","if","array","item","or","get","append","let","token/is-legacy","policy/group"]}',meta:{moduleName:"consul-ui/components/consul/token/ruleset/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:""}))
+e.default=n})),define("consul-ui/components/consul/token/search-bar/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"MmGQHD2n",block:'{"symbols":["__arg0","__arg1","search","components","Optgroup","Option","selectable","search","components","Optgroup","Option","state","search","components","Optgroup","Option","prop","search","key","value","@sort","@filter","@onsearch","@search","&attrs"],"statements":[[8,"search-bar",[[24,0,"consul-token-search-bar"],[17,25]],[["@filter","@namedBlocksInfo"],[[32,22],[30,[36,14],null,[["status","search","filter","sort"],[1,1,1,1]]]]],[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"status"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,0],[[30,[36,10],["components.consul.token.search-bar.",[32,18,["status","key"]],".name"],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,18,["status","key"]]],null],[30,[36,10],["common.consul.",[32,18,["status","key"]]],null]],null]]]],[30,[36,0],[[30,[36,10],["components.consul.token.search-bar.",[32,18,["status","key"]],".options.",[32,18,["status","value"]]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,18,["status","value"]]],null],[30,[36,10],["common.consul.",[32,18,["status","value"]]],null],[30,[36,10],["common.brand.",[32,18,["status","value"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,18,["RemoveFilter"]],[[16,"aria-label",[30,[36,0],["common.ui.remove"],[["item"],[[30,[36,10],[[32,19]," ",[32,20]],null]]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[1,[32,19]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,20]],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[19,20]}]]],[2,"\\n    "]],"parameters":[18]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"search"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,13,["Search"]],[],[["@onsearch","@value","@placeholder"],[[30,[36,3],[[32,0],[32,23]],null],[32,24],[30,[36,0],["common.search.search"],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,13,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,22,["searchproperty","change"]]],null],true,true]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[2,"\\n              "],[1,[30,[36,0],["common.search.searchproperty"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,14,["Optgroup"]],[32,14,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[32,22,["searchproperty","default"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,16],[],[["@value","@selected"],[[32,17],[30,[36,9],[[32,17],[32,22,["searchproperty","value"]]],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[30,[36,13],[[32,17]],null]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[17]}]]]],"parameters":[15,16]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[14]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[13]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"filter"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,8,["Select"]],[[24,0,"type-status"]],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,22,["kind","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["components.consul.token.search-bar.kind.name"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,9,["Optgroup"]],[32,9,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[30,[36,4],["global-management","global","local"],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,11],[[16,0,[31,["value-",[32,12]]]]],[["@value","@selected"],[[32,12],[30,[36,9],[[32,12],[32,22,["kind","value"]]],null]]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],[[30,[36,10],["components.consul.token.search-bar.kind.options.",[32,12]],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,12]],null]],null]]]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[12]}]]]],"parameters":[10,11]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[9]}]]],[2,"\\n    "]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"sort"],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,21,["change"]]],null],false,true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,4],[[30,[36,4],["CreateTime:desc",[30,[36,0],["common.sort.age.desc"],null]],null],[30,[36,4],["CreateTime:asc",[30,[36,0],["common.sort.age.asc"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[1,[30,[36,2],[[32,7],[32,21,["value"]]],null]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,4,["Optgroup"]],[32,4,["Option"]]],null,[["default"],[{"statements":[[2,"        "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.ui.creation"],null]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["CreateTime:desc",[30,[36,1],["CreateTime:desc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.age.desc"],null]]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6],[],[["@value","@selected"],["CreateTime:asc",[30,[36,1],["CreateTime:asc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.age.asc"],null]]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["t","eq","get","action","array","from-entries","let","-is-named-block-invocation","if","contains","concat","-track-array","each","lowercase","hash"]}',meta:{moduleName:"consul-ui/components/consul/token/search-bar/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/token/selector/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l
+function s(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const i=Ember.HTMLBars.template({id:"lqyx1nTC",block:'{"symbols":["__arg0","__arg1","authDialog","disclosure","panel","menu","modal","authForm","authDialog","modal","authForm","@dc","@nspace","@partition","&default"],"statements":[[6,[37,4],[[30,[36,7],["use acls"],null]],null,[["default"],[{"statements":[[2,"  "],[10,"li"],[12],[2,"\\n\\n    "],[8,"auth-dialog",[],[["@src","@sink","@onchange","@namedBlocksInfo"],[[30,[36,8],["settings://consul:token"],null],[30,[36,8],["settings://consul:token"],null],[32,0,["reauthorize"]],[30,[36,0],null,[["unauthorized","authorized"],[1,1]]]]],[["default"],[{"statements":[[6,[37,4],[[30,[36,6],[[32,1],"unauthorized"],null]],null,[["default","else"],[{"statements":[[6,[37,5],[[32,2]],null,[["default"],[{"statements":[[2,"\\n        "],[8,"portal",[],[["@target"],["app-before-skip-links"]],[["default"],[{"statements":[[2,"\\n          "],[8,"action",[[4,[38,2],["click",[30,[36,3],[[32,0,["modal","open"]]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n            Login\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"action",[[4,[38,2],["click",[30,[36,3],[[32,0,["modal","open"]]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n          Log in\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"modal-dialog",[],[["@name","@onclose","@onopen","@aria"],["login-toggle",[32,0,["close"]],[32,0,["open"]],[30,[36,0],null,[["label"],["Log in to Consul"]]]]],[["default"],[{"statements":[[2,"\\n          "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"modal",[32,10]]],null],[2,"\\n          "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n            "],[10,"h2"],[12],[2,"\\n              Log in to Consul\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n            "],[8,"auth-form",[],[["@dc","@partition","@nspace","@onsubmit"],[[32,12,["Name"]],[32,14],[32,13],[30,[36,1],[[32,0],[32,9,["login"]]],[["value"],["data"]]]]],[["default"],[{"statements":[[2,"\\n              "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"authForm",[32,11]]],null],[2,"\\n"],[6,[37,4],[[30,[36,7],["use SSO"],null]],null,[["default"],[{"statements":[[2,"                "],[8,[32,11,["Method"]],[],[["@matches"],["sso"]],[["default"],[{"statements":[[2,"\\n                  "],[8,"oidc-select",[],[["@dc","@nspace","@disabled","@onchange","@onerror"],[[32,12,["Name"]],[32,13],[32,11,["disabled"]],[32,11,["submit"]],[32,11,["error"]]]],null],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"            "]],"parameters":[11]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n            "],[8,"action",[[4,[38,2],["click",[32,10,["close"]]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n              Continue without logging in\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[10]}]]],[2,"\\n      "]],"parameters":[9]}]]]],"parameters":[]},{"statements":[[6,[37,4],[[30,[36,6],[[32,1],"authorized"],null]],null,[["default"],[{"statements":[[6,[37,5],[[32,2]],null,[["default"],[{"statements":[[2,"\\n        "],[8,"modal-dialog",[],[["@name","@onclose","@onopen","@aria"],["login-toggle",[32,0,["close"]],[32,0,["open"]],[30,[36,0],null,[["label"],["Log in with a different token"]]]]],[["default"],[{"statements":[[2,"\\n          "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"modal",[32,7]]],null],[2,"\\n          "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n            "],[10,"h2"],[12],[2,"\\n              Log in with a different token\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n            "],[8,"auth-form",[],[["@dc","@nspace","@partition","@onsubmit"],[[32,12,["Name"]],[32,13],[32,14],[30,[36,1],[[32,0],[32,3,["login"]]],[["value"],["data"]]]]],[["default"],[{"statements":[[2,"\\n              "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"authForm",[32,8]]],null],[2,"\\n            "]],"parameters":[8]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n            "],[8,"action",[[4,[38,2],["click",[32,7,["close"]]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n              Continue without logging in\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[7]}]]],[2,"\\n        "],[8,"portal",[],[["@target"],["app-before-skip-links"]],[["default"],[{"statements":[[2,"\\n          "],[8,"action",[[4,[38,2],["click",[30,[36,3],[[32,3,["logout"]]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n            Logout\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"disclosure-menu",[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,4,["Action"]],[[4,[38,2],["click",[32,4,["toggle"]]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n            Logout\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,4,["Menu"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n"],[6,[37,4],[[32,3,["token","AccessorID"]]],null,[["default"],[{"statements":[[2,"            "],[8,"auth-profile",[],[["@item"],[[32,3,["token"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"            "],[8,[32,5,["Menu"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,[32,6,["Separator"]],[],[[],[]],null],[2,"\\n              "],[8,[32,6,["Item"]],[[24,0,"dangerous"]],[[],[]],[["default"],[{"statements":[[2,"\\n                "],[8,[32,6,["Action"]],[[4,[38,2],["click",[30,[36,3],[[32,3,["logout"]]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n                  Logout\\n                "]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[6]}]]],[2,"\\n          "]],"parameters":[5]}]]],[2,"\\n        "]],"parameters":[4]}]]],[2,"\\n      "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]],[2,"\\n\\n  "],[13],[2,"\\n"],[18,15,[[30,[36,0],null,[["open","close"],[[32,0,["modal","open"]],[32,0,["model","close"]]]]]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"]],"hasEval":false,"upvars":["hash","action","on","optional","if","let","-is-named-block-invocation","can","uri"]}',meta:{moduleName:"consul-ui/components/consul/token/selector/index.hbs"}})
+let o=(n=Ember._action,r=Ember._action,a=Ember._action,s((l=class extends t.default{open(){this.authForm.focus()}close(){this.authForm.reset()}reauthorize(e){this.modal.close(),this.args.onchange(e)}}).prototype,"open",[n],Object.getOwnPropertyDescriptor(l.prototype,"open"),l.prototype),s(l.prototype,"close",[r],Object.getOwnPropertyDescriptor(l.prototype,"close"),l.prototype),s(l.prototype,"reauthorize",[a],Object.getOwnPropertyDescriptor(l.prototype,"reauthorize"),l.prototype),l)
+e.default=o,Ember._setComponentTemplate(i,o)})),define("consul-ui/components/consul/tomography/graph/index",["exports","@glimmer/component"],(function(e,t){var n,r,a
+function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const s=Ember.HTMLBars.template({id:"rK0KE41X",block:'{"symbols":["item","&attrs"],"statements":[[11,"div"],[24,0,"tomography-graph"],[17,2],[12],[2,"\\n  "],[10,"svg"],[15,"width",[32,0,["size"]]],[15,"height",[32,0,["size"]]],[12],[2,"\\n      "],[10,"g"],[15,"transform",[31,["translate(",[30,[36,5],[[32,0,["size"]],2],null],", ",[30,[36,5],[[32,0,["size"]],2],null],")"]]],[12],[2,"\\n          "],[10,"g"],[12],[2,"\\n              "],[10,"circle"],[14,0,"background"],[15,"r",[32,0,["circle","0"]]],[12],[13],[2,"\\n              "],[10,"circle"],[14,0,"axis"],[15,"r",[32,0,["circle","1"]]],[12],[13],[2,"\\n              "],[10,"circle"],[14,0,"axis"],[15,"r",[32,0,["circle","2"]]],[12],[13],[2,"\\n              "],[10,"circle"],[14,0,"axis"],[15,"r",[32,0,["circle","3"]]],[12],[13],[2,"\\n              "],[10,"circle"],[14,0,"border"],[15,"r",[32,0,["circle","4"]]],[12],[13],[2,"\\n          "],[13],[2,"\\n          "],[10,"g"],[14,0,"lines"],[12],[2,"\\n"],[6,[37,7],[[30,[36,6],[[30,[36,6],[[32,0,["distances"]]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[11,"rect"],[16,"transform",[31,["rotate(",[32,1,["rotate"]],")"]]],[16,"width",[32,1,["y2"]]],[24,"height","1"],[4,[38,4],[[30,[36,1],[[32,1,["node"]]," - ",[30,[36,3],[[32,1,["distance"]]],[["maximumFractionDigits"],[2]]],"ms",[30,[36,2],[[32,1,["segment"]],[30,[36,1],["<br />(Segment: ",[32,1,["segment"]],")"],null]],null]],null]],[["options"],[[30,[36,0],null,[["followCursor","allowHTML"],[true,true]]]]]],[12],[13],[2,"\\n"]],"parameters":[1]}]]],[2,"          "],[13],[2,"\\n          "],[10,"g"],[14,0,"labels"],[12],[2,"\\n              "],[10,"circle"],[14,0,"point"],[14,"r","5"],[12],[13],[2,"\\n              "],[10,"g"],[14,0,"tick"],[15,"transform",[31,["translate(0, ",[32,0,["labels","0"]],")"]]],[12],[2,"\\n                  "],[10,"line"],[14,"x2","70"],[12],[13],[2,"\\n                  "],[10,"text"],[14,"x","75"],[14,"y","0"],[14,"dy",".32em"],[12],[1,[30,[36,3],[[32,0,["milliseconds","0"]]],[["maximumFractionDigits"],[2]]]],[2,"ms"],[13],[2,"\\n              "],[13],[2,"\\n              "],[10,"g"],[14,0,"tick"],[15,"transform",[31,["translate(0, ",[32,0,["labels","1"]],")"]]],[12],[2,"\\n                  "],[10,"line"],[14,"x2","70"],[12],[13],[2,"\\n                  "],[10,"text"],[14,"x","75"],[14,"y","0"],[14,"dy",".32em"],[12],[1,[30,[36,3],[[32,0,["milliseconds","1"]]],[["maximumFractionDigits"],[2]]]],[2,"ms"],[13],[2,"\\n              "],[13],[2,"\\n              "],[10,"g"],[14,0,"tick"],[15,"transform",[31,["translate(0, ",[32,0,["labels","2"]],")"]]],[12],[2,"\\n                  "],[10,"line"],[14,"x2","70"],[12],[13],[2,"\\n                  "],[10,"text"],[14,"x","75"],[14,"y","0"],[14,"dy",".32em"],[12],[1,[30,[36,3],[[32,0,["milliseconds","2"]]],[["maximumFractionDigits"],[2]]]],[2,"ms"],[13],[2,"\\n              "],[13],[2,"\\n              "],[10,"g"],[14,0,"tick"],[15,"transform",[31,["translate(0, ",[32,0,["labels","3"]],")"]]],[12],[2,"\\n                  "],[10,"line"],[14,"x2","70"],[12],[13],[2,"\\n                  "],[10,"text"],[14,"x","75"],[14,"y","0"],[14,"dy",".32em"],[12],[1,[30,[36,3],[[32,0,["milliseconds","3"]]],[["maximumFractionDigits"],[2]]]],[2,"ms"],[13],[2,"\\n              "],[13],[2,"\\n          "],[13],[2,"\\n      "],[13],[2,"\\n  "],[13],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["hash","concat","if","format-number","tooltip","div","-track-array","each"]}',meta:{moduleName:"consul-ui/components/consul/tomography/graph/index.hbs"}}),i=function(e){return 160*e}
+let o=(n=Ember._tracked,r=class extends t.default{constructor(...e){var t,n,r,s
+super(...e),t=this,n="max",s=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(s):void 0}),l(this,"size",336),l(this,"circle",[i(1),i(.25),i(.5),i(.75),i(1)]),l(this,"labels",[i(-.25),i(-.5),i(-.75),i(-1)])}get milliseconds(){const e=(this.args.distances||[]).reduce((e,t)=>Math.max(e,t.distance),this.max)
+return[25,50,75,100].map(t=>function(e,t){return t>0?parseInt(t*e)/100:0}(t,e))}get distances(){let e=this.args.distances||[]
+const t=e.reduce((e,t)=>Math.max(e,t.distance),this.max),n=e.length
+if(n>360){const t=360/n
+e=e.filter((function(e,r){return 0==r||r==n-1||Math.random()<t}))}return e.map((n,r)=>({rotate:360*r/e.length,y2:n.distance/t*160,node:n.node,distance:n.distance,segment:n.segment}))}},u=r.prototype,c="max",d=[n],m={configurable:!0,enumerable:!0,writable:!0,initializer:function(){return-999999999}},f={},Object.keys(m).forEach((function(e){f[e]=m[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=d.slice().reverse().reduce((function(e,t){return t(u,c,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,c,f),f=null),a=f,r)
+var u,c,d,m,p,f
+e.default=o,Ember._setComponentTemplate(s,o)})),define("consul-ui/components/consul/transparent-proxy/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"+31LUgoZ",block:'{"symbols":[],"statements":[[10,"span"],[14,0,"consul-transparent-proxy"],[12],[2,"\\n  "],[1,[30,[36,0],["components.consul.transparent-proxy"],null]],[2,"\\n"],[13]],"hasEval":false,"upvars":["t"]}',meta:{moduleName:"consul-ui/components/consul/transparent-proxy/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/upstream-instance/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"Xj0kgGX9",block:'{"symbols":["item","combinedAddress","@partition","@nspace","@dc","&attrs","@items"],"statements":[[11,"div"],[24,0,"consul-upstream-instance-list"],[17,6],[12],[2,"\\n  "],[10,"ul"],[12],[2,"\\n"],[6,[37,10],[[30,[36,9],[[30,[36,9],[[32,7]],null]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"li"],[12],[2,"\\n\\n      "],[10,"div"],[14,0,"header"],[12],[2,"\\n        "],[10,"p"],[12],[2,"\\n          "],[1,[32,1,["DestinationName"]]],[2,"\\n        "],[13],[2,"\\n      "],[13],[2,"\\n\\n      "],[10,"div"],[14,0,"detail"],[12],[2,"\\n\\n"],[6,[37,4],[[30,[36,7],[[32,1,["DestinationType"]],"prepared_query"],null]],null,[["default"],[{"statements":[[2,"        "],[8,"consul/bucket/list",[],[["@item","@partition","@nspace"],[[30,[36,6],null,[["Namespace","Partition"],[[30,[36,0],[[32,1,["DestinationNamespace"]],[32,4]],null],[30,[36,0],[[32,1,["DestinationPartition"]],[32,3]],null]]]],[32,3],[32,4]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[6,[37,4],[[30,[36,8],[[30,[36,7],[[32,1,["Datacenter"]],[32,5]],null],[30,[36,7],[[32,1,["Datacenter"]],""],null]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"dl"],[14,0,"datacenter"],[12],[2,"\\n          "],[11,"dt"],[4,[38,5],null,null],[12],[2,"\\n            Datacenter\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[1,[32,1,["Datacenter"]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[6,[37,4],[[32,1,["LocalBindSocketPath"]]],null,[["default","else"],[{"statements":[[2,"        "],[10,"dl"],[14,0,"local-bind-socket-path"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n              Local bind socket path\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[8,"copy-button",[],[["@value","@name"],[[32,1,["LocalBindSocketPath"]],"Local bind socket path"]],null],[2,"\\n            "],[1,[32,1,["LocalBindSocketPath"]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"dl"],[14,0,"local-bind-socket-mode"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n            Mode\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[1,[30,[36,0],[[32,1,["LocalBindSocketMode"]],"-"],null]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"\\n"],[6,[37,4],[[30,[36,3],[[32,1,["LocalBindPort"]],0],null]],null,[["default"],[{"statements":[[6,[37,2],[[30,[36,1],[[30,[36,0],[[32,1,["LocalBindAddress"]],"127.0.0.1"],null],":",[32,1,["LocalBindPort"]]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"dl"],[14,0,"local-bind-address"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n            Address\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n            "],[8,"copy-button",[],[["@value","@name"],[[32,2],"Address"]],null],[2,"\\n              "],[1,[32,2]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[2]}]]]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[1]}]]],[2,"  "],[13],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["or","concat","let","gt","if","tooltip","hash","not-eq","and","-track-array","each"]}',meta:{moduleName:"consul-ui/components/consul/upstream-instance/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n}))
+define("consul-ui/components/consul/upstream-instance/search-bar/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"FXiYZK0f",block:'{"symbols":["__arg0","__arg1","search","components","Optgroup","Option","selectable","search","components","Optgroup","Option","prop","search","key","value","@sort","@filter","@onsearch","@search","&attrs"],"statements":[[8,"search-bar",[[24,0,"consul-upstream-instance-search-bar"],[17,20]],[["@filter","@namedBlocksInfo"],[[32,17],[30,[36,14],null,[["status","search","sort"],[1,1,1]]]]],[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"status"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,1],[[30,[36,11],["components.consul.upstream-instance.search-bar.",[32,13,["status","key"]],".name"],null]],[["default"],[[30,[36,4],[[30,[36,11],["common.search.",[32,13,["status","key"]]],null],[30,[36,11],["common.consul.",[32,13,["status","key"]]],null]],null]]]],[30,[36,1],[[30,[36,11],["components.consul.upstream-instance.search-bar.",[32,13,["status","value"]],".name"],null]],[["default"],[[30,[36,4],[[30,[36,11],["common.search.",[32,13,["status","value"]]],null],[30,[36,11],["common.consul.",[32,13,["status","value"]]],null],[30,[36,11],["common.brand.",[32,13,["status","value"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,13,["RemoveFilter"]],[[16,"aria-label",[30,[36,1],["common.ui.remove"],[["item"],[[30,[36,11],[[32,14]," ",[32,15]],null]]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[1,[32,14]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,15]],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[14,15]}]]],[2,"\\n    "]],"parameters":[13]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"search"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,8,["Search"]],[],[["@onsearch","@value","@placeholder"],[[30,[36,3],[[32,0],[32,18]],null],[32,19],[30,[36,1],["common.search.search"],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,8,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,17,["searchproperty","change"]]],null],true,true]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[2,"\\n              "],[1,[30,[36,1],["common.search.searchproperty"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,9,["Optgroup"]],[32,9,["Option"]]],null,[["default"],[{"statements":[[6,[37,13],[[30,[36,12],[[30,[36,12],[[32,17,["searchproperty","default"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,11],[],[["@value","@selected"],[[32,12],[30,[36,9],[[32,12],[32,17,["searchproperty","value"]]],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,1],[[30,[36,11],["common.consul.",[30,[36,10],[[32,12]],null]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[12]}]]]],"parameters":[10,11]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[9]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"sort"],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,16,["change"]]],null],false,true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,4],[[30,[36,4],["DestinationName:asc",[30,[36,1],["common.sort.alpha.asc"],null]],null],[30,[36,4],["DestinationName:desc",[30,[36,1],["common.sort.alpha.desc"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[1,[30,[36,2],[[32,7],[32,16,["value"]]],null]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,4,["Optgroup"]],[32,4,["Option"]]],null,[["default"],[{"statements":[[2,"            "],[8,[32,6],[],[["@value","@selected"],["DestinationName:asc",[30,[36,0],["DestinationName:asc",[32,16,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,1],["common.sort.alpha.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["DestinationName:desc",[30,[36,0],["DestinationName:desc",[32,16,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,1],["common.sort.alpha.desc"],null]]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["eq","t","get","action","array","from-entries","let","-is-named-block-invocation","if","contains","lowercase","concat","-track-array","each","hash"]}',meta:{moduleName:"consul-ui/components/consul/upstream-instance/search-bar/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/upstream/list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"qkxQac+l",block:'{"symbols":["item","index","address","@nspace","@partition","&attrs","@items"],"statements":[[8,"list-collection",[[24,0,"consul-upstream-list"],[17,6]],[["@items","@linkable"],[[32,7],"linkable upstream"]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[30,[36,6],[[32,1,["InstanceCount"]],0],null]],null,[["default","else"],[{"statements":[[2,"    "],[10,"dl"],[15,0,[32,1,["MeshStatus"]]],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        Health\\n      "],[13],[2,"\\n      "],[11,"dd"],[4,[38,2],null,null],[12],[2,"\\n"],[6,[37,1],[[30,[36,0],["critical",[32,1,["MeshStatus"]]],null]],null,[["default","else"],[{"statements":[[2,"            At least one health check on one instance is failing.\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,0],["warning",[32,1,["MeshStatus"]]],null]],null,[["default","else"],[{"statements":[[2,"            At least one health check on one instance has a warning.\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,0],["passing",[32,1,["MeshStatus"]]],null]],null,[["default","else"],[{"statements":[[2,"            All health checks are passing.\\n"]],"parameters":[]},{"statements":[[2,"            There are no health checks.\\n          "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n    "],[13],[2,"\\n    "],[10,"a"],[15,6,[30,[36,5],["dc.services.show",[32,1,["Name"]]],[["params"],[[30,[36,1],[[30,[36,4],[[32,1,["Partition"]],[32,5]],null],[30,[36,3],null,[["partition","nspace"],[[32,1,["Partition"]],[32,1,["Namespace"]]]]],[30,[36,1],[[30,[36,4],[[32,1,["Namespace"]],[32,4]],null],[30,[36,3],null,[["nspace"],[[32,1,["Namespace"]]]]],[30,[36,3],null,null]],null]],null]]]]],[12],[2,"\\n      "],[1,[32,1,["Name"]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[10,"p"],[12],[2,"\\n      "],[1,[32,1,["Name"]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n    "],[8,"consul/bucket/list",[],[["@item","@nspace","@partition"],[[32,1],[32,4],[32,5]]],null],[2,"\\n"],[6,[37,8],[[30,[36,7],[[30,[36,7],[[32,1,["GatewayConfig","Addresses"]]],null]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"dl"],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        Address\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[8,"copy-button",[],[["@value","@name"],[[32,3],"Address"]],null],[2,"\\n        "],[1,[32,3]],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[3]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["eq","if","tooltip","hash","not-eq","href-to","gt","-track-array","each"]}',meta:{moduleName:"consul-ui/components/consul/upstream/list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/consul/upstream/search-bar/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"BotuftEI",block:'{"symbols":["__arg0","__arg1","search","components","Optgroup","Option","selectable","search","components","Optgroup","Option","item","search","components","Optgroup","Option","prop","search","key","value","@sort","@filter","@onsearch","@search","&attrs"],"statements":[[8,"search-bar",[[24,0,"consul-upstream-search-bar"],[17,25]],[["@filter","@namedBlocksInfo"],[[32,22],[30,[36,14],null,[["status","search","filter","sort"],[1,1,1,1]]]]],[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"status"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,0],[[30,[36,10],["components.consul.upstream.search-bar.",[32,18,["status","key"]],".name"],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,18,["status","key"]]],null],[30,[36,10],["common.consul.",[32,18,["status","key"]]],null]],null]]]],[30,[36,0],[[30,[36,10],["components.consul.upstream.search-bar.",[32,18,["status","value"]],".name"],null]],[["default"],[[30,[36,4],[[30,[36,10],["common.search.",[32,18,["status","value"]]],null],[30,[36,10],["common.consul.",[32,18,["status","value"]]],null],[30,[36,10],["common.brand.",[32,18,["status","value"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"      "],[8,[32,18,["RemoveFilter"]],[[16,"aria-label",[30,[36,0],["common.ui.remove"],[["item"],[[30,[36,10],[[32,19]," ",[32,20]],null]]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[1,[32,19]],[13],[2,"\\n          "],[10,"dd"],[12],[1,[32,20]],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[19,20]}]]],[2,"\\n    "]],"parameters":[18]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"search"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,13,["Search"]],[],[["@onsearch","@value","@placeholder"],[[30,[36,3],[[32,0],[32,23]],null],[32,24],[30,[36,0],["common.search.search"],null]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,13,["Select"]],[[24,0,"type-search-properties"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,22,["searchproperty","change"]]],null],true,true]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[12],[2,"\\n              "],[1,[30,[36,0],["common.search.searchproperty"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,14,["Optgroup"]],[32,14,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[32,22,["searchproperty","default"]]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,16],[],[["@value","@selected"],[[32,17],[30,[36,9],[[32,17],[32,22,["searchproperty","value"]]],null]]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[30,[36,13],[[32,17]],null]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[17]}]]]],"parameters":[15,16]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[14]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[13]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"filter"],null]],null,[["default","else"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,8,["Select"]],[],[["@position","@onchange","@multiple"],["left",[30,[36,3],[[32,0],[32,22,["instance","change"]]],null],true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n            "],[1,[30,[36,0],["components.consul.upstream.search-bar.instance.name"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,9,["Optgroup"]],[32,9,["Option"]]],null,[["default"],[{"statements":[[6,[37,12],[[30,[36,11],[[30,[36,11],[[30,[36,4],["registered","not-registered"],null]],null]],null]],null,[["default"],[{"statements":[[2,"            "],[8,[32,11],[],[["@value","@selected"],[[32,12],[30,[36,9],[[32,12],[32,22,["instance","value"]]],null]]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,0],[[30,[36,10],["common.consul.",[32,12]],null]],null]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[12]}]]]],"parameters":[10,11]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[9]}]]],[2,"\\n    "]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,7],[[32,1],"sort"],null]],null,[["default"],[{"statements":[[6,[37,6],[[32,2]],null,[["default"],[{"statements":[[2,"\\n      "],[8,[32,3,["Select"]],[[24,0,"type-sort"]],[["@position","@onchange","@multiple","@required"],["right",[30,[36,3],[[32,0],[32,21,["change"]]],null],false,true]],[["default"],[{"statements":[[2,"\\n        "],[8,"block-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n          "],[10,"span"],[12],[2,"\\n"],[6,[37,6],[[30,[36,5],[[30,[36,4],[[30,[36,4],["Name:asc",[30,[36,0],["common.sort.alpha.asc"],null]],null],[30,[36,4],["Name:desc",[30,[36,0],["common.sort.alpha.desc"],null]],null],[30,[36,4],["Status:asc",[30,[36,0],["common.sort.status.asc"],null]],null],[30,[36,4],["Status:desc",[30,[36,0],["common.sort.status.desc"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[1,[30,[36,2],[[32,7],[32,21,["value"]]],null]],[2,"\\n"]],"parameters":[7]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,4,["Optgroup"]],[32,4,["Option"]]],null,[["default"],[{"statements":[[2,"          "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.consul.status"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Status:asc",[30,[36,1],["Status:asc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.status.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Status:desc",[30,[36,1],["Status:desc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.status.desc"],null]]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,5],[],[["@label"],[[30,[36,0],["common.consul.service-name"],null]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Name:asc",[30,[36,1],["Name:asc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.asc"],null]]],"parameters":[]}]]],[2,"\\n            "],[8,[32,6],[],[["@value","@selected"],["Name:desc",[30,[36,1],["Name:desc",[32,21,["value"]]],null]]],[["default"],[{"statements":[[1,[30,[36,0],["common.sort.alpha.desc"],null]]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "]],"parameters":[3]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["t","eq","get","action","array","from-entries","let","-is-named-block-invocation","if","contains","concat","-track-array","each","lowercase","hash"]}',meta:{moduleName:"consul-ui/components/consul/upstream/search-bar/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/copy-button/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={id:"copy-button",initial:"idle",on:{RESET:[{target:"idle"}]},states:{idle:{on:{SUCCESS:[{target:"success"}],ERROR:[{target:"error"}]}},success:{},error:{}}}})),define("consul-ui/components/copy-button/index",["exports","@glimmer/component","consul-ui/components/copy-button/chart.xstate"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r=Ember.HTMLBars.template({id:"wLwVUwEq",block:'{"symbols":["State","Guard","Action","dispatch","state","success","error","reset","@name","&attrs","@value","&default"],"statements":[[8,"state-chart",[],[["@src"],[[32,0,["chart"]]]],[["default"],[{"statements":[[2,"\\n  "],[11,"div"],[24,0,"copy-button"],[17,10],[12],[2,"\\n"],[6,[37,9],[[30,[36,8],[[32,4],"SUCCESS"],null],[30,[36,8],[[32,4],"ERROR"],null],[30,[36,8],[[32,4],"RESET"],null]],null,[["default"],[{"statements":[[2,"    "],[11,"button"],[16,"aria-label",[30,[36,0],["components.copy-button.title"],[["name"],[[32,9]]]]],[24,0,"copy-btn"],[17,10],[24,4,"button"],[4,[38,1],[[32,11]],[["success","error"],[[32,6],[32,7]]]],[4,[38,7],[[30,[36,6],[[30,[36,3],[[32,5],"success"],null],[30,[36,0],["components.copy-button.success"],[["name"],[[32,9]]]],[30,[36,0],["components.copy-button.error"],null]],null]],[["options"],[[30,[36,5],null,[["trigger","showOnCreate","delay","onHidden"],["manual",[30,[36,4],[[30,[36,3],[[32,5],"idle"],null]],null],[30,[36,2],[0,3000],null],[32,8]]]]]]],[12],[18,12,null],[13],[2,"\\n"]],"parameters":[6,7,8]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[1,2,3,4,5]}]]],[2,"\\n"]],"hasEval":false,"upvars":["t","with-copyable","array","state-matches","not","hash","if","tooltip","fn","let"]}',meta:{moduleName:"consul-ui/components/copy-button/index.hbs"}})
+class a extends t.default{constructor(){super(...arguments),this.chart=n.default}}e.default=a,Ember._setComponentTemplate(r,a)})),define("consul-ui/components/custom-element/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s,i,o,u
+function c(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function d(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?c(Object(n),!0).forEach((function(t){p(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function m(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function p(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function f(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const b=Ember.HTMLBars.template({id:"aOhJs+XD",block:'{"symbols":["shadow","&default"],"statements":[[8,"shadow-host",[],[[],[]],[["default"],[{"statements":[[2,"\\n  "],[18,2,[[30,[36,1],null,[["root","connect","Template","disconnect"],[[30,[36,0],[[32,0,["setHost"]],[30,[36,0],[[32,1,["host"]]],null]],null],[30,[36,0],[[32,0,["setHost"]],[30,[36,0],[[32,1,["host"]]],null]],null],[32,1,["Template"]],[30,[36,0],[[32,0,["disconnect"]]],null]]]],[32,0,["element"]]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["fn","hash"]}',meta:{moduleName:"consul-ui/components/custom-element/index.hbs"}}),h=new Map,v=new WeakMap,y=(e,t)=>{let n=e.type
+const r=e.default
+switch(t=null==t?e.default:t,-1!==n.indexOf("|")&&(n="string"),n){case"<length>":case"<percentage>":case"<dimension>":case"number":{const e=parseFloat(t)
+return isNaN(e)?void 0===r?0:r:e}case"<integer>":return parseInt(t)
+case"<string>":case"string":return(t||"").toString()}},g=(e,t=HTMLElement,n={},r={})=>{const a=Object.keys(n)
+return customElements.define(e,class extends t{static get observedAttributes(){return a}attributeChangedCallback(e,t,a){const l=y(n[e],t),s=y(n[e],a),i=r["--"+e]
+void 0!==i&&i.track===`[${e}]`&&this.style.setProperty("--"+e,s),"function"==typeof super.attributeChangedCallback&&super.attributeChangedCallback(e,l,s),this.dispatchEvent(new CustomEvent("custom-element.attributeChange",{detail:{name:e,previousValue:l,value:s}}))}}),()=>{}},O=(e,t)=>(e||[]).reduce((e,n)=>{let r
+const a={}
+return t.forEach((e,t)=>{"_"!==e?a[e]=n[t]:r=t}),e[n[r]]=a,e},{})
+let _=(n=Ember._tracked,r=Ember._tracked,a=Ember._action,l=Ember._action,s=Ember._action,i=class extends t.default{constructor(e,t){if(super(...arguments),m(this,"$element",o,this),m(this,"_attributes",u,this),p(this,"__attributes",void 0),p(this,"_attchange",void 0),!h.has(t.element)){const e=g(t.element,t.class,O(t.attrs,["_","type","default","description"]),O(t.cssprops,["_","type","track","description"]))
+h.set(t.element,e)}}get attributes(){return this._attributes}get element(){if(this.$element){if(v.has(this.$element))return v.get(this.$element)
+const n=(e=this.$element,t=this,new Proxy(e,{get:(e,n)=>{switch(n){case"attrs":return t.attributes
+default:if("function"==typeof e[n])return e[n].bind(e)}}}))
+return v.set(this.$element,n),n}var e,t}setHost(e,t){e(t),this.$element=t,this.$element.addEventListener("custom-element.attributeChange",this.attributeChange),(this.args.attrs||[]).forEach(e=>{const n=t.getAttribute(e[0])
+t.attributeChangedCallback(e[0],n,n)})}disconnect(){this.$element.removeEventListener("custom-element.attributeChange",this.attributeChange)}attributeChange(e){var t,n
+e.stopImmediatePropagation(),this.__attributes=d(d({},this.__attributes),{},{[e.detail.name]:e.detail.value}),this._attchange=(t=()=>{this._attributes=this.__attributes},void 0!==(n=this._attchange)&&cancelAnimationFrame(n),requestAnimationFrame(t))}},o=f(i.prototype,"$element",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=f(i.prototype,"_attributes",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return{}}}),f(i.prototype,"setHost",[a],Object.getOwnPropertyDescriptor(i.prototype,"setHost"),i.prototype),f(i.prototype,"disconnect",[l],Object.getOwnPropertyDescriptor(i.prototype,"disconnect"),i.prototype),f(i.prototype,"attributeChange",[s],Object.getOwnPropertyDescriptor(i.prototype,"attributeChange"),i.prototype),i)
+e.default=_,Ember._setComponentTemplate(b,_)})),define("consul-ui/components/data-collection/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O
+function _(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function P(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const w=Ember.HTMLBars.template({id:"V00/q7z+",block:'{"symbols":["@search","&default"],"statements":[[1,[30,[36,3],[[30,[36,2],[[32,0],[30,[36,1],[[30,[36,0],[[32,0],"term"],null],""],null],[32,1]],null]],null]],[2,"\\n"],[18,2,[[30,[36,8],null,[["search","items","Collection","Empty"],[[30,[36,2],[[32,0],[32,0,["search"]]],null],[32,0,["items"]],[30,[36,6],[[30,[36,7],[[32,0,["items","length"]],0],null],[30,[36,4],["anonymous"],null],""],null],[30,[36,6],[[30,[36,5],[[32,0,["items","length"]],0],null],[30,[36,4],["anonymous"],null],""],null]]]]]],[2,"\\n"]],"hasEval":false,"upvars":["set","fn","action","did-update","component","eq","if","gt","hash"]}',meta:{moduleName:"consul-ui/components/data-collection/index.hbs"}})
+let E=(n=Ember.inject.service("filter"),r=Ember.inject.service("sort"),a=Ember.inject.service("search"),l=Ember._tracked,s=Ember.computed.alias("searchService.searchables"),i=Ember.computed("term","args.search"),o=Ember.computed("type","searchMethod","filtered","args.filters"),u=Ember.computed("type","args.sort"),c=Ember.computed("comparator","searched"),d=Ember.computed("searchTerm","searchable","filtered"),m=Ember.computed("type","content","args.filters"),p=Ember.computed("args.{items.[],items.content.[]}"),f=Ember._action,b=class extends t.default{constructor(...e){super(...e),_(this,"filter",h,this),_(this,"sort",v,this),_(this,"searchService",y,this),_(this,"term",g,this),_(this,"searchableMap",O,this)}get type(){return this.args.type}get searchMethod(){return this.args.searchable||"exact"}get searchProperties(){return this.args.filters.searchproperties}get searchTerm(){return this.term||this.args.search||""}get searchable(){const e=Ember.get(this,"args.filters.searchproperty.value")||Ember.get(this,"args.filters.searchproperty")
+return new("string"==typeof this.searchMethod?this.searchableMap[this.searchMethod]:this.args.searchable)(this.filtered,{finders:Object.fromEntries(Object.entries(this.searchService.predicate(this.type)).filter(([t,n])=>void 0===e||e.includes(t)))})}get comparator(){return void 0===this.args.sort?[]:this.sort.comparator(this.type)(this.args.sort)}get items(){let e="comparator"
+return"function"==typeof this.comparator&&(e=this.comparator),Ember.defineProperty(this,"sorted",Ember.computed.sort("searched",e)),this.sorted}get searched(){return""===this.searchTerm?this.filtered:this.searchable.search(this.searchTerm)}get filtered(){if(void 0===this.args.filters)return this.content.slice()
+const e=this.filter.predicate(this.type)
+if(void 0===e)return this.content.slice()
+const t=Object.entries(this.args.filters).filter(([e,t])=>Boolean(t)).map(([e,t])=>[e,"string"!=typeof t?t.value:t])
+return this.content.filter(e(Object.fromEntries(t)))}get content(){const e=this.args.items||[]
+return"function"==typeof e.dispatchEvent?e.content:e}search(e){return this.term=e,this.items}},h=P(b.prototype,"filter",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=P(b.prototype,"sort",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=P(b.prototype,"searchService",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=P(b.prototype,"term",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),O=P(b.prototype,"searchableMap",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P(b.prototype,"searchTerm",[i],Object.getOwnPropertyDescriptor(b.prototype,"searchTerm"),b.prototype),P(b.prototype,"searchable",[o],Object.getOwnPropertyDescriptor(b.prototype,"searchable"),b.prototype),P(b.prototype,"comparator",[u],Object.getOwnPropertyDescriptor(b.prototype,"comparator"),b.prototype),P(b.prototype,"items",[c],Object.getOwnPropertyDescriptor(b.prototype,"items"),b.prototype),P(b.prototype,"searched",[d],Object.getOwnPropertyDescriptor(b.prototype,"searched"),b.prototype),P(b.prototype,"filtered",[m],Object.getOwnPropertyDescriptor(b.prototype,"filtered"),b.prototype),P(b.prototype,"content",[p],Object.getOwnPropertyDescriptor(b.prototype,"content"),b.prototype),P(b.prototype,"search",[f],Object.getOwnPropertyDescriptor(b.prototype,"search"),b.prototype),b)
+e.default=E,Ember._setComponentTemplate(w,E)})),define("consul-ui/components/data-form/index",["exports","block-slots","validated-changeset"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r=Ember.HTMLBars.template({id:"0brDSSRZ",block:'{"symbols":["writer","api","&default"],"statements":[[8,"data-loader",[],[["@items","@src","@onchange","@once"],[[34,2],[30,[36,9],["/${partition}/${nspace}/${dc}/${type}/${src}",[30,[36,8],null,[["partition","nspace","dc","type","src"],[[35,7],[35,6],[35,5],[35,4],[35,3]]]]],null],[30,[36,10],[[32,0],"setData"],null],true]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"data-writer",[],[["@sink","@type","@label","@ondelete","@onchange"],[[30,[36,9],["/${partition}/${nspace}/${dc}/${type}",[30,[36,8],null,[["partition","nspace","dc","type"],[[35,7],[35,6],[30,[36,12],[[35,11,["Datacenter"]],[35,5]],null],[35,4]]]]],null],[34,4],[34,13],[30,[36,10],[[32,0],[35,14]],null],[30,[36,10],[[32,0],[35,15]],null]]],[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,17],[[30,[36,8],null,[["data","change","isCreate","error","disabled","submit","delete"],[[35,11],[30,[36,10],[[32,0],"change"],null],[35,16],[32,1,["error"]],[32,1,["inflight"]],[30,[36,10],[[32,0],[32,1,["persist"]],[35,11]],null],[30,[36,10],[[32,0],[32,1,["delete"]],[35,11]],null]]]]],null,[["default"],[{"statements":[[2,"\\n      "],[18,3,[[32,2]]],[2,"\\n"],[6,[37,1],[[35,0]],null,[["default"],[{"statements":[[2,"      "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n        "],[8,"yield-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n          "],[18,3,[[32,2]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n        "],[8,"yield-slot",[],[["@name"],["form"]],[["default"],[{"statements":[[2,"\\n          "],[18,3,[[32,2]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n\\n"]],"parameters":[2]}]]],[2,"\\n    "]],"parameters":[1]}]]],[2,"\\n\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["hasError","if","item","src","type","dc","nspace","partition","hash","uri","action","data","or","label","ondelete","onsubmit","create","let"]}',meta:{moduleName:"consul-ui/components/data-form/index.hbs"}})
+var a=Ember._setComponentTemplate(r,Ember.Component.extend(t.default,{tagName:"",dom:Ember.inject.service("dom"),builder:Ember.inject.service("form"),create:!1,ondelete:function(){return this.onsubmit(...arguments)},oncancel:function(){return this.onsubmit(...arguments)},onsubmit:function(){},onchange:function(e,t){return t.handleEvent(e)},didReceiveAttrs:function(){this._super(...arguments)
+try{this.form=this.builder.form(this.type)}catch(e){}},willRender:function(){this._super(...arguments),Ember.set(this,"hasError",this._isRegistered("error"))},willDestroyElement:function(){this._super(...arguments),Ember.get(this,"data.isNew")&&this.data.rollbackAttributes()},actions:{setData:function(e){let t=e
+return(0,n.isChangeset)(e)||void 0===this.form||(t=this.form.setData(e).getData()),Ember.get(e,"isNew")&&(Ember.set(this,"create",!0),t=Object.entries(this.autofill||{}).reduce((function(e,[t,n]){return Ember.set(e,t,n),e}),t)),Ember.set(this,"data",t),this.data},change:function(e,t){this.onchange(this.dom.normalizeEvent(e,t),this.form,this.form.getData())}}}))
+e.default=a})),define("consul-ui/components/data-loader/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={id:"data-loader",initial:"load",on:{OPEN:{target:"load"},ERROR:{target:"disconnected"},LOAD:[{target:"idle",cond:"loaded"},{target:"loading"}],INVALIDATE:[{target:"invalidating"}]},states:{load:{},invalidating:{},loading:{on:{SUCCESS:{target:"idle"},ERROR:{target:"error"}}},idle:{},error:{on:{RETRY:{target:"load"}}},disconnected:{on:{RETRY:{target:"load"}}}}}})),define("consul-ui/components/data-loader/index",["exports","block-slots","consul-ui/components/data-loader/chart.xstate"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r=Ember.HTMLBars.template({id:"t05sBy/d",block:'{"symbols":["State","Guard","Action","dispatch","state","api","notice","&default"],"statements":[[18,8,null],[2,"\\n"],[8,"state-chart",[],[["@src"],[[34,17]]],[["default"],[{"statements":[[2,"\\n  "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"dispatch",[32,4]]],null],[2,"\\n  "],[8,[32,2],[],[["@name","@cond"],["loaded",[30,[36,3],[[32,0],"isLoaded"],null]]],null],[2,"\\n\\n\\n"],[6,[37,21],[[30,[36,20],null,[["data","error","invalidate","dispatchError"],[[35,19],[35,0],[30,[36,3],[[32,0],"invalidate"],null],[30,[36,7],[[30,[36,3],[[32,0],[30,[36,18],[[35,0]],null]],[["value"],["error.errors.firstObject"]]],[30,[36,3],[[32,0],[32,4],"ERROR"],null]],null]]]]],null,[["default"],[{"statements":[[2,"\\n"],[6,[37,1],null,[["name"],["data"]],[["default","else"],[{"statements":[[2,"      "],[18,8,[[32,6]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,14],[[30,[36,11],[[35,15]],null]],null,[["default"],[{"statements":[[2,"        "],[8,[32,1],[],[["@notMatches"],[[30,[36,8],["error","disconnected","invalidating"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,14],[[30,[36,13],[[35,6],[30,[36,12],[[30,[36,11],[[35,10]],null],[30,[36,9],[[32,5],"loading"],null]],null]],null]],null,[["default"],[{"statements":[[2,"            "],[8,"data-source",[],[["@open","@src","@onchange","@onerror"],[[34,5],[34,6],[30,[36,7],[[30,[36,3],[[32,0],"change"],[["value"],["data"]]],[30,[36,3],[[32,0],[32,4],"SUCCESS"],null]],null],[32,6,["dispatchError"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"\\n  "],[8,[32,1],[],[["@matches"],["loading"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],null,[["name"],["loading"]],[["default","else"],[{"statements":[[2,"      "],[18,8,[[32,6]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[8,"consul/loader",[],[[],[]],null],[2,"\\n"]],"parameters":[]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n\\n  "],[8,[32,1],[],[["@matches"],["error"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],null,[["name"],["error"]],[["default","else"],[{"statements":[[2,"      "],[18,8,[[32,6]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[8,"error-state",[],[["@error"],[[34,0]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n\\n  "],[8,[32,1],[],[["@matches"],[[30,[36,8],["idle","disconnected","invalidating"],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,[32,1],[],[["@matches"],["disconnected"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,14],[[30,[36,11],[[30,[36,16],[[35,0,["status"]],"401"],null]],null]],null,[["default"],[{"statements":[[6,[37,1],null,[["name","params"],["disconnected",[30,[36,4],[[30,[36,3],[[32,0],[32,4],"RESET"],null]],null]]],[["default","else"],[{"statements":[[2,"            "],[18,8,[[32,6]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          "],[8,"notice",[[24,0,"notification-update"],[4,[38,2],null,[["sticky"],[true]]]],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,7,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"strong"],[12],[2,"Warning!"],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,[32,7,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"p"],[12],[2,"\\n                An error was returned whilst loading this data, refresh to try again.\\n              "],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[7]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n"],[6,[37,14],[[30,[36,16],[[35,0,["status"]],"403"],null]],null,[["default","else"],[{"statements":[[6,[37,1],null,[["name"],["error"]],[["default","else"],[{"statements":[[2,"        "],[18,8,[[32,6]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,"error-state",[],[["@error"],[[34,0]]],null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[2,"      "],[8,"yield-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n        "],[18,8,[[32,6]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n\\n"]],"parameters":[6]}]]],[2,"  "],[1,[30,[36,23],[[30,[36,22],[[32,4],"LOAD"],null]],[["src"],[[35,6]]]]],[2,"\\n"]],"parameters":[1,2,3,4,5]}]]]],"hasEval":false,"upvars":["error","yield-slot","notification","action","block-params","open","src","queue","array","state-matches","once","not","or","and","if","items","eq","chart","mut","data","hash","let","fn","did-update"]}',meta:{moduleName:"consul-ui/components/data-loader/index.hbs"}})
+var a=Ember._setComponentTemplate(r,Ember.Component.extend(t.default,{tagName:"",onchange:e=>e,init:function(){this._super(...arguments),this.chart=n.default},didReceiveAttrs:function(){this._super(...arguments),void 0!==this.items&&this.actions.change.apply(this,[this.items])},didInsertElement:function(){this._super(...arguments),this.dispatch("LOAD")},actions:{invalidate(){this.dispatch("INVALIDATE"),Ember.run.schedule("afterRender",()=>{this.dispatch("LOAD")})},isLoaded:function(){return void 0!==this.items||void 0===this.src},change:function(e){Ember.set(this,"data",this.onchange(e))}}}))
+e.default=a})),define("consul-ui/components/data-sink/index",["exports","consul-ui/utils/dom/event-source"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"R4WHi3tx",block:'{"symbols":["&default"],"statements":[[18,1,[[30,[36,2],null,[["open","state"],[[30,[36,1],[[32,0],"open"],null],[35,0]]]]]],[2,"\\n"]],"hasEval":false,"upvars":["state","action","hash"]}',meta:{moduleName:"consul-ui/components/data-sink/index.hbs"}})
+var r=Ember._setComponentTemplate(n,Ember.Component.extend({tagName:"",service:Ember.inject.service("data-sink/service"),dom:Ember.inject.service("dom"),logger:Ember.inject.service("logger"),onchange:function(){},onerror:function(){},state:Ember.computed("instance","instance.{dirtyType,isSaving}",(function(){let e
+const t=Ember.get(this,"instance.isSaving"),n=Ember.get(this,"instance.dirtyType")
+if(void 0===t&&void 0===n)e="idle"
+else{switch(n){case"created":e=t?"creating":"create"
+break
+case"updated":e=t?"updating":"update"
+break
+case"deleted":case void 0:e=t?"removing":"remove"}e="active."+e}return{matches:t=>-1!==e.indexOf(t)}})),init:function(){this._super(...arguments),this._listeners=this.dom.listeners()},willDestroyElement:function(){this._super(...arguments),this._listeners.remove()},source:function(e){const n=(0,t.once)(e),r=e=>{Ember.set(this,"instance",void 0)
+try{this.onerror(e),this.logger.execute(e)}catch(e){this.logger.execute(e)}}
+return this._listeners.add(n,{message:e=>{try{Ember.set(this,"instance",void 0),this.onchange(e)}catch(t){r(t)}},error:e=>r(e)}),n},didInsertElement:function(){this._super(...arguments),void 0===this.data&&void 0===this.item||this.actions.open.apply(this,[this.data,this.item])},persist:function(e,t){void 0!==e?Ember.set(this,"instance",this.service.prepare(this.sink,e,t)):Ember.set(this,"instance",t),this.source(()=>this.service.persist(this.sink,this.instance))},remove:function(e){Ember.set(this,"instance",e),this.source(()=>this.service.remove(this.sink,e))},actions:{open:function(e,t){if(t instanceof Event&&(t=void 0),void 0===e&&void 0===t)throw new Error("You must specify data to save, or null to remove")
+null===e||""===e?this.remove(t):this.persist(e,t)}}}))
+e.default=r})),define("consul-ui/components/data-source/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O
+function _(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function P(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const w=Ember.HTMLBars.template({id:"N/jmqD/5",block:'{"symbols":["@src","@loading","@disabled","&default"],"statements":[[6,[37,2],[[30,[36,5],[[32,0,["disabled"]]],null]],null,[["default"],[{"statements":[[6,[37,2],[[30,[36,1],[[32,0,["loading"]],"lazy"],null]],null,[["default","else"],[{"statements":[[2,"    "],[11,"data"],[24,"aria-hidden","true"],[24,5,"width: 0;height: 0;font-size: 0;padding: 0;margin: 0;"],[4,[38,0],[[32,0,["connect"]]],null],[12],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[1,[30,[36,0],[[32,0,["connect"]]],null]],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[1,[30,[36,3],[[32,0,["attributeChanged"]],"src",[32,1]],null]],[2,"\\n  "],[1,[30,[36,3],[[32,0,["attributeChanged"]],"loading",[32,2]],null]],[2,"\\n  "],[1,[30,[36,4],[[32,0,["disconnect"]]],null]],[2,"\\n"]],"parameters":[]}]]],[1,[30,[36,3],[[32,0,["attributeChanged"]],"disabled",[32,3]],null]],[2,"\\n"],[18,4,[[30,[36,7],null,[["data","error","Source"],[[32,0,["data"]],[32,0,["error"]],[30,[36,2],[[32,0,["data"]],[30,[36,6],["data-source"],[["disabled"],[[30,[36,5],[[30,[36,1],[[32,0,["error"]],[29]],null]],null]]]],""],null]]]]]],[2,"\\n"]],"hasEval":false,"upvars":["did-insert","eq","if","did-update","will-destroy","not","component","hash"]}',meta:{moduleName:"consul-ui/components/data-source/index.hbs"}}),E=function(e,t,n,r=((e=null)=>"function"==typeof e?e():null)){const a=e[t]
+return a!==n&&r(a,n),e[t]=n},k=()=>{},x=e=>"function"==typeof e?e:k,j=["eager","lazy"]
+let C=(n=Ember.inject.service("data-source/service"),r=Ember.inject.service("dom"),a=Ember.inject.service("logger"),l=Ember._tracked,s=Ember._tracked,i=Ember._tracked,o=Ember._action,u=Ember._action,c=Ember._action,d=Ember._action,m=Ember._action,p=Ember._action,f=class extends t.default{constructor(e,t){super(...arguments),_(this,"dataSource",b,this),_(this,"dom",h,this),_(this,"logger",v,this),_(this,"isIntersecting",y,this),_(this,"data",g,this),_(this,"error",O,this),this._listeners=this.dom.listeners(),this._lazyListeners=this.dom.listeners()}get loading(){return j.includes(this.args.loading)?this.args.loading:j[0]}get disabled(){return void 0!==this.args.disabled&&this.args.disabled}onchange(e){this.error=void 0,this.data=e.data,x(this.args.onchange)(e)}onerror(e){this.error=e.error||e,x(this.args.onerror)(e)}connect(e){Array.isArray(e)?(this._lazyListeners.remove(),this.open()):this._lazyListeners.add(this.dom.isInViewport(e,e=>{this.isIntersecting=e,this.isIntersecting?this.open():this.close()}))}disconnect(){void 0!==this.data&&void 0===this.data.length&&"function"==typeof this.data.rollbackAttributes&&this.data.rollbackAttributes(),this.close(),this._listeners.remove(),this._lazyListeners.remove()}attributeChanged([e,t]){switch(e){case"src":("eager"===this.loading||this.isIntersecting)&&this.open()}}open(){const e=this.args.src,t=E(this,"source",this.dataSource.open(e,this,this.open),e=>{this.dataSource.close(e,this)}),n=e=>{try{const t=Ember.get(e,"error.errors.firstObject")||{}
+"429"!==Ember.get(t,"status")&&this.onerror(e),this.logger.execute(e)}catch(e){this.logger.execute(e)}},r=this._listeners.add(this.source,{message:e=>{try{this.onchange(e)}catch(t){n(t)}},error:e=>{n(e)}})
+if(E(this,"_remove",r),"function"==typeof t.getCurrentEvent){const e=t.getCurrentEvent()
+if(e){let t
+void 0!==e.error?(t="onerror",this.error=e.error):(this.error=void 0,this.data=e.data,t="onchange"),Ember.run.schedule("afterRender",()=>{try{this[t](e)}catch(r){n(r)}})}}}async invalidate(){this.source.readyState=2,this.disconnect(),Ember.run.schedule("afterRender",()=>{this.connect([])})}close(){void 0!==this.source&&(this.dataSource.close(this.source,this),E(this,"_remove",void 0),this.source=void 0)}},b=P(f.prototype,"dataSource",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=P(f.prototype,"dom",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=P(f.prototype,"logger",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=P(f.prototype,"isIntersecting",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),g=P(f.prototype,"data",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=P(f.prototype,"error",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P(f.prototype,"connect",[o],Object.getOwnPropertyDescriptor(f.prototype,"connect"),f.prototype),P(f.prototype,"disconnect",[u],Object.getOwnPropertyDescriptor(f.prototype,"disconnect"),f.prototype),P(f.prototype,"attributeChanged",[c],Object.getOwnPropertyDescriptor(f.prototype,"attributeChanged"),f.prototype),P(f.prototype,"open",[d],Object.getOwnPropertyDescriptor(f.prototype,"open"),f.prototype),P(f.prototype,"invalidate",[m],Object.getOwnPropertyDescriptor(f.prototype,"invalidate"),f.prototype),P(f.prototype,"close",[p],Object.getOwnPropertyDescriptor(f.prototype,"close"),f.prototype),f)
+e.default=C,Ember._setComponentTemplate(w,C)})),define("consul-ui/components/data-writer/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={id:"data-writer",initial:"idle",states:{idle:{on:{PERSIST:{target:"persisting"},REMOVE:{target:"removing"}}},removing:{on:{SUCCESS:{target:"removed"},ERROR:{target:"error"}}},persisting:{on:{SUCCESS:{target:"persisted"},ERROR:{target:"error"}}},removed:{on:{RESET:{target:"idle"}}},persisted:{on:{RESET:{target:"idle"}}},error:{on:{RESET:{target:"idle"}}}}}})),define("consul-ui/components/data-writer/index",["exports","block-slots","consul-ui/components/data-writer/chart.xstate"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r=Ember.HTMLBars.template({id:"Gj1ownZS",block:'{"symbols":["State","Guard","Action","dispatch","state","api","after","notice","after","notice","after","notice","&default"],"statements":[[8,"state-chart",[],[["@src"],[[34,17]]],[["default"],[{"statements":[[2,"\\n\\n  "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"dispatch",[32,4]]],null],[2,"\\n\\n"],[6,[37,15],[[30,[36,20],null,[["data","error","persist","delete","inflight","disabled"],[[35,10],[35,11],[30,[36,0],[[32,0],"persist"],null],[30,[36,13],[[30,[36,0],[[32,0],[30,[36,12],[[35,10]],null]],null],[30,[36,0],[[32,0],[32,4],"REMOVE"],null]],null],[30,[36,19],[[32,5],[30,[36,18],["persisting","removing"],null]],null],[30,[36,19],[[32,5],[30,[36,18],["persisting","removing"],null]],null]]]]],null,[["default"],[{"statements":[[2,"\\n  "],[18,13,[[32,6]]],[2,"\\n\\n  "],[8,[32,1],[],[["@matches"],["removing"]],[["default"],[{"statements":[[2,"\\n    "],[8,"data-sink",[],[["@sink","@item","@data","@onchange","@onerror"],[[34,9],[34,10],null,[30,[36,0],[[32,0],[32,4],"SUCCESS"],null],[30,[36,13],[[30,[36,0],[[32,0],[30,[36,12],[[35,11]],null]],[["value"],["error.errors.firstObject"]]],[30,[36,0],[[32,0],[32,4],"ERROR"],null]],null]]],null],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n\\n  "],[8,[32,1],[],[["@matches"],["persisting"]],[["default"],[{"statements":[[2,"\\n    "],[8,"data-sink",[],[["@sink","@item","@onchange","@onerror"],[[34,9],[34,10],[30,[36,0],[[32,0],[32,4],"SUCCESS"],null],[30,[36,13],[[30,[36,0],[[32,0],[30,[36,12],[[35,11]],null]],[["value"],["error.errors.firstObject"]]],[30,[36,0],[[32,0],[32,4],"ERROR"],null]],null]]],null],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n\\n  "],[8,[32,1],[],[["@matches"],["removed"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,15],[[30,[36,13],[[30,[36,0],[[32,0],[32,4],"RESET"],null],[30,[36,0],[[32,0],[35,14]],null]],null]],null,[["default"],[{"statements":[[6,[37,8],null,[["name","params"],["removed",[30,[36,7],[[32,11]],null]]],[["default","else"],[{"statements":[[2,"      "],[18,13,[[32,6]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[8,"notice",[[24,0,"notification-delete"],[4,[38,1],null,[["after"],[[30,[36,0],[[32,0],[32,11]],null]]]]],[["@type"],["success"]],[["default"],[{"statements":[[2,"\\n      "],[8,[32,12,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"strong"],[12],[2,"Success!"],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,[32,12,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"p"],[12],[2,"\\n          Your "],[1,[30,[36,4],[[35,3],[35,2]],null]],[2," has been deleted.\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[12]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[11]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n\\n  "],[8,[32,1],[],[["@matches"],["persisted"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,15],[[30,[36,0],[[32,0],[35,16]],null]],null,[["default"],[{"statements":[[6,[37,8],null,[["name","params"],["persisted",[30,[36,7],[[32,9]],null]]],[["default","else"],[{"statements":[[2,"      "],[18,13,[[32,6]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[8,"notice",[[24,0,"notification-update"],[4,[38,1],null,[["after"],[[30,[36,0],[[32,0],[32,9]],null]]]]],[["@type"],["success"]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,10,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[10,"strong"],[12],[2,"Success!"],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,10,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[10,"p"],[12],[2,"\\n            Your "],[1,[30,[36,4],[[35,3],[35,2]],null]],[2," has been saved.\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[10]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[9]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n\\n  "],[8,[32,1],[],[["@matches"],["error"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,15],[[30,[36,0],[[32,0],[32,4],"RESET"],null]],null,[["default"],[{"statements":[[6,[37,8],null,[["name","params"],["error",[30,[36,7],[[32,7],[32,6,["error"]]],null]]],[["default","else"],[{"statements":[[2,"      "],[18,13,[[32,6]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[8,"notice",[[24,0,"notification-update"],[4,[38,1],null,[["after"],[[30,[36,0],[[32,0],[32,7]],null]]]]],[["@type"],["error"]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,8,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[10,"strong"],[12],[2,"Error!"],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,8,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[10,"p"],[12],[2,"\\n            There was an error saving your "],[1,[30,[36,4],[[35,3],[35,2]],null]],[2,".\\n"],[6,[37,6],[[30,[36,5],[[32,6,["error","status"]],[32,6,["error","detail"]]],null]],null,[["default"],[{"statements":[[2,"            "],[10,"br"],[12],[13],[1,[32,6,["error","status"]]],[2,": "],[1,[32,6,["error","detail"]]],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[8]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[7]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n\\n  "],[8,"yield-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n    "],[18,13,[[32,6]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n\\n"]],"parameters":[6]}]]]],"parameters":[1,2,3,4,5]}]]]],"hasEval":false,"upvars":["action","notification","type","label","or","and","if","block-params","yield-slot","sink","data","error","mut","queue","ondelete","let","onchange","chart","array","state-matches","hash"]}',meta:{moduleName:"consul-ui/components/data-writer/index.hbs"}})
+var a=Ember._setComponentTemplate(r,Ember.Component.extend(t.default,{tagName:"",ondelete:function(){return this.onchange(...arguments)},onchange:function(){},init:function(){this._super(...arguments),this.chart=n.default},actions:{persist:function(e,t){t&&"function"==typeof t.preventDefault&&t.preventDefault(),Ember.set(this,"data",e),this.dispatch("PERSIST")}}}))
+e.default=a})),define("consul-ui/components/debug/navigation/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"ZDKUMD/N",block:'{"symbols":[],"statements":[],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/debug/navigation/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/delete-confirmation/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"jCwHFXDR",block:'{"symbols":[],"statements":[[10,"p"],[12],[2,"\\n  "],[1,[34,0]],[2,"\\n"],[13],[2,"\\n"],[10,"button"],[14,0,"type-delete"],[15,"onclick",[30,[36,2],[[32,0],[35,1]],null]],[14,4,"button"],[12],[2,"\\n  Confirm Delete\\n"],[13],[2,"\\n"],[10,"button"],[14,0,"type-cancel"],[15,"onclick",[30,[36,2],[[32,0],[35,3]],null]],[14,4,"button"],[12],[2,"Cancel"],[13],[2,"\\n"]],"hasEval":false,"upvars":["message","execute","action","cancel"]}',meta:{moduleName:"consul-ui/components/delete-confirmation/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:"",execute:function(){},cancel:function(){}}))
+e.default=n})),define("consul-ui/components/disclosure-card/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"jQWyQTRo",block:'{"symbols":["custom","element","disclosure","&default"],"statements":[[8,"custom-element",[],[["@attrs"],[[34,0]]],[["default"],[{"statements":[[2,"\\n"],[8,"disclosure",[],[[],[]],[["default"],[{"statements":[[2,"\\n  "],[11,"disclosure-card"],[16,"expanded",[32,3,["expanded"]]],[4,[38,1],[[32,1,["connect"]]],null],[4,[38,2],[[32,1,["disconnect"]]],null],[12],[2,"\\n\\n      "],[8,[32,1,["Template"]],[],[["@styles"],[[30,[36,5],[[30,[36,4],["/styles/base/icons/base-keyframes.css"],[["from"],["/components/disclosure-card"]]],[30,[36,4],["/styles/base/icons/icons/chevron-down/index.css"],[["from"],["/components/disclosure-card"]]],[30,[36,4],["/components/panel/index.css"],[["from"],["/components/disclosure-card"]]],[30,[36,3],["\\n            :host {\\n              display: block;\\n            }\\n            slot[name=\'action\']::slotted(button) {\\n              display: block;\\n              cursor: pointer;\\n              width: 100%;\\n\\n              background-color: rgb(var(--tone-gray-050));\\n              color: rgb(var(--tone-gray-800));\\n              padding-top: var(--padding-y);\\n              padding-bottom: var(--padding-y);\\n            }\\n            slot[name=\'action\']::slotted(button)::after {\\n              transition-timing-function: linear;\\n              transition-duration: 300ms;\\n              transition-property: transform;\\n              --icon-name: icon-chevron-down;\\n              --icon-size: icon-000;\\n              content: \'\';\\n            }\\n\\n            :host([expanded]) slot[name=\'action\']::slotted(button)::after {\\n              transform: scaleY(-100%);\\n            }\\n\\n            :host([expanded]) [style*=\'max-height\'] {\\n              transition-duration: 50ms;\\n            }\\n            [style*=\'max-height\'] {\\n              transition-timing-function: ease-out;\\n              transition-property: max-height;\\n              overflow: hidden;\\n            }\\n            .content {\\n              padding: var(--padding-y) var(--padding-x);\\n            }\\n          "],null]],null]]],[["default"],[{"statements":[[2,"\\n        "],[10,"div"],[14,"part","base"],[15,0,[30,[36,6],["panel"],null]],[12],[2,"\\n          "],[11,"div"],[16,0,[30,[36,6],["content"],null]],[4,[38,8],[[30,[36,7],[[30,[36,0],[[30,[36,0],["height","max-height"],null]],null]],null]],null],[12],[2,"\\n            "],[10,"slot"],[12],[2,"\\n            "],[13],[2,"\\n          "],[13],[2,"\\n          "],[10,"hr"],[15,0,[30,[36,6],["panel-separator"],null]],[12],[13],[2,"\\n          "],[10,"slot"],[14,3,"action"],[12],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n\\n      "],[18,4,[[32,3]]],[2,"\\n\\n  "],[13],[2,"\\n"]],"parameters":[3]}]]],[2,"\\n"]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["array","did-insert","will-destroy","css","require","css-map","class-map","dom-position","on-resize"]}',meta:{moduleName:"consul-ui/components/disclosure-card/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/disclosure-menu/action/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"dVOJ6hd3",block:'{"symbols":["@disclosure","&attrs","&default"],"statements":[[8,[32,1,["Action"]],[[24,"aria-haspopup","menu"],[17,2]],[[],[]],[["default"],[{"statements":[[2,"\\n  "],[18,3,null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/disclosure-menu/action/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/disclosure-menu/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"0ppCO1I+",block:'{"symbols":["disclosure","&attrs","@expanded","@rowHeight","@items","&default"],"statements":[[11,"div"],[16,0,[30,[36,0],["disclosure-menu"],null]],[17,2],[12],[2,"\\n  "],[8,"disclosure",[],[["@expanded"],[[32,3]]],[["default"],[{"statements":[[2,"\\n    "],[18,6,[[30,[36,2],null,[["Action","Menu","disclosure","toggle","close","open","expanded"],[[30,[36,1],["disclosure-menu/action"],[["disclosure"],[[32,1]]]],[30,[36,1],["disclosure-menu/menu"],[["disclosure","items","rowHeight"],[[32,1],[32,5],[32,4]]]],[32,1],[32,1,["toggle"]],[32,1,["close"]],[32,1,["open"]],[32,1,["expanded"]]]]]]],[2,"\\n  "]],"parameters":[1]}]]],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["class-map","component","hash"]}',meta:{moduleName:"consul-ui/components/disclosure-menu/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/disclosure-menu/menu/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"OoptGQit",block:'{"symbols":["details","pager","@disclosure","@items","&attrs","&default"],"statements":[[8,[32,3,["Details"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n  "],[8,"paged-collection",[],[["@items"],[[30,[36,1],[[32,4],[30,[36,0],null,null]],null]]],[["default"],[{"statements":[[2,"\\n    "],[11,"div"],[16,0,[30,[36,3],[[30,[36,0],["paged-collection-scroll",[30,[36,2],[[32,2,["type"]],[30,[36,0],["virtual-scroll","native-scroll"],null]],null]],null]],null]],[17,5],[4,[38,4],["click",[32,3,["close"]]],null],[4,[38,5],[[32,2,["viewport"]]],null],[4,[38,6],[[32,2,["resize"]]],null],[4,[38,7],["--paged-row-height"],[["returns"],[[32,2,["rowHeight"]]]]],[4,[38,7],["max-height"],[["returns"],[[32,2,["maxHeight"]]]]],[12],[2,"\\n      "],[18,6,[[30,[36,9],null,[["Menu"],[[30,[36,8],["menu"],[["disclosure","pager"],[[32,3],[32,2]]]]]]]]],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n\\n"]],"hasEval":false,"upvars":["array","or","contains","class-map","on-outside","did-insert","on-resize","css-prop","component","hash"]}',meta:{moduleName:"consul-ui/components/disclosure-menu/menu/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/disclosure/action/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"psbqw5ZC",block:'{"symbols":["@disclosure","&attrs","&default"],"statements":[[8,"action",[[16,"aria-expanded",[30,[36,0],[[32,1,["expanded"]],"true","false"],null]],[16,"aria-controls",[32,1,["controls"]]],[17,2]],[[],[]],[["default"],[{"statements":[[2,"\\n  "],[18,3,null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"]],"hasEval":false,"upvars":["if"]}',meta:{moduleName:"consul-ui/components/disclosure/action/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/disclosure/details/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"zTpefIvc",block:'{"symbols":["id","@disclosure","&default","@auto"],"statements":[[6,[37,10],[[30,[36,9],null,null]],null,[["default"],[{"statements":[[6,[37,5],[[30,[36,4],[[30,[36,3],[[30,[36,1],[[32,4],[29]],null],[32,2,["expanded"]]],null],[30,[36,3],[[30,[36,2],[[32,4],[29]],null],[30,[36,1],[[32,4],false],null]],null]],null]],null,[["default"],[{"statements":[[18,3,[[30,[36,0],null,[["id","expanded"],[[32,1],[32,2,["expanded"]]]]]]],[2,"\\n"]],"parameters":[]}]]],[1,[30,[36,7],[[30,[36,6],[[32,2,["add"]],[32,1]],null]],null]],[2,"\\n"],[1,[30,[36,8],[[30,[36,6],[[32,2,["remove"]],[32,1]],null]],null]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["hash","eq","not-eq","and","or","if","fn","did-insert","will-destroy","unique-id","let"]}',meta:{moduleName:"consul-ui/components/disclosure/details/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/disclosure/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s
+function i(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const o=Ember.HTMLBars.template({id:"28tf0rhU",block:'{"symbols":["State","Guard","Action","dispatch","state","_api","api","&default","@expanded"],"statements":[[8,"state-chart",[],[["@src","@initial"],[[30,[36,5],["boolean"],null],[30,[36,6],[[32,9],"true","false"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,4],[[30,[36,1],null,[["toggle","close","open","expanded","event","button","controls"],[[30,[36,8],[[32,4],"TOGGLE"],null],[30,[36,8],[[32,4],"FALSE"],null],[30,[36,8],[[32,4],"TRUE"],null],[30,[36,0],[[32,5],"true"],null],[32,5,["context"]],[30,[36,7],null,null],[32,0,["ids"]]]]]],null,[["default"],[{"statements":[[6,[37,4],[[30,[36,3],[[32,6],[30,[36,1],null,[["Action","Details"],[[30,[36,2],["disclosure/action"],[["disclosure"],[[32,6]]]],[30,[36,2],["disclosure/details"],[["disclosure"],[[30,[36,1],null,[["add","remove","expanded"],[[32,0,["add"]],[32,0,["remove"]],[30,[36,0],[[32,5],"true"],null]]]]]]]]]]],null]],null,[["default"],[{"statements":[[2,"    "],[18,8,[[32,7]]],[2,"\\n"]],"parameters":[7]}]]]],"parameters":[6]}]]]],"parameters":[1,2,3,4,5]}]]]],"hasEval":false,"upvars":["state-matches","hash","component","assign","let","state-chart","if","unique-id","fn"]}',meta:{moduleName:"consul-ui/components/disclosure/index.hbs"}})
+let u=(n=Ember._tracked,r=Ember._action,a=Ember._action,l=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="ids",a=this,(r=s)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}add(e){Ember.run.schedule("afterRender",()=>{this.ids=`${this.ids}${this.ids.length>0?" ":""}${e}`})}remove(e){this.ids=this.ids.split(" ").filter(t=>t!==e).join(" ")}},s=i(l.prototype,"ids",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),i(l.prototype,"add",[r],Object.getOwnPropertyDescriptor(l.prototype,"add"),l.prototype),i(l.prototype,"remove",[a],Object.getOwnPropertyDescriptor(l.prototype,"remove"),l.prototype),l)
+e.default=u,Ember._setComponentTemplate(o,u)})),define("consul-ui/components/distribution-meter/index.css",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=e=>e`
+    :host {
+      display: block;
+      width: 100%;
+      height: 100%;
+    }
+    dl {
+      position: relative;
+      height: 100%;
+    }
+    :host([type='linear']) {
+      height: 3px;
+    }
+    :host([type='radial']),
+    :host([type='circular']) {
+      height: 300px;
+    }
+    :host([type='linear']) dl {
+      background-color: currentColor;
+      color: rgb(var(--tone-gray-100));
+      border-radius: var(--decor-radius-999);
+      transition-property: transform;
+      transition-timing-function: ease-out;
+      transition-duration: .1s;
+    }
+    :host([type='linear']) dl:hover {
+      transform: scaleY(3);
+      box-shadow: var(--decor-elevation-200);
+    }
+  `})),define("consul-ui/components/distribution-meter/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"weg3QSze",block:'{"symbols":["custom","element","&attrs","&default"],"statements":[[8,"custom-element",[],[["@attrs"],[[30,[36,0],[[30,[36,0],["type","\\"linear\\" | \\"radial\\" | \\"circular\\"","linear"],null]],null]]],[["default"],[{"statements":[[2,"\\n  "],[11,"distribution-meter"],[17,3],[4,[38,1],[[32,1,["connect"]]],null],[4,[38,2],[[32,1,["disconnect"]]],null],[12],[2,"\\n    "],[8,[32,1,["Template"]],[],[["@styles"],[[30,[36,4],[[30,[36,3],["./index.css"],[["from"],["/components/distribution-meter"]]]],null]]],[["default"],[{"statements":[[2,"\\n      "],[10,"dl"],[12],[2,"\\n        "],[10,"slot"],[12],[13],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[18,4,[[30,[36,6],null,[["Meter"],[[30,[36,5],["distribution-meter/meter"],[["type"],[[32,2,["attrs","type"]]]]]]]]]],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["array","did-insert","will-destroy","require","css-map","component","hash"]}',meta:{moduleName:"consul-ui/components/distribution-meter/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/distribution-meter/meter/element",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=(e,t=0)=>{const n=parseFloat(e)
+return isNaN(n)?t:n}
+e.default=e=>class extends e{attributeChangedCallback(e,n,r){const a=this
+switch(e){case"percentage":{let e=a
+for(;e;){const n=e.nextElementSibling,r=n?t(n.style.getPropertyValue("--aggregated-percentage")):0,a=t(e.getAttribute("percentage"))+r
+e.style.setProperty("--aggregated-percentage",a),e.setAttribute("aggregated-percentage",a),e=e.previousElementSibling}break}}}}})),define("consul-ui/components/distribution-meter/meter/index.css",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=e=>e`
+    /*@import '~/styles/base/decoration/visually-hidden.css';*/
+
+    :host(.critical) {
+      color: rgb(var(--tone-red-500));
+    }
+    :host(.warning) {
+      color: rgb(var(--tone-orange-500));
+    }
+    :host(.passing) {
+      color: rgb(var(--tone-green-500));
+    }
+
+    :host {
+      position: absolute;
+      top: 0;
+      height: 100%;
+
+      transition-timing-function: ease-out;
+      transition-duration: .5s;
+    }
+    dt, dd meter {
+      animation-name: visually-hidden;
+      animation-fill-mode: forwards;
+      animation-play-state: paused;
+    }
+
+    :host(.type-linear) {
+      transition-property: width;
+      width: calc(var(--aggregated-percentage) * 1%);
+      height: 100%;
+      background-color: currentColor;
+      border-radius: var(--decor-radius-999);
+    }
+
+    :host svg {
+      height: 100%;
+    }
+    :host(.type-radial),
+    :host(.type-circular) {
+      transition-property: none;
+    }
+    :host(.type-radial) dd,
+    :host(.type-circular) dd {
+      width: 100%;
+      height: 100%;
+    }
+    :host(.type-radial) circle,
+    :host(.type-circular) circle {
+      transition-timing-function: ease-out;
+      transition-duration: .5s;
+      pointer-events: stroke;
+      transition-property: stroke-dashoffset, stroke-width;
+      transform: rotate(-90deg);
+      transform-origin: 50%;
+      fill: transparent;
+      stroke: currentColor;
+      stroke-dasharray: 100, 100;
+      stroke-dashoffset: calc(calc(100 - var(--aggregated-percentage)) * 1px);
+    }
+    :host([aggregated-percentage='100']) circle {
+      stroke-dasharray: 0 !important;
+    }
+    :host([aggregated-percentage='0']) circle {
+      stroke-dasharray: 0, 100 !important;
+    }
+    :host(.type-radial) circle,
+    :host(.type-circular]) svg {
+      pointer-events: none;
+    }
+    :host(.type-radial) circle {
+      stroke-width: 32;
+    }
+    :host(.type-circular) circle {
+      stroke-width: 14;
+    }
+  `})),define("consul-ui/components/distribution-meter/meter/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"pCg7idGT",block:'{"symbols":["custom","element","@type","&attrs"],"statements":[[8,"custom-element",[],[["@class","@attrs","@cssprops"],[[30,[36,0],["./element"],[["from"],["/components/distribution-meter/meter"]]],[30,[36,1],[[30,[36,1],["percentage","number",0],null],[30,[36,1],["description","string",""],null]],null],[30,[36,1],[[30,[36,1],["--percentage","percentage","[percentage]"],null],[30,[36,1],["--aggregated-percentage","percentage",[29]],null]],null]]],[["default"],[{"statements":[[2,"\\n\\n  "],[11,"distribution-meter-meter"],[16,0,[30,[36,3],[[30,[36,1],[[30,[36,2],["type-",[32,3]],null],[32,3]],null]],null]],[17,4],[4,[38,4],[[32,1,["connect"]]],null],[4,[38,5],[[32,1,["disconnect"]]],null],[12],[2,"\\n    "],[8,[32,1,["Template"]],[],[["@styles"],[[30,[36,6],[[30,[36,0],["/styles/base/decoration/visually-hidden.css"],[["from"],["/components/distribution-meter/meter"]]],[30,[36,0],["./index.css"],[["from"],["/components/distribution-meter/meter"]]]],null]]],[["default"],[{"statements":[[2,"\\n      "],[10,"dt"],[12],[1,[32,2,["attrs","description"]]],[13],[2,"\\n      "],[10,"dd"],[15,"aria-label",[30,[36,2],[[32,2,["attrs","percentage"]],"%"],null]],[12],[2,"\\n        "],[10,"meter"],[14,"min","0"],[14,"max","100"],[15,2,[32,2,["attrs","percentage"]]],[12],[2,"\\n          "],[10,"slot"],[12],[1,[30,[36,2],[[32,2,["attrs","percentage"]],"%"],null]],[13],[2,"\\n        "],[13],[2,"\\n"],[6,[37,9],[[30,[36,8],[[30,[36,7],[[32,3],"circular"],null],[30,[36,7],[[32,3],"radial"],null]],null]],null,[["default"],[{"statements":[[2,"          "],[10,"svg"],[14,"aria-hidden","true"],[14,"viewBox","0 0 32 32"],[14,"clip-path","circle()"],[12],[2,"\\n            "],[10,"circle"],[14,"r","16"],[14,"cx","16"],[14,"cy","16"],[12],[13],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "],[13],[2,"\\n\\n"]],"parameters":[1,2]}]]],[2,"\\n\\n"]],"hasEval":false,"upvars":["require","array","concat","class-map","did-insert","will-destroy","css-map","eq","or","if"]}',meta:{moduleName:"consul-ui/components/distribution-meter/meter/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/ember-collection",["exports","ember-collection/components/ember-collection"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/ember-native-scrollable",["exports","ember-collection/components/ember-native-scrollable"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
+define("consul-ui/components/empty-state/index",["exports","block-slots"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"iwlkCEdF",block:'{"symbols":["&default","&attrs"],"statements":[[18,1,null],[2,"\\n"],[11,"div"],[24,0,"empty-state"],[17,2],[12],[2,"\\n"],[6,[37,6],[[35,8]],null,[["default"],[{"statements":[[2,"  "],[10,"header"],[12],[2,"\\n"],[6,[37,7],null,[["name"],["header"]],[["default"],[{"statements":[[2,"      "],[18,1,null],[2,"\\n"]],"parameters":[]}]]],[6,[37,7],null,[["name"],["subheader"]],[["default"],[{"statements":[[2,"      "],[18,1,null],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,7],null,[["name"],["body"]],[["default"],[{"statements":[[2,"    "],[10,"div"],[12],[2,"\\n      "],[18,1,null],[2,"\\n"],[6,[37,6],[[35,0]],null,[["default"],[{"statements":[[2,"        "],[8,"action",[[4,[38,1],["click",[35,0]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,2],["settings://consul:token"],null],[30,[36,5],[[32,0],[30,[36,4],[[35,3]],null]],[["value"],["data"]]]]],null],[2,"\\n"],[6,[37,6],[[35,3,["AccessorID"]]],null,[["default","else"],[{"statements":[[2,"            Log in with a different token\\n"]],"parameters":[]},{"statements":[[2,"            Log in\\n"]],"parameters":[]}]]],[2,"        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,7],null,[["name"],["actions"]],[["default"],[{"statements":[[2,"    "],[10,"ul"],[12],[2,"\\n      "],[18,1,null],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]],[13]],"hasEval":false,"upvars":["login","on","uri","token","mut","action","if","yield-slot","hasHeader"]}',meta:{moduleName:"consul-ui/components/empty-state/index.hbs"}})
+var r=Ember._setComponentTemplate(n,Ember.Component.extend(t.default,{tagName:"",willRender:function(){this._super(...arguments),Ember.set(this,"hasHeader",this._isRegistered("header")||this._isRegistered("subheader"))}}))
+e.default=r})),define("consul-ui/components/error-state/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"hckyXX72",block:'{"symbols":["@error","@login"],"statements":[[6,[37,3],[[30,[36,5],[[32,1,["status"]],"403"],null]],null,[["default","else"],[{"statements":[[2,"  "],[8,"empty-state",[[16,0,[30,[36,0],["status-",[32,1,["status"]]],null]]],[["@login"],[[32,2]]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n      "],[10,"h2"],[12],[2,"\\n        "],[1,[30,[36,2],[[32,1,["message"]],"Consul returned an error"],null]],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"],[6,[37,3],[[32,1,["status"]]],null,[["default"],[{"statements":[[2,"    "],[8,"block-slot",[],[["@name"],["subheader"]],[["default"],[{"statements":[[2,"\\n      "],[10,"h3"],[12],[2,"\\n        Error "],[1,[32,1,["status"]]],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n      "],[10,"p"],[12],[2,"\\n"],[6,[37,3],[[32,1,["detail"]]],null,[["default","else"],[{"statements":[[2,"          "],[1,[32,1,["detail"]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          You may have visited a URL that is loading an unknown resource, so you can try going back to the root or try re-submitting your ACL Token/SecretID by going back to ACLs.\\n"]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n      "],[10,"li"],[14,0,"back-link"],[12],[2,"\\n        "],[8,"action",[],[["@href"],[[30,[36,4],["index"],null]]],[["default"],[{"statements":[[2,"\\n          Go back\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n      "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n        "],[8,"action",[],[["@href","@external"],[[31,[[30,[36,1],["CONSUL_DOCS_URL"],null]]],true]],[["default"],[{"statements":[[2,"\\n          Read the documentation\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"  "],[8,"empty-state",[[16,0,[30,[36,0],["status-",[32,1,["status"]]],null]]],[["@login"],[[32,2]]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n      "],[10,"h2"],[12],[2,"\\n        You are not authorized\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["subheader"]],[["default"],[{"statements":[[2,"\\n      "],[10,"h3"],[12],[2,"\\n        Error "],[1,[32,1,["status"]]],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n      "],[10,"p"],[12],[2,"\\n        You must be granted permissions to view this data. Ask your administrator if you think you should have access.\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n      "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n        "],[8,"action",[],[["@href","@external"],[[31,[[30,[36,1],["CONSUL_DOCS_URL"],null],"/acl/index.html"]],true]],[["default"],[{"statements":[[2,"\\n          Read the documentation\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n      "],[10,"li"],[14,0,"learn-link"],[12],[2,"\\n        "],[8,"action",[],[["@href","@external"],[[31,[[30,[36,1],["CONSUL_DOCS_LEARN_URL"],null],"/consul/security-networking/production-acls"]],true]],[["default"],[{"statements":[[2,"\\n          Follow the guide\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["concat","env","or","if","href-to","not-eq"]}',meta:{moduleName:"consul-ui/components/error-state/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/event-source/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"9rZp1Dvu",block:'{"symbols":["&default"],"statements":[[18,1,[[30,[36,1],null,[["close"],[[30,[36,0],[[32,0],"close"],null]]]]]],[2,"\\n"]],"hasEval":false,"upvars":["action","hash"]}',meta:{moduleName:"consul-ui/components/event-source/index.hbs"}}),n=function(e,t,n,r=((e=null)=>"function"==typeof e?e():null)){const a=e[t]
+return a!==n&&r(a,n),Ember.set(e,t,n)}
+var r=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:"",dom:Ember.inject.service("dom"),logger:Ember.inject.service("logger"),data:Ember.inject.service("data-source/service"),closeOnDestroy:!0,onerror:function(e){this.logger.execute(e.error)},init:function(){this._super(...arguments),this._listeners=this.dom.listeners()},willDestroyElement:function(){this.closeOnDestroy&&this.actions.close.apply(this,[]),this._listeners.remove(),this._super(...arguments)},didReceiveAttrs:function(){this._super(...arguments),Ember.get(this,"src.configuration.uri")!==Ember.get(this,"source.configuration.uri")&&this.actions.open.apply(this,[])},actions:{open:function(){n(this,"source",this.data.open(this.src,this),e=>{void 0!==e&&this.data.close(e,this)}),n(this,"proxy",this.src,e=>{void 0!==e&&e.destroy()})
+const e=e=>{try{const t=Ember.get(e,"error.errors.firstObject")
+"429"!==Ember.get(t||{},"status")&&this.onerror(e),this.logger.execute(e)}catch(e){this.logger.execute(e)}},t=this._listeners.add(this.source,{error:t=>{e(t)}})
+n(this,"_remove",t)},close:function(){void 0!==this.source&&(this.data.close(this.source,this),n(this,"_remove",void 0),Ember.set(this,"source",void 0)),void 0!==this.proxy&&this.proxy.destroy()}}}))
+e.default=r})),define("consul-ui/components/flash-message",["exports","ember-cli-flash/components/flash-message"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/form-component/index",["exports","block-slots"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"YBF10tF/",block:'{"symbols":["&default"],"statements":[[18,1,null]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/form-component/index.hbs"}}),r=/([^[\]])+/g
+var a=Ember._setComponentTemplate(n,Ember.Component.extend(t.default,{tagName:"",onreset:function(){},onchange:function(){},onerror:function(){},onsuccess:function(){},data:Ember.computed.alias("form.data"),item:Ember.computed.alias("form.data"),dom:Ember.inject.service("dom"),container:Ember.inject.service("form"),actions:{change:function(e,t){let n=this.dom.normalizeEvent(e,t)
+const a=[...n.target.name.matchAll(r)],l=a[a.length-1][0]
+let s
+s=-1===l.indexOf("[")?`${this.type}[${l}]`:l,this.form.handleEvent(n,s),this.onchange({target:this})}}}))
+e.default=a})),define("consul-ui/components/form-group/element/checkbox/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"dFj6ezet",block:'{"symbols":["@name","@value","&attrs","@didinsert","@onchange"],"statements":[[11,"input"],[16,3,[32,1]],[16,2,[32,2]],[17,3],[24,4,"checkbox"],[4,[38,1],[[30,[36,0],[[32,4]],null]],null],[4,[38,2],["change",[30,[36,0],[[32,5]],null]],null],[12],[13],[2,"\\n"]],"hasEval":false,"upvars":["optional","did-insert","on"]}',meta:{moduleName:"consul-ui/components/form-group/element/checkbox/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/form-group/element/error/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"Z2yKEUoj",block:'{"symbols":["&attrs","&default"],"statements":[[11,"strong"],[24,"role","alert"],[17,1],[12],[2,"\\n  "],[18,2,null],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/form-group/element/error/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/form-group/element/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s,i
+function o(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function u(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const c=Ember.HTMLBars.template({id:"F1rSsI4z",block:'{"symbols":["el","&attrs","&default","@name","@group"],"statements":[[6,[37,9],[[30,[36,8],null,[["Element","Text","Checkbox","Radio","Label","Error","state"],[[30,[36,5],["form-group/element"],[["group","name"],[[32,5],[32,4]]]],[30,[36,5],["form-group/element/text"],[["didinsert","name","oninput"],[[30,[36,7],[[32,0],[32,0,["connect"]]],null],[32,0,["name"]],[30,[36,7],[[32,0],[30,[36,6],[[32,0,["touched"]]],null],true],null]]]],[30,[36,5],["form-group/element/checkbox"],[["didinsert","name","onchange"],[[30,[36,7],[[32,0],[32,0,["connect"]]],null],[32,0,["name"]],[30,[36,7],[[32,0],[30,[36,6],[[32,0,["touched"]]],null],true],null]]]],[30,[36,5],["form-group/element/radio"],[["didinsert","name","onchange"],[[30,[36,7],[[32,0],[32,0,["connect"]]],null],[32,0,["name"]],[30,[36,7],[[32,0],[30,[36,6],[[32,0,["touched"]]],null],true],null]]]],[30,[36,5],["form-group/element/label"],null],[30,[36,5],["form-group/element/error"],null],[35,0]]]]],null,[["default"],[{"statements":[[6,[37,2],[[30,[36,4],[[32,0,["type"]],[30,[36,3],["radiogroup","checkbox-group","checkboxgroup"],null]],null]],null,[["default","else"],[{"statements":[[2,"    "],[11,"div"],[16,"data-property",[32,0,["prop"]]],[16,0,[31,["type-",[32,0,["type"]],[30,[36,2],[[30,[36,1],[[35,0],"error"],null]," has-error"],null]]]],[17,2],[12],[2,"\\n      "],[18,3,[[32,1]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[11,"label"],[16,"data-property",[32,0,["prop"]]],[16,0,[31,["type-",[32,0,["type"]],[30,[36,2],[[30,[36,1],[[35,0],"error"],null]," has-error"],null]]]],[17,2],[12],[2,"\\n      "],[18,3,[[32,1]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["state","state-matches","if","array","contains","component","mut","action","hash","let"]}',meta:{moduleName:"consul-ui/components/form-group/element/index.hbs"}})
+let d=(n=Ember._tracked,r=Ember._tracked,a=Ember._action,l=class extends t.default{constructor(...e){super(...e),o(this,"el",s,this),o(this,"touched",i,this)}get type(){return void 0!==this.el?this.el.dataset.type||this.el.getAttribute("type")||this.el.getAttribute("role"):this.args.type}get name(){return void 0!==this.args.group?`${this.args.group.name}[${this.args.name}]`:this.args.name}get prop(){return""+this.args.name.toLowerCase().split(".").join("-")}get state(){const e=this.touched&&this.args.error
+return{matches:t=>"error"===t&&e}}connect(e){this.el=e}},s=u(l.prototype,"el",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i=u(l.prototype,"touched",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),u(l.prototype,"connect",[a],Object.getOwnPropertyDescriptor(l.prototype,"connect"),l.prototype),l)
+e.default=d,Ember._setComponentTemplate(c,d)})),define("consul-ui/components/form-group/element/label/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"ND/d/+Dz",block:'{"symbols":["&attrs","&default"],"statements":[[11,"span"],[24,0,"form-elements-label label"],[17,1],[12],[2,"\\n  "],[18,2,null],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/form-group/element/label/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/form-group/element/radio/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"Pv6QuCmR",block:'{"symbols":["@name","@value","&attrs","@didinsert","@onchange"],"statements":[[11,"input"],[16,3,[32,1]],[16,2,[32,2]],[17,3],[24,4,"radio"],[4,[38,1],[[30,[36,0],[[32,4]],null]],null],[4,[38,2],["change",[30,[36,0],[[32,5]],null]],null],[12],[13],[2,"\\n"]],"hasEval":false,"upvars":["optional","did-insert","on"]}',meta:{moduleName:"consul-ui/components/form-group/element/radio/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/form-group/element/text/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"RUJvSrX2",block:'{"symbols":["@name","@value","&attrs","@didinsert","@oninput"],"statements":[[11,"input"],[16,3,[32,1]],[16,2,[32,2]],[17,3],[24,4,"text"],[4,[38,1],[[30,[36,0],[[32,4]],null]],null],[4,[38,2],["input",[30,[36,0],[[32,5]],null]],null],[12],[13],[2,"\\n"]],"hasEval":false,"upvars":["optional","did-insert","on"]}',meta:{moduleName:"consul-ui/components/form-group/element/text/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/form-group/index",["exports","@glimmer/component"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"PFK3HI8F",block:'{"symbols":["&default"],"statements":[[18,1,[[30,[36,1],null,[["Element"],[[30,[36,0],["form-group/element"],[["group"],[[32,0]]]]]]]]],[2,"\\n"]],"hasEval":false,"upvars":["component","hash"]}',meta:{moduleName:"consul-ui/components/form-group/index.hbs"}})
+class r extends t.default{get name(){return this.args.name}}e.default=r,Ember._setComponentTemplate(n,r)})),define("consul-ui/components/form-input/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"TcGpchvk",block:'{"symbols":["help","@name","@chart","&attrs","&default","@help","@validations"],"statements":[[11,"label"],[16,0,[30,[36,2],["form-input",[30,[36,0],[[30,[36,1],[[32,3,["state","context","errors"]],[32,2]],null]," has-error"],null]],null]],[17,4],[12],[2,"\\n  "],[10,"span"],[12],[2,"\\n    "],[18,5,[[30,[36,3],["label"],null]]],[2,"\\n  "],[13],[2,"\\n  "],[18,5,[[30,[36,3],["input"],null]]],[2,"\\n"],[6,[37,5],[[30,[36,4],[[32,7,["help"]],[32,6]],null]],null,[["default"],[{"statements":[[6,[37,0],[[32,1]],null,[["default"],[{"statements":[[2,"    "],[10,"em"],[12],[2,"\\n      "],[1,[32,1]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]],[2,"  "],[8,"state",[],[["@state","@matches"],[[32,3,["state"]],"error"]],[["default"],[{"statements":[[2,"\\n"],[2,"    "],[10,"strong"],[14,"role","alert"],[12],[1,[30,[36,1],[[30,[36,1],[[32,3,["state","context","errors"]],[32,2]],null],"message"],null]],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["if","get","concat","-named-block-invocation","or","let"]}',meta:{moduleName:"consul-ui/components/form-input/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/freetext-filter/index",["exports","@glimmer/component"],(function(e,t){var n,r,a
+function l(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const s=Ember.HTMLBars.template({id:"lUCYCwl6",block:'{"symbols":["&attrs","@value","&default"],"statements":[[11,"div"],[24,0,"freetext-filter"],[17,1],[12],[2,"\\n  "],[10,"label"],[14,0,"type-search"],[12],[2,"\\n    "],[10,"span"],[14,0,"freetext-filter_label"],[12],[2,"Search"],[13],[2,"\\n    "],[10,"input"],[14,0,"freetext-filter_input"],[15,"onsearch",[30,[36,0],[[32,0],[32,0,["change"]]],null]],[15,"oninput",[30,[36,0],[[32,0],[32,0,["change"]]],null]],[15,"onkeydown",[30,[36,0],[[32,0],[32,0,["keydown"]]],null]],[14,3,"s"],[15,2,[32,2]],[15,"placeholder",[32,0,["placeholder"]]],[14,"autofocus","autofocus"],[14,4,"search"],[12],[13],[2,"\\n  "],[13],[2,"\\n  "],[18,3,null],[2,"\\n"],[13]],"hasEval":false,"upvars":["action"]}',meta:{moduleName:"consul-ui/components/freetext-filter/index.hbs"}})
+let i=(n=Ember._action,r=Ember._action,l((a=class extends t.default{get placeholder(){return this.args.placeholder||"Search"}get onsearch(){return this.args.onsearch||(()=>{})}change(e){this.onsearch(e)}keydown(e){13===e.keyCode&&e.preventDefault()}}).prototype,"change",[n],Object.getOwnPropertyDescriptor(a.prototype,"change"),a.prototype),l(a.prototype,"keydown",[r],Object.getOwnPropertyDescriptor(a.prototype,"keydown"),a.prototype),a)
+e.default=i,Ember._setComponentTemplate(s,i)})),define("consul-ui/components/hashicorp-consul/index",["exports","@glimmer/component"],(function(e,t){var n,r,a
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const l=Ember.HTMLBars.template({id:"GQy+KSaK",block:'{"symbols":["__arg0","__arg1","selector","disclosure","panel","menu","app","flash","status","type","notice","&default","@dc","@partition","@nspace","@onchange","@dcs","&attrs"],"statements":[[8,"app",[[24,0,"hashicorp-consul"],[17,18]],[["@namedBlocksInfo"],[[30,[36,4],null,[["notifications","home-nav","main-nav","complementary-nav","main","content-info"],[1,0,0,0,0,0]]]]],[["default"],[{"statements":[[6,[37,3],[[30,[36,2],[[32,1],"notifications"],null]],null,[["default","else"],[{"statements":[[6,[37,17],[[32,2]],null,[["default"],[{"statements":[[2,"\\n"],[6,[37,21],[[30,[36,20],[[30,[36,20],[[35,19,["queue"]]],null]],null]],null,[["default"],[{"statements":[[2,"  "],[8,[32,7,["Notification"]],[],[["@delay","@sticky"],[[30,[36,18],[[32,8,["timeout"]],[32,8,["extendedTimeout"]]],null],[32,8,["sticky"]]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[32,8,["dom"]]],null,[["default","else"],[{"statements":[[2,"      "],[2,[32,8,["dom"]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,17],[[30,[36,16],[[32,8,["type"]]],null],[30,[36,16],[[32,8,["action"]]],null]],null,[["default"],[{"statements":[[2,"  "],[8,"notice",[[24,"role","alert"],[16,0,[30,[36,1],[[32,9]," notification-",[32,10]],null]],[24,"data-notification",""]],[["@type"],[[32,9]]],[["default"],[{"statements":[[2,"\\n    "],[8,[32,11,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[10,"strong"],[12],[2,"\\n        "],[1,[30,[36,15],[[32,9]],null]],[2,"!\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,[32,11,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[10,"p"],[12],[2,"\\n"],[6,[37,3],[[30,[36,13],[[32,10],"logout"],null]],null,[["default","else"],[{"statements":[[6,[37,3],[[30,[36,13],[[32,9],"success"],null]],null,[["default","else"],[{"statements":[[2,"            You are now logged out.\\n"]],"parameters":[]},{"statements":[[2,"            There was an error logging out.\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,3],[[30,[36,13],[[32,10],"authorize"],null]],null,[["default","else"],[{"statements":[[6,[37,3],[[30,[36,13],[[32,9],"success"],null]],null,[["default","else"],[{"statements":[[2,"            You are now logged in.\\n"]],"parameters":[]},{"statements":[[2,"            There was an error, please check your SecretID/Token\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,3],[[30,[36,14],[[30,[36,13],[[32,10],"use"],null],[30,[36,13],[[32,8,["model"]],"token"],null]],null]],null,[["default","else"],[{"statements":[[2,"            "],[8,"consul/token/notifications",[],[["@type","@status","@item","@error"],[[32,10],[32,9],[32,8,["item"]],[32,8,["error"]]]],null],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,3],[[30,[36,13],[[32,8,["model"]],"intention"],null]],null,[["default","else"],[{"statements":[[2,"            "],[8,"consul/intention/notifications",[],[["@type","@status","@item","@error"],[[32,10],[32,9],[32,8,["item"]],[32,8,["error"]]]],null],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,3],[[30,[36,13],[[32,8,["model"]],"role"],null]],null,[["default","else"],[{"statements":[[2,"            "],[8,"consul/role/notifications",[],[["@type","@status","@item","@error"],[[32,10],[32,9],[32,8,["item"]],[32,8,["error"]]]],null],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,3],[[30,[36,13],[[32,8,["model"]],"policy"],null]],null,[["default"],[{"statements":[[2,"            "],[8,"consul/policy/notifications",[],[["@type","@status","@item","@error"],[[32,10],[32,9],[32,8,["item"]],[32,8,["error"]]]],null],[2,"\\n          "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[2,"        "]],"parameters":[]}]]]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[11]}]]],[2,"\\n"]],"parameters":[9,10]}]]]],"parameters":[]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[8]}]]],[2,"\\n  "]],"parameters":[7]}]]]],"parameters":[]},{"statements":[[6,[37,3],[[30,[36,2],[[32,1],"home-nav"],null]],null,[["default","else"],[{"statements":[[2,"\\n    "],[10,"a"],[15,6,[30,[36,7],["index"],null]],[12],[8,"consul/logo",[],[[],[]],null],[13],[2,"\\n  "]],"parameters":[]},{"statements":[[6,[37,3],[[30,[36,2],[[32,1],"main-nav"],null]],null,[["default","else"],[{"statements":[[2,"\\n    "],[10,"ul"],[12],[2,"\\n      "],[8,"consul/datacenter/selector",[],[["@dc","@partition","@nspace","@dcs"],[[32,13],[32,14],[32,15],[32,17]]],null],[2,"\\n      "],[8,"consul/partition/selector",[],[["@dc","@partition","@nspace","@partitions","@onchange"],[[32,13],[32,14],[32,15],[32,0,["partitions"]],[30,[36,11],[[32,0],[30,[36,10],[[32,0,["partitions"]]],null]],[["value"],["data"]]]]],null],[2,"\\n      "],[8,"consul/nspace/selector",[],[["@dc","@partition","@nspace","@nspaces","@onchange"],[[32,13],[32,14],[32,15],[32,0,["nspaces"]],[30,[36,11],[[32,0],[30,[36,10],[[32,0,["nspaces"]]],null]],[["value"],["data"]]]]],null],[2,"\\n"],[6,[37,3],[[30,[36,12],["access overview"],null]],null,[["default"],[{"statements":[[2,"        "],[10,"li"],[15,0,[30,[36,9],[[30,[36,8],["is-active",[30,[36,6],["dc.show",[32,13,["Name"]]],null]],null]],null]],[12],[2,"\\n          "],[8,"action",[],[["@href"],[[30,[36,7],["dc.show",[32,13,["Name"]]],null]]],[["default"],[{"statements":[[2,"\\n            Overview\\n          "]],"parameters":[]}]]],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,3],[[30,[36,12],["read services"],null]],null,[["default"],[{"statements":[[2,"        "],[10,"li"],[15,0,[30,[36,3],[[30,[36,6],["dc.services",[32,13,["Name"]]],null],"is-active"],null]],[12],[2,"\\n            "],[10,"a"],[15,6,[30,[36,7],["dc.services",[32,13,["Name"]]],null]],[12],[2,"Services"],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,3],[[30,[36,12],["read nodes"],null]],null,[["default"],[{"statements":[[2,"        "],[10,"li"],[15,0,[30,[36,3],[[30,[36,6],["dc.nodes",[32,13,["Name"]]],null],"is-active"],null]],[12],[2,"\\n            "],[10,"a"],[15,6,[30,[36,7],["dc.nodes",[32,13,["Name"]]],null]],[12],[2,"Nodes"],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,3],[[30,[36,12],["read kv"],null]],null,[["default"],[{"statements":[[2,"        "],[10,"li"],[15,0,[30,[36,3],[[30,[36,6],["dc.kv",[32,13,["Name"]]],null],"is-active"],null]],[12],[2,"\\n            "],[10,"a"],[15,6,[30,[36,7],["dc.kv",[32,13,["Name"]]],null]],[12],[2,"Key/Value"],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,3],[[30,[36,12],["read intentions"],null]],null,[["default"],[{"statements":[[2,"        "],[10,"li"],[15,0,[30,[36,3],[[30,[36,6],["dc.intentions",[32,13,["Name"]]],null],"is-active"],null]],[12],[2,"\\n            "],[10,"a"],[15,6,[30,[36,7],["dc.intentions",[32,13,["Name"]]],null]],[12],[2,"Intentions"],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[8,"consul/acl/selector",[],[["@dc","@partition","@nspace"],[[32,13],[32,14],[32,15]]],null],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]},{"statements":[[6,[37,3],[[30,[36,2],[[32,1],"complementary-nav"],null]],null,[["default","else"],[{"statements":[[2,"\\n    "],[10,"ul"],[12],[2,"\\n        "],[8,"debug/navigation",[],[[],[]],null],[2,"\\n        "],[10,"li"],[12],[2,"\\n          "],[8,"disclosure-menu",[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,4,["Action"]],[[4,[38,5],["click",[32,4,["toggle"]]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n              Help\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,[32,4,["Menu"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,[32,5,["Menu"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                "],[8,[32,6,["Separator"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                  Consul v"],[1,[30,[36,0],["CONSUL_VERSION"],null]],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n                "],[8,[32,6,["Item"]],[[24,0,"docs-link"]],[[],[]],[["default"],[{"statements":[[2,"\\n                  "],[8,[32,6,["Action"]],[],[["@href","@external"],[[30,[36,0],["CONSUL_DOCS_URL"],null],true]],[["default"],[{"statements":[[2,"\\n                    Documentation\\n                  "]],"parameters":[]}]]],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n                "],[8,[32,6,["Item"]],[[24,0,"learn-link"]],[[],[]],[["default"],[{"statements":[[2,"\\n                  "],[8,[32,6,["Action"]],[],[["@href","@external"],[[30,[36,1],[[30,[36,0],["CONSUL_DOCS_LEARN_URL"],null],"/consul"],null],true]],[["default"],[{"statements":[[2,"\\n                    HashiCorp Learn\\n                  "]],"parameters":[]}]]],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n                "],[8,[32,6,["Separator"]],[],[[],[]],null],[2,"\\n                "],[8,[32,6,["Item"]],[[24,0,"feedback-link"]],[[],[]],[["default"],[{"statements":[[2,"\\n                  "],[8,[32,6,["Action"]],[],[["@href","@external"],[[30,[36,0],["CONSUL_REPO_ISSUES_URL"],null],true]],[["default"],[{"statements":[[2,"\\n                    Provide Feedback\\n                  "]],"parameters":[]}]]],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[6]}]]],[2,"\\n            "]],"parameters":[5]}]]],[2,"\\n          "]],"parameters":[4]}]]],[2,"\\n        "],[13],[2,"\\n        "],[10,"li"],[15,0,[30,[36,3],[[30,[36,6],["settings"],null],"is-active"],null]],[12],[2,"\\n            "],[10,"a"],[15,6,[30,[36,7],["settings"],[["params"],[[30,[36,4],null,[["nspace","partition"],[[29],[29]]]]]]]],[12],[2,"\\n              Settings\\n            "],[13],[2,"\\n        "],[13],[2,"\\n        "],[8,"consul/token/selector",[],[["@dc","@partition","@nspace","@onchange"],[[32,13],[32,14],[32,15],[32,16]]],[["default"],[{"statements":[[2,"\\n          "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"tokenSelector",[32,3]]],null],[2,"\\n        "]],"parameters":[3]}]]],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]},{"statements":[[6,[37,3],[[30,[36,2],[[32,1],"main"],null]],null,[["default","else"],[{"statements":[[2,"\\n    "],[18,12,[[30,[36,4],null,[["login"],[[30,[36,3],[[32,0,["tokenSelector"]],[32,0,["tokenSelector"]],[30,[36,4],null,[["open","close"],[[29],[29]]]]],null]]]]]],[2,"\\n  "]],"parameters":[]},{"statements":[[6,[37,3],[[30,[36,2],[[32,1],"content-info"],null]],null,[["default"],[{"statements":[[2,"\\n    "],[10,"p"],[12],[2,"\\n      Consul v"],[1,[30,[36,0],["CONSUL_VERSION"],null]],[2,"\\n    "],[13],[2,"\\n    "],[2,[30,[36,1],["\x3c!-- ",[30,[36,0],["CONSUL_GIT_SHA"],null],"--\x3e"],null]],[2,"\\n  "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1,2]}]]]],"hasEval":false,"upvars":["env","concat","-is-named-block-invocation","if","hash","on","is-href","href-to","array","class-map","mut","action","can","eq","or","capitalize","lowercase","let","sub","flashMessages","-track-array","each"]}',meta:{moduleName:"consul-ui/components/hashicorp-consul/index.hbs"}})
+let s=(n=Ember.inject.service("flashMessages"),r=class extends t.default{constructor(...e){var t,n,r,l
+super(...e),t=this,n="flashMessages",l=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(l):void 0})}},i=r.prototype,o="flashMessages",u=[n],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),a=m,r)
+var i,o,u,c,d,m
+e.default=s,Ember._setComponentTemplate(l,s)})),define("consul-ui/components/informed-action/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"VuPbMP+L",block:'{"symbols":["&attrs","&default"],"statements":[[11,"div"],[24,0,"informed-action"],[17,1],[12],[2,"\\n  "],[10,"div"],[12],[2,"\\n    "],[10,"header"],[12],[2,"\\n      "],[18,2,[[30,[36,0],["header"],null]]],[2,"\\n    "],[13],[2,"\\n    "],[18,2,[[30,[36,0],["body"],null]]],[2,"\\n  "],[13],[2,"\\n  "],[10,"ul"],[12],[2,"\\n    "],[18,2,[[30,[36,0],["actions"],null],[30,[36,2],null,[["Action"],[[30,[36,1],["anonymous"],[["tagName"],["li"]]]]]]]],[2,"\\n  "],[13],[2,"\\n"],[13]],"hasEval":false,"upvars":["-named-block-invocation","component","hash"]}',meta:{moduleName:"consul-ui/components/informed-action/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/ivy-codemirror",["exports","ivy-codemirror/components/ivy-codemirror"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/jwt-source/index",["exports","@glimmer/component","consul-ui/utils/dom/event-source"],(function(e,t,n){var r,a,l,s,i
+function o(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function u(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let c=(r=Ember.inject.service("repository/oidc-provider"),a=Ember.inject.service("dom"),l=class extends t.default{constructor(){super(...arguments),o(this,"repo",s,this),o(this,"dom",i,this),this.source&&this.source.close(),this._listeners=this.dom.listeners(),this.source=(0,n.fromPromise)(this.repo.findCodeByURL(this.args.src)),this._listeners.add(this.source,{message:e=>this.onchange(e),error:e=>this.onerror(e)})}onchange(e){"function"==typeof this.args.onchange&&this.args.onchange(...arguments)}onerror(e){"function"==typeof this.args.onerror&&this.args.onerror(...arguments)}willDestroy(){super.willDestroy(...arguments),this.source&&this.source.close(),this.repo.close(),this._listeners.remove()}},s=u(l.prototype,"repo",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i=u(l.prototype,"dom",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),l)
+e.default=c})),define("consul-ui/components/list-collection/index",["exports","ember-collection/components/ember-collection","ember-collection/layouts/percentage-columns","block-slots"],(function(e,t,n,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const a=Ember.HTMLBars.template({id:"sapn9cV8",block:'{"symbols":["slice","more","item","index","cell","&default","&attrs"],"statements":[[11,"div"],[16,0,[31,["list-collection list-collection-scroll-",[34,26]]]],[23,5,[30,[36,28],["height:",[35,27,["height"]],"px"],null]],[16,1,[34,29]],[17,7],[12],[2,"\\n"],[18,6,null],[2,"\\n"],[6,[37,2],[[30,[36,20],[[35,26],"virtual"],null]],null,[["default","else"],[{"statements":[[2,"  "],[1,[30,[36,21],["resize",[30,[36,4],[[32,0],"resize"],null]],null]],[2,"\\n  "],[8,"ember-native-scrollable",[],[["@tagName","@content-size","@scroll-left","@scroll-top","@scrollChange","@clientSizeChange"],["ul",[34,22],[34,23],[34,24],[30,[36,4],[[32,0],"scrollChange"],null],[30,[36,4],[[32,0],"clientSizeChange"],null]]],[["default"],[{"statements":[[2,"\\n      "],[10,"li"],[12],[13],[6,[37,14],[[30,[36,13],[[30,[36,13],[[35,25]],null]],null]],null,[["default"],[{"statements":[[10,"li"],[15,"onclick",[30,[36,4],[[32,0],"click"],null]],[22,5,[32,5,["style"]]],[15,0,[30,[36,2],[[35,8],[30,[36,2],[[30,[36,9],[[35,8]],[["item"],[[32,5,["item"]]]]],"linkable"],null]],null]],[12],[2,"\\n        "],[8,"yield-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[10,"div"],[14,0,"header"],[12],[18,6,[[32,5,["item"]],[32,5,["index"]]]],[13]],"parameters":[]}]]],[2,"\\n        "],[8,"yield-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[10,"div"],[14,0,"detail"],[12],[18,6,[[32,5,["item"]],[32,5,["index"]]]],[13]],"parameters":[]}]]],[2,"\\n        "],[8,"yield-slot",[],[["@name","@params"],["actions",[30,[36,12],[[30,[36,11],["more-popover-menu"],[["expanded","onchange"],[[30,[36,2],[[30,[36,20],[[35,19],[32,5,["index"]]],null],true,false],null],[30,[36,4],[[32,0],"change",[32,5,["index"]]],null]]]]],null]]],[["default"],[{"statements":[[2,"\\n          "],[10,"div"],[14,0,"actions"],[12],[2,"\\n            "],[18,6,[[32,5,["item"]],[32,5,["index"]]]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13]],"parameters":[5]}]]]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,6],[[30,[36,2],[[30,[36,17],[[35,15],[30,[36,10],[[32,0,["expand"]]],null]],null],[30,[36,18],[0,[35,15],[35,0]],null],[35,0]],null]],null,[["default"],[{"statements":[[2,"  "],[10,"ul"],[12],[2,"\\n    "],[10,"li"],[14,5,"display: none;"],[12],[13],[6,[37,14],[[30,[36,13],[[30,[36,13],[[32,1]],null]],null]],null,[["default"],[{"statements":[[10,"li"],[15,"onclick",[30,[36,4],[[32,0],"click"],null]],[15,0,[30,[36,2],[[30,[36,10],[[35,8]],null],"linkable",[30,[36,2],[[30,[36,9],[[35,8]],[["item"],[[35,7,["item"]]]]],"linkable"],null]],null]],[12],[2,"\\n        "],[8,"yield-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[10,"div"],[14,0,"header"],[12],[18,6,[[32,3],[32,4]]],[13]],"parameters":[]}]]],[2,"\\n        "],[8,"yield-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[10,"div"],[14,0,"detail"],[12],[18,6,[[32,3],[32,4]]],[13]],"parameters":[]}]]],[2,"\\n        "],[8,"yield-slot",[],[["@name","@params"],["actions",[30,[36,12],[[30,[36,11],["more-popover-menu"],[["onchange"],[[30,[36,4],[[32,0],"change",[32,4]],null]]]]],null]]],[["default"],[{"statements":[[2,"\\n          "],[10,"div"],[14,0,"actions"],[12],[2,"\\n            "],[18,6,[[32,3],[32,4]]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13]],"parameters":[3,4]}]]],[13],[2,"\\n"],[6,[37,2],[[30,[36,17],[[35,15],[30,[36,16],[[35,0,["length"]],[35,15]],null]],null]],null,[["default"],[{"statements":[[6,[37,6],[[30,[36,5],[[32,1,["length"]],[35,0,["length"]]],null]],null,[["default"],[{"statements":[[2,"  "],[10,"button"],[15,0,[30,[36,2],[[32,2],"closed"],null]],[15,"onclick",[30,[36,4],[[32,0],[30,[36,3],[[32,0,["expand"]]],null],[32,2]],null]],[14,4,"button"],[12],[2,"\\n"],[6,[37,2],[[32,2]],null,[["default","else"],[{"statements":[[2,"      View "],[1,[30,[36,1],[[35,0,["length"]],[32,1,["length"]]],null]],[2," more\\n"]],"parameters":[]},{"statements":[[2,"      View less\\n"]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[2]}]]]],"parameters":[]}]]]],"parameters":[1]}]]],[2,"\\n"]],"parameters":[]}]]],[13]],"hasEval":false,"upvars":["items","sub","if","mut","action","not-eq","let","cell","linkable","is","not","component","block-params","-track-array","each","partial","gt","and","slice","checked","eq","on-window","_contentSize","_scrollLeft","_scrollTop","_cells","scroll","style","concat","guid"]}',meta:{moduleName:"consul-ui/components/list-collection/index.hbs"}}),l=n.default.prototype.formatItemStyle
+var s=Ember._setComponentTemplate(a,t.default.extend(r.default,{dom:Ember.inject.service("dom"),tagName:"",height:500,cellHeight:70,checked:null,scroll:"virtual",init:function(){this._super(...arguments),this.columns=[100],this.guid=this.dom.guid(this)},didInsertElement:function(){this._super(...arguments),this.$element=this.dom.element("#"+this.guid),"virtual"===this.scroll&&this.actions.resize.apply(this,[{target:this.dom.viewport()}])},didReceiveAttrs:function(){this._super(...arguments),this._cellLayout=this["cell-layout"]=new n.default(Ember.get(this,"items.length"),Ember.get(this,"columns"),Ember.get(this,"cellHeight"))
+const e=this
+this["cell-layout"].formatItemStyle=function(t){let n=l.apply(this,arguments)
+return e.checked===t&&(n+=";z-index: 1"),n}},style:Ember.computed("height",(function(){return"virtual"!==this.scroll?{}:{height:Ember.get(this,"height")}})),actions:{resize:function(e){const t=Ember.get(this,"dom").element('footer[role="contentinfo"]')
+if(t){const n=1,r=this.$element.getBoundingClientRect().top+t.clientHeight+n,a=e.target.innerHeight-r
+this.set("height",Math.max(0,a)),this.updateItems(),this.updateScrollPosition()}},click:function(e){return this.dom.clickFirstAnchor(e,".list-collection > ul > li")},change:function(e,t={}){if(t.target.checked&&e!==Ember.get(this,"checked")){Ember.set(this,"checked",parseInt(e)),this.$row=this.dom.closest("li",t.target),this.$row.style.zIndex=1
+const n=this.dom.sibling(t.target,"div")
+n.getBoundingClientRect().top+n.clientHeight>this.dom.element('footer[role="contentinfo"]').getBoundingClientRect().top?n.classList.add("above"):n.classList.remove("above")}else{this.dom.sibling(t.target,"div").classList.remove("above"),Ember.set(this,"checked",null),this.$row.style.zIndex=null}}}}))
+e.default=s})),define("consul-ui/components/maybe-in-element",["exports","ember-maybe-in-element/components/maybe-in-element"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/menu-panel/index",["exports","block-slots"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"NsIcnIv+",block:'{"symbols":["api","&default","&attrs"],"statements":[[18,2,null],[2,"\\n"],[6,[37,8],[[30,[36,7],null,[["change"],[[30,[36,4],[[32,0],"change"],null]]]]],null,[["default"],[{"statements":[[11,"div"],[16,0,[30,[36,3],[[30,[36,1],["menu-panel"],null],[30,[36,1],["menu-panel-deprecated"],null],[30,[36,1],[[35,2]],null],[30,[36,1],[[35,0],"confirmation"],null]],null]],[4,[38,5],[[30,[36,4],[[32,0],"connect"],null]],null],[12],[2,"\\n  "],[8,"yield-slot",[],[["@name"],["controls"]],[["default"],[{"statements":[[2,"\\n    "],[18,2,[[32,1]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"],[6,[37,6],null,[["name"],["header"]],[["default","else"],[{"statements":[[2,"    "],[10,"div"],[12],[2,"\\n      "],[18,2,[[32,1]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]},{"statements":[],"parameters":[]}]]],[2,"  "],[11,"ul"],[24,"role","menu"],[17,3],[12],[2,"\\n    "],[8,"yield-slot",[],[["@name"],["menu"]],[["default"],[{"statements":[[2,"\\n      "],[18,2,[[32,1]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "],[13],[2,"\\n"],[13],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["isConfirmation","array","position","class-map","action","did-insert","yield-slot","hash","let"]}',meta:{moduleName:"consul-ui/components/menu-panel/index.hbs"}})
+var r=Ember._setComponentTemplate(n,Ember.Component.extend(t.default,{tagName:"",dom:Ember.inject.service("dom"),isConfirmation:!1,actions:{connect:function(e){Ember.run.next(()=>{if(!this.isDestroyed){const t=this.dom.element('li:only-child > [role="menu"]:first-child',e)
+Ember.set(this,"isConfirmation",void 0!==t)}})},change:function(e){const t=e.target.getAttribute("id"),n=this.dom.element(`[for='${t}']`),r=this.dom.element("[role=menu]",n.parentElement),a=this.dom.closest(".menu-panel",r)
+if(e.target.checked){r.style.display="block"
+const e=r.offsetHeight+2
+a.style.maxHeight=a.style.minHeight=e+"px"}else r.style.display=null,a.style.maxHeight=null,a.style.minHeight="0"}}}))
+e.default=r})),define("consul-ui/components/menu/action/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"H3aA1fem",block:'{"symbols":["&attrs","@href","@external","@disclosure","&default"],"statements":[[8,"action",[[24,"role","menuitem"],[17,1],[4,[38,2],["click",[30,[36,1],[[32,2],[32,4,["close"]],[30,[36,0],null,null]],null]],null]],[["@href","@external"],[[32,2],[32,3]]],[["default"],[{"statements":[[2,"\\n  "],[18,5,null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"]],"hasEval":false,"upvars":["noop","if","on"]}',meta:{moduleName:"consul-ui/components/menu/action/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/menu/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"grZDhn10",block:'{"symbols":["@pager","@disclosure","@event","@onclose","&default"],"statements":[[11,"ul"],[24,"role","menu"],[23,5,[30,[36,4],[[30,[36,3],["height",[30,[36,2],[[30,[36,1],[[32,1],[30,[36,0],[[32,1,["type"]],"native-scroll"],null]],null],[32,1,["totalHeight"]]],null],"px"],null],[30,[36,3],["--paged-start",[30,[36,2],[[30,[36,1],[[32,1],[30,[36,0],[[32,1,["type"]],"native-scroll"],null]],null],[32,1,["startHeight"]]],null],"px"],null]],null]],[4,[38,6],[[30,[36,5],[[32,1,["pane"]]],null]],null],[4,[38,8],null,[["onclose","openEvent"],[[30,[36,7],[[32,4],[32,2,["close"]]],null],[30,[36,7],[[32,3],[32,2,["event"]]],null]]]],[12],[2,"\\n  "],[18,5,[[30,[36,10],null,[["Action","Item","Separator","items"],[[30,[36,9],["menu/action"],[["disclosure"],[[32,2]]]],[30,[36,9],["menu/item"],null],[30,[36,9],["menu/separator"],null],[32,1,["items"]]]]]]],[2,"\\n"],[13]],"hasEval":false,"upvars":["not-eq","and","if","array","style-map","optional","did-insert","or","aria-menu","component","hash"]}',meta:{moduleName:"consul-ui/components/menu/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/menu/item/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"50p8S2ab",block:'{"symbols":["&attrs","&default"],"statements":[[11,"li"],[24,"role","none"],[17,1],[12],[2,"\\n  "],[18,2,null],[2,"\\n"],[13],[2,"\\n\\n"]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/menu/item/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/menu/separator/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"TK+1HboX",block:'{"symbols":["&attrs","&default"],"statements":[[11,"li"],[24,"role","separator"],[17,1],[12],[18,2,null],[13],[2,"\\n"]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/menu/separator/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/modal-dialog/index",["exports","block-slots","a11y-dialog"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r=Ember.HTMLBars.template({id:"QFjycrze",block:'{"symbols":["aria","&default","&attrs","@aria"],"statements":[[6,[37,6],[[30,[36,3],null,[["labelledby"],[[30,[36,5],null,null]]]]],null,[["default"],[{"statements":[[2,"  "],[8,"portal",[],[["@target"],["modal"]],[["default"],[{"statements":[[2,"\\n    "],[18,2,null],[2,"\\n    "],[11,"div"],[24,0,"modal-dialog"],[24,"aria-hidden","true"],[17,3],[4,[38,1],[[30,[36,0],[[32,0],"connect"],null]],null],[4,[38,2],[[30,[36,0],[[32,0],"disconnect"],null]],null],[12],[2,"\\n      "],[10,"div"],[14,"tabindex","-1"],[14,"data-a11y-dialog-hide",""],[12],[13],[2,"\\n      "],[10,"div"],[14,0,"modal-dialog-modal"],[14,"role","dialog"],[15,"aria-label",[32,4,["label"]]],[12],[2,"\\n        "],[10,"div"],[14,"role","document"],[12],[2,"\\n          "],[10,"header"],[14,0,"modal-dialog-header"],[12],[2,"\\n            "],[10,"button"],[14,"data-a11y-dialog-hide",""],[14,"aria-label","Close dialog"],[14,4,"button"],[12],[2,"\\n            "],[13],[2,"\\n            "],[8,"yield-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n              "],[18,2,[[30,[36,3],null,[["open","close","aria"],[[30,[36,0],[[32,0],"open"],null],[30,[36,0],[[32,0],"close"],null],[32,1]]]]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n          "],[10,"div"],[14,0,"modal-dialog-body"],[12],[2,"\\n            "],[8,"yield-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n              "],[18,2,[[30,[36,3],null,[["open","close","aria"],[[30,[36,0],[[32,0],"open"],null],[30,[36,0],[[32,0],"close"],null],[32,1]]]]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n          "],[10,"footer"],[14,0,"modal-dialog-footer"],[12],[2,"\\n            "],[8,"yield-slot",[],[["@name","@params"],["actions",[30,[36,4],[[30,[36,0],[[32,0],"close"],null]],null]]],[["default"],[{"statements":[[2,"\\n              "],[18,2,[[30,[36,3],null,[["open","close","aria"],[[30,[36,0],[[32,0],"open"],null],[30,[36,0],[[32,0],"close"],null],[32,1]]]]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["action","did-insert","will-destroy","hash","block-params","unique-id","let"]}',meta:{moduleName:"consul-ui/components/modal-dialog/index.hbs"}})
+var a=Ember._setComponentTemplate(r,Ember.Component.extend(t.default,{tagName:"",onclose:function(){},onopen:function(){},actions:{connect:function(e){this.dialog=new n.default(e),this.dialog.on("hide",()=>this.onclose({target:e})),this.dialog.on("show",()=>this.onopen({target:e})),this.open&&this.dialog.show()},disconnect:function(){this.dialog.destroy()},open:function(){this.dialog.show()},close:function(){this.dialog.hide()}}}))
+e.default=a})),define("consul-ui/components/modal-layer/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"SGKsWSq5",block:'{"symbols":["&attrs"],"statements":[[11,"div"],[24,0,"modal-layer"],[17,1],[12],[2,"\\n  "],[8,"portal-target",[],[["@name","@multiple"],["modal",true]],null],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/modal-layer/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/more-popover-menu/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"tD2XBvHN",block:'{"symbols":["components","api","&attrs","&default"],"statements":[[11,"div"],[24,0,"more-popover-menu"],[17,3],[12],[2,"\\n  "],[8,"popover-menu",[],[["@expanded","@onchange","@keyboardAccess"],[[34,0],[30,[36,2],[[32,0],[35,1]],null],false]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["trigger"]],[["default"],[{"statements":[[2,"\\n      More\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["menu"]],[["default"],[{"statements":[[2,"\\n      "],[18,4,[[32,1,["MenuItem"]]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[1,2]}]]],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["expanded","onchange","action"]}',meta:{moduleName:"consul-ui/components/more-popover-menu/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:""}))
+e.default=n})),define("consul-ui/components/notice/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"CHmd0+dq",block:'{"symbols":["@type","&attrs","&default"],"statements":[[11,"div"],[16,0,[31,["notice ",[30,[36,0],[[32,1],"info"],null]]]],[17,2],[12],[2,"\\n"],[18,3,[[30,[36,2],null,[["Header","Body","Footer"],[[30,[36,1],["anonymous"],[["tagName"],["header"]]],[30,[36,1],["anonymous"],null],[30,[36,1],["anonymous"],[["tagName"],["footer"]]]]]]]],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["or","component","hash"]}',meta:{moduleName:"consul-ui/components/notice/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/oidc-select/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={id:"oidc-select",initial:"idle",on:{RESET:[{target:"idle"}]},states:{idle:{on:{LOAD:[{target:"loading"}]}},loaded:{},loading:{on:{SUCCESS:[{target:"loaded"}]}}}}}))
+define("consul-ui/components/oidc-select/index",["exports","@glimmer/component","consul-ui/components/oidc-select/chart.xstate"],(function(e,t,n){var r,a,l
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const s=Ember.HTMLBars.template({id:"QN/Z72sP",block:'{"symbols":["State","Guard","ChartAction","dispatch","state","chart","item","__arg0","__arg1","option","item","ignoredState","ignoredGuard","ignoredAction","formDispatch","state","@disabled","@onchange","&attrs","@dc","@nspace","@onerror"],"statements":[[8,"state-chart",[],[["@src"],[[34,22]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,4],[[30,[36,7],null,[["State","Guard","Action","dispatch","state"],[[32,1],[32,2],[32,3],[32,4],[32,5]]]]],null,[["default"],[{"statements":[[2,"\\n"],[11,"div"],[24,0,"oidc-select"],[17,19],[12],[2,"\\n    "],[8,[32,1],[],[["@notMatches"],["idle"]],[["default"],[{"statements":[[2,"\\n      "],[8,"data-source",[],[["@src","@onchange","@onerror"],[[30,[36,15],["/${partition}/${nspace}/${dc}/oidc/providers",[30,[36,7],null,[["partition","nspace","dc"],[[32,0,["partition"]],[32,21],[32,20]]]]],null],[30,[36,16],[[30,[36,6],[[32,0],[30,[36,5],[[32,0,["items"]]],null]],[["value"],["data"]]],[30,[36,10],[[32,4],"SUCCESS"],null]],null],[30,[36,16],[[30,[36,10],[[32,4],"RESET"],null],[32,22]],null]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,[32,1],[],[["@matches"],["loaded"]],[["default"],[{"statements":[[2,"\\n      "],[8,"action",[[24,0,"reset"],[4,[38,11],["click",[30,[36,16],[[30,[36,17],[[32,0],"partition",""],null],[30,[36,10],[[32,4],"RESET"],null]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n        Choose different Partition\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n  "],[8,"state-chart",[],[["@src"],[[30,[36,18],["validate"],null]]],[["default"],[{"statements":[[2,"\\n    "],[8,"text-input",[],[["@name","@label","@item","@validations","@placeholder","@oninput","@chart"],["partition","Admin Partition",[32,0],[30,[36,7],null,[["partition"],[[30,[36,19],[[30,[36,7],null,[["test","error"],["^[a-zA-Z0-9]([a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?$","Name must be a valid DNS hostname."]]]],null]]]],"Enter your Partition",[30,[36,6],[[32,0],[30,[36,5],[[32,0,["partition"]]],null]],[["value"],["target.value"]]],[30,[36,7],null,[["state","dispatch"],[[32,16],[32,15]]]]]],null],[2,"\\n\\n"],[2,"  "],[8,[32,1],[],[["@matches"],["idle"]],[["default"],[{"statements":[[2,"\\n    "],[8,"action",[[4,[38,9],[[30,[36,1],[[30,[36,21],[[32,0,["partition","length"]],1],null],[30,[36,20],[[32,16],"error"],null]],null]],null],[4,[38,11],["click",[30,[36,10],[[32,4],"LOAD"],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n      Choose provider\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n\\n  "]],"parameters":[12,13,14,15,16]}]]],[2,"\\n\\n  "],[8,[32,1],[],[["@matches"],["loading"]],[["default"],[{"statements":[[2,"\\n    "],[8,"progress",[[24,"aria-label","Loading"]],[[],[]],null],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n\\n  "],[8,[32,1],[],[["@matches"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[30,[36,21],[[32,0,["items","length"]],3],null]],null,[["default","else"],[{"statements":[[2,"\\n        "],[10,"ul"],[12],[2,"\\n"],[6,[37,14],[[30,[36,13],[[30,[36,13],[[32,0,["items"]]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[10,"li"],[12],[2,"\\n            "],[8,"action",[[16,0,[30,[36,0],[[32,11,["Kind"]],"-oidc-provider"],null]],[16,"disabled",[32,17]],[4,[38,11],["click",[30,[36,10],[[32,18],[32,11]],null]],null]],[["@type"],["button"]],[["default"],[{"statements":[[2,"\\n              Continue with "],[1,[30,[36,1],[[32,11,["DisplayName"]],[32,11,["Name"]]],null]],[6,[37,3],[[30,[36,2],[[32,11,["Namespace"]],"default"],null]],null,[["default"],[{"statements":[[2," ("],[1,[32,11,["Namespace"]]],[2,")"]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[11]}]]],[2,"        "],[13],[2,"\\n\\n"]],"parameters":[]},{"statements":[[2,"\\n"],[6,[37,4],[[30,[36,1],[[32,0,["provider"]],[30,[36,12],[0,[32,0,["items"]]],null]],null]],null,[["default"],[{"statements":[[2,"\\n        "],[8,"option-input",[],[["@label","@name","@item","@selected","@items","@onchange","@disabled","@namedBlocksInfo"],["SSO Provider","provider",[32,0],[32,7],[32,0,["items"]],[30,[36,6],[[32,0],[30,[36,5],[[32,0,["provider"]]],null]],null],[32,17],[30,[36,7],null,[["option"],[1]]]]],[["default"],[{"statements":[[6,[37,3],[[30,[36,8],[[32,8],"option"],null]],null,[["default"],[{"statements":[[6,[37,4],[[32,9]],null,[["default"],[{"statements":[[2,"\\n            "],[10,"span"],[15,0,[30,[36,0],[[32,10,["item","Kind"]],"-oidc-provider"],null]],[12],[2,"\\n              "],[1,[30,[36,1],[[32,10,["item","DisplayName"]],[32,10,["item","Name"]]],null]],[6,[37,3],[[30,[36,2],[[32,10,["item","Namespace"]],"default"],null]],null,[["default"],[{"statements":[[2," ("],[1,[32,10,["item","Namespace"]]],[2,")"]],"parameters":[]}]]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[10]}]]]],"parameters":[]}]]]],"parameters":[8,9]}]]],[2,"\\n\\n        "],[8,"action",[[4,[38,9],[[32,17]],null],[4,[38,11],["click",[30,[36,10],[[32,18],[32,7]],null]],null]],[["@type"],["button"]],[["default"],[{"statements":[[2,"\\n          Log in\\n        "]],"parameters":[]}]]],[2,"\\n\\n"]],"parameters":[7]}]]]],"parameters":[]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[6]}]]]],"parameters":[1,2,3,4,5]}]]]],"hasEval":false,"upvars":["concat","or","not-eq","if","let","mut","action","hash","-is-named-block-invocation","disabled","fn","on","object-at","-track-array","each","uri","queue","set","state-chart","array","state-matches","lt","chart"]}',meta:{moduleName:"consul-ui/components/oidc-select/index.hbs"}})
+let i=(r=Ember._tracked,a=class extends t.default{constructor(){var e,t,r,a
+super(...arguments),e=this,t="partition",a=this,(r=l)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0}),this.chart=n.default}},o=a.prototype,u="partition",c=[r],d={configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}},p={},Object.keys(d).forEach((function(e){p[e]=d[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=c.slice().reverse().reduce((function(e,t){return t(o,u,e)||e}),p),m&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(m):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(o,u,p),p=null),l=p,a)
+var o,u,c,d,m,p
+e.default=i,Ember._setComponentTemplate(s,i)})),define("consul-ui/components/option-input/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"lDf2582n",block:'{"symbols":["__arg0","item","@disabled","@onchange","@selected","@items","&default","@multiple","@expanded","@name","@label","&attrs","@item","@placeholder","@help","@validations","@chart"],"statements":[[8,"form-input",[[24,0,"option-input type-select"],[17,12]],[["@item","@placeholder","@name","@label","@help","@validations","@chart","@namedBlocksInfo"],[[32,13],[32,14],[32,10],[32,11],[32,15],[32,16],[32,17],[30,[36,0],null,[["label","input"],[0,0]]]]],[["default"],[{"statements":[[6,[37,2],[[30,[36,3],[[32,1],"label"],null]],null,[["default","else"],[{"statements":[[2,"\\n"],[2,"    "],[1,[30,[36,4],[[32,11],[32,10]],null]],[2,"\\n  "]],"parameters":[]},{"statements":[[6,[37,2],[[30,[36,3],[[32,1],"input"],null]],null,[["default"],[{"statements":[[2,"\\n"],[6,[37,2],[[32,9]],null,[["default","else"],[{"statements":[[6,[37,2],[[32,8]],null,[["default","else"],[{"statements":[],"parameters":[]},{"statements":[],"parameters":[]}]]]],"parameters":[]},{"statements":[[2,"      "],[8,"power-select",[],[["@disabled","@onChange","@selected","@searchEnabled","@options"],[[32,3],[32,4],[32,5],false,[32,6]]],[["default"],[{"statements":[[2,"\\n        "],[18,7,[[30,[36,1],["option"],null],[30,[36,0],null,[["item"],[[32,2]]]]]],[2,"\\n      "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"  "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["hash","-named-block-invocation","if","-is-named-block-invocation","or"]}',meta:{moduleName:"consul-ui/components/option-input/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/outlet/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E
+function k(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function x(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const j=Ember.HTMLBars.template({id:"R/yzDCxZ",block:'{"symbols":["@name","@model","&default"],"statements":[[1,[30,[36,0],[[32,0,["connect"]]],null]],[2,"\\n"],[1,[30,[36,1],[[32,0,["disconnect"]]],null]],[2,"\\n"],[11,"section"],[24,0,"outlet"],[16,"data-outlet",[32,1]],[16,"data-route",[32,0,["routeName"]]],[16,"data-state",[32,0,["state","name"]]],[16,"data-transition",[30,[36,2],[[32,0,["previousState","name"]]," ",[32,0,["state","name"]]],null]],[4,[38,0],[[30,[36,3],[[32,0,["attributeChanged"]],"element"],null]],null],[4,[38,4],[[30,[36,3],[[32,0,["attributeChanged"]],"model",[32,2]],null]],null],[4,[38,5],["transitionend",[32,0,["transitionEnd"]]],null],[12],[2,"\\n  "],[18,3,[[30,[36,6],null,[["state","previousState","route"],[[32,0,["state"]],[32,0,["previousState"]],[32,0,["route"]]]]]]],[2,"\\n"],[13]],"hasEval":false,"upvars":["did-insert","will-destroy","concat","fn","did-update","on","hash"]}',meta:{moduleName:"consul-ui/components/outlet/index.hbs"}})
+class C{constructor(e){this.name=e}matches(e){return this.name===e}}let S=(n=Ember.inject.service("routlet"),r=Ember.inject.service("router"),a=Ember._tracked,l=Ember._tracked,s=Ember._tracked,i=Ember._tracked,o=Ember._tracked,u=Ember._tracked,c=Ember._action,d=Ember._action,m=Ember._action,p=Ember._action,f=Ember._action,b=Ember._action,h=class extends t.default{constructor(...e){super(...e),k(this,"routlet",v,this),k(this,"router",y,this),k(this,"element",g,this),k(this,"routeName",O,this),k(this,"state",_,this),k(this,"previousState",P,this),k(this,"endTransition",w,this),k(this,"route",E,this)}get model(){return this.args.model||{}}get name(){return this.args.name}setAppRoute(e){if("loading"!==e||"oidc-provider-debug"===e){const t=this.element.ownerDocument.documentElement
+t.classList.contains("ember-loading")&&t.classList.remove("ember-loading"),t.dataset.route=e,this.setAppState("idle")}}setAppState(e){this.element.ownerDocument.documentElement.dataset.state=e}attributeChanged(e,t){switch(e){case"element":this.element=t,"application"===this.args.name&&(this.setAppState("loading"),this.setAppRoute(this.router.currentRouteName))
+break
+case"model":void 0!==this.route&&(this.route._model=t)}}transitionEnd(e){"function"==typeof this.endTransition&&this.endTransition()}startLoad(e){const t=this.routlet.findOutlet(e.to.name)||"application"
+if(this.args.name===t){this.previousState=this.state,this.state=new C("loading"),this.endTransition=this.routlet.transition()
+const e=window.getComputedStyle(this.element).getPropertyValue("transition-duration")
+0===parseFloat(e)&&this.endTransition()}"application"===this.args.name&&this.setAppState("loading")}endLoad(e){this.state.matches("loading")&&(this.previousState=this.state,this.state=new C("idle")),"application"===this.args.name&&this.setAppRoute(this.router.currentRouteName)}connect(){this.routlet.addOutlet(this.args.name,this),this.previousState=this.state=new C("idle"),this.router.on("routeWillChange",this.startLoad),this.router.on("routeDidChange",this.endLoad)}disconnect(){this.routlet.removeOutlet(this.args.name),this.router.off("routeWillChange",this.startLoad),this.router.off("routeDidChange",this.endLoad)}},v=x(h.prototype,"routlet",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=x(h.prototype,"router",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=x(h.prototype,"element",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=x(h.prototype,"routeName",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=x(h.prototype,"state",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=x(h.prototype,"previousState",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=x(h.prototype,"endTransition",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=x(h.prototype,"route",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x(h.prototype,"attributeChanged",[c],Object.getOwnPropertyDescriptor(h.prototype,"attributeChanged"),h.prototype),x(h.prototype,"transitionEnd",[d],Object.getOwnPropertyDescriptor(h.prototype,"transitionEnd"),h.prototype),x(h.prototype,"startLoad",[m],Object.getOwnPropertyDescriptor(h.prototype,"startLoad"),h.prototype),x(h.prototype,"endLoad",[p],Object.getOwnPropertyDescriptor(h.prototype,"endLoad"),h.prototype),x(h.prototype,"connect",[f],Object.getOwnPropertyDescriptor(h.prototype,"connect"),h.prototype),x(h.prototype,"disconnect",[b],Object.getOwnPropertyDescriptor(h.prototype,"disconnect"),h.prototype),h)
+e.default=S,Ember._setComponentTemplate(j,S)})),define("consul-ui/components/paged-collection/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w
+function E(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function k(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const x=Ember.HTMLBars.template({id:"hajSVwhB",block:'{"symbols":["@page","&default"],"statements":[[18,2,[[30,[36,5],null,[["items","page","pane","resize","viewport","rowHeight","maxHeight","startHeight","totalHeight","totalPages","Pager"],[[32,0,["items"]],[32,1],[30,[36,4],[[32,0,["setPane"]]],null],[30,[36,4],[[32,0,["resize"]]],null],[30,[36,4],[[32,0,["setViewport"]]],null],[30,[36,4],[[32,0,["setRowHeight"]]],null],[30,[36,4],[[32,0,["setMaxHeight"]]],null],[32,0,["startHeight"]],[32,0,["totalHeight"]],[32,0,["totalPages"]],[30,[36,3],[[30,[36,2],[[35,1],"index"],null],[30,[36,0],["yield"],null],""],null]]]]]],[2,"\\n\\n"],[1,[30,[36,6],[[32,0,["disconnect"]]],null]],[2,"\\n"]],"hasEval":false,"upvars":["component","type","eq","if","fn","hash","will-destroy"]}',meta:{moduleName:"consul-ui/components/paged-collection/index.hbs"}})
+let j=(n=Ember._tracked,r=Ember._tracked,a=Ember._tracked,l=Ember._tracked,s=Ember._tracked,i=Ember._tracked,o=Ember._tracked,u=Ember._action,c=Ember._action,d=Ember._action,m=Ember._action,p=Ember._action,f=Ember._action,b=Ember._action,h=class extends t.default{constructor(...e){super(...e),E(this,"$pane",v,this),E(this,"$viewport",y,this),E(this,"top",g,this),E(this,"visibleItems",O,this),E(this,"overflow",_,this),E(this,"_rowHeight",P,this),E(this,"_type",w,this)}get type(){return this.args.type||this._type}get items(){return this.args.items.slice(this.cursor,this.cursor+this.perPage)}get perPage(){switch(this.type){case"virtual-scroll":return this.visibleItems+2*this.overflow
+case"index":return parseInt(this.args.perPage)}return this.total}get cursor(){switch(this.type){case"virtual-scroll":return this.itemsBefore
+case"index":return(parseInt(this.args.page)-1)*this.perPage}return 0}get itemsBefore(){return void 0===this.$viewport?0:Math.max(0,Math.round(this.top/this.rowHeight)-this.overflow)}get rowHeight(){return parseFloat(this.args.rowHeight||this._rowHeight)}get startHeight(){switch(this.type){case"virtual-scroll":return Math.min(this.totalHeight,this.itemsBefore*this.rowHeight)
+case"index":return 0}return 0}get totalHeight(){return this.total*this.rowHeight}get totalPages(){return Math.ceil(this.total/this.perPage)}get total(){return this.args.items.length}scroll(e){this.top=this.$viewport.scrollTop}resize(){this.$viewport.clientHeight>0&&this.rowHeight>0?this.visibleItems=Math.ceil(this.$viewport.clientHeight/this.rowHeight):this.visibleItems=0}setViewport(e){this.$viewport="html"===e?[...document.getElementsByTagName("html")][0]:e,this.$viewport.addEventListener("scroll",this.scroll),"html"===e&&this.$viewport.addEventListener("resize",this.resize),this.scroll(),this.resize()}setPane(e){this.$pane=e}setRowHeight(e){this._rowHeight=parseFloat(e)}setMaxHeight(e){const t=parseFloat(e)
+isNaN(t)||(this._type="virtual-scroll")}disconnect(){this.$viewport.removeEventListener("scroll",this.scroll),this.$viewport.removeEventListener("resize",this.resize)}},v=k(h.prototype,"$pane",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=k(h.prototype,"$viewport",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=k(h.prototype,"top",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return 0}}),O=k(h.prototype,"visibleItems",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return 0}}),_=k(h.prototype,"overflow",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return 10}}),P=k(h.prototype,"_rowHeight",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return 0}}),w=k(h.prototype,"_type",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return"native-scroll"}}),k(h.prototype,"scroll",[u],Object.getOwnPropertyDescriptor(h.prototype,"scroll"),h.prototype),k(h.prototype,"resize",[c],Object.getOwnPropertyDescriptor(h.prototype,"resize"),h.prototype),k(h.prototype,"setViewport",[d],Object.getOwnPropertyDescriptor(h.prototype,"setViewport"),h.prototype),k(h.prototype,"setPane",[m],Object.getOwnPropertyDescriptor(h.prototype,"setPane"),h.prototype),k(h.prototype,"setRowHeight",[p],Object.getOwnPropertyDescriptor(h.prototype,"setRowHeight"),h.prototype),k(h.prototype,"setMaxHeight",[f],Object.getOwnPropertyDescriptor(h.prototype,"setMaxHeight"),h.prototype),k(h.prototype,"disconnect",[b],Object.getOwnPropertyDescriptor(h.prototype,"disconnect"),h.prototype),h)
+e.default=j,Ember._setComponentTemplate(x,j)})),define("consul-ui/components/panel/index.css",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=e=>e`
+  .panel {
+    --padding-x: 14px;
+    --padding-y: 14px;
+  }
+  .panel {
+    position: relative;
+  }
+  .panel-separator {
+    margin: 0;
+  }
+
+  .panel {
+    --tone-border: var(--tone-gray-300);
+    border: var(--decor-border-100);
+    border-radius: var(--decor-radius-200);
+    box-shadow: var(--decor-elevation-600);
+  }
+  .panel-separator {
+    border: 0;
+    border-top: var(--decor-border-100);
+  }
+  .panel {
+    color: rgb(var(--tone-gray-900));
+    background-color: rgb(var(--tone-gray-000));
+  }
+  .panel,
+  .panel-separator {
+    border-color: rgb(var(--tone-border));
+  }
+`})),define("consul-ui/components/policy-form/index",["exports","consul-ui/components/form-component/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"F2W+pe23",block:'{"symbols":["dc","dc","Name","__arg0","__arg0","__arg0","template","&default","&attrs"],"statements":[[18,8,null],[2,"\\n"],[11,"fieldset"],[24,0,"policy-form"],[16,"disabled",[30,[36,6],[[30,[36,5],[[30,[36,27],["write policy"],[["item"],[[35,1]]]]],null],"disabled"],null]],[17,9],[12],[2,"\\n"],[6,[37,28],null,[["name"],["template"]],[["default","else"],[{"statements":[],"parameters":[]},{"statements":[[2,"    "],[10,"header"],[12],[2,"\\n      Policy"],[1,[30,[36,6],[[35,26]," or identity?",""],null]],[2,"\\n    "],[13],[2,"\\n"],[6,[37,6],[[35,26]],null,[["default","else"],[{"statements":[[2,"    "],[10,"p"],[12],[2,"\\n      Identities are default policies with configurable names. They save you some time and effort you\'re using Consul for Connect features.\\n    "],[13],[2,"\\n"],[2,"    "],[10,"div"],[14,"role","radiogroup"],[15,0,[30,[36,6],[[35,1,["error","Type"]]," has-error"],null]],[12],[2,"\\n"],[6,[37,11],[[30,[36,10],[[30,[36,10],[[35,25]],null]],null]],null,[["default"],[{"statements":[[2,"            "],[10,"label"],[12],[2,"\\n              "],[10,"span"],[12],[1,[32,7,["name"]]],[13],[2,"\\n              "],[10,"input"],[15,3,[30,[36,19],[[35,0],"[template]"],null]],[15,2,[32,7,["template"]]],[15,"checked",[30,[36,15],[[35,1,["template"]],[32,7,["template"]]],null]],[15,"onchange",[30,[36,2],[[32,0],[30,[36,24],[[30,[36,23],[[35,1],"template"],null]],null]],[["value"],["target.value"]]]],[14,4,"radio"],[12],[13],[2,"\\n            "],[13],[2,"\\n"]],"parameters":[7]}]]],[2,"    "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[10,"input"],[15,3,[30,[36,19],[[35,0],"[template]"],null]],[14,2,""],[14,4,"hidden"],[12],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"    "],[10,"label"],[15,0,[31,["type-text",[30,[36,6],[[30,[36,29],[[35,1,["error","Name"]],[30,[36,5],[[35,1,["isPristine"]]],null]],null]," has-error"],null]]]],[12],[2,"\\n        "],[10,"span"],[12],[2,"Name"],[13],[2,"\\n        "],[10,"input"],[15,2,[34,1,["Name"]]],[15,3,[31,[[34,0],"[Name]"]]],[14,"autofocus","autofocus"],[15,"oninput",[30,[36,2],[[32,0],"change"],null]],[14,4,"text"],[12],[13],[2,"\\n        "],[10,"em"],[12],[2,"\\n          Maximum 128 characters. May only include letters (uppercase and/or lowercase) and/or numbers. Must be unique.\\n        "],[13],[2,"\\n"],[6,[37,6],[[30,[36,29],[[35,1,["error","Name"]],[30,[36,5],[[35,1,["isPristine"]]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[10,"strong"],[12],[1,[35,1,["error","Name","validation"]]],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n    "],[10,"label"],[14,"for",""],[14,0,"type-text"],[12],[2,"\\n"],[6,[37,6],[[30,[36,15],[[35,1,["template"]],"service-identity"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"code-editor",[],[["@readonly","@name","@syntax","@oninput","@namedBlocksInfo"],[true,[30,[36,19],[[35,0],"[Rules]"],null],"hcl",[30,[36,2],[[32,0],"change",[30,[36,19],[[35,0],"[Rules]"],null]],null],[30,[36,20],null,[["label","content"],[0,0]]]]],[["default"],[{"statements":[[6,[37,6],[[30,[36,21],[[32,6],"label"],null]],null,[["default","else"],[{"statements":[[2,"\\n            Rules "],[10,"a"],[15,6,[31,[[30,[36,18],["CONSUL_DOCS_URL"],null],"/guides/acl.html#rule-specification"]]],[14,"rel","help noopener noreferrer"],[14,"target","_blank"],[12],[2,"(HCL Format)"],[13],[2,"\\n          "]],"parameters":[]},{"statements":[[6,[37,6],[[30,[36,21],[[32,6],"content"],null]],null,[["default"],[{"statements":[[8,"consul/service-identity/template",[],[["@nspace","@partition","@name"],[[34,22],[34,13],[34,1,["Name"]]]],null]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[6]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,6],[[30,[36,15],[[35,1,["template"]],"node-identity"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"code-editor",[],[["@readonly","@name","@syntax","@oninput","@namedBlocksInfo"],[true,[30,[36,19],[[35,0],"[Rules]"],null],"hcl",[30,[36,2],[[32,0],"change",[30,[36,19],[[35,0],"[Rules]"],null]],null],[30,[36,20],null,[["label","content"],[0,0]]]]],[["default"],[{"statements":[[6,[37,6],[[30,[36,21],[[32,5],"label"],null]],null,[["default","else"],[{"statements":[[2,"\\n            Rules "],[10,"a"],[15,6,[31,[[30,[36,18],["CONSUL_DOCS_URL"],null],"/guides/acl.html#rule-specification"]]],[14,"rel","help noopener noreferrer"],[14,"target","_blank"],[12],[2,"(HCL Format)"],[13],[2,"\\n          "]],"parameters":[]},{"statements":[[6,[37,6],[[30,[36,21],[[32,5],"content"],null]],null,[["default"],[{"statements":[[8,"consul/node-identity/template",[],[["@name","@partition"],[[34,1,["Name"]],[34,13]]],null]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[5]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,"code-editor",[],[["@syntax","@class","@name","@value","@onkeyup","@namedBlocksInfo"],["hcl",[30,[36,6],[[35,1,["error","Rules"]],"error"],null],[30,[36,19],[[35,0],"[Rules]"],null],[34,1,["Rules"]],[30,[36,2],[[32,0],"change",[30,[36,19],[[35,0],"[Rules]"],null]],null],[30,[36,20],null,[["label"],[0]]]]],[["default"],[{"statements":[[6,[37,6],[[30,[36,21],[[32,4],"label"],null]],null,[["default"],[{"statements":[[2,"\\n            Rules "],[10,"a"],[15,6,[31,[[30,[36,18],["CONSUL_DOCS_URL"],null],"/guides/acl.html#rule-specification"]]],[14,"rel","help noopener noreferrer"],[14,"target","_blank"],[12],[2,"(HCL Format)"],[13],[2,"\\n          "]],"parameters":[]}]]]],"parameters":[4]}]]],[2,"\\n"],[6,[37,6],[[35,1,["error","Rules"]]],null,[["default"],[{"statements":[[2,"          "],[10,"strong"],[12],[1,[35,1,["error","Rules","validation"]]],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n"],[6,[37,6],[[30,[36,15],[[35,1,["template"]],"node-identity"],null]],null,[["default","else"],[{"statements":[[2,"\\n    "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,8],["/*/*/*/datacenters"],null],[30,[36,2],[[32,0],[30,[36,9],[[35,3]],null]],[["value"],["data"]]]]],null],[2,"\\n    "],[10,"label"],[14,0,"type-select"],[12],[2,"\\n      "],[10,"span"],[12],[2,"Datacenter"],[13],[2,"\\n      "],[8,"power-select",[],[["@options","@searchField","@selected","@searchPlaceholder","@onChange"],[[30,[36,16],["Name",[35,3]],null],"Name",[30,[36,14],[[35,1,["Datacenter"]],[35,17]],null],"Type a datacenter name",[30,[36,2],[[32,0],"change","Datacenter"],null]]],[["default"],[{"statements":[[2,"\\n            "],[1,[32,3]],[2,"\\n      "]],"parameters":[3]}]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,6],[[30,[36,15],[[30,[36,14],[[35,13],"default"],null],"default"],null]],null,[["default"],[{"statements":[[2,"    "],[10,"div"],[14,0,"type-toggle"],[12],[2,"\\n      "],[10,"span"],[12],[2,"Valid datacenters"],[13],[2,"\\n      "],[10,"label"],[12],[2,"\\n        "],[10,"input"],[15,3,[31,[[34,0],"[isScoped]"]]],[15,"checked",[30,[36,6],[[30,[36,5],[[35,12]],null],"checked"],null]],[15,"onchange",[30,[36,2],[[32,0],"change"],null]],[14,4,"checkbox"],[12],[13],[2,"\\n        "],[10,"span"],[12],[2,"All"],[13],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,6],[[35,12]],null,[["default"],[{"statements":[[2,"    "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,8],["/*/*/*/datacenters"],null],[30,[36,2],[[32,0],[30,[36,9],[[35,3]],null]],[["value"],["data"]]]]],null],[2,"\\n\\n    "],[10,"div"],[14,0,"checkbox-group"],[14,"role","group"],[12],[2,"\\n"],[6,[37,11],[[30,[36,10],[[30,[36,10],[[35,3]],null]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"label"],[14,0,"type-checkbox"],[12],[2,"\\n          "],[10,"input"],[15,3,[31,[[34,0],"[Datacenters]"]]],[15,2,[32,2,["Name"]]],[15,"checked",[30,[36,6],[[30,[36,7],[[32,2,["Name"]],[35,1,["Datacenters"]]],null],"checked"],null]],[15,"onchange",[30,[36,2],[[32,0],"change"],null]],[14,4,"checkbox"],[12],[13],[2,"\\n          "],[10,"span"],[12],[1,[32,2,["Name"]]],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[2]}]]],[6,[37,11],[[30,[36,10],[[30,[36,10],[[35,1,["Datacenters"]]],null]],null]],null,[["default"],[{"statements":[[6,[37,6],[[30,[36,5],[[30,[36,4],["Name",[32,1],[35,3]],null]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"label"],[14,0,"type-checkbox"],[12],[2,"\\n          "],[10,"input"],[15,3,[31,[[34,0],"[Datacenters]"]]],[15,2,[32,1]],[14,"checked","checked"],[15,"onchange",[30,[36,2],[[32,0],"change"],null]],[14,4,"checkbox"],[12],[13],[2,"\\n          "],[10,"span"],[12],[1,[32,1]],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]],[2,"    "],[13],[2,"\\n\\n\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[6,[37,6],[[30,[36,15],[[35,1,["template"]],""],null]],null,[["default"],[{"statements":[[2,"  "],[10,"label"],[14,0,"type-text"],[12],[2,"\\n    "],[10,"span"],[12],[2,"Description (Optional)"],[13],[2,"\\n    "],[10,"textarea"],[15,3,[31,[[34,0],"[Description]"]]],[15,2,[34,1,["Description"]]],[15,"oninput",[30,[36,2],[[32,0],"change"],null]],[12],[13],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]}]]],[13],[2,"\\n\\n"]],"hasEval":false,"upvars":["name","item","action","datacenters","find-by","not","if","contains","uri","mut","-track-array","each","isScoped","partition","or","eq","map-by","dc","env","concat","hash","-is-named-block-invocation","nspace","changeset-set","optional","templates","allowIdentity","can","yield-slot","and"]}',meta:{moduleName:"consul-ui/components/policy-form/index.hbs"}})
+var r=Ember._setComponentTemplate(n,t.default.extend({type:"policy",name:"policy",allowIdentity:!0,classNames:["policy-form"],isScoped:!1,init:function(){this._super(...arguments),Ember.set(this,"isScoped",Ember.get(this,"item.Datacenters.length")>0),this.templates=[{name:"Policy",template:""},{name:"Service Identity",template:"service-identity"},{name:"Node Identity",template:"node-identity"}]},actions:{change:function(e){try{this._super(...arguments)}catch(t){const e=this.isScoped
+switch(t.target.name){case"policy[isScoped]":e?(Ember.set(this,"previousDatacenters",Ember.get(this.item,"Datacenters")),Ember.set(this.item,"Datacenters",null)):(Ember.set(this.item,"Datacenters",this.previousDatacenters),Ember.set(this,"previousDatacenters",null)),Ember.set(this,"isScoped",!e)
+break
+default:this.onerror(t)}this.onchange({target:this.form})}}}}))
+e.default=r})),define("consul-ui/components/policy-selector/index",["exports","consul-ui/components/child-selector/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"CuBwNJCz",block:'{"symbols":["item","index","execute","cancel","message","confirm","__arg0","__arg0","__arg0","option","modal","close","&default","&attrs"],"statements":[[8,"child-selector",[[17,14]],[["@disabled","@repo","@dc","@partition","@nspace","@type","@placeholder","@items"],[[34,24],[34,25],[34,13],[34,8],[34,10],"policy","Search for policy",[34,0]]],[["default"],[{"statements":[[2,"\\n  "],[18,13,null],[2,"\\n  "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n    Apply an existing policy\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["create"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,26],null,[["name"],["trigger"]],[["default","else"],[{"statements":[[2,"      "],[18,13,null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[11,"label"],[24,0,"type-dialog"],[4,[38,18],["click",[30,[36,17],[[32,0,["modal","open"]]],null]],null],[12],[2,"\\n        "],[10,"span"],[12],[2,"Create new policy"],[13],[2,"\\n      "],[13],[2,"\\n"],[2,"      "],[8,"modal-dialog",[[24,1,"new-policy"]],[["@onopen","@aria"],[[30,[36,1],[[32,0],"open"],null],[30,[36,5],null,[["label"],["New Policy"]]]]],[["default"],[{"statements":[[2,"\\n        "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"modal",[32,11]]],null],[2,"\\n        "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n          "],[10,"h2"],[12],[2,"New Policy"],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n          "],[8,"policy-form",[],[["@form","@nspace","@partition","@dc","@allowServiceIdentity"],[[34,19],[34,10],[34,8],[34,13],[34,20]]],null],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n          "],[10,"button"],[15,"onclick",[30,[36,23],[[32,0,["save"]],[35,22],[35,0],[30,[36,21],[[30,[36,1],[[32,0],[32,12]],null],[30,[36,1],[[32,0],"reset"],null]],null]],null]],[15,"disabled",[30,[36,7],[[30,[36,4],[[35,22,["isSaving"]],[35,22,["isPristine"]],[35,22,["isInvalid"]]],null],"disabled"],null]],[14,4,"submit"],[12],[2,"\\n"],[6,[37,7],[[35,22,["isSaving"]]],null,[["default"],[{"statements":[[2,"              "],[10,"div"],[14,0,"progress indeterminate"],[12],[13],[2,"\\n"]],"parameters":[]}]]],[2,"            "],[10,"span"],[12],[2,"Create and apply"],[13],[2,"\\n          "],[13],[2,"\\n          "],[11,"button"],[16,"disabled",[30,[36,7],[[35,22,["isSaving"]],"disabled"],null]],[24,4,"reset"],[4,[38,1],[[32,0],[30,[36,21],[[30,[36,1],[[32,0],[32,12]],null],[30,[36,1],[[32,0],"reset"],null]],null]],null],[12],[2,"Cancel"],[13],[2,"\\n        "]],"parameters":[12]}]]],[2,"\\n      "]],"parameters":[11]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["option"]],[["default"],[{"statements":[[2,"\\n    "],[1,[32,10,["Name"]]],[2,"\\n  "]],"parameters":[10]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["set"]],[["default"],[{"statements":[[2,"\\n    "],[8,"tabular-details",[],[["@onchange","@items"],[[30,[36,1],[[32,0],"open"],null],[30,[36,27],["CreateTime:desc","Name:asc",[35,0]],null]]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"th"],[12],[2,"Name"],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["row"]],[["default"],[{"statements":[[2,"\\n        "],[10,"td"],[15,0,[30,[36,28],[[32,1]],null]],[12],[2,"\\n"],[6,[37,7],[[32,1,["ID"]]],null,[["default","else"],[{"statements":[[2,"          "],[10,"a"],[15,6,[30,[36,16],["dc.acls.policies.edit",[32,1,["ID"]]],null]],[12],[1,[32,1,["Name"]]],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          "],[10,"a"],[15,3,[32,1,["Name"]]],[12],[1,[32,1,["Name"]]],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,7],[[30,[36,9],[[32,1,["template"]],""],null]],null,[["default"],[{"statements":[[2,"        "],[8,"data-source",[],[["@src","@onchange","@loading"],[[30,[36,14],["/${partition}/${nspace}/${dc}/policy/${id}",[30,[36,5],null,[["partition","nspace","dc","id"],[[35,8],[35,10],[35,13],[32,1,["ID"]]]]]],null],[30,[36,1],[[32,0],[30,[36,15],[[35,3]],null]],[["value"],["data"]]],"lazy"]],null],[2,"\\n"]],"parameters":[]}]]],[6,[37,7],[[30,[36,9],[[32,1,["template"]],"node-identity"],null]],null,[["default","else"],[{"statements":[[2,"          "],[10,"dl"],[12],[2,"\\n            "],[10,"dt"],[12],[2,"Datacenter:"],[13],[2,"\\n            "],[10,"dd"],[12],[2,"\\n              "],[1,[32,1,["Datacenter"]]],[2,"\\n            "],[13],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          "],[10,"dl"],[12],[2,"\\n            "],[10,"dt"],[12],[2,"Datacenters:"],[13],[2,"\\n            "],[10,"dd"],[12],[2,"\\n              "],[1,[30,[36,12],[", ",[30,[36,11],[[30,[36,4],[[35,3],[32,1]],null]],null]],null]],[2,"\\n            "],[13],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[10,"label"],[14,0,"type-text"],[12],[2,"\\n"],[6,[37,7],[[30,[36,9],[[32,1,["template"]],"service-identity"],null]],null,[["default","else"],[{"statements":[[2,"            "],[8,"code-editor",[],[["@syntax","@readonly","@namedBlocksInfo"],["hcl",true,[30,[36,5],null,[["label","content"],[0,0]]]]],[["default"],[{"statements":[[6,[37,7],[[30,[36,6],[[32,9],"label"],null]],null,[["default","else"],[{"statements":[[2,"\\n                Rules "],[10,"a"],[15,6,[31,[[30,[36,2],["CONSUL_DOCS_URL"],null],"/guides/acl.html#rule-specification"]]],[14,"rel","help noopener noreferrer"],[14,"target","_blank"],[12],[2,"(HCL Format)"],[13],[2,"\\n              "]],"parameters":[]},{"statements":[[6,[37,7],[[30,[36,6],[[32,9],"content"],null]],null,[["default"],[{"statements":[[2,"\\n                "],[8,"consul/service-identity/template",[],[["@nspace","@partition","@name"],[[34,10],[34,8],[32,1,["Name"]]]],null],[2,"\\n              "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[9]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,7],[[30,[36,9],[[32,1,["template"]],"node-identity"],null]],null,[["default","else"],[{"statements":[[2,"            "],[8,"code-editor",[],[["@syntax","@readonly","@namedBlocksInfo"],["hcl",true,[30,[36,5],null,[["label","content"],[0,0]]]]],[["default"],[{"statements":[[6,[37,7],[[30,[36,6],[[32,8],"label"],null]],null,[["default","else"],[{"statements":[[2,"\\n                Rules "],[10,"a"],[15,6,[31,[[30,[36,2],["CONSUL_DOCS_URL"],null],"/guides/acl.html#rule-specification"]]],[14,"rel","help noopener noreferrer"],[14,"target","_blank"],[12],[2,"(HCL Format)"],[13],[2,"\\n              "]],"parameters":[]},{"statements":[[6,[37,7],[[30,[36,6],[[32,8],"content"],null]],null,[["default"],[{"statements":[[2,"\\n                "],[8,"consul/node-identity/template",[],[["@name","@partition"],[[32,1,["Name"]],[34,8]]],null],[2,"\\n              "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[8]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"            "],[8,"code-editor",[],[["@syntax","@readonly","@value","@namedBlocksInfo"],["hcl",true,[30,[36,4],[[35,3,["Rules"]],[32,1,["Rules"]]],null],[30,[36,5],null,[["label"],[0]]]]],[["default"],[{"statements":[[6,[37,7],[[30,[36,6],[[32,7],"label"],null]],null,[["default"],[{"statements":[[2,"\\n                Rules "],[10,"a"],[15,6,[31,[[30,[36,2],["CONSUL_DOCS_URL"],null],"/guides/acl.html#rule-specification"]]],[14,"rel","help noopener noreferrer"],[14,"target","_blank"],[12],[2,"(HCL Format)"],[13],[2,"\\n              "]],"parameters":[]}]]]],"parameters":[7]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n"],[6,[37,7],[[30,[36,29],[[35,24]],null]],null,[["default"],[{"statements":[[2,"          "],[10,"div"],[12],[2,"\\n            "],[8,"confirmation-dialog",[],[["@message"],["Are you sure you want to remove this policy from this token?"]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["action"]],[["default"],[{"statements":[[2,"\\n                "],[11,"button"],[24,0,"type-delete"],[24,4,"button"],[4,[38,1],[[32,0],[32,6],"remove",[32,1],[35,0]],null],[12],[2,"Remove"],[13],[2,"\\n              "]],"parameters":[6]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["dialog"]],[["default"],[{"statements":[[2,"\\n                "],[10,"p"],[12],[2,"\\n                  "],[1,[32,5]],[2,"\\n                "],[13],[2,"\\n\\n                "],[11,"button"],[24,0,"type-delete"],[24,4,"button"],[4,[38,1],[[32,0],[32,3]],null],[12],[2,"Confirm remove"],[13],[2,"\\n                "],[11,"button"],[24,0,"type-cancel"],[24,4,"button"],[4,[38,1],[[32,0],[32,4]],null],[12],[2,"Cancel"],[13],[2,"\\n              "]],"parameters":[3,4,5]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[1,2]}]]],[2,"\\n\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"]],"hasEval":false,"upvars":["items","action","env","loadedItem","or","hash","-is-named-block-invocation","if","partition","eq","nspace","policy/datacenters","join","dc","uri","mut","href-to","optional","on","form","allowServiceIdentity","queue","item","perform","disabled","repo","yield-slot","sort-by","policy/typeof","not"]}',meta:{moduleName:"consul-ui/components/policy-selector/index.hbs"}})
+var r=Ember._setComponentTemplate(n,t.default.extend({repo:Ember.inject.service("repository/policy"),name:"policy",type:"policy",allowIdentity:!0,classNames:["policy-selector"],init:function(){this._super(...arguments)
+const e=this.source
+e&&this._listeners.add(e,{save:e=>{this.save.perform(...e.data)}})},reset:function(e){this._super(...arguments),Ember.set(this,"isScoped",!1)},refreshCodeEditor:function(e,t){this.dom.component(".code-editor",t).didAppear()},error:function(e){const t=this.item,n=e.error
+if(void 0===n.errors)throw n
+{const e=n.errors[0]
+let r="Rules",a=e.detail
+switch(!0){case 0===a.indexOf("Failed to parse ACL rules"):case 0===a.indexOf("Invalid service policy"):r="Rules",a=e.detail
+break
+case 0===a.indexOf("Invalid Policy: A Policy with Name"):r="Name",a=a.substr("Invalid Policy: A Policy with Name".indexOf(":")+1)}r&&t.addError(r,a)}},actions:{open:function(e){this.refreshCodeEditor(e,e.target.parentElement)}}}))
+e.default=r})),define("consul-ui/components/popover-menu/index",["exports","block-slots"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"sMDVsgDS",block:'{"symbols":["change","keypress","keypressClick","aria","components","api","menu","sub","toggle","&default","&attrs"],"statements":[[18,10,null],[2,"\\n"],[11,"div"],[24,0,"popover-menu"],[17,11],[12],[2,"\\n  "],[8,"aria-menu",[],[["@keyboardAccess"],[[34,4]]],[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,16],[[30,[36,15],null,[["MenuItem","MenuSeparator"],[[30,[36,17],["popover-menu/menu-item"],[["menu"],[[30,[36,15],null,[["addSubmenu","removeSubmenu","confirm","clickTrigger","keypressClick"],[[30,[36,6],[[32,0],"addSubmenu"],null],[30,[36,6],[[32,0],"removeSubmenu"],null],[30,[36,2],["popover-menu-",[35,1],"-"],null],[32,0,["toggle","click"]],[32,3]]]]]]],[30,[36,17],["popover-menu/menu-separator"],null]]]]],null,[["default"],[{"statements":[[6,[37,16],[[30,[36,15],null,[["toggle"],[[32,0,["toggle","click"]]]]]],null,[["default"],[{"statements":[[2,"\\n    "],[8,"toggle-button",[],[["@checked","@onchange"],[[30,[36,5],[[35,4],[32,4,["expanded"]],[35,3]],null],[30,[36,7],[[32,1],[30,[36,6],[[32,0],"change"],null]],null]]],[["default"],[{"statements":[[2,"\\n      "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"toggle",[32,9]]],null],[2,"\\n      "],[10,"button"],[14,"aria-haspopup","menu"],[15,"onkeydown",[32,2]],[15,"onclick",[32,0,["toggle","click"]]],[15,1,[32,4,["labelledBy"]]],[15,"aria-controls",[32,4,["controls"]]],[14,4,"button"],[12],[2,"\\n        "],[8,"yield-slot",[],[["@name"],["trigger"]],[["default"],[{"statements":[[2,"\\n          "],[18,10,[[32,5],[32,6]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[9]}]]],[2,"\\n\\n    "],[8,"menu-panel",[[16,1,[32,4,["controls"]]],[16,"aria-labelledby",[32,4,["labelledBy"]]],[16,"aria-expanded",[32,4,["expanded"]]]],[["@position"],[[34,8]]],[["default"],[{"statements":[[2,"\\n      "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"menu",[32,7]]],null],[2,"\\n      "],[8,"block-slot",[],[["@name"],["controls"]],[["default"],[{"statements":[[2,"\\n        "],[10,"input"],[15,1,[30,[36,2],["popover-menu-",[35,1],"-"],null]],[14,4,"checkbox"],[12],[13],[2,"\\n"],[6,[37,11],[[30,[36,10],[[30,[36,10],[[35,9]],null]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"input"],[15,1,[30,[36,2],["popover-menu-",[35,1],"-",[32,8]],null]],[15,"onchange",[32,7,["change"]]],[14,4,"checkbox"],[12],[13],[2,"\\n"]],"parameters":[8]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n"],[6,[37,5],[[35,12]],null,[["default"],[{"statements":[[2,"        "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n          "],[18,10,[[32,5],[32,6]]],[2,"\\n          "],[6,[37,0],null,[["name"],["header"]],[["default","else"],[{"statements":[],"parameters":[]},{"statements":[],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[8,"block-slot",[],[["@name"],["menu"]],[["default"],[{"statements":[[2,"\\n        "],[8,"yield-slot",[],[["@name","@params"],["menu",[30,[36,14],[[30,[36,2],["popover-menu-",[35,1],"-"],null],[35,13],[32,3],[32,0,["toggle","click"]]],null]]],[["default"],[{"statements":[[2,"\\n          "],[18,10,[[32,5],[32,6]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[7]}]]],[2,"\\n\\n"]],"parameters":[6]}]]]],"parameters":[5]}]]],[2,"\\n  "]],"parameters":[1,2,3,4]}]]],[2,"\\n"],[13]],"hasEval":false,"upvars":["yield-slot","guid","concat","expanded","keyboardAccess","if","action","queue","position","submenus","-track-array","each","hasHeader","send","block-params","hash","let","component"]}',meta:{moduleName:"consul-ui/components/popover-menu/index.hbs"}})
+var r=Ember._setComponentTemplate(n,Ember.Component.extend(t.default,{tagName:"",dom:Ember.inject.service("dom"),expanded:!1,keyboardAccess:!0,onchange:function(){},position:"",init:function(){this._super(...arguments),this.guid=this.dom.guid(this),this.submenus=[]},willRender:function(){Ember.set(this,"hasHeader",this._isRegistered("header"))},actions:{addSubmenu:function(e){Ember.set(this,"submenus",this.submenus.concat(e))},removeSubmenu:function(e){const t=this.submenus.indexOf(e);-1!==t&&(this.submenus.splice(t,1),Ember.set(this,"submenus",this.submenus))},change:function(e){e.target.checked||[...this.dom.elements(`[id^=popover-menu-${this.guid}]`)].forEach((function(e){e.checked=!1})),this.onchange(e)},send:function(){this.sendAction(...arguments)}}}))
+e.default=r})),define("consul-ui/components/popover-menu/menu-item/index",["exports","block-slots"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"zKK0lEHV",block:'{"symbols":["external","&default","&attrs"],"statements":[[18,2,null],[2,"\\n"],[11,"li"],[24,"role","none"],[17,3],[12],[2,"\\n"],[6,[37,1],[[35,15]],null,[["default","else"],[{"statements":[[2,"  "],[10,"label"],[15,"for",[30,[36,11],[[35,3,["confirm"]],[35,10]],null]],[14,"role","menuitem"],[14,"tabindex","-1"],[15,"onkeypress",[34,3,["keypressClick"]]],[12],[2,"\\n    "],[8,"yield-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[18,2,null]],"parameters":[]}]]],[2,"\\n  "],[13],[2,"\\n  "],[10,"div"],[14,"role","menu"],[12],[2,"\\n    "],[8,"yield-slot",[],[["@name","@params"],["confirmation",[30,[36,14],[[30,[36,13],["confirmation-alert"],[["onclick","name"],[[30,[36,6],[[30,[36,4],[[32,0],[35,3,["clickTrigger"]]],null],[30,[36,4],[[32,0],[35,12]],null]],null],[30,[36,11],[[35,3,["confirm"]],[35,10]],null]]]]],null]]],[["default"],[{"statements":[[18,2,null]],"parameters":[]}]]],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[35,7]],null,[["default","else"],[{"statements":[[6,[37,9],[[30,[36,8],[[35,7],"://"],null]],null,[["default"],[{"statements":[[2,"  "],[10,"a"],[14,"role","menuitem"],[14,"tabindex","-1"],[15,"onclick",[30,[36,4],[[32,0],[35,3,["clickTrigger"]]],null]],[15,6,[34,7]],[15,"target",[30,[36,1],[[32,1],"_blank"],null]],[15,"rel",[30,[36,1],[[32,1],"noopener noreferrer"],null]],[12],[2,"\\n    "],[8,"yield-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n    "],[18,2,null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[1]}]]]],"parameters":[]},{"statements":[[10,"button"],[14,"role","menuitem"],[15,"aria-selected",[30,[36,1],[[35,0],"true"],null]],[14,"tabindex","-1"],[15,"onclick",[30,[36,6],[[30,[36,4],[[32,0],[30,[36,5],[[32,0,["onclick"]],[30,[36,2],null,null]],null]],null],[30,[36,4],[[32,0],[30,[36,1],[[32,0,["close"]],[35,3,["clickTrigger"]],[30,[36,2],null,null]],null]],null]],null]],[14,4,"button"],[12],[2,"\\n    "],[8,"yield-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n      "],[18,2,null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[13],[2,"\\n\\n"]],"hasEval":false,"upvars":["selected","if","noop","menu","action","or","queue","href","string-includes","let","guid","concat","onclick","component","block-params","hasConfirmation"]}',meta:{moduleName:"consul-ui/components/popover-menu/menu-item/index.hbs"}})
+var r=Ember._setComponentTemplate(n,Ember.Component.extend(t.default,{tagName:"",dom:Ember.inject.service("dom"),init:function(){this._super(...arguments),this.guid=this.dom.guid(this)},didInsertElement:function(){this._super(...arguments),this.menu.addSubmenu(this.guid)},didDestroyElement:function(){this._super(...arguments),this.menu.removeSubmenu(this.guid)},willRender:function(){this._super(...arguments),Ember.set(this,"hasConfirmation",this._isRegistered("confirmation"))}}))
+e.default=r})),define("consul-ui/components/popover-menu/menu-separator/index",["exports","block-slots"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"RS9Jf7fe",block:'{"symbols":["&default"],"statements":[[18,1,null],[2,"\\n"],[10,"li"],[14,"role","separator"],[12],[2,"\\n  "],[8,"yield-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[18,1,null]],"parameters":[]}]]],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/popover-menu/menu-separator/index.hbs"}})
+var r=Ember._setComponentTemplate(n,Ember.Component.extend(t.default,{tagName:""}))
+e.default=r})),define("consul-ui/components/popover-select/index",["exports","block-slots"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"nf0dRHsn",block:'{"symbols":["components","menu","Optgroup","Option","&default","&attrs"],"statements":[[8,"popover-menu",[[24,0,"popover-select"],[17,6]],[["@position"],[[30,[36,2],[[35,1],"left"],null]]],[["default"],[{"statements":[[2,"\\n  "],[18,5,null],[2,"\\n"],[6,[37,9],[[30,[36,8],["popover-select/optgroup"],[["components"],[[32,1]]]],[30,[36,8],["popover-select/option"],[["select","components","onclick"],[[32,0],[32,1],[30,[36,7],[[30,[36,6],[[32,0],"click"],null],[30,[36,5],[[35,4],[30,[36,3],null,null],[32,2,["toggle"]]],null]],null]]]]],null,[["default"],[{"statements":[[2,"    "],[8,"block-slot",[],[["@name"],["trigger"]],[["default"],[{"statements":[[2,"\\n      "],[8,"yield-slot",[],[["@name"],["selected"]],[["default"],[{"statements":[[2,"\\n        "],[18,5,[[30,[36,0],null,[["Optgroup","Option"],[[32,3],[32,4]]]]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["menu"]],[["default"],[{"statements":[[2,"\\n      "],[8,"yield-slot",[],[["@name"],["options"]],[["default"],[{"statements":[[2,"\\n        "],[18,5,[[30,[36,0],null,[["Optgroup","Option"],[[32,3],[32,4]]]]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3,4]}]]]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["hash","position","or","noop","multiple","if","action","pipe","component","let"]}',meta:{moduleName:"consul-ui/components/popover-select/index.hbs"}})
+var r=Ember._setComponentTemplate(n,Ember.Component.extend(t.default,{tagName:"",dom:Ember.inject.service("dom"),multiple:!1,required:!1,onchange:function(){},addOption:function(e){void 0===this._options&&(this._options=new Set),this._options.add(e)},removeOption:function(e){this._options.delete(e)},actions:{click:function(e,t){if(this.multiple){if(e.selected&&this.required){if(![...this._options].find(t=>t!==e&&t.selected))return t}}else{if(e.selected&&this.required)return t;[...this._options].filter(t=>t!==e).forEach(e=>{e.selected=!1})}return e.selected=!e.selected,this.onchange(this.dom.setEventTargetProperties(t,{selected:()=>e.args.value,selectedItems:()=>[...this._options].filter(e=>e.selected).map(e=>e.args.value).join(",")})),t}}}))
+e.default=r})),define("consul-ui/components/popover-select/optgroup/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"tEmaYnIW",block:'{"symbols":["MenuSeparator","@label","&default","@components"],"statements":[[6,[37,0],[[32,4,["MenuSeparator"]]],null,[["default"],[{"statements":[[8,[32,1],[],[[],[]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n    "],[1,[32,2]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[18,3,null],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["let"]}',meta:{moduleName:"consul-ui/components/popover-select/optgroup/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/popover-select/option/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s
+function i(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const o=Ember.HTMLBars.template({id:"n6EznTlk",block:'{"symbols":["MenuItem","&attrs","@onclick","@selected","&default","@components"],"statements":[[6,[37,6],[[32,6,["MenuItem"]]],null,[["default"],[{"statements":[[2,"  "],[8,[32,1],[[16,0,[30,[36,0],[[32,0,["selected"]],"is-active"],null]],[17,2],[4,[38,2],[[32,0,["connect"]]],null],[4,[38,2],[[30,[36,3],[[32,0],"selected",[32,4]],null]],null],[4,[38,4],[[30,[36,3],[[32,0],"selected",[32,4]],null]],null],[4,[38,5],[[32,0,["disconnect"]]],null]],[["@onclick","@selected"],[[30,[36,1],[[32,0],[32,3],[32,0]],null],[32,0,["selected"]]]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n      "],[18,5,null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["if","action","did-insert","set","did-update","will-destroy","let"]}',meta:{moduleName:"consul-ui/components/popover-select/option/index.hbs"}})
+let u=(n=Ember._tracked,r=Ember._action,a=Ember._action,l=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="selected",a=this,(r=s)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}connect(){this.args.select.addOption(this)}disconnect(){this.args.select.removeOption(this)}},s=i(l.prototype,"selected",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i(l.prototype,"connect",[r],Object.getOwnPropertyDescriptor(l.prototype,"connect"),l.prototype),i(l.prototype,"disconnect",[a],Object.getOwnPropertyDescriptor(l.prototype,"disconnect"),l.prototype),l)
+e.default=u,Ember._setComponentTemplate(o,u)})),define("consul-ui/components/portal-target",["exports","ember-stargate/components/portal-target"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/portal",["exports","ember-stargate/components/portal"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select-multiple-with-create",["exports","ember-power-select-with-create/components/power-select-multiple-with-create"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select-multiple",["exports","ember-power-select/components/power-select-multiple"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select-multiple/trigger",["exports","ember-power-select/components/power-select-multiple/trigger"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select-with-create",["exports","ember-power-select-with-create/components/power-select-with-create"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select-with-create/suggested-option",["exports","ember-power-select-with-create/components/power-select-with-create/suggested-option"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select",["exports","ember-power-select/components/power-select"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select/before-options",["exports","ember-power-select/components/power-select/before-options"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select/no-matches-message",["exports","ember-power-select/components/power-select/no-matches-message"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select/options",["exports","ember-power-select/components/power-select/options"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select/placeholder",["exports","ember-power-select/components/power-select/placeholder"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select/power-select-group",["exports","ember-power-select/components/power-select/power-select-group"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select/search-message",["exports","ember-power-select/components/power-select/search-message"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/power-select/trigger",["exports","ember-power-select/components/power-select/trigger"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/progress/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"i9InYRlc",block:'{"symbols":["&attrs"],"statements":[[11,"div"],[24,0,"progress indeterminate"],[24,"role","progressbar"],[17,1],[12],[13],[2,"\\n"]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/progress/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/radio-card/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"Z32bK3Za",block:'{"symbols":["&attrs","&default"],"statements":[[11,"label"],[17,1],[16,0,[31,["radio-card",[30,[36,5],[[35,1]," checked"],null]]]],[12],[2,"\\n  "],[10,"div"],[12],[2,"\\n"],[6,[37,5],[[30,[36,6],[[35,4,["length"]],0],null]],null,[["default","else"],[{"statements":[[2,"      "],[10,"input"],[15,3,[34,0]],[15,2,[34,4]],[15,"checked",[34,1]],[15,"onchange",[30,[36,3],[[32,0],[35,2]],null]],[14,4,"radio"],[12],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[10,"input"],[15,3,[34,0]],[14,2,""],[15,"checked",[34,1]],[15,"onchange",[30,[36,3],[[32,0],[35,2]],null]],[14,4,"radio"],[12],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n  "],[10,"div"],[12],[2,"\\n    "],[18,2,null],[2,"\\n  "],[13],[2,"\\n"],[13]],"hasEval":false,"upvars":["name","checked","onchange","action","value","if","gt"]}',meta:{moduleName:"consul-ui/components/radio-card/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:""}))
+e.default=n}))
+define("consul-ui/components/radio-group/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"VMO7TmR4",block:'{"symbols":["item","_key","_value"],"statements":[[10,"fieldset"],[12],[2,"\\n  "],[10,"div"],[14,"role","radiogroup"],[15,1,[31,["radiogroup_",[34,3]]]],[12],[2,"\\n"],[6,[37,12],[[30,[36,11],[[30,[36,11],[[35,10]],null]],null]],null,[["default"],[{"statements":[[6,[37,9],[[30,[36,1],[[30,[36,8],[[32,1,["key"]],[29]],null],[32,1,["key"]],[32,1,["value"]]],null],[30,[36,7],[[32,1,["label"]],[32,1,["value"]]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"label"],[15,"tabindex",[30,[36,1],[[35,0],"0"],null]],[15,"onkeydown",[30,[36,1],[[35,0],[30,[36,2],[[32,0],"keydown"],null]],null]],[15,0,[31,["type-radio value-",[32,2]]]],[12],[2," "],[2,"\\n      "],[10,"input"],[15,3,[34,3]],[15,2,[32,2]],[15,"checked",[30,[36,1],[[30,[36,6],[[30,[36,5],[[35,4]],null],[32,2]],null],"checked"],null]],[15,"onchange",[30,[36,2],[[32,0],"change"],null]],[14,4,"radio"],[12],[13],[2,"\\n      "],[10,"span"],[12],[1,[32,3]],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[2,3]}]]]],"parameters":[1]}]]],[2,"  "],[13],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["keyboardAccess","if","action","name","value","concat","eq","or","not-eq","let","items","-track-array","each"]}',meta:{moduleName:"consul-ui/components/radio-group/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:"",keyboardAccess:!1,dom:Ember.inject.service("dom"),init:function(){this._super(...arguments),this.name=this.dom.guid(this)},actions:{keydown:function(e){13===e.keyCode&&e.target.dispatchEvent(new MouseEvent("click"))},change:function(e){this.onchange(this.dom.setEventTargetProperty(e,"value",e=>""===e?void 0:e))}}}))
+e.default=n})),define("consul-ui/components/ref/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Component.extend({tagName:"",didReceiveAttrs:function(){Ember.set(this.target,this.name,this.value)}})
+e.default=t})),define("consul-ui/components/role-form/index",["exports","consul-ui/components/form-component/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"YrahCt0J",block:'{"symbols":["&default","&attrs"],"statements":[[18,1,null],[2,"\\n"],[11,"fieldset"],[24,0,"role-form"],[16,"disabled",[30,[36,6],[[30,[36,2],[[30,[36,1],["write role"],[["item"],[[35,0]]]]],null],"disabled"],null]],[17,2],[12],[2,"\\n    "],[10,"label"],[15,0,[31,["type-text",[30,[36,6],[[35,0,["error","Name"]]," has-error"],null]]]],[12],[2,"\\n        "],[10,"span"],[12],[2,"Name"],[13],[2,"\\n        "],[10,"input"],[15,2,[34,0,["Name"]]],[14,3,"role[Name]"],[14,"autofocus","autofocus"],[15,"oninput",[30,[36,7],[[32,0],"change"],null]],[14,4,"text"],[12],[13],[2,"\\n        "],[10,"em"],[12],[2,"\\n          Maximum 256 characters. May only include letters (uppercase and/or lowercase) and/or numbers. Must be unique.\\n        "],[13],[2,"\\n"],[6,[37,6],[[35,0,["error","Name"]]],null,[["default"],[{"statements":[[2,"          "],[10,"strong"],[12],[1,[35,0,["error","Name","validation"]]],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n  "],[10,"label"],[14,0,"type-text"],[12],[2,"\\n    "],[10,"span"],[12],[2,"Description (Optional)"],[13],[2,"\\n    "],[10,"textarea"],[14,3,"role[Description]"],[15,2,[34,0,["Description"]]],[15,"oninput",[30,[36,7],[[32,0],"change"],null]],[12],[13],[2,"\\n  "],[13],[2,"\\n"],[13],[2,"\\n"],[10,"fieldset"],[14,1,"policies"],[14,0,"policies"],[12],[2,"\\n  "],[10,"h2"],[12],[2,"Policies"],[13],[2,"\\n"],[6,[37,9],null,[["name","params"],["policy",[30,[36,8],[[35,0]],null]]],[["default","else"],[{"statements":[[2,"    "],[18,1,null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[8,"policy-selector",[],[["@disabled","@dc","@partition","@nspace","@items"],[[30,[36,2],[[30,[36,1],["write role"],[["item"],[[35,0]]]]],null],[34,3],[34,4],[34,5],[34,0,["Policies"]]]],null],[2,"\\n"]],"parameters":[]}]]],[13],[2,"\\n"]],"hasEval":false,"upvars":["item","can","not","dc","partition","nspace","if","action","block-params","yield-slot"]}',meta:{moduleName:"consul-ui/components/role-form/index.hbs"}})
+var r=Ember._setComponentTemplate(n,t.default.extend({type:"role",name:"role",classNames:["role-form"]}))
+e.default=r})),define("consul-ui/components/role-selector/index",["exports","consul-ui/components/child-selector/index","consul-ui/utils/dom/event-source"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r=Ember.HTMLBars.template({id:"shRBjLTM",block:'{"symbols":["item","index","index","change","checked","confirm","send","keypressClick","__arg0","__arg1","Actions","option","modal","close"],"statements":[[8,"modal-dialog",[[24,0,"role-selector"],[24,1,"new-role"]],[["@onclose","@aria"],[[30,[36,1],[[32,0],[30,[36,10],[[35,9]],null],"role"],null],[30,[36,6],null,[["label"],[[30,[36,5],[[30,[36,15],[[35,9],"role"],null],"New Role","New Policy"],null]]]]]],[["default"],[{"statements":[[2,"\\n  "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"modal",[32,13]]],null],[2,"\\n  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,15],[[35,9],"role"],null]],null,[["default","else"],[{"statements":[[2,"    "],[10,"h2"],[12],[2,"New Role"],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[10,"h2"],[12],[2,"New Policy"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n\\n  "],[10,"input"],[15,1,[31,[[34,16],"_state_role"]]],[15,3,[31,[[34,16],"[state]"]]],[14,2,"role"],[15,"checked",[30,[36,5],[[30,[36,15],[[35,9],"role"],null],"checked"],null]],[15,"onchange",[30,[36,1],[[32,0],"change"],null]],[14,4,"radio"],[12],[13],[2,"\\n    "],[8,"role-form",[],[["@form","@dc","@nspace","@partition"],[[34,17],[34,18],[34,19],[34,20]]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["policy"]],[["default"],[{"statements":[[2,"\\n\\n        "],[8,"policy-selector",[],[["@source","@dc","@partition","@nspace","@items"],[[34,21],[34,18],[34,20],[34,19],[34,11,["Policies"]]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["trigger"]],[["default"],[{"statements":[[2,"\\n            "],[10,"label"],[15,"for",[31,[[34,16],"_state_policy"]]],[14,0,"type-dialog"],[12],[2,"\\n              "],[10,"span"],[12],[2,"Create new policy"],[13],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[10,"input"],[15,1,[31,[[34,16],"_state_policy"]]],[15,3,[31,[[34,16],"[state]"]]],[14,2,"policy"],[15,"checked",[30,[36,5],[[30,[36,15],[[35,9],"policy"],null],"checked"],null]],[15,"onchange",[30,[36,1],[[32,0],"change"],null]],[14,4,"radio"],[12],[13],[2,"\\n    "],[8,"policy-form",[],[["@name","@form","@dc","@nspace","@partition"],["role[policy]",[34,22],[34,18],[34,19],[34,20]]],null],[2,"\\n\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,5],[[30,[36,15],[[35,9],"role"],null]],null,[["default","else"],[{"statements":[[2,"    "],[10,"button"],[15,"onclick",[30,[36,14],[[32,0,["save"]],[35,11],[35,0],[30,[36,13],[[30,[36,1],[[32,0],[32,14]],null],[30,[36,1],[[32,0],"reset"],null]],null]],null]],[15,"disabled",[30,[36,5],[[30,[36,8],[[35,11,["isSaving"]],[35,11,["isPristine"]],[35,11,["isInvalid"]]],null],"disabled"],null]],[14,4,"submit"],[12],[2,"\\n"],[6,[37,5],[[35,11,["isSaving"]]],null,[["default"],[{"statements":[[2,"        "],[10,"div"],[14,0,"progress indeterminate"],[12],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[10,"span"],[12],[2,"Create and apply"],[13],[2,"\\n    "],[13],[2,"\\n    "],[11,"button"],[16,"disabled",[30,[36,5],[[35,11,["isSaving"]],"disabled"],null]],[24,4,"reset"],[4,[38,1],[[32,0],[30,[36,13],[[30,[36,1],[[32,0],[32,14]],null],[30,[36,1],[[32,0],"reset"],null]],null]],null],[12],[2,"Cancel"],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[11,"button"],[16,"disabled",[30,[36,5],[[30,[36,8],[[35,7,["isSaving"]],[35,7,["isPristine"]],[35,7,["isInvalid"]]],null],"disabled"],null]],[24,4,"submit"],[4,[38,1],[[32,0],"dispatch","save",[30,[36,12],[[35,7],[35,11,["Policies"]],[30,[36,1],[[32,0],[30,[36,10],[[35,9]],null],"role"],null]],null]],null],[12],[2,"\\n"],[6,[37,5],[[35,7,["isSaving"]]],null,[["default"],[{"statements":[[2,"        "],[10,"div"],[14,0,"progress indeterminate"],[12],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[10,"span"],[12],[2,"Create and apply"],[13],[2,"\\n    "],[13],[2,"\\n    "],[11,"button"],[16,"disabled",[30,[36,5],[[35,7,["isSaving"]],"disabled"],null]],[24,4,"reset"],[4,[38,1],[[32,0],[30,[36,10],[[35,9]],null],"role"],null],[12],[2,"Cancel"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[14]}]]],[2,"\\n"]],"parameters":[13]}]]],[2,"\\n\\n"],[8,"child-selector",[],[["@disabled","@repo","@dc","@partition","@nspace","@type","@placeholder","@items"],[[34,23],[34,24],[34,18],[34,20],[34,19],"role","Search for role",[34,0]]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["label"]],[["default"],[{"statements":[[2,"\\n    Apply an existing role\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["create"]],[["default"],[{"statements":[[2,"\\n    "],[11,"label"],[24,0,"type-dialog"],[4,[38,2],["click",[30,[36,25],[[32,0,["modal","open"]]],null]],null],[12],[2,"\\n      "],[10,"span"],[12],[2,"Create new role"],[13],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["option"]],[["default"],[{"statements":[[2,"\\n    "],[1,[32,12,["Name"]]],[2,"\\n  "]],"parameters":[12]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["set"]],[["default"],[{"statements":[[2,"\\n    "],[8,"tabular-collection",[],[["@rows","@items"],[5,[30,[36,26],["CreateTime:desc","Name:asc",[35,0]],null]]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"th"],[12],[2,"Name"],[13],[2,"\\n        "],[10,"th"],[12],[2,"Description"],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["row"]],[["default"],[{"statements":[[2,"\\n        "],[10,"td"],[12],[2,"\\n          "],[10,"a"],[15,6,[30,[36,27],["dc.acls.roles.edit",[32,1,["ID"]]],null]],[12],[1,[32,1,["Name"]]],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"td"],[12],[2,"\\n          "],[1,[32,1,["Description"]]],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n        "],[8,"popover-menu",[],[["@expanded","@onchange","@keyboardAccess"],[[30,[36,5],[[30,[36,15],[[32,5],[32,3]],null],true,false],null],[30,[36,1],[[32,0],[32,4],[32,3]],null],false]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["trigger"]],[["default"],[{"statements":[[2,"\\n            More\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["menu"]],[["default"],[{"statements":[[2,"\\n              "],[10,"li"],[14,"role","none"],[12],[2,"\\n                "],[10,"a"],[14,"role","menuitem"],[14,"tabindex","-1"],[15,6,[30,[36,27],["dc.acls.roles.edit",[32,1,["ID"]]],null]],[12],[2,"\\n"],[6,[37,5],[[30,[36,28],["edit role"],[["item"],[[32,1]]]]],null,[["default","else"],[{"statements":[[2,"                  Edit\\n"]],"parameters":[]},{"statements":[[2,"                  View\\n"]],"parameters":[]}]]],[2,"                "],[13],[2,"\\n              "],[13],[2,"\\n"],[6,[37,5],[[30,[36,29],[[35,23]],null]],null,[["default"],[{"statements":[[2,"              "],[10,"li"],[14,"role","none"],[14,0,"dangerous"],[12],[2,"\\n                "],[10,"label"],[15,"for",[32,6]],[14,"role","menuitem"],[14,"tabindex","-1"],[15,"onkeypress",[32,8]],[12],[2,"Remove"],[13],[2,"\\n                "],[10,"div"],[14,"role","menu"],[12],[2,"\\n                  "],[8,"informed-action",[[24,0,"warning"]],[["@namedBlocksInfo"],[[30,[36,6],null,[["header","body","actions"],[0,0,1]]]]],[["default"],[{"statements":[[6,[37,5],[[30,[36,4],[[32,9],"header"],null]],null,[["default","else"],[{"statements":[[2,"\\n                      Confirm Remove\\n                    "]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,4],[[32,9],"body"],null]],null,[["default","else"],[{"statements":[[2,"\\n                      "],[10,"p"],[12],[2,"\\n                        Are you sure you want to remove this role?\\n                      "],[13],[2,"\\n                    "]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,4],[[32,9],"actions"],null]],null,[["default"],[{"statements":[[6,[37,3],[[32,10]],null,[["default"],[{"statements":[[2,"\\n                      "],[8,[32,11,["Action"]],[[24,0,"dangerous"]],[[],[]],[["default"],[{"statements":[[2,"\\n                        "],[8,"action",[[24,"tabindex","-1"],[4,[38,2],["click",[30,[36,1],[[32,0],[32,7],"remove",[32,1],[35,0]],null]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n                          Remove\\n                        "]],"parameters":[]}]]],[2,"\\n                      "]],"parameters":[]}]]],[2,"\\n                      "],[8,[32,11,["Action"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                        "],[8,"action",[],[["@for"],[[32,6]]],[["default"],[{"statements":[[2,"\\n                          Cancel\\n                        "]],"parameters":[]}]]],[2,"\\n                      "]],"parameters":[]}]]],[2,"\\n                    "]],"parameters":[11]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[9,10]}]]],[2,"\\n                "],[13],[2,"\\n              "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"          "]],"parameters":[6,7,8]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[3,4,5]}]]],[2,"\\n    "]],"parameters":[1,2]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"]],"hasEval":false,"upvars":["items","action","on","let","-is-named-block-invocation","if","hash","policy","or","state","mut","item","array","queue","perform","eq","name","form","dc","nspace","partition","source","policyForm","disabled","repo","optional","sort-by","href-to","can","not"]}',meta:{moduleName:"consul-ui/components/role-selector/index.hbs"}})
+var a=Ember._setComponentTemplate(r,t.default.extend({repo:Ember.inject.service("repository/role"),dom:Ember.inject.service("dom"),name:"role",type:"role",classNames:["role-selector"],state:"role",policy:Ember.computed.alias("policyForm.data"),init:function(){this._super(...arguments),this.policyForm=this.formContainer.form("policy"),this.source=new n.CallableEventSource},actions:{reset:function(e){this._super(...arguments),this.policyForm.clear({Datacenter:this.dc})},dispatch:function(e,t){this.source.dispatchEvent({type:e,data:t})},change:function(){const e=this.dom.normalizeEvent(...arguments),t=e.target
+switch(t.name){case"role[state]":Ember.set(this,"state",t.value),"policy"===t.value&&this.dom.component(".code-editor",t.nextElementSibling).didAppear()
+break
+default:this._super(...arguments)}}}}))
+e.default=a})),define("consul-ui/components/route/announcer/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"TLOSA7kE",block:'{"symbols":["@separator","@title"],"statements":[[1,[30,[36,1],[[32,2]],[["separator"],[[30,[36,0],[[32,1]," - "],null]]]]],[2,"\\n"],[8,"portal-target",[],[["@name"],["route-announcer"]],null],[2,"\\n\\n"]],"hasEval":false,"upvars":["or","page-title"]}',meta:{moduleName:"consul-ui/components/route/announcer/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/route/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b
+function h(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function v(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const y=Ember.HTMLBars.template({id:"uH9p2fDA",block:'{"symbols":["&default"],"statements":[[1,[30,[36,0],[[32,0,["connect"]]],null]],[2,"\\n"],[1,[30,[36,1],[[32,0,["disconnect"]]],null]],[2,"\\n"],[18,1,[[30,[36,3],null,[["model","params","currentName","refresh","t","Title","Announcer"],[[32,0,["model"]],[32,0,["params"]],[32,0,["router","currentRoute","name"]],[32,0,["refresh"]],[32,0,["t"]],[30,[36,2],["route/title"],null],[30,[36,2],["route/announcer"],null]]]]]]],"hasEval":false,"upvars":["did-insert","will-destroy","component","hash"]}',meta:{moduleName:"consul-ui/components/route/index.hbs"}}),g=/\${([A-Za-z.0-9_-]+)}/g
+let O=(n=Ember.inject.service("routlet"),r=Ember.inject.service("router"),a=Ember.inject.service("intl"),l=Ember.inject.service("encoder"),s=Ember._tracked,i=Ember._action,o=Ember._action,u=Ember._action,c=class extends t.default{constructor(){super(...arguments),h(this,"routlet",d,this),h(this,"router",m,this),h(this,"intl",p,this),h(this,"encoder",f,this),h(this,"_model",b,this),this.intlKey=this.encoder.createRegExpEncoder(g,e=>e)}get params(){return this.routlet.paramsFor(this.args.name)}get model(){if(this._model)return this._model
+if(this.args.name){const e=this.routlet.outletFor(this.args.name)
+return this.routlet.modelFor(e.name)}}t(e,t){return e.includes("${")&&(e=this.intlKey(e,t)),this.intl.t(`routes.${this.args.name}.${e}`,t)}connect(){this.routlet.addRoute(this.args.name,this)}disconnect(){this.routlet.removeRoute(this.args.name,this)}},d=v(c.prototype,"routlet",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=v(c.prototype,"router",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=v(c.prototype,"intl",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=v(c.prototype,"encoder",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=v(c.prototype,"_model",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v(c.prototype,"t",[i],Object.getOwnPropertyDescriptor(c.prototype,"t"),c.prototype),v(c.prototype,"connect",[o],Object.getOwnPropertyDescriptor(c.prototype,"connect"),c.prototype),v(c.prototype,"disconnect",[u],Object.getOwnPropertyDescriptor(c.prototype,"disconnect"),c.prototype),c)
+e.default=O,Ember._setComponentTemplate(y,O)})),define("consul-ui/components/route/title/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"W83dDaVI",block:'{"symbols":["@title","@separator","@render","&attrs"],"statements":[[1,[30,[36,0],[[32,1]],[["separator"],[[32,2]]]]],[2,"\\n"],[6,[37,2],[[30,[36,1],[[32,3],false],null]],null,[["default"],[{"statements":[[1,[32,1]],[2,"\\n"]],"parameters":[]}]]],[8,"portal",[],[["@target"],["route-announcer"]],[["default"],[{"statements":[[2,"\\n"],[11,"div"],[24,0,"route-title"],[17,4],[24,"aria-live","assertive"],[24,"aria-atomic","true"],[12],[2,"\\n"],[2,"  "],[1,[30,[36,3],["Navigated to ",[32,1]],null]],[2,"\\n"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"]],"hasEval":false,"upvars":["page-title","not-eq","if","concat"]}',meta:{moduleName:"consul-ui/components/route/title/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/search-bar/index",["exports","@glimmer/component","consul-ui/components/search-bar/utils"],(function(e,t,n){var r,a
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const l=Ember.HTMLBars.template({id:"zyw10T4p",block:'{"symbols":["filter","@filter","&default","&attrs"],"statements":[[11,"div"],[24,0,"search-bar"],[17,4],[12],[2,"\\n  "],[10,"form"],[14,0,"filter-bar"],[12],[2,"\\n    "],[10,"div"],[14,0,"search"],[12],[2,"\\n      "],[18,3,[[30,[36,6],["search"],null],[30,[36,1],null,[["Search","Select"],[[30,[36,5],["freetext-filter"],null],[30,[36,5],["popover-select"],null]]]]]],[2,"\\n    "],[13],[2,"\\n    "],[10,"div"],[14,0,"filters"],[12],[2,"\\n      "],[18,3,[[30,[36,6],["filter"],null],[30,[36,1],null,[["Search","Select"],[[30,[36,5],["freetext-filter"],null],[30,[36,5],["popover-select"],null]]]]]],[2,"\\n    "],[13],[2,"\\n    "],[10,"div"],[14,0,"sort"],[12],[2,"\\n      "],[18,3,[[30,[36,6],["sort"],null],[30,[36,1],null,[["Search","Select"],[[30,[36,5],["freetext-filter"],null],[30,[36,5],["popover-select"],null]]]]]],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n"],[6,[37,12],[[32,0,["isFiltered"]]],null,[["default"],[{"statements":[[2,"  "],[10,"div"],[14,0,"search-bar-status"],[12],[2,"\\n    "],[10,"dl"],[12],[2,"\\n      "],[10,"dt"],[12],[1,[30,[36,8],[[30,[36,7],["component.search-bar.header"],[["default","item"],["common.ui.filtered-by",""]]]],null]],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[10,"ul"],[12],[2,"\\n"],[6,[37,10],[[30,[36,9],[[30,[36,9],[[32,0,["filters"]]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[18,3,[[30,[36,6],["status"],null],[30,[36,1],null,[["RemoveFilter","status"],[[30,[36,5],["search-bar/remove-filter"],[["onclick"],[[30,[36,4],[[32,0],[30,[36,3],[[30,[36,3],[[32,2],[32,1,["key"]]],null],"change"],null],[30,[36,1],null,[["target"],[[30,[36,1],null,[["selectedItems"],[[30,[36,2],[[32,1,["selected"]],","],null]]]]]]]],null]]]],[30,[36,1],null,[["key","value"],[[32,1,["key"]],[30,[36,0],[[32,1,["value"]]],null]]]]]]]]],[2,"\\n"]],"parameters":[1]}]]],[2,"          "],[10,"li"],[14,0,"remove-all"],[12],[2,"\\n            "],[8,"action",[[4,[38,11],["click",[32,0,["removeAllFilters"]]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n              Remove filters\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]}]]],[13],[2,"\\n"]],"hasEval":false,"upvars":["lowercase","hash","join","get","action","component","-named-block-invocation","t","string-trim","-track-array","each","on","if"]}',meta:{moduleName:"consul-ui/components/search-bar/index.hbs"}})
+let s=(r=Ember._action,a=class extends t.default{get isFiltered(){const e=this.args.filter.searchproperty||{default:[],value:[]}
+return(0,n.diff)(e.default,e.value).length>0||Object.entries(this.args.filter).some(([e,t])=>"searchproperty"!==e&&void 0!==t.value)}get filters(){return(0,n.filters)(this.args.filter)}removeAllFilters(){Object.values(this.args.filter).forEach((e,t)=>{setTimeout(()=>e.change(e.default||[]),1*t)})}},i=a.prototype,o="removeAllFilters",u=[r],c=Object.getOwnPropertyDescriptor(a.prototype,"removeAllFilters"),d=a.prototype,m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),a)
+var i,o,u,c,d,m
+e.default=s,Ember._setComponentTemplate(l,s)})),define("consul-ui/components/search-bar/remove-filter/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"qI+OTqbX",block:'{"symbols":["&attrs","@onclick","&default"],"statements":[[10,"li"],[12],[2,"\\n  "],[8,"action",[[17,1],[4,[38,0],["click",[32,2]],null]],[[],[]],null],[2,"\\n  "],[18,3,null],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["on"]}',meta:{moduleName:"consul-ui/components/search-bar/remove-filter/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/search-bar/utils",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.filters=e.diff=void 0
+const t=(e,t)=>e.filter(e=>!t.includes(e))
+e.diff=t
+e.filters=e=>Object.entries(e).filter(([e,n])=>"searchproperty"===e?t(n.default,n.value).length>0:(n.value||[]).length>0).reduce((e,[n,r])=>e.concat(r.value.map(e=>{const a={key:n,value:e}
+return a.selected="searchproperty"!==n?t(r.value,[e]):1===r.value.length?r.default:t(r.value,[e]),a})),[])})),define("consul-ui/components/secret-button/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"XcT8OSA5",block:'{"symbols":["&default"],"statements":[[10,"label"],[14,0,"type-reveal"],[12],[2,"\\n  "],[10,"input"],[14,4,"checkbox"],[12],[13],[2,"\\n  "],[10,"span"],[12],[2,"Reveal"],[13],[2,"\\n  "],[10,"em"],[12],[18,1,null],[13],[2,"\\n"],[13]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/secret-button/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({}))
+e.default=n})),define("consul-ui/components/shadow-host/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l
+function s(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const i=Ember.HTMLBars.template({id:"U0GA4gT4",block:'{"symbols":["&default"],"statements":[[18,1,[[30,[36,2],null,[["host","root","Template"],[[30,[36,1],[[32,0,["attachShadow"]]],null],[32,0,["shadowRoot"]],[30,[36,0],["shadow-template"],[["shadowRoot"],[[32,0,["shadowRoot"]]]]]]]]]],[2,"\\n"]],"hasEval":false,"upvars":["component","fn","hash"]}',meta:{moduleName:"consul-ui/components/shadow-host/index.hbs"}})
+let o=(n=Ember._tracked,r=Ember._action,a=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="shadowRoot",a=this,(r=l)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}attachShadow(e){this.shadowRoot=e.attachShadow({mode:"open"})}},l=s(a.prototype,"shadowRoot",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s(a.prototype,"attachShadow",[r],Object.getOwnPropertyDescriptor(a.prototype,"attachShadow"),a.prototype),a)
+e.default=o,Ember._setComponentTemplate(i,o)})),define("consul-ui/components/shadow-template/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"SySVt5/r",block:'{"symbols":["@styles","@shadowRoot","&default"],"statements":[[6,[37,1],[[32,2]],null,[["default"],[{"statements":[[6,[37,2],[[32,2]],[["guid","insertBefore"],["%cursor:0%",[29]]],[["default"],[{"statements":[[6,[37,1],[[32,1]],null,[["default"],[{"statements":[[2,"      "],[1,[30,[36,0],[[32,2],[32,1]],null]],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[18,3,null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]]],"hasEval":false,"upvars":["adopt-styles","if","in-element"]}',meta:{moduleName:"consul-ui/components/shadow-template/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/state-chart/action/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"vK0LWE3t",block:'{"symbols":["&default"],"statements":[[18,1,null]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/state-chart/action/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:"",didInsertElement:function(){this._super(...arguments),this.chart.addAction(this.name,(e,t)=>this.exec(e,t))},willDestroy:function(){this._super(...arguments),this.chart.removeAction(this.type)}}))
+e.default=n})),define("consul-ui/components/state-chart/guard/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"ajHPMf+f",block:'{"symbols":["&default"],"statements":[[18,1,null]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/state-chart/guard/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({tagName:"",didInsertElement:function(){this._super(...arguments)
+const e=this
+this.chart.addGuard(this.name,(function(){return"function"==typeof e.cond?e.cond(...arguments):e.cond}))},willDestroyElement:function(){this._super(...arguments),this.chart.removeGuard(this.name)}}))
+e.default=n})),define("consul-ui/components/state-chart/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"uYjYKgyF",block:'{"symbols":["&default"],"statements":[[18,1,[[30,[36,2],["state"],[["state"],[[35,0]]]],[30,[36,2],["state-chart/guard"],[["chart"],[[32,0]]]],[30,[36,2],["state-chart/action"],[["chart"],[[32,0]]]],[30,[36,1],[[32,0],"dispatch"],null],[35,0]]]],"hasEval":false,"upvars":["state","action","component"]}',meta:{moduleName:"consul-ui/components/state-chart/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({chart:Ember.inject.service("state"),tagName:"",ontransition:function(){},init:function(){this._super(...arguments),this._actions={},this._guards={}},didReceiveAttrs:function(){void 0!==this.machine&&this.machine.stop(),void 0!==this.initial&&(this.src.initial=this.initial),this.machine=this.chart.interpret(this.src,{onTransition:e=>{const t=new CustomEvent("transition",{detail:e})
+this.ontransition(t),t.defaultPrevented||e.actions.forEach(t=>{"function"==typeof this._actions[t.type]&&this._actions[t.type](t.type,e.context,e.event)}),Ember.set(this,"state",e)},onGuard:(e,...t)=>this._guards[e](...t)})},didInsertElement:function(){this._super(...arguments),Ember.set(this,"state",this.machine.initialState||this.machine.state),this.machine.start()},willDestroy:function(){this._super(...arguments),this.machine.stop()},addAction:function(e,t){this._actions[e]=t},removeAction:function(e){delete this._actions[e]},addGuard:function(e,t){this._guards[e]=t},removeGuard:function(e){delete this._guards[e]},dispatch:function(e,t){this.machine.state.context=t,this.machine.send({type:e})},actions:{dispatch:function(e,t){t&&t.preventDefault&&(void 0!==t.target.nodeName&&"a"===t.target.nodeName.toLowerCase()||t.preventDefault()),this.dispatch(e,t)}}}))
+e.default=n})),define("consul-ui/components/state/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"oAnib0UE",block:'{"symbols":["&default"],"statements":[[6,[37,1],[[35,0]],null,[["default"],[{"statements":[[2,"  "],[18,1,null],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["rendering","if"]}',meta:{moduleName:"consul-ui/components/state/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({service:Ember.inject.service("state"),tagName:"",didReceiveAttrs:function(){if(void 0===this.state)return
+let e=!0
+void 0!==this.matches?e=this.service.matches(this.state,this.matches):void 0!==this.notMatches&&(e=!this.service.matches(this.state,this.notMatches)),Ember.set(this,"rendering",e)}}))
+e.default=n})),define("consul-ui/components/tab-nav/index",["exports","@glimmer/component"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"AuN05zkB",block:'{"symbols":["select","name","item","@items","@onclick","&attrs"],"statements":[[6,[37,16],[[30,[36,15],[[30,[36,14],[[32,0],"style"],null]],[["offset"],[true]]],"tab"],null,[["default"],[{"statements":[[11,"nav"],[23,5,[30,[36,1],[[32,0,["style"]],[30,[36,11],["--selected-width:",[32,0,["style","width"]],";","--selected-left:",[32,0,["style","left"]],";","--selected-height:",[32,0,["style","height"]],";","--selected-top:",[32,0,["style","top"]]],null],[29]],null]],[24,"aria-label","Secondary"],[16,0,[30,[36,11],["tab-nav"," animatable"],null]],[17,6],[12],[2,"\\n  "],[10,"ul"],[12],[2,"\\n"],[6,[37,13],[[30,[36,12],[[30,[36,12],[[32,4]],null]],null]],null,[["default"],[{"statements":[[2,"  "],[11,"li"],[16,0,[30,[36,1],[[30,[36,4],[[32,3,["selected"]],[30,[36,3],[[35,2],[30,[36,1],[[32,3,["label"]],[30,[36,0],[[32,3,["label"]]],null],[30,[36,0],[[32,3]],null]],null]],null]],null],"selected"],null]],[4,[38,6],["click",[30,[36,5],[[32,1]],null]],null],[4,[38,8],[[30,[36,1],[[32,3,["selected"]],[30,[36,5],[[32,1]],null],[30,[36,7],null,null]],null],[32,4,["length"]]],null],[12],[2,"\\n    "],[8,"action",[[4,[38,6],["click",[30,[36,1],[[30,[36,10],[[32,5],[29]],null],[30,[36,5],[[32,5],[30,[36,9],[[32,3,["label"]]],null]],null],[30,[36,7],null,null]],null]],null]],[["@href"],[[32,3,["href"]]]],[["default"],[{"statements":[[2,"\\n      "],[1,[32,3,["label"]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[3]}]]],[2,"  "],[13],[2,"\\n"],[13],[2,"\\n"]],"parameters":[1,2]}]]]],"hasEval":false,"upvars":["slugify","if","selected","eq","or","fn","on","noop","did-upsert","uppercase","not-eq","concat","-track-array","each","set","dom-position","let"]}',meta:{moduleName:"consul-ui/components/tab-nav/index.hbs"}})
+class r extends t.default{}e.default=r,Ember._setComponentTemplate(n,r)})),define("consul-ui/components/tabular-collection/index",["exports","ember-collection/components/ember-collection","ember-collection/utils/needs-revalidate","ember-collection/layouts/grid","block-slots"],(function(e,t,n,r,a){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const l=Ember.HTMLBars.template({id:"Vy6UbjoV",block:'{"symbols":["cell","index","&default","&attrs"],"statements":[[11,"table"],[16,0,[31,["tabular-collection dom-recycling ",[30,[36,4],[[35,3],"has-actions",""],null]]]],[16,1,[34,5]],[23,5,[30,[36,7],["height:",[35,6,["height"]],"px"],null]],[17,4],[12],[2,"\\n"],[1,[30,[36,8],["resize",[30,[36,1],[[32,0],"resize"],null]],null]],[2,"\\n"],[18,3,null],[2,"\\n"],[6,[37,4],[[35,9]],null,[["default"],[{"statements":[[2,"  "],[10,"caption"],[12],[8,"yield-slot",[],[["@name"],["caption"]],[["default"],[{"statements":[[18,3,null]],"parameters":[]}]]],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[10,"thead"],[12],[2,"\\n    "],[10,"tr"],[12],[2,"\\n      "],[8,"yield-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[18,3,null]],"parameters":[]}]]],[2,"\\n"],[6,[37,4],[[35,3]],null,[["default"],[{"statements":[[2,"      "],[10,"th"],[14,0,"actions"],[12],[2,"Actions"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n  "],[13],[2,"\\n  "],[8,"ember-native-scrollable",[],[["@tagName","@content-size","@scroll-left","@scroll-top","@scrollChange","@clientSizeChange"],["tbody",[34,10],[34,11],[34,12],[30,[36,1],[[32,0],"scrollChange"],null],[30,[36,1],[[32,0],"clientSizeChange"],null]]],[["default"],[{"statements":[[2,"\\n    "],[10,"tr"],[12],[13],[6,[37,15],[[30,[36,14],[[30,[36,14],[[35,13]],null]],null]],null,[["default"],[{"statements":[[10,"tr"],[22,5,[32,1,["style"]]],[15,"onclick",[30,[36,1],[[32,0],"click"],null]],[12],[2,"\\n      "],[8,"yield-slot",[],[["@name"],["row"]],[["default"],[{"statements":[[18,3,[[32,1,["item"]],[32,2]]]],"parameters":[]}]]],[2,"\\n"],[6,[37,4],[[35,3]],null,[["default"],[{"statements":[[2,"      "],[10,"td"],[14,0,"actions"],[12],[2,"\\n        "],[8,"yield-slot",[],[["@name","@params"],["actions",[30,[36,2],[[32,1,["index"]],[30,[36,1],[[32,0],"change"],null],[35,0]],null]]],[["default"],[{"statements":[[2,"\\n          "],[18,3,[[32,1,["item"]],[32,2]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13]],"parameters":[1,2]}]]]],"parameters":[]}]]],[2,"\\n"],[13]],"hasEval":false,"upvars":["checked","action","block-params","hasActions","if","guid","style","concat","on-window","hasCaption","_contentSize","_scrollLeft","_scrollTop","_cells","-track-array","each"]}',meta:{moduleName:"consul-ui/components/tabular-collection/index.hbs"}}),s=r.default.prototype.formatItemStyle
+var i=Ember._setComponentTemplate(l,t.default.extend(a.default,{tagName:"",dom:Ember.inject.service("dom"),width:1150,rowHeight:50,maxHeight:500,checked:null,hasCaption:!1,init:function(){this._super(...arguments),this.guid=this.dom.guid(this)
+const e=this
+this["cell-layout"]=new r.default(Ember.get(this,"width"),Ember.get(this,"rowHeight")),this["cell-layout"].formatItemStyle=function(t){let n=s.apply(this,arguments)
+return e.checked===t&&(n+=";z-index: 1"),n}},didInsertElement:function(){this._super(...arguments),this.$element=this.dom.element("#"+this.guid),this.actions.resize.apply(this,[{target:this.dom.viewport()}])},style:Ember.computed("rowHeight","_items","maxRows","maxHeight",(function(){const e=Ember.get(this,"rows")
+let t=Ember.get(this,"maxHeight")
+if(e){let n=Math.max(3,Ember.get(this._items||[],"length"))
+n=Math.min(e,n),t=Ember.get(this,"rowHeight")*n+29}return{height:t}})),willRender:function(){this._super(...arguments),Ember.set(this,"hasCaption",this._isRegistered("caption")),Ember.set(this,"hasActions",this._isRegistered("actions"))},_needsRevalidate:function(){this.isDestroyed||this.isDestroying||(this._isGlimmer2()?this.rerender():(0,n.default)(this))},actions:{resize:function(e){const t=this.$element,n=this.dom.element(".app-view")
+if(n){const a=1,l=t.getBoundingClientRect(),i=this.dom.element('footer[role="contentinfo"]'),o=l.top+i.clientHeight+a,u=e.target.innerHeight-o
+this.set("maxHeight",Math.max(0,u)),this["cell-layout"]=new r.default(n.clientWidth,Ember.get(this,"rowHeight"))
+const c=this
+this["cell-layout"].formatItemStyle=function(e){let t=s.apply(this,arguments)
+return c.checked===e&&(t+=";z-index: 1"),t},this.updateItems(),this.updateScrollPosition()}},click:function(e){return this.dom.clickFirstAnchor(e)},change:function(e,t={}){if(this.$tr&&(this.$tr.style.zIndex=null),t.target&&t.target.checked&&e!==Ember.get(this,"checked")){Ember.set(this,"checked",parseInt(e))
+const n=t.target,r=this.dom.closest("tr",n),a=this.dom.sibling(n,"div")
+a.getBoundingClientRect().top+a.clientHeight>this.dom.element('footer[role="contentinfo"]').getBoundingClientRect().top?a.classList.add("above"):a.classList.remove("above"),r.style.zIndex=1,this.$tr=r}else Ember.set(this,"checked",null)}}}))
+e.default=i})),define("consul-ui/components/tabular-details/index",["exports","block-slots"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"1/kFWI3B",block:'{"symbols":["inputId","item","index","&default"],"statements":[[18,4,null],[2,"\\n"],[10,"table"],[14,0,"with-details has-actions"],[12],[2,"\\n  "],[10,"thead"],[12],[2,"\\n    "],[10,"tr"],[12],[2,"\\n      "],[8,"yield-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[18,4,null]],"parameters":[]}]]],[2,"\\n      "],[10,"th"],[14,0,"actions"],[12],[2,"Actions"],[13],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n  "],[10,"tbody"],[12],[2,"\\n"],[6,[37,9],[[30,[36,1],["tabular-details-",[35,4],"-toggle-",[35,8],"_"],null]],null,[["default"],[{"statements":[[6,[37,7],[[30,[36,6],[[30,[36,6],[[35,5]],null]],null]],null,[["default"],[{"statements":[[2,"      "],[10,"tr"],[15,"onclick",[30,[36,0],[[32,0],"click"],null]],[12],[2,"\\n          "],[8,"yield-slot",[],[["@name"],["row"]],[["default"],[{"statements":[[18,4,[[32,2],[32,3]]]],"parameters":[]}]]],[2,"\\n          "],[10,"td"],[14,0,"actions"],[12],[2,"\\n            "],[10,"label"],[15,"for",[30,[36,1],[[32,1],[32,3]],null]],[12],[10,"span"],[12],[2,"Show details"],[13],[13],[2,"\\n          "],[13],[2,"\\n      "],[13],[2,"\\n      "],[10,"tr"],[12],[2,"\\n        "],[10,"td"],[14,"colspan","3"],[12],[2,"\\n          "],[10,"input"],[15,"checked",[30,[36,3],[[30,[36,2],[[32,2,["closed"]]],null]],null]],[15,2,[32,3]],[15,3,[34,4]],[15,1,[30,[36,1],[[32,1],[32,3]],null]],[15,"onchange",[30,[36,0],[[32,0],"change",[32,2],[35,5]],null]],[14,4,"checkbox"],[12],[13],[2,"\\n          "],[10,"div"],[12],[2,"\\n            "],[10,"label"],[15,"for",[30,[36,1],[[32,1],[32,3]],null]],[12],[10,"span"],[12],[2,"Hide details"],[13],[13],[2,"\\n            "],[10,"div"],[12],[2,"\\n              "],[8,"yield-slot",[],[["@name"],["details"]],[["default"],[{"statements":[[2,"\\n                "],[18,4,[[32,2],[32,3]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "],[13],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[2,3]}]]]],"parameters":[1]}]]],[2,"  "],[13],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["action","concat","is-empty","not","name","items","-track-array","each","guid","let"]}',meta:{moduleName:"consul-ui/components/tabular-details/index.hbs"}})
+var r=Ember._setComponentTemplate(n,Ember.Component.extend(t.default,{dom:Ember.inject.service("dom"),onchange:function(){},init:function(){this._super(...arguments),this.guid=this.dom.guid(this)},actions:{click:function(e){this.dom.clickFirstAnchor(e)},change:function(e,t,n){this.onchange(n,e,t)}}}))
+e.default=r})),define("consul-ui/components/tag-list/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"m+vNqE0Z",block:'{"symbols":["tags","item","&attrs","@item","&default","@namedBlocksInfo","@tags"],"statements":[[6,[37,11],[[30,[36,10],[[30,[36,9],[[32,4,["Tags"]],[30,[36,1],null,null]],null],[30,[36,9],[[32,7],[30,[36,1],null,null]],null]],null]],null,[["default"],[{"statements":[[6,[37,7],[[30,[36,8],[[32,1,["length"]],0],null]],null,[["default"],[{"statements":[[6,[37,7],[[30,[36,6],[[32,6],"default",[27,[32,5]]],null]],null,[["default","else"],[{"statements":[[2,"      "],[18,5,[[30,[36,5],["tag-list"],[["item"],[[32,4]]]]]],[2,"\\n"]],"parameters":[]},{"statements":[[11,"dl"],[24,0,"tag-list"],[17,3],[12],[2,"\\n  "],[11,"dt"],[4,[38,0],null,null],[12],[2,"\\n    "],[1,[30,[36,2],["components.tag-list.title"],[["default"],[[30,[36,1],["common.consul.tags"],null]]]]],[2,"\\n  "],[13],[2,"\\n  "],[10,"dd"],[12],[2,"\\n"],[6,[37,4],[[30,[36,3],[[30,[36,3],[[32,1]],null]],null]],null,[["default"],[{"statements":[[2,"      "],[10,"span"],[12],[1,[32,2]],[13],[2,"\\n"]],"parameters":[2]}]]],[2,"  "],[13],[2,"\\n"],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["tooltip","array","t","-track-array","each","component","-has-block","if","gt","or","union","let"]}',meta:{moduleName:"consul-ui/components/tag-list/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/text-input/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"BI0eUwml",block:'{"symbols":["__arg0","@name","@item","@value","@placeholder","@chart","@validations","@oninput","@expanded","@label","&attrs","@help"],"statements":[[8,"form-input",[[16,0,[30,[36,7],["text-input"," type-text"],null]],[17,11]],[["@item","@placeholder","@name","@label","@help","@validations","@chart","@namedBlocksInfo"],[[32,3],[32,5],[32,2],[32,10],[32,12],[32,7],[32,6],[30,[36,8],null,[["label","input"],[0,0]]]]],[["default"],[{"statements":[[6,[37,5],[[30,[36,6],[[32,1],"label"],null]],null,[["default","else"],[{"statements":[[2,"\\n"],[2,"    "],[1,[30,[36,1],[[32,10],[32,2]],null]],[2,"\\n  "]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,6],[[32,1],"input"],null]],null,[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[32,9]],null,[["default","else"],[{"statements":[[2,"    "],[11,"textarea"],[16,3,[32,2]],[4,[38,2],[[32,3]],[["validations","chart"],[[32,7],[32,6]]]],[4,[38,4],["input",[30,[36,3],[[32,8]],null]],null],[12],[1,[30,[36,1],[[32,4],[30,[36,0],[[32,3],[32,2]],null]],null]],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[11,"input"],[16,2,[30,[36,1],[[32,4],[30,[36,0],[[32,3],[32,2]],null]],null]],[16,3,[32,2]],[16,"placeholder",[30,[36,1],[[32,5]],null]],[24,4,"text"],[4,[38,2],[[32,3]],[["validations","chart"],[[32,7],[32,6]]]],[4,[38,4],["input",[30,[36,3],[[32,8]],null]],null],[12],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["get","or","validate","optional","on","if","-is-named-block-invocation","concat","hash"]}',meta:{moduleName:"consul-ui/components/text-input/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/toggle-button/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"R/cqpwNW",block:'{"symbols":["&attrs","&default"],"statements":[[11,"input"],[17,1],[16,"checked",[30,[36,1],[[35,0],"checked",[29]],null]],[16,1,[30,[36,3],["toggle-button-",[35,2]],null]],[16,"onchange",[30,[36,4],[[32,0],"change"],null]],[24,4,"checkbox"],[4,[38,6],[[30,[36,5],[[32,0],"input"],null]],null],[12],[13],[2,"\\n"],[11,"label"],[16,"for",[30,[36,3],["toggle-button-",[35,2]],null]],[4,[38,6],[[30,[36,5],[[32,0],"label"],null]],null],[12],[2,"\\n  "],[18,2,[[30,[36,7],null,[["click"],[[30,[36,4],[[32,0],"click"],null]]]]]],[2,"\\n"],[13]],"hasEval":false,"upvars":["checked","if","guid","concat","action","set","did-insert","hash"]}',meta:{moduleName:"consul-ui/components/toggle-button/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember.Component.extend({dom:Ember.inject.service("dom"),tagName:"",checked:!1,onchange:function(){},onblur:function(){},init:function(){this._super(...arguments),this.guid=this.dom.guid(this),this._listeners=this.dom.listeners()},willDestroyElement:function(){this._super(...arguments),this._listeners.remove()},didReceiveAttrs:function(){this._super(...arguments),this.checked?this.addClickOutsideListener():this._listeners.remove()},addClickOutsideListener:function(){this._listeners.remove(),this._listeners.add(this.dom.document(),"click",e=>{this.dom.isOutside(this.label,e.target)&&this.dom.isOutside(this.label.nextElementSibling,e.target)&&(this.input.checked&&(this.input.checked=!1,this.onchange({target:this.input})),this._listeners.remove())})},actions:{click:function(e){-1===(e.target.rel||"").indexOf("noopener")&&e.preventDefault(),this.input.checked=!this.input.checked,0!==e.detail&&e.target.blur(),this.actions.change.apply(this,[e])},change:function(){this.input.checked&&this.addClickOutsideListener(),this.onchange({target:this.input})}}}))
+e.default=n})),define("consul-ui/components/token-list/index",["exports","block-slots"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"Nxw8uhmR",block:'{"symbols":["item","index","&default"],"statements":[[18,3,null],[2,"\\n"],[6,[37,3],[[30,[36,8],[[35,1,["length"]],0],null]],null,[["default"],[{"statements":[[2,"  "],[8,"tabular-collection",[[24,0,"token-list"]],[["@rows","@items"],[5,[30,[36,2],["AccessorID:asc",[35,1]],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[35,0]],null,[["default"],[{"statements":[[2,"    "],[8,"block-slot",[],[["@name"],["caption"]],[["default"],[{"statements":[[1,[34,0]]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n          "],[10,"th"],[12],[2,"AccessorID"],[13],[2,"\\n          "],[10,"th"],[12],[2,"Scope"],[13],[2,"\\n          "],[10,"th"],[12],[2,"Description"],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["row"]],[["default"],[{"statements":[[2,"\\n          "],[10,"td"],[12],[2,"\\n            "],[10,"a"],[15,6,[30,[36,4],["dc.acls.tokens.edit",[32,1,["AccessorID"]]],null]],[15,"target",[30,[36,6],[[35,5],""],null]],[12],[1,[30,[36,7],[[32,1,["AccessorID"]],8,false],null]],[13],[2,"\\n          "],[13],[2,"\\n          "],[10,"td"],[12],[2,"\\n            "],[1,[30,[36,3],[[32,1,["Local"]],"local","global"],null]],[2,"\\n          "],[13],[2,"\\n          "],[10,"td"],[12],[2,"\\n            "],[10,"p"],[12],[1,[32,1,["Description"]]],[13],[2,"\\n          "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[1,2]}]]],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["caption","items","sort-by","if","href-to","target","or","truncate","gt"]}',meta:{moduleName:"consul-ui/components/token-list/index.hbs"}})
+var r=Ember._setComponentTemplate(n,Ember.Component.extend(t.default,{tagName:""}))
+e.default=r})),define("consul-ui/components/token-source/chart.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={id:"token-source",initial:"idle",on:{RESTART:[{target:"secret",cond:"isSecret"},{target:"provider"}]},states:{idle:{},secret:{},provider:{on:{SUCCESS:"jwt"}},jwt:{on:{SUCCESS:"token"}},token:{}}}})),define("consul-ui/components/token-source/index",["exports","@glimmer/component","consul-ui/components/token-source/chart.xstate"],(function(e,t,n){var r,a,l,s,i,o,u
+function c(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function d(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function m(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function p(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const f=Ember.HTMLBars.template({id:"mPga2rq/",block:'{"symbols":["State","Guard","Action","dispatch","state","path","@value","@onerror","@type","@dc","@nspace","@partition"],"statements":[[8,"state-chart",[],[["@src","@initial"],[[32,0,["chart"]],[30,[36,8],[[30,[36,7],[[32,9],"oidc"],null],"provider","secret"],null]]],[["default"],[{"statements":[[2,"\\n  "],[8,[32,2],[],[["@name","@cond"],["isSecret",[32,0,["isSecret"]]]],null],[2,"\\n"],[6,[37,9],[[30,[36,2],["/${partition}/${nspace}/${dc}",[30,[36,0],null,[["partition","nspace","dc"],[[30,[36,6],[[32,7,["Partition"]],[32,12]],null],[30,[36,6],[[32,7,["Namespace"]],[32,11]],null],[32,10]]]]],null]],null,[["default"],[{"statements":[[2,"    "],[8,[32,1],[],[["@matches"],["secret"]],[["default"],[{"statements":[[2,"\\n      "],[8,"data-source",[],[["@src","@onchange","@onerror"],[[30,[36,2],[[30,[36,1],[[32,6],"/token/self/${value}"],null],[30,[36,0],null,[["value"],[[32,7]]]]],null],[32,0,["change"]],[32,8]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,[32,1],[],[["@matches"],["provider"]],[["default"],[{"statements":[[2,"\\n      "],[8,"data-source",[],[["@src","@onchange","@onerror"],[[30,[36,2],[[30,[36,1],[[32,6],"/oidc/provider/${value}"],null],[30,[36,0],null,[["value"],[[32,7,["Name"]]]]]],null],[30,[36,5],[[30,[36,3],[[32,0],[30,[36,4],[[32,0,["provider"]]],null]],[["value"],["data"]]],[30,[36,3],[[32,0],[32,4],"SUCCESS"],null]],null],[32,8]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,[32,1],[],[["@matches"],["jwt"]],[["default"],[{"statements":[[2,"\\n      "],[8,"jwt-source",[],[["@src","@onchange","@onerror"],[[32,0,["provider","AuthURL"]],[30,[36,5],[[30,[36,3],[[32,0],[30,[36,4],[[32,0,["jwt"]]],null]],[["value"],["data"]]],[30,[36,3],[[32,0],[32,4],"SUCCESS"],null]],null],[32,8]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,[32,1],[],[["@matches"],["token"]],[["default"],[{"statements":[[2,"\\n      "],[8,"data-source",[],[["@src","@onchange","@onerror"],[[30,[36,2],[[30,[36,1],[[32,6],"/oidc/authorize/${provider}/${code}/${state}"],null],[30,[36,0],null,[["provider","code","state"],[[32,0,["provider","Name"]],[32,0,["jwt","authorizationCode"]],[30,[36,6],[[32,0,["jwt","authorizationState"]],""],null]]]]],null],[32,0,["change"]],[32,8]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[6]}]]]],"parameters":[1,2,3,4,5]}]]]],"hasEval":false,"upvars":["hash","concat","uri","action","mut","queue","or","eq","if","let"]}',meta:{moduleName:"consul-ui/components/token-source/index.hbs"}})
+let b=(r=Ember._tracked,a=Ember._tracked,l=Ember._action,s=Ember._action,i=class extends t.default{constructor(){super(...arguments),d(this,"provider",o,this),d(this,"jwt",u,this),this.chart=n.default}isSecret(){return"secret"===this.args.type}change(e){e.data.toJSON=function(){return function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?c(Object(n),!0).forEach((function(t){m(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({AccessorID:this.AccessorID,SecretID:this.SecretID,Namespace:this.Namespace,Partition:this.Partition},{AuthMethod:void 0!==this.AuthMethod?this.AuthMethod:void 0})},"function"==typeof this.args.onchange&&this.args.onchange(e)}},o=p(i.prototype,"provider",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=p(i.prototype,"jwt",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p(i.prototype,"isSecret",[l],Object.getOwnPropertyDescriptor(i.prototype,"isSecret"),i.prototype),p(i.prototype,"change",[s],Object.getOwnPropertyDescriptor(i.prototype,"change"),i.prototype),i)
+e.default=b,Ember._setComponentTemplate(f,b)})),define("consul-ui/components/tooltip/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"9tuPBZz8",block:'{"symbols":["&attrs","&default"],"statements":[[11,"div"],[24,0,"tooltip"],[17,1],[4,[38,1],null,[["options"],[[30,[36,0],null,[["triggerTarget"],["parentNode"]]]]]],[12],[2,"\\n  "],[18,2,null],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["hash","tooltip"]}',meta:{moduleName:"consul-ui/components/tooltip/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/topology-metrics/card/index",["exports","@glimmer/component"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"z7O6i1oQ",block:'{"symbols":["percentage","@item","@dc","@service","&default"],"statements":[[6,[37,1],[[30,[36,2],[[32,2,["Datacenter"]],""],null]],null,[["default","else"],[{"statements":[[10,"a"],[14,0,"topology-metrics-card"],[15,6,[30,[36,6],["dc.services.index"],null]],[15,"data-permission",[30,[36,10],[[32,2]],null]],[12],[2,"\\n  "],[10,"p"],[14,0,"empty"],[12],[2,"\\n    "],[1,[32,2,["Name"]]],[2,"\\n  "],[13],[2,"\\n"],[13],[2,"\\n"]],"parameters":[]},{"statements":[[10,"a"],[14,0,"topology-metrics-card"],[15,6,[30,[36,1],[[30,[36,9],[[30,[36,8],["CONSUL_NSPACES_ENABLED"],null],[30,[36,0],[[32,2,["Namespace"]],[32,4,["Namespace"]]],null]],null],[30,[36,6],[[32,0,["hrefPath"]],[32,2,["Datacenter"]],[32,2,["Name"]]],[["params"],[[30,[36,7],null,[["nspace"],[[32,2,["Namespace"]]]]]]]],[30,[36,6],[[32,0,["hrefPath"]],[32,2,["Name"]]],null]],null]],[15,"data-permission",[30,[36,10],[[32,2]],null]],[15,1,[31,[[32,2,["Namespace"]],[32,2,["Name"]]]]],[12],[2,"\\n  "],[10,"p"],[12],[2,"\\n    "],[1,[32,2,["Name"]]],[2,"\\n  "],[13],[2,"\\n"],[6,[37,1],[[30,[36,2],[[32,2,["Source"]],"proxy-registration"],null]],null,[["default"],[{"statements":[[2,"    "],[8,"topology-metrics/source-type",[],[["@source"],["proxy-registration"]],null],[2,"\\n"]],"parameters":[]}]]],[6,[37,1],[[30,[36,2],[[32,2,["Source"]],"routing-config"],null]],null,[["default"],[{"statements":[[2,"    "],[8,"topology-metrics/source-type",[],[["@source"],["routing-config"]],null],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[10,"div"],[14,0,"details"],[12],[2,"\\n"],[6,[37,1],[[30,[36,9],[[30,[36,11],["use partitions"],null],[30,[36,11],["use nspaces"],null]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"div"],[15,0,[30,[36,1],[[30,[36,0],[[32,2,["Partition"]],[32,4,["Partition"]]],null],"group"],null]],[12],[2,"\\n"],[6,[37,1],[[30,[36,0],[[32,2,["Partition"]],[32,4,["Partition"]]],null]],null,[["default"],[{"statements":[[2,"      "],[10,"dl"],[14,0,"partition"],[12],[2,"\\n        "],[10,"dt"],[12],[2,"\\n          "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n              Admin Partition\\n          "]],"parameters":[]}]]],[2,"\\n        "],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[1,[32,2,["Partition"]]],[2,"\\n        "],[13],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[10,"span"],[12],[13],[2,"\\n"],[6,[37,1],[[30,[36,5],[[30,[36,0],[[32,2,["Partition"]],[32,4,["Partition"]]],null],[30,[36,0],[[32,2,["Namespace"]],[32,4,["Namespace"]]],null]],null]],null,[["default"],[{"statements":[[2,"      "],[10,"dl"],[14,0,"nspace"],[12],[2,"\\n        "],[10,"dt"],[12],[2,"\\n          "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n              Namespace\\n          "]],"parameters":[]}]]],[2,"\\n        "],[13],[2,"\\n        "],[10,"dd"],[12],[2,"\\n          "],[1,[32,2,["Namespace"]]],[2,"\\n        "],[13],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[6,[37,1],[[30,[36,0],[[32,2,["Source"]],"routing-config"],null]],null,[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[30,[36,2],[[32,2,["Datacenter"]],[32,3]],null]],null,[["default","else"],[{"statements":[[6,[37,4],[[30,[36,3],[[32,2]],null]],null,[["default"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,1],""],null]],null,[["default","else"],[{"statements":[[2,"    "],[10,"span"],[14,0,"empty"],[12],[2,"No health checks"],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,0],[[32,1,["passing"]],0],null]],null,[["default"],[{"statements":[[2,"      "],[10,"span"],[14,0,"passing"],[12],[1,[32,1,["passing"]]],[2,"%"],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,1],[[30,[36,0],[[32,1,["warning"]],0],null]],null,[["default"],[{"statements":[[2,"      "],[10,"span"],[14,0,"warning"],[12],[1,[32,1,["warning"]]],[2,"%"],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,1],[[30,[36,0],[[32,1,["critical"]],0],null]],null,[["default"],[{"statements":[[2,"      "],[10,"span"],[14,0,"critical"],[12],[1,[32,1,["critical"]]],[2,"%"],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1]}]]]],"parameters":[]},{"statements":[[2,"    "],[10,"dl"],[14,0,"health"],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n            We are unable to determine the health status of services in remote datacenters.\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        Health\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n  "],[18,5,null],[2,"\\n"],[13],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["not-eq","if","eq","service/health-percentage","let","or","href-to","hash","env","and","service/card-permissions","can"]}',meta:{moduleName:"consul-ui/components/topology-metrics/card/index.hbs"}})
+class r extends t.default{get hrefPath(){return"routing-config"===Ember.get(this.args.item,"Source")?"dc.routing-config":"dc.services.show.index"}}e.default=r,Ember._setComponentTemplate(n,r)})),define("consul-ui/components/topology-metrics/down-lines/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s,i
+function o(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function u(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const c=Ember.HTMLBars.template({id:"It3D29Z1",block:'{"symbols":["disabled","item","line","@service","@oncreate","@items","@view","@lines"],"statements":[[6,[37,7],[[30,[36,14],[[32,8,["length"]],0],null]],null,[["default"],[{"statements":[[2,"  "],[11,"svg"],[16,"viewBox",[30,[36,0],[[32,7,["x"]]," ",[32,7,["y"]]," ",[32,7,["width"]]," ",[32,7,["height"]]],null]],[24,"preserveAspectRatio","none"],[4,[38,12],[[32,0,["getIconPositions"]]],null],[4,[38,13],[[32,0,["getIconPositions"]],[32,8]],null],[12],[2,"\\n    "],[10,"defs"],[12],[2,"\\n      "],[10,"marker"],[15,1,[30,[36,0],[[32,0,["guid"]],"-allow-dot"],null]],[14,0,"allow-dot"],[14,"viewBox","-2 -2 15 15"],[14,"refX","6"],[14,"refY","6"],[14,"markerWidth","6"],[14,"markerHeight","6"],[12],[2,"\\n        "],[10,"circle"],[14,"cx","6"],[14,"cy","6"],[14,"r","6"],[12],[13],[2,"\\n      "],[13],[2,"\\n      "],[10,"marker"],[15,1,[30,[36,0],[[32,0,["guid"]],"-allow-arrow"],null]],[14,0,"allow-arrow"],[14,"viewBox","-1 -1 12 12"],[14,"refX","5"],[14,"refY","5"],[14,"markerWidth","6"],[14,"markerHeight","6"],[14,"orient","auto-start-reverse"],[12],[2,"\\n        "],[10,"polygon"],[14,"points","0 0 10 5 0 10"],[12],[13],[2,"\\n      "],[13],[2,"\\n      "],[10,"marker"],[15,1,[30,[36,0],[[32,0,["guid"]],"-deny-dot"],null]],[14,0,"deny-dot"],[14,"viewBox","-2 -2 15 15"],[14,"refX","6"],[14,"refY","6"],[14,"markerWidth","6"],[14,"markerHeight","6"],[12],[2,"\\n        "],[10,"circle"],[14,"cx","6"],[14,"cy","6"],[14,"r","6"],[12],[13],[2,"\\n      "],[13],[2,"\\n      "],[10,"marker"],[15,1,[30,[36,0],[[32,0,["guid"]],"-deny-arrow"],null]],[14,0,"deny-arrow"],[14,"viewBox","-1 -1 12 12"],[14,"refX","5"],[14,"refY","5"],[14,"markerWidth","6"],[14,"markerHeight","6"],[14,"orient","auto-start-reverse"],[12],[2,"\\n        "],[10,"polygon"],[14,"points","0 0 10 5 0 10"],[12],[13],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"],[6,[37,10],[[30,[36,9],[[30,[36,9],[[32,8]],null]],null]],null,[["default"],[{"statements":[[6,[37,7],[[30,[36,3],[[32,3,["permission"]],"deny"],null]],null,[["default","else"],[{"statements":[[2,"    "],[10,"path"],[15,1,[30,[36,0],[[32,0,["guid"]],[32,3,["id"]]],null]],[15,"d",[30,[36,11],[[32,3,["dest"]]],[["src"],[[32,3,["src"]]]]]],[15,"marker-start",[30,[36,0],["url(#",[32,0,["guid"]],"-deny-dot)"],null]],[15,"marker-end",[30,[36,0],["url(#",[32,0,["guid"]],"-deny-arrow)"],null]],[15,"data-permission",[32,3,["permission"]]],[12],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"     "],[10,"path"],[15,1,[30,[36,0],[[32,0,["guid"]],[32,3,["id"]]],null]],[15,"d",[30,[36,11],[[32,3,["dest"]]],[["src"],[[32,3,["src"]]]]]],[15,"marker-start",[30,[36,0],["url(#",[32,0,["guid"]],"-allow-dot)"],null]],[15,"marker-end",[30,[36,0],["url(#",[32,0,["guid"]],"-allow-arrow)"],null]],[15,"data-permission",[32,3,["permission"]]],[12],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[3]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[6,[37,16],[[30,[36,4],[[30,[36,15],["update intention for service"],[["item"],[[32,4,["Service"]]]]]],null]],null,[["default"],[{"statements":[[6,[37,10],[[30,[36,9],[[30,[36,9],[[32,6]],null]],null]],null,[["default"],[{"statements":[[6,[37,7],[[30,[36,6],[[30,[36,5],[[32,2,["Datacenter"]],""],null],[30,[36,8],[[30,[36,4],[[32,2,["Intention","Allowed"]]],null],[32,2,["Intention","HasPermissions"]]],null]],null]],null,[["default","else"],[{"statements":[[2,"    "],[8,"topology-metrics/popover",[],[["@type","@position","@item","@disabled","@oncreate"],[[30,[36,7],[[32,2,["Intention","HasPermissions"]],"l7","deny"],null],[30,[36,1],["id",[30,[36,0],[[32,0,["guid"]],[32,2,["Namespace"]],[32,2,["Name"]]],null],[32,0,["iconPositions"]]],null],[32,2],[32,1],[30,[36,2],[[32,0],[32,5],[32,2],[32,4]],null]]],null],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,7],[[30,[36,6],[[30,[36,5],[[32,2,["Datacenter"]],""],null],[32,2,["Intention","Allowed"]],[30,[36,4],[[32,2,["TransparentProxy"]]],null],[30,[36,4],[[32,2,["ConnectNative"]]],null],[30,[36,3],[[32,2,["Source"]],"specific-intention"],null]],null]],null,[["default"],[{"statements":[[2,"    "],[8,"topology-metrics/popover",[],[["@type","@service","@position","@item","@disabled","@oncreate"],["not-defined",[32,4],[30,[36,1],["id",[30,[36,0],[[32,0,["guid"]],[32,2,["Namespace"]],[32,2,["Name"]]],null],[32,0,["iconPositions"]]],null],[32,2],[32,1],[30,[36,2],[[32,0],[32,5],[32,2],[32,4]],null]]],null],[2,"\\n  "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[2]}]]]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["concat","find-by","action","eq","not","not-eq","and","if","or","-track-array","each","svg-curve","did-insert","did-update","gt","can","let"]}',meta:{moduleName:"consul-ui/components/topology-metrics/down-lines/index.hbs"}})
+let d=(n=Ember._tracked,r=Ember.inject.service("dom"),a=Ember._action,l=class extends t.default{constructor(...e){super(...e),o(this,"iconPositions",s,this),o(this,"dom",i,this)}get guid(){return this.dom.guid(this)}getIconPositions(){const e=this.args.view,t=[...document.querySelectorAll("#downstream-lines path")]
+this.iconPositions=t.map(t=>{const n=parseFloat(t.getTotalLength()),r=t.getPointAtLength(Math.ceil(n/3))
+return{id:t.id,x:Math.round(r.x-e.x),y:Math.round(r.y-e.y)}})}},s=u(l.prototype,"iconPositions",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i=u(l.prototype,"dom",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u(l.prototype,"getIconPositions",[a],Object.getOwnPropertyDescriptor(l.prototype,"getIconPositions"),l.prototype),l)
+e.default=d,Ember._setComponentTemplate(c,d)})),define("consul-ui/components/topology-metrics/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y
+function g(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function O(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const _=Ember.HTMLBars.template({id:"FlkBlhGg",block:'{"symbols":["upstreams","dc","item","item","@service","@dc","@hasMetricsProvider","@metricsHref","@topology","@nspace","@oncreate"],"statements":[[11,"div"],[24,0,"topology-container consul-topology-metrics"],[4,[38,13],[[32,0,["calculate"]]],null],[12],[2,"\\n"],[6,[37,3],[[30,[36,14],[[32,0,["downstreams","length"]],0],null]],null,[["default"],[{"statements":[[2,"  "],[11,"div"],[24,1,"downstream-container"],[4,[38,4],[[32,0,["setHeight"]],"downstream-lines"],null],[4,[38,5],[[32,0,["setHeight"]],"downstream-lines",[32,0,["downstreams"]]],null],[12],[2,"\\n"],[6,[37,3],[[30,[36,12],[[32,0,["emptyColumn"]]],null]],null,[["default"],[{"statements":[[2,"    "],[10,"div"],[12],[2,"\\n      "],[10,"p"],[12],[1,[32,6,["Name"]]],[13],[2,"\\n      "],[10,"span"],[12],[2,"\\n        "],[8,"tooltip",[],[[],[]],[["default"],[{"statements":[[2,"\\n          Only showing downstreams within the current datacenter for "],[1,[32,5,["Service","Service"]]],[2,".\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,7],[[30,[36,6],[[30,[36,6],[[32,0,["downstreams"]]],null]],null]],null,[["default"],[{"statements":[[2,"    "],[8,"topology-metrics/card",[],[["@nspace","@dc","@service","@item","@hasMetricsProvider","@noMetricsReason"],[[32,10],[32,6,["Name"]],[32,5,["Service"]],[32,4],[32,7],[32,0,["noMetricsReason"]]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[30,[36,2],[[32,7],[32,0,["mainNotIngressService"]],[30,[36,1],[[32,4,["Kind"]],"ingress-gateway"],null]],null]],null,[["default"],[{"statements":[[2,"      "],[8,"topology-metrics/stats",[],[["@nspace","@partition","@dc","@endpoint","@service","@item","@noMetricsReason"],[[30,[36,0],[[32,4,["Namespace"]],"default"],null],[30,[36,0],[[32,4,["Partition"]],"default"],null],[32,4,["Datacenter"]],"downstream-summary-for-service",[32,5,["Service","Service"]],[32,4,["Name"]],[32,0,["noMetricsReason"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[4]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[10,"div"],[14,1,"metrics-container"],[12],[2,"\\n    "],[10,"div"],[14,0,"metrics-header"],[12],[2,"\\n      "],[1,[32,5,["Service","Service"]]],[2,"\\n    "],[13],[2,"\\n"],[6,[37,3],[[30,[36,1],[[32,5,["Service","Meta","external-source"]],"consul-api-gateway"],null]],null,[["default"],[{"statements":[[6,[37,3],[[32,7]],null,[["default"],[{"statements":[[2,"      "],[8,"topology-metrics/series",[],[["@nspace","@partition","@dc","@service","@protocol","@noMetricsReason"],[[30,[36,0],[[32,5,["Service","Namespace"]],"default"],null],[30,[36,0],[[35,11,["Service","Partition"]],"default"],null],[32,6,["Name"]],[32,5,["Service","Service"]],[32,9,["Protocol"]],[32,0,["noMetricsReason"]]]],null],[2,"\\n"],[6,[37,3],[[32,0,["mainNotIngressService"]]],null,[["default"],[{"statements":[[2,"      "],[8,"topology-metrics/stats",[],[["@nspace","@partition","@dc","@endpoint","@service","@protocol","@noMetricsReason"],[[30,[36,0],[[32,5,["Service","Namespace"]],"default"],null],[30,[36,0],[[35,11,["Service","Partition"]],"default"],null],[32,6,["Name"]],"summary-for-service",[32,5,["Service","Service"]],[32,9,["Protocol"]],[32,0,["noMetricsReason"]]]],null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"    "],[10,"div"],[14,0,"link"],[12],[2,"\\n"],[6,[37,3],[[32,8]],null,[["default","else"],[{"statements":[[2,"      "],[10,"a"],[14,0,"metrics-link"],[15,6,[32,8]],[14,"target","_blank"],[14,"rel","noopener noreferrer"],[12],[2,"Open dashboard"],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[10,"a"],[14,0,"config-link"],[15,6,[31,[[30,[36,10],["CONSUL_DOCS_URL"],null],"/connect/observability/ui-visualization"]]],[14,"target","_blank"],[14,"rel","noopener noreferrer"],[12],[2,"Configure dashboard"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n  "],[10,"div"],[14,1,"downstream-lines"],[12],[2,"\\n    "],[8,"topology-metrics/down-lines",[],[["@type","@service","@view","@center","@lines","@items","@oncreate"],["downstream",[32,5],[32,0,["downView"]],[32,0,["centerDimensions"]],[32,0,["downLines"]],[32,0,["downstreams"]],[30,[36,15],[[32,0],[32,11]],null]]],null],[2,"\\n  "],[13],[2,"\\n"],[6,[37,3],[[30,[36,14],[[32,0,["upstreams","length"]],0],null]],null,[["default"],[{"statements":[[2,"  "],[10,"div"],[14,1,"upstream-column"],[12],[2,"\\n"],[6,[37,7],[[30,[36,9],[[30,[36,8],["Datacenter",[32,0,["upstreams"]]],null]],null]],null,[["default"],[{"statements":[[2,"    "],[11,"div"],[24,1,"upstream-container"],[4,[38,4],[[32,0,["setHeight"]],"upstream-lines"],null],[4,[38,5],[[32,0,["setHeight"]],"upstream-lines",[32,0,["upstreams"]]],null],[12],[2,"\\n"],[6,[37,3],[[32,2]],null,[["default"],[{"statements":[[2,"      "],[10,"p"],[12],[1,[32,2]],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,7],[[30,[36,6],[[30,[36,6],[[32,1]],null]],null]],null,[["default"],[{"statements":[[2,"      "],[8,"topology-metrics/card",[],[["@dc","@item","@service"],[[32,6,["Name"]],[32,3],[32,5,["Service"]]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,3],[[30,[36,2],[[32,7],[32,0,["mainNotIngressService"]],[30,[36,1],[[32,3,["Kind"]],"ingress-gateway"],null]],null]],null,[["default"],[{"statements":[[2,"        "],[8,"topology-metrics/stats",[],[["@nspace","@partition","@dc","@endpoint","@service","@item","@noMetricsReason"],[[30,[36,0],[[32,3,["Namespace"]],"default"],null],[30,[36,0],[[32,3,["Partition"]],"default"],null],[32,3,["Datacenter"]],"upstream-summary-for-service",[32,5,["Service","Service"]],[32,3,["Name"]],[32,0,["noMetricsReason"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3]}]]],[2,"    "],[13],[2,"\\n"]],"parameters":[1,2]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[10,"div"],[14,1,"upstream-lines"],[12],[2,"\\n    "],[8,"topology-metrics/up-lines",[],[["@type","@service","@view","@center","@lines","@items","@oncreate"],["upstream",[32,5],[32,0,["upView"]],[32,0,["centerDimensions"]],[32,0,["upLines"]],[32,0,["upstreams"]],[30,[36,15],[[32,0],[32,11]],null]]],null],[2,"\\n  "],[13],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["or","not-eq","and","if","did-insert","did-update","-track-array","each","group-by","-each-in","env","service","not","on-resize","gt","action"]}',meta:{moduleName:"consul-ui/components/topology-metrics/index.hbs"}})
+let P=(n=Ember.inject.service("env"),r=Ember._tracked,a=Ember._tracked,l=Ember._tracked,s=Ember._tracked,i=Ember._tracked,o=Ember._tracked,u=Ember._action,c=Ember._action,d=class extends t.default{constructor(...e){super(...e),g(this,"env",m,this),g(this,"centerDimensions",p,this),g(this,"downView",f,this),g(this,"downLines",b,this),g(this,"upView",h,this),g(this,"upLines",v,this),g(this,"noMetricsReason",y,this)}drawDownLines(e){const t=["allow","deny"],n={x:this.centerDimensions.x-7,y:this.centerDimensions.y+this.centerDimensions.height/2}
+return e.map(e=>{const t=e.getBoundingClientRect(),r={x:t.x+t.width,y:t.y+t.height/2}
+return{id:e.id,permission:e.getAttribute("data-permission"),dest:n,src:r}}).sort((e,n)=>t.indexOf(e.permission)-t.indexOf(n.permission))}drawUpLines(e){const t=["allow","deny"],n={x:this.centerDimensions.x+5.5,y:this.centerDimensions.y+this.centerDimensions.height/2}
+return e.map(e=>{const t=e.getBoundingClientRect(),r={x:t.x-t.width-25,y:t.y+t.height/2}
+return{id:e.id,permission:e.getAttribute("data-permission"),dest:r,src:n}}).sort((e,n)=>t.indexOf(e.permission)-t.indexOf(n.permission))}emptyColumn(){const e=Ember.get(this.args.topology,"noDependencies")
+return!this.env.var("CONSUL_ACLS_ENABLED")||e}get downstreams(){const e=Ember.get(this.args.topology,"Downstreams")||[],t=[...e],n=Ember.get(this.args.topology,"noDependencies")
+return!this.env.var("CONSUL_ACLS_ENABLED")&&n?t.push({Name:"Downstreams unknown.",Empty:!0,Datacenter:"",Namespace:""}):0===e.length&&t.push({Name:"No downstreams.",Datacenter:"",Namespace:""}),t}get upstreams(){const e=Ember.get(this.args.topology,"Upstreams")||[],t=[...e],n=Ember.get(this.args.dc,"DefaultACLPolicy"),r=Ember.get(this.args.topology,"wildcardIntention"),a=Ember.get(this.args.topology,"noDependencies")
+return!this.env.var("CONSUL_ACLS_ENABLED")&&a?t.push({Name:"Upstreams unknown.",Datacenter:"",Namespace:""}):"allow"===n||r?t.push({Name:"* (All Services)",Datacenter:"",Namespace:""}):0===e.length&&t.push({Name:"No upstreams.",Datacenter:"",Namespace:""}),t}get mainNotIngressService(){return"ingress-gateway"!==(Ember.get(this.args.service.Service,"Kind")||"")}setHeight(e,t){if(e){const n=e.getBoundingClientRect()
+document.getElementById(""+t[0]).setAttribute("style",`height:${n.height}px`)}this.calculate()}calculate(){this.args.isRemoteDC?this.noMetricsReason="remote-dc":"ingress-gateway"===this.args.service.Service.Kind?this.noMetricsReason="ingress-gateway":this.noMetricsReason=null
+const e=document.getElementById("downstream-lines").getBoundingClientRect(),t=document.getElementById("upstream-lines").getBoundingClientRect(),n=document.getElementById("upstream-column")
+this.emptyColumn?this.downView={x:e.x,y:e.y,width:e.width,height:e.height+10}:this.downView=e,n&&(this.upView={x:t.x,y:t.y,width:t.width,height:n.getBoundingClientRect().height+10})
+const r=[...document.querySelectorAll("#downstream-container .topology-metrics-card")],a=document.querySelector(".metrics-header"),l=[...document.querySelectorAll("#upstream-column .topology-metrics-card")]
+this.centerDimensions=a.getBoundingClientRect(),this.downLines=this.drawDownLines(r),this.upLines=this.drawUpLines(l)}},m=O(d.prototype,"env",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=O(d.prototype,"centerDimensions",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=O(d.prototype,"downView",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=O(d.prototype,"downLines",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return[]}}),h=O(d.prototype,"upView",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=O(d.prototype,"upLines",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return[]}}),y=O(d.prototype,"noMetricsReason",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O(d.prototype,"setHeight",[u],Object.getOwnPropertyDescriptor(d.prototype,"setHeight"),d.prototype),O(d.prototype,"calculate",[c],Object.getOwnPropertyDescriptor(d.prototype,"calculate"),d.prototype),d)
+e.default=P,Ember._setComponentTemplate(_,P)}))
+define("consul-ui/components/topology-metrics/notifications/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"ZVlQpsZp",block:'{"symbols":["error","@status","@type","@error"],"statements":[[6,[37,1],[[30,[36,2],[[32,3],"create"],null]],null,[["default","else"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    Your intention has been added.\\n"]],"parameters":[]},{"statements":[[2,"    There was an error adding your intention.\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,2],[[32,3],"update"],null]],null,[["default"],[{"statements":[[6,[37,1],[[30,[36,2],[[32,2],"success"],null]],null,[["default","else"],[{"statements":[[2,"    Your intention has been saved.\\n"]],"parameters":[]},{"statements":[[2,"    There was an error saving your intention.\\n"]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[6,[37,3],[[32,4,["errors","firstObject"]]],null,[["default"],[{"statements":[[6,[37,1],[[32,1,["detail"]]],null,[["default"],[{"statements":[[2,"    "],[10,"br"],[12],[13],[1,[30,[36,0],["(",[30,[36,1],[[32,1,["status"]],[30,[36,0],[[32,1,["status"]],": "],null]],null],[32,1,["detail"]],")"],null]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["concat","if","eq","let"]}',meta:{moduleName:"consul-ui/components/topology-metrics/notifications/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/topology-metrics/popover/index",["exports","@glimmer/component"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Ember.HTMLBars.template({id:"iYw9/Q3m",block:'{"symbols":["style","label","__arg0","__arg1","Actions","__arg0","__arg1","Actions","__arg0","__arg1","Actions","@item","@service","@type","@oncreate","@disabled","&attrs","@position"],"statements":[[11,"div"],[16,0,[31,["topology-metrics-popover ",[32,14]]]],[17,17],[12],[2,"\\n"],[6,[37,7],[[30,[36,1],["top:",[32,18,["y"]],"px;left:",[32,18,["x"]],"px;"],null],[30,[36,9],[[30,[36,14],[[32,14],"deny"],null],"Add intention","View intention"],null]],null,[["default"],[{"statements":[[6,[37,9],[[30,[36,16],[[32,16]],null]],null,[["default","else"],[{"statements":[[6,[37,9],[[30,[36,14],[[32,14],"deny"],null]],null,[["default","else"],[{"statements":[[2,"      "],[8,"informed-action",[[24,0,"dangerous"],[4,[38,12],[[30,[36,11],[[32,0],"popover"],null]],null]],[["@namedBlocksInfo"],[[30,[36,10],null,[["header","body","actions"],[0,0,1]]]]],[["default"],[{"statements":[[6,[37,9],[[30,[36,8],[[32,9],"header"],null]],null,[["default","else"],[{"statements":[[2,"\\n          "],[10,"h3"],[12],[2,"\\n            "],[1,[30,[36,3],["components.consul.topology-metrics.popover.deny.header"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]},{"statements":[[6,[37,9],[[30,[36,8],[[32,9],"body"],null]],null,[["default","else"],[{"statements":[[2,"\\n          "],[10,"p"],[12],[2,"\\n"],[6,[37,9],[[32,12,["Intention","HasExact"]]],null,[["default","else"],[{"statements":[[2,"              "],[1,[30,[36,3],["components.consul.topology-metrics.popover.deny.body.isExact"],null]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"              "],[1,[30,[36,3],["components.consul.topology-metrics.popover.deny.body.notExact"],null]],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n        "]],"parameters":[]},{"statements":[[6,[37,9],[[30,[36,8],[[32,9],"actions"],null]],null,[["default"],[{"statements":[[6,[37,7],[[32,10]],null,[["default"],[{"statements":[[2,"\\n          "],[8,[32,11,["Action"]],[[24,0,"action"]],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[11,"button"],[24,4,"button"],[4,[38,6],["click",[32,15]],null],[12],[2,"\\n"],[6,[37,9],[[32,12,["Intention","HasExact"]]],null,[["default","else"],[{"statements":[[2,"                "],[1,[30,[36,3],["components.consul.topology-metrics.popover.deny.action.isExact"],null]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"                "],[1,[30,[36,3],["components.consul.topology-metrics.popover.deny.action.notExact"],null]],[2,"\\n"]],"parameters":[]}]]],[2,"            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,11,["Action"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[11,"button"],[24,0,"cancel"],[24,4,"button"],[4,[38,6],["click",[30,[36,5],[[30,[36,4],[[32,0,["popoverController","hide"]]],null]],null]],null],[12],[2,"\\n              Cancel\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[11]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[9,10]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,9],[[30,[36,14],[[32,14],"not-defined"],null]],null,[["default","else"],[{"statements":[[2,"      "],[8,"informed-action",[[24,0,"warning documentation"],[4,[38,12],[[30,[36,11],[[32,0],"popover"],null]],null]],[["@namedBlocksInfo"],[[30,[36,10],null,[["header","body","actions"],[0,0,1]]]]],[["default"],[{"statements":[[6,[37,9],[[30,[36,8],[[32,6],"header"],null]],null,[["default","else"],[{"statements":[[2,"\\n          "],[10,"h3"],[12],[2,"\\n            "],[1,[30,[36,3],["components.consul.topology-metrics.popover.not-defined.header"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]},{"statements":[[6,[37,9],[[30,[36,8],[[32,6],"body"],null]],null,[["default","else"],[{"statements":[[2,"\\n          "],[10,"p"],[12],[2,"\\n            "],[1,[30,[36,3],["components.consul.topology-metrics.popover.not-defined.body"],[["downstream","upstream"],[[32,12,["Name"]],[32,13,["Name"]]]]]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]},{"statements":[[6,[37,9],[[30,[36,8],[[32,6],"actions"],null]],null,[["default"],[{"statements":[[6,[37,7],[[32,7]],null,[["default"],[{"statements":[[2,"\\n          "],[8,[32,8,["Action"]],[[24,0,"action"]],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"a"],[15,6,[31,[[30,[36,13],["CONSUL_DOCS_URL"],null],"/connect/registration/service-registration#upstreams"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"\\n              "],[1,[30,[36,3],["components.consul.topology-metrics.popover.not-defined.action"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,8,["Action"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[11,"button"],[24,0,"cancel"],[24,4,"button"],[4,[38,6],["click",[30,[36,5],[[30,[36,4],[[32,0,["popoverController","hide"]]],null]],null]],null],[12],[2,"\\n              Close\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[8]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[6,7]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[8,"informed-action",[[24,0,"info"],[4,[38,12],[[30,[36,11],[[32,0],"popover"],null]],null]],[["@namedBlocksInfo"],[[30,[36,10],null,[["header","body","actions"],[0,0,1]]]]],[["default"],[{"statements":[[6,[37,9],[[30,[36,8],[[32,3],"header"],null]],null,[["default","else"],[{"statements":[[2,"\\n          "],[10,"h3"],[12],[2,"\\n            "],[1,[30,[36,3],["components.consul.topology-metrics.popover.l7.header"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]},{"statements":[[6,[37,9],[[30,[36,8],[[32,3],"body"],null]],null,[["default","else"],[{"statements":[[2,"\\n          "],[10,"p"],[12],[2,"\\n            "],[1,[30,[36,3],["components.consul.topology-metrics.popover.l7.body"],null]],[2,"\\n          "],[13],[2,"\\n        "]],"parameters":[]},{"statements":[[6,[37,9],[[30,[36,8],[[32,3],"actions"],null]],null,[["default"],[{"statements":[[6,[37,7],[[32,4]],null,[["default"],[{"statements":[[2,"\\n          "],[8,[32,5,["Action"]],[[24,0,"action"]],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"a"],[15,6,[30,[36,2],["dc.services.show.intentions.edit",[30,[36,1],[[32,12,["Intention","ID"]]],null]],null]],[12],[2,"\\n              "],[1,[30,[36,3],["components.consul.topology-metrics.popover.l7.action"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,5,["Action"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[11,"button"],[24,0,"cancel"],[24,4,"button"],[4,[38,6],["click",[30,[36,5],[[30,[36,4],[[32,0,["popoverController","hide"]]],null]],null]],null],[12],[2,"\\n              Close\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[5]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[3,4]}]]],[2,"\\n    "]],"parameters":[]}]]]],"parameters":[]}]]],[2,"    "],[11,"button"],[23,5,[32,1]],[16,"aria-label",[32,2]],[24,4,"button"],[4,[38,15],[[32,0,["popover"]]],[["options","returns"],[[30,[36,10],null,[["theme","placement"],["square-tail","bottom-start"]]],[30,[36,11],[[32,0],"popoverController"],null]]]],[4,[38,6],["click",[30,[36,5],[[30,[36,4],[[32,0,["popoverController","show"]]],null]],null]],null],[12],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[11,"button"],[23,5,[32,1]],[16,"aria-label",[32,2]],[24,4,"button"],[4,[38,0],[true],null],[12],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1,2]}]]],[13],[2,"\\n"]],"hasEval":false,"upvars":["disabled","concat","href-to","t","optional","fn","on","let","-is-named-block-invocation","if","hash","set","did-insert","env","eq","with-overlay","not"]}',meta:{moduleName:"consul-ui/components/topology-metrics/popover/index.hbs"}})
+class r extends t.default{}e.default=r,Ember._setComponentTemplate(n,r)})),define("consul-ui/components/topology-metrics/series/index",["exports","dayjs","dayjs/plugin/calendar","d3-selection","d3-scale","d3-scale-chromatic","d3-shape","d3-array"],(function(e,t,n,r,a,l,s,i){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const o=Ember.HTMLBars.template({id:"T4gO0fLS",block:'{"symbols":["modal","desc","label","@noMetricsReason","@protocol","@service","@dc","@partition","@nspace"],"statements":[[6,[37,4],[[30,[36,9],[[32,4]],null]],null,[["default"],[{"statements":[[2,"  "],[8,"data-source",[],[["@src","@onchange","@onerror"],[[30,[36,6],["/${partition}/${nspace}/${dc}/metrics/summary-for-service/${service}/${protocol}",[30,[36,5],null,[["nspace","partition","dc","service","protocol"],[[32,9],[32,8],[32,7],[32,6],[32,5]]]]],null],[30,[36,7],[[32,0],"change"],null],[30,[36,7],[[32,0],[30,[36,8],[[35,0]],null]],[["value"],["error"]]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[1,[30,[36,10],["resize",[30,[36,7],[[32,0],"redraw"],null]],null]],[2,"\\n"],[1,[30,[36,11],[[30,[36,7],[[32,0],"redraw"],null]],null]],[2,"\\n\\n"],[6,[37,4],[[30,[36,9],[[35,12]],null]],null,[["default"],[{"statements":[[6,[37,4],[[35,3,["labels"]]],null,[["default"],[{"statements":[[2,"    "],[11,"a"],[24,0,"sparkline-key-link"],[4,[38,2],["click",[30,[36,1],[[32,0,["modal","open"]]],null]],null],[12],[2,"\\n      Key\\n    "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"\\n"],[10,"div"],[14,0,"sparkline-wrapper"],[12],[2,"\\n  "],[10,"div"],[14,0,"tooltip"],[12],[2,"\\n    "],[10,"div"],[14,0,"sparkline-time"],[12],[2,"Timestamp"],[13],[2,"\\n  "],[13],[2,"\\n"],[6,[37,4],[[35,12]],null,[["default"],[{"statements":[[2,"    "],[8,"topology-metrics/status",[],[["@noMetricsReason","@error"],[[32,4],[34,0]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[10,"svg"],[14,0,"sparkline"],[12],[13],[2,"\\n"],[13],[2,"\\n\\n"],[8,"modal-dialog",[[24,0,"sparkline-key"]],[["@aria"],[[30,[36,5],null,[["label"],["Metrics Key"]]]]],[["default"],[{"statements":[[2,"\\n    "],[8,"ref",[],[["@target","@name","@value"],[[32,0],"modal",[32,1]]],null],[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n      "],[10,"h3"],[12],[2,"Metrics Key"],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n      "],[10,"div"],[14,0,"sparkline-key-content"],[12],[2,"\\n        "],[10,"p"],[12],[2,"This key describes the metrics corresponding to the graph tooltip labels in more detail."],[13],[2,"\\n        "],[10,"dl"],[12],[2,"\\n"],[6,[37,14],[[30,[36,13],[[35,3,["labels"]]],null]],null,[["default"],[{"statements":[[2,"            "],[10,"dt"],[12],[1,[32,3]],[13],[2,"\\n            "],[10,"dd"],[12],[1,[32,2]],[13],[2,"\\n"]],"parameters":[2,3]}]]],[2,"        "],[13],[2,"\\n"],[6,[37,15],[[35,3,["labels"]]],null,[["default"],[{"statements":[[2,"          "],[10,"span"],[14,0,"no-data"],[12],[2,"No metrics loaded."],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n      "],[10,"button"],[14,0,"type-cancel"],[15,"onclick",[30,[36,7],[[32,0],[32,1,["close"]]],null]],[14,4,"button"],[12],[2,"\\n        Close\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["error","optional","on","data","if","hash","uri","action","mut","not","on-window","did-insert","empty","-each-in","each","unless"]}',meta:{moduleName:"consul-ui/components/topology-metrics/series/index.hbs"}})
+t.default.extend(n.default)
+var u=Ember._setComponentTemplate(o,Ember.Component.extend({data:null,empty:!1,actions:{redraw:function(){this.drawGraphs()},change:function(e){this.set("data",e.data.series),this.drawGraphs(),this.rerender()}},drawGraphs:function(){if(!this.data)return void Ember.set(this,"empty",!0)
+let e=this.svg=(0,r.select)(this.element.querySelector("svg.sparkline"))
+e.on("mouseover mousemove mouseout",null),e.selectAll("path").remove(),e.selectAll("rect").remove()
+let t=e.node().getBoundingClientRect(),n=t.width,o=t.height,u=this.data||{},c=u.data||[],d=u.labels||{},m=u.unitSuffix||"",p=Object.keys(d).filter(e=>"Total"!=e)
+if(0==c.length||0==p.length)return void Ember.set(this,"empty",!0)
+Ember.set(this,"empty",!1)
+let f=(0,s.stack)().keys(p).order(s.stackOrderReverse)(c),b=c.map(e=>{let t=0
+return p.forEach(n=>{t+=e[n]}),t}),h=(0,a.scaleTime)().domain((0,i.extent)(c,e=>e.time)).range([0,n]),v=(0,a.scaleLinear)().domain([0,(0,i.max)(b)]).range([o,0]),y=(0,s.area)().x(e=>h(e.data.time)).y1(e=>v(e[0])).y0(e=>v(e[1])),g=["#DCE0E6","#C73445"].concat(l.schemeTableau10)
+p.includes("Outbound")&&(g=["#DCE0E6","#0E40A3"].concat(l.schemeTableau10))
+let O=(0,a.scaleOrdinal)(g).domain(p)
+e.selectAll("path").data(f).join("path").attr("fill",({key:e})=>O(e)).attr("stroke",({key:e})=>O(e)).attr("d",y)
+let _=e.append("rect").attr("class","cursor").style("visibility","hidden").attr("width",1).attr("height",o).attr("x",0).attr("y",0),P=(0,r.select)(this.element.querySelector(".tooltip"))
+for(var w of(P.selectAll(".sparkline-tt-legend").remove(),P.selectAll(".sparkline-tt-sum").remove(),p)){let e=P.append("div").attr("class","sparkline-tt-legend")
+e.append("div").attr("class","sparkline-tt-legend-color").style("background-color",O(w)),e.append("span").text(w).append("span").attr("class","sparkline-tt-legend-value")}let E=P.selectAll(".sparkline-tt-legend-value")
+p.length>1&&P.append("div").attr("class","sparkline-tt-sum").append("span").text("Total").append("span").attr("class","sparkline-tt-sum-value")
+let k=this
+e.on("mouseover",(function(e){P.style("visibility","visible"),_.style("visibility","visible"),k.updateTooltip(e,c,f,b,m,h,P,E,_)})).on("mousemove",(function(e){k.updateTooltip(e,c,f,b,m,h,P,E,_)})).on("mouseout",(function(){P.style("visibility","hidden"),_.style("visibility","hidden")}))},willDestroyElement:function(){this._super(...arguments),void 0!==this.svg&&this.svg.on("mouseover mousemove mouseout",null)},updateTooltip:function(e,n,a,l,s,o,u,d,m){let[p]=(0,r.pointer)(e)
+m.attr("x",p)
+let f=o.invert(p)
+let b=(0,(0,i.bisector)((function(e){return e.time})).left)(n,f)
+var h
+u.style("left",p-22+"px").select(".sparkline-time").text((h=f,(0,t.default)(h).calendar(null,{sameDay:"[Today at] h:mm:ss A",lastDay:"[Yesterday at] h:mm:ss A",lastWeek:"[Last] dddd at h:mm:ss A",sameElse:"MMM DD at h:mm:ss A"}))),u.select(".sparkline-tt-sum-value").text(`${c(l[b])}${s}`),d.nodes().forEach((e,t)=>{let n=a[t][b][1]-a[t][b][0];(0,r.select)(e).text(`${c(n)}${s}`)}),m.attr("x",p)}}))
+function c(e){return e<1e3?Number.isInteger(e)?""+e:Number(e>=100?e.toPrecision(3):e<1?e.toFixed(2):e.toPrecision(2)):e>=1e3&&e<1e6?+(e/1e3).toPrecision(3)+"k":e>=1e6&&e<1e9?+(e/1e6).toPrecision(3)+"m":e>=1e9&&e<1e12?+(e/1e9).toPrecision(3)+"g":e>=1e12?+(e/1e12).toFixed(0)+"t":void 0}e.default=u})),define("consul-ui/components/topology-metrics/source-type/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"g20EXkUJ",block:'{"symbols":["@source"],"statements":[[11,"span"],[24,0,"topology-metrics-source-type"],[4,[38,2],[[30,[36,1],[[30,[36,0],["components.consul.topology-metrics.source-type.",[32,1],".tooltip"],null]],null]],null],[12],[2,"\\n  "],[1,[30,[36,1],[[30,[36,0],["components.consul.topology-metrics.source-type.",[32,1],".text"],null]],null]],[2,"\\n"],[13]],"hasEval":false,"upvars":["concat","t","tooltip"]}',meta:{moduleName:"consul-ui/components/topology-metrics/source-type/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/topology-metrics/stats/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s,i
+function o(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function u(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const c=Ember.HTMLBars.template({id:"vUxWURoJ",block:'{"symbols":["stat","@noMetricsReason","@protocol","@service","@endpoint","@dc","@partition","@nspace","&attrs"],"statements":[[6,[37,11],[[30,[36,10],[[32,2]],null]],null,[["default"],[{"statements":[[2,"  "],[8,"data-source",[],[["@src","@onchange","@onerror"],[[30,[36,7],["/${partition}/${nspace}/${dc}/metrics/${endpoint}/${service}/${protocol}",[30,[36,1],null,[["nspace","partition","dc","endpoint","service","protocol"],[[32,8],[32,7],[32,6],[32,5],[32,4],[30,[36,6],[[32,3],""],null]]]]],null],[30,[36,8],[[32,0],"statsUpdate"],null],[30,[36,8],[[32,0],[30,[36,9],[[35,0]],null]],[["value"],["error"]]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[11,"div"],[17,9],[24,0,"topology-metrics-stats"],[12],[2,"\\n"],[6,[37,11],[[35,12]],null,[["default","else"],[{"statements":[[6,[37,5],[[30,[36,4],[[30,[36,4],[[35,3]],null]],null]],null,[["default","else"],[{"statements":[[2,"    "],[11,"dl"],[4,[38,2],[[32,1,["desc"]]],[["options"],[[30,[36,1],null,[["allowHTML"],[true]]]]]],[12],[2,"\\n      "],[10,"dt"],[12],[2,"\\n        "],[1,[32,1,["value"]]],[2,"\\n      "],[13],[2,"\\n      "],[10,"dd"],[12],[2,"\\n        "],[1,[32,1,["label"]]],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[1]},{"statements":[[2,"      "],[10,"span"],[12],[2,"No Metrics Available"],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[2,"    "],[8,"topology-metrics/status",[],[["@noMetricsReason","@error"],[[32,2],[34,0]]],null],[2,"\\n"]],"parameters":[]}]]],[13]],"hasEval":false,"upvars":["error","hash","tooltip","stats","-track-array","each","or","uri","action","mut","not","if","hasLoaded"]}',meta:{moduleName:"consul-ui/components/topology-metrics/stats/index.hbs"}})
+let d=(n=Ember._tracked,r=Ember._tracked,a=Ember._action,l=class extends t.default{constructor(...e){super(...e),o(this,"stats",s,this),o(this,"hasLoaded",i,this)}statsUpdate(e){if("summary-for-service"==this.args.endpoint)this.stats=e.data.stats
+else{let t=this.args.nspace||""
+0===t.length&&(t="default")
+let n=`${this.args.item}.${t}.${this.args.dc}`
+this.stats=e.data.stats[n]}this.stats=(this.stats||[]).slice(0,4),this.hasLoaded=!0}},s=u(l.prototype,"stats",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return null}}),i=u(l.prototype,"hasLoaded",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),u(l.prototype,"statsUpdate",[a],Object.getOwnPropertyDescriptor(l.prototype,"statsUpdate"),l.prototype),l)
+e.default=d,Ember._setComponentTemplate(c,d)})),define("consul-ui/components/topology-metrics/status/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"nZPL6KB3",block:'{"symbols":["@error","@noMetricsReason"],"statements":[[6,[37,1],[[30,[36,4],[[32,2],[32,1]],null]],null,[["default","else"],[{"statements":[[2,"  "],[10,"span"],[14,0,"topology-metrics-status-error"],[12],[2,"\\n"],[6,[37,1],[[30,[36,3],[[32,2],"ingress-gateway"],null]],null,[["default","else"],[{"statements":[[2,"      "],[1,[30,[36,0],["components.consul.topology-metrics.status.ingress-gateway"],null]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[30,[36,3],[[32,2],"remote-dc"],null]],null,[["default","else"],[{"statements":[[2,"      "],[1,[30,[36,0],["components.consul.topology-metrics.status.error"],null]],[2,"\\n      "],[11,"span"],[4,[38,2],[[30,[36,0],["components.consul.topology-metrics.status.remote-dc"],null]],null],[12],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[32,1]],null,[["default"],[{"statements":[[2,"      "],[1,[30,[36,0],["components.consul.topology-metrics.status.error"],null]],[2,"\\n    "]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"  "],[10,"span"],[14,0,"topology-metrics-status-loader"],[12],[1,[30,[36,0],["components.consul.topology-metrics.status.loading"],null]],[13],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["t","if","tooltip","eq","or"]}',meta:{moduleName:"consul-ui/components/topology-metrics/status/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/components/topology-metrics/up-lines/index",["exports","@glimmer/component"],(function(e,t){var n,r,a,l,s,i
+function o(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function u(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const c=Ember.HTMLBars.template({id:"JzB9jHPV",block:'{"symbols":["item","line","@service","@oncreate","@view","@center","@lines","@items"],"statements":[[6,[37,0],[[30,[36,14],[[32,7,["length"]],0],null]],null,[["default"],[{"statements":[[2,"  "],[11,"svg"],[16,"viewBox",[30,[36,1],[[32,6,["x"]]," ",[32,5,["y"]]," ",[32,5,["width"]]," ",[32,5,["height"]]],null]],[24,"preserveAspectRatio","none"],[4,[38,10],[[32,0,["getIconPositions"]]],null],[4,[38,11],[[32,0,["getIconPositions"]],[32,7]],null],[12],[2,"\\n    "],[10,"defs"],[12],[2,"\\n      "],[10,"marker"],[15,1,[30,[36,1],[[32,0,["guid"]],"-allow-dot"],null]],[14,0,"allow-dot"],[14,"viewBox","-2 -2 15 15"],[14,"refX","6"],[14,"refY","6"],[14,"markerWidth","6"],[14,"markerHeight","6"],[12],[2,"\\n        "],[10,"circle"],[14,"cx","6"],[14,"cy","6"],[14,"r","6"],[12],[13],[2,"\\n      "],[13],[2,"\\n      "],[10,"marker"],[15,1,[30,[36,1],[[32,0,["guid"]],"-allow-arrow"],null]],[14,0,"allow-arrow"],[14,"viewBox","-1 -1 12 12"],[14,"refX","5"],[14,"refY","5"],[14,"markerWidth","6"],[14,"markerHeight","6"],[14,"orient","auto-start-reverse"],[12],[2,"\\n        "],[10,"polygon"],[14,"points","0 0 10 5 0 10"],[12],[13],[2,"\\n      "],[13],[2,"\\n      "],[10,"marker"],[15,1,[30,[36,1],[[32,0,["guid"]],"-deny-dot"],null]],[14,0,"deny-dot"],[14,"viewBox","-2 -2 15 15"],[14,"refX","6"],[14,"refY","6"],[14,"markerWidth","6"],[14,"markerHeight","6"],[12],[2,"\\n        "],[10,"circle"],[14,"cx","6"],[14,"cy","6"],[14,"r","6"],[12],[13],[2,"\\n      "],[13],[2,"\\n      "],[10,"marker"],[15,1,[30,[36,1],[[32,0,["guid"]],"-deny-arrow"],null]],[14,0,"deny-arrow"],[14,"viewBox","-1 -1 12 12"],[14,"refX","5"],[14,"refY","5"],[14,"markerWidth","6"],[14,"markerHeight","6"],[14,"orient","auto-start-reverse"],[12],[2,"\\n        "],[10,"polygon"],[14,"points","0 0 10 5 0 10"],[12],[13],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n"],[6,[37,13],[[30,[36,12],[[30,[36,12],[[32,7]],null]],null]],null,[["default"],[{"statements":[[6,[37,0],[[30,[36,9],[[32,2,["permission"]],"deny"],null]],null,[["default","else"],[{"statements":[[2,"    "],[10,"path"],[15,1,[30,[36,1],[[32,0,["guid"]],[32,2,["id"]]],null]],[15,"d",[30,[36,8],[[32,2,["dest"]]],[["src"],[[32,2,["src"]]]]]],[15,"marker-start",[30,[36,1],["url(#",[32,0,["guid"]],"-deny-dot)"],null]],[15,"marker-end",[30,[36,1],["url(#",[32,0,["guid"]],"-deny-arrow)"],null]],[15,"data-permission",[32,2,["permission"]]],[12],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"     "],[10,"path"],[15,1,[30,[36,1],[[32,0,["guid"]],[32,2,["id"]]],null]],[15,"d",[30,[36,8],[[32,2,["dest"]]],[["src"],[[32,2,["src"]]]]]],[15,"marker-start",[30,[36,1],["url(#",[32,0,["guid"]],"-allow-dot)"],null]],[15,"marker-end",[30,[36,1],["url(#",[32,0,["guid"]],"-allow-arrow)"],null]],[15,"data-permission",[32,2,["permission"]]],[12],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[2]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,13],[[30,[36,12],[[30,[36,12],[[32,8]],null]],null]],null,[["default"],[{"statements":[[6,[37,0],[[30,[36,7],[[30,[36,6],[[32,1,["Datacenter"]],""],null],[30,[36,5],[[30,[36,4],[[32,1,["Intention","Allowed"]]],null],[32,1,["Intention","HasPermissions"]]],null]],null]],null,[["default"],[{"statements":[[2,"    "],[8,"topology-metrics/popover",[],[["@type","@position","@item","@disabled","@oncreate"],[[30,[36,0],[[32,1,["Intention","HasPermissions"]],"l7","deny"],null],[30,[36,2],["id",[30,[36,1],[[32,0,["guid"]],[32,1,["Namespace"]],[32,1,["Name"]]],null],[32,0,["iconPositions"]]],null],[32,1],false,[30,[36,3],[[32,0],[32,4],[32,3],[32,1]],null]]],null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["if","concat","find-by","action","not","or","not-eq","and","svg-curve","eq","did-insert","did-update","-track-array","each","gt"]}',meta:{moduleName:"consul-ui/components/topology-metrics/up-lines/index.hbs"}})
+let d=(n=Ember._tracked,r=Ember.inject.service("dom"),a=Ember._action,l=class extends t.default{constructor(...e){super(...e),o(this,"iconPositions",s,this),o(this,"dom",i,this)}get guid(){return this.dom.guid(this)}getIconPositions(){const e=this.args.center,t=this.args.view,n=[...document.querySelectorAll("#upstream-lines path")]
+this.iconPositions=n.map(n=>{const r=parseFloat(n.getTotalLength()),a=n.getPointAtLength(Math.ceil(.666*r))
+return{id:n.id,x:Math.round(a.x-e.x),y:Math.round(a.y-t.y)}})}},s=u(l.prototype,"iconPositions",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i=u(l.prototype,"dom",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u(l.prototype,"getIconPositions",[a],Object.getOwnPropertyDescriptor(l.prototype,"getIconPositions"),l.prototype),l)
+e.default=d,Ember._setComponentTemplate(c,d)})),define("consul-ui/components/torii-iframe-placeholder",["exports","torii/components/torii-iframe-placeholder"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=t.default
+e.default=n})),define("consul-ui/components/yield-slot",["exports","block-slots/components/yield-slot"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/components/yield/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"TxsW/zUX",block:'{"symbols":["&default"],"statements":[[18,1,null],[2,"\\n"]],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/components/yield/index.hbs"}})
+var n=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=n})),define("consul-ui/controllers/application",["exports","consul-ui/utils/routing/transitionable"],(function(e,t){var n,r,a,l,s,i,o,u
+function c(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function d(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let m=(n=Ember.inject.service("router"),r=Ember.inject.service("store"),a=Ember.inject.service("feedback"),l=Ember._action,s=class extends Ember.Controller{constructor(...e){super(...e),c(this,"router",i,this),c(this,"store",o,this),c(this,"feedback",u,this)}reauthorize(e){this.feedback.execute(()=>{this.store.invalidate()
+const n={}
+if(e.data){const t=e.data
+if(void 0!==this.nspace){const e=Ember.get(t,"Namespace")||this.nspace.Name
+e!==this.nspace.Name&&(n.nspace=""+e)}}const r=Ember.getOwner(this),a=this.router.currentRoute.name,l=r.lookup("route:"+a)
+return r.lookup("route:application").refresh().promise.catch((function(){})).then(e=>a!==this.router.currentRouteName||void 0!==n.nspace?l.transitionTo(...(0,t.default)(this.router.currentRoute,n,r)):e)},e.type,(function(e){return e}),{})}},i=d(s.prototype,"router",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o=d(s.prototype,"store",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=d(s.prototype,"feedback",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d(s.prototype,"reauthorize",[l],Object.getOwnPropertyDescriptor(s.prototype,"reauthorize"),s.prototype),s)
+e.default=m})),define("consul-ui/controllers/dc/acls/policies/create",["exports","consul-ui/controllers/dc/acls/policies/edit"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{}e.default=n})),define("consul-ui/controllers/dc/acls/policies/edit",["exports"],(function(e){var t,n,r
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let a=(t=Ember.inject.service("form"),n=class extends Ember.Controller{constructor(...e){var t,n,a,l
+super(...e),t=this,n="builder",l=this,(a=r)&&Object.defineProperty(t,n,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(l):void 0})}init(){super.init(...arguments),this.form=this.builder.form("policy")}setProperties(e){super.setProperties(Object.keys(e).reduce((e,t)=>{switch(t){case"item":e[t]=this.form.setData(e[t]).getData()}return e},e))}},l=n.prototype,s="builder",i=[t],o={configurable:!0,enumerable:!0,writable:!0,initializer:null},c={},Object.keys(o).forEach((function(e){c[e]=o[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=i.slice().reverse().reduce((function(e,t){return t(l,s,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(l,s,c),c=null),r=c,n)
+var l,s,i,o,u,c
+e.default=a})),define("consul-ui/controllers/dc/acls/roles/create",["exports","consul-ui/controllers/dc/acls/roles/edit"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{}e.default=n})),define("consul-ui/controllers/dc/acls/roles/edit",["exports"],(function(e){var t,n,r
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let a=(t=Ember.inject.service("form"),n=class extends Ember.Controller{constructor(...e){var t,n,a,l
+super(...e),t=this,n="builder",l=this,(a=r)&&Object.defineProperty(t,n,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(l):void 0})}init(){super.init(...arguments),this.form=this.builder.form("role")}setProperties(e){super.setProperties(Object.keys(e).reduce((e,t)=>{switch(t){case"item":e[t]=this.form.setData(e[t]).getData()}return e},e))}},l=n.prototype,s="builder",i=[t],o={configurable:!0,enumerable:!0,writable:!0,initializer:null},c={},Object.keys(o).forEach((function(e){c[e]=o[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=i.slice().reverse().reduce((function(e,t){return t(l,s,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(l,s,c),c=null),r=c,n)
+var l,s,i,o,u,c
+e.default=a})),define("consul-ui/controllers/dc/acls/tokens/create",["exports","consul-ui/controllers/dc/acls/tokens/edit"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{}e.default=n})),define("consul-ui/controllers/dc/acls/tokens/edit",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Controller.extend({dom:Ember.inject.service("dom"),builder:Ember.inject.service("form"),isScoped:!1,init:function(){this._super(...arguments),this.form=this.builder.form("token")},setProperties:function(e){this._super(Object.keys(e).reduce((e,t)=>{switch(t){case"item":e[t]=this.form.setData(e[t]).getData()}return e},e))},actions:{change:function(e,t){const n=this.dom.normalizeEvent(e,t),r=this.form
+try{r.handleEvent(n)}catch(a){throw n.target.name,a}}}})
+e.default=t})),define("consul-ui/data-adapter",["exports","@ember-data/debug"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/decorators/data-source",["exports","wayfarer"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.match=e.default=void 0
+const n=(0,t.default)()
+e.default=e=>(t,r,a)=>(n.on(e,(function(e,n,r){const l=n.lookup("service:container").get(t)
+return t=>a.value.apply(l,[e,t,r])})),a)
+e.match=e=>n.match(e)})),define("consul-ui/decorators/replace",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.nullValue=e.replace=void 0
+const t=(e,t)=>(n,r,a)=>({get:function(){const n=a.get.apply(this,arguments)
+return n===e?t:n},set:function(){return a.set.apply(this,arguments)}})
+e.replace=t
+e.nullValue=function(e){return t(null,e)}
+var n=t
+e.default=n})),define("consul-ui/env",["exports","consul-ui/config/environment","consul-ui/utils/get-environment"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.env=void 0
+const r=(0,n.default)(t.default,window,document)
+e.env=r})),define("consul-ui/filter/predicates/auth-method",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={kind:{kubernetes:(e,t)=>e.Type===t,jwt:(e,t)=>e.Type===t,oidc:(e,t)=>e.Type===t},source:{local:(e,t)=>e.TokenLocality===t,global:(e,t)=>e.TokenLocality===t}}})),define("consul-ui/filter/predicates/health-check",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={status:{passing:(e,t)=>e.Status===t,warning:(e,t)=>e.Status===t,critical:(e,t)=>e.Status===t},kind:{service:(e,t)=>e.Kind===t,node:(e,t)=>e.Kind===t},check:{serf:(e,t)=>e.Type===t,script:(e,t)=>e.Type===t,http:(e,t)=>e.Type===t,tcp:(e,t)=>e.Type===t,ttl:(e,t)=>e.Type===t,docker:(e,t)=>e.Type===t,grpc:(e,t)=>e.Type===t,alias:(e,t)=>e.Type===t}}})),define("consul-ui/filter/predicates/intention",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={access:{allow:(e,t)=>e.Action===t,deny:(e,t)=>e.Action===t,"app-aware":e=>void 0===e.Action}}})),define("consul-ui/filter/predicates/kv",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={kind:{folder:e=>e.isFolder,key:e=>!e.isFolder}}})),define("consul-ui/filter/predicates/node",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={status:{passing:(e,t)=>e.Status===t,warning:(e,t)=>e.Status===t,critical:(e,t)=>e.Status===t}}})),define("consul-ui/filter/predicates/policy",["exports","mnemonist/set"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n={kind:{"global-management":e=>e.isGlobalManagement,standard:e=>!e.isGlobalManagement},datacenter:(e,n)=>void 0===e.Datacenters||t.default.intersectionSize(n,new Set(e.Datacenters))>0}
+e.default=n})),define("consul-ui/filter/predicates/service-instance",["exports","mnemonist/set"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n={status:{passing:(e,t)=>e.Status===t,warning:(e,t)=>e.Status===t,critical:(e,t)=>e.Status===t,empty:e=>0===e.ServiceChecks.length},source:(e,n)=>0!==t.default.intersectionSize(n,new Set(e.ExternalSources||[]))}
+e.default=n})),define("consul-ui/filter/predicates/service",["exports","mnemonist/set"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n={kind:{"ingress-gateway":(e,t)=>e.Kind===t,"terminating-gateway":(e,t)=>e.Kind===t,"mesh-gateway":(e,t)=>e.Kind===t,service:e=>!e.Kind,"in-mesh":e=>e.InMesh,"not-in-mesh":e=>!e.InMesh},status:{passing:(e,t)=>e.MeshStatus===t,warning:(e,t)=>e.MeshStatus===t,critical:(e,t)=>e.MeshStatus===t,empty:e=>0===e.MeshChecksTotal},instance:{registered:e=>e.InstanceCount>0,"not-registered":e=>0===e.InstanceCount},source:(e,n)=>0!==t.default.intersectionSize(n,new Set(e.ExternalSources||[]))||n.includes(e.Partition)}
+e.default=n})),define("consul-ui/filter/predicates/token",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={kind:{"global-management":e=>e.isGlobalManagement,global:e=>!e.Local,local:e=>e.Local}}}))
+define("consul-ui/flash/object",["exports","ember-cli-flash/flash/object"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/formats",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={time:{hhmmss:{hour:"numeric",minute:"numeric",second:"numeric"}},date:{hhmmss:{hour:"numeric",minute:"numeric",second:"numeric"}},number:{compact:{notation:"compact"},EUR:{style:"currency",currency:"EUR",minimumFractionDigits:2,maximumFractionDigits:2},USD:{style:"currency",currency:"USD",minimumFractionDigits:2,maximumFractionDigits:2}}}})),define("consul-ui/forms/intention",["exports","consul-ui/validations/intention","consul-ui/utils/form/builder"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n="",a=t.default,l=r){return l(n,{}).setValidators(a)}
+const r=(0,n.default)()})),define("consul-ui/forms/kv",["exports","consul-ui/validations/kv","consul-ui/utils/form/builder"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n="",a=t.default,l=r){return l(n,{}).setValidators(a)}
+const r=(0,n.default)()})),define("consul-ui/forms/policy",["exports","consul-ui/validations/policy","consul-ui/utils/form/builder"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n="policy",a=t.default,l=r){return l(n,{Datacenters:{type:"array"}}).setValidators(a)}
+const r=(0,n.default)()})),define("consul-ui/forms/role",["exports","consul-ui/validations/role","consul-ui/utils/form/builder"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n="role",a=t.default,l=r){return l(n,{}).setValidators(a).add(e.form("policy"))}
+const r=(0,n.default)()})),define("consul-ui/forms/token",["exports","consul-ui/validations/token","consul-ui/utils/form/builder"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n="",a=t.default,l=r){return l(n,{}).setValidators(a).add(e.form("policy")).add(e.form("role"))}
+const r=(0,n.default)()})),define("consul-ui/helpers/-element",["exports","ember-element-helper/helpers/-element"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/-has-block-params",["exports","ember-named-blocks-polyfill/helpers/-has-block-params"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/-has-block",["exports","ember-named-blocks-polyfill/helpers/-has-block"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/-is-named-block-invocation",["exports","ember-named-blocks-polyfill/helpers/-is-named-block-invocation"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/-named-block-invocation",["exports","ember-named-blocks-polyfill/helpers/-named-block-invocation"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/abs",["exports","ember-math-helpers/helpers/abs"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"abs",{enumerable:!0,get:function(){return t.abs}})})),define("consul-ui/helpers/acos",["exports","ember-math-helpers/helpers/acos"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"acos",{enumerable:!0,get:function(){return t.acos}})})),define("consul-ui/helpers/acosh",["exports","ember-math-helpers/helpers/acosh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"acosh",{enumerable:!0,get:function(){return t.acosh}})})),define("consul-ui/helpers/add",["exports","ember-math-helpers/helpers/add"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"add",{enumerable:!0,get:function(){return t.add}})})),define("consul-ui/helpers/adopt-styles",["exports","@lit/reactive-element"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends Ember.Helper{compute([e,n],r){Array.isArray(n)||(n=[n]),(0,t.adoptStyles)(e,n)}}e.default=n})),define("consul-ui/helpers/and",["exports","ember-truth-helpers/helpers/and"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"and",{enumerable:!0,get:function(){return t.and}})})),define("consul-ui/helpers/app-version",["exports","consul-ui/config/environment","ember-cli-app-version/utils/regexp"],(function(e,t,n){function r(e,r={}){const a=t.default.APP.version
+let l=r.versionOnly||r.hideSha,s=r.shaOnly||r.hideVersion,i=null
+return l&&(r.showExtended&&(i=a.match(n.versionExtendedRegExp)),i||(i=a.match(n.versionRegExp))),s&&(i=a.match(n.shaRegExp)),i?i[0]:a}Object.defineProperty(e,"__esModule",{value:!0}),e.appVersion=r,e.default=void 0
+var a=Ember.Helper.helper(r)
+e.default=a})),define("consul-ui/helpers/append",["exports","ember-composable-helpers/helpers/append"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"append",{enumerable:!0,get:function(){return t.append}})})),define("consul-ui/helpers/array-concat",["exports","ember-array-fns/helpers/array-concat"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayConcat",{enumerable:!0,get:function(){return t.arrayConcat}})})),define("consul-ui/helpers/array-every",["exports","ember-array-fns/helpers/array-every"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayEvery",{enumerable:!0,get:function(){return t.arrayEvery}})})),define("consul-ui/helpers/array-filter",["exports","ember-array-fns/helpers/array-filter"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayFilter",{enumerable:!0,get:function(){return t.arrayFilter}})})),define("consul-ui/helpers/array-find-index",["exports","ember-array-fns/helpers/array-find-index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayFindIndex",{enumerable:!0,get:function(){return t.arrayFindIndex}})})),define("consul-ui/helpers/array-find",["exports","ember-array-fns/helpers/array-find"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayFind",{enumerable:!0,get:function(){return t.arrayFind}})})),define("consul-ui/helpers/array-includes",["exports","ember-array-fns/helpers/array-includes"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayIncludes",{enumerable:!0,get:function(){return t.arrayIncludes}})})),define("consul-ui/helpers/array-index-of",["exports","ember-array-fns/helpers/array-index-of"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayIndexOf",{enumerable:!0,get:function(){return t.arrayIndexOf}})})),define("consul-ui/helpers/array-is-array",["exports","ember-array-fns/helpers/array-is-array"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayIsArray",{enumerable:!0,get:function(){return t.arrayIsArray}})})),define("consul-ui/helpers/array-is-first-element",["exports","ember-array-fns/helpers/array-is-first-element"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayIsFirstElement",{enumerable:!0,get:function(){return t.arrayIsFirstElement}})})),define("consul-ui/helpers/array-is-last-element",["exports","ember-array-fns/helpers/array-is-last-element"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayIsLastElement",{enumerable:!0,get:function(){return t.arrayIsLastElement}})}))
+define("consul-ui/helpers/array-join",["exports","ember-array-fns/helpers/array-join"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayJoin",{enumerable:!0,get:function(){return t.arrayJoin}})})),define("consul-ui/helpers/array-last-index-of",["exports","ember-array-fns/helpers/array-last-index-of"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayLastIndexOf",{enumerable:!0,get:function(){return t.arrayLastIndexOf}})})),define("consul-ui/helpers/array-map",["exports","ember-array-fns/helpers/array-map"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayMap",{enumerable:!0,get:function(){return t.arrayMap}})})),define("consul-ui/helpers/array-reduce",["exports","ember-array-fns/helpers/array-reduce"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayReduce",{enumerable:!0,get:function(){return t.arrayReduce}})})),define("consul-ui/helpers/array-reverse",["exports","ember-array-fns/helpers/array-reverse"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arrayReverse",{enumerable:!0,get:function(){return t.arrayReverse}})})),define("consul-ui/helpers/array-slice",["exports","ember-array-fns/helpers/array-slice"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arraySlice",{enumerable:!0,get:function(){return t.arraySlice}})})),define("consul-ui/helpers/array-some",["exports","ember-array-fns/helpers/array-some"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arraySome",{enumerable:!0,get:function(){return t.arraySome}})})),define("consul-ui/helpers/array-sort",["exports","ember-array-fns/helpers/array-sort"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arraySort",{enumerable:!0,get:function(){return t.arraySort}})})),define("consul-ui/helpers/array-splice",["exports","ember-array-fns/helpers/array-splice"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"arraySplice",{enumerable:!0,get:function(){return t.arraySplice}})})),define("consul-ui/helpers/asin",["exports","ember-math-helpers/helpers/asin"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"asin",{enumerable:!0,get:function(){return t.asin}})})),define("consul-ui/helpers/asinh",["exports","ember-math-helpers/helpers/asinh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"asinh",{enumerable:!0,get:function(){return t.asinh}})})),define("consul-ui/helpers/assign",["exports","ember-assign-helper/helpers/assign"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"assign",{enumerable:!0,get:function(){return t.assign}})})),define("consul-ui/helpers/atan",["exports","ember-math-helpers/helpers/atan"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"atan",{enumerable:!0,get:function(){return t.atan}})})),define("consul-ui/helpers/atan2",["exports","ember-math-helpers/helpers/atan2"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"atan2",{enumerable:!0,get:function(){return t.atan2}})})),define("consul-ui/helpers/atanh",["exports","ember-math-helpers/helpers/atanh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"atanh",{enumerable:!0,get:function(){return t.atanh}})})),define("consul-ui/helpers/atob",["exports","consul-ui/utils/atob"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.Helper.helper((function([e=""]){return(0,t.default)(e)}))
+e.default=n})),define("consul-ui/helpers/block-params",["exports","block-slots/helpers/block-params"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/cached-model",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class t extends Ember.Helper{compute([e,t],n){return Ember.getOwner(this).lookup("service:repository/"+e).cached(t)}}e.default=t})),define("consul-ui/helpers/camelize",["exports","ember-cli-string-helpers/helpers/camelize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"camelize",{enumerable:!0,get:function(){return t.camelize}})})),define("consul-ui/helpers/can",["exports","ember-can/helpers/can"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{_addAbilityObserver(e,t){this.isDestroyed||this.isDestroying||super._addAbilityObserver(...arguments)}}e.default=n})),define("consul-ui/helpers/cancel-all",["exports","ember-concurrency/helpers/cancel-all"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/cannot",["exports","ember-can/helpers/cannot"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/capitalize",["exports","ember-cli-string-helpers/helpers/capitalize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"capitalize",{enumerable:!0,get:function(){return t.capitalize}})})),define("consul-ui/helpers/cbrt",["exports","ember-math-helpers/helpers/cbrt"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"cbrt",{enumerable:!0,get:function(){return t.cbrt}})})),define("consul-ui/helpers/ceil",["exports","ember-math-helpers/helpers/ceil"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"ceil",{enumerable:!0,get:function(){return t.ceil}})})),define("consul-ui/helpers/changeset-get",["exports","ember-changeset/helpers/changeset-get"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/changeset-set",["exports","ember-changeset/helpers/changeset-set"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"changesetSet",{enumerable:!0,get:function(){return t.changesetSet}})})),define("consul-ui/helpers/changeset",["exports","ember-changeset-validations/helpers/changeset"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"changeset",{enumerable:!0,get:function(){return t.changeset}})})),define("consul-ui/helpers/chunk",["exports","ember-composable-helpers/helpers/chunk"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"chunk",{enumerable:!0,get:function(){return t.chunk}})})),define("consul-ui/helpers/class-map",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper(e=>{const t=e.filter(Boolean).filter(e=>"string"==typeof e||e[e.length-1]).map(e=>"string"==typeof e?e:e[0]).join(" ")
+return t.length>0?t:void 0})
+e.default=t}))
+define("consul-ui/helpers/classify",["exports","ember-cli-string-helpers/helpers/classify"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"classify",{enumerable:!0,get:function(){return t.classify}})})),define("consul-ui/helpers/clz32",["exports","ember-math-helpers/helpers/clz32"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"clz32",{enumerable:!0,get:function(){return t.clz32}})})),define("consul-ui/helpers/collection",["exports","consul-ui/models/service","consul-ui/models/service-instance"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r={service:t.Collection,"service-instance":n.Collection}
+class a{}class l extends Ember.Helper{compute([e,t],n){if(e.length>0){const t=Ember.get(e,"firstObject")._internalModel.modelName
+return new(0,r[t])(e)}return new a}}e.default=l})),define("consul-ui/helpers/compact",["exports","ember-composable-helpers/helpers/compact"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/compute",["exports","ember-composable-helpers/helpers/compute"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"compute",{enumerable:!0,get:function(){return t.compute}})})),define("consul-ui/helpers/contains",["exports","ember-composable-helpers/helpers/contains"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"contains",{enumerable:!0,get:function(){return t.contains}})})),define("consul-ui/helpers/cos",["exports","ember-math-helpers/helpers/cos"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"cos",{enumerable:!0,get:function(){return t.cos}})})),define("consul-ui/helpers/cosh",["exports","ember-math-helpers/helpers/cosh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"cosh",{enumerable:!0,get:function(){return t.cosh}})})),define("consul-ui/helpers/css-map",["exports","@lit/reactive-element"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.Helper.helper(e=>e.filter(e=>e instanceof t.CSSResult||e[e.length-1]).map(e=>e instanceof t.CSSResult?e:e[0]))
+e.default=n})),define("consul-ui/helpers/css",["exports","@lit/reactive-element"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends Ember.Helper{compute([e],n){return(0,t.css)([e])}}e.default=n})),define("consul-ui/helpers/dasherize",["exports","ember-cli-string-helpers/helpers/dasherize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"dasherize",{enumerable:!0,get:function(){return t.dasherize}})})),define("consul-ui/helpers/dec",["exports","ember-composable-helpers/helpers/dec"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"dec",{enumerable:!0,get:function(){return t.dec}})})),define("consul-ui/helpers/did-insert",["exports","ember-render-helpers/helpers/did-insert"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/did-update",["exports","ember-render-helpers/helpers/did-update"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/div",["exports","ember-math-helpers/helpers/div"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"div",{enumerable:!0,get:function(){return t.div}})})),define("consul-ui/helpers/document-attrs",["exports","mnemonist/multi-map"],(function(e,t){var n,r,a
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const l=new Map,s=new WeakMap
+let i=(n=Ember.inject.service("-document"),r=class extends Ember.Helper{constructor(...e){var t,n,r,l
+super(...e),t=this,n="document",l=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(l):void 0})}compute(e,t){this.synchronize(this.document.documentElement,t)}willDestroy(){this.synchronize(this.document.documentElement),s.delete(this)}synchronize(e,n){const r=s.get(this)
+return r&&Object.entries(r).forEach(([e,t])=>{let n=l.get(e)
+void 0!==n&&[...new Set(t.split(" "))].map(e=>n.remove(e,this))}),n&&(s.set(this,n),[...Object.entries(n)].forEach(([e,n])=>{let r=l.get(e)
+void 0===r&&(r=new t.default(Set),l.set(e,r)),[...new Set(n.split(" "))].map(e=>{0===r.count(e)&&r.set(e,null),r.set(e,this)})})),[...l.entries()].forEach(([t,n])=>{let r="attr"
+"class"===t?r=t:t.startsWith("data-")&&(r="data"),[...n.keys()].forEach(a=>{if(1===n.count(a)){switch(r){case"class":e.classList.remove(a)}n.delete(a),0===n.size&&l.delete(t)}else switch(r){case"class":e.classList.add(a)}})}),l}},o=r.prototype,u="document",c=[n],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(d).forEach((function(e){p[e]=d[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=c.slice().reverse().reduce((function(e,t){return t(o,u,e)||e}),p),m&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(m):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(o,u,p),p=null),a=p,r)
+var o,u,c,d,m,p
+e.default=i})),define("consul-ui/helpers/dom-position",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class t extends Ember.Helper{compute([e],{from:t,offset:n=!1}){return r=>{if("function"==typeof e){let a,l
+if(n)l=r.currentTarget,a={width:l.offsetWidth,left:l.offsetLeft,height:l.offsetHeight,top:l.offsetTop}
+else if(l=r.target,a=l.getBoundingClientRect(),void 0!==t){const e=t.getBoundingClientRect()
+a.x=a.x-e.x,a.y=a.y-e.y}return e(a)}{const t=r.target,n=t.getBoundingClientRect()
+e.forEach(([e,r])=>{t.style[r]=n[e]+"px"})}}}}e.default=t})),define("consul-ui/helpers/drop",["exports","ember-composable-helpers/helpers/drop"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/duration-from",["exports"],(function(e){var t,n,r
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let a=(t=Ember.inject.service("temporal"),n=class extends Ember.Helper{constructor(...e){var t,n,a,l
+super(...e),t=this,n="temporal",l=this,(a=r)&&Object.defineProperty(t,n,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(l):void 0})}compute([e],t){return this.temporal.durationFrom(e)}},l=n.prototype,s="temporal",i=[t],o={configurable:!0,enumerable:!0,writable:!0,initializer:null},c={},Object.keys(o).forEach((function(e){c[e]=o[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=i.slice().reverse().reduce((function(e,t){return t(l,s,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(l,s,c),c=null),r=c,n)
+var l,s,i,o,u,c
+e.default=a})),define("consul-ui/helpers/element",["exports","ember-element-helper/helpers/element"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/ember-power-select-is-group",["exports","ember-power-select/helpers/ember-power-select-is-group"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"emberPowerSelectIsGroup",{enumerable:!0,get:function(){return t.emberPowerSelectIsGroup}})})),define("consul-ui/helpers/ember-power-select-is-selected",["exports","ember-power-select/helpers/ember-power-select-is-selected"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"emberPowerSelectIsSelected",{enumerable:!0,get:function(){return t.emberPowerSelectIsSelected}})})),define("consul-ui/helpers/ensure-safe-component",["exports","@embroider/util"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.EnsureSafeComponentHelper}})})),define("consul-ui/helpers/entries",["exports","ember-composable-helpers/helpers/entries"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"entries",{enumerable:!0,get:function(){return t.entries}})})),define("consul-ui/helpers/env",["exports"],(function(e){var t,n,r
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let a=(t=Ember.inject.service("env"),n=class extends Ember.Helper{constructor(...e){var t,n,a,l
+super(...e),t=this,n="env",l=this,(a=r)&&Object.defineProperty(t,n,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(l):void 0})}compute([e,t=""],n){const r=this.env.var(e)
+return null!=r?r:t}},l=n.prototype,s="env",i=[t],o={configurable:!0,enumerable:!0,writable:!0,initializer:null},c={},Object.keys(o).forEach((function(e){c[e]=o[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=i.slice().reverse().reduce((function(e,t){return t(l,s,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(l,s,c),c=null),r=c,n)
+var l,s,i,o,u,c
+e.default=a})),define("consul-ui/helpers/eq",["exports","ember-truth-helpers/helpers/equal"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"equal",{enumerable:!0,get:function(){return t.equal}})})),define("consul-ui/helpers/exp",["exports","ember-math-helpers/helpers/exp"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"exp",{enumerable:!0,get:function(){return t.exp}})})),define("consul-ui/helpers/expm1",["exports","ember-math-helpers/helpers/expm1"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"expm1",{enumerable:!0,get:function(){return t.expm1}})})),define("consul-ui/helpers/filter-by",["exports","ember-composable-helpers/helpers/filter-by"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/filter",["exports","ember-composable-helpers/helpers/filter"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
+define("consul-ui/helpers/find-by",["exports","ember-composable-helpers/helpers/find-by"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/fixed-grid-layout",["exports","ember-collection/layouts/grid"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.Helper.helper((function(e){return new t.default(e[0],e[1])}))
+e.default=n})),define("consul-ui/helpers/flatten-property",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function e([t,n],r){const a=r.pages||[]
+return a.push(...t.pages),t.children.forEach(t=>e([t],{pages:a})),a}))
+e.default=t})),define("consul-ui/helpers/flatten",["exports","ember-composable-helpers/helpers/flatten"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"flatten",{enumerable:!0,get:function(){return t.flatten}})})),define("consul-ui/helpers/floor",["exports","ember-math-helpers/helpers/floor"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"floor",{enumerable:!0,get:function(){return t.floor}})})),define("consul-ui/helpers/format-date",["exports","ember-intl/helpers/format-date"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/format-message",["exports","ember-intl/helpers/format-message"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/format-number",["exports","ember-intl/helpers/format-number"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/format-relative",["exports","ember-intl/helpers/format-relative"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/format-short-time",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function([e]){let t,n,r,a
+a=Math.floor(e/1e3),r=Math.floor(a/60),a%=60,n=Math.floor(r/60),r%=60,t=Math.floor(n/24),n%=24
+const l=t,s=n,i=r,o=a
+switch(!0){case 0!==l:return l+"d"
+case 0!==s:return s+"h"
+case 0!==i:return i+"m"
+default:return o+"s"}}))
+e.default=t})),define("consul-ui/helpers/format-time",["exports","ember-intl/helpers/format-time"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/from-entries",["exports","ember-composable-helpers/helpers/from-entries"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"fromEntries",{enumerable:!0,get:function(){return t.fromEntries}})})),define("consul-ui/helpers/fround",["exports","ember-math-helpers/helpers/fround"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"fround",{enumerable:!0,get:function(){return t.fround}})})),define("consul-ui/helpers/gcd",["exports","ember-math-helpers/helpers/gcd"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"gcd",{enumerable:!0,get:function(){return t.gcd}})})),define("consul-ui/helpers/group-by",["exports","ember-composable-helpers/helpers/group-by"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/gt",["exports","ember-truth-helpers/helpers/gt"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"gt",{enumerable:!0,get:function(){return t.gt}})})),define("consul-ui/helpers/gte",["exports","ember-truth-helpers/helpers/gte"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"gte",{enumerable:!0,get:function(){return t.gte}})})),define("consul-ui/helpers/has-next",["exports","ember-composable-helpers/helpers/has-next"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"hasNext",{enumerable:!0,get:function(){return t.hasNext}})})),define("consul-ui/helpers/has-previous",["exports","ember-composable-helpers/helpers/has-previous"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"hasPrevious",{enumerable:!0,get:function(){return t.hasPrevious}})})),define("consul-ui/helpers/href-to",["exports","consul-ui/utils/routing/transitionable","consul-ui/utils/routing/wildcard","consul-ui/router"],(function(e,t,n,r){var a,l,s,i
+function o(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.hrefTo=void 0
+const u=(0,n.default)(r.routes),c=function(e,n,r={}){const a=e.lookup("router:main").location,l=e.lookup("service:router")
+let s=n.slice(0),i=s.shift(),o=r.params||{}
+"."===i&&(s=(0,t.default)(l.currentRoute,o,e),i=s.shift())
+try{return u(i)&&(s=s.map(e=>e.split("/").map(encodeURIComponent).join("/"))),a.hrefTo(i,s,o)}catch(c){throw c.constructor===Error&&(c.message=`${c.message} For "${n[0]}:${JSON.stringify(n.slice(1))}"`),c}}
+e.hrefTo=c
+let d=(a=Ember.inject.service("router"),l=Ember._action,s=class extends Ember.Helper{constructor(...e){var t,n,r,a
+super(...e),t=this,n="router",a=this,(r=i)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}init(){super.init(...arguments),this.router.on("routeWillChange",this.routeWillChange)}compute(e,t){return c(Ember.getOwner(this),e,t)}routeWillChange(e){this.recompute()}willDestroy(){this.router.off("routeWillChange",this.routeWillChange),super.willDestroy()}},i=o(s.prototype,"router",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o(s.prototype,"routeWillChange",[l],Object.getOwnPropertyDescriptor(s.prototype,"routeWillChange"),s.prototype),s)
+e.default=d})),define("consul-ui/helpers/html-safe",["exports","ember-cli-string-helpers/helpers/html-safe"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"htmlSafe",{enumerable:!0,get:function(){return t.htmlSafe}})})),define("consul-ui/helpers/humanize",["exports","ember-cli-string-helpers/helpers/humanize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"humanize",{enumerable:!0,get:function(){return t.humanize}})})),define("consul-ui/helpers/hypot",["exports","ember-math-helpers/helpers/hypot"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"hypot",{enumerable:!0,get:function(){return t.hypot}})})),define("consul-ui/helpers/imul",["exports","ember-math-helpers/helpers/imul"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"imul",{enumerable:!0,get:function(){return t.imul}})})),define("consul-ui/helpers/inc",["exports","ember-composable-helpers/helpers/inc"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"inc",{enumerable:!0,get:function(){return t.inc}})})),define("consul-ui/helpers/intersect",["exports","ember-composable-helpers/helpers/intersect"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/invoke",["exports","ember-composable-helpers/helpers/invoke"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"invoke",{enumerable:!0,get:function(){return t.invoke}})})),define("consul-ui/helpers/is-active",["exports","ember-router-helpers/helpers/is-active"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"isActive",{enumerable:!0,get:function(){return t.isActive}})})),define("consul-ui/helpers/is-array",["exports","ember-truth-helpers/helpers/is-array"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"isArray",{enumerable:!0,get:function(){return t.isArray}})})),define("consul-ui/helpers/is-empty",["exports","ember-truth-helpers/helpers/is-empty"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
+define("consul-ui/helpers/is-equal",["exports","ember-truth-helpers/helpers/is-equal"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"isEqual",{enumerable:!0,get:function(){return t.isEqual}})})),define("consul-ui/helpers/is-href",["exports"],(function(e){var t,n,r,a
+function l(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let s=(t=Ember.inject.service("router"),n=Ember._action,r=class extends Ember.Helper{constructor(...e){var t,n,r,l
+super(...e),t=this,n="router",l=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(l):void 0})}init(){super.init(...arguments),this.router.on("routeWillChange",this.routeWillChange)}compute([e,...t]){return this.router.currentRouteName.startsWith("nspace.")&&e.startsWith("dc.")&&(e="nspace."+e),void 0!==this.next&&"loading"!==this.next?this.next.startsWith(e):this.router.isActive(e,...t)}routeWillChange(e){this.next=e.to.name.replace(".index",""),this.recompute()}willDestroy(){this.router.off("routeWillChange",this.routeWillChange),super.willDestroy()}},a=l(r.prototype,"router",[t],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),l(r.prototype,"routeWillChange",[n],Object.getOwnPropertyDescriptor(r.prototype,"routeWillChange"),r.prototype),r)
+e.default=s})),define("consul-ui/helpers/is",["exports","ember-can/helpers/can"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.is=void 0
+const n=(e,[t,n],r)=>{let{abilityName:a,propertyName:l}=e.abilities.parse(t),s=e.abilities.abilityFor(a,n,r)
+return l="function"==typeof s.getCharacteristicProperty?s.getCharacteristicProperty(l):Ember.String.camelize("is-"+l),e._removeAbilityObserver(),e._addAbilityObserver(s,l),Ember.get(s,l)}
+e.is=n
+class r extends t.default{compute([e,t],r){return n(this,[e,t],r)}}e.default=r})),define("consul-ui/helpers/join",["exports","ember-composable-helpers/helpers/join"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/json-stringify",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function(e){try{return JSON.stringify(...e)}catch(t){return e[0].map(t=>JSON.stringify(t,e[1],e[2]))}}))
+e.default=t})),define("consul-ui/helpers/keys",["exports","ember-composable-helpers/helpers/keys"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"keys",{enumerable:!0,get:function(){return t.keys}})})),define("consul-ui/helpers/last",["exports"],(function(e){function t([e=""]){switch(!0){case"string"==typeof e:return e.substr(-1)}}Object.defineProperty(e,"__esModule",{value:!0}),e.last=t,e.default=void 0
+var n=Ember.Helper.helper(t)
+e.default=n})),define("consul-ui/helpers/lcm",["exports","ember-math-helpers/helpers/lcm"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"lcm",{enumerable:!0,get:function(){return t.lcm}})})),define("consul-ui/helpers/left-trim",["exports","consul-ui/utils/left-trim"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.Helper.helper((function([e="",n=""]){return(0,t.default)(e,n)}))
+e.default=n})),define("consul-ui/helpers/log-e",["exports","ember-math-helpers/helpers/log-e"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"logE",{enumerable:!0,get:function(){return t.logE}})})),define("consul-ui/helpers/log10",["exports","ember-math-helpers/helpers/log10"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"log10",{enumerable:!0,get:function(){return t.log10}})})),define("consul-ui/helpers/log1p",["exports","ember-math-helpers/helpers/log1p"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"log1p",{enumerable:!0,get:function(){return t.log1p}})})),define("consul-ui/helpers/log2",["exports","ember-math-helpers/helpers/log2"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"log2",{enumerable:!0,get:function(){return t.log2}})})),define("consul-ui/helpers/lowercase",["exports","ember-cli-string-helpers/helpers/lowercase"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"lowercase",{enumerable:!0,get:function(){return t.lowercase}})})),define("consul-ui/helpers/lt",["exports","ember-truth-helpers/helpers/lt"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"lt",{enumerable:!0,get:function(){return t.lt}})})),define("consul-ui/helpers/lte",["exports","ember-truth-helpers/helpers/lte"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"lte",{enumerable:!0,get:function(){return t.lte}})})),define("consul-ui/helpers/map-by",["exports","ember-composable-helpers/helpers/map-by"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/map",["exports","ember-composable-helpers/helpers/map"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/max",["exports","ember-math-helpers/helpers/max"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"max",{enumerable:!0,get:function(){return t.max}})})),define("consul-ui/helpers/merge-checks",["exports","consul-ui/utils/merge-checks"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.Helper.helper((function([e,n]){return(0,t.default)(e,n)}))
+e.default=n})),define("consul-ui/helpers/min",["exports","ember-math-helpers/helpers/min"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"min",{enumerable:!0,get:function(){return t.min}})})),define("consul-ui/helpers/mixed-grid-layout",["exports","ember-collection/layouts/mixed-grid"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.Helper.helper((function(e){return new t.default(e[0])}))
+e.default=n})),define("consul-ui/helpers/mod",["exports","ember-math-helpers/helpers/mod"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"mod",{enumerable:!0,get:function(){return t.mod}})})),define("consul-ui/helpers/mult",["exports","ember-math-helpers/helpers/mult"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"mult",{enumerable:!0,get:function(){return t.mult}})})),define("consul-ui/helpers/next",["exports","ember-composable-helpers/helpers/next"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"next",{enumerable:!0,get:function(){return t.next}})})),define("consul-ui/helpers/noop",["exports","ember-composable-helpers/helpers/noop"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"noop",{enumerable:!0,get:function(){return t.noop}})})),define("consul-ui/helpers/not-eq",["exports","ember-truth-helpers/helpers/not-equal"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"notEqualHelper",{enumerable:!0,get:function(){return t.notEqualHelper}})})),define("consul-ui/helpers/not",["exports","ember-truth-helpers/helpers/not"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"not",{enumerable:!0,get:function(){return t.not}})})),define("consul-ui/helpers/object-at",["exports","ember-composable-helpers/helpers/object-at"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"objectAt",{enumerable:!0,get:function(){return t.objectAt}})})),define("consul-ui/helpers/on-document",["exports","ember-on-helper/helpers/on-document"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
+define("consul-ui/helpers/on-window",["exports","ember-on-helper/helpers/on-window"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/on",["exports","ember-on-helper/helpers/on"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/optional",["exports","ember-composable-helpers/helpers/optional"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"optional",{enumerable:!0,get:function(){return t.optional}})})),define("consul-ui/helpers/or",["exports","ember-truth-helpers/helpers/or"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"or",{enumerable:!0,get:function(){return t.or}})})),define("consul-ui/helpers/page-title",["exports","ember-page-title/helpers/page-title"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=t.default
+e.default=n})),define("consul-ui/helpers/percentage-columns-layout",["exports","ember-collection/layouts/percentage-columns"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.Helper.helper((function(e){return new t.default(e[0],e[1],e[2])}))
+e.default=n})),define("consul-ui/helpers/percentage-of",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function([e,t]){const n=e/t*100
+return isNaN(n)?0:n.toFixed(2)}))
+e.default=t})),define("consul-ui/helpers/perform",["exports","ember-concurrency/helpers/perform"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/pipe-action",["exports","ember-composable-helpers/helpers/pipe-action"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/pipe",["exports","ember-composable-helpers/helpers/pipe"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"pipe",{enumerable:!0,get:function(){return t.pipe}})})),define("consul-ui/helpers/pluralize",["exports","ember-inflector/lib/helpers/pluralize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=t.default
+e.default=n})),define("consul-ui/helpers/policy/datacenters",["exports"],(function(e){function t(e,t={}){const n=Ember.get(e[0],"Datacenters")
+return Array.isArray(n)&&0!==n.length?Ember.get(e[0],"Datacenters"):[t.global||"All"]}Object.defineProperty(e,"__esModule",{value:!0}),e.datacenters=t,e.default=void 0
+var n=Ember.Helper.helper(t)
+e.default=n})),define("consul-ui/helpers/policy/group",["exports","consul-ui/models/policy"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.Helper.helper((function([e]){return e.reduce((function(e,n){let r
+switch(!0){case Ember.get(n,"ID")===t.MANAGEMENT_ID:r="management"
+break
+case""!==Ember.get(n,"template"):r="identities"
+break
+default:r="policies"}return e[r].push(n),e}),{management:[],identities:[],policies:[]})}))
+e.default=n})),define("consul-ui/helpers/policy/typeof",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.typeOf=t,e.default=void 0
+function t(e){const t=e[0],n=Ember.get(t,"template")
+switch(!0){case void 0===n:return"role"
+case"service-identity"===n:return"policy-service-identity"
+case"node-identity"===n:return"policy-node-identity"
+case"00000000-0000-0000-0000-000000000001"===Ember.get(t,"ID"):return"policy-management"
+default:return"policy"}}var n=Ember.Helper.helper(t)
+e.default=n})),define("consul-ui/helpers/pow",["exports","ember-math-helpers/helpers/pow"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"pow",{enumerable:!0,get:function(){return t.pow}})})),define("consul-ui/helpers/previous",["exports","ember-composable-helpers/helpers/previous"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"previous",{enumerable:!0,get:function(){return t.previous}})})),define("consul-ui/helpers/queue",["exports","ember-composable-helpers/helpers/queue"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"queue",{enumerable:!0,get:function(){return t.queue}})})),define("consul-ui/helpers/random",["exports","ember-math-helpers/helpers/random"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"random",{enumerable:!0,get:function(){return t.random}})})),define("consul-ui/helpers/range",["exports","ember-composable-helpers/helpers/range"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"range",{enumerable:!0,get:function(){return t.range}})})),define("consul-ui/helpers/reduce",["exports","ember-composable-helpers/helpers/reduce"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/refresh-route",["exports"],(function(e){var t,n,r
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let a=(t=Ember.inject.service("router"),n=class extends Ember.Helper{constructor(...e){var t,n,a,l
+super(...e),t=this,n="router",l=this,(a=r)&&Object.defineProperty(t,n,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(l):void 0})}compute(e,t){return()=>{const e=Ember.getOwner(this),t=this.router.currentRoute.name
+return e.lookup("route:"+t).refresh()}}},l=n.prototype,s="router",i=[t],o={configurable:!0,enumerable:!0,writable:!0,initializer:null},c={},Object.keys(o).forEach((function(e){c[e]=o[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=i.slice().reverse().reduce((function(e,t){return t(l,s,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(l,s,c),c=null),r=c,n)
+var l,s,i,o,u,c
+e.default=a})),define("consul-ui/helpers/reject-by",["exports","ember-composable-helpers/helpers/reject-by"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/render-template",["exports"],(function(e){var t,n,r
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const a=/{{([A-Za-z.0-9_-]+)}}/g
+let l,s=(t=Ember.inject.service("encoder"),n=class extends Ember.Helper{constructor(){var e,t,n,s
+super(...arguments),e=this,t="encoder",s=this,(n=r)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(s):void 0}),"function"!=typeof l&&(l=this.encoder.createRegExpEncoder(a,encodeURIComponent,!1))}compute([e,t]){return l(e,t)}},i=n.prototype,o="encoder",u=[t],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),r=m,n)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/helpers/repeat",["exports","ember-composable-helpers/helpers/repeat"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"repeat",{enumerable:!0,get:function(){return t.repeat}})})),define("consul-ui/helpers/require",["exports","@lit/reactive-element","consul-ui/utils/path/resolve","consul-ui/components/panel/index.css","consul-ui/components/distribution-meter/index.css","consul-ui/components/distribution-meter/meter/index.css","consul-ui/components/distribution-meter/meter/element","consul-ui/styles/base/decoration/visually-hidden.css","consul-ui/styles/base/icons/base-keyframes.css","consul-ui/styles/base/icons/icons/chevron-down/index.css"],(function(e,t,n,r,a,l,s,i,o,u){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const c={"/components/panel/index.css":r.default,"/components/distribution-meter/index.css":a.default,"/components/distribution-meter/meter/index.css":l.default,"/components/distribution-meter/meter/element":s.default,"/styles/base/decoration/visually-hidden.css":i.default,"/styles/base/icons/base-keyframes.css":o.default,"/styles/base/icons/icons/chevron-down/index.css":u.default},d=new Map
+var m=Ember.Helper.helper(([e=""],{from:r})=>{const a=(0,n.default)(r,e)
+switch(!0){case a.endsWith(".css"):return c[a](t.css)
+default:{if(d.has(a))return d.get(a)
+const e=c[a](HTMLElement)
+return d.set(a,e),e}}})
+e.default=m})),define("consul-ui/helpers/reverse",["exports","ember-composable-helpers/helpers/reverse"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/right-trim",["exports","consul-ui/utils/right-trim"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.Helper.helper((function([e="",n=""]){return(0,t.default)(e,n)}))
+e.default=n})),define("consul-ui/helpers/root-url",["exports","ember-router-helpers/helpers/root-url"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"rootUrl",{enumerable:!0,get:function(){return t.rootUrl}})})),define("consul-ui/helpers/round",["exports","ember-math-helpers/helpers/round"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"round",{enumerable:!0,get:function(){return t.round}})})),define("consul-ui/helpers/route-action",["exports","ember-route-action-helper/helpers/route-action"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
+define("consul-ui/helpers/route-match",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function([e]){switch(["Present","Exact","Prefix","Suffix","Regex"].find(t=>void 0!==e[t])){case"Present":return(e.Invert?"NOT ":"")+"present"
+case"Exact":return`${e.Invert?"NOT ":""}exactly matching "${e.Exact}"`
+case"Prefix":return`${e.Invert?"NOT ":""}prefixed by "${e.Prefix}"`
+case"Suffix":return`${e.Invert?"NOT ":""}suffixed by "${e.Suffix}"`
+case"Regex":return`${e.Invert?"NOT ":""}matching the regex "${e.Regex}"`}return""}))
+e.default=t})),define("consul-ui/helpers/route-params",["exports","ember-router-helpers/helpers/route-params"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"routeParams",{enumerable:!0,get:function(){return t.routeParams}})})),define("consul-ui/helpers/service/card-permissions",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function([e]){if(""===e.Datacenter)return"empty"
+{const t=e.Intention.HasPermissions,n=e.Intention.Allowed,r="specific-intention"===e.Source&&!e.TransparentProxy
+switch(!0){case t:return"allow"
+case!n&&!t:return"deny"
+case n&&r:return"not-defined"
+default:return"allow"}}}))
+e.default=t})),define("consul-ui/helpers/service/external-source",["exports"],(function(e){function t(e,t){let n=Ember.get(e[0],"ExternalSources.firstObject")
+n||(n=Ember.get(e[0],"Meta.external-source"))
+const r=void 0===t.prefix?"":t.prefix
+if(n&&["consul-api-gateway","vault","kubernetes","terraform","nomad","consul","aws"].includes(n))return`${r}${n}`}Object.defineProperty(e,"__esModule",{value:!0}),e.serviceExternalSource=t,e.default=void 0
+var n=Ember.Helper.helper(t)
+e.default=n})),define("consul-ui/helpers/service/health-percentage",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function([e]){const t=e.ChecksCritical+e.ChecksPassing+e.ChecksWarning
+return 0===t?"":{passing:Math.round(e.ChecksPassing/t*100),warning:Math.round(e.ChecksWarning/t*100),critical:Math.round(e.ChecksCritical/t*100)}}))
+e.default=t})),define("consul-ui/helpers/set",["exports","ember-set-helper/helpers/set"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/shuffle",["exports","ember-composable-helpers/helpers/shuffle"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"shuffle",{enumerable:!0,get:function(){return t.shuffle}})})),define("consul-ui/helpers/sign",["exports","ember-math-helpers/helpers/sign"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"sign",{enumerable:!0,get:function(){return t.sign}})})),define("consul-ui/helpers/sin",["exports","ember-math-helpers/helpers/sin"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"sin",{enumerable:!0,get:function(){return t.sin}})})),define("consul-ui/helpers/singularize",["exports","ember-inflector/lib/helpers/singularize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=t.default
+e.default=n})),define("consul-ui/helpers/slice",["exports","ember-composable-helpers/helpers/slice"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/slugify",["exports"],(function(e){function t([e=""]){return e.replace(/ /g,"-").toLowerCase()}Object.defineProperty(e,"__esModule",{value:!0}),e.slugify=t,e.default=void 0
+var n=Ember.Helper.helper(t)
+e.default=n})),define("consul-ui/helpers/sort-by",["exports","ember-composable-helpers/helpers/sort-by"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/split",["exports"],(function(e){function t([e="",t=","]){return e.split(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.split=t,e.default=void 0
+var n=Ember.Helper.helper(t)
+e.default=n})),define("consul-ui/helpers/sqrt",["exports","ember-math-helpers/helpers/sqrt"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"sqrt",{enumerable:!0,get:function(){return t.sqrt}})})),define("consul-ui/helpers/state-chart",["exports"],(function(e){var t,n,r
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let a=(t=Ember.inject.service("state"),n=class extends Ember.Helper{constructor(...e){var t,n,a,l
+super(...e),t=this,n="state",l=this,(a=r)&&Object.defineProperty(t,n,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(l):void 0})}compute([e],t){return this.state.stateChart(e)}},l=n.prototype,s="state",i=[t],o={configurable:!0,enumerable:!0,writable:!0,initializer:null},c={},Object.keys(o).forEach((function(e){c[e]=o[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=i.slice().reverse().reduce((function(e,t){return t(l,s,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(l,s,c),c=null),r=c,n)
+var l,s,i,o,u,c
+e.default=a})),define("consul-ui/helpers/state-matches",["exports"],(function(e){var t,n,r
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let a=(t=Ember.inject.service("state"),n=class extends Ember.Helper{constructor(...e){var t,n,a,l
+super(...e),t=this,n="state",l=this,(a=r)&&Object.defineProperty(t,n,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(l):void 0})}compute([e,t],n){return this.state.matches(e,t)}},l=n.prototype,s="state",i=[t],o={configurable:!0,enumerable:!0,writable:!0,initializer:null},c={},Object.keys(o).forEach((function(e){c[e]=o[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=i.slice().reverse().reduce((function(e,t){return t(l,s,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(l,s,c),c=null),r=c,n)
+var l,s,i,o,u,c
+e.default=a})),define("consul-ui/helpers/string-char-at",["exports","ember-string-fns/helpers/string-char-at"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringCharAt",{enumerable:!0,get:function(){return t.stringCharAt}})})),define("consul-ui/helpers/string-char-code-at",["exports","ember-string-fns/helpers/string-char-code-at"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringCharCodeAt",{enumerable:!0,get:function(){return t.stringCharCodeAt}})})),define("consul-ui/helpers/string-code-point-at",["exports","ember-string-fns/helpers/string-code-point-at"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringCodePointAt",{enumerable:!0,get:function(){return t.stringCodePointAt}})})),define("consul-ui/helpers/string-concat",["exports","ember-string-fns/helpers/string-concat"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringConcat",{enumerable:!0,get:function(){return t.stringConcat}})})),define("consul-ui/helpers/string-ends-with",["exports","ember-string-fns/helpers/string-ends-with"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringEndsWith",{enumerable:!0,get:function(){return t.stringEndsWith}})})),define("consul-ui/helpers/string-equals",["exports","ember-string-fns/helpers/string-equals"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringEquals",{enumerable:!0,get:function(){return t.stringEquals}})})),define("consul-ui/helpers/string-from-char-code",["exports","ember-string-fns/helpers/string-from-char-code"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringFromCharCode",{enumerable:!0,get:function(){return t.stringFromCharCode}})})),define("consul-ui/helpers/string-from-code-point",["exports","ember-string-fns/helpers/string-from-code-point"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringFromCodePoint",{enumerable:!0,get:function(){return t.stringFromCodePoint}})})),define("consul-ui/helpers/string-html-safe",["exports"],(function(e){function t([e=""]){return Ember.String.htmlSafe(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringHtmlSafe=t,e.default=void 0
+var n=Ember.Helper.helper(t)
+e.default=n})),define("consul-ui/helpers/string-includes",["exports","ember-string-fns/helpers/string-includes"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringIncludes",{enumerable:!0,get:function(){return t.stringIncludes}})})),define("consul-ui/helpers/string-index-of",["exports","ember-string-fns/helpers/string-index-of"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringIndexOf",{enumerable:!0,get:function(){return t.stringIndexOf}})})),define("consul-ui/helpers/string-last-index-of",["exports","ember-string-fns/helpers/string-last-index-of"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringLastIndexOf",{enumerable:!0,get:function(){return t.stringLastIndexOf}})})),define("consul-ui/helpers/string-not-equals",["exports","ember-string-fns/helpers/string-not-equals"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringNotEquals",{enumerable:!0,get:function(){return t.stringNotEquals}})}))
+define("consul-ui/helpers/string-pad-end",["exports","ember-string-fns/helpers/string-pad-end"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringPadEnd",{enumerable:!0,get:function(){return t.stringPadEnd}})})),define("consul-ui/helpers/string-pad-start",["exports","ember-string-fns/helpers/string-pad-start"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringPadStart",{enumerable:!0,get:function(){return t.stringPadStart}})})),define("consul-ui/helpers/string-repeat",["exports","ember-string-fns/helpers/string-repeat"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringRepeat",{enumerable:!0,get:function(){return t.stringRepeat}})})),define("consul-ui/helpers/string-replace-all",["exports","ember-string-fns/helpers/string-replace-all"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringReplaceAll",{enumerable:!0,get:function(){return t.stringReplaceAll}})})),define("consul-ui/helpers/string-replace",["exports","ember-string-fns/helpers/string-replace"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringReplace",{enumerable:!0,get:function(){return t.stringReplace}})})),define("consul-ui/helpers/string-slice",["exports","ember-string-fns/helpers/string-slice"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringSlice",{enumerable:!0,get:function(){return t.stringSlice}})})),define("consul-ui/helpers/string-split",["exports","ember-string-fns/helpers/string-split"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringSplit",{enumerable:!0,get:function(){return t.stringSplit}})})),define("consul-ui/helpers/string-starts-with",["exports","ember-string-fns/helpers/string-starts-with"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringStartsWith",{enumerable:!0,get:function(){return t.stringStartsWith}})})),define("consul-ui/helpers/string-substring",["exports","ember-string-fns/helpers/string-substring"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringSubstring",{enumerable:!0,get:function(){return t.stringSubstring}})})),define("consul-ui/helpers/string-to-camel-case",["exports","ember-string-fns/helpers/string-to-camel-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToCamelCase",{enumerable:!0,get:function(){return t.stringToCamelCase}})})),define("consul-ui/helpers/string-to-kebab-case",["exports","ember-string-fns/helpers/string-to-kebab-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToKebabCase",{enumerable:!0,get:function(){return t.stringToKebabCase}})})),define("consul-ui/helpers/string-to-lower-case",["exports","ember-string-fns/helpers/string-to-lower-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToLowerCase",{enumerable:!0,get:function(){return t.stringToLowerCase}})})),define("consul-ui/helpers/string-to-pascal-case",["exports","ember-string-fns/helpers/string-to-pascal-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToPascalCase",{enumerable:!0,get:function(){return t.stringToPascalCase}})})),define("consul-ui/helpers/string-to-sentence-case",["exports","ember-string-fns/helpers/string-to-sentence-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToSentenceCase",{enumerable:!0,get:function(){return t.stringToSentenceCase}})})),define("consul-ui/helpers/string-to-snake-case",["exports","ember-string-fns/helpers/string-to-snake-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToSnakeCase",{enumerable:!0,get:function(){return t.stringToSnakeCase}})})),define("consul-ui/helpers/string-to-title-case",["exports","ember-string-fns/helpers/string-to-title-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToTitleCase",{enumerable:!0,get:function(){return t.stringToTitleCase}})})),define("consul-ui/helpers/string-to-upper-case",["exports","ember-string-fns/helpers/string-to-upper-case"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringToUpperCase",{enumerable:!0,get:function(){return t.stringToUpperCase}})})),define("consul-ui/helpers/string-trim-end",["exports","ember-string-fns/helpers/string-trim-end"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringTrimEnd",{enumerable:!0,get:function(){return t.stringTrimEnd}})})),define("consul-ui/helpers/string-trim-start",["exports","ember-string-fns/helpers/string-trim-start"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringTrimStart",{enumerable:!0,get:function(){return t.stringTrimStart}})})),define("consul-ui/helpers/string-trim",["exports","ember-string-fns/helpers/string-trim"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"stringTrim",{enumerable:!0,get:function(){return t.stringTrim}})})),define("consul-ui/helpers/style-map",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper(e=>{const t=e.reduce((e,[t,n,r=""])=>null==n?e:`${e}${t}:${n.toString()}${r};`,"")
+return t.length>0?t:void 0})
+e.default=t})),define("consul-ui/helpers/sub",["exports","ember-math-helpers/helpers/sub"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"sub",{enumerable:!0,get:function(){return t.sub}})})),define("consul-ui/helpers/substr",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function([e="",t=0,n]){return e.substr(t,n)}))
+e.default=t})),define("consul-ui/helpers/svg-curve",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function([e],t){const n=t.src||{x:0,y:0},r=t.type||"cubic"
+let a=[e,{x:(n.x+e.x)/2,y:n.y}]
+return"cubic"===r&&a.push({x:a[1].x,y:e.y}),`${l=n,`\n    M ${l.x} ${l.y}\n  `}${function(){const e=[...arguments]
+return`${arguments.length>2?"C":"Q"} ${e.concat(e.shift()).map(e=>Object.values(e).join(" ")).join(",")}`}(...a)}`
+var l}))
+e.default=t})),define("consul-ui/helpers/t",["exports","ember-intl/helpers/t"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/take",["exports","ember-composable-helpers/helpers/take"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/tan",["exports","ember-math-helpers/helpers/tan"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"tan",{enumerable:!0,get:function(){return t.tan}})})),define("consul-ui/helpers/tanh",["exports","ember-math-helpers/helpers/tanh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"tanh",{enumerable:!0,get:function(){return t.tanh}})})),define("consul-ui/helpers/task",["exports","ember-concurrency/helpers/task"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/temporal-format",["exports"],(function(e){var t,n,r
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let a=(t=Ember.inject.service("temporal"),n=class extends Ember.Helper{constructor(...e){var t,n,a,l
+super(...e),t=this,n="temporal",l=this,(a=r)&&Object.defineProperty(t,n,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(l):void 0})}compute([e],t){return this.temporal.format(e,t)}},l=n.prototype,s="temporal",i=[t],o={configurable:!0,enumerable:!0,writable:!0,initializer:null},c={},Object.keys(o).forEach((function(e){c[e]=o[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=i.slice().reverse().reduce((function(e,t){return t(l,s,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(l,s,c),c=null),r=c,n)
+var l,s,i,o,u,c
+e.default=a}))
+define("consul-ui/helpers/temporal-within",["exports"],(function(e){var t,n,r
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let a=(t=Ember.inject.service("temporal"),n=class extends Ember.Helper{constructor(...e){var t,n,a,l
+super(...e),t=this,n="temporal",l=this,(a=r)&&Object.defineProperty(t,n,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(l):void 0})}compute(e,t){return this.temporal.within(e,t)}},l=n.prototype,s="temporal",i=[t],o={configurable:!0,enumerable:!0,writable:!0,initializer:null},c={},Object.keys(o).forEach((function(e){c[e]=o[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=i.slice().reverse().reduce((function(e,t){return t(l,s,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(l,s,c),c=null),r=c,n)
+var l,s,i,o,u,c
+e.default=a})),define("consul-ui/helpers/test",["exports","consul-ui/helpers/can","consul-ui/helpers/is"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends t.default{compute([e,t],r){switch(!0){case e.startsWith("can "):return super.compute([e.substr(4),t],r)
+case e.startsWith("is "):return(0,n.is)(this,[e.substr(3),t],r)}throw new Error(e+" is not supported by the 'test' helper.")}}e.default=r})),define("consul-ui/helpers/titleize",["exports","ember-cli-string-helpers/helpers/titleize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"titleize",{enumerable:!0,get:function(){return t.titleize}})})),define("consul-ui/helpers/to-hash",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper(([e=[],t])=>(Array.isArray(e)||(e=e.toArray()),e.reduce((e,n)=>(e[Ember.get(n,t)]=n,e),{})))
+e.default=t})),define("consul-ui/helpers/to-route",["exports"],(function(e){var t,n,r,a,l
+function s(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function i(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let o=(t=Ember.inject.service("router"),n=Ember.inject.service("env"),r=class extends Ember.Helper{constructor(...e){super(...e),s(this,"router",a,this),s(this,"env",l,this)}compute([e]){return this.router.recognize(`${this.env.var("rootURL")}${e}`).name}},a=i(r.prototype,"router",[t],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),l=i(r.prototype,"env",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),r)
+e.default=o})),define("consul-ui/helpers/toggle-action",["exports","ember-composable-helpers/helpers/toggle-action"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/toggle",["exports","ember-composable-helpers/helpers/toggle"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"toggle",{enumerable:!0,get:function(){return t.toggle}})})),define("consul-ui/helpers/token/is-anonymous",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.isAnonymous=t,e.default=void 0
+function t(e){return"00000000-0000-0000-0000-000000000002"===Ember.get(e[0],"AccessorID")}var n=Ember.Helper.helper(t)
+e.default=n})),define("consul-ui/helpers/token/is-legacy",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.isLegacy=n,e.default=void 0
+const t=function(e){const t=Ember.get(e,"Rules")
+if(null!=t)return""!==t.trim()
+const n=Ember.get(e,"Legacy")
+return void 0!==n&&n}
+function n(e){const n=e[0]
+return void 0!==n.length?n.find((function(e){return t(e)})):t(n)}var r=Ember.Helper.helper(n)
+e.default=r})),define("consul-ui/helpers/transition-to",["exports","ember-router-helpers/helpers/transition-to"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"transitionTo",{enumerable:!0,get:function(){return t.transitionTo}})})),define("consul-ui/helpers/trim",["exports","ember-cli-string-helpers/helpers/trim"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"trim",{enumerable:!0,get:function(){return t.trim}})})),define("consul-ui/helpers/trunc",["exports","ember-math-helpers/helpers/trunc"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"trunc",{enumerable:!0,get:function(){return t.trunc}})})),define("consul-ui/helpers/truncate",["exports","ember-cli-string-helpers/helpers/truncate"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"truncate",{enumerable:!0,get:function(){return t.truncate}})})),define("consul-ui/helpers/tween-to",["exports"],(function(e){var t,n,r
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let a=(t=Ember.inject.service("ticker"),n=class extends Ember.Helper{constructor(...e){var t,n,a,l
+super(...e),t=this,n="ticker",l=this,(a=r)&&Object.defineProperty(t,n,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(l):void 0})}compute([e,t],n){return this.ticker.tweenTo(e,t)}},l=n.prototype,s="ticker",i=[t],o={configurable:!0,enumerable:!0,writable:!0,initializer:null},c={},Object.keys(o).forEach((function(e){c[e]=o[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=i.slice().reverse().reduce((function(e,t){return t(l,s,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(l,s,c),c=null),r=c,n)
+var l,s,i,o,u,c
+e.default=a})),define("consul-ui/helpers/underscore",["exports","ember-cli-string-helpers/helpers/underscore"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"underscore",{enumerable:!0,get:function(){return t.underscore}})})),define("consul-ui/helpers/union",["exports","ember-composable-helpers/helpers/union"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/uniq-by",["exports"],(function(e){function t([e,t]){return Ember.isEmpty(e)?[]:Ember.A(t).uniqBy(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.uniqBy=t,e.default=void 0
+var n=Ember.Helper.helper(t)
+e.default=n})),define("consul-ui/helpers/unique-id",["exports"],(function(e){var t,n,r
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let a=(t=Ember.inject.service("dom"),n=class extends Ember.Helper{constructor(...e){var t,n,a,l
+super(...e),t=this,n="dom",l=this,(a=r)&&Object.defineProperty(t,n,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(l):void 0})}compute(e,t){return this.dom.guid({})}},l=n.prototype,s="dom",i=[t],o={configurable:!0,enumerable:!0,writable:!0,initializer:null},c={},Object.keys(o).forEach((function(e){c[e]=o[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=i.slice().reverse().reduce((function(e,t){return t(l,s,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(l,s,c),c=null),r=c,n)
+var l,s,i,o,u,c
+e.default=a})),define("consul-ui/helpers/uppercase",["exports","ember-cli-string-helpers/helpers/uppercase"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"uppercase",{enumerable:!0,get:function(){return t.uppercase}})})),define("consul-ui/helpers/uri",["exports"],(function(e){var t,n,r,a,l
+function s(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function i(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const o=/\${([A-Za-z.0-9_-]+)}/g
+let u,c=(t=Ember.inject.service("encoder"),n=Ember.inject.service("data-source/service"),r=class extends Ember.Helper{constructor(){super(...arguments),s(this,"encoder",a,this),s(this,"data",l,this),"function"!=typeof u&&(u=this.encoder.createRegExpEncoder(o,encodeURIComponent))}compute([e,t]){return this.data.uri(u(e,t))}},a=i(r.prototype,"encoder",[t],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),l=i(r.prototype,"data",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),r)
+e.default=c})),define("consul-ui/helpers/url-for",["exports","ember-router-helpers/helpers/url-for"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"urlFor",{enumerable:!0,get:function(){return t.urlFor}})})),define("consul-ui/helpers/values",["exports","ember-composable-helpers/helpers/values"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"values",{enumerable:!0,get:function(){return t.values}})})),define("consul-ui/helpers/w",["exports","ember-cli-string-helpers/helpers/w"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"w",{enumerable:!0,get:function(){return t.w}})})),define("consul-ui/helpers/will-destroy",["exports","ember-render-helpers/helpers/will-destroy"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/without",["exports","ember-composable-helpers/helpers/without"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"without",{enumerable:!0,get:function(){return t.without}})})),define("consul-ui/helpers/xor",["exports","ember-truth-helpers/helpers/xor"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"xor",{enumerable:!0,get:function(){return t.xor}})})),define("consul-ui/initializers/app-version",["exports","ember-cli-app-version/initializer-factory","consul-ui/config/environment"],(function(e,t,n){let r,a
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,n.default.APP&&(r=n.default.APP.name,a=n.default.APP.version)
+var l={name:"App Version",initialize:(0,t.default)(r,a)}
+e.default=l})),define("consul-ui/initializers/container-debug-adapter",["exports","ember-resolver/resolvers/classic/container-debug-adapter"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n={name:"container-debug-adapter",initialize(){let e=arguments[1]||arguments[0]
+e.register("container-debug-adapter:main",t.default),e.inject("container-debug-adapter:main","namespace","application:main")}}
+e.default=n})),define("consul-ui/initializers/ember-data-data-adapter",["exports","@ember-data/debug/setup"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/initializers/ember-data",["exports","ember-data","ember-data/setup-container"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r={name:"ember-data",initialize:n.default}
+e.default=r}))
+define("consul-ui/initializers/export-application-global",["exports","consul-ui/config/environment"],(function(e,t){function n(){var e=arguments[1]||arguments[0]
+if(!1!==t.default.exportApplicationGlobal){var n
+if("undefined"!=typeof window)n=window
+else if("undefined"!=typeof global)n=global
+else{if("undefined"==typeof self)return
+n=self}var r,a=t.default.exportApplicationGlobal
+r="string"==typeof a?a:Ember.String.classify(t.default.modulePrefix),n[r]||(n[r]=e,e.reopen({willDestroy:function(){this._super.apply(this,arguments),delete n[r]}}))}}Object.defineProperty(e,"__esModule",{value:!0}),e.initialize=n,e.default=void 0
+var r={name:"export-application-global",initialize:n}
+e.default=r})),define("consul-ui/initializers/flash-messages",["exports","consul-ui/config/environment","ember-cli-flash/utils/flash-message-options"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.initialize=r,e.default=void 0
+function r(){const e=arguments[1]||arguments[0],{flashMessageDefaults:r}=t.default||{},{injectionFactories:a}=r||[],l=(0,n.default)(r)
+a&&a.length
+l.injectionFactories.forEach(t=>{e.inject(t,"flashMessages","service:flash-messages")})}var a={name:"flash-messages",initialize:r}
+e.default=a})),define("consul-ui/initializers/initialize-torii-callback",["exports","consul-ui/config/environment","torii/redirect-handler"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r={name:"torii-callback",before:"torii",initialize(e){arguments[1]&&(e=arguments[1]),t.default.torii&&t.default.torii.disableRedirectInitializer||(e.deferReadiness(),n.default.handle(window).catch((function(){e.advanceReadiness()})))}}
+e.default=r})),define("consul-ui/initializers/initialize-torii-session",["exports","torii/bootstrap/session","torii/configuration"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r={name:"torii-session",after:"torii",initialize(e){arguments[1]&&(e=arguments[1])
+const r=(0,n.getConfiguration)()
+if(r.sessionServiceName){(0,t.default)(e,r.sessionServiceName)
+var a="service:"+r.sessionServiceName
+e.inject("adapter",r.sessionServiceName,a)}}}
+e.default=r})),define("consul-ui/initializers/initialize-torii",["exports","torii/bootstrap/torii","torii/configuration","consul-ui/config/environment"],(function(e,t,n,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var a={name:"torii",initialize(e){arguments[1]&&(e=arguments[1]),(0,n.configure)(r.default.torii||{}),(0,t.default)(e),e.inject("route","torii","service:torii")}}
+e.default=a})),define("consul-ui/initializers/model-fragments",["exports","ember-data-model-fragments","ember-data-model-fragments/ext"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t={name:"fragmentTransform",after:"ember-data",initialize(){}}
+e.default=t})),define("consul-ui/initializers/setup-ember-can",["exports","ember-can/initializers/setup-ember-can"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"initialize",{enumerable:!0,get:function(){return t.initialize}})})),define("consul-ui/initializers/viewport-config",["exports","ember-in-viewport/initializers/viewport-config"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"initialize",{enumerable:!0,get:function(){return t.initialize}})})),define("consul-ui/instance-initializers/container",["exports","require","deepmerge"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.services=void 0
+const r=document,a=n.default.all([...r.querySelectorAll("script[data-services]")].map(e=>JSON.parse(e.dataset.services)))
+e.services=a
+var l={name:"container",initialize(e){(function(e,n){Object.entries(n).forEach(([n,r])=>{switch(!0){case"string"==typeof r.class:if(!t.default.has(r.class))throw new Error(`Unable to locate '${r.class}'`)
+e.register(n.replace("auth-provider:","torii-provider:"),(0,t.default)(r.class).default)}})})(e,a)
+const n=e.lookup("service:container")
+let r=n.get("container-debug-adapter:main").catalogEntriesByType("service").filter(e=>e.startsWith("repository/")||"ui-config"===e)
+r.push("repository/service"),r.forEach(e=>{const t="service:"+e
+n.set(t,n.resolveRegistration(t))})}}
+e.default=l})),define("consul-ui/instance-initializers/ember-data",["exports","ember-data/initialize-store-service"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n={name:"ember-data",initialize:t.default}
+e.default=n})),define("consul-ui/instance-initializers/href-to",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.HrefTo=void 0
+class t{constructor(e,t){this.applicationInstance=e,this.target=t
+const n=this.target.attributes.href
+this.url=n&&n.value}handle(e){this.shouldHandle(e)&&(e.preventDefault(),this.applicationInstance.lookup("router:main").location.transitionTo(this.url))}shouldHandle(e){return this.isUnmodifiedLeftClick(e)&&!this.isIgnored(this.target)&&!this.isExternal(this.target)&&!this.hasActionHelper(this.target)&&!this.hasDownload(this.target)&&!this.isLinkComponent(this.target)}isUnmodifiedLeftClick(e){return!(void 0!==e.which&&1!==e.which||e.ctrlKey||e.metaKey)}isExternal(e){return"_blank"===e.getAttribute("target")}isIgnored(e){return e.dataset.nativeHref}hasActionHelper(e){return e.dataset.emberAction}hasDownload(e){return e.hasAttribute("download")}isLinkComponent(e){let t=!1
+const n=e.id
+if(n){const e=this.applicationInstance.lookup("-view-registry:main")[n]
+t=e&&e instanceof Ember.LinkComponent}return t}recognizeUrl(e){let t=!1
+if(e){const n=this._getRouter(),r=this._getRootUrl(),a=0===e.indexOf(r),l=this.getUrlWithoutRoot(),s=n._router._routerMicrolib||n._router.router
+t=a&&s.recognizer.recognize(l)}return t}getUrlWithoutRoot(){const e=this.applicationInstance.lookup("router:main").location
+let t=e.getURL.apply({getHash:()=>"",location:{pathname:this.url},baseURL:e.baseURL,rootURL:e.rootURL,env:e.env},[])
+const n=t.indexOf("?")
+return-1!==n&&(t=t.substr(0,n-1)),t}_getRouter(){return this.applicationInstance.lookup("service:router")}_getRootUrl(){let e=this._getRouter().get("rootURL")
+return"/"!==e.charAt(e.length-1)&&(e+="/"),e}}e.HrefTo=t
+var n={name:"href-to",initialize(e){if("undefined"==typeof FastBoot){const n=e.lookup("service:dom").document(),r=n=>{const r="A"===n.target.tagName?n.target:function(e){if(e.closest)return e.closest("a")
+for(e=e.parentElement;e&&"A"!==e.tagName;)e=e.parentElement
+return e}(n.target)
+if(r){new t(e,r).handle(n)}}
+n.body.addEventListener("click",r),e.reopen({willDestroy(){return n.body.removeEventListener("click",r),this._super(...arguments)}})}}}
+e.default=n})),define("consul-ui/instance-initializers/ivy-codemirror",["exports"],(function(e){function t(e){const t=e.application.name,n=e.lookup("service:-document"),r=new Map(Object.entries(JSON.parse(n.querySelector(`[data-${t}-fs]`).textContent)))
+CodeMirror.modeURL={replace:function(e,t){switch(t.trim()){case"javascript":return r.get(["codemirror","mode","javascript","javascript.js"].join("/"))
+case"ruby":return r.get(["codemirror","mode","ruby","ruby.js"].join("/"))
+case"yaml":return r.get(["codemirror","mode","yaml","yaml.js"].join("/"))
+case"xml":return r.get(["codemirror","mode","xml","xml.js"].join("/"))}}}
+e.resolveRegistration("component:ivy-codemirror").reopen({attributeBindings:["name"]})}Object.defineProperty(e,"__esModule",{value:!0}),e.initialize=t,e.default=void 0
+var n={initialize:t}
+e.default=n})),define("consul-ui/instance-initializers/selection",["exports","consul-ui/env"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n={name:"selection",initialize(e){if((0,t.env)("CONSUL_UI_DISABLE_ANCHOR_SELECTION"))return
+const n=e.lookup("service:dom"),r=n.document(),a=r.getElementsByTagName("html")[0],l=function(e){return"A"===e.tagName?e:n.closest("a",e)},s=function(e){if(a.classList.contains("is-debug"))return
+const t=l(e.target)
+if(t){if(void 0!==e.button&&2===e.button){const e=t.dataset.href
+return void(e&&t.setAttribute("href",e))}const n=t.getAttribute("href")
+n&&(t.dataset.href=n,t.removeAttribute("href"))}},i=function(e){if(a.classList.contains("is-debug"))return
+const t=l(e.target)
+if(t){const n=t.dataset.href
+!function(t=window){const n=t.getSelection()
+let r=!1
+try{r="isCollapsed"in n&&!n.isCollapsed&&n.toString().length>1}catch(e){}return r}()&&n&&t.setAttribute("href",n)}}
+r.body.addEventListener("mousedown",s),r.body.addEventListener("mouseup",i),e.reopen({willDestroy:function(){return r.body.removeEventListener("mousedown",s),r.body.removeEventListener("mouseup",i),this._super(...arguments)}})}}
+e.default=n})),define("consul-ui/instance-initializers/setup-routes",["exports","torii/bootstrap/routing","torii/configuration","torii/compat/get-router-instance","torii/compat/get-router-lib","torii/router-dsl-ext"],(function(e,t,n,r,a){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var l={name:"torii-setup-routes",initialize(e){if(!(0,n.getConfiguration)().sessionServiceName)return
+let l=(0,r.default)(e)
+var s=function(){var n=(0,a.default)(l).authenticatedRoutes
+!Ember.isEmpty(n)&&(0,t.default)(e,n),l.off("willTransition",s)}
+l.on("willTransition",s)}}
+e.default=l})),define("consul-ui/instance-initializers/walk-providers",["exports","torii/lib/container-utils","torii/configuration"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r={name:"torii-walk-providers",initialize(e){let r=(0,n.getConfiguration)()
+for(var a in r.providers)r.providers.hasOwnProperty(a)&&(0,t.lookup)(e,"torii-provider:"+a)}}
+e.default=r})),define("consul-ui/locations/fsm-with-optional-test",["exports","consul-ui/locations/fsm-with-optional","consul-ui/locations/fsm","@ember/test-helpers"],(function(e,t,n,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class a extends t.default{static create(){return new this(...arguments)}constructor(){var e,t,r
+super(...arguments),r="fsm-with-optional-test",(t="implementation")in(e=this)?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,this.location=new n.Location,this.machine=new n.FSM(this.location),this.doc={defaultView:{addEventListener:(e,t)=>{this.machine=new n.FSM(this.location,t)},removeEventListener:()=>{this.machine=new n.FSM}}}}visit(e){const t=this.container,n=this.container.lookup("router:main"),a=async()=>(await(0,r.settled)(),new Promise(e=>setTimeout(e(t),0))),l=e=>{if(e.error)throw e.error
+if("TransitionAborted"===e.name&&n._routerMicrolib.activeTransition)return n._routerMicrolib.activeTransition.then(a,l)
+throw"TransitionAborted"===e.name?new Error(e.message):e}
+return""===this.location.pathname?(this.rootURL=n.rootURL.replace(/\/$/,""),this.machine.state.path=this.location.pathname=`${this.rootURL}${e}`,this.path=this.getURL(),t.handleURL(""+this.path).then(a,l)):this.transitionTo(e).then(a,l)}}e.default=a})),define("consul-ui/locations/fsm-with-optional",["exports","consul-ui/env"],(function(e,t){function n(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r={};(0,t.env)("CONSUL_PARTITIONS_ENABLED")&&(r.partition=/^_([a-zA-Z0-9]([a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?)$/),(0,t.env)("CONSUL_NSPACES_ENABLED")&&(r.nspace=/^~([a-zA-Z0-9]([a-zA-Z0-9-]{0,62}[a-zA-Z0-9])?)$/)
+const a=/\/$/,l=function(e){const t=e.state.path,n=this.getURLForTransition(t)
+if(n===this._previousURL){if(t===this._previousPath)return
+this._previousPath=e.state.path,this.container.lookup("route:application").refresh()}"function"==typeof this.callback&&this.callback(n),this._previousURL=n,this._previousPath=e.state.path}
+e.default=class{static create(){return new this(...arguments)}constructor(e,t,r){n(this,"implementation","fsm-with-optional"),n(this,"baseURL",""),n(this,"rootURL","/"),n(this,"path","/"),n(this,"cancelRouterSetup",!1),n(this,"optional",{}),this.container=Object.entries(e)[0][1],this.route=l.bind(this),this.doc=void 0===t?this.container.lookup("service:-document"):t,this.env=void 0===r?this.container.lookup("service:env"):r
+const a=this.doc.querySelector("base[href]")
+null!==a&&(this.baseURL=a.getAttribute("href"))}initState(){this.location=this.location||this.doc.defaultView.location,this.machine=this.machine||this.doc.defaultView.history,this.doc.defaultView.addEventListener("popstate",this.route)
+const e=this.machine.state,t=this.getURL(),n=this.formatURL(t)
+e&&e.path===n?(this._previousPath=n,this._previousURL=t):this.dispatch("replace",n)}getURLFrom(e){return e=e||this.location.pathname,this.rootURL=this.rootURL.replace(a,""),this.baseURL=this.baseURL.replace(a,""),e.replace(new RegExp(`^${this.baseURL}(?=/|$)`),"").replace(new RegExp(`^${this.rootURL}(?=/|$)`),"")}getURLForTransition(e){return this.optional={},e=this.getURLFrom(e).split("/").filter((e,t)=>{if(t<3){let t=!1
+return Object.entries(r).reduce((n,[r,a])=>{const l=a.exec(e)
+return null!==l&&(n[r]={value:e,match:l[1]},t=!0),n},this.optional),!t}return!0}).join("/")}optionalParams(){let e=this.optional||{}
+return["partition","nspace"].reduce((t,n)=>{let r=""
+return void 0!==e[n]&&(r=e[n].match),t[n]=r,t},{})}visit(){return this.transitionTo(...arguments)}hrefTo(e,n,r){void 0!==r.dc&&delete r.dc,void 0!==r.nspace&&(r.nspace="~"+r.nspace),void 0!==r.partition&&(r.partition="_"+r.partition),void 0===this.router&&(this.router=this.container.lookup("router:main"))
+let a=!0
+switch(!0){case"settings"===e:case e.startsWith("docs."):a=!1}if(this.router.currentRouteName.startsWith("docs.")&&(n.unshift((0,t.env)("CONSUL_DATACENTER_PRIMARY")),e.startsWith("dc")))return`console://${e} <= ${JSON.stringify(n)}`
+const l=this.router._routerMicrolib
+let s
+try{s=l.generate(e,...n,{queryParams:{}})}catch(i){n=Object.values(l.oldState.params).reduce((e,t)=>e.concat(Object.keys(t).length>0?t:[]),[]),s=l.generate(e,...n)}return this.formatURL(s,r,a)}transitionTo(e){if(this.router.currentRouteName.startsWith("docs")&&e.startsWith("console://"))return console.info("location.transitionTo: "+e.substr(10)),!0
+const t=Object.entries(this.optionalParams()),n=this.getURLForTransition(e)
+if(this._previousURL===n)return this.dispatch("push",e),Promise.resolve()
+{const r=this.optionalParams()
+return t.some(([e,t])=>r[e]!==t)&&this.dispatch("push",e),this.container.lookup("router:main").transitionTo(n)}}getURL(){const e=this.location.search||""
+let t=""
+void 0!==this.location.hash&&(t=this.location.hash.substr(0))
+return`${this.getURLForTransition(this.location.pathname)}${e}${t}`}formatURL(e,t,n=!0){if(""!==e?(this.rootURL=this.rootURL.replace(a,""),this.baseURL=this.baseURL.replace(a,"")):"/"===this.baseURL[0]&&"/"===this.rootURL[0]&&(this.baseURL=this.baseURL.replace(a,"")),n){const n=e.split("/")
+0===Object.keys(t||{}).length&&(t=void 0),t=(t=Object.values(t||this.optional||{})).filter(e=>Boolean(e)).map(e=>e.value||e,[]),n.splice(...[1,0].concat(t)),e=n.join("/")}return`${this.baseURL}${this.rootURL}${e}`}changeURL(e,t){this.path=t
+const n=this.machine.state
+t=this.formatURL(t),n&&n.path===t||this.dispatch(e,t)}setURL(e){this.changeURL("push",e)}replaceURL(e){this.changeURL("replace",e)}onUpdateURL(e){this.callback=e}dispatch(e,t){const n={path:t,uuid:"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,e=>{const t=16*Math.random()|0
+return("x"===e?t:3&t|8).toString(16)})}
+this.machine[e+"State"](n,null,t),this.route({state:n})}willDestroy(){this.doc.defaultView.removeEventListener("popstate",this.route)}}})),define("consul-ui/locations/fsm",["exports"],(function(e){function t(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.Location=e.FSM=void 0
+e.FSM=class{constructor(e,n=(()=>{})){t(this,"state",{}),this.listener=n,this.location=e}pushState(e,t,n){this.state=e,this.location.pathname=n,this.listener({state:this.state})}replaceState(){return this.pushState(...arguments)}}
+e.Location=class{constructor(){t(this,"pathname",""),t(this,"search",""),t(this,"hash","")}}
+e.default=class{static create(){return new this(...arguments)}constructor(e){t(this,"implementation","fsm"),this.container=Object.entries(e)[0][1]}visit(){return this.transitionTo(...arguments)}hrefTo(){}transitionTo(){}}})),define("consul-ui/machines/boolean.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={id:"boolean",initial:"false",states:{true:{on:{TOGGLE:[{target:"false"}],FALSE:[{target:"false"}]}},false:{on:{TOGGLE:[{target:"true"}],TRUE:[{target:"true"}]}}}}})),define("consul-ui/machines/validate.xstate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={id:"form",initial:"idle",on:{RESET:[{target:"idle"}]},states:{idle:{on:{SUCCESS:[{target:"success"}],ERROR:[{target:"error"}]}},success:{},error:{}}}})),define("consul-ui/mixins/policy/as-many",["exports","consul-ui/utils/minimizeModel"],(function(e,t){function n(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const a=function(e,t,n,r){return(e||[]).map((function(e){const a={template:t,Name:e[n]}
+return void 0!==e[r]&&(a[r]=e[r]),a}))},l=function(e){return(e||[]).map((function(e){return function(e){for(var t=1;t<arguments.length;t++){var a=null!=arguments[t]?arguments[t]:{}
+t%2?n(Object(a),!0).forEach((function(t){r(e,t,a[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(a)):n(Object(a)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(a,t))}))}return e}({template:""},e)}))},s=function(e,t,n,r){return e.filter((function(e){return Ember.get(e,"template")===t})).map((function(e){const t={[n]:Ember.get(e,"Name")}
+return void 0!==Ember.get(e,r)&&(t[r]=Ember.get(e,r)),t}))},i=function(e){return e.filter((function(e){return""===Ember.get(e,"template")}))}
+var o=Ember.Mixin.create({respondForQueryRecord:function(e,t){return this._super((function(t){return e((e,n)=>(n.Policies=l(n.Policies).concat(a(n.ServiceIdentities,"service-identity","ServiceName","Datacenters")).concat(a(n.NodeIdentities,"node-identity","NodeName","Datacenter")),t(e,n)))}),t)},respondForQuery:function(e,t){return this._super((function(t){return e((function(e,n){return t(e,n.map((function(e){return e.Policies=l(e.Policies).concat(a(e.ServiceIdentities,"service-identity","ServiceName","Datacenters")).concat(a(e.NodeIdentities,"node-identity","NodeName","Datacenter")),e})))}))}),t)},serialize:function(e,n){const r=this._super(...arguments)
+return r.ServiceIdentities=s(r.Policies,"service-identity","ServiceName","Datacenters"),r.NodeIdentities=s(r.Policies,"node-identity","NodeName","Datacenter"),r.Policies=(0,t.default)(i(r.Policies)),r}})
+e.default=o})),define("consul-ui/mixins/role/as-many",["exports","consul-ui/utils/minimizeModel"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.Mixin.create({respondForQueryRecord:function(e,t){return this._super((function(t){return e((e,n)=>(n.Roles=void 0===n.Roles||null===n.Roles?[]:n.Roles,t(e,n)))}),t)},respondForQuery:function(e,t){return this._super((function(t){return e((function(e,n){return t(e,n.map((function(e){return e.Roles=void 0===e.Roles||null===e.Roles?[]:e.Roles,e})))}))}),t)},serialize:function(e,n){const r=this._super(...arguments)
+return r.Roles=(0,t.default)(r.Roles),r}})
+e.default=n})),define("consul-ui/mixins/slots",["exports","block-slots/mixins/slots"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/mixins/with-blocking-actions",["exports","ember-inflector"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.Mixin.create({_feedback:Ember.inject.service("feedback"),settings:Ember.inject.service("settings"),init:function(){this._super(...arguments)
+const e=this._feedback,n=this
+Ember.set(this,"feedback",{execute:function(r,a,l){const s=n.routeName.split(".")
+s.pop()
+const i=(0,t.singularize)(s.pop())
+return e.execute(r,a,l,i)}})},afterCreate:function(e){return this.afterUpdate(...arguments)},afterUpdate:function(){const e=this.routeName.split(".")
+return e.pop(),this.transitionTo(e.join("."))},afterDelete:function(){const e=this.routeName.split(".")
+switch(e.pop()){case"index":return this.refresh()
+default:return this.transitionTo(e.join("."))}},errorCreate:function(e){return e},errorUpdate:function(e){return e},errorDelete:function(e){return e},actions:{cancel:function(){return this.afterUpdate(...arguments)},create:function(e){return this.feedback.execute(()=>this.repo.persist(e).then(()=>this.afterCreate(...arguments)),"create",(e,t)=>this.errorCreate(e,t))},update:function(e){return this.feedback.execute(()=>this.repo.persist(e).then(()=>this.afterUpdate(...arguments)),"update",(e,t)=>this.errorUpdate(e,t))},delete:function(e){return this.feedback.execute(()=>this.repo.remove(e).then(()=>this.afterDelete(...arguments)),"delete",(e,t)=>this.errorDelete(e,t))},use:function(e){return this.repo.findBySlug({dc:Ember.get(e,"Datacenter"),ns:Ember.get(e,"Namespace"),partition:Ember.get(e,"Partition"),id:Ember.get(e,"AccessorID")}).then(e=>this.settings.persist({token:{AccessorID:Ember.get(e,"AccessorID"),SecretID:Ember.get(e,"SecretID"),Namespace:Ember.get(e,"Namespace"),Partition:Ember.get(e,"Partition")}}))},logout:function(){return this.settings.delete("token")},clone:function(e){let t
+return this.feedback.execute(()=>this.repo.clone(e).then(e=>(t=e,this.afterDelete(...arguments))).then((function(){return t})),"clone")}}})
+e.default=n})),define("consul-ui/models/auth-method",["exports","@ember-data/model","parse-duration"],(function(e,t,n){var r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x,j,C,S,N,z,M,D,T,L,A,R,I
+function B(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function H(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="Name"
+let $=(r=(0,t.attr)("string"),a=(0,t.attr)("string"),l=(0,t.attr)("string"),s=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string",{defaultValue:()=>""}),u=(0,t.attr)("string",{defaultValue:()=>""}),c=(0,t.attr)("string",{defaultValue:()=>"local"}),d=(0,t.attr)("string"),m=(0,t.attr)(),p=Ember.computed.or("DisplayName","Name"),f=(0,t.attr)(),b=(0,t.attr)("string"),h=(0,t.attr)("number"),v=(0,t.attr)("number"),y=(0,t.attr)(),g=(0,t.attr)(),O=Ember.computed("MaxTokenTTL"),_=class extends t.default{constructor(...e){super(...e),B(this,"uid",P,this),B(this,"Name",w,this),B(this,"Datacenter",E,this),B(this,"Namespace",k,this),B(this,"Partition",x,this),B(this,"Description",j,this),B(this,"DisplayName",C,this),B(this,"TokenLocality",S,this),B(this,"Type",N,this),B(this,"NamespaceRules",z,this),B(this,"MethodName",M,this),B(this,"Config",D,this),B(this,"MaxTokenTTL",T,this),B(this,"CreateIndex",L,this),B(this,"ModifyIndex",A,this),B(this,"Datacenters",R,this),B(this,"meta",I,this)}get TokenTTL(){return(0,n.default)(this.MaxTokenTTL)}},P=H(_.prototype,"uid",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=H(_.prototype,"Name",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=H(_.prototype,"Datacenter",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=H(_.prototype,"Namespace",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=H(_.prototype,"Partition",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=H(_.prototype,"Description",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=H(_.prototype,"DisplayName",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=H(_.prototype,"TokenLocality",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=H(_.prototype,"Type",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=H(_.prototype,"NamespaceRules",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=H(_.prototype,"MethodName",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=H(_.prototype,"Config",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=H(_.prototype,"MaxTokenTTL",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=H(_.prototype,"CreateIndex",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=H(_.prototype,"ModifyIndex",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=H(_.prototype,"Datacenters",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=H(_.prototype,"meta",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),H(_.prototype,"TokenTTL",[O],Object.getOwnPropertyDescriptor(_.prototype,"TokenTTL"),_.prototype),_)
+e.default=$})),define("consul-ui/models/binding-rule",["exports","@ember-data/model"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x
+function j(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function C(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="ID"
+let S=(n=(0,t.attr)("string"),r=(0,t.attr)("string"),a=(0,t.attr)("string"),l=(0,t.attr)("string"),s=(0,t.attr)("string"),i=(0,t.attr)("string",{defaultValue:()=>""}),o=(0,t.attr)("string"),u=(0,t.attr)("string",{defaultValue:()=>""}),c=(0,t.attr)("string"),d=(0,t.attr)("string"),m=(0,t.attr)("number"),p=(0,t.attr)("number"),f=class extends t.default{constructor(...e){super(...e),j(this,"uid",b,this),j(this,"ID",h,this),j(this,"Datacenter",v,this),j(this,"Namespace",y,this),j(this,"Partition",g,this),j(this,"Description",O,this),j(this,"AuthMethod",_,this),j(this,"Selector",P,this),j(this,"BindType",w,this),j(this,"BindName",E,this),j(this,"CreateIndex",k,this),j(this,"ModifyIndex",x,this)}},b=C(f.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=C(f.prototype,"ID",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=C(f.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=C(f.prototype,"Namespace",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=C(f.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=C(f.prototype,"Description",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=C(f.prototype,"AuthMethod",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=C(f.prototype,"Selector",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=C(f.prototype,"BindType",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=C(f.prototype,"BindName",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=C(f.prototype,"CreateIndex",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=C(f.prototype,"ModifyIndex",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f)
+e.default=S})),define("consul-ui/models/coordinate",["exports","@ember-data/model"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h
+function v(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function y(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="Node"
+let g=(n=(0,t.attr)("string"),r=(0,t.attr)("string"),a=(0,t.attr)(),l=(0,t.attr)("string"),s=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("number"),u=class extends t.default{constructor(...e){super(...e),v(this,"uid",c,this),v(this,"Node",d,this),v(this,"Coord",m,this),v(this,"Segment",p,this),v(this,"Datacenter",f,this),v(this,"Partition",b,this),v(this,"SyncTime",h,this)}},c=y(u.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=y(u.prototype,"Node",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=y(u.prototype,"Coord",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=y(u.prototype,"Segment",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=y(u.prototype,"Datacenter",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=y(u.prototype,"Partition",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=y(u.prototype,"SyncTime",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u)
+e.default=g})),define("consul-ui/models/dc",["exports","@ember-data/model"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x,j,C,S,N,z,M
+function D(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function T(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.FOREIGN_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.FOREIGN_KEY="Datacenter"
+e.SLUG_KEY="Name"
+let L=(n=(0,t.attr)("string"),r=(0,t.attr)("string"),a=(0,t.attr)("boolean"),l=(0,t.attr)("number"),s=(0,t.attr)("number"),i=(0,t.attr)("string"),o=(0,t.attr)(),u=(0,t.attr)(),c=(0,t.attr)(),d=(0,t.attr)(),m=(0,t.attr)(),p=(0,t.attr)("boolean"),f=(0,t.attr)("boolean"),b=(0,t.attr)("string"),h=(0,t.attr)("boolean",{defaultValue:()=>!0}),v=class extends t.default{constructor(...e){super(...e),D(this,"uri",y,this),D(this,"Name",g,this),D(this,"Healthy",O,this),D(this,"FailureTolerance",_,this),D(this,"OptimisticFailureTolerance",P,this),D(this,"Leader",w,this),D(this,"Voters",E,this),D(this,"Servers",k,this),D(this,"RedundancyZones",x,this),D(this,"Default",j,this),D(this,"ReadReplicas",C,this),D(this,"Local",S,this),D(this,"Primary",N,this),D(this,"DefaultACLPolicy",z,this),D(this,"MeshEnabled",M,this)}},y=T(v.prototype,"uri",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=T(v.prototype,"Name",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=T(v.prototype,"Healthy",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=T(v.prototype,"FailureTolerance",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=T(v.prototype,"OptimisticFailureTolerance",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=T(v.prototype,"Leader",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=T(v.prototype,"Voters",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=T(v.prototype,"Servers",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=T(v.prototype,"RedundancyZones",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=T(v.prototype,"Default",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=T(v.prototype,"ReadReplicas",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=T(v.prototype,"Local",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=T(v.prototype,"Primary",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=T(v.prototype,"DefaultACLPolicy",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=T(v.prototype,"MeshEnabled",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v)
+e.default=L})),define("consul-ui/models/discovery-chain",["exports","@ember-data/model"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h
+function v(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function y(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="ServiceName"
+let g=(n=(0,t.attr)("string"),r=(0,t.attr)("string"),a=(0,t.attr)("string"),l=(0,t.attr)("string"),s=(0,t.attr)("string"),i=(0,t.attr)(),o=(0,t.attr)(),u=class extends t.default{constructor(...e){super(...e),v(this,"uid",c,this),v(this,"ServiceName",d,this),v(this,"Datacenter",m,this),v(this,"Partition",p,this),v(this,"Namespace",f,this),v(this,"Chain",b,this),v(this,"meta",h,this)}},c=y(u.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=y(u.prototype,"ServiceName",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=y(u.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=y(u.prototype,"Partition",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=y(u.prototype,"Namespace",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=y(u.prototype,"Chain",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=y(u.prototype,"meta",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u)
+e.default=g})),define("consul-ui/models/gateway-config",["exports","ember-data-model-fragments/fragment","ember-data-model-fragments/attributes","@ember-data/model"],(function(e,t,n,r){var a,l,s,i,o
+function u(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function c(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let d=(a=(0,r.attr)("number",{defaultValue:()=>0}),l=(0,n.array)("string",{defaultValue:()=>[]}),s=class extends t.default{constructor(...e){super(...e),u(this,"AssociatedServiceCount",i,this),u(this,"Addresses",o,this)}},i=c(s.prototype,"AssociatedServiceCount",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o=c(s.prototype,"Addresses",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s)
+e.default=d}))
+define("consul-ui/models/health-check",["exports","ember-data-model-fragments/fragment","ember-data-model-fragments/attributes","@ember-data/model","consul-ui/decorators/replace"],(function(e,t,n,r,a){var l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x,j,C,S,N,z,M,D
+function T(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function L(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.schema=void 0
+e.schema={Status:{allowedValues:["passing","warning","critical"]},Type:{allowedValues:["serf","script","http","tcp","ttl","docker","grpc","alias"]}}
+let A=(l=(0,r.attr)("string"),s=(0,r.attr)("string"),i=(0,a.replace)("","serf"),o=(0,r.attr)("string"),u=(0,r.attr)("string"),c=(0,r.attr)("string"),d=(0,r.attr)("string"),m=(0,r.attr)("string"),p=(0,r.attr)("string"),f=(0,r.attr)("string"),b=(0,a.nullValue)([]),h=(0,n.array)("string"),v=(0,r.attr)(),y=(0,r.attr)("boolean"),g=Ember.computed("ServiceID"),O=Ember.computed("Type"),_=class extends t.default{constructor(...e){super(...e),T(this,"Name",P,this),T(this,"CheckID",w,this),T(this,"Type",E,this),T(this,"Status",k,this),T(this,"Notes",x,this),T(this,"Output",j,this),T(this,"ServiceName",C,this),T(this,"ServiceID",S,this),T(this,"Node",N,this),T(this,"ServiceTags",z,this),T(this,"Definition",M,this),T(this,"Exposed",D,this)}get Kind(){return""===this.ServiceID?"node":"service"}get Exposable(){return["http","grpc"].includes(this.Type)}},P=L(_.prototype,"Name",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=L(_.prototype,"CheckID",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=L(_.prototype,"Type",[i,o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=L(_.prototype,"Status",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=L(_.prototype,"Notes",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=L(_.prototype,"Output",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=L(_.prototype,"ServiceName",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=L(_.prototype,"ServiceID",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=L(_.prototype,"Node",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=L(_.prototype,"ServiceTags",[b,h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=L(_.prototype,"Definition",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=L(_.prototype,"Exposed",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L(_.prototype,"Kind",[g],Object.getOwnPropertyDescriptor(_.prototype,"Kind"),_.prototype),L(_.prototype,"Exposable",[O],Object.getOwnPropertyDescriptor(_.prototype,"Exposable"),_.prototype),_)
+e.default=A})),define("consul-ui/models/intention-permission-http-header",["exports","ember-data-model-fragments/fragment","@ember-data/model"],(function(e,t,n){var r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y
+function g(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function O(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.schema=void 0
+const _={Name:{required:!0},HeaderType:{allowedValues:["Exact","Prefix","Suffix","Regex","Present"]}}
+e.schema=_
+let P=(r=(0,n.attr)("string"),a=(0,n.attr)("string"),l=(0,n.attr)("string"),s=(0,n.attr)("string"),i=(0,n.attr)("string"),o=(0,n.attr)(),u=Ember.computed.or(..._.HeaderType.allowedValues),c=Ember.computed(..._.HeaderType.allowedValues),d=class extends t.default{constructor(...e){super(...e),g(this,"Name",m,this),g(this,"Exact",p,this),g(this,"Prefix",f,this),g(this,"Suffix",b,this),g(this,"Regex",h,this),g(this,"Present",v,this),g(this,"Value",y,this)}get HeaderType(){return _.HeaderType.allowedValues.find(e=>void 0!==this[e])}},m=O(d.prototype,"Name",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=O(d.prototype,"Exact",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=O(d.prototype,"Prefix",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=O(d.prototype,"Suffix",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=O(d.prototype,"Regex",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=O(d.prototype,"Present",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=O(d.prototype,"Value",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O(d.prototype,"HeaderType",[c],Object.getOwnPropertyDescriptor(d.prototype,"HeaderType"),d.prototype),d)
+e.default=P})),define("consul-ui/models/intention-permission-http",["exports","ember-data-model-fragments/fragment","ember-data-model-fragments/attributes","@ember-data/model"],(function(e,t,n,r){var a,l,s,i,o,u,c,d,m,p,f,b,h,v
+function y(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function g(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.schema=void 0
+const O={PathType:{allowedValues:["PathPrefix","PathExact","PathRegex"]},Methods:{allowedValues:["GET","HEAD","POST","PUT","DELETE","CONNECT","OPTIONS","TRACE","PATCH"]}}
+e.schema=O
+let _=(a=(0,r.attr)("string"),l=(0,r.attr)("string"),s=(0,r.attr)("string"),i=(0,n.fragmentArray)("intention-permission-http-header"),o=(0,n.array)("string"),u=Ember.computed.or(...O.PathType.allowedValues),c=Ember.computed(...O.PathType.allowedValues),d=class extends t.default{constructor(...e){super(...e),y(this,"PathExact",m,this),y(this,"PathPrefix",p,this),y(this,"PathRegex",f,this),y(this,"Header",b,this),y(this,"Methods",h,this),y(this,"Path",v,this)}get PathType(){return O.PathType.allowedValues.find(e=>"string"==typeof this[e])}},m=g(d.prototype,"PathExact",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=g(d.prototype,"PathPrefix",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=g(d.prototype,"PathRegex",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=g(d.prototype,"Header",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=g(d.prototype,"Methods",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=g(d.prototype,"Path",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g(d.prototype,"PathType",[c],Object.getOwnPropertyDescriptor(d.prototype,"PathType"),d.prototype),d)
+e.default=_})),define("consul-ui/models/intention-permission",["exports","ember-data-model-fragments/fragment","ember-data-model-fragments/attributes","@ember-data/model"],(function(e,t,n,r){var a,l,s,i,o
+function u(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function c(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.schema=void 0
+const d={Action:{defaultValue:"allow",allowedValues:["allow","deny"]}}
+e.schema=d
+let m=(a=(0,r.attr)("string",{defaultValue:()=>d.Action.defaultValue}),l=(0,n.fragment)("intention-permission-http"),s=class extends t.default{constructor(...e){super(...e),u(this,"Action",i,this),u(this,"HTTP",o,this)}},i=c(s.prototype,"Action",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o=c(s.prototype,"HTTP",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s)
+e.default=m})),define("consul-ui/models/intention",["exports","@ember-data/model","ember-data-model-fragments/attributes","consul-ui/decorators/replace"],(function(e,t,n,r){var a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x,j,C,S,N,z,M,D,T,L,A,R,I,B,H,$,U,F,q,K,Y,V,W,G,Q,Z,J
+function X(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function ee(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="ID"
+let te=(a=(0,t.attr)("string"),l=(0,t.attr)("string"),s=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string",{defaultValue:()=>"*"}),u=(0,t.attr)("string",{defaultValue:()=>"*"}),c=(0,t.attr)("string",{defaultValue:()=>"default"}),d=(0,t.attr)("string",{defaultValue:()=>"default"}),m=(0,t.attr)("string",{defaultValue:()=>"default"}),p=(0,t.attr)("string",{defaultValue:()=>"default"}),f=(0,t.attr)("number"),b=(0,t.attr)("string",{defaultValue:()=>"consul"}),h=(0,r.nullValue)(void 0),v=(0,t.attr)("string"),y=(0,t.attr)("string"),g=(0,t.attr)("boolean",{defaultValue:()=>!0}),O=(0,t.attr)("number"),_=(0,t.attr)("date"),P=(0,t.attr)("date"),w=(0,t.attr)("number"),E=(0,t.attr)("number"),k=(0,t.attr)(),x=(0,t.attr)({defaultValue:()=>[]}),j=(0,n.fragmentArray)("intention-permission"),C=Ember.computed("Meta"),S=class extends t.default{constructor(...e){super(...e),X(this,"uid",N,this),X(this,"ID",z,this),X(this,"Datacenter",M,this),X(this,"Description",D,this),X(this,"SourceName",T,this),X(this,"DestinationName",L,this),X(this,"SourceNS",A,this),X(this,"DestinationNS",R,this),X(this,"SourcePartition",I,this),X(this,"DestinationPartition",B,this),X(this,"Precedence",H,this),X(this,"SourceType",$,this),X(this,"Action",U,this),X(this,"LegacyID",F,this),X(this,"Legacy",q,this),X(this,"SyncTime",K,this),X(this,"CreatedAt",Y,this),X(this,"UpdatedAt",V,this),X(this,"CreateIndex",W,this),X(this,"ModifyIndex",G,this),X(this,"Meta",Q,this),X(this,"Resources",Z,this),X(this,"Permissions",J,this)}get IsManagedByCRD(){return void 0!==Object.entries(this.Meta||{}).find(([e,t])=>"external-source"===e&&"kubernetes"===t)}},N=ee(S.prototype,"uid",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=ee(S.prototype,"ID",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=ee(S.prototype,"Datacenter",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=ee(S.prototype,"Description",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=ee(S.prototype,"SourceName",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=ee(S.prototype,"DestinationName",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=ee(S.prototype,"SourceNS",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=ee(S.prototype,"DestinationNS",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=ee(S.prototype,"SourcePartition",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),B=ee(S.prototype,"DestinationPartition",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),H=ee(S.prototype,"Precedence",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),$=ee(S.prototype,"SourceType",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),U=ee(S.prototype,"Action",[h,v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=ee(S.prototype,"LegacyID",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),q=ee(S.prototype,"Legacy",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),K=ee(S.prototype,"SyncTime",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Y=ee(S.prototype,"CreatedAt",[_],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),V=ee(S.prototype,"UpdatedAt",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),W=ee(S.prototype,"CreateIndex",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),G=ee(S.prototype,"ModifyIndex",[E],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Q=ee(S.prototype,"Meta",[k],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Z=ee(S.prototype,"Resources",[x],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),J=ee(S.prototype,"Permissions",[j],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ee(S.prototype,"IsManagedByCRD",[C],Object.getOwnPropertyDescriptor(S.prototype,"IsManagedByCRD"),S.prototype),S)
+e.default=te})),define("consul-ui/models/kv",["exports","@ember-data/model","consul-ui/utils/isFolder","consul-ui/decorators/replace"],(function(e,t,n,r){var a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x,j,C,S,N,z,M,D,T,L
+function A(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function R(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="Key"
+let I=(a=(0,t.attr)("string"),l=(0,t.attr)("string"),s=(0,t.attr)("number"),i=(0,t.attr)(),o=(0,t.attr)("string"),u=(0,t.attr)("string"),c=(0,t.attr)("string"),d=(0,t.attr)("number"),m=(0,t.attr)("number"),p=(0,r.nullValue)(void 0),f=(0,t.attr)("string"),b=(0,t.attr)("number"),h=(0,t.attr)("number"),v=(0,t.attr)("string"),y=(0,t.attr)({defaultValue:()=>[]}),g=Ember.computed("isFolder"),O=Ember.computed("Key"),_=class extends t.default{constructor(...e){super(...e),A(this,"uid",P,this),A(this,"Key",w,this),A(this,"SyncTime",E,this),A(this,"meta",k,this),A(this,"Datacenter",x,this),A(this,"Namespace",j,this),A(this,"Partition",C,this),A(this,"LockIndex",S,this),A(this,"Flags",N,this),A(this,"Value",z,this),A(this,"CreateIndex",M,this),A(this,"ModifyIndex",D,this),A(this,"Session",T,this),A(this,"Resources",L,this)}get Kind(){return this.isFolder?"folder":"key"}get isFolder(){return(0,n.default)(this.Key||"")}},P=R(_.prototype,"uid",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=R(_.prototype,"Key",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=R(_.prototype,"SyncTime",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=R(_.prototype,"meta",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=R(_.prototype,"Datacenter",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=R(_.prototype,"Namespace",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=R(_.prototype,"Partition",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=R(_.prototype,"LockIndex",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=R(_.prototype,"Flags",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=R(_.prototype,"Value",[p,f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=R(_.prototype,"CreateIndex",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=R(_.prototype,"ModifyIndex",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=R(_.prototype,"Session",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=R(_.prototype,"Resources",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R(_.prototype,"Kind",[g],Object.getOwnPropertyDescriptor(_.prototype,"Kind"),_.prototype),R(_.prototype,"isFolder",[O],Object.getOwnPropertyDescriptor(_.prototype,"isFolder"),_.prototype),_)
+e.default=I})),define("consul-ui/models/license",["exports","@ember-data/model"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y
+function g(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function O(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uri"
+let _=(n=(0,t.attr)("string"),r=(0,t.attr)("boolean"),a=(0,t.attr)("number"),l=(0,t.attr)(),s=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),u=(0,t.attr)(),c=class extends t.default{constructor(...e){super(...e),g(this,"uri",d,this),g(this,"Valid",m,this),g(this,"SyncTime",p,this),g(this,"meta",f,this),g(this,"Datacenter",b,this),g(this,"Namespace",h,this),g(this,"Partition",v,this),g(this,"License",y,this)}},d=O(c.prototype,"uri",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=O(c.prototype,"Valid",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=O(c.prototype,"SyncTime",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=O(c.prototype,"meta",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=O(c.prototype,"Datacenter",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=O(c.prototype,"Namespace",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=O(c.prototype,"Partition",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=O(c.prototype,"License",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c)
+e.default=_})),define("consul-ui/models/node",["exports","@ember-data/model","ember-data-model-fragments/attributes"],(function(e,t,n){var r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x,j,C,S,N,z,M,D,T,L,A,R,I,B,H,$,U,F
+function q(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function K(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="ID"
+let Y=(r=(0,t.attr)("string"),a=(0,t.attr)("string"),l=(0,t.attr)("string"),s=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),u=(0,t.attr)("number"),c=(0,t.attr)("number"),d=(0,t.attr)("number"),m=(0,t.attr)(),p=(0,t.attr)(),f=(0,t.attr)(),b=(0,t.attr)({defaultValue:()=>[]}),h=(0,t.hasMany)("service-instance"),v=(0,n.fragmentArray)("health-check"),y=Ember.computed.filter("Services",e=>"connect-proxy"!==e.Service.Kind),g=Ember.computed.filter("Services",e=>"connect-proxy"===e.Service.Kind),O=Ember.computed.filter("Checks",e=>""===e.ServiceID),_=Ember.computed("ChecksCritical","ChecksPassing","ChecksWarning"),P=Ember.computed("NodeChecks.[]"),w=Ember.computed("NodeChecks.[]"),E=Ember.computed("NodeChecks.[]"),k=class extends t.default{constructor(...e){super(...e),q(this,"uid",x,this),q(this,"ID",j,this),q(this,"Datacenter",C,this),q(this,"Partition",S,this),q(this,"Address",N,this),q(this,"Node",z,this),q(this,"SyncTime",M,this),q(this,"CreateIndex",D,this),q(this,"ModifyIndex",T,this),q(this,"meta",L,this),q(this,"Meta",A,this),q(this,"TaggedAddresses",R,this),q(this,"Resources",I,this),q(this,"Services",B,this),q(this,"Checks",H,this),q(this,"MeshServiceInstances",$,this),q(this,"ProxyServiceInstances",U,this),q(this,"NodeChecks",F,this)}get Status(){switch(!0){case 0!==this.ChecksCritical:return"critical"
+case 0!==this.ChecksWarning:return"warning"
+case 0!==this.ChecksPassing:return"passing"
+default:return"empty"}}get ChecksCritical(){return this.NodeChecks.filter(e=>"critical"===e.Status).length}get ChecksPassing(){return this.NodeChecks.filter(e=>"passing"===e.Status).length}get ChecksWarning(){return this.NodeChecks.filter(e=>"warning"===e.Status).length}},x=K(k.prototype,"uid",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=K(k.prototype,"ID",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=K(k.prototype,"Datacenter",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=K(k.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=K(k.prototype,"Address",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=K(k.prototype,"Node",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=K(k.prototype,"SyncTime",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=K(k.prototype,"CreateIndex",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=K(k.prototype,"ModifyIndex",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=K(k.prototype,"meta",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=K(k.prototype,"Meta",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=K(k.prototype,"TaggedAddresses",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=K(k.prototype,"Resources",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),B=K(k.prototype,"Services",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),H=K(k.prototype,"Checks",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),$=K(k.prototype,"MeshServiceInstances",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),U=K(k.prototype,"ProxyServiceInstances",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=K(k.prototype,"NodeChecks",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),K(k.prototype,"Status",[_],Object.getOwnPropertyDescriptor(k.prototype,"Status"),k.prototype),K(k.prototype,"ChecksCritical",[P],Object.getOwnPropertyDescriptor(k.prototype,"ChecksCritical"),k.prototype),K(k.prototype,"ChecksPassing",[w],Object.getOwnPropertyDescriptor(k.prototype,"ChecksPassing"),k.prototype),K(k.prototype,"ChecksWarning",[E],Object.getOwnPropertyDescriptor(k.prototype,"ChecksWarning"),k.prototype),k)
+e.default=Y})),define("consul-ui/models/nspace",["exports","@ember-data/model"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P
+function w(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function E(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.NSPACE_KEY=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="Name"
+e.NSPACE_KEY="Namespace"
+let k=(n=(0,t.attr)("string"),r=(0,t.attr)("string"),a=(0,t.attr)("string"),l=(0,t.attr)("string"),s=(0,t.attr)("string"),i=(0,t.attr)("number"),o=(0,t.attr)("string",{defaultValue:()=>""}),u=(0,t.attr)({defaultValue:()=>[]}),c=(0,t.attr)("string"),d=(0,t.attr)({defaultValue:()=>({PolicyDefaults:[],RoleDefaults:[]})}),m=class extends t.default{constructor(...e){super(...e),w(this,"uid",p,this),w(this,"Name",f,this),w(this,"Datacenter",b,this),w(this,"Partition",h,this),w(this,"Namespace",v,this),w(this,"SyncTime",y,this),w(this,"Description",g,this),w(this,"Resources",O,this),w(this,"DeletedAt",_,this),w(this,"ACLs",P,this)}},p=E(m.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=E(m.prototype,"Name",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=E(m.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=E(m.prototype,"Partition",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=E(m.prototype,"Namespace",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=E(m.prototype,"SyncTime",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=E(m.prototype,"Description",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=E(m.prototype,"Resources",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=E(m.prototype,"DeletedAt",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=E(m.prototype,"ACLs",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m)
+e.default=k})),define("consul-ui/models/oidc-provider",["exports","@ember-data/model"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O
+function _(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function P(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="Name"
+let w=(n=(0,t.attr)("string"),r=(0,t.attr)("string"),a=(0,t.attr)("string"),l=(0,t.attr)("string"),s=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),u=(0,t.attr)("string"),c=(0,t.attr)(),d=class extends t.default{constructor(...e){super(...e),_(this,"uid",m,this),_(this,"Name",p,this),_(this,"Datacenter",f,this),_(this,"Namespace",b,this),_(this,"Partition",h,this),_(this,"Kind",v,this),_(this,"AuthURL",y,this),_(this,"DisplayName",g,this),_(this,"meta",O,this)}},m=P(d.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=P(d.prototype,"Name",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=P(d.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=P(d.prototype,"Namespace",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=P(d.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=P(d.prototype,"Kind",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=P(d.prototype,"AuthURL",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=P(d.prototype,"DisplayName",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=P(d.prototype,"meta",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d)
+e.default=w})),define("consul-ui/models/partition",["exports","ember-data/model","ember-data/attr"],(function(e,t,n){var r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_
+function P(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function w(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.PARTITION_KEY=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="Name"
+e.PARTITION_KEY="Partition"
+let E=(r=(0,n.default)("string"),a=(0,n.default)("string"),l=(0,n.default)("string"),s=(0,n.default)("string"),i=(0,n.default)("string"),o=(0,n.default)("string"),u=(0,n.default)("string"),c=(0,n.default)("number"),d=(0,n.default)(),m=class extends t.default{constructor(...e){super(...e),P(this,"uid",p,this),P(this,"Name",f,this),P(this,"Description",b,this),P(this,"DeletedAt",h,this),P(this,"Datacenter",v,this),P(this,"Namespace",y,this),P(this,"Partition",g,this),P(this,"SyncTime",O,this),P(this,"meta",_,this)}},p=w(m.prototype,"uid",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=w(m.prototype,"Name",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=w(m.prototype,"Description",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=w(m.prototype,"DeletedAt",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=w(m.prototype,"Datacenter",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=w(m.prototype,"Namespace",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=w(m.prototype,"Partition",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=w(m.prototype,"SyncTime",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=w(m.prototype,"meta",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m)
+e.default=E})),define("consul-ui/models/permission",["exports","@ember-data/model"],(function(e,t){var n,r,a,l,s,i,o,u,c
+function d(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function m(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let p=(n=(0,t.attr)("string"),r=(0,t.attr)("string"),a=(0,t.attr)("string"),l=(0,t.attr)("boolean"),s=class extends t.default{constructor(...e){super(...e),d(this,"Resource",i,this),d(this,"Segment",o,this),d(this,"Access",u,this),d(this,"Allow",c,this)}},i=m(s.prototype,"Resource",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o=m(s.prototype,"Segment",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=m(s.prototype,"Access",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=m(s.prototype,"Allow",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s)
+e.default=p})),define("consul-ui/models/policy",["exports","@ember-data/model"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x,j,C,S,N,z,M,D
+function T(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function L(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=e.MANAGEMENT_ID=void 0
+e.MANAGEMENT_ID="00000000-0000-0000-0000-000000000001"
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="ID"
+let A=(n=(0,t.attr)("string"),r=(0,t.attr)("string"),a=(0,t.attr)("string"),l=(0,t.attr)("string"),s=(0,t.attr)("string"),i=(0,t.attr)("string",{defaultValue:()=>""}),o=(0,t.attr)("string",{defaultValue:()=>""}),u=(0,t.attr)("string",{defaultValue:()=>""}),c=(0,t.attr)("number"),d=(0,t.attr)("number"),m=(0,t.attr)("number"),p=(0,t.attr)(),f=(0,t.attr)(),b=(0,t.attr)("string",{defaultValue:()=>""}),h=(0,t.attr)("number",{defaultValue:()=>(new Date).getTime()}),v=Ember.computed("ID"),y=class extends t.default{constructor(...e){super(...e),T(this,"uid",g,this),T(this,"ID",O,this),T(this,"Datacenter",_,this),T(this,"Namespace",P,this),T(this,"Partition",w,this),T(this,"Name",E,this),T(this,"Description",k,this),T(this,"Rules",x,this),T(this,"SyncTime",j,this),T(this,"CreateIndex",C,this),T(this,"ModifyIndex",S,this),T(this,"Datacenters",N,this),T(this,"meta",z,this),T(this,"template",M,this),T(this,"CreateTime",D,this)}get isGlobalManagement(){return"00000000-0000-0000-0000-000000000001"===this.ID}},g=L(y.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=L(y.prototype,"ID",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=L(y.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=L(y.prototype,"Namespace",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=L(y.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=L(y.prototype,"Name",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=L(y.prototype,"Description",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=L(y.prototype,"Rules",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=L(y.prototype,"SyncTime",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=L(y.prototype,"CreateIndex",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=L(y.prototype,"ModifyIndex",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=L(y.prototype,"Datacenters",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=L(y.prototype,"meta",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=L(y.prototype,"template",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=L(y.prototype,"CreateTime",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L(y.prototype,"isGlobalManagement",[v],Object.getOwnPropertyDescriptor(y.prototype,"isGlobalManagement"),y.prototype),y)
+e.default=A})),define("consul-ui/models/proxy",["exports","@ember-data/model","consul-ui/models/service-instance"],(function(e,t,n){var r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w
+function E(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function k(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="Node,ServiceID"
+let x=(r=(0,t.attr)("string"),a=(0,t.attr)("string"),l=(0,t.attr)("string"),s=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),u=(0,t.attr)("string"),c=(0,t.attr)("string"),d=(0,t.attr)("number"),m=(0,t.attr)(),p=class extends n.default{constructor(...e){super(...e),E(this,"uid",f,this),E(this,"ID",b,this),E(this,"Datacenter",h,this),E(this,"Namespace",v,this),E(this,"Partition",y,this),E(this,"ServiceName",g,this),E(this,"ServiceID",O,this),E(this,"NodeName",_,this),E(this,"SyncTime",P,this),E(this,"ServiceProxy",w,this)}},f=k(p.prototype,"uid",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=k(p.prototype,"ID",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=k(p.prototype,"Datacenter",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=k(p.prototype,"Namespace",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=k(p.prototype,"Partition",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=k(p.prototype,"ServiceName",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=k(p.prototype,"ServiceID",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=k(p.prototype,"NodeName",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=k(p.prototype,"SyncTime",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=k(p.prototype,"ServiceProxy",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p)
+e.default=x})),define("consul-ui/models/role",["exports","@ember-data/model"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x,j,C,S,N,z,M,D,T
+function L(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function A(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="ID"
+let R=(n=(0,t.attr)("string"),r=(0,t.attr)("string"),a=(0,t.attr)("string"),l=(0,t.attr)("string"),s=(0,t.attr)("string"),i=(0,t.attr)("string",{defaultValue:()=>""}),o=(0,t.attr)("string",{defaultValue:()=>""}),u=(0,t.attr)({defaultValue:()=>[]}),c=(0,t.attr)({defaultValue:()=>[]}),d=(0,t.attr)({defaultValue:()=>[]}),m=(0,t.attr)("number"),p=(0,t.attr)("number"),f=(0,t.attr)("number"),b=(0,t.attr)("number"),h=(0,t.attr)(),v=(0,t.attr)("string"),y=class extends t.default{constructor(...e){super(...e),L(this,"uid",g,this),L(this,"ID",O,this),L(this,"Datacenter",_,this),L(this,"Namespace",P,this),L(this,"Partition",w,this),L(this,"Name",E,this),L(this,"Description",k,this),L(this,"Policies",x,this),L(this,"ServiceIdentities",j,this),L(this,"NodeIdentities",C,this),L(this,"SyncTime",S,this),L(this,"CreateIndex",N,this),L(this,"ModifyIndex",z,this),L(this,"CreateTime",M,this),L(this,"Datacenters",D,this),L(this,"Hash",T,this)}},g=A(y.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=A(y.prototype,"ID",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=A(y.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=A(y.prototype,"Namespace",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=A(y.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=A(y.prototype,"Name",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=A(y.prototype,"Description",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=A(y.prototype,"Policies",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=A(y.prototype,"ServiceIdentities",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=A(y.prototype,"NodeIdentities",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=A(y.prototype,"SyncTime",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=A(y.prototype,"CreateIndex",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=A(y.prototype,"ModifyIndex",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=A(y.prototype,"CreateTime",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=A(y.prototype,"Datacenters",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=A(y.prototype,"Hash",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y)
+e.default=R})),define("consul-ui/models/service-instance",["exports","@ember-data/model","ember-data-model-fragments/attributes"],(function(e,t,n){var r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x,j,C,S,N,z,M,D,T,L,A,R,I,B,H,$,U,F,q,K,Y,V,W,G,Q,Z,J,X,ee,te
+function ne(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function re(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.Collection=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="Node.Node,Service.ID"
+const ae=(r=Ember._tracked,l=re((a=class{constructor(e){ne(this,"items",l,this),this.items=e}get ExternalSources(){const e=this.items.reduce((function(e,t){return e.concat(t.ExternalSources||[])}),[])
+return[...new Set(e)].filter(Boolean).sort()}}).prototype,"items",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a)
+e.Collection=ae
+let le=(s=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)(),u=(0,t.attr)(),c=(0,t.attr)(),d=(0,n.fragmentArray)("health-check"),m=(0,t.attr)("number"),p=(0,t.attr)(),f=(0,t.attr)({defaultValue:()=>[]}),b=Ember.computed.alias("Service.Service"),h=Ember.computed.or("Service.{ID,Service}"),v=Ember.computed.or("Service.Address","Node.Service"),y=(0,t.attr)("string"),g=Ember.computed.alias("Service.Tags"),O=Ember.computed.alias("Service.Meta"),_=Ember.computed.alias("Service.Namespace"),P=Ember.computed.alias("Service.Partition"),w=Ember.computed.filter("Checks.@each.Kind",e=>"service"===e.Kind),E=Ember.computed.filter("Checks.@each.Kind",e=>"node"===e.Kind),k=Ember.computed("Service.Meta"),x=Ember.computed("Service.Kind"),j=Ember.computed("Service.Kind"),C=Ember.computed("IsOrigin"),S=Ember.computed("ChecksPassing","ChecksWarning","ChecksCritical"),N=Ember.computed("Checks.[]"),z=Ember.computed("Checks.[]"),M=Ember.computed("Checks.[]"),D=Ember.computed("Checks.[]","ChecksPassing"),T=Ember.computed("Checks.[]","ChecksWarning"),L=Ember.computed("Checks.[]","ChecksCritical"),A=class extends t.default{constructor(...e){super(...e),ne(this,"uid",R,this),ne(this,"Datacenter",I,this),ne(this,"Proxy",B,this),ne(this,"Node",H,this),ne(this,"Service",$,this),ne(this,"Checks",U,this),ne(this,"SyncTime",F,this),ne(this,"meta",q,this),ne(this,"Resources",K,this),ne(this,"Name",Y,this),ne(this,"ID",V,this),ne(this,"Address",W,this),ne(this,"SocketPath",G,this),ne(this,"Tags",Q,this),ne(this,"Meta",Z,this),ne(this,"Namespace",J,this),ne(this,"Partition",X,this),ne(this,"ServiceChecks",ee,this),ne(this,"NodeChecks",te,this)}get ExternalSources(){const e=Object.entries(this.Service.Meta||{}).filter(([e,t])=>"external-source"===e).map(([e,t])=>t)
+return[...new Set(e)]}get IsProxy(){return["connect-proxy","mesh-gateway","ingress-gateway","terminating-gateway"].includes(this.Service.Kind)}get IsOrigin(){return!["connect-proxy","mesh-gateway"].includes(this.Service.Kind)}get IsMeshOrigin(){return this.IsOrigin&&!["terminating-gateway"].includes(this.Service.Kind)}get Status(){switch(!0){case 0!==this.ChecksCritical.length:return"critical"
+case 0!==this.ChecksWarning.length:return"warning"
+case 0!==this.ChecksPassing.length:return"passing"
+default:return"empty"}}get ChecksPassing(){return this.Checks.filter(e=>"passing"===e.Status)}get ChecksWarning(){return this.Checks.filter(e=>"warning"===e.Status)}get ChecksCritical(){return this.Checks.filter(e=>"critical"===e.Status)}get PercentageChecksPassing(){return this.ChecksPassing.length/this.Checks.length*100}get PercentageChecksWarning(){return this.ChecksWarning.length/this.Checks.length*100}get PercentageChecksCritical(){return this.ChecksCritical.length/this.Checks.length*100}},R=re(A.prototype,"uid",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=re(A.prototype,"Datacenter",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),B=re(A.prototype,"Proxy",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),H=re(A.prototype,"Node",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),$=re(A.prototype,"Service",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),U=re(A.prototype,"Checks",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=re(A.prototype,"SyncTime",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),q=re(A.prototype,"meta",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),K=re(A.prototype,"Resources",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Y=re(A.prototype,"Name",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),V=re(A.prototype,"ID",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),W=re(A.prototype,"Address",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),G=re(A.prototype,"SocketPath",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Q=re(A.prototype,"Tags",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Z=re(A.prototype,"Meta",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),J=re(A.prototype,"Namespace",[_],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),X=re(A.prototype,"Partition",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ee=re(A.prototype,"ServiceChecks",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),te=re(A.prototype,"NodeChecks",[E],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),re(A.prototype,"ExternalSources",[k],Object.getOwnPropertyDescriptor(A.prototype,"ExternalSources"),A.prototype),re(A.prototype,"IsProxy",[x],Object.getOwnPropertyDescriptor(A.prototype,"IsProxy"),A.prototype),re(A.prototype,"IsOrigin",[j],Object.getOwnPropertyDescriptor(A.prototype,"IsOrigin"),A.prototype),re(A.prototype,"IsMeshOrigin",[C],Object.getOwnPropertyDescriptor(A.prototype,"IsMeshOrigin"),A.prototype),re(A.prototype,"Status",[S],Object.getOwnPropertyDescriptor(A.prototype,"Status"),A.prototype),re(A.prototype,"ChecksPassing",[N],Object.getOwnPropertyDescriptor(A.prototype,"ChecksPassing"),A.prototype),re(A.prototype,"ChecksWarning",[z],Object.getOwnPropertyDescriptor(A.prototype,"ChecksWarning"),A.prototype),re(A.prototype,"ChecksCritical",[M],Object.getOwnPropertyDescriptor(A.prototype,"ChecksCritical"),A.prototype),re(A.prototype,"PercentageChecksPassing",[D],Object.getOwnPropertyDescriptor(A.prototype,"PercentageChecksPassing"),A.prototype),re(A.prototype,"PercentageChecksWarning",[T],Object.getOwnPropertyDescriptor(A.prototype,"PercentageChecksWarning"),A.prototype),re(A.prototype,"PercentageChecksCritical",[L],Object.getOwnPropertyDescriptor(A.prototype,"PercentageChecksCritical"),A.prototype),A)
+e.default=le})),define("consul-ui/models/service",["exports","@ember-data/model","ember-data-model-fragments/attributes","consul-ui/decorators/replace"],(function(e,t,n,r){var a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x,j,C,S,N,z,M,D,T,L,A,R,I,B,H,$,U,F,q,K,Y,V,W,G,Q,Z,J,X,ee,te,ne,re,ae,le,se,ie,oe,ue
+function ce(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function de(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.Collection=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="Name"
+const me=(a=Ember._tracked,s=de((l=class{constructor(e){ce(this,"items",s,this),this.items=e}get ExternalSources(){const e=this.items.reduce((function(e,t){return e.concat(t.ExternalSources||[])}),[])
+return[...new Set(e)].filter(Boolean).sort()}get Partitions(){return[...new Set(this.items.map(e=>e.Partition))].sort()}}).prototype,"items",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),l)
+e.Collection=me
+let pe=(i=(0,t.attr)("string"),o=(0,t.attr)("string"),u=(0,t.attr)("string"),c=(0,t.attr)("string"),d=(0,t.attr)("string"),m=(0,t.attr)("string"),p=(0,t.attr)("number"),f=(0,t.attr)("number"),b=(0,t.attr)("number"),h=(0,t.attr)("number"),v=(0,t.attr)("boolean"),y=(0,t.attr)("boolean"),g=(0,t.attr)({defaultValue:()=>[]}),O=(0,t.attr)("number"),_=(0,t.attr)("number"),P=(0,t.attr)("number"),w=(0,r.nullValue)([]),E=(0,t.attr)({defaultValue:()=>[]}),k=(0,t.attr)(),x=(0,t.attr)(),j=(0,n.fragment)("gateway-config"),C=(0,r.nullValue)([]),S=(0,t.attr)(),N=(0,t.attr)(),z=(0,t.attr)(),M=Ember.computed("ChecksPassing","ChecksWarning","ChecksCritical"),D=Ember.computed("MeshChecksPassing","MeshChecksWarning","MeshChecksCritical"),T=Ember.computed("ConnectedWithProxy","ConnectedWithGateway"),L=Ember.computed("MeshEnabled","Kind"),A=Ember.computed("MeshChecksPassing","MeshChecksWarning","MeshChecksCritical"),R=Ember.computed("ChecksPassing","Proxy.ChecksPassing"),I=Ember.computed("ChecksWarning","Proxy.ChecksWarning"),B=Ember.computed("ChecksCritical","Proxy.ChecksCritical"),H=class extends t.default{constructor(...e){super(...e),ce(this,"uid",$,this),ce(this,"Name",U,this),ce(this,"Datacenter",F,this),ce(this,"Namespace",q,this),ce(this,"Partition",K,this),ce(this,"Kind",Y,this),ce(this,"ChecksPassing",V,this),ce(this,"ChecksCritical",W,this),ce(this,"ChecksWarning",G,this),ce(this,"InstanceCount",Q,this),ce(this,"ConnectedWithGateway",Z,this),ce(this,"ConnectedWithProxy",J,this),ce(this,"Resources",X,this),ce(this,"SyncTime",ee,this),ce(this,"CreateIndex",te,this),ce(this,"ModifyIndex",ne,this),ce(this,"Tags",re,this),ce(this,"Nodes",ae,this),ce(this,"Proxy",le,this),ce(this,"GatewayConfig",se,this),ce(this,"ExternalSources",ie,this),ce(this,"Meta",oe,this),ce(this,"meta",ue,this)}get ChecksTotal(){return this.ChecksPassing+this.ChecksWarning+this.ChecksCritical}get MeshChecksTotal(){return this.MeshChecksPassing+this.MeshChecksWarning+this.MeshChecksCritical}get MeshEnabled(){return this.ConnectedWithProxy||this.ConnectedWithGateway}get InMesh(){return this.MeshEnabled||(this.Kind||"").length>0}get MeshStatus(){switch(!0){case 0!==this.MeshChecksCritical:return"critical"
+case 0!==this.MeshChecksWarning:return"warning"
+case 0!==this.MeshChecksPassing:return"passing"
+default:return"empty"}}get MeshChecksPassing(){let e=0
+return void 0!==this.Proxy&&(e=this.Proxy.ChecksPassing),this.ChecksPassing+e}get MeshChecksWarning(){let e=0
+return void 0!==this.Proxy&&(e=this.Proxy.ChecksWarning),this.ChecksWarning+e}get MeshChecksCritical(){let e=0
+return void 0!==this.Proxy&&(e=this.Proxy.ChecksCritical),this.ChecksCritical+e}},$=de(H.prototype,"uid",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),U=de(H.prototype,"Name",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=de(H.prototype,"Datacenter",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),q=de(H.prototype,"Namespace",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),K=de(H.prototype,"Partition",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Y=de(H.prototype,"Kind",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),V=de(H.prototype,"ChecksPassing",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),W=de(H.prototype,"ChecksCritical",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),G=de(H.prototype,"ChecksWarning",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Q=de(H.prototype,"InstanceCount",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Z=de(H.prototype,"ConnectedWithGateway",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),J=de(H.prototype,"ConnectedWithProxy",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),X=de(H.prototype,"Resources",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ee=de(H.prototype,"SyncTime",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),te=de(H.prototype,"CreateIndex",[_],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ne=de(H.prototype,"ModifyIndex",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),re=de(H.prototype,"Tags",[w,E],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ae=de(H.prototype,"Nodes",[k],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),le=de(H.prototype,"Proxy",[x],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),se=de(H.prototype,"GatewayConfig",[j],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ie=de(H.prototype,"ExternalSources",[C,S],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),oe=de(H.prototype,"Meta",[N],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ue=de(H.prototype,"meta",[z],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),de(H.prototype,"ChecksTotal",[M],Object.getOwnPropertyDescriptor(H.prototype,"ChecksTotal"),H.prototype),de(H.prototype,"MeshChecksTotal",[D],Object.getOwnPropertyDescriptor(H.prototype,"MeshChecksTotal"),H.prototype),de(H.prototype,"MeshEnabled",[T],Object.getOwnPropertyDescriptor(H.prototype,"MeshEnabled"),H.prototype),de(H.prototype,"InMesh",[L],Object.getOwnPropertyDescriptor(H.prototype,"InMesh"),H.prototype),de(H.prototype,"MeshStatus",[A],Object.getOwnPropertyDescriptor(H.prototype,"MeshStatus"),H.prototype),de(H.prototype,"MeshChecksPassing",[R],Object.getOwnPropertyDescriptor(H.prototype,"MeshChecksPassing"),H.prototype),de(H.prototype,"MeshChecksWarning",[I],Object.getOwnPropertyDescriptor(H.prototype,"MeshChecksWarning"),H.prototype),de(H.prototype,"MeshChecksCritical",[B],Object.getOwnPropertyDescriptor(H.prototype,"MeshChecksCritical"),H.prototype),H)
+e.default=pe})),define("consul-ui/models/session",["exports","@ember-data/model","consul-ui/decorators/replace"],(function(e,t,n){var r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x,j,C,S,N,z,M,D,T,L,A,R,I
+function B(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function H(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="ID"
+let $=(r=(0,t.attr)("string"),a=(0,t.attr)("string"),l=(0,t.attr)("string"),s=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),u=(0,t.attr)("string"),c=(0,t.attr)("string"),d=(0,t.attr)("string"),m=(0,t.attr)("number"),p=(0,t.attr)("number"),f=(0,t.attr)("number"),b=(0,t.attr)("number"),h=(0,n.nullValue)([]),v=(0,t.attr)({defaultValue:()=>[]}),y=(0,n.nullValue)([]),g=(0,t.attr)({defaultValue:()=>[]}),O=(0,t.attr)({defaultValue:()=>[]}),_=Ember.computed("NodeChecks","ServiceChecks"),P=class extends t.default{constructor(...e){super(...e),B(this,"uid",w,this),B(this,"ID",E,this),B(this,"Name",k,this),B(this,"Datacenter",x,this),B(this,"Namespace",j,this),B(this,"Partition",C,this),B(this,"Node",S,this),B(this,"Behavior",N,this),B(this,"TTL",z,this),B(this,"LockDelay",M,this),B(this,"SyncTime",D,this),B(this,"CreateIndex",T,this),B(this,"ModifyIndex",L,this),B(this,"NodeChecks",A,this),B(this,"ServiceChecks",R,this),B(this,"Resources",I,this)}get checks(){return[...this.NodeChecks,...this.ServiceChecks.map(({ID:e})=>e)]}},w=H(P.prototype,"uid",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=H(P.prototype,"ID",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=H(P.prototype,"Name",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=H(P.prototype,"Datacenter",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=H(P.prototype,"Namespace",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=H(P.prototype,"Partition",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=H(P.prototype,"Node",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=H(P.prototype,"Behavior",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=H(P.prototype,"TTL",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=H(P.prototype,"LockDelay",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=H(P.prototype,"SyncTime",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=H(P.prototype,"CreateIndex",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=H(P.prototype,"ModifyIndex",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=H(P.prototype,"NodeChecks",[h,v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=H(P.prototype,"ServiceChecks",[y,g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=H(P.prototype,"Resources",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),H(P.prototype,"checks",[_],Object.getOwnPropertyDescriptor(P.prototype,"checks"),P.prototype),P)
+e.default=$})),define("consul-ui/models/token",["exports","@ember-data/model","consul-ui/models/policy"],(function(e,t,n){var r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x,j,C,S,N,z,M,D,T,L,A,R,I,B,H,$,U,F,q,K,Y,V,W,G
+function Q(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function Z(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="AccessorID"
+let J=(r=(0,t.attr)("string"),a=(0,t.attr)("string"),l=(0,t.attr)("string"),s=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("string"),u=(0,t.attr)("string"),c=(0,t.attr)("boolean"),d=(0,t.attr)("boolean"),m=(0,t.attr)("string",{defaultValue:()=>""}),p=(0,t.attr)(),f=(0,t.attr)({defaultValue:()=>[]}),b=(0,t.attr)({defaultValue:()=>[]}),h=(0,t.attr)({defaultValue:()=>[]}),v=(0,t.attr)({defaultValue:()=>[]}),y=(0,t.attr)("date"),g=(0,t.attr)("string"),O=(0,t.attr)("number"),_=(0,t.attr)("number"),P=(0,t.attr)("string"),w=(0,t.attr)("string",{defaultValue:()=>""}),E=(0,t.attr)("string"),k=Ember.computed("Policies.[]"),x=Ember.computed("SecretID"),j=class extends t.default{constructor(...e){super(...e),Q(this,"uid",C,this),Q(this,"AccessorID",S,this),Q(this,"Datacenter",N,this),Q(this,"Namespace",z,this),Q(this,"Partition",M,this),Q(this,"IDPName",D,this),Q(this,"SecretID",T,this),Q(this,"Legacy",L,this),Q(this,"Local",A,this),Q(this,"Description",R,this),Q(this,"meta",I,this),Q(this,"Policies",B,this),Q(this,"Roles",H,this),Q(this,"ServiceIdentities",$,this),Q(this,"NodeIdentities",U,this),Q(this,"CreateTime",F,this),Q(this,"Hash",q,this),Q(this,"CreateIndex",K,this),Q(this,"ModifyIndex",Y,this),Q(this,"Type",V,this),Q(this,"Name",W,this),Q(this,"Rules",G,this)}get isGlobalManagement(){return(this.Policies||[]).find(e=>e.ID===n.MANAGEMENT_ID)}get hasSecretID(){return""!==this.SecretID&&"<hidden>"!==this.SecretID}},C=Z(j.prototype,"uid",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=Z(j.prototype,"AccessorID",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=Z(j.prototype,"Datacenter",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=Z(j.prototype,"Namespace",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=Z(j.prototype,"Partition",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=Z(j.prototype,"IDPName",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=Z(j.prototype,"SecretID",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=Z(j.prototype,"Legacy",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=Z(j.prototype,"Local",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=Z(j.prototype,"Description",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=Z(j.prototype,"meta",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),B=Z(j.prototype,"Policies",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),H=Z(j.prototype,"Roles",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),$=Z(j.prototype,"ServiceIdentities",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),U=Z(j.prototype,"NodeIdentities",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=Z(j.prototype,"CreateTime",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),q=Z(j.prototype,"Hash",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),K=Z(j.prototype,"CreateIndex",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Y=Z(j.prototype,"ModifyIndex",[_],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),V=Z(j.prototype,"Type",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),W=Z(j.prototype,"Name",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),G=Z(j.prototype,"Rules",[E],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Z(j.prototype,"isGlobalManagement",[k],Object.getOwnPropertyDescriptor(j.prototype,"isGlobalManagement"),j.prototype),Z(j.prototype,"hasSecretID",[x],Object.getOwnPropertyDescriptor(j.prototype,"hasSecretID"),j.prototype),j)
+e.default=J})),define("consul-ui/models/topology",["exports","@ember-data/model"],(function(e,t){var n,r,a,l,s,i,o,u,c,d,m,p,f,b,h,v,y,g,O,_,P,w,E,k,x,j,C,S
+function N(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function z(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SLUG_KEY=e.PRIMARY_KEY=void 0
+e.PRIMARY_KEY="uid"
+e.SLUG_KEY="ServiceName"
+let M=(n=(0,t.attr)("string"),r=(0,t.attr)("string"),a=(0,t.attr)("string"),l=(0,t.attr)("string"),s=(0,t.attr)("string"),i=(0,t.attr)("string"),o=(0,t.attr)("boolean"),u=(0,t.attr)("boolean"),c=(0,t.attr)("boolean"),d=(0,t.attr)(),m=(0,t.attr)(),p=(0,t.attr)(),f=Ember.computed("Downstreams"),b=Ember.computed("Downstreams","Upstreams"),h=Ember.computed("Downstreams","Upstreams"),v=class extends t.default{constructor(...e){super(...e),N(this,"uid",y,this),N(this,"ServiceName",g,this),N(this,"Datacenter",O,this),N(this,"Namespace",_,this),N(this,"Partition",P,this),N(this,"Protocol",w,this),N(this,"FilteredByACLs",E,this),N(this,"TransparentProxy",k,this),N(this,"ConnectNative",x,this),N(this,"Upstreams",j,this),N(this,"Downstreams",C,this),N(this,"meta",S,this)}get notDefinedIntention(){let e=!1
+return e=0!==this.Downstreams.filter(e=>"specific-intention"===e.Source&&!e.TransparentProxy&&!e.ConnectNative&&e.Intention.Allowed).length,e}get wildcardIntention(){const e=0!==this.Downstreams.filter(e=>!e.Intention.HasExact&&e.Intention.Allowed).length,t=0!==this.Upstreams.filter(e=>!e.Intention.HasExact&&e.Intention.Allowed).length
+return e||t}get noDependencies(){return 0===this.Upstreams.length&&0===this.Downstreams.length}},y=z(v.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=z(v.prototype,"ServiceName",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=z(v.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=z(v.prototype,"Namespace",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=z(v.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=z(v.prototype,"Protocol",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=z(v.prototype,"FilteredByACLs",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=z(v.prototype,"TransparentProxy",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=z(v.prototype,"ConnectNative",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=z(v.prototype,"Upstreams",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=z(v.prototype,"Downstreams",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=z(v.prototype,"meta",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z(v.prototype,"notDefinedIntention",[f],Object.getOwnPropertyDescriptor(v.prototype,"notDefinedIntention"),v.prototype),z(v.prototype,"wildcardIntention",[b],Object.getOwnPropertyDescriptor(v.prototype,"wildcardIntention"),v.prototype),z(v.prototype,"noDependencies",[h],Object.getOwnPropertyDescriptor(v.prototype,"noDependencies"),v.prototype),v)
+e.default=M})),define("consul-ui/modifiers/aria-menu",["exports","ember-modifier"],(function(e,t){var n,r,a,l,s
+function i(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const o={vertical:{40:(e,t=-1)=>(t+1)%e.length,38:(e,t=0)=>0===t?e.length-1:t-1,36:()=>0,35:e=>e.length-1},horizontal:{}}
+let u=(n=Ember.inject.service("-document"),r=Ember._action,a=Ember._action,l=class extends t.default{constructor(...e){var t,n,r,a,l,i,o
+super(...e),t=this,n="doc",a=this,(r=s)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0}),o="vertical",(i="orientation")in(l=this)?Object.defineProperty(l,i,{value:o,enumerable:!0,configurable:!0,writable:!0}):l[i]=o}async keydown(e){if(27===e.keyCode)return this.options.onclose(e),void this.$trigger.focus()
+const t=[...this.element.querySelectorAll('[role^="menuitem"]')],n=t.findIndex(e=>e===this.doc.activeElement)
+9!==e.keyCode?void 0!==o[this.orientation][e.keyCode]&&(t[o[this.orientation][e.keyCode](t,n)].focus(),e.stopPropagation(),e.preventDefault()):e.shiftKey?0===n&&(this.options.onclose(e),this.$trigger.focus()):n===t.length-1&&(await new Promise(e=>setTimeout(e,0)),this.options.onclose(e))}async focus(e){""===e.pointerType&&(await Promise.resolve(),this.keydown({keyCode:36,stopPropagation:()=>{},preventDefault:()=>{}}))}connect(e,t){this.$trigger=this.doc.getElementById(this.element.getAttribute("aria-labelledby")),void 0!==t.openEvent&&this.focus(t.openEvent),this.doc.addEventListener("keydown",this.keydown)}disconnect(){this.doc.removeEventListener("keydown",this.keydown)}didReceiveArguments(){this.params=this.args.positional,this.options=this.args.named}didInstall(){this.connect(this.args.positional,this.args.named)}willRemove(){this.disconnect()}},s=i(l.prototype,"doc",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i(l.prototype,"keydown",[r],Object.getOwnPropertyDescriptor(l.prototype,"keydown"),l.prototype),i(l.prototype,"focus",[a],Object.getOwnPropertyDescriptor(l.prototype,"focus"),l.prototype),l)
+e.default=u})),define("consul-ui/modifiers/attach-shadow",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember._setModifierManager(()=>({capabilities:Ember._modifierManagerCapabilities("3.13",{disableAutoTracking:!0}),createModifier(){},installModifier(e,t,n){let r,{positional:[a,...l],named:s}=n
+try{r=t.attachShadow({mode:"open"})}catch(i){console.error(i)}a(r)},updateModifier(){},destroyModifier(){}}),class{})
+e.default=t})),define("consul-ui/modifiers/css-prop",["exports","ember-modifier"],(function(e,t){var n,r,a
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let l=(n=Ember.inject.service("-document"),r=class extends t.default{constructor(...e){var t,n,r,l
+super(...e),t=this,n="doc",l=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(l):void 0})}didReceiveArguments(){const e=this.args.positional,t=this.args.named;(e[1]||t.returns)(this.doc.defaultView.getComputedStyle(this.element).getPropertyValue(e[0]))}},s=r.prototype,i="doc",o=[n],u={configurable:!0,enumerable:!0,writable:!0,initializer:null},d={},Object.keys(u).forEach((function(e){d[e]=u[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=o.slice().reverse().reduce((function(e,t){return t(s,i,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(s,i,d),d=null),a=d,r)
+var s,i,o,u,c,d
+e.default=l})),define("consul-ui/modifiers/css-props",["exports","ember-modifier"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=Object.fromEntries([...document.styleSheets].reduce((e,t)=>e.concat([...t.cssRules].filter(e=>1===e.type).reduce((e,t)=>[...e,...[...t.style].filter(e=>e.startsWith("--")).map(e=>[e.trim(),t.style.getPropertyValue(e).trim()])],[])),[]))
+var r=(0,t.modifier)((function(e,[t],r){const a=new RegExp(`^--${r.prefix||"."}${r.group||""}+`),l={}
+Object.entries(n).forEach(([e,t])=>{const n=e.match(a)
+if(n){let a=n[0]
+"-"===a.charAt(a.length-1)&&(a=a.substr(0,a.length-1)),r.group?(void 0===l[a]&&(l[a]={}),l[a][e]=t):l[e]=t}}),t(l)}))
+e.default=r})),define("consul-ui/modifiers/did-insert",["exports","@ember/render-modifiers/modifiers/did-insert"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/modifiers/did-update",["exports","@ember/render-modifiers/modifiers/did-update"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/modifiers/did-upsert",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=e=>({target:e.element,currentTarget:e.element})
+var n=Ember._setModifierManager(()=>({capabilities:Ember._modifierManagerCapabilities("3.13",{disableAutoTracking:!0}),createModifier:()=>({element:null}),installModifier(e,n,r){e.element=n
+const[a,...l]=r.positional
+a(t(e),l,r.named)},updateModifier(e,n){const[r,...a]=n.positional
+r(t(e),a,n.named)},destroyModifier(){}}),class{})
+e.default=n})),define("consul-ui/modifiers/disabled",["exports","ember-modifier"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=(0,t.modifier)((function(e,[t=!0]){if(["input","textarea","select","button"].includes(e.nodeName.toLowerCase()))t?(e.setAttribute("disabled",t),e.setAttribute("aria-disabled",t)):(e.dataset.disabled=!1,e.removeAttribute("disabled"),e.removeAttribute("aria-disabled"))
+else for(const n of e.querySelectorAll("input,textarea,button"))t&&"false"!==n.dataset.disabled?(e.setAttribute("disabled",t),e.setAttribute("aria-disabled",t)):(e.removeAttribute("disabled"),e.removeAttribute("aria-disabled"))}))
+e.default=n})),define("consul-ui/modifiers/in-viewport",["exports","ember-in-viewport/modifiers/in-viewport"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/modifiers/notification",["exports","ember-modifier"],(function(e,t){var n,r,a
+function l(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function s(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let i=(n=Ember.inject.service("flashMessages"),r=class extends t.default{constructor(...e){var t,n,r,l
+super(...e),t=this,n="notify",l=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(l):void 0})}didInstall(){this.element.setAttribute("role","alert"),this.element.dataset.notification=null
+const e=function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?l(Object(n),!0).forEach((function(t){s(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({timeout:6e3,extendedTimeout:300},this.args.named)
+e.dom=this.element.outerHTML,this.element.remove(),this.notify.clearMessages(),"function"==typeof e.after?Promise.resolve().then(()=>e.after()).catch(e=>{if("TransitionAborted"!==e.name)throw e}).then(()=>{this.notify.add(e)}):this.notify.add(e)}willDestroy(){this.args.named.sticky&&this.notify.clearMessages()}},o=r.prototype,u="notify",c=[n],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(d).forEach((function(e){p[e]=d[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=c.slice().reverse().reduce((function(e,t){return t(o,u,e)||e}),p),m&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(m):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(o,u,p),p=null),a=p,r)
+var o,u,c,d,m,p
+e.default=i}))
+define("consul-ui/modifiers/on-outside",["exports","ember-modifier"],(function(e,t){var n,r,a,l
+function s(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let i=(n=Ember.inject.service("dom"),r=Ember._action,a=class extends t.default{constructor(){var e,t,n,r
+super(...arguments),e=this,t="dom",r=this,(n=l)&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0}),this.doc=this.dom.document()}async connect(e,t){await new Promise(e=>setTimeout(e,0))
+try{this.doc.addEventListener(e[0],this.listen)}catch(n){}}listen(e){if(this.dom.isOutside(this.element,e.target)){("function"==typeof this.params[1]?this.params[1]:()=>{}).apply(this.element,[e])}}disconnect(){this.doc.removeEventListener("click",this.listen)}didReceiveArguments(){this.params=this.args.positional,this.options=this.args.named}didInstall(){this.connect(this.args.positional,this.args.named)}willRemove(){this.disconnect()}},l=s(a.prototype,"dom",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s(a.prototype,"listen",[r],Object.getOwnPropertyDescriptor(a.prototype,"listen"),a.prototype),a)
+e.default=i})),define("consul-ui/modifiers/on-resize",["exports","ember-on-resize-modifier/modifiers/on-resize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/modifiers/ref",["exports","ember-ref-modifier/modifiers/ref"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/modifiers/style",["exports","ember-modifier"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{setStyles(e=[]){const t=this._oldStyles||new Set
+Array.isArray(e)||(e=Object.entries(e)),e.forEach(([e,n])=>{let r=""
+n.length>0&&n.includes("!important")&&(r="important",n=n.replace("!important","")),this.element.style.setProperty(e,n,r),t.delete(e)}),t.forEach(e=>this.element.style.removeProperty(e)),this._oldStyles=new Set(e.map(e=>e[0]))}didReceiveArguments(){void 0!==this.args.named.delay?setTimeout(()=>{typeof this!==this.args.positional[0]&&this.setStyles(this.args.positional[0])},this.args.named.delay):this.setStyles(this.args.positional[0])}}e.default=n})),define("consul-ui/modifiers/tooltip",["exports","ember-modifier","tippy.js"],(function(e,t,n){function r(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var l=(0,t.modifier)((e,[t],l={})=>{const s=l.options||{}
+let i,o=e
+if("string"==typeof s.triggerTarget){const e=o
+switch(s.triggerTarget){case"parentNode":o=o.parentNode
+break
+default:o=o.querySelectorAll(s.triggerTarget)}t=o.cloneNode(!0),e.remove(),l.options.triggerTarget=void 0}if(void 0===t&&(t=o.innerHTML,o.innerHTML=""),"manual"===s.trigger){const e=s.delay||[]
+void 0!==e[1]&&(l.options.onShown=t=>{clearInterval(i),i=setTimeout(()=>{t.hide()},e[1])})}let u=o,c=!1
+u.hasAttribute("tabindex")||(c=!0,u.setAttribute("tabindex","0"))
+const d=(0,n.default)(o,function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?r(Object(n),!0).forEach((function(t){a(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):r(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({theme:"tooltip",triggerTarget:u,content:()=>t,plugins:[void 0!==s.followCursor?n.followCursor:void 0].filter(e=>Boolean(e))},l.options))
+return()=>{c&&u.removeAttribute("tabindex"),clearInterval(i),d.destroy()}})
+e.default=l})),define("consul-ui/modifiers/validate",["exports","ember-modifier"],(function(e,t){var n,r,a
+function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function s(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class i extends Error{}let o=(n=Ember._action,r=Ember._action,s((a=class extends t.default{constructor(...e){super(...e),l(this,"item",null),l(this,"hash",null)}validate(e,t={}){if(0===Object.keys(t).length)return
+const n={}
+Object.entries(this.hash.validations).filter(([e,t])=>"string"!=typeof t).forEach(([t,r])=>{this.item&&(this.item[t]=e),(r||[]).forEach(r=>{new RegExp(r.test).test(e)||(n[t]=new i(r.error))})})
+const r=this.hash.chart.state
+null==r.context&&(r.context={}),Object.keys(n).length>0?(r.context.errors=n,this.hash.chart.dispatch("ERROR")):(r.context.errors=null,this.hash.chart.dispatch("RESET"))}reset(e){if(0===e.target.value.length){const e=this.hash.chart.state
+e.context||(e.context={}),e.context.errors||(e.context.errors={}),Object.entries(this.hash.validations).filter(([e,t])=>"string"!=typeof t).forEach(([t,n])=>{void 0!==e.context.errors[t]&&delete e.context.errors[t]}),0===Object.keys(e.context.errors).length&&(e.context.errors=null,this.hash.chart.dispatch("RESET"))}}async connect([e],t){this.element.addEventListener("input",this.listen),this.element.addEventListener("blur",this.reset),this.element.value.length>0&&(await Promise.resolve(),this&&this.element&&this.validate(this.element.value,this.hash.validations))}listen(e){this.validate(e.target.value,this.hash.validations)}disconnect(){this.item=null,this.hash=null,this.element.removeEventListener("input",this.listen),this.element.removeEventListener("blur",this.reset)}didReceiveArguments(){const[e]=this.args.positional,t=this.args.named
+this.item=e,this.hash=t,void 0===t.chart&&(this.hash.chart={state:{context:{}},dispatch:e=>{switch(e){case"ERROR":t.onchange(this.hash.chart.state.context.errors)
+break
+case"RESET":t.onchange()}}})}didInstall(){this.connect(this.args.positional,this.args.named)}willRemove(){this.disconnect()}}).prototype,"reset",[n],Object.getOwnPropertyDescriptor(a.prototype,"reset"),a.prototype),s(a.prototype,"listen",[r],Object.getOwnPropertyDescriptor(a.prototype,"listen"),a.prototype),a)
+e.default=o})),define("consul-ui/modifiers/will-destroy",["exports","@ember/render-modifiers/modifiers/will-destroy"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/modifiers/with-copyable",["exports","ember-modifier"],(function(e,t){var n,r,a
+function l(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function s(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const i=(e,t,n)=>typeof t===e?t:n
+let o=(n=Ember.inject.service("clipboard/os"),r=class extends t.default{constructor(...e){var t,n,r,l
+super(...e),t=this,n="clipboard",l=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(l):void 0}),s(this,"hash",null),s(this,"source",null)}connect([e],t){e=i("string",e,this.element.innerText)
+const n={success:e=>i("function",t.success,()=>{})(e),error:e=>i("function",t.error,()=>{})(e)}
+this.source=this.clipboard.execute(this.element,function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?l(Object(n),!0).forEach((function(t){s(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({text:()=>e},n.options)).on("success",n.success).on("error",n.error),this.hash=n}disconnect(){this.source&&this.hash&&(this.source.off("success",this.hash.success).off("error",this.hash.error),this.source.destroy(),this.hash=null,this.source=null)}didReceiveArguments(){this.disconnect(),this.connect(this.args.positional,this.args.named)}willRemove(){this.disconnect()}},u=r.prototype,c="clipboard",d=[n],m={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(m).forEach((function(e){f[e]=m[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=d.slice().reverse().reduce((function(e,t){return t(u,c,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,c,f),f=null),a=f,r)
+var u,c,d,m,p,f
+e.default=o})),define("consul-ui/modifiers/with-overlay",["exports","ember-modifier","tippy.js"],(function(e,t,n){function r(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var l=(0,t.modifier)((e,[t],l={})=>{const s=l.options||{}
+let i,o=e
+if("string"==typeof s.triggerTarget){const e=o
+switch(s.triggerTarget){case"parentNode":o=o.parentNode
+break
+default:o=o.querySelectorAll(s.triggerTarget)}t=o.cloneNode(!0),e.remove(),l.options.triggerTarget=void 0}if(void 0===t&&(t=o.innerHTML,o.innerHTML=""),l.returns&&(s.trigger="manual"),"manual"===s.trigger){const e=s.delay||[]
+void 0!==e[1]&&(s.onShown=t=>{clearInterval(i),i=setTimeout(()=>{t.hide()},e[1])})}let u=o
+const c=(0,n.default)(o,function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?r(Object(n),!0).forEach((function(t){a(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):r(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({triggerTarget:u,content:()=>t,interactive:!0,plugins:[void 0!==s.followCursor?n.followCursor:void 0].filter(e=>Boolean(e))},s))
+return l.returns&&l.returns(c),()=>{clearInterval(i),c.destroy()}})
+e.default=l})),define("consul-ui/router",["exports","consul-ui/config/environment","deepmerge","consul-ui/env","consul-ui/utils/routing/walk"],(function(e,t,n,r,a){function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.routes=void 0
+const s=document,i=(t.default.modulePrefix,n.default.all([...s.querySelectorAll("script[data-routes]")].map(e=>JSON.parse(e.dataset.routes))))
+e.routes=i
+class o extends Ember.Router{constructor(...e){super(...e),l(this,"location",(0,r.env)("locationType")),l(this,"rootURL",(0,r.env)("rootURL"))}}e.default=o,o.map((0,a.default)(i))})),define("consul-ui/routes/application",["exports","consul-ui/routing/route","consul-ui/mixins/with-blocking-actions"],(function(e,t,n){var r,a,l,s,i
+function o(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let u=(r=Ember.inject.service("client/http"),a=Ember._action,l=Ember._action,s=class extends(t.default.extend(n.default)){constructor(...e){var t,n,r,a,l,s,o
+super(...e),t=this,n="client",a=this,(r=i)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0}),o=void 0,(s="data")in(l=this)?Object.defineProperty(l,s,{value:o,enumerable:!0,configurable:!0,writable:!0}):l[s]=o}onClientChanged(e){let t=e.data
+""===t&&(t={blocking:!0}),void 0!==this.data?(!0===this.data.blocking&&!1===t.blocking&&this.client.abort(),this.data=Object.assign({},t)):this.data=Object.assign({},t)}error(e,t){let n={status:e.code||e.statusCode||"",message:e.message||e.detail||"Error"}
+return e.errors&&e.errors[0]&&(n=e.errors[0],n.message=n.message||n.title||n.detail||"Error"),""===n.status&&(n.message="Error"),this.controllerFor("application").setProperties({error:n}),!0}},i=o(s.prototype,"client",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o(s.prototype,"onClientChanged",[a],Object.getOwnPropertyDescriptor(s.prototype,"onClientChanged"),s.prototype),o(s.prototype,"error",[l],Object.getOwnPropertyDescriptor(s.prototype,"error"),s.prototype),s)
+e.default=u})),define("consul-ui/routes/dc",["exports","consul-ui/routing/route"],(function(e,t){var n,r,a
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let l=(n=Ember.inject.service("repository/permission"),r=class extends t.default{constructor(...e){var t,n,r,l
+super(...e),t=this,n="permissionsRepo",l=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(l):void 0})}async model(e){const t=await this.permissionsRepo.findAll({dc:e.dc,ns:this.optionalParams().nspace,partition:this.optionalParams().partition})
+return this.controllerFor("application").setProperties({permissions:t}),{permissions:t}}},s=r.prototype,i="permissionsRepo",o=[n],u={configurable:!0,enumerable:!0,writable:!0,initializer:null},d={},Object.keys(u).forEach((function(e){d[e]=u[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=o.slice().reverse().reduce((function(e,t){return t(s,i,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(s,i,d),d=null),a=d,r)
+var s,i,o,u,c,d
+e.default=l})),define("consul-ui/routes/dc/acls/auth-methods/index",["exports","consul-ui/routing/route"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{constructor(...e){var t,n,r
+super(...e),r={sortBy:"sort",source:"source",kind:"kind",searchproperty:{as:"searchproperty",empty:[["Name","DisplayName"]]},search:{as:"filter",replace:!0}},(n="queryParams")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r}}e.default=n})),define("consul-ui/routes/dc/acls/auth-methods/show/index",["exports","consul-ui/routing/route","consul-ui/utils/routing/redirect-to"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends t.default{constructor(...e){var t,r,a
+super(...e),t=this,r="redirect",a=(0,n.default)("auth-method"),r in t?Object.defineProperty(t,r,{value:a,enumerable:!0,configurable:!0,writable:!0}):t[r]=a}}e.default=r})),define("consul-ui/routes/dc/acls/policies/create",["exports","consul-ui/routes/dc/acls/policies/edit"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{constructor(...e){var t,n,r
+super(...e),r="dc/acls/policies/edit",(n="templateName")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r}}e.default=n})),define("consul-ui/routes/dc/acls/policies/edit",["exports","consul-ui/routing/route","consul-ui/mixins/with-blocking-actions"],(function(e,t,n){var r,a,l
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let s=(r=Ember.inject.service("repository/policy"),a=class extends(t.default.extend(n.default)){constructor(...e){var t,n,r,a
+super(...e),t=this,n="repo",a=this,(r=l)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}},i=a.prototype,o="repo",u=[r],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),l=m,a)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/routes/dc/acls/policies/index",["exports","consul-ui/routing/route","consul-ui/mixins/with-blocking-actions"],(function(e,t,n){var r,a,l
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let s=(r=Ember.inject.service("repository/policy"),a=class extends(t.default.extend(n.default)){constructor(...e){var t,n,r,a,s,i,o
+super(...e),t=this,n="repo",a=this,(r=l)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0}),o={sortBy:"sort",datacenter:{as:"dc"},kind:"kind",searchproperty:{as:"searchproperty",empty:[["Name","Description"]]},search:{as:"filter",replace:!0}},(i="queryParams")in(s=this)?Object.defineProperty(s,i,{value:o,enumerable:!0,configurable:!0,writable:!0}):s[i]=o}},i=a.prototype,o="repo",u=[r],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),l=m,a)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/routes/dc/acls/roles/create",["exports","consul-ui/routes/dc/acls/roles/edit"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{constructor(...e){var t,n,r
+super(...e),r="dc/acls/roles/edit",(n="templateName")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r}}e.default=n})),define("consul-ui/routes/dc/acls/roles/edit",["exports","consul-ui/routing/route","consul-ui/mixins/with-blocking-actions"],(function(e,t,n){var r,a,l
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let s=(r=Ember.inject.service("repository/role"),a=class extends(t.default.extend(n.default)){constructor(...e){var t,n,r,a
+super(...e),t=this,n="repo",a=this,(r=l)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}},i=a.prototype,o="repo",u=[r],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),l=m,a)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/routes/dc/acls/roles/index",["exports","consul-ui/routing/route","consul-ui/mixins/with-blocking-actions"],(function(e,t,n){var r,a,l
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let s=(r=Ember.inject.service("repository/role"),a=class extends(t.default.extend(n.default)){constructor(...e){var t,n,r,a,s,i,o
+super(...e),t=this,n="repo",a=this,(r=l)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0}),o={sortBy:"sort",searchproperty:{as:"searchproperty",empty:[["Name","Description","Policy"]]},search:{as:"filter",replace:!0}},(i="queryParams")in(s=this)?Object.defineProperty(s,i,{value:o,enumerable:!0,configurable:!0,writable:!0}):s[i]=o}},i=a.prototype,o="repo",u=[r],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),l=m,a)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/routes/dc/acls/tokens/create",["exports","consul-ui/routes/dc/acls/tokens/edit"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{constructor(...e){var t,n,r
+super(...e),r="dc/acls/tokens/edit",(n="templateName")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r}}e.default=n})),define("consul-ui/routes/dc/acls/tokens/edit",["exports","consul-ui/routing/route","consul-ui/mixins/with-blocking-actions"],(function(e,t,n){var r,a,l,s,i
+function o(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function u(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let c=(r=Ember.inject.service("repository/token"),a=Ember.inject.service("settings"),l=class extends(t.default.extend(n.default)){constructor(...e){super(...e),o(this,"repo",s,this),o(this,"settings",i,this)}async model(e,t){return{token:await this.settings.findBySlug("token")}}},s=u(l.prototype,"repo",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i=u(l.prototype,"settings",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),l)
+e.default=c})),define("consul-ui/routes/dc/acls/tokens/index",["exports","consul-ui/routing/route","consul-ui/mixins/with-blocking-actions"],(function(e,t,n){var r,a,l
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let s=(r=Ember.inject.service("repository/token"),a=class extends(t.default.extend(n.default)){constructor(...e){var t,n,r,a,s,i,o
+super(...e),t=this,n="repo",a=this,(r=l)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0}),o={sortBy:"sort",kind:"kind",searchproperty:{as:"searchproperty",empty:[["AccessorID","Description","Role","Policy"]]},search:{as:"filter",replace:!0}},(i="queryParams")in(s=this)?Object.defineProperty(s,i,{value:o,enumerable:!0,configurable:!0,writable:!0}):s[i]=o}},i=a.prototype,o="repo",u=[r],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),l=m,a)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/routes/dc/kv/folder",["exports","consul-ui/routes/dc/kv/index"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{beforeModel(e){super.beforeModel(...arguments)
+const t=this.paramsFor("dc.kv.folder")
+if("/"===t.key||null==t.key)return this.transitionTo("dc.kv.index")}}e.default=n})),define("consul-ui/routes/dc/kv/index",["exports","consul-ui/routing/route","consul-ui/utils/isFolder"],(function(e,t,n){var r,a
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let l=(r=Ember._action,a=class extends t.default{beforeModel(){const e=this.paramsFor(this.routeName).key||"/"
+if(!(0,n.default)(e))return this.replaceWith(this.routeName,e+"/")}error(e){return!e.errors||!e.errors[0]||"404"!=e.errors[0].status||this.transitionTo("dc.kv.index")}},s=a.prototype,i="error",o=[r],u=Object.getOwnPropertyDescriptor(a.prototype,"error"),c=a.prototype,d={},Object.keys(u).forEach((function(e){d[e]=u[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=o.slice().reverse().reduce((function(e,t){return t(s,i,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(s,i,d),d=null),a)
+var s,i,o,u,c,d
+e.default=l})),define("consul-ui/routes/dc/services/notfound",["exports","consul-ui/routing/route"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{redirect(e,t){this.replaceWith("dc.services.instance",e.name,e.node,e.id)}}e.default=n})),define("consul-ui/routes/dc/services/show/topology",["exports","consul-ui/routing/route"],(function(e,t){var n,r,a,l,s,i,o,u
+function c(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function d(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?c(Object(n),!0).forEach((function(t){p(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function m(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function p(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function f(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let b=(n=Ember.inject.service("data-source/service"),r=Ember.inject.service("repository/intention"),a=Ember.inject.service("feedback"),l=Ember._action,s=class extends t.default{constructor(...e){super(...e),m(this,"data",i,this),m(this,"repo",o,this),m(this,"feedback",u,this)}async createIntention(e,t){let n=this.feedback.notification("create","intention")
+try{let r=(await this.intentions).find(n=>n.Datacenter===e.Datacenter&&n.SourceName===e.Name&&n.SourceNS===e.Namespace&&n.SourcePartition===e.Partition&&n.DestinationName===t.Name&&n.DestinationNS===t.Namespace&&n.DestinationPartition===t.Partition)
+void 0===r?r=this.repo.create({Datacenter:e.Datacenter,SourceName:e.Name,SourceNS:e.Namespace||"default",SourcePartition:e.Partition||"default",DestinationName:t.Name,DestinationNS:t.Namespace||"default",DestinationPartition:t.Partition||"default"}):n=this.feedback.notification("update","intention"),Ember.set(r,"Action","allow"),await this.repo.persist(r),n.success(r)}catch(r){n.error(r)}this.refresh()}afterModel(e,t){const n=d(d(d({},this.optionalParams()),this.paramsFor("dc")),this.paramsFor("dc.services.show"))
+this.intentions=this.data.source(e=>e`/${n.partition}/${n.nspace}/${n.dc}/intentions/for-service/${n.name}`)}async deactivate(e){(await this.intentions).destroy()}},i=f(s.prototype,"data",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o=f(s.prototype,"repo",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=f(s.prototype,"feedback",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f(s.prototype,"createIntention",[l],Object.getOwnPropertyDescriptor(s.prototype,"createIntention"),s.prototype),s)
+e.default=b})),define("consul-ui/routing/route",["exports","consul-ui/utils/path/resolve","consul-ui/router"],(function(e,t,n){var r,a,l,s,i,o,u,c,d,m,p,f,b
+function h(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function v(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?h(Object(n),!0).forEach((function(t){g(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):h(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function y(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function g(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function O(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let _=(r=Ember.inject.service("container"),a=Ember.inject.service("env"),l=Ember.inject.service("repository/permission"),s=Ember.inject.service("router"),i=Ember.inject.service("routlet"),o=Ember._action,u=Ember._action,c=class extends Ember.Route{constructor(...e){super(...e),y(this,"container",d,this),y(this,"env",m,this),y(this,"permissions",p,this),y(this,"router",f,this),y(this,"routlet",b,this)}_setRouteName(){super._setRouteName(...arguments)
+const e=Ember.get(n.routes,this.routeName+"._options.template")
+void 0!==e&&(this.templateName=(0,t.default)(this.routeName.split(".").join("/"),e))
+const r=Ember.get(n.routes,this.routeName+"._options.queryParams")
+void 0!==r&&(this.queryParams=r)}redirect(e,r){let a=Ember.get(n.routes,this.routeName+"._options.redirect")
+void 0!==a&&this.replaceWith((0,t.default)(this.routeName.split(".").join("/"),a).split("/").join("."),e)}serializeQueryParam(e,t,n){if(void 0!==e){const n=Ember.get(this,`queryParams.${t}.empty`)
+if(void 0===n)""===e&&(e=void 0)
+else{const t=n[0]
+let r=e
+Array.isArray(r)&&(r=r.split(","))
+0===t.filter(e=>!r.includes(e)).length&&(e=void 0)}}return e}model(){const e={}
+return void 0!==this.queryParams&&void 0!==this.queryParams.searchproperty&&(e.searchProperties=this.queryParams.searchproperty.empty[0]),e}setupController(e,t){Ember.setProperties(e,v(v({},t),{},{routeName:this.routeName})),super.setupController(...arguments)}optionalParams(){return this.container.get("location:"+this.env.var("locationType")).optionalParams()}paramsFor(e){return this.routlet.normalizeParamsFor(this.routeName,super.paramsFor(...arguments))}async replaceWith(e,t){await Promise.resolve()
+let n=[]
+return"string"==typeof t&&(n=[t]),void 0===t||Array.isArray(t)||"string"==typeof t||(n=Object.values(t)),super.replaceWith(e,...n)}async transitionTo(e,t){await Promise.resolve()
+let n=[]
+return"string"==typeof t&&(n=[t]),void 0===t||Array.isArray(t)||"string"==typeof t||(n=Object.values(t)),super.transitionTo(e,...n)}},d=O(c.prototype,"container",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=O(c.prototype,"env",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=O(c.prototype,"permissions",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=O(c.prototype,"router",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=O(c.prototype,"routlet",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O(c.prototype,"replaceWith",[o],Object.getOwnPropertyDescriptor(c.prototype,"replaceWith"),c.prototype),O(c.prototype,"transitionTo",[u],Object.getOwnPropertyDescriptor(c.prototype,"transitionTo"),c.prototype),c)
+e.default=_})),define("consul-ui/routing/single",["exports","consul-ui/routing/route"],(function(e,t){function n(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function r(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{}
+t%2?n(Object(r),!0).forEach((function(t){a(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):n(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var l=t.default.extend({isCreate:function(e,t){return"create"===t.targetName.split(".").pop()},model:function(e,t){const n=this.repo,a=this.modelFor("dc").dc.Name,l=this.optionalParams().nspace,s=this.optionalParams().partition,i=this.isCreate(...arguments)
+return Ember.RSVP.hash(r({dc:a,partition:s,nspace:l,create:i},n.status({item:i?Ember.RSVP.Promise.resolve(n.create({Datacenter:a,Namespace:l,Partition:s})):n.findBySlug({partition:s,ns:l,dc:a,id:e.id})})))}})
+e.default=l})),define("consul-ui/search/predicates/acl",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={ID:e=>e.ID,Name:e=>e.Name}}))
+define("consul-ui/search/predicates/auth-method",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={Name:e=>e.Name,DisplayName:e=>e.DisplayName}})),define("consul-ui/search/predicates/health-check",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t={Name:e=>e.Name,Node:e=>e.Node,Service:e=>e.ServiceName,CheckID:e=>e.CheckID||"",ID:e=>e.Service.ID||"",Notes:e=>e.Notes,Output:e=>e.Output,ServiceTags:e=>{return t=e.ServiceTags,Array.isArray(t)?t:t.toArray()
+var t}}
+e.default=t})),define("consul-ui/search/predicates/intention",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t={SourceName:e=>[e.SourceName,"*"===e.SourceName?"All Services (*)":void 0].filter(Boolean),DestinationName:e=>[e.DestinationName,"*"===e.DestinationName?"All Services (*)":void 0].filter(Boolean)}
+e.default=t})),define("consul-ui/search/predicates/kv",["exports","consul-ui/utils/right-trim"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n={Key:e=>(0,t.default)(e.Key.toLowerCase()).split("/").filter(e=>Boolean(e)).pop()}
+e.default=n})),define("consul-ui/search/predicates/node",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t={Node:e=>e.Node,Address:e=>e.Address,Meta:e=>Object.entries(e.Meta||{}).reduce((e,t)=>e.concat(t),[])}
+e.default=t})),define("consul-ui/search/predicates/nspace",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={Name:e=>e.Name,Description:e=>e.Description,Role:e=>((e.ACLs||{}).RoleDefaults||[]).map(e=>e.Name),Policy:e=>((e.ACLs||{}).PolicyDefaults||[]).map(e=>e.Name)}})),define("consul-ui/search/predicates/policy",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={Name:e=>e.Name,Description:e=>e.Description}})),define("consul-ui/search/predicates/role",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={Name:e=>e.Name,Description:e=>e.Description,Policy:e=>(e.Policies||[]).map(e=>e.Name).concat((e.ServiceIdentities||[]).map(e=>e.ServiceName)).concat((e.NodeIdentities||[]).map(e=>e.NodeName))}})),define("consul-ui/search/predicates/service-instance",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t={Name:e=>e.Name,Node:e=>e.Node.Node,Tags:e=>e.Service.Tags||[],ID:e=>e.Service.ID||"",Address:e=>e.Address||"",Port:e=>(e.Service.Port||"").toString(),"Service.Meta":e=>Object.entries(e.Service.Meta||{}).reduce((e,t)=>e.concat(t),[]),"Node.Meta":e=>Object.entries(e.Node.Meta||{}).reduce((e,t)=>e.concat(t),[])}
+e.default=t})),define("consul-ui/search/predicates/service",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={Name:e=>e.Name,Tags:e=>e.Tags||[]}})),define("consul-ui/search/predicates/token",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={Name:e=>e.Name,Description:e=>e.Description,AccessorID:e=>e.AccessorID,Role:e=>(e.Roles||[]).map(e=>e.Name),Policy:e=>(e.Policies||[]).map(e=>e.Name).concat((e.ServiceIdentities||[]).map(e=>e.ServiceName)).concat((e.NodeIdentities||[]).map(e=>e.NodeName))}})),define("consul-ui/search/predicates/upstream-instance",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={DestinationName:e=>e.DestinationName,LocalBindAddress:e=>e.LocalBindAddress,LocalBindPort:e=>e.LocalBindPort.toString()}})),define("consul-ui/serializers/-default",["exports","@ember-data/serializer/json"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/serializers/-json-api",["exports","@ember-data/serializer/json-api"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/serializers/-rest",["exports","@ember-data/serializer/rest"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/serializers/application",["exports","consul-ui/serializers/http","consul-ui/utils/http/consul","consul-ui/utils/http/headers","consul-ui/models/dc","consul-ui/models/nspace","consul-ui/models/partition","consul-ui/utils/create-fingerprinter"],(function(e,t,n,r,a,l,s,i){function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const u=function(e,t){const r={}
+return Object.keys(e).forEach((function(t){r[t.toLowerCase()]=e[t]})),t[n.HEADERS_SYMBOL]=r,t}
+class c extends t.default{constructor(...e){super(...e),o(this,"attachHeaders",u),o(this,"fingerprint",(0,i.default)(a.FOREIGN_KEY,l.NSPACE_KEY,s.PARTITION_KEY))}respondForQuery(e,t){return e((e,r)=>{return u(e,(a=r,l=this.fingerprint(this.primaryKey,this.slugKey,t.dc,e[n.HEADERS_NAMESPACE],e[n.HEADERS_PARTITION]),Array.isArray(a)?a.map(l):[a].map(l)[0]))
+var a,l})}respondForQueryRecord(e,t){return e((e,r)=>u(e,this.fingerprint(this.primaryKey,this.slugKey,t.dc,e[n.HEADERS_NAMESPACE],e[n.HEADERS_PARTITION])(r)))}respondForCreateRecord(e,t,r){const l=this.slugKey,s=this.primaryKey
+return e((e,t)=>(!0===t&&(t=r),this.fingerprint(s,l,r[a.FOREIGN_KEY],e[n.HEADERS_NAMESPACE],r.Partition)(t)))}respondForUpdateRecord(e,t,r){const l=this.slugKey,s=this.primaryKey
+return e((e,t)=>(!0===t&&(t=r),this.fingerprint(s,l,r[a.FOREIGN_KEY],e[n.HEADERS_NAMESPACE],e[n.HEADERS_PARTITION])(t)))}respondForDeleteRecord(e,t,r){const i=this.slugKey,o=this.primaryKey
+return e(e=>({[o]:this.fingerprint(o,i,r[a.FOREIGN_KEY],e[n.HEADERS_NAMESPACE],e[n.HEADERS_PARTITION])({[i]:r[i],[l.NSPACE_KEY]:r[l.NSPACE_KEY],[s.PARTITION_KEY]:r[s.PARTITION_KEY]})[o]}))}normalizeResponse(e,t,n,r,a){const l=this.normalizePayload(n,r,a),s=this.normalizeMeta(e,t,l,r,a)
+"query"!==a&&(l.meta=s)
+const i=super.normalizeResponse(e,t,{meta:s,[t.modelName]:l},r,a)
+return void 0===i?n:i}timestamp(){return(new Date).getTime()}normalizeMeta(e,t,a,l,s){const i=a[n.HEADERS_SYMBOL]||{}
+delete a[n.HEADERS_SYMBOL]
+const o={cacheControl:i[r.CACHE_CONTROL.toLowerCase()],cursor:i[n.HEADERS_INDEX.toLowerCase()],dc:i[n.HEADERS_DATACENTER.toLowerCase()],nspace:i[n.HEADERS_NAMESPACE.toLowerCase()],partition:i[n.HEADERS_PARTITION.toLowerCase()]}
+return void 0!==i["x-range"]&&(o.range=i["x-range"]),void 0!==i.refresh&&(o.interval=1e3*i.refresh),"query"===s&&(o.date=this.timestamp(),a.forEach((function(e){Ember.set(e,"SyncTime",o.date)}))),o}normalizePayload(e,t,n){return e}}e.default=c})),define("consul-ui/serializers/auth-method",["exports","consul-ui/serializers/application","consul-ui/models/auth-method"],(function(e,t,n){function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class a extends t.default{constructor(...e){super(...e),r(this,"primaryKey",n.PRIMARY_KEY),r(this,"slugKey",n.SLUG_KEY)}}e.default=a})),define("consul-ui/serializers/binding-rule",["exports","consul-ui/serializers/application","consul-ui/models/binding-rule"],(function(e,t,n){function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class a extends t.default{constructor(...e){super(...e),r(this,"primaryKey",n.PRIMARY_KEY),r(this,"slugKey",n.SLUG_KEY)}}e.default=a})),define("consul-ui/serializers/coordinate",["exports","consul-ui/serializers/application","consul-ui/models/coordinate"],(function(e,t,n){function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class a extends t.default{constructor(...e){super(...e),r(this,"primaryKey",n.PRIMARY_KEY),r(this,"slugKey",n.SLUG_KEY)}}e.default=a})),define("consul-ui/serializers/discovery-chain",["exports","consul-ui/serializers/application","consul-ui/models/discovery-chain"],(function(e,t,n){function r(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function a(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?r(Object(n),!0).forEach((function(t){l(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):r(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class s extends t.default{constructor(...e){super(...e),l(this,"primaryKey",n.PRIMARY_KEY),l(this,"slugKey",n.SLUG_KEY)}respondForQueryRecord(e,t){return super.respondForQueryRecord((function(t){return e((function(e,r){return t(e,a(a({},r),{},{[n.SLUG_KEY]:r.Chain[n.SLUG_KEY]}))}))}),t)}}e.default=s})),define("consul-ui/serializers/http",["exports","@ember-data/serializer/rest"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{transformBelongsToResponse(e,t,n,r){return r}transformHasManyResponse(e,t,n,r){return r}respondForQuery(e,t){return e((e,t)=>t)}respondForQueryRecord(e,t){return e((e,t)=>t)}respondForFindAll(e,t){return e((e,t)=>t)}respondForCreateRecord(e,t){return e((e,t)=>t)}respondForUpdateRecord(e,t){return e((e,t)=>t)}respondForDeleteRecord(e,t){return e((e,t)=>t)}}e.default=n})),define("consul-ui/serializers/intention",["exports","consul-ui/serializers/application","consul-ui/models/intention"],(function(e,t,n){var r,a,l
+function s(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let i=(r=Ember.inject.service("encoder"),a=class extends t.default{constructor(...e){var t,r,a,i
+super(...e),t=this,r="encoder",i=this,(a=l)&&Object.defineProperty(t,r,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(i):void 0}),s(this,"primaryKey",n.PRIMARY_KEY),s(this,"slugKey",n.SLUG_KEY)}init(){super.init(...arguments),this.uri=this.encoder.uriTag()}ensureID(e){return Ember.get(e,"ID.length")?(e.Legacy=!0,e.LegacyID=e.ID):e.Legacy=!1,e.ID=this.uri`${e.SourcePartition}:${e.SourceNS}:${e.SourceName}:${e.DestinationPartition}:${e.DestinationNS}:${e.DestinationName}`,e}respondForQuery(e,t){return super.respondForQuery(t=>e((e,n)=>t(e,n.map(e=>this.ensureID(e)))),t)}respondForQueryRecord(e,t){return super.respondForQueryRecord(t=>e((e,n)=>(n=this.ensureID(n),t(e,n))),t)}respondForCreateRecord(e,t,n){const r=this.slugKey,a=this.primaryKey
+return e((e,l)=>((l=n).ID=this.uri`${t.SourcePartition}:${t.SourceNS}:${t.SourceName}:${t.DestinationPartition}:${t.DestinationNS}:${t.DestinationName}`,this.fingerprint(a,r,l.Datacenter)(l)))}respondForUpdateRecord(e,t,n){const r=this.slugKey,a=this.primaryKey
+return e((e,l)=>((l=n).LegacyID=l.ID,l.ID=t.ID,this.fingerprint(a,r,l.Datacenter)(l)))}},o=a.prototype,u="encoder",c=[r],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(d).forEach((function(e){p[e]=d[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=c.slice().reverse().reduce((function(e,t){return t(o,u,e)||e}),p),m&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(m):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(o,u,p),p=null),l=p,a)
+var o,u,c,d,m,p
+e.default=i})),define("consul-ui/serializers/kv",["exports","consul-ui/serializers/application","consul-ui/models/kv"],(function(e,t,n){var r,a,l
+function s(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let i=(r=Ember.inject.service("atob"),a=class extends t.default{constructor(...e){var t,r,a,i
+super(...e),t=this,r="decoder",i=this,(a=l)&&Object.defineProperty(t,r,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(i):void 0}),s(this,"primaryKey",n.PRIMARY_KEY),s(this,"slugKey",n.SLUG_KEY)}serialize(e,t){const n=e.attr("Value")
+return"string"==typeof n?this.decoder.execute(n):null}respondForQueryRecord(e,t){return super.respondForQueryRecord(t=>e((e,n)=>(void 0===n[0].Session&&(n[0].Session=""),t(e,n[0]))),t)}respondForQuery(e,t){return super.respondForQuery(t=>e((e,n)=>t(e,n.map(e=>({[this.slugKey]:e})))),t)}},o=a.prototype,u="decoder",c=[r],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(d).forEach((function(e){p[e]=d[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=c.slice().reverse().reduce((function(e,t){return t(o,u,e)||e}),p),m&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(m):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(o,u,p),p=null),l=p,a)
+var o,u,c,d,m,p
+e.default=i})),define("consul-ui/serializers/node",["exports","consul-ui/serializers/application","@ember-data/serializer/rest","consul-ui/models/node"],(function(e,t,n,r){function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const l=function(e){return""===e[r.SLUG_KEY]&&(e[r.SLUG_KEY]=e.Node),e}
+class s extends(t.default.extend(n.EmbeddedRecordsMixin)){constructor(...e){super(...e),a(this,"primaryKey",r.PRIMARY_KEY),a(this,"slugKey",r.SLUG_KEY),a(this,"attrs",{Services:{embedded:"always"}})}transformHasManyResponse(e,t,n,r=null){let a,l={}
+switch(t.key){case"Services":return(n.Checks||[]).filter(e=>""!==e.ServiceID).forEach(e=>{void 0===l[e.ServiceID]&&(l[e.ServiceID]=[]),l[e.ServiceID].push(e)}),a=this.store.serializerFor(t.type),n.Services=n.Services.map(e=>a.transformHasManyResponseFromNode(n,e,l)),n}return super.transformHasManyResponse(...arguments)}respondForQuery(e,t,n,r){const a=super.respondForQuery(t=>e((e,n)=>t(e,n.map(l))),t)
+return r.eachRelationship((e,t)=>{a.forEach(e=>this[`transform${Ember.String.classify(t.kind)}Response`](this.store,t,e,a))}),a}respondForQueryRecord(e,t,n,r){const a=super.respondForQueryRecord(t=>e((e,n)=>t(e,l(n))),t)
+return r.eachRelationship((e,t)=>{this[`transform${Ember.String.classify(t.kind)}Response`](this.store,t,a)}),a}respondForQueryLeader(e,t){return e((e,n)=>{const r=n.split(":"),a=r.pop(),l=r.join(":")
+return this.attachHeaders(e,{Address:l,Port:a},t)})}}e.default=s})),define("consul-ui/serializers/nspace",["exports","consul-ui/serializers/application","consul-ui/models/nspace"],(function(e,t,n){function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const a=e=>(Ember.get(e,"ACLs.PolicyDefaults")&&(e.ACLs.PolicyDefaults=e.ACLs.PolicyDefaults.map((function(e){return void 0===e.template&&(e.template=""),e}))),["PolicyDefaults","RoleDefaults"].forEach((function(t){void 0===e.ACLs&&(e.ACLs=[]),void 0===e.ACLs[t]&&(e.ACLs[t]=[])})),e)
+class l extends t.default{constructor(...e){super(...e),r(this,"primaryKey",n.PRIMARY_KEY),r(this,"slugKey",n.SLUG_KEY)}respondForQuery(e,t,n,r){return super.respondForQuery(n=>e((e,r)=>n(e,r.map((function(e){return e.Namespace="*",e.Datacenter=t.dc,a(e)})))),t)}respondForQueryRecord(e,t,n){return super.respondForQuery(n=>e((e,r)=>(r.Datacenter=t.dc,r.Namespace="*",n(e,a(r)))),t,n)}respondForCreateRecord(e,t,n){return super.respondForCreateRecord(n=>e((e,r)=>(r.Datacenter=t.dc,r.Namespace="*",n(e,a(r)))),t,n)}respondForUpdateRecord(e,t,n){return e((e,t)=>a(t))}}e.default=l})),define("consul-ui/serializers/oidc-provider",["exports","consul-ui/serializers/application","consul-ui/models/oidc-provider"],(function(e,t,n){function r(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class l extends t.default{constructor(...e){super(...e),a(this,"primaryKey",n.PRIMARY_KEY),a(this,"slugKey",n.SLUG_KEY)}respondForAuthorize(e,t,n){return e((e,t)=>this.attachHeaders(e,t,n))}respondForQueryRecord(e,t){return super.respondForQueryRecord(n=>e((e,l)=>n(e,function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?r(Object(n),!0).forEach((function(t){a(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):r(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({Name:t.id,Namespace:t.ns,Partition:t.partition},l))),t)}}e.default=l})),define("consul-ui/serializers/partition",["exports","consul-ui/serializers/application","consul-ui/models/partition"],(function(e,t,n){function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class a extends t.default{constructor(...e){super(...e),r(this,"primaryKey",n.PRIMARY_KEY),r(this,"slugKey",n.SLUG_KEY)}respondForQuery(e,t,n,r){return super.respondForQuery(t=>e((e,n)=>t(e,n.map(e=>(e.Partition="*",e.Namespace="*",e)))),t)}}e.default=a})),define("consul-ui/serializers/permission",["exports","consul-ui/serializers/application"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{}e.default=n})),define("consul-ui/serializers/policy",["exports","consul-ui/serializers/application","consul-ui/models/policy"],(function(e,t,n){function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class a extends t.default{constructor(...e){super(...e),r(this,"primaryKey",n.PRIMARY_KEY),r(this,"slugKey",n.SLUG_KEY)}}e.default=a})),define("consul-ui/serializers/proxy",["exports","consul-ui/serializers/application","consul-ui/models/proxy"],(function(e,t,n){function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class a extends t.default{constructor(...e){super(...e),r(this,"primaryKey",n.PRIMARY_KEY),r(this,"slugKey",n.SLUG_KEY),r(this,"attrs",{NodeName:"Node"})}}e.default=a}))
+define("consul-ui/serializers/role",["exports","consul-ui/serializers/application","consul-ui/models/role","consul-ui/mixins/policy/as-many"],(function(e,t,n,r){function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class l extends(t.default.extend(r.default)){constructor(...e){super(...e),a(this,"primaryKey",n.PRIMARY_KEY),a(this,"slugKey",n.SLUG_KEY)}}e.default=l})),define("consul-ui/serializers/service-instance",["exports","consul-ui/serializers/application","consul-ui/models/service-instance"],(function(e,t,n){function r(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function a(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?r(Object(n),!0).forEach((function(t){l(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):r(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class s extends t.default{constructor(...e){super(...e),l(this,"primaryKey",n.PRIMARY_KEY),l(this,"slugKey",n.SLUG_KEY),l(this,"hash",JSON.stringify)}extractUid(e){return this.hash([e.Partition||"default",e.Namespace||"default",e.Datacenter,e.Node.Node,e.Service.ID])}transformHasManyResponseFromNode(e,t,n){const r=n[t.ID]||[],l=a(a({},r.reduce((e,t)=>{switch(t.Status){case"passing":e.ChecksPassing.push(t)
+break
+case"warning":e.ChecksWarning.push(t)
+break
+case"critical":e.ChecksCritical.push(t)}return e},{ChecksPassing:[],ChecksWarning:[],ChecksCritical:[]})),{},{Service:t,Checks:r,Node:{Datacenter:e.Datacenter,Namespace:e.Namespace,Partition:e.Partition,ID:e.ID,Node:e.Node,Address:e.Address,TaggedAddresses:e.TaggedAddresses,Meta:e.Meta}})
+return l.uid=this.extractUid(l),l}respondForQuery(e,t){return super.respondForQuery(n=>e((e,r)=>{if(0===r.length){const e=new Error
+throw e.errors=[{status:"404",title:"Not found"}],e}return r.forEach(e=>{e.Datacenter=t.dc,e.Namespace=t.ns||"default",e.Partition=t.partition||"default",e.uid=this.extractUid(e)}),n(e,r)}),t)}respondForQueryRecord(e,t){return super.respondForQueryRecord(n=>e((e,r)=>{if(r.forEach(e=>{e.Datacenter=t.dc,e.Namespace=t.ns||"default",e.Partition=t.partition||"default",e.uid=this.extractUid(e)}),void 0===(r=r.find((function(e){return e.Node.Node===t.node&&e.Service.ID===t.serviceId})))){const e=new Error
+throw e.errors=[{status:"404",title:"Not found"}],e}return r.Namespace=r.Service.Namespace,r.Partition=r.Service.Partition,n(e,r)}),t)}}e.default=s})),define("consul-ui/serializers/service",["exports","consul-ui/serializers/application","consul-ui/models/service"],(function(e,t,n){function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class a extends t.default{constructor(...e){super(...e),r(this,"primaryKey",n.PRIMARY_KEY),r(this,"slugKey",n.SLUG_KEY)}respondForQuery(e,t){return super.respondForQuery(t=>e((e,n)=>{const r={}
+return n.filter((function(e){return"connect-proxy"!==e.Kind})).forEach(e=>{r[e.Name]=e}),n.filter((function(e){return"connect-proxy"===e.Kind})).forEach(e=>{e.ProxyFor&&e.ProxyFor.forEach(t=>{void 0!==r[t]&&(r[t].Proxy=e)})}),t(e,n)}),t)}respondForQueryRecord(e,t){return super.respondForQueryRecord(n=>e((e,r)=>n(e,{Name:t.id,Namespace:Ember.get(r,"firstObject.Service.Namespace"),Nodes:r})),t)}}e.default=a})),define("consul-ui/serializers/session",["exports","consul-ui/serializers/application","consul-ui/models/session"],(function(e,t,n){function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class a extends t.default{constructor(...e){super(...e),r(this,"primaryKey",n.PRIMARY_KEY),r(this,"slugKey",n.SLUG_KEY)}respondForQueryRecord(e,t){return super.respondForQueryRecord(t=>e((e,n)=>{if(0===n.length){const e=new Error
+throw e.errors=[{status:"404",title:"Not found"}],e}return t(e,n[0])}),t)}}e.default=a})),define("consul-ui/serializers/token",["exports","consul-ui/serializers/application","consul-ui/models/token","consul-ui/mixins/policy/as-many","consul-ui/mixins/role/as-many"],(function(e,t,n,r,a){function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class s extends(t.default.extend(r.default,a.default)){constructor(...e){super(...e),l(this,"primaryKey",n.PRIMARY_KEY),l(this,"slugKey",n.SLUG_KEY)}serialize(e,t){let n=super.serialize(...arguments)
+return null!==n.Rules&&(n={ID:n.SecretID,Name:n.Description,Type:n.Type,Rules:n.Rules}),n&&delete n.SecretID,n}respondForSelf(e,t){return this.respondForQueryRecord(e,t)}respondForUpdateRecord(e,t,n){return super.respondForUpdateRecord(t=>e((e,n)=>{if(void 0!==n.Policies&&null!==n.Policies||(n.Policies=[]),void 0!==n.ID){const e=this.store.peekAll("token").findBy("SecretID",n.ID)
+e&&(n.SecretID=n.ID,n.AccessorID=Ember.get(e,"AccessorID"))}return t(e,n)}),t,n)}}e.default=s})),define("consul-ui/serializers/topology",["exports","consul-ui/serializers/application","consul-ui/models/topology"],(function(e,t,n){var r,a,l
+function s(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function i(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?s(Object(n),!0).forEach((function(t){o(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):s(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let u=(r=Ember.inject.service("store"),a=class extends t.default{constructor(...e){var t,r,a,s
+super(...e),t=this,r="store",s=this,(a=l)&&Object.defineProperty(t,r,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(s):void 0}),o(this,"primaryKey",n.PRIMARY_KEY),o(this,"slugKey",n.SLUG_KEY)}respondForQueryRecord(e,t){const r=this.store.serializerFor("intention")
+return super.respondForQueryRecord((function(a){return e((function(e,l){return l.Downstreams.forEach(e=>{e.Intention.SourceName=e.Name,e.Intention.SourceNS=e.Namespace,e.Intention.DestinationName=t.id,e.Intention.DestinationNS=t.ns||"default",r.ensureID(e.Intention)}),l.Upstreams.forEach(e=>{e.Intention.SourceName=t.id,e.Intention.SourceNS=t.ns||"default",e.Intention.DestinationName=e.Name,e.Intention.DestinationNS=e.Namespace,r.ensureID(e.Intention)}),a(e,i(i({},l),{},{[n.SLUG_KEY]:t.id}))}))}),t)}},c=a.prototype,d="store",m=[r],p={configurable:!0,enumerable:!0,writable:!0,initializer:null},b={},Object.keys(p).forEach((function(e){b[e]=p[e]})),b.enumerable=!!b.enumerable,b.configurable=!!b.configurable,("value"in b||b.initializer)&&(b.writable=!0),b=m.slice().reverse().reduce((function(e,t){return t(c,d,e)||e}),b),f&&void 0!==b.initializer&&(b.value=b.initializer?b.initializer.call(f):void 0,b.initializer=void 0),void 0===b.initializer&&(Object.defineProperty(c,d,b),b=null),l=b,a)
+var c,d,m,p,f,b
+e.default=u})),define("consul-ui/services/-ensure-registered",["exports","@embroider/util/services/ensure-registered"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/-portal",["exports","ember-stargate/services/-portal"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/abilities",["exports","ember-can/services/can"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{parse(e){return super.parse(e.replace("use SSO","use authMethods").replace("service","zervice"))}}e.default=n})),define("consul-ui/services/atob",["exports","consul-ui/utils/atob"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends Ember.Service{execute(){return(0,t.default)(...arguments)}}e.default=n})),define("consul-ui/services/auth-providers/oauth2-code-with-url-provider",["exports","torii/providers/oauth2-code"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{constructor(...e){var t,n,r
+super(...e),r="oidc-with-url",(n="name")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r}buildUrl(){return this.baseUrl}open(e){const t=this.get("name"),n=this.buildUrl()
+return this.get("popup").open(n,["state","code"],e).then((function(e){return{authorizationState:e.state,authorizationCode:decodeURIComponent(e.code),provider:t}}))}close(){const e=this.get("popup.remote")||{}
+if("function"==typeof e.close)return e.close()}}e.default=n})),define("consul-ui/services/btoa",["exports","consul-ui/utils/btoa"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends Ember.Service{execute(){return(0,t.default)(...arguments)}}e.default=n})),define("consul-ui/services/can",["exports","ember-can/services/abilities"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/change",["exports","ember-changeset-validations","ember-changeset","consul-ui/utils/form/changeset","consul-ui/validations/intention-permission","consul-ui/validations/intention-permission-http-header"],(function(e,t,n,r,a,l){var s,i,o
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const u={"intention-permission":a.default,"intention-permission-http-header":l.default}
+let c=(s=Ember.inject.service("schema"),i=class extends Ember.Service{constructor(...e){var t,n,r,a
+super(...e),t=this,n="schema",a=this,(r=o)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}init(){super.init(...arguments),this._validators=new Map}willDestroy(){this._validators=null}changesetFor(e,a,l={}){const s=this.validatorFor(e,l)
+let i
+if(s){let e=s
+"function"!=typeof s&&(e=(0,t.default)(s)),i=(0,n.Changeset)(a,e,s,{changeset:r.default})}else i=(0,n.Changeset)(a)
+return i}validatorFor(e,t={}){if(!this._validators.has(e)){const t=u[e]
+let n
+void 0!==t&&(n=t(this.schema)),this._validators.set(e,n)}return this._validators.get(e)}},d=i.prototype,m="schema",p=[s],f={configurable:!0,enumerable:!0,writable:!0,initializer:null},h={},Object.keys(f).forEach((function(e){h[e]=f[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=p.slice().reverse().reduce((function(e,t){return t(d,m,e)||e}),h),b&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(b):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(d,m,h),h=null),o=h,i)
+var d,m,p,f,b,h
+e.default=c})),define("consul-ui/services/client/connections",["exports"],(function(e){var t,n,r,a,l,s,i
+function o(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function u(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let c=(t=Ember.inject.service("dom"),n=Ember.inject.service("env"),r=Ember.inject.service("data-source/service"),a=class extends Ember.Service{constructor(...e){super(...e),o(this,"dom",l,this),o(this,"env",s,this),o(this,"data",i,this)}init(){super.init(...arguments),this._listeners=this.dom.listeners(),this.connections=new Set,this.addVisibilityChange()}willDestroy(){this._listeners.remove(),this.purge(),super.willDestroy(...arguments)}addVisibilityChange(){this._listeners.add(this.dom.document(),{visibilitychange:e=>{e.target.hidden&&this.purge(-1)}})}whenAvailable(e){const t=this.dom.document()
+return t.hidden?new Promise(n=>{const r=this._listeners.add(t,{visibilitychange:function(){r(),n(e)}})}):Promise.resolve(e)}purge(e=0){[...this.connections].forEach((function(t){t.abort(e)})),this.connections=new Set}acquire(e){if(this.connections.size>=this.env.var("CONSUL_HTTP_MAX_CONNECTIONS")){const t=this.data.closed()
+let n=[...this.connections].find(e=>!!e.headers()["x-request-id"]&&t.includes(e.headers()["x-request-id"]))
+void 0===n&&"text/event-stream"===e.headers()["content-type"]&&(n=this.connections.values().next().value),void 0!==n&&(this.release(n),n.abort(429))}this.connections.add(e)}release(e){this.connections.delete(e)}},l=u(a.prototype,"dom",[t],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=u(a.prototype,"env",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i=u(a.prototype,"data",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a)
+e.default=c})),define("consul-ui/services/client/http",["exports","consul-ui/utils/http/headers","consul-ui/utils/http/consul","consul-ui/utils/http/create-url","consul-ui/utils/http/create-headers","consul-ui/utils/http/create-query-params"],(function(e,t,n,r,a,l){var s,i,o,u,c,d,m,p,f,b,h,v,y,g,O
+function _(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function P(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}function w(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function E(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?w(Object(n),!0).forEach((function(t){k(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):w(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function k(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.restartWhenAvailable=void 0
+e.restartWhenAvailable=function(e){return function(t){if("-1"===Ember.get(t,"errors.firstObject.status"))return e.whenAvailable(t)
+throw t}}
+const x={stringify:(0,l.default)(encodeURIComponent)},j=(0,a.default)(),C=[t.CACHE_CONTROL,"X-Request-ID","X-Range","Refresh"]
+let S=(s=Ember.inject.service("dom"),i=Ember.inject.service("env"),o=Ember.inject.service("client/connections"),u=Ember.inject.service("client/transports/xhr"),c=Ember.inject.service("settings"),d=Ember.inject.service("encoder"),m=Ember.inject.service("store"),p=class extends Ember.Service{constructor(...e){super(...e),_(this,"dom",f,this),_(this,"env",b,this),_(this,"connections",h,this),_(this,"transport",v,this),_(this,"settings",y,this),_(this,"encoder",g,this),_(this,"store",O,this)}init(){super.init(...arguments),this._listeners=this.dom.listeners(),this.parseURL=(0,r.default)(encodeURIComponent,e=>x.stringify(this.sanitize(e)))
+const e=this.encoder.uriTag()
+this.cache=(t,n)=>(t.uri=n(e),t.SyncTime=(new Date).getTime(),this.store.push({data:{id:t.uri,type:new URL(t.uri).protocol.slice(0,-1),attributes:t}}))}sanitize(e){return this.env.var("CONSUL_NSPACES_ENABLED")&&void 0!==e.ns&&null!==e.ns&&""!==e.ns||delete e.ns,this.env.var("CONSUL_PARTITIONS_ENABLED")&&void 0!==e.partition&&null!==e.partition&&""!==e.partition||delete e.partition,e}willDestroy(){this._listeners.remove(),super.willDestroy(...arguments)}url(){return this.parseURL(...arguments)}body(){const e=function(e,...t){let n={}
+const r=e.reduce((function(e,t,n){return-1!==(t=t.split("\n").map(e=>e.trim()).join("\n")).indexOf("\n\n")?n:e}),-1)
+return-1!==r&&(n=t.splice(r).reduce((function(e,t,n){switch(!0){case Array.isArray(t):return 0===n&&(e=[]),e.concat(t)
+case"string"!=typeof t:return E(E({},e),t)
+default:return t}}),n)),[n,...t]}(...arguments)
+return this.sanitize(e[0]),e}requestParams(e,...n){const[r,...a]=this.body(...arguments),[l,...s]=this.url(e,...a).split(" "),[i,...o]=s.join(" ").split("\n"),u={url:i.trim(),method:l.trim(),headers:E({[t.CONTENT_TYPE]:"application/json; charset=utf-8"},j(o)),body:null,data:r}
+if(u.clientHeaders=C.reduce((function(e,t){return void 0!==u.headers[t]&&(e[t.toLowerCase()]=u.headers[t],delete u.headers[t]),e}),{}),void 0!==r)if("GET"!==u.method)-1!==u.headers[t.CONTENT_TYPE].indexOf("json")?u.body=JSON.stringify(u.data):("string"==typeof u.data&&u.data.length>0||Object.keys(u.data).length>0)&&(u.body=u.data)
+else{const e=x.stringify(u.data)
+e.length>0&&(-1!==u.url.indexOf("?")?u.url=`${u.url}&${e}`:u.url=`${u.url}?${e}`)}return u.headers[t.CONTENT_TYPE]="application/json; charset=utf-8",u}fetchWithToken(e,t){return this.settings.findBySlug("token").then(n=>fetch(""+e,E(E({},t),{},{headers:E({"X-Consul-Token":void 0===n.SecretID?"":n.SecretID},t.headers)})))}request(e){const t=this,r=this.cache
+return e((function(e){const a=t.requestParams(...arguments)
+return t.settings.findBySlug("token").then(e=>{const l=E(E({},a),{},{headers:E({[n.HEADERS_TOKEN]:void 0===e.SecretID?"":e.SecretID},a.headers)}),s=t.transport.request(l)
+return new Promise((l,i)=>{const o=t._listeners.add(s,{open:e=>{t.acquire(e.target)},message:t=>{const s=E(E(E({},Object.entries(t.data.headers).reduce((function(e,[t,n]){return C.includes(t)||(e[t]=n),e}),{})),a.clientHeaders),{},{[n.HEADERS_DATACENTER]:a.data.dc,[n.HEADERS_NAMESPACE]:a.data.ns||e.Namespace||"default",[n.HEADERS_PARTITION]:a.data.partition||e.Partition||"default"}),i=function(e){let n=e(s,t.data.response,r)
+const a=n.meta||{}
+return 2===a.version&&(Array.isArray(n.body)?n=new Proxy(n.body,{get:(e,t)=>{switch(t){case"meta":return a}return e[t]}}):(n=n.body,n.meta=a)),n}
+Ember.run.next(()=>l(i))},error:e=>{Ember.run.next(()=>i(e.error))},close:e=>{t.release(e.target),o()}})
+s.fetch()})})}))}whenAvailable(e){return this.connections.whenAvailable(e)}abort(){return this.connections.purge(...arguments)}acquire(){return this.connections.acquire(...arguments)}release(){return this.connections.release(...arguments)}},f=P(p.prototype,"dom",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=P(p.prototype,"env",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=P(p.prototype,"connections",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=P(p.prototype,"transport",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=P(p.prototype,"settings",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=P(p.prototype,"encoder",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=P(p.prototype,"store",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p)
+e.default=S})),define("consul-ui/services/client/transports/xhr",["exports","consul-ui/utils/http/create-headers","consul-ui/utils/http/xhr","consul-ui/utils/http/request","consul-ui/utils/http/error"],(function(e,t,n,r,a){function l(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function s(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?l(Object(n),!0).forEach((function(t){i(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const o=(0,n.default)((0,t.default)())
+class u extends Ember.Service{xhr(e){return o(e)}request(e){const t=new r.default(e.method,e.url,{"x-request-id":e.clientHeaders["x-request-id"],body:e.data||{}}),n=s(s({},e),{},{beforeSend:function(e){t.open(e)},converters:{"text json":function(e){try{return JSON.parse(e)}catch(t){return e}}},success:function(e,n,r,a){t.respond({headers:e,response:n,status:r,statusText:a})},error:function(e,n,r,l,s){let i
+i=s instanceof Error?s:new a.default(r,n),t.error(i)},complete:function(){t.close()}})
+return t.fetch=()=>(this.xhr(n),t),t}}e.default=u})),define("consul-ui/services/clipboard/local-storage",["exports","clipboard"],(function(e,t){var n,r,a
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class l extends t.default{constructor(e,t,n){super(e,t),this._cb=n}onClick(e){this._cb(this.text(e.delegateTarget||e.currentTarget)),this.emit("success",{})}}let s=(n=Ember.inject.service("-document"),r=class extends Ember.Service{constructor(...e){var t,n,r,l,s,i,o
+super(...e),t=this,n="doc",l=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(l):void 0}),o="clipboard",(i="key")in(s=this)?Object.defineProperty(s,i,{value:o,enumerable:!0,configurable:!0,writable:!0}):s[i]=o}execute(e,t){return new l(e,t,e=>{this.doc.defaultView.localStorage.setItem(this.key,e)})}},i=r.prototype,o="doc",u=[n],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),a=m,r)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/services/clipboard/os",["exports","clipboard"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends Ember.Service{execute(){return new t.default(...arguments)}}e.default=n})),define("consul-ui/services/code-mirror",["exports","ivy-codemirror/services/code-mirror"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/code-mirror/linter",["exports","consul-ui/utils/editor/lint"],(function(e,t){var n,r,a
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const l=[{name:"JSON",mime:"application/json",mode:"javascript",ext:["json","map"],alias:["json5"]},{name:"HCL",mime:"text/x-ruby",mode:"ruby",ext:["rb"],alias:["jruby","macruby","rake","rb","rbx"]},{name:"YAML",mime:"text/x-yaml",mode:"yaml",ext:["yaml","yml"],alias:["yml"]},{name:"XML",mime:"application/xml",mode:"xml",htmlMode:!1,matchClosing:!0,alignCDATA:!1,ext:["xml"],alias:["xml"]}]
+let s=(n=Ember.inject.service("dom"),r=class extends Ember.Service{constructor(...e){var t,n,r,l
+super(...e),t=this,n="dom",l=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(l):void 0})}modes(){return l}lint(){return(0,t.default)(...arguments)}getEditor(e){return this.dom.element("textarea + div",e).CodeMirror}},i=r.prototype,o="dom",u=[n],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),a=m,r)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/services/container",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class t extends Ember.Service{constructor(e){super(...arguments),this._owner=e,this._wm=new WeakMap}set(e,t){this._wm.set(t,e)}keyForClass(e){return this._wm.get(e)}get(e){return"string"!=typeof e&&(e=this.keyForClass(e)),this.lookup(e)}lookup(e){return this._owner.lookup(e)}resolveRegistration(e){return this._owner.resolveRegistration(e).prototype}}e.default=t})),define("consul-ui/services/data-sink/protocols/http",["exports"],(function(e){var t,n,r,a,l,s,i,o,u,c,d,m,p
+function f(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function b(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let h=(t=Ember.inject.service("settings"),n=Ember.inject.service("repository/intention"),r=Ember.inject.service("repository/kv"),a=Ember.inject.service("repository/nspace"),l=Ember.inject.service("repository/partition"),s=Ember.inject.service("repository/session"),i=class extends Ember.Service{constructor(...e){super(...e),f(this,"settings",o,this),f(this,"intention",u,this),f(this,"kv",c,this),f(this,"nspace",d,this),f(this,"partition",m,this),f(this,"session",p,this)}prepare(e,t,n){return Ember.setProperties(n,t)}persist(e,t){const[,,,,n]=e.split("/")
+return this[n].persist(t)}remove(e,t){const[,,,,n]=e.split("/")
+return this[n].remove(t)}},o=b(i.prototype,"settings",[t],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=b(i.prototype,"intention",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=b(i.prototype,"kv",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=b(i.prototype,"nspace",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=b(i.prototype,"partition",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=b(i.prototype,"session",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i)
+e.default=h})),define("consul-ui/services/data-sink/protocols/local-storage",["exports"],(function(e){var t,n,r
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let a=(t=Ember.inject.service("settings"),n=class extends Ember.Service{constructor(...e){var t,n,a,l
+super(...e),t=this,n="settings",l=this,(a=r)&&Object.defineProperty(t,n,{enumerable:a.enumerable,configurable:a.configurable,writable:a.writable,value:a.initializer?a.initializer.call(l):void 0})}prepare(e,t,n={}){return null===t||""===t?n:Ember.setProperties(n,t)}persist(e,t){const n=e.split(":").pop()
+return this.settings.persist({[n]:t})}remove(e,t){const n=e.split(":").pop()
+return this.settings.delete(n)}},l=n.prototype,s="settings",i=[t],o={configurable:!0,enumerable:!0,writable:!0,initializer:null},c={},Object.keys(o).forEach((function(e){c[e]=o[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=i.slice().reverse().reduce((function(e,t){return t(l,s,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(l,s,c),c=null),r=c,n)
+var l,s,i,o,u,c
+e.default=a})),define("consul-ui/services/data-sink/service",["exports"],(function(e){var t,n,r,a,l
+function s(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function i(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const o=function(e){return-1===(e=e.toString()).indexOf("://")&&(e="consul://"+e),e.split("://")}
+let u=(t=Ember.inject.service("data-sink/protocols/http"),n=Ember.inject.service("data-sink/protocols/local-storage"),r=class extends Ember.Service{constructor(...e){super(...e),s(this,"consul",a,this),s(this,"settings",l,this)}prepare(e,t,n){const[r,a]=o(e)
+return this[r].prepare(a,t,n)}persist(e,t){const[n,r]=o(e)
+return this[n].persist(r,t)}remove(e,t){const[n,r]=o(e)
+return this[n].remove(r,t)}},a=i(r.prototype,"consul",[t],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),l=i(r.prototype,"settings",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),r)
+e.default=u})),define("consul-ui/services/data-source/protocols/http",["exports","consul-ui/decorators/data-source"],(function(e,t){var n,r,a,l,s
+function i(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function o(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let u=(n=Ember.inject.service("client/http"),r=Ember.inject.service("data-source/protocols/http/blocking"),a=class extends Ember.Service{constructor(...e){super(...e),i(this,"client",l,this),i(this,"type",s,this)}source(e,n){const r=(0,t.match)(e)
+let a
+return this.client.request(e=>{a=r.cb(r.params,Ember.getOwner(this),e)}),this.type.source(a,n)}},l=o(a.prototype,"client",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=o(a.prototype,"type",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a)
+e.default=u})),define("consul-ui/services/data-source/protocols/http/blocking",["exports","consul-ui/utils/dom/event-source","consul-ui/services/settings","consul-ui/services/client/http","consul-ui/utils/maybe-call"],(function(e,t,n,r,a){var l,s,i,o,u
+function c(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function d(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let m=(l=Ember.inject.service("client/http"),s=Ember.inject.service("settings"),i=class extends Ember.Service{constructor(...e){super(...e),c(this,"client",o,this),c(this,"settings",u,this)}source(e,l){return new t.BlockingEventSource((t,l)=>{const s=l.close.bind(l)
+return(0,a.default)(()=>t.cursor=void 0,(0,n.ifNotBlocking)(this.settings))().then(()=>e(t).then((0,a.default)(s,(0,n.ifNotBlocking)(this.settings))).then((function(e={}){const t=Ember.get(e,"meta")||{}
+return void 0===t.cursor&&void 0===t.interval&&s(),e})).catch((0,r.restartWhenAvailable)(this.client)))},l)}},o=d(i.prototype,"client",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=d(i.prototype,"settings",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i)
+e.default=m})),define("consul-ui/services/data-source/protocols/http/promise",["exports","consul-ui/utils/dom/event-source"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends Ember.Service{source(e,n){return(0,t.once)(e,n)}}e.default=n})),define("consul-ui/services/data-source/protocols/local-storage",["exports","consul-ui/utils/dom/event-source"],(function(e,t){var n,r,a
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let l=(n=Ember.inject.service("settings"),r=class extends Ember.Service{constructor(...e){var t,n,r,l
+super(...e),t=this,n="repo",l=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(l):void 0})}source(e,n){const r=e.split(":").pop()
+return new t.StorageEventSource(()=>this.repo.findBySlug(r),{key:e,uri:n.uri})}},s=r.prototype,i="repo",o=[n],u={configurable:!0,enumerable:!0,writable:!0,initializer:null},d={},Object.keys(u).forEach((function(e){d[e]=u[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=o.slice().reverse().reduce((function(e,t){return t(s,i,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(s,i,d),d=null),a=d,r)
+var s,i,o,u,c,d
+e.default=l})),define("consul-ui/services/data-source/service",["exports","consul-ui/utils/dom/event-source","mnemonist/multi-map"],(function(e,t,n){var r,a,l,s,i,o,u,c,d
+function m(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function p(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let f=null,b=null,h=null
+class v{constructor(e){this.uri=e}toString(){return this.uri}}let y=(r=Ember.inject.service("dom"),a=Ember.inject.service("encoder"),l=Ember.inject.service("data-source/protocols/http"),s=Ember.inject.service("data-source/protocols/local-storage"),i=class extends Ember.Service{constructor(...e){super(...e),m(this,"dom",o,this),m(this,"encoder",u,this),m(this,"consul",c,this),m(this,"settings",d,this)}init(){super.init(...arguments),f=new Map,b=new Map,h=new n.default(Set),this._listeners=this.dom.listeners()}resetCache(){f=new Map}willDestroy(){Ember.run.schedule("afterRender",()=>{this._listeners.remove(),b.forEach((function(e){e.close()})),f=null,b=null,h.clear(),h=null})}source(e,n){const r=e(this.encoder.uriTag())
+return new Promise((e,n)=>{const a={},l=this.open(r,a,!0)
+l.configuration.ref=a
+const s=this._listeners.add(l,{message:n=>{s(),e((0,t.proxy)(n.target,n.data))},error:e=>{s(),this.close(l,a),n(e.error)}})
+void 0!==l.getCurrentEvent()&&l.dispatchEvent(l.getCurrentEvent())})}unwrap(e,t){const n=e._source
+return h.set(n,t),h.remove(n,n.configuration.ref),delete n.configuration.ref,n}uri(e){return new v(e)}open(e,t,n=!1){if(!(e instanceof v)&&"string"!=typeof e)return this.unwrap(e,t)
+let r;-1===(e=e.toString()).indexOf("://")&&(e="consul://"+e)
+let[a,l]=e.split("://")
+const s=this[a]
+if(b.has(e))r=b.get(e),b.delete(e),b.set(e,r)
+else{let t={}
+f.has(e)&&(t=f.get(e)),t.uri=e,r=s.source(l,t)
+const n=this._listeners.add(r,{close:t=>{const r=t.target,a=r.getCurrentEvent(),l=r.configuration.cursor
+void 0!==a&&void 0!==l&&t.errors&&"401"!==t.errors[0].status&&f.set(e,{currentEvent:a,cursor:l}),h.has(r)||b.delete(e),n()}})
+b.set(e,r)}return(!h.has(r)||r.readyState>1||n)&&r.open(),h.set(r,t),r}close(e,t){e&&(h.remove(e,t),h.has(e)||(e.close(),2===e.readyState&&b.delete(e.configuration.uri)))}closed(){return[...b.entries()].filter(([e,t])=>t.readyState>1).map(e=>e[0])}},o=p(i.prototype,"dom",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=p(i.prototype,"encoder",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=p(i.prototype,"consul",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=p(i.prototype,"settings",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i)
+e.default=y}))
+define("consul-ui/services/data-structs",["exports","ngraph.graph"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends Ember.Service{graph(){return(0,t.default)()}}e.default=n})),define("consul-ui/services/dom",["exports","consul-ui/utils/dom/qsa-factory","consul-ui/utils/dom/sibling","consul-ui/utils/dom/closest","consul-ui/utils/dom/is-outside","consul-ui/utils/dom/get-component-factory","consul-ui/utils/dom/normalize-event","consul-ui/utils/dom/create-listeners","consul-ui/utils/dom/click-first-anchor"],(function(e,t,n,r,a,l,s,i,o){var u,c,d
+function m(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const p=(0,t.default)()
+let f,b
+const h=(0,o.default)(r.default)
+let v=(u=Ember.inject.service("-document"),c=class extends Ember.Service{constructor(e){var t,o,u,c
+super(...arguments),t=this,o="doc",c=this,(u=d)&&Object.defineProperty(t,o,{enumerable:u.enumerable,configurable:u.configurable,writable:u.writable,value:u.initializer?u.initializer.call(c):void 0}),m(this,"clickFirstAnchor",h),m(this,"closest",r.default),m(this,"sibling",n.default),m(this,"isOutside",a.default),m(this,"normalizeEvent",s.default),m(this,"listeners",i.default),b=new WeakMap,f=(0,l.default)(e)}willDestroy(){super.willDestroy(...arguments),b=null,f=null}document(){return this.doc}viewport(){return this.doc.defaultView}guid(e){return Ember.guidFor(e)}focus(e){if("string"==typeof e&&(e=this.element(e)),void 0!==e){let t=e.getAttribute("tabindex")
+e.setAttribute("tabindex","0"),e.focus(),null===t?e.removeAttribute("tabindex"):e.setAttribute("tabindex",t)}}setEventTargetProperty(e,t,n){const r=e.target
+return new Proxy(e,{get:function(a,l,s){return"target"===l?new Proxy(r,{get:function(a,l){return l===t?n(e.target[t]):r[l]}}):Reflect.get(...arguments)}})}setEventTargetProperties(e,t){const n=e.target
+return new Proxy(e,{get:function(r,a,l){return"target"===a?new Proxy(n,{get:function(r,a){return void 0!==t[a]?t[a](e.target):n[a]}}):Reflect.get(...arguments)}})}root(){return this.doc.documentElement}elementById(e){return this.doc.getElementById(e)}elementsByTagName(e,t){return(t=void 0===t?this.doc:t).getElementsByTagName(e)}elements(e,t){return p(e,t)}element(e,t){return"#"===e.substr(0,1)?this.elementById(e.substr(1)):[...p(e,t)][0]}component(e,t){return f("string"!=typeof e?e:this.element(e,t))}components(e,t){return[...this.elements(e,t)].map((function(e){return f(e)})).filter((function(e){return null!=e}))}isInViewport(e,t,n=0){b.set(e,t)
+let r=new IntersectionObserver(e=>{e.map(e=>{const t=b.get(e.target)
+"function"==typeof t&&t(e.isIntersecting)})},{rootMargin:"0px",threshold:n})
+return r.observe(e),()=>{r.unobserve(e),b&&b.delete(e),r.disconnect(),r=null}}},y=c.prototype,g="doc",O=[u],_={configurable:!0,enumerable:!0,writable:!0,initializer:null},w={},Object.keys(_).forEach((function(e){w[e]=_[e]})),w.enumerable=!!w.enumerable,w.configurable=!!w.configurable,("value"in w||w.initializer)&&(w.writable=!0),w=O.slice().reverse().reduce((function(e,t){return t(y,g,e)||e}),w),P&&void 0!==w.initializer&&(w.value=w.initializer?w.initializer.call(P):void 0,w.initializer=void 0),void 0===w.initializer&&(Object.defineProperty(y,g,w),w=null),d=w,c)
+var y,g,O,_,P,w
+e.default=v})),define("consul-ui/services/encoder",["exports","consul-ui/utils/atob","consul-ui/utils/btoa"],(function(e,t,n){function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class a extends Ember.Service{constructor(...e){super(...e),r(this,"uriComponent",encodeURIComponent),r(this,"joiner",(e,t="",n="")=>(r,a)=>(a||Array(r.length).fill(t)).reduce((t,a,l)=>`${t}${a}${e(r[l]||n)}`,""))}createRegExpEncoder(e,t){return function(e,t=(e=>e)){return(n="",r={})=>""!==n?n.replace(e,(e,n)=>{const a=Ember.get(r,n)
+return t(a||"")}):""}(e,t)}atob(){return(0,t.default)(...arguments)}btoa(){return(0,n.default)(...arguments)}uriJoin(){return this.joiner(this.uriComponent,"/","")(...arguments)}uriTag(){return this.tag(this.uriJoin.bind(this))}tag(e){return(t,...n)=>e(n,t)}}e.default=a})),define("consul-ui/services/env",["exports","consul-ui/env"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends Ember.Service{env(e){return this.var(e)}var(e){return(0,t.env)(e)}}e.default=n})),define("consul-ui/services/feedback",["exports","consul-ui/utils/callable-type"],(function(e,t){var n,r,a,l,s
+function i(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function o(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?i(Object(n),!0).forEach((function(t){c(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):i(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function u(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function c(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function d(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const m=function(e){return e}
+let p=(n=Ember.inject.service("flashMessages"),r=Ember.inject.service("logger"),a=class extends Ember.Service{constructor(...e){super(...e),u(this,"notify",l,this),u(this,"logger",s,this)}notification(e,t){return{success:n=>this.success(n,e,void 0,t),error:n=>this.error(n,e,void 0,t)}}success(e,n,r=m,a){const l=(0,t.default)(n),s=(0,t.default)(r)
+!1!==e&&(this.notify.clearMessages(),this.notify.add(o(o({},{timeout:6e3,extendedTimeout:300,destroyOnClick:!0}),{},{type:s("success"),action:l(),item:e,model:a})))}error(e,n,r=m,a){const l=(0,t.default)(n),s=(0,t.default)(r)
+this.notify.clearMessages(),this.logger.execute(e),"TransitionAborted"===e.name?this.notify.add(o(o({},{timeout:6e3,extendedTimeout:300,destroyOnClick:!0}),{},{type:s("success"),action:l(),model:a})):this.notify.add(o(o({},{timeout:6e3,extendedTimeout:300,destroyOnClick:!0}),{},{type:s("error",e),action:l(),error:e,model:a}))}async execute(e,t,n,r){let a
+try{a=await e(),this.success(a,t,n,r)}catch(l){this.error(l,t,n,r)}}},l=d(a.prototype,"notify",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=d(a.prototype,"logger",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a)
+e.default=p})),define("consul-ui/services/filter",["exports","consul-ui/utils/filter","consul-ui/filter/predicates/service","consul-ui/filter/predicates/service-instance","consul-ui/filter/predicates/health-check","consul-ui/filter/predicates/node","consul-ui/filter/predicates/kv","consul-ui/filter/predicates/intention","consul-ui/filter/predicates/token","consul-ui/filter/predicates/policy","consul-ui/filter/predicates/auth-method"],(function(e,t,n,r,a,l,s,i,o,u,c){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const d={service:(0,t.andOr)(n.default),"service-instance":(0,t.andOr)(r.default),"health-check":(0,t.andOr)(a.default),"auth-method":(0,t.andOr)(c.default),node:(0,t.andOr)(l.default),kv:(0,t.andOr)(s.default),intention:(0,t.andOr)(i.default),token:(0,t.andOr)(o.default),policy:(0,t.andOr)(u.default)}
+class m extends Ember.Service{predicate(e){return d[e]}}e.default=m})),define("consul-ui/services/flash-messages",["exports","ember-cli-flash/services/flash-messages"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/form",["exports","consul-ui/utils/form/builder","consul-ui/forms/kv","consul-ui/forms/token","consul-ui/forms/policy","consul-ui/forms/role","consul-ui/forms/intention"],(function(e,t,n,r,a,l,s){var i,o,u,c,d
+function m(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function p(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const f=(0,t.default)(),b={kv:n.default,token:r.default,policy:a.default,role:l.default,intention:s.default}
+let h=(i=Ember.inject.service("repository/role"),o=Ember.inject.service("repository/policy"),u=class extends Ember.Service{constructor(...e){var t,n,r
+super(...e),m(this,"role",c,this),m(this,"policy",d,this),r=[],(n="forms")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r}build(e,t){return f(...arguments)}form(e){let t=this.forms[e]
+if(void 0===t&&(t=this.forms[e]=b[e](this),"role"===e||"policy"===e)){const n=this[e]
+t.clear((function(e){return n.create(e)})),t.submit((function(e){return n.persist(e)}))}return t}},c=p(u.prototype,"role",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=p(u.prototype,"policy",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u)
+e.default=h})),define("consul-ui/services/i18n",["exports","ember-intl/services/intl"],(function(e,t){var n,r,a
+function l(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function s(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?l(Object(n),!0).forEach((function(t){i(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.formatOptionsSymbol=void 0
+const o=Symbol()
+e.formatOptionsSymbol=o
+let u=(n=Ember.inject.service("env"),r=class extends t.default{constructor(...e){var t,n,r,l
+super(...e),t=this,n="env",l=this,(r=a)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(l):void 0})}formatMessage(e,t){return t=this[o](t),super.formatMessage(e,t)}[o](e){const t=["CONSUL_HOME_URL","CONSUL_REPO_ISSUES_URL","CONSUL_DOCS_URL","CONSUL_DOCS_LEARN_URL","CONSUL_DOCS_API_URL","CONSUL_COPYRIGHT_URL"].reduce((e,t)=>(e[t]=this.env.var(t),e),{})
+return s(s({},e),t)}},c=r.prototype,d="env",m=[n],p={configurable:!0,enumerable:!0,writable:!0,initializer:null},b={},Object.keys(p).forEach((function(e){b[e]=p[e]})),b.enumerable=!!b.enumerable,b.configurable=!!b.configurable,("value"in b||b.initializer)&&(b.writable=!0),b=m.slice().reverse().reduce((function(e,t){return t(c,d,e)||e}),b),f&&void 0!==b.initializer&&(b.value=b.initializer?b.initializer.call(f):void 0,b.initializer=void 0),void 0===b.initializer&&(Object.defineProperty(c,d,b),b=null),a=b,r)
+var c,d,m,p,f,b
+e.default=u})),define("consul-ui/services/in-viewport",["exports","ember-in-viewport/services/in-viewport"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/intl",["exports","ember-intl/services/intl"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/logger",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class t extends Ember.Service{execute(e){}}e.default=t})),define("consul-ui/services/page-title-list",["exports","ember-page-title/services/page-title-list"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/page-title",["exports","ember-page-title/services/page-title"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/popup",["exports","torii/services/popup"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/repository",["exports","validated-changeset","consul-ui/utils/http/error","consul-ui/abilities/base"],(function(e,t,n,r){var a,l,s,i,o,u,c
+function d(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function m(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.softDelete=void 0
+e.softDelete=(e,t)=>e.store.adapterFor(e.getModelName()).rpc((e,t,n,r)=>e.requestForDeleteRecord(t,n,r),()=>t,t,e.getModelName())
+let p=(a=Ember.inject.service("store"),l=Ember.inject.service("env"),s=Ember.inject.service("repository/permission"),i=class extends Ember.Service{constructor(...e){super(...e),d(this,"store",o,this),d(this,"env",u,this),d(this,"permissions",c,this)}getModelName(){}getPrimaryKey(){}getSlugKey(){}async authorizeBySlug(e,t,n){return n.resources=await this.permissions.findBySlug(n,this.getModelName()),this.validatePermissions(e,t,n)}async authorizeByPermissions(e,t,n){return n.resources=await this.permissions.authorize(n),this.validatePermissions(e,t,n)}async validatePermissions(e,t,r){if(r.resources.length>0){const e=r.resources.find(e=>e.Access===t)
+if(e&&!1===e.Allow){const e=new n.default(403)
+throw e.errors=[{status:"403"}],e}}const a=await e(r.resources)
+return Ember.get(a,"Resources")&&Ember.set(a,"Resources",r.resources),a}shouldReconcile(e,t){if(Ember.get(e,"Datacenter")!==t.dc)return!1
+if(this.env.var("CONSUL_NSPACES_ENABLED")){const n=Ember.get(e,"Namespace")
+if(void 0!==n&&n!==t.ns)return!1}if(this.env.var("CONSUL_PARTITIONS_ENABLED")){const n=Ember.get(e,"Partition")
+if(void 0!==n&&n!==t.partition)return!1}return!0}reconcile(e={},t={},n={}){void 0!==e.date&&this.store.peekAll(this.getModelName()).forEach(n=>{const r=Ember.get(n,"SyncTime")
+!n.isDeleted&&void 0!==r&&r!=e.date&&this.shouldReconcile(n,t)&&this.store.unloadRecord(n)})}peekOne(e){return this.store.peekRecord(this.getModelName(),e)}peekAll(){return this.store.peekAll(this.getModelName())}cached(e){const t=Object.entries(e)
+return this.store.peekAll(this.getModelName()).filter(e=>t.every(([t,n])=>e[t]===n))}async findAllByDatacenter(e,t={}){return this.findAll(...arguments)}async findAll(e={},t={}){return void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.query(e)}async query(e={},t={}){let n,r,a
+try{a=await this.store.query(this.getModelName(),e),r=a.meta}catch(l){switch(Ember.get(l,"errors.firstObject.status")){case"404":case"403":r={date:Number.POSITIVE_INFINITY},n=l
+break
+default:throw l}}if(void 0!==r&&this.reconcile(r,e,t),void 0!==n)throw n
+return a}async findBySlug(e,t={}){return""===e.id?this.create({Datacenter:e.dc,Namespace:e.ns,Partition:e.partition}):(void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.authorizeBySlug(()=>this.store.queryRecord(this.getModelName(),e),r.ACCESS_READ,e))}create(e){return this.store.createRecord(this.getModelName(),e)}persist(e){return(0,t.isChangeset)(e)&&(e.execute(),e=e.data),Ember.set(e,"SyncTime",void 0),e.save()}remove(e){let t=e
+return void 0===e.destroyRecord&&(t=e.get("data")),"object"===Ember.typeOf(t)&&(t=this.store.peekRecord(this.getModelName(),t[this.getPrimaryKey()])),t.destroyRecord().then(e=>this.store.unloadRecord(e))}invalidate(){this.store.unloadAll(this.getModelName())}},o=m(i.prototype,"store",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=m(i.prototype,"env",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=m(i.prototype,"permissions",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i)
+e.default=p})),define("consul-ui/services/repository/auth-method",["exports","consul-ui/services/repository","consul-ui/models/auth-method","consul-ui/decorators/data-source"],(function(e,t,n,r){var a,l,s
+function i(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let o=(a=(0,r.default)("/:partition/:ns/:dc/auth-methods"),l=(0,r.default)("/:partition/:ns/:dc/auth-method/:id"),i((s=class extends t.default{getModelName(){return"auth-method"}getPrimaryKey(){return n.PRIMARY_KEY}getSlugKey(){return n.SLUG_KEY}async findAllByDatacenter(){return super.findAllByDatacenter(...arguments)}async findBySlug(){return super.findBySlug(...arguments)}}).prototype,"findAllByDatacenter",[a],Object.getOwnPropertyDescriptor(s.prototype,"findAllByDatacenter"),s.prototype),i(s.prototype,"findBySlug",[l],Object.getOwnPropertyDescriptor(s.prototype,"findBySlug"),s.prototype),s)
+e.default=o})),define("consul-ui/services/repository/binding-rule",["exports","consul-ui/services/repository","consul-ui/models/binding-rule","consul-ui/decorators/data-source"],(function(e,t,n,r){var a,l
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let s=(a=(0,r.default)("/:partition/:ns/:dc/binding-rules/for-auth-method/:authmethod"),l=class extends t.default{getModelName(){return"binding-rule"}getPrimaryKey(){return n.PRIMARY_KEY}getSlugKey(){return n.SLUG_KEY}async findAllByAuthMethod(){return super.findAll(...arguments)}},i=l.prototype,o="findAllByAuthMethod",u=[a],c=Object.getOwnPropertyDescriptor(l.prototype,"findAllByAuthMethod"),d=l.prototype,m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),l)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/services/repository/coordinate",["exports","consul-ui/services/repository","consul-ui/decorators/data-source","consul-ui/utils/tomography","consul-ui/utils/distance"],(function(e,t,n,r,a){var l,s,i
+function o(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const u=(0,r.default)(a.default)
+let c=(l=(0,n.default)("/:partition/:ns/:dc/coordinates"),s=(0,n.default)("/:partition/:ns/:dc/coordinates/for-node/:id"),o((i=class extends t.default{getModelName(){return"coordinate"}async findAllByDatacenter(e,t={}){return void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.store.query(this.getModelName(),e)}async findAllByNode(e,t){const n=await this.findAllByDatacenter(e,t)
+let r={}
+return n.length>1&&(r=u(e.id,n)),r.meta=n.meta,r}}).prototype,"findAllByDatacenter",[l],Object.getOwnPropertyDescriptor(i.prototype,"findAllByDatacenter"),i.prototype),o(i.prototype,"findAllByNode",[s],Object.getOwnPropertyDescriptor(i.prototype,"findAllByNode"),i.prototype),i)
+e.default=c})),define("consul-ui/services/repository/dc",["exports","consul-ui/services/repository","consul-ui/decorators/data-source","consul-ui/utils/http/consul"],(function(e,t,n,r){var a,l,s,i,o,u,c
+function d(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}function m(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function p(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?m(Object(n),!0).forEach((function(t){f(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):m(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function f(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const b={Total:0,Passing:0,Warning:0,Critical:0}
+let h=(a=Ember.inject.service("env"),l=(0,n.default)("/:partition/:ns/:dc/datacenters"),s=(0,n.default)("/:partition/:ns/:dc/datacenter"),i=(0,n.default)("/:partition/:ns/:dc/catalog/health"),o=(0,n.default)("/:partition/:ns/:dc/datacenter-cache/:name"),u=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="env",a=this,(r=c)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}getModelName(){return"dc"}async fetchAll({partition:e,ns:t,dc:n},{uri:a},l){const s=this.env.var("CONSUL_DATACENTER_LOCAL"),i=this.env.var("CONSUL_DATACENTER_PRIMARY")
+return(await(l`
+      GET /v1/catalog/datacenters
+      X-Request-ID: ${a}
+    `))((e,t,n)=>{const l=Object.entries(e).find(([e,t])=>e.toLowerCase()===r.HEADERS_DEFAULT_ACL_POLICY.toLowerCase())[1]||"allow"
+return{meta:{version:2,uri:a},body:t.map(e=>n({Name:e,Datacenter:"",Local:e===s,Primary:e===i,DefaultACLPolicy:l},t=>t`${"dc"}:///${""}/${""}/${e}/datacenter`))}})}async fetch({partition:e,ns:t,dc:n},{uri:r},a){return(await(a`
+      GET /v1/operator/autopilot/state?${{dc:n}}
+      X-Request-ID: ${r}
+    `))((e,t,a)=>{const l=Object.values(t.Servers),s=[]
+return{meta:{version:2,uri:r},body:a(p(p({},t),{},{Servers:l,RedundancyZones:Object.entries(t.RedundancyZones||{}).map(([e,n])=>p(p({},n),{},{Name:e,Healthy:!0,Servers:n.Servers.reduce((e,n)=>{const r=t.Servers[n]
+return s.push(r.ID),e.push(r),e},[])})),ReadReplicas:(t.ReadReplicas||[]).map(e=>(s.push(e),t.Servers[e])),Default:{Servers:l.filter(e=>!s.includes(e.ID))}}),e=>e`${"dc"}:///${""}/${""}/${n}/datacenter`)}})}async fetchCatalogHealth({partition:e,ns:t,dc:n},{uri:r},a){return(await(a`
+      GET /v1/internal/ui/catalog-overview?${{dc:n,stale:null}}
+      X-Request-ID: ${r}
+    `))((e,t)=>{const a=["Nodes","Services","Checks"].reduce((e,n)=>((e,t,n)=>t[n].reduce((e,t)=>(["Partition","Namespace"].forEach(r=>{let a=e[r][t[r]]
+void 0===a&&(a=e[r][t[r]]={Name:t[r]}),void 0===a[n]&&(a[n]=p({},b)),a[n].Total+=t.Total,a[n].Passing+=t.Passing,a[n].Warning+=t.Warning,a[n].Critical+=t.Critical}),e.Datacenter[n].Total+=t.Total,e.Datacenter[n].Passing+=t.Passing,e.Datacenter[n].Warning+=t.Warning,e.Datacenter[n].Critical+=t.Critical,e),e))(e,t,n),{Datacenter:{Name:n,Nodes:p({},b),Services:p({},b),Checks:p({},b)},Partition:{},Namespace:{}})
+return{meta:{version:2,uri:r,interval:3e4},body:p({Datacenter:a.Datacenter,Partitions:Object.values(a.Partition),Namespaces:Object.values(a.Namespace)},t)}})}async find(e){const t=this.store.peekAll("dc").findBy("Name",e.name)
+if(void 0===t){const e=new Ember.Error("Page not found")
+throw e.status="404",{errors:[e]}}return t}},c=d(u.prototype,"env",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d(u.prototype,"fetchAll",[l],Object.getOwnPropertyDescriptor(u.prototype,"fetchAll"),u.prototype),d(u.prototype,"fetch",[s],Object.getOwnPropertyDescriptor(u.prototype,"fetch"),u.prototype),d(u.prototype,"fetchCatalogHealth",[i],Object.getOwnPropertyDescriptor(u.prototype,"fetchCatalogHealth"),u.prototype),d(u.prototype,"find",[o],Object.getOwnPropertyDescriptor(u.prototype,"find"),u.prototype),u)
+e.default=h})),define("consul-ui/services/repository/discovery-chain",["exports","consul-ui/services/repository","consul-ui/decorators/data-source"],(function(e,t,n){var r,a,l,s
+function i(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let o=(r=Ember.inject.service("repository/dc"),a=(0,n.default)("/:partition/:ns/:dc/discovery-chain/:id"),l=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="dcs",a=this,(r=s)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}getModelName(){return"discovery-chain"}findBySlug(e,t={}){const n=this.dcs.peekAll().findBy("Name",e.dc)
+return void 0===n||Ember.get(n,"MeshEnabled")?super.findBySlug(...arguments).catch(e=>{const t=Ember.get(e,"errors.firstObject.status"),r=(Ember.get(e,"errors.firstObject.detail")||"").trim()
+switch(t){case"500":return void(void 0!==n&&r.endsWith("Connect must be enabled in order to use this endpoint")&&Ember.set(n,"MeshEnabled",!1))
+default:throw e}}):Promise.resolve()}},s=i(l.prototype,"dcs",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i(l.prototype,"findBySlug",[a],Object.getOwnPropertyDescriptor(l.prototype,"findBySlug"),l.prototype),l)
+e.default=o})),define("consul-ui/services/repository/intention-permission-http-header",["exports","consul-ui/services/repository"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{getModelName(){return"intention-permission-http-header"}create(e={}){return this.store.createFragment(this.getModelName(),e)}persist(e){return e.execute()}}e.default=n})),define("consul-ui/services/repository/intention-permission",["exports","consul-ui/services/repository"],(function(e,t){function n(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function r(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{}
+t%2?n(Object(r),!0).forEach((function(t){a(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):n(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class l extends t.default{getModelName(){return"intention-permission"}create(e={}){return this.store.createFragment(this.getModelName(),r(r({},e),{},{HTTP:this.store.createFragment("intention-permission-http",e.HTTP||{})}))}persist(e){return e.execute()}}e.default=l})),define("consul-ui/services/repository/intention",["exports","consul-ui/services/repository","consul-ui/models/intention","consul-ui/decorators/data-source"],(function(e,t,n,r){var a,l,s,i,o,u
+function c(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function d(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function m(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let p=(a=Ember.inject.service("env"),l=(0,r.default)("/:partition/:ns/:dc/intentions"),s=(0,r.default)("/:partition/:ns/:dc/intention/:id"),i=(0,r.default)("/:partition/:ns/:dc/intentions/for-service/:id"),o=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="env",a=this,(r=u)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0}),d(this,"managedByCRDs",!1)}getModelName(){return"intention"}getPrimaryKey(){return n.PRIMARY_KEY}create(e){return delete e.Namespace,super.create(function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?c(Object(n),!0).forEach((function(t){d(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}({Action:"allow"},e))}isManagedByCRDs(){return this.managedByCRDs||(this.managedByCRDs=this.store.peekAll(this.getModelName()).toArray().some(e=>e.IsManagedByCRD)),this.managedByCRDs}async authorizeBySlug(e,t,n){const[,r,,a]=n.id.split(":"),l=this.permissions.abilityFor(this.getModelName())
+return n.resources=l.generateForSegment(r).concat(l.generateForSegment(a)),this.authorizeByPermissions(e,t,n)}async persist(e){const t=await super.persist(...arguments)
+return Ember.get(t,"Action.length")&&Ember.set(t,"Permissions",[]),t}async findAll(){return super.findAll(...arguments)}async findBySlug(e){let t
+if(""===e.id){const n=this.env.var("CONSUL_NSPACES_ENABLED")?"*":"default",r="default"
+t=await this.create({SourceNS:e.nspace||n,DestinationNS:e.nspace||n,SourcePartition:e.partition||r,DestinationPartition:e.partition||r,Datacenter:e.dc,Partition:e.partition})}else t=super.findBySlug(...arguments)
+return t}async findByService(e,t={}){const n={dc:e.dc,nspace:e.nspace,filter:`SourceName == "${e.id}" or DestinationName == "${e.id}" or SourceName == "*" or DestinationName == "*"`}
+return void 0!==t.cursor&&(n.index=t.cursor,n.uri=t.uri),this.store.query(this.getModelName(),n)}},u=m(o.prototype,"env",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m(o.prototype,"findAll",[l],Object.getOwnPropertyDescriptor(o.prototype,"findAll"),o.prototype),m(o.prototype,"findBySlug",[s],Object.getOwnPropertyDescriptor(o.prototype,"findBySlug"),o.prototype),m(o.prototype,"findByService",[i],Object.getOwnPropertyDescriptor(o.prototype,"findByService"),o.prototype),o)
+e.default=p})),define("consul-ui/services/repository/kv",["exports","consul-ui/services/repository","consul-ui/utils/isFolder","consul-ui/models/kv","consul-ui/decorators/data-source"],(function(e,t,n,r,a){var l,s,i
+function o(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let u=(l=(0,a.default)("/:partition/:ns/:dc/kv/:id"),s=(0,a.default)("/:partition/:ns/:dc/kvs/:id"),o((i=class extends t.default{getModelName(){return"kv"}getPrimaryKey(){return r.PRIMARY_KEY}shouldReconcile(e,t){return super.shouldReconcile(...arguments)&&e.Key.startsWith(t.id)}async findBySlug(e,t={}){let r
+if((0,n.default)(e.id)){const t=JSON.stringify([e.partition,e.ns,e.dc,e.id])
+r=this.store.peekRecord(this.getModelName(),t),r||(r=await this.create({Key:e.id,Datacenter:e.dc,Namespace:e.ns,Partition:e.partition}))}else r=""===e.id?await this.create({Datacenter:e.dc,Namespace:e.ns,Partition:e.partition}):await super.findBySlug(...arguments)
+return r}async findAllBySlug(e,t={}){e.separator="/","/"===e.id&&(e.id="")
+let n=await this.findAll(...arguments)
+const r=n.meta
+return n=n.filter(t=>e.id!==Ember.get(t,"Key")),n.meta=r,n}}).prototype,"findBySlug",[l],Object.getOwnPropertyDescriptor(i.prototype,"findBySlug"),i.prototype),o(i.prototype,"findAllBySlug",[s],Object.getOwnPropertyDescriptor(i.prototype,"findAllBySlug"),i.prototype),i)
+e.default=u})),define("consul-ui/services/repository/license",["exports","consul-ui/services/repository","consul-ui/decorators/data-source"],(function(e,t,n){var r,a
+function l(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function s(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?l(Object(n),!0).forEach((function(t){i(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):l(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const o=function(e,{dc:t,ns:n="default",partition:r="default"}){return s(s({},e),{},{Datacenter:t,Namespace:void 0===e.Namespace?n:e.Namespace,Partition:void 0===e.Partition?r:e.Partition})}
+let u=(r=(0,n.default)("/:partition/:ns/:dc/license"),a=class extends t.default{async find({partition:e,ns:t,dc:n},{uri:r},a){return(await(a`
+      GET /v1/operator/license?${{dc:n}}
+      X-Request-ID: ${r}
+    `))((a,l,s)=>({meta:{version:2,uri:r,interval:3e4},body:s(o(l,{dc:n}),r=>r`${"license"}:///${e}/${t}/${n}/license/${l.License.license_id}`)}))}},c=a.prototype,d="find",m=[r],p=Object.getOwnPropertyDescriptor(a.prototype,"find"),f=a.prototype,b={},Object.keys(p).forEach((function(e){b[e]=p[e]})),b.enumerable=!!b.enumerable,b.configurable=!!b.configurable,("value"in b||b.initializer)&&(b.writable=!0),b=m.slice().reverse().reduce((function(e,t){return t(c,d,e)||e}),b),f&&void 0!==b.initializer&&(b.value=b.initializer?b.initializer.call(f):void 0,b.initializer=void 0),void 0===b.initializer&&(Object.defineProperty(c,d,b),b=null),a)
+var c,d,m,p,f,b
+e.default=u})),define("consul-ui/services/repository/metrics",["exports","consul-ui/services/repository","consul-ui/decorators/data-source"],(function(e,t,n){var r,a,l,s,i,o,u,c,d,m
+function p(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function f(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let b=(r=Ember.inject.service("ui-config"),a=Ember.inject.service("env"),l=Ember.inject.service("client/http"),s=(0,n.default)("/:partition/:ns/:dc/metrics/summary-for-service/:slug/:protocol"),i=(0,n.default)("/:partition/:ns/:dc/metrics/upstream-summary-for-service/:slug/:protocol"),o=(0,n.default)("/:partition/:ns/:dc/metrics/downstream-summary-for-service/:slug/:protocol"),u=class extends t.default{constructor(...e){var t,n,r
+super(...e),p(this,"config",c,this),p(this,"env",d,this),p(this,"client",m,this),r=null,(n="error")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r}getModelName(){return"metrics"}init(){super.init(...arguments)
+const e=this.config.getSync(),t=e.metrics_provider_options||{}
+t.metrics_proxy_enabled=e.metrics_proxy_enabled
+const n=e.metrics_provider||"prometheus"
+t.fetch=(e,t)=>this.client.fetchWithToken("/v1/internal/ui/metrics-proxy"+e,t)
+try{this.provider=window.consul.getMetricsProvider(n,t)}catch(r){this.error=new Error("metrics provider not initialized: "+r),console.error(this.error)}}findServiceSummary(e,t={}){if(this.error)return Promise.reject(this.error)
+const n=[this.provider.serviceRecentSummarySeries(e.slug,e.dc,e.ns,e.protocol,{}),this.provider.serviceRecentSummaryStats(e.slug,e.dc,e.ns,e.protocol,{})]
+return Promise.all(n).then(e=>({meta:{interval:this.env.var("CONSUL_METRICS_POLL_INTERVAL")||1e4},series:e[0],stats:e[1].stats}))}findUpstreamSummary(e,t={}){return this.error?Promise.reject(this.error):this.provider.upstreamRecentSummaryStats(e.slug,e.dc,e.ns,{}).then(e=>(e.meta={interval:this.env.var("CONSUL_METRICS_POLL_INTERVAL")||1e4},e))}findDownstreamSummary(e,t={}){return this.error?Promise.reject(this.error):this.provider.downstreamRecentSummaryStats(e.slug,e.dc,e.ns,{}).then(e=>(e.meta={interval:this.env.var("CONSUL_METRICS_POLL_INTERVAL")||1e4},e))}},c=f(u.prototype,"config",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=f(u.prototype,"env",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=f(u.prototype,"client",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f(u.prototype,"findServiceSummary",[s],Object.getOwnPropertyDescriptor(u.prototype,"findServiceSummary"),u.prototype),f(u.prototype,"findUpstreamSummary",[i],Object.getOwnPropertyDescriptor(u.prototype,"findUpstreamSummary"),u.prototype),f(u.prototype,"findDownstreamSummary",[o],Object.getOwnPropertyDescriptor(u.prototype,"findDownstreamSummary"),u.prototype),u)
+e.default=b})),define("consul-ui/services/repository/node",["exports","consul-ui/services/repository","consul-ui/decorators/data-source"],(function(e,t,n){var r,a,l,s
+function i(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let o=(r=(0,n.default)("/:partition/:ns/:dc/nodes"),a=(0,n.default)("/:partition/:ns/:dc/node/:id"),l=(0,n.default)("/:partition/:ns/:dc/leader"),i((s=class extends t.default{getModelName(){return"node"}async findAllByDatacenter(){return super.findAllByDatacenter(...arguments)}async findBySlug(){return super.findBySlug(...arguments)}findLeader(e,t={}){return void 0!==t.refresh&&(e.uri=t.uri),this.store.queryLeader(this.getModelName(),e)}}).prototype,"findAllByDatacenter",[r],Object.getOwnPropertyDescriptor(s.prototype,"findAllByDatacenter"),s.prototype),i(s.prototype,"findBySlug",[a],Object.getOwnPropertyDescriptor(s.prototype,"findBySlug"),s.prototype),i(s.prototype,"findLeader",[l],Object.getOwnPropertyDescriptor(s.prototype,"findLeader"),s.prototype),s)
+e.default=o})),define("consul-ui/services/repository/nspace",["exports","consul-ui/services/repository","consul-ui/models/nspace","consul-ui/decorators/data-source","consul-ui/utils/form/builder"],(function(e,t,n,r,a){var l,s,i,o,u,c,d,m,p,f,b,h,v,y,g
+function O(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function _(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let P=(l=Ember.inject.service("router"),s=Ember.inject.service("container"),i=Ember.inject.service("env"),o=Ember.inject.service("form"),u=Ember.inject.service("settings"),c=Ember.inject.service("repository/permission"),d=(0,r.default)("/:partition/:ns/:dc/namespaces"),m=(0,r.default)("/:partition/:ns/:dc/namespace/:id"),p=class extends t.default{constructor(...e){super(...e),O(this,"router",f,this),O(this,"container",b,this),O(this,"env",h,this),O(this,"form",v,this),O(this,"settings",y,this),O(this,"permissions",g,this)}getPrimaryKey(){return n.PRIMARY_KEY}getSlugKey(){return n.SLUG_KEY}getModelName(){return"nspace"}async findAll(){return this.permissions.can("use nspaces")?super.findAll(...arguments).catch(()=>[]):[]}async findBySlug(e){let t
+return t=""===e.id?await this.create({Datacenter:e.dc,Partition:e.partition,ACLs:{PolicyDefaults:[],RoleDefaults:[]}}):await super.findBySlug(...arguments),(0,a.defaultChangeset)(t)}remove(e){return(0,t.softDelete)(this,e)}authorize(e,t){return this.env.var("CONSUL_ACLS_ENABLED")?this.store.authorize(this.getModelName(),{dc:e,ns:t}).catch((function(){return[]})):Promise.resolve([{Resource:"operator",Access:"write",Allow:!0}])}async getActive(e=""){if(this.permissions.can("use nspaces"))return{Name:"default"}
+const t=this.store.peekAll("nspace").toArray()
+if(0===e.length){e=(await this.settings.findBySlug("token")).Namespace||"default"}return 1===t.length?t[0]:function(e,t){let n=e.find((function(e){return e.Name===t.Name}))
+return void 0===n&&(n=e.find((function(e){return"default"===e.Name})),void 0===n&&(n=e[0])),n}(t,{Name:e})}},f=_(p.prototype,"router",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=_(p.prototype,"container",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=_(p.prototype,"env",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=_(p.prototype,"form",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=_(p.prototype,"settings",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=_(p.prototype,"permissions",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_(p.prototype,"findAll",[d],Object.getOwnPropertyDescriptor(p.prototype,"findAll"),p.prototype),_(p.prototype,"findBySlug",[m],Object.getOwnPropertyDescriptor(p.prototype,"findBySlug"),p.prototype),p)
+e.default=P})),define("consul-ui/services/repository/oidc-provider",["exports","consul-ui/services/repository","consul-ui/decorators/data-source"],(function(e,t,n){var r,a,l,s,i,o,u,c
+function d(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function m(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let p=(r=Ember.inject.service("torii"),a=Ember.inject.service("settings"),l=(0,n.default)("/:partition/:ns/:dc/oidc/providers"),s=(0,n.default)("/:partition/:ns/:dc/oidc/provider/:id"),i=(0,n.default)("/:partition/:ns/:dc/oidc/authorize/:id/:code/:state"),o=class extends t.default{constructor(...e){super(...e),d(this,"manager",u,this),d(this,"settings",c,this)}init(){super.init(...arguments),this.provider=Ember.getOwner(this).lookup("torii-provider:oidc-with-url")}getModelName(){return"oidc-provider"}async findAllByDatacenter(){const e=await super.findAllByDatacenter(...arguments)
+if(0===e.length){const e=new Error("Not found")
+return e.statusCode=404,void this.store.adapterFor(this.getModelName()).error(e)}return e}async findBySlug(e){const t=await this.settings.findBySlug("token")||{}
+return super.findBySlug({ns:e.ns||t.Namespace||"default",partition:e.partition||t.Partition||"default",dc:e.dc,id:e.id})}authorize(e,t={}){return this.store.authorize(this.getModelName(),e)}logout(e,t,n,r,a,l={}){const s={id:e}
+return this.store.logout(this.getModelName(),s)}close(){this.manager.close("oidc-with-url")}findCodeByURL(e){return Ember.set(this.provider,"baseUrl",e),this.manager.open("oidc-with-url",{}).catch(e=>{let t
+switch(!0){case e.message.startsWith("remote was closed"):t=new Error("Remote was closed"),t.statusCode=499
+break
+default:t=new Error(e.message),t.statusCode=500}this.store.adapterFor(this.getModelName()).error(t)})}},u=m(o.prototype,"manager",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=m(o.prototype,"settings",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m(o.prototype,"findAllByDatacenter",[l],Object.getOwnPropertyDescriptor(o.prototype,"findAllByDatacenter"),o.prototype),m(o.prototype,"findBySlug",[s],Object.getOwnPropertyDescriptor(o.prototype,"findBySlug"),o.prototype),m(o.prototype,"authorize",[i],Object.getOwnPropertyDescriptor(o.prototype,"authorize"),o.prototype),o)
+e.default=p}))
+define("consul-ui/services/repository/partition",["exports","consul-ui/services/repository","consul-ui/models/partition","consul-ui/decorators/data-source","consul-ui/utils/form/builder"],(function(e,t,n,r,a){var l,s,i,o,u,c,d,m,p
+function f(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function b(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let h=(l=Ember.inject.service("settings"),s=Ember.inject.service("form"),i=Ember.inject.service("repository/permission"),o=(0,r.default)("/:partition/:ns/:dc/partitions"),u=(0,r.default)("/:partition/:ns/:dc/partition/:id"),c=class extends t.default{constructor(...e){super(...e),f(this,"settings",d,this),f(this,"form",m,this),f(this,"permissions",p,this)}getModelName(){return"partition"}getPrimaryKey(){return n.PRIMARY_KEY}getSlugKey(){return n.SLUG_KEY}async findAll(){return this.permissions.can("use partitions")?super.findAll(...arguments).catch(()=>[]):[]}async findBySlug(e){let t
+return t=""===e.id?await this.create({Datacenter:e.dc,Partition:""}):await super.findBySlug(...arguments),(0,a.defaultChangeset)(t)}remove(e){return(0,t.softDelete)(this,e)}async getActive(e=""){const t=this.store.peekAll("partition").toArray()
+if(0===e.length){e=(await this.settings.findBySlug("token")).Partition||"default"}return 1===t.length?t[0]:function(e,t){let n=e.find((function(e){return e.Name===t.Name}))
+return void 0===n&&(n=e.find((function(e){return"default"===e.Name})),void 0===n&&(n=e[0])),n}(t,{Name:e})}},d=b(c.prototype,"settings",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=b(c.prototype,"form",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=b(c.prototype,"permissions",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b(c.prototype,"findAll",[o],Object.getOwnPropertyDescriptor(c.prototype,"findAll"),c.prototype),b(c.prototype,"findBySlug",[u],Object.getOwnPropertyDescriptor(c.prototype,"findBySlug"),c.prototype),c)
+e.default=h})),define("consul-ui/services/repository/permission",["exports","consul-ui/services/repository","consul-ui/decorators/data-source"],(function(e,t,n){var r,a,l,s,i,o,u,c
+function d(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function m(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?d(Object(n),!0).forEach((function(t){f(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):d(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function p(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function f(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function b(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const h=[{Resource:"operator",Access:"write"},{Resource:"operator",Access:"read"},{Resource:"service",Access:"read"},{Resource:"node",Access:"read"},{Resource:"session",Access:"read"},{Resource:"session",Access:"write"},{Resource:"key",Access:"read"},{Resource:"key",Access:"write"},{Resource:"intention",Access:"read"},{Resource:"intention",Access:"write"},{Resource:"acl",Access:"read"},{Resource:"acl",Access:"write"}]
+let v=(r=Ember.inject.service("env"),a=Ember.inject.service("abilities"),l=Ember._tracked,s=(0,n.default)("/:partition/:nspace/:dc/permissions"),i=class extends t.default{constructor(...e){super(...e),p(this,"env",o,this),p(this,"_can",u,this),p(this,"permissions",c,this)}getModelName(){return"permission"}has(e){const t=Object.keys(e)
+return this.permissions.some(n=>t.every(t=>n[t]===e[t])&&!0===n.Allow)}can(e){return this._can.can(e)}abilityFor(e){return this._can.abilityFor(e)}generate(e,t,n){const r={Resource:e,Access:t}
+return void 0!==n&&(r.Segment=n),r}async authorize(e){if(this.env.var("CONSUL_ACLS_ENABLED")){let n=[]
+try{n=await this.store.authorize("permission",e)}catch(t){}return n}return e.resources.map(e=>m(m({},e),{},{Allow:!0}))}async findBySlug(e,t){let n
+try{n=this._can.abilityFor(t)}catch(a){return[]}const r=n.generateForSegment(e.id.toString())
+return 0===r.length?[]:(e.resources=r,this.authorize(e))}async findByPermissions(e){return this.authorize(e)}async findAll(e){return e.resources=h,this.permissions=await this.findByPermissions(e),this.permissions.forEach(e=>{["key","node","service","intention","session"].includes(e.Resource)&&(e.Allow=!0)}),this.permissions}},o=b(i.prototype,"env",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=b(i.prototype,"_can",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=b(i.prototype,"permissions",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return[]}}),b(i.prototype,"findAll",[s],Object.getOwnPropertyDescriptor(i.prototype,"findAll"),i.prototype),i)
+e.default=v})),define("consul-ui/services/repository/policy",["exports","consul-ui/services/repository","consul-ui/models/policy","consul-ui/decorators/data-source"],(function(e,t,n,r){var a,l,s,i,o
+function u(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let c=(a=Ember.inject.service("form"),l=(0,r.default)("/:partition/:ns/:dc/policies"),s=(0,r.default)("/:partition/:ns/:dc/policy/:id"),i=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="form",a=this,(r=o)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}getModelName(){return"policy"}getPrimaryKey(){return n.PRIMARY_KEY}getSlugKey(){return n.SLUG_KEY}async findAllByDatacenter(){return super.findAllByDatacenter(...arguments)}async findBySlug(e){let t
+return t=""===e.id?await this.create({Datacenter:e.dc,Partition:e.partition,Namespace:e.ns}):await super.findBySlug(...arguments),this.form.form(this.getModelName()).setData(t).getData()}persist(e){switch(Ember.get(e,"template")){case"":return e.save()}return Promise.resolve(e)}translate(e){return this.store.translate("policy",Ember.get(e,"Rules"))}},o=u(i.prototype,"form",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u(i.prototype,"findAllByDatacenter",[l],Object.getOwnPropertyDescriptor(i.prototype,"findAllByDatacenter"),i.prototype),u(i.prototype,"findBySlug",[s],Object.getOwnPropertyDescriptor(i.prototype,"findBySlug"),i.prototype),i)
+e.default=c})),define("consul-ui/services/repository/proxy",["exports","consul-ui/services/repository","consul-ui/models/proxy","consul-ui/decorators/data-source"],(function(e,t,n,r){var a,l,s
+function i(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let o=(a=(0,r.default)("/:partition/:ns/:dc/proxies/for-service/:id"),l=(0,r.default)("/:partition/:ns/:dc/proxy-instance/:serviceId/:node/:id"),i((s=class extends t.default{getModelName(){return"proxy"}getPrimaryKey(){return n.PRIMARY_KEY}findAllBySlug(e,t={}){return void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.store.query(this.getModelName(),e).then(e=>(e.forEach(e=>{const t=JSON.parse(e.uid)
+t.pop(),t.push(e.ServiceProxy.DestinationServiceID)
+const n=this.store.peekRecord("service-instance",JSON.stringify(t))
+n&&Ember.set(n,"ProxyInstance",e)}),e))}async findInstanceBySlug(e,t){const n=await this.findAllBySlug(e,t)
+let r={}
+if(Ember.get(n,"length")>0){let t=n.filterBy("ServiceProxy.DestinationServiceID",e.serviceId).findBy("NodeName",e.node)
+t?r=t:(t=n.findBy("ServiceProxy.DestinationServiceName",e.id),t&&(r=t))}return Ember.set(r,"meta",Ember.get(n,"meta")),r}}).prototype,"findAllBySlug",[a],Object.getOwnPropertyDescriptor(s.prototype,"findAllBySlug"),s.prototype),i(s.prototype,"findInstanceBySlug",[l],Object.getOwnPropertyDescriptor(s.prototype,"findInstanceBySlug"),s.prototype),s)
+e.default=o})),define("consul-ui/services/repository/role",["exports","consul-ui/services/repository","consul-ui/models/role","consul-ui/decorators/data-source"],(function(e,t,n,r){var a,l,s,i,o
+function u(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let c=(a=Ember.inject.service("form"),l=(0,r.default)("/:partition/:ns/:dc/roles"),s=(0,r.default)("/:partition/:ns/:dc/role/:id"),i=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="form",a=this,(r=o)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}getModelName(){return"role"}getPrimaryKey(){return n.PRIMARY_KEY}getSlugKey(){return n.SLUG_KEY}async findAll(){return super.findAll(...arguments)}async findBySlug(e){let t
+return t=""===e.id?await this.create({Datacenter:e.dc,Partition:e.partition,Namespace:e.ns}):await super.findBySlug(...arguments),this.form.form(this.getModelName()).setData(t).getData()}},o=u(i.prototype,"form",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u(i.prototype,"findAll",[l],Object.getOwnPropertyDescriptor(i.prototype,"findAll"),i.prototype),u(i.prototype,"findBySlug",[s],Object.getOwnPropertyDescriptor(i.prototype,"findBySlug"),i.prototype),i)
+e.default=c})),define("consul-ui/services/repository/service-instance",["exports","consul-ui/services/repository","consul-ui/abilities/base","consul-ui/decorators/data-source"],(function(e,t,n,r){var a,l,s
+function i(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let o=(a=(0,r.default)("/:partition/:ns/:dc/service-instances/for-service/:id"),l=(0,r.default)("/:partition/:ns/:dc/service-instance/:serviceId/:node/:id"),i((s=class extends t.default{getModelName(){return"service-instance"}shouldReconcile(e,t){return super.shouldReconcile(...arguments)&&e.Service.Service===t.id}async findByService(e,t={}){return void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.authorizeBySlug(async t=>{const n=await this.query(e)
+return Ember.set(n,"firstObject.Service.Resources",t),n},n.ACCESS_READ,e)}async findBySlug(e,t={}){return super.findBySlug(...arguments)}}).prototype,"findByService",[a],Object.getOwnPropertyDescriptor(s.prototype,"findByService"),s.prototype),i(s.prototype,"findBySlug",[l],Object.getOwnPropertyDescriptor(s.prototype,"findBySlug"),s.prototype),s)
+e.default=o})),define("consul-ui/services/repository/service",["exports","consul-ui/services/repository","consul-ui/decorators/data-source"],(function(e,t,n){var r,a,l
+function s(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let i=(r=(0,n.default)("/:partition/:ns/:dc/services"),a=(0,n.default)("/:partition/:ns/:dc/gateways/for-service/:gateway"),s((l=class extends t.default{getModelName(){return"service"}async findAllByDatacenter(){return super.findAll(...arguments)}findGatewayBySlug(e,t={}){return void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.store.query(this.getModelName(),e)}}).prototype,"findAllByDatacenter",[r],Object.getOwnPropertyDescriptor(l.prototype,"findAllByDatacenter"),l.prototype),s(l.prototype,"findGatewayBySlug",[a],Object.getOwnPropertyDescriptor(l.prototype,"findGatewayBySlug"),l.prototype),l)
+e.default=i})),define("consul-ui/services/repository/session",["exports","consul-ui/services/repository","consul-ui/decorators/data-source"],(function(e,t,n){var r,a,l,s,i
+function o(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let u=(r=Ember.inject.service("store"),a=(0,n.default)("/:partition/:ns/:dc/sessions/for-node/:id"),l=(0,n.default)("/:partition/:ns/:dc/sessions/for-key/:id"),s=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="store",a=this,(r=i)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}getModelName(){return"session"}findByNode(e,t={}){return void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.store.query(this.getModelName(),e)}findByKey(e,t={}){return this.findBySlug(...arguments)}},i=o(s.prototype,"store",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o(s.prototype,"findByNode",[a],Object.getOwnPropertyDescriptor(s.prototype,"findByNode"),s.prototype),o(s.prototype,"findByKey",[l],Object.getOwnPropertyDescriptor(s.prototype,"findByKey"),s.prototype),s)
+e.default=u})),define("consul-ui/services/repository/token",["exports","consul-ui/services/repository","consul-ui/models/token","consul-ui/decorators/data-source"],(function(e,t,n,r){var a,l,s,i,o,u,c,d
+function m(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let p=(a=Ember.inject.service("form"),l=(0,r.default)("/:partition/:ns/:dc/tokens"),s=(0,r.default)("/:partition/:ns/:dc/token/:id"),i=(0,r.default)("/:partition/:ns/:dc/token/self/:secret"),o=(0,r.default)("/:partition/:ns/:dc/tokens/for-policy/:policy"),u=(0,r.default)("/:partition/:ns/:dc/tokens/for-role/:role"),c=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="form",a=this,(r=d)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}getModelName(){return"token"}getPrimaryKey(){return n.PRIMARY_KEY}getSlugKey(){return n.SLUG_KEY}async findAll(){return super.findAll(...arguments)}async findBySlug(e){let t
+return t=""===e.id?await this.create({Datacenter:e.dc,Partition:e.partition,Namespace:e.ns}):await super.findBySlug(...arguments),this.form.form(this.getModelName()).setData(t).getData()}self(e){return this.store.self(this.getModelName(),{secret:e.secret,dc:e.dc}).catch(e=>Promise.reject(e))}clone(e){return this.store.clone(this.getModelName(),Ember.get(e,n.PRIMARY_KEY))}findByPolicy(e){return this.findAll(...arguments)}findByRole(){return this.findAll(...arguments)}},d=m(c.prototype,"form",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m(c.prototype,"findAll",[l],Object.getOwnPropertyDescriptor(c.prototype,"findAll"),c.prototype),m(c.prototype,"findBySlug",[s],Object.getOwnPropertyDescriptor(c.prototype,"findBySlug"),c.prototype),m(c.prototype,"self",[i],Object.getOwnPropertyDescriptor(c.prototype,"self"),c.prototype),m(c.prototype,"findByPolicy",[o],Object.getOwnPropertyDescriptor(c.prototype,"findByPolicy"),c.prototype),m(c.prototype,"findByRole",[u],Object.getOwnPropertyDescriptor(c.prototype,"findByRole"),c.prototype),c)
+e.default=p})),define("consul-ui/services/repository/topology",["exports","consul-ui/services/repository","consul-ui/decorators/data-source"],(function(e,t,n){var r,a,l,s
+function i(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let o=(r=Ember.inject.service("repository/dc"),a=(0,n.default)("/:partition/:ns/:dc/topology/:id/:kind"),l=class extends t.default{constructor(...e){var t,n,r,a
+super(...e),t=this,n="dcs",a=this,(r=s)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}getModelName(){return"topology"}findBySlug(e,t={}){const n=this.dcs.peekOne(e.dc)
+return null===n||Ember.get(n,"MeshEnabled")?(void 0!==t.cursor&&(e.index=t.cursor,e.uri=t.uri),this.store.queryRecord(this.getModelName(),e).catch(e=>{const t=Ember.get(e,"errors.firstObject.status"),r=(Ember.get(e,"errors.firstObject.detail")||"").trim()
+switch(t){case"500":return void(null!==n&&r.endsWith("Connect must be enabled in order to use this endpoint")&&Ember.set(n,"MeshEnabled",!1))
+default:throw e}})):Promise.resolve()}},s=i(l.prototype,"dcs",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i(l.prototype,"findBySlug",[a],Object.getOwnPropertyDescriptor(l.prototype,"findBySlug"),l.prototype),l)
+e.default=o})),define("consul-ui/services/resize-observer",["exports","ember-resize-observer-service/services/resize-observer"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/routlet",["exports","consul-ui/utils/routing/wildcard","consul-ui/router"],(function(e,t,n){var r,a,l,s,i,o,u
+function c(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function d(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{}
+t%2?c(Object(n),!0).forEach((function(t){p(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function m(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function p(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function f(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const b=(0,t.default)(n.routes)
+const h=new class{constructor(){this.map=new Map,this.sorted=[]}sort(){this.sorted=[...this.map.keys()],this.sorted.sort((e,t)=>{if("application"===e)return 1
+if("application"===t)return-1
+const n=e.split(".").length,r=t.split(".").length
+switch(!0){case n>r:return-1
+case n<r:return 1
+default:return 0}})}set(e,t){this.map.set(e,t),this.sort()}get(e){return this.map.get(e)}delete(e){this.map.delete(e),this.sort()}keys(){return this.sorted}}
+let v=(r=Ember.inject.service("container"),a=Ember.inject.service("env"),l=Ember.inject.service("router"),s=class extends Ember.Service{constructor(...e){super(...e),m(this,"container",i,this),m(this,"env",o,this),m(this,"router",u,this)}ready(){return this._transition}transition(){let e
+return this._transition=new Promise(t=>{e=t}),e}findOutlet(e){return[...h.keys()].find(t=>-1!==e.indexOf(t))}outletFor(e){const t=[...h.keys()],n=t.indexOf(e)+1
+return h.get(t[n])}normalizeParamsFor(e,t={}){return b(e)?Object.keys(t).reduce((function(e,n){return void 0!==t[n]?e[n]=decodeURIComponent(t[n]):e[n]=t[n],e}),{}):t}paramsFor(e){let t={}
+const n=h.get(e)
+void 0!==n&&void 0!==n.args.params&&(t=n.args.params)
+let r=this.router.currentRoute
+null===r&&(r=this.container.lookup("route:application"))
+let a,l=r,s=this.normalizeParamsFor(e,l.params)
+for(;a=l.parent;)s=d(d({},this.normalizeParamsFor(a.name,a.params)),s),l=a
+return d(d(d({},this.container.get("location:"+this.env.var("locationType")).optionalParams()),s),t)}modelFor(e){const t=h.get(e)
+if(void 0!==t)return t.model}addRoute(e,t){const n=this.outletFor(e)
+void 0!==n&&(n.route=t,Ember.run.schedule("afterRender",()=>{n.routeName=e}))}removeRoute(e,t){const n=this.outletFor(e)
+t._model=void 0,void 0!==n&&Ember.run.schedule("afterRender",()=>{n.route=void 0})}addOutlet(e,t){h.set(e,t)}removeOutlet(e){Ember.run.schedule("afterRender",()=>{h.delete(e)})}},i=f(s.prototype,"container",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o=f(s.prototype,"env",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=f(s.prototype,"router",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s)
+e.default=v})),define("consul-ui/services/schema",["exports","consul-ui/models/intention-permission","consul-ui/models/intention-permission-http","consul-ui/models/intention-permission-http-header"],(function(e,t,n,r){function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class l extends Ember.Service{constructor(...e){super(...e),a(this,"intention-permission",t.schema),a(this,"intention-permission-http",n.schema),a(this,"intention-permission-http-header",r.schema)}}e.default=l})),define("consul-ui/services/search",["exports","consul-ui/utils/search/exact","consul-ui/search/predicates/intention","consul-ui/search/predicates/upstream-instance","consul-ui/search/predicates/service-instance","consul-ui/search/predicates/health-check","consul-ui/search/predicates/acl","consul-ui/search/predicates/service","consul-ui/search/predicates/node","consul-ui/search/predicates/kv","consul-ui/search/predicates/token","consul-ui/search/predicates/role","consul-ui/search/predicates/policy","consul-ui/search/predicates/auth-method","consul-ui/search/predicates/nspace"],(function(e,t,n,r,a,l,s,i,o,u,c,d,m,p,f){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const b={intention:n.default,service:i.default,"service-instance":a.default,"upstream-instance":r.default,"health-check":l.default,"auth-method":p.default,node:o.default,kv:u.default,acl:s.default,token:c.default,role:d.default,policy:m.default,nspace:f.default}
+class h extends Ember.Service{constructor(...e){var n,r,a
+super(...e),n=this,r="searchables",a={exact:t.default},r in n?Object.defineProperty(n,r,{value:a,enumerable:!0,configurable:!0,writable:!0}):n[r]=a}predicate(e){return b[e]}}e.default=h})),define("consul-ui/services/settings",["exports","consul-ui/utils/storage/local-storage"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.ifNotBlocking=void 0
+const n=(0,t.default)("consul")
+e.ifNotBlocking=function(e){return e.findBySlug("client").then((function(e){return void 0!==e.blocking&&!e.blocking}))}
+class r extends Ember.Service{constructor(...e){var t,r,a
+super(...e),a=n,(r="storage")in(t=this)?Object.defineProperty(t,r,{value:a,enumerable:!0,configurable:!0,writable:!0}):t[r]=a}findAll(e){return Promise.resolve(this.storage.all())}findBySlug(e){return Promise.resolve(this.storage.getValue(e))}persist(e){const t=this.storage
+return Object.keys(e).forEach(n=>{t.setValue(n,e[n])}),Promise.resolve(e)}delete(e){Array.isArray(e)||(e=[e])
+const t=this.storage,n=e.reduce((function(e,n){return t.removeValue(n),e}),{})
+return Promise.resolve(n)}}e.default=r})),define("consul-ui/services/sort",["exports","consul-ui/sort/comparators/service","consul-ui/sort/comparators/service-instance","consul-ui/sort/comparators/upstream-instance","consul-ui/sort/comparators/kv","consul-ui/sort/comparators/health-check","consul-ui/sort/comparators/intention","consul-ui/sort/comparators/token","consul-ui/sort/comparators/role","consul-ui/sort/comparators/policy","consul-ui/sort/comparators/auth-method","consul-ui/sort/comparators/nspace","consul-ui/sort/comparators/node"],(function(e,t,n,r,a,l,s,i,o,u,c,d,m){Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.properties=void 0
+const p=e=>e.reduce((e,t)=>e.concat([t+":asc",t+":desc"]),[]),f=(e=[])=>t=>{const n=p(e)
+return[n.find(e=>e===t)||n[0]]}
+e.properties=f
+const b={properties:f,directionify:p},h={service:(0,t.default)(b),"service-instance":(0,n.default)(b),"upstream-instance":(0,r.default)(b),"health-check":(0,l.default)(b),"auth-method":(0,c.default)(b),kv:(0,a.default)(b),intention:(0,s.default)(b),token:(0,i.default)(b),role:(0,o.default)(b),policy:(0,u.default)(b),nspace:(0,d.default)(b),node:(0,m.default)(b)}
+class v extends Ember.Service{comparator(e){return h[e]}}e.default=v})),define("consul-ui/services/state-with-charts",["exports","consul-ui/services/state","consul-ui/machines/validate.xstate","consul-ui/machines/boolean.xstate"],(function(e,t,n,r){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class a extends t.default{constructor(...e){var t,a,l
+super(...e),t=this,a="stateCharts",l={validate:n.default,boolean:r.default},a in t?Object.defineProperty(t,a,{value:l,enumerable:!0,configurable:!0,writable:!0}):t[a]=l}}e.default=a})),define("consul-ui/services/state",["exports","flat","@xstate/fsm"],(function(e,t,n){var r,a,l
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let s=(r=Ember.inject.service("logger"),a=class extends Ember.Service{constructor(...e){var t,n,r,a,s,i,o
+super(...e),r={},(n="stateCharts")in(t=this)?Object.defineProperty(t,n,{value:r,enumerable:!0,configurable:!0,writable:!0}):t[n]=r,a=this,s="logger",o=this,(i=l)&&Object.defineProperty(a,s,{enumerable:i.enumerable,configurable:i.configurable,writable:i.writable,value:i.initializer?i.initializer.call(o):void 0})}log(e,t){}stateChart(e){return this.stateCharts[e]}addGuards(e,t){return this.guards(e).forEach((function([n,r]){Ember.set(e,n,(function(){return!!t.onGuard(r,...arguments)}))})),[e,t]}machine(e,t={}){return(0,n.createMachine)(...this.addGuards(e,t))}prepareChart(e){return void 0!==(e=JSON.parse(JSON.stringify(e))).on&&Object.values(e.states).forEach((function(t){void 0===t.on?t.on=e.on:Object.keys(e.on).forEach((function(n){void 0===t.on[n]&&(t.on[n]=e.on[n])}))})),e}matches(e,t){if(void 0===e)return!1
+return(Array.isArray(t)?t:[t]).some(t=>e.matches(t))}state(e){return{matches:e}}interpret(e,t){e=this.prepareChart(e)
+const r=(0,n.interpret)(this.machine(e,t))
+return r.subscribe(n=>{n.changed&&(this.log(e,n),t.onTransition(n))}),r}guards(e){return Object.entries((0,t.default)(e)).filter(([e])=>e.endsWith(".cond"))}},i=a.prototype,o="logger",u=[r],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(c).forEach((function(e){m[e]=c[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=u.slice().reverse().reduce((function(e,t){return t(i,o,e)||e}),m),d&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(d):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(i,o,m),m=null),l=m,a)
+var i,o,u,c,d,m
+e.default=s})),define("consul-ui/services/store",["exports","@ember-data/store"],(function(e,t){var n,r,a,l,s
+function i(e,t,n,r){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(r):void 0})}function o(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let u=(n=Ember.inject.service("data-source/service"),r=Ember.inject.service("client/http"),a=class extends t.default{constructor(...e){super(...e),i(this,"dataSource",l,this),i(this,"client",s,this)}invalidate(e=401){this.client.abort(401),this.dataSource.resetCache(),this.init()}clear(){this.invalidate(0)}clone(e,t){return this.adapterFor(e).clone(this,{modelName:e},t,this._internalModelForId(e,t).createSnapshot({}))}self(e,t){const n=this.adapterFor(e),r=this.serializerFor(e),a={modelName:e}
+return n.self(this,a,t.secret,t).then(e=>r.normalizeResponse(this,a,e,t,"self"))}queryLeader(e,t){const n=this.adapterFor(e),r=this.serializerFor(e),a={modelName:e}
+return n.queryLeader(this,a,null,t).then(e=>(e.meta=r.normalizeMeta(this,a,e,null,"leader"),e))}authorize(e,t={}){const n=this.adapterFor(e),r=this.serializerFor(e),a={modelName:e}
+return n.authorize(this,a,null,t).then(e=>r.normalizeResponse(this,a,e,void 0,"authorize"))}logout(e,t={}){const n={modelName:e}
+return this.adapterFor(e).logout(this,n,t.id,t)}},l=o(a.prototype,"dataSource",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=o(a.prototype,"client",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a)
+e.default=u})),define("consul-ui/services/temporal",["exports","pretty-ms","parse-duration","dayjs","dayjs/plugin/relativeTime"],(function(e,t,n,r,a){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,r.default.extend(a.default)
+class l extends Ember.Service{format(e,t){const n=(0,r.default)(e)
+return(0,r.default)().isBefore(n)?(0,r.default)().to(n,!0):(0,r.default)().from(n,!0)}within([e,t],n){return(0,r.default)(e).isBefore((0,r.default)().add(t,"ms"))}parse(e,t){return(0,n.default)(e)}durationFrom(e,n={}){switch(!0){case"number"==typeof e:return 0===e?"0":(0,t.default)(e/1e6,{formatSubMilliseconds:!0}).split(" ").join("")
+case"string"==typeof e:default:return e}}}e.default=l})),define("consul-ui/services/text-measurer",["exports","ember-text-measurer/services/text-measurer"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/ticker",["exports","consul-ui/utils/ticker"],(function(e,t){let n
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends Ember.Service{init(){super.init(...arguments),this.reset()}tweenTo(e,r="",a,l){const s=r
+return n.has(s)?((r=n.get(s))instanceof t.Tween&&(r=r.stop().getTarget()),n.set(s,t.Tween.to(r,e,a,l)),r):(n.set(s,e),e)}destroy(e){return this.reset(),t.Tween.destroy()}reset(){n=new Map}}e.default=r})),define("consul-ui/services/timeout",["exports","consul-ui/utils/promisedTimeout"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=(0,t.default)(Promise)
+class r extends Ember.Service{execute(e,t){return n(e,t)}tick(){return new Promise((function(e){Ember.run.next(e)}))}}e.default=r})),define("consul-ui/services/torii-session",["exports","torii/services/torii-session"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/torii",["exports","torii/services/torii"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/services/ui-config",["exports","consul-ui/decorators/data-source"],(function(e,t){var n,r,a,l,s,i
+function o(e,t,n,r,a){var l={}
+return Object.keys(r).forEach((function(e){l[e]=r[e]})),l.enumerable=!!l.enumerable,l.configurable=!!l.configurable,("value"in l||l.initializer)&&(l.writable=!0),l=n.slice().reverse().reduce((function(n,r){return r(e,t,n)||n}),l),a&&void 0!==l.initializer&&(l.value=l.initializer?l.initializer.call(a):void 0,l.initializer=void 0),void 0===l.initializer&&(Object.defineProperty(e,t,l),l=null),l}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let u=(n=Ember.inject.service("env"),r=(0,t.default)("/:partition/:nspace/:dc/ui-config/:path"),a=(0,t.default)("/:partition/:nspace/:dc/notfound/:path"),l=(0,t.default)("/:partition/:nspace/:dc/ui-config"),s=class extends Ember.Service{constructor(...e){var t,n,r,a
+super(...e),t=this,n="env",a=this,(r=i)&&Object.defineProperty(t,n,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(a):void 0})}async findByPath(e){return Ember.get(this.get(),e.path)}async parsePath(e){return e.path.split("/").reduce((e,t)=>{switch(!0){case t.startsWith("~"):e.nspace=t.substr(1)
+break
+case t.startsWith("_"):e.partition=t.substr(1)
+break
+case void 0===e.dc:e.dc=t}return e},{})}async get(){return this.env.var("CONSUL_UI_CONFIG")}getSync(){return this.env.var("CONSUL_UI_CONFIG")}},i=o(s.prototype,"env",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),o(s.prototype,"findByPath",[r],Object.getOwnPropertyDescriptor(s.prototype,"findByPath"),s.prototype),o(s.prototype,"parsePath",[a],Object.getOwnPropertyDescriptor(s.prototype,"parsePath"),s.prototype),o(s.prototype,"get",[l],Object.getOwnPropertyDescriptor(s.prototype,"get"),s.prototype),s)
+e.default=u})),define("consul-ui/sort/comparators/auth-method",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=({properties:e})=>(t="MethodName:asc")=>e(["MethodName","TokenTTL"])(t)})),define("consul-ui/sort/comparators/health-check",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=({properties:e})=>(t="Status:asc")=>t.startsWith("Status:")?function(e,n){const[,r]=t.split(":")
+let a,l
+"asc"===r?(a=e,l=n):(l=e,a=n)
+const s=a.Status,i=l.Status
+switch(s){case"passing":return"passing"===i?0:1
+case"critical":return"critical"===i?0:-1
+case"warning":switch(i){case"passing":return-1
+case"critical":return 1
+default:return 0}}return 0}:e(["Name","Kind"])(t)})),define("consul-ui/sort/comparators/intention",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=()=>e=>[e]})),define("consul-ui/sort/comparators/kv",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=({properties:e})=>t=>e(["Key","Kind"])(t)}))
+define("consul-ui/sort/comparators/node",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=({properties:e})=>(t="Name:asc")=>t.startsWith("Status:")?function(e,n){const[,r]=t.split(":")
+let a,l
+switch("asc"===r?(l=e,a=n):(a=e,l=n),!0){case a.ChecksCritical>l.ChecksCritical:return 1
+case a.ChecksCritical<l.ChecksCritical:return-1
+default:switch(!0){case a.ChecksWarning>l.ChecksWarning:return 1
+case a.ChecksWarning<l.ChecksWarning:return-1
+default:switch(!0){case a.ChecksPassing<l.ChecksPassing:return 1
+case a.ChecksPassing>l.ChecksPassing:return-1}}return 0}}:e(["Node"])(t)})),define("consul-ui/sort/comparators/nspace",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=({properties:e})=>t=>e(["Name"])(t)})),define("consul-ui/sort/comparators/partition",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=({properties:e})=>t=>e(["Name"])(t)})),define("consul-ui/sort/comparators/policy",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=({properties:e})=>(t="Name:asc")=>e(["Name"])(t)})),define("consul-ui/sort/comparators/role",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=({properties:e})=>(t="Name:asc")=>e(["Name","CreateIndex"])(t)})),define("consul-ui/sort/comparators/service-instance",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=({properties:e})=>t=>{if(t.startsWith("Status:")){const[,e]=t.split(":"),n=["PercentageChecksPassing","PercentageChecksWarning","PercentageChecksCritical"]
+return"asc"===e&&n.reverse(),function(e,t){for(let r in n){let a=n[r]
+if(e[a]!==t[a])return e[a]>t[a]?-1:1}}}return e(["Name"])(t)}})),define("consul-ui/sort/comparators/service",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=({properties:e})=>(t="Status:asc")=>t.startsWith("Status:")?function(e,n){const[,r]=t.split(":")
+let a,l
+switch("asc"===r?(l=e,a=n):(a=e,l=n),!0){case a.MeshChecksCritical>l.MeshChecksCritical:return 1
+case a.MeshChecksCritical<l.MeshChecksCritical:return-1
+default:switch(!0){case a.MeshChecksWarning>l.MeshChecksWarning:return 1
+case a.MeshChecksWarning<l.MeshChecksWarning:return-1
+default:switch(!0){case a.MeshChecksPassing<l.MeshChecksPassing:return 1
+case a.MeshChecksPassing>l.MeshChecksPassing:return-1}}return 0}}:e(["Name"])(t)})),define("consul-ui/sort/comparators/token",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=({properties:e})=>t=>e(["CreateTime"])(t)})),define("consul-ui/sort/comparators/upstream-instance",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=({properties:e})=>(t="DestinationName:asc")=>e(["DestinationName"])(t)})),define("consul-ui/styles/base/decoration/visually-hidden.css",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=e=>e`
+    @keyframes visually-hidden {
+      100% {
+        position: absolute;
+        overflow: hidden;
+        clip: rect(0 0 0 0);
+        width: 1px;
+        height: 1px;
+        margin: -1px;
+        padding: 0;
+        border: 0;
+      }
+    }
+  `})),define("consul-ui/styles/base/icons/base-keyframes.css",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=e=>e`
+*::before, *::after {
+  display: inline-block;
+  animation-play-state: paused;
+  animation-fill-mode: forwards;
+  animation-iteration-count: var(--icon-resolution, 1);
+  vertical-align: text-top;
+}
+*::before {
+  animation-name: var(--icon-name-start, var(--icon-name)),
+                  var(--icon-size-start, var(--icon-size, icon-000));
+  background-color: var(--icon-color-start, var(--icon-color));
+}
+*::after {
+  animation-name: var(--icon-name-end, var(--icon-name)),
+                  var(--icon-size-end, var(--icon-size, icon-000));
+  background-color: var(--icon-color-end, var(--icon-color));
+}
+
+[style*='--icon-color-start']::before {
+  color: var(--icon-color-start);
+}
+[style*='--icon-color-end']::after {
+  color: var(--icon-color-end);
+}
+[style*='--icon-name-start']::before,
+[style*='--icon-name-end']::after {
+  content: '';
+}
+
+@keyframes icon-000 {
+  100% {
+    width: 1.2em;
+    height: 1.2em;
+  }
+}
+@keyframes icon-100 {
+  100% {
+    width: 0.625rem; /* 10px */
+    height: 0.625rem; /* 10px */
+  }
+}
+@keyframes icon-200 {
+  100% {
+    width: 0.75rem; /* 12px */
+    height: 0.75rem; /* 12px */
+  }
+}
+@keyframes icon-300 {
+  100% {
+    width: 1rem; /* 16px */
+    height: 1rem; /* 16px */
+  }
+}
+@keyframes icon-400 {
+  100% {
+    width: 1.125rem; /* 18px */
+    height: 1.125rem; /* 18px */
+  }
+}
+@keyframes icon-500 {
+  100% {
+    width: 1.250rem; /* 20px */
+    height: 1.250rem; /* 20px */
+  }
+}
+@keyframes icon-600 {
+  100% {
+    width: 1.375rem; /* 22px */
+    height: 1.375rem; /* 22px */
+  }
+}
+@keyframes icon-700 {
+  100% {
+    width: 1.500rem; /* 24px */
+    height: 1.500rem; /* 24px */
+  }
+}
+@keyframes icon-800 {
+  100% {
+    width: 1.625rem; /* 26px */
+    height: 1.625rem; /* 26px */
+  }
+}
+@keyframes icon-900 {
+  100% {
+    width: 1.750rem; /* 28px */
+    height: 1.750rem; /* 28px */
+  }
+}
+`})),define("consul-ui/templates/application",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"wBErwPik",block:'{"symbols":["route","o","partition","nspace","dcs","dc","dcs","dc","consul","o","source","value","key"],"statements":[[8,"route",[],[["@name"],[[34,26]]],[["default"],[{"statements":[[2,"\\n\\n"],[8,[32,1,["Announcer"]],[],[["@title"],["Consul"]],null],[2,"\\n"],[6,[37,6],[[30,[36,19],["use acls"],null]],null,[["default"],[{"statements":[[2,"  "],[1,[30,[36,23],null,[["class"],["has-acls"]]]],[2,"\\n"]],"parameters":[]}]]],[6,[37,6],[[30,[36,19],["use nspaces"],null]],null,[["default"],[{"statements":[[2,"  "],[1,[30,[36,23],null,[["class"],["has-nspaces"]]]],[2,"\\n"]],"parameters":[]}]]],[6,[37,6],[[30,[36,19],["use partitions"],null]],null,[["default"],[{"statements":[[2,"  "],[1,[30,[36,23],null,[["class"],["has-partitions"]]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[8,"data-source",[],[["@src","@onchange"],[[30,[36,7],["settings://consul:client"],null],[30,[36,20],["onClientChanged"],null]]],null],[2,"\\n\\n"],[8,"data-source",[],[["@src"],[[30,[36,7],["settings://consul:theme"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,28],[[30,[36,27],[[32,11,["data"]]],null]],null,[["default"],[{"statements":[[6,[37,6],[[30,[36,9],[[32,12],[30,[36,25],[[32,13],[30,[36,24],["color-scheme","contrast"],null]],null]],null]],null,[["default"],[{"statements":[[2,"    "],[1,[30,[36,23],null,[["class"],[[30,[36,22],["prefers-",[32,13],"-",[32,12]],null]]]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[12,13]}]]]],"parameters":[11]}]]],[2,"\\n\\n"],[6,[37,6],[[30,[36,19],["use acls"],null]],null,[["default"],[{"statements":[[8,"data-source",[],[["@src","@onchange"],[[30,[36,7],["settings://consul:token"],null],[30,[36,5],[[32,0],[30,[36,17],[[35,0]],null]],[["value"],["data"]]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n\\n"],[6,[37,6],[[30,[36,29],[[32,1,["currentName"]],"oauth-provider-debug"],null]],null,[["default","else"],[{"statements":[[2,"\\n"],[6,[37,6],[[30,[36,18],[[32,1,["currentName"]],"index"],null]],null,[["default","else"],[{"statements":[[2,"\\n"],[2,"  "],[1,[30,[36,21],[[30,[36,20],["replaceWith","dc.services.index",[30,[36,1],null,[["dc"],[[30,[36,10],["CONSUL_DATACENTER_LOCAL"],null]]]]],null]],null]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,6],[[30,[36,18],[[32,1,["currentName"]],"notfound"],null]],null,[["default"],[{"statements":[[2,"  "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,7],["/*/*/*/notfound/${path}",[30,[36,1],null,[["path"],[[32,1,["params","notfound"]]]]]],null],[30,[36,5],[[32,0],[30,[36,17],[[35,13]],null]],[["value"],["data"]]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[6,[37,16],[[30,[36,6],[[30,[36,19],["use partitions"],null],[30,[36,15],[[32,1,["params","partition"]],[35,13,["partition"]],[35,0,["Partition"]],""],null],""],null],[30,[36,6],[[30,[36,19],["use nspaces"],null],[30,[36,15],[[32,1,["params","nspace"]],[35,13,["nspace"]],[35,0,["Namespace"]],""],null],""],null]],null,[["default"],[{"statements":[[2,"\\n"],[8,"data-source",[],[["@src"],[[30,[36,7],["/*/*/*/datacenters"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,16],[[30,[36,15],[[30,[36,6],[[35,14,["dc"]],[30,[36,12],[0,[30,[36,11],["dc",[30,[36,1],null,[["Name"],[[35,13,["dc"]]]]]],null]],null]],null],[30,[36,12],[0,[30,[36,11],["dc",[30,[36,1],null,[["Name"],[[32,1,["params","dc"]]]]]],null]],null],[30,[36,1],null,[["Name"],[[30,[36,10],["CONSUL_DATACENTER_LOCAL"],null]]]]],null],[32,5,["data"]]],null,[["default"],[{"statements":[[6,[37,6],[[30,[36,9],[[30,[36,8],[[32,6,["Name","length"]],0],null],[32,7]],null]],null,[["default"],[{"statements":[[2,"\\n"],[2,"    "],[8,"data-source",[],[["@src"],[[30,[36,7],["/${partition}/*/${dc}/datacenter-cache/${name}",[30,[36,1],null,[["dc","partition","name"],[[32,6,["Name"]],[32,3],[32,6,["Name"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,8,["data"]]],null,[["default"],[{"statements":[[2,"      "],[8,"hashicorp-consul",[[24,1,"wrapper"]],[["@dcs","@dc","@partition","@nspace","@user","@onchange"],[[32,7],[32,8,["data"]],[32,3],[32,4],[30,[36,1],null,[["token"],[[35,0]]]],[30,[36,5],[[32,0],"reauthorize"],null]]],[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[35,4]],null,[["default","else"],[{"statements":[[2,"        "],[8,"app-error",[],[["@error","@login"],[[34,4],[32,9,["login","open"]]]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,"outlet",[],[["@name","@model"],["application",[30,[36,1],null,[["app","user","dc","dcs"],[[32,9],[30,[36,1],null,[["token"],[[35,0]]]],[32,8,["data"]],[32,7]]]]]],[["default"],[{"statements":[[2,"\\n          "],[1,[30,[36,3],[[30,[36,2],null,null]],null]],[2,"\\n        "]],"parameters":[10]}]]],[2,"\\n\\n"],[2,"        "],[8,"consul/loader",[[24,0,"view-loader"]],[[],[]],null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[9]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[8]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[6,7]}]]]],"parameters":[5]}]]],[2,"\\n"]],"parameters":[3,4]}]]]],"parameters":[]}]]]],"parameters":[]},{"statements":[[2,"  "],[8,"outlet",[],[["@name","@model"],["application",[30,[36,1],null,[["user"],[[30,[36,1],null,[["token"],[[35,0]]]]]]]]],[["default"],[{"statements":[[2,"\\n    "],[1,[30,[36,3],[[30,[36,2],null,null]],null]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["token","hash","-outlet","component","error","action","if","uri","gt","and","env","cached-model","object-at","notfound","nofound","or","let","mut","eq","can","route-action","did-insert","concat","document-attrs","array","contains","routeName","-each-in","each","not-eq"]}',meta:{moduleName:"consul-ui/templates/application.hbs"}})
+e.default=t})),define("consul-ui/templates/components/basic-dropdown-content",["exports","ember-basic-dropdown/templates/components/basic-dropdown-content"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/templates/components/basic-dropdown-optional-tag",["exports","ember-basic-dropdown/templates/components/basic-dropdown-optional-tag"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/templates/components/basic-dropdown-trigger",["exports","ember-basic-dropdown/templates/components/basic-dropdown-trigger"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/templates/components/basic-dropdown",["exports","ember-basic-dropdown/templates/components/basic-dropdown"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/templates/dc",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"jdt244Ym",block:'{"symbols":["route","o"],"statements":[[8,"route",[],[["@name"],[[34,0]]],[["default"],[{"statements":[[2,"\\n  "],[8,"outlet",[],[["@name","@model"],[[34,0],[32,1,["model"]]]],[["default"],[{"statements":[[2,"\\n    "],[1,[30,[36,2],[[30,[36,1],null,null]],null]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["routeName","-outlet","component"]}',meta:{moduleName:"consul-ui/templates/dc.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"ToSP5lq3",block:'{"symbols":["route","o"],"statements":[[8,"route",[],[["@name"],[[34,0]]],[["default"],[{"statements":[[2,"\\n  "],[8,"outlet",[],[["@name","@model"],[[34,0],[32,1,["model"]]]],[["default"],[{"statements":[[2,"\\n    "],[1,[30,[36,2],[[30,[36,1],null,null]],null]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["routeName","-outlet","component"]}',meta:{moduleName:"consul-ui/templates/dc/acls.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/auth-methods/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"D0g2fM3h",block:'{"symbols":["route","loader","sort","filters","items","collection"],"statements":[[8,"route",[],[["@name"],[[34,7]]],[["default"],[{"statements":[[2,"\\n\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,9],["/${partition}/${nspace}/${dc}/auth-methods",[30,[36,8],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,4],[[30,[36,10],[[32,2,["error","status"]],"401"],null]],null,[["default","else"],[{"statements":[[2,"      "],[8,"consul/acl/disabled",[],[[],[]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,19],[[30,[36,8],null,[["value","change"],[[30,[36,18],[[35,17],"MethodName:asc"],null],[30,[36,2],[[32,0],[30,[36,1],[[35,17]],null]],[["value"],["target.selected"]]]]]],[30,[36,8],null,[["kind","source","searchproperty"],[[30,[36,8],null,[["value","change"],[[30,[36,4],[[35,16],[30,[36,13],[[35,16],","],null],[29]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,16]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,8],null,[["value","change"],[[30,[36,4],[[35,15],[30,[36,13],[[35,15],","],null],[29]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,15]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,8],null,[["value","change","default"],[[30,[36,4],[[30,[36,14],[[35,12],[29]],null],[30,[36,13],[[35,12],","],null],[35,11]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,12]],null]],[["value"],["target.selectedItems"]]],[35,11]]]]]]],[32,2,["data"]]],null,[["default"],[{"statements":[[2,"\\n\\n    "],[8,"app-view",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"h1"],[12],[2,"\\n          "],[8,[32,1,["Title"]],[],[["@title"],["Auth Methods"]],null],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["toolbar"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,4],[[30,[36,3],[[32,5,["length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[8,"consul/auth-method/search-bar",[],[["@search","@onsearch","@sort","@filter"],[[34,0],[30,[36,2],[[32,0],[30,[36,1],[[35,0]],null]],[["value"],["target.value"]]],[32,3],[32,4]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n        "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["auth-method",[32,3,["value"]],[32,4],[34,0],[32,5]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"consul/auth-method/list",[],[["@items"],[[32,6,["items"]]]],null],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"empty-state",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                "],[10,"h2"],[12],[2,"\\n                  "],[1,[30,[36,5],["routes.dc.auth-methods.index.empty.header"],[["items"],[[32,5,["length"]]]]]],[2,"\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,5],["routes.dc.auth-methods.index.empty.body"],[["items","htmlSafe"],[[32,5,["length"]],true]]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n                "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n                  "],[10,"a"],[15,6,[31,[[30,[36,6],["CONSUL_DOCS_URL"],null],"/security/acl/auth-methods"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Documentation on auth methods"],[13],[2,"\\n                "],[13],[2,"\\n                "],[10,"li"],[14,0,"learn-link"],[12],[2,"\\n                  "],[10,"a"],[15,6,[31,[[30,[36,6],["CONSUL_DOCS_API_URL"],null],"/acl/auth-methods.html"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Read the API Docs"],[13],[2,"\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[6]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3,4,5]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["search","mut","action","gt","if","t","env","routeName","hash","uri","eq","searchProperties","searchproperty","split","not-eq","source","kind","sortBy","or","let"]}',meta:{moduleName:"consul-ui/templates/dc/acls/auth-methods/index.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/auth-methods/show",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"ljPKKeyW",block:'{"symbols":["route","loader","item","o"],"statements":[[8,"route",[],[["@name"],[[34,7]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,10],["/${partition}/${nspace}/${dc}/auth-method/${name}",[30,[36,2],null,[["partition","nspace","dc","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","id"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,4],[[30,[36,11],[[32,2,["error","status"]],"401"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"consul/acl/disabled",[],[[],[]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,12],[[32,2,["data"]]],null,[["default"],[{"statements":[[2,"  "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["breadcrumbs"]],[["default"],[{"statements":[[2,"\\n          "],[10,"ol"],[12],[2,"\\n              "],[10,"li"],[12],[10,"a"],[15,6,[30,[36,0],["dc.acls.auth-methods"],null]],[12],[2,"All Auth Methods"],[13],[13],[2,"\\n          "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"h1"],[12],[2,"\\n          "],[8,[32,1,["Title"]],[],[["@title"],[[32,3,["Name"]]]],null],[2,"\\n        "],[13],[2,"\\n        "],[8,"consul/auth-method/type",[],[["@item"],[[32,3]]],null],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["nav"]],[["default"],[{"statements":[[2,"\\n        "],[8,"tab-nav",[],[["@items"],[[30,[36,6],[[30,[36,5],[[30,[36,2],null,[["label","href","selected"],["General info",[30,[36,0],["dc.acls.auth-methods.show.auth-method"],null],[30,[36,1],["dc.acls.auth-methods.show.auth-method"],null]]]],[30,[36,4],[[30,[36,3],["use nspaces"],null],[30,[36,2],null,[["label","href","selected"],["Namespace rules",[30,[36,0],["dc.acls.auth-methods.show.nspace-rules"],null],[30,[36,1],["dc.acls.auth-methods.show.nspace-rules"],null]]]],""],null],[30,[36,2],null,[["label","href","selected"],["Binding rules",[30,[36,0],["dc.acls.auth-methods.show.binding-rules"],null],[30,[36,1],["dc.acls.auth-methods.show.binding-rules"],null]]]]],null]],null]]],null],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n        "],[8,"outlet",[],[["@name","@model"],[[34,7],[30,[36,2],null,[["item"],[[32,3]]]]]],[["default"],[{"statements":[[2,"\\n          "],[1,[30,[36,9],[[30,[36,8],null,null]],null]],[2,"\\n        "]],"parameters":[4]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["href-to","is-href","hash","can","if","array","compact","routeName","-outlet","component","uri","eq","let"]}',meta:{moduleName:"consul-ui/templates/dc/acls/auth-methods/show.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/auth-methods/show/auth-method",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"IJCIKqTr",block:'{"symbols":["route"],"statements":[[8,"route",[],[["@name"],[[34,0]]],[["default"],[{"statements":[[2,"\\n  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n    "],[8,"consul/auth-method/view",[],[["@item"],[[32,1,["model","item"]]]],null],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["routeName"]}',meta:{moduleName:"consul-ui/templates/dc/acls/auth-methods/show/auth-method.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/auth-methods/show/binding-rules",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"TJUhzlOO",block:'{"symbols":["route","loader","items","item"],"statements":[[8,"route",[],[["@name"],[[34,6]]],[["default"],[{"statements":[[2,"\\n\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,8],["/${partition}/${nspace}/${dc}/binding-rules/for-auth-method/${name}",[30,[36,7],null,[["partition","nspace","dc","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","id"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,9],[[32,2,["data"]]],null,[["default"],[{"statements":[[2,"\\n  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n"],[6,[37,5],[[30,[36,4],[[32,3,["length"]],0],null]],null,[["default","else"],[{"statements":[[2,"    "],[10,"p"],[12],[2,"\\n      Binding rules allow an operator to express a systematic way of automatically linking roles and service identities to newly created tokens without operator intervention.\\n    "],[13],[2,"\\n    "],[10,"p"],[12],[2,"\\n      Successful authentication with an auth method returns a set of trusted identity attributes corresponding to the authenticated identity. Those attributes are matched against all configured binding rules for that auth method to determine what privileges to grant the Consul ACL token it will ultimately create.\\n    "],[13],[2,"\\n    "],[10,"hr"],[12],[13],[2,"\\n"],[6,[37,3],[[30,[36,2],[[30,[36,2],[[32,3]],null]],null]],null,[["default"],[{"statements":[[2,"      "],[8,"consul/auth-method/binding-list",[],[["@item"],[[32,4]]],null],[2,"\\n      "],[10,"hr"],[12],[13],[2,"\\n"]],"parameters":[4]}]]]],"parameters":[]},{"statements":[[2,"    "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"h2"],[12],[2,"\\n          "],[1,[30,[36,0],["routes.dc.acls.auth-methods.show.binding-rules.index.empty.header"],null]],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n        "],[1,[30,[36,0],["routes.dc.acls.auth-methods.show.binding-rules.index.empty.body"],[["htmlSafe"],[true]]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n        "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n          "],[10,"a"],[15,6,[31,[[30,[36,1],["CONSUL_DOCS_API_URL"],null],"/acl/binding-rules"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Read the documentation"],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[3]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["t","env","-track-array","each","gt","if","routeName","hash","uri","let"]}',meta:{moduleName:"consul-ui/templates/dc/acls/auth-methods/show/binding-rules.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/auth-methods/show/nspace-rules",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"wKhoHeez",block:'{"symbols":["route","item"],"statements":[[8,"route",[],[["@name"],[[34,6]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,7],[[32,1,["model","item"]]],null,[["default"],[{"statements":[[2,"  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n"],[6,[37,5],[[30,[36,4],[[32,2,["NamespaceRules","length"]],0],null]],null,[["default","else"],[{"statements":[[2,"    "],[10,"p"],[12],[2,"\\n      A set of rules that can control which namespace tokens created via this auth method will be created within. Unlike binding rules, the first matching namespace rule wins.\\n    "],[13],[2,"\\n    "],[8,"consul/auth-method/nspace-list",[],[["@items"],[[32,2,["NamespaceRules"]]]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"h2"],[12],[2,"\\n          "],[1,[30,[36,1],[[30,[36,0],[[32,1,["t"]],"empty.header"],null]],null]],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n        "],[1,[30,[36,1],[[30,[36,0],[[32,1,["t"]],"empty.body",[30,[36,2],null,[["htmlSafe"],[true]]]],null]],null]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n        "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n          "],[10,"a"],[15,6,[31,[[30,[36,3],["CONSUL_DOCS_API_URL"],null],"/acl/auth-methods#namespacerules"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Read the documentation"],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[2]}]]]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["fn","compute","hash","env","gt","if","routeName","let"]}',meta:{moduleName:"consul-ui/templates/dc/acls/auth-methods/show/nspace-rules.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"EbSFMm5f",block:'{"symbols":["route"],"statements":[[8,"route",[],[["@name"],[[34,0]]],[["default"],[{"statements":[[2,"\\n  "],[1,[30,[36,2],[[30,[36,1],["replaceWith","dc.acls.tokens"],null]],null]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["routeName","route-action","did-insert"]}',meta:{moduleName:"consul-ui/templates/dc/acls/index.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/policies/-form",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"Dodweqnu",block:'{"symbols":["execute","cancel","message","close","confirm"],"statements":[[10,"form"],[12],[2,"\\n  "],[8,"policy-form",[],[["@form","@partition","@nspace","@item"],[[34,15],[34,12],[34,11],[34,3]]],[["default"],[{"statements":[[2,"\\n"],[2,"    "],[8,"block-slot",[],[["@name"],["template"]],null],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"],[6,[37,5],[[30,[36,17],[[35,16]],null]],null,[["default"],[{"statements":[[2,"    "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,13],["/${partition}/${nspace}/${dc}/tokens/for-policy/${id}",[30,[36,1],null,[["partition","nspace","dc","id"],[[35,12],[35,11],[35,10],[30,[36,8],[[35,9],""],null]]]]],null],[30,[36,0],[[32,0],[30,[36,14],[[35,2]],null]],[["value"],["data"]]]]],null],[2,"\\n"],[6,[37,5],[[30,[36,4],[[35,2,["length"]],0],null]],null,[["default"],[{"statements":[[2,"      "],[8,"token-list",[],[["@caption","@items"],["Applied to the following tokens:",[34,2]]],null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"    "],[10,"div"],[12],[2,"\\n"],[6,[37,5],[[30,[36,18],[[35,16],[30,[36,6],["create tokens"],null]],null]],null,[["default","else"],[{"statements":[[2,"        "],[11,"button"],[16,"disabled",[30,[36,5],[[30,[36,8],[[35,3,["isPristine"]],[35,3,["isInvalid"]],[30,[36,7],[[35,3,["Name"]],""],null]],null],"disabled"],null]],[24,4,"submit"],[4,[38,0],[[32,0],"create",[35,3]],null],[12],[2,"Save"],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,6],["write policy"],[["item"],[[35,3]]]]],null,[["default"],[{"statements":[[2,"        "],[11,"button"],[16,"disabled",[30,[36,5],[[35,3,["isInvalid"]],"disabled"],null]],[24,4,"submit"],[4,[38,0],[[32,0],"update",[35,3]],null],[12],[2,"Save"],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"        "],[11,"button"],[24,4,"reset"],[4,[38,0],[[32,0],"cancel",[35,3]],null],[12],[2,"Cancel"],[13],[2,"\\n"],[6,[37,5],[[30,[36,18],[[30,[36,17],[[35,16]],null],[30,[36,6],["delete policy"],[["item"],[[35,3]]]]],null]],null,[["default"],[{"statements":[[2,"        "],[8,"confirmation-dialog",[],[["@message"],["Are you sure you want to delete this Policy?"]],[["default"],[{"statements":[[2,"\\n            "],[8,"block-slot",[],[["@name"],["action"]],[["default"],[{"statements":[[2,"\\n                "],[11,"button"],[24,0,"type-delete"],[24,4,"button"],[4,[38,0],[[32,0],[32,5],"delete",[35,3]],null],[12],[2,"Delete"],[13],[2,"\\n            "]],"parameters":[5]}]]],[2,"\\n            "],[8,"block-slot",[],[["@name"],["dialog"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,4],[[35,2,["length"]],0],null]],null,[["default","else"],[{"statements":[[2,"              "],[8,"modal-dialog",[],[["@onclose","@open","@aria"],[[30,[36,0],[[32,0],[32,2]],null],true,[30,[36,1],null,[["label"],["Policy in Use"]]]]],[["default"],[{"statements":[[2,"\\n                  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                      "],[10,"h2"],[12],[2,"Policy in Use"],[13],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                  "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                    "],[10,"p"],[12],[2,"\\n                      This Policy is currently in use. If you choose to delete this Policy, it will be removed from the following "],[10,"strong"],[12],[1,[35,2,["length"]]],[2," Tokens"],[13],[2,":\\n                    "],[13],[2,"\\n                    "],[8,"token-list",[],[["@items","@target"],[[34,2],"_blank"]],null],[2,"\\n                    "],[10,"p"],[12],[2,"\\n                      This action cannot be undone. "],[1,[32,3]],[2,"\\n                    "],[13],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                  "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n                    "],[11,"button"],[24,0,"type-delete"],[24,4,"button"],[4,[38,0],[[32,0],[32,1]],null],[12],[2,"Yes, Delete"],[13],[2,"\\n                    "],[11,"button"],[24,0,"type-cancel"],[24,4,"button"],[4,[38,0],[[32,0],[32,4]],null],[12],[2,"Cancel"],[13],[2,"\\n                  "]],"parameters":[4]}]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"                "],[8,"delete-confirmation",[],[["@message","@execute","@cancel"],[[32,3],[32,1],[32,2]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"            "]],"parameters":[1,2,3]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["action","hash","items","item","gt","if","can","eq","or","id","dc","nspace","partition","uri","mut","form","create","not","and"]}',meta:{moduleName:"consul-ui/templates/dc/acls/policies/-form.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/policies/edit",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"HjXPxbrO",block:'{"symbols":["route","loader","dc","partition","nspace","id","item","create","loader","notice"],"statements":[[8,"route",[],[["@name"],[[34,12]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,4],["/${partition}/${nspace}/${dc}/policy/${id}",[30,[36,3],null,[["partition","nspace","dc","id"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[30,[36,13],[[32,1,["params","id"]],""],null]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[30,[36,11],[[32,2,["error","status"]],"401"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"consul/acl/disabled",[],[[],[]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,14],[[32,1,["params","dc"]],[32,1,["params","partition"]],[32,1,["params","nspace"]],[30,[36,13],[[32,1,["params","id"]],""],null],[32,2,["data"]],[32,2,["data","isNew"]]],null,[["default"],[{"statements":[[2,"  "],[8,"app-view",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["breadcrumbs"]],[["default"],[{"statements":[[2,"\\n          "],[10,"ol"],[12],[2,"\\n              "],[10,"li"],[12],[10,"a"],[15,6,[30,[36,8],["dc.acls.policies"],null]],[12],[2,"All Policies"],[13],[13],[2,"\\n          "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n          "],[10,"h1"],[12],[2,"\\n"],[6,[37,6],[[32,8]],null,[["default","else"],[{"statements":[[2,"            "],[8,[32,1,["Title"]],[],[["@title"],["New Policy"]],null],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,6],[[30,[36,7],["write policy"],[["item"],[[32,7]]]]],null,[["default","else"],[{"statements":[[2,"            "],[8,[32,1,["Title"]],[],[["@title"],["Edit Policy"]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"            "],[8,[32,1,["Title"]],[],[["@title"],["View Policy"]],null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[30,[36,9],[[32,8]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"div"],[14,0,"definition-table"],[12],[2,"\\n            "],[10,"dl"],[12],[2,"\\n              "],[10,"dt"],[12],[2,"Policy ID"],[13],[2,"\\n              "],[10,"dd"],[12],[2,"\\n                "],[8,"copy-button",[],[["@value","@name","@position"],[[32,7,["ID"]],"Policy ID","top-start"]],null],[2," "],[1,[32,7,["ID"]]],[2,"\\n              "],[13],[2,"\\n            "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,6],[[30,[36,11],[[30,[36,10],[[32,7]],null],"policy-management"],null]],null,[["default","else"],[{"statements":[[2,"    "],[8,"notice",[[24,0,"policy-management"]],[["@type"],["none"]],[["default"],[{"statements":[[2,"\\n      "],[8,[32,10,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"h3"],[12],[2,"Management"],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,[32,10,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[10,"p"],[12],[2,"\\n          This global-management token is built into Consul\'s policy system. You can apply this special policy to tokens for full access. This policy is not editable or removeable, but can be ignored by not applying it to any tokens. Learn more in our "],[10,"a"],[15,6,[31,[[30,[36,0],["CONSUL_DOCS_URL"],null],"/guides/acl.html#builtin-policies"]]],[14,"target","_blank"],[14,"rel","noopener noreferrer"],[12],[2,"documentation"],[13],[2,".\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[10]}]]],[2,"\\n    "],[10,"div"],[14,0,"definition-table"],[12],[2,"\\n      "],[10,"dl"],[12],[2,"\\n        "],[10,"dt"],[12],[2,"Name"],[13],[2,"\\n        "],[10,"dd"],[12],[1,[32,7,["Name"]]],[13],[2,"\\n        "],[10,"dt"],[12],[2,"Valid Datacenters"],[13],[2,"\\n        "],[10,"dd"],[12],[1,[30,[36,2],[", ",[30,[36,1],[[32,7]],null]],null]],[13],[2,"\\n        "],[10,"dt"],[12],[2,"Description"],[13],[2,"\\n        "],[10,"dd"],[12],[1,[32,7,["Description"]]],[13],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n    "],[8,"data-source",[],[["@src"],[[30,[36,4],["/${partition}/${nspace}/${dc}/tokens/for-policy/${id}",[30,[36,3],null,[["partition","nspace","dc","id"],[[32,4],[32,5],[32,3],[32,6]]]]],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[30,[36,5],[[32,9,["data","length"]],0],null]],null,[["default"],[{"statements":[[2,"      "],[8,"token-list",[],[["@caption","@items"],["Applied to the following tokens:",[32,9,["data"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[9]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[19,"dc/acls/policies/form",[1,2,3,4,5,6,7,8]],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3,4,5,6,7,8]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":true,"upvars":["env","policy/datacenters","join","hash","uri","gt","if","can","href-to","not","policy/typeof","eq","routeName","or","let"]}',meta:{moduleName:"consul-ui/templates/dc/acls/policies/edit.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/policies/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"Fqeas+Q6",block:'{"symbols":["route","loader","sort","filters","items","collection"],"statements":[[8,"route",[],[["@name"],[[34,10]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,12],["/${partition}/${nspace}/${dc}/policies",[30,[36,11],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,13],[[32,2,["error","status"]],"401"],null]],null,[["default","else"],[{"statements":[[2,"      "],[8,"consul/acl/disabled",[],[[],[]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,22],[[30,[36,11],null,[["value","change"],[[30,[36,21],[[35,20],"Name:asc"],null],[30,[36,2],[[32,0],[30,[36,1],[[35,20]],null]],[["value"],["target.selected"]]]]]],[30,[36,11],null,[["kind","datacenter","searchproperty"],[[30,[36,11],null,[["value","change"],[[30,[36,5],[[35,19],[30,[36,16],[[35,19],","],null],[29]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,19]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,11],null,[["value","change"],[[30,[36,5],[[35,18],[30,[36,16],[[35,18],","],null],[29]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,18]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,11],null,[["value","change","default"],[[30,[36,5],[[30,[36,17],[[35,15],[29]],null],[30,[36,16],[[35,15],","],null],[35,14]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,15]],null]],[["value"],["target.selectedItems"]]],[35,14]]]]]]],[32,2,["data"]]],null,[["default"],[{"statements":[[2,"    "],[8,"app-view",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"h1"],[12],[2,"\\n          "],[8,[32,1,["Title"]],[],[["@title"],["Policies"]],null],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,4],["create policies"],null]],null,[["default"],[{"statements":[[2,"          "],[10,"a"],[15,6,[31,[[30,[36,3],["dc.acls.policies.create"],null]]]],[14,0,"type-create"],[12],[2,"Create"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["toolbar"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,6],[[32,5,["length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[8,"consul/policy/search-bar",[],[["@partition","@search","@onsearch","@sort","@filter"],[[32,1,["params","partition"]],[34,0],[30,[36,2],[[32,0],[30,[36,1],[[35,0]],null]],[["value"],["target.value"]]],[32,3],[32,4]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n        "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["policy",[32,3,["value"]],[32,4],[34,0],[32,5]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"consul/policy/list",[],[["@items","@ondelete"],[[32,6,["items"]],[30,[36,7],["delete"],null]]],null],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"empty-state",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                "],[10,"h2"],[12],[2,"\\n                  "],[1,[30,[36,8],["routes.dc.acls.policies.index.empty.header"],[["items"],[[32,5,["length"]]]]]],[2,"\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,8],["routes.dc.acls.policies.index.empty.body"],[["items","htmlSafe"],[[32,5,["length"]],true]]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n                "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n                  "],[10,"a"],[15,6,[31,[[30,[36,9],["CONSUL_DOCS_URL"],null],"/commands/acl/policy"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Documentation on policies"],[13],[2,"\\n                "],[13],[2,"\\n                "],[10,"li"],[14,0,"learn-link"],[12],[2,"\\n                  "],[10,"a"],[15,6,[31,[[30,[36,9],["CONSUL_LEARN_URL"],null],"/consul/security-networking/managing-acl-policies"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Take the tutorial"],[13],[2,"\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[6]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n"]],"parameters":[3,4,5]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["search","mut","action","href-to","can","if","gt","route-action","t","env","routeName","hash","uri","eq","searchProperties","searchproperty","split","not-eq","datacenter","kind","sortBy","or","let"]}',meta:{moduleName:"consul-ui/templates/dc/acls/policies/index.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/roles/-form",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"BgUOJM1D",block:'{"symbols":["execute","cancel","message","close","confirm","loader"],"statements":[[10,"form"],[12],[2,"\\n  "],[8,"role-form",[],[["@form","@item","@dc","@nspace","@partition"],[[34,14],[34,3],[34,10],[34,11],[34,12]]],null],[2,"\\n"],[6,[37,5],[[30,[36,16],[[35,15]],null]],null,[["default"],[{"statements":[[2,"  "],[8,"data-source",[],[["@src"],[[30,[36,13],["/${partition}/${nspace}/${dc}/tokens/for-role/${id}",[30,[36,1],null,[["partition","nspace","dc","id"],[[35,12],[35,11],[35,10],[30,[36,8],[[35,9],""],null]]]]],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,4],[[32,6,["data","length"]],0],null]],null,[["default"],[{"statements":[[2,"    "],[10,"h2"],[12],[2,"Where is this role used?"],[13],[2,"\\n    "],[10,"p"],[12],[2,"\\n      We\'re only able to show information for the primary datacenter and the current datacenter. This list may not show every case where this role is applied.\\n    "],[13],[2,"\\n    "],[8,"token-list",[],[["@caption","@items"],["Tokens",[32,6,["data"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"  "]],"parameters":[6]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[10,"div"],[12],[2,"\\n"],[6,[37,5],[[30,[36,17],[[35,15],[30,[36,6],["create roles"],null]],null]],null,[["default","else"],[{"statements":[[2,"        "],[11,"button"],[16,"disabled",[30,[36,5],[[30,[36,8],[[35,3,["isPristine"]],[35,3,["isInvalid"]],[30,[36,7],[[35,3,["Name"]],""],null]],null],"disabled"],null]],[24,4,"submit"],[4,[38,0],[[32,0],"create",[35,3]],null],[12],[2,"Save"],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,6],["write role"],[["item"],[[35,3]]]]],null,[["default"],[{"statements":[[2,"        "],[11,"button"],[16,"disabled",[30,[36,5],[[35,3,["isInvalid"]],"disabled"],null]],[24,4,"submit"],[4,[38,0],[[32,0],"update",[35,3]],null],[12],[2,"Save"],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"        "],[11,"button"],[24,4,"reset"],[4,[38,0],[[32,0],"cancel",[35,3]],null],[12],[2,"Cancel"],[13],[2,"\\n"],[6,[37,5],[[30,[36,17],[[30,[36,16],[[35,15]],null],[30,[36,6],["delete role"],[["item"],[[35,3]]]]],null]],null,[["default"],[{"statements":[[2,"        "],[8,"confirmation-dialog",[],[["@message"],["Are you sure you want to delete this Role?"]],[["default"],[{"statements":[[2,"\\n            "],[8,"block-slot",[],[["@name"],["action"]],[["default"],[{"statements":[[2,"\\n                "],[11,"button"],[24,0,"type-delete"],[24,4,"button"],[4,[38,0],[[32,0],[32,5],"delete",[35,3]],null],[12],[2,"Delete"],[13],[2,"\\n            "]],"parameters":[5]}]]],[2,"\\n            "],[8,"block-slot",[],[["@name"],["dialog"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,4],[[35,2,["length"]],0],null]],null,[["default","else"],[{"statements":[[2,"              "],[8,"modal-dialog",[],[["@onclose","@aria"],[[30,[36,0],[[32,0],[32,2]],null],[30,[36,1],null,[["label"],["Role in Use"]]]]],[["default"],[{"statements":[[2,"\\n                  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                      "],[10,"h2"],[12],[2,"Role in Use"],[13],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                  "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                    "],[10,"p"],[12],[2,"\\n                      This Role is currently in use. If you choose to delete this Role, it will be removed from the following "],[10,"strong"],[12],[1,[35,2,["length"]]],[2," Tokens"],[13],[2,":\\n                    "],[13],[2,"\\n                    "],[8,"token-list",[],[["@items","@target"],[[34,2],"_blank"]],null],[2,"\\n                    "],[10,"p"],[12],[2,"\\n                      This action cannot be undone. "],[1,[32,3]],[2,"\\n                    "],[13],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                  "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n                    "],[11,"button"],[24,0,"type-delete"],[24,4,"button"],[4,[38,0],[[32,0],[32,1]],null],[12],[2,"Yes, Delete"],[13],[2,"\\n                    "],[11,"button"],[24,0,"type-cancel"],[24,4,"button"],[4,[38,0],[[32,0],[32,4]],null],[12],[2,"Cancel"],[13],[2,"\\n                  "]],"parameters":[4]}]]],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"                "],[8,"delete-confirmation",[],[["@message","@execute","@cancel"],[[32,3],[32,1],[32,2]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"            "]],"parameters":[1,2,3]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["action","hash","items","item","gt","if","can","eq","or","id","dc","nspace","partition","uri","form","create","not","and"]}',meta:{moduleName:"consul-ui/templates/dc/acls/roles/-form.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/roles/edit",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"O1z/UWcV",block:'{"symbols":["route","loader","dc","partition","nspace","item","create"],"statements":[[8,"route",[],[["@name"],[[34,3]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,6],["/${partition}/${nspace}/${dc}/role/${id}",[30,[36,5],null,[["partition","nspace","dc","id"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[30,[36,4],[[32,1,["params","id"]],""],null]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[30,[36,7],[[32,2,["error","status"]],"401"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"consul/acl/disabled",[],[[],[]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,8],[[32,1,["params","dc"]],[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,2,["data"]],[32,2,["data","isNew"]]],null,[["default"],[{"statements":[[2,"  "],[8,"app-view",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["breadcrumbs"]],[["default"],[{"statements":[[2,"\\n          "],[10,"ol"],[12],[2,"\\n              "],[10,"li"],[12],[10,"a"],[15,6,[30,[36,0],["dc.acls.roles"],null]],[12],[2,"All Roles"],[13],[13],[2,"\\n          "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n          "],[10,"h1"],[12],[2,"\\n"],[6,[37,1],[[32,7]],null,[["default","else"],[{"statements":[[2,"              "],[8,[32,1,["Title"]],[],[["@title"],["New Role"]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"              "],[8,[32,1,["Title"]],[],[["@title"],["Edit Role"]],null],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,1],[[30,[36,2],[[32,7]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"div"],[14,0,"definition-table"],[12],[2,"\\n            "],[10,"dl"],[12],[2,"\\n              "],[10,"dt"],[12],[2,"Role ID"],[13],[2,"\\n              "],[10,"dd"],[12],[2,"\\n                "],[8,"copy-button",[],[["@value","@name","@position"],[[32,6,["ID"]],"Role ID","top-start"]],null],[2," "],[1,[32,6,["ID"]]],[2,"\\n              "],[13],[2,"\\n            "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[19,"dc/acls/roles/form",[1,2,3,4,5,6,7]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3,4,5,6,7]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":true,"upvars":["href-to","if","not","routeName","or","hash","uri","eq","let"]}',meta:{moduleName:"consul-ui/templates/dc/acls/roles/edit.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/roles/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"8C6UqAw5",block:'{"symbols":["route","loader","sort","filters","items","collection"],"statements":[[8,"route",[],[["@name","@title"],[[34,10],"Roles"]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,12],["/${partition}/${nspace}/${dc}/roles",[30,[36,11],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,13],[[32,2,["error","status"]],"401"],null]],null,[["default","else"],[{"statements":[[2,"      "],[8,"consul/acl/disabled",[],[[],[]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,20],[[30,[36,11],null,[["value","change"],[[30,[36,19],[[35,18],"Name:asc"],null],[30,[36,2],[[32,0],[30,[36,1],[[35,18]],null]],[["value"],["target.selected"]]]]]],[30,[36,11],null,[["searchproperty"],[[30,[36,11],null,[["value","change","default"],[[30,[36,5],[[30,[36,17],[[35,15],[29]],null],[30,[36,16],[[35,15],","],null],[35,14]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,15]],null]],[["value"],["target.selectedItems"]]],[35,14]]]]]]],[32,2,["data"]]],null,[["default"],[{"statements":[[2,"\\n    "],[8,"app-view",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"h1"],[12],[2,"\\n          "],[8,[32,1,["Title"]],[],[["@title"],["Roles"]],null],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,4],["create roles"],null]],null,[["default"],[{"statements":[[2,"        "],[10,"a"],[15,6,[31,[[30,[36,3],["dc.acls.roles.create"],null]]]],[14,0,"type-create"],[12],[2,"Create"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["toolbar"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,6],[[32,5,["length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[8,"consul/role/search-bar",[],[["@search","@onsearch","@sort","@filter"],[[34,0],[30,[36,2],[[32,0],[30,[36,1],[[35,0]],null]],[["value"],["target.value"]]],[32,3],[32,4]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n        "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["role",[32,3,["value"]],[32,4],[34,0],[32,5]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"consul/role/list",[],[["@items","@ondelete"],[[32,6,["items"]],[30,[36,7],["delete"],null]]],null],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"empty-state",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                "],[10,"h2"],[12],[2,"\\n                  "],[1,[30,[36,8],["routes.dc.acls.roles.index.empty.header"],[["items"],[[32,5,["length"]]]]]],[2,"\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,8],["routes.dc.acls.roles.index.empty.body"],[["items","htmlSafe"],[[32,5,["length"]],true]]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n                "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n                  "],[10,"a"],[15,6,[31,[[30,[36,9],["CONSUL_DOCS_URL"],null],"/commands/acl/role"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Documentation on roles"],[13],[2,"\\n                "],[13],[2,"\\n                "],[10,"li"],[14,0,"learn-link"],[12],[2,"\\n                  "],[10,"a"],[15,6,[31,[[30,[36,9],["CONSUL_DOCS_API_URL"],null],"/acl/roles.html"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Read the API Docs"],[13],[2,"\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[6]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3,4,5]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["search","mut","action","href-to","can","if","gt","route-action","t","env","routeName","hash","uri","eq","searchProperties","searchproperty","split","not-eq","sortBy","or","let"]}',meta:{moduleName:"consul-ui/templates/dc/acls/roles/index.hbs"}})
+e.default=t}))
+define("consul-ui/templates/dc/acls/tokens/-fieldsets-legacy",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"IUa7dEzO",block:'{"symbols":["__arg0","type"],"statements":[[2,"    "],[10,"fieldset"],[15,"disabled",[30,[36,4],[[30,[36,10],[[30,[36,9],["write token"],[["item"],[[35,0]]]]],null],"disabled"],null]],[12],[2,"\\n        "],[10,"label"],[15,0,[31,["type-text",[30,[36,4],[[35,0,["error","Name"]]," has-error"],null]]]],[12],[2,"\\n            "],[10,"span"],[12],[2,"Name"],[13],[2,"\\n            "],[8,"input",[],[["@value","@name","@autofocus"],[[34,0,["Description"]],"name","autofocus"]],null],[2,"\\n        "],[13],[2,"\\n"],[6,[37,4],[false],null,[["default"],[{"statements":[[2,"        "],[10,"div"],[14,"role","radiogroup"],[15,0,[30,[36,4],[[35,0,["error","Type"]]," has-error"],null]],[12],[2,"\\n"],[6,[37,8],[[30,[36,7],[[30,[36,7],[[30,[36,6],["management","client"],null]],null]],null]],null,[["default"],[{"statements":[[2,"                "],[10,"label"],[12],[2,"\\n                    "],[10,"span"],[12],[1,[30,[36,2],[[32,2]],null]],[13],[2,"\\n                    "],[10,"input"],[14,3,"Type"],[15,2,[31,[[32,2]]]],[15,"checked",[30,[36,4],[[30,[36,3],[[35,0,["Type"]],[32,2]],null],"checked"],null]],[15,"onchange",[30,[36,5],[[32,0],"change"],null]],[14,4,"radio"],[12],[13],[2,"\\n                "],[13],[2,"\\n"]],"parameters":[2]}]]],[2,"        "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[10,"label"],[14,0,"type-text"],[12],[2,"\\n            "],[8,"code-editor",[],[["@class","@name","@syntax","@value","@onkeyup","@namedBlocksInfo"],[[30,[36,4],[[35,0,["error","Rules"]],"error"],null],"Rules","hcl",[34,0,["Rules"]],[30,[36,5],[[32,0],"change","Rules"],null],[30,[36,11],null,[["label"],[0]]]]],[["default"],[{"statements":[[6,[37,4],[[30,[36,12],[[32,1],"label"],null]],null,[["default"],[{"statements":[[2,"\\n                    Rules "],[10,"a"],[15,6,[31,[[30,[36,1],["CONSUL_DOCS_URL"],null],"/guides/acl.html#rule-specification"]]],[14,"rel","help noopener noreferrer"],[14,"target","_blank"],[12],[2,"(HCL Format)"],[13],[2,"\\n                "]],"parameters":[]}]]]],"parameters":[1]}]]],[2,"\\n        "],[13],[2,"\\n"],[6,[37,4],[[35,13]],null,[["default"],[{"statements":[[2,"        "],[10,"label"],[14,0,"type-text"],[12],[2,"\\n            "],[10,"span"],[12],[2,"ID"],[13],[2,"\\n            "],[8,"input",[],[["@value"],[[34,0,["ID"]]]],null],[2,"\\n            "],[10,"em"],[12],[2,"We\'ll generate a UUID if this field is left empty."],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n\\n"]],"hasEval":false,"upvars":["item","env","capitalize","eq","if","action","array","-track-array","each","can","not","hash","-is-named-block-invocation","create"]}',meta:{moduleName:"consul-ui/templates/dc/acls/tokens/-fieldsets-legacy.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/tokens/-fieldsets",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"pIlDyS1J",block:'{"symbols":[],"statements":[[10,"fieldset"],[15,"disabled",[30,[36,1],[[30,[36,5],[[30,[36,4],["write token"],[["item"],[[35,3]]]]],null],"disabled"],null]],[12],[2,"\\n"],[6,[37,1],[[35,6]],null,[["default"],[{"statements":[[2,"  "],[10,"div"],[14,0,"type-toggle"],[12],[2,"\\n    "],[10,"label"],[12],[2,"\\n      "],[10,"input"],[14,3,"Local"],[15,"checked",[30,[36,1],[[35,0],"checked"],null]],[15,"onchange",[30,[36,2],[[32,0],"change"],null]],[14,4,"checkbox"],[12],[13],[2,"\\n      "],[10,"span"],[12],[2,"Restrict this token to a local datacenter?"],[13],[2,"\\n    "],[13],[2,"\\n    "],[10,"em"],[12],[2,"Local tokens get set in the Raft store of the local DC and do not ever get transmitted to the primary DC or replicated to any other DC."],[13],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[10,"label"],[14,0,"type-text validate-optional"],[12],[2,"\\n    "],[10,"span"],[12],[2,"Description (Optional)"],[13],[2,"\\n    "],[10,"textarea"],[14,3,"Description"],[15,"oninput",[30,[36,2],[[32,0],"change"],null]],[12],[1,[35,3,["Description"]]],[13],[2,"\\n  "],[13],[2,"\\n"],[13],[2,"\\n"],[10,"fieldset"],[14,1,"roles"],[12],[2,"\\n  "],[10,"h2"],[12],[2,"Roles"],[13],[2,"\\n  "],[8,"role-selector",[],[["@disabled","@dc","@partition","@nspace","@items"],[[30,[36,5],[[30,[36,4],["write token"],[["item"],[[35,3]]]]],null],[34,7],[34,8],[34,9],[34,3,["Roles"]]]],null],[2,"\\n"],[13],[2,"\\n"],[10,"fieldset"],[14,1,"policies"],[12],[2,"\\n  "],[10,"h2"],[12],[2,"Policies"],[13],[2,"\\n  "],[8,"policy-selector",[],[["@disabled","@dc","@partition","@nspace","@items"],[[30,[36,5],[[30,[36,4],["write token"],[["item"],[[35,3]]]]],null],[34,7],[34,8],[34,9],[34,3,["Policies"]]]],null],[2,"\\n"],[13],[2,"\\n"]],"hasEval":false,"upvars":["Local","if","action","item","can","not","create","dc","partition","nspace"]}',meta:{moduleName:"consul-ui/templates/dc/acls/tokens/-fieldsets.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/tokens/-form",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"vq0ZKeUV",block:'{"symbols":["execute","cancel","message","confirm"],"statements":[[10,"form"],[12],[2,"\\n"],[6,[37,2],[[30,[36,7],[[30,[36,4],[[35,0]],null]],null]],null,[["default","else"],[{"statements":[[2,"  "],[19,"dc/acls/tokens/fieldsets",[]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"  "],[19,"dc/acls/tokens/fieldsets-legacy",[]],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[10,"div"],[12],[2,"\\n"],[6,[37,2],[[30,[36,5],[[35,8],[30,[36,3],["create tokens"],null]],null]],null,[["default","else"],[{"statements":[[2,"        "],[11,"button"],[16,"disabled",[30,[36,2],[[30,[36,6],[[30,[36,5],[[30,[36,4],[[35,0]],null],[35,0,["isPristine"]]],null],[35,0,["isInvalid"]]],null],"disabled"],null]],[24,4,"submit"],[4,[38,1],[[32,0],"create",[35,0]],null],[12],[2,"Save"],[13],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,2],[[30,[36,3],["write token"],[["item"],[[35,0]]]]],null,[["default"],[{"statements":[[2,"        "],[11,"button"],[16,"disabled",[30,[36,2],[[35,0,["isInvalid"]],"disabled"],null]],[24,4,"submit"],[4,[38,1],[[32,0],"update",[35,0]],null],[12],[2,"Save"],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"\\n        "],[11,"button"],[24,4,"reset"],[4,[38,1],[[32,0],"cancel",[35,0]],null],[12],[2,"Cancel"],[13],[2,"\\n"],[6,[37,2],[[30,[36,5],[[30,[36,7],[[35,8]],null],[30,[36,3],["delete token"],[["item","token"],[[35,0],[35,9]]]]],null]],null,[["default"],[{"statements":[[2,"        "],[8,"confirmation-dialog",[],[["@message"],["Are you sure you want to delete this Token?"]],[["default"],[{"statements":[[2,"\\n            "],[8,"block-slot",[],[["@name"],["action"]],[["default"],[{"statements":[[2,"\\n                "],[11,"button"],[24,0,"type-delete"],[24,4,"button"],[4,[38,1],[[32,0],[32,4],"delete",[35,0]],null],[12],[2,"Delete"],[13],[2,"\\n            "]],"parameters":[4]}]]],[2,"\\n            "],[8,"block-slot",[],[["@name"],["dialog"]],[["default"],[{"statements":[[2,"\\n              "],[8,"delete-confirmation",[],[["@message","@execute","@cancel"],[[32,3],[32,1],[32,2]]],null],[2,"\\n            "]],"parameters":[1,2,3]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n"],[13],[2,"\\n"]],"hasEval":true,"upvars":["item","action","if","can","token/is-legacy","and","or","not","create","token"]}',meta:{moduleName:"consul-ui/templates/dc/acls/tokens/-form.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/tokens/edit",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"jGx0lf6+",block:'{"symbols":["route","loader","dc","partition","nspace","item","create","notice","execute","cancel","message","confirm"],"statements":[[8,"route",[],[["@name"],[[34,10]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,13],["/${partition}/${nspace}/${dc}/token/${id}",[30,[36,12],null,[["partition","nspace","dc","id"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[30,[36,11],[[32,1,["params","id"]],""],null]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,0],[[30,[36,14],[[32,2,["error","status"]],"401"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"consul/acl/disabled",[],[[],[]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,15],[[32,1,["params","dc"]],[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,2,["data"]],[32,2,["data","isNew"]]],null,[["default"],[{"statements":[[2,"  "],[8,"app-view",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["breadcrumbs"]],[["default"],[{"statements":[[2,"\\n          "],[10,"ol"],[12],[2,"\\n              "],[10,"li"],[12],[10,"a"],[15,6,[30,[36,9],["dc.acls.tokens"],null]],[12],[2,"All Tokens"],[13],[13],[2,"\\n          "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n          "],[10,"h1"],[12],[2,"\\n"],[6,[37,0],[[32,7]],null,[["default","else"],[{"statements":[[2,"              "],[8,[32,1,["Title"]],[],[["@title"],["New Token"]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"              "],[8,[32,1,["Title"]],[],[["@title"],["Edit Token"]],null],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,0],[[30,[36,1],[[32,7]],null]],null,[["default"],[{"statements":[[6,[37,0],[[30,[36,7],[[32,6,["AccessorID"]],[35,6,["AccessorID"]]],null]],null,[["default"],[{"statements":[[2,"        "],[8,"confirmation-dialog",[],[["@message"],["Are you sure you want to use this ACL token?"]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["action"]],[["default"],[{"statements":[[2,"\\n              "],[11,"button"],[24,4,"button"],[4,[38,5],[[32,0],[32,12],"use",[32,6]],null],[12],[2,"Use"],[13],[2,"\\n          "]],"parameters":[12]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["dialog"]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n                "],[1,[32,11]],[2,"\\n            "],[13],[2,"\\n            "],[11,"button"],[24,0,"type-delete"],[24,4,"button"],[4,[38,5],[[32,0],[32,9]],null],[12],[2,"Confirm Use"],[13],[2,"\\n            "],[11,"button"],[24,0,"type-cancel"],[24,4,"button"],[4,[38,5],[[32,0],[32,10]],null],[12],[2,"Cancel"],[13],[2,"\\n          "]],"parameters":[9,10,11]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[6,[37,0],[[30,[36,8],["duplicate token"],[["item"],[[32,6]]]]],null,[["default"],[{"statements":[[2,"        "],[11,"button"],[24,4,"button"],[4,[38,5],[[32,0],"clone",[32,6]],null],[12],[2,"Duplicate"],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,0],[[30,[36,2],[[32,6]],null]],null,[["default"],[{"statements":[[2,"            "],[8,"notice",[],[["@type"],["info"]],[["default"],[{"statements":[[2,"\\n              "],[8,[32,8,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                "],[10,"h2"],[12],[2,"Update"],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,[32,8,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                "],[10,"p"],[12],[2,"\\n                  We have upgraded our ACL system by allowing you to create reusable policies which you can then apply to tokens. Don\'t worry, even though this token was written in the old style, it is still valid. However, we do recommend upgrading your old tokens to the new style. Learn how in our "],[10,"a"],[15,6,[31,[[30,[36,4],["CONSUL_DOCS_URL"],null],"/guides/acl-migrate-tokens.html"]]],[14,"target","_blank"],[14,"rel","noopener noreferrer"],[12],[2,"documentation"],[13],[2,".\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[8]}]]],[2,"\\n"]],"parameters":[]}]]],[6,[37,0],[[30,[36,1],[[32,7]],null]],null,[["default"],[{"statements":[[2,"        "],[10,"div"],[14,0,"definition-table"],[12],[2,"\\n            "],[10,"dl"],[12],[2,"\\n              "],[10,"dt"],[12],[2,"AccessorID"],[13],[2,"\\n              "],[10,"dd"],[12],[2,"\\n                "],[8,"copy-button",[],[["@value","@name","@position"],[[32,6,["AccessorID"]],"AccessorID","top-start"]],null],[2," "],[1,[32,6,["AccessorID"]]],[2,"\\n              "],[13],[2,"\\n              "],[10,"dt"],[12],[2,"Token"],[13],[2,"\\n              "],[10,"dd"],[12],[2,"\\n                "],[8,"copy-button",[],[["@value","@name","@position"],[[32,6,["SecretID"]],"Token","top-start"]],null],[2," "],[8,"secret-button",[],[[],[]],[["default"],[{"statements":[[1,[32,6,["SecretID"]]]],"parameters":[]}]]],[2,"\\n              "],[13],[2,"\\n"],[6,[37,0],[[30,[36,3],[[30,[36,1],[[30,[36,2],[[32,6]],null]],null],[30,[36,1],[[32,7]],null]],null]],null,[["default"],[{"statements":[[2,"              "],[10,"dt"],[12],[2,"Scope"],[13],[2,"\\n              "],[10,"dd"],[12],[2,"\\n                "],[1,[30,[36,0],[[32,6,["Local"]],"local","global"],null]],[2,"\\n              "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"            "],[13],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[19,"dc/acls/tokens/form",[1,2,3,4,5,6,7]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3,4,5,6,7]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":true,"upvars":["if","not","token/is-legacy","and","env","action","token","not-eq","can","href-to","routeName","or","hash","uri","eq","let"]}',meta:{moduleName:"consul-ui/templates/dc/acls/tokens/edit.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/acls/tokens/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"ghj4WLgF",block:'{"symbols":["route","loader","sort","filters","items","collection","notice"],"statements":[[8,"route",[],[["@name"],[[34,11]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,13],["/${partition}/${nspace}/${dc}/tokens",[30,[36,12],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[30,[36,14],[[32,2,["error","status"]],"401"],null]],null,[["default","else"],[{"statements":[[2,"      "],[8,"consul/acl/disabled",[],[[],[]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,22],[[30,[36,12],null,[["value","change"],[[30,[36,21],[[35,20],"CreateTime:desc"],null],[30,[36,3],[[32,0],[30,[36,2],[[35,20]],null]],[["value"],["target.selected"]]]]]],[30,[36,12],null,[["kind","searchproperty"],[[30,[36,12],null,[["value","change"],[[30,[36,6],[[35,19],[30,[36,17],[[35,19],","],null],[29]],null],[30,[36,3],[[32,0],[30,[36,2],[[35,19]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,12],null,[["value","change","default"],[[30,[36,6],[[30,[36,18],[[35,16],[29]],null],[30,[36,17],[[35,16],","],null],[35,15]],null],[30,[36,3],[[32,0],[30,[36,2],[[35,16]],null]],[["value"],["target.selectedItems"]]],[35,15]]]]]]],[32,2,["data"]]],null,[["default"],[{"statements":[[2,"\\n    "],[8,"app-view",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"h1"],[12],[2,"\\n          "],[8,[32,1,["Title"]],[],[["@title"],["Tokens"]],null],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[30,[36,5],["create tokens"],null]],null,[["default"],[{"statements":[[2,"          "],[10,"a"],[15,6,[31,[[30,[36,4],["dc.acls.tokens.create"],null]]]],[14,0,"type-create"],[12],[2,"Create"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["toolbar"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[30,[36,7],[[32,5,["length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[8,"consul/token/search-bar",[],[["@search","@onsearch","@sort","@filter"],[[34,1],[30,[36,3],[[32,0],[30,[36,2],[[35,1]],null]],[["value"],["target.value"]]],[32,3],[32,4]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[30,[36,8],[[32,5]],null]],null,[["default"],[{"statements":[[2,"        "],[8,"notice",[],[["@type"],["info"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,7,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"h2"],[12],[2,"Update"],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,7,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"We have upgraded our ACL System to allow the creation of reusable policies that can be applied to tokens. Read more about the changes and how to upgrade legacy tokens in our "],[10,"a"],[15,6,[31,[[30,[36,0],["CONSUL_DOCS_URL"],null],"/guides/acl-migrate-tokens.html"]]],[14,"target","_blank"],[14,"rel","noopener noreferrer"],[12],[2,"documentation"],[13],[2,"."],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[7]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["token",[32,3,["value"]],[32,4],[34,1],[32,5]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"consul/token/list",[],[["@items","@token","@onuse","@ondelete","@onlogout","@onclone"],[[32,6,["items"]],[32,1,["model","user","token"]],[30,[36,9],["use"],null],[30,[36,9],["delete"],null],[30,[36,9],["logout"],null],[30,[36,9],["clone"],null]]],null],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"empty-state",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                "],[10,"h2"],[12],[2,"\\n                  "],[1,[30,[36,10],["routes.dc.acls.tokens.index.empty.header"],[["items"],[[32,5,["length"]]]]]],[2,"\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,10],["routes.dc.acls.tokens.index.empty.body"],[["items","htmlSafe"],[[32,5,["length"]],true]]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[6]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3,4,5]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["env","search","mut","action","href-to","can","if","gt","token/is-legacy","route-action","t","routeName","hash","uri","eq","searchProperties","searchproperty","split","not-eq","kind","sortBy","or","let"]}',meta:{moduleName:"consul-ui/templates/dc/acls/tokens/index.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/intentions/edit",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"e81sBB7+",block:'{"symbols":["route","loader","item","readOnly"],"statements":[[8,"route",[],[["@name"],[[34,5]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,7],["/${partition}/${nspace}/${dc}/intention/${id}",[30,[36,3],null,[["partition","nspace","dc","id"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[30,[36,6],[[32,1,["params","intention_id"]],""],null]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n        "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,10],[[32,2,["data"]],[30,[36,2],[[30,[36,9],["write intention"],[["item"],[[35,8]]]]],null]],null,[["default"],[{"statements":[[2,"  "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["breadcrumbs"]],[["default"],[{"statements":[[2,"\\n          "],[10,"ol"],[12],[2,"\\n            "],[10,"li"],[12],[10,"a"],[15,6,[30,[36,1],["dc.intentions"],null]],[12],[2,"All Intentions"],[13],[13],[2,"\\n          "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n          "],[10,"h1"],[12],[2,"\\n"],[6,[37,0],[[30,[36,2],[[32,4]],null]],null,[["default","else"],[{"statements":[[6,[37,0],[[32,3,["ID"]]],null,[["default","else"],[{"statements":[[2,"            "],[8,[32,1,["Title"]],[],[["@title"],["Edit Intention"]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"            "],[8,[32,1,["Title"]],[],[["@title"],["New Intention"]],null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[2,"            "],[8,[32,1,["Title"]],[],[["@title"],["View Intention"]],null],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n        "],[8,"consul/intention/form",[],[["@readonly","@item","@dc","@nspace","@partition","@onsubmit"],[[32,4],[32,3],[32,1,["model","dc"]],[32,1,["params","nspace"]],[32,1,["params","partition"]],[30,[36,4],["transitionTo","dc.intentions.index",[30,[36,3],null,[["dc"],[[32,1,["params","dc"]]]]]],null]]],null],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3,4]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["if","href-to","not","hash","route-action","routeName","or","uri","item","can","let"]}',meta:{moduleName:"consul-ui/templates/dc/intentions/edit.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/intentions/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"yq7mXGuh",block:'{"symbols":["route","api","sort","filters","items","writer","collection","list"],"statements":[[8,"route",[],[["@name"],[[34,13]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,9],["/${partition}/${nspace}/${dc}/intentions",[30,[36,8],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,21],[[30,[36,8],null,[["value","change"],[[30,[36,20],[[35,19],"Action:asc"],null],[30,[36,2],[[32,0],[30,[36,1],[[35,19]],null]],[["value"],["target.selected"]]]]]],[30,[36,8],null,[["access","searchproperty"],[[30,[36,8],null,[["value","change"],[[30,[36,6],[[35,18],[30,[36,16],[[35,18],","],null],[29]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,18]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,8],null,[["value","change","default"],[[30,[36,6],[[30,[36,17],[[35,15],[29]],null],[30,[36,16],[[35,15],","],null],[35,14]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,15]],null]],[["value"],["target.selectedItems"]]],[35,14]]]]]]],[32,2,["data"]]],null,[["default"],[{"statements":[[2,"\\n    "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n          "],[10,"h1"],[12],[2,"\\n            "],[8,[32,1,["Title"]],[],[["@title"],["Intentions"]],null],[2," "],[10,"em"],[12],[1,[30,[36,4],[[32,5,["length"]]],null]],[2," total"],[13],[2,"\\n          "],[13],[2,"\\n          "],[10,"label"],[14,"for","toolbar-toggle"],[12],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[30,[36,5],["create intentions"],null]],null,[["default"],[{"statements":[[2,"          "],[10,"a"],[15,6,[31,[[30,[36,3],["dc.intentions.create"],null]]]],[14,0,"type-create"],[12],[2,"Create"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["toolbar"]],[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,6],[[30,[36,7],[[32,5,["length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[8,"consul/intention/search-bar",[],[["@search","@onsearch","@sort","@filter"],[[34,0],[30,[36,2],[[32,0],[30,[36,1],[[35,0]],null]],[["value"],["target.value"]]],[32,3],[32,4]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n        "],[8,"data-writer",[],[["@sink","@type","@ondelete"],[[30,[36,9],["/${partition}/${dc}/${nspace}/intention/",[30,[36,8],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null],"intention",[34,10]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n            "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["intention",[32,3,["value"]],[32,4],[34,0],[32,5]]],[["default"],[{"statements":[[2,"\\n              "],[8,[32,7,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                "],[8,"consul/intention/list",[],[["@items","@delete"],[[32,7,["items"]],[32,6,["delete"]]]],[["default"],[{"statements":[[2,"\\n                    "],[8,[32,8,["CustomResourceNotice"]],[],[[],[]],null],[2,"\\n                    "],[8,[32,8,["Table"]],[],[[],[]],null],[2,"\\n                "]],"parameters":[8]}]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,[32,7,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                "],[8,"empty-state",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n                  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                    "],[10,"h2"],[12],[2,"\\n                      "],[1,[30,[36,11],["routes.dc.intentions.index.empty.header"],[["items"],[[32,5,["length"]]]]]],[2,"\\n                    "],[13],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                  "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                    "],[1,[30,[36,11],["routes.dc.intentions.index.empty.body"],[["items","htmlSafe"],[[32,5,["length"]],true]]]],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                  "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n                    "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n                      "],[10,"a"],[15,6,[31,[[30,[36,12],["CONSUL_DOCS_URL"],null],"/commands/intention"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Documentation on intentions"],[13],[2,"\\n                    "],[13],[2,"\\n                    "],[10,"li"],[14,0,"learn-link"],[12],[2,"\\n                      "],[10,"a"],[15,6,[31,[[30,[36,12],["CONSUL_DOCS_LEARN_URL"],null],"/consul/getting-started/connect"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Take the tutorial"],[13],[2,"\\n                    "],[13],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[7]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[6]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n"]],"parameters":[3,4,5]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["search","mut","action","href-to","format-number","can","if","gt","hash","uri","refresh-route","t","env","routeName","searchProperties","searchproperty","split","not-eq","access","sortBy","or","let"]}',meta:{moduleName:"consul-ui/templates/dc/intentions/index.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/kv/edit",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"3Thl/bd4",block:'{"symbols":["route","separator","parentKey","loader","dc","partition","nspace","item","parts","breadcrumb","index"],"statements":[[8,"route",[],[["@name"],[[34,23]]],[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,18],["/"],null,[["default"],[{"statements":[[2,"\\n"],[6,[37,18],[[30,[36,6],[[30,[36,12],[[32,2],[30,[36,10],[0,-1,[30,[36,17],[[32,1,["params","key"]],[32,2]],null]],null]],null],[32,2]],null]],null,[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,2],["/${partition}/${nspace}/${dc}/kv/${key}",[30,[36,1],null,[["partition","nspace","dc","key"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[30,[36,7],[[30,[36,24],[[35,23],"create"],null],"",[32,1,["params","key"]]],null]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,4,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,18],[[32,1,["params","dc"]],[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,4,["data"]]],null,[["default"],[{"statements":[[2,"\\n  "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["breadcrumbs"]],[["default"],[{"statements":[[2,"\\n      "],[10,"ol"],[12],[2,"\\n        "],[10,"li"],[12],[2,"\\n          "],[8,"action",[],[["@href"],[[30,[36,13],["dc.kv.index"],null]]],[["default"],[{"statements":[[2,"\\n            Key / Values\\n          "]],"parameters":[]}]]],[2,"\\n        "],[13],[2,"\\n"],[6,[37,7],[[30,[36,19],[[32,3],[32,2]],null]],null,[["default"],[{"statements":[[2,"\\n"],[6,[37,18],[[30,[36,17],[[32,3],[32,2]],null]],null,[["default"],[{"statements":[[2,"\\n"],[6,[37,16],[[30,[36,15],[[30,[36,15],[[32,9]],null]],null]],null,[["default"],[{"statements":[[6,[37,7],[[30,[36,14],[[32,10,["length"]],0],null]],null,[["default"],[{"statements":[[2,"          "],[10,"li"],[12],[2,"\\n            "],[8,"action",[],[["@href"],[[30,[36,13],["dc.kv.folder",[30,[36,12],["/",[30,[36,11],[[30,[36,10],[0,[30,[36,9],[[32,11],1],null],[32,9]],null],""],null]],null]],null]]],[["default"],[{"statements":[[2,"\\n              "],[1,[32,10]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[10,11]}]]]],"parameters":[9]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"h1"],[12],[2,"\\n"],[6,[37,7],[[30,[36,20],[[32,8,["Key"]],[30,[36,19],[[32,8,["Key"]],[32,3]],null]],null]],null,[["default","else"],[{"statements":[[2,"          "],[8,[32,1,["Title"]],[],[["@title","@render"],["Edit Key / Value",false]],null],[2,"\\n          "],[1,[30,[36,8],[[32,8,["Key"]],[32,3]],null]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          "],[8,[32,1,["Title"]],[],[["@title","@render"],["New Key / Value",true]],null],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,7],[[32,8,["Session"]]],null,[["default"],[{"statements":[[2,"    "],[8,"consul/lock-session/notifications",[],[["@type"],["kv"]],null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n      "],[8,"consul/kv/form",[],[["@item","@dc","@nspace","@partition","@onsubmit","@parent"],[[32,8],[32,1,["params","dc"]],[32,1,["params","nspace"]],[32,1,["params","partition"]],[30,[36,7],[[30,[36,22],[[32,3],[32,2]],null],[30,[36,21],["dc.kv.index"],null],[30,[36,21],["dc.kv.folder",[32,3]],null]],null],[32,3]]],null],[2,"\\n\\n\\n"],[6,[37,7],[[30,[36,20],[[32,8,["Session"]]],null]],null,[["default"],[{"statements":[[2,"      "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,2],["/${partition}/${nspace}/${dc}/sessions/for-key/${id}",[30,[36,1],null,[["partition","nspace","dc","id"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,8,["Session"]]]]]],null],[30,[36,4],[[32,0],[30,[36,3],[[35,0]],null]],[["value"],["data"]]]]],null],[2,"\\n      "],[10,"h2"],[12],[2,"\\n        "],[8,"action",[[24,"rel","help"]],[["@href","@external"],[[30,[36,6],[[30,[36,5],["CONSUL_DOCS_URL"],null],"/internals/sessions.html#session-design"],null],true]],[["default"],[{"statements":[[2,"\\n          Lock Session\\n        "]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n"],[6,[37,7],[[35,0,["ID"]]],null,[["default"],[{"statements":[[2,"      "],[8,"consul/lock-session/form",[],[["@item","@ondelete"],[[34,0],[32,4,["invalidate"]]]],null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5,6,7,8]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[4]}]]],[2,"\\n"]],"parameters":[3]}]]]],"parameters":[2]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["session","hash","uri","mut","action","env","concat","if","left-trim","add","slice","append","join","href-to","gt","-track-array","each","split","let","not-eq","and","transition-to","eq","routeName","string-ends-with"]}',meta:{moduleName:"consul-ui/templates/dc/kv/edit.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/kv/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"46JF00/h",block:'{"symbols":["route","loader","sort","filters","parent","items","writer","collection","breadcrumb","index","after","notice","notice","notice"],"statements":[[8,"route",[],[["@name"],[[34,25]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,20],["/${partition}/${nspace}/${dc}/kv/${key}",[30,[36,19],null,[["partition","nspace","dc","key"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[30,[36,26],[[32,1,["params","key"]],"/"],null]]]]],null],[30,[36,5],[[32,0],[30,[36,4],[[35,27]],null]],[["value"],["data"]]]]],null],[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,20],["/${partition}/${nspace}/${dc}/kvs/${key}",[30,[36,19],null,[["partition","nspace","dc","key"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[30,[36,26],[[32,1,["params","key"]],"/"],null]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["disconnected"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,2],[[30,[36,16],[[32,2,["error","status"]],"404"],null]],null,[["default","else"],[{"statements":[[2,"          "],[8,"notice",[[24,0,"notification-update"],[4,[38,24],null,[["sticky"],[true]]]],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,14,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"strong"],[12],[2,"Warning!"],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,[32,14,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"p"],[12],[2,"\\n                This KV or parent of this KV was deleted.\\n              "],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[14]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,2],[[30,[36,16],[[32,2,["error","status"]],"403"],null]],null,[["default","else"],[{"statements":[[2,"          "],[8,"notice",[[24,0,"notification-update"],[4,[38,24],null,[["sticky"],[true]]]],[["@type"],["error"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,13,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"strong"],[12],[2,"Error!"],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,[32,13,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"p"],[12],[2,"\\n                You no longer have access to this KV.\\n              "],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[13]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          "],[8,"notice",[[24,0,"notification-update"],[4,[38,24],null,[["sticky"],[true]]]],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,12,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"strong"],[12],[2,"Warning!"],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,[32,12,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"p"],[12],[2,"\\n                An error was returned whilst loading this data, refresh to try again.\\n              "],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[12]}]]],[2,"\\n        "]],"parameters":[]}]]]],"parameters":[]}]]],[2,"      "]],"parameters":[11]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,30],[[30,[36,19],null,[["value","change"],[[30,[36,26],[[35,29],"Kind:asc"],null],[30,[36,5],[[32,0],[30,[36,4],[[35,29]],null]],[["value"],["target.selected"]]]]]],[30,[36,19],null,[["kind"],[[30,[36,19],null,[["value","change"],[[30,[36,2],[[35,28],[30,[36,6],[[35,28],","],null],[29]],null],[30,[36,5],[[32,0],[30,[36,4],[[35,28]],null]],[["value"],["target.selectedItems"]]]]]]]]],[35,27],[32,2,["data"]]],null,[["default"],[{"statements":[[2,"    "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n"],[6,[37,2],[[30,[36,1],[[32,5,["Key"]],"/"],null]],null,[["default"],[{"statements":[[2,"      "],[8,"block-slot",[],[["@name"],["breadcrumbs"]],[["default"],[{"statements":[[2,"\\n        "],[10,"ol"],[12],[2,"\\n          "],[10,"li"],[12],[10,"a"],[15,6,[30,[36,0],["dc.kv"],null]],[12],[2,"Key / Values"],[13],[13],[2,"\\n"],[6,[37,15],[[30,[36,14],[[30,[36,14],[[30,[36,11],[0,-2,[30,[36,6],[[32,5,["Key"]],"/"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"          "],[10,"li"],[12],[10,"a"],[15,6,[30,[36,0],["dc.kv.folder",[30,[36,13],["/",[30,[36,12],[[30,[36,11],[0,[30,[36,10],[[32,10],1],null],[30,[36,6],[[32,5,["Key"]],"/"],null]],null],""],null]],null]],null]],[12],[1,[32,9]],[13],[13],[2,"\\n"]],"parameters":[9,10]}]]],[2,"        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n          "],[10,"h1"],[12],[2,"\\n"],[6,[37,2],[[30,[36,16],[[32,5,["Key"]],"/"],null]],null,[["default","else"],[{"statements":[[2,"              "],[8,[32,1,["Title"]],[],[["@title"],["Key / Value"]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"              "],[8,[32,1,["Title"]],[],[["@title"],[[30,[36,9],[1,[30,[36,8],[1,[30,[36,7],[[30,[36,6],[[32,5,["Key"]],"/"],null]],null]],null]],null]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n          "],[10,"label"],[14,"for","toolbar-toggle"],[12],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["toolbar"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,2],[[30,[36,17],[[32,6,["length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[8,"consul/kv/search-bar",[],[["@search","@onsearch","@sort","@filter"],[[34,3],[30,[36,5],[[32,0],[30,[36,4],[[35,3]],null]],[["value"],["target.value"]]],[32,3],[32,4]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,2],[[30,[36,18],["create kvs"],null]],null,[["default"],[{"statements":[[6,[37,2],[[30,[36,1],[[32,5,["Key"]],"/"],null]],null,[["default","else"],[{"statements":[[2,"          "],[10,"a"],[15,6,[31,[[30,[36,0],["dc.kv.create",[32,5,["Key"]]],null]]]],[14,0,"type-create"],[12],[2,"Create"],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          "],[10,"a"],[15,6,[31,[[30,[36,0],["dc.kv.root-create"],null]]]],[14,0,"type-create"],[12],[2,"Create"],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n        "],[8,"data-writer",[],[["@sink","@type","@label","@ondelete"],[[30,[36,20],["/${partition}/${nspace}/${dc}/kv/",[30,[36,19],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null],"kv","key",[34,21]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n            "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["kv",[32,3,["value"]],[32,4],[34,3],[32,6]]],[["default"],[{"statements":[[2,"\\n              "],[8,[32,8,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                "],[8,"consul/kv/list",[],[["@items","@parent","@delete"],[[32,8,["items"]],[32,5],[32,7,["delete"]]]],null],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,[32,8,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                "],[8,"empty-state",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n                  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                    "],[10,"h2"],[12],[2,"\\n                      "],[1,[30,[36,22],["routes.dc.kv.index.empty.header"],[["items"],[[32,6,["length"]]]]]],[2,"\\n                    "],[13],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                  "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                    "],[1,[30,[36,22],["routes.dc.kv.index.empty.body"],[["items","htmlSafe"],[[32,6,["length"]],true]]]],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                  "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n                    "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n                      "],[10,"a"],[15,6,[31,[[30,[36,23],["CONSUL_DOCS_URL"],null],"/agent/kv"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Documentation on K/V"],[13],[2,"\\n                    "],[13],[2,"\\n                    "],[10,"li"],[14,0,"learn-link"],[12],[2,"\\n                      "],[10,"a"],[15,6,[31,[[30,[36,23],["CONSUL_DOCS_LEARN_URL"],null],"/consul/getting-started/kv"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Take the tutorial"],[13],[2,"\\n                    "],[13],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[8]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[7]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3,4,5,6]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["href-to","not-eq","if","search","mut","action","split","reverse","drop","take","add","slice","append","join","-track-array","each","eq","gt","can","hash","uri","refresh-route","t","env","notification","routeName","or","parent","kind","sortBy","let"]}',meta:{moduleName:"consul-ui/templates/dc/kv/index.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/nodes/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"C5bHf0Hx",block:'{"symbols":["route","leader","api","sort","filters","items","leader","collection"],"statements":[[8,"route",[],[["@name"],[[34,7]]],[["default"],[{"statements":[[2,"\\n\\n  "],[8,"data-source",[],[["@src"],[[30,[36,9],["/${partition}/${nspace}/${dc}/leader",[30,[36,8],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"data-loader",[],[["@src"],[[30,[36,9],["/${partition}/${nspace}/${dc}/nodes",[30,[36,8],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,3,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,17],[[30,[36,8],null,[["value","change"],[[30,[36,16],[[35,15],"Status:asc"],null],[30,[36,2],[[32,0],[30,[36,1],[[35,15]],null]],[["value"],["target.selected"]]]]]],[30,[36,8],null,[["status","searchproperty"],[[30,[36,8],null,[["value","change"],[[30,[36,5],[[35,14],[30,[36,12],[[35,14],","],null],[29]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,14]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,8],null,[["value","change","default"],[[30,[36,5],[[30,[36,13],[[35,11],[29]],null],[30,[36,12],[[35,11],","],null],[35,10]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,11]],null]],[["value"],["target.selectedItems"]]],[35,10]]]]]]],[32,3,["data"]],[32,2,["data"]]],null,[["default"],[{"statements":[[2,"    "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"h1"],[12],[2,"\\n          "],[8,[32,1,["Title"]],[],[["@title"],["Nodes"]],null],[2," "],[10,"em"],[12],[1,[30,[36,3],[[32,6,["length"]]],null]],[2," total"],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"label"],[14,"for","toolbar-toggle"],[12],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["toolbar"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,4],[[32,6,["length"]],0],null]],null,[["default"],[{"statements":[[2,"          "],[8,"consul/node/search-bar",[],[["@search","@onsearch","@sort","@filter"],[[34,0],[30,[36,2],[[32,0],[30,[36,1],[[35,0]],null]],[["value"],["target.value"]]],[32,4],[32,5]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n        "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["node",[32,4,["value"]],[32,5],[34,0],[32,6]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,8,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"consul/node/list",[],[["@items","@leader"],[[32,8,["items"]],[32,7]]],null],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,8,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"empty-state",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                "],[10,"h2"],[12],[2,"\\n                  "],[1,[30,[36,6],["routes.dc.nodes.index.empty.header"],[["items"],[[32,6,["length"]]]]]],[2,"\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,6],["routes.dc.nodes.index.empty.body"],[["items","htmlSafe"],[[32,6,["length"]],true]]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[8]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[4,5,6,7]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[3]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n  "]],"parameters":[1]}]]]],"hasEval":false,"upvars":["search","mut","action","format-number","gt","if","t","routeName","hash","uri","searchProperties","searchproperty","split","not-eq","status","sortBy","or","let"]}',meta:{moduleName:"consul-ui/templates/dc/nodes/index.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/nodes/show",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"AGs+VtxL",block:'{"symbols":["route","tomography","loader","item","tomography","o","status","type","after","notice","notice","notice"],"statements":[[8,"route",[],[["@name"],[[34,8]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-source",[],[["@src"],[[30,[36,14],["/${partition}/${nspace}/${dc}/coordinates/for-node/${name}",[30,[36,3],null,[["partition","nspace","dc","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","name"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,14],["/${partition}/${nspace}/${dc}/node/${name}",[30,[36,3],null,[["partition","nspace","dc","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","name"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,3,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["disconnected"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,13],[[32,3,["error","status"]],"404"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"notice",[[24,0,"notification-update"],[4,[38,12],null,[["sticky"],[true]]]],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,12,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"strong"],[12],[2,"Warning!"],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,12,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              This node no longer exists in the catalog.\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[12]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,5],[[30,[36,13],[[32,3,["error","status"]],"403"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"notice",[[24,0,"notification-update"],[4,[38,12],null,[["sticky"],[true]]]],[["@type"],["error"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,11,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"strong"],[12],[2,"Error!"],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,11,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              You no longer have access to this node\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[11]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,"notice",[[24,0,"notification-update"],[4,[38,12],null,[["sticky"],[true]]]],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,10,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"strong"],[12],[2,"Warning!"],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,10,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              An error was returned whilst loading this data, refresh to try again.\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[10]}]]],[2,"\\n      "]],"parameters":[]}]]]],"parameters":[]}]]],[2,"    "]],"parameters":[9]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,15],[[32,3,["data"]],[32,2,["data"]]],null,[["default"],[{"statements":[[2,"      "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["notification"]],[["default"],[{"statements":[[2,"\\n            "],[8,"consul/lock-session/notifications",[],[["@type","@status"],[[32,8],[32,7]]],null],[2,"\\n          "]],"parameters":[7,8]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["breadcrumbs"]],[["default"],[{"statements":[[2,"\\n              "],[10,"ol"],[12],[2,"\\n                  "],[10,"li"],[12],[10,"a"],[15,6,[30,[36,0],["dc.nodes"],null]],[12],[2,"All Nodes"],[13],[13],[2,"\\n              "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n              "],[10,"h1"],[12],[2,"\\n                "],[8,[32,1,["Title"]],[],[["@title"],[[32,4,["Node"]]]],null],[2,"\\n              "],[13],[2,"\\n              "],[10,"label"],[14,"for","toolbar-toggle"],[12],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["nav"]],[["default"],[{"statements":[[2,"\\n            "],[8,"tab-nav",[],[["@items"],[[30,[36,7],[[30,[36,6],[[30,[36,3],null,[["label","href","selected"],[[30,[36,2],["routes.dc.nodes.show.healthchecks.title"],null],[30,[36,0],["dc.nodes.show.healthchecks"],null],[30,[36,1],["dc.nodes.show.healthchecks"],null]]]],[30,[36,3],null,[["label","href","selected"],[[30,[36,2],["routes.dc.nodes.show.services.title"],null],[30,[36,0],["dc.nodes.show.services"],null],[30,[36,1],["dc.nodes.show.services"],null]]]],[30,[36,5],[[32,5,["distances"]],[30,[36,3],null,[["label","href","selected"],[[30,[36,2],["routes.dc.nodes.show.rtt.title"],null],[30,[36,0],["dc.nodes.show.rtt"],null],[30,[36,1],["dc.nodes.show.rtt"],null]]]],""],null],[30,[36,5],[[30,[36,4],["read sessions"],null],[30,[36,3],null,[["label","href","selected"],[[30,[36,2],["routes.dc.nodes.show.sessions.title"],null],[30,[36,0],["dc.nodes.show.sessions"],null],[30,[36,1],["dc.nodes.show.sessions"],null]]]],""],null],[30,[36,3],null,[["label","href","selected"],[[30,[36,2],["routes.dc.nodes.show.metadata.title"],null],[30,[36,0],["dc.nodes.show.metadata"],null],[30,[36,1],["dc.nodes.show.metadata"],null]]]]],null]],null]]],null],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n            "],[8,"copy-button",[],[["@value","@name"],[[32,4,["Address"]],"Address"]],[["default"],[{"statements":[[1,[32,4,["Address"]]]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n            "],[8,"outlet",[],[["@name","@model"],[[34,8],[30,[36,9],[[30,[36,3],null,[["item","tomography"],[[32,4],[32,5]]]],[32,1,["model"]]],null]]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,11],[[30,[36,10],null,null]],null]],[2,"\\n            "]],"parameters":[6]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[4,5]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[3]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["href-to","is-href","t","hash","can","if","array","compact","routeName","assign","-outlet","component","notification","eq","uri","let"]}',meta:{moduleName:"consul-ui/templates/dc/nodes/show.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/nodes/show/healthchecks",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"bJw4npZ1",block:'{"symbols":["route","sort","filters","items","collection","serf","notice"],"statements":[[8,"route",[],[["@name"],[[34,10]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,9],[[30,[36,15],null,[["value","change"],[[30,[36,20],[[35,19],"Status:asc"],null],[30,[36,6],[[32,0],[30,[36,5],[[35,19]],null]],[["value"],["target.selected"]]]]]],[30,[36,15],null,[["status","kind","check","searchproperty"],[[30,[36,15],null,[["value","change"],[[30,[36,3],[[35,18],[30,[36,13],[[35,18],","],null],[29]],null],[30,[36,6],[[32,0],[30,[36,5],[[35,18]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,15],null,[["value","change"],[[30,[36,3],[[35,17],[30,[36,13],[[35,17],","],null],[29]],null],[30,[36,6],[[32,0],[30,[36,5],[[35,17]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,15],null,[["value","change"],[[30,[36,3],[[35,16],[30,[36,13],[[35,16],","],null],[29]],null],[30,[36,6],[[32,0],[30,[36,5],[[35,16]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,15],null,[["value","change","default"],[[30,[36,3],[[30,[36,14],[[35,12],[29]],null],[30,[36,13],[[35,12],","],null],[35,11]],null],[30,[36,6],[[32,0],[30,[36,5],[[35,12]],null]],[["value"],["target.selectedItems"]]],[35,11]]]]]]],[32,1,["model","item","Checks"]]],null,[["default"],[{"statements":[[2,"      "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n"],[6,[37,3],[[30,[36,7],[[32,4,["length"]],0],null]],null,[["default"],[{"statements":[[2,"            "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[2,"\\n            "],[8,"consul/health-check/search-bar",[],[["@search","@onsearch","@sort","@filter"],[[34,4],[30,[36,6],[[32,0],[30,[36,5],[[35,4]],null]],[["value"],["target.value"]]],[32,2],[32,3]]],null],[2,"\\n"]],"parameters":[]}]]],[6,[37,9],[[30,[36,8],["Type","serf",[32,4]],null]],null,[["default"],[{"statements":[[6,[37,3],[[30,[36,2],[[32,6],[30,[36,1],[[32,6,["Status"]],"critical"],null]],null]],null,[["default"],[{"statements":[[2,"              "],[8,"notice",[],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n                "],[8,[32,7,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                  "],[10,"h2"],[12],[2,"\\n                    "],[1,[30,[36,0],["routes.dc.nodes.show.healthchecks.critical-serf-notice.header"],null]],[2,"\\n                  "],[13],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n                "],[8,[32,7,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                  "],[1,[30,[36,0],["routes.dc.nodes.show.healthchecks.critical-serf-notice.body"],[["htmlSafe"],[true]]]],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[7]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[6]}]]],[2,"          "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["health-check",[32,2,["value"]],[32,3],[34,4],[32,4]]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,5,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,"consul/health-check/list",[],[["@items"],[[32,5,["items"]]]],null],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,[32,5,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n                "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                  "],[1,[30,[36,0],["routes.dc.nodes.show.healthchecks.empty"],[["items","htmlSafe"],[[32,4,["length"]],true]]]],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[5]}]]],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[2,3,4]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["t","eq","and","if","search","mut","action","gt","find-by","let","routeName","searchProperties","searchproperty","split","not-eq","hash","check","kind","status","sortBy","or"]}',meta:{moduleName:"consul-ui/templates/dc/nodes/show/healthchecks.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/nodes/show/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"m12qfaqn",block:'{"symbols":["route"],"statements":[[8,"route",[],[["@name"],[[34,2]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,4],[[30,[36,3],[[32,1,["model","item","Checks","length"]],0],null]],null,[["default","else"],[{"statements":[[2,"  "],[1,[30,[36,1],[[30,[36,0],["replaceWith","dc.nodes.show.services"],null]],null]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"  "],[1,[30,[36,1],[[30,[36,0],["replaceWith","dc.nodes.show.healthchecks"],null]],null]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["route-action","did-insert","routeName","eq","if"]}',meta:{moduleName:"consul-ui/templates/dc/nodes/show/index.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/nodes/show/metadata",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"etmR4DHA",block:'{"symbols":["route"],"statements":[[8,"route",[],[["@name"],[[34,1]]],[["default"],[{"statements":[[2,"\\n  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n"],[6,[37,2],[[32,1,["model","item","Meta"]]],null,[["default","else"],[{"statements":[[2,"    "],[8,"consul/metadata/list",[],[["@items"],[[30,[36,0],[[32,1,["model","item","Meta"]]],null]]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n        "],[10,"p"],[12],[2,"\\n          This node has no metadata.\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["entries","routeName","if"]}',meta:{moduleName:"consul-ui/templates/dc/nodes/show/metadata.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/nodes/show/rtt",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"P8rIllxs",block:'{"symbols":["route","tomography"],"statements":[[8,"route",[],[["@name"],[[34,5]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,1,["model","tomography"]]],null,[["default"],[{"statements":[[6,[37,4],[[30,[36,3],[[32,2,["distances"]]],null]],null,[["default","else"],[{"statements":[[2,"  "],[1,[30,[36,2],[[30,[36,1],["replaceWith","dc.nodes.show"],null]],null]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n    "],[10,"div"],[14,0,"definition-table"],[12],[2,"\\n      "],[10,"dl"],[12],[2,"\\n          "],[10,"dt"],[12],[2,"\\n              Minimum\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n              "],[1,[30,[36,0],[[32,2,["min"]]],[["maximumFractionDigits"],[2]]]],[2,"ms\\n          "],[13],[2,"\\n          "],[10,"dt"],[12],[2,"\\n              Median\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n              "],[1,[30,[36,0],[[32,2,["median"]]],[["maximumFractionDigits"],[2]]]],[2,"ms\\n          "],[13],[2,"\\n          "],[10,"dt"],[12],[2,"\\n              Maximum\\n          "],[13],[2,"\\n          "],[10,"dd"],[12],[2,"\\n              "],[1,[30,[36,0],[[32,2,["max"]]],[["maximumFractionDigits"],[2]]]],[2,"ms\\n          "],[13],[2,"\\n      "],[13],[2,"\\n    "],[13],[2,"\\n    "],[8,"consul/tomography/graph",[],[["@distances"],[[32,2,["distances"]]]],null],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[2]}]]]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["format-number","route-action","did-insert","not","if","routeName","let"]}',meta:{moduleName:"consul-ui/templates/dc/nodes/show/rtt.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/nodes/show/services",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"2fksFjAV",block:'{"symbols":["route","sort","filters","items","proxies","collection"],"statements":[[8,"route",[],[["@name"],[[34,9]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,18],[[30,[36,13],null,[["value","change"],[[30,[36,17],[[35,16],"Status:asc"],null],[30,[36,4],[[32,0],[30,[36,3],[[35,16]],null]],[["value"],["target.selected"]]]]]],[30,[36,13],null,[["status","source","searchproperty"],[[30,[36,13],null,[["value","change"],[[30,[36,7],[[35,15],[30,[36,11],[[35,15],","],null],[29]],null],[30,[36,4],[[32,0],[30,[36,3],[[35,15]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,13],null,[["value","change"],[[30,[36,7],[[35,14],[30,[36,11],[[35,14],","],null],[29]],null],[30,[36,4],[[32,0],[30,[36,3],[[35,14]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,13],null,[["value","change","default"],[[30,[36,7],[[30,[36,12],[[35,10],[29]],null],[30,[36,11],[[35,10],","],null],[35,5]],null],[30,[36,4],[[32,0],[30,[36,3],[[35,10]],null]],[["value"],["target.selectedItems"]]],[35,5]]]]]]],[32,1,["model","item","MeshServiceInstances"]],[32,1,["model","item","ProxyServiceInstances"]]],null,[["default"],[{"statements":[[2,"  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n"],[6,[37,7],[[30,[36,6],[[32,4,["length"]],0],null]],null,[["default"],[{"statements":[[2,"      "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[2,"\\n      "],[8,"consul/service-instance/search-bar",[],[["@sources","@search","@onsearch","@searchproperties","@sort","@filter"],[[30,[36,1],[[30,[36,0],[[32,4]],null],"ExternalSources"],null],[34,2],[30,[36,4],[[32,0],[30,[36,3],[[35,2]],null]],[["value"],["target.value"]]],[34,5],[32,2],[32,3]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["service-instance",[32,2,["value"]],[32,3],[34,2],[32,4]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,6,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"consul/service-instance/list",[],[["@node","@routeName","@items","@proxies"],[[32,1,["model","item"]],"dc.services.show",[32,6,["items"]],[32,5]]],null],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,6,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,8],["routes.dc.nodes.show.services.empty"],[["items","htmlSafe"],[[32,4,["length"]],true]]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[6]}]]],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[2,3,4,5]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["collection","get","search","mut","action","searchProperties","gt","if","t","routeName","searchproperty","split","not-eq","hash","source","status","sortBy","or","let"]}',meta:{moduleName:"consul-ui/templates/dc/nodes/show/services.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/nodes/show/sessions",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"FSj+j5r9",block:'{"symbols":["route","api","items","writer","collection","after","error","after"],"statements":[[8,"route",[],[["@name"],[[34,7]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,1],["/${partition}/${nspace}/${dc}/sessions/for-node/${node}",[30,[36,0],null,[["partition","nspace","dc","node"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","name"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,8],[[32,2,["data"]]],null,[["default"],[{"statements":[[2,"    "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n      "],[8,"data-writer",[],[["@sink","@type","@label","@ondelete"],[[30,[36,1],["/${partition}/${dc}/${nspace}/session/",[30,[36,0],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null],"session","Lock Session",[34,2]]],[["default"],[{"statements":[[2,"\\n\\n        "],[8,"block-slot",[],[["@name"],["removed"]],[["default"],[{"statements":[[2,"\\n          "],[8,"consul/lock-session/notifications",[[4,[38,4],null,[["after"],[[30,[36,3],[[32,0],[32,8]],null]]]]],[["@type"],["remove"]],null],[2,"\\n        "]],"parameters":[8]}]]],[2,"\\n\\n        "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n          "],[8,"consul/lock-session/notifications",[[4,[38,4],null,[["after"],[[30,[36,3],[[32,0],[32,6]],null]]]]],[["@type","@error"],["remove",[32,7]]],null],[2,"\\n        "]],"parameters":[6,7]}]]],[2,"\\n\\n        "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n\\n          "],[8,"data-collection",[],[["@type","@items"],["session",[32,3]]],[["default"],[{"statements":[[2,"\\n\\n            "],[8,[32,5,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,"consul/lock-session/list",[],[["@items","@ondelete"],[[32,5,["items"]],[32,4,["delete"]]]],null],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n\\n            "],[8,[32,5,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,"empty-state",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                "],[10,"h2"],[12],[2,"\\n                  "],[1,[30,[36,5],["routes.dc.nodes.show.sessions.empty.header"],[["items"],[[32,3,["length"]]]]]],[2,"\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,5],["routes.dc.nodes.show.sessions.empty.body"],[["htmlSafe"],[true]]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n\\n                "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n                  "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n                    "],[8,"action",[],[["@href","@external"],[[31,[[30,[36,6],["CONSUL_DOCS_URL"],null],"/internals/sessions.html"]],true]],[["default"],[{"statements":[[2,"\\n                      Documentation on Lock Sessions\\n                    "]],"parameters":[]}]]],[2,"\\n                  "],[13],[2,"\\n                  "],[10,"li"],[14,0,"learn-link"],[12],[2,"\\n                    "],[8,"action",[],[["@href","@external"],[[31,[[30,[36,6],["CONSUL_DOCS_LEARN_URL"],null],"/tutorials/consul/distributed-semaphore"]],true]],[["default"],[{"statements":[[2,"\\n                      Take the tutorial\\n                    "]],"parameters":[]}]]],[2,"\\n                  "],[13],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n\\n          "]],"parameters":[5]}]]],[2,"\\n\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[3]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["hash","uri","refresh-route","action","notification","t","env","routeName","let"]}',meta:{moduleName:"consul-ui/templates/dc/nodes/show/sessions.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/nspaces/edit",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"vtIZmmQj",block:'{"symbols":["route","loader","dc","partition","nspace","item","create"],"statements":[[8,"route",[],[["@name"],[[34,4]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,7],["/${partition}/${nspace}/${dc}/namespace/${id}",[30,[36,6],null,[["partition","nspace","dc","id"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[30,[36,5],[[32,1,["params","name"]],""],null]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,8],[[32,1,["params","dc"]],[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,2,["data"]],[32,2,["data","isNew"]]],null,[["default"],[{"statements":[[2,"  "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["breadcrumbs"]],[["default"],[{"statements":[[2,"\\n      "],[10,"ol"],[12],[2,"\\n          "],[10,"li"],[12],[10,"a"],[15,6,[30,[36,0],["dc.nspaces"],null]],[12],[2,"All Namespaces"],[13],[13],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n      "],[10,"h1"],[12],[2,"\\n        "],[8,[32,1,["Title"]],[],[["@title"],[[30,[36,2],[[32,7],"New Namespace",[30,[36,1],["Edit ",[32,6,["Name"]]],null]],null]]],null],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n      "],[8,"consul/nspace/form",[],[["@item","@dc","@nspace","@partition","@onsubmit"],[[32,6],[32,1,["params","dc"]],[32,1,["params","nspace"]],[32,1,["params","partition"]],[30,[36,3],["dc.nspaces.index"],null]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3,4,5,6,7]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["href-to","concat","if","transition-to","routeName","or","hash","uri","let"]}',meta:{moduleName:"consul-ui/templates/dc/nspaces/edit.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/nspaces/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"0ldYIvBg",block:'{"symbols":["route","loader","sort","filters","items","writer","collection","after"],"statements":[[8,"route",[],[["@name"],[[34,12]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,8],["/${partition}/${nspace}/${dc}/namespaces",[30,[36,7],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,19],[[30,[36,7],null,[["value","change"],[[30,[36,18],[[35,17],"Name:asc"],null],[30,[36,2],[[32,0],[30,[36,1],[[35,17]],null]],[["value"],["target.selected"]]]]]],[30,[36,7],null,[["searchproperty"],[[30,[36,7],null,[["value","change","default"],[[30,[36,5],[[30,[36,16],[[35,14],[29]],null],[30,[36,15],[[35,14],","],null],[35,13]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,14]],null]],[["value"],["target.selectedItems"]]],[35,13]]]]]]],[32,2,["data"]]],null,[["default"],[{"statements":[[2,"\\n    "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"h1"],[12],[2,"\\n          "],[8,[32,1,["Title"]],[],[["@title"],["Namespaces"]],null],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,4],["create nspaces"],null]],null,[["default"],[{"statements":[[2,"          "],[10,"a"],[15,6,[31,[[30,[36,3],["dc.nspaces.create"],null]]]],[14,0,"type-create"],[12],[2,"Create"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["toolbar"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,6],[[32,5,["length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[8,"consul/nspace/search-bar",[],[["@search","@onsearch","@sort","@filter"],[[34,0],[30,[36,2],[[32,0],[30,[36,1],[[35,0]],null]],[["value"],["target.value"]]],[32,3],[32,4]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n        "],[8,"data-writer",[],[["@sink","@type","@label","@ondelete"],[[30,[36,8],["/${partition}/${dc}/${nspace}/nspace/",[30,[36,7],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null],"nspace","Namespace",[34,9]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["removed"]],[["default"],[{"statements":[[2,"\\n            "],[8,"consul/nspace/notifications",[[4,[38,10],null,[["after"],[[30,[36,2],[[32,0],[32,8]],null]]]]],[["@type"],["remove"]],null],[2,"\\n          "]],"parameters":[8]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n        "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["nspace",[32,3,["value"]],[32,4],[34,0],[32,5]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,7,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"consul/nspace/list",[],[["@items","@ondelete"],[[32,7,["items"]],[32,6,["delete"]]]],null],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,7,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"empty-state",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                "],[10,"h2"],[12],[2,"\\n"],[6,[37,5],[[30,[36,6],[[32,5,["length"]],0],null]],null,[["default","else"],[{"statements":[[2,"                    No namespaces found\\n"]],"parameters":[]},{"statements":[[2,"                    Welcome to Namespaces\\n"]],"parameters":[]}]]],[2,"                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[10,"p"],[12],[2,"\\n"],[6,[37,5],[[30,[36,6],[[32,5,["length"]],0],null]],null,[["default","else"],[{"statements":[[2,"                    No namespaces where found matching that search, or you may not have access to view the namespaces you are searching for.\\n"]],"parameters":[]},{"statements":[[2,"                    There don\'t seem to be any namespaces, or you may not have access to view namespaces yet.\\n"]],"parameters":[]}]]],[2,"                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n                "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n                  "],[10,"a"],[15,6,[31,[[30,[36,11],["CONSUL_DOCS_URL"],null],"/commands/namespace"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Documentation on namespaces"],[13],[2,"\\n                "],[13],[2,"\\n                "],[10,"li"],[14,0,"learn-link"],[12],[2,"\\n                  "],[10,"a"],[15,6,[31,[[30,[36,11],["CONSUL_DOCS_LEARN_URL"],null],"/consul/namespaces/secure-namespaces"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Read the guide"],[13],[2,"\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[7]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[6]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3,4,5]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["search","mut","action","href-to","can","if","gt","hash","uri","refresh-route","notification","env","routeName","searchProperties","searchproperty","split","not-eq","sortBy","or","let"]}',meta:{moduleName:"consul-ui/templates/dc/nspaces/index.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/partitions/edit",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"ENp7Mr/r",block:'{"symbols":["route","loader","dc","partition","nspace","item"],"statements":[[8,"route",[],[["@name"],[[34,5]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,8],["/${partition}/${nspace}/${dc}/partition/${id}",[30,[36,7],null,[["partition","nspace","dc","id"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[30,[36,6],[[32,1,["params","name"]],""],null]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,9],[[32,1,["params","dc"]],[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,2,["data"]]],null,[["default"],[{"statements":[[2,"  "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["breadcrumbs"]],[["default"],[{"statements":[[2,"\\n      "],[10,"ol"],[12],[2,"\\n          "],[10,"li"],[12],[10,"a"],[15,6,[30,[36,0],["dc.partitions"],null]],[12],[2,"All Admin Partitions"],[13],[13],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n      "],[10,"h1"],[12],[2,"\\n        "],[8,[32,1,["Title"]],[],[["@title"],[[30,[36,3],[[30,[36,2],["new partition"],[["item"],[[32,6]]]],"New Partition",[30,[36,1],["Edit ",[32,6,["Name"]]],null]],null]]],null],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n\\n      "],[8,"consul/partition/form",[],[["@item","@dc","@nspace","@partition","@onsubmit"],[[32,6],[32,1,["params","dc"]],[32,1,["params","nspace"]],[32,1,["params","partition"]],[30,[36,4],["dc.partitions.index"],null]]],null],[2,"\\n\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3,4,5,6]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["href-to","concat","is","if","transition-to","routeName","or","hash","uri","let"]}',meta:{moduleName:"consul-ui/templates/dc/partitions/edit.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/partitions/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"noxbZ0Vh",block:'{"symbols":["route","loader","sort","filters","items","writer","collection","after"],"statements":[[8,"route",[],[["@name"],[[34,12]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,8],["/${partition}/${nspace}/${dc}/partitions",[30,[36,7],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,19],[[30,[36,7],null,[["value","change"],[[30,[36,18],[[35,17],"Name:asc"],null],[30,[36,2],[[32,0],[30,[36,1],[[35,17]],null]],[["value"],["target.selected"]]]]]],[30,[36,7],null,[["searchproperty"],[[30,[36,7],null,[["value","change","default"],[[30,[36,5],[[30,[36,16],[[35,14],[29]],null],[30,[36,15],[[35,14],","],null],[35,13]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,14]],null]],[["value"],["target.selectedItems"]]],[35,13]]]]]]],[32,2,["data"]]],null,[["default"],[{"statements":[[2,"\\n    "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"h1"],[12],[2,"\\n          "],[8,[32,1,["Title"]],[],[["@title"],["Admin Partitions"]],null],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,4],["create partitions"],null]],null,[["default"],[{"statements":[[2,"        "],[10,"a"],[14,0,"type-create"],[15,6,[31,[[30,[36,3],["dc.partitions.create"],null]]]],[12],[2,"\\n          Create\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["toolbar"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,6],[[32,5,["length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[8,"consul/partition/search-bar",[],[["@search","@onsearch","@sort","@filter"],[[34,0],[30,[36,2],[[32,0],[30,[36,1],[[35,0]],null]],[["value"],["target.value"]]],[32,3],[32,4]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n      "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n        "],[8,"data-writer",[],[["@sink","@type","@label","@ondelete"],[[30,[36,8],["/${partition}/${dc}/${nspace}/partition/",[30,[36,7],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null],"partition","Partition",[34,9]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["removed"]],[["default"],[{"statements":[[2,"\\n            "],[8,"consul/partition/notifications",[[4,[38,10],null,[["after"],[[30,[36,2],[[32,0],[32,8]],null]]]]],[["@type"],["remove"]],null],[2,"\\n          "]],"parameters":[8]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n        "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["nspace",[32,3,["value"]],[32,4],[34,0],[32,5]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,7,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"consul/partition/list",[],[["@items","@ondelete"],[[32,7,["items"]],[32,6,["delete"]]]],null],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,7,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"empty-state",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                "],[10,"h2"],[12],[2,"\\n"],[6,[37,5],[[30,[36,6],[[32,5,["length"]],0],null]],null,[["default","else"],[{"statements":[[2,"                    No partitions found\\n"]],"parameters":[]},{"statements":[[2,"                    Welcome to Partitions\\n"]],"parameters":[]}]]],[2,"                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[10,"p"],[12],[2,"\\n"],[6,[37,5],[[30,[36,6],[[32,5,["length"]],0],null]],null,[["default","else"],[{"statements":[[2,"                    No partitions where found matching that search, or you may not have access to view the namespaces you are searching for.\\n"]],"parameters":[]},{"statements":[[2,"                    There don\'t seem to be any partitions, or you may not have access to view partitions yet.\\n"]],"parameters":[]}]]],[2,"                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n                "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n                  "],[8,"action",[],[["@href","@external"],[[31,[[30,[36,11],["CONSUL_DOCS_URL"],null],"/enterprise/admin-partitions"]],true]],[["default"],[{"statements":[[2,"\\n                    Documentation on Admin Partitions\\n                  "]],"parameters":[]}]]],[2,"\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[7]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[6]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3,4,5]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["search","mut","action","href-to","can","if","gt","hash","uri","refresh-route","notification","env","routeName","searchProperties","searchproperty","split","not-eq","sortBy","or","let"]}',meta:{moduleName:"consul-ui/templates/dc/partitions/index.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/routing-config",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"mrMbnEYc",block:'{"symbols":["route","loader","item"],"statements":[[8,"route",[],[["@name"],[[34,2]]],[["default"],[{"statements":[[2,"\\n\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,4],["/${partition}/${nspace}/${dc}/discovery-chain/${name}",[30,[36,3],null,[["partition","nspace","dc","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","name"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[32,2,["data"]]],null,[["default"],[{"statements":[[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n  "],[8,"block-slot",[],[["@name"],["breadcrumbs"]],[["default"],[{"statements":[[2,"\\n    "],[10,"ol"],[12],[2,"\\n        "],[10,"li"],[12],[10,"a"],[15,6,[30,[36,0],["dc.services"],null]],[12],[2,"All Services"],[13],[13],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n    "],[10,"h1"],[12],[2,"\\n      "],[8,[32,1,["Title"]],[],[["@title"],[[32,3,["Chain","ServiceName"]]]],null],[2,"\\n    "],[13],[2,"\\n    "],[8,"consul/source",[],[["@source","@withInfo"],[[30,[36,1],["routes.dc.routing-config.source"],null],true]],null],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n  "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n    "],[10,"div"],[14,0,"container"],[12],[2,"\\n      "],[8,"consul/discovery-chain",[],[["@chain"],[[32,3,["Chain"]]]],null],[2,"\\n    "],[13],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["href-to","t","routeName","hash","uri","let"]}',meta:{moduleName:"consul-ui/templates/dc/routing-config.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"LK9P+jx5",block:'{"symbols":["route","api","sort","filters","items","partition","nspace","collection","items"],"statements":[[8,"route",[],[["@name"],[[34,11]]],[["default"],[{"statements":[[2,"\\n\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,13],["/${partition}/${nspace}/${dc}/services",[30,[36,12],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,5],[[30,[36,12],null,[["value","change"],[[30,[36,14],[[35,23],"Status:asc"],null],[30,[36,3],[[32,0],[30,[36,2],[[35,23]],null]],[["value"],["target.selected"]]]]]],[30,[36,12],null,[["status","kind","source","searchproperty"],[[30,[36,12],null,[["value","change"],[[30,[36,8],[[35,22],[30,[36,18],[[35,22],","],null],[29]],null],[30,[36,3],[[32,0],[30,[36,2],[[35,22]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,12],null,[["value","change"],[[30,[36,8],[[35,21],[30,[36,18],[[35,21],","],null],[29]],null],[30,[36,3],[[32,0],[30,[36,2],[[35,21]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,12],null,[["value","change"],[[30,[36,8],[[35,20],[30,[36,18],[[35,20],","],null],[29]],null],[30,[36,3],[[32,0],[30,[36,2],[[35,20]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,12],null,[["value","change","default"],[[30,[36,8],[[30,[36,19],[[35,17],[29]],null],[30,[36,18],[[35,17],","],null],[35,16]],null],[30,[36,3],[[32,0],[30,[36,2],[[35,17]],null]],[["value"],["target.selectedItems"]]],[35,16]]]]]]],[30,[36,15],["Kind","connect-proxy",[32,2,["data"]]],null],[30,[36,14],[[32,1,["params","partition"]],[32,1,["model","user","token","Partition"]],"default"],null],[30,[36,14],[[32,1,["params","nspace"]],[32,1,["model","user","token","Namespace"]],"default"],null]],null,[["default"],[{"statements":[[2,"\\n  "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n        "],[10,"h1"],[12],[2,"\\n          "],[8,[32,1,["Title"]],[],[["@title"],["Services"]],null],[2," "],[10,"em"],[12],[1,[30,[36,6],[[32,5,["length"]]],null]],[2," total"],[13],[2,"\\n        "],[13],[2,"\\n        "],[10,"label"],[14,"for","toolbar-toggle"],[12],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["toolbar"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,8],[[30,[36,7],[[32,5,["length"]],0],null]],null,[["default"],[{"statements":[[6,[37,5],[[30,[36,4],[[32,5]],null]],null,[["default"],[{"statements":[[2,"        "],[8,"consul/service/search-bar",[],[["@sources","@partitions","@partition","@search","@onsearch","@sort","@filter"],[[30,[36,0],[[32,9],"ExternalSources"],null],[30,[36,0],[[32,9],"Partitions"],null],[32,6],[34,1],[30,[36,3],[[32,0],[30,[36,2],[[35,1]],null]],[["value"],["target.value"]]],[32,3],[32,4]]],null],[2,"\\n"]],"parameters":[9]}]]]],"parameters":[]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n      "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["service",[32,3,["value"]],[32,4],[34,1],[32,5]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,8,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"consul/service/list",[],[["@items","@partition"],[[32,8,["items"]],[32,6]]],[["default"],[{"statements":[[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,8,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"empty-state",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                "],[10,"h2"],[12],[2,"\\n                  "],[1,[30,[36,9],["routes.dc.services.index.empty.header"],[["items"],[[32,5,["length"]]]]]],[2,"\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,9],["routes.dc.services.index.empty.body"],[["items","htmlSafe"],[[32,5,["length"]],true]]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n                "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n                  "],[8,"action",[],[["@href","@external"],[[31,[[30,[36,10],["CONSUL_DOCS_URL"],null],"/commands/services"]],true]],[["default"],[{"statements":[[2,"\\n                    Documentation on Services\\n                  "]],"parameters":[]}]]],[2,"\\n                "],[13],[2,"\\n                "],[10,"li"],[14,0,"learn-link"],[12],[2,"\\n                  "],[8,"action",[],[["@href","@external"],[[31,[[30,[36,10],["CONSUL_DOCS_LEARN_URL"],null],"/consul/getting-started/services"]],true]],[["default"],[{"statements":[[2,"\\n                    Take the tutorial\\n                  "]],"parameters":[]}]]],[2,"\\n                "],[13],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[8]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n  "]],"parameters":[]}]]],[2,"\\n\\n"]],"parameters":[3,4,5,6,7]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["get","search","mut","action","collection","let","format-number","gt","if","t","env","routeName","hash","uri","or","reject-by","searchProperties","searchproperty","split","not-eq","source","kind","status","sortBy"]}',meta:{moduleName:"consul-ui/templates/dc/services/index.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/instance",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"N+/8UsgU",block:'{"symbols":["route","loader","item","o","address","meta","after","notice","notice","notice"],"statements":[[8,"route",[],[["@name"],[[34,14]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,1],["/${partition}/${nspace}/${dc}/service-instance/${id}/${node}/${name}",[30,[36,0],null,[["partition","nspace","dc","id","node","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","id"]],[32,1,["params","node"]],[32,1,["params","name"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["disconnected"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[30,[36,8],[[32,2,["error","status"]],"404"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"notice",[[24,0,"notification-update"],[4,[38,18],null,[["sticky"],[true]]]],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,10,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"strong"],[12],[2,"Warning!"],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,10,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              This service has been deregistered and no longer exists in the catalog.\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[10]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,6],[[30,[36,8],[[32,2,["error","status"]],"403"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"notice",[[24,0,"notification-update"],[4,[38,18],null,[["sticky"],[true]]]],[["@type"],["error"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,9,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"strong"],[12],[2,"Error!"],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,9,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              You no longer have access to this service\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[9]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,"notice",[[24,0,"notification-update"],[4,[38,18],null,[["sticky"],[true]]]],[["@type"],["error"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,8,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"strong"],[12],[2,"Warning!"],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,8,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              An error was returned whilst loading this data, refresh to try again.\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[8]}]]],[2,"\\n      "]],"parameters":[]}]]]],"parameters":[]}]]],[2,"    "]],"parameters":[7]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,10],[[32,2,["data"]]],null,[["default"],[{"statements":[[6,[37,6],[[32,3,["IsOrigin"]]],null,[["default"],[{"statements":[[2,"        "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,1],["/${partition}/${nspace}/${dc}/proxy-instance/${id}/${node}/${name}",[30,[36,0],null,[["partition","nspace","dc","id","node","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","id"]],[32,1,["params","node"]],[32,1,["params","name"]]]]]],null],[30,[36,4],[[32,0],[30,[36,3],[[35,5]],null]],[["value"],["data"]]]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,6],[[32,6,["data","ServiceID"]]],null,[["default"],[{"statements":[[2,"            "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,1],["/${partition}/${nspace}/${dc}/service-instance/${id}/${node}/${name}",[30,[36,0],null,[["partition","nspace","dc","id","node","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,6,["data","ServiceID"]],[32,6,["data","NodeName"]],[32,6,["data","ServiceName"]]]]]],null],[30,[36,4],[[32,0],[30,[36,3],[[35,2]],null]],[["value"],["data"]]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"        "]],"parameters":[6]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["breadcrumbs"]],[["default"],[{"statements":[[2,"\\n              "],[10,"ol"],[12],[2,"\\n                  "],[10,"li"],[12],[10,"a"],[15,6,[30,[36,7],["dc.services"],null]],[12],[2,"All Services"],[13],[13],[2,"\\n                  "],[10,"li"],[12],[10,"a"],[15,6,[30,[36,7],["dc.services.show"],null]],[12],[2,"Service ("],[1,[32,3,["Service","Service"]]],[2,")"],[13],[13],[2,"\\n              "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n            "],[10,"h1"],[12],[2,"\\n              "],[8,[32,1,["Title"]],[],[["@title"],[[32,3,["Service","ID"]]]],null],[2,"\\n            "],[13],[2,"\\n            "],[8,"consul/external-source",[],[["@item","@withInfo"],[[32,3],true]],null],[2,"\\n            "],[8,"consul/kind",[],[["@item","@withInfo"],[[32,3],true]],null],[2,"\\n"],[6,[37,6],[[30,[36,8],[[35,5,["ServiceProxy","Mode"]],"transparent"],null]],null,[["default"],[{"statements":[[2,"              "],[8,"consul/transparent-proxy",[],[[],[]],null],[2,"\\n"]],"parameters":[]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["nav"]],[["default"],[{"statements":[[2,"\\n            "],[10,"dl"],[12],[2,"\\n              "],[10,"dt"],[12],[2,"Service Name"],[13],[2,"\\n              "],[10,"dd"],[12],[10,"a"],[15,6,[31,[[30,[36,7],["dc.services.show",[32,3,["Service","Service"]]],null]]]],[12],[1,[32,3,["Service","Service"]]],[13],[13],[2,"\\n            "],[13],[2,"\\n            "],[10,"dl"],[12],[2,"\\n              "],[10,"dt"],[12],[2,"Node Name"],[13],[2,"\\n              "],[10,"dd"],[12],[10,"a"],[15,6,[31,[[30,[36,7],["dc.nodes.show",[32,3,["Node","Node"]]],null]]]],[12],[1,[32,3,["Node","Node"]]],[13],[13],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,10],[[30,[36,9],[[32,3,["Service","Address"]],[32,3,["Node","Address"]]],null]],null,[["default"],[{"statements":[[2,"              "],[8,"copy-button",[],[["@value","@name"],[[32,5],"Address"]],[["default"],[{"statements":[[1,[32,5]]],"parameters":[]}]]],[2,"\\n"]],"parameters":[5]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n            "],[8,"tab-nav",[],[["@items"],[[30,[36,13],[[30,[36,12],[[30,[36,0],null,[["label","href","selected"],["Health Checks",[30,[36,7],["dc.services.instance.healthchecks"],null],[30,[36,11],["dc.services.instance.healthchecks"],null]]]],[30,[36,6],[[30,[36,8],[[32,3,["Service","Kind"]],"mesh-gateway"],null],[30,[36,0],null,[["label","href","selected"],["Addresses",[30,[36,7],["dc.services.instance.addresses"],null],[30,[36,11],["dc.services.instance.addresses"],null]]]]],null],[30,[36,6],[[35,2],[30,[36,0],null,[["label","href","selected"],["Upstreams",[30,[36,7],["dc.services.instance.upstreams"],null],[30,[36,11],["dc.services.instance.upstreams"],null]]]]],null],[30,[36,6],[[35,2],[30,[36,0],null,[["label","href","selected"],["Exposed Paths",[30,[36,7],["dc.services.instance.exposedpaths"],null],[30,[36,11],["dc.services.instance.exposedpaths"],null]]]]],null],[30,[36,0],null,[["label","href","selected"],["Tags & Meta",[30,[36,7],["dc.services.instance.metadata"],null],[30,[36,11],["dc.services.instance.metadata"],null]]]]],null]],null]]],null],[2,"\\n            "],[8,"outlet",[],[["@name","@model"],[[34,14],[30,[36,15],[[30,[36,0],null,[["proxy","meta","item"],[[35,2],[35,5],[32,3]]]],[32,1,["model"]]],null]]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,17],[[30,[36,16],null,null]],null]],[2,"\\n            "]],"parameters":[4]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["hash","uri","proxy","mut","action","meta","if","href-to","eq","or","let","is-href","array","compact","routeName","assign","-outlet","component","notification"]}',meta:{moduleName:"consul-ui/templates/dc/services/instance.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/instance/addresses",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"pc97C5QS",block:'{"symbols":["route","items","taggedAddress","index","address"],"statements":[[8,"route",[],[["@name"],[[34,7]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,9],[[30,[36,8],[[32,1,["model","item","Service","TaggedAddresses"]]],null]],null,[["default"],[{"statements":[[2,"  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n"],[6,[37,4],[[30,[36,6],[[32,2,["length"]],0],null]],null,[["default","else"],[{"statements":[[2,"      "],[8,"tabular-collection",[[24,0,"consul-tagged-addresses"]],[["@items"],[[32,2]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n            "],[10,"th"],[12],[2,"Tag"],[13],[2,"\\n            "],[10,"th"],[12],[2,"Address"],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["row"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,0],[1,[32,3]],null]],null,[["default"],[{"statements":[[2,"            "],[10,"td"],[12],[2,"\\n              "],[1,[30,[36,0],[0,[32,3]],null]],[6,[37,4],[[30,[36,3],[[30,[36,2],[[32,5,["Address"]],[35,1,["Address"]]],null],[30,[36,2],[[32,5,["Port"]],[35,1,["Port"]]],null]],null]],null,[["default"],[{"statements":[[2," "],[10,"em"],[12],[2,"(default)"],[13]],"parameters":[]}]]],[2,"\\n            "],[13],[2,"\\n            "],[10,"td"],[12],[2,"\\n              "],[1,[32,5,["Address"]]],[2,":"],[1,[32,5,["Port"]]],[2,"\\n            "],[13],[2,"\\n"]],"parameters":[5]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[3,4]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[10,"p"],[12],[2,"\\n        There are no additional addresses.\\n      "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[2]}]]]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["object-at","item","eq","and","if","with","gt","routeName","entries","let"]}',meta:{moduleName:"consul-ui/templates/dc/services/instance/addresses.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/instance/exposedpaths",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"fkDhaB82",block:'{"symbols":["route","item","proxy"],"statements":[[8,"route",[],[["@name"],[[34,4]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[32,1,["model","proxy"]],[32,1,["model","meta"]]],null,[["default"],[{"statements":[[2,"  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n"],[6,[37,3],[[30,[36,2],[[32,3,["ServiceProxy","Expose","Paths","length"]],0],null]],null,[["default","else"],[{"statements":[[2,"    "],[1,[30,[36,0],["routes.dc.services.instance.exposedpaths.intro"],[["htmlSafe"],[true]]]],[2,"\\n    "],[8,"consul/exposed-path/list",[],[["@items","@address"],[[32,3,["ServiceProxy","Expose","Paths"]],[30,[36,1],[[32,2,["Service","Address"]],[32,2,["Node","Address"]]],null]]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n        "],[1,[30,[36,0],["routes.dc.services.instance.exposedpaths.empty.body"],[["htmlSafe"],[true]]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[2,3]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["t","or","gt","if","routeName","let"]}',meta:{moduleName:"consul-ui/templates/dc/services/instance/exposedpaths.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/instance/healthchecks",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"RMWIT75Y",block:'{"symbols":["route","sort","filters","items","collection","serf","notice"],"statements":[[8,"route",[],[["@name"],[[34,10]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,9],[[30,[36,17],null,[["value","change"],[[30,[36,21],[[35,20],"Status:asc"],null],[30,[36,6],[[32,0],[30,[36,5],[[35,20]],null]],[["value"],["target.selected"]]]]]],[30,[36,17],null,[["status","check","searchproperty"],[[30,[36,17],null,[["value","change"],[[30,[36,3],[[35,19],[30,[36,15],[[35,19],","],null],[29]],null],[30,[36,6],[[32,0],[30,[36,5],[[35,19]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,17],null,[["value","change"],[[30,[36,3],[[35,18],[30,[36,15],[[35,18],","],null],[29]],null],[30,[36,6],[[32,0],[30,[36,5],[[35,18]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,17],null,[["value","change","default"],[[30,[36,3],[[30,[36,16],[[35,14],[29]],null],[30,[36,15],[[35,14],","],null],[35,13]],null],[30,[36,6],[[32,0],[30,[36,5],[[35,14]],null]],[["value"],["target.selectedItems"]]],[35,13]]]]]]],[30,[36,12],[[30,[36,11],[[32,1,["model","item","Checks"]],[32,1,["model","proxy","Checks"]]],null],[32,1,["model","proxy","ServiceProxy","Expose","Checks"]]],null]],null,[["default"],[{"statements":[[2,"  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n\\n"],[6,[37,3],[[30,[36,7],[[32,4,["length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[2,"\\n        "],[8,"consul/health-check/search-bar",[],[["@search","@onsearch","@sort","@filter"],[[34,4],[30,[36,6],[[32,0],[30,[36,5],[[35,4]],null]],[["value"],["target.value"]]],[32,2],[32,3]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[6,[37,9],[[30,[36,8],["Type","serf",[32,4]],null]],null,[["default"],[{"statements":[[6,[37,3],[[30,[36,2],[[32,6],[30,[36,1],[[32,6,["Status"]],"critical"],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,"notice",[],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,7,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"h2"],[12],[2,"\\n                "],[1,[30,[36,0],["routes.dc.services.instance.healthchecks.critical-serf-notice.header"],null]],[2,"\\n              "],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,[32,7,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,0],["routes.dc.services.instance.healthchecks.critical-serf-notice.body"],[["htmlSafe"],[true]]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[7]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[6]}]]],[2,"      "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["health-check",[32,2,["value"]],[32,3],[34,4],[32,4]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,5,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"consul/health-check/list",[],[["@items"],[[32,5,["items"]]]],null],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,5,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,0],["routes.dc.services.instance.healthchecks.empty"],[["items","htmlSafe"],[[32,4,["length"]],true]]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[5]}]]],[2,"\\n\\n  "],[13],[2,"\\n"]],"parameters":[2,3,4]}]]]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["t","eq","and","if","search","mut","action","gt","find-by","let","routeName","array","merge-checks","searchProperties","searchproperty","split","not-eq","hash","check","status","sortBy","or"]}',meta:{moduleName:"consul-ui/templates/dc/services/instance/healthchecks.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/instance/metadata",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"qT0uOojO",block:'{"symbols":["route","item"],"statements":[[8,"route",[],[["@name"],[[34,3]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,4],[[32,1,["model","item"]]],null,[["default"],[{"statements":[[2,"  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n      "],[10,"section"],[14,0,"tags"],[12],[2,"\\n        "],[10,"h2"],[12],[2,"Tags"],[13],[2,"\\n"],[6,[37,2],[[30,[36,1],[[32,2,["Tags","length"]],0],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"tag-list",[],[["@item"],[[32,2]]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              There are no tags.\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n      "],[10,"section"],[14,0,"metadata"],[12],[2,"\\n        "],[10,"h2"],[12],[2,"Meta"],[13],[2,"\\n"],[6,[37,2],[[32,2,["Meta"]]],null,[["default","else"],[{"statements":[[2,"        "],[8,"consul/metadata/list",[],[["@items"],[[30,[36,0],[[32,2,["Meta"]]],null]]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              This instance has no metadata.\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[2]}]]]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["entries","gt","if","routeName","let"]}',meta:{moduleName:"consul-ui/templates/dc/services/instance/metadata.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/instance/upstreams",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"E9rUcBLq",block:'{"symbols":["route","sort","filters","partition","nspace","dc","proxy","meta","items","collection","notice"],"statements":[[8,"route",[],[["@name"],[[34,8]]],[["default"],[{"statements":[[2,"\\n  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n"],[6,[37,15],[[30,[36,13],null,[["value","change"],[[30,[36,9],[[35,14],"DestinationName:asc"],null],[30,[36,3],[[32,0],[30,[36,2],[[35,14]],null]],[["value"],["target.selected"]]]]]],[30,[36,13],null,[["searchproperty"],[[30,[36,13],null,[["value","change","default"],[[30,[36,6],[[30,[36,12],[[35,10],[29]],null],[30,[36,11],[[35,10],","],null],[35,4]],null],[30,[36,3],[[32,0],[30,[36,2],[[35,10]],null]],[["value"],["target.selectedItems"]]],[35,4]]]]]]],[30,[36,9],[[32,1,["params","partition"]],[32,1,["model","user","token","Partition"]],"default"],null],[30,[36,9],[[32,1,["params","nspace"]],[32,1,["model","user","token","Namespace"]],"default"],null],[32,1,["params","dc"]],[32,1,["model","proxy"]],[32,1,["model","meta"]],[32,1,["model","proxy","Service","Proxy","Upstreams"]]],null,[["default"],[{"statements":[[6,[37,6],[[30,[36,5],[[32,9,["length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[2,"\\n        "],[8,"consul/upstream-instance/search-bar",[],[["@search","@onsearch","@searchproperties","@sort","@filter"],[[34,1],[30,[36,3],[[32,0],[30,[36,2],[[35,1]],null]],[["value"],["target.value"]]],[34,4],[32,2],[32,3]]],null],[2,"\\n"]],"parameters":[]}]]],[6,[37,6],[[30,[36,7],[[32,8,["ServiceProxy","Mode"]],"transparent"],null]],null,[["default"],[{"statements":[[2,"        "],[8,"notice",[],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,11,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"h3"],[12],[2,"\\n              "],[1,[30,[36,0],["routes.dc.services.instance.upstreams.tproxy-mode.header"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,11,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],["routes.dc.services.instance.upstreams.tproxy-mode.body"],[["htmlSafe"],[true]]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,11,["Footer"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],["routes.dc.services.instance.upstreams.tproxy-mode.footer"],[["htmlSafe"],[true]]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[11]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["upstream-instance",[32,2,["value"]],[32,3],[34,1],[32,9]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,10,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"consul/upstream-instance/list",[],[["@items","@dc","@nspace","@partition"],[[32,10,["items"]],[32,6],[32,5],[32,4]]],null],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,10,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,0],["routes.dc.services.instance.upstreams.empty"],[["items","htmlSafe"],[[32,9,["length"]],true]]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[10]}]]],[2,"\\n"]],"parameters":[2,3,4,5,6,7,8,9]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["t","search","mut","action","searchProperties","gt","if","eq","routeName","or","searchproperty","split","not-eq","hash","sortBy","let"]}',meta:{moduleName:"consul-ui/templates/dc/services/instance/upstreams.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/show",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"+YTjbG+A",block:'{"symbols":["route","loader","items","item","dc","tabs","o","config","status","type","item","error","after","notice","notice","notice"],"statements":[[8,"route",[],[["@name"],[[34,0]]],[["default"],[{"statements":[[2,"\\n    "],[8,"data-loader",[],[["@src"],[[30,[36,14],["/${partition}/${nspace}/${dc}/service-instances/for-service/${name}",[30,[36,2],null,[["partition","nspace","dc","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","name"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n      "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n        "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n\\n      "],[8,"block-slot",[],[["@name"],["disconnected"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,10],[[30,[36,23],[[32,2,["error","status"]],"404"],null]],null,[["default","else"],[{"statements":[[2,"          "],[8,"notice",[[24,0,"notification-update"],[4,[38,26],null,[["sticky"],[true]]]],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,16,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"strong"],[12],[2,"Warning!"],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,[32,16,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"p"],[12],[2,"\\n                This service has been deregistered and no longer exists in the catalog.\\n              "],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[16]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,10],[[30,[36,23],[[32,2,["error","status"]],"403"],null]],null,[["default","else"],[{"statements":[[2,"          "],[8,"notice",[[24,0,"notification-update"],[4,[38,26],null,[["sticky"],[true]]]],[["@type"],["error"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,15,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"strong"],[12],[2,"Error!"],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,[32,15,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"p"],[12],[2,"\\n                You no longer have access to this service\\n              "],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[15]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          "],[8,"notice",[[24,0,"notification-update"],[4,[38,26],null,[["sticky"],[true]]]],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n            "],[8,[32,14,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"strong"],[12],[2,"Warning!"],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n            "],[8,[32,14,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[10,"p"],[12],[2,"\\n                An error was returned whilst loading this data, refresh to try again.\\n              "],[13],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[14]}]]],[2,"\\n        "]],"parameters":[]}]]]],"parameters":[]}]]],[2,"      "]],"parameters":[13]}]]],[2,"\\n\\n      "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,25],[[32,2,["data"]],[32,2,["data","firstObject"]],[32,1,["model","dc"]]],null,[["default"],[{"statements":[[2,"\\n"],[6,[37,10],[[32,4,["IsOrigin"]]],null,[["default"],[{"statements":[[2,"      "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,14],["/${partition}/${nspace}/${dc}/proxies/for-service/${name}",[30,[36,2],null,[["partition","nspace","dc","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","name"]]]]]],null],[30,[36,18],[[32,0],[30,[36,17],[[35,1]],null]],[["value"],["data"]]]]],null],[2,"\\n"],[6,[37,10],[[30,[36,16],[[35,15]],null]],null,[["default"],[{"statements":[[2,"          "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,14],["/${partition}/${nspace}/${dc}/discovery-chain/${name}",[30,[36,2],null,[["partition","nspace","dc","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","name"]]]]]],null],[30,[36,18],[[32,0],[30,[36,17],[[35,15]],null]],[["value"],["data"]]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[1,[30,[36,20],[[30,[36,19],[[32,0],"chain",[29]],null],[32,1,["params","dc"]]],null]],[2,"\\n"]],"parameters":[]}]]],[6,[37,25],[[30,[36,2],null,[["topology","services","upstreams","instances","intentions","routing","tags"],[[30,[36,21],[[32,5,["MeshEnabled"]],[32,4,["IsMeshOrigin"]],[30,[36,6],[[30,[36,24],[[35,1,["length"]],0],null],[30,[36,23],[[32,4,["Service","Kind"]],"ingress-gateway"],null]],null]],null],[30,[36,23],[[32,4,["Service","Kind"]],"terminating-gateway"],null],[30,[36,23],[[32,4,["Service","Kind"]],"ingress-gateway"],null],true,[30,[36,21],[[30,[36,13],[[32,4,["Service","Kind"]],"terminating-gateway"],null],[30,[36,22],["read intention for service"],[["item"],[[32,4,["Service"]]]]]],null],[30,[36,21],[[32,5,["MeshEnabled"]],[32,4,["IsOrigin"]]],null],true]]]],null,[["default"],[{"statements":[[2,"        "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["notification"]],[["default"],[{"statements":[[2,"\\n            "],[8,"topology-metrics/notifications",[],[["@type","@status","@error"],[[32,10],[32,9],[32,12]]],null],[2,"\\n          "]],"parameters":[9,10,11,12]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["breadcrumbs"]],[["default"],[{"statements":[[2,"\\n            "],[10,"ol"],[12],[2,"\\n                "],[10,"li"],[12],[10,"a"],[15,6,[30,[36,9],["dc.services"],null]],[12],[2,"All Services"],[13],[13],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n              "],[10,"h1"],[12],[2,"\\n                "],[8,[32,1,["Title"]],[],[["@title"],[[32,4,["Service","Service"]]]],null],[2,"\\n              "],[13],[2,"\\n              "],[8,"consul/external-source",[],[["@item","@withInfo"],[[32,4,["Service"]],true]],null],[2,"\\n              "],[8,"consul/kind",[],[["@item","@withInfo"],[[32,4,["Service"]],true]],null],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["nav"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,10],[[30,[36,13],[[32,4,["Service","Kind"]],"mesh-gateway"],null]],null,[["default"],[{"statements":[[2,"              "],[8,"tab-nav",[],[["@items"],[[30,[36,12],[[30,[36,11],[[30,[36,10],[[32,6,["topology"]],[30,[36,2],null,[["label","href","selected"],["Topology",[30,[36,9],["dc.services.show.topology"],null],[30,[36,8],["dc.services.show.topology"],null]]]],""],null],[30,[36,10],[[32,6,["services"]],[30,[36,2],null,[["label","href","selected"],["Linked Services",[30,[36,9],["dc.services.show.services"],null],[30,[36,8],["dc.services.show.services"],null]]]],""],null],[30,[36,10],[[32,6,["upstreams"]],[30,[36,2],null,[["label","href","selected"],["Upstreams",[30,[36,9],["dc.services.show.upstreams"],null],[30,[36,8],["dc.services.show.upstreams"],null]]]],""],null],[30,[36,10],[[32,6,["instances"]],[30,[36,2],null,[["label","href","selected"],["Instances",[30,[36,9],["dc.services.show.instances"],null],[30,[36,8],["dc.services.show.instances"],null]]]],""],null],[30,[36,10],[[32,6,["intentions"]],[30,[36,2],null,[["label","href","selected"],["Intentions",[30,[36,9],["dc.services.show.intentions"],null],[30,[36,8],["dc.services.show.intentions"],null]]]],""],null],[30,[36,10],[[32,6,["routing"]],[30,[36,2],null,[["label","href","selected"],["Routing",[30,[36,9],["dc.services.show.routing"],null],[30,[36,8],["dc.services.show.routing"],null]]]],""],null],[30,[36,10],[[32,6,["tags"]],[30,[36,2],null,[["label","href","selected"],["Tags",[30,[36,9],["dc.services.show.tags"],null],[30,[36,8],["dc.services.show.tags"],null]]]],""],null]],null]],null]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n            "],[8,"data-source",[],[["@src"],[[30,[36,14],["/${partition}/${nspace}/${dc}/ui-config",[30,[36,2],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,10],[[32,8,["data","dashboard_url_templates","service"]]],null,[["default"],[{"statements":[[2,"              "],[8,"action",[[24,0,"external-dashboard"]],[["@href","@external"],[[30,[36,7],[[32,8,["data","dashboard_url_templates","service"]],[30,[36,2],null,[["Datacenter","Service"],[[32,5,["Name"]],[30,[36,2],null,[["Name","Namespace","Partition"],[[32,4,["Service","Service"]],[30,[36,6],[[32,4,["Service","Namespace"]],""],null],[30,[36,6],[[32,4,["Service","Partition"]],""],null]]]]]]]],null],true]],[["default"],[{"statements":[[2,"\\n                Open dashboard\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"            "]],"parameters":[8]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,10],[[30,[36,6],[[30,[36,16],[[32,4,["IsOrigin"]]],null],[35,15]],null]],null,[["default"],[{"statements":[[2,"            "],[8,"outlet",[],[["@name","@model"],[[34,0],[30,[36,3],[[30,[36,2],null,[["items","proxies","item","tabs"],[[32,3],[35,1],[32,4],[32,6]]]],[32,1,["model"]]],null]]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,5],[[30,[36,4],null,null]],null]],[2,"\\n            "]],"parameters":[7]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[6]}]]]],"parameters":[3,4,5]}]]],[2,"      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["routeName","proxies","hash","assign","-outlet","component","or","render-template","is-href","href-to","if","array","compact","not-eq","uri","chain","not","mut","action","set","did-insert","and","can","eq","gt","let","notification"]}',meta:{moduleName:"consul-ui/templates/dc/services/show.hbs"}})
+e.default=t}))
+define("consul-ui/templates/dc/services/show/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"awAzFj0u",block:'{"symbols":["route"],"statements":[[8,"route",[],[["@name"],[[34,3]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,2],[[32,1,["model","tabs","topology"]]],null,[["default","else"],[{"statements":[[2,"  "],[1,[30,[36,1],[[30,[36,0],["replaceWith","dc.services.show.topology"],null]],null]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,2],[[32,1,["model","tabs","upstreams"]]],null,[["default","else"],[{"statements":[[2,"  "],[1,[30,[36,1],[[30,[36,0],["replaceWith","dc.services.show.upstreams"],null]],null]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,2],[[32,1,["model","tabs","services"]]],null,[["default","else"],[{"statements":[[2,"  "],[1,[30,[36,1],[[30,[36,0],["replaceWith","dc.services.show.services"],null]],null]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"  "],[1,[30,[36,1],[[30,[36,0],["replaceWith","dc.services.show.instances"],null]],null]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["route-action","did-insert","if","routeName"]}',meta:{moduleName:"consul-ui/templates/dc/services/show/index.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/show/instances",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"13/W51mM",block:'{"symbols":["route","sort","filters","items","proxyMeta","collection"],"statements":[[8,"route",[],[["@name"],[[34,11]]],[["default"],[{"statements":[[2,"\\n"],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n"],[6,[37,20],[[30,[36,0],null,[["value","change"],[[30,[36,19],[[35,18],"Status:asc"],null],[30,[36,4],[[32,0],[30,[36,3],[[35,18]],null]],[["value"],["target.selected"]]]]]],[30,[36,0],null,[["status","source","searchproperty"],[[30,[36,0],null,[["value","change"],[[30,[36,9],[[35,17],[30,[36,14],[[35,17],","],null],[29]],null],[30,[36,4],[[32,0],[30,[36,3],[[35,17]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,0],null,[["value","change"],[[30,[36,9],[[35,16],[30,[36,14],[[35,16],","],null],[29]],null],[30,[36,4],[[32,0],[30,[36,3],[[35,16]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,0],null,[["value","change","default"],[[30,[36,9],[[30,[36,15],[[35,13],[29]],null],[30,[36,14],[[35,13],","],null],[35,12]],null],[30,[36,4],[[32,0],[30,[36,3],[[35,13]],null]],[["value"],["target.selectedItems"]]],[35,12]]]]]]],[32,1,["model","items"]],[32,1,["model","proxies","firstObject"]]],null,[["default"],[{"statements":[[6,[37,9],[[30,[36,8],[[32,4,["length"]],0],null]],null,[["default"],[{"statements":[[2,"    "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[2,"\\n    "],[8,"consul/service-instance/search-bar",[],[["@sources","@search","@onsearch","@sort","@filter"],[[30,[36,6],[[30,[36,5],[[32,4]],null],"ExternalSources"],null],[34,7],[30,[36,4],[[32,0],[30,[36,3],[[35,7]],null]],[["value"],["target.value"]]],[32,2],[32,3]]],null],[2,"\\n"]],"parameters":[]}]]],[6,[37,9],[[32,5,["ServiceName"]]],null,[["default"],[{"statements":[[2,"      "],[8,"data-source",[],[["@src","@onchange"],[[30,[36,1],["/${partition}/${nspace}/${dc}/service-instances/for-service/${name}",[30,[36,0],null,[["partition","nspace","dc","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,5,["ServiceName"]]]]]],null],[30,[36,4],[[32,0],[30,[36,3],[[35,2]],null]],[["value"],["data"]]]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["service-instance",[32,2,["value"]],[32,3],[34,7],[32,4]]],[["default"],[{"statements":[[2,"\\n      "],[8,[32,6,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[8,"consul/service-instance/list",[],[["@routeName","@items","@proxies"],["dc.services.instance",[32,6,["items"]],[34,2]]],null],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n      "],[8,[32,6,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,10],["routes.dc.services.show.instances.empty"],[["items","htmlSafe"],[[32,4,["length"]],true]]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n    "]],"parameters":[6]}]]],[2,"\\n"]],"parameters":[2,3,4,5]}]]],[13],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["hash","uri","proxies","mut","action","collection","get","search","gt","if","t","routeName","searchProperties","searchproperty","split","not-eq","source","status","sortBy","or","let"]}',meta:{moduleName:"consul-ui/templates/dc/services/show/instances.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/show/intentions",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"JedXDjTs",block:'{"symbols":["route","o"],"statements":[[8,"route",[],[["@name"],[[34,0]]],[["default"],[{"statements":[[2,"\\n  "],[8,"outlet",[],[["@name","@model"],[[34,0],[32,1,["model"]]]],[["default"],[{"statements":[[2,"\\n    "],[1,[30,[36,2],[[30,[36,1],null,null]],null]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["routeName","-outlet","component"]}',meta:{moduleName:"consul-ui/templates/dc/services/show/intentions.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/show/intentions/edit",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"5Aptuf+o",block:'{"symbols":["route","readOnly","loader","item"],"statements":[[8,"route",[],[["@name"],[[34,5]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,4],[[30,[36,8],[[30,[36,7],["write intention for service"],[["item"],[[35,6,["Service"]]]]]],null]],null,[["default"],[{"statements":[[2,"  "],[8,"data-loader",[],[["@src"],[[30,[36,3],["/${partition}/${nspace}/${dc}/intention/${id}",[30,[36,0],null,[["partition","nspace","dc","id"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[30,[36,2],[[32,1,["params","intention_id"]],""],null]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n        "],[8,"error-state",[],[["@error","@login"],[[32,3,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,4],[[32,3,["data"]]],null,[["default"],[{"statements":[[2,"        "],[8,"consul/intention/form",[],[["@readonly","@item","@dc","@nspace","@partition","@autofill","@onsubmit"],[[32,2],[32,4],[32,1,["model","dc"]],[32,1,["params","nspace"]],[32,1,["params","partition"]],[30,[36,0],null,[["DestinationName"],[[32,1,["params","name"]]]]],[30,[36,1],["dc.services.show.intentions.index"],null]]],null],[2,"\\n"]],"parameters":[4]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3]}]]],[2,"\\n"]],"parameters":[2]}]]]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["hash","transition-to","or","uri","let","routeName","item","can","not"]}',meta:{moduleName:"consul-ui/templates/dc/services/show/intentions/edit.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/show/intentions/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"YEgUH4GU",block:'{"symbols":["route","api","sort","filters","items","item","writer","collection","list"],"statements":[[8,"route",[],[["@name"],[[34,12]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,8],["/${partition}/${nspace}/${dc}/intentions/for-service/${slug}",[30,[36,7],null,[["partition","nspace","dc","slug"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","name"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"error-state",[],[["@error"],[[32,2,["error"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,20],[[30,[36,7],null,[["value","change"],[[30,[36,19],[[35,18],"Action:asc"],null],[30,[36,2],[[32,0],[30,[36,1],[[35,18]],null]],[["value"],["target.selected"]]]]]],[30,[36,7],null,[["access","searchproperty"],[[30,[36,7],null,[["value","change"],[[30,[36,5],[[35,17],[30,[36,15],[[35,17],","],null],[29]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,17]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,7],null,[["value","change","default"],[[30,[36,5],[[30,[36,16],[[35,14],[29]],null],[30,[36,15],[[35,14],","],null],[35,13]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,14]],null]],[["value"],["target.selectedItems"]]],[35,13]]]]]]],[32,2,["data"]],[32,1,["model","item"]]],null,[["default"],[{"statements":[[2,"    "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n"],[6,[37,5],[[30,[36,4],["create intention for service"],[["item"],[[32,6,["Service"]]]]]],null,[["default"],[{"statements":[[2,"        "],[8,"portal",[],[["@target"],["app-view-actions"]],[["default"],[{"statements":[[2,"\\n          "],[10,"a"],[15,6,[30,[36,3],["dc.services.show.intentions.create"],null]],[14,0,"type-create"],[12],[2,"Create"],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[6,[37,5],[[30,[36,6],[[32,5,["length"]],0],null]],null,[["default"],[{"statements":[[2,"        "],[8,"consul/intention/search-bar",[],[["@search","@onsearch","@sort","@filter"],[[34,0],[30,[36,2],[[32,0],[30,[36,1],[[35,0]],null]],[["value"],["target.value"]]],[32,3],[32,4]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[8,"data-writer",[],[["@sink","@type","@ondelete"],[[30,[36,8],["/${partition}/${dc}/${nspace}/intention/",[30,[36,7],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null],"intention",[34,9]]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n            "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["intention",[32,3,["value"]],[32,4],[34,0],[32,5]]],[["default"],[{"statements":[[2,"\\n              "],[8,[32,8,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                "],[8,"consul/intention/list",[],[["@items","@check","@delete"],[[32,8,["items"]],[34,0],[32,7,["delete"]]]],[["default"],[{"statements":[[2,"\\n                  "],[8,[32,9,["CustomResourceNotice"]],[],[[],[]],null],[2,"\\n                  "],[8,[32,9,["CheckNotice"]],[],[[],[]],null],[2,"\\n                  "],[8,[32,9,["Table"]],[],[["@routeName"],["dc.services.show.intentions.edit"]],null],[2,"\\n                "]],"parameters":[9]}]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n              "],[8,[32,8,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                "],[8,"empty-state",[],[["@login"],[[32,1,["model","app","login","open"]]]],[["default"],[{"statements":[[2,"\\n                  "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n                    "],[10,"h2"],[12],[2,"\\n                      "],[1,[30,[36,10],["routes.dc.services.intentions.index.empty.header"],[["items"],[[32,5,["length"]]]]]],[2,"\\n                    "],[13],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                  "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                    "],[1,[30,[36,10],["routes.dc.services.intentions.index.empty.body"],[["items","htmlSafe"],[[32,5,["length"]],true]]]],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                  "],[8,"block-slot",[],[["@name"],["actions"]],[["default"],[{"statements":[[2,"\\n                    "],[10,"li"],[14,0,"docs-link"],[12],[2,"\\n                      "],[10,"a"],[15,6,[31,[[30,[36,11],["CONSUL_DOCS_URL"],null],"/commands/intention"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Documentation on intentions"],[13],[2,"\\n                    "],[13],[2,"\\n                    "],[10,"li"],[14,0,"learn-link"],[12],[2,"\\n                      "],[10,"a"],[15,6,[31,[[30,[36,11],["CONSUL_DOCS_LEARN_URL"],null],"/consul/getting-started/connect"]]],[14,"rel","noopener noreferrer"],[14,"target","_blank"],[12],[2,"Take the tutorial"],[13],[2,"\\n                    "],[13],[2,"\\n                  "]],"parameters":[]}]]],[2,"\\n                "]],"parameters":[]}]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[8]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[7]}]]],[2,"\\n    "],[13],[2,"\\n"]],"parameters":[3,4,5,6]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["search","mut","action","href-to","can","if","gt","hash","uri","refresh-route","t","env","routeName","searchProperties","searchproperty","split","not-eq","access","sortBy","or","let"]}',meta:{moduleName:"consul-ui/templates/dc/services/show/intentions/index.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/show/routing",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"ECmVG/5P",block:'{"symbols":["route","loader"],"statements":[[8,"route",[],[["@name"],[[34,0]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,2],["/${partition}/${nspace}/${dc}/discovery-chain/${name}",[30,[36,1],null,[["partition","nspace","dc","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","name"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n      "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n        "],[8,"consul/discovery-chain",[],[["@chain"],[[32,2,["data","Chain"]]]],null],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["routeName","hash","uri"]}',meta:{moduleName:"consul-ui/templates/dc/services/show/routing.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/show/services",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"I2O7WlJO",block:'{"symbols":["route","loader","sort","filters","items","collection"],"statements":[[8,"route",[],[["@name"],[[34,7]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,9],["/${partition}/${nspace}/${dc}/gateways/for-service/${name}",[30,[36,8],null,[["partition","nspace","dc","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","name"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n"],[6,[37,16],[[30,[36,8],null,[["value","change"],[[30,[36,6],[[35,15],"Status:asc"],null],[30,[36,2],[[32,0],[30,[36,1],[[35,15]],null]],[["value"],["target.selected"]]]]]],[30,[36,8],null,[["instance","searchproperty"],[[30,[36,8],null,[["value","change"],[[30,[36,4],[[35,14],[30,[36,12],[[35,14],","],null],[29]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,14]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,8],null,[["value","change","default"],[[30,[36,4],[[30,[36,13],[[35,11],[29]],null],[30,[36,12],[[35,11],","],null],[35,10]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,11]],null]],[["value"],["target.selectedItems"]]],[35,10]]]]]]],[32,2,["data"]]],null,[["default"],[{"statements":[[6,[37,4],[[30,[36,3],[[32,5,["length"]],0],null]],null,[["default"],[{"statements":[[2,"      "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[2,"\\n      "],[8,"consul/upstream/search-bar",[],[["@search","@onsearch","@sort","@filter"],[[34,0],[30,[36,2],[[32,0],[30,[36,1],[[35,0]],null]],[["value"],["target.value"]]],[32,3],[32,4]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["service",[32,3,["value"]],[32,4],[34,0],[32,5]]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,6,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[1,[30,[36,5],["routes.dc.services.show.services.intro"],[["htmlSafe"],[true]]]],[2,"\\n          "],[8,"consul/service/list",[],[["@nspace","@partition","@items"],[[30,[36,6],[[32,1,["params","nspace"]],[32,1,["model","user","token","Namespace"]],"default"],null],[30,[36,6],[[32,1,["params","partition"]],[32,1,["model","user","token","Partition"]],"default"],null],[32,6,["items"]]]],[["default"],[{"statements":[[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,6,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,5],["routes.dc.services.show.services.empty"],[["items","htmlSafe"],[[32,5,["length"]],true]]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[6]}]]],[2,"\\n"]],"parameters":[3,4,5]}]]],[2,"  "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["search","mut","action","gt","if","t","or","routeName","hash","uri","searchProperties","searchproperty","split","not-eq","instance","sortBy","let"]}',meta:{moduleName:"consul-ui/templates/dc/services/show/services.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/show/tags",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"6gutQsyo",block:'{"symbols":["route","tags"],"statements":[[8,"route",[],[["@name"],[[34,4]]],[["default"],[{"statements":[[2,"\\n  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n"],[6,[37,7],[[30,[36,6],[[30,[36,5],["Tags",[32,1,["model","items"]]],null]],null]],null,[["default"],[{"statements":[[6,[37,3],[[30,[36,2],[[32,2,["length"]],0],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"tag-list",[],[["@item"],[[30,[36,1],null,[["Tags"],[[32,2]]]]]],null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n            "],[10,"h2"],[12],[2,"\\n              "],[1,[30,[36,0],["routes.dc.services.show.tags.empty.header"],null]],[2,"\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n            "],[1,[30,[36,0],["routes.dc.services.show.tags.empty.body"],[["htmlSafe"],[true]]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[2]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["t","hash","gt","if","routeName","map-by","flatten","let"]}',meta:{moduleName:"consul-ui/templates/dc/services/show/tags.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/show/topology",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"YIp1h+g1",block:'{"symbols":["route","loader","nspace","dc","items","topology","config","disclosure","notices","noticesEnabled","enabled","prop","details","notice","footer"],"statements":[[8,"route",[],[["@name"],[[34,24]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,23],["/${partition}/${nspace}/${dc}/topology/${name}/${kind}",[30,[36,1],null,[["partition","nspace","dc","name","kind"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","name"]],[30,[36,0],[[32,1,["model","items","firstObject","Service","Kind"]],""],null]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,15],[[32,1,["params","nspace"]],[32,1,["model","dc"]],[32,1,["model","items"]],[32,2,["data"]]],null,[["default"],[{"statements":[[2,"  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n\\n    "],[10,"div"],[14,0,"topology-notices"],[12],[2,"\\n      "],[8,"disclosure",[],[["@expanded"],[true]],[["default"],[{"statements":[[2,"\\n"],[6,[37,15],[[30,[36,22],[[30,[36,12],[[30,[36,12],["filtered-by-acls",[30,[36,0],[false,[32,6,["FilteredByACLs"]]],null]],null],[30,[36,12],["default-allow",[30,[36,0],[false,[30,[36,21],[[32,4,["DefaultACLPolicy"]],"allow"],null]],null]],null],[30,[36,12],["wildcard-intention",[30,[36,0],[false,[32,6,["wildcardIntention"]]],null]],null],[30,[36,12],["not-defined-intention",[30,[36,0],[false,[32,6,["notDefinedIntention"]]],null]],null],[30,[36,12],["no-dependencies",[30,[36,0],[false,[30,[36,11],[[32,6,["noDependencies"]],[30,[36,20],["use acls"],null]],null]],null]],null],[30,[36,12],["acls-disabled",[30,[36,0],[false,[30,[36,11],[[32,6,["noDependencies"]],[30,[36,3],[[30,[36,20],["use acls"],null]],null]],null]],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"\\n"],[6,[37,15],[[30,[36,19],[false,[30,[36,18],[[32,9]],null]],null]],null,[["default"],[{"statements":[[2,"\\n"],[6,[37,17],[[30,[36,16],[[32,9]],null]],null,[["default"],[{"statements":[[6,[37,7],[[32,11]],null,[["default"],[{"statements":[[2,"                "],[8,[32,8,["Details"]],[],[["@auto"],[false]],[["default"],[{"statements":[[2,"\\n                  "],[8,"notice",[[24,0,"topology-metrics-notice"],[16,1,[32,13,["id"]]]],[["@type"],[[30,[36,7],[[30,[36,13],[[32,12],[30,[36,12],["filtered-by-acls","no-dependencies"],null]],null],"info","warning"],null]]],[["default"],[{"statements":[[2,"\\n                    "],[8,[32,14,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                      "],[10,"h3"],[12],[2,"\\n                        "],[1,[30,[36,9],[[30,[36,8],[[32,1,["t"]],"notice.${prop}.header",[30,[36,1],null,[["prop"],[[32,12]]]]],null]],null]],[2,"\\n                      "],[13],[2,"\\n                    "]],"parameters":[]}]]],[2,"\\n"],[6,[37,7],[[32,8,["expanded"]]],null,[["default"],[{"statements":[[2,"                      "],[8,[32,14,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                        "],[10,"p"],[12],[2,"\\n                          "],[1,[30,[36,9],[[30,[36,8],[[32,1,["t"]],"notice.${prop}.body",[30,[36,1],null,[["prop"],[[32,12]]]]],null]],null]],[2,"\\n                        "],[13],[2,"\\n                      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[6,[37,15],[[30,[36,9],[[30,[36,8],[[32,1,["t"]],"notice.${prop}.footer",[30,[36,1],null,[["route_intentions","prop","htmlSafe"],[[30,[36,14],["dc.services.show.intentions"],null],[32,12],true]]]],null]],null]],null,[["default"],[{"statements":[[6,[37,7],[[30,[36,11],[[32,8,["expanded"]],[30,[36,10],[[32,12],"filtered-by-acls"],null]],null]],null,[["default"],[{"statements":[[2,"                        "],[8,[32,14,["Footer"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n                          "],[1,[32,15]],[2,"\\n                        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[15]}]]],[2,"                  "]],"parameters":[14]}]]],[2,"\\n                "]],"parameters":[13]}]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[11,12]}]]],[2,"\\n"],[6,[37,7],[[30,[36,4],[[32,10,["length"]],2],null]],null,[["default"],[{"statements":[[2,"              "],[8,[32,8,["Action"]],[[4,[38,6],["click",[32,8,["toggle"]]],null]],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[1,[30,[36,9],[[30,[36,8],[[32,1,["t"]],"notices.${expanded}",[30,[36,1],null,[["expanded"],[[30,[36,7],[[32,8,["expanded"]],"close","open"],null]]]]],null]],null]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"]],"parameters":[10]}]]]],"parameters":[9]}]]],[2,"      "]],"parameters":[8]}]]],[2,"\\n\\n    "],[13],[2,"\\n\\n\\n    "],[8,"data-source",[],[["@src"],[[30,[36,23],["/${partition}/${nspace}/${dc}/ui-config",[30,[36,1],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,7],[[32,7,["data"]]],null,[["default"],[{"statements":[[2,"\\n      "],[8,"topology-metrics",[],[["@nspace","@dc","@service","@topology","@metricsHref","@isRemoteDC","@hasMetricsProvider","@oncreate"],[[32,3],[32,4],[32,5,["firstObject"]],[32,6],[30,[36,2],[[32,7,["data","dashboard_url_templates","service"]],[30,[36,1],null,[["Datacenter","Service"],[[32,4,["Name"]],[30,[36,1],null,[["Name","Namespace","Partition"],[[32,5,["firstObject","Name"]],[30,[36,0],[[32,5,["firstObject","Namespace"]],""],null],[30,[36,0],[[32,5,["firstObject","Partition"]],""],null]]]]]]]],null],[30,[36,3],[[32,4,["Local"]]],null],[30,[36,4],[[32,7,["data","metrics_provider","length"]],0],null],[30,[36,5],["createIntention"],null]]],null],[2,"\\n\\n"]],"parameters":[]}]]],[2,"    "]],"parameters":[7]}]]],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[3,4,5,6]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["or","hash","render-template","not","gt","route-action","on","if","fn","compute","not-eq","and","array","contains","href-to","let","-each-in","each","values","without","can","eq","from-entries","uri","routeName"]}',meta:{moduleName:"consul-ui/templates/dc/services/show/topology.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/services/show/upstreams",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"G1oiIhX0",block:'{"symbols":["route","loader","sort","filters","partition","nspace","dc","items","collection"],"statements":[[8,"route",[],[["@name"],[[34,6]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,8],["/${partition}/${nspace}/${dc}/gateways/for-service/${name}",[30,[36,7],null,[["partition","nspace","dc","name"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]],[32,1,["params","name"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n  "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n"],[6,[37,16],[[30,[36,7],null,[["value","change"],[[30,[36,9],[[35,15],"Status:asc"],null],[30,[36,2],[[32,0],[30,[36,1],[[35,15]],null]],[["value"],["target.selected"]]]]]],[30,[36,7],null,[["instance","searchproperty"],[[30,[36,7],null,[["value","change"],[[30,[36,4],[[35,14],[30,[36,12],[[35,14],","],null],[29]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,14]],null]],[["value"],["target.selectedItems"]]]]]],[30,[36,7],null,[["value","change","default"],[[30,[36,4],[[30,[36,13],[[35,11],[29]],null],[30,[36,12],[[35,11],","],null],[35,10]],null],[30,[36,2],[[32,0],[30,[36,1],[[35,11]],null]],[["value"],["target.selectedItems"]]],[35,10]]]]]]],[30,[36,9],[[32,1,["params","partition"]],[32,1,["model","user","token","Partition"]],"default"],null],[30,[36,9],[[32,1,["params","nspace"]],[32,1,["model","user","token","Namespace"]],"default"],null],[32,1,["params","dc"]],[32,2,["data"]]],null,[["default"],[{"statements":[[6,[37,4],[[30,[36,3],[[32,8,["length"]],0],null]],null,[["default"],[{"statements":[[2,"      "],[10,"input"],[14,1,"toolbar-toggle"],[14,4,"checkbox"],[12],[13],[2,"\\n      "],[8,"consul/upstream/search-bar",[],[["@search","@onsearch","@sort","@filter"],[[34,0],[30,[36,2],[[32,0],[30,[36,1],[[35,0]],null]],[["value"],["target.value"]]],[32,3],[32,4]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"        "],[1,[30,[36,5],["routes.dc.services.show.upstreams.intro"],[["htmlSafe"],[true]]]],[2,"\\n        "],[8,"data-collection",[],[["@type","@sort","@filters","@search","@items"],["service",[32,3,["value"]],[32,4],[34,0],[32,8]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,9,["Collection"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"consul/upstream/list",[],[["@items","@dc","@nspace","@partition"],[[32,9,["items"]],[32,7],[32,6],[32,5]]],[["default"],[{"statements":[[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,9,["Empty"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[8,"empty-state",[],[[],[]],[["default"],[{"statements":[[2,"\\n              "],[8,"block-slot",[],[["@name"],["body"]],[["default"],[{"statements":[[2,"\\n                "],[1,[30,[36,5],["routes.dc.services.show.upstreams.empty"],[["items","htmlSafe"],[[32,8,["length"]],true]]]],[2,"\\n              "]],"parameters":[]}]]],[2,"\\n            "]],"parameters":[]}]]],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[9]}]]],[2,"\\n"]],"parameters":[3,4,5,6,7,8]}]]],[2,"  "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["search","mut","action","gt","if","t","routeName","hash","uri","or","searchProperties","searchproperty","split","not-eq","instance","sortBy","let"]}',meta:{moduleName:"consul-ui/templates/dc/services/show/upstreams.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/show",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"l00QFa3D",block:'{"symbols":["route","o","tabs","tabsEnabled"],"statements":[[8,"route",[],[["@name"],[[34,12]]],[["default"],[{"statements":[[2,"\\n  "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n      "],[10,"h1"],[12],[2,"\\n        "],[8,[32,1,["Title"]],[],[["@title"],[[30,[36,3],[[30,[36,2],[[32,1,["t"]],"title"],null]],null]]],null],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["toolbar"]],[["default"],[{"statements":[[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["nav"]],[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,11],[[30,[36,14],[[30,[36,6],[[30,[36,6],["serverstatus",true],null],[30,[36,6],["cataloghealth",false],null],[30,[36,6],["license",[30,[36,13],["read license"],null]],null]],null]],null]],null,[["default"],[{"statements":[[2,"\\n"],[6,[37,11],[[30,[36,10],[false,[30,[36,9],[[32,3]],null]],null]],null,[["default"],[{"statements":[[2,"\\n"],[6,[37,5],[[30,[36,8],[[32,4,["length"]],1],null]],null,[["default"],[{"statements":[[2,"      "],[8,"tab-nav",[],[["@items"],[[30,[36,7],[[30,[36,6],[[30,[36,5],[[32,3,["serverstatus"]],[30,[36,4],null,[["label","href","selected"],[[30,[36,3],[[30,[36,2],[[32,1,["t"]],"serverstatus.title"],null]],null],[30,[36,1],["dc.show.serverstatus"],null],[30,[36,0],["dc.show.serverstatus"],null]]]],""],null],[30,[36,5],[[32,3,["cataloghealth"]],[30,[36,4],null,[["label","href","selected"],[[30,[36,3],[[30,[36,2],[[32,1,["t"]],"cataloghealth.title"],null]],null],[30,[36,1],["dc.show.cataloghealth"],null],[30,[36,0],["dc.show.cataloghealth"],null]]]],""],null],[30,[36,5],[[32,3,["license"]],[30,[36,4],null,[["label","href","selected"],[[30,[36,3],[[30,[36,2],[[32,1,["t"]],"license.title"],null]],null],[30,[36,1],["dc.show.license"],null],[30,[36,0],["dc.show.license"],null]]]]],null],""],null]],null]]],null],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"]],"parameters":[4]}]]]],"parameters":[3]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n      "],[8,"outlet",[],[["@name","@model"],[[34,12],[32,1,["model"]]]],[["default"],[{"statements":[[2,"\\n        "],[1,[30,[36,16],[[30,[36,15],null,null]],null]],[2,"\\n      "]],"parameters":[2]}]]],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["is-href","href-to","fn","compute","hash","if","array","compact","gt","values","without","let","routeName","can","from-entries","-outlet","component"]}',meta:{moduleName:"consul-ui/templates/dc/show.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/show/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"p6/8nAfZ",block:'{"symbols":["route"],"statements":[[8,"route",[],[["@name"],[[34,0]]],[["default"],[{"statements":[[2,"\\n  "],[1,[30,[36,4],[[30,[36,3],["replaceWith",[30,[36,2],[[30,[36,1],["access overview"],null],"dc.show.serverstatus","dc.services.index"],null]],null]],null]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n\\n"]],"hasEval":false,"upvars":["routeName","can","if","route-action","did-insert"]}',meta:{moduleName:"consul-ui/templates/dc/show/index.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/show/license",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"6J16wkmB",block:'{"symbols":["route","loader","item","after","notice","notice","notice"],"statements":[[8,"route",[],[["@name"],[[34,12]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,13],["/${partition}/${nspace}/${dc}/license",[30,[36,8],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,14],[[32,2,["data"]]],null,[["default"],[{"statements":[[2,"    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"error-state",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["disconnected"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,2],[[30,[36,1],[[32,2,["error","status"]],"404"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"notice",[[24,0,"notification-update"],[4,[38,0],null,[["sticky"],[true]]]],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,7,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"strong"],[12],[2,"Warning!"],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,7,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              This service has been deregistered and no longer exists in the catalog.\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[7]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,2],[[30,[36,1],[[32,2,["error","status"]],"403"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"notice",[[24,0,"notification-update"],[4,[38,0],null,[["sticky"],[true]]]],[["@type"],["error"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"strong"],[12],[2,"Error!"],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              You no longer have access to this service\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[6]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,"notice",[[24,0,"notification-update"],[4,[38,0],null,[["sticky"],[true]]]],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,5,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"strong"],[12],[2,"Warning!"],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,5,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              An error was returned whilst loading this data, refresh to try again.\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[5]}]]],[2,"\\n      "]],"parameters":[]}]]]],"parameters":[]}]]],[2,"    "]],"parameters":[4]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n      "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n        "],[10,"section"],[15,0,[30,[36,4],["validity",[30,[36,3],["valid",[32,3,["Valid"]]],null]],null]],[12],[2,"\\n          "],[10,"header"],[12],[2,"\\n            "],[10,"h2"],[12],[2,"\\n              "],[1,[30,[36,6],[[30,[36,5],[[32,1,["t"]],"expiry.header"],null]],null]],[2,"\\n            "],[13],[2,"\\n          "],[13],[2,"\\n\\n          "],[10,"p"],[12],[2,"\\n            "],[1,[30,[36,6],[[30,[36,5],[[32,1,["t"]],"expiry.${type}.body",[30,[36,8],null,[["type","date","time","htmlSafe"],[[30,[36,2],[[32,3,["Valid"]],"valid","expired"],null],[30,[36,7],[[32,3,["License","expiration_time"]]],[["year","month","day"],["numeric","long","numeric"]]],[30,[36,7],[[32,3,["License","expiration_time"]]],[["hour12","hour","hourCycle","minute","second","timeZoneName"],[true,"numeric","h12","numeric","numeric","short"]]],true]]]],null]],null]],[2,"\\n          "],[13],[2,"\\n\\n          "],[10,"dl"],[12],[2,"\\n            "],[10,"dt"],[15,0,[30,[36,4],[[30,[36,3],["valid",[32,3,["Valid"]]],null],[30,[36,3],["expired",[30,[36,10],[[32,3,["Valid"]]],null]],null],[30,[36,3],["warning",[30,[36,9],[[32,3,["License","expiration_time"]],2629800000],null]],null]],null]],[12],[2,"\\n              "],[1,[30,[36,6],[[30,[36,5],[[32,1,["t"]],"expiry.${type}.header",[30,[36,8],null,[["type"],[[30,[36,2],[[32,3,["Valid"]],"valid","expired"],null]]]]],null]],null]],[2,"\\n            "],[13],[2,"\\n            "],[10,"dd"],[12],[2,"\\n              "],[1,[30,[36,11],[[32,3,["License","expiration_time"]]],null]],[2,"\\n            "],[13],[2,"\\n          "],[13],[2,"\\n\\n          "],[10,"aside"],[12],[2,"\\n            "],[10,"header"],[12],[2,"\\n              "],[10,"h3"],[12],[2,"\\n                "],[1,[30,[36,6],[[30,[36,5],[[32,1,["t"]],"documentation.title"],null]],null]],[2,"\\n              "],[13],[2,"\\n            "],[13],[2,"\\n            "],[1,[30,[36,6],[[30,[36,5],[[32,1,["t"]],"documentation.body",[30,[36,8],null,[["htmlSafe"],[true]]]],null]],null]],[2,"\\n          "],[13],[2,"\\n\\n        "],[13],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3]}]]],[2,"  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n\\n"]],"hasEval":false,"upvars":["notification","eq","if","array","class-map","fn","compute","format-time","hash","temporal-within","not","temporal-format","routeName","uri","let"]}',meta:{moduleName:"consul-ui/templates/dc/show/license.hbs"}})
+e.default=t})),define("consul-ui/templates/dc/show/serverstatus",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"oG6Yv0sK",block:'{"symbols":["route","loader","item","item","after","notice","notice","notice"],"statements":[[8,"route",[],[["@name"],[[34,16]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,17],["/${partition}/${nspace}/${dc}/datacenter",[30,[36,13],null,[["partition","nspace","dc"],[[32,1,["params","partition"]],[32,1,["params","nspace"]],[32,1,["params","dc"]]]]]],null]]],[["default"],[{"statements":[[2,"\\n\\n"],[6,[37,18],[[32,2,["data"]]],null,[["default"],[{"statements":[[2,"    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"error-state",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["disconnected"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,8],[[30,[36,4],[[32,2,["error","status"]],"404"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"notice",[[24,0,"notification-update"],[4,[38,12],null,[["sticky"],[true]]]],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,8,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"strong"],[12],[2,"Warning!"],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,8,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              This service has been deregistered and no longer exists in the catalog.\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[8]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,8],[[30,[36,4],[[32,2,["error","status"]],"403"],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,"notice",[[24,0,"notification-update"],[4,[38,12],null,[["sticky"],[true]]]],[["@type"],["error"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,7,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"strong"],[12],[2,"Error!"],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,7,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              You no longer have access to this service\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[7]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[8,"notice",[[24,0,"notification-update"],[4,[38,12],null,[["sticky"],[true]]]],[["@type"],["warning"]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,6,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"strong"],[12],[2,"Warning!"],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n          "],[8,[32,6,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n            "],[10,"p"],[12],[2,"\\n              An error was returned whilst loading this data, refresh to try again.\\n            "],[13],[2,"\\n          "]],"parameters":[]}]]],[2,"\\n        "]],"parameters":[6]}]]],[2,"\\n      "]],"parameters":[]}]]]],"parameters":[]}]]],[2,"    "]],"parameters":[5]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n      "],[10,"div"],[14,0,"tab-section"],[12],[2,"\\n\\n          "],[10,"section"],[15,0,[30,[36,6],["server-failure-tolerance"],null]],[12],[2,"\\n\\n            "],[10,"header"],[12],[2,"\\n              "],[1,[30,[36,3],[[30,[36,2],[[32,1,["t"]],"tolerance.link",[30,[36,13],null,[["htmlSafe"],[true]]]],null]],null]],[2,"\\n              "],[10,"h2"],[12],[2,"\\n                "],[1,[30,[36,3],[[30,[36,2],[[32,1,["t"]],"tolerance.header"],null]],null]],[2,"\\n              "],[13],[2,"\\n            "],[13],[2,"\\n\\n            "],[10,"section"],[15,0,[30,[36,6],[[30,[36,5],["immediate-tolerance"],null]],null]],[12],[2,"\\n              "],[10,"header"],[12],[2,"\\n                "],[10,"h3"],[12],[2,"\\n                  "],[1,[30,[36,3],[[30,[36,2],[[32,1,["t"]],"tolerance.immediate.header"],null]],null]],[2,"\\n                "],[13],[2,"\\n              "],[13],[2,"\\n              "],[10,"dl"],[15,0,[30,[36,6],[[30,[36,5],["warning",[30,[36,14],[[30,[36,4],[[32,3,["FailureTolerance"]],0],null],[30,[36,4],[[32,3,["OptimisticFailureTolerance"]],0],null]],null]],null]],null]],[12],[2,"\\n                "],[10,"dt"],[12],[2,"\\n                  "],[1,[30,[36,3],[[30,[36,2],[[32,1,["t"]],"tolerance.immediate.body"],null]],null]],[2,"\\n                "],[13],[2,"\\n                "],[10,"dd"],[12],[2,"\\n                  "],[1,[32,3,["FailureTolerance"]]],[2,"\\n                "],[13],[2,"\\n              "],[13],[2,"\\n            "],[13],[2,"\\n\\n"],[6,[37,8],[[30,[36,15],["read zones"],null]],null,[["default"],[{"statements":[[2,"            "],[10,"section"],[15,0,[30,[36,6],[[30,[36,5],["optimistic-tolerance"],null]],null]],[12],[2,"\\n              "],[10,"header"],[12],[2,"\\n                "],[10,"h3"],[12],[2,"\\n                  "],[1,[30,[36,3],[[30,[36,2],[[32,1,["t"]],"tolerance.optimistic.header"],null]],null]],[2,"\\n                  "],[11,"span"],[4,[38,11],["With > 30 seconds between server failures, Consul can restore the Immediate Fault Tolerance by replacing failed active voters with healthy back-up voters when using redundancy zones."],null],[12],[2,"\\n                  "],[13],[2,"\\n                "],[13],[2,"\\n              "],[13],[2,"\\n              "],[10,"dl"],[15,0,[30,[36,6],[[30,[36,5],["warning",[30,[36,4],[[32,3,["OptimisticFailureTolerance"]],0],null]],null]],null]],[12],[2,"\\n                "],[10,"dt"],[12],[2,"\\n                  "],[1,[30,[36,3],[[30,[36,2],[[32,1,["t"]],"tolerance.optimistic.body"],null]],null]],[2,"\\n                "],[13],[2,"\\n                "],[10,"dd"],[12],[2,"\\n                  "],[1,[32,3,["OptimisticFailureTolerance"]]],[2,"\\n                "],[13],[2,"\\n              "],[13],[2,"\\n\\n            "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"          "],[13],[2,"\\n\\n"],[6,[37,8],[[30,[36,7],[[32,3,["RedundancyZones","length"]],0],null]],null,[["default","else"],[{"statements":[[2,"          "],[10,"section"],[15,0,[30,[36,6],["redundancy-zones"],null]],[12],[2,"\\n            "],[10,"header"],[12],[2,"\\n              "],[10,"h2"],[12],[2,"\\n                "],[1,[30,[36,1],[[30,[36,0],["common.consul.redundancyzone"],null]],null]],[2,"\\n              "],[13],[2,"\\n            "],[13],[2,"\\n\\n"],[6,[37,10],[[30,[36,9],[[30,[36,9],[[32,3,["RedundancyZones"]]],null]],null]],null,[["default"],[{"statements":[[6,[37,8],[[30,[36,7],[[32,4,["Servers","length"]],0],null]],null,[["default"],[{"statements":[[2,"              "],[10,"section"],[12],[2,"\\n                "],[10,"header"],[12],[2,"\\n                  "],[10,"h3"],[12],[2,"\\n                    "],[1,[32,4,["Name"]]],[2,"\\n                  "],[13],[2,"\\n                  "],[10,"dl"],[15,0,[30,[36,6],[[30,[36,5],["warning",[30,[36,4],[[32,4,["FailureTolerance"]],0],null]],null]],null]],[12],[2,"\\n                      "],[10,"dt"],[12],[1,[30,[36,0],["common.consul.failuretolerance"],null]],[13],[2,"\\n                      "],[10,"dd"],[12],[1,[32,4,["FailureTolerance"]]],[13],[2,"\\n                  "],[13],[2,"\\n                "],[13],[2,"\\n                "],[8,"consul/server/list",[],[["@items"],[[32,4,["Servers"]]]],null],[2,"\\n              "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[4]}]]],[2,"\\n"],[6,[37,8],[[30,[36,7],[[32,3,["Default","Servers","length"]],0],null]],null,[["default"],[{"statements":[[2,"              "],[10,"section"],[12],[2,"\\n                "],[10,"header"],[12],[2,"\\n                  "],[10,"h3"],[12],[2,"\\n                    "],[1,[30,[36,3],[[30,[36,2],[[32,1,["t"]],"unassigned"],null]],null]],[2,"\\n                  "],[13],[2,"\\n                "],[13],[2,"\\n                "],[8,"consul/server/list",[],[["@items"],[[32,3,["Default","Servers"]]]],null],[2,"\\n              "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"          "],[10,"section"],[12],[2,"\\n            "],[10,"header"],[12],[2,"\\n              "],[10,"h2"],[12],[2,"\\n                "],[1,[30,[36,3],[[30,[36,2],[[32,1,["t"]],"servers"],null]],null]],[2,"\\n              "],[13],[2,"\\n            "],[13],[2,"\\n            "],[8,"consul/server/list",[],[["@items"],[[32,3,["Default","Servers"]]]],null],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[6,[37,8],[[30,[36,7],[[32,3,["ReadReplicas","length"]],0],null]],null,[["default"],[{"statements":[[2,"          "],[10,"section"],[12],[2,"\\n            "],[10,"header"],[12],[2,"\\n              "],[10,"h2"],[12],[2,"\\n                "],[1,[30,[36,1],[[30,[36,0],["common.consul.readreplica"],null]],null]],[2,"\\n              "],[13],[2,"\\n            "],[13],[2,"\\n\\n            "],[8,"consul/server/list",[],[["@items"],[[32,3,["ReadReplicas"]]]],null],[2,"\\n          "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3]}]]],[2,"  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n\\n"]],"hasEval":false,"upvars":["t","pluralize","fn","compute","eq","array","class-map","gt","if","-track-array","each","tooltip","notification","hash","and","can","routeName","uri","let"]}',meta:{moduleName:"consul-ui/templates/dc/show/serverstatus.hbs"}})
+e.default=t})),define("consul-ui/templates/error",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"KX7JLK/T",block:'{"symbols":[],"statements":[[6,[37,1],[[35,0]],null,[["default"],[{"statements":[[8,"app-error",[],[["@error"],[[34,0]]],null],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["error","if"]}',meta:{moduleName:"consul-ui/templates/error.hbs"}})
+e.default=t})),define("consul-ui/templates/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"OcrlVtCJ",block:'{"symbols":["route","o"],"statements":[[8,"route",[],[["@name"],[[34,0]]],[["default"],[{"statements":[[2,"\\n  "],[8,"outlet",[],[["@name","@model"],[[34,0],[32,1,["model"]]]],[["default"],[{"statements":[[2,"\\n    "],[1,[30,[36,2],[[30,[36,1],null,null]],null]],[2,"\\n  "]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["routeName","-outlet","component"]}',meta:{moduleName:"consul-ui/templates/index.hbs"}})
+e.default=t})),define("consul-ui/templates/loading",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"o38EFfaS",block:'{"symbols":[],"statements":[],"hasEval":false,"upvars":[]}',meta:{moduleName:"consul-ui/templates/loading.hbs"}})
+e.default=t})),define("consul-ui/templates/notfound",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"UjlaBDbX",block:'{"symbols":["route"],"statements":[[8,"route",[],[["@name"],[[34,0]]],[["default"],[{"statements":[[2,"\\n  "],[8,"app-error",[],[["@login","@error"],[[32,1,["model","app","login","open"]],[30,[36,1],null,[["status","message"],[404,"Unable to find that page"]]]]],null],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n\\n"]],"hasEval":false,"upvars":["routeName","hash"]}',meta:{moduleName:"consul-ui/templates/notfound.hbs"}})
+e.default=t})),define("consul-ui/templates/oauth-provider-debug",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"Ngf+ijS4",block:'{"symbols":["route","item"],"statements":[[8,"route",[],[["@name"],[[34,0]]],[["default"],[{"statements":[[2,"\\n"],[10,"div"],[14,5,"width: 50%;margin: 0 auto;"],[12],[2,"\\n  "],[10,"h1"],[12],[8,[32,1,["Title"]],[],[["@title"],["Mock OAuth Provider"]],null],[13],[2,"\\n  "],[10,"main"],[12],[2,"\\n    "],[10,"form"],[14,"method","GET"],[15,"action",[34,1]],[12],[2,"\\n"],[6,[37,3],[[30,[36,2],null,[["state","code"],["state-123456789/abcdefghijklmnopqrstuvwxyz","code-abcdefghijklmnopqrstuvwxyz/123456789"]]]],null,[["default"],[{"statements":[[2,"      "],[8,"text-input",[],[["@name","@label","@item","@help"],["state","State",[32,2],"The OIDC state value that will get passed through to Consul"]],null],[2,"\\n      "],[8,"text-input",[],[["@name","@label","@item","@help"],["code","Code",[32,2],"The OIDC code value that will get passed through to Consul"]],null],[2,"\\n"]],"parameters":[2]}]]],[2,"      "],[8,"action",[],[["@type"],["submit"]],[["default"],[{"statements":[[2,"\\n        Login\\n      "]],"parameters":[]}]]],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n"],[13],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["routeName","redirect_uri","hash","let"]}',meta:{moduleName:"consul-ui/templates/oauth-provider-debug.hbs"}})
+e.default=t})),define("consul-ui/templates/settings",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"NoqsVAP9",block:'{"symbols":["route","loader","item","disclosure","notice"],"statements":[[8,"route",[],[["@name"],[[34,8]]],[["default"],[{"statements":[[2,"\\n  "],[8,"data-loader",[],[["@src"],[[30,[36,9],["settings://consul:client"],null]]],[["default"],[{"statements":[[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["error"]],[["default"],[{"statements":[[2,"\\n      "],[8,"app-error",[],[["@error","@login"],[[32,2,["error"]],[32,1,["model","app","login","open"]]]],null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n\\n    "],[8,"block-slot",[],[["@name"],["loaded"]],[["default"],[{"statements":[[2,"\\n"],[6,[37,12],[[30,[36,11],[[32,2,["data"]],[30,[36,10],null,[["blocking"],[true]]]],null]],null,[["default"],[{"statements":[[2,"  "],[8,"app-view",[],[[],[]],[["default"],[{"statements":[[2,"\\n    "],[8,"block-slot",[],[["@name"],["header"]],[["default"],[{"statements":[[2,"\\n      "],[10,"h1"],[12],[2,"\\n        "],[8,[32,1,["Title"]],[],[["@title"],["Settings"]],null],[2,"\\n      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n    "],[8,"block-slot",[],[["@name"],["content"]],[["default"],[{"statements":[[2,"\\n      "],[8,"notice",[],[["@type"],["info"]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,5,["Header"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[10,"h2"],[12],[2,"Local Storage"],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[8,[32,5,["Body"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[10,"p"],[12],[2,"\\n            These settings are immediately saved to local storage and persisted through browser usage.\\n          "],[13],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n      "]],"parameters":[5]}]]],[2,"\\n      "],[10,"form"],[12],[2,"\\n"],[6,[37,2],[[30,[36,3],[[30,[36,7],["CONSUL_UI_DISABLE_REALTIME"],null]],null]],null,[["default"],[{"statements":[[2,"      "],[8,"disclosure",[],[[],[]],[["default"],[{"statements":[[2,"\\n        "],[8,[32,4,["Details"]],[],[[],[]],[["default"],[{"statements":[[2,"\\n          "],[8,"data-sink",[],[["@data","@sink","@onchange"],[[32,3],"settings://consul:client",[30,[36,1],[[32,0],[30,[36,0],[[32,4,["close"]]],null]],null]]],null],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n        "],[10,"fieldset"],[12],[2,"\\n          "],[10,"h2"],[12],[2,"Blocking Queries"],[13],[2,"\\n          "],[10,"p"],[12],[2,"Keep catalog info up-to-date without refreshing the page. Any changes made to services, nodes and intentions would be reflected in real time."],[13],[2,"\\n          "],[10,"div"],[14,0,"type-toggle"],[12],[2,"\\n            "],[10,"label"],[12],[2,"\\n              "],[11,"input"],[24,3,"client[blocking]"],[16,"checked",[30,[36,2],[[32,3,["blocking"]],"checked"],null]],[24,4,"checkbox"],[4,[38,6],["change",[30,[36,5],[[30,[36,4],[[32,3],"blocking",[30,[36,3],[[32,3,["blocking"]]],null]],null],[30,[36,0],[[32,4,["open"]]],null]],null]],null],[12],[13],[2,"\\n              "],[10,"span"],[12],[1,[30,[36,2],[[32,3,["blocking"]],"On","Off"],null]],[13],[2,"\\n            "],[13],[2,"\\n          "],[13],[2,"\\n        "],[13],[2,"\\n      "]],"parameters":[4]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"      "],[13],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[3]}]]],[2,"  "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[2]}]]],[2,"\\n"]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["fn","action","if","not","set","queue","on","env","routeName","uri","hash","or","let"]}',meta:{moduleName:"consul-ui/templates/settings.hbs"}})
+e.default=t})),define("consul-ui/transforms/array",["exports","ember-data-model-fragments/transforms/array"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=t.default
+e.default=n})),define("consul-ui/transforms/boolean",["exports","@ember-data/serializer/-private"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.BooleanTransform}})})),define("consul-ui/transforms/date",["exports","@ember-data/serializer/-private"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.DateTransform}})})),define("consul-ui/transforms/fragment-array",["exports","ember-data-model-fragments/transforms/fragment-array"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=t.default
+e.default=n})),define("consul-ui/transforms/fragment",["exports","ember-data-model-fragments/transforms/fragment"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=t.default
+e.default=n})),define("consul-ui/transforms/number",["exports","@ember-data/serializer/-private"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.NumberTransform}})})),define("consul-ui/transforms/string",["exports","@ember-data/serializer/-private"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.StringTransform}})})),define("consul-ui/utils/ascend",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){const n=e.split("/")
+return n.length>t?n.slice(0,-t).concat("").join("/"):""}})),define("consul-ui/utils/atob",["exports","base64-js"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n="utf-8"){const r=t.default.toByteArray(e)
+return new TextDecoder(n).decode(r)}})),define("consul-ui/utils/btoa",["exports","base64-js"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){const n=(new TextEncoder).encode(e)
+return t.default.fromByteArray(n)}}))
+define("consul-ui/utils/calculate-position",["exports","ember-basic-dropdown/utils/calculate-position"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/utils/callable-type",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return"function"!=typeof e?function(){return e}:e}})),define("consul-ui/utils/create-fingerprinter",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,n,r=JSON.stringify){return function(a,l,s,i,o){return function(u){if(null==(s=null==s?u[e]:s))throw new Error(`Unable to create fingerprint, missing foreignKey value. Looking for value in \`${e}\` got \`${s}\``)
+const c=l.split(",").map((function(e){const t=Ember.get(u,e)
+if(null==t||t.length<1)throw new Error(`Unable to create fingerprint, missing slug. Looking for value in \`${e}\` got \`${t}\``)
+return t}))
+return void 0===u[t]&&("*"===i&&(i="default"),u[t]=i),void 0===u[n]&&("*"===o&&(o="default"),u[n]=o),void 0===u[e]&&(u[e]=s),void 0===u[a]&&(u[a]=r([u[n],u[t],s].concat(c))),u}}}})),define("consul-ui/utils/distance",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){e=e.Coord,t=t.Coord
+let n=0
+for(let s=0;s<e.Vec.length;s++){var r=e.Vec[s]-t.Vec[s]
+n+=r*r}let a=Math.sqrt(n)+e.Height+t.Height
+const l=a+e.Adjustment+t.Adjustment
+l>0&&(a=l)
+return Math.round(1e5*a)/100}})),define("consul-ui/utils/dom/click-first-anchor",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n=t){return function(t,r="tr"){switch(t.target.nodeName.toLowerCase()){case"input":case"label":case"a":case"button":return}const a=e(r,t.target).querySelector("a")
+a&&n(a)}}
+const t=function(e){["mousedown","mouseup","click"].map((function(e){return new MouseEvent(e,{bubbles:!0,cancelable:!0,view:window})})).forEach((function(t){e.dispatchEvent(t)}))}})),define("consul-ui/utils/dom/closest",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){try{return t.closest(e)}catch(n){return}}})),define("consul-ui/utils/dom/create-listeners",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=[]){return new t(e)}
+class t{constructor(e=[]){this.listeners=e}add(e,n,r){let a
+if("function"==typeof e)a=e
+else if(e instanceof t)a=e.remove.bind(e)
+else{let t="addEventListener",l="removeEventListener"
+void 0===e[t]&&(t="on",l="off")
+let s=n
+"string"==typeof s&&(s={[n]:r})
+const i=Object.keys(s).map((function(n){return function(n,r){return e[t](n,r),function(){return e[l](n,r),r}}(n,s[n])}))
+a=()=>i.map(e=>e())}return this.listeners.push(a),()=>{const e=this.listeners.findIndex((function(e){return e===a}))
+return this.listeners.splice(e,1)[0]()}}remove(){const e=this.listeners.map(e=>e())
+return this.listeners.splice(0,this.listeners.length),e}}})),define("consul-ui/utils/dom/event-source/blocking",["exports"],(function(e){function t(e,t){if(null==e)return{}
+var n,r,a=function(e,t){if(null==e)return{}
+var n,r,a={},l=Object.keys(e)
+for(r=0;r<l.length;r++)n=l[r],t.indexOf(n)>=0||(a[n]=e[n])
+return a}(e,t)
+if(Object.getOwnPropertySymbols){var l=Object.getOwnPropertySymbols(e)
+for(r=0;r<l.length;r++)n=l[r],t.indexOf(n)>=0||Object.prototype.propertyIsEnumerable.call(e,n)&&(a[n]=e[n])}return a}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,l=n()){const s=function(n,s={}){const{currentEvent:i}=s,o=t(s,["currentEvent"])
+e.apply(this,[e=>{const{createEvent:s}=e,i=t(e,["createEvent"])
+return n.apply(this,[i,this]).catch(l).then(t=>{if(t instanceof Error)return t
+let n=("function"==typeof s?s:a)(t,e)
+n.type||(n={type:"message",data:n})
+const l=Ember.get(n.data||{},"meta")
+l&&(e.cursor=r(l.cursor,e.cursor),e.cacheControl=l.cacheControl,e.interval=l.interval),-1===(e.cacheControl||"").indexOf("no-store")&&(this.currentEvent=n),this.dispatchEvent(n)
+const i=function(e){return function(t){return new Promise((function(n){setTimeout((function(){n(t)}),e.interval||2e3)}))}}(e,this.previousEvent)
+return this.previousEvent=this.currentEvent,i(t)})},o]),void 0!==i&&(this.currentEvent=i),this.addEventListener("open",e=>{const t=e.target.getCurrentEvent()
+void 0!==t&&this.dispatchEvent(t)})}
+return s.prototype=Object.assign(Object.create(e.prototype,{constructor:{value:e,configurable:!0,writable:!0}}),{getCurrentEvent:function(){return this.currentEvent},getPreviousEvent:function(){return this.previousEvent}}),s},e.validateCursor=e.createErrorBackoff=void 0
+const n=function(e=3e3,t=Promise,n=setTimeout){return function(r){let a=Ember.get(r,"errors.firstObject.status")||Ember.get(r,"statusCode")
+if(void 0!==a)switch(a=a.toString(),!0){case 0===a.indexOf("5")&&3===a.length&&"500"!==a:case"0"===a:return new t((function(t){n((function(){t(r)}),e)}))}throw r}}
+e.createErrorBackoff=n
+const r=function(e,t=null){let n=parseInt(e)
+if(!isNaN(n))return null!==t&&n<t&&(n=0),Math.max(n,1)}
+e.validateCursor=r
+const a=function(e){return{type:"message",data:e}}})),define("consul-ui/utils/dom/event-source/cache",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,n=Promise){return function(r){return function(a,l){const s=l.key
+if(void 0!==r[s]&&l.settings.enabled)return void 0===r[s].configuration&&(r[s].configuration={}),r[s].configuration.settings=l.settings,e(r[s])
+{const i=l.type||t,o=r[s]=new i(a,l)
+return e(o).catch((function(e){return delete r[s],n.reject(e)})).then((function(e){return void 0===e.configuration.cursor&&(e.close(),delete r[s]),e}))}}}}})),define("consul-ui/utils/dom/event-source/callable",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,a=Promise,l=t,s=n){const i=function(t,n={}){e.call(this),this.readyState=2,this.source="function"!=typeof t?function(){return this.close(),a.resolve()}:t,this.readyState=0,a.resolve().then(()=>{if(!(this.readyState>1))return this.readyState=1,this.dispatchEvent({type:"open"}),l(this,n,r)}).catch(e=>{this.dispatchEvent(s(e)),this.readyState=2,this.dispatchEvent({type:"close",error:e})}).then(()=>{this.readyState=2})}
+return i.prototype=Object.assign(Object.create(e.prototype,{constructor:{value:i,configurable:!0,writable:!0}}),{close:function(){switch(this.readyState){case 0:case 2:this.readyState=2
+break
+default:this.readyState=3}return this}}),i},e.defaultRunner=void 0
+const t=function(e,n,r){if(!r(e))return e.source.bind(e)(n,e).then((function(){return t(e,n,r)}))
+e.dispatchEvent({type:"close"})}
+e.defaultRunner=t
+const n=function(e){return new ErrorEvent("error",{error:e,message:e.message})},r=function(e){switch(e.readyState){case 2:case 3:return!0}return!1}})),define("consul-ui/utils/dom/event-source/index",["exports","consul-ui/utils/dom/create-listeners","consul-ui/utils/dom/event-target/rsvp","consul-ui/utils/dom/event-source/cache","consul-ui/utils/dom/event-source/proxy","consul-ui/utils/dom/event-source/resolver","consul-ui/utils/dom/event-source/callable","consul-ui/utils/dom/event-source/openable","consul-ui/utils/dom/event-source/blocking","consul-ui/utils/dom/event-source/storage","ember-concurrency","consul-ui/env"],(function(e,t,n,r,a,l,s,i,o,u,c,d){let m
+switch(Object.defineProperty(e,"__esModule",{value:!0}),e.once=e.toPromise=e.fromPromise=e.cache=e.source=e.resolve=e.proxy=e.StorageEventSource=e.BlockingEventSource=e.OpenableEventSource=e.CallableEventSource=void 0,(0,d.env)("CONSUL_UI_REALTIME_RUNNER")){case"ec":m=function(e,t,n){return Ember.Object.extend({task:(0,c.task)((function*(){for(;!n(e);)yield e.source.bind(e)(t)}))}).create().get("task").perform()}
+break
+case"generator":m=async function(e,t,n){const r=function*(){for(;!n(e);)yield e.source.bind(e)(t)}
+let a,l=r().next()
+for(;!l.done;)a=await l.value,l=r().next()
+return a}
+break
+case"async":m=async function(e,t,n){let r
+for(;!n(e);)r=await e.source.bind(e)(t)
+return r}}const p=(0,s.default)(n.default,Promise,m)
+e.CallableEventSource=p
+const f=(0,i.default)(p)
+e.OpenableEventSource=f
+const b=(0,o.default)(f)
+e.BlockingEventSource=b
+const h=(0,u.default)(n.default,Promise)
+e.StorageEventSource=h
+const v=(0,a.default)(Ember.ObjectProxy,Ember.ArrayProxy,t.default)
+e.proxy=v
+const y=(0,l.default)(Promise)
+e.resolve=y
+const g=function(e){return y(e,(0,t.default)()).then((function(t){return v(e,t)}))}
+e.source=g
+const O=(0,r.default)(g,b,Promise)
+e.cache=O
+e.fromPromise=function(e){return new p((function(){const t=this.dispatchEvent.bind(this),n=()=>{this.close()}
+return e.then((function(e){n(),t({type:"message",data:e})})).catch((function(e){n(),t(function(e){return new ErrorEvent("error",{error:e,message:e.message})}(e))}))}))}
+e.toPromise=function(e,t,n="message",r="error"){return new Promise((function(a,l){const s=function(e){a(e.data)},i=function(e){l(e.error)}
+e.addEventListener(n,s),e.addEventListener(r,i),t((function(){"function"==typeof e.close&&e.close(),e.removeEventListener(n,s),e.removeEventListener(r,i)}))}))}
+e.once=function(e,t,n=f){return new n((function(t,n){return e(t,n).then((function(e){n.dispatchEvent({type:"message",data:e}),n.close()})).catch((function(e){n.dispatchEvent({type:"error",error:e}),n.close()}))}),t)}})),define("consul-ui/utils/dom/event-source/openable",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=EventSource){const t=function(t,n={}){e.apply(this,arguments),this.configuration=n}
+return t.prototype=Object.assign(Object.create(e.prototype,{constructor:{value:t,configurable:!0,writable:!0}}),{open:function(){switch(this.readyState){case 3:this.readyState=1
+break
+case 2:e.apply(this,[this.source,this.configuration])}return this}}),t}})),define("consul-ui/utils/dom/event-source/proxy",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n,r){return function(a,l=[]){let s=e,i="object"
+return"string"!=typeof l&&void 0!==Ember.get(l,"length")&&(s=n,i="array",l=l.filter((function(e){return!Ember.get(e,"isDestroyed")&&!Ember.get(e,"isDeleted")&&Ember.get(e,"isLoaded")}))),void 0===t[i]&&(t[i]=s.extend({init:function(){this.listeners=r(),this.listeners.add(this._source,"message",e=>Ember.set(this,"content",e.data)),this._super(...arguments)},addEventListener:function(e,t){this.listeners.add(this._source,e,t)},getCurrentEvent:function(){return this._source.getCurrentEvent(...arguments)},removeEventListener:function(){return this._source.removeEventListener(...arguments)},dispatchEvent:function(){return this._source.dispatchEvent(...arguments)},close:function(){return this._source.close(...arguments)},open:function(){return this._source.open(...arguments)},willDestroy:function(){this._super(...arguments),this.close(),this.listeners.remove()}})),t[i].create({content:l,_source:a,configuration:a.configuration})}}
+const t={}})),define("consul-ui/utils/dom/event-source/resolver",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=Promise){return function(t,n){let r
+return"function"==typeof t.getCurrentEvent&&(r=t.getCurrentEvent()),null!=r?e.resolve(r.data).then((function(e){return t.open(),e})):new e((function(e,r){n.add(t,"error",(function(e){n.remove(),e.target.close(),r(e.error)})),n.add(t,"message",(function(t){n.remove(),e(t.data)}))}))}}})),define("consul-ui/utils/dom/event-source/storage",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t=Promise){const n=function(e){if((void 0===e||e.key===this.configuration.key)&&1===this.readyState){const e=this.source(this.configuration)
+t.resolve(e).then(e=>{this.configuration.cursor++,this._currentEvent={type:"message",data:e},this.dispatchEvent({type:"message",data:e})})}}
+return class extends e{constructor(e,t){super(...arguments),this.readyState=2,this.target=t.target||window,this.name="storage",this.source=e,this.handler=n.bind(this),this.configuration=t,this.configuration.cursor=1,this.open()}dispatchEvent(){if(1===this.readyState)return super.dispatchEvent(...arguments)}close(){this.target.removeEventListener(this.name,this.handler),this.readyState=2}getCurrentEvent(){return this._currentEvent}open(){const e=this.readyState
+this.readyState=1,1!==e&&(this.target.addEventListener(this.name,this.handler),this.handler())}}}})),define("consul-ui/utils/dom/event-target/event-target-shim/event",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.wrapEvent=function(e,t){return new(function e(t){if(null==t||t===Object.prototype)return l
+let r=n.get(t)
+null==r&&(r=function(e,t){const n=Object.keys(t)
+if(0===n.length)return e
+function r(t,n){e.call(this,t,n)}r.prototype=Object.create(e.prototype,{constructor:{value:r,configurable:!0,writable:!0}})
+for(let a=0;a<n.length;++a){const l=n[a]
+if(!(l in e.prototype)){const e="function"==typeof Object.getOwnPropertyDescriptor(t,l).value
+Object.defineProperty(r.prototype,l,e?i(l):s(l))}}return r}(e(Object.getPrototypeOf(t)),t),n.set(t,r))
+return r}(Object.getPrototypeOf(t)))(e,t)},e.isStopped=function(e){return r(e).immediateStopped},e.setEventPhase=function(e,t){r(e).eventPhase=t},e.setCurrentTarget=function(e,t){r(e).currentTarget=t},e.setPassiveListener=function(e,t){r(e).passiveListener=t}
+const t=new WeakMap,n=new WeakMap
+function r(e){const n=t.get(e)
+return console.assert(null!=n,"'this' is expected an Event object, but got",e),n}function a(e){null==e.passiveListener?e.event.cancelable&&(e.canceled=!0,"function"==typeof e.event.preventDefault&&e.event.preventDefault()):"undefined"!=typeof console&&"function"==typeof console.error&&console.error("Unable to preventDefault inside passive event listener invocation.",e.passiveListener)}function l(e,n){t.set(this,{eventTarget:e,event:n,eventPhase:2,currentTarget:e,canceled:!1,stopped:!1,immediateStopped:!1,passiveListener:null,timeStamp:n.timeStamp||Date.now()}),Object.defineProperty(this,"isTrusted",{value:!1,enumerable:!0})
+const r=Object.keys(n)
+for(let t=0;t<r.length;++t){const e=r[t]
+e in this||Object.defineProperty(this,e,s(e))}}function s(e){return{get(){return r(this).event[e]},set(t){r(this).event[e]=t},configurable:!0,enumerable:!0}}function i(e){return{value(){const t=r(this).event
+return t[e].apply(t,arguments)},configurable:!0,enumerable:!0}}l.prototype={get type(){return r(this).event.type},get target(){return r(this).eventTarget},get currentTarget(){return r(this).currentTarget},composedPath(){const e=r(this).currentTarget
+return null==e?[]:[e]},get NONE(){return 0},get CAPTURING_PHASE(){return 1},get AT_TARGET(){return 2},get BUBBLING_PHASE(){return 3},get eventPhase(){return r(this).eventPhase},stopPropagation(){const e=r(this)
+e.stopped=!0,"function"==typeof e.event.stopPropagation&&e.event.stopPropagation()},stopImmediatePropagation(){const e=r(this)
+e.stopped=!0,e.immediateStopped=!0,"function"==typeof e.event.stopImmediatePropagation&&e.event.stopImmediatePropagation()},get bubbles(){return Boolean(r(this).event.bubbles)},get cancelable(){return Boolean(r(this).event.cancelable)},preventDefault(){a(r(this))},get defaultPrevented(){return r(this).canceled},get composed(){return Boolean(r(this).event.composed)},get timeStamp(){return r(this).timeStamp},get srcElement(){return r(this).eventTarget},get cancelBubble(){return r(this).stopped},set cancelBubble(e){if(!e)return
+const t=r(this)
+t.stopped=!0,"boolean"==typeof t.event.cancelBubble&&(t.event.cancelBubble=!0)},get returnValue(){return!r(this).canceled},set returnValue(e){e||a(r(this))},initEvent(){}},Object.defineProperty(l.prototype,"constructor",{value:l,configurable:!0,writable:!0}),"undefined"!=typeof window&&void 0!==window.Event&&(Object.setPrototypeOf(l.prototype,window.Event.prototype),n.set(window.Event.prototype,l))})),define("consul-ui/utils/dom/event-target/rsvp",["exports","consul-ui/utils/dom/event-target/event-target-shim/event"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=function(){}
+n.prototype=Object.assign(Object.create(Object.prototype,{constructor:{value:n,configurable:!0,writable:!0}}),{dispatchEvent:function(e){const n=(0,t.wrapEvent)(this,e);(0,t.setCurrentTarget)(n,null)
+const r=e.type,a=n
+let l=function(e){let t=e._promiseCallbacks
+return t||(t=e._promiseCallbacks={}),t}(this)[r]
+if(l){let e
+for(let t=0;t<l.length;t++)e=l[t],e.bind(this)(a)}},addEventListener:function(e,t){this.on(e,t)},removeEventListener:function(e,t){try{this.off(e,t)}catch(n){}}}),Ember.RSVP.EventTarget.mixin(n.prototype)
+var r=n
+e.default=r})),define("consul-ui/utils/dom/get-component-factory",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t="-view-registry:main"){const n=e.lookup(t)
+return function(e){const t=e.getAttribute("id")
+if(t)return n[t]}}})),define("consul-ui/utils/dom/is-outside",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,n=document){if(e){const r=!t||!n.contains(t),a=e===t||e.contains(t)
+return!r&&!a}return!1}})),define("consul-ui/utils/dom/normalize-event",["exports"],(function(e){function t(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function n(e){for(var n=1;n<arguments.length;n++){var a=null!=arguments[n]?arguments[n]:{}
+n%2?t(Object(a),!0).forEach((function(t){r(e,t,a[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(a)):t(Object(a)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(a,t))}))}return e}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,r={}){if(void 0!==e.target)return e
+return{target:n(n({},r),{name:e,value:t})}}})),define("consul-ui/utils/dom/qsa-factory",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=document){return function(t,n=e){return n.querySelectorAll(t)}}})),define("consul-ui/utils/dom/sibling",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){let n=e
+for(;n=n.nextSibling;)if(1===n.nodeType&&n.nodeName.toLowerCase()===t)return n}})),define("consul-ui/utils/editor/lint",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){n(e,t,(function(){e.getValue().trim().length&&e.performLint()}))},e.createLoader=void 0
+const t=function(e=document.getElementsByTagName.bind(document),t=CodeMirror){return t.registerHelper("lint","ruby",(function(){return[]})),function(n,r,a){let l=[...e("script")]
+const s=l.find((function(e){return-1!==e.src.indexOf(`/codemirror/mode/${r}/${r}.js`)}))
+t.autoLoadMode(n,r),s?a():(l=[...e("script")],t.on(l[0],"load",(function(){a()})))}}
+e.createLoader=t
+const n=t()})),define("consul-ui/utils/filter/index",["exports","mnemonist/set"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.andOr=void 0
+e.andOr=e=>{const n=function(e){return Object.entries(e).reduce((e,[t,n])=>(e[t]="function"!=typeof n?new Set(Object.keys(n)):null,e),{})}(e)
+return r=>(r=function(e,n){return Object.keys(n).reduce((r,a)=>{const l=void 0===e[a]?[]:e[a]
+return l.length>0&&(null!==n[a]?r[a]=[...t.default.intersection(n[a],new Set(l))]:r[a]=[...new Set(l)]),r},{})}(r,n),t=>function(e,t,n){return Object.entries(t).every(([t,r])=>{let a=n[t]
+return"function"==typeof a?a(e,r):r.some(t=>a[t](e,t))})}(t,r,e))}})),define("consul-ui/utils/form/builder",["exports","ember-changeset","consul-ui/utils/form/changeset","ember-changeset-validations","consul-ui/utils/get-form-name-property"],(function(e,t,n,r,a){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=l,t=a.default){return function(n="",r={}){const a={}
+let l=null
+const s={data:null,name:n,getName:function(){return this.name},setData:function(t){return l&&!Array.isArray(t)&&(t=e(t,l)),Ember.set(this,"data",t),this},getData:function(){return this.data},add:function(e){return a[e.getName()]=e,this},handleEvent:function(e,n){const a=e.target,l=t(n||a.name),s=l[0],i=l[1]
+let o=r
+if(s!==this.getName()){if(this.has(s))return this.form(s).handleEvent(e)
+o=o[s]}const u=this.getData(),c="function"==typeof u.toJSON?u.toJSON():Ember.get(u,"data").toJSON()
+if(!Object.keys(c).includes(i)){const e=new Error(i+" property doesn't exist")
+throw e.target=a,e}let d=Ember.get(u,i)
+if(Array.isArray(d)||void 0!==o[i]&&"string"==typeof o[i].type&&"array"===o[i].type.toLowerCase()){null==d&&(d=[])
+d[a.checked?"pushObject":"removeObject"](a.value),Ember.set(u,i,d)}else void 0===a.checked||"on"!==a.value.toLowerCase()&&"off"!==a.value.toLowerCase()?Ember.set(u,i,a.value):Ember.set(u,i,a.checked)
+return this.validate()},reset:function(){return"function"==typeof this.getData().rollbackAttributes&&this.getData().rollbackAttributes(),this},clear:function(e={}){return"function"==typeof e?this.clearer=e:this.setData(this.clearer(e)).getData()},submit:function(e={}){if("function"==typeof e)return this.submitter=e
+this.submitter(this.getData())},setValidators:function(e){return l=e,this},validate:function(){const e=this.getData()
+return"function"==typeof e.validate&&e.validate(),this},addError:function(){const e=this.getData()
+"function"==typeof e.addError&&e.addError(...arguments)},form:function(e){return null==e?this:a[e]},has:function(e){return void 0!==a[e]}}
+return s.submit=s.submit.bind(s),s.reset=s.reset.bind(s),s}},e.defaultChangeset=void 0
+const l=function(e,a){return(0,t.Changeset)(e,(0,r.default)(a),a,{changeset:n.default})}
+e.defaultChangeset=l})),define("consul-ui/utils/form/changeset",["exports","ember-changeset"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.EmberChangeset{pushObject(e,t){let n
+void 0===Ember.get(this,"_changes."+e)?(n=Ember.get(this,"data."+e),n=n?n.toArray():[]):n=this.get(e).slice(0),n.push(t),this.set(""+e,n)}removeObject(e,t){let n
+void 0===Ember.get(this,"_changes."+e)?(n=Ember.get(this,"data."+e),n=void 0===n?[]:n.toArray()):n=this.get(e).slice(0)
+const r=n.indexOf(t);-1!==r&&n.splice(r,1),this.set(""+e,n)}}e.default=n})),define("consul-ui/utils/get-environment",["exports"],(function(e){function t(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function n(e){for(var n=1;n<arguments.length;n++){var a=null!=arguments[n]?arguments[n]:{}
+n%2?t(Object(a),!0).forEach((function(t){r(e,t,a[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(a)):t(Object(a)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(a,t))}))}return e}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e={},t=window,r=document){const a=function(e){const n=t.localStorage.getItem(e)
+return null===n?void 0:n},l=n(n({},e.operatorConfig),JSON.parse(r.querySelector(`[data-${e.modulePrefix}-config]`).textContent)),s=l.UIConfig||{},i=r.getElementsByTagName("script"),o=i[i.length-1].src
+let u
+const c=function(e,n){let r,a,i,c
+switch(e){case"CONSUL_NSPACES_ENABLED":return void 0!==l.NamespacesEnabled&&l.NamespacesEnabled
+case"CONSUL_SSO_ENABLED":return void 0!==l.SSOEnabled&&l.SSOEnabled
+case"CONSUL_ACLS_ENABLED":return void 0!==l.ACLsEnabled&&l.ACLsEnabled
+case"CONSUL_PARTITIONS_ENABLED":return void 0!==l.PartitionsEnabled&&l.PartitionsEnabled
+case"CONSUL_DATACENTER_LOCAL":return l.LocalDatacenter
+case"CONSUL_DATACENTER_PRIMARY":return l.PrimaryDatacenter
+case"CONSUL_UI_CONFIG":return a={service:void 0},i=n("CONSUL_METRICS_PROVIDER"),c=n("CONSUL_METRICS_PROXY_ENABLED"),a.service=n("CONSUL_SERVICE_DASHBOARD_URL"),i&&(s.metrics_provider=i),c&&(s.metrics_proxy_enabled=c),a.service&&(s.dashboard_url_templates=a),s
+case"CONSUL_BASE_UI_URL":return o.split("/").slice(0,-2).join("/")
+case"CONSUL_HTTP_PROTOCOL":return void 0===u&&(u=function(e){try{return t.performance.getEntriesByType("resource").find(t=>"script"===t.initiatorType&&e===t.name)||{}}catch(n){return{}}}(o)),u.nextHopProtocol||"http/1.1"
+case"CONSUL_HTTP_MAX_CONNECTIONS":switch(r=n("CONSUL_HTTP_PROTOCOL"),!0){case 0===r.indexOf("h2"):case 0===r.indexOf("hq"):case 0===r.indexOf("spdy"):return
+default:return 5}}},d=function(t){let n
+switch(e.environment){case"development":case"staging":case"coverage":case"test":if(n=function(e=r.cookie){return e.split(";").filter(e=>""!==e).map(e=>{const[t,...n]=e.trim().split("=")
+return[t,n.join("=")]})}().reduce((function(e,[t,n]){switch(t){case"CONSUL_INTL_LOCALE":e.CONSUL_INTL_LOCALE=String(n).toLowerCase()
+break
+case"CONSUL_INTL_DEBUG":e.CONSUL_INTL_DEBUG=!!JSON.parse(String(n).toLowerCase())
+break
+case"CONSUL_ACLS_ENABLE":e.CONSUL_ACLS_ENABLED=!!JSON.parse(String(n).toLowerCase())
+break
+case"CONSUL_NSPACES_ENABLE":e.CONSUL_NSPACES_ENABLED=!!JSON.parse(String(n).toLowerCase())
+break
+case"CONSUL_SSO_ENABLE":e.CONSUL_SSO_ENABLED=!!JSON.parse(String(n).toLowerCase())
+break
+case"CONSUL_PARTITIONS_ENABLE":e.CONSUL_PARTITIONS_ENABLED=!!JSON.parse(String(n).toLowerCase())
+break
+case"CONSUL_METRICS_PROXY_ENABLE":e.CONSUL_METRICS_PROXY_ENABLED=!!JSON.parse(String(n).toLowerCase())
+break
+case"CONSUL_UI_CONFIG":e.CONSUL_UI_CONFIG=JSON.parse(n)
+break
+default:e[t]=n}return e}),{}),void 0!==n[t])return n[t]}return e[t]}
+return function e(t){switch(t){case"CONSUL_UI_DISABLE_REALTIME":case"CONSUL_UI_DISABLE_ANCHOR_SELECTION":return!!JSON.parse(String(a(t)||0).toLowerCase())||d(t)
+case"CONSUL_UI_REALTIME_RUNNER":return a(t)||d(t)
+case"CONSUL_UI_CONFIG":case"CONSUL_DATACENTER_LOCAL":case"CONSUL_DATACENTER_PRIMARY":case"CONSUL_ACLS_ENABLED":case"CONSUL_NSPACES_ENABLED":case"CONSUL_SSO_ENABLED":case"CONSUL_PARTITIONS_ENABLED":case"CONSUL_METRICS_PROVIDER":case"CONSUL_METRICS_PROXY_ENABLE":case"CONSUL_SERVICE_DASHBOARD_URL":case"CONSUL_BASE_UI_URL":case"CONSUL_HTTP_PROTOCOL":case"CONSUL_HTTP_MAX_CONNECTIONS":return d(t)||c(t,e)
+default:return d(t)}}}})),define("consul-ui/utils/get-form-name-property",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){if(-1!==e.indexOf("["))return e.match(/(.*)\[(.*)\]/).slice(1)
+return["",e]}})),define("consul-ui/utils/helpers/call-if-type",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return function(t){return function(n,r={}){return typeof n[0]!==e?n[0]:t(n[0],r)}}}})),define("consul-ui/utils/http/consul",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.HEADERS_SYMBOL=e.HEADERS_DIGEST=e.HEADERS_TOKEN=e.HEADERS_INDEX=e.HEADERS_DEFAULT_ACL_POLICY=e.HEADERS_DATACENTER=e.HEADERS_NAMESPACE=e.HEADERS_PARTITION=void 0
+e.HEADERS_PARTITION="X-Consul-Partition"
+e.HEADERS_NAMESPACE="X-Consul-Namespace"
+e.HEADERS_DATACENTER="X-Consul-Datacenter"
+e.HEADERS_DEFAULT_ACL_POLICY="X-Consul-Default-Acl-Policy"
+e.HEADERS_INDEX="X-Consul-Index"
+e.HEADERS_TOKEN="X-Consul-Token"
+e.HEADERS_DIGEST="X-Consul-ContentHash"
+e.HEADERS_SYMBOL="__consul_ui_http_headers__"}))
+define("consul-ui/utils/http/create-headers",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){return function(e){return e.reduce((function(e,t){const[n,...r]=t.split(":")
+return r.length>0&&(e[n.trim()]=r.join(":").trim()),e}),{})}}})),define("consul-ui/utils/http/create-query-params",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=encodeURIComponent){return function t(n,r){return Object.entries(n).reduce((function(n,[a,l]){if(void 0===l)return n
+let s=e(a)
+return void 0!==r&&(s=`${r}[${s}]`),null===l?n.concat(s):"object"==typeof l?n.concat(t(l,s)):n.concat(`${s}=${e(l)}`)}),[]).join("&")}}})),define("consul-ui/utils/http/create-url",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){return function(n,...r){let a=1
+return n.map((function(n,l){0===l&&(n=n.trimStart()),-1!==n.indexOf("?")&&1===a&&(a=2),-1!==n.indexOf("\n\n")&&(a=4),-1!==n.indexOf("\n")&&4!==a&&(a=3)
+let s=void 0!==r[l]?r[l]:""
+switch(a){case 1:switch(!0){case"string"==typeof s:s=e(s)
+break
+case Array.isArray(s):s=s.map((function(t){return""+e(t)}),"").join("/")}break
+case 2:switch(!0){case"string"==typeof s:s=e(s)
+break
+case"object"==typeof s:s=t(s)}break
+case 4:return n.split("\n\n")[0]}return`${n}${s}`})).join("").trim()}}})),define("consul-ui/utils/http/error",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class t extends Error{constructor(e,t){super(t),this.statusCode=e}}e.default=t})),define("consul-ui/utils/http/headers",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.CONTENT_TYPE=e.CACHE_CONTROL=void 0
+e.CACHE_CONTROL="Cache-Control"
+e.CONTENT_TYPE="Content-Type"})),define("consul-ui/utils/http/method",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.POST=e.DELETE=e.PUT=void 0
+e.PUT="PUT"
+e.DELETE="DELETE"
+e.POST="POST"})),define("consul-ui/utils/http/request",["exports","consul-ui/utils/dom/event-target/rsvp"],(function(e,t){function n(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function r(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{}
+t%2?n(Object(r),!0).forEach((function(t){a(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):n(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class l extends t.default{constructor(e,t,n){super(),this._url=t,this._method=e,this._headers=n,this._headers=r(r({},n),{},{"content-type":"application/json"}),void 0!==this._headers.body.index&&(this._headers["content-type"]="text/event-stream")}headers(){return this._headers}open(e){this._xhr=e,this.dispatchEvent({type:"open"})}respond(e){this.dispatchEvent({type:"message",data:e})}error(e){0===e.statusCode&&void 0!==this.statusCode&&(e.statusCode=this.statusCode),this.dispatchEvent({type:"error",error:e})}close(){this.dispatchEvent({type:"close"})}connection(){return this._xhr}abort(e=0){if("text/event-stream"===this.headers()["content-type"]){this.statusCode=e
+const t=this.connection()
+if(t.readyState)switch(t.readyState){case 0:case 1:t.abort()}}}}e.default=l})),define("consul-ui/utils/http/status",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.INTERNAL_SERVER_ERROR=e.FORBIDDEN=e.UNAUTHORIZED=e.OK=void 0
+e.OK=200
+e.UNAUTHORIZED=401
+e.FORBIDDEN=403
+e.INTERNAL_SERVER_ERROR=500})),define("consul-ui/utils/http/xhr",["exports"],(function(e){function t(e,t){var n=Object.keys(e)
+if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e)
+t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function n(e){for(var n=1;n<arguments.length;n++){var a=null!=arguments[n]?arguments[n]:{}
+n%2?t(Object(a),!0).forEach((function(t){r(e,t,a[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(a)):t(Object(a)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(a,t))}))}return e}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){return function(r){const a=new(t||XMLHttpRequest)
+a.onreadystatechange=function(){if(4===this.readyState){const t=e(this.getAllResponseHeaders().split("\n"))
+if(this.status>=200&&this.status<400){const e=r.converters["text json"](this.response)
+r.success(t,e,this.status,this.statusText)}else r.error(t,this.responseText,this.status,this.statusText,this.error)
+r.complete(this.status)}}
+let l=r.url
+l.endsWith("?")&&(l=l.substr(0,l.length-1)),a.open(r.method,l,!0),void 0===r.headers&&(r.headers={})
+const s=n(n({},r.headers),{},{"X-Requested-With":"XMLHttpRequest"})
+return Object.entries(s).forEach(([e,t])=>a.setRequestHeader(e,t)),r.beforeSend(a),a.send(r.body),a}}})),define("consul-ui/utils/intl/missing-message",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){const t=e.split(".").pop().split("-").join(" ")
+return`${t.substr(0,1).toUpperCase()}${t.substr(1)}`}})),define("consul-ui/utils/isFolder",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=""){return"/"===e.slice(-1)}})),define("consul-ui/utils/keyToArray",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t="/"){return(e===t?"":e).split(t)}})),define("consul-ui/utils/left-trim",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e="",t=""){return 0===e.indexOf(t)?e.substr(t.length):e}})),define("consul-ui/utils/maybe-call",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){return function(n){return t.then((function(t){return t&&e(),n}))}}})),define("consul-ui/utils/merge-checks",["exports","mnemonist/multi-map"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=(e=[],n=!1,r=t.default)=>{const a=new r,l=e.shift().map(e=>(""===e.ServiceName&&a.set(e.Node,e.CheckID),e)).concat(e.reduce((e,t)=>void 0===t?e:e.concat(t.reduce((e,t)=>{if(""===t.ServiceName){if((a.get(t.Node)||[]).includes(t.CheckID))return e
+a.set(t.Node,t.CheckID)}return e.push(t),e},[])),[]))
+return n&&l.filter(e=>Ember.get(e,"Exposable")).forEach(e=>{Ember.set(e,"Exposed",n)}),l}})),define("consul-ui/utils/minimizeModel",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){if(Array.isArray(e))return e.filter((function(e){return!Ember.get(e,"isNew")})).map((function(e){return{ID:Ember.get(e,"ID"),Name:Ember.get(e,"Name")}}))}})),define("consul-ui/utils/non-empty-set",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return function(t){return null==t||""===t?{}:{[e]:t}}}})),define("consul-ui/utils/path/resolve",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=(e,t)=>0===t.indexOf("/")?t:t.split("/").reduce((e,t,n,r)=>("."!==t&&(".."===t?e.pop():""===t&&n!==r.length-1||e.push(t)),e),e.split("/")).join("/")})),define("consul-ui/utils/promisedTimeout",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=Promise,t=setTimeout){return function(n,r=function(){}){return new e(e=>{r(t((function(){e(n)}),n))})}}})),define("consul-ui/utils/right-trim",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e="",t=""){const n=e.length-t.length
+if(n>=0)return e.lastIndexOf(t)===n?e.substr(0,n):e
+return e}})),define("consul-ui/utils/routing/redirect-to",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return function(t){const n=this.routeName.split(".").slice(0,-1).join(".")
+this.replaceWith(`${n}.${e}`,t)}}})),define("consul-ui/utils/routing/transitionable",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n={},r){null===e&&(e=r.lookup("route:application"))
+let a,l=t(e,n),s=e
+for(;a=s.parent;)l=l.concat(t(a,n)),s=a
+return l.reverse(),function(e,t){return[e,...t]}(e.name||"application",l)}
+const t=function(e,t={}){return(e.paramNames||[]).map((function(n){return void 0!==t[n]?t[n]:e.params[n]})).reverse()}})),define("consul-ui/utils/routing/walk",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return function(){t.apply(this,[e])}},e.dump=e.walk=void 0
+const t=function(e){Object.keys(e).forEach(n=>{if("_options"===n)return
+const r=e[n]._options
+let a
+Object.keys(e[n]).length>1&&(a=function(){t.apply(this,[e[n]])}),this.route(n,r,a)}),void 0===e.index&&(e.index={_options:{path:""}})}
+e.walk=t
+e.dump=()=>{}})),define("consul-ui/utils/routing/wildcard",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return function(t){let n=!1
+try{n=-1!==Ember.get(e,t)._options.path.indexOf("*")}catch(r){}return n}}})),define("consul-ui/utils/search/exact",["exports","consul-ui/utils/search/predicate"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{predicate(e){return e=e.toLowerCase(),(t="")=>-1!==t.toString().toLowerCase().indexOf(e)}}e.default=n})),define("consul-ui/utils/search/fuzzy",["exports","fuse.js"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=class{constructor(e,n){this.fuse=new t.default(e,{includeMatches:!0,shouldSort:!1,threshold:.4,keys:Object.keys(n.finders)||[],getFn:(e,t)=>(n.finders[t[0]](e)||[]).toString()})}search(e){return this.fuse.search(e).map(e=>e.item)}}})),define("consul-ui/utils/search/predicate",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=class{constructor(e,t){this.items=e,this.options=t}search(e){const t=this.predicate(e)
+return this.items.filter(e=>Object.entries(this.options.finders).some(([n,r])=>{const a=r(e)
+return Array.isArray(a)?a.some(t):t(a)}))}}})),define("consul-ui/utils/search/regexp",["exports","consul-ui/utils/search/predicate"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{predicate(e){let t
+try{t=new RegExp(e,"i")}catch(n){return()=>!1}return e=>t.test(e)}}e.default=n})),define("consul-ui/utils/storage/local-storage",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e="",t=window.localStorage,n=JSON.stringify,r=JSON.parse,a=function(e){window.dispatchEvent(new StorageEvent("storage",{key:e}))}){const l=e+":"
+return{getValue:function(e){let n=t.getItem(`${l}${e}`)
+"string"!=typeof n&&(n='""')
+try{n=r(n)}catch(a){n=""}return n},setValue:function(e,r){if(null===r)return this.removeValue(e)
+try{r=n(r)}catch(i){r='""'}const s=t.setItem(`${l}${e}`,r)
+return a(`${l}${e}`),s},removeValue:function(e){const n=t.removeItem(`${l}${e}`)
+return a(`${l}${e}`),n},all:function(){return Object.keys(t).reduce((e,t)=>{if(0===t.indexOf(""+l)){const n=t.substr(l.length)
+e[n]=this.getValue(n)}return e},{})}}}})),define("consul-ui/utils/templatize",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=[]){return e.map(e=>"template-"+e)}}))
+define("consul-ui/utils/ticker/index",["exports","consul-ui/utils/dom/event-target/rsvp"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.Tween=e.Ticker=void 0
+const n=class extends t.default{constructor(e=1e3/60){super(),this.setRate(e)}tick(){this.dispatchEvent({type:"tick",target:this})}setRate(e){clearInterval(this._interval),this._interval=setInterval(()=>this.tick(),e)}destroy(){clearInterval(this._interval)}},r=class extends t.default{static destroy(){void 0!==r.defaultTickerGroup&&(r.defaultTickerGroup.destroy(),delete r.defaultTickerGroup)}constructor(e){super(),this.setTickable(e)}tick(){this._tickable.tick()}setTickable(e){this._tickable=e,void 0===this._tickable.getTicker&&(this._tickable.getTicker=()=>this),this.tick=this._tickable.tick.bind(this._tickable)}getTickable(){return this._tickable}isAlive(){return this._isAlive}start(){this._isAlive=!0,this.getTickerGroup().addEventListener("tick",this.tick),this.dispatchEvent({type:"start",target:this})}stop(){this._isAlive=!1,this.getTickerGroup().removeEventListener("tick",this.tick),this.dispatchEvent({type:"stop",target:this})}activeCount(){return this.getTickerGroup().activeCount()}setTickerGroup(e){this._group=e}getTickerGroup(){return void 0===this._group&&(void 0===r.defaultTickerGroup&&(r.defaultTickerGroup=new l),this._group=r.defaultTickerGroup),this._group}}
+e.Ticker=r
+const a=function(e,t,n,r){return e/=r,n*(--e*e*e+1)+t},l=n,s=class extends class{constructor(){this._currentframe=1,this.setIncrement(1)}isAtStart(){return this._currentframe<=1}isAtEnd(){return this._currentframe>=this._totalframes}addEventListener(){return this.getTicker().addEventListener(...arguments)}removeEventListener(){return this.getTicker().removeEventListener(...arguments)}stop(){return this.gotoAndStop(this._currentframe)}play(){return this.gotoAndPlay(this._currentframe)}start(){return this.gotoAndPlay(this._currentframe)}gotoAndStop(e){this._currentframe=e
+const t=this.getTicker()
+return t.isAlive()&&t.stop(),this}gotoAndPlay(e){this._currentframe=e
+const t=this.getTicker()
+return t.isAlive()||t.start(),this}getTicker(){return void 0===this._ticker&&(this._ticker=new r(this)),this._ticker}setFrames(e){return this._totalframes=e,this}setIncrement(e){return this._increment=e,this}}{static destroy(){r.destroy()}static to(e,t,n,r){return Object.keys(t).forEach((function(n){t[n]-=e[n]})),new s(e,t,n,r).play()}constructor(e,t,n=12,r=a){super(),this.setMethod(r),this.setProps(t),this.setTarget(e),this.setFrames(n),this.tick=this.forwards}_process(){Object.keys(this._props).forEach(e=>{const t=this._method(this._currentframe,this._initialstate[e],this._props[e],this._totalframes)
+Ember.set(this._target,e,t)})}forwards(){this._currentframe<=this._totalframes?(this._process(),this._currentframe+=this._increment):(this._currentframe=this._totalframes,this.getTicker().stop())}backwards(){this._currentframe-=this._increment,this._currentframe>=0?this._process():(this.run=this.forwards,this._currentframe=1,this.getTicker().stop())}gotoAndPlay(){return void 0===this._initialstate&&(this._initialstate={},Object.keys(this._props).forEach(e=>{this._initialstate[e]=this._target[e]})),super.gotoAndPlay(...arguments)}setTarget(e){this._target=e}getTarget(e){return this._target}setProps(e){return this._props=e,this}setMethod(e){this._method=e}}
+e.Tween=s})),define("consul-ui/utils/titleize",["exports","ember-cli-string-helpers/utils/titleize"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/utils/tomography",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return function(t,n){var r=999999999,a=-999999999,l=[]
+n.forEach((function(s){if(t==s.Node){var i=s.Segment
+n.forEach((function(t){if(s.Node!=t.Node&&t.Segment==i){var n=e(s,t)
+l.push({node:t.Node,distance:n,segment:i}),n<r&&(r=n),n>a&&(a=n)}})),l.sort((function(e,t){return e.distance-t.distance}))}}))
+var s,i=l.length,o=Math.floor(i/2)
+return i>0?s=i%2?l[o].distance:(l[o-1].distance+l[o].distance)/2:(s=0,r=0,a=0),{distances:l,min:Math.trunc(100*r)/100,median:Math.trunc(100*s)/100,max:Math.trunc(100*a)/100}}}})),define("consul-ui/utils/ucfirst",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return`${e.substr(0,1).toUpperCase()}${e.substr(1)}`}})),define("consul-ui/utils/update-array-object",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,n,r){r=void 0===r?Ember.get(t,n):r
+const a=e.findIndex((function(e){return Ember.get(e,n)===r}));-1!==a&&(t instanceof Ember.ObjectProxy&&Ember.set(t,"content",e.objectAt(a)),e.replace(a,1,[t]))
+return t}})),define("consul-ui/validations/intention-permission-http-header",["exports","ember-changeset-validations/validators","ember-changeset-conditional-validations/validators/sometimes"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=()=>({Name:[(0,t.validatePresence)(!0)],Value:(0,n.default)([(0,t.validatePresence)(!0)],(function(){return"Present"!==this.get("HeaderType")}))})})),define("consul-ui/validations/intention-permission",["exports","ember-changeset-validations/validators","ember-changeset-conditional-validations/validators/sometimes"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=e=>({"*":(0,n.default)([(0,t.validatePresence)(!0)],(function(){const e=this.get("HTTP.Methods")||[],t=this.get("HTTP.Header")||[],n=this.get("HTTP.PathType")||"NoPath",r=this.get("HTTP.Path")||""
+return![0!==e.length,0!==t.length,"NoPath"!==n&&""!==r].includes(!0)})),Action:[(0,t.validateInclusion)({in:e["intention-permission"].Action.allowedValues})],HTTP:{Path:(0,n.default)([(0,t.validateFormat)({regex:/^\//})],(function(){const e=this.get("HTTP.PathType")
+return void 0!==e&&"NoPath"!==e}))}})})),define("consul-ui/validations/intention",["exports","ember-changeset-validations/validators","ember-changeset-conditional-validations/validators/sometimes"],(function(e,t,n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r={"*":(0,n.default)([(0,t.validatePresence)(!0)],(function(){const e=this.get("Action")||"",t=this.get("Permissions")||[]
+return""===e&&0===t.length})),SourceName:[(0,t.validatePresence)(!0),(0,t.validateLength)({min:1})],DestinationName:[(0,t.validatePresence)(!0),(0,t.validateLength)({min:1})],Permissions:[(0,n.default)([(0,t.validateLength)({min:1})],(function(){return!this.get("Action")}))]}
+e.default=r})),define("consul-ui/validations/kv",["exports","ember-changeset-validations/validators"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n={Key:[(0,t.validatePresence)(!0),(0,t.validateLength)({min:1})]}
+e.default=n})),define("consul-ui/validations/policy",["exports","ember-changeset-validations/validators"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n={Name:(0,t.validateFormat)({regex:/^[A-Za-z0-9\-_]{1,128}$/})}
+e.default=n})),define("consul-ui/validations/role",["exports","ember-changeset-validations/validators"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n={Name:(0,t.validateFormat)({regex:/^[A-Za-z0-9\-_]{1,256}$/})}
+e.default=n})),define("consul-ui/validations/token",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={}})),define("consul-ui/config/environment",[],(function(){try{var e="consul-ui/config/environment",t=document.querySelector('meta[name="'+e+'"]').getAttribute("content"),n={default:JSON.parse(decodeURIComponent(t))}
+return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(r){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("consul-ui/app").default.create({name:"consul-ui",version:"2.2.0+89053cb2"})
diff --git a/agent/uiserver/dist/assets/consul-ui-f5d0ec3be8cca14adb133c8e2f488419.css b/agent/uiserver/dist/assets/consul-ui-f5d0ec3be8cca14adb133c8e2f488419.css
deleted file mode 100644
index f09dcd203cfe2..0000000000000
--- a/agent/uiserver/dist/assets/consul-ui-f5d0ec3be8cca14adb133c8e2f488419.css
+++ /dev/null
@@ -1 +0,0 @@
-@charset "UTF-8";.hds-table,table{border-spacing:0}progress,sub,sup{vertical-align:baseline}.container,.w-full{width:100%}.hover\:scale-125:hover,.scale-100,.transform{transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.ease-in-out,.transition{transition-timing-function:cubic-bezier(.4,0,.2,1)}*,::after,::before{border-width:0;border-style:solid;border-color:currentColor}html{line-height:1.5;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"}a,hr{color:inherit}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;font-weight:inherit;line-height:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}menu,ol,ul{list-style:none;margin:0;padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{opacity:1;color:#9ca3af}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto}::-webkit-backdrop{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-scroll-snap-strictness:proximity;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgb(59 130 246 / 0.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000}::backdrop{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-scroll-snap-strictness:proximity;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgb(59 130 246 / 0.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}.visible{visibility:visible}.invisible{visibility:hidden}.static{position:static}.fixed{position:fixed}.absolute{position:absolute}.hds-breadcrumb,.hds-breadcrumb__item,.relative{position:relative}.sticky{position:-webkit-sticky;position:sticky}.bottom-0{bottom:0}.isolate{isolation:isolate}.ml-4{margin-left:1rem}.mb-3{margin-bottom:.75rem}.mt-2{margin-top:.5rem}.mb-1{margin-bottom:.25rem}.mr-1\.5{margin-right:.375rem}.mr-1{margin-right:.25rem}.mr-2\.5{margin-right:.625rem}.mr-2{margin-right:.5rem}.mt-6{margin-top:1.5rem}.mb-2{margin-bottom:.5rem}.mr-0\.5{margin-right:.125rem}.mr-0{margin-right:0}.mb-6{margin-bottom:1.5rem}.mt-3{margin-top:.75rem}.block{display:block}.inline{display:inline}.flex{display:flex}.inline-flex{display:inline-flex}.table{display:table}.contents{display:contents}.hidden{display:none}.h-16{height:4rem}.h-8{height:2rem}.h-4{height:1rem}.h-48{height:12rem}.h-full{height:100%}.h-12{height:3rem}.h-24{height:6rem}.w-8{width:2rem}.w-4{width:1rem}.w-24{width:6rem}.\!w-80{width:20rem!important}.flex-1{flex:1 1 0%}.shrink-0{flex-shrink:0}.scale-100{--tw-scale-x:1;--tw-scale-y:1}.cursor-pointer{cursor:pointer}.resize{resize:both}.flex-col{flex-direction:column}.flex-nowrap{flex-wrap:nowrap}.items-center{align-items:center}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.gap-1\.5{gap:.375rem}.gap-1{gap:.25rem}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-right:calc(.5rem * var(--tw-space-x-reverse));margin-left:calc(.5rem * calc(1 - var(--tw-space-x-reverse)))}.space-x-12>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-right:calc(3rem * var(--tw-space-x-reverse));margin-left:calc(3rem * calc(1 - var(--tw-space-x-reverse)))}.overflow-x-auto{overflow-x:auto}.overflow-y-scroll{overflow-y:scroll}.truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.rounded{border-radius:.25rem}.border{border-width:1px}.p-6{padding:1.5rem}.px-4{padding-left:1rem;padding-right:1rem}.px-3{padding-left:.75rem;padding-right:.75rem}.uppercase{text-transform:uppercase}.lowercase{text-transform:lowercase}.capitalize,.type-source.popover-select li:not(.partition) button{text-transform:capitalize}.underline{-webkit-text-decoration-line:underline;text-decoration-line:underline}.opacity-0{opacity:0}.shadow{--tw-shadow:0 1px 3px 0 rgb(0 0 0 / 0.1),0 1px 2px -1px rgb(0 0 0 / 0.1);--tw-shadow-colored:0 1px 3px 0 var(--tw-shadow-color),0 1px 2px -1px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.outline{outline-style:solid}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.transition{transition-property:color,background-color,border-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-text-decoration-color,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-text-decoration-color,-webkit-backdrop-filter;transition-duration:150ms}.consul-surface-nav{background:var(--token-color-palette-neutral-700)}:root{--token-color-palette-blue-500:#1c345f;--token-color-palette-blue-400:#0046d1;--token-color-palette-blue-300:#0c56e9;--token-color-palette-blue-200:#1060ff;--token-color-palette-blue-100:#cce3fe;--token-color-palette-blue-50:#f2f8ff;--token-color-palette-purple-500:#42215b;--token-color-palette-purple-400:#7b00db;--token-color-palette-purple-300:#911ced;--token-color-palette-purple-200:#a737ff;--token-color-palette-purple-100:#ead2fe;--token-color-palette-purple-50:#f9f2ff;--token-color-palette-green-500:#054220;--token-color-palette-green-400:#006619;--token-color-palette-green-300:#00781e;--token-color-palette-green-200:#008a22;--token-color-palette-green-100:#cceeda;--token-color-palette-green-50:#f2fbf6;--token-color-palette-amber-500:#542800;--token-color-palette-amber-400:#803d00;--token-color-palette-amber-300:#9e4b00;--token-color-palette-amber-200:#bb5a00;--token-color-palette-amber-100:#fbeabf;--token-color-palette-amber-50:#fff9e8;--token-color-palette-red-500:#51130a;--token-color-palette-red-400:#940004;--token-color-palette-red-300:#c00005;--token-color-palette-red-200:#e52228;--token-color-palette-red-100:#fbd4d4;--token-color-palette-red-50:#fff5f5;--token-color-palette-neutral-700:#0c0c0e;--token-color-palette-neutral-600:#3b3d45;--token-color-palette-neutral-500:#656a76;--token-color-palette-neutral-400:#8c909c;--token-color-palette-neutral-300:#c2c5cb;--token-color-palette-neutral-200:#dedfe3;--token-color-palette-neutral-100:#f1f2f3;--token-color-palette-neutral-50:#fafafa;--token-color-palette-neutral-0:#ffffff;--token-color-palette-alpha-300:#3b3d4566;--token-color-palette-alpha-200:#656a7633;--token-color-palette-alpha-100:#656a761a;--token-color-border-primary:#656a7633;--token-color-border-faint:#656a761a;--token-color-border-strong:#3b3d4566;--token-color-border-action:#cce3fe;--token-color-border-highlight:#ead2fe;--token-color-border-success:#cceeda;--token-color-border-warning:#fbeabf;--token-color-border-critical:#fbd4d4;--token-color-focus-action-internal:#0c56e9;--token-color-focus-action-external:#5990ff;--token-color-focus-critical-internal:#c00005;--token-color-focus-critical-external:#dd7578;--token-color-foreground-strong:#0c0c0e;--token-color-foreground-primary:#3b3d45;--token-color-foreground-faint:#656a76;--token-color-foreground-high-contrast:#ffffff;--token-color-foreground-disabled:#8c909c;--token-color-foreground-action:#1060ff;--token-color-foreground-action-hover:#0c56e9;--token-color-foreground-action-active:#0046d1;--token-color-foreground-highlight:#a737ff;--token-color-foreground-highlight-on-surface:#911ced;--token-color-foreground-highlight-high-contrast:#42215b;--token-color-foreground-success:#008a22;--token-color-foreground-success-on-surface:#00781e;--token-color-foreground-success-high-contrast:#054220;--token-color-foreground-warning:#bb5a00;--token-color-foreground-warning-on-surface:#9e4b00;--token-color-foreground-warning-high-contrast:#542800;--token-color-foreground-critical:#e52228;--token-color-foreground-critical-on-surface:#c00005;--token-color-foreground-critical-high-contrast:#51130a;--token-color-page-primary:#ffffff;--token-color-page-faint:#fafafa;--token-color-surface-primary:#ffffff;--token-color-surface-faint:#fafafa;--token-color-surface-strong:#f1f2f3;--token-color-surface-interactive:#ffffff;--token-color-surface-interactive-hover:#f1f2f3;--token-color-surface-interactive-active:#dedfe3;--token-color-surface-interactive-disabled:#fafafa;--token-color-surface-action:#f2f8ff;--token-color-surface-highlight:#f9f2ff;--token-color-surface-success:#f2fbf6;--token-color-surface-warning:#fff9e8;--token-color-surface-critical:#fff5f5;--token-color-hashicorp-brand:#000000;--token-color-boundary-brand:#f24c53;--token-color-boundary-foreground:#cf2d32;--token-color-boundary-surface:#ffecec;--token-color-boundary-border:#fbd7d8;--token-color-boundary-gradient-primary-start:#f97076;--token-color-boundary-gradient-primary-stop:#db363b;--token-color-boundary-gradient-faint-start:#fffafa;--token-color-boundary-gradient-faint-stop:#ffecec;--token-color-consul-brand:#e03875;--token-color-consul-foreground:#d01c5b;--token-color-consul-surface:#ffe9f1;--token-color-consul-border:#ffcede;--token-color-consul-gradient-primary-start:#ff99be;--token-color-consul-gradient-primary-stop:#da306e;--token-color-consul-gradient-faint-start:#fff9fb;--token-color-consul-gradient-faint-stop:#ffe9f1;--token-color-hcp-brand:#000000;--token-color-nomad-brand:#06d092;--token-color-nomad-foreground:#008661;--token-color-nomad-surface:#d3fdeb;--token-color-nomad-border:#bff3dd;--token-color-nomad-gradient-primary-start:#bff3dd;--token-color-nomad-gradient-primary-stop:#60dea9;--token-color-nomad-gradient-faint-start:#f3fff9;--token-color-nomad-gradient-faint-stop:#d3fdeb;--token-color-packer-brand:#02a8ef;--token-color-packer-foreground:#007eb4;--token-color-packer-surface:#d4f2ff;--token-color-packer-border:#b4e4ff;--token-color-packer-gradient-primary-start:#b4e4ff;--token-color-packer-gradient-primary-stop:#63d0ff;--token-color-packer-gradient-faint-start:#f3fcff;--token-color-packer-gradient-faint-stop:#d4f2ff;--token-color-terraform-brand:#7b42bc;--token-color-terraform-foreground:#773cb4;--token-color-terraform-surface:#f4ecff;--token-color-terraform-border:#ebdbfc;--token-color-terraform-gradient-primary-start:#bb8deb;--token-color-terraform-gradient-primary-stop:#844fba;--token-color-terraform-gradient-faint-start:#fcfaff;--token-color-terraform-gradient-faint-stop:#f4ecff;--token-color-vagrant-brand:#1868f2;--token-color-vagrant-foreground:#1c61d8;--token-color-vagrant-surface:#d6ebff;--token-color-vagrant-border:#c7dbfc;--token-color-vagrant-gradient-primary-start:#c7dbfc;--token-color-vagrant-gradient-primary-stop:#7dadff;--token-color-vagrant-gradient-faint-start:#f4faff;--token-color-vagrant-gradient-faint-stop:#d6ebff;--token-color-vault-brand:#ffd814;--token-color-vault-brand-alt:#000000;--token-color-vault-foreground:#9a6f00;--token-color-vault-surface:#fff9cf;--token-color-vault-border:#feec7b;--token-color-vault-gradient-primary-start:#feec7b;--token-color-vault-gradient-primary-stop:#ffe543;--token-color-vault-gradient-faint-start:#fffdf2;--token-color-vault-gradient-faint-stop:#fff9cf;--token-color-waypoint-brand:#14c6cb;--token-color-waypoint-foreground:#008196;--token-color-waypoint-surface:#e0fcff;--token-color-waypoint-border:#cbf1f3;--token-color-waypoint-gradient-primary-start:#cbf1f3;--token-color-waypoint-gradient-primary-stop:#62d4dc;--token-color-waypoint-gradient-faint-start:#f6feff;--token-color-waypoint-gradient-faint-stop:#e0fcff;--token-elevation-inset-box-shadow:inset 0px 1px 2px 1px #656a761a;--token-elevation-low-box-shadow:0px 1px 1px 0px #656a760d,0px 2px 2px 0px #656a760d;--token-elevation-mid-box-shadow:0px 2px 3px 0px #656a761a,0px 8px 16px -10px #656a7633;--token-elevation-high-box-shadow:0px 2px 3px 0px #656a7626,0px 16px 16px -10px #656a7633;--token-elevation-higher-box-shadow:0px 2px 3px 0px #656a761a,0px 12px 28px 0px #656a7640;--token-elevation-overlay-box-shadow:0px 2px 3px 0px #3b3d4580,0px 12px 24px 0px #3b3d4599;--token-surface-inset-box-shadow:inset 0 0 0 1px #656a764d,inset 0px 1px 2px 1px #656a761a;--token-surface-base-box-shadow:0 0 0 1px #656a7633;--token-surface-low-box-shadow:0 0 0 1px #656a7626,0px 1px 1px 0px #656a760d,0px 2px 2px 0px #656a760d;--token-surface-mid-box-shadow:0 0 0 1px #656a7626,0px 2px 3px 0px #656a761a,0px 8px 16px -10px #656a7633;--token-surface-high-box-shadow:0 0 0 1px #656a7640,0px 2px 3px 0px #656a7626,0px 16px 16px -10px #656a7633;--token-surface-higher-box-shadow:0 0 0 1px #656a7633,0px 2px 3px 0px #656a761a,0px 12px 28px 0px #656a7640;--token-surface-overlay-box-shadow:0 0 0 1px #3b3d4566,0px 2px 3px 0px #3b3d4580,0px 12px 24px 0px #3b3d4599;--token-focus-ring-action-box-shadow:inset 0 0 0 1px #0c56e9,0 0 0 3px #5990ff;--token-focus-ring-critical-box-shadow:inset 0 0 0 1px #c00005,0 0 0 3px #dd7578;--token-form-label-color:#0c0c0e;--token-form-legend-color:#0c0c0e;--token-form-helper-text-color:#656a76;--token-form-indicator-optional-color:#656a76;--token-form-error-color:#c00005;--token-form-error-icon-size:14px;--token-form-checkbox-size:16px;--token-form-checkbox-border-radius:3px;--token-form-checkbox-border-width:1px;--token-form-checkbox-background-image-size:12px;--token-form-checkbox-background-image-data-url:url("data:image/svg+xml,%3csvg viewBox='0 0 12 12' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M9.78033 3.21967C10.0732 3.51256 10.0732 3.98744 9.78033 4.28033L5.28033 8.78033C4.98744 9.07322 4.51256 9.07322 4.21967 8.78033L2.21967 6.78033C1.92678 6.48744 1.92678 6.01256 2.21967 5.71967C2.51256 5.42678 2.98744 5.42678 3.28033 5.71967L4.75 7.18934L8.71967 3.21967C9.01256 2.92678 9.48744 2.92678 9.78033 3.21967Z' fill='%23FFF'/%3e%3c/svg%3e");--token-form-checkbox-background-image-data-url-disabled:url("data:image/svg+xml,%3csvg viewBox='0 0 12 12' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M9.78033 3.21967C10.0732 3.51256 10.0732 3.98744 9.78033 4.28033L5.28033 8.78033C4.98744 9.07322 4.51256 9.07322 4.21967 8.78033L2.21967 6.78033C1.92678 6.48744 1.92678 6.01256 2.21967 5.71967C2.51256 5.42678 2.98744 5.42678 3.28033 5.71967L4.75 7.18934L8.71967 3.21967C9.01256 2.92678 9.48744 2.92678 9.78033 3.21967Z' fill='%238C909C'/%3e%3c/svg%3e");--token-form-control-base-foreground-value-color:#0c0c0e;--token-form-control-base-foreground-placeholder-color:#656a76;--token-form-control-base-surface-color-default:#ffffff;--token-form-control-base-surface-color-hover:#f1f2f3;--token-form-control-base-border-color-default:#8c909c;--token-form-control-base-border-color-hover:#656a76;--token-form-control-checked-foreground-color:#ffffff;--token-form-control-checked-surface-color-default:#1060ff;--token-form-control-checked-surface-color-hover:#0c56e9;--token-form-control-checked-border-color-default:#0c56e9;--token-form-control-checked-border-color-hover:#0046d1;--token-form-control-invalid-border-color-default:#c00005;--token-form-control-invalid-border-color-hover:#940004;--token-form-control-readonly-foreground-color:#3b3d45;--token-form-control-readonly-surface-color:#f1f2f3;--token-form-control-readonly-border-color:#656a761a;--token-form-control-disabled-foreground-color:#8c909c;--token-form-control-disabled-surface-color:#fafafa;--token-form-control-disabled-border-color:#656a7633;--token-form-control-padding:7px;--token-form-control-border-radius:5px;--token-form-control-border-width:1px;--token-form-radio-size:16px;--token-form-radio-border-width:1px;--token-form-radio-background-image-size:12px;--token-form-radio-background-image-data-url:url("data:image/svg+xml,%3csvg width='12' height='12' xmlns='http://www.w3.org/2000/svg'%3e%3ccircle cx='6' cy='6' r='2.5' fill='%23ffffff'/%3e%3c/svg%3e");--token-form-radio-background-image-data-url-disabled:url("data:image/svg+xml,%3csvg width='12' height='12' xmlns='http://www.w3.org/2000/svg'%3e%3ccircle cx='6' cy='6' r='2.5' fill='%238C909C'/%3e%3c/svg%3e");--token-form-select-background-image-size:16px;--token-form-select-background-image-position-right-x:7px;--token-form-select-background-image-position-top-y:9px;--token-form-select-background-image-data-url:url("data:image/svg+xml,%3Csvg viewBox='0 0 16 16' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M8.55 2.24a.75.75 0 0 0-1.1 0L4.2 5.74a.75.75 0 1 0 1.1 1.02L8 3.852l2.7 2.908a.75.75 0 1 0 1.1-1.02l-3.25-3.5Zm-1.1 11.52a.75.75 0 0 0 1.1 0l3.25-3.5a.75.75 0 1 0-1.1-1.02L8 12.148 5.3 9.24a.75.75 0 0 0-1.1 1.02l3.25 3.5Z' fill='%23656A76'/%3E%3C/svg%3E");--token-form-select-background-image-data-url-disabled:url("data:image/svg+xml,%3Csvg viewBox='0 0 16 16' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M8.55 2.24a.75.75 0 0 0-1.1 0L4.2 5.74a.75.75 0 1 0 1.1 1.02L8 3.852l2.7 2.908a.75.75 0 1 0 1.1-1.02l-3.25-3.5Zm-1.1 11.52a.75.75 0 0 0 1.1 0l3.25-3.5a.75.75 0 1 0-1.1-1.02L8 12.148 5.3 9.24a.75.75 0 0 0-1.1 1.02l3.25 3.5Z' fill='%238C909C'/%3E%3C/svg%3E");--token-form-text-input-background-image-size:16px;--token-form-text-input-background-image-position-x:7px;--token-form-text-input-background-image-data-url-date:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M11.5.75a.75.75 0 00-1.5 0V1H6V.75a.75.75 0 00-1.5 0V1H3.25A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1H11.5V.75zm-7 2.5V2.5H3.25a.75.75 0 00-.75.75V5h11V3.25a.75.75 0 00-.75-.75H11.5v.75a.75.75 0 01-1.5 0V2.5H6v.75a.75.75 0 01-1.5 0zm9 3.25h-11v6.25c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V6.5z' fill-rule='evenodd' clip-rule='evenodd' fill='%233B3D45'/%3e%3c/svg%3e");--token-form-text-input-background-image-data-url-time:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' xmlns='http://www.w3.org/2000/svg'%3e%3cg fill='%233B3D45'%3e%3cpath d='M8.5 3.75a.75.75 0 00-1.5 0V8c0 .284.16.544.415.67l2.5 1.25a.75.75 0 10.67-1.34L8.5 7.535V3.75z'/%3e%3cpath d='M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z' fill-rule='evenodd' clip-rule='evenodd'/%3e%3c/g%3e%3c/svg%3e");--token-form-text-input-background-image-data-url-search:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' xmlns='http://www.w3.org/2000/svg'%3e%3cg fill='%23656A76'%3e%3cpath d='M7.25 2a5.25 5.25 0 103.144 9.455l2.326 2.325a.75.75 0 101.06-1.06l-2.325-2.326A5.25 5.25 0 007.25 2zM3.5 7.25a3.75 3.75 0 117.5 0 3.75 3.75 0 01-7.5 0z' fill-rule='evenodd' clip-rule='evenodd'/%3e%3c/g%3e%3c/svg%3e");--token-form-text-input-background-image-data-url-search-cancel:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.78 4.28a.75.75 0 00-1.06-1.06L8 6.94 4.28 3.22a.75.75 0 00-1.06 1.06L6.94 8l-3.72 3.72a.75.75 0 101.06 1.06L8 9.06l3.72 3.72a.75.75 0 101.06-1.06L9.06 8l3.72-3.72z'/%3e%3c/svg%3e");--token-form-toggle-width:32px;--token-form-toggle-height:16px;--token-form-toggle-base-surface-color-default:#f1f2f3;--token-form-toggle-border-radius:3px;--token-form-toggle-border-width:1px;--token-form-toggle-background-image-size:12px;--token-form-toggle-background-image-position-x:2px;--token-form-toggle-background-image-data-url:url("data:image/svg+xml,%3csvg viewBox='0 0 12 12' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M9.78033 3.21967C10.0732 3.51256 10.0732 3.98744 9.78033 4.28033L5.28033 8.78033C4.98744 9.07322 4.51256 9.07322 4.21967 8.78033L2.21967 6.78033C1.92678 6.48744 1.92678 6.01256 2.21967 5.71967C2.51256 5.42678 2.98744 5.42678 3.28033 5.71967L4.75 7.18934L8.71967 3.21967C9.01256 2.92678 9.48744 2.92678 9.78033 3.21967Z' fill='%23FFF'/%3e%3c/svg%3e");--token-form-toggle-background-image-data-url-disabled:url("data:image/svg+xml,%3csvg viewBox='0 0 12 12' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M9.78033 3.21967C10.0732 3.51256 10.0732 3.98744 9.78033 4.28033L5.28033 8.78033C4.98744 9.07322 4.51256 9.07322 4.21967 8.78033L2.21967 6.78033C1.92678 6.48744 1.92678 6.01256 2.21967 5.71967C2.51256 5.42678 2.98744 5.42678 3.28033 5.71967L4.75 7.18934L8.71967 3.21967C9.01256 2.92678 9.48744 2.92678 9.78033 3.21967Z' fill='%238C909C'/%3e%3c/svg%3e");--token-form-toggle-transition-duration:0.2s;--token-form-toggle-transition-timing-function:cubic-bezier(0.68, -0.2, 0.265, 1.15);--token-form-toggle-thumb-size:16px;--token-typography-font-stack-display:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;--token-typography-font-stack-text:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;--token-typography-font-stack-code:ui-monospace,Menlo,Consolas,monospace;--token-typography-font-weight-regular:400;--token-typography-font-weight-medium:500;--token-typography-font-weight-semibold:600;--token-typography-font-weight-bold:700;--token-typography-display-500-font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;--token-typography-display-500-font-size:1.875rem;--token-typography-display-500-line-height:1.2666;--token-typography-display-400-font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;--token-typography-display-400-font-size:1.5rem;--token-typography-display-400-line-height:1.3333;--token-typography-display-300-font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;--token-typography-display-300-font-size:1.125rem;--token-typography-display-300-line-height:1.3333;--token-typography-display-300-letter-spacing:-0.5px;--token-typography-display-200-font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;--token-typography-display-200-font-size:1rem;--token-typography-display-200-line-height:1.5;--token-typography-display-200-letter-spacing:-0.5px;--token-typography-display-100-font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;--token-typography-display-100-font-size:0.8125rem;--token-typography-display-100-line-height:1.3846;--token-typography-body-300-font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;--token-typography-body-300-font-size:1rem;--token-typography-body-300-line-height:1.5;--token-typography-body-200-font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;--token-typography-body-200-font-size:0.875rem;--token-typography-body-200-line-height:1.4286;--token-typography-body-100-font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;--token-typography-body-100-font-size:0.8125rem;--token-typography-body-100-line-height:1.3846;--token-typography-code-100-font-family:ui-monospace,Menlo,Consolas,monospace;--token-typography-code-100-font-size:0.8125rem;--token-typography-code-100-line-height:1.23;--decor-radius-000:0;--decor-radius-100:2px;--decor-radius-200:4px;--decor-radius-250:6px;--decor-radius-300:7px;--decor-radius-999:9999px;--decor-radius-full:100%;--decor-border-000:none;--decor-border-100:1px solid;--decor-border-200:2px solid;--decor-border-300:3px solid;--decor-border-400:4px solid;--color-info:var(--token-color-foreground-action);--color-alert:var(--token-color-palette-amber-200);--typo-family-sans:BlinkMacSystemFont,-apple-system,"Segoe UI","Roboto","Oxygen","Ubuntu","Cantarell","Fira Sans","Droid Sans","Helvetica Neue","Helvetica","Arial",sans-serif;--typo-family-mono:monospace;--typo-size-000:16px;--typo-size-100:3.5rem;--typo-size-200:1.8rem;--typo-size-250:1.750rem;--typo-size-300:1.3rem;--typo-size-400:1.2rem;--typo-size-450:1.125rem;--typo-size-500:1rem;--typo-size-600:0.875rem;--typo-size-700:0.8125rem;--typo-size-800:0.75rem;--typo-weight-light:300;--typo-weight-normal:400;--typo-weight-medium:500;--typo-weight-semibold:600;--typo-weight-bold:700;--typo-lead-000:0;--typo-lead-050:1;--typo-lead-100:1.2;--typo-lead-200:1.25;--typo-lead-300:1.28;--typo-lead-500:1.33;--typo-lead-600:1.4;--typo-lead-700:1.5;--typo-lead-800:1.7;--icon-alert-triangle-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zM8.75 5.75a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z"/><path fill-rule="evenodd" d="M6.953 1.273a2.143 2.143 0 012.874.751l.002.004 5.884 9.774a2.126 2.126 0 01-.768 2.905c-.322.188-.687.289-1.06.293H2.115a2.143 2.143 0 01-1.833-1.074 2.125 2.125 0 01.006-2.124l.006-.01 5.878-9.764.002-.004c.191-.313.46-.571.78-.75zm.502 1.53l-.001.002-5.872 9.754a.626.626 0 00.231.853.644.644 0 00.314.088h11.746a.643.643 0 00.544-.32.626.626 0 000-.62l-5.87-9.755-.002-.001A.635.635 0 008 2.5a.643.643 0 00-.545.304z" clip-rule="evenodd"/></g></svg>');--icon-alert-triangle-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11 17a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1zM12.75 8.75a.75.75 0 00-1.5 0v4.5a.75.75 0 001.5 0v-4.5z"/><path fill-rule="evenodd" d="M10.658 2.366a2.651 2.651 0 012.684 0c.407.239.745.581.984.99l.002.004 8.315 14.46a2.86 2.86 0 01.008 2.758 2.757 2.757 0 01-.976 1.03c-.41.25-.877.386-1.357.392H3.682a2.653 2.653 0 01-1.357-.393 2.757 2.757 0 01-.975-1.029 2.86 2.86 0 01.007-2.758l.006-.01 8.31-14.45.001-.004a2.75 2.75 0 01.984-.99zm.313 1.744v.001L2.665 18.552a1.36 1.36 0 000 1.306c.108.198.262.36.443.47.18.11.382.169.586.172h16.61c.204-.003.406-.061.586-.172.181-.11.335-.272.444-.47a1.361 1.361 0 00-.001-1.306L13.03 4.112l-.001-.002a1.25 1.25 0 00-.446-.45 1.151 1.151 0 00-1.166 0 1.25 1.25 0 00-.446.45z" clip-rule="evenodd"/></g></svg>');--icon-arrow-left-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M7.765 4.045a.75.75 0 10-1.03-1.09L2.237 7.203a.748.748 0 00-.001 1.093l4.499 4.25a.75.75 0 001.03-1.091L4.636 8.5h8.614a.75.75 0 000-1.5H4.636l3.129-2.955z"/></svg>');--icon-arrow-left-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M11.771 5.04a.75.75 0 00-1.042-1.08l-7.5 7.25a.75.75 0 000 1.08l7.5 7.25a.75.75 0 101.042-1.08L5.605 12.5H20.25a.75.75 0 000-1.5H5.605l6.166-5.96z"/></svg>');--icon-arrow-right-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8.235 4.045a.75.75 0 111.03-1.09l4.5 4.25a.75.75 0 010 1.09l-4.5 4.25a.75.75 0 01-1.03-1.09L11.364 8.5H2.75a.75.75 0 010-1.5h8.614L8.235 4.045z"/></svg>');--icon-arrow-right-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M12.229 5.04a.75.75 0 011.042-1.08l7.5 7.25a.75.75 0 010 1.08l-7.5 7.25a.75.75 0 11-1.042-1.08l6.166-5.96H3.75a.75.75 0 010-1.5h14.645l-6.166-5.96z"/></svg>');--icon-x-square-fill-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M1 3.139C1 1.958 1.958 1 3.139 1h9.722C14.042 1 15 1.958 15 3.139v9.722A2.139 2.139 0 0112.861 15H3.14A2.139 2.139 0 011 12.861V3.14zm4.28 1.08A.75.75 0 004.22 5.28L6.94 8l-2.72 2.72a.75.75 0 101.06 1.06L8 9.06l2.72 2.72a.75.75 0 101.06-1.06L9.06 8l2.72-2.72a.75.75 0 00-1.06-1.06L8 6.94 5.28 4.22z" clip-rule="evenodd"/></svg>');--icon-x-square-fill-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M2 4.806A2.806 2.806 0 014.806 2h14.388A2.806 2.806 0 0122 4.806v14.388A2.806 2.806 0 0119.194 22H4.806A2.806 2.806 0 012 19.194V4.806zM8.28 7.22a.75.75 0 00-1.06 1.06L10.94 12l-3.72 3.72a.75.75 0 101.06 1.06L12 13.06l3.72 3.72a.75.75 0 101.06-1.06L13.06 12l3.72-3.72a.75.75 0 00-1.06-1.06L12 10.94 8.28 7.22z" clip-rule="evenodd"/></svg>');--icon-chevron-down-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.235 5.205a.75.75 0 011.06.03L8 9.158l3.705-3.923a.75.75 0 011.09 1.03l-4.25 4.5a.75.75 0 01-1.09 0l-4.25-4.5a.75.75 0 01.03-1.06z" clip-rule="evenodd"/></svg>');--icon-chevron-down-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.23 8.21a.75.75 0 011.06.02L12 14.168l5.71-5.938a.75.75 0 111.08 1.04l-6.25 6.5a.75.75 0 01-1.08 0l-6.25-6.5a.75.75 0 01.02-1.06z" clip-rule="evenodd"/></svg>');--icon-clipboard-copy-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M3.25 2.5H4v.25C4 3.44 4.56 4 5.25 4h5.5C11.44 4 12 3.44 12 2.75V2.5h.75a.75.75 0 01.75.75v3a.75.75 0 001.5 0v-3A2.25 2.25 0 0012.75 1h-.775c-.116-.57-.62-1-1.225-1h-5.5c-.605 0-1.11.43-1.225 1H3.25A2.25 2.25 0 001 3.25v10.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75v-1a.75.75 0 00-1.5 0v1a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V3.25a.75.75 0 01.75-.75zm2.25-1v1h5v-1h-5z" clip-rule="evenodd"/><path d="M4.75 5.5a.75.75 0 000 1.5h3a.75.75 0 000-1.5h-3zM4 12.25a.75.75 0 01.75-.75h3a.75.75 0 010 1.5h-3a.75.75 0 01-.75-.75zM4.75 8.5a.75.75 0 000 1.5h2a.75.75 0 000-1.5h-2zM16 9.25a.75.75 0 01-.75.75h-4.19l1.22 1.22a.75.75 0 11-1.06 1.06l-2.5-2.5a.752.752 0 010-1.06l2.5-2.5a.75.75 0 111.06 1.06L11.06 8.5h4.19a.75.75 0 01.75.75z"/></g></svg>');--icon-clipboard-copy-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M8.75 1A1.75 1.75 0 007 2.75V3H5.75A2.75 2.75 0 003 5.75v14.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25v-2.5a.75.75 0 00-1.5 0v2.5c0 .69-.56 1.25-1.25 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V5.75c0-.69.56-1.25 1.25-1.25h1.268c.121.848.85 1.5 1.732 1.5h6.5a1.75 1.75 0 001.732-1.5h1.268c.69 0 1.25.56 1.25 1.25v4.5a.75.75 0 001.5 0v-4.5A2.75 2.75 0 0018.25 3H17v-.25A1.75 1.75 0 0015.25 1h-6.5zM8.5 2.75a.25.25 0 01.25-.25h6.5a.25.25 0 01.25.25v1.5a.25.25 0 01-.25.25h-6.5a.25.25 0 01-.25-.25v-1.5z" clip-rule="evenodd"/><path d="M7 9.75A.75.75 0 017.75 9h4.5a.75.75 0 010 1.5h-4.5A.75.75 0 017 9.75zM7 17.75a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5h-4.5a.75.75 0 01-.75-.75zM7.75 13a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5zM22.75 14a.75.75 0 01-.75.75h-6.34l2.1 1.95a.75.75 0 11-1.02 1.1l-3.5-3.25a.747.747 0 01-.24-.533v-.034a.748.748 0 01.227-.521l.014-.013L16.74 10.2a.75.75 0 111.02 1.1l-2.1 1.95H22a.75.75 0 01.75.75z"/></g></svg>');--icon-docs-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M4.25 1A2.25 2.25 0 002 3.25v9.5A2.25 2.25 0 004.25 15h8.5c.69 0 1.25-.56 1.25-1.25V2.25C14 1.56 13.44 1 12.75 1h-8.5zM3.5 12.75c0 .414.336.75.75.75h8.25v-2H4.25a.75.75 0 00-.75.75v.5zm0-2.622c.235-.083.487-.128.75-.128h8.25V2.5H4.25a.75.75 0 00-.75.75v6.878z" clip-rule="evenodd"/></svg>');--icon-docs-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h13.5A1.75 1.75 0 0021 21.25V2.75A1.75 1.75 0 0019.25 1H5.75zM19.5 17.5V2.75a.25.25 0 00-.25-.25H5.75c-.69 0-1.25.56-1.25 1.25V17.8c.375-.192.8-.3 1.25-.3H19.5zm-15 2.75c0 .69.56 1.25 1.25 1.25h13.5a.25.25 0 00.25-.25V19H5.75c-.69 0-1.25.56-1.25 1.25z" clip-rule="evenodd"/></svg>');--icon-external-link-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M9 .75A.75.75 0 019.75 0h4.5c.206 0 .393.083.529.218l.001.002.002.001A.748.748 0 0115 .75v4.5a.75.75 0 01-1.5 0V2.56L7.28 8.78a.75.75 0 01-1.06-1.06l6.22-6.22H9.75A.75.75 0 019 .75z"/><path d="M3.25 3.5a.75.75 0 00-.75.75v7.5c0 .414.336.75.75.75h7.5a.75.75 0 00.75-.75v-4a.75.75 0 011.5 0v4A2.25 2.25 0 0110.75 14h-7.5A2.25 2.25 0 011 11.75v-7.5A2.25 2.25 0 013.25 2h4a.75.75 0 010 1.5h-4z"/></g></svg>');--icon-external-link-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M15 1.75a.75.75 0 01.75-.75h5.5a.748.748 0 01.75.75v5.5a.75.75 0 01-1.5 0V3.56L10.28 13.78a.75.75 0 11-1.06-1.06L19.44 2.5h-3.69a.75.75 0 01-.75-.75z"/><path d="M4.75 5.5c-.69 0-1.25.56-1.25 1.25v11.5c0 .69.56 1.25 1.25 1.25h11.5c.69 0 1.25-.56 1.25-1.25v-6.5a.75.75 0 011.5 0v6.5A2.75 2.75 0 0116.25 21H4.75A2.75 2.75 0 012 18.25V6.75A2.75 2.75 0 014.75 4h6.5a.75.75 0 010 1.5h-6.5z"/></g></svg>');--icon-file-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.25 0A2.25 2.25 0 001 2.25v11.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75V5.457c0-.331-.132-.65-.366-.884L10.427.366A1.25 1.25 0 009.543 0H3.25zM2.5 2.25a.75.75 0 01.75-.75H9v3.75c0 .414.336.75.75.75h3.75v7.75a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V2.25zm9.94 2.25L10.5 2.56V4.5h1.94z" clip-rule="evenodd"/></svg>');--icon-file-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V8.664c0-.464-.184-.909-.513-1.237l-5.914-5.914A1.75 1.75 0 0013.336 1H5.75zM4.5 3.75c0-.69.56-1.25 1.25-1.25H13v5.75c0 .414.336.75.75.75h5.75v11.25c0 .69-.56 1.25-1.25 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V3.75zM18.44 7.5L14.5 3.56V7.5h3.94z" clip-rule="evenodd"/></svg>');--icon-folder-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-7.5A2.25 2.25 0 0013.75 3H9.871a.75.75 0 01-.53-.22L8.22 1.66A2.25 2.25 0 006.629 1H2.25zM1.5 3.25a.75.75 0 01.75-.75h4.379a.75.75 0 01.53.22L8.28 3.84a2.25 2.25 0 001.591.659h3.879a.75.75 0 01.75.75v7.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75V7h10.75a.75.75 0 000-1.5H1.5V3.25z" clip-rule="evenodd"/></svg>');--icon-folder-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M3.75 2A2.75 2.75 0 001 4.75v14.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V6.75A2.75 2.75 0 0020.25 4h-7.172a1.25 1.25 0 01-.883-.366l-.829-.829A2.75 2.75 0 009.422 2H3.75zM2.5 4.75c0-.69.56-1.25 1.25-1.25h5.672c.331 0 .649.132.883.366l.829.829a2.75 2.75 0 001.944.805h7.172c.69 0 1.25.56 1.25 1.25v12.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V8.5h16.75a.75.75 0 000-1.5H2.5V4.75z" clip-rule="evenodd"/></svg>');--icon-activity-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M6.016 1a.75.75 0 01.698.521l3.306 10.33 1.47-4.341A.75.75 0 0112.2 7H15a.75.75 0 010 1.5h-2.262l-2.028 5.99a.75.75 0 01-1.424-.011L5.952 4.06 4.504 8.008A.75.75 0 013.8 8.5H1A.75.75 0 111 7h2.276l2.02-5.508c.11-.301.4-.499.72-.492z" clip-rule="evenodd"/></svg>');--icon-activity-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M9.003 2a.75.75 0 01.71.519l5.278 16.27 2.294-7.265A.75.75 0 0118 11h4a.75.75 0 010 1.5h-3.45l-2.835 8.976a.75.75 0 01-1.428.005L8.99 5.151l-2.278 6.836A.75.75 0 016 12.5H2A.75.75 0 012 11h3.46l2.828-8.487A.75.75 0 019.003 2z" clip-rule="evenodd"/></svg>');--icon-help-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M8.197 4.523a1.532 1.532 0 00-1.051.196c-.318.19-.563.49-.687.85a.75.75 0 01-1.418-.49c.239-.69.71-1.274 1.335-1.648a3.032 3.032 0 012.079-.386 3.057 3.057 0 011.829 1.065 3.13 3.13 0 01.716 2c0 .487-.092.905-.275 1.266-.182.36-.431.62-.679.817-.194.156-.41.291-.581.398l-.096.06a2.507 2.507 0 00-.452.34.643.643 0 00-.172.292.75.75 0 01-1.499-.033c0-.163.035-.324.086-.479.08-.243.232-.543.515-.832.239-.243.505-.419.72-.554.044-.029.086-.056.126-.08.169-.106.296-.186.415-.282a.976.976 0 00.279-.323c.059-.117.113-.296.113-.59v-.002a1.63 1.63 0 00-.372-1.041c-.24-.29-.57-.481-.931-.544z" clip-rule="evenodd"/><path d="M8 11a1 1 0 100 2h.007a1 1 0 100-2H8z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');--icon-help-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M12.349 7.536c-.612-.1-1.24.01-1.77.31s-.926.765-1.125 1.308a.75.75 0 11-1.408-.516A3.995 3.995 0 019.842 6.54a4.212 4.212 0 012.75-.484c.946.156 1.81.63 2.436 1.343.627.715.973 1.624.972 2.569 0 .636-.127 1.168-.369 1.62-.24.449-.569.77-.9 1.021a8.43 8.43 0 01-.804.519l-.144.085c-.294.177-.526.329-.712.507-.185.178-.264.341-.298.441a.62.62 0 00-.028.107l-.001.007a.75.75 0 01-1.5-.025c0-.198.047-.394.111-.58a2.63 2.63 0 01.677-1.032c.318-.304.675-.529.98-.712l.177-.104a6.68 6.68 0 00.636-.409 1.64 1.64 0 00.484-.533c.107-.2.191-.482.191-.913v-.001c0-.573-.21-1.132-.6-1.578a2.628 2.628 0 00-1.551-.852z" clip-rule="evenodd"/><path d="M12 16a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');--icon-learn-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8.316 2.07a.75.75 0 00-.632 0l-7 3.25a.75.75 0 000 1.36l1.434.666A.746.746 0 002 7.75V11a.75.75 0 00.158.46L2.75 11l-.592.46.001.002.001.001.003.004.008.01a1.882 1.882 0 00.103.12c.068.076.165.178.292.299.254.24.63.555 1.132.866C4.706 13.388 6.217 14 8.25 14c2.037 0 3.44-.615 4.345-1.266a5.32 5.32 0 00.977-.902 3.916 3.916 0 00.322-.448l.007-.012.003-.004v-.002h.001c0-.001 0-.002-.655-.366l.655.365A.754.754 0 0014 11V7.75a.747.747 0 00-.118-.404l1.434-.666a.75.75 0 000-1.36l-7-3.25zM12.5 7.988L8.316 9.93a.75.75 0 01-.632 0L3.5 7.988v2.723a5.585 5.585 0 00.99.776c.804.5 2.043 1.013 3.76 1.013 1.713 0 2.81-.51 3.468-.984a3.812 3.812 0 00.782-.745V7.988zM8 8.423L2.781 6 8 3.577 13.219 6 8 8.423z" clip-rule="evenodd"/></svg>');--icon-learn-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12.367 3.096a.75.75 0 00-.734 0l-10.25 5.75a.75.75 0 000 1.308l2.82 1.582A.747.747 0 004 12.25v5a.75.75 0 00.12.407l.63-.407-.63.408.001.001.002.002.003.005.009.013a2.202 2.202 0 00.118.162c.08.1.194.237.348.397.308.321.774.736 1.427 1.147C7.34 20.21 9.378 21 12.345 21c2.968 0 4.854-.79 6.018-1.646a5.597 5.597 0 001.209-1.193 3.945 3.945 0 00.339-.553 1.8 1.8 0 00.02-.043l.007-.016.002-.006.001-.002v-.001s.001-.002-.691-.29l.692.288A.75.75 0 0020 17.25v-5a.747.747 0 00-.203-.514l2.82-1.582a.75.75 0 000-1.308l-10.25-5.75zm6.133 9.368l-6.133 3.44a.75.75 0 01-.734 0L5.5 12.464v4.533c.047.055.107.124.182.202.233.242.605.577 1.144.916 1.072.675 2.833 1.385 5.52 1.385 2.686 0 4.252-.71 5.128-1.354.442-.325.722-.644.887-.87.061-.084.107-.155.139-.21v-4.602zM12 14.39L3.283 9.5 12 4.61l8.717 4.89L12 14.39z" clip-rule="evenodd"/></svg>');--icon-github-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23161514" fill-rule="evenodd" d="M8 1C4.133 1 1 4.13 1 7.993c0 3.09 2.006 5.71 4.787 6.635.35.064.478-.152.478-.337 0-.166-.006-.606-.01-1.19-1.947.423-2.357-.937-2.357-.937-.319-.808-.778-1.023-.778-1.023-.635-.434.048-.425.048-.425.703.05 1.073.72 1.073.72.624 1.07 1.638.76 2.037.582.063-.452.244-.76.444-.935-1.554-.176-3.188-.776-3.188-3.456 0-.763.273-1.388.72-1.876-.072-.177-.312-.888.07-1.85 0 0 .586-.189 1.924.716A6.711 6.711 0 018 4.381c.595.003 1.194.08 1.753.236 1.336-.905 1.923-.717 1.923-.717.382.963.142 1.674.07 1.85.448.49.72 1.114.72 1.877 0 2.686-1.638 3.278-3.197 3.45.251.216.475.643.475 1.296 0 .934-.009 1.688-.009 1.918 0 .187.127.404.482.336A6.996 6.996 0 0015 7.993 6.997 6.997 0 008 1z" clip-rule="evenodd"/></svg>');--icon-github-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23161514" fill-rule="evenodd" d="M12 2C6.477 2 2 6.476 2 11.997c0 4.417 2.865 8.163 6.839 9.485.5.092.682-.216.682-.482 0-.236-.008-.865-.013-1.7-2.782.604-3.369-1.34-3.369-1.34-.454-1.155-1.11-1.462-1.11-1.462-.908-.62.069-.608.069-.608 1.003.07 1.531 1.03 1.531 1.03.892 1.528 2.341 1.087 2.91.831.092-.646.35-1.086.636-1.336-2.22-.252-4.555-1.11-4.555-4.94 0-1.092.39-1.985 1.029-2.683-.103-.253-.446-1.27.098-2.646 0 0 .84-.269 2.75 1.025A9.581 9.581 0 0112 6.834c.85.004 1.705.115 2.504.337 1.909-1.294 2.747-1.025 2.747-1.025.546 1.376.202 2.393.1 2.646.64.698 1.028 1.591 1.028 2.682 0 3.84-2.339 4.686-4.566 4.933.359.309.678.919.678 1.852 0 1.336-.012 2.414-.012 2.741 0 .268.18.58.688.482 3.97-1.325 6.833-5.07 6.833-9.485C22 6.476 17.522 2 12 2z" clip-rule="evenodd"/></svg>');--icon-google-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%234285F4" d="M14.9 8.161c0-.476-.039-.954-.121-1.422h-6.64v2.695h3.802a3.24 3.24 0 01-1.407 2.127v1.75h2.269c1.332-1.22 2.097-3.02 2.097-5.15z"/><path fill="%2334A853" d="M8.14 15c1.898 0 3.499-.62 4.665-1.69l-2.268-1.749c-.631.427-1.446.669-2.395.669-1.836 0-3.393-1.232-3.952-2.888H1.85v1.803A7.044 7.044 0 008.14 15z"/><path fill="%23FBBC04" d="M4.187 9.341a4.17 4.17 0 010-2.68V4.858H1.849a6.97 6.97 0 000 6.287l2.338-1.803z"/><path fill="%23EA4335" d="M8.14 3.77a3.837 3.837 0 012.7 1.05l2.01-1.999a6.786 6.786 0 00-4.71-1.82 7.042 7.042 0 00-6.29 3.858L4.186 6.66c.556-1.658 2.116-2.89 3.952-2.89z"/></svg>');--icon-google-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%234285F4" d="M21.804 12.23c0-.68-.055-1.363-.173-2.032H12.2v3.85h5.4a4.63 4.63 0 01-1.998 3.04v2.498h3.222c1.893-1.742 2.98-4.314 2.98-7.356z"/><path fill="%2334A853" d="M12.2 22c2.697 0 4.971-.886 6.628-2.414l-3.222-2.499c-.897.61-2.054.956-3.402.956-2.61 0-4.821-1.76-5.615-4.127H3.264v2.576A10 10 0 0012.2 22z"/><path fill="%23FBBC04" d="M6.585 13.916a5.99 5.99 0 010-3.828V7.512H3.264a10.008 10.008 0 000 8.98l3.321-2.576z"/><path fill="%23EA4335" d="M12.2 5.958a5.434 5.434 0 013.836 1.499l2.855-2.855A9.61 9.61 0 0012.2 2.001a9.998 9.998 0 00-8.936 5.511l3.321 2.576c.79-2.37 3.006-4.13 5.615-4.13z"/></svg>');--icon-kubernetes-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23326DE6" d="M4.5 14.569c.214.278.539.431.874.431h5.251c.335 0 .66-.165.875-.434l3.258-4.178c.214-.278.288-.633.214-.978l-1.165-5.207a1.128 1.128 0 00-.606-.777l-4.714-2.31A1.062 1.062 0 008.002 1c-.168 0-.335.038-.485.115l-4.715 2.32a1.129 1.129 0 00-.605.777L1.032 9.42c-.084.345 0 .7.214.978L4.5 14.568z"/><path fill="%23fff" fill-rule="evenodd" d="M12.741 9.128c.098.003.196.01.293.024l.058.013.031.008a.308.308 0 01.26.371.306.306 0 01-.396.223h-.004l-.003-.001-.003-.001a1.58 1.58 0 00-.08-.017 2.55 2.55 0 01-.274-.106 2.867 2.867 0 00-.533-.156.243.243 0 00-.171.063 4.656 4.656 0 00-.131-.023 3.971 3.971 0 01-1.764 2.212c.015.042.032.083.051.123a.239.239 0 00-.023.18c.074.17.165.332.271.484.06.078.114.16.164.244l.028.057.012.025a.305.305 0 01-.132.434.31.31 0 01-.354-.066.307.307 0 01-.067-.107l-.01-.021a1.57 1.57 0 01-.028-.058 2.553 2.553 0 01-.089-.28 2.834 2.834 0 00-.21-.512.242.242 0 00-.156-.095 6.199 6.199 0 01-.03-.053l-.035-.064a3.97 3.97 0 01-2.823-.007l-.07.125a.249.249 0 00-.132.064 2.13 2.13 0 00-.237.548 2.518 2.518 0 01-.088.28l-.025.05-.013.027v.001a.306.306 0 01-.421.173.307.307 0 01-.132-.434l.014-.03.026-.052c.05-.085.104-.166.164-.244.108-.156.2-.322.277-.496a.302.302 0 00-.028-.173l.056-.133A3.972 3.972 0 014.22 9.532l-.134.023a.34.34 0 00-.176-.062 2.872 2.872 0 00-.533.156c-.09.04-.181.075-.274.105l-.05.011-.03.007H3.02l-.002.002h-.005a.308.308 0 01-.397-.349.306.306 0 01.261-.245l.005-.001h.002l.006-.002c.024-.006.054-.014.076-.018.097-.013.195-.021.293-.023.186-.013.37-.043.549-.09a.422.422 0 00.131-.133l.128-.037a3.938 3.938 0 01.625-2.752l-.098-.087a.338.338 0 00-.062-.176 2.854 2.854 0 00-.455-.319 2.557 2.557 0 01-.254-.148l-.048-.038-.015-.012-.004-.004a.323.323 0 01-.076-.45.295.295 0 01.244-.107.365.365 0 01.213.08l.022.017c.016.013.034.026.046.037.072.067.139.139.202.213.125.137.263.262.412.372.056.03.121.036.182.018l.11.078a3.938 3.938 0 012.552-1.224l.008-.129a.332.332 0 00.099-.157 2.844 2.844 0 00-.034-.554 2.56 2.56 0 01-.042-.29v-.082-.004A.306.306 0 018 2.82a.308.308 0 01.306.337v.087a2.529 2.529 0 01-.041.29 2.85 2.85 0 00-.035.553.242.242 0 00.1.153v.007l.007.13c.967.087 1.87.522 2.54 1.223l.116-.083a.34.34 0 00.186-.02c.149-.11.287-.235.412-.373.063-.074.13-.146.202-.213l.051-.04.017-.014a.307.307 0 11.381.477l-.024.02c-.015.012-.03.025-.043.034a2.537 2.537 0 01-.254.148 2.87 2.87 0 00-.455.32.241.241 0 00-.058.172l-.05.044-.058.053c.542.806.77 1.783.637 2.745l.123.036c.031.056.077.101.133.132.179.048.363.078.548.09zM7.291 5.24c.107-.024.216-.043.326-.056l-.09 1.6-.008.004a.268.268 0 01-.293.256.27.27 0 01-.135-.05l-.002.001-1.316-.93c.419-.41.945-.696 1.518-.825zm1.618 1.75l1.308-.924a3.182 3.182 0 00-1.833-.882l.09 1.598h.002a.268.268 0 00.294.256.27.27 0 00.135-.05l.004.002zm2.248 1.656l-1.548-.445-.002-.006a.27.27 0 01-.185-.343.27.27 0 01.08-.12L9.5 7.73l1.195-1.067c.366.594.527 1.29.46 1.983zM9.096 9.5l.618 1.49a3.148 3.148 0 001.275-1.598l-1.593-.269-.002.004a.26.26 0 00-.166.022.27.27 0 00-.13.348l-.002.003zm-.385 1.905c-.573.13-1.17.1-1.727-.088l.777-1.4h.001a.27.27 0 01.475-.001h.006l.779 1.402a3.286 3.286 0 01-.311.087zm-2.418-.422l.611-1.474-.004-.006a.268.268 0 00-.297-.37L6.6 9.13l-1.579.267a3.16 3.16 0 001.272 1.586zm-.997-4.32l1.201 1.071-.001.007a.269.269 0 01-.106.462l-.001.005-1.54.443a3.134 3.134 0 01.447-1.988zm2.95 1.154h-.492l-.307.38.11.476.443.213.442-.212.11-.476-.306-.381z" clip-rule="evenodd"/></svg>');--icon-kubernetes-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23326DE6" d="M7 21.384c.306.397.77.616 1.249.616h7.501c.48 0 .944-.236 1.25-.62l4.654-5.969a1.69 1.69 0 00.306-1.397l-1.664-7.439a1.612 1.612 0 00-.865-1.11l-6.736-3.3A1.517 1.517 0 0012.003 2c-.24 0-.48.055-.692.164L4.575 5.48c-.44.22-.759.617-.865 1.11l-1.664 7.438c-.12.494 0 1 .306 1.398L7 21.384z"/><path fill="%23fff" fill-rule="evenodd" d="M18.773 13.612c.14.003.28.014.419.033a1.424 1.424 0 01.127.03.439.439 0 01.294.695.437.437 0 01-.488.155l-.007-.001-.004-.002-.004-.001-.043-.01-.07-.014a3.664 3.664 0 01-.392-.151 4.094 4.094 0 00-.762-.224.346.346 0 00-.245.09 6.82 6.82 0 00-.187-.032 5.674 5.674 0 01-2.52 3.16c.021.06.046.119.074.176a.342.342 0 00-.034.257c.106.243.236.474.388.692.084.111.162.227.234.347l.04.082.017.036a.437.437 0 01-.545.629.44.44 0 01-.245-.257l-.015-.03-.04-.082a3.625 3.625 0 01-.126-.4 4.058 4.058 0 00-.3-.732.346.346 0 00-.223-.135l-.043-.076-.05-.092c-1.3.491-2.736.488-4.034-.01l-.099.179a.356.356 0 00-.188.091 3.044 3.044 0 00-.339.783 3.6 3.6 0 01-.126.4l-.035.073-.019.037v.002a.437.437 0 01-.602.248.439.439 0 01-.188-.621l.02-.043.036-.075c.072-.12.15-.236.235-.348.154-.223.286-.46.395-.709a.432.432 0 00-.039-.246l.08-.19a5.674 5.674 0 01-2.52-3.138l-.191.033a.485.485 0 00-.251-.088c-.261.05-.516.124-.762.223a3.683 3.683 0 01-.392.15l-.071.016c-.015.003-.03.006-.042.01h-.005l-.004.002h-.006a.44.44 0 01-.568-.498.437.437 0 01.374-.35l.006-.002.004-.001.008-.002c.035-.009.077-.02.108-.025.14-.02.28-.03.42-.034.264-.017.527-.06.783-.129a.603.603 0 00.188-.188l.183-.053a5.626 5.626 0 01.892-3.931l-.14-.125a.483.483 0 00-.088-.251 4.077 4.077 0 00-.65-.456 3.655 3.655 0 01-.363-.212 1.61 1.61 0 01-.069-.055l-.02-.017-.008-.005a.462.462 0 01-.107-.642.42.42 0 01.348-.154.522.522 0 01.305.115l.03.024.067.053c.102.096.198.198.288.305.178.195.376.373.589.53.08.042.173.051.26.026.051.037.104.075.157.111A5.626 5.626 0 0111.52 6.82l.01-.184a.474.474 0 00.142-.225c.01-.265-.007-.53-.049-.79a3.644 3.644 0 01-.06-.415l.001-.076V5.089v-.007a.437.437 0 01.615-.444.44.44 0 01.259.444v.046c.001.027.002.056 0 .078-.011.139-.031.277-.059.414a4.063 4.063 0 00-.05.79.345.345 0 00.143.218v.011l.01.184A5.734 5.734 0 0116.11 8.57l.166-.119c.09.016.181.006.265-.028.213-.158.41-.336.59-.532.09-.107.186-.209.288-.305l.073-.058.024-.019a.44.44 0 11.544.682l-.035.028-.061.05a3.634 3.634 0 01-.363.21c-.231.13-.449.283-.65.456a.344.344 0 00-.082.247 8.03 8.03 0 01-.155.138 5.65 5.65 0 01.91 3.922l.177.051a.49.49 0 00.188.19c.257.068.52.11.784.128zm-7.786-5.554a4.64 4.64 0 01.466-.08l-.13 2.285-.01.005a.383.383 0 01-.419.366.386.386 0 01-.192-.072l-.004.003-1.88-1.33a4.505 4.505 0 012.169-1.177zm2.312 2.5l1.867-1.321a4.546 4.546 0 00-2.618-1.26l.13 2.283h.002a.383.383 0 00.42.366.386.386 0 00.192-.072l.007.003zm3.21 2.365l-2.21-.635-.003-.01a.386.386 0 01-.264-.489.385.385 0 01.113-.17v-.005l1.706-1.523a4.56 4.56 0 01.658 2.832zm-2.944 1.22l.883 2.127a4.497 4.497 0 001.822-2.282l-2.275-.383-.004.004a.37.37 0 00-.236.032.385.385 0 00-.187.498l-.003.004zm-.55 2.721a4.531 4.531 0 01-2.466-.126l1.11-2h.001a.386.386 0 01.679-.001h.008l1.113 2.004c-.145.048-.293.089-.445.123zm-3.454-.602l.874-2.106-.007-.009a.383.383 0 00-.424-.528l-.003-.005-2.256.382c.338.934.977 1.73 1.816 2.266zM8.137 10.09l1.716 1.53-.002.01a.384.384 0 01-.151.66l-.002.007-2.2.633c-.11-.991.115-1.99.639-2.84zm4.214 1.648h-.703l-.438.544.157.68.633.303.631-.302.157-.68-.437-.545z" clip-rule="evenodd"/></svg>');--icon-menu-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1 3.75A.75.75 0 011.75 3h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 3.75zM1 7.75A.75.75 0 011.75 7h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 7.75zM1.75 11a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75z"/></g></svg>');--icon-menu-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M2 5.75A.75.75 0 012.75 5h18.5a.75.75 0 010 1.5H2.75A.75.75 0 012 5.75zM2 11.75a.75.75 0 01.75-.75h18.5a.75.75 0 010 1.5H2.75a.75.75 0 01-.75-.75zM2.75 17a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75z"/></g></svg>');--icon-minus-square-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.25 7a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5z"/><path fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zM2.5 3.25a.75.75 0 01.75-.75h9.5a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75v-9.5z" clip-rule="evenodd"/></g></svg>');--icon-minus-square-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.25 11a.75.75 0 000 1.5h7.5a.75.75 0 000-1.5h-7.5z"/><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25h14.5c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25V4.75z" clip-rule="evenodd"/></g></svg>');--icon-more-horizontal-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.5 6.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM8 6.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM12.5 6.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3z"/></g></svg>');--icon-more-horizontal-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M5 10a2 2 0 100 4 2 2 0 000-4zM12 10a2 2 0 100 4 2 2 0 000-4zM19 10a2 2 0 100 4 2 2 0 000-4z"/></g></svg>');--icon-globe-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM6.128 1.774A6.508 6.508 0 001.576 7H4.07a11.095 11.095 0 012.06-5.226zm3.744 0A11.096 11.096 0 0111.932 7h2.492a6.508 6.508 0 00-4.552-5.226zM10.42 7C10.165 5.124 9.333 3.335 8 1.836 6.667 3.335 5.835 5.124 5.58 7h4.84zM5.527 8.5h4.946C10.31 10.557 9.451 12.533 8 14.164 6.55 12.533 5.691 10.557 5.527 8.5zm-1.505 0H1.52a6.505 6.505 0 004.61 5.726C4.896 12.525 4.163 10.555 4.021 8.5zm5.85 5.726c1.231-1.701 1.964-3.671 2.106-5.726h2.503a6.505 6.505 0 01-4.61 5.726z" clip-rule="evenodd"/></svg>');--icon-globe-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm-1.673 1.647A9.506 9.506 0 002.552 11h4.747a16.673 16.673 0 013.028-8.353zm3.346 0A16.673 16.673 0 0116.701 11h4.747a9.506 9.506 0 00-7.775-8.353zM15.196 11A15.149 15.149 0 0012 2.916 15.149 15.149 0 008.804 11h6.392zm-6.427 1.5h6.462A15.16 15.16 0 0112 21.084 15.16 15.16 0 018.769 12.5zm-1.502 0H2.513c.23 4.45 3.525 8.091 7.814 8.853a16.683 16.683 0 01-3.06-8.853zm6.406 8.853a16.683 16.683 0 003.06-8.853h4.754c-.23 4.45-3.525 8.091-7.814 8.853z" clip-rule="evenodd"/></svg>');--icon-search-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M7.25 2a5.25 5.25 0 103.144 9.455l2.326 2.325a.75.75 0 101.06-1.06l-2.325-2.326A5.25 5.25 0 007.25 2zM3.5 7.25a3.75 3.75 0 117.5 0 3.75 3.75 0 01-7.5 0z" clip-rule="evenodd"/></svg>');--icon-search-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M10.5 2a8.5 8.5 0 105.457 15.017l4.763 4.763a.75.75 0 101.06-1.06l-4.763-4.763A8.5 8.5 0 0010.5 2zm-7 8.5a7 7 0 1114 0 7 7 0 01-14 0z" clip-rule="evenodd"/></svg>');--icon-star-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 .5a.75.75 0 01.67.412l2.064 4.094 4.622.662a.75.75 0 01.412 1.285l-3.335 3.18.786 4.488a.75.75 0 01-1.082.796L8 13.287l-4.137 2.13a.75.75 0 01-1.082-.796l.786-4.489-3.335-3.18a.75.75 0 01.412-1.284l4.622-.662L7.33.912A.75.75 0 018 .5zm0 2.416L6.43 6.03a.75.75 0 01-.564.405l-3.48.498 2.507 2.39a.75.75 0 01.22.672l-.594 3.396 3.138-1.616a.75.75 0 01.686 0l3.138 1.616-.595-3.396a.75.75 0 01.221-.672l2.507-2.39-3.48-.498a.75.75 0 01-.563-.405L8 2.916z" clip-rule="evenodd"/></svg>');--icon-star-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1a.75.75 0 01.673.418l2.992 6.065 6.694.978a.75.75 0 01.414 1.28l-4.842 4.717 1.143 6.665a.75.75 0 01-1.089.79L12 18.766l-5.985 3.149a.75.75 0 01-1.089-.79l1.143-6.666-4.842-4.717a.75.75 0 01.415-1.28l6.693-.978 2.992-6.065A.75.75 0 0112 1zm0 2.445L9.505 8.5a.75.75 0 01-.564.41l-5.58.816 4.037 3.933a.75.75 0 01.216.664l-.952 5.556 4.989-2.625a.75.75 0 01.698 0l4.99 2.625-.953-5.556a.75.75 0 01.216-.664l4.037-3.933-5.58-.816a.75.75 0 01-.564-.41L12 3.445z" clip-rule="evenodd"/></svg>');--icon-org-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h6.5A2.25 2.25 0 0112 3.25v2.112l2.05 1.453A2.25 2.25 0 0115 8.65v5.1c0 .69-.56 1.25-1.25 1.25h-2.5a.748.748 0 01-.75-.751v-11a.75.75 0 00-.75-.75h-6.5a.75.75 0 00-.75.75v11a.75.75 0 01-1.5 0v-11zM12 13.5V7.2l1.184.839a.75.75 0 01.316.612v4.85H12z" clip-rule="evenodd"/><path d="M4.75 10.55a.7.7 0 00-.7.7v3a.7.7 0 101.4 0v-2.3h2.1v2.3a.7.7 0 101.4 0v-3a.7.7 0 00-.7-.7h-3.5zM4.25 4.75A.75.75 0 015 4h.25a.75.75 0 010 1.5H5a.75.75 0 01-.75-.75zM7.75 4a.75.75 0 000 1.5H8A.75.75 0 008 4h-.25zM4.25 6.75A.75.75 0 015 6h.25a.75.75 0 010 1.5H5a.75.75 0 01-.75-.75zM7.75 6a.75.75 0 000 1.5H8A.75.75 0 008 6h-.25zM4.25 8.75A.75.75 0 015 8h.25a.75.75 0 010 1.5H5a.75.75 0 01-.75-.75zM7.75 8a.75.75 0 000 1.5H8A.75.75 0 008 8h-.25z"/></g></svg>');--icon-org-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h10.5A2.75 2.75 0 0118 4.75v5.504l2.326.988A2.75 2.75 0 0122 13.773v6.477A1.75 1.75 0 0120.25 22h-3a.746.746 0 01-.622-.33.746.746 0 01-.128-.42V10.769a.81.81 0 010-.039V4.75c0-.69-.56-1.25-1.25-1.25H4.75c-.69 0-1.25.56-1.25 1.25v16.5a.75.75 0 01-1.5 0V4.75zM18 20.5v-8.616l1.739.739c.461.196.76.649.76 1.15v6.477a.25.25 0 01-.25.25H18z" clip-rule="evenodd"/><path d="M8.25 16C7.56 16 7 16.56 7 17.25v4a.75.75 0 001.5 0V17.5h3v3.75a.75.75 0 001.5 0v-4c0-.69-.56-1.25-1.25-1.25h-3.5zM7 6.75A.75.75 0 017.75 6h.5a.75.75 0 010 1.5h-.5A.75.75 0 017 6.75zM11.75 6a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM7 9.75A.75.75 0 017.75 9h.5a.75.75 0 010 1.5h-.5A.75.75 0 017 9.75zM11.75 9a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM7 12.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75zM11.75 12a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/></g></svg>');--icon-user-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M8 1a4 4 0 100 8 4 4 0 000-8zM5.5 5a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z" clip-rule="evenodd"/><path d="M5.25 10a3.75 3.75 0 00-3.75 3.75v.5a.75.75 0 001.5 0v-.5a2.25 2.25 0 012.25-2.25h5.5A2.25 2.25 0 0113 13.75v.5a.75.75 0 001.5 0v-.5A3.75 3.75 0 0010.75 10h-5.5z"/></g></svg>');--icon-user-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M12 3a5 5 0 100 10 5 5 0 000-10zM8.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z" clip-rule="evenodd"/><path d="M7.75 14.5A4.75 4.75 0 003 19.25v1a.75.75 0 001.5 0v-1A3.25 3.25 0 017.75 16h8.5a3.25 3.25 0 013.25 3.25v1a.75.75 0 001.5 0v-1a4.75 4.75 0 00-4.75-4.75h-8.5z"/></g></svg>');--icon-users-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M6 2a3.5 3.5 0 100 7 3.5 3.5 0 000-7zM4 5.5a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/><path d="M4.25 10A3.75 3.75 0 00.5 13.75v.5a.75.75 0 001.5 0v-.5a2.25 2.25 0 012.25-2.25h3.5A2.25 2.25 0 0110 13.75v.5a.75.75 0 001.5 0v-.5A3.75 3.75 0 007.75 10h-3.5zM11.25 10.75A.75.75 0 0112 10h.25a3.25 3.25 0 013.25 3.25v1a.75.75 0 01-1.5 0v-1a1.75 1.75 0 00-1.75-1.75H12a.75.75 0 01-.75-.75zM11.273 2.24a.75.75 0 00-.546 1.396 2.001 2.001 0 010 3.728.75.75 0 00.546 1.397 3.501 3.501 0 000-6.522z"/></g></svg>');--icon-users-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M9 3a5 5 0 100 10A5 5 0 009 3zM5.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z" clip-rule="evenodd"/><path d="M4.75 14.5A4.75 4.75 0 000 19.25v1a.75.75 0 001.5 0v-1A3.25 3.25 0 014.75 16h8.5a3.25 3.25 0 013.25 3.25v1a.75.75 0 001.5 0v-1a4.75 4.75 0 00-4.75-4.75h-8.5zM18.25 15.25a.75.75 0 01.75-.75h.25A4.75 4.75 0 0124 19.25v1a.75.75 0 01-1.5 0v-1A3.25 3.25 0 0019.25 16H19a.75.75 0 01-.75-.75zM15 3a.75.75 0 000 1.5 3.5 3.5 0 110 7 .75.75 0 000 1.5 5 5 0 000-10z"/></g></svg>');--icon-alert-circle-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 4a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 018 4zM8 10a1 1 0 100 2h.007a1 1 0 100-2H8z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');--icon-alert-circle-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 7a.75.75 0 01.75.75v4.5a.75.75 0 01-1.5 0v-4.5A.75.75 0 0112 7zM12 15a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');--icon-check-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M14.78 4.28a.75.75 0 00-1.06-1.06l-7.97 7.97-3.47-3.47a.75.75 0 00-1.06 1.06l4 4a.75.75 0 001.06 0l8.5-8.5z"/></svg>');--icon-check-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M21.78 6.28a.75.75 0 00-1.06-1.06L8.75 17.19l-5.47-5.47a.75.75 0 00-1.06 1.06l6 6a.75.75 0 001.06 0l12.5-12.5z"/></svg>');--icon-check-circle-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.78 5.22a.75.75 0 010 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');--icon-check-circle-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M17.78 8.22a.75.75 0 010 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');--icon-check-circle-fill-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zm2.72 5.22a.75.75 0 111.06 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97z" clip-rule="evenodd"/></svg>');--icon-check-circle-fill-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm4.72 7.22a.75.75 0 111.06 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97z" clip-rule="evenodd"/></svg>');--icon-chevron-left-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M10.795 3.235a.75.75 0 01-.03 1.06L6.842 8l3.923 3.705a.75.75 0 01-1.03 1.09l-4.5-4.25a.75.75 0 010-1.09l4.5-4.25a.75.75 0 011.06.03z" clip-rule="evenodd"/></svg>');--icon-chevron-left-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M15.79 18.77a.75.75 0 00-.02-1.06L9.832 12l5.938-5.71a.75.75 0 10-1.04-1.08l-6.5 6.25a.75.75 0 000 1.08l6.5 6.25a.75.75 0 001.06-.02z" clip-rule="evenodd"/></svg>');--icon-chevron-right-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M5.205 3.235a.75.75 0 00.03 1.06L9.158 8l-3.923 3.705a.75.75 0 001.03 1.09l4.5-4.25a.75.75 0 000-1.09l-4.5-4.25a.75.75 0 00-1.06.03z" clip-rule="evenodd"/></svg>');--icon-chevron-right-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M8.21 18.77a.75.75 0 01.02-1.06L14.168 12 8.23 6.29a.75.75 0 111.04-1.08l6.5 6.25a.75.75 0 010 1.08l-6.5 6.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd"/></svg>');--icon-chevron-up-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.235 10.795a.75.75 0 001.06-.03L8 6.842l3.705 3.923a.75.75 0 001.09-1.03l-4.25-4.5a.75.75 0 00-1.09 0l-4.25 4.5a.75.75 0 00.03 1.06z" clip-rule="evenodd"/></svg>');--icon-chevron-up-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.23 15.79a.75.75 0 001.06-.02L12 9.832l5.71 5.938a.75.75 0 101.08-1.04l-6.25-6.5a.75.75 0 00-1.08 0l-6.25 6.5a.75.75 0 00.02 1.06z" clip-rule="evenodd"/></svg>');--icon-delay-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.5 8a6.5 6.5 0 016.744-6.496.75.75 0 10.055-1.499 8 8 0 107.036 11.193.75.75 0 00-1.375-.6 6.722 6.722 0 01-.22.453A6.5 6.5 0 011.5 8zM10.726 1.238a.75.75 0 011.013-.312c.177.094.35.194.518.3a.75.75 0 01-.799 1.27 6.512 6.512 0 00-.42-.244.75.75 0 01-.312-1.014zM13.74 3.508a.75.75 0 011.034.235c.106.168.206.34.3.518a.75.75 0 11-1.326.702 6.452 6.452 0 00-.243-.421.75.75 0 01.235-1.034zM15.217 6.979a.75.75 0 01.777.722 8.034 8.034 0 01.002.552.75.75 0 01-1.5-.047 6.713 6.713 0 000-.45.75.75 0 01.721-.777z"/><path d="M7.75 3a.75.75 0 01.75.75v3.786l2.085 1.043a.75.75 0 11-.67 1.342l-2.5-1.25A.75.75 0 017 8V3.75A.75.75 0 017.75 3z"/></g></svg>');--icon-delay-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 2.5a9.5 9.5 0 100 19 9.5 9.5 0 008.747-5.788.75.75 0 111.382.583c-.072.17-.148.338-.23.506v.002A11 11 0 0112 23C5.925 23 1 18.075 1 12S5.925 1 12 1c.186 0 .371.005.555.014a.75.75 0 01-.079 1.498A9.14 9.14 0 0012 2.5zM14.822 2.136a.75.75 0 01.971-.427c.346.135.683.287 1.01.455a.75.75 0 01-.687 1.334 9.08 9.08 0 00-.866-.39.75.75 0 01-.428-.972zM18.414 4.112a.75.75 0 011.06-.011c.263.257.513.527.749.807a.75.75 0 11-1.147.966 10.025 10.025 0 00-.651-.702.75.75 0 01-.01-1.06zM20.977 7.315a.75.75 0 01.99.381c.149.335.282.677.398 1.026a.75.75 0 11-1.422.476c-.102-.303-.218-.601-.347-.893a.75.75 0 01.38-.99zM22.174 11.239a.75.75 0 01.768.73c.01.368 0 .737-.029 1.107a.75.75 0 01-1.495-.118c.025-.317.033-.634.025-.95a.75.75 0 01.73-.77z"/><path d="M12.5 5.75a.75.75 0 00-1.5 0V12c0 .284.16.544.415.67l4.5 2.25a.75.75 0 10.67-1.34L12.5 11.536V5.75z"/></g></svg>');--icon-docs-link-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M3.5 3.25a.75.75 0 01.75-.75H8A.75.75 0 008 1H4.25A2.25 2.25 0 002 3.25v9.5A2.25 2.25 0 004.25 15h8.5c.69 0 1.25-.56 1.25-1.25V7a.75.75 0 00-1.5 0v3H4.25c-.263 0-.515.045-.75.128V3.25zm0 9v.5c0 .414.336.75.75.75h8.25v-2H4.25a.75.75 0 00-.75.75z" clip-rule="evenodd"/><path d="M12.5 3.56v.69a.75.75 0 001.5 0v-2.5a.75.75 0 00-.75-.75h-2.5a.75.75 0 000 1.5h.69L9.47 4.47a.75.75 0 001.06 1.06l1.97-1.97z"/></g></svg>');--icon-docs-link-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M4.5 3.75c0-.69.56-1.25 1.25-1.25h7.5a.75.75 0 000-1.5h-7.5A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h13.5A1.75 1.75 0 0021 21.25V8.75a.75.75 0 00-1.5 0v8.75H5.75c-.45 0-.875.108-1.25.3V3.75zm0 16.5c0 .69.56 1.25 1.25 1.25h13.5a.25.25 0 00.25-.25V19H5.75c-.69 0-1.25.56-1.25 1.25z" clip-rule="evenodd"/><path d="M19.5 3.56v1.69a.75.75 0 001.5 0v-3.5a.75.75 0 00-.75-.75h-3.5a.75.75 0 000 1.5h1.69l-2.97 2.97a.75.75 0 001.06 1.06l2.97-2.97z"/></g></svg>');--icon-eye-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 5a3 3 0 100 6 3 3 0 000-6zM6.5 8a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z"/><path d="M8 2C5.422 2 3.43 3.32 2.112 4.65A10.948 10.948 0 00.596 6.564c-.173.28-.31.536-.407.75a3 3 0 00-.122.31C.04 7.705 0 7.846 0 8s.041.296.067.375a3 3 0 00.122.31c.097.215.234.471.407.751.346.56.854 1.246 1.516 1.914C3.43 12.68 5.422 14 8 14s4.57-1.32 5.888-2.65a10.952 10.952 0 001.516-1.914c.173-.28.31-.536.407-.75.048-.107.09-.212.122-.31.026-.08.067-.221.067-.376s-.041-.296-.067-.375a2.978 2.978 0 00-.122-.31 6.777 6.777 0 00-.407-.751 10.952 10.952 0 00-1.516-1.914C12.57 3.32 10.578 2 8 2zM1.556 7.933a2.314 2.314 0 00-.03.067l.03.067c.065.145.17.344.316.58a9.45 9.45 0 001.306 1.647C4.332 11.458 5.964 12.5 8 12.5s3.668-1.042 4.822-2.206a9.45 9.45 0 001.306-1.646A5.336 5.336 0 0014.473 8a5.335 5.335 0 00-.346-.648 9.452 9.452 0 00-1.305-1.646C11.668 4.542 10.036 3.5 8 3.5S4.332 4.542 3.178 5.706a9.45 9.45 0 00-1.306 1.646 5.316 5.316 0 00-.316.58z"/></g></svg>');--icon-eye-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 8a4 4 0 100 8 4 4 0 000-8zm-2.5 4a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z"/><path d="M12 3C8.135 3 5.14 5.088 3.15 7.162c-1.001 1.043-1.767 2.1-2.286 2.936-.26.417-.46.785-.6 1.074-.069.143-.127.275-.169.388a1.952 1.952 0 00-.058.177A1.024 1.024 0 000 12c0 .116.025.216.037.263.017.06.037.12.058.177.042.113.1.245.17.388.138.289.34.657.599 1.074a18.14 18.14 0 002.285 2.936C5.14 18.912 8.135 21 12 21c3.864 0 6.86-2.088 8.85-4.162 1.001-1.043 1.767-2.1 2.286-2.936.26-.417.46-.785.6-1.074.069-.143.127-.275.169-.388a1.98 1.98 0 00.058-.177c.012-.047.037-.147.037-.263 0-.116-.025-.216-.037-.263a1.98 1.98 0 00-.058-.177 4.709 4.709 0 00-.17-.388c-.139-.289-.34-.657-.599-1.074a18.146 18.146 0 00-2.285-2.936C18.86 5.088 15.865 3 12 3zM1.615 12.177a4.225 4.225 0 01-.08-.177c.02-.048.047-.107.08-.177.113-.233.287-.554.523-.934a16.641 16.641 0 012.093-2.688C6.076 6.28 8.705 4.5 12 4.5c3.294 0 5.924 1.78 7.768 3.701a16.639 16.639 0 012.094 2.688c.236.38.41.701.523.934.033.07.06.129.08.177a4.03 4.03 0 01-.08.177c-.113.233-.287.554-.523.934a16.639 16.639 0 01-2.093 2.688C17.924 17.72 15.294 19.5 12 19.5s-5.925-1.78-7.769-3.701a16.641 16.641 0 01-2.093-2.688c-.236-.38-.41-.701-.523-.934z"/></g></svg>');--icon-eye-off-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M2.28 1.22a.75.75 0 00-1.06 1.06l1.664 1.665A10.99 10.99 0 00.977 5.994c-.295.41-.524.791-.683 1.103a4.16 4.16 0 00-.194.431A1.4 1.4 0 000 8c0 .155.041.296.067.375a3 3 0 00.122.31c.097.215.234.471.407.751.346.56.854 1.246 1.516 1.914C3.43 12.68 5.422 14 8 14c1.49 0 2.786-.442 3.868-1.071l1.852 1.851a.75.75 0 101.06-1.06l-4.645-4.646a.383.383 0 00-.008-.007v-.001l-3.19-3.19a.555.555 0 00-.014-.014L2.28 1.22zm3.127 5.248L3.95 5.01a9.444 9.444 0 00-1.754 1.857 7.362 7.362 0 00-.566.911c-.046.09-.08.164-.104.221l.03.067c.065.145.17.344.316.58a9.45 9.45 0 001.306 1.647C4.332 11.458 5.964 12.5 8 12.5c1.028 0 1.95-.264 2.763-.677l-1.23-1.23C9.078 10.858 8.552 11 8 11a3 3 0 01-3-3c0-.553.142-1.079.407-1.532zm2.985 2.985L6.547 7.608A1.62 1.62 0 006.5 8 1.5 1.5 0 008 9.5c.137 0 .269-.016.392-.047zM8 3.5c-.306 0-.602.023-.887.067a.75.75 0 11-.226-1.483C7.247 2.029 7.617 2 8 2c2.578 0 4.57 1.32 5.888 2.65.662.668 1.17 1.354 1.516 1.914.173.28.31.536.407.75.048.107.09.212.122.31.026.08.067.221.067.376 0 .21-.079.42-.126.537a4.99 4.99 0 01-.251.524c-.21.384-.515.857-.909 1.355a.75.75 0 11-1.176-.93c.343-.434.6-.836.768-1.144.078-.143.133-.258.168-.342a5.336 5.336 0 00-.346-.648 9.452 9.452 0 00-1.306-1.646C11.668 4.542 10.036 3.5 8 3.5zm6.511 4.604l-.002-.008.001.005.001.003z"/></g></svg>');--icon-eye-off-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M2.28 1.22a.75.75 0 00-1.06 1.06l3.468 3.468C3.294 6.87 2.204 8.154 1.437 9.236a15.323 15.323 0 00-1.02 1.635c-.117.22-.21.415-.277.574-.033.08-.063.16-.086.234A1.102 1.102 0 000 12c0 .116.025.216.037.263.017.06.037.12.058.177.042.113.1.245.17.388.138.289.34.657.599 1.074a18.14 18.14 0 002.285 2.936C5.14 18.912 8.135 21 12 21c2.361 0 4.4-.78 6.08-1.86l3.64 3.64a.75.75 0 101.06-1.06L2.28 1.22zm10.88 13l-3.38-3.38c-.18.345-.28.738-.28 1.16a2.5 2.5 0 002.5 2.5c.422 0 .815-.1 1.16-.28zM8.688 9.75A3.976 3.976 0 008 12a4 4 0 004 4c.835 0 1.609-.25 2.251-.688l2.74 2.74c-1.43.863-3.1 1.448-4.991 1.448-3.295 0-5.925-1.78-7.769-3.701a16.641 16.641 0 01-2.093-2.688c-.236-.38-.41-.701-.523-.934a4.225 4.225 0 01-.08-.177 5.8 5.8 0 01.207-.426c.202-.38.51-.893.919-1.47.733-1.036 1.776-2.253 3.094-3.288l2.933 2.933zM12 4.5c-.813 0-1.583.108-2.31.299a.75.75 0 11-.38-1.451A10.568 10.568 0 0112 3c3.864 0 6.86 2.088 8.85 4.162 1.001 1.043 1.767 2.1 2.286 2.936.26.417.46.785.6 1.074.069.143.127.275.169.388.021.056.041.117.058.177.012.047.037.147.037.263 0 .171-.057.332-.08.396-.034.098-.08.208-.134.326-.109.236-.265.535-.465.874-.4.68-.99 1.551-1.759 2.455a.75.75 0 01-1.142-.973 16.232 16.232 0 001.608-2.242 8.709 8.709 0 00.438-.836 4.03 4.03 0 00-.081-.177 10.392 10.392 0 00-.523-.934 16.639 16.639 0 00-2.093-2.688C17.924 6.28 15.294 4.5 12 4.5zm10.516 7.365z"/></g></svg>');--icon-file-text-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.75 8a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5zM4 11.75a.75.75 0 01.75-.75h3.5a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75zM4.75 5a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5z"/><path fill-rule="evenodd" d="M1 2.25A2.25 2.25 0 013.25 0h6.293c.331 0 .65.132.884.366l4.207 4.207c.234.235.366.553.366.884v8.293A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V2.25zm2.25-.75a.75.75 0 00-.75.75v11.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V6H9.75A.75.75 0 019 5.25V1.5H3.25zm7.25 1.06l1.94 1.94H10.5V2.56z" clip-rule="evenodd"/></g></svg>');--icon-file-text-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M7.75 12a.75.75 0 000 1.5h8a.75.75 0 000-1.5h-8zM7 16.75a.75.75 0 01.75-.75h6a.75.75 0 010 1.5h-6a.75.75 0 01-.75-.75zM7.75 8a.75.75 0 000 1.5h2a.75.75 0 000-1.5h-2z"/><path fill-rule="evenodd" d="M3 3.75A2.75 2.75 0 015.75 1h7.586c.464 0 .909.184 1.237.513l5.914 5.914c.329.328.513.773.513 1.237V20.25A2.75 2.75 0 0118.25 23H5.75A2.75 2.75 0 013 20.25V3.75zM5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V9h-5.75a.75.75 0 01-.75-.75V2.5H5.75zm8.75 1.06l3.94 3.94H14.5V3.56z" clip-rule="evenodd"/></g></svg>');--icon-gateway-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.537 5.354c.415-1.153.971-2.12 1.695-2.794C5.938 1.903 6.83 1.5 8 1.5c1.251 0 2.188.46 2.921 1.21.752.768 1.31 1.865 1.71 3.146.802 2.566.901 5.638.862 7.563-.013.594-.508 1.081-1.16 1.081H3.668c-.653 0-1.148-.487-1.16-1.083-.012-.545-.012-1.189.012-1.89a.75.75 0 10-1.499-.053 35.678 35.678 0 00-.013 1.974C1.038 14.916 2.256 16 3.668 16h8.665c1.41 0 2.63-1.082 2.66-2.55.04-1.968-.054-5.238-.93-8.041-.438-1.404-1.09-2.747-2.07-3.749C10.994.64 9.677 0 8 0 6.439 0 5.185.554 4.21 1.462c-.96.893-1.622 2.1-2.084 3.384a.75.75 0 101.411.508z"/><path d="M6.22 4.47a.75.75 0 011.06 0l3.25 3.25.008.008a.75.75 0 01-.008 1.052l-3.25 3.25a.75.75 0 01-1.06-1.06L8.19 9H1a.75.75 0 010-1.5h7.19L6.22 5.53a.75.75 0 010-1.06z"/></g></svg>');--icon-gateway-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M5.052 8.165c.624-1.654 1.469-3.072 2.593-4.071C8.753 3.108 10.164 2.5 12 2.5c2.06 0 3.592.765 4.763 1.987 1.19 1.242 2.03 2.984 2.608 4.946 1.155 3.929 1.19 8.503 1.096 10.985-.023.6-.523 1.082-1.173 1.082H4.706c-.648 0-1.15-.484-1.173-1.086a46.334 46.334 0 01.016-3.879.75.75 0 10-1.498-.07 47.832 47.832 0 00-.017 4.006C2.09 21.924 3.297 23 4.706 23h14.588c1.406 0 2.616-1.07 2.672-2.525.096-2.523.07-7.297-1.156-11.465-.614-2.086-1.545-4.08-2.964-5.561C16.405 1.946 14.488 1 12 1c-2.207 0-3.971.745-5.352 1.973-1.365 1.214-2.324 2.871-3 4.662a.75.75 0 001.404.53z"/><path d="M9.207 6.482a.75.75 0 011.06-.025l5.5 5.25c.14.133.23.322.233.531v.024a.75.75 0 01-.232.53l-5.5 5.25a.75.75 0 01-1.036-1.085L13.378 13H1.75a.75.75 0 010-1.5h11.628L9.232 7.543a.75.75 0 01-.025-1.06z"/></g></svg>');--icon-git-commit-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M10.905 7a3.001 3.001 0 00-5.81 0H2.75a.75.75 0 000 1.5h2.345a3.001 3.001 0 005.81 0h2.345a.75.75 0 000-1.5h-2.345zM8 6.25a1.5 1.5 0 100 3 1.5 1.5 0 000-3z" clip-rule="evenodd"/></svg>');--icon-git-commit-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M15.93 11a4.001 4.001 0 00-7.86 0H3.75a.75.75 0 000 1.5h4.32a4.001 4.001 0 007.86 0h4.32a.75.75 0 000-1.5h-4.32zM12 9.25a2.5 2.5 0 100 5 2.5 2.5 0 000-5z" clip-rule="evenodd"/></svg>');--icon-hexagon-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M6.834.33a2.25 2.25 0 012.332 0l5.25 3.182A2.25 2.25 0 0115.5 5.436v5.128a2.25 2.25 0 01-1.084 1.924l-5.25 3.182a2.25 2.25 0 01-2.332 0l-5.25-3.182A2.25 2.25 0 01.5 10.564V5.436a2.25 2.25 0 011.084-1.924L6.834.33zm1.555 1.283a.75.75 0 00-.778 0l-5.25 3.181A.75.75 0 002 5.436v5.128a.75.75 0 00.361.642l5.25 3.181a.75.75 0 00.778 0l5.25-3.181a.75.75 0 00.361-.642V5.436a.75.75 0 00-.361-.642l-5.25-3.181z" clip-rule="evenodd"/></svg>');--icon-hexagon-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M10.559 1.006a2.75 2.75 0 012.882 0l7.75 4.77A2.75 2.75 0 0122.5 8.118v7.764a2.75 2.75 0 01-1.309 2.342l-7.75 4.77a2.75 2.75 0 01-2.882 0l-7.75-4.77A2.75 2.75 0 011.5 15.882V8.118a2.75 2.75 0 011.309-2.342l7.75-4.77zm2.096 1.278a1.25 1.25 0 00-1.31 0l-7.75 4.77A1.25 1.25 0 003 8.117v7.764c0 .435.225.838.595 1.065l7.75 4.77a1.25 1.25 0 001.31 0l7.75-4.77c.37-.227.595-.63.595-1.065V8.118a1.25 1.25 0 00-.595-1.065l-7.75-4.77z" clip-rule="evenodd"/></svg>');--icon-history-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.5 1.25a.75.75 0 011.5 0v1.851A7 7 0 111 8a.75.75 0 011.5 0 5.5 5.5 0 101.725-4H5.75a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75v-3.5z"/><path d="M8.25 4a.75.75 0 01.75.75v3.763l1.805.802a.75.75 0 01-.61 1.37l-2.25-1A.75.75 0 017.5 9V4.75A.75.75 0 018.25 4z"/></g></svg>');--icon-history-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 3.5c-2.347 0-4.471.95-6.01 2.49A8.55 8.55 0 005.125 7H8.25a.75.75 0 010 1.5h-4.5A.75.75 0 013 7.75v-4.5a.75.75 0 011.5 0v2.135A9.971 9.971 0 0112 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12a.75.75 0 011.5 0A8.5 8.5 0 1012 3.5z"/><path d="M11.75 6a.75.75 0 01.75.75v5.787l4.085 2.042a.75.75 0 11-.67 1.342l-4.5-2.25A.75.75 0 0111 13V6.75a.75.75 0 01.75-.75z"/></g></svg>');--icon-info-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 7a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 018 7zM8 4a1 1 0 000 2h.007a1 1 0 000-2H8z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');--icon-info-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 10.5a.75.75 0 01.75.75v5.5a.75.75 0 01-1.5 0v-5.5a.75.75 0 01.75-.75zM12 7a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');--icon-layers-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M7.656.084a.75.75 0 01.689 0l7.25 3.75a.75.75 0 010 1.332l-7.25 3.75a.75.75 0 01-.69 0l-7.25-3.75a.75.75 0 010-1.332l7.25-3.75zM2.383 4.5L8 7.405 13.617 4.5 8 1.594 2.383 4.5z" clip-rule="evenodd"/><path d="M.093 10.887a.75.75 0 011.02-.294L8 14.393l6.888-3.8a.75.75 0 11.724 1.313l-7.25 4a.75.75 0 01-.724 0l-7.25-4a.75.75 0 01-.295-1.019z"/><path d="M1.112 7.093a.75.75 0 00-.724 1.313l7.25 4a.75.75 0 00.724 0l7.25-4a.75.75 0 00-.724-1.313L8 10.893l-6.888-3.8z"/></g></svg>');--icon-layers-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M11.658 1.082a.75.75 0 01.684 0l10.25 5.25a.75.75 0 010 1.336l-10.25 5.25a.75.75 0 01-.684 0l-10.25-5.25a.75.75 0 010-1.336l10.25-5.25zM3.395 7L12 11.407 20.605 7 12 2.593 3.395 7z" clip-rule="evenodd"/><path d="M1.089 16.395a.75.75 0 011.016-.306L12 21.399l9.895-5.31a.75.75 0 01.71 1.322l-10.25 5.5a.75.75 0 01-.71 0l-10.25-5.5a.75.75 0 01-.306-1.016z"/><path d="M2.105 11.089a.75.75 0 00-.71 1.322l10.25 5.5a.75.75 0 00.71 0l10.25-5.5a.75.75 0 00-.71-1.322L12 16.399l-9.895-5.31z"/></g></svg>');--icon-loading-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" class="hds-flight-icon--animation-loading"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8z" opacity=".2"/><path d="M7.25.75A.75.75 0 018 0a8 8 0 018 8 .75.75 0 01-1.5 0A6.5 6.5 0 008 1.5a.75.75 0 01-.75-.75z"/></g></svg>');--icon-loading-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="hds-flight-icon--animation-loading"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 2.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19zM1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12z" opacity=".2"/><path d="M11.25 1.75A.75.75 0 0112 1c6.075 0 11 4.925 11 11a.75.75 0 01-1.5 0A9.5 9.5 0 0012 2.5a.75.75 0 01-.75-.75z"/></g></svg>');--icon-network-alt-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M16 8a.75.75 0 00-.22-.53l-3.5-3.5a.75.75 0 10-1.06 1.06L14.19 8l-2.97 2.97a.75.75 0 101.06 1.06l3.5-3.5A.75.75 0 0016 8zM.22 8.53a.75.75 0 010-1.06l3.5-3.5a.75.75 0 011.06 1.06L1.81 8l2.97 2.97a.75.75 0 11-1.06 1.06l-3.5-3.5z"/><path d="M5 7a1 1 0 000 2h.01a1 1 0 100-2H5zM7 8a1 1 0 011-1h.01a1 1 0 010 2H8a1 1 0 01-1-1zM11 7a1 1 0 100 2h.01a1 1 0 100-2H11z"/></g></svg>');--icon-network-alt-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M23 12a.75.75 0 00-.232-.543l-5.5-5.25a.75.75 0 00-1.036 1.086L21.164 12l-4.932 4.707a.75.75 0 001.036 1.085l5.5-5.25A.75.75 0 0023 12zM1 12a.75.75 0 01.232-.543l5.5-5.25a.75.75 0 111.036 1.086L2.836 12l4.932 4.707a.75.75 0 01-1.036 1.085l-5.5-5.25A.75.75 0 011 12z"/><path d="M8 11a1 1 0 100 2h.01a1 1 0 100-2H8zM11 12a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1zM16 11a1 1 0 100 2h.01a1 1 0 100-2H16z"/></g></svg>');--icon-path-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M13 0a3 3 0 00-1.65 5.506 7.338 7.338 0 01-.78 1.493c-.22.32-.472.635-.8 1.025a1.509 1.509 0 00-.832.085 12.722 12.722 0 00-1.773-1.124c-.66-.34-1.366-.616-2.215-.871a1.5 1.5 0 10-2.708 1.204c-.9 1.935-1.236 3.607-1.409 5.838a1.5 1.5 0 101.497.095c.162-2.07.464-3.55 1.25-5.253.381-.02.725-.183.979-.435.763.23 1.367.471 1.919.756a11.13 11.13 0 011.536.973 1.5 1.5 0 102.899-.296c.348-.415.64-.779.894-1.148.375-.548.665-1.103.964-1.857A3 3 0 1013 0zm-1.5 3a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/></svg>');--icon-path-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M19.5 1a3.5 3.5 0 00-1.668 6.578c-.665 1.8-1.174 2.997-2.267 4.503a2.001 2.001 0 00-1.605.21c-1.859-1.251-3.599-1.917-5.978-2.56A2 2 0 104.48 11.3c-.616 1.268-1.071 2.439-1.406 3.674-.344 1.267-.556 2.585-.694 4.125a2 2 0 101.497.103c.132-1.465.332-2.682.644-3.835.303-1.115.715-2.186 1.29-3.375a1.997 1.997 0 001.8-.806c2.236.605 3.801 1.208 5.454 2.311A2.002 2.002 0 0015 16a2 2 0 001.74-2.986c1.25-1.71 1.815-3.057 2.537-5.021A3.5 3.5 0 1019.5 1zm-2 3.5a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/></svg>');--icon-running-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" class="hds-flight-icon--animation-running"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 1.5a6.48 6.48 0 00-4.707 2.017.75.75 0 11-1.086-1.034A7.98 7.98 0 018 0a7.98 7.98 0 015.793 2.483.75.75 0 11-1.086 1.034A6.48 6.48 0 008 1.5zM1.236 5.279a.75.75 0 01.514.927 6.503 6.503 0 004.727 8.115.75.75 0 11-.349 1.459 8.003 8.003 0 01-5.82-9.986.75.75 0 01.928-.515zm13.528 0a.75.75 0 01.928.515 8.003 8.003 0 01-5.82 9.986.75.75 0 01-.35-1.459 6.503 6.503 0 004.728-8.115.75.75 0 01.514-.927z"/><path d="M8 4.5a3.5 3.5 0 100 7 3.5 3.5 0 000-7zM3 8a5 5 0 1110 0A5 5 0 013 8z" opacity=".2"/></g></svg>');--icon-running-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="hds-flight-icon--animation-running"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 2.5a9.47 9.47 0 00-6.88 2.948.75.75 0 01-1.085-1.034A10.97 10.97 0 0112 1a10.97 10.97 0 017.965 3.414.75.75 0 11-1.086 1.034A9.47 9.47 0 0012 2.5zM2.351 8.451a.75.75 0 01.515.928A9.506 9.506 0 002.5 12c0 4.48 3.102 8.237 7.276 9.238a.75.75 0 01-.35 1.459C4.593 21.537 1 17.189 1 12c0-1.051.148-2.07.424-3.034a.75.75 0 01.927-.515zm19.297 0a.75.75 0 01.928.515C22.852 9.93 23 10.949 23 12c0 5.19-3.593 9.538-8.426 10.697a.75.75 0 11-.35-1.459c4.174-1 7.276-4.758 7.276-9.238 0-.91-.128-1.79-.366-2.621a.75.75 0 01.514-.928z"/><path d="M12 5.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM4 12a8 8 0 1116 0 8 8 0 01-16 0z" opacity=".2"/></g></svg>');--icon-skip-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 0110.535-5.096l-9.131 9.131A6.472 6.472 0 011.5 8zm2.465 5.096a6.5 6.5 0 009.131-9.131l-9.131 9.131z" clip-rule="evenodd"/></svg>');--icon-skip-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M4.172 19.728a.744.744 0 00.1.1A10.965 10.965 0 0012 23c6.075 0 11-4.925 11-11 0-3.012-1.21-5.742-3.172-7.728a.769.769 0 00-.1-.1A10.965 10.965 0 0012 1C5.925 1 1 5.925 1 12c0 3.012 1.21 5.742 3.172 7.728zM2.5 12A9.5 9.5 0 0112 2.5c2.353 0 4.507.856 6.166 2.273L4.773 18.166A9.462 9.462 0 012.5 12zm16.727-6.166A9.462 9.462 0 0121.5 12a9.5 9.5 0 01-9.5 9.5 9.462 9.462 0 01-6.166-2.273L19.227 5.834z" clip-rule="evenodd"/></svg>');--icon-socket-16:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12 20C16.4183 20 20 16.4183 20 12C20 7.58172 16.4183 4 12 4C7.58172 4 4 7.58172 4 12C4 16.4183 7.58172 20 12 20ZM12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM7 11C7 10.4477 7.44772 10 8 10H10C10.5523 10 11 10.4477 11 11V13C11 13.5523 10.5523 14 10 14H8C7.44772 14 7 13.5523 7 13V11ZM14 10C13.4477 10 13 10.4477 13 11V13C13 13.5523 13.4477 14 14 14H16C16.5523 14 17 13.5523 17 13V11C17 10.4477 16.5523 10 16 10H14Z" fill="%23000"/></svg>');--icon-socket-24:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12 20C16.4183 20 20 16.4183 20 12C20 7.58172 16.4183 4 12 4C7.58172 4 4 7.58172 4 12C4 16.4183 7.58172 20 12 20ZM12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM7 11C7 10.4477 7.44772 10 8 10H10C10.5523 10 11 10.4477 11 11V13C11 13.5523 10.5523 14 10 14H8C7.44772 14 7 13.5523 7 13V11ZM14 10C13.4477 10 13 10.4477 13 11V13C13 13.5523 13.4477 14 14 14H16C16.5523 14 17 13.5523 17 13V11C17 10.4477 16.5523 10 16 10H14Z" fill="%23000"/></svg>');--icon-star-circle-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8.679 2.431a.75.75 0 00-1.358 0L6.023 5.196l-2.887.444a.75.75 0 00-.423 1.265l2.11 2.162-.499 3.062a.75.75 0 001.103.777L8 11.484l2.573 1.422a.75.75 0 001.103-.777l-.5-3.062 2.11-2.162a.75.75 0 00-.422-1.265l-2.887-.444-1.298-2.765zM7.21 6.195L8 4.515l.789 1.68a.75.75 0 00.565.423l1.84.283L9.838 8.29a.75.75 0 00-.203.644l.312 1.912-1.584-.876a.75.75 0 00-.726 0l-1.584.876.312-1.912a.75.75 0 00-.203-.644L4.806 6.9l1.84-.282a.75.75 0 00.565-.423z"/><path d="M8 .05a7.95 7.95 0 100 15.9A7.95 7.95 0 008 .05zM1.45 8a6.55 6.55 0 1113.1 0 6.55 6.55 0 01-13.1 0z"/></g></svg>');--icon-star-circle-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12.669 4.91a.75.75 0 00-1.338 0l-1.91 3.767-4.277.608a.75.75 0 00-.41 1.287l3.082 2.923-.726 4.125a.75.75 0 001.08.798L12 16.457l3.83 1.96a.75.75 0 001.08-.797l-.726-4.125 3.082-2.923a.75.75 0 00-.41-1.287l-4.278-.608L12.67 4.91zm-2.086 4.793L12 6.91l1.417 2.794a.75.75 0 00.563.404l3.128.445-2.25 2.132a.75.75 0 00-.222.675l.535 3.036-2.83-1.448a.75.75 0 00-.683 0l-2.83 1.448.536-3.036a.75.75 0 00-.223-.675l-2.249-2.132 3.128-.445a.75.75 0 00.563-.404z"/><path d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z"/></g></svg>');--icon-star-fill-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8.67.912a.75.75 0 00-1.34 0L5.266 5.006l-4.622.662a.75.75 0 00-.412 1.285l3.335 3.18-.786 4.488a.75.75 0 001.082.796L8 13.287l4.137 2.13a.75.75 0 001.082-.796l-.786-4.488 3.335-3.18a.75.75 0 00-.412-1.285l-4.622-.662L8.67.912z"/></svg>');--icon-star-fill-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M12.673 1.418a.75.75 0 00-1.345 0L8.335 7.483l-6.693.978a.75.75 0 00-.415 1.28l4.842 4.717-1.143 6.665a.75.75 0 001.089.79L12 18.766l5.985 3.149a.75.75 0 001.089-.79l-1.143-6.666 4.842-4.717a.75.75 0 00-.415-1.28l-6.693-.978-2.992-6.065z"/></svg>');--icon-tag-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5 4a1 1 0 000 2h.006a1 1 0 000-2H5z"/><path fill-rule="evenodd" d="M2.25 1C1.56 1 1 1.56 1 2.25v5.246c0 .596.237 1.169.659 1.59l5.383 5.384a2.25 2.25 0 003.182 0l4.246-4.246a2.25 2.25 0 000-3.182L9.087 1.66A2.25 2.25 0 007.496 1H2.25zm.25 6.496V2.5h4.996a.75.75 0 01.53.22l5.383 5.383a.75.75 0 010 1.06L9.163 13.41a.75.75 0 01-1.06 0L2.72 8.026a.75.75 0 01-.22-.53z" clip-rule="evenodd"/></g></svg>');--icon-tag-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M6 5a1 1 0 000 2h.01a1 1 0 000-2H6z"/><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v6.422c0 .729.29 1.428.805 1.944l8 8a2.75 2.75 0 003.89 0l6.421-6.421a2.75 2.75 0 000-3.89l-8-8A2.75 2.75 0 0011.172 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25h6.422c.331 0 .649.132.883.366l8 8a1.25 1.25 0 010 1.768l-6.421 6.421a1.25 1.25 0 01-1.768 0l-8-8a1.25 1.25 0 01-.366-.883V4.75z" clip-rule="evenodd"/></g></svg>');--icon-x-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M12.78 4.28a.75.75 0 00-1.06-1.06L8 6.94 4.28 3.22a.75.75 0 00-1.06 1.06L6.94 8l-3.72 3.72a.75.75 0 101.06 1.06L8 9.06l3.72 3.72a.75.75 0 101.06-1.06L9.06 8l3.72-3.72z"/></svg>');--icon-x-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M18.78 6.28a.75.75 0 00-1.06-1.06L12 10.94 6.28 5.22a.75.75 0 00-1.06 1.06L10.94 12l-5.72 5.72a.75.75 0 101.06 1.06L12 13.06l5.72 5.72a.75.75 0 101.06-1.06L13.06 12l5.72-5.72z"/></svg>');--icon-x-circle-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.28 4.72a.75.75 0 010 1.06L9.06 8l2.22 2.22a.75.75 0 11-1.06 1.06L8 9.06l-2.22 2.22a.75.75 0 01-1.06-1.06L6.94 8 4.72 5.78a.75.75 0 011.06-1.06L8 6.94l2.22-2.22a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M.25 8a7.75 7.75 0 1115.5 0A7.75 7.75 0 01.25 8zM8 1.75a6.25 6.25 0 100 12.5 6.25 6.25 0 000-12.5z" clip-rule="evenodd"/></g></svg>');--icon-x-circle-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M16.78 7.22a.75.75 0 010 1.06L13.06 12l3.72 3.72a.75.75 0 11-1.06 1.06L12 13.06l-3.72 3.72a.75.75 0 01-1.06-1.06L10.94 12 7.22 8.28a.75.75 0 011.06-1.06L12 10.94l3.72-3.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M1.25 12C1.25 6.063 6.063 1.25 12 1.25S22.75 6.063 22.75 12 17.937 22.75 12 22.75 1.25 17.937 1.25 12zM12 2.75a9.25 9.25 0 100 18.5 9.25 9.25 0 000-18.5z" clip-rule="evenodd"/></g></svg>');--icon-x-square-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.139 2.5a.639.639 0 00-.639.639v9.722c0 .353.286.639.639.639h9.722a.639.639 0 00.639-.639V3.14a.639.639 0 00-.639-.639H3.14zM1 3.139C1 1.958 1.958 1 3.139 1h9.722C14.042 1 15 1.958 15 3.139v9.722A2.139 2.139 0 0112.861 15H3.14A2.139 2.139 0 011 12.861V3.14zm3.72 1.58a.75.75 0 011.06 0L8 6.94l2.22-2.22a.75.75 0 111.06 1.061L9.06 8l2.22 2.22a.75.75 0 11-1.06 1.06L8 9.06l-2.22 2.22a.75.75 0 01-1.06-1.06L6.94 8 4.72 5.78a.75.75 0 010-1.06z" clip-rule="evenodd"/></svg>');--icon-x-square-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M4.806 3.5c-.721 0-1.306.585-1.306 1.306v14.388c0 .722.585 1.306 1.306 1.306h14.388c.722 0 1.306-.584 1.306-1.306V4.806c0-.721-.584-1.306-1.306-1.306H4.806zM2 4.806A2.806 2.806 0 014.806 2h14.388A2.806 2.806 0 0122 4.806v14.388A2.806 2.806 0 0119.194 22H4.806A2.806 2.806 0 012 19.194V4.806zM7.22 7.22a.75.75 0 011.06 0L12 10.94l3.72-3.72a.75.75 0 111.06 1.06L13.06 12l3.72 3.72a.75.75 0 11-1.06 1.06L12 13.06l-3.72 3.72a.75.75 0 01-1.06-1.06L10.94 12 7.22 8.28a.75.75 0 010-1.06z" clip-rule="evenodd"/></svg>');--icon-cloud-cross-16:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 23 20" xmlns="http://www.w3.org/2000/svg"><path d="M12 13.586l3-3L16.414 12l-3 3 3 3L15 19.414l-3-3-3 3L7.586 18l3-3-2.75-2.75 1.414-1.414 2.75 2.75zM13.905.856c2.706.498 4.595 2.544 4.816 5.64l.234.066c2.46.754 3.884 2.79 3.5 5.036-.445 2.592-2.083 4.371-5.876 4.371v-2c5.054 0 4.868-5.46.23-6.152.242-2.277-1.278-4.628-3.267-4.995-1.789-.33-3.757.564-4.572 2.164-1.629-.727-2.605-.345-3.442.362-.836.706-.527 2.194-.225 2.823-1.089.915-1.901 2.013-2.152 2.987-.101.395-.091 1.014 0 1.212.428.928 1.016 1.6 4.403 1.6v2c-4.117 0-5.672-.96-6.448-2.874-.652-1.61.137-3.457 1.882-5.118-.544-1.734.01-3.297 1.391-4.267a4.89 4.89 0 013.689-.77C9.222 1.26 11.603.431 13.905.855z" fill="%236F7682" fill-rule="nonzero"/></svg>');--icon-loading-motion-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" class="hds-flight-icon--animation-loading"><style>@keyframes hds-flight-icon-animation-rotation {to {transform: rotate(360deg);}}.hds-flight-icon--animation-loading {animation: hds-flight-icon-animation-rotation .7s linear infinite;}.hds-flight-icon--animation-running {animation: hds-flight-icon-animation-rotation .7s linear infinite;}</style><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8z" opacity=".2"/><path d="M7.25.75A.75.75 0 018 0a8 8 0 018 8 .75.75 0 01-1.5 0A6.5 6.5 0 008 1.5a.75.75 0 01-.75-.75z"/></g></svg>');--icon-auth0-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M12.549 1h-4.55l1.407 4.38h4.548l-3.68 2.61 1.406 4.405c2.37-1.725 3.143-4.336 2.274-7.016L12.55 1zM2.045 5.38h4.55L8 1H3.45L2.045 5.38c-.868 2.68-.094 5.29 2.275 7.015L5.725 7.99l-3.68-2.612zm2.275 7.015L8 15l3.68-2.605L8 9.745l-3.68 2.65z"/></svg>');--icon-auth0-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M17.848 3H12l1.807 5.63h5.849l-4.732 3.358 1.807 5.663c3.046-2.218 4.042-5.575 2.925-9.02L17.848 3zM4.344 8.63h5.848L12 3H6.15L4.344 8.63c-1.117 3.446-.122 6.802 2.924 9.02l1.808-5.662-4.732-3.357zm2.924 9.02L12 21l4.731-3.35L12 14.244 7.268 17.65z"/></svg>');--icon-logo-ember-circle-color-16:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M64 0c35.346 0 64 28.654 64 64 0 35.346-28.654 64-64 64-35.346 0-64-28.654-64-64C0 28.654 28.654 0 64 0z" fill="%23E05C43" fill-rule="nonzero"/><path d="M65.265 24.128c8.246-.163 14.073 2.073 19.087 9.19 10.934 27.109-28.147 41.1-29.714 41.65l-.049.016s-1.18 7.363 10.028 7.08c13.793 0 28.294-10.691 33.81-15.21a3.293 3.293 0 0 1 4.468.265l4.13 4.29a3.291 3.291 0 0 1 .085 4.491c-3.59 3.997-12.014 12.203-24.696 17.504 0 0-21.16 9.798-35.42.52-8.503-5.53-10.842-12.151-11.793-19.038.005 0-10.324-.524-16.957-3.114-6.635-2.592.049-10.411.049-10.411s2.04-3.233 5.92 0c3.883 3.228 11.13 1.772 11.13 1.772.646-5.099 1.72-11.828 4.884-18.93 6.632-14.885 16.789-19.915 25.038-20.075zm4.853 14.915c-4.369-4.21-16.984 4.202-17.471 23.45 0 0 3.724 1.134 11.97-4.53 8.25-5.661 9.87-14.718 5.501-18.92z" fill="%23FFF"/></g></svg>');--icon-logo-glimmer-color-16:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M256 128c0 70.692-57.308 128-128 128C57.307 256 0 198.692 0 128 0 57.308 57.307 0 128 0c70.692 0 128 57.308 128 128" fill="%23F8835A"/><path d="M78.63 140.37a11.39 11.39 0 0 1-7.951-3.222c-4.533-4.392-4.648-11.627-.256-16.16l77.144-79.619c4.39-4.533 11.626-4.648 16.16-.256 4.532 4.392 4.647 11.628.255 16.161l-77.143 79.62a11.397 11.397 0 0 1-8.21 3.475zm50.31 3.036a11.356 11.356 0 0 1-7.926-3.21c-4.52-4.38-4.633-11.592-.254-16.111L181.687 61.2c4.379-4.52 11.59-4.632 16.11-.254s4.634 11.59.256 16.11l-60.928 62.884a11.363 11.363 0 0 1-8.184 3.465zm-24.69 79.286a11.383 11.383 0 0 1-7.951-3.221c-4.533-4.391-4.648-11.627-.256-16.16L202.61 93.322c4.39-4.532 11.627-4.647 16.16-.255 4.534 4.392 4.648 11.627.255 16.161L112.459 219.216a11.397 11.397 0 0 1-8.21 3.476zm-33.44-19.44c-2.865 0-5.73-1.07-7.95-3.222-4.534-4.392-4.649-11.628-.257-16.16l29.053-29.986c4.393-4.533 11.628-4.648 16.161-.256 4.533 4.393 4.647 11.628.255 16.161L79.02 199.775a11.397 11.397 0 0 1-8.209 3.476zm-23.179-86.764a11.39 11.39 0 0 1-7.952-3.221c-4.533-4.392-4.647-11.627-.255-16.16L68.477 67.12c4.393-4.533 11.628-4.647 16.161-.255 4.533 4.392 4.647 11.627.255 16.16L55.84 113.013a11.398 11.398 0 0 1-8.209 3.476zm149.433 65.295a11.39 11.39 0 0 1-7.95-3.221c-4.534-4.392-4.649-11.627-.257-16.16l13.754-14.195c4.391-4.532 11.627-4.65 16.16-.255 4.533 4.392 4.647 11.627.255 16.16l-13.753 14.195a11.397 11.397 0 0 1-8.209 3.476zm-26.78 28.338c0 6.312-5.117 11.428-11.43 11.428-6.31 0-11.428-5.116-11.428-11.428 0-6.312 5.118-11.429 11.429-11.429 6.312 0 11.429 5.117 11.429 11.43zM61.06 158.925c0 6.312-5.117 11.43-11.43 11.43-6.311 0-11.427-5.118-11.427-11.43 0-6.312 5.116-11.428 11.428-11.428 6.312 0 11.429 5.116 11.429 11.428zm54.284-112.142c0 6.312-5.117 11.428-11.428 11.428-6.312 0-11.429-5.116-11.429-11.428 0-6.312 5.117-11.43 11.429-11.43 6.311 0 11.428 5.118 11.428 11.43z" fill="%23FFF"/></svg>');--icon-logo-jwt-color-16:url('data:image/svg+xml;charset=UTF-8,<svg width="12" height="13" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M6.863 3.805V.667h-1.75v3.138l.875 1.202.875-1.202zM5.113 9.195v3.138h1.75V9.195l-.875-1.202-.875 1.202z" fill="%23fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6.863 9.195l1.844 2.543L10.13 10.7 8.275 8.168l-1.412-.466v1.493zM5.113 3.805L3.27 1.262 1.847 2.3l1.855 2.532 1.411.466V3.805z" fill="%2300F2E6"/><path fill-rule="evenodd" clip-rule="evenodd" d="M3.702 4.832L.715 3.863.167 5.532l2.986.968 1.424-.455-.875-1.213zM7.4 6.955l.875 1.213 2.987.969.548-1.669L8.823 6.5 7.4 6.955z" fill="%2300B9F1"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.823 6.5l2.987-.968-.548-1.669-2.987.969L7.4 6.045l1.423.455zM3.153 6.5l-2.986.968.548 1.669 2.987-.969.875-1.213L3.153 6.5z" fill="%23D63AFF"/><path fill-rule="evenodd" clip-rule="evenodd" d="M3.702 8.168L1.847 10.7l1.423 1.038 1.843-2.543V7.702l-1.411.466zM8.275 4.832L10.13 2.3 8.707 1.262 6.863 3.805v1.493l1.412-.466z" fill="%23FB015B"/></svg>');--icon-microsoft-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23F35325" d="M1 1h6.5v6.5H1V1z"/><path fill="%2381BC06" d="M8.5 1H15v6.5H8.5V1z"/><path fill="%2305A6F0" d="M1 8.5h6.5V15H1V8.5z"/><path fill="%23FFBA08" d="M8.5 8.5H15V15H8.5V8.5z"/></svg>');--icon-microsoft-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23F35325" d="M3 3h8.5v8.5H3V3z"/><path fill="%2381BC06" d="M12.5 3H21v8.5h-8.5V3z"/><path fill="%2305A6F0" d="M3 12.5h8.5V21H3v-8.5z"/><path fill="%23FFBA08" d="M12.5 12.5H21V21h-8.5v-8.5z"/></svg>');--icon-logo-oidc-color-16:url('data:image/svg+xml;charset=UTF-8,<svg viewbox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M12.833 8.375l-.291-2.625-.846.554c-.788-.496-1.78-.846-2.888-1.02 0 0-.554-.117-1.283-.117-.73 0-1.4.087-1.4.087-2.83.35-4.958 1.954-4.958 3.88 0 1.983 2.187 3.616 5.541 3.908v-1.138c-2.304-.32-3.762-1.4-3.762-2.77 0-1.284 1.341-2.363 3.179-2.713 0 0 1.43-.321 2.683.058.613.146 1.167.35 1.634.642l-1.109.67 3.5.584z" fill="%239E9E9E"/><path d="M6.708 2.833v10.209l1.75-.875V1.958l-1.75.875z" fill="%23000"/><path d="M6.708 2.833v10.209l1.75-.875V1.958l-1.75.875z" fill="%23FF9800"/></svg>');--icon-okta-color-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23007DC1" d="M8 1C4.143 1 1 4.12 1 8s3.121 7 7 7 7-3.121 7-7-3.143-7-7-7zm0 10.5c-1.94 0-3.5-1.56-3.5-3.5S6.06 4.5 8 4.5s3.5 1.56 3.5 3.5-1.56 3.5-3.5 3.5z"/></svg>');--icon-okta-color-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23007DC1" d="M12 2C6.49 2 2 6.458 2 12s4.459 10 10 10 10-4.459 10-10S17.51 2 12 2zm0 15c-2.77 0-5-2.23-5-5s2.23-5 5-5 5 2.23 5 5-2.23 5-5 5z"/></svg>');--icon-mesh-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M15.681 10.243A8.001 8.001 0 0016 8a7.97 7.97 0 00-2.047-5.345A1.752 1.752 0 0012.25.5h-.007c-.321 0-.623.087-.882.238A7.97 7.97 0 008 0a7.963 7.963 0 00-4.321 1.266A1.742 1.742 0 002.75 1h-.007a1.75 1.75 0 00-1.48 2.684A7.963 7.963 0 000 8a7.985 7.985 0 002.994 6.24 1.75 1.75 0 001.75 1.71h.006c.353 0 .681-.104.956-.284A8.004 8.004 0 008 16a7.985 7.985 0 006.245-3h.005a1.75 1.75 0 001.431-2.757zM2.573 4.492a1.758 1.758 0 01-.043-.005A6.47 6.47 0 001.5 8c0 1.918.83 3.642 2.152 4.832.112-.09.234-.165.366-.225-.029-3.003-.435-5.146-1.445-8.115zM6.5 14.2c0 .042-.001.084-.004.125.482.114.986.175 1.504.175a6.484 6.484 0 004.858-2.181 1.742 1.742 0 01-.242-1.713 32.908 32.908 0 00-2.306-2.179c-.067.116-.136.232-.205.347-.942 1.56-2.101 3.078-3.71 4.829.068.186.105.387.105.597zm7.826-4.698a1.776 1.776 0 00-.076-.002h-.007a1.75 1.75 0 00-.53.082 33.906 33.906 0 00-2.675-2.503c.484-.967.918-1.976 1.352-3.085a1.74 1.74 0 00.601-.158 6.518 6.518 0 011.335 5.666zM8 1.5c.89 0 1.738.179 2.51.503a1.755 1.755 0 00.476 1.464c-.379.964-.75 1.836-1.152 2.662C8.338 5.013 6.66 3.984 4.499 2.823a1.784 1.784 0 00-.013-.292A6.47 6.47 0 018 1.5zM4.094 4.309c.957 2.878 1.371 5.082 1.42 8.034 1.44-1.591 2.471-2.96 3.306-4.344.105-.174.208-.348.307-.524-1.41-1.072-2.989-2.056-5.033-3.166z" clip-rule="evenodd"/></svg>');--icon-mesh-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M22.56 15.09c.286-.98.44-2.017.44-3.09 0-3.075-1.262-5.855-3.296-7.851A1.75 1.75 0 0018 2h-.01c-.328 0-.635.09-.897.247A10.953 10.953 0 0012 1c-2.448 0-4.709.8-6.536 2.152A1.744 1.744 0 004.75 3h-.01a1.75 1.75 0 00-1.595 2.472A10.95 10.95 0 001 12a10.99 10.99 0 004.99 9.215v.035c0 .966.784 1.75 1.75 1.75h.01c.445 0 .851-.166 1.16-.44.98.286 2.017.44 3.09.44a10.99 10.99 0 009.221-5H21.25a1.75 1.75 0 001.31-2.91zM4.603 6.495a1.745 1.745 0 01-.309-.052A9.457 9.457 0 002.5 12a9.49 9.49 0 004.17 7.865c.106-.082.222-.152.345-.208-.012-4.964-.626-8.255-2.412-13.162zm4.74 14.03c.09.198.144.414.155.642A9.513 9.513 0 0012 21.5a9.49 9.49 0 007.864-4.169 1.743 1.743 0 01-.262-1.697c-1.477-1.49-2.83-2.747-4.193-3.859-1.514 2.857-3.359 5.497-6.065 8.75zm11.824-6.023c-.17.006-.333.037-.487.09-1.61-1.626-3.083-2.986-4.578-4.186.729-1.509 1.393-3.11 2.064-4.914.212-.02.412-.077.595-.166A9.47 9.47 0 0121.5 12a9.51 9.51 0 01-.333 2.502zM12 2.5a9.46 9.46 0 014.257 1.005 1.745 1.745 0 00.496 1.483 55.99 55.99 0 01-1.866 4.483c-2.418-1.785-5-3.234-8.388-4.768a1.75 1.75 0 00-.059-.407A9.457 9.457 0 0112 2.5zM6.077 6.159c1.737 4.813 2.384 8.186 2.435 13.02 2.538-3.084 4.267-5.6 5.697-8.343-2.352-1.763-4.843-3.177-8.132-4.677z" clip-rule="evenodd"/></svg>');--icon-port-16:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M8.35 3.00001C8.35 2.08874 9.08873 1.35001 10 1.35001H14C14.9113 1.35001 15.65 2.08874 15.65 3.00001V7.00001C15.65 7.91128 14.9113 8.65001 14 8.65001H12.5834C12.5836 8.66071 12.5836 8.67147 12.5833 8.68229L12.5329 10.7L21.35 10.7C21.709 10.7 22 10.991 22 11.35C22 11.709 21.709 12 21.35 12H17.5826C17.594 12.0482 17.6 12.0984 17.6 12.15V14.35H19C19.9113 14.35 20.65 15.0887 20.65 16V20C20.65 20.9113 19.9113 21.65 19 21.65H15C14.0887 21.65 13.35 20.9113 13.35 20V16C13.35 15.0887 14.0887 14.35 15 14.35H16.3V12.15C16.3 12.0984 16.306 12.0482 16.3174 12H12.012C11.96 12.012 11.9056 12.0176 11.8498 12.0162C11.8053 12.0151 11.762 12.0096 11.7202 12H7.58261C7.59398 12.0482 7.6 12.0984 7.6 12.15V14.35H9C9.91127 14.35 10.65 15.0887 10.65 16V20C10.65 20.9113 9.91127 21.65 9 21.65H5C4.08873 21.65 3.35 20.9113 3.35 20V16C3.35 15.0887 4.08873 14.35 5 14.35H6.3V12.15C6.3 12.0984 6.30602 12.0482 6.31739 12H2.65C2.29102 12 2 11.709 2 11.35C2 10.991 2.29101 10.7 2.65 10.7L11.2325 10.7L11.2838 8.65001H10C9.08873 8.65001 8.35 7.91128 8.35 7.00001V3.00001ZM10 2.65001C9.8067 2.65001 9.65 2.80671 9.65 3.00001V7.00001C9.65 7.19331 9.8067 7.35001 10 7.35001H14C14.1933 7.35001 14.35 7.19331 14.35 7.00001V3.00001C14.35 2.80671 14.1933 2.65001 14 2.65001H10ZM5 15.65C4.8067 15.65 4.65 15.8067 4.65 16V20C4.65 20.1933 4.8067 20.35 5 20.35H9C9.1933 20.35 9.35 20.1933 9.35 20V16C9.35 15.8067 9.1933 15.65 9 15.65H5ZM14.65 16C14.65 15.8067 14.8067 15.65 15 15.65H19C19.1933 15.65 19.35 15.8067 19.35 16V20C19.35 20.1933 19.1933 20.35 19 20.35H15C14.8067 20.35 14.65 20.1933 14.65 20V16Z" fill="%236F7682"/></svg>');--icon-protocol-16:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12ZM11.8104 19.9978C11.9269 19.8258 12.0639 19.6117 12.212 19.3572C12.5111 18.8431 12.8544 18.1657 13.1663 17.3382C12.9879 17.3233 12.8084 17.3101 12.6278 17.2987C11.9536 17.2562 11.2715 17.2398 10.5929 17.2563C10.8669 18.1335 11.2168 19.0463 11.6554 19.9927C11.7069 19.9949 11.7586 19.9966 11.8104 19.9978ZM9.897 19.7207C9.55842 18.9089 9.28019 18.1195 9.05511 17.354C8.53381 17.4089 8.01993 17.4871 7.51892 17.5915C7.73118 18.0727 7.97418 18.5653 8.25086 19.0689C8.7684 19.344 9.31972 19.5638 9.897 19.7207ZM5.45938 16.6077C5.48104 16.6001 5.50273 16.5925 5.52445 16.585C4.46623 13.3833 4.62347 10.6454 5.21707 8.50224C5.09245 8.46738 4.97167 8.43251 4.85496 8.39777C4.30807 9.4804 4 10.7042 4 12C4 13.7156 4.54003 15.3051 5.45938 16.6077ZM5.69311 7.07772C5.69614 7.07856 5.69918 7.07939 5.70221 7.08023C5.70623 7.07039 5.71025 7.06056 5.71427 7.05076C5.7072 7.05973 5.70015 7.06872 5.69311 7.07772ZM8.96894 4.59417C8.93129 4.63447 8.8765 4.69478 8.80813 4.77455C8.66145 4.94568 8.45292 5.20563 8.21744 5.5491C7.8904 6.02611 7.51351 6.66107 7.17773 7.44022C7.68086 7.54828 8.21954 7.64986 8.78391 7.73875L8.79848 7.68326C9.18148 6.23496 9.70589 5.06597 10.1744 4.20925C9.75921 4.30615 9.35646 4.43539 8.96894 4.59417ZM12.0548 4.00018C11.938 4.17254 11.8005 4.38729 11.6519 4.64277C11.2113 5.40008 10.6747 6.5116 10.2841 7.93527C10.6414 7.97247 11.0048 8.00331 11.3722 8.02649C12.1215 8.07374 12.8805 8.08863 13.6336 8.06207C13.3315 6.79045 12.8705 5.435 12.2062 4.00261C12.1559 4.00133 12.1054 4.00052 12.0548 4.00018ZM15.0311 19.4058C14.5954 19.5843 14.1406 19.7255 13.6705 19.8253C14.0078 19.2125 14.3757 18.4365 14.6998 17.5098C15.227 17.5833 15.7354 17.6688 16.2175 17.7617C16.0682 18.019 15.9209 18.2491 15.7826 18.4509C15.5471 18.7944 15.3386 19.0543 15.1919 19.2255C15.1235 19.3052 15.0687 19.3655 15.0311 19.4058ZM18.4508 16.7325C19.4247 15.4072 20 13.7708 20 12C20 10.7332 19.7056 9.53525 19.1814 8.47072C19.0626 8.52056 18.9428 8.56843 18.8221 8.61438C19.5339 11.495 19.2703 13.9558 18.6676 15.8898C18.5781 16.1768 18.4814 16.4516 18.3797 16.7138C18.4035 16.72 18.4272 16.7262 18.4508 16.7325ZM15.7491 4.93109C16.2637 5.8677 16.6617 6.76614 16.9623 7.6241C16.3749 7.76946 15.7668 7.87585 15.147 7.94868C14.8822 6.77294 14.493 5.53469 13.9502 4.23938C14.5831 4.39792 15.1861 4.63186 15.7491 4.93109ZM6.67301 8.86539C7.23389 8.98964 7.83778 9.10647 8.47251 9.20809C8.16114 11.101 8.13055 13.3457 8.68042 15.8864C8.10403 15.9541 7.53135 16.0491 6.96921 16.176C5.97706 13.2159 6.14482 10.7469 6.67301 8.86539ZM9.9596 9.4091C9.66322 11.1785 9.63171 13.3152 10.1908 15.7687C11.047 15.7336 11.8982 15.7497 12.7222 15.8017C13.0281 15.8209 13.3313 15.8453 13.6308 15.8739C14.0706 14.1822 14.3018 12.0541 13.9234 9.55152C13.0288 9.59288 12.1384 9.57779 11.2778 9.52351C10.8317 9.49538 10.3912 9.45656 9.9596 9.4091ZM16.9025 16.3689C16.3454 16.2539 15.7517 16.1474 15.1319 16.0564C15.5821 14.232 15.7965 12.0001 15.4213 9.42649C16.0858 9.3447 16.7447 9.22621 17.3877 9.06387C18.0053 11.6354 17.7519 13.7864 17.2355 15.4435C17.1337 15.7703 17.0212 16.0789 16.9025 16.3689Z" fill="%236F7682"/></svg>');--icon-redirect-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 3.517a1 1 0 011.62-.784l5.348 4.233a1 1 0 010 1.568l-5.347 4.233A1 1 0 018 11.983v-1.545c-.76-.043-1.484.003-2.254.218-.994.279-2.118.857-3.506 1.99a.993.993 0 01-1.129.096.962.962 0 01-.445-1.099c.415-1.5 1.425-3.141 2.808-4.412C4.69 6.114 6.244 5.241 8 5.042V3.517zm1.5 1.034v1.2a.75.75 0 01-.75.75c-1.586 0-3.066.738-4.261 1.835a8.996 8.996 0 00-1.635 2.014c.878-.552 1.695-.916 2.488-1.138 1.247-.35 2.377-.33 3.49-.207a.75.75 0 01.668.745v1.2l4.042-3.2L9.5 4.55z" clip-rule="evenodd"/></svg>');--icon-redirect-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 5.786c0-1.046 1.209-1.63 2.028-.978l7.45 5.922c.627.498.63 1.45.005 1.952l-7.45 5.997c-.817.659-2.033.077-2.033-.973v-2.754a7.316 7.316 0 00-2.824.427c-1.306.456-2.918 1.342-5.295 2.981-.436.3-.973.287-1.37.029a1.168 1.168 0 01-.479-1.326c.59-2 1.91-4.124 3.743-5.755C7.444 9.824 9.571 8.72 12 8.529V5.786zm1.5.518V9.25a.75.75 0 01-.75.75c-2.296 0-4.35.98-5.978 2.428-1.36 1.21-2.393 2.723-2.994 4.189 2.03-1.357 3.565-2.187 4.903-2.654 1.53-.535 2.769-.584 4.137-.46a.75.75 0 01.682.747v2.933l6.8-5.473-6.8-5.406z" clip-rule="evenodd"/></svg>');--icon-search-color-16:url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M15.5 14h-.79l-.28-.27A6.471 6.471 0 0 0 16 9.5 6.5 6.5 0 1 0 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" fill="%231563ff"/></svg>');--icon-sort-desc-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M2.25 3.75A.75.75 0 013 3h10a.75.75 0 010 1.5H3a.75.75 0 01-.75-.75zM3 6a.75.75 0 000 1.5h6A.75.75 0 009 6H3zM11.963 13.943a.747.747 0 00.817-.163l3-3a.75.75 0 10-1.06-1.06L13 11.44V6.75a.75.75 0 00-1.5 0v4.69L9.78 9.72a.75.75 0 00-1.06 1.06l3 3a.748.748 0 00.243.163zM3 9a.75.75 0 000 1.5h3A.75.75 0 006 9H3zM2.25 12.75A.75.75 0 013 12h3a.75.75 0 010 1.5H3a.75.75 0 01-.75-.75z"/></g></svg>');--icon-sort-desc-24:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3 5.75A.75.75 0 013.75 5h16.5a.75.75 0 010 1.5H3.75A.75.75 0 013 5.75zM3.75 9a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5zM16.963 20.443a.747.747 0 00.817-.163l4-4a.75.75 0 10-1.06-1.06L18 17.94V9.75a.75.75 0 00-1.5 0v8.19l-2.72-2.72a.75.75 0 10-1.06 1.06l4 4a.748.748 0 00.243.163zM3.75 13a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5zM3 17.75a.75.75 0 01.75-.75h3.5a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75z"/></g></svg>');--icon-union-16:url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M0 0V9V10H1H9V9H1L1 0H0Z" fill="%23000"/></svg>');--chrome-width:280px;--chrome-height:64px;--typo-action:var(--token-color-foreground-action);--decor-error:var(--token-color-foreground-critical);--typo-contrast:var(--token-color-hashicorp-brand);--syntax-light-grey:#dde3e7;--syntax-light-gray:#a4a4a4;--syntax-light-grey-blue:#6c7b81;--syntax-dark-grey:#788290;--syntax-faded-gray:#eaeaea;--syntax-atlas:#127eff;--syntax-vagrant:#2f88f7;--syntax-consul:#69499a;--syntax-terraform:#822ff7;--syntax-serf:#dd4e58;--syntax-packer:#1ddba3;--syntax-gray:lighten(#000, 89%);--syntax-red:#ff3d3d;--syntax-green:#39b54a;--syntax-dark-gray:#535f73;--syntax-gutter-grey:#2a2f36;--syntax-yellow:var(--token-color-vault-brand);--horizontal-kv-list-separator-width:18px;--horizontal-kv-list-key-separator:":";--horizontal-kv-list-key-wrapper-start:"(";--horizontal-kv-list-key-wrapper-end:")";--csv-list-separator:",";--icon-loading:icon-loading-motion}.hds-border-primary{border:1px solid var(--token-color-border-primary)}.hds-border-faint{border:1px solid var(--token-color-border-faint)}.hds-border-strong{border:1px solid var(--token-color-border-strong)}.hds-border-action{border:1px solid var(--token-color-border-action)}.hds-border-highlight{border:1px solid var(--token-color-border-highlight)}.hds-border-success{border:1px solid var(--token-color-border-success)}.hds-border-warning{border:1px solid var(--token-color-border-warning)}.hds-border-critical{border:1px solid var(--token-color-border-critical)}.hds-foreground-strong{color:var(--token-color-foreground-strong)}.hds-foreground-primary{color:var(--token-color-foreground-primary)}.hds-foreground-faint{color:var(--token-color-foreground-faint)}.hds-foreground-high-contrast{color:var(--token-color-foreground-high-contrast)}.hds-foreground-disabled{color:var(--token-color-foreground-disabled)}.hds-foreground-action{color:var(--token-color-foreground-action)}.hds-foreground-action-hover{color:var(--token-color-foreground-action-hover)}.hds-foreground-action-active{color:var(--token-color-foreground-action-active)}.hds-foreground-highlight{color:var(--token-color-foreground-highlight)}.hds-foreground-highlight-on-surface{color:var(--token-color-foreground-highlight-on-surface)}.hds-foreground-highlight-high-contrast{color:var(--token-color-foreground-highlight-high-contrast)}.hds-foreground-success{color:var(--token-color-foreground-success)}.hds-foreground-success-on-surface{color:var(--token-color-foreground-success-on-surface)}.hds-foreground-success-high-contrast{color:var(--token-color-foreground-success-high-contrast)}.hds-foreground-warning{color:var(--token-color-foreground-warning)}.hds-alert__text,.hds-foreground-warning-on-surface{color:var(--token-color-foreground-warning-on-surface)}.hds-foreground-warning-high-contrast{color:var(--token-color-foreground-warning-high-contrast)}.hds-foreground-critical{color:var(--token-color-foreground-critical)}.hds-foreground-critical-on-surface{color:var(--token-color-foreground-critical-on-surface)}.hds-foreground-critical-high-contrast{color:var(--token-color-foreground-critical-high-contrast)}.hds-page-primary{background-color:var(--token-color-page-primary)}.hds-page-faint{background-color:var(--token-color-page-faint)}.hds-surface-primary{background-color:var(--token-color-surface-primary)}.hds-surface-faint{background-color:var(--token-color-surface-faint)}.hds-surface-strong{background-color:var(--token-color-surface-strong)}.hds-surface-interactive{background-color:var(--token-color-surface-interactive)}.hds-surface-interactive-hover{background-color:var(--token-color-surface-interactive-hover)}.hds-surface-interactive-active{background-color:var(--token-color-surface-interactive-active)}.hds-surface-interactive-disabled{background-color:var(--token-color-surface-interactive-disabled)}.hds-surface-action{background-color:var(--token-color-surface-action)}.hds-surface-highlight{background-color:var(--token-color-surface-highlight)}.hds-surface-success{background-color:var(--token-color-surface-success)}.hds-surface-warning{background-color:var(--token-color-surface-warning)}.hds-surface-critical{background-color:var(--token-color-surface-critical)}.hds-elevation-inset{box-shadow:var(--token-elevation-inset-box-shadow)}.hds-elevation-low{box-shadow:var(--token-elevation-low-box-shadow)}.hds-elevation-mid{box-shadow:var(--token-elevation-mid-box-shadow)}.hds-elevation-high{box-shadow:var(--token-elevation-high-box-shadow)}.hds-elevation-higher{box-shadow:var(--token-elevation-higher-box-shadow)}.hds-elevation-overlay{box-shadow:var(--token-elevation-overlay-box-shadow)}.hds-surface-inset{box-shadow:var(--token-surface-inset-box-shadow)}.hds-surface-base{box-shadow:var(--token-surface-base-box-shadow)}.hds-surface-low{box-shadow:var(--token-surface-low-box-shadow)}.hds-surface-mid{box-shadow:var(--token-surface-mid-box-shadow)}.hds-surface-high{box-shadow:var(--token-surface-high-box-shadow)}.hds-surface-higher{box-shadow:var(--token-surface-higher-box-shadow)}.hds-surface-overlay{box-shadow:var(--token-surface-overlay-box-shadow)}.hds-breadcrumb__link.mock-focus,.hds-breadcrumb__link:focus,.hds-focus-ring-action-box-shadow{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-focus-ring-critical-box-shadow{box-shadow:var(--token-focus-ring-critical-box-shadow)}.hds-font-family-sans-display{font-family:var(--token-typography-font-stack-display)}.hds-font-family-sans-text{font-family:var(--token-typography-font-stack-text)}.hds-font-family-mono-code{font-family:var(--token-typography-font-stack-code)}.hds-font-weight-regular{font-weight:400}.hds-font-weight-medium{font-weight:500}.hds-font-weight-semibold{font-weight:600}.hds-font-weight-bold{font-weight:700}.hds-typography-display-500{font-family:var(--token-typography-display-500-font-family);font-size:var(--token-typography-display-500-font-size);line-height:var(--token-typography-display-500-line-height);margin:0;padding:0}.hds-typography-display-400{font-family:var(--token-typography-display-400-font-family);font-size:var(--token-typography-display-400-font-size);line-height:var(--token-typography-display-400-line-height);margin:0;padding:0}.hds-typography-display-300{font-family:var(--token-typography-display-300-font-family);font-size:var(--token-typography-display-300-font-size);line-height:var(--token-typography-display-300-line-height);margin:0;padding:0}.hds-typography-display-200{font-family:var(--token-typography-display-200-font-family);font-size:var(--token-typography-display-200-font-size);line-height:var(--token-typography-display-200-line-height);margin:0;padding:0}.hds-typography-display-100{font-family:var(--token-typography-display-100-font-family);font-size:var(--token-typography-display-100-font-size);line-height:var(--token-typography-display-100-line-height);margin:0;padding:0}.hds-typography-body-300{font-family:var(--token-typography-body-300-font-family);font-size:var(--token-typography-body-300-font-size);line-height:var(--token-typography-body-300-line-height);margin:0;padding:0}.hds-typography-body-200{font-family:var(--token-typography-body-200-font-family);font-size:var(--token-typography-body-200-font-size);line-height:var(--token-typography-body-200-line-height);margin:0;padding:0}.hds-typography-body-100{font-family:var(--token-typography-body-100-font-family);font-size:var(--token-typography-body-100-font-size);line-height:var(--token-typography-body-100-line-height);margin:0;padding:0}.hds-typography-code-100{font-family:var(--token-typography-code-100-font-family);font-size:var(--token-typography-code-100-font-size);line-height:var(--token-typography-code-100-line-height);margin:0;padding:0}.hds-alert{display:flex;align-items:flex-start}.hds-alert__icon{flex:none;width:20px;height:20px;margin-right:12px}.hds-alert__content{flex:1 1 auto}.hds-alert__text{display:flex;flex-direction:column;justify-content:center;font-size:var(--token-typography-body-200-font-size);font-family:var(--token-typography-body-200-font-family);line-height:var(--token-typography-body-200-line-height)}.hds-alert--type-compact .hds-alert__text,.hds-pagination-size-selector>select{font-size:var(--token-typography-body-100-font-size);font-family:var(--token-typography-body-100-font-family);line-height:var(--token-typography-body-100-line-height)}.hds-alert__title{font-weight:var(--token-typography-font-weight-semibold)}.hds-alert__description{color:var(--token-color-foreground-primary);font-weight:var(--token-typography-font-weight-regular);word-break:break-word}.hds-alert__title+.hds-alert__description{margin-top:4px}.hds-alert__description strong{font-weight:var(--token-typography-font-weight-semibold)}.hds-badge-count,.hds-badge__text,.hds-link-standalone{font-weight:var(--token-typography-font-weight-medium)}.hds-alert__description code,.hds-alert__description pre{display:inline;padding:1px 5px;font-size:.9em;font-family:var(--token-typography-code-100-font-family);line-height:1em;background-color:var(--token-color-surface-primary);border:1px solid var(--token-color-palette-neutral-200);border-radius:5px}.hds-badge-count,.hds-badge__text,.hds-breadcrumb__text,.hds-button,.hds-link-standalone,.hds-stepper-indicator-step__text,.hds-tag{font-family:var(--token-typography-font-stack-text)}.hds-alert__description a{color:var(--token-color-foreground-action)}.hds-alert__description a:focus,.hds-alert__description a:focus-visible{text-decoration:none;outline:var(--token-color-focus-action-internal) solid 2px;outline-offset:1px}.hds-alert__description a:hover{color:var(--token-color-foreground-action-hover)}.hds-alert__description a:active{color:var(--token-color-foreground-action-active)}.hds-alert__actions{display:flex;align-items:center}.hds-alert--type-compact .hds-alert__title,button.hds-button[href] .hds-button__text,button.hds-button[href]::before{display:none}.hds-alert__actions>*{margin-top:16px}.hds-alert__actions>*+*{margin-left:8px}.hds-alert__dismiss{margin-top:2px;margin-left:16px}.hds-alert--type-compact .hds-alert__dismiss{margin-top:1px}.hds-alert--type-page{padding:16px 48px}.hds-alert--type-inline{padding:16px;border-style:solid;border-width:1px;border-radius:6px}.hds-alert--type-compact .hds-alert__icon{width:14px;height:14px;margin-top:2px;margin-right:8px}.hds-alert--type-compact .hds-alert__title+.hds-alert__description{margin-top:0}.hds-alert--color-neutral.hds-alert--type-page{background-color:var(--token-color-surface-faint);box-shadow:0 1px 0 0 var(--token-color-palette-alpha-300)}.hds-alert--color-neutral.hds-alert--type-inline{background-color:var(--token-color-surface-faint);border-color:var(--token-color-border-strong)}.hds-alert--color-neutral .hds-alert__icon{color:var(--token-color-foreground-faint)}.hds-alert--color-neutral .hds-alert__title{color:var(--token-color-foreground-primary)}.hds-alert--color-highlight.hds-alert--type-page{background-color:var(--token-color-surface-highlight);box-shadow:0 1px 0 0 var(--token-color-border-highlight)}.hds-alert--color-highlight.hds-alert--type-inline{background-color:var(--token-color-surface-highlight);border-color:var(--token-color-border-highlight)}.hds-alert--color-highlight .hds-alert__icon,.hds-alert--color-highlight .hds-alert__title{color:var(--token-color-foreground-highlight-on-surface)}.hds-alert--color-success.hds-alert--type-page{background-color:var(--token-color-surface-success);box-shadow:0 1px 0 0 var(--token-color-border-success)}.hds-alert--color-success.hds-alert--type-inline{background-color:var(--token-color-surface-success);border-color:var(--token-color-border-success)}.hds-alert--color-success .hds-alert__icon,.hds-alert--color-success .hds-alert__title{color:var(--token-color-foreground-success-on-surface)}.hds-alert--color-warning.hds-alert--type-page{background-color:var(--token-color-surface-warning);box-shadow:0 1px 0 0 var(--token-color-border-warning)}.hds-alert--color-warning.hds-alert--type-inline{background-color:var(--token-color-surface-warning);border-color:var(--token-color-border-warning)}.hds-alert--color-warning .hds-alert__icon,.hds-alert--color-warning .hds-alert__title{color:var(--token-color-foreground-warning-on-surface)}.hds-alert--color-critical.hds-alert--type-page{background-color:var(--token-color-surface-critical);box-shadow:0 1px 0 0 var(--token-color-border-critical)}.hds-alert--color-critical.hds-alert--type-inline{background-color:var(--token-color-surface-critical);border-color:var(--token-color-border-critical)}.hds-alert--color-critical .hds-alert__icon,.hds-alert--color-critical .hds-alert__title{color:var(--token-color-foreground-critical-on-surface)}.hds-avatar{display:inline-flex;align-items:center;justify-content:center;box-sizing:border-box;width:32px;height:32px}.hds-avatar svg,.hds-form-toggle{display:inline-block}.hds-avatar img{width:inherit;height:inherit;border-radius:2px}.hds-badge{display:inline-flex;align-items:center;max-width:100%;vertical-align:middle;border:1px solid transparent;border-radius:5px}.hds-badge__icon{display:block;flex:0 0 auto}.hds-badge__text{flex:1 0 0}.hds-badge--size-small{min-height:1.25rem;padding:calc(.125rem - 1px) calc(.375rem - 1px)}.hds-badge--size-small .hds-badge__icon{width:.75rem;height:.75rem}.hds-badge--size-large .hds-badge__icon,.hds-badge--size-medium .hds-badge__icon{width:1rem;height:1rem}.hds-badge--size-small .hds-badge__text{font-size:.8125rem;line-height:1.2308}.hds-badge--size-small .hds-badge__icon+.hds-badge__text{-webkit-margin-start:.25rem;margin-inline-start:.25rem}.hds-badge--size-medium{min-height:1.5rem;padding:calc(.25rem - 1px) calc(.5rem - 1px)}.hds-badge--size-medium .hds-badge__text{font-size:.8125rem;line-height:1.2308}.hds-badge--size-medium .hds-badge__icon+.hds-badge__text{-webkit-margin-start:.25rem;margin-inline-start:.25rem}.hds-badge--size-large{min-height:2rem;padding:calc(.25rem - 1px) calc(.5rem - 1px)}.hds-badge--size-large .hds-badge__text{font-size:1rem;line-height:1.5}.hds-badge--size-large .hds-badge__icon+.hds-badge__text{-webkit-margin-start:.375rem;margin-inline-start:.375rem}.hds-badge--color-neutral.hds-badge--type-filled{color:var(--token-color-foreground-primary);background-color:var(--token-color-surface-strong)}.hds-badge--color-neutral.hds-badge--type-inverted{color:var(--token-color-foreground-high-contrast);background-color:var(--token-color-foreground-faint)}.hds-badge--color-neutral.hds-badge--type-outlined{color:var(--token-color-foreground-primary);background-color:transparent;border-color:var(--token-color-foreground-faint)}.hds-badge--color-neutral-dark-mode.hds-badge--type-filled{color:var(--token-color-foreground-high-contrast);background-color:var(--token-color-foreground-faint)}.hds-badge--color-neutral-dark-mode.hds-badge--type-inverted{color:var(--token-color-foreground-primary);background-color:var(--token-color-surface-faint)}.hds-badge--color-neutral-dark-mode.hds-badge--type-outlined{color:var(--token-color-foreground-high-contrast);background-color:transparent;border-color:var(--token-color-palette-neutral-100)}.hds-badge--color-highlight.hds-badge--type-filled{color:var(--token-color-foreground-highlight-on-surface);background-color:var(--token-color-surface-highlight)}.hds-badge--color-highlight.hds-badge--type-inverted{color:var(--token-color-foreground-high-contrast);background-color:var(--token-color-foreground-highlight)}.hds-badge--color-highlight.hds-badge--type-outlined{color:var(--token-color-foreground-highlight);background-color:transparent;border-color:currentColor}.hds-badge--color-success.hds-badge--type-filled{color:var(--token-color-foreground-success-on-surface);background-color:var(--token-color-surface-success)}.hds-badge--color-success.hds-badge--type-inverted{color:var(--token-color-foreground-high-contrast);background-color:var(--token-color-foreground-success)}.hds-badge--color-success.hds-badge--type-outlined{color:var(--token-color-foreground-success);background-color:transparent;border-color:currentColor}.hds-badge--color-warning.hds-badge--type-filled{color:var(--token-color-foreground-warning-on-surface);background-color:var(--token-color-surface-warning)}.hds-badge--color-warning.hds-badge--type-inverted{color:var(--token-color-foreground-high-contrast);background-color:var(--token-color-foreground-warning)}.hds-badge--color-warning.hds-badge--type-outlined{color:var(--token-color-foreground-warning);background-color:transparent;border-color:currentColor}.hds-badge--color-critical.hds-badge--type-filled{color:var(--token-color-foreground-critical-on-surface);background-color:var(--token-color-surface-critical)}.hds-badge--color-critical.hds-badge--type-inverted{color:var(--token-color-foreground-high-contrast);background-color:var(--token-color-foreground-critical)}.hds-badge--color-critical.hds-badge--type-outlined{color:var(--token-color-foreground-critical);background-color:transparent;border-color:currentColor}.hds-badge-count{display:inline-flex;align-items:center;max-width:100%;border:1px solid transparent}.hds-badge-count--size-small{min-height:1.25rem;padding:calc(.125rem - 1px) calc(.5rem - 1px);font-size:.8125rem;line-height:1.2308;border-radius:.625rem}.hds-badge-count--size-medium{min-height:1.5rem;padding:calc(.25rem - 1px) calc(.75rem - 1px);font-size:.8125rem;line-height:1.2308;border-radius:.75rem}.hds-badge-count--size-large{min-height:2rem;padding:calc(.25rem - 1px) calc(.875rem - 1px);font-size:1rem;line-height:1.5;border-radius:1rem}.hds-breadcrumb__list,.hds-breadcrumb__sublist{margin:0;padding:0;list-style:none}.hds-badge-count--color-neutral.hds-badge-count--type-filled{color:var(--token-color-foreground-primary);background-color:var(--token-color-surface-strong)}.hds-badge-count--color-neutral.hds-badge-count--type-inverted{color:var(--token-color-foreground-high-contrast);background-color:var(--token-color-foreground-faint)}.hds-badge-count--color-neutral.hds-badge-count--type-outlined{color:var(--token-color-foreground-primary);background-color:transparent;border-color:var(--token-color-foreground-faint)}.hds-badge-count--color-neutral-dark-mode.hds-badge-count--type-filled{color:var(--token-color-foreground-high-contrast);background-color:var(--token-color-foreground-faint)}.hds-badge-count--color-neutral-dark-mode.hds-badge-count--type-inverted{color:var(--token-color-foreground-primary);background-color:var(--token-color-surface-faint)}.hds-badge-count--color-neutral-dark-mode.hds-badge-count--type-outlined{color:var(--token-color-foreground-high-contrast);background-color:transparent;border-color:var(--token-color-palette-neutral-100)}.hds-breadcrumb__list{display:flex}.hds-breadcrumb--items-can-wrap .hds-breadcrumb__list{flex-wrap:wrap}.hds-breadcrumb__item{display:flex;flex-direction:row;align-items:center;min-width:0}.hds-breadcrumb__list>.hds-breadcrumb__item:not(:last-child)::after{padding:0 8px;color:var(--token-color-palette-neutral-300);content:"/"}.hds-breadcrumb__sublist>.hds-breadcrumb__item+.hds-breadcrumb__item{margin-top:4px}.hds-breadcrumb__item--is-truncation{flex:none}.hds-breadcrumb__link{display:flex;flex-direction:row;align-items:center;min-width:0;margin:0 -4px;padding:0 4px;color:var(--token-color-foreground-faint);border-radius:5px;-webkit-text-decoration-color:transparent;text-decoration-color:transparent;outline-style:solid;outline-color:transparent}.hds-breadcrumb__link.mock-active>.hds-breadcrumb__text,.hds-breadcrumb__link.mock-hover>.hds-breadcrumb__text,.hds-breadcrumb__link:active>.hds-breadcrumb__text,.hds-breadcrumb__link:hover>.hds-breadcrumb__text{-webkit-text-decoration-color:currentColor;text-decoration-color:currentColor}.hds-breadcrumb__link.mock-hover,.hds-breadcrumb__link:hover{color:var(--token-color-palette-neutral-600)}.hds-breadcrumb__link:focus:not(:focus-visible){box-shadow:none}.hds-breadcrumb__link:focus-visible{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-breadcrumb__link.mock-focus.mock-active,.hds-breadcrumb__link:focus:active{box-shadow:none}.hds-breadcrumb__link.mock-active,.hds-breadcrumb__link:active{color:var(--token-color-foreground-secondary)}.hds-breadcrumb__text,.hds-link-standalone,.hds-link-standalone__text{-webkit-text-decoration-color:transparent;text-decoration-color:transparent}.hds-breadcrumb__current{display:flex;flex-direction:row;align-items:center;min-width:0;margin:0 -4px;padding:0 4px;color:var(--token-color-foreground-strong)}.consul-exposed-path-list>ul>li>.detail,.consul-exposed-path-list>ul>li>.header>dl:first-child,.consul-lock-session-list ul>li:not(:first-child)>.detail,.consul-lock-session-list ul>li:not(:first-child)>.header>dl:first-child,.consul-upstream-instance-list li>.detail,.consul-upstream-instance-list li>.header>dl:first-child,.hds-breadcrumb__icon,.hds-pagination-nav__arrow--direction-next .hds-pagination-nav__arrow-label,.list-collection>ul>li:not(:first-child)>.detail,.list-collection>ul>li:not(:first-child)>.header>dl:first-child{margin-right:6px}.hds-breadcrumb__icon{flex:none;width:13px;height:13px}.hds-breadcrumb__text{padding:calc((28px - 1rem)/ 2) 0;overflow:hidden;font-size:.8125rem;line-height:1rem;white-space:nowrap;text-decoration:underline;text-overflow:ellipsis}.hds-breadcrumb__sublist .hds-breadcrumb__text{white-space:normal}.hds-breadcrumb__truncation-toggle{display:flex;flex:none;align-items:center;justify-content:center;width:28px;height:28px;margin:0 -4px;padding:0;color:var(--token-color-foreground-faint);background-color:transparent;border:1px solid transparent;border-radius:5px;outline:transparent solid 0;cursor:pointer}.hds-button,.hds-dismiss-button,.hds-dropdown-list-item--copy-item button,.hds-dropdown-list-item--interactive a,.hds-dropdown-list-item--interactive button,.hds-dropdown-toggle-icon{outline-style:solid;outline-color:transparent}.hds-breadcrumb__truncation-toggle.mock-hover,.hds-breadcrumb__truncation-toggle:hover{color:var(--token-color-foreground-faint);border-color:var(--token-color-border-strong)}.hds-breadcrumb__truncation-toggle.mock-focus,.hds-breadcrumb__truncation-toggle:focus{box-shadow:var(--token-focus-ring-action-box-shadow);background-color:transparent;border:none}.hds-breadcrumb__truncation-toggle:focus:not(:focus-visible){box-shadow:none}.hds-breadcrumb__truncation-toggle:focus-visible,.hds-dismiss-button.mock-focus::before,.hds-dismiss-button:focus::before{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-breadcrumb__truncation-toggle.mock-focus.mock-active,.hds-breadcrumb__truncation-toggle:focus:active{box-shadow:none}.hds-breadcrumb__truncation-toggle.mock-active,.hds-breadcrumb__truncation-toggle:active{color:var(--token-color-foreground-primary);background-color:var(--token-color-surface-interactive-active);border-color:var(--token-color-border-strong)}.hds-breadcrumb__truncation-content{position:absolute;top:100%;left:-4px;z-index:300;width:-webkit-max-content;width:-moz-max-content;width:max-content;max-width:200px;margin-top:4px;padding:6px 12px;background-color:var(--token-color-surface-primary);border-radius:6px;box-shadow:var(--token-surface-high-box-shadow)}.hds-button{position:relative;display:flex;align-items:center;justify-content:center;width:auto;text-decoration:none;border:1px solid transparent;border-radius:5px;isolation:isolate}.hds-disclosure,.hds-form-field--layout-vertical .hds-form-field__label,a.hds-button{width:-webkit-fit-content;width:-moz-fit-content}a.hds-button{width:fit-content}a.hds-button.mock-active,a.hds-button.mock-focus,a.hds-button.mock-hover,a.hds-button:active,a.hds-button:focus,a.hds-button:hover{text-decoration:underline}.hds-button.mock-disabled,.hds-button.mock-disabled:focus,.hds-button.mock-disabled:hover,.hds-button:disabled,.hds-button:disabled:focus,.hds-button:disabled:hover,.hds-button[disabled],.hds-button[disabled]:focus,.hds-button[disabled]:hover{color:var(--token-color-foreground-disabled);background-color:var(--token-color-surface-faint);border-color:var(--token-color-border-primary);box-shadow:none;cursor:not-allowed}.hds-button.mock-disabled::before,.hds-button.mock-disabled:focus::before,.hds-button.mock-disabled:hover::before,.hds-button:disabled::before,.hds-button:disabled:focus::before,.hds-button:disabled:hover::before,.hds-button[disabled]::before,.hds-button[disabled]:focus::before,.hds-button[disabled]:hover::before{border-color:transparent}.hds-button.hds-button--width-full{width:100%;max-width:100%}.hds-button.hds-button--width-full .hds-button__text{flex:0 0 auto}.hds-button__text,.hds-form-group--radio-cards .hds-form-radio-card--layout-fluid{flex:1 0 0}.hds-button.mock-focus,.hds-button:focus{box-shadow:none}.hds-button.mock-focus::before,.hds-button:focus::before{position:absolute;top:-4px;right:-4px;bottom:-4px;left:-4px;z-index:-1;border:3px solid transparent;border-radius:8px;content:""}.hds-button__icon+.hds-button__text,.hds-button__text+.hds-button__icon{margin-left:.375rem}.hds-button--size-small{min-height:1.75rem;padding:.375rem .6875rem}.hds-button--size-small .hds-button__icon{width:.75rem;height:.75rem}.hds-button--size-small .hds-button__text{font-size:.8125rem;line-height:.875rem}.hds-button--size-medium{min-height:2.25rem;padding:.5625rem .9375rem}.hds-button--size-medium .hds-button__icon{width:1rem;height:1rem}.hds-button--size-medium .hds-button__text{font-size:.875rem;line-height:1rem}.hds-button--size-large{min-height:3rem;padding:.6875rem 1.1875rem}.hds-button--size-large .hds-button__icon{width:1.5rem;height:1.5rem}.hds-button--size-large .hds-button__text{font-size:1rem;line-height:1.5rem}.hds-button--color-primary{color:var(--token-color-foreground-high-contrast);background-color:var(--token-color-palette-blue-200);border-color:var(--token-color-palette-blue-300);box-shadow:var(--token-elevation-low-box-shadow)}.hds-button--color-primary.mock-hover,.hds-button--color-primary:hover{color:var(--token-color-foreground-high-contrast);background-color:var(--token-color-palette-blue-300);border-color:var(--token-color-palette-blue-400);cursor:pointer}.hds-button--color-primary.mock-focus,.hds-button--color-primary:focus{color:var(--token-color-foreground-high-contrast);background-color:var(--token-color-palette-blue-200);border-color:var(--token-color-focus-action-internal)}.hds-button--color-primary.mock-focus::before,.hds-button--color-primary:focus::before{top:-6px;right:-6px;bottom:-6px;left:-6px;border-color:var(--token-color-focus-action-external);border-radius:10px}.hds-button--color-primary.mock-active,.hds-button--color-primary:active{color:var(--token-color-foreground-high-contrast);background-color:var(--token-color-palette-blue-400);border-color:var(--token-color-palette-blue-400);box-shadow:none}.hds-button--color-primary.mock-active::before,.hds-button--color-primary:active::before{border-color:transparent}.hds-button--color-secondary{color:var(--token-color-foreground-primary);background-color:var(--token-color-surface-faint);border-color:var(--token-color-border-strong);box-shadow:var(--token-elevation-low-box-shadow)}.hds-button--color-secondary.mock-hover,.hds-button--color-secondary:hover{color:var(--token-color-foreground-primary);background-color:var(--token-color-surface-primary);border-color:var(--token-color-border-strong);cursor:pointer}.hds-button--color-secondary.mock-focus,.hds-button--color-secondary:focus{color:var(--token-color-foreground-primary);background-color:var(--token-color-surface-faint);border-color:var(--token-color-focus-action-internal)}.hds-button--color-secondary.mock-focus::before,.hds-button--color-secondary:focus::before{border-color:var(--token-color-focus-action-external)}.hds-button--color-secondary.mock-active,.hds-button--color-secondary:active{color:var(--token-color-foreground-primary);background-color:var(--token-color-surface-interactive-active);border-color:var(--token-color-border-strong);box-shadow:none}.hds-button--color-secondary.mock-active::before,.hds-button--color-secondary:active::before{border-color:transparent}.hds-button--color-tertiary{color:var(--token-color-foreground-action);background-color:transparent;border-color:transparent}.hds-button--color-tertiary.mock-hover,.hds-button--color-tertiary:hover{color:var(--token-color-foreground-action-hover);background-color:var(--token-color-surface-primary);border-color:var(--token-color-border-strong);cursor:pointer}.hds-button--color-tertiary.mock-focus,.hds-button--color-tertiary:focus{color:var(--token-color-foreground-action);border-color:var(--token-color-focus-action-internal)}.hds-button--color-tertiary.mock-focus::before,.hds-button--color-tertiary:focus::before{border-color:var(--token-color-focus-action-external)}.hds-button--color-tertiary.mock-active,.hds-button--color-tertiary:active{color:var(--token-color-foreground-action-active);background-color:var(--token-color-surface-interactive-active);border-color:var(--token-color-border-strong);box-shadow:none}.hds-button--color-tertiary.mock-active::before,.hds-button--color-tertiary:active::before{border-color:transparent}.hds-button--color-tertiary.mock-disabled,.hds-button--color-tertiary.mock-disabled:focus,.hds-button--color-tertiary.mock-disabled:hover,.hds-button--color-tertiary:disabled,.hds-button--color-tertiary:disabled:focus,.hds-button--color-tertiary:disabled:hover,.hds-button--color-tertiary[disabled],.hds-button--color-tertiary[disabled]:focus,.hds-button--color-tertiary[disabled]:hover{background-color:transparent;border-color:transparent}.hds-button--color-tertiary.mock-disabled::before,.hds-button--color-tertiary.mock-disabled:focus::before,.hds-button--color-tertiary.mock-disabled:hover::before,.hds-button--color-tertiary:disabled::before,.hds-button--color-tertiary:disabled:focus::before,.hds-button--color-tertiary:disabled:hover::before,.hds-button--color-tertiary[disabled]::before,.hds-button--color-tertiary[disabled]:focus::before,.hds-button--color-tertiary[disabled]:hover::before{border-color:transparent}.hds-button--color-critical{color:var(--token-color-foreground-critical-on-surface);background-color:var(--token-color-surface-critical);border-color:var(--token-color-foreground-critical-on-surface);box-shadow:var(--token-elevation-low-box-shadow)}.hds-button--color-critical.mock-hover,.hds-button--color-critical:hover{color:var(--token-color-foreground-high-contrast);background-color:var(--token-color-palette-red-300);border-color:var(--token-color-palette-red-400);cursor:pointer}.hds-button--color-critical.mock-focus,.hds-button--color-critical:focus{color:var(--token-color-foreground-critical-on-surface);background-color:var(--token-color-surface-critical);border-color:var(--token-color-focus-critical-internal)}.hds-button--color-critical.mock-focus::before,.hds-button--color-critical:focus::before{border-color:var(--token-color-focus-critical-external)}.hds-button--color-critical.mock-active,.hds-button--color-critical:active{color:var(--token-color-foreground-high-contrast);background-color:var(--token-color-palette-red-400);border-color:var(--token-color-palette-red-400);box-shadow:none}.hds-button--color-critical.mock-active::before,.hds-button--color-critical:active::before{border-color:transparent}button.hds-button[href]{color:#fff!important;background-color:red!important;border:none}button.hds-button[href]::after{content:' Attention: you’re passing a "href" attribute to the "Hds::Button" component, you should use an "@href" argument.'}.hds-button-set{display:flex}.hds-button-set>*+*{margin-left:16px}.hds-card__container{position:relative;background-color:#fff;border-radius:6px}.hds-card__container--level-surface-base{box-shadow:var(--token-surface-base-box-shadow)}.hds-card__container--level-surface-mid{box-shadow:var(--token-surface-mid-box-shadow)}.hds-card__container--level-surface-high{box-shadow:var(--token-surface-high-box-shadow)}.hds-card__container--hover-level-surface-base.mock-hover,.hds-card__container--hover-level-surface-base:hover{box-shadow:var(--token-surface-base-box-shadow)}.hds-card__container--hover-level-surface-mid.mock-hover,.hds-card__container--hover-level-surface-mid:hover{box-shadow:var(--token-surface-mid-box-shadow)}.hds-card__container--hover-level-surface-high.mock-hover,.hds-card__container--hover-level-surface-high:hover{box-shadow:var(--token-surface-high-box-shadow)}.hds-card__container--active-level-surface-base.mock-active,.hds-card__container--active-level-surface-base:active{box-shadow:var(--token-surface-base-box-shadow)}.hds-card__container--active-level-surface-mid.mock-active,.hds-card__container--active-level-surface-mid:active{box-shadow:var(--token-surface-mid-box-shadow)}.hds-card__container--active-level-surface-high.mock-active,.hds-card__container--active-level-surface-high:active{box-shadow:var(--token-surface-high-box-shadow)}.hds-card__container--level-elevation-base{box-shadow:var(--token-elevation-base-box-shadow)}.hds-card__container--level-elevation-mid{box-shadow:var(--token-elevation-mid-box-shadow)}.hds-card__container--level-elevation-high{box-shadow:var(--token-elevation-high-box-shadow)}.hds-card__container--hover-level-elevation-base.mock-hover,.hds-card__container--hover-level-elevation-base:hover{box-shadow:var(--token-elevation-base-box-shadow)}.hds-card__container--hover-level-elevation-mid.mock-hover,.hds-card__container--hover-level-elevation-mid:hover{box-shadow:var(--token-elevation-mid-box-shadow)}.hds-card__container--hover-level-elevation-high.mock-hover,.hds-card__container--hover-level-elevation-high:hover{box-shadow:var(--token-elevation-high-box-shadow)}.hds-card__container--active-level-elevation-base.mock-active,.hds-card__container--active-level-elevation-base:active{box-shadow:var(--token-elevation-base-box-shadow)}.hds-card__container--active-level-elevation-mid.mock-active,.hds-card__container--active-level-elevation-mid:active{box-shadow:var(--token-elevation-mid-box-shadow)}.hds-card__container--active-level-elevation-high.mock-active,.hds-card__container--active-level-elevation-high:active{box-shadow:var(--token-elevation-high-box-shadow)}.hds-card__container--background-neutral-primary{background-color:var(--token-color-surface-primary)}.hds-card__container--background-neutral-secondary{background-color:var(--token-color-surface-faint)}.hds-card__container--overflow-hidden{overflow:hidden}.hds-card__container--overflow-visible{overflow:visible}.hds-disclosure{position:relative;width:fit-content}.hds-dismiss-button{flex:none;padding:0;color:var(--token-color-foreground-faint);background-color:transparent;border:none;cursor:pointer;position:relative;isolation:isolate}.hds-dismiss-button.mock-hover::before,.hds-dismiss-button:hover::before{background-color:rgba(222,223,227,.4)}.hds-dismiss-button::before{position:absolute;top:-4px;right:-4px;bottom:-4px;left:-4px;z-index:-1;border-radius:5px;content:""}.hds-dismiss-button:focus:not(:focus-visible)::before{box-shadow:none}.hds-dismiss-button:focus-visible::before{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-dismiss-button.mock-focus.mock-active::before,.hds-dismiss-button:focus:active::before{box-shadow:none}.hds-dismiss-button.mock-active,.hds-dismiss-button:active{color:var(--token-color-foreground-secondary)}.hds-dismiss-button.mock-active::before,.hds-dismiss-button:active::before{background-color:rgba(222,223,227,.4);border:1px solid var(--token-color-border-strong)}.hds-dropdown-toggle-icon{display:flex;align-items:center;justify-content:center;min-width:36px;height:36px;padding:1px;background-color:transparent;border:1px solid transparent;border-radius:5px;position:relative;isolation:isolate}.hds-dropdown-toggle-icon.mock-hover,.hds-dropdown-toggle-icon:hover{background-color:var(--token-color-surface-interactive);border-color:var(--token-color-border-strong);cursor:pointer}.hds-dropdown-toggle-icon::before{position:absolute;top:-1px;right:-1px;bottom:-1px;left:-1px;z-index:-1;border-radius:5px;content:""}.hds-dropdown-toggle-icon.mock-focus::before,.hds-dropdown-toggle-icon:focus::before{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-dropdown-toggle-icon:focus:not(:focus-visible)::before{box-shadow:none}.hds-dropdown-toggle-icon:focus-visible::before{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-dropdown-toggle-button,.hds-dropdown-toggle-icon.mock-focus.mock-active::before,.hds-dropdown-toggle-icon:focus:active::before{box-shadow:none}.hds-dropdown-toggle-icon.mock-active,.hds-dropdown-toggle-icon:active{background-color:var(--token-color-surface-interactive-active);border-color:var(--token-color-border-strong)}.hds-dropdown-toggle-icon__wrapper{display:flex;align-items:center;justify-content:center;width:32px;height:32px;padding:1px;border-radius:3px}.hds-dropdown-toggle-icon__wrapper img{width:100%;height:100%;-o-object-fit:cover;object-fit:cover;border-radius:inherit}.hds-dropdown-toggle-icon__chevron{margin-left:4px}.hds-dropdown-toggle-icon--is-open .hds-dropdown-toggle-icon__chevron{transform:rotate(-180deg)}.hds-dropdown-toggle-button .hds-button__icon{margin-right:-6px;margin-left:8px}@media (prefers-reduced-motion:no-preference){.hds-dropdown-toggle-button .hds-button__icon,.hds-dropdown-toggle-icon__chevron{transition:transform .3s}}.hds-dropdown-toggle-button--is-open .hds-button__icon{transform:rotate(-180deg)}.hds-dropdown-list{width:-webkit-max-content;width:-moz-max-content;width:max-content;min-width:200px;max-width:400px;margin:0;padding:4px 0;list-style:none;background-color:var(--token-color-surface-primary);border-radius:6px;box-shadow:var(--token-surface-high-box-shadow)}.hds-dropdown-list--fixed-width{min-width:initial;max-width:initial}.hds-dropdown-list--position-right{position:absolute;top:calc(100% + 4px);right:0;z-index:2}.hds-dropdown-list--position-left{position:absolute;top:calc(100% + 4px);left:0;z-index:2}.hds-dropdown-list-item__copy-item-title{padding:2px 0 4px;color:var(--token-color-foreground-faint)}.hds-dropdown-list-item--copy-item{width:100%;padding:10px 16px 12px}.hds-dropdown-list-item--copy-item button{display:flex;justify-content:space-between;width:100%;padding:12px 8px;color:var(--token-color-foreground-primary);background-color:transparent;border:1px solid var(--token-color-border-primary);border-radius:5px}.hds-dropdown-list-item--copy-item button.mock-hover,.hds-dropdown-list-item--copy-item button:hover{background-color:var(--token-color-surface-interactive-hover);cursor:pointer}.hds-dropdown-list-item--copy-item button.mock-focus,.hds-dropdown-list-item--copy-item button:focus{box-shadow:var(--token-focus-ring-action-box-shadow);background-color:var(--token-color-surface-action);border-color:var(--token-color-focus-action-internal)}.hds-dropdown-list-item--copy-item button:focus:not(:focus-visible){box-shadow:none}.hds-dropdown-list-item--copy-item button:focus-visible{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-dropdown-list-item--copy-item button.mock-focus.mock-active,.hds-dropdown-list-item--copy-item button:focus:active{box-shadow:none}.hds-dropdown-list-item--copy-item button.mock-active,.hds-dropdown-list-item--copy-item button:active{background-color:var(--token-color-surface-interactive-active)}.hds-dropdown-list-item--copy-item button.is-success{background-color:var(--token-color-surface-success);border-color:var(--token-color-border-success)}.hds-dropdown-list-item--copy-item button.is-success .hds-dropdown-list-item__copy-item-icon{color:var(--token-color-foreground-success)}.hds-dropdown-list-item__copy-item-text{overflow:hidden;white-space:nowrap;text-align:left;text-overflow:ellipsis}.hds-dropdown-list-item__copy-item-icon{flex:none;margin-left:8px;color:var(--token-color-foreground-action)}.hds-dropdown-list-item--description{padding:2px 16px 4px;color:var(--token-color-foreground-faint)}.hds-dropdown-list-item--generic{padding-right:16px;padding-left:16px}.hds-dropdown-list-item--interactive{position:relative;min-height:36px;isolation:isolate}.hds-dropdown-list-item--interactive button{width:100%;background-color:transparent}.hds-dropdown-list-item--interactive button:hover{cursor:pointer}.hds-dropdown-list-item--interactive a,.hds-dropdown-list-item--interactive button{display:flex;align-items:center;padding:7px 9px 7px 15px;text-decoration:none;border:1px solid transparent}.hds-dropdown-list-item--interactive a::before,.hds-dropdown-list-item--interactive button::before{position:absolute;top:6px;bottom:6px;left:4px;z-index:-1;width:2px;border-radius:1px;content:""}.hds-dropdown-list-item--interactive a::after,.hds-dropdown-list-item--interactive button::after{position:absolute;top:0;right:4px;bottom:0;left:10px;z-index:-1;border-radius:5px;content:""}.hds-dropdown-list-item--interactive a.mock-hover,.hds-dropdown-list-item--interactive a:hover,.hds-dropdown-list-item--interactive button.mock-hover,.hds-dropdown-list-item--interactive button:hover{color:var(--current-color-hover)}.hds-dropdown-list-item--interactive a.mock-focus,.hds-dropdown-list-item--interactive a:focus,.hds-dropdown-list-item--interactive a:focus-visible,.hds-dropdown-list-item--interactive button.mock-focus,.hds-dropdown-list-item--interactive button:focus,.hds-dropdown-list-item--interactive button:focus-visible{color:var(--current-color-focus)}.hds-dropdown-list-item--interactive a.mock-hover::before,.hds-dropdown-list-item--interactive a:hover::before,.hds-dropdown-list-item--interactive button.mock-hover::before,.hds-dropdown-list-item--interactive button:hover::before{background-color:currentColor}.hds-dropdown-list-item--interactive a.mock-focus::after,.hds-dropdown-list-item--interactive a:focus::after,.hds-dropdown-list-item--interactive button.mock-focus::after,.hds-dropdown-list-item--interactive button:focus::after{left:4px;background-color:var(--current-background-color);box-shadow:var(--current-focus-ring-box-shadow)}.hds-dropdown-list-item--interactive a:focus:not(:focus-visible)::after,.hds-dropdown-list-item--interactive button:focus:not(:focus-visible)::after{background-color:transparent;box-shadow:none}.hds-dropdown-list-item--interactive a:focus-visible::after,.hds-dropdown-list-item--interactive button:focus-visible::after{left:4px;background-color:var(--current-background-color);box-shadow:var(--current-focus-ring-box-shadow)}.hds-dropdown-list-item--interactive a.mock-focus.mock-active::after,.hds-dropdown-list-item--interactive a:focus-visible:active::after,.hds-dropdown-list-item--interactive a:focus:active::after,.hds-dropdown-list-item--interactive button.mock-focus.mock-active::after,.hds-dropdown-list-item--interactive button:focus-visible:active::after,.hds-dropdown-list-item--interactive button:focus:active::after{left:10px;background-color:var(--current-background-color);box-shadow:none}.hds-dropdown-list-item--interactive a.mock-active,.hds-dropdown-list-item--interactive a:active,.hds-dropdown-list-item--interactive button.mock-active,.hds-dropdown-list-item--interactive button:active{color:var(--current-color-active)}.hds-dropdown-list-item--interactive a.mock-active::before,.hds-dropdown-list-item--interactive a:active::before,.hds-dropdown-list-item--interactive button.mock-active::before,.hds-dropdown-list-item--interactive button:active::before{background-color:currentColor}.hds-dropdown-list-item--interactive a.mock-active::after,.hds-dropdown-list-item--interactive a:active::after,.hds-dropdown-list-item--interactive button.mock-active::after,.hds-dropdown-list-item--interactive button:active::after{background-color:var(--current-background-color)}.hds-dropdown-list-item__interactive-icon{margin-right:8px}.hds-dropdown-list-item__interactive-text{text-align:left}.hds-dropdown-list-item--color-action a,.hds-dropdown-list-item--color-action button{color:var(--token-color-foreground-primary);--current-color-hover:var(--token-color-foreground-action-hover);--current-color-focus:var(--token-color-foreground-action-active);--current-color-active:var(--token-color-foreground-action-active)}.hds-dropdown-list-item--color-action a::after,.hds-dropdown-list-item--color-action button::after{--current-background-color:var(--token-color-surface-action);--current-focus-ring-box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-dropdown-list-item--color-critical a,.hds-dropdown-list-item--color-critical button{color:var(--token-color-foreground-critical);--current-color-hover:var(--token-color-palette-red-300);--current-color-focus:var(--token-color-palette-red-400);--current-color-active:var(--token-color-palette-red-400)}.hds-dropdown-list-item--color-critical a::after,.hds-dropdown-list-item--color-critical button::after{--current-background-color:var(--token-color-surface-critical);--current-focus-ring-box-shadow:var(--token-focus-ring-critical-box-shadow)}.hds-dropdown-list-item__interactive-loading-wrapper{display:flex;align-items:center;padding:8px 10px 8px 16px}.hds-dropdown-list-item__interactive-loading-wrapper .hds-dropdown-list-item__interactive-text{color:var(--token-color-foreground-faint)}.hds-dropdown-list-item__interactive-loading-wrapper .hds-dropdown-list-item__interactive-icon{color:var(--token-color-foreground-primary)}.hds-dropdown-list-item--separator{position:relative;width:100%;height:4px}.hds-dropdown-list-item--separator::before{position:absolute;right:6px;bottom:0;left:6px;border-bottom:1px solid var(--token-color-border-primary);content:""}.hds-dropdown-list-item--title{padding:10px 16px 4px;color:var(--token-color-foreground-strong)}.hds-empty-state{display:block;max-width:40ch;margin:0 auto;padding:0;color:var(--token-color-foreground-faint)}.hds-empty-state>*{margin:0;padding:0}.hds-empty-state__body{font-weight:400;font-size:1rem;line-height:1.5}.hds-empty-state__body+*{-webkit-margin-before:1rem;margin-block-start:1rem}.hds-empty-state__header{font-weight:700;font-size:1.25rem;line-height:1.2}.hds-flyout{z-index:49;flex-direction:column;height:100vh;max-height:100vh;margin:0;padding:0;background:var(--token-color-surface-primary);border:none;box-shadow:0 2px 3px 0 rgba(59,61,69,.2509803922),0 12px 24px 0 rgba(59,61,69,.3490196078)}.hds-flyout[open]{position:fixed;display:flex}.hds-flyout::-webkit-backdrop{display:none}.hds-flyout::backdrop{display:none}.hds-flyout__overlay{position:fixed;top:0;right:0;bottom:0;left:0;z-index:50;background:var(--token-color-palette-neutral-700);opacity:.5}.hds-flyout__header{display:flex;flex:none;align-items:flex-start;padding:16px 24px;color:var(--token-color-foreground-strong)}.hds-flyout__icon{flex:none;align-self:center;margin-right:16px}.hds-flyout__title{flex-grow:1}.hds-flyout__tagline{margin-bottom:4px;color:var(--token-color-foreground-faint)}.hds-flyout__dismiss{align-self:center;margin-left:16px}.hds-flyout__description{padding:0 24px 16px;color:var(--token-color-foreground-primary)}.hds-flyout__body{flex:1 1 auto;padding:24px;overflow-y:auto;overscroll-behavior:contain;border-top:1px solid var(--token-color-border-primary)}.hds-flyout--size-medium{width:min(480px,100vw - 40px);max-width:calc(100vw - 40px)}.hds-flyout--size-medium[open]{margin-left:calc(100% - min(480px,100vw - 40px))}.hds-flyout--size-large{width:min(720px,100vw - 40px);max-width:calc(100vw - 40px)}.hds-flyout--size-large[open]{margin-left:calc(100% - min(720px,100vw - 40px))}.hds-form-label{display:block;width:-webkit-max-content;width:-moz-max-content;width:max-content;max-width:100%;color:var(--token-form-label-color)}.hds-form-label .hds-badge{vertical-align:initial}.hds-form-helper-text{display:block;color:var(--token-form-helper-text-color)}.hds-form-error{display:flex;align-items:flex-start;color:var(--token-form-error-color)}.hds-form-error__icon{flex:none;width:var(--token-form-error-icon-size);height:var(--token-form-error-icon-size);margin:2px 8px 2px 0}.hds-form-error__content{flex:1 1 auto}.hds-form-error__message{margin:0}.hds-form-field--layout-vertical{display:grid;justify-items:start;width:100%}.hds-form-field--layout-vertical .hds-form-field__label{width:fit-content}.hds-form-field--layout-vertical .hds-form-field__helper-text:not(:first-child){margin-top:4px}.hds-form-field--layout-vertical .hds-form-field__helper-text+.hds-form-helper-text{margin-top:2px}.hds-form-field--layout-vertical .hds-form-field__control:not(:first-child){margin-top:8px}.hds-form-field--layout-vertical .hds-form-field__control:not(:last-child){margin-bottom:8px}.hds-form-field--layout-flag{display:grid;grid-auto-flow:row;grid-template-areas:"control label" "control helper-text" "control error";grid-template-rows:auto auto auto;grid-template-columns:auto 1fr;justify-items:start}.hds-form-field--layout-flag .hds-form-field__label{grid-area:label;width:-webkit-fit-content;width:-moz-fit-content;width:fit-content}.hds-form-field--layout-flag .hds-form-field__helper-text{grid-area:helper-text;margin-top:4px}.hds-form-field--layout-flag .hds-form-field__control{grid-area:control}.hds-form-field--layout-flag .hds-form-field__control:not(:only-child){margin-top:2px;margin-right:8px}.hds-form-field--layout-flag .hds-form-field__error{grid-area:error;margin-top:4px}.hds-form-legend{display:block;color:var(--token-form-legend-color)}.hds-form-legend .hds-badge{vertical-align:initial}.hds-form-group{display:block;margin:0;padding:0;border:none}.hds-form-checkbox,.hds-form-radio{padding:0;background-position:center center;border-style:solid}.hds-form-group__legend{margin:0 0 4px;padding:0}.hds-form-group__legend~.hds-form-group__control-fields-wrapper .hds-form-label{font-weight:var(--token-typography-font-weight-regular)}.hds-form-group--layout-vertical .hds-form-group__control-field+.hds-form-group__control-field{margin-top:12px}.hds-form-group--layout-horizontal .hds-form-group__control-fields-wrapper{display:flex;flex-wrap:wrap;margin-bottom:-4px}.hds-form-group--layout-horizontal .hds-form-group__control-field{margin-right:16px;margin-bottom:4px}.hds-form-group__helper-text{margin-bottom:8px}.hds-form-group__error{margin-top:8px}.hds-form-indicator--optional{color:var(--token-form-indicator-optional-color)}.hds-form-checkbox{width:var(--token-form-checkbox-size);height:var(--token-form-checkbox-size);margin:0;background-size:var(--token-form-checkbox-background-image-size) var(--token-form-checkbox-background-image-size);border-width:var(--token-form-checkbox-border-width);border-radius:var(--token-form-checkbox-border-radius);cursor:pointer;-webkit-appearance:none;-moz-appearance:none;appearance:none}.hds-form-radio,.hds-form-select{-webkit-appearance:none;-moz-appearance:none}.hds-form-checkbox:not(:checked,:indeterminate){background-color:var(--token-form-control-base-surface-color-default);border-color:var(--token-form-control-base-border-color-default);box-shadow:var(--hds-elevation-inset-box-shadow)}.hds-form-checkbox:checked,.hds-form-checkbox:indeterminate{background-color:var(--token-form-control-checked-surface-color-default);border-color:var(--token-form-control-checked-border-color-default)}.hds-form-checkbox:checked{background-image:var(--token-form-checkbox-background-image-data-url)}.hds-form-checkbox:indeterminate{background-image:var(--token-form-checkbox-background-image-data-url-indeterminate)}.hds-form-checkbox.mock-hover:not(:checked,:indeterminate),.hds-form-checkbox:hover:not(:checked,:indeterminate){background-color:var(--token-form-control-base-surface-color-hover);border-color:var(--token-form-control-base-border-color-hover)}.hds-form-checkbox.mock-hover:checked,.hds-form-checkbox.mock-hover:indeterminate,.hds-form-checkbox:hover:checked,.hds-form-checkbox:hover:indeterminate{background-color:var(--token-form-control-checked-border-color-default);border-color:var(--token-form-control-checked-border-color-hover)}.hds-form-checkbox:disabled:checked,.hds-form-checkbox:disabled:indeterminate,.hds-form-checkbox:disabled:not(:checked,:indeterminate){background-color:var(--token-form-control-disabled-surface-color);border-color:var(--token-form-control-disabled-border-color);box-shadow:none;cursor:not-allowed}.hds-form-checkbox.mock-focus,.hds-form-checkbox:focus{outline:var(--token-color-focus-action-external) solid 3px;outline-offset:1px}.hds-form-checkbox:disabled:checked{background-image:var(--token-form-checkbox-background-image-data-url-disabled)}.hds-form-checkbox:disabled:indeterminate{background-image:var(--token-form-checkbox-background-image-data-url-indeterminate-disabled);background-repeat:no-repeat}.hds-form-radio{width:var(--token-form-radio-size);height:var(--token-form-radio-size);margin:0;background-size:var(--token-form-radio-background-image-size) var(--token-form-radio-background-image-size);border-width:var(--token-form-radio-border-width);border-radius:50%;cursor:pointer;appearance:none}.hds-form-radio:not(:checked){background-color:var(--token-form-control-base-surface-color-default);border-color:var(--token-form-control-base-border-color-default);box-shadow:var(--hds-elevation-inset-box-shadow)}.hds-form-radio:checked{background-color:var(--token-form-control-checked-surface-color-default);background-image:var(--token-form-radio-background-image-data-url);border-color:var(--token-form-control-checked-border-color-default)}.hds-form-radio.mock-hover:not(:checked),.hds-form-radio:hover:not(:checked){background-color:var(--token-form-control-base-surface-color-hover);border-color:var(--token-form-control-base-border-color-hover)}.hds-form-radio.mock-hover:checked,.hds-form-radio:hover:checked{background-color:var(--token-form-control-checked-border-color-default);border-color:var(--token-form-control-checked-border-color-hover)}.hds-form-radio:disabled:checked,.hds-form-radio:disabled:not(:checked){background-color:var(--token-form-control-disabled-surface-color);border-color:var(--token-form-control-disabled-border-color);box-shadow:none;cursor:not-allowed}.hds-form-radio.mock-focus,.hds-form-radio:focus{outline:var(--token-color-focus-action-external) solid 3px;outline-offset:1px}.hds-form-radio:disabled:checked{background-image:var(--token-form-radio-background-image-data-url-disabled)}.hds-form-group--radio-cards .hds-form-group__control-fields-wrapper{margin:calc(-1 * var(--token-form-radiocard-group-gap)/ 2)}.hds-form-group--radio-cards .hds-form-group__legend{margin-bottom:12px}.hds-form-group--radio-cards .hds-form-radio-card{margin:calc(var(--token-form-radiocard-group-gap)/ 2)}.hds-form-group--radio-cards .hds-form-radio-card--layout-fixed{flex:1 0 100%}.hds-form-radio-card{display:flex;flex-direction:column;background-color:var(--token-color-surface-primary);border:var(--token-form-radiocard-border-width) solid var(--token-color-border-primary);border-radius:var(--token-form-radiocard-border-radius);box-shadow:var(--token-elevation-mid-box-shadow);cursor:pointer}.hds-form-radio-card .hds-form-radio-card__control{outline-color:transparent}.hds-form-radio-card.mock-hover,.hds-form-radio-card:hover{box-shadow:var(--token-elevation-high-box-shadow);transition:var(--token-form-radiocard-transition-duration)}.hds-form-radio-card.mock-focus,.hds-form-radio-card:focus-within{border-color:var(--token-color-focus-action-internal);box-shadow:0 0 0 3px var(--token-color-focus-action-external)}.hds-form-radio-card--checked,.hds-form-radio-card.mock-checked{border-color:var(--token-color-focus-action-internal)}.hds-form-radio-card--checked .hds-form-radio-card__control-wrapper,.hds-form-radio-card.mock-checked .hds-form-radio-card__control-wrapper{background-color:var(--token-color-surface-action);border-color:var(--token-color-border-action)}.hds-form-radio-card--disabled,.hds-form-radio-card--disabled .hds-form-radio-card__control-wrapper,.hds-form-radio-card.mock-disabled,.hds-form-radio-card.mock-disabled .hds-form-radio-card__control-wrapper{background-color:var(--token-color-surface-interactive-disabled);border-color:var(--token-color-border-primary)}.hds-form-radio-card--disabled,.hds-form-radio-card.mock-disabled{box-shadow:none;cursor:not-allowed}.hds-form-radio-card--align-left{text-align:left}.hds-form-radio-card--align-center{text-align:center}.hds-form-radio-card--align-center .flight-icon{margin:auto}.hds-form-radio-card--control-bottom .hds-form-radio-card__control-wrapper{border-top-width:var(--token-form-radiocard-border-width);border-top-style:solid;border-bottom-right-radius:inherit;border-bottom-left-radius:inherit}.hds-form-radio-card--control-left{flex-direction:row-reverse}.hds-form-radio-card--control-left .hds-form-radio-card__control-wrapper{display:flex;align-items:center;border-right-width:var(--token-form-radiocard-border-width);border-right-style:solid;border-top-left-radius:inherit;border-bottom-left-radius:inherit}.hds-form-radio-card__content{flex:1;padding:var(--token-form-radiocard-content-padding)}.hds-form-radio-card__content .hds-badge{margin-bottom:12px}.hds-form-radio-card__label{display:block;margin:8px 0;color:var(--token-form-label-color)}.hds-form-radio-card__label:first-child{margin-top:0}.hds-form-radio-card__description{display:block;color:var(--token-color-foreground-primary)}.hds-form-radio-card__control-wrapper{padding:var(--token-form-radiocard-control-padding);background-color:var(--token-color-surface-faint);border-color:var(--token-color-border-primary)}.hds-form-radio-card__control{display:block;margin:auto}.hds-form-select{max-width:100%;padding:var(--token-form-control-padding);padding-right:calc(var(--token-form-control-padding) + 24px);color:var(--token-form-control-base-foreground-value-color);background-color:var(--token-form-control-base-surface-color-default);background-image:var(--token-form-select-background-image-data-url);background-repeat:no-repeat;background-position:right var(--token-form-select-background-image-position-right-x) top var(--token-form-select-background-image-position-top-y);background-size:var(--token-form-select-background-image-size) var(--token-form-select-background-image-size);border:var(--token-form-control-border-width) solid var(--token-form-control-base-border-color-default);border-radius:var(--token-form-control-border-radius);box-shadow:var(--token-elevation-low-box-shadow);appearance:none}.hds-form-select.mock-hover,.hds-form-select:hover{border-color:var(--token-form-control-base-border-color-hover)}.hds-form-select.mock-focus,.hds-form-select:focus{border-color:var(--token-color-focus-action-internal);outline:var(--token-color-focus-action-external) solid 3px;outline-offset:0}.hds-form-select:disabled{color:var(--token-form-control-disabled-foreground-color);background-color:var(--token-form-control-disabled-surface-color);background-image:var(--token-form-select-background-image-data-url-disabled);border-color:var(--token-form-control-disabled-border-color);box-shadow:none;cursor:not-allowed}.hds-form-select.hds-form-select--is-invalid{border-color:var(--token-form-control-invalid-border-color-default)}.hds-form-select.hds-form-select--is-invalid.mock-hover,.hds-form-select.hds-form-select--is-invalid:hover{border-color:var(--token-form-control-invalid-border-color-hover)}.hds-form-select.hds-form-select--is-invalid.mock-focus,.hds-form-select.hds-form-select--is-invalid:focus{border-color:var(--token-color-focus-critical-internal);outline-color:var(--token-color-focus-critical-external)}.hds-form-select[multiple],.hds-form-select[size]{background:0 0}.hds-form-select[multiple] option,.hds-form-select[size] option{margin:2px auto;border-radius:3px}.hds-form-select[multiple] option:hover,.hds-form-select[size] option:hover{color:var(--token-color-foreground-action)}.hds-form-select[multiple] option:disabled,.hds-form-select[size] option:disabled{color:var(--token-color-foreground-disabled)}.hds-form-select[multiple] option:checked,.hds-form-select[size] option:checked{color:var(--token-color-foreground-high-contrast);background:var(--token-color-palette-blue-200)}.hds-form-text-input,.hds-form-textarea{max-width:100%;background-color:var(--token-form-control-base-surface-color-default)}.hds-form-select[multiple] optgroup,.hds-form-select[size] optgroup{color:var(--token-color-foreground-strong);font-weight:var(--token-typography-font-weight-semibold);font-style:normal}.hds-form-text-input{width:100%;padding:var(--token-form-control-padding);color:var(--token-form-control-base-foreground-value-color);border:var(--token-form-control-border-width) solid var(--token-form-control-base-border-color-default);border-radius:var(--token-form-control-border-radius);box-shadow:var(--hds-elevation-inset-box-shadow)}.hds-form-text-input ::-moz-placeholder{color:var(--token-form-control-base-foreground-placeholder-color)}.hds-form-text-input ::placeholder{color:var(--token-form-control-base-foreground-placeholder-color)}.hds-form-text-input.mock-hover,.hds-form-text-input:hover{border-color:var(--token-form-control-base-border-color-hover)}.hds-form-text-input.mock-focus,.hds-form-text-input:focus{border-color:var(--token-color-focus-action-internal);outline:var(--token-color-focus-action-external) solid 3px;outline-offset:0}.hds-form-text-input:-moz-read-only{color:var(--token-form-control-readonly-foreground-color);background-color:var(--token-form-control-readonly-surface-color);border-color:var(--token-form-control-readonly-border-color);box-shadow:none}.hds-form-text-input:read-only{color:var(--token-form-control-readonly-foreground-color);background-color:var(--token-form-control-readonly-surface-color);border-color:var(--token-form-control-readonly-border-color);box-shadow:none}.hds-form-text-input:disabled{color:var(--token-form-control-disabled-foreground-color);background-color:var(--token-form-control-disabled-surface-color);border-color:var(--token-form-control-disabled-border-color);box-shadow:none;cursor:not-allowed}.hds-form-text-input.hds-form-text-input--is-invalid{border-color:var(--token-form-control-invalid-border-color-default)}.hds-form-text-input.hds-form-text-input--is-invalid.mock-hover,.hds-form-text-input.hds-form-text-input--is-invalid:hover{border-color:var(--token-form-control-invalid-border-color-hover)}.hds-form-text-input.hds-form-text-input--is-invalid.mock-focus,.hds-form-text-input.hds-form-text-input--is-invalid:focus{border-color:var(--token-color-focus-critical-internal);outline-color:var(--token-color-focus-critical-external)}.hds-form-text-input[type=date],.hds-form-text-input[type=time]{width:initial}.hds-form-text-input[type=date]:disabled::-webkit-calendar-picker-indicator,.hds-form-text-input[type=time]:disabled::-webkit-calendar-picker-indicator{visibility:visible;opacity:.5}.hds-form-text-input[type=date][readonly]::-webkit-calendar-picker-indicator,.hds-form-text-input[type=time][readonly]::-webkit-calendar-picker-indicator{visibility:visible}.hds-form-text-input[type=date]::-webkit-calendar-picker-indicator{background-image:var(--token-form-text-input-background-image-data-url-date);background-position:center center;background-size:var(--token-form-text-input-background-image-size)}.hds-form-text-input[type=time]::-webkit-calendar-picker-indicator{background-image:var(--token-form-text-input-background-image-data-url-time);background-position:center center;background-size:var(--token-form-text-input-background-image-size)}.hds-form-text-input[type=search]{padding-left:calc(var(--token-form-control-padding) + 24px);background-image:var(--token-form-text-input-background-image-data-url-search);background-repeat:no-repeat;background-position:var(--token-form-text-input-background-image-position-x) 50%;background-size:var(--token-form-text-input-background-image-size)}.hds-form-text-input[type=search]::-webkit-search-cancel-button{width:var(--token-form-text-input-background-image-size);height:var(--token-form-text-input-background-image-size);background-image:var(--token-form-text-input-background-image-data-url-search-cancel);background-position:center center;background-size:var(--token-form-text-input-background-image-size);-webkit-appearance:none}.hds-form-textarea{width:100%;padding:var(--token-form-control-padding);color:var(--token-form-control-base-foreground-value-color);border:var(--token-form-control-border-width) solid var(--token-form-control-base-border-color-default);border-radius:var(--token-form-control-border-radius);box-shadow:var(--hds-elevation-inset-box-shadow);resize:vertical}.hds-form-textarea ::-moz-placeholder{color:var(--token-form-control-base-foreground-placeholder-color)}.hds-form-textarea ::placeholder{color:var(--token-form-control-base-foreground-placeholder-color)}.hds-form-textarea.mock-hover,.hds-form-textarea:hover{border-color:var(--token-form-control-base-border-color-hover)}.hds-form-textarea.mock-focus,.hds-form-textarea:focus{border-color:var(--token-color-focus-action-internal);outline:var(--token-color-focus-action-external) solid 3px;outline-offset:0}.hds-form-textarea:-moz-read-only{color:var(--token-form-control-disabled-foreground-color);background-color:var(--token-form-control-readonly-surface-color);border-color:var(--token-form-control-disabled-border-color);box-shadow:none}.hds-form-textarea:read-only{color:var(--token-form-control-disabled-foreground-color);background-color:var(--token-form-control-readonly-surface-color);border-color:var(--token-form-control-disabled-border-color);box-shadow:none}.hds-form-textarea:disabled{color:var(--token-form-control-disabled-foreground-color);background-color:var(--token-form-control-disabled-surface-color);border-color:var(--token-form-control-disabled-border-color);box-shadow:none;cursor:not-allowed}.hds-form-textarea.hds-form-textarea--is-invalid{border-color:var(--token-form-control-invalid-border-color-default)}.hds-form-textarea.hds-form-textarea--is-invalid.mock-hover,.hds-form-textarea.hds-form-textarea--is-invalid:hover{border-color:var(--token-form-control-invalid-border-color-hover)}.hds-form-textarea.hds-form-textarea--is-invalid.mock-focus,.hds-form-textarea.hds-form-textarea--is-invalid:focus{border-color:var(--token-color-focus-critical-internal);outline-color:var(--token-color-focus-critical-external)}.hds-form-toggle{position:relative;isolation:isolate}.hds-form-toggle__control{position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;display:block;height:100%;margin:0;padding:0;color:transparent;background-color:transparent;border:none;outline:0;cursor:pointer;opacity:0;-webkit-appearance:none;-moz-appearance:none;appearance:none}.hds-form-toggle__control:disabled{cursor:not-allowed}.hds-form-toggle__facade{position:relative;display:block;width:var(--token-form-toggle-width);height:var(--token-form-toggle-height);background-image:var(--token-form-toggle-background-image-data-url);background-repeat:no-repeat;background-position:var(--token-form-toggle-background-image-position-x) 50%;background-size:var(--token-form-toggle-background-image-size) var(--token-form-toggle-background-image-size);border:var(--token-form-radio-border-width) solid var(--border-color);border-radius:calc(var(--token-form-toggle-height)/ 2)}.hds-form-toggle__facade::after{position:absolute;top:calc(var(--token-form-radio-border-width) * -1);left:calc(var(--token-form-radio-border-width) * -1);width:var(--token-form-toggle-thumb-size);height:var(--token-form-toggle-thumb-size);background-color:var(--token-form-control-base-surface-color-default);border:var(--token-form-radio-border-width) solid var(--border-color);border-radius:50%;transform:translate3d(0,0,0);content:""}@media (prefers-reduced-motion:no-preference){.hds-form-toggle__facade,.hds-form-toggle__facade::after{transition-timing-function:var(--token-form-toggle-transition-timing-function);transition-duration:var(--token-form-toggle-transition-duration);transition-property:all}}.hds-form-toggle__facade::before{position:absolute;top:-5px;right:-5px;bottom:-5px;left:-5px;margin:auto;border-width:3px;border-radius:calc(var(--token-form-toggle-height)/ 2 + 3px + 1px);content:""}:not(:checked)+.hds-form-toggle__facade{--border-color:var(--token-form-control-base-border-color-default);background-color:var(--token-form-toggle-base-surface-color-default)}:checked+.hds-form-toggle__facade{--border-color:var(--token-form-control-checked-border-color-default);background-color:var(--token-form-control-checked-surface-color-default)}:checked+.hds-form-toggle__facade::after{transform:translate3d(calc(var(--token-form-toggle-width) - var(--token-form-toggle-thumb-size)),0,0)}.mock-hover:not(:checked)+.hds-form-toggle__facade,:hover:not(:checked)+.hds-form-toggle__facade{--border-color:var(--token-form-control-base-border-color-hover)}.mock-hover:checked+.hds-form-toggle__facade,:hover:checked+.hds-form-toggle__facade{--border-color:var(--token-form-control-checked-border-color-hover);background-color:var(--token-form-control-checked-border-color-default)}.mock-focus+.hds-form-toggle__facade::before,:focus+.hds-form-toggle__facade::before{border-color:var(--token-color-focus-action-external);border-style:solid}:disabled:checked+.hds-form-toggle__facade,:disabled:not(:checked)+.hds-form-toggle__facade{--border-color:var(--token-form-control-disabled-border-color);background-color:var(--token-form-control-disabled-surface-color);background-image:var(--token-form-toggle-background-image-data-url-disabled)}.hds-icon-tile--logo,.hds-icon-tile__extra{background-color:var(--token-color-surface-primary)}.hds-icon-tile{position:relative;display:flex;border:1px solid transparent;border-radius:4px;box-shadow:0 1px 1px rgba(101,106,118,.05)}.hds-icon-tile__icon,.hds-icon-tile__logo{display:flex;margin:auto}.hds-icon-tile__extra{position:absolute;right:-6px;bottom:-6px;display:flex;box-sizing:content-box;border:1px solid var(--token-color-border-primary);box-shadow:0 1px 1px rgba(101,106,118,.05)}.hds-icon-tile__extra-icon{display:flex;margin:auto;color:var(--token-color-foreground-strong)}.hds-icon-tile--size-small{width:1.75rem;height:1.75rem;border-radius:5px}.hds-icon-tile--size-small .hds-icon-tile__icon{width:1rem;height:1rem}.hds-icon-tile--size-small .hds-icon-tile__logo{width:1.125rem;height:1.125rem}.hds-icon-tile--size-small .hds-icon-tile__extra{width:1.125rem;height:1.125rem;border-radius:4px}.hds-icon-tile--size-small .hds-icon-tile__extra-icon{width:.75rem;height:.75rem}.hds-icon-tile--size-medium{width:2.5rem;height:2.5rem;border-radius:6px}.hds-icon-tile--size-medium .hds-icon-tile__icon{width:1.5rem;height:1.5rem}.hds-icon-tile--size-medium .hds-icon-tile__logo{width:1.75rem;height:1.75rem}.hds-icon-tile--size-medium .hds-icon-tile__extra{width:1.5rem;height:1.5rem;border-radius:5px}.hds-icon-tile--size-medium .hds-icon-tile__extra-icon{width:1rem;height:1rem}.hds-icon-tile--size-large{width:3rem;height:3rem;border-radius:6px}.hds-icon-tile--size-large .hds-icon-tile__icon{width:1.5rem;height:1.5rem}.hds-icon-tile--size-large .hds-icon-tile__logo{width:2rem;height:2rem}.hds-icon-tile--size-large .hds-icon-tile__extra{width:1.5rem;height:1.5rem;border-radius:5px}.hds-icon-tile--size-large .hds-icon-tile__extra-icon{width:1rem;height:1rem}.hds-icon-tile--logo{border-color:var(--token-color-border-primary)}.hds-icon-tile--icon.hds-icon-tile--color-neutral{color:var(--token-color-foreground-faint);background-color:var(--token-color-surface-faint);border-color:var(--token-color-border-primary)}.hds-icon-tile--icon.hds-icon-tile--color-boundary{color:var(--token-color-boundary-foreground);background:linear-gradient(135deg,var(--token-color-boundary-gradient-faint-start) 0,var(--token-color-boundary-gradient-faint-stop) 100%);border-color:var(--token-color-boundary-border)}.hds-icon-tile--icon.hds-icon-tile--color-consul{color:var(--token-color-consul-foreground);background:linear-gradient(135deg,var(--token-color-consul-gradient-faint-start) 0,var(--token-color-consul-gradient-faint-stop) 100%);border-color:var(--token-color-consul-border)}.hds-icon-tile--icon.hds-icon-tile--color-hcp{color:var(--token-color-palette-hcp-brand);background-color:var(--token-color-surface-faint);border-color:var(--token-color-border-primary)}.hds-icon-tile--icon.hds-icon-tile--color-nomad{color:var(--token-color-nomad-foreground);background:linear-gradient(135deg,var(--token-color-nomad-gradient-faint-start) 0,var(--token-color-nomad-gradient-faint-stop) 100%);border-color:var(--token-color-nomad-border)}.hds-icon-tile--icon.hds-icon-tile--color-packer{color:var(--token-color-packer-foreground);background:linear-gradient(135deg,var(--token-color-packer-gradient-faint-start) 0,var(--token-color-packer-gradient-faint-stop) 100%);border-color:var(--token-color-packer-border)}.hds-icon-tile--icon.hds-icon-tile--color-terraform{color:var(--token-color-terraform-foreground);background:linear-gradient(135deg,var(--token-color-terraform-gradient-faint-start) 0,var(--token-color-terraform-gradient-faint-stop) 100%);border-color:var(--token-color-terraform-border)}.hds-icon-tile--icon.hds-icon-tile--color-vagrant{color:var(--token-color-vagrant-foreground);background:linear-gradient(135deg,var(--token-color-vagrant-gradient-faint-start) 0,var(--token-color-vagrant-gradient-faint-stop) 100%);border-color:var(--token-color-vagrant-border)}.hds-icon-tile--icon.hds-icon-tile--color-vault{color:var(--token-color-vault-foreground);background:linear-gradient(135deg,var(--token-color-vault-gradient-faint-start) 0,var(--token-color-vault-gradient-faint-stop) 100%);border-color:var(--token-color-vault-border)}.hds-icon-tile--icon.hds-icon-tile--color-waypoint{color:var(--token-color-waypoint-foreground);background:linear-gradient(135deg,var(--token-color-waypoint-gradient-faint-start) 0,var(--token-color-waypoint-gradient-faint-stop) 100%);border-color:var(--token-color-waypoint-border)}.hds-link-inline--color-primary,.hds-link-standalone--color-primary{color:var(--token-color-foreground-action)}.hds-link-inline{border-radius:2px}.hds-link-inline.mock-focus,.hds-link-inline:focus,.hds-link-inline:focus-visible{text-decoration:none;outline:var(--token-color-focus-action-internal) solid 2px;outline-offset:1px}.hds-link-standalone,.hds-pagination-nav__control,.hds-table__th-sort button,.hds-tabs__tab-button{outline-style:solid;outline-color:transparent}.hds-link-inline__icon{display:inline-block;width:1em;height:1em;vertical-align:text-bottom}.hds-link-inline--icon-leading>.hds-link-inline__icon{margin-right:.25em}.hds-link-inline--icon-trailing>.hds-link-inline__icon{margin-left:.25em}.hds-link-inline--color-primary.mock-hover,.hds-link-inline--color-primary:hover{color:var(--token-color-foreground-action-hover)}.hds-link-inline--color-primary.mock-active,.hds-link-inline--color-primary:active{color:var(--token-color-foreground-action-active)}.hds-link-inline--color-secondary{color:var(--token-color-foreground-strong)}.hds-link-inline--color-secondary.mock-hover,.hds-link-inline--color-secondary:hover{color:var(--token-color-foreground-primary)}.hds-link-inline--color-secondary.mock-active,.hds-link-inline--color-secondary:active{color:var(--token-color-foreground-faint)}.hds-link-standalone{display:flex;align-items:center;justify-content:center;width:-webkit-fit-content;width:-moz-fit-content;width:fit-content;background-color:transparent;border:1px solid transparent;position:relative;isolation:isolate}.hds-link-standalone--size-medium .hds-link-standalone__icon,.hds-link-standalone--size-small .hds-link-standalone__icon{width:1rem;height:1rem}.hds-link-standalone__text{flex:1 0 0;text-decoration:underline;transition:-webkit-text-decoration-color .25s ease-in;transition:text-decoration-color .25s ease-in;transition:text-decoration-color .25s ease-in,-webkit-text-decoration-color .25s ease-in}#login-toggle+div footer button,.consul-intention-fieldsets .permissions>button,.empty-state>ul>li>*,.empty-state>ul>li>:active,.empty-state>ul>li>label>button,.empty-state>ul>li>label>button:active,.hds-pagination-nav__control,.hds-tabs__tab,.modal-dialog [role=document] dd a,.modal-dialog [role=document] p a,.oidc-select button.reset,.search-bar-status .remove-all button,a,main dd a,main dd a:active,main p a,main p a:active{text-decoration:none}.hds-link-standalone__icon+.hds-link-standalone__text,.hds-link-standalone__text+.hds-link-standalone__icon{margin-left:.375rem}.hds-link-standalone--size-small .hds-link-standalone__text{font-size:.8125rem;line-height:1.231}.hds-link-standalone--size-medium .hds-link-standalone__text{font-size:.875rem;line-height:1.143}.hds-link-standalone--size-large .hds-link-standalone__icon{width:1.5rem;height:1.5rem}.hds-link-standalone--size-large .hds-link-standalone__text{font-size:1rem;line-height:1.5}.hds-link-standalone--color-primary.mock-hover,.hds-link-standalone--color-primary:hover{color:var(--token-color-foreground-action-hover)}.hds-link-standalone--color-primary.mock-hover .hds-link-standalone__text,.hds-link-standalone--color-primary:hover .hds-link-standalone__text{-webkit-text-decoration-color:#4e81e8;text-decoration-color:#4e81e8}.hds-link-standalone--color-primary.mock-active,.hds-link-standalone--color-primary:active{color:var(--token-color-foreground-action-active)}.hds-link-standalone--color-primary.mock-active .hds-link-standalone__text,.hds-link-standalone--color-primary:active .hds-link-standalone__text{-webkit-text-decoration-color:#396ed6;text-decoration-color:#396ed6}.hds-link-standalone--color-primary.mock-active::before,.hds-link-standalone--color-primary:active::before{background-color:var(--token-color-surface-action)}.hds-link-standalone--color-secondary{color:var(--token-color-foreground-strong)}.hds-link-standalone--color-secondary.mock-hover .hds-link-standalone__text,.hds-link-standalone--color-secondary:hover .hds-link-standalone__text{-webkit-text-decoration-color:#4d4d4f;text-decoration-color:#4d4d4f}.hds-link-standalone--color-secondary.mock-active,.hds-link-standalone--color-secondary:active{color:var(--token-color-foreground-primary)}.hds-link-standalone--color-secondary.mock-active .hds-link-standalone__text,.hds-link-standalone--color-secondary:active .hds-link-standalone__text{-webkit-text-decoration-color:#6e7075;text-decoration-color:#6e7075}.hds-link-standalone--color-secondary.mock-active::before,.hds-link-standalone--color-secondary:active::before{background-color:var(--token-color-surface-interactive-active)}.hds-link-standalone::before{position:absolute;top:-5px;right:-5px;bottom:-5px;left:-5px;z-index:-1;border-radius:5px;content:""}.hds-link-standalone.mock-focus::before,.hds-link-standalone:focus::before{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-link-standalone:focus:not(:focus-visible)::before{box-shadow:none}.hds-link-standalone:focus-visible::before,.hds-pagination-nav__control.mock-focus::before,.hds-pagination-nav__control:focus::before{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-link-standalone.mock-focus.mock-active::before,.hds-link-standalone:focus:active::before{box-shadow:none}.hds-link-standalone.hds-link-standalone--icon-position-leading::before{right:-7px}.hds-link-standalone.hds-link-standalone--icon-position-trailing::before{left:-7px}.hds-modal{z-index:50;flex-direction:column;padding:0;background:var(--token-color-surface-primary);border:none;border-radius:8px;box-shadow:var(--token-surface-overlay-box-shadow)}.hds-modal[open]{position:fixed;display:flex}.hds-modal::backdrop,.readonly-codemirror .CodeMirror-cursors{display:none}.hds-modal::-webkit-backdrop{display:none}.hds-modal__overlay{position:fixed;top:0;right:0;bottom:0;left:0;z-index:50;background:var(--token-color-palette-neutral-700);opacity:.5}.hds-modal__header{display:flex;flex:none;align-items:flex-start;padding:16px 24px;border-top-left-radius:inherit;border-top-right-radius:inherit}.hds-modal__icon{flex:none;align-self:center;margin-right:16px}.freetext-filter>label,.freetext-filter_input,.hds-modal__title{flex-grow:1}.hds-modal__tagline{margin-bottom:4px}.hds-modal__dismiss{align-self:center;margin-left:16px}.hds-modal__body{flex:1 1 auto;padding:24px;overflow-y:auto;overscroll-behavior:contain}.hds-modal__footer{flex:none;padding:16px 24px;background:var(--token-color-surface-faint);border-top:1px solid var(--token-color-border-primary);border-bottom-right-radius:inherit;border-bottom-left-radius:inherit}.hds-modal__footer .hds-button-set .hds-button--color-tertiary{margin-left:auto}.hds-modal--size-small{width:min(400px,95vw)}.hds-modal--size-medium{width:min(600px,95vw)}.hds-modal--size-large{width:min(800px,95vw)}.hds-modal--color-neutral .hds-modal__header{color:var(--token-color-foreground-strong);background:var(--token-color-surface-faint);border-bottom:1px solid var(--token-color-border-primary)}.hds-modal--color-neutral .hds-modal__tagline{color:var(--token-color-foreground-faint)}.hds-modal--color-warning .hds-modal__header,.hds-modal--color-warning .hds-modal__tagline{color:var(--token-color-foreground-warning-on-surface)}.hds-modal--color-warning .hds-modal__header{background:var(--token-color-surface-warning);border-bottom:1px solid var(--token-color-border-warning)}.hds-modal--color-critical .hds-modal__header,.hds-modal--color-critical .hds-modal__tagline{color:var(--token-color-foreground-critical-on-surface)}.hds-modal--color-critical .hds-modal__header{background:var(--token-color-surface-critical);border-bottom:1px solid var(--token-color-border-critical)}.hds-pagination{display:grid;grid-template-areas:"info nav selector";grid-template-rows:auto;grid-template-columns:1fr auto 1fr;align-items:center;margin:0 auto}@media screen and (max-width:1000px){.hds-pagination{display:flex;flex-wrap:wrap;justify-content:center}.hds-pagination-info{margin-top:var(--token-pagination-child-spacing-vertical);margin-left:var(--token-pagination-child-spacing-horizontal)}}.hds-pagination-info{grid-area:info;justify-self:flex-start;margin-right:var(--token-pagination-child-spacing-horizontal);white-space:nowrap}.hds-pagination-nav{display:flex;grid-area:nav}@media screen and (max-width:1000px){.hds-pagination-nav{justify-content:center;order:-1;width:100%}}.hds-pagination-nav__page-list{display:flex;margin:0;padding:0}.hds-pagination-nav__page-item{list-style-type:none}.hds-pagination-nav__control{display:flex;align-items:center;height:var(--token-pagination-nav-control-height);padding:0 calc(var(--token-pagination-nav-control-padding-horizontal) - 1px);color:var(--token-color-foreground-primary);background-color:transparent;border:1px solid transparent;position:relative;isolation:isolate}.hds-pagination-nav__control::before{position:absolute;top:var(--token-pagination-nav-control-focus-inset);right:var(--token-pagination-nav-control-focus-inset);bottom:var(--token-pagination-nav-control-focus-inset);left:var(--token-pagination-nav-control-focus-inset);z-index:-1;border-radius:5px;content:""}.hds-pagination-nav__control:focus:not(:focus-visible)::before{box-shadow:none}.hds-pagination-nav__control:focus-visible::before,.hds-table__th-sort button.mock-focus::before,.hds-table__th-sort button:focus::before{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-pagination-nav__control.mock-focus.mock-active::before,.hds-pagination-nav__control:focus:active::before{box-shadow:none}.hds-pagination-nav__control.mock-hover,.hds-pagination-nav__control:hover{color:var(--token-color-foreground-action-hover)}.hds-pagination-nav__control.mock-active,.hds-pagination-nav__control:active{color:var(--token-color-foreground-action-active)}.hds-pagination-nav__arrow.mock-disabled,.hds-pagination-nav__arrow:disabled{color:var(--token-color-foreground-disabled);cursor:not-allowed}.hds-pagination-nav__arrow--direction-prev{flex-direction:row;justify-content:flex-start}.hds-pagination-nav__arrow--direction-prev .hds-pagination-nav__arrow-label{margin-left:var(--token-pagination-nav-control-icon-spacing)}.hds-pagination-nav__arrow--direction-next{flex-direction:row-reverse;justify-content:flex-end}.hds-pagination-nav__number--is-selected{position:relative;color:var(--token-color-foreground-action)}.hds-pagination-nav__number--is-selected:hover{color:var(--token-color-foreground-action-hover)}.hds-pagination-nav__number--is-selected:active{color:var(--token-color-foreground-action-active)}.hds-pagination-nav__number--is-selected::after{position:absolute;right:calc(var(--token-pagination-nav-indicator-spacing) - 1px);bottom:-1px;left:calc(var(--token-pagination-nav-indicator-spacing) - 1px);height:var(--token-pagination-nav-indicator-height);margin:0 auto;background-color:currentColor;border-radius:2px;content:""}.hds-pagination-nav__ellipsis{display:flex;align-items:center;height:var(--token-pagination-nav-control-height);padding:0 var(--token-pagination-nav-control-padding-horizontal);color:var(--token-color-foreground-faint)}.hds-pagination-size-selector{display:flex;grid-area:selector;align-items:center;justify-self:flex-end;margin-left:var(--token-pagination-child-spacing-horizontal)}@media screen and (max-width:1000px){.hds-pagination-size-selector{margin-top:var(--token-pagination-child-spacing-vertical);margin-right:var(--token-pagination-child-spacing-horizontal)}}.hds-pagination-size-selector>label{white-space:nowrap}.hds-pagination-size-selector>select{height:28px;margin-left:12px;padding:0 24px 0 8px;background-position:center right 5px}.hds-stepper-indicator-step__text,.hds-tag{font-weight:var(--token-typography-font-weight-medium);font-size:.8125rem}.hds-stepper-indicator-step{position:relative;width:24px;height:24px}.hds-stepper-indicator-step__svg-hexagon{width:100%;height:100%;filter:drop-shadow(0 1px 1px rgba(101, 106, 118, .05))}.hds-stepper-indicator-step__svg-hexagon path{fill:--status-fill-color;stroke:--status-stroke-color}.hds-stepper-indicator-step__status{position:absolute;top:0;right:0;bottom:0;left:0;display:flex;align-items:center;justify-content:center}.hds-stepper-indicator-step__icon{width:12px;height:12px;color:--status-text-color}.hds-stepper-indicator-step__text{width:20px;overflow:hidden;color:--status-text-color;white-space:nowrap;text-align:center;-webkit-user-select:none;-moz-user-select:none;user-select:none}.hds-stepper-indicator-step--status-incomplete .hds-stepper-indicator-step__status{color:var(--token-color-foreground-strong)}.hds-stepper-indicator-step--status-complete .hds-stepper-indicator-step__status,.hds-stepper-indicator-step--status-processing .hds-stepper-indicator-step__status,.hds-stepper-indicator-step--status-progress .hds-stepper-indicator-step__status{color:var(--token-color-foreground-high-contrast)}.hds-stepper-indicator-step--status-incomplete .hds-stepper-indicator-step__svg-hexagon path{fill:var(--token-color-surface-faint);stroke:var(--token-color-foreground-strong)}.hds-stepper-indicator-step--status-complete .hds-stepper-indicator-step__svg-hexagon path,.hds-stepper-indicator-step--status-processing .hds-stepper-indicator-step__svg-hexagon path,.hds-stepper-indicator-step--status-progress .hds-stepper-indicator-step__svg-hexagon path{fill:var(--token-color-foreground-strong);stroke:var(--token-color-foreground-strong)}.hds-stepper-indicator-step--is-interactive{cursor:pointer}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-incomplete .hds-stepper-indicator-step__status{color:var(--token-color-foreground-primary)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-processing .hds-stepper-indicator-step__status,.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-progress .hds-stepper-indicator-step__status{color:var(--token-color-foreground-high-contrast)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-incomplete .hds-stepper-indicator-step__svg-hexagon path{fill:var(--token-color-surface-interactive);stroke:var(--token-color-border-strong)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-incomplete.mock-hover .hds-stepper-indicator-step__svg-hexagon path,.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-incomplete:hover .hds-stepper-indicator-step__svg-hexagon path{fill:var(--token-color-surface-interactive-hover)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-incomplete.mock-active .hds-stepper-indicator-step__svg-hexagon path,.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-incomplete:active .hds-stepper-indicator-step__svg-hexagon path{fill:var(--token-color-surface-interactive-active)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-progress .hds-stepper-indicator-step__svg-hexagon path{fill:var(--token-color-palette-blue-200);stroke:var(--token-color-palette-blue-300)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-progress.mock-hover .hds-stepper-indicator-step__svg-hexagon path,.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-progress:hover .hds-stepper-indicator-step__svg-hexagon path{fill:var(--token-color-palette-blue-300);stroke:var(--token-color-palette-blue-400)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-progress.mock-active .hds-stepper-indicator-step__svg-hexagon path,.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-progress:active .hds-stepper-indicator-step__svg-hexagon path{fill:var(--token-color-palette-blue-400);stroke:var(--token-color-palette-blue-400)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-processing .hds-stepper-indicator-step__svg-hexagon path{fill:var(--token-color-palette-blue-200);stroke:var(--token-color-palette-blue-300)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-processing.mock-hover .hds-stepper-indicator-step__svg-hexagon path,.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-processing:hover .hds-stepper-indicator-step__svg-hexagon path{fill:var(--token-color-palette-blue-300);stroke:var(--token-color-palette-blue-400)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-processing.mock-active .hds-stepper-indicator-step__svg-hexagon path,.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-processing:active .hds-stepper-indicator-step__svg-hexagon path{fill:var(--token-color-palette-blue-400);stroke:var(--token-color-palette-blue-400)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-complete .hds-stepper-indicator-step__status{color:var(--token-color-palette-blue-200)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-complete .hds-stepper-indicator-step__svg-hexagon path{fill:var(--token-color-palette-blue-50);stroke:var(--token-color-palette-blue-300)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-complete.mock-active .hds-stepper-indicator-step__svg-hexagon path,.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-complete.mock-hover .hds-stepper-indicator-step__svg-hexagon path,.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-complete:active .hds-stepper-indicator-step__svg-hexagon path,.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-complete:hover .hds-stepper-indicator-step__svg-hexagon path{fill:var(--token-color-palette-blue-100);stroke:var(--token-color-palette-blue-400)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-complete.mock-hover .hds-stepper-indicator-step__status,.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-complete:hover .hds-stepper-indicator-step__status{color:var(--token-color-palette-blue-300)}.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-complete.mock-active .hds-stepper-indicator-step__status,.hds-stepper-indicator-step--is-interactive.hds-stepper-indicator-step--status-complete:active .hds-stepper-indicator-step__status{color:var(--token-color-palette-blue-400)}.hds-stepper-indicator-task{position:relative;display:flex;align-items:center;justify-content:center;width:16px;height:16px;color:var(--token-color-foreground-strong)}.hds-stepper-indicator-task__icon{width:12px;height:12px}.hds-stepper-indicator-task--is-interactive{cursor:pointer}.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-incomplete{color:var(--token-color-palette-neutral-300)}.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-incomplete.mock-hover,.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-incomplete:hover{color:var(--token-color-palette-blue-300)}.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-incomplete.mock-active,.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-incomplete:active{color:var(--token-color-palette-blue-400)}.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-progress{color:var(--token-color-palette-blue-200)}.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-progress.mock-hover,.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-progress:hover{color:var(--token-color-palette-blue-300)}.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-progress.mock-active,.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-progress:active{color:var(--token-color-palette-blue-400)}.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-processing{color:var(--token-color-palette-blue-200)}.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-processing.mock-hover,.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-processing:hover{color:var(--token-color-palette-blue-300)}.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-processing.mock-active,.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-processing:active{color:var(--token-color-palette-blue-400)}.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-complete{color:var(--token-color-palette-green-200)}.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-complete.mock-hover,.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-complete:hover{color:var(--token-color-palette-green-300)}.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-complete.mock-active,.hds-stepper-indicator-task--is-interactive.hds-stepper-indicator-task--status-complete:active{color:var(--token-color-palette-green-400)}.hds-table{width:100%;border:1px solid var(--token-color-border-primary);border-radius:6px}.hds-table--layout-fixed{table-layout:fixed}.hds-table__thead .hds-table__tr{color:var(--token-color-foreground-strong);background-color:var(--token-color-surface-strong)}.hds-table__thead .hds-table__tr:first-of-type th:first-child{border-top-left-radius:5px}.hds-table__thead .hds-table__tr:first-of-type th:last-child{border-top-right-radius:5px}.hds-table__th,.hds-table__th-sort{height:48px;text-align:left;border-top:none;border-right:none;border-bottom:1px solid var(--token-color-border-primary);border-left:none}.hds-table__th{padding:12px 16px}.hds-table__th-sort{padding:0}.hds-table__th-sort button{width:100%;height:100%;min-height:48px;margin:0;padding:12px 16px;text-align:inherit;background-color:transparent;border:1px solid transparent;border-radius:inherit;position:relative;isolation:isolate}.hds-table__th-sort button .hds-table__th-sort--button-content{display:flex;align-items:center}.hds-table__th-sort button .hds-table__th-sort--button-content .flight-icon{flex:none;margin-left:8px;color:var(--token-color-foreground-action)}.hds-tabs__tab,.hds-tabs__tablist{margin:0;position:relative;display:flex}.hds-table__th-sort button.mock-hover,.hds-table__th-sort button:hover{color:var(--token-color-foreground-strong);background-color:var(--token-color-palette-neutral-200);cursor:pointer}.hds-table__th-sort button::before{position:absolute;top:0;right:0;bottom:0;left:0;z-index:-1;border-radius:inherit;content:""}.hds-table__th-sort button:focus:not(:focus-visible)::before{box-shadow:none}.hds-table__th-sort button:focus-visible::before{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-table__th-sort button.mock-focus.mock-active::before,.hds-table__th-sort button:focus:active::before{box-shadow:none}.hds-table__th-sort button.mock-active,.hds-table__th-sort button:active{color:var(--token-color-foreground-strong);background-color:var(--token-color-palette-neutral-300)}.hds-table__tbody .hds-table__tr,.hds-tabs__tab,.hds-tag,.hds-tag__dismiss-icon{color:var(--token-color-foreground-primary)}.hds-table--striped .hds-table__tbody .hds-table__tr:nth-child(even){background-color:var(--token-color-surface-faint)}.hds-table--density-short .hds-table__tbody td{padding:4px 16px}.hds-table--density-medium .hds-table__tbody td{padding:12px 16px}.hds-table--density-tall .hds-table__tbody td{padding:20px 16px}.hds-table--valign-top .hds-table__tbody td{vertical-align:top}.hds-table--valign-middle .hds-table__tbody td,.hds-tag{vertical-align:middle}.hds-table__td--text-right,.hds-table__th--text-right,.hds-table__th-sort--text-right{text-align:right}.hds-table__td--text-center,.hds-table__th--text-center,.hds-table__th-sort--text-center{text-align:center}.hds-table__tbody .hds-table__tr{background-color:var(--token-color-surface-primary)}.hds-table__tbody .hds-table__tr td{border-top:none;border-right:none;border-bottom:1px solid var(--token-color-border-primary);border-left:none}.hds-table__tbody .hds-table__tr:last-of-type td{border-bottom:none}.hds-table__tbody .hds-table__tr:last-of-type td:first-child{border-bottom-left-radius:5px}.hds-table__tbody .hds-table__tr:last-of-type td:last-child{border-bottom-right-radius:5px}.hds-tabs__tablist-wrapper{position:relative}.hds-tabs__tablist-wrapper::before{position:absolute;right:0;bottom:calc((var(--token-tabs-indicator-height) - var(--token-tabs-divider-height))/ 2);left:0;display:block;border-top:var(--token-tabs-divider-height) solid var(--token-color-border-primary);content:""}.hds-tabs__tablist{padding:0;overflow-x:auto;-webkit-overflow-scrolling:touch}.hds-tabs__tab{align-items:center;height:var(--token-tabs-tab-height);padding:var(--token-tabs-tab-padding-vertical) var(--token-tabs-tab-padding-horizontal);white-space:nowrap;list-style:none}.hds-tabs__tab.hds-tabs__tab--is-selected,.hds-tabs__tab.mock-hover,.hds-tabs__tab:hover{color:var(--token-color-foreground-action)}.hds-tabs__tab.hds-tabs__tab--is-selected:hover{color:var(--token-color-foreground-action-hover)}.hds-tabs__tab.hds-tabs__tab--is-selected:hover~.hds-tabs__tab-indicator{background:var(--token-color-foreground-action-hover)}.hds-tabs__tab-button{isolation:isolate;position:static;display:flex;align-items:center;padding:0;color:inherit;background-color:transparent;border:none;border-radius:var(--token-tabs-tab-border-radius);cursor:pointer}.hds-tabs__tab-button::before{position:absolute;top:var(--token-tabs-tab-focus-inset);right:var(--token-tabs-tab-focus-inset);bottom:var(--token-tabs-tab-focus-inset);left:var(--token-tabs-tab-focus-inset);z-index:-1;border-radius:5px;content:""}.hds-tabs__tab-button.mock-focus::before,.hds-tabs__tab-button:focus::before{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-tabs__tab-button:focus:not(:focus-visible)::before{box-shadow:none}.hds-tabs__tab-button:focus-visible::before{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-tabs__tab-button.mock-focus.mock-active::before,.hds-tabs__tab-button:focus:active::before{box-shadow:none}.hds-tabs__tab-button::after{position:absolute;content:"";inset:0}.hds-tabs__tab-icon{margin-right:var(--token-tabs-tab-gutter)}.hds-tabs__tab-count{margin-left:var(--token-tabs-tab-gutter)}.hds-tabs__tab-indicator{position:absolute;right:0;bottom:0;left:var(--indicator-left-pos);z-index:10;display:block;width:var(--indicator-width);height:var(--token-tabs-indicator-height);background-color:var(--token-color-foreground-action);border-radius:var(--token-tabs-indicator-height)}.hds-tag,.hds-tag__dismiss,.hds-tag__link{background-color:var(--token-color-surface-interactive)}@media screen and (prefers-reduced-motion:no-preference){.hds-tabs__tab-indicator{transition-timing-function:var(--token-tabs-indicator-transition-function);transition-duration:var(--token-tabs-indicator-transition-duration);transition-property:left,width}}.hds-tag{display:inline-flex;align-items:stretch;line-height:1rem;border:1px solid var(--token-color-border-strong);border-radius:50px}article,aside,figure,footer,header,hgroup,hr,section{display:block}.hds-tag__dismiss{flex:0 0 auto;margin:0;padding:6px 2px 6px 8px;border:none;border-radius:inherit;border-top-right-radius:0;border-bottom-right-radius:0}.hds-tag__dismiss-icon{width:12px;height:12px}.hds-tag__link,.hds-tag__text{flex:1 0 0;padding:3px 10px 5px;border-radius:inherit}.hds-tag__dismiss~.hds-tag__link,.hds-tag__dismiss~.hds-tag__text{padding:3px 8px 5px 6px;border-top-left-radius:0;border-bottom-left-radius:0}.hds-tag__dismiss,.hds-tag__link{cursor:pointer}.hds-tag__dismiss.mock-hover,.hds-tag__dismiss:hover,.hds-tag__link.mock-hover,.hds-tag__link:hover{background-color:var(--token-color-surface-interactive-hover)}.hds-tag__dismiss.mock-active,.hds-tag__dismiss:active,.hds-tag__link.mock-active,.hds-tag__link:active,hr{background-color:var(--token-color-surface-interactive-active)}.hds-tag__dismiss.mock-focus,.hds-tag__dismiss:focus,.hds-tag__link.mock-focus,.hds-tag__link:focus{outline-style:solid;outline-color:transparent;z-index:1}.hds-tag__dismiss.mock-focus.mock-focus,.hds-tag__dismiss.mock-focus:focus,.hds-tag__dismiss:focus.mock-focus,.hds-tag__dismiss:focus:focus,.hds-tag__link.mock-focus.mock-focus,.hds-tag__link.mock-focus:focus,.hds-tag__link:focus.mock-focus,.hds-tag__link:focus:focus{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-tag__dismiss.mock-focus:focus:not(:focus-visible),.hds-tag__dismiss:focus:focus:not(:focus-visible),.hds-tag__link.mock-focus:focus:not(:focus-visible),.hds-tag__link:focus:focus:not(:focus-visible){box-shadow:none}.hds-tag__dismiss.mock-focus:focus-visible,.hds-tag__dismiss:focus:focus-visible,.hds-tag__link.mock-focus:focus-visible,.hds-tag__link:focus:focus-visible{box-shadow:var(--token-focus-ring-action-box-shadow)}.hds-tag__dismiss.mock-focus.mock-focus.mock-active,.hds-tag__dismiss.mock-focus:focus:active,.hds-tag__dismiss:focus.mock-focus.mock-active,.hds-tag__dismiss:focus:focus:active,.hds-tag__link.mock-focus.mock-focus.mock-active,.hds-tag__link.mock-focus:focus:active,.hds-tag__link:focus.mock-focus.mock-active,.hds-tag__link:focus:focus:active{box-shadow:none}.hds-tag--color-primary .hds-tag__link{color:var(--token-color-foreground-action)}.hds-tag--color-primary .hds-tag__link.mock-hover,.hds-tag--color-primary .hds-tag__link:hover{color:var(--token-color-foreground-action-hover)}.hds-tag--color-primary .hds-tag__link.mock-active,.hds-tag--color-primary .hds-tag__link:active{color:var(--token-color-foreground-action-active)}.hds-tag--color-secondary .hds-tag__link,body{color:var(--token-color-foreground-strong)}.hds-toast{width:-webkit-fit-content;width:-moz-fit-content;width:fit-content;min-width:min(360px,80vw);max-width:min(500px,80vw);box-shadow:var(--token-elevation-higher-box-shadow)}.sr-only{position:absolute!important;width:1px!important;height:1px!important;margin:-1px!important;padding:0!important;overflow:hidden!important;white-space:nowrap!important;border:0!important;clip:rect(1px,1px,1px,1px)!important;-webkit-clip-path:inset(50%)!important;clip-path:inset(50%)!important}fieldset,hr{border:none}blockquote,body,dd,dl,dt,fieldset,figure,h1,h2,h3,h4,h5,h6,hr,html,iframe,legend,li,ol,p,pre,textarea,ul{margin:0;padding:0}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:400}ul{list-style:none}table td,table th{padding:0;text-align:left}audio,embed,img,object,video{height:auto;max-width:100%}.consul-intention-action-warn-modal button.dangerous,.copy-button button,.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button,.informed-action>ul>li>*,.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-select label>*,.topology-notices button,.type-sort.popover-select label>*,label span,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}a{color:var(--token-color-foreground-action)}span,strong,td,th{color:inherit}html{background-color:var(--token-color-surface-primary);font-size:var(--typo-size-000);text-rendering:optimizeLegibility;-webkit-text-size-adjust:100%;-moz-text-size-adjust:100%;text-size-adjust:100%;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;overflow-x:hidden;overflow-y:scroll;box-sizing:border-box;min-width:300px}hr{height:1px;margin:1.5rem 0}body,input,select,textarea{font-family:var(--typo-family-sans)}.CodeMirror-lint-tooltip,.cm-s-hashi.CodeMirror,code,pre{font-family:var(--typo-family-mono)}strong{font-style:inherit;font-weight:var(--typo-weight-bold)}code,pre{-moz-osx-font-smoothing:auto;-webkit-font-smoothing:auto}pre{-webkit-overflow-scrolling:touch;overflow-x:auto;white-space:pre;word-wrap:normal}*,::after,::before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-scroll-snap-strictness:proximity;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgb(59 130 246 / 0.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;box-sizing:inherit;-webkit-animation-play-state:paused;animation-play-state:paused;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards}fieldset{width:100%}a,input[type=checkbox],input[type=radio]{cursor:pointer}input[type=checkbox],input[type=radio]{vertical-align:baseline}td,th{text-align:left;vertical-align:top}button,input,select,textarea{margin:0}iframe{border:0}.consul-bucket-list .service,.consul-bucket-list:not([class]) dt:not([class]),.consul-exposed-path-list>ul>li>.detail dl:not([class]) dt:not([class]),.consul-instance-checks:not([class]) dt:not([class]),.consul-lock-session-list dl:not([class]) dt:not([class]),.consul-server-card dt:not(.name),.consul-upstream-instance-list dl.local-bind-address dt,.consul-upstream-instance-list dl.local-bind-socket-path dt,.consul-upstream-instance-list dl:not([class]) dt:not([class]),.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dt:not([class]),.route-title,.tag-list:not([class]) dt:not([class]),section[data-route="dc.show.license"] .validity dl .expired+dd,section[data-route="dc.show.license"] .validity dl:not([class]) dt:not([class]),section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dt:not([class]),td.tags:not([class]) dt:not([class]){position:absolute;overflow:hidden;clip:rect(0 0 0 0);width:1px;height:1px;margin:-1px;padding:0;border:0}.consul-upstream-instance-list dl.local-bind-socket-mode dt,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dt{position:static!important;clip:unset!important;overflow:visible!important;width:auto!important;height:auto!important;margin:0!important;padding:0!important}.animatable.tab-nav ul::after,.consul-auth-method-type,.consul-external-source,.consul-intention-action-warn-modal button.dangerous,.consul-intention-action-warn-modal button.dangerous:hover:active,.consul-intention-action-warn-modal button.dangerous:hover:not(:disabled):not(:active),.consul-intention-list td.intent- strong,.consul-intention-permission-form button.type-submit,.consul-intention-permission-form button.type-submit:disabled,.consul-intention-permission-form button.type-submit:focus:not(:disabled),.consul-intention-permission-form button.type-submit:hover:not(:disabled),.consul-intention-search-bar .value- span,.consul-kind,.consul-source,.consul-transparent-proxy,.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:first-child,.discovery-chain .route-card>header ul li,.informed-action>ul>.dangerous>*,.informed-action>ul>.dangerous>:focus,.informed-action>ul>.dangerous>:hover,.leader,.menu-panel>ul>li.dangerous>:first-child,.modal-dialog [role=document]>footer,.modal-dialog [role=document]>header,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:first-child,.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:first-child,.tab-nav .selected>*,.topology-metrics-source-type,html[data-route^="dc.acls.index"] main td strong,span.policy-node-identity,span.policy-service-identity,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:first-child{border-style:solid}.animatable.tab-nav ul::after,.app .notifications .app-notification,.tab-nav li>*{transition-duration:.15s;transition-timing-function:ease-out}[role=banner] nav:first-of-type,[role=contentinfo],html body>.brand-loader,main{transition-timing-function:cubic-bezier(.1,.1,.25,.9);transition-duration:.1s}html[data-state]:not(.ember-loading) body>.brand-loader{-webkit-animation-timing-function:cubic-bezier(.1,.1,.25,.9);animation-timing-function:cubic-bezier(.1,.1,.25,.9);-webkit-animation-duration:.1s;animation-duration:.1s;-webkit-animation-name:remove-from-flow;animation-name:remove-from-flow;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards}@-webkit-keyframes remove-from-flow{100%{visibility:hidden;overflow:hidden;clip:rect(0 0 0 0)}}@keyframes remove-from-flow{100%{visibility:hidden;overflow:hidden;clip:rect(0 0 0 0)}}@-webkit-keyframes typo-truncate{100%{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}}@keyframes typo-truncate{100%{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}}.informed-action header>*{font-size:inherit;font-weight:inherit;line-height:inherit;font-style:inherit}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password],.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text],.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea,.modal-dialog [role=document] .type-password [type=password],.modal-dialog [role=document] .type-password [type=text],.modal-dialog [role=document] .type-password textarea,.modal-dialog [role=document] .type-select [type=password],.modal-dialog [role=document] .type-select [type=text],.modal-dialog [role=document] .type-select textarea,.modal-dialog [role=document] .type-text [type=password],.modal-dialog [role=document] .type-text [type=text],.modal-dialog [role=document] .type-text textarea,.modal-dialog [role=document] [role=radiogroup] label [type=password],.modal-dialog [role=document] [role=radiogroup] label [type=text],.modal-dialog [role=document] [role=radiogroup] label textarea,.oidc-select label [type=password],.oidc-select label [type=text],.oidc-select label textarea,.type-toggle [type=password],.type-toggle [type=text],.type-toggle textarea,body,main .type-password [type=password],main .type-password [type=text],main .type-password textarea,main .type-select [type=password],main .type-select [type=text],main .type-select textarea,main .type-text [type=password],main .type-text [type=text],main .type-text textarea{font-size:var(--typo-size-600);font-family:var(--typo-family-sans);line-height:var(--typo-lead-700)}.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.app-view>header .title .title-left-container>:first-child,.consul-auth-method-binding-list h2,.consul-auth-method-view section h2,.consul-health-check-list .health-check-output dt,.consul-health-check-list .health-check-output header>*,.consul-intention-list td.destination,.consul-intention-list td.source,.consul-intention-permission-form h2,.consul-intention-view h2,.consul-server-card .name+dd,.definition-table dt,.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.empty-state header :first-child,.hashicorp-consul nav .dcs [aria-expanded],.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button,.informed-action header,.informed-action>ul>li>*,.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label>span,.modal-dialog [role=document] form h2,.modal-dialog [role=document] table caption,.modal-dialog [role=document] table td strong,.modal-dialog [role=document] table td:first-child,.modal-dialog [role=document] table th,.modal-dialog [role=document]>header>:not(button),.modal-dialog-body h2,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.oidc-select label>span,.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.radio-card header,.tab-nav,.type-toggle label span,.type-toggle>span,[role=banner] nav:last-of-type [aria-expanded],[role=banner] nav:last-of-type>ul>li>.popover-menu>label>button,[role=banner] nav:last-of-type>ul>li>a,[role=banner] nav:last-of-type>ul>li>button,[role=banner] nav:last-of-type>ul>li>span,fieldset>header,html[data-route^="dc.kv.edit"] h2,html[data-route^="dc.services.instance.metadata"] .tab-section section h2,main .type-password>span,main .type-select>span,main .type-text>span,main form h2,main header nav:first-child ol li>*,main table caption,main table td strong,main table td:first-child,main table th,section[data-route="dc.show.license"] aside header>:first-child,section[data-route="dc.show.license"] h2,section[data-route="dc.show.serverstatus"] .redundancy-zones h3,section[data-route="dc.show.serverstatus"] h2,section[data-route="dc.show.serverstatus"] h3,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{line-height:var(--typo-lead-200)}.app-view>header .title .title-left-container>:first-child{font-weight:var(--typo-weight-bold);font-size:var(--typo-size-200)}.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.consul-auth-method-binding-list h2,.consul-auth-method-view section h2,.consul-health-check-list .health-check-output header>*,.consul-intention-list td.destination,.consul-intention-list td.source,.consul-intention-permission-form h2,.consul-intention-view h2,.consul-server-card .name+dd,.definition-table dt,.empty-state header :first-child,.hashicorp-consul nav .dcs [aria-expanded],.informed-action header,.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label>span,.modal-dialog [role=document] form h2,.modal-dialog [role=document] table caption,.modal-dialog [role=document] table td:first-child,.modal-dialog [role=document]>header>:not(button),.modal-dialog-body h2,.oidc-select label>span,.radio-card header,.type-toggle>span,[role=banner] nav:last-of-type [aria-expanded],[role=banner] nav:last-of-type>ul>li>.popover-menu>label>button,[role=banner] nav:last-of-type>ul>li>a,[role=banner] nav:last-of-type>ul>li>button,[role=banner] nav:last-of-type>ul>li>span,fieldset>header,html[data-route^="dc.kv.edit"] h2,html[data-route^="dc.services.instance.metadata"] .tab-section section h2,main .type-password>span,main .type-select>span,main .type-text>span,main form h2,main table caption,main table td:first-child,section[data-route="dc.show.license"] aside header>:first-child,section[data-route="dc.show.license"] h2,section[data-route="dc.show.serverstatus"] .redundancy-zones h3,section[data-route="dc.show.serverstatus"] h2,section[data-route="dc.show.serverstatus"] h3{font-weight:var(--typo-weight-semibold)}.consul-health-check-list .health-check-output dt,.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button,.informed-action>ul>li>*,.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.modal-dialog [role=document] table td strong,.modal-dialog [role=document] table th,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.tab-nav,.type-toggle label span,main header nav:first-child ol li>*,main table td strong,main table th,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{font-weight:var(--typo-weight-medium)}.consul-auth-method-binding-list h2,.consul-auth-method-view section h2,.consul-intention-permission-form h2,.consul-intention-view h2,.empty-state header :first-child,.modal-dialog [role=document] form h2,.modal-dialog [role=document]>header>:not(button),.modal-dialog-body h2,html[data-route^="dc.kv.edit"] h2,main form h2,section[data-route="dc.show.license"] h2,section[data-route="dc.show.serverstatus"] h2,section[data-route="dc.show.serverstatus"] h3{font-size:var(--typo-size-300)}.consul-health-check-list .health-check-output header>*,.consul-server-card .name+dd,html[data-route^="dc.services.instance.metadata"] .tab-section section h2,section[data-route="dc.show.license"] aside header>:first-child,section[data-route="dc.show.serverstatus"] .redundancy-zones h3{font-size:var(--typo-size-500)}.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.consul-intention-list td.destination,.consul-intention-list td.source,.definition-table dt,.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.hashicorp-consul nav .dcs [aria-expanded],.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button,.informed-action header,.informed-action>ul>li>*,.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label>span,.modal-dialog [role=document] table caption,.modal-dialog [role=document] table td:first-child,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.oidc-select label>span,.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.radio-card header,.tab-nav,.type-toggle>span,[role=banner] nav:last-of-type [aria-expanded],[role=banner] nav:last-of-type>ul>li>.popover-menu>label>button,[role=banner] nav:last-of-type>ul>li>a,[role=banner] nav:last-of-type>ul>li>button,[role=banner] nav:last-of-type>ul>li>span,fieldset>header,main .type-password>span,main .type-select>span,main .type-text>span,main header nav:first-child ol li>*,main table caption,main table td:first-child,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{font-size:var(--typo-size-600)}.consul-health-check-list .health-check-output dt,.modal-dialog [role=document] table td strong,.modal-dialog [role=document] table th,.type-toggle label span,main table td strong,main table th{font-size:var(--typo-size-700)}.app-view h1 span.kind-proxy,.app-view>div form:not(.filter-bar) [role=radiogroup] label>em,.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.auth-form em,.auth-profile,.consul-auth-method-view section,.consul-external-source,.consul-health-check-list .health-check-output dl>dd,.consul-intention-action-warn-modal button.dangerous,.consul-intention-fieldsets .permissions>button,.consul-intention-permission-header-list>ul>li dd,.consul-intention-permission-list>ul>li dd,.consul-kind,.consul-source,.copy-button button,.disclosure-menu [aria-expanded]~* [role=separator],.disclosure-menu [aria-expanded]~*>div,.discovery-chain .resolvers>header>*,.discovery-chain .routes>header>*,.discovery-chain .splitters>header>*,.empty-state header :nth-child(2),.empty-state p,.empty-state>ul>li>*,.empty-state>ul>li>label>button,.has-error>strong,.informed-action p,.menu-panel [role=separator],.menu-panel>div,.modal-dialog [role=document] .type-password>em,.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>em,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text>em,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label>em,.modal-dialog [role=document] [role=radiogroup] label>span,.modal-dialog [role=document] form button+em,.modal-dialog [role=document] p,.modal-dialog [role=document] table td,.modal-dialog [role=document] table td p,.more-popover-menu>[type=checkbox]+label+div [role=separator],.more-popover-menu>[type=checkbox]+label+div>div,.oidc-select button.reset,.oidc-select label>em,.oidc-select label>span,.popover-menu>[type=checkbox]+label+div [role=separator],.popover-menu>[type=checkbox]+label+div>div,.popover-select label>*,.tippy-box[data-theme~=tooltip] .tippy-content,.topology-notices button,.type-sort.popover-select label>*,.type-toggle>em,.type-toggle>span,[role=banner] nav:first-of-type [role=separator],[role=banner] nav:first-of-type a,[role=banner] nav:first-of-type>ul>li>label,[role=contentinfo],main .type-password>em,main .type-password>span,main .type-select>em,main .type-select>span,main .type-text>em,main .type-text>span,main form button+em,main p,main table td,main table td p,pre code,section[data-route="dc.show.serverstatus"] .server-failure-tolerance dt,span.label,table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator],table.has-actions tr>.actions>[type=checkbox]+label+div>div,table.with-details tr>.actions>[type=checkbox]+label+div [role=separator],table.with-details tr>.actions>[type=checkbox]+label+div>div{line-height:inherit;font-size:inherit}.consul-auth-method-view section,.consul-external-source,.consul-kind,.consul-source,[role=banner] nav:first-of-type a,[role=banner] nav:first-of-type>ul>li>label,pre code{font-size:var(--typo-size-600)}.app-view h1 span.kind-proxy,.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.auth-profile,.consul-health-check-list .health-check-output dl>dd,.consul-intention-fieldsets .permissions>button,.consul-intention-permission-header-list>ul>li dd,.consul-intention-permission-list>ul>li dd,.disclosure-menu [aria-expanded]~*>div,.empty-state>ul>li>*,.empty-state>ul>li>label>button,.informed-action p,.menu-panel>div,.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label>span,.modal-dialog [role=document] table td,.modal-dialog [role=document] table td p,.more-popover-menu>[type=checkbox]+label+div>div,.oidc-select label>span,.popover-menu>[type=checkbox]+label+div>div,.type-toggle>span,[role=contentinfo],main .type-password>span,main .type-select>span,main .type-text>span,main table td,main table td p,section[data-route="dc.show.serverstatus"] .server-failure-tolerance dt,span.label,table.has-actions tr>.actions>[type=checkbox]+label+div>div,table.with-details tr>.actions>[type=checkbox]+label+div>div{font-size:var(--typo-size-700)}.app-view>div form:not(.filter-bar) [role=radiogroup] label>em,.auth-form em,.consul-intention-action-warn-modal button.dangerous,.copy-button button,.disclosure-menu [aria-expanded]~* [role=separator],.discovery-chain .resolvers>header>*,.discovery-chain .routes>header>*,.discovery-chain .splitters>header>*,.empty-state header :nth-child(2),.empty-state p,.has-error>strong,.menu-panel [role=separator],.modal-dialog [role=document] .type-password>em,.modal-dialog [role=document] .type-select>em,.modal-dialog [role=document] .type-text>em,.modal-dialog [role=document] [role=radiogroup] label>em,.modal-dialog [role=document] form button+em,.modal-dialog [role=document] p,.more-popover-menu>[type=checkbox]+label+div [role=separator],.oidc-select button.reset,.oidc-select label>em,.popover-menu>[type=checkbox]+label+div [role=separator],.popover-select label>*,.tippy-box[data-theme~=tooltip] .tippy-content,.topology-notices button,.type-sort.popover-select label>*,.type-toggle>em,[role=banner] nav:first-of-type [role=separator],[role=contentinfo],main .type-password>em,main .type-select>em,main .type-text>em,main form button+em,main p,table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator],table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]{font-size:var(--typo-size-800)}::after,::before{--tw-content:'';display:inline-block;vertical-align:text-top;background-repeat:no-repeat;background-position:center;mask-repeat:no-repeat;-webkit-mask-repeat:no-repeat;mask-position:center;-webkit-mask-position:center}::before{-webkit-animation-name:var(--icon-name-start,var(--icon-name)),var(--icon-size-start,var(--icon-size,icon-000));animation-name:var(--icon-name-start,var(--icon-name)),var(--icon-size-start,var(--icon-size,icon-000));background-color:var(--icon-color-start,var(--icon-color))}::after{-webkit-animation-name:var(--icon-name-end,var(--icon-name)),var(--icon-size-end,var(--icon-size,icon-000));animation-name:var(--icon-name-end,var(--icon-name)),var(--icon-size-end,var(--icon-size,icon-000));background-color:var(--icon-color-end,var(--icon-color))}[style*="--icon-color-start"]::before{color:var(--icon-color-start)}[style*="--icon-color-end"]::after{color:var(--icon-color-end)}[style*="--icon-name-start"]::before,[style*="--icon-name-end"]::after{content:""}@-webkit-keyframes icon-000{100%{width:1.2em;height:1.2em}}@keyframes icon-000{100%{width:1.2em;height:1.2em}}@-webkit-keyframes icon-100{100%{width:.625rem;height:.625rem}}@keyframes icon-100{100%{width:.625rem;height:.625rem}}@-webkit-keyframes icon-200{100%{width:.75rem;height:.75rem}}@keyframes icon-200{100%{width:.75rem;height:.75rem}}@-webkit-keyframes icon-300{100%{width:1rem;height:1rem}}@keyframes icon-300{100%{width:1rem;height:1rem}}@-webkit-keyframes icon-400{100%{width:1.125rem;height:1.125rem}}@keyframes icon-400{100%{width:1.125rem;height:1.125rem}}@-webkit-keyframes icon-500{100%{width:1.25rem;height:1.25rem}}@keyframes icon-500{100%{width:1.25rem;height:1.25rem}}@-webkit-keyframes icon-600{100%{width:1.375rem;height:1.375rem}}@keyframes icon-600{100%{width:1.375rem;height:1.375rem}}@-webkit-keyframes icon-700{100%{width:1.5rem;height:1.5rem}}@keyframes icon-700{100%{width:1.5rem;height:1.5rem}}@-webkit-keyframes icon-800{100%{width:1.625rem;height:1.625rem}}@keyframes icon-800{100%{width:1.625rem;height:1.625rem}}@-webkit-keyframes icon-900{100%{width:1.75rem;height:1.75rem}}@keyframes icon-900{100%{width:1.75rem;height:1.75rem}}@-webkit-keyframes icon-999{100%{width:100%;height:100%}}@keyframes icon-999{100%{width:100%;height:100%}}.consul-intention-permission-header-list dt::before,.consul-intention-permission-list dt::before,.discovery-chain .resolver-card dt,.discovery-chain .route-card section header>::before{font-weight:var(--typo-weight-normal);background-color:var(--token-color-surface-strong);visibility:visible;padding:0 4px}.consul-intention-action-warn-modal button.dangerous:disabled .progress+*,.copy-button button:disabled .progress+*,.popover-select label>:disabled .progress+*,.topology-notices button:disabled .progress+*,[role=banner] nav:not(.in-viewport):first-of-type{visibility:hidden}#downstream-container .topology-metrics-card .details .group span::before,#downstream-container .topology-metrics-card div .critical::before,#downstream-container .topology-metrics-card div .empty::before,#downstream-container .topology-metrics-card div .health dt::before,#downstream-container .topology-metrics-card div .nspace dt::before,#downstream-container .topology-metrics-card div .partition dt::before,#downstream-container .topology-metrics-card div .passing::before,#downstream-container .topology-metrics-card div .warning::before,#downstream-container>div:first-child span::before,#login-toggle+div footer button::after,#metrics-container .link .config-link::before,#metrics-container .link .metrics-link::before,#metrics-container:hover .sparkline-key-link::before,#upstream-container .topology-metrics-card .details .group span::before,#upstream-container .topology-metrics-card div .critical::before,#upstream-container .topology-metrics-card div .empty::before,#upstream-container .topology-metrics-card div .health dt::before,#upstream-container .topology-metrics-card div .nspace dt::before,#upstream-container .topology-metrics-card div .partition dt::before,#upstream-container .topology-metrics-card div .passing::before,#upstream-container .topology-metrics-card div .warning::before,.animatable.tab-nav ul::after,.consul-auth-method-binding-list dl dt.type+dd span::before,.consul-auth-method-list ul .locality::before,.consul-auth-method-view dl dt.type+dd span::before,.consul-auth-method-view section dl dt.type+dd span::before,.consul-bucket-list .nspace::before,.consul-bucket-list .partition::before,.consul-bucket-list .peer::before,.consul-exposed-path-list>ul>li>.detail .policy-management::before,.consul-exposed-path-list>ul>li>.detail .policy::before,.consul-exposed-path-list>ul>li>.detail .role::before,.consul-exposed-path-list>ul>li>.detail dl.address dt::before,.consul-exposed-path-list>ul>li>.detail dl.behavior dt::before,.consul-exposed-path-list>ul>li>.detail dl.checks dt::before,.consul-exposed-path-list>ul>li>.detail dl.critical dt::before,.consul-exposed-path-list>ul>li>.detail dl.datacenter dt::before,.consul-exposed-path-list>ul>li>.detail dl.empty dt::before,.consul-exposed-path-list>ul>li>.detail dl.lock-delay dt::before,.consul-exposed-path-list>ul>li>.detail dl.mesh dt::before,.consul-exposed-path-list>ul>li>.detail dl.node dt::before,.consul-exposed-path-list>ul>li>.detail dl.nspace dt::before,.consul-exposed-path-list>ul>li>.detail dl.passing dt::before,.consul-exposed-path-list>ul>li>.detail dl.path dt::before,.consul-exposed-path-list>ul>li>.detail dl.port dt::before,.consul-exposed-path-list>ul>li>.detail dl.protocol dt::before,.consul-exposed-path-list>ul>li>.detail dl.socket dt::before,.consul-exposed-path-list>ul>li>.detail dl.ttl dt::before,.consul-exposed-path-list>ul>li>.detail dl.unknown dt::before,.consul-exposed-path-list>ul>li>.detail dl.warning dt::before,.consul-exposed-path-list>ul>li>.header .critical dd::before,.consul-exposed-path-list>ul>li>.header .empty dd::before,.consul-exposed-path-list>ul>li>.header .passing dd::before,.consul-exposed-path-list>ul>li>.header .policy-management dd::before,.consul-exposed-path-list>ul>li>.header .unknown dd::before,.consul-exposed-path-list>ul>li>.header .warning dd::before,.consul-exposed-path-list>ul>li>.header [rel=me] dd::before,.consul-external-source.jwt::before,.consul-external-source.oidc::before,.consul-health-check-list .health-check-output dd em.jwt::before,.consul-health-check-list .health-check-output dd em.oidc::before,.consul-health-check-list .health-check-output::before,.consul-instance-checks dt::before,.consul-intention-fieldsets .value->:last-child::before,.consul-intention-fieldsets .value-allow>:last-child::before,.consul-intention-fieldsets .value-deny>:last-child::before,.consul-intention-list em span::before,.consul-intention-list td strong.jwt::before,.consul-intention-list td strong.oidc::before,.consul-intention-list td.intent- strong::before,.consul-intention-list td.intent-allow strong::before,.consul-intention-list td.intent-deny strong::before,.consul-intention-permission-list .intent-allow::before,.consul-intention-permission-list .intent-deny::before,.consul-intention-permission-list strong.jwt::before,.consul-intention-permission-list strong.oidc::before,.consul-intention-search-bar .value- span::before,.consul-intention-search-bar .value-allow span::before,.consul-intention-search-bar .value-deny span::before,.consul-intention-search-bar li button span.jwt::before,.consul-intention-search-bar li button span.oidc::before,.consul-kind::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .policy-management::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .policy::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .role::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.address dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.behavior dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.checks dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.critical dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.datacenter dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.empty dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.lock-delay dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.mesh dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.node dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.nspace dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.passing dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.path dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.port dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.protocol dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.socket dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.ttl dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.unknown dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.warning dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .critical dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header .empty dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header .passing dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header .policy-management dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header .unknown dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header .warning dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header [rel=me] dd::before,.consul-peer-search-bar li button span.jwt::before,.consul-peer-search-bar li button span.oidc::before,.consul-server-card .health-status+dd.jwt::before,.consul-server-card .health-status+dd.oidc::before,.consul-upstream-instance-list dl.datacenter dt::before,.consul-upstream-instance-list dl.nspace dt::before,.consul-upstream-instance-list dl.partition dt::before,.consul-upstream-instance-list li>.detail .policy-management::before,.consul-upstream-instance-list li>.detail .policy::before,.consul-upstream-instance-list li>.detail .role::before,.consul-upstream-instance-list li>.detail dl.address dt::before,.consul-upstream-instance-list li>.detail dl.behavior dt::before,.consul-upstream-instance-list li>.detail dl.checks dt::before,.consul-upstream-instance-list li>.detail dl.critical dt::before,.consul-upstream-instance-list li>.detail dl.datacenter dt::before,.consul-upstream-instance-list li>.detail dl.empty dt::before,.consul-upstream-instance-list li>.detail dl.lock-delay dt::before,.consul-upstream-instance-list li>.detail dl.mesh dt::before,.consul-upstream-instance-list li>.detail dl.node dt::before,.consul-upstream-instance-list li>.detail dl.nspace dt::before,.consul-upstream-instance-list li>.detail dl.passing dt::before,.consul-upstream-instance-list li>.detail dl.path dt::before,.consul-upstream-instance-list li>.detail dl.port dt::before,.consul-upstream-instance-list li>.detail dl.protocol dt::before,.consul-upstream-instance-list li>.detail dl.socket dt::before,.consul-upstream-instance-list li>.detail dl.ttl dt::before,.consul-upstream-instance-list li>.detail dl.unknown dt::before,.consul-upstream-instance-list li>.detail dl.warning dt::before,.consul-upstream-instance-list li>.header .critical dd::before,.consul-upstream-instance-list li>.header .empty dd::before,.consul-upstream-instance-list li>.header .passing dd::before,.consul-upstream-instance-list li>.header .policy-management dd::before,.consul-upstream-instance-list li>.header .unknown dd::before,.consul-upstream-instance-list li>.header .warning dd::before,.consul-upstream-instance-list li>.header [rel=me] dd::before,.consul-upstream-list dl.partition dt::before,.copy-button button::before,.dangerous.informed-action header::before,.disclosure-menu [aria-expanded]~*>ul>li.is-active>::after,.disclosure-menu [aria-expanded]~*>ul>li[aria-checked]>::after,.disclosure-menu [aria-expanded]~*>ul>li[aria-current]>::after,.disclosure-menu [aria-expanded]~*>ul>li[aria-selected]>::after,.discovery-chain .resolvers>header span::after,.discovery-chain .route-card::before,.discovery-chain .route-card>header ul li.jwt::before,.discovery-chain .route-card>header ul li.oidc::before,.discovery-chain .routes>header span::after,.discovery-chain .splitter-card::before,.discovery-chain .splitters>header span::after,.empty-state li[class*=-link]>::after,.has-error>strong::before,.hashicorp-consul .docs-link a::after,.hashicorp-consul .feedback-link a::after,.hashicorp-consul .learn-link a::after,.hashicorp-consul nav .dcs .dc-name span.jwt::before,.hashicorp-consul nav .dcs .dc-name span.oidc::before,.hashicorp-consul nav .dcs li.is-local span.jwt::before,.hashicorp-consul nav .dcs li.is-local span.oidc::before,.hashicorp-consul nav .dcs li.is-primary span.jwt::before,.hashicorp-consul nav .dcs li.is-primary span.oidc::before,.hashicorp-consul nav li.nspaces .disclosure-menu>button::after,.hashicorp-consul nav li.partitions .disclosure-menu>button::after,.info.informed-action header::before,.jwt.consul-auth-method-type::before,.jwt.consul-external-source::before,.jwt.consul-kind::before,.jwt.consul-source::before,.jwt.consul-transparent-proxy::before,.jwt.leader::before,.jwt.topology-metrics-source-type::before,.leader::before,.list-collection>button::after,.list-collection>ul>li:not(:first-child)>.detail .policy-management::before,.list-collection>ul>li:not(:first-child)>.detail .policy::before,.list-collection>ul>li:not(:first-child)>.detail .role::before,.list-collection>ul>li:not(:first-child)>.detail dl.address dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.behavior dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.checks dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.critical dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.datacenter dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.empty dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.lock-delay dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.mesh dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.node dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.nspace dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.passing dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.path dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.port dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.protocol dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.socket dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.ttl dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.unknown dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.warning dt::before,.list-collection>ul>li:not(:first-child)>.header .critical dd::before,.list-collection>ul>li:not(:first-child)>.header .empty dd::before,.list-collection>ul>li:not(:first-child)>.header .passing dd::before,.list-collection>ul>li:not(:first-child)>.header .policy-management dd::before,.list-collection>ul>li:not(:first-child)>.header .unknown dd::before,.list-collection>ul>li:not(:first-child)>.header .warning dd::before,.list-collection>ul>li:not(:first-child)>.header [rel=me] dd::before,.menu-panel>ul>li.is-active>::after,.menu-panel>ul>li[aria-checked]>::after,.menu-panel>ul>li[aria-current]>::after,.menu-panel>ul>li[aria-selected]>::after,.modal-dialog [role=document] a[rel*=help]::after,.modal-dialog [role=document] table td.folder::before,.modal-dialog [role=document] table th span::after,.more-popover-menu>[type=checkbox]+label+div>ul>li.is-active>::after,.more-popover-menu>[type=checkbox]+label+div>ul>li[aria-checked]>::after,.more-popover-menu>[type=checkbox]+label+div>ul>li[aria-current]>::after,.more-popover-menu>[type=checkbox]+label+div>ul>li[aria-selected]>::after,.more-popover-menu>[type=checkbox]+label>::after,.oidc-select .auth0-oidc-provider::before,.oidc-select .google-oidc-provider::before,.oidc-select .microsoft-oidc-provider::before,.oidc-select .okta-oidc-provider::before,.oidc.consul-auth-method-type::before,.oidc.consul-external-source::before,.oidc.consul-kind::before,.oidc.consul-source::before,.oidc.consul-transparent-proxy::before,.oidc.leader::before,.oidc.topology-metrics-source-type::before,.popover-menu>[type=checkbox]+label+div>ul>li.is-active>::after,.popover-menu>[type=checkbox]+label+div>ul>li[aria-checked]>::after,.popover-menu>[type=checkbox]+label+div>ul>li[aria-current]>::after,.popover-menu>[type=checkbox]+label+div>ul>li[aria-selected]>::after,.popover-menu>[type=checkbox]+label>::after,.popover-select .jwt button::before,.popover-select .oidc button::before,.popover-select .value-critical button::before,.popover-select .value-empty button::before,.popover-select .value-passing button::before,.popover-select .value-unknown button::before,.popover-select .value-warning button::before,.search-bar-status li.jwt:not(.remove-all)::before,.search-bar-status li.oidc:not(.remove-all)::before,.search-bar-status li:not(.remove-all) button::before,.sparkline-key h3::before,.tag-list dt::before,.tooltip-panel dd>div::before,.topology-metrics-popover.deny .tippy-arrow::after,.topology-metrics-popover.deny>button::before,.topology-metrics-popover.l7 .tippy-arrow::after,.topology-metrics-popover.l7>button::before,.topology-metrics-popover.not-defined .tippy-arrow::after,.topology-metrics-popover.not-defined>button::before,.topology-metrics-status-error span::before,.topology-metrics-status-loader span::before,.topology-notices button::before,.type-sort.popover-select label>::before,.type-source.popover-select li.partition button::before,.warning.informed-action header::before,.warning.modal-dialog header::before,[class*=status-].empty-state header::before,a[rel*=external]::after,html[data-route^="dc.acls.index"] main td strong.jwt::before,html[data-route^="dc.acls.index"] main td strong.oidc::before,main a[rel*=help]::after,main header nav:first-child ol li:first-child a::before,main table td.folder::before,main table th span::after,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.jwt::before,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.oidc::before,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em.jwt::before,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em.oidc::before,span.jwt.policy-node-identity::before,span.jwt.policy-service-identity::before,span.oidc.policy-node-identity::before,span.oidc.policy-service-identity::before,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.is-active>::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li[aria-checked]>::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li[aria-current]>::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li[aria-selected]>::after,table.has-actions tr>.actions>[type=checkbox]+label>::after,table.with-details td:only-child>div>label::before,table.with-details td>label::before,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.is-active>::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li[aria-checked]>::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li[aria-current]>::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li[aria-selected]>::after,table.with-details tr>.actions>[type=checkbox]+label>::after,td.tags dt::before{content:""}.hashicorp-consul .acls-separator span{box-sizing:border-box;width:12px;height:12px}.hashicorp-consul .acls-separator span::after,.hashicorp-consul .acls-separator span::before{content:"";display:block;width:100%;height:100%;border-radius:100%}.hashicorp-consul .acls-separator span::before{border:1px solid currentColor;opacity:.5}.ember-power-select-trigger,.ember-power-select-trigger--active,.ember-power-select-trigger:focus{border-top:1px solid #aaa;border-bottom:1px solid #aaa;border-right:1px solid #aaa;border-left:1px solid #aaa}.hashicorp-consul .acls-separator span::after{position:absolute;top:2px;left:2px;width:calc(100% - 4px);height:calc(100% - 4px);background-color:currentColor}@-webkit-keyframes icon-alert-circle-outline{100%{-webkit-mask-image:var(--icon-alert-circle-16);mask-image:var(--icon-alert-circle-16);background-color:var(--icon-color,var(--color-alert-circle-outline-500,currentColor))}}@keyframes icon-alert-circle-outline{100%{-webkit-mask-image:var(--icon-alert-circle-16);mask-image:var(--icon-alert-circle-16);background-color:var(--icon-color,var(--color-alert-circle-outline-500,currentColor))}}[class*=status-].empty-state header::before{--icon-name:icon-alert-circle-outline;content:""}@-webkit-keyframes icon-alert-triangle{100%{-webkit-mask-image:var(--icon-alert-triangle-16);mask-image:var(--icon-alert-triangle-16);background-color:var(--icon-color,var(--color-alert-triangle-500,currentColor))}}@keyframes icon-alert-triangle{100%{-webkit-mask-image:var(--icon-alert-triangle-16);mask-image:var(--icon-alert-triangle-16);background-color:var(--icon-color,var(--color-alert-triangle-500,currentColor))}}#downstream-container .topology-metrics-card div .warning::before,#upstream-container .topology-metrics-card div .warning::before,.consul-exposed-path-list>ul>li>.detail dl.warning dt::before,.consul-exposed-path-list>ul>li>.header .warning dd::before,.consul-health-check-list .warning.health-check-output::before,.consul-instance-checks.warning dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.warning dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .warning dd::before,.consul-upstream-instance-list li>.detail dl.warning dt::before,.consul-upstream-instance-list li>.header .warning dd::before,.dangerous.informed-action header::before,.list-collection>ul>li:not(:first-child)>.detail dl.warning dt::before,.list-collection>ul>li:not(:first-child)>.header .warning dd::before,.popover-select .value-warning button::before,.topology-metrics-popover.not-defined .tippy-arrow::after,.topology-metrics-popover.not-defined>button::before,.warning.informed-action header::before,.warning.modal-dialog header::before{--icon-name:icon-alert-triangle;content:""}@-webkit-keyframes icon-arrow-left{100%{-webkit-mask-image:var(--icon-arrow-left-16);mask-image:var(--icon-arrow-left-16);background-color:var(--icon-color,var(--color-arrow-left-500,currentColor))}}@keyframes icon-arrow-left{100%{-webkit-mask-image:var(--icon-arrow-left-16);mask-image:var(--icon-arrow-left-16);background-color:var(--icon-color,var(--color-arrow-left-500,currentColor))}}@-webkit-keyframes icon-arrow-right{100%{-webkit-mask-image:var(--icon-arrow-right-16);mask-image:var(--icon-arrow-right-16);background-color:var(--icon-color,var(--color-arrow-right-500,currentColor))}}@keyframes icon-arrow-right{100%{-webkit-mask-image:var(--icon-arrow-right-16);mask-image:var(--icon-arrow-right-16);background-color:var(--icon-color,var(--color-arrow-right-500,currentColor))}}@-webkit-keyframes icon-cancel-plain{100%{-webkit-mask-image:var(--icon-x-16);mask-image:var(--icon-x-16);background-color:var(--icon-color,var(--color-cancel-plain-500,currentColor))}}@keyframes icon-cancel-plain{100%{-webkit-mask-image:var(--icon-x-16);mask-image:var(--icon-x-16);background-color:var(--icon-color,var(--color-cancel-plain-500,currentColor))}}.search-bar-status li:not(.remove-all) button::before{--icon-name:icon-cancel-plain;content:""}@-webkit-keyframes icon-cancel-square-fill{100%{-webkit-mask-image:var(--icon-x-square-fill-16);mask-image:var(--icon-x-square-fill-16);background-color:var(--icon-color,var(--color-cancel-square-fill-500,currentColor))}}@keyframes icon-cancel-square-fill{100%{-webkit-mask-image:var(--icon-x-square-fill-16);mask-image:var(--icon-x-square-fill-16);background-color:var(--icon-color,var(--color-cancel-square-fill-500,currentColor))}}#downstream-container .topology-metrics-card div .critical::before,#upstream-container .topology-metrics-card div .critical::before,.consul-exposed-path-list>ul>li>.detail dl.critical dt::before,.consul-exposed-path-list>ul>li>.header .critical dd::before,.consul-health-check-list .critical.health-check-output::before,.consul-instance-checks.critical dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.critical dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .critical dd::before,.consul-upstream-instance-list li>.detail dl.critical dt::before,.consul-upstream-instance-list li>.header .critical dd::before,.has-error>strong::before,.list-collection>ul>li:not(:first-child)>.detail dl.critical dt::before,.list-collection>ul>li:not(:first-child)>.header .critical dd::before,.popover-select .value-critical button::before,.topology-metrics-popover.deny .tippy-arrow::after,.topology-metrics-popover.deny>button::before{--icon-name:icon-cancel-square-fill;content:""}@-webkit-keyframes icon-check-plain{100%{-webkit-mask-image:var(--icon-check-16);mask-image:var(--icon-check-16);background-color:var(--icon-color,var(--color-check-plain-500,currentColor))}}@keyframes icon-check-plain{100%{-webkit-mask-image:var(--icon-check-16);mask-image:var(--icon-check-16);background-color:var(--icon-color,var(--color-check-plain-500,currentColor))}}.disclosure-menu [aria-expanded]~*>ul>li.is-active>::after,.disclosure-menu [aria-expanded]~*>ul>li[aria-checked]>::after,.disclosure-menu [aria-expanded]~*>ul>li[aria-current]>::after,.disclosure-menu [aria-expanded]~*>ul>li[aria-selected]>::after,.menu-panel>ul>li.is-active>::after,.menu-panel>ul>li[aria-checked]>::after,.menu-panel>ul>li[aria-current]>::after,.menu-panel>ul>li[aria-selected]>::after,.more-popover-menu>[type=checkbox]+label+div>ul>li.is-active>::after,.more-popover-menu>[type=checkbox]+label+div>ul>li[aria-checked]>::after,.more-popover-menu>[type=checkbox]+label+div>ul>li[aria-current]>::after,.more-popover-menu>[type=checkbox]+label+div>ul>li[aria-selected]>::after,.popover-menu>[type=checkbox]+label+div>ul>li.is-active>::after,.popover-menu>[type=checkbox]+label+div>ul>li[aria-checked]>::after,.popover-menu>[type=checkbox]+label+div>ul>li[aria-current]>::after,.popover-menu>[type=checkbox]+label+div>ul>li[aria-selected]>::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.is-active>::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li[aria-checked]>::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li[aria-current]>::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li[aria-selected]>::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.is-active>::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li[aria-checked]>::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li[aria-current]>::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li[aria-selected]>::after{--icon-name:icon-check-plain;content:""}@-webkit-keyframes icon-chevron-down{100%{-webkit-mask-image:var(--icon-chevron-down-16);mask-image:var(--icon-chevron-down-16);background-color:var(--icon-color,var(--color-chevron-down-500,currentColor))}}@keyframes icon-chevron-down{100%{-webkit-mask-image:var(--icon-chevron-down-16);mask-image:var(--icon-chevron-down-16);background-color:var(--icon-color,var(--color-chevron-down-500,currentColor))}}.hashicorp-consul nav li.nspaces .disclosure-menu>button::after,.hashicorp-consul nav li.partitions .disclosure-menu>button::after,.list-collection>button.closed::after,.more-popover-menu>[type=checkbox]+label>::after,.popover-menu>[type=checkbox]+label>::after,.topology-notices button::before,table.has-actions tr>.actions>[type=checkbox]+label>::after,table.with-details td:only-child>div>label::before,table.with-details td>label::before,table.with-details tr>.actions>[type=checkbox]+label>::after{--icon-name:icon-chevron-down;content:""}@-webkit-keyframes icon-copy-action{100%{-webkit-mask-image:var(--icon-clipboard-copy-16);mask-image:var(--icon-clipboard-copy-16);background-color:var(--icon-color,var(--color-copy-action-500,currentColor))}}@keyframes icon-copy-action{100%{-webkit-mask-image:var(--icon-clipboard-copy-16);mask-image:var(--icon-clipboard-copy-16);background-color:var(--icon-color,var(--color-copy-action-500,currentColor))}}.copy-button button::before{--icon-name:icon-copy-action;content:"";--icon-color:var(--token-color-foreground-faint)}@-webkit-keyframes icon-deny-alt{100%{-webkit-mask-image:var(--icon-skip-16);mask-image:var(--icon-skip-16);background-color:var(--icon-color,var(--color-deny-alt-500,currentColor))}}@keyframes icon-deny-alt{100%{-webkit-mask-image:var(--icon-skip-16);mask-image:var(--icon-skip-16);background-color:var(--icon-color,var(--color-deny-alt-500,currentColor))}}@-webkit-keyframes icon-deny-default{100%{-webkit-mask-image:var(--icon-skip-16);mask-image:var(--icon-skip-16);background-color:var(--icon-color,var(--color-deny-default-500,currentColor))}}@keyframes icon-deny-default{100%{-webkit-mask-image:var(--icon-skip-16);mask-image:var(--icon-skip-16);background-color:var(--icon-color,var(--color-deny-default-500,currentColor))}}@-webkit-keyframes icon-disabled{100%{-webkit-mask-image:var(--icon-skip-16);mask-image:var(--icon-skip-16);background-color:var(--icon-color,var(--color-disabled-500,currentColor))}}@keyframes icon-disabled{100%{-webkit-mask-image:var(--icon-skip-16);mask-image:var(--icon-skip-16);background-color:var(--icon-color,var(--color-disabled-500,currentColor))}}.status-403.empty-state header::before{--icon-name:icon-disabled;content:""}@-webkit-keyframes icon-docs{100%{-webkit-mask-image:var(--icon-docs-16);mask-image:var(--icon-docs-16);background-color:var(--icon-color,var(--color-docs-500,currentColor))}}@keyframes icon-docs{100%{-webkit-mask-image:var(--icon-docs-16);mask-image:var(--icon-docs-16);background-color:var(--icon-color,var(--color-docs-500,currentColor))}}#metrics-container .link .config-link::before,.empty-state .docs-link>::after,.hashicorp-consul .docs-link a::after{--icon-name:icon-docs;content:""}@-webkit-keyframes icon-exit{100%{-webkit-mask-image:var(--icon-external-link-16);mask-image:var(--icon-external-link-16);background-color:var(--icon-color,var(--color-exit-500,currentColor))}}@keyframes icon-exit{100%{-webkit-mask-image:var(--icon-external-link-16);mask-image:var(--icon-external-link-16);background-color:var(--icon-color,var(--color-exit-500,currentColor))}}#metrics-container .link .metrics-link::before,a[rel*=external]::after{--icon-name:icon-exit;content:""}@-webkit-keyframes icon-file-fill{100%{-webkit-mask-image:var(--icon-file-16);mask-image:var(--icon-file-16);background-color:var(--icon-color,var(--color-file-fill-500,currentColor))}}@keyframes icon-file-fill{100%{-webkit-mask-image:var(--icon-file-16);mask-image:var(--icon-file-16);background-color:var(--icon-color,var(--color-file-fill-500,currentColor))}}@-webkit-keyframes icon-folder-outline{100%{-webkit-mask-image:var(--icon-folder-16);mask-image:var(--icon-folder-16);background-color:var(--icon-color,var(--color-folder-outline-500,currentColor))}}@keyframes icon-folder-outline{100%{-webkit-mask-image:var(--icon-folder-16);mask-image:var(--icon-folder-16);background-color:var(--icon-color,var(--color-folder-outline-500,currentColor))}}#downstream-container .topology-metrics-card div .nspace dt::before,#upstream-container .topology-metrics-card div .nspace dt::before,.consul-bucket-list .nspace::before,.consul-exposed-path-list>ul>li>.detail dl.nspace dt::before,.consul-intention-list span[class|=nspace]::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.nspace dt::before,.consul-upstream-instance-list dl.nspace dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.nspace dt::before,.modal-dialog [role=document] table td.folder::before,main table td.folder::before{--icon-name:icon-folder-outline;content:""}@-webkit-keyframes icon-health{100%{-webkit-mask-image:var(--icon-activity-16);mask-image:var(--icon-activity-16);background-color:var(--icon-color,var(--color-health-500,currentColor))}}@keyframes icon-health{100%{-webkit-mask-image:var(--icon-activity-16);mask-image:var(--icon-activity-16);background-color:var(--icon-color,var(--color-health-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.checks dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.checks dt::before,.consul-upstream-instance-list li>.detail dl.checks dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.checks dt::before{--icon-name:icon-health;content:""}@-webkit-keyframes icon-help-circle-outline{100%{-webkit-mask-image:var(--icon-help-16);mask-image:var(--icon-help-16);background-color:var(--icon-color,var(--color-help-circle-outline-500,currentColor))}}@keyframes icon-help-circle-outline{100%{-webkit-mask-image:var(--icon-help-16);mask-image:var(--icon-help-16);background-color:var(--icon-color,var(--color-help-circle-outline-500,currentColor))}}#downstream-container .topology-metrics-card div .health dt::before,#upstream-container .topology-metrics-card div .health dt::before,.consul-exposed-path-list>ul>li>.detail dl.unknown dt::before,.consul-exposed-path-list>ul>li>.header .unknown dd::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.unknown dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .unknown dd::before,.consul-upstream-instance-list li>.detail dl.unknown dt::before,.consul-upstream-instance-list li>.header .unknown dd::before,.list-collection>ul>li:not(:first-child)>.detail dl.unknown dt::before,.list-collection>ul>li:not(:first-child)>.header .unknown dd::before,.popover-select .value-unknown button::before,.status-404.empty-state header::before{--icon-name:icon-help-circle-outline;content:""}@-webkit-keyframes icon-info-circle-fill{100%{-webkit-mask-image:var(--icon-info-16);mask-image:var(--icon-info-16);background-color:var(--icon-color,var(--color-info-circle-fill-500,currentColor))}}@keyframes icon-info-circle-fill{100%{-webkit-mask-image:var(--icon-info-16);mask-image:var(--icon-info-16);background-color:var(--icon-color,var(--color-info-circle-fill-500,currentColor))}}#metrics-container:hover .sparkline-key-link::before,.info.informed-action header::before,.sparkline-key h3::before{--icon-name:icon-info-circle-fill;content:""}@-webkit-keyframes icon-info-circle-outline{100%{-webkit-mask-image:var(--icon-info-16);mask-image:var(--icon-info-16);background-color:var(--icon-color,var(--color-info-circle-outline-500,currentColor))}}@keyframes icon-info-circle-outline{100%{-webkit-mask-image:var(--icon-info-16);mask-image:var(--icon-info-16);background-color:var(--icon-color,var(--color-info-circle-outline-500,currentColor))}}#downstream-container>div:first-child span::before,.consul-auth-method-binding-list dl dt.type+dd span::before,.consul-auth-method-view dl dt.type+dd span::before,.consul-exposed-path-list>ul>li>.detail dl.behavior dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.behavior dt::before,.consul-upstream-instance-list li>.detail dl.behavior dt::before,.discovery-chain .resolvers>header span::after,.discovery-chain .routes>header span::after,.discovery-chain .splitters>header span::after,.list-collection>ul>li:not(:first-child)>.detail dl.behavior dt::before,.modal-dialog [role=document] a[rel*=help]::after,.modal-dialog [role=document] table th span::after,.topology-metrics-status-error span::before,.topology-metrics-status-loader span::before,main a[rel*=help]::after,main table th span::after{--icon-name:icon-info-circle-outline;content:""}@-webkit-keyframes icon-learn{100%{-webkit-mask-image:var(--icon-learn-16);mask-image:var(--icon-learn-16);background-color:var(--icon-color,var(--color-learn-500,currentColor))}}@keyframes icon-learn{100%{-webkit-mask-image:var(--icon-learn-16);mask-image:var(--icon-learn-16);background-color:var(--icon-color,var(--color-learn-500,currentColor))}}.empty-state .learn-link>::after,.hashicorp-consul .learn-link a::after{--icon-name:icon-learn;content:""}@-webkit-keyframes icon-loading{100%{-webkit-mask-image:var(--icon-loading-16);mask-image:var(--icon-loading-16);background-color:var(--icon-color,var(--color-loading-500,currentColor))}}@-webkit-keyframes icon-logo-github-monochrome{100%{-webkit-mask-image:var(--icon-github-color-16);mask-image:var(--icon-github-color-16);background-color:var(--icon-color,var(--color-logo-github-monochrome-500,currentColor))}}@keyframes icon-logo-github-monochrome{100%{-webkit-mask-image:var(--icon-github-color-16);mask-image:var(--icon-github-color-16);background-color:var(--icon-color,var(--color-logo-github-monochrome-500,currentColor))}}.hashicorp-consul .feedback-link a::after{--icon-name:icon-logo-github-monochrome;content:""}@-webkit-keyframes icon-logo-google-color{100%{background-image:var(--icon-google-color-16)}}@keyframes icon-logo-google-color{100%{background-image:var(--icon-google-color-16)}}.oidc-select .google-oidc-provider::before{--icon-name:icon-logo-google-color;content:""}@-webkit-keyframes icon-logo-kubernetes-color{100%{background-image:var(--icon-kubernetes-color-16)}}@keyframes icon-logo-kubernetes-color{100%{background-image:var(--icon-kubernetes-color-16)}}@-webkit-keyframes icon-menu{100%{-webkit-mask-image:var(--icon-menu-16);mask-image:var(--icon-menu-16);background-color:var(--icon-color,var(--color-menu-500,currentColor))}}@keyframes icon-menu{100%{-webkit-mask-image:var(--icon-menu-16);mask-image:var(--icon-menu-16);background-color:var(--icon-color,var(--color-menu-500,currentColor))}}@-webkit-keyframes icon-minus-square-fill{100%{-webkit-mask-image:var(--icon-minus-square-16);mask-image:var(--icon-minus-square-16);background-color:var(--icon-color,var(--color-minus-square-fill-500,currentColor))}}@keyframes icon-minus-square-fill{100%{-webkit-mask-image:var(--icon-minus-square-16);mask-image:var(--icon-minus-square-16);background-color:var(--icon-color,var(--color-minus-square-fill-500,currentColor))}}#downstream-container .topology-metrics-card div .empty::before,#upstream-container .topology-metrics-card div .empty::before,.consul-exposed-path-list>ul>li>.detail dl.empty dt::before,.consul-exposed-path-list>ul>li>.header .empty dd::before,.consul-instance-checks.empty dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.empty dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .empty dd::before,.consul-upstream-instance-list li>.detail dl.empty dt::before,.consul-upstream-instance-list li>.header .empty dd::before,.list-collection>ul>li:not(:first-child)>.detail dl.empty dt::before,.list-collection>ul>li:not(:first-child)>.header .empty dd::before,.popover-select .value-empty button::before{--icon-name:icon-minus-square-fill;content:""}@-webkit-keyframes icon-more-horizontal{100%{-webkit-mask-image:var(--icon-more-horizontal-16);mask-image:var(--icon-more-horizontal-16);background-color:var(--icon-color,var(--color-more-horizontal-500,currentColor))}}@keyframes icon-more-horizontal{100%{-webkit-mask-image:var(--icon-more-horizontal-16);mask-image:var(--icon-more-horizontal-16);background-color:var(--icon-color,var(--color-more-horizontal-500,currentColor))}}@-webkit-keyframes icon-public-default{100%{-webkit-mask-image:var(--icon-globe-16);mask-image:var(--icon-globe-16);background-color:var(--icon-color,var(--color-public-default-500,currentColor))}}@keyframes icon-public-default{100%{-webkit-mask-image:var(--icon-globe-16);mask-image:var(--icon-globe-16);background-color:var(--icon-color,var(--color-public-default-500,currentColor))}}.consul-auth-method-list ul .locality::before,.consul-exposed-path-list>ul>li>.detail dl.address dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.address dt::before,.consul-upstream-instance-list li>.detail dl.address dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.address dt::before{--icon-name:icon-public-default;content:""}@-webkit-keyframes icon-search{100%{-webkit-mask-image:var(--icon-search-16);mask-image:var(--icon-search-16);background-color:var(--icon-color,var(--color-search-500,currentColor))}}@keyframes icon-search{100%{-webkit-mask-image:var(--icon-search-16);mask-image:var(--icon-search-16);background-color:var(--icon-color,var(--color-search-500,currentColor))}}@-webkit-keyframes icon-star-outline{100%{-webkit-mask-image:var(--icon-star-16);mask-image:var(--icon-star-16);background-color:var(--icon-color,var(--color-star-outline-500,currentColor))}}@keyframes icon-star-outline{100%{-webkit-mask-image:var(--icon-star-16);mask-image:var(--icon-star-16);background-color:var(--icon-color,var(--color-star-outline-500,currentColor))}}.leader::before{--icon-name:icon-star-outline;content:""}@-webkit-keyframes icon-user-organization{100%{-webkit-mask-image:var(--icon-org-16);mask-image:var(--icon-org-16);background-color:var(--icon-color,var(--color-user-organization-500,currentColor))}}@keyframes icon-user-organization{100%{-webkit-mask-image:var(--icon-org-16);mask-image:var(--icon-org-16);background-color:var(--icon-color,var(--color-user-organization-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.datacenter dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.datacenter dt::before,.consul-upstream-instance-list dl.datacenter dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.datacenter dt::before{--icon-name:icon-user-organization;content:""}@-webkit-keyframes icon-user-plain{100%{-webkit-mask-image:var(--icon-user-16);mask-image:var(--icon-user-16);background-color:var(--icon-color,var(--color-user-plain-500,currentColor))}}@keyframes icon-user-plain{100%{-webkit-mask-image:var(--icon-user-16);mask-image:var(--icon-user-16);background-color:var(--icon-color,var(--color-user-plain-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail .role::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .role::before,.consul-upstream-instance-list li>.detail .role::before,.list-collection>ul>li:not(:first-child)>.detail .role::before{--icon-name:icon-user-plain;content:""}@-webkit-keyframes icon-user-team{100%{-webkit-mask-image:var(--icon-users-16);mask-image:var(--icon-users-16);background-color:var(--icon-color,var(--color-user-team-500,currentColor))}}@keyframes icon-user-team{100%{-webkit-mask-image:var(--icon-users-16);mask-image:var(--icon-users-16);background-color:var(--icon-color,var(--color-user-team-500,currentColor))}}#downstream-container .topology-metrics-card div .partition dt::before,#upstream-container .topology-metrics-card div .partition dt::before,.consul-bucket-list .partition::before,.consul-intention-list span[class|=partition]::before,.consul-upstream-instance-list dl.partition dt::before,.consul-upstream-list dl.partition dt::before,.type-source.popover-select li.partition button::before{--icon-name:icon-user-team;content:""}@-webkit-keyframes icon-alert-circle{100%{-webkit-mask-image:var(--icon-alert-circle-16);mask-image:var(--icon-alert-circle-16);background-color:var(--icon-color,var(--color-alert-circle-500,currentColor))}}@keyframes icon-alert-circle{100%{-webkit-mask-image:var(--icon-alert-circle-16);mask-image:var(--icon-alert-circle-16);background-color:var(--icon-color,var(--color-alert-circle-500,currentColor))}}@-webkit-keyframes icon-check{100%{-webkit-mask-image:var(--icon-check-16);mask-image:var(--icon-check-16);background-color:var(--icon-color,var(--color-check-500,currentColor))}}@keyframes icon-check{100%{-webkit-mask-image:var(--icon-check-16);mask-image:var(--icon-check-16);background-color:var(--icon-color,var(--color-check-500,currentColor))}}@-webkit-keyframes icon-check-circle{100%{-webkit-mask-image:var(--icon-check-circle-16);mask-image:var(--icon-check-circle-16);background-color:var(--icon-color,var(--color-check-circle-500,currentColor))}}@keyframes icon-check-circle{100%{-webkit-mask-image:var(--icon-check-circle-16);mask-image:var(--icon-check-circle-16);background-color:var(--icon-color,var(--color-check-circle-500,currentColor))}}@-webkit-keyframes icon-check-circle-fill{100%{-webkit-mask-image:var(--icon-check-circle-fill-16);mask-image:var(--icon-check-circle-fill-16);background-color:var(--icon-color,var(--color-check-circle-fill-500,currentColor))}}@keyframes icon-check-circle-fill{100%{-webkit-mask-image:var(--icon-check-circle-fill-16);mask-image:var(--icon-check-circle-fill-16);background-color:var(--icon-color,var(--color-check-circle-fill-500,currentColor))}}#downstream-container .topology-metrics-card div .passing::before,#upstream-container .topology-metrics-card div .passing::before,.consul-exposed-path-list>ul>li>.detail dl.passing dt::before,.consul-exposed-path-list>ul>li>.header .passing dd::before,.consul-exposed-path-list>ul>li>.header [rel=me] dd::before,.consul-health-check-list .passing.health-check-output::before,.consul-instance-checks.passing dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.passing dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .passing dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header [rel=me] dd::before,.consul-upstream-instance-list li>.detail dl.passing dt::before,.consul-upstream-instance-list li>.header .passing dd::before,.consul-upstream-instance-list li>.header [rel=me] dd::before,.list-collection>ul>li:not(:first-child)>.detail dl.passing dt::before,.list-collection>ul>li:not(:first-child)>.header .passing dd::before,.list-collection>ul>li:not(:first-child)>.header [rel=me] dd::before,.popover-select .value-passing button::before{--icon-name:icon-check-circle-fill;content:""}@-webkit-keyframes icon-chevron-left{100%{-webkit-mask-image:var(--icon-chevron-left-16);mask-image:var(--icon-chevron-left-16);background-color:var(--icon-color,var(--color-chevron-left-500,currentColor))}}@keyframes icon-chevron-left{100%{-webkit-mask-image:var(--icon-chevron-left-16);mask-image:var(--icon-chevron-left-16);background-color:var(--icon-color,var(--color-chevron-left-500,currentColor))}}.empty-state .back-link>::after,main header nav:first-child ol li:first-child a::before{--icon-name:icon-chevron-left;content:""}@-webkit-keyframes icon-chevron-right{100%{-webkit-mask-image:var(--icon-chevron-right-16);mask-image:var(--icon-chevron-right-16);background-color:var(--icon-color,var(--color-chevron-right-500,currentColor))}}@keyframes icon-chevron-right{100%{-webkit-mask-image:var(--icon-chevron-right-16);mask-image:var(--icon-chevron-right-16);background-color:var(--icon-color,var(--color-chevron-right-500,currentColor))}}#login-toggle+div footer button::after{--icon-name:icon-chevron-right;content:""}@-webkit-keyframes icon-chevron-up{100%{-webkit-mask-image:var(--icon-chevron-up-16);mask-image:var(--icon-chevron-up-16);background-color:var(--icon-color,var(--color-chevron-up-500,currentColor))}}@keyframes icon-chevron-up{100%{-webkit-mask-image:var(--icon-chevron-up-16);mask-image:var(--icon-chevron-up-16);background-color:var(--icon-color,var(--color-chevron-up-500,currentColor))}}.hashicorp-consul nav li.nspaces .disclosure-menu>button[aria-expanded=true]::after,.hashicorp-consul nav li.partitions .disclosure-menu>button[aria-expanded=true]::after,.list-collection>button::after,.more-popover-menu>[type=checkbox]:checked+label>::after,.popover-menu>[type=checkbox]:checked+label>::after,.topology-notices button[aria-expanded=true]::before,table.has-actions tr>.actions>[type=checkbox]:checked+label>::after,table.with-details tr>.actions>[type=checkbox]:checked+label>::after{--icon-name:icon-chevron-up;content:""}@-webkit-keyframes icon-delay{100%{-webkit-mask-image:var(--icon-delay-16);mask-image:var(--icon-delay-16);background-color:var(--icon-color,var(--color-delay-500,currentColor))}}@keyframes icon-delay{100%{-webkit-mask-image:var(--icon-delay-16);mask-image:var(--icon-delay-16);background-color:var(--icon-color,var(--color-delay-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.lock-delay dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.lock-delay dt::before,.consul-upstream-instance-list li>.detail dl.lock-delay dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.lock-delay dt::before{--icon-name:icon-delay;content:""}@-webkit-keyframes icon-docs-link{100%{-webkit-mask-image:var(--icon-docs-link-16);mask-image:var(--icon-docs-link-16);background-color:var(--icon-color,var(--color-docs-link-500,currentColor))}}@keyframes icon-docs-link{100%{-webkit-mask-image:var(--icon-docs-link-16);mask-image:var(--icon-docs-link-16);background-color:var(--icon-color,var(--color-docs-link-500,currentColor))}}@-webkit-keyframes icon-eye{100%{-webkit-mask-image:var(--icon-eye-16);mask-image:var(--icon-eye-16);background-color:var(--icon-color,var(--color-eye-500,currentColor))}}@keyframes icon-eye{100%{-webkit-mask-image:var(--icon-eye-16);mask-image:var(--icon-eye-16);background-color:var(--icon-color,var(--color-eye-500,currentColor))}}@-webkit-keyframes icon-eye-off{100%{-webkit-mask-image:var(--icon-eye-off-16);mask-image:var(--icon-eye-off-16);background-color:var(--icon-color,var(--color-eye-off-500,currentColor))}}@keyframes icon-eye-off{100%{-webkit-mask-image:var(--icon-eye-off-16);mask-image:var(--icon-eye-off-16);background-color:var(--icon-color,var(--color-eye-off-500,currentColor))}}@-webkit-keyframes icon-file-text{100%{-webkit-mask-image:var(--icon-file-text-16);mask-image:var(--icon-file-text-16);background-color:var(--icon-color,var(--color-file-text-500,currentColor))}}@keyframes icon-file-text{100%{-webkit-mask-image:var(--icon-file-text-16);mask-image:var(--icon-file-text-16);background-color:var(--icon-color,var(--color-file-text-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail .policy::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .policy::before,.consul-upstream-instance-list li>.detail .policy::before,.list-collection>ul>li:not(:first-child)>.detail .policy::before{--icon-name:icon-file-text;content:""}@-webkit-keyframes icon-gateway{100%{-webkit-mask-image:var(--icon-gateway-16);mask-image:var(--icon-gateway-16);background-color:var(--icon-color,var(--color-gateway-500,currentColor))}}@keyframes icon-gateway{100%{-webkit-mask-image:var(--icon-gateway-16);mask-image:var(--icon-gateway-16);background-color:var(--icon-color,var(--color-gateway-500,currentColor))}}.consul-kind::before{--icon-name:icon-gateway;content:""}@-webkit-keyframes icon-git-commit{100%{-webkit-mask-image:var(--icon-git-commit-16);mask-image:var(--icon-git-commit-16);background-color:var(--icon-color,var(--color-git-commit-500,currentColor))}}@keyframes icon-git-commit{100%{-webkit-mask-image:var(--icon-git-commit-16);mask-image:var(--icon-git-commit-16);background-color:var(--icon-color,var(--color-git-commit-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.node dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.node dt::before,.consul-upstream-instance-list li>.detail dl.node dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.node dt::before{--icon-name:icon-git-commit;content:""}@-webkit-keyframes icon-hexagon{100%{-webkit-mask-image:var(--icon-hexagon-16);mask-image:var(--icon-hexagon-16);background-color:var(--icon-color,var(--color-hexagon-500,currentColor))}}@keyframes icon-hexagon{100%{-webkit-mask-image:var(--icon-hexagon-16);mask-image:var(--icon-hexagon-16);background-color:var(--icon-color,var(--color-hexagon-500,currentColor))}}@-webkit-keyframes icon-history{100%{-webkit-mask-image:var(--icon-history-16);mask-image:var(--icon-history-16);background-color:var(--icon-color,var(--color-history-500,currentColor))}}@keyframes icon-history{100%{-webkit-mask-image:var(--icon-history-16);mask-image:var(--icon-history-16);background-color:var(--icon-color,var(--color-history-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.ttl dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.ttl dt::before,.consul-upstream-instance-list li>.detail dl.ttl dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.ttl dt::before{--icon-name:icon-history;content:""}@-webkit-keyframes icon-info{100%{-webkit-mask-image:var(--icon-info-16);mask-image:var(--icon-info-16);background-color:var(--icon-color,var(--color-info-500,currentColor))}}@keyframes icon-info{100%{-webkit-mask-image:var(--icon-info-16);mask-image:var(--icon-info-16);background-color:var(--icon-color,var(--color-info-500,currentColor))}}@-webkit-keyframes icon-layers{100%{-webkit-mask-image:var(--icon-layers-16);mask-image:var(--icon-layers-16);background-color:var(--icon-color,var(--color-layers-500,currentColor))}}@keyframes icon-layers{100%{-webkit-mask-image:var(--icon-layers-16);mask-image:var(--icon-layers-16);background-color:var(--icon-color,var(--color-layers-500,currentColor))}}.topology-metrics-popover.l7 .tippy-arrow::after,.topology-metrics-popover.l7>button::before{--icon-name:icon-layers;content:"";--icon-color:var(--token-color-palette-neutral-300)}@keyframes icon-loading{100%{-webkit-mask-image:var(--icon-loading-16);mask-image:var(--icon-loading-16);background-color:var(--icon-color,var(--color-loading-500,currentColor))}}@-webkit-keyframes icon-network-alt{100%{-webkit-mask-image:var(--icon-network-alt-16);mask-image:var(--icon-network-alt-16);background-color:var(--icon-color,var(--color-network-alt-500,currentColor))}}@keyframes icon-network-alt{100%{-webkit-mask-image:var(--icon-network-alt-16);mask-image:var(--icon-network-alt-16);background-color:var(--icon-color,var(--color-network-alt-500,currentColor))}}.consul-bucket-list .peer::before{--icon-name:icon-network-alt;content:""}@-webkit-keyframes icon-path{100%{-webkit-mask-image:var(--icon-path-16);mask-image:var(--icon-path-16);background-color:var(--icon-color,var(--color-path-500,currentColor))}}@keyframes icon-path{100%{-webkit-mask-image:var(--icon-path-16);mask-image:var(--icon-path-16);background-color:var(--icon-color,var(--color-path-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.path dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.path dt::before,.consul-upstream-instance-list li>.detail dl.path dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.path dt::before{--icon-name:icon-path;content:""}@-webkit-keyframes icon-running{100%{-webkit-mask-image:var(--icon-running-16);mask-image:var(--icon-running-16);background-color:var(--icon-color,var(--color-running-500,currentColor))}}@keyframes icon-running{100%{-webkit-mask-image:var(--icon-running-16);mask-image:var(--icon-running-16);background-color:var(--icon-color,var(--color-running-500,currentColor))}}@-webkit-keyframes icon-skip{100%{-webkit-mask-image:var(--icon-skip-16);mask-image:var(--icon-skip-16);background-color:var(--icon-color,var(--color-skip-500,currentColor))}}@keyframes icon-skip{100%{-webkit-mask-image:var(--icon-skip-16);mask-image:var(--icon-skip-16);background-color:var(--icon-color,var(--color-skip-500,currentColor))}}@-webkit-keyframes icon-socket{100%{-webkit-mask-image:var(--icon-socket-16);mask-image:var(--icon-socket-16);background-color:var(--icon-color,var(--color-socket-500,currentColor))}}@keyframes icon-socket{100%{-webkit-mask-image:var(--icon-socket-16);mask-image:var(--icon-socket-16);background-color:var(--icon-color,var(--color-socket-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.socket dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.socket dt::before,.consul-upstream-instance-list li>.detail dl.socket dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.socket dt::before{--icon-name:icon-socket;content:""}@-webkit-keyframes icon-star-circle{100%{-webkit-mask-image:var(--icon-star-circle-16);mask-image:var(--icon-star-circle-16);background-color:var(--icon-color,var(--color-star-circle-500,currentColor))}}@keyframes icon-star-circle{100%{-webkit-mask-image:var(--icon-star-circle-16);mask-image:var(--icon-star-circle-16);background-color:var(--icon-color,var(--color-star-circle-500,currentColor))}}@-webkit-keyframes icon-star-fill{100%{-webkit-mask-image:var(--icon-star-fill-16);mask-image:var(--icon-star-fill-16);background-color:var(--icon-color,var(--color-star-fill-500,currentColor))}}@keyframes icon-star-fill{100%{-webkit-mask-image:var(--icon-star-fill-16);mask-image:var(--icon-star-fill-16);background-color:var(--icon-color,var(--color-star-fill-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail .policy-management::before,.consul-exposed-path-list>ul>li>.header .policy-management dd::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .policy-management::before,.consul-lock-session-list ul>li:not(:first-child)>.header .policy-management dd::before,.consul-upstream-instance-list li>.detail .policy-management::before,.consul-upstream-instance-list li>.header .policy-management dd::before,.list-collection>ul>li:not(:first-child)>.detail .policy-management::before,.list-collection>ul>li:not(:first-child)>.header .policy-management dd::before{--icon-name:icon-star-fill;content:"";--icon-color:var(--token-color-consul-brand)}@-webkit-keyframes icon-tag{100%{-webkit-mask-image:var(--icon-tag-16);mask-image:var(--icon-tag-16);background-color:var(--icon-color,var(--color-tag-500,currentColor))}}@keyframes icon-tag{100%{-webkit-mask-image:var(--icon-tag-16);mask-image:var(--icon-tag-16);background-color:var(--icon-color,var(--color-tag-500,currentColor))}}.tag-list dt::before,td.tags dt::before{--icon-name:icon-tag;content:""}@-webkit-keyframes icon-x{100%{-webkit-mask-image:var(--icon-x-16);mask-image:var(--icon-x-16);background-color:var(--icon-color,var(--color-x-500,currentColor))}}@keyframes icon-x{100%{-webkit-mask-image:var(--icon-x-16);mask-image:var(--icon-x-16);background-color:var(--icon-color,var(--color-x-500,currentColor))}}@-webkit-keyframes icon-x-circle{100%{-webkit-mask-image:var(--icon-x-circle-16);mask-image:var(--icon-x-circle-16);background-color:var(--icon-color,var(--color-x-circle-500,currentColor))}}@keyframes icon-x-circle{100%{-webkit-mask-image:var(--icon-x-circle-16);mask-image:var(--icon-x-circle-16);background-color:var(--icon-color,var(--color-x-circle-500,currentColor))}}@-webkit-keyframes icon-x-square{100%{-webkit-mask-image:var(--icon-x-square-16);mask-image:var(--icon-x-square-16);background-color:var(--icon-color,var(--color-x-square-500,currentColor))}}@keyframes icon-x-square{100%{-webkit-mask-image:var(--icon-x-square-16);mask-image:var(--icon-x-square-16);background-color:var(--icon-color,var(--color-x-square-500,currentColor))}}@-webkit-keyframes icon-cloud-cross{100%{-webkit-mask-image:var(--icon-cloud-cross-16);mask-image:var(--icon-cloud-cross-16);background-color:var(--icon-color,var(--color-cloud-cross-500,currentColor))}}@keyframes icon-cloud-cross{100%{-webkit-mask-image:var(--icon-cloud-cross-16);mask-image:var(--icon-cloud-cross-16);background-color:var(--icon-color,var(--color-cloud-cross-500,currentColor))}}@-webkit-keyframes icon-loading-motion{100%{-webkit-mask-image:var(--icon-loading-motion-16);mask-image:var(--icon-loading-motion-16);background-color:var(--icon-color,var(--color-loading-motion-500,currentColor))}}@keyframes icon-loading-motion{100%{-webkit-mask-image:var(--icon-loading-motion-16);mask-image:var(--icon-loading-motion-16);background-color:var(--icon-color,var(--color-loading-motion-500,currentColor))}}@-webkit-keyframes icon-logo-auth0-color{100%{background-image:var(--icon-auth0-color-16)}}@keyframes icon-logo-auth0-color{100%{background-image:var(--icon-auth0-color-16)}}.oidc-select .auth0-oidc-provider::before{--icon-name:icon-logo-auth0-color;content:""}@-webkit-keyframes icon-logo-ember-circle-color{100%{background-image:var(--icon-logo-ember-circle-color-16)}}@keyframes icon-logo-ember-circle-color{100%{background-image:var(--icon-logo-ember-circle-color-16)}}@-webkit-keyframes icon-logo-glimmer-color{100%{background-image:var(--icon-logo-glimmer-color-16)}}@keyframes icon-logo-glimmer-color{100%{background-image:var(--icon-logo-glimmer-color-16)}}@-webkit-keyframes icon-logo-jwt-color{100%{background-image:var(--icon-logo-jwt-color-16)}}@keyframes icon-logo-jwt-color{100%{background-image:var(--icon-logo-jwt-color-16)}}.consul-external-source.jwt::before,.consul-health-check-list .health-check-output dd em.jwt::before,.consul-intention-list td strong.jwt::before,.consul-intention-permission-list strong.jwt::before,.consul-intention-search-bar li button span.jwt::before,.consul-peer-search-bar li button span.jwt::before,.consul-server-card .health-status+dd.jwt::before,.discovery-chain .route-card>header ul li.jwt::before,.hashicorp-consul nav .dcs .dc-name span.jwt::before,.hashicorp-consul nav .dcs li.is-local span.jwt::before,.hashicorp-consul nav .dcs li.is-primary span.jwt::before,.jwt.consul-auth-method-type::before,.jwt.consul-kind::before,.jwt.consul-source::before,.jwt.consul-transparent-proxy::before,.jwt.leader::before,.jwt.topology-metrics-source-type::before,.popover-select .jwt button::before,.search-bar-status li.jwt:not(.remove-all)::before,html[data-route^="dc.acls.index"] main td strong.jwt::before,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.jwt::before,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em.jwt::before,span.jwt.policy-node-identity::before,span.jwt.policy-service-identity::before{--icon-name:icon-logo-jwt-color;content:""}@-webkit-keyframes icon-logo-microsoft-color{100%{background-image:var(--icon-microsoft-color-16)}}@keyframes icon-logo-microsoft-color{100%{background-image:var(--icon-microsoft-color-16)}}.oidc-select .microsoft-oidc-provider::before{--icon-name:icon-logo-microsoft-color;content:""}@-webkit-keyframes icon-logo-oidc-color{100%{background-image:var(--icon-logo-oidc-color-16)}}@keyframes icon-logo-oidc-color{100%{background-image:var(--icon-logo-oidc-color-16)}}.consul-external-source.oidc::before,.consul-health-check-list .health-check-output dd em.oidc::before,.consul-intention-list td strong.oidc::before,.consul-intention-permission-list strong.oidc::before,.consul-intention-search-bar li button span.oidc::before,.consul-peer-search-bar li button span.oidc::before,.consul-server-card .health-status+dd.oidc::before,.discovery-chain .route-card>header ul li.oidc::before,.hashicorp-consul nav .dcs .dc-name span.oidc::before,.hashicorp-consul nav .dcs li.is-local span.oidc::before,.hashicorp-consul nav .dcs li.is-primary span.oidc::before,.oidc.consul-auth-method-type::before,.oidc.consul-kind::before,.oidc.consul-source::before,.oidc.consul-transparent-proxy::before,.oidc.leader::before,.oidc.topology-metrics-source-type::before,.popover-select .oidc button::before,.search-bar-status li.oidc:not(.remove-all)::before,html[data-route^="dc.acls.index"] main td strong.oidc::before,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.oidc::before,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em.oidc::before,span.oidc.policy-node-identity::before,span.oidc.policy-service-identity::before{--icon-name:icon-logo-oidc-color;content:""}@-webkit-keyframes icon-logo-okta-color{100%{background-image:var(--icon-okta-color-16)}}@keyframes icon-logo-okta-color{100%{background-image:var(--icon-okta-color-16)}}.oidc-select .okta-oidc-provider::before{--icon-name:icon-logo-okta-color;content:""}@-webkit-keyframes icon-mesh{100%{-webkit-mask-image:var(--icon-mesh-16);mask-image:var(--icon-mesh-16);background-color:var(--icon-color,var(--color-mesh-500,currentColor))}}@keyframes icon-mesh{100%{-webkit-mask-image:var(--icon-mesh-16);mask-image:var(--icon-mesh-16);background-color:var(--icon-color,var(--color-mesh-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.mesh dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.mesh dt::before,.consul-upstream-instance-list li>.detail dl.mesh dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.mesh dt::before{--icon-name:icon-mesh;content:""}@-webkit-keyframes icon-port{100%{-webkit-mask-image:var(--icon-port-16);mask-image:var(--icon-port-16);background-color:var(--icon-color,var(--color-port-500,currentColor))}}@keyframes icon-port{100%{-webkit-mask-image:var(--icon-port-16);mask-image:var(--icon-port-16);background-color:var(--icon-color,var(--color-port-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.port dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.port dt::before,.consul-upstream-instance-list li>.detail dl.port dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.port dt::before{--icon-name:icon-port;content:""}@-webkit-keyframes icon-protocol{100%{-webkit-mask-image:var(--icon-protocol-16);mask-image:var(--icon-protocol-16);background-color:var(--icon-color,var(--color-protocol-500,currentColor))}}@keyframes icon-protocol{100%{-webkit-mask-image:var(--icon-protocol-16);mask-image:var(--icon-protocol-16);background-color:var(--icon-color,var(--color-protocol-500,currentColor))}}.consul-exposed-path-list>ul>li>.detail dl.protocol dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.protocol dt::before,.consul-upstream-instance-list li>.detail dl.protocol dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.protocol dt::before{--icon-name:icon-protocol;content:""}@-webkit-keyframes icon-redirect{100%{-webkit-mask-image:var(--icon-redirect-16);mask-image:var(--icon-redirect-16);background-color:var(--icon-color,var(--color-redirect-500,currentColor))}}@keyframes icon-redirect{100%{-webkit-mask-image:var(--icon-redirect-16);mask-image:var(--icon-redirect-16);background-color:var(--icon-color,var(--color-redirect-500,currentColor))}}@-webkit-keyframes icon-search-color{100%{background-image:var(--icon-search-color-16)}}@keyframes icon-search-color{100%{background-image:var(--icon-search-color-16)}}[for=toolbar-toggle]{--icon-name:icon-search-color;content:""}@-webkit-keyframes icon-sort{100%{-webkit-mask-image:var(--icon-sort-desc-16);mask-image:var(--icon-sort-desc-16);background-color:var(--icon-color,var(--color-sort-500,currentColor))}}@keyframes icon-sort{100%{-webkit-mask-image:var(--icon-sort-desc-16);mask-image:var(--icon-sort-desc-16);background-color:var(--icon-color,var(--color-sort-500,currentColor))}}.type-sort.popover-select label>::before{--icon-name:icon-sort;content:""}@-webkit-keyframes icon-union{100%{-webkit-mask-image:var(--icon-union-16);mask-image:var(--icon-union-16);background-color:var(--icon-color,var(--color-union-500,currentColor))}}@keyframes icon-union{100%{-webkit-mask-image:var(--icon-union-16);mask-image:var(--icon-union-16);background-color:var(--icon-color,var(--color-union-500,currentColor))}}#downstream-container .topology-metrics-card .details .group span::before,#upstream-container .topology-metrics-card .details .group span::before{--icon-name:icon-union;content:""}.ember-basic-dropdown{position:relative}.ember-basic-dropdown,.ember-basic-dropdown-content,.ember-basic-dropdown-content *{box-sizing:border-box}.ember-basic-dropdown-content{position:absolute;width:auto;z-index:1000;background-color:#fff}.ember-basic-dropdown-content--left{left:0}.ember-basic-dropdown-content--right{right:0}.ember-basic-dropdown-overlay{position:fixed;background:rgba(0,0,0,.5);width:100%;height:100%;z-index:10;top:0;left:0;pointer-events:none}.ember-basic-dropdown-content-wormhole-origin{display:inline}.ember-power-select-dropdown *{box-sizing:border-box}.ember-power-select-trigger{position:relative;border-radius:4px;background-color:#fff;line-height:1.75;overflow-x:hidden;text-overflow:ellipsis;min-height:1.75em;-moz-user-select:none;user-select:none;-webkit-user-select:none;color:inherit}.ember-power-select-trigger:after{content:"";display:table;clear:both}.ember-power-select-trigger--active,.ember-power-select-trigger:focus{box-shadow:none}.ember-basic-dropdown-trigger--below.ember-power-select-trigger[aria-expanded=true],.ember-basic-dropdown-trigger--in-place.ember-power-select-trigger[aria-expanded=true]{border-bottom-left-radius:0;border-bottom-right-radius:0}.ember-basic-dropdown-trigger--above.ember-power-select-trigger[aria-expanded=true]{border-top-left-radius:0;border-top-right-radius:0}.ember-power-select-placeholder{color:#999;display:block;overflow-x:hidden;white-space:nowrap;text-overflow:ellipsis}.ember-power-select-status-icon{position:absolute;display:inline-block;width:0;height:0;top:0;bottom:0;margin:auto;border-style:solid;border-width:7px 4px 0;border-color:#aaa transparent transparent;right:5px}.ember-basic-dropdown-trigger[aria-expanded=true] .ember-power-select-status-icon{transform:rotate(180deg)}.ember-power-select-clear-btn{position:absolute;cursor:pointer;right:25px}.ember-power-select-trigger-multiple-input{font-family:inherit;font-size:inherit;border:none;display:inline-block;line-height:inherit;-webkit-appearance:none;outline:0;padding:0;float:left;background-color:transparent;text-indent:2px}.ember-power-select-trigger-multiple-input:disabled{background-color:#eee}.ember-power-select-trigger-multiple-input::placeholder{opacity:1;color:#999}.ember-power-select-trigger-multiple-input::-webkit-input-placeholder{opacity:1;color:#999}.ember-power-select-trigger-multiple-input::-moz-placeholder{opacity:1;color:#999}.ember-power-select-trigger-multiple-input::-ms-input-placeholder{opacity:1;color:#999}.active.discovery-chain [id*=":"],.discovery-chain path,.ember-power-select-multiple-remove-btn:not(:hover){opacity:.5}.ember-power-select-multiple-options{padding:0;margin:0}.ember-power-select-multiple-option{border:1px solid gray;border-radius:4px;color:#333;background-color:#e4e4e4;padding:0 4px;display:inline-block;line-height:1.45;float:left;margin:2px 0 2px 3px}.ember-power-select-multiple-remove-btn{cursor:pointer}.ember-power-select-search{padding:4px}.ember-power-select-search-input{border:1px solid #aaa;border-radius:0;width:100%;font-size:inherit;line-height:inherit;padding:0 5px}.ember-power-select-search-input:focus{border:1px solid #aaa;box-shadow:none}.ember-power-select-dropdown{border-left:1px solid #aaa;border-right:1px solid #aaa;line-height:1.75;border-radius:4px;box-shadow:none;overflow:hidden;color:inherit}.ember-power-select-dropdown.ember-basic-dropdown-content--above{border-top:1px solid #aaa;border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.ember-power-select-dropdown.ember-basic-dropdown-content--below,.ember-power-select-dropdown.ember-basic-dropdown-content--in-place{border-top:none;border-bottom:1px solid #aaa;border-top-left-radius:0;border-top-right-radius:0}.ember-power-select-dropdown.ember-basic-dropdown-content--in-place{width:100%}.ember-power-select-options{list-style:none;margin:0;padding:0;-moz-user-select:none;user-select:none;-webkit-user-select:none}.ember-power-select-placeholder,.ember-power-select-selected-item,a[rel*=external]::after{margin-left:8px}.ember-power-select-options[role=listbox]{overflow-y:auto;-webkit-overflow-scrolling:touch;max-height:12.25em}.ember-power-select-option{cursor:pointer;padding:0 8px}.ember-power-select-group[aria-disabled=true]{color:#999;cursor:not-allowed}.ember-power-select-group[aria-disabled=true] .ember-power-select-option,.ember-power-select-option[aria-disabled=true]{color:#999;pointer-events:none;cursor:not-allowed}.ember-power-select-option[aria-selected=true]{background-color:#ddd}.ember-power-select-option[aria-current=true]{background-color:#5897fb;color:#fff}.ember-power-select-group-name{cursor:default;font-weight:700}.ember-power-select-trigger[aria-disabled=true]{background-color:#eee}.ember-power-select-trigger{padding:0 16px 0 0}.ember-power-select-group .ember-power-select-group .ember-power-select-group-name{padding-left:24px}.ember-power-select-group .ember-power-select-group .ember-power-select-option{padding-left:40px}.ember-power-select-group .ember-power-select-option{padding-left:24px}.ember-power-select-group .ember-power-select-group-name{padding-left:8px}.ember-power-select-trigger[dir=rtl]{padding:0 0 0 16px}.ember-power-select-trigger[dir=rtl] .ember-power-select-placeholder,.ember-power-select-trigger[dir=rtl] .ember-power-select-selected-item{margin-right:8px}.ember-power-select-trigger[dir=rtl] .ember-power-select-multiple-option,.ember-power-select-trigger[dir=rtl] .ember-power-select-trigger-multiple-input{float:right}.ember-power-select-trigger[dir=rtl] .ember-power-select-status-icon{left:5px;right:initial}.ember-power-select-trigger[dir=rtl] .ember-power-select-clear-btn{left:25px;right:initial}.ember-power-select-dropdown[dir=rtl] .ember-power-select-group .ember-power-select-group .ember-power-select-group-name{padding-right:24px}.ember-power-select-dropdown[dir=rtl] .ember-power-select-group .ember-power-select-group .ember-power-select-option{padding-right:40px}.ember-power-select-dropdown[dir=rtl] .ember-power-select-group .ember-power-select-option{padding-right:24px}.ember-power-select-dropdown[dir=rtl] .ember-power-select-group .ember-power-select-group-name{padding-right:8px}#login-toggle+div footer button:focus,#login-toggle+div footer button:hover,.consul-intention-fieldsets .permissions>button:focus,.consul-intention-fieldsets .permissions>button:hover,.empty-state>ul>li>:focus,.empty-state>ul>li>:hover,.empty-state>ul>li>label>button:focus,.empty-state>ul>li>label>button:hover,.modal-dialog [role=document] dd a:focus,.modal-dialog [role=document] dd a:hover,.modal-dialog [role=document] p a:focus,.modal-dialog [role=document] p a:hover,.oidc-select button.reset:focus,.oidc-select button.reset:hover,.search-bar-status .remove-all button:focus,.search-bar-status .remove-all button:hover,main dd a:focus,main dd a:hover,main p a:focus,main p a:hover{text-decoration:underline}#login-toggle+div footer button,.consul-intention-fieldsets .permissions>button,.empty-state>ul>li>*,.empty-state>ul>li>:active,.empty-state>ul>li>:focus,.empty-state>ul>li>:hover,.empty-state>ul>li>label>button,.empty-state>ul>li>label>button:active,.empty-state>ul>li>label>button:focus,.empty-state>ul>li>label>button:hover,.modal-dialog [role=document] dd a,.modal-dialog [role=document] p a,.oidc-select button.reset,.search-bar-status .remove-all button,main dd a,main dd a:active,main dd a:focus,main dd a:hover,main p a,main p a:active,main p a:focus,main p a:hover{color:var(--token-color-foreground-action)}.modal-dialog [role=document] label a[rel*=help],div.with-confirmation p,main label a[rel*=help]{color:var(--token-color-foreground-disabled)}#login-toggle+div footer button,.consul-intention-fieldsets .permissions>button,.empty-state>ul>li>*,.empty-state>ul>li>label>button,.modal-dialog [role=document] dd a,.modal-dialog [role=document] p a,.oidc-select button.reset,.search-bar-status .remove-all button,main dd a,main p a{cursor:pointer;background-color:transparent}#login-toggle+div footer button:active,.consul-intention-fieldsets .permissions>button:active,.empty-state>ul>li>:active,.empty-state>ul>li>label>button:active,.modal-dialog [role=document] dd a:active,.modal-dialog [role=document] p a:active,.oidc-select button.reset:active,.search-bar-status .remove-all button:active,main dd a:active,main p a:active{outline:0}.modal-dialog [role=document] a[rel*=help]::after,main a[rel*=help]::after{opacity:.4}.modal-dialog [role=document] h2 a,main h2 a{color:var(--token-color-foreground-strong)}.modal-dialog [role=document] h2 a[rel*=help]::after,main h2 a[rel*=help]::after{font-size:.65em;margin-top:.2em;margin-left:.2em}.tab-section>p:only-child [rel*=help]::after{content:none}.auth-form{width:320px;margin:-20px 25px 0}.auth-form em{color:var(--token-color-foreground-faint);font-style:normal;display:inline-block;margin-top:1em}.auth-form .oidc-select,.auth-form form{padding-top:1em}.auth-form form{margin-bottom:0!important}.auth-form .ember-basic-dropdown-trigger,.auth-form button:not(.reset){width:100%}.auth-form .progress{margin:0 auto}#login-toggle+div footer button::after{font-size:120%;position:relative;top:-1px;left:-3px}#login-toggle+div footer{border-top:0;background-color:transparent;padding:10px 42px 20px}#login-toggle+div>div>div>div{padding-bottom:0}.auth-profile{padding:.9em 1em}.auth-profile dt span{font-weight:var(--typo-weight-normal)}.auth-profile dt{font-weight:var(--typo-weight-bold)}.auth-profile dd,.auth-profile dt{color:var(--token-color-paletter-neutral-300)}.auth-profile dt span,.empty-state,main header nav:first-child ol li a,main header nav:first-child ol li:not(:first-child) a::before{color:var(--token-color-foreground-faint)}main header nav:first-child ol li a{text-decoration:none}main header nav:first-child ol li a:hover{color:var(--token-color-foreground-action);text-decoration:underline}main header nav:first-child ol li a::before{text-decoration:none}main header nav:first-child ol{display:grid;grid-auto-flow:column;white-space:nowrap;overflow:hidden}main header nav:first-child ol>li{list-style-type:none;display:inline-flex;overflow:hidden}main header nav:first-child ol li:first-child a::before{background-color:var(--token-color-foreground-faint);margin-right:4px;display:inline-block}main header nav:first-child ol li:not(:first-child) a{margin-left:6px;overflow:hidden;text-overflow:ellipsis}main header nav:first-child ol li:not(:first-child) a::before{content:"/";margin-right:8px;display:inline-block}main header nav:first-child{position:absolute;top:12px}.consul-intention-action-warn-modal button.dangerous,.copy-button button,.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button,.informed-action>ul>li>*,.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-select label>*,.topology-notices button,.type-sort.popover-select label>*,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{cursor:pointer;white-space:nowrap;text-decoration:none}.consul-intention-action-warn-modal button.dangerous:disabled,.copy-button button:disabled,.disclosure-menu [aria-expanded]~*>ul>[role=treeitem]:disabled,.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem]:disabled,.disclosure-menu [aria-expanded]~*>ul>li>[role=option]:disabled,.hashicorp-consul nav li.nspaces .disclosure-menu>button:disabled,.hashicorp-consul nav li.partitions .disclosure-menu>button:disabled,.informed-action>ul>li>:disabled,.menu-panel>ul>[role=treeitem]:disabled,.menu-panel>ul>li>[role=menuitem]:disabled,.menu-panel>ul>li>[role=option]:disabled,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]:disabled,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]:disabled,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option]:disabled,.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]:disabled,.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]:disabled,.popover-menu>[type=checkbox]+label+div>ul>li>[role=option]:disabled,.popover-select label>:disabled,.topology-notices button:disabled,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]:disabled,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]:disabled,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]:disabled,table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]:disabled,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]:disabled,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]:disabled{cursor:default;box-shadow:none}.checkbox-group label,.more-popover-menu>[type=checkbox]~label,.popover-menu>[type=checkbox]~label,html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] label,table.has-actions tr>.actions>[type=checkbox]~label,table.with-details tr>.actions>[type=checkbox]~label{cursor:pointer}.consul-intention-action-warn-modal button.dangerous{border-width:1px;border-radius:var(--decor-radius-100);box-shadow:var(--token-elevation-high-box-shadow)}.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button,.informed-action>ul>li>*,.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{color:var(--token-color-foreground-strong);background-color:var(--token-color-surface-primary)}.disclosure-menu [aria-expanded]~*>ul>[role=treeitem]:focus,.disclosure-menu [aria-expanded]~*>ul>[role=treeitem]:hover,.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem]:focus,.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem]:hover,.disclosure-menu [aria-expanded]~*>ul>li>[role=option]:focus,.disclosure-menu [aria-expanded]~*>ul>li>[role=option]:hover,.hashicorp-consul nav li.nspaces .disclosure-menu>button:focus,.hashicorp-consul nav li.nspaces .disclosure-menu>button:hover,.hashicorp-consul nav li.partitions .disclosure-menu>button:focus,.hashicorp-consul nav li.partitions .disclosure-menu>button:hover,.informed-action>ul>li>:focus,.informed-action>ul>li>:hover,.menu-panel>ul>[role=treeitem]:focus,.menu-panel>ul>[role=treeitem]:hover,.menu-panel>ul>li>[role=menuitem]:focus,.menu-panel>ul>li>[role=menuitem]:hover,.menu-panel>ul>li>[role=option]:focus,.menu-panel>ul>li>[role=option]:hover,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]:focus,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]:hover,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]:focus,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]:hover,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option]:focus,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option]:hover,.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]:focus,.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]:hover,.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]:focus,.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]:hover,.popover-menu>[type=checkbox]+label+div>ul>li>[role=option]:focus,.popover-menu>[type=checkbox]+label+div>ul>li>[role=option]:hover,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]:focus,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]:hover,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]:focus,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]:hover,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]:focus,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]:hover,table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]:focus,table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]:hover,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]:focus,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]:hover,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]:focus,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]:hover{background-color:var(--token-color-surface-strong)}.type-sort.popover-select label>::before{position:relative;width:16px;height:16px}.type-sort.popover-select label>::after{top:0!important}.consul-intention-action-warn-modal button.dangerous,.copy-button button,.popover-select label>*,.topology-notices button,.type-sort.popover-select label>*{position:relative}.consul-intention-action-warn-modal button.dangerous .progress.indeterminate,.copy-button button .progress.indeterminate,.popover-select label>* .progress.indeterminate,.topology-notices button .progress.indeterminate{position:absolute;top:50%;left:50%;margin-left:-12px;margin-top:-12px}.consul-intention-action-warn-modal button.dangerous:empty,.copy-button button:empty,.popover-select label>:empty,.topology-notices button:empty{padding-right:0!important;padding-left:18px!important;margin-right:5px}.consul-intention-action-warn-modal button.dangerous:empty::before,.copy-button button:empty::before,.popover-select label>:empty::before,.topology-notices button:empty::before{left:1px}.consul-intention-action-warn-modal button.dangerous:not(:empty),.copy-button button:not(:empty),.popover-select label>:not(:empty),.topology-notices button:not(:empty){display:inline-flex;text-align:center;justify-content:center;align-items:center;padding:calc(.5em - 1px) calc(2.2em - 1px);min-width:100px}.consul-intention-action-warn-modal button.dangerous:not(:last-child),.copy-button button:not(:last-child),.popover-select label>:not(:last-child),.topology-notices button:not(:last-child){margin-right:8px}.app-view>header .actions a{padding-top:calc(.4em - 1px)!important;padding-bottom:calc(.4em - 1px)!important}.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button,.informed-action>ul>li>*,.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{padding:.9em 1em;text-align:center;display:inline-block;box-sizing:border-box}.type-sort.popover-select label>*{height:35px!important}.discovery-chain .resolver-card,.discovery-chain .route-card,.discovery-chain .splitter-card{border:var(--decor-border-100);border-radius:var(--decor-radius-100);background-color:var(--token-color-surface-faint);display:block;position:relative}.discovery-chain .resolver-card>section,.discovery-chain .resolver-card>ul>li,.discovery-chain .route-card>section,.discovery-chain .route-card>ul>li,.discovery-chain .splitter-card>section,.discovery-chain .splitter-card>ul>li{border-top:var(--decor-border-100)}.discovery-chain .resolver-card,.discovery-chain .resolver-card>section,.discovery-chain .resolver-card>ul>li,.discovery-chain .route-card,.discovery-chain .route-card>section,.discovery-chain .route-card>ul>li,.discovery-chain .splitter-card,.discovery-chain .splitter-card>section,.discovery-chain .splitter-card>ul>li{border-color:var(--token-color-surface-interactive-active)}.discovery-chain .resolver-card:focus,.discovery-chain .resolver-card:hover,.discovery-chain .route-card:focus,.discovery-chain .route-card:hover,.discovery-chain .splitter-card:focus,.discovery-chain .splitter-card:hover{box-shadow:var(--token-surface-mid-box-shadow)}.discovery-chain .resolver-card>header,.discovery-chain .route-card>header,.discovery-chain .splitter-card>header{padding:10px}.discovery-chain .resolver-card>section,.discovery-chain .resolver-card>ul>li,.discovery-chain .route-card>section,.discovery-chain .route-card>ul>li,.discovery-chain .splitter-card>section,.discovery-chain .splitter-card>ul>li{padding:5px 10px}.discovery-chain .resolver-card ul,.discovery-chain .route-card ul,.discovery-chain .splitter-card ul{list-style-type:none;margin:0;padding:0}.checkbox-group label{margin-right:10px;white-space:nowrap}.checkbox-group span{display:inline-block;margin-left:10px;min-width:50px}.CodeMirror{max-width:1260px;min-height:300px;height:auto;padding-bottom:20px}.CodeMirror-scroll{overflow-x:hidden!important}.CodeMirror-lint-tooltip{background-color:#f9f9fa;border:1px solid var(--syntax-light-gray);border-radius:0;color:#212121;font-size:13px;padding:7px 8px 9px}.cm-s-hashi.CodeMirror{width:100%;background-color:var(--token-color-hashicorp-brand)!important;color:#cfd2d1!important;border:none;-webkit-font-smoothing:auto;line-height:1.4}.cm-s-hashi .CodeMirror-gutters{color:var(--syntax-dark-grey);background-color:var(--syntax-gutter-grey);border:none}.cm-s-hashi .CodeMirror-cursor{border-left:solid thin #f8f8f0}.cm-s-hashi .CodeMirror-linenumber{color:#6d8a88}.cm-s-hashi.CodeMirror-focused div.CodeMirror-selected{background:#214283}.cm-s-hashi .CodeMirror-line::selection,.cm-s-hashi .CodeMirror-line>span::selection,.cm-s-hashi .CodeMirror-line>span>span::selection{background:#214283}.cm-s-hashi .CodeMirror-line::-moz-selection,.cm-s-hashi .CodeMirror-line>span::-moz-selection,.cm-s-hashi .CodeMirror-line>span>span::-moz-selection{background:var(--token-color-surface-interactive)}.cm-s-hashi span.cm-comment{color:var(--syntax-light-grey)}.cm-s-hashi span.cm-string,.cm-s-hashi span.cm-string-2{color:var(--syntax-packer)}.cm-s-hashi span.cm-number{color:var(--syntax-serf)}.cm-s-hashi span.cm-variable,.cm-s-hashi span.cm-variable-2{color:#9e84c5}.cm-s-hashi span.cm-def{color:var(--syntax-packer)}.cm-s-hashi span.cm-operator{color:var(--syntax-gray)}.cm-s-hashi span.cm-keyword{color:var(--syntax-yellow)}.cm-s-hashi span.cm-atom{color:var(--syntax-serf)}.cm-s-hashi span.cm-meta,.cm-s-hashi span.cm-tag{color:var(--syntax-packer)}.cm-s-hashi span.cm-error{color:var(--syntax-red)}.cm-s-hashi span.cm-attribute,.cm-s-hashi span.cm-qualifier{color:#9fca56}.cm-s-hashi span.cm-property{color:#9e84c5}.cm-s-hashi span.cm-builtin,.cm-s-hashi span.cm-variable-3{color:#9fca56}.cm-s-hashi .CodeMirror-activeline-background{background:#101213}.cm-s-hashi .CodeMirror-matchingbracket{text-decoration:underline;color:var(--token-color-surface-primary)!important}.readonly-codemirror .cm-s-hashi span{color:var(--syntax-light-grey)}.readonly-codemirror .cm-s-hashi span.cm-string,.readonly-codemirror .cm-s-hashi span.cm-string-2{color:var(--syntax-faded-gray)}.readonly-codemirror .cm-s-hashi span.cm-number{color:#a3acbc}.readonly-codemirror .cm-s-hashi span.cm-property{color:var(--token-color-surface-primary)}.readonly-codemirror .cm-s-hashi span.cm-variable-2{color:var(--syntax-light-grey-blue)}.code-editor .toolbar-container{background:var(--token-color-surface-strong);background:linear-gradient(180deg,var(--token-color-surface-strong) 50%,var(--token-color-surface-interactive-active) 100%);border:1px solid var(--token-color-surface-interactive-active);border-bottom-color:var(--token-color-foreground-faint);border-top-color:var(--token-color-foreground-disabled)}.code-editor .toolbar-container .toolbar .title{color:var(--token-color-foreground-strong);font-size:14px;font-weight:700;padding:0 8px}.code-editor .toolbar-container .toolbar .toolbar-separator{border-right:1px solid var(--token-color-palette-neutral-300)}.code-editor .toolbar-container .ember-power-select-trigger{background-color:var(--token-color-surface-primary);color:var(--token-color-hashicorp-brand);border-radius:var(--decor-radius-100);border:var(--decor-border-100);border-color:var(--token-color-foreground-faint)}.code-editor{display:block;border:10px;overflow:hidden;position:relative;clear:both}.code-editor::after{position:absolute;bottom:0;width:100%;height:25px;background-color:var(--token-color-hashicorp-brand);content:"";display:block}.code-editor>pre{display:none}.code-editor .toolbar-container,.code-editor .toolbar-container .toolbar{align-items:center;justify-content:space-between;display:flex}.code-editor .toolbar-container{position:relative;margin-top:4px;height:44px}.code-editor .toolbar-container .toolbar{flex:1;white-space:nowrap}.code-editor .toolbar-container .toolbar .toolbar-separator{height:32px;margin:0 4px;width:0}.code-editor .toolbar-container .toolbar .tools{display:flex;flex-direction:row;margin:0 10px;align-items:center}.code-editor .toolbar-container .toolbar .tools .copy-button{margin-left:10px}.code-editor .toolbar-container .ember-basic-dropdown-trigger{margin:0 8px;width:120px;height:32px;display:flex;align-items:center;flex-direction:row}.consul-exposed-path-list>ul>li,.consul-lock-session-list ul>li:not(:first-child),.consul-upstream-instance-list li,.list-collection>ul>li:not(:first-child){display:grid;grid-template-columns:1fr auto;grid-template-rows:50% 50%;grid-template-areas:"header actions" "detail actions"}.consul-exposed-path-list>ul>li>.header,.consul-lock-session-list ul>li:not(:first-child)>.header,.consul-upstream-instance-list li>.header,.list-collection>ul>li:not(:first-child)>.header{grid-area:header;align-self:start}.consul-exposed-path-list>ul>li>.detail,.consul-lock-session-list ul>li:not(:first-child)>.detail,.consul-upstream-instance-list li>.detail,.list-collection>ul>li:not(:first-child)>.detail{grid-area:detail;align-self:end}.consul-exposed-path-list>ul>li>.detail *,.consul-lock-session-list ul>li:not(:first-child)>.detail *,.consul-upstream-instance-list li>.detail *,.list-collection>ul>li:not(:first-child)>.detail *{flex-wrap:nowrap!important}.consul-exposed-path-list>ul>li>.actions,.consul-lock-session-list ul>li:not(:first-child)>.actions,.consul-upstream-instance-list li>.actions,.list-collection>ul>li:not(:first-child)>.actions{grid-area:actions;display:inline-flex}.consul-nspace-list>ul>li:not(:first-child) dt,.consul-policy-list>ul li:not(:first-child) dl:not(.datacenter) dt,.consul-role-list>ul>li:not(:first-child) dt,.consul-service-instance-list .port dt,.consul-service-instance-list .port dt::before,.consul-token-list>ul>li:not(:first-child) dt{display:none}.consul-exposed-path-list>ul>li>.header:nth-last-child(2),.consul-lock-session-list ul>li:not(:first-child)>.header:nth-last-child(2),.consul-upstream-instance-list li>.header:nth-last-child(2),.list-collection>ul>li:not(:first-child)>.header:nth-last-child(2){grid-column-start:header;grid-column-end:actions}.consul-exposed-path-list>ul>li>.detail:last-child,.consul-lock-session-list ul>li:not(:first-child)>.detail:last-child,.consul-upstream-instance-list li>.detail:last-child,.list-collection>ul>li:not(:first-child)>.detail:last-child{grid-column-start:detail;grid-column-end:actions}.consul-nspace-list>ul>li:not(:first-child) dt+dd,.consul-policy-list>ul li:not(:first-child) dl:not(.datacenter) dt+dd,.consul-role-list>ul>li:not(:first-child) dt+dd,.consul-token-list>ul>li:not(:first-child) dt+dd{margin-left:0!important}.consul-policy-list dl.datacenter dt,.consul-service-list li>div:first-child>dl:first-child dd{margin-top:1px}.consul-service-instance-list .detail,.consul-service-list .detail{overflow-x:visible!important}.consul-intention-permission-list>ul{border-top:1px solid var(--token-color-surface-interactive-active)}.consul-service-instance-list .port .copy-button{margin-right:0}.consul-exposed-path-list>ul>li .copy-button,.consul-lock-session-list ul>li:not(:first-child) .copy-button,.consul-upstream-instance-list li .copy-button,.list-collection>ul>li:not(:first-child) .copy-button{display:inline-flex}.consul-exposed-path-list>ul>li>.header .copy-button,.consul-lock-session-list ul>li:not(:first-child)>.header .copy-button,.consul-upstream-instance-list li>.header .copy-button,.list-collection>ul>li:not(:first-child)>.header .copy-button{margin-left:4px}.consul-exposed-path-list>ul>li>.detail .copy-button,.consul-lock-session-list ul>li:not(:first-child)>.detail .copy-button,.consul-upstream-instance-list li>.detail .copy-button,.list-collection>ul>li:not(:first-child)>.detail .copy-button{margin-top:2px}.consul-exposed-path-list>ul>li .copy-button button,.consul-lock-session-list ul>li:not(:first-child) .copy-button button,.consul-upstream-instance-list li .copy-button button,.list-collection>ul>li:not(:first-child) .copy-button button{padding:0!important;margin:0!important}.consul-exposed-path-list>ul>li>.header .copy-button button,.consul-lock-session-list ul>li:not(:first-child)>.header .copy-button button,.consul-upstream-instance-list li>.header .copy-button button,.list-collection>ul>li:not(:first-child)>.header .copy-button button{display:none}.consul-exposed-path-list>ul>li>.header:hover .copy-button button,.consul-lock-session-list ul>li:not(:first-child)>.header:hover .copy-button button,.consul-upstream-instance-list li>.header:hover .copy-button button,.list-collection>ul>li:not(:first-child)>.header:hover .copy-button button{display:block}.consul-exposed-path-list>ul>li .copy-button button:hover,.consul-lock-session-list ul>li:not(:first-child) .copy-button button:hover,.consul-upstream-instance-list li .copy-button button:hover,.list-collection>ul>li:not(:first-child) .copy-button button:hover{background-color:transparent!important}.consul-exposed-path-list>ul>li>.detail>.consul-external-source:first-child,.consul-exposed-path-list>ul>li>.detail>.consul-kind:first-child,.consul-lock-session-list ul>li:not(:first-child)>.detail>.consul-external-source:first-child,.consul-lock-session-list ul>li:not(:first-child)>.detail>.consul-kind:first-child,.consul-upstream-instance-list li>.detail>.consul-external-source:first-child,.consul-upstream-instance-list li>.detail>.consul-kind:first-child,.list-collection>ul>li:not(:first-child)>.detail>.consul-external-source:first-child,.list-collection>ul>li:not(:first-child)>.detail>.consul-kind:first-child{margin-left:-5px}.consul-exposed-path-list>ul>li>.detail .policy-management::before,.consul-exposed-path-list>ul>li>.detail .policy::before,.consul-exposed-path-list>ul>li>.detail .role::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .policy-management::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .policy::before,.consul-lock-session-list ul>li:not(:first-child)>.detail .role::before,.consul-upstream-instance-list li>.detail .policy-management::before,.consul-upstream-instance-list li>.detail .policy::before,.consul-upstream-instance-list li>.detail .role::before,.list-collection>ul>li:not(:first-child)>.detail .policy-management::before,.list-collection>ul>li:not(:first-child)>.detail .policy::before,.list-collection>ul>li:not(:first-child)>.detail .role::before{margin-right:3px}table div.with-confirmation.confirming{background-color:var(--token-color-surface-primary)}div.with-confirmation p{margin-right:12px;padding-left:12px;margin-bottom:0!important}div.with-confirmation{justify-content:end;width:100%;display:flex;align-items:center}table td>div.with-confirmation.confirming{position:absolute;right:0}@media (max-width:420px){div.with-confirmation{float:none;margin-top:1em;display:block}div.with-confirmation p{margin-bottom:1em}}.copy-button button{color:var(--token-color-foreground-action);--icon-color:transparent;min-height:17px}.copy-button button::after{--icon-color:var(--token-color-surface-strong)}.copy-button button:focus,.copy-button button:hover:not(:disabled):not(:active){color:var(--token-color-foreground-action);--icon-color:var(--token-color-surface-strong)}.copy-button button:hover::before{--icon-color:var(--token-color-foreground-action)}.copy-button button:active{--icon-color:var(--token-color-surface-interactive-active)}.copy-button button:empty{padding:0!important;margin-right:0;top:-1px}.copy-button button:empty::after{content:"";display:none;position:absolute;top:-2px;left:-3px;width:20px;height:22px}.copy-button button:empty:hover::after{display:block}.copy-button button:empty::before{position:relative;z-index:1}.copy-button button:not(:empty)::before{margin-right:4px}.consul-bucket-list .copy-button,.consul-exposed-path-list>ul>li>.detail dl .copy-button,.consul-instance-checks .copy-button,.consul-lock-session-list dl .copy-button,.consul-lock-session-list ul>li:not(:first-child)>.detail dl .copy-button,.consul-upstream-instance-list dl .copy-button,.list-collection>ul>li:not(:first-child)>.detail dl .copy-button,.tag-list .copy-button,section[data-route="dc.show.license"] .validity dl .copy-button,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .copy-button,td.tags .copy-button{margin-top:0!important}.consul-bucket-list .copy-btn,.consul-exposed-path-list>ul>li>.detail dl .copy-btn,.consul-instance-checks .copy-btn,.consul-lock-session-list dl .copy-btn,.consul-lock-session-list ul>li:not(:first-child)>.detail dl .copy-btn,.consul-upstream-instance-list dl .copy-btn,.list-collection>ul>li:not(:first-child)>.detail dl .copy-btn,.tag-list .copy-btn,section[data-route="dc.show.license"] .validity dl .copy-btn,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .copy-btn,td.tags .copy-btn{top:0!important}.consul-bucket-list .copy-btn:empty::before,.consul-exposed-path-list>ul>li>.detail dl .copy-btn:empty::before,.consul-instance-checks .copy-btn:empty::before,.consul-lock-session-list dl .copy-btn:empty::before,.consul-upstream-instance-list dl .copy-btn:empty::before,.list-collection>ul>li:not(:first-child)>.detail dl .copy-btn:empty::before,.tag-list .copy-btn:empty::before,section[data-route="dc.show.license"] .validity dl .copy-btn:empty::before,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .copy-btn:empty::before,td.tags .copy-btn:empty::before{left:0!important}.definition-table>dl{display:grid;grid-template-columns:140px auto;grid-gap:.4em 20px;margin-bottom:1.4em}.disclosure-menu{position:relative}.disclosure-menu [aria-expanded]~*{overflow-y:auto!important;will-change:scrollPosition}.more-popover-menu>[type=checkbox],.more-popover-menu>[type=checkbox]~:not(.animating):not(label),.popover-menu>[type=checkbox],.popover-menu>[type=checkbox]~:not(.animating):not(label),table.has-actions tr>.actions>[type=checkbox],table.has-actions tr>.actions>[type=checkbox]~:not(.animating):not(label),table.with-details tr>.actions>[type=checkbox],table.with-details tr>.actions>[type=checkbox]~:not(.animating):not(label){display:none}.more-popover-menu>[type=checkbox]:checked~:not(label),.popover-menu>[type=checkbox]:checked~:not(label),table.has-actions tr>.actions>[type=checkbox]:checked~:not(label),table.with-details tr>.actions>[type=checkbox]:checked~:not(label){display:block}table.dom-recycling{position:relative}table.dom-recycling tr>*{overflow:hidden}.list-collection-scroll-virtual>ul,table.dom-recycling tbody{overflow-x:hidden!important}table.dom-recycling dd{flex-wrap:nowrap}table.dom-recycling dd>*{margin-bottom:0}.empty-state,.empty-state>div{display:flex;flex-direction:column}.empty-state header :first-child{padding:0;margin:0}.empty-state{margin-top:0!important;padding-bottom:2.8em;background-color:var(--token-color-surface-faint)}.empty-state>*{width:370px;margin:0 auto}.empty-state button{margin:0 auto;display:inline}.empty-state header :first-child{margin-bottom:-3px;border-bottom:none}.empty-state header{margin-top:1.8em;margin-bottom:.5em}.empty-state>ul{display:flex;justify-content:space-between;margin-top:1em}.empty-state>ul>li>*,.empty-state>ul>li>label>button{display:inline-flex;align-items:center}.empty-state>div:only-child{padding:50px 0 10px;text-align:center}.empty-state header::before{font-size:2.6em;position:relative;top:-3px;float:left;margin-right:10px}.oidc-select button.reset,.type-dialog{float:right}.empty-state>ul>li>::before,.empty-state>ul>li>label>button::before{margin-top:-1px;margin-right:.5em;font-size:.9em}.empty-state li[class*=-link]>::after{margin-left:5px}html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup]{border:var(--decor-border-100);border-color:var(--token-color-palette-neutral-300);border-radius:var(--decor-radius-100)}html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] input[type=radio]:checked+*,html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] input[type=radio]:focus+*,html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] input[type=radio]:hover+*{box-shadow:var(--token-elevation-high-box-shadow);background-color:var(--token-color-surface-primary)}@media (min-width:996px){html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup]{display:flex}html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] label{flex-grow:1}}html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] input[type=radio]{display:none}.app-view>div form:not(.filter-bar) [role=radiogroup] label,.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea,.app-view>div form:not(.filter-bar) [role=radiogroup] label>em,.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.modal-dialog [role=document] .type-password,.modal-dialog [role=document] .type-password textarea,.modal-dialog [role=document] .type-password>em,.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select,.modal-dialog [role=document] .type-select textarea,.modal-dialog [role=document] .type-select>em,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text,.modal-dialog [role=document] .type-text textarea,.modal-dialog [role=document] .type-text>em,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label,.modal-dialog [role=document] [role=radiogroup] label textarea,.modal-dialog [role=document] [role=radiogroup] label>em,.modal-dialog [role=document] [role=radiogroup] label>span,.modal-dialog [role=document] form button+em,.oidc-select label,.oidc-select label textarea,.oidc-select label>em,.oidc-select label>span,.type-toggle,.type-toggle textarea,.type-toggle>em,.type-toggle>span,html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] label,html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] label span,main .type-password,main .type-password textarea,main .type-password>em,main .type-password>span,main .type-select,main .type-select textarea,main .type-select>em,main .type-select>span,main .type-text,main .type-text textarea,main .type-text>em,main .type-text>span,main form button+em,span.label{display:block}html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup],html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] label,html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] label span{height:100%}html[data-route^="dc.acls.index"] .filter-bar [role=radiogroup] label span{padding:5px 14px}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password],.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text],.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea,.modal-dialog [role=document] .type-password [type=password],.modal-dialog [role=document] .type-password [type=text],.modal-dialog [role=document] .type-password textarea,.modal-dialog [role=document] .type-select [type=password],.modal-dialog [role=document] .type-select [type=text],.modal-dialog [role=document] .type-select textarea,.modal-dialog [role=document] .type-text [type=password],.modal-dialog [role=document] .type-text [type=text],.modal-dialog [role=document] .type-text textarea,.modal-dialog [role=document] [role=radiogroup] label [type=password],.modal-dialog [role=document] [role=radiogroup] label [type=text],.modal-dialog [role=document] [role=radiogroup] label textarea,.oidc-select label [type=password],.oidc-select label [type=text],.oidc-select label textarea,.type-toggle [type=password],.type-toggle [type=text],.type-toggle textarea,main .type-password [type=password],main .type-password [type=text],main .type-password textarea,main .type-select [type=password],main .type-select [type=text],main .type-select textarea,main .type-text [type=password],main .type-text [type=text],main .type-text textarea{-moz-appearance:none;-webkit-appearance:none;box-shadow:var(--token-surface-inset-box-shadow);border-radius:var(--decor-radius-100);border:var(--decor-border-100);outline:0}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password]:-moz-read-only,.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text]:-moz-read-only,.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea:-moz-read-only,.modal-dialog [role=document] .type-password [type=password]:-moz-read-only,.modal-dialog [role=document] .type-password [type=text]:-moz-read-only,.modal-dialog [role=document] .type-password textarea:-moz-read-only,.modal-dialog [role=document] .type-select [type=password]:-moz-read-only,.modal-dialog [role=document] .type-select [type=text]:-moz-read-only,.modal-dialog [role=document] .type-select textarea:-moz-read-only,.modal-dialog [role=document] .type-text [type=password]:-moz-read-only,.modal-dialog [role=document] .type-text [type=text]:-moz-read-only,.modal-dialog [role=document] .type-text textarea:-moz-read-only,.modal-dialog [role=document] [role=radiogroup] label [type=password]:-moz-read-only,.modal-dialog [role=document] [role=radiogroup] label [type=text]:-moz-read-only,.modal-dialog [role=document] [role=radiogroup] label textarea:-moz-read-only,.oidc-select label [type=password]:-moz-read-only,.oidc-select label [type=text]:-moz-read-only,.oidc-select label textarea:-moz-read-only,.type-toggle [type=password]:-moz-read-only,.type-toggle [type=text]:-moz-read-only,.type-toggle textarea:-moz-read-only,main .type-password [type=password]:-moz-read-only,main .type-password [type=text]:-moz-read-only,main .type-password textarea:-moz-read-only,main .type-select [type=password]:-moz-read-only,main .type-select [type=text]:-moz-read-only,main .type-select textarea:-moz-read-only,main .type-text [type=password]:-moz-read-only,main .type-text [type=text]:-moz-read-only,main .type-text textarea:-moz-read-only{cursor:not-allowed}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password]:disabled,.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password]:read-only,.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text]:disabled,.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text]:read-only,.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea:disabled,.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea:read-only,.modal-dialog [role=document] .type-password [type=password]:disabled,.modal-dialog [role=document] .type-password [type=password]:read-only,.modal-dialog [role=document] .type-password [type=text]:disabled,.modal-dialog [role=document] .type-password [type=text]:read-only,.modal-dialog [role=document] .type-password textarea:disabled,.modal-dialog [role=document] .type-password textarea:read-only,.modal-dialog [role=document] .type-select [type=password]:disabled,.modal-dialog [role=document] .type-select [type=password]:read-only,.modal-dialog [role=document] .type-select [type=text]:disabled,.modal-dialog [role=document] .type-select [type=text]:read-only,.modal-dialog [role=document] .type-select textarea:disabled,.modal-dialog [role=document] .type-select textarea:read-only,.modal-dialog [role=document] .type-text [type=password]:disabled,.modal-dialog [role=document] .type-text [type=password]:read-only,.modal-dialog [role=document] .type-text [type=text]:disabled,.modal-dialog [role=document] .type-text [type=text]:read-only,.modal-dialog [role=document] .type-text textarea:disabled,.modal-dialog [role=document] .type-text textarea:read-only,.modal-dialog [role=document] [role=radiogroup] label [type=password]:disabled,.modal-dialog [role=document] [role=radiogroup] label [type=password]:read-only,.modal-dialog [role=document] [role=radiogroup] label [type=text]:disabled,.modal-dialog [role=document] [role=radiogroup] label [type=text]:read-only,.modal-dialog [role=document] [role=radiogroup] label textarea:disabled,.modal-dialog [role=document] [role=radiogroup] label textarea:read-only,.oidc-select label [type=password]:disabled,.oidc-select label [type=password]:read-only,.oidc-select label [type=text]:disabled,.oidc-select label [type=text]:read-only,.oidc-select label textarea:disabled,.oidc-select label textarea:read-only,.type-toggle [type=password]:disabled,.type-toggle [type=password]:read-only,.type-toggle [type=text]:disabled,.type-toggle [type=text]:read-only,.type-toggle textarea:disabled,.type-toggle textarea:read-only,main .type-password [type=password]:disabled,main .type-password [type=password]:read-only,main .type-password [type=text]:disabled,main .type-password [type=text]:read-only,main .type-password textarea:disabled,main .type-password textarea:read-only,main .type-select [type=password]:disabled,main .type-select [type=password]:read-only,main .type-select [type=text]:disabled,main .type-select [type=text]:read-only,main .type-select textarea:disabled,main .type-select textarea:read-only,main .type-text [type=password]:disabled,main .type-text [type=password]:read-only,main .type-text [type=text]:disabled,main .type-text [type=text]:read-only,main .type-text textarea:disabled,main .type-text textarea:read-only,textarea:disabled+.CodeMirror{cursor:not-allowed}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password]::-moz-placeholder,.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text]::-moz-placeholder,.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea::-moz-placeholder,.modal-dialog [role=document] .type-password [type=password]::-moz-placeholder,.modal-dialog [role=document] .type-password [type=text]::-moz-placeholder,.modal-dialog [role=document] .type-password textarea::-moz-placeholder,.modal-dialog [role=document] .type-select [type=password]::-moz-placeholder,.modal-dialog [role=document] .type-select [type=text]::-moz-placeholder,.modal-dialog [role=document] .type-select textarea::-moz-placeholder,.modal-dialog [role=document] .type-text [type=password]::-moz-placeholder,.modal-dialog [role=document] .type-text [type=text]::-moz-placeholder,.modal-dialog [role=document] .type-text textarea::-moz-placeholder,.modal-dialog [role=document] [role=radiogroup] label [type=password]::-moz-placeholder,.modal-dialog [role=document] [role=radiogroup] label [type=text]::-moz-placeholder,.modal-dialog [role=document] [role=radiogroup] label textarea::-moz-placeholder,.oidc-select label [type=password]::-moz-placeholder,.oidc-select label [type=text]::-moz-placeholder,.oidc-select label textarea::-moz-placeholder,.type-toggle [type=password]::-moz-placeholder,.type-toggle [type=text]::-moz-placeholder,.type-toggle textarea::-moz-placeholder,main .type-password [type=password]::-moz-placeholder,main .type-password [type=text]::-moz-placeholder,main .type-password textarea::-moz-placeholder,main .type-select [type=password]::-moz-placeholder,main .type-select [type=text]::-moz-placeholder,main .type-select textarea::-moz-placeholder,main .type-text [type=password]::-moz-placeholder,main .type-text [type=text]::-moz-placeholder,main .type-text textarea::-moz-placeholder{color:var(--token-color-foreground-disabled)}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password]::placeholder,.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text]::placeholder,.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea::placeholder,.app-view>div form:not(.filter-bar) [role=radiogroup] label>em,.modal-dialog [role=document] .type-password [type=password]::placeholder,.modal-dialog [role=document] .type-password [type=text]::placeholder,.modal-dialog [role=document] .type-password textarea::placeholder,.modal-dialog [role=document] .type-password>em,.modal-dialog [role=document] .type-select [type=password]::placeholder,.modal-dialog [role=document] .type-select [type=text]::placeholder,.modal-dialog [role=document] .type-select textarea::placeholder,.modal-dialog [role=document] .type-select>em,.modal-dialog [role=document] .type-text [type=password]::placeholder,.modal-dialog [role=document] .type-text [type=text]::placeholder,.modal-dialog [role=document] .type-text textarea::placeholder,.modal-dialog [role=document] .type-text>em,.modal-dialog [role=document] [role=radiogroup] label [type=password]::placeholder,.modal-dialog [role=document] [role=radiogroup] label [type=text]::placeholder,.modal-dialog [role=document] [role=radiogroup] label textarea::placeholder,.modal-dialog [role=document] [role=radiogroup] label>em,.modal-dialog [role=document] form button+em,.modal-dialog [role=document] form fieldset>p,.oidc-select label [type=password]::placeholder,.oidc-select label [type=text]::placeholder,.oidc-select label textarea::placeholder,.oidc-select label>em,.type-toggle [type=password]::placeholder,.type-toggle [type=text]::placeholder,.type-toggle textarea::placeholder,.type-toggle>em,main .type-password [type=password]::placeholder,main .type-password [type=text]::placeholder,main .type-password textarea::placeholder,main .type-password>em,main .type-select [type=password]::placeholder,main .type-select [type=text]::placeholder,main .type-select textarea::placeholder,main .type-select>em,main .type-text [type=password]::placeholder,main .type-text [type=text]::placeholder,main .type-text textarea::placeholder,main .type-text>em,main form button+em,main form fieldset>p{color:var(--token-color-foreground-disabled)}.has-error>input,.has-error>textarea{border-color:var(--decor-error,var(--token-color-foreground-critical))!important}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password],.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text],.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea,.modal-dialog [role=document] .type-password [type=password],.modal-dialog [role=document] .type-password [type=text],.modal-dialog [role=document] .type-password textarea,.modal-dialog [role=document] .type-select [type=password],.modal-dialog [role=document] .type-select [type=text],.modal-dialog [role=document] .type-select textarea,.modal-dialog [role=document] .type-text [type=password],.modal-dialog [role=document] .type-text [type=text],.modal-dialog [role=document] .type-text textarea,.modal-dialog [role=document] [role=radiogroup] label [type=password],.modal-dialog [role=document] [role=radiogroup] label [type=text],.modal-dialog [role=document] [role=radiogroup] label textarea,.oidc-select label [type=password],.oidc-select label [type=text],.oidc-select label textarea,.type-toggle [type=password],.type-toggle [type=text],.type-toggle textarea,main .type-password [type=password],main .type-password [type=text],main .type-password textarea,main .type-select [type=password],main .type-select [type=text],main .type-select textarea,main .type-text [type=password],main .type-text [type=text],main .type-text textarea{color:var(--token-color-foreground-faint);border-color:var(--token-color-palette-neutral-300)}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password]:hover,.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text]:hover,.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea:hover,.modal-dialog [role=document] .type-password [type=password]:hover,.modal-dialog [role=document] .type-password [type=text]:hover,.modal-dialog [role=document] .type-password textarea:hover,.modal-dialog [role=document] .type-select [type=password]:hover,.modal-dialog [role=document] .type-select [type=text]:hover,.modal-dialog [role=document] .type-select textarea:hover,.modal-dialog [role=document] .type-text [type=password]:hover,.modal-dialog [role=document] .type-text [type=text]:hover,.modal-dialog [role=document] .type-text textarea:hover,.modal-dialog [role=document] [role=radiogroup] label [type=password]:hover,.modal-dialog [role=document] [role=radiogroup] label [type=text]:hover,.modal-dialog [role=document] [role=radiogroup] label textarea:hover,.oidc-select label [type=password]:hover,.oidc-select label [type=text]:hover,.oidc-select label textarea:hover,.type-toggle [type=password]:hover,.type-toggle [type=text]:hover,.type-toggle textarea:hover,main .type-password [type=password]:hover,main .type-password [type=text]:hover,main .type-password textarea:hover,main .type-select [type=password]:hover,main .type-select [type=text]:hover,main .type-select textarea:hover,main .type-text [type=password]:hover,main .type-text [type=text]:hover,main .type-text textarea:hover{border-color:var(--token-color-foreground-faint)}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password]:focus,.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text]:focus,.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea:focus,.modal-dialog [role=document] .type-password [type=password]:focus,.modal-dialog [role=document] .type-password [type=text]:focus,.modal-dialog [role=document] .type-password textarea:focus,.modal-dialog [role=document] .type-select [type=password]:focus,.modal-dialog [role=document] .type-select [type=text]:focus,.modal-dialog [role=document] .type-select textarea:focus,.modal-dialog [role=document] .type-text [type=password]:focus,.modal-dialog [role=document] .type-text [type=text]:focus,.modal-dialog [role=document] .type-text textarea:focus,.modal-dialog [role=document] [role=radiogroup] label [type=password]:focus,.modal-dialog [role=document] [role=radiogroup] label [type=text]:focus,.modal-dialog [role=document] [role=radiogroup] label textarea:focus,.oidc-select label [type=password]:focus,.oidc-select label [type=text]:focus,.oidc-select label textarea:focus,.type-toggle [type=password]:focus,.type-toggle [type=text]:focus,.type-toggle textarea:focus,main .type-password [type=password]:focus,main .type-password [type=text]:focus,main .type-password textarea:focus,main .type-select [type=password]:focus,main .type-select [type=text]:focus,main .type-select textarea:focus,main .type-text [type=password]:focus,main .type-text [type=text]:focus,main .type-text textarea:focus{border-color:var(--typo-action,var(--token-color-foreground-action))}.app-view>div form:not(.filter-bar) [role=radiogroup] label a,.modal-dialog [role=document] .type-password a,.modal-dialog [role=document] .type-select a,.modal-dialog [role=document] .type-text a,.modal-dialog [role=document] [role=radiogroup] label a,.oidc-select label a,.type-toggle a,main .type-password a,main .type-select a,main .type-text a{display:inline}.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=password],.app-view>div form:not(.filter-bar) [role=radiogroup] label [type=text],.modal-dialog [role=document] .type-password [type=password],.modal-dialog [role=document] .type-password [type=text],.modal-dialog [role=document] .type-select [type=password],.modal-dialog [role=document] .type-select [type=text],.modal-dialog [role=document] .type-text [type=password],.modal-dialog [role=document] .type-text [type=text],.modal-dialog [role=document] [role=radiogroup] label [type=password],.modal-dialog [role=document] [role=radiogroup] label [type=text],.oidc-select label [type=password],.oidc-select label [type=text],.type-toggle [type=password],.type-toggle [type=text],main .type-password [type=password],main .type-password [type=text],main .type-select [type=password],main .type-select [type=text],main .type-text [type=password],main .type-text [type=text]{display:inline-flex;justify-content:flex-start;max-width:100%;width:100%;height:0;padding:17px 13px}.app-view>div form:not(.filter-bar) [role=radiogroup] label textarea,.modal-dialog [role=document] .type-password textarea,.modal-dialog [role=document] .type-select textarea,.modal-dialog [role=document] .type-text textarea,.modal-dialog [role=document] [role=radiogroup] label textarea,.oidc-select label textarea,.type-toggle textarea,main .type-password textarea,main .type-select textarea,main .type-text textarea{resize:vertical;max-width:100%;min-width:100%;min-height:70px;padding:6px 13px}.app-view>div form:not(.filter-bar) [role=radiogroup],.app-view>div form:not(.filter-bar) [role=radiogroup] label,.checkbox-group,.modal-dialog [role=document] .type-password,.modal-dialog [role=document] .type-select,.modal-dialog [role=document] .type-text,.modal-dialog [role=document] [role=radiogroup],.modal-dialog [role=document] [role=radiogroup] label,.modal-dialog [role=document] form table,.oidc-select label,.type-toggle,main .type-password,main .type-select,main .type-text,main form table{margin-bottom:1.4em}.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label>span,.oidc-select label>span,.type-toggle>span,main .type-password>span,main .type-select>span,main .type-text>span,span.label{color:var(--typo-contrast,inherit);margin-bottom:.3em}.app-view>div form:not(.filter-bar) [role=radiogroup] label>em,.modal-dialog [role=document] .type-password>em,.modal-dialog [role=document] .type-select>em,.modal-dialog [role=document] .type-text>em,.modal-dialog [role=document] [role=radiogroup] label>em,.modal-dialog [role=document] form button+em,.oidc-select label>em,.type-toggle>em,main .type-password>em,main .type-select>em,main .type-text>em,main form button+em{margin-top:2px}.app-view>div form:not(.filter-bar) [role=radiogroup] label>span+em,.modal-dialog [role=document] .type-password>span+em,.modal-dialog [role=document] .type-select>span+em,.modal-dialog [role=document] .type-text>span+em,.modal-dialog [role=document] [role=radiogroup] label>span+em,.oidc-select label>span+em,.type-toggle>span+em,main .type-password>span+em,main .type-select>span+em,main .type-text>span+em,span.label+em{margin-top:-.5em;margin-bottom:.5em}.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] label.type-text>span,main .type-password>span,main .type-select>span,main label.type-text>span{line-height:2.2em}.type-toggle+.checkbox-group{margin-top:-1em}.consul-exposed-path-list>ul>li,.consul-intention-permission-header-list>ul>li,.consul-intention-permission-list>ul>li,.consul-lock-session-list ul>li:not(:first-child),.consul-upstream-instance-list li,.list-collection>ul>li:not(:first-child){list-style-type:none;border:var(--decor-border-100);border-top-color:transparent;border-bottom-color:var(--token-color-surface-interactive-active);border-right-color:transparent;border-left-color:transparent;--horizontal-padding:12px;--vertical-padding:10px;padding:var(--vertical-padding) 0;padding-left:var(--horizontal-padding)}.consul-auth-method-list>ul>li:active:not(:first-child),.consul-auth-method-list>ul>li:focus:not(:first-child),.consul-auth-method-list>ul>li:hover:not(:first-child),.consul-exposed-path-list>ul>li.linkable:active,.consul-exposed-path-list>ul>li.linkable:focus,.consul-exposed-path-list>ul>li.linkable:hover,.consul-intention-permission-list:not(.readonly)>ul>li:active,.consul-intention-permission-list:not(.readonly)>ul>li:focus,.consul-intention-permission-list:not(.readonly)>ul>li:hover,.consul-lock-session-list ul>li.linkable:active:not(:first-child),.consul-lock-session-list ul>li.linkable:focus:not(:first-child),.consul-lock-session-list ul>li.linkable:hover:not(:first-child),.consul-node-list>ul>li:active:not(:first-child),.consul-node-list>ul>li:focus:not(:first-child),.consul-node-list>ul>li:hover:not(:first-child),.consul-policy-list>ul>li:active:not(:first-child),.consul-policy-list>ul>li:focus:not(:first-child),.consul-policy-list>ul>li:hover:not(:first-child),.consul-role-list>ul>li:active:not(:first-child),.consul-role-list>ul>li:focus:not(:first-child),.consul-role-list>ul>li:hover:not(:first-child),.consul-service-instance-list>ul>li:active:not(:first-child),.consul-service-instance-list>ul>li:focus:not(:first-child),.consul-service-instance-list>ul>li:hover:not(:first-child),.consul-token-list>ul>li:active:not(:first-child),.consul-token-list>ul>li:focus:not(:first-child),.consul-token-list>ul>li:hover:not(:first-child),.consul-upstream-instance-list li.linkable:active,.consul-upstream-instance-list li.linkable:focus,.consul-upstream-instance-list li.linkable:hover,.list-collection>ul>li.linkable:active:not(:first-child),.list-collection>ul>li.linkable:focus:not(:first-child),.list-collection>ul>li.linkable:hover:not(:first-child){border-color:var(--token-color-surface-interactive-active);box-shadow:var(--token-elevation-high-box-shadow);border-top-color:transparent;cursor:pointer}.radio-card,.tippy-box{box-shadow:var(--token-surface-mid-box-shadow)}.consul-exposed-path-list>ul>li>.header,.consul-lock-session-list ul>li:not(:first-child)>.header,.consul-upstream-instance-list li>.header,.list-collection>ul>li:not(:first-child)>.header{color:var(--token-color-hashicorp-brand)}.consul-exposed-path-list>ul>li>.header *,.consul-lock-session-list ul>li:not(:first-child)>.header *,.consul-upstream-instance-list li>.header *,.list-collection>ul>li:not(:first-child)>.header *{color:inherit}.consul-exposed-path-list>ul>li>.detail,.consul-lock-session-list ul>li:not(:first-child)>.detail,.consul-upstream-instance-list li>.detail,.list-collection>ul>li:not(:first-child)>.detail,.radio-card{color:var(--token-color-foreground-faint)}.consul-exposed-path-list>ul>li>.detail a,.consul-lock-session-list ul>li:not(:first-child)>.detail a,.consul-upstream-instance-list li>.detail a,.list-collection>ul>li:not(:first-child)>.detail a{color:inherit}.consul-exposed-path-list>ul>li>.detail a:hover,.consul-lock-session-list ul>li:not(:first-child)>.detail a:hover,.consul-upstream-instance-list li>.detail a:hover,.list-collection>ul>li:not(:first-child)>.detail a:hover{color:var(--token-color-foreground-action);text-decoration:underline}.consul-exposed-path-list>ul>li>.header dt,.consul-lock-session-list ul>li:not(:first-child)>.header dt,.consul-upstream-instance-list li>.header dt,.list-collection>ul>li:not(:first-child)>.header dt{display:none}.consul-exposed-path-list>ul>li>.header dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header dd::before,.consul-upstream-instance-list li>.header dd::before,.list-collection>ul>li:not(:first-child)>.header dd::before{font-size:.9em}.consul-exposed-path-list>ul>li>.detail,.consul-exposed-path-list>ul>li>.header,.consul-lock-session-list ul>li:not(:first-child)>.detail,.consul-lock-session-list ul>li:not(:first-child)>.header,.consul-upstream-instance-list li>.detail,.consul-upstream-instance-list li>.header,.list-collection>ul>li:not(:first-child)>.detail,.list-collection>ul>li:not(:first-child)>.header{display:flex;flex-wrap:nowrap;overflow-x:hidden}.consul-exposed-path-list>ul>li>.detail *,.consul-exposed-path-list>ul>li>.header *,.consul-lock-session-list ul>li:not(:first-child)>.detail *,.consul-lock-session-list ul>li:not(:first-child)>.header *,.consul-upstream-instance-list li>.detail *,.consul-upstream-instance-list li>.header *,.list-collection>ul>li:not(:first-child)>.detail *,.list-collection>ul>li:not(:first-child)>.header *{white-space:nowrap;flex-wrap:nowrap}.consul-exposed-path-list>ul>li>.detail>span,.consul-lock-session-list ul>li:not(:first-child)>.detail>span,.consul-upstream-instance-list li>.detail>span,.list-collection>ul>li:not(:first-child)>.detail>span{margin-right:18px}.consul-intention-permission-header-list>ul>li,.consul-intention-permission-list>ul>li{padding-top:0!important;padding-bottom:0!important}.consul-intention-permission-header-list>ul>li .detail,.consul-intention-permission-list>ul>li .detail{grid-row-start:header!important;grid-row-end:detail!important;align-self:center!important;padding:5px 0}.consul-intention-permission-header-list>ul>li .popover-menu>[type=checkbox]+label,.consul-intention-permission-list>ul>li .popover-menu>[type=checkbox]+label{padding:0}.consul-intention-permission-header-list>ul>li .popover-menu>[type=checkbox]+label+div:not(.above),.consul-intention-permission-list>ul>li .popover-menu>[type=checkbox]+label+div:not(.above){top:30px}.has-error>strong{font-style:normal;font-weight:400;color:inherit;color:var(--token-color-foreground-critical);position:relative;padding-left:20px}.has-error>strong::before{font-size:14px;color:var(--token-color-foreground-critical);position:absolute;top:50%;left:0;margin-top:-8px}.more-popover-menu .popover-menu>[type=checkbox]+label,table.has-actions tr>.actions .popover-menu>[type=checkbox]+label,table.with-details tr>.actions .popover-menu>[type=checkbox]+label{padding:7px}.more-popover-menu .popover-menu>[type=checkbox]+label>*,table.has-actions tr>.actions .popover-menu>[type=checkbox]+label>*,table.with-details tr>.actions .popover-menu>[type=checkbox]+label>*{background-color:transparent;border-radius:var(--decor-radius-100);width:30px;height:30px;font-size:0}.more-popover-menu .popover-menu>[type=checkbox]+label>:active,.more-popover-menu .popover-menu>[type=checkbox]+label>:focus,.more-popover-menu .popover-menu>[type=checkbox]+label>:hover,.radio-card>:first-child,table.has-actions tr>.actions .popover-menu>[type=checkbox]+label>:active,table.has-actions tr>.actions .popover-menu>[type=checkbox]+label>:focus,table.has-actions tr>.actions .popover-menu>[type=checkbox]+label>:hover,table.with-details td:only-child>div>label:active,table.with-details td:only-child>div>label:focus,table.with-details td:only-child>div>label:hover,table.with-details td>label:active,table.with-details td>label:focus,table.with-details td>label:hover,table.with-details tr>.actions .popover-menu>[type=checkbox]+label>:active,table.with-details tr>.actions .popover-menu>[type=checkbox]+label>:focus,table.with-details tr>.actions .popover-menu>[type=checkbox]+label>:hover{background-color:var(--token-color-surface-strong)}.more-popover-menu .popover-menu>[type=checkbox]+label>::after,table.has-actions tr>.actions .popover-menu>[type=checkbox]+label>::after,table.with-details tr>.actions .popover-menu>[type=checkbox]+label>::after{--icon-name:icon-more-horizontal;--icon-color:var(--token-color-foreground-strong);--icon-size:icon-300;content:"";position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}.oidc-select [class$=-oidc-provider]::before{width:22px;height:22px;flex:0 0 auto;margin-right:10px}.oidc-select .ember-power-select-trigger,.oidc-select li{margin-bottom:1em}.informed-action header,.radio-card header{margin-bottom:.5em}.oidc-select .ember-power-select-trigger{width:100%}.radio-card{border:var(--decor-border-100);border-radius:var(--decor-radius-100);border-color:var(--token-color-surface-interactive-active);cursor:pointer;float:none!important;margin-right:0!important;display:flex!important}.checked.radio-card{border-color:var(--token-color-foreground-action)}.checked.radio-card>:first-child{background-color:var(--token-color-surface-action)}.radio-card header{color:var(--token-color-hashicorp-brand)}.consul-intention-fieldsets .radio-card>:last-child{padding-left:47px;position:relative}.consul-intention-fieldsets .radio-card>:last-child::before{position:absolute;left:14px;font-size:1rem}.radio-card>:first-child{padding:10px;display:grid;align-items:center;justify-items:center}.radio-card>:last-child{padding:18px}.consul-server-card,.disclosure-menu [aria-expanded]~*,.menu-panel,.more-popover-menu>[type=checkbox]+label+div,.popover-menu>[type=checkbox]+label+div,section[data-route="dc.show.license"] aside,section[data-route="dc.show.serverstatus"] .server-failure-tolerance,table.has-actions tr>.actions>[type=checkbox]+label+div,table.with-details tr>.actions>[type=checkbox]+label+div{--tone-border:var(--token-color-palette-neutral-300);border:var(--decor-border-100);border-radius:var(--decor-radius-200);box-shadow:var(--token-surface-high-box-shadow);color:var(--token-color-foreground-strong);background-color:var(--token-color-surface-primary);--padding-x:14px;--padding-y:14px;position:relative}.disclosure-menu [aria-expanded]~* [role=separator],.menu-panel [role=separator],.more-popover-menu>[type=checkbox]+label+div [role=separator],.popover-menu>[type=checkbox]+label+div [role=separator],table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator],table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]{border-top:var(--decor-border-100);margin:0}.consul-server-card,.disclosure-menu [aria-expanded]~*,.disclosure-menu [aria-expanded]~* [role=separator],.menu-panel,.menu-panel [role=separator],.more-popover-menu>[type=checkbox]+label+div,.more-popover-menu>[type=checkbox]+label+div [role=separator],.popover-menu>[type=checkbox]+label+div,.popover-menu>[type=checkbox]+label+div [role=separator],section[data-route="dc.show.license"] aside,section[data-route="dc.show.serverstatus"] .server-failure-tolerance,table.has-actions tr>.actions>[type=checkbox]+label+div,table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator],table.with-details tr>.actions>[type=checkbox]+label+div,table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]{border-color:var(--tone-border)}.paged-collection-scroll,[style*="--paged-row-height"]{overflow-y:auto!important;will-change:scrollPosition}[style*="--paged-start"]::before{content:"";display:block;height:var(--paged-start)}.consul-auth-method-type,.consul-external-source,.consul-health-check-list .health-check-output dd em,.consul-intention-list td strong,.consul-intention-permission-list strong,.consul-intention-search-bar li button span,.consul-kind,.consul-peer-search-bar li button span,.consul-server-card .health-status+dd,.consul-source,.consul-transparent-proxy,.discovery-chain .route-card>header ul li,.hashicorp-consul nav .dcs .dc-name span,.hashicorp-consul nav .dcs li.is-local span,.hashicorp-consul nav .dcs li.is-primary span,.leader,.search-bar-status li:not(.remove-all),.topology-metrics-source-type,html[data-route^="dc.acls.index"] main td strong,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em,span.policy-node-identity,span.policy-service-identity{border-radius:var(--decor-radius-100);display:inline-flex;position:relative;align-items:center;white-space:nowrap}.consul-auth-method-type::before,.consul-external-source::before,.consul-health-check-list .health-check-output dd em::before,.consul-intention-list td strong::before,.consul-intention-permission-list strong::before,.consul-intention-search-bar li button span::before,.consul-kind::before,.consul-peer-search-bar li button span::before,.consul-server-card .health-status+dd::before,.consul-source::before,.consul-transparent-proxy::before,.discovery-chain .route-card>header ul li::before,.hashicorp-consul nav .dcs .dc-name span::before,.hashicorp-consul nav .dcs li.is-local span::before,.hashicorp-consul nav .dcs li.is-primary span::before,.leader::before,.search-bar-status li:not(.remove-all)::before,.topology-metrics-source-type::before,html[data-route^="dc.acls.index"] main td strong::before,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl::before,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em::before,span.policy-node-identity::before,span.policy-service-identity::before{margin-right:4px;--icon-size:icon-300}.consul-auth-method-type,.consul-external-source,.consul-kind,.consul-server-card .health-status+dd,.consul-source,.consul-transparent-proxy,.hashicorp-consul nav .dcs .dc-name span,.leader,.search-bar-status li:not(.remove-all),.topology-metrics-source-type,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em,span.policy-node-identity,span.policy-service-identity{padding:0 8px;--icon-size:icon-200}.consul-intention-permission-list strong,.consul-peer-search-bar li button span,.discovery-chain .route-card>header ul li,html[data-route^="dc.acls.index"] main td strong,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl{padding:1px 5px}.consul-intention-list td strong,.consul-intention-search-bar li button span{padding:4px 8px}span.policy-node-identity::before,span.policy-service-identity::before{vertical-align:unset}span.policy-node-identity::before{content:"Node Identity: "}span.policy-service-identity::before{content:"Service Identity: "}.more-popover-menu>[type=checkbox]+label>*,.popover-menu>[type=checkbox]+label>*,table.has-actions tr>.actions>[type=checkbox]+label>*,table.with-details tr>.actions>[type=checkbox]+label>*{cursor:pointer}.more-popover-menu>[type=checkbox]+label>::after,.popover-menu>[type=checkbox]+label>::after,table.has-actions tr>.actions>[type=checkbox]+label>::after,table.with-details tr>.actions>[type=checkbox]+label>::after{width:16px;height:16px;position:relative}.more-popover-menu,.popover-menu,table.has-actions tr>.actions,table.with-details tr>.actions{position:relative}.more-popover-menu>[type=checkbox]+label,.popover-menu>[type=checkbox]+label,table.has-actions tr>.actions>[type=checkbox]+label,table.with-details tr>.actions>[type=checkbox]+label{display:block}.more-popover-menu>[type=checkbox]+label+div,.popover-menu>[type=checkbox]+label+div,table.has-actions tr>.actions>[type=checkbox]+label+div,table.with-details tr>.actions>[type=checkbox]+label+div{min-width:192px}.more-popover-menu>[type=checkbox]+label+div:not(.above),.popover-menu>[type=checkbox]+label+div:not(.above),table.has-actions tr>.actions>[type=checkbox]+label+div:not(.above),table.with-details tr>.actions>[type=checkbox]+label+div:not(.above){top:38px}.more-popover-menu>[type=checkbox]+label+div:not(.left),.popover-menu>[type=checkbox]+label+div:not(.left),table.has-actions tr>.actions>[type=checkbox]+label+div:not(.left),table.with-details tr>.actions>[type=checkbox]+label+div:not(.left){right:5px}.popover-menu .menu-panel{position:absolute!important}.popover-select label{height:100%}.popover-select label>*{padding:0 8px!important;height:100%!important;justify-content:space-between!important;min-width:auto!important}.popover-select label>::after{margin-left:6px}.popover-select button::before{margin-right:10px}.popover-select .value-passing button::before{color:var(--token-color-foreground-success)}.popover-select .value-warning button::before{color:var(--token-color-foreground-warning)}.popover-select .value-critical button::before{color:var(--token-color-foreground-critical)}.popover-select .value-empty button::before{color:var(--token-color-foreground-disabled)}.popover-select .value-unknown button::before,.type-source.popover-select li.partition button::before{color:var(--token-color-foreground-faint)}.type-source.popover-select li.aws button{text-transform:uppercase}.progress.indeterminate{width:100%;display:flex;align-items:center;justify-content:center;--icon-size:icon-700;--icon-name:var(--icon-loading);--icon-color:var(--token-color-foreground-faint)}.progress.indeterminate::before{content:""}.app-view>div form:not(.filter-bar) [role=radiogroup],.modal-dialog [role=document] [role=radiogroup]{overflow:hidden;padding-left:1px}.app-view>div form:not(.filter-bar) [role=radiogroup] label,.modal-dialog [role=document] [role=radiogroup] label{float:left}.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.modal-dialog [role=document] [role=radiogroup] label>span{float:right;margin-left:1em}.app-view>div form:not(.filter-bar) [role=radiogroup] label:not(:last-child),.modal-dialog [role=document] [role=radiogroup] label:not(:last-child){margin-right:25px}.app-view>div form:not(.filter-bar) [role=radiogroup] label,.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.modal-dialog [role=document] [role=radiogroup] label,.modal-dialog [role=document] [role=radiogroup] label>span{margin-bottom:0!important}.type-toggle label span{cursor:pointer}.type-toggle label span::after{border-radius:var(--decor-radius-full)}.type-toggle label span::before{border-radius:7px;left:0;width:24px;height:12px;margin-top:-5px}.type-negative.type-toggle{border:0}.app-view>header .title,.modal-dialog [role=document] table td,.modal-dialog [role=document] table th,main table td,main table th{border-bottom:var(--decor-border-100)}.type-toggle label span::after{background-color:var(--token-color-surface-primary);margin-top:-3px;width:8px;height:8px}.app .skip-links,.type-negative.type-toggle label input+span::before,.type-toggle label input:checked+span::before{background-color:var(--token-color-foreground-action)}.type-negative.type-toggle label input:checked+span::before,.type-toggle label span::before{background-color:var(--token-color-palette-neutral-300)}.type-toggle label{position:relative}.type-toggle input{display:none}.type-toggle label span{color:var(--token-color-foreground-strong);display:inline-block;padding-left:34px}.type-toggle label span::after,.type-toggle label span::before{position:absolute;display:block;content:"";top:50%}.type-negative.type-toggle label input+span::after,.type-toggle label input:checked+span::after{left:14px}.type-negative.type-toggle label input:checked+span::after,.type-toggle label span::after{left:2px}.modal-dialog [role=document] table th,main table th{border-color:var(--token-color-palette-neutral-300);padding:.6em 0}.modal-dialog [role=document] table td,main table td{border-color:var(--token-color-surface-interactive-active);color:var(--token-color-foreground-faint);height:50px;vertical-align:middle}.modal-dialog [role=document] table td strong,.modal-dialog [role=document] table th,main table td strong,main table th{color:var(--token-color-foreground-faint)}.consul-intention-list td.destination,.consul-intention-list td.source,.modal-dialog [role=document] table a,.modal-dialog [role=document] table td:first-child,.tomography-graph .tick text,main table a,main table td:first-child{color:var(--token-color-foreground-strong)}.modal-dialog [role=document] table,main table{width:100%;border-collapse:collapse}table.dom-recycling tr{display:flex}table.dom-recycling tr>*{flex:1 1 auto;display:inline-flex;align-items:center}.modal-dialog [role=document] table caption,.modal-dialog [role=document] table thead th,main table caption,main table thead th{text-align:left}.modal-dialog [role=document] table th.actions input,main table th.actions input{display:none}.modal-dialog [role=document] table th.actions,main table th.actions{text-align:right}.modal-dialog [role=document] table td a,main table td a{display:block}.modal-dialog [role=document] table td.no-actions~.actions,main table td.no-actions~.actions{display:none}.modal-dialog [role=document] table td:not(.actions)>:only-child,main table td:not(.actions)>:only-child{overflow:hidden;text-overflow:ellipsis}.modal-dialog [role=document] table td:not(.actions)>*,main table td:not(.actions)>*{white-space:nowrap}.modal-dialog [role=document] table caption,main table caption{margin-bottom:.8em}.modal-dialog [role=document] table td a,.modal-dialog [role=document] table td:not(.actions),.modal-dialog [role=document] table th:not(.actions),main table td a,main table td:not(.actions),main table th:not(.actions){padding-right:.9em}.modal-dialog [role=document] table tbody td em,main table tbody td em{display:block;font-style:normal;font-weight:400;color:var(--token-color-foreground-faint)}table.has-actions tr>.actions,table.with-details tr>.actions{width:60px!important;overflow:visible}table.has-actions tr>.actions>[type=checkbox]+label,table.with-details tr>.actions>[type=checkbox]+label{position:absolute;right:5px}table.consul-metadata-list tbody tr{cursor:default}table.consul-metadata-list tbody tr:hover{box-shadow:none}.modal-dialog [role=document] table th span::after,main table th span::after{color:var(--token-color-foreground-faint);margin-left:4px}.modal-dialog [role=document] table tbody tr,main table tbody tr{cursor:pointer}.modal-dialog [role=document] table td:first-child,main table td:first-child{padding:0}.modal-dialog [role=document] table tbody tr:hover,main table tbody tr:hover{box-shadow:var(--token-elevation-high-box-shadow)}.modal-dialog [role=document] table td.folder::before,main table td.folder::before{background-color:var(--token-color-palette-neutral-300);margin-top:1px;margin-right:5px}@media (max-width:420px){.consul-intention-list tr>:nth-last-child(2),.modal-dialog [role=document] table tr>.actions,main table tr>.actions{display:none}}.voting-status-leader.consul-server-card .name{width:var(--tile-size,3rem);height:var(--tile-size,3rem)}.voting-status-leader.consul-server-card .name::before{display:block;content:"";width:100%;height:100%;border-radius:var(--decor-radius-250);border:var(--decor-border-100);background-image:linear-gradient(135deg,var(--token-color-consul-surface) 0,var(--token-color-consul-border) 100%);border-color:var(--token-color-border-faint)}.voting-status-leader.consul-server-card .name::after{content:"";position:absolute;top:calc(var(--tile-size,3rem)/ 4);left:calc(var(--tile-size,3rem)/ 4);--icon-name:icon-star-fill;--icon-size:icon-700;color:var(--token-color-consul-brand)}table.with-details td:only-child>div>label,table.with-details td>label{border-radius:var(--decor-radius-100);cursor:pointer;min-width:30px;min-height:30px;display:inline-flex;align-items:center;justify-content:center}table.dom-recycling tbody{top:33px!important;width:100%}table.dom-recycling caption~tbody{top:57px!important}table tr>:nth-last-child(2):first-child,table tr>:nth-last-child(2):first-child~*{width:50%}table tr>:nth-last-child(3):first-child,table tr>:nth-last-child(3):first-child~*{width:33.3333333333%}table tr>:nth-last-child(4):first-child,table tr>:nth-last-child(4):first-child~*{width:25%}table tr>:nth-last-child(5):first-child,table tr>:nth-last-child(5):first-child~*{width:20%}table.has-actions tr>:nth-last-child(2):first-child,table.has-actions tr>:nth-last-child(2):first-child~*{width:calc(100% - 60px)}table.has-actions tr>:nth-last-child(3):first-child,table.has-actions tr>:nth-last-child(3):first-child~*{width:calc(50% - 30px)}table.has-actions tr>:nth-last-child(4):first-child,table.has-actions tr>:nth-last-child(4):first-child~*{width:calc(33% - 20px)}table.has-actions tr>:nth-last-child(5):first-child,table.has-actions tr>:nth-last-child(5):first-child~*{width:calc(25% - 15px)}html[data-route^="dc.acls.policies"] [role=dialog] table tr>:not(last-child),html[data-route^="dc.acls.policies"] table tr>:not(last-child),html[data-route^="dc.acls.roles"] [role=dialog] table tr>:not(last-child),html[data-route^="dc.acls.roles"] main table.token-list tr>:not(last-child){width:120px}html[data-route^="dc.acls.policies"] table tr>:last-child,html[data-route^="dc.acls.roles"] [role=dialog] table tr>:last-child,html[data-route^="dc.acls.roles"] main table.token-list tr>:last-child{width:calc(100% - 240px)!important}table.with-details td:only-child{cursor:default;border:0}table.with-details td:only-child>div::before,table.with-details td:only-child>div>div,table.with-details td:only-child>div>label{background-color:var(--token-color-surface-primary)}table.with-details td:only-child>div>label::before{transform:rotate(180deg)}table.with-details td:only-child>div::before{background:var(--token-color-surface-interactive-active);content:"";display:block;height:1px;position:absolute;bottom:-20px;left:10px;width:calc(100% - 20px)}table.with-details tr>.actions{position:relative}table.with-details td:only-child>div>label,table.with-details td>label{pointer-events:auto;position:absolute;top:8px}table.with-details td:only-child>div>label span,table.with-details td>label span{display:none}table.with-details td>label{right:2px}table.with-details tr:nth-child(even) td{height:auto;position:relative;display:table-cell}table.with-details tr:nth-child(even) td>*{display:none}table.with-details td:only-child>div>label{right:11px}table.with-details tr:nth-child(even) td>input:checked+*{display:block}table.with-details td:only-child{overflow:visible;width:100%}table.with-details td:only-child>div{border:1px solid var(--token-color-palette-neutral-300);border-radius:var(--decor-radius-100);box-shadow:var(--token-surface-high-box-shadow);margin-bottom:20px;position:relative;left:-10px;right:-10px;width:calc(100% + 20px);margin-top:-51px;pointer-events:none;padding:10px}table.with-details td:only-child>div::after{content:"";display:block;clear:both}table.with-details td:only-child>div>div{pointer-events:auto;margin-top:36px}.consul-auth-method-binding-list dl,.consul-auth-method-view dl,.consul-auth-method-view section dl{display:flex;flex-wrap:wrap}.consul-auth-method-binding-list dl dd,.consul-auth-method-binding-list dl dt,.consul-auth-method-view dl dd,.consul-auth-method-view dl dt{padding:12px 0;margin:0;border-top:1px solid!important}.consul-auth-method-binding-list dl dt,.consul-auth-method-view dl dt{width:20%;font-weight:var(--typo-weight-bold)}.consul-auth-method-binding-list dl dd,.consul-auth-method-view dl dd{margin-left:auto;width:80%;display:flex}.consul-auth-method-binding-list dl dd>ul li,.consul-auth-method-view dl dd>ul li{display:flex}.consul-auth-method-binding-list dl dd>ul li:not(:last-of-type),.consul-auth-method-view dl dd>ul li:not(:last-of-type){padding-bottom:12px}.consul-auth-method-binding-list dl dt.check+dd,.consul-auth-method-view dl dt.check+dd{padding-top:16px}.consul-auth-method-binding-list dl>dd:last-of-type,.consul-auth-method-binding-list dl>dt:last-of-type,.consul-auth-method-view dl>dd:last-of-type,.consul-auth-method-view dl>dt:last-of-type{border-bottom:1px solid!important;border-color:var(--token-color-palette-neutral-300)!important}.consul-auth-method-binding-list dl dd,.consul-auth-method-binding-list dl dt,.consul-auth-method-view dl dd,.consul-auth-method-view dl dt{border-color:var(--token-color-palette-neutral-300)!important;color:var(--token-color-hashicorp-brand)!important}.consul-auth-method-binding-list dl dd .copy-button button::before,.consul-auth-method-view dl dd .copy-button button::before{background-color:var(--token-color-hashicorp-brand)}.consul-auth-method-binding-list dl dt.type+dd span::before,.consul-auth-method-view dl dt.type+dd span::before{margin-left:4px;background-color:var(--token-color-foreground-faint)}.tooltip-panel dt{cursor:pointer}.tooltip-panel dd>div::before{width:12px;height:12px;background-color:var(--token-color-surface-primary);border-top:1px solid var(--token-color-palette-neutral-300);border-right:1px solid var(--token-color-palette-neutral-300);transform:rotate(-45deg);position:absolute;left:16px;top:-7px}.tooltip-panel,.tooltip-panel dt{display:flex;flex-direction:column}.tooltip-panel dd>div.menu-panel{top:auto;overflow:visible}.tooltip-panel dd{display:none;position:relative;z-index:1;padding-top:10px;margin-bottom:-10px}.tooltip-panel:hover dd{display:block}.tooltip-panel dd>div{width:250px}.app-view>header .title{display:grid;grid-template-columns:1fr auto;grid-template-areas:"title actions";position:relative;z-index:5;padding-bottom:1.4em}.app-view>div form:not(.filter-bar) fieldset{border-bottom:var(--decor-border-200)}.app-view>header h1>em{color:var(--token-color-foreground-faint)}.app-view>header dd>a{color:var(--token-color-hashicorp-brand)}.app-view>div div>dl>dd,[role=contentinfo]{color:var(--token-color-foreground-disabled)}.app-view>div form:not(.filter-bar) fieldset,.app-view>header .title{border-color:var(--token-color-surface-interactive-active)}.app-view>header .title .title-left-container{grid-area:title;display:flex;flex-wrap:wrap;align-items:center;white-space:normal}.app-view>header .title .title-left-container>:first-child{flex-basis:100%}.app-view>header .title .title-left-container>:not(:first-child){margin-right:8px}.app-view>header .actions{grid-area:actions;align-self:end;display:flex;align-items:flex-start;margin-left:auto;margin-top:9px}.app-view>div form:not(.filter-bar) fieldset{padding-bottom:.3em;margin-bottom:2em}[for=toolbar-toggle]{background-position:0 4px;display:inline-block;width:26px;height:26px;cursor:pointer;color:var(--token-color-foreground-action)}#toolbar-toggle{display:none}@media (max-width:849px){.app-view>header .actions{margin-top:9px}}@media (min-width:996px){[for=toolbar-toggle]{display:none}}@media (max-width:995px){.app-view>header h1{display:inline-block}html[data-route$="dc.services.instance.show"] h1{display:block}#toolbar-toggle+*{display:none}#toolbar-toggle:checked+*{display:flex}}.brand-loader{position:absolute;top:50%;margin-top:-26px;left:50%}.app .skip-links{outline:solid var(--token-color-surface-primary);color:var(--token-color-surface-primary);display:flex;flex-direction:column;position:absolute;z-index:10;left:50%;padding:20px;top:-100px;transform:translateX(-50%)}.app .skip-links a,.app .skip-links button{color:inherit}.app .skip-links a,.app .skip-links button,.app .skip-links div{display:block;width:100%;text-align:center;box-sizing:border-box}.app .skip-links:focus-within{top:0}.app .notifications{position:fixed;z-index:100;bottom:2rem;left:1.5rem;pointer-events:none}.app .notifications .app-notification>*{min-width:400px}.app .notifications .app-notification{transition-property:opacity;width:-webkit-fit-content;width:-moz-fit-content;width:fit-content;max-width:80%;pointer-events:auto}[role=banner] nav:last-of-type{margin-left:auto}.hashicorp-consul nav .dcs{top:18px}.hashicorp-consul nav .dcs [aria-label]::before{display:none!important}[role=banner] nav:last-of-type [aria-haspopup=menu]~*{position:absolute;right:0;min-width:192px}[role=contentinfo]{position:fixed;z-index:50;width:250px;padding-left:25px;top:calc(100vh - 42px);top:calc(max(100vh,460px) - 42px)}html.has-partitions.has-nspaces .app [role=contentinfo]{top:calc(100vh - 42px);top:calc(max(100vh,640px) - 42px)}[role=banner] nav:first-of-type{z-index:10}[role=banner] nav:first-of-type,[role=contentinfo]{transition-property:left}.app .notifications,main{margin-top:var(--chrome-height,64px);transition-property:margin-left}.app .notifications{transition-property:margin-left,width}@media (min-width:900px){.app>input[id]~main .notifications{width:calc(100% - var(--chrome-width))}.app>input[id]:checked~main .notifications{width:100%}.app>input[id]+header>div>nav:first-of-type,.app>input[id]~footer{left:0}.app>input[id]:checked+header>div>nav:first-of-type,.app>input[id]:checked~footer{left:calc(var(--chrome-width,280px) * -1)}.app>input[id]~main{margin-left:var(--chrome-width,280px)}.app>input[id]:checked~main,.app>input[id]:checked~main .notifications{margin-left:0}}@media (max-width:899px){.app>input[id]~main .notifications{width:100%}.app>input[id]:checked+header>div>nav:first-of-type,.app>input[id]:checked~footer{left:0}.app>input[id]+header>div>nav:first-of-type,.app>input[id]~footer{left:calc(var(--chrome-width,280px) * -1)}.app>input[id]~main,.app>input[id]~main .notifications{margin-left:0}}[role=banner]::before{background-color:var(--token-color-hashicorp-brand);content:"";position:absolute;z-index:-1;left:0;width:100vw}[role=banner]{display:flex;position:fixed;z-index:50;left:0;padding:0 25px;width:calc(100% - 50px);align-items:center}[role=banner],[role=banner]::before{height:var(--chrome-height)}[role=banner]>a{display:block;line-height:0;font-size:0}.hashicorp-consul nav .dcs [aria-expanded]>a,[role=banner] nav:last-of-type [aria-expanded]>a,[role=banner] nav:last-of-type>ul>li>a>a,[role=banner] nav:last-of-type>ul>li>button>a,[role=banner] nav:last-of-type>ul>li>span>a{color:inherit}.hashicorp-consul nav .dcs [aria-expanded]::after,[role=banner] nav:last-of-type [aria-expanded]::after{--icon-name:icon-chevron-down;content:""}.hashicorp-consul nav .dcs [aria-expanded=true][aria-expanded]::after,[role=banner] nav:last-of-type [aria-expanded=true][aria-expanded]::after{transform:scaleY(-100%)}[role=banner] nav:last-of-type .disclosure-menu button+*,[role=banner] nav:last-of-type .disclosure-menu button+*>ul[role=menu],[role=banner] nav:last-of-type .disclosure-menu button+*>ul[role=menu]>li>[role=menuitem]{background-color:var(--token-color-hashicorp-brand);color:var(--token-color-palette-neutral-300)}[role=banner] nav:last-of-type .disclosure-menu button+*>ul[role=menu]>li>[role=menuitem]:hover{background-color:var(--token-color-palette-neutral-600)}.app>input[id]{display:none}.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.menu-panel>ul>[role=treeitem],.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],[role=banner] nav:last-of-type>ul,[role=banner]>div,[role=banner]>label,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{display:flex}[role=banner]>label::before{--icon-name:icon-menu;--icon-color:var(--token-color-palette-neutral-300);content:"";cursor:pointer}.hashicorp-consul nav .dcs [aria-expanded],[role=banner] nav:last-of-type .popover-menu [type=checkbox]:checked+label>*,[role=banner] nav:last-of-type [aria-expanded],[role=banner] nav:last-of-type>ul>li>.popover-menu>label>button,[role=banner] nav:last-of-type>ul>li>a,[role=banner] nav:last-of-type>ul>li>button,[role=banner] nav:last-of-type>ul>li>span{color:var(--token-color-palette-neutral-300)}[role=banner]>label{align-items:center;height:100%;padding:0 1rem 0 5px}[role=banner]>div{justify-content:space-between;flex-grow:1}[role=banner] nav:last-of-type .disclosure-menu button+*{z-index:400;top:28px!important}.hashicorp-consul nav .dcs [aria-expanded],[role=banner] nav:last-of-type [aria-expanded],[role=banner] nav:last-of-type>ul>li>.popover-menu>label>button,[role=banner] nav:last-of-type>ul>li>a,[role=banner] nav:last-of-type>ul>li>button,[role=banner] nav:last-of-type>ul>li>span{border-radius:var(--decor-radius-200);cursor:pointer;display:block;padding:5px 12px;white-space:nowrap}[role=banner] nav:last-of-type .popover-menu>label{padding-right:5px}[role=banner] nav:last-of-type .popover-menu>label>*{padding-right:4px!important}[role=banner] nav:last-of-type .popover-menu>label>button::after{top:2px}[role=banner] nav:last-of-type>ul>li>span{cursor:default}[role=banner] nav:first-of-type a>a,[role=banner] nav:first-of-type>ul>li>label>a{color:inherit;font-size:inherit}[role=banner] nav:first-of-type [role=separator]{text-transform:uppercase;font-weight:var(--typo-weight-medium)}[role=banner] nav:first-of-type a:focus,[role=banner] nav:first-of-type a:hover,[role=banner] nav:first-of-type>ul>li>label:focus,[role=banner] nav:first-of-type>ul>li>label:hover{text-decoration:underline}.tab-nav li>*,[role=banner] nav:first-of-type>ul>li.is-active>a:focus:not(:active),[role=banner] nav:first-of-type>ul>li.is-active>a:hover:not(:active){text-decoration:none}[role=banner] nav:first-of-type{background-color:var(--token-color-foreground-strong);color:var(--token-color-foreground-faint)}[role=banner] nav:first-of-type li:not([role=separator])>span{color:var(--token-color-palette-neutral-300)}.hashicorp-consul nav .dcs [role=separator],[role=banner] nav:first-of-type [role=separator]{color:var(--token-color-palette-neutral-400);background-color:var(--token-color-foreground-strong)}[role=banner] nav:first-of-type a,[role=banner] nav:first-of-type>ul>li>label{cursor:pointer;border-right:var(--decor-border-400);border-color:transparent;color:var(--token-color-palette-neutral-300)}[role=banner] nav:first-of-type a:focus,[role=banner] nav:first-of-type a:hover,[role=banner] nav:first-of-type>ul>li.is-active>a,[role=banner] nav:first-of-type>ul>li>label:focus,[role=banner] nav:first-of-type>ul>li>label:hover,[role=banner] nav:first-of-type>ul>li[aria-label]{color:var(--token-color-palette-neutral-0)}[role=banner] nav:first-of-type>ul>li.is-active>a{background-color:var(--token-color-palette-neutral-500);border-color:var(--token-color-palette-neutral-0)}[role=banner] nav:first-of-type [aria-label]::before{color:var(--token-color-palette-neutral-400);content:attr(aria-label);display:block;margin-top:-.5rem;margin-bottom:.5rem}.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button{border:var(--decor-border-100);border-color:var(--token-color-foreground-faint);border-radius:var(--decor-radius-100);font-weight:inherit;background-color:var(--token-color-foreground-strong);color:var(--token-color-palette-neutral-200)}.hashicorp-consul nav li.nspaces .disclosure-menu>button:focus,.hashicorp-consul nav li.nspaces .disclosure-menu>button:hover,.hashicorp-consul nav li.partitions .disclosure-menu>button:focus,.hashicorp-consul nav li.partitions .disclosure-menu>button:hover,[role=banner] nav:first-of-type ul[role=menu] li a[role=menuitem]{color:var(--token-color-palette-neutral-300);background-color:var(--token-color-foreground-strong)}[role=banner] nav:first-of-type ul[role=menu] li a[role=menuitem]:hover{background-color:var(--token-color-palette-neutral-600)}.hashicorp-consul nav li.nspaces .disclosure-menu>button[aria-expanded=true],.hashicorp-consul nav li.partitions .disclosure-menu>button[aria-expanded=true]{border-bottom-left-radius:var(--decor-radius-000);border-bottom-right-radius:var(--decor-radius-000)}.disclosure-menu [aria-expanded]~* [role=banner] nav:first-of-type [role=separator],.disclosure-menu [aria-expanded]~* [role=banner] nav:last-of-type [role=separator],.disclosure-menu [role=banner] nav:first-of-type [aria-expanded]~*,.disclosure-menu [role=banner] nav:last-of-type [aria-expanded]~*,.menu-panel [role=banner] nav:first-of-type [role=separator],.menu-panel [role=banner] nav:last-of-type [role=separator],.more-popover-menu>[type=checkbox]+label+div [role=banner] nav:first-of-type [role=separator],.more-popover-menu>[type=checkbox]+label+div [role=banner] nav:last-of-type [role=separator],.popover-menu>[type=checkbox]+label+div [role=banner] nav:first-of-type [role=separator],.popover-menu>[type=checkbox]+label+div [role=banner] nav:last-of-type [role=separator],[role=banner] nav:first-of-type .consul-server-card,[role=banner] nav:first-of-type .disclosure-menu [aria-expanded]~*,[role=banner] nav:first-of-type .disclosure-menu [aria-expanded]~* [role=separator],[role=banner] nav:first-of-type .menu-panel,[role=banner] nav:first-of-type .menu-panel [role=separator],[role=banner] nav:first-of-type .more-popover-menu>[type=checkbox]+label+div,[role=banner] nav:first-of-type .more-popover-menu>[type=checkbox]+label+div [role=separator],[role=banner] nav:first-of-type .popover-menu>[type=checkbox]+label+div,[role=banner] nav:first-of-type .popover-menu>[type=checkbox]+label+div [role=separator],[role=banner] nav:first-of-type section[data-route="dc.show.license"] aside,[role=banner] nav:first-of-type section[data-route="dc.show.serverstatus"] .server-failure-tolerance,[role=banner] nav:first-of-type table.has-actions tr>.actions>[type=checkbox]+label+div,[role=banner] nav:first-of-type table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator],[role=banner] nav:first-of-type table.with-details tr>.actions>[type=checkbox]+label+div,[role=banner] nav:first-of-type table.with-details tr>.actions>[type=checkbox]+label+div [role=separator],[role=banner] nav:last-of-type .consul-server-card,[role=banner] nav:last-of-type .disclosure-menu [aria-expanded]~*,[role=banner] nav:last-of-type .disclosure-menu [aria-expanded]~* [role=separator],[role=banner] nav:last-of-type .menu-panel,[role=banner] nav:last-of-type .menu-panel [role=separator],[role=banner] nav:last-of-type .more-popover-menu>[type=checkbox]+label+div,[role=banner] nav:last-of-type .more-popover-menu>[type=checkbox]+label+div [role=separator],[role=banner] nav:last-of-type .popover-menu>[type=checkbox]+label+div,[role=banner] nav:last-of-type .popover-menu>[type=checkbox]+label+div [role=separator],[role=banner] nav:last-of-type section[data-route="dc.show.license"] aside,[role=banner] nav:last-of-type section[data-route="dc.show.serverstatus"] .server-failure-tolerance,[role=banner] nav:last-of-type table.has-actions tr>.actions>[type=checkbox]+label+div,[role=banner] nav:last-of-type table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator],[role=banner] nav:last-of-type table.with-details tr>.actions>[type=checkbox]+label+div,[role=banner] nav:last-of-type table.with-details tr>.actions>[type=checkbox]+label+div [role=separator],section[data-route="dc.show.license"] [role=banner] nav:first-of-type aside,section[data-route="dc.show.license"] [role=banner] nav:last-of-type aside,section[data-route="dc.show.serverstatus"] [role=banner] nav:first-of-type .server-failure-tolerance,section[data-route="dc.show.serverstatus"] [role=banner] nav:last-of-type .server-failure-tolerance,table.has-actions [role=banner] nav:first-of-type tr>.actions>[type=checkbox]+label+div,table.has-actions [role=banner] nav:last-of-type tr>.actions>[type=checkbox]+label+div,table.has-actions tr>.actions>[type=checkbox]+label+div [role=banner] nav:first-of-type [role=separator],table.has-actions tr>.actions>[type=checkbox]+label+div [role=banner] nav:last-of-type [role=separator],table.with-details [role=banner] nav:first-of-type tr>.actions>[type=checkbox]+label+div,table.with-details [role=banner] nav:last-of-type tr>.actions>[type=checkbox]+label+div,table.with-details tr>.actions>[type=checkbox]+label+div [role=banner] nav:first-of-type [role=separator],table.with-details tr>.actions>[type=checkbox]+label+div [role=banner] nav:last-of-type [role=separator]{border-color:var(--token-color-foreground-faint)}.hashicorp-consul nav li.nspaces .disclosure-menu>button::after,.hashicorp-consul nav li.partitions .disclosure-menu>button::after{width:16px;height:16px;position:relative;float:right}.hashicorp-consul nav li.nspaces .disclosure-menu button+*,.hashicorp-consul nav li.partitions .disclosure-menu button+*{border-top-left-radius:var(--decor-radius-000);border-top-right-radius:var(--decor-radius-000);border-top:var(--decor-border-000);color:var(--token-color-palette-neutral-300);background-color:var(--token-color-foreground-strong)}.hashicorp-consul nav .dcs .dcs-message,.hashicorp-consul nav .dcs ul[role=menu]{background-color:var(--token-color-hashicorp-brand)}[role=banner] nav:first-of-type{position:absolute;left:0;top:var(--chrome-height,47px);width:var(--chrome-width,280px);height:calc(100vh - var(--chrome-height,47px) - 35px);padding-top:35px;overflow:auto}[role=banner] nav:first-of-type li.nspaces,[role=banner] nav:first-of-type li.partition,[role=banner] nav:first-of-type li.partitions{margin-bottom:25px;padding:0 26px}[role=banner] nav:first-of-type li.dcs{padding:0 18px}[role=banner] nav:first-of-type [role=menuitem]{justify-content:flex-start!important}[role=banner] nav:first-of-type [role=menuitem] span{margin-left:.5rem}[role=banner] nav:first-of-type [role=separator],[role=banner] nav:first-of-type a,[role=banner] nav:first-of-type li:not([role=separator])>span,[role=banner] nav:first-of-type>ul>li>label{display:block;padding:7px 25px}[role=banner] nav:first-of-type>ul>[role=separator]{margin-top:.7rem;padding-bottom:0}.hashicorp-consul nav li.nspaces .disclosure,.hashicorp-consul nav li.partitions .disclosure{position:relative}.hashicorp-consul nav li.nspaces .disclosure-menu>button,.hashicorp-consul nav li.partitions .disclosure-menu>button{width:100%;text-align:left;padding:10px}.hashicorp-consul nav li.nspaces .disclosure-menu button+*,.hashicorp-consul nav li.partitions .disclosure-menu button+*{position:absolute;z-index:1;width:calc(100% - 2px)}.hashicorp-consul nav .dcs{visibility:visible;position:fixed;z-index:10;left:100px}.hashicorp-consul nav .dcs .dcs-message{padding:8px 12px;border-bottom:1px solid var(--token-color-foreground-disabled);max-width:-webkit-fit-content;max-width:-moz-fit-content;max-width:fit-content;color:var(--token-color-palette-neutral-300)}.hashicorp-consul nav .dcs .dc-name{color:var(--token-color-foreground-faint);padding:3.25px 0;font-weight:var(--typo-weight-semibold)}.hashicorp-consul nav .dcs .dc-name span{margin-left:1rem;background-color:var(--token-color-palette-neutral-300);color:var(--token-color-hashicorp-brand)}.hashicorp-consul nav li.dcs [aria-expanded]~*{min-width:250px;max-height:560px;--paged-row-height:43px}.hashicorp-consul nav li.nspaces [aria-expanded]~*,.hashicorp-consul nav li.partitions [aria-expanded]~*{max-height:360px;--paged-row-height:43px}.hashicorp-consul [role=banner] a svg{fill:var(--token-color-consul-brand)}.hashicorp-consul .acls-separator span{color:var(--token-color-foreground-critical);display:inline-block;position:relative;top:2px;margin-left:2px}.disclosure-menu [aria-expanded]~*>div+ul,.menu-panel>div+ul,.more-popover-menu>[type=checkbox]+label+div>div+ul,.popover-menu>[type=checkbox]+label+div>div+ul,table.has-actions tr>.actions>[type=checkbox]+label+div>div+ul,table.with-details tr>.actions>[type=checkbox]+label+div>div+ul{border-top:var(--decor-border-100);border-color:var(--token-form--base-border-color-default)}.disclosure-menu [aria-expanded]~* [role=separator]:first-child:not(:empty),.menu-panel [role=separator]:first-child:not(:empty),.more-popover-menu>[type=checkbox]+label+div [role=separator]:first-child:not(:empty),.popover-menu>[type=checkbox]+label+div [role=separator]:first-child:not(:empty),table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator]:first-child:not(:empty),table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]:first-child:not(:empty){border:none}.disclosure-menu [aria-expanded]~* [role=separator],.menu-panel [role=separator],.more-popover-menu>[type=checkbox]+label+div [role=separator],.popover-menu>[type=checkbox]+label+div [role=separator],table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator],table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]{text-transform:uppercase;font-weight:var(--typo-weight-medium);color:var(--token-color-foreground-faint)}.disclosure-menu [aria-expanded]~*>ul>li,.menu-panel>ul>li,.more-popover-menu>[type=checkbox]+label+div>ul>li,.popover-menu>[type=checkbox]+label+div>ul>li,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li{list-style-type:none}.disclosure-menu [aria-expanded]~*>ul .informed-action,.menu-panel>ul .informed-action,.more-popover-menu>[type=checkbox]+label+div>ul .informed-action,.popover-menu>[type=checkbox]+label+div>ul .informed-action,table.has-actions tr>.actions>[type=checkbox]+label+div>ul .informed-action,table.with-details tr>.actions>[type=checkbox]+label+div>ul .informed-action{border:0!important}.disclosure-menu [aria-expanded]~*>div,.menu-panel>div,.more-popover-menu>[type=checkbox]+label+div>div,.popover-menu>[type=checkbox]+label+div>div,table.has-actions tr>.actions>[type=checkbox]+label+div>div,table.with-details tr>.actions>[type=checkbox]+label+div>div{padding:.625rem var(--padding-x);white-space:normal;max-width:-webkit-fit-content;max-width:-moz-fit-content;max-width:fit-content}@supports not ((max-width:-webkit-fit-content) or (max-width:-moz-fit-content) or (max-width:fit-content)){.disclosure-menu [aria-expanded]~*>div,.menu-panel>div,.more-popover-menu>[type=checkbox]+label+div>div,.popover-menu>[type=checkbox]+label+div>div,table.has-actions tr>.actions>[type=checkbox]+label+div>div,table.with-details tr>.actions>[type=checkbox]+label+div>div{max-width:200px}}.disclosure-menu [aria-expanded]~*>div::before,.menu-panel>div::before,.more-popover-menu>[type=checkbox]+label+div>div::before,.popover-menu>[type=checkbox]+label+div>div::before,table.has-actions tr>.actions>[type=checkbox]+label+div>div::before,table.with-details tr>.actions>[type=checkbox]+label+div>div::before{position:absolute;left:15px;top:calc(10px + .1em)}.disclosure-menu [aria-expanded]~*>ul>[role=treeitem]+*,.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem]+*,.disclosure-menu [aria-expanded]~*>ul>li>[role=option]+*,.menu-panel-deprecated>ul>li>div[role=menu],.menu-panel>ul>[role=treeitem]+*,.menu-panel>ul>li>[role=menuitem]+*,.menu-panel>ul>li>[role=option]+*,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]+*,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]+*,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option]+*,.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]+*,.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]+*,.popover-menu>[type=checkbox]+label+div>ul>li>[role=option]+*,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]+*,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]+*,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]+*,table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]+*,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]+*,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]+*{position:absolute;top:0;left:calc(100% + 10px)}.disclosure-menu [aria-expanded]~*>ul,.menu-panel>ul,.more-popover-menu>[type=checkbox]+label+div>ul,.popover-menu>[type=checkbox]+label+div>ul,table.has-actions tr>.actions>[type=checkbox]+label+div>ul,table.with-details tr>.actions>[type=checkbox]+label+div>ul{margin:0;padding:calc(var(--padding-y) - .625rem) 0;transition:transform 150ms}.disclosure-menu [aria-expanded]~*>ul,.disclosure-menu [aria-expanded]~*>ul>li,.disclosure-menu [aria-expanded]~*>ul>li>*,.menu-panel>ul,.menu-panel>ul>li,.menu-panel>ul>li>*,.more-popover-menu>[type=checkbox]+label+div>ul,.more-popover-menu>[type=checkbox]+label+div>ul>li,.more-popover-menu>[type=checkbox]+label+div>ul>li>*,.popover-menu>[type=checkbox]+label+div>ul,.popover-menu>[type=checkbox]+label+div>ul>li,.popover-menu>[type=checkbox]+label+div>ul>li>*,table.has-actions tr>.actions>[type=checkbox]+label+div>ul,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>*,table.with-details tr>.actions>[type=checkbox]+label+div>ul,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>*{width:100%}.disclosure-menu [aria-expanded]~*>ul>[role=treeitem],.disclosure-menu [aria-expanded]~*>ul>li,.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem],.disclosure-menu [aria-expanded]~*>ul>li>[role=option],.menu-panel>ul>[role=treeitem],.menu-panel>ul>li,.menu-panel>ul>li>[role=menuitem],.menu-panel>ul>li>[role=option],.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.more-popover-menu>[type=checkbox]+label+div>ul>li,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option],.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem],.popover-menu>[type=checkbox]+label+div>ul>li,.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem],.popover-menu>[type=checkbox]+label+div>ul>li>[role=option],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option],table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem],table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]{text-align:left}.hashicorp-consul nav .dcs li.is-local span,.hashicorp-consul nav .dcs li.is-primary span{color:var(--token-color-surface-primary);background-color:var(--token-color-foreground-faint);padding:0 8px;margin-left:.5rem}.disclosure-menu [aria-expanded]~*>ul>[role=treeitem]::after,.disclosure-menu [aria-expanded]~*>ul>li>[role=menuitem]::after,.disclosure-menu [aria-expanded]~*>ul>li>[role=option]::after,.menu-panel>ul>[role=treeitem]::after,.menu-panel>ul>li>[role=menuitem]::after,.menu-panel>ul>li>[role=option]::after,.more-popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]::after,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]::after,.more-popover-menu>[type=checkbox]+label+div>ul>li>[role=option]::after,.popover-menu>[type=checkbox]+label+div>ul>[role=treeitem]::after,.popover-menu>[type=checkbox]+label+div>ul>li>[role=menuitem]::after,.popover-menu>[type=checkbox]+label+div>ul>li>[role=option]::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]::after,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>[role=treeitem]::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=menuitem]::after,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li>[role=option]::after{margin-left:auto;padding-right:var(--padding-x);transform:translate(calc(var(--padding-x)/ 2),0)}.disclosure-menu [aria-expanded]~* [role=separator],.menu-panel [role=separator],.more-popover-menu>[type=checkbox]+label+div [role=separator],.popover-menu>[type=checkbox]+label+div [role=separator],table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator],table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]{padding-top:.375rem}.disclosure-menu [aria-expanded]~* [role=separator]:not(:first-child),.menu-panel [role=separator]:not(:first-child),.more-popover-menu>[type=checkbox]+label+div [role=separator]:not(:first-child),.popover-menu>[type=checkbox]+label+div [role=separator]:not(:first-child),table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator]:not(:first-child),table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]:not(:first-child){margin-top:.275rem}.disclosure-menu [aria-expanded]~* [role=separator]:not(:empty),.menu-panel [role=separator]:not(:empty),.more-popover-menu>[type=checkbox]+label+div [role=separator]:not(:empty),.popover-menu>[type=checkbox]+label+div [role=separator]:not(:empty),table.has-actions tr>.actions>[type=checkbox]+label+div [role=separator]:not(:empty),table.with-details tr>.actions>[type=checkbox]+label+div [role=separator]:not(:empty){padding-left:var(--padding-x);padding-right:var(--padding-x);padding-bottom:.125rem}.disclosure-menu [aria-expanded]~.menu-panel-confirming,.menu-panel-confirming.menu-panel,.more-popover-menu>[type=checkbox]+label+div.menu-panel-confirming,.popover-menu>[type=checkbox]+label+div.menu-panel-confirming,table.has-actions tr>.actions>[type=checkbox]+label+div.menu-panel-confirming,table.with-details tr>.actions>[type=checkbox]+label+div.menu-panel-confirming{overflow:hidden}.disclosure-menu [aria-expanded]~.menu-panel-confirming>ul,.menu-panel-confirming.menu-panel>ul,.more-popover-menu>[type=checkbox]+label+div.menu-panel-confirming>ul,.popover-menu>[type=checkbox]+label+div.menu-panel-confirming>ul,table.has-actions tr>.actions>[type=checkbox]+label+div.menu-panel-confirming>ul,table.with-details tr>.actions>[type=checkbox]+label+div.menu-panel-confirming>ul{transform:translateX(calc(-100% - 10px))}.disclosure-menu [aria-expanded]~*,.menu-panel,.more-popover-menu>[type=checkbox]+label+div,.popover-menu>[type=checkbox]+label+div,table.has-actions tr>.actions>[type=checkbox]+label+div,table.with-details tr>.actions>[type=checkbox]+label+div{overflow:hidden}.menu-panel-deprecated{position:absolute;transition:max-height 150ms;transition:min-height 150ms,max-height 150ms;min-height:0}.menu-panel-deprecated [type=checkbox]{display:none}.menu-panel-deprecated:not(.confirmation) [type=checkbox]~*{transition:transform 150ms}.confirmation.menu-panel-deprecated [role=menu]{min-height:205px!important}.menu-panel-deprecated [type=checkbox]:checked~*{transform:translateX(calc(-100% - 10px));min-height:143px;max-height:143px}.menu-panel-deprecated [id$="-"]:first-child:checked~ul label[for$="-"] * [role=menu],.menu-panel-deprecated [id$="-"]:first-child:checked~ul>li>[role=menu]{display:block}.menu-panel-deprecated>ul>li>:not(div[role=menu]),.tippy-box{position:relative}.menu-panel-deprecated:not(.left){right:0!important;left:auto!important}.left.menu-panel-deprecated{left:0}.menu-panel-deprecated:not(.above){top:28px}.above.menu-panel-deprecated{bottom:42px}.consul-upstream-instance-list dl.local-bind-socket-mode dt::after{display:inline;content:var(--horizontal-kv-list-key-separator)}.consul-bucket-list,.consul-exposed-path-list>ul>li>.detail dl,.consul-instance-checks,.consul-lock-session-list dl,.consul-lock-session-list ul>li:not(:first-child)>.detail dl,.consul-upstream-instance-list dl,.consul-upstream-instance-list li>.detail dl,.list-collection>ul>li:not(:first-child)>.detail dl,.tag-list,section[data-route="dc.show.license"] .validity dl,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl,td.tags{display:inline-flex;flex-wrap:nowrap;align-items:center}.consul-bucket-list:empty,.consul-exposed-path-list>ul>li>.detail dl:empty,.consul-instance-checks:empty,.consul-lock-session-list dl:empty,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:empty,.consul-upstream-instance-list dl:empty,.list-collection>ul>li:not(:first-child)>.detail dl:empty,.tag-list:empty,section[data-route="dc.show.license"] .validity dl:empty,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:empty,td.tags:empty{display:none}.consul-bucket-list>*>*,.consul-exposed-path-list>ul>li>.detail dl>*>*,.consul-instance-checks>*>*,.consul-lock-session-list dl>*>*,.consul-lock-session-list ul>li:not(:first-child)>.detail dl>*>*,.consul-upstream-instance-list dl>*>*,.consul-upstream-instance-list li>.detail dl>*>*,.list-collection>ul>li:not(:first-child)>.detail dl>*>*,.tag-list>*>*,section[data-route="dc.show.license"] .validity dl>*>*,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl>*>*,td.tags>*>*{display:inline-block}.consul-bucket-list>*,.consul-exposed-path-list>ul>li>.detail dl>*,.consul-instance-checks>*,.consul-lock-session-list dl>*,.consul-lock-session-list ul>li:not(:first-child)>.detail dl>*,.consul-upstream-instance-list dl>*,.consul-upstream-instance-list li>.detail dl>*,.list-collection>ul>li:not(:first-child)>.detail dl>*,.tag-list>*,section[data-route="dc.show.license"] .validity dl>*,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl>*,td.tags>*{white-space:nowrap}.consul-bucket-list>dd,.consul-exposed-path-list>ul>li>.detail dl>dd,.consul-instance-checks>dd,.consul-lock-session-list dl>dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl>dd,.consul-upstream-instance-list dl>dd,.consul-upstream-instance-list li>.detail dl>dd,.list-collection>ul>li:not(:first-child)>.detail dl>dd,.tag-list>dd,section[data-route="dc.show.license"] .validity dl>dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl>dd,td.tags>dd{flex-wrap:wrap}.consul-upstream-instance-list dl.local-bind-socket-mode dt{display:inline-flex;min-width:18px;overflow:hidden}.consul-lock-session-list .checks dd,.discovery-chain .resolver-card ol,.filter-bar,.filter-bar>div,.modal-dialog,.tag-list dd,td.tags dd{display:flex}.consul-bucket-list .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-bucket-list .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-bucket-list .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.consul-bucket-list .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.consul-bucket-list .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-bucket-list .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-bucket-list .tag-list:not([class]) dd+dt:not([class])+dd,.consul-bucket-list dd+dt,.consul-bucket-list td.tags:not([class]) dd+dt:not([class])+dd,.consul-bucket-list+.consul-bucket-list:not(:first-of-type),.consul-bucket-list+.consul-instance-checks:not(:first-of-type),.consul-bucket-list+.tag-list:not(:first-of-type),.consul-bucket-list+td.tags:not(:first-of-type),.consul-bucket-list:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,.consul-bucket-list:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-bucket-list:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,.consul-bucket-list:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-bucket-list:not([class]) .tag-list dd+dt:not([class])+dd,.consul-bucket-list:not([class]) dd+dt:not([class])+dd,.consul-bucket-list:not([class]) td.tags dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail .consul-bucket-list+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail .consul-instance-checks+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail .consul-lock-session-list dl+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail .consul-upstream-instance-list dl+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.consul-exposed-path-list>ul>li>.detail .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.consul-exposed-path-list>ul>li>.detail .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail .tag-list+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail dl .consul-bucket-list:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl .consul-instance-checks:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl .consul-lock-session-list dl:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl .consul-upstream-instance-list dl:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl .tag-list:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl dd+dt,.consul-exposed-path-list>ul>li>.detail dl section[data-route="dc.show.license"] .validity dl:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl td.tags:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl+.consul-bucket-list:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail dl+.consul-instance-checks:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail dl+.tag-list:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail dl+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail dl+td.tags:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail dl:not([class]) .consul-bucket-list dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) .consul-instance-checks dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) .consul-lock-session-list dl dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) .consul-upstream-instance-list dl dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) .tag-list dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) section[data-route="dc.show.license"] .validity dl dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) td.tags dd+dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail section[data-route="dc.show.license"] .validity dl+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+dl:not(:first-of-type),.consul-exposed-path-list>ul>li>.detail td.tags+dl:not(:first-of-type),.consul-instance-checks .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-instance-checks .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-instance-checks .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.consul-instance-checks .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.consul-instance-checks .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-instance-checks .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-instance-checks .tag-list:not([class]) dd+dt:not([class])+dd,.consul-instance-checks dd+dt,.consul-instance-checks td.tags:not([class]) dd+dt:not([class])+dd,.consul-instance-checks+.consul-bucket-list:not(:first-of-type),.consul-instance-checks+.consul-instance-checks:not(:first-of-type),.consul-instance-checks+.tag-list:not(:first-of-type),.consul-instance-checks+td.tags:not(:first-of-type),.consul-instance-checks:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,.consul-instance-checks:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-instance-checks:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,.consul-instance-checks:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-instance-checks:not([class]) .tag-list dd+dt:not([class])+dd,.consul-instance-checks:not([class]) dd+dt:not([class])+dd,.consul-instance-checks:not([class]) td.tags dd+dt:not([class])+dd,.consul-lock-session-list .consul-bucket-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .consul-bucket-list+dl:not(:first-of-type),.consul-lock-session-list .consul-bucket-list:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list .consul-exposed-path-list>ul>li>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .consul-exposed-path-list>ul>li>.detail dl+dl:not(:first-of-type),.consul-lock-session-list .consul-exposed-path-list>ul>li>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-lock-session-list .consul-instance-checks ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .consul-instance-checks+dl:not(:first-of-type),.consul-lock-session-list .consul-instance-checks:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list dl li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list dl ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list dl+dl:not(:first-of-type),.consul-lock-session-list .consul-upstream-instance-list dl.local-bind-address dl dd+dt+dd,.consul-lock-session-list .consul-upstream-instance-list dl.local-bind-socket-path dl dd+dt+dd,.consul-lock-session-list .consul-upstream-instance-list dl:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list dl:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list li>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list li>.detail dl+dl:not(:first-of-type),.consul-lock-session-list .consul-upstream-instance-list li>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .consul-upstream-instance-list ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),.consul-lock-session-list .consul-upstream-instance-list ul>li:not(:first-child)>.detail dl.local-bind-address dd+dt+dd,.consul-lock-session-list .consul-upstream-instance-list ul>li:not(:first-child)>.detail dl.local-bind-socket-path dd+dt+dd,.consul-lock-session-list .consul-upstream-instance-list ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-lock-session-list .list-collection>ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .list-collection>ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),.consul-lock-session-list .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-lock-session-list .list-collection>ul>li:not(:first-child)>.detail ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .tag-list dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .tag-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list .tag-list+dl:not(:first-of-type),.consul-lock-session-list .tag-list:not([class]) dl dd+dt:not([class])+dd,.consul-lock-session-list .tag-list:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list dl .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.consul-lock-session-list dl .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.consul-lock-session-list dl .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl .tag-list:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl dd+dt,.consul-lock-session-list dl td.tags:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl+.consul-bucket-list:not(:first-of-type),.consul-lock-session-list dl+.consul-instance-checks:not(:first-of-type),.consul-lock-session-list dl+.tag-list:not(:first-of-type),.consul-lock-session-list dl+dl:not(:first-of-type),.consul-lock-session-list dl+td.tags:not(:first-of-type),.consul-lock-session-list dl:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list dl:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list dl:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list dl:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list dl:not([class]) .tag-list dd+dt:not([class])+dd,.consul-lock-session-list dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list dl:not([class]) td.tags dd+dt:not([class])+dd,.consul-lock-session-list dl:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list section[data-route="dc.show.license"] .validity dl ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list section[data-route="dc.show.license"] .validity dl+dl:not(:first-of-type),.consul-lock-session-list section[data-route="dc.show.license"] .validity dl:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+dl:not(:first-of-type),.consul-lock-session-list section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list td.tags dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list td.tags ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list td.tags+dl:not(:first-of-type),.consul-lock-session-list td.tags:not([class]) dl dd+dt:not([class])+dd,.consul-lock-session-list td.tags:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail .consul-bucket-list+dl:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail .consul-instance-checks+dl:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail .consul-upstream-instance-list dl+dl:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail .tag-list+dl:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail dl .consul-bucket-list:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl .consul-instance-checks:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl .consul-upstream-instance-list dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl .tag-list:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt,.consul-lock-session-list ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl section[data-route="dc.show.license"] .validity dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl td.tags:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl+.consul-bucket-list:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail dl+.consul-instance-checks:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail dl+.tag-list:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail dl+td.tags:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) .consul-bucket-list dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) .consul-instance-checks dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) .consul-upstream-instance-list dl dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) .tag-list dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) section[data-route="dc.show.license"] .validity dl dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) td.tags dd+dt:not([class])+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail section[data-route="dc.show.license"] .validity dl+dl:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+dl:not(:first-of-type),.consul-lock-session-list ul>li:not(:first-child)>.detail td.tags+dl:not(:first-of-type),.consul-upstream-instance-list .consul-bucket-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-bucket-list+dl:not(:first-of-type),.consul-upstream-instance-list .consul-bucket-list:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-exposed-path-list>ul>li>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-exposed-path-list>ul>li>.detail dl+dl:not(:first-of-type),.consul-upstream-instance-list .consul-exposed-path-list>ul>li>.detail dl.local-bind-address dd+dt+dd,.consul-upstream-instance-list .consul-exposed-path-list>ul>li>.detail dl.local-bind-socket-path dd+dt+dd,.consul-upstream-instance-list .consul-exposed-path-list>ul>li>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-instance-checks li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-instance-checks+dl:not(:first-of-type),.consul-upstream-instance-list .consul-instance-checks:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-lock-session-list dl li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-lock-session-list dl+dl:not(:first-of-type),.consul-upstream-instance-list .consul-lock-session-list dl:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-lock-session-list ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .consul-lock-session-list ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),.consul-upstream-instance-list .consul-lock-session-list ul>li:not(:first-child)>.detail dl.local-bind-address dd+dt+dd,.consul-upstream-instance-list .consul-lock-session-list ul>li:not(:first-child)>.detail dl.local-bind-socket-path dd+dt+dd,.consul-upstream-instance-list .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-upstream-instance-list .list-collection>ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .list-collection>ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),.consul-upstream-instance-list .list-collection>ul>li:not(:first-child)>.detail dl.local-bind-address dd+dt+dd,.consul-upstream-instance-list .list-collection>ul>li:not(:first-child)>.detail dl.local-bind-socket-path dd+dt+dd,.consul-upstream-instance-list .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-upstream-instance-list .list-collection>ul>li:not(:first-child)>.detail li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .tag-list dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .tag-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list .tag-list+dl:not(:first-of-type),.consul-upstream-instance-list .tag-list:not([class]) dl dd+dt:not([class])+dd,.consul-upstream-instance-list .tag-list:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list dl .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl .tag-list:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl dd+dt,.consul-upstream-instance-list dl li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl td.tags:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl+.consul-bucket-list:not(:first-of-type),.consul-upstream-instance-list dl+.consul-instance-checks:not(:first-of-type),.consul-upstream-instance-list dl+.tag-list:not(:first-of-type),.consul-upstream-instance-list dl+dl:not(:first-of-type),.consul-upstream-instance-list dl+td.tags:not(:first-of-type),.consul-upstream-instance-list dl.local-bind-address .consul-bucket-list dd+dt+dd,.consul-upstream-instance-list dl.local-bind-address .consul-instance-checks dd+dt+dd,.consul-upstream-instance-list dl.local-bind-address .consul-lock-session-list dl dd+dt+dd,.consul-upstream-instance-list dl.local-bind-address .tag-list dd+dt+dd,.consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.consul-upstream-instance-list dl.local-bind-address section[data-route="dc.show.license"] .validity dl dd+dt+dd,.consul-upstream-instance-list dl.local-bind-address section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt+dd,.consul-upstream-instance-list dl.local-bind-address td.tags dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path .consul-bucket-list dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path .consul-instance-checks dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path .consul-lock-session-list dl dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path .tag-list dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path section[data-route="dc.show.license"] .validity dl dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path td.tags dd+dt+dd,.consul-upstream-instance-list dl:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list dl:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list dl:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list dl:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list dl:not([class]) .tag-list dd+dt:not([class])+dd,.consul-upstream-instance-list dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list dl:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list dl:not([class]) td.tags dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail .consul-bucket-list+dl:not(:first-of-type),.consul-upstream-instance-list li>.detail .consul-instance-checks+dl:not(:first-of-type),.consul-upstream-instance-list li>.detail .consul-lock-session-list dl+dl:not(:first-of-type),.consul-upstream-instance-list li>.detail .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail .tag-list+dl:not(:first-of-type),.consul-upstream-instance-list li>.detail dl .consul-bucket-list:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl .consul-instance-checks:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl .consul-lock-session-list dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl .tag-list:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl dd+dt,.consul-upstream-instance-list li>.detail dl dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl section[data-route="dc.show.license"] .validity dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl td.tags:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl+.consul-bucket-list:not(:first-of-type),.consul-upstream-instance-list li>.detail dl+.consul-instance-checks:not(:first-of-type),.consul-upstream-instance-list li>.detail dl+.tag-list:not(:first-of-type),.consul-upstream-instance-list li>.detail dl+dl:not(:first-of-type),.consul-upstream-instance-list li>.detail dl+td.tags:not(:first-of-type),.consul-upstream-instance-list li>.detail dl.local-bind-address dd+dt+dd,.consul-upstream-instance-list li>.detail dl.local-bind-socket-path dd+dt+dd,.consul-upstream-instance-list li>.detail dl:not([class]) .consul-bucket-list dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) .consul-instance-checks dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) .consul-lock-session-list dl dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) .tag-list dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) dl dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) section[data-route="dc.show.license"] .validity dl dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail dl:not([class]) td.tags dd+dt:not([class])+dd,.consul-upstream-instance-list li>.detail section[data-route="dc.show.license"] .validity dl+dl:not(:first-of-type),.consul-upstream-instance-list li>.detail section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+dl:not(:first-of-type),.consul-upstream-instance-list li>.detail td.tags+dl:not(:first-of-type),.consul-upstream-instance-list section[data-route="dc.show.license"] .validity dl li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list section[data-route="dc.show.license"] .validity dl+dl:not(:first-of-type),.consul-upstream-instance-list section[data-route="dc.show.license"] .validity dl:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+dl:not(:first-of-type),.consul-upstream-instance-list section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) li>.detail dl dd+dt:not([class])+dd,.consul-upstream-instance-list td.tags dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list td.tags li>.detail dl:not([class]) dd+dt:not([class])+dd,.consul-upstream-instance-list td.tags+dl:not(:first-of-type),.consul-upstream-instance-list td.tags:not([class]) dl dd+dt:not([class])+dd,.consul-upstream-instance-list td.tags:not([class]) li>.detail dl dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail .consul-bucket-list+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail .consul-instance-checks+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail .consul-lock-session-list dl+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail .consul-upstream-instance-list dl+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.list-collection>ul>li:not(:first-child)>.detail .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.list-collection>ul>li:not(:first-child)>.detail .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail .tag-list+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail dl .consul-bucket-list:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl .consul-instance-checks:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl .consul-lock-session-list dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl .consul-upstream-instance-list dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl .tag-list:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl dd+dt,.list-collection>ul>li:not(:first-child)>.detail dl section[data-route="dc.show.license"] .validity dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl td.tags:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl+.consul-bucket-list:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail dl+.consul-instance-checks:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail dl+.tag-list:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail dl+td.tags:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) .consul-bucket-list dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) .consul-instance-checks dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) .consul-lock-session-list dl dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) .consul-upstream-instance-list dl dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) .tag-list dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) section[data-route="dc.show.license"] .validity dl dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) td.tags dd+dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail section[data-route="dc.show.license"] .validity dl+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+dl:not(:first-of-type),.list-collection>ul>li:not(:first-child)>.detail td.tags+dl:not(:first-of-type),.tag-list .consul-bucket-list:not([class]) dd+dt:not([class])+dd,.tag-list .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,.tag-list .consul-instance-checks:not([class]) dd+dt:not([class])+dd,.tag-list .consul-lock-session-list dl:not([class]) dd+dt:not([class])+dd,.tag-list .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.tag-list .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,.tag-list .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,.tag-list .consul-upstream-instance-list dl:not([class]) dd+dt:not([class])+dd,.tag-list .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,.tag-list .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,.tag-list dd+dt,.tag-list section[data-route="dc.show.license"] .validity dl:not([class]) dd+dt:not([class])+dd,.tag-list section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dd+dt:not([class])+dd,.tag-list td.tags:not([class]) dd+dt:not([class])+dd,.tag-list+.consul-bucket-list:not(:first-of-type),.tag-list+.consul-instance-checks:not(:first-of-type),.tag-list+.tag-list:not(:first-of-type),.tag-list+td.tags:not(:first-of-type),.tag-list:not([class]) .consul-bucket-list dd+dt:not([class])+dd,.tag-list:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,.tag-list:not([class]) .consul-instance-checks dd+dt:not([class])+dd,.tag-list:not([class]) .consul-lock-session-list dl dd+dt:not([class])+dd,.tag-list:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.tag-list:not([class]) .consul-upstream-instance-list dl dd+dt:not([class])+dd,.tag-list:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,.tag-list:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,.tag-list:not([class]) dd+dt:not([class])+dd,.tag-list:not([class]) section[data-route="dc.show.license"] .validity dl dd+dt:not([class])+dd,.tag-list:not([class]) section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt:not([class])+dd,.tag-list:not([class]) td.tags dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-bucket-list+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .consul-exposed-path-list>ul>li>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-exposed-path-list>ul>li>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .consul-exposed-path-list>ul>li>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-instance-checks+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .consul-lock-session-list dl ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-lock-session-list dl+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .consul-lock-session-list dl:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-lock-session-list ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-lock-session-list ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-upstream-instance-list dl li>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-upstream-instance-list dl+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .consul-upstream-instance-list dl.local-bind-address dl dd+dt+dd,section[data-route="dc.show.license"] .validity .consul-upstream-instance-list dl.local-bind-socket-path dl dd+dt+dd,section[data-route="dc.show.license"] .validity .consul-upstream-instance-list dl:not([class]) li>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-upstream-instance-list li>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .consul-upstream-instance-list li>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .consul-upstream-instance-list li>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .list-collection>ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .list-collection>ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .tag-list dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity .tag-list+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity .tag-list:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,section[data-route="dc.show.license"] .validity dl .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,section[data-route="dc.show.license"] .validity dl .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl .tag-list:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl dd+dt,section[data-route="dc.show.license"] .validity dl td.tags:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl+.consul-bucket-list:not(:first-of-type),section[data-route="dc.show.license"] .validity dl+.consul-instance-checks:not(:first-of-type),section[data-route="dc.show.license"] .validity dl+.tag-list:not(:first-of-type),section[data-route="dc.show.license"] .validity dl+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity dl+td.tags:not(:first-of-type),section[data-route="dc.show.license"] .validity dl:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl:not([class]) .tag-list dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl:not([class]) td.tags dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity td.tags dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.license"] .validity td.tags+dl:not(:first-of-type),section[data-route="dc.show.license"] .validity td.tags:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-bucket-list+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-exposed-path-list>ul>li>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-exposed-path-list>ul>li>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-exposed-path-list>ul>li>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-instance-checks+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-lock-session-list dl ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-lock-session-list dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-lock-session-list dl:not([class]) ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-lock-session-list ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-lock-session-list ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list dl li>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list dl.local-bind-address dl dd+dt+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list dl.local-bind-socket-path dl dd+dt+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list dl:not([class]) li>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list li>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list li>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .consul-upstream-instance-list li>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .list-collection>ul>li:not(:first-child)>.detail dl dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .list-collection>ul>li:not(:first-child)>.detail dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .tag-list dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header .tag-list+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header .tag-list:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl .tag-list:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl td.tags:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+.consul-bucket-list:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+.consul-instance-checks:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+.tag-list:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl+td.tags:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) .tag-list dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) td.tags dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header td.tags dl:not([class]) dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header td.tags+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section header td.tags:not([class]) dl dd+dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section[data-route="dc.show.license"] .validity header dl+dl:not(:first-of-type),section[data-route="dc.show.serverstatus"] .redundancy-zones section[data-route="dc.show.license"] header .validity dl+dl:not(:first-of-type),td.tags .consul-bucket-list:not([class]) dd+dt:not([class])+dd,td.tags .consul-exposed-path-list>ul>li>.detail dl:not([class]) dd+dt:not([class])+dd,td.tags .consul-instance-checks:not([class]) dd+dt:not([class])+dd,td.tags .consul-lock-session-list dl:not([class]) dd+dt:not([class])+dd,td.tags .consul-lock-session-list ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,td.tags .consul-upstream-instance-list dl.local-bind-address dd+dt+dd,td.tags .consul-upstream-instance-list dl.local-bind-socket-path dd+dt+dd,td.tags .consul-upstream-instance-list dl:not([class]) dd+dt:not([class])+dd,td.tags .consul-upstream-instance-list li>.detail dl:not([class]) dd+dt:not([class])+dd,td.tags .list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dd+dt:not([class])+dd,td.tags .tag-list:not([class]) dd+dt:not([class])+dd,td.tags dd+dt,td.tags section[data-route="dc.show.license"] .validity dl:not([class]) dd+dt:not([class])+dd,td.tags section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dd+dt:not([class])+dd,td.tags+.consul-bucket-list:not(:first-of-type),td.tags+.consul-instance-checks:not(:first-of-type),td.tags+.tag-list:not(:first-of-type),td.tags+td.tags:not(:first-of-type),td.tags:not([class]) .consul-bucket-list dd+dt:not([class])+dd,td.tags:not([class]) .consul-exposed-path-list>ul>li>.detail dl dd+dt:not([class])+dd,td.tags:not([class]) .consul-instance-checks dd+dt:not([class])+dd,td.tags:not([class]) .consul-lock-session-list dl dd+dt:not([class])+dd,td.tags:not([class]) .consul-lock-session-list ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,td.tags:not([class]) .consul-upstream-instance-list dl dd+dt:not([class])+dd,td.tags:not([class]) .consul-upstream-instance-list li>.detail dl dd+dt:not([class])+dd,td.tags:not([class]) .list-collection>ul>li:not(:first-child)>.detail dl dd+dt:not([class])+dd,td.tags:not([class]) .tag-list dd+dt:not([class])+dd,td.tags:not([class]) dd+dt:not([class])+dd,td.tags:not([class]) section[data-route="dc.show.license"] .validity dl dd+dt:not([class])+dd,td.tags:not([class]) section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dd+dt:not([class])+dd{margin-left:var(--horizontal-kv-list-separator-width)}.consul-bucket-list dt+dd,.consul-exposed-path-list>ul>li>.detail dl dt+dd,.consul-instance-checks dt+dd,.consul-lock-session-list dl dt+dd,.consul-lock-session-list ul>li:not(:first-child)>.detail dl dt+dd,.consul-upstream-instance-list dl dt+dd,.consul-upstream-instance-list li>.detail dl dt+dd,.list-collection>ul>li:not(:first-child)>.detail dl dt+dd,.tag-list dt+dd,section[data-route="dc.show.license"] .validity dl dt+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl dt+dd,td.tags dt+dd{margin-left:4px}.consul-bucket-list:not([class]) dt:not([class])+dd,.consul-exposed-path-list>ul>li>.detail dl:not([class]) dt:not([class])+dd,.consul-instance-checks:not([class]) dt:not([class])+dd,.consul-lock-session-list dl:not([class]) dt:not([class])+dd,.consul-upstream-instance-list dl.local-bind-address dt+dd,.consul-upstream-instance-list dl.local-bind-socket-path dt+dd,.consul-upstream-instance-list dl:not([class]) dt:not([class])+dd,.list-collection>ul>li:not(:first-child)>.detail dl:not([class]) dt:not([class])+dd,.tag-list:not([class]) dt:not([class])+dd,section[data-route="dc.show.license"] .validity dl:not([class]) dt:not([class])+dd,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not([class]) dt:not([class])+dd,td.tags:not([class]) dt:not([class])+dd{margin-left:0!important}.consul-lock-session-list .checks dd>:not(:last-child)::after,.discovery-chain .resolver-card ol>:not(:last-child)::after,.tag-list dd>:not(:last-child)::after,td.tags dd>:not(:last-child)::after{display:inline;content:var(--csv-list-separator);vertical-align:initial;margin-right:.3em}.tag-list dt::before,td.tags dt::before{color:inherit;color:var(--token-color-foreground-faint)}.consul-exposed-path-list>ul>li>.detail dl>dt>*,.consul-lock-session-list ul>li:not(:first-child)>.detail dl>dt>*,.consul-upstream-instance-list li>.detail dl>dt>*,.list-collection>ul>li:not(:first-child)>.detail dl>dt>*{display:none}.consul-exposed-path-list>ul>li>.detail dl.passing dt::before,.consul-exposed-path-list>ul>li>.header .passing dd::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.passing dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .passing dd::before,.consul-upstream-instance-list li>.detail dl.passing dt::before,.consul-upstream-instance-list li>.header .passing dd::before,.list-collection>ul>li:not(:first-child)>.detail dl.passing dt::before,.list-collection>ul>li:not(:first-child)>.header .passing dd::before{color:var(--token-color-foreground-success)}.consul-exposed-path-list>ul>li>.detail dl.warning dt::before,.consul-exposed-path-list>ul>li>.header .warning dd::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.warning dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .warning dd::before,.consul-upstream-instance-list li>.detail dl.warning dt::before,.consul-upstream-instance-list li>.header .warning dd::before,.list-collection>ul>li:not(:first-child)>.detail dl.warning dt::before,.list-collection>ul>li:not(:first-child)>.header .warning dd::before{color:var(--token-color-foreground-warning)}.consul-exposed-path-list>ul>li>.detail dl.critical dt::before,.consul-exposed-path-list>ul>li>.header .critical dd::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.critical dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .critical dd::before,.consul-upstream-instance-list li>.detail dl.critical dt::before,.consul-upstream-instance-list li>.header .critical dd::before,.list-collection>ul>li:not(:first-child)>.detail dl.critical dt::before,.list-collection>ul>li:not(:first-child)>.header .critical dd::before{color:var(--token-color-foreground-critical)}.consul-exposed-path-list>ul>li>.detail dl.empty dt::before,.consul-exposed-path-list>ul>li>.detail dl.unknown dt::before,.consul-exposed-path-list>ul>li>.header .empty dd::before,.consul-exposed-path-list>ul>li>.header .unknown dd::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.empty dt::before,.consul-lock-session-list ul>li:not(:first-child)>.detail dl.unknown dt::before,.consul-lock-session-list ul>li:not(:first-child)>.header .empty dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header .unknown dd::before,.consul-upstream-instance-list li>.detail dl.empty dt::before,.consul-upstream-instance-list li>.detail dl.unknown dt::before,.consul-upstream-instance-list li>.header .empty dd::before,.consul-upstream-instance-list li>.header .unknown dd::before,.list-collection>ul>li:not(:first-child)>.detail dl.empty dt::before,.list-collection>ul>li:not(:first-child)>.detail dl.unknown dt::before,.list-collection>ul>li:not(:first-child)>.header .empty dd::before,.list-collection>ul>li:not(:first-child)>.header .unknown dd::before{color:var(--token-color-foreground-faint)}.consul-exposed-path-list>ul>li>.header [rel=me] dd::before,.consul-lock-session-list ul>li:not(:first-child)>.header [rel=me] dd::before,.consul-upstream-instance-list li>.header [rel=me] dd::before,.list-collection>ul>li:not(:first-child)>.header [rel=me] dd::before{color:var(--token-color-foreground-action)}.app-view>div form:not(.filter-bar) [role=radiogroup] label>em>code,.modal-dialog [role=document] .type-password>em>code,.modal-dialog [role=document] .type-select>em>code,.modal-dialog [role=document] .type-text>em>code,.modal-dialog [role=document] [role=radiogroup] label>em>code,.modal-dialog [role=document] form button+em>code,.modal-dialog [role=document] p code,.oidc-select label>em>code,.type-toggle>em>code,main .type-password>em>code,main .type-select>em>code,main .type-text>em>code,main form button+em>code,main p code{border:1px solid;color:var(--token-color-consul-brand);background-color:var(--token-color-surface-strong);border-color:var(--token-color-surface-interactive-active);display:inline-block;padding:0 4px}[data-tippy-root]{max-width:calc(100vw - 10px)}.tippy-box{outline:0;transition-property:transform,visibility,opacity;background-color:var(--token-color-surface-primary);border-radius:var(--decor-radius-100)}[data-animation=fade][data-state=hidden].tippy-box{opacity:0}[data-inertia][data-state=visible].tippy-box{transition-timing-function:cubic-bezier(.54,1.5,.38,1.11)}.tippy-box .tippy-arrow{--size:5px}.tippy-box .tippy-arrow::before{content:"";position:absolute}[data-placement^=top].tippy-box>.tippy-arrow{bottom:0}[data-placement^=top].tippy-box>.tippy-arrow::before{left:0;bottom:calc(0px - var(--size));transform-origin:center top}[data-placement^=bottom].tippy-box>.tippy-arrow{top:0}[data-placement^=bottom].tippy-box>.tippy-arrow::before{left:0;top:calc(0px - var(--size));transform-origin:center bottom}[data-placement^=left].tippy-box>.tippy-arrow{right:0}[data-placement^=left].tippy-box>.tippy-arrow::before{right:calc(0px - var(--size));transform-origin:center left}[data-placement^=right].tippy-box>.tippy-arrow{left:0}[data-placement^=right].tippy-box>.tippy-arrow::before{left:calc(0px - var(--size));transform-origin:center right}[data-theme~=square-tail] .tippy-arrow{--size:18px;left:calc(0px - var(--size)/ 2)!important}[data-theme~=square-tail] .tippy-arrow::before{background-color:var(--token-color-surface-primary);width:calc(1px + var(--size));height:calc(1px + var(--size));border:var(--decor-border-100);border-color:var(--token-color-palette-neutral-300)}[data-theme~=square-tail] .tippy-arrow::after{position:absolute;left:1px}[data-theme~=square-tail][data-placement^=top]{bottom:-10px}[data-theme~=square-tail][data-placement^=top] .informed-action{border-bottom-left-radius:0!important}[data-theme~=square-tail][data-placement^=top] .tippy-arrow::before{border-bottom-left-radius:var(--decor-radius-200);border-bottom-right-radius:var(--decor-radius-200);border-top:0!important}[data-theme~=square-tail][data-placement^=top] .tippy-arrow::after{bottom:calc(0px - var(--size))}[data-theme~=square-tail][data-placement^=bottom]{top:-10px}[data-theme~=square-tail][data-placement^=bottom] .informed-action{border-top-left-radius:0!important}[data-theme~=square-tail][data-placement^=bottom] .tippy-arrow::before{border-top-left-radius:var(--decor-radius-200);border-top-right-radius:var(--decor-radius-200);border-bottom:0!important}[data-theme~=square-tail][data-placement^=bottom] .tippy-arrow::after{top:calc(0px - var(--size))}.tippy-box[data-theme~=tooltip] .tippy-content{padding:12px;max-width:224px;position:relative;z-index:1}.tippy-box[data-theme~=tooltip]{background-color:var(--token-color-foreground-faint);color:var(--token-color-surface-primary)}.tippy-box[data-theme~=tooltip] .tippy-arrow{--size:5px;color:var(--token-color-foreground-faint);width:calc(var(--size) * 2);height:calc(var(--size) * 2)}.tippy-box[data-theme~=tooltip] .tippy-arrow::before{border-color:transparent;border-style:solid}.tippy-box[data-theme~=tooltip][data-placement^=top]>.tippy-arrow::before{border-width:var(--size) var(--size) 0;border-top-color:initial}.tippy-box[data-theme~=tooltip][data-placement^=bottom]>.tippy-arrow::before{border-width:0 var(--size) var(--size);border-bottom-color:initial}.tippy-box[data-theme~=tooltip][data-placement^=left]>.tippy-arrow::before{border-width:var(--size) 0 var(--size) var(--size);border-left-color:initial}.tippy-box[data-theme~=tooltip][data-placement^=right]>.tippy-arrow::before{border-width:var(--size) var(--size) var(--size) 0;border-right-color:initial}.warning.modal-dialog header{background-color:var(--token-color-vault-gradient-faint-start);border-color:var(--token-color-vault-brand);color:var(--token-color-vault-foreground)}.warning.modal-dialog header>:not(label){font-size:var(--typo-size-500);font-weight:var(--typo-weight-semibold)}.warning.modal-dialog header::before{color:var(--token-color-vault-brand);float:left;margin-top:2px;margin-right:3px}.modal-dialog>div:first-child{background-color:var(--token-color-surface-interactive);opacity:.9}.modal-dialog [role=document]>footer,.modal-dialog [role=document]>header,.modal-dialog-body{border-color:var(--token-color-palette-neutral-300)}.modal-dialog-body{border-style:solid;border-left-width:1px;border-right-width:1px}.modal-layer{height:0}.modal-dialog [role=document] table{height:150px!important}.modal-dialog [role=document] tbody{max-height:100px}.modal-dialog table{min-height:149px}.modal-dialog,.modal-dialog>div:first-child{position:fixed;top:0;right:0;bottom:0;left:0}.modal-dialog{z-index:500;align-items:center;justify-content:center;height:100%}[aria-hidden=true].modal-dialog{display:none}.modal-dialog [role=document]{box-shadow:var(--token-elevation-overlay-box-shadow);background-color:var(--token-color-surface-primary);margin:auto;z-index:2;max-width:855px;position:relative}.modal-dialog [role=document]>*{padding-left:15px;padding-right:15px}.modal-dialog [role=document]>div{overflow-y:auto;max-height:80vh;padding:20px 23px}.modal-dialog [role=document]>footer,.modal-dialog [role=document]>header{border-width:1px;padding-top:12px;padding-bottom:10px}.modal-dialog [role=document]>header{position:relative}.modal-dialog [role=document]>header button{float:right;margin-top:-3px}.list-collection>ul{border-top:1px solid;border-color:var(--token-color-surface-interactive-active)}.list-collection>button{cursor:pointer;background-color:var(--token-color-surface-strong);color:var(--token-color-foreground-action);width:100%;padding:15px}.list-collection-scroll-virtual,.list-collection>ul>li{position:relative}.list-collection-scroll-virtual{height:500px}.filter-bar{background-color:var(--token-color-foreground-high-contrast);border-bottom:var(--decor-border-100);border-color:var(--token-color-surface-interactive-active);padding:4px 8px}.filter-bar .filters .popover-menu>[type=checkbox]:checked+label button,.filter-bar .sort .popover-menu>[type=checkbox]:checked+label button{color:var(--token-color-foreground-action);background-color:var(--token-color-foreground-high-contrast)}.filter-bar .sort{margin-left:auto}.filter-bar .popover-select{position:relative;z-index:3}.filter-bar .popover-menu>[type=checkbox]+label button{padding-left:1.5rem!important;padding-right:1.5rem!important}.filter-bar .popover-menu [role=menuitem]{justify-content:normal!important}@media (max-width:1379px){.filter-bar,.filter-bar>div{flex-wrap:wrap}.filter-bar .search{position:relative;z-index:4;width:100%;margin-bottom:.3rem}}@media (max-width:995px){.filter-bar .filters,.filter-bar .sort{display:none}}html[data-route^="dc.acls.index"] .filter-bar{color:inherit}.freetext-filter{border:var(--decor-border-100);border-radius:var(--decor-radius-100);background-color:var(--token-color-surface-primary);border-color:var(--token-color-surface-interactive-active);color:var(--token-color-foreground-disabled)}.freetext-filter:hover,.freetext-filter:hover *{border-color:var(--token-color-foreground-disabled)}.freetext-filter_input::-moz-placeholder{cursor:inherit;color:inherit;border-color:inherit}.freetext-filter *,.freetext-filter_input::placeholder{cursor:inherit;color:inherit;border-color:inherit}.freetext-filter_input{-webkit-appearance:none;border:none}.freetext-filter_label::after{visibility:visible;--icon-name:icon-search;content:"";position:absolute;top:50%;left:50%;width:16px;height:16px;margin-left:-8px;margin-top:-8px}.freetext-filter .popover-menu{background-color:var(--token-color-surface-strong);color:var(--token-color-foreground-primary);border-left:1px solid;border-color:inherit}.freetext-filter .popover-menu>[type=checkbox]:checked+label button{background-color:var(--token-color-surface-interactive-active)}.freetext-filter{--height:2.2rem;display:flex;position:relative;height:var(--height);width:100%}.freetext-filter_input,.freetext-filter_label{height:100%}.freetext-filter_input{padding:8px 10px;padding-left:var(--height);min-width:12.7rem;width:100%}.freetext-filter_label{visibility:hidden;position:absolute;z-index:1;width:var(--height)}.informed-action{border-radius:var(--decor-radius-200);border:var(--decor-border-100);border-color:var(--token-color-palette-neutral-300);background-color:var(--token-color-surface-primary);min-width:190px}.informed-action>div{border-top-left-radius:var(--decor-radius-200);border-top-right-radius:var(--decor-radius-200);cursor:default;padding:1rem}.informed-action p{color:var(--token-color-hashicorp-brand)}.informed-action>ul>li>:focus,.informed-action>ul>li>:hover{background-color:var(--token-color-surface-strong)}.info.informed-action header{color:var(--token-color-foreground-action-active)}.info.informed-action header::before{background-color:var(--token-color-foreground-action);margin-right:5px}.info.informed-action>div{background-color:var(--token-color-surface-action)}.dangerous.informed-action header{color:var(--token-color-palette-red-400)}.dangerous.informed-action header::before{background-color:var(--token-color-foreground-critical)}.dangerous.informed-action>div{background-color:var(--token-color-surface-critical)}.warning.informed-action header{color:var(--token-color-foreground-warning-on-surface)}.warning.informed-action header::before{background-color:var(--token-color-vault-brand);margin-right:5px}.warning.informed-action>div{background-color:var(--token-color-vault-gradient-faint-start)}.copyable-code::after,.tab-nav li:not(.selected)>:active,.tab-nav li:not(.selected)>:focus,.tab-nav li:not(.selected)>:hover{background-color:var(--token-color-surface-strong)}.informed-action>ul>.action>*{color:var(--token-color-foreground-action)}.documentation.informed-action{min-width:270px}.informed-action header::before{float:left;margin-right:5px}.informed-action>ul{list-style:none;display:flex;margin:0;padding:4px}.informed-action>ul>li{width:50%}.informed-action>ul>li>*{width:100%}.tab-nav ul{list-style-type:none;display:inline-flex;align-items:center;position:relative;padding:0;margin:0}.tab-nav li>:not(:disabled){cursor:pointer}.tab-nav{border-bottom:var(--decor-border-100)}.animatable.tab-nav ul::after,.tab-nav li>*{border-bottom:var(--decor-border-300)}.tab-nav{border-color:var(--token-color-surface-interactive-active);clear:both;overflow:auto;letter-spacing:.03em}.tab-nav li>*{white-space:nowrap;transition-property:background-color,border-color;border-color:transparent;color:var(--token-color-foreground-faint);display:inline-block;padding:16px 13px}.tab-nav li:not(.selected)>:focus,.tab-nav li:not(.selected)>:hover{border-color:var(--token-color-palette-neutral-300)}.animatable.tab-nav .selected a{border-color:transparent!important}.animatable.tab-nav ul::after{position:absolute;bottom:0;height:0;border-top:0;width:calc(var(--selected-width,0) * 1px);transform:translate(calc(var(--selected-left,0) * 1px),0);transition-property:transform,width}.search-bar-status{border-bottom:var(--decor-border-100);border-bottom-color:var(--token-color-surface-interactive-active);padding:.5rem 0 .5rem .5rem}.search-bar-status li:not(.remove-all) button::before{color:var(--token-color-foreground-faint);margin-top:1px;margin-right:.2rem}.search-bar-status dt::after{content:":";padding-right:.3rem}.search-bar-status>dl>dt{float:left}.search-bar-status dt{white-space:nowrap}.search-bar-status li{display:inline-flex}.search-bar-status li:not(:last-child){margin-right:.3rem;margin-bottom:.3rem}.search-bar-status li:not(.remove-all){border:var(--decor-border-100);border-color:var(--token-color-surface-interactive-active);color:var(--token-color-foreground-faint);padding:0 .2rem}.search-bar-status li:not(.remove-all) dl{display:flex}.search-bar-status li:not(.remove-all) button{cursor:pointer;padding:0}.copyable-code{display:flex;align-items:flex-start;position:relative;width:100%;padding:8px 14px 3px;border:var(--decor-border-100);border-color:var(--token-color-surface-interactive-active);border-radius:var(--decor-radius-200)}.copyable-code.obfuscated{padding-left:4px}.copyable-code::after{position:absolute;top:0;right:0;width:40px;height:100%;display:block;content:""}.copyable-code .copy-button{position:absolute;top:0;right:0;z-index:1}.copyable-code .copy-button button{width:40px;height:40px}.copyable-code .copy-button button:empty::after{display:none}.copyable-code button[aria-expanded]{margin-top:1px;margin-right:4px;cursor:pointer}.copyable-code button[aria-expanded]::before{content:"";--icon-size:icon-000;--icon-color:var(--token-color-foreground-faint)}.copyable-code button[aria-expanded=true]::before{--icon-name:icon-eye-off}.copyable-code button[aria-expanded=false]::before{--icon-name:icon-eye}.copyable-code pre{padding-right:30px}.copyable-code code{display:inline-block;overflow:hidden;text-overflow:ellipsis;width:100%}.copyable-code hr{width:calc(100% - 80px);margin:8px 0 13px;border:3px dashed var(--token-color-palette-neutral-300);background-color:var(--token-color-surface-primary)}.consul-loader circle{fill:var(--token-color-consul-gradient-faint-stop);-webkit-animation:loader-animation 1.5s infinite ease-in-out;animation:loader-animation 1.5s infinite ease-in-out;transform-origin:50% 50%}.consul-loader g:nth-last-child(2) circle{-webkit-animation-delay:.2s;animation-delay:.2s}.consul-loader g:nth-last-child(3) circle{-webkit-animation-delay:.3s;animation-delay:.3s}.consul-loader g:nth-last-child(4) circle{-webkit-animation-delay:.4s;animation-delay:.4s}.consul-loader g:nth-last-child(5) circle{-webkit-animation-delay:.5s;animation-delay:.5s}@-webkit-keyframes loader-animation{0%,100%{transform:scale3D(1,1,1)}33%{transform:scale3D(0,0,1)}}@keyframes loader-animation{0%,100%{transform:scale3D(1,1,1)}33%{transform:scale3D(0,0,1)}}.consul-loader{display:flex;align-items:center;justify-content:center;height:100%;position:absolute;width:100%;top:0;margin-top:0!important}.tomography-graph .background{fill:var(--token-color-surface-strong)}.tomography-graph .axis{fill:none;stroke:var(--token-color-palette-neutral-300);stroke-dasharray:4 4}.tomography-graph .border{fill:none;stroke:var(--token-color-palette-neutral-300)}.tomography-graph .point{stroke:var(--token-color-foreground-disabled);fill:var(--token-color-consul-foreground)}.tomography-graph .lines rect{fill:var(--token-color-consul-foreground);stroke:transparent;stroke-width:5px}.tomography-graph .lines rect:hover{fill:var(--token-color-palette-neutral-300);height:3px;y:-1px}.tomography-graph .tick line{stroke:var(--token-color-palette-neutral-300)}.tomography-graph .tick text{font-size:var(--typo-size-600);text-anchor:start}.discovery-chain .resolver-card,.discovery-chain .route-card,.discovery-chain .splitter-card,.discovery-chain path{transition-duration:.1s;transition-timing-function:linear;cursor:pointer}.discovery-chain path{transition-property:stroke;fill:none;stroke:var(--token-color-foreground-disabled);stroke-width:2;vector-effect:non-scaling-stroke}#downstream-lines svg circle,#upstream-lines svg circle,.discovery-chain circle{fill:var(--token-color-surface-primary)}.discovery-chain .resolver-card,.discovery-chain .resolver-card a,.discovery-chain .route-card,.discovery-chain .route-card a,.discovery-chain .splitter-card,.discovery-chain .splitter-card a{color:var(--token-color-foreground-strong)!important}.discovery-chain path:focus,.discovery-chain path:hover{stroke:var(--token-color-foreground-strong)}.discovery-chain .resolvers,.discovery-chain .routes,.discovery-chain .splitters{border-radius:var(--decor-radius-100);border:1px solid;border-color:var(--token-color-surface-interactive-active);background-color:var(--token-color-surface-strong);pointer-events:none}.discovery-chain .resolver-card,.discovery-chain .resolvers>header span,.discovery-chain .route-card,.discovery-chain .routes>header span,.discovery-chain .splitter-card,.discovery-chain .splitters>header span{pointer-events:all}.discovery-chain .resolvers>header>*,.discovery-chain .routes>header>*,.discovery-chain .splitters>header>*{text-transform:uppercase}.discovery-chain .resolvers>header span::after,.discovery-chain .routes>header span::after,.discovery-chain .splitters>header span::after{width:1.2em;height:1.2em;opacity:.6}.discovery-chain .resolver-card,.discovery-chain .route-card,.discovery-chain .splitter-card{transition-property:opacity background-color border-color;margin-top:0!important}.discovery-chain [id*=":"]:not(path):hover{opacity:1;background-color:var(--token-color-surface-primary);border-color:var(--token-color-foreground-faint)}.discovery-chain .route-card header:not(.short) dd{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.discovery-chain .route-card section header>*{visibility:hidden}.discovery-chain .route-card .match-headers header ::before{content:"H"}.discovery-chain .route-card .match-queryparams header>::before{content:"Q"}.discovery-chain .resolver-card dt::before{content:"";--icon-size:icon-999}.discovery-chain .resolver-card dl.failover dt::before{--icon-name:icon-cloud-cross}.discovery-chain .resolver-card dl.redirect dt::before{--icon-name:icon-redirect}.discovery-chain circle{stroke-width:2;stroke:var(--token-color-foreground-disabled)}.discovery-chain{position:relative;display:flex;justify-content:space-between}.discovery-chain svg{position:absolute}.discovery-chain .resolvers,.discovery-chain .routes,.discovery-chain .splitters{padding:10px 1%;width:32%}.discovery-chain .resolvers>header,.discovery-chain .routes>header,.discovery-chain .splitters>header{height:18px}.discovery-chain .resolvers>header span,.discovery-chain .routes>header span,.discovery-chain .splitters>header span{position:relative;z-index:1;margin-left:2px}.discovery-chain .resolvers [role=group],.discovery-chain .routes [role=group],.discovery-chain .splitters [role=group]{position:relative;z-index:1;display:flex;flex-direction:column;justify-content:space-around;height:100%}.discovery-chain .resolver-card dl,.discovery-chain .route-card dl,.discovery-chain .splitter-card dl{margin:0;float:none}.discovery-chain .resolver-card,.discovery-chain .route-card,.discovery-chain .splitter-card{margin-bottom:20px}.discovery-chain .route-card header.short dl{display:flex}.discovery-chain .route-card header.short dt::after{content:" ";display:inline-block}.discovery-chain .route-card>header ul{float:right;margin-top:-2px}.discovery-chain .route-card>header ul li{margin-left:5px}.discovery-chain .route-card section{display:flex}.discovery-chain .route-card section header{display:block;width:19px;margin-right:14px}.discovery-chain .resolver-card a{display:block}.discovery-chain .resolver-card dl{display:flex;flex-wrap:wrap;margin-top:5px}.discovery-chain .resolver-card dt{font-size:0;margin-right:6px;margin-top:1px;width:23px;height:20px}.discovery-chain .resolver-card ol{display:flex;flex-wrap:wrap;list-style-type:none}.discovery-chain .route-card,.discovery-chain .splitter-card{position:relative}.discovery-chain .route-card::before,.discovery-chain .splitter-card::before{background-color:var(--token-color-surface-primary);border-radius:var(--decor-radius-full);border:2px solid;border-color:var(--token-color-foreground-disabled);position:absolute;z-index:1;right:-5px;top:50%;margin-top:-5px;width:10px;height:10px}.discovery-chain .resolver-inlets,.discovery-chain .splitter-inlets{width:10px;height:100%;z-index:1}.discovery-chain .splitter-inlets{left:50%;margin-left:calc(-15% - 3px)}.discovery-chain .resolver-inlets{right:calc(31% - 7px)}.consul-bucket-list .service+dd{font-weight:var(--typo-weight-semibold)}.consul-bucket-list dd:not(:last-child)::after{display:inline-block;content:"/";margin:0 6px 0 3px}.consul-bucket-list .service+dd,.consul-bucket-list dd+dt{margin-left:0!important}.consul-upstream-instance-list dl.local-bind-socket-mode dt{text-transform:lowercase;font-weight:var(--typo-weight-semibold)}.consul-health-check-list .health-check-output::before{min-width:20px;min-height:20px;margin-right:15px}@media (max-width:650px){.consul-health-check-list .health-check-output::before{min-width:18px;min-height:18px;margin-right:8px}}.consul-health-check-list .health-check-output dd em{background-color:var(--token-color-surface-strong);cursor:default;font-style:normal;margin-top:-2px;margin-left:.5em}.consul-health-check-list .passing.health-check-output::before{color:var(--token-color-foreground-success)}.consul-health-check-list .warning.health-check-output::before{color:var(--token-color-foreground-warning)}.consul-health-check-list .critical.health-check-output::before{color:var(--token-color-foreground-critical)}.consul-health-check-list .health-check-output,.consul-health-check-list .health-check-output pre{border-radius:var(--decor-radius-100)}.consul-health-check-list .health-check-output dd:first-of-type{color:var(--token-color-foreground-disabled)}.consul-health-check-list .health-check-output pre{background-color:var(--token-color-surface-strong);color:var(--token-color-foreground-faint)}.consul-health-check-list .health-check-output{border-width:1px 1px 1px 4px;color:var(--token-color-foreground-strong);border-color:var(--token-color-surface-interactive-active);border-style:solid;display:flex;padding:20px 24px 20px 16px}.consul-health-check-list .passing.health-check-output{border-left-color:var(--token-color-foreground-success)}.consul-health-check-list .warning.health-check-output{border-left-color:var(--token-color-vault-brand)}.consul-health-check-list .critical.health-check-output{border-left-color:var(--token-color-foreground-critical)}.consul-health-check-list .health-check-output:not(:last-child){margin-bottom:24px}.consul-health-check-list .health-check-output dl:last-of-type,.consul-health-check-list .health-check-output header{width:100%}.consul-health-check-list .health-check-output header{margin-bottom:.9em}.consul-health-check-list .health-check-output>div{flex:1 1 auto;width:calc(100% - 26px);display:flex;flex-wrap:wrap;justify-content:space-between}.consul-health-check-list .health-check-output dl{min-width:110px}.consul-health-check-list .health-check-output dl>*{display:block;width:auto;position:static;padding-left:0}.consul-health-check-list .health-check-output dt{margin-bottom:0}.consul-health-check-list .health-check-output dd{position:relative}.consul-health-check-list .health-check-output dl:nth-last-of-type(2){width:50%}.consul-health-check-list .health-check-output dl:last-of-type{margin-top:1em;margin-bottom:0}.consul-health-check-list .health-check-output dl:last-of-type dt{margin-bottom:.3em}.consul-health-check-list .health-check-output pre{padding:12px 40px 12px 12px;white-space:pre-wrap;position:relative}.consul-health-check-list .health-check-output pre code{word-wrap:break-word}.consul-health-check-list .health-check-output .copy-button{position:absolute;right:.5em;top:.7em}@media (max-width:650px){.consul-health-check-list .health-check-output{padding:15px 19px 15px 14px}.consul-health-check-list .health-check-output::before{margin-right:8px}.consul-health-check-list .health-check-output dl:nth-last-of-type(2){width:100%}.consul-health-check-list .health-check-output dl:not(:last-of-type){margin-right:0}}.consul-instance-checks.passing dt::before{color:var(--token-color-foreground-success)}.consul-instance-checks.warning dt::before{color:var(--token-color-foreground-warning)}.consul-instance-checks.critical dt::before{color:var(--token-color-foreground-critical)}.consul-instance-checks.empty dt::before{color:var(--token-color-foreground-faint)}.consul-exposed-path-list>ul{border-top:1px solid var(--token-color-surface-interactive-active)}.consul-external-source::before,.consul-kind::before{--icon-size:icon-300}.consul-intention-list td.intent- strong::before,.consul-intention-list td.intent-allow strong::before,.consul-intention-list td.intent-deny strong::before,.consul-intention-permission-list .intent-allow::before,.consul-intention-permission-list .intent-deny::before,.consul-intention-search-bar .value- span::before,.consul-intention-search-bar .value-allow span::before,.consul-intention-search-bar .value-deny span::before{margin-right:5px}.consul-intention-list td.intent- strong,.consul-intention-list td.intent-allow strong,.consul-intention-list td.intent-deny strong,.consul-intention-permission-list .intent-allow,.consul-intention-permission-list .intent-deny,.consul-intention-search-bar .value- span,.consul-intention-search-bar .value-allow span,.consul-intention-search-bar .value-deny span{display:inline-block;font-weight:var(--typo-weight-normal);font-size:var(--typo-size-600)}.consul-intention-list td.intent-allow strong,.consul-intention-permission-list .intent-allow,.consul-intention-search-bar .value-allow span{color:var(--token-color-foreground-success-on-surface);background-color:var(--token-color-border-success)}.consul-intention-list td.intent-deny strong,.consul-intention-permission-list .intent-deny,.consul-intention-search-bar .value-deny span{color:var(--token-color-foreground-critical-on-surface);background-color:var(--token-color-border-critical)}.consul-intention-list td.permissions{color:var(--token-color-foreground-action)}.consul-intention-list em{--word-spacing:0.25rem}.consul-intention-list em span::before,.consul-intention-list em span:first-child{margin-right:var(--word-spacing)}.consul-intention-list em span:last-child{margin-left:var(--word-spacing)}.consul-intention-list td{height:59px}.consul-intention-list tr>:nth-child(1){width:calc(30% - 50px)}.consul-intention-list tr>:nth-child(2){width:120px}.consul-intention-list tr>:nth-child(3){width:calc(30% - 50px)}.consul-intention-list tr>:nth-child(4){width:calc(40% - 240px)}.consul-intention-list tr>:nth-child(5){width:160px}.consul-intention-list tr>:last-child{width:60px}.consul-intention-list .menu-panel.confirmation{width:200px}@media (max-width:849px){.consul-intention-list tr>:not(.source):not(.destination):not(.intent){display:none}}.consul-intention-action-warn-modal .modal-dialog-window{max-width:450px}.consul-intention-action-warn-modal .modal-dialog-body p{font-size:var(--typo-size-600)}.consul-intention-fieldsets [role=radiogroup]{overflow:visible!important;display:grid;grid-gap:12px;grid-template-columns:repeat(auto-fit,minmax(270px,auto))}.consul-intention-fieldsets .radio-card header>*{display:inline}.consul-intention-fieldsets .permissions>button{float:right}.consul-intention-permission-modal [role=dialog]{width:100%}.consul-intention-permission-list dl.permission-methods dt::before{content:"M"}.consul-intention-permission-list dl.permission-path dt::before{content:"P"}.consul-intention-permission-header-list dt::before,.consul-intention-permission-list dl.permission-header dt::before{content:"H"}.consul-intention-permission-list .detail>div{display:flex;width:100%}.consul-intention-permission-list strong{margin-right:8px}.consul-intention-permission-form h2{border-top:1px solid var(--token-color-foreground-action);padding-top:1.4em;margin-top:.2em;margin-bottom:.6em}.consul-intention-permission-form .consul-intention-permission-header-form{margin-top:10px}.consul-intention-permission-form .consul-intention-permission-header-form fieldset>div,.consul-intention-permission-form fieldset:nth-child(2)>div{display:grid;grid-template-columns:repeat(auto-fit,minmax(160px,1fr));grid-gap:12px}.consul-intention-permission-form fieldset:nth-child(2)>div label:last-child{grid-column:span 2}.consul-intention-permission-form .ember-basic-dropdown-trigger{padding:5px}.consul-intention-permission-form .checkbox-group{flex-direction:column}.consul-intention-permission-header-list{max-height:200px;overflow:auto}.consul-lock-session-list button{margin-right:var(--horizontal-padding)}.consul-lock-session-form{overflow:hidden}.consul-server-list ul{display:grid;grid-template-columns:repeat(4,minmax(215px,25%));gap:12px}.consul-server-list a:hover div{box-shadow:var(--token-elevation-overlay-box-shadow);--tone-border:var(--token-color-foreground-faint)}.consul-server-card .name+dd{color:var(--token-color-hashicorp-brand);-webkit-animation-name:typo-truncate;animation-name:typo-truncate}.consul-server-card .health-status+dd{font-size:var(--typo-size-700)}.voting-status-non-voter.consul-server-card .health-status+dd{background-color:var(--token-color-surface-strong);color:var(--token-color-foreground-faint)}.consul-server-card:not(.voting-status-non-voter) .health-status.healthy+dd{background-color:var(--token-color-surface-success);color:var(--token-color-palette-green-400)}.consul-server-card:not(.voting-status-non-voter) .health-status:not(.healthy)+dd{background-color:var(--token-color-surface-critical);color:var(--token-color-foreground-critical)}.consul-server-card .health-status+dd::before{--icon-size:icon-000;content:""}.consul-server-card .health-status.healthy+dd::before{--icon-name:icon-check}.consul-server-card .health-status:not(.healthy)+dd::before{--icon-name:icon-x}.consul-server-card{position:relative;overflow:hidden;--padding-x:24px;--padding-y:24px;padding:var(--padding-y) var(--padding-x);--tile-size:3rem}.consul-auth-method-binding-list h2,.consul-auth-method-view section h2{padding-bottom:12px}.voting-status-leader.consul-server-card .name{position:absolute!important}.consul-server-card dd:not(:last-of-type){margin-bottom:calc(var(--padding-y)/ 2)}.voting-status-leader.consul-server-card dd{margin-left:calc(var(--tile-size) + 1rem)}.consul-auth-method-list ul .locality::before{margin-right:4px}.consul-auth-method-view{margin-bottom:32px}.consul-auth-method-view section{width:100%;position:relative;overflow-y:auto}.consul-auth-method-view section table thead td{color:var(--token-color-foreground-faint);font-weight:var(--typo-weight-semibold);font-size:var(--typo-size-700)}.consul-auth-method-view section table tbody td{font-size:var(--typo-size-600);color:var(--token-color-hashicorp-brand)}.consul-auth-method-view section table tbody tr{cursor:default}.consul-auth-method-view section table tbody tr:hover{box-shadow:none}.consul-auth-method-view section dt{width:30%}.consul-auth-method-view section dd{width:70%}.consul-auth-method-binding-list p{margin-bottom:4px!important}.consul-auth-method-binding-list code{background-color:var(--token-color-surface-strong);padding:0 12px}.consul-auth-method-nspace-list thead td{color:var(--token-color-foreground-faint)!important;font-weight:var(--typo-weight-semibold)!important;font-size:var(--typo-size-700)!important}.consul-auth-method-nspace-list tbody td{font-size:var(--typo-size-600);color:var(--token-color-hashicorp-brand)}.consul-auth-method-nspace-list tbody tr{cursor:default}.consul-auth-method-nspace-list tbody tr:hover{box-shadow:none}.role-selector [name="role[state]"],.role-selector [name="role[state]"]+*{display:none}.role-selector [name="role[state]"]:checked+*{display:block}.topology-notices button{color:var(--token-color-foreground-action);float:right;margin-top:16px;margin-bottom:32px}#metrics-container .link a,.topology-container{color:var(--token-color-foreground-faint)}#downstream-container .topology-metrics-card:not(:last-child),#upstream-column #upstream-container:not(:last-child),#upstream-container .topology-metrics-card:not(:last-child){margin-bottom:8px}#downstream-container,#metrics-container,#upstream-container{border-radius:var(--decor-radius-100);border:1px solid;border-color:var(--token-color-surface-interactive-active)}#downstream-container,#upstream-container{background-color:var(--token-color-surface-strong);padding:12px}#downstream-container>div:first-child{display:inline-flex}#downstream-container>div:first-child span::before{background-color:var(--token-color-foreground-faint)}#metrics-container div:first-child{background-color:var(--token-color-surface-primary);padding:12px;border:none;font-size:16px;font-weight:700}#metrics-container .link{background-color:var(--token-color-surface-strong);padding:18px}#metrics-container .link a:hover{color:var(--token-color-foreground-action)}#downstream-lines svg path,#upstream-lines svg path{fill:transparent}#downstream-lines svg .allow-arrow,#upstream-lines svg .allow-arrow{fill:var(--token-color-palette-neutral-300);stroke-linejoin:round}#downstream-lines svg .allow-arrow,#downstream-lines svg .allow-dot,#downstream-lines svg path,#upstream-lines svg .allow-arrow,#upstream-lines svg .allow-dot,#upstream-lines svg path{stroke:var(--token-color-palette-neutral-300);stroke-width:2}#downstream-lines svg path[data-permission=empty],#downstream-lines svg path[data-permission=not-defined],#upstream-lines svg path[data-permission=empty],#upstream-lines svg path[data-permission=not-defined]{stroke-dasharray:4}#downstream-lines svg path[data-permission=deny],#upstream-lines svg path[data-permission=deny]{stroke:var(--token-color-foreground-critical)}#downstream-lines svg .deny-dot,#upstream-lines svg .deny-dot{stroke:var(--token-color-foreground-critical);stroke-width:2}#downstream-lines svg .deny-arrow,#upstream-lines svg .deny-arrow{fill:var(--token-color-foreground-critical);stroke:var(--token-color-foreground-critical);stroke-linejoin:round}.topology-notices{display:flow-root}.topology-container{display:grid;height:100%;align-items:start;grid-template-columns:2fr 1fr 2fr 1fr 2fr;grid-template-rows:50px 1fr 50px;grid-template-areas:"down-cards down-lines . up-lines up-cards" "down-cards down-lines metrics up-lines up-cards" "down-cards down-lines . up-lines up-cards"}#downstream-container{grid-area:down-cards}#downstream-lines{grid-area:down-lines;margin-left:-20px}#upstream-lines{grid-area:up-lines;margin-right:-20px}#upstream-column{grid-area:up-cards}#downstream-lines,#upstream-lines{position:relative}#metrics-container{grid-area:metrics}#metrics-container .link a::before{background-color:var(--token-color-foreground-faint);margin-right:4px}#downstream-container .topology-metrics-card,#upstream-container .topology-metrics-card{display:block;color:var(--token-color-foreground-faint);overflow:hidden;background-color:var(--token-color-surface-primary);border-radius:var(--decor-radius-100);border:1px solid;border-color:var(--token-color-surface-interactive-active)}#downstream-container .topology-metrics-card p,#upstream-container .topology-metrics-card p{padding:12px 12px 0;font-size:var(--typo-size-500);font-weight:var(--typo-weight-semibold);margin-bottom:0!important}#downstream-container .topology-metrics-card p.empty,#upstream-container .topology-metrics-card p.empty{padding:12px!important}#downstream-container .topology-metrics-card div dl,#upstream-container .topology-metrics-card div dl{display:inline-flex;margin-right:8px}#downstream-container .topology-metrics-card div dd,#upstream-container .topology-metrics-card div dd{color:var(--token-color-foreground-faint)}#downstream-container .topology-metrics-card div span,#upstream-container .topology-metrics-card div span{margin-right:8px}#downstream-container .topology-metrics-card div dt::before,#downstream-container .topology-metrics-card div span::before,#upstream-container .topology-metrics-card div dt::before,#upstream-container .topology-metrics-card div span::before{margin-right:4px}#downstream-container .topology-metrics-card div .health dt::before,#downstream-container .topology-metrics-card div .nspace dt::before,#upstream-container .topology-metrics-card div .health dt::before,#upstream-container .topology-metrics-card div .nspace dt::before{margin-top:2px}#downstream-container .topology-metrics-card div .health dt::before,#downstream-container .topology-metrics-card div .nspace dt::before,#downstream-container .topology-metrics-card div .partition dt::before,#upstream-container .topology-metrics-card div .health dt::before,#upstream-container .topology-metrics-card div .nspace dt::before,#upstream-container .topology-metrics-card div .partition dt::before{--icon-color:var(--token-color-foreground-faint)}#downstream-container .topology-metrics-card div .passing::before,#upstream-container .topology-metrics-card div .passing::before{--icon-color:var(--token-color-foreground-success)}#downstream-container .topology-metrics-card div .warning::before,#upstream-container .topology-metrics-card div .warning::before{--icon-color:var(--token-color-foreground-warning)}#downstream-container .topology-metrics-card div .critical::before,#upstream-container .topology-metrics-card div .critical::before{--icon-color:var(--token-color-foreground-critical)}#downstream-container .topology-metrics-card div .empty::before,#upstream-container .topology-metrics-card div .empty::before{--icon-color:var(--token-color-foreground-faint)}#downstream-container .topology-metrics-card .details,#upstream-container .topology-metrics-card .details{padding:0 12px 12px}#downstream-container .topology-metrics-card .details>:not(:last-child),#upstream-container .topology-metrics-card .details>:not(:last-child){padding-bottom:6px}#downstream-container .topology-metrics-card .details .group,#upstream-container .topology-metrics-card .details .group{display:grid;grid-template-columns:20px 1fr;grid-template-rows:repeat(2,1fr);grid-template-areas:"partition partition" "union namespace"}#downstream-container .topology-metrics-card .details .group span,#upstream-container .topology-metrics-card .details .group span{display:inline-block;grid-area:union;padding-left:7px;margin-right:0}#downstream-container .topology-metrics-card .details .group span::before,#upstream-container .topology-metrics-card .details .group span::before{margin-right:0;--icon-color:var(--token-color-foreground-faint)}#downstream-container .topology-metrics-card .details .group dl:first-child,#upstream-container .topology-metrics-card .details .group dl:first-child{grid-area:partition;padding-bottom:6px}#downstream-container .topology-metrics-card .details .group dl:nth-child(2),#upstream-container .topology-metrics-card .details .group dl:nth-child(2){grid-area:namespace}.topology-metrics-source-type{margin:6px 0 6px 12px;display:table}.topology-metrics-popover>button{position:absolute;transform:translate(-50%,-50%);background-color:var(--token-color-surface-primary);padding:1px}.topology-metrics-popover>button:hover{cursor:pointer}.topology-metrics-popover>button:disabled,html[data-route^="dc.nodes.show.metadata"] table tr{cursor:default}.topology-metrics-popover>button:active,.topology-metrics-popover>button:focus{outline:0}.topology-metrics-popover.deny .informed-action header::before{display:none}.topology-metrics-popover.deny .tippy-arrow::after,.topology-metrics-popover.deny>button::before{--icon-color:var(--token-color-foreground-critical)}.topology-metrics-popover.not-defined .tippy-arrow::after,.topology-metrics-popover.not-defined>button::before{--icon-color:var(--token-color-vault-brand)}#metrics-container .sparkline-wrapper svg path{stroke-width:0}#metrics-container .sparkline-wrapper .tooltip{padding:0 0 10px;font-size:.875em;line-height:1.5em;font-weight:400;border:1px solid var(--token-color-palette-neutral-300);background:#fff;border-radius:2px;box-sizing:border-box;box-shadow:var(--token-elevation-higher-box-shadow)}#metrics-container .sparkline-wrapper .tooltip .sparkline-time{padding:8px 10px;font-weight:700;font-size:14px;color:#000;border-bottom:1px solid var(--token-color-surface-interactive-active);margin-bottom:4px;text-align:center}#metrics-container .sparkline-wrapper .tooltip .sparkline-tt-legend,#metrics-container .sparkline-wrapper .tooltip .sparkline-tt-sum{border:0;padding:3px 10px 0}#metrics-container .sparkline-wrapper .tooltip .sparkline-tt-sum{border-top:1px solid var(--token-color-surface-interactive-active);margin-top:4px;padding:8px 10px 0}#metrics-container .sparkline-wrapper .tooltip .sparkline-tt-legend-color{width:12px;height:12px;border-radius:2px;margin:0 5px 0 0;padding:0}#metrics-container .sparkline-wrapper .tooltip .sparkline-tt-legend-value,#metrics-container .sparkline-wrapper .tooltip .sparkline-tt-sum-value{float:right}#metrics-container .sparkline-wrapper div.tooltip:before{content:"";display:block;position:absolute;width:12px;height:12px;left:15px;bottom:-7px;border:1px solid var(--token-color-palette-neutral-300);border-top:0;border-left:0;background:#fff;transform:rotate(45deg)}.sparkline-key h3::before{margin:2px 3px 0 0;font-size:14px}.sparkline-key h3{color:var(--token-color-foreground-strong);font-size:16px}.sparkline-key .sparkline-key-content dd,.sparkline-key-link{color:var(--token-color-foreground-faint)}.sparkline-key-link:hover{color:var(--token-color-foreground-action)}#metrics-container:hover .sparkline-key-link::before{margin:1px 3px 0 0;font-size:12px}#metrics-container div .sparkline-wrapper,#metrics-container div .sparkline-wrapper svg.sparkline{width:100%;height:70px;padding:0;margin:0}#metrics-container div .sparkline-wrapper{position:relative}#metrics-container div .sparkline-wrapper .tooltip{visibility:hidden;position:absolute;z-index:10;bottom:78px;width:217px}#metrics-container div .sparkline-wrapper .sparkline-tt-legend-color{display:inline-block}#metrics-container div .sparkline-wrapper .topology-metrics-error,#metrics-container div .sparkline-wrapper .topology-metrics-loader{padding-top:15px}.sparkline-key .sparkline-key-content{width:500px;min-height:100px}.sparkline-key .sparkline-key-content dl{padding:10px 0 0}.sparkline-key .sparkline-key-content dt{font-weight:600;width:125px;float:left}.sparkline-key .sparkline-key-content dd{margin:0 0 12px 135px}.sparkline-key-link{visibility:hidden;float:right;margin-top:-35px;margin-right:12px}#metrics-container:hover .sparkline-key-link{visibility:visible}.topology-metrics-stats{padding:12px 12px 0;display:flex;flex-flow:row wrap;justify-content:space-between;align-items:stretch;width:100%;border-top:1px solid var(--token-color-surface-interactive-active)}.topology-metrics-stats dl{display:flex;padding-bottom:12px}.topology-metrics-stats dt{margin-right:5px;line-height:1.5em!important}.topology-metrics-stats dd{color:var(--token-color-foreground-disabled)!important}.topology-metrics-stats span{padding-bottom:12px}.topology-metrics-status-error,.topology-metrics-status-loader{font-weight:400;font-size:.875rem;color:var(--token-color-foreground-faint);text-align:center;margin:0 auto!important;display:block}.topology-metrics-status-error span::before,.topology-metrics-status-loader span::before{background-color:var(--token-color-foreground-faint)}span.topology-metrics-status-loader::after{--icon-name:var(--icon-loading);content:"";margin-left:.5rem}.consul-node-peer-info .consul-node-peer-info__name,.consul-peer-info .consul-peer-info__description{margin-left:4px}.consul-intention-list-table__meta-info{display:flex}.consul-intention-list-table__meta-info .consul-intention-list-table__meta-info__peer{display:flex;align-items:center}.consul-node-peer-info,.peerings-badge{align-items:center;display:flex}.consul-peer-search-bar .value-active span::before,.consul-peer-search-bar .value-deleting span::before,.consul-peer-search-bar .value-establishing span::before,.consul-peer-search-bar .value-failing span::before,.consul-peer-search-bar .value-pending span::before,.consul-peer-search-bar .value-terminated span::before{--icon-size:icon-000;content:""}.consul-peer-search-bar .value-active span,.consul-peer-search-bar .value-deleting span,.consul-peer-search-bar .value-establishing span,.consul-peer-search-bar .value-failing span,.consul-peer-search-bar .value-pending span,.consul-peer-search-bar .value-terminated span{font-weight:var(--typo-weight-medium);font-size:var(--typo-size-700)}.consul-peer-search-bar .value-pending span::before{--icon-name:icon-running;--icon-color:var(--token-color-palette-neutral-600)}.consul-peer-search-bar .value-pending span{background-color:var(--token-color-consul-surface);color:var(--token-color-consul-foreground)}.consul-peer-search-bar .value-establishing span::before{--icon-name:icon-running;--icon-color:var(--token-color-palette-neutral-600)}.consul-peer-search-bar .value-establishing span{background-color:var(--token-color-palette-blue-50);color:var(--token-color-palette-blue-200)}.consul-peer-search-bar .value-active span::before{--icon-name:icon-check;--icon-color:var(--token-color-palette-green-400)}.consul-peer-search-bar .value-active span{background-color:var(--token-color-palette-green-50);color:var(--token-color-palette-green-200)}.consul-peer-search-bar .value-failing span::before{--icon-name:icon-x;--icon-color:var(--token-color-palette-red-200)}.consul-peer-search-bar .value-failing span{background-color:var(--token-color-palette-red-50);color:var(--token-color-palette-red-200)}.consul-peer-search-bar .value-terminated span::before{--icon-name:icon-x-square;--icon-color:var(--token-color-palette-neutral-600)}.consul-peer-search-bar .value-terminated span{background-color:var(--token-color-palette-neutral-200);color:var(--token-color-palette-neutral-600)}.consul-peer-search-bar .value-deleting span::before{--icon-name:icon-loading;--icon-color:var(--token-color-foreground-warning-on-surface)}.consul-peer-search-bar .value-deleting span{background-color:var(--token-color-surface-warning);color:var(--token-color-foreground-warning-on-surface)}.peers__list__peer-detail{display:flex;align-content:center;gap:18px}.border-bottom-primary{border-bottom:1px solid var(--token-color-border-primary)}.peerings-badge{justify-content:center;padding:2px 8px;border-radius:5px;gap:4px}.peerings-badge.active{background:var(--token-color-surface-success);color:var(--token-color-foreground-success)}.peerings-badge.pending{background:var(--token-color-consul-surface);color:var(--token-color-consul-brand)}.peerings-badge.establishing{background:var(--token-color-surface-action);color:var(--token-color-foreground-action)}.peerings-badge.failing{background:var(--token-color-surface-critical);color:var(--token-color-foreground-critical)}.peerings-badge.deleting{background:var(--token-color-surface-warning);color:var(--token-color-foreground-warning-on-surface)}.peerings-badge.terminated,.peerings-badge.undefined{background:var(--token-color-surface-interactive-active);color:var(--token-color-foreground-primary)}.consul-peer-info,section[data-route="dc.show.serverstatus"] .server-failure-tolerance dt{color:var(--token-color-foreground-faint)}.peerings-badge .peerings-badge__text{font-weight:500;font-size:13px}.consul-peer-info{background:var(--token-color-surface-faint);padding:0 8px;border-radius:2px;display:flex;align-items:center}.consul-peer-form{width:416px}.consul-peer-form nav{margin-bottom:20px}.consul-peer-form-generate{width:416px;min-height:200px}.consul-peer-form-generate ol{list-style-position:outside;list-style-type:none;counter-reset:hexagonal-counter;position:relative}.consul-peer-form-generate ol::before{content:"";border-left:var(--decor-border-100);border-color:var(--token-color-palette-neutral-300);height:100%;position:absolute;left:2rem}.consul-peer-form-generate li{counter-increment:hexagonal-counter;position:relative;margin-left:60px;margin-bottom:1rem}.consul-peer-form-generate li .copyable-code{margin-top:1rem}.consul-peer-form-generate li::before{--icon-name:icon-hexagon;--icon-size:icon-600;content:"";position:absolute;z-index:2}.consul-peer-form-generate li::after{content:counter(hexagonal-counter);position:absolute;top:0;font-size:14px;font-weight:var(--typo-weight-bold);background-color:var(--token-color-palette-neutral-0);z-index:1;text-align:center}.consul-peer-form-generate li::after,.consul-peer-form-generate li::before{left:-2.4rem;width:20px;height:20px}.consul-hcp-home{position:relative;top:-22px}.consul-hcp-home a::before{content:"";--icon-name:icon-arrow-left;--icon-size:icon-300;margin-right:8px}.agentless-node-notice .hds-alert__title{display:flex;justify-content:space-between}.definition-table dt{line-height:var(--typo-lead-700)}.app-view>div form:not(.filter-bar) [role=radiogroup] label,.modal-dialog [role=document] [role=radiogroup] label{line-height:var(--typo-lead-200)}.app-view>div form:not(.filter-bar) [role=radiogroup] label>span,.consul-intention-action-warn-modal button.dangerous,.copy-button button,.modal-dialog [role=document] .type-password>span,.modal-dialog [role=document] .type-select>span,.modal-dialog [role=document] .type-text>span,.modal-dialog [role=document] [role=radiogroup] label>span,.oidc-select label>span,.popover-select label>*,.topology-notices button,.type-sort.popover-select label>*,.type-toggle>span,main .type-password>span,main .type-select>span,main .type-text>span,span.label{font-weight:var(--typo-weight-semibold)}.discovery-chain .route-card header:not(.short) dd,.discovery-chain .route-card section dt,.discovery-chain .splitter-card>header{font-weight:var(--typo-weight-bold)}.app-view h1 em,.app-view>div form:not(.filter-bar) [role=radiogroup] label>strong,.consul-auth-method-type,.consul-external-source,.consul-health-check-list .health-check-output dd em,.consul-intention-list td strong,.consul-intention-list td.destination em,.consul-intention-list td.source em,.consul-intention-permission-list strong,.consul-intention-search-bar li button span,.consul-kind,.consul-peer-search-bar li button span,.consul-server-card .health-status+dd,.consul-source,.consul-transparent-proxy,.discovery-chain .route-card header dt,.discovery-chain .route-card>header ul li,.empty-state header :nth-child(2),.hashicorp-consul nav .dcs .dc-name span,.hashicorp-consul nav .dcs li.is-local span,.hashicorp-consul nav .dcs li.is-primary span,.leader,.modal-dialog [role=document] .type-password>strong,.modal-dialog [role=document] .type-select>strong,.modal-dialog [role=document] .type-text>strong,.modal-dialog [role=document] [role=radiogroup] label>strong,.modal-dialog [role=document] label a[rel*=help],.modal-dialog [role=document] table td:first-child em,.oidc-select label>strong,.search-bar-status li:not(.remove-all),.topology-metrics-source-type,.type-toggle>strong,html[data-route^="dc.acls.index"] main td strong,main .type-password>strong,main .type-select>strong,main .type-text>strong,main label a[rel*=help],main table td:first-child em,section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl,section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em,span.policy-node-identity,span.policy-service-identity{font-weight:var(--typo-weight-normal)}.app-view h1 em,.app-view>div form:not(.filter-bar) [role=radiogroup] label>em,.consul-intention-list td.destination em,.consul-intention-list td.source em,.modal-dialog [role=document] .type-password>em,.modal-dialog [role=document] .type-select>em,.modal-dialog [role=document] .type-text>em,.modal-dialog [role=document] [role=radiogroup] label>em,.modal-dialog [role=document] form button+em,.modal-dialog [role=document] table td:first-child em,.oidc-select label>em,.type-toggle>em,main .type-password>em,main .type-select>em,main .type-text>em,main form button+em,main table td:first-child em{font-style:normal}.consul-exposed-path-list>ul>li>.header,.consul-lock-session-list ul>li:not(:first-child)>.header,.consul-upstream-instance-list li>.header,.list-collection>ul>li:not(:first-child)>.header{font-size:var(--typo-size-450);font-weight:var(--typo-weight-medium)}.consul-exposed-path-list>ul>li>.header :not(button),.consul-lock-session-list ul>li:not(:first-child)>.header :not(button),.consul-upstream-instance-list li>.header :not(button),.list-collection>ul>li:not(:first-child)>.header :not(button){font-size:inherit;font-weight:inherit}.app-view h1 em{font-size:var(--typo-size-500)}@media (max-width:420px) and (-webkit-min-device-pixel-ratio:0){input{font-size:16px!important}}#wrapper{box-sizing:content-box}#wrapper>footer>*,.modal-dialog>*,main>*{box-sizing:border-box}html[data-route$=create] main,html[data-route$=edit] main{max-width:1260px}fieldset [role=group]{display:flex;flex-wrap:wrap;flex-direction:row}.outlet[data-state=loading],html.ember-loading .view-loader,html:not(.has-nspaces) [class*=nspace-],html:not(.has-partitions) [class*=partition-],html[data-state=idle] .view-loader{display:none}[role=group] fieldset{width:50%}[role=group] fieldset:not(:first-of-type){padding-left:20px;border-left:1px solid;border-left:var(--token-color-foreground-faint)}[role=group] fieldset:not(:last-of-type){padding-right:20px}.app-view{margin-top:50px}@media (max-width:849px){html:not(.with-breadcrumbs) .app-view{margin-top:10px}}html body>.brand-loader{transition-property:transform,opacity;transform:translate(0,0);opacity:1}html[data-state]:not(.ember-loading) body>.brand-loader{opacity:0}@media (min-width:900px){html[data-state] body>.brand-loader{transform:translate(calc(var(--chrome-width)/ 2),0)}}html[data-route$=create] .app-view>header+div>:first-child,html[data-route$=edit] .app-view>header+div>:first-child{margin-top:1.8em}.app-view>div .container,.app-view>div .tab-section .consul-health-check-list,.app-view>div .tab-section>.search-bar+p,.app-view>div .tab-section>:first-child:not(.filter-bar):not(table){margin-top:1.25em}.consul-upstream-instance-list,html[data-route^="dc.nodes.show.sessions"] .consul-lock-session-list{margin-top:0!important}.consul-auth-method-list ul,.consul-node-list ul,.consul-nspace-list ul,.consul-peer-list ul,.consul-policy-list ul,.consul-role-list ul,.consul-service-instance-list ul,.consul-token-list ul,html[data-route="dc.services.index"] .consul-service-list ul,html[data-route^="dc.nodes.show.sessions"] .consul-lock-session-list ul{border-top-width:0!important}#wrapper{padding-left:48px;padding-right:48px;display:flex;min-height:100vh;flex-direction:column}main{position:relative;flex:1}html:not([data-route$=index]):not([data-route$=instances]) main{margin-bottom:2em}@media (max-width:849px){.actions button.copy-btn{margin-top:-56px;padding:0}}.modal-dialog [role=document] p:not(:last-child),main p:not(:last-child){margin-bottom:1em}.modal-dialog [role=document] form+div .with-confirmation,.modal-dialog [role=document] form:not(.filter-bar),main form+div .with-confirmation,main form:not(.filter-bar){margin-bottom:2em}@media (max-width:420px){main form [type=reset]{float:right;margin-right:0!important}}html[data-route^="dc.services.show"] .app-view .actions .external-dashboard{position:absolute;top:50px;right:0}html[data-route^="dc.services.instance"] .app-view>header dl{float:left;margin-top:19px;margin-bottom:23px;margin-right:50px}html[data-route^="dc.services.instance"] .app-view>header dt{font-weight:var(--typo-weight-bold)}html[data-route^="dc.services.instance"] .tab-nav{border-top:var(--decor-border-100)}html[data-route^="dc.services.instance"] .tab-section section:not(:last-child){border-bottom:var(--decor-border-100);padding-bottom:24px}html[data-route^="dc.services.instance"] .tab-nav,html[data-route^="dc.services.instance"] .tab-section section:not(:last-child){border-color:var(--token-color-surface-interactive-active)}html[data-route^="dc.services.instance.metadata"] .tab-section section h2{margin:24px 0 12px}html[data-route^="dc.kv"] .type-toggle{float:right;margin-bottom:0!important}html[data-route^="dc.kv.edit"] h2{border-bottom:var(--decor-border-200);border-color:var(--token-color-surface-interactive-active);padding-bottom:.2em;margin-bottom:.5em}html[data-route^="dc.acls.index"] main td strong{margin-right:3px}@media (max-width:420px){html[data-route^="dc.acls.create"] main header .actions,html[data-route^="dc.acls.edit"] main header .actions{float:none;display:flex;justify-content:space-between;margin-bottom:1em}html[data-route^="dc.acls.create"] main header .actions .with-feedback,html[data-route^="dc.acls.edit"] main header .actions .with-feedback{position:absolute;right:0}html[data-route^="dc.acls.create"] main header .actions .with-confirmation,html[data-route^="dc.acls.edit"] main header .actions .with-confirmation{margin-top:0}}html[data-route^="dc.intentions.edit"] .definition-table{margin-bottom:1em}section[data-route="dc.show.serverstatus"] .server-failure-tolerance{box-shadow:none;padding:var(--padding-y) var(--padding-x);max-width:770px;display:flex;flex-wrap:wrap}section[data-route="dc.show.serverstatus"] .server-failure-tolerance>header{width:100%;display:flex;flex-direction:row;justify-content:space-between;align-items:center;padding-bottom:.5rem;margin-bottom:1rem;border-bottom:var(--decor-border-100);border-color:var(--tone-border)}section[data-route="dc.show.serverstatus"] .server-failure-tolerance header em{font-size:.812rem;background-color:var(--token-color-surface-interactive-active);text-transform:uppercase;font-style:normal}section[data-route="dc.show.serverstatus"] .server-failure-tolerance>section{width:50%}section[data-route="dc.show.serverstatus"] .server-failure-tolerance dl,section[data-route="dc.show.serverstatus"] .server-failure-tolerance>section{display:flex;flex-direction:column}section[data-route="dc.show.serverstatus"] .server-failure-tolerance dl{flex-grow:1;justify-content:space-between}section[data-route="dc.show.serverstatus"] .server-failure-tolerance dl.warning dd::before{--icon-name:icon-alert-circle;--icon-size:icon-800;--icon-color:var(--token-color-foreground-warning);content:"";margin-right:.5rem}section[data-route="dc.show.serverstatus"] .server-failure-tolerance section:first-of-type dl{padding-right:1.5rem}section[data-route="dc.show.serverstatus"] .server-failure-tolerance dd{display:flex;align-items:center;font-size:var(--typo-size-250);color:var(--token-color-hashicorp-brand)}section[data-route="dc.show.serverstatus"] .server-failure-tolerance header span::before{--icon-name:icon-info;--icon-size:icon-300;--icon-color:var(--token-color-foreground-faint);vertical-align:unset;content:""}section[data-route="dc.show.serverstatus"] section:not([class*=-tolerance]) h2{margin-top:1.5rem;margin-bottom:1.5rem}section[data-route="dc.show.serverstatus"] section:not([class*=-tolerance]) header{margin-top:18px;margin-bottom:18px}section[data-route="dc.show.serverstatus"] .redundancy-zones section header{display:flow-root}section[data-route="dc.show.serverstatus"] .redundancy-zones section header h3{float:left;margin-right:.5rem}section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl:not(.warning){background-color:var(--token-color-surface-strong)}section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.warning{background-color:var(--token-color-border-warning);color:var(--token-color-palette-amber-400)}section[data-route="dc.show.serverstatus"] .redundancy-zones section header dl.warning::before{--icon-name:icon-alert-circle;--icon-size:icon-000;margin-right:.312rem;content:""}section[data-route="dc.show.serverstatus"] .redundancy-zones section header dt::after{content:":";display:inline-block;vertical-align:revert;background-color:transparent}section[data-route="dc.show.license"] .validity p{color:var(--token-color-foreground-faint)}section[data-route="dc.show.license"] .validity dl{font-size:var(--typo-size-400)}section[data-route="dc.show.license"] .validity dl dt::before{content:"";margin-right:.25rem}section[data-route="dc.show.license"] .validity dl .expired::before{--icon-name:icon-x-circle;--icon-color:var(--token-color-foreground-critical)}section[data-route="dc.show.license"] .validity dl .warning::before{--icon-name:icon-alert-circle;--icon-color:var(--token-color-foreground-warning)}section[data-route="dc.show.license"] .validity dl .valid:not(.warning)::before{--icon-name:icon-check-circle;--icon-color:var(--token-color-foreground-success)}section[data-route="dc.show.license"] aside{box-shadow:none;padding:var(--padding-y) var(--padding-x);width:40%;min-width:413px;margin-top:1rem}section[data-route="dc.show.license"] aside header{margin-bottom:1rem}.prefers-reduced-motion{--icon-loading:icon-loading}@media (prefers-reduced-motion){:root{--icon-loading:icon-loading}}.consul-intention-fieldsets .value->:last-child::before,.consul-intention-fieldsets .value-allow>:last-child::before,.consul-intention-fieldsets .value-deny>:last-child::before{--icon-size:icon-500;--icon-resolution:0.5}.consul-intention-fieldsets .value-allow>:last-child::before,.consul-intention-list td.intent-allow strong::before,.consul-intention-permission-list .intent-allow::before,.consul-intention-search-bar .value-allow span::before{--icon-name:icon-arrow-right;--icon-color:var(--token-color-foreground-success-on-surface)}.consul-intention-fieldsets .value-deny>:last-child::before,.consul-intention-list td.intent-deny strong::before,.consul-intention-permission-list .intent-deny::before,.consul-intention-search-bar .value-deny span::before{--icon-name:icon-skip;--icon-color:var(--token-color-foreground-critical-on-surface)}.consul-intention-fieldsets .value->:last-child::before,.consul-intention-list td.intent- strong::before,.consul-intention-search-bar .value- span::before{--icon-name:icon-layers}*{border-width:0}.animatable.tab-nav ul::after,.consul-auth-method-type,.consul-external-source,.consul-intention-action-warn-modal button.dangerous,.consul-intention-action-warn-modal button.dangerous:disabled,.consul-intention-action-warn-modal button.dangerous:focus,.consul-intention-action-warn-modal button.dangerous:hover:active,.consul-intention-action-warn-modal button.dangerous:hover:not(:disabled):not(:active),.consul-intention-list td.intent- strong,.consul-intention-permission-form button.type-submit,.consul-intention-permission-form button.type-submit:disabled,.consul-intention-permission-form button.type-submit:focus:not(:disabled),.consul-intention-permission-form button.type-submit:hover:not(:disabled),.consul-intention-search-bar .value- span,.consul-kind,.consul-source,.consul-transparent-proxy,.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:first-child,.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:focus:first-child,.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:hover:first-child,.discovery-chain .route-card>header ul li,.informed-action>ul>.dangerous>*,.informed-action>ul>.dangerous>:focus,.informed-action>ul>.dangerous>:hover,.leader,.menu-panel>ul>li.dangerous>:first-child,.menu-panel>ul>li.dangerous>:focus:first-child,.menu-panel>ul>li.dangerous>:hover:first-child,.modal-dialog [role=document]>footer,.modal-dialog [role=document]>header,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:first-child,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:first-child,.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,.tab-nav .selected>*,.topology-metrics-source-type,html[data-route^="dc.acls.index"] main td strong,span.policy-node-identity,span.policy-service-identity,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:first-child,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child{border-style:solid}.consul-auth-method-type,.consul-external-source,.consul-kind,.consul-source,.consul-transparent-proxy,.leader,.topology-metrics-source-type,span.policy-node-identity,span.policy-service-identity{background-color:var(--token-color-surface-strong);border-color:var(--token-color-foreground-faint);color:var(--token-color-foreground-primary)}.consul-intention-list td.intent- strong,.consul-intention-search-bar .value- span,.discovery-chain .route-card>header ul li,.modal-dialog [role=document]>footer,.modal-dialog [role=document]>header,html[data-route^="dc.acls.index"] main td strong{background-color:var(--token-color-surface-strong);border-color:var(--token-color-palette-neutral-300);color:var(--token-color-foreground-strong)}.animatable.tab-nav ul::after,.consul-intention-permission-form button.type-submit,.consul-intention-permission-form button.type-submit:disabled,.tab-nav .selected>*{background-color:var(--token-color-surface-primary);border-color:var(--token-color-foreground-action);color:var(--token-color-foreground-action)}.consul-intention-permission-form button.type-submit:focus:not(:disabled),.consul-intention-permission-form button.type-submit:hover:not(:disabled){background-color:var(--token-color-surface-action);border-color:var(--token-color-foreground-action);color:var(--token-color-palette-blue-500)}.consul-intention-action-warn-modal button.dangerous,.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:first-child,.informed-action>ul>.dangerous>*,.menu-panel>ul>li.dangerous>:first-child,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:first-child,.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:first-child,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:first-child{background-color:transparent;border-color:var(--token-color-foreground-critical);color:var(--token-color-foreground-critical)}.consul-intention-action-warn-modal button.dangerous:disabled{background-color:var(--token-color-border-critical);border-color:var(--token-color-foreground-disabled);color:var(--token-color-surface-primary)}.consul-intention-action-warn-modal button.dangerous:focus,.consul-intention-action-warn-modal button.dangerous:hover:not(:disabled):not(:active),.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:focus:first-child,.disclosure-menu [aria-expanded]~*>ul>li.dangerous>:hover:first-child,.informed-action>ul>.dangerous>:focus,.informed-action>ul>.dangerous>:hover,.menu-panel>ul>li.dangerous>:focus:first-child,.menu-panel>ul>li.dangerous>:hover:first-child,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,.more-popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,.popover-menu>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,table.has-actions tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:focus:first-child,table.with-details tr>.actions>[type=checkbox]+label+div>ul>li.dangerous>:hover:first-child{background-color:var(--token-color-foreground-critical);border-color:var(--token-color-foreground-critical-high-contrast);color:var(--token-color-surface-primary)}.consul-intention-action-warn-modal button.dangerous:hover:active{background-color:var(--token-color-palette-red-400);border-color:var(--token-color-foreground-critical-high-contrast);color:var(--token-color-surface-primary)}[role=banner] nav:last-of-type .dangerous button:focus,[role=banner] nav:last-of-type .dangerous button:hover{color:var(--token-color-surface-primary)!important}[role=banner] nav:first-of-type .menu-panel a:focus,[role=banner] nav:first-of-type .menu-panel a:hover{background-color:var(--token-color-foreground-action)}.hover\:scale-125:hover{--tw-scale-x:1.25;--tw-scale-y:1.25}.group:hover .group-hover\:opacity-100{opacity:1}
\ No newline at end of file
diff --git a/agent/uiserver/dist/assets/consul-ui/routes-c69d5bf72b7c740af5e6ce29eefe65bf.js b/agent/uiserver/dist/assets/consul-ui/routes-c69d5bf72b7c740af5e6ce29eefe65bf.js
deleted file mode 100644
index 0004d8645f90c..0000000000000
--- a/agent/uiserver/dist/assets/consul-ui/routes-c69d5bf72b7c740af5e6ce29eefe65bf.js
+++ /dev/null
@@ -1 +0,0 @@
-((e,t=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{t.routes=JSON.stringify(e)})({dc:{_options:{path:"/:dc"},index:{_options:{path:"/",redirect:"../services"}},show:{_options:{path:"/overview",abilities:["access overview"]},serverstatus:{_options:{path:"/server-status",abilities:["read servers"]}},cataloghealth:{_options:{path:"/catalog-health",abilities:["access overview"]}},license:{_options:{path:"/license",abilities:["read license"]}}},services:{_options:{path:"/services"},index:{_options:{path:"/",queryParams:{sortBy:"sort",status:"status",source:"source",kind:"kind",searchproperty:{as:"searchproperty",empty:[["Partition","Name","Tags","PeerName"]]},search:{as:"filter",replace:!0}}}},show:{_options:{path:"/:name"},instances:{_options:{path:"/instances",queryParams:{sortBy:"sort",status:"status",source:"source",searchproperty:{as:"searchproperty",empty:[["Name","Node","Tags","ID","Address","Port","Service.Meta","Node.Meta"]]},search:{as:"filter",replace:!0}}}},intentions:{_options:{path:"/intentions"},index:{_options:{path:"",queryParams:{sortBy:"sort",access:"access",searchproperty:{as:"searchproperty",empty:[["SourceName","DestinationName"]]},search:{as:"filter",replace:!0}}}},edit:{_options:{path:"/:intention_id"}},create:{_options:{template:"../edit",path:"/create"}}},topology:{_options:{path:"/topology"}},services:{_options:{path:"/services",queryParams:{sortBy:"sort",instance:"instance",searchproperty:{as:"searchproperty",empty:[["Name","Tags"]]},search:{as:"filter",replace:!0}}}},upstreams:{_options:{path:"/upstreams",queryParams:{sortBy:"sort",instance:"instance",searchproperty:{as:"searchproperty",empty:[["Name","Tags"]]},search:{as:"filter",replace:!0}}}},routing:{_options:{path:"/routing"}},tags:{_options:{path:"/tags"}}},instance:{_options:{path:"/:name/instances/:node/:id",redirect:"./healthchecks"},healthchecks:{_options:{path:"/health-checks",queryParams:{sortBy:"sort",status:"status",check:"check",searchproperty:{as:"searchproperty",empty:[["Name","Node","CheckID","Notes","Output","ServiceTags"]]},search:{as:"filter",replace:!0}}}},upstreams:{_options:{path:"/upstreams",queryParams:{sortBy:"sort",search:{as:"filter",replace:!0},searchproperty:{as:"searchproperty",empty:[["DestinationName","LocalBindAddress","LocalBindPort"]]}}}},exposedpaths:{_options:{path:"/exposed-paths"}},addresses:{_options:{path:"/addresses"}},metadata:{_options:{path:"/metadata"}}},notfound:{_options:{path:"/:name/:node/:id"}}},nodes:{_options:{path:"/nodes"},index:{_options:{path:"",queryParams:{sortBy:"sort",status:"status",searchproperty:{as:"searchproperty",empty:[["Node","Address","Meta","PeerName"]]},search:{as:"filter",replace:!0}}}},show:{_options:{path:"/:name"},healthchecks:{_options:{path:"/health-checks",queryParams:{sortBy:"sort",status:"status",kind:"kind",check:"check",searchproperty:{as:"searchproperty",empty:[["Name","Service","CheckID","Notes","Output","ServiceTags"]]},search:{as:"filter",replace:!0}}}},services:{_options:{path:"/service-instances",queryParams:{sortBy:"sort",status:"status",source:"source",searchproperty:{as:"searchproperty",empty:[["Name","Tags","ID","Address","Port","Service.Meta"]]},search:{as:"filter",replace:!0}}}},rtt:{_options:{path:"/round-trip-time"}},metadata:{_options:{path:"/metadata"}}}},intentions:{_options:{path:"/intentions"},index:{_options:{path:"/",queryParams:{sortBy:"sort",access:"access",searchproperty:{as:"searchproperty",empty:[["SourceName","DestinationName"]]},search:{as:"filter",replace:!0}}}},edit:{_options:{path:"/:intention_id",abilities:["read intentions"]}},create:{_options:{template:"../edit",path:"/create",abilities:["create intentions"]}}},kv:{_options:{path:"/kv"},index:{_options:{path:"/",queryParams:{sortBy:"sort",kind:"kind",search:{as:"filter",replace:!0}}}},folder:{_options:{template:"../index",path:"/*key"}},edit:{_options:{path:"/*key/edit"}},create:{_options:{template:"../edit",path:"/*key/create",abilities:["create kvs"]}},"root-create":{_options:{template:"../edit",path:"/create",abilities:["create kvs"]}}},acls:{_options:{path:"/acls",abilities:["access acls"]},policies:{_options:{path:"/policies",abilities:["read policies"]},edit:{_options:{path:"/:id"}},create:{_options:{path:"/create",abilities:["create policies"]}}},roles:{_options:{path:"/roles",abilities:["read roles"]},edit:{_options:{path:"/:id"}},create:{_options:{path:"/create",abilities:["create roles"]}}},tokens:{_options:{path:"/tokens",abilities:["access acls"]},edit:{_options:{path:"/:id"}},create:{_options:{path:"/create",abilities:["create tokens"]}}},"auth-methods":{_options:{path:"/auth-methods",abilities:["read auth-methods"]},show:{_options:{path:"/:id"},"auth-method":{_options:{path:"/auth-method"}},"binding-rules":{_options:{path:"/binding-rules"}},"nspace-rules":{_options:{path:"/nspace-rules"}}}}},"routing-config":{_options:{path:"/routing-config/:name"}}},index:{_options:{path:"/"}},settings:{_options:{path:"/settings"}},setting:{_options:{path:"/setting",redirect:"../settings"}},notfound:{_options:{path:"/*notfound"}}})
diff --git a/agent/uiserver/dist/assets/consul-ui/routes-debug-41d0902009004c6875ddb9882b4ee3f6.js b/agent/uiserver/dist/assets/consul-ui/routes-debug-8f884a3e3f7105d43b7b4024db9b4c99.js
similarity index 100%
rename from agent/uiserver/dist/assets/consul-ui/routes-debug-41d0902009004c6875ddb9882b4ee3f6.js
rename to agent/uiserver/dist/assets/consul-ui/routes-debug-8f884a3e3f7105d43b7b4024db9b4c99.js
diff --git a/agent/uiserver/dist/assets/consul-ui/routes-e55bc65732ba7c0352d43313fd9563e6.js b/agent/uiserver/dist/assets/consul-ui/routes-e55bc65732ba7c0352d43313fd9563e6.js
new file mode 100644
index 0000000000000..0168f3ce0a067
--- /dev/null
+++ b/agent/uiserver/dist/assets/consul-ui/routes-e55bc65732ba7c0352d43313fd9563e6.js
@@ -0,0 +1 @@
+((e,t=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{t.routes=JSON.stringify(e)})({dc:{_options:{path:"/:dc"},index:{_options:{path:"/",redirect:"../services"}},show:{_options:{path:"/overview",abilities:["access overview"]},serverstatus:{_options:{path:"/server-status",abilities:["access overview","read zones"]}},cataloghealth:{_options:{path:"/catalog-health",abilities:["access overview"]}},license:{_options:{path:"/license",abilities:["access overview","read licence"]}}},services:{_options:{path:"/services"},index:{_options:{path:"/",queryParams:{sortBy:"sort",status:"status",source:"source",kind:"kind",searchproperty:{as:"searchproperty",empty:[["Name","Tags"]]},search:{as:"filter",replace:!0}}}},show:{_options:{path:"/:name"},instances:{_options:{path:"/instances",queryParams:{sortBy:"sort",status:"status",source:"source",searchproperty:{as:"searchproperty",empty:[["Name","Node","Tags","ID","Address","Port","Service.Meta","Node.Meta"]]},search:{as:"filter",replace:!0}}}},intentions:{_options:{path:"/intentions"},index:{_options:{path:"",queryParams:{sortBy:"sort",access:"access",searchproperty:{as:"searchproperty",empty:[["SourceName","DestinationName"]]},search:{as:"filter",replace:!0}}}},edit:{_options:{path:"/:intention_id"}},create:{_options:{template:"../edit",path:"/create"}}},topology:{_options:{path:"/topology"}},services:{_options:{path:"/services",queryParams:{sortBy:"sort",instance:"instance",searchproperty:{as:"searchproperty",empty:[["Name","Tags"]]},search:{as:"filter",replace:!0}}}},upstreams:{_options:{path:"/upstreams",queryParams:{sortBy:"sort",instance:"instance",searchproperty:{as:"searchproperty",empty:[["Name","Tags"]]},search:{as:"filter",replace:!0}}}},routing:{_options:{path:"/routing"}},tags:{_options:{path:"/tags"}}},instance:{_options:{path:"/:name/instances/:node/:id",redirect:"./healthchecks"},healthchecks:{_options:{path:"/health-checks",queryParams:{sortBy:"sort",status:"status",check:"check",searchproperty:{as:"searchproperty",empty:[["Name","Node","CheckID","Notes","Output","ServiceTags"]]},search:{as:"filter",replace:!0}}}},upstreams:{_options:{path:"/upstreams",queryParams:{sortBy:"sort",search:{as:"filter",replace:!0},searchproperty:{as:"searchproperty",empty:[["DestinationName","LocalBindAddress","LocalBindPort"]]}}}},exposedpaths:{_options:{path:"/exposed-paths"}},addresses:{_options:{path:"/addresses"}},metadata:{_options:{path:"/metadata"}}},notfound:{_options:{path:"/:name/:node/:id"}}},nodes:{_options:{path:"/nodes"},index:{_options:{path:"",queryParams:{sortBy:"sort",status:"status",searchproperty:{as:"searchproperty",empty:[["Node","Address","Meta"]]},search:{as:"filter",replace:!0}}}},show:{_options:{path:"/:name"},healthchecks:{_options:{path:"/health-checks",queryParams:{sortBy:"sort",status:"status",kind:"kind",check:"check",searchproperty:{as:"searchproperty",empty:[["Name","Service","CheckID","Notes","Output","ServiceTags"]]},search:{as:"filter",replace:!0}}}},services:{_options:{path:"/service-instances",queryParams:{sortBy:"sort",status:"status",source:"source",searchproperty:{as:"searchproperty",empty:[["Name","Tags","ID","Address","Port","Service.Meta"]]},search:{as:"filter",replace:!0}}}},rtt:{_options:{path:"/round-trip-time"}},metadata:{_options:{path:"/metadata"}}}},intentions:{_options:{path:"/intentions"},index:{_options:{path:"/",queryParams:{sortBy:"sort",access:"access",searchproperty:{as:"searchproperty",empty:[["SourceName","DestinationName"]]},search:{as:"filter",replace:!0}}}},edit:{_options:{path:"/:intention_id",abilities:["read intentions"]}},create:{_options:{template:"../edit",path:"/create",abilities:["create intentions"]}}},kv:{_options:{path:"/kv"},index:{_options:{path:"/",queryParams:{sortBy:"sort",kind:"kind",search:{as:"filter",replace:!0}}}},folder:{_options:{template:"../index",path:"/*key"}},edit:{_options:{path:"/*key/edit"}},create:{_options:{template:"../edit",path:"/*key/create",abilities:["create kvs"]}},"root-create":{_options:{template:"../edit",path:"/create",abilities:["create kvs"]}}},acls:{_options:{path:"/acls",abilities:["access acls"]},policies:{_options:{path:"/policies",abilities:["read policies"]},edit:{_options:{path:"/:id"}},create:{_options:{path:"/create",abilities:["create policies"]}}},roles:{_options:{path:"/roles",abilities:["read roles"]},edit:{_options:{path:"/:id"}},create:{_options:{path:"/create",abilities:["create roles"]}}},tokens:{_options:{path:"/tokens",abilities:["access acls"]},edit:{_options:{path:"/:id"}},create:{_options:{path:"/create",abilities:["create tokens"]}}},"auth-methods":{_options:{path:"/auth-methods",abilities:["read auth-methods"]},show:{_options:{path:"/:id"},"auth-method":{_options:{path:"/auth-method"}},"binding-rules":{_options:{path:"/binding-rules"}},"nspace-rules":{_options:{path:"/nspace-rules"}}}}},"routing-config":{_options:{path:"/routing-config/:name"}}},index:{_options:{path:"/"}},settings:{_options:{path:"/settings"}},setting:{_options:{path:"/setting",redirect:"../settings"}},notfound:{_options:{path:"/*notfound"}}})
diff --git a/agent/uiserver/dist/assets/consul-ui/services-a17470cdfbd4a4096117ac0103802226.js b/agent/uiserver/dist/assets/consul-ui/services-a17470cdfbd4a4096117ac0103802226.js
new file mode 100644
index 0000000000000..b4e8774d509b7
--- /dev/null
+++ b/agent/uiserver/dist/assets/consul-ui/services-a17470cdfbd4a4096117ac0103802226.js
@@ -0,0 +1 @@
+((e,s=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{s.services=JSON.stringify(e)})({"route:basic":{class:"consul-ui/routing/route"},"service:intl":{class:"consul-ui/services/i18n"},"service:state":{class:"consul-ui/services/state-with-charts"},"auth-provider:oidc-with-url":{class:"consul-ui/services/auth-providers/oauth2-code-with-url-provider"},"component:consul/partition/selector":{class:"@glimmer/component"}})
diff --git a/agent/uiserver/dist/assets/consul-ui/services-debug-d1862bae590c1c8cd6dc0dd81645801a.js b/agent/uiserver/dist/assets/consul-ui/services-debug-5a3f1d2e3954a05aa8383f02db31b8e6.js
similarity index 100%
rename from agent/uiserver/dist/assets/consul-ui/services-debug-d1862bae590c1c8cd6dc0dd81645801a.js
rename to agent/uiserver/dist/assets/consul-ui/services-debug-5a3f1d2e3954a05aa8383f02db31b8e6.js
diff --git a/agent/uiserver/dist/assets/consul-ui/services-faa0d1867ff0795f940a4199bcf17128.js b/agent/uiserver/dist/assets/consul-ui/services-faa0d1867ff0795f940a4199bcf17128.js
deleted file mode 100644
index a50f394f1c805..0000000000000
--- a/agent/uiserver/dist/assets/consul-ui/services-faa0d1867ff0795f940a4199bcf17128.js
+++ /dev/null
@@ -1 +0,0 @@
-((e,s=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{s.services=JSON.stringify(e)})({"route:basic":{class:"consul-ui/routing/route"},"service:intl":{class:"consul-ui/services/i18n"},"service:state":{class:"consul-ui/services/state-with-charts"},"auth-provider:oidc-with-url":{class:"consul-ui/services/auth-providers/oauth2-code-with-url-provider"},"component:consul/partition/selector":{class:"@glimmer/component"},"component:consul/peer/selector":{class:"@glimmer/component"},"component:consul/hcp/home":{class:"@glimmer/component"}})
diff --git a/agent/uiserver/dist/assets/css.escape-fe4db48c9e3f272a6d12cf1312de889e.js b/agent/uiserver/dist/assets/css.escape-851839b3ea1d0b4eb4c7089446df5e9f.js
similarity index 100%
rename from agent/uiserver/dist/assets/css.escape-fe4db48c9e3f272a6d12cf1312de889e.js
rename to agent/uiserver/dist/assets/css.escape-851839b3ea1d0b4eb4c7089446df5e9f.js
diff --git a/agent/uiserver/dist/assets/encoding-022884ab2a5bd42b6f4fff580fa0dd34.js b/agent/uiserver/dist/assets/encoding-022884ab2a5bd42b6f4fff580fa0dd34.js
deleted file mode 100644
index 35d450c110083..0000000000000
--- a/agent/uiserver/dist/assets/encoding-022884ab2a5bd42b6f4fff580fa0dd34.js
+++ /dev/null
@@ -1,209 +0,0 @@
-(function(n){"use strict"
-function e(n,e,r){return e<=n&&n<=r}"undefined"!=typeof module&&module.exports&&!n["encoding-indexes"]&&(n["encoding-indexes"]=require("./encoding-indexes-50f27403be5972eae4831f5b69db1f80.js")["encoding-indexes"])
-var r=Math.floor
-function i(n){if(void 0===n)return{}
-if(n===Object(n))return n
-throw TypeError("Could not convert argument to dictionary")}function t(n){return 0<=n&&n<=127}var o=t,s=-1
-function a(n){this.tokens=[].slice.call(n),this.tokens.reverse()}a.prototype={endOfStream:function(){return!this.tokens.length},read:function(){return this.tokens.length?this.tokens.pop():s},prepend:function(n){if(Array.isArray(n))for(var e=n;e.length;)this.tokens.push(e.pop())
-else this.tokens.push(n)},push:function(n){if(Array.isArray(n))for(var e=n;e.length;)this.tokens.unshift(e.shift())
-else this.tokens.unshift(n)}}
-var u=-1
-function l(n,e){if(n)throw TypeError("Decoder error")
-return e||65533}function f(n){throw TypeError("The code point "+n+" could not be encoded.")}function c(n){return n=String(n).trim().toLowerCase(),Object.prototype.hasOwnProperty.call(h,n)?h[n]:null}var d=[{encodings:[{labels:["unicode-1-1-utf-8","utf-8","utf8"],name:"UTF-8"}],heading:"The Encoding"},{encodings:[{labels:["866","cp866","csibm866","ibm866"],name:"IBM866"},{labels:["csisolatin2","iso-8859-2","iso-ir-101","iso8859-2","iso88592","iso_8859-2","iso_8859-2:1987","l2","latin2"],name:"ISO-8859-2"},{labels:["csisolatin3","iso-8859-3","iso-ir-109","iso8859-3","iso88593","iso_8859-3","iso_8859-3:1988","l3","latin3"],name:"ISO-8859-3"},{labels:["csisolatin4","iso-8859-4","iso-ir-110","iso8859-4","iso88594","iso_8859-4","iso_8859-4:1988","l4","latin4"],name:"ISO-8859-4"},{labels:["csisolatincyrillic","cyrillic","iso-8859-5","iso-ir-144","iso8859-5","iso88595","iso_8859-5","iso_8859-5:1988"],name:"ISO-8859-5"},{labels:["arabic","asmo-708","csiso88596e","csiso88596i","csisolatinarabic","ecma-114","iso-8859-6","iso-8859-6-e","iso-8859-6-i","iso-ir-127","iso8859-6","iso88596","iso_8859-6","iso_8859-6:1987"],name:"ISO-8859-6"},{labels:["csisolatingreek","ecma-118","elot_928","greek","greek8","iso-8859-7","iso-ir-126","iso8859-7","iso88597","iso_8859-7","iso_8859-7:1987","sun_eu_greek"],name:"ISO-8859-7"},{labels:["csiso88598e","csisolatinhebrew","hebrew","iso-8859-8","iso-8859-8-e","iso-ir-138","iso8859-8","iso88598","iso_8859-8","iso_8859-8:1988","visual"],name:"ISO-8859-8"},{labels:["csiso88598i","iso-8859-8-i","logical"],name:"ISO-8859-8-I"},{labels:["csisolatin6","iso-8859-10","iso-ir-157","iso8859-10","iso885910","l6","latin6"],name:"ISO-8859-10"},{labels:["iso-8859-13","iso8859-13","iso885913"],name:"ISO-8859-13"},{labels:["iso-8859-14","iso8859-14","iso885914"],name:"ISO-8859-14"},{labels:["csisolatin9","iso-8859-15","iso8859-15","iso885915","iso_8859-15","l9"],name:"ISO-8859-15"},{labels:["iso-8859-16"],name:"ISO-8859-16"},{labels:["cskoi8r","koi","koi8","koi8-r","koi8_r"],name:"KOI8-R"},{labels:["koi8-ru","koi8-u"],name:"KOI8-U"},{labels:["csmacintosh","mac","macintosh","x-mac-roman"],name:"macintosh"},{labels:["dos-874","iso-8859-11","iso8859-11","iso885911","tis-620","windows-874"],name:"windows-874"},{labels:["cp1250","windows-1250","x-cp1250"],name:"windows-1250"},{labels:["cp1251","windows-1251","x-cp1251"],name:"windows-1251"},{labels:["ansi_x3.4-1968","ascii","cp1252","cp819","csisolatin1","ibm819","iso-8859-1","iso-ir-100","iso8859-1","iso88591","iso_8859-1","iso_8859-1:1987","l1","latin1","us-ascii","windows-1252","x-cp1252"],name:"windows-1252"},{labels:["cp1253","windows-1253","x-cp1253"],name:"windows-1253"},{labels:["cp1254","csisolatin5","iso-8859-9","iso-ir-148","iso8859-9","iso88599","iso_8859-9","iso_8859-9:1989","l5","latin5","windows-1254","x-cp1254"],name:"windows-1254"},{labels:["cp1255","windows-1255","x-cp1255"],name:"windows-1255"},{labels:["cp1256","windows-1256","x-cp1256"],name:"windows-1256"},{labels:["cp1257","windows-1257","x-cp1257"],name:"windows-1257"},{labels:["cp1258","windows-1258","x-cp1258"],name:"windows-1258"},{labels:["x-mac-cyrillic","x-mac-ukrainian"],name:"x-mac-cyrillic"}],heading:"Legacy single-byte encodings"},{encodings:[{labels:["chinese","csgb2312","csiso58gb231280","gb2312","gb_2312","gb_2312-80","gbk","iso-ir-58","x-gbk"],name:"GBK"},{labels:["gb18030"],name:"gb18030"}],heading:"Legacy multi-byte Chinese (simplified) encodings"},{encodings:[{labels:["big5","big5-hkscs","cn-big5","csbig5","x-x-big5"],name:"Big5"}],heading:"Legacy multi-byte Chinese (traditional) encodings"},{encodings:[{labels:["cseucpkdfmtjapanese","euc-jp","x-euc-jp"],name:"EUC-JP"},{labels:["csiso2022jp","iso-2022-jp"],name:"ISO-2022-JP"},{labels:["csshiftjis","ms932","ms_kanji","shift-jis","shift_jis","sjis","windows-31j","x-sjis"],name:"Shift_JIS"}],heading:"Legacy multi-byte Japanese encodings"},{encodings:[{labels:["cseuckr","csksc56011987","euc-kr","iso-ir-149","korean","ks_c_5601-1987","ks_c_5601-1989","ksc5601","ksc_5601","windows-949"],name:"EUC-KR"}],heading:"Legacy multi-byte Korean encodings"},{encodings:[{labels:["csiso2022kr","hz-gb-2312","iso-2022-cn","iso-2022-cn-ext","iso-2022-kr"],name:"replacement"},{labels:["utf-16be"],name:"UTF-16BE"},{labels:["utf-16","utf-16le"],name:"UTF-16LE"},{labels:["x-user-defined"],name:"x-user-defined"}],heading:"Legacy miscellaneous encodings"}],h={}
-d.forEach((function(n){n.encodings.forEach((function(n){n.labels.forEach((function(e){h[e]=n}))}))}))
-var g,p,b={},_={}
-function w(n,e){return e&&e[n]||null}function m(n,e){var r=e.indexOf(n)
-return-1===r?null:r}function v(e){if(!("encoding-indexes"in n))throw Error("Indexes missing. Did you forget to include encoding-indexes-50f27403be5972eae4831f5b69db1f80.js first?")
-return n["encoding-indexes"][e]}var y="utf-8"
-function x(n,e){if(!(this instanceof x))throw TypeError("Called as a function. Did you forget 'new'?")
-n=void 0!==n?String(n):y,e=i(e),this._encoding=null,this._decoder=null,this._ignoreBOM=!1,this._BOMseen=!1,this._error_mode="replacement",this._do_not_flush=!1
-var r=c(n)
-if(null===r||"replacement"===r.name)throw RangeError("Unknown encoding: "+n)
-if(!_[r.name])throw Error("Decoder not present. Did you forget to include encoding-indexes-50f27403be5972eae4831f5b69db1f80.js first?")
-var t=this
-return t._encoding=r,Boolean(e.fatal)&&(t._error_mode="fatal"),Boolean(e.ignoreBOM)&&(t._ignoreBOM=!0),Object.defineProperty||(this.encoding=t._encoding.name.toLowerCase(),this.fatal="fatal"===t._error_mode,this.ignoreBOM=t._ignoreBOM),t}function O(e,r){if(!(this instanceof O))throw TypeError("Called as a function. Did you forget 'new'?")
-r=i(r),this._encoding=null,this._encoder=null,this._do_not_flush=!1,this._fatal=Boolean(r.fatal)?"fatal":"replacement"
-var t=this
-if(Boolean(r.NONSTANDARD_allowLegacyEncoding)){var o=c(e=void 0!==e?String(e):y)
-if(null===o||"replacement"===o.name)throw RangeError("Unknown encoding: "+e)
-if(!b[o.name])throw Error("Encoder not present. Did you forget to include encoding-indexes-50f27403be5972eae4831f5b69db1f80.js first?")
-t._encoding=o}else t._encoding=c("utf-8"),void 0!==e&&"console"in n&&console.warn("TextEncoder constructor called with encoding label, which is ignored.")
-return Object.defineProperty||(this.encoding=t._encoding.name.toLowerCase()),t}function k(n){var r=n.fatal,i=0,t=0,o=0,a=128,f=191
-this.handler=function(n,c){if(c===s&&0!==o)return o=0,l(r)
-if(c===s)return u
-if(0===o){if(e(c,0,127))return c
-if(e(c,194,223))o=1,i=31&c
-else if(e(c,224,239))224===c&&(a=160),237===c&&(f=159),o=2,i=15&c
-else{if(!e(c,240,244))return l(r)
-240===c&&(a=144),244===c&&(f=143),o=3,i=7&c}return null}if(!e(c,a,f))return i=o=t=0,a=128,f=191,n.prepend(c),l(r)
-if(a=128,f=191,i=i<<6|63&c,(t+=1)!==o)return null
-var d=i
-return i=o=t=0,d}}function E(n){n.fatal
-this.handler=function(n,r){if(r===s)return u
-if(o(r))return r
-var i,t
-e(r,128,2047)?(i=1,t=192):e(r,2048,65535)?(i=2,t=224):e(r,65536,1114111)&&(i=3,t=240)
-for(var a=[(r>>6*i)+t];i>0;){var l=r>>6*(i-1)
-a.push(128|63&l),i-=1}return a}}function j(n,e){var r=e.fatal
-this.handler=function(e,i){if(i===s)return u
-if(t(i))return i
-var o=n[i-128]
-return null===o?l(r):o}}function B(n,e){e.fatal
-this.handler=function(e,r){if(r===s)return u
-if(o(r))return r
-var i=m(r,n)
-return null===i&&f(r),i+128}}function S(n){var r=n.fatal,i=0,o=0,a=0
-this.handler=function(n,f){if(f===s&&0===i&&0===o&&0===a)return u
-var c
-if(f!==s||0===i&&0===o&&0===a||(i=0,o=0,a=0,l(r)),0!==a){c=null,e(f,48,57)&&(c=function(n){if(n>39419&&n<189e3||n>1237575)return null
-if(7457===n)return 59335
-var e,r=0,i=0,t=v("gb18030-ranges")
-for(e=0;e<t.length;++e){var o=t[e]
-if(!(o[0]<=n))break
-r=o[0],i=o[1]}return i+n-r}(10*(126*(10*(i-129)+o-48)+a-129)+f-48))
-var d=[o,a,f]
-return i=0,o=0,a=0,null===c?(n.prepend(d),l(r)):c}if(0!==o)return e(f,129,254)?(a=f,null):(n.prepend([o,f]),i=0,o=0,l(r))
-if(0!==i){if(e(f,48,57))return o=f,null
-var h=i,g=null
-i=0
-var p=f<127?64:65
-return(e(f,64,126)||e(f,128,254))&&(g=190*(h-129)+(f-p)),null===(c=null===g?null:w(g,v("gb18030")))&&t(f)&&n.prepend(f),null===c?l(r):c}return t(f)?f:128===f?8364:e(f,129,254)?(i=f,null):l(r)}}function T(n,e){n.fatal
-this.handler=function(n,i){if(i===s)return u
-if(o(i))return i
-if(58853===i)return f(i)
-if(e&&8364===i)return 128
-var t=m(i,v("gb18030"))
-if(null!==t){var a=t%190
-return[r(t/190)+129,a+(a<63?64:65)]}if(e)return f(i)
-t=function(n){if(59335===n)return 7457
-var e,r=0,i=0,t=v("gb18030-ranges")
-for(e=0;e<t.length;++e){var o=t[e]
-if(!(o[1]<=n))break
-r=o[1],i=o[0]}return i+n-r}(i)
-var l=r(t/10/126/10),c=r((t-=10*l*126*10)/10/126),d=r((t-=10*c*126)/10)
-return[l+129,c+48,d+129,t-10*d+48]}}function I(n){var r=n.fatal,i=0
-this.handler=function(n,o){if(o===s&&0!==i)return i=0,l(r)
-if(o===s&&0===i)return u
-if(0!==i){var a=i,f=null
-i=0
-var c=o<127?64:98
-switch((e(o,64,126)||e(o,161,254))&&(f=157*(a-129)+(o-c)),f){case 1133:return[202,772]
-case 1135:return[202,780]
-case 1164:return[234,772]
-case 1166:return[234,780]}var d=null===f?null:w(f,v("big5"))
-return null===d&&t(o)&&n.prepend(o),null===d?l(r):d}return t(o)?o:e(o,129,254)?(i=o,null):l(r)}}function U(n){n.fatal
-this.handler=function(n,e){if(e===s)return u
-if(o(e))return e
-var i=function(n){p=p||v("big5").map((function(n,e){return e<5024?null:n}))
-var e=p
-return 9552===n||9566===n||9569===n||9578===n||21313===n||21317===n?e.lastIndexOf(n):m(n,e)}(e)
-if(null===i)return f(e)
-var t=r(i/157)+129
-if(t<161)return f(e)
-var a=i%157
-return[t,a+(a<63?64:98)]}}function C(n){var r=n.fatal,i=!1,o=0
-this.handler=function(n,a){if(a===s&&0!==o)return o=0,l(r)
-if(a===s&&0===o)return u
-if(142===o&&e(a,161,223))return o=0,65216+a
-if(143===o&&e(a,161,254))return i=!0,o=a,null
-if(0!==o){var f=o
-o=0
-var c=null
-return e(f,161,254)&&e(a,161,254)&&(c=w(94*(f-161)+(a-161),v(i?"jis0212":"jis0208"))),i=!1,e(a,161,254)||n.prepend(a),null===c?l(r):c}return t(a)?a:142===a||143===a||e(a,161,254)?(o=a,null):l(r)}}function A(n){n.fatal
-this.handler=function(n,i){if(i===s)return u
-if(o(i))return i
-if(165===i)return 92
-if(8254===i)return 126
-if(e(i,65377,65439))return[142,i-65377+161]
-8722===i&&(i=65293)
-var t=m(i,v("jis0208"))
-return null===t?f(i):[r(t/94)+161,t%94+161]}}function L(n){var r=n.fatal,i=0,t=1,o=2,a=3,f=4,c=5,d=6,h=i,g=i,p=0,b=!1
-this.handler=function(n,_){switch(h){default:case i:return 27===_?(h=c,null):e(_,0,127)&&14!==_&&15!==_&&27!==_?(b=!1,_):_===s?u:(b=!1,l(r))
-case t:return 27===_?(h=c,null):92===_?(b=!1,165):126===_?(b=!1,8254):e(_,0,127)&&14!==_&&15!==_&&27!==_&&92!==_&&126!==_?(b=!1,_):_===s?u:(b=!1,l(r))
-case o:return 27===_?(h=c,null):e(_,33,95)?(b=!1,65344+_):_===s?u:(b=!1,l(r))
-case a:return 27===_?(h=c,null):e(_,33,126)?(b=!1,p=_,h=f,null):_===s?u:(b=!1,l(r))
-case f:if(27===_)return h=c,l(r)
-if(e(_,33,126)){h=a
-var m=w(94*(p-33)+_-33,v("jis0208"))
-return null===m?l(r):m}return _===s?(h=a,n.prepend(_),l(r)):(h=a,l(r))
-case c:return 36===_||40===_?(p=_,h=d,null):(n.prepend(_),b=!1,h=g,l(r))
-case d:var y=p
-p=0
-var x=null
-if(40===y&&66===_&&(x=i),40===y&&74===_&&(x=t),40===y&&73===_&&(x=o),36!==y||64!==_&&66!==_||(x=a),null!==x){h=h=x
-var O=b
-return b=!0,O?l(r):null}return n.prepend([y,_]),b=!1,h=g,l(r)}}}function M(n){n.fatal
-var e=0,i=1,t=2,a=e
-this.handler=function(n,l){if(l===s&&a!==e)return n.prepend(l),a=e,[27,40,66]
-if(l===s&&a===e)return u
-if(!(a!==e&&a!==i||14!==l&&15!==l&&27!==l))return f(65533)
-if(a===e&&o(l))return l
-if(a===i&&(o(l)&&92!==l&&126!==l||165==l||8254==l)){if(o(l))return l
-if(165===l)return 92
-if(8254===l)return 126}if(o(l)&&a!==e)return n.prepend(l),a=e,[27,40,66]
-if((165===l||8254===l)&&a!==i)return n.prepend(l),a=i,[27,40,74]
-8722===l&&(l=65293)
-var c=m(l,v("jis0208"))
-return null===c?f(l):a!==t?(n.prepend(l),a=t,[27,36,66]):[r(c/94)+33,c%94+33]}}function P(n){var r=n.fatal,i=0
-this.handler=function(n,o){if(o===s&&0!==i)return i=0,l(r)
-if(o===s&&0===i)return u
-if(0!==i){var a=i,f=null
-i=0
-var c=o<127?64:65,d=a<160?129:193
-if((e(o,64,126)||e(o,128,252))&&(f=188*(a-d)+o-c),e(f,8836,10715))return 48508+f
-var h=null===f?null:w(f,v("jis0208"))
-return null===h&&t(o)&&n.prepend(o),null===h?l(r):h}return t(o)||128===o?o:e(o,161,223)?65216+o:e(o,129,159)||e(o,224,252)?(i=o,null):l(r)}}function D(n){n.fatal
-this.handler=function(n,i){if(i===s)return u
-if(o(i)||128===i)return i
-if(165===i)return 92
-if(8254===i)return 126
-if(e(i,65377,65439))return i-65377+161
-8722===i&&(i=65293)
-var t=function(n){return g=g||v("jis0208").map((function(n,r){return e(r,8272,8835)?null:n})),g.indexOf(n)}(i)
-if(null===t)return f(i)
-var a=r(t/188),l=t%188
-return[a+(a<31?129:193),l+(l<63?64:65)]}}function F(n){var r=n.fatal,i=0
-this.handler=function(n,o){if(o===s&&0!==i)return i=0,l(r)
-if(o===s&&0===i)return u
-if(0!==i){var a=i,f=null
-i=0,e(o,65,254)&&(f=190*(a-129)+(o-65))
-var c=null===f?null:w(f,v("euc-kr"))
-return null===f&&t(o)&&n.prepend(o),null===c?l(r):c}return t(o)?o:e(o,129,254)?(i=o,null):l(r)}}function J(n){n.fatal
-this.handler=function(n,e){if(e===s)return u
-if(o(e))return e
-var i=m(e,v("euc-kr"))
-return null===i?f(e):[r(i/190)+129,i%190+65]}}function K(n,e){var r=n>>8,i=255&n
-return e?[r,i]:[i,r]}function R(n,r){var i=r.fatal,t=null,o=null
-this.handler=function(r,a){if(a===s&&(null!==t||null!==o))return l(i)
-if(a===s&&null===t&&null===o)return u
-if(null===t)return t=a,null
-var f
-if(f=n?(t<<8)+a:(a<<8)+t,t=null,null!==o){var c=o
-return o=null,e(f,56320,57343)?65536+1024*(c-55296)+(f-56320):(r.prepend(K(f,n)),l(i))}return e(f,55296,56319)?(o=f,null):e(f,56320,57343)?l(i):f}}function G(n,r){r.fatal
-this.handler=function(r,i){if(i===s)return u
-if(e(i,0,65535))return K(i,n)
-var t=K(55296+(i-65536>>10),n),o=K(56320+(i-65536&1023),n)
-return t.concat(o)}}function N(n){n.fatal
-this.handler=function(n,e){return e===s?u:t(e)?e:63360+e-128}}function q(n){n.fatal
-this.handler=function(n,r){return r===s?u:o(r)?r:e(r,63360,63487)?r-63360+128:f(r)}}Object.defineProperty&&(Object.defineProperty(x.prototype,"encoding",{get:function(){return this._encoding.name.toLowerCase()}}),Object.defineProperty(x.prototype,"fatal",{get:function(){return"fatal"===this._error_mode}}),Object.defineProperty(x.prototype,"ignoreBOM",{get:function(){return this._ignoreBOM}})),x.prototype.decode=function(n,e){var r
-r="object"==typeof n&&n instanceof ArrayBuffer?new Uint8Array(n):"object"==typeof n&&"buffer"in n&&n.buffer instanceof ArrayBuffer?new Uint8Array(n.buffer,n.byteOffset,n.byteLength):new Uint8Array(0),e=i(e),this._do_not_flush||(this._decoder=_[this._encoding.name]({fatal:"fatal"===this._error_mode}),this._BOMseen=!1),this._do_not_flush=Boolean(e.stream)
-for(var t,o=new a(r),l=[];;){var f=o.read()
-if(f===s)break
-if((t=this._decoder.handler(o,f))===u)break
-null!==t&&(Array.isArray(t)?l.push.apply(l,t):l.push(t))}if(!this._do_not_flush){do{if((t=this._decoder.handler(o,o.read()))===u)break
-null!==t&&(Array.isArray(t)?l.push.apply(l,t):l.push(t))}while(!o.endOfStream())
-this._decoder=null}return function(n){var e,r
-return e=["UTF-8","UTF-16LE","UTF-16BE"],r=this._encoding.name,-1===e.indexOf(r)||this._ignoreBOM||this._BOMseen||(n.length>0&&65279===n[0]?(this._BOMseen=!0,n.shift()):n.length>0&&(this._BOMseen=!0)),function(n){for(var e="",r=0;r<n.length;++r){var i=n[r]
-i<=65535?e+=String.fromCharCode(i):(i-=65536,e+=String.fromCharCode(55296+(i>>10),56320+(1023&i)))}return e}(n)}.call(this,l)},Object.defineProperty&&Object.defineProperty(O.prototype,"encoding",{get:function(){return this._encoding.name.toLowerCase()}}),O.prototype.encode=function(n,e){n=void 0===n?"":String(n),e=i(e),this._do_not_flush||(this._encoder=b[this._encoding.name]({fatal:"fatal"===this._fatal})),this._do_not_flush=Boolean(e.stream)
-for(var r,t=new a(function(n){for(var e=String(n),r=e.length,i=0,t=[];i<r;){var o=e.charCodeAt(i)
-if(o<55296||o>57343)t.push(o)
-else if(56320<=o&&o<=57343)t.push(65533)
-else if(55296<=o&&o<=56319)if(i===r-1)t.push(65533)
-else{var s=e.charCodeAt(i+1)
-if(56320<=s&&s<=57343){var a=1023&o,u=1023&s
-t.push(65536+(a<<10)+u),i+=1}else t.push(65533)}i+=1}return t}(n)),o=[];;){var l=t.read()
-if(l===s)break
-if((r=this._encoder.handler(t,l))===u)break
-Array.isArray(r)?o.push.apply(o,r):o.push(r)}if(!this._do_not_flush){for(;(r=this._encoder.handler(t,t.read()))!==u;)Array.isArray(r)?o.push.apply(o,r):o.push(r)
-this._encoder=null}return new Uint8Array(o)},b["UTF-8"]=function(n){return new E(n)},_["UTF-8"]=function(n){return new k(n)},"encoding-indexes"in n&&d.forEach((function(n){"Legacy single-byte encodings"===n.heading&&n.encodings.forEach((function(n){var e=n.name,r=v(e.toLowerCase())
-_[e]=function(n){return new j(r,n)},b[e]=function(n){return new B(r,n)}}))})),_.GBK=function(n){return new S(n)},b.GBK=function(n){return new T(n,!0)},b.gb18030=function(n){return new T(n)},_.gb18030=function(n){return new S(n)},b.Big5=function(n){return new U(n)},_.Big5=function(n){return new I(n)},b["EUC-JP"]=function(n){return new A(n)},_["EUC-JP"]=function(n){return new C(n)},b["ISO-2022-JP"]=function(n){return new M(n)},_["ISO-2022-JP"]=function(n){return new L(n)},b.Shift_JIS=function(n){return new D(n)},_.Shift_JIS=function(n){return new P(n)},b["EUC-KR"]=function(n){return new J(n)},_["EUC-KR"]=function(n){return new F(n)},b["UTF-16BE"]=function(n){return new G(!0,n)},_["UTF-16BE"]=function(n){return new R(!0,n)},b["UTF-16LE"]=function(n){return new G(!1,n)},_["UTF-16LE"]=function(n){return new R(!1,n)},b["x-user-defined"]=function(n){return new q(n)},_["x-user-defined"]=function(n){return new N(n)},n.TextEncoder||(n.TextEncoder=O),n.TextDecoder||(n.TextDecoder=x),"undefined"!=typeof module&&module.exports&&(module.exports={TextEncoder:n.TextEncoder,TextDecoder:n.TextDecoder,EncodingIndexes:n["encoding-indexes"]})})(this||{})
diff --git a/agent/uiserver/dist/assets/encoding-cdb50fbdab6d4d3fdf574dd784f77d27.js b/agent/uiserver/dist/assets/encoding-cdb50fbdab6d4d3fdf574dd784f77d27.js
new file mode 100644
index 0000000000000..19f436540f397
--- /dev/null
+++ b/agent/uiserver/dist/assets/encoding-cdb50fbdab6d4d3fdf574dd784f77d27.js
@@ -0,0 +1,204 @@
+(function(n){"use strict"
+function e(n,e,r){return e<=n&&n<=r}"undefined"!=typeof module&&module.exports&&!n["encoding-indexes"]&&(n["encoding-indexes"]=require("./encoding-indexes-75eea16b259716db4fd162ee283d2ae5.js")["encoding-indexes"])
+var r=Math.floor
+function i(n){if(void 0===n)return{}
+if(n===Object(n))return n
+throw TypeError("Could not convert argument to dictionary")}function t(n){return 0<=n&&n<=127}var o=t
+function s(n){this.tokens=[].slice.call(n),this.tokens.reverse()}s.prototype={endOfStream:function(){return!this.tokens.length},read:function(){return this.tokens.length?this.tokens.pop():-1},prepend:function(n){if(Array.isArray(n))for(var e=n;e.length;)this.tokens.push(e.pop())
+else this.tokens.push(n)},push:function(n){if(Array.isArray(n))for(var e=n;e.length;)this.tokens.unshift(e.shift())
+else this.tokens.unshift(n)}}
+function a(n,e){if(n)throw TypeError("Decoder error")
+return e||65533}function u(n){throw TypeError("The code point "+n+" could not be encoded.")}function l(n){return n=String(n).trim().toLowerCase(),Object.prototype.hasOwnProperty.call(c,n)?c[n]:null}var f=[{encodings:[{labels:["unicode-1-1-utf-8","utf-8","utf8"],name:"UTF-8"}],heading:"The Encoding"},{encodings:[{labels:["866","cp866","csibm866","ibm866"],name:"IBM866"},{labels:["csisolatin2","iso-8859-2","iso-ir-101","iso8859-2","iso88592","iso_8859-2","iso_8859-2:1987","l2","latin2"],name:"ISO-8859-2"},{labels:["csisolatin3","iso-8859-3","iso-ir-109","iso8859-3","iso88593","iso_8859-3","iso_8859-3:1988","l3","latin3"],name:"ISO-8859-3"},{labels:["csisolatin4","iso-8859-4","iso-ir-110","iso8859-4","iso88594","iso_8859-4","iso_8859-4:1988","l4","latin4"],name:"ISO-8859-4"},{labels:["csisolatincyrillic","cyrillic","iso-8859-5","iso-ir-144","iso8859-5","iso88595","iso_8859-5","iso_8859-5:1988"],name:"ISO-8859-5"},{labels:["arabic","asmo-708","csiso88596e","csiso88596i","csisolatinarabic","ecma-114","iso-8859-6","iso-8859-6-e","iso-8859-6-i","iso-ir-127","iso8859-6","iso88596","iso_8859-6","iso_8859-6:1987"],name:"ISO-8859-6"},{labels:["csisolatingreek","ecma-118","elot_928","greek","greek8","iso-8859-7","iso-ir-126","iso8859-7","iso88597","iso_8859-7","iso_8859-7:1987","sun_eu_greek"],name:"ISO-8859-7"},{labels:["csiso88598e","csisolatinhebrew","hebrew","iso-8859-8","iso-8859-8-e","iso-ir-138","iso8859-8","iso88598","iso_8859-8","iso_8859-8:1988","visual"],name:"ISO-8859-8"},{labels:["csiso88598i","iso-8859-8-i","logical"],name:"ISO-8859-8-I"},{labels:["csisolatin6","iso-8859-10","iso-ir-157","iso8859-10","iso885910","l6","latin6"],name:"ISO-8859-10"},{labels:["iso-8859-13","iso8859-13","iso885913"],name:"ISO-8859-13"},{labels:["iso-8859-14","iso8859-14","iso885914"],name:"ISO-8859-14"},{labels:["csisolatin9","iso-8859-15","iso8859-15","iso885915","iso_8859-15","l9"],name:"ISO-8859-15"},{labels:["iso-8859-16"],name:"ISO-8859-16"},{labels:["cskoi8r","koi","koi8","koi8-r","koi8_r"],name:"KOI8-R"},{labels:["koi8-ru","koi8-u"],name:"KOI8-U"},{labels:["csmacintosh","mac","macintosh","x-mac-roman"],name:"macintosh"},{labels:["dos-874","iso-8859-11","iso8859-11","iso885911","tis-620","windows-874"],name:"windows-874"},{labels:["cp1250","windows-1250","x-cp1250"],name:"windows-1250"},{labels:["cp1251","windows-1251","x-cp1251"],name:"windows-1251"},{labels:["ansi_x3.4-1968","ascii","cp1252","cp819","csisolatin1","ibm819","iso-8859-1","iso-ir-100","iso8859-1","iso88591","iso_8859-1","iso_8859-1:1987","l1","latin1","us-ascii","windows-1252","x-cp1252"],name:"windows-1252"},{labels:["cp1253","windows-1253","x-cp1253"],name:"windows-1253"},{labels:["cp1254","csisolatin5","iso-8859-9","iso-ir-148","iso8859-9","iso88599","iso_8859-9","iso_8859-9:1989","l5","latin5","windows-1254","x-cp1254"],name:"windows-1254"},{labels:["cp1255","windows-1255","x-cp1255"],name:"windows-1255"},{labels:["cp1256","windows-1256","x-cp1256"],name:"windows-1256"},{labels:["cp1257","windows-1257","x-cp1257"],name:"windows-1257"},{labels:["cp1258","windows-1258","x-cp1258"],name:"windows-1258"},{labels:["x-mac-cyrillic","x-mac-ukrainian"],name:"x-mac-cyrillic"}],heading:"Legacy single-byte encodings"},{encodings:[{labels:["chinese","csgb2312","csiso58gb231280","gb2312","gb_2312","gb_2312-80","gbk","iso-ir-58","x-gbk"],name:"GBK"},{labels:["gb18030"],name:"gb18030"}],heading:"Legacy multi-byte Chinese (simplified) encodings"},{encodings:[{labels:["big5","big5-hkscs","cn-big5","csbig5","x-x-big5"],name:"Big5"}],heading:"Legacy multi-byte Chinese (traditional) encodings"},{encodings:[{labels:["cseucpkdfmtjapanese","euc-jp","x-euc-jp"],name:"EUC-JP"},{labels:["csiso2022jp","iso-2022-jp"],name:"ISO-2022-JP"},{labels:["csshiftjis","ms932","ms_kanji","shift-jis","shift_jis","sjis","windows-31j","x-sjis"],name:"Shift_JIS"}],heading:"Legacy multi-byte Japanese encodings"},{encodings:[{labels:["cseuckr","csksc56011987","euc-kr","iso-ir-149","korean","ks_c_5601-1987","ks_c_5601-1989","ksc5601","ksc_5601","windows-949"],name:"EUC-KR"}],heading:"Legacy multi-byte Korean encodings"},{encodings:[{labels:["csiso2022kr","hz-gb-2312","iso-2022-cn","iso-2022-cn-ext","iso-2022-kr"],name:"replacement"},{labels:["utf-16be"],name:"UTF-16BE"},{labels:["utf-16","utf-16le"],name:"UTF-16LE"},{labels:["x-user-defined"],name:"x-user-defined"}],heading:"Legacy miscellaneous encodings"}],c={}
+f.forEach((function(n){n.encodings.forEach((function(n){n.labels.forEach((function(e){c[e]=n}))}))}))
+var d,h,g={},p={}
+function _(n,e){return e&&e[n]||null}function b(n,e){var r=e.indexOf(n)
+return-1===r?null:r}function w(e){if(!("encoding-indexes"in n))throw Error("Indexes missing. Did you forget to include encoding-indexes-75eea16b259716db4fd162ee283d2ae5.js first?")
+return n["encoding-indexes"][e]}function m(n,e){if(!(this instanceof m))throw TypeError("Called as a function. Did you forget 'new'?")
+n=void 0!==n?String(n):"utf-8",e=i(e),this._encoding=null,this._decoder=null,this._ignoreBOM=!1,this._BOMseen=!1,this._error_mode="replacement",this._do_not_flush=!1
+var r=l(n)
+if(null===r||"replacement"===r.name)throw RangeError("Unknown encoding: "+n)
+if(!p[r.name])throw Error("Decoder not present. Did you forget to include encoding-indexes-75eea16b259716db4fd162ee283d2ae5.js first?")
+return this._encoding=r,Boolean(e.fatal)&&(this._error_mode="fatal"),Boolean(e.ignoreBOM)&&(this._ignoreBOM=!0),Object.defineProperty||(this.encoding=this._encoding.name.toLowerCase(),this.fatal="fatal"===this._error_mode,this.ignoreBOM=this._ignoreBOM),this}function v(e,r){if(!(this instanceof v))throw TypeError("Called as a function. Did you forget 'new'?")
+r=i(r),this._encoding=null,this._encoder=null,this._do_not_flush=!1,this._fatal=Boolean(r.fatal)?"fatal":"replacement"
+if(Boolean(r.NONSTANDARD_allowLegacyEncoding)){var t=l(e=void 0!==e?String(e):"utf-8")
+if(null===t||"replacement"===t.name)throw RangeError("Unknown encoding: "+e)
+if(!g[t.name])throw Error("Encoder not present. Did you forget to include encoding-indexes-75eea16b259716db4fd162ee283d2ae5.js first?")
+this._encoding=t}else this._encoding=l("utf-8"),void 0!==e&&"console"in n&&console.warn("TextEncoder constructor called with encoding label, which is ignored.")
+return Object.defineProperty||(this.encoding=this._encoding.name.toLowerCase()),this}function y(n){var r=n.fatal,i=0,t=0,o=0,s=128,u=191
+this.handler=function(n,l){if(-1===l&&0!==o)return o=0,a(r)
+if(-1===l)return-1
+if(0===o){if(e(l,0,127))return l
+if(e(l,194,223))o=1,i=31&l
+else if(e(l,224,239))224===l&&(s=160),237===l&&(u=159),o=2,i=15&l
+else{if(!e(l,240,244))return a(r)
+240===l&&(s=144),244===l&&(u=143),o=3,i=7&l}return null}if(!e(l,s,u))return i=o=t=0,s=128,u=191,n.prepend(l),a(r)
+if(s=128,u=191,i=i<<6|63&l,(t+=1)!==o)return null
+var f=i
+return i=o=t=0,f}}function x(n){n.fatal
+this.handler=function(n,r){if(-1===r)return-1
+if(o(r))return r
+var i,t
+e(r,128,2047)?(i=1,t=192):e(r,2048,65535)?(i=2,t=224):e(r,65536,1114111)&&(i=3,t=240)
+for(var s=[(r>>6*i)+t];i>0;){var a=r>>6*(i-1)
+s.push(128|63&a),i-=1}return s}}function O(n,e){var r=e.fatal
+this.handler=function(e,i){if(-1===i)return-1
+if(t(i))return i
+var o=n[i-128]
+return null===o?a(r):o}}function k(n,e){e.fatal
+this.handler=function(e,r){if(-1===r)return-1
+if(o(r))return r
+var i=b(r,n)
+return null===i&&u(r),i+128}}function E(n){var r=n.fatal,i=0,o=0,s=0
+this.handler=function(n,u){if(-1===u&&0===i&&0===o&&0===s)return-1
+var l
+if(-1!==u||0===i&&0===o&&0===s||(i=0,o=0,s=0,a(r)),0!==s){l=null,e(u,48,57)&&(l=function(n){if(n>39419&&n<189e3||n>1237575)return null
+if(7457===n)return 59335
+var e,r=0,i=0,t=w("gb18030-ranges")
+for(e=0;e<t.length;++e){var o=t[e]
+if(!(o[0]<=n))break
+r=o[0],i=o[1]}return i+n-r}(10*(126*(10*(i-129)+o-48)+s-129)+u-48))
+var f=[o,s,u]
+return i=0,o=0,s=0,null===l?(n.prepend(f),a(r)):l}if(0!==o)return e(u,129,254)?(s=u,null):(n.prepend([o,u]),i=0,o=0,a(r))
+if(0!==i){if(e(u,48,57))return o=u,null
+var c=i,d=null
+i=0
+var h=u<127?64:65
+return(e(u,64,126)||e(u,128,254))&&(d=190*(c-129)+(u-h)),null===(l=null===d?null:_(d,w("gb18030")))&&t(u)&&n.prepend(u),null===l?a(r):l}return t(u)?u:128===u?8364:e(u,129,254)?(i=u,null):a(r)}}function j(n,e){n.fatal
+this.handler=function(n,i){if(-1===i)return-1
+if(o(i))return i
+if(58853===i)return u(i)
+if(e&&8364===i)return 128
+var t=b(i,w("gb18030"))
+if(null!==t){var s=t%190
+return[r(t/190)+129,s+(s<63?64:65)]}if(e)return u(i)
+t=function(n){if(59335===n)return 7457
+var e,r=0,i=0,t=w("gb18030-ranges")
+for(e=0;e<t.length;++e){var o=t[e]
+if(!(o[1]<=n))break
+r=o[1],i=o[0]}return i+n-r}(i)
+var a=r(t/10/126/10),l=r((t-=10*a*126*10)/10/126),f=r((t-=10*l*126)/10)
+return[a+129,l+48,f+129,t-10*f+48]}}function B(n){var r=n.fatal,i=0
+this.handler=function(n,o){if(-1===o&&0!==i)return i=0,a(r)
+if(-1===o&&0===i)return-1
+if(0!==i){var s=i,u=null
+i=0
+var l=o<127?64:98
+switch((e(o,64,126)||e(o,161,254))&&(u=157*(s-129)+(o-l)),u){case 1133:return[202,772]
+case 1135:return[202,780]
+case 1164:return[234,772]
+case 1166:return[234,780]}var f=null===u?null:_(u,w("big5"))
+return null===f&&t(o)&&n.prepend(o),null===f?a(r):f}return t(o)?o:e(o,129,254)?(i=o,null):a(r)}}function S(n){n.fatal
+this.handler=function(n,e){if(-1===e)return-1
+if(o(e))return e
+var i=function(n){var e=h=h||w("big5").map((function(n,e){return e<5024?null:n}))
+return 9552===n||9566===n||9569===n||9578===n||21313===n||21317===n?e.lastIndexOf(n):b(n,e)}(e)
+if(null===i)return u(e)
+var t=r(i/157)+129
+if(t<161)return u(e)
+var s=i%157
+return[t,s+(s<63?64:98)]}}function T(n){var r=n.fatal,i=!1,o=0
+this.handler=function(n,s){if(-1===s&&0!==o)return o=0,a(r)
+if(-1===s&&0===o)return-1
+if(142===o&&e(s,161,223))return o=0,65216+s
+if(143===o&&e(s,161,254))return i=!0,o=s,null
+if(0!==o){var u=o
+o=0
+var l=null
+return e(u,161,254)&&e(s,161,254)&&(l=_(94*(u-161)+(s-161),w(i?"jis0212":"jis0208"))),i=!1,e(s,161,254)||n.prepend(s),null===l?a(r):l}return t(s)?s:142===s||143===s||e(s,161,254)?(o=s,null):a(r)}}function I(n){n.fatal
+this.handler=function(n,i){if(-1===i)return-1
+if(o(i))return i
+if(165===i)return 92
+if(8254===i)return 126
+if(e(i,65377,65439))return[142,i-65377+161]
+8722===i&&(i=65293)
+var t=b(i,w("jis0208"))
+return null===t?u(i):[r(t/94)+161,t%94+161]}}function U(n){var r=n.fatal,i=0,t=1,o=2,s=3,u=4,l=5,f=6,c=i,d=i,h=0,g=!1
+this.handler=function(n,p){switch(c){default:case i:return 27===p?(c=l,null):e(p,0,127)&&14!==p&&15!==p&&27!==p?(g=!1,p):-1===p?-1:(g=!1,a(r))
+case t:return 27===p?(c=l,null):92===p?(g=!1,165):126===p?(g=!1,8254):e(p,0,127)&&14!==p&&15!==p&&27!==p&&92!==p&&126!==p?(g=!1,p):-1===p?-1:(g=!1,a(r))
+case o:return 27===p?(c=l,null):e(p,33,95)?(g=!1,65344+p):-1===p?-1:(g=!1,a(r))
+case s:return 27===p?(c=l,null):e(p,33,126)?(g=!1,h=p,c=u,null):-1===p?-1:(g=!1,a(r))
+case u:if(27===p)return c=l,a(r)
+if(e(p,33,126)){c=s
+var b=_(94*(h-33)+p-33,w("jis0208"))
+return null===b?a(r):b}return-1===p?(c=s,n.prepend(p),a(r)):(c=s,a(r))
+case l:return 36===p||40===p?(h=p,c=f,null):(n.prepend(p),g=!1,c=d,a(r))
+case f:var m=h
+h=0
+var v=null
+if(40===m&&66===p&&(v=i),40===m&&74===p&&(v=t),40===m&&73===p&&(v=o),36!==m||64!==p&&66!==p||(v=s),null!==v){c=c=v
+var y=g
+return g=!0,y?a(r):null}return n.prepend([m,p]),g=!1,c=d,a(r)}}}function C(n){n.fatal
+var e=0,i=1,t=2,s=e
+this.handler=function(n,a){if(-1===a&&s!==e)return n.prepend(a),s=e,[27,40,66]
+if(-1===a&&s===e)return-1
+if(!(s!==e&&s!==i||14!==a&&15!==a&&27!==a))return u(65533)
+if(s===e&&o(a))return a
+if(s===i&&(o(a)&&92!==a&&126!==a||165==a||8254==a)){if(o(a))return a
+if(165===a)return 92
+if(8254===a)return 126}if(o(a)&&s!==e)return n.prepend(a),s=e,[27,40,66]
+if((165===a||8254===a)&&s!==i)return n.prepend(a),s=i,[27,40,74]
+8722===a&&(a=65293)
+var l=b(a,w("jis0208"))
+return null===l?u(a):s!==t?(n.prepend(a),s=t,[27,36,66]):[r(l/94)+33,l%94+33]}}function A(n){var r=n.fatal,i=0
+this.handler=function(n,o){if(-1===o&&0!==i)return i=0,a(r)
+if(-1===o&&0===i)return-1
+if(0!==i){var s=i,u=null
+i=0
+var l=o<127?64:65,f=s<160?129:193
+if((e(o,64,126)||e(o,128,252))&&(u=188*(s-f)+o-l),e(u,8836,10715))return 48508+u
+var c=null===u?null:_(u,w("jis0208"))
+return null===c&&t(o)&&n.prepend(o),null===c?a(r):c}return t(o)||128===o?o:e(o,161,223)?65216+o:e(o,129,159)||e(o,224,252)?(i=o,null):a(r)}}function L(n){n.fatal
+this.handler=function(n,i){if(-1===i)return-1
+if(o(i)||128===i)return i
+if(165===i)return 92
+if(8254===i)return 126
+if(e(i,65377,65439))return i-65377+161
+8722===i&&(i=65293)
+var t=function(n){return(d=d||w("jis0208").map((function(n,r){return e(r,8272,8835)?null:n}))).indexOf(n)}(i)
+if(null===t)return u(i)
+var s=r(t/188),a=t%188
+return[s+(s<31?129:193),a+(a<63?64:65)]}}function M(n){var r=n.fatal,i=0
+this.handler=function(n,o){if(-1===o&&0!==i)return i=0,a(r)
+if(-1===o&&0===i)return-1
+if(0!==i){var s=i,u=null
+i=0,e(o,65,254)&&(u=190*(s-129)+(o-65))
+var l=null===u?null:_(u,w("euc-kr"))
+return null===u&&t(o)&&n.prepend(o),null===l?a(r):l}return t(o)?o:e(o,129,254)?(i=o,null):a(r)}}function P(n){n.fatal
+this.handler=function(n,e){if(-1===e)return-1
+if(o(e))return e
+var i=b(e,w("euc-kr"))
+return null===i?u(e):[r(i/190)+129,i%190+65]}}function D(n,e){var r=n>>8,i=255&n
+return e?[r,i]:[i,r]}function F(n,r){var i=r.fatal,t=null,o=null
+this.handler=function(r,s){if(-1===s&&(null!==t||null!==o))return a(i)
+if(-1===s&&null===t&&null===o)return-1
+if(null===t)return t=s,null
+var u
+if(u=n?(t<<8)+s:(s<<8)+t,t=null,null!==o){var l=o
+return o=null,e(u,56320,57343)?65536+1024*(l-55296)+(u-56320):(r.prepend(D(u,n)),a(i))}return e(u,55296,56319)?(o=u,null):e(u,56320,57343)?a(i):u}}function J(n,r){r.fatal
+this.handler=function(r,i){if(-1===i)return-1
+if(e(i,0,65535))return D(i,n)
+var t=D(55296+(i-65536>>10),n),o=D(56320+(i-65536&1023),n)
+return t.concat(o)}}function K(n){n.fatal
+this.handler=function(n,e){return-1===e?-1:t(e)?e:63360+e-128}}function R(n){n.fatal
+this.handler=function(n,r){return-1===r?-1:o(r)?r:e(r,63360,63487)?r-63360+128:u(r)}}Object.defineProperty&&(Object.defineProperty(m.prototype,"encoding",{get:function(){return this._encoding.name.toLowerCase()}}),Object.defineProperty(m.prototype,"fatal",{get:function(){return"fatal"===this._error_mode}}),Object.defineProperty(m.prototype,"ignoreBOM",{get:function(){return this._ignoreBOM}})),m.prototype.decode=function(n,e){var r
+r="object"==typeof n&&n instanceof ArrayBuffer?new Uint8Array(n):"object"==typeof n&&"buffer"in n&&n.buffer instanceof ArrayBuffer?new Uint8Array(n.buffer,n.byteOffset,n.byteLength):new Uint8Array(0),e=i(e),this._do_not_flush||(this._decoder=p[this._encoding.name]({fatal:"fatal"===this._error_mode}),this._BOMseen=!1),this._do_not_flush=Boolean(e.stream)
+for(var t,o=new s(r),a=[];;){var u=o.read()
+if(-1===u)break
+if(-1===(t=this._decoder.handler(o,u)))break
+null!==t&&(Array.isArray(t)?a.push.apply(a,t):a.push(t))}if(!this._do_not_flush){do{if(-1===(t=this._decoder.handler(o,o.read())))break
+null!==t&&(Array.isArray(t)?a.push.apply(a,t):a.push(t))}while(!o.endOfStream())
+this._decoder=null}return function(n){var e,r
+return e=["UTF-8","UTF-16LE","UTF-16BE"],r=this._encoding.name,-1===e.indexOf(r)||this._ignoreBOM||this._BOMseen||(n.length>0&&65279===n[0]?(this._BOMseen=!0,n.shift()):n.length>0&&(this._BOMseen=!0)),function(n){for(var e="",r=0;r<n.length;++r){var i=n[r]
+i<=65535?e+=String.fromCharCode(i):(i-=65536,e+=String.fromCharCode(55296+(i>>10),56320+(1023&i)))}return e}(n)}.call(this,a)},Object.defineProperty&&Object.defineProperty(v.prototype,"encoding",{get:function(){return this._encoding.name.toLowerCase()}}),v.prototype.encode=function(n,e){n=void 0===n?"":String(n),e=i(e),this._do_not_flush||(this._encoder=g[this._encoding.name]({fatal:"fatal"===this._fatal})),this._do_not_flush=Boolean(e.stream)
+for(var r,t=new s(function(n){for(var e=String(n),r=e.length,i=0,t=[];i<r;){var o=e.charCodeAt(i)
+if(o<55296||o>57343)t.push(o)
+else if(56320<=o&&o<=57343)t.push(65533)
+else if(55296<=o&&o<=56319)if(i===r-1)t.push(65533)
+else{var s=e.charCodeAt(i+1)
+if(56320<=s&&s<=57343){var a=1023&o,u=1023&s
+t.push(65536+(a<<10)+u),i+=1}else t.push(65533)}i+=1}return t}(n)),o=[];;){var a=t.read()
+if(-1===a)break
+if(-1===(r=this._encoder.handler(t,a)))break
+Array.isArray(r)?o.push.apply(o,r):o.push(r)}if(!this._do_not_flush){for(;-1!==(r=this._encoder.handler(t,t.read()));)Array.isArray(r)?o.push.apply(o,r):o.push(r)
+this._encoder=null}return new Uint8Array(o)},g["UTF-8"]=function(n){return new x(n)},p["UTF-8"]=function(n){return new y(n)},"encoding-indexes"in n&&f.forEach((function(n){"Legacy single-byte encodings"===n.heading&&n.encodings.forEach((function(n){var e=n.name,r=w(e.toLowerCase())
+p[e]=function(n){return new O(r,n)},g[e]=function(n){return new k(r,n)}}))})),p.GBK=function(n){return new E(n)},g.GBK=function(n){return new j(n,!0)},g.gb18030=function(n){return new j(n)},p.gb18030=function(n){return new E(n)},g.Big5=function(n){return new S(n)},p.Big5=function(n){return new B(n)},g["EUC-JP"]=function(n){return new I(n)},p["EUC-JP"]=function(n){return new T(n)},g["ISO-2022-JP"]=function(n){return new C(n)},p["ISO-2022-JP"]=function(n){return new U(n)},g.Shift_JIS=function(n){return new L(n)},p.Shift_JIS=function(n){return new A(n)},g["EUC-KR"]=function(n){return new P(n)},p["EUC-KR"]=function(n){return new M(n)},g["UTF-16BE"]=function(n){return new J(!0,n)},p["UTF-16BE"]=function(n){return new F(!0,n)},g["UTF-16LE"]=function(n){return new J(!1,n)},p["UTF-16LE"]=function(n){return new F(!1,n)},g["x-user-defined"]=function(n){return new R(n)},p["x-user-defined"]=function(n){return new K(n)},n.TextEncoder||(n.TextEncoder=v),n.TextDecoder||(n.TextDecoder=m),"undefined"!=typeof module&&module.exports&&(module.exports={TextEncoder:n.TextEncoder,TextDecoder:n.TextDecoder,EncodingIndexes:n["encoding-indexes"]})})(this||{})
diff --git a/agent/uiserver/dist/assets/encoding-indexes-50f27403be5972eae4831f5b69db1f80.js b/agent/uiserver/dist/assets/encoding-indexes-75eea16b259716db4fd162ee283d2ae5.js
similarity index 100%
rename from agent/uiserver/dist/assets/encoding-indexes-50f27403be5972eae4831f5b69db1f80.js
rename to agent/uiserver/dist/assets/encoding-indexes-75eea16b259716db4fd162ee283d2ae5.js
diff --git a/agent/uiserver/dist/assets/init-21ea65714d133467454b601efc15e2dd.js b/agent/uiserver/dist/assets/init-21ea65714d133467454b601efc15e2dd.js
new file mode 100644
index 0000000000000..0befe4545f14d
--- /dev/null
+++ b/agent/uiserver/dist/assets/init-21ea65714d133467454b601efc15e2dd.js
@@ -0,0 +1,5 @@
+(function(e){const t=new Map(Object.entries(JSON.parse(e.querySelector("[data-consul-ui-fs]").textContent))),n=function(t){var n=e.createElement("script")
+n.src=t,e.body.appendChild(n)}
+"TextDecoder"in window||(n(t.get(["text-encoding","encoding-indexes"].join("/")+".js")),n(t.get(["text-encoding","encoding"].join("/")+".js"))),window.CSS&&window.CSS.escape||n(t.get(["css.escape","css.escape"].join("/")+".js"))
+try{const t=e.querySelector('[name="consul-ui/config/environment"]'),n=JSON.parse(e.querySelector("[data-consul-ui-config]").textContent),o=JSON.parse(decodeURIComponent(t.getAttribute("content"))),c="string"!=typeof n.ContentPath?"":n.ContentPath
+c.length>0&&(o.rootURL=c),t.setAttribute("content",encodeURIComponent(JSON.stringify(o)))}catch(o){throw new Error("Unable to parse consul-ui settings: "+o.message)}})(document)
diff --git a/agent/uiserver/dist/assets/init-fe2561b45ce1429092f4a9a2bbb9ce71.js b/agent/uiserver/dist/assets/init-fe2561b45ce1429092f4a9a2bbb9ce71.js
deleted file mode 100644
index 084a65b5555a3..0000000000000
--- a/agent/uiserver/dist/assets/init-fe2561b45ce1429092f4a9a2bbb9ce71.js
+++ /dev/null
@@ -1,5 +0,0 @@
-(function(e,t){const n=new Map(Object.entries(JSON.parse(e.querySelector("[data-consul-ui-fs]").textContent))),o=function(t){var n=e.createElement("script")
-n.src=t,e.body.appendChild(n)}
-"TextDecoder"in window||(o(n.get(`${["text-encoding","encoding-indexes"].join("/")}.js`)),o(n.get(`${["text-encoding","encoding"].join("/")}.js`))),window.CSS&&window.CSS.escape||o(n.get(`${["css.escape","css.escape"].join("/")}.js`))
-try{const t=e.querySelector('[name="consul-ui/config/environment"]'),n=JSON.parse(e.querySelector("[data-consul-ui-config]").textContent),o=JSON.parse(decodeURIComponent(t.getAttribute("content"))),c="string"!=typeof n.ContentPath?"":n.ContentPath
-c.length>0&&(o.rootURL=c),t.setAttribute("content",encodeURIComponent(JSON.stringify(o)))}catch(c){throw new Error(`Unable to parse consul-ui settings: ${c.message}`)}})(document)
diff --git a/agent/uiserver/dist/assets/metrics-providers/consul-5e97a9af114229497d43377450c54418.js b/agent/uiserver/dist/assets/metrics-providers/consul-31d7e3b0ef7c58d62338c7d7aeaaf545.js
similarity index 100%
rename from agent/uiserver/dist/assets/metrics-providers/consul-5e97a9af114229497d43377450c54418.js
rename to agent/uiserver/dist/assets/metrics-providers/consul-31d7e3b0ef7c58d62338c7d7aeaaf545.js
diff --git a/agent/uiserver/dist/assets/metrics-providers/prometheus-5f31ba3b7ffd850fa916a0a76933e968.js b/agent/uiserver/dist/assets/metrics-providers/prometheus-5f31ba3b7ffd850fa916a0a76933e968.js
new file mode 100644
index 0000000000000..073ed767a5070
--- /dev/null
+++ b/agent/uiserver/dist/assets/metrics-providers/prometheus-5f31ba3b7ffd850fa916a0a76933e968.js
@@ -0,0 +1,43 @@
+(function(){var e={unitSuffix:"",labels:{},data:[]},t={options:{},init:function(e){if(this.options=e,!this.options.metrics_proxy_enabled)throw new Error("prometheus metrics provider currently requires the ui_config.metrics_proxy to be configured in the Consul agent.")},httpGet:function(e,t,r){if(t){var s=-1!==e.indexOf("?")?"&":"?"
+e=e+s+Object.keys(t).map((function(e){return encodeURIComponent(e)+"="+encodeURIComponent(t[e])})).join("&")}return this.options.fetch(e,{headers:r||{}}).then((function(e){if(e.ok)return e.json()
+var t=new Error("HTTP Error: "+e.statusText)
+throw t.statusCode=e.status,t}))},serviceRecentSummarySeries:function(e,t,r,s,n){var a=(new Date).getTime()/1e3
+return n.start=a-900,n.end=a,this.hasL7Metrics(s)?this.fetchRequestRateSeries(e,t,r,n):this.fetchDataRateSeries(e,t,r,n)},serviceRecentSummaryStats:function(e,t,r,s,n){var a=[]
+return this.hasL7Metrics(s)?(a.push(this.fetchRPS(e,t,r,"service",n)),a.push(this.fetchER(e,t,r,"service",n)),a.push(this.fetchPercentile(50,e,t,r,"service",n)),a.push(this.fetchPercentile(99,e,t,r,"service",n))):(a.push(this.fetchConnRate(e,t,r,"service",n)),a.push(this.fetchServiceRx(e,t,r,"service",n)),a.push(this.fetchServiceTx(e,t,r,"service",n)),a.push(this.fetchServiceNoRoute(e,t,r,"service",n))),this.fetchStats(a)},upstreamRecentSummaryStats:function(e,t,r,s){return this.fetchRecentSummaryStats(e,t,r,"upstream",s)},downstreamRecentSummaryStats:function(e,t,r,s){return this.fetchRecentSummaryStats(e,t,r,"downstream",s)},fetchRecentSummaryStats:function(e,t,r,s,n){var a=[]
+return a.push(this.fetchRPS(e,t,r,s,n)),a.push(this.fetchER(e,t,r,s,n)),a.push(this.fetchPercentile(50,e,t,r,s,n)),a.push(this.fetchPercentile(99,e,t,r,s,n)),a.push(this.fetchConnRate(e,t,r,s,n)),a.push(this.fetchServiceRx(e,t,r,s,n)),a.push(this.fetchServiceTx(e,t,r,s,n)),a.push(this.fetchServiceNoRoute(e,t,r,s,n)),this.fetchStatsGrouped(a)},hasL7Metrics:function(e){return"http"===e||"http2"===e||"grpc"===e},fetchStats:function(e){return Promise.all(e).then((function(t){for(var r={stats:[]},s=0;s<e.length;s++)t[s].value&&r.stats.push(t[s])
+return r}))},fetchStatsGrouped:function(e){return Promise.all(e).then((function(t){for(var r={stats:{}},s=0;s<e.length;s++)if(t[s])for(var n in t[s])t[s].hasOwnProperty(n)&&(r.stats[n]||(r.stats[n]=[]),r.stats[n].push(t[s][n]))
+return r}))},reformatSeries:function(t,r){return function(s){if(!s.data||!s.data.result||0==s.data.result.length||!s.data.result[0].values||0==s.data.result[0].values.length)return e
+let n=s.data.result[0].values.map((function(e){return{time:Math.round(1e3*e[0])}}))
+return s.data.result.map((function(e){e.values.map((function(t,r){n[r][e.metric.label]=parseFloat(t[1])}))})),{unitSuffix:t,labels:r,data:n}}},fetchRequestRateSeries:function(e,t,r,s){var n=`sum by (label) (label_replace(label_replace(irate(envoy_listener_http_downstream_rq_xx{consul_source_service="${e}",consul_source_datacenter="${t}",consul_source_namespace="${r}",envoy_http_conn_manager_prefix="public_listener"}[10m]), "label", "Successes", "envoy_response_code_class", "[^5]"), "label", "Errors", "envoy_response_code_class", "5"))`
+return this.fetchSeries(n,s).then(this.reformatSeries(" rps",{Total:"Total inbound requests per second",Successes:"Successful responses (with an HTTP response code not in the 5xx range) per second.",Errors:"Error responses (with an HTTP response code in the 5xx range) per second."}))},fetchDataRateSeries:function(e,t,r,s){var n=`8 * sum by (label) (label_replace(irate(envoy_tcp_downstream_cx_tx_bytes_total{consul_source_service="${e}",consul_source_datacenter="${t}",consul_source_namespace="${r}",envoy_tcp_prefix="public_listener"}[10m]), "label", "Outbound", "__name__", ".*") or label_replace(irate(envoy_tcp_downstream_cx_rx_bytes_total{consul_source_service="${e}",consul_source_datacenter="${t}",consul_source_namespace="${r}",envoy_tcp_prefix="public_listener"}[10m]), "label", "Inbound", "__name__", ".*"))`
+return this.fetchSeries(n,s).then(this.reformatSeries("bps",{Total:"Total bandwidth",Inbound:"Inbound data rate (data recieved) from the network in bits per second.",Outbound:"Outbound data rate (data transmitted) from the network in bits per second."}))},makeSubject:function(e,t,r,s){var n=`${r}/${e} (${t})`
+return"upstream"==s?n+" &rarr; {{GROUP}}":"downstream"==s?"{{GROUP}} &rarr; "+n:n},makeHTTPSelector:function(e,t,r,s){if("downstream"==s)return`consul_destination_service="${e}",consul_destination_datacenter="${t}",consul_destination_namespace="${r}"`
+var n=`consul_source_service="${e}",consul_source_datacenter="${t}",consul_source_namespace="${r}"`
+return n+="upstream"==s?',envoy_http_conn_manager_prefix="upstream"':',envoy_http_conn_manager_prefix="public_listener"'},makeTCPSelector:function(e,t,r,s){if("downstream"==s)return`consul_destination_service="${e}",consul_destination_datacenter="${t}",consul_destination_namespace="${r}"`
+var n=`consul_source_service="${e}",consul_source_datacenter="${t}",consul_source_namespace="${r}"`
+return n+="upstream"==s?',envoy_tcp_prefix=~"upstream.*"':',envoy_tcp_prefix="public_listener"'},groupQuery:function(e,t){return"upstream"==e?t+=" by (consul_upstream_service,consul_upstream_datacenter,consul_upstream_namespace)":"downstream"==e&&(t+=" by (consul_source_service,consul_source_datacenter,consul_source_namespace)"),t},groupByInfix:function(e){return"upstream"==e?"upstream":"downstream"==e&&"source"},metricPrefixHTTP:function(e){return"downstream"==e?"envoy_cluster_upstream_rq":"envoy_http_downstream_rq"},metricPrefixTCP:function(e){return"downstream"==e?"envoy_cluster_upstream_cx":"envoy_tcp_downstream_cx"},fetchRPS:function(e,t,s,n){var a=this.makeHTTPSelector(e,t,s,n),c=this.makeSubject(e,t,s,n),i=`sum(rate(${this.metricPrefixHTTP(n)}_completed{${a}}[15m]))`
+return this.fetchStat(this.groupQuery(n,i),"RPS",`<b>${c}</b> request rate averaged over the last 15 minutes`,r,this.groupByInfix(n))},fetchER:function(e,t,s,n){var a=this.makeHTTPSelector(e,t,s,n),c=this.makeSubject(e,t,s,n),i=""
+"upstream"==n?i+=" by (consul_upstream_service,consul_upstream_datacenter,consul_upstream_namespace)":"downstream"==n&&(i+=" by (consul_source_service,consul_source_datacenter,consul_source_namespace)")
+var u=this.metricPrefixHTTP(n),o=`sum(rate(${u}_xx{${a},envoy_response_code_class="5"}[15m]))${i}/sum(rate(${u}_xx{${a}}[15m]))${i}`
+return this.fetchStat(o,"ER",`Percentage of <b>${c}</b> requests which were 5xx status over the last 15 minutes`,(function(e){return r(e)+"%"}),this.groupByInfix(n))},fetchPercentile:function(e,t,r,n,a){var c=this.makeHTTPSelector(t,r,n,a),i=this.makeSubject(t,r,n,a),u="le"
+"upstream"==a?u+=",consul_upstream_service,consul_upstream_datacenter,consul_upstream_namespace":"downstream"==a&&(u+=",consul_source_service,consul_source_datacenter,consul_source_namespace")
+var o=`histogram_quantile(${e/100}, sum by(${u}) (rate(${this.metricPrefixHTTP(a)}_time_bucket{${c}}[15m])))`
+return this.fetchStat(o,"P"+e,`<b>${i}</b> ${e}th percentile request service time over the last 15 minutes`,s,this.groupByInfix(a))},fetchConnRate:function(e,t,s,n){var a=this.makeTCPSelector(e,t,s,n),c=this.makeSubject(e,t,s,n),i=`sum(rate(${this.metricPrefixTCP(n)}_total{${a}}[15m]))`
+return this.fetchStat(this.groupQuery(n,i),"CR",`<b>${c}</b> inbound TCP connections per second averaged over the last 15 minutes`,r,this.groupByInfix(n))},fetchServiceRx:function(e,t,s,n){var a=this.makeTCPSelector(e,t,s,n),c=this.makeSubject(e,t,s,n),i=`8 * sum(rate(${this.metricPrefixTCP(n)}_rx_bytes_total{${a}}[15m]))`
+return this.fetchStat(this.groupQuery(n,i),"RX",`<b>${c}</b> received bits per second averaged over the last 15 minutes`,r,this.groupByInfix(n))},fetchServiceTx:function(e,t,s,n){var a=this.makeTCPSelector(e,t,s,n),c=this.makeSubject(e,t,s,n),i=`8 * sum(rate(${this.metricPrefixTCP(n)}_tx_bytes_total{${a}}[15m]))`
+return this.fetchStat(this.groupQuery(n,i),"TX",`<b>${c}</b> transmitted bits per second averaged over the last 15 minutes`,r,this.groupByInfix(n))},fetchServiceNoRoute:function(e,t,s,n){var a=this.makeTCPSelector(e,t,s,n),c=this.makeSubject(e,t,s,n),i="_no_route"
+"downstream"==n&&(i="_connect_fail")
+var u=`sum(rate(${this.metricPrefixTCP(n)}${i}{${a}}[15m]))`
+return this.fetchStat(this.groupQuery(n,u),"NR",`<b>${c}</b> unroutable (failed) connections per second averaged over the last 15 minutes`,r,this.groupByInfix(n))},fetchStat:function(e,t,r,s,n){n||(e+=" OR on() vector(0)")
+var a={query:e,time:(new Date).getTime()/1e3}
+return this.httpGet("/api/v1/query",a).then((function(e){if(!n){var a=parseFloat(e.data.result[0].value[1])
+return{label:t,desc:r,value:isNaN(a)?"-":s(a)}}for(var c={},i=0;i<e.data.result.length;i++){var u=e.data.result[i],o=(a=parseFloat(u.value[1]),`${u.metric["consul_"+n+"_service"]}.${u.metric["consul_"+n+"_namespace"]}.${u.metric["consul_"+n+"_datacenter"]}`)
+c[o]={label:t,desc:r.replace("{{GROUP}}",o),value:isNaN(a)?"-":s(a)}}return c}))},fetchSeries:function(e,t){var r={query:e,start:t.start,end:t.end,step:"10s",timeout:"8s"}
+return this.httpGet("/api/v1/query_range",r)}}
+function r(e){return e<1e3?Number.isInteger(e)?""+e:Number(e>=100?e.toPrecision(3):e<1?e.toFixed(2):e.toPrecision(2)):e>=1e3&&e<1e6?+(e/1e3).toPrecision(3)+"k":e>=1e6&&e<1e9?+(e/1e6).toPrecision(3)+"m":e>=1e9&&e<1e12?+(e/1e9).toPrecision(3)+"g":e>=1e12?+(e/1e12).toFixed(0)+"t":void 0}function s(e){if(e<1e3)return Math.round(e)+"ms"
+var t=e/1e3
+if(t<60)return t.toFixed(1)+"s"
+var r=t/60
+if(r<60)return r.toFixed(1)+"m"
+var s=r/60
+return s<24?s.toFixed(1)+"h":(s/24).toFixed(1)+"d"}window.consul.registerMetricsProvider("prometheus",t)})()
diff --git a/agent/uiserver/dist/assets/metrics-providers/prometheus-8779f1c99f6a15611567154767f1f674.js b/agent/uiserver/dist/assets/metrics-providers/prometheus-8779f1c99f6a15611567154767f1f674.js
deleted file mode 100644
index 725f6e0b424ce..0000000000000
--- a/agent/uiserver/dist/assets/metrics-providers/prometheus-8779f1c99f6a15611567154767f1f674.js
+++ /dev/null
@@ -1,43 +0,0 @@
-(function(){var e={unitSuffix:"",labels:{},data:[]},t={options:{},init:function(e){if(this.options=e,!this.options.metrics_proxy_enabled)throw new Error("prometheus metrics provider currently requires the ui_config.metrics_proxy to be configured in the Consul agent.")},httpGet:function(e,t,r){if(t){var s=-1!==e.indexOf("?")?"&":"?"
-e=e+s+Object.keys(t).map((function(e){return encodeURIComponent(e)+"="+encodeURIComponent(t[e])})).join("&")}return this.options.fetch(e,{headers:r||{}}).then((function(e){if(e.ok)return e.json()
-var t=new Error("HTTP Error: "+e.statusText)
-throw t.statusCode=e.status,t}))},serviceRecentSummarySeries:function(e,t,r,s,n){var a=(new Date).getTime()/1e3
-return n.start=a-900,n.end=a,this.hasL7Metrics(s)?this.fetchRequestRateSeries(e,t,r,n):this.fetchDataRateSeries(e,t,r,n)},serviceRecentSummaryStats:function(e,t,r,s,n){var a=[]
-return this.hasL7Metrics(s)?(a.push(this.fetchRPS(e,t,r,"service",n)),a.push(this.fetchER(e,t,r,"service",n)),a.push(this.fetchPercentile(50,e,t,r,"service",n)),a.push(this.fetchPercentile(99,e,t,r,"service",n))):(a.push(this.fetchConnRate(e,t,r,"service",n)),a.push(this.fetchServiceRx(e,t,r,"service",n)),a.push(this.fetchServiceTx(e,t,r,"service",n)),a.push(this.fetchServiceNoRoute(e,t,r,"service",n))),this.fetchStats(a)},upstreamRecentSummaryStats:function(e,t,r,s){return this.fetchRecentSummaryStats(e,t,r,"upstream",s)},downstreamRecentSummaryStats:function(e,t,r,s){return this.fetchRecentSummaryStats(e,t,r,"downstream",s)},fetchRecentSummaryStats:function(e,t,r,s,n){var a=[]
-return a.push(this.fetchRPS(e,t,r,s,n)),a.push(this.fetchER(e,t,r,s,n)),a.push(this.fetchPercentile(50,e,t,r,s,n)),a.push(this.fetchPercentile(99,e,t,r,s,n)),a.push(this.fetchConnRate(e,t,r,s,n)),a.push(this.fetchServiceRx(e,t,r,s,n)),a.push(this.fetchServiceTx(e,t,r,s,n)),a.push(this.fetchServiceNoRoute(e,t,r,s,n)),this.fetchStatsGrouped(a)},hasL7Metrics:function(e){return"http"===e||"http2"===e||"grpc"===e},fetchStats:function(e){return Promise.all(e).then((function(t){for(var r={stats:[]},s=0;s<e.length;s++)t[s].value&&r.stats.push(t[s])
-return r}))},fetchStatsGrouped:function(e){return Promise.all(e).then((function(t){for(var r={stats:{}},s=0;s<e.length;s++)if(t[s])for(var n in t[s])t[s].hasOwnProperty(n)&&(r.stats[n]||(r.stats[n]=[]),r.stats[n].push(t[s][n]))
-return r}))},reformatSeries:function(t,r){return function(s){if(!s.data||!s.data.result||0==s.data.result.length||!s.data.result[0].values||0==s.data.result[0].values.length)return e
-let n=s.data.result[0].values.map((function(e,t){return{time:Math.round(1e3*e[0])}}))
-return s.data.result.map((function(e){e.values.map((function(t,r){n[r][e.metric.label]=parseFloat(t[1])}))})),{unitSuffix:t,labels:r,data:n}}},fetchRequestRateSeries:function(e,t,r,s){var n=`sum by (label) (label_replace(label_replace(irate(envoy_listener_http_downstream_rq_xx{consul_source_service="${e}",consul_source_datacenter="${t}",consul_source_namespace="${r}",envoy_http_conn_manager_prefix="public_listener"}[10m]), "label", "Successes", "envoy_response_code_class", "[^5]"), "label", "Errors", "envoy_response_code_class", "5"))`
-return this.fetchSeries(n,s).then(this.reformatSeries(" rps",{Total:"Total inbound requests per second",Successes:"Successful responses (with an HTTP response code not in the 5xx range) per second.",Errors:"Error responses (with an HTTP response code in the 5xx range) per second."}))},fetchDataRateSeries:function(e,t,r,s){var n=`8 * sum by (label) (label_replace(irate(envoy_tcp_downstream_cx_tx_bytes_total{consul_source_service="${e}",consul_source_datacenter="${t}",consul_source_namespace="${r}",envoy_tcp_prefix="public_listener"}[10m]), "label", "Outbound", "__name__", ".*") or label_replace(irate(envoy_tcp_downstream_cx_rx_bytes_total{consul_source_service="${e}",consul_source_datacenter="${t}",consul_source_namespace="${r}",envoy_tcp_prefix="public_listener"}[10m]), "label", "Inbound", "__name__", ".*"))`
-return this.fetchSeries(n,s).then(this.reformatSeries("bps",{Total:"Total bandwidth",Inbound:"Inbound data rate (data recieved) from the network in bits per second.",Outbound:"Outbound data rate (data transmitted) from the network in bits per second."}))},makeSubject:function(e,t,r,s){var n=`${r}/${e} (${t})`
-return"upstream"==s?`${n} &rarr; {{GROUP}}`:"downstream"==s?`{{GROUP}} &rarr; ${n}`:n},makeHTTPSelector:function(e,t,r,s){if("downstream"==s)return`consul_destination_service="${e}",consul_destination_datacenter="${t}",consul_destination_namespace="${r}"`
-var n=`consul_source_service="${e}",consul_source_datacenter="${t}",consul_source_namespace="${r}"`
-return n+="upstream"==s?',envoy_http_conn_manager_prefix="upstream"':',envoy_http_conn_manager_prefix="public_listener"'},makeTCPSelector:function(e,t,r,s){if("downstream"==s)return`consul_destination_service="${e}",consul_destination_datacenter="${t}",consul_destination_namespace="${r}"`
-var n=`consul_source_service="${e}",consul_source_datacenter="${t}",consul_source_namespace="${r}"`
-return n+="upstream"==s?',envoy_tcp_prefix=~"upstream.*"':',envoy_tcp_prefix="public_listener"'},groupQuery:function(e,t){return"upstream"==e?t+=" by (consul_upstream_service,consul_upstream_datacenter,consul_upstream_namespace)":"downstream"==e&&(t+=" by (consul_source_service,consul_source_datacenter,consul_source_namespace)"),t},groupByInfix:function(e){return"upstream"==e?"upstream":"downstream"==e&&"source"},metricPrefixHTTP:function(e){return"downstream"==e?"envoy_cluster_upstream_rq":"envoy_http_downstream_rq"},metricPrefixTCP:function(e){return"downstream"==e?"envoy_cluster_upstream_cx":"envoy_tcp_downstream_cx"},fetchRPS:function(e,t,s,n,a){var c=this.makeHTTPSelector(e,t,s,n),i=this.makeSubject(e,t,s,n),u=`sum(rate(${this.metricPrefixHTTP(n)}_completed{${c}}[15m]))`
-return this.fetchStat(this.groupQuery(n,u),"RPS",`<b>${i}</b> request rate averaged over the last 15 minutes`,r,this.groupByInfix(n))},fetchER:function(e,t,s,n,a){var c=this.makeHTTPSelector(e,t,s,n),i=this.makeSubject(e,t,s,n),u=""
-"upstream"==n?u+=" by (consul_upstream_service,consul_upstream_datacenter,consul_upstream_namespace)":"downstream"==n&&(u+=" by (consul_source_service,consul_source_datacenter,consul_source_namespace)")
-var o=this.metricPrefixHTTP(n),h=`sum(rate(${o}_xx{${c},envoy_response_code_class="5"}[15m]))${u}/sum(rate(${o}_xx{${c}}[15m]))${u}`
-return this.fetchStat(h,"ER",`Percentage of <b>${i}</b> requests which were 5xx status over the last 15 minutes`,(function(e){return r(e)+"%"}),this.groupByInfix(n))},fetchPercentile:function(e,t,r,n,a,c){var i=this.makeHTTPSelector(t,r,n,a),u=this.makeSubject(t,r,n,a),o="le"
-"upstream"==a?o+=",consul_upstream_service,consul_upstream_datacenter,consul_upstream_namespace":"downstream"==a&&(o+=",consul_source_service,consul_source_datacenter,consul_source_namespace")
-var h=`histogram_quantile(${e/100}, sum by(${o}) (rate(${this.metricPrefixHTTP(a)}_time_bucket{${i}}[15m])))`
-return this.fetchStat(h,`P${e}`,`<b>${u}</b> ${e}th percentile request service time over the last 15 minutes`,s,this.groupByInfix(a))},fetchConnRate:function(e,t,s,n,a){var c=this.makeTCPSelector(e,t,s,n),i=this.makeSubject(e,t,s,n),u=`sum(rate(${this.metricPrefixTCP(n)}_total{${c}}[15m]))`
-return this.fetchStat(this.groupQuery(n,u),"CR",`<b>${i}</b> inbound TCP connections per second averaged over the last 15 minutes`,r,this.groupByInfix(n))},fetchServiceRx:function(e,t,s,n,a){var c=this.makeTCPSelector(e,t,s,n),i=this.makeSubject(e,t,s,n),u=`8 * sum(rate(${this.metricPrefixTCP(n)}_rx_bytes_total{${c}}[15m]))`
-return this.fetchStat(this.groupQuery(n,u),"RX",`<b>${i}</b> received bits per second averaged over the last 15 minutes`,r,this.groupByInfix(n))},fetchServiceTx:function(e,t,s,n,a){var c=this.makeTCPSelector(e,t,s,n),i=this.makeSubject(e,t,s,n),u=`8 * sum(rate(${this.metricPrefixTCP(n)}_tx_bytes_total{${c}}[15m]))`
-return this.fetchStat(this.groupQuery(n,u),"TX",`<b>${i}</b> transmitted bits per second averaged over the last 15 minutes`,r,this.groupByInfix(n))},fetchServiceNoRoute:function(e,t,s,n,a){var c=this.makeTCPSelector(e,t,s,n),i=this.makeSubject(e,t,s,n),u="_no_route"
-"downstream"==n&&(u="_connect_fail")
-var o=`sum(rate(${this.metricPrefixTCP(n)}${u}{${c}}[15m]))`
-return this.fetchStat(this.groupQuery(n,o),"NR",`<b>${i}</b> unroutable (failed) connections per second averaged over the last 15 minutes`,r,this.groupByInfix(n))},fetchStat:function(e,t,r,s,n){n||(e+=" OR on() vector(0)")
-var a={query:e,time:(new Date).getTime()/1e3}
-return this.httpGet("/api/v1/query",a).then((function(e){if(!n){var a=parseFloat(e.data.result[0].value[1])
-return{label:t,desc:r,value:isNaN(a)?"-":s(a)}}for(var c={},i=0;i<e.data.result.length;i++){var u=e.data.result[i],o=(a=parseFloat(u.value[1]),`${u.metric["consul_"+n+"_service"]}.${u.metric["consul_"+n+"_namespace"]}.${u.metric["consul_"+n+"_datacenter"]}`)
-c[o]={label:t,desc:r.replace("{{GROUP}}",o),value:isNaN(a)?"-":s(a)}}return c}))},fetchSeries:function(e,t){var r={query:e,start:t.start,end:t.end,step:"10s",timeout:"8s"}
-return this.httpGet("/api/v1/query_range",r)}}
-function r(e){return e<1e3?Number.isInteger(e)?""+e:Number(e>=100?e.toPrecision(3):e<1?e.toFixed(2):e.toPrecision(2)):e>=1e3&&e<1e6?+(e/1e3).toPrecision(3)+"k":e>=1e6&&e<1e9?+(e/1e6).toPrecision(3)+"m":e>=1e9&&e<1e12?+(e/1e9).toPrecision(3)+"g":e>=1e12?+(e/1e12).toFixed(0)+"t":void 0}function s(e){if(e<1e3)return Math.round(e)+"ms"
-var t=e/1e3
-if(t<60)return t.toFixed(1)+"s"
-var r=t/60
-if(r<60)return r.toFixed(1)+"m"
-var s=r/60
-return s<24?s.toFixed(1)+"h":(s/24).toFixed(1)+"d"}window.consul.registerMetricsProvider("prometheus",t)})()
diff --git a/agent/uiserver/dist/assets/vendor-69ef69e98b7d14d1513f8056b6c6b48d.css b/agent/uiserver/dist/assets/vendor-69ef69e98b7d14d1513f8056b6c6b48d.css
new file mode 100644
index 0000000000000..f092ac981fdfd
--- /dev/null
+++ b/agent/uiserver/dist/assets/vendor-69ef69e98b7d14d1513f8056b6c6b48d.css
@@ -0,0 +1 @@
+.CodeMirror{font-family:monospace;height:300px;color:#000}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-ruler{border-left:1px solid #ccc;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:none!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:none;font-variant-ligatures:none}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0 0}.CodeMirror-lint-markers{width:16px}.CodeMirror-lint-tooltip{background-color:#ffd;border:1px solid #000;border-radius:4px;color:#000;font-family:monospace;font-size:10pt;overflow:hidden;padding:2px 5px;position:fixed;white-space:pre;white-space:pre-wrap;z-index:100;max-width:600px;opacity:0;transition:opacity .4s;-moz-transition:opacity .4s;-webkit-transition:opacity .4s;-o-transition:opacity .4s;-ms-transition:opacity .4s}.CodeMirror-lint-mark-error,.CodeMirror-lint-mark-warning{background-position:left bottom;background-repeat:repeat-x}.CodeMirror-lint-mark-error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==)}.CodeMirror-lint-mark-warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=)}.CodeMirror-lint-marker-error,.CodeMirror-lint-marker-warning{background-position:center center;background-repeat:no-repeat;cursor:pointer;display:inline-block;height:16px;width:16px;vertical-align:middle;position:relative}.CodeMirror-lint-message-error,.CodeMirror-lint-message-warning{padding-left:18px;background-position:top left;background-repeat:no-repeat}.CodeMirror-lint-marker-error,.CodeMirror-lint-message-error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=)}.CodeMirror-lint-marker-warning,.CodeMirror-lint-message-warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEX/uwDvrwD/uwD/uwD/uwD/uwD/uwD/uwD/uwD6twD/uwAAAADurwD2tQD7uAD+ugAAAAD/uwDhmeTRAAAADHRSTlMJ8mN1EYcbmiixgACm7WbuAAAAVklEQVR42n3PUQqAIBBFUU1LLc3u/jdbOJoW1P08DA9Gba8+YWJ6gNJoNYIBzAA2chBth5kLmG9YUoG0NHAUwFXwO9LuBQL1giCQb8gC9Oro2vp5rncCIY8L8uEx5ZkAAAAASUVORK5CYII=)}.CodeMirror-lint-marker-multiple{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAMAAADzjKfhAAAACVBMVEUAAAAAAAC/v7914kyHAAAAAXRSTlMAQObYZgAAACNJREFUeNo1ioEJAAAIwmz/H90iFFSGJgFMe3gaLZ0od+9/AQZ0ADosbYraAAAAAElFTkSuQmCC);background-repeat:no-repeat;background-position:right bottom;width:100%;height:100%}
\ No newline at end of file
diff --git a/agent/uiserver/dist/assets/vendor-aeac0d1e27f3b95c9b4bad3aac59a219.js b/agent/uiserver/dist/assets/vendor-aeac0d1e27f3b95c9b4bad3aac59a219.js
deleted file mode 100644
index 88a469d18522f..0000000000000
--- a/agent/uiserver/dist/assets/vendor-aeac0d1e27f3b95c9b4bad3aac59a219.js
+++ /dev/null
@@ -1,11134 +0,0 @@
-window.EmberENV=function(e,t){for(var r in t)e[r]=t[r]
-return e}(window.EmberENV||{},{FEATURES:{},EXTEND_PROTOTYPES:{Date:!1},_APPLICATION_TEMPLATE_WRAPPER:!1,_DEFAULT_ASYNC_OBSERVERS:!0,_JQUERY_INTEGRATION:!1,_TEMPLATE_ONLY_GLIMMER_COMPONENTS:!0})
-var loader,define,requireModule,require,requirejs,runningTests=!1;(function(e){"use strict"
-function t(){var e=Object.create(null)
-return e.__=void 0,delete e.__,e}var r={loader:loader,define:define,requireModule:requireModule,require:require,requirejs:requirejs}
-requirejs=require=requireModule=function(e){for(var t=[],r=c(e,"(require)",t),n=t.length-1;n>=0;n--)t[n].exports()
-return r.module.exports},loader={noConflict:function(t){var n,i
-for(n in t)t.hasOwnProperty(n)&&r.hasOwnProperty(n)&&(i=t[n],e[i]=e[n],e[n]=r[n])},makeDefaultExport:!0}
-var n=t(),i=(t(),0)
-function o(e){throw new Error("an unsupported module was defined, expected `define(id, deps, module)` instead got: `"+e+"` arguments to define`")}var s=["require","exports","module"]
-function a(e,t,r,n){this.uuid=i++,this.id=e,this.deps=!t.length&&r.length?s:t,this.module={exports:{}},this.callback=r,this.hasExportsAsDep=!1,this.isAlias=n,this.reified=new Array(t.length),this.state="new"}function l(){}function u(e){this.id=e}function c(e,t,r){for(var i=n[e]||n[e+"/index"];i&&i.isAlias;)i=n[i.id]||n[i.id+"/index"]
-return i||function(e,t){throw new Error("Could not find module `"+e+"` imported from `"+t+"`")}(e,t),r&&"pending"!==i.state&&"finalized"!==i.state&&(i.findDeps(r),r.push(i)),i}function d(e,t){if("."!==e.charAt(0))return e
-for(var r=e.split("/"),n=t.split("/").slice(0,-1),i=0,o=r.length;i<o;i++){var s=r[i]
-if(".."===s){if(0===n.length)throw new Error("Cannot access parent module of root")
-n.pop()}else{if("."===s)continue
-n.push(s)}}return n.join("/")}function h(e){return!(!n[e]&&!n[e+"/index"])}a.prototype.makeDefaultExport=function(){var e=this.module.exports
-null===e||"object"!=typeof e&&"function"!=typeof e||void 0!==e.default||!Object.isExtensible(e)||(e.default=e)},a.prototype.exports=function(){if("finalized"===this.state||"reifying"===this.state)return this.module.exports
-loader.wrapModules&&(this.callback=loader.wrapModules(this.id,this.callback)),this.reify()
-var e=this.callback.apply(this,this.reified)
-return this.reified.length=0,this.state="finalized",this.hasExportsAsDep&&void 0===e||(this.module.exports=e),loader.makeDefaultExport&&this.makeDefaultExport(),this.module.exports},a.prototype.unsee=function(){this.state="new",this.module={exports:{}}},a.prototype.reify=function(){if("reified"!==this.state){this.state="reifying"
-try{this.reified=this._reify(),this.state="reified"}finally{"reifying"===this.state&&(this.state="errored")}}},a.prototype._reify=function(){for(var e=this.reified.slice(),t=0;t<e.length;t++){var r=e[t]
-e[t]=r.exports?r.exports:r.module.exports()}return e},a.prototype.findDeps=function(e){if("new"===this.state){this.state="pending"
-for(var t=this.deps,r=0;r<t.length;r++){var n=t[r],i=this.reified[r]={exports:void 0,module:void 0}
-"exports"===n?(this.hasExportsAsDep=!0,i.exports=this.module.exports):"require"===n?i.exports=this.makeRequire():"module"===n?i.exports=this.module:i.module=c(d(n,this.id),this.id,e)}}},a.prototype.makeRequire=function(){var e=this.id,t=function(t){return require(d(t,e))}
-return t.default=t,t.moduleId=e,t.has=function(t){return h(d(t,e))},t},define=function(e,t,r){var i=n[e]
-i&&"new"!==i.state||(arguments.length<2&&o(arguments.length),Array.isArray(t)||(r=t,t=[]),n[e]=r instanceof u?new a(r.id,t,r,!0):new a(e,t,r,!1))},define.exports=function(e,t){var r=n[e]
-if(!r||"new"===r.state)return(r=new a(e,[],l,null)).module.exports=t,r.state="finalized",n[e]=r,r},define.alias=function(e,t){return 2===arguments.length?define(t,new u(e)):new u(e)},requirejs.entries=requirejs._eak_seen=n,requirejs.has=h,requirejs.unsee=function(e){c(e,"(unsee)",!1).unsee()},requirejs.clear=function(){requirejs.entries=requirejs._eak_seen=n=t(),t()},define("foo",(function(){})),define("foo/bar",[],(function(){})),define("foo/asdf",["module","exports","require"],(function(e,t,r){r.has("foo/bar")&&r("foo/bar")})),define("foo/baz",[],define.alias("foo")),define("foo/quz",define.alias("foo")),define.alias("foo","foo/qux"),define("foo/bar",["foo","./quz","./baz","./asdf","./bar","../foo"],(function(){})),define("foo/main",["foo/bar"],(function(){})),define.exports("foo/exports",{}),require("foo/exports"),require("foo/main"),require.unsee("foo/bar"),requirejs.clear(),"object"==typeof exports&&"object"==typeof module&&module.exports&&(module.exports={require:require,define:define})})(this),function e(t,r,n){function i(s,a){if(!r[s]){if(!t[s]){var l="function"==typeof require&&require
-if(!a&&l)return l(s,!0)
-if(o)return o(s,!0)
-var u=new Error("Cannot find module '"+s+"'")
-throw u.code="MODULE_NOT_FOUND",u}var c=r[s]={exports:{}}
-t[s][0].call(c.exports,(function(e){return i(t[s][1][e]||e)}),c,c.exports,e,t,r,n)}return r[s].exports}for(var o="function"==typeof require&&require,s=0;s<n.length;s++)i(n[s])
-return i}({1:[function(e,t,r){e(276),e(212),e(214),e(213),e(216),e(218),e(223),e(217),e(215),e(225),e(224),e(220),e(221),e(219),e(211),e(222),e(226),e(227),e(178),e(180),e(179),e(229),e(228),e(199),e(209),e(210),e(200),e(201),e(202),e(203)
-e(204),e(205),e(206),e(207),e(208),e(182),e(183),e(184),e(185),e(186),e(187),e(188),e(189),e(190),e(191),e(192),e(193),e(194),e(195),e(196),e(197),e(198),e(263),e(268),e(275),e(266),e(258),e(259),e(264),e(269)
-e(271),e(254),e(255),e(256),e(257),e(260),e(261),e(262),e(265),e(267),e(270),e(272),e(273),e(274),e(173),e(175),e(174),e(177),e(176),e(161),e(159),e(166),e(163),e(169),e(171),e(158),e(165),e(155),e(170),e(153)
-e(168),e(167),e(160),e(164),e(152),e(154),e(157),e(156),e(172),e(162),e(245),e(246),e(252),e(247),e(248),e(249),e(250),e(251),e(230),e(181),e(253),e(288),e(289),e(277),e(278),e(283),e(286),e(287),e(281),e(284)
-e(282),e(285),e(279),e(280),e(231),e(232),e(233),e(234),e(235),e(238),e(236),e(237),e(239),e(240),e(241),e(242),e(244),e(243),t.exports=e(50)},{152:152,153:153,154:154,155:155,156:156,157:157,158:158,159:159,160:160,161:161,162:162,163:163,164:164,165:165,166:166,167:167,168:168,169:169,170:170,171:171,172:172,173:173,174:174,175:175,176:176,177:177,178:178,179:179,180:180,181:181,182:182,183:183,184:184,185:185,186:186,187:187,188:188,189:189,190:190,191:191,192:192,193:193,194:194,195:195,196:196,197:197,198:198,199:199,200:200,201:201,202:202,203:203,204:204,205:205,206:206,207:207,208:208,209:209,210:210,211:211,212:212,213:213,214:214,215:215,216:216,217:217,218:218,219:219,220:220,221:221,222:222,223:223,224:224,225:225,226:226,227:227,228:228,229:229,230:230,231:231,232:232,233:233,234:234,235:235,236:236,237:237,238:238,239:239,240:240,241:241,242:242,243:243,244:244,245:245,246:246,247:247,248:248,249:249,250:250,251:251,252:252,253:253,254:254,255:255,256:256,257:257,258:258,259:259,260:260,261:261,262:262,263:263,264:264,265:265,266:266,267:267,268:268,269:269,270:270,271:271,272:272,273:273,274:274,275:275,276:276,277:277,278:278,279:279,280:280,281:281,282:282,283:283,284:284,285:285,286:286,287:287,288:288,289:289,50:50}],2:[function(e,t,r){e(290),t.exports=e(50).Array.flatMap},{290:290,50:50}],3:[function(e,t,r){e(291),t.exports=e(50).Array.includes},{291:291,50:50}],4:[function(e,t,r){e(292),t.exports=e(50).Object.entries},{292:292,50:50}],5:[function(e,t,r){e(293),t.exports=e(50).Object.getOwnPropertyDescriptors},{293:293,50:50}],6:[function(e,t,r){e(294),t.exports=e(50).Object.values},{294:294,50:50}],7:[function(e,t,r){"use strict"
-e(230),e(295),t.exports=e(50).Promise.finally},{230:230,295:295,50:50}],8:[function(e,t,r){e(296),t.exports=e(50).String.padEnd},{296:296,50:50}],9:[function(e,t,r){e(297),t.exports=e(50).String.padStart},{297:297,50:50}],10:[function(e,t,r){e(299),t.exports=e(50).String.trimRight},{299:299,50:50}],11:[function(e,t,r){e(298),t.exports=e(50).String.trimLeft},{298:298,50:50}],12:[function(e,t,r){e(300),t.exports=e(149).f("asyncIterator")},{149:149,300:300}],13:[function(e,t,r){e(30),t.exports=e(16).global},{16:16,30:30}],14:[function(e,t,r){t.exports=function(e){if("function"!=typeof e)throw TypeError(e+" is not a function!")
-return e}},{}],15:[function(e,t,r){var n=e(26)
-t.exports=function(e){if(!n(e))throw TypeError(e+" is not an object!")
-return e}},{26:26}],16:[function(e,t,r){var n=t.exports={version:"2.6.11"}
-"number"==typeof __e&&(__e=n)},{}],17:[function(e,t,r){var n=e(14)
-t.exports=function(e,t,r){if(n(e),void 0===t)return e
-switch(r){case 1:return function(r){return e.call(t,r)}
-case 2:return function(r,n){return e.call(t,r,n)}
-case 3:return function(r,n,i){return e.call(t,r,n,i)}}return function(){return e.apply(t,arguments)}}},{14:14}],18:[function(e,t,r){t.exports=!e(21)((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a}))},{21:21}],19:[function(e,t,r){var n=e(26),i=e(22).document,o=n(i)&&n(i.createElement)
-t.exports=function(e){return o?i.createElement(e):{}}},{22:22,26:26}],20:[function(e,t,r){var n=e(22),i=e(16),o=e(17),s=e(24),a=e(23),l=function(e,t,r){var u,c,d,h=e&l.F,p=e&l.G,f=e&l.S,m=e&l.P,g=e&l.B,v=e&l.W,b=p?i:i[t]||(i[t]={}),y=b.prototype,_=p?n:f?n[t]:(n[t]||{}).prototype
-for(u in p&&(r=t),r)(c=!h&&_&&void 0!==_[u])&&a(b,u)||(d=c?_[u]:r[u],b[u]=p&&"function"!=typeof _[u]?r[u]:g&&c?o(d,n):v&&_[u]==d?function(e){var t=function(t,r,n){if(this instanceof e){switch(arguments.length){case 0:return new e
-case 1:return new e(t)
-case 2:return new e(t,r)}return new e(t,r,n)}return e.apply(this,arguments)}
-return t.prototype=e.prototype,t}(d):m&&"function"==typeof d?o(Function.call,d):d,m&&((b.virtual||(b.virtual={}))[u]=d,e&l.R&&y&&!y[u]&&s(y,u,d)))}
-l.F=1,l.G=2,l.S=4,l.P=8,l.B=16,l.W=32,l.U=64,l.R=128,t.exports=l},{16:16,17:17,22:22,23:23,24:24}],21:[function(e,t,r){t.exports=function(e){try{return!!e()}catch(t){return!0}}},{}],22:[function(e,t,r){var n=t.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")()
-"number"==typeof __g&&(__g=n)},{}],23:[function(e,t,r){var n={}.hasOwnProperty
-t.exports=function(e,t){return n.call(e,t)}},{}],24:[function(e,t,r){var n=e(27),i=e(28)
-t.exports=e(18)?function(e,t,r){return n.f(e,t,i(1,r))}:function(e,t,r){return e[t]=r,e}},{18:18,27:27,28:28}],25:[function(e,t,r){t.exports=!e(18)&&!e(21)((function(){return 7!=Object.defineProperty(e(19)("div"),"a",{get:function(){return 7}}).a}))},{18:18,19:19,21:21}],26:[function(e,t,r){t.exports=function(e){return"object"==typeof e?null!==e:"function"==typeof e}},{}],27:[function(e,t,r){var n=e(15),i=e(25),o=e(29),s=Object.defineProperty
-r.f=e(18)?Object.defineProperty:function(e,t,r){if(n(e),t=o(t,!0),n(r),i)try{return s(e,t,r)}catch(a){}if("get"in r||"set"in r)throw TypeError("Accessors not supported!")
-return"value"in r&&(e[t]=r.value),e}},{15:15,18:18,25:25,29:29}],28:[function(e,t,r){t.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},{}],29:[function(e,t,r){var n=e(26)
-t.exports=function(e,t){if(!n(e))return e
-var r,i
-if(t&&"function"==typeof(r=e.toString)&&!n(i=r.call(e)))return i
-if("function"==typeof(r=e.valueOf)&&!n(i=r.call(e)))return i
-if(!t&&"function"==typeof(r=e.toString)&&!n(i=r.call(e)))return i
-throw TypeError("Can't convert object to primitive value")}},{26:26}],30:[function(e,t,r){var n=e(20)
-n(n.G,{global:e(22)})},{20:20,22:22}],31:[function(e,t,r){arguments[4][14][0].apply(r,arguments)},{14:14}],32:[function(e,t,r){var n=e(46)
-t.exports=function(e,t){if("number"!=typeof e&&"Number"!=n(e))throw TypeError(t)
-return+e}},{46:46}],33:[function(e,t,r){var n=e(150)("unscopables"),i=Array.prototype
-null==i[n]&&e(70)(i,n,{}),t.exports=function(e){i[n][e]=!0}},{150:150,70:70}],34:[function(e,t,r){"use strict"
-var n=e(127)(!0)
-t.exports=function(e,t,r){return t+(r?n(e,t).length:1)}},{127:127}],35:[function(e,t,r){t.exports=function(e,t,r,n){if(!(e instanceof t)||void 0!==n&&n in e)throw TypeError(r+": incorrect invocation!")
-return e}},{}],36:[function(e,t,r){arguments[4][15][0].apply(r,arguments)},{15:15,79:79}],37:[function(e,t,r){"use strict"
-var n=e(140),i=e(135),o=e(139)
-t.exports=[].copyWithin||function(e,t){var r=n(this),s=o(r.length),a=i(e,s),l=i(t,s),u=arguments.length>2?arguments[2]:void 0,c=Math.min((void 0===u?s:i(u,s))-l,s-a),d=1
-for(l<a&&a<l+c&&(d=-1,l+=c-1,a+=c-1);c-- >0;)l in r?r[a]=r[l]:delete r[a],a+=d,l+=d
-return r}},{135:135,139:139,140:140}],38:[function(e,t,r){"use strict"
-var n=e(140),i=e(135),o=e(139)
-t.exports=function(e){for(var t=n(this),r=o(t.length),s=arguments.length,a=i(s>1?arguments[1]:void 0,r),l=s>2?arguments[2]:void 0,u=void 0===l?r:i(l,r);u>a;)t[a++]=e
-return t}},{135:135,139:139,140:140}],39:[function(e,t,r){var n=e(138),i=e(139),o=e(135)
-t.exports=function(e){return function(t,r,s){var a,l=n(t),u=i(l.length),c=o(s,u)
-if(e&&r!=r){for(;u>c;)if((a=l[c++])!=a)return!0}else for(;u>c;c++)if((e||c in l)&&l[c]===r)return e||c||0
-return!e&&-1}}},{135:135,138:138,139:139}],40:[function(e,t,r){var n=e(52),i=e(75),o=e(140),s=e(139),a=e(43)
-t.exports=function(e,t){var r=1==e,l=2==e,u=3==e,c=4==e,d=6==e,h=5==e||d,p=t||a
-return function(t,a,f){for(var m,g,v=o(t),b=i(v),y=n(a,f,3),_=s(b.length),w=0,O=r?p(t,_):l?p(t,0):void 0;_>w;w++)if((h||w in b)&&(g=y(m=b[w],w,v),e))if(r)O[w]=g
-else if(g)switch(e){case 3:return!0
-case 5:return m
-case 6:return w
-case 2:O.push(m)}else if(c)return!1
-return d?-1:u||c?c:O}}},{139:139,140:140,43:43,52:52,75:75}],41:[function(e,t,r){var n=e(31),i=e(140),o=e(75),s=e(139)
-t.exports=function(e,t,r,a,l){n(t)
-var u=i(e),c=o(u),d=s(u.length),h=l?d-1:0,p=l?-1:1
-if(r<2)for(;;){if(h in c){a=c[h],h+=p
-break}if(h+=p,l?h<0:d<=h)throw TypeError("Reduce of empty array with no initial value")}for(;l?h>=0:d>h;h+=p)h in c&&(a=t(a,c[h],h,u))
-return a}},{139:139,140:140,31:31,75:75}],42:[function(e,t,r){var n=e(79),i=e(77),o=e(150)("species")
-t.exports=function(e){var t
-return i(e)&&("function"!=typeof(t=e.constructor)||t!==Array&&!i(t.prototype)||(t=void 0),n(t)&&null===(t=t[o])&&(t=void 0)),void 0===t?Array:t}},{150:150,77:77,79:79}],43:[function(e,t,r){var n=e(42)
-t.exports=function(e,t){return new(n(e))(t)}},{42:42}],44:[function(e,t,r){"use strict"
-var n=e(31),i=e(79),o=e(74),s=[].slice,a={},l=function(e,t,r){if(!(t in a)){for(var n=[],i=0;i<t;i++)n[i]="a["+i+"]"
-a[t]=Function("F,a","return new F("+n.join(",")+")")}return a[t](e,r)}
-t.exports=Function.bind||function(e){var t=n(this),r=s.call(arguments,1),a=function(){var n=r.concat(s.call(arguments))
-return this instanceof a?l(t,n.length,n):o(t,n,e)}
-return i(t.prototype)&&(a.prototype=t.prototype),a}},{31:31,74:74,79:79}],45:[function(e,t,r){var n=e(46),i=e(150)("toStringTag"),o="Arguments"==n(function(){return arguments}())
-t.exports=function(e){var t,r,s
-return void 0===e?"Undefined":null===e?"Null":"string"==typeof(r=function(e,t){try{return e[t]}catch(r){}}(t=Object(e),i))?r:o?n(t):"Object"==(s=n(t))&&"function"==typeof t.callee?"Arguments":s}},{150:150,46:46}],46:[function(e,t,r){var n={}.toString
-t.exports=function(e){return n.call(e).slice(8,-1)}},{}],47:[function(e,t,r){"use strict"
-var n=e(97).f,i=e(96),o=e(115),s=e(52),a=e(35),l=e(66),u=e(83),c=e(85),d=e(121),h=e(56),p=e(92).fastKey,f=e(147),m=h?"_s":"size",g=function(e,t){var r,n=p(t)
-if("F"!==n)return e._i[n]
-for(r=e._f;r;r=r.n)if(r.k==t)return r}
-t.exports={getConstructor:function(e,t,r,u){var c=e((function(e,n){a(e,c,t,"_i"),e._t=t,e._i=i(null),e._f=void 0,e._l=void 0,e[m]=0,null!=n&&l(n,r,e[u],e)}))
-return o(c.prototype,{clear:function(){for(var e=f(this,t),r=e._i,n=e._f;n;n=n.n)n.r=!0,n.p&&(n.p=n.p.n=void 0),delete r[n.i]
-e._f=e._l=void 0,e[m]=0},delete:function(e){var r=f(this,t),n=g(r,e)
-if(n){var i=n.n,o=n.p
-delete r._i[n.i],n.r=!0,o&&(o.n=i),i&&(i.p=o),r._f==n&&(r._f=i),r._l==n&&(r._l=o),r[m]--}return!!n},forEach:function(e){f(this,t)
-for(var r,n=s(e,arguments.length>1?arguments[1]:void 0,3);r=r?r.n:this._f;)for(n(r.v,r.k,this);r&&r.r;)r=r.p},has:function(e){return!!g(f(this,t),e)}}),h&&n(c.prototype,"size",{get:function(){return f(this,t)[m]}}),c},def:function(e,t,r){var n,i,o=g(e,t)
-return o?o.v=r:(e._l=o={i:i=p(t,!0),k:t,v:r,p:n=e._l,n:void 0,r:!1},e._f||(e._f=o),n&&(n.n=o),e[m]++,"F"!==i&&(e._i[i]=o)),e},getEntry:g,setStrong:function(e,t,r){u(e,t,(function(e,r){this._t=f(e,t),this._k=r,this._l=void 0}),(function(){for(var e=this,t=e._k,r=e._l;r&&r.r;)r=r.p
-return e._t&&(e._l=r=r?r.n:e._t._f)?c(0,"keys"==t?r.k:"values"==t?r.v:[r.k,r.v]):(e._t=void 0,c(1))}),r?"entries":"values",!r,!0),d(t)}}},{115:115,121:121,147:147,35:35,52:52,56:56,66:66,83:83,85:85,92:92,96:96,97:97}],48:[function(e,t,r){"use strict"
-var n=e(115),i=e(92).getWeak,o=e(36),s=e(79),a=e(35),l=e(66),u=e(40),c=e(69),d=e(147),h=u(5),p=u(6),f=0,m=function(e){return e._l||(e._l=new g)},g=function(){this.a=[]},v=function(e,t){return h(e.a,(function(e){return e[0]===t}))}
-g.prototype={get:function(e){var t=v(this,e)
-if(t)return t[1]},has:function(e){return!!v(this,e)},set:function(e,t){var r=v(this,e)
-r?r[1]=t:this.a.push([e,t])},delete:function(e){var t=p(this.a,(function(t){return t[0]===e}))
-return~t&&this.a.splice(t,1),!!~t}},t.exports={getConstructor:function(e,t,r,o){var u=e((function(e,n){a(e,u,t,"_i"),e._t=t,e._i=f++,e._l=void 0,null!=n&&l(n,r,e[o],e)}))
-return n(u.prototype,{delete:function(e){if(!s(e))return!1
-var r=i(e)
-return!0===r?m(d(this,t)).delete(e):r&&c(r,this._i)&&delete r[this._i]},has:function(e){if(!s(e))return!1
-var r=i(e)
-return!0===r?m(d(this,t)).has(e):r&&c(r,this._i)}}),u},def:function(e,t,r){var n=i(o(t),!0)
-return!0===n?m(e).set(t,r):n[e._i]=r,e},ufstore:m}},{115:115,147:147,35:35,36:36,40:40,66:66,69:69,79:79,92:92}],49:[function(e,t,r){"use strict"
-var n=e(68),i=e(60),o=e(116),s=e(115),a=e(92),l=e(66),u=e(35),c=e(79),d=e(62),h=e(84),p=e(122),f=e(73)
-t.exports=function(e,t,r,m,g,v){var b=n[e],y=b,_=g?"set":"add",w=y&&y.prototype,O={},x=function(e){var t=w[e]
-o(w,e,"delete"==e||"has"==e?function(e){return!(v&&!c(e))&&t.call(this,0===e?0:e)}:"get"==e?function(e){return v&&!c(e)?void 0:t.call(this,0===e?0:e)}:"add"==e?function(e){return t.call(this,0===e?0:e),this}:function(e,r){return t.call(this,0===e?0:e,r),this})}
-if("function"==typeof y&&(v||w.forEach&&!d((function(){(new y).entries().next()})))){var P=new y,S=P[_](v?{}:-0,1)!=P,T=d((function(){P.has(1)})),E=h((function(e){new y(e)})),C=!v&&d((function(){for(var e=new y,t=5;t--;)e[_](t,t)
-return!e.has(-0)}))
-E||((y=t((function(t,r){u(t,y,e)
-var n=f(new b,t,y)
-return null!=r&&l(r,g,n[_],n),n}))).prototype=w,w.constructor=y),(T||C)&&(x("delete"),x("has"),g&&x("get")),(C||S)&&x(_),v&&w.clear&&delete w.clear}else y=m.getConstructor(t,e,g,_),s(y.prototype,r),a.NEED=!0
-return p(y,e),O[e]=y,i(i.G+i.W+i.F*(y!=b),O),v||m.setStrong(y,e,g),y}},{115:115,116:116,122:122,35:35,60:60,62:62,66:66,68:68,73:73,79:79,84:84,92:92}],50:[function(e,t,r){arguments[4][16][0].apply(r,arguments)},{16:16}],51:[function(e,t,r){"use strict"
-var n=e(97),i=e(114)
-t.exports=function(e,t,r){t in e?n.f(e,t,i(0,r)):e[t]=r}},{114:114,97:97}],52:[function(e,t,r){arguments[4][17][0].apply(r,arguments)},{17:17,31:31}],53:[function(e,t,r){"use strict"
-var n=e(62),i=Date.prototype.getTime,o=Date.prototype.toISOString,s=function(e){return e>9?e:"0"+e}
-t.exports=n((function(){return"0385-07-25T07:06:39.999Z"!=o.call(new Date(-50000000000001))}))||!n((function(){o.call(new Date(NaN))}))?function(){if(!isFinite(i.call(this)))throw RangeError("Invalid time value")
-var e=this,t=e.getUTCFullYear(),r=e.getUTCMilliseconds(),n=t<0?"-":t>9999?"+":""
-return n+("00000"+Math.abs(t)).slice(n?-6:-4)+"-"+s(e.getUTCMonth()+1)+"-"+s(e.getUTCDate())+"T"+s(e.getUTCHours())+":"+s(e.getUTCMinutes())+":"+s(e.getUTCSeconds())+"."+(r>99?r:"0"+s(r))+"Z"}:o},{62:62}],54:[function(e,t,r){"use strict"
-var n=e(36),i=e(141),o="number"
-t.exports=function(e){if("string"!==e&&e!==o&&"default"!==e)throw TypeError("Incorrect hint")
-return i(n(this),e!=o)}},{141:141,36:36}],55:[function(e,t,r){t.exports=function(e){if(null==e)throw TypeError("Can't call method on  "+e)
-return e}},{}],56:[function(e,t,r){arguments[4][18][0].apply(r,arguments)},{18:18,62:62}],57:[function(e,t,r){arguments[4][19][0].apply(r,arguments)},{19:19,68:68,79:79}],58:[function(e,t,r){t.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},{}],59:[function(e,t,r){var n=e(105),i=e(102),o=e(106)
-t.exports=function(e){var t=n(e),r=i.f
-if(r)for(var s,a=r(e),l=o.f,u=0;a.length>u;)l.call(e,s=a[u++])&&t.push(s)
-return t}},{102:102,105:105,106:106}],60:[function(e,t,r){var n=e(68),i=e(50),o=e(70),s=e(116),a=e(52),l=function(e,t,r){var u,c,d,h,p=e&l.F,f=e&l.G,m=e&l.S,g=e&l.P,v=e&l.B,b=f?n:m?n[t]||(n[t]={}):(n[t]||{}).prototype,y=f?i:i[t]||(i[t]={}),_=y.prototype||(y.prototype={})
-for(u in f&&(r=t),r)d=((c=!p&&b&&void 0!==b[u])?b:r)[u],h=v&&c?a(d,n):g&&"function"==typeof d?a(Function.call,d):d,b&&s(b,u,d,e&l.U),y[u]!=d&&o(y,u,h),g&&_[u]!=d&&(_[u]=d)}
-n.core=i,l.F=1,l.G=2,l.S=4,l.P=8,l.B=16,l.W=32,l.U=64,l.R=128,t.exports=l},{116:116,50:50,52:52,68:68,70:70}],61:[function(e,t,r){var n=e(150)("match")
-t.exports=function(e){var t=/./
-try{"/./"[e](t)}catch(r){try{return t[n]=!1,!"/./"[e](t)}catch(i){}}return!0}},{150:150}],62:[function(e,t,r){arguments[4][21][0].apply(r,arguments)},{21:21}],63:[function(e,t,r){"use strict"
-e(246)
-var n=e(116),i=e(70),o=e(62),s=e(55),a=e(150),l=e(118),u=a("species"),c=!o((function(){var e=/./
-return e.exec=function(){var e=[]
-return e.groups={a:"7"},e},"7"!=="".replace(e,"$<a>")})),d=function(){var e=/(?:)/,t=e.exec
-e.exec=function(){return t.apply(this,arguments)}
-var r="ab".split(e)
-return 2===r.length&&"a"===r[0]&&"b"===r[1]}()
-t.exports=function(e,t,r){var h=a(e),p=!o((function(){var t={}
-return t[h]=function(){return 7},7!=""[e](t)})),f=p?!o((function(){var t=!1,r=/a/
-return r.exec=function(){return t=!0,null},"split"===e&&(r.constructor={},r.constructor[u]=function(){return r}),r[h](""),!t})):void 0
-if(!p||!f||"replace"===e&&!c||"split"===e&&!d){var m=/./[h],g=r(s,h,""[e],(function(e,t,r,n,i){return t.exec===l?p&&!i?{done:!0,value:m.call(t,r,n)}:{done:!0,value:e.call(r,t,n)}:{done:!1}})),v=g[0],b=g[1]
-n(String.prototype,e,v),i(RegExp.prototype,h,2==t?function(e,t){return b.call(e,this,t)}:function(e){return b.call(e,this)})}}},{116:116,118:118,150:150,246:246,55:55,62:62,70:70}],64:[function(e,t,r){"use strict"
-var n=e(36)
-t.exports=function(){var e=n(this),t=""
-return e.global&&(t+="g"),e.ignoreCase&&(t+="i"),e.multiline&&(t+="m"),e.unicode&&(t+="u"),e.sticky&&(t+="y"),t}},{36:36}],65:[function(e,t,r){"use strict"
-var n=e(77),i=e(79),o=e(139),s=e(52),a=e(150)("isConcatSpreadable")
-t.exports=function e(t,r,l,u,c,d,h,p){for(var f,m,g=c,v=0,b=!!h&&s(h,p,3);v<u;){if(v in l){if(f=b?b(l[v],v,r):l[v],m=!1,i(f)&&(m=void 0!==(m=f[a])?!!m:n(f)),m&&d>0)g=e(t,r,f,o(f.length),g,d-1)-1
-else{if(g>=9007199254740991)throw TypeError()
-t[g]=f}g++}v++}return g}},{139:139,150:150,52:52,77:77,79:79}],66:[function(e,t,r){var n=e(52),i=e(81),o=e(76),s=e(36),a=e(139),l=e(151),u={},c={};(r=t.exports=function(e,t,r,d,h){var p,f,m,g,v=h?function(){return e}:l(e),b=n(r,d,t?2:1),y=0
-if("function"!=typeof v)throw TypeError(e+" is not iterable!")
-if(o(v)){for(p=a(e.length);p>y;y++)if((g=t?b(s(f=e[y])[0],f[1]):b(e[y]))===u||g===c)return g}else for(m=v.call(e);!(f=m.next()).done;)if((g=i(m,b,f.value,t))===u||g===c)return g}).BREAK=u,r.RETURN=c},{139:139,151:151,36:36,52:52,76:76,81:81}],67:[function(e,t,r){t.exports=e(124)("native-function-to-string",Function.toString)},{124:124}],68:[function(e,t,r){arguments[4][22][0].apply(r,arguments)},{22:22}],69:[function(e,t,r){arguments[4][23][0].apply(r,arguments)},{23:23}],70:[function(e,t,r){arguments[4][24][0].apply(r,arguments)},{114:114,24:24,56:56,97:97}],71:[function(e,t,r){var n=e(68).document
-t.exports=n&&n.documentElement},{68:68}],72:[function(e,t,r){arguments[4][25][0].apply(r,arguments)},{25:25,56:56,57:57,62:62}],73:[function(e,t,r){var n=e(79),i=e(120).set
-t.exports=function(e,t,r){var o,s=t.constructor
-return s!==r&&"function"==typeof s&&(o=s.prototype)!==r.prototype&&n(o)&&i&&i(e,o),e}},{120:120,79:79}],74:[function(e,t,r){t.exports=function(e,t,r){var n=void 0===r
-switch(t.length){case 0:return n?e():e.call(r)
-case 1:return n?e(t[0]):e.call(r,t[0])
-case 2:return n?e(t[0],t[1]):e.call(r,t[0],t[1])
-case 3:return n?e(t[0],t[1],t[2]):e.call(r,t[0],t[1],t[2])
-case 4:return n?e(t[0],t[1],t[2],t[3]):e.call(r,t[0],t[1],t[2],t[3])}return e.apply(r,t)}},{}],75:[function(e,t,r){var n=e(46)
-t.exports=Object("z").propertyIsEnumerable(0)?Object:function(e){return"String"==n(e)?e.split(""):Object(e)}},{46:46}],76:[function(e,t,r){var n=e(86),i=e(150)("iterator"),o=Array.prototype
-t.exports=function(e){return void 0!==e&&(n.Array===e||o[i]===e)}},{150:150,86:86}],77:[function(e,t,r){var n=e(46)
-t.exports=Array.isArray||function(e){return"Array"==n(e)}},{46:46}],78:[function(e,t,r){var n=e(79),i=Math.floor
-t.exports=function(e){return!n(e)&&isFinite(e)&&i(e)===e}},{79:79}],79:[function(e,t,r){arguments[4][26][0].apply(r,arguments)},{26:26}],80:[function(e,t,r){var n=e(79),i=e(46),o=e(150)("match")
-t.exports=function(e){var t
-return n(e)&&(void 0!==(t=e[o])?!!t:"RegExp"==i(e))}},{150:150,46:46,79:79}],81:[function(e,t,r){var n=e(36)
-t.exports=function(e,t,r,i){try{return i?t(n(r)[0],r[1]):t(r)}catch(s){var o=e.return
-throw void 0!==o&&n(o.call(e)),s}}},{36:36}],82:[function(e,t,r){"use strict"
-var n=e(96),i=e(114),o=e(122),s={}
-e(70)(s,e(150)("iterator"),(function(){return this})),t.exports=function(e,t,r){e.prototype=n(s,{next:i(1,r)}),o(e,t+" Iterator")}},{114:114,122:122,150:150,70:70,96:96}],83:[function(e,t,r){"use strict"
-var n=e(87),i=e(60),o=e(116),s=e(70),a=e(86),l=e(82),u=e(122),c=e(103),d=e(150)("iterator"),h=!([].keys&&"next"in[].keys()),p="keys",f="values",m=function(){return this}
-t.exports=function(e,t,r,g,v,b,y){l(r,t,g)
-var _,w,O,x=function(e){if(!h&&e in E)return E[e]
-switch(e){case p:case f:return function(){return new r(this,e)}}return function(){return new r(this,e)}},P=t+" Iterator",S=v==f,T=!1,E=e.prototype,C=E[d]||E["@@iterator"]||v&&E[v],k=C||x(v),M=v?S?x("entries"):k:void 0,A="Array"==t&&E.entries||C
-if(A&&(O=c(A.call(new e)))!==Object.prototype&&O.next&&(u(O,P,!0),n||"function"==typeof O[d]||s(O,d,m)),S&&C&&C.name!==f&&(T=!0,k=function(){return C.call(this)}),n&&!y||!h&&!T&&E[d]||s(E,d,k),a[t]=k,a[P]=m,v)if(_={values:S?k:x(f),keys:b?k:x(p),entries:M},y)for(w in _)w in E||o(E,w,_[w])
-else i(i.P+i.F*(h||T),t,_)
-return _}},{103:103,116:116,122:122,150:150,60:60,70:70,82:82,86:86,87:87}],84:[function(e,t,r){var n=e(150)("iterator"),i=!1
-try{var o=[7][n]()
-o.return=function(){i=!0},Array.from(o,(function(){throw 2}))}catch(s){}t.exports=function(e,t){if(!t&&!i)return!1
-var r=!1
-try{var o=[7],a=o[n]()
-a.next=function(){return{done:r=!0}},o[n]=function(){return a},e(o)}catch(s){}return r}},{150:150}],85:[function(e,t,r){t.exports=function(e,t){return{value:t,done:!!e}}},{}],86:[function(e,t,r){t.exports={}},{}],87:[function(e,t,r){t.exports=!1},{}],88:[function(e,t,r){var n=Math.expm1
-t.exports=!n||n(10)>22025.465794806718||n(10)<22025.465794806718||-2e-17!=n(-2e-17)?function(e){return 0==(e=+e)?e:e>-1e-6&&e<1e-6?e+e*e/2:Math.exp(e)-1}:n},{}],89:[function(e,t,r){var n=e(91),i=Math.pow,o=i(2,-52),s=i(2,-23),a=i(2,127)*(2-s),l=i(2,-126)
-t.exports=Math.fround||function(e){var t,r,i=Math.abs(e),u=n(e)
-return i<l?u*(i/l/s+1/o-1/o)*l*s:(r=(t=(1+s/o)*i)-(t-i))>a||r!=r?u*(1/0):u*r}},{91:91}],90:[function(e,t,r){t.exports=Math.log1p||function(e){return(e=+e)>-1e-8&&e<1e-8?e-e*e/2:Math.log(1+e)}},{}],91:[function(e,t,r){t.exports=Math.sign||function(e){return 0==(e=+e)||e!=e?e:e<0?-1:1}},{}],92:[function(e,t,r){var n=e(145)("meta"),i=e(79),o=e(69),s=e(97).f,a=0,l=Object.isExtensible||function(){return!0},u=!e(62)((function(){return l(Object.preventExtensions({}))})),c=function(e){s(e,n,{value:{i:"O"+ ++a,w:{}}})},d=t.exports={KEY:n,NEED:!1,fastKey:function(e,t){if(!i(e))return"symbol"==typeof e?e:("string"==typeof e?"S":"P")+e
-if(!o(e,n)){if(!l(e))return"F"
-if(!t)return"E"
-c(e)}return e[n].i},getWeak:function(e,t){if(!o(e,n)){if(!l(e))return!0
-if(!t)return!1
-c(e)}return e[n].w},onFreeze:function(e){return u&&d.NEED&&l(e)&&!o(e,n)&&c(e),e}}},{145:145,62:62,69:69,79:79,97:97}],93:[function(e,t,r){var n=e(68),i=e(134).set,o=n.MutationObserver||n.WebKitMutationObserver,s=n.process,a=n.Promise,l="process"==e(46)(s)
-t.exports=function(){var e,t,r,u=function(){var n,i
-for(l&&(n=s.domain)&&n.exit();e;){i=e.fn,e=e.next
-try{i()}catch(o){throw e?r():t=void 0,o}}t=void 0,n&&n.enter()}
-if(l)r=function(){s.nextTick(u)}
-else if(!o||n.navigator&&n.navigator.standalone)if(a&&a.resolve){var c=a.resolve(void 0)
-r=function(){c.then(u)}}else r=function(){i.call(n,u)}
-else{var d=!0,h=document.createTextNode("")
-new o(u).observe(h,{characterData:!0}),r=function(){h.data=d=!d}}return function(n){var i={fn:n,next:void 0}
-t&&(t.next=i),e||(e=i,r()),t=i}}},{134:134,46:46,68:68}],94:[function(e,t,r){"use strict"
-var n=e(31)
-function i(e){var t,r
-this.promise=new e((function(e,n){if(void 0!==t||void 0!==r)throw TypeError("Bad Promise constructor")
-t=e,r=n})),this.resolve=n(t),this.reject=n(r)}t.exports.f=function(e){return new i(e)}},{31:31}],95:[function(e,t,r){"use strict"
-var n=e(56),i=e(105),o=e(102),s=e(106),a=e(140),l=e(75),u=Object.assign
-t.exports=!u||e(62)((function(){var e={},t={},r=Symbol(),n="abcdefghijklmnopqrst"
-return e[r]=7,n.split("").forEach((function(e){t[e]=e})),7!=u({},e)[r]||Object.keys(u({},t)).join("")!=n}))?function(e,t){for(var r=a(e),u=arguments.length,c=1,d=o.f,h=s.f;u>c;)for(var p,f=l(arguments[c++]),m=d?i(f).concat(d(f)):i(f),g=m.length,v=0;g>v;)p=m[v++],n&&!h.call(f,p)||(r[p]=f[p])
-return r}:u},{102:102,105:105,106:106,140:140,56:56,62:62,75:75}],96:[function(e,t,r){var n=e(36),i=e(98),o=e(58),s=e(123)("IE_PROTO"),a=function(){},l=function(){var t,r=e(57)("iframe"),n=o.length
-for(r.style.display="none",e(71).appendChild(r),r.src="javascript:",(t=r.contentWindow.document).open(),t.write("<script>document.F=Object<\/script>"),t.close(),l=t.F;n--;)delete l.prototype[o[n]]
-return l()}
-t.exports=Object.create||function(e,t){var r
-return null!==e?(a.prototype=n(e),r=new a,a.prototype=null,r[s]=e):r=l(),void 0===t?r:i(r,t)}},{123:123,36:36,57:57,58:58,71:71,98:98}],97:[function(e,t,r){arguments[4][27][0].apply(r,arguments)},{141:141,27:27,36:36,56:56,72:72}],98:[function(e,t,r){var n=e(97),i=e(36),o=e(105)
-t.exports=e(56)?Object.defineProperties:function(e,t){i(e)
-for(var r,s=o(t),a=s.length,l=0;a>l;)n.f(e,r=s[l++],t[r])
-return e}},{105:105,36:36,56:56,97:97}],99:[function(e,t,r){var n=e(106),i=e(114),o=e(138),s=e(141),a=e(69),l=e(72),u=Object.getOwnPropertyDescriptor
-r.f=e(56)?u:function(e,t){if(e=o(e),t=s(t,!0),l)try{return u(e,t)}catch(r){}if(a(e,t))return i(!n.f.call(e,t),e[t])}},{106:106,114:114,138:138,141:141,56:56,69:69,72:72}],100:[function(e,t,r){var n=e(138),i=e(101).f,o={}.toString,s="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[]
-t.exports.f=function(e){return s&&"[object Window]"==o.call(e)?function(e){try{return i(e)}catch(t){return s.slice()}}(e):i(n(e))}},{101:101,138:138}],101:[function(e,t,r){var n=e(104),i=e(58).concat("length","prototype")
-r.f=Object.getOwnPropertyNames||function(e){return n(e,i)}},{104:104,58:58}],102:[function(e,t,r){r.f=Object.getOwnPropertySymbols},{}],103:[function(e,t,r){var n=e(69),i=e(140),o=e(123)("IE_PROTO"),s=Object.prototype
-t.exports=Object.getPrototypeOf||function(e){return e=i(e),n(e,o)?e[o]:"function"==typeof e.constructor&&e instanceof e.constructor?e.constructor.prototype:e instanceof Object?s:null}},{123:123,140:140,69:69}],104:[function(e,t,r){var n=e(69),i=e(138),o=e(39)(!1),s=e(123)("IE_PROTO")
-t.exports=function(e,t){var r,a=i(e),l=0,u=[]
-for(r in a)r!=s&&n(a,r)&&u.push(r)
-for(;t.length>l;)n(a,r=t[l++])&&(~o(u,r)||u.push(r))
-return u}},{123:123,138:138,39:39,69:69}],105:[function(e,t,r){var n=e(104),i=e(58)
-t.exports=Object.keys||function(e){return n(e,i)}},{104:104,58:58}],106:[function(e,t,r){r.f={}.propertyIsEnumerable},{}],107:[function(e,t,r){var n=e(60),i=e(50),o=e(62)
-t.exports=function(e,t){var r=(i.Object||{})[e]||Object[e],s={}
-s[e]=t(r),n(n.S+n.F*o((function(){r(1)})),"Object",s)}},{50:50,60:60,62:62}],108:[function(e,t,r){var n=e(56),i=e(105),o=e(138),s=e(106).f
-t.exports=function(e){return function(t){for(var r,a=o(t),l=i(a),u=l.length,c=0,d=[];u>c;)r=l[c++],n&&!s.call(a,r)||d.push(e?[r,a[r]]:a[r])
-return d}}},{105:105,106:106,138:138,56:56}],109:[function(e,t,r){var n=e(101),i=e(102),o=e(36),s=e(68).Reflect
-t.exports=s&&s.ownKeys||function(e){var t=n.f(o(e)),r=i.f
-return r?t.concat(r(e)):t}},{101:101,102:102,36:36,68:68}],110:[function(e,t,r){var n=e(68).parseFloat,i=e(132).trim
-t.exports=1/n(e(133)+"-0")!=-1/0?function(e){var t=i(String(e),3),r=n(t)
-return 0===r&&"-"==t.charAt(0)?-0:r}:n},{132:132,133:133,68:68}],111:[function(e,t,r){var n=e(68).parseInt,i=e(132).trim,o=e(133),s=/^[-+]?0[xX]/
-t.exports=8!==n(o+"08")||22!==n(o+"0x16")?function(e,t){var r=i(String(e),3)
-return n(r,t>>>0||(s.test(r)?16:10))}:n},{132:132,133:133,68:68}],112:[function(e,t,r){t.exports=function(e){try{return{e:!1,v:e()}}catch(t){return{e:!0,v:t}}}},{}],113:[function(e,t,r){var n=e(36),i=e(79),o=e(94)
-t.exports=function(e,t){if(n(e),i(t)&&t.constructor===e)return t
-var r=o.f(e)
-return(0,r.resolve)(t),r.promise}},{36:36,79:79,94:94}],114:[function(e,t,r){arguments[4][28][0].apply(r,arguments)},{28:28}],115:[function(e,t,r){var n=e(116)
-t.exports=function(e,t,r){for(var i in t)n(e,i,t[i],r)
-return e}},{116:116}],116:[function(e,t,r){var n=e(68),i=e(70),o=e(69),s=e(145)("src"),a=e(67),l="toString",u=(""+a).split(l)
-e(50).inspectSource=function(e){return a.call(e)},(t.exports=function(e,t,r,a){var l="function"==typeof r
-l&&(o(r,"name")||i(r,"name",t)),e[t]!==r&&(l&&(o(r,s)||i(r,s,e[t]?""+e[t]:u.join(String(t)))),e===n?e[t]=r:a?e[t]?e[t]=r:i(e,t,r):(delete e[t],i(e,t,r)))})(Function.prototype,l,(function(){return"function"==typeof this&&this[s]||a.call(this)}))},{145:145,50:50,67:67,68:68,69:69,70:70}],117:[function(e,t,r){"use strict"
-var n=e(45),i=RegExp.prototype.exec
-t.exports=function(e,t){var r=e.exec
-if("function"==typeof r){var o=r.call(e,t)
-if("object"!=typeof o)throw new TypeError("RegExp exec method returned something other than an Object or null")
-return o}if("RegExp"!==n(e))throw new TypeError("RegExp#exec called on incompatible receiver")
-return i.call(e,t)}},{45:45}],118:[function(e,t,r){"use strict"
-var n,i,o=e(64),s=RegExp.prototype.exec,a=String.prototype.replace,l=s,u=(n=/a/,i=/b*/g,s.call(n,"a"),s.call(i,"a"),0!==n.lastIndex||0!==i.lastIndex),c=void 0!==/()??/.exec("")[1];(u||c)&&(l=function(e){var t,r,n,i,l=this
-return c&&(r=new RegExp("^"+l.source+"$(?!\\s)",o.call(l))),u&&(t=l.lastIndex),n=s.call(l,e),u&&n&&(l.lastIndex=l.global?n.index+n[0].length:t),c&&n&&n.length>1&&a.call(n[0],r,(function(){for(i=1;i<arguments.length-2;i++)void 0===arguments[i]&&(n[i]=void 0)})),n}),t.exports=l},{64:64}],119:[function(e,t,r){t.exports=Object.is||function(e,t){return e===t?0!==e||1/e==1/t:e!=e&&t!=t}},{}],120:[function(e,t,r){var n=e(79),i=e(36),o=function(e,t){if(i(e),!n(t)&&null!==t)throw TypeError(t+": can't set as prototype!")}
-t.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(t,r,n){try{(n=e(52)(Function.call,e(99).f(Object.prototype,"__proto__").set,2))(t,[]),r=!(t instanceof Array)}catch(i){r=!0}return function(e,t){return o(e,t),r?e.__proto__=t:n(e,t),e}}({},!1):void 0),check:o}},{36:36,52:52,79:79,99:99}],121:[function(e,t,r){"use strict"
-var n=e(68),i=e(97),o=e(56),s=e(150)("species")
-t.exports=function(e){var t=n[e]
-o&&t&&!t[s]&&i.f(t,s,{configurable:!0,get:function(){return this}})}},{150:150,56:56,68:68,97:97}],122:[function(e,t,r){var n=e(97).f,i=e(69),o=e(150)("toStringTag")
-t.exports=function(e,t,r){e&&!i(e=r?e:e.prototype,o)&&n(e,o,{configurable:!0,value:t})}},{150:150,69:69,97:97}],123:[function(e,t,r){var n=e(124)("keys"),i=e(145)
-t.exports=function(e){return n[e]||(n[e]=i(e))}},{124:124,145:145}],124:[function(e,t,r){var n=e(50),i=e(68),o="__core-js_shared__",s=i[o]||(i[o]={});(t.exports=function(e,t){return s[e]||(s[e]=void 0!==t?t:{})})("versions",[]).push({version:n.version,mode:e(87)?"pure":"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})},{50:50,68:68,87:87}],125:[function(e,t,r){var n=e(36),i=e(31),o=e(150)("species")
-t.exports=function(e,t){var r,s=n(e).constructor
-return void 0===s||null==(r=n(s)[o])?t:i(r)}},{150:150,31:31,36:36}],126:[function(e,t,r){"use strict"
-var n=e(62)
-t.exports=function(e,t){return!!e&&n((function(){t?e.call(null,(function(){}),1):e.call(null)}))}},{62:62}],127:[function(e,t,r){var n=e(137),i=e(55)
-t.exports=function(e){return function(t,r){var o,s,a=String(i(t)),l=n(r),u=a.length
-return l<0||l>=u?e?"":void 0:(o=a.charCodeAt(l))<55296||o>56319||l+1===u||(s=a.charCodeAt(l+1))<56320||s>57343?e?a.charAt(l):o:e?a.slice(l,l+2):s-56320+(o-55296<<10)+65536}}},{137:137,55:55}],128:[function(e,t,r){var n=e(80),i=e(55)
-t.exports=function(e,t,r){if(n(t))throw TypeError("String#"+r+" doesn't accept regex!")
-return String(i(e))}},{55:55,80:80}],129:[function(e,t,r){var n=e(60),i=e(62),o=e(55),s=/"/g,a=function(e,t,r,n){var i=String(o(e)),a="<"+t
-return""!==r&&(a+=" "+r+'="'+String(n).replace(s,"&quot;")+'"'),a+">"+i+"</"+t+">"}
-t.exports=function(e,t){var r={}
-r[e]=t(a),n(n.P+n.F*i((function(){var t=""[e]('"')
-return t!==t.toLowerCase()||t.split('"').length>3})),"String",r)}},{55:55,60:60,62:62}],130:[function(e,t,r){var n=e(139),i=e(131),o=e(55)
-t.exports=function(e,t,r,s){var a=String(o(e)),l=a.length,u=void 0===r?" ":String(r),c=n(t)
-if(c<=l||""==u)return a
-var d=c-l,h=i.call(u,Math.ceil(d/u.length))
-return h.length>d&&(h=h.slice(0,d)),s?h+a:a+h}},{131:131,139:139,55:55}],131:[function(e,t,r){"use strict"
-var n=e(137),i=e(55)
-t.exports=function(e){var t=String(i(this)),r="",o=n(e)
-if(o<0||o==1/0)throw RangeError("Count can't be negative")
-for(;o>0;(o>>>=1)&&(t+=t))1&o&&(r+=t)
-return r}},{137:137,55:55}],132:[function(e,t,r){var n=e(60),i=e(55),o=e(62),s=e(133),a="["+s+"]",l=RegExp("^"+a+a+"*"),u=RegExp(a+a+"*$"),c=function(e,t,r){var i={},a=o((function(){return!!s[e]()||"​…"!="​…"[e]()})),l=i[e]=a?t(d):s[e]
-r&&(i[r]=l),n(n.P+n.F*a,"String",i)},d=c.trim=function(e,t){return e=String(i(e)),1&t&&(e=e.replace(l,"")),2&t&&(e=e.replace(u,"")),e}
-t.exports=c},{133:133,55:55,60:60,62:62}],133:[function(e,t,r){t.exports="\t\n\v\f\r   ᠎             　\u2028\u2029\ufeff"},{}],134:[function(e,t,r){var n,i,o,s=e(52),a=e(74),l=e(71),u=e(57),c=e(68),d=c.process,h=c.setImmediate,p=c.clearImmediate,f=c.MessageChannel,m=c.Dispatch,g=0,v={},b="onreadystatechange",y=function(){var e=+this
-if(v.hasOwnProperty(e)){var t=v[e]
-delete v[e],t()}},_=function(e){y.call(e.data)}
-h&&p||(h=function(e){for(var t=[],r=1;arguments.length>r;)t.push(arguments[r++])
-return v[++g]=function(){a("function"==typeof e?e:Function(e),t)},n(g),g},p=function(e){delete v[e]},"process"==e(46)(d)?n=function(e){d.nextTick(s(y,e,1))}:m&&m.now?n=function(e){m.now(s(y,e,1))}:f?(o=(i=new f).port2,i.port1.onmessage=_,n=s(o.postMessage,o,1)):c.addEventListener&&"function"==typeof postMessage&&!c.importScripts?(n=function(e){c.postMessage(e+"","*")},c.addEventListener("message",_,!1)):n=b in u("script")?function(e){l.appendChild(u("script")).onreadystatechange=function(){l.removeChild(this),y.call(e)}}:function(e){setTimeout(s(y,e,1),0)}),t.exports={set:h,clear:p}},{46:46,52:52,57:57,68:68,71:71,74:74}],135:[function(e,t,r){var n=e(137),i=Math.max,o=Math.min
-t.exports=function(e,t){return(e=n(e))<0?i(e+t,0):o(e,t)}},{137:137}],136:[function(e,t,r){var n=e(137),i=e(139)
-t.exports=function(e){if(void 0===e)return 0
-var t=n(e),r=i(t)
-if(t!==r)throw RangeError("Wrong length!")
-return r}},{137:137,139:139}],137:[function(e,t,r){var n=Math.ceil,i=Math.floor
-t.exports=function(e){return isNaN(e=+e)?0:(e>0?i:n)(e)}},{}],138:[function(e,t,r){var n=e(75),i=e(55)
-t.exports=function(e){return n(i(e))}},{55:55,75:75}],139:[function(e,t,r){var n=e(137),i=Math.min
-t.exports=function(e){return e>0?i(n(e),9007199254740991):0}},{137:137}],140:[function(e,t,r){var n=e(55)
-t.exports=function(e){return Object(n(e))}},{55:55}],141:[function(e,t,r){arguments[4][29][0].apply(r,arguments)},{29:29,79:79}],142:[function(e,t,r){"use strict"
-if(e(56)){var n=e(87),i=e(68),o=e(62),s=e(60),a=e(144),l=e(143),u=e(52),c=e(35),d=e(114),h=e(70),p=e(115),f=e(137),m=e(139),g=e(136),v=e(135),b=e(141),y=e(69),_=e(45),w=e(79),O=e(140),x=e(76),P=e(96),S=e(103),T=e(101).f,E=e(151),C=e(145),k=e(150),M=e(40),A=e(39),R=e(125),j=e(162),I=e(86),D=e(84),N=e(121),F=e(38),L=e(37),z=e(97),U=e(99),B=z.f,H=U.f,$=i.RangeError,W=i.TypeError,q=i.Uint8Array,V="ArrayBuffer",G="SharedArrayBuffer",K="BYTES_PER_ELEMENT",Y=Array.prototype,Q=l.ArrayBuffer,J=l.DataView,X=M(0),Z=M(2),ee=M(3),te=M(4),re=M(5),ne=M(6),ie=A(!0),oe=A(!1),se=j.values,ae=j.keys,le=j.entries,ue=Y.lastIndexOf,ce=Y.reduce,de=Y.reduceRight,he=Y.join,pe=Y.sort,fe=Y.slice,me=Y.toString,ge=Y.toLocaleString,ve=k("iterator"),be=k("toStringTag"),ye=C("typed_constructor"),_e=C("def_constructor"),we=a.CONSTR,Oe=a.TYPED,xe=a.VIEW,Pe="Wrong length!",Se=M(1,(function(e,t){return Me(R(e,e[_e]),t)})),Te=o((function(){return 1===new q(new Uint16Array([1]).buffer)[0]})),Ee=!!q&&!!q.prototype.set&&o((function(){new q(1).set({})})),Ce=function(e,t){var r=f(e)
-if(r<0||r%t)throw $("Wrong offset!")
-return r},ke=function(e){if(w(e)&&Oe in e)return e
-throw W(e+" is not a typed array!")},Me=function(e,t){if(!w(e)||!(ye in e))throw W("It is not a typed array constructor!")
-return new e(t)},Ae=function(e,t){return Re(R(e,e[_e]),t)},Re=function(e,t){for(var r=0,n=t.length,i=Me(e,n);n>r;)i[r]=t[r++]
-return i},je=function(e,t,r){B(e,t,{get:function(){return this._d[r]}})},Ie=function(e){var t,r,n,i,o,s,a=O(e),l=arguments.length,c=l>1?arguments[1]:void 0,d=void 0!==c,h=E(a)
-if(null!=h&&!x(h)){for(s=h.call(a),n=[],t=0;!(o=s.next()).done;t++)n.push(o.value)
-a=n}for(d&&l>2&&(c=u(c,arguments[2],2)),t=0,r=m(a.length),i=Me(this,r);r>t;t++)i[t]=d?c(a[t],t):a[t]
-return i},De=function(){for(var e=0,t=arguments.length,r=Me(this,t);t>e;)r[e]=arguments[e++]
-return r},Ne=!!q&&o((function(){ge.call(new q(1))})),Fe=function(){return ge.apply(Ne?fe.call(ke(this)):ke(this),arguments)},Le={copyWithin:function(e,t){return L.call(ke(this),e,t,arguments.length>2?arguments[2]:void 0)},every:function(e){return te(ke(this),e,arguments.length>1?arguments[1]:void 0)},fill:function(e){return F.apply(ke(this),arguments)},filter:function(e){return Ae(this,Z(ke(this),e,arguments.length>1?arguments[1]:void 0))},find:function(e){return re(ke(this),e,arguments.length>1?arguments[1]:void 0)},findIndex:function(e){return ne(ke(this),e,arguments.length>1?arguments[1]:void 0)},forEach:function(e){X(ke(this),e,arguments.length>1?arguments[1]:void 0)},indexOf:function(e){return oe(ke(this),e,arguments.length>1?arguments[1]:void 0)},includes:function(e){return ie(ke(this),e,arguments.length>1?arguments[1]:void 0)},join:function(e){return he.apply(ke(this),arguments)},lastIndexOf:function(e){return ue.apply(ke(this),arguments)},map:function(e){return Se(ke(this),e,arguments.length>1?arguments[1]:void 0)},reduce:function(e){return ce.apply(ke(this),arguments)},reduceRight:function(e){return de.apply(ke(this),arguments)},reverse:function(){for(var e,t=this,r=ke(t).length,n=Math.floor(r/2),i=0;i<n;)e=t[i],t[i++]=t[--r],t[r]=e
-return t},some:function(e){return ee(ke(this),e,arguments.length>1?arguments[1]:void 0)},sort:function(e){return pe.call(ke(this),e)},subarray:function(e,t){var r=ke(this),n=r.length,i=v(e,n)
-return new(R(r,r[_e]))(r.buffer,r.byteOffset+i*r.BYTES_PER_ELEMENT,m((void 0===t?n:v(t,n))-i))}},ze=function(e,t){return Ae(this,fe.call(ke(this),e,t))},Ue=function(e){ke(this)
-var t=Ce(arguments[1],1),r=this.length,n=O(e),i=m(n.length),o=0
-if(i+t>r)throw $(Pe)
-for(;o<i;)this[t+o]=n[o++]},Be={entries:function(){return le.call(ke(this))},keys:function(){return ae.call(ke(this))},values:function(){return se.call(ke(this))}},He=function(e,t){return w(e)&&e[Oe]&&"symbol"!=typeof t&&t in e&&String(+t)==String(t)},$e=function(e,t){return He(e,t=b(t,!0))?d(2,e[t]):H(e,t)},We=function(e,t,r){return!(He(e,t=b(t,!0))&&w(r)&&y(r,"value"))||y(r,"get")||y(r,"set")||r.configurable||y(r,"writable")&&!r.writable||y(r,"enumerable")&&!r.enumerable?B(e,t,r):(e[t]=r.value,e)}
-we||(U.f=$e,z.f=We),s(s.S+s.F*!we,"Object",{getOwnPropertyDescriptor:$e,defineProperty:We}),o((function(){me.call({})}))&&(me=ge=function(){return he.call(this)})
-var qe=p({},Le)
-p(qe,Be),h(qe,ve,Be.values),p(qe,{slice:ze,set:Ue,constructor:function(){},toString:me,toLocaleString:Fe}),je(qe,"buffer","b"),je(qe,"byteOffset","o"),je(qe,"byteLength","l"),je(qe,"length","e"),B(qe,be,{get:function(){return this[Oe]}}),t.exports=function(e,t,r,l){var u=e+((l=!!l)?"Clamped":"")+"Array",d="get"+e,p="set"+e,f=i[u],v=f||{},b=f&&S(f),y=!f||!a.ABV,O={},x=f&&f.prototype,E=function(e,r){B(e,r,{get:function(){return function(e,r){var n=e._d
-return n.v[d](r*t+n.o,Te)}(this,r)},set:function(e){return function(e,r,n){var i=e._d
-l&&(n=(n=Math.round(n))<0?0:n>255?255:255&n),i.v[p](r*t+i.o,n,Te)}(this,r,e)},enumerable:!0})}
-y?(f=r((function(e,r,n,i){c(e,f,u,"_d")
-var o,s,a,l,d=0,p=0
-if(w(r)){if(!(r instanceof Q||(l=_(r))==V||l==G))return Oe in r?Re(f,r):Ie.call(f,r)
-o=r,p=Ce(n,t)
-var v=r.byteLength
-if(void 0===i){if(v%t)throw $(Pe)
-if((s=v-p)<0)throw $(Pe)}else if((s=m(i)*t)+p>v)throw $(Pe)
-a=s/t}else a=g(r),o=new Q(s=a*t)
-for(h(e,"_d",{b:o,o:p,l:s,e:a,v:new J(o)});d<a;)E(e,d++)})),x=f.prototype=P(qe),h(x,"constructor",f)):o((function(){f(1)}))&&o((function(){new f(-1)}))&&D((function(e){new f,new f(null),new f(1.5),new f(e)}),!0)||(f=r((function(e,r,n,i){var o
-return c(e,f,u),w(r)?r instanceof Q||(o=_(r))==V||o==G?void 0!==i?new v(r,Ce(n,t),i):void 0!==n?new v(r,Ce(n,t)):new v(r):Oe in r?Re(f,r):Ie.call(f,r):new v(g(r))})),X(b!==Function.prototype?T(v).concat(T(b)):T(v),(function(e){e in f||h(f,e,v[e])})),f.prototype=x,n||(x.constructor=f))
-var C=x[ve],k=!!C&&("values"==C.name||null==C.name),M=Be.values
-h(f,ye,!0),h(x,Oe,u),h(x,xe,!0),h(x,_e,f),(l?new f(1)[be]==u:be in x)||B(x,be,{get:function(){return u}}),O[u]=f,s(s.G+s.W+s.F*(f!=v),O),s(s.S,u,{BYTES_PER_ELEMENT:t}),s(s.S+s.F*o((function(){v.of.call(f,1)})),u,{from:Ie,of:De}),K in x||h(x,K,t),s(s.P,u,Le),N(u),s(s.P+s.F*Ee,u,{set:Ue}),s(s.P+s.F*!k,u,Be),n||x.toString==me||(x.toString=me),s(s.P+s.F*o((function(){new f(1).slice()})),u,{slice:ze}),s(s.P+s.F*(o((function(){return[1,2].toLocaleString()!=new f([1,2]).toLocaleString()}))||!o((function(){x.toLocaleString.call([1,2])}))),u,{toLocaleString:Fe}),I[u]=k?C:M,n||k||h(x,ve,M)}}else t.exports=function(){}},{101:101,103:103,114:114,115:115,121:121,125:125,135:135,136:136,137:137,139:139,140:140,141:141,143:143,144:144,145:145,150:150,151:151,162:162,35:35,37:37,38:38,39:39,40:40,45:45,52:52,56:56,60:60,62:62,68:68,69:69,70:70,76:76,79:79,84:84,86:86,87:87,96:96,97:97,99:99}],143:[function(e,t,r){"use strict"
-var n=e(68),i=e(56),o=e(87),s=e(144),a=e(70),l=e(115),u=e(62),c=e(35),d=e(137),h=e(139),p=e(136),f=e(101).f,m=e(97).f,g=e(38),v=e(122),b="ArrayBuffer",y="DataView",_="Wrong index!",w=n.ArrayBuffer,O=n.DataView,x=n.Math,P=n.RangeError,S=n.Infinity,T=w,E=x.abs,C=x.pow,k=x.floor,M=x.log,A=x.LN2,R="buffer",j="byteLength",I="byteOffset",D=i?"_b":R,N=i?"_l":j,F=i?"_o":I
-function L(e,t,r){var n,i,o,s=new Array(r),a=8*r-t-1,l=(1<<a)-1,u=l>>1,c=23===t?C(2,-24)-C(2,-77):0,d=0,h=e<0||0===e&&1/e<0?1:0
-for((e=E(e))!=e||e===S?(i=e!=e?1:0,n=l):(n=k(M(e)/A),e*(o=C(2,-n))<1&&(n--,o*=2),(e+=n+u>=1?c/o:c*C(2,1-u))*o>=2&&(n++,o/=2),n+u>=l?(i=0,n=l):n+u>=1?(i=(e*o-1)*C(2,t),n+=u):(i=e*C(2,u-1)*C(2,t),n=0));t>=8;s[d++]=255&i,i/=256,t-=8);for(n=n<<t|i,a+=t;a>0;s[d++]=255&n,n/=256,a-=8);return s[--d]|=128*h,s}function z(e,t,r){var n,i=8*r-t-1,o=(1<<i)-1,s=o>>1,a=i-7,l=r-1,u=e[l--],c=127&u
-for(u>>=7;a>0;c=256*c+e[l],l--,a-=8);for(n=c&(1<<-a)-1,c>>=-a,a+=t;a>0;n=256*n+e[l],l--,a-=8);if(0===c)c=1-s
-else{if(c===o)return n?NaN:u?-S:S
-n+=C(2,t),c-=s}return(u?-1:1)*n*C(2,c-t)}function U(e){return e[3]<<24|e[2]<<16|e[1]<<8|e[0]}function B(e){return[255&e]}function H(e){return[255&e,e>>8&255]}function $(e){return[255&e,e>>8&255,e>>16&255,e>>24&255]}function W(e){return L(e,52,8)}function q(e){return L(e,23,4)}function V(e,t,r){m(e.prototype,t,{get:function(){return this[r]}})}function G(e,t,r,n){var i=p(+r)
-if(i+t>e[N])throw P(_)
-var o=e[D]._b,s=i+e[F],a=o.slice(s,s+t)
-return n?a:a.reverse()}function K(e,t,r,n,i,o){var s=p(+r)
-if(s+t>e[N])throw P(_)
-for(var a=e[D]._b,l=s+e[F],u=n(+i),c=0;c<t;c++)a[l+c]=u[o?c:t-c-1]}if(s.ABV){if(!u((function(){w(1)}))||!u((function(){new w(-1)}))||u((function(){return new w,new w(1.5),new w(NaN),w.name!=b}))){for(var Y,Q=(w=function(e){return c(this,w),new T(p(e))}).prototype=T.prototype,J=f(T),X=0;J.length>X;)(Y=J[X++])in w||a(w,Y,T[Y])
-o||(Q.constructor=w)}var Z=new O(new w(2)),ee=O.prototype.setInt8
-Z.setInt8(0,2147483648),Z.setInt8(1,2147483649),!Z.getInt8(0)&&Z.getInt8(1)||l(O.prototype,{setInt8:function(e,t){ee.call(this,e,t<<24>>24)},setUint8:function(e,t){ee.call(this,e,t<<24>>24)}},!0)}else w=function(e){c(this,w,b)
-var t=p(e)
-this._b=g.call(new Array(t),0),this[N]=t},O=function(e,t,r){c(this,O,y),c(e,w,y)
-var n=e[N],i=d(t)
-if(i<0||i>n)throw P("Wrong offset!")
-if(i+(r=void 0===r?n-i:h(r))>n)throw P("Wrong length!")
-this[D]=e,this[F]=i,this[N]=r},i&&(V(w,j,"_l"),V(O,R,"_b"),V(O,j,"_l"),V(O,I,"_o")),l(O.prototype,{getInt8:function(e){return G(this,1,e)[0]<<24>>24},getUint8:function(e){return G(this,1,e)[0]},getInt16:function(e){var t=G(this,2,e,arguments[1])
-return(t[1]<<8|t[0])<<16>>16},getUint16:function(e){var t=G(this,2,e,arguments[1])
-return t[1]<<8|t[0]},getInt32:function(e){return U(G(this,4,e,arguments[1]))},getUint32:function(e){return U(G(this,4,e,arguments[1]))>>>0},getFloat32:function(e){return z(G(this,4,e,arguments[1]),23,4)},getFloat64:function(e){return z(G(this,8,e,arguments[1]),52,8)},setInt8:function(e,t){K(this,1,e,B,t)},setUint8:function(e,t){K(this,1,e,B,t)},setInt16:function(e,t){K(this,2,e,H,t,arguments[2])},setUint16:function(e,t){K(this,2,e,H,t,arguments[2])},setInt32:function(e,t){K(this,4,e,$,t,arguments[2])},setUint32:function(e,t){K(this,4,e,$,t,arguments[2])},setFloat32:function(e,t){K(this,4,e,q,t,arguments[2])},setFloat64:function(e,t){K(this,8,e,W,t,arguments[2])}})
-v(w,b),v(O,y),a(O.prototype,s.VIEW,!0),r.ArrayBuffer=w,r.DataView=O},{101:101,115:115,122:122,136:136,137:137,139:139,144:144,35:35,38:38,56:56,62:62,68:68,70:70,87:87,97:97}],144:[function(e,t,r){for(var n,i=e(68),o=e(70),s=e(145),a=s("typed_array"),l=s("view"),u=!(!i.ArrayBuffer||!i.DataView),c=u,d=0,h="Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array".split(",");d<9;)(n=i[h[d++]])?(o(n.prototype,a,!0),o(n.prototype,l,!0)):c=!1
-t.exports={ABV:u,CONSTR:c,TYPED:a,VIEW:l}},{145:145,68:68,70:70}],145:[function(e,t,r){var n=0,i=Math.random()
-t.exports=function(e){return"Symbol(".concat(void 0===e?"":e,")_",(++n+i).toString(36))}},{}],146:[function(e,t,r){var n=e(68).navigator
-t.exports=n&&n.userAgent||""},{68:68}],147:[function(e,t,r){var n=e(79)
-t.exports=function(e,t){if(!n(e)||e._t!==t)throw TypeError("Incompatible receiver, "+t+" required!")
-return e}},{79:79}],148:[function(e,t,r){var n=e(68),i=e(50),o=e(87),s=e(149),a=e(97).f
-t.exports=function(e){var t=i.Symbol||(i.Symbol=o?{}:n.Symbol||{})
-"_"==e.charAt(0)||e in t||a(t,e,{value:s.f(e)})}},{149:149,50:50,68:68,87:87,97:97}],149:[function(e,t,r){r.f=e(150)},{150:150}],150:[function(e,t,r){var n=e(124)("wks"),i=e(145),o=e(68).Symbol,s="function"==typeof o;(t.exports=function(e){return n[e]||(n[e]=s&&o[e]||(s?o:i)("Symbol."+e))}).store=n},{124:124,145:145,68:68}],151:[function(e,t,r){var n=e(45),i=e(150)("iterator"),o=e(86)
-t.exports=e(50).getIteratorMethod=function(e){if(null!=e)return e[i]||e["@@iterator"]||o[n(e)]}},{150:150,45:45,50:50,86:86}],152:[function(e,t,r){var n=e(60)
-n(n.P,"Array",{copyWithin:e(37)}),e(33)("copyWithin")},{33:33,37:37,60:60}],153:[function(e,t,r){"use strict"
-var n=e(60),i=e(40)(4)
-n(n.P+n.F*!e(126)([].every,!0),"Array",{every:function(e){return i(this,e,arguments[1])}})},{126:126,40:40,60:60}],154:[function(e,t,r){var n=e(60)
-n(n.P,"Array",{fill:e(38)}),e(33)("fill")},{33:33,38:38,60:60}],155:[function(e,t,r){"use strict"
-var n=e(60),i=e(40)(2)
-n(n.P+n.F*!e(126)([].filter,!0),"Array",{filter:function(e){return i(this,e,arguments[1])}})},{126:126,40:40,60:60}],156:[function(e,t,r){"use strict"
-var n=e(60),i=e(40)(6),o="findIndex",s=!0
-o in[]&&Array(1)[o]((function(){s=!1})),n(n.P+n.F*s,"Array",{findIndex:function(e){return i(this,e,arguments.length>1?arguments[1]:void 0)}}),e(33)(o)},{33:33,40:40,60:60}],157:[function(e,t,r){"use strict"
-var n=e(60),i=e(40)(5),o="find",s=!0
-o in[]&&Array(1).find((function(){s=!1})),n(n.P+n.F*s,"Array",{find:function(e){return i(this,e,arguments.length>1?arguments[1]:void 0)}}),e(33)(o)},{33:33,40:40,60:60}],158:[function(e,t,r){"use strict"
-var n=e(60),i=e(40)(0),o=e(126)([].forEach,!0)
-n(n.P+n.F*!o,"Array",{forEach:function(e){return i(this,e,arguments[1])}})},{126:126,40:40,60:60}],159:[function(e,t,r){"use strict"
-var n=e(52),i=e(60),o=e(140),s=e(81),a=e(76),l=e(139),u=e(51),c=e(151)
-i(i.S+i.F*!e(84)((function(e){Array.from(e)})),"Array",{from:function(e){var t,r,i,d,h=o(e),p="function"==typeof this?this:Array,f=arguments.length,m=f>1?arguments[1]:void 0,g=void 0!==m,v=0,b=c(h)
-if(g&&(m=n(m,f>2?arguments[2]:void 0,2)),null==b||p==Array&&a(b))for(r=new p(t=l(h.length));t>v;v++)u(r,v,g?m(h[v],v):h[v])
-else for(d=b.call(h),r=new p;!(i=d.next()).done;v++)u(r,v,g?s(d,m,[i.value,v],!0):i.value)
-return r.length=v,r}})},{139:139,140:140,151:151,51:51,52:52,60:60,76:76,81:81,84:84}],160:[function(e,t,r){"use strict"
-var n=e(60),i=e(39)(!1),o=[].indexOf,s=!!o&&1/[1].indexOf(1,-0)<0
-n(n.P+n.F*(s||!e(126)(o)),"Array",{indexOf:function(e){return s?o.apply(this,arguments)||0:i(this,e,arguments[1])}})},{126:126,39:39,60:60}],161:[function(e,t,r){var n=e(60)
-n(n.S,"Array",{isArray:e(77)})},{60:60,77:77}],162:[function(e,t,r){"use strict"
-var n=e(33),i=e(85),o=e(86),s=e(138)
-t.exports=e(83)(Array,"Array",(function(e,t){this._t=s(e),this._i=0,this._k=t}),(function(){var e=this._t,t=this._k,r=this._i++
-return!e||r>=e.length?(this._t=void 0,i(1)):i(0,"keys"==t?r:"values"==t?e[r]:[r,e[r]])}),"values"),o.Arguments=o.Array,n("keys"),n("values"),n("entries")},{138:138,33:33,83:83,85:85,86:86}],163:[function(e,t,r){"use strict"
-var n=e(60),i=e(138),o=[].join
-n(n.P+n.F*(e(75)!=Object||!e(126)(o)),"Array",{join:function(e){return o.call(i(this),void 0===e?",":e)}})},{126:126,138:138,60:60,75:75}],164:[function(e,t,r){"use strict"
-var n=e(60),i=e(138),o=e(137),s=e(139),a=[].lastIndexOf,l=!!a&&1/[1].lastIndexOf(1,-0)<0
-n(n.P+n.F*(l||!e(126)(a)),"Array",{lastIndexOf:function(e){if(l)return a.apply(this,arguments)||0
-var t=i(this),r=s(t.length),n=r-1
-for(arguments.length>1&&(n=Math.min(n,o(arguments[1]))),n<0&&(n=r+n);n>=0;n--)if(n in t&&t[n]===e)return n||0
-return-1}})},{126:126,137:137,138:138,139:139,60:60}],165:[function(e,t,r){"use strict"
-var n=e(60),i=e(40)(1)
-n(n.P+n.F*!e(126)([].map,!0),"Array",{map:function(e){return i(this,e,arguments[1])}})},{126:126,40:40,60:60}],166:[function(e,t,r){"use strict"
-var n=e(60),i=e(51)
-n(n.S+n.F*e(62)((function(){function e(){}return!(Array.of.call(e)instanceof e)})),"Array",{of:function(){for(var e=0,t=arguments.length,r=new("function"==typeof this?this:Array)(t);t>e;)i(r,e,arguments[e++])
-return r.length=t,r}})},{51:51,60:60,62:62}],167:[function(e,t,r){"use strict"
-var n=e(60),i=e(41)
-n(n.P+n.F*!e(126)([].reduceRight,!0),"Array",{reduceRight:function(e){return i(this,e,arguments.length,arguments[1],!0)}})},{126:126,41:41,60:60}],168:[function(e,t,r){"use strict"
-var n=e(60),i=e(41)
-n(n.P+n.F*!e(126)([].reduce,!0),"Array",{reduce:function(e){return i(this,e,arguments.length,arguments[1],!1)}})},{126:126,41:41,60:60}],169:[function(e,t,r){"use strict"
-var n=e(60),i=e(71),o=e(46),s=e(135),a=e(139),l=[].slice
-n(n.P+n.F*e(62)((function(){i&&l.call(i)})),"Array",{slice:function(e,t){var r=a(this.length),n=o(this)
-if(t=void 0===t?r:t,"Array"==n)return l.call(this,e,t)
-for(var i=s(e,r),u=s(t,r),c=a(u-i),d=new Array(c),h=0;h<c;h++)d[h]="String"==n?this.charAt(i+h):this[i+h]
-return d}})},{135:135,139:139,46:46,60:60,62:62,71:71}],170:[function(e,t,r){"use strict"
-var n=e(60),i=e(40)(3)
-n(n.P+n.F*!e(126)([].some,!0),"Array",{some:function(e){return i(this,e,arguments[1])}})},{126:126,40:40,60:60}],171:[function(e,t,r){"use strict"
-var n=e(60),i=e(31),o=e(140),s=e(62),a=[].sort,l=[1,2,3]
-n(n.P+n.F*(s((function(){l.sort(void 0)}))||!s((function(){l.sort(null)}))||!e(126)(a)),"Array",{sort:function(e){return void 0===e?a.call(o(this)):a.call(o(this),i(e))}})},{126:126,140:140,31:31,60:60,62:62}],172:[function(e,t,r){e(121)("Array")},{121:121}],173:[function(e,t,r){var n=e(60)
-n(n.S,"Date",{now:function(){return(new Date).getTime()}})},{60:60}],174:[function(e,t,r){var n=e(60),i=e(53)
-n(n.P+n.F*(Date.prototype.toISOString!==i),"Date",{toISOString:i})},{53:53,60:60}],175:[function(e,t,r){"use strict"
-var n=e(60),i=e(140),o=e(141)
-n(n.P+n.F*e(62)((function(){return null!==new Date(NaN).toJSON()||1!==Date.prototype.toJSON.call({toISOString:function(){return 1}})})),"Date",{toJSON:function(e){var t=i(this),r=o(t)
-return"number"!=typeof r||isFinite(r)?t.toISOString():null}})},{140:140,141:141,60:60,62:62}],176:[function(e,t,r){var n=e(150)("toPrimitive"),i=Date.prototype
-n in i||e(70)(i,n,e(54))},{150:150,54:54,70:70}],177:[function(e,t,r){var n=Date.prototype,i="Invalid Date",o="toString",s=n.toString,a=n.getTime
-new Date(NaN)+""!=i&&e(116)(n,o,(function(){var e=a.call(this)
-return e==e?s.call(this):i}))},{116:116}],178:[function(e,t,r){var n=e(60)
-n(n.P,"Function",{bind:e(44)})},{44:44,60:60}],179:[function(e,t,r){"use strict"
-var n=e(79),i=e(103),o=e(150)("hasInstance"),s=Function.prototype
-o in s||e(97).f(s,o,{value:function(e){if("function"!=typeof this||!n(e))return!1
-if(!n(this.prototype))return e instanceof this
-for(;e=i(e);)if(this.prototype===e)return!0
-return!1}})},{103:103,150:150,79:79,97:97}],180:[function(e,t,r){var n=e(97).f,i=Function.prototype,o=/^\s*function ([^ (]*)/,s="name"
-s in i||e(56)&&n(i,s,{configurable:!0,get:function(){try{return(""+this).match(o)[1]}catch(e){return""}}})},{56:56,97:97}],181:[function(e,t,r){"use strict"
-var n=e(47),i=e(147),o="Map"
-t.exports=e(49)(o,(function(e){return function(){return e(this,arguments.length>0?arguments[0]:void 0)}}),{get:function(e){var t=n.getEntry(i(this,o),e)
-return t&&t.v},set:function(e,t){return n.def(i(this,o),0===e?0:e,t)}},n,!0)},{147:147,47:47,49:49}],182:[function(e,t,r){var n=e(60),i=e(90),o=Math.sqrt,s=Math.acosh
-n(n.S+n.F*!(s&&710==Math.floor(s(Number.MAX_VALUE))&&s(1/0)==1/0),"Math",{acosh:function(e){return(e=+e)<1?NaN:e>94906265.62425156?Math.log(e)+Math.LN2:i(e-1+o(e-1)*o(e+1))}})},{60:60,90:90}],183:[function(e,t,r){var n=e(60),i=Math.asinh
-n(n.S+n.F*!(i&&1/i(0)>0),"Math",{asinh:function e(t){return isFinite(t=+t)&&0!=t?t<0?-e(-t):Math.log(t+Math.sqrt(t*t+1)):t}})},{60:60}],184:[function(e,t,r){var n=e(60),i=Math.atanh
-n(n.S+n.F*!(i&&1/i(-0)<0),"Math",{atanh:function(e){return 0==(e=+e)?e:Math.log((1+e)/(1-e))/2}})},{60:60}],185:[function(e,t,r){var n=e(60),i=e(91)
-n(n.S,"Math",{cbrt:function(e){return i(e=+e)*Math.pow(Math.abs(e),1/3)}})},{60:60,91:91}],186:[function(e,t,r){var n=e(60)
-n(n.S,"Math",{clz32:function(e){return(e>>>=0)?31-Math.floor(Math.log(e+.5)*Math.LOG2E):32}})},{60:60}],187:[function(e,t,r){var n=e(60),i=Math.exp
-n(n.S,"Math",{cosh:function(e){return(i(e=+e)+i(-e))/2}})},{60:60}],188:[function(e,t,r){var n=e(60),i=e(88)
-n(n.S+n.F*(i!=Math.expm1),"Math",{expm1:i})},{60:60,88:88}],189:[function(e,t,r){var n=e(60)
-n(n.S,"Math",{fround:e(89)})},{60:60,89:89}],190:[function(e,t,r){var n=e(60),i=Math.abs
-n(n.S,"Math",{hypot:function(e,t){for(var r,n,o=0,s=0,a=arguments.length,l=0;s<a;)l<(r=i(arguments[s++]))?(o=o*(n=l/r)*n+1,l=r):o+=r>0?(n=r/l)*n:r
-return l===1/0?1/0:l*Math.sqrt(o)}})},{60:60}],191:[function(e,t,r){var n=e(60),i=Math.imul
-n(n.S+n.F*e(62)((function(){return-5!=i(4294967295,5)||2!=i.length})),"Math",{imul:function(e,t){var r=65535,n=+e,i=+t,o=r&n,s=r&i
-return 0|o*s+((r&n>>>16)*s+o*(r&i>>>16)<<16>>>0)}})},{60:60,62:62}],192:[function(e,t,r){var n=e(60)
-n(n.S,"Math",{log10:function(e){return Math.log(e)*Math.LOG10E}})},{60:60}],193:[function(e,t,r){var n=e(60)
-n(n.S,"Math",{log1p:e(90)})},{60:60,90:90}],194:[function(e,t,r){var n=e(60)
-n(n.S,"Math",{log2:function(e){return Math.log(e)/Math.LN2}})},{60:60}],195:[function(e,t,r){var n=e(60)
-n(n.S,"Math",{sign:e(91)})},{60:60,91:91}],196:[function(e,t,r){var n=e(60),i=e(88),o=Math.exp
-n(n.S+n.F*e(62)((function(){return-2e-17!=!Math.sinh(-2e-17)})),"Math",{sinh:function(e){return Math.abs(e=+e)<1?(i(e)-i(-e))/2:(o(e-1)-o(-e-1))*(Math.E/2)}})},{60:60,62:62,88:88}],197:[function(e,t,r){var n=e(60),i=e(88),o=Math.exp
-n(n.S,"Math",{tanh:function(e){var t=i(e=+e),r=i(-e)
-return t==1/0?1:r==1/0?-1:(t-r)/(o(e)+o(-e))}})},{60:60,88:88}],198:[function(e,t,r){var n=e(60)
-n(n.S,"Math",{trunc:function(e){return(e>0?Math.floor:Math.ceil)(e)}})},{60:60}],199:[function(e,t,r){"use strict"
-var n=e(68),i=e(69),o=e(46),s=e(73),a=e(141),l=e(62),u=e(101).f,c=e(99).f,d=e(97).f,h=e(132).trim,p="Number",f=n.Number,m=f,g=f.prototype,v=o(e(96)(g))==p,b="trim"in String.prototype,y=function(e){var t=a(e,!1)
-if("string"==typeof t&&t.length>2){var r,n,i,o=(t=b?t.trim():h(t,3)).charCodeAt(0)
-if(43===o||45===o){if(88===(r=t.charCodeAt(2))||120===r)return NaN}else if(48===o){switch(t.charCodeAt(1)){case 66:case 98:n=2,i=49
-break
-case 79:case 111:n=8,i=55
-break
-default:return+t}for(var s,l=t.slice(2),u=0,c=l.length;u<c;u++)if((s=l.charCodeAt(u))<48||s>i)return NaN
-return parseInt(l,n)}}return+t}
-if(!f(" 0o1")||!f("0b1")||f("+0x1")){f=function(e){var t=arguments.length<1?0:e,r=this
-return r instanceof f&&(v?l((function(){g.valueOf.call(r)})):o(r)!=p)?s(new m(y(t)),r,f):y(t)}
-for(var _,w=e(56)?u(m):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger".split(","),O=0;w.length>O;O++)i(m,_=w[O])&&!i(f,_)&&d(f,_,c(m,_))
-f.prototype=g,g.constructor=f,e(116)(n,p,f)}},{101:101,116:116,132:132,141:141,46:46,56:56,62:62,68:68,69:69,73:73,96:96,97:97,99:99}],200:[function(e,t,r){var n=e(60)
-n(n.S,"Number",{EPSILON:Math.pow(2,-52)})},{60:60}],201:[function(e,t,r){var n=e(60),i=e(68).isFinite
-n(n.S,"Number",{isFinite:function(e){return"number"==typeof e&&i(e)}})},{60:60,68:68}],202:[function(e,t,r){var n=e(60)
-n(n.S,"Number",{isInteger:e(78)})},{60:60,78:78}],203:[function(e,t,r){var n=e(60)
-n(n.S,"Number",{isNaN:function(e){return e!=e}})},{60:60}],204:[function(e,t,r){var n=e(60),i=e(78),o=Math.abs
-n(n.S,"Number",{isSafeInteger:function(e){return i(e)&&o(e)<=9007199254740991}})},{60:60,78:78}],205:[function(e,t,r){var n=e(60)
-n(n.S,"Number",{MAX_SAFE_INTEGER:9007199254740991})},{60:60}],206:[function(e,t,r){var n=e(60)
-n(n.S,"Number",{MIN_SAFE_INTEGER:-9007199254740991})},{60:60}],207:[function(e,t,r){var n=e(60),i=e(110)
-n(n.S+n.F*(Number.parseFloat!=i),"Number",{parseFloat:i})},{110:110,60:60}],208:[function(e,t,r){var n=e(60),i=e(111)
-n(n.S+n.F*(Number.parseInt!=i),"Number",{parseInt:i})},{111:111,60:60}],209:[function(e,t,r){"use strict"
-var n=e(60),i=e(137),o=e(32),s=e(131),a=1..toFixed,l=Math.floor,u=[0,0,0,0,0,0],c="Number.toFixed: incorrect invocation!",d="0",h=function(e,t){for(var r=-1,n=t;++r<6;)n+=e*u[r],u[r]=n%1e7,n=l(n/1e7)},p=function(e){for(var t=6,r=0;--t>=0;)r+=u[t],u[t]=l(r/e),r=r%e*1e7},f=function(){for(var e=6,t="";--e>=0;)if(""!==t||0===e||0!==u[e]){var r=String(u[e])
-t=""===t?r:t+s.call(d,7-r.length)+r}return t},m=function(e,t,r){return 0===t?r:t%2==1?m(e,t-1,r*e):m(e*e,t/2,r)}
-n(n.P+n.F*(!!a&&("0.000"!==8e-5.toFixed(3)||"1"!==.9.toFixed(0)||"1.25"!==1.255.toFixed(2)||"1000000000000000128"!==(0xde0b6b3a7640080).toFixed(0))||!e(62)((function(){a.call({})}))),"Number",{toFixed:function(e){var t,r,n,a,l=o(this,c),u=i(e),g="",v=d
-if(u<0||u>20)throw RangeError(c)
-if(l!=l)return"NaN"
-if(l<=-1e21||l>=1e21)return String(l)
-if(l<0&&(g="-",l=-l),l>1e-21)if(t=function(e){for(var t=0,r=e;r>=4096;)t+=12,r/=4096
-for(;r>=2;)t+=1,r/=2
-return t}(l*m(2,69,1))-69,r=t<0?l*m(2,-t,1):l/m(2,t,1),r*=4503599627370496,(t=52-t)>0){for(h(0,r),n=u;n>=7;)h(1e7,0),n-=7
-for(h(m(10,n,1),0),n=t-1;n>=23;)p(1<<23),n-=23
-p(1<<n),h(1,1),p(2),v=f()}else h(0,r),h(1<<-t,0),v=f()+s.call(d,u)
-return v=u>0?g+((a=v.length)<=u?"0."+s.call(d,u-a)+v:v.slice(0,a-u)+"."+v.slice(a-u)):g+v}})},{131:131,137:137,32:32,60:60,62:62}],210:[function(e,t,r){"use strict"
-var n=e(60),i=e(62),o=e(32),s=1..toPrecision
-n(n.P+n.F*(i((function(){return"1"!==s.call(1,void 0)}))||!i((function(){s.call({})}))),"Number",{toPrecision:function(e){var t=o(this,"Number#toPrecision: incorrect invocation!")
-return void 0===e?s.call(t):s.call(t,e)}})},{32:32,60:60,62:62}],211:[function(e,t,r){var n=e(60)
-n(n.S+n.F,"Object",{assign:e(95)})},{60:60,95:95}],212:[function(e,t,r){var n=e(60)
-n(n.S,"Object",{create:e(96)})},{60:60,96:96}],213:[function(e,t,r){var n=e(60)
-n(n.S+n.F*!e(56),"Object",{defineProperties:e(98)})},{56:56,60:60,98:98}],214:[function(e,t,r){var n=e(60)
-n(n.S+n.F*!e(56),"Object",{defineProperty:e(97).f})},{56:56,60:60,97:97}],215:[function(e,t,r){var n=e(79),i=e(92).onFreeze
-e(107)("freeze",(function(e){return function(t){return e&&n(t)?e(i(t)):t}}))},{107:107,79:79,92:92}],216:[function(e,t,r){var n=e(138),i=e(99).f
-e(107)("getOwnPropertyDescriptor",(function(){return function(e,t){return i(n(e),t)}}))},{107:107,138:138,99:99}],217:[function(e,t,r){e(107)("getOwnPropertyNames",(function(){return e(100).f}))},{100:100,107:107}],218:[function(e,t,r){var n=e(140),i=e(103)
-e(107)("getPrototypeOf",(function(){return function(e){return i(n(e))}}))},{103:103,107:107,140:140}],219:[function(e,t,r){var n=e(79)
-e(107)("isExtensible",(function(e){return function(t){return!!n(t)&&(!e||e(t))}}))},{107:107,79:79}],220:[function(e,t,r){var n=e(79)
-e(107)("isFrozen",(function(e){return function(t){return!n(t)||!!e&&e(t)}}))},{107:107,79:79}],221:[function(e,t,r){var n=e(79)
-e(107)("isSealed",(function(e){return function(t){return!n(t)||!!e&&e(t)}}))},{107:107,79:79}],222:[function(e,t,r){var n=e(60)
-n(n.S,"Object",{is:e(119)})},{119:119,60:60}],223:[function(e,t,r){var n=e(140),i=e(105)
-e(107)("keys",(function(){return function(e){return i(n(e))}}))},{105:105,107:107,140:140}],224:[function(e,t,r){var n=e(79),i=e(92).onFreeze
-e(107)("preventExtensions",(function(e){return function(t){return e&&n(t)?e(i(t)):t}}))},{107:107,79:79,92:92}],225:[function(e,t,r){var n=e(79),i=e(92).onFreeze
-e(107)("seal",(function(e){return function(t){return e&&n(t)?e(i(t)):t}}))},{107:107,79:79,92:92}],226:[function(e,t,r){var n=e(60)
-n(n.S,"Object",{setPrototypeOf:e(120).set})},{120:120,60:60}],227:[function(e,t,r){"use strict"
-var n=e(45),i={}
-i[e(150)("toStringTag")]="z",i+""!="[object z]"&&e(116)(Object.prototype,"toString",(function(){return"[object "+n(this)+"]"}),!0)},{116:116,150:150,45:45}],228:[function(e,t,r){var n=e(60),i=e(110)
-n(n.G+n.F*(parseFloat!=i),{parseFloat:i})},{110:110,60:60}],229:[function(e,t,r){var n=e(60),i=e(111)
-n(n.G+n.F*(parseInt!=i),{parseInt:i})},{111:111,60:60}],230:[function(e,t,r){"use strict"
-var n,i,o,s,a=e(87),l=e(68),u=e(52),c=e(45),d=e(60),h=e(79),p=e(31),f=e(35),m=e(66),g=e(125),v=e(134).set,b=e(93)(),y=e(94),_=e(112),w=e(146),O=e(113),x="Promise",P=l.TypeError,S=l.process,T=S&&S.versions,E=T&&T.v8||"",C=l.Promise,k="process"==c(S),M=function(){},A=i=y.f,R=!!function(){try{var t=C.resolve(1),r=(t.constructor={})[e(150)("species")]=function(e){e(M,M)}
-return(k||"function"==typeof PromiseRejectionEvent)&&t.then(M)instanceof r&&0!==E.indexOf("6.6")&&-1===w.indexOf("Chrome/66")}catch(n){}}(),j=function(e){var t
-return!(!h(e)||"function"!=typeof(t=e.then))&&t},I=function(e,t){if(!e._n){e._n=!0
-var r=e._c
-b((function(){for(var n=e._v,i=1==e._s,o=0,s=function(t){var r,o,s,a=i?t.ok:t.fail,l=t.resolve,u=t.reject,c=t.domain
-try{a?(i||(2==e._h&&F(e),e._h=1),!0===a?r=n:(c&&c.enter(),r=a(n),c&&(c.exit(),s=!0)),r===t.promise?u(P("Promise-chain cycle")):(o=j(r))?o.call(r,l,u):l(r)):u(n)}catch(d){c&&!s&&c.exit(),u(d)}};r.length>o;)s(r[o++])
-e._c=[],e._n=!1,t&&!e._h&&D(e)}))}},D=function(e){v.call(l,(function(){var t,r,n,i=e._v,o=N(e)
-if(o&&(t=_((function(){k?S.emit("unhandledRejection",i,e):(r=l.onunhandledrejection)?r({promise:e,reason:i}):(n=l.console)&&n.error&&n.error("Unhandled promise rejection",i)})),e._h=k||N(e)?2:1),e._a=void 0,o&&t.e)throw t.v}))},N=function(e){return 1!==e._h&&0===(e._a||e._c).length},F=function(e){v.call(l,(function(){var t
-k?S.emit("rejectionHandled",e):(t=l.onrejectionhandled)&&t({promise:e,reason:e._v})}))},L=function(e){var t=this
-t._d||(t._d=!0,(t=t._w||t)._v=e,t._s=2,t._a||(t._a=t._c.slice()),I(t,!0))},z=function(e){var t,r=this
-if(!r._d){r._d=!0,r=r._w||r
-try{if(r===e)throw P("Promise can't be resolved itself");(t=j(e))?b((function(){var n={_w:r,_d:!1}
-try{t.call(e,u(z,n,1),u(L,n,1))}catch(i){L.call(n,i)}})):(r._v=e,r._s=1,I(r,!1))}catch(n){L.call({_w:r,_d:!1},n)}}}
-R||(C=function(e){f(this,C,x,"_h"),p(e),n.call(this)
-try{e(u(z,this,1),u(L,this,1))}catch(t){L.call(this,t)}},(n=function(e){this._c=[],this._a=void 0,this._s=0,this._d=!1,this._v=void 0,this._h=0,this._n=!1}).prototype=e(115)(C.prototype,{then:function(e,t){var r=A(g(this,C))
-return r.ok="function"!=typeof e||e,r.fail="function"==typeof t&&t,r.domain=k?S.domain:void 0,this._c.push(r),this._a&&this._a.push(r),this._s&&I(this,!1),r.promise},catch:function(e){return this.then(void 0,e)}}),o=function(){var e=new n
-this.promise=e,this.resolve=u(z,e,1),this.reject=u(L,e,1)},y.f=A=function(e){return e===C||e===s?new o(e):i(e)}),d(d.G+d.W+d.F*!R,{Promise:C}),e(122)(C,x),e(121)(x),s=e(50).Promise,d(d.S+d.F*!R,x,{reject:function(e){var t=A(this)
-return(0,t.reject)(e),t.promise}}),d(d.S+d.F*(a||!R),x,{resolve:function(e){return O(a&&this===s?C:this,e)}}),d(d.S+d.F*!(R&&e(84)((function(e){C.all(e).catch(M)}))),x,{all:function(e){var t=this,r=A(t),n=r.resolve,i=r.reject,o=_((function(){var r=[],o=0,s=1
-m(e,!1,(function(e){var a=o++,l=!1
-r.push(void 0),s++,t.resolve(e).then((function(e){l||(l=!0,r[a]=e,--s||n(r))}),i)})),--s||n(r)}))
-return o.e&&i(o.v),r.promise},race:function(e){var t=this,r=A(t),n=r.reject,i=_((function(){m(e,!1,(function(e){t.resolve(e).then(r.resolve,n)}))}))
-return i.e&&n(i.v),r.promise}})},{112:112,113:113,115:115,121:121,122:122,125:125,134:134,146:146,150:150,31:31,35:35,45:45,50:50,52:52,60:60,66:66,68:68,79:79,84:84,87:87,93:93,94:94}],231:[function(e,t,r){var n=e(60),i=e(31),o=e(36),s=(e(68).Reflect||{}).apply,a=Function.apply
-n(n.S+n.F*!e(62)((function(){s((function(){}))})),"Reflect",{apply:function(e,t,r){var n=i(e),l=o(r)
-return s?s(n,t,l):a.call(n,t,l)}})},{31:31,36:36,60:60,62:62,68:68}],232:[function(e,t,r){var n=e(60),i=e(96),o=e(31),s=e(36),a=e(79),l=e(62),u=e(44),c=(e(68).Reflect||{}).construct,d=l((function(){function e(){}return!(c((function(){}),[],e)instanceof e)})),h=!l((function(){c((function(){}))}))
-n(n.S+n.F*(d||h),"Reflect",{construct:function(e,t){o(e),s(t)
-var r=arguments.length<3?e:o(arguments[2])
-if(h&&!d)return c(e,t,r)
-if(e==r){switch(t.length){case 0:return new e
-case 1:return new e(t[0])
-case 2:return new e(t[0],t[1])
-case 3:return new e(t[0],t[1],t[2])
-case 4:return new e(t[0],t[1],t[2],t[3])}var n=[null]
-return n.push.apply(n,t),new(u.apply(e,n))}var l=r.prototype,p=i(a(l)?l:Object.prototype),f=Function.apply.call(e,p,t)
-return a(f)?f:p}})},{31:31,36:36,44:44,60:60,62:62,68:68,79:79,96:96}],233:[function(e,t,r){var n=e(97),i=e(60),o=e(36),s=e(141)
-i(i.S+i.F*e(62)((function(){Reflect.defineProperty(n.f({},1,{value:1}),1,{value:2})})),"Reflect",{defineProperty:function(e,t,r){o(e),t=s(t,!0),o(r)
-try{return n.f(e,t,r),!0}catch(i){return!1}}})},{141:141,36:36,60:60,62:62,97:97}],234:[function(e,t,r){var n=e(60),i=e(99).f,o=e(36)
-n(n.S,"Reflect",{deleteProperty:function(e,t){var r=i(o(e),t)
-return!(r&&!r.configurable)&&delete e[t]}})},{36:36,60:60,99:99}],235:[function(e,t,r){"use strict"
-var n=e(60),i=e(36),o=function(e){this._t=i(e),this._i=0
-var t,r=this._k=[]
-for(t in e)r.push(t)}
-e(82)(o,"Object",(function(){var e,t=this,r=t._k
-do{if(t._i>=r.length)return{value:void 0,done:!0}}while(!((e=r[t._i++])in t._t))
-return{value:e,done:!1}})),n(n.S,"Reflect",{enumerate:function(e){return new o(e)}})},{36:36,60:60,82:82}],236:[function(e,t,r){var n=e(99),i=e(60),o=e(36)
-i(i.S,"Reflect",{getOwnPropertyDescriptor:function(e,t){return n.f(o(e),t)}})},{36:36,60:60,99:99}],237:[function(e,t,r){var n=e(60),i=e(103),o=e(36)
-n(n.S,"Reflect",{getPrototypeOf:function(e){return i(o(e))}})},{103:103,36:36,60:60}],238:[function(e,t,r){var n=e(99),i=e(103),o=e(69),s=e(60),a=e(79),l=e(36)
-s(s.S,"Reflect",{get:function e(t,r){var s,u,c=arguments.length<3?t:arguments[2]
-return l(t)===c?t[r]:(s=n.f(t,r))?o(s,"value")?s.value:void 0!==s.get?s.get.call(c):void 0:a(u=i(t))?e(u,r,c):void 0}})},{103:103,36:36,60:60,69:69,79:79,99:99}],239:[function(e,t,r){var n=e(60)
-n(n.S,"Reflect",{has:function(e,t){return t in e}})},{60:60}],240:[function(e,t,r){var n=e(60),i=e(36),o=Object.isExtensible
-n(n.S,"Reflect",{isExtensible:function(e){return i(e),!o||o(e)}})},{36:36,60:60}],241:[function(e,t,r){var n=e(60)
-n(n.S,"Reflect",{ownKeys:e(109)})},{109:109,60:60}],242:[function(e,t,r){var n=e(60),i=e(36),o=Object.preventExtensions
-n(n.S,"Reflect",{preventExtensions:function(e){i(e)
-try{return o&&o(e),!0}catch(t){return!1}}})},{36:36,60:60}],243:[function(e,t,r){var n=e(60),i=e(120)
-i&&n(n.S,"Reflect",{setPrototypeOf:function(e,t){i.check(e,t)
-try{return i.set(e,t),!0}catch(r){return!1}}})},{120:120,60:60}],244:[function(e,t,r){var n=e(97),i=e(99),o=e(103),s=e(69),a=e(60),l=e(114),u=e(36),c=e(79)
-a(a.S,"Reflect",{set:function e(t,r,a){var d,h,p=arguments.length<4?t:arguments[3],f=i.f(u(t),r)
-if(!f){if(c(h=o(t)))return e(h,r,a,p)
-f=l(0)}if(s(f,"value")){if(!1===f.writable||!c(p))return!1
-if(d=i.f(p,r)){if(d.get||d.set||!1===d.writable)return!1
-d.value=a,n.f(p,r,d)}else n.f(p,r,l(0,a))
-return!0}return void 0!==f.set&&(f.set.call(p,a),!0)}})},{103:103,114:114,36:36,60:60,69:69,79:79,97:97,99:99}],245:[function(e,t,r){var n=e(68),i=e(73),o=e(97).f,s=e(101).f,a=e(80),l=e(64),u=n.RegExp,c=u,d=u.prototype,h=/a/g,p=/a/g,f=new u(h)!==h
-if(e(56)&&(!f||e(62)((function(){return p[e(150)("match")]=!1,u(h)!=h||u(p)==p||"/a/i"!=u(h,"i")})))){u=function(e,t){var r=this instanceof u,n=a(e),o=void 0===t
-return!r&&n&&e.constructor===u&&o?e:i(f?new c(n&&!o?e.source:e,t):c((n=e instanceof u)?e.source:e,n&&o?l.call(e):t),r?this:d,u)}
-for(var m=function(e){e in u||o(u,e,{configurable:!0,get:function(){return c[e]},set:function(t){c[e]=t}})},g=s(c),v=0;g.length>v;)m(g[v++])
-d.constructor=u,u.prototype=d,e(116)(n,"RegExp",u)}e(121)("RegExp")},{101:101,116:116,121:121,150:150,56:56,62:62,64:64,68:68,73:73,80:80,97:97}],246:[function(e,t,r){"use strict"
-var n=e(118)
-e(60)({target:"RegExp",proto:!0,forced:n!==/./.exec},{exec:n})},{118:118,60:60}],247:[function(e,t,r){e(56)&&"g"!=/./g.flags&&e(97).f(RegExp.prototype,"flags",{configurable:!0,get:e(64)})},{56:56,64:64,97:97}],248:[function(e,t,r){"use strict"
-var n=e(36),i=e(139),o=e(34),s=e(117)
-e(63)("match",1,(function(e,t,r,a){return[function(r){var n=e(this),i=null==r?void 0:r[t]
-return void 0!==i?i.call(r,n):new RegExp(r)[t](String(n))},function(e){var t=a(r,e,this)
-if(t.done)return t.value
-var l=n(e),u=String(this)
-if(!l.global)return s(l,u)
-var c=l.unicode
-l.lastIndex=0
-for(var d,h=[],p=0;null!==(d=s(l,u));){var f=String(d[0])
-h[p]=f,""===f&&(l.lastIndex=o(u,i(l.lastIndex),c)),p++}return 0===p?null:h}]}))},{117:117,139:139,34:34,36:36,63:63}],249:[function(e,t,r){"use strict"
-var n=e(36),i=e(140),o=e(139),s=e(137),a=e(34),l=e(117),u=Math.max,c=Math.min,d=Math.floor,h=/\$([$&`']|\d\d?|<[^>]*>)/g,p=/\$([$&`']|\d\d?)/g
-e(63)("replace",2,(function(e,t,r,f){return[function(n,i){var o=e(this),s=null==n?void 0:n[t]
-return void 0!==s?s.call(n,o,i):r.call(String(o),n,i)},function(e,t){var i=f(r,e,this,t)
-if(i.done)return i.value
-var d=n(e),h=String(this),p="function"==typeof t
-p||(t=String(t))
-var g=d.global
-if(g){var v=d.unicode
-d.lastIndex=0}for(var b=[];;){var y=l(d,h)
-if(null===y)break
-if(b.push(y),!g)break
-""===String(y[0])&&(d.lastIndex=a(h,o(d.lastIndex),v))}for(var _,w="",O=0,x=0;x<b.length;x++){y=b[x]
-for(var P=String(y[0]),S=u(c(s(y.index),h.length),0),T=[],E=1;E<y.length;E++)T.push(void 0===(_=y[E])?_:String(_))
-var C=y.groups
-if(p){var k=[P].concat(T,S,h)
-void 0!==C&&k.push(C)
-var M=String(t.apply(void 0,k))}else M=m(P,h,S,T,C,t)
-S>=O&&(w+=h.slice(O,S)+M,O=S+P.length)}return w+h.slice(O)}]
-function m(e,t,n,o,s,a){var l=n+e.length,u=o.length,c=p
-return void 0!==s&&(s=i(s),c=h),r.call(a,c,(function(r,i){var a
-switch(i.charAt(0)){case"$":return"$"
-case"&":return e
-case"`":return t.slice(0,n)
-case"'":return t.slice(l)
-case"<":a=s[i.slice(1,-1)]
-break
-default:var c=+i
-if(0===c)return r
-if(c>u){var h=d(c/10)
-return 0===h?r:h<=u?void 0===o[h-1]?i.charAt(1):o[h-1]+i.charAt(1):r}a=o[c-1]}return void 0===a?"":a}))}}))},{117:117,137:137,139:139,140:140,34:34,36:36,63:63}],250:[function(e,t,r){"use strict"
-var n=e(36),i=e(119),o=e(117)
-e(63)("search",1,(function(e,t,r,s){return[function(r){var n=e(this),i=null==r?void 0:r[t]
-return void 0!==i?i.call(r,n):new RegExp(r)[t](String(n))},function(e){var t=s(r,e,this)
-if(t.done)return t.value
-var a=n(e),l=String(this),u=a.lastIndex
-i(u,0)||(a.lastIndex=0)
-var c=o(a,l)
-return i(a.lastIndex,u)||(a.lastIndex=u),null===c?-1:c.index}]}))},{117:117,119:119,36:36,63:63}],251:[function(e,t,r){"use strict"
-var n=e(80),i=e(36),o=e(125),s=e(34),a=e(139),l=e(117),u=e(118),c=e(62),d=Math.min,h=[].push,p=4294967295,f=!c((function(){RegExp(p,"y")}))
-e(63)("split",2,(function(e,t,r,c){var m
-return m="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(e,t){var i=String(this)
-if(void 0===e&&0===t)return[]
-if(!n(e))return r.call(i,e,t)
-for(var o,s,a,l=[],c=(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.unicode?"u":"")+(e.sticky?"y":""),d=0,f=void 0===t?p:t>>>0,m=new RegExp(e.source,c+"g");(o=u.call(m,i))&&!((s=m.lastIndex)>d&&(l.push(i.slice(d,o.index)),o.length>1&&o.index<i.length&&h.apply(l,o.slice(1)),a=o[0].length,d=s,l.length>=f));)m.lastIndex===o.index&&m.lastIndex++
-return d===i.length?!a&&m.test("")||l.push(""):l.push(i.slice(d)),l.length>f?l.slice(0,f):l}:"0".split(void 0,0).length?function(e,t){return void 0===e&&0===t?[]:r.call(this,e,t)}:r,[function(r,n){var i=e(this),o=null==r?void 0:r[t]
-return void 0!==o?o.call(r,i,n):m.call(String(i),r,n)},function(e,t){var n=c(m,e,this,t,m!==r)
-if(n.done)return n.value
-var u=i(e),h=String(this),g=o(u,RegExp),v=u.unicode,b=(u.ignoreCase?"i":"")+(u.multiline?"m":"")+(u.unicode?"u":"")+(f?"y":"g"),y=new g(f?u:"^(?:"+u.source+")",b),_=void 0===t?p:t>>>0
-if(0===_)return[]
-if(0===h.length)return null===l(y,h)?[h]:[]
-for(var w=0,O=0,x=[];O<h.length;){y.lastIndex=f?O:0
-var P,S=l(y,f?h:h.slice(O))
-if(null===S||(P=d(a(y.lastIndex+(f?0:O)),h.length))===w)O=s(h,O,v)
-else{if(x.push(h.slice(w,O)),x.length===_)return x
-for(var T=1;T<=S.length-1;T++)if(x.push(S[T]),x.length===_)return x
-O=w=P}}return x.push(h.slice(w)),x}]}))},{117:117,118:118,125:125,139:139,34:34,36:36,62:62,63:63,80:80}],252:[function(e,t,r){"use strict"
-e(247)
-var n=e(36),i=e(64),o=e(56),s="toString",a=/./.toString,l=function(t){e(116)(RegExp.prototype,s,t,!0)}
-e(62)((function(){return"/a/b"!=a.call({source:"a",flags:"b"})}))?l((function(){var e=n(this)
-return"/".concat(e.source,"/","flags"in e?e.flags:!o&&e instanceof RegExp?i.call(e):void 0)})):a.name!=s&&l((function(){return a.call(this)}))},{116:116,247:247,36:36,56:56,62:62,64:64}],253:[function(e,t,r){"use strict"
-var n=e(47),i=e(147)
-t.exports=e(49)("Set",(function(e){return function(){return e(this,arguments.length>0?arguments[0]:void 0)}}),{add:function(e){return n.def(i(this,"Set"),e=0===e?0:e,e)}},n)},{147:147,47:47,49:49}],254:[function(e,t,r){"use strict"
-e(129)("anchor",(function(e){return function(t){return e(this,"a","name",t)}}))},{129:129}],255:[function(e,t,r){"use strict"
-e(129)("big",(function(e){return function(){return e(this,"big","","")}}))},{129:129}],256:[function(e,t,r){"use strict"
-e(129)("blink",(function(e){return function(){return e(this,"blink","","")}}))},{129:129}],257:[function(e,t,r){"use strict"
-e(129)("bold",(function(e){return function(){return e(this,"b","","")}}))},{129:129}],258:[function(e,t,r){"use strict"
-var n=e(60),i=e(127)(!1)
-n(n.P,"String",{codePointAt:function(e){return i(this,e)}})},{127:127,60:60}],259:[function(e,t,r){"use strict"
-var n=e(60),i=e(139),o=e(128),s="endsWith",a="".endsWith
-n(n.P+n.F*e(61)(s),"String",{endsWith:function(e){var t=o(this,e,s),r=arguments.length>1?arguments[1]:void 0,n=i(t.length),l=void 0===r?n:Math.min(i(r),n),u=String(e)
-return a?a.call(t,u,l):t.slice(l-u.length,l)===u}})},{128:128,139:139,60:60,61:61}],260:[function(e,t,r){"use strict"
-e(129)("fixed",(function(e){return function(){return e(this,"tt","","")}}))},{129:129}],261:[function(e,t,r){"use strict"
-e(129)("fontcolor",(function(e){return function(t){return e(this,"font","color",t)}}))},{129:129}],262:[function(e,t,r){"use strict"
-e(129)("fontsize",(function(e){return function(t){return e(this,"font","size",t)}}))},{129:129}],263:[function(e,t,r){var n=e(60),i=e(135),o=String.fromCharCode,s=String.fromCodePoint
-n(n.S+n.F*(!!s&&1!=s.length),"String",{fromCodePoint:function(e){for(var t,r=[],n=arguments.length,s=0;n>s;){if(t=+arguments[s++],i(t,1114111)!==t)throw RangeError(t+" is not a valid code point")
-r.push(t<65536?o(t):o(55296+((t-=65536)>>10),t%1024+56320))}return r.join("")}})},{135:135,60:60}],264:[function(e,t,r){"use strict"
-var n=e(60),i=e(128),o="includes"
-n(n.P+n.F*e(61)(o),"String",{includes:function(e){return!!~i(this,e,o).indexOf(e,arguments.length>1?arguments[1]:void 0)}})},{128:128,60:60,61:61}],265:[function(e,t,r){"use strict"
-e(129)("italics",(function(e){return function(){return e(this,"i","","")}}))},{129:129}],266:[function(e,t,r){"use strict"
-var n=e(127)(!0)
-e(83)(String,"String",(function(e){this._t=String(e),this._i=0}),(function(){var e,t=this._t,r=this._i
-return r>=t.length?{value:void 0,done:!0}:(e=n(t,r),this._i+=e.length,{value:e,done:!1})}))},{127:127,83:83}],267:[function(e,t,r){"use strict"
-e(129)("link",(function(e){return function(t){return e(this,"a","href",t)}}))},{129:129}],268:[function(e,t,r){var n=e(60),i=e(138),o=e(139)
-n(n.S,"String",{raw:function(e){for(var t=i(e.raw),r=o(t.length),n=arguments.length,s=[],a=0;r>a;)s.push(String(t[a++])),a<n&&s.push(String(arguments[a]))
-return s.join("")}})},{138:138,139:139,60:60}],269:[function(e,t,r){var n=e(60)
-n(n.P,"String",{repeat:e(131)})},{131:131,60:60}],270:[function(e,t,r){"use strict"
-e(129)("small",(function(e){return function(){return e(this,"small","","")}}))},{129:129}],271:[function(e,t,r){"use strict"
-var n=e(60),i=e(139),o=e(128),s="startsWith",a="".startsWith
-n(n.P+n.F*e(61)(s),"String",{startsWith:function(e){var t=o(this,e,s),r=i(Math.min(arguments.length>1?arguments[1]:void 0,t.length)),n=String(e)
-return a?a.call(t,n,r):t.slice(r,r+n.length)===n}})},{128:128,139:139,60:60,61:61}],272:[function(e,t,r){"use strict"
-e(129)("strike",(function(e){return function(){return e(this,"strike","","")}}))},{129:129}],273:[function(e,t,r){"use strict"
-e(129)("sub",(function(e){return function(){return e(this,"sub","","")}}))},{129:129}],274:[function(e,t,r){"use strict"
-e(129)("sup",(function(e){return function(){return e(this,"sup","","")}}))},{129:129}],275:[function(e,t,r){"use strict"
-e(132)("trim",(function(e){return function(){return e(this,3)}}))},{132:132}],276:[function(e,t,r){"use strict"
-var n=e(68),i=e(69),o=e(56),s=e(60),a=e(116),l=e(92).KEY,u=e(62),c=e(124),d=e(122),h=e(145),p=e(150),f=e(149),m=e(148),g=e(59),v=e(77),b=e(36),y=e(79),_=e(140),w=e(138),O=e(141),x=e(114),P=e(96),S=e(100),T=e(99),E=e(102),C=e(97),k=e(105),M=T.f,A=C.f,R=S.f,j=n.Symbol,I=n.JSON,D=I&&I.stringify,N=p("_hidden"),F=p("toPrimitive"),L={}.propertyIsEnumerable,z=c("symbol-registry"),U=c("symbols"),B=c("op-symbols"),H=Object.prototype,$="function"==typeof j&&!!E.f,W=n.QObject,q=!W||!W.prototype||!W.prototype.findChild,V=o&&u((function(){return 7!=P(A({},"a",{get:function(){return A(this,"a",{value:7}).a}})).a}))?function(e,t,r){var n=M(H,t)
-n&&delete H[t],A(e,t,r),n&&e!==H&&A(H,t,n)}:A,G=function(e){var t=U[e]=P(j.prototype)
-return t._k=e,t},K=$&&"symbol"==typeof j.iterator?function(e){return"symbol"==typeof e}:function(e){return e instanceof j},Y=function(e,t,r){return e===H&&Y(B,t,r),b(e),t=O(t,!0),b(r),i(U,t)?(r.enumerable?(i(e,N)&&e[N][t]&&(e[N][t]=!1),r=P(r,{enumerable:x(0,!1)})):(i(e,N)||A(e,N,x(1,{})),e[N][t]=!0),V(e,t,r)):A(e,t,r)},Q=function(e,t){b(e)
-for(var r,n=g(t=w(t)),i=0,o=n.length;o>i;)Y(e,r=n[i++],t[r])
-return e},J=function(e){var t=L.call(this,e=O(e,!0))
-return!(this===H&&i(U,e)&&!i(B,e))&&(!(t||!i(this,e)||!i(U,e)||i(this,N)&&this[N][e])||t)},X=function(e,t){if(e=w(e),t=O(t,!0),e!==H||!i(U,t)||i(B,t)){var r=M(e,t)
-return!r||!i(U,t)||i(e,N)&&e[N][t]||(r.enumerable=!0),r}},Z=function(e){for(var t,r=R(w(e)),n=[],o=0;r.length>o;)i(U,t=r[o++])||t==N||t==l||n.push(t)
-return n},ee=function(e){for(var t,r=e===H,n=R(r?B:w(e)),o=[],s=0;n.length>s;)!i(U,t=n[s++])||r&&!i(H,t)||o.push(U[t])
-return o}
-$||(j=function(){if(this instanceof j)throw TypeError("Symbol is not a constructor!")
-var e=h(arguments.length>0?arguments[0]:void 0),t=function(r){this===H&&t.call(B,r),i(this,N)&&i(this[N],e)&&(this[N][e]=!1),V(this,e,x(1,r))}
-return o&&q&&V(H,e,{configurable:!0,set:t}),G(e)},a(j.prototype,"toString",(function(){return this._k})),T.f=X,C.f=Y,e(101).f=S.f=Z,e(106).f=J,E.f=ee,o&&!e(87)&&a(H,"propertyIsEnumerable",J,!0),f.f=function(e){return G(p(e))}),s(s.G+s.W+s.F*!$,{Symbol:j})
-for(var te="hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","),re=0;te.length>re;)p(te[re++])
-for(var ne=k(p.store),ie=0;ne.length>ie;)m(ne[ie++])
-s(s.S+s.F*!$,"Symbol",{for:function(e){return i(z,e+="")?z[e]:z[e]=j(e)},keyFor:function(e){if(!K(e))throw TypeError(e+" is not a symbol!")
-for(var t in z)if(z[t]===e)return t},useSetter:function(){q=!0},useSimple:function(){q=!1}}),s(s.S+s.F*!$,"Object",{create:function(e,t){return void 0===t?P(e):Q(P(e),t)},defineProperty:Y,defineProperties:Q,getOwnPropertyDescriptor:X,getOwnPropertyNames:Z,getOwnPropertySymbols:ee})
-var oe=u((function(){E.f(1)}))
-s(s.S+s.F*oe,"Object",{getOwnPropertySymbols:function(e){return E.f(_(e))}}),I&&s(s.S+s.F*(!$||u((function(){var e=j()
-return"[null]"!=D([e])||"{}"!=D({a:e})||"{}"!=D(Object(e))}))),"JSON",{stringify:function(e){for(var t,r,n=[e],i=1;arguments.length>i;)n.push(arguments[i++])
-if(r=t=n[1],(y(t)||void 0!==e)&&!K(e))return v(t)||(t=function(e,t){if("function"==typeof r&&(t=r.call(this,e,t)),!K(t))return t}),n[1]=t,D.apply(I,n)}}),j.prototype[F]||e(70)(j.prototype,F,j.prototype.valueOf),d(j,"Symbol"),d(Math,"Math",!0),d(n.JSON,"JSON",!0)},{100:100,101:101,102:102,105:105,106:106,114:114,116:116,122:122,124:124,138:138,140:140,141:141,145:145,148:148,149:149,150:150,36:36,56:56,59:59,60:60,62:62,68:68,69:69,70:70,77:77,79:79,87:87,92:92,96:96,97:97,99:99}],277:[function(e,t,r){"use strict"
-var n=e(60),i=e(144),o=e(143),s=e(36),a=e(135),l=e(139),u=e(79),c=e(68).ArrayBuffer,d=e(125),h=o.ArrayBuffer,p=o.DataView,f=i.ABV&&c.isView,m=h.prototype.slice,g=i.VIEW,v="ArrayBuffer"
-n(n.G+n.W+n.F*(c!==h),{ArrayBuffer:h}),n(n.S+n.F*!i.CONSTR,v,{isView:function(e){return f&&f(e)||u(e)&&g in e}}),n(n.P+n.U+n.F*e(62)((function(){return!new h(2).slice(1,void 0).byteLength})),v,{slice:function(e,t){if(void 0!==m&&void 0===t)return m.call(s(this),e)
-for(var r=s(this).byteLength,n=a(e,r),i=a(void 0===t?r:t,r),o=new(d(this,h))(l(i-n)),u=new p(this),c=new p(o),f=0;n<i;)c.setUint8(f++,u.getUint8(n++))
-return o}}),e(121)(v)},{121:121,125:125,135:135,139:139,143:143,144:144,36:36,60:60,62:62,68:68,79:79}],278:[function(e,t,r){var n=e(60)
-n(n.G+n.W+n.F*!e(144).ABV,{DataView:e(143).DataView})},{143:143,144:144,60:60}],279:[function(e,t,r){e(142)("Float32",4,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],280:[function(e,t,r){e(142)("Float64",8,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],281:[function(e,t,r){e(142)("Int16",2,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],282:[function(e,t,r){e(142)("Int32",4,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],283:[function(e,t,r){e(142)("Int8",1,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],284:[function(e,t,r){e(142)("Uint16",2,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],285:[function(e,t,r){e(142)("Uint32",4,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],286:[function(e,t,r){e(142)("Uint8",1,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],287:[function(e,t,r){e(142)("Uint8",1,(function(e){return function(t,r,n){return e(this,t,r,n)}}),!0)},{142:142}],288:[function(e,t,r){"use strict"
-var n,i=e(68),o=e(40)(0),s=e(116),a=e(92),l=e(95),u=e(48),c=e(79),d=e(147),h=e(147),p=!i.ActiveXObject&&"ActiveXObject"in i,f="WeakMap",m=a.getWeak,g=Object.isExtensible,v=u.ufstore,b=function(e){return function(){return e(this,arguments.length>0?arguments[0]:void 0)}},y={get:function(e){if(c(e)){var t=m(e)
-return!0===t?v(d(this,f)).get(e):t?t[this._i]:void 0}},set:function(e,t){return u.def(d(this,f),e,t)}},_=t.exports=e(49)(f,b,y,u,!0,!0)
-h&&p&&(l((n=u.getConstructor(b,f)).prototype,y),a.NEED=!0,o(["delete","has","get","set"],(function(e){var t=_.prototype,r=t[e]
-s(t,e,(function(t,i){if(c(t)&&!g(t)){this._f||(this._f=new n)
-var o=this._f[e](t,i)
-return"set"==e?this:o}return r.call(this,t,i)}))})))},{116:116,147:147,40:40,48:48,49:49,68:68,79:79,92:92,95:95}],289:[function(e,t,r){"use strict"
-var n=e(48),i=e(147),o="WeakSet"
-e(49)(o,(function(e){return function(){return e(this,arguments.length>0?arguments[0]:void 0)}}),{add:function(e){return n.def(i(this,o),e,!0)}},n,!1,!0)},{147:147,48:48,49:49}],290:[function(e,t,r){"use strict"
-var n=e(60),i=e(65),o=e(140),s=e(139),a=e(31),l=e(43)
-n(n.P,"Array",{flatMap:function(e){var t,r,n=o(this)
-return a(e),t=s(n.length),r=l(n,0),i(r,n,n,t,0,1,e,arguments[1]),r}}),e(33)("flatMap")},{139:139,140:140,31:31,33:33,43:43,60:60,65:65}],291:[function(e,t,r){"use strict"
-var n=e(60),i=e(39)(!0)
-n(n.P,"Array",{includes:function(e){return i(this,e,arguments.length>1?arguments[1]:void 0)}}),e(33)("includes")},{33:33,39:39,60:60}],292:[function(e,t,r){var n=e(60),i=e(108)(!0)
-n(n.S,"Object",{entries:function(e){return i(e)}})},{108:108,60:60}],293:[function(e,t,r){var n=e(60),i=e(109),o=e(138),s=e(99),a=e(51)
-n(n.S,"Object",{getOwnPropertyDescriptors:function(e){for(var t,r,n=o(e),l=s.f,u=i(n),c={},d=0;u.length>d;)void 0!==(r=l(n,t=u[d++]))&&a(c,t,r)
-return c}})},{109:109,138:138,51:51,60:60,99:99}],294:[function(e,t,r){var n=e(60),i=e(108)(!1)
-n(n.S,"Object",{values:function(e){return i(e)}})},{108:108,60:60}],295:[function(e,t,r){"use strict"
-var n=e(60),i=e(50),o=e(68),s=e(125),a=e(113)
-n(n.P+n.R,"Promise",{finally:function(e){var t=s(this,i.Promise||o.Promise),r="function"==typeof e
-return this.then(r?function(r){return a(t,e()).then((function(){return r}))}:e,r?function(r){return a(t,e()).then((function(){throw r}))}:e)}})},{113:113,125:125,50:50,60:60,68:68}],296:[function(e,t,r){"use strict"
-var n=e(60),i=e(130),o=e(146),s=/Version\/10\.\d+(\.\d+)?( Mobile\/\w+)? Safari\//.test(o)
-n(n.P+n.F*s,"String",{padEnd:function(e){return i(this,e,arguments.length>1?arguments[1]:void 0,!1)}})},{130:130,146:146,60:60}],297:[function(e,t,r){"use strict"
-var n=e(60),i=e(130),o=e(146),s=/Version\/10\.\d+(\.\d+)?( Mobile\/\w+)? Safari\//.test(o)
-n(n.P+n.F*s,"String",{padStart:function(e){return i(this,e,arguments.length>1?arguments[1]:void 0,!0)}})},{130:130,146:146,60:60}],298:[function(e,t,r){"use strict"
-e(132)("trimLeft",(function(e){return function(){return e(this,1)}}),"trimStart")},{132:132}],299:[function(e,t,r){"use strict"
-e(132)("trimRight",(function(e){return function(){return e(this,2)}}),"trimEnd")},{132:132}],300:[function(e,t,r){e(148)("asyncIterator")},{148:148}],301:[function(e,t,r){for(var n=e(162),i=e(105),o=e(116),s=e(68),a=e(70),l=e(86),u=e(150),c=u("iterator"),d=u("toStringTag"),h=l.Array,p={CSSRuleList:!0,CSSStyleDeclaration:!1,CSSValueList:!1,ClientRectList:!1,DOMRectList:!1,DOMStringList:!1,DOMTokenList:!0,DataTransferItemList:!1,FileList:!1,HTMLAllCollection:!1,HTMLCollection:!1,HTMLFormElement:!1,HTMLSelectElement:!1,MediaList:!0,MimeTypeArray:!1,NamedNodeMap:!1,NodeList:!0,PaintRequestList:!1,Plugin:!1,PluginArray:!1,SVGLengthList:!1,SVGNumberList:!1,SVGPathSegList:!1,SVGPointList:!1,SVGStringList:!1,SVGTransformList:!1,SourceBufferList:!1,StyleSheetList:!0,TextTrackCueList:!1,TextTrackList:!1,TouchList:!1},f=i(p),m=0;m<f.length;m++){var g,v=f[m],b=p[v],y=s[v],_=y&&y.prototype
-if(_&&(_[c]||a(_,c,h),_[d]||a(_,d,v),l[v]=h,b))for(g in n)_[g]||o(_,g,n[g],!0)}},{105:105,116:116,150:150,162:162,68:68,70:70,86:86}],302:[function(e,t,r){var n=e(60),i=e(134)
-n(n.G+n.B,{setImmediate:i.set,clearImmediate:i.clear})},{134:134,60:60}],303:[function(e,t,r){var n=e(68),i=e(60),o=e(146),s=[].slice,a=/MSIE .\./.test(o),l=function(e){return function(t,r){var n=arguments.length>2,i=!!n&&s.call(arguments,2)
-return e(n?function(){("function"==typeof t?t:Function(t)).apply(this,i)}:t,r)}}
-i(i.G+i.B+i.F*a,{setTimeout:l(n.setTimeout),setInterval:l(n.setInterval)})},{146:146,60:60,68:68}],304:[function(e,t,r){e(303),e(302),e(301),t.exports=e(50)},{301:301,302:302,303:303,50:50}],305:[function(e,t,r){var n=function(e){"use strict"
-var t,r=Object.prototype,n=r.hasOwnProperty,i="function"==typeof Symbol?Symbol:{},o=i.iterator||"@@iterator",s=i.asyncIterator||"@@asyncIterator",a=i.toStringTag||"@@toStringTag"
-function l(e,t,r,n){var i=t&&t.prototype instanceof m?t:m,o=Object.create(i.prototype),s=new E(n||[])
-return o._invoke=function(e,t,r){var n=c
-return function(i,o){if(n===h)throw new Error("Generator is already running")
-if(n===p){if("throw"===i)throw o
-return k()}for(r.method=i,r.arg=o;;){var s=r.delegate
-if(s){var a=P(s,r)
-if(a){if(a===f)continue
-return a}}if("next"===r.method)r.sent=r._sent=r.arg
-else if("throw"===r.method){if(n===c)throw n=p,r.arg
-r.dispatchException(r.arg)}else"return"===r.method&&r.abrupt("return",r.arg)
-n=h
-var l=u(e,t,r)
-if("normal"===l.type){if(n=r.done?p:d,l.arg===f)continue
-return{value:l.arg,done:r.done}}"throw"===l.type&&(n=p,r.method="throw",r.arg=l.arg)}}}(e,r,s),o}function u(e,t,r){try{return{type:"normal",arg:e.call(t,r)}}catch(n){return{type:"throw",arg:n}}}e.wrap=l
-var c="suspendedStart",d="suspendedYield",h="executing",p="completed",f={}
-function m(){}function g(){}function v(){}var b={}
-b[o]=function(){return this}
-var y=Object.getPrototypeOf,_=y&&y(y(C([])))
-_&&_!==r&&n.call(_,o)&&(b=_)
-var w=v.prototype=m.prototype=Object.create(b)
-function O(e){["next","throw","return"].forEach((function(t){e[t]=function(e){return this._invoke(t,e)}}))}function x(e,t){function r(i,o,s,a){var l=u(e[i],e,o)
-if("throw"!==l.type){var c=l.arg,d=c.value
-return d&&"object"==typeof d&&n.call(d,"__await")?t.resolve(d.__await).then((function(e){r("next",e,s,a)}),(function(e){r("throw",e,s,a)})):t.resolve(d).then((function(e){c.value=e,s(c)}),(function(e){return r("throw",e,s,a)}))}a(l.arg)}var i
-this._invoke=function(e,n){function o(){return new t((function(t,i){r(e,n,t,i)}))}return i=i?i.then(o,o):o()}}function P(e,r){var n=e.iterator[r.method]
-if(n===t){if(r.delegate=null,"throw"===r.method){if(e.iterator.return&&(r.method="return",r.arg=t,P(e,r),"throw"===r.method))return f
-r.method="throw",r.arg=new TypeError("The iterator does not provide a 'throw' method")}return f}var i=u(n,e.iterator,r.arg)
-if("throw"===i.type)return r.method="throw",r.arg=i.arg,r.delegate=null,f
-var o=i.arg
-return o?o.done?(r[e.resultName]=o.value,r.next=e.nextLoc,"return"!==r.method&&(r.method="next",r.arg=t),r.delegate=null,f):o:(r.method="throw",r.arg=new TypeError("iterator result is not an object"),r.delegate=null,f)}function S(e){var t={tryLoc:e[0]}
-1 in e&&(t.catchLoc=e[1]),2 in e&&(t.finallyLoc=e[2],t.afterLoc=e[3]),this.tryEntries.push(t)}function T(e){var t=e.completion||{}
-t.type="normal",delete t.arg,e.completion=t}function E(e){this.tryEntries=[{tryLoc:"root"}],e.forEach(S,this),this.reset(!0)}function C(e){if(e){var r=e[o]
-if(r)return r.call(e)
-if("function"==typeof e.next)return e
-if(!isNaN(e.length)){var i=-1,s=function r(){for(;++i<e.length;)if(n.call(e,i))return r.value=e[i],r.done=!1,r
-return r.value=t,r.done=!0,r}
-return s.next=s}}return{next:k}}function k(){return{value:t,done:!0}}return g.prototype=w.constructor=v,v.constructor=g,v[a]=g.displayName="GeneratorFunction",e.isGeneratorFunction=function(e){var t="function"==typeof e&&e.constructor
-return!!t&&(t===g||"GeneratorFunction"===(t.displayName||t.name))},e.mark=function(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,v):(e.__proto__=v,a in e||(e[a]="GeneratorFunction")),e.prototype=Object.create(w),e},e.awrap=function(e){return{__await:e}},O(x.prototype),x.prototype[s]=function(){return this},e.AsyncIterator=x,e.async=function(t,r,n,i,o){void 0===o&&(o=Promise)
-var s=new x(l(t,r,n,i),o)
-return e.isGeneratorFunction(r)?s:s.next().then((function(e){return e.done?e.value:s.next()}))},O(w),w[a]="Generator",w[o]=function(){return this},w.toString=function(){return"[object Generator]"},e.keys=function(e){var t=[]
-for(var r in e)t.push(r)
-return t.reverse(),function r(){for(;t.length;){var n=t.pop()
-if(n in e)return r.value=n,r.done=!1,r}return r.done=!0,r}},e.values=C,E.prototype={constructor:E,reset:function(e){if(this.prev=0,this.next=0,this.sent=this._sent=t,this.done=!1,this.delegate=null,this.method="next",this.arg=t,this.tryEntries.forEach(T),!e)for(var r in this)"t"===r.charAt(0)&&n.call(this,r)&&!isNaN(+r.slice(1))&&(this[r]=t)},stop:function(){this.done=!0
-var e=this.tryEntries[0].completion
-if("throw"===e.type)throw e.arg
-return this.rval},dispatchException:function(e){if(this.done)throw e
-var r=this
-function i(n,i){return a.type="throw",a.arg=e,r.next=n,i&&(r.method="next",r.arg=t),!!i}for(var o=this.tryEntries.length-1;o>=0;--o){var s=this.tryEntries[o],a=s.completion
-if("root"===s.tryLoc)return i("end")
-if(s.tryLoc<=this.prev){var l=n.call(s,"catchLoc"),u=n.call(s,"finallyLoc")
-if(l&&u){if(this.prev<s.catchLoc)return i(s.catchLoc,!0)
-if(this.prev<s.finallyLoc)return i(s.finallyLoc)}else if(l){if(this.prev<s.catchLoc)return i(s.catchLoc,!0)}else{if(!u)throw new Error("try statement without catch or finally")
-if(this.prev<s.finallyLoc)return i(s.finallyLoc)}}}},abrupt:function(e,t){for(var r=this.tryEntries.length-1;r>=0;--r){var i=this.tryEntries[r]
-if(i.tryLoc<=this.prev&&n.call(i,"finallyLoc")&&this.prev<i.finallyLoc){var o=i
-break}}o&&("break"===e||"continue"===e)&&o.tryLoc<=t&&t<=o.finallyLoc&&(o=null)
-var s=o?o.completion:{}
-return s.type=e,s.arg=t,o?(this.method="next",this.next=o.finallyLoc,f):this.complete(s)},complete:function(e,t){if("throw"===e.type)throw e.arg
-return"break"===e.type||"continue"===e.type?this.next=e.arg:"return"===e.type?(this.rval=this.arg=e.arg,this.method="return",this.next="end"):"normal"===e.type&&t&&(this.next=t),f},finish:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var r=this.tryEntries[t]
-if(r.finallyLoc===e)return this.complete(r.completion,r.afterLoc),T(r),f}},catch:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var r=this.tryEntries[t]
-if(r.tryLoc===e){var n=r.completion
-if("throw"===n.type){var i=n.arg
-T(r)}return i}}throw new Error("illegal catch attempt")},delegateYield:function(e,r,n){return this.delegate={iterator:C(e),resultName:r,nextLoc:n},"next"===this.method&&(this.arg=t),f}},e}("object"==typeof t?t.exports:{})
-try{regeneratorRuntime=n}catch(i){Function("r","regeneratorRuntime = r")(n)}},{}],306:[function(e,t,r){"use strict"
-e(307)
-var n,i=(n=e(13))&&n.__esModule?n:{default:n}
-i.default._babelPolyfill&&"undefined"!=typeof console&&console.warn&&console.warn("@babel/polyfill is loaded more than once on this page. This is probably not desirable/intended and may have consequences if different versions of the polyfills are applied sequentially. If you do need to load the polyfill more than once, use @babel/polyfill/noConflict instead to bypass the warning."),i.default._babelPolyfill=!0},{13:13,307:307}],307:[function(e,t,r){"use strict"
-e(1),e(3),e(2),e(9),e(8),e(11),e(10),e(12),e(5),e(6),e(4),e(7),e(304),e(305)},{1:1,10:10,11:11,12:12,2:2,3:3,304:304,305:305,4:4,5:5,6:6,7:7,8:8,9:9}]},{},[306]),function(){
-/*!
- * @overview  Ember - JavaScript Application Framework
- * @copyright Copyright 2011-2021 Tilde Inc. and contributors
- *            Portions Copyright 2006-2011 Strobe Inc.
- *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
- * @license   Licensed under MIT license
- *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   3.27.5
- */
-var e,t;(function(){var r="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:"undefined"!=typeof window?window:"undefined"!=typeof global?global:null
-if(null===r)throw new Error("unable to locate global object")
-if("function"==typeof r.define&&"function"==typeof r.require)return e=r.define,void(t=r.require)
-var n=Object.create(null),i=Object.create(null)
-function o(e,r){var o=e,s=n[o]
-s||(s=n[o+="/index"])
-var a=i[o]
-if(void 0!==a)return a
-a=i[o]={},s||function(e,t){throw t?new Error("Could not find module "+e+" required by: "+t):new Error("Could not find module "+e)}(e,r)
-for(var l=s.deps,u=s.callback,c=new Array(l.length),d=0;d<l.length;d++)"exports"===l[d]?c[d]=a:"require"===l[d]?c[d]=t:c[d]=t(l[d],o)
-return u.apply(this,c),a}e=function(e,t,r){n[e]={deps:t,callback:r}},(t=function(e){return o(e,null)}).default=t,t.has=function(e){return Boolean(n[e])||Boolean(n[e+"/index"])},t._eak_seen=t.entries=n})(),e("@ember/-internals/bootstrap/index",["@ember/-internals/environment","@ember/-internals/overrides","@ember/debug","require"],(function(e,t,r,n){"use strict";(function(){var t,r=()=>(t||(t=(0,n.default)("ember").default),t)
-function i(t){Object.defineProperty(e.context.exports,t,{enumerable:!0,configurable:!0,get:r})}i("Ember"),i("Em"),"object"==typeof module&&"function"==typeof module.require&&(module.exports=t=(0,n.default)("ember").default)})()})),e("@ember/-internals/browser-environment/index",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.hasDOM=e.isIE=e.isFirefox=e.isChrome=e.userAgent=e.history=e.location=e.window=void 0
-var t="object"==typeof self&&null!==self&&self.Object===Object&&"undefined"!=typeof Window&&self.constructor===Window&&"object"==typeof document&&null!==document&&self.document===document&&"object"==typeof location&&null!==location&&self.location===location&&"object"==typeof history&&null!==history&&self.history===history&&"object"==typeof navigator&&null!==navigator&&self.navigator===navigator&&"string"==typeof navigator.userAgent
-e.hasDOM=t
-var r=t?self:null
-e.window=r
-var n=t?self.location:null
-e.location=n
-var i=t?self.history:null
-e.history=i
-var o=t?self.navigator.userAgent:"Lynx (textmode)"
-e.userAgent=o
-var s=!!t&&("object"==typeof chrome&&!("object"==typeof opera))
-e.isChrome=s
-var a=!!t&&"undefined"!=typeof InstallTrigger
-e.isFirefox=a
-var l=!!t&&("undefined"!=typeof MSInputMethodContext&&"undefined"!=typeof documentMode)
-e.isIE=l})),e("@ember/-internals/console/index",["exports","@ember/debug","@ember/deprecated-features"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n
-r.LOGGER&&(n={log(){return console.log(...arguments)},warn(){return console.warn(...arguments)},error(){return console.error(...arguments)},info(){return console.info(...arguments)},debug(){return console.debug?console.debug(...arguments):console.info(...arguments)},assert(){return console.assert(...arguments)}})
-var i=n
-e.default=i})),e("@ember/-internals/container/index",["exports","@ember/-internals/owner","@ember/-internals/utils","@ember/debug","@ember/polyfills"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.privatize=function(e){var[t]=e,n=y[t]
-if(n)return n
-var[i,o]=t.split(":")
-return y[t]=(0,r.intern)(`${i}:${o}-${_}`)},e.getFactoryFor=function(e){return e[f]},e.setFactoryFor=m,e.INIT_FACTORY=e.Container=e.Registry=void 0
-class o{constructor(e,t){void 0===t&&(t={}),this.registry=e,this.owner=t.owner||null,this.cache=(0,r.dictionary)(t.cache||null),this.factoryManagerCache=(0,r.dictionary)(t.factoryManagerCache||null),this.isDestroyed=!1,this.isDestroying=!1}lookup(e,t){if(this.isDestroyed)throw new Error("Can not call `.lookup` after the owner has been destroyed")
-return l(this,this.registry.normalize(e),t)}destroy(){this.isDestroying=!0,h(this)}finalizeDestroy(){p(this),this.isDestroyed=!0}reset(e){this.isDestroyed||(void 0===e?(h(this),p(this)):function(e,t){var r=e.cache[t]
-delete e.factoryManagerCache[t],r&&(delete e.cache[t],r.destroy&&r.destroy())}(this,this.registry.normalize(e)))}ownerInjection(){var e={}
-return(0,t.setOwner)(e,this.owner),e}factoryFor(e){if(this.isDestroyed)throw new Error("Can not call `.factoryFor` after the owner has been destroyed")
-var t=this.registry.normalize(e)
-return u(this,t,e)}}function s(e,t){return!1!==e.registry.getOption(t,"singleton")}function a(e,t){return!1!==e.registry.getOption(t,"instantiate")}function l(e,t,r){void 0===r&&(r={})
-var n=t
-if(!1!==r.singleton){var i=e.cache[n]
-if(void 0!==i)return i}return function(e,t,r,n){var i=u(e,t,r)
-if(void 0===i)return
-if(function(e,t,r){var{instantiate:n,singleton:i}=r
-return!1!==i&&!1!==n&&s(e,t)&&a(e,t)}(e,r,n)){var o=e.cache[t]=i.create()
-return e.isDestroying&&"function"==typeof o.destroy&&o.destroy(),o}if(function(e,t,r){var{instantiate:n,singleton:i}=r
-return!1!==n&&(!1!==i||s(e,t))&&a(e,t)}(e,r,n))return i.create()
-if(function(e,t,r){var{instantiate:n,singleton:i}=r
-return!1!==i&&!n&&s(e,t)&&!a(e,t)}(e,r,n)||function(e,t,r){var{instantiate:n,singleton:i}=r
-return!(!1!==n||!1!==i&&s(e,t)||a(e,t))}(e,r,n))return i.class
-throw new Error("Could not create factory")}(e,n,t,r)}function u(e,t,r){var n=e.factoryManagerCache[t]
-if(void 0!==n)return n
-var i=e.registry.resolve(t)
-if(void 0!==i){0
-var o=new g(e,i,r,t)
-return e.factoryManagerCache[t]=o,o}}function c(e,t,r){for(var n=r.injections,i=0;i<t.length;i++){var{property:o,specifier:a}=t[i]
-n[o]=l(e,a),r.isDynamic||(r.isDynamic=!s(e,a))}}function d(e,r){var n=e.registry,[i]=r.split(":")
-return function(e,r,n){var i={};(0,t.setOwner)(i,e.owner)
-var o={injections:i,isDynamic:!1}
-return void 0!==r&&c(e,r,o),void 0!==n&&c(e,n,o),o}(e,n.getTypeInjections(i),n.getInjections(r))}function h(e){for(var t=e.cache,r=Object.keys(t),n=0;n<r.length;n++){var i=t[r[n]]
-i.destroy&&i.destroy()}}function p(e){e.cache=(0,r.dictionary)(null),e.factoryManagerCache=(0,r.dictionary)(null)}e.Container=o
-var f=(0,r.symbol)("INIT_FACTORY")
-function m(e,t){e[f]=t}e.INIT_FACTORY=f
-class g{constructor(e,t,n,i){this.container=e,this.owner=e.owner,this.class=t,this.fullName=n,this.normalizedName=i,this.madeToString=void 0,this.injections=void 0,m(this,this),t&&(r.HAS_NATIVE_SYMBOL||f in t)&&m(t,this)}toString(){return void 0===this.madeToString&&(this.madeToString=this.container.registry.makeToString(this.class,this.fullName)),this.madeToString}create(e){var{container:t}=this
-if(t.isDestroyed)throw new Error(`Can not create new instances after the owner has been destroyed (you attempted to create ${this.fullName})`)
-var r=this.injections
-if(void 0===r){var{injections:n,isDynamic:o}=d(this.container,this.normalizedName)
-m(n,this),r=n,o||(this.injections=n)}return void 0!==e&&(r=(0,i.assign)({},r,e)),this.class.create(r)}}var v=/^[^:]+:[^:]+$/
-class b{constructor(e){void 0===e&&(e={}),this.fallback=e.fallback||null,this.resolver=e.resolver||null,this.registrations=(0,r.dictionary)(e.registrations||null),this._typeInjections=(0,r.dictionary)(null),this._injections=(0,r.dictionary)(null),this._localLookupCache=Object.create(null),this._normalizeCache=(0,r.dictionary)(null),this._resolveCache=(0,r.dictionary)(null),this._failSet=new Set,this._options=(0,r.dictionary)(null),this._typeOptions=(0,r.dictionary)(null)}container(e){return new o(this,e)}register(e,t,r){void 0===r&&(r={})
-var n=this.normalize(e)
-this._failSet.delete(n),this.registrations[n]=t,this._options[n]=r}unregister(e){var t=this.normalize(e)
-this._localLookupCache=Object.create(null),delete this.registrations[t],delete this._resolveCache[t],delete this._options[t],this._failSet.delete(t)}resolve(e){var t=function(e,t){var r,n=t,i=e._resolveCache[n]
-if(void 0!==i)return i
-if(e._failSet.has(n))return
-e.resolver&&(r=e.resolver.resolve(n))
-void 0===r&&(r=e.registrations[n])
-void 0===r?e._failSet.add(n):e._resolveCache[n]=r
-return r}(this,this.normalize(e))
-return void 0===t&&null!==this.fallback&&(t=this.fallback.resolve(...arguments)),t}describe(e){return null!==this.resolver&&this.resolver.lookupDescription?this.resolver.lookupDescription(e):null!==this.fallback?this.fallback.describe(e):e}normalizeFullName(e){return null!==this.resolver&&this.resolver.normalize?this.resolver.normalize(e):null!==this.fallback?this.fallback.normalizeFullName(e):e}normalize(e){return this._normalizeCache[e]||(this._normalizeCache[e]=this.normalizeFullName(e))}makeToString(e,t){var r
-return null!==this.resolver&&this.resolver.makeToString?this.resolver.makeToString(e,t):null!==this.fallback?this.fallback.makeToString(e,t):"string"==typeof e?e:null!==(r=e.name)&&void 0!==r?r:"(unknown class)"}has(e){return!!this.isValidFullName(e)&&function(e,t){return void 0!==e.resolve(t)}(this,this.normalize(e))}optionsForType(e,t){this._typeOptions[e]=t}getOptionsForType(e){var t=this._typeOptions[e]
-return void 0===t&&null!==this.fallback&&(t=this.fallback.getOptionsForType(e)),t}options(e,t){var r=this.normalize(e)
-this._options[r]=t}getOptions(e){var t=this.normalize(e),r=this._options[t]
-return void 0===r&&null!==this.fallback&&(r=this.fallback.getOptions(e)),r}getOption(e,t){var r=this._options[e]
-if(void 0!==r&&void 0!==r[t])return r[t]
-var n=e.split(":")[0]
-return(r=this._typeOptions[n])&&void 0!==r[t]?r[t]:null!==this.fallback?this.fallback.getOption(e,t):void 0}typeInjection(e,t,r){r.split(":")[0];(this._typeInjections[e]||(this._typeInjections[e]=[])).push({property:t,specifier:r})}injection(e,t,r){var n=this.normalize(r)
-if(-1===e.indexOf(":"))return this.typeInjection(e,t,n)
-var i=this.normalize(e);(this._injections[i]||(this._injections[i]=[])).push({property:t,specifier:n})}knownForType(e){for(var t,n,o=(0,r.dictionary)(null),s=Object.keys(this.registrations),a=0;a<s.length;a++){var l=s[a]
-l.split(":")[0]===e&&(o[l]=!0)}return null!==this.fallback&&(t=this.fallback.knownForType(e)),null!==this.resolver&&this.resolver.knownForType&&(n=this.resolver.knownForType(e)),(0,i.assign)({},t,o,n)}isValidFullName(e){return v.test(e)}getInjections(e){var t=this._injections[e]
-if(null!==this.fallback){var r=this.fallback.getInjections(e)
-void 0!==r&&(t=void 0===t?r:t.concat(r))}return t}getTypeInjections(e){var t=this._typeInjections[e]
-if(null!==this.fallback){var r=this.fallback.getTypeInjections(e)
-void 0!==r&&(t=void 0===t?r:t.concat(r))}return t}}e.Registry=b
-var y=(0,r.dictionary)(null),_=`${Math.random()}${Date.now()}`.replace(".","")})),e("@ember/-internals/environment/index",["exports","@ember/deprecated-features"],(function(e,t){"use strict"
-function r(e){return e&&e.Object===Object?e:void 0}Object.defineProperty(e,"__esModule",{value:!0}),e.getLookup=function(){return o.lookup},e.setLookup=function(e){o.lookup=e},e.getENV=function(){return s},e.ENV=e.context=e.global=void 0
-var n,i=r((n="object"==typeof global&&global)&&void 0===n.nodeType?n:void 0)||r("object"==typeof self&&self)||r("object"==typeof window&&window)||"undefined"!=typeof mainContext&&mainContext||new Function("return this")()
-e.global=i
-var o=function(e,t){return void 0===t?{imports:e,exports:e,lookup:e}:{imports:t.imports||e,exports:t.exports||e,lookup:t.lookup||e}}(i,i.Ember)
-e.context=o
-var s={ENABLE_OPTIONAL_FEATURES:!1,EXTEND_PROTOTYPES:{Array:!0,Function:!0,String:!0},LOG_STACKTRACE_ON_DEPRECATION:!0,LOG_VERSION:!0,RAISE_ON_DEPRECATION:!1,STRUCTURED_PROFILE:!1,_APPLICATION_TEMPLATE_WRAPPER:!0,_TEMPLATE_ONLY_GLIMMER_COMPONENTS:!1,_DEBUG_RENDER_TREE:!1,_JQUERY_INTEGRATION:!0,_DEFAULT_ASYNC_OBSERVERS:!1,_RERENDER_LOOP_LIMIT:1e3,_DISABLE_PROPERTY_FALLBACK_DEPRECATION:!1,EMBER_LOAD_HOOKS:{},FEATURES:{}}
-e.ENV=s,(e=>{if("object"==typeof e&&null!==e){for(var r in e)if(Object.prototype.hasOwnProperty.call(e,r)&&"EXTEND_PROTOTYPES"!==r&&"EMBER_LOAD_HOOKS"!==r){var n=s[r]
-!0===n?s[r]=!1!==e[r]:!1===n&&(s[r]=!0===e[r])}var{EXTEND_PROTOTYPES:i}=e
-if(void 0!==i)if("object"==typeof i&&null!==i)s.EXTEND_PROTOTYPES.String=!1!==i.String,t.FUNCTION_PROTOTYPE_EXTENSIONS&&(s.EXTEND_PROTOTYPES.Function=!1!==i.Function),s.EXTEND_PROTOTYPES.Array=!1!==i.Array
-else{var o=!1!==i
-s.EXTEND_PROTOTYPES.String=o,t.FUNCTION_PROTOTYPE_EXTENSIONS&&(s.EXTEND_PROTOTYPES.Function=o),s.EXTEND_PROTOTYPES.Array=o}var{EMBER_LOAD_HOOKS:a}=e
-if("object"==typeof a&&null!==a)for(var l in a)if(Object.prototype.hasOwnProperty.call(a,l)){var u=a[l]
-Array.isArray(u)&&(s.EMBER_LOAD_HOOKS[l]=u.filter((e=>"function"==typeof e)))}var{FEATURES:c}=e
-if("object"==typeof c&&null!==c)for(var d in c)Object.prototype.hasOwnProperty.call(c,d)&&(s.FEATURES[d]=!0===c[d])
-0}})(i.EmberENV)})),e("@ember/-internals/error-handling/index",["exports"],(function(e){"use strict"
-var t
-Object.defineProperty(e,"__esModule",{value:!0}),e.getOnerror=function(){return t},e.setOnerror=function(e){t=e},e.getDispatchOverride=function(){return r},e.setDispatchOverride=function(e){r=e},e.onErrorTarget=void 0
-var r,n={get onerror(){return t}}
-e.onErrorTarget=n})),e("@ember/-internals/extension-support/index",["exports","@ember/-internals/extension-support/lib/data_adapter","@ember/-internals/extension-support/lib/container_debug_adapter"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"DataAdapter",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"ContainerDebugAdapter",{enumerable:!0,get:function(){return r.default}})})),e("@ember/-internals/extension-support/lib/container_debug_adapter",["exports","@ember/string","@ember/-internals/runtime"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=r.Object.extend({resolver:null,canCatalogEntriesByType:e=>"model"!==e&&"template"!==e,catalogEntriesByType(e){var n=(0,r.A)(r.Namespace.NAMESPACES),i=(0,r.A)(),o=new RegExp(`${(0,t.classify)(e)}$`)
-return n.forEach((e=>{for(var n in e)if(Object.prototype.hasOwnProperty.call(e,n)&&o.test(n)){var s=e[n]
-"class"===(0,r.typeOf)(s)&&i.push((0,t.dasherize)(n.replace(o,"")))}})),i}})
-e.default=n})),e("@ember/-internals/extension-support/lib/data_adapter",["exports","@ember/-internals/owner","@ember/runloop","@ember/-internals/metal","@ember/string","@ember/-internals/utils","@ember/-internals/runtime","@glimmer/validator"],(function(e,t,r,n,i,o,s,a){"use strict"
-function l(e,t){if(o.HAS_NATIVE_SYMBOL&&Symbol.iterator in e)for(var r of e)t(r)
-else e.forEach(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class u{getCacheForItem(e){var t=this.recordCaches.get(e)
-if(!t){var r=!1
-t=(0,a.createCache)((()=>{r?this.updated.push(this.wrapRecord(e)):(this.added.push(this.wrapRecord(e)),r=!0)})),this.recordCaches.set(e,t)}return t}constructor(e,t,r,n,i,o){this.recordCaches=new Map,this.added=[],this.updated=[],this.removed=[],this.release=o,this.wrapRecord=i,this.recordArrayCache=(0,a.createCache)((()=>{var o=new Set;(0,a.consumeTag)((0,a.tagFor)(e,"[]")),l(e,(e=>{(0,a.getValue)(this.getCacheForItem(e)),o.add(e)})),(0,a.untrack)((()=>{this.recordCaches.forEach(((e,t)=>{o.has(t)||(this.removed.push(i(t)),this.recordCaches.delete(t))}))})),this.added.length>0&&(t(this.added),this.added=[]),this.updated.length>0&&(r(this.updated),this.updated=[]),this.removed.length>0&&(n(this.removed),this.removed=[])}))}revalidate(){(0,a.getValue)(this.recordArrayCache)}}class c{constructor(e,t,r){var n=!1
-this.cache=(0,a.createCache)((()=>{l(e,(()=>{})),(0,a.consumeTag)((0,a.tagFor)(e,"[]")),!0===n?t():n=!0})),this.release=r}revalidate(){(0,a.getValue)(this.cache)}}var d=s.Object.extend({init(){this._super(...arguments),this.containerDebugAdapter=(0,t.getOwner)(this).lookup("container-debug-adapter:main"),this.releaseMethods=(0,s.A)(),this.recordsWatchers=new Map,this.typeWatchers=new Map,this.flushWatchers=null},attributeLimit:3,acceptsModelName:!0,getFilters:()=>(0,s.A)(),watchModelTypes(e,t){var r=this.getModelTypes(),n=(0,s.A)()
-e(r.map((e=>{var r=e.klass,i=this.wrapModelType(r,e.name)
-return n.push(this.observeModelType(e.name,t)),i})))
-var i=()=>{n.forEach((e=>e())),this.releaseMethods.removeObject(i)}
-return this.releaseMethods.pushObject(i),i},_nameToClass(e){if("string"==typeof e){var r=(0,t.getOwner)(this).factoryFor(`model:${e}`)
-e=r&&r.class}return e},watchRecords(e,t,r,n){var i=this._nameToClass(e),o=this.getRecords(i,e),{recordsWatchers:s}=this,a=s.get(o)
-return a||(a=new u(o,t,r,n,(e=>this.wrapRecord(e)),(()=>{s.delete(o),this.updateFlushWatchers()})),s.set(o,a),this.updateFlushWatchers(),a.revalidate()),a.release},updateFlushWatchers(){null===this.flushWatchers?(this.typeWatchers.size>0||this.recordsWatchers.size>0)&&(this.flushWatchers=()=>{this.typeWatchers.forEach((e=>e.revalidate())),this.recordsWatchers.forEach((e=>e.revalidate()))},r._backburner.on("end",this.flushWatchers)):0===this.typeWatchers.size&&0===this.recordsWatchers.size&&(r._backburner.off("end",this.flushWatchers),this.flushWatchers=null)},willDestroy(){this._super(...arguments),this.typeWatchers.forEach((e=>e.release())),this.recordsWatchers.forEach((e=>e.release())),this.releaseMethods.forEach((e=>e())),this.flushWatchers&&r._backburner.off("end",this.flushWatchers)},detect:()=>!1,columnsForType:()=>(0,s.A)(),observeModelType(e,t){var r=this._nameToClass(e),n=this.getRecords(r,e),{typeWatchers:i}=this,o=i.get(n)
-return o||(o=new c(n,(()=>{t([this.wrapModelType(r,e)])}),(()=>{i.delete(n),this.updateFlushWatchers()})),i.set(n,o),this.updateFlushWatchers(),o.revalidate()),o.release},wrapModelType(e,t){var r=this.getRecords(e,t)
-return{name:t,count:(0,n.get)(r,"length"),columns:this.columnsForType(e),object:e}},getModelTypes(){var e,t=this.get("containerDebugAdapter")
-return e=t.canCatalogEntriesByType("model")?t.catalogEntriesByType("model"):this._getObjectsOnNamespaces(),e=(0,s.A)(e).map((e=>({klass:this._nameToClass(e),name:e}))),e=(0,s.A)(e).filter((e=>this.detect(e.klass))),(0,s.A)(e)},_getObjectsOnNamespaces(){var e=(0,s.A)(s.Namespace.NAMESPACES),t=(0,s.A)()
-return e.forEach((e=>{for(var r in e)if(Object.prototype.hasOwnProperty.call(e,r)&&this.detect(e[r])){var n=(0,i.dasherize)(r)
-t.push(n)}})),t},getRecords:()=>(0,s.A)(),wrapRecord(e){var t={object:e}
-return t.columnValues=this.getRecordColumnValues(e),t.searchKeywords=this.getRecordKeywords(e),t.filterValues=this.getRecordFilterValues(e),t.color=this.getRecordColor(e),t},getRecordColumnValues:()=>({}),getRecordKeywords:()=>(0,s.A)(),getRecordFilterValues:()=>({}),getRecordColor:()=>null})
-e.default=d})),e("@ember/-internals/glimmer/index",["exports","@ember/polyfills","@glimmer/opcode-compiler","@ember/-internals/metal","@ember/debug","@ember/deprecated-features","@ember/string","@glimmer/reference","@glimmer/validator","@ember/-internals/views","@glimmer/destroyable","@glimmer/manager","@ember/-internals/utils","@ember/instrumentation","@ember/runloop","@glimmer/util","@ember/-internals/owner","@glimmer/runtime","@ember/-internals/runtime","@ember/-internals/browser-environment","@ember/engine","@ember/service","@ember/object","@ember/-internals/environment","@ember/-internals/container","@glimmer/node","@ember/-internals/glimmer","@glimmer/global-context","@ember/-internals/routing","@ember/error","@glimmer/program","rsvp"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p,f,m,g,v,b,y,_,w,O,x,P,S,T,E,C,k,M,A){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.helper=xt,e.escapeExpression=function(e){if("string"!=typeof e){if(e&&e.toHTML)return e.toHTML()
-if(null==e)return""
-if(!e)return String(e)
-e=String(e)}if(!N.test(e))return e
-return e.replace(F,L)},e.htmlSafe=z,e.isHTMLSafe=U,e._resetRenderers=function(){wr.length=0},e.renderSettled=function(){null===Pr&&(Pr=A.default.defer(),(0,f._getCurrentRunLoop)()||f._backburner.schedule("actions",null,xr))
-return Pr.promise},e.getTemplate=function(e){if(Object.prototype.hasOwnProperty.call(Er,e))return Er[e]},e.setTemplate=function(e,t){return Er[e]=t},e.hasTemplate=function(e){return Object.prototype.hasOwnProperty.call(Er,e)},e.getTemplates=function(){return Er},e.setTemplates=function(e){Er=e},e.setupEngineRegistry=function(e){e.optionsForType("template",{instantiate:!1}),e.register("view:-outlet",tn),e.register("template:-outlet",Xr),e.injection("view:-outlet","template","template:-outlet"),e.optionsForType("helper",{instantiate:!1}),e.register("helper:loc",Jr),e.register("component:-text-field",Se),e.register("component:-checkbox",xe),e.register("component:input",dt),e.register("component:link-to",Qr),e.register("component:-link-to",Me),e.register("component:-textarea",Te),e.register("component:textarea",mt),x.ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS||e.register(P.privatize`component:-default`,we)},e.setupApplicationRegistry=function(e){e.injection("renderer","env","-environment:main"),e.register("service:-dom-builder",{create(e){var{bootOptions:t}=e,{_renderMode:r}=t
-switch(r){case"serialize":return S.serializeBuilder.bind(null)
-case"rehydrate":return v.rehydrationBuilder.bind(null)
-default:return v.clientBuilder.bind(null)}}}),e.injection("service:-dom-builder","bootOptions","-environment:main"),e.injection("renderer","builder","service:-dom-builder"),e.register(P.privatize`template:-root`,R),e.injection("renderer","rootTemplate",P.privatize`template:-root`),e.register("renderer:-dom",Tr),e.injection("renderer","document","service:-document")},e.setComponentManager=function(e,t){var r
-r=o.COMPONENT_MANAGER_STRING_LOOKUP&&"string"==typeof e?function(t){return t.lookup(`component-manager:${e}`)}:e
-return(0,d.setComponentManager)(r,t)},Object.defineProperty(e,"template",{enumerable:!0,get:function(){return r.templateFactory}}),Object.defineProperty(e,"templateCacheCounters",{enumerable:!0,get:function(){return r.templateCacheCounters}}),Object.defineProperty(e,"DOMChanges",{enumerable:!0,get:function(){return v.DOMChanges}}),Object.defineProperty(e,"DOMTreeConstruction",{enumerable:!0,get:function(){return v.DOMTreeConstruction}}),Object.defineProperty(e,"isSerializationFirstNode",{enumerable:!0,get:function(){return v.isSerializationFirstNode}}),Object.defineProperty(e,"NodeDOMTreeConstruction",{enumerable:!0,get:function(){return S.NodeDOMTreeConstruction}}),e.modifierCapabilities=e.componentCapabilities=e.OutletView=e.INVOKE=e.Renderer=e.SafeString=e.Helper=e.Component=e.Textarea=e.Input=e.LinkComponent=e.TextArea=e.TextField=e.Checkbox=e.RootTemplate=void 0
-var R=(0,r.templateFactory)({id:"9BtKrod8",block:'[[[46,[30,0],null,null,null]],[],false,["component"]]',moduleName:"packages/@ember/-internals/glimmer/lib/templates/root.hbs",isStrictMode:!1})
-function j(e){return"function"==typeof e}e.RootTemplate=R
-class I{constructor(e){this.string=e}toString(){return`${this.string}`}toHTML(){return this.toString()}}e.SafeString=I
-var D={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;","=":"&#x3D;"},N=/[&<>"'`=]/,F=/[&<>"'`=]/g
-function L(e){return D[e]}function z(e){return null==e?e="":"string"!=typeof e&&(e=String(e)),new I(e)}function U(e){return null!==e&&"object"==typeof e&&"function"==typeof e.toHTML}function B(e,t){return"attrs"===t[0]&&(t.shift(),1===t.length)?(0,a.childRefFor)(e,t[0]):(0,a.childRefFromParts)(e,t)}function H(e){var t=e.indexOf(":")
-if(-1===t)return[e,e,!0]
-var r=e.substring(0,t),n=e.substring(t+1)
-return[r,n,!1]}function $(e,t,r,i){var[s,l,u]=r
-if("id"===l){var c=(0,n.get)(e,s)
-return null==c&&(c=e.elementId),c=(0,a.createPrimitiveRef)(c),void i.setAttribute("id",c,!0,null)}var d=s.indexOf(".")>-1,h=d?B(t,s.split(".")):(0,a.childRefFor)(t,s)
-o.EMBER_COMPONENT_IS_VISIBLE&&"style"===l&&void 0!==W&&(h=W(h,(0,a.childRefFor)(t,"isVisible"))),i.setAttribute(l,h,!1,null)}var W,q,V="display: none;",G=z(V)
-function K(e,t,r){var[n,i,o]=t.split(":")
-if(""===n)r.setAttribute("class",(0,a.createPrimitiveRef)(i),!0,null)
-else{var s,l=n.indexOf(".")>-1,u=l?n.split("."):[],c=l?B(e,u):(0,a.childRefFor)(e,n)
-s=void 0===i?Y(c,l?u[u.length-1]:n):function(e,t,r){return(0,a.createComputeRef)((()=>(0,a.valueForRef)(e)?t:r))}(c,i,o),r.setAttribute("class",s,!1,null)}}function Y(e,t){var r
-return(0,a.createComputeRef)((()=>{var n=(0,a.valueForRef)(e)
-return!0===n?r||(r=(0,s.dasherize)(t)):n||0===n?String(n):null}))}function Q(){}o.EMBER_COMPONENT_IS_VISIBLE&&(W=(e,t)=>(0,a.createComputeRef)((()=>{var r=(0,a.valueForRef)(e),n=(0,a.valueForRef)(t)
-if(!1!==n)return r
-if(r){var i=r+" "+V
-return U(r)?z(i):i}return G})),q=(e,t)=>{t.setAttribute("style",W(a.UNDEFINED_REFERENCE,(0,a.childRefFor)(e,"isVisible")),!1,null)})
-class J{constructor(e,t,r,n,i,o){this.component=e,this.args=t,this.argsTag=r,this.finalizer=n,this.hasWrappedElement=i,this.isInteractive=o,this.classRef=null,this.classRef=null,this.argsRevision=null===t?0:(0,l.valueForTag)(r),this.rootRef=(0,a.createConstRef)(e,"this"),(0,c.registerDestructor)(this,(()=>this.willDestroy()),!0),(0,c.registerDestructor)(this,(()=>this.component.destroy()))}willDestroy(){var{component:e,isInteractive:t}=this
-if(t){(0,l.beginUntrackFrame)(),e.trigger("willDestroyElement"),e.trigger("willClearRender"),(0,l.endUntrackFrame)()
-var r=(0,u.getViewElement)(e)
-r&&((0,u.clearElementView)(r),(0,u.clearViewElement)(e))}e.renderer.unregister(e)}finalize(){var{finalizer:e}=this
-e(),this.finalizer=Q}}function X(e){return(0,d.setInternalHelperManager)(e,{})}var Z=new m._WeakSet,ee=(0,h.symbol)("INVOKE")
-e.INVOKE=ee
-var te=X((e=>{var t,{named:r,positional:i}=e,[o,s,...l]=i,u=s.debugLabel,c="target"in r?r.target:o,d=function(e,t){var r,i
-t.length>0&&(r=e=>t.map(a.valueForRef).concat(e))
-e&&(i=t=>{var r=(0,a.valueForRef)(e)
-return r&&t.length>0&&(t[0]=(0,n.get)(t[0],r)),t})
-return r&&i?e=>i(r(e)):r||i||re}("value"in r&&r.value,l)
-return t=(0,a.isInvokableRef)(s)?ne(s,s,ie,d,u):function(e,t,r,n,i){0
-return function(){return ne(e,(0,a.valueForRef)(t),(0,a.valueForRef)(r),n,i)(...arguments)}}((0,a.valueForRef)(o),c,s,d,u),Z.add(t),(0,a.createUnboundRef)(t,"(result of an `action` helper)")}))
-function re(e){return e}function ne(e,t,r,n,i){var o,s
-if("function"==typeof r[ee])o=r,s=r[ee]
-else{var a=typeof r
-"string"===a?(o=t,s=t.actions&&t.actions[r]):"function"===a&&(o=e,s=r)}return function(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-var i={target:o,args:t,label:"@glimmer/closure-action"}
-return(0,p.flaggedInstrument)("interaction.ember-action",i,(()=>(0,f.join)(o,s,...n(t))))}}function ie(e){(0,a.updateRef)(this,e)}function oe(e){var t=Object.create(null),r=Object.create(null)
-for(var n in r[ue]=e,e){var i=e[n],o=(0,a.valueForRef)(i),s="function"==typeof o&&Z.has(o);(0,a.isUpdatableRef)(i)&&!s?t[n]=new ae(i,o):t[n]=o,r[n]=o}return r.attrs=t,r}var se=(0,h.symbol)("REF")
-class ae{constructor(e,t){this[u.MUTABLE_CELL]=!0,this[se]=e,this.value=t}update(e){(0,a.updateRef)(this[se],e)}}var le=function(e,t){var r={}
-for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&t.indexOf(n)<0&&(r[n]=e[n])
-if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var i=0
-for(n=Object.getOwnPropertySymbols(e);i<n.length;i++)t.indexOf(n[i])<0&&Object.prototype.propertyIsEnumerable.call(e,n[i])&&(r[n[i]]=e[n[i]])}return r},ue=(0,h.enumerableSymbol)("ARGS"),ce=(0,h.enumerableSymbol)("HAS_BLOCK"),de=(0,h.symbol)("DIRTY_TAG"),he=(0,h.symbol)("IS_DISPATCHING_ATTRS"),pe=(0,h.symbol)("BOUNDS"),fe=(0,a.createPrimitiveRef)("ember-view");(0,i.debugFreeze)([])
-class me{templateFor(e){var t,{layout:r,layoutName:n}=e,i=(0,g.getOwner)(e)
-if(void 0===r){if(void 0===n)return null
-var o=i.lookup(`template:${n}`)
-t=o}else{if(!j(r))return null
-t=r}return(0,m.unwrapTemplate)(t(i)).asWrappedLayout()}getDynamicLayout(e){return this.templateFor(e.component)}getTagName(e){var{component:t,hasWrappedElement:r}=e
-return r?t&&t.tagName||"div":null}getCapabilities(){return be}prepareArgs(e,r){var n
-if(r.named.has("__ARGS__")){var i=r.named.capture(),{__ARGS__:o}=i,s=le(i,["__ARGS__"]),l=(0,a.valueForRef)(o)
-return{positional:l.positional,named:(0,t.assign)((0,t.assign)({},s),l.named)}}var u,{positionalParams:c}=null!==(n=e.class)&&void 0!==n?n:e
-if(null==c||0===r.positional.length)return null
-if("string"==typeof c){var d=r.positional.capture()
-u={[c]:(0,a.createComputeRef)((()=>(0,v.reifyPositional)(d)))},(0,t.assign)(u,r.named.capture())}else{if(!(Array.isArray(c)&&c.length>0))return null
-var h=Math.min(c.length,r.positional.length)
-u={},(0,t.assign)(u,r.named.capture())
-for(var p=0;p<h;p++){var f=c[p]
-u[f]=r.positional.at(p)}}return{positional:m.EMPTY_ARRAY,named:u}}create(e,t,r,n,i,o,s){var{isInteractive:c}=n,d=i.view,h=r.named.capture();(0,l.beginTrackFrame)()
-var f=oe(h),m=(0,l.endTrackFrame)();(function(e,t){e.named.has("id")&&(t.elementId=t.id)})(r,f),f.parentView=d,f[ce]=s,f._target=(0,a.valueForRef)(o),(0,g.setOwner)(f,e),(0,l.beginUntrackFrame)()
-var v=t.create(f),b=(0,p._instrumentStart)("render.component",ge,v)
-i.view=v,null!=d&&(0,u.addChildView)(d,v),v.trigger("didReceiveAttrs")
-var y=""!==v.tagName
-y||(c&&v.trigger("willRender"),v._transitionTo("hasElement"),c&&v.trigger("willInsertElement"))
-var _=new J(v,h,m,b,y,c)
-return r.named.has("class")&&(_.classRef=r.named.get("class")),c&&y&&v.trigger("willRender"),(0,l.endUntrackFrame)(),(0,l.consumeTag)(_.argsTag),(0,l.consumeTag)(v[de]),_}getDebugName(e){var t
-return e.fullName||e.normalizedName||(null===(t=e.class)||void 0===t?void 0:t.name)||e.name}getSelf(e){var{rootRef:t}=e
-return t}didCreateElement(e,t,r){var{component:n,classRef:i,isInteractive:s,rootRef:c}=e;(0,u.setViewElement)(n,t),(0,u.setElementView)(t,n)
-var{attributeBindings:d,classNames:p,classNameBindings:f}=n
-if(d&&d.length)(function(e,t,r,n){for(var i=[],s=e.length-1;-1!==s;){var l=H(e[s]),u=l[1];-1===i.indexOf(u)&&(i.push(u),$(t,r,l,n)),s--}if(-1===i.indexOf("id")){var c=t.elementId?t.elementId:(0,h.guidFor)(t)
-n.setAttribute("id",(0,a.createPrimitiveRef)(c),!1,null)}o.EMBER_COMPONENT_IS_VISIBLE&&void 0!==q&&-1===i.indexOf("style")&&q(r,n)})(d,n,c,r)
-else{var m=n.elementId?n.elementId:(0,h.guidFor)(n)
-r.setAttribute("id",(0,a.createPrimitiveRef)(m),!1,null),o.EMBER_COMPONENT_IS_VISIBLE&&q(c,r)}if(i){var g=Y(i)
-r.setAttribute("class",g,!1,null)}p&&p.length&&p.forEach((e=>{r.setAttribute("class",(0,a.createPrimitiveRef)(e),!1,null)})),f&&f.length&&f.forEach((e=>{K(c,e,r)})),r.setAttribute("class",fe,!1,null),"ariaRole"in n&&r.setAttribute("role",(0,a.childRefFor)(c,"ariaRole"),!1,null),n._transitionTo("hasElement"),s&&((0,l.beginUntrackFrame)(),n.trigger("willInsertElement"),(0,l.endUntrackFrame)())}didRenderLayout(e,t){e.component[pe]=t,e.finalize()}didCreate(e){var{component:t,isInteractive:r}=e
-r&&(t._transitionTo("inDOM"),t.trigger("didInsertElement"),t.trigger("didRender"))}update(e){var{component:t,args:r,argsTag:n,argsRevision:i,isInteractive:o}=e
-if(e.finalizer=(0,p._instrumentStart)("render.component",ve,t),(0,l.beginUntrackFrame)(),null!==r&&!(0,l.validateTag)(n,i)){(0,l.beginTrackFrame)()
-var s=oe(r)
-n=e.argsTag=(0,l.endTrackFrame)(),e.argsRevision=(0,l.valueForTag)(n),t[he]=!0,t.setProperties(s),t[he]=!1,t.trigger("didUpdateAttrs"),t.trigger("didReceiveAttrs")}o&&(t.trigger("willUpdate"),t.trigger("willRender")),(0,l.endUntrackFrame)(),(0,l.consumeTag)(n),(0,l.consumeTag)(t[de])}didUpdateLayout(e){e.finalize()}didUpdate(e){var{component:t,isInteractive:r}=e
-r&&(t.trigger("didUpdate"),t.trigger("didRender"))}getDestroyable(e){return e}}function ge(e){return e.instrumentDetails({initialRender:!0})}function ve(e){return e.instrumentDetails({initialRender:!1})}var be={dynamicLayout:!0,dynamicTag:!0,prepareArgs:!0,createArgs:!0,attributeHook:!0,elementHook:!0,createCaller:!0,dynamicScope:!0,updateHook:!0,createInstance:!0,wrapped:!0,willDestroy:!0,hasSubOwner:!1},ye=new me
-function _e(e){return e===ye}var we=u.CoreView.extend(u.ChildViewsSupport,u.ViewStateSupport,u.ClassNamesSupport,b.TargetActionSupport,u.ActionSupport,u.ViewMixin,{isComponent:!0,init(){this._super(...arguments),this[he]=!1,this[de]=(0,l.createTag)(),this[pe]=null},rerender(){(0,l.dirtyTag)(this[de]),this._super()},[n.PROPERTY_DID_CHANGE](e,t){if(!this[he]){var r=this[ue],i=void 0!==r?r[e]:void 0
-void 0!==i&&(0,a.isUpdatableRef)(i)&&(0,a.updateRef)(i,2===arguments.length?t:(0,n.get)(this,e))}},getAttr(e){return this.get(e)},readDOMAttr(e){var t=(0,u.getViewElement)(this),r=t,n="http://www.w3.org/2000/svg"===r.namespaceURI,{type:i,normalized:o}=(0,v.normalizeProperty)(r,e)
-return n||"attr"===i?r.getAttribute(o):r[o]},didReceiveAttrs(){},didRender(){},willRender(){},didUpdateAttrs(){},willUpdate(){},didUpdate(){}})
-e.Component=we,we.toString=()=>"@ember/component",we.reopenClass({isComponentFactory:!0,positionalParams:[]}),(0,d.setInternalComponentManager)(ye,we),Object.defineProperty(we,"_wasReopened",{configurable:!0,enumerable:!1,writable:!0,value:!1}),Object.defineProperty(we,"reopen",{configurable:!0,enumerable:!1,writable:!0,value:function(){this===we&&(we._wasReopened=!0)
-for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return b.CoreObject.reopen.call(this,...t)}}),Object.defineProperty(we,"reopenClass",{configurable:!0,enumerable:!1,writable:!0,value:function(){this===we&&(we._wasReopened=!0)
-for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return b.CoreObject.reopenClass.call(this,...t)}})
-var Oe=(0,r.templateFactory)({id:"14evwHqT",block:"[[],[],false,[]]",moduleName:"packages/@ember/-internals/glimmer/lib/templates/empty.hbs",isStrictMode:!1}),xe=we.extend({layout:Oe,classNames:["ember-checkbox"],tagName:"input",attributeBindings:["type","checked","indeterminate","disabled","tabindex","name","autofocus","required","form"],type:"checkbox",disabled:!1,indeterminate:!1,didInsertElement(){this._super(...arguments),this.element.indeterminate=Boolean(this.indeterminate)},change(){(0,n.set)(this,"checked",this.element.checked)}})
-e.Checkbox=xe,xe.toString=()=>"@ember/component/checkbox",Object.defineProperty(xe,"_wasReopened",{configurable:!0,enumerable:!1,writable:!0,value:!1}),Object.defineProperty(xe,"reopen",{configurable:!0,enumerable:!1,writable:!0,value:function(){this===xe&&(xe._wasReopened=!0)
-for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return b.FrameworkObject.reopen.call(this,...t)}}),Object.defineProperty(xe,"reopenClass",{configurable:!0,enumerable:!1,writable:!0,value:function(){this===xe&&(xe._wasReopened=!0)
-for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return b.FrameworkObject.reopenClass.call(this,...t)}})
-var Pe=y.hasDOM?Object.create(null):null
-var Se=we.extend(u.TextSupport,{layout:Oe,classNames:["ember-text-field"],tagName:"input",attributeBindings:["accept","autocomplete","autosave","dir","formaction","formenctype","formmethod","formnovalidate","formtarget","height","inputmode","lang","list","type","max","min","multiple","name","pattern","size","step","value","width"],value:"",type:(0,n.computed)({get:()=>"text",set(e,t){var r="text"
-return function(e){if(!y.hasDOM)return Boolean(e)
-if(e in Pe)return Pe[e]
-var t=document.createElement("input")
-try{t.type=e}catch(r){}return Pe[e]=t.type===e}(t)&&(r=t),r}}),size:null,pattern:null,min:null,max:null})
-e.TextField=Se,Se.toString=()=>"@ember/component/text-field",Object.defineProperty(Se,"_wasReopened",{configurable:!0,enumerable:!1,writable:!0,value:!1}),Object.defineProperty(Se,"reopen",{configurable:!0,enumerable:!1,writable:!0,value:function(){this===Se&&(Se._wasReopened=!0)
-for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return b.CoreObject.reopen.call(this,...t)}}),Object.defineProperty(Se,"reopenClass",{configurable:!0,enumerable:!1,writable:!0,value:function(){this===Se&&(Se._wasReopened=!0)
-for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return b.CoreObject.reopenClass.call(this,...t)}})
-var Te=we.extend(u.TextSupport,{classNames:["ember-text-area"],layout:Oe,tagName:"textarea",attributeBindings:["rows","cols","name","selectionEnd","selectionStart","autocomplete","wrap","lang","dir","value"],rows:null,cols:null})
-e.TextArea=Te,Te.toString=()=>"@ember/component/text-area",Object.defineProperty(Te,"_wasReopened",{configurable:!0,enumerable:!1,writable:!0,value:!1}),Object.defineProperty(Te,"reopen",{configurable:!0,enumerable:!1,writable:!0,value:function(){this===Te&&(Te._wasReopened=!0)
-for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return b.CoreObject.reopen.call(this,...t)}}),Object.defineProperty(Te,"reopenClass",{configurable:!0,enumerable:!1,writable:!0,value:function(){this===Te&&(Te._wasReopened=!0)
-for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return b.CoreObject.reopenClass.call(this,...t)}})
-var Ee=(0,r.templateFactory)({id:"zyblzQRj",block:'[[[41,[48,[30,1]],[[[18,1,null]],[]],[[[1,[30,0,["linkTitle"]]]],[]]]],["&default"],false,["if","has-block","yield"]]',moduleName:"packages/@ember/-internals/glimmer/lib/templates/-link-to.hbs",isStrictMode:!1}),Ce=Object.freeze({toString:()=>"UNDEFINED"}),ke=Object.freeze({}),Me=we.extend({layout:Ee,tagName:"a",route:Ce,model:Ce,models:Ce,query:Ce,"current-when":null,title:null,rel:null,tabindex:null,target:null,activeClass:"active",loadingClass:"loading",disabledClass:"disabled",replace:!1,preventDefault:!0,attributeBindings:["href","title","rel","tabindex","target"],classNameBindings:["active","loading","disabled","transitioningIn","transitioningOut"],eventName:"click",init(){this._super(...arguments),this.assertLinkToOrigin()
-var{eventName:e}=this
-this.on(e,this,this._invoke)},_routing:(0,w.inject)("-routing"),_currentRoute:(0,n.alias)("_routing.currentRouteName"),_currentRouterState:(0,n.alias)("_routing.currentState"),_targetRouterState:(0,n.alias)("_routing.targetState"),_isEngine:(0,n.computed)((function(){return void 0!==(0,_.getEngineParent)((0,g.getOwner)(this))})),_engineMountPoint:(0,n.computed)((function(){return(0,g.getOwner)(this).mountPoint})),_route:(0,n.computed)("route","_currentRouterState",(function(){var{route:e}=this
-return e===Ce?this._currentRoute:this._namespaceRoute(e)})),_models:(0,n.computed)("model","models",(function(){var{model:e,models:t}=this
-return e!==Ce?[e]:t!==Ce?t:[]})),_query:(0,n.computed)("query",(function(){var{query:e}=this
-return e===Ce?ke:(0,t.assign)({},e)})),disabled:(0,n.computed)({get:e=>!1,set(e,t){return this._isDisabled=t,!!t&&this.disabledClass}}),active:(0,n.computed)("activeClass","_active",(function(){return!!this._active&&this.activeClass})),_active:(0,n.computed)("_currentRouterState","_route","_models","_query","loading","current-when",(function(){var{_currentRouterState:e}=this
-return!!e&&this._isActive(e)})),willBeActive:(0,n.computed)("_currentRouterState","_targetRouterState","_route","_models","_query","loading","current-when",(function(){var{_currentRouterState:e,_targetRouterState:t}=this
-if(e!==t)return this._isActive(t)})),assertLinkToOrigin(){},_isActive(e){if(this.loading)return!1
-var t=this["current-when"]
-if("boolean"==typeof t)return t
-var{_models:r,_routing:n}=this
-return"string"==typeof t?t.split(" ").some((t=>n.isActiveForRoute(r,void 0,this._namespaceRoute(t),e))):n.isActiveForRoute(r,this._query,this._route,e)},transitioningIn:(0,n.computed)("_active","willBeActive",(function(){return!0===this.willBeActive&&!this._active&&"ember-transitioning-in"})),transitioningOut:(0,n.computed)("_active","willBeActive",(function(){return!(!1!==this.willBeActive||!this._active)&&"ember-transitioning-out"})),_namespaceRoute(e){var{_engineMountPoint:t}=this
-return void 0===t?e:"application"===e?t:`${t}.${e}`},_invoke(e){if(!(0,u.isSimpleClick)(e))return!0
-var{bubbles:t,preventDefault:r}=this,n=this.element.target,i=!n||"_self"===n
-if(!1!==r&&i&&e.preventDefault(),!1===t&&e.stopPropagation(),this._isDisabled)return!1
-if(this.loading)return!1
-if(!i)return!1
-var{_route:o,_models:s,_query:a,replace:l}=this,c={queryParams:a,routeName:o}
-return(0,p.flaggedInstrument)("interaction.link-to",c,this._generateTransition(c,o,s,a,l)),!1},_generateTransition(e,t,r,n,i){var{_routing:o}=this
-return()=>{e.transition=o.transitionTo(t,r,n,i)}},href:(0,n.computed)("_currentRouterState","_route","_models","_query","tagName","loading","loadingHref",(function(){if("a"===this.tagName){if(this.loading)return this.loadingHref
-var{_route:e,_models:t,_query:r,_routing:n}=this
-return n.generateURL(e,t,r)}})),loading:(0,n.computed)("_route","_modelsAreLoaded","loadingClass",(function(){var{_route:e,_modelsAreLoaded:t}=this
-if(!t||null==e)return this.loadingClass})),_modelsAreLoaded:(0,n.computed)("_models",(function(){for(var{_models:e}=this,t=0;t<e.length;t++){var r=e[t]
-if(null==r)return!1}return!0})),loadingHref:"#",didReceiveAttrs(){var{disabledWhen:e}=this
-void 0!==e&&this.set("disabled",e)
-var{params:t}=this
-if(t&&0!==t.length){var r=this[ce]
-t=t.slice(),r||this.set("linkTitle",t.shift())
-var n=t[t.length-1]
-n&&n.isQueryParams?this.set("query",t.pop().values):this.set("query",Ce),0===t.length?this.set("route",Ce):this.set("route",t.shift()),this.set("model",Ce),this.set("models",t),(0,i.runInDebug)((()=>{t=this.params.slice()
-var e=[],n=!1
-r||t.shift()
-var i=t[t.length-1]
-if(i&&i.isQueryParams&&(t.pop(),n=!0),t.length>0&&(t.shift(),e.push("`@route`")),1===t.length?e.push("`@model`"):t.length>1&&e.push("`@models`"),n&&e.push("`@query`"),e.length>0){`Please use the equivalent named arguments (${e.join(", ")})`,n&&" along with the `hash` helper",r||" and pass a block for the link's content.","."}}))}else{var{_models:o}=this
-if(o.length>0){var s=o[o.length-1]
-"object"==typeof s&&null!==s&&s.isQueryParams&&(this.query=s.values,o.pop())}}}})
-e.LinkComponent=Me,Me.toString=()=>"@ember/routing/link-component",Me.reopenClass({positionalParams:"params"}),Object.defineProperty(Me,"_wasReopened",{configurable:!0,enumerable:!1,writable:!0,value:!1}),Object.defineProperty(Me,"reopen",{configurable:!0,enumerable:!1,writable:!0,value:function(){this===Me&&(Me._wasReopened=!0)
-for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return b.CoreObject.reopen.call(this,...t)}}),Object.defineProperty(Me,"reopenClass",{configurable:!0,enumerable:!1,writable:!0,value:function(){this===Me&&(Me._wasReopened=!0)
-for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return b.CoreObject.reopenClass.call(this,...t)}})
-var Ae=(0,r.templateFactory)({id:"4uiR2oaY",block:'[[[41,[30,0,["modernized"]],[[[11,"input"],[16,1,[30,0,["id"]]],[16,0,[30,0,["class"]]],[16,"role",[30,0,["role"]]],[16,"autocapitalize",[30,0,["autocapitalize"]]],[16,"autocorrect",[30,0,["autocorrect"]]],[16,"autofocus",[30,0,["autofocus"]]],[16,"disabled",[30,0,["disabled"]]],[16,"form",[30,0,["form"]]],[16,"maxlength",[30,0,["maxlength"]]],[16,"minlength",[30,0,["minlength"]]],[16,"placeholder",[30,0,["placeholder"]]],[16,"readonly",[30,0,["readonly"]]],[16,"required",[30,0,["required"]]],[16,"selectionDirection",[30,0,["selectionDirection"]]],[16,"spellcheck",[30,0,["spellcheck"]]],[16,"tabindex",[30,0,["tabindex"]]],[16,"title",[30,0,["title"]]],[16,"accept",[30,0,["accept"]]],[16,"autocomplete",[30,0,["autocomplete"]]],[16,"autosave",[30,0,["autosave"]]],[16,"dir",[30,0,["dir"]]],[16,"formaction",[30,0,["formaction"]]],[16,"formenctype",[30,0,["formenctype"]]],[16,"formmethod",[30,0,["formmethod"]]],[16,"formnovalidate",[30,0,["formnovalidate"]]],[16,"formtarget",[30,0,["formtarget"]]],[16,"height",[30,0,["height"]]],[16,"inputmode",[30,0,["inputmode"]]],[16,"lang",[30,0,["lang"]]],[16,"list",[30,0,["list"]]],[16,"max",[30,0,["max"]]],[16,"min",[30,0,["min"]]],[16,"multiple",[30,0,["multiple"]]],[16,3,[30,0,["name"]]],[16,"pattern",[30,0,["pattern"]]],[16,"size",[30,0,["size"]]],[16,"step",[30,0,["step"]]],[16,"width",[30,0,["width"]]],[16,"indeterminate",[30,0,["indeterminate"]]],[17,1],[16,4,[30,0,["type"]]],[16,"checked",[30,0,["checked"]]],[16,2,[30,0,["value"]]],[4,[38,1],["change",[30,0,["change"]]],null],[4,[38,1],["input",[30,0,["input"]]],null],[4,[38,1],["keyup",[30,0,["keyUp"]]],null],[4,[38,1],["paste",[30,0,["valueDidChange"]]],null],[4,[38,1],["cut",[30,0,["valueDidChange"]]],null],[4,[30,0,["handleDeprecatedEvents"]],[[30,0]],null],[12],[13]],[]],[[[44,[[50,"-checkbox",0,null,null],[50,"-text-field",0,null,null]],[[[41,[30,0,["isCheckbox"]],[[[8,[30,2],[[17,1]],[["@target","@__ARGS__"],[[30,0,["caller"]],[30,0,["args"]]]],null]],[]],[[[8,[30,3],[[17,1]],[["@target","@__ARGS__"],[[30,0,["caller"]],[30,0,["args"]]]],null]],[]]]],[2,3]]]],[]]]],["&attrs","Checkbox","TextField"],false,["if","on","let","component"]]',moduleName:"packages/@ember/-internals/glimmer/lib/templates/input.hbs",isStrictMode:!1})
-function Re(e){e.remove()}class je{constructor(e){this.instance=e}}class Ie{constructor(e,t){this.ModifierClass=e,this.name=t}create(e,t,r,n){var{ModifierClass:i}=this,o=new i(e,t,n)
-return(0,c.registerDestructor)(o,Re),new je(o)}getTag(){return null}getDebugName(){return this.name}install(e){var{instance:t}=e
-return t.install()}update(){}getDestroyable(e){var{instance:t}=e
-return t}}function De(){}var Ne="function"==typeof Object.entries?Object.entries:e=>Object.keys(e).map((t=>[t,e[t]])),Fe="function"==typeof Object.values?Object.values:e=>Object.keys(e).map((t=>e[t]))
-class Le{constructor(e,t,r){this.owner=e,this.args=t,this.caller=r,(0,g.setOwner)(this,e)}static toString(){return"internal component"}get id(){return(0,h.guidFor)(this)}get class(){return"ember-view"}validateArguments(){for(var e of Object.keys(this.args.named))this.isSupportedArgument(e)||this.onUnsupportedArgument(e)}named(e){var t=this.args.named[e]
-return t?(0,a.valueForRef)(t):void 0}positional(e){var t=this.args.positional[e]
-return t?(0,a.valueForRef)(t):void 0}listenerFor(e){var t=this.named(e)
-return t||De}isSupportedArgument(e){return!1}onUnsupportedArgument(e){}toString(){return`<${this.constructor}:${(0,h.guidFor)(this)}>`}}var ze=new WeakMap
-function Ue(e,t){var r={create(){throw(0,i.assert)("Use constructor instead of create")},toString:()=>e.toString()}
-return ze.set(r,e),(0,d.setInternalComponentManager)(He,r),(0,d.setComponentTemplate)(t,r),r}var Be={dynamicLayout:!1,dynamicTag:!1,prepareArgs:!1,createArgs:!0,attributeHook:!1,elementHook:!1,createCaller:!0,dynamicScope:!1,updateHook:!1,createInstance:!0,wrapped:!1,willDestroy:!1,hasSubOwner:!1}
-var He=new class{getCapabilities(){return Be}create(e,t,r,n,i,o){var s,u=new(s=t,ze.get(s))(e,r.capture(),(0,a.valueForRef)(o))
-return(0,l.untrack)(u.validateArguments.bind(u)),u}didCreate(){}didUpdate(){}didRenderLayout(){}didUpdateLayout(){}getDebugName(e){return e.toString()}getSelf(e){return(0,a.createConstRef)(e,"this")}getDestroyable(e){return e}}
-function $e(e){e.toString()
-var{prototype:t}=e,r=t.onUnsupportedArgument
-Object.defineProperty(t,"onUnsupportedArgument",{configurable:!0,enumerable:!1,value:function(e){this.modernized=!1,r.call(this,e)}})}function We(e,t){var r=e.toString(),{prototype:n}=(r.replace(/([a-z])([A-Z])/g,"$1-$2").toLowerCase(),e),i=(e,t)=>e?Object.getOwnPropertyDescriptor(e,t)||i(Object.getPrototypeOf(e),t):null
-t.forEach((e=>{var t,r
-Array.isArray(e)?[t,r]=e:t=r=e
-var o=n.isSupportedArgument
-Object.defineProperty(n,"isSupportedArgument",{configurable:!0,enumerable:!1,value:function(e){return this.modernized&&e===r||o.call(this,e)}})
-var s=i(n,t),a=()=>{}
-s&&(a=s.get),Object.defineProperty(n,t,{configurable:!0,enumerable:!0,get(){return r in this.args.named?"class"===t&&s?`${a.call(this)} ${this.named(r)}`:this.named(r):a.call(this)}})}))}var qe,Ve=new WeakMap,Ge=Object.freeze({}),Ke=e=>{var t=Ve.get(e)
-if(void 0===t){t=Ge
-var r=e.lookup("event_dispatcher:main")
-null!=r&&"_finalEvents"in r&&null!==r._finalEvents&&void 0!==r._finalEvents&&(t=r._finalEvents),Ve.set(e,t)}return t}
-function Ye(e){if(o.JQUERY_INTEGRATION){var{prototype:t}=e,r=t.listenerFor
-Object.defineProperty(t,"listenerFor",{configurable:!0,enumerable:!1,value:function(e){var t=r.call(this,e)
-return u.jQuery&&!u.jQueryDisabled?e=>t(new u.jQuery.Event(e)):t}})}}qe=function(e,t){void 0===t&&(t=[])
-var r=e.toString(),{prototype:n}=(r.toLowerCase(),e),i=n.isSupportedArgument
-Object.defineProperty(n,"isSupportedArgument",{configurable:!0,enumerable:!1,value:function(e){var t=[...Fe(Ke(this.owner)),"focus-in","focus-out","key-press","key-up","key-down"]
-return this.modernized&&-1!==t.indexOf(e)||i.call(this,e)}})
-class o extends class{constructor(e,t,r){this.owner=e,this.element=t,this.args=r,(0,g.setOwner)(this,e)}static toString(){return"internal modifier"}install(){}remove(){}positional(e){var t=this.args.positional[e]
-return t?(0,a.valueForRef)(t):void 0}named(e){var t=this.args.named[e]
-return t?(0,a.valueForRef)(t):void 0}toString(){return`<${this.constructor.toString()}:${(0,h.guidFor)(this)}>`}}{constructor(){super(...arguments),this.listeners=new Map}static toString(){return"DeprecatedEventHandlersModifier"}install(){var{element:e,component:r,listenerFor:n,listeners:i}=this,o=[...Ne(Ke(this.owner)),...t]
-for(var[s,a]of o){var l=n.call(r,s,a)
-l&&(i.set(s,l),e.addEventListener(s,l))}Object.freeze(i)}remove(){var{element:e,listeners:t}=this
-for(var[r,n]of Ne(t))e.removeEventListener(r,n)
-this.listeners=new Map}get component(){var e=this.positional(0)
-return e}listenerFor(e,t){return t in this.args.named?this.listenerFor.call(this,t):null}}(0,d.setInternalModifierManager)(new Ie(o,"deprecated-event-handlers"),o),Object.defineProperty(n,"handleDeprecatedEvents",{configurable:!0,enumerable:!0,value:o})}
-var Qe=function(e,t,r,n){var i,o=arguments.length,s=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n
-if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n)
-else for(var a=e.length-1;a>=0;a--)(i=e[a])&&(s=(o<3?i(s):o>3?i(t,r,s):i(t,r))||s)
-return o>3&&s&&Object.defineProperty(t,r,s),s},Je=Object.freeze({})
-function Xe(e){return function(e){return e.target}(e).value}function Ze(e){return t=>e(Xe(t),t)}function et(e){return void 0===e?new tt(void 0):(0,a.isConstRef)(e)?new tt((0,a.valueForRef)(e)):(0,a.isUpdatableRef)(e)?new rt(e):new nt(e)}class tt{constructor(e){this.value=e}get(){return this.value}set(e){this.value=e}}Qe([n.tracked],tt.prototype,"value",void 0)
-class rt{constructor(e){this.reference=e}get(){return(0,a.valueForRef)(this.reference)}set(e){(0,a.updateRef)(this.reference,e)}}class nt{constructor(e){this.lastUpstreamValue=Je,this.upstream=new rt(e)}get(){var e=this.upstream.get()
-return e!==this.lastUpstreamValue&&(this.lastUpstreamValue=e,this.local=new tt(e)),this.local.get()}set(e){this.local.set(e)}}class it extends Le{constructor(){super(...arguments),this.modernized=this.shouldModernize(),this._value=et(this.args.named.value)}validateArguments(){super.validateArguments()}shouldModernize(){return Boolean(!0)&&!1===we._wasReopened&&!1===u.TextSupport._wasReopened&&!1===b.TargetActionSupport._wasReopened}get value(){return this._value.get()}set value(e){this._value.set(e)}valueDidChange(e){this.value=Xe(e)}change(e){this.valueDidChange(e)}input(e){this.valueDidChange(e)}keyUp(e){switch(e.key){case"Enter":this.listenerFor("enter")(e),this.listenerFor("insert-newline")(e)
-break
-case"Escape":this.listenerFor("escape-press")(e)}}listenerFor(e){var t=super.listenerFor(e)
-return this.isVirtualEventListener(e,t)?Ze(t):t}isVirtualEventListener(e,t){return-1!==["enter","insert-newline","escape-press"].indexOf(e)}}function ot(e,t){if(o.SEND_ACTION){e.toString()
-var{prototype:r}=e,n=r.listenerFor
-Object.defineProperty(r,"listenerFor",{configurable:!0,enumerable:!1,value:function(e){var t=this.named(e)
-if("string"==typeof t){var r,{caller:i}=this
-r=(e=>"function"==typeof e.send)(i)?function(){for(var e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n]
-return i.send(t,...r)}:i[t]
-var o=function(){return r(...arguments)}
-return this.isVirtualEventListener(e,o)?Ze(o):o}return n.call(this,e)}})}var{prototype:i}=e,s={focusin:"focus-in",focusout:"focus-out",keypress:"key-press",keyup:"key-up",keydown:"key-down"}
-$e(e),We(e,t),qe(e,Ne(s))
-var a=i.isVirtualEventListener
-Object.defineProperty(i,"isVirtualEventListener",{configurable:!0,enumerable:!1,value:function(e,t){return-1!==Fe(s).indexOf(e)||a.call(this,e,t)}}),o.JQUERY_INTEGRATION&&Ye(e)}Qe([O.action],it.prototype,"valueDidChange",null),Qe([O.action],it.prototype,"keyUp",null)
-var st,at=function(e,t,r,n){var i,o=arguments.length,s=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n
-if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n)
-else for(var a=e.length-1;a>=0;a--)(i=e[a])&&(s=(o<3?i(s):o>3?i(t,r,s):i(t,r))||s)
-return o>3&&s&&Object.defineProperty(t,r,s),s}
-if(y.hasDOM){var lt=Object.create(null),ut=document.createElement("input")
-lt[""]=!1,lt.text=!0,lt.checkbox=!0,st=e=>{var t=lt[e]
-if(void 0===t){try{ut.type=e,t=ut.type===e}catch(r){t=!1}finally{ut.type="text"}lt[e]=t}return t}}else st=e=>""!==e
-class ct extends it{constructor(){super(...arguments),this._checked=et(this.args.named.checked)}static toString(){return"Input"}get class(){return this.isCheckbox?"ember-checkbox ember-view":"ember-text-field ember-view"}get type(){var e=this.named("type")
-return null==e?"text":st(e)?e:"text"}get isCheckbox(){return"checkbox"===this.named("type")}get checked(){return this.isCheckbox?this._checked.get():void 0}set checked(e){this._checked.set(e)}change(e){this.isCheckbox?this.checkedDidChange(e):super.change(e)}input(e){this.isCheckbox||super.input(e)}checkedDidChange(e){var t=e.target
-this.checked=t.checked}shouldModernize(){return super.shouldModernize()&&!1===Se._wasReopened&&!1===xe._wasReopened}isSupportedArgument(e){return-1!==["type","value","checked","enter","insert-newline","escape-press"].indexOf(e)||super.isSupportedArgument(e)}}at([O.action],ct.prototype,"change",null),at([O.action],ct.prototype,"input",null),at([O.action],ct.prototype,"checkedDidChange",null),ot(ct,["id",["id","elementId"],"class",["class","classNames"],["role","ariaRole"],"autocapitalize","autocorrect","autofocus","disabled","form","maxlength","minlength","placeholder","readonly","required","selectionDirection","spellcheck","tabindex","title","accept","autocomplete","autosave","dir","formaction","formenctype","formmethod","formnovalidate","formtarget","height","inputmode","lang","list","max","min","multiple","name","pattern","size","step","width","indeterminate"])
-var dt=Ue(ct,Ae)
-e.Input=dt
-var ht=(0,r.templateFactory)({id:"mmUstqaU",block:'[[[41,[30,0,["modernized"]],[[[11,"textarea"],[16,1,[30,0,["id"]]],[16,0,[30,0,["class"]]],[16,"role",[30,0,["role"]]],[16,"autocapitalize",[30,0,["autocapitalize"]]],[16,"autocorrect",[30,0,["autocorrect"]]],[16,"autofocus",[30,0,["autofocus"]]],[16,"disabled",[30,0,["disabled"]]],[16,"form",[30,0,["form"]]],[16,"maxlength",[30,0,["maxlength"]]],[16,"minlength",[30,0,["minlength"]]],[16,"placeholder",[30,0,["placeholder"]]],[16,"readonly",[30,0,["readonly"]]],[16,"required",[30,0,["required"]]],[16,"selectionDirection",[30,0,["selectionDirection"]]],[16,"spellcheck",[30,0,["spellcheck"]]],[16,"tabindex",[30,0,["tabindex"]]],[16,"title",[30,0,["title"]]],[16,"rows",[30,0,["rows"]]],[16,"cols",[30,0,["cols"]]],[16,3,[30,0,["name"]]],[16,"selectionEnd",[30,0,["selectionEnd"]]],[16,"selectionStart",[30,0,["selectionStart"]]],[16,"autocomplete",[30,0,["autocomplete"]]],[16,"wrap",[30,0,["wrap"]]],[16,"lang",[30,0,["lang"]]],[16,"dir",[30,0,["dir"]]],[17,1],[16,2,[30,0,["value"]]],[4,[38,1],["change",[30,0,["change"]]],null],[4,[38,1],["input",[30,0,["input"]]],null],[4,[38,1],["keyup",[30,0,["keyUp"]]],null],[4,[38,1],["paste",[30,0,["valueDidChange"]]],null],[4,[38,1],["cut",[30,0,["valueDidChange"]]],null],[4,[30,0,["handleDeprecatedEvents"]],[[30,0]],null],[12],[13]],[]],[[[44,[[50,"-textarea",0,null,null]],[[[8,[30,2],[[17,1]],[["@target","@__ARGS__"],[[30,0,["caller"]],[30,0,["args"]]]],null]],[2]]]],[]]]],["&attrs","Textarea"],false,["if","on","let","component"]]',moduleName:"packages/@ember/-internals/glimmer/lib/templates/textarea.hbs",isStrictMode:!1}),pt=function(e,t,r,n){var i,o=arguments.length,s=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n
-if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n)
-else for(var a=e.length-1;a>=0;a--)(i=e[a])&&(s=(o<3?i(s):o>3?i(t,r,s):i(t,r))||s)
-return o>3&&s&&Object.defineProperty(t,r,s),s}
-class ft extends it{static toString(){return"Textarea"}get class(){return"ember-text-area ember-view"}change(e){super.change(e)}input(e){super.input(e)}shouldModernize(){return super.shouldModernize()&&!1===Te._wasReopened}isSupportedArgument(e){return-1!==["type","value","enter","insert-newline","escape-press"].indexOf(e)||super.isSupportedArgument(e)}}pt([O.action],ft.prototype,"change",null),pt([O.action],ft.prototype,"input",null),ot(ft,["id",["id","elementId"],"class",["class","classNames"],["role","ariaRole"],"autocapitalize","autocorrect","autofocus","disabled","form","maxlength","minlength","placeholder","readonly","required","selectionDirection","spellcheck","tabindex","title","rows","cols","name","selectionEnd","selectionStart","autocomplete","wrap","lang","dir"])
-var mt=Ue(ft,ht)
-e.Textarea=mt
-var gt=(0,h.symbol)("RECOMPUTE_TAG"),vt=b.FrameworkObject.extend({init(){this._super(...arguments),this[gt]=(0,l.createTag)()},recompute(){(0,f.join)((()=>(0,l.dirtyTag)(this[gt])))}})
-e.Helper=vt
-var bt=(0,h.symbol)("IS_CLASSIC_HELPER")
-vt.isHelperFactory=!0,vt[bt]=!0
-class yt{constructor(e){this.capabilities=(0,d.helperCapabilities)("3.23",{hasValue:!0,hasDestroyable:!0})
-var t={};(0,g.setOwner)(t,e),this.ownerInjection=t}createHelper(e,t){return{instance:void 0===e.class?e.create(this.ownerInjection):e.create(),args:t}}getDestroyable(e){var{instance:t}=e
-return t}getValue(e){var t,{instance:r,args:n}=e,{positional:i,named:o}=n
-return t=r.compute(i,o),(0,l.consumeTag)(r[gt]),t}getDebugName(e){return(0,h.getDebugName)(e.class.prototype)}}(0,d.setHelperManager)((e=>new yt(e)),vt)
-var _t=(0,d.getInternalHelperManager)(vt)
-class wt{constructor(e){this.compute=e,this.isHelperFactory=!0}create(){return{compute:this.compute}}}var Ot=new class{constructor(){this.capabilities=(0,d.helperCapabilities)("3.23",{hasValue:!0})}createHelper(e,t){var{compute:r}=e
-return()=>r.call(null,t.positional,t.named)}getValue(e){return e()}getDebugName(e){return(0,h.getDebugName)(e.compute)}}
-function xt(e){return new wt(e)}function Pt(e){return{object:`${e.name}:${e.outlet}`}}(0,d.setHelperManager)((()=>Ot),wt.prototype)
-var St={dynamicLayout:!1,dynamicTag:!1,prepareArgs:!1,createArgs:!1,attributeHook:!1,elementHook:!1,createCaller:!1,dynamicScope:!0,updateHook:!1,createInstance:!0,wrapped:!1,willDestroy:!1,hasSubOwner:!1}
-class Tt{create(e,t,r,n,i){var o=i.get("outletState"),s=t.ref
-i.set("outletState",s)
-var l={self:(0,a.createConstRef)(t.controller,"this"),finalize:(0,p._instrumentStart)("render.outlet",Pt,t)}
-if(void 0!==n.debugRenderTree){l.outlet={name:t.outlet}
-var u=(0,a.valueForRef)(o),c=u&&u.render&&u.render.owner,d=(0,a.valueForRef)(s).render.owner
-if(c&&c!==d){var h=d,f=h.mountPoint
-l.engine=h,l.engineBucket={mountPoint:f}}}return l}getDebugName(e){var{name:t}=e
-return t}getDebugCustomRenderTree(e,t,r){var n=[]
-return t.outlet&&n.push({bucket:t.outlet,type:"outlet",name:t.outlet.name,args:v.EMPTY_ARGS,instance:void 0,template:void 0}),t.engineBucket&&n.push({bucket:t.engineBucket,type:"engine",name:t.engineBucket.mountPoint,args:v.EMPTY_ARGS,instance:t.engine,template:void 0}),n.push({bucket:t,type:"route-template",name:e.name,args:r,instance:e.controller,template:(0,m.unwrapTemplate)(e.template).moduleName}),n}getCapabilities(){return St}getSelf(e){var{self:t}=e
-return t}didCreate(){}didUpdate(){}didRenderLayout(e){e.finalize()}didUpdateLayout(){}getDestroyable(){return null}}var Et=new Tt
-class Ct{constructor(e,t){void 0===t&&(t=Et),this.state=e,this.manager=t,this.handle=-1
-var r=t.getCapabilities()
-this.capabilities=(0,d.capabilityFlagsFrom)(r),this.compilable=r.wrapped?(0,m.unwrapTemplate)(e.template).asWrappedLayout():(0,m.unwrapTemplate)(e.template).asLayout(),this.resolvedName=e.name}}class kt extends me{constructor(e){super(),this.component=e}create(e,t,r,n,i){var{isInteractive:o}=n,s=this.component,a=(0,p._instrumentStart)("render.component",ge,s)
-i.view=s
-var u=""!==s.tagName
-u||(o&&s.trigger("willRender"),s._transitionTo("hasElement"),o&&s.trigger("willInsertElement"))
-var c=new J(s,null,l.CONSTANT_TAG,a,u,o)
-return(0,l.consumeTag)(s[de]),c}}var Mt={dynamicLayout:!0,dynamicTag:!0,prepareArgs:!1,createArgs:!1,attributeHook:!0,elementHook:!0,createCaller:!0,dynamicScope:!0,updateHook:!0,createInstance:!0,wrapped:!0,willDestroy:!1,hasSubOwner:!1}
-class At{constructor(e){this.handle=-1,this.resolvedName="-top-level",this.capabilities=(0,d.capabilityFlagsFrom)(Mt),this.compilable=null,this.manager=new kt(e),this.state=(0,P.getFactoryFor)(e)}}class Rt{constructor(e){this.inner=e}}var jt=X((e=>{var{positional:t}=e,r=t[0]
-return(0,a.createComputeRef)((()=>{var e=(0,a.valueForRef)(r)
-return(0,l.consumeTag)((0,n.tagForObject)(e)),(0,h.isProxy)(e)&&(e=(0,b._contentFor)(e)),new Rt(e)}))}))
-class It{constructor(e){this.length=e,this.position=0}isEmpty(){return!1}memoFor(e){return e}next(){var{length:e,position:t}=this
-if(t>=e)return null
-var r=this.valueFor(t),n=this.memoFor(t)
-return this.position++,{value:r,memo:n}}}class Dt extends It{constructor(e){super(e.length),this.array=e}static from(e){return e.length>0?new this(e):null}static fromForEachable(e){var t=[]
-return e.forEach((e=>t.push(e))),this.from(t)}valueFor(e){return this.array[e]}}class Nt extends It{constructor(e){super(e.length),this.array=e}static from(e){return e.length>0?new this(e):null}valueFor(e){return(0,n.objectAt)(this.array,e)}}class Ft extends It{constructor(e,t){super(t.length),this.keys=e,this.values=t}static fromIndexable(e){var t=Object.keys(e),{length:r}=t
-if(0===r)return null
-for(var n=[],i=0;i<r;i++){var o,s=t[i]
-o=e[s],(0,l.isTracking)()&&((0,l.consumeTag)((0,l.tagFor)(e,s)),Array.isArray(o)&&(0,l.consumeTag)((0,l.tagFor)(o,"[]"))),n.push(o)}return new this(t,n)}static fromForEachable(e){var t=[],r=[],n=0,i=!1
-return e.forEach((function(e,o){(i=i||arguments.length>=2)&&t.push(o),r.push(e),n++})),0===n?null:i?new this(t,r):new Dt(r)}valueFor(e){return this.values[e]}memoFor(e){return this.keys[e]}}class Lt{constructor(e,t){this.iterable=e,this.result=t,this.position=0}static from(e){var t=e[Symbol.iterator](),r=t.next(),{done:n}=r
-return n?null:new this(t,r)}isEmpty(){return!1}next(){var{iterable:e,result:t,position:r}=this
-if(t.done)return null
-var n=this.valueFor(t,r),i=this.memoFor(t,r)
-return this.position++,this.result=e.next(),{value:n,memo:i}}}class zt extends Lt{valueFor(e){return e.value}memoFor(e,t){return t}}class Ut extends Lt{valueFor(e){return e.value[1]}memoFor(e){return e.value[0]}}function Bt(e){return"function"==typeof e.forEach}function Ht(e){return"function"==typeof e[Symbol.iterator]}(0,E.default)({scheduleRevalidate(){f._backburner.ensureInstance()},toBool:function(e){return(0,h.isProxy)(e)?((0,l.consumeTag)((0,n.tagForProperty)(e,"content")),Boolean((0,n.get)(e,"isTruthy"))):(0,b.isArray)(e)?((0,l.consumeTag)((0,n.tagForProperty)(e,"[]")),0!==e.length):(0,T.isHTMLSafe)(e)?Boolean(e.toString()):Boolean(e)},toIterator:function(e){return e instanceof Rt?function(e){if(t=e,null===t||"object"!=typeof t&&"function"!=typeof t)return null
-var t
-return Array.isArray(e)||(0,h.isEmberArray)(e)?Ft.fromIndexable(e):h.HAS_NATIVE_SYMBOL&&Ht(e)?Ut.from(e):Bt(e)?Ft.fromForEachable(e):Ft.fromIndexable(e)}(e.inner):function(e){if(!(0,h.isObject)(e))return null
-return Array.isArray(e)?Dt.from(e):(0,h.isEmberArray)(e)?Nt.from(e):h.HAS_NATIVE_SYMBOL&&Ht(e)?zt.from(e):Bt(e)?Dt.fromForEachable(e):null}(e)},getProp:n._getProp,setProp:n._setProp,getPath:n.get,setPath:n.set,scheduleDestroy(e,t){(0,f.schedule)("actions",null,t,e)},scheduleDestroyed(e){(0,f.schedule)("destroy",null,e)},warnIfStyleNotTrusted(e){},assert(e,t,r){},deprecate(e,t,r){}})
-x.ENV._DISABLE_PROPERTY_FALLBACK_DEPRECATION
-class $t{constructor(e,t){this.owner=e,this.isInteractive=t,this.enableDebugTooling=x.ENV._DEBUG_RENDER_TREE}onTransactionCommit(){}}var Wt=X((e=>{var{positional:t,named:r}=e,n=t[0],i=r.type,o=r.loc,s=r.original;(0,a.valueForRef)(i),(0,a.valueForRef)(o),(0,a.valueForRef)(s)
-return(0,a.createComputeRef)((()=>{var e=(0,a.valueForRef)(n)
-return e}))})),qt=X((e=>e.positional[0])),Vt=X((e=>{var{positional:t}=e
-return(0,a.createComputeRef)((()=>{var e=(0,a.valueForRef)(t[0]).split("."),r=e[e.length-1],n=(0,a.valueForRef)(t[1])
-return!0===n?(0,s.dasherize)(r):n||0===n?String(n):""}))})),Gt=X(((e,t)=>{var r,{positional:n}=e,i=n[0],o=(0,a.valueForRef)(i)
-return(0,a.createConstRef)(null===(r=t.factoryFor(o))||void 0===r?void 0:r.class,`(-resolve "${o}")`)})),Kt=X((e=>{var{positional:t}=e,r=t[0]
-return(0,a.createComputeRef)((()=>{var e=(0,a.valueForRef)(r)
-return(0,h.isObject)(e)&&(0,l.consumeTag)((0,n.tagForProperty)(e,"[]")),e}))})),Yt=X((e=>{var{positional:t}=e,r=t[0]
-return(0,a.createInvokableRef)(r)})),Qt=X((e=>{var{positional:r,named:n}=e
-return(0,a.createComputeRef)((()=>new C.QueryParams((0,t.assign)({},(0,v.reifyNamed)(n)))))})),Jt=X((e=>{var{positional:t}=e
-return(0,a.createReadOnlyRef)(t[0])})),Xt=X((e=>{var{positional:t,named:r}=e
-return(0,a.createUnboundRef)((0,a.valueForRef)(t[0]),"(resurt of an `unbound` helper)")})),Zt=["alt","shift","meta","ctrl"],er=/^click|mouse|touch/
-var tr={registeredActions:u.ActionManager.registeredActions,registerAction(e){var{actionId:t}=e
-return u.ActionManager.registeredActions[t]=e,t},unregisterAction(e){var{actionId:t}=e
-delete u.ActionManager.registeredActions[t]}}
-class rr{constructor(e,t,r,n,i){this.tag=(0,l.createUpdatableTag)(),this.element=e,this.actionId=t,this.actionArgs=r,this.namedArgs=n,this.positional=i,this.eventName=this.getEventName(),(0,c.registerDestructor)(this,(()=>tr.unregisterAction(this)))}getEventName(){var{on:e}=this.namedArgs
-return void 0!==e?(0,a.valueForRef)(e):"click"}getActionArgs(){for(var e=new Array(this.actionArgs.length),t=0;t<this.actionArgs.length;t++)e[t]=(0,a.valueForRef)(this.actionArgs[t])
-return e}getTarget(){var{implicitTarget:e,namedArgs:t}=this,{target:r}=t
-return void 0!==r?(0,a.valueForRef)(r):(0,a.valueForRef)(e)}handler(e){var{actionName:t,namedArgs:r}=this,{bubbles:n,preventDefault:i,allowedKeys:o}=r,s=void 0!==n?(0,a.valueForRef)(n):void 0,l=void 0!==i?(0,a.valueForRef)(i):void 0,c=void 0!==o?(0,a.valueForRef)(o):void 0,d=this.getTarget(),h=!1!==s
-return!function(e,t){if(null==t){if(er.test(e.type))return(0,u.isSimpleClick)(e)
-t=""}if(t.indexOf("any")>=0)return!0
-for(var r=0;r<Zt.length;r++)if(e[Zt[r]+"Key"]&&-1===t.indexOf(Zt[r]))return!1
-return!0}(e,c)||(!1!==l&&e.preventDefault(),h||e.stopPropagation(),(0,f.join)((()=>{var e=this.getActionArgs(),r={args:e,target:d,name:null}
-"function"!=typeof t[ee]?(0,a.isInvokableRef)(t)?(0,p.flaggedInstrument)("interaction.ember-action",r,(()=>{(0,a.updateRef)(t,e[0])})):"function"!=typeof t?(r.name=t,d.send?(0,p.flaggedInstrument)("interaction.ember-action",r,(()=>{d.send.apply(d,[t,...e])})):(0,p.flaggedInstrument)("interaction.ember-action",r,(()=>{d[t].apply(d,e)}))):(0,p.flaggedInstrument)("interaction.ember-action",r,(()=>{t.apply(d,e)})):(0,p.flaggedInstrument)("interaction.ember-action",r,(()=>{t[ee].apply(t,e)}))})),h)}}var nr=new class{create(e,t,r,n){for(var{named:i,positional:o}=n,s=[],a=2;a<o.length;a++)s.push(o[a])
-var l=(0,h.uuid)(),u=new rr(t,l,s,i,o)
-return u}getDebugName(){return"action"}install(e){var t,r,n,{element:i,actionId:o,positional:s}=e
-s.length>1&&(n=s[0],r=s[1],t=(0,a.isInvokableRef)(r)?r:(0,a.valueForRef)(r))
-e.actionName=t,e.implicitTarget=n,tr.registerAction(e),i.setAttribute("data-ember-action",""),i.setAttribute(`data-ember-action-${o}`,String(o))}update(e){var{positional:t}=e,r=t[1];(0,a.isInvokableRef)(r)||(e.actionName=(0,a.valueForRef)(r)),e.eventName=e.getEventName()}getTag(e){return e.tag}getDestroyable(e){return e}},ir=(0,d.setInternalModifierManager)(nr,{}),or={dynamicLayout:!0,dynamicTag:!1,prepareArgs:!1,createArgs:!0,attributeHook:!1,elementHook:!1,createCaller:!0,dynamicScope:!0,updateHook:!0,createInstance:!0,wrapped:!1,willDestroy:!1,hasSubOwner:!0}
-var sr=new class{getDynamicLayout(e){var t=e.engine.lookup("template:application")
-return(0,m.unwrapTemplate)(t(e.engine)).asLayout()}getCapabilities(){return or}getOwner(e){return e.engine}create(e,t,r,n){var{name:i}=t,o=e.buildChildEngineInstance(i)
-o.boot()
-var s,l,u,d=o.factoryFor("controller:application")||(0,C.generateControllerFactory)(o,"application")
-if(r.named.has("model")&&(u=r.named.get("model")),void 0===u)l={engine:o,controller:s=d.create(),self:(0,a.createConstRef)(s,"this"),modelRef:u}
-else{var h=(0,a.valueForRef)(u)
-l={engine:o,controller:s=d.create({model:h}),self:(0,a.createConstRef)(s,"this"),modelRef:u}}return n.debugRenderTree&&(0,c.associateDestroyableChild)(o,s),l}getDebugName(e){var{name:t}=e
-return t}getDebugCustomRenderTree(e,t,r,n){return[{bucket:t.engine,instance:t.engine,type:"engine",name:e.name,args:r},{bucket:t.controller,instance:t.controller,type:"route-template",name:"application",args:r,template:n}]}getSelf(e){var{self:t}=e
-return t}getDestroyable(e){return e.engine}didCreate(){}didUpdate(){}didRenderLayout(){}didUpdateLayout(){}update(e){var{controller:t,modelRef:r}=e
-void 0!==r&&t.set("model",(0,a.valueForRef)(r))}}
-class ar{constructor(e){this.resolvedName=e,this.handle=-1,this.manager=sr,this.compilable=null,this.capabilities=(0,d.capabilityFlagsFrom)(or),this.state={name:e}}}var lr,ur,cr,dr=X(((e,t)=>{var r,n,i,o=e.positional[0]
-return r=(0,v.createCapturedArgs)(e.named,v.EMPTY_POSITIONAL),(0,a.createComputeRef)((()=>{var e=(0,a.valueForRef)(o)
-return"string"==typeof e?n===e?i:(n=e,i=(0,v.curry)(0,new ar(e),t,r,!0)):(i=null,n=null,null)}))})),hr=X(((e,t,r)=>{var n
-n=0===e.positional.length?(0,a.createPrimitiveRef)("main"):e.positional[0]
-var i=(0,a.createComputeRef)((()=>{var e=(0,a.valueForRef)(r.get("outletState")),t=void 0!==e?e.outlets:void 0
-return void 0!==t?t[(0,a.valueForRef)(n)]:void 0})),o=null,s=null
-return(0,a.createComputeRef)((()=>{var e,r,n=(0,a.valueForRef)(i),l=function(e,t){if(void 0===t)return null
-var r=t.render
-if(void 0===r)return null
-var n=r.template
-if(void 0===n)return null
-j(n)&&(n=n(r.owner))
-return{ref:e,name:r.name,outlet:r.outlet,template:n,controller:r.controller,model:r.model}}(i,n)
-if(!function(e,t){if(null===e)return null===t
-if(null===t)return!1
-return e.template===t.template&&e.controller===t.controller}(l,o))if(o=l,null!==l){var u=(0,m.dict)()
-u.model=(0,a.childRefFromParts)(i,["render","model"])
-var c=(0,v.createCapturedArgs)(u,v.EMPTY_POSITIONAL)
-s=(0,v.curry)(0,new Ct(l),null!==(r=null===(e=null==n?void 0:n.render)||void 0===e?void 0:e.owner)&&void 0!==r?r:t,c,!0)}else s=null
-return s}))}))
-function pr(e){return{object:`component:${e}`}}o.PARTIALS&&(lr=function(e,t){if(null!==e){var r=ur(t,cr(e),e)
-return r}},ur=function(e,t,r){if(o.PARTIALS){if(!r)return
-if(!e)throw new k.default("Container was not found when looking up a views template. This is most likely due to manually instantiating an Ember.View. See: http://git.io/EKPpnA")
-return e.lookup(`template:${t}`)||e.lookup(`template:${r}`)}},cr=function(e){var t=e.split("/"),r=t[t.length-1]
-return t[t.length-1]=`_${r}`,t.join("/")})
-var fr={action:te,mut:Yt,readonly:Jt,unbound:Xt,"query-params":Qt,"-hash":v.hash,"-each-in":jt,"-normalize-class":Vt,"-resolve":Gt,"-track-array":Kt,"-mount":dr,"-outlet":hr,"-in-el-null":qt}
-fr["-disallow-dynamic-resolution"]=Wt
-var mr=(0,t.assign)((0,t.assign)({},fr),{array:v.array,concat:v.concat,fn:v.fn,get:v.get,hash:v.hash}),gr={action:ir},vr=(0,t.assign)((0,t.assign)({},gr),{on:v.on})
-new m._WeakSet
-class br{constructor(){this.componentDefinitionCache=new Map}lookupPartial(e,t){if(o.PARTIALS){var n=lr(e,t)(t)
-return new r.PartialDefinitionImpl(e,n)}return null}lookupHelper(e,t){var r=mr[e]
-if(void 0!==r)return r
-var n=t.factoryFor(`helper:${e}`)
-if(void 0===n)return null
-var i=n.class
-return void 0===i?null:"function"==typeof i&&!0===i[bt]?((0,d.setInternalHelperManager)(_t,n),n):i}lookupBuiltInHelper(e){var t
-return null!==(t=fr[e])&&void 0!==t?t:null}lookupModifier(e,t){var r=vr[e]
-if(void 0!==r)return r
-var n=t.factoryFor(`modifier:${e}`)
-return void 0===n?null:n.class||null}lookupBuiltInModifier(e){var t
-return null!==(t=gr[e])&&void 0!==t?t:null}lookupComponent(e,t){var r=function(e,t,r){var n=function(e,t,r){var n=`component:${e}`
-return t.factoryFor(n,r)||null}(t,e,r)
-if(null!==n&&void 0!==n.class){var i=(0,d.getComponentTemplate)(n.class)
-if(void 0!==i)return{component:n,layout:i}}var o=function(e,t,r){var n=`template:components/${e}`
-return t.lookup(n,r)||null}(t,e,r)
-return null===n&&null===o?null:{component:n,layout:o}}(t,e)
-if(null===r)return null
-var n,i=null
-n=null===r.component?i=r.layout(t):r.component
-var o=this.componentDefinitionCache.get(n)
-if(void 0!==o)return o
-null===i&&null!==r.layout&&(i=r.layout(t))
-var s=(0,p._instrumentStart)("render.getComponentDefinition",pr,e),a=null
-if(null===r.component)if(x.ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS)a={state:(0,v.templateOnlyComponent)(void 0,e),manager:v.TEMPLATE_ONLY_COMPONENT_MANAGER,template:i}
-else{var l=t.factoryFor(P.privatize`component:-default`)
-a={state:l,manager:(0,d.getInternalComponentManager)(l.class),template:i}}else{var u=r.component,c=u.class,h=(0,d.getInternalComponentManager)(c)
-a={state:_e(h)?u:c,manager:h,template:i}}return s(),this.componentDefinitionCache.set(n,a),a}}class yr{constructor(e,t){this.view=e,this.outletState=t}child(){return new yr(this.view,this.outletState)}get(e){return this.outletState}set(e,t){return this.outletState=t,t}}class _r{constructor(e,t,r,n,i,o,s,a,l){this.root=e,this.runtime=t,this.id=(0,u.getViewId)(e),this.result=void 0,this.destroyed=!1,this.render=()=>{var e=(0,m.unwrapTemplate)(i).asLayout(),u=(0,v.renderMain)(t,r,n,o,l(t.env,{element:s,nextSibling:null}),e,a),c=this.result=u.sync()
-this.render=()=>c.rerender({alwaysRevalidate:!1})}}isFor(e){return this.root===e}destroy(){var{result:e,runtime:{env:t}}=this
-this.destroyed=!0,this.runtime=void 0,this.root=null,this.result=void 0,this.render=void 0,void 0!==e&&(0,v.inTransaction)(t,(()=>(0,c.destroy)(e)))}}var wr=[]
-function Or(e){var t=wr.indexOf(e)
-wr.splice(t,1)}function xr(){}var Pr=null
-var Sr=0
-f._backburner.on("begin",(function(){for(var e=0;e<wr.length;e++)wr[e]._scheduleRevalidate()})),f._backburner.on("end",(function(){for(var e=0;e<wr.length;e++)if(!wr[e]._isValid()){if(Sr>x.ENV._RERENDER_LOOP_LIMIT)throw Sr=0,wr[e].destroy(),new Error("infinite rendering invalidation detected")
-return Sr++,f._backburner.join(null,xr)}Sr=0,function(){if(null!==Pr){var e=Pr.resolve
-Pr=null,f._backburner.join(null,e)}}()}))
-class Tr{constructor(e,t,n,i,o,s){void 0===s&&(s=v.clientBuilder),this._inRenderTransaction=!1,this._lastRevision=-1,this._destroyed=!1,this._owner=e,this._rootTemplate=i(e),this._viewRegistry=o,this._roots=[],this._removedRoots=[],this._builder=s,this._isInteractive=n.isInteractive
-var a=this._runtimeResolver=new br,l=(0,M.artifacts)()
-this._context=(0,r.programCompilationContext)(l,a)
-var u=new $t(e,n.isInteractive)
-this._runtime=(0,v.runtimeContext)({appendOperations:n.hasDOM?new v.DOMTreeConstruction(t):new S.NodeDOMTreeConstruction(t),updateOperations:new v.DOMChanges(t)},u,l,a)}static create(e){var{document:t,env:r,rootTemplate:n,_viewRegistry:i,builder:o}=e
-return new this((0,g.getOwner)(e),t,r,n,i,o)}get debugRenderTree(){var{debugRenderTree:e}=this._runtime.env
-return e}appendOutletView(e,r){var n=function(e){if(x.ENV._APPLICATION_TEMPLATE_WRAPPER){var r=(0,t.assign)({},St,{dynamicTag:!0,elementHook:!0,wrapped:!0}),n=new class extends Tt{getTagName(){return"div"}getCapabilities(){return r}didCreateElement(e,t){t.setAttribute("class","ember-view"),t.setAttribute("id",(0,h.guidFor)(e))}}
-return new Ct(e.state,n)}return new Ct(e.state)}(e)
-this._appendDefinition(e,(0,v.curry)(0,n,e.owner,null,!0),r)}appendTo(e,t){var r=new At(e)
-this._appendDefinition(e,(0,v.curry)(0,r,this._owner,null,!0),t)}_appendDefinition(e,t,r){var n=(0,a.createConstRef)(t,"this"),i=new yr(null,a.UNDEFINED_REFERENCE),o=new _r(e,this._runtime,this._context,this._owner,this._rootTemplate,n,r,i,this._builder)
-this._renderRoot(o)}rerender(){this._scheduleRevalidate()}register(e){var t=(0,u.getViewId)(e)
-this._viewRegistry[t]=e}unregister(e){delete this._viewRegistry[(0,u.getViewId)(e)]}remove(e){e._transitionTo("destroying"),this.cleanupRootFor(e),this._isInteractive&&e.trigger("didDestroyElement")}cleanupRootFor(e){if(!this._destroyed)for(var t=this._roots,r=this._roots.length;r--;){var n=t[r]
-n.isFor(e)&&(n.destroy(),t.splice(r,1))}}destroy(){this._destroyed||(this._destroyed=!0,this._clearAllRoots())}getElement(e){if(this._isInteractive)return(0,u.getViewElement)(e)
-throw new Error("Accessing `this.element` is not allowed in non-interactive environments (such as FastBoot).")}getBounds(e){var t=e[pe]
-return{parentElement:t.parentElement(),firstNode:t.firstNode(),lastNode:t.lastNode()}}createElement(e){return this._runtime.env.getAppendOperations().createElement(e)}_renderRoot(e){var t,{_roots:r}=this
-r.push(e),1===r.length&&(t=this,wr.push(t)),this._renderRootsTransaction()}_renderRoots(){var e,{_roots:t,_runtime:r,_removedRoots:n}=this
-do{e=t.length,(0,v.inTransaction)(r.env,(()=>{for(var r=0;r<t.length;r++){var i=t[r]
-i.destroyed?n.push(i):r>=e||i.render()}this._lastRevision=(0,l.valueForTag)(l.CURRENT_TAG)}))}while(t.length>e)
-for(;n.length;){var i=n.pop(),o=t.indexOf(i)
-t.splice(o,1)}0===this._roots.length&&Or(this)}_renderRootsTransaction(){if(!this._inRenderTransaction){this._inRenderTransaction=!0
-var e=!1
-try{this._renderRoots(),e=!0}finally{e||(this._lastRevision=(0,l.valueForTag)(l.CURRENT_TAG)),this._inRenderTransaction=!1}}}_clearAllRoots(){for(var e=this._roots,t=0;t<e.length;t++){e[t].destroy()}this._removedRoots.length=0,this._roots=[],e.length&&Or(this)}_scheduleRevalidate(){f._backburner.scheduleOnce("render",this,this._revalidate)}_isValid(){return this._destroyed||0===this._roots.length||(0,l.validateTag)(l.CURRENT_TAG,this._lastRevision)}_revalidate(){this._isValid()||this._renderRootsTransaction()}}e.Renderer=Tr
-var Er={}
-var Cr=(0,r.templateFactory)({id:"E6sfwpuG",block:'[[[41,[30,0,["modernized"]],[[[11,3],[16,1,[30,0,["id"]]],[16,0,[30,0,["class"]]],[16,"role",[30,0,["role"]]],[16,"title",[30,0,["title"]]],[16,"rel",[30,0,["rel"]]],[16,"tabindex",[30,0,["tabindex"]]],[16,"target",[30,0,["target"]]],[17,1],[16,6,[30,0,["href"]]],[4,[38,1],["click",[30,0,["click"]]],null],[12],[18,3,null],[13]],[]],[[[44,[[50,"-link-to",0,null,null]],[[[8,[30,2],[[17,1]],[["@__ARGS__"],[[30,0,["args"]]]],[["default"],[[[[18,3,null]],[]]]]]],[2]]]],[]]]],["&attrs","LegacyLinkTo","&default"],false,["if","on","yield","let","component"]]',moduleName:"packages/@ember/-internals/glimmer/lib/templates/link-to.hbs",isStrictMode:!1}),kr=function(e,t,r,n){var i,o=arguments.length,s=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n
-if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n)
-else for(var a=e.length-1;a>=0;a--)(i=e[a])&&(s=(o<3?i(s):o>3?i(t,r,s):i(t,r))||s)
-return o>3&&s&&Object.defineProperty(t,r,s),s},Mr=[],Ar={}
-function Rr(e){return null==e}function jr(e){return!Rr(e)}function Ir(e){return"object"==typeof e&&null!==e&&!0===e.isQueryParams}(0,i.debugFreeze)(Mr),(0,i.debugFreeze)(Ar)
-class Dr extends Le{constructor(){super(...arguments),this.modernized=this.shouldModernize(),this.currentRouteCache=(0,l.createCache)((()=>((0,l.consumeTag)((0,l.tagFor)(this.routing,"currentState")),(0,l.untrack)((()=>this.routing.currentRouteName)))))}static toString(){return"LinkTo"}validateArguments(){super.validateArguments()}get class(){var e="ember-view"
-return this.isActive?(e+=this.classFor("active"),!1===this.willBeActive&&(e+=" ember-transitioning-out")):this.willBeActive&&(e+=" ember-transitioning-in"),this.isLoading&&(e+=this.classFor("loading")),this.isDisabled&&(e+=this.classFor("disabled")),e}get href(){if(this.isLoading)return"#"
-var{routing:e,route:t,models:r,query:n}=this
-return(0,l.consumeTag)((0,l.tagFor)(e,"currentState")),e.generateURL(t,r,n)}click(e){if((0,u.isSimpleClick)(e)){var t=e.currentTarget
-if((""===t.target||"_self"===t.target)&&(this.preventDefault(e),!this.isDisabled&&!this.isLoading)){var{routing:r,route:n,models:i,query:o,replace:s}=this,a={routeName:n,queryParams:o,transition:void 0};(0,p.flaggedInstrument)("interaction.link-to",a,(()=>{a.transition=r.transitionTo(n,i,o,s)}))}}}get route(){if("route"in this.args.named){var e=this.named("route")
-return e&&this.namespaceRoute(e)}return this.currentRoute}get currentRoute(){return(0,l.getValue)(this.currentRouteCache)}get models(){if("models"in this.args.named){var e=this.named("models")
-return e}return"model"in this.args.named?[this.named("model")]:Mr}get query(){if("query"in this.args.named){var e=this.named("query")
-return(0,t.assign)({},e)}return Ar}get replace(){return!0===this.named("replace")}get isActive(){return this.isActiveForState(this.routing.currentState)}get willBeActive(){var e=this.routing.currentState,t=this.routing.targetState
-return e===t?null:this.isActiveForState(t)}get isLoading(){return Rr(this.route)||this.models.some((e=>Rr(e)))}get isDisabled(){return Boolean(this.named("disabled"))}get isEngine(){return void 0!==(0,_.getEngineParent)(this.owner)}get engineMountPoint(){return this.owner.mountPoint}classFor(e){var t=this.named(`${e}Class`)
-return!0===t||Rr(t)?` ${e}`:t?` ${t}`:""}namespaceRoute(e){var{engineMountPoint:t}=this
-return void 0===t?e:"application"===e?t:`${t}.${e}`}isActiveForState(e){if(!jr(e))return!1
-if(this.isLoading)return!1
-var t=this.named("current-when")
-if("boolean"==typeof t)return t
-if("string"==typeof t){var{models:r,routing:n}=this
-return t.split(" ").some((t=>n.isActiveForRoute(r,void 0,this.namespaceRoute(t),e)))}var{route:i,models:o,query:s,routing:a}=this
-return a.isActiveForRoute(o,s,i,e)}preventDefault(e){e.preventDefault()}shouldModernize(){return Boolean(!0)&&!1===we._wasReopened&&!1===b.TargetActionSupport._wasReopened&&!1===Me._wasReopened}isSupportedArgument(e){return-1!==["route","model","models","query","replace","disabled","current-when","activeClass","loadingClass","disabledClass"].indexOf(e)||super.isSupportedArgument(e)}}kr([(0,w.inject)("-routing")],Dr.prototype,"routing",void 0),kr([O.action],Dr.prototype,"click",null)
-var{prototype:Nr}=Dr,Fr=(e,t)=>e?Object.getOwnPropertyDescriptor(e,t)||Fr(Object.getPrototypeOf(e),t):null
-$e(Dr),We(Dr,["id",["id","elementId"],"class",["class","classNames"],["role","ariaRole"],"title","rel","tabindex","target"]),qe(Dr)
-var Lr=Nr.onUnsupportedArgument
-Object.defineProperty(Nr,"onUnsupportedArgument",{configurable:!0,enumerable:!1,value:function(e){"href"===e||Lr.call(this,e)}})
-var zr=Nr.onUnsupportedArgument
-Object.defineProperty(Nr,"onUnsupportedArgument",{configurable:!0,enumerable:!1,value:function(e){if("tagName"===e){this.named("tagName")
-this.modernized=!1}else zr.call(this,e)}})
-var Ur=Nr.isSupportedArgument
-Object.defineProperty(Nr,"isSupportedArgument",{configurable:!0,enumerable:!1,value:function(e){if(this.modernized){if("bubbles"===e)return!0
-if("preventDefault"===e)return!0}return Ur.call(this,e)}}),Object.defineProperty(Nr,"preventDefault",{configurable:!0,enumerable:!1,value:function(e){var t=!0,r=!1
-if("preventDefault"in this.args.named){var n=this.named("preventDefault")
-Rr(n)||n||(t=!1)}"bubbles"in this.args.named&&(!1===this.named("bubbles")&&(r=!0))
-t&&e.preventDefault(),r&&e.stopPropagation()}})
-var Br=Nr.isSupportedArgument
-Object.defineProperty(Nr,"isSupportedArgument",{configurable:!0,enumerable:!1,value:function(e){return!(!this.modernized||"disabledWhen"!==e)||Br.call(this,e)}})
-var Hr=Fr(Nr,"isDisabled"),$r=Hr.get
-Object.defineProperty(Nr,"isDisabled",{configurable:!0,enumerable:!1,get:function(){return"disabledWhen"in this.args.named?Boolean(this.named("disabledWhen")):$r.call(this)}})
-var Wr=Fr(Nr,"models"),qr=Wr.get
-Object.defineProperty(Nr,"models",{configurable:!0,enumerable:!1,get:function(){var e=qr.call(this)
-return e.length>0&&!("query"in this.args.named)&&Ir(e[e.length-1])&&(e=e.slice(0,-1)),e}})
-var Vr=Fr(Nr,"query"),Gr=Vr.get
-Object.defineProperty(Nr,"query",{configurable:!0,enumerable:!1,get:function(){var e
-if("query"in this.args.named){var t=Gr.call(this)
-return Ir(t)?null!==(e=t.values)&&void 0!==e?e:Ar:t}var r=qr.call(this)
-if(r.length>0){var n=r[r.length-1]
-if(Ir(n)&&null!==n.values)return n.values}return Ar}})
-var Kr=Nr.validateArguments
-Object.defineProperty(Nr,"validateArguments",{configurable:!0,enumerable:!1,value:function(){(0!==this.args.positional.length||"params"in this.args.named)&&(this.modernized=!1),Kr.call(this)}})
-var Yr=Nr.onUnsupportedArgument
-Object.defineProperty(Nr,"onUnsupportedArgument",{configurable:!0,enumerable:!1,value:function(e){"params"!==e&&Yr.call(this,e)}}),o.JQUERY_INTEGRATION&&Ye(Dr)
-var Qr=Ue(Dr,Cr),Jr=xt((function(e){return s.loc.apply(null,e)})),Xr=(0,r.templateFactory)({id:"3jT+eJpe",block:'[[[46,[28,[37,1],null,null],null,null,null]],[],false,["component","-outlet"]]',moduleName:"packages/@ember/-internals/glimmer/lib/templates/outlet.hbs",isStrictMode:!1}),Zr="-top-level",en="main"
-class tn{constructor(e,t,r){this._environment=e,this.owner=t,this.template=r
-var n=(0,l.createTag)(),i={outlets:{main:void 0},render:{owner:t,into:void 0,outlet:en,name:Zr,controller:void 0,model:void 0,template:r}},o=this.ref=(0,a.createComputeRef)((()=>((0,l.consumeTag)(n),i)),(e=>{(0,l.dirtyTag)(n),i.outlets.main=e}))
-this.state={ref:o,name:Zr,outlet:en,template:r,controller:void 0,model:void 0}}static extend(e){return class extends tn{static create(r){return r?super.create((0,t.assign)({},e,r)):super.create(e)}}}static reopenClass(e){(0,t.assign)(this,e)}static create(e){var{_environment:t,template:r}=e,n=(0,g.getOwner)(e),i=r(n)
-return new tn(t,n,i)}appendTo(e){var t
-t=this._environment.hasDOM&&"string"==typeof e?document.querySelector(e):e
-var r=this.owner.lookup("renderer:-dom");(0,f.schedule)("render",r,"appendOutletView",this,t)}rerender(){}setOutletState(e){(0,a.updateRef)(this.ref,e)}destroy(){}}e.OutletView=tn
-var rn=d.componentCapabilities
-e.componentCapabilities=rn
-var nn=d.modifierCapabilities
-e.modifierCapabilities=nn})),e("@ember/-internals/meta/index",["exports","@ember/-internals/meta/lib/meta"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"counters",{enumerable:!0,get:function(){return t.counters}}),Object.defineProperty(e,"Meta",{enumerable:!0,get:function(){return t.Meta}}),Object.defineProperty(e,"meta",{enumerable:!0,get:function(){return t.meta}}),Object.defineProperty(e,"peekMeta",{enumerable:!0,get:function(){return t.peekMeta}}),Object.defineProperty(e,"setMeta",{enumerable:!0,get:function(){return t.setMeta}}),Object.defineProperty(e,"UNDEFINED",{enumerable:!0,get:function(){return t.UNDEFINED}})})),e("@ember/-internals/meta/lib/meta",["exports","@ember/-internals/utils","@ember/debug","@glimmer/destroyable"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.setMeta=d,e.peekMeta=h,e.counters=e.meta=e.Meta=e.UNDEFINED=void 0
-var i,o=Object.prototype
-e.counters=i
-var s=(0,t.symbol)("undefined")
-e.UNDEFINED=s
-var a=1
-class l{constructor(e){this._listenersVersion=1,this._inheritedEnd=-1,this._flattenedVersion=0,this._parent=void 0,this._descriptors=void 0,this._mixins=void 0,this._lazyChains=void 0,this._values=void 0,this._revisions=void 0,this._isInit=!1,this.source=e,this.proto=void 0===e.constructor?void 0:e.constructor.prototype,this._listeners=void 0}get parent(){var e=this._parent
-if(void 0===e){var t=u(this.source)
-this._parent=e=null===t||t===o?null:p(t)}return e}setSourceDestroying(){}setSourceDestroyed(){}isSourceDestroying(){return(0,n.isDestroying)(this.source)}isSourceDestroyed(){return(0,n.isDestroyed)(this.source)}setInitializing(){this._isInit=!0}unsetInitializing(){this._isInit=!1}isInitializing(){return this._isInit}isPrototypeMeta(e){return this.proto===this.source&&this.source===e}_getOrCreateOwnMap(e){return this[e]||(this[e]=Object.create(null))}_getOrCreateOwnSet(e){return this[e]||(this[e]=new Set)}_findInheritedMap(e,t){for(var r=this;null!==r;){var n=r[e]
-if(void 0!==n){var i=n.get(t)
-if(void 0!==i)return i}r=r.parent}}_hasInInheritedSet(e,t){for(var r=this;null!==r;){var n=r[e]
-if(void 0!==n&&n.has(t))return!0
-r=r.parent}return!1}valueFor(e){var t=this._values
-return void 0!==t?t[e]:void 0}setValueFor(e,t){this._getOrCreateOwnMap("_values")[e]=t}revisionFor(e){var t=this._revisions
-return void 0!==t?t[e]:void 0}setRevisionFor(e,t){this._getOrCreateOwnMap("_revisions")[e]=t}writableLazyChainsFor(e){var t=this._getOrCreateOwnMap("_lazyChains"),r=t[e]
-return void 0===r&&(r=t[e]=[]),r}readableLazyChainsFor(e){var t=this._lazyChains
-if(void 0!==t)return t[e]}addMixin(e){this._getOrCreateOwnSet("_mixins").add(e)}hasMixin(e){return this._hasInInheritedSet("_mixins",e)}forEachMixins(e){for(var t,r=this;null!==r;){var n=r._mixins
-void 0!==n&&(t=void 0===t?new Set:t,n.forEach((r=>{t.has(r)||(t.add(r),e(r))}))),r=r.parent}}writeDescriptors(e,t){(this._descriptors||(this._descriptors=new Map)).set(e,t)}peekDescriptors(e){var t=this._findInheritedMap("_descriptors",e)
-return t===s?void 0:t}removeDescriptors(e){this.writeDescriptors(e,s)}forEachDescriptors(e){for(var t,r=this;null!==r;){var n=r._descriptors
-void 0!==n&&(t=void 0===t?new Set:t,n.forEach(((r,n)=>{t.has(n)||(t.add(n),r!==s&&e(n,r))}))),r=r.parent}}addToListeners(e,t,r,n,i){this.pushListener(e,t,r,n?1:0,i)}removeFromListeners(e,t,r){this.pushListener(e,t,r,2)}pushListener(e,t,r,n,i){void 0===i&&(i=!1)
-var o=this.writableListeners(),s=f(o,e,t,r)
-if(-1!==s&&s<this._inheritedEnd&&(o.splice(s,1),this._inheritedEnd--,s=-1),-1===s)o.push({event:e,target:t,method:r,kind:n,sync:i})
-else{var a=o[s]
-2===n&&2!==a.kind?o.splice(s,1):(a.kind=n,a.sync=i)}}writableListeners(){return this._flattenedVersion!==a||this.source!==this.proto&&-1!==this._inheritedEnd||a++,-1===this._inheritedEnd&&(this._inheritedEnd=0,this._listeners=[]),this._listeners}flattenedListeners(){if(this._flattenedVersion<a){0
-var e=this.parent
-if(null!==e){var t=e.flattenedListeners()
-if(void 0!==t)if(void 0===this._listeners)this._listeners=t
-else{var r=this._listeners
-this._inheritedEnd>0&&(r.splice(0,this._inheritedEnd),this._inheritedEnd=0)
-for(var n=0;n<t.length;n++){var i=t[n];-1===f(r,i.event,i.target,i.method)&&(r.unshift(i),this._inheritedEnd++)}}}this._flattenedVersion=a}return this._listeners}matchingListeners(e){var t,r=this.flattenedListeners()
-if(void 0!==r)for(var n=0;n<r.length;n++){var i=r[n]
-i.event!==e||0!==i.kind&&1!==i.kind||(void 0===t&&(t=[]),t.push(i.target,i.method,1===i.kind))}return t}observerEvents(){var e,t=this.flattenedListeners()
-if(void 0!==t)for(var r=0;r<t.length;r++){var n=t[r]
-0!==n.kind&&1!==n.kind||-1===n.event.indexOf(":change")||(void 0===e&&(e=[]),e.push(n))}return e}}e.Meta=l
-var u=Object.getPrototypeOf,c=new WeakMap
-function d(e,t){c.set(e,t)}function h(e){var t=c.get(e)
-if(void 0!==t)return t
-for(var r=u(e);null!==r;){if(void 0!==(t=c.get(r)))return t.proto!==r&&(t.proto=r),t
-r=u(r)}return null}var p=function(e){var t=h(e)
-if(null!==t&&t.source===e)return t
-var r=new l(e)
-return d(e,r),r}
-function f(e,t,r,n){for(var i=e.length-1;i>=0;i--){var o=e[i]
-if(o.event===t&&o.target===r&&o.method===n)return i}return-1}e.meta=p})),e("@ember/-internals/metal/index",["exports","@ember/-internals/meta","@ember/-internals/utils","@ember/debug","@ember/-internals/environment","@ember/runloop","@glimmer/destroyable","@glimmer/validator","@glimmer/manager","@glimmer/util","@ember/error","ember/version","@ember/-internals/container","@ember/deprecated-features","@ember/polyfills","@ember/-internals/owner"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p,f,m){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.computed=je,e.autoComputed=function(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return ae(new Ae(t),Re)},e.isComputed=function(e,t){return Boolean(ue(e,t))},e.getCachedValueFor=function(e,r){var n=(0,t.peekMeta)(e)
-if(n)return n.valueFor(r)},e.alias=function(e){return ae(new De(e),Ie)},e.deprecateProperty=function(e,t,r,n){Object.defineProperty(e,t,{configurable:!0,enumerable:!1,set(e){Te(this,r,e)},get(){return Oe(this,r)}})},e._getPath=Pe,e.get=Oe,e.getWithDefault=function(e,t,r){var n=Oe(e,t)
-if(void 0===n)return r
-return n},e._getProp=xe,e.set=Te,e._setProp=Ee,e.trySet=function(e,t,r){return Te(e,t,r,!0)},e.objectAt=V,e.replace=function(e,t,r,n){void 0===n&&(n=q)
-Array.isArray(e)?K(e,t,r,n):e.replace(t,r,n)},e.replaceInNativeArray=K,e.addArrayObserver=function(e,t,r,n){void 0===n&&(n=!1)
-return Y(e,t,r,g,!1)},e.removeArrayObserver=function(e,t,r,n){void 0===n&&(n=!1)
-return Y(e,t,r,v,!0)},e.arrayContentWillChange=$,e.arrayContentDidChange=W,e.eachProxyArrayWillChange=function(e,t,r,n){var i=Le.get(e)
-void 0!==i&&i.arrayWillChange(e,t,r,n)},e.eachProxyArrayDidChange=function(e,t,r,n){var i=Le.get(e)
-void 0!==i&&i.arrayDidChange(e,t,r,n)},e.addListener=g,e.hasListeners=function(e,r){var n=(0,t.peekMeta)(e)
-if(null===n)return!1
-var i=n.matchingListeners(r)
-return void 0!==i&&i.length>0},e.on=function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n]
-var i=t.pop(),o=t
-return(0,r.setListeners)(i,o),i},e.removeListener=v,e.sendEvent=b,e.isNone=function(e){return null==e},e.isEmpty=ze
-function g(e,r,n,i,o,s){void 0===s&&(s=!0),i||"function"!=typeof n||(i=n,n=null),(0,t.meta)(e).addToListeners(r,n,i,!0===o,s)}function v(e,r,n,i){var o,s
-"object"==typeof n?(o=n,s=i):(o=null,s=n),(0,t.meta)(e).removeFromListeners(r,o,s)}function b(e,r,n,i,o){if(void 0===i){var s=void 0===o?(0,t.peekMeta)(e):o
-i=null!==s?s.matchingListeners(r):void 0}if(void 0===i||0===i.length)return!1
-for(var a=i.length-3;a>=0;a-=3){var l=i[a],u=i[a+1],c=i[a+2]
-if(u){c&&v(e,r,l,u),l||(l=e)
-var d=typeof u
-"string"!==d&&"symbol"!==d||(u=l[u]),u.apply(l,n)}}return!0}e.isBlank=Ue,e.isPresent=function(e){return!Ue(e)},e.beginPropertyChanges=U,e.changeProperties=H,e.endPropertyChanges=B,e.notifyPropertyChange=z,e.defineProperty=ge,e.isElementDescriptor=te,e.nativeDescDecorator=re,e.descriptorForDecorator=ce,e.descriptorForProperty=ue,e.isClassicDecorator=de,e.setClassicDecorator=he,e.getProperties=function(e,t){var r={},n=arguments,i=1
-2===arguments.length&&Array.isArray(t)&&(i=0,n=arguments[1])
-for(;i<n.length;i++)r[n[i]]=Oe(e,n[i])
-return r},e.setProperties=function(e,t){if(null===t||"object"!=typeof t)return t
-return H((()=>{for(var r,n=Object.keys(t),i=0;i<n.length;i++)r=n[i],Te(e,r,t[r])})),t},e.expandProperties=fe,e.addObserver=x,e.activateObserver=T,e.removeObserver=P,e.flushAsyncObservers=function(e){void 0===e&&(e=!0)
-var r=(0,a.valueForTag)(a.CURRENT_TAG)
-if(A===r)return
-A=r,O.forEach(((r,n)=>{var i=(0,t.peekMeta)(n)
-r.forEach(((r,s)=>{if(!(0,a.validateTag)(r.tag,r.lastRevision)){var l=()=>{try{b(n,s,[n,r.path],void 0,i)}finally{r.tag=Z(n,r.path,(0,a.tagMetaFor)(n),(0,t.peekMeta)(n)),r.lastRevision=(0,a.valueForTag)(r.tag)}}
-e?(0,o.schedule)("actions",l):l()}}))}))},e.mixin=function(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-return dt(e,r),e},e.observer=function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n]
-var o,s,a,l=t.pop()
-"function"==typeof l?(o=l,s=t,a=!i.ENV._DEFAULT_ASYNC_OBSERVERS):(o=l.fn,s=l.dependentKeys,a=l.sync)
-for(var u=[],c=0;c<s.length;++c)fe(s[c],(e=>u.push(e)))
-return(0,r.setObservers)(o,{paths:u,sync:a}),o},e.applyMixin=dt,e.inject=function(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-var i=te(r),o=i?void 0:r[0],s=function(t){var r=(0,m.getOwner)(this)||this.container
-return r.lookup(`${e}:${o||t}`)}
-0
-var a=je({get:s,set(e,t){ge(this,e,null,t)}})
-return i?a(r[0],r[1],r[2]):a},e.tagForProperty=D,e.tagForObject=function(e){if((0,r.isObject)(e))return(0,a.tagFor)(e,I)
-return a.CONSTANT_TAG},e.markObjectAsDirty=N,e.tracked=Ot,e.addNamespace=function(e){qe.unprocessedNamespaces=!0,Ge.push(e)},e.findNamespace=function(e){We||Je()
-return Ke[e]}
-e.findNamespaces=Ye,e.processNamespace=Qe,e.processAllNamespaces=Je,e.removeNamespace=function(e){var t=(0,r.getName)(e)
-delete Ke[t],Ge.splice(Ge.indexOf(e),1),t in i.context.lookup&&e===i.context.lookup[t]&&(i.context.lookup[t]=void 0)},e.isNamespaceSearchDisabled=function(){return We},e.setNamespaceSearchDisabled=function(e){We=Boolean(e)},Object.defineProperty(e,"createCache",{enumerable:!0,get:function(){return a.createCache}}),Object.defineProperty(e,"getValue",{enumerable:!0,get:function(){return a.getValue}}),Object.defineProperty(e,"isConst",{enumerable:!0,get:function(){return a.isConst}}),e.NAMESPACES_BY_ID=e.NAMESPACES=e.TrackedDescriptor=e.DEBUG_INJECTION_FUNCTIONS=e.aliasMethod=e.Mixin=e.SYNC_OBSERVERS=e.ASYNC_OBSERVERS=e.Libraries=e.libraries=e.PROPERTY_DID_CHANGE=e.PROXY_CONTENT=e.ComputedProperty=void 0
-function y(e){return e+":change"}var _=!i.ENV._DEFAULT_ASYNC_OBSERVERS,w=new Map
-e.SYNC_OBSERVERS=w
-var O=new Map
-function x(e,r,n,i,o){void 0===o&&(o=_)
-var s=y(r)
-g(e,s,n,i,!1,o)
-var a=(0,t.peekMeta)(e)
-null!==a&&(a.isPrototypeMeta(e)||a.isInitializing())||T(e,s,o)}function P(e,r,n,i,o){void 0===o&&(o=_)
-var s=y(r),a=(0,t.peekMeta)(e)
-null!==a&&(a.isPrototypeMeta(e)||a.isInitializing())||k(e,s,o),v(e,s,n,i)}function S(e,t){var r=!0===t?w:O
-return r.has(e)||(r.set(e,new Map),(0,s.registerDestructor)(e,(()=>function(e){w.size>0&&w.delete(e)
-O.size>0&&O.delete(e)}(e)),!0)),r.get(e)}function T(e,r,n){void 0===n&&(n=!1)
-var i=S(e,n)
-if(i.has(r))i.get(r).count++
-else{var o=r.substring(0,r.lastIndexOf(":")),s=Z(e,o,(0,a.tagMetaFor)(e),(0,t.peekMeta)(e))
-i.set(r,{count:1,path:o,tag:s,lastRevision:(0,a.valueForTag)(s),suspended:!1})}}e.ASYNC_OBSERVERS=O
-var E=!1,C=[]
-function k(e,t,r){if(void 0===r&&(r=!1),!0!==E){var n=!0===r?w:O,i=n.get(e)
-if(void 0!==i){var o=i.get(t)
-o.count--,0===o.count&&(i.delete(t),0===i.size&&n.delete(e))}}else C.push([e,t,r])}function M(e){O.has(e)&&O.get(e).forEach((r=>{r.tag=Z(e,r.path,(0,a.tagMetaFor)(e),(0,t.peekMeta)(e)),r.lastRevision=(0,a.valueForTag)(r.tag)})),w.has(e)&&w.get(e).forEach((r=>{r.tag=Z(e,r.path,(0,a.tagMetaFor)(e),(0,t.peekMeta)(e)),r.lastRevision=(0,a.valueForTag)(r.tag)}))}var A=0
-function R(){w.forEach(((e,r)=>{var n=(0,t.peekMeta)(r)
-e.forEach(((e,i)=>{if(!e.suspended&&!(0,a.validateTag)(e.tag,e.lastRevision))try{e.suspended=!0,b(r,i,[r,e.path],void 0,n)}finally{e.tag=Z(r,e.path,(0,a.tagMetaFor)(r),(0,t.peekMeta)(r)),e.lastRevision=(0,a.valueForTag)(e.tag),e.suspended=!1}}))}))}function j(e,t,r){var n=w.get(e)
-if(n){var i=n.get(y(t))
-i&&(i.suspended=r)}}var I=(0,r.symbol)("SELF_TAG")
-function D(e,t,r,n){void 0===r&&(r=!1)
-var i=(0,l.getCustomTagFor)(e)
-if(void 0!==i)return i(e,t,r)
-var o=(0,a.tagFor)(e,t,n)
-return o}function N(e,t){(0,a.dirtyTagFor)(e,t),(0,a.dirtyTagFor)(e,I)}var F=(0,r.enumerableSymbol)("PROPERTY_DID_CHANGE")
-e.PROPERTY_DID_CHANGE=F
-var L=0
-function z(e,r,n,i){var o=void 0===n?(0,t.peekMeta)(e):n
-null!==o&&(o.isInitializing()||o.isPrototypeMeta(e))||(N(e,r),L<=0&&R(),F in e&&(4===arguments.length?e[F](r,i):e[F](r)))}function U(){L++,E=!0}function B(){--L<=0&&(R(),function(){for(var[e,t,r]of(E=!1,C))k(e,t,r)
-C=[]}())}function H(e){U()
-try{e()}finally{B()}}function $(e,t,r,n){return void 0===t?(t=0,r=n=-1):(void 0===r&&(r=-1),void 0===n&&(n=-1)),b(e,"@array:before",[e,t,r,n]),e}function W(e,r,n,i,o){void 0===o&&(o=!0),void 0===r?(r=0,n=i=-1):(void 0===n&&(n=-1),void 0===i&&(i=-1))
-var s=(0,t.peekMeta)(e)
-if(o&&((i<0||n<0||i-n!=0)&&z(e,"length",s),z(e,"[]",s)),b(e,"@array:change",[e,r,n,i]),null!==s){var a=-1===n?0:n,l=e.length-((-1===i?0:i)-a),u=r<0?l+r:r
-if(void 0!==s.revisionFor("firstObject")&&0===u&&z(e,"firstObject",s),void 0!==s.revisionFor("lastObject"))l-1<u+a&&z(e,"lastObject",s)}return e}var q=Object.freeze([])
-function V(e,t){return Array.isArray(e)?e[t]:e.objectAt(t)}var G=6e4
-function K(e,t,r,n){if($(e,t,r,n.length),n.length<=G)e.splice(t,r,...n)
-else{e.splice(t,r)
-for(var i=0;i<n.length;i+=G){var o=n.slice(i,i+G)
-e.splice(t+i,0,...o)}}W(e,t,r,n.length)}function Y(e,t,r,n,i){var o=r&&r.willChange||"arrayWillChange",s=r&&r.didChange||"arrayDidChange",a=e.hasArrayObservers
-return n(e,"@array:before",t,o),n(e,"@array:change",t,s),a===i&&z(e,"hasArrayObservers"),e}var Q=new u._WeakSet
-function J(e,n,i){var o=e.readableLazyChainsFor(n)
-if(void 0!==o){if((0,r.isObject)(i))for(var s=0;s<o.length;s++){var[l,u]=o[s];(0,a.updateTag)(l,Z(i,u,(0,a.tagMetaFor)(i),(0,t.peekMeta)(i)))}o.length=0}}function X(e,t,r,n){for(var i=[],o=0;o<t.length;o++)ee(i,e,t[o],r,n)
-return(0,a.combine)(i)}function Z(e,t,r,n){return(0,a.combine)(ee([],e,t,r,n))}function ee(e,n,i,o,s){for(var l,u,c=n,d=o,h=s,p=i.length,f=-1;;){var m=f+1
-if(-1===(f=i.indexOf(".",m))&&(f=p),"@each"===(l=i.slice(m,f))&&f!==p){m=f+1,f=i.indexOf(".",m)
-var g=c.length
-if("number"!=typeof g||!Array.isArray(c)&&!("objectAt"in c))break
-if(0===g){e.push(D(c,"[]"))
-break}l=-1===f?i.slice(m):i.slice(m,f)
-for(var v=0;v<g;v++){var b=V(c,v)
-b&&(e.push(D(b,l,!0)),void 0!==(u=null!==(h=(0,t.peekMeta)(b))?h.peekDescriptors(l):void 0)&&"string"==typeof u.altKey&&b[l])}e.push(D(c,"[]",!0,d))
-break}var y=D(c,l,!0,d)
-if(u=null!==h?h.peekDescriptors(l):void 0,e.push(y),f===p){Q.has(u)&&c[l]
-break}if(void 0===u)c=l in c||"function"!=typeof c.unknownProperty?c[l]:c.unknownProperty(l)
-else if(Q.has(u))c=c[l]
-else{var _=h.source===c?h:(0,t.meta)(c),w=_.revisionFor(l)
-if(void 0===w||!(0,a.validateTag)(y,w)){var O=_.writableLazyChainsFor(l),x=i.substr(f+1),P=(0,a.createUpdatableTag)()
-O.push([P,x]),e.push(P)
-break}c=_.valueFor(l)}if(!(0,r.isObject)(c))break
-d=(0,a.tagMetaFor)(c),h=(0,t.peekMeta)(c)}return e}function te(e){var[t,r,n]=e
-return 3===e.length&&("function"==typeof t||"object"==typeof t&&null!==t)&&"string"==typeof r&&("object"==typeof n&&null!==n||void 0===n)}function re(e){var t=function(){return e}
-return he(t),t}class ne{constructor(){this.enumerable=!0,this.configurable=!0,this._dependentKeys=void 0,this._meta=void 0}setup(e,t,r,n){n.writeDescriptors(t,this)}teardown(e,t,r){r.removeDescriptors(t)}}function ie(e,t){function r(){return t.get(this,e)}return r}function oe(e,t){var r=function(r){return t.set(this,e,r)}
-return se.add(r),r}var se=new u._WeakSet
-function ae(e,r){var n=function(r,n,i,o,s){var a=3===arguments.length?(0,t.meta)(r):o
-e.setup(r,n,i,a)
-var l={enumerable:e.enumerable,configurable:e.configurable,get:ie(n,e),set:oe(n,e)}
-return l}
-return he(n,e),Object.setPrototypeOf(n,r.prototype),n}var le=new WeakMap
-function ue(e,r,n){var i=void 0===n?(0,t.peekMeta)(e):n
-if(null!==i)return i.peekDescriptors(r)}function ce(e){return le.get(e)}function de(e){return"function"==typeof e&&le.has(e)}function he(e,t){void 0===t&&(t=!0),le.set(e,t)}var pe=/\.@each$/
-function fe(e,t){var r=e.indexOf("{")
-r<0?t(e.replace(pe,".[]")):me("",e,r,t)}function me(e,t,r,n){var i,o,s=t.indexOf("}"),a=0,l=t.substring(r+1,s).split(","),u=t.substring(s+1)
-for(e+=t.substring(0,r),o=l.length;a<o;)(i=u.indexOf("{"))<0?n((e+l[a++]+u).replace(pe,".[]")):me(e+l[a++],u,i,n)}function ge(e,r,n,i,o){var s=void 0===o?(0,t.meta)(e):o,a=ue(e,r,s),l=void 0!==a
-l&&a.teardown(e,r,s),de(n)?ve(e,r,n,s):null==n?be(e,r,i,l,!0):Object.defineProperty(e,r,n),s.isPrototypeMeta(e)||M(e)}function ve(e,t,r,n){var i
-return i=r(e,t,void 0,n),Object.defineProperty(e,t,i),r}function be(e,t,r,n,i){return void 0===i&&(i=!0),!0===n||!1===i?Object.defineProperty(e,t,{configurable:!0,enumerable:i,writable:!0,value:r}):e[t]=r,r}var ye=new r.Cache(1e3,(e=>e.indexOf(".")))
-function _e(e){return"string"==typeof e&&-1!==ye.get(e)}var we=(0,r.symbol)("PROXY_CONTENT")
-function Oe(e,t){return _e(t)?Pe(e,t):xe(e,t)}function xe(e,t){var n,i=typeof e,o="object"===i
-return o||"function"===i?(void 0===(n=e[t])&&o&&!(t in e)&&"function"==typeof e.unknownProperty&&(n=e.unknownProperty(t)),(0,a.isTracking)()&&((0,a.consumeTag)((0,a.tagFor)(e,t)),(Array.isArray(n)||(0,r.isEmberArray)(n))&&(0,a.consumeTag)((0,a.tagFor)(n,"[]")))):n=e[t],n}function Pe(e,t){for(var r=e,n="string"==typeof t?t.split("."):t,i=0;i<n.length;i++){if(null==r||r.isDestroyed)return
-r=xe(r,n[i])}return r}e.PROXY_CONTENT=we,xe("foo","a"),xe("foo",1),xe({},"a"),xe({},1),xe({unkonwnProperty(){}},"a"),xe({unkonwnProperty(){}},1),Oe({},"foo"),Oe({},"foo.bar")
-var Se={}
-function Te(e,t,r,n){return e.isDestroyed?r:_e(t)?Ce(e,t,r,n):Ee(e,t,r)}function Ee(e,t,n){var i,o=(0,r.lookupDescriptor)(e,t)
-return null!==o&&se.has(o.set)?(e[t]=n,n):(void 0!==(i=e[t])||"object"!=typeof e||t in e||"function"!=typeof e.setUnknownProperty?(e[t]=n,i!==n&&z(e,t)):e.setUnknownProperty(t,n),n)}function Ce(e,t,r,n){var i=t.split("."),o=i.pop(),s=Pe(e,i)
-if(null!=s)return Te(s,o,r)
-if(!n)throw new c.default(`Property set failed: object in path "${i.join(".")}" could not be found.`)}(0,r.setProxy)(Se),(0,a.track)((()=>xe({},"a"))),(0,a.track)((()=>xe({},1))),(0,a.track)((()=>xe({a:[]},"a"))),(0,a.track)((()=>xe({a:Se},"a")))
-function ke(){}class Me extends ne{constructor(e){super(),this._volatile=!1,this._readOnly=!1,this._hasConfig=!1,this._getter=void 0,this._setter=void 0
-var t=e[e.length-1]
-if("function"==typeof t||null!==t&&"object"==typeof t){this._hasConfig=!0
-var r=e.pop()
-if("function"==typeof r)this._getter=r
-else{var n=r
-this._getter=n.get||ke,this._setter=n.set}}e.length>0&&this._property(...e)}setup(e,t,r,n){if(super.setup(e,t,r,n),!1===this._hasConfig){var{get:i,set:o}=r
-void 0!==i&&(this._getter=i),void 0!==o&&(this._setter=function(e,t){var r=o.call(this,t)
-return void 0!==i&&void 0===r?i.call(this):r})}}_property(){var e=[]
-function t(t){e.push(t)}for(var r=0;r<arguments.length;r++)fe(r<0||arguments.length<=r?void 0:arguments[r],t)
-this._dependentKeys=e}get(e,r){if(this._volatile)return this._getter.call(e,r)
-var n,i=(0,t.meta)(e),o=(0,a.tagMetaFor)(e),s=(0,a.tagFor)(e,r,o),l=i.revisionFor(r)
-if(void 0!==l&&(0,a.validateTag)(s,l))n=i.valueFor(r)
-else{var{_getter:u,_dependentKeys:c}=this;(0,a.untrack)((()=>{n=u.call(e,r)})),void 0!==c&&(0,a.updateTag)(s,X(e,c,o,i)),i.setValueFor(r,n),i.setRevisionFor(r,(0,a.valueForTag)(s)),J(i,r,n)}return(0,a.consumeTag)(s),Array.isArray(n)&&(0,a.consumeTag)((0,a.tagFor)(n,"[]")),n}set(e,r,n){if(this._readOnly&&this._throwReadOnlyError(e,r),!this._setter)return this.clobberSet(e,r,n)
-if(this._volatile)return this.volatileSet(e,r,n)
-var i,o=(0,t.meta)(e)
-o.isInitializing()&&void 0!==this._dependentKeys&&this._dependentKeys.length>0&&"function"==typeof e[F]&&e.isComponent&&x(e,r,(()=>{e[F](r)}),void 0,!0)
-try{U(),i=this._set(e,r,n,o),J(o,r,i)
-var s=(0,a.tagMetaFor)(e),l=(0,a.tagFor)(e,r,s),{_dependentKeys:u}=this
-void 0!==u&&(0,a.updateTag)(l,X(e,u,s,o)),o.setRevisionFor(r,(0,a.valueForTag)(l))}finally{B()}return i}_throwReadOnlyError(e,t){throw new c.default(`Cannot set read-only property "${t}" on object: ${(0,r.inspect)(e)}`)}clobberSet(e,r,n){return ge(e,r,null,(0,t.meta)(e).valueFor(r)),Te(e,r,n),n}volatileSet(e,t,r){return this._setter.call(e,t,r)}_set(e,t,r,n){var i,o=void 0!==n.revisionFor(t),s=n.valueFor(t),{_setter:a}=this
-j(e,t,!0)
-try{i=a.call(e,t,r,s)}finally{j(e,t,!1)}return o&&s===i||(n.setValueFor(t,i),z(e,t,n,r)),i}teardown(e,t,r){this._volatile||void 0!==r.revisionFor(t)&&(r.setRevisionFor(t,void 0),r.setValueFor(t,void 0)),super.teardown(e,t,r)}}e.ComputedProperty=Me
-class Ae extends Me{get(e,r){if(this._volatile)return this._getter.call(e,r)
-var n,i=(0,t.meta)(e),o=(0,a.tagMetaFor)(e),s=(0,a.tagFor)(e,r,o),l=i.revisionFor(r)
-if(void 0!==l&&(0,a.validateTag)(s,l))n=i.valueFor(r)
-else{var{_getter:u}=this,c=(0,a.track)((()=>{n=u.call(e,r)}));(0,a.updateTag)(s,c),i.setValueFor(r,n),i.setRevisionFor(r,(0,a.valueForTag)(s)),J(i,r,n)}return(0,a.consumeTag)(s),Array.isArray(n)&&(0,a.consumeTag)((0,a.tagFor)(n,"[]",o)),n}}class Re extends Function{readOnly(){var e=ce(this)
-return e._readOnly=!0,this}volatile(){return ce(this)._volatile=!0,this}property(){return ce(this)._property(...arguments),this}meta(e){var t=ce(this)
-return 0===arguments.length?t._meta||{}:(t._meta=e,this)}get _getter(){return ce(this)._getter}set enumerable(e){ce(this).enumerable=e}}function je(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-if(te(t)){var n=ae(new Me([]),Re)
-return n(t[0],t[1],t[2])}return ae(new Me(t),Re)}class Ie extends Function{readOnly(){return ce(this).readOnly(),this}oneWay(){return ce(this).oneWay(),this}meta(e){var t=ce(this)
-if(0===arguments.length)return t._meta||{}
-t._meta=e}}class De extends ne{constructor(e){super(),this.altKey=e}setup(e,t,r,n){super.setup(e,t,r,n),Q.add(this)}get(e,r){var n,i=(0,t.meta)(e),o=(0,a.tagMetaFor)(e),s=(0,a.tagFor)(e,r,o);(0,a.untrack)((()=>{n=Oe(e,this.altKey)}))
-var l=i.revisionFor(r)
-return void 0!==l&&(0,a.validateTag)(s,l)||((0,a.updateTag)(s,Z(e,this.altKey,o,i)),i.setRevisionFor(r,(0,a.valueForTag)(s)),J(i,r,n)),(0,a.consumeTag)(s),n}set(e,t,r){return Te(e,this.altKey,r)}readOnly(){this.set=Ne}oneWay(){this.set=Fe}}function Ne(e,t){throw new c.default(`Cannot set read-only property '${t}' on object: ${(0,r.inspect)(e)}`)}function Fe(e,t,r){return ge(e,t,null),Te(e,t,r)}var Le=new WeakMap
-function ze(e){var t=null==e
-if(t)return t
-if("number"==typeof e.size)return!e.size
-var r=typeof e
-if("object"===r){var n=Oe(e,"size")
-if("number"==typeof n)return!n}if("number"==typeof e.length&&"function"!==r)return!e.length
-if("object"===r){var i=Oe(e,"length")
-if("number"==typeof i)return!i}return!1}function Ue(e){return ze(e)||"string"==typeof e&&!1===/\S/.test(e)}class Be{constructor(){this._registry=[],this._coreLibIndex=0}_getLibraryByName(e){for(var t=this._registry,r=t.length,n=0;n<r;n++)if(t[n].name===e)return t[n]}register(e,t,r){var n=this._registry.length
-this._getLibraryByName(e)||(r&&(n=this._coreLibIndex++),this._registry.splice(n,0,{name:e,version:t}))}registerCoreLibrary(e,t){this.register(e,t,!0)}deRegister(e){var t,r=this._getLibraryByName(e)
-r&&(t=this._registry.indexOf(r),this._registry.splice(t,1))}}e.Libraries=Be
-var He=new Be
-e.libraries=He,He.registerCoreLibrary("Ember",d.default)
-var $e=Object.prototype.hasOwnProperty,We=!1,qe={_set:0,_unprocessedNamespaces:!1,get unprocessedNamespaces(){return this._unprocessedNamespaces},set unprocessedNamespaces(e){this._set++,this._unprocessedNamespaces=e}},Ve=!1,Ge=[]
-e.NAMESPACES=Ge
-var Ke=Object.create(null)
-function Ye(){if(qe.unprocessedNamespaces)for(var e,t=i.context.lookup,n=Object.keys(t),o=0;o<n.length;o++){var s=n[o]
-if((e=s.charCodeAt(0))>=65&&e<=90){var a=Ze(t,s)
-a&&(0,r.setName)(a,s)}}}function Qe(e){Xe([e.toString()],e,new Set)}function Je(){var e=qe.unprocessedNamespaces
-if(e&&(Ye(),qe.unprocessedNamespaces=!1),e||Ve){for(var t=Ge,r=0;r<t.length;r++)Qe(t[r])
-Ve=!1}}function Xe(e,t,n){var i=e.length,o=e.join(".")
-for(var s in Ke[o]=t,(0,r.setName)(t,o),t)if($e.call(t,s)){var a=t[s]
-if(e[i]=s,a&&void 0===(0,r.getName)(a))(0,r.setName)(a,e.join("."))
-else if(a&&a.isNamespace){if(n.has(a))continue
-n.add(a),Xe(e,a,n)}}e.length=i}function Ze(e,t){try{var r=e[t]
-return(null!==r&&"object"==typeof r||"function"==typeof r)&&r.isNamespace&&r}catch(n){}}e.NAMESPACES_BY_ID=Ke
-var et,tt=Array.prototype.concat,{isArray:rt}=Array
-function nt(e,t,r,n){var i=r[e]||n[e]
-return t[e]&&(i=i?tt.call(i,t[e]):t[e]),i}function it(e,t,n,i){if(!0===n)return t
-var o=n._getter
-if(void 0===o)return t
-var s=i[e],a="function"==typeof s?ce(s):s
-if(void 0===a||!0===a)return t
-var l=a._getter
-if(void 0===l)return t
-var u,c=(0,r.wrap)(o,l),d=n._setter,h=a._setter
-if(u=void 0!==h?void 0!==d?(0,r.wrap)(d,h):h:d,c!==o||u!==d){var p=n._dependentKeys||[],f=new Me([...p,{get:c,set:u}])
-return f._readOnly=n._readOnly,f._volatile=n._volatile,f._meta=n._meta,f.enumerable=n.enumerable,ae(f,Me)}return t}function ot(e,t,n,i){if(void 0!==i[e])return t
-var o=n[e]
-return"function"==typeof o?(0,r.wrap)(t,o):t}function st(e,t,n){var i=n[e],o=(0,r.makeArray)(i).concat((0,r.makeArray)(t))
-return o}function at(e,t,n){var i=n[e]
-if(!i)return t
-for(var o=(0,f.assign)({},i),s=!1,a=Object.keys(t),l=0;l<a.length;l++){var u=a[l],c=t[u]
-"function"==typeof c?(s=!0,o[u]=ot(u,c,i,{})):o[u]=c}return s&&(o._super=r.ROOT),o}function lt(e,t,r,n,i,o,s){for(var a,l=0;l<e.length;l++)if(a=e[l],gt.has(a)){if(t.hasMixin(a))continue
-t.addMixin(a)
-var{properties:u,mixins:c}=a
-void 0!==u?ut(t,u,r,n,i,o,s):void 0!==c&&(lt(c,t,r,n,i,o,s),void 0!==a._without&&a._without.forEach((e=>{var t=o.indexOf(e);-1!==t&&o.splice(t,1)})))}else ut(t,a,r,n,i,o,s)}function ut(e,t,r,n,i,o,s){for(var a=nt("concatenatedProperties",t,n,i),l=nt("mergedProperties",t,n,i),u=Object.keys(t),c=0;c<u.length;c++){var d=u[c],h=t[d]
-if(void 0!==h){if(-1===o.indexOf(d)){o.push(d)
-var p=e.peekDescriptors(d)
-if(void 0===p){var f=n[d]=i[d]
-"function"==typeof f&&ct(i,d,f,!1)}else r[d]=p,s.push(d),p.teardown(i,d,e)}var m="function"==typeof h
-if(m){var g=ce(h)
-if(void 0!==g){r[d]=it(d,h,g,r),n[d]=void 0
-continue}}a&&a.indexOf(d)>=0||"concatenatedProperties"===d||"mergedProperties"===d?h=st(d,h,n):l&&l.indexOf(d)>-1?h=at(d,h,n):m&&(h=ot(d,h,n,r)),n[d]=h,r[d]=void 0}}}function ct(e,t,n,i){var o=(0,r.observerListenerMetaFor)(n)
-if(void 0!==o){var{observers:s,listeners:a}=o
-if(void 0!==s)for(var l=i?x:P,u=0;u<s.paths.length;u++)l(e,s.paths[u],null,t,s.sync)
-if(void 0!==a)for(var c=i?g:v,d=0;d<a.length;d++)c(e,a[d],null,t)}}function dt(e,n,i){void 0===i&&(i=!1)
-var o=Object.create(null),s=Object.create(null),a=(0,t.meta)(e),l=[],u=[]
-e._super=r.ROOT,lt(n,a,o,s,e,l,u)
-for(var c=0;c<l.length;c++){var d=l[c],h=s[d],f=o[d]
-if(p.ALIAS_METHOD)for(;void 0!==h&&pt(h);){var m=et(e,h,o,s)
-f=m.desc,h=m.value}void 0!==h?("function"==typeof h&&ct(e,d,h,!0),be(e,d,h,-1!==u.indexOf(d),!i)):void 0!==f&&ve(e,d,f,a)}return a.isPrototypeMeta(e)||M(e),e}p.ALIAS_METHOD&&(et=function(e,t,r,n){var i,o=t.methodName,s=r[o],a=n[o]
-return void 0!==s||void 0!==a||(void 0!==(i=ue(e,o))?(s=i,a=void 0):(s=void 0,a=e[o])),{desc:s,value:a}})
-var ht,pt,ft,mt,gt=new u._WeakSet
-class vt{constructor(e,t){gt.add(this),this.properties=function(e){if(void 0!==e)for(var t=Object.keys(e),r=0;r<t.length;r++){var n=t[r],i=Object.getOwnPropertyDescriptor(e,n)
-void 0===i.get&&void 0===i.set||Object.defineProperty(e,n,{value:re(i)})}return e}(t),this.mixins=bt(e),this.ownerConstructor=void 0,this._without=void 0}static create(){Ve=!0
-for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return new this(t,void 0)}static mixins(e){var r=(0,t.peekMeta)(e),n=[]
-return null===r||r.forEachMixins((e=>{e.properties||n.push(e)})),n}reopen(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-if(0!==t.length){if(this.properties){var n=new vt(void 0,this.properties)
-this.properties=void 0,this.mixins=[n]}else this.mixins||(this.mixins=[])
-return this.mixins=this.mixins.concat(bt(t)),this}}apply(e,t){return void 0===t&&(t=!1),dt(e,[this],t)}applyPartial(e){return dt(e,[this])}detect(e){if("object"!=typeof e||null===e)return!1
-if(gt.has(e))return yt(e,this)
-var r=(0,t.peekMeta)(e)
-return null!==r&&r.hasMixin(this)}without(){for(var e=new vt([this]),t=arguments.length,r=new Array(t),n=0;n<t;n++)r[n]=arguments[n]
-return e._without=r,e}keys(){return _t(this)}toString(){return"(unknown mixin)"}}function bt(e){var t=e&&e.length||0,r=void 0
-if(t>0){r=new Array(t)
-for(var n=0;n<t;n++){var i=e[n]
-gt.has(i)?r[n]=i:r[n]=new vt(void 0,i)}}return r}function yt(e,t,r){if(void 0===r&&(r=new Set),r.has(e))return!1
-if(r.add(e),e===t)return!0
-var n=e.mixins
-return!!n&&n.some((e=>yt(e,t,r)))}function _t(e,t,r){if(void 0===t&&(t=new Set),void 0===r&&(r=new Set),!r.has(e)){if(r.add(e),e.properties)for(var n=Object.keys(e.properties),i=0;i<n.length;i++)t.add(n[i])
-else e.mixins&&e.mixins.forEach((e=>_t(e,t,r)))
-return t}}if(e.Mixin=vt,p.ALIAS_METHOD){var wt=new u._WeakSet
-pt=e=>wt.has(e),ht=class{constructor(e){this.methodName=e,wt.add(this)}}}function Ot(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-if(!te(t)){var n=t[0],i=n?n.initializer:void 0,o=n?n.value:void 0,s=function(e,t,r,n,s){return xt([e,t,{initializer:i||(()=>o)}])}
-return he(s),s}return xt(t)}function xt(e){var[n,i,o]=e,{getter:s,setter:l}=(0,a.trackedData)(i,o?o.initializer:void 0)
-function u(){var e=s(this)
-return(Array.isArray(e)||(0,r.isEmberArray)(e))&&(0,a.consumeTag)((0,a.tagFor)(e,"[]")),e}function c(e){l(this,e),(0,a.dirtyTagFor)(this,I)}var d={enumerable:!0,configurable:!0,isTracked:!0,get:u,set:c}
-return se.add(c),(0,t.meta)(n).writeDescriptors(i,new Pt(u,c)),d}e.aliasMethod=ft,p.ALIAS_METHOD&&(e.aliasMethod=ft=function(e){return new ht(e)}),e.DEBUG_INJECTION_FUNCTIONS=mt
-class Pt{constructor(e,t){this._get=e,this._set=t,Q.add(this)}get(e){return this._get.call(e)}set(e,t,r){this._set.call(e,r)}}e.TrackedDescriptor=Pt})),e("@ember/-internals/overrides/index",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.onRunloopDotAccess=e.onComputedDotAccess=e.onEmberGlobalAccess=void 0,e.onEmberGlobalAccess=undefined,e.onComputedDotAccess=undefined,e.onRunloopDotAccess=undefined})),e("@ember/-internals/owner/index",["exports","@glimmer/owner","@ember/-internals/utils","@ember/debug"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.getOwner=function(e){var r=(0,t.getOwner)(e)
-void 0===r&&(r=e[i])
-return r},e.setOwner=function(e,r){(0,t.setOwner)(e,r),e[i]=r},e.LEGACY_OWNER=void 0
-var i=(0,r.enumerableSymbol)("LEGACY_OWNER")
-e.LEGACY_OWNER=i})),e("@ember/-internals/routing/index",["exports","@ember/-internals/routing/lib/ext/controller","@ember/-internals/routing/lib/location/api","@ember/-internals/routing/lib/location/none_location","@ember/-internals/routing/lib/location/hash_location","@ember/-internals/routing/lib/location/history_location","@ember/-internals/routing/lib/location/auto_location","@ember/-internals/routing/lib/system/generate_controller","@ember/-internals/routing/lib/system/controller_for","@ember/-internals/routing/lib/system/dsl","@ember/-internals/routing/lib/system/router","@ember/-internals/routing/lib/system/route","@ember/-internals/routing/lib/system/query_params","@ember/-internals/routing/lib/services/routing","@ember/-internals/routing/lib/services/router","@ember/-internals/routing/lib/system/router_state","@ember/-internals/routing/lib/system/cache"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p,f,m,g){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"Location",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"NoneLocation",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"HashLocation",{enumerable:!0,get:function(){return i.default}}),Object.defineProperty(e,"HistoryLocation",{enumerable:!0,get:function(){return o.default}}),Object.defineProperty(e,"AutoLocation",{enumerable:!0,get:function(){return s.default}}),Object.defineProperty(e,"generateController",{enumerable:!0,get:function(){return a.default}}),Object.defineProperty(e,"generateControllerFactory",{enumerable:!0,get:function(){return a.generateControllerFactory}}),Object.defineProperty(e,"controllerFor",{enumerable:!0,get:function(){return l.default}}),Object.defineProperty(e,"RouterDSL",{enumerable:!0,get:function(){return u.default}}),Object.defineProperty(e,"Router",{enumerable:!0,get:function(){return c.default}}),Object.defineProperty(e,"Route",{enumerable:!0,get:function(){return d.default}}),Object.defineProperty(e,"QueryParams",{enumerable:!0,get:function(){return h.default}}),Object.defineProperty(e,"RoutingService",{enumerable:!0,get:function(){return p.default}}),Object.defineProperty(e,"RouterService",{enumerable:!0,get:function(){return f.default}}),Object.defineProperty(e,"RouterState",{enumerable:!0,get:function(){return m.default}}),Object.defineProperty(e,"BucketCache",{enumerable:!0,get:function(){return g.default}})})),e("@ember/-internals/routing/lib/ext/controller",["exports","@ember/-internals/metal","@ember/-internals/owner","@ember/controller/lib/controller_mixin","@ember/-internals/routing/lib/utils"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,n.default.reopen({concatenatedProperties:["queryParams"],init(){this._super(...arguments)
-var e=(0,r.getOwner)(this)
-e&&(this.namespace=e.lookup("application:main"),this.target=e.lookup("router:main"))},queryParams:null,_qpDelegate:null,_qpChanged(e,r){var n=r.indexOf(".[]"),i=-1===n?r:r.slice(0,n);(0,e._qpDelegate)(i,(0,t.get)(e,i))},transitionToRoute(){(0,i.deprecateTransitionMethods)("controller","transitionToRoute")
-for(var e=(0,t.get)(this,"target"),r=e.transitionToRoute||e.transitionTo,n=arguments.length,o=new Array(n),s=0;s<n;s++)o[s]=arguments[s]
-return r.apply(e,(0,i.prefixRouteNameArg)(this,o))},replaceRoute(){(0,i.deprecateTransitionMethods)("controller","replaceRoute")
-for(var e=(0,t.get)(this,"target"),r=e.replaceRoute||e.replaceWith,n=arguments.length,o=new Array(n),s=0;s<n;s++)o[s]=arguments[s]
-return r.apply(e,(0,i.prefixRouteNameArg)(this,o))}})
-var o=n.default
-e.default=o})),e("@ember/-internals/routing/lib/location/api",["exports","@ember/debug"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r={create(e){var t=e&&e.implementation,r=this.implementations[t]
-return r.create(...arguments)},implementations:{}}
-e.default=r})),e("@ember/-internals/routing/lib/location/auto_location",["exports","@ember/-internals/browser-environment","@ember/-internals/metal","@ember/-internals/owner","@ember/-internals/runtime","@ember/debug","@ember/-internals/routing/lib/location/util"],(function(e,t,r,n,i,o,s){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.getHistoryPath=u,e.getHashPath=c,e.default=void 0
-class a extends i.Object{constructor(){super(...arguments),this.implementation="auto"}detect(){var e=this.rootURL,t=function(e){var{location:t,userAgent:r,history:n,documentMode:i,global:o,rootURL:a}=e,l="none",d=!1,h=(0,s.getFullPath)(t)
-if((0,s.supportsHistory)(r,n)){var p=u(a,t)
-h===p?l="history":"/#"===h.substr(0,2)?(n.replaceState({path:p},"",p),l="history"):(d=!0,(0,s.replacePath)(t,p))}else if((0,s.supportsHashChange)(i,o)){var f=c(a,t)
-h===f||"/"===h&&"/#/"===f?l="hash":(d=!0,(0,s.replacePath)(t,f))}if(d)return!1
-return l}({location:this.location,history:this.history,userAgent:this.userAgent,rootURL:e,documentMode:this.documentMode,global:this.global})
-!1===t&&((0,r.set)(this,"cancelRouterSetup",!0),t="none")
-var i=(0,n.getOwner)(this).lookup(`location:${t}`);(0,r.set)(i,"rootURL",e),(0,r.set)(this,"concreteImplementation",i)}willDestroy(){var{concreteImplementation:e}=this
-e&&e.destroy()}}function l(e){return function(){for(var t,{concreteImplementation:r}=this,n=arguments.length,i=new Array(n),o=0;o<n;o++)i[o]=arguments[o]
-return null===(t=r[e])||void 0===t?void 0:t.call(r,...i)}}function u(e,t){var r,n,i=(0,s.getPath)(t),o=(0,s.getHash)(t),a=(0,s.getQuery)(t)
-i.indexOf(e)
-return"#/"===o.substr(0,2)?(r=(n=o.substr(1).split("#")).shift(),"/"===i.charAt(i.length-1)&&(r=r.substr(1)),i+=r+a,n.length&&(i+=`#${n.join("#")}`)):i+=a+o,i}function c(e,t){var r=e,n=u(e,t).substr(e.length)
-return""!==n&&("/"!==n[0]&&(n=`/${n}`),r+=`#${n}`),r}e.default=a,a.reopen({rootURL:"/",initState:l("initState"),getURL:l("getURL"),setURL:l("setURL"),replaceURL:l("replaceURL"),onUpdateURL:l("onUpdateURL"),formatURL:l("formatURL"),location:t.location,history:t.history,global:t.window,userAgent:t.userAgent,cancelRouterSetup:!1})})),e("@ember/-internals/routing/lib/location/hash_location",["exports","@ember/-internals/metal","@ember/-internals/runtime","@ember/runloop","@ember/-internals/routing/lib/location/util"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class o extends r.Object{constructor(){super(...arguments),this.implementation="hash"}init(){(0,t.set)(this,"location",this._location||window.location),this._hashchangeHandler=void 0}getHash(){return(0,i.getHash)(this.location)}getURL(){var e=this.getHash().substr(1),t=e
-return"/"!==t[0]&&(t="/",e&&(t+=`#${e}`)),t}setURL(e){this.location.hash=e,(0,t.set)(this,"lastSetURL",e)}replaceURL(e){this.location.replace(`#${e}`),(0,t.set)(this,"lastSetURL",e)}onUpdateURL(e){this._removeEventListener(),this._hashchangeHandler=(0,n.bind)(this,(function(){var r=this.getURL()
-this.lastSetURL!==r&&((0,t.set)(this,"lastSetURL",null),e(r))})),window.addEventListener("hashchange",this._hashchangeHandler)}formatURL(e){return`#${e}`}willDestroy(){this._removeEventListener()}_removeEventListener(){this._hashchangeHandler&&window.removeEventListener("hashchange",this._hashchangeHandler)}}e.default=o})),e("@ember/-internals/routing/lib/location/history_location",["exports","@ember/-internals/metal","@ember/-internals/runtime","@ember/-internals/routing/lib/location/util"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=!1
-function o(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,(function(e){var t
-return t=16*Math.random()|0,("x"===e?t:3&t|8).toString(16)}))}class s extends r.Object{constructor(){super(...arguments),this.implementation="history",this.rootURL="/"}getHash(){return(0,n.getHash)(this.location)}init(){this._super(...arguments)
-var e=document.querySelector("base"),r=""
-null!==e&&e.hasAttribute("href")&&(r=e.getAttribute("href")),(0,t.set)(this,"baseURL",r),(0,t.set)(this,"location",this.location||window.location),this._popstateHandler=void 0}initState(){var e=this.history||window.history;(0,t.set)(this,"history",e)
-var{state:r}=e,n=this.formatURL(this.getURL())
-r&&r.path===n?this._previousURL=this.getURL():this.replaceState(n)}getURL(){var{location:e,rootURL:t,baseURL:r}=this,n=e.pathname
-t=t.replace(/\/$/,""),r=r.replace(/\/$/,"")
-var i=n.replace(new RegExp(`^${r}(?=/|$)`),"").replace(new RegExp(`^${t}(?=/|$)`),"").replace(/\/\//g,"/")
-return i+=(e.search||"")+this.getHash()}setURL(e){var{state:t}=this.history
-e=this.formatURL(e),t&&t.path===e||this.pushState(e)}replaceURL(e){var{state:t}=this.history
-e=this.formatURL(e),t&&t.path===e||this.replaceState(e)}pushState(e){var t={path:e,uuid:o()}
-this.history.pushState(t,null,e),this._previousURL=this.getURL()}replaceState(e){var t={path:e,uuid:o()}
-this.history.replaceState(t,null,e),this._previousURL=this.getURL()}onUpdateURL(e){this._removeEventListener(),this._popstateHandler=()=>{(i||(i=!0,this.getURL()!==this._previousURL))&&e(this.getURL())},window.addEventListener("popstate",this._popstateHandler)}formatURL(e){var{rootURL:t,baseURL:r}=this
-return""!==e?(t=t.replace(/\/$/,""),r=r.replace(/\/$/,"")):"/"===r[0]&&"/"===t[0]&&(r=r.replace(/\/$/,"")),r+t+e}willDestroy(){this._removeEventListener()}_removeEventListener(){this._popstateHandler&&window.removeEventListener("popstate",this._popstateHandler)}}e.default=s})),e("@ember/-internals/routing/lib/location/none_location",["exports","@ember/-internals/metal","@ember/-internals/runtime","@ember/debug"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class i extends r.Object{constructor(){super(...arguments),this.implementation="none"}detect(){var{rootURL:e}=this}getURL(){var{path:e,rootURL:t}=this
-return t=t.replace(/\/$/,""),e.replace(new RegExp(`^${t}(?=/|$)`),"")}setURL(e){(0,t.set)(this,"path",e)}onUpdateURL(e){this.updateCallback=e}handleURL(e){(0,t.set)(this,"path",e),this.updateCallback(e)}formatURL(e){var{rootURL:t}=this
-return""!==e&&(t=t.replace(/\/$/,"")),t+e}}e.default=i,i.reopen({path:"",rootURL:"/"})})),e("@ember/-internals/routing/lib/location/util",["exports"],(function(e){"use strict"
-function t(e){var t=e.pathname
-return"/"!==t[0]&&(t=`/${t}`),t}function r(e){return e.search}function n(e){return void 0!==e.hash?e.hash.substr(0):""}function i(e){var t=e.origin
-return t||(t=`${e.protocol}//${e.hostname}`,e.port&&(t+=`:${e.port}`)),t}Object.defineProperty(e,"__esModule",{value:!0}),e.getPath=t,e.getQuery=r,e.getHash=n,e.getFullPath=function(e){return t(e)+r(e)+n(e)},e.getOrigin=i,e.supportsHashChange=function(e,t){return Boolean(t&&"onhashchange"in t&&(void 0===e||e>7))},e.supportsHistory=function(e,t){if((-1!==e.indexOf("Android 2.")||-1!==e.indexOf("Android 4.0"))&&-1!==e.indexOf("Mobile Safari")&&-1===e.indexOf("Chrome")&&-1===e.indexOf("Windows Phone"))return!1
-return Boolean(t&&"pushState"in t)},e.replacePath=function(e,t){e.replace(i(e)+t)}})),e("@ember/-internals/routing/lib/services/router",["exports","@ember/-internals/owner","@ember/-internals/runtime","@ember/-internals/utils","@ember/debug","@ember/object/computed","@ember/polyfills","@ember/service","@glimmer/validator","@ember/-internals/routing/lib/utils"],(function(e,t,r,n,i,o,s,a,l,u){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var c=(0,n.symbol)("ROUTER")
-function d(e,t){return"/"===t?e:e.substr(t.length,e.length)}class h extends a.default{get _router(){var e=this[c]
-return void 0!==e?e:(e=(0,t.getOwner)(this).lookup("router:main"),this[c]=e)}transitionTo(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-if((0,u.resemblesURL)(t[0]))return this._router._doURLTransition("transitionTo",t[0])
-var{routeName:n,models:i,queryParams:o}=(0,u.extractRouteArgs)(t),s=this._router._doTransition(n,i,o,!0)
-return s._keepDefaultQueryParamValues=!0,s}replaceWith(){return this.transitionTo(...arguments).method("replace")}urlFor(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-return this._router.generate(e,...r)}isActive(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-var{routeName:n,models:i,queryParams:o}=(0,u.extractRouteArgs)(t),a=this._router._routerMicrolib
-return(0,l.consumeTag)((0,l.tagFor)(this._router,"currentURL")),!!a.isActiveIntent(n,i)&&(!(Object.keys(o).length>0)||(o=(0,s.assign)({},o),this._router._prepareQueryParams(n,i,o,!0),(0,u.shallowEqual)(o,a.state.queryParams)))}recognize(e){var t=d(e,this.rootURL)
-return this._router._routerMicrolib.recognize(t)}recognizeAndLoad(e){var t=d(e,this.rootURL)
-return this._router._routerMicrolib.recognizeAndLoad(t)}}e.default=h,h.reopen(r.Evented,{currentRouteName:(0,o.readOnly)("_router.currentRouteName"),currentURL:(0,o.readOnly)("_router.currentURL"),location:(0,o.readOnly)("_router.location"),rootURL:(0,o.readOnly)("_router.rootURL"),currentRoute:(0,o.readOnly)("_router.currentRoute")})})),e("@ember/-internals/routing/lib/services/routing",["exports","@ember/-internals/owner","@ember/-internals/utils","@ember/object/computed","@ember/polyfills","@ember/service"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var s=(0,r.symbol)("ROUTER")
-class a extends o.default{get router(){var e=this[s]
-return void 0!==e?e:((e=(0,t.getOwner)(this).lookup("router:main")).setupRouter(),this[s]=e)}hasRoute(e){return this.router.hasRoute(e)}transitionTo(e,t,r,n){var i=this.router._doTransition(e,t,r)
-return n&&i.method("replace"),i}normalizeQueryParams(e,t,r){this.router._prepareQueryParams(e,t,r)}_generateURL(e,t,r){var n={}
-return r&&((0,i.assign)(n,r),this.normalizeQueryParams(e,t,n)),this.router.generate(e,...t,{queryParams:n})}generateURL(e,t,r){if(this.router._initialTransitionStarted)return this._generateURL(e,t,r)
-try{return this._generateURL(e,t,r)}catch(n){return}}isActiveForRoute(e,t,r,n){var i=this.router._routerMicrolib.recognizer.handlersFor(r),o=i[i.length-1].handler,s=function(e,t){for(var r=0,n=0;n<t.length&&(r+=t[n].names.length,t[n].handler!==e);n++);return r}(r,i)
-return e.length>s&&(r=o),n.isActiveIntent(r,e,t)}}e.default=a,a.reopen({targetState:(0,n.readOnly)("router.targetState"),currentState:(0,n.readOnly)("router.currentState"),currentRouteName:(0,n.readOnly)("router.currentRouteName"),currentPath:(0,n.readOnly)("router.currentPath")})})),e("@ember/-internals/routing/lib/system/cache",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=class{constructor(){this.cache=new Map}has(e){return this.cache.has(e)}stash(e,t,r){var n=this.cache.get(e)
-void 0===n&&(n=new Map,this.cache.set(e,n)),n.set(t,r)}lookup(e,t,r){if(!this.has(e))return r
-var n=this.cache.get(e)
-return n.has(t)?n.get(t):r}}})),e("@ember/-internals/routing/lib/system/controller_for",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,r){return e.lookup(`controller:${t}`,r)}})),e("@ember/-internals/routing/lib/system/dsl",["exports","@ember/debug","@ember/polyfills"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=0
-function i(e){return"function"==typeof e}class o{constructor(e,t){void 0===e&&(e=null),this.explicitIndex=!1,this.parent=e,this.enableLoadingSubstates=Boolean(t&&t.enableLoadingSubstates),this.matches=[],this.options=t}route(e,t,r){var n,l=null,u=`/_unused_dummy_error_path_route_${e}/:error`
-if(i(t)?(n={},l=t):i(r)?(n=t,l=r):n=t||{},this.enableLoadingSubstates&&(a(this,`${e}_loading`,{resetNamespace:n.resetNamespace}),a(this,`${e}_error`,{resetNamespace:n.resetNamespace,path:u})),l){var c=s(this,e,n.resetNamespace),d=new o(c,this.options)
-a(d,"loading"),a(d,"error",{path:u}),l.call(d),a(this,e,n,d.generate())}else a(this,e,n)}push(e,t,n,i){var o=t.split(".")
-if(this.options.engineInfo){var s=t.slice(this.options.engineInfo.fullName.length+1),a=(0,r.assign)({localFullName:s},this.options.engineInfo)
-i&&(a.serializeMethod=i),this.options.addRouteForEngine(t,a)}else if(i)throw new Error(`Defining a route serializer on route '${t}' outside an Engine is not allowed.`)
-""!==e&&"/"!==e&&"index"!==o[o.length-1]||(this.explicitIndex=!0),this.matches.push(e,t,n)}generate(){var e=this.matches
-return this.explicitIndex||this.route("index",{path:"/"}),t=>{for(var r=0;r<e.length;r+=3)t(e[r]).to(e[r+1],e[r+2])}}mount(e,t){void 0===t&&(t={})
-var i=this.options.resolveRouteMap(e),l=e
-t.as&&(l=t.as)
-var u,c=s(this,l,t.resetNamespace),d={name:e,instanceId:n++,mountPoint:c,fullName:c},h=t.path
-"string"!=typeof h&&(h=`/${l}`)
-var p=`/_unused_dummy_error_path_route_${l}/:error`
-if(i){var f=!1,m=this.options.engineInfo
-m&&(f=!0,this.options.engineInfo=d)
-var g=(0,r.assign)({engineInfo:d},this.options),v=new o(c,g)
-a(v,"loading"),a(v,"error",{path:p}),i.class.call(v),u=v.generate(),f&&(this.options.engineInfo=m)}var b=(0,r.assign)({localFullName:"application"},d)
-if(this.enableLoadingSubstates){var y=`${l}_loading`,_="application_loading",w=(0,r.assign)({localFullName:_},d)
-a(this,y,{resetNamespace:t.resetNamespace}),this.options.addRouteForEngine(y,w),y=`${l}_error`,_="application_error",w=(0,r.assign)({localFullName:_},d),a(this,y,{resetNamespace:t.resetNamespace,path:p}),this.options.addRouteForEngine(y,w)}this.options.addRouteForEngine(c,b),this.push(h,c,u)}}function s(e,t,r){return function(e){return"application"!==e.parent}(e)&&!0!==r?`${e.parent}.${t}`:t}function a(e,t,r,n){void 0===r&&(r={})
-var i=s(e,t,r.resetNamespace)
-"string"!=typeof r.path&&(r.path=`/${t}`),e.push(r.path,i,n,r.serialize)}e.default=o})),e("@ember/-internals/routing/lib/system/engines",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0})}))
-e("@ember/-internals/routing/lib/system/generate_controller",["exports","@ember/-internals/metal","@ember/debug"],(function(e,t,r){"use strict"
-function n(e,t){var r=e.factoryFor("controller:basic").class
-r=r.extend({toString:()=>`(generated ${t} controller)`})
-var n=`controller:${t}`
-return e.register(n,r),e.factoryFor(n)}Object.defineProperty(e,"__esModule",{value:!0}),e.generateControllerFactory=n,e.default=function(e,t){n(e,t)
-var r=`controller:${t}`,i=e.lookup(r)
-0
-return i}})),e("@ember/-internals/routing/lib/system/query_params",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=class{constructor(e){void 0===e&&(e=null),this.isQueryParams=!0,this.values=e}}})),e("@ember/-internals/routing/lib/system/route-info",[],(function(){})),e("@ember/-internals/routing/lib/system/route",["exports","@ember/polyfills","@ember/-internals/container","@ember/-internals/metal","@ember/-internals/owner","@ember/-internals/runtime","@ember/-internals/utils","@ember/debug","@ember/deprecated-features","@ember/object/compat","@ember/runloop","@ember/string","router_js","@ember/-internals/routing/lib/utils","@ember/-internals/routing/lib/system/generate_controller"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p,f){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.defaultSerialize=b,e.hasDefaultSerialize=function(e){return e.serialize===b},e.getFullQueryParams=w,e.default=e.ROUTER_EVENT_DEPRECATIONS=e.ROUTE_CONNECTIONS=void 0
-var m=new WeakMap
-e.ROUTE_CONNECTIONS=m
-var g,v=(0,s.symbol)("render")
-function b(e,t){if(!(t.length<1)&&e){var r={}
-if(1===t.length){var[i]=t
-i in e?r[i]=(0,n.get)(e,i):/_id$/.test(i)?r[i]=(0,n.get)(e,"id"):(0,s.isProxy)(e)&&(r[i]=(0,n.get)(e,i))}else r=(0,n.getProperties)(e,t)
-return r}}class y extends o.Object{constructor(e){if(super(...arguments),this.context={},e){var t=e.lookup("router:main"),n=e.lookup(r.privatize`-bucket-cache:main`)
-this._router=t,this._bucketCache=n,this._topLevelViewTemplate=e.lookup("template:-outlet"),this._environment=e.lookup("-environment:main")}}_setRouteName(e){this.routeName=e,this.fullRouteName=P((0,i.getOwner)(this),e)}_stashNames(e,t){if(!this._names){var r=this._names=e._names
-r.length||(r=(e=t)&&e._names||[])
-for(var i=(0,n.get)(this,"_qp.qps"),o=new Array(r.length),s=0;s<r.length;++s)o[s]=`${e.name}.${r[s]}`
-for(var a=0;a<i.length;++a){var l=i[a]
-"model"===l.scope&&(l.parts=o)}}}_activeQPChanged(e,t){this._router._activeQPChanged(e.scopedPropertyName,t)}_updatingQPChanged(e){this._router._updatingQPChanged(e.urlKey)}paramsFor(e){var r=(0,i.getOwner)(this).lookup(`route:${e}`)
-if(void 0===r)return{}
-var n=this._router._routerMicrolib.activeTransition,o=n?n[h.STATE_SYMBOL]:this._router._routerMicrolib.state,s=r.fullRouteName,a=(0,t.assign)({},o.params[s]),l=O(r,o)
-return Object.keys(l).reduce(((e,t)=>(e[t]=l[t],e)),a)}serializeQueryParamKey(e){return e}serializeQueryParam(e,t,r){return this._router._serializeQueryParam(e,r)}deserializeQueryParam(e,t,r){return this._router._deserializeQueryParam(e,r)}_optionsForQueryParam(e){return(0,n.get)(this,`queryParams.${e.urlKey}`)||(0,n.get)(this,`queryParams.${e.prop}`)||{}}resetController(e,t,r){return this}exit(e){this.deactivate(e),this.trigger("deactivate",e),this.teardownViews()}_internalReset(e,t){var r=this.controller
-r._qpDelegate=(0,n.get)(this,"_qp.states.inactive"),this.resetController(r,e,t)}enter(e){m.set(this,[]),this.activate(e),this.trigger("activate",e)}deactivate(e){}activate(e){}transitionTo(){(0,p.deprecateTransitionMethods)("route","transitionTo")
-for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return this._router.transitionTo(...(0,p.prefixRouteNameArg)(this,t))}intermediateTransitionTo(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-var[n,...i]=(0,p.prefixRouteNameArg)(this,t)
-this._router.intermediateTransitionTo(n,...i)}refresh(){return this._router._routerMicrolib.refresh(this)}replaceWith(){(0,p.deprecateTransitionMethods)("route","replaceWith")
-for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return this._router.replaceWith(...(0,p.prefixRouteNameArg)(this,t))}setup(e,t){var r,i=this.controllerName||this.routeName,o=this.controllerFor(i,!0)
-if(r=o||this.generateController(i),!this.controller){var a=(0,n.get)(this,"_qp"),l=void 0!==a?(0,n.get)(a,"propertyNames"):[];(function(e,t){t.forEach((t=>{if(void 0===(0,n.descriptorForProperty)(e,t)){var r=(0,s.lookupDescriptor)(e,t)
-null===r||"function"!=typeof r.get&&"function"!=typeof r.set||(0,n.defineProperty)(e,t,(0,u.dependentKeyCompat)({get:r.get,set:r.set}))}(0,n.addObserver)(e,`${t}.[]`,e,e._qpChanged,!1)}))})(r,l),this.controller=r}var c=(0,n.get)(this,"_qp"),d=c.states
-if(r._qpDelegate=d.allowOverrides,t){(0,p.stashParamNames)(this._router,t[h.STATE_SYMBOL].routeInfos)
-var f=this._bucketCache,m=t[h.PARAMS_SYMBOL]
-c.propertyNames.forEach((e=>{var t=c.map[e]
-t.values=m
-var i=(0,p.calculateCacheKey)(t.route.fullRouteName,t.parts,t.values),o=f.lookup(i,e,t.undecoratedDefaultValue);(0,n.set)(r,e,o)}))
-var g=O(this,t[h.STATE_SYMBOL]);(0,n.setProperties)(r,g)}this.setupController(r,e,t),this._environment.options.shouldRender&&this.renderTemplate(r,e),(0,n.flushAsyncObservers)(!1)}_qpChanged(e,t,r){if(r){var n=this._bucketCache,i=(0,p.calculateCacheKey)(r.route.fullRouteName,r.parts,r.values)
-n.stash(i,e,t)}}beforeModel(){}afterModel(){}redirect(){}contextDidChange(){this.currentModel=this.context}model(e,r){var i,o,s,a=(0,n.get)(this,"_qp.map")
-for(var l in e)if(!("queryParams"===l||a&&l in a)){var u=l.match(/^(.*)_id$/)
-null!==u&&(i=u[1],s=e[l]),o=!0}if(!i){if(o)return(0,t.assign)({},e)
-if(r.resolveIndex<1)return
-return r[h.STATE_SYMBOL].routeInfos[r.resolveIndex-1].context}return this.findModel(i,s)}deserialize(e,t){return this.model(this._paramsFor(this.routeName,e),t)}findModel(){return(0,n.get)(this,"store").find(...arguments)}setupController(e,t,r){e&&void 0!==t&&(0,n.set)(e,"model",t)}controllerFor(e,t){var r=(0,i.getOwner)(this),n=r.lookup(`route:${e}`)
-n&&n.controllerName&&(e=n.controllerName)
-var o=r.lookup(`controller:${e}`)
-return o}generateController(e){var t=(0,i.getOwner)(this)
-return(0,f.default)(t,e)}modelFor(e){var t,r=(0,i.getOwner)(this),n=this._router&&this._router._routerMicrolib?this._router._routerMicrolib.activeTransition:void 0
-t=r.routable&&void 0!==n?P(r,e):e
-var o=r.lookup(`route:${t}`)
-if(null!=n){var s=o&&o.routeName||t
-if(Object.prototype.hasOwnProperty.call(n.resolvedModels,s))return n.resolvedModels[s]}return o&&o.currentModel}[v](e,t){var r=function(e,t,r){var n,o=!t&&!r
-o||("object"!=typeof t||r?n=t:(n=e.templateName||e.routeName,r=t))
-var s,a,l,u,c,d=(0,i.getOwner)(e),h=void 0
-r&&(l=r.into&&r.into.replace(/\//g,"."),u=r.outlet,h=r.controller,c=r.model)
-u=u||"main",o?(s=e.routeName,a=e.templateName||s):a=s=n.replace(/\//g,".")
-void 0===h&&(h=o?e.controllerName||d.lookup(`controller:${s}`):d.lookup(`controller:${s}`)||e.controllerName||e.routeName)
-if("string"==typeof h){var p=h
-h=d.lookup(`controller:${p}`)}void 0===c?c=e.currentModel:h.set("model",c)
-var f,m=d.lookup(`template:${a}`)
-l&&(f=_(e))&&l===f.routeName&&(l=void 0)
-var g={owner:d,into:l,outlet:u,name:s,controller:h,model:c,template:void 0!==m?m(d):e._topLevelViewTemplate(d)}
-return g}(this,e,t)
-m.get(this).push(r),(0,c.once)(this._router,"_setOutlets")}renderTemplate(e,t){this[v]()}render(e,t){this[v](e,t)}disconnectOutlet(e){var t,r
-e&&("string"==typeof e?t=e:(t=e.outlet,r=e.parentView?e.parentView.replace(/\//g,"."):void 0)),t=t||"main",this._disconnectOutlet(t,r)
-for(var n=this._router._routerMicrolib.currentRouteInfos,i=0;i<n.length;i++)n[i].route._disconnectOutlet(t,r)}_disconnectOutlet(e,t){var r=_(this)
-r&&t===r.routeName&&(t=void 0)
-for(var n=m.get(this),i=0;i<n.length;i++){var o=n[i]
-o.outlet===e&&o.into===t&&(n[i]={owner:o.owner,into:o.into,outlet:o.outlet,name:o.name,controller:void 0,template:void 0,model:void 0},(0,c.once)(this._router,"_setOutlets"))}}willDestroy(){this.teardownViews()}teardownViews(){var e=m.get(this)
-void 0!==e&&e.length>0&&(m.set(this,[]),(0,c.once)(this._router,"_setOutlets"))}buildRouteInfoMetadata(){}}function _(e){var t=function(e,t,r){void 0===r&&(r=0)
-if(!t)return
-for(var n=0;n<t.length;n++)if(t[n].route===e)return t[n+r]
-return}(e,e._router._routerMicrolib.state.routeInfos,-1)
-return t&&t.route}function w(e,r){return r.fullQueryParams||(r.fullQueryParams={},(0,t.assign)(r.fullQueryParams,r.queryParams),e._deserializeQueryParams(r.routeInfos,r.fullQueryParams)),r.fullQueryParams}function O(e,t){t.queryParamsFor=t.queryParamsFor||{}
-var r=e.fullRouteName
-if(t.queryParamsFor[r])return t.queryParamsFor[r]
-for(var i=w(e._router,t),o=t.queryParamsFor[r]={},s=(0,n.get)(e,"_qp.qps"),a=0;a<s.length;++a){var l=s[a],u=l.prop in i
-o[l.prop]=u?i[l.prop]:x(l.defaultValue)}return o}function x(e){return Array.isArray(e)?(0,o.A)(e.slice()):e}function P(e,t){if(e.routable){var r=e.mountPoint
-return"application"===t?r:`${r}.${t}`}return t}y.reopenClass({isRouteFactory:!0}),y.prototype.serialize=b,y.reopen(o.ActionHandler,o.Evented,{mergedProperties:["queryParams"],queryParams:{},templateName:null,_names:null,controllerName:null,store:(0,n.computed)({get(){var e=(0,i.getOwner)(this)
-this.routeName,(0,n.get)(this,"_router.namespace")
-return{find(t,r){var n=e.factoryFor(`model:${t}`)
-if(n)return(n=n.class).find(r)}}},set(e,t){(0,n.defineProperty)(this,e,null,t)}}),_qp:(0,n.computed)((function(){var e,r=this.controllerName||this.routeName,s=(0,i.getOwner)(this),a=s.lookup(`controller:${r}`),l=(0,n.get)(this,"queryParams"),u=Object.keys(l).length>0
-if(a){var c=(0,n.get)(a,"queryParams")||{}
-e=function(e,r){var n={},i={defaultValue:!0,type:!0,scope:!0,as:!0}
-for(var o in e)if(Object.prototype.hasOwnProperty.call(e,o)){var s={};(0,t.assign)(s,e[o],r[o]),n[o]=s,i[o]=!0}for(var a in r)if(Object.prototype.hasOwnProperty.call(r,a)&&!i[a]){var l={};(0,t.assign)(l,r[a],e[a]),n[a]=l}return n}((0,p.normalizeControllerQueryParams)(c),l)}else u&&(a=(0,f.default)(s,r),e=l)
-var d=[],h={},m=[]
-for(var g in e)if(Object.prototype.hasOwnProperty.call(e,g)&&"unknownProperty"!==g&&"_super"!==g){var v=e[g],b=v.scope||"model",y=void 0
-"controller"===b&&(y=[])
-var _=v.as||this.serializeQueryParamKey(g),w=(0,n.get)(a,g)
-w=x(w)
-var O=v.type||(0,o.typeOf)(w),P=this.serializeQueryParam(w,_,O),S=`${r}:${g}`,T={undecoratedDefaultValue:(0,n.get)(a,g),defaultValue:w,serializedDefaultValue:P,serializedValue:P,type:O,urlKey:_,prop:g,scopedPropertyName:S,controllerName:r,route:this,parts:y,values:null,scope:b}
-h[g]=h[_]=h[S]=T,d.push(T),m.push(g)}return{qps:d,map:h,propertyNames:m,states:{inactive:(e,t)=>{var r=h[e]
-this._qpChanged(e,t,r)},active:(e,t)=>{var r=h[e]
-return this._qpChanged(e,t,r),this._activeQPChanged(r,t)},allowOverrides:(e,t)=>{var r=h[e]
-return this._qpChanged(e,t,r),this._updatingQPChanged(r)}}}})),send(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-if(this._router&&this._router._routerMicrolib||!(0,a.isTesting)())this._router.send(...t)
-else{var n=t.shift(),i=this.actions[n]
-if(i)return i.apply(this,t)}},actions:{queryParamsDidChange(e,t,r){for(var i=(0,n.get)(this,"_qp").map,o=Object.keys(e).concat(Object.keys(r)),s=0;s<o.length;++s){var a=i[o[s]]
-if(a&&(0,n.get)(this._optionsForQueryParam(a),"refreshModel")&&this._router.currentState){this.refresh()
-break}}return!0},finalizeQueryParamChange(e,t,r){if("application"!==this.fullRouteName)return!0
-if(r){var i,o=r[h.STATE_SYMBOL].routeInfos,s=this._router,a=s._queryParamsFor(o),l=s._qpUpdates,u=!1;(0,p.stashParamNames)(s,o)
-for(var c=0;c<a.qps.length;++c){var d=a.qps[c],f=d.route,m=f.controller,g=d.urlKey in e&&d.urlKey,v=void 0,b=void 0
-if(l.has(d.urlKey)?(v=(0,n.get)(m,d.prop),b=f.serializeQueryParam(v,d.urlKey,d.type)):g?void 0!==(b=e[g])&&(v=f.deserializeQueryParam(b,d.urlKey,d.type)):(b=d.serializedDefaultValue,v=x(d.defaultValue)),m._qpDelegate=(0,n.get)(f,"_qp.states.inactive"),b!==d.serializedValue){if(r.queryParamsOnly&&!1!==i){var y=f._optionsForQueryParam(d),_=(0,n.get)(y,"replace")
-_?i=!0:!1===_&&(i=!1)}(0,n.set)(m,d.prop,v),u=!0}d.serializedValue=b,d.serializedDefaultValue===b&&!r._keepDefaultQueryParamValues||t.push({value:b,visible:!0,key:g||d.urlKey})}!0===u&&(0,n.flushAsyncObservers)(!1),i&&r.method("replace"),a.qps.forEach((e=>{var t=(0,n.get)(e.route,"_qp")
-e.route.controller._qpDelegate=(0,n.get)(t,"states.active")})),s._qpUpdates.clear()}}}}),e.ROUTER_EVENT_DEPRECATIONS=g,l.ROUTER_EVENTS&&(e.ROUTER_EVENT_DEPRECATIONS=g={on(e){this._super(...arguments)}},y.reopen(g,{_paramsFor(e,t){return void 0!==this._router._routerMicrolib.activeTransition?this.paramsFor(e):t}}))
-var S=y
-e.default=S})),e("@ember/-internals/routing/lib/system/router",["exports","@ember/-internals/container","@ember/-internals/metal","@ember/-internals/owner","@ember/-internals/runtime","@ember/debug","@ember/deprecated-features","@ember/error","@ember/polyfills","@ember/runloop","@ember/-internals/routing/lib/location/api","@ember/-internals/routing/lib/utils","@ember/-internals/routing/lib/system/dsl","@ember/-internals/routing/lib/system/route","@ember/-internals/routing/lib/system/router_state","router_js"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p,f,m){"use strict"
-function g(e){C(this),this._cancelSlowTransitionTimer(),this.notifyPropertyChange("url"),this.set("currentState",this.targetState),(0,u.once)(this,this.trigger,"didTransition")}function v(e,t,r){(0,u.once)(this,this.trigger,"willTransition",r)}function b(){return this}Object.defineProperty(e,"__esModule",{value:!0}),e.triggerEvent=T,e.default=void 0
-var{slice:y}=Array.prototype
-class _ extends i.Object{constructor(e){super(...arguments),this._didSetupRouter=!1,this._initialTransitionStarted=!1,this.currentURL=null,this.currentRouteName=null,this.currentPath=null,this.currentRoute=null,this._qpCache=Object.create(null),this._qpUpdates=new Set,this._queuedQPChanges={},this._toplevelView=null,this._handledErrors=new Set,this._engineInstances=Object.create(null),this._engineInfoByRoute=Object.create(null),this.currentState=null,this.targetState=null,this._resetQueuedQueryParameterChanges(),this.namespace=e.lookup("application:main")
-var r=e.lookup(t.privatize`-bucket-cache:main`)
-this._bucketCache=r
-var n=e.lookup("service:router")
-this._routerService=n}_initRouterJs(){var e=(0,r.get)(this,"location"),t=this,i=(0,n.getOwner)(this),o=Object.create(null)
-class a extends m.default{getRoute(e){var r=e,n=i,s=t._engineInfoByRoute[r]
-s&&(n=t._getEngineInstance(s),r=s.localFullName)
-var a=`route:${r}`,l=n.lookup(a)
-if(o[e])return l
-if(o[e]=!0,!l){var u=n.factoryFor("route:basic").class
-n.register(a,u.extend()),l=n.lookup(a)}if(l._setRouteName(r),s&&!(0,p.hasDefaultSerialize)(l))throw new Error("Defining a custom serialize method on an Engine route is not supported.")
-return l}getSerializer(e){var r=t._engineInfoByRoute[e]
-if(r)return r.serializeMethod||p.defaultSerialize}updateURL(n){(0,u.once)((()=>{e.setURL(n),(0,r.set)(t,"currentURL",n)}))}didTransition(e){s.ROUTER_EVENTS&&t.didTransition,t.didTransition(e)}willTransition(e,r,n){s.ROUTER_EVENTS&&t.willTransition,t.willTransition(e,r,n)}triggerEvent(e,r,n,i){return T.bind(t)(e,r,n,i)}routeWillChange(e){t.trigger("routeWillChange",e),t._routerService.trigger("routeWillChange",e),e.isIntermediate&&t.set("currentRoute",e.to)}routeDidChange(e){t.set("currentRoute",e.to),(0,u.once)((()=>{t.trigger("routeDidChange",e),t._routerService.trigger("routeDidChange",e)}))}transitionDidError(e,r){return e.wasAborted||r.isAborted?(0,m.logAbort)(r):(r.trigger(!1,"error",e.error,r,e.route),t._isErrorHandled(e.error)?(r.rollback(),this.routeDidChange(r),e.error):(r.abort(),e.error))}replaceURL(n){if(e.replaceURL){(0,u.once)((()=>{e.replaceURL(n),(0,r.set)(t,"currentURL",n)}))}else this.updateURL(n)}}var l=this._routerMicrolib=new a,c=this.constructor.dslCallbacks||[b],d=this._buildDSL()
-d.route("application",{path:"/",resetNamespace:!0,overrideNameAssertion:!0},(function(){for(var e=0;e<c.length;e++)c[e].call(this)})),l.map(d.generate())}_buildDSL(){var e=this._hasModuleBasedResolver(),t=this,r=(0,n.getOwner)(this),i={enableLoadingSubstates:e,resolveRouteMap:e=>r.factoryFor(`route-map:${e}`),addRouteForEngine(e,r){t._engineInfoByRoute[e]||(t._engineInfoByRoute[e]=r)}}
-return new h.default(null,i)}_resetQueuedQueryParameterChanges(){this._queuedQPChanges={}}_hasModuleBasedResolver(){var e=(0,n.getOwner)(this),t=(0,r.get)(e,"application.__registry__.resolver.moduleBasedResolver")
-return Boolean(t)}startRouting(){if(this.setupRouter()){var e=(0,r.get)(this,"initialURL")
-void 0===e&&(e=(0,r.get)(this,"location").getURL())
-var t=this.handleURL(e)
-if(t&&t.error)throw t.error}}setupRouter(){if(this._didSetupRouter)return!1
-this._didSetupRouter=!0,this._setupLocation()
-var e=(0,r.get)(this,"location")
-return!(0,r.get)(e,"cancelRouterSetup")&&(this._initRouterJs(),e.onUpdateURL((e=>{this.handleURL(e)})),!0)}_setOutlets(){if(!this.isDestroying&&!this.isDestroyed){var e=this._routerMicrolib.currentRouteInfos
-if(e){for(var t,r=null,i=0;i<e.length;i++){var o=e[i].route,s=p.ROUTE_CONNECTIONS.get(o),a=void 0
-if(0===s.length)a=j(r,t,o)
-else for(var l=0;l<s.length;l++){var u=R(r,t,s[l])
-r=u.liveRoutes
-var{name:c,outlet:d}=u.ownState.render
-c!==o.routeName&&"main"!==d||(a=u.ownState)}t=a}if(r)if(this._toplevelView)this._toplevelView.setOutletState(r)
-else{var h=(0,n.getOwner)(this),f=h.factoryFor("view:-outlet")
-this._toplevelView=f.create(),this._toplevelView.setOutletState(r)
-var m=h.lookup("-application-instance:main")
-m&&m.didCreateRootView(this._toplevelView)}}}}handleURL(e){var t=e.split(/#(.+)?/)[0]
-return this._doURLTransition("handleURL",t)}_doURLTransition(e,t){this._initialTransitionStarted=!0
-var r=this._routerMicrolib[e](t||"/")
-return k(r,this),r}transitionTo(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-if((0,d.resemblesURL)(t[0]))return this._doURLTransition("transitionTo",t[0])
-var{routeName:n,models:i,queryParams:o}=(0,d.extractRouteArgs)(t)
-return this._doTransition(n,i,o)}intermediateTransitionTo(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-this._routerMicrolib.intermediateTransitionTo(e,...r),C(this)}replaceWith(){return this.transitionTo(...arguments).method("replace")}generate(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-var i=this._routerMicrolib.generate(e,...r)
-return this.location.formatURL(i)}isActive(e){return this._routerMicrolib.isActive(e)}isActiveIntent(e,t,r){return this.currentState.isActiveIntent(e,t,r)}send(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-this._routerMicrolib.trigger(e,...r)}hasRoute(e){return this._routerMicrolib.hasRoute(e)}reset(){this._didSetupRouter=!1,this._initialTransitionStarted=!1,this._routerMicrolib&&this._routerMicrolib.reset()}willDestroy(){this._toplevelView&&(this._toplevelView.destroy(),this._toplevelView=null),this._super(...arguments),this.reset()
-var e=this._engineInstances
-for(var t in e)for(var r in e[t])(0,u.run)(e[t][r],"destroy")}_activeQPChanged(e,t){this._queuedQPChanges[e]=t,(0,u.once)(this,this._fireQueryParamTransition)}_updatingQPChanged(e){this._qpUpdates.add(e)}_fireQueryParamTransition(){this.transitionTo({queryParams:this._queuedQPChanges}),this._resetQueuedQueryParameterChanges()}_setupLocation(){var e=this.location,t=this.rootURL,i=(0,n.getOwner)(this)
-if("string"==typeof e){var o=i.lookup(`location:${e}`)
-if(void 0!==o)e=(0,r.set)(this,"location",o)
-else{var s={implementation:e}
-e=(0,r.set)(this,"location",c.default.create(s))}}null!==e&&"object"==typeof e&&(t&&(0,r.set)(e,"rootURL",t),"function"==typeof e.detect&&e.detect(),"function"==typeof e.initState&&e.initState())}_serializeQueryParams(e,t){M(this,e,t,((e,r,n)=>{if(n)delete t[e],t[n.urlKey]=n.route.serializeQueryParam(r,n.urlKey,n.type)
-else{if(void 0===r)return
-t[e]=this._serializeQueryParam(r,(0,i.typeOf)(r))}}))}_serializeQueryParam(e,t){return null==e?e:"array"===t?JSON.stringify(e):`${e}`}_deserializeQueryParams(e,t){M(this,e,t,((e,r,n)=>{n&&(delete t[e],t[n.prop]=n.route.deserializeQueryParam(r,n.urlKey,n.type))}))}_deserializeQueryParam(e,t){return null==e?e:"boolean"===t?"true"===e:"number"===t?Number(e).valueOf():"array"===t?(0,i.A)(JSON.parse(e)):e}_pruneDefaultQueryParamValues(e,t){var r=this._queryParamsFor(e)
-for(var n in t){var i=r.map[n]
-i&&i.serializedDefaultValue===t[n]&&delete t[n]}}_doTransition(e,t,r,n){var i=e||(0,d.getActiveTargetName)(this._routerMicrolib)
-this._initialTransitionStarted=!0
-var o={}
-this._processActiveTransitionQueryParams(i,t,o,r),(0,l.assign)(o,r),this._prepareQueryParams(i,t,o,Boolean(n))
-var s=this._routerMicrolib.transitionTo(i,...t,{queryParams:o})
-return k(s,this),s}_processActiveTransitionQueryParams(e,t,r,n){if(this._routerMicrolib.activeTransition){var i={},o=this._qpUpdates,s=(0,p.getFullQueryParams)(this,this._routerMicrolib.activeTransition[m.STATE_SYMBOL])
-for(var a in s)o.has(a)||(i[a]=s[a])
-this._fullyScopeQueryParams(e,t,n),this._fullyScopeQueryParams(e,t,i),(0,l.assign)(r,i)}}_prepareQueryParams(e,t,r,n){var i=E(this,e,t)
-this._hydrateUnsuppliedQueryParams(i,r,Boolean(n)),this._serializeQueryParams(i.routeInfos,r),n||this._pruneDefaultQueryParamValues(i.routeInfos,r)}_getQPMeta(e){var t=e.route
-return t&&(0,r.get)(t,"_qp")}_queryParamsFor(e){var t=e.length,r=e[t-1].name,n=this._qpCache[r]
-if(void 0!==n)return n
-for(var i,o,s=!0,a={},u=[],c=0;c<t;++c)if(i=this._getQPMeta(e[c])){for(var d=0;d<i.qps.length;d++)o=i.qps[d],u.push(o);(0,l.assign)(a,i.map)}else s=!1
-var h={qps:u,map:a}
-return s&&(this._qpCache[r]=h),h}_fullyScopeQueryParams(e,t,r){for(var n,i=E(this,e,t).routeInfos,o=0,s=i.length;o<s;++o)if(n=this._getQPMeta(i[o]))for(var a=void 0,l=void 0,u=0,c=n.qps.length;u<c;++u)(l=(a=n.qps[u]).prop in r&&a.prop||a.scopedPropertyName in r&&a.scopedPropertyName||a.urlKey in r&&a.urlKey)&&l!==a.scopedPropertyName&&(r[a.scopedPropertyName]=r[l],delete r[l])}_hydrateUnsuppliedQueryParams(e,t,r){for(var n,i,o,s=e.routeInfos,a=this._bucketCache,l=0;l<s.length;++l)if(n=this._getQPMeta(s[l]))for(var u=0,c=n.qps.length;u<c;++u)if(i=n.qps[u],o=i.prop in t&&i.prop||i.scopedPropertyName in t&&i.scopedPropertyName||i.urlKey in t&&i.urlKey)o!==i.scopedPropertyName&&(t[i.scopedPropertyName]=t[o],delete t[o])
-else{var h=(0,d.calculateCacheKey)(i.route.fullRouteName,i.parts,e.params)
-t[i.scopedPropertyName]=a.lookup(h,i.prop,i.defaultValue)}}_scheduleLoadingEvent(e,t){this._cancelSlowTransitionTimer(),this._slowTransitionTimer=(0,u.scheduleOnce)("routerTransitions",this,"_handleSlowTransition",e,t)}_handleSlowTransition(e,t){if(this._routerMicrolib.activeTransition){var r=new f.default(this,this._routerMicrolib,this._routerMicrolib.activeTransition[m.STATE_SYMBOL])
-this.set("targetState",r),e.trigger(!0,"loading",e,t)}}_cancelSlowTransitionTimer(){this._slowTransitionTimer&&(0,u.cancel)(this._slowTransitionTimer),this._slowTransitionTimer=null}_markErrorAsHandled(e){this._handledErrors.add(e)}_isErrorHandled(e){return this._handledErrors.has(e)}_clearHandledError(e){this._handledErrors.delete(e)}_getEngineInstance(e){var{name:t,instanceId:r,mountPoint:i}=e,o=this._engineInstances
-o[t]||(o[t]=Object.create(null))
-var s=o[t][r]
-if(!s){var a=(0,n.getOwner)(this);(s=a.buildChildEngineInstance(t,{routable:!0,mountPoint:i})).boot(),o[t][r]=s}return s}}function w(e,t){for(var r=e.length-1;r>=0;--r){var n=e[r],i=n.route
-if(void 0!==i&&!0!==t(i,n))return}}var O={willResolveModel(e,t,r){this._scheduleLoadingEvent(t,r)},error(e,t,r){var n=this,i=e[e.length-1]
-w(e,((e,r)=>{if(r!==i){var o=P(e,"error")
-if(o)return n._markErrorAsHandled(t),n.intermediateTransitionTo(o,t),!1}var s=x(e,"error")
-return!s||(n._markErrorAsHandled(t),n.intermediateTransitionTo(s,t),!1)})),function(e,t){var r,n=[]
-r=e&&"object"==typeof e&&"object"==typeof e.errorThrown?e.errorThrown:e
-t&&n.push(t)
-r&&(r.message&&n.push(r.message),r.stack&&n.push(r.stack),"string"==typeof r&&n.push(r))
-console.error(...n)}(t,`Error while processing route: ${r.targetName}`)},loading(e,t){var r=this,n=e[e.length-1]
-w(e,((e,i)=>{if(i!==n){var o=P(e,"loading")
-if(o)return r.intermediateTransitionTo(o),!1}var s=x(e,"loading")
-return s?(r.intermediateTransitionTo(s),!1):t.pivotHandler!==e}))}}
-function x(e,t){var r=(0,n.getOwner)(e),{routeName:i,fullRouteName:o,_router:s}=e,a=`${o}_${t}`
-return S(r,s,`${i}_${t}`,a)?a:""}function P(e,t){var r=(0,n.getOwner)(e),{routeName:i,fullRouteName:o,_router:s}=e,a="application"===o?t:`${o}.${t}`
-return S(r,s,"application"===i?t:`${i}.${t}`,a)?a:""}function S(e,t,r,n){var i=t.hasRoute(n),o=e.hasRegistration(`template:${r}`)||e.hasRegistration(`route:${r}`)
-return i&&o}function T(e,t,r,n){if(!e){if(t)return
-throw new a.default(`Can't trigger action '${r}' because your app hasn't finished transitioning into its first route. To trigger an action on destination routes during a transition, you can call \`.send()\` on the \`Transition\` object passed to the \`model/beforeModel/afterModel\` hooks.`)}for(var i,o,s=!1,l=e.length-1;l>=0;l--)if(o=(i=e[l].route)&&i.actions&&i.actions[r]){if(!0!==o.apply(i,n))return void("error"===r&&i._router._markErrorAsHandled(n[0]))
-s=!0}var u=O[r]
-if(u)u.apply(this,[e,...n])
-else if(!s&&!t)throw new a.default(`Nothing handled the action '${r}'. If you did handle the action, this error can be caused by returning true from an action handler in a controller, causing the action to bubble.`)}function E(e,t,r){for(var n=e._routerMicrolib.applyIntent(t,r),{routeInfos:i,params:o}=n,s=0;s<i.length;++s){var a=i[s]
-a.isResolved?o[a.name]=a.params:o[a.name]=a.serialize(a.context)}return n}function C(e){var t=e._routerMicrolib.currentRouteInfos
-if(0!==t.length){var i=_._routePath(t),o=t[t.length-1].name,a=e.get("location").getURL();(0,r.set)(e,"currentPath",i),(0,r.set)(e,"currentRouteName",o),(0,r.set)(e,"currentURL",a)
-var l=(0,n.getOwner)(e).lookup("controller:application")
-l&&s.APP_CTRL_ROUTER_PROPS&&("currentPath"in l||Object.defineProperty(l,"currentPath",{get:()=>(0,r.get)(e,"currentPath")}),(0,r.notifyPropertyChange)(l,"currentPath"),"currentRouteName"in l||Object.defineProperty(l,"currentRouteName",{get:()=>(0,r.get)(e,"currentRouteName")}),(0,r.notifyPropertyChange)(l,"currentRouteName"))}}function k(e,t){var r=new f.default(t,t._routerMicrolib,e[m.STATE_SYMBOL])
-t.currentState||t.set("currentState",r),t.set("targetState",r),e.promise=e.catch((e=>{if(!t._isErrorHandled(e))throw e
-t._clearHandledError(e)}),"Transition Error")}function M(e,t,r,n){var i=e._queryParamsFor(t)
-for(var o in r){if(Object.prototype.hasOwnProperty.call(r,o))n(o,r[o],i.map[o])}}function A(e,t){if(e)for(var r=[e];r.length>0;){var n=r.shift()
-if(n.render.name===t)return n
-var i=n.outlets
-for(var o in i)r.push(i[o])}}function R(e,t,n){var i,o={render:n,outlets:Object.create(null),wasUsed:!1}
-return(i=n.into?A(e,n.into):t)?(0,r.set)(i.outlets,n.outlet,o):e=o,{liveRoutes:e,ownState:o}}function j(e,t,r){var{routeName:n}=r,i=A(e,n)
-return i||(t.outlets.main={render:{name:n,outlet:"main"},outlets:{}},t)}_.reopenClass({map(e){return this.dslCallbacks||(this.dslCallbacks=[],this.reopenClass({dslCallbacks:this.dslCallbacks})),this.dslCallbacks.push(e),this},_routePath(e){var t,r,n=[]
-function i(e,t){for(var r=0;r<e.length;++r)if(e[r]!==t[r])return!1
-return!0}for(var o=1;o<e.length;o++){for(t=e[o].name.split("."),r=y.call(n);r.length&&!i(r,t);)r.shift()
-n.push(...t.slice(r.length))}return n.join(".")}}),_.reopen(i.Evented,{didTransition:g,willTransition:v,rootURL:"/",location:"hash",url:(0,r.computed)((function(){var e=(0,r.get)(this,"location")
-if("string"!=typeof e)return e.getURL()}))}),s.ROUTER_EVENTS&&_.reopen(p.ROUTER_EVENT_DEPRECATIONS)
-var I=_
-e.default=I})),e("@ember/-internals/routing/lib/system/router_state",["exports","@ember/polyfills","@ember/-internals/routing/lib/utils"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=class{constructor(e,t,r){this.emberRouter=e,this.router=t,this.routerJsState=r}isActiveIntent(e,n,i){var o=this.routerJsState
-if(!this.router.isActiveIntent(e,n,void 0,o))return!1
-if(void 0!==i&&Object.keys(i).length>0){var s=(0,t.assign)({},i)
-return this.emberRouter._prepareQueryParams(e,n,s),(0,r.shallowEqual)(s,o.queryParams)}return!0}}})),e("@ember/-internals/routing/lib/system/transition",[],(function(){})),e("@ember/-internals/routing/lib/utils",["exports","@ember/-internals/metal","@ember/-internals/owner","@ember/debug","@ember/error","@ember/polyfills","router_js"],(function(e,t,r,n,i,o,s){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.extractRouteArgs=function(e){var t,r=(e=e.slice())[e.length-1]
-t=r&&Object.prototype.hasOwnProperty.call(r,"queryParams")?e.pop().queryParams:{}
-return{routeName:e.shift(),models:e,queryParams:t}},e.getActiveTargetName=function(e){var t=e.activeTransition?e.activeTransition[s.STATE_SYMBOL].routeInfos:e.state.routeInfos
-return t[t.length-1].name},e.stashParamNames=function(e,t){if(t._namesStashed)return
-for(var r,n=t[t.length-1].name,i=e._routerMicrolib.recognizer.handlersFor(n),o=0;o<t.length;++o){var s=t[o],a=i[o].names
-a.length&&(r=s),s._names=a,s.route._stashNames(s,r)}t._namesStashed=!0},e.calculateCacheKey=function(e,r,n){void 0===r&&(r=[])
-for(var i="",o=0;o<r.length;++o){var s=r[o],u=l(e,s),c=void 0
-if(n)if(u&&u in n){var d=0===s.indexOf(u)?s.substr(u.length+1):s
-c=(0,t.get)(n[u],d)}else c=(0,t.get)(n,s)
-i+=`::${s}:${c}`}return e+i.replace(a,"-")},e.normalizeControllerQueryParams=function(e){for(var t={},r=0;r<e.length;++r)u(e[r],t)
-return t},e.resemblesURL=c,e.prefixRouteNameArg=function(e,t){var n=t[0],o=(0,r.getOwner)(e),s=o.mountPoint
-if(o.routable&&"string"==typeof n){if(c(n))throw new i.default("Programmatic transitions by URL cannot be used within an Engine. Please use the route name instead.")
-n=`${s}.${n}`,t[0]=n}return t},e.shallowEqual=function(e,t){var r,n=0,i=0
-for(r in e)if(Object.prototype.hasOwnProperty.call(e,r)){if(e[r]!==t[r])return!1
-n++}for(r in t)Object.prototype.hasOwnProperty.call(t,r)&&i++
-return n===i},e.deprecateTransitionMethods=function(e,t){}
-var a=/\./g
-function l(e,t){for(var r=e.split("."),n="",i=0;i<r.length;i++){var o=r.slice(0,i+1).join(".")
-if(0!==t.indexOf(o))break
-n=o}return n}function u(e,t){var r,n=e
-for(var i in"string"==typeof n&&((r={})[n]={as:null},n=r),n){if(!Object.prototype.hasOwnProperty.call(n,i))return
-var s=n[i]
-"string"==typeof s&&(s={as:s}),r=t[i]||{as:null,scope:"model"},(0,o.assign)(r,s),t[i]=r}}function c(e){return"string"==typeof e&&(""===e||"/"===e[0])}})),e("@ember/-internals/runtime/index",["exports","@ember/-internals/runtime/lib/system/object","@ember/-internals/runtime/lib/mixins/registry_proxy","@ember/-internals/runtime/lib/mixins/container_proxy","@ember/-internals/runtime/lib/copy","@ember/-internals/runtime/lib/compare","@ember/-internals/runtime/lib/is-equal","@ember/-internals/runtime/lib/mixins/array","@ember/-internals/runtime/lib/mixins/comparable","@ember/-internals/runtime/lib/system/namespace","@ember/-internals/runtime/lib/system/array_proxy","@ember/-internals/runtime/lib/system/object_proxy","@ember/-internals/runtime/lib/system/core_object","@ember/-internals/runtime/lib/mixins/action_handler","@ember/-internals/runtime/lib/mixins/copyable","@ember/-internals/runtime/lib/mixins/enumerable","@ember/-internals/runtime/lib/mixins/-proxy","@ember/-internals/runtime/lib/mixins/observable","@ember/-internals/runtime/lib/mixins/mutable_enumerable","@ember/-internals/runtime/lib/mixins/target_action_support","@ember/-internals/runtime/lib/mixins/evented","@ember/-internals/runtime/lib/mixins/promise_proxy","@ember/-internals/runtime/lib/ext/rsvp","@ember/-internals/runtime/lib/type-of","@ember/-internals/runtime/lib/ext/function"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p,f,m,g,v,b,y,_,w,O,x,P){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"Object",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"FrameworkObject",{enumerable:!0,get:function(){return t.FrameworkObject}}),Object.defineProperty(e,"RegistryProxyMixin",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"ContainerProxyMixin",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"copy",{enumerable:!0,get:function(){return i.default}}),Object.defineProperty(e,"compare",{enumerable:!0,get:function(){return o.default}}),Object.defineProperty(e,"isEqual",{enumerable:!0,get:function(){return s.default}}),Object.defineProperty(e,"Array",{enumerable:!0,get:function(){return a.default}}),Object.defineProperty(e,"NativeArray",{enumerable:!0,get:function(){return a.NativeArray}}),Object.defineProperty(e,"A",{enumerable:!0,get:function(){return a.A}}),Object.defineProperty(e,"MutableArray",{enumerable:!0,get:function(){return a.MutableArray}}),Object.defineProperty(e,"removeAt",{enumerable:!0,get:function(){return a.removeAt}}),Object.defineProperty(e,"uniqBy",{enumerable:!0,get:function(){return a.uniqBy}}),Object.defineProperty(e,"isArray",{enumerable:!0,get:function(){return a.isArray}}),Object.defineProperty(e,"Comparable",{enumerable:!0,get:function(){return l.default}}),Object.defineProperty(e,"Namespace",{enumerable:!0,get:function(){return u.default}}),Object.defineProperty(e,"ArrayProxy",{enumerable:!0,get:function(){return c.default}}),Object.defineProperty(e,"ObjectProxy",{enumerable:!0,get:function(){return d.default}}),Object.defineProperty(e,"CoreObject",{enumerable:!0,get:function(){return h.default}}),Object.defineProperty(e,"ActionHandler",{enumerable:!0,get:function(){return p.default}}),Object.defineProperty(e,"Copyable",{enumerable:!0,get:function(){return f.default}}),Object.defineProperty(e,"Enumerable",{enumerable:!0,get:function(){return m.default}}),Object.defineProperty(e,"_ProxyMixin",{enumerable:!0,get:function(){return g.default}}),Object.defineProperty(e,"_contentFor",{enumerable:!0,get:function(){return g.contentFor}}),Object.defineProperty(e,"Observable",{enumerable:!0,get:function(){return v.default}}),Object.defineProperty(e,"MutableEnumerable",{enumerable:!0,get:function(){return b.default}}),Object.defineProperty(e,"TargetActionSupport",{enumerable:!0,get:function(){return y.default}}),Object.defineProperty(e,"Evented",{enumerable:!0,get:function(){return _.default}}),Object.defineProperty(e,"PromiseProxyMixin",{enumerable:!0,get:function(){return w.default}})
-Object.defineProperty(e,"RSVP",{enumerable:!0,get:function(){return O.default}}),Object.defineProperty(e,"onerrorDefault",{enumerable:!0,get:function(){return O.onerrorDefault}}),Object.defineProperty(e,"typeOf",{enumerable:!0,get:function(){return x.typeOf}})})),e("@ember/-internals/runtime/lib/compare",["exports","@ember/-internals/runtime/lib/type-of","@ember/-internals/runtime/lib/mixins/comparable"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function e(o,s){if(o===s)return 0
-var a=(0,t.typeOf)(o),l=(0,t.typeOf)(s)
-if("instance"===a&&r.default.detect(o)&&o.constructor.compare)return o.constructor.compare(o,s)
-if("instance"===l&&r.default.detect(s)&&s.constructor.compare)return-1*s.constructor.compare(s,o)
-var u=i(n[a],n[l])
-if(0!==u)return u
-switch(a){case"boolean":case"number":return i(o,s)
-case"string":return i(o.localeCompare(s),0)
-case"array":for(var c=o.length,d=s.length,h=Math.min(c,d),p=0;p<h;p++){var f=e(o[p],s[p])
-if(0!==f)return f}return i(c,d)
-case"instance":return r.default.detect(o)?o.compare(o,s):0
-case"date":return i(o.getTime(),s.getTime())
-default:return 0}}
-var n={undefined:0,null:1,boolean:2,number:3,string:4,array:5,object:6,instance:7,function:8,class:9,date:10}
-function i(e,t){var r=e-t
-return(r>0)-(r<0)}})),e("@ember/-internals/runtime/lib/copy",["exports","@ember/debug","@ember/-internals/runtime/lib/system/object","@ember/-internals/runtime/lib/mixins/copyable"],(function(e,t,r,n){"use strict"
-function i(e,t,r,o){if("object"!=typeof e||null===e)return e
-var s,a
-if(t&&(a=r.indexOf(e))>=0)return o[a]
-if(t&&r.push(e),Array.isArray(e)){if(s=e.slice(),t)for(o.push(s),a=s.length;--a>=0;)s[a]=i(s[a],t,r,o)}else if(n.default.detect(e))s=e.copy(t,r,o),t&&o.push(s)
-else if(e instanceof Date)s=new Date(e.getTime()),t&&o.push(s)
-else{var l
-for(l in s={},t&&o.push(s),e)Object.prototype.hasOwnProperty.call(e,l)&&"__"!==l.substring(0,2)&&(s[l]=t?i(e[l],t,r,o):e[l])}return s}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){if("object"!=typeof e||null===e)return e
-if(!Array.isArray(e)&&n.default.detect(e))return e.copy(t)
-return i(e,t,t?[]:null,t?[]:null)}})),e("@ember/-internals/runtime/lib/ext/function",["@ember/-internals/environment","@ember/-internals/metal","@ember/debug","@ember/deprecated-features"],(function(e,t,r,n){"use strict"
-n.FUNCTION_PROTOTYPE_EXTENSIONS&&e.ENV.EXTEND_PROTOTYPES.Function&&Object.defineProperties(Function.prototype,{property:{configurable:!0,enumerable:!1,writable:!0,value:function(){return(0,t.computed)(...arguments,this)}},observes:{configurable:!0,enumerable:!1,writable:!0,value:function(){return(0,t.observer)(...arguments,this)}},on:{configurable:!0,enumerable:!1,writable:!0,value:function(){return(0,t.on)(...arguments,this)}}})})),e("@ember/-internals/runtime/lib/ext/rsvp",["exports","rsvp","@ember/runloop","@ember/-internals/error-handling","@ember/debug"],(function(e,t,r,n,i){"use strict"
-function o(e){var t=function(e){if(!e)return
-if(e.errorThrown)return function(e){var t=e.errorThrown
-"string"==typeof t&&(t=new Error(t))
-return Object.defineProperty(t,"__reason_with_error_thrown__",{value:e,enumerable:!1}),t}(e)
-if("UnrecognizedURLError"===e.name)return
-if("TransitionAborted"===e.name)return
-return e}(e)
-if(t){var r=(0,n.getDispatchOverride)()
-if(!r)throw t
-r(t)}}Object.defineProperty(e,"__esModule",{value:!0}),e.onerrorDefault=o,e.default=void 0,t.configure("async",((e,t)=>{r._backburner.schedule("actions",null,e,t)})),t.configure("after",(e=>{r._backburner.schedule(r._rsvpErrorQueue,null,e)})),t.on("error",o)
-var s=t
-e.default=s})),e("@ember/-internals/runtime/lib/is-equal",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){if(e&&"function"==typeof e.isEqual)return e.isEqual(t)
-if(e instanceof Date&&t instanceof Date)return e.getTime()===t.getTime()
-return e===t}})),e("@ember/-internals/runtime/lib/mixins/-proxy",["exports","@ember/-internals/meta","@ember/-internals/metal","@ember/-internals/utils","@ember/debug","@glimmer/manager","@glimmer/validator"],(function(e,t,r,n,i,o,s){"use strict"
-function a(e){var t=(0,r.get)(e,"content")
-return(0,s.updateTag)((0,r.tagForObject)(e),(0,r.tagForObject)(t)),t}function l(e,t,i){var o=(0,s.tagMetaFor)(e),l=(0,s.tagFor)(e,t,o)
-if(t in e)return l
-var u=[l,(0,s.tagFor)(e,"content",o)],c=a(e)
-return(0,n.isObject)(c)&&u.push((0,r.tagForProperty)(c,t,i)),(0,s.combine)(u)}Object.defineProperty(e,"__esModule",{value:!0}),e.contentFor=a,e.default=void 0
-var u=r.Mixin.create({content:null,init(){this._super(...arguments),(0,n.setProxy)(this),(0,r.tagForObject)(this),(0,o.setCustomTagFor)(this,l)},willDestroy(){this.set("content",null),this._super(...arguments)},isTruthy:(0,r.computed)("content",(function(){return Boolean((0,r.get)(this,"content"))})),unknownProperty(e){var t=a(this)
-if(t)return(0,r.get)(t,e)},setUnknownProperty(e,n){var i=(0,t.meta)(this)
-if(i.isInitializing()||i.isPrototypeMeta(this))return(0,r.defineProperty)(this,e,null,n),n
-var o=a(this)
-return(0,r.set)(o,e,n)}})
-e.default=u})),e("@ember/-internals/runtime/lib/mixins/action_handler",["exports","@ember/-internals/metal","@ember/debug"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.Mixin.create({mergedProperties:["actions"],send(e){for(var r=arguments.length,n=new Array(r>1?r-1:0),i=1;i<r;i++)n[i-1]=arguments[i]
-if(this.actions&&this.actions[e]&&!(!0===this.actions[e].apply(this,n)))return
-var o=(0,t.get)(this,"target")
-o&&o.send(...arguments)}}),i=n
-e.default=i})),e("@ember/-internals/runtime/lib/mixins/array",["exports","@ember/-internals/metal","@ember/-internals/utils","@ember/debug","@ember/-internals/runtime/lib/mixins/enumerable","@ember/-internals/runtime/lib/compare","@ember/-internals/environment","@ember/-internals/runtime/lib/mixins/observable","@ember/-internals/runtime/lib/mixins/mutable_enumerable","@ember/-internals/runtime/lib/type-of"],(function(e,t,r,n,i,o,s,a,l,u){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.uniqBy=h,e.removeAt=y,e.isArray=w,e.default=e.MutableArray=e.NativeArray=e.A=void 0
-var c=Object.freeze([]),d=e=>e
-function h(e,r){void 0===r&&(r=d)
-var n=E(),i=new Set,o="function"==typeof r?r:e=>(0,t.get)(e,r)
-return e.forEach((e=>{var t=o(e)
-i.has(t)||(i.add(t),n.push(e))})),n}function p(e,r){var n=2===arguments.length
-return n?n=>r===(0,t.get)(n,e):r=>Boolean((0,t.get)(r,e))}function f(e,r,n){for(var i=e.length,o=n;o<i;o++){if(r((0,t.objectAt)(e,o),o,e))return o}return-1}function m(e,r,n){var i=f(e,r.bind(n),0)
-return-1===i?void 0:(0,t.objectAt)(e,i)}function g(e,t,r){return-1!==f(e,t.bind(r),0)}function v(e,t,r){var n=t.bind(r)
-return-1===f(e,((e,t,r)=>!n(e,t,r)),0)}function b(e,t,r,n){void 0===r&&(r=0)
-var i=e.length
-return r<0&&(r+=i),f(e,n&&t!=t?e=>e!=e:e=>e===t,r)}function y(e,r,n){return void 0===n&&(n=1),(0,t.replace)(e,r,n,c),e}function _(e,r,n){return(0,t.replace)(e,r,0,[n]),n}function w(e){var t=e
-if(!t||t.setInterval)return!1
-if(Array.isArray(t)||P.detect(t))return!0
-var r=(0,u.typeOf)(t)
-if("array"===r)return!0
-var n=t.length
-return"number"==typeof n&&n==n&&"object"===r}function O(){var e=(0,t.computed)(...arguments)
-return e.enumerable=!1,e}function x(e){return this.map((r=>(0,t.get)(r,e)))}var P=t.Mixin.create(i.default,{init(){this._super(...arguments),(0,r.setEmberArray)(this)},objectsAt(e){return e.map((e=>(0,t.objectAt)(this,e)))},"[]":O({get(){return this},set(e,t){return this.replace(0,this.length,t),this}}),firstObject:O((function(){return(0,t.objectAt)(this,0)})).readOnly(),lastObject:O((function(){return(0,t.objectAt)(this,this.length-1)})).readOnly(),slice(e,r){void 0===e&&(e=0)
-var n=E(),i=this.length
-for(e<0&&(e=i+e),void 0===r||r>i?r=i:r<0&&(r=i+r);e<r;)n[n.length]=(0,t.objectAt)(this,e++)
-return n},indexOf(e,t){return b(this,e,t,!1)},lastIndexOf(e,r){var n=this.length;(void 0===r||r>=n)&&(r=n-1),r<0&&(r+=n)
-for(var i=r;i>=0;i--)if((0,t.objectAt)(this,i)===e)return i
-return-1},addArrayObserver(e,r){return(0,t.addArrayObserver)(this,e,r)},removeArrayObserver(e,r){return(0,t.removeArrayObserver)(this,e,r)},hasArrayObservers:(0,t.nativeDescDecorator)({configurable:!0,enumerable:!1,get(){return(0,t.hasListeners)(this,"@array:change")||(0,t.hasListeners)(this,"@array:before")}}),arrayContentWillChange(e,r,n){return(0,t.arrayContentWillChange)(this,e,r,n)},arrayContentDidChange(e,r,n){return(0,t.arrayContentDidChange)(this,e,r,n)},forEach(e,t){void 0===t&&(t=null)
-for(var r=this.length,n=0;n<r;n++){var i=this.objectAt(n)
-e.call(t,i,n,this)}return this},getEach:x,setEach(e,r){return this.forEach((n=>(0,t.set)(n,e,r)))},map(e,t){void 0===t&&(t=null)
-var r=E()
-return this.forEach(((n,i,o)=>r[i]=e.call(t,n,i,o))),r},mapBy:x,filter(e,t){void 0===t&&(t=null)
-var r=E()
-return this.forEach(((n,i,o)=>{e.call(t,n,i,o)&&r.push(n)})),r},reject(e,t){return void 0===t&&(t=null),this.filter((function(){return!e.apply(t,arguments)}))},filterBy(){return this.filter(p(...arguments))},rejectBy(){return this.reject(p(...arguments))},find(e,t){return void 0===t&&(t=null),m(this,e,t)},findBy(){return m(this,p(...arguments))},every(e,t){return void 0===t&&(t=null),v(this,e,t)},isEvery(){return v(this,p(...arguments))},any(e,t){return void 0===t&&(t=null),g(this,e,t)},isAny(){return g(this,p(...arguments))},reduce(e,t){var r=t
-return this.forEach((function(t,n){r=e(r,t,n,this)}),this),r},invoke(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-var i=E()
-return this.forEach((t=>{var n
-return i.push(null==(n=t[e])?void 0:n.call(t,...r))})),i},toArray(){return this.map((e=>e))},compact(){return this.filter((e=>null!=e))},includes(e,t){return-1!==b(this,e,t,!0)},sortBy(){var e=arguments
-return this.toArray().sort(((r,n)=>{for(var i=0;i<e.length;i++){var s=e[i],a=(0,t.get)(r,s),l=(0,t.get)(n,s),u=(0,o.default)(a,l)
-if(u)return u}return 0}))},uniq(){return h(this)},uniqBy(e){return h(this,e)},without(e){if(!this.includes(e))return this
-var t=e==e?t=>t!==e:e=>e==e
-return this.filter(t)}}),S=t.Mixin.create(P,l.default,{clear(){var e=this.length
-return 0===e||this.replace(0,e,c),this},insertAt(e,t){return _(this,e,t),this},removeAt(e,t){return y(this,e,t)},pushObject(e){return _(this,this.length,e)},pushObjects(e){return this.replace(this.length,0,e),this},popObject(){var e=this.length
-if(0===e)return null
-var r=(0,t.objectAt)(this,e-1)
-return this.removeAt(e-1,1),r},shiftObject(){if(0===this.length)return null
-var e=(0,t.objectAt)(this,0)
-return this.removeAt(0),e},unshiftObject(e){return _(this,0,e)},unshiftObjects(e){return this.replace(0,0,e),this},reverseObjects(){var e=this.length
-if(0===e)return this
-var t=this.toArray().reverse()
-return this.replace(0,e,t),this},setObjects(e){if(0===e.length)return this.clear()
-var t=this.length
-return this.replace(0,t,e),this},removeObject(e){for(var r=this.length||0;--r>=0;){(0,t.objectAt)(this,r)===e&&this.removeAt(r)}return this},removeObjects(e){(0,t.beginPropertyChanges)()
-for(var r=e.length-1;r>=0;r--)this.removeObject(e[r])
-return(0,t.endPropertyChanges)(),this},addObject(e){return this.includes(e)||this.pushObject(e),this},addObjects(e){return(0,t.beginPropertyChanges)(),e.forEach((e=>this.addObject(e))),(0,t.endPropertyChanges)(),this}})
-e.MutableArray=S
-var T=t.Mixin.create(S,a.default,{objectAt(e){return this[e]},replace(e,r,n){return void 0===n&&(n=c),(0,t.replaceInNativeArray)(this,e,r,n),this}})
-e.NativeArray=T
-var E,C=["length"]
-T.keys().forEach((e=>{Array.prototype[e]&&C.push(e)})),e.NativeArray=T=T.without(...C),e.A=E,s.ENV.EXTEND_PROTOTYPES.Array?(T.apply(Array.prototype,!0),e.A=E=function(e){return e||[]}):e.A=E=function(e){return e||(e=[]),P.detect(e)?e:T.apply(e)}
-var k=P
-e.default=k})),e("@ember/-internals/runtime/lib/mixins/comparable",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.Mixin.create({compare:null})
-e.default=r})),e("@ember/-internals/runtime/lib/mixins/container_proxy",["exports","@ember/runloop","@ember/-internals/metal"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n={__container__:null,ownerInjection(){return this.__container__.ownerInjection()},lookup(e,t){return this.__container__.lookup(e,t)},destroy(){var e=this.__container__
-e&&(0,t.join)((()=>{e.destroy(),(0,t.schedule)("destroy",e,"finalizeDestroy")})),this._super()},factoryFor(e,t){return void 0===t&&(t={}),this.__container__.factoryFor(e,t)}},i=r.Mixin.create(n)
-e.default=i})),e("@ember/-internals/runtime/lib/mixins/copyable",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.Mixin.create({copy:null})
-e.default=r})),e("@ember/-internals/runtime/lib/mixins/enumerable",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.Mixin.create()
-e.default=r})),e("@ember/-internals/runtime/lib/mixins/evented",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.Mixin.create({on(e,r,n){return(0,t.addListener)(this,e,r,n),this},one(e,r,n){return(0,t.addListener)(this,e,r,n,!0),this},trigger(e){for(var r=arguments.length,n=new Array(r>1?r-1:0),i=1;i<r;i++)n[i-1]=arguments[i];(0,t.sendEvent)(this,e,n)},off(e,r,n){return(0,t.removeListener)(this,e,r,n),this},has(e){return(0,t.hasListeners)(this,e)}})
-e.default=r})),e("@ember/-internals/runtime/lib/mixins/mutable_enumerable",["exports","@ember/-internals/runtime/lib/mixins/enumerable","@ember/-internals/metal"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=r.Mixin.create(t.default)
-e.default=n})),e("@ember/-internals/runtime/lib/mixins/observable",["exports","@ember/-internals/meta","@ember/-internals/metal","@ember/debug"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=r.Mixin.create({get(e){return(0,r.get)(this,e)},getProperties(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n]
-return(0,r.getProperties)(...[this].concat(t))},set(e,t){return(0,r.set)(this,e,t)},setProperties(e){return(0,r.setProperties)(this,e)},beginPropertyChanges(){return(0,r.beginPropertyChanges)(),this},endPropertyChanges(){return(0,r.endPropertyChanges)(),this},notifyPropertyChange(e){return(0,r.notifyPropertyChange)(this,e),this},addObserver(e,t,n,i){return(0,r.addObserver)(this,e,t,n,i),this},removeObserver(e,t,n,i){return(0,r.removeObserver)(this,e,t,n,i),this},hasObserverFor(e){return(0,r.hasListeners)(this,`${e}:change`)},getWithDefault(e,t){return(0,r.getWithDefault)(this,e,t)},incrementProperty(e,t){return void 0===t&&(t=1),(0,r.set)(this,e,(parseFloat((0,r.get)(this,e))||0)+t)},decrementProperty(e,t){return void 0===t&&(t=1),(0,r.set)(this,e,((0,r.get)(this,e)||0)-t)},toggleProperty(e){return(0,r.set)(this,e,!(0,r.get)(this,e))},cacheFor(e){var r=(0,t.peekMeta)(this)
-if(null!==r)return r.valueFor(e)}})
-e.default=i})),e("@ember/-internals/runtime/lib/mixins/promise_proxy",["exports","@ember/-internals/metal","@ember/error"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.Mixin.create({reason:null,isPending:(0,t.computed)("isSettled",(function(){return!(0,t.get)(this,"isSettled")})).readOnly(),isSettled:(0,t.computed)("isRejected","isFulfilled",(function(){return(0,t.get)(this,"isRejected")||(0,t.get)(this,"isFulfilled")})).readOnly(),isRejected:!1,isFulfilled:!1,promise:(0,t.computed)({get(){throw new r.default("PromiseProxy's promise must be set")},set(e,r){return function(e,r){return(0,t.setProperties)(e,{isFulfilled:!1,isRejected:!1}),r.then((r=>(e.isDestroyed||e.isDestroying||(0,t.setProperties)(e,{content:r,isFulfilled:!0}),r)),(r=>{throw e.isDestroyed||e.isDestroying||(0,t.setProperties)(e,{reason:r,isRejected:!0}),r}),"Ember: PromiseProxy")}(this,r)}}),then:i("then"),catch:i("catch"),finally:i("finally")})
-function i(e){return function(){var r=(0,t.get)(this,"promise")
-return r[e](...arguments)}}e.default=n})),e("@ember/-internals/runtime/lib/mixins/registry_proxy",["exports","@ember/debug","@ember/-internals/metal"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=r.Mixin.create({__registry__:null,resolveRegistration(e,t){return this.__registry__.resolve(e,t)},register:i("register"),unregister:i("unregister"),hasRegistration:i("has"),registeredOption:i("getOption"),registerOptions:i("options"),registeredOptions:i("getOptions"),registerOptionsForType:i("optionsForType"),registeredOptionsForType:i("getOptionsForType"),inject:i("injection")})
-function i(e){return function(){return this.__registry__[e](...arguments)}}e.default=n})),e("@ember/-internals/runtime/lib/mixins/target_action_support",["exports","@ember/-internals/environment","@ember/-internals/metal","@ember/debug"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=r.Mixin.create({target:null,action:null,actionContext:null,actionContextObject:(0,r.computed)("actionContext",(function(){var e=(0,r.get)(this,"actionContext")
-if("string"==typeof e){var n=(0,r.get)(this,e)
-return void 0===n&&(n=(0,r.get)(t.context.lookup,e)),n}return e})),triggerAction(e){void 0===e&&(e={})
-var{action:n,target:i,actionContext:o}=e
-if((n=n||(0,r.get)(this,"action"),i=i||function(e){var n=(0,r.get)(e,"target")
-if(n){if("string"==typeof n){var i=(0,r.get)(e,n)
-return void 0===i&&(i=(0,r.get)(t.context.lookup,n)),i}return n}if(e._target)return e._target
-return null}(this),void 0===o&&(o=(0,r.get)(this,"actionContextObject")||this),i&&n)&&!1!==(i.send?i.send(...[n].concat(o)):i[n](...[].concat(o))))return!0
-return!1}})
-Object.defineProperty(i,"_wasReopened",{configurable:!0,enumerable:!1,writable:!0,value:!1}),Object.defineProperty(i,"reopen",{configurable:!0,enumerable:!1,writable:!0,value:function(){this===i&&(i._wasReopened=!0)
-for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n]
-return r.Mixin.prototype.reopen.call(this,...t)}})
-var o=i
-e.default=o})),e("@ember/-internals/runtime/lib/system/array_proxy",["exports","@ember/-internals/metal","@ember/-internals/utils","@ember/-internals/runtime/lib/system/object","@ember/-internals/runtime/lib/mixins/array","@ember/debug","@glimmer/manager","@glimmer/validator"],(function(e,t,r,n,i,o,s,a){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l={willChange:"_arrangedContentArrayWillChange",didChange:"_arrangedContentArrayDidChange"}
-function u(e,t){return"[]"===t?(e._revalidate(),e._arrTag):"length"===t?(e._revalidate(),e._lengthTag):(0,a.tagFor)(e,t)}class c extends n.default{init(){super.init(...arguments),this._objectsDirtyIndex=0,this._objects=null,this._lengthDirty=!0,this._length=0,this._arrangedContent=null,this._arrangedContentIsUpdating=!1,this._arrangedContentTag=null,this._arrangedContentRevision=null,this._lengthTag=null,this._arrTag=null,(0,s.setCustomTagFor)(this,u)}[t.PROPERTY_DID_CHANGE](){this._revalidate()}willDestroy(){this._removeArrangedContentArrayObserver()}objectAtContent(e){return(0,t.objectAt)((0,t.get)(this,"arrangedContent"),e)}replace(e,t,r){this.replaceContent(e,t,r)}replaceContent(e,r,n){(0,t.get)(this,"content").replace(e,r,n)}objectAt(e){if(this._revalidate(),null===this._objects&&(this._objects=[]),-1!==this._objectsDirtyIndex&&e>=this._objectsDirtyIndex){var r=(0,t.get)(this,"arrangedContent")
-if(r)for(var n=this._objects.length=(0,t.get)(r,"length"),i=this._objectsDirtyIndex;i<n;i++)this._objects[i]=this.objectAtContent(i)
-else this._objects.length=0
-this._objectsDirtyIndex=-1}return this._objects[e]}get length(){if(this._revalidate(),this._lengthDirty){var e=(0,t.get)(this,"arrangedContent")
-this._length=e?(0,t.get)(e,"length"):0,this._lengthDirty=!1}return(0,a.consumeTag)(this._lengthTag),this._length}set length(e){var r,n=this.length-e
-if(0!==n){n<0&&(r=new Array(-n),n=0)
-var i=(0,t.get)(this,"content")
-i&&((0,t.replace)(i,e,n,r),this._invalidate())}}_updateArrangedContentArray(e){var r=null===this._objects?0:this._objects.length,n=e?(0,t.get)(e,"length"):0
-this._removeArrangedContentArrayObserver(),this.arrayContentWillChange(0,r,n),this._invalidate(),this.arrayContentDidChange(0,r,n),this._addArrangedContentArrayObserver(e)}_addArrangedContentArrayObserver(e){e&&!e.isDestroyed&&((0,t.addArrayObserver)(e,this,l,!0),this._arrangedContent=e)}_removeArrangedContentArrayObserver(){this._arrangedContent&&(0,t.removeArrayObserver)(this._arrangedContent,this,l,!0)}_arrangedContentArrayWillChange(){}_arrangedContentArrayDidChange(e,r,n,i){this.arrayContentWillChange(r,n,i)
-var o=r
-o<0&&(o+=(0,t.get)(this._arrangedContent,"length")+n-i);(-1===this._objectsDirtyIndex||this._objectsDirtyIndex>o)&&(this._objectsDirtyIndex=o),this._lengthDirty=!0,this.arrayContentDidChange(r,n,i)}_invalidate(){this._objectsDirtyIndex=0,this._lengthDirty=!0}_revalidate(){if(!0!==this._arrangedContentIsUpdating&&(null===this._arrangedContentTag||!(0,a.validateTag)(this._arrangedContentTag,this._arrangedContentRevision))){var e=this.get("arrangedContent")
-null===this._arrangedContentTag?this._addArrangedContentArrayObserver(e):(this._arrangedContentIsUpdating=!0,this._updateArrangedContentArray(e),this._arrangedContentIsUpdating=!1)
-var n=this._arrangedContentTag=(0,a.tagFor)(this,"arrangedContent")
-this._arrangedContentRevision=(0,a.valueForTag)(this._arrangedContentTag),(0,r.isObject)(e)?(this._lengthTag=(0,a.combine)([n,(0,t.tagForProperty)(e,"length")]),this._arrTag=(0,a.combine)([n,(0,t.tagForProperty)(e,"[]")])):this._lengthTag=this._arrTag=n}}}e.default=c,c.reopen(i.MutableArray,{arrangedContent:(0,t.alias)("content"),arrayContentDidChange(e,r,n){return(0,t.arrayContentDidChange)(this,e,r,n,!1)}})})),e("@ember/-internals/runtime/lib/system/core_object",["exports","@ember/-internals/container","@ember/-internals/owner","@ember/polyfills","@ember/-internals/utils","@ember/-internals/meta","@ember/-internals/metal","@ember/-internals/runtime/lib/mixins/action_handler","@ember/debug","@glimmer/util","@glimmer/destroyable","@glimmer/owner"],(function(e,t,r,n,i,o,s,a,l,u,c,d){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var h=s.Mixin.prototype.reopen,p=new u._WeakSet,f=new WeakMap,m=new Set
-function g(e){m.has(e)||e.destroy()}function v(e,t){var r=(0,o.meta)(e)
-if(void 0!==t)for(var a=e.concatenatedProperties,l=e.mergedProperties,u=void 0!==a&&a.length>0,c=void 0!==l&&l.length>0,d=Object.keys(t),h=0;h<d.length;h++){var p=d[h],f=t[p],m=(0,s.descriptorForProperty)(e,p,r),g=void 0!==m
-if(!g){if(u&&a.indexOf(p)>-1){var v=e[p]
-f=v?(0,i.makeArray)(v).concat(f):(0,i.makeArray)(f)}if(c&&l.indexOf(p)>-1){var b=e[p]
-f=(0,n.assign)({},b,f)}}if(g)m.set(e,p,f)
-else if("function"!=typeof e.setUnknownProperty||p in e){e[p]=f}else e.setUnknownProperty(p,f)}e.init(t),r.unsetInitializing()
-var y=r.observerEvents()
-if(void 0!==y)for(var _=0;_<y.length;_++)(0,s.activateObserver)(e,y[_].event,y[_].sync);(0,s.sendEvent)(e,"init",void 0,void 0,void 0,r)}class b{constructor(e){this[d.OWNER]=e,this.constructor.proto()
-var t=this;(0,c.registerDestructor)(t,g,!0),(0,c.registerDestructor)(t,(()=>t.willDestroy())),(0,o.meta)(t).setInitializing()}set[r.LEGACY_OWNER](e){}reopen(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return(0,s.applyMixin)(this,t),this}init(){}get isDestroyed(){return(0,c.isDestroyed)(this)}set isDestroyed(e){}get isDestroying(){return(0,c.isDestroying)(this)}set isDestroying(e){}destroy(){m.add(this)
-try{(0,c.destroy)(this)}finally{m.delete(this)}return this}willDestroy(){}toString(){var e="function"==typeof this.toStringExtension?`:${this.toStringExtension()}`:""
-return`<${(0,t.getFactoryFor)(this)||"(unknown)"}:${(0,i.guidFor)(this)}${e}>`}static extend(){var e=class extends(this){}
-return h.apply(e.PrototypeMixin,arguments),e}static create(e,n){var i
-return void 0!==e?(i=new this((0,r.getOwner)(e)),(0,t.setFactoryFor)(i,(0,t.getFactoryFor)(e))):i=new this,v(i,void 0===n?e:y.apply(this,arguments)),i}static reopen(){return this.willReopen(),h.apply(this.PrototypeMixin,arguments),this}static willReopen(){var e=this.prototype
-p.has(e)&&(p.delete(e),f.has(this)&&f.set(this,s.Mixin.create(this.PrototypeMixin)))}static reopenClass(){return(0,s.applyMixin)(this,arguments),this}static detect(e){if("function"!=typeof e)return!1
-for(;e;){if(e===this)return!0
-e=e.superclass}return!1}static detectInstance(e){return e instanceof this}static metaForProperty(e){var t=this.proto(),r=(0,s.descriptorForProperty)(t,e)
-return r._meta||{}}static eachComputedProperty(e,t){void 0===t&&(t=this),this.proto()
-var r={};(0,o.meta)(this.prototype).forEachDescriptors(((n,i)=>{if(i.enumerable){var o=i._meta||r
-e.call(t,n,o)}}))}static get PrototypeMixin(){var e=f.get(this)
-return void 0===e&&((e=s.Mixin.create()).ownerConstructor=this,f.set(this,e)),e}static get superclass(){var e=Object.getPrototypeOf(this)
-return e!==Function.prototype?e:void 0}static proto(){var e=this.prototype
-if(!p.has(e)){p.add(e)
-var t=this.superclass
-t&&t.proto(),f.has(this)&&this.PrototypeMixin.apply(e)}return e}static toString(){return`<${(0,t.getFactoryFor)(this)||"(unknown)"}:constructor>`}}function y(){for(var{concatenatedProperties:e,mergedProperties:t}=this,r=void 0!==e&&e.length>0,o=void 0!==t&&t.length>0,s={},a=0;a<arguments.length;a++)for(var l=a<0||arguments.length<=a?void 0:arguments[a],u=Object.keys(l),c=0,d=u.length;c<d;c++){var h=u[c],p=l[h]
-if(r&&e.indexOf(h)>-1){var f=s[h]
-p=f?(0,i.makeArray)(f).concat(p):(0,i.makeArray)(p)}if(o&&t.indexOf(h)>-1){var m=s[h]
-p=(0,n.assign)({},m,p)}s[h]=p}return s}if(b.isClass=!0,b.isMethod=!1,!i.HAS_NATIVE_SYMBOL){var _=new WeakMap,w=new WeakMap
-Object.defineProperty(b.prototype,d.OWNER,{get(){return _.get(this)},set(e){_.set(this,e)}}),Object.defineProperty(b.prototype,t.INIT_FACTORY,{get(){return w.get(this)},set(e){w.set(this,e)}}),Object.defineProperty(b,t.INIT_FACTORY,{get(){return w.get(this)},set(e){w.set(this,e)},enumerable:!1})}var O=b
-e.default=O})),e("@ember/-internals/runtime/lib/system/namespace",["exports","@ember/-internals/metal","@ember/-internals/utils","@ember/-internals/runtime/lib/system/object"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class i extends n.default{init(){(0,t.addNamespace)(this)}toString(){var e=(0,t.get)(this,"name")||(0,t.get)(this,"modulePrefix")
-return e||((0,t.findNamespaces)(),void 0===(e=(0,r.getName)(this))&&(e=(0,r.guidFor)(this),(0,r.setName)(this,e)),e)}nameClasses(){(0,t.processNamespace)(this)}destroy(){(0,t.removeNamespace)(this),super.destroy()}}e.default=i,i.prototype.isNamespace=!0,i.NAMESPACES=t.NAMESPACES,i.NAMESPACES_BY_ID=t.NAMESPACES_BY_ID,i.processAll=t.processAllNamespaces,i.byName=t.findNamespace}))
-e("@ember/-internals/runtime/lib/system/object",["exports","@ember/-internals/container","@ember/-internals/utils","@ember/-internals/metal","@ember/-internals/runtime/lib/system/core_object","@ember/-internals/runtime/lib/mixins/observable","@ember/debug"],(function(e,t,r,n,i,o,s){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.FrameworkObject=e.default=void 0
-class a extends i.default{get _debugContainerKey(){var e=(0,t.getFactoryFor)(this)
-return void 0!==e&&e.fullName}}var l
-e.default=a,o.default.apply(a.prototype),e.FrameworkObject=l,e.FrameworkObject=l=class extends i.default{get _debugContainerKey(){var e=(0,t.getFactoryFor)(this)
-return void 0!==e&&e.fullName}},o.default.apply(l.prototype)})),e("@ember/-internals/runtime/lib/system/object_proxy",["exports","@ember/-internals/runtime/lib/system/object","@ember/-internals/runtime/lib/mixins/-proxy"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{}e.default=n,n.PrototypeMixin.reopen(r.default)})),e("@ember/-internals/runtime/lib/type-of",["exports","@ember/-internals/runtime/lib/system/core_object"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.typeOf=function(e){if(null===e)return"null"
-if(void 0===e)return"undefined"
-var i=r[n.call(e)]||"object"
-"function"===i?t.default.detect(e)&&(i="class"):"object"===i&&(e instanceof Error?i="error":e instanceof t.default?i="instance":e instanceof Date&&(i="date"))
-return i}
-var r={"[object Boolean]":"boolean","[object Number]":"number","[object String]":"string","[object Function]":"function","[object AsyncFunction]":"function","[object Array]":"array","[object Date]":"date","[object RegExp]":"regexp","[object Object]":"object","[object FileList]":"filelist"},{toString:n}=Object.prototype})),e("@ember/-internals/utils/index",["exports","@glimmer/util","@ember/debug"],(function(e,t,r){"use strict"
-function n(e){var t={}
-for(var r in t[e]=1,t)if(r===e)return r
-return e}function i(e){return null!==e&&("object"==typeof e||"function"==typeof e)}Object.defineProperty(e,"__esModule",{value:!0}),e.enumerableSymbol=p,e.isInternalSymbol=function(e){return-1!==h.indexOf(e)},e.dictionary=function(e){var t=Object.create(e)
-return t._dict=null,delete t._dict,t},e.uuid=s,e.generateGuid=function(e,t){void 0===t&&(t=a)
-var r=t+s()
-i(e)&&l.set(e,r)
-return r},e.guidFor=function(e){var t
-if(i(e))void 0===(t=l.get(e))&&(t=a+s(),l.set(e,t))
-else if(void 0===(t=u.get(e))){var r=typeof e
-t="string"===r?"st"+s():"number"===r?"nu"+s():"symbol"===r?"sy"+s():"("+e+")",u.set(e,t)}return t},e.intern=n,e.wrap=function(e,t){if(!O(e))return e
-if(!T.has(t)&&O(t))return E(e,E(t,w))
-return E(e,t)},e.observerListenerMetaFor=function(e){return P.get(e)},e.setObservers=function(e,t){S(e).observers=t},e.setListeners=function(e,t){S(e).listeners=t},e.inspect=function(e){if("number"==typeof e&&2===arguments.length)return this
-return D(e,0)},e.lookupDescriptor=F,e.canInvoke=L,e.tryInvoke=function(e,t,r){if(L(e,t)){return e[t].apply(e,r)}},e.makeArray=function(e){if(null==e)return[]
-return z(e)?e:[e]},e.getName=function(e){return U.get(e)},e.setName=function(e,t){i(e)&&U.set(e,t)},e.toString=function e(t){if("string"==typeof t)return t
-if(null===t)return"null"
-if(void 0===t)return"undefined"
-if(Array.isArray(t)){for(var r="",n=0;n<t.length;n++)n>0&&(r+=","),H(t[n])||(r+=e(t[n]))
-return r}if("function"==typeof t.toString)return t.toString()
-return B.call(t)},e.isObject=i,e.isProxy=function(e){if(i(e))return W.has(e)
-return!1},e.setProxy=function(e){i(e)&&W.add(e)},e.setEmberArray=function(e){K.add(e)},e.isEmberArray=function(e){return K.has(e)},e.setWithMandatorySetter=e.teardownMandatorySetter=e.setupMandatorySetter=e.Cache=e.HAS_NATIVE_PROXY=e.HAS_NATIVE_SYMBOL=e.ROOT=e.checkHasSuper=e.GUID_KEY=e.getDebugName=e.symbol=void 0
-var o=0
-function s(){return++o}var a="ember",l=new WeakMap,u=new Map,c=n(`__ember${Date.now()}`)
-e.GUID_KEY=c
-var d="function"==typeof Symbol&&"symbol"==typeof Symbol()
-e.HAS_NATIVE_SYMBOL=d
-var h=[]
-function p(e){var t=n(`__${e}${c+Math.floor(Math.random()*Date.now())}__`)
-return t}var f,m=d?Symbol:p
-e.symbol=m
-var g=f
-e.getDebugName=g
-var v=/\.(_super|call\(this|apply\(this)/,b=Function.prototype.toString,y=b.call((function(){return this})).indexOf("return this")>-1?function(e){return v.test(b.call(e))}:function(){return!0}
-e.checkHasSuper=y
-var _=new WeakMap,w=Object.freeze((function(){}))
-function O(e){var t=_.get(e)
-return void 0===t&&(t=y(e),_.set(e,t)),t}e.ROOT=w,_.set(w,!1)
-class x{constructor(){this.listeners=void 0,this.observers=void 0}}var P=new WeakMap
-function S(e){var t=P.get(e)
-return void 0===t&&(t=new x,P.set(e,t)),t}var T=new t._WeakSet
-function E(e,t){function r(){var r=this._super
-this._super=t
-var n=e.apply(this,arguments)
-return this._super=r,n}T.add(r)
-var n=P.get(e)
-return void 0!==n&&P.set(r,n),r}var{toString:C}=Object.prototype,{toString:k}=Function.prototype,{isArray:M}=Array,{keys:A}=Object,{stringify:R}=JSON,j=100,I=/^[\w$]+$/
-function D(e,r,n){var i=!1
-switch(typeof e){case"undefined":return"undefined"
-case"object":if(null===e)return"null"
-if(M(e)){i=!0
-break}if(e.toString===C||void 0===e.toString)break
-return e.toString()
-case"function":return e.toString===k?e.name?`[Function:${e.name}]`:"[Function]":e.toString()
-case"string":return R(e)
-default:return e.toString()}if(void 0===n)n=new t._WeakSet
-else if(n.has(e))return"[Circular]"
-return n.add(e),i?function(e,t,r){if(t>4)return"[Array]"
-for(var n="[",i=0;i<e.length;i++){if(n+=0===i?" ":", ",i>=j){n+=`... ${e.length-j} more items`
-break}n+=D(e[i],t,r)}return n+=" ]"}(e,r+1,n):function(e,t,r){if(t>4)return"[Object]"
-for(var n="{",i=A(e),o=0;o<i.length;o++){if(n+=0===o?" ":", ",o>=j){n+=`... ${i.length-j} more keys`
-break}var s=i[o]
-n+=N(s)+": "+D(e[s],t,r)}return n+=" }"}(e,r+1,n)}function N(e){return I.test(e)?e:R(e)}function F(e,t){var r=e
-do{var n=Object.getOwnPropertyDescriptor(r,t)
-if(void 0!==n)return n
-r=Object.getPrototypeOf(r)}while(null!==r)
-return null}function L(e,t){return null!=e&&"function"==typeof e[t]}var{isArray:z}=Array
-var U=new WeakMap
-var B=Object.prototype.toString
-function H(e){return null==e}var $="function"==typeof Proxy
-e.HAS_NATIVE_PROXY=$
-var W=new t._WeakSet
-e.Cache=class{constructor(e,t,r){this.limit=e,this.func=t,this.store=r,this.size=0,this.misses=0,this.hits=0,this.store=r||new Map}get(e){return this.store.has(e)?(this.hits++,this.store.get(e)):(this.misses++,this.set(e,this.func(e)))}set(e,t){return this.limit>this.size&&(this.size++,this.store.set(e,t)),t}purge(){this.store.clear(),this.size=0,this.hits=0,this.misses=0}}
-var q,V,G,K=new t._WeakSet
-e.setupMandatorySetter=q,e.teardownMandatorySetter=V,e.setWithMandatorySetter=G})),e("@ember/-internals/views/index",["exports","@ember/-internals/views/lib/system/jquery","@ember/-internals/views/lib/system/utils","@ember/-internals/views/lib/system/event_dispatcher","@ember/-internals/views/lib/component_lookup","@ember/-internals/views/lib/mixins/text_support","@ember/-internals/views/lib/views/core_view","@ember/-internals/views/lib/mixins/class_names_support","@ember/-internals/views/lib/mixins/child_views_support","@ember/-internals/views/lib/mixins/view_state_support","@ember/-internals/views/lib/mixins/view_support","@ember/-internals/views/lib/mixins/action_support","@ember/-internals/views/lib/compat/attrs","@ember/-internals/views/lib/system/action_manager"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"jQuery",{enumerable:!0,get:function(){return t.jQuery}}),Object.defineProperty(e,"jQueryDisabled",{enumerable:!0,get:function(){return t.jQueryDisabled}}),Object.defineProperty(e,"addChildView",{enumerable:!0,get:function(){return r.addChildView}}),Object.defineProperty(e,"isSimpleClick",{enumerable:!0,get:function(){return r.isSimpleClick}}),Object.defineProperty(e,"getViewBounds",{enumerable:!0,get:function(){return r.getViewBounds}}),Object.defineProperty(e,"getViewClientRects",{enumerable:!0,get:function(){return r.getViewClientRects}}),Object.defineProperty(e,"getViewBoundingClientRect",{enumerable:!0,get:function(){return r.getViewBoundingClientRect}}),Object.defineProperty(e,"getRootViews",{enumerable:!0,get:function(){return r.getRootViews}}),Object.defineProperty(e,"getChildViews",{enumerable:!0,get:function(){return r.getChildViews}}),Object.defineProperty(e,"getViewId",{enumerable:!0,get:function(){return r.getViewId}}),Object.defineProperty(e,"getElementView",{enumerable:!0,get:function(){return r.getElementView}}),Object.defineProperty(e,"getViewElement",{enumerable:!0,get:function(){return r.getViewElement}}),Object.defineProperty(e,"setElementView",{enumerable:!0,get:function(){return r.setElementView}}),Object.defineProperty(e,"setViewElement",{enumerable:!0,get:function(){return r.setViewElement}}),Object.defineProperty(e,"clearElementView",{enumerable:!0,get:function(){return r.clearElementView}}),Object.defineProperty(e,"clearViewElement",{enumerable:!0,get:function(){return r.clearViewElement}}),Object.defineProperty(e,"constructStyleDeprecationMessage",{enumerable:!0,get:function(){return r.constructStyleDeprecationMessage}}),Object.defineProperty(e,"EventDispatcher",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"ComponentLookup",{enumerable:!0,get:function(){return i.default}}),Object.defineProperty(e,"TextSupport",{enumerable:!0,get:function(){return o.default}}),Object.defineProperty(e,"CoreView",{enumerable:!0,get:function(){return s.default}}),Object.defineProperty(e,"ClassNamesSupport",{enumerable:!0,get:function(){return a.default}}),Object.defineProperty(e,"ChildViewsSupport",{enumerable:!0,get:function(){return l.default}}),Object.defineProperty(e,"ViewStateSupport",{enumerable:!0,get:function(){return u.default}}),Object.defineProperty(e,"ViewMixin",{enumerable:!0,get:function(){return c.default}}),Object.defineProperty(e,"ActionSupport",{enumerable:!0,get:function(){return d.default}}),Object.defineProperty(e,"MUTABLE_CELL",{enumerable:!0,get:function(){return h.MUTABLE_CELL}}),Object.defineProperty(e,"ActionManager",{enumerable:!0,get:function(){return p.default}})})),e("@ember/-internals/views/lib/compat/attrs",["exports","@ember/-internals/utils"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.MUTABLE_CELL=void 0
-var r=(0,t.symbol)("MUTABLE_CELL")
-e.MUTABLE_CELL=r})),e("@ember/-internals/views/lib/compat/fallback-view-registry",["exports","@ember/-internals/utils"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.dictionary)(null)
-e.default=r})),e("@ember/-internals/views/lib/component_lookup",["exports","@ember/-internals/runtime"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.Object.extend({componentFor(e,t,r){var n=`component:${e}`
-return t.factoryFor(n,r)},layoutFor(e,t,r){var n=`template:components/${e}`
-return t.lookup(n,r)}})
-e.default=r})),e("@ember/-internals/views/lib/mixins/action_support",["exports","@ember/-internals/utils","@ember/-internals/metal","@ember/debug","@ember/-internals/views/lib/compat/attrs","@ember/deprecated-features"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var s={send(e){for(var t=arguments.length,n=new Array(t>1?t-1:0),i=1;i<t;i++)n[i-1]=arguments[i]
-var o=this.actions&&this.actions[e]
-if(o&&!(!0===o.apply(this,n)))return
-var s=(0,r.get)(this,"target")
-s&&s.send(...arguments)}}
-if(o.SEND_ACTION){var a=function(e,t){return t&&t[i.MUTABLE_CELL]&&(t=t.value),t}
-s.sendAction=function(e){var t
-if(void 0===e&&(e="action"),t=(0,r.get)(this,`attrs.${e}`)||(0,r.get)(this,e),void 0!==(t=a(this,t))){for(var n=arguments.length,i=new Array(n>1?n-1:0),o=1;o<n;o++)i[o-1]=arguments[o]
-"function"==typeof t?t(...i):this.triggerAction({action:t,actionContext:i})}}}var l=r.Mixin.create(s)
-e.default=l})),e("@ember/-internals/views/lib/mixins/child_views_support",["exports","@ember/-internals/metal","@ember/-internals/views/lib/system/utils"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.Mixin.create({childViews:(0,t.nativeDescDecorator)({configurable:!1,enumerable:!1,get(){return(0,r.getChildViews)(this)}}),appendChild(e){(0,r.addChildView)(this,e)}})
-e.default=n})),e("@ember/-internals/views/lib/mixins/class_names_support",["exports","@ember/-internals/metal","@ember/debug"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=Object.freeze([]),i=t.Mixin.create({concatenatedProperties:["classNames","classNameBindings"],init(){this._super(...arguments)},classNames:n,classNameBindings:n})
-e.default=i})),e("@ember/-internals/views/lib/mixins/text_support",["exports","@ember/-internals/metal","@ember/debug","@ember/deprecated-features","@ember/-internals/views"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var o={Enter:"insertNewline",Escape:"cancel"},s=t.Mixin.create({value:"",attributeBindings:["autocapitalize","autocorrect","autofocus","disabled","form","maxlength","minlength","placeholder","readonly","required","selectionDirection","spellcheck","tabindex","title"],placeholder:null,disabled:!1,maxlength:null,init(){this._super(...arguments),this.on("paste",this,this._elementValueDidChange),this.on("cut",this,this._elementValueDidChange),this.on("input",this,this._elementValueDidChange)},bubbles:!1,interpretKeyEvents(e){var t=o[e.key]
-if(this._elementValueDidChange(),t)return this[t](e)},_elementValueDidChange(){(0,t.set)(this,"value",this.element.value)},change(e){this._elementValueDidChange(e)},insertNewline(e){a("enter",this,e),a("insert-newline",this,e)},cancel(e){a("escape-press",this,e)},focusIn(e){a("focus-in",this,e)},focusOut(e){this._elementValueDidChange(e),a("focus-out",this,e)},keyPress(e){a("key-press",this,e)},keyUp(e){this.interpretKeyEvents(e),a("key-up",this,e)},keyDown(e){a("key-down",this,e)}})
-function a(e,r,o){var s=(0,t.get)(r,`attrs.${e}`)
-null!==s&&"object"==typeof s&&!0===s[i.MUTABLE_CELL]&&(s=s.value),void 0===s&&(s=(0,t.get)(r,e))
-var a=(0,t.get)(r,"value")
-if(n.SEND_ACTION&&"string"==typeof s){r.triggerAction({action:s,actionContext:[a,o]})}else"function"==typeof s&&s(a,o)
-s&&!(0,t.get)(r,"bubbles")&&o.stopPropagation()}Object.defineProperty(s,"_wasReopened",{configurable:!0,enumerable:!1,writable:!0,value:!1}),Object.defineProperty(s,"reopen",{configurable:!0,enumerable:!1,writable:!0,value:function(){this===s&&(s._wasReopened=!0)
-for(var e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n]
-return t.Mixin.prototype.reopen.call(this,...r)}})
-var l=s
-e.default=l})),e("@ember/-internals/views/lib/mixins/view_state_support",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.Mixin.create({_transitionTo(e){var t=this._currentState,r=this._currentState=this._states[e]
-this._state=e,t&&t.exit&&t.exit(this),r.enter&&r.enter(this)}})
-e.default=r})),e("@ember/-internals/views/lib/mixins/view_support",["exports","@ember/-internals/utils","@ember/-internals/metal","@ember/debug","@ember/-internals/browser-environment","@ember/-internals/views/lib/system/utils","@ember/-internals/views/lib/system/jquery","@ember/deprecated-features"],(function(e,t,r,n,i,o,s,a){"use strict"
-function l(){return this}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var u={concatenatedProperties:["attributeBindings"],nearestOfType(e){for(var t=this.parentView,n=e instanceof r.Mixin?t=>e.detect(t):t=>e.detect(t.constructor);t;){if(n(t))return t
-t=t.parentView}},nearestWithProperty(e){for(var t=this.parentView;t;){if(e in t)return t
-t=t.parentView}},rerender(){return this._currentState.rerender(this)},element:(0,r.nativeDescDecorator)({configurable:!1,enumerable:!1,get(){return this.renderer.getElement(this)}}),appendTo(e){var t
-return t=i.hasDOM&&"string"==typeof e?document.querySelector(e):e,this.renderer.appendTo(this,t),this},append(){return this.appendTo(document.body)},elementId:null,willInsertElement:l,didInsertElement:l,willClearRender:l,destroy(){this._super(...arguments),this._currentState.destroy(this)},willDestroyElement:l,didDestroyElement:l,parentViewDidChange:l,tagName:null,init(){this._super(...arguments),this.elementId||""===this.tagName||(this.elementId=(0,t.guidFor)(this))},handleEvent(e,t){return this._currentState.handleEvent(this,e,t)}}
-a.JQUERY_INTEGRATION&&(u.$=function(e){if(this.element)return e?(0,s.jQuery)(e,this.element):(0,s.jQuery)(this.element)})
-var c=r.Mixin.create(u)
-e.default=c})),e("@ember/-internals/views/lib/system/action_manager",["exports"],(function(e){"use strict"
-function t(){}Object.defineProperty(e,"__esModule",{value:!0}),e.default=t,t.registeredActions={}})),e("@ember/-internals/views/lib/system/event_dispatcher",["exports","@ember/-internals/owner","@ember/polyfills","@ember/debug","@ember/-internals/metal","@ember/-internals/runtime","@ember/-internals/views","@ember/-internals/views/lib/system/jquery","@ember/-internals/views/lib/system/action_manager","@ember/-internals/views/lib/system/jquery_event_deprecation","@ember/-internals/views/lib/system/utils","@ember/deprecated-features"],(function(e,t,r,n,i,o,s,a,l,u,c,d){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var h="ember-application",p=".ember-application",f={mouseenter:"mouseover",mouseleave:"mouseout"},m=o.Object.extend({events:(0,r.assign)({touchstart:"touchStart",touchmove:"touchMove",touchend:"touchEnd",touchcancel:"touchCancel",keydown:"keyDown",keyup:"keyUp",keypress:"keyPress",mousedown:"mouseDown",mouseup:"mouseUp",contextmenu:"contextMenu",click:"click",dblclick:"doubleClick",focusin:"focusIn",focusout:"focusOut",submit:"submit",input:"input",change:"change",dragstart:"dragStart",drag:"drag",dragenter:"dragEnter",dragleave:"dragLeave",dragover:"dragOver",drop:"drop",dragend:"dragEnd"},d.MOUSE_ENTER_LEAVE_MOVE_EVENTS?{mouseenter:"mouseEnter",mouseleave:"mouseLeave",mousemove:"mouseMove"}:{}),rootElement:"body",init(){this._super(),this._eventHandlers=Object.create(null),this._didSetup=!1},setup(e,t){var n=this._finalEvents=(0,r.assign)({},(0,i.get)(this,"events"),e)
-null!=t&&(0,i.set)(this,"rootElement",t)
-var o,s=(0,i.get)(this,"rootElement")
-if(!d.JQUERY_INTEGRATION||a.jQueryDisabled)(o="string"!=typeof s?s:document.querySelector(s)).classList.add(h)
-else if((o=(0,a.jQuery)(s)).addClass(h),!o.is(p))throw new TypeError(`Unable to add 'ember-application' class to root element (${o.selector||o[0].tagName}). Make sure you set rootElement to the body or an element in the body.`)
-for(var l in n)Object.prototype.hasOwnProperty.call(n,l)&&this.setupHandler(o,l,n[l])
-this._didSetup=!0},setupHandler(e,t,r){if(null!==r)if(!d.JQUERY_INTEGRATION||a.jQueryDisabled){var n=(e,t)=>{var n=(0,s.getElementView)(e),i=!0
-return n&&(i=n.handleEvent(r,t)),i},i=(e,t)=>{var n=e.getAttribute("data-ember-action"),i=l.default.registeredActions[n]
-if(""===n){var o=e.attributes,s=o.length
-i=[]
-for(var a=0;a<s;a++){var u=o.item(a)
-0===u.name.indexOf("data-ember-action-")&&(i=i.concat(l.default.registeredActions[u.value]))}}if(i){for(var c=!0,d=0;d<i.length;d++){var h=i[d]
-h&&h.eventName===r&&(c=h.handler(t)&&c)}return c}}
-if(d.MOUSE_ENTER_LEAVE_MOVE_EVENTS&&void 0!==f[t]){var o=f[t],h=t,p=(e,t)=>{var r=document.createEvent("MouseEvent")
-return r.initMouseEvent(e,!1,!1,t.view,t.detail,t.screenX,t.screenY,t.clientX,t.clientY,t.ctrlKey,t.altKey,t.shiftKey,t.metaKey,t.button,t.relatedTarget),Object.defineProperty(r,"target",{value:t.target,enumerable:!0}),r},m=this._eventHandlers[o]=e=>{for(var t=e.target,r=e.relatedTarget;t&&1===t.nodeType&&(null===r||r!==t&&!(0,c.contains)(t,r));)(0,s.getElementView)(t)?n(t,p(h,e)):t.hasAttribute("data-ember-action")&&i(t,p(h,e)),t=t.parentNode}
-e.addEventListener(o,m)}else{var g=this._eventHandlers[t]=e=>{var t=e.target
-do{if((0,s.getElementView)(t)){if(!1===n(t,e)){e.preventDefault(),e.stopPropagation()
-break}if(!0===e.cancelBubble)break}else if("function"==typeof t.hasAttribute&&t.hasAttribute("data-ember-action")&&!1===i(t,e))break
-t=t.parentNode}while(t&&1===t.nodeType)}
-e.addEventListener(t,g)}}else e.on(`${t}.ember`,".ember-view",(function(e){var t=(0,s.getElementView)(this),n=!0
-return t&&(n=t.handleEvent(r,(0,u.default)(e))),n})),e.on(`${t}.ember`,"[data-ember-action]",(e=>{var t=e.currentTarget.attributes,n=[]
-e=(0,u.default)(e)
-for(var i=0;i<t.length;i++){var o=t.item(i)
-if(-1!==o.name.lastIndexOf("data-ember-action-",0)){var s=l.default.registeredActions[o.value]
-s&&s.eventName===r&&-1===n.indexOf(s)&&(s.handler(e),n.push(s))}}}))},destroy(){if(!1!==this._didSetup){var e,t=(0,i.get)(this,"rootElement")
-if(e=t.nodeType?t:document.querySelector(t)){if(!d.JQUERY_INTEGRATION||a.jQueryDisabled)for(var r in this._eventHandlers)e.removeEventListener(r,this._eventHandlers[r])
-else(0,a.jQuery)(t).off(".ember","**")
-return e.classList.remove(h),this._super(...arguments)}}},toString:()=>"(EventDispatcher)"})
-e.default=m})),e("@ember/-internals/views/lib/system/jquery",["exports","@ember/-internals/environment","@ember/-internals/browser-environment","@ember/deprecated-features"],(function(e,t,r,n){"use strict"
-var i
-Object.defineProperty(e,"__esModule",{value:!0}),e.jQueryDisabled=e.jQuery=void 0,e.jQuery=i
-var o=!n.JQUERY_INTEGRATION||!1===t.ENV._JQUERY_INTEGRATION
-e.jQueryDisabled=o,n.JQUERY_INTEGRATION&&r.hasDOM&&(e.jQuery=i=t.context.imports.jQuery,!o&&i?i.event.addProp?i.event.addProp("dataTransfer"):["dragstart","drag","dragenter","dragleave","dragover","drop","dragend"].forEach((e=>{i.event.fixHooks[e]={props:["dataTransfer"]}})):(e.jQuery=i=void 0,e.jQueryDisabled=o=!0))})),e("@ember/-internals/views/lib/system/jquery_event_deprecation",["exports","@ember/debug","@ember/-internals/environment","@ember/-internals/utils","@ember/deprecated-features"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return e}})),e("@ember/-internals/views/lib/system/utils",["exports","@ember/-internals/owner","@ember/-internals/utils","@ember/debug"],(function(e,t,r,n){"use strict"
-function i(e){return""!==e.tagName&&e.elementId?e.elementId:(0,r.guidFor)(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.isSimpleClick=function(e){var t=e.shiftKey||e.metaKey||e.altKey||e.ctrlKey,r=e.which>1
-return!t&&!r},e.constructStyleDeprecationMessage=function(e){return'Binding style attributes may introduce cross-site scripting vulnerabilities; please ensure that values being bound are properly escaped. For more information, including how to disable this warning, see https://deprecations.emberjs.com/v1.x/#toc_binding-style-attributes. Style affected: "'+e+'"'},e.getRootViews=function(e){var t=e.lookup("-view-registry:main"),r=[]
-return Object.keys(t).forEach((e=>{var n=t[e]
-null===n.parentView&&r.push(n)})),r},e.getViewId=i,e.getElementView=function(e){return o.get(e)||null},e.getViewElement=function(e){return s.get(e)||null},e.setElementView=function(e,t){o.set(e,t)},e.setViewElement=function(e,t){s.set(e,t)},e.clearElementView=function(e){o.delete(e)},e.clearViewElement=function(e){s.delete(e)},e.getChildViews=function(e){var r=(0,t.getOwner)(e).lookup("-view-registry:main")
-return u(e,r)},e.initChildViews=l,e.addChildView=function(e,t){var r=a.get(e)
-void 0===r&&(r=l(e))
-r.add(i(t))},e.collectChildViews=u,e.getViewBounds=c,e.getViewRange=d,e.getViewClientRects=function(e){return d(e).getClientRects()},e.getViewBoundingClientRect=function(e){return d(e).getBoundingClientRect()},e.matches=function(e,t){return h.call(e,t)},e.contains=function(e,t){if(void 0!==e.contains)return e.contains(t)
-var r=t.parentNode
-for(;r&&(r=r.parentNode);)if(r===e)return!0
-return!1},e.elMatches=void 0
-var o=new WeakMap,s=new WeakMap
-var a=new WeakMap
-function l(e){var t=new Set
-return a.set(e,t),t}function u(e,t){var r=[],n=a.get(e)
-return void 0!==n&&n.forEach((e=>{var n=t[e]
-!n||n.isDestroying||n.isDestroyed||r.push(n)})),r}function c(e){return e.renderer.getBounds(e)}function d(e){var t=c(e),r=document.createRange()
-return r.setStartBefore(t.firstNode),r.setEndAfter(t.lastNode),r}var h="undefined"!=typeof Element?Element.prototype.matches||Element.prototype.matchesSelector||Element.prototype.mozMatchesSelector||Element.prototype.msMatchesSelector||Element.prototype.oMatchesSelector||Element.prototype.webkitMatchesSelector:void 0
-e.elMatches=h})),e("@ember/-internals/views/lib/views/core_view",["exports","@ember/-internals/metal","@ember/-internals/runtime","@ember/-internals/views/lib/views/states"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=r.FrameworkObject.extend(r.Evented,r.ActionHandler,{isView:!0,_states:n.default,init(){this._super(...arguments),this._state="preRender",this._currentState=this._states.preRender},renderer:(0,t.inject)("renderer","-dom"),parentView:null,instrumentDetails(e){return e.object=this.toString(),e.containerKey=this._debugContainerKey,e.view=this,e},trigger(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-this._super(...arguments)
-var i=this[e]
-if("function"==typeof i)return i.apply(this,r)},has(e){return"function"==typeof this[e]||this._super(e)}})
-i.reopenClass({isViewFactory:!0})
-var o=i
-e.default=o})),e("@ember/-internals/views/lib/views/states",["exports","@ember/-internals/views/lib/views/states/pre_render","@ember/-internals/views/lib/views/states/has_element","@ember/-internals/views/lib/views/states/in_dom","@ember/-internals/views/lib/views/states/destroying"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var o=Object.freeze({preRender:t.default,inDOM:n.default,hasElement:r.default,destroying:i.default})
-e.default=o})),e("@ember/-internals/views/lib/views/states/default",["exports","@ember/error"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r={appendChild(){throw new t.default("You can't use appendChild outside of the rendering process")},handleEvent:()=>!0,rerender(){},destroy(){}},n=Object.freeze(r)
-e.default=n})),e("@ember/-internals/views/lib/views/states/destroying",["exports","@ember/polyfills","@ember/error","@ember/-internals/views/lib/views/states/default"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=(0,t.assign)({},n.default,{appendChild(){throw new r.default("You can't call appendChild on a view being destroyed")},rerender(){throw new r.default("You can't call rerender on a view being destroyed")}}),o=Object.freeze(i)
-e.default=o})),e("@ember/-internals/views/lib/views/states/has_element",["exports","@ember/polyfills","@ember/-internals/views/lib/views/states/default","@ember/runloop","@ember/instrumentation"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var o=(0,t.assign)({},r.default,{rerender(e){e.renderer.rerender(e)},destroy(e){e.renderer.remove(e)},handleEvent:(e,t,r)=>!e.has(t)||(0,i.flaggedInstrument)(`interaction.${t}`,{event:r,view:e},(()=>(0,n.join)(e,e.trigger,t,r)))}),s=Object.freeze(o)
-e.default=s})),e("@ember/-internals/views/lib/views/states/in_dom",["exports","@ember/-internals/utils","@ember/polyfills","@ember/error","@ember/-internals/views/lib/views/states/has_element"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var o=(0,r.assign)({},i.default,{enter(e){e.renderer.register(e)}}),s=Object.freeze(o)
-e.default=s})),e("@ember/-internals/views/lib/views/states/pre_render",["exports","@ember/-internals/views/lib/views/states/default","@ember/polyfills"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,r.assign)({},t.default),i=Object.freeze(n)
-e.default=i})),e("@ember/application/deprecations",["exports","@ember/debug"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.deprecate=function(e,t,r){},e.deprecateFunc=function(e,r,n){(0,t.deprecateFunc)(e,r,n)}})),e("@ember/application/globals-resolver",["exports","@ember/-internals/utils","@ember/-internals/metal","@ember/debug","@ember/string","@ember/-internals/runtime","@ember/-internals/glimmer","@ember/deprecated-features"],(function(e,t,r,n,i,o,s,a){"use strict"
-var l
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,a.GLOBALS_RESOLVER&&(l=class extends o.Object{static create(e){return super.create(e)}init(){this._parseNameCache=(0,t.dictionary)(null)}normalize(e){var[t,r]=e.split(":")
-return"template"!==t?`${t}:${r.replace(/(\.|_|-)./g,(e=>e.charAt(1).toUpperCase()))}`:e}resolve(e){var t,r=this.parseName(e),n=r.resolveMethodName
-return this[n]&&(t=this[n](r)),t=t||this.resolveOther(r)}parseName(e){return this._parseNameCache[e]||(this._parseNameCache[e]=this._parseName(e))}_parseName(e){var[t,n]=e.split(":"),o=n,s=(0,r.get)(this,"namespace"),a=o.lastIndexOf("/"),l=-1!==a?o.slice(0,a):null
-if("template"!==t&&-1!==a){var u=o.split("/")
-o=u[u.length-1]
-var c=(0,i.capitalize)(u.slice(0,-1).join("."))
-s=(0,r.findNamespace)(c)}var d="main"===n?"Main":(0,i.classify)(t)
-if(!o||!t)throw new TypeError(`Invalid fullName: \`${e}\`, must be of the form \`type:name\` `)
-return{fullName:e,type:t,fullNameWithoutType:n,dirname:l,name:o,root:s,resolveMethodName:`resolve${d}`}}lookupDescription(e){var t,r=this.parseName(e)
-return"template"===r.type?`template at ${r.fullNameWithoutType.replace(/\./g,"/")}`:(t=`${r.root}.${(0,i.classify)(r.name).replace(/\./g,"")}`,"model"!==r.type&&(t+=(0,i.classify)(r.type)),t)}makeToString(e){var t
-return"string"==typeof e?e:null!=(t=e.name)?t:"(unknown class)"}useRouterNaming(e){"basic"===e.name?e.name="":e.name=e.name.replace(/\./g,"_")}resolveTemplate(e){var t=e.fullNameWithoutType.replace(/\./g,"/")
-return(0,s.getTemplate)(t)||(0,s.getTemplate)((0,i.decamelize)(t))}resolveView(e){return this.useRouterNaming(e),this.resolveOther(e)}resolveController(e){return this.useRouterNaming(e),this.resolveOther(e)}resolveRoute(e){return this.useRouterNaming(e),this.resolveOther(e)}resolveModel(e){var t=(0,i.classify)(e.name)
-return(0,r.get)(e.root,t)}resolveHelper(e){return this.resolveOther(e)}resolveOther(e){var t=(0,i.classify)(e.name)+(0,i.classify)(e.type)
-return(0,r.get)(e.root,t)}resolveMain(e){var t=(0,i.classify)(e.type)
-return(0,r.get)(e.root,t)}knownForType(e){for(var n=(0,r.get)(this,"namespace"),o=(0,i.classify)(e),s=new RegExp(`${o}$`),a=(0,t.dictionary)(null),l=Object.keys(n),u=0;u<l.length;u++){var c=l[u]
-if(s.test(c))a[this.translateToContainerFullname(e,c)]=!0}return a}translateToContainerFullname(e,t){var r=(0,i.classify)(e),n=t.slice(0,-1*r.length)
-return`${e}:${(0,i.dasherize)(n)}`}})
-var u=l
-e.default=u})),e("@ember/application/index",["exports","@ember/-internals/owner","@ember/application/lib/lazy_load","@ember/application/lib/application"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"getOwner",{enumerable:!0,get:function(){return t.getOwner}}),Object.defineProperty(e,"setOwner",{enumerable:!0,get:function(){return t.setOwner}}),Object.defineProperty(e,"onLoad",{enumerable:!0,get:function(){return r.onLoad}}),Object.defineProperty(e,"runLoadHooks",{enumerable:!0,get:function(){return r.runLoadHooks}}),Object.defineProperty(e,"_loaded",{enumerable:!0,get:function(){return r._loaded}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return n.default}})})),e("@ember/application/instance",["exports","@ember/polyfills","@ember/-internals/metal","@ember/-internals/browser-environment","@ember/-internals/views","@ember/engine/instance","@ember/-internals/glimmer"],(function(e,t,r,n,i,o,s){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var a=o.default.extend({application:null,customEvents:null,rootElement:null,init(){this._super(...arguments),this.application._watchInstance(this),this.register("-application-instance:main",this,{instantiate:!1})},_bootSync(e){return this._booted||(e=new l(e),this.setupRegistry(e),e.rootElement?this.rootElement=e.rootElement:this.rootElement=this.application.rootElement,e.location&&(0,r.set)(this.router,"location",e.location),this.application.runInstanceInitializers(this),e.isInteractive&&this.setupEventDispatcher(),this._booted=!0),this},setupRegistry(e){this.constructor.setupRegistry(this.__registry__,e)},router:(0,r.computed)((function(){return this.lookup("router:main")})).readOnly(),didCreateRootView(e){e.appendTo(this.rootElement)},startRouting(){this.router.startRouting()},setupRouter(){this.router.setupRouter()},handleURL(e){return this.setupRouter(),this.router.handleURL(e)},setupEventDispatcher(){var e=this.lookup("event_dispatcher:main"),n=(0,r.get)(this.application,"customEvents"),i=(0,r.get)(this,"customEvents"),o=(0,t.assign)({},n,i)
-return e.setup(o,this.rootElement),e},getURL(){return this.router.url},visit(e){this.setupRouter()
-var t=this.__container__.lookup("-environment:main"),n=this.router,i=()=>t.options.shouldRender?(0,s.renderSettled)().then((()=>this)):this,o=e=>{if(e.error)throw e.error
-if("TransitionAborted"===e.name&&n._routerMicrolib.activeTransition)return n._routerMicrolib.activeTransition.then(i,o)
-throw"TransitionAborted"===e.name?new Error(e.message):e},a=(0,r.get)(n,"location")
-return a.setURL(e),n.handleURL(a.getURL()).then(i,o)},willDestroy(){this._super(...arguments),this.application._unwatchInstance(this)}})
-a.reopenClass({setupRegistry(e,t){void 0===t&&(t={}),t.toEnvironment||(t=new l(t)),e.register("-environment:main",t.toEnvironment(),{instantiate:!1}),e.register("service:-document",t.document,{instantiate:!1}),this._super(e,t)}})
-class l{constructor(e){void 0===e&&(e={}),this.jQuery=i.jQuery,this.isInteractive=n.hasDOM,this._renderMode=e._renderMode,void 0!==e.isBrowser?this.isBrowser=Boolean(e.isBrowser):this.isBrowser=n.hasDOM,this.isBrowser||(this.jQuery=null,this.isInteractive=!1,this.location="none"),void 0!==e.shouldRender?this.shouldRender=Boolean(e.shouldRender):this.shouldRender=!0,this.shouldRender||(this.jQuery=null,this.isInteractive=!1),e.document?this.document=e.document:this.document="undefined"!=typeof document?document:null,e.rootElement&&(this.rootElement=e.rootElement),void 0!==e.location&&(this.location=e.location),void 0!==e.jQuery&&(this.jQuery=e.jQuery),void 0!==e.isInteractive&&(this.isInteractive=Boolean(e.isInteractive))}toEnvironment(){var e=(0,t.assign)({},n)
-return e.hasDOM=this.isBrowser,e.isInteractive=this.isInteractive,e._renderMode=this._renderMode,e.options=this,e}}var u=a
-e.default=u}))
-e("@ember/application/lib/application",["exports","@ember/-internals/utils","@ember/-internals/environment","@ember/-internals/browser-environment","@ember/debug","@ember/runloop","@ember/-internals/metal","@ember/application/lib/lazy_load","@ember/-internals/runtime","@ember/-internals/views","@ember/-internals/routing","@ember/application/instance","@ember/engine","@ember/-internals/container","@ember/-internals/glimmer","@ember/deprecated-features"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p,f,m){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var g=!1,v=h.default.extend({rootElement:"body",_document:n.hasDOM?window.document:null,eventDispatcher:null,customEvents:null,autoboot:!0,_globalsMode:!0,_applicationInstances:null,init(){this._super(...arguments),this.$||(this.$=u.jQuery),g||(g=!0,m.JQUERY_INTEGRATION&&n.hasDOM&&!u.jQueryDisabled&&s.libraries.registerCoreLibrary("jQuery",(0,u.jQuery)().jquery)),this._readinessDeferrals=1,this._booted=!1,this._applicationInstances=new Set,this.autoboot=this._globalsMode=Boolean(this.autoboot),this._globalsMode&&this._prepareForGlobalsMode(),this.autoboot&&this.waitForDOMReady()},buildInstance(e){return void 0===e&&(e={}),e.base=this,e.application=this,d.default.create(e)},_watchInstance(e){this._applicationInstances.add(e)},_unwatchInstance(e){return this._applicationInstances.delete(e)},_prepareForGlobalsMode(){this.Router=(this.Router||c.Router).extend(),this._buildDeprecatedInstance()},_buildDeprecatedInstance(){var e=this.buildInstance()
-this.__deprecatedInstance__=e,this.__container__=e.__container__},waitForDOMReady(){if(null===this._document||"loading"!==this._document.readyState)(0,o.schedule)("actions",this,"domReady")
-else{var e=()=>{this._document.removeEventListener("DOMContentLoaded",e),(0,o.run)(this,"domReady")}
-this._document.addEventListener("DOMContentLoaded",e)}},domReady(){this.isDestroying||this.isDestroyed||this._bootSync()},deferReadiness(){this._readinessDeferrals++},advanceReadiness(){this._readinessDeferrals--,0===this._readinessDeferrals&&(0,o.once)(this,this.didBecomeReady)},boot(){if(this._bootPromise)return this._bootPromise
-try{this._bootSync()}catch(e){}return this._bootPromise},_bootSync(){if(!(this._booted||this.isDestroying||this.isDestroyed)){var e=this._bootResolver=l.RSVP.defer()
-this._bootPromise=e.promise
-try{this.runInitializers(),(0,a.runLoadHooks)("application",this),this.advanceReadiness()}catch(t){throw e.reject(t),t}}},reset(){var e=this.__deprecatedInstance__
-this._readinessDeferrals=1,this._bootPromise=null,this._bootResolver=null,this._booted=!1,(0,o.join)(this,(function(){(0,o.run)(e,"destroy"),this._buildDeprecatedInstance(),(0,o.schedule)("actions",this,"_bootSync")}))},didBecomeReady(){if(!this.isDestroying&&!this.isDestroyed)try{var e
-if(this.autoboot)(e=this._globalsMode?this.__deprecatedInstance__:this.buildInstance())._bootSync(),this.ready(),e.startRouting()
-this._bootResolver.resolve(this),this._booted=!0}catch(t){throw this._bootResolver.reject(t),t}},ready(){return this},willDestroy(){this._super(...arguments),a._loaded.application===this&&(a._loaded.application=void 0),this._applicationInstances.size&&(this._applicationInstances.forEach((e=>e.destroy())),this._applicationInstances.clear())},visit(e,t){return this.boot().then((()=>{var r=this.buildInstance()
-return r.boot(t).then((()=>r.visit(e))).catch((e=>{throw(0,o.run)(r,"destroy"),e}))}))}})
-v.reopenClass({buildRegistry(){var e=this._super(...arguments)
-return function(e){e.register("router:main",c.Router),e.register("-view-registry:main",{create:()=>(0,t.dictionary)(null)}),e.register("route:basic",c.Route),e.register("event_dispatcher:main",u.EventDispatcher),e.register("location:auto",c.AutoLocation),e.register("location:hash",c.HashLocation),e.register("location:history",c.HistoryLocation),e.register("location:none",c.NoneLocation),e.register(p.privatize`-bucket-cache:main`,{create:()=>new c.BucketCache}),e.register("service:router",c.RouterService)}(e),(0,f.setupApplicationRegistry)(e),e}})
-var b=v
-e.default=b})),e("@ember/application/lib/lazy_load",["exports","@ember/-internals/environment","@ember/-internals/browser-environment"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.onLoad=function(e,t){var r=i[e]
-n[e]=n[e]||[],n[e].push(t),r&&t(r)},e.runLoadHooks=function(e,t){if(i[e]=t,r.window&&"function"==typeof CustomEvent){var o=new CustomEvent(e,{detail:t,name:e})
-r.window.dispatchEvent(o)}n[e]&&n[e].forEach((e=>e(t)))},e._loaded=void 0
-var n=t.ENV.EMBER_LOAD_HOOKS||{},i={},o=i
-e._loaded=o})),e("@ember/application/namespace",["exports","@ember/-internals/runtime"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.Namespace}})})),e("@ember/application/resolver",["exports","@ember/application/globals-resolver"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),e("@ember/array/index",["exports","@ember/-internals/runtime","@ember/-internals/utils"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.Array}}),Object.defineProperty(e,"isArray",{enumerable:!0,get:function(){return t.isArray}}),Object.defineProperty(e,"A",{enumerable:!0,get:function(){return t.A}}),Object.defineProperty(e,"makeArray",{enumerable:!0,get:function(){return r.makeArray}})})),e("@ember/array/mutable",["exports","@ember/-internals/runtime"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.MutableArray}})})),e("@ember/array/proxy",["exports","@ember/-internals/runtime"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.ArrayProxy}})})),e("@ember/canary-features/index",["exports","@ember/-internals/environment","@ember/polyfills"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.isEnabled=function(e){var r=i[e]
-return!0===r||!1===r?r:!!t.ENV.ENABLE_OPTIONAL_FEATURES},e.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS=e.EMBER_STRICT_MODE=e.EMBER_MODERNIZED_BUILT_IN_COMPONENTS=e.EMBER_GLIMMER_INVOKE_HELPER=e.EMBER_GLIMMER_HELPER_MANAGER=e.EMBER_NAMED_BLOCKS=e.EMBER_IMPROVED_INSTRUMENTATION=e.EMBER_LIBRARIES_ISREGISTERED=e.FEATURES=e.DEFAULT_FEATURES=void 0
-var n={EMBER_LIBRARIES_ISREGISTERED:!1,EMBER_IMPROVED_INSTRUMENTATION:!1,EMBER_NAMED_BLOCKS:!0,EMBER_GLIMMER_HELPER_MANAGER:!0,EMBER_GLIMMER_INVOKE_HELPER:!0,EMBER_MODERNIZED_BUILT_IN_COMPONENTS:!0,EMBER_STRICT_MODE:!0,EMBER_DYNAMIC_HELPERS_AND_MODIFIERS:!0}
-e.DEFAULT_FEATURES=n
-var i=(0,r.assign)(n,t.ENV.FEATURES)
-function o(e){return!(!t.ENV.ENABLE_OPTIONAL_FEATURES||null!==e)||e}e.FEATURES=i
-var s=o(i.EMBER_LIBRARIES_ISREGISTERED)
-e.EMBER_LIBRARIES_ISREGISTERED=s
-var a=o(i.EMBER_IMPROVED_INSTRUMENTATION)
-e.EMBER_IMPROVED_INSTRUMENTATION=a
-var l=o(i.EMBER_NAMED_BLOCKS)
-e.EMBER_NAMED_BLOCKS=l
-var u=o(i.EMBER_GLIMMER_HELPER_MANAGER)
-e.EMBER_GLIMMER_HELPER_MANAGER=u
-var c=o(i.EMBER_GLIMMER_INVOKE_HELPER)
-e.EMBER_GLIMMER_INVOKE_HELPER=c
-var d=o(i.EMBER_MODERNIZED_BUILT_IN_COMPONENTS)
-e.EMBER_MODERNIZED_BUILT_IN_COMPONENTS=d
-var h=o(i.EMBER_STRICT_MODE)
-e.EMBER_STRICT_MODE=h
-var p=o(i.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS)
-e.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS=p})),e("@ember/component/checkbox",["exports","@ember/debug","@ember/-internals/glimmer"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return r.Checkbox}})})),e("@ember/component/helper",["exports","@ember/-internals/glimmer"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.Helper}}),Object.defineProperty(e,"helper",{enumerable:!0,get:function(){return t.helper}})})),e("@ember/component/index",["exports","@glimmer/manager","@ember/-internals/glimmer"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"setComponentTemplate",{enumerable:!0,get:function(){return t.setComponentTemplate}}),Object.defineProperty(e,"getComponentTemplate",{enumerable:!0,get:function(){return t.getComponentTemplate}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return r.Component}}),Object.defineProperty(e,"Input",{enumerable:!0,get:function(){return r.Input}}),Object.defineProperty(e,"capabilities",{enumerable:!0,get:function(){return r.componentCapabilities}}),Object.defineProperty(e,"setComponentManager",{enumerable:!0,get:function(){return r.setComponentManager}})})),e("@ember/component/template-only",["exports","@glimmer/runtime"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.templateOnlyComponent}})})),e("@ember/component/text-area",["exports","@ember/debug","@ember/-internals/glimmer"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return r.TextArea}})})),e("@ember/component/text-field",["exports","@ember/debug","@ember/-internals/glimmer"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return r.TextField}})})),e("@ember/controller/index",["exports","@ember/-internals/runtime","@ember/-internals/metal","@ember/controller/lib/controller_mixin"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.inject=function(){return(0,r.inject)("controller",...arguments)},e.default=void 0
-var i=t.FrameworkObject.extend(n.default)
-e.default=i})),e("@ember/controller/lib/controller_mixin",["exports","@ember/-internals/metal","@ember/-internals/runtime","@ember/-internals/utils"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=(0,n.symbol)("MODEL"),o=t.Mixin.create(r.ActionHandler,{isController:!0,target:null,store:null,model:(0,t.computed)({get(){return this[i]},set(e,t){return this[i]=t}})})
-e.default=o})),e("@ember/debug/container-debug-adapter",["exports","@ember/-internals/extension-support"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.ContainerDebugAdapter}})})),e("@ember/debug/data-adapter",["exports","@ember/-internals/extension-support"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.DataAdapter}})})),e("@ember/debug/index",["exports","@ember/-internals/browser-environment","@ember/error","@ember/debug/lib/deprecate","@ember/debug/lib/testing","@ember/debug/lib/warn","@ember/-internals/utils","@ember/debug/lib/capture-render-tree"],(function(e,t,r,n,i,o,s,a){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"registerDeprecationHandler",{enumerable:!0,get:function(){return n.registerHandler}}),Object.defineProperty(e,"isTesting",{enumerable:!0,get:function(){return i.isTesting}}),Object.defineProperty(e,"setTesting",{enumerable:!0,get:function(){return i.setTesting}}),Object.defineProperty(e,"registerWarnHandler",{enumerable:!0,get:function(){return o.registerHandler}}),Object.defineProperty(e,"inspect",{enumerable:!0,get:function(){return s.inspect}}),Object.defineProperty(e,"captureRenderTree",{enumerable:!0,get:function(){return a.default}}),e._warnIfUsingStrippedFeatureFlags=e.getDebugFunction=e.setDebugFunction=e.deprecateFunc=e.runInDebug=e.debugFreeze=e.debugSeal=e.deprecate=e.debug=e.warn=e.info=e.assert=void 0
-var l=()=>{},u=l
-e.assert=u
-var c=l
-e.info=c
-var d=l
-e.warn=d
-var h=l
-e.debug=h
-var p=l
-e.deprecate=p
-var f=l
-e.debugSeal=f
-var m=l
-e.debugFreeze=m
-var g=l
-e.runInDebug=g
-var v=l
-e.setDebugFunction=v
-var b=l
-e.getDebugFunction=b
-var y=function(){return arguments[arguments.length-1]}
-e.deprecateFunc=y,e._warnIfUsingStrippedFeatureFlags=undefined})),e("@ember/debug/lib/capture-render-tree",["exports","@glimmer/util"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return(0,t.expect)(e.lookup("renderer:-dom"),"BUG: owner is missing renderer").debugRenderTree.capture()}})),e("@ember/debug/lib/deprecate",["exports","@ember/-internals/environment","@ember/debug/index","@ember/debug/lib/handlers"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.SINCE_MISSING_DEPRECATIONS=e.FOR_MISSING_DEPRECATIONS=e.missingOptionsSinceDeprecation=e.missingOptionsForDeprecation=e.missingOptionsUntilDeprecation=e.missingOptionsIdDeprecation=e.missingOptionsDeprecation=e.registerHandler=e.default=void 0
-var i,o,s,a=()=>{}
-e.registerHandler=a,e.missingOptionsDeprecation=i,e.missingOptionsIdDeprecation=o,e.missingOptionsUntilDeprecation=s
-var l=()=>""
-e.missingOptionsForDeprecation=l
-var u=()=>""
-e.missingOptionsSinceDeprecation=u
-var c=()=>{},d=new Set
-e.FOR_MISSING_DEPRECATIONS=d
-var h=new Set
-e.SINCE_MISSING_DEPRECATIONS=h
-var p=c
-e.default=p})),e("@ember/debug/lib/handlers",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.invoke=e.registerHandler=e.HANDLERS=void 0
-var t={}
-e.HANDLERS=t
-var r=()=>{}
-e.registerHandler=r
-var n=()=>{}
-e.invoke=n})),e("@ember/debug/lib/testing",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.isTesting=function(){return t},e.setTesting=function(e){t=Boolean(e)}
-var t=!1})),e("@ember/debug/lib/warn",["exports","@ember/debug/index","@ember/debug/lib/handlers"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.missingOptionsDeprecation=e.missingOptionsIdDeprecation=e.registerHandler=e.default=void 0
-var n=()=>{}
-e.registerHandler=n
-var i,o,s=()=>{}
-e.missingOptionsDeprecation=i,e.missingOptionsIdDeprecation=o
-var a=s
-e.default=a})),e("@ember/deprecated-features/index",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.GLOBALS_RESOLVER=e.PARTIALS=e.EMBER_COMPONENT_IS_VISIBLE=e.MOUSE_ENTER_LEAVE_MOVE_EVENTS=e.FUNCTION_PROTOTYPE_EXTENSIONS=e.APP_CTRL_ROUTER_PROPS=e.ALIAS_METHOD=e.JQUERY_INTEGRATION=e.COMPONENT_MANAGER_STRING_LOOKUP=e.ROUTER_EVENTS=e.MERGE=e.LOGGER=e.EMBER_EXTEND_PROTOTYPES=e.SEND_ACTION=void 0
-e.SEND_ACTION=!0
-e.EMBER_EXTEND_PROTOTYPES=!0
-e.LOGGER=!0
-e.MERGE=!0
-e.ROUTER_EVENTS=!0
-e.COMPONENT_MANAGER_STRING_LOOKUP=!0
-e.JQUERY_INTEGRATION=!0
-e.ALIAS_METHOD=!0
-e.APP_CTRL_ROUTER_PROPS=!0
-e.FUNCTION_PROTOTYPE_EXTENSIONS=!0
-e.MOUSE_ENTER_LEAVE_MOVE_EVENTS=!0
-e.EMBER_COMPONENT_IS_VISIBLE=!0
-e.PARTIALS=!0
-e.GLOBALS_RESOLVER=!0})),e("@ember/destroyable/index",["exports","@glimmer/destroyable"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.registerDestructor=function(e,r){return(0,t.registerDestructor)(e,r)},e.unregisterDestructor=function(e,r){return(0,t.unregisterDestructor)(e,r)},Object.defineProperty(e,"assertDestroyablesDestroyed",{enumerable:!0,get:function(){return t.assertDestroyablesDestroyed}}),Object.defineProperty(e,"associateDestroyableChild",{enumerable:!0,get:function(){return t.associateDestroyableChild}}),Object.defineProperty(e,"destroy",{enumerable:!0,get:function(){return t.destroy}}),Object.defineProperty(e,"enableDestroyableTracking",{enumerable:!0,get:function(){return t.enableDestroyableTracking}}),Object.defineProperty(e,"isDestroying",{enumerable:!0,get:function(){return t.isDestroying}}),Object.defineProperty(e,"isDestroyed",{enumerable:!0,get:function(){return t.isDestroyed}})})),e("@ember/engine/index",["exports","@ember/engine/lib/engine-parent","@ember/-internals/utils","@ember/controller","@ember/-internals/runtime","@ember/-internals/container","dag-map","@ember/debug","@ember/-internals/metal","@ember/application/globals-resolver","@ember/engine/instance","@ember/-internals/routing","@ember/-internals/extension-support","@ember/-internals/views","@ember/-internals/glimmer"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p,f){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"getEngineParent",{enumerable:!0,get:function(){return t.getEngineParent}}),Object.defineProperty(e,"setEngineParent",{enumerable:!0,get:function(){return t.setEngineParent}}),e.default=void 0
-var m=i.Namespace.extend(i.RegistryProxyMixin,{init(){this._super(...arguments),this.buildRegistry()},_initializersRan:!1,ensureInitializers(){this._initializersRan||(this.runInitializers(),this._initializersRan=!0)},buildInstance(e){return void 0===e&&(e={}),this.ensureInitializers(),e.base=this,c.default.create(e)},buildRegistry(){return this.__registry__=this.constructor.buildRegistry(this)},initializer(e){this.constructor.initializer(e)},instanceInitializer(e){this.constructor.instanceInitializer(e)},runInitializers(){this._runInitializer("initializers",((e,t)=>{t.initialize(this)}))},runInstanceInitializers(e){this._runInitializer("instanceInitializers",((t,r)=>{r.initialize(e)}))},_runInitializer(e,t){for(var r,n=(0,l.get)(this.constructor,e),i=function(e){var t=[]
-for(var r in e)t.push(r)
-return t}(n),o=new s.default,a=0;a<i.length;a++)r=n[i[a]],o.add(r.name,r,r.before,r.after)
-o.topsort(t)}})
-function g(e){var t={namespace:e}
-return((0,l.get)(e,"Resolver")||u.default).create(t)}function v(e,t){return function(t){if(void 0!==this.superclass[e]&&this.superclass[e]===this[e]){var r={}
-r[e]=Object.create(this[e]),this.reopenClass(r)}this[e][t.name]=t}}m.reopenClass({initializers:Object.create(null),instanceInitializers:Object.create(null),initializer:v("initializers","initializer"),instanceInitializer:v("instanceInitializers","instance initializer"),buildRegistry(e){var t=new o.Registry({resolver:g(e)})
-return t.set=l.set,t.register("application:main",e,{instantiate:!1}),function(e){e.optionsForType("component",{singleton:!1}),e.optionsForType("view",{singleton:!1}),e.register("controller:basic",n.default,{instantiate:!1}),e.injection("renderer","_viewRegistry","-view-registry:main"),e.injection("view:-outlet","namespace","application:main"),e.register("service:-routing",d.RoutingService),e.register("resolver-for-debugging:main",e.resolver,{instantiate:!1}),e.injection("container-debug-adapter:main","resolver","resolver-for-debugging:main"),e.register("container-debug-adapter:main",h.ContainerDebugAdapter),e.register("component-lookup:main",p.ComponentLookup)}(t),(0,f.setupEngineRegistry)(t),t},resolver:null,Resolver:null})
-var b=m
-e.default=b})),e("@ember/engine/instance",["exports","@ember/-internals/runtime","@ember/debug","@ember/error","@ember/-internals/container","@ember/-internals/utils","@ember/engine/lib/engine-parent"],(function(e,t,r,n,i,o,s){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var a=t.Object.extend(t.RegistryProxyMixin,t.ContainerProxyMixin,{base:null,init(){this._super(...arguments),(0,o.guidFor)(this)
-var e=this.base
-e||(e=this.application,this.base=e)
-var t=this.__registry__=new i.Registry({fallback:e.__registry__})
-this.__container__=t.container({owner:this}),this._booted=!1},boot(e){return this._bootPromise||(this._bootPromise=new t.RSVP.Promise((t=>t(this._bootSync(e))))),this._bootPromise},_bootSync(e){return this._booted||(this.cloneParentDependencies(),this.setupRegistry(e),this.base.runInstanceInitializers(this),this._booted=!0),this},setupRegistry(e){void 0===e&&(e=this.__container__.lookup("-environment:main")),this.constructor.setupRegistry(this.__registry__,e)},unregister(e){this.__container__.reset(e),this._super(...arguments)},buildChildEngineInstance(e,t){void 0===t&&(t={})
-var r=this.lookup(`engine:${e}`)
-if(!r)throw new n.default(`You attempted to mount the engine '${e}', but it is not registered with its parent.`)
-var i=r.buildInstance(t)
-return(0,s.setEngineParent)(i,this),i},cloneParentDependencies(){var e=(0,s.getEngineParent)(this);["route:basic","service:-routing"].forEach((t=>this.register(t,e.resolveRegistration(t))))
-var t=e.lookup("-environment:main")
-this.register("-environment:main",t,{instantiate:!1})
-var r=["router:main",i.privatize`-bucket-cache:main`,"-view-registry:main","renderer:-dom","service:-document"]
-t.isInteractive&&r.push("event_dispatcher:main"),r.forEach((t=>this.register(t,e.lookup(t),{instantiate:!1}))),this.inject("view","_environment","-environment:main"),this.inject("route","_environment","-environment:main")}})
-a.reopenClass({setupRegistry(e,t){t&&e.injection("view","_environment","-environment:main")}})
-var l=a
-e.default=l})),e("@ember/engine/lib/engine-parent",["exports","@ember/-internals/utils"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.getEngineParent=function(e){return e[r]},e.setEngineParent=function(e,t){e[r]=t}
-var r=(0,t.symbol)("ENGINE_PARENT")})),e("@ember/enumerable/index",["exports","@ember/-internals/runtime"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.Enumerable}})}))
-e("@ember/error/index",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Error
-e.default=t})),e("@ember/helper/index",["exports","@glimmer/manager","@glimmer/runtime"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"setHelperManager",{enumerable:!0,get:function(){return t.setHelperManager}}),Object.defineProperty(e,"capabilities",{enumerable:!0,get:function(){return t.helperCapabilities}}),Object.defineProperty(e,"invokeHelper",{enumerable:!0,get:function(){return r.invokeHelper}}),Object.defineProperty(e,"hash",{enumerable:!0,get:function(){return r.hash}}),Object.defineProperty(e,"array",{enumerable:!0,get:function(){return r.array}}),Object.defineProperty(e,"concat",{enumerable:!0,get:function(){return r.concat}}),Object.defineProperty(e,"get",{enumerable:!0,get:function(){return r.get}}),Object.defineProperty(e,"fn",{enumerable:!0,get:function(){return r.fn}})})),e("@ember/instrumentation/index",["exports","@ember/-internals/environment"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.instrument=u,e._instrumentStart=h,e.subscribe=function(e,t){for(var i,o=e.split("."),s=[],a=0;a<o.length;a++)"*"===(i=o[a])?s.push("[^\\.]*"):s.push(i)
-var l=s.join("\\.")
-l=`${l}(\\..*)?`
-var u={pattern:e,regex:new RegExp(`^${l}$`),object:t}
-return r.push(u),n={},u},e.unsubscribe=function(e){for(var t=0,i=0;i<r.length;i++)r[i]===e&&(t=i)
-r.splice(t,1),n={}},e.reset=function(){r.length=0,n={}},e.flaggedInstrument=e.subscribers=void 0
-var r=[]
-e.subscribers=r
-var n={}
-var i,o,s,a=(i="undefined"!=typeof window&&window.performance||{},(o=i.now||i.mozNow||i.webkitNow||i.msNow||i.oNow)?o.bind(i):Date.now)
-function l(e){return"function"==typeof e}function u(e,t,n,i){var o,s,a
-if(arguments.length<=3&&l(t)?(s=t,a=n):(o=t,s=n,a=i),0===r.length)return s.call(a)
-var u=o||{},p=h(e,(()=>u))
-return p===d?s.call(a):c(s,p,u,a)}function c(e,t,r,n){try{return e.call(n)}catch(i){throw r.exception=i,i}finally{t()}}function d(){}function h(e,i,o){if(0===r.length)return d
-var s=n[e]
-if(s||(s=function(e){for(var t,i=[],o=0;o<r.length;o++)(t=r[o]).regex.test(e)&&i.push(t.object)
-return n[e]=i,i}(e)),0===s.length)return d
-var l,u=i(o),c=t.ENV.STRUCTURED_PROFILE
-c&&(l=`${e}: ${u.object}`,console.time(l))
-for(var h=[],p=a(),f=0;f<s.length;f++){var m=s[f]
-h.push(m.before(e,p,u))}return function(){for(var t=a(),r=0;r<s.length;r++){var n=s[r]
-"function"==typeof n.after&&n.after(e,t,u,h[r])}c&&console.timeEnd(l)}}e.flaggedInstrument=s,e.flaggedInstrument=s=function(e,t,r){return r()}})),e("@ember/modifier/index",["exports","@glimmer/manager","@ember/-internals/glimmer","@glimmer/runtime"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"setModifierManager",{enumerable:!0,get:function(){return t.setModifierManager}}),Object.defineProperty(e,"capabilities",{enumerable:!0,get:function(){return r.modifierCapabilities}}),Object.defineProperty(e,"on",{enumerable:!0,get:function(){return n.on}})})),e("@ember/object/compat",["exports","@ember/-internals/metal","@ember/debug","@glimmer/validator"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.dependentKeyCompat=o
-var i=function(e,t,r){var{get:i}=r
-return void 0!==i&&(r.get=function(){var e,r=(0,n.tagFor)(this,t),o=(0,n.track)((()=>{e=i.call(this)}))
-return(0,n.updateTag)(r,o),(0,n.consumeTag)(o),e}),r}
-function o(e,r,n){if(!(0,t.isElementDescriptor)([e,r,n])){n=e
-var o=function(e,t,r,o,s){return i(0,t,n)}
-return(0,t.setClassicDecorator)(o),o}return i(0,r,n)}(0,t.setClassicDecorator)(o)})),e("@ember/object/computed",["exports","@ember/-internals/metal","@ember/object/lib/computed/computed_macros","@ember/object/lib/computed/reduce_computed_macros"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.ComputedProperty}}),Object.defineProperty(e,"expandProperties",{enumerable:!0,get:function(){return t.expandProperties}}),Object.defineProperty(e,"alias",{enumerable:!0,get:function(){return t.alias}}),Object.defineProperty(e,"empty",{enumerable:!0,get:function(){return r.empty}}),Object.defineProperty(e,"notEmpty",{enumerable:!0,get:function(){return r.notEmpty}}),Object.defineProperty(e,"none",{enumerable:!0,get:function(){return r.none}}),Object.defineProperty(e,"not",{enumerable:!0,get:function(){return r.not}}),Object.defineProperty(e,"bool",{enumerable:!0,get:function(){return r.bool}}),Object.defineProperty(e,"match",{enumerable:!0,get:function(){return r.match}}),Object.defineProperty(e,"equal",{enumerable:!0,get:function(){return r.equal}}),Object.defineProperty(e,"gt",{enumerable:!0,get:function(){return r.gt}}),Object.defineProperty(e,"gte",{enumerable:!0,get:function(){return r.gte}}),Object.defineProperty(e,"lt",{enumerable:!0,get:function(){return r.lt}}),Object.defineProperty(e,"lte",{enumerable:!0,get:function(){return r.lte}}),Object.defineProperty(e,"oneWay",{enumerable:!0,get:function(){return r.oneWay}}),Object.defineProperty(e,"reads",{enumerable:!0,get:function(){return r.oneWay}}),Object.defineProperty(e,"readOnly",{enumerable:!0,get:function(){return r.readOnly}}),Object.defineProperty(e,"deprecatingAlias",{enumerable:!0,get:function(){return r.deprecatingAlias}}),Object.defineProperty(e,"and",{enumerable:!0,get:function(){return r.and}}),Object.defineProperty(e,"or",{enumerable:!0,get:function(){return r.or}}),Object.defineProperty(e,"sum",{enumerable:!0,get:function(){return n.sum}}),Object.defineProperty(e,"min",{enumerable:!0,get:function(){return n.min}}),Object.defineProperty(e,"max",{enumerable:!0,get:function(){return n.max}}),Object.defineProperty(e,"map",{enumerable:!0,get:function(){return n.map}}),Object.defineProperty(e,"sort",{enumerable:!0,get:function(){return n.sort}}),Object.defineProperty(e,"setDiff",{enumerable:!0,get:function(){return n.setDiff}}),Object.defineProperty(e,"mapBy",{enumerable:!0,get:function(){return n.mapBy}}),Object.defineProperty(e,"filter",{enumerable:!0,get:function(){return n.filter}}),Object.defineProperty(e,"filterBy",{enumerable:!0,get:function(){return n.filterBy}})
-Object.defineProperty(e,"uniq",{enumerable:!0,get:function(){return n.uniq}}),Object.defineProperty(e,"uniqBy",{enumerable:!0,get:function(){return n.uniqBy}}),Object.defineProperty(e,"union",{enumerable:!0,get:function(){return n.union}}),Object.defineProperty(e,"intersect",{enumerable:!0,get:function(){return n.intersect}}),Object.defineProperty(e,"collect",{enumerable:!0,get:function(){return n.collect}})})),e("@ember/object/core",["exports","@ember/-internals/runtime"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.CoreObject}})})),e("@ember/object/evented",["exports","@ember/-internals/runtime","@ember/-internals/metal"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.Evented}}),Object.defineProperty(e,"on",{enumerable:!0,get:function(){return r.on}})})),e("@ember/object/events",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"addListener",{enumerable:!0,get:function(){return t.addListener}}),Object.defineProperty(e,"removeListener",{enumerable:!0,get:function(){return t.removeListener}}),Object.defineProperty(e,"sendEvent",{enumerable:!0,get:function(){return t.sendEvent}})})),e("@ember/object/index",["exports","@ember/debug","@ember/polyfills","@ember/-internals/metal","@ember/-internals/overrides","@ember/-internals/runtime","@ember/object/computed"],(function(e,t,r,n,i,o,s){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.action=u,Object.defineProperty(e,"notifyPropertyChange",{enumerable:!0,get:function(){return n.notifyPropertyChange}}),Object.defineProperty(e,"defineProperty",{enumerable:!0,get:function(){return n.defineProperty}}),Object.defineProperty(e,"get",{enumerable:!0,get:function(){return n.get}}),Object.defineProperty(e,"set",{enumerable:!0,get:function(){return n.set}}),Object.defineProperty(e,"getProperties",{enumerable:!0,get:function(){return n.getProperties}}),Object.defineProperty(e,"setProperties",{enumerable:!0,get:function(){return n.setProperties}}),Object.defineProperty(e,"getWithDefault",{enumerable:!0,get:function(){return n.getWithDefault}}),Object.defineProperty(e,"observer",{enumerable:!0,get:function(){return n.observer}}),Object.defineProperty(e,"computed",{enumerable:!0,get:function(){return n.computed}}),Object.defineProperty(e,"trySet",{enumerable:!0,get:function(){return n.trySet}}),Object.defineProperty(e,"aliasMethod",{enumerable:!0,get:function(){return n.aliasMethod}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return o.Object}}),n.computed.alias=s.alias,n.computed.and=s.and,n.computed.bool=s.bool,n.computed.collect=s.collect,n.computed.deprecatingAlias=s.deprecatingAlias,n.computed.empty=s.empty,n.computed.equal=s.equal,n.computed.filterBy=s.filterBy,n.computed.filter=s.filter,n.computed.gte=s.gte,n.computed.gt=s.gt,n.computed.intersect=s.intersect,n.computed.lte=s.lte,n.computed.lt=s.lt,n.computed.mapBy=s.mapBy,n.computed.map=s.map,n.computed.match=s.match,n.computed.max=s.max,n.computed.min=s.min,n.computed.none=s.none,n.computed.notEmpty=s.notEmpty,n.computed.not=s.not,n.computed.oneWay=s.oneWay,n.computed.reads=s.oneWay,n.computed.or=s.or,n.computed.readOnly=s.readOnly,n.computed.setDiff=s.setDiff,n.computed.sort=s.sort,n.computed.sum=s.sum,n.computed.union=s.union
-n.computed.uniqBy=s.uniqBy,n.computed.uniq=s.uniq
-var a=new WeakMap
-function l(e,t,n){if(void 0!==e.constructor&&"function"==typeof e.constructor.proto&&e.constructor.proto(),!Object.prototype.hasOwnProperty.call(e,"actions")){var i=e.actions
-e.actions=i?(0,r.assign)({},i):{}}return e.actions[t]=n,{get(){var e=a.get(this)
-void 0===e&&(e=new Map,a.set(this,e))
-var t=e.get(n)
-return void 0===t&&(t=n.bind(this),e.set(n,t)),t}}}function u(e,t,r){var i
-if(!(0,n.isElementDescriptor)([e,t,r])){i=e
-var o=function(e,t,r,n,o){return l(e,t,i)}
-return(0,n.setClassicDecorator)(o),o}return l(e,t,i=r.value)}(0,n.setClassicDecorator)(u)})),e("@ember/object/internals",["exports","@ember/-internals/metal","@ember/-internals/runtime","@ember/-internals/utils"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"cacheFor",{enumerable:!0,get:function(){return t.getCachedValueFor}}),Object.defineProperty(e,"copy",{enumerable:!0,get:function(){return r.copy}}),Object.defineProperty(e,"guidFor",{enumerable:!0,get:function(){return n.guidFor}})})),e("@ember/object/lib/computed/computed_macros",["exports","@ember/-internals/metal","@ember/debug"],(function(e,t,r){"use strict"
-function n(e,r){var n=[]
-function i(e){n.push(e)}for(var o=0;o<r.length;o++){var s=r[o];(0,t.expandProperties)(s,i)}return n}function i(e,r){return function(){for(var e=arguments.length,i=new Array(e),o=0;o<e;o++)i[o]=arguments[o]
-var s=n(0,i),a=(0,t.computed)(...s,(function(){for(var e=s.length-1,n=0;n<e;n++){var i=(0,t.get)(this,s[n])
-if(!r(i))return i}return(0,t.get)(this,s[e])}))
-return a}}Object.defineProperty(e,"__esModule",{value:!0}),e.empty=function(e){return(0,t.computed)(`${e}.length`,(function(){return(0,t.isEmpty)((0,t.get)(this,e))}))},e.notEmpty=function(e){return(0,t.computed)(`${e}.length`,(function(){return!(0,t.isEmpty)((0,t.get)(this,e))}))},e.none=function(e){return(0,t.computed)(e,(function(){return(0,t.isNone)((0,t.get)(this,e))}))},e.not=function(e){return(0,t.computed)(e,(function(){return!(0,t.get)(this,e)}))},e.bool=function(e){return(0,t.computed)(e,(function(){return Boolean((0,t.get)(this,e))}))},e.match=function(e,r){return(0,t.computed)(e,(function(){var n=(0,t.get)(this,e)
-return r.test(n)}))},e.equal=function(e,r){return(0,t.computed)(e,(function(){return(0,t.get)(this,e)===r}))},e.gt=function(e,r){return(0,t.computed)(e,(function(){return(0,t.get)(this,e)>r}))},e.gte=function(e,r){return(0,t.computed)(e,(function(){return(0,t.get)(this,e)>=r}))},e.lt=function(e,r){return(0,t.computed)(e,(function(){return(0,t.get)(this,e)<r}))},e.lte=function(e,r){return(0,t.computed)(e,(function(){return(0,t.get)(this,e)<=r}))},e.oneWay=function(e){return(0,t.alias)(e).oneWay()},e.readOnly=function(e){return(0,t.alias)(e).readOnly()},e.deprecatingAlias=function(e,r){return(0,t.computed)(e,{get(r){return(0,t.get)(this,e)},set(r,n){return(0,t.set)(this,e,n),n}})},e.or=e.and=void 0
-var o=i(0,(e=>e))
-e.and=o
-var s=i(0,(e=>!e))
-e.or=s})),e("@ember/object/lib/computed/reduce_computed_macros",["exports","@ember/debug","@ember/-internals/metal","@ember/-internals/runtime"],(function(e,t,r,n){"use strict"
-function i(e,t,n,i){return(0,r.computed)(`${e}.[]`,(function(){var i=(0,r.get)(this,e)
-return null===i||"object"!=typeof i?n:i.reduce(t,n,this)})).readOnly()}function o(e,t,i){var o
-return/@each/.test(e)?o=e.replace(/\.@each.*$/,""):(o=e,e+=".[]"),(0,r.computed)(e,...t,(function(){var e=(0,r.get)(this,o)
-return(0,n.isArray)(e)?(0,n.A)(i.call(this,e)):(0,n.A)()})).readOnly()}function s(e,t,i){var o=e.map((e=>`${e}.[]`))
-return(0,r.computed)(...o,(function(){return(0,n.A)(t.call(this,e))})).readOnly()}function a(e,t,r){return void 0===r&&"function"==typeof t&&(r=t,t=[]),o(e,t,(function(e){return e.map(r,this)}))}function l(e,t,r){return void 0===r&&"function"==typeof t&&(r=t,t=[]),o(e,t,(function(e){return e.filter(r,this)}))}function u(){for(var e=arguments.length,t=new Array(e),i=0;i<e;i++)t[i]=arguments[i]
-return s(t,(function(e){var t=(0,n.A)(),i=new Set
-return e.forEach((e=>{var o=(0,r.get)(this,e);(0,n.isArray)(o)&&o.forEach((e=>{i.has(e)||(i.add(e),t.push(e))}))})),t}))}Object.defineProperty(e,"__esModule",{value:!0}),e.sum=function(e){return i(e,((e,t)=>e+t),0,"sum")},e.max=function(e){return i(e,((e,t)=>Math.max(e,t)),-1/0,"max")},e.min=function(e){return i(e,((e,t)=>Math.min(e,t)),1/0,"min")},e.map=a,e.mapBy=function(e,t){return a(`${e}.@each.${t}`,(e=>(0,r.get)(e,t)))},e.filter=l,e.filterBy=function(e,t,n){var i
-i=2===arguments.length?e=>(0,r.get)(e,t):e=>(0,r.get)(e,t)===n
-return l(`${e}.@each.${t}`,i)},e.uniq=u,e.uniqBy=function(e,t){return(0,r.computed)(`${e}.[]`,(function(){var i=(0,r.get)(this,e)
-return(0,n.isArray)(i)?(0,n.uniqBy)(i,t):(0,n.A)()})).readOnly()},e.intersect=function(){for(var e=arguments.length,t=new Array(e),i=0;i<e;i++)t[i]=arguments[i]
-return s(t,(function(e){var t=e.map((e=>{var t=(0,r.get)(this,e)
-return(0,n.isArray)(t)?t:[]})),i=t.pop().filter((e=>{for(var r=0;r<t.length;r++){for(var n=!1,i=t[r],o=0;o<i.length;o++)if(i[o]===e){n=!0
-break}if(!1===n)return!1}return!0}))
-return(0,n.A)(i)}),"intersect")},e.setDiff=function(e,t){return(0,r.computed)(`${e}.[]`,`${t}.[]`,(function(){var i=(0,r.get)(this,e),o=(0,r.get)(this,t)
-return(0,n.isArray)(i)?(0,n.isArray)(o)?i.filter((e=>-1===o.indexOf(e))):(0,n.A)(i):(0,n.A)()})).readOnly()},e.collect=function(){for(var e=arguments.length,t=new Array(e),i=0;i<e;i++)t[i]=arguments[i]
-return s(t,(function(){var e=t.map((e=>{var t=(0,r.get)(this,e)
-return void 0===t?null:t}))
-return(0,n.A)(e)}),"collect")},e.sort=function(e,t,r){void 0!==r||Array.isArray(t)||(r=t,t=[])
-return"function"==typeof r?d(e,t,r):h(e,r)},e.union=void 0
-var c=u
-function d(e,t,r){return o(e,t,(function(e){return e.slice().sort(((e,t)=>r.call(this,e,t)))}))}function h(e,t){return(0,r.autoComputed)((function(i){var o=(0,r.get)(this,t),s="@this"===e,a=function(e){return e.map((e=>{var[t,r]=e.split(":")
-return[t,r=r||"asc"]}))}(o),l=s?this:(0,r.get)(this,e)
-return(0,n.isArray)(l)?0===a.length?(0,n.A)(l.slice()):function(e,t){return(0,n.A)(e.slice().sort(((e,i)=>{for(var o=0;o<t.length;o++){var[s,a]=t[o],l=(0,n.compare)((0,r.get)(e,s),(0,r.get)(i,s))
-if(0!==l)return"desc"===a?-1*l:l}return 0})))}(l,a):(0,n.A)()})).readOnly()}e.union=c})),e("@ember/object/mixin",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.Mixin}})})),e("@ember/object/observable",["exports","@ember/-internals/runtime"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.Observable}})})),e("@ember/object/observers",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"addObserver",{enumerable:!0,get:function(){return t.addObserver}}),Object.defineProperty(e,"removeObserver",{enumerable:!0,get:function(){return t.removeObserver}})})),e("@ember/object/promise-proxy-mixin",["exports","@ember/-internals/runtime"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.PromiseProxyMixin}})})),e("@ember/object/proxy",["exports","@ember/-internals/runtime"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.ObjectProxy}})})),e("@ember/polyfills/index",["exports","@ember/deprecated-features","@ember/polyfills/lib/merge","@ember/polyfills/lib/assign"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"assign",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"assignPolyfill",{enumerable:!0,get:function(){return n.assign}}),e.hasPropertyAccessors=e.merge=void 0
-var i=t.MERGE?r.default:void 0
-e.merge=i
-e.hasPropertyAccessors=!0})),e("@ember/polyfills/lib/assign",["exports"],(function(e){"use strict"
-function t(e){for(var t=1;t<arguments.length;t++){var r=arguments[t]
-if(r)for(var n=Object.keys(r),i=0;i<n.length;i++){var o=n[i]
-e[o]=r[o]}}return e}Object.defineProperty(e,"__esModule",{value:!0}),e.assign=t,e.default=void 0
-var{assign:r}=Object,n=r||t
-e.default=n})),e("@ember/polyfills/lib/merge",["exports","@ember/debug"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=function(e,t){if(null===t||"object"!=typeof t)return e
-for(var r,n=Object.keys(t),i=0;i<n.length;i++)e[r=n[i]]=t[r]
-return e}
-e.default=r})),e("@ember/routing/auto-location",["exports","@ember/-internals/routing"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.AutoLocation}})})),e("@ember/routing/hash-location",["exports","@ember/-internals/routing"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.HashLocation}})})),e("@ember/routing/history-location",["exports","@ember/-internals/routing"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.HistoryLocation}})})),e("@ember/routing/index",["exports","@ember/-internals/glimmer"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"LinkTo",{enumerable:!0,get:function(){return t.LinkComponent}})})),e("@ember/routing/link-component",["exports","@ember/debug","@ember/-internals/glimmer"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return r.LinkComponent}})})),e("@ember/routing/location",["exports","@ember/-internals/routing"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.Location}})})),e("@ember/routing/none-location",["exports","@ember/-internals/routing"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.NoneLocation}})})),e("@ember/routing/route",["exports","@ember/-internals/routing"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.Route}})})),e("@ember/routing/router",["exports","@ember/-internals/routing"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.Router}})}))
-e("@ember/runloop/index",["exports","@ember/debug","@ember/-internals/error-handling","@ember/-internals/metal","@ember/-internals/overrides","backburner"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e._getCurrentRunLoop=a,e.run=d,e.join=h,e.begin=m,e.end=g,e.schedule=v,e._hasScheduledTimers=b,e._cancelTimers=y,e.later=_,e.once=w,e.scheduleOnce=O,e.next=x,e.cancel=P,e.debounce=S,e.throttle=T,e._deprecatedGlobalGetCurrentRunLoop=e.bind=e._backburner=e._queues=e._rsvpErrorQueue=void 0
-var s=null
-function a(){return s}var l=`${Math.random()}${Date.now()}`.replace(".","")
-e._rsvpErrorQueue=l
-var u=["actions","routerTransitions","render","afterRender","destroy",l]
-e._queues=u
-var c=new o.default(u,{defaultQueue:"actions",onBegin:function(e){s=e},onEnd:function(e,t){s=t,(0,n.flushAsyncObservers)()},onErrorTarget:r.onErrorTarget,onErrorMethod:"onerror",flush:function(e,t){"render"!==e&&e!==l||(0,n.flushAsyncObservers)(),t()}})
-function d(){return c.run(...arguments)}function h(){return c.join(...arguments)}e._backburner=c
-var p,f=function(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return function(){for(var e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n]
-return h(...t.concat(r))}}
-function m(){c.begin()}function g(){c.end()}function v(){return c.schedule(...arguments)}function b(){return c.hasTimers()}function y(){c.cancelTimers()}function _(){return c.later(...arguments)}function w(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return t.unshift("actions"),c.scheduleOnce(...t)}function O(){return c.scheduleOnce(...arguments)}function x(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return t.push(1),c.later(...t)}function P(e){return c.cancel(e)}function S(){return c.debounce(...arguments)}function T(){return c.throttle(...arguments)}e.bind=f,e._deprecatedGlobalGetCurrentRunLoop=p,d.backburner=c,d.begin=m,d.bind=f,d.cancel=P,d.debounce=S,d.end=g,d.hasScheduledTimers=b,d.join=h,d.later=_,d.next=x,d.once=w,d.schedule=v,d.scheduleOnce=O,d.throttle=T,d.cancelTimers=y,Object.defineProperty(d,"currentRunLoop",{get:a,enumerable:!1})})),e("@ember/service/index",["exports","@ember/-internals/runtime","@ember/-internals/metal"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.inject=function(){return(0,r.inject)("service",...arguments)},e.default=void 0
-var n=t.FrameworkObject.extend()
-n.reopenClass({isServiceFactory:!0})
-var i=n
-e.default=i})),e("@ember/string/index",["exports","@ember/string/lib/string_registry","@ember/-internals/environment","@ember/-internals/utils","@ember/debug","@ember/-internals/glimmer"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.loc=x,e.w=P,e.decamelize=S,e.dasherize=T,e.camelize=E,e.classify=C,e.underscore=k,e.capitalize=M,e.htmlSafe=function(e){return A("htmlSafe"),(0,o.htmlSafe)(e)},e.isHTMLSafe=function(e){return A("isHTMLSafe"),(0,o.isHTMLSafe)(e)},Object.defineProperty(e,"_getStrings",{enumerable:!0,get:function(){return t.getStrings}}),Object.defineProperty(e,"_setStrings",{enumerable:!0,get:function(){return t.setStrings}})
-var s=/[ _]/g,a=new n.Cache(1e3,(e=>S(e).replace(s,"-"))),l=/(-|_|\.|\s)+(.)?/g,u=/(^|\/)([A-Z])/g,c=new n.Cache(1e3,(e=>e.replace(l,((e,t,r)=>r?r.toUpperCase():"")).replace(u,(e=>e.toLowerCase())))),d=/^(-|_)+(.)?/,h=/(.)(-|_|\.|\s)+(.)?/g,p=/(^|\/|\.)([a-z])/g,f=new n.Cache(1e3,(e=>{for(var t=(e,t,r)=>r?`_${r.toUpperCase()}`:"",r=(e,t,r,n)=>t+(n?n.toUpperCase():""),n=e.split("/"),i=0;i<n.length;i++)n[i]=n[i].replace(d,t).replace(h,r)
-return n.join("/").replace(p,(e=>e.toUpperCase()))})),m=/([a-z\d])([A-Z]+)/g,g=/-|\s+/g,v=new n.Cache(1e3,(e=>e.replace(m,"$1_$2").replace(g,"_").toLowerCase())),b=/(^|\/)([a-z\u00C0-\u024F])/g,y=new n.Cache(1e3,(e=>e.replace(b,(e=>e.toUpperCase())))),_=/([a-z\d])([A-Z])/g,w=new n.Cache(1e3,(e=>e.replace(_,"$1_$2").toLowerCase()))
-function O(e,t){var r=0
-return e.replace(/%@([0-9]+)?/g,((e,n)=>{var i=n?parseInt(n,10)-1:r++,o=i<t.length?t[i]:void 0
-return"string"==typeof o?o:null===o?"(null)":void 0===o?"":String(o)}))}function x(e,r){return(!Array.isArray(r)||arguments.length>2)&&(r=Array.prototype.slice.call(arguments,1)),O(e=(0,t.getString)(e)||e,r)}function P(e){return e.split(/\s+/)}function S(e){return w.get(e)}function T(e){return a.get(e)}function E(e){return c.get(e)}function C(e){return f.get(e)}function k(e){return v.get(e)}function M(e){return y.get(e)}function A(e,t){void 0===t&&(t=`Importing ${e} from '@ember/string' is deprecated. Please import ${e} from '@ember/template' instead.`)}if(r.ENV.EXTEND_PROTOTYPES.String){var R=function(e,t,r){return void 0===r&&(r=`String prototype extensions are deprecated. Please import ${e} from '@ember/string' instead.`),function(){return t(this,...arguments)}}
-Object.defineProperties(String.prototype,{w:{configurable:!0,enumerable:!1,writeable:!0,value:R("w",P)},loc:{configurable:!0,enumerable:!1,writeable:!0,value(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return x(this,t)}},camelize:{configurable:!0,enumerable:!1,writeable:!0,value:R("camelize",E)},decamelize:{configurable:!0,enumerable:!1,writeable:!0,value:R("decamelize",S)},dasherize:{configurable:!0,enumerable:!1,writeable:!0,value:R("dasherize",T)},underscore:{configurable:!0,enumerable:!1,writeable:!0,value:R("underscore",k)},classify:{configurable:!0,enumerable:!1,writeable:!0,value:R("classify",C)},capitalize:{configurable:!0,enumerable:!1,writeable:!0,value:R("capitalize",M)}})}})),e("@ember/string/lib/string_registry",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.setStrings=function(e){t=e},e.getStrings=function(){return t},e.getString=function(e){return t[e]}
-var t={}})),e("@ember/template-compilation/index",["exports","ember-template-compiler"],(function(e,t){"use strict"
-var r
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"compileTemplate",{enumerable:!0,get:function(){return t.compile}}),e.precompileTemplate=void 0,e.precompileTemplate=r})),e("@ember/template-factory/index",["exports","@glimmer/opcode-compiler"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"createTemplateFactory",{enumerable:!0,get:function(){return t.templateFactory}})})),e("@ember/template/index",["exports","@ember/-internals/glimmer"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"htmlSafe",{enumerable:!0,get:function(){return t.htmlSafe}}),Object.defineProperty(e,"isHTMLSafe",{enumerable:!0,get:function(){return t.isHTMLSafe}})})),e("@ember/test/adapter",["exports","ember-testing"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.Test.Adapter
-e.default=r})),e("@ember/test/index",["exports","require"],(function(e,t){"use strict"
-var r,n,i,o,s
-if(Object.defineProperty(e,"__esModule",{value:!0}),e.unregisterWaiter=e.unregisterHelper=e.registerWaiter=e.registerHelper=e.registerAsyncHelper=void 0,e.registerAsyncHelper=r,e.registerHelper=n,e.registerWaiter=i,e.unregisterHelper=o,e.unregisterWaiter=s,(0,t.has)("ember-testing")){var{Test:a}=(0,t.default)("ember-testing")
-e.registerAsyncHelper=r=a.registerAsyncHelper,e.registerHelper=n=a.registerHelper,e.registerWaiter=i=a.registerWaiter,e.unregisterHelper=o=a.unregisterHelper,e.unregisterWaiter=s=a.unregisterWaiter}else{var l=()=>{throw new Error("Attempted to use test utilities, but `ember-testing` was not included")}
-e.registerAsyncHelper=r=l,e.registerHelper=n=l,e.registerWaiter=i=l,e.unregisterHelper=o=l,e.unregisterWaiter=s=l}})),e("@ember/utils/index",["exports","@ember/-internals/metal","@ember/-internals/utils","@ember/-internals/runtime"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"isNone",{enumerable:!0,get:function(){return t.isNone}}),Object.defineProperty(e,"isBlank",{enumerable:!0,get:function(){return t.isBlank}}),Object.defineProperty(e,"isEmpty",{enumerable:!0,get:function(){return t.isEmpty}}),Object.defineProperty(e,"isPresent",{enumerable:!0,get:function(){return t.isPresent}}),Object.defineProperty(e,"tryInvoke",{enumerable:!0,get:function(){return r.tryInvoke}}),Object.defineProperty(e,"compare",{enumerable:!0,get:function(){return n.compare}}),Object.defineProperty(e,"isEqual",{enumerable:!0,get:function(){return n.isEqual}}),Object.defineProperty(e,"typeOf",{enumerable:!0,get:function(){return n.typeOf}})})),e("@ember/version/index",["exports","ember/version"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"VERSION",{enumerable:!0,get:function(){return t.default}})})),e("@glimmer/destroyable",["exports","@glimmer/util","@glimmer/global-context"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.associateDestroyableChild=function(e,t){0
-var r=u(e),n=u(t)
-return r.children=s(r.children,t),n.parents=s(n.parents,e),t},e.registerDestructor=function(e,t,r){void 0===r&&(r=!1)
-0
-var n=u(e),i=!0===r?"eagerDestructors":"destructors"
-return n[i]=s(n[i],t),t},e.unregisterDestructor=function(e,t,r){void 0===r&&(r=!1)
-0
-var n=u(e),i=!0===r?"eagerDestructors":"destructors"
-n[i]=l(n[i],t,!1)},e.destroy=c,e.destroyChildren=function(e){var{children:t}=u(e)
-a(t,c)},e._hasDestroyableChildren=function(e){var t=o.get(e)
-return void 0!==t&&null!==t.children},e.isDestroying=d,e.isDestroyed=function(e){var t=o.get(e)
-return void 0!==t&&t.state>=2},e.assertDestroyablesDestroyed=e.enableDestroyableTracking=void 0
-var n,i,o=new WeakMap
-function s(e,t){return null===e?t:Array.isArray(e)?(e.push(t),e):[e,t]}function a(e,t){if(Array.isArray(e))for(var r=0;r<e.length;r++)t(e[r])
-else null!==e&&t(e)}function l(e,t,r){if(Array.isArray(e)&&e.length>1){var n=e.indexOf(t)
-return e.splice(n,1),e}return null}function u(e){var t=o.get(e)
-return void 0===t&&(t={parents:null,children:null,eagerDestructors:null,destructors:null,state:0},o.set(e,t)),t}function c(e){var t=u(e)
-if(!(t.state>=1)){var{parents:n,children:i,eagerDestructors:o,destructors:s}=t
-t.state=1,a(i,c),a(o,(t=>t(e))),a(s,(t=>(0,r.scheduleDestroy)(e,t))),(0,r.scheduleDestroyed)((()=>{a(n,(t=>function(e,t){var r=u(t)
-0===r.state&&(r.children=l(r.children,e))}(e,t))),t.state=2}))}}function d(e){var t=o.get(e)
-return void 0!==t&&t.state>=1}e.enableDestroyableTracking=n,e.assertDestroyablesDestroyed=i})),e("@glimmer/encoder",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.InstructionEncoderImpl=void 0
-e.InstructionEncoderImpl=class{constructor(e){this.buffer=e,this.size=0}encode(e,t){if(e>255)throw new Error(`Opcode type over 8-bits. Got ${e}.`)
-var r=e|t|arguments.length-2<<8
-this.buffer.push(r)
-for(var n=2;n<arguments.length;n++){var i=arguments[n]
-0,this.buffer.push(i)}this.size=this.buffer.length}patch(e,t){if(-1!==this.buffer[e+1])throw new Error("Trying to patch operand in populated slot instead of a reserved slot.")
-this.buffer[e+1]=t}}})),e("@glimmer/env",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.CI=e.DEBUG=void 0
-e.DEBUG=!1
-e.CI=!1})),e("@glimmer/global-context",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.testOverrideGlobalContext=e.assertGlobalContextWasSet=e.deprecate=e.assert=e.warnIfStyleNotTrusted=e.setPath=e.getPath=e.setProp=e.getProp=e.toBool=e.toIterator=e.scheduleDestroyed=e.scheduleDestroy=e.scheduleRevalidate=e.default=void 0
-var t,r,n,i,o,s,a,l,u,c,d,h=()=>{}
-e.scheduleRevalidate=h,e.scheduleDestroy=t,e.scheduleDestroyed=r,e.toIterator=n,e.toBool=i,e.getProp=o,e.setProp=s,e.getPath=a,e.setPath=l,e.warnIfStyleNotTrusted=u,e.assert=c,e.deprecate=d
-var p,f
-e.assertGlobalContextWasSet=p,e.testOverrideGlobalContext=f
-var m=function(p){e.scheduleRevalidate=h=p.scheduleRevalidate,e.scheduleDestroy=t=p.scheduleDestroy,e.scheduleDestroyed=r=p.scheduleDestroyed,e.toIterator=n=p.toIterator,e.toBool=i=p.toBool,e.getProp=o=p.getProp,e.setProp=s=p.setProp,e.getPath=a=p.getPath,e.setPath=l=p.setPath,e.warnIfStyleNotTrusted=u=p.warnIfStyleNotTrusted,e.assert=c=p.assert,e.deprecate=d=p.deprecate}
-e.default=m})),e("@glimmer/low-level",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.Stack=e.Storage=void 0
-e.Storage=class{constructor(){this.array=[],this.next=0}add(e){var{next:t,array:r}=this
-if(t===r.length)this.next++
-else{var n=r[t]
-this.next=n}return this.array[t]=e,t}deref(e){return this.array[e]}drop(e){this.array[e]=this.next,this.next=e}}
-class t{constructor(e){void 0===e&&(e=[]),this.vec=e}clone(){return new t(this.vec.slice())}sliceFrom(e){return new t(this.vec.slice(e))}slice(e,r){return new t(this.vec.slice(e,r))}copy(e,t){this.vec[t]=this.vec[e]}writeRaw(e,t){this.vec[e]=t}getRaw(e){return this.vec[e]}reset(){this.vec.length=0}len(){return this.vec.length}}e.Stack=t})),e("@glimmer/manager",["exports","@glimmer/util","@glimmer/reference","@glimmer/validator","@glimmer/destroyable","@glimmer/owner"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.setInternalHelperManager=p,e.setInternalModifierManager=h,e.setInternalComponentManager=f,e.getInternalHelperManager=function(e,t){0
-var r=d(l,e)
-if(void 0===r&&!0===t)return null
-return r},e.getInternalModifierManager=function(e,t){0
-var r=d(a,e)
-if(void 0===r&&!0===t)return null
-return r},e.getInternalComponentManager=function(e,t){0
-var r=d(s,e)
-if(void 0===r&&!0===t)return null
-return r},e.hasInternalHelperManager=function(e){return void 0!==d(l,e)},e.hasInternalModifierManager=function(e){return void 0!==d(a,e)},e.hasInternalComponentManager=function(e){return void 0!==d(s,e)},e.setHelperManager=function(e,t){return p(new j(e),t)},e.setModifierManager=function(e,t){return h(new k(e),t)},e.setComponentManager=function(e,t){return f(new E(e),t)},e.componentCapabilities=function(e,t){void 0===t&&(t={})
-0
-var r=!0
-"3.13"===e&&(r=Boolean(t.updateHook))
-return m({asyncLifeCycleCallbacks:Boolean(t.asyncLifecycleCallbacks),destructor:Boolean(t.destructor),updateHook:r})},e.modifierCapabilities=function(e,t){void 0===t&&(t={})
-0
-return m({disableAutoTracking:Boolean(t.disableAutoTracking),useArgsProxy:"3.13"!==e,passFactoryToCreate:"3.13"===e})},e.helperCapabilities=function(e,t){void 0===t&&(t={})
-0
-0
-0
-return m({hasValue:Boolean(t.hasValue),hasDestroyable:Boolean(t.hasDestroyable),hasScheduledEffect:Boolean(t.hasScheduledEffect)})},e.hasDestroyable=R,e.hasValue=A,e.getComponentTemplate=function(e){var t=e
-for(;null!==t;){var r=I.get(t)
-if(void 0!==r)return r
-t=D(t)}return},e.setComponentTemplate=function(e,t){0
-0
-return I.set(t,e),t},e.capabilityFlagsFrom=function(e){return 0|(e.dynamicLayout?1:0)|(e.dynamicTag?2:0)|(e.prepareArgs?4:0)|(e.createArgs?8:0)|(e.attributeHook?16:0)|(e.elementHook?32:0)|(e.dynamicScope?64:0)|(e.createCaller?128:0)|(e.updateHook?256:0)|(e.createInstance?512:0)|(e.wrapped?1024:0)|(e.willDestroy?2048:0)|(e.hasSubOwner?4096:0)},e.hasCapability=function(e,t){return!!(e&t)},e.managerHasCapability=function(e,t,r){return!!(t&r)},e.getCustomTagFor=function(e){return v.get(e)},e.setCustomTagFor=b,e.CustomHelperManager=e.CustomModifierManager=e.CustomComponentManager=void 0
-var s=new WeakMap,a=new WeakMap,l=new WeakMap,u=Object.getPrototypeOf
-function c(e,t,r){return e.set(r,t),r}function d(e,t){for(var r=t;null!=r;){var n=e.get(r)
-if(void 0!==n)return n
-r=u(r)}}function h(e,t){return c(a,e,t)}function p(e,t){return c(l,e,t)}function f(e,t){return c(s,e,t)}function m(e){return e}var g,v=new WeakMap
-function b(e,t){v.set(e,t)}function y(e){if("symbol"==typeof e)return null
-var t=Number(e)
-return isNaN(t)?null:t%1==0?t:null}function _(e,t){return(0,n.track)((()=>{t in e&&(0,r.valueForRef)(e[t])}))}function w(e,t){return(0,n.track)((()=>{"[]"===t&&e.forEach(r.valueForRef)
-var n=y(t)
-null!==n&&n<e.length&&(0,r.valueForRef)(e[n])}))}class O{constructor(e){this.named=e}get(e,t){var n=this.named[t]
-if(void 0!==n)return(0,r.valueForRef)(n)}has(e,t){return t in this.named}ownKeys(){return Object.keys(this.named)}isExtensible(){return!1}getOwnPropertyDescriptor(e,t){return{enumerable:!0,configurable:!0}}}class x{constructor(e){this.positional=e}get(e,t){var{positional:n}=this
-if("length"===t)return n.length
-var i=y(t)
-return null!==i&&i<n.length?(0,r.valueForRef)(n[i]):e[t]}isExtensible(){return!1}has(e,t){var r=y(t)
-return null!==r&&r<this.positional.length}}g=t.HAS_NATIVE_PROXY?(e,t)=>{var{named:r,positional:n}=e,i=new O(r),o=new x(n),s=Object.create(null),a=new Proxy(s,i),l=new Proxy([],o)
-return b(a,((e,t)=>_(r,t))),b(l,((e,t)=>w(n,t))),{named:a,positional:l}}:(e,t)=>{var{named:n,positional:i}=e,o={},s=[]
-return b(o,((e,t)=>_(n,t))),b(s,((e,t)=>w(i,t))),Object.keys(n).forEach((e=>{Object.defineProperty(o,e,{enumerable:!0,configurable:!0,get:()=>(0,r.valueForRef)(n[e])})})),i.forEach(((e,t)=>{Object.defineProperty(s,t,{enumerable:!0,configurable:!0,get:()=>(0,r.valueForRef)(e)})})),{named:o,positional:s}}
-var P={dynamicLayout:!1,dynamicTag:!1,prepareArgs:!1,createArgs:!0,attributeHook:!1,elementHook:!1,createCaller:!1,dynamicScope:!0,updateHook:!0,createInstance:!0,wrapped:!1,willDestroy:!1,hasSubOwner:!1}
-function S(e){return e.capabilities.asyncLifeCycleCallbacks}function T(e){return e.capabilities.updateHook}class E{constructor(e){this.factory=e,this.componentManagerDelegates=new WeakMap}getDelegateFor(e){var{componentManagerDelegates:t}=this,r=t.get(e)
-if(void 0===r){var{factory:n}=this
-r=n(e),t.set(e,r)}return r}create(e,t,r){var n,i=this.getDelegateFor(e),o=g(r.capture(),"component")
-return n=i.createComponent(t,o),new C(n,i,o)}getDebugName(e){return"function"==typeof e?e.name:e.toString()}update(e){var{delegate:t}=e
-if(T(t)){var{component:r,args:n}=e
-t.updateComponent(r,n)}}didCreate(e){var{component:t,delegate:r}=e
-S(r)&&r.didCreateComponent(t)}didUpdate(e){var{component:t,delegate:r}=e;(function(e){return S(e)&&T(e)})(r)&&r.didUpdateComponent(t)}didRenderLayout(){}didUpdateLayout(){}getSelf(e){var{component:t,delegate:n}=e
-return(0,r.createConstRef)(n.getContext(t),"this")}getDestroyable(e){var{delegate:t}=e
-if(function(e){return e.capabilities.destructor}(t)){var{component:r}=e
-return(0,i.registerDestructor)(e,(()=>t.destroyComponent(r))),e}return null}getCapabilities(){return P}}e.CustomComponentManager=E
-class C{constructor(e,t,r){this.component=e,this.delegate=t,this.args=r}}class k{constructor(e){this.factory=e,this.componentManagerDelegates=new WeakMap}getDelegateFor(e){var{componentManagerDelegates:t}=this,r=t.get(e)
-if(void 0===r){var{factory:n}=this
-r=n(e),t.set(e,r)}return r}create(e,r,s,a){var l,u=this.getDelegateFor(e),{useArgsProxy:c,passFactoryToCreate:d}=u.capabilities,h=g(a,"modifier"),p=c?h:M(a),f=s
-d&&(f={create(r){var n=(0,t.assign)({},r)
-return(0,o.setOwner)(n,e),s.create(r)},class:s}),l=u.createModifier(f,p)
-var m,v=(0,n.createUpdatableTag)()
-return m=c?{tag:v,element:r,delegate:u,args:p,modifier:l}:{tag:v,element:r,modifier:l,delegate:u,get args(){return M(a)}},(0,i.registerDestructor)(m,(()=>u.destroyModifier(l,h))),m}getDebugName(e){var{debugName:t}=e
-return t}getTag(e){var{tag:t}=e
-return t}install(e){var{element:t,args:r,modifier:i,delegate:o}=e,{capabilities:s}=o
-!0===s.disableAutoTracking?(0,n.untrack)((()=>o.installModifier(i,t,r))):o.installModifier(i,t,r)}update(e){var{args:t,modifier:r,delegate:i}=e,{capabilities:o}=i
-!0===o.disableAutoTracking?(0,n.untrack)((()=>i.updateModifier(r,t))):i.updateModifier(r,t)}getDestroyable(e){return e}}function M(e){var{named:n,positional:i}=e,o=(0,t.dict)()
-for(var s in n)o[s]=(0,r.valueForRef)(n[s])
-return{named:o,positional:i.map(r.valueForRef)}}function A(e){return e.capabilities.hasValue}function R(e){return e.capabilities.hasDestroyable}e.CustomModifierManager=k
-class j{constructor(e){this.factory=e,this.helperManagerDelegates=new WeakMap,this.undefinedDelegate=null}getDelegateForOwner(e){var t=this.helperManagerDelegates.get(e)
-if(void 0===t){var{factory:r}=this
-t=r(e),this.helperManagerDelegates.set(e,t)}return t}getDelegateFor(e){if(void 0===e){var{undefinedDelegate:t}=this
-if(null===t){var{factory:r}=this
-this.undefinedDelegate=t=r(void 0)}return t}return this.getDelegateForOwner(e)}getHelper(e){return(t,n)=>{var o=this.getDelegateFor(n),s=g(t,"helper"),a=o.createHelper(e,s)
-if(A(o)){var l=(0,r.createComputeRef)((()=>o.getValue(a)),null,!1)
-return R(o)&&(0,i.associateDestroyableChild)(l,o.getDestroyable(a)),l}if(R(o)){var u=(0,r.createConstRef)(void 0,!1)
-return(0,i.associateDestroyableChild)(u,o.getDestroyable(a)),u}return r.UNDEFINED_REFERENCE}}}e.CustomHelperManager=j
-var I=new WeakMap,D=Object.getPrototypeOf})),e("@glimmer/node",["exports","@glimmer/runtime","@simple-dom/document"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.serializeBuilder=function(e,t){return o.forInitialRender(e,t)},e.NodeDOMTreeConstruction=void 0
-class n extends t.DOMTreeConstruction{constructor(e){super(e||(0,r.default)())}setupUselessElement(){}insertHTMLBefore(e,r,n){var i=this.document.createRawHTMLSection(n)
-return e.insertBefore(i,r),new t.ConcreteBounds(e,i,i)}createElement(e){return this.document.createElement(e)}setAttribute(e,t,r){e.setAttribute(t,r)}}e.NodeDOMTreeConstruction=n
-var i=new WeakMap
-class o extends t.NewElementBuilder{constructor(){super(...arguments),this.serializeBlockDepth=0}__openBlock(){var{tagName:e}=this.element
-if("TITLE"!==e&&"SCRIPT"!==e&&"STYLE"!==e){var t=this.serializeBlockDepth++
-this.__appendComment(`%+b:${t}%`)}super.__openBlock()}__closeBlock(){var{tagName:e}=this.element
-if(super.__closeBlock(),"TITLE"!==e&&"SCRIPT"!==e&&"STYLE"!==e){var t=--this.serializeBlockDepth
-this.__appendComment(`%-b:${t}%`)}}__appendHTML(e){var{tagName:r}=this.element
-if("TITLE"===r||"SCRIPT"===r||"STYLE"===r)return super.__appendHTML(e)
-var n=this.__appendComment("%glmr%")
-if("TABLE"===r){var i=e.indexOf("<")
-if(i>-1)"tr"===e.slice(i+1,i+3)&&(e=`<tbody>${e}</tbody>`)}""===e?this.__appendComment("% %"):super.__appendHTML(e)
-var o=this.__appendComment("%glmr%")
-return new t.ConcreteBounds(this.element,n,o)}__appendText(e){var{tagName:t}=this.element,r=function(e){var{element:t,nextSibling:r}=e
-return null===r?t.lastChild:r.previousSibling}(this)
-return"TITLE"===t||"SCRIPT"===t||"STYLE"===t?super.__appendText(e):""===e?this.__appendComment("% %"):(r&&3===r.nodeType&&this.__appendComment("%|%"),super.__appendText(e))}closeElement(){return i.has(this.element)&&(i.delete(this.element),super.closeElement()),super.closeElement()}openElement(e){return"tr"===e&&"TBODY"!==this.element.tagName&&"THEAD"!==this.element.tagName&&"TFOOT"!==this.element.tagName&&(this.openElement("tbody"),i.set(this.constructing,!0),this.flushElement(null)),super.openElement(e)}pushRemoteElement(e,t,r){void 0===r&&(r=null)
-var{dom:n}=this,i=n.createElement("script")
-return i.setAttribute("glmr",t),n.insertBefore(e,i,r),super.pushRemoteElement(e,t,r)}}})),e("@glimmer/opcode-compiler",["exports","@glimmer/util","@glimmer/vm","@glimmer/global-context","@glimmer/manager","@glimmer/encoder"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.compileStatements=te,e.compilable=ee,e.invokeStaticBlockWithStack=D,e.invokeStaticBlock=I,e.compileStd=se,e.meta=T,e.templateFactory=function(e){var t,{id:r,moduleName:n,block:i,scope:o,isStrictMode:s}=e,a=r||"client-"+de++,l=null,u=new WeakMap,c=e=>{if(void 0===t&&(t=JSON.parse(i)),void 0===e)return null===l?(he.cacheMiss++,l=new pe({id:a,block:t,moduleName:n,owner:null,scope:o,isStrictMode:s})):he.cacheHit++,l
-var r=u.get(e)
-return void 0===r?(he.cacheMiss++,r=new pe({id:a,block:t,moduleName:n,owner:e,scope:o,isStrictMode:s}),u.set(e,r)):he.cacheHit++,r}
-return c.__id=a,c.__meta={moduleName:n},c},e.programCompilationContext=function(e,t){return new ue(e,t)},e.templateCompilationContext=V,e.MINIMAL_CAPABILITIES=e.DEFAULT_CAPABILITIES=e.CompileTimeCompilationContextImpl=e.EMPTY_BLOCKS=e.WrappedBuilder=e.templateCacheCounters=e.PartialDefinitionImpl=e.StdLib=e.debugCompiler=void 0
-class s{constructor(e){this.blocks=e,this.names=e?Object.keys(e):[]}get(e){return this.blocks&&this.blocks[e]||null}has(e){var{blocks:t}=this
-return null!==t&&e in t}with(e,r){var{blocks:n}=this
-return new s(n?(0,t.assign)({},n,{[e]:r}):{[e]:r})}get hasAny(){return null!==this.blocks}}var a=new s(null)
-function l(e){if(null===e)return a
-for(var r=(0,t.dict)(),[n,i]=e,o=0;o<n.length;o++)r[n[o]]=i[o]
-return new s(r)}function u(e){return{type:1,value:e}}function c(e){return{type:5,value:e}}function d(e){return{type:7,value:e}}function h(e){return{type:8,value:e}}function p(e){return t=>{if(!function(e){return Array.isArray(e)&&2===e.length}(t))return!1
-var r=t[0]
-return 31===r||32===r||r===e}}e.EMPTY_BLOCKS=a
-var f=p(39),m=p(38),g=p(37),v=p(35),b=p(34)
-function y(e,t,r,n,i){var{upvars:o}=r,s=o[e[1]],a=t.lookupBuiltInHelper(s)
-return n.helper(a,s)}class _{constructor(){this.names={},this.funcs=[]}add(e,t){this.names[e]=this.funcs.push(t)-1}compile(e,t){var r=t[0],n=this.names[r];(0,this.funcs[n])(e,t)}}var w=new _
-function O(e,t){if(void 0!==t&&0!==t.length)for(var r=0;r<t.length;r++)e(22,t[r])}function x(e,t){Array.isArray(t)?w.compile(e,t):(k(e,t),e(31))}function P(e,r,n,i){if(null!==r||null!==n){var o=S(e,r)<<4
-i&&(o|=8)
-var s=t.EMPTY_STRING_ARRAY
-if(n){s=n[0]
-for(var a=n[1],l=0;l<a.length;l++)x(e,a[l])}e(82,s,t.EMPTY_STRING_ARRAY,o)}else e(83)}function S(e,t){if(null===t)return 0
-for(var r=0;r<t.length;r++)x(e,t[r])
-return t.length}function T(e){var t,r,[,n,,i]=e.block
-return{asPartial:e.asPartial||!1,evalSymbols:E(e),upvars:i,scopeValues:null!==(r=null===(t=e.scope)||void 0===t?void 0:t.call(e))&&void 0!==r?r:null,isStrictMode:e.isStrictMode,moduleName:e.moduleName,owner:e.owner,size:n.length}}function E(e){var{block:t}=e,[,r,n]=t
-return n?r:null}function C(e,t){k(e,t),e(31)}function k(e,r){var n=r
-"number"==typeof n&&(n=(0,t.isSmallInt)(n)?(0,t.encodeImmediate)(n):{type:6,value:n}),e(30,n)}function M(e,t,n,i){e(0),P(e,n,i,!1),e(16,t),e(1),e(36,r.$v0)}function A(e,t,n,i){e(0),P(e,t,n,!1),e(33,r.$fp,1),e(107),i?(e(36,r.$v0),i(),e(1),e(34,1)):(e(1),e(34,1),e(36,r.$v0))}function R(e,t,r){P(e,r,null,!0),e(23,t),e(24),e(61),e(64),e(40),e(1)}function j(e,t){(function(e,t){null!==t?e(63,d({parameters:t})):k(e,null)})(e,t&&t[1]),e(62),N(e,t)}function I(e,t){e(0),N(e,t),e(61),e(2),e(1)}function D(e,t,n){var i=t[1],o=i.length,s=Math.min(n,o)
-if(0!==s){if(e(0),s){e(39)
-for(var a=0;a<s;a++)e(33,r.$fp,n-a),e(19,i[a])}N(e,t),e(61),e(2),s&&e(40),e(1)}else I(e,t)}function N(e,t){null===t?k(e,null):e(28,{type:4,value:t})}function F(e,t,r){var n=[],i=0
-for(var o of(r((function(e,t){n.push({match:e,callback:t,label:"CLAUSE"+i++})})),e(69,1),t(),e(1001),n.slice(0,-1)))e(67,u(o.label),o.match)
-for(var s=n.length-1;s>=0;s--){var a=n[s]
-e(1e3,a.label),e(34,1),a.callback(),0!==s&&e(4,u("END"))}e(1e3,"END"),e(1002),e(70)}function L(e,t,r){e(1001),e(0),e(6,u("ENDINITIAL")),e(69,t()),r(),e(1e3,"FINALLY"),e(70),e(5),e(1e3,"ENDINITIAL"),e(1),e(1002)}function z(e,t,r,n){return L(e,t,(()=>{e(66,u("ELSE")),r(),e(4,u("FINALLY")),e(1e3,"ELSE"),void 0!==n&&n()}))}w.add(29,((e,t)=>{var[,r]=t
-for(var n of r)x(e,n)
-e(27,r.length)})),w.add(28,((e,t)=>{var[,r,n,i]=t
-g(r)?e(1005,r,(t=>{M(e,t,n,i)})):(x(e,r),A(e,n,i))})),w.add(50,((e,t)=>{var[,n,i,o,s]=t;(function(e,t,n,i,o){e(0),P(e,i,o,!1),e(86),x(e,n),e(77,t,{type:2,value:void 0}),e(1),e(36,r.$v0)})(e,i,n,o,s)})),w.add(30,((e,t)=>{var[,r,n]=t
-e(21,r),O(e,n)})),w.add(32,((e,t)=>{var[,r,n]=t
-e(1011,r,(t=>{e(29,t),O(e,n)}))})),w.add(31,((e,t)=>{var[,r,n]=t
-e(1009,r,(e=>{}))})),w.add(33,((e,t)=>{var[,r,n]=t
-e(1010,r,((t,r)=>{e(21,0),e(22,t)})),O(e,n)})),w.add(34,(()=>{throw new Error("unimplemented opcode")})),w.add(36,((e,t)=>{e(1010,t[1],(r=>{e(1006,t,{ifHelper:t=>{M(e,t,null,null)},ifFallback:(t,r)=>{e(21,0),e(22,t)}})}))})),w.add(99,((e,t)=>{e(1010,t[1],(r=>{e(1006,t,{ifHelper:(r,n,i)=>{t[2][0]
-M(e,r,null,null)},ifFallback:(t,r)=>{e(21,0),e(22,t)}})}))})),w.add(27,(e=>C(e,void 0))),w.add(48,((e,t)=>{var[,r]=t
-x(e,r),e(25)})),w.add(49,((e,t)=>{var[,r]=t
-x(e,r),e(24),e(61),e(26)})),w.add(52,((e,t)=>{var[,r,n,i]=t
-x(e,i),x(e,n),x(e,r),e(109)})),w.add(51,((e,t)=>{var[,r]=t
-x(e,r),e(110)})),w.add(53,((e,t)=>{var[,r]=t
-x(e,r),e(111)})),w.add(54,((e,t)=>{var[,n]=t
-e(0),P(e,n,null,!1),e(112),e(1),e(36,r.$v0)}))
-var U="&attrs"
-function B(e,n,o,s,a,u){var{compilable:c,capabilities:d,handle:p}=n,f=o?[o,[]]:null,m=Array.isArray(u)||null===u?l(u):u
-c?(e(78,p),function(e,n){var{capabilities:o,layout:s,elementBlock:a,positional:l,named:u,blocks:c}=n,{symbolTable:d}=s
-if(d.hasEval||(0,i.hasCapability)(o,4))return void $(e,{capabilities:o,elementBlock:a,positional:l,named:u,atNames:!0,blocks:c,layout:s})
-e(36,r.$s0),e(33,r.$sp,1),e(35,r.$s0),e(0)
-var{symbols:p}=d,f=[],m=[],g=[],v=c.names
-if(null!==a){var b=p.indexOf(U);-1!==b&&(j(e,a),f.push(b))}for(var y=0;y<v.length;y++){var _=v[y],w=p.indexOf(`&${_}`);-1!==w&&(j(e,c.get(_)),f.push(w))}if((0,i.hasCapability)(o,8)){var O=S(e,l)<<4
-O|=8
-var P=t.EMPTY_STRING_ARRAY
-if(null!==u){P=u[0]
-for(var T=u[1],E=0;E<T.length;E++){var C=p.indexOf(P[E])
-x(e,T[E]),m.push(C)}}e(82,P,t.EMPTY_STRING_ARRAY,O),m.push(-1)}else if(null!==u)for(var k=u[0],M=u[1],A=0;A<M.length;A++){var R=k[A],I=p.indexOf(R);-1!==I&&(x(e,M[A]),m.push(I),g.push(R))}e(97,r.$s0),(0,i.hasCapability)(o,64)&&e(59);(0,i.hasCapability)(o,512)&&e(87,0|c.has("default"),r.$s0)
-e(88,r.$s0),(0,i.hasCapability)(o,8)?e(90,r.$s0):e(90,r.$s0,g)
-e(37,p.length+1,Object.keys(c).length>0?1:0),e(19,0)
-for(var D=m.length-1;D>=0;D--){var N=m[D];-1===N?e(34,1):e(19,N+1)}null!==l&&e(34,l.length)
-for(var F=f.length-1;F>=0;F--){e(20,f[F]+1)}e(28,h(s)),e(61),e(2),e(100,r.$s0),e(1),e(40),(0,i.hasCapability)(o,64)&&e(60)
-e(98),e(35,r.$s0)}(e,{capabilities:d,layout:c,elementBlock:f,positional:s,named:a,blocks:m})):(e(78,p),$(e,{capabilities:d,elementBlock:f,positional:s,named:a,atNames:!0,blocks:m}))}function H(e,t,n,i,o,s,a,c){var d=n?[n,[]]:null,h=Array.isArray(s)||null===s?l(s):s
-L(e,(()=>(x(e,t),e(33,r.$sp,0),2)),(()=>{e(66,u("ELSE")),c?e(81):e(80,{type:2,value:void 0}),e(79),$(e,{capabilities:!0,elementBlock:d,positional:i,named:o,atNames:a,blocks:h}),e(1e3,"ELSE")}))}function $(e,n){var{capabilities:o,elementBlock:s,positional:a,named:l,atNames:u,blocks:c,layout:p}=n,f=!!c,m=!0===o||(0,i.hasCapability)(o,4)||!(!l||0===l[0].length),g=c.with("attrs",s)
-e(36,r.$s0),e(33,r.$sp,1),e(35,r.$s0),e(0),function(e,r,n,i,o){for(var s=i.names,a=0;a<s.length;a++)j(e,i.get(s[a]))
-var l=S(e,r)<<4
-o&&(l|=8),i&&(l|=7)
-var u=t.EMPTY_ARRAY
-if(n){u=n[0]
-for(var c=n[1],d=0;d<c.length;d++)x(e,c[d])}e(82,u,s,l)}(e,a,l,g,u),e(85,r.$s0),W(e,g.has("default"),f,m,(()=>{p?(e(63,d(p.symbolTable)),e(28,h(p)),e(61)):e(92,r.$s0),e(95,r.$s0)})),e(35,r.$s0)}function W(e,t,n,i,o){void 0===o&&(o=null),e(97,r.$s0),e(59),e(87,0|t,r.$s0),o&&o(),e(88,r.$s0),e(90,r.$s0),e(38,r.$s0),e(19,0),e(94,r.$s0),i&&e(17,r.$s0),n&&e(18,r.$s0),e(34,1),e(96,r.$s0),e(100,r.$s0),e(1),e(40),e(60),e(98)}class q{constructor(e,t,r,n,i){this.main=e,this.trustingGuardedAppend=t,this.cautiousGuardedAppend=r,this.trustingNonDynamicAppend=n,this.cautiousNonDynamicAppend=i}get"trusting-append"(){return this.trustingGuardedAppend}get"cautious-append"(){return this.cautiousGuardedAppend}get"trusting-non-dynamic-append"(){return this.trustingNonDynamicAppend}get"cautious-non-dynamic-append"(){return this.cautiousNonDynamicAppend}getAppend(e){return e?this.trustingGuardedAppend:this.cautiousGuardedAppend}}function V(e,t){return{program:e,encoder:new ie(e.heap,t,e.stdlib),meta:t}}e.StdLib=q,e.debugCompiler=undefined
-var G=new _,K=["class","id","value","name","type","style","href"],Y=["div","span","p","a"]
-function Q(e){return"string"==typeof e?e:Y[e]}function J(e){return"string"==typeof e?e:K[e]}function X(e){return null===e?null:[e[0].map((e=>`@${e}`)),e[1]]}G.add(3,((e,t)=>e(42,t[1]))),G.add(13,(e=>e(55))),G.add(12,(e=>e(54))),G.add(4,((e,t)=>{var[,n,i,o]=t
-m(n)?e(1003,n,(t=>{e(0),P(e,i,o,!1),e(57,t),e(1)})):(x(e,n),e(0),P(e,i,o,!1),e(33,r.$fp,1),e(108),e(1))})),G.add(14,((e,t)=>{var[,r,n,i]=t
-e(51,J(r),n,null!=i?i:null)})),G.add(24,((e,t)=>{var[,r,n,i]=t
-e(105,J(r),n,null!=i?i:null)})),G.add(15,((e,t)=>{var[,r,n,i]=t
-x(e,n),e(52,J(r),!1,null!=i?i:null)})),G.add(22,((e,t)=>{var[,r,n,i]=t
-x(e,n),e(52,J(r),!0,null!=i?i:null)})),G.add(16,((e,t)=>{var[,r,n,i]=t
-x(e,n),e(53,J(r),!1,null!=i?i:null)})),G.add(23,((e,t)=>{var[,r,n,i]=t
-x(e,n),e(53,J(r),!0,null!=i?i:null)})),G.add(10,((e,t)=>{var[,r]=t
-e(48,Q(r))})),G.add(11,((e,t)=>{var[,r]=t
-e(89),e(48,Q(r))})),G.add(8,((e,t)=>{var[,r,n,i,o]=t
-f(r)?e(1004,r,(t=>{B(e,t,n,null,i,o)})):H(e,r,n,null,i,o,!0,!0)})),G.add(19,((e,t)=>{var[,n,i]=t
-z(e,(()=>(x(e,n),e(33,r.$sp,0),2)),(()=>{e(101,{type:3,value:void 0},i),e(40),e(1)}))})),G.add(18,((e,t)=>{var[,r,n]=t
-return R(e,r,n)})),G.add(17,((e,t)=>{var[,r]=t
-return R(e,r,null)})),G.add(26,((e,t)=>{var[,r]=t
-return e(103,{type:3,value:void 0},r)})),G.add(1,((e,t)=>{var[,r]=t
-if(Array.isArray(r))if(b(r))e(1008,r,{ifComponent(t){B(e,t,null,null,null,null)},ifHelper(t){e(0),M(e,t,null,null),e(3,c("cautious-non-dynamic-append")),e(1)},ifValue(t){e(0),e(29,t),e(3,c("cautious-non-dynamic-append")),e(1)},ifFallback(t){e(0),e(1010,r[1],((t,r)=>{e(21,0),e(22,t)})),e(3,c("cautious-append")),e(1)}})
-else if(28===r[0]){var[,n,i,o]=r
-v(n)?e(1007,n,{ifComponent(t){B(e,t,null,i,X(o),null)},ifHelper(t){e(0),M(e,t,i,o),e(3,c("cautious-non-dynamic-append")),e(1)}}):F(e,(()=>{x(e,n),e(106)}),(t=>{t(0,(()=>{e(81),e(79),$(e,{capabilities:!0,elementBlock:null,positional:i,named:o,atNames:!1,blocks:l(null)})})),t(1,(()=>{A(e,i,o,(()=>{e(3,c("cautious-non-dynamic-append"))}))}))}))}else e(0),x(e,r),e(3,c("cautious-append")),e(1)
-else e(41,null==r?"":String(r))})),G.add(2,((e,t)=>{var[,r]=t
-Array.isArray(r)?(e(0),x(e,r),e(3,c("trusting-append")),e(1)):e(41,null==r?"":String(r))})),G.add(6,((e,t)=>{var[,r,n,i,o]=t
-f(r)?e(1004,r,(t=>{B(e,t,null,n,X(i),o)})):H(e,r,null,n,i,o,!1,!1)})),G.add(40,((e,t)=>{var[,n,i,o,s]=t
-z(e,(()=>(x(e,i),void 0===s?C(e,void 0):x(e,s),x(e,o),e(33,r.$sp,0),4)),(()=>{e(50),I(e,n),e(56)}))})),G.add(41,((e,t)=>{var[,r,n,i]=t
-return z(e,(()=>(x(e,r),e(71),1)),(()=>{I(e,n)}),i?()=>{I(e,i)}:void 0)})),G.add(42,((e,t)=>{var[,n,i,o,s]=t
-return L(e,(()=>(i?x(e,i):C(e,null),x(e,n),2)),(()=>{e(72,u("BODY"),u("ELSE")),e(0),e(33,r.$fp,1),e(6,u("ITER")),e(1e3,"ITER"),e(74,u("BREAK")),e(1e3,"BODY"),D(e,o,2),e(34,2),e(4,u("FINALLY")),e(1e3,"BREAK"),e(1),e(73),e(4,u("FINALLY")),e(1e3,"ELSE"),s&&I(e,s)}))})),G.add(43,((e,t)=>{var[,n,i,o]=t
-z(e,(()=>(x(e,n),e(33,r.$sp,0),e(71),2)),(()=>{D(e,i,1)}),(()=>{o&&I(e,o)}))})),G.add(44,((e,t)=>{var[,r,n]=t
-D(e,n,S(e,r))})),G.add(45,((e,t)=>{var[,r,n]=t
-if(r){var[i,o]=r
-S(e,o),function(e,t,r){e(59),e(58,t),r(),e(60)}(e,i,(()=>{I(e,n)}))}else I(e,n)})),G.add(46,((e,t)=>{var[,r,n,i,o]=t
-f(r)?e(1004,r,(t=>{B(e,t,null,n,X(i),o)})):H(e,r,null,n,i,o,!1,!1)}))
-class Z{constructor(e,t,r,n){void 0===n&&(n="plain block"),this.statements=e,this.meta=t,this.symbolTable=r,this.moduleName=n,this.compiled=null}compile(e){return function(e,t){if(null!==e.compiled)return e.compiled
-e.compiled=-1
-var{statements:r,meta:n}=e,i=te(r,n,t)
-return e.compiled=i,i}(this,e)}}function ee(e,t){var[r,n,i]=e.block
-return new Z(r,T(e),{symbols:n,hasEval:i},t)}function te(e,t,r){var n=G,i=V(r,t),{encoder:o,program:{constants:s,resolver:a}}=i
-function l(){for(var e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n]
-ne(o,s,a,t,r)}for(var u=0;u<e.length;u++)n.compile(l,e[u])
-return i.encoder.commit(t.size)}class re{constructor(){this.labels=(0,t.dict)(),this.targets=[]}label(e,t){this.labels[e]=t}target(e,t){this.targets.push({at:e,target:t})}patch(e){for(var{targets:t,labels:r}=this,n=0;n<t.length;n++){var{at:i,target:o}=t[n],s=r[o]-i
-e.setbyaddr(i,s)}}}function ne(e,t,r,n,i){if(function(e){return e<1e3}(i[0])){var[o,...s]=i
-e.push(t,o,...s)}else switch(i[0]){case 1e3:return e.label(i[1])
-case 1001:return e.startLabels()
-case 1002:return e.stopLabels()
-case 1004:return function(e,t,r,n){var[,i,o]=n
-if(32===i[0]){var{scopeValues:s,owner:a}=r,l=s[i[1]]
-o(t.component(l,a))}else{var{upvars:u,owner:c}=r,d=u[i[1]],h=e.lookupComponent(d,c)
-o(t.resolvedComponent(h,d))}}(r,t,n,i)
-case 1003:return function(e,t,r,n){var[,i,o]=n,s=i[0]
-if(32===s){var{scopeValues:a}=r,l=a[i[1]]
-o(t.modifier(l))}else if(31===s){var{upvars:u}=r,c=u[i[1]],d=e.lookupBuiltInModifier(c)
-o(t.modifier(d,c))}else{var{upvars:h,owner:p}=r,f=h[i[1]],m=e.lookupModifier(f,p)
-o(t.modifier(m,f))}}(r,t,n,i)
-case 1005:return function(e,t,r,n){var[,i,o]=n,s=i[0]
-if(32===s){var{scopeValues:a}=r,l=a[i[1]]
-o(t.helper(l))}else if(31===s)o(y(i,e,r,t))
-else{var{upvars:u,owner:c}=r,d=u[i[1]],h=e.lookupHelper(d,c)
-o(t.helper(h,d))}}(r,t,n,i)
-case 1007:return function(e,t,r,n){var[,i,{ifComponent:o,ifHelper:s}]=n,a=i[0]
-if(32===a){var{scopeValues:l,owner:u}=r,c=l[i[1]],d=t.component(c,u,!0)
-if(null!==d)return void o(d)
-s(t.helper(c,null,!0))}else if(31===a)s(y(i,e,r,t))
-else{var{upvars:h,owner:p}=r,f=h[i[1]],m=e.lookupComponent(f,p)
-if(null!==m)o(t.resolvedComponent(m,f))
-else{var g=e.lookupHelper(f,p)
-s(t.helper(g,f))}}}(r,t,n,i)
-case 1006:return function(e,t,r,n){var[,i,{ifHelper:o,ifFallback:s}]=n,{upvars:a,owner:l}=r,u=a[i[1]],c=e.lookupHelper(u,l)
-null===c?s(u,r.moduleName):o(t.helper(c,u),u,r.moduleName)}(r,t,n,i)
-case 1008:return function(e,t,r,n){var[,i,{ifComponent:o,ifHelper:s,ifValue:a,ifFallback:l}]=n,u=i[0]
-if(32===u){var{scopeValues:c,owner:d}=r,h=c[i[1]]
-if("function"!=typeof h&&("object"!=typeof h||null===h))return void a(t.value(h))
-var p=t.component(h,d,!0)
-if(null!==p)return void o(p)
-var f=t.helper(h,null,!0)
-if(null!==f)return void s(f)
-a(t.value(h))}else if(31===u)s(y(i,e,r,t))
-else{var{upvars:m,owner:g}=r,v=m[i[1]],b=e.lookupComponent(v,g)
-if(null!==b)return void o(t.resolvedComponent(b,v))
-var _=e.lookupHelper(v,g)
-if(null!==_)return void s(t.helper(_,v))
-l(v)}}(r,t,n,i)
-case 1010:var a=i[1],l=n.upvars[a]
-if(!0===n.asPartial)e.push(t,102,l)
-else(0,i[2])(l,n.moduleName)
-break
-case 1011:var[,u,c]=i,d=n.scopeValues[u]
-c(t.value(d))
-break
-case 1009:break
-default:throw new Error(`Unexpected high level opcode ${i[0]}`)}}class ie{constructor(e,r,n){this.heap=e,this.meta=r,this.stdlib=n,this.labelsStack=new t.Stack,this.encoder=new o.InstructionEncoderImpl([]),this.errors=[],this.handle=e.malloc()}error(e){this.encoder.encode(30,0),this.errors.push(e)}commit(e){var t=this.handle
-return this.heap.push(1029),this.heap.finishMalloc(t,e),this.errors.length?{errors:this.errors,handle:t}:t}push(e,t){var{heap:n}=this
-var i=t|((0,r.isMachineOp)(t)?1024:0)|(arguments.length<=2?0:arguments.length-2)<<8
-n.push(i)
-for(var o=0;o<(arguments.length<=2?0:arguments.length-2);o++){var s=o+2<2||arguments.length<=o+2?void 0:arguments[o+2]
-n.push(this.operand(e,s))}}operand(e,r){if("number"==typeof r)return r
-if("object"==typeof r&&null!==r){if(Array.isArray(r))return(0,t.encodeHandle)(e.array(r))
-switch(r.type){case 1:return this.currentLabels.target(this.heap.offset,r.value),-1
-case 2:return(0,t.encodeHandle)(e.value(this.meta.isStrictMode))
-case 3:return(0,t.encodeHandle)(e.array(this.meta.evalSymbols||t.EMPTY_STRING_ARRAY))
-case 4:return(0,t.encodeHandle)(e.value((n=r.value,i=this.meta,new Z(n[0],i,{parameters:n[1]||t.EMPTY_ARRAY}))))
-case 5:return this.stdlib[r.value]
-case 6:case 7:case 8:return e.value(r.value)}}var n,i
-return(0,t.encodeHandle)(e.value(r))}get currentLabels(){return this.labelsStack.current}label(e){this.currentLabels.label(e,this.heap.offset+1)}startLabels(){this.labelsStack.push(new re)}stopLabels(){this.labelsStack.pop().patch(this.heap)}}function oe(e,t,n){F(e,(()=>e(76)),(i=>{i(2,(()=>{t?(e(68),e(43)):e(47)})),"number"==typeof n?(i(0,(()=>{e(81),e(79),function(e){e(36,r.$s0),e(33,r.$sp,1),e(35,r.$s0),e(0),e(83),e(85,r.$s0),W(e,!1,!1,!0,(()=>{e(92,r.$s0),e(95,r.$s0)})),e(35,r.$s0)}(e)})),i(1,(()=>{A(e,null,null,(()=>{e(3,n)}))}))):(i(0,(()=>{e(47)})),i(1,(()=>{e(47)}))),i(4,(()=>{e(68),e(44)})),i(5,(()=>{e(68),e(45)})),i(6,(()=>{e(68),e(46)}))}))}function se(e){var t=le(e,(e=>function(e){e(75,r.$s0),W(e,!1,!1,!0)}(e))),n=le(e,(e=>oe(e,!0,null))),i=le(e,(e=>oe(e,!1,null))),o=le(e,(e=>oe(e,!0,n))),s=le(e,(e=>oe(e,!1,i)))
-return new q(t,o,s,n,i)}var ae={asPartial:!1,evalSymbols:null,upvars:null,moduleName:"stdlib",scopeValues:null,isStrictMode:!0,owner:null,size:0}
-function le(e,t){var{constants:r,heap:n,resolver:i}=e,o=new ie(n,ae)
-t((function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n]
-ne(o,r,i,ae,t)}))
-var s=o.commit(0)
-if("number"!=typeof s)throw new Error("Unexpected errors compiling std")
-return s}class ue{constructor(e,t){var{constants:r,heap:n}=e
-this.resolver=t,this.constants=r,this.heap=n,this.stdlib=se(this)}}e.CompileTimeCompilationContextImpl=ue
-e.DEFAULT_CAPABILITIES={dynamicLayout:!0,dynamicTag:!0,prepareArgs:!0,createArgs:!0,attributeHook:!1,elementHook:!1,dynamicScope:!0,createCaller:!1,updateHook:!0,createInstance:!0,wrapped:!1,willDestroy:!1,hasSubOwner:!1}
-e.MINIMAL_CAPABILITIES={dynamicLayout:!1,dynamicTag:!1,prepareArgs:!1,createArgs:!1,attributeHook:!1,elementHook:!1,dynamicScope:!1,createCaller:!1,updateHook:!1,createInstance:!1,wrapped:!1,willDestroy:!1,hasSubOwner:!1}
-e.PartialDefinitionImpl=class{constructor(e,t){this.name=e,this.template=t}getPartial(e){var r=(0,t.unwrapTemplate)(this.template).asPartial(),n=r.compile(e)
-return{symbolTable:r.symbolTable,handle:n}}}
-class ce{constructor(e,t){this.layout=e,this.moduleName=t,this.compiled=null
-var{block:r}=e,[,n,i]=r,o=(n=n.slice()).indexOf(U)
-this.attrsBlockNumber=-1===o?n.push(U):o+1,this.symbolTable={hasEval:i,symbols:n}}compile(e){if(null!==this.compiled)return this.compiled
-var t,n,i,o=T(this.layout),s=V(e,o),{encoder:a,program:{constants:l,resolver:c}}=s
-t=function(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-ne(a,l,c,o,t)},n=this.layout,i=this.attrsBlockNumber,t(1001),function(e,t,r){e(36,t),r(),e(35,t)}(t,r.$s1,(()=>{t(91,r.$s0),t(31),t(33,r.$sp,0)})),t(66,u("BODY")),t(36,r.$s1),t(89),t(49),t(99,r.$s0),R(t,i,null),t(54),t(1e3,"BODY"),I(t,[n.block[0],[]]),t(36,r.$s1),t(66,u("END")),t(55),t(1e3,"END"),t(35,r.$s1),t(1002)
-var d=s.encoder.commit(o.size)
-return"number"!=typeof d||(this.compiled=d),d}}e.WrappedBuilder=ce
-var de=0,he={cacheHit:0,cacheMiss:0}
-e.templateCacheCounters=he
-class pe{constructor(e){this.parsedLayout=e,this.result="ok",this.layout=null,this.partial=null,this.wrappedLayout=null}get moduleName(){return this.parsedLayout.moduleName}get id(){return this.parsedLayout.id}get referrer(){return{moduleName:this.parsedLayout.moduleName,owner:this.parsedLayout.owner}}asLayout(){return this.layout?this.layout:this.layout=ee((0,t.assign)({},this.parsedLayout,{asPartial:!1}),this.moduleName)}asPartial(){return this.partial?this.partial:this.partial=ee((0,t.assign)({},this.parsedLayout,{asPartial:!0}),this.moduleName)}asWrappedLayout(){return this.wrappedLayout?this.wrappedLayout:this.wrappedLayout=new ce((0,t.assign)({},this.parsedLayout,{asPartial:!1}),this.moduleName)}}})),e("@glimmer/owner",["exports","@glimmer/util"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.getOwner=function(e){return e[r]},e.setOwner=function(e,t){e[r]=t},e.OWNER=void 0
-var r=(0,t.symbol)("OWNER")
-e.OWNER=r})),e("@glimmer/program",["exports","@glimmer/util","@glimmer/manager","@glimmer/opcode-compiler"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.hydrateHeap=function(e){return new h(e)},e.artifacts=function(){return{constants:new u,heap:new p}},e.RuntimeOpImpl=e.RuntimeProgramImpl=e.HeapImpl=e.RuntimeHeapImpl=e.ConstantsImpl=e.RuntimeConstantsImpl=e.CompileTimeConstantImpl=void 0
-var i={id:"1b32f5c2-7623-43d6-a0ad-9672898920a1",moduleName:"__default__.hbs",block:JSON.stringify([[[18,1,null]],["&default"],!1,[]]),scope:null,isStrictMode:!0},o=Object.freeze([]),s=(0,t.constants)(o),a=s.indexOf(o)
-class l{constructor(){this.values=s.slice(),this.indexMap=new Map(this.values.map(((e,t)=>[e,t])))}value(e){var t=this.indexMap,r=t.get(e)
-return void 0===r&&(r=this.values.push(e)-1,t.set(e,r)),r}array(e){if(0===e.length)return a
-for(var t=new Array(e.length),r=0;r<e.length;r++)t[r]=this.value(e[r])
-return this.value(t)}toPool(){return this.values}}e.CompileTimeConstantImpl=l
-e.RuntimeConstantsImpl=class{constructor(e){this.values=e}getValue(e){return this.values[e]}getArray(e){for(var t=this.getValue(e),r=new Array(t.length),n=0;n<t.length;n++){var i=t[n]
-r[n]=this.getValue(i)}return r}}
-class u extends l{constructor(){super(...arguments),this.reifiedArrs={[a]:o},this.defaultTemplate=(0,n.templateFactory)(i)(),this.helperDefinitionCount=0,this.modifierDefinitionCount=0,this.componentDefinitionCount=0,this.helperDefinitionCache=new WeakMap,this.modifierDefinitionCache=new WeakMap,this.componentDefinitionCache=new WeakMap}helper(e,t,n){void 0===t&&(t=null)
-var i=this.helperDefinitionCache.get(e)
-if(void 0===i){var o=(0,r.getInternalHelperManager)(e,n)
-if(null===o)return this.helperDefinitionCache.set(e,null),null
-var s="function"==typeof o?o:o.getHelper(e)
-i=this.value(s),this.helperDefinitionCache.set(e,i),this.helperDefinitionCount++}return i}modifier(e,t,n){void 0===t&&(t=null)
-var i=this.modifierDefinitionCache.get(e)
-if(void 0===i){var o=(0,r.getInternalModifierManager)(e,n)
-if(null===o)return this.modifierDefinitionCache.set(e,null),null
-var s={resolvedName:t,manager:o,state:e}
-i=this.value(s),this.modifierDefinitionCache.set(e,i),this.modifierDefinitionCount++}return i}component(e,n,i){var o,s=this.componentDefinitionCache.get(e)
-if(void 0===s){var a=(0,r.getInternalComponentManager)(e,i)
-if(null===a)return this.componentDefinitionCache.set(e,null),null
-var l,u=(0,r.capabilityFlagsFrom)(a.getCapabilities(e)),c=(0,r.getComponentTemplate)(e),d=null
-void 0!==(l=(0,r.managerHasCapability)(a,u,1)?null==c?void 0:c(n):null!==(o=null==c?void 0:c(n))&&void 0!==o?o:this.defaultTemplate)&&(l=(0,t.unwrapTemplate)(l),d=(0,r.managerHasCapability)(a,u,1024)?l.asWrappedLayout():l.asLayout()),(s={resolvedName:null,handle:-1,manager:a,capabilities:u,state:e,compilable:d}).handle=this.value(s),this.componentDefinitionCache.set(e,s),this.componentDefinitionCount++}return s}resolvedComponent(e,n){var i=this.componentDefinitionCache.get(e)
-if(void 0===i){var{manager:o,state:s,template:a}=e,l=(0,r.capabilityFlagsFrom)(o.getCapabilities(e)),u=null;(0,r.managerHasCapability)(o,l,1)||(a=null!=a?a:this.defaultTemplate),null!==a&&(a=(0,t.unwrapTemplate)(a),u=(0,r.managerHasCapability)(o,l,1024)?a.asWrappedLayout():a.asLayout()),(i={resolvedName:n,handle:-1,manager:o,capabilities:l,state:s,compilable:u}).handle=this.value(i),this.componentDefinitionCache.set(e,i),this.componentDefinitionCount++}return i}getValue(e){return this.values[e]}getArray(e){var t=this.reifiedArrs,r=t[e]
-if(void 0===r){var n=this.getValue(e)
-r=new Array(n.length)
-for(var i=0;i<n.length;i++)r[i]=this.getValue(n[i])
-t[e]=r}return r}}e.ConstantsImpl=u
-class c{constructor(e){this.heap=e,this.offset=0}get size(){return 1+((768&this.heap.getbyaddr(this.offset))>>8)}get isMachine(){return 1024&this.heap.getbyaddr(this.offset)?1:0}get type(){return 255&this.heap.getbyaddr(this.offset)}get op1(){return this.heap.getbyaddr(this.offset+1)}get op2(){return this.heap.getbyaddr(this.offset+2)}get op3(){return this.heap.getbyaddr(this.offset+3)}}e.RuntimeOpImpl=c
-var d=1048576
-class h{constructor(e){var{buffer:t,table:r}=e
-this.heap=new Int32Array(t),this.table=r}getaddr(e){return this.table[e]}getbyaddr(e){return this.heap[e]}sizeof(e){return f(this.table,e)}}e.RuntimeHeapImpl=h
-class p{constructor(){this.offset=0,this.handle=0,this.heap=new Int32Array(d),this.handleTable=[],this.handleState=[]}push(e){this.sizeCheck(),this.heap[this.offset++]=e}sizeCheck(){var{heap:e}=this
-if(this.offset===this.heap.length){var t=new Int32Array(e.length+d)
-t.set(e,0),this.heap=t}}getbyaddr(e){return this.heap[e]}setbyaddr(e,t){this.heap[e]=t}malloc(){return this.handleTable.push(this.offset),this.handleTable.length-1}finishMalloc(e){}size(){return this.offset}getaddr(e){return this.handleTable[e]}sizeof(e){return f(this.handleTable,e)}free(e){this.handleState[e]=1}compact(){for(var e=0,{handleTable:t,handleState:r,heap:n}=this,i=0;i<length;i++){var o=t[i],s=t[i+1]-o,a=r[i]
-if(2!==a)if(1===a)r[i]=2,e+=s
-else if(0===a){for(var l=o;l<=i+s;l++)n[l-e]=n[l]
-t[i]=o-e}else 3===a&&(t[i]=o-e)}this.offset=this.offset-e}capture(e){void 0===e&&(e=this.offset)
-var t=function(e,t,r){if(void 0!==e.slice)return e.slice(t,r)
-for(var n=new Int32Array(r);t<r;t++)n[t]=e[t]
-return n}(this.heap,0,e).buffer
-return{handle:this.handle,table:this.handleTable,buffer:t}}}e.HeapImpl=p
-function f(e,t){return-1}e.RuntimeProgramImpl=class{constructor(e,t){this.constants=e,this.heap=t,this._opcode=new c(this.heap)}opcode(e){return this._opcode.offset=e,this._opcode}}})),e("@glimmer/reference",["exports","@glimmer/global-context","@glimmer/util","@glimmer/validator"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.createPrimitiveRef=s,e.createConstRef=function(e,t){var r=new o(0)
-r.lastValue=e,r.tag=n.CONSTANT_TAG,!1
-return r},e.createUnboundRef=h,e.createComputeRef=p,e.createReadOnlyRef=function(e){return f(e)?p((()=>m(e)),null,e.debugLabel):e},e.createInvokableRef=function(e){var t=p((()=>m(e)),(t=>g(e,t)))
-return t.debugLabel=e.debugLabel,t[i]=3,t},e.isInvokableRef=function(e){return 3===e[i]},e.isConstRef=function(e){return e.tag===n.CONSTANT_TAG},e.isUpdatableRef=f,e.valueForRef=m,e.updateRef=g,e.childRefFor=v,e.childRefFromParts=function(e,t){for(var r=e,n=0;n<t.length;n++)r=v(r,t[n])
-return r},e.createIteratorRef=function(e,n){return p((()=>{var i=m(e),o=function(e){switch(e){case"@key":return P(y)
-case"@index":return P(_)
-case"@identity":return P(w)
-default:return function(e){0
-return P((r=>(0,t.getPath)(r,e)))}(e)}}(n)
-if(Array.isArray(i))return new T(i,o)
-var s=(0,t.toIterator)(i)
-return null===s?new T(r.EMPTY_ARRAY,(()=>null)):new S(s,o)}))},e.createIteratorItemRef=function(e){var t=e,r=(0,n.createTag)()
-return p((()=>((0,n.consumeTag)(r),t)),(e=>{t!==e&&(t=e,(0,n.dirtyTag)(r))}))},e.FALSE_REFERENCE=e.TRUE_REFERENCE=e.NULL_REFERENCE=e.UNDEFINED_REFERENCE=e.createDebugAliasRef=e.REFERENCE=void 0
-var i=(0,r.symbol)("REFERENCE")
-e.REFERENCE=i
-class o{constructor(e){this.tag=null,this.lastRevision=n.INITIAL,this.children=null,this.compute=null,this.update=null,this[i]=e}}function s(e){var t=new o(2)
-return t.tag=n.CONSTANT_TAG,t.lastValue=e,t}var a=s(void 0)
-e.UNDEFINED_REFERENCE=a
-var l=s(null)
-e.NULL_REFERENCE=l
-var u=s(!0)
-e.TRUE_REFERENCE=u
-var c,d=s(!1)
-function h(e,t){var r=new o(2)
-return r.lastValue=e,r.tag=n.CONSTANT_TAG,r}function p(e,t,r){void 0===t&&(t=null),void 0===r&&(r="unknown")
-var n=new o(1)
-return n.compute=e,n.update=t,n}function f(e){return null!==e.update}function m(e){var t=e,{tag:r}=t
-if(r===n.CONSTANT_TAG)return t.lastValue
-var i,{lastRevision:o}=t
-if(null!==r&&(0,n.validateTag)(r,o))i=t.lastValue
-else{var{compute:s}=t
-r=t.tag=(0,n.track)((()=>{i=t.lastValue=s()}),!1),t.lastRevision=(0,n.valueForTag)(r)}return(0,n.consumeTag)(r),i}function g(e,t){(0,e.update)(t)}function v(e,n){var o,s=e,l=s[i],u=s.children
-if(null===u)u=s.children=new Map
-else if(void 0!==(o=u.get(n)))return o
-if(2===l){var c=m(s)
-o=(0,r.isDict)(c)?h(c[n]):a}else o=p((()=>{var e=m(s)
-if((0,r.isDict)(e))return(0,t.getProp)(e,n)}),(e=>{var i=m(s)
-if((0,r.isDict)(i))return(0,t.setProp)(i,n,e)}))
-return u.set(n,o),o}e.FALSE_REFERENCE=d,e.createDebugAliasRef=c
-var b={},y=(e,t)=>t,_=(e,t)=>String(t),w=e=>null===e?b:e
-class O{get weakMap(){return void 0===this._weakMap&&(this._weakMap=new WeakMap),this._weakMap}get primitiveMap(){return void 0===this._primitiveMap&&(this._primitiveMap=new Map),this._primitiveMap}set(e,t){(0,r.isObject)(e)?this.weakMap.set(e,t):this.primitiveMap.set(e,t)}get(e){return(0,r.isObject)(e)?this.weakMap.get(e):this.primitiveMap.get(e)}}var x=new O
-function P(e){var t=new O
-return(r,n)=>{var i=e(r,n),o=t.get(i)||0
-return t.set(i,o+1),0===o?i:function(e,t){var r=x.get(e)
-void 0===r&&(r=[],x.set(e,r))
-var n=r[t]
-return void 0===n&&(n={value:e,count:t},r[t]=n),n}(i,o)}}class S{constructor(e,t){this.inner=e,this.keyFor=t}isEmpty(){return this.inner.isEmpty()}next(){var e=this.inner.next()
-return null!==e&&(e.key=this.keyFor(e.value,e.memo)),e}}class T{constructor(e,t){this.iterator=e,this.keyFor=t,this.pos=0,0===e.length?this.current={kind:"empty"}:this.current={kind:"first",value:e[this.pos]}}isEmpty(){return"empty"===this.current.kind}next(){var e,t=this.current
-if("first"===t.kind)this.current={kind:"progress"},e=t.value
-else{if(this.pos>=this.iterator.length-1)return null
-e=this.iterator[++this.pos]}var{keyFor:r}=this
-return{key:r(e,this.pos),value:e,memo:this.pos}}}})),e("@glimmer/runtime",["exports","@glimmer/util","@glimmer/reference","@glimmer/global-context","@glimmer/destroyable","@glimmer/vm","@glimmer/validator","@glimmer/manager","@glimmer/program","@glimmer/low-level","@glimmer/owner","@glimmer/runtime"],(function(e,t,r,n,i,o,s,a,l,u,c,d){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.clear=S,e.resetDebuggerCallback=function(){ut=lt},e.setDebuggerCallback=function(e){ut=e},e.curry=Pe,e.templateOnlyComponent=function(e,t){return new ft(e,t)},e.isWhitespace=function(e){return Ot.test(e)},e.normalizeProperty=A,e.runtimeContext=function(e,t,r,n){return{env:new Nt(e,t),program:new l.RuntimeProgramImpl(r.constants,r.heap),resolver:n}},e.inTransaction=Ft,e.renderComponent=function(e,n,i,o,s,a,l){void 0===a&&(a={})
-void 0===l&&(l=new h)
-return function(e,r,n,i,o){var s=Object.keys(o).map((e=>[e,o[e]])),a=["main","else","attrs"],l=s.map((e=>{var[t]=e
-return`@${t}`})),u=e[y].component(i,n)
-e.pushFrame()
-for(var c=0;c<3*a.length;c++)e.stack.pushNull()
-e.stack.pushNull(),s.forEach((t=>{var[,r]=t
-e.stack.pushJs(r)})),e[_].setup(e.stack,l,a,0,!0)
-var d=u.compilable,h={handle:(0,t.unwrapHandle)(d.compile(r)),symbolTable:d.symbolTable}
-return e.stack.pushJs(e[_]),e.stack.pushJs(h),e.stack.pushJs(u),new Xt(e)}(Yt.empty(e,{treeBuilder:n,handle:i.stdlib.main,dynamicScope:l,owner:o},i),i,o,s,(u=a,c=(0,r.createConstRef)(u,"args"),Object.keys(u).reduce(((e,t)=>(e[t]=(0,r.childRefFor)(c,t),e)),{})))
-var u,c},e.renderMain=function(e,r,n,i,o,s,a){void 0===a&&(a=new h)
-var l=(0,t.unwrapHandle)(s.compile(r)),u=s.symbolTable.symbols.length,c=Yt.initial(e,r,{self:i,dynamicScope:a,treeBuilder:o,handle:l,numSymbols:u,owner:n})
-return new Xt(c)},e.renderSync=function(e,t){var r
-return Ft(e,(()=>r=t.sync())),r},e.createCapturedArgs=je,e.reifyArgs=Ne,e.reifyNamed=Ie,e.reifyPositional=De,e.dynamicAttribute=G,e.clientBuilder=function(e,t){return se.forInitialRender(e,t)},e.isSerializationFirstNode=function(e){return e.nodeValue===Zt},e.rehydrationBuilder=function(e,t){return tr.forInitialRender(e,t)},e.invokeHelper=function(e,t,r){0
-var n=(0,c.getOwner)(e),o=(0,a.getInternalHelperManager)(t)
-0
-0
-var l,u=o.getDelegateFor(n),d=new dr(e,r),h=u.createHelper(t,d)
-if(!(0,a.hasValue)(u))throw new Error("TODO: unreachable, to be implemented with hasScheduledEffect")
-l=(0,s.createCache)((()=>u.getValue(h))),(0,i.associateDestroyableChild)(e,l)
-if((0,a.hasDestroyable)(u)){var p=u.getDestroyable(h);(0,i.associateDestroyableChild)(l,p)}return l},Object.defineProperty(e,"destroy",{enumerable:!0,get:function(){return i.destroy}}),Object.defineProperty(e,"registerDestructor",{enumerable:!0,get:function(){return i.registerDestructor}}),Object.defineProperty(e,"isDestroying",{enumerable:!0,get:function(){return i.isDestroying}}),Object.defineProperty(e,"isDestroyed",{enumerable:!0,get:function(){return i.isDestroyed}}),e.on=e.concat=e.get=e.array=e.hash=e.fn=e.SERIALIZATION_FIRST_NODE_STRING=e.RehydrateBuilder=e.RemoteLiveBlock=e.UpdatableBlockImpl=e.NewElementBuilder=e.SimpleDynamicAttribute=e.DynamicAttribute=e.EMPTY_POSITIONAL=e.EMPTY_NAMED=e.EMPTY_ARGS=e.LowLevelVM=e.UpdatingVM=e.EnvironmentImpl=e.PartialScopeImpl=e.DynamicScopeImpl=e.DOMTreeConstruction=e.IDOMChanges=e.DOMChanges=e.TemplateOnlyComponent=e.TEMPLATE_ONLY_COMPONENT_MANAGER=e.TemplateOnlyComponentManager=e.CurriedValue=e.CursorImpl=e.ConcreteBounds=void 0
-class h{constructor(e){this.bucket=e?(0,t.assign)({},e):{}}get(e){return this.bucket[e]}set(e,t){return this.bucket[e]=t}child(){return new h(this.bucket)}}e.DynamicScopeImpl=h
-class p{constructor(e,t,r,n,i){this.slots=e,this.owner=t,this.callerScope=r,this.evalScope=n,this.partialMap=i}static root(e,t,n){void 0===t&&(t=0)
-for(var i=new Array(t+1),o=0;o<=t;o++)i[o]=r.UNDEFINED_REFERENCE
-return new p(i,n,null,null,null).init({self:e})}static sized(e,t){void 0===e&&(e=0)
-for(var n=new Array(e+1),i=0;i<=e;i++)n[i]=r.UNDEFINED_REFERENCE
-return new p(n,t,null,null,null)}init(e){var{self:t}=e
-return this.slots[0]=t,this}getSelf(){return this.get(0)}getSymbol(e){return this.get(e)}getBlock(e){var t=this.get(e)
-return t===r.UNDEFINED_REFERENCE?null:t}getEvalScope(){return this.evalScope}getPartialMap(){return this.partialMap}bind(e,t){this.set(e,t)}bindSelf(e){this.set(0,e)}bindSymbol(e,t){this.set(e,t)}bindBlock(e,t){this.set(e,t)}bindEvalScope(e){this.evalScope=e}bindPartialMap(e){this.partialMap=e}bindCallerScope(e){this.callerScope=e}getCallerScope(){return this.callerScope}child(){return new p(this.slots.slice(),this.owner,this.callerScope,this.evalScope,this.partialMap)}get(e){if(e>=this.slots.length)throw new RangeError(`BUG: cannot get $${e} from scope; length=${this.slots.length}`)
-return this.slots[e]}set(e,t){if(e>=this.slots.length)throw new RangeError(`BUG: cannot get $${e} from scope; length=${this.slots.length}`)
-this.slots[e]=t}}e.PartialScopeImpl=p
-var f=(0,t.symbol)("INNER_VM"),m=(0,t.symbol)("DESTROYABLE_STACK"),g=(0,t.symbol)("STACKS"),v=(0,t.symbol)("REGISTERS"),b=(0,t.symbol)("HEAP"),y=(0,t.symbol)("CONSTANTS"),_=(0,t.symbol)("ARGS");(0,t.symbol)("PC")
-class w{constructor(e,t){this.element=e,this.nextSibling=t}}e.CursorImpl=w
-class O{constructor(e,t,r){this.parentNode=e,this.first=t,this.last=r}parentElement(){return this.parentNode}firstNode(){return this.first}lastNode(){return this.last}}e.ConcreteBounds=O
-class x{constructor(e,t){this.parentNode=e,this.node=t}parentElement(){return this.parentNode}firstNode(){return this.node}lastNode(){return this.node}}function P(e,t){for(var r=e.parentElement(),n=e.firstNode(),i=e.lastNode(),o=n;;){var s=o.nextSibling
-if(r.insertBefore(o,t),o===i)return s
-o=s}}function S(e){for(var t=e.parentElement(),r=e.firstNode(),n=e.lastNode(),i=r;;){var o=i.nextSibling
-if(t.removeChild(i),i===n)return o
-i=o}}function T(e){return E(e)?"":String(e)}function E(e){return null==e||"function"!=typeof e.toString}function C(e){return"object"==typeof e&&null!==e&&"function"==typeof e.toHTML}function k(e){return"object"==typeof e&&null!==e&&"number"==typeof e.nodeType}function M(e){return"string"==typeof e}function A(e,t){var r,n,i,o,s
-if(t in e)n=t,r="prop"
-else{var a=t.toLowerCase()
-a in e?(r="prop",n=a):(r="attr",n=t)}return"prop"===r&&("style"===n.toLowerCase()||(i=e.tagName,o=n,(s=R[i.toUpperCase()])&&s[o.toLowerCase()]))&&(r="attr"),{normalized:n,type:r}}var R={INPUT:{form:!0,autocorrect:!0,list:!0},SELECT:{form:!0},OPTION:{form:!0},TEXTAREA:{form:!0},LABEL:{form:!0},FIELDSET:{form:!0},LEGEND:{form:!0},OBJECT:{form:!0},OUTPUT:{form:!0},BUTTON:{form:!0}}
-var j,I,D=["javascript:","vbscript:"],N=["A","BODY","LINK","IMG","IFRAME","BASE","FORM"],F=["EMBED"],L=["href","src","background","action"],z=["src"]
-function U(e,t){return-1!==e.indexOf(t)}function B(e,t){return(null===e||U(N,e))&&U(L,t)}function H(e,t){return null!==e&&(U(F,e)&&U(z,t))}function $(e,t){return B(e,t)||H(e,t)}if("object"==typeof URL&&null!==URL&&"function"==typeof URL.parse){var W=URL
-j=e=>{var t=null
-return"string"==typeof e&&(t=W.parse(e).protocol),null===t?":":t}}else if("function"==typeof URL)j=e=>{try{return new URL(e).protocol}catch(t){return":"}}
-else{var q=document.createElement("a")
-j=e=>(q.href=e,q.protocol)}function V(e,t,r){var n=null
-if(null==r)return r
-if(C(r))return r.toHTML()
-n=e?e.tagName.toUpperCase():null
-var i=T(r)
-if(B(n,t)){var o=j(i)
-if(U(D,o))return`unsafe:${i}`}return H(n,t)?`unsafe:${i}`:i}function G(e,t,r,n){void 0===n&&(n=!1)
-var{tagName:i,namespaceURI:o}=e,s={element:e,name:t,namespace:r}
-if("http://www.w3.org/2000/svg"===o)return K(i,t,s)
-var{type:a,normalized:l}=A(e,t)
-return"attr"===a?K(i,l,s):function(e,t,r){if($(e,t))return new X(t,r)
-if(function(e,t){return("INPUT"===e||"TEXTAREA"===e)&&"value"===t}(e,t))return new ee(t,r)
-if(function(e,t){return"OPTION"===e&&"selected"===t}(e,t))return new te(t,r)
-return new J(t,r)}(i,l,s)}function K(e,t,r){return $(e,t)?new Z(r):new Q(r)}class Y{constructor(e){this.attribute=e}}e.DynamicAttribute=Y
-class Q extends Y{set(e,t,r){var n=re(t)
-if(null!==n){var{name:i,namespace:o}=this.attribute
-e.__setAttribute(i,n,o)}}update(e,t){var r=re(e),{element:n,name:i}=this.attribute
-null===r?n.removeAttribute(i):n.setAttribute(i,r)}}e.SimpleDynamicAttribute=Q
-class J extends Y{constructor(e,t){super(t),this.normalizedName=e}set(e,t,r){null!=t&&(this.value=t,e.__setProperty(this.normalizedName,t))}update(e,t){var{element:r}=this.attribute
-this.value!==e&&(r[this.normalizedName]=this.value=e,null==e&&this.removeAttribute())}removeAttribute(){var{element:e,namespace:t}=this.attribute
-t?e.removeAttributeNS(t,this.normalizedName):e.removeAttribute(this.normalizedName)}}class X extends J{set(e,t,r){var{element:n,name:i}=this.attribute,o=V(n,i,t)
-super.set(e,o,r)}update(e,t){var{element:r,name:n}=this.attribute,i=V(r,n,e)
-super.update(i,t)}}class Z extends Q{set(e,t,r){var{element:n,name:i}=this.attribute,o=V(n,i,t)
-super.set(e,o,r)}update(e,t){var{element:r,name:n}=this.attribute,i=V(r,n,e)
-super.update(i,t)}}class ee extends J{set(e,t){e.__setProperty("value",T(t))}update(e){var t=this.attribute.element,r=t.value,n=T(e)
-r!==n&&(t.value=n)}}class te extends J{set(e,t){null!=t&&!1!==t&&e.__setProperty("selected",!0)}update(e){var t=this.attribute.element
-t.selected=!!e}}function re(e){return!1===e||null==e||void 0===e.toString?null:!0===e?"":"function"==typeof e?null:String(e)}class ne{constructor(e){this.node=e}firstNode(){return this.node}}class ie{constructor(e){this.node=e}lastNode(){return this.node}}var oe=(0,t.symbol)("CURSOR_STACK")
-class se{constructor(e,r,n){this.constructing=null,this.operations=null,this[I]=new t.Stack,this.modifierStack=new t.Stack,this.blockStack=new t.Stack,this.pushElement(r,n),this.env=e,this.dom=e.getAppendOperations(),this.updateOperations=e.getDOM()}static forInitialRender(e,t){return new this(e,t.element,t.nextSibling).initialize()}static resume(e,t){var r=new this(e,t.parentElement(),t.reset(e)).initialize()
-return r.pushLiveBlock(t),r}initialize(){return this.pushSimpleBlock(),this}debugBlocks(){return this.blockStack.toArray()}get element(){return this[oe].current.element}get nextSibling(){return this[oe].current.nextSibling}get hasBlocks(){return this.blockStack.size>0}block(){return this.blockStack.current}popElement(){this[oe].pop(),this[oe].current}pushSimpleBlock(){return this.pushLiveBlock(new ae(this.element))}pushUpdatableBlock(){return this.pushLiveBlock(new ue(this.element))}pushBlockList(e){return this.pushLiveBlock(new ce(this.element,e))}pushLiveBlock(e,t){void 0===t&&(t=!1)
-var r=this.blockStack.current
-return null!==r&&(t||r.didAppendBounds(e)),this.__openBlock(),this.blockStack.push(e),e}popBlock(){return this.block().finalize(this),this.__closeBlock(),this.blockStack.pop()}__openBlock(){}__closeBlock(){}openElement(e){var t=this.__openElement(e)
-return this.constructing=t,t}__openElement(e){return this.dom.createElement(e,this.element)}flushElement(e){var t=this.element,r=this.constructing
-this.__flushElement(t,r),this.constructing=null,this.operations=null,this.pushModifiers(e),this.pushElement(r,null),this.didOpenElement(r)}__flushElement(e,t){this.dom.insertBefore(e,t,this.nextSibling)}closeElement(){return this.willCloseElement(),this.popElement(),this.popModifiers()}pushRemoteElement(e,t,r){return this.__pushRemoteElement(e,t,r)}__pushRemoteElement(e,t,r){if(this.pushElement(e,r),void 0===r)for(;e.lastChild;)e.removeChild(e.lastChild)
-var n=new le(e)
-return this.pushLiveBlock(n,!0)}popRemoteElement(){this.popBlock(),this.popElement()}pushElement(e,t){void 0===t&&(t=null),this[oe].push(new w(e,t))}pushModifiers(e){this.modifierStack.push(e)}popModifiers(){return this.modifierStack.pop()}didAppendBounds(e){return this.block().didAppendBounds(e),e}didAppendNode(e){return this.block().didAppendNode(e),e}didOpenElement(e){return this.block().openElement(e),e}willCloseElement(){this.block().closeElement()}appendText(e){return this.didAppendNode(this.__appendText(e))}__appendText(e){var{dom:t,element:r,nextSibling:n}=this,i=t.createTextNode(e)
-return t.insertBefore(r,i,n),i}__appendNode(e){return this.dom.insertBefore(this.element,e,this.nextSibling),e}__appendFragment(e){var t=e.firstChild
-if(t){var r=new O(this.element,t,e.lastChild)
-return this.dom.insertBefore(this.element,e,this.nextSibling),r}return new x(this.element,this.__appendComment(""))}__appendHTML(e){return this.dom.insertHTMLBefore(this.element,this.nextSibling,e)}appendDynamicHTML(e){var t=this.trustedContent(e)
-this.didAppendBounds(t)}appendDynamicText(e){var t=this.untrustedContent(e)
-return this.didAppendNode(t),t}appendDynamicFragment(e){var t=this.__appendFragment(e)
-this.didAppendBounds(t)}appendDynamicNode(e){var t=this.__appendNode(e),r=new x(this.element,t)
-this.didAppendBounds(r)}trustedContent(e){return this.__appendHTML(e)}untrustedContent(e){return this.__appendText(e)}appendComment(e){return this.didAppendNode(this.__appendComment(e))}__appendComment(e){var{dom:t,element:r,nextSibling:n}=this,i=t.createComment(e)
-return t.insertBefore(r,i,n),i}__setAttribute(e,t,r){this.dom.setAttribute(this.constructing,e,t,r)}__setProperty(e,t){this.constructing[e]=t}setStaticAttribute(e,t,r){this.__setAttribute(e,t,r)}setDynamicAttribute(e,t,r,n){var i=G(this.constructing,e,n,r)
-return i.set(this,t,this.env),i}}e.NewElementBuilder=se,I=oe
-class ae{constructor(e){this.parent=e,this.first=null,this.last=null,this.nesting=0}parentElement(){return this.parent}firstNode(){return this.first.firstNode()}lastNode(){return this.last.lastNode()}openElement(e){this.didAppendNode(e),this.nesting++}closeElement(){this.nesting--}didAppendNode(e){0===this.nesting&&(this.first||(this.first=new ne(e)),this.last=new ie(e))}didAppendBounds(e){0===this.nesting&&(this.first||(this.first=e),this.last=e)}finalize(e){null===this.first&&e.appendComment("")}}class le extends ae{constructor(e){super(e),(0,i.registerDestructor)(this,(()=>{this.parentElement()===this.firstNode().parentNode&&S(this)}))}}e.RemoteLiveBlock=le
-class ue extends ae{reset(){(0,i.destroy)(this)
-var e=S(this)
-return this.first=null,this.last=null,this.nesting=0,e}}e.UpdatableBlockImpl=ue
-class ce{constructor(e,t){this.parent=e,this.boundList=t,this.parent=e,this.boundList=t}parentElement(){return this.parent}firstNode(){return this.boundList[0].firstNode()}lastNode(){var e=this.boundList
-return e[e.length-1].lastNode()}openElement(e){}closeElement(){}didAppendNode(e){}didAppendBounds(e){}finalize(e){}}var de=new class{constructor(){this.evaluateOpcode=(0,t.fillNulls)(104).slice()}add(e,t,r){void 0===r&&(r="syscall"),this.evaluateOpcode[e]={syscall:"machine"!==r,evaluate:t}}debugBefore(e,t){return{sp:undefined,pc:e.fetchValue(o.$pc),name:undefined,params:undefined,type:t.type,isMachine:t.isMachine,size:t.size,state:void 0}}debugAfter(e,t){}evaluate(e,t,r){var n=this.evaluateOpcode[r]
-n.syscall?n.evaluate(e,t):n.evaluate(e[f],t)}}
-class he extends class{constructor(){(0,t.initializeGuid)(this)}}{}function pe(e){return"function"!=typeof e.toString?"":String(e)}var fe=(0,t.symbol)("TYPE"),me=(0,t.symbol)("INNER"),ge=(0,t.symbol)("OWNER"),ve=(0,t.symbol)("ARGS"),be=(0,t.symbol)("RESOLVED"),ye=new t._WeakSet
-function _e(e){return ye.has(e)}function we(e,t){return _e(e)&&e[fe]===t}class Oe{constructor(e,t,r,n,i){void 0===i&&(i=!1),ye.add(this),this[fe]=e,this[me]=t,this[ge]=r,this[ve]=n,this[be]=i}}function xe(e){for(var t,r,n,i,o,s=e;;){var{[ve]:a,[me]:l}=s
-if(null!==a){var{named:u,positional:c}=a
-c.length>0&&(t=void 0===t?c:c.concat(t)),void 0===r&&(r=[]),r.unshift(u)}if(!_e(l)){n=l,i=s[ge],o=s[be]
-break}s=l}return{definition:n,owner:i,resolved:o,positional:t,named:r}}function Pe(e,t,r,n,i){return void 0===i&&(i=!1),new Oe(e,t,r,n,i)}e.CurriedValue=Oe
-class Se{constructor(){this.stack=null,this.positional=new Ee,this.named=new Ce,this.blocks=new Ae}empty(e){var t=e[v][o.$sp]+1
-return this.named.empty(e,t),this.positional.empty(e,t),this.blocks.empty(e,t),this}setup(e,t,r,n,i){this.stack=e
-var s=this.named,a=t.length,l=e[v][o.$sp]-a+1
-s.setup(e,l,a,t,i)
-var u=l-n
-this.positional.setup(e,u,n)
-var c=this.blocks,d=r.length,h=u-3*d
-c.setup(e,h,d,r)}get base(){return this.blocks.base}get length(){return this.positional.length+this.named.length+3*this.blocks.length}at(e){return this.positional.at(e)}realloc(e){var{stack:t}=this
-if(e>0&&null!==t){for(var{positional:r,named:n}=this,i=r.base+e,s=r.length+n.length-1;s>=0;s--)t.copy(s+r.base,s+i)
-r.base+=e,n.base+=e,t[v][o.$sp]+=e}}capture(){var e=0===this.positional.length?Le:this.positional.capture()
-return{named:0===this.named.length?Fe:this.named.capture(),positional:e}}clear(){var{stack:e,length:t}=this
-t>0&&null!==e&&e.pop(t)}}var Te=(0,t.emptyArray)()
-class Ee{constructor(){this.base=0,this.length=0,this.stack=null,this._references=null}empty(e,t){this.stack=e,this.base=t,this.length=0,this._references=Te}setup(e,t,r){this.stack=e,this.base=t,this.length=r,this._references=0===r?Te:null}at(e){var{base:t,length:n,stack:i}=this
-return e<0||e>=n?r.UNDEFINED_REFERENCE:i.get(e,t)}capture(){return this.references}prepend(e){var t=e.length
-if(t>0){var{base:r,length:n,stack:i}=this
-this.base=r-=t,this.length=n+t
-for(var o=0;o<t;o++)i.set(e[o],o,r)
-this._references=null}}get references(){var e=this._references
-if(!e){var{stack:t,base:r,length:n}=this
-e=this._references=t.slice(r,r+n)}return e}}class Ce{constructor(){this.base=0,this.length=0,this._references=null,this._names=t.EMPTY_STRING_ARRAY,this._atNames=t.EMPTY_STRING_ARRAY}empty(e,r){this.stack=e,this.base=r,this.length=0,this._references=Te,this._names=t.EMPTY_STRING_ARRAY,this._atNames=t.EMPTY_STRING_ARRAY}setup(e,r,n,i,o){this.stack=e,this.base=r,this.length=n,0===n?(this._references=Te,this._names=t.EMPTY_STRING_ARRAY,this._atNames=t.EMPTY_STRING_ARRAY):(this._references=null,o?(this._names=null,this._atNames=i):(this._names=i,this._atNames=null))}get names(){var e=this._names
-return e||(e=this._names=this._atNames.map(this.toSyntheticName)),e}get atNames(){var e=this._atNames
-return e||(e=this._atNames=this._names.map(this.toAtName)),e}has(e){return-1!==this.names.indexOf(e)}get(e,t){void 0===t&&(t=!1)
-var{base:n,stack:i}=this,o=(t?this.atNames:this.names).indexOf(e)
-if(-1===o)return r.UNDEFINED_REFERENCE
-var s=i.get(o,n)
-return s}capture(){for(var{names:e,references:r}=this,n=(0,t.dict)(),i=0;i<e.length;i++){var o=e[i]
-n[o]=r[i]}return n}merge(e){var t=Object.keys(e)
-if(t.length>0){for(var{names:r,length:n,stack:i}=this,o=r.slice(),s=0;s<t.length;s++){var a=t[s];-1===o.indexOf(a)&&(n=o.push(a),i.pushJs(e[a]))}this.length=n,this._references=null,this._names=o,this._atNames=null}}get references(){var e=this._references
-if(!e){var{base:t,length:r,stack:n}=this
-e=this._references=n.slice(t,t+r)}return e}toSyntheticName(e){return e.slice(1)}toAtName(e){return`@${e}`}}function ke(e){return`&${e}`}var Me=(0,t.emptyArray)()
-class Ae{constructor(){this.internalValues=null,this._symbolNames=null,this.internalTag=null,this.names=t.EMPTY_STRING_ARRAY,this.length=0,this.base=0}empty(e,r){this.stack=e,this.names=t.EMPTY_STRING_ARRAY,this.base=r,this.length=0,this._symbolNames=null,this.internalTag=s.CONSTANT_TAG,this.internalValues=Me}setup(e,t,r,n){this.stack=e,this.names=n,this.base=t,this.length=r,this._symbolNames=null,0===r?(this.internalTag=s.CONSTANT_TAG,this.internalValues=Me):(this.internalTag=null,this.internalValues=null)}get values(){var e=this.internalValues
-if(!e){var{base:t,length:r,stack:n}=this
-e=this.internalValues=n.slice(t,t+3*r)}return e}has(e){return-1!==this.names.indexOf(e)}get(e){var t=this.names.indexOf(e)
-if(-1===t)return null
-var{base:r,stack:n}=this,i=n.get(3*t,r),o=n.get(3*t+1,r),s=n.get(3*t+2,r)
-return null===s?null:[s,o,i]}capture(){return new Re(this.names,this.values)}get symbolNames(){var e=this._symbolNames
-return null===e&&(e=this._symbolNames=this.names.map(ke)),e}}class Re{constructor(e,t){this.names=e,this.values=t,this.length=e.length}has(e){return-1!==this.names.indexOf(e)}get(e){var t=this.names.indexOf(e)
-return-1===t?null:[this.values[3*t+2],this.values[3*t+1],this.values[3*t]]}}function je(e,t){return{named:e,positional:t}}function Ie(e){var n=(0,t.dict)()
-for(var i in e)n[i]=(0,r.valueForRef)(e[i])
-return n}function De(e){return e.map(r.valueForRef)}function Ne(e){return{named:Ie(e.named),positional:De(e.positional)}}var Fe=Object.freeze(Object.create(null))
-e.EMPTY_NAMED=Fe
-var Le=Te
-e.EMPTY_POSITIONAL=Le
-var ze=je(Fe,Le)
-function Ue(e,t,r){var n=e.helper(t,null,!0)
-return e.getValue(n)}function Be(e){return e===r.UNDEFINED_REFERENCE}function He(e){return"getDebugCustomRenderTree"in e}e.EMPTY_ARGS=ze,de.add(77,((e,n)=>{var{op1:i,op2:s}=n,a=e.stack,l=a.popJs(),u=a.popJs(),c=e.getOwner()
-e.runtime.resolver
-e.loadValue(o.$v0,function(e,n,i,o,s,a){var l,u
-return(0,r.createComputeRef)((()=>{var s=(0,r.valueForRef)(n)
-return s===l||(u=we(s,e)?o?Pe(e,s,i,o):o:0===e&&"string"==typeof s&&s||(0,t.isObject)(s)?Pe(e,s,i,o):null,l=s),u}))}(i,l,c,u))})),de.add(107,(e=>{var n,s=e.stack,a=s.popJs(),l=s.popJs().capture(),u=e.getOwner(),c=(0,r.createComputeRef)((()=>{void 0!==n&&(0,i.destroy)(n)
-var o=(0,r.valueForRef)(a)
-if(we(o,1)){var{definition:s,owner:d,positional:h,named:p}=xe(o),f=Ue(e[y],s,a)
-void 0!==p&&(l.named=(0,t.assign)({},...p,l.named)),void 0!==h&&(l.positional=h.concat(l.positional)),n=f(l,d),(0,i.associateDestroyableChild)(c,n)}else if((0,t.isObject)(o)){var m=Ue(e[y],o,a)
-n=m(l,u),(0,i._hasDestroyableChildren)(n)&&(0,i.associateDestroyableChild)(c,n)}else n=r.UNDEFINED_REFERENCE})),d=(0,r.createComputeRef)((()=>((0,r.valueForRef)(c),(0,r.valueForRef)(n))))
-e.associateDestroyable(c),e.loadValue(o.$v0,d)})),de.add(16,((e,t)=>{var{op1:r}=t,n=e.stack,s=e[y].getValue(r)(n.popJs().capture(),e.getOwner(),e.dynamicScope());(0,i._hasDestroyableChildren)(s)&&e.associateDestroyable(s),e.loadValue(o.$v0,s)})),de.add(21,((e,t)=>{var{op1:r}=t,n=e.referenceForSymbol(r)
-e.stack.pushJs(n)})),de.add(19,((e,t)=>{var{op1:r}=t,n=e.stack.pop()
-e.scope().bindSymbol(r,n)})),de.add(20,((e,t)=>{var{op1:r}=t,n=e.stack.popJs(),i=e.stack.popJs(),o=e.stack.popJs()
-e.scope().bindBlock(r,[n,i,o])})),de.add(102,((e,t)=>{var{op1:n}=t,i=e[y].getValue(n),o=e.scope().getPartialMap()[i]
-void 0===o&&(o=(0,r.childRefFor)(e.getSelf(),i)),e.stack.pushJs(o)})),de.add(37,((e,t)=>{var{op1:r}=t
-e.pushRootScope(r,e.getOwner())})),de.add(22,((e,t)=>{var{op1:n}=t,i=e[y].getValue(n),o=e.stack.popJs()
-e.stack.pushJs((0,r.childRefFor)(o,i))})),de.add(23,((e,t)=>{var{op1:r}=t,{stack:n}=e,i=e.scope().getBlock(r)
-null===i?n.pushNull():n.pushJs(i)})),de.add(24,(e=>{var{stack:t}=e,r=t.popJs()
-if(r&&!Be(r)){var[n,i,o]=r
-t.pushJs(o),t.pushJs(i),"number"==typeof n?t.pushSmallInt(n):t.pushJs(n)}else t.pushNull(),t.pushNull(),t.pushNull()})),de.add(25,(e=>{var{stack:t}=e,n=t.pop()
-n&&!Be(n)?t.pushJs(r.TRUE_REFERENCE):t.pushJs(r.FALSE_REFERENCE)})),de.add(26,(e=>{e.stack.pop(),e.stack.popJs()
-var t=e.stack.popJs(),n=t&&t.parameters.length
-e.stack.pushJs(n?r.TRUE_REFERENCE:r.FALSE_REFERENCE)})),de.add(27,((e,t)=>{for(var n,{op1:i}=t,o=new Array(i),s=i;s>0;s--){o[s-1]=e.stack.pop()}e.stack.pushJs((n=o,(0,r.createComputeRef)((()=>{for(var e=new Array,t=0;t<n.length;t++){var i=(0,r.valueForRef)(n[t])
-null!=i&&(e[t]=pe(i))}return e.length>0?e.join(""):null}))))})),de.add(109,(e=>{var t=e.stack.popJs(),i=e.stack.popJs(),o=e.stack.popJs()
-e.stack.pushJs((0,r.createComputeRef)((()=>!0===(0,n.toBool)((0,r.valueForRef)(t))?(0,r.valueForRef)(i):(0,r.valueForRef)(o))))})),de.add(110,(e=>{var t=e.stack.popJs()
-e.stack.pushJs((0,r.createComputeRef)((()=>!(0,n.toBool)((0,r.valueForRef)(t)))))})),de.add(111,(e=>{var t=e.dynamicScope(),n=e.stack,i=n.popJs()
-n.pushJs((0,r.createComputeRef)((()=>{var e=String((0,r.valueForRef)(i))
-return(0,r.valueForRef)(t.get(e))})))})),de.add(112,(e=>{var{positional:t}=e.stack.popJs().capture()
-e.loadValue(o.$v0,(0,r.createComputeRef)((()=>{console.log(...De(t))})))})),de.add(39,(e=>e.pushChildScope())),de.add(40,(e=>e.popScope())),de.add(59,(e=>e.pushDynamicScope())),de.add(60,(e=>e.popDynamicScope())),de.add(28,((e,r)=>{var{op1:n}=r
-e.stack.pushJs(e[y].getValue((0,t.decodeHandle)(n)))})),de.add(29,((e,n)=>{var{op1:i}=n
-e.stack.pushJs((0,r.createConstRef)(e[y].getValue((0,t.decodeHandle)(i)),!1))})),de.add(30,((e,r)=>{var{op1:n}=r,i=e.stack
-if((0,t.isNonPrimitiveHandle)(n)){var o=e[y].getValue((0,t.decodeHandle)(n))
-i.pushJs(o)}else i.pushRaw(n)})),de.add(31,(e=>{var t,n=e.stack,i=n.pop()
-t=void 0===i?r.UNDEFINED_REFERENCE:null===i?r.NULL_REFERENCE:!0===i?r.TRUE_REFERENCE:!1===i?r.FALSE_REFERENCE:(0,r.createPrimitiveRef)(i),n.pushJs(t)})),de.add(33,((e,t)=>{var{op1:r,op2:n}=t,i=e.fetchValue(r)-n
-e.stack.dup(i)})),de.add(34,((e,t)=>{var{op1:r}=t
-e.stack.pop(r)})),de.add(35,((e,t)=>{var{op1:r}=t
-e.load(r)}))
-de.add(36,((e,t)=>{var{op1:r}=t
-e.fetch(r)})),de.add(58,((e,t)=>{var{op1:r}=t,n=e[y].getArray(r)
-e.bindDynamicScope(n)})),de.add(69,((e,t)=>{var{op1:r}=t
-e.enter(r)})),de.add(70,(e=>{e.exit()})),de.add(63,((e,t)=>{var{op1:r}=t
-e.stack.pushJs(e[y].getValue(r))})),de.add(62,(e=>{e.stack.pushJs(e.scope())})),de.add(61,(e=>{var t=e.stack,r=t.pop()
-r?t.pushSmallInt(e.compile(r)):t.pushNull()})),de.add(64,(e=>{var{stack:t}=e,r=t.pop(),n=t.popJs(),i=t.popJs(),o=t.pop()
-if(null===i)return e.pushFrame(),void e.pushScope(null!=n?n:e.scope())
-var s=n,a=i.parameters,l=a.length
-if(l>0){s=s.child()
-for(var u=0;u<l;u++)s.bindSymbol(a[u],o.at(u))}e.pushFrame(),e.pushScope(s),e.call(r)})),de.add(65,((e,t)=>{var{op1:n}=t,i=e.stack.popJs(),o=Boolean((0,r.valueForRef)(i));(0,r.isConstRef)(i)?!0===o&&e.goto(n):(!0===o&&e.goto(n),e.updateWith(new $e(i)))})),de.add(66,((e,t)=>{var{op1:n}=t,i=e.stack.popJs(),o=Boolean((0,r.valueForRef)(i));(0,r.isConstRef)(i)?!1===o&&e.goto(n):(!1===o&&e.goto(n),e.updateWith(new $e(i)))})),de.add(67,((e,t)=>{var{op1:r,op2:n}=t
-e.stack.peekSmallInt()===n&&e.goto(r)})),de.add(68,(e=>{var t=e.stack.peekJs()
-!1===(0,r.isConstRef)(t)&&e.updateWith(new $e(t))})),de.add(71,(e=>{var{stack:t}=e,i=t.popJs()
-t.pushJs((0,r.createComputeRef)((()=>(0,n.toBool)((0,r.valueForRef)(i)))))}))
-class $e extends he{constructor(e){super(),this.ref=e,this.type="assert",this.last=(0,r.valueForRef)(e)}evaluate(e){var{last:t,ref:n}=this
-t!==(0,r.valueForRef)(n)&&e.throw()}}class We extends he{constructor(e,t){super(),this.ref=e,this.filter=t,this.type="assert-filter",this.last=t((0,r.valueForRef)(e))}evaluate(e){var{last:t,ref:n,filter:i}=this
-t!==i((0,r.valueForRef)(n))&&e.throw()}}class qe extends he{constructor(){super(...arguments),this.type="jump-if-not-modified",this.tag=s.CONSTANT_TAG,this.lastRevision=s.INITIAL}finalize(e,t){this.target=t,this.didModify(e)}evaluate(e){var{tag:t,target:r,lastRevision:n}=this
-!e.alwaysRevalidate&&(0,s.validateTag)(t,n)&&((0,s.consumeTag)(t),e.goto(r))}didModify(e){this.tag=e,this.lastRevision=(0,s.valueForTag)(this.tag),(0,s.consumeTag)(e)}}class Ve extends he{constructor(e){super(),this.debugLabel=e,this.type="begin-track-frame"}evaluate(){(0,s.beginTrackFrame)(this.debugLabel)}}class Ge extends he{constructor(e){super(),this.target=e,this.type="end-track-frame"}evaluate(){var e=(0,s.endTrackFrame)()
-this.target.didModify(e)}}de.add(41,((e,t)=>{var{op1:r}=t
-e.elements().appendText(e[y].getValue(r))})),de.add(42,((e,t)=>{var{op1:r}=t
-e.elements().appendComment(e[y].getValue(r))})),de.add(48,((e,t)=>{var{op1:r}=t
-e.elements().openElement(e[y].getValue(r))})),de.add(49,(e=>{var t=(0,r.valueForRef)(e.stack.popJs())
-e.elements().openElement(t)})),de.add(50,(e=>{var t=e.stack.popJs(),n=e.stack.popJs(),i=e.stack.popJs(),o=(0,r.valueForRef)(t),s=(0,r.valueForRef)(n),a=(0,r.valueForRef)(i);(0,r.isConstRef)(t)||e.updateWith(new $e(t)),void 0===s||(0,r.isConstRef)(n)||e.updateWith(new $e(n))
-var l=e.elements().pushRemoteElement(o,a,s)
-l&&e.associateDestroyable(l)})),de.add(56,(e=>{e.elements().popRemoteElement()})),de.add(54,(e=>{var t=e.fetchValue(o.$t0),r=null
-t&&(r=t.flush(e),e.loadValue(o.$t0,null)),e.elements().flushElement(r)})),de.add(55,(e=>{var t=e.elements().closeElement()
-t&&t.forEach((t=>{e.env.scheduleInstallModifier(t)
-var{manager:r,state:n}=t,i=r.getDestroyable(n)
-i&&e.associateDestroyable(i)}))})),de.add(57,((e,t)=>{var{op1:r}=t
-if(!1!==e.env.isInteractive){var n=e.getOwner(),i=e.stack.popJs(),a=e[y].getValue(r),{manager:l}=a,{constructing:u}=e.elements(),c=l.create(n,u,a.state,i.capture()),d={manager:l,state:c,definition:a}
-e.fetchValue(o.$t0).addModifier(d)
-var h=l.getTag(c)
-return null!==h?((0,s.consumeTag)(h),e.updateWith(new Ke(h,d))):void 0}})),de.add(108,(e=>{if(!1!==e.env.isInteractive){var{stack:n,[y]:i}=e,a=n.popJs(),l=n.popJs().capture(),{constructing:u}=e.elements(),c=e.getOwner(),d=(0,r.createComputeRef)((()=>{var e,n=(0,r.valueForRef)(a)
-if((0,t.isObject)(n)){var o
-if(we(n,2)){var{definition:s,owner:d,positional:h,named:p}=xe(n)
-o=s,e=d,void 0!==h&&(l.positional=h.concat(l.positional)),void 0!==p&&(l.named=(0,t.assign)({},...p,l.named))}else o=n,e=c
-var f=i.modifier(o,null,!0)
-0
-var m=i.getValue(f),{manager:g}=m,v=g.create(e,u,m.state,l)
-return{manager:g,state:v,definition:m}}})),h=(0,r.valueForRef)(d),p=null
-if(void 0!==h)e.fetchValue(o.$t0).addModifier(h),null!==(p=h.manager.getTag(h.state))&&(0,s.consumeTag)(p)
-return!(0,r.isConstRef)(a)||p?e.updateWith(new Ye(p,h,d)):void 0}}))
-class Ke extends he{constructor(e,t){super(),this.tag=e,this.modifier=t,this.type="update-modifier",this.lastUpdated=(0,s.valueForTag)(e)}evaluate(e){var{modifier:t,tag:r,lastUpdated:n}=this;(0,s.consumeTag)(r),(0,s.validateTag)(r,n)||(e.env.scheduleUpdateModifier(t),this.lastUpdated=(0,s.valueForTag)(r))}}class Ye extends he{constructor(e,t,r){super(),this.tag=e,this.instance=t,this.instanceRef=r,this.type="update-dynamic-modifier",this.lastUpdated=(0,s.valueForTag)(null!=e?e:s.CURRENT_TAG)}evaluate(e){var{tag:t,lastUpdated:n,instance:o,instanceRef:a}=this,l=(0,r.valueForRef)(a)
-if(l!==o){if(void 0!==o){var u=o.manager.getDestroyable(o.state)
-null!==u&&(0,i.destroy)(u)}if(void 0!==l){var{manager:c,state:d}=l,h=c.getDestroyable(d)
-null!==h&&(0,i.associateDestroyableChild)(this,h),null!==(t=c.getTag(d))&&(this.lastUpdated=(0,s.valueForTag)(t)),this.tag=t,e.env.scheduleInstallModifier(l)}this.instance=l}else null===t||(0,s.validateTag)(t,n)||(e.env.scheduleUpdateModifier(o),this.lastUpdated=(0,s.valueForTag)(t))
-null!==t&&(0,s.consumeTag)(t)}}de.add(51,((e,t)=>{var{op1:r,op2:n,op3:i}=t,o=e[y].getValue(r),s=e[y].getValue(n),a=i?e[y].getValue(i):null
-e.elements().setStaticAttribute(o,s,a)})),de.add(52,((e,t)=>{var{op1:n,op2:i,op3:o}=t,s=e[y].getValue(n),a=e[y].getValue(i),l=e.stack.popJs(),u=(0,r.valueForRef)(l),c=o?e[y].getValue(o):null,d=e.elements().setDynamicAttribute(s,u,a,c);(0,r.isConstRef)(l)||e.updateWith(new Qe(l,d,e.env))}))
-class Qe extends he{constructor(e,t,n){super(),this.type="patch-element"
-var i=!1
-this.updateRef=(0,r.createComputeRef)((()=>{var o=(0,r.valueForRef)(e)
-!0===i?t.update(o,n):i=!0})),(0,r.valueForRef)(this.updateRef)}evaluate(){(0,r.valueForRef)(this.updateRef)}}de.add(78,((e,t)=>{var{op1:r}=t,n=e[y].getValue(r),{manager:i,capabilities:o}=n,s={definition:n,manager:i,capabilities:o,state:null,handle:null,table:null,lookup:null}
-e.stack.pushJs(s)})),de.add(80,((e,t)=>{var n,{op1:i}=t,s=e.stack,a=(0,r.valueForRef)(s.popJs()),l=e[y],u=e.getOwner()
-l.getValue(i)
-if(e.loadValue(o.$t1,null),"string"==typeof a){0
-var c=function(e,t,r,n){var i=e.lookupComponent(r,n)
-return t.resolvedComponent(i,r)}(e.runtime.resolver,l,a,u)
-n=c}else n=_e(a)?a:l.component(a,u)
-s.pushJs(n)})),de.add(81,(e=>{var t,n=e.stack,i=n.popJs(),o=(0,r.valueForRef)(i),s=e[y]
-t=_e(o)?o:s.component(o,e.getOwner(),!0),n.pushJs(t)})),de.add(79,(e=>{var t,r,{stack:n}=e,i=n.pop()
-_e(i)?r=t=null:(r=i.manager,t=i.capabilities),n.pushJs({definition:i,capabilities:t,manager:r,state:null,handle:null,table:null})})),de.add(82,((e,r)=>{var{op1:n,op2:i,op3:o}=r,s=e.stack,a=e[y].getArray(n),l=o>>4,u=8&o,c=7&o?e[y].getArray(i):t.EMPTY_STRING_ARRAY
-e[_].setup(s,a,c,l,!!u),s.pushJs(e[_])})),de.add(83,(e=>{var{stack:t}=e
-t.pushJs(e[_].empty(t))})),de.add(86,(e=>{var t=e.stack,r=t.popJs().capture()
-t.pushJs(r)})),de.add(85,((e,r)=>{var{op1:n}=r,i=e.stack,s=e.fetchValue(n),l=i.popJs(),{definition:u}=s
-if(we(u,0)){var c=e[y],{definition:d,owner:h,resolved:p,positional:f,named:m}=xe(u)
-if(!0===p)u=d
-else if("string"==typeof d){var g=e.runtime.resolver.lookupComponent(d,h)
-u=c.resolvedComponent(g,d)}else u=c.component(d,h)
-void 0!==m&&l.named.merge((0,t.assign)({},...m)),void 0!==f&&(l.realloc(f.length),l.positional.prepend(f))
-var{manager:v}=u
-s.definition=u,s.manager=v,s.capabilities=u.capabilities,e.loadValue(o.$t1,h)}var{manager:b,state:_}=u,w=s.capabilities
-if((0,a.managerHasCapability)(b,w,4)){var O=l.blocks.values,x=l.blocks.names,P=b.prepareArgs(_,l)
-if(P){l.clear()
-for(var S=0;S<O.length;S++){var T=O[S]
-"number"==typeof T?i.pushSmallInt(T):i.pushJs(T)}for(var{positional:E,named:C}=P,k=E.length,M=0;M<k;M++)i.pushJs(E[M])
-for(var A=Object.keys(C),R=0;R<A.length;R++)i.pushJs(C[A[R]])
-l.setup(i,A,x,k,!1)}i.pushJs(l)}else i.pushJs(l)})),de.add(87,((e,t)=>{var{op1:r,op2:n}=t,i=e.fetchValue(n),{definition:o,manager:s,capabilities:l}=i
-if((0,a.managerHasCapability)(s,l,512)){var u=null;(0,a.managerHasCapability)(s,l,64)&&(u=e.dynamicScope())
-var c=1&r,d=null;(0,a.managerHasCapability)(s,l,8)&&(d=e.stack.peekJs())
-var h=null;(0,a.managerHasCapability)(s,l,128)&&(h=e.getSelf())
-var p=s.create(e.getOwner(),o.state,d,e.env,u,h,!!c)
-i.state=p,(0,a.managerHasCapability)(s,l,256)&&e.updateWith(new tt(p,s,u))}})),de.add(88,((e,t)=>{var{op1:r}=t,{manager:n,state:i,capabilities:o}=e.fetchValue(r),s=n.getDestroyable(i)
-s&&e.associateDestroyable(s)})),de.add(97,((e,t)=>{var r,{op1:n}=t
-e.beginCacheGroup(r),e.elements().pushSimpleBlock()})),de.add(89,(e=>{e.loadValue(o.$t0,new Je)})),de.add(53,((e,t)=>{var{op1:r,op2:n,op3:i}=t,s=e[y].getValue(r),a=e[y].getValue(n),l=e.stack.popJs(),u=i?e[y].getValue(i):null
-e.fetchValue(o.$t0).setAttribute(s,l,a,u)})),de.add(105,((e,t)=>{var{op1:r,op2:n,op3:i}=t,s=e[y].getValue(r),a=e[y].getValue(n),l=i?e[y].getValue(i):null
-e.fetchValue(o.$t0).setStaticAttribute(s,a,l)}))
-class Je{constructor(){this.attributes=(0,t.dict)(),this.classes=[],this.modifiers=[]}setAttribute(e,t,r,n){var i={value:t,namespace:n,trusting:r}
-"class"===e&&this.classes.push(t),this.attributes[e]=i}setStaticAttribute(e,t,r){var n={value:t,namespace:r}
-"class"===e&&this.classes.push(t),this.attributes[e]=n}addModifier(e){this.modifiers.push(e)}flush(e){var t,r=this.attributes
-for(var n in this.attributes)if("type"!==n){var i=this.attributes[n]
-"class"===n?Ze(e,"class",Xe(this.classes),i.namespace,i.trusting):Ze(e,n,i.value,i.namespace,i.trusting)}else t=r[n]
-return void 0!==t&&Ze(e,"type",t.value,t.namespace,t.trusting),this.modifiers}}function Xe(e){return 0===e.length?"":1===e.length?e[0]:function(e){for(var t=0;t<e.length;t++)if("string"!=typeof e[t])return!1
-return!0}(e)?e.join(" "):(t=e,(0,r.createComputeRef)((()=>{for(var e=[],n=0;n<t.length;n++){var i=t[n],o=T("string"==typeof i?i:(0,r.valueForRef)(t[n]))
-o&&e.push(o)}return 0===e.length?null:e.join(" ")})))
-var t}function Ze(e,t,n,i,o){if(void 0===o&&(o=!1),"string"==typeof n)e.elements().setStaticAttribute(t,n,i)
-else{var s=e.elements().setDynamicAttribute(t,(0,r.valueForRef)(n),o,i);(0,r.isConstRef)(n)||e.updateWith(new Qe(n,s,e.env))}}function et(e,t,r,n,i){var o=r.table.symbols.indexOf(e),s=n.get(t);-1!==o&&i.scope().bindBlock(o+1,s),r.lookup&&(r.lookup[e]=s)}de.add(99,((e,t)=>{var{op1:r}=t,{definition:n,state:i}=e.fetchValue(r),{manager:s}=n,a=e.fetchValue(o.$t0)
-s.didCreateElement(i,e.elements().constructing,a)})),de.add(90,((e,t)=>{var n,{op1:o,op2:s}=t,a=e.fetchValue(o),{definition:l,state:u}=a,{manager:c}=l,d=c.getSelf(u)
-if(void 0!==e.env.debugRenderTree){var h,p,f=e.fetchValue(o),{definition:m,manager:g}=f
-if(e.stack.peek()===e[_])h=e[_].capture()
-else{var v=e[y].getArray(s)
-e[_].setup(e.stack,v,[],0,!0),h=e[_].capture()}var b=m.compilable
-if(p=null===b?null!==(b=g.getDynamicLayout(u,e.runtime.resolver))?b.moduleName:"__default__.hbs":b.moduleName,e.associateDestroyable(f),He(g)){g.getDebugCustomRenderTree(f.definition.state,f.state,h,p).forEach((t=>{var{bucket:r}=t
-e.env.debugRenderTree.create(r,t),(0,i.registerDestructor)(f,(()=>{var t
-null===(t=e.env.debugRenderTree)||void 0===t||t.willDestroy(r)})),e.updateWith(new nt(r))}))}else{var w=null!==(n=m.resolvedName)&&void 0!==n?n:g.getDebugName(m.state)
-e.env.debugRenderTree.create(f,{type:"component",name:w,args:h,template:p,instance:(0,r.valueForRef)(d)}),e.associateDestroyable(f),(0,i.registerDestructor)(f,(()=>{var t
-null===(t=e.env.debugRenderTree)||void 0===t||t.willDestroy(f)})),e.updateWith(new nt(f))}}e.stack.pushJs(d)})),de.add(91,((e,t)=>{var{op1:r}=t,{definition:n,state:i}=e.fetchValue(r),{manager:o}=n,s=o.getTagName(i)
-e.stack.pushJs(s)})),de.add(92,((e,r)=>{var{op1:n}=r,i=e.fetchValue(n),{manager:o,definition:s}=i,{stack:l}=e,{compilable:u}=s
-if(null===u){var{capabilities:c}=i
-null===(u=o.getDynamicLayout(i.state,e.runtime.resolver))&&(u=(0,a.managerHasCapability)(o,c,1024)?(0,t.unwrapTemplate)(e[y].defaultTemplate).asWrappedLayout():(0,t.unwrapTemplate)(e[y].defaultTemplate).asLayout())}var d=u.compile(e.context)
-l.pushJs(u.symbolTable),l.pushSmallInt(d)})),de.add(75,((e,t)=>{var{op1:r}=t,n=e.stack.popJs(),i=e.stack.popJs(),{manager:o,capabilities:s}=n,a={definition:n,manager:o,capabilities:s,state:null,handle:i.handle,table:i.symbolTable,lookup:null}
-e.loadValue(r,a)})),de.add(95,((e,t)=>{var{op1:r}=t,{stack:n}=e,i=n.popSmallInt(),o=n.popJs(),s=e.fetchValue(r)
-s.handle=i,s.table=o})),de.add(38,((e,t)=>{var r,{op1:n}=t,{table:i,manager:s,capabilities:l,state:u}=e.fetchValue(n);(0,a.managerHasCapability)(s,l,4096)?(r=s.getOwner(u),e.loadValue(o.$t1,null)):null===(r=e.fetchValue(o.$t1))?r=e.getOwner():e.loadValue(o.$t1,null),e.pushRootScope(i.symbols.length+1,r)})),de.add(94,((e,r)=>{var{op1:n}=r,i=e.fetchValue(n)
-if(i.table.hasEval){var o=i.lookup=(0,t.dict)()
-e.scope().bindEvalScope(o)}})),de.add(17,((e,t)=>{for(var{op1:r}=t,n=e.fetchValue(r),i=e.scope(),o=e.stack.peekJs(),s=o.named.atNames,a=s.length-1;a>=0;a--){var l=s[a],u=n.table.symbols.indexOf(s[a]),c=o.named.get(l,!0);-1!==u&&i.bindSymbol(u+1,c),n.lookup&&(n.lookup[l]=c)}})),de.add(18,((e,t)=>{for(var{op1:r}=t,n=e.fetchValue(r),{blocks:i}=e.stack.peekJs(),o=0;o<i.names.length;o++)et(i.symbolNames[o],i.names[o],n,i,e)})),de.add(96,((e,t)=>{var{op1:r}=t,n=e.fetchValue(r)
-e.call(n.handle)})),de.add(100,((e,t)=>{var{op1:r}=t,n=e.fetchValue(r),{manager:i,state:o,capabilities:s}=n,l=e.elements().popBlock()
-void 0!==e.env.debugRenderTree&&(He(i)?i.getDebugCustomRenderTree(n.definition.state,o,ze).reverse().forEach((t=>{var{bucket:r}=t
-e.env.debugRenderTree.didRender(r,l),e.updateWith(new it(r,l))})):(e.env.debugRenderTree.didRender(n,l),e.updateWith(new it(n,l))));(0,a.managerHasCapability)(i,s,512)&&(i.didRenderLayout(o,l),e.env.didCreate(n),e.updateWith(new rt(n,l)))})),de.add(98,(e=>{e.commitCacheGroup()}))
-class tt extends he{constructor(e,t,r){super(),this.component=e,this.manager=t,this.dynamicScope=r,this.type="update-component"}evaluate(e){var{component:t,manager:r,dynamicScope:n}=this
-r.update(t,n)}}class rt extends he{constructor(e,t){super(),this.component=e,this.bounds=t,this.type="did-update-layout"}evaluate(e){var{component:t,bounds:r}=this,{manager:n,state:i}=t
-n.didUpdateLayout(i,r),e.env.didUpdate(t)}}class nt extends he{constructor(e){super(),this.bucket=e,this.type="debug-render-tree-update"}evaluate(e){var t
-null===(t=e.env.debugRenderTree)||void 0===t||t.update(this.bucket)}}class it extends he{constructor(e,t){super(),this.bucket=e,this.bounds=t,this.type="debug-render-tree-did-render"}evaluate(e){var t
-null===(t=e.env.debugRenderTree)||void 0===t||t.didRender(this.bucket,this.bounds)}}class ot extends he{constructor(e,t,r){super(),this.node=e,this.reference=t,this.lastValue=r,this.type="dynamic-text"}evaluate(){var e,t=(0,r.valueForRef)(this.reference),{lastValue:n}=this
-t!==n&&((e=E(t)?"":M(t)?t:String(t))!==n&&(this.node.nodeValue=this.lastValue=e))}}function st(e){return function(e){return M(e)||E(e)||"boolean"==typeof e||"number"==typeof e}(e)?2:we(e,0)||(0,a.hasInternalComponentManager)(e)?0:we(e,1)||(0,a.hasInternalHelperManager)(e)?1:C(e)?4:function(e){return k(e)&&11===e.nodeType}(e)?5:k(e)?6:2}function at(e){return(0,t.isObject)(e)?we(e,0)||(0,a.hasInternalComponentManager)(e)?0:1:2}function lt(e,t){console.info("Use `context`, and `get(<path>)` to debug this template."),t("this")}de.add(76,(e=>{var t=e.stack.peek()
-e.stack.pushSmallInt(st((0,r.valueForRef)(t))),(0,r.isConstRef)(t)||e.updateWith(new We(t,st))})),de.add(106,(e=>{var t=e.stack.peek()
-e.stack.pushSmallInt(at((0,r.valueForRef)(t))),(0,r.isConstRef)(t)||e.updateWith(new We(t,at))})),de.add(43,(e=>{var t=e.stack.popJs(),n=(0,r.valueForRef)(t),i=E(n)?"":String(n)
-e.elements().appendDynamicHTML(i)})),de.add(44,(e=>{var t=e.stack.popJs(),n=(0,r.valueForRef)(t).toHTML(),i=E(n)?"":n
-e.elements().appendDynamicHTML(i)})),de.add(47,(e=>{var t=e.stack.popJs(),n=(0,r.valueForRef)(t),i=E(n)?"":String(n),o=e.elements().appendDynamicText(i);(0,r.isConstRef)(t)||e.updateWith(new ot(o,t,i))})),de.add(45,(e=>{var t=e.stack.popJs(),n=(0,r.valueForRef)(t)
-e.elements().appendDynamicFragment(n)})),de.add(46,(e=>{var t=e.stack.popJs(),n=(0,r.valueForRef)(t)
-e.elements().appendDynamicNode(n)}))
-var ut=lt
-class ct{constructor(e,r,n){this.scope=e,this.locals=(0,t.dict)()
-for(var i=0;i<n.length;i++){var o=n[i],s=r[o-1],a=e.getSymbol(o)
-this.locals[s]=a}}get(e){var t,{scope:n,locals:i}=this,o=e.split("."),[s,...a]=e.split("."),l=n.getEvalScope()
-return"this"===s?t=n.getSelf():i[s]?t=i[s]:0===s.indexOf("@")&&l[s]?t=l[s]:(t=this.scope.getSelf(),a=o),a.reduce(((e,t)=>(0,r.childRefFor)(e,t)),t)}}de.add(103,((e,n)=>{var{op1:i,op2:o}=n,s=e[y].getArray(i),a=e[y].getArray((0,t.decodeHandle)(o)),l=new ct(e.scope(),s,a)
-ut((0,r.valueForRef)(e.getSelf()),(e=>(0,r.valueForRef)(l.get(e))))})),de.add(101,((e,n)=>{var{op1:i,op2:o}=n,{[y]:s,stack:a}=e,l=(0,r.valueForRef)(a.pop()),u=e.scope(),c=u.owner,d=s.getArray(i),h=s.getArray((0,t.decodeHandle)(o)),p=e.runtime.resolver.lookupPartial(l,c),{symbolTable:f,handle:m}=p.getPartial(e.context),g=f.symbols,v=e.pushRootScope(g.length,c),b=u.getEvalScope()
-v.bindEvalScope(b),v.bindSelf(u.getSelf())
-for(var _=Object.create(u.getPartialMap()),w=0;w<h.length;w++){var O=h[w]
-if(-1!==O){var x=d[O-1],P=u.getSymbol(O)
-_[x]=P}}if(b)for(var S=0;S<g.length;S++){var T=S+1,E=b[g[S]]
-void 0!==E&&v.bind(T,E)}v.bindPartialMap(_),e.pushFrame(),e.call((0,t.unwrapHandle)(m))})),de.add(72,((e,t)=>{var{op1:n,op2:i}=t,o=e.stack,s=o.popJs(),a=o.popJs(),l=(0,r.valueForRef)(a),u=null===l?"@identity":String(l),c=(0,r.createIteratorRef)(s,u),d=(0,r.valueForRef)(c)
-e.updateWith(new We(c,(e=>e.isEmpty()))),!0===d.isEmpty()?e.goto(i+1):(e.enterList(c,n),e.stack.pushJs(d))})),de.add(73,(e=>{e.exitList()})),de.add(74,((e,t)=>{var{op1:r}=t,n=e.stack.peekJs().next()
-null!==n?e.registerItem(e.enterItem(n)):e.goto(r)}))
-var dt={dynamicLayout:!1,dynamicTag:!1,prepareArgs:!1,createArgs:!1,attributeHook:!1,elementHook:!1,createCaller:!1,dynamicScope:!1,updateHook:!1,createInstance:!1,wrapped:!1,willDestroy:!1,hasSubOwner:!1}
-class ht{getCapabilities(){return dt}getDebugName(e){var{name:t}=e
-return t}getSelf(){return r.NULL_REFERENCE}getDestroyable(){return null}}e.TemplateOnlyComponentManager=ht
-var pt=new ht
-e.TEMPLATE_ONLY_COMPONENT_MANAGER=pt
-class ft{constructor(e,t){void 0===e&&(e="@glimmer/component/template-only"),void 0===t&&(t="(unknown template-only component)"),this.moduleName=e,this.name=t}toString(){return this.moduleName}}e.TemplateOnlyComponent=ft,(0,a.setInternalComponentManager)(pt,ft.prototype)
-var mt={foreignObject:1,desc:1,title:1},gt=Object.create(null)
-class vt{constructor(e){this.document=e,this.setupUselessElement()}setupUselessElement(){this.uselessElement=this.document.createElement("div")}createElement(e,t){var r,n
-if(t?(r="http://www.w3.org/2000/svg"===t.namespaceURI||"svg"===e,n=!!mt[t.tagName]):(r="svg"===e,n=!1),r&&!n){if(gt[e])throw new Error(`Cannot create a ${e} inside an SVG context`)
-return this.document.createElementNS("http://www.w3.org/2000/svg",e)}return this.document.createElement(e)}insertBefore(e,t,r){e.insertBefore(t,r)}insertHTMLBefore(e,t,r){if(""===r){var n=this.createComment("")
-return e.insertBefore(n,t),new O(e,n,n)}var i,o=t?t.previousSibling:e.lastChild
-if(null===t)e.insertAdjacentHTML("beforeend",r),i=e.lastChild
-else if(t instanceof HTMLElement)t.insertAdjacentHTML("beforebegin",r),i=t.previousSibling
-else{var{uselessElement:s}=this
-e.insertBefore(s,t),s.insertAdjacentHTML("beforebegin",r),i=s.previousSibling,e.removeChild(s)}var a=o?o.nextSibling:e.firstChild
-return new O(e,a,i)}createTextNode(e){return this.document.createTextNode(e)}createComment(e){return this.document.createComment(e)}}var bt="http://www.w3.org/2000/svg"
-function yt(e,r,n){if(!e)return r
-if(!function(e,t){var r=e.createElementNS(t,"svg")
-try{r.insertAdjacentHTML("beforeend","<circle></circle>")}catch(n){}finally{return 1!==r.childNodes.length||r.firstChild.namespaceURI!==bt}}(e,n))return r
-var i=e.createElement("div")
-return class extends r{insertHTMLBefore(e,r,o){return""===o||e.namespaceURI!==n?super.insertHTMLBefore(e,r,o):function(e,r,n,i){var o
-if("FOREIGNOBJECT"===e.tagName.toUpperCase()){var s="<svg><foreignObject>"+n+"</foreignObject></svg>";(0,t.clearElement)(r),r.insertAdjacentHTML("afterbegin",s),o=r.firstChild.firstChild}else{var a="<svg>"+n+"</svg>";(0,t.clearElement)(r),r.insertAdjacentHTML("afterbegin",a),o=r.firstChild}return function(e,t,r){for(var n=e.firstChild,i=n,o=n;o;){var s=o.nextSibling
-t.insertBefore(o,r),i=o,o=s}return new O(t,n,i)}(o,e,i)}(e,i,o,r)}}}function _t(e,t){return e&&function(e){var t=e.createElement("div")
-if(t.appendChild(e.createTextNode("first")),t.insertAdjacentHTML("beforeend","second"),2===t.childNodes.length)return!1
-return!0}(e)?class extends t{constructor(e){super(e),this.uselessComment=e.createComment("")}insertHTMLBefore(e,t,r){if(""===r)return super.insertHTMLBefore(e,t,r)
-var n=!1,i=t?t.previousSibling:e.lastChild
-i&&i instanceof Text&&(n=!0,e.insertBefore(this.uselessComment,t))
-var o=super.insertHTMLBefore(e,t,r)
-return n&&e.removeChild(this.uselessComment),o}}:t}["b","big","blockquote","body","br","center","code","dd","div","dl","dt","em","embed","h1","h2","h3","h4","h5","h6","head","hr","i","img","li","listing","main","meta","nobr","ol","p","pre","ruby","s","small","span","strong","strike","sub","sup","table","tt","u","ul","var"].forEach((e=>gt[e]=1))
-var wt,Ot=/[\t-\r \xA0\u1680\u180E\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]/,xt="undefined"==typeof document?null:document;(function(e){class t extends vt{createElementNS(e,t){return this.document.createElementNS(e,t)}setAttribute(e,t,r,n){void 0===n&&(n=null),n?e.setAttributeNS(n,t,r):e.setAttribute(t,r)}}e.TreeConstruction=t
-var r=t
-r=_t(xt,r),r=yt(xt,r,"http://www.w3.org/2000/svg"),e.DOMTreeConstruction=r})(wt||(wt={}))
-class Pt extends vt{constructor(e){super(e),this.document=e,this.namespace=null}setAttribute(e,t,r){e.setAttribute(t,r)}removeAttribute(e,t){e.removeAttribute(t)}insertAfter(e,t,r){this.insertBefore(e,t,r.nextSibling)}}e.IDOMChanges=Pt
-var St=Pt
-St=_t(xt,St)
-var Tt=St=yt(xt,St,"http://www.w3.org/2000/svg")
-e.DOMChanges=Tt
-var Et=wt.DOMTreeConstruction
-e.DOMTreeConstruction=Et
-var Ct,kt=0
-class Mt{constructor(e){this.id=kt++,this.value=e}get(){return this.value}release(){this.value=null}toString(){var e=`Ref ${this.id}`
-if(null===this.value)return`${e} (released)`
-try{return`${e}: ${this.value}`}catch(I){return e}}}class At{constructor(){this.stack=new t.Stack,this.refs=new WeakMap,this.roots=new Set,this.nodes=new WeakMap}begin(){this.reset()}create(e,r){var n=(0,t.assign)({},r,{bounds:null,refs:new Set})
-this.nodes.set(e,n),this.appendChild(n,e),this.enter(e)}update(e){this.enter(e)}didRender(e,t){this.nodeFor(e).bounds=t,this.exit()}willDestroy(e){this.refs.get(e).release()}commit(){this.reset()}capture(){return this.captureRefs(this.roots)}reset(){if(0!==this.stack.size){var e=this.stack.toArray()[0],t=this.refs.get(e)
-for(void 0!==t&&this.roots.delete(t);!this.stack.isEmpty();)this.stack.pop()}}enter(e){this.stack.push(e)}exit(){this.stack.pop()}nodeFor(e){return this.nodes.get(e)}appendChild(e,t){var r=this.stack.current,n=new Mt(t)
-if(this.refs.set(t,n),r){var i=this.nodeFor(r)
-i.refs.add(n),e.parent=i}else this.roots.add(n)}captureRefs(e){var t=[]
-return e.forEach((r=>{var n=r.get()
-n?t.push(this.captureNode(`render-node:${r.id}`,n)):e.delete(r)})),t}captureNode(e,t){var r=this.nodeFor(t),{type:n,name:i,args:o,instance:s,refs:a}=r,l=this.captureTemplate(r),u=this.captureBounds(r),c=this.captureRefs(a)
-return{id:e,type:n,name:i,args:Ne(o),instance:s,template:l,bounds:u,children:c}}captureTemplate(e){var{template:t}=e
-return t||null}captureBounds(e){var t=e.bounds
-return{parentElement:t.parentElement(),firstNode:t.firstNode(),lastNode:t.lastNode()}}}var Rt,jt,It=(0,t.symbol)("TRANSACTION")
-class Dt{constructor(){this.scheduledInstallModifiers=[],this.scheduledUpdateModifiers=[],this.createdComponents=[],this.updatedComponents=[]}didCreate(e){this.createdComponents.push(e)}didUpdate(e){this.updatedComponents.push(e)}scheduleInstallModifier(e){this.scheduledInstallModifiers.push(e)}scheduleUpdateModifier(e){this.scheduledUpdateModifiers.push(e)}commit(){for(var{createdComponents:e,updatedComponents:t}=this,r=0;r<e.length;r++){var{manager:n,state:i}=e[r]
-n.didCreate(i)}for(var o=0;o<t.length;o++){var{manager:a,state:l}=t[o]
-a.didUpdate(l)}for(var u,c,{scheduledInstallModifiers:d,scheduledUpdateModifiers:h}=this,p=0;p<d.length;p++){var f=d[p]
-u=f.manager,c=f.state
-var m=u.getTag(c)
-if(null!==m){var g=(0,s.track)((()=>u.install(c)),!1);(0,s.updateTag)(m,g)}else u.install(c)}for(var v=0;v<h.length;v++){var b=h[v]
-u=b.manager,c=b.state
-var y=u.getTag(c)
-if(null!==y){var _=(0,s.track)((()=>u.update(c)),!1);(0,s.updateTag)(y,_)}else u.update(c)}}}class Nt{constructor(e,t){this.delegate=t,this[Ct]=null,this.isInteractive=this.delegate.isInteractive,this.debugRenderTree=this.delegate.enableDebugTooling?new At:void 0,e.appendOperations?(this.appendOperations=e.appendOperations,this.updateOperations=e.updateOperations):e.document&&(this.appendOperations=new Et(e.document),this.updateOperations=new Pt(e.document))}getAppendOperations(){return this.appendOperations}getDOM(){return this.updateOperations}begin(){var e
-null===(e=this.debugRenderTree)||void 0===e||e.begin(),this[It]=new Dt}get transaction(){return this[It]}didCreate(e){this.transaction.didCreate(e)}didUpdate(e){this.transaction.didUpdate(e)}scheduleInstallModifier(e){this.isInteractive&&this.transaction.scheduleInstallModifier(e)}scheduleUpdateModifier(e){this.isInteractive&&this.transaction.scheduleUpdateModifier(e)}commit(){var e,t=this.transaction
-this[It]=null,t.commit(),null===(e=this.debugRenderTree)||void 0===e||e.commit(),this.delegate.onTransactionCommit()}}function Ft(e,t){if(e[It])t()
-else{e.begin()
-try{t()}finally{e.commit()}}}e.EnvironmentImpl=Nt,Ct=It
-class Lt{constructor(e,t,r,n,i){this.stack=e,this.heap=t,this.program=r,this.externs=n,this.registers=i,this.currentOpSize=0}fetchRegister(e){return this.registers[e]}loadRegister(e,t){this.registers[e]=t}setPc(e){this.registers[o.$pc]=e}pushFrame(){this.stack.pushSmallInt(this.registers[o.$ra]),this.stack.pushSmallInt(this.registers[o.$fp]),this.registers[o.$fp]=this.registers[o.$sp]-1}popFrame(){this.registers[o.$sp]=this.registers[o.$fp]-1,this.registers[o.$ra]=this.stack.get(0),this.registers[o.$fp]=this.stack.get(1)}pushSmallFrame(){this.stack.pushSmallInt(this.registers[o.$ra])}popSmallFrame(){this.registers[o.$ra]=this.stack.popSmallInt()}goto(e){this.setPc(this.target(e))}target(e){return this.registers[o.$pc]+e-this.currentOpSize}call(e){this.registers[o.$ra]=this.registers[o.$pc],this.setPc(this.heap.getaddr(e))}returnTo(e){this.registers[o.$ra]=this.target(e)}return(){this.setPc(this.registers[o.$ra])}nextStatement(){var{registers:e,program:t}=this,r=e[o.$pc]
-if(-1===r)return null
-var n=t.opcode(r),i=this.currentOpSize=n.size
-return this.registers[o.$pc]+=i,n}evaluateOuter(e,t){this.evaluateInner(e,t)}evaluateInner(e,t){e.isMachine?this.evaluateMachine(e):this.evaluateSyscall(e,t)}evaluateMachine(e){switch(e.type){case 0:return this.pushFrame()
-case 1:return this.popFrame()
-case 3:return this.call(e.op1)
-case 2:return this.call(this.stack.popSmallInt())
-case 4:return this.goto(e.op1)
-case 5:return this.return()
-case 6:return this.returnTo(e.op1)}}evaluateSyscall(e,t){de.evaluate(t,e,e.type)}}class zt{constructor(e,r){var{alwaysRevalidate:n=!1}=r
-this.frameStack=new t.Stack,this.env=e,this.dom=e.getDOM(),this.alwaysRevalidate=n}execute(e,t){this._execute(e,t)}_execute(e,t){var{frameStack:r}=this
-for(this.try(e,t);!r.isEmpty();){var n=this.frame.nextStatement()
-void 0!==n?n.evaluate(this):r.pop()}}get frame(){return this.frameStack.current}goto(e){this.frame.goto(e)}try(e,t){this.frameStack.push(new qt(e,t))}throw(){this.frame.handleException(),this.frameStack.pop()}}e.UpdatingVM=zt
-class Ut{constructor(e,t){this.state=e,this.resumeCallback=t}resume(e,t){return this.resumeCallback(e,this.state,t)}}class Bt extends he{constructor(e,t,r,n){super(),this.state=e,this.runtime=t,this.type="block",this.children=n,this.bounds=r}parentElement(){return this.bounds.parentElement()}firstNode(){return this.bounds.firstNode()}lastNode(){return this.bounds.lastNode()}evaluate(e){e.try(this.children,null)}}class Ht extends Bt{constructor(){super(...arguments),this.type="try"}evaluate(e){e.try(this.children,this)}handleException(){var{state:e,bounds:t,runtime:r}=this;(0,i.destroyChildren)(this)
-var n=se.resume(r.env,t),o=e.resume(r,n),s=[],a=this.children=[],l=o.execute((e=>{e.pushUpdating(s),e.updateWith(this),e.pushUpdating(a)}));(0,i.associateDestroyableChild)(this,l.drop)}}class $t extends Ht{constructor(e,t,r,n,i,o){super(e,t,r,[]),this.key=n,this.memo=i,this.value=o,this.retained=!1,this.index=-1}updateReferences(e){this.retained=!0,(0,r.updateRef)(this.value,e.value),(0,r.updateRef)(this.memo,e.memo)}shouldRemove(){return!this.retained}reset(){this.retained=!1}}class Wt extends Bt{constructor(e,t,n,i,o){super(e,t,n,i),this.iterableRef=o,this.type="list-block",this.opcodeMap=new Map,this.marker=null,this.lastIterator=(0,r.valueForRef)(o)}initializeChild(e){e.index=this.children.length-1,this.opcodeMap.set(e.key,e)}evaluate(e){var t=(0,r.valueForRef)(this.iterableRef)
-if(this.lastIterator!==t){var{bounds:n}=this,{dom:i}=e,o=this.marker=i.createComment("")
-i.insertAfter(n.parentElement(),o,n.lastNode()),this.sync(t),this.parentElement().removeChild(o),this.marker=null,this.lastIterator=t}super.evaluate(e)}sync(e){var{opcodeMap:t,children:r}=this,n=0,i=0
-for(this.children=this.bounds.boundList=[];;){var o=e.next()
-if(null===o)break
-for(var s=r[n],{key:a}=o;void 0!==s&&!0===s.retained;)s=r[++n]
-if(void 0!==s&&s.key===a)this.retainItem(s,o),n++
-else if(t.has(a)){var l=t.get(a)
-if(l.index<i)this.moveItem(l,o,s)
-else{i=l.index
-for(var u=!1,c=n+1;c<i;c++)if(!1===r[c].retained){u=!0
-break}!1===u?(this.retainItem(l,o),n=i+1):(this.moveItem(l,o,s),n++)}}else this.insertItem(o,s)}for(var d=0;d<r.length;d++){var h=r[d]
-!1===h.retained?this.deleteItem(h):h.reset()}}retainItem(e,t){var{children:n}=this;(0,r.updateRef)(e.memo,t.memo),(0,r.updateRef)(e.value,t.value),e.retained=!0,e.index=n.length,n.push(e)}insertItem(e,t){var{opcodeMap:r,bounds:n,state:o,runtime:s,children:a}=this,{key:l}=e,u=void 0===t?this.marker:t.firstNode(),c=se.forInitialRender(s.env,{element:n.parentElement(),nextSibling:u})
-o.resume(s,c).execute((t=>{t.pushUpdating()
-var n=t.enterItem(e)
-n.index=a.length,a.push(n),r.set(l,n),(0,i.associateDestroyableChild)(this,n)}))}moveItem(e,t,n){var i,{children:o}=this;(0,r.updateRef)(e.memo,t.memo),(0,r.updateRef)(e.value,t.value),e.retained=!0,void 0===n?P(e,this.marker):e.lastNode().nextSibling!==(i=n.firstNode())&&P(e,i),e.index=o.length,o.push(e)}deleteItem(e){(0,i.destroy)(e),S(e),this.opcodeMap.delete(e.key)}}class qt{constructor(e,t){this.ops=e,this.exceptionHandler=t,this.current=0}goto(e){this.current=e}nextStatement(){return this.ops[this.current++]}handleException(){this.exceptionHandler&&this.exceptionHandler.handleException()}}class Vt{constructor(e,t,r,n){this.env=e,this.updating=t,this.bounds=r,this.drop=n,(0,i.associateDestroyableChild)(this,n),(0,i.registerDestructor)(this,(()=>S(this.bounds)))}rerender(e){var{alwaysRevalidate:t=!1}=void 0===e?{alwaysRevalidate:!1}:e,{env:r,updating:n}=this
-new zt(r,{alwaysRevalidate:t}).execute(n,this)}parentElement(){return this.bounds.parentElement()}firstNode(){return this.bounds.firstNode()}lastNode(){return this.bounds.lastNode()}handleException(){throw"this should never happen"}}class Gt{constructor(e,r){void 0===e&&(e=new u.Stack),this.inner=e,this.js=(0,t.constants)(),void 0!==r&&(this.js=this.js.concat(r))}slice(e,t){var r=[]
-if(-1===e)return r
-for(var n=e;n<t;n++)r.push(this.get(n))
-return r}copy(e,t){this.inner.copy(e,t)}writeJs(e,r){var n=this.js.length
-this.js.push(r),this.inner.writeRaw(e,(0,t.encodeHandle)(n))}writeSmallInt(e,r){this.inner.writeRaw(e,(0,t.encodeImmediate)(r))}writeTrue(e){this.inner.writeRaw(e,1)}writeFalse(e){this.inner.writeRaw(e,0)}writeNull(e){this.inner.writeRaw(e,2)}writeUndefined(e){this.inner.writeRaw(e,3)}writeRaw(e,t){this.inner.writeRaw(e,t)}getJs(e){var r=this.inner.getRaw(e)
-return this.js[(0,t.decodeHandle)(r)]}getSmallInt(e){var r=this.inner.getRaw(e)
-return(0,t.decodeImmediate)(r)}get(e){var r=0|this.inner.getRaw(e)
-return(0,t.isHandle)(r)?this.js[(0,t.decodeHandle)(r)]:(0,t.decodeImmediate)(r)}reset(){this.inner.reset(),this.js.length=0}get length(){return this.inner.len()}}class Kt{constructor(){this.scope=new t.Stack,this.dynamicScope=new t.Stack,this.updating=new t.Stack,this.cache=new t.Stack,this.list=new t.Stack}}class Yt{constructor(e,r,n,i){var{pc:s,scope:a,dynamicScope:l,stack:u}=r
-this.runtime=e,this.elementStack=n,this.context=i,this[Rt]=new Kt,this[jt]=new t.Stack,this.s0=null,this.s1=null,this.t0=null,this.t1=null,this.v0=null,this.resume=Jt(this.context)
-var c=class{constructor(e,t){this.stack=e,this[v]=t}static restore(e){for(var r=new Gt,n=0;n<e.length;n++){var i=e[n]
-"number"==typeof i&&(0,t.isSmallInt)(i)?r.writeRaw(n,(0,t.encodeImmediate)(i)):!0===i?r.writeTrue(n):!1===i?r.writeFalse(n):null===i?r.writeNull(n):void 0===i?r.writeUndefined(n):r.writeJs(n,i)}return new this(r,[0,-1,e.length-1,0])}pushJs(e){this.stack.writeJs(++this[v][o.$sp],e)}pushSmallInt(e){this.stack.writeSmallInt(++this[v][o.$sp],e)}pushTrue(){this.stack.writeTrue(++this[v][o.$sp])}pushFalse(){this.stack.writeFalse(++this[v][o.$sp])}pushNull(){this.stack.writeNull(++this[v][o.$sp])}pushUndefined(){this.stack.writeUndefined(++this[v][o.$sp])}pushRaw(e){this.stack.writeRaw(++this[v][o.$sp],e)}dup(e){void 0===e&&(e=this[v][o.$sp]),this.stack.copy(e,++this[v][o.$sp])}copy(e,t){this.stack.copy(e,t)}popJs(e){void 0===e&&(e=1)
-var t=this.stack.getJs(this[v][o.$sp])
-return this[v][o.$sp]-=e,t}popSmallInt(e){void 0===e&&(e=1)
-var t=this.stack.getSmallInt(this[v][o.$sp])
-return this[v][o.$sp]-=e,t}pop(e){void 0===e&&(e=1)
-var t=this.stack.get(this[v][o.$sp])
-return this[v][o.$sp]-=e,t}peekJs(e){return void 0===e&&(e=0),this.stack.getJs(this[v][o.$sp]-e)}peekSmallInt(e){return void 0===e&&(e=0),this.stack.getSmallInt(this[v][o.$sp]-e)}peek(e){return void 0===e&&(e=0),this.stack.get(this[v][o.$sp]-e)}get(e,t){return void 0===t&&(t=this[v][o.$fp]),this.stack.get(t+e)}set(e,t,r){void 0===r&&(r=this[v][o.$fp]),this.stack.writeJs(r+t,e)}slice(e,t){return this.stack.slice(e,t)}capture(e){var t=this[v][o.$sp]+1,r=t-e
-return this.stack.slice(r,t)}reset(){this.stack.reset()}toArray(){return this.stack.slice(this[v][o.$fp],this[v][o.$sp]+1)}}.restore(u)
-c[v][o.$pc]=s,c[v][o.$sp]=u.length-1,c[v][o.$fp]=-1,this[b]=this.program.heap,this[y]=this.program.constants,this.elementStack=n,this[g].scope.push(a),this[g].dynamicScope.push(l),this[_]=new Se,this[f]=new Lt(c,this[b],e.program,{debugBefore:e=>de.debugBefore(this,e),debugAfter:e=>{de.debugAfter(this,e)}},c[v]),this.destructor={},this[m].push(this.destructor)}get stack(){return this[f].stack}get pc(){return this[f].fetchRegister(o.$pc)}fetch(e){var t=this.fetchValue(e)
-this.stack.pushJs(t)}load(e){var t=this.stack.pop()
-this.loadValue(e,t)}fetchValue(e){if((0,o.isLowLevelRegister)(e))return this[f].fetchRegister(e)
-switch(e){case o.$s0:return this.s0
-case o.$s1:return this.s1
-case o.$t0:return this.t0
-case o.$t1:return this.t1
-case o.$v0:return this.v0}}loadValue(e,t){switch((0,o.isLowLevelRegister)(e)&&this[f].loadRegister(e,t),e){case o.$s0:this.s0=t
-break
-case o.$s1:this.s1=t
-break
-case o.$t0:this.t0=t
-break
-case o.$t1:this.t1=t
-break
-case o.$v0:this.v0=t}}pushFrame(){this[f].pushFrame()}popFrame(){this[f].popFrame()}goto(e){this[f].goto(e)}call(e){this[f].call(e)}returnTo(e){this[f].returnTo(e)}return(){this[f].return()}static initial(e,t,r){var{handle:n,self:i,dynamicScope:o,treeBuilder:s,numSymbols:a,owner:l}=r,u=p.root(i,a,l),c=Qt(e.program.heap.getaddr(n),u,o),d=Jt(t)(e,c,s)
-return d.pushUpdating(),d}static empty(e,t,n){var{handle:i,treeBuilder:o,dynamicScope:s,owner:a}=t,l=Jt(n)(e,Qt(e.program.heap.getaddr(i),p.root(r.UNDEFINED_REFERENCE,0,a),s),o)
-return l.pushUpdating(),l}compile(e){return(0,t.unwrapHandle)(e.compile(this.context))}get program(){return this.runtime.program}get env(){return this.runtime.env}captureState(e,t){return void 0===t&&(t=this[f].fetchRegister(o.$pc)),{pc:t,scope:this.scope(),dynamicScope:this.dynamicScope(),stack:this.stack.capture(e)}}capture(e,t){return void 0===t&&(t=this[f].fetchRegister(o.$pc)),new Ut(this.captureState(e,t),this.resume)}beginCacheGroup(e){var t=this.updating(),r=new qe
-t.push(r),t.push(new Ve(e)),this[g].cache.push(r),(0,s.beginTrackFrame)(e)}commitCacheGroup(){var e=this.updating(),t=this[g].cache.pop(),r=(0,s.endTrackFrame)()
-e.push(new Ge(t)),t.finalize(r,e.length)}enter(e){var t=this.capture(e),r=this.elements().pushUpdatableBlock(),n=new Ht(t,this.runtime,r,[])
-this.didEnter(n)}enterItem(e){var{key:t,value:n,memo:i}=e,{stack:o}=this,s=(0,r.createIteratorItemRef)(n),a=(0,r.createIteratorItemRef)(i)
-o.pushJs(s),o.pushJs(a)
-var l=this.capture(2),u=this.elements().pushUpdatableBlock(),c=new $t(l,this.runtime,u,t,a,s)
-return this.didEnter(c),c}registerItem(e){this.listBlock().initializeChild(e)}enterList(e,t){var r=[],n=this[f].target(t),i=this.capture(0,n),o=this.elements().pushBlockList(r),s=new Wt(i,this.runtime,o,r,e)
-this[g].list.push(s),this.didEnter(s)}didEnter(e){this.associateDestroyable(e),this[m].push(e),this.updateWith(e),this.pushUpdating(e.children)}exit(){this[m].pop(),this.elements().popBlock(),this.popUpdating()}exitList(){this.exit(),this[g].list.pop()}pushUpdating(e){void 0===e&&(e=[]),this[g].updating.push(e)}popUpdating(){return this[g].updating.pop()}updateWith(e){this.updating().push(e)}listBlock(){return this[g].list.current}associateDestroyable(e){var t=this[m].current;(0,i.associateDestroyableChild)(t,e)}tryUpdating(){return this[g].updating.current}updating(){return this[g].updating.current}elements(){return this.elementStack}scope(){return this[g].scope.current}dynamicScope(){return this[g].dynamicScope.current}pushChildScope(){this[g].scope.push(this.scope().child())}pushDynamicScope(){var e=this.dynamicScope().child()
-return this[g].dynamicScope.push(e),e}pushRootScope(e,t){var r=p.sized(e,t)
-return this[g].scope.push(r),r}pushScope(e){this[g].scope.push(e)}popScope(){this[g].scope.pop()}popDynamicScope(){this[g].dynamicScope.pop()}getOwner(){return this.scope().owner}getSelf(){return this.scope().getSelf()}referenceForSymbol(e){return this.scope().getSymbol(e)}execute(e){return this._execute(e)}_execute(e){var t
-for(e&&e(this);!(t=this.next()).done;);return t.value}next(){var e,{env:t,elementStack:r}=this,n=this[f].nextStatement()
-return null!==n?(this[f].evaluateOuter(n,this),e={done:!1,value:null}):(this.stack.reset(),e={done:!0,value:new Vt(t,this.popUpdating(),r.popBlock(),this.destructor)}),e}bindDynamicScope(e){for(var t=this.dynamicScope(),r=e.length-1;r>=0;r--){var n=e[r]
-t.set(n,this.stack.popJs())}}}function Qt(e,t,r){return{pc:e,scope:t,dynamicScope:r,stack:[]}}function Jt(e){return(t,r,n)=>new Yt(t,r,n,e)}e.LowLevelVM=Yt,Rt=g,jt=m
-class Xt{constructor(e){this.vm=e}next(){return this.vm.next()}sync(){return this.vm.execute()}}var Zt="%+b:0%"
-e.SERIALIZATION_FIRST_NODE_STRING=Zt
-class er extends w{constructor(e,t,r){super(e,t),this.startingBlockDepth=r,this.candidate=null,this.injectedOmittedNode=!1,this.openBlockDepth=r-1}}class tr extends se{constructor(e,t,r){if(super(e,t,r),this.unmatchedAttributes=null,this.blockDepth=0,r)throw new Error("Rehydration with nextSibling not supported")
-for(var n=this.currentCursor.element.firstChild;null!==n&&!rr(n);)n=n.nextSibling
-this.candidate=n
-var i=ir(n)
-if(0!==i){var o=i-1,s=this.dom.createComment(`%+b:${o}%`)
-n.parentNode.insertBefore(s,this.candidate)
-for(var a=n.nextSibling;null!==a&&(!nr(a)||ir(a)!==i);)a=a.nextSibling
-var l=this.dom.createComment(`%-b:${o}%`)
-n.parentNode.insertBefore(l,a.nextSibling),this.candidate=s,this.startingBlockOffset=o}else this.startingBlockOffset=0}get currentCursor(){return this[oe].current}get candidate(){return this.currentCursor?this.currentCursor.candidate:null}set candidate(e){this.currentCursor.candidate=e}disableRehydration(e){var t=this.currentCursor
-t.candidate=null,t.nextSibling=e}enableRehydration(e){var t=this.currentCursor
-t.candidate=e,t.nextSibling=null}pushElement(e,t){void 0===t&&(t=null)
-var r=new er(e,t,this.blockDepth||0)
-null!==this.candidate&&(r.candidate=e.firstChild,this.candidate=e.nextSibling),this[oe].push(r)}clearMismatch(e){var t=e,r=this.currentCursor
-if(null!==r){var n=r.openBlockDepth
-if(n>=r.startingBlockDepth)for(;t;){if(nr(t))if(n>=or(t,this.startingBlockOffset))break
-t=this.remove(t)}else for(;null!==t;)t=this.remove(t)
-this.disableRehydration(t)}}__openBlock(){var{currentCursor:e}=this
-if(null!==e){var t=this.blockDepth
-this.blockDepth++
-var{candidate:r}=e
-if(null!==r){var{tagName:n}=e.element
-rr(r)&&or(r,this.startingBlockOffset)===t?(this.candidate=this.remove(r),e.openBlockDepth=t):"TITLE"!==n&&"SCRIPT"!==n&&"STYLE"!==n&&this.clearMismatch(r)}}}__closeBlock(){var{currentCursor:e}=this
-if(null!==e){var t=e.openBlockDepth
-this.blockDepth--
-var{candidate:r}=e,n=!1
-if(null!==r)if(n=!0,nr(r)&&or(r,this.startingBlockOffset)===t){var i=this.remove(r)
-this.candidate=i,e.openBlockDepth--}else this.clearMismatch(r),n=!1
-if(!1===n){var o=e.nextSibling
-if(null!==o&&nr(o)&&or(o,this.startingBlockOffset)===this.blockDepth){var s=this.remove(o)
-this.enableRehydration(s),e.openBlockDepth--}}}}__appendNode(e){var{candidate:t}=this
-return t||super.__appendNode(e)}__appendHTML(e){var t=this.markerBounds()
-if(t){var r=t.firstNode(),n=t.lastNode(),i=new O(this.element,r.nextSibling,n.previousSibling),o=this.remove(r)
-return this.remove(n),null!==o&&lr(o)&&(this.candidate=this.remove(o),null!==this.candidate&&this.clearMismatch(this.candidate)),i}return super.__appendHTML(e)}remove(e){var t=e.parentNode,r=e.nextSibling
-return t.removeChild(e),r}markerBounds(){var e=this.candidate
-if(e&&ar(e)){for(var t=e,r=t.nextSibling;r&&!ar(r);)r=r.nextSibling
-return new O(this.element,t,r)}return null}__appendText(e){var{candidate:t}=this
-return t?3===t.nodeType?(t.nodeValue!==e&&(t.nodeValue=e),this.candidate=t.nextSibling,t):function(e){return 8===e.nodeType&&"%|%"===e.nodeValue}(t)||lr(t)&&""===e?(this.candidate=this.remove(t),this.__appendText(e)):(this.clearMismatch(t),super.__appendText(e)):super.__appendText(e)}__appendComment(e){var t=this.candidate
-return t&&8===t.nodeType?(t.nodeValue!==e&&(t.nodeValue=e),this.candidate=t.nextSibling,t):(t&&this.clearMismatch(t),super.__appendComment(e))}__openElement(e){var t=this.candidate
-if(t&&sr(t)&&function(e,t){if("http://www.w3.org/2000/svg"===e.namespaceURI)return e.tagName===t
-return e.tagName===t.toUpperCase()}(t,e))return this.unmatchedAttributes=[].slice.call(t.attributes),t
-if(t){if(sr(t)&&"TBODY"===t.tagName)return this.pushElement(t,null),this.currentCursor.injectedOmittedNode=!0,this.__openElement(e)
-this.clearMismatch(t)}return super.__openElement(e)}__setAttribute(e,t,r){var n=this.unmatchedAttributes
-if(n){var i=ur(n,e)
-if(i)return i.value!==t&&(i.value=t),void n.splice(n.indexOf(i),1)}return super.__setAttribute(e,t,r)}__setProperty(e,t){var r=this.unmatchedAttributes
-if(r){var n=ur(r,e)
-if(n)return n.value!==t&&(n.value=t),void r.splice(r.indexOf(n),1)}return super.__setProperty(e,t)}__flushElement(e,t){var{unmatchedAttributes:r}=this
-if(r){for(var n=0;n<r.length;n++)this.constructing.removeAttribute(r[n].name)
-this.unmatchedAttributes=null}else super.__flushElement(e,t)}willCloseElement(){var{candidate:e,currentCursor:t}=this
-null!==e&&this.clearMismatch(e),t&&t.injectedOmittedNode&&this.popElement(),super.willCloseElement()}getMarker(e,t){var r=e.querySelector(`script[glmr="${t}"]`)
-return r||null}__pushRemoteElement(e,t,r){var n=this.getMarker(e,t)
-if(void 0===r){for(;null!==e.firstChild&&e.firstChild!==n;)this.remove(e.firstChild)
-r=null}var i=new er(e,null,this.blockDepth)
-this[oe].push(i),null===n?this.disableRehydration(r):this.candidate=this.remove(n)
-var o=new le(e)
-return this.pushLiveBlock(o,!0)}didAppendBounds(e){if(super.didAppendBounds(e),this.candidate){var t=e.lastNode()
-this.candidate=t&&t.nextSibling}return e}}function rr(e){return 8===e.nodeType&&0===e.nodeValue.lastIndexOf("%+b:",0)}function nr(e){return 8===e.nodeType&&0===e.nodeValue.lastIndexOf("%-b:",0)}function ir(e){return parseInt(e.nodeValue.slice(4),10)}function or(e,t){return ir(e)-t}function sr(e){return 1===e.nodeType}function ar(e){return 8===e.nodeType&&"%glmr%"===e.nodeValue}function lr(e){return 8===e.nodeType&&"% %"===e.nodeValue}function ur(e,t){for(var r=0;r<e.length;r++){var n=e[r]
-if(n.name===t)return n}}e.RehydrateBuilder=tr
-function cr(e){return(0,s.getValue)(e.argsCache)}class dr{constructor(e,t){void 0===t&&(t=()=>ze)
-var r=(0,s.createCache)((()=>t(e)))
-this.argsCache=r}get named(){return cr(this).named||Fe}get positional(){return cr(this).positional||Le}}function hr(e){return(0,a.setInternalHelperManager)(e,{})}var pr=(0,t.buildUntouchableThis)("`fn` helper"),fr=hr((e=>{var{positional:t}=e,n=t[0]
-return(0,r.createComputeRef)((()=>function(){var[e,...i]=(0,d.reifyPositional)(t)
-for(var o=arguments.length,s=new Array(o),a=0;a<o;a++)s[a]=arguments[a]
-if((0,r.isInvokableRef)(n)){var l=i.length>0?i[0]:s[0]
-return(0,r.updateRef)(n,l)}return e.call(pr,...i,...s)}),null,"fn")}))
-e.fn=fr
-var mr=hr((e=>{var{named:t}=e
-return(0,r.createComputeRef)((()=>(0,d.reifyNamed)(t)),null,"hash")}))
-e.hash=mr
-var gr=hr((e=>{var{positional:t}=e
-return(0,r.createComputeRef)((()=>(0,d.reifyPositional)(t)),null,"array")}))
-e.array=gr
-var vr=hr((e=>{var i,o,{positional:s}=e,a=null!==(i=s[0])&&void 0!==i?i:r.UNDEFINED_REFERENCE,l=null!==(o=s[1])&&void 0!==o?o:r.UNDEFINED_REFERENCE
-return(0,r.createComputeRef)((()=>{var e=(0,r.valueForRef)(a)
-if((0,t.isDict)(e))return(0,n.getPath)(e,String((0,r.valueForRef)(l)))}),(e=>{var i=(0,r.valueForRef)(a)
-if((0,t.isDict)(i))return(0,n.setPath)(i,String((0,r.valueForRef)(l)),e)}),"get")}))
-e.get=vr
-var br=e=>(e=>null==e||"function"!=typeof e.toString)(e)?"":String(e),yr=hr((e=>{var{positional:t}=e
-return(0,r.createComputeRef)((()=>(0,d.reifyPositional)(t).map(br).join("")),null,"concat")}))
-e.concat=yr
-var _r=(0,t.buildUntouchableThis)("`on` modifier"),wr=(()=>{try{var e,t=document.createElement("div"),r=0
-return t.addEventListener("click",(()=>r++),{once:!0}),"function"==typeof Event?e=new Event("click"):(e=document.createEvent("Event")).initEvent("click",!0,!0),t.dispatchEvent(e),t.dispatchEvent(e),1===r}catch(n){return!1}})()
-class Or{constructor(e,t){this.tag=(0,s.createUpdatableTag)(),this.shouldUpdate=!0,this.element=e,this.args=t}updateFromArgs(){var e,{args:t}=this,{once:n,passive:i,capture:o}=(0,d.reifyNamed)(t.named)
-n!==this.once&&(this.once=n,this.shouldUpdate=!0),i!==this.passive&&(this.passive=i,this.shouldUpdate=!0),o!==this.capture&&(this.capture=o,this.shouldUpdate=!0),n||i||o?e=this.options={once:n,passive:i,capture:o}:this.options=void 0
-var s=(0,r.valueForRef)(t.positional[0])
-s!==this.eventName&&(this.eventName=s,this.shouldUpdate=!0)
-var a=t.positional[1],l=(0,r.valueForRef)(a)
-l!==this.userProvidedCallback&&(this.userProvidedCallback=l,this.shouldUpdate=!0)
-var u=!1===wr&&n||!1
-if(this.shouldUpdate)if(u)var c=this.callback=function(t){return!wr&&n&&Sr(this,s,c,e),l.call(_r,t)}
-else this.callback=l}}var xr=0,Pr=0
-function Sr(e,t,r,n){Pr++,wr?e.removeEventListener(t,r,n):void 0!==n&&n.capture?e.removeEventListener(t,r,!0):e.removeEventListener(t,r)}function Tr(e,t,r,n){xr++,wr?e.addEventListener(t,r,n):void 0!==n&&n.capture?e.addEventListener(t,r,!0):e.addEventListener(t,r)}var Er=(0,a.setInternalModifierManager)(new class{constructor(){this.SUPPORTS_EVENT_OPTIONS=wr}getDebugName(){return"on"}get counters(){return{adds:xr,removes:Pr}}create(e,t,r,n){return new Or(t,n)}getTag(e){return null===e?null:e.tag}install(e){if(null!==e){e.updateFromArgs()
-var{element:t,eventName:r,callback:n,options:o}=e
-Tr(t,r,n,o),(0,i.registerDestructor)(e,(()=>Sr(t,r,n,o))),e.shouldUpdate=!1}}update(e){if(null!==e){var{element:t,eventName:r,callback:n,options:i}=e
-e.updateFromArgs(),e.shouldUpdate&&(Sr(t,r,n,i),Tr(e.element,e.eventName,e.callback,e.options),e.shouldUpdate=!1)}}getDestroyable(e){return e}},{})
-e.on=Er})),e("@glimmer/tracking/index",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"tracked",{enumerable:!0,get:function(){return t.tracked}})})),e("@glimmer/tracking/primitives/cache",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"createCache",{enumerable:!0,get:function(){return t.createCache}}),Object.defineProperty(e,"getValue",{enumerable:!0,get:function(){return t.getValue}}),Object.defineProperty(e,"isConst",{enumerable:!0,get:function(){return t.isConst}})})),e("@glimmer/util",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.assertNever=function(e,t){void 0===t&&(t="unexpected unreachable branch")
-throw j.log("unreachable",e),j.log(`${t} :: ${JSON.stringify(e)} (${e})`),new Error("code reached unreachable")},e.assert=function(e,t){if(!e)throw new Error(t||"assertion failure")},e.deprecate=function(e){R.warn(`DEPRECATION: ${e}`)},e.dict=l,e.isDict=function(e){return null!=e},e.isObject=function(e){return"function"==typeof e||"object"==typeof e&&null!==e},e.ensureGuid=a,e.initializeGuid=s,e.isSerializationFirstNode=function(e){return e.nodeValue===c},e.fillNulls=function(e){for(var t=new Array(e),r=0;r<e;r++)t[r]=null
-return t},e.values=function(e){var t=[]
-for(var r in e)t.push(e[r])
-return t},e.castToSimple=function(e){return E(e)||function(e){e.nodeType}(e),e},e.castToBrowser=function(e,t){if(null==e)return null
-if(void 0===typeof document)throw new Error("Attempted to cast to a browser node in a non-browser context")
-if(E(e))return e
-if(e.ownerDocument!==document)throw new Error("Attempted to cast to a browser node with a node that was not created from this document")
-return C(e,t)},e.checkNode=C,e.intern=p,e.buildUntouchableThis=function(e){var t=null
-return t},e.emptyArray=r,e.isEmptyArray=function(e){return e===t},e.clearElement=function(e){var t=e.firstChild
-for(;t;){var r=t.nextSibling
-e.removeChild(t),t=r}},e.keys=function(e){return Object.keys(e)},e.unwrap=function(e){if(null==e)throw new Error("Expected value to be present")
-return e},e.expect=function(e,t){if(null==e)throw new Error(t)
-return e},e.unreachable=g,e.exhausted=function(e){throw new Error(`Exhausted ${e}`)},e.enumerableSymbol=v,e.strip=function(e){for(var t="",r=arguments.length,n=new Array(r>1?r-1:0),i=1;i<r;i++)n[i-1]=arguments[i]
-for(var o=0;o<e.length;o++){var s=e[o],a=void 0!==n[o]?String(n[o]):""
-t+=`${s}${a}`}var l=t.split("\n")
-for(;l.length&&l[0].match(/^\s*$/);)l.shift()
-for(;l.length&&l[l.length-1].match(/^\s*$/);)l.pop()
-var u=1/0
-for(var c of l){var d=c.match(/^\s*/)[0].length
-u=Math.min(u,d)}var h=[]
-for(var p of l)h.push(p.slice(u))
-return h.join("\n")},e.isHandle=function(e){return e>=0},e.isNonPrimitiveHandle=function(e){return e>3},e.constants=function(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return[!1,!0,null,void 0,...t]}
-e.isSmallInt=function(e){return e%1==0&&e<=536870911&&e>=-536870912},e.encodeNegative=y,e.decodeNegative=_,e.encodePositive=w,e.decodePositive=O,e.encodeHandle=function(e){return e},e.decodeHandle=function(e){return e},e.encodeImmediate=x,e.decodeImmediate=P,e.unwrapHandle=function(e){if("number"==typeof e)return e
-var t=e.errors[0]
-throw new Error(`Compile Error: ${t.problem} @ ${t.span.start}..${t.span.end}`)},e.unwrapTemplate=function(e){if("error"===e.result)throw new Error(`Compile Error: ${e.problem} @ ${e.span.start}..${e.span.end}`)
-return e},e.extractHandle=function(e){return"number"==typeof e?e:e.handle},e.isOkHandle=function(e){return"number"==typeof e},e.isErrHandle=function(e){return"number"==typeof e},e.isPresent=M,e.ifPresent=function(e,t,r){return M(e)?t(e):r()},e.toPresentOption=function(e){return M(e)?e:null},e.assertPresent=function(e,t){void 0===t&&(t="unexpected empty list")
-if(!M(e))throw new Error(t)},e.mapPresent=function(e,t){if(null===e)return null
-var r=[]
-for(var n of e)r.push(t(n))
-return r},e.symbol=e.tuple=e.HAS_NATIVE_SYMBOL=e.HAS_NATIVE_PROXY=e.EMPTY_NUMBER_ARRAY=e.EMPTY_STRING_ARRAY=e.EMPTY_ARRAY=e.verifySteps=e.logStep=e.endTestSteps=e.beginTestSteps=e.debugToString=e._WeakSet=e.assign=e.SERIALIZATION_FIRST_NODE_STRING=e.NonemptyStack=e.Stack=e.DictSet=e.LOGGER=e.LOCAL_LOGGER=void 0
-var t=Object.freeze([])
-function r(){return t}e.EMPTY_ARRAY=t
-var n=r()
-e.EMPTY_STRING_ARRAY=n
-var i=r()
-e.EMPTY_NUMBER_ARRAY=i
-var o=0
-function s(e){return e._guid=++o}function a(e){return e._guid||s(e)}function l(){return Object.create(null)}e.DictSet=class{constructor(){this.dict=l()}add(e){return"string"==typeof e?this.dict[e]=e:this.dict[a(e)]=e,this}delete(e){"string"==typeof e?delete this.dict[e]:e._guid&&delete this.dict[e._guid]}}
-e.Stack=class{constructor(e){void 0===e&&(e=[]),this.current=null,this.stack=e}get size(){return this.stack.length}push(e){this.current=e,this.stack.push(e)}pop(){var e=this.stack.pop(),t=this.stack.length
-return this.current=0===t?null:this.stack[t-1],void 0===e?null:e}nth(e){var t=this.stack.length
-return t<e?null:this.stack[t-e]}isEmpty(){return 0===this.stack.length}toArray(){return this.stack}}
-e.NonemptyStack=class{constructor(e){this.stack=e,this.current=e[e.length-1]}get size(){return this.stack.length}push(e){this.current=e,this.stack.push(e)}pop(){if(1===this.stack.length)throw new Error("cannot pop the last element of a NonemptyStack")
-var e=this.stack.pop(),t=this.stack.length
-return this.current=this.stack[t-1],e}nth(e){return e>=this.stack.length?null:this.stack[e]}nthBack(e){var t=this.stack.length
-return t<e?null:this.stack[t-e]}toArray(){return this.stack}}
-var u,c="%+b:0%"
-e.SERIALIZATION_FIRST_NODE_STRING=c
-var{keys:d}=Object
-var h=null!==(u=Object.assign)&&void 0!==u?u:function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t]
-if(null!==r&&"object"==typeof r)for(var n=d(r),i=0;i<n.length;i++){var o=n[i]
-e[o]=r[o]}}return e}
-function p(e){var t={}
-for(var r in t[e]=1,t)if(r===e)return r
-return e}e.assign=h
-var f="function"==typeof Proxy
-e.HAS_NATIVE_PROXY=f
-var m="function"==typeof Symbol&&"symbol"==typeof Symbol()
-function g(e){return void 0===e&&(e="unreachable"),new Error(e)}e.HAS_NATIVE_SYMBOL=m
-function v(e){return p(`__${e}${Math.floor(Math.random()*Date.now())}__`)}e.tuple=function(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return t}
-var b=m?Symbol:v
-function y(e){return-536870913&e}function _(e){return 536870912|e}function w(e){return~e}function O(e){return~e}function x(e){return(e|=0)<0?y(e):w(e)}function P(e){return(e|=0)>-536870913?O(e):_(e)}e.symbol=b,[1,-1].forEach((e=>P(x(e))))
-var S,T="function"==typeof WeakSet?WeakSet:class{constructor(){this._map=new WeakMap}add(e){return this._map.set(e,!0),this}delete(e){return this._map.delete(e)}has(e){return this._map.has(e)}}
-function E(e){return 9===e.nodeType}function C(e,t){var r=!1
-if(null!==e)if("string"==typeof t)r=k(e,t)
-else{if(!Array.isArray(t))throw g()
-r=t.some((t=>k(e,t)))}if(r)return e
-throw function(e,t){return new Error(`cannot cast a ${e} into ${t}`)}(`SimpleElement(${e})`,t)}function k(e,t){switch(t){case"NODE":return!0
-case"HTML":return e instanceof HTMLElement
-case"SVG":return e instanceof SVGElement
-case"ELEMENT":return e instanceof Element
-default:if(t.toUpperCase()===t)throw new Error("BUG: this code is missing handling for a generic node type")
-return e instanceof Element&&e.tagName.toLowerCase()===t}}function M(e){return e.length>0}e._WeakSet=T
-var A=S
-e.debugToString=A,e.beginTestSteps=undefined,e.endTestSteps=undefined,e.verifySteps=undefined,e.logStep=undefined
-var R=console
-e.LOCAL_LOGGER=R
-var j=console
-e.LOGGER=j})),e("@glimmer/validator",["exports","@ember/polyfills","@glimmer/global-context"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.bump=function(){h++},e.createTag=function(){return new b(0)},e.createUpdatableTag=w,e.isConstTag=x,e.validateTag=m,e.valueForTag=f,e.dirtyTagFor=j,e.tagFor=D,e.tagMetaFor=I,e.beginTrackFrame=z,e.endTrackFrame=U,e.beginUntrackFrame=B,e.endUntrackFrame=H,e.resetTracking=function(){for(;L.length>0;)L.pop()
-F=null,!1},e.consumeTag=$,e.isTracking=function(){return null!==F},e.track=function(e,t){var r
-z(t)
-try{e()}finally{r=U()}return r},e.untrack=function(e){B()
-try{return e()}finally{H()}},e.createCache=function(e,t){0
-var r={[W]:e,[q]:void 0,[V]:void 0,[G]:-1}
-0
-return r},e.isConst=function(e){K(e,"isConst")
-var t=e[V]
-return function(e,t){0}(),x(t)},e.getValue=function(e){K(e,"getValue")
-var t=e[W],r=e[V],n=e[G]
-if(void 0!==r&&m(r,n))$(r)
-else{z()
-try{e[q]=t()}finally{r=U(),e[V]=r,e[G]=f(r),$(r)}}return e[q]},e.trackedData=function(e,t){var r=new WeakMap,n="function"==typeof t
-return{getter:function(i){var o
-return $(D(i,e)),n&&!r.has(i)?(o=t.call(i),r.set(i,o)):o=r.get(i),o},setter:function(t,n){j(t,e),r.set(t,n)}}},e.deprecateMutationsInTrackingTransaction=e.endTrackingTransaction=e.beginTrackingTransaction=e.runInTrackingTransaction=e.setTrackingTransactionEnv=e.logTrackingStack=e.VOLATILE=e.VOLATILE_TAG=e.VolatileTag=e.updateTag=e.INITIAL=e.dirtyTag=e.CURRENT_TAG=e.CurrentTag=e.CONSTANT=e.CONSTANT_TAG=e.COMPUTE=e.combine=e.ALLOW_CYCLES=void 0
-var n,i,o,s,a,l,u="undefined"!=typeof Symbol?Symbol:e=>`__${e}${Math.floor(Math.random()*Date.now())}__`,c="undefined"!=typeof Symbol?Symbol.for:e=>`__GLIMMER_VALIDATOR_SYMBOL_FOR_${e}`
-function d(e){if(null==e)throw new Error("Expected value to be present")
-return e}e.beginTrackingTransaction=n,e.endTrackingTransaction=i,e.runInTrackingTransaction=o,e.deprecateMutationsInTrackingTransaction=s,e.setTrackingTransactionEnv=a,e.logTrackingStack=l
-e.CONSTANT=0
-e.INITIAL=1
-e.VOLATILE=NaN
-var h=1
-var p=u("TAG_COMPUTE")
-function f(e){return e[p]()}function m(e,t){return t>=e[p]()}e.COMPUTE=p
-var g,v=u("TAG_TYPE")
-e.ALLOW_CYCLES=g
-class b{constructor(e){this.revision=1,this.lastChecked=1,this.lastValue=1,this.isUpdating=!1,this.subtag=null,this.subtagBufferCache=null,this[v]=e}static combine(e){switch(e.length){case 0:return O
-case 1:return e[0]
-default:var t=new b(2)
-return t.subtag=e,t}}[p](){var{lastChecked:e}=this
-if(!0===this.isUpdating)this.lastChecked=++h
-else if(e!==h){this.isUpdating=!0,this.lastChecked=h
-try{var{subtag:t,revision:r}=this
-if(null!==t)if(Array.isArray(t))for(var n=0;n<t.length;n++){var i=t[n][p]()
-r=Math.max(i,r)}else{var o=t[p]()
-o===this.subtagBufferCache?r=Math.max(r,this.lastValue):(this.subtagBufferCache=null,r=Math.max(r,o))}this.lastValue=r}finally{this.isUpdating=!1}}return this.lastValue}static updateTag(e,t){var r=e,n=t
-n===O?r.subtag=null:(r.subtagBufferCache=n[p](),r.subtag=n)}static dirtyTag(e,t){e.revision=++h,(0,r.scheduleRevalidate)()}}var y=b.dirtyTag
-e.dirtyTag=y
-var _=b.updateTag
-function w(){return new b(1)}e.updateTag=_
-var O=new b(3)
-function x(e){return e===O}e.CONSTANT_TAG=O
-class P{[p](){return NaN}}e.VolatileTag=P
-var S=new P
-e.VOLATILE_TAG=S
-class T{[p](){return h}}e.CurrentTag=T
-var E=new T
-e.CURRENT_TAG=E
-var C=b.combine
-e.combine=C
-var k=w(),M=w(),A=w()
-f(k),y(k),f(k),_(k,C([M,A])),f(k),y(M),f(k),y(A),f(k),_(k,A),f(k),y(A),f(k)
-var R=new WeakMap
-function j(e,t,r){var n=void 0===r?R.get(e):r
-if(void 0!==n){var i=n.get(t)
-void 0!==i&&y(i,!0)}}function I(e){var t=R.get(e)
-return void 0===t&&(t=new Map,R.set(e,t)),t}function D(e,t,r){var n=void 0===r?I(e):r,i=n.get(t)
-return void 0===i&&(i=w(),n.set(t,i)),i}class N{constructor(){this.tags=new Set,this.last=null}add(e){e!==O&&(this.tags.add(e),this.last=e)}combine(){var{tags:e}=this
-if(0===e.size)return O
-if(1===e.size)return this.last
-var t=[]
-return e.forEach((e=>t.push(e))),C(t)}}var F=null,L=[]
-function z(e){L.push(F),F=new N}function U(){var e=F
-return F=L.pop()||null,d(e).combine()}function B(){L.push(F),F=null}function H(){F=L.pop()||null}function $(e){null!==F&&F.add(e)}var W=u("FN"),q=u("LAST_VALUE"),V=u("TAG"),G=u("SNAPSHOT")
-u("DEBUG_LABEL")
-function K(e,t){0}var Y=c("GLIMMER_VALIDATOR_REGISTRATION"),Q=function(){if("undefined"!=typeof globalThis)return globalThis
-if("undefined"!=typeof self)return self
-if("undefined"!=typeof window)return window
-if("undefined"!=typeof global)return global
-throw new Error("unable to locate global object")}()
-if(!0===Q[Y])throw new Error("The `@glimmer/validator` library has been included twice in this application. It could be different versions of the package, or the same version included twice by mistake. `@glimmer/validator` depends on having a single copy of the package in use at any time in an application, even if they are the same version. You must dedupe your build to remove the duplicate packages in order to prevent this error.")
-Q[Y]=!0})),e("@glimmer/vm",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.isMachineOp=function(e){return e>=0&&e<=15},e.isOp=function(e){return e>=16},e.isLowLevelRegister=function(e){return e<=3},e.$v0=e.$t1=e.$t0=e.$s1=e.$s0=e.$sp=e.$ra=e.$fp=e.$pc=e.TemporaryRegister=e.SavedRegister=void 0
-e.$pc=0
-e.$ra=1
-e.$fp=2
-e.$sp=3
-e.$s0=4
-e.$s1=5
-e.$t0=6
-e.$t1=7
-var t,r
-e.$v0=8,e.SavedRegister=t,function(e){e[e.s0=4]="s0",e[e.s1=5]="s1"}(t||(e.SavedRegister=t={})),e.TemporaryRegister=r,function(e){e[e.t0=6]="t0",e[e.t1=7]="t1"}(r||(e.TemporaryRegister=r={}))})),e("@glimmer/wire-format",["exports"],(function(e){"use strict"
-function t(e){return function(t){return Array.isArray(t)&&t[0]===e}}Object.defineProperty(e,"__esModule",{value:!0}),e.is=t,e.isAttribute=function(e){return 14===e[0]||15===e[0]||22===e[0]||16===e[0]||24===e[0]||23===e[0]||17===e[0]||4===e[0]},e.isStringLiteral=function(e){return"string"==typeof e},e.getStringFromValue=function(e){return e},e.isArgument=function(e){return 21===e[0]||20===e[0]},e.isHelper=function(e){return Array.isArray(e)&&28===e[0]},e.isGet=e.isFlushElement=void 0
-var r=t(12)
-e.isFlushElement=r
-var n=t(30)
-e.isGet=n})),e("@simple-dom/document",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=[]
-function r(e,t,r){for(var n=0;n<e.length;n++){var i=e[n]
-if(i.namespaceURI===t&&i.localName===r)return n}return-1}function n(e,t){return"http://www.w3.org/1999/xhtml"===e?t.toLowerCase():t}function i(e,t,n){var i=r(e,t,n)
-return-1===i?null:e[i].value}function o(e,t,n){var i=r(e,t,n);-1!==i&&e.splice(i,1)}function s(e,n,i,o,s){"string"!=typeof s&&(s=""+s)
-var{attributes:a}=e
-if(a===t)a=e.attributes=[]
-else{var l=r(a,n,o)
-if(-1!==l)return void(a[l].value=s)}a.push({localName:o,name:null===i?o:i+":"+o,namespaceURI:n,prefix:i,specified:!0,value:s})}class a{constructor(e){this.node=e,this.stale=!0,this._length=0}get length(){if(this.stale){this.stale=!1
-for(var e=0,t=this.node.firstChild;null!==t;e++)this[e]=t,t=t.nextSibling
-var r=this._length
-for(this._length=e;e<r;e++)delete this[e]}return this._length}item(e){return e<this.length?this[e]:null}}function l(e,r){var n=function(e){var r
-1===e.nodeType&&(r=e.namespaceURI)
-var n=new h(e.ownerDocument,e.nodeType,e.nodeName,e.nodeValue,r)
-1===e.nodeType&&(n.attributes=function(e){if(e===t)return t
-for(var r=[],n=0;n<e.length;n++){var i=e[n]
-r.push({localName:i.localName,name:i.name,namespaceURI:i.namespaceURI,prefix:i.prefix,specified:!0,value:i.value})}return r}(e.attributes))
-return n}(e)
-if(r)for(var i=e.firstChild,o=i;null!==i;)o=i.nextSibling,n.appendChild(i.cloneNode(!0)),i=o
-return n}function u(e,t,r){d(e),function(e,t,r,n){if(11===t.nodeType)return void function(e,t,r,n){var i=e.firstChild
-if(null===i)return
-e.firstChild=null,e.lastChild=null
-var o=i,s=i
-i.previousSibling=r,null===r?t.firstChild=i:r.nextSibling=i
-for(;null!==s;)s.parentNode=t,o=s,s=s.nextSibling
-o.nextSibling=n,null===n?t.lastChild=o:n.previousSibling=o}(t,e,r,n)
-null!==t.parentNode&&c(t.parentNode,t)
-t.parentNode=e,t.previousSibling=r,t.nextSibling=n,null===r?e.firstChild=t:r.nextSibling=t
-null===n?e.lastChild=t:n.previousSibling=t}(e,t,null===r?e.lastChild:r.previousSibling,r)}function c(e,t){d(e),function(e,t,r,n){t.parentNode=null,t.previousSibling=null,t.nextSibling=null,null===r?e.firstChild=n:r.nextSibling=n
-null===n?e.lastChild=r:n.previousSibling=r}(e,t,t.previousSibling,t.nextSibling)}function d(e){var t=e._childNodes
-void 0!==t&&(t.stale=!0)}class h{constructor(e,r,n,i,o){this.ownerDocument=e,this.nodeType=r,this.nodeName=n,this.nodeValue=i,this.namespaceURI=o,this.parentNode=null,this.previousSibling=null,this.nextSibling=null,this.firstChild=null,this.lastChild=null,this.attributes=t,this._childNodes=void 0}get tagName(){return this.nodeName}get childNodes(){var e=this._childNodes
-return void 0===e&&(e=this._childNodes=new a(this)),e}cloneNode(e){return l(this,!0===e)}appendChild(e){return u(this,e,null),e}insertBefore(e,t){return u(this,e,t),e}removeChild(e){return c(this,e),e}insertAdjacentHTML(e,t){var r,n,i=new h(this.ownerDocument,-1,"#raw",t,void 0)
-switch(e){case"beforebegin":r=this.parentNode,n=this
-break
-case"afterbegin":r=this,n=this.firstChild
-break
-case"beforeend":r=this,n=null
-break
-case"afterend":r=this.parentNode,n=this.nextSibling
-break
-default:throw new Error("invalid position")}if(null===r)throw new Error(`${e} requires a parentNode`)
-u(r,i,n)}getAttribute(e){var t=n(this.namespaceURI,e)
-return i(this.attributes,null,t)}getAttributeNS(e,t){return i(this.attributes,e,t)}setAttribute(e,t){s(this,null,null,n(this.namespaceURI,e),t)}setAttributeNS(e,t,r){var[n,i]=function(e){var t=e,r=null,n=e.indexOf(":")
-return-1!==n&&(r=e.slice(0,n),t=e.slice(n+1)),[r,t]}(t)
-s(this,e,n,i,r)}removeAttribute(e){var t=n(this.namespaceURI,e)
-o(this.attributes,null,t)}removeAttributeNS(e,t){o(this.attributes,e,t)}get doctype(){return this.firstChild}get documentElement(){return this.lastChild}get head(){return this.documentElement.firstChild}get body(){return this.documentElement.lastChild}createElement(e){return new h(this,1,e.toUpperCase(),null,"http://www.w3.org/1999/xhtml")}createElementNS(e,t){var r="http://www.w3.org/1999/xhtml"===e?t.toUpperCase():t
-return new h(this,1,r,null,e)}createTextNode(e){return new h(this,3,"#text",e,void 0)}createComment(e){return new h(this,8,"#comment",e,void 0)}createRawHTMLSection(e){return new h(this,-1,"#raw",e,void 0)}createDocumentFragment(){return new h(this,11,"#document-fragment",null,void 0)}}var p=function(){var e=new h(null,9,"#document",null,"http://www.w3.org/1999/xhtml"),t=new h(e,10,"html",null,"http://www.w3.org/1999/xhtml"),r=new h(e,1,"HTML",null,"http://www.w3.org/1999/xhtml"),n=new h(e,1,"HEAD",null,"http://www.w3.org/1999/xhtml"),i=new h(e,1,"BODY",null,"http://www.w3.org/1999/xhtml")
-return r.appendChild(n),r.appendChild(i),e.appendChild(t),e.appendChild(r),e}
-e.default=p}))
-e("backburner",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.buildPlatform=i,e.default=void 0
-var t=setTimeout,r=()=>{}
-function n(e){if("function"==typeof Promise){var r=Promise.resolve()
-return()=>r.then(e)}if("function"==typeof MutationObserver){var n=0,i=new MutationObserver(e),o=document.createTextNode("")
-return i.observe(o,{characterData:!0}),()=>(n=++n%2,o.data=""+n,n)}return()=>t(e,0)}function i(e){var t=r
-return{setTimeout:(e,t)=>setTimeout(e,t),clearTimeout:e=>clearTimeout(e),now:()=>Date.now(),next:n(e),clearNext:t}}var o=/\d+/
-function s(e){var t=typeof e
-return"number"===t&&e==e||"string"===t&&o.test(e)}function a(e){return e.onError||e.onErrorTarget&&e.onErrorTarget[e.onErrorMethod]}function l(e,t,r){for(var n=-1,i=0,o=r.length;i<o;i+=4)if(r[i]===e&&r[i+1]===t){n=i
-break}return n}function u(e,t,r){for(var n=-1,i=2,o=r.length;i<o;i+=6)if(r[i]===e&&r[i+1]===t){n=i-2
-break}return n}function c(e,t,r){void 0===r&&(r=0)
-for(var n=[],i=0;i<e.length;i+=t){var o=e[i+3+r],s={target:e[i+0+r],method:e[i+1+r],args:e[i+2+r],stack:void 0!==o&&"stack"in o?o.stack:""}
-n.push(s)}return n}function d(e,t){for(var r,n,i=0,o=t.length-6;i<o;)e>=t[r=i+(n=(o-i)/6)-n%6]?i=r+6:o=r
-return e>=t[i]?i+6:i}class h{constructor(e,t,r){void 0===t&&(t={}),void 0===r&&(r={}),this._queueBeingFlushed=[],this.targetQueues=new Map,this.index=0,this._queue=[],this.name=e,this.options=t,this.globalOptions=r}stackFor(e){if(e<this._queue.length){var t=this._queue[3*e+4]
-return t?t.stack:null}}flush(e){var t,r,{before:n,after:i}=this.options
-this.targetQueues.clear(),0===this._queueBeingFlushed.length&&(this._queueBeingFlushed=this._queue,this._queue=[]),void 0!==n&&n()
-var o=this._queueBeingFlushed
-if(o.length>0){var s=a(this.globalOptions)
-r=s?this.invokeWithOnError:this.invoke
-for(var l=this.index;l<o.length;l+=4)if(this.index+=4,null!==(t=o[l+1])&&r(o[l],t,o[l+2],s,o[l+3]),this.index!==this._queueBeingFlushed.length&&this.globalOptions.mustYield&&this.globalOptions.mustYield())return 1}void 0!==i&&i(),this._queueBeingFlushed.length=0,this.index=0,!1!==e&&this._queue.length>0&&this.flush(!0)}hasWork(){return this._queueBeingFlushed.length>0||this._queue.length>0}cancel(e){var{target:t,method:r}=e,n=this._queue,i=this.targetQueues.get(t)
-void 0!==i&&i.delete(r)
-var o=l(t,r,n)
-return o>-1?(n.splice(o,4),!0):(o=l(t,r,n=this._queueBeingFlushed))>-1&&(n[o+1]=null,!0)}push(e,t,r,n){return this._queue.push(e,t,r,n),{queue:this,target:e,method:t}}pushUnique(e,t,r,n){var i=this.targetQueues.get(e)
-void 0===i&&(i=new Map,this.targetQueues.set(e,i))
-var o=i.get(t)
-if(void 0===o){var s=this._queue.push(e,t,r,n)-4
-i.set(t,s)}else{var a=this._queue
-a[o+2]=r,a[o+3]=n}return{queue:this,target:e,method:t}}_getDebugInfo(e){if(e)return c(this._queue,4)}invoke(e,t,r){void 0===r?t.call(e):t.apply(e,r)}invokeWithOnError(e,t,r,n,i){try{void 0===r?t.call(e):t.apply(e,r)}catch(o){n(o,i)}}}class p{constructor(e,t){void 0===e&&(e=[]),this.queues={},this.queueNameIndex=0,this.queueNames=e,e.reduce((function(e,r){return e[r]=new h(r,t[r],t),e}),this.queues)}schedule(e,t,r,n,i,o){var s=this.queues[e]
-if(void 0===s)throw new Error(`You attempted to schedule an action in a queue (${e}) that doesn't exist`)
-if(null==r)throw new Error(`You attempted to schedule an action in a queue (${e}) for a method that doesn't exist`)
-return this.queueNameIndex=0,i?s.pushUnique(t,r,n,o):s.push(t,r,n,o)}flush(e){var t,r
-void 0===e&&(e=!1)
-for(var n=this.queueNames.length;this.queueNameIndex<n;)if(r=this.queueNames[this.queueNameIndex],!1===(t=this.queues[r]).hasWork()){if(this.queueNameIndex++,e&&this.queueNameIndex<n)return 1}else if(1===t.flush(!1))return 1}_getDebugInfo(e){if(e){for(var t,r,n={},i=this.queueNames.length,o=0;o<i;)r=this.queueNames[o],t=this.queues[r],n[r]=t._getDebugInfo(e),o++
-return n}}}function f(e){for(var t=e(),r=t.next();!1===r.done;)r.value(),r=t.next()}var m=function(){},g=Object.freeze([])
-function v(){var e,t,r,n=arguments.length
-if(0===n);else if(1===n)r=null,t=arguments[0]
-else{var i=2,o=arguments[0],s=arguments[1],a=typeof s
-if("function"===a?(r=o,t=s):null!==o&&"string"===a&&s in o?t=(r=o)[s]:"function"==typeof o&&(i=1,r=null,t=o),n>i){var l=n-i
-e=new Array(l)
-for(var u=0;u<l;u++)e[u]=arguments[u+i]}}return[r,t,e]}function b(){var e,t,r,n,i
-return 2===arguments.length?(t=arguments[0],i=arguments[1],e=null):([e,t,n]=v(...arguments),void 0===n?i=0:s(i=n.pop())||(r=!0===i,i=n.pop())),[e,t,n,i=parseInt(i,10),r]}var y=0,_=0,w=0,O=0,x=0,P=0,S=0,T=0,E=0,C=0,k=0,M=0,A=0,R=0,j=0,I=0,D=0,N=0,F=0,L=0,z=0
-class U{constructor(e,t){this.DEBUG=!1,this.currentInstance=null,this.instanceStack=[],this._eventCallbacks={end:[],begin:[]},this._timerTimeoutId=null,this._timers=[],this._autorun=!1,this._autorunStack=null,this.queueNames=e,this.options=t||{},"string"==typeof this.options.defaultQueue?this._defaultQueue=this.options.defaultQueue:this._defaultQueue=this.queueNames[0],this._onBegin=this.options.onBegin||m,this._onEnd=this.options.onEnd||m,this._boundRunExpiredTimers=this._runExpiredTimers.bind(this),this._boundAutorunEnd=()=>{F++,!1!==this._autorun&&(this._autorun=!1,this._autorunStack=null,this._end(!0))}
-var r=this.options._buildPlatform||i
-this._platform=r(this._boundAutorunEnd)}get counters(){return{begin:_,end:w,events:{begin:O,end:0},autoruns:{created:N,completed:F},run:x,join:P,defer:S,schedule:T,scheduleIterable:E,deferOnce:C,scheduleOnce:k,setTimeout:M,later:A,throttle:R,debounce:j,cancelTimers:I,cancel:D,loops:{total:L,nested:z}}}get defaultQueue(){return this._defaultQueue}begin(){_++
-var e,t=this.options,r=this.currentInstance
-return!1!==this._autorun?(e=r,this._cancelAutorun()):(null!==r&&(z++,this.instanceStack.push(r)),L++,e=this.currentInstance=new p(this.queueNames,t),O++,this._trigger("begin",e,r)),this._onBegin(e,r),e}end(){w++,this._end(!1)}on(e,t){if("function"!=typeof t)throw new TypeError("Callback must be a function")
-var r=this._eventCallbacks[e]
-if(void 0===r)throw new TypeError(`Cannot on() event ${e} because it does not exist`)
-r.push(t)}off(e,t){var r=this._eventCallbacks[e]
-if(!e||void 0===r)throw new TypeError(`Cannot off() event ${e} because it does not exist`)
-var n=!1
-if(t)for(var i=0;i<r.length;i++)r[i]===t&&(n=!0,r.splice(i,1),i--)
-if(!n)throw new TypeError("Cannot off() callback that does not exist")}run(){x++
-var[e,t,r]=v(...arguments)
-return this._run(e,t,r)}join(){P++
-var[e,t,r]=v(...arguments)
-return this._join(e,t,r)}defer(e,t,r){S++
-for(var n=arguments.length,i=new Array(n>3?n-3:0),o=3;o<n;o++)i[o-3]=arguments[o]
-return this.schedule(e,t,r,...i)}schedule(e){T++
-for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-var[i,o,s]=v(...r),a=this.DEBUG?new Error:void 0
-return this._ensureInstance().schedule(e,i,o,s,!1,a)}scheduleIterable(e,t){E++
-var r=this.DEBUG?new Error:void 0
-return this._ensureInstance().schedule(e,null,f,[t],!1,r)}deferOnce(e,t,r){C++
-for(var n=arguments.length,i=new Array(n>3?n-3:0),o=3;o<n;o++)i[o-3]=arguments[o]
-return this.scheduleOnce(e,t,r,...i)}scheduleOnce(e){k++
-for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-var[i,o,s]=v(...r),a=this.DEBUG?new Error:void 0
-return this._ensureInstance().schedule(e,i,o,s,!0,a)}setTimeout(){return M++,this.later(...arguments)}later(){A++
-var[e,t,r,n]=function(){var[e,t,r]=v(...arguments),n=0,i=void 0!==r?r.length:0
-if(i>0){s(r[i-1])&&(n=parseInt(r.pop(),10))}return[e,t,r,n]}(...arguments)
-return this._later(e,t,r,n)}throttle(){R++
-var e,[t,r,n,i,o=!0]=b(...arguments),s=u(t,r,this._timers)
-if(-1===s)e=this._later(t,r,o?g:n,i),o&&this._join(t,r,n)
-else{e=this._timers[s+1]
-var a=s+4
-this._timers[a]!==g&&(this._timers[a]=n)}return e}debounce(){j++
-var e,[t,r,n,i,o=!1]=b(...arguments),s=this._timers,a=u(t,r,s)
-if(-1===a)e=this._later(t,r,o?g:n,i),o&&this._join(t,r,n)
-else{var l=this._platform.now()+i,c=a+4
-s[c]===g&&(n=g),e=s[a+1]
-var h=d(l,s)
-if(a+6===h)s[a]=l,s[c]=n
-else{var p=this._timers[a+5]
-this._timers.splice(h,0,l,e,t,r,n,p),this._timers.splice(a,6)}0===a&&this._reinstallTimerTimeout()}return e}cancelTimers(){I++,this._clearTimerTimeout(),this._timers=[],this._cancelAutorun()}hasTimers(){return this._timers.length>0||this._autorun}cancel(e){if(D++,null==e)return!1
-var t=typeof e
-return"number"===t?this._cancelLaterTimer(e):!("object"!==t||!e.queue||!e.method)&&e.queue.cancel(e)}ensureInstance(){this._ensureInstance()}getDebugInfo(){if(this.DEBUG)return{autorun:this._autorunStack,counters:this.counters,timers:c(this._timers,6,2),instanceStack:[this.currentInstance,...this.instanceStack].map((e=>e&&e._getDebugInfo(this.DEBUG)))}}_end(e){var t=this.currentInstance,r=null
-if(null===t)throw new Error("end called without begin")
-var n,i=!1
-try{n=t.flush(e)}finally{if(!i)if(i=!0,1===n){var o=this.queueNames[t.queueNameIndex]
-this._scheduleAutorun(o)}else this.currentInstance=null,this.instanceStack.length>0&&(r=this.instanceStack.pop(),this.currentInstance=r),this._trigger("end",t,r),this._onEnd(t,r)}}_join(e,t,r){return null===this.currentInstance?this._run(e,t,r):void 0===e&&void 0===r?t():t.apply(e,r)}_run(e,t,r){var n=a(this.options)
-if(this.begin(),n)try{return t.apply(e,r)}catch(i){n(i)}finally{this.end()}else try{return t.apply(e,r)}finally{this.end()}}_cancelAutorun(){this._autorun&&(this._platform.clearNext(),this._autorun=!1,this._autorunStack=null)}_later(e,t,r,n){var i=this.DEBUG?new Error:void 0,o=this._platform.now()+n,s=y++
-if(0===this._timers.length)this._timers.push(o,s,e,t,r,i),this._installTimerTimeout()
-else{var a=d(o,this._timers)
-this._timers.splice(a,0,o,s,e,t,r,i),this._reinstallTimerTimeout()}return s}_cancelLaterTimer(e){for(var t=1;t<this._timers.length;t+=6)if(this._timers[t]===e)return this._timers.splice(t-1,6),1===t&&this._reinstallTimerTimeout(),!0
-return!1}_trigger(e,t,r){var n=this._eventCallbacks[e]
-if(void 0!==n)for(var i=0;i<n.length;i++)n[i](t,r)}_runExpiredTimers(){this._timerTimeoutId=null,this._timers.length>0&&(this.begin(),this._scheduleExpiredTimers(),this.end())}_scheduleExpiredTimers(){for(var e=this._timers,t=0,r=e.length,n=this._defaultQueue,i=this._platform.now();t<r;t+=6){if(e[t]>i)break
-var o=e[t+4]
-if(o!==g){var s=e[t+2],a=e[t+3],l=e[t+5]
-this.currentInstance.schedule(n,s,a,o,!1,l)}}e.splice(0,t),this._installTimerTimeout()}_reinstallTimerTimeout(){this._clearTimerTimeout(),this._installTimerTimeout()}_clearTimerTimeout(){null!==this._timerTimeoutId&&(this._platform.clearTimeout(this._timerTimeoutId),this._timerTimeoutId=null)}_installTimerTimeout(){if(0!==this._timers.length){var e=this._timers[0],t=this._platform.now(),r=Math.max(0,e-t)
-this._timerTimeoutId=this._platform.setTimeout(this._boundRunExpiredTimers,r)}}_ensureInstance(){var e=this.currentInstance
-return null===e&&(this._autorunStack=this.DEBUG?new Error:void 0,e=this.begin(),this._scheduleAutorun(this.queueNames[0])),e}_scheduleAutorun(e){N++
-var t=this._platform.next,r=this.options.flush
-r?r(e,t):t(),this._autorun=!0}}U.Queue=h,U.buildPlatform=i,U.buildNext=n
-var B=U
-e.default=B})),e("dag-map",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=function(){function e(){this._vertices=new r}return e.prototype.add=function(e,t,r,n){if(!e)throw new Error("argument `key` is required")
-var i=this._vertices,o=i.add(e)
-if(o.val=t,r)if("string"==typeof r)i.addEdge(o,i.add(r))
-else for(var s=0;s<r.length;s++)i.addEdge(o,i.add(r[s]))
-if(n)if("string"==typeof n)i.addEdge(i.add(n),o)
-else for(s=0;s<n.length;s++)i.addEdge(i.add(n[s]),o)},e.prototype.addEdges=function(e,t,r,n){this.add(e,t,r,n)},e.prototype.each=function(e){this._vertices.walk(e)},e.prototype.topsort=function(e){this.each(e)},e}()
-e.default=t
-var r=function(){function e(){this.length=0,this.stack=new n,this.path=new n,this.result=new n}return e.prototype.add=function(e){if(!e)throw new Error("missing key")
-for(var t,r=0|this.length,n=0;n<r;n++)if((t=this[n]).key===e)return t
-return this.length=r+1,this[r]={idx:r,key:e,val:void 0,out:!1,flag:!1,length:0}},e.prototype.addEdge=function(e,t){this.check(e,t.key)
-for(var r=0|t.length,n=0;n<r;n++)if(t[n]===e.idx)return
-t.length=r+1,t[r]=e.idx,e.out=!0},e.prototype.walk=function(e){this.reset()
-for(var t=0;t<this.length;t++){var r=this[t]
-r.out||this.visit(r,"")}this.each(this.result,e)},e.prototype.check=function(e,t){if(e.key===t)throw new Error("cycle detected: "+t+" <- "+t)
-if(0!==e.length){for(var r=0;r<e.length;r++){if(this[e[r]].key===t)throw new Error("cycle detected: "+t+" <- "+e.key+" <- "+t)}if(this.reset(),this.visit(e,t),this.path.length>0){var n="cycle detected: "+t
-throw this.each(this.path,(function(e){n+=" <- "+e})),new Error(n)}}},e.prototype.reset=function(){this.stack.length=0,this.path.length=0,this.result.length=0
-for(var e=0,t=this.length;e<t;e++)this[e].flag=!1},e.prototype.visit=function(e,t){var r=this,n=r.stack,i=r.path,o=r.result
-for(n.push(e.idx);n.length;){var s=0|n.pop()
-if(s>=0){var a=this[s]
-if(a.flag)continue
-if(a.flag=!0,i.push(s),t===a.key)break
-n.push(~s),this.pushIncoming(a)}else i.pop(),o.push(~s)}},e.prototype.pushIncoming=function(e){for(var t=this.stack,r=e.length-1;r>=0;r--){var n=e[r]
-this[n].flag||t.push(n)}},e.prototype.each=function(e,t){for(var r=0,n=e.length;r<n;r++){var i=this[e[r]]
-t(i.key,i.val)}},e}(),n=function(){function e(){this.length=0}return e.prototype.push=function(e){this[this.length++]=0|e},e.prototype.pop=function(){return 0|this[--this.length]},e}()})),e("ember-babel",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.wrapNativeSuper=function(e){if(i.has(e))return i.get(e)
-function r(){}return r.prototype=Object.create(e.prototype,{constructor:{value:r,enumerable:!1,writable:!0,configurable:!0}}),i.set(e,r),t(r,e)},e.classCallCheck=function(e,t){0},e.inheritsLoose=function(e,r){0
-e.prototype=Object.create(null===r?null:r.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),null!==r&&t(e,r)},e.taggedTemplateLiteralLoose=function(e,t){t||(t=e.slice(0))
-return e.raw=t,e},e.createClass=function(e,t,r){null!=t&&o(e.prototype,t)
-null!=r&&o(e,r)
-return e},e.assertThisInitialized=s,e.possibleConstructorReturn=a,e.objectDestructuringEmpty=function(e){0},e.createSuper=function(e){return function(){var t,i=r(e)
-if(n){var o=r(this).constructor
-t=Reflect.construct(i,arguments,o)}else t=i.apply(this,arguments)
-return a(this,t)}},e.createForOfIteratorHelperLoose=function(e){var t=0
-if("undefined"==typeof Symbol||null==e[Symbol.iterator]){if(Array.isArray(e)||(e=function(e,t){if(!e)return
-if("string"==typeof e)return l(e,t)
-var r=Object.prototype.toString.call(e).slice(8,-1)
-"Object"===r&&e.constructor&&(r=e.constructor.name)
-if("Map"===r||"Set"===r)return Array.from(r)
-if("Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r))return l(e,t)}(e)))return function(){return t>=e.length?{done:!0}:{done:!1,value:e[t++]}}
-throw new TypeError("Invalid attempt to iterate non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}return(t=e[Symbol.iterator]()).next.bind(t)}
-var t=Object.setPrototypeOf,r=Object.getPrototypeOf,n="object"==typeof Reflect&&"function"==typeof Reflect.construct,i=new Map
-function o(e,t){for(var r=0;r<t.length;r++){var n=t[r]
-n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function s(e){return e}function a(e,t){return"object"==typeof t&&null!==t||"function"==typeof t?t:e}function l(e,t){(null==t||t>e.length)&&(t=e.length)
-for(var r=new Array(t),n=0;n<t;n++)r[n]=e[n]
-return r}})),e("ember/index",["exports","require","@ember/-internals/environment","@ember/-internals/utils","@ember/-internals/container","@ember/instrumentation","@ember/-internals/meta","@ember/-internals/metal","@ember/canary-features","@ember/debug","backburner","@ember/-internals/console","@ember/controller","@ember/controller/lib/controller_mixin","@ember/string","@ember/service","@ember/object","@ember/object/compat","@ember/-internals/runtime","@ember/-internals/glimmer","ember/version","@ember/-internals/views","@ember/-internals/routing","@ember/-internals/extension-support","@ember/error","@ember/runloop","@ember/-internals/error-handling","@ember/-internals/owner","@ember/application","@ember/application/globals-resolver","@ember/application/instance","@ember/engine","@ember/engine/instance","@ember/polyfills","@ember/deprecated-features","@glimmer/runtime","@glimmer/manager","@ember/destroyable","@ember/-internals/browser-environment"],(function(t,r,n,i,o,s,a,l,u,c,d,h,p,f,m,g,v,b,y,_,w,O,x,P,S,T,E,C,k,M,A,R,j,I,D,N,F,L,z){"use strict"
-Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0
-var U={isNamespace:!0,toString:function(){return"Ember"}}
-Object.defineProperty(U,"ENV",{get:n.getENV,enumerable:!1}),Object.defineProperty(U,"lookup",{get:n.getLookup,set:n.setLookup,enumerable:!1}),D.EMBER_EXTEND_PROTOTYPES&&Object.defineProperty(U,"EXTEND_PROTOTYPES",{enumerable:!1,get:()=>n.ENV.EXTEND_PROTOTYPES}),U.getOwner=C.getOwner,U.setOwner=C.setOwner,U.Application=k.default,U.ApplicationInstance=A.default,Object.defineProperty(U,"Resolver",{get:()=>M.default}),Object.defineProperty(U,"DefaultResolver",{get:()=>U.Resolver}),U.Engine=R.default,U.EngineInstance=j.default,U.assign=I.assign,U.merge=I.merge,U.generateGuid=i.generateGuid,U.GUID_KEY=i.GUID_KEY,U.guidFor=i.guidFor,U.inspect=i.inspect,U.makeArray=i.makeArray,U.canInvoke=i.canInvoke,U.tryInvoke=i.tryInvoke,U.wrap=i.wrap,U.uuid=i.uuid,U.Container=o.Container,U.Registry=o.Registry,U.assert=c.assert,U.warn=c.warn,U.debug=c.debug,U.deprecate=c.deprecate,U.deprecateFunc=c.deprecateFunc,U.runInDebug=c.runInDebug,U.Error=S.default,U.Debug={registerDeprecationHandler:c.registerDeprecationHandler,registerWarnHandler:c.registerWarnHandler,isComputed:l.isComputed},U.instrument=s.instrument,U.subscribe=s.subscribe,U.Instrumentation={instrument:s.instrument,subscribe:s.subscribe,unsubscribe:s.unsubscribe,reset:s.reset},U.run=T.run,U.computed=v.computed,U._descriptor=l.nativeDescDecorator,U._tracked=l.tracked,U.cacheFor=l.getCachedValueFor,U.ComputedProperty=l.ComputedProperty,U._setClassicDecorator=l.setClassicDecorator,U.meta=a.meta,U.get=l.get,U.getWithDefault=l.getWithDefault,U._getPath=l._getPath,U.set=l.set,U.trySet=l.trySet,U.FEATURES=(0,I.assign)({isEnabled:u.isEnabled},u.FEATURES),U._Cache=i.Cache,U.on=l.on,U.addListener=l.addListener,U.removeListener=l.removeListener,U.sendEvent=l.sendEvent,U.hasListeners=l.hasListeners,U.isNone=l.isNone,U.isEmpty=l.isEmpty,U.isBlank=l.isBlank
-U.isPresent=l.isPresent,U.notifyPropertyChange=l.notifyPropertyChange,U.beginPropertyChanges=l.beginPropertyChanges,U.endPropertyChanges=l.endPropertyChanges,U.changeProperties=l.changeProperties,U.platform={defineProperty:!0,hasPropertyAccessors:!0},U.defineProperty=l.defineProperty,U.destroy=L.destroy,U.libraries=l.libraries,U.getProperties=l.getProperties,U.setProperties=l.setProperties,U.expandProperties=l.expandProperties,U.addObserver=l.addObserver,U.removeObserver=l.removeObserver,U.aliasMethod=l.aliasMethod,U.observer=l.observer,U.mixin=l.mixin,U.Mixin=l.Mixin,U._createCache=l.createCache,U._cacheGetValue=l.getValue,U._cacheIsConst=l.isConst,U._registerDestructor=L.registerDestructor,U._unregisterDestructor=L.unregisterDestructor,U._associateDestroyableChild=L.associateDestroyableChild,U._assertDestroyablesDestroyed=L.assertDestroyablesDestroyed,U._enableDestroyableTracking=L.enableDestroyableTracking,U._isDestroying=L.isDestroying,U._isDestroyed=L.isDestroyed,Object.defineProperty(U,"onerror",{get:E.getOnerror,set:E.setOnerror,enumerable:!1}),Object.defineProperty(U,"testing",{get:c.isTesting,set:c.setTesting,enumerable:!1})
-U._Backburner=d.default,D.LOGGER&&(U.Logger=h.default),U.A=y.A,U.String={loc:m.loc,w:m.w,dasherize:m.dasherize,decamelize:m.decamelize,camelize:m.camelize,classify:m.classify,underscore:m.underscore,capitalize:m.capitalize},U.Object=y.Object,U._RegistryProxyMixin=y.RegistryProxyMixin,U._ContainerProxyMixin=y.ContainerProxyMixin,U.compare=y.compare,U.copy=y.copy,U.isEqual=y.isEqual,U.inject=function(){},U.inject.service=g.inject,U.inject.controller=p.inject,U.Array=y.Array,U.Comparable=y.Comparable,U.Enumerable=y.Enumerable,U.ArrayProxy=y.ArrayProxy,U.ObjectProxy=y.ObjectProxy,U.ActionHandler=y.ActionHandler,U.CoreObject=y.CoreObject,U.NativeArray=y.NativeArray,U.Copyable=y.Copyable,U.MutableEnumerable=y.MutableEnumerable,U.MutableArray=y.MutableArray,U.Evented=y.Evented,U.PromiseProxyMixin=y.PromiseProxyMixin,U.Observable=y.Observable,U.typeOf=y.typeOf,U.isArray=y.isArray,U.Object=y.Object
-U.onLoad=k.onLoad,U.runLoadHooks=k.runLoadHooks,U.Controller=p.default,U.ControllerMixin=f.default,U.Service=g.default,U._ProxyMixin=y._ProxyMixin,U.RSVP=y.RSVP,U.Namespace=y.Namespace,U._action=v.action,U._dependentKeyCompat=b.dependentKeyCompat,Object.defineProperty(U,"STRINGS",{configurable:!1,get:m._getStrings,set:m._setStrings}),Object.defineProperty(U,"BOOTED",{configurable:!1,enumerable:!1,get:l.isNamespaceSearchDisabled,set:l.setNamespaceSearchDisabled}),U.Component=_.Component,_.Helper.helper=_.helper,U.Helper=_.Helper,[["Checkbox","@ember/component/checkbox",_.Checkbox,!0],["TextField","@ember/component/text-field",_.TextField,!0],["TextArea","@ember/component/text-area",_.TextArea,!0],["LinkComponent","@ember/routing/link-component",_.LinkComponent,!0],["TextSupport",null,O.TextSupport,!1],["TargetActionSupport",null,y.TargetActionSupport,!1]].forEach((e=>{var[t,r,n,i]=e
-Object.defineProperty(U,t,{get:()=>(null!==r&&` or importing from '${r}'`," is deprecated.",i&&` Install the \`@ember/legacy-built-in-components\` addon and use \`import { ${t} } from '@ember/legacy-built-in-components';\` instead.`,n),configurable:!0,enumerable:!0}),U[`_Legacy${t}`]=n})),U._setComponentManager=_.setComponentManager,U._componentManagerCapabilities=_.componentCapabilities,U._setModifierManager=F.setModifierManager,U._modifierManagerCapabilities=_.modifierCapabilities,U._getComponentTemplate=F.getComponentTemplate,U._setComponentTemplate=F.setComponentTemplate,U._templateOnlyComponent=N.templateOnlyComponent,U._Input=_.Input,U._hash=N.hash,U._array=N.array,U._concat=N.concat,U._get=N.get,U._on=N.on,U._fn=N.fn
-U._helperManagerCapabilities=F.helperCapabilities,U._setHelperManager=F.setHelperManager,U._invokeHelper=N.invokeHelper,U._captureRenderTree=c.captureRenderTree,n.ENV.EXTEND_PROTOTYPES.String&&(String.prototype.htmlSafe=function(){return(0,_.htmlSafe)(this)})
-var B=function(e,t){void 0===t&&(t=`Importing ${e} from '@ember/string' is deprecated. Please import ${e} from '@ember/template' instead.`)}
-Object.defineProperty(U.String,"htmlSafe",{enumerable:!0,configurable:!0,get:()=>(B("htmlSafe"),_.htmlSafe)}),Object.defineProperty(U.String,"isHTMLSafe",{enumerable:!0,configurable:!0,get:()=>(B("isHTMLSafe"),_.isHTMLSafe)}),Object.defineProperty(U,"TEMPLATES",{get:_.getTemplates,set:_.setTemplates,configurable:!1,enumerable:!1}),U.VERSION=w.default,D.JQUERY_INTEGRATION&&!O.jQueryDisabled&&Object.defineProperty(U,"$",{get:()=>O.jQuery,configurable:!0,enumerable:!0}),U.ViewUtils={isSimpleClick:O.isSimpleClick,getElementView:O.getElementView,getViewElement:O.getViewElement,getViewBounds:O.getViewBounds,getViewClientRects:O.getViewClientRects,getViewBoundingClientRect:O.getViewBoundingClientRect,getRootViews:O.getRootViews,getChildViews:O.getChildViews,isSerializationFirstNode:_.isSerializationFirstNode},U.ComponentLookup=O.ComponentLookup,U.EventDispatcher=O.EventDispatcher,U.Location=x.Location,U.AutoLocation=x.AutoLocation,U.HashLocation=x.HashLocation,U.HistoryLocation=x.HistoryLocation,U.NoneLocation=x.NoneLocation,U.controllerFor=x.controllerFor,U.generateControllerFactory=x.generateControllerFactory,U.generateController=x.generateController,U.RouterDSL=x.RouterDSL,U.Router=x.Router,U.Route=x.Route,(0,k.runLoadHooks)("Ember.Application",k.default),U.DataAdapter=P.DataAdapter,U.ContainerDebugAdapter=P.ContainerDebugAdapter
-var H={template:_.template,Utils:{escapeExpression:_.escapeExpression}},$={template:_.template}
-function W(e){Object.defineProperty(U,e,{configurable:!0,enumerable:!0,get(){if((0,r.has)("ember-template-compiler")){var t=(0,r.default)("ember-template-compiler")
-$.precompile=H.precompile=t.precompile,$.compile=H.compile=t.compile,$.registerPlugin=t.registerPlugin,Object.defineProperty(U,"HTMLBars",{configurable:!0,writable:!0,enumerable:!0,value:$}),Object.defineProperty(U,"Handlebars",{configurable:!0,writable:!0,enumerable:!0,value:H})}return"Handlebars"===e?H:$}})}function q(e){Object.defineProperty(U,e,{configurable:!0,enumerable:!0,get(){if((0,r.has)("ember-testing")){var t=(0,r.default)("ember-testing"),{Test:n,Adapter:i,QUnitAdapter:o,setupForTesting:s}=t
-return n.Adapter=i,n.QUnitAdapter=o,Object.defineProperty(U,"Test",{configurable:!0,writable:!0,enumerable:!0,value:n}),Object.defineProperty(U,"setupForTesting",{configurable:!0,writable:!0,enumerable:!0,value:s}),"Test"===e?n:s}}})}W("HTMLBars"),W("Handlebars"),q("Test"),q("setupForTesting"),(0,k.runLoadHooks)("Ember"),U.__loader={require:r.default,define:e,registry:void 0!==requirejs?requirejs.entries:r.default.entries}
-var V=U
-t.default=V})),e("ember/version",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default="3.27.5"})),e("route-recognizer",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Object.create
-function r(){var e=t(null)
-return e.__=void 0,delete e.__,e}var n=function(e,t,r){this.path=e,this.matcher=t,this.delegate=r}
-n.prototype.to=function(e,t){var r=this.delegate
-if(r&&r.willAddRoute&&(e=r.willAddRoute(this.matcher.target,e)),this.matcher.add(this.path,e),t){if(0===t.length)throw new Error("You must have an argument in the function passed to `to`")
-this.matcher.addChild(this.path,e,t,this.delegate)}}
-var i=function(e){this.routes=r(),this.children=r(),this.target=e}
-function o(e,t,r){return function(i,s){var a=e+i
-if(!s)return new n(a,t,r)
-s(o(a,t,r))}}function s(e,t,r){for(var n=0,i=0;i<e.length;i++)n+=e[i].path.length
-var o={path:t=t.substr(n),handler:r}
-e.push(o)}function a(e,t,r,n){for(var i=t.routes,o=Object.keys(i),l=0;l<o.length;l++){var u=o[l],c=e.slice()
-s(c,u,i[u])
-var d=t.children[u]
-d?a(c,d,r,n):r.call(n,c)}}i.prototype.add=function(e,t){this.routes[e]=t},i.prototype.addChild=function(e,t,r,n){var s=new i(t)
-this.children[e]=s
-var a=o(e,s,n)
-n&&n.contextEntered&&n.contextEntered(t,a),r(a)}
-function l(e){return e.split("/").map(c).join("/")}var u=/%|\//g
-function c(e){return e.length<3||-1===e.indexOf("%")?e:decodeURIComponent(e).replace(u,encodeURIComponent)}var d=/%(?:2(?:4|6|B|C)|3(?:B|D|A)|40)/g
-function h(e){return encodeURIComponent(e).replace(d,decodeURIComponent)}var p=/(\/|\.|\*|\+|\?|\||\(|\)|\[|\]|\{|\}|\\)/g,f=Array.isArray,m=Object.prototype.hasOwnProperty
-function g(e,t){if("object"!=typeof e||null===e)throw new Error("You must pass an object as the second argument to `generate`.")
-if(!m.call(e,t))throw new Error("You must provide param `"+t+"` to `generate`.")
-var r=e[t],n="string"==typeof r?r:""+r
-if(0===n.length)throw new Error("You must provide a param `"+t+"`.")
-return n}var v=[]
-v[0]=function(e,t){for(var r=t,n=e.value,i=0;i<n.length;i++){var o=n.charCodeAt(i)
-r=r.put(o,!1,!1)}return r},v[1]=function(e,t){return t.put(47,!0,!0)},v[2]=function(e,t){return t.put(-1,!1,!0)},v[4]=function(e,t){return t}
-var b=[]
-b[0]=function(e){return e.value.replace(p,"\\$1")},b[1]=function(){return"([^/]+)"},b[2]=function(){return"(.+)"},b[4]=function(){return""}
-var y=[]
-y[0]=function(e){return e.value},y[1]=function(e,t){var r=g(t,e.value)
-return k.ENCODE_AND_DECODE_PATH_SEGMENTS?h(r):r},y[2]=function(e,t){return g(t,e.value)},y[4]=function(){return""}
-var _=Object.freeze({}),w=Object.freeze([])
-function O(e,t,r){t.length>0&&47===t.charCodeAt(0)&&(t=t.substr(1))
-for(var n=t.split("/"),i=void 0,o=void 0,s=0;s<n.length;s++){var a,l=n[s],u=0
-12&(a=2<<(u=""===l?4:58===l.charCodeAt(0)?1:42===l.charCodeAt(0)?2:0))&&(l=l.slice(1),(i=i||[]).push(l),(o=o||[]).push(0!=(4&a))),14&a&&r[u]++,e.push({type:u,value:c(l)})}return{names:i||w,shouldDecodes:o||w}}function x(e,t,r){return e.char===t&&e.negate===r}var P=function(e,t,r,n,i){this.states=e,this.id=t,this.char=r,this.negate=n,this.nextStates=i?t:null,this.pattern="",this._regex=void 0,this.handlers=void 0,this.types=void 0}
-function S(e,t){return e.negate?e.char!==t&&-1!==e.char:e.char===t||-1===e.char}function T(e,t){for(var r=[],n=0,i=e.length;n<i;n++){var o=e[n]
-r=r.concat(o.match(t))}return r}P.prototype.regex=function(){return this._regex||(this._regex=new RegExp(this.pattern)),this._regex},P.prototype.get=function(e,t){var r=this.nextStates
-if(null!==r)if(f(r))for(var n=0;n<r.length;n++){var i=this.states[r[n]]
-if(x(i,e,t))return i}else{var o=this.states[r]
-if(x(o,e,t))return o}},P.prototype.put=function(e,t,r){var n
-if(n=this.get(e,t))return n
-var i=this.states
-return n=new P(i,i.length,e,t,r),i[i.length]=n,null==this.nextStates?this.nextStates=n.id:f(this.nextStates)?this.nextStates.push(n.id):this.nextStates=[this.nextStates,n.id],n},P.prototype.match=function(e){var t=this.nextStates
-if(!t)return[]
-var r=[]
-if(f(t))for(var n=0;n<t.length;n++){var i=this.states[t[n]]
-S(i,e)&&r.push(i)}else{var o=this.states[t]
-S(o,e)&&r.push(o)}return r}
-var E=function(e){this.length=0,this.queryParams=e||{}}
-function C(e){var t
-e=e.replace(/\+/gm,"%20")
-try{t=decodeURIComponent(e)}catch(r){t=""}return t}E.prototype.splice=Array.prototype.splice,E.prototype.slice=Array.prototype.slice,E.prototype.push=Array.prototype.push
-var k=function(){this.names=r()
-var e=[],t=new P(e,0,-1,!0,!1)
-e[0]=t,this.states=e,this.rootState=t}
-k.prototype.add=function(e,t){for(var r,n=this.rootState,i="^",o=[0,0,0],s=new Array(e.length),a=[],l=!0,u=0,c=0;c<e.length;c++){for(var d=e[c],h=O(a,d.path,o),p=h.names,f=h.shouldDecodes;u<a.length;u++){var m=a[u]
-4!==m.type&&(l=!1,n=n.put(47,!1,!1),i+="/",n=v[m.type](m,n),i+=b[m.type](m))}s[c]={handler:d.handler,names:p,shouldDecodes:f}}l&&(n=n.put(47,!1,!1),i+="/"),n.handlers=s,n.pattern=i+"$",n.types=o,"object"==typeof t&&null!==t&&t.as&&(r=t.as),r&&(this.names[r]={segments:a,handlers:s})},k.prototype.handlersFor=function(e){var t=this.names[e]
-if(!t)throw new Error("There is no route named "+e)
-for(var r=new Array(t.handlers.length),n=0;n<t.handlers.length;n++){var i=t.handlers[n]
-r[n]=i}return r},k.prototype.hasRoute=function(e){return!!this.names[e]},k.prototype.generate=function(e,t){var r=this.names[e],n=""
-if(!r)throw new Error("There is no route named "+e)
-for(var i=r.segments,o=0;o<i.length;o++){var s=i[o]
-4!==s.type&&(n+="/",n+=y[s.type](s,t))}return"/"!==n.charAt(0)&&(n="/"+n),t&&t.queryParams&&(n+=this.generateQueryString(t.queryParams)),n},k.prototype.generateQueryString=function(e){var t=[],r=Object.keys(e)
-r.sort()
-for(var n=0;n<r.length;n++){var i=r[n],o=e[i]
-if(null!=o){var s=encodeURIComponent(i)
-if(f(o))for(var a=0;a<o.length;a++){var l=i+"[]="+encodeURIComponent(o[a])
-t.push(l)}else s+="="+encodeURIComponent(o),t.push(s)}}return 0===t.length?"":"?"+t.join("&")},k.prototype.parseQueryString=function(e){for(var t=e.split("&"),r={},n=0;n<t.length;n++){var i=t[n].split("="),o=C(i[0]),s=o.length,a=!1,l=void 0
-1===i.length?l="true":(s>2&&"[]"===o.slice(s-2)&&(a=!0,r[o=o.slice(0,s-2)]||(r[o]=[])),l=i[1]?C(i[1]):""),a?r[o].push(l):r[o]=l}return r},k.prototype.recognize=function(e){var t,r=[this.rootState],n={},i=!1,o=e.indexOf("#");-1!==o&&(e=e.substr(0,o))
-var s=e.indexOf("?")
-if(-1!==s){var a=e.substr(s+1,e.length)
-e=e.substr(0,s),n=this.parseQueryString(a)}"/"!==e.charAt(0)&&(e="/"+e)
-var u=e
-k.ENCODE_AND_DECODE_PATH_SEGMENTS?e=l(e):(e=decodeURI(e),u=decodeURI(u))
-var c=e.length
-c>1&&"/"===e.charAt(c-1)&&(e=e.substr(0,c-1),u=u.substr(0,u.length-1),i=!0)
-for(var d=0;d<e.length&&(r=T(r,e.charCodeAt(d))).length;d++);for(var h=[],p=0;p<r.length;p++)r[p].handlers&&h.push(r[p])
-r=function(e){return e.sort((function(e,t){var r=e.types||[0,0,0],n=r[0],i=r[1],o=r[2],s=t.types||[0,0,0],a=s[0],l=s[1],u=s[2]
-if(o!==u)return o-u
-if(o){if(n!==a)return a-n
-if(i!==l)return l-i}return i!==l?i-l:n!==a?a-n:0}))}(h)
-var f=h[0]
-return f&&f.handlers&&(i&&f.pattern&&"(.+)$"===f.pattern.slice(-5)&&(u+="/"),t=function(e,t,r){var n=e.handlers,i=e.regex()
-if(!i||!n)throw new Error("state not initialized")
-var o=t.match(i),s=1,a=new E(r)
-a.length=n.length
-for(var l=0;l<n.length;l++){var u=n[l],c=u.names,d=u.shouldDecodes,h=_,p=!1
-if(c!==w&&d!==w)for(var f=0;f<c.length;f++){p=!0
-var m=c[f],g=o&&o[s++]
-h===_&&(h={}),k.ENCODE_AND_DECODE_PATH_SEGMENTS&&d[f]?h[m]=g&&decodeURIComponent(g):h[m]=g}a[l]={handler:u.handler,params:h,isDynamic:p}}return a}(f,u,n)),t},k.VERSION="0.3.4",k.ENCODE_AND_DECODE_PATH_SEGMENTS=!0,k.Normalizer={normalizeSegment:c,normalizePath:l,encodePathSegment:h},k.prototype.map=function(e,t){var r=new i
-e(o("",r,this.delegate)),a([],r,(function(e){t?t(this,e):this.add(e)}),this)}
-var M=k
-e.default=M})),e("router_js",["exports","@ember/polyfills","rsvp","route-recognizer"],(function(e,t,r,n){"use strict"
-function i(){var e=new Error("TransitionAborted")
-return e.name="TransitionAborted",e.code="TRANSITION_ABORTED",e}function o(e){if("object"==typeof(t=e)&&null!==t&&"boolean"==typeof t.isAborted&&e.isAborted)throw i()
-var t}Object.defineProperty(e,"__esModule",{value:!0}),e.logAbort=w,e.InternalRouteInfo=e.TransitionError=e.TransitionState=e.QUERY_PARAMS_SYMBOL=e.PARAMS_SYMBOL=e.STATE_SYMBOL=e.InternalTransition=e.default=void 0
-var s=Array.prototype.slice,a=Object.prototype.hasOwnProperty
-function l(e,t){for(var r in t)a.call(t,r)&&(e[r]=t[r])}function u(e){var t,r=e&&e.length
-if(r&&r>0){var n=e[r-1]
-if(function(e){return e&&a.call(e,"queryParams")}(n))return t=n.queryParams,[s.call(e,0,r-1),t]}return[e,null]}function c(e){for(var t in e){var r=e[t]
-if("number"==typeof r)e[t]=""+r
-else if(Array.isArray(r))for(var n=0,i=r.length;n<i;n++)r[n]=""+r[n]}}function d(e){if(e.log){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-if(2===r.length){var[i,o]=r
-e.log("Transition #"+i+": "+o)}else{var[s]=r
-e.log(s)}}}function h(e){return"string"==typeof e||e instanceof String||"number"==typeof e||e instanceof Number}function p(e,t){for(var r=0,n=e.length;r<n&&!1!==t(e[r]);r++);}function f(e,t){var r,n={all:{},changed:{},removed:{}}
-l(n.all,t)
-var i=!1
-for(r in c(e),c(t),e)a.call(e,r)&&(a.call(t,r)||(i=!0,n.removed[r]=e[r]))
-for(r in t)if(a.call(t,r)){var o=e[r],s=t[r]
-if(m(o)&&m(s))if(o.length!==s.length)n.changed[r]=t[r],i=!0
-else for(var u=0,d=o.length;u<d;u++)o[u]!==s[u]&&(n.changed[r]=t[r],i=!0)
-else e[r]!==t[r]&&(n.changed[r]=t[r],i=!0)}return i?n:void 0}function m(e){return Array.isArray(e)}function g(e){return"Router: "+e}var v="__STATE__-2619860001345920-3322w3"
-e.STATE_SYMBOL=v
-var b="__PARAMS__-261986232992830203-23323"
-e.PARAMS_SYMBOL=b
-var y="__QPS__-2619863929824844-32323"
-e.QUERY_PARAMS_SYMBOL=y
-class _{constructor(e,t,n,i,o){if(void 0===i&&(i=void 0),void 0===o&&(o=void 0),this.from=null,this.to=void 0,this.isAborted=!1,this.isActive=!0,this.urlMethod="update",this.resolveIndex=0,this.queryParamsOnly=!1,this.isTransition=!0,this.isCausedByAbortingTransition=!1,this.isCausedByInitialTransition=!1,this.isCausedByAbortingReplaceTransition=!1,this._visibleQueryParams={},this.isIntermediate=!1,this[v]=n||e.state,this.intent=t,this.router=e,this.data=t&&t.data||{},this.resolvedModels={},this[y]={},this.promise=void 0,this.error=void 0,this[b]={},this.routeInfos=[],this.targetName=void 0,this.pivotHandler=void 0,this.sequence=-1,i)return this.promise=r.Promise.reject(i),void(this.error=i)
-if(this.isCausedByAbortingTransition=!!o,this.isCausedByInitialTransition=!!o&&(o.isCausedByInitialTransition||0===o.sequence),this.isCausedByAbortingReplaceTransition=!!o&&"replace"===o.urlMethod&&(!o.isCausedByAbortingTransition||o.isCausedByAbortingReplaceTransition),n){this[b]=n.params,this[y]=n.queryParams,this.routeInfos=n.routeInfos
-var s=n.routeInfos.length
-s&&(this.targetName=n.routeInfos[s-1].name)
-for(var a=0;a<s;++a){var l=n.routeInfos[a]
-if(!l.isResolved)break
-this.pivotHandler=l.route}this.sequence=e.currentSequence++,this.promise=n.resolve(this).catch((e=>{throw this.router.transitionDidError(e,this)}),g("Handle Abort"))}else this.promise=r.Promise.resolve(this[v]),this[b]={}}then(e,t,r){return this.promise.then(e,t,r)}catch(e,t){return this.promise.catch(e,t)}finally(e,t){return this.promise.finally(e,t)}abort(){this.rollback()
-var e=new _(this.router,void 0,void 0,void 0)
-return e.to=this.from,e.from=this.from,e.isAborted=!0,this.router.routeWillChange(e),this.router.routeDidChange(e),this}rollback(){this.isAborted||(d(this.router,this.sequence,this.targetName+": transition was aborted"),void 0!==this.intent&&null!==this.intent&&(this.intent.preTransitionState=this.router.state),this.isAborted=!0,this.isActive=!1,this.router.activeTransition=void 0)}redirect(e){this.rollback(),this.router.routeWillChange(e)}retry(){this.abort()
-var e=this.router.transitionByIntent(this.intent,!1)
-return null!==this.urlMethod&&e.method(this.urlMethod),e}method(e){return this.urlMethod=e,this}send(e,t,r,n,i){void 0===e&&(e=!1),this.trigger(e,t,r,n,i)}trigger(e,t){void 0===e&&(e=!1),"string"==typeof e&&(t=e,e=!1)
-for(var r=arguments.length,n=new Array(r>2?r-2:0),i=2;i<r;i++)n[i-2]=arguments[i]
-this.router.triggerEvent(this[v].routeInfos.slice(0,this.resolveIndex+1),e,t,n)}followRedirects(){var e=this.router
-return this.promise.catch((function(t){return e.activeTransition?e.activeTransition.followRedirects():r.Promise.reject(t)}))}toString(){return"Transition (sequence "+this.sequence+")"}log(e){d(this.router,this.sequence,e)}}function w(e){return d(e.router,e.sequence,"detected abort."),i()}function O(e){return"object"==typeof e&&e instanceof _&&e.isTransition}e.InternalTransition=_
-var x=new WeakMap
-function P(e,r,n){return void 0===r&&(r={}),void 0===n&&(n=!1),e.map(((i,o)=>{var{name:s,params:a,paramNames:l,context:u,route:c}=i
-if(x.has(i)&&n){var d=x.get(i)
-d=function(e,r){var n={get metadata(){return T(e)}}
-if(!Object.isExtensible(r)||r.hasOwnProperty("metadata"))return Object.freeze((0,t.assign)({},r,n))
-return(0,t.assign)(r,n)}(c,d)
-var h=S(d,u)
-return x.set(i,h),h}var p={find(t,r){var n,i=[]
-3===t.length&&(i=e.map((e=>x.get(e))))
-for(var o=0;e.length>o;o++)if(n=x.get(e[o]),t.call(r,n,o,i))return n},get name(){return s},get paramNames(){return l},get metadata(){return T(i.route)},get parent(){var t=e[o-1]
-return void 0===t?null:x.get(t)},get child(){var t=e[o+1]
-return void 0===t?null:x.get(t)},get localName(){var e=this.name.split(".")
-return e[e.length-1]},get params(){return a},get queryParams(){return r}}
-return n&&(p=S(p,u)),x.set(i,p),p}))}function S(e,r){var n={get attributes(){return r}}
-return!Object.isExtensible(e)||e.hasOwnProperty("attributes")?Object.freeze((0,t.assign)({},e,n)):(0,t.assign)(e,n)}function T(e){return null!=e&&void 0!==e.buildRouteInfoMetadata?e.buildRouteInfoMetadata():null}class E{constructor(e,t,r,n){this._routePromise=void 0,this._route=null,this.params={},this.isResolved=!1,this.name=t,this.paramNames=r,this.router=e,n&&this._processRoute(n)}getModel(e){return r.Promise.resolve(this.context)}serialize(e){return this.params||{}}resolve(e){return r.Promise.resolve(this.routePromise).then((t=>(o(e),t))).then((()=>this.runBeforeModelHook(e))).then((()=>o(e))).then((()=>this.getModel(e))).then((t=>(o(e),t))).then((t=>this.runAfterModelHook(e,t))).then((t=>this.becomeResolved(e,t)))}becomeResolved(e,t){var r,n=this.serialize(t)
-e&&(this.stashResolvedModel(e,t),e[b]=e[b]||{},e[b][this.name]=n)
-var i=t===this.context
-!("context"in this)&&i||(r=t)
-var o=x.get(this),s=new C(this.router,this.name,this.paramNames,n,this.route,r)
-return void 0!==o&&x.set(s,o),s}shouldSupersede(e){if(!e)return!0
-var t=e.context===this.context
-return e.name!==this.name||"context"in this&&!t||this.hasOwnProperty("params")&&!function(e,t){if(!e!=!t)return!1
-if(!e)return!0
-for(var r in e)if(e.hasOwnProperty(r)&&e[r]!==t[r])return!1
-return!0}(this.params,e.params)}get route(){return null!==this._route?this._route:this.fetchRoute()}set route(e){this._route=e}get routePromise(){return this._routePromise||this.fetchRoute(),this._routePromise}set routePromise(e){this._routePromise=e}log(e,t){e.log&&e.log(this.name+": "+t)}updateRoute(e){return e._internalName=this.name,this.route=e}runBeforeModelHook(e){var t
-return e.trigger&&e.trigger(!0,"willResolveModel",e,this.route),this.route&&void 0!==this.route.beforeModel&&(t=this.route.beforeModel(e)),O(t)&&(t=null),r.Promise.resolve(t)}runAfterModelHook(e,t){var n,i,o=this.name
-return this.stashResolvedModel(e,t),void 0!==this.route&&void 0!==this.route.afterModel&&(n=this.route.afterModel(t,e)),n=O(i=n)?null:i,r.Promise.resolve(n).then((()=>e.resolvedModels[o]))}stashResolvedModel(e,t){e.resolvedModels=e.resolvedModels||{},e.resolvedModels[this.name]=t}fetchRoute(){var e=this.router.getRoute(this.name)
-return this._processRoute(e)}_processRoute(e){return this.routePromise=r.Promise.resolve(e),null!==(t=e)&&"object"==typeof t&&"function"==typeof t.then?(this.routePromise=this.routePromise.then((e=>this.updateRoute(e))),this.route=void 0):e?this.updateRoute(e):void 0
-var t}}e.InternalRouteInfo=E
-class C extends E{constructor(e,t,r,n,i,o){super(e,t,r,i),this.params=n,this.isResolved=!0,this.context=o}resolve(e){return e&&e.resolvedModels&&(e.resolvedModels[this.name]=this.context),r.Promise.resolve(this)}}class k extends E{constructor(e,t,r,n,i){super(e,t,r,i),this.params={},this.params=n}getModel(e){var t=this.params
-e&&e[y]&&(l(t={},this.params),t.queryParams=e[y])
-var n,i=this.route
-return i.deserialize?n=i.deserialize(t,e):i.model&&(n=i.model(t,e)),n&&O(n)&&(n=void 0),r.Promise.resolve(n)}}class M extends E{constructor(e,t,r,n){super(e,t,r),this.context=n,this.serializer=this.router.getSerializer(t)}getModel(e){return void 0!==this.router.log&&this.router.log(this.name+": resolving provided model"),super.getModel(e)}serialize(e){var{paramNames:t,context:r}=this
-e||(e=r)
-var n={}
-if(h(e))return n[t[0]]=e,n
-if(this.serializer)return this.serializer.call(null,e,t)
-if(void 0!==this.route&&this.route.serialize)return this.route.serialize(e,t)
-if(1===t.length){var i=t[0]
-return/_id$/.test(i)?n[i]=e.id:n[i]=e,n}}}class A{constructor(e,t){void 0===t&&(t={}),this.router=e,this.data=t}}function R(e,t,r){var n=e.routeInfos,i=t.resolveIndex>=n.length?n.length-1:t.resolveIndex,o=t.isAborted
-throw new N(r,e.routeInfos[i].route,o,e)}function j(e,t){if(t.resolveIndex!==e.routeInfos.length)return e.routeInfos[t.resolveIndex].resolve(t).then(I.bind(null,e,t),null,e.promiseLabel("Proceed"))}function I(e,t,r){var n=e.routeInfos[t.resolveIndex].isResolved
-if(e.routeInfos[t.resolveIndex++]=r,!n){var{route:i}=r
-void 0!==i&&i.redirect&&i.redirect(r.context,t)}return o(t),j(e,t)}class D{constructor(){this.routeInfos=[],this.queryParams={},this.params={}}promiseLabel(e){var t=""
-return p(this.routeInfos,(function(e){return""!==t&&(t+="."),t+=e.name,!0})),g("'"+t+"': "+e)}resolve(e){var t=this.params
-return p(this.routeInfos,(e=>(t[e.name]=e.params||{},!0))),e.resolveIndex=0,r.Promise.resolve(null,this.promiseLabel("Start transition")).then(j.bind(null,this,e),null,this.promiseLabel("Resolve route")).catch(R.bind(null,this,e),this.promiseLabel("Handle error")).then((()=>this))}}e.TransitionState=D
-class N{constructor(e,t,r,n){this.error=e,this.route=t,this.wasAborted=r,this.state=n}}e.TransitionError=N
-class F extends A{constructor(e,t,r,n,i,o){void 0===n&&(n=[]),void 0===i&&(i={}),super(e,o),this.preTransitionState=void 0,this.name=t,this.pivotHandler=r,this.contexts=n,this.queryParams=i}applyToState(e,t){var r=u([this.name].concat(this.contexts))[0],n=this.router.recognizer.handlersFor(r[0]),i=n[n.length-1].handler
-return this.applyToHandlers(e,n,i,t,!1)}applyToHandlers(e,t,r,n,i){var o,s,a=new D,u=this.contexts.slice(0),c=t.length
-if(this.pivotHandler)for(o=0,s=t.length;o<s;++o)if(t[o].handler===this.pivotHandler._internalName){c=o
-break}for(o=t.length-1;o>=0;--o){var d=t[o],h=d.handler,p=e.routeInfos[o],f=null
-if(f=d.names.length>0?o>=c?this.createParamHandlerInfo(h,d.names,u,p):this.getHandlerInfoForDynamicSegment(h,d.names,u,p,r,o):this.createParamHandlerInfo(h,d.names,u,p),i){f=f.becomeResolved(null,f.context)
-var m=p&&p.context
-d.names.length>0&&void 0!==p.context&&f.context===m&&(f.params=p&&p.params),f.context=m}var g=p;(o>=c||f.shouldSupersede(p))&&(c=Math.min(o,c),g=f),n&&!i&&(g=g.becomeResolved(null,g.context)),a.routeInfos.unshift(g)}if(u.length>0)throw new Error("More context objects were passed than there are dynamic segments for the route: "+r)
-return n||this.invalidateChildren(a.routeInfos,c),l(a.queryParams,this.queryParams||{}),n&&e.queryParams&&l(a.queryParams,e.queryParams),a}invalidateChildren(e,t){for(var r=t,n=e.length;r<n;++r){if(e[r].isResolved){var{name:i,params:o,route:s,paramNames:a}=e[r]
-e[r]=new k(this.router,i,a,o,s)}}}getHandlerInfoForDynamicSegment(e,t,r,n,i,o){var s
-if(r.length>0){if(h(s=r[r.length-1]))return this.createParamHandlerInfo(e,t,r,n)
-r.pop()}else{if(n&&n.name===e)return n
-if(!this.preTransitionState)return n
-var a=this.preTransitionState.routeInfos[o]
-s=a&&a.context}return new M(this.router,e,t,s)}createParamHandlerInfo(e,t,r,n){for(var i={},o=t.length,s=[];o--;){var a=n&&e===n.name&&n.params||{},l=r[r.length-1],u=t[o]
-h(l)?i[u]=""+r.pop():a.hasOwnProperty(u)?i[u]=a[u]:s.push(u)}if(s.length>0)throw new Error(`You didn't provide enough string/numeric parameters to satisfy all of the dynamic segments for route ${e}. Missing params: ${s}`)
-return new k(this.router,e,t,i)}}var L=function(){function e(t){var r=Error.call(this,t)
-this.name="UnrecognizedURLError",this.message=t||"UnrecognizedURL",Error.captureStackTrace?Error.captureStackTrace(this,e):this.stack=r.stack}return e.prototype=Object.create(Error.prototype),e.prototype.constructor=e,e}()
-class z extends A{constructor(e,t,r){super(e,r),this.url=t,this.preTransitionState=void 0}applyToState(e){var t,r,n=new D,i=this.router.recognizer.recognize(this.url)
-if(!i)throw new L(this.url)
-var o=!1,s=this.url
-function a(e){if(e&&e.inaccessibleByURL)throw new L(s)
-return e}for(t=0,r=i.length;t<r;++t){var u=i[t],c=u.handler,d=[]
-this.router.recognizer.hasRoute(c)&&(d=this.router.recognizer.handlersFor(c)[t].names)
-var h=new k(this.router,c,d,u.params),p=h.route
-p?a(p):h.routePromise=h.routePromise.then(a)
-var f=e.routeInfos[t]
-o||h.shouldSupersede(f)?(o=!0,n.routeInfos[t]=h):n.routeInfos[t]=f}return l(n.queryParams,i.queryParams),n}}function U(e,t){if(e.length!==t.length)return!1
-for(var r=0,n=e.length;r<n;++r)if(e[r]!==t[r])return!1
-return!0}function B(e,t){if(!e&&!t)return!0
-if(!e&&t||e&&!t)return!1
-var r=Object.keys(e),n=Object.keys(t)
-if(r.length!==n.length)return!1
-for(var i=0,o=r.length;i<o;++i){var s=r[i]
-if(e[s]!==t[s])return!1}return!0}var H=class{constructor(e){this._lastQueryParams={},this.state=void 0,this.oldState=void 0,this.activeTransition=void 0,this.currentRouteInfos=void 0,this._changedQueryParams=void 0,this.currentSequence=0,this.log=e,this.recognizer=new n.default,this.reset()}map(e){this.recognizer.map(e,(function(e,t){for(var r=t.length-1,n=!0;r>=0&&n;--r){var i=t[r],o=i.handler
-e.add(t,{as:o}),n="/"===i.path||""===i.path||".index"===o.slice(-6)}}))}hasRoute(e){return this.recognizer.hasRoute(e)}queryParamsTransition(e,t,r,n){if(this.fireQueryParamDidChange(n,e),!t&&this.activeTransition)return this.activeTransition
-var i=new _(this,void 0,void 0)
-return i.queryParamsOnly=!0,r.queryParams=this.finalizeQueryParamChange(n.routeInfos,n.queryParams,i),i[y]=n.queryParams,this.toReadOnlyInfos(i,n),this.routeWillChange(i),i.promise=i.promise.then((e=>(i.isAborted||(this._updateURL(i,r),this.didTransition(this.currentRouteInfos),this.toInfos(i,n.routeInfos,!0),this.routeDidChange(i)),e)),null,g("Transition complete")),i}transitionByIntent(e,t){try{return this.getTransitionByIntent(e,t)}catch(r){return new _(this,e,void 0,r,void 0)}}recognize(e){var t=new z(this,e),r=this.generateNewState(t)
-if(null===r)return r
-var n=P(r.routeInfos,r.queryParams)
-return n[n.length-1]}recognizeAndLoad(e){var t=new z(this,e),n=this.generateNewState(t)
-if(null===n)return r.Promise.reject(`URL ${e} was not recognized`)
-var i=new _(this,t,n,void 0)
-return i.then((()=>{var e=P(n.routeInfos,i[y],!0)
-return e[e.length-1]}))}generateNewState(e){try{return e.applyToState(this.state,!1)}catch(t){return null}}getTransitionByIntent(e,t){var r,n=!!this.activeTransition,i=n?this.activeTransition[v]:this.state,o=e.applyToState(i,t),s=f(i.queryParams,o.queryParams)
-if(U(o.routeInfos,i.routeInfos)){if(s){var a=this.queryParamsTransition(s,n,i,o)
-return a.queryParamsOnly=!0,a}return this.activeTransition||new _(this,void 0,void 0)}if(t){var l=new _(this,void 0,o)
-return l.isIntermediate=!0,this.toReadOnlyInfos(l,o),this.setupContexts(o,l),this.routeWillChange(l),this.activeTransition}return r=new _(this,e,o,void 0,this.activeTransition),function(e,t){if(e.length!==t.length)return!1
-for(var r=0,n=e.length;r<n;++r){if(e[r].name!==t[r].name)return!1
-if(!B(e[r].params,t[r].params))return!1}return!0}(o.routeInfos,i.routeInfos)&&(r.queryParamsOnly=!0),this.toReadOnlyInfos(r,o),this.activeTransition&&this.activeTransition.redirect(r),this.activeTransition=r,r.promise=r.promise.then((e=>this.finalizeTransition(r,e)),null,g("Settle transition promise when transition is finalized")),n||this.notifyExistingHandlers(o,r),this.fireQueryParamDidChange(o,s),r}doTransition(e,t,r){void 0===t&&(t=[]),void 0===r&&(r=!1)
-var n,i=t[t.length-1],o={}
-if(void 0!==i&&i.hasOwnProperty("queryParams")&&(o=t.pop().queryParams),void 0===e){d(this,"Updating query params")
-var{routeInfos:s}=this.state
-n=new F(this,s[s.length-1].name,void 0,[],o)}else"/"===e.charAt(0)?(d(this,"Attempting URL transition to "+e),n=new z(this,e)):(d(this,"Attempting transition to "+e),n=new F(this,e,void 0,t,o))
-return this.transitionByIntent(n,r)}finalizeTransition(e,t){try{d(e.router,e.sequence,"Resolved all models on destination route; finalizing transition.")
-var n=t.routeInfos
-return this.setupContexts(t,e),e.isAborted?(this.state.routeInfos=this.currentRouteInfos,r.Promise.reject(w(e))):(this._updateURL(e,t),e.isActive=!1,this.activeTransition=void 0,this.triggerEvent(this.currentRouteInfos,!0,"didTransition",[]),this.didTransition(this.currentRouteInfos),this.toInfos(e,t.routeInfos,!0),this.routeDidChange(e),d(this,e.sequence,"TRANSITION COMPLETE."),n[n.length-1].route)}catch(s){if("object"!=typeof(o=s)||null===o||"TRANSITION_ABORTED"!==o.code){var i=e[v].routeInfos
-e.trigger(!0,"error",s,e,i[i.length-1].route),e.abort()}throw s}var o}setupContexts(e,t){var r,n,i,o=this.partitionRoutes(this.state,e)
-for(r=0,n=o.exited.length;r<n;r++)delete(i=o.exited[r].route).context,void 0!==i&&(void 0!==i._internalReset&&i._internalReset(!0,t),void 0!==i.exit&&i.exit(t))
-var s=this.oldState=this.state
-this.state=e
-var a=this.currentRouteInfos=o.unchanged.slice()
-try{for(r=0,n=o.reset.length;r<n;r++)void 0!==(i=o.reset[r].route)&&void 0!==i._internalReset&&i._internalReset(!1,t)
-for(r=0,n=o.updatedContext.length;r<n;r++)this.routeEnteredOrUpdated(a,o.updatedContext[r],!1,t)
-for(r=0,n=o.entered.length;r<n;r++)this.routeEnteredOrUpdated(a,o.entered[r],!0,t)}catch(l){throw this.state=s,this.currentRouteInfos=s.routeInfos,l}this.state.queryParams=this.finalizeQueryParamChange(a,e.queryParams,t)}fireQueryParamDidChange(e,t){t&&(this._changedQueryParams=t.all,this.triggerEvent(e.routeInfos,!0,"queryParamsDidChange",[t.changed,t.all,t.removed]),this._changedQueryParams=void 0)}routeEnteredOrUpdated(e,t,r,n){var i=t.route,s=t.context
-function a(i){return r&&void 0!==i.enter&&i.enter(n),o(n),i.context=s,void 0!==i.contextDidChange&&i.contextDidChange(),void 0!==i.setup&&i.setup(s,n),o(n),e.push(t),i}return void 0===i?t.routePromise=t.routePromise.then(a):a(i),!0}partitionRoutes(e,t){var r,n,i,o=e.routeInfos,s=t.routeInfos,a={updatedContext:[],exited:[],entered:[],unchanged:[],reset:[]},l=!1
-for(n=0,i=s.length;n<i;n++){var u=o[n],c=s[n]
-u&&u.route===c.route||(r=!0),r?(a.entered.push(c),u&&a.exited.unshift(u)):l||u.context!==c.context?(l=!0,a.updatedContext.push(c)):a.unchanged.push(u)}for(n=s.length,i=o.length;n<i;n++)a.exited.unshift(o[n])
-return a.reset=a.updatedContext.slice(),a.reset.reverse(),a}_updateURL(e,t){var r=e.urlMethod
-if(r){for(var{routeInfos:n}=t,{name:i}=n[n.length-1],o={},s=n.length-1;s>=0;--s){var a=n[s]
-l(o,a.params),a.route.inaccessibleByURL&&(r=null)}if(r){o.queryParams=e._visibleQueryParams||t.queryParams
-var u=this.recognizer.generate(i,o),c=e.isCausedByInitialTransition,d="replace"===r&&!e.isCausedByAbortingTransition,h=e.queryParamsOnly&&"replace"===r,p="replace"===r&&e.isCausedByAbortingReplaceTransition
-c||d||h||p?this.replaceURL(u):this.updateURL(u)}}}finalizeQueryParamChange(e,t,r){for(var n in t)t.hasOwnProperty(n)&&null===t[n]&&delete t[n]
-var i=[]
-this.triggerEvent(e,!0,"finalizeQueryParamChange",[t,i,r]),r&&(r._visibleQueryParams={})
-for(var o={},s=0,a=i.length;s<a;++s){var l=i[s]
-o[l.key]=l.value,r&&!1!==l.visible&&(r._visibleQueryParams[l.key]=l.value)}return o}toReadOnlyInfos(e,t){var r=this.state.routeInfos
-this.fromInfos(e,r),this.toInfos(e,t.routeInfos),this._lastQueryParams=t.queryParams}fromInfos(e,r){if(void 0!==e&&r.length>0){var n=P(r,(0,t.assign)({},this._lastQueryParams),!0)
-e.from=n[n.length-1]||null}}toInfos(e,r,n){if(void 0===n&&(n=!1),void 0!==e&&r.length>0){var i=P(r,(0,t.assign)({},e[y]),n)
-e.to=i[i.length-1]||null}}notifyExistingHandlers(e,t){var r,n,i,o,s=this.state.routeInfos
-for(n=s.length,r=0;r<n&&(i=s[r],(o=e.routeInfos[r])&&i.name===o.name);r++)o.isResolved
-this.triggerEvent(s,!0,"willTransition",[t]),this.routeWillChange(t),this.willTransition(s,e.routeInfos,t)}reset(){this.state&&p(this.state.routeInfos.slice().reverse(),(function(e){var t=e.route
-return void 0!==t&&void 0!==t.exit&&t.exit(),!0})),this.oldState=void 0,this.state=new D,this.currentRouteInfos=void 0}handleURL(e){return"/"!==e.charAt(0)&&(e="/"+e),this.doTransition(e).method(null)}transitionTo(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-return"object"==typeof e?(r.push(e),this.doTransition(void 0,r,!1)):this.doTransition(e,r)}intermediateTransitionTo(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-return this.doTransition(e,r,!0)}refresh(e){var t=this.activeTransition,r=t?t[v]:this.state,n=r.routeInfos
-void 0===e&&(e=n[0].route),d(this,"Starting a refresh transition")
-var i=n[n.length-1].name,o=new F(this,i,e,[],this._changedQueryParams||r.queryParams),s=this.transitionByIntent(o,!1)
-return t&&"replace"===t.urlMethod&&s.method(t.urlMethod),s}replaceWith(e){return this.doTransition(e).method("replace")}generate(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-for(var i=u(r),o=i[0],s=i[1],a=new F(this,e,void 0,o).applyToState(this.state,!1),c={},d=0,h=a.routeInfos.length;d<h;++d){l(c,a.routeInfos[d].serialize())}return c.queryParams=s,this.recognizer.generate(e,c)}applyIntent(e,t){var r=new F(this,e,void 0,t),n=this.activeTransition&&this.activeTransition[v]||this.state
-return r.applyToState(n,!1)}isActiveIntent(e,t,r,n){var i,o=n||this.state,s=o.routeInfos
-if(!s.length)return!1
-var a=s[s.length-1].name,u=this.recognizer.handlersFor(a),c=0
-for(i=u.length;c<i&&s[c].name!==e;++c);if(c===u.length)return!1
-var d=new D
-d.routeInfos=s.slice(0,c+1),u=u.slice(0,c+1)
-var h=U(new F(this,a,void 0,t).applyToHandlers(d,u,a,!0,!0).routeInfos,d.routeInfos)
-if(!r||!h)return h
-var p={}
-l(p,r)
-var m=o.queryParams
-for(var g in m)m.hasOwnProperty(g)&&p.hasOwnProperty(g)&&(p[g]=m[g])
-return h&&!f(p,r)}isActive(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-var i=u(r)
-return this.isActiveIntent(e,i[0],i[1])}trigger(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-this.triggerEvent(this.currentRouteInfos,!1,e,r)}}
-e.default=H})),e("rsvp",["exports"],(function(e){"use strict"
-function r(e){var t=e._promiseCallbacks
-return t||(t=e._promiseCallbacks={}),t}Object.defineProperty(e,"__esModule",{value:!0}),e.asap=Q,e.all=A,e.allSettled=j,e.race=I,e.hash=N,e.hashSettled=L,e.rethrow=z,e.defer=U,e.denodeify=C,e.configure=o,e.on=fe,e.off=me,e.resolve=$,e.reject=W,e.map=H,e.filter=G,e.async=e.EventTarget=e.Promise=e.cast=e.default=void 0
-var n={mixin(e){return e.on=this.on,e.off=this.off,e.trigger=this.trigger,e._promiseCallbacks=void 0,e},on(e,t){if("function"!=typeof t)throw new TypeError("Callback must be a function")
-var n=r(this),i=n[e]
-i||(i=n[e]=[]),-1===i.indexOf(t)&&i.push(t)},off(e,t){var n=r(this)
-if(t){var i=n[e],o=i.indexOf(t);-1!==o&&i.splice(o,1)}else n[e]=[]},trigger(e,t,n){var i=r(this)[e]
-if(i)for(var o=0;o<i.length;o++)(0,i[o])(t,n)}}
-e.EventTarget=n
-var i={instrument:!1}
-function o(e,t){if(2!==arguments.length)return i[e]
-i[e]=t}n.mixin(i)
-var s=[]
-function a(e,t,r){1===s.push({name:e,payload:{key:t._guidKey,id:t._id,eventName:e,detail:t._result,childId:r&&r._id,label:t._label,timeStamp:Date.now(),error:i["instrument-with-stack"]?new Error(t._label):null}})&&setTimeout((()=>{for(var e=0;e<s.length;e++){var t=s[e],r=t.payload
-r.guid=r.key+r.id,r.childGuid=r.key+r.childId,r.error&&(r.stack=r.error.stack),i.trigger(t.name,t.payload)}s.length=0}),50)}function l(e,t){if(e&&"object"==typeof e&&e.constructor===this)return e
-var r=new this(u,t)
-return h(r,e),r}function u(){}var c=void 0
-function d(e,t,r){t.constructor===e.constructor&&r===y&&e.constructor.resolve===l?function(e,t){1===t._state?f(e,t._result):2===t._state?(t._onError=null,m(e,t._result)):g(t,void 0,(r=>{t===r?f(e,r):h(e,r)}),(t=>m(e,t)))}(e,t):"function"==typeof r?function(e,t,r){i.async((e=>{var n=!1,i=function(e,t,r,n){try{e.call(t,r,n)}catch(i){return i}}(r,t,(r=>{n||(n=!0,t===r?f(e,r):h(e,r))}),(t=>{n||(n=!0,m(e,t))}),e._label)
-!n&&i&&(n=!0,m(e,i))}),e)}(e,t,r):f(e,t)}function h(e,t){if(e===t)f(e,t)
-else if(i=typeof(n=t),null===n||"object"!==i&&"function"!==i)f(e,t)
-else{var r
-try{r=t.then}catch(o){return void m(e,o)}d(e,t,r)}var n,i}function p(e){e._onError&&e._onError(e._result),v(e)}function f(e,t){e._state===c&&(e._result=t,e._state=1,0===e._subscribers.length?i.instrument&&a("fulfilled",e):i.async(v,e))}function m(e,t){e._state===c&&(e._state=2,e._result=t,i.async(p,e))}function g(e,t,r,n){var o=e._subscribers,s=o.length
-e._onError=null,o[s]=t,o[s+1]=r,o[s+2]=n,0===s&&e._state&&i.async(v,e)}function v(e){var t=e._subscribers,r=e._state
-if(i.instrument&&a(1===r?"fulfilled":"rejected",e),0!==t.length){for(var n,o,s=e._result,l=0;l<t.length;l+=3)n=t[l],o=t[l+r],n?b(r,n,o,s):o(s)
-e._subscribers.length=0}}function b(e,t,r,n){var i,o,s="function"==typeof r,a=!0
-if(s)try{i=r(n)}catch(l){a=!1,o=l}else i=n
-t._state!==c||(i===t?m(t,new TypeError("A promises callback cannot return that same promise.")):!1===a?m(t,o):s?h(t,i):1===e?f(t,i):2===e&&m(t,i))}function y(e,t,r){var n=this,o=n._state
-if(1===o&&!e||2===o&&!t)return i.instrument&&a("chained",n,n),n
-n._onError=null
-var s=new n.constructor(u,r),l=n._result
-if(i.instrument&&a("chained",n,s),o===c)g(n,s,e,t)
-else{var d=1===o?e:t
-i.async((()=>b(o,s,d,l)))}return s}class _{constructor(e,t,r,n){this._instanceConstructor=e,this.promise=new e(u,n),this._abortOnReject=r,this._isUsingOwnPromise=e===P,this._isUsingOwnResolve=e.resolve===l,this._init(...arguments)}_init(e,t){var r=t.length||0
-this.length=r,this._remaining=r,this._result=new Array(r),this._enumerate(t)}_enumerate(e){for(var t=this.length,r=this.promise,n=0;r._state===c&&n<t;n++)this._eachEntry(e[n],n,!0)
-this._checkFullfillment()}_checkFullfillment(){if(0===this._remaining){var e=this._result
-f(this.promise,e),this._result=null}}_settleMaybeThenable(e,t,r){var n=this._instanceConstructor
-if(this._isUsingOwnResolve){var i,o,s=!0
-try{i=e.then}catch(l){s=!1,o=l}if(i===y&&e._state!==c)e._onError=null,this._settledAt(e._state,t,e._result,r)
-else if("function"!=typeof i)this._settledAt(1,t,e,r)
-else if(this._isUsingOwnPromise){var a=new n(u)
-!1===s?m(a,o):(d(a,e,i),this._willSettleAt(a,t,r))}else this._willSettleAt(new n((t=>t(e))),t,r)}else this._willSettleAt(n.resolve(e),t,r)}_eachEntry(e,t,r){null!==e&&"object"==typeof e?this._settleMaybeThenable(e,t,r):this._setResultAt(1,t,e,r)}_settledAt(e,t,r,n){var i=this.promise
-i._state===c&&(this._abortOnReject&&2===e?m(i,r):(this._setResultAt(e,t,r,n),this._checkFullfillment()))}_setResultAt(e,t,r,n){this._remaining--,this._result[t]=r}_willSettleAt(e,t,r){g(e,void 0,(e=>this._settledAt(1,t,e,r)),(e=>this._settledAt(2,t,e,r)))}}function w(e,t,r){this._remaining--,this._result[t]=1===e?{state:"fulfilled",value:r}:{state:"rejected",reason:r}}var O="rsvp_"+Date.now()+"-",x=0
-class P{constructor(e,t){this._id=x++,this._label=t,this._state=void 0,this._result=void 0,this._subscribers=[],i.instrument&&a("created",this),u!==e&&("function"!=typeof e&&function(){throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")}(),this instanceof P?function(e,t){var r=!1
-try{t((t=>{r||(r=!0,h(e,t))}),(t=>{r||(r=!0,m(e,t))}))}catch(n){m(e,n)}}(this,e):function(){throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")}())}_onError(e){i.after((()=>{this._onError&&i.trigger("error",e,this._label)}))}catch(e,t){return this.then(void 0,e,t)}finally(e,t){var r=this,n=r.constructor
-return"function"==typeof e?r.then((t=>n.resolve(e()).then((()=>t))),(t=>n.resolve(e()).then((()=>{throw t})))):r.then(e,e)}}function S(e,t){for(var r={},n=e.length,i=new Array(n),o=0;o<n;o++)i[o]=e[o]
-for(var s=0;s<t.length;s++){r[t[s]]=i[s+1]}return r}function T(e){for(var t=e.length,r=new Array(t-1),n=1;n<t;n++)r[n-1]=e[n]
-return r}function E(e,t){return{then:(r,n)=>e.call(t,r,n)}}function C(e,t){var r=function(){for(var r=arguments.length,n=new Array(r+1),i=!1,o=0;o<r;++o){var s=arguments[o]
-if(!i){if(null!==s&&"object"==typeof s)if(s.constructor===P)i=!0
-else try{i=s.then}catch(c){var a=new P(u)
-return m(a,c),a}else i=!1
-i&&!0!==i&&(s=E(i,s))}n[o]=s}var l=new P(u)
-return n[r]=function(e,r){e?m(l,e):void 0===t?h(l,r):!0===t?h(l,T(arguments)):Array.isArray(t)?h(l,S(arguments,t)):h(l,r)},i?M(l,n,e,this):k(l,n,e,this)}
-return r.__proto__=e,r}function k(e,t,r,n){try{r.apply(n,t)}catch(i){m(e,i)}return e}function M(e,t,r,n){return P.all(t).then((t=>k(e,t,r,n)))}function A(e,t){return P.all(e,t)}e.Promise=P,P.cast=l,P.all=function(e,t){return Array.isArray(e)?new _(this,e,!0,t).promise:this.reject(new TypeError("Promise.all must be called with an array"),t)},P.race=function(e,t){var r=new this(u,t)
-if(!Array.isArray(e))return m(r,new TypeError("Promise.race must be called with an array")),r
-for(var n=0;r._state===c&&n<e.length;n++)g(this.resolve(e[n]),void 0,(e=>h(r,e)),(e=>m(r,e)))
-return r},P.resolve=l,P.reject=function(e,t){var r=new this(u,t)
-return m(r,e),r},P.prototype._guidKey=O,P.prototype.then=y
-class R extends _{constructor(e,t,r){super(e,t,!1,r)}}function j(e,t){return Array.isArray(e)?new R(P,e,t).promise:P.reject(new TypeError("Promise.allSettled must be called with an array"),t)}function I(e,t){return P.race(e,t)}R.prototype._setResultAt=w
-class D extends _{constructor(e,t,r,n){void 0===r&&(r=!0),super(e,t,r,n)}_init(e,t){this._result={},this._enumerate(t)}_enumerate(e){var t,r,n=Object.keys(e),i=n.length,o=this.promise
-this._remaining=i
-for(var s=0;o._state===c&&s<i;s++)r=e[t=n[s]],this._eachEntry(r,t,!0)
-this._checkFullfillment()}}function N(e,t){return P.resolve(e,t).then((function(e){if(null===e||"object"!=typeof e)throw new TypeError("Promise.hash must be called with an object")
-return new D(P,e,t).promise}))}class F extends D{constructor(e,t,r){super(e,t,!1,r)}}function L(e,t){return P.resolve(e,t).then((function(e){if(null===e||"object"!=typeof e)throw new TypeError("hashSettled must be called with an object")
-return new F(P,e,!1,t).promise}))}function z(e){throw setTimeout((()=>{throw e})),e}function U(e){var t={resolve:void 0,reject:void 0}
-return t.promise=new P(((e,r)=>{t.resolve=e,t.reject=r}),e),t}F.prototype._setResultAt=w
-class B extends _{constructor(e,t,r,n){super(e,t,!0,n,r)}_init(e,t,r,n,i){var o=t.length||0
-this.length=o,this._remaining=o,this._result=new Array(o),this._mapFn=i,this._enumerate(t)}_setResultAt(e,t,r,n){if(n)try{this._eachEntry(this._mapFn(r,t),t,!1)}catch(i){this._settledAt(2,t,i,!1)}else this._remaining--,this._result[t]=r}}function H(e,t,r){return"function"!=typeof t?P.reject(new TypeError("map expects a function as a second argument"),r):P.resolve(e,r).then((function(e){if(!Array.isArray(e))throw new TypeError("map must be called with an array")
-return new B(P,e,t,r).promise}))}function $(e,t){return P.resolve(e,t)}function W(e,t){return P.reject(e,t)}var q={}
-class V extends B{_checkFullfillment(){if(0===this._remaining&&null!==this._result){var e=this._result.filter((e=>e!==q))
-f(this.promise,e),this._result=null}}_setResultAt(e,t,r,n){if(n){this._result[t]=r
-var i,o=!0
-try{i=this._mapFn(r,t)}catch(s){o=!1,this._settledAt(2,t,s,!1)}o&&this._eachEntry(i,t,!1)}else this._remaining--,r||(this._result[t]=q)}}function G(e,t,r){return"function"!=typeof t?P.reject(new TypeError("filter expects function as a second argument"),r):P.resolve(e,r).then((function(e){if(!Array.isArray(e))throw new TypeError("filter must be called with an array")
-return new V(P,e,t,r).promise}))}var K,Y=0
-function Q(e,t){ce[Y]=e,ce[Y+1]=t,2===(Y+=2)&&ne()}var J="undefined"!=typeof window?window:void 0,X=J||{},Z=X.MutationObserver||X.WebKitMutationObserver,ee="undefined"==typeof self&&"undefined"!=typeof process&&"[object process]"==={}.toString.call(process),te="undefined"!=typeof Uint8ClampedArray&&"undefined"!=typeof importScripts&&"undefined"!=typeof MessageChannel
-function re(){return()=>setTimeout(de,1)}var ne,ie,oe,se,ae,le,ue,ce=new Array(1e3)
-function de(){for(var e=0;e<Y;e+=2){(0,ce[e])(ce[e+1]),ce[e]=void 0,ce[e+1]=void 0}Y=0}ee?(le=process.nextTick,ue=process.versions.node.match(/^(?:(\d+)\.)?(?:(\d+)\.)?(\*|\d+)$/),Array.isArray(ue)&&"0"===ue[1]&&"10"===ue[2]&&(le=setImmediate),ne=()=>le(de)):Z?(oe=0,se=new Z(de),ae=document.createTextNode(""),se.observe(ae,{characterData:!0}),ne=()=>ae.data=oe=++oe%2):te?((ie=new MessageChannel).port1.onmessage=de,ne=()=>ie.port2.postMessage(0)):ne=void 0===J&&"function"==typeof t?function(){try{var e=Function("return this")().require("vertx")
-return void 0!==(K=e.runOnLoop||e.runOnContext)?function(){K(de)}:re()}catch(t){return re()}}():re(),i.async=Q,i.after=e=>setTimeout(e,0)
-var he=$
-e.cast=he
-var pe=(e,t)=>i.async(e,t)
-function fe(){i.on(...arguments)}function me(){i.off(...arguments)}if(e.async=pe,"undefined"!=typeof window&&"object"==typeof window.__PROMISE_INSTRUMENTATION__){var ge=window.__PROMISE_INSTRUMENTATION__
-for(var ve in o("instrument",!0),ge)ge.hasOwnProperty(ve)&&fe(ve,ge[ve])}var be={asap:Q,cast:he,Promise:P,EventTarget:n,all:A,allSettled:j,race:I,hash:N,hashSettled:L,rethrow:z,defer:U,denodeify:C,configure:o,on:fe,off:me,resolve:$,reject:W,map:H,async:pe,filter:G}
-e.default=be})),t("@ember/-internals/bootstrap")}(),function(e){if("object"==typeof exports&&"object"==typeof module)module.exports=e()
-else{if("function"==typeof define&&define.amd)return define([],e);(this||window).CodeMirror=e()}}((function(){"use strict"
-var e=navigator.userAgent,t=navigator.platform,r=/gecko\/\d/i.test(e),n=/MSIE \d/.test(e),i=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(e),o=n||i,s=o&&(n?document.documentMode||6:i[1]),a=/WebKit\//.test(e),l=a&&/Qt\/\d+\.\d+/.test(e),u=/Chrome\//.test(e),c=/Opera\//.test(e),d=/Apple Computer/.test(navigator.vendor),h=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(e),p=/PhantomJS/.test(e),f=/AppleWebKit/.test(e)&&/Mobile\/\w+/.test(e),m=f||/Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(e),g=f||/Mac/.test(t),v=/\bCrOS\b/.test(e),b=/win/i.test(t),y=c&&e.match(/Version\/(\d*\.\d*)/)
-y&&(y=Number(y[1])),y&&y>=15&&(c=!1,a=!0)
-var _=g&&(l||c&&(null==y||y<12.11)),w=r||o&&s>=9,O=!1,x=!1
-function P(e,t){if(!(this instanceof P))return new P(e,t)
-this.options=t=t?Oo(t):{},Oo(Xr,t,!1),N(t)
-var r=t.value
-"string"==typeof r&&(r=new vi(r,t.mode,null,t.lineSeparator)),this.doc=r
-var n=new P.inputStyles[t.inputStyle](this),i=this.display=new S(e,r,n)
-i.wrapper.CodeMirror=this,R(this),M(this),t.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap"),t.autofocus&&!m&&i.input.focus(),U(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,delayingBlurEvent:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,selectingText:!1,draggingText:!1,highlight:new co,keySeq:null,specialChars:null}
-var l=this
-for(var u in o&&s<11&&setTimeout((function(){l.display.input.reset(!0)}),20),function(e){var t=e.display
-Gi(t.scroller,"mousedown",Yt(e,ur)),Gi(t.scroller,"dblclick",o&&s<11?Yt(e,(function(t){if(!to(e,t)){var r=lr(e,t)
-if(r&&!dr(e,t)&&!ar(e.display,t)){Bi(t)
-var n=e.findWordAt(r)
-Be(e.doc,n.anchor,n.head)}}})):function(t){to(e,t)||Bi(t)})
-w||Gi(t.scroller,"contextmenu",(function(t){Ar(e,t)}))
-var r,n={end:0}
-function i(){t.activeTouch&&(r=setTimeout((function(){t.activeTouch=null}),1e3),(n=t.activeTouch).end=+new Date)}function a(e){if(1!=e.touches.length)return!1
-var t=e.touches[0]
-return t.radiusX<=1&&t.radiusY<=1}function l(e,t){if(null==t.left)return!0
-var r=t.left-e.left,n=t.top-e.top
-return r*r+n*n>400}Gi(t.scroller,"touchstart",(function(i){if(!to(e,i)&&!a(i)){clearTimeout(r)
-var o=+new Date
-t.activeTouch={start:o,moved:!1,prev:o-n.end<=300?n:null},1==i.touches.length&&(t.activeTouch.left=i.touches[0].pageX,t.activeTouch.top=i.touches[0].pageY)}})),Gi(t.scroller,"touchmove",(function(){t.activeTouch&&(t.activeTouch.moved=!0)})),Gi(t.scroller,"touchend",(function(r){var n=t.activeTouch
-if(n&&!ar(t,r)&&null!=n.left&&!n.moved&&new Date-n.start<300){var o,s=e.coordsChar(t.activeTouch,"page")
-o=!n.prev||l(n,n.prev)?new je(s,s):!n.prev.prev||l(n,n.prev.prev)?e.findWordAt(s):new je(pe(s.line,0),Fe(e.doc,pe(s.line+1,0))),e.setSelection(o.anchor,o.head),e.focus(),Bi(r)}i()})),Gi(t.scroller,"touchcancel",i),Gi(t.scroller,"scroll",(function(){t.scroller.clientHeight&&(mr(e,t.scroller.scrollTop),gr(e,t.scroller.scrollLeft,!0),Ji(e,"scroll",e))})),Gi(t.scroller,"mousewheel",(function(t){_r(e,t)})),Gi(t.scroller,"DOMMouseScroll",(function(t){_r(e,t)})),Gi(t.wrapper,"scroll",(function(){t.wrapper.scrollTop=t.wrapper.scrollLeft=0})),t.dragFunctions={enter:function(t){to(e,t)||Wi(t)},over:function(t){to(e,t)||(function(e,t){var r=lr(e,t)
-if(!r)return
-var n=document.createDocumentFragment()
-rt(e,r,n),e.display.dragCursor||(e.display.dragCursor=Ao("div",null,"CodeMirror-cursors CodeMirror-dragcursors"),e.display.lineSpace.insertBefore(e.display.dragCursor,e.display.cursorDiv))
-jo(e.display.dragCursor,n)}(e,t),Wi(t))},start:function(t){(function(e,t){if(o&&(!e.state.draggingText||+new Date-hr<100))return void Wi(t)
-if(to(e,t)||ar(e.display,t))return
-if(t.dataTransfer.setData("Text",e.getSelection()),t.dataTransfer.effectAllowed="copyMove",t.dataTransfer.setDragImage&&!d){var r=Ao("img",null,null,"position: fixed; left: 0; top: 0;")
-r.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",c&&(r.width=r.height=1,e.display.wrapper.appendChild(r),r._top=r.offsetTop),t.dataTransfer.setDragImage(r,0,0),c&&r.parentNode.removeChild(r)}})(e,t)},drop:Yt(e,pr),leave:function(t){to(e,t)||fr(e)}}
-var u=t.input.getField()
-Gi(u,"keyup",(function(t){Er.call(e,t)})),Gi(u,"keydown",Yt(e,Tr)),Gi(u,"keypress",Yt(e,Cr)),Gi(u,"focus",xo(kr,e)),Gi(u,"blur",xo(Mr,e))}(this),function(){if(Bo)return
-Gi(window,"resize",(function(){null==e&&(e=setTimeout((function(){e=null,Uo(sr)}),100))})),Gi(window,"blur",(function(){Uo(Mr)})),Bo=!0
-var e}(),Bt(this),this.curOp.forceUpdate=!0,wi(this,r),t.autofocus&&!m||l.hasFocus()?setTimeout(xo(kr,this),20):Mr(this),Zr)Zr.hasOwnProperty(u)&&Zr[u](this,t[u],tn)
-q(this),t.finishInit&&t.finishInit(this)
-for(var h=0;h<sn.length;++h)sn[h](this)
-Ht(this),a&&t.lineWrapping&&"optimizelegibility"==getComputedStyle(i.lineDiv).textRendering&&(i.lineDiv.style.textRendering="auto")}function S(e,t,n){var i=this
-this.input=n,i.scrollbarFiller=Ao("div",null,"CodeMirror-scrollbar-filler"),i.scrollbarFiller.setAttribute("cm-not-content","true"),i.gutterFiller=Ao("div",null,"CodeMirror-gutter-filler"),i.gutterFiller.setAttribute("cm-not-content","true"),i.lineDiv=Ao("div",null,"CodeMirror-code"),i.selectionDiv=Ao("div",null,null,"position: relative; z-index: 1"),i.cursorDiv=Ao("div",null,"CodeMirror-cursors"),i.measure=Ao("div",null,"CodeMirror-measure"),i.lineMeasure=Ao("div",null,"CodeMirror-measure"),i.lineSpace=Ao("div",[i.measure,i.lineMeasure,i.selectionDiv,i.cursorDiv,i.lineDiv],null,"position: relative; outline: none"),i.mover=Ao("div",[Ao("div",[i.lineSpace],"CodeMirror-lines")],null,"position: relative"),i.sizer=Ao("div",[i.mover],"CodeMirror-sizer"),i.sizerWidth=null,i.heightForcer=Ao("div",null,null,"position: absolute; height: "+oo+"px; width: 1px;"),i.gutters=Ao("div",null,"CodeMirror-gutters"),i.lineGutter=null,i.scroller=Ao("div",[i.sizer,i.heightForcer,i.gutters],"CodeMirror-scroll"),i.scroller.setAttribute("tabIndex","-1"),i.wrapper=Ao("div",[i.scrollbarFiller,i.gutterFiller,i.scroller],"CodeMirror"),o&&s<8&&(i.gutters.style.zIndex=-1,i.scroller.style.paddingRight=0),a||r&&m||(i.scroller.draggable=!0),e&&(e.appendChild?e.appendChild(i.wrapper):e(i.wrapper)),i.viewFrom=i.viewTo=t.first,i.reportedViewFrom=i.reportedViewTo=t.first,i.view=[],i.renderedView=null,i.externalMeasured=null,i.viewOffset=0,i.lastWrapHeight=i.lastWrapWidth=0
-i.updateLineNumbers=null,i.nativeBarWidth=i.barHeight=i.barWidth=0,i.scrollbarsClipped=!1,i.lineNumWidth=i.lineNumInnerWidth=i.lineNumChars=null,i.alignWidgets=!1,i.cachedCharWidth=i.cachedTextHeight=i.cachedPaddingH=null,i.maxLine=null,i.maxLineLength=0,i.maxLineChanged=!1,i.wheelDX=i.wheelDY=i.wheelStartX=i.wheelStartY=null,i.shift=!1,i.selForContextMenu=null,i.activeTouch=null,n.init(i)}function T(e){e.doc.mode=P.getMode(e.options,e.doc.modeOption),E(e)}function E(e){e.doc.iter((function(e){e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null)})),e.doc.frontier=e.doc.first,ot(e,100),e.state.modeGen++,e.curOp&&er(e)}function C(e){var t=Dt(e.display),r=e.options.lineWrapping,n=r&&Math.max(5,e.display.scroller.clientWidth/Nt(e.display)-3)
-return function(i){if(Hn(e.doc,i))return 0
-var o=0
-if(i.widgets)for(var s=0;s<i.widgets.length;s++)i.widgets[s].height&&(o+=i.widgets[s].height)
-return r?o+(Math.ceil(i.text.length/n)||1)*t:o+t}}function k(e){var t=e.doc,r=C(e)
-t.iter((function(e){var t=r(e)
-t!=e.height&&Si(e,t)}))}function M(e){e.display.wrapper.className=e.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+e.options.theme.replace(/(^|\s)\s*/g," cm-s-"),Pt(e)}function A(e){R(e),er(e),setTimeout((function(){W(e)}),20)}function R(e){var t=e.display.gutters,r=e.options.gutters
-Ro(t)
-for(var n=0;n<r.length;++n){var i=r[n],o=t.appendChild(Ao("div",null,"CodeMirror-gutter "+i))
-"CodeMirror-linenumbers"==i&&(e.display.lineGutter=o,o.style.width=(e.display.lineNumWidth||1)+"px")}t.style.display=n?"":"none",j(e)}function j(e){var t=e.display.gutters.offsetWidth
-e.display.sizer.style.marginLeft=t+"px"}function I(e){if(0==e.height)return 0
-for(var t,r=e.text.length,n=e;t=Nn(n);){n=(i=t.find(0,!0)).from.line,r+=i.from.ch-i.to.ch}for(n=e;t=Fn(n);){var i=t.find(0,!0)
-r-=n.text.length-i.from.ch,r+=(n=i.to.line).text.length-i.to.ch}return r}function D(e){var t=e.display,r=e.doc
-t.maxLine=Oi(r,r.first),t.maxLineLength=I(t.maxLine),t.maxLineChanged=!0,r.iter((function(e){var r=I(e)
-r>t.maxLineLength&&(t.maxLineLength=r,t.maxLine=e)}))}function N(e){var t=bo(e.gutters,"CodeMirror-linenumbers");-1==t&&e.lineNumbers?e.gutters=e.gutters.concat(["CodeMirror-linenumbers"]):t>-1&&!e.lineNumbers&&(e.gutters=e.gutters.slice(0),e.gutters.splice(t,1))}function F(e){var t=e.display,r=t.gutters.offsetWidth,n=Math.round(e.doc.height+ut(e.display))
-return{clientHeight:t.scroller.clientHeight,viewHeight:t.wrapper.clientHeight,scrollWidth:t.scroller.scrollWidth,clientWidth:t.scroller.clientWidth,viewWidth:t.wrapper.clientWidth,barLeft:e.options.fixedGutter?r:0,docHeight:n,scrollHeight:n+dt(e)+t.barHeight,nativeBarWidth:t.nativeBarWidth,gutterWidth:r}}function L(e,t,r){this.cm=r
-var n=this.vert=Ao("div",[Ao("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar"),i=this.horiz=Ao("div",[Ao("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar")
-e(n),e(i),Gi(n,"scroll",(function(){n.clientHeight&&t(n.scrollTop,"vertical")})),Gi(i,"scroll",(function(){i.clientWidth&&t(i.scrollLeft,"horizontal")})),this.checkedZeroWidth=!1,o&&s<8&&(this.horiz.style.minHeight=this.vert.style.minWidth="18px")}function z(){}function U(e){e.display.scrollbars&&(e.display.scrollbars.clear(),e.display.scrollbars.addClass&&Fo(e.display.wrapper,e.display.scrollbars.addClass)),e.display.scrollbars=new P.scrollbarModel[e.options.scrollbarStyle]((function(t){e.display.wrapper.insertBefore(t,e.display.scrollbarFiller),Gi(t,"mousedown",(function(){e.state.focused&&setTimeout((function(){e.display.input.focus()}),0)})),t.setAttribute("cm-not-content","true")}),(function(t,r){"horizontal"==r?gr(e,t):mr(e,t)}),e),e.display.scrollbars.addClass&&Lo(e.display.wrapper,e.display.scrollbars.addClass)}function B(e,t){t||(t=F(e))
-var r=e.display.barWidth,n=e.display.barHeight
-H(e,t)
-for(var i=0;i<4&&r!=e.display.barWidth||n!=e.display.barHeight;i++)r!=e.display.barWidth&&e.options.lineWrapping&&Z(e),H(e,F(e)),r=e.display.barWidth,n=e.display.barHeight}function H(e,t){var r=e.display,n=r.scrollbars.update(t)
-r.sizer.style.paddingRight=(r.barWidth=n.right)+"px",r.sizer.style.paddingBottom=(r.barHeight=n.bottom)+"px",r.heightForcer.style.borderBottom=n.bottom+"px solid transparent",n.right&&n.bottom?(r.scrollbarFiller.style.display="block",r.scrollbarFiller.style.height=n.bottom+"px",r.scrollbarFiller.style.width=n.right+"px"):r.scrollbarFiller.style.display="",n.bottom&&e.options.coverGutterNextToScrollbar&&e.options.fixedGutter?(r.gutterFiller.style.display="block",r.gutterFiller.style.height=n.bottom+"px",r.gutterFiller.style.width=t.gutterWidth+"px"):r.gutterFiller.style.display=""}function $(e,t,r){var n=r&&null!=r.top?Math.max(0,r.top):e.scroller.scrollTop
-n=Math.floor(n-lt(e))
-var i=r&&null!=r.bottom?r.bottom:n+e.wrapper.clientHeight,o=Ei(t,n),s=Ei(t,i)
-if(r&&r.ensure){var a=r.ensure.from.line,l=r.ensure.to.line
-a<o?(o=a,s=Ei(t,Ci(Oi(t,a))+e.wrapper.clientHeight)):Math.min(l,t.lastLine())>=s&&(o=Ei(t,Ci(Oi(t,l))-e.wrapper.clientHeight),s=l)}return{from:o,to:Math.max(s,o+1)}}function W(e){var t=e.display,r=t.view
-if(t.alignWidgets||t.gutters.firstChild&&e.options.fixedGutter){for(var n=G(t)-t.scroller.scrollLeft+e.doc.scrollLeft,i=t.gutters.offsetWidth,o=n+"px",s=0;s<r.length;s++)if(!r[s].hidden){e.options.fixedGutter&&r[s].gutter&&(r[s].gutter.style.left=o)
-var a=r[s].alignable
-if(a)for(var l=0;l<a.length;l++)a[l].style.left=o}e.options.fixedGutter&&(t.gutters.style.left=n+i+"px")}}function q(e){if(!e.options.lineNumbers)return!1
-var t=e.doc,r=V(e.options,t.first+t.size-1),n=e.display
-if(r.length!=n.lineNumChars){var i=n.measure.appendChild(Ao("div",[Ao("div",r)],"CodeMirror-linenumber CodeMirror-gutter-elt")),o=i.firstChild.offsetWidth,s=i.offsetWidth-o
-return n.lineGutter.style.width="",n.lineNumInnerWidth=Math.max(o,n.lineGutter.offsetWidth-s)+1,n.lineNumWidth=n.lineNumInnerWidth+s,n.lineNumChars=n.lineNumInnerWidth?r.length:-1,n.lineGutter.style.width=n.lineNumWidth+"px",j(e),!0}return!1}function V(e,t){return String(e.lineNumberFormatter(t+e.firstLineNumber))}function G(e){return e.scroller.getBoundingClientRect().left-e.sizer.getBoundingClientRect().left}function K(e,t,r){var n=e.display
-this.viewport=t,this.visible=$(n,e.doc,t),this.editorIsHidden=!n.wrapper.offsetWidth,this.wrapperHeight=n.wrapper.clientHeight,this.wrapperWidth=n.wrapper.clientWidth,this.oldDisplayWidth=ht(e),this.force=r,this.dims=te(e),this.events=[]}function Y(e,t){var r=e.display,n=e.doc
-if(t.editorIsHidden)return rr(e),!1
-if(!t.force&&t.visible.from>=r.viewFrom&&t.visible.to<=r.viewTo&&(null==r.updateLineNumbers||r.updateLineNumbers>=r.viewTo)&&r.renderedView==r.view&&0==or(e))return!1
-q(e)&&(rr(e),t.dims=te(e))
-var i=n.first+n.size,o=Math.max(t.visible.from-e.options.viewportMargin,n.first),s=Math.min(i,t.visible.to+e.options.viewportMargin)
-r.viewFrom<o&&o-r.viewFrom<20&&(o=Math.max(n.first,r.viewFrom)),r.viewTo>s&&r.viewTo-s<20&&(s=Math.min(i,r.viewTo)),x&&(o=Un(e.doc,o),s=Bn(e.doc,s))
-var l=o!=r.viewFrom||s!=r.viewTo||r.lastWrapHeight!=t.wrapperHeight||r.lastWrapWidth!=t.wrapperWidth;(function(e,t,r){var n=e.display
-0==n.view.length||t>=n.viewTo||r<=n.viewFrom?(n.view=Zt(e,t,r),n.viewFrom=t):(n.viewFrom>t?n.view=Zt(e,t,n.viewFrom).concat(n.view):n.viewFrom<t&&(n.view=n.view.slice(nr(e,t))),n.viewFrom=t,n.viewTo<r?n.view=n.view.concat(Zt(e,n.viewTo,r)):n.viewTo>r&&(n.view=n.view.slice(0,nr(e,r))))
-n.viewTo=r})(e,o,s),r.viewOffset=Ci(Oi(e.doc,r.viewFrom)),e.display.mover.style.top=r.viewOffset+"px"
-var u=or(e)
-if(!l&&0==u&&!t.force&&r.renderedView==r.view&&(null==r.updateLineNumbers||r.updateLineNumbers>=r.viewTo))return!1
-var c=Do()
-return u>4&&(r.lineDiv.style.display="none"),function(e,t,r){var n=e.display,i=e.options.lineNumbers,o=n.lineDiv,s=o.firstChild
-function l(t){var r=t.nextSibling
-return a&&g&&e.display.currentWheelTarget==t?t.style.display="none":t.parentNode.removeChild(t),r}for(var u=n.view,c=n.viewFrom,d=0;d<u.length;d++){var h=u[d]
-if(h.hidden);else if(h.node&&h.node.parentNode==o){for(;s!=h.node;)s=l(s)
-var p=i&&null!=t&&t<=c&&h.lineNumber
-h.changes&&(bo(h.changes,"gutter")>-1&&(p=!1),re(e,h,c,r)),p&&(Ro(h.lineNumber),h.lineNumber.appendChild(document.createTextNode(V(e.options,c)))),s=h.node.nextSibling}else{var f=ue(e,h,c,r)
-o.insertBefore(f,s)}c+=h.size}for(;s;)s=l(s)}(e,r.updateLineNumbers,t.dims),u>4&&(r.lineDiv.style.display=""),r.renderedView=r.view,c&&Do()!=c&&c.offsetHeight&&c.focus(),Ro(r.cursorDiv),Ro(r.selectionDiv),r.gutters.style.height=r.sizer.style.minHeight=0,l&&(r.lastWrapHeight=t.wrapperHeight,r.lastWrapWidth=t.wrapperWidth,ot(e,400)),r.updateLineNumbers=null,!0}function Q(e,t){for(var r=t.viewport,n=!0;(n&&e.options.lineWrapping&&t.oldDisplayWidth!=ht(e)||(r&&null!=r.top&&(r={top:Math.min(e.doc.height+ut(e.display)-pt(e),r.top)}),t.visible=$(e.display,e.doc,r),!(t.visible.from>=e.display.viewFrom&&t.visible.to<=e.display.viewTo)))&&Y(e,t);n=!1){Z(e)
-var i=F(e)
-et(e),B(e,i),X(e,i)}t.signal(e,"update",e),e.display.viewFrom==e.display.reportedViewFrom&&e.display.viewTo==e.display.reportedViewTo||(t.signal(e,"viewportChange",e,e.display.viewFrom,e.display.viewTo),e.display.reportedViewFrom=e.display.viewFrom,e.display.reportedViewTo=e.display.viewTo)}function J(e,t){var r=new K(e,t)
-if(Y(e,r)){Z(e),Q(e,r)
-var n=F(e)
-et(e),B(e,n),X(e,n),r.finish()}}function X(e,t){e.display.sizer.style.minHeight=t.docHeight+"px",e.display.heightForcer.style.top=t.docHeight+"px",e.display.gutters.style.height=t.docHeight+e.display.barHeight+dt(e)+"px"}function Z(e){for(var t=e.display,r=t.lineDiv.offsetTop,n=0;n<t.view.length;n++){var i,a=t.view[n]
-if(!a.hidden){if(o&&s<8){var l=a.node.offsetTop+a.node.offsetHeight
-i=l-r,r=l}else{var u=a.node.getBoundingClientRect()
-i=u.bottom-u.top}var c=a.line.height-i
-if(i<2&&(i=Dt(t)),(c>.001||c<-.001)&&(Si(a.line,i),ee(a.line),a.rest))for(var d=0;d<a.rest.length;d++)ee(a.rest[d])}}}function ee(e){if(e.widgets)for(var t=0;t<e.widgets.length;++t)e.widgets[t].height=e.widgets[t].node.parentNode.offsetHeight}function te(e){for(var t=e.display,r={},n={},i=t.gutters.clientLeft,o=t.gutters.firstChild,s=0;o;o=o.nextSibling,++s)r[e.options.gutters[s]]=o.offsetLeft+o.clientLeft+i,n[e.options.gutters[s]]=o.clientWidth
-return{fixedPos:G(t),gutterTotalWidth:t.gutters.offsetWidth,gutterLeft:r,gutterWidth:n,wrapperWidth:t.wrapper.clientWidth}}function re(e,t,r,n){for(var i=0;i<t.changes.length;i++){var o=t.changes[i]
-"text"==o?oe(e,t):"gutter"==o?ae(e,t,r,n):"class"==o?se(t):"widget"==o&&le(e,t,n)}t.changes=null}function ne(e){return e.node==e.text&&(e.node=Ao("div",null,null,"position: relative"),e.text.parentNode&&e.text.parentNode.replaceChild(e.node,e.text),e.node.appendChild(e.text),o&&s<8&&(e.node.style.zIndex=2)),e.node}function ie(e,t){var r=e.display.externalMeasured
-return r&&r.line==t.line?(e.display.externalMeasured=null,t.measure=r.measure,r.built):si(e,t)}function oe(e,t){var r=t.text.className,n=ie(e,t)
-t.text==t.node&&(t.node=n.pre),t.text.parentNode.replaceChild(n.pre,t.text),t.text=n.pre,n.bgClass!=t.bgClass||n.textClass!=t.textClass?(t.bgClass=n.bgClass,t.textClass=n.textClass,se(t)):r&&(t.text.className=r)}function se(e){(function(e){var t=e.bgClass?e.bgClass+" "+(e.line.bgClass||""):e.line.bgClass
-if(t&&(t+=" CodeMirror-linebackground"),e.background)t?e.background.className=t:(e.background.parentNode.removeChild(e.background),e.background=null)
-else if(t){var r=ne(e)
-e.background=r.insertBefore(Ao("div",null,t),r.firstChild)}})(e),e.line.wrapClass?ne(e).className=e.line.wrapClass:e.node!=e.text&&(e.node.className="")
-var t=e.textClass?e.textClass+" "+(e.line.textClass||""):e.line.textClass
-e.text.className=t||""}function ae(e,t,r,n){if(t.gutter&&(t.node.removeChild(t.gutter),t.gutter=null),t.gutterBackground&&(t.node.removeChild(t.gutterBackground),t.gutterBackground=null),t.line.gutterClass){var i=ne(t)
-t.gutterBackground=Ao("div",null,"CodeMirror-gutter-background "+t.line.gutterClass,"left: "+(e.options.fixedGutter?n.fixedPos:-n.gutterTotalWidth)+"px; width: "+n.gutterTotalWidth+"px"),i.insertBefore(t.gutterBackground,t.text)}var o=t.line.gutterMarkers
-if(e.options.lineNumbers||o){i=ne(t)
-var s=t.gutter=Ao("div",null,"CodeMirror-gutter-wrapper","left: "+(e.options.fixedGutter?n.fixedPos:-n.gutterTotalWidth)+"px")
-if(e.display.input.setUneditable(s),i.insertBefore(s,t.text),t.line.gutterClass&&(s.className+=" "+t.line.gutterClass),!e.options.lineNumbers||o&&o["CodeMirror-linenumbers"]||(t.lineNumber=s.appendChild(Ao("div",V(e.options,r),"CodeMirror-linenumber CodeMirror-gutter-elt","left: "+n.gutterLeft["CodeMirror-linenumbers"]+"px; width: "+e.display.lineNumInnerWidth+"px"))),o)for(var a=0;a<e.options.gutters.length;++a){var l=e.options.gutters[a],u=o.hasOwnProperty(l)&&o[l]
-u&&s.appendChild(Ao("div",[u],"CodeMirror-gutter-elt","left: "+n.gutterLeft[l]+"px; width: "+n.gutterWidth[l]+"px"))}}}function le(e,t,r){t.alignable&&(t.alignable=null)
-for(var n=t.node.firstChild;n;n=i){var i=n.nextSibling
-"CodeMirror-linewidget"==n.className&&t.node.removeChild(n)}ce(e,t,r)}function ue(e,t,r,n){var i=ie(e,t)
-return t.text=t.node=i.pre,i.bgClass&&(t.bgClass=i.bgClass),i.textClass&&(t.textClass=i.textClass),se(t),ae(e,t,r,n),ce(e,t,n),t.node}function ce(e,t,r){if(de(e,t.line,t,r,!0),t.rest)for(var n=0;n<t.rest.length;n++)de(e,t.rest[n],t,r,!1)}function de(e,t,r,n,i){if(t.widgets)for(var o=ne(r),s=0,a=t.widgets;s<a.length;++s){var l=a[s],u=Ao("div",[l.node],"CodeMirror-linewidget")
-l.handleMouseEvents||u.setAttribute("cm-ignore-events","true"),he(l,u,r,n),e.display.input.setUneditable(u),i&&l.above?o.insertBefore(u,r.gutter||r.text):o.appendChild(u),Zi(l,"redraw")}}function he(e,t,r,n){if(e.noHScroll){(r.alignable||(r.alignable=[])).push(t)
-var i=n.wrapperWidth
-t.style.left=n.fixedPos+"px",e.coverGutter||(i-=n.gutterTotalWidth,t.style.paddingLeft=n.gutterTotalWidth+"px"),t.style.width=i+"px"}e.coverGutter&&(t.style.zIndex=5,t.style.position="relative",e.noHScroll||(t.style.marginLeft=-n.gutterTotalWidth+"px"))}L.prototype=Oo({update:function(e){var t=e.scrollWidth>e.clientWidth+1,r=e.scrollHeight>e.clientHeight+1,n=e.nativeBarWidth
-if(r){this.vert.style.display="block",this.vert.style.bottom=t?n+"px":"0"
-var i=e.viewHeight-(t?n:0)
-this.vert.firstChild.style.height=Math.max(0,e.scrollHeight-e.clientHeight+i)+"px"}else this.vert.style.display="",this.vert.firstChild.style.height="0"
-if(t){this.horiz.style.display="block",this.horiz.style.right=r?n+"px":"0",this.horiz.style.left=e.barLeft+"px"
-var o=e.viewWidth-e.barLeft-(r?n:0)
-this.horiz.firstChild.style.width=e.scrollWidth-e.clientWidth+o+"px"}else this.horiz.style.display="",this.horiz.firstChild.style.width="0"
-return!this.checkedZeroWidth&&e.clientHeight>0&&(0==n&&this.zeroWidthHack(),this.checkedZeroWidth=!0),{right:r?n:0,bottom:t?n:0}},setScrollLeft:function(e){this.horiz.scrollLeft!=e&&(this.horiz.scrollLeft=e),this.disableHoriz&&this.enableZeroWidthBar(this.horiz,this.disableHoriz)},setScrollTop:function(e){this.vert.scrollTop!=e&&(this.vert.scrollTop=e),this.disableVert&&this.enableZeroWidthBar(this.vert,this.disableVert)},zeroWidthHack:function(){var e=g&&!h?"12px":"18px"
-this.horiz.style.height=this.vert.style.width=e,this.horiz.style.pointerEvents=this.vert.style.pointerEvents="none",this.disableHoriz=new co,this.disableVert=new co},enableZeroWidthBar:function(e,t){e.style.pointerEvents="auto",t.set(1e3,(function r(){var n=e.getBoundingClientRect()
-document.elementFromPoint(n.left+1,n.bottom-1)!=e?e.style.pointerEvents="none":t.set(1e3,r)}))},clear:function(){var e=this.horiz.parentNode
-e.removeChild(this.horiz),e.removeChild(this.vert)}},L.prototype),z.prototype=Oo({update:function(){return{bottom:0,right:0}},setScrollLeft:function(){},setScrollTop:function(){},clear:function(){}},z.prototype),P.scrollbarModel={native:L,null:z},K.prototype.signal=function(e,t){no(e,t)&&this.events.push(arguments)},K.prototype.finish=function(){for(var e=0;e<this.events.length;e++)Ji.apply(null,this.events[e])}
-var pe=P.Pos=function(e,t){if(!(this instanceof pe))return new pe(e,t)
-this.line=e,this.ch=t},fe=P.cmpPos=function(e,t){return e.line-t.line||e.ch-t.ch}
-function me(e){return pe(e.line,e.ch)}function ge(e,t){return fe(e,t)<0?t:e}function ve(e,t){return fe(e,t)<0?e:t}function be(e){e.state.focused||(e.display.input.focus(),kr(e))}var ye=null
-function _e(e,t,r,n,i){var o=e.doc
-e.display.shift=!1,n||(n=o.sel)
-var s=e.state.pasteIncoming||"paste"==i,a=o.splitLines(t),l=null
-if(s&&n.ranges.length>1)if(ye&&ye.text.join("\n")==t){if(n.ranges.length%ye.text.length==0){l=[]
-for(var u=0;u<ye.text.length;u++)l.push(o.splitLines(ye.text[u]))}}else a.length==n.ranges.length&&(l=yo(a,(function(e){return[e]})))
-for(u=n.ranges.length-1;u>=0;u--){var c=n.ranges[u],d=c.from(),h=c.to()
-c.empty()&&(r&&r>0?d=pe(d.line,d.ch-r):e.state.overwrite&&!s?h=pe(h.line,Math.min(Oi(o,h.line).text.length,h.ch+go(a).length)):ye&&ye.lineWise&&ye.text.join("\n")==t&&(d=h=pe(d.line,0)))
-var p=e.curOp.updateInput,f={from:d,to:h,text:l?l[u%l.length]:a,origin:i||(s?"paste":e.state.cutIncoming?"cut":"+input")}
-Fr(e.doc,f),Zi(e,"inputRead",e,f)}t&&!s&&Oe(e,t),qr(e),e.curOp.updateInput=p,e.curOp.typing=!0,e.state.pasteIncoming=e.state.cutIncoming=!1}function we(e,t){var r=e.clipboardData&&e.clipboardData.getData("text/plain")
-if(r)return e.preventDefault(),t.isReadOnly()||t.options.disableInput||Kt(t,(function(){_e(t,r,0,null,"paste")})),!0}function Oe(e,t){if(e.options.electricChars&&e.options.smartIndent)for(var r=e.doc.sel,n=r.ranges.length-1;n>=0;n--){var i=r.ranges[n]
-if(!(i.head.ch>100||n&&r.ranges[n-1].head.line==i.head.line)){var o=e.getModeAt(i.head),s=!1
-if(o.electricChars){for(var a=0;a<o.electricChars.length;a++)if(t.indexOf(o.electricChars.charAt(a))>-1){s=Gr(e,i.head.line,"smart")
-break}}else o.electricInput&&o.electricInput.test(Oi(e.doc,i.head.line).text.slice(0,i.head.ch))&&(s=Gr(e,i.head.line,"smart"))
-s&&Zi(e,"electricInput",e,i.head.line)}}}function xe(e){for(var t=[],r=[],n=0;n<e.doc.sel.ranges.length;n++){var i=e.doc.sel.ranges[n].head.line,o={anchor:pe(i,0),head:pe(i+1,0)}
-r.push(o),t.push(e.getRange(o.anchor,o.head))}return{text:t,ranges:r}}function Pe(e){e.setAttribute("autocorrect","off"),e.setAttribute("autocapitalize","off"),e.setAttribute("spellcheck","false")}function Se(e){this.cm=e,this.prevInput="",this.pollingFast=!1,this.polling=new co,this.inaccurateSelection=!1,this.hasSelection=!1,this.composing=null}function Te(){var e=Ao("textarea",null,null,"position: absolute; padding: 0; width: 1px; height: 1em; outline: none"),t=Ao("div",[e],null,"overflow: hidden; position: relative; width: 3px; height: 0px;")
-return a?e.style.width="1000px":e.setAttribute("wrap","off"),f&&(e.style.border="1px solid black"),Pe(e),t}function Ee(e){this.cm=e,this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null,this.polling=new co,this.gracePeriod=!1}function Ce(e,t){var r=gt(e,t.line)
-if(!r||r.hidden)return null
-var n=Oi(e.doc,t.line),i=ft(r,n,t.line),o=ki(n),s="left"
-o&&(s=as(o,t.ch)%2?"right":"left")
-var a=wt(i.map,t.ch,s)
-return a.offset="right"==a.collapse?a.end:a.start,a}function ke(e,t){return t&&(e.bad=!0),e}function Me(e,t,r){var n
-if(t==e.display.lineDiv){if(!(n=e.display.lineDiv.childNodes[r]))return ke(e.clipPos(pe(e.display.viewTo-1)),!0)
-t=null,r=0}else for(n=t;;n=n.parentNode){if(!n||n==e.display.lineDiv)return null
-if(n.parentNode&&n.parentNode==e.display.lineDiv)break}for(var i=0;i<e.display.view.length;i++){var o=e.display.view[i]
-if(o.node==n)return Ae(o,t,r)}}function Ae(e,t,r){var n=e.text.firstChild,i=!1
-if(!t||!Io(n,t))return ke(pe(Ti(e.line),0),!0)
-if(t==n&&(i=!0,t=n.childNodes[r],r=0,!t)){var o=e.rest?go(e.rest):e.line
-return ke(pe(Ti(o),o.text.length),i)}var s=3==t.nodeType?t:null,a=t
-for(s||1!=t.childNodes.length||3!=t.firstChild.nodeType||(s=t.firstChild,r&&(r=s.nodeValue.length));a.parentNode!=n;)a=a.parentNode
-var l=e.measure,u=l.maps
-function c(t,r,n){for(var i=-1;i<(u?u.length:0);i++)for(var o=i<0?l.map:u[i],s=0;s<o.length;s+=3){var a=o[s+2]
-if(a==t||a==r){var c=Ti(i<0?e.line:e.rest[i]),d=o[s]+n
-return(n<0||a!=t)&&(d=o[s+(n?1:0)]),pe(c,d)}}}var d=c(s,a,r)
-if(d)return ke(d,i)
-for(var h=a.nextSibling,p=s?s.nodeValue.length-r:0;h;h=h.nextSibling){if(d=c(h,h.firstChild,0))return ke(pe(d.line,d.ch-p),i)
-p+=h.textContent.length}var f=a.previousSibling
-for(p=r;f;f=f.previousSibling){if(d=c(f,f.firstChild,-1))return ke(pe(d.line,d.ch+p),i)
-p+=h.textContent.length}}function Re(e,t){this.ranges=e,this.primIndex=t}function je(e,t){this.anchor=e,this.head=t}function Ie(e,t){var r=e[t]
-e.sort((function(e,t){return fe(e.from(),t.from())})),t=bo(e,r)
-for(var n=1;n<e.length;n++){var i=e[n],o=e[n-1]
-if(fe(o.to(),i.from())>=0){var s=ve(o.from(),i.from()),a=ge(o.to(),i.to()),l=o.empty()?i.from()==i.head:o.from()==o.head
-n<=t&&--t,e.splice(--n,2,new je(l?a:s,l?s:a))}}return new Re(e,t)}function De(e,t){return new Re([new je(e,t||e)],0)}function Ne(e,t){return Math.max(e.first,Math.min(t,e.first+e.size-1))}function Fe(e,t){if(t.line<e.first)return pe(e.first,0)
-var r=e.first+e.size-1
-return t.line>r?pe(r,Oi(e,r).text.length):function(e,t){var r=e.ch
-return null==r||r>t?pe(e.line,t):r<0?pe(e.line,0):e}(t,Oi(e,t.line).text.length)}function Le(e,t){return t>=e.first&&t<e.first+e.size}function ze(e,t){for(var r=[],n=0;n<t.length;n++)r[n]=Fe(e,t[n])
-return r}function Ue(e,t,r,n){if(e.cm&&e.cm.display.shift||e.extend){var i=t.anchor
-if(n){var o=fe(r,i)<0
-o!=fe(n,i)<0?(i=r,r=n):o!=fe(r,n)<0&&(r=n)}return new je(i,r)}return new je(n||r,r)}function Be(e,t,r,n){Ve(e,new Re([Ue(e,e.sel.primary(),t,r)],0),n)}function He(e,t,r){for(var n=[],i=0;i<e.sel.ranges.length;i++)n[i]=Ue(e,e.sel.ranges[i],t[i],null)
-Ve(e,Ie(n,e.sel.primIndex),r)}function $e(e,t,r,n){var i=e.sel.ranges.slice(0)
-i[t]=r,Ve(e,Ie(i,e.sel.primIndex),n)}function We(e,t,r,n){Ve(e,De(t,r),n)}function qe(e,t,r){var n=e.history.done,i=go(n)
-i&&i.ranges?(n[n.length-1]=t,Ge(e,t,r)):Ve(e,t,r)}function Ve(e,t,r){Ge(e,t,r),function(e,t,r,n){var i=e.history,o=n&&n.origin
-r==i.lastSelOp||o&&i.lastSelOrigin==o&&(i.lastModTime==i.lastSelTime&&i.lastOrigin==o||function(e,t,r,n){var i=t.charAt(0)
-return"*"==i||"+"==i&&r.ranges.length==n.ranges.length&&r.somethingSelected()==n.somethingSelected()&&new Date-e.history.lastSelTime<=(e.cm?e.cm.options.historyEventDelay:500)}(e,o,go(i.done),t))?i.done[i.done.length-1]=t:Ii(t,i.done)
-i.lastSelTime=+new Date,i.lastSelOrigin=o,i.lastSelOp=r,n&&!1!==n.clearRedo&&Ri(i.undone)}(e,e.sel,e.cm?e.cm.curOp.id:NaN,r)}function Ge(e,t,r){(no(e,"beforeSelectionChange")||e.cm&&no(e.cm,"beforeSelectionChange"))&&(t=function(e,t,r){var n={ranges:t.ranges,update:function(t){this.ranges=[]
-for(var r=0;r<t.length;r++)this.ranges[r]=new je(Fe(e,t[r].anchor),Fe(e,t[r].head))},origin:r&&r.origin}
-return Ji(e,"beforeSelectionChange",e,n),e.cm&&Ji(e.cm,"beforeSelectionChange",e.cm,n),n.ranges!=t.ranges?Ie(n.ranges,n.ranges.length-1):t}(e,t,r))
-var n=r&&r.bias||(fe(t.primary().head,e.sel.primary().head)<0?-1:1)
-Ke(e,Qe(e,t,n,!0)),r&&!1===r.scroll||!e.cm||qr(e.cm)}function Ke(e,t){t.equals(e.sel)||(e.sel=t,e.cm&&(e.cm.curOp.updateInput=e.cm.curOp.selectionChanged=!0,ro(e.cm)),Zi(e,"cursorActivity",e))}function Ye(e){Ke(e,Qe(e,e.sel,null,!1))}function Qe(e,t,r,n){for(var i,o=0;o<t.ranges.length;o++){var s=t.ranges[o],a=t.ranges.length==e.sel.ranges.length&&e.sel.ranges[o],l=Xe(e,s.anchor,a&&a.anchor,r,n),u=Xe(e,s.head,a&&a.head,r,n);(i||l!=s.anchor||u!=s.head)&&(i||(i=t.ranges.slice(0,o)),i[o]=new je(l,u))}return i?Ie(i,t.primIndex):t}function Je(e,t,r,n,i){var o=Oi(e,t.line)
-if(o.markedSpans)for(var s=0;s<o.markedSpans.length;++s){var a=o.markedSpans[s],l=a.marker
-if((null==a.from||(l.inclusiveLeft?a.from<=t.ch:a.from<t.ch))&&(null==a.to||(l.inclusiveRight?a.to>=t.ch:a.to>t.ch))){if(i&&(Ji(l,"beforeCursorEnter"),l.explicitlyCleared)){if(o.markedSpans){--s
-continue}break}if(!l.atomic)continue
-if(r){var u,c=l.find(n<0?1:-1)
-if((n<0?l.inclusiveRight:l.inclusiveLeft)&&(c=Ze(e,c,-n,c&&c.line==t.line?o:null)),c&&c.line==t.line&&(u=fe(c,r))&&(n<0?u<0:u>0))return Je(e,c,t,n,i)}var d=l.find(n<0?-1:1)
-return(n<0?l.inclusiveLeft:l.inclusiveRight)&&(d=Ze(e,d,n,d.line==t.line?o:null)),d?Je(e,d,t,n,i):null}}return t}function Xe(e,t,r,n,i){var o=n||1,s=Je(e,t,r,o,i)||!i&&Je(e,t,r,o,!0)||Je(e,t,r,-o,i)||!i&&Je(e,t,r,-o,!0)
-return s||(e.cantEdit=!0,pe(e.first,0))}function Ze(e,t,r,n){return r<0&&0==t.ch?t.line>e.first?Fe(e,pe(t.line-1)):null:r>0&&t.ch==(n||Oi(e,t.line)).text.length?t.line<e.first+e.size-1?pe(t.line+1,0):null:new pe(t.line,t.ch+r)}function et(e){e.display.input.showSelection(e.display.input.prepareSelection())}function tt(e,t){for(var r=e.doc,n={},i=n.cursors=document.createDocumentFragment(),o=n.selection=document.createDocumentFragment(),s=0;s<r.sel.ranges.length;s++)if(!1!==t||s!=r.sel.primIndex){var a=r.sel.ranges[s]
-if(!(a.from().line>=e.display.viewTo||a.to().line<e.display.viewFrom)){var l=a.empty();(l||e.options.showCursorWhenSelecting)&&rt(e,a.head,i),l||nt(e,a,o)}}return n}function rt(e,t,r){var n=Mt(e,t,"div",null,null,!e.options.singleCursorHeightPerLine),i=r.appendChild(Ao("div"," ","CodeMirror-cursor"))
-if(i.style.left=n.left+"px",i.style.top=n.top+"px",i.style.height=Math.max(0,n.bottom-n.top)*e.options.cursorHeight+"px",n.other){var o=r.appendChild(Ao("div"," ","CodeMirror-cursor CodeMirror-secondarycursor"))
-o.style.display="",o.style.left=n.other.left+"px",o.style.top=n.other.top+"px",o.style.height=.85*(n.other.bottom-n.other.top)+"px"}}function nt(e,t,r){var n=e.display,i=e.doc,o=document.createDocumentFragment(),s=ct(e.display),a=s.left,l=Math.max(n.sizerWidth,ht(e)-n.sizer.offsetLeft)-s.right
-function u(e,t,r,n){t<0&&(t=0),t=Math.round(t),n=Math.round(n),o.appendChild(Ao("div",null,"CodeMirror-selected","position: absolute; left: "+e+"px; top: "+t+"px; width: "+(null==r?l-e:r)+"px; height: "+(n-t)+"px"))}function c(t,r,n){var o,s,c=Oi(i,t),d=c.text.length
-function h(r,n){return kt(e,pe(t,r),"div",c,n)}return function(e,t,r,n){if(!e)return n(t,r,"ltr")
-for(var i=!1,o=0;o<e.length;++o){var s=e[o];(s.from<r&&s.to>t||t==r&&s.to==t)&&(n(Math.max(s.from,t),Math.min(s.to,r),1==s.level?"rtl":"ltr"),i=!0)}i||n(t,r,"ltr")}(ki(c),r||0,null==n?d:n,(function(e,t,i){var c,p,f,m=h(e,"left")
-if(e==t)c=m,p=f=m.left
-else{if(c=h(t-1,"right"),"rtl"==i){var g=m
-m=c,c=g}p=m.left,f=c.right}null==r&&0==e&&(p=a),c.top-m.top>3&&(u(p,m.top,null,m.bottom),p=a,m.bottom<c.top&&u(p,m.bottom,null,c.top)),null==n&&t==d&&(f=l),(!o||m.top<o.top||m.top==o.top&&m.left<o.left)&&(o=m),(!s||c.bottom>s.bottom||c.bottom==s.bottom&&c.right>s.right)&&(s=c),p<a+1&&(p=a),u(p,c.top,f-p,c.bottom)})),{start:o,end:s}}var d=t.from(),h=t.to()
-if(d.line==h.line)c(d.line,d.ch,h.ch)
-else{var p=Oi(i,d.line),f=Oi(i,h.line),m=zn(p)==zn(f),g=c(d.line,d.ch,m?p.text.length+1:null).end,v=c(h.line,m?0:null,h.ch).start
-m&&(g.top<v.top-2?(u(g.right,g.top,null,g.bottom),u(a,v.top,v.left,v.bottom)):u(g.right,g.top,v.left-g.right,g.bottom)),g.bottom<v.top&&u(a,g.bottom,null,v.top)}r.appendChild(o)}function it(e){if(e.state.focused){var t=e.display
-clearInterval(t.blinker)
-var r=!0
-t.cursorDiv.style.visibility="",e.options.cursorBlinkRate>0?t.blinker=setInterval((function(){t.cursorDiv.style.visibility=(r=!r)?"":"hidden"}),e.options.cursorBlinkRate):e.options.cursorBlinkRate<0&&(t.cursorDiv.style.visibility="hidden")}}function ot(e,t){e.doc.mode.startState&&e.doc.frontier<e.display.viewTo&&e.state.highlight.set(t,xo(st,e))}function st(e){var t=e.doc
-if(t.frontier<t.first&&(t.frontier=t.first),!(t.frontier>=e.display.viewTo)){var r=+new Date+e.options.workTime,n=ln(t.mode,at(e,t.frontier)),i=[]
-t.iter(t.frontier,Math.min(t.first+t.size,e.display.viewTo+500),(function(o){if(t.frontier>=e.display.viewFrom){var s=o.styles,a=o.text.length>e.options.maxHighlightLength,l=ei(e,o,a?ln(t.mode,n):n,!0)
-o.styles=l.styles
-var u=o.styleClasses,c=l.classes
-c?o.styleClasses=c:u&&(o.styleClasses=null)
-for(var d=!s||s.length!=o.styles.length||u!=c&&(!u||!c||u.bgClass!=c.bgClass||u.textClass!=c.textClass),h=0;!d&&h<s.length;++h)d=s[h]!=o.styles[h]
-d&&i.push(t.frontier),o.stateAfter=a?n:ln(t.mode,n)}else o.text.length<=e.options.maxHighlightLength&&ri(e,o.text,n),o.stateAfter=t.frontier%5==0?ln(t.mode,n):null
-if(++t.frontier,+new Date>r)return ot(e,e.options.workDelay),!0})),i.length&&Kt(e,(function(){for(var t=0;t<i.length;t++)tr(e,i[t],"text")}))}}function at(e,t,r){var n=e.doc,i=e.display
-if(!n.mode.startState)return!0
-var o=function(e,t,r){for(var n,i,o=e.doc,s=r?-1:t-(e.doc.mode.innerMode?1e3:100),a=t;a>s;--a){if(a<=o.first)return o.first
-var l=Oi(o,a-1)
-if(l.stateAfter&&(!r||a<=o.frontier))return a
-var u=ho(l.text,null,e.options.tabSize);(null==i||n>u)&&(i=a-1,n=u)}return i}(e,t,r),s=o>n.first&&Oi(n,o-1).stateAfter
-return s=s?ln(n.mode,s):un(n.mode),n.iter(o,t,(function(r){ri(e,r.text,s)
-var a=o==t-1||o%5==0||o>=i.viewFrom&&o<i.viewTo
-r.stateAfter=a?ln(n.mode,s):null,++o})),r&&(n.frontier=o),s}function lt(e){return e.lineSpace.offsetTop}function ut(e){return e.mover.offsetHeight-e.lineSpace.offsetHeight}function ct(e){if(e.cachedPaddingH)return e.cachedPaddingH
-var t=jo(e.measure,Ao("pre","x")),r=window.getComputedStyle?window.getComputedStyle(t):t.currentStyle,n={left:parseInt(r.paddingLeft),right:parseInt(r.paddingRight)}
-return isNaN(n.left)||isNaN(n.right)||(e.cachedPaddingH=n),n}function dt(e){return oo-e.display.nativeBarWidth}function ht(e){return e.display.scroller.clientWidth-dt(e)-e.display.barWidth}function pt(e){return e.display.scroller.clientHeight-dt(e)-e.display.barHeight}function ft(e,t,r){if(e.line==t)return{map:e.measure.map,cache:e.measure.cache}
-for(var n=0;n<e.rest.length;n++)if(e.rest[n]==t)return{map:e.measure.maps[n],cache:e.measure.caches[n]}
-for(n=0;n<e.rest.length;n++)if(Ti(e.rest[n])>r)return{map:e.measure.maps[n],cache:e.measure.caches[n],before:!0}}function mt(e,t,r,n){return bt(e,vt(e,t),r,n)}function gt(e,t){if(t>=e.display.viewFrom&&t<e.display.viewTo)return e.display.view[nr(e,t)]
-var r=e.display.externalMeasured
-return r&&t>=r.lineN&&t<r.lineN+r.size?r:void 0}function vt(e,t){var r=Ti(t),n=gt(e,r)
-n&&!n.text?n=null:n&&n.changes&&(re(e,n,r,te(e)),e.curOp.forceUpdate=!0),n||(n=function(e,t){var r=Ti(t=zn(t)),n=e.display.externalMeasured=new Xt(e.doc,t,r)
-n.lineN=r
-var i=n.built=si(e,n)
-return n.text=i.pre,jo(e.display.lineMeasure,i.pre),n}(e,t))
-var i=ft(n,t,r)
-return{line:t,view:n,rect:null,map:i.map,cache:i.cache,before:i.before,hasHeights:!1}}function bt(e,t,r,n,i){t.before&&(r=-1)
-var a,l=r+(n||"")
-return t.cache.hasOwnProperty(l)?a=t.cache[l]:(t.rect||(t.rect=t.view.text.getBoundingClientRect()),t.hasHeights||(function(e,t,r){var n=e.options.lineWrapping,i=n&&ht(e)
-if(!t.measure.heights||n&&t.measure.width!=i){var o=t.measure.heights=[]
-if(n){t.measure.width=i
-for(var s=t.text.firstChild.getClientRects(),a=0;a<s.length-1;a++){var l=s[a],u=s[a+1]
-Math.abs(l.bottom-u.bottom)>2&&o.push((l.bottom+u.top)/2-r.top)}}o.push(r.bottom-r.top)}}(e,t.view,t.rect),t.hasHeights=!0),a=function(e,t,r,n){var i,a=wt(t.map,r,n),l=a.node,u=a.start,c=a.end,d=a.collapse
-if(3==l.nodeType){for(var h=0;h<4;h++){for(;u&&Mo(t.line.text.charAt(a.coverStart+u));)--u
-for(;a.coverStart+c<a.coverEnd&&Mo(t.line.text.charAt(a.coverStart+c));)++c
-if(o&&s<9&&0==u&&c==a.coverEnd-a.coverStart)i=l.parentNode.getBoundingClientRect()
-else if(o&&e.options.lineWrapping){i=(p=Co(l,u,c).getClientRects()).length?p["right"==n?p.length-1:0]:_t}else i=Co(l,u,c).getBoundingClientRect()||_t
-if(i.left||i.right||0==u)break
-c=u,u-=1,d="right"}o&&s<11&&(i=function(e,t){if(!window.screen||null==screen.logicalXDPI||screen.logicalXDPI==screen.deviceXDPI||!function(e){if(null!=Jo)return Jo
-var t=jo(e,Ao("span","x")),r=t.getBoundingClientRect(),n=Co(t,0,1).getBoundingClientRect()
-return Jo=Math.abs(r.left-n.left)>1}(e))return t
-var r=screen.logicalXDPI/screen.deviceXDPI,n=screen.logicalYDPI/screen.deviceYDPI
-return{left:t.left*r,right:t.right*r,top:t.top*n,bottom:t.bottom*n}}(e.display.measure,i))}else{var p
-u>0&&(d=n="right"),i=e.options.lineWrapping&&(p=l.getClientRects()).length>1?p["right"==n?p.length-1:0]:l.getBoundingClientRect()}if(o&&s<9&&!u&&(!i||!i.left&&!i.right)){var f=l.parentNode.getClientRects()[0]
-i=f?{left:f.left,right:f.left+Nt(e.display),top:f.top,bottom:f.bottom}:_t}var m=i.top-t.rect.top,g=i.bottom-t.rect.top,v=(m+g)/2,b=t.view.measure.heights
-for(h=0;h<b.length-1&&!(v<b[h]);h++);var y=h?b[h-1]:0,_=b[h],w={left:("right"==d?i.right:i.left)-t.rect.left,right:("left"==d?i.left:i.right)-t.rect.left,top:y,bottom:_}
-i.left||i.right||(w.bogus=!0)
-e.options.singleCursorHeightPerLine||(w.rtop=m,w.rbottom=g)
-return w}(e,t,r,n),a.bogus||(t.cache[l]=a)),{left:a.left,right:a.right,top:i?a.rtop:a.top,bottom:i?a.rbottom:a.bottom}}Se.prototype=Oo({init:function(e){var t=this,r=this.cm,n=this.wrapper=Te(),i=this.textarea=n.firstChild
-function a(e){if(!to(r,e)){if(r.somethingSelected())ye={lineWise:!1,text:r.getSelections()},t.inaccurateSelection&&(t.prevInput="",t.inaccurateSelection=!1,i.value=ye.text.join("\n"),vo(i))
-else{if(!r.options.lineWiseCopyCut)return
-var n=xe(r)
-ye={lineWise:!0,text:n.text},"cut"==e.type?r.setSelections(n.ranges,null,ao):(t.prevInput="",i.value=n.text.join("\n"),vo(i))}"cut"==e.type&&(r.state.cutIncoming=!0)}}e.wrapper.insertBefore(n,e.wrapper.firstChild),f&&(i.style.width="0px"),Gi(i,"input",(function(){o&&s>=9&&t.hasSelection&&(t.hasSelection=null),t.poll()})),Gi(i,"paste",(function(e){to(r,e)||we(e,r)||(r.state.pasteIncoming=!0,t.fastPoll())})),Gi(i,"cut",a),Gi(i,"copy",a),Gi(e.scroller,"paste",(function(n){ar(e,n)||to(r,n)||(r.state.pasteIncoming=!0,t.focus())})),Gi(e.lineSpace,"selectstart",(function(t){ar(e,t)||Bi(t)})),Gi(i,"compositionstart",(function(){var e=r.getCursor("from")
-t.composing&&t.composing.range.clear(),t.composing={start:e,range:r.markText(e,r.getCursor("to"),{className:"CodeMirror-composing"})}})),Gi(i,"compositionend",(function(){t.composing&&(t.poll(),t.composing.range.clear(),t.composing=null)}))},prepareSelection:function(){var e=this.cm,t=e.display,r=e.doc,n=tt(e)
-if(e.options.moveInputWithCursor){var i=Mt(e,r.sel.primary().head,"div"),o=t.wrapper.getBoundingClientRect(),s=t.lineDiv.getBoundingClientRect()
-n.teTop=Math.max(0,Math.min(t.wrapper.clientHeight-10,i.top+s.top-o.top)),n.teLeft=Math.max(0,Math.min(t.wrapper.clientWidth-10,i.left+s.left-o.left))}return n},showSelection:function(e){var t=this.cm.display
-jo(t.cursorDiv,e.cursors),jo(t.selectionDiv,e.selection),null!=e.teTop&&(this.wrapper.style.top=e.teTop+"px",this.wrapper.style.left=e.teLeft+"px")},reset:function(e){if(!this.contextMenuPending){var t,r,n=this.cm,i=n.doc
-if(n.somethingSelected()){this.prevInput=""
-var a=i.sel.primary(),l=(t=Qo&&(a.to().line-a.from().line>100||(r=n.getSelection()).length>1e3))?"-":r||n.getSelection()
-this.textarea.value=l,n.state.focused&&vo(this.textarea),o&&s>=9&&(this.hasSelection=l)}else e||(this.prevInput=this.textarea.value="",o&&s>=9&&(this.hasSelection=null))
-this.inaccurateSelection=t}},getField:function(){return this.textarea},supportsTouch:function(){return!1},focus:function(){if("nocursor"!=this.cm.options.readOnly&&(!m||Do()!=this.textarea))try{this.textarea.focus()}catch(Go){}},blur:function(){this.textarea.blur()},resetPosition:function(){this.wrapper.style.top=this.wrapper.style.left=0},receivedFocus:function(){this.slowPoll()},slowPoll:function(){var e=this
-e.pollingFast||e.polling.set(this.cm.options.pollInterval,(function(){e.poll(),e.cm.state.focused&&e.slowPoll()}))},fastPoll:function(){var e=!1,t=this
-t.pollingFast=!0,t.polling.set(20,(function r(){t.poll()||e?(t.pollingFast=!1,t.slowPoll()):(e=!0,t.polling.set(60,r))}))},poll:function(){var e=this.cm,t=this.textarea,r=this.prevInput
-if(this.contextMenuPending||!e.state.focused||Yo(t)&&!r&&!this.composing||e.isReadOnly()||e.options.disableInput||e.state.keySeq)return!1
-var n=t.value
-if(n==r&&!e.somethingSelected())return!1
-if(o&&s>=9&&this.hasSelection===n||g&&/[\uf700-\uf7ff]/.test(n))return e.display.input.reset(),!1
-if(e.doc.sel==e.display.selForContextMenu){var i=n.charCodeAt(0)
-if(8203!=i||r||(r="​"),8666==i)return this.reset(),this.cm.execCommand("undo")}for(var a=0,l=Math.min(r.length,n.length);a<l&&r.charCodeAt(a)==n.charCodeAt(a);)++a
-var u=this
-return Kt(e,(function(){_e(e,n.slice(a),r.length-a,null,u.composing?"*compose":null),n.length>1e3||n.indexOf("\n")>-1?t.value=u.prevInput="":u.prevInput=n,u.composing&&(u.composing.range.clear(),u.composing.range=e.markText(u.composing.start,e.getCursor("to"),{className:"CodeMirror-composing"}))})),!0},ensurePolled:function(){this.pollingFast&&this.poll()&&(this.pollingFast=!1)},onKeyPress:function(){o&&s>=9&&(this.hasSelection=null),this.fastPoll()},onContextMenu:function(e){var t=this,r=t.cm,n=r.display,i=t.textarea,l=lr(r,e),u=n.scroller.scrollTop
-if(l&&!c){r.options.resetSelectionOnContextMenu&&-1==r.doc.sel.contains(l)&&Yt(r,Ve)(r.doc,De(l),ao)
-var d=i.style.cssText,h=t.wrapper.style.cssText
-t.wrapper.style.cssText="position: absolute"
-var p=t.wrapper.getBoundingClientRect()
-if(i.style.cssText="position: absolute; width: 30px; height: 30px; top: "+(e.clientY-p.top-5)+"px; left: "+(e.clientX-p.left-5)+"px; z-index: 1000; background: "+(o?"rgba(255, 255, 255, .05)":"transparent")+"; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);",a)var f=window.scrollY
-if(n.input.focus(),a&&window.scrollTo(null,f),n.input.reset(),r.somethingSelected()||(i.value=t.prevInput=" "),t.contextMenuPending=!0,n.selForContextMenu=r.doc.sel,clearTimeout(n.detectingSelectAll),o&&s>=9&&g(),w){Wi(e)
-var m=function(){Qi(window,"mouseup",m),setTimeout(v,20)}
-Gi(window,"mouseup",m)}else setTimeout(v,50)}function g(){if(null!=i.selectionStart){var e=r.somethingSelected(),o="​"+(e?i.value:"")
-i.value="⇚",i.value=o,t.prevInput=e?"":"​",i.selectionStart=1,i.selectionEnd=o.length,n.selForContextMenu=r.doc.sel}}function v(){if(t.contextMenuPending=!1,t.wrapper.style.cssText=h,i.style.cssText=d,o&&s<9&&n.scrollbars.setScrollTop(n.scroller.scrollTop=u),null!=i.selectionStart){(!o||o&&s<9)&&g()
-var e=0,a=function(){n.selForContextMenu==r.doc.sel&&0==i.selectionStart&&i.selectionEnd>0&&"​"==t.prevInput?Yt(r,cn.selectAll)(r):e++<10?n.detectingSelectAll=setTimeout(a,500):n.input.reset()}
-n.detectingSelectAll=setTimeout(a,200)}}},readOnlyChanged:function(e){e||this.reset()},setUneditable:_o,needsContentAttribute:!1},Se.prototype),Ee.prototype=Oo({init:function(e){var t=this,r=t.cm,n=t.div=e.lineDiv
-function i(e){if(!to(r,e)){if(r.somethingSelected())ye={lineWise:!1,text:r.getSelections()},"cut"==e.type&&r.replaceSelection("",null,"cut")
-else{if(!r.options.lineWiseCopyCut)return
-var t=xe(r)
-ye={lineWise:!0,text:t.text},"cut"==e.type&&r.operation((function(){r.setSelections(t.ranges,0,ao),r.replaceSelection("",null,"cut")}))}if(e.clipboardData&&!f)e.preventDefault(),e.clipboardData.clearData(),e.clipboardData.setData("text/plain",ye.text.join("\n"))
-else{var n=Te(),i=n.firstChild
-r.display.lineSpace.insertBefore(n,r.display.lineSpace.firstChild),i.value=ye.text.join("\n")
-var o=document.activeElement
-vo(i),setTimeout((function(){r.display.lineSpace.removeChild(n),o.focus()}),50)}}}Pe(n),Gi(n,"paste",(function(e){to(r,e)||we(e,r)})),Gi(n,"compositionstart",(function(e){var n=e.data
-if(t.composing={sel:r.doc.sel,data:n,startData:n},n){var i=r.doc.sel.primary(),o=r.getLine(i.head.line).indexOf(n,Math.max(0,i.head.ch-n.length))
-o>-1&&o<=i.head.ch&&(t.composing.sel=De(pe(i.head.line,o),pe(i.head.line,o+n.length)))}})),Gi(n,"compositionupdate",(function(e){t.composing.data=e.data})),Gi(n,"compositionend",(function(e){var r=t.composing
-r&&(e.data==r.startData||/\u200b/.test(e.data)||(r.data=e.data),setTimeout((function(){r.handled||t.applyComposition(r),t.composing==r&&(t.composing=null)}),50))})),Gi(n,"touchstart",(function(){t.forceCompositionEnd()})),Gi(n,"input",(function(){t.composing||!r.isReadOnly()&&t.pollContent()||Kt(t.cm,(function(){er(r)}))})),Gi(n,"copy",i),Gi(n,"cut",i)},prepareSelection:function(){var e=tt(this.cm,!1)
-return e.focus=this.cm.state.focused,e},showSelection:function(e,t){e&&this.cm.display.view.length&&((e.focus||t)&&this.showPrimarySelection(),this.showMultipleSelections(e))},showPrimarySelection:function(){var e=window.getSelection(),t=this.cm.doc.sel.primary(),n=Me(this.cm,e.anchorNode,e.anchorOffset),i=Me(this.cm,e.focusNode,e.focusOffset)
-if(!n||n.bad||!i||i.bad||0!=fe(ve(n,i),t.from())||0!=fe(ge(n,i),t.to())){var o=Ce(this.cm,t.from()),s=Ce(this.cm,t.to())
-if(o||s){var a=this.cm.display.view,l=e.rangeCount&&e.getRangeAt(0)
-if(o){if(!s){var u=a[a.length-1].measure,c=u.maps?u.maps[u.maps.length-1]:u.map
-s={node:c[c.length-1],offset:c[c.length-2]-c[c.length-3]}}}else o={node:a[0].measure.map[2],offset:0}
-try{var d=Co(o.node,o.offset,s.offset,s.node)}catch(Go){}d&&(!r&&this.cm.state.focused?(e.collapse(o.node,o.offset),d.collapsed||e.addRange(d)):(e.removeAllRanges(),e.addRange(d)),l&&null==e.anchorNode?e.addRange(l):r&&this.startGracePeriod()),this.rememberSelection()}}},startGracePeriod:function(){var e=this
-clearTimeout(this.gracePeriod),this.gracePeriod=setTimeout((function(){e.gracePeriod=!1,e.selectionChanged()&&e.cm.operation((function(){e.cm.curOp.selectionChanged=!0}))}),20)},showMultipleSelections:function(e){jo(this.cm.display.cursorDiv,e.cursors),jo(this.cm.display.selectionDiv,e.selection)},rememberSelection:function(){var e=window.getSelection()
-this.lastAnchorNode=e.anchorNode,this.lastAnchorOffset=e.anchorOffset,this.lastFocusNode=e.focusNode,this.lastFocusOffset=e.focusOffset},selectionInEditor:function(){var e=window.getSelection()
-if(!e.rangeCount)return!1
-var t=e.getRangeAt(0).commonAncestorContainer
-return Io(this.div,t)},focus:function(){"nocursor"!=this.cm.options.readOnly&&this.div.focus()},blur:function(){this.div.blur()},getField:function(){return this.div},supportsTouch:function(){return!0},receivedFocus:function(){var e=this
-this.selectionInEditor()?this.pollSelection():Kt(this.cm,(function(){e.cm.curOp.selectionChanged=!0})),this.polling.set(this.cm.options.pollInterval,(function t(){e.cm.state.focused&&(e.pollSelection(),e.polling.set(e.cm.options.pollInterval,t))}))},selectionChanged:function(){var e=window.getSelection()
-return e.anchorNode!=this.lastAnchorNode||e.anchorOffset!=this.lastAnchorOffset||e.focusNode!=this.lastFocusNode||e.focusOffset!=this.lastFocusOffset},pollSelection:function(){if(!this.composing&&!this.gracePeriod&&this.selectionChanged()){var e=window.getSelection(),t=this.cm
-this.rememberSelection()
-var r=Me(t,e.anchorNode,e.anchorOffset),n=Me(t,e.focusNode,e.focusOffset)
-r&&n&&Kt(t,(function(){Ve(t.doc,De(r,n),ao),(r.bad||n.bad)&&(t.curOp.selectionChanged=!0)}))}},pollContent:function(){var e,t=this.cm,r=t.display,n=t.doc.sel.primary(),i=n.from(),o=n.to()
-if(i.line<r.viewFrom||o.line>r.viewTo-1)return!1
-if(i.line==r.viewFrom||0==(e=nr(t,i.line)))var s=Ti(r.view[0].line),a=r.view[0].node
-else s=Ti(r.view[e].line),a=r.view[e-1].node.nextSibling
-var l=nr(t,o.line)
-if(l==r.view.length-1)var u=r.viewTo-1,c=r.lineDiv.lastChild
-else u=Ti(r.view[l+1].line)-1,c=r.view[l+1].node.previousSibling
-for(var d=t.doc.splitLines(function(e,t,r,n,i){var o="",s=!1,a=e.doc.lineSeparator()
-function l(e){return function(t){return t.id==e}}function u(t){if(1==t.nodeType){var r=t.getAttribute("cm-text")
-if(null!=r)return""==r&&(r=t.textContent.replace(/\u200b/g,"")),void(o+=r)
-var c,d=t.getAttribute("cm-marker")
-if(d){var h=e.findMarks(pe(n,0),pe(i+1,0),l(+d))
-return void(h.length&&(c=h[0].find())&&(o+=xi(e.doc,c.from,c.to).join(a)))}if("false"==t.getAttribute("contenteditable"))return
-for(var p=0;p<t.childNodes.length;p++)u(t.childNodes[p]);/^(pre|div|p)$/i.test(t.nodeName)&&(s=!0)}else if(3==t.nodeType){var f=t.nodeValue
-if(!f)return
-s&&(o+=a,s=!1),o+=f}}for(;u(t),t!=r;)t=t.nextSibling
-return o}(t,a,c,s,u)),h=xi(t.doc,pe(s,0),pe(u,Oi(t.doc,u).text.length));d.length>1&&h.length>1;)if(go(d)==go(h))d.pop(),h.pop(),u--
-else{if(d[0]!=h[0])break
-d.shift(),h.shift(),s++}for(var p=0,f=0,m=d[0],g=h[0],v=Math.min(m.length,g.length);p<v&&m.charCodeAt(p)==g.charCodeAt(p);)++p
-for(var b=go(d),y=go(h),_=Math.min(b.length-(1==d.length?p:0),y.length-(1==h.length?p:0));f<_&&b.charCodeAt(b.length-f-1)==y.charCodeAt(y.length-f-1);)++f
-d[d.length-1]=b.slice(0,b.length-f),d[0]=d[0].slice(p)
-var w=pe(s,p),O=pe(u,h.length?go(h).length-f:0)
-return d.length>1||d[0]||fe(w,O)?(Hr(t.doc,d,w,O,"+input"),!0):void 0},ensurePolled:function(){this.forceCompositionEnd()},reset:function(){this.forceCompositionEnd()},forceCompositionEnd:function(){this.composing&&!this.composing.handled&&(this.applyComposition(this.composing),this.composing.handled=!0,this.div.blur(),this.div.focus())},applyComposition:function(e){this.cm.isReadOnly()?Yt(this.cm,er)(this.cm):e.data&&e.data!=e.startData&&Yt(this.cm,_e)(this.cm,e.data,0,e.sel)},setUneditable:function(e){e.contentEditable="false"},onKeyPress:function(e){e.preventDefault(),this.cm.isReadOnly()||Yt(this.cm,_e)(this.cm,String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),0)},readOnlyChanged:function(e){this.div.contentEditable=String("nocursor"!=e)},onContextMenu:_o,resetPosition:_o,needsContentAttribute:!0},Ee.prototype),P.inputStyles={textarea:Se,contenteditable:Ee},Re.prototype={primary:function(){return this.ranges[this.primIndex]},equals:function(e){if(e==this)return!0
-if(e.primIndex!=this.primIndex||e.ranges.length!=this.ranges.length)return!1
-for(var t=0;t<this.ranges.length;t++){var r=this.ranges[t],n=e.ranges[t]
-if(0!=fe(r.anchor,n.anchor)||0!=fe(r.head,n.head))return!1}return!0},deepCopy:function(){for(var e=[],t=0;t<this.ranges.length;t++)e[t]=new je(me(this.ranges[t].anchor),me(this.ranges[t].head))
-return new Re(e,this.primIndex)},somethingSelected:function(){for(var e=0;e<this.ranges.length;e++)if(!this.ranges[e].empty())return!0
-return!1},contains:function(e,t){t||(t=e)
-for(var r=0;r<this.ranges.length;r++){var n=this.ranges[r]
-if(fe(t,n.from())>=0&&fe(e,n.to())<=0)return r}return-1}},je.prototype={from:function(){return ve(this.anchor,this.head)},to:function(){return ge(this.anchor,this.head)},empty:function(){return this.head.line==this.anchor.line&&this.head.ch==this.anchor.ch}}
-var yt,_t={left:0,right:0,top:0,bottom:0}
-function wt(e,t,r){for(var n,i,o,s,a=0;a<e.length;a+=3){var l=e[a],u=e[a+1]
-if(t<l?(i=0,o=1,s="left"):t<u?o=(i=t-l)+1:(a==e.length-3||t==u&&e[a+3]>t)&&(i=(o=u-l)-1,t>=u&&(s="right")),null!=i){if(n=e[a+2],l==u&&r==(n.insertLeft?"left":"right")&&(s=r),"left"==r&&0==i)for(;a&&e[a-2]==e[a-3]&&e[a-1].insertLeft;)n=e[2+(a-=3)],s="left"
-if("right"==r&&i==u-l)for(;a<e.length-3&&e[a+3]==e[a+4]&&!e[a+5].insertLeft;)n=e[(a+=3)+2],s="right"
-break}}return{node:n,start:i,end:o,collapse:s,coverStart:l,coverEnd:u}}function Ot(e){if(e.measure&&(e.measure.cache={},e.measure.heights=null,e.rest))for(var t=0;t<e.rest.length;t++)e.measure.caches[t]={}}function xt(e){e.display.externalMeasure=null,Ro(e.display.lineMeasure)
-for(var t=0;t<e.display.view.length;t++)Ot(e.display.view[t])}function Pt(e){xt(e),e.display.cachedCharWidth=e.display.cachedTextHeight=e.display.cachedPaddingH=null,e.options.lineWrapping||(e.display.maxLineChanged=!0),e.display.lineNumChars=null}function St(){return window.pageXOffset||(document.documentElement||document.body).scrollLeft}function Tt(){return window.pageYOffset||(document.documentElement||document.body).scrollTop}function Et(e,t,r,n){if(t.widgets)for(var i=0;i<t.widgets.length;++i)if(t.widgets[i].above){var o=Vn(t.widgets[i])
-r.top+=o,r.bottom+=o}if("line"==n)return r
-n||(n="local")
-var s=Ci(t)
-if("local"==n?s+=lt(e.display):s-=e.display.viewOffset,"page"==n||"window"==n){var a=e.display.lineSpace.getBoundingClientRect()
-s+=a.top+("window"==n?0:Tt())
-var l=a.left+("window"==n?0:St())
-r.left+=l,r.right+=l}return r.top+=s,r.bottom+=s,r}function Ct(e,t,r){if("div"==r)return t
-var n=t.left,i=t.top
-if("page"==r)n-=St(),i-=Tt()
-else if("local"==r||!r){var o=e.display.sizer.getBoundingClientRect()
-n+=o.left,i+=o.top}var s=e.display.lineSpace.getBoundingClientRect()
-return{left:n-s.left,top:i-s.top}}function kt(e,t,r,n,i){return n||(n=Oi(e.doc,t.line)),Et(e,n,mt(e,n,t.ch,i),r)}function Mt(e,t,r,n,i,o){function s(t,s){var a=bt(e,i,t,s?"right":"left",o)
-return s?a.left=a.right:a.right=a.left,Et(e,n,a,r)}function a(e,t){var r=l[t],n=r.level%2
-return e==es(r)&&t&&r.level<l[t-1].level?(e=ts(r=l[--t])-(r.level%2?0:1),n=!0):e==ts(r)&&t<l.length-1&&r.level<l[t+1].level&&(e=es(r=l[++t])-r.level%2,n=!1),n&&e==r.to&&e>r.from?s(e-1):s(e,n)}n=n||Oi(e.doc,t.line),i||(i=vt(e,n))
-var l=ki(n),u=t.ch
-if(!l)return s(u)
-var c=a(u,as(l,u))
-return null!=Xo&&(c.other=a(u,Xo)),c}function At(e,t){var r=0
-t=Fe(e.doc,t)
-e.options.lineWrapping||(r=Nt(e.display)*t.ch)
-var n=Oi(e.doc,t.line),i=Ci(n)+lt(e.display)
-return{left:r,right:r,top:i,bottom:i+n.height}}function Rt(e,t,r,n){var i=pe(e,t)
-return i.xRel=n,r&&(i.outside=!0),i}function jt(e,t,r){var n=e.doc
-if((r+=e.display.viewOffset)<0)return Rt(n.first,0,!0,-1)
-var i=Ei(n,r),o=n.first+n.size-1
-if(i>o)return Rt(n.first+n.size-1,Oi(n,o).text.length,!0,1)
-t<0&&(t=0)
-for(var s=Oi(n,i);;){var a=It(e,s,i,t,r),l=Fn(s),u=l&&l.find(0,!0)
-if(!l||!(a.ch>u.from.ch||a.ch==u.from.ch&&a.xRel>0))return a
-i=Ti(s=u.to.line)}}function It(e,t,r,n,i){var o=i-Ci(t),s=!1,a=2*e.display.wrapper.clientWidth,l=vt(e,t)
-function u(n){var i=Mt(e,pe(r,n),"line",t,l)
-return s=!0,o>i.bottom?i.left-a:o<i.top?i.left+a:(s=!1,i.left)}var c=ki(t),d=t.text.length,h=rs(t),p=ns(t),f=u(h),m=s,g=u(p),v=s
-if(n>g)return Rt(r,p,v,1)
-for(;;){if(c?p==h||p==us(t,h,1):p-h<=1){for(var b=n<f||n-f<=g-n?h:p,y=n-(b==h?f:g);Mo(t.text.charAt(b));)++b
-return Rt(r,b,b==h?m:v,y<-1?-1:y>1?1:0)}var _=Math.ceil(d/2),w=h+_
-if(c){w=h
-for(var O=0;O<_;++O)w=us(t,w,1)}var x=u(w)
-x>n?(p=w,g=x,(v=s)&&(g+=1e3),d=_):(h=w,f=x,m=s,d-=_)}}function Dt(e){if(null!=e.cachedTextHeight)return e.cachedTextHeight
-if(null==yt){yt=Ao("pre")
-for(var t=0;t<49;++t)yt.appendChild(document.createTextNode("x")),yt.appendChild(Ao("br"))
-yt.appendChild(document.createTextNode("x"))}jo(e.measure,yt)
-var r=yt.offsetHeight/50
-return r>3&&(e.cachedTextHeight=r),Ro(e.measure),r||1}function Nt(e){if(null!=e.cachedCharWidth)return e.cachedCharWidth
-var t=Ao("span","xxxxxxxxxx"),r=Ao("pre",[t])
-jo(e.measure,r)
-var n=t.getBoundingClientRect(),i=(n.right-n.left)/10
-return i>2&&(e.cachedCharWidth=i),i||10}var Ft,Lt,zt=null,Ut=0
-function Bt(e){e.curOp={cm:e,viewChanged:!1,startHeight:e.doc.height,forceUpdate:!1,updateInput:null,typing:!1,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:!1,updateMaxLine:!1,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:!1,id:++Ut},zt?zt.ops.push(e.curOp):e.curOp.ownsGroup=zt={ops:[e.curOp],delayedCallbacks:[]}}function Ht(e){var t=e.curOp.ownsGroup
-if(t)try{(function(e){var t=e.delayedCallbacks,r=0
-do{for(;r<t.length;r++)t[r].call(null)
-for(var n=0;n<e.ops.length;n++){var i=e.ops[n]
-if(i.cursorActivityHandlers)for(;i.cursorActivityCalled<i.cursorActivityHandlers.length;)i.cursorActivityHandlers[i.cursorActivityCalled++].call(null,i.cm)}}while(r<t.length)})(t)}finally{zt=null
-for(var r=0;r<t.ops.length;r++)t.ops[r].cm.curOp=null;(function(e){for(var t=e.ops,r=0;r<t.length;r++)$t(t[r])
-for(r=0;r<t.length;r++)Wt(t[r])
-for(r=0;r<t.length;r++)qt(t[r])
-for(r=0;r<t.length;r++)Vt(t[r])
-for(r=0;r<t.length;r++)Gt(t[r])})(t)}}function $t(e){var t=e.cm,r=t.display;(function(e){var t=e.display
-!t.scrollbarsClipped&&t.scroller.offsetWidth&&(t.nativeBarWidth=t.scroller.offsetWidth-t.scroller.clientWidth,t.heightForcer.style.height=dt(e)+"px",t.sizer.style.marginBottom=-t.nativeBarWidth+"px",t.sizer.style.borderRightWidth=dt(e)+"px",t.scrollbarsClipped=!0)})(t),e.updateMaxLine&&D(t),e.mustUpdate=e.viewChanged||e.forceUpdate||null!=e.scrollTop||e.scrollToPos&&(e.scrollToPos.from.line<r.viewFrom||e.scrollToPos.to.line>=r.viewTo)||r.maxLineChanged&&t.options.lineWrapping,e.update=e.mustUpdate&&new K(t,e.mustUpdate&&{top:e.scrollTop,ensure:e.scrollToPos},e.forceUpdate)}function Wt(e){e.updatedDisplay=e.mustUpdate&&Y(e.cm,e.update)}function qt(e){var t=e.cm,r=t.display
-e.updatedDisplay&&Z(t),e.barMeasure=F(t),r.maxLineChanged&&!t.options.lineWrapping&&(e.adjustWidthTo=mt(t,r.maxLine,r.maxLine.text.length).left+3,t.display.sizerWidth=e.adjustWidthTo,e.barMeasure.scrollWidth=Math.max(r.scroller.clientWidth,r.sizer.offsetLeft+e.adjustWidthTo+dt(t)+t.display.barWidth),e.maxScrollLeft=Math.max(0,r.sizer.offsetLeft+e.adjustWidthTo-ht(t))),(e.updatedDisplay||e.selectionChanged)&&(e.preparedSelection=r.input.prepareSelection(e.focus))}function Vt(e){var t=e.cm
-null!=e.adjustWidthTo&&(t.display.sizer.style.minWidth=e.adjustWidthTo+"px",e.maxScrollLeft<t.doc.scrollLeft&&gr(t,Math.min(t.display.scroller.scrollLeft,e.maxScrollLeft),!0),t.display.maxLineChanged=!1)
-var r=e.focus&&e.focus==Do()&&(!document.hasFocus||document.hasFocus())
-e.preparedSelection&&t.display.input.showSelection(e.preparedSelection,r),(e.updatedDisplay||e.startHeight!=t.doc.height)&&B(t,e.barMeasure),e.updatedDisplay&&X(t,e.barMeasure),e.selectionChanged&&it(t),t.state.focused&&e.updateInput&&t.display.input.reset(e.typing),r&&be(e.cm)}function Gt(e){var t=e.cm,r=t.display,n=t.doc
-if(e.updatedDisplay&&Q(t,e.update),null==r.wheelStartX||null==e.scrollTop&&null==e.scrollLeft&&!e.scrollToPos||(r.wheelStartX=r.wheelStartY=null),null==e.scrollTop||r.scroller.scrollTop==e.scrollTop&&!e.forceScroll||(n.scrollTop=Math.max(0,Math.min(r.scroller.scrollHeight-r.scroller.clientHeight,e.scrollTop)),r.scrollbars.setScrollTop(n.scrollTop),r.scroller.scrollTop=n.scrollTop),null==e.scrollLeft||r.scroller.scrollLeft==e.scrollLeft&&!e.forceScroll||(n.scrollLeft=Math.max(0,Math.min(r.scroller.scrollWidth-r.scroller.clientWidth,e.scrollLeft)),r.scrollbars.setScrollLeft(n.scrollLeft),r.scroller.scrollLeft=n.scrollLeft,W(t)),e.scrollToPos){var i=function(e,t,r,n){null==n&&(n=0)
-for(var i=0;i<5;i++){var o=!1,s=Mt(e,t),a=r&&r!=t?Mt(e,r):s,l=$r(e,Math.min(s.left,a.left),Math.min(s.top,a.top)-n,Math.max(s.left,a.left),Math.max(s.bottom,a.bottom)+n),u=e.doc.scrollTop,c=e.doc.scrollLeft
-if(null!=l.scrollTop&&(mr(e,l.scrollTop),Math.abs(e.doc.scrollTop-u)>1&&(o=!0)),null!=l.scrollLeft&&(gr(e,l.scrollLeft),Math.abs(e.doc.scrollLeft-c)>1&&(o=!0)),!o)break}return s}(t,Fe(n,e.scrollToPos.from),Fe(n,e.scrollToPos.to),e.scrollToPos.margin)
-e.scrollToPos.isCursor&&t.state.focused&&function(e,t){if(to(e,"scrollCursorIntoView"))return
-var r=e.display,n=r.sizer.getBoundingClientRect(),i=null
-t.top+n.top<0?i=!0:t.bottom+n.top>(window.innerHeight||document.documentElement.clientHeight)&&(i=!1)
-if(null!=i&&!p){var o=Ao("div","​",null,"position: absolute; top: "+(t.top-r.viewOffset-lt(e.display))+"px; height: "+(t.bottom-t.top+dt(e)+r.barHeight)+"px; left: "+t.left+"px; width: 2px;")
-e.display.lineSpace.appendChild(o),o.scrollIntoView(i),e.display.lineSpace.removeChild(o)}}(t,i)}var o=e.maybeHiddenMarkers,s=e.maybeUnhiddenMarkers
-if(o)for(var a=0;a<o.length;++a)o[a].lines.length||Ji(o[a],"hide")
-if(s)for(a=0;a<s.length;++a)s[a].lines.length&&Ji(s[a],"unhide")
-r.wrapper.offsetHeight&&(n.scrollTop=t.display.scroller.scrollTop),e.changeObjs&&Ji(t,"changes",t,e.changeObjs),e.update&&e.update.finish()}function Kt(e,t){if(e.curOp)return t()
-Bt(e)
-try{return t()}finally{Ht(e)}}function Yt(e,t){return function(){if(e.curOp)return t.apply(e,arguments)
-Bt(e)
-try{return t.apply(e,arguments)}finally{Ht(e)}}}function Qt(e){return function(){if(this.curOp)return e.apply(this,arguments)
-Bt(this)
-try{return e.apply(this,arguments)}finally{Ht(this)}}}function Jt(e){return function(){var t=this.cm
-if(!t||t.curOp)return e.apply(this,arguments)
-Bt(t)
-try{return e.apply(this,arguments)}finally{Ht(t)}}}function Xt(e,t,r){this.line=t,this.rest=function(e){var t,r
-for(;t=Fn(e);)e=t.find(1,!0).line,(r||(r=[])).push(e)
-return r}(t),this.size=this.rest?Ti(go(this.rest))-r+1:1,this.node=this.text=null,this.hidden=Hn(e,t)}function Zt(e,t,r){for(var n,i=[],o=t;o<r;o=n){var s=new Xt(e.doc,Oi(e.doc,o),o)
-n=o+s.size,i.push(s)}return i}function er(e,t,r,n){null==t&&(t=e.doc.first),null==r&&(r=e.doc.first+e.doc.size),n||(n=0)
-var i=e.display
-if(n&&r<i.viewTo&&(null==i.updateLineNumbers||i.updateLineNumbers>t)&&(i.updateLineNumbers=t),e.curOp.viewChanged=!0,t>=i.viewTo)x&&Un(e.doc,t)<i.viewTo&&rr(e)
-else if(r<=i.viewFrom)x&&Bn(e.doc,r+n)>i.viewFrom?rr(e):(i.viewFrom+=n,i.viewTo+=n)
-else if(t<=i.viewFrom&&r>=i.viewTo)rr(e)
-else if(t<=i.viewFrom){(o=ir(e,r,r+n,1))?(i.view=i.view.slice(o.index),i.viewFrom=o.lineN,i.viewTo+=n):rr(e)}else if(r>=i.viewTo){var o;(o=ir(e,t,t,-1))?(i.view=i.view.slice(0,o.index),i.viewTo=o.lineN):rr(e)}else{var s=ir(e,t,t,-1),a=ir(e,r,r+n,1)
-s&&a?(i.view=i.view.slice(0,s.index).concat(Zt(e,s.lineN,a.lineN)).concat(i.view.slice(a.index)),i.viewTo+=n):rr(e)}var l=i.externalMeasured
-l&&(r<l.lineN?l.lineN+=n:t<l.lineN+l.size&&(i.externalMeasured=null))}function tr(e,t,r){e.curOp.viewChanged=!0
-var n=e.display,i=e.display.externalMeasured
-if(i&&t>=i.lineN&&t<i.lineN+i.size&&(n.externalMeasured=null),!(t<n.viewFrom||t>=n.viewTo)){var o=n.view[nr(e,t)]
-if(null!=o.node){var s=o.changes||(o.changes=[]);-1==bo(s,r)&&s.push(r)}}}function rr(e){e.display.viewFrom=e.display.viewTo=e.doc.first,e.display.view=[],e.display.viewOffset=0}function nr(e,t){if(t>=e.display.viewTo)return null
-if((t-=e.display.viewFrom)<0)return null
-for(var r=e.display.view,n=0;n<r.length;n++)if((t-=r[n].size)<0)return n}function ir(e,t,r,n){var i,o=nr(e,t),s=e.display.view
-if(!x||r==e.doc.first+e.doc.size)return{index:o,lineN:r}
-for(var a=0,l=e.display.viewFrom;a<o;a++)l+=s[a].size
-if(l!=t){if(n>0){if(o==s.length-1)return null
-i=l+s[o].size-t,o++}else i=l-t
-t+=i,r+=i}for(;Un(e.doc,r)!=r;){if(o==(n<0?0:s.length-1))return null
-r+=n*s[o-(n<0?1:0)].size,o+=n}return{index:o,lineN:r}}function or(e){for(var t=e.display.view,r=0,n=0;n<t.length;n++){var i=t[n]
-i.hidden||i.node&&!i.changes||++r}return r}function sr(e){var t=e.display
-t.lastWrapHeight==t.wrapper.clientHeight&&t.lastWrapWidth==t.wrapper.clientWidth||(t.cachedCharWidth=t.cachedTextHeight=t.cachedPaddingH=null,t.scrollbarsClipped=!1,e.setSize())}function ar(e,t){for(var r=qi(t);r!=e.wrapper;r=r.parentNode)if(!r||1==r.nodeType&&"true"==r.getAttribute("cm-ignore-events")||r.parentNode==e.sizer&&r!=e.mover)return!0}function lr(e,t,r,n){var i=e.display
-if(!r&&"true"==qi(t).getAttribute("cm-not-content"))return null
-var o,s,a=i.lineSpace.getBoundingClientRect()
-try{o=t.clientX-a.left,s=t.clientY-a.top}catch(t){return null}var l,u=jt(e,o,s)
-if(n&&1==u.xRel&&(l=Oi(e.doc,u.line).text).length==u.ch){var c=ho(l,l.length,e.options.tabSize)-l.length
-u=pe(u.line,Math.max(0,Math.round((o-ct(e.display).left)/Nt(e.display))-c))}return u}function ur(e){var t=this,r=t.display
-if(!(to(t,e)||r.activeTouch&&r.input.supportsTouch()))if(r.shift=e.shiftKey,ar(r,e))a||(r.scroller.draggable=!1,setTimeout((function(){r.scroller.draggable=!0}),100))
-else if(!dr(t,e)){var n=lr(t,e)
-switch(window.focus(),Vi(e)){case 1:t.state.selectingText?t.state.selectingText(e):n?function(e,t,r){o?setTimeout(xo(be,e),0):e.curOp.focus=Do()
-var n,i=+new Date
-Lt&&Lt.time>i-400&&0==fe(Lt.pos,r)?n="triple":Ft&&Ft.time>i-400&&0==fe(Ft.pos,r)?(n="double",Lt={time:i,pos:r}):(n="single",Ft={time:i,pos:r})
-var l,u=e.doc.sel,c=g?t.metaKey:t.ctrlKey
-e.options.dragDrop&&Wo&&!e.isReadOnly()&&"single"==n&&(l=u.contains(r))>-1&&(fe((l=u.ranges[l]).from(),r)<0||r.xRel>0)&&(fe(l.to(),r)>0||r.xRel<0)?function(e,t,r,n){var i=e.display,l=+new Date,u=Yt(e,(function(c){a&&(i.scroller.draggable=!1),e.state.draggingText=!1,Qi(document,"mouseup",u),Qi(i.scroller,"drop",u),Math.abs(t.clientX-c.clientX)+Math.abs(t.clientY-c.clientY)<10&&(Bi(c),!n&&+new Date-200<l&&Be(e.doc,r),a||o&&9==s?setTimeout((function(){document.body.focus(),i.input.focus()}),20):i.input.focus())}))
-a&&(i.scroller.draggable=!0)
-e.state.draggingText=u,i.scroller.dragDrop&&i.scroller.dragDrop()
-Gi(document,"mouseup",u),Gi(i.scroller,"drop",u)}(e,t,r,c):function(e,t,r,n,i){var o=e.display,s=e.doc
-Bi(t)
-var a,l,u=s.sel,c=u.ranges
-i&&!t.shiftKey?(l=s.sel.contains(r),a=l>-1?c[l]:new je(r,r)):(a=s.sel.primary(),l=s.sel.primIndex)
-if(v?t.shiftKey&&t.metaKey:t.altKey)n="rect",i||(a=new je(r,r)),r=lr(e,t,!0,!0),l=-1
-else if("double"==n){var d=e.findWordAt(r)
-a=e.display.shift||s.extend?Ue(s,a,d.anchor,d.head):d}else if("triple"==n){var h=new je(pe(r.line,0),Fe(s,pe(r.line+1,0)))
-a=e.display.shift||s.extend?Ue(s,a,h.anchor,h.head):h}else a=Ue(s,a,r)
-i?-1==l?(l=c.length,Ve(s,Ie(c.concat([a]),l),{scroll:!1,origin:"*mouse"})):c.length>1&&c[l].empty()&&"single"==n&&!t.shiftKey?(Ve(s,Ie(c.slice(0,l).concat(c.slice(l+1)),0),{scroll:!1,origin:"*mouse"}),u=s.sel):$e(s,l,a,lo):(l=0,Ve(s,new Re([a],0),lo),u=s.sel)
-var p=r
-function f(t){if(0!=fe(p,t))if(p=t,"rect"==n){for(var i=[],o=e.options.tabSize,c=ho(Oi(s,r.line).text,r.ch,o),d=ho(Oi(s,t.line).text,t.ch,o),h=Math.min(c,d),f=Math.max(c,d),m=Math.min(r.line,t.line),g=Math.min(e.lastLine(),Math.max(r.line,t.line));m<=g;m++){var v=Oi(s,m).text,b=po(v,h,o)
-h==f?i.push(new je(pe(m,b),pe(m,b))):v.length>b&&i.push(new je(pe(m,b),pe(m,po(v,f,o))))}i.length||i.push(new je(r,r)),Ve(s,Ie(u.ranges.slice(0,l).concat(i),l),{origin:"*mouse",scroll:!1}),e.scrollIntoView(t)}else{var y=a,_=y.anchor,w=t
-if("single"!=n){if("double"==n)var O=e.findWordAt(t)
-else O=new je(pe(t.line,0),Fe(s,pe(t.line+1,0)))
-fe(O.anchor,_)>0?(w=O.head,_=ve(y.from(),O.anchor)):(w=O.anchor,_=ge(y.to(),O.head))}(i=u.ranges.slice(0))[l]=new je(Fe(s,_),w),Ve(s,Ie(i,l),lo)}}var m=o.wrapper.getBoundingClientRect(),g=0
-function b(t){var r=++g,i=lr(e,t,!0,"rect"==n)
-if(i)if(0!=fe(i,p)){e.curOp.focus=Do(),f(i)
-var a=$(o,s);(i.line>=a.to||i.line<a.from)&&setTimeout(Yt(e,(function(){g==r&&b(t)})),150)}else{var l=t.clientY<m.top?-20:t.clientY>m.bottom?20:0
-l&&setTimeout(Yt(e,(function(){g==r&&(o.scroller.scrollTop+=l,b(t))})),50)}}function y(t){e.state.selectingText=!1,g=1/0,Bi(t),o.input.focus(),Qi(document,"mousemove",_),Qi(document,"mouseup",w),s.history.lastSelOrigin=null}var _=Yt(e,(function(e){Vi(e)?b(e):y(e)})),w=Yt(e,y)
-e.state.selectingText=w,Gi(document,"mousemove",_),Gi(document,"mouseup",w)}(e,t,r,n,c)}(t,e,n):qi(e)==r.scroller&&Bi(e)
-break
-case 2:a&&(t.state.lastMiddleDown=+new Date),n&&Be(t.doc,n),setTimeout((function(){r.input.focus()}),20),Bi(e)
-break
-case 3:w?Ar(t,e):function(e){e.state.delayingBlurEvent=!0,setTimeout((function(){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1,Mr(e))}),100)}(t)}}}function cr(e,t,r,n){try{var i=t.clientX,o=t.clientY}catch(t){return!1}if(i>=Math.floor(e.display.gutters.getBoundingClientRect().right))return!1
-n&&Bi(t)
-var s=e.display,a=s.lineDiv.getBoundingClientRect()
-if(o>a.bottom||!no(e,r))return $i(t)
-o-=a.top-s.viewOffset
-for(var l=0;l<e.options.gutters.length;++l){var u=s.gutters.childNodes[l]
-if(u&&u.getBoundingClientRect().right>=i){var c=Ei(e.doc,o),d=e.options.gutters[l]
-return Ji(e,r,e,c,d,t),$i(t)}}}function dr(e,t){return cr(e,t,"gutterClick",!0)}var hr=0
-function pr(e){var t=this
-if(fr(t),!to(t,e)&&!ar(t.display,e)){Bi(e),o&&(hr=+new Date)
-var r=lr(t,e,!0),n=e.dataTransfer.files
-if(r&&!t.isReadOnly())if(n&&n.length&&window.FileReader&&window.File)for(var i=n.length,s=Array(i),a=0,l=function(e,n){if(!t.options.allowDropFileTypes||-1!=bo(t.options.allowDropFileTypes,e.type)){var o=new FileReader
-o.onload=Yt(t,(function(){var e=o.result
-if(/[\x00-\x08\x0e-\x1f]{2}/.test(e)&&(e=""),s[n]=e,++a==i){var l={from:r=Fe(t.doc,r),to:r,text:t.doc.splitLines(s.join(t.doc.lineSeparator())),origin:"paste"}
-Fr(t.doc,l),qe(t.doc,De(r,Rr(l)))}})),o.readAsText(e)}},u=0;u<i;++u)l(n[u],u)
-else{if(t.state.draggingText&&t.doc.sel.contains(r)>-1)return t.state.draggingText(e),void setTimeout((function(){t.display.input.focus()}),20)
-try{if(s=e.dataTransfer.getData("Text")){if(t.state.draggingText&&!(g?e.altKey:e.ctrlKey))var c=t.listSelections()
-if(Ge(t.doc,De(r,r)),c)for(u=0;u<c.length;++u)Hr(t.doc,"",c[u].anchor,c[u].head,"drag")
-t.replaceSelection(s,"around","paste"),t.display.input.focus()}}catch(e){}}}}function fr(e){e.display.dragCursor&&(e.display.lineSpace.removeChild(e.display.dragCursor),e.display.dragCursor=null)}function mr(e,t){Math.abs(e.doc.scrollTop-t)<2||(e.doc.scrollTop=t,r||J(e,{top:t}),e.display.scroller.scrollTop!=t&&(e.display.scroller.scrollTop=t),e.display.scrollbars.setScrollTop(t),r&&J(e),ot(e,100))}function gr(e,t,r){(r?t==e.doc.scrollLeft:Math.abs(e.doc.scrollLeft-t)<2)||(t=Math.min(t,e.display.scroller.scrollWidth-e.display.scroller.clientWidth),e.doc.scrollLeft=t,W(e),e.display.scroller.scrollLeft!=t&&(e.display.scroller.scrollLeft=t),e.display.scrollbars.setScrollLeft(t))}var vr=0,br=null
-o?br=-.53:r?br=15:u?br=-.7:d&&(br=-1/3)
-var yr=function(e){var t=e.wheelDeltaX,r=e.wheelDeltaY
-return null==t&&e.detail&&e.axis==e.HORIZONTAL_AXIS&&(t=e.detail),null==r&&e.detail&&e.axis==e.VERTICAL_AXIS?r=e.detail:null==r&&(r=e.wheelDelta),{x:t,y:r}}
-function _r(e,t){var n=yr(t),i=n.x,o=n.y,s=e.display,l=s.scroller,u=l.scrollWidth>l.clientWidth,d=l.scrollHeight>l.clientHeight
-if(i&&u||o&&d){if(o&&g&&a)e:for(var h=t.target,p=s.view;h!=l;h=h.parentNode)for(var f=0;f<p.length;f++)if(p[f].node==h){e.display.currentWheelTarget=h
-break e}if(i&&!r&&!c&&null!=br)return o&&d&&mr(e,Math.max(0,Math.min(l.scrollTop+o*br,l.scrollHeight-l.clientHeight))),gr(e,Math.max(0,Math.min(l.scrollLeft+i*br,l.scrollWidth-l.clientWidth))),(!o||o&&d)&&Bi(t),void(s.wheelStartX=null)
-if(o&&null!=br){var m=o*br,v=e.doc.scrollTop,b=v+s.wrapper.clientHeight
-m<0?v=Math.max(0,v+m-50):b=Math.min(e.doc.height,b+m+50),J(e,{top:v,bottom:b})}vr<20&&(null==s.wheelStartX?(s.wheelStartX=l.scrollLeft,s.wheelStartY=l.scrollTop,s.wheelDX=i,s.wheelDY=o,setTimeout((function(){if(null!=s.wheelStartX){var e=l.scrollLeft-s.wheelStartX,t=l.scrollTop-s.wheelStartY,r=t&&s.wheelDY&&t/s.wheelDY||e&&s.wheelDX&&e/s.wheelDX
-s.wheelStartX=s.wheelStartY=null,r&&(br=(br*vr+r)/(vr+1),++vr)}}),200)):(s.wheelDX+=i,s.wheelDY+=o))}}function wr(e,t,r){if("string"==typeof t&&!(t=cn[t]))return!1
-e.display.input.ensurePolled()
-var n=e.display.shift,i=!1
-try{e.isReadOnly()&&(e.state.suppressEdits=!0),r&&(e.display.shift=!1),i=t(e)!=so}finally{e.display.shift=n,e.state.suppressEdits=!1}return i}P.wheelEventPixels=function(e){var t=yr(e)
-return t.x*=br,t.y*=br,t}
-var Or=new co
-function xr(e,t,r,n){var i=e.state.keySeq
-if(i){if(fn(t))return"handled"
-Or.set(50,(function(){e.state.keySeq==i&&(e.state.keySeq=null,e.display.input.reset())})),t=i+" "+t}var o=function(e,t,r){for(var n=0;n<e.state.keyMaps.length;n++){var i=pn(t,e.state.keyMaps[n],r,e)
-if(i)return i}return e.options.extraKeys&&pn(t,e.options.extraKeys,r,e)||pn(t,e.options.keyMap,r,e)}(e,t,n)
-return"multi"==o&&(e.state.keySeq=t),"handled"==o&&Zi(e,"keyHandled",e,t,r),"handled"!=o&&"multi"!=o||(Bi(r),it(e)),i&&!o&&/\'$/.test(t)?(Bi(r),!0):!!o}function Pr(e,t){var r=mn(t,!0)
-return!!r&&(t.shiftKey&&!e.state.keySeq?xr(e,"Shift-"+r,t,(function(t){return wr(e,t,!0)}))||xr(e,r,t,(function(t){if("string"==typeof t?/^go[A-Z]/.test(t):t.motion)return wr(e,t)})):xr(e,r,t,(function(t){return wr(e,t)})))}var Sr=null
-function Tr(e){var t=this
-if(t.curOp.focus=Do(),!to(t,e)){o&&s<11&&27==e.keyCode&&(e.returnValue=!1)
-var r=e.keyCode
-t.display.shift=16==r||e.shiftKey
-var n=Pr(t,e)
-c&&(Sr=n?r:null,n||88!=r||Qo||!(g?e.metaKey:e.ctrlKey)||t.replaceSelection("",null,"cut")),18!=r||/\bCodeMirror-crosshair\b/.test(t.display.lineDiv.className)||function(e){var t=e.display.lineDiv
-function r(e){18!=e.keyCode&&e.altKey||(Fo(t,"CodeMirror-crosshair"),Qi(document,"keyup",r),Qi(document,"mouseover",r))}Lo(t,"CodeMirror-crosshair"),Gi(document,"keyup",r),Gi(document,"mouseover",r)}(t)}}function Er(e){16==e.keyCode&&(this.doc.sel.shift=!1),to(this,e)}function Cr(e){var t=this
-if(!(ar(t.display,e)||to(t,e)||e.ctrlKey&&!e.altKey||g&&e.metaKey)){var r=e.keyCode,n=e.charCode
-if(c&&r==Sr)return Sr=null,void Bi(e)
-if(!c||e.which&&!(e.which<10)||!Pr(t,e))(function(e,t,r){return xr(e,"'"+r+"'",t,(function(t){return wr(e,t,!0)}))})(t,e,String.fromCharCode(null==n?r:n))||t.display.input.onKeyPress(e)}}function kr(e){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1),"nocursor"!=e.options.readOnly&&(e.state.focused||(Ji(e,"focus",e),e.state.focused=!0,Lo(e.display.wrapper,"CodeMirror-focused"),e.curOp||e.display.selForContextMenu==e.doc.sel||(e.display.input.reset(),a&&setTimeout((function(){e.display.input.reset(!0)}),20)),e.display.input.receivedFocus()),it(e))}function Mr(e){e.state.delayingBlurEvent||(e.state.focused&&(Ji(e,"blur",e),e.state.focused=!1,Fo(e.display.wrapper,"CodeMirror-focused")),clearInterval(e.display.blinker),setTimeout((function(){e.state.focused||(e.display.shift=!1)}),150))}function Ar(e,t){ar(e.display,t)||function(e,t){return!!no(e,"gutterContextMenu")&&cr(e,t,"gutterContextMenu",!1)}(e,t)||to(e,t,"contextmenu")||e.display.input.onContextMenu(t)}var Rr=P.changeEnd=function(e){return e.text?pe(e.from.line+e.text.length-1,go(e.text).length+(1==e.text.length?e.from.ch:0)):e.to}
-function jr(e,t){if(fe(e,t.from)<0)return e
-if(fe(e,t.to)<=0)return Rr(t)
-var r=e.line+t.text.length-(t.to.line-t.from.line)-1,n=e.ch
-return e.line==t.to.line&&(n+=Rr(t).ch-t.to.ch),pe(r,n)}function Ir(e,t){for(var r=[],n=0;n<e.sel.ranges.length;n++){var i=e.sel.ranges[n]
-r.push(new je(jr(i.anchor,t),jr(i.head,t)))}return Ie(r,e.sel.primIndex)}function Dr(e,t,r){return e.line==t.line?pe(r.line,e.ch-t.ch+r.ch):pe(r.line+(e.line-t.line),e.ch)}function Nr(e,t,r){var n={canceled:!1,from:t.from,to:t.to,text:t.text,origin:t.origin,cancel:function(){this.canceled=!0}}
-return r&&(n.update=function(t,r,n,i){t&&(this.from=Fe(e,t)),r&&(this.to=Fe(e,r)),n&&(this.text=n),void 0!==i&&(this.origin=i)}),Ji(e,"beforeChange",e,n),e.cm&&Ji(e.cm,"beforeChange",e.cm,n),n.canceled?null:{from:n.from,to:n.to,text:n.text,origin:n.origin}}function Fr(e,t,r){if(e.cm){if(!e.cm.curOp)return Yt(e.cm,Fr)(e,t,r)
-if(e.cm.state.suppressEdits)return}if(!(no(e,"beforeChange")||e.cm&&no(e.cm,"beforeChange"))||(t=Nr(e,t,!0))){var n=O&&!r&&function(e,t,r){var n=null
-if(e.iter(t.line,r.line+1,(function(e){if(e.markedSpans)for(var t=0;t<e.markedSpans.length;++t){var r=e.markedSpans[t].marker
-!r.readOnly||n&&-1!=bo(n,r)||(n||(n=[])).push(r)}})),!n)return null
-for(var i=[{from:t,to:r}],o=0;o<n.length;++o)for(var s=n[o],a=s.find(0),l=0;l<i.length;++l){var u=i[l]
-if(!(fe(u.to,a.from)<0||fe(u.from,a.to)>0)){var c=[l,1],d=fe(u.from,a.from),h=fe(u.to,a.to);(d<0||!s.inclusiveLeft&&!d)&&c.push({from:u.from,to:a.from}),(h>0||!s.inclusiveRight&&!h)&&c.push({from:a.to,to:u.to}),i.splice.apply(i,c),l+=c.length-1}}return i}(e,t.from,t.to)
-if(n)for(var i=n.length-1;i>=0;--i)Lr(e,{from:n[i].from,to:n[i].to,text:i?[""]:t.text})
-else Lr(e,t)}}function Lr(e,t){if(1!=t.text.length||""!=t.text[0]||0!=fe(t.from,t.to)){var r=Ir(e,t)
-ji(e,t,r,e.cm?e.cm.curOp.id:NaN),Br(e,t,r,En(e,t))
-var n=[]
-_i(e,(function(e,r){r||-1!=bo(n,e.history)||(Ui(e.history,t),n.push(e.history)),Br(e,t,null,En(e,t))}))}}function zr(e,t,r){if(!e.cm||!e.cm.state.suppressEdits){for(var n,i=e.history,o=e.sel,s="undo"==t?i.done:i.undone,a="undo"==t?i.undone:i.done,l=0;l<s.length&&(n=s[l],r?!n.ranges||n.equals(e.sel):n.ranges);l++);if(l!=s.length){for(i.lastOrigin=i.lastSelOrigin=null;(n=s.pop()).ranges;){if(Ii(n,a),r&&!n.equals(e.sel))return void Ve(e,n,{clearRedo:!1})
-o=n}var u=[]
-Ii(o,a),a.push({changes:u,generation:i.generation}),i.generation=n.generation||++i.maxGeneration
-var c=no(e,"beforeChange")||e.cm&&no(e.cm,"beforeChange")
-for(l=n.changes.length-1;l>=0;--l){var d=n.changes[l]
-if(d.origin=t,c&&!Nr(e,d,!1))return void(s.length=0)
-u.push(Ai(e,d))
-var h=l?Ir(e,d):go(s)
-Br(e,d,h,kn(e,d)),!l&&e.cm&&e.cm.scrollIntoView({from:d.from,to:Rr(d)})
-var p=[]
-_i(e,(function(e,t){t||-1!=bo(p,e.history)||(Ui(e.history,d),p.push(e.history)),Br(e,d,null,kn(e,d))}))}}}}function Ur(e,t){if(0!=t&&(e.first+=t,e.sel=new Re(yo(e.sel.ranges,(function(e){return new je(pe(e.anchor.line+t,e.anchor.ch),pe(e.head.line+t,e.head.ch))})),e.sel.primIndex),e.cm)){er(e.cm,e.first,e.first-t,t)
-for(var r=e.cm.display,n=r.viewFrom;n<r.viewTo;n++)tr(e.cm,n,"gutter")}}function Br(e,t,r,n){if(e.cm&&!e.cm.curOp)return Yt(e.cm,Br)(e,t,r,n)
-if(t.to.line<e.first)Ur(e,t.text.length-1-(t.to.line-t.from.line))
-else if(!(t.from.line>e.lastLine())){if(t.from.line<e.first){var i=t.text.length-1-(e.first-t.from.line)
-Ur(e,i),t={from:pe(e.first,0),to:pe(t.to.line+i,t.to.ch),text:[go(t.text)],origin:t.origin}}var o=e.lastLine()
-t.to.line>o&&(t={from:t.from,to:pe(o,Oi(e,o).text.length),text:[t.text[0]],origin:t.origin}),t.removed=xi(e,t.from,t.to),r||(r=Ir(e,t)),e.cm?function(e,t,r){var n=e.doc,i=e.display,o=t.from,s=t.to,a=!1,l=o.line
-e.options.lineWrapping||(l=Ti(zn(Oi(n,o.line))),n.iter(l,s.line+1,(function(e){if(e==i.maxLine)return a=!0,!0})))
-n.sel.contains(t.from,t.to)>-1&&ro(e)
-pi(n,t,r,C(e)),e.options.lineWrapping||(n.iter(l,o.line+t.text.length,(function(e){var t=I(e)
-t>i.maxLineLength&&(i.maxLine=e,i.maxLineLength=t,i.maxLineChanged=!0,a=!1)})),a&&(e.curOp.updateMaxLine=!0))
-n.frontier=Math.min(n.frontier,o.line),ot(e,400)
-var u=t.text.length-(s.line-o.line)-1
-t.full?er(e):o.line!=s.line||1!=t.text.length||hi(e.doc,t)?er(e,o.line,s.line+1,u):tr(e,o.line,"text")
-var c=no(e,"changes"),d=no(e,"change")
-if(d||c){var h={from:o,to:s,text:t.text,removed:t.removed,origin:t.origin}
-d&&Zi(e,"change",e,h),c&&(e.curOp.changeObjs||(e.curOp.changeObjs=[])).push(h)}e.display.selForContextMenu=null}(e.cm,t,n):pi(e,t,n),Ge(e,r,ao)}}function Hr(e,t,r,n,i){if(n||(n=r),fe(n,r)<0){var o=n
-n=r,r=o}"string"==typeof t&&(t=e.splitLines(t)),Fr(e,{from:r,to:n,text:t,origin:i})}function $r(e,t,r,n,i){var o=e.display,s=Dt(e.display)
-r<0&&(r=0)
-var a=e.curOp&&null!=e.curOp.scrollTop?e.curOp.scrollTop:o.scroller.scrollTop,l=pt(e),u={}
-i-r>l&&(i=r+l)
-var c=e.doc.height+ut(o),d=r<s,h=i>c-s
-if(r<a)u.scrollTop=d?0:r
-else if(i>a+l){var p=Math.min(r,(h?c:i)-l)
-p!=a&&(u.scrollTop=p)}var f=e.curOp&&null!=e.curOp.scrollLeft?e.curOp.scrollLeft:o.scroller.scrollLeft,m=ht(e)-(e.options.fixedGutter?o.gutters.offsetWidth:0),g=n-t>m
-return g&&(n=t+m),t<10?u.scrollLeft=0:t<f?u.scrollLeft=Math.max(0,t-(g?0:10)):n>m+f-3&&(u.scrollLeft=n+(g?0:10)-m),u}function Wr(e,t,r){null==t&&null==r||Vr(e),null!=t&&(e.curOp.scrollLeft=(null==e.curOp.scrollLeft?e.doc.scrollLeft:e.curOp.scrollLeft)+t),null!=r&&(e.curOp.scrollTop=(null==e.curOp.scrollTop?e.doc.scrollTop:e.curOp.scrollTop)+r)}function qr(e){Vr(e)
-var t=e.getCursor(),r=t,n=t
-e.options.lineWrapping||(r=t.ch?pe(t.line,t.ch-1):t,n=pe(t.line,t.ch+1)),e.curOp.scrollToPos={from:r,to:n,margin:e.options.cursorScrollMargin,isCursor:!0}}function Vr(e){var t=e.curOp.scrollToPos
-if(t){e.curOp.scrollToPos=null
-var r=At(e,t.from),n=At(e,t.to),i=$r(e,Math.min(r.left,n.left),Math.min(r.top,n.top)-t.margin,Math.max(r.right,n.right),Math.max(r.bottom,n.bottom)+t.margin)
-e.scrollTo(i.scrollLeft,i.scrollTop)}}function Gr(e,t,r,n){var i,o=e.doc
-null==r&&(r="add"),"smart"==r&&(o.mode.indent?i=at(e,t):r="prev")
-var s=e.options.tabSize,a=Oi(o,t),l=ho(a.text,null,s)
-a.stateAfter&&(a.stateAfter=null)
-var u,c=a.text.match(/^\s*/)[0]
-if(n||/\S/.test(a.text)){if("smart"==r&&((u=o.mode.indent(i,a.text.slice(c.length),a.text))==so||u>150)){if(!n)return
-r="prev"}}else u=0,r="not"
-"prev"==r?u=t>o.first?ho(Oi(o,t-1).text,null,s):0:"add"==r?u=l+e.options.indentUnit:"subtract"==r?u=l-e.options.indentUnit:"number"==typeof r&&(u=l+r),u=Math.max(0,u)
-var d="",h=0
-if(e.options.indentWithTabs)for(var p=Math.floor(u/s);p;--p)h+=s,d+="\t"
-if(h<u&&(d+=mo(u-h)),d!=c)return Hr(o,d,pe(t,0),pe(t,c.length),"+input"),a.stateAfter=null,!0
-for(p=0;p<o.sel.ranges.length;p++){var f=o.sel.ranges[p]
-if(f.head.line==t&&f.head.ch<c.length){$e(o,p,new je(h=pe(t,c.length),h))
-break}}}function Kr(e,t,r,n){var i=t,o=t
-return"number"==typeof t?o=Oi(e,Ne(e,t)):i=Ti(t),null==i?null:(n(o,i)&&e.cm&&tr(e.cm,i,r),o)}function Yr(e,t){for(var r=e.doc.sel.ranges,n=[],i=0;i<r.length;i++){for(var o=t(r[i]);n.length&&fe(o.from,go(n).to)<=0;){var s=n.pop()
-if(fe(s.from,o.from)<0){o.from=s.from
-break}}n.push(o)}Kt(e,(function(){for(var t=n.length-1;t>=0;t--)Hr(e.doc,"",n[t].from,n[t].to,"+delete")
-qr(e)}))}function Qr(e,t,r,n,i){var o=t.line,s=t.ch,a=r,l=Oi(e,o)
-function u(t){var n,a=(i?us:cs)(l,s,r,!0)
-if(null==a){if(t||(n=o+r)<e.first||n>=e.first+e.size||(o=n,!(l=Oi(e,n))))return!1
-s=i?(r<0?ns:rs)(l):r<0?l.text.length:0}else s=a
-return!0}if("char"==n)u()
-else if("column"==n)u(!0)
-else if("word"==n||"group"==n)for(var c=null,d="group"==n,h=e.cm&&e.cm.getHelper(t,"wordChars"),p=!0;!(r<0)||u(!p);p=!1){var f=l.text.charAt(s)||"\n",m=To(f,h)?"w":d&&"\n"==f?"n":!d||/\s/.test(f)?null:"p"
-if(!d||p||m||(m="s"),c&&c!=m){r<0&&(r=1,u())
-break}if(m&&(c=m),r>0&&!u(!p))break}var g=Xe(e,pe(o,s),t,a,!0)
-return fe(t,g)||(g.hitSide=!0),g}function Jr(e,t,r,n){var i,o=e.doc,s=t.left
-if("page"==n){var a=Math.min(e.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight)
-i=t.top+r*(a-(r<0?1.5:.5)*Dt(e.display))}else"line"==n&&(i=r>0?t.bottom+3:t.top-3)
-for(;;){var l=jt(e,s,i)
-if(!l.outside)break
-if(r<0?i<=0:i>=o.height){l.hitSide=!0
-break}i+=5*r}return l}P.prototype={constructor:P,focus:function(){window.focus(),this.display.input.focus()},setOption:function(e,t){var r=this.options,n=r[e]
-r[e]==t&&"mode"!=e||(r[e]=t,Zr.hasOwnProperty(e)&&Yt(this,Zr[e])(this,t,n))},getOption:function(e){return this.options[e]},getDoc:function(){return this.doc},addKeyMap:function(e,t){this.state.keyMaps[t?"push":"unshift"](gn(e))},removeKeyMap:function(e){for(var t=this.state.keyMaps,r=0;r<t.length;++r)if(t[r]==e||t[r].name==e)return t.splice(r,1),!0},addOverlay:Qt((function(e,t){var r=e.token?e:P.getMode(this.options,e)
-if(r.startState)throw new Error("Overlays may not be stateful.")
-this.state.overlays.push({mode:r,modeSpec:e,opaque:t&&t.opaque}),this.state.modeGen++,er(this)})),removeOverlay:Qt((function(e){for(var t=this.state.overlays,r=0;r<t.length;++r){var n=t[r].modeSpec
-if(n==e||"string"==typeof e&&n.name==e)return t.splice(r,1),this.state.modeGen++,void er(this)}})),indentLine:Qt((function(e,t,r){"string"!=typeof t&&"number"!=typeof t&&(t=null==t?this.options.smartIndent?"smart":"prev":t?"add":"subtract"),Le(this.doc,e)&&Gr(this,e,t,r)})),indentSelection:Qt((function(e){for(var t=this.doc.sel.ranges,r=-1,n=0;n<t.length;n++){var i=t[n]
-if(i.empty())i.head.line>r&&(Gr(this,i.head.line,e,!0),r=i.head.line,n==this.doc.sel.primIndex&&qr(this))
-else{var o=i.from(),s=i.to(),a=Math.max(r,o.line)
-r=Math.min(this.lastLine(),s.line-(s.ch?0:1))+1
-for(var l=a;l<r;++l)Gr(this,l,e)
-var u=this.doc.sel.ranges
-0==o.ch&&t.length==u.length&&u[n].from().ch>0&&$e(this.doc,n,new je(o,u[n].to()),ao)}}})),getTokenAt:function(e,t){return Xn(this,e,t)},getLineTokens:function(e,t){return Xn(this,pe(e),t,!0)},getTokenTypeAt:function(e){e=Fe(this.doc,e)
-var t,r=ti(this,Oi(this.doc,e.line)),n=0,i=(r.length-1)/2,o=e.ch
-if(0==o)t=r[2]
-else for(;;){var s=n+i>>1
-if((s?r[2*s-1]:0)>=o)i=s
-else{if(!(r[2*s+1]<o)){t=r[2*s+2]
-break}n=s+1}}var a=t?t.indexOf("cm-overlay "):-1
-return a<0?t:0==a?null:t.slice(0,a-1)},getModeAt:function(e){var t=this.doc.mode
-return t.innerMode?P.innerMode(t,this.getTokenAt(e).state).mode:t},getHelper:function(e,t){return this.getHelpers(e,t)[0]},getHelpers:function(e,t){var r=[]
-if(!an.hasOwnProperty(t))return r
-var n=an[t],i=this.getModeAt(e)
-if("string"==typeof i[t])n[i[t]]&&r.push(n[i[t]])
-else if(i[t])for(var o=0;o<i[t].length;o++){var s=n[i[t][o]]
-s&&r.push(s)}else i.helperType&&n[i.helperType]?r.push(n[i.helperType]):n[i.name]&&r.push(n[i.name])
-for(o=0;o<n._global.length;o++){var a=n._global[o]
-a.pred(i,this)&&-1==bo(r,a.val)&&r.push(a.val)}return r},getStateAfter:function(e,t){var r=this.doc
-return at(this,(e=Ne(r,null==e?r.first+r.size-1:e))+1,t)},cursorCoords:function(e,t){var r=this.doc.sel.primary()
-return Mt(this,null==e?r.head:"object"==typeof e?Fe(this.doc,e):e?r.from():r.to(),t||"page")},charCoords:function(e,t){return kt(this,Fe(this.doc,e),t||"page")},coordsChar:function(e,t){return jt(this,(e=Ct(this,e,t||"page")).left,e.top)},lineAtHeight:function(e,t){return e=Ct(this,{top:e,left:0},t||"page").top,Ei(this.doc,e+this.display.viewOffset)},heightAtLine:function(e,t){var r,n=!1
-if("number"==typeof e){var i=this.doc.first+this.doc.size-1
-e<this.doc.first?e=this.doc.first:e>i&&(e=i,n=!0),r=Oi(this.doc,e)}else r=e
-return Et(this,r,{top:0,left:0},t||"page").top+(n?this.doc.height-Ci(r):0)},defaultTextHeight:function(){return Dt(this.display)},defaultCharWidth:function(){return Nt(this.display)},setGutterMarker:Qt((function(e,t,r){return Kr(this.doc,e,"gutter",(function(e){var n=e.gutterMarkers||(e.gutterMarkers={})
-return n[t]=r,!r&&Eo(n)&&(e.gutterMarkers=null),!0}))})),clearGutter:Qt((function(e){var t=this,r=t.doc,n=r.first
-r.iter((function(r){r.gutterMarkers&&r.gutterMarkers[e]&&(r.gutterMarkers[e]=null,tr(t,n,"gutter"),Eo(r.gutterMarkers)&&(r.gutterMarkers=null)),++n}))})),lineInfo:function(e){if("number"==typeof e){if(!Le(this.doc,e))return null
-var t=e
-if(!(e=Oi(this.doc,e)))return null}else{if(null==(t=Ti(e)))return null}return{line:t,handle:e,text:e.text,gutterMarkers:e.gutterMarkers,textClass:e.textClass,bgClass:e.bgClass,wrapClass:e.wrapClass,widgets:e.widgets}},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(e,t,r,n,i){var o,s,a,l,u,c,d=this.display,h=(e=Mt(this,Fe(this.doc,e))).bottom,p=e.left
-if(t.style.position="absolute",t.setAttribute("cm-ignore-events","true"),this.display.input.setUneditable(t),d.sizer.appendChild(t),"over"==n)h=e.top
-else if("above"==n||"near"==n){var f=Math.max(d.wrapper.clientHeight,this.doc.height),m=Math.max(d.sizer.clientWidth,d.lineSpace.clientWidth);("above"==n||e.bottom+t.offsetHeight>f)&&e.top>t.offsetHeight?h=e.top-t.offsetHeight:e.bottom+t.offsetHeight<=f&&(h=e.bottom),p+t.offsetWidth>m&&(p=m-t.offsetWidth)}t.style.top=h+"px",t.style.left=t.style.right="","right"==i?(p=d.sizer.clientWidth-t.offsetWidth,t.style.right="0px"):("left"==i?p=0:"middle"==i&&(p=(d.sizer.clientWidth-t.offsetWidth)/2),t.style.left=p+"px"),r&&(o=this,s=p,a=h,l=p+t.offsetWidth,u=h+t.offsetHeight,null!=(c=$r(o,s,a,l,u)).scrollTop&&mr(o,c.scrollTop),null!=c.scrollLeft&&gr(o,c.scrollLeft))},triggerOnKeyDown:Qt(Tr),triggerOnKeyPress:Qt(Cr),triggerOnKeyUp:Er,execCommand:function(e){if(cn.hasOwnProperty(e))return cn[e].call(null,this)},triggerElectric:Qt((function(e){Oe(this,e)})),findPosH:function(e,t,r,n){var i=1
-t<0&&(i=-1,t=-t)
-for(var o=0,s=Fe(this.doc,e);o<t&&!(s=Qr(this.doc,s,i,r,n)).hitSide;++o);return s},moveH:Qt((function(e,t){var r=this
-r.extendSelectionsBy((function(n){return r.display.shift||r.doc.extend||n.empty()?Qr(r.doc,n.head,e,t,r.options.rtlMoveVisually):e<0?n.from():n.to()}),uo)})),deleteH:Qt((function(e,t){var r=this.doc.sel,n=this.doc
-r.somethingSelected()?n.replaceSelection("",null,"+delete"):Yr(this,(function(r){var i=Qr(n,r.head,e,t,!1)
-return e<0?{from:i,to:r.head}:{from:r.head,to:i}}))})),findPosV:function(e,t,r,n){var i=1,o=n
-t<0&&(i=-1,t=-t)
-for(var s=0,a=Fe(this.doc,e);s<t;++s){var l=Mt(this,a,"div")
-if(null==o?o=l.left:l.left=o,(a=Jr(this,l,i,r)).hitSide)break}return a},moveV:Qt((function(e,t){var r=this,n=this.doc,i=[],o=!r.display.shift&&!n.extend&&n.sel.somethingSelected()
-if(n.extendSelectionsBy((function(s){if(o)return e<0?s.from():s.to()
-var a=Mt(r,s.head,"div")
-null!=s.goalColumn&&(a.left=s.goalColumn),i.push(a.left)
-var l=Jr(r,a,e,t)
-return"page"==t&&s==n.sel.primary()&&Wr(r,null,kt(r,l,"div").top-a.top),l}),uo),i.length)for(var s=0;s<n.sel.ranges.length;s++)n.sel.ranges[s].goalColumn=i[s]})),findWordAt:function(e){var t=Oi(this.doc,e.line).text,r=e.ch,n=e.ch
-if(t){var i=this.getHelper(e,"wordChars");(e.xRel<0||n==t.length)&&r?--r:++n
-for(var o=t.charAt(r),s=To(o,i)?function(e){return To(e,i)}:/\s/.test(o)?function(e){return/\s/.test(e)}:function(e){return!/\s/.test(e)&&!To(e)};r>0&&s(t.charAt(r-1));)--r
-for(;n<t.length&&s(t.charAt(n));)++n}return new je(pe(e.line,r),pe(e.line,n))},toggleOverwrite:function(e){null!=e&&e==this.state.overwrite||((this.state.overwrite=!this.state.overwrite)?Lo(this.display.cursorDiv,"CodeMirror-overwrite"):Fo(this.display.cursorDiv,"CodeMirror-overwrite"),Ji(this,"overwriteToggle",this,this.state.overwrite))},hasFocus:function(){return this.display.input.getField()==Do()},isReadOnly:function(){return!(!this.options.readOnly&&!this.doc.cantEdit)},scrollTo:Qt((function(e,t){null==e&&null==t||Vr(this),null!=e&&(this.curOp.scrollLeft=e),null!=t&&(this.curOp.scrollTop=t)})),getScrollInfo:function(){var e=this.display.scroller
-return{left:e.scrollLeft,top:e.scrollTop,height:e.scrollHeight-dt(this)-this.display.barHeight,width:e.scrollWidth-dt(this)-this.display.barWidth,clientHeight:pt(this),clientWidth:ht(this)}},scrollIntoView:Qt((function(e,t){if(null==e?(e={from:this.doc.sel.primary().head,to:null},null==t&&(t=this.options.cursorScrollMargin)):"number"==typeof e?e={from:pe(e,0),to:null}:null==e.from&&(e={from:e,to:null}),e.to||(e.to=e.from),e.margin=t||0,null!=e.from.line)Vr(this),this.curOp.scrollToPos=e
-else{var r=$r(this,Math.min(e.from.left,e.to.left),Math.min(e.from.top,e.to.top)-e.margin,Math.max(e.from.right,e.to.right),Math.max(e.from.bottom,e.to.bottom)+e.margin)
-this.scrollTo(r.scrollLeft,r.scrollTop)}})),setSize:Qt((function(e,t){var r=this
-function n(e){return"number"==typeof e||/^\d+$/.test(String(e))?e+"px":e}null!=e&&(r.display.wrapper.style.width=n(e)),null!=t&&(r.display.wrapper.style.height=n(t)),r.options.lineWrapping&&xt(this)
-var i=r.display.viewFrom
-r.doc.iter(i,r.display.viewTo,(function(e){if(e.widgets)for(var t=0;t<e.widgets.length;t++)if(e.widgets[t].noHScroll){tr(r,i,"widget")
-break}++i})),r.curOp.forceUpdate=!0,Ji(r,"refresh",this)})),operation:function(e){return Kt(this,e)},refresh:Qt((function(){var e=this.display.cachedTextHeight
-er(this),this.curOp.forceUpdate=!0,Pt(this),this.scrollTo(this.doc.scrollLeft,this.doc.scrollTop),j(this),(null==e||Math.abs(e-Dt(this.display))>.5)&&k(this),Ji(this,"refresh",this)})),swapDoc:Qt((function(e){var t=this.doc
-return t.cm=null,wi(this,e),Pt(this),this.display.input.reset(),this.scrollTo(e.scrollLeft,e.scrollTop),this.curOp.forceScroll=!0,Zi(this,"swapDoc",this,t),t})),getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},io(P)
-var Xr=P.defaults={},Zr=P.optionHandlers={}
-function en(e,t,r,n){P.defaults[e]=t,r&&(Zr[e]=n?function(e,t,n){n!=tn&&r(e,t,n)}:r)}var tn=P.Init={toString:function(){return"CodeMirror.Init"}}
-en("value","",(function(e,t){e.setValue(t)}),!0),en("mode",null,(function(e,t){e.doc.modeOption=t,T(e)}),!0),en("indentUnit",2,T,!0),en("indentWithTabs",!1),en("smartIndent",!0),en("tabSize",4,(function(e){E(e),Pt(e),er(e)}),!0),en("lineSeparator",null,(function(e,t){if(e.doc.lineSep=t,t){var r=[],n=e.doc.first
-e.doc.iter((function(e){for(var i=0;;){var o=e.text.indexOf(t,i)
-if(-1==o)break
-i=o+t.length,r.push(pe(n,o))}n++}))
-for(var i=r.length-1;i>=0;i--)Hr(e.doc,t,r[i],pe(r[i].line,r[i].ch+t.length))}})),en("specialChars",/[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g,(function(e,t,r){e.state.specialChars=new RegExp(t.source+(t.test("\t")?"":"|\t"),"g"),r!=P.Init&&e.refresh()})),en("specialCharPlaceholder",(function(e){var t=Ao("span","•","cm-invalidchar")
-return t.title="\\u"+e.charCodeAt(0).toString(16),t.setAttribute("aria-label",t.title),t}),(function(e){e.refresh()}),!0),en("electricChars",!0),en("inputStyle",m?"contenteditable":"textarea",(function(){throw new Error("inputStyle can not (yet) be changed in a running editor")}),!0),en("rtlMoveVisually",!b),en("wholeLineUpdateBefore",!0),en("theme","default",(function(e){M(e),A(e)}),!0),en("keyMap","default",(function(e,t,r){var n=gn(t),i=r!=P.Init&&gn(r)
-i&&i.detach&&i.detach(e,n),n.attach&&n.attach(e,i||null)})),en("extraKeys",null),en("lineWrapping",!1,(function(e){e.options.lineWrapping?(Lo(e.display.wrapper,"CodeMirror-wrap"),e.display.sizer.style.minWidth="",e.display.sizerWidth=null):(Fo(e.display.wrapper,"CodeMirror-wrap"),D(e)),k(e),er(e),Pt(e),setTimeout((function(){B(e)}),100)}),!0),en("gutters",[],(function(e){N(e.options),A(e)}),!0),en("fixedGutter",!0,(function(e,t){e.display.gutters.style.left=t?G(e.display)+"px":"0",e.refresh()}),!0),en("coverGutterNextToScrollbar",!1,(function(e){B(e)}),!0),en("scrollbarStyle","native",(function(e){U(e),B(e),e.display.scrollbars.setScrollTop(e.doc.scrollTop),e.display.scrollbars.setScrollLeft(e.doc.scrollLeft)}),!0),en("lineNumbers",!1,(function(e){N(e.options),A(e)}),!0),en("firstLineNumber",1,A,!0),en("lineNumberFormatter",(function(e){return e}),A,!0),en("showCursorWhenSelecting",!1,et,!0),en("resetSelectionOnContextMenu",!0),en("lineWiseCopyCut",!0),en("readOnly",!1,(function(e,t){"nocursor"==t?(Mr(e),e.display.input.blur(),e.display.disabled=!0):e.display.disabled=!1,e.display.input.readOnlyChanged(t)})),en("disableInput",!1,(function(e,t){t||e.display.input.reset()}),!0),en("dragDrop",!0,(function(e,t,r){if(!t!=!(r&&r!=P.Init)){var n=e.display.dragFunctions,i=t?Gi:Qi
-i(e.display.scroller,"dragstart",n.start),i(e.display.scroller,"dragenter",n.enter),i(e.display.scroller,"dragover",n.over),i(e.display.scroller,"dragleave",n.leave),i(e.display.scroller,"drop",n.drop)}}))
-en("allowDropFileTypes",null),en("cursorBlinkRate",530),en("cursorScrollMargin",0),en("cursorHeight",1,et,!0),en("singleCursorHeightPerLine",!0,et,!0),en("workTime",100),en("workDelay",100),en("flattenSpans",!0,E,!0),en("addModeClass",!1,E,!0),en("pollInterval",100),en("undoDepth",200,(function(e,t){e.doc.history.undoDepth=t})),en("historyEventDelay",1250),en("viewportMargin",10,(function(e){e.refresh()}),!0),en("maxHighlightLength",1e4,E,!0),en("moveInputWithCursor",!0,(function(e,t){t||e.display.input.resetPosition()})),en("tabindex",null,(function(e,t){e.display.input.getField().tabIndex=t||""})),en("autofocus",null)
-var rn=P.modes={},nn=P.mimeModes={}
-P.defineMode=function(e,t){P.defaults.mode||"null"==e||(P.defaults.mode=e),arguments.length>2&&(t.dependencies=Array.prototype.slice.call(arguments,2)),rn[e]=t},P.defineMIME=function(e,t){nn[e]=t},P.resolveMode=function(e){if("string"==typeof e&&nn.hasOwnProperty(e))e=nn[e]
-else if(e&&"string"==typeof e.name&&nn.hasOwnProperty(e.name)){var t=nn[e.name]
-"string"==typeof t&&(t={name:t}),(e=wo(t,e)).name=t.name}else if("string"==typeof e&&/^[\w\-]+\/[\w\-]+\+xml$/.test(e))return P.resolveMode("application/xml")
-return"string"==typeof e?{name:e}:e||{name:"null"}},P.getMode=function(e,t){t=P.resolveMode(t)
-var r=rn[t.name]
-if(!r)return P.getMode(e,"text/plain")
-var n=r(e,t)
-if(on.hasOwnProperty(t.name)){var i=on[t.name]
-for(var o in i)i.hasOwnProperty(o)&&(n.hasOwnProperty(o)&&(n["_"+o]=n[o]),n[o]=i[o])}if(n.name=t.name,t.helperType&&(n.helperType=t.helperType),t.modeProps)for(var o in t.modeProps)n[o]=t.modeProps[o]
-return n},P.defineMode("null",(function(){return{token:function(e){e.skipToEnd()}}})),P.defineMIME("text/plain","null")
-var on=P.modeExtensions={}
-P.extendMode=function(e,t){Oo(t,on.hasOwnProperty(e)?on[e]:on[e]={})},P.defineExtension=function(e,t){P.prototype[e]=t},P.defineDocExtension=function(e,t){vi.prototype[e]=t},P.defineOption=en
-var sn=[]
-P.defineInitHook=function(e){sn.push(e)}
-var an=P.helpers={}
-P.registerHelper=function(e,t,r){an.hasOwnProperty(e)||(an[e]=P[e]={_global:[]}),an[e][t]=r},P.registerGlobalHelper=function(e,t,r,n){P.registerHelper(e,t,n),an[e]._global.push({pred:r,val:n})}
-var ln=P.copyState=function(e,t){if(!0===t)return t
-if(e.copyState)return e.copyState(t)
-var r={}
-for(var n in t){var i=t[n]
-i instanceof Array&&(i=i.concat([])),r[n]=i}return r},un=P.startState=function(e,t,r){return!e.startState||e.startState(t,r)}
-P.innerMode=function(e,t){for(;e.innerMode;){var r=e.innerMode(t)
-if(!r||r.mode==e)break
-t=r.state,e=r.mode}return r||{mode:e,state:t}}
-var cn=P.commands={selectAll:function(e){e.setSelection(pe(e.firstLine(),0),pe(e.lastLine()),ao)},singleSelection:function(e){e.setSelection(e.getCursor("anchor"),e.getCursor("head"),ao)},killLine:function(e){Yr(e,(function(t){if(t.empty()){var r=Oi(e.doc,t.head.line).text.length
-return t.head.ch==r&&t.head.line<e.lastLine()?{from:t.head,to:pe(t.head.line+1,0)}:{from:t.head,to:pe(t.head.line,r)}}return{from:t.from(),to:t.to()}}))},deleteLine:function(e){Yr(e,(function(t){return{from:pe(t.from().line,0),to:Fe(e.doc,pe(t.to().line+1,0))}}))},delLineLeft:function(e){Yr(e,(function(e){return{from:pe(e.from().line,0),to:e.from()}}))},delWrappedLineLeft:function(e){Yr(e,(function(t){var r=e.charCoords(t.head,"div").top+5
-return{from:e.coordsChar({left:0,top:r},"div"),to:t.from()}}))},delWrappedLineRight:function(e){Yr(e,(function(t){var r=e.charCoords(t.head,"div").top+5,n=e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:r},"div")
-return{from:t.from(),to:n}}))},undo:function(e){e.undo()},redo:function(e){e.redo()},undoSelection:function(e){e.undoSelection()},redoSelection:function(e){e.redoSelection()},goDocStart:function(e){e.extendSelection(pe(e.firstLine(),0))},goDocEnd:function(e){e.extendSelection(pe(e.lastLine()))},goLineStart:function(e){e.extendSelectionsBy((function(t){return is(e,t.head.line)}),{origin:"+move",bias:1})},goLineStartSmart:function(e){e.extendSelectionsBy((function(t){return os(e,t.head)}),{origin:"+move",bias:1})},goLineEnd:function(e){e.extendSelectionsBy((function(t){return function(e,t){var r,n=Oi(e.doc,t)
-for(;r=Fn(n);)n=r.find(1,!0).line,t=null
-var i=ki(n),o=i?i[0].level%2?rs(n):ns(n):n.text.length
-return pe(null==t?Ti(n):t,o)}(e,t.head.line)}),{origin:"+move",bias:-1})},goLineRight:function(e){e.extendSelectionsBy((function(t){var r=e.charCoords(t.head,"div").top+5
-return e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:r},"div")}),uo)},goLineLeft:function(e){e.extendSelectionsBy((function(t){var r=e.charCoords(t.head,"div").top+5
-return e.coordsChar({left:0,top:r},"div")}),uo)},goLineLeftSmart:function(e){e.extendSelectionsBy((function(t){var r=e.charCoords(t.head,"div").top+5,n=e.coordsChar({left:0,top:r},"div")
-return n.ch<e.getLine(n.line).search(/\S/)?os(e,t.head):n}),uo)},goLineUp:function(e){e.moveV(-1,"line")},goLineDown:function(e){e.moveV(1,"line")},goPageUp:function(e){e.moveV(-1,"page")},goPageDown:function(e){e.moveV(1,"page")},goCharLeft:function(e){e.moveH(-1,"char")},goCharRight:function(e){e.moveH(1,"char")},goColumnLeft:function(e){e.moveH(-1,"column")},goColumnRight:function(e){e.moveH(1,"column")},goWordLeft:function(e){e.moveH(-1,"word")},goGroupRight:function(e){e.moveH(1,"group")},goGroupLeft:function(e){e.moveH(-1,"group")},goWordRight:function(e){e.moveH(1,"word")},delCharBefore:function(e){e.deleteH(-1,"char")},delCharAfter:function(e){e.deleteH(1,"char")},delWordBefore:function(e){e.deleteH(-1,"word")},delWordAfter:function(e){e.deleteH(1,"word")},delGroupBefore:function(e){e.deleteH(-1,"group")},delGroupAfter:function(e){e.deleteH(1,"group")},indentAuto:function(e){e.indentSelection("smart")},indentMore:function(e){e.indentSelection("add")},indentLess:function(e){e.indentSelection("subtract")},insertTab:function(e){e.replaceSelection("\t")},insertSoftTab:function(e){for(var t=[],r=e.listSelections(),n=e.options.tabSize,i=0;i<r.length;i++){var o=r[i].from(),s=ho(e.getLine(o.line),o.ch,n)
-t.push(mo(n-s%n))}e.replaceSelections(t)},defaultTab:function(e){e.somethingSelected()?e.indentSelection("add"):e.execCommand("insertTab")},transposeChars:function(e){Kt(e,(function(){for(var t=e.listSelections(),r=[],n=0;n<t.length;n++){var i=t[n].head,o=Oi(e.doc,i.line).text
-if(o)if(i.ch==o.length&&(i=new pe(i.line,i.ch-1)),i.ch>0)i=new pe(i.line,i.ch+1),e.replaceRange(o.charAt(i.ch-1)+o.charAt(i.ch-2),pe(i.line,i.ch-2),i,"+transpose")
-else if(i.line>e.doc.first){var s=Oi(e.doc,i.line-1).text
-s&&e.replaceRange(o.charAt(0)+e.doc.lineSeparator()+s.charAt(s.length-1),pe(i.line-1,s.length-1),pe(i.line,1),"+transpose")}r.push(new je(i,i))}e.setSelections(r)}))},newlineAndIndent:function(e){Kt(e,(function(){for(var t=e.listSelections().length,r=0;r<t;r++){var n=e.listSelections()[r]
-e.replaceRange(e.doc.lineSeparator(),n.anchor,n.head,"+input"),e.indentLine(n.from().line+1,null,!0)}qr(e)}))},openLine:function(e){e.replaceSelection("\n","start")},toggleOverwrite:function(e){e.toggleOverwrite()}},dn=P.keyMap={}
-function hn(e){for(var t,r,n,i,o=e.split(/-(?!$)/),s=(e=o[o.length-1],0);s<o.length-1;s++){var a=o[s]
-if(/^(cmd|meta|m)$/i.test(a))i=!0
-else if(/^a(lt)?$/i.test(a))t=!0
-else if(/^(c|ctrl|control)$/i.test(a))r=!0
-else{if(!/^s(hift)$/i.test(a))throw new Error("Unrecognized modifier name: "+a)
-n=!0}}return t&&(e="Alt-"+e),r&&(e="Ctrl-"+e),i&&(e="Cmd-"+e),n&&(e="Shift-"+e),e}dn.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"},dn.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"},dn.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars","Ctrl-O":"openLine"},dn.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight","Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]},dn.default=g?dn.macDefault:dn.pcDefault,P.normalizeKeyMap=function(e){var t={}
-for(var r in e)if(e.hasOwnProperty(r)){var n=e[r]
-if(/^(name|fallthrough|(de|at)tach)$/.test(r))continue
-if("..."==n){delete e[r]
-continue}for(var i=yo(r.split(" "),hn),o=0;o<i.length;o++){var s,a
-o==i.length-1?(a=i.join(" "),s=n):(a=i.slice(0,o+1).join(" "),s="...")
-var l=t[a]
-if(l){if(l!=s)throw new Error("Inconsistent bindings for "+a)}else t[a]=s}delete e[r]}for(var u in t)e[u]=t[u]
-return e}
-var pn=P.lookupKey=function(e,t,r,n){var i=(t=gn(t)).call?t.call(e,n):t[e]
-if(!1===i)return"nothing"
-if("..."===i)return"multi"
-if(null!=i&&r(i))return"handled"
-if(t.fallthrough){if("[object Array]"!=Object.prototype.toString.call(t.fallthrough))return pn(e,t.fallthrough,r,n)
-for(var o=0;o<t.fallthrough.length;o++){var s=pn(e,t.fallthrough[o],r,n)
-if(s)return s}}},fn=P.isModifierKey=function(e){var t="string"==typeof e?e:Zo[e.keyCode]
-return"Ctrl"==t||"Alt"==t||"Shift"==t||"Mod"==t},mn=P.keyName=function(e,t){if(c&&34==e.keyCode&&e.char)return!1
-var r=Zo[e.keyCode],n=r
-return null!=n&&!e.altGraphKey&&(e.altKey&&"Alt"!=r&&(n="Alt-"+n),(_?e.metaKey:e.ctrlKey)&&"Ctrl"!=r&&(n="Ctrl-"+n),(_?e.ctrlKey:e.metaKey)&&"Cmd"!=r&&(n="Cmd-"+n),!t&&e.shiftKey&&"Shift"!=r&&(n="Shift-"+n),n)}
-function gn(e){return"string"==typeof e?dn[e]:e}P.fromTextArea=function(e,t){if((t=t?Oo(t):{}).value=e.value,!t.tabindex&&e.tabIndex&&(t.tabindex=e.tabIndex),!t.placeholder&&e.placeholder&&(t.placeholder=e.placeholder),null==t.autofocus){var r=Do()
-t.autofocus=r==e||null!=e.getAttribute("autofocus")&&r==document.body}function n(){e.value=a.getValue()}if(e.form&&(Gi(e.form,"submit",n),!t.leaveSubmitMethodAlone)){var i=e.form,o=i.submit
-try{var s=i.submit=function(){n(),i.submit=o,i.submit(),i.submit=s}}catch(Go){}}t.finishInit=function(t){t.save=n,t.getTextArea=function(){return e},t.toTextArea=function(){t.toTextArea=isNaN,n(),e.parentNode.removeChild(t.getWrapperElement()),e.style.display="",e.form&&(Qi(e.form,"submit",n),"function"==typeof e.form.submit&&(e.form.submit=o))}},e.style.display="none"
-var a=P((function(t){e.parentNode.insertBefore(t,e.nextSibling)}),t)
-return a}
-var vn=P.StringStream=function(e,t){this.pos=this.start=0,this.string=e,this.tabSize=t||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0}
-vn.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return this.pos==this.lineStart},peek:function(){return this.string.charAt(this.pos)||void 0},next:function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},eat:function(e){var t=this.string.charAt(this.pos)
-if("string"==typeof e)var r=t==e
-else r=t&&(e.test?e.test(t):e(t))
-if(r)return++this.pos,t},eatWhile:function(e){for(var t=this.pos;this.eat(e););return this.pos>t},eatSpace:function(){for(var e=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos
-return this.pos>e},skipToEnd:function(){this.pos=this.string.length},skipTo:function(e){var t=this.string.indexOf(e,this.pos)
-if(t>-1)return this.pos=t,!0},backUp:function(e){this.pos-=e},column:function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=ho(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-(this.lineStart?ho(this.string,this.lineStart,this.tabSize):0)},indentation:function(){return ho(this.string,null,this.tabSize)-(this.lineStart?ho(this.string,this.lineStart,this.tabSize):0)},match:function(e,t,r){if("string"!=typeof e){var n=this.string.slice(this.pos).match(e)
-return n&&n.index>0?null:(n&&!1!==t&&(this.pos+=n[0].length),n)}var i=function(e){return r?e.toLowerCase():e}
-if(i(this.string.substr(this.pos,e.length))==i(e))return!1!==t&&(this.pos+=e.length),!0},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(e,t){this.lineStart+=e
-try{return t()}finally{this.lineStart-=e}}}
-var bn=0,yn=P.TextMarker=function(e,t){this.lines=[],this.type=t,this.doc=e,this.id=++bn}
-io(yn),yn.prototype.clear=function(){if(!this.explicitlyCleared){var e=this.doc.cm,t=e&&!e.curOp
-if(t&&Bt(e),no(this,"clear")){var r=this.find()
-r&&Zi(this,"clear",r.from,r.to)}for(var n=null,i=null,o=0;o<this.lines.length;++o){var s=this.lines[o],a=Sn(s.markedSpans,this)
-e&&!this.collapsed?tr(e,Ti(s),"text"):e&&(null!=a.to&&(i=Ti(s)),null!=a.from&&(n=Ti(s))),s.markedSpans=Tn(s.markedSpans,a),null==a.from&&this.collapsed&&!Hn(this.doc,s)&&e&&Si(s,Dt(e.display))}if(e&&this.collapsed&&!e.options.lineWrapping)for(o=0;o<this.lines.length;++o){var l=zn(this.lines[o]),u=I(l)
-u>e.display.maxLineLength&&(e.display.maxLine=l,e.display.maxLineLength=u,e.display.maxLineChanged=!0)}null!=n&&e&&this.collapsed&&er(e,n,i+1),this.lines.length=0,this.explicitlyCleared=!0,this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,e&&Ye(e.doc)),e&&Zi(e,"markerCleared",e,this),t&&Ht(e),this.parent&&this.parent.clear()}},yn.prototype.find=function(e,t){var r,n
-null==e&&"bookmark"==this.type&&(e=1)
-for(var i=0;i<this.lines.length;++i){var o=this.lines[i],s=Sn(o.markedSpans,this)
-if(null!=s.from&&(r=pe(t?o:Ti(o),s.from),-1==e))return r
-if(null!=s.to&&(n=pe(t?o:Ti(o),s.to),1==e))return n}return r&&{from:r,to:n}},yn.prototype.changed=function(){var e=this.find(-1,!0),t=this,r=this.doc.cm
-e&&r&&Kt(r,(function(){var n=e.line,i=Ti(e.line),o=gt(r,i)
-if(o&&(Ot(o),r.curOp.selectionChanged=r.curOp.forceUpdate=!0),r.curOp.updateMaxLine=!0,!Hn(t.doc,n)&&null!=t.height){var s=t.height
-t.height=null
-var a=Vn(t)-s
-a&&Si(n,n.height+a)}}))},yn.prototype.attachLine=function(e){if(!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp
-t.maybeHiddenMarkers&&-1!=bo(t.maybeHiddenMarkers,this)||(t.maybeUnhiddenMarkers||(t.maybeUnhiddenMarkers=[])).push(this)}this.lines.push(e)},yn.prototype.detachLine=function(e){if(this.lines.splice(bo(this.lines,e),1),!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp;(t.maybeHiddenMarkers||(t.maybeHiddenMarkers=[])).push(this)}}
-bn=0
-function _n(e,t,r,n,i){if(n&&n.shared)return function(e,t,r,n,i){(n=Oo(n)).shared=!1
-var o=[_n(e,t,r,n,i)],s=o[0],a=n.widgetNode
-return _i(e,(function(e){a&&(n.widgetNode=a.cloneNode(!0)),o.push(_n(e,Fe(e,t),Fe(e,r),n,i))
-for(var l=0;l<e.linked.length;++l)if(e.linked[l].isParent)return
-s=go(o)})),new wn(o,s)}(e,t,r,n,i)
-if(e.cm&&!e.cm.curOp)return Yt(e.cm,_n)(e,t,r,n,i)
-var o=new yn(e,i),s=fe(t,r)
-if(n&&Oo(n,o,!1),s>0||0==s&&!1!==o.clearWhenEmpty)return o
-if(o.replacedWith&&(o.collapsed=!0,o.widgetNode=Ao("span",[o.replacedWith],"CodeMirror-widget"),n.handleMouseEvents||o.widgetNode.setAttribute("cm-ignore-events","true"),n.insertLeft&&(o.widgetNode.insertLeft=!0)),o.collapsed){if(Ln(e,t.line,t,r,o)||t.line!=r.line&&Ln(e,r.line,t,r,o))throw new Error("Inserting collapsed marker partially overlapping an existing one")
-x=!0}o.addToHistory&&ji(e,{from:t,to:r,origin:"markText"},e.sel,NaN)
-var a,l=t.line,u=e.cm
-if(e.iter(l,r.line+1,(function(e){u&&o.collapsed&&!u.options.lineWrapping&&zn(e)==u.display.maxLine&&(a=!0),o.collapsed&&l!=t.line&&Si(e,0),function(e,t){e.markedSpans=e.markedSpans?e.markedSpans.concat([t]):[t],t.marker.attachLine(e)}(e,new Pn(o,l==t.line?t.ch:null,l==r.line?r.ch:null)),++l})),o.collapsed&&e.iter(t.line,r.line+1,(function(t){Hn(e,t)&&Si(t,0)})),o.clearOnEnter&&Gi(o,"beforeCursorEnter",(function(){o.clear()})),o.readOnly&&(O=!0,(e.history.done.length||e.history.undone.length)&&e.clearHistory()),o.collapsed&&(o.id=++bn,o.atomic=!0),u){if(a&&(u.curOp.updateMaxLine=!0),o.collapsed)er(u,t.line,r.line+1)
-else if(o.className||o.title||o.startStyle||o.endStyle||o.css)for(var c=t.line;c<=r.line;c++)tr(u,c,"text")
-o.atomic&&Ye(u.doc),Zi(u,"markerAdded",u,o)}return o}var wn=P.SharedTextMarker=function(e,t){this.markers=e,this.primary=t
-for(var r=0;r<e.length;++r)e[r].parent=this}
-function On(e){return e.findMarks(pe(e.first,0),e.clipPos(pe(e.lastLine())),(function(e){return e.parent}))}function xn(e){for(var t=0;t<e.length;t++){var r=e[t],n=[r.primary.doc]
-_i(r.primary.doc,(function(e){n.push(e)}))
-for(var i=0;i<r.markers.length;i++){var o=r.markers[i];-1==bo(n,o.doc)&&(o.parent=null,r.markers.splice(i--,1))}}}function Pn(e,t,r){this.marker=e,this.from=t,this.to=r}function Sn(e,t){if(e)for(var r=0;r<e.length;++r){var n=e[r]
-if(n.marker==t)return n}}function Tn(e,t){for(var r,n=0;n<e.length;++n)e[n]!=t&&(r||(r=[])).push(e[n])
-return r}function En(e,t){if(t.full)return null
-var r=Le(e,t.from.line)&&Oi(e,t.from.line).markedSpans,n=Le(e,t.to.line)&&Oi(e,t.to.line).markedSpans
-if(!r&&!n)return null
-var i=t.from.ch,o=t.to.ch,s=0==fe(t.from,t.to),a=function(e,t,r){if(e)for(var n,i=0;i<e.length;++i){var o=e[i],s=o.marker
-if(null==o.from||(s.inclusiveLeft?o.from<=t:o.from<t)||o.from==t&&"bookmark"==s.type&&(!r||!o.marker.insertLeft)){var a=null==o.to||(s.inclusiveRight?o.to>=t:o.to>t);(n||(n=[])).push(new Pn(s,o.from,a?null:o.to))}}return n}(r,i,s),l=function(e,t,r){if(e)for(var n,i=0;i<e.length;++i){var o=e[i],s=o.marker
-if(null==o.to||(s.inclusiveRight?o.to>=t:o.to>t)||o.from==t&&"bookmark"==s.type&&(!r||o.marker.insertLeft)){var a=null==o.from||(s.inclusiveLeft?o.from<=t:o.from<t);(n||(n=[])).push(new Pn(s,a?null:o.from-t,null==o.to?null:o.to-t))}}return n}(n,o,s),u=1==t.text.length,c=go(t.text).length+(u?i:0)
-if(a)for(var d=0;d<a.length;++d){if(null==(h=a[d]).to)(p=Sn(l,h.marker))?u&&(h.to=null==p.to?null:p.to+c):h.to=i}if(l)for(d=0;d<l.length;++d){var h,p
-if(null!=(h=l[d]).to&&(h.to+=c),null==h.from)(p=Sn(a,h.marker))||(h.from=c,u&&(a||(a=[])).push(h))
-else h.from+=c,u&&(a||(a=[])).push(h)}a&&(a=Cn(a)),l&&l!=a&&(l=Cn(l))
-var f=[a]
-if(!u){var m,g=t.text.length-2
-if(g>0&&a)for(d=0;d<a.length;++d)null==a[d].to&&(m||(m=[])).push(new Pn(a[d].marker,null,null))
-for(d=0;d<g;++d)f.push(m)
-f.push(l)}return f}function Cn(e){for(var t=0;t<e.length;++t){var r=e[t]
-null!=r.from&&r.from==r.to&&!1!==r.marker.clearWhenEmpty&&e.splice(t--,1)}return e.length?e:null}function kn(e,t){var r=function(e,t){var r=t["spans_"+e.id]
-if(!r)return null
-for(var n=0,i=[];n<t.text.length;++n)i.push(Ni(r[n]))
-return i}(e,t),n=En(e,t)
-if(!r)return n
-if(!n)return r
-for(var i=0;i<r.length;++i){var o=r[i],s=n[i]
-if(o&&s)e:for(var a=0;a<s.length;++a){for(var l=s[a],u=0;u<o.length;++u)if(o[u].marker==l.marker)continue e
-o.push(l)}else s&&(r[i]=s)}return r}function Mn(e){var t=e.markedSpans
-if(t){for(var r=0;r<t.length;++r)t[r].marker.detachLine(e)
-e.markedSpans=null}}function An(e,t){if(t){for(var r=0;r<t.length;++r)t[r].marker.attachLine(e)
-e.markedSpans=t}}function Rn(e){return e.inclusiveLeft?-1:0}function jn(e){return e.inclusiveRight?1:0}function In(e,t){var r=e.lines.length-t.lines.length
-if(0!=r)return r
-var n=e.find(),i=t.find(),o=fe(n.from,i.from)||Rn(e)-Rn(t)
-if(o)return-o
-var s=fe(n.to,i.to)||jn(e)-jn(t)
-return s||t.id-e.id}function Dn(e,t){var r,n=x&&e.markedSpans
-if(n)for(var i,o=0;o<n.length;++o)(i=n[o]).marker.collapsed&&null==(t?i.from:i.to)&&(!r||In(r,i.marker)<0)&&(r=i.marker)
-return r}function Nn(e){return Dn(e,!0)}function Fn(e){return Dn(e,!1)}function Ln(e,t,r,n,i){var o=Oi(e,t),s=x&&o.markedSpans
-if(s)for(var a=0;a<s.length;++a){var l=s[a]
-if(l.marker.collapsed){var u=l.marker.find(0),c=fe(u.from,r)||Rn(l.marker)-Rn(i),d=fe(u.to,n)||jn(l.marker)-jn(i)
-if(!(c>=0&&d<=0||c<=0&&d>=0)&&(c<=0&&(l.marker.inclusiveRight&&i.inclusiveLeft?fe(u.to,r)>=0:fe(u.to,r)>0)||c>=0&&(l.marker.inclusiveRight&&i.inclusiveLeft?fe(u.from,n)<=0:fe(u.from,n)<0)))return!0}}}function zn(e){for(var t;t=Nn(e);)e=t.find(-1,!0).line
-return e}function Un(e,t){var r=Oi(e,t),n=zn(r)
-return r==n?t:Ti(n)}function Bn(e,t){if(t>e.lastLine())return t
-var r,n=Oi(e,t)
-if(!Hn(e,n))return t
-for(;r=Fn(n);)n=r.find(1,!0).line
-return Ti(n)+1}function Hn(e,t){var r=x&&t.markedSpans
-if(r)for(var n,i=0;i<r.length;++i)if((n=r[i]).marker.collapsed){if(null==n.from)return!0
-if(!n.marker.widgetNode&&0==n.from&&n.marker.inclusiveLeft&&$n(e,t,n))return!0}}function $n(e,t,r){if(null==r.to){var n=r.marker.find(1,!0)
-return $n(e,n.line,Sn(n.line.markedSpans,r.marker))}if(r.marker.inclusiveRight&&r.to==t.text.length)return!0
-for(var i,o=0;o<t.markedSpans.length;++o)if((i=t.markedSpans[o]).marker.collapsed&&!i.marker.widgetNode&&i.from==r.to&&(null==i.to||i.to!=r.from)&&(i.marker.inclusiveLeft||r.marker.inclusiveRight)&&$n(e,t,i))return!0}io(wn),wn.prototype.clear=function(){if(!this.explicitlyCleared){this.explicitlyCleared=!0
-for(var e=0;e<this.markers.length;++e)this.markers[e].clear()
-Zi(this,"clear")}},wn.prototype.find=function(e,t){return this.primary.find(e,t)}
-var Wn=P.LineWidget=function(e,t,r){if(r)for(var n in r)r.hasOwnProperty(n)&&(this[n]=r[n])
-this.doc=e,this.node=t}
-function qn(e,t,r){Ci(t)<(e.curOp&&e.curOp.scrollTop||e.doc.scrollTop)&&Wr(e,null,r)}function Vn(e){if(null!=e.height)return e.height
-var t=e.doc.cm
-if(!t)return 0
-if(!Io(document.body,e.node)){var r="position: relative;"
-e.coverGutter&&(r+="margin-left: -"+t.display.gutters.offsetWidth+"px;"),e.noHScroll&&(r+="width: "+t.display.wrapper.clientWidth+"px;"),jo(t.display.measure,Ao("div",[e.node],null,r))}return e.height=e.node.parentNode.offsetHeight}io(Wn),Wn.prototype.clear=function(){var e=this.doc.cm,t=this.line.widgets,r=this.line,n=Ti(r)
-if(null!=n&&t){for(var i=0;i<t.length;++i)t[i]==this&&t.splice(i--,1)
-t.length||(r.widgets=null)
-var o=Vn(this)
-Si(r,Math.max(0,r.height-o)),e&&Kt(e,(function(){qn(e,r,-o),tr(e,n,"widget")}))}},Wn.prototype.changed=function(){var e=this.height,t=this.doc.cm,r=this.line
-this.height=null
-var n=Vn(this)-e
-n&&(Si(r,r.height+n),t&&Kt(t,(function(){t.curOp.forceUpdate=!0,qn(t,r,n)})))}
-var Gn=P.Line=function(e,t,r){this.text=e,An(this,t),this.height=r?r(this):1}
-function Kn(e){e.parent=null,Mn(e)}function Yn(e,t){if(e)for(;;){var r=e.match(/(?:^|\s+)line-(background-)?(\S+)/)
-if(!r)break
-e=e.slice(0,r.index)+e.slice(r.index+r[0].length)
-var n=r[1]?"bgClass":"textClass"
-null==t[n]?t[n]=r[2]:new RegExp("(?:^|s)"+r[2]+"(?:$|s)").test(t[n])||(t[n]+=" "+r[2])}return e}function Qn(e,t){if(e.blankLine)return e.blankLine(t)
-if(e.innerMode){var r=P.innerMode(e,t)
-return r.mode.blankLine?r.mode.blankLine(r.state):void 0}}function Jn(e,t,r,n){for(var i=0;i<10;i++){n&&(n[0]=P.innerMode(e,r).mode)
-var o=e.token(t,r)
-if(t.pos>t.start)return o}throw new Error("Mode "+e.name+" failed to advance stream.")}function Xn(e,t,r,n){function i(e){return{start:d.start,end:d.pos,string:d.current(),type:o||null,state:e?ln(s.mode,c):c}}var o,s=e.doc,a=s.mode
-t=Fe(s,t)
-var l,u=Oi(s,t.line),c=at(e,t.line,r),d=new vn(u.text,e.options.tabSize)
-for(n&&(l=[]);(n||d.pos<t.ch)&&!d.eol();)d.start=d.pos,o=Jn(a,d,c),n&&l.push(i(!0))
-return n?l:i()}function Zn(e,t,r,n,i,o,s){var a=r.flattenSpans
-null==a&&(a=e.options.flattenSpans)
-var l,u=0,c=null,d=new vn(t,e.options.tabSize),h=e.options.addModeClass&&[null]
-for(""==t&&Yn(Qn(r,n),o);!d.eol();){if(d.pos>e.options.maxHighlightLength?(a=!1,s&&ri(e,t,n,d.pos),d.pos=t.length,l=null):l=Yn(Jn(r,d,n,h),o),h){var p=h[0].name
-p&&(l="m-"+(l?p+" "+l:p))}if(!a||c!=l){for(;u<d.start;)i(u=Math.min(d.start,u+5e4),c)
-c=l}d.start=d.pos}for(;u<d.pos;){var f=Math.min(d.pos,u+5e4)
-i(f,c),u=f}}function ei(e,t,r,n){var i=[e.state.modeGen],o={}
-Zn(e,t.text,e.doc.mode,r,(function(e,t){i.push(e,t)}),o,n)
-for(var s=0;s<e.state.overlays.length;++s){var a=e.state.overlays[s],l=1,u=0
-Zn(e,t.text,a.mode,!0,(function(e,t){for(var r=l;u<e;){var n=i[l]
-n>e&&i.splice(l,1,e,i[l+1],n),l+=2,u=Math.min(e,n)}if(t)if(a.opaque)i.splice(r,l-r,e,"cm-overlay "+t),l=r+2
-else for(;r<l;r+=2){var o=i[r+1]
-i[r+1]=(o?o+" ":"")+"cm-overlay "+t}}),o)}return{styles:i,classes:o.bgClass||o.textClass?o:null}}function ti(e,t,r){if(!t.styles||t.styles[0]!=e.state.modeGen){var n=at(e,Ti(t)),i=ei(e,t,t.text.length>e.options.maxHighlightLength?ln(e.doc.mode,n):n)
-t.stateAfter=n,t.styles=i.styles,i.classes?t.styleClasses=i.classes:t.styleClasses&&(t.styleClasses=null),r===e.doc.frontier&&e.doc.frontier++}return t.styles}function ri(e,t,r,n){var i=e.doc.mode,o=new vn(t,e.options.tabSize)
-for(o.start=o.pos=n||0,""==t&&Qn(i,r);!o.eol();)Jn(i,o,r),o.start=o.pos}io(Gn),Gn.prototype.lineNo=function(){return Ti(this)}
-var ni={},ii={}
-function oi(e,t){if(!e||/^\s*$/.test(e))return null
-var r=t.addModeClass?ii:ni
-return r[e]||(r[e]=e.replace(/\S+/g,"cm-$&"))}function si(e,t){var r=Ao("span",null,null,a?"padding-right: .1px":null),n={pre:Ao("pre",[r],"CodeMirror-line"),content:r,col:0,pos:0,cm:e,splitSpaces:(o||a)&&e.getOption("lineWrapping")}
-t.measure={}
-for(var i=0;i<=(t.rest?t.rest.length:0);i++){var s,l=i?t.rest[i-1]:t.line
-n.pos=0,n.addToken=ai,Vo(e.display.measure)&&(s=ki(l))&&(n.addToken=ui(n.addToken,s)),n.map=[],di(l,n,ti(e,l,t!=e.display.externalMeasured&&Ti(l))),l.styleClasses&&(l.styleClasses.bgClass&&(n.bgClass=zo(l.styleClasses.bgClass,n.bgClass||"")),l.styleClasses.textClass&&(n.textClass=zo(l.styleClasses.textClass,n.textClass||""))),0==n.map.length&&n.map.push(0,0,n.content.appendChild(qo(e.display.measure))),0==i?(t.measure.map=n.map,t.measure.cache={}):((t.measure.maps||(t.measure.maps=[])).push(n.map),(t.measure.caches||(t.measure.caches=[])).push({}))}if(a){var u=n.content.lastChild;(/\bcm-tab\b/.test(u.className)||u.querySelector&&u.querySelector(".cm-tab"))&&(n.content.className="cm-tab-wrap-hack")}return Ji(e,"renderLine",e,t.line,n.pre),n.pre.className&&(n.textClass=zo(n.pre.className,n.textClass||"")),n}function ai(e,t,r,n,i,a,l){if(t){var u=e.splitSpaces?t.replace(/ {3,}/g,li):t,c=e.cm.state.specialChars,d=!1
-if(c.test(t)){b=document.createDocumentFragment()
-for(var h=0;;){c.lastIndex=h
-var p=c.exec(t),f=p?p.index-h:t.length-h
-if(f){var m=document.createTextNode(u.slice(h,h+f))
-o&&s<9?b.appendChild(Ao("span",[m])):b.appendChild(m),e.map.push(e.pos,e.pos+f,m),e.col+=f,e.pos+=f}if(!p)break
-if(h+=f+1,"\t"==p[0]){var g=e.cm.options.tabSize,v=g-e.col%g;(m=b.appendChild(Ao("span",mo(v),"cm-tab"))).setAttribute("role","presentation"),m.setAttribute("cm-text","\t"),e.col+=v}else if("\r"==p[0]||"\n"==p[0]){(m=b.appendChild(Ao("span","\r"==p[0]?"␍":"␤","cm-invalidchar"))).setAttribute("cm-text",p[0]),e.col+=1}else{(m=e.cm.options.specialCharPlaceholder(p[0])).setAttribute("cm-text",p[0]),o&&s<9?b.appendChild(Ao("span",[m])):b.appendChild(m),e.col+=1}e.map.push(e.pos,e.pos+1,m),e.pos++}}else{e.col+=t.length
-var b=document.createTextNode(u)
-e.map.push(e.pos,e.pos+t.length,b),o&&s<9&&(d=!0),e.pos+=t.length}if(r||n||i||d||l){var y=r||""
-n&&(y+=n),i&&(y+=i)
-var _=Ao("span",[b],y,l)
-return a&&(_.title=a),e.content.appendChild(_)}e.content.appendChild(b)}}function li(e){for(var t=" ",r=0;r<e.length-2;++r)t+=r%2?" ":" "
-return t+=" "}function ui(e,t){return function(r,n,i,o,s,a,l){i=i?i+" cm-force-border":"cm-force-border"
-for(var u=r.pos,c=u+n.length;;){for(var d=0;d<t.length;d++){var h=t[d]
-if(h.to>u&&h.from<=u)break}if(h.to>=c)return e(r,n,i,o,s,a,l)
-e(r,n.slice(0,h.to-u),i,o,null,a,l),o=null,n=n.slice(h.to-u),u=h.to}}}function ci(e,t,r,n){var i=!n&&r.widgetNode
-i&&e.map.push(e.pos,e.pos+t,i),!n&&e.cm.display.input.needsContentAttribute&&(i||(i=e.content.appendChild(document.createElement("span"))),i.setAttribute("cm-marker",r.id)),i&&(e.cm.display.input.setUneditable(i),e.content.appendChild(i)),e.pos+=t}function di(e,t,r){var n=e.markedSpans,i=e.text,o=0
-if(n)for(var s,a,l,u,c,d,h,p=i.length,f=0,m=(S=1,""),g=0;;){if(g==f){l=u=c=d=a="",h=null,g=1/0
-for(var v,b=[],y=0;y<n.length;++y){var _=n[y],w=_.marker
-"bookmark"==w.type&&_.from==f&&w.widgetNode?b.push(w):_.from<=f&&(null==_.to||_.to>f||w.collapsed&&_.to==f&&_.from==f)?(null!=_.to&&_.to!=f&&g>_.to&&(g=_.to,u=""),w.className&&(l+=" "+w.className),w.css&&(a=(a?a+";":"")+w.css),w.startStyle&&_.from==f&&(c+=" "+w.startStyle),w.endStyle&&_.to==g&&(v||(v=[])).push(w.endStyle,_.to),w.title&&!d&&(d=w.title),w.collapsed&&(!h||In(h.marker,w)<0)&&(h=_)):_.from>f&&g>_.from&&(g=_.from)}if(v)for(y=0;y<v.length;y+=2)v[y+1]==g&&(u+=" "+v[y])
-if(!h||h.from==f)for(y=0;y<b.length;++y)ci(t,0,b[y])
-if(h&&(h.from||0)==f){if(ci(t,(null==h.to?p+1:h.to)-f,h.marker,null==h.from),null==h.to)return
-h.to==f&&(h=!1)}}if(f>=p)break
-for(var O=Math.min(p,g);;){if(m){var x=f+m.length
-if(!h){var P=x>O?m.slice(0,O-f):m
-t.addToken(t,P,s?s+l:l,c,f+P.length==g?u:"",d,a)}if(x>=O){m=m.slice(O-f),f=O
-break}f=x,c=""}m=i.slice(o,o=r[S++]),s=oi(r[S++],t.cm.options)}}else for(var S=1;S<r.length;S+=2)t.addToken(t,i.slice(o,o=r[S]),oi(r[S+1],t.cm.options))}function hi(e,t){return 0==t.from.ch&&0==t.to.ch&&""==go(t.text)&&(!e.cm||e.cm.options.wholeLineUpdateBefore)}function pi(e,t,r,n){function i(e){return r?r[e]:null}function o(e,r,i){(function(e,t,r,n){e.text=t,e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null),null!=e.order&&(e.order=null),Mn(e),An(e,r)
-var i=n?n(e):1
-i!=e.height&&Si(e,i)})(e,r,i,n),Zi(e,"change",e,t)}function s(e,t){for(var r=e,o=[];r<t;++r)o.push(new Gn(u[r],i(r),n))
-return o}var a=t.from,l=t.to,u=t.text,c=Oi(e,a.line),d=Oi(e,l.line),h=go(u),p=i(u.length-1),f=l.line-a.line
-if(t.full)e.insert(0,s(0,u.length)),e.remove(u.length,e.size-u.length)
-else if(hi(e,t)){var m=s(0,u.length-1)
-o(d,d.text,p),f&&e.remove(a.line,f),m.length&&e.insert(a.line,m)}else if(c==d){if(1==u.length)o(c,c.text.slice(0,a.ch)+h+c.text.slice(l.ch),p)
-else(m=s(1,u.length-1)).push(new Gn(h+c.text.slice(l.ch),p,n)),o(c,c.text.slice(0,a.ch)+u[0],i(0)),e.insert(a.line+1,m)}else if(1==u.length)o(c,c.text.slice(0,a.ch)+u[0]+d.text.slice(l.ch),i(0)),e.remove(a.line+1,f)
-else{o(c,c.text.slice(0,a.ch)+u[0],i(0)),o(d,h+d.text.slice(l.ch),p)
-m=s(1,u.length-1)
-f>1&&e.remove(a.line+1,f-1),e.insert(a.line+1,m)}Zi(e,"change",e,t)}function fi(e){this.lines=e,this.parent=null
-for(var t=0,r=0;t<e.length;++t)e[t].parent=this,r+=e[t].height
-this.height=r}function mi(e){this.children=e
-for(var t=0,r=0,n=0;n<e.length;++n){var i=e[n]
-t+=i.chunkSize(),r+=i.height,i.parent=this}this.size=t,this.height=r,this.parent=null}fi.prototype={chunkSize:function(){return this.lines.length},removeInner:function(e,t){for(var r=e,n=e+t;r<n;++r){var i=this.lines[r]
-this.height-=i.height,Kn(i),Zi(i,"delete")}this.lines.splice(e,t)},collapse:function(e){e.push.apply(e,this.lines)},insertInner:function(e,t,r){this.height+=r,this.lines=this.lines.slice(0,e).concat(t).concat(this.lines.slice(e))
-for(var n=0;n<t.length;++n)t[n].parent=this},iterN:function(e,t,r){for(var n=e+t;e<n;++e)if(r(this.lines[e]))return!0}},mi.prototype={chunkSize:function(){return this.size},removeInner:function(e,t){this.size-=t
-for(var r=0;r<this.children.length;++r){var n=this.children[r],i=n.chunkSize()
-if(e<i){var o=Math.min(t,i-e),s=n.height
-if(n.removeInner(e,o),this.height-=s-n.height,i==o&&(this.children.splice(r--,1),n.parent=null),0==(t-=o))break
-e=0}else e-=i}if(this.size-t<25&&(this.children.length>1||!(this.children[0]instanceof fi))){var a=[]
-this.collapse(a),this.children=[new fi(a)],this.children[0].parent=this}},collapse:function(e){for(var t=0;t<this.children.length;++t)this.children[t].collapse(e)},insertInner:function(e,t,r){this.size+=t.length,this.height+=r
-for(var n=0;n<this.children.length;++n){var i=this.children[n],o=i.chunkSize()
-if(e<=o){if(i.insertInner(e,t,r),i.lines&&i.lines.length>50){for(var s=i.lines.length%25+25,a=s;a<i.lines.length;){var l=new fi(i.lines.slice(a,a+=25))
-i.height-=l.height,this.children.splice(++n,0,l),l.parent=this}i.lines=i.lines.slice(0,s),this.maybeSpill()}break}e-=o}},maybeSpill:function(){if(!(this.children.length<=10)){var e=this
-do{var t=new mi(e.children.splice(e.children.length-5,5))
-if(e.parent){e.size-=t.size,e.height-=t.height
-var r=bo(e.parent.children,e)
-e.parent.children.splice(r+1,0,t)}else{var n=new mi(e.children)
-n.parent=e,e.children=[n,t],e=n}t.parent=e.parent}while(e.children.length>10)
-e.parent.maybeSpill()}},iterN:function(e,t,r){for(var n=0;n<this.children.length;++n){var i=this.children[n],o=i.chunkSize()
-if(e<o){var s=Math.min(t,o-e)
-if(i.iterN(e,s,r))return!0
-if(0==(t-=s))break
-e=0}else e-=o}}}
-var gi=0,vi=P.Doc=function(e,t,r,n){if(!(this instanceof vi))return new vi(e,t,r,n)
-null==r&&(r=0),mi.call(this,[new fi([new Gn("",null)])]),this.first=r,this.scrollTop=this.scrollLeft=0,this.cantEdit=!1,this.cleanGeneration=1,this.frontier=r
-var i=pe(r,0)
-this.sel=De(i),this.history=new Mi(null),this.id=++gi,this.modeOption=t,this.lineSep=n,this.extend=!1,"string"==typeof e&&(e=this.splitLines(e)),pi(this,{from:i,to:i,text:e}),Ve(this,De(i),ao)}
-vi.prototype=wo(mi.prototype,{constructor:vi,iter:function(e,t,r){r?this.iterN(e-this.first,t-e,r):this.iterN(this.first,this.first+this.size,e)},insert:function(e,t){for(var r=0,n=0;n<t.length;++n)r+=t[n].height
-this.insertInner(e-this.first,t,r)},remove:function(e,t){this.removeInner(e-this.first,t)},getValue:function(e){var t=Pi(this,this.first,this.first+this.size)
-return!1===e?t:t.join(e||this.lineSeparator())},setValue:Jt((function(e){var t=pe(this.first,0),r=this.first+this.size-1
-Fr(this,{from:t,to:pe(r,Oi(this,r).text.length),text:this.splitLines(e),origin:"setValue",full:!0},!0),Ve(this,De(t))})),replaceRange:function(e,t,r,n){Hr(this,e,t=Fe(this,t),r=r?Fe(this,r):t,n)},getRange:function(e,t,r){var n=xi(this,Fe(this,e),Fe(this,t))
-return!1===r?n:n.join(r||this.lineSeparator())},getLine:function(e){var t=this.getLineHandle(e)
-return t&&t.text},getLineHandle:function(e){if(Le(this,e))return Oi(this,e)},getLineNumber:function(e){return Ti(e)},getLineHandleVisualStart:function(e){return"number"==typeof e&&(e=Oi(this,e)),zn(e)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(e){return Fe(this,e)},getCursor:function(e){var t=this.sel.primary()
-return null==e||"head"==e?t.head:"anchor"==e?t.anchor:"end"==e||"to"==e||!1===e?t.to():t.from()},listSelections:function(){return this.sel.ranges},somethingSelected:function(){return this.sel.somethingSelected()},setCursor:Jt((function(e,t,r){We(this,Fe(this,"number"==typeof e?pe(e,t||0):e),null,r)})),setSelection:Jt((function(e,t,r){We(this,Fe(this,e),Fe(this,t||e),r)})),extendSelection:Jt((function(e,t,r){Be(this,Fe(this,e),t&&Fe(this,t),r)})),extendSelections:Jt((function(e,t){He(this,ze(this,e),t)})),extendSelectionsBy:Jt((function(e,t){He(this,ze(this,yo(this.sel.ranges,e)),t)})),setSelections:Jt((function(e,t,r){if(e.length){for(var n=0,i=[];n<e.length;n++)i[n]=new je(Fe(this,e[n].anchor),Fe(this,e[n].head))
-null==t&&(t=Math.min(e.length-1,this.sel.primIndex)),Ve(this,Ie(i,t),r)}})),addSelection:Jt((function(e,t,r){var n=this.sel.ranges.slice(0)
-n.push(new je(Fe(this,e),Fe(this,t||e))),Ve(this,Ie(n,n.length-1),r)})),getSelection:function(e){for(var t,r=this.sel.ranges,n=0;n<r.length;n++){var i=xi(this,r[n].from(),r[n].to())
-t=t?t.concat(i):i}return!1===e?t:t.join(e||this.lineSeparator())},getSelections:function(e){for(var t=[],r=this.sel.ranges,n=0;n<r.length;n++){var i=xi(this,r[n].from(),r[n].to())
-!1!==e&&(i=i.join(e||this.lineSeparator())),t[n]=i}return t},replaceSelection:function(e,t,r){for(var n=[],i=0;i<this.sel.ranges.length;i++)n[i]=e
-this.replaceSelections(n,t,r||"+input")},replaceSelections:Jt((function(e,t,r){for(var n=[],i=this.sel,o=0;o<i.ranges.length;o++){var s=i.ranges[o]
-n[o]={from:s.from(),to:s.to(),text:this.splitLines(e[o]),origin:r}}var a=t&&"end"!=t&&function(e,t,r){for(var n=[],i=pe(e.first,0),o=i,s=0;s<t.length;s++){var a=t[s],l=Dr(a.from,i,o),u=Dr(Rr(a),i,o)
-if(i=a.to,o=u,"around"==r){var c=e.sel.ranges[s],d=fe(c.head,c.anchor)<0
-n[s]=new je(d?u:l,d?l:u)}else n[s]=new je(l,l)}return new Re(n,e.sel.primIndex)}(this,n,t)
-for(o=n.length-1;o>=0;o--)Fr(this,n[o])
-a?qe(this,a):this.cm&&qr(this.cm)})),undo:Jt((function(){zr(this,"undo")})),redo:Jt((function(){zr(this,"redo")})),undoSelection:Jt((function(){zr(this,"undo",!0)})),redoSelection:Jt((function(){zr(this,"redo",!0)})),setExtending:function(e){this.extend=e},getExtending:function(){return this.extend},historySize:function(){for(var e=this.history,t=0,r=0,n=0;n<e.done.length;n++)e.done[n].ranges||++t
-for(n=0;n<e.undone.length;n++)e.undone[n].ranges||++r
-return{undo:t,redo:r}},clearHistory:function(){this.history=new Mi(this.history.maxGeneration)},markClean:function(){this.cleanGeneration=this.changeGeneration(!0)},changeGeneration:function(e){return e&&(this.history.lastOp=this.history.lastSelOp=this.history.lastOrigin=null),this.history.generation},isClean:function(e){return this.history.generation==(e||this.cleanGeneration)},getHistory:function(){return{done:Fi(this.history.done),undone:Fi(this.history.undone)}},setHistory:function(e){var t=this.history=new Mi(this.history.maxGeneration)
-t.done=Fi(e.done.slice(0),null,!0),t.undone=Fi(e.undone.slice(0),null,!0)},addLineClass:Jt((function(e,t,r){return Kr(this,e,"gutter"==t?"gutter":"class",(function(e){var n="text"==t?"textClass":"background"==t?"bgClass":"gutter"==t?"gutterClass":"wrapClass"
-if(e[n]){if(No(r).test(e[n]))return!1
-e[n]+=" "+r}else e[n]=r
-return!0}))})),removeLineClass:Jt((function(e,t,r){return Kr(this,e,"gutter"==t?"gutter":"class",(function(e){var n="text"==t?"textClass":"background"==t?"bgClass":"gutter"==t?"gutterClass":"wrapClass",i=e[n]
-if(!i)return!1
-if(null==r)e[n]=null
-else{var o=i.match(No(r))
-if(!o)return!1
-var s=o.index+o[0].length
-e[n]=i.slice(0,o.index)+(o.index&&s!=i.length?" ":"")+i.slice(s)||null}return!0}))})),addLineWidget:Jt((function(e,t,r){return function(e,t,r,n){var i=new Wn(e,r,n),o=e.cm
-return o&&i.noHScroll&&(o.display.alignWidgets=!0),Kr(e,t,"widget",(function(t){var r=t.widgets||(t.widgets=[])
-if(null==i.insertAt?r.push(i):r.splice(Math.min(r.length-1,Math.max(0,i.insertAt)),0,i),i.line=t,o&&!Hn(e,t)){var n=Ci(t)<e.scrollTop
-Si(t,t.height+Vn(i)),n&&Wr(o,null,i.height),o.curOp.forceUpdate=!0}return!0})),i}(this,e,t,r)})),removeLineWidget:function(e){e.clear()},markText:function(e,t,r){return _n(this,Fe(this,e),Fe(this,t),r,r&&r.type||"range")},setBookmark:function(e,t){var r={replacedWith:t&&(null==t.nodeType?t.widget:t),insertLeft:t&&t.insertLeft,clearWhenEmpty:!1,shared:t&&t.shared,handleMouseEvents:t&&t.handleMouseEvents}
-return _n(this,e=Fe(this,e),e,r,"bookmark")},findMarksAt:function(e){var t=[],r=Oi(this,(e=Fe(this,e)).line).markedSpans
-if(r)for(var n=0;n<r.length;++n){var i=r[n];(null==i.from||i.from<=e.ch)&&(null==i.to||i.to>=e.ch)&&t.push(i.marker.parent||i.marker)}return t},findMarks:function(e,t,r){e=Fe(this,e),t=Fe(this,t)
-var n=[],i=e.line
-return this.iter(e.line,t.line+1,(function(o){var s=o.markedSpans
-if(s)for(var a=0;a<s.length;a++){var l=s[a]
-null!=l.to&&i==e.line&&e.ch>=l.to||null==l.from&&i!=e.line||null!=l.from&&i==t.line&&l.from>=t.ch||r&&!r(l.marker)||n.push(l.marker.parent||l.marker)}++i})),n},getAllMarks:function(){var e=[]
-return this.iter((function(t){var r=t.markedSpans
-if(r)for(var n=0;n<r.length;++n)null!=r[n].from&&e.push(r[n].marker)})),e},posFromIndex:function(e){var t,r=this.first,n=this.lineSeparator().length
-return this.iter((function(i){var o=i.text.length+n
-if(o>e)return t=e,!0
-e-=o,++r})),Fe(this,pe(r,t))},indexFromPos:function(e){var t=(e=Fe(this,e)).ch
-if(e.line<this.first||e.ch<0)return 0
-var r=this.lineSeparator().length
-return this.iter(this.first,e.line,(function(e){t+=e.text.length+r})),t},copy:function(e){var t=new vi(Pi(this,this.first,this.first+this.size),this.modeOption,this.first,this.lineSep)
-return t.scrollTop=this.scrollTop,t.scrollLeft=this.scrollLeft,t.sel=this.sel,t.extend=!1,e&&(t.history.undoDepth=this.history.undoDepth,t.setHistory(this.getHistory())),t},linkedDoc:function(e){e||(e={})
-var t=this.first,r=this.first+this.size
-null!=e.from&&e.from>t&&(t=e.from),null!=e.to&&e.to<r&&(r=e.to)
-var n=new vi(Pi(this,t,r),e.mode||this.modeOption,t,this.lineSep)
-return e.sharedHist&&(n.history=this.history),(this.linked||(this.linked=[])).push({doc:n,sharedHist:e.sharedHist}),n.linked=[{doc:this,isParent:!0,sharedHist:e.sharedHist}],function(e,t){for(var r=0;r<t.length;r++){var n=t[r],i=n.find(),o=e.clipPos(i.from),s=e.clipPos(i.to)
-if(fe(o,s)){var a=_n(e,o,s,n.primary,n.primary.type)
-n.markers.push(a),a.parent=n}}}(n,On(this)),n},unlinkDoc:function(e){if(e instanceof P&&(e=e.doc),this.linked)for(var t=0;t<this.linked.length;++t){if(this.linked[t].doc==e){this.linked.splice(t,1),e.unlinkDoc(this),xn(On(this))
-break}}if(e.history==this.history){var r=[e.id]
-_i(e,(function(e){r.push(e.id)}),!0),e.history=new Mi(null),e.history.done=Fi(this.history.done,r),e.history.undone=Fi(this.history.undone,r)}},iterLinkedDocs:function(e){_i(this,e)},getMode:function(){return this.mode},getEditor:function(){return this.cm},splitLines:function(e){return this.lineSep?e.split(this.lineSep):Ko(e)},lineSeparator:function(){return this.lineSep||"\n"}}),vi.prototype.eachLine=vi.prototype.iter
-var bi="iter insert remove copy getEditor constructor".split(" ")
-for(var yi in vi.prototype)vi.prototype.hasOwnProperty(yi)&&bo(bi,yi)<0&&(P.prototype[yi]=function(e){return function(){return e.apply(this.doc,arguments)}}(vi.prototype[yi]))
-function _i(e,t,r){(function e(n,i,o){if(n.linked)for(var s=0;s<n.linked.length;++s){var a=n.linked[s]
-if(a.doc!=i){var l=o&&a.sharedHist
-r&&!l||(t(a.doc,l),e(a.doc,n,l))}}})(e,null,!0)}function wi(e,t){if(t.cm)throw new Error("This document is already in use.")
-e.doc=t,t.cm=e,k(e),T(e),e.options.lineWrapping||D(e),e.options.mode=t.modeOption,er(e)}function Oi(e,t){if((t-=e.first)<0||t>=e.size)throw new Error("There is no line "+(t+e.first)+" in the document.")
-for(var r=e;!r.lines;)for(var n=0;;++n){var i=r.children[n],o=i.chunkSize()
-if(t<o){r=i
-break}t-=o}return r.lines[t]}function xi(e,t,r){var n=[],i=t.line
-return e.iter(t.line,r.line+1,(function(e){var o=e.text
-i==r.line&&(o=o.slice(0,r.ch)),i==t.line&&(o=o.slice(t.ch)),n.push(o),++i})),n}function Pi(e,t,r){var n=[]
-return e.iter(t,r,(function(e){n.push(e.text)})),n}function Si(e,t){var r=t-e.height
-if(r)for(var n=e;n;n=n.parent)n.height+=r}function Ti(e){if(null==e.parent)return null
-for(var t=e.parent,r=bo(t.lines,e),n=t.parent;n;t=n,n=n.parent)for(var i=0;n.children[i]!=t;++i)r+=n.children[i].chunkSize()
-return r+t.first}function Ei(e,t){var r=e.first
-e:do{for(var n=0;n<e.children.length;++n){var i=e.children[n],o=i.height
-if(t<o){e=i
-continue e}t-=o,r+=i.chunkSize()}return r}while(!e.lines)
-for(n=0;n<e.lines.length;++n){var s=e.lines[n].height
-if(t<s)break
-t-=s}return r+n}function Ci(e){for(var t=0,r=(e=zn(e)).parent,n=0;n<r.lines.length;++n){var i=r.lines[n]
-if(i==e)break
-t+=i.height}for(var o=r.parent;o;o=(r=o).parent)for(n=0;n<o.children.length;++n){var s=o.children[n]
-if(s==r)break
-t+=s.height}return t}function ki(e){var t=e.order
-return null==t&&(t=e.order=ds(e.text)),t}function Mi(e){this.done=[],this.undone=[],this.undoDepth=1/0,this.lastModTime=this.lastSelTime=0,this.lastOp=this.lastSelOp=null,this.lastOrigin=this.lastSelOrigin=null,this.generation=this.maxGeneration=e||1}function Ai(e,t){var r={from:me(t.from),to:Rr(t),text:xi(e,t.from,t.to)}
-return Di(e,r,t.from.line,t.to.line+1),_i(e,(function(e){Di(e,r,t.from.line,t.to.line+1)}),!0),r}function Ri(e){for(;e.length;){if(!go(e).ranges)break
-e.pop()}}function ji(e,t,r,n){var i=e.history
-i.undone.length=0
-var o,s=+new Date
-if((i.lastOp==n||i.lastOrigin==t.origin&&t.origin&&("+"==t.origin.charAt(0)&&e.cm&&i.lastModTime>s-e.cm.options.historyEventDelay||"*"==t.origin.charAt(0)))&&(o=function(e,t){return t?(Ri(e.done),go(e.done)):e.done.length&&!go(e.done).ranges?go(e.done):e.done.length>1&&!e.done[e.done.length-2].ranges?(e.done.pop(),go(e.done)):void 0}(i,i.lastOp==n))){var a=go(o.changes)
-0==fe(t.from,t.to)&&0==fe(t.from,a.to)?a.to=Rr(t):o.changes.push(Ai(e,t))}else{var l=go(i.done)
-for(l&&l.ranges||Ii(e.sel,i.done),o={changes:[Ai(e,t)],generation:i.generation},i.done.push(o);i.done.length>i.undoDepth;)i.done.shift(),i.done[0].ranges||i.done.shift()}i.done.push(r),i.generation=++i.maxGeneration,i.lastModTime=i.lastSelTime=s,i.lastOp=i.lastSelOp=n,i.lastOrigin=i.lastSelOrigin=t.origin,a||Ji(e,"historyAdded")}function Ii(e,t){var r=go(t)
-r&&r.ranges&&r.equals(e)||t.push(e)}function Di(e,t,r,n){var i=t["spans_"+e.id],o=0
-e.iter(Math.max(e.first,r),Math.min(e.first+e.size,n),(function(r){r.markedSpans&&((i||(i=t["spans_"+e.id]={}))[o]=r.markedSpans),++o}))}function Ni(e){if(!e)return null
-for(var t,r=0;r<e.length;++r)e[r].marker.explicitlyCleared?t||(t=e.slice(0,r)):t&&t.push(e[r])
-return t?t.length?t:null:e}function Fi(e,t,r){for(var n=0,i=[];n<e.length;++n){var o=e[n]
-if(o.ranges)i.push(r?Re.prototype.deepCopy.call(o):o)
-else{var s=o.changes,a=[]
-i.push({changes:a})
-for(var l=0;l<s.length;++l){var u,c=s[l]
-if(a.push({from:c.from,to:c.to,text:c.text}),t)for(var d in c)(u=d.match(/^spans_(\d+)$/))&&bo(t,Number(u[1]))>-1&&(go(a)[d]=c[d],delete c[d])}}}return i}function Li(e,t,r,n){r<e.line?e.line+=n:t<e.line&&(e.line=t,e.ch=0)}function zi(e,t,r,n){for(var i=0;i<e.length;++i){var o=e[i],s=!0
-if(o.ranges){o.copied||((o=e[i]=o.deepCopy()).copied=!0)
-for(var a=0;a<o.ranges.length;a++)Li(o.ranges[a].anchor,t,r,n),Li(o.ranges[a].head,t,r,n)}else{for(a=0;a<o.changes.length;++a){var l=o.changes[a]
-if(r<l.from.line)l.from=pe(l.from.line+n,l.from.ch),l.to=pe(l.to.line+n,l.to.ch)
-else if(t<=l.to.line){s=!1
-break}}s||(e.splice(0,i+1),i=0)}}}function Ui(e,t){var r=t.from.line,n=t.to.line,i=t.text.length-(n-r)-1
-zi(e.done,r,n,i),zi(e.undone,r,n,i)}io(vi)
-var Bi=P.e_preventDefault=function(e){e.preventDefault?e.preventDefault():e.returnValue=!1},Hi=P.e_stopPropagation=function(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0}
-function $i(e){return null!=e.defaultPrevented?e.defaultPrevented:0==e.returnValue}var Wi=P.e_stop=function(e){Bi(e),Hi(e)}
-function qi(e){return e.target||e.srcElement}function Vi(e){var t=e.which
-return null==t&&(1&e.button?t=1:2&e.button?t=3:4&e.button&&(t=2)),g&&e.ctrlKey&&1==t&&(t=3),t}var Gi=P.on=function(e,t,r){if(e.addEventListener)e.addEventListener(t,r,!1)
-else if(e.attachEvent)e.attachEvent("on"+t,r)
-else{var n=e._handlers||(e._handlers={});(n[t]||(n[t]=[])).push(r)}},Ki=[]
-function Yi(e,t,r){var n=e._handlers&&e._handlers[t]
-return r?n&&n.length>0?n.slice():Ki:n||Ki}var Qi=P.off=function(e,t,r){if(e.removeEventListener)e.removeEventListener(t,r,!1)
-else if(e.detachEvent)e.detachEvent("on"+t,r)
-else for(var n=Yi(e,t,!1),i=0;i<n.length;++i)if(n[i]==r){n.splice(i,1)
-break}},Ji=P.signal=function(e,t){var r=Yi(e,t,!0)
-if(r.length)for(var n=Array.prototype.slice.call(arguments,2),i=0;i<r.length;++i)r[i].apply(null,n)},Xi=null
-function Zi(e,t){var r=Yi(e,t,!1)
-if(r.length){var n,i=Array.prototype.slice.call(arguments,2)
-zt?n=zt.delayedCallbacks:Xi?n=Xi:(n=Xi=[],setTimeout(eo,0))
-for(var o=0;o<r.length;++o)n.push(s(r[o]))}function s(e){return function(){e.apply(null,i)}}}function eo(){var e=Xi
-Xi=null
-for(var t=0;t<e.length;++t)e[t]()}function to(e,t,r){return"string"==typeof t&&(t={type:t,preventDefault:function(){this.defaultPrevented=!0}}),Ji(e,r||t.type,e,t),$i(t)||t.codemirrorIgnore}function ro(e){var t=e._handlers&&e._handlers.cursorActivity
-if(t)for(var r=e.curOp.cursorActivityHandlers||(e.curOp.cursorActivityHandlers=[]),n=0;n<t.length;++n)-1==bo(r,t[n])&&r.push(t[n])}function no(e,t){return Yi(e,t).length>0}function io(e){e.prototype.on=function(e,t){Gi(this,e,t)},e.prototype.off=function(e,t){Qi(this,e,t)}}var oo=30,so=P.Pass={toString:function(){return"CodeMirror.Pass"}},ao={scroll:!1},lo={origin:"*mouse"},uo={origin:"+move"}
-function co(){this.id=null}co.prototype.set=function(e,t){clearTimeout(this.id),this.id=setTimeout(t,e)}
-var ho=P.countColumn=function(e,t,r,n,i){null==t&&-1==(t=e.search(/[^\s\u00a0]/))&&(t=e.length)
-for(var o=n||0,s=i||0;;){var a=e.indexOf("\t",o)
-if(a<0||a>=t)return s+(t-o)
-s+=a-o,s+=r-s%r,o=a+1}},po=P.findColumn=function(e,t,r){for(var n=0,i=0;;){var o=e.indexOf("\t",n);-1==o&&(o=e.length)
-var s=o-n
-if(o==e.length||i+s>=t)return n+Math.min(s,t-i)
-if(i+=o-n,n=o+1,(i+=r-i%r)>=t)return n}},fo=[""]
-function mo(e){for(;fo.length<=e;)fo.push(go(fo)+" ")
-return fo[e]}function go(e){return e[e.length-1]}var vo=function(e){e.select()}
-function bo(e,t){for(var r=0;r<e.length;++r)if(e[r]==t)return r
-return-1}function yo(e,t){for(var r=[],n=0;n<e.length;n++)r[n]=t(e[n],n)
-return r}function _o(){}function wo(e,t){var r
-return Object.create?r=Object.create(e):(_o.prototype=e,r=new _o),t&&Oo(t,r),r}function Oo(e,t,r){for(var n in t||(t={}),e)!e.hasOwnProperty(n)||!1===r&&t.hasOwnProperty(n)||(t[n]=e[n])
-return t}function xo(e){var t=Array.prototype.slice.call(arguments,1)
-return function(){return e.apply(null,t)}}f?vo=function(e){e.selectionStart=0,e.selectionEnd=e.value.length}:o&&(vo=function(e){try{e.select()}catch(t){}})
-var Po=/[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/,So=P.isWordChar=function(e){return/\w/.test(e)||e>"€"&&(e.toUpperCase()!=e.toLowerCase()||Po.test(e))}
-function To(e,t){return t?!!(t.source.indexOf("\\w")>-1&&So(e))||t.test(e):So(e)}function Eo(e){for(var t in e)if(e.hasOwnProperty(t)&&e[t])return!1
-return!0}var Co,ko=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/
-function Mo(e){return e.charCodeAt(0)>=768&&ko.test(e)}function Ao(e,t,r,n){var i=document.createElement(e)
-if(r&&(i.className=r),n&&(i.style.cssText=n),"string"==typeof t)i.appendChild(document.createTextNode(t))
-else if(t)for(var o=0;o<t.length;++o)i.appendChild(t[o])
-return i}function Ro(e){for(var t=e.childNodes.length;t>0;--t)e.removeChild(e.firstChild)
-return e}function jo(e,t){return Ro(e).appendChild(t)}Co=document.createRange?function(e,t,r,n){var i=document.createRange()
-return i.setEnd(n||e,r),i.setStart(e,t),i}:function(e,t,r){var n=document.body.createTextRange()
-try{n.moveToElementText(e.parentNode)}catch(Go){return n}return n.collapse(!0),n.moveEnd("character",r),n.moveStart("character",t),n}
-var Io=P.contains=function(e,t){if(3==t.nodeType&&(t=t.parentNode),e.contains)return e.contains(t)
-do{if(11==t.nodeType&&(t=t.host),t==e)return!0}while(t=t.parentNode)}
-function Do(){for(var e=document.activeElement;e&&e.root&&e.root.activeElement;)e=e.root.activeElement
-return e}function No(e){return new RegExp("(^|\\s)"+e+"(?:$|\\s)\\s*")}o&&s<11&&(Do=function(){try{return document.activeElement}catch(Go){return document.body}})
-var Fo=P.rmClass=function(e,t){var r=e.className,n=No(t).exec(r)
-if(n){var i=r.slice(n.index+n[0].length)
-e.className=r.slice(0,n.index)+(i?n[1]+i:"")}},Lo=P.addClass=function(e,t){var r=e.className
-No(t).test(r)||(e.className+=(r?" ":"")+t)}
-function zo(e,t){for(var r=e.split(" "),n=0;n<r.length;n++)r[n]&&!No(r[n]).test(t)&&(t+=" "+r[n])
-return t}function Uo(e){if(document.body.getElementsByClassName)for(var t=document.body.getElementsByClassName("CodeMirror"),r=0;r<t.length;r++){var n=t[r].CodeMirror
-n&&e(n)}}var Bo=!1
-var Ho,$o,Wo=function(){if(o&&s<9)return!1
-var e=Ao("div")
-return"draggable"in e||"dragDrop"in e}()
-function qo(e){if(null==Ho){var t=Ao("span","​")
-jo(e,Ao("span",[t,document.createTextNode("x")])),0!=e.firstChild.offsetHeight&&(Ho=t.offsetWidth<=1&&t.offsetHeight>2&&!(o&&s<8))}var r=Ho?Ao("span","​"):Ao("span"," ",null,"display: inline-block; width: 1px; margin-right: -1px")
-return r.setAttribute("cm-text",""),r}function Vo(e){if(null!=$o)return $o
-var t=jo(e,document.createTextNode("AخA")),r=Co(t,0,1).getBoundingClientRect()
-if(!r||r.left==r.right)return!1
-var n=Co(t,1,2).getBoundingClientRect()
-return $o=n.right-r.right<3}var Go,Ko=P.splitLines=3!="\n\nb".split(/\n/).length?function(e){for(var t=0,r=[],n=e.length;t<=n;){var i=e.indexOf("\n",t);-1==i&&(i=e.length)
-var o=e.slice(t,"\r"==e.charAt(i-1)?i-1:i),s=o.indexOf("\r");-1!=s?(r.push(o.slice(0,s)),t+=s+1):(r.push(o),t=i+1)}return r}:function(e){return e.split(/\r\n?|\n/)},Yo=window.getSelection?function(e){try{return e.selectionStart!=e.selectionEnd}catch(Go){return!1}}:function(e){try{var t=e.ownerDocument.selection.createRange()}catch(Go){}return!(!t||t.parentElement()!=e)&&0!=t.compareEndPoints("StartToEnd",t)},Qo="oncopy"in(Go=Ao("div"))||(Go.setAttribute("oncopy","return;"),"function"==typeof Go.oncopy),Jo=null
-var Xo,Zo=P.keyNames={3:"Enter",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",61:"=",91:"Mod",92:"Mod",93:"Mod",106:"*",107:"=",109:"-",110:".",111:"/",127:"Delete",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"}
-function es(e){return e.level%2?e.to:e.from}function ts(e){return e.level%2?e.from:e.to}function rs(e){var t=ki(e)
-return t?es(t[0]):0}function ns(e){var t=ki(e)
-return t?ts(go(t)):e.text.length}function is(e,t){var r=Oi(e.doc,t),n=zn(r)
-n!=r&&(t=Ti(n))
-var i=ki(n),o=i?i[0].level%2?ns(n):rs(n):0
-return pe(t,o)}function os(e,t){var r=is(e,t.line),n=Oi(e.doc,r.line),i=ki(n)
-if(!i||0==i[0].level){var o=Math.max(0,n.text.search(/\S/)),s=t.line==r.line&&t.ch<=o&&t.ch
-return pe(r.line,s?0:o)}return r}function ss(e,t,r){var n=e[0].level
-return t==n||r!=n&&t<r}function as(e,t){Xo=null
-for(var r,n=0;n<e.length;++n){var i=e[n]
-if(i.from<t&&i.to>t)return n
-if(i.from==t||i.to==t){if(null!=r)return ss(e,i.level,e[r].level)?(i.from!=i.to&&(Xo=r),n):(i.from!=i.to&&(Xo=n),r)
-r=n}}return r}function ls(e,t,r,n){if(!n)return t+r
-do{t+=r}while(t>0&&Mo(e.text.charAt(t)))
-return t}function us(e,t,r,n){var i=ki(e)
-if(!i)return cs(e,t,r,n)
-for(var o=as(i,t),s=i[o],a=ls(e,t,s.level%2?-r:r,n);;){if(a>s.from&&a<s.to)return a
-if(a==s.from||a==s.to)return as(i,a)==o?a:r>0==(s=i[o+=r]).level%2?s.to:s.from
-if(!(s=i[o+=r]))return null
-a=r>0==s.level%2?ls(e,s.to,-1,n):ls(e,s.from,1,n)}}function cs(e,t,r,n){var i=t+r
-if(n)for(;i>0&&Mo(e.text.charAt(i));)i+=r
-return i<0||i>e.text.length?null:i}(function(){for(var e=0;e<10;e++)Zo[e+48]=Zo[e+96]=String(e)
-for(e=65;e<=90;e++)Zo[e]=String.fromCharCode(e)
-for(e=1;e<=12;e++)Zo[e+111]=Zo[e+63235]="F"+e})()
-var ds=function(){var e=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,t=/[stwN]/,r=/[LRr]/,n=/[Lb1n]/,i=/[1n]/,o="L"
-function s(e,t,r){this.level=e,this.from=t,this.to=r}return function(a){if(!e.test(a))return!1
-for(var l,u=a.length,c=[],d=0;d<u;++d)c.push(v=(l=a.charCodeAt(d))<=247?"bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN".charAt(l):1424<=l&&l<=1524?"R":1536<=l&&l<=1773?"rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm".charAt(l-1536):1774<=l&&l<=2220?"r":8192<=l&&l<=8203?"w":8204==l?"b":"L")
-d=0
-for(var h=o;d<u;++d){"m"==(v=c[d])?c[d]=h:h=v}d=0
-for(var p=o;d<u;++d){"1"==(v=c[d])&&"r"==p?c[d]="n":r.test(v)&&(p=v,"r"==v&&(c[d]="R"))}for(d=1,h=c[0];d<u-1;++d){"+"==(v=c[d])&&"1"==h&&"1"==c[d+1]?c[d]="1":","!=v||h!=c[d+1]||"1"!=h&&"n"!=h||(c[d]=h),h=v}for(d=0;d<u;++d){if(","==(v=c[d]))c[d]="N"
-else if("%"==v){for(var f=d+1;f<u&&"%"==c[f];++f);for(var m=d&&"!"==c[d-1]||f<u&&"1"==c[f]?"1":"N",g=d;g<f;++g)c[g]=m
-d=f-1}}for(d=0,p=o;d<u;++d){var v=c[d]
-"L"==p&&"1"==v?c[d]="L":r.test(v)&&(p=v)}for(d=0;d<u;++d)if(t.test(c[d])){for(f=d+1;f<u&&t.test(c[f]);++f);var b="L"==(d?c[d-1]:o),y="L"==(f<u?c[f]:o)
-for(m=b||y?"L":"R",g=d;g<f;++g)c[g]=m
-d=f-1}var _,w=[]
-for(d=0;d<u;)if(n.test(c[d])){var O=d
-for(++d;d<u&&n.test(c[d]);++d);w.push(new s(0,O,d))}else{var x=d,P=w.length
-for(++d;d<u&&"L"!=c[d];++d);for(g=x;g<d;)if(i.test(c[g])){x<g&&w.splice(P,0,new s(1,x,g))
-var S=g
-for(++g;g<d&&i.test(c[g]);++g);w.splice(P,0,new s(2,S,g)),x=g}else++g
-x<d&&w.splice(P,0,new s(1,x,d))}return 1==w[0].level&&(_=a.match(/^\s+/))&&(w[0].from=_[0].length,w.unshift(new s(0,0,_[0].length))),1==go(w).level&&(_=a.match(/\s+$/))&&(go(w).to-=_[0].length,w.push(new s(0,u-_[0].length,u))),2==w[0].level&&w.unshift(new s(1,w[0].to,w[0].to)),w[0].level!=go(w).level&&w.push(new s(w[0].level,u,u)),w}}()
-return P.version="5.15.2",P})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}((function(e){"use strict"
-var t="CodeMirror-lint-markers"
-function r(e){e.parentNode&&e.parentNode.removeChild(e)}function n(t,n,i){var o=function(t,r){var n=document.createElement("div")
-function i(t){if(!n.parentNode)return e.off(document,"mousemove",i)
-n.style.top=Math.max(0,t.clientY-n.offsetHeight-5)+"px",n.style.left=t.clientX+5+"px"}return n.className="CodeMirror-lint-tooltip",n.appendChild(r.cloneNode(!0)),document.body.appendChild(n),e.on(document,"mousemove",i),i(t),null!=n.style.opacity&&(n.style.opacity=1),n}(t,n)
-function s(){var t
-e.off(i,"mouseout",s),o&&((t=o).parentNode&&(null==t.style.opacity&&r(t),t.style.opacity=0,setTimeout((function(){r(t)}),600)),o=null)}var a=setInterval((function(){if(o)for(var e=i;;e=e.parentNode){if(e&&11==e.nodeType&&(e=e.host),e==document.body)return
-if(!e){s()
-break}}if(!o)return clearInterval(a)}),400)
-e.on(i,"mouseout",s)}function i(e,t,r){this.marked=[],this.options=t,this.timeout=null,this.hasGutter=r,this.onMouseOver=function(t){(function(e,t){var r=t.target||t.srcElement
-if(!/\bCodeMirror-lint-mark-/.test(r.className))return
-for(var i=r.getBoundingClientRect(),o=(i.left+i.right)/2,s=(i.top+i.bottom)/2,l=e.findMarksAt(e.coordsChar({left:o,top:s},"client")),u=[],c=0;c<l.length;++c){var d=l[c].__annotation
-d&&u.push(d)}u.length&&function(e,t){for(var r=t.target||t.srcElement,i=document.createDocumentFragment(),o=0;o<e.length;o++){var s=e[o]
-i.appendChild(a(s))}n(t,i,r)}(u,t)})(e,t)},this.waitingFor=0}function o(e){var r=e.state.lint
-r.hasGutter&&e.clearGutter(t)
-for(var n=0;n<r.marked.length;++n)r.marked[n].clear()
-r.marked.length=0}function s(t,r,i,o){var s=document.createElement("div"),a=s
-return s.className="CodeMirror-lint-marker-"+r,i&&((a=s.appendChild(document.createElement("div"))).className="CodeMirror-lint-marker-multiple"),0!=o&&e.on(a,"mouseover",(function(e){n(e,t,a)})),s}function a(e){var t=e.severity
-t||(t="error")
-var r=document.createElement("div")
-return r.className="CodeMirror-lint-message-"+t,r.appendChild(document.createTextNode(e.message)),r}function l(t){var r=t.state.lint.options,n=r.options||r,i=r.getAnnotations||t.getHelper(e.Pos(0,0),"lint")
-i&&(r.async||i.async?function(t,r,n){var i=t.state.lint,o=++i.waitingFor
-function s(){o=-1,t.off("change",s)}t.on("change",s),r(t.getValue(),(function(r,n){t.off("change",s),i.waitingFor==o&&(n&&r instanceof e&&(r=n),u(t,r))}),n,t)}(t,i,n):u(t,i(t.getValue(),n,t)))}function u(e,r){o(e)
-for(var n,i,l=e.state.lint,u=l.options,c=function(e){for(var t=[],r=0;r<e.length;++r){var n=e[r],i=n.from.line;(t[i]||(t[i]=[])).push(n)}return t}(r),d=0;d<c.length;++d){var h=c[d]
-if(h){for(var p=null,f=l.hasGutter&&document.createDocumentFragment(),m=0;m<h.length;++m){var g=h[m],v=g.severity
-v||(v="error"),i=v,p="error"==(n=p)?n:i,u.formatAnnotation&&(g=u.formatAnnotation(g)),l.hasGutter&&f.appendChild(a(g)),g.to&&l.marked.push(e.markText(g.from,g.to,{className:"CodeMirror-lint-mark-"+v,__annotation:g}))}l.hasGutter&&e.setGutterMarker(d,t,s(f,p,h.length>1,l.options.tooltips))}}u.onUpdateLinting&&u.onUpdateLinting(r,c,e)}function c(e){var t=e.state.lint
-t&&(clearTimeout(t.timeout),t.timeout=setTimeout((function(){l(e)}),t.options.delay||500))}e.defineOption("lint",!1,(function(r,n,s){if(s&&s!=e.Init&&(o(r),!1!==r.state.lint.options.lintOnChange&&r.off("change",c),e.off(r.getWrapperElement(),"mouseover",r.state.lint.onMouseOver),clearTimeout(r.state.lint.timeout),delete r.state.lint),n){for(var a=r.getOption("gutters"),u=!1,d=0;d<a.length;++d)a[d]==t&&(u=!0)
-var h=r.state.lint=new i(r,(p=n)instanceof Function?{getAnnotations:p}:(p&&!0!==p||(p={}),p),u)
-!1!==h.options.lintOnChange&&r.on("change",c),0!=h.options.tooltips&&e.on(r.getWrapperElement(),"mouseover",h.onMouseOver),l(r)}var p})),e.defineExtension("performLint",(function(){this.state.lint&&l(this)}))})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}((function(e){"use strict"
-e.registerHelper("lint","json",(function(t){var r=[]
-jsonlint.parseError=function(t,n){var i=n.loc
-r.push({from:e.Pos(i.first_line-1,i.first_column),to:e.Pos(i.last_line-1,i.last_column),message:t})}
-try{jsonlint.parse(t)}catch(n){}return r}))})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}((function(e){"use strict"
-e.registerHelper("lint","yaml",(function(t){var r=[]
-try{jsyaml.load(t)}catch(i){var n=i.mark
-r.push({from:e.Pos(n.line,n.column),to:e.Pos(n.line,n.column),message:i.message})}return r}))})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror"),"cjs"):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],(function(t){e(t,"amd")})):e(CodeMirror,"plain")}((function(e,t){e.modeURL||(e.modeURL="../mode/%N/%N.js")
-var r={}
-function n(t,r){var n=e.modes[t].dependencies
-if(!n)return r()
-for(var i=[],o=0;o<n.length;++o)e.modes.hasOwnProperty(n[o])||i.push(n[o])
-if(!i.length)return r()
-var s=function(e,t){var r=t
-return function(){0==--r&&e()}}(r,i.length)
-for(o=0;o<i.length;++o)e.requireMode(i[o],s)}e.requireMode=function(i,o){if("string"!=typeof i&&(i=i.name),e.modes.hasOwnProperty(i))return n(i,o)
-if(r.hasOwnProperty(i))return r[i].push(o)
-var s=e.modeURL.replace(/%N/g,i)
-if("plain"==t){var a=document.createElement("script")
-a.src=s
-var l=document.getElementsByTagName("script")[0],u=r[i]=[o]
-e.on(a,"load",(function(){n(i,(function(){for(var e=0;e<u.length;++e)u[e]()}))})),l.parentNode.insertBefore(a,l)}else"cjs"==t?(require(s),o()):"amd"==t&&requirejs([s],o)},e.autoLoadMode=function(t,r){e.modes.hasOwnProperty(r)||e.requireMode(r,(function(){t.setOption("mode",t.getOption("mode"))}))}})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}((function(e){"use strict"
-function t(e,t){if(!e.hasOwnProperty(t))throw new Error("Undefined state "+t+" in simple mode")}function r(e,t){if(!e)return/(?:)/
-var r=""
-return e instanceof RegExp?(e.ignoreCase&&(r="i"),e=e.source):e=String(e),new RegExp((!1===t?"":"^")+"(?:"+e+")",r)}function n(e,n){(e.next||e.push)&&t(n,e.next||e.push),this.regex=r(e.regex),this.token=function(e){if(!e)return null
-if("string"==typeof e)return e.replace(/\./g," ")
-for(var t=[],r=0;r<e.length;r++)t.push(e[r]&&e[r].replace(/\./g," "))
-return t}(e.token),this.data=e}function i(e,t){return function(r,n){if(n.pending){var i=n.pending.shift()
-return 0==n.pending.length&&(n.pending=null),r.pos+=i.text.length,i.token}if(n.local){if(n.local.end&&r.match(n.local.end)){var o=n.local.endToken||null
-return n.local=n.localState=null,o}var a
-o=n.local.mode.token(r,n.localState)
-return n.local.endScan&&(a=n.local.endScan.exec(r.current()))&&(r.pos=r.start+a.index),o}for(var l=e[n.state],u=0;u<l.length;u++){var c=l[u],d=(!c.data.sol||r.sol())&&r.match(c.regex)
-if(d){if(c.data.next?n.state=c.data.next:c.data.push?((n.stack||(n.stack=[])).push(n.state),n.state=c.data.push):c.data.pop&&n.stack&&n.stack.length&&(n.state=n.stack.pop()),c.data.mode&&s(t,n,c.data.mode,c.token),c.data.indent&&n.indent.push(r.indentation()+t.indentUnit),c.data.dedent&&n.indent.pop(),d.length>2){n.pending=[]
-for(var h=2;h<d.length;h++)d[h]&&n.pending.push({text:d[h],token:c.token[h-1]})
-return r.backUp(d[0].length-(d[1]?d[1].length:0)),c.token[0]}return c.token&&c.token.join?c.token[0]:c.token}}return r.next(),null}}function o(e,t){if(e===t)return!0
-if(!e||"object"!=typeof e||!t||"object"!=typeof t)return!1
-var r=0
-for(var n in e)if(e.hasOwnProperty(n)){if(!t.hasOwnProperty(n)||!o(e[n],t[n]))return!1
-r++}for(var n in t)t.hasOwnProperty(n)&&r--
-return 0==r}function s(t,n,i,s){var a
-if(i.persistent)for(var l=n.persistentStates;l&&!a;l=l.next)(i.spec?o(i.spec,l.spec):i.mode==l.mode)&&(a=l)
-var u=a?a.mode:i.mode||e.getMode(t,i.spec),c=a?a.state:e.startState(u)
-i.persistent&&!a&&(n.persistentStates={mode:u,spec:i.spec,state:c,next:n.persistentStates}),n.localState=c,n.local={mode:u,end:i.end&&r(i.end),endScan:i.end&&!1!==i.forceEnd&&r(i.end,!1),endToken:s&&s.join?s[s.length-1]:s}}function a(t,r){return function(n,i,o){if(n.local&&n.local.mode.indent)return n.local.mode.indent(n.localState,i,o)
-if(null==n.indent||n.local||r.dontIndentStates&&function(e,t){for(var r=0;r<t.length;r++)if(t[r]===e)return!0}(n.state,r.dontIndentStates)>-1)return e.Pass
-var s=n.indent.length-1,a=t[n.state]
-e:for(;;){for(var l=0;l<a.length;l++){var u=a[l]
-if(u.data.dedent&&!1!==u.data.dedentIfLineStart){var c=u.regex.exec(i)
-if(c&&c[0]){s--,(u.next||u.push)&&(a=t[u.next||u.push]),i=i.slice(c[0].length)
-continue e}}}break}return s<0?0:n.indent[s]}}e.defineSimpleMode=function(t,r){e.defineMode(t,(function(t){return e.simpleMode(t,r)}))},e.simpleMode=function(r,o){t(o,"start")
-var s={},l=o.meta||{},u=!1
-for(var c in o)if(c!=l&&o.hasOwnProperty(c))for(var d=s[c]=[],h=o[c],p=0;p<h.length;p++){var f=h[p]
-d.push(new n(f,o)),(f.indent||f.dedent)&&(u=!0)}var m={startState:function(){return{state:"start",pending:null,local:null,localState:null,indent:u?[]:null}},copyState:function(t){var r={state:t.state,pending:t.pending,local:t.local,localState:null,indent:t.indent&&t.indent.slice(0)}
-t.localState&&(r.localState=e.copyState(t.local.mode,t.localState)),t.stack&&(r.stack=t.stack.slice(0))
-for(var n=t.persistentStates;n;n=n.next)r.persistentStates={mode:n.mode,spec:n.spec,state:n.state==t.localState?r.localState:e.copyState(n.mode,n.state),next:r.persistentStates}
-return r},token:i(s,r),innerMode:function(e){return e.local&&{mode:e.local.mode,state:e.localState}},indent:a(s,l)}
-if(l)for(var g in l)l.hasOwnProperty(g)&&(m[g]=l[g])
-return m}})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}((function(e){"use strict"
-e.multiplexingMode=function(t){var r=Array.prototype.slice.call(arguments,1)
-function n(e,t,r,n){if("string"==typeof t){var i=e.indexOf(t,r)
-return n&&i>-1?i+t.length:i}var o=t.exec(r?e.slice(r):e)
-return o?o.index+r+(n?o[0].length:0):-1}return{startState:function(){return{outer:e.startState(t),innerActive:null,inner:null}},copyState:function(r){return{outer:e.copyState(t,r.outer),innerActive:r.innerActive,inner:r.innerActive&&e.copyState(r.innerActive.mode,r.inner)}},token:function(i,o){if(o.innerActive){var s=o.innerActive
-u=i.string
-if(!s.close&&i.sol())return o.innerActive=o.inner=null,this.token(i,o)
-if((d=s.close?n(u,s.close,i.pos,s.parseDelimiters):-1)==i.pos&&!s.parseDelimiters)return i.match(s.close),o.innerActive=o.inner=null,s.delimStyle&&s.delimStyle+" "+s.delimStyle+"-close"
-d>-1&&(i.string=u.slice(0,d))
-var a=s.mode.token(i,o.inner)
-return d>-1&&(i.string=u),d==i.pos&&s.parseDelimiters&&(o.innerActive=o.inner=null),s.innerStyle&&(a=a?a+" "+s.innerStyle:s.innerStyle),a}for(var l=1/0,u=i.string,c=0;c<r.length;++c){var d,h=r[c]
-if((d=n(u,h.open,i.pos))==i.pos)return h.parseDelimiters||i.match(h.open),o.innerActive=h,o.inner=e.startState(h.mode,t.indent?t.indent(o.outer,""):0),h.delimStyle&&h.delimStyle+" "+h.delimStyle+"-open";-1!=d&&d<l&&(l=d)}l!=1/0&&(i.string=u.slice(0,l))
-var p=t.token(i,o.outer)
-return l!=1/0&&(i.string=u),p},indent:function(r,n){var i=r.innerActive?r.innerActive.mode:t
-return i.indent?i.indent(r.innerActive?r.inner:r.outer,n):e.Pass},blankLine:function(n){var i=n.innerActive?n.innerActive.mode:t
-if(i.blankLine&&i.blankLine(n.innerActive?n.inner:n.outer),n.innerActive)"\n"===n.innerActive.close&&(n.innerActive=n.inner=null)
-else for(var o=0;o<r.length;++o){var s=r[o]
-"\n"===s.open&&(n.innerActive=s,n.inner=e.startState(s.mode,i.indent?i.indent(n.outer,""):0))}},electricChars:t.electricChars,innerMode:function(e){return e.inner?{state:e.inner,mode:e.innerActive.mode}:{state:e.outer,mode:t}}}}})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("bower_components/codemirror/lib/codemirror"),require("bower_components/codemirror/addon/mode/simple")):"function"==typeof define&&define.amd?define(["bower_components/codemirror/lib/codemirror","bower_components/codemirror/addon/mode/simple"],e):e(CodeMirror)}((function(e){"use strict"
-e.defineMode("htmlhandlebars",(function(t){return e.multiplexingMode(e.getMode(t,"text/html"),{open:"{{",close:"}}",mode:e.getMode(t,"handlebars"),parseDelimiters:!0})})),e.defineMIME("text/x-handlebars-template","htmlhandlebars")})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../lib/codemirror"),require("../addon/search/searchcursor"),require("../addon/edit/matchbrackets")):"function"==typeof define&&define.amd?define(["../lib/codemirror","../addon/search/searchcursor","../addon/edit/matchbrackets"],e):e(CodeMirror)}((function(e){"use strict"
-var t=e.keyMap.sublime={fallthrough:"default"},r=e.commands,n=e.Pos,i=e.keyMap.default==e.keyMap.macDefault,o=i?"Cmd-":"Ctrl-"
-function s(t,r){t.extendSelectionsBy((function(i){return t.display.shift||t.doc.extend||i.empty()?function(t,r,i){if(i<0&&0==r.ch)return t.clipPos(n(r.line-1))
-var o=t.getLine(r.line)
-if(i>0&&r.ch>=o.length)return t.clipPos(n(r.line+1,0))
-for(var s,a="start",l=r.ch,u=i<0?0:o.length,c=0;l!=u;l+=i,c++){var d=o.charAt(i<0?l-1:l),h="_"!=d&&e.isWordChar(d)?"w":"o"
-if("w"==h&&d.toUpperCase()==d&&(h="W"),"start"==a)"o"!=h&&(a="in",s=h)
-else if("in"==a&&s!=h){if("w"==s&&"W"==h&&i<0&&l--,"W"==s&&"w"==h&&i>0){s="w"
-continue}break}}return n(r.line,l)}(t.doc,i.head,r):r<0?i.from():i.to()}))}r[t["Alt-Left"]="goSubwordLeft"]=function(e){s(e,-1)},r[t["Alt-Right"]="goSubwordRight"]=function(e){s(e,1)},i&&(t["Cmd-Left"]="goLineStartSmart")
-var a=i?"Ctrl-Alt-":"Ctrl-"
-function l(t,r){if(t.isReadOnly())return e.Pass
-t.operation((function(){for(var e=t.listSelections().length,i=[],o=-1,s=0;s<e;s++){var a=t.listSelections()[s].head
-if(!(a.line<=o)){var l=n(a.line+(r?0:1),0)
-t.replaceRange("\n",l,null,"+insertLine"),t.indentLine(l.line,null,!0),i.push({head:l,anchor:l}),o=a.line+1}}t.setSelections(i)})),t.execCommand("indentAuto")}function u(t,r){for(var i=r.ch,o=i,s=t.getLine(r.line);i&&e.isWordChar(s.charAt(i-1));)--i
-for(;o<s.length&&e.isWordChar(s.charAt(o));)++o
-return{from:n(r.line,i),to:n(r.line,o),word:s.slice(i,o)}}r[t[a+"Up"]="scrollLineUp"]=function(e){var t=e.getScrollInfo()
-if(!e.somethingSelected()){var r=e.lineAtHeight(t.top+t.clientHeight,"local")
-e.getCursor().line>=r&&e.execCommand("goLineUp")}e.scrollTo(null,t.top-e.defaultTextHeight())},r[t[a+"Down"]="scrollLineDown"]=function(e){var t=e.getScrollInfo()
-if(!e.somethingSelected()){var r=e.lineAtHeight(t.top,"local")+1
-e.getCursor().line<=r&&e.execCommand("goLineDown")}e.scrollTo(null,t.top+e.defaultTextHeight())},r[t["Shift-"+o+"L"]="splitSelectionByLine"]=function(e){for(var t=e.listSelections(),r=[],i=0;i<t.length;i++)for(var o=t[i].from(),s=t[i].to(),a=o.line;a<=s.line;++a)s.line>o.line&&a==s.line&&0==s.ch||r.push({anchor:a==o.line?o:n(a,0),head:a==s.line?s:n(a)})
-e.setSelections(r,0)},t["Shift-Tab"]="indentLess",r[t.Esc="singleSelectionTop"]=function(e){var t=e.listSelections()[0]
-e.setSelection(t.anchor,t.head,{scroll:!1})},r[t[o+"L"]="selectLine"]=function(e){for(var t=e.listSelections(),r=[],i=0;i<t.length;i++){var o=t[i]
-r.push({anchor:n(o.from().line,0),head:n(o.to().line+1,0)})}e.setSelections(r)},t["Shift-Ctrl-K"]="deleteLine",r[t[o+"Enter"]="insertLineAfter"]=function(e){return l(e,!1)},r[t["Shift-"+o+"Enter"]="insertLineBefore"]=function(e){return l(e,!0)},r[t[o+"D"]="selectNextOccurrence"]=function(t){var r=t.getCursor("from"),i=t.getCursor("to"),o=t.state.sublimeFindFullWord==t.doc.sel
-if(0==e.cmpPos(r,i)){var s=u(t,r)
-if(!s.word)return
-t.setSelection(s.from,s.to),o=!0}else{var a=t.getRange(r,i),l=o?new RegExp("\\b"+a+"\\b"):a,c=t.getSearchCursor(l,i);(c.findNext()||(c=t.getSearchCursor(l,n(t.firstLine(),0))).findNext())&&t.addSelection(c.from(),c.to())}o&&(t.state.sublimeFindFullWord=t.doc.sel)}
-var c="(){}[]"
-function d(e){var t=e.getCursor(),r=e.scanForBracket(t,-1)
-if(r)for(;;){var i=e.scanForBracket(t,1)
-if(!i)return
-if(i.ch==c.charAt(c.indexOf(r.ch)+1))return e.setSelection(n(r.pos.line,r.pos.ch+1),i.pos,!1),!0
-t=n(i.pos.line,i.pos.ch+1)}}r[t["Shift-"+o+"Space"]="selectScope"]=function(e){d(e)||e.execCommand("selectAll")},r[t["Shift-"+o+"M"]="selectBetweenBrackets"]=function(t){if(!d(t))return e.Pass},r[t[o+"M"]="goToBracket"]=function(t){t.extendSelectionsBy((function(r){var i=t.scanForBracket(r.head,1)
-if(i&&0!=e.cmpPos(i.pos,r.head))return i.pos
-var o=t.scanForBracket(r.head,-1)
-return o&&n(o.pos.line,o.pos.ch+1)||r.head}))}
-var h=i?"Cmd-Ctrl-":"Shift-Ctrl-"
-function p(t,r){if(t.isReadOnly())return e.Pass
-for(var i,o=t.listSelections(),s=[],a=0;a<o.length;a++){var l=o[a]
-if(!l.empty()){for(var u=l.from().line,c=l.to().line;a<o.length-1&&o[a+1].from().line==c;)c=l[++a].to().line
-s.push(u,c)}}s.length?i=!0:s.push(t.firstLine(),t.lastLine()),t.operation((function(){for(var e=[],o=0;o<s.length;o+=2){var a=s[o],l=s[o+1],u=n(a,0),c=n(l),d=t.getRange(u,c,!1)
-r?d.sort():d.sort((function(e,t){var r=e.toUpperCase(),n=t.toUpperCase()
-return r!=n&&(e=r,t=n),e<t?-1:e==t?0:1})),t.replaceRange(d,u,c),i&&e.push({anchor:u,head:c})}i&&t.setSelections(e,0)}))}r[t[h+"Up"]="swapLineUp"]=function(t){if(t.isReadOnly())return e.Pass
-for(var r=t.listSelections(),i=[],o=t.firstLine()-1,s=[],a=0;a<r.length;a++){var l=r[a],u=l.from().line-1,c=l.to().line
-s.push({anchor:n(l.anchor.line-1,l.anchor.ch),head:n(l.head.line-1,l.head.ch)}),0!=l.to().ch||l.empty()||--c,u>o?i.push(u,c):i.length&&(i[i.length-1]=c),o=c}t.operation((function(){for(var e=0;e<i.length;e+=2){var r=i[e],o=i[e+1],a=t.getLine(r)
-t.replaceRange("",n(r,0),n(r+1,0),"+swapLine"),o>t.lastLine()?t.replaceRange("\n"+a,n(t.lastLine()),null,"+swapLine"):t.replaceRange(a+"\n",n(o,0),null,"+swapLine")}t.setSelections(s),t.scrollIntoView()}))},r[t[h+"Down"]="swapLineDown"]=function(t){if(t.isReadOnly())return e.Pass
-for(var r=t.listSelections(),i=[],o=t.lastLine()+1,s=r.length-1;s>=0;s--){var a=r[s],l=a.to().line+1,u=a.from().line
-0!=a.to().ch||a.empty()||l--,l<o?i.push(l,u):i.length&&(i[i.length-1]=u),o=u}t.operation((function(){for(var e=i.length-2;e>=0;e-=2){var r=i[e],o=i[e+1],s=t.getLine(r)
-r==t.lastLine()?t.replaceRange("",n(r-1),n(r),"+swapLine"):t.replaceRange("",n(r,0),n(r+1,0),"+swapLine"),t.replaceRange(s+"\n",n(o,0),null,"+swapLine")}t.scrollIntoView()}))},r[t[o+"/"]="toggleCommentIndented"]=function(e){e.toggleComment({indent:!0})},r[t[o+"J"]="joinLines"]=function(e){for(var t=e.listSelections(),r=[],i=0;i<t.length;i++){for(var o=t[i],s=o.from(),a=s.line,l=o.to().line;i<t.length-1&&t[i+1].from().line==l;)l=t[++i].to().line
-r.push({start:a,end:l,anchor:!o.empty()&&s})}e.operation((function(){for(var t=0,i=[],o=0;o<r.length;o++){for(var s,a=r[o],l=a.anchor&&n(a.anchor.line-t,a.anchor.ch),u=a.start;u<=a.end;u++){var c=u-t
-u==a.end&&(s=n(c,e.getLine(c).length+1)),c<e.lastLine()&&(e.replaceRange(" ",n(c),n(c+1,/^\s*/.exec(e.getLine(c+1))[0].length)),++t)}i.push({anchor:l||s,head:s})}e.setSelections(i,0)}))},r[t["Shift-"+o+"D"]="duplicateLine"]=function(e){e.operation((function(){for(var t=e.listSelections().length,r=0;r<t;r++){var i=e.listSelections()[r]
-i.empty()?e.replaceRange(e.getLine(i.head.line)+"\n",n(i.head.line,0)):e.replaceRange(e.getRange(i.from(),i.to()),i.from())}e.scrollIntoView()}))},t[o+"T"]="transposeChars",r[t.F9="sortLines"]=function(e){p(e,!0)},r[t[o+"F9"]="sortLinesInsensitive"]=function(e){p(e,!1)},r[t.F2="nextBookmark"]=function(e){var t=e.state.sublimeBookmarks
-if(t)for(;t.length;){var r=t.shift(),n=r.find()
-if(n)return t.push(r),e.setSelection(n.from,n.to)}},r[t["Shift-F2"]="prevBookmark"]=function(e){var t=e.state.sublimeBookmarks
-if(t)for(;t.length;){t.unshift(t.pop())
-var r=t[t.length-1].find()
-if(r)return e.setSelection(r.from,r.to)
-t.pop()}},r[t[o+"F2"]="toggleBookmark"]=function(e){for(var t=e.listSelections(),r=e.state.sublimeBookmarks||(e.state.sublimeBookmarks=[]),n=0;n<t.length;n++){for(var i=t[n].from(),o=t[n].to(),s=e.findMarks(i,o),a=0;a<s.length;a++)if(s[a].sublimeBookmark){s[a].clear()
-for(var l=0;l<r.length;l++)r[l]==s[a]&&r.splice(l--,1)
-break}a==s.length&&r.push(e.markText(i,o,{sublimeBookmark:!0,clearWhenEmpty:!1}))}},r[t["Shift-"+o+"F2"]="clearBookmarks"]=function(e){var t=e.state.sublimeBookmarks
-if(t)for(var r=0;r<t.length;r++)t[r].clear()
-t.length=0},r[t["Alt-F2"]="selectBookmarks"]=function(e){var t=e.state.sublimeBookmarks,r=[]
-if(t)for(var n=0;n<t.length;n++){var i=t[n].find()
-i?r.push({anchor:i.from,head:i.to}):t.splice(n--,0)}r.length&&e.setSelections(r,0)},t["Alt-Q"]="wrapLines"
-var f=o+"K "
-function m(t,r){t.operation((function(){for(var n=t.listSelections(),i=[],o=[],s=0;s<n.length;s++){(l=n[s]).empty()?(i.push(s),o.push("")):o.push(r(t.getRange(l.from(),l.to())))}t.replaceSelections(o,"around","case")
-var a
-for(s=i.length-1;s>=0;s--){var l=n[i[s]]
-if(!(a&&e.cmpPos(l.head,a)>0)){var c=u(t,l.head)
-a=c.from,t.replaceRange(r(c.word),c.from,c.to)}}}))}function g(t){var r=t.getCursor("from"),n=t.getCursor("to")
-if(0==e.cmpPos(r,n)){var i=u(t,r)
-if(!i.word)return
-r=i.from,n=i.to}return{from:r,to:n,query:t.getRange(r,n),word:i}}function v(e,t){var r=g(e)
-if(r){var i=r.query,o=e.getSearchCursor(i,t?r.to:r.from);(t?o.findNext():o.findPrevious())?e.setSelection(o.from(),o.to()):(o=e.getSearchCursor(i,t?n(e.firstLine(),0):e.clipPos(n(e.lastLine()))),(t?o.findNext():o.findPrevious())?e.setSelection(o.from(),o.to()):r.word&&e.setSelection(r.from,r.to))}}t[f+o+"Backspace"]="delLineLeft",r[t[f+o+"K"]="delLineRight"]=function(e){e.operation((function(){for(var t=e.listSelections(),r=t.length-1;r>=0;r--)e.replaceRange("",t[r].anchor,n(t[r].to().line),"+delete")
-e.scrollIntoView()}))},r[t[f+o+"U"]="upcaseAtCursor"]=function(e){m(e,(function(e){return e.toUpperCase()}))},r[t[f+o+"L"]="downcaseAtCursor"]=function(e){m(e,(function(e){return e.toLowerCase()}))},r[t[f+o+"Space"]="setSublimeMark"]=function(e){e.state.sublimeMark&&e.state.sublimeMark.clear(),e.state.sublimeMark=e.setBookmark(e.getCursor())},r[t[f+o+"A"]="selectToSublimeMark"]=function(e){var t=e.state.sublimeMark&&e.state.sublimeMark.find()
-t&&e.setSelection(e.getCursor(),t)},r[t[f+o+"W"]="deleteToSublimeMark"]=function(t){var r=t.state.sublimeMark&&t.state.sublimeMark.find()
-if(r){var n=t.getCursor(),i=r
-if(e.cmpPos(n,i)>0){var o=i
-i=n,n=o}t.state.sublimeKilled=t.getRange(n,i),t.replaceRange("",n,i)}},r[t[f+o+"X"]="swapWithSublimeMark"]=function(e){var t=e.state.sublimeMark&&e.state.sublimeMark.find()
-t&&(e.state.sublimeMark.clear(),e.state.sublimeMark=e.setBookmark(e.getCursor()),e.setCursor(t))},r[t[f+o+"Y"]="sublimeYank"]=function(e){null!=e.state.sublimeKilled&&e.replaceSelection(e.state.sublimeKilled,null,"paste")},t[f+o+"G"]="clearBookmarks",r[t[f+o+"C"]="showInCenter"]=function(e){var t=e.cursorCoords(null,"local")
-e.scrollTo(null,(t.top+t.bottom)/2-e.getScrollInfo().clientHeight/2)},r[t["Shift-Alt-Up"]="selectLinesUpward"]=function(e){e.operation((function(){for(var t=e.listSelections(),r=0;r<t.length;r++){var i=t[r]
-i.head.line>e.firstLine()&&e.addSelection(n(i.head.line-1,i.head.ch))}}))},r[t["Shift-Alt-Down"]="selectLinesDownward"]=function(e){e.operation((function(){for(var t=e.listSelections(),r=0;r<t.length;r++){var i=t[r]
-i.head.line<e.lastLine()&&e.addSelection(n(i.head.line+1,i.head.ch))}}))},r[t[o+"F3"]="findUnder"]=function(e){v(e,!0)},r[t["Shift-"+o+"F3"]="findUnderPrevious"]=function(e){v(e,!1)},r[t["Alt-F3"]="findAllUnder"]=function(e){var t=g(e)
-if(t){for(var r=e.getSearchCursor(t.query),n=[],i=-1;r.findNext();)n.push({anchor:r.from(),head:r.to()}),r.from().line<=t.from.line&&r.from().ch<=t.from.ch&&i++
-e.setSelections(n,i)}},t["Shift-"+o+"["]="fold",t["Shift-"+o+"]"]="unfold",t[f+o+"0"]=t[f+o+"j"]="unfoldAll",t[o+"I"]="findIncremental",t["Shift-"+o+"I"]="findIncrementalReverse",t[o+"H"]="replace",t.F3="findNext",t["Shift-F3"]="findPrev",e.normalizeKeyMap(t)})),define("codemirror",[],(function(){"use strict"
-return{default:CodeMirror}})),define("@ember-data/adapter/-private",["exports","@ember/debug","rsvp","require","@ember/object","@ember/object/mixin","@ember/string","ember-inflector"],(function(e,t,r,n,i,o,s,a){"use strict"
-var l="default"in n?n.default:n
-o=o&&Object.prototype.hasOwnProperty.call(o,"default")?o.default:o
-var u=/\r?\n/
-var c=/\[\]$/
-function d(e,t,r){void 0!==r&&(null===r&&(r=""),r="function"==typeof r?r():r,e[e.length]=`${encodeURIComponent(t)}=${encodeURIComponent(r)}`)}var h=null
-var p=o.create({buildURL(e,t,r,n,i){switch(void 0===n&&(n=""),void 0===i&&(i={}),n){case"findRecord":return this.urlForFindRecord(t,e,r)
-case"findAll":return this.urlForFindAll(e,r)
-case"query":return this.urlForQuery(i,e)
-case"queryRecord":return this.urlForQueryRecord(i,e)
-case"findMany":return this.urlForFindMany(t,e,r)
-case"findHasMany":return this.urlForFindHasMany(t,e,r)
-case"findBelongsTo":return this.urlForFindBelongsTo(t,e,r)
-case"createRecord":return this.urlForCreateRecord(e,r)
-case"updateRecord":return this.urlForUpdateRecord(t,e,r)
-case"deleteRecord":return this.urlForDeleteRecord(t,e,r)
-default:return this._buildURL(e,t)}},_buildURL(e,t){var r,n=[],o=i.get(this,"host"),s=this.urlPrefix()
-e&&(r=this.pathForType(e))&&n.push(r),t&&n.push(encodeURIComponent(t)),s&&n.unshift(s)
-var a=n.join("/")
-return!o&&a&&"/"!==a.charAt(0)&&(a="/"+a),a},urlForFindRecord(e,t,r){return this._buildURL(t,e)},urlForFindAll(e,t){return this._buildURL(e)},urlForQuery(e,t){return this._buildURL(t)},urlForQueryRecord(e,t){return this._buildURL(t)},urlForFindMany(e,t,r){return this._buildURL(t)},urlForFindHasMany(e,t,r){return this._buildURL(t,e)},urlForFindBelongsTo(e,t,r){return this._buildURL(t,e)},urlForCreateRecord(e,t){return this._buildURL(e)},urlForUpdateRecord(e,t,r){return this._buildURL(t,e)},urlForDeleteRecord(e,t,r){return this._buildURL(t,e)},urlPrefix(e,t){var r=i.get(this,"host"),n=i.get(this,"namespace")
-if(r&&"/"!==r||(r=""),e)return/^\/\//.test(e)||/http(s)?:\/\//.test(e)?e:"/"===e.charAt(0)?`${r}${e}`:`${t}/${e}`
-var o=[]
-return r&&o.push(r),n&&o.push(n),o.join("/")},pathForType(e){var t=s.camelize(e)
-return a.pluralize(t)}})
-e.BuildURLMixin=p,e.determineBodyPromise=function(e,t){return(n=e.text(),r.resolve(n).catch((e=>e))).then((r=>function(e,t,r){var n,i=r
-if(!e.ok)return r
-var o=e.status,s=""===r||null===r,a=204===o||205===o||"HEAD"===t.method
-if(!e.ok||!a&&!s){try{i=JSON.parse(r)}catch(l){if(!(l instanceof SyntaxError))return l
-l.payload=r,n=l}return n||i}}(e,t,r)))
-var n},e.fetch=function(){if(null!==h)return h()
-if(n.has("fetch")){var e=l("fetch").default
-h=()=>e}else{if("function"!=typeof fetch)throw new Error("cannot find the `fetch` module or the `fetch` global. Did you mean to install the `ember-fetch` addon?")
-h=()=>fetch}return h()},e.parseResponseHeaders=function(e){var t=Object.create(null)
-if(!e)return t
-for(var r=e.split(u),n=0;n<r.length;n++){for(var i=r[n],o=0,s=!1;o<i.length;o++)if(58===i.charCodeAt(o)){s=!0
-break}if(!1!==s){var a=i.substring(0,o).trim(),l=i.substring(o+1,i.length).trim()
-if(l)t[a.toLowerCase()]=l,t[a]=l}}return t},e.serializeIntoHash=function(e,t,r,n){void 0===n&&(n={includeId:!0})
-var i=e.serializerFor(t.modelName)
-if("function"==typeof i.serializeIntoHash){var o={}
-return i.serializeIntoHash(o,t,r,n),o}return i.serialize(r,n)},e.serializeQueryParams=function(e){var t=[]
-return function e(r,n){var i,o,s
-if(r)if(Array.isArray(n))for(i=0,o=n.length;i<o;i++)c.test(r)?d(t,r,n[i]):e(r+"["+("object"==typeof n[i]?i:"")+"]",n[i])
-else if(function(e){return"[object Object]"===Object.prototype.toString.call(e)}(n))for(s in n)e(r+"["+s+"]",n[s])
-else d(t,r,n)
-else if(Array.isArray(n))for(i=0,o=n.length;i<o;i++)d(t,n[i].name,n[i].value)
-else for(s in n)e(s,n[s])
-return t}("",e).join("&").replace(/%20/g,"+")},Object.defineProperty(e,"__esModule",{value:!0})})),define("@ember-data/adapter/error",["exports","@ember/debug","@ember/error","@ember-data/store/-private"],(function(e,t,r,n){"use strict"
-function i(e,t){void 0===t&&(t="Adapter operation failed"),this.isAdapterError=!0
-var n=r.default.call(this,t)
-n&&(this.stack=n.stack,this.description=n.description,this.fileName=n.fileName,this.lineNumber=n.lineNumber,this.message=n.message,this.name=n.name,this.number=n.number),this.errors=e||[{title:"Adapter Error",detail:t}]}Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"errorsHashToArray",{enumerable:!0,get:function(){return n.errorsHashToArray}}),Object.defineProperty(e,"errorsArrayToHash",{enumerable:!0,get:function(){return n.errorsArrayToHash}}),e.ServerError=e.ConflictError=e.NotFoundError=e.ForbiddenError=e.UnauthorizedError=e.AbortError=e.TimeoutError=e.InvalidError=e.default=void 0
-var o=i
-function s(e){return function(t){var{message:r}=void 0===t?{}:t
-return a(e,r)}}function a(e,t){var r=function(r,n){e.call(this,r,n||t)}
-return r.prototype=Object.create(e.prototype),r.extend=s(r),r}e.default=o,i.prototype=Object.create(r.default.prototype),i.prototype.code="AdapterError",i.extend=s(i)
-var l=a(i,"The adapter rejected the commit because it was invalid")
-e.InvalidError=l,l.prototype.code="InvalidError"
-var u=a(i,"The adapter operation timed out")
-e.TimeoutError=u,u.prototype.code="TimeoutError"
-var c=a(i,"The adapter operation was aborted")
-e.AbortError=c,c.prototype.code="AbortError"
-var d=a(i,"The adapter operation is unauthorized")
-e.UnauthorizedError=d,d.prototype.code="UnauthorizedError"
-var h=a(i,"The adapter operation is forbidden")
-e.ForbiddenError=h,h.prototype.code="ForbiddenError"
-var p=a(i,"The adapter could not find the resource")
-e.NotFoundError=p,p.prototype.code="NotFoundError"
-var f=a(i,"The adapter operation failed due to a conflict")
-e.ConflictError=f,f.prototype.code="ConflictError"
-var m=a(i,"The adapter operation failed due to a server error")
-e.ServerError=m,m.prototype.code="ServerError"})),define("@ember-data/adapter/index",["exports","@ember/object","rsvp","@ember-data/adapter/-private"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"BuildURLMixin",{enumerable:!0,get:function(){return n.BuildURLMixin}}),e.default=void 0
-class i extends t.default{constructor(){super(...arguments),this.defaultSerializer="-default",this.coalesceFindRequests=!0}findRecord(e,t,n,i){return r.Promise.resolve()}findAll(e,t,n,i){return r.Promise.resolve()}query(e,t,n){return r.Promise.resolve()}queryRecord(e,t,n,i){return r.Promise.resolve()}serialize(e,t){return e.serialize(t)}createRecord(e,t,n){return r.Promise.resolve()}updateRecord(e,t,n){return r.Promise.resolve()}deleteRecord(e,t,n){return r.Promise.resolve()}groupRecordsForFindMany(e,t){return[t]}shouldReloadRecord(e,t){return!1}shouldReloadAll(e,t){return!t.length}shouldBackgroundReloadRecord(e,t){return!0}shouldBackgroundReloadAll(e,t){return!0}}e.default=i})),define("@ember-data/adapter/json-api",["exports","@ember/string","ember-inflector","@ember-data/adapter/-private","@ember-data/adapter/rest"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class o extends i.default{constructor(){super(...arguments),this.defaultSerializer="-json-api",this._defaultContentType="application/vnd.api+json",this.coalesceFindRequests=!1}ajaxOptions(e,t,r){void 0===r&&(r={})
-var n=super.ajaxOptions(e,t,r)
-return n.headers.Accept=n.headers.Accept||"application/vnd.api+json",n}findMany(e,t,r,n){var i=this.buildURL(t.modelName,r,n,"findMany")
-return this.ajax(i,"GET",{data:{filter:{id:r.join(",")}}})}pathForType(e){var n=(0,t.dasherize)(e)
-return(0,r.pluralize)(n)}updateRecord(e,t,r){var i=(0,n.serializeIntoHash)(e,t,r),o=this.buildURL(t.modelName,r.id,r,"updateRecord")
-return this.ajax(o,"PATCH",{data:i})}}var s=o
-e.default=s})),define("@ember-data/adapter/rest",["exports","@ember/application","@ember/debug","@ember/object","@ember/polyfills","@ember/runloop","require","rsvp","@ember-data/adapter","@ember-data/adapter/error","@ember-data/store/-private","@ember-data/adapter/-private"],(function(e,t,r,n,i,o,s,a,l,u,c,d){"use strict"
-var h,p
-Object.defineProperty(e,"__esModule",{value:!0}),e.fetchOptions=C,e.default=void 0
-var f,m,g,v,b,y,_=(0,c.symbol)("useFetch"),w="undefined"!=typeof jQuery,O=(h=(0,n.computed)(),p=class extends(l.default.extend(l.BuildURLMixin)){constructor(){super(...arguments),this.defaultSerializer="-rest",this._defaultContentType="application/json; charset=utf-8",this.coalesceFindRequests=!1,this.maxURLLength=2048}get fastboot(){var e=this._fastboot
-return e||(this._fastboot=(0,t.getOwner)(this).lookup("service:fastboot"))}set fastboot(e){this._fastboot=e}sortQueryParams(e){var t=Object.keys(e),r=t.length
-if(r<2)return e
-for(var n={},i=t.sort(),o=0;o<r;o++)n[i[o]]=e[i[o]]
-return n}findRecord(e,t,r,n){var i=this.buildURL(t.modelName,r,n,"findRecord"),o=this.buildQuery(n)
-return this.ajax(i,"GET",{data:o})}findAll(e,t,r,n){var i=this.buildQuery(n),o=this.buildURL(t.modelName,null,n,"findAll")
-return r&&(i.since=r),this.ajax(o,"GET",{data:i})}query(e,t,r){var n=this.buildURL(t.modelName,null,null,"query",r)
-return this.sortQueryParams&&(r=this.sortQueryParams(r)),this.ajax(n,"GET",{data:r})}queryRecord(e,t,r){var n=this.buildURL(t.modelName,null,null,"queryRecord",r)
-return this.sortQueryParams&&(r=this.sortQueryParams(r)),this.ajax(n,"GET",{data:r})}findMany(e,t,r,n){var i=this.buildURL(t.modelName,r,n,"findMany")
-return this.ajax(i,"GET",{data:{ids:r}})}findHasMany(e,t,r,n){var i=t.id,o=t.modelName
-return r=this.urlPrefix(r,this.buildURL(o,i,t,"findHasMany")),this.ajax(r,"GET")}findBelongsTo(e,t,r,n){var i=t.id,o=t.modelName
-return r=this.urlPrefix(r,this.buildURL(o,i,t,"findBelongsTo")),this.ajax(r,"GET")}createRecord(e,t,r){var n=this.buildURL(t.modelName,null,r,"createRecord"),i=(0,d.serializeIntoHash)(e,t,r)
-return this.ajax(n,"POST",{data:i})}updateRecord(e,t,r){var n=(0,d.serializeIntoHash)(e,t,r,{}),i=r.id,o=this.buildURL(t.modelName,i,r,"updateRecord")
-return this.ajax(o,"PUT",{data:n})}deleteRecord(e,t,r){var n=r.id
-return this.ajax(this.buildURL(t.modelName,n,r,"deleteRecord"),"DELETE")}_stripIDFromURL(e,t){var r,n,i=this.buildURL(t.modelName,t.id,t).split("/"),o=i[i.length-1],s=t.id
-return decodeURIComponent(o)===s?i[i.length-1]="":s&&(r=o,n="?id="+s,"function"!=typeof String.prototype.endsWith?-1!==r.indexOf(n,r.length-n.length):r.endsWith(n))&&(i[i.length-1]=o.substring(0,o.length-s.length-1)),i.join("/")}groupRecordsForFindMany(e,t){var r=new Map,n=this,i=this.maxURLLength
-t.forEach((t=>{var i=n._stripIDFromURL(e,t)
-r.has(i)||r.set(i,[]),r.get(i).push(t)}))
-var o=[]
-return r.forEach(((t,r)=>{var s=function(t,r,i){var o=0,s=n._stripIDFromURL(e,t[0]),a=[[]]
-return t.forEach((e=>{var t=encodeURIComponent(e.id).length+i
-s.length+o+t>=r&&(o=0,a.push([])),o+=t
-var n=a.length-1
-a[n].push(e)})),a}(t,i,"&ids%5B%5D=".length)
-s.forEach((e=>o.push(e)))})),o}handleResponse(e,t,r,n){if(this.isSuccess(e,t,r))return r
-if(this.isInvalid(e,t,r))return new u.InvalidError("object"==typeof r?r.errors:void 0)
-var i=this.normalizeErrorResponse(e,t,r),o=this.generatedDetailedMessage(e,t,r,n)
-switch(e){case 401:return new u.UnauthorizedError(i,o)
-case 403:return new u.ForbiddenError(i,o)
-case 404:return new u.NotFoundError(i,o)
-case 409:return new u.ConflictError(i,o)
-default:if(e>=500)return new u.ServerError(i,o)}return new u.default(i,o)}isSuccess(e,t,r){return e>=200&&e<300||304===e}isInvalid(e,t,r){return 422===e}ajax(e,t,r){void 0===r&&(r={})
-var n=this,i={url:e,method:t}
-if(this.useFetch){var s,l=n.ajaxOptions(e,t,r)
-return this._fetchRequest(l).then((e=>(s=e,(0,d.determineBodyPromise)(e,i)))).then((e=>{if(!s.ok||e instanceof Error)throw function(e,t,r,n,i){var o=S(r)
-200===o.status&&t instanceof Error?(o.errorThrown=t,t=o.errorThrown.payload):(o.errorThrown=n,"string"==typeof t&&(t=e.parseErrorResponse(t)))
-return P(e,t,i,o)}(n,e,s,null,i)
-return function(e,t,r,n){var i=S(r)
-return x(e,t,n,i)}(n,e,s,i)}))}var u=n.ajaxOptions(e,t,r)
-return new a.Promise((function(e,t){u.success=function(t,r,s){var a=function(e,t,r,n){var i=T(r)
-return x(e,t,n,i)}(n,t,s,i);(0,o.join)(null,e,a)},u.error=function(e,r,s){var a=function(e,t,r,n){var i=T(t)
-i.errorThrown=r
-var o=e.parseErrorResponse(t.responseText)
-return P(e,o,n,i)}(n,e,s,i);(0,o.join)(null,t,a)},n._ajax(u)}),"DS: RESTAdapter#ajax "+t+" to "+e)}_ajaxRequest(e){"undefined"!=typeof jQuery&&jQuery.ajax(e)}_fetchRequest(e){var t=(0,d.fetch)()
-if(t)return t(e.url,e)
-throw new Error("cannot find the `fetch` module or the `fetch` global. Did you mean to install the `ember-fetch` addon?")}_ajax(e){this.useFetch?this._fetchRequest(e):this.fastboot&&this.fastboot.isFastBoot?this._najaxRequest(e):this._ajaxRequest(e)}ajaxOptions(e,t,r){var n=(0,i.assign)({url:e,method:t,type:t},r)
-void 0!==this.headers?n.headers=(0,i.assign)({},this.headers,n.headers):r.headers||(n.headers={})
-var o=n.contentType||this._defaultContentType
-return this.useFetch?(n.data&&"GET"!==n.type&&n.headers&&(n.headers["Content-Type"]||n.headers["content-type"]||(n.headers["content-type"]=o)),n=C(n,this)):(n.data&&"GET"!==n.type&&(n=(0,i.assign)(n,{contentType:o})),n=function(e,t){e.dataType="json",e.context=t,e.data&&"GET"!==e.type&&(e.data=JSON.stringify(e.data))
-return e.beforeSend=function(t){e.headers&&Object.keys(e.headers).forEach((r=>{var n=e.headers&&e.headers[r];(e=>"string"==typeof e)(n)&&t.setRequestHeader(r,n)}))},e}(n,this)),n.url=this._ajaxURL(n.url),n}_ajaxURL(e){var t
-if(null!=(t=this.fastboot)&&t.isFastBoot){var r=this.fastboot.request.protocol,n=this.fastboot.request.host
-if(/^\/\//.test(e))return`${r}${e}`
-if(!/^https?:\/\//.test(e))try{return`${r}//${n}${e}`}catch(i){throw new Error("You are using Ember Data with no host defined in your adapter. This will attempt to use the host of the FastBoot request, which is not configured for the current host of this request. Please set the hostWhitelist property for in your environment.js. FastBoot Error: "+i.message)}}return e}parseErrorResponse(e){var t=e
-try{t=JSON.parse(e)}catch(r){}return t}normalizeErrorResponse(e,t,r){return r&&"object"==typeof r&&r.errors instanceof Array?r.errors:[{status:`${e}`,title:"The backend responded with an error",detail:`${r}`}]}generatedDetailedMessage(e,t,r,n){var i,o=t["content-type"]||"Empty Content-Type"
-return i="text/html"===o&&"string"==typeof r&&r.length>250?"[Omitted Lengthy HTML]":r,["Ember Data Request "+(n.method+" "+n.url)+" returned a "+e,"Payload ("+o+")",i].join("\n")}buildQuery(e){var t={}
-if(e){var{include:r}=e
-r&&(t.include=r)}return t}},f=p.prototype,m="fastboot",g=[h],v=Object.getOwnPropertyDescriptor(p.prototype,"fastboot"),b=p.prototype,y={},Object.keys(v).forEach((function(e){y[e]=v[e]})),y.enumerable=!!y.enumerable,y.configurable=!!y.configurable,("value"in y||y.initializer)&&(y.writable=!0),y=g.slice().reverse().reduce((function(e,t){return t(f,m,e)||e}),y),b&&void 0!==y.initializer&&(y.value=y.initializer?y.initializer.call(b):void 0,y.initializer=void 0),void 0===y.initializer&&(Object.defineProperty(f,m,y),y=null),p)
-function x(e,t,r,n){var i
-try{i=e.handleResponse(n.status,n.headers,t,r)}catch(o){return a.Promise.reject(o)}return i&&i.isAdapterError?a.Promise.reject(i):i}function P(e,t,r,n){var i
-if(n.errorThrown instanceof Error&&""!==t)i=n.errorThrown
-else if("timeout"===n.textStatus)i=new u.TimeoutError
-else if("abort"===n.textStatus||0===n.status)i=function(e,t){var{method:r,url:n,errorThrown:i}=e,{status:o}=t,s=[{title:"Adapter Error",detail:`Request failed: ${r} ${n} ${i||""}`.trim(),status:o}]
-return new u.AbortError(s)}(r,n)
-else try{i=e.handleResponse(n.status,n.headers,t||n.errorThrown,r)}catch(o){i=o}return i}function S(e){return{status:e.status,textStatus:e.statusText,headers:E(e.headers)}}function T(e){return{status:e.status,textStatus:e.statusText,headers:(0,d.parseResponseHeaders)(e.getAllResponseHeaders())}}function E(e){var t={}
-return e&&e.forEach(((e,r)=>t[r]=e)),t}function C(e,t){if(e.credentials=e.credentials||"same-origin",e.data)if("GET"===e.method||"HEAD"===e.method){if(Object.keys(e.data).length&&e.url){var r=e.url.indexOf("?")>-1?"&":"?"
-e.url+=`${r}${(0,d.serializeQueryParams)(e.data)}`}}else"[object Object]"===Object.prototype.toString.call(e.data)?e.body=JSON.stringify(e.data):e.body=e.data
-return e}O.prototype._najaxRequest=function(e){if("undefined"==typeof najax)throw new Error("najax does not seem to be defined in your app. Did you override it via `addOrOverrideSandboxGlobals` in the fastboot server?")
-najax(e)},Object.defineProperty(O.prototype,"useFetch",{get(){if("boolean"==typeof this[_])return this[_]
-var e,r=(0,t.getOwner)(this)?(0,t.getOwner)(this).resolveRegistration("config:environment"):{}
-return r&&r.EmberENV&&!1===r.EmberENV._JQUERY_INTEGRATION?e=!0:"undefined"!=typeof najax?((0,s.has)("fetch"),e=!1):e=!w,(0,c.addSymbol)(this,_,e),e},set(e){return(0,c.addSymbol)(this,_,e),e}})
-var k=O
-e.default=k})),define("@ember-data/debug/index",["exports","@ember/array","@ember/debug","@ember/debug/data-adapter","@ember/object","@ember/object/observers","@ember/service","@ember/string","@ember-data/debug/setup"],(function(e,t,r,n,i,o,s,a,l){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var u=n.default.extend({store:(0,s.inject)("store"),getFilters:()=>[{name:"isNew",desc:"New"},{name:"isModified",desc:"Modified"},{name:"isClean",desc:"Clean"}],_nameToClass(e){return(0,i.get)(this,"store").modelFor(e)},watchModelTypes(e,t){var r=(0,i.get)(this,"store"),n=r._createRecordData,o=[],s=(0,l.typesMapFor)(r)
-s.forEach(((n,i)=>{this.watchTypeIfUnseen(r,s,i,e,t,o)})),r._createRecordData=i=>(this.watchTypeIfUnseen(r,s,i.type,e,t,o),n.call(r,i))
-var a=()=>{o.forEach((e=>e())),r._createRecordData=n,s.forEach(((e,t)=>{s.set(t,!1)})),this.releaseMethods.removeObject(a)}
-return this.releaseMethods.pushObject(a),a},watchTypeIfUnseen(e,t,r,n,i,o){if(!0!==t.get(r)){var s=e.modelFor(r),a=this.wrapModelType(s,r)
-o.push(this.observeModelType(r,i)),n([a]),t.set(r,!0)}},columnNameToDesc:e=>(0,a.capitalize)((0,a.underscore)(e).replace(/_/g," ").trim()),columnsForType(e){var t=[{name:"id",desc:"Id"}],r=0,n=this
-return(0,i.get)(e,"attributes").forEach(((e,i)=>{if(r++>n.attributeLimit)return!1
-var o=this.columnNameToDesc(i)
-t.push({name:i,desc:o})})),t},getRecords(e,t){if(arguments.length<2){var r=e._debugContainerKey
-if(r){var n=r.match(/model:(.*)/)
-null!==n&&(t=n[1])}}return this.get("store").peekAll(t)},getRecordColumnValues(e){var t=0,r={id:(0,i.get)(e,"id")}
-return e.eachAttribute((n=>{if(t++>this.attributeLimit)return!1
-r[n]=(0,i.get)(e,n)})),r},getRecordKeywords(e){var r=[],n=(0,t.A)(["id"])
-return e.eachAttribute((e=>n.push(e))),n.forEach((t=>r.push((0,i.get)(e,t)))),r},getRecordFilterValues:e=>({isNew:e.get("isNew"),isModified:e.get("hasDirtyAttributes")&&!e.get("isNew"),isClean:!e.get("hasDirtyAttributes")}),getRecordColor(e){var t="black"
-return e.get("isNew")?t="green":e.get("hasDirtyAttributes")&&(t="blue"),t},observeRecord(e,r){var n=(0,t.A)(),i=(0,t.A)(["id","isNew","hasDirtyAttributes"])
-e.eachAttribute((e=>i.push(e)))
-var s=this
-i.forEach((function(t){var i=function(){r(s.wrapRecord(e))};(0,o.addObserver)(e,t,i),n.push((function(){(0,o.removeObserver)(e,t,i)}))}))
-return function(){n.forEach((e=>e()))}}})
-e.default=u})),define("@ember-data/debug/setup",["exports","@ember-data/store"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.typesMapFor=n,e.default=void 0
-var r=new WeakMap
-function n(e){var t=r.get(e)
-return void 0===t&&(t=new Map,r.set(e,t)),t}var i=t.default.prototype._createRecordData
-t.default.prototype._createRecordData=function(e){var t=n(this)
-return t.has(e.type)||t.set(e.type,!1),i.call(this,e)}
-var o={name:"@ember-data/data-adapter",initialize(){}}
-e.default=o})),define("@ember-data/model/-private",["exports","@ember/debug","@ember/object","@ember-data/store/-private","@ember-data/store","@ember/error","@ember/utils","ember","@ember/array","@ember/array/proxy","@ember/object/computed","@ember/array/mutable","rsvp","@ember/application"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p){"use strict"
-var f="default"in r?r.default:r
-o=o&&Object.prototype.hasOwnProperty.call(o,"default")?o.default:o,a=a&&Object.prototype.hasOwnProperty.call(a,"default")?a.default:a
-"default"in l&&l.default
-function m(e){var[t,r,n]=e
-return 3===e.length&&("function"==typeof t||"object"==typeof t&&null!==t)&&"string"==typeof r&&("object"==typeof n&&null!==n&&"enumerable"in n&&"configurable"in n||void 0===n)}function g(e){return function(){for(var t=arguments.length,r=new Array(t),n=0;n<t;n++)r[n]=arguments[n]
-return m(r)?e()(...r):e(...r)}}u=u&&Object.prototype.hasOwnProperty.call(u,"default")?u.default:u,d=d&&Object.prototype.hasOwnProperty.call(d,"default")?d.default:d
-var v=g((function(e,t){"object"==typeof e?(t=e,e=void 0):t=t||{}
-var i={type:e,isAttribute:!0,kind:"attribute",options:t}
-return r.computed({get(e){var r=this._internalModel
-return function(e,t){return n.recordDataFor(e).hasAttr(t)}(r,e)?r.getAttributeValue(e):function(e,t,r){return"function"==typeof t.defaultValue?t.defaultValue.apply(null,arguments):t.defaultValue}(this,t,e)},set(e,t){return this._internalModel.setDirtyAttribute(e,t)}}).meta(i)}))
-var b=g((function(e,t){var n,o
-"object"==typeof e?(n=e,o=void 0):(n=t,o=e),"string"==typeof o&&(o=i.normalizeModelName(o))
-var s={type:o,isRelationship:!0,options:n=n||{},kind:"belongsTo",name:"Belongs To",key:null}
-return r.computed({get(e){return this._internalModel.getBelongsTo(e)},set(e,t){return this._internalModel.setDirtyBelongsTo(e,t),this._internalModel.getBelongsTo(e)}}).meta(s)}))
-var y=g((function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{},"string"==typeof e&&(e=i.normalizeModelName(e))
-var n={type:e,options:t,isRelationship:!0,kind:"hasMany",name:"Has Many",key:null}
-return r.computed({get(e){return this._internalModel.getHasMany(e)},set(e,t){var r=this._internalModel
-return r.setDirtyHasMany(e,t),r.getHasMany(e)}}).meta(n)})),_=u.extend(n.DeprecatedEvented,{_registerHandlers(e,t){this._registeredHandlers={becameInvalid:e,becameValid:t}},errorsByAttributeName:r.computed((function(){return new Map})),errorsFor(e){var t=r.get(this,"errorsByAttributeName"),n=t.get(e)
-return void 0===n&&(n=l.A(),t.set(e,n)),r.get(n,"[]"),n},messages:c.mapBy("content","message"),content:r.computed((function(){return l.A()})),unknownProperty(e){var t=this.errorsFor(e)
-if(0!==t.length)return t},isEmpty:c.not("length").readOnly(),add(e,t){var n=r.get(this,"isEmpty")
-this._add(e,t),n&&!r.get(this,"isEmpty")&&this._registeredHandlers&&this._registeredHandlers.becameInvalid()},_add(e,t){t=this._findOrCreateMessages(e,t),this.addObjects(t),this.errorsFor(e).addObjects(t),this.notifyPropertyChange(e)},_findOrCreateMessages(e,t){for(var r=this.errorsFor(e),n=l.makeArray(t),i=new Array(n.length),o=0;o<n.length;o++){var s=n[o],a=r.findBy("message",s)
-i[o]=a||{attribute:e,message:s}}return i},remove(e){r.get(this,"isEmpty")||(this._remove(e),r.get(this,"isEmpty")&&this._registeredHandlers&&this._registeredHandlers.becameValid())},_remove(e){if(!r.get(this,"isEmpty")){var t=this.rejectBy("attribute",e)
-r.get(this,"content").setObjects(t)
-for(var n=this.errorsFor(e),i=0;i<n.length;i++)n[i].attribute===e&&n.replace(i,1)
-r.get(this,"errorsByAttributeName").delete(e),this.notifyPropertyChange(e),this.notifyPropertyChange("length")}},clear(){r.get(this,"isEmpty")||(this._clear(),this._registeredHandlers&&this._registeredHandlers.becameValid())},_clear(){if(!r.get(this,"isEmpty")){var e=r.get(this,"errorsByAttributeName"),t=[]
-e.forEach((function(e,r){t.push(r)})),e.clear(),t.forEach((e=>{this.notifyPropertyChange(e)})),u.prototype.clear.call(this)}},has(e){return this.errorsFor(e).length>0}}),w=r.computed((function(){var e=new Map
-return r.get(this,"relationshipsByName").forEach((t=>{var{type:r}=t
-e.has(r)||e.set(r,[]),e.get(r).push(t)})),e})).readOnly(),O=r.computed((function(){this.modelName
-var e=l.A()
-return this.eachComputedProperty(((t,r)=>{if(r.isRelationship){r.key=t
-var i=n.typeForRelationshipMeta(r)
-e.includes(i)||e.push(i)}})),e})).readOnly(),x=r.computed((function(){var e=Object.create(null),t=this.modelName
-return this.eachComputedProperty(((r,i)=>{i.isRelationship&&(i.key=r,i.name=r,i.parentModelName=t,e[r]=n.relationshipFromMeta(i))})),e})),P=r.computed((function(){for(var e=new Map,t=r.get(this,"relationshipsObject"),n=Object.keys(t),i=0;i<n.length;i++){var o=t[n[i]]
-e.set(o.key,o)}return e})).readOnly(),{changeProperties:S}=a
-function T(e,t,n,i){var o=i||[],s=r.get(t,"relationships")
-if(!s)return o
-var a=s.get(e.modelName),l=Array.isArray(a)?a.filter((e=>{var r=t.metaForProperty(e.name).options
-return!r.inverse&&null!==r.inverse||n===r.inverse})):null
-return l&&o.push.apply(o,l),e.superclass&&T(e.superclass,t,n,o),o}var E,C,k=r.computed("currentState",(function(e){return r.get(this._internalModel.currentState,e)})).readOnly(),M=(r.computed("errors.length",(function(e){return!(this.get("errors.length")>0)})).readOnly(),k)
-E=k,C=k
-var A=f.extend(n.DeprecatedEvented,{init(){this._super(...arguments)},_notifyNetworkChanges:function(){["isValid"].forEach((e=>this.notifyPropertyChange(e)))},isEmpty:k,isLoading:k,isLoaded:k,hasDirtyAttributes:r.computed("currentState.isDirty",(function(){return this.get("currentState.isDirty")})),isSaving:k,isDeleted:E,isNew:C,isValid:M,_markInvalidRequestAsClean(){},dirtyType:k,isError:false,_markErrorRequestAsClean(){this._errorRequests=[],this._lastError=null,this._notifyNetworkChanges()},isReloading:false,currentState:n.RootState.empty,_internalModel:null,store:null,errors:r.computed((function(){var e=_.create()
-return e._registerHandlers((()=>{this.send("becameInvalid")}),(()=>{this.send("becameValid")})),e})).readOnly(),invalidErrorsChanged(e){},_addErrorMessageToAttribute(e,t){this.get("errors")._add(e,t)},_clearErrorMessages(){this.get("errors")._clear()},adapterError:null,serialize(e){return this._internalModel.createSnapshot().serialize(e)},ready:null,didLoad:null,didUpdate:null,didCreate:null,didDelete:null,becameInvalid:null,becameError:null,rolledBack:null,send(e,t){return this._internalModel.send(e,t)},transitionTo(e){return this._internalModel.transitionTo(e)},deleteRecord(){this._internalModel.deleteRecord()},destroyRecord(e){return this.deleteRecord(),this.save(e)},unloadRecord(){this.isDestroyed||this._internalModel.unloadRecord()},_notifyProperties(e){S((()=>{for(var t,r=0,n=e.length;r<n;r++)t=e[r],this.notifyPropertyChange(t)}))},changedAttributes(){return this._internalModel.changedAttributes()},rollbackAttributes(){this._internalModel.rollbackAttributes()},_createSnapshot(){return this._internalModel.createSnapshot()},toStringExtension(){return this._internalModel&&this._internalModel.id},save(e){return n.PromiseObject.create({promise:this._internalModel.save(e).then((()=>this))})},reload(e){var t
-return"object"==typeof e&&null!==e&&e.adapterOptions&&(t={adapterOptions:e.adapterOptions}),n.PromiseObject.create({promise:this._internalModel.reload(t).then((()=>this))})},attr(){},belongsTo(e){return this._internalModel.referenceFor("belongsTo",e)},hasMany(e){return this._internalModel.referenceFor("hasMany",e)},_debugInfo(){var e=["id"],t={},r=[]
-this.eachAttribute(((t,r)=>e.push(t)))
-var n=[{name:"Attributes",properties:e,expand:!0}]
-return this.eachRelationship(((e,i)=>{var o=t[i.kind]
-void 0===o&&(o=t[i.kind]=[],n.push({name:i.kind,properties:o,expand:!0})),o.push(e),r.push(e)})),n.push({name:"Flags",properties:["isLoaded","hasDirtyAttributes","isSaving","isDeleted","isError","isNew","isValid"]}),{propertyInfo:{includeOtherProperties:!0,groups:n,expensiveProperties:r}}},notifyBelongsToChange(e){this.notifyPropertyChange(e)},eachRelationship(e,t){this.constructor.eachRelationship(e,t)},relationshipFor(e){return r.get(this.constructor,"relationshipsByName").get(e)},inverseFor(e){return this.constructor.inverseFor(e,this._internalModel.store)},notifyHasManyAdded(e){this.notifyPropertyChange(e)},eachAttribute(e,t){this.constructor.eachAttribute(e,t)}})
-A.reopen({trigger(e){var t=this[e]
-if("function"==typeof t){for(var r=arguments.length,n=new Array(r-1),i=1;i<r;i++)n[i-1]=arguments[i]
-t.apply(this,n)}this.has(e)&&this._super(...arguments)}}),A.reopen({toJSON(e){var t=this._internalModel.store.serializerFor("-default"),r=this._internalModel.createSnapshot()
-return t.serialize(r,e)}})
-var R={configurable:!1,set(e){var t=n.coerceId(e)
-null!==t&&this._internalModel.setId(t)},get(){return r.get(this._internalModel,"_tag"),this._internalModel.id}}
-Object.defineProperty(A.prototype,"id",R),A.reopenClass({isModel:!0,modelName:null,typeForRelationship(e,t){var n=r.get(this,"relationshipsByName").get(e)
-return n&&t.modelFor(n.type)},inverseMap:r.computed((function(){return Object.create(null)})),inverseFor(e,t){var n=r.get(this,"inverseMap")
-if(n[e])return n[e]
-var i=this._findInverseFor(e,t)
-return n[e]=i,i},_findInverseFor(e,t){var n=this.typeForRelationship(e,t)
-if(!n)return null
-var i,o,s,a,l=this.metaForProperty(e),u=l.options
-if(null===u.inverse)return null
-if(u.inverse)i=u.inverse,o=(s=r.get(n,"relationshipsByName").get(i)).kind,a=s.options
-else{l.type,l.parentModelName
-var c=T(this,n,e)
-if(0===c.length)return null
-var d=c.filter((t=>{var r=n.metaForProperty(t.name).options
-return e===r.inverse}))
-1===d.length&&(c=d),i=c[0].name,o=c[0].kind,a=c[0].options}return{type:n,name:i,kind:o,options:a}},relationships:w,relationshipNames:r.computed((function(){var e={hasMany:[],belongsTo:[]}
-return this.eachComputedProperty(((t,r)=>{r.isRelationship&&e[r.kind].push(t)})),e})),relatedTypes:O,relationshipsByName:P,relationshipsObject:x,fields:r.computed((function(){var e=new Map
-return this.eachComputedProperty(((t,r)=>{r.isRelationship?e.set(t,r.kind):r.isAttribute&&e.set(t,"attribute")})),e})).readOnly(),eachRelationship(e,t){r.get(this,"relationshipsByName").forEach(((r,n)=>{e.call(t,n,r)}))},eachRelatedType(e,t){for(var n=r.get(this,"relatedTypes"),i=0;i<n.length;i++){var o=n[i]
-e.call(t,o)}},determineRelationshipType(e,t){var r=e.key,n=e.kind,i=this.inverseFor(r,t)
-return i?"belongsTo"===i.kind?"belongsTo"===n?"oneToOne":"manyToOne":"belongsTo"===n?"oneToMany":"manyToMany":"belongsTo"===n?"oneToNone":"manyToNone"},attributes:r.computed((function(){var e=new Map
-return this.eachComputedProperty(((t,r)=>{r.isAttribute&&(r.name=t,e.set(t,r))})),e})).readOnly(),transformedAttributes:r.computed((function(){var e=new Map
-return this.eachAttribute(((t,r)=>{r.type&&e.set(t,r.type)})),e})).readOnly(),eachAttribute(e,t){r.get(this,"attributes").forEach(((r,n)=>{e.call(t,n,r)}))},eachTransformedAttribute(e,t){r.get(this,"transformedAttributes").forEach(((r,n)=>{e.call(t,n,r)}))},toString(){return`model:${r.get(this,"modelName")}`}})
-var j=f.extend(d,n.DeprecatedEvented,{_inverseIsAsync:!1,isLoaded:!1,init(){this._super(...arguments),this.isLoaded=this.isLoaded||!1,this._length=0,this.promise=null,this.meta=this.meta||null,this.isPolymorphic=this.isPolymorphic||!1,this.currentState=[],this.flushCanonical(this.initialState,!1),this.initialState=void 0},anyUnloaded(){return!!this.currentState.filter((e=>e._isDematerializing||!e.isLoaded()))[0]},removeUnloadedInternalModel(){for(var e=0;e<this.currentState.length;++e){var t=this.currentState[e]
-if(t._isDematerializing||!t.isLoaded())return this.arrayContentWillChange(e,1,0),this.currentState.splice(e,1),this.set("length",this.currentState.length),this.arrayContentDidChange(e,1,0),!0}return!1},get length(){return r.get(this,"[]"),this._length},set length(e){return this._length=e},objectAt(e){var t=this.currentState[e]
-if(void 0!==t)return t.getRecord()},flushCanonical(e,t){if(void 0===t&&(t=!0),n._objectIsAlive(this)){var r=n.diffArray(this.currentState,e)
-null!==r.firstChangeIndex&&(this.arrayContentWillChange(r.firstChangeIndex,r.removedCount,r.addedCount),this.set("length",e.length),this.currentState=e.slice(),this.arrayContentDidChange(r.firstChangeIndex,r.removedCount,r.addedCount),t&&r.addedCount>0&&this.internalModel.manyArrayRecordAdded(this.get("key")))}},replace(e,t,r){var i
-t>0&&(i=this.currentState.slice(e,e+t),this.get("recordData").removeFromHasMany(this.get("key"),i.map((e=>n.recordDataFor(e))))),r&&this.get("recordData").addToHasMany(this.get("key"),r.map((e=>n.recordDataFor(e))),e),this.retrieveLatest()},retrieveLatest(){var e=this.get("recordData").getHasMany(this.get("key")),t=this.store._getHasManyByJsonApiResource(e)
-e.meta&&this.set("meta",e.meta),e.links&&this.set("links",e.links),this.flushCanonical(t,!0)},reload(e){return this.get("store").reloadManyArray(this,this.get("internalModel"),this.get("key"),e)},save(){var e=this,t="DS: ManyArray#save "+r.get(this,"type"),i=h.all(this.invoke("save"),t).then((()=>e),null,"DS: ManyArray#save return ManyArray")
-return n.PromiseArray.create({promise:i})},createRecord(e){var t=r.get(this,"store"),n=r.get(this,"type"),i=t.createRecord(n.modelName,e)
-return this.pushObject(i),i}}),I=n.PromiseObject.extend({meta:r.computed((function(){})),reload(e){var{key:t,store:r,originatingInternalModel:n}=this._belongsToState
-return r.reloadBelongsTo(this,n,t,e).then((()=>this))}}),D=n.PromiseArray.extend({links:c.reads("content.links"),reload(e){return this.set("promise",this.get("content").reload(e)),this},createRecord:N("createRecord"),on:N("on"),one:N("one"),trigger:N("trigger"),off:N("off"),has:N("has")})
-function N(e){return function(){return r.get(this,"content")[e](...arguments)}}e.Errors=_,e.ManyArray=j,e.Model=A,e.PromiseBelongsTo=I,e.PromiseManyArray=D,e._modelForMixin=function(e,t){var r=p.getOwner(e),n=r.factoryFor(`mixin:${t}`),i=n&&n.class
-if(i){var o=A.extend(i)
-o.reopenClass({__isMixin:!0,__mixin:i}),r.register("model:"+t,o)}return r.factoryFor(`model:${t}`)},e.attr=v,e.belongsTo=b,e.hasMany=y,Object.defineProperty(e,"__esModule",{value:!0})})),define("@ember-data/model/index",["exports","@ember-data/model/-private"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.Model}}),Object.defineProperty(e,"attr",{enumerable:!0,get:function(){return t.attr}}),Object.defineProperty(e,"belongsTo",{enumerable:!0,get:function(){return t.belongsTo}}),Object.defineProperty(e,"hasMany",{enumerable:!0,get:function(){return t.hasMany}})})),define("@ember-data/record-data/-private",["exports","@ember/debug","@ember/polyfills","@ember/runloop","@ember/utils","@ember-data/store/-private","@ember/object","@ember/object/internals","@ember/ordered-set"],(function(e,t,r,n,i,o,s,a,l){"use strict"
-function u(e){return null==e||""===e?null:"string"==typeof e?e:"symbol"==typeof e?e.toString():""+e}function c(e){switch(typeof e){case"object":return e
-case"string":return{href:e}}return null}l=l&&Object.prototype.hasOwnProperty.call(l,"default")?l.default:l
-class d extends l{static create(){return new this}addWithIndex(e,t){var r=a.guidFor(e),n=this.presenceSet,i=this.list
-if(!0!==n[r])return n[r]=!0,null==t?i.push(e):i.splice(t,0,e),this.size+=1,this}deleteWithIndex(e,t){var r=a.guidFor(e),n=this.presenceSet,i=this.list
-if(!0===n[r]){delete n[r]
-var o=void 0!==t?t:i.indexOf(e)
-return o>-1&&i.splice(o,1),this.size=i.length,!0}return!1}}function h(e){return(o.recordDataFor(e)||e)._relationships}function p(e,t){return h(e).get(t)}function f(e,t){return function(e){return(o.recordDataFor(e)||e)._implicitRelationships}(e)[t]}class m{constructor(e,t,r,n,i){this.inverseIsAsync=void 0,this.kind=void 0,this.recordData=void 0,this.members=void 0,this.canonicalMembers=void 0,this.store=void 0,this.key=void 0,this.inverseKey=void 0,this.isAsync=void 0,this.isPolymorphic=void 0,this.relationshipMeta=void 0,this.inverseKeyForImplicit=void 0,this.meta=void 0,this.__inverseMeta=void 0,this._tempModelName=void 0,this.shouldForceReload=!1,this.relationshipIsStale=void 0,this.hasDematerializedInverse=void 0,this.hasAnyRelationshipData=void 0,this.relationshipIsEmpty=void 0,this.hasFailedLoadAttempt=!1,this.links=void 0,this.willSync=void 0,this.inverseIsAsync=i,this.kind=r.kind
-var o=r.options.async,s=r.options.polymorphic
-this.recordData=n,this.members=new d,this.canonicalMembers=new d,this.store=e,this.key=r.key||null,this.inverseKey=t,this.isAsync=void 0===o||o,this.isPolymorphic=void 0!==s&&s,this.relationshipMeta=r,this.inverseKeyForImplicit=this._tempModelName+this.key,this.meta=null,this.__inverseMeta=void 0,this.relationshipIsStale=!1,this.hasDematerializedInverse=!1,this.hasAnyRelationshipData=!1,this.relationshipIsEmpty=!0}get isNew(){return this.recordData.isNew()}_inverseIsAsync(){return!!this.inverseIsAsync}_inverseIsSync(){return!(!this.inverseKey||this.inverseIsAsync)}_hasSupportForImplicitRelationships(e){return void 0!==e._implicitRelationships&&null!==e._implicitRelationships}_hasSupportForRelationships(e){return void 0!==e._relationships&&null!==e._relationships}get _inverseMeta(){if(void 0===this.__inverseMeta){var e=null
-if(this.inverseKey){var t=this.relationshipMeta.type,r=this.store.modelFor(t)
-e=s.get(r,"relationshipsByName").get(this.inverseKey)}this.__inverseMeta=e}return this.__inverseMeta}recordDataDidDematerialize(){var e=this.inverseKey
-e&&this.forAllMembers((t=>{if(this._hasSupportForRelationships(t)){var r=p(t,e),n=t.getBelongsTo(e)._relationship
-n&&n.inverseRecordData&&this.recordData!==n.inverseRecordData||r.inverseDidDematerialize(this.recordData)}}))}forAllMembers(e){for(var t=Object.create(null),r=0;r<this.members.list.length;r++){var n=this.members.list[r],i=a.guidFor(n)
-t[i]||(t[i]=!0,e(n))}for(var o=0;o<this.canonicalMembers.list.length;o++){var s=this.canonicalMembers.list[o],l=a.guidFor(s)
-t[l]||(t[l]=!0,e(s))}}inverseDidDematerialize(e){!this.isAsync||e&&e.isNew()?(this.removeRecordDataFromOwn(e),this.removeCanonicalRecordDataFromOwn(e),this.setRelationshipIsEmpty(!0)):this.setHasDematerializedInverse(!0)}updateMeta(e){this.meta=e}clear(){for(var e=this.members.list;e.length>0;){var t=e[0]
-this.removeRecordData(t)}for(var r=this.canonicalMembers.list;r.length>0;){var n=r[0]
-this.removeCanonicalRecordData(n)}}removeAllRecordDatasFromOwn(){this.setRelationshipIsStale(!0),this.members.clear()}removeAllCanonicalRecordDatasFromOwn(){this.canonicalMembers.clear(),this.flushCanonicalLater()}removeRecordDatas(e){e.forEach((e=>this.removeRecordData(e)))}addRecordDatas(e,t){e.forEach((e=>{this.addRecordData(e,t),void 0!==t&&t++}))}addCanonicalRecordData(e,t){this.canonicalMembers.has(e)||(this.canonicalMembers.add(e),this.setupInverseRelationship(e)),this.flushCanonicalLater(),this.setHasAnyRelationshipData(!0)}setupInverseRelationship(e){if(this.inverseKey){if(!this._hasSupportForRelationships(e))return
-p(e,this.inverseKey).addCanonicalRecordData(this.recordData)}else{if(!this._hasSupportForImplicitRelationships(e))return
-var t=e._implicitRelationships,r=t[this.inverseKeyForImplicit]
-r||(r=t[this.inverseKeyForImplicit]=new m(this.store,this.key,{options:{async:this.isAsync}},e)),r.addCanonicalRecordData(this.recordData)}}removeCanonicalRecordDatas(e,t){for(var r=0;r<e.length;r++)void 0!==t?this.removeCanonicalRecordData(e[r],r+t):this.removeCanonicalRecordData(e[r])}removeCanonicalRecordData(e,t){this.canonicalMembers.has(e)&&(this.removeCanonicalRecordDataFromOwn(e,t),this.inverseKey?this.removeCanonicalRecordDataFromInverse(e):this._hasSupportForImplicitRelationships(e)&&e._implicitRelationships[this.inverseKeyForImplicit]&&e._implicitRelationships[this.inverseKeyForImplicit].removeCanonicalRecordData(this.recordData)),this.flushCanonicalLater()}addRecordData(e,t){this.members.has(e)||(this.members.addWithIndex(e,t),this.notifyRecordRelationshipAdded(e,t),this._hasSupportForRelationships(e)&&this.inverseKey?p(e,this.inverseKey).addRecordData(this.recordData):this._hasSupportForImplicitRelationships(e)&&(e._implicitRelationships[this.inverseKeyForImplicit]||(e._implicitRelationships[this.inverseKeyForImplicit]=new m(this.store,this.key,{options:{async:this.isAsync}},e,this.isAsync)),e._implicitRelationships[this.inverseKeyForImplicit].addRecordData(this.recordData))),this.setHasAnyRelationshipData(!0)}removeRecordData(e){this.members.has(e)&&(this.removeRecordDataFromOwn(e),this.inverseKey?this.removeRecordDataFromInverse(e):this._hasSupportForImplicitRelationships(e)&&e._implicitRelationships[this.inverseKeyForImplicit]&&e._implicitRelationships[this.inverseKeyForImplicit].removeRecordData(this.recordData))}removeRecordDataFromInverse(e){if(this._hasSupportForRelationships(e)&&this.inverseKey){var t=p(e,this.inverseKey)
-t&&t.removeRecordDataFromOwn(this.recordData)}}removeRecordDataFromOwn(e,t){this.members.delete(e)}removeCanonicalRecordDataFromInverse(e){if(this._hasSupportForRelationships(e)&&this.inverseKey){var t=p(e,this.inverseKey)
-t&&t.removeCanonicalRecordDataFromOwn(this.recordData)}}removeCanonicalRecordDataFromOwn(e,t){this.canonicalMembers.deleteWithIndex(e,t),this.flushCanonicalLater()}removeCompletelyFromInverse(){if(this.inverseKey||this.inverseKeyForImplicit){var e,t=Object.create(null),r=this.recordData
-e=this.inverseKey?e=>{var n=a.guidFor(e)
-if(this._hasSupportForRelationships(e)&&void 0===t[n]){if(this.inverseKey)p(e,this.inverseKey).removeCompletelyFromOwn(r)
-t[n]=!0}}:e=>{var n=a.guidFor(e)
-this._hasSupportForImplicitRelationships(e)&&void 0===t[n]&&(f(e,this.inverseKeyForImplicit).removeCompletelyFromOwn(r),t[n]=!0)},this.members.forEach(e),this.canonicalMembers.forEach(e),this.isAsync||this.clear()}}removeCompletelyFromOwn(e){this.canonicalMembers.delete(e),this.members.delete(e)}flushCanonical(){var e=this.members.list
-this.willSync=!1
-for(var t=[],r=0;r<e.length;r++)e[r].isNew()&&t.push(e[r])
-this.members=this.canonicalMembers.copy()
-for(var n=0;n<t.length;n++)this.members.add(t[n])}flushCanonicalLater(){this.willSync||(this.willSync=!0,this.store._updateRelationshipState(this))}updateLinks(e){this.links=e}updateRecordDatasFromAdapter(e){this.setHasAnyRelationshipData(!0),this.computeChanges(e)}computeChanges(e){}notifyRecordRelationshipAdded(e,t){}setHasAnyRelationshipData(e){this.hasAnyRelationshipData=e}setHasDematerializedInverse(e){this.hasDematerializedInverse=e}setRelationshipIsStale(e){this.relationshipIsStale=e}setRelationshipIsEmpty(e){this.relationshipIsEmpty=e}setShouldForceReload(e){this.shouldForceReload=e}setHasFailedLoadAttempt(e){this.hasFailedLoadAttempt=e}push(e){var t=!1,r=!1
-if(e.meta&&this.updateMeta(e.meta),void 0!==e.data)t=!0,this.updateData(e.data)
-else if(!1===this.isAsync&&!this.hasAnyRelationshipData){t=!0
-var n="hasMany"===this.kind?[]:null
-this.updateData(n)}if(e.links){var i=this.links
-if(this.updateLinks(e.links),e.links.related){var o=c(e.links.related),s=i&&i.related?c(i.related):null,a=s?s.href:null
-o&&o.href&&o.href!==a&&(r=!0)}}if(this.setHasFailedLoadAttempt(!1),t){var l=null===e.data||Array.isArray(e.data)&&0===e.data.length
-this.setHasAnyRelationshipData(!0),this.setRelationshipIsStale(!1),this.setHasDematerializedInverse(!1),this.setRelationshipIsEmpty(l)}else if(r){this.setRelationshipIsStale(!0)
-var u=this.recordData
-this.recordData.storeWrapper.notifyPropertyChange(u.modelName,u.id,u.clientId,this.key)}}localStateIsEmpty(){}updateData(e){}destroy(){}}class g extends m{constructor(e,t,r,n,i){super(e,t,r,n,i),this.inverseRecordData=void 0,this.canonicalState=void 0,this.key=void 0,this.key=r.key,this.inverseRecordData=null,this.canonicalState=null,this.key=r.key}setRecordData(e){e?this.addRecordData(e):this.inverseRecordData&&this.removeRecordData(this.inverseRecordData),this.setHasAnyRelationshipData(!0),this.setRelationshipIsStale(!1),this.setRelationshipIsEmpty(!1)}setCanonicalRecordData(e){e?this.addCanonicalRecordData(e):this.canonicalState&&this.removeCanonicalRecordData(this.canonicalState),this.flushCanonicalLater()}addCanonicalRecordData(e){this.canonicalMembers.has(e)||(this.canonicalState&&this.removeCanonicalRecordData(this.canonicalState),this.canonicalState=e,super.addCanonicalRecordData(e),this.setHasAnyRelationshipData(!0),this.setRelationshipIsEmpty(!1))}inverseDidDematerialize(){super.inverseDidDematerialize(this.inverseRecordData),this.notifyBelongsToChange()}removeCompletelyFromOwn(e){super.removeCompletelyFromOwn(e),this.canonicalState===e&&(this.canonicalState=null),this.inverseRecordData===e&&(this.inverseRecordData=null,this.notifyBelongsToChange())}removeCompletelyFromInverse(){super.removeCompletelyFromInverse(),this.inverseRecordData=null}flushCanonical(){this.inverseRecordData&&this.inverseRecordData.isNew()&&!this.canonicalState?this.willSync=!1:(this.inverseRecordData!==this.canonicalState&&(this.inverseRecordData=this.canonicalState,this.notifyBelongsToChange()),super.flushCanonical())}addRecordData(e){this.members.has(e)||(this.inverseRecordData&&this.removeRecordData(this.inverseRecordData),this.inverseRecordData=e,super.addRecordData(e),this.notifyBelongsToChange())}removeRecordDataFromOwn(e){this.members.has(e)&&(this.inverseRecordData=null,super.removeRecordDataFromOwn(e),this.notifyBelongsToChange())}removeAllRecordDatasFromOwn(){super.removeAllRecordDatasFromOwn(),this.inverseRecordData=null,this.notifyBelongsToChange()}notifyBelongsToChange(){var e=this.recordData
-this.recordData.storeWrapper.notifyBelongsToChange(e.modelName,e.id,e.clientId,this.key)}removeCanonicalRecordDataFromOwn(e,t){this.canonicalMembers.has(e)&&(this.canonicalState=null,this.setHasAnyRelationshipData(!0),this.setRelationshipIsEmpty(!0),super.removeCanonicalRecordDataFromOwn(e,t))}removeAllCanonicalRecordDatasFromOwn(){super.removeAllCanonicalRecordDatasFromOwn(),this.canonicalState=null}getData(){var e,t={}
-return this.inverseRecordData&&(e=this.inverseRecordData.getResourceIdentifier()),null===this.inverseRecordData&&this.hasAnyRelationshipData&&(e=null),this.links&&(t.links=this.links),void 0!==e&&(t.data=e),this.meta&&(t.meta=this.meta),t._relationship=this,t}updateData(e){var t
-i.isNone(e)&&(t=null),null!==t&&(t=this.recordData.storeWrapper.recordDataFor(e.type,e.id)),this.setCanonicalRecordData(t)}}class v extends m{constructor(e,t,r,n,i){super(e,t,r,n,i),this.canonicalState=void 0,this.currentState=void 0,this._willUpdateManyArray=void 0,this._pendingManyArrayUpdates=void 0,this.key=void 0,this.canonicalState=[],this.currentState=[],this._willUpdateManyArray=!1,this._pendingManyArrayUpdates=null,this.key=r.key}addCanonicalRecordData(e,t){this.canonicalMembers.has(e)||(void 0!==t?this.canonicalState.splice(t,0,e):this.canonicalState.push(e),super.addCanonicalRecordData(e,t))}inverseDidDematerialize(e){super.inverseDidDematerialize(e),this.isAsync&&this.notifyManyArrayIsStale()}addRecordData(e,t){this.members.has(e)||(super.addRecordData(e,t),void 0===t&&(t=this.currentState.length),this.currentState.splice(t,0,e),this.notifyHasManyChange())}removeCanonicalRecordDataFromOwn(e,t){var r=t
-this.canonicalMembers.has(e)&&(void 0===r&&(r=this.canonicalState.indexOf(e)),r>-1&&this.canonicalState.splice(r,1),super.removeCanonicalRecordDataFromOwn(e,t))}removeAllCanonicalRecordDatasFromOwn(){super.removeAllCanonicalRecordDatasFromOwn(),this.canonicalMembers.clear(),this.canonicalState.splice(0,this.canonicalState.length),super.removeAllCanonicalRecordDatasFromOwn()}removeCompletelyFromOwn(e){super.removeCompletelyFromOwn(e)
-var t=this.canonicalState.indexOf(e);-1!==t&&this.canonicalState.splice(t,1),this.removeRecordDataFromOwn(e)}flushCanonical(){var e=this.canonicalState,t=this.currentState.filter((t=>t.isNew()&&-1===e.indexOf(t)))
-e=e.concat(t),this.currentState=e,super.flushCanonical(),this.notifyHasManyChange()}removeRecordDataFromOwn(e,t){super.removeRecordDataFromOwn(e,t)
-var r=t||this.currentState.indexOf(e);-1!==r&&(this.currentState.splice(r,1),this.notifyHasManyChange())}notifyRecordRelationshipAdded(){this.notifyHasManyChange()}computeChanges(e){void 0===e&&(e=[])
-for(var t=this.canonicalMembers.toArray(),r=t.length-1;r>=0;r--)this.removeCanonicalRecordData(t[r],r)
-for(var n=0,i=e.length;n<i;n++)this.addCanonicalRecordData(e[n],n)}notifyManyArrayIsStale(){var e=this.recordData
-e.storeWrapper.notifyPropertyChange(e.modelName,e.id,e.clientId,this.key)}notifyHasManyChange(){var e=this.recordData
-e.storeWrapper.notifyHasManyChange(e.modelName,e.id,e.clientId,this.key)}getData(){var e={}
-return this.hasAnyRelationshipData&&(e.data=this.currentState.map((e=>e.getResourceIdentifier()))),this.links&&(e.links=this.links),this.meta&&(e.meta=this.meta),e._relationship=this,e}updateData(e){var t
-if(i.isNone(e))t=void 0
-else{t=new Array(e.length)
-for(var r=0;r<e.length;r++)t[r]=this.recordData.storeWrapper.recordDataFor(e[r].type,e[r].id,e[r].lid)}this.updateRecordDatasFromAdapter(t)}}class b{constructor(e){this._store=void 0,this._storeWrapper=void 0,this.initializedRelationships=void 0,this.recordData=e,this.initializedRelationships=Object.create(null),this._storeWrapper=o.upgradeForInternal(e.storeWrapper),this._store=this._storeWrapper._store}has(e){return!!this.initializedRelationships[e]}forEach(e){var t=this.initializedRelationships
-Object.keys(t).forEach((r=>{e(r,t[r])}))}get(e){var t=this.initializedRelationships,r=t[e]
-if(!r){var n=this.recordData,i=this.recordData.storeWrapper.relationshipsDefinitionFor(this.recordData.modelName)[e]
-i&&(r=t[e]=function(e,t,r,n){var i=r.storeWrapper.inverseForRelationship(r.modelName,n),o=r.storeWrapper.inverseIsAsyncForRelationship(r.modelName,n)
-return"hasMany"===e.kind?new v(t,i,e,r,o):new g(t,i,e,r,o)}(i,this._store,n,e))}return r}}var y=1
-class _{constructor(e,t){this._errors=void 0,this.__relationships=void 0,this.__implicitRelationships=void 0,this.modelName=void 0,this.clientId=void 0,this.id=void 0,this.isDestroyed=void 0,this._isNew=void 0,this._bfsId=void 0,this.__attributes=void 0,this.__inFlightAttributes=void 0,this.__data=void 0,this._scheduledDestroy=void 0,this._isDeleted=void 0,this._isDeletionCommited=void 0,this._directlyRelatedRecordDatasIterable=()=>{var e=this._relationships.initializedRelationships,t=Object.keys(e).map((t=>e[t])),r=0,n=0,i=0
-return{iterator:()=>({next:()=>{var e=(()=>{for(;r<t.length;){for(;n<2;){for(var e=0===n?t[r].members.list:t[r].canonicalMembers.list;i<e.length;)return e[i++]
-i=0,n++}n=0,r++}})()
-return{value:e,done:void 0===e}}})}},this.identifier=e,this.storeWrapper=t,this.modelName=e.type,this.clientId=e.lid,this.id=e.id,this.__relationships=null,this.__implicitRelationships=null,this.isDestroyed=!1,this._isNew=!1,this._isDeleted=!1,this._bfsId=0,this.reset()}getResourceIdentifier(){return this.identifier}pushData(e,t){var n
-return this._isNew&&(this._isNew=!1,this.notifyStateChange()),t&&(n=this._changedKeys(e.attributes)),r.assign(this._data,e.attributes),this.__attributes&&this._updateChangedAttributes(),e.relationships&&this._setupRelationships(e),e.id&&(this.id=u(e.id)),n}willCommit(){this._inFlightAttributes=this._attributes,this._attributes=null}hasChangedAttributes(){return null!==this.__attributes&&Object.keys(this.__attributes).length>0}_clearErrors(){}getErrors(){return[]}isEmpty(){return null===this.__attributes&&null===this.__inFlightAttributes&&null===this.__data}deleteRecord(){this._isDeleted=!0,this.notifyStateChange()}isDeleted(){return this._isDeleted}setIsDeleted(e){this._isDeleted=e,this._isNew&&this._deletionConfirmed(),this.notifyStateChange()}isDeletionCommitted(){return this._isDeletionCommited}reset(){this.__attributes=null,this.__inFlightAttributes=null,this.__data=null,this._errors=void 0}_setupRelationships(e){for(var t=this.storeWrapper.relationshipsDefinitionFor(this.modelName),r=Object.keys(t),n=0;n<r.length;n++){var i=r[n]
-if(e.relationships[i]){var o=e.relationships[i]
-this._relationships.get(i).push(o)}}}_updateChangedAttributes(){for(var e=this.changedAttributes(),t=Object.keys(e),r=this._attributes,n=0,i=t.length;n<i;n++){var o=t[n],s=e[o]
-s[0]===s[1]&&delete r[o]}}changedAttributes(){for(var e=this._data,t=this._attributes,n=this._inFlightAttributes,i=r.assign({},n,t),o=Object.create(null),s=Object.keys(i),a=0,l=s.length;a<l;a++){var u=s[a]
-o[u]=[e[u],i[u]]}return o}isNew(){return this._isNew}rollbackAttributes(){var e
-return this._isDeleted=!1,this.hasChangedAttributes()&&(e=Object.keys(this._attributes),this._attributes=null),this.isNew()&&(this.removeFromInverseRelationships(!0),this._isDeleted=!0,this._isNew=!1),this._inFlightAttributes=null,this._clearErrors(),this.notifyStateChange(),e}_deletionConfirmed(){this.removeFromInverseRelationships()}didCommit(e){this._isDeleted&&(this._deletionConfirmed(),this._isDeletionCommited=!0),this._isNew=!1
-var t=null
-e&&(e.relationships&&this._setupRelationships(e),e.id&&(this.storeWrapper.setRecordId(this.modelName,e.id,this.clientId),this.id=u(e.id)),t=e.attributes||null)
-var n=this._changedKeys(t)
-return r.assign(this._data,this.__inFlightAttributes,t),this._inFlightAttributes=null,this._updateChangedAttributes(),this._clearErrors(),this.notifyStateChange(),n}notifyStateChange(){}getHasMany(e){return this._relationships.get(e).getData()}setDirtyHasMany(e,t){var r=this._relationships.get(e)
-r.clear(),r.addRecordDatas(t)}addToHasMany(e,t,r){this._relationships.get(e).addRecordDatas(t,r)}removeFromHasMany(e,t){this._relationships.get(e).removeRecordDatas(t)}commitWasRejected(e,t){var r=Object.keys(this._inFlightAttributes)
-if(r.length>0)for(var n=this._attributes,i=0;i<r.length;i++)void 0===n[r[i]]&&(n[r[i]]=this._inFlightAttributes[r[i]])
-this._inFlightAttributes=null}getBelongsTo(e){return this._relationships.get(e).getData()}setDirtyBelongsTo(e,t){this._relationships.get(e).setRecordData(t)}setDirtyAttribute(e,t){this._attributes[e]=t,t===(e in this._inFlightAttributes?this._inFlightAttributes[e]:this._data[e])&&delete this._attributes[e]}__setId(e){this.id!==e&&(this.id=e)}getAttr(e){return e in this._attributes?this._attributes[e]:e in this._inFlightAttributes?this._inFlightAttributes[e]:this._data[e]}hasAttr(e){return e in this._attributes||e in this._inFlightAttributes||e in this._data}unloadRecord(){this.isDestroyed||(this._destroyRelationships(),this.reset(),this._scheduledDestroy||(this._scheduledDestroy=n._backburner.schedule("destroy",this,"_cleanupOrphanedRecordDatas")))}_cleanupOrphanedRecordDatas(){var e=this._allRelatedRecordDatas()
-if(function(e){for(var t=0;t<e.length;++t)if(e[t].isRecordInUse())return!1
-return!0}(e))for(var t=0;t<e.length;++t){var r=e[t]
-r.isDestroyed||r.destroy()}this._scheduledDestroy=null}destroy(){this._relationships.forEach(((e,t)=>t.destroy())),this.isDestroyed=!0,this.storeWrapper.disconnectRecord(this.modelName,this.id,this.clientId)}isRecordInUse(){return this.storeWrapper.isRecordInUse(this.modelName,this.id,this.clientId)}_allRelatedRecordDatas(){var e=[],t=[],r=y++
-for(t.push(this),this._bfsId=r;t.length>0;){var n=t.shift()
-e.push(n)
-for(var i=this._directlyRelatedRecordDatasIterable().iterator(),o=i.next();!o.done;o=i.next()){var s=o.value
-s instanceof _&&s._bfsId<r&&(t.push(s),s._bfsId=r)}}return e}isAttrDirty(e){return void 0!==this._attributes[e]&&(void 0!==this._inFlightAttributes[e]?this._inFlightAttributes[e]:this._data[e])!==this._attributes[e]}get _attributes(){return null===this.__attributes&&(this.__attributes=Object.create(null)),this.__attributes}set _attributes(e){this.__attributes=e}get _relationships(){return null===this.__relationships&&(this.__relationships=new b(this)),this.__relationships}get _data(){return null===this.__data&&(this.__data=Object.create(null)),this.__data}set _data(e){this.__data=e}get _implicitRelationships(){if(null===this.__implicitRelationships){var e=Object.create(null)
-return this.__implicitRelationships=e,e}return this.__implicitRelationships}get _inFlightAttributes(){return null===this.__inFlightAttributes&&(this.__inFlightAttributes=Object.create(null)),this.__inFlightAttributes}set _inFlightAttributes(e){this.__inFlightAttributes=e}_initRecordCreateOptions(e){var t={}
-if(void 0!==e)for(var{modelName:r,storeWrapper:n}=this,i=n.attributesDefinitionFor(r),o=n.relationshipsDefinitionFor(r),s=this._relationships,a=Object.keys(e),l=0;l<a.length;l++){var u=a[l],c=e[u]
-if("id"!==u){var d=o[u]||i[u],h=void 0
-switch(void 0!==d?d.kind:null){case"attribute":this.setDirtyAttribute(u,c)
-break
-case"belongsTo":this.setDirtyBelongsTo(u,c),(h=s.get(u)).setHasAnyRelationshipData(!0),h.setRelationshipIsEmpty(!1)
-break
-case"hasMany":this.setDirtyHasMany(u,c),(h=s.get(u)).setHasAnyRelationshipData(!0),h.setRelationshipIsEmpty(!1)
-break
-default:t[u]=c}}else this.id=c}return t}removeFromInverseRelationships(e){void 0===e&&(e=!1),this._relationships.forEach(((t,r)=>{r.removeCompletelyFromInverse(),!0===e&&r.clear()})),this.__relationships=null
-var t=this._implicitRelationships
-this.__implicitRelationships=null,Object.keys(t).forEach((r=>{var n=t[r]
-n.removeCompletelyFromInverse(),!0===e&&n.clear()}))}_destroyRelationships(){this._relationships.forEach(((e,t)=>w(t)))
-var e=this._implicitRelationships
-this.__implicitRelationships=null,Object.keys(e).forEach((t=>{w(e[t])}))}clientDidCreate(){this._isNew=!0}_changedKeys(e){var t=[]
-if(e){var n,o,s,a,l,u=Object.keys(e),c=u.length,d=this.hasChangedAttributes()
-for(d&&(l=this._attributes),n=r.assign(Object.create(null),this._data,this.__inFlightAttributes),o=0;o<c;o++)s=e[a=u[o]],!0===d&&void 0!==l[a]||i.isEqual(n[a],s)||t.push(a)}return t}toString(){return`<${this.modelName}:${this.id}>`}}function w(e){e.recordDataDidDematerialize(),e._inverseIsSync()&&(e.removeAllRecordDatasFromOwn(),e.removeAllCanonicalRecordDatasFromOwn())}e.BelongsToRelationship=g,e.ManyRelationship=v,e.RecordData=_,e.Relationship=m,e.relationshipStateFor=p,e.relationshipsFor=h,Object.defineProperty(e,"__esModule",{value:!0})})),define("@ember-data/serializer/-private",["exports","@ember/array","@ember/debug","@ember/object","@ember/object/mixin","@ember/string","@ember/utils"],(function(e,t,r,n,i,o,s){"use strict"
-var a="default"in n?n.default:n,l=(i=i&&Object.prototype.hasOwnProperty.call(i,"default")?i.default:i).create({normalize(e,t,r){var n=this._super(e,t,r)
-return this._extractEmbeddedRecords(this,this.store,e,n)},keyForRelationship(e,t,r){return"serialize"===r&&this.hasSerializeRecordsOption(e)||"deserialize"===r&&this.hasDeserializeRecordsOption(e)?this.keyForAttribute(e,r):this._super(e,t,r)||e},serializeBelongsTo(e,t,r){var n=r.key
-if(this.noSerializeOptionSpecified(n))this._super(e,t,r)
-else{var i=this.hasSerializeIdsOption(n),o=this.hasSerializeRecordsOption(n),s=e.belongsTo(n)
-if(i){var a=this._getMappedKey(r.key,e.type)
-a===r.key&&this.keyForRelationship&&(a=this.keyForRelationship(r.key,r.kind,"serialize")),s?(t[a]=s.id,r.options.polymorphic&&this.serializePolymorphicType(e,t,r)):t[a]=null}else o&&this._serializeEmbeddedBelongsTo(e,t,r)}},_serializeEmbeddedBelongsTo(e,t,r){var n=e.belongsTo(r.key),i=this._getMappedKey(r.key,e.type)
-i===r.key&&this.keyForRelationship&&(i=this.keyForRelationship(r.key,r.kind,"serialize")),n?(t[i]=n.serialize({includeId:!0}),this.removeEmbeddedForeignKey(e,n,r,t[i]),r.options.polymorphic&&this.serializePolymorphicType(e,t,r)):t[i]=null},serializeHasMany(e,t,r){var n=r.key
-if(this.noSerializeOptionSpecified(n))this._super(e,t,r)
-else if(this.hasSerializeIdsOption(n)){var i=this._getMappedKey(r.key,e.type)
-i===r.key&&this.keyForRelationship&&(i=this.keyForRelationship(r.key,r.kind,"serialize")),t[i]=e.hasMany(n,{ids:!0})}else this.hasSerializeRecordsOption(n)?this._serializeEmbeddedHasMany(e,t,r):this.hasSerializeIdsAndTypesOption(n)&&this._serializeHasManyAsIdsAndTypes(e,t,r)},_serializeHasManyAsIdsAndTypes(e,r,n){var i=this.keyForAttribute(n.key,"serialize"),o=e.hasMany(n.key)
-r[i]=t.A(o).map((function(e){return{id:e.id,type:e.modelName}}))},_serializeEmbeddedHasMany(e,t,r){var n=this._getMappedKey(r.key,e.type)
-n===r.key&&this.keyForRelationship&&(n=this.keyForRelationship(r.key,r.kind,"serialize")),t[n]=this._generateSerializedHasMany(e,r)},_generateSerializedHasMany(e,r){for(var n=e.hasMany(r.key),i=t.A(n),o=new Array(i.length),s=0;s<i.length;s++){var a=i[s],l=a.serialize({includeId:!0})
-this.removeEmbeddedForeignKey(e,a,r,l),o[s]=l}return o},removeEmbeddedForeignKey(e,t,r,n){if("belongsTo"===r.kind){var i=e.type.inverseFor(r.key,this.store)
-if(i){var o=i.name,s=this.store.serializerFor(t.modelName).keyForRelationship(o,i.kind,"deserialize")
-s&&delete n[s]}}},hasEmbeddedAlwaysOption(e){var t=this.attrsOption(e)
-return t&&"always"===t.embedded},hasSerializeRecordsOption(e){var t=this.hasEmbeddedAlwaysOption(e),r=this.attrsOption(e)
-return t||r&&"records"===r.serialize},hasSerializeIdsOption(e){var t=this.attrsOption(e)
-return t&&("ids"===t.serialize||"id"===t.serialize)},hasSerializeIdsAndTypesOption(e){var t=this.attrsOption(e)
-return t&&("ids-and-types"===t.serialize||"id-and-type"===t.serialize)},noSerializeOptionSpecified(e){var t=this.attrsOption(e)
-return!(t&&(t.serialize||t.embedded))},hasDeserializeRecordsOption(e){var t=this.hasEmbeddedAlwaysOption(e),r=this.attrsOption(e)
-return t||r&&"records"===r.deserialize},attrsOption(e){var t=this.get("attrs")
-return t&&(t[o.camelize(e)]||t[e])},_extractEmbeddedRecords(e,t,r,n){return r.eachRelationship(((r,i)=>{e.hasDeserializeRecordsOption(r)&&("hasMany"===i.kind&&this._extractEmbeddedHasMany(t,r,n,i),"belongsTo"===i.kind&&this._extractEmbeddedBelongsTo(t,r,n,i))})),n},_extractEmbeddedHasMany(e,t,r,i){var o=n.get(r,`data.relationships.${t}.data`)
-if(o){for(var s=new Array(o.length),a=0;a<o.length;a++){var l=o[a],{data:u,included:c}=this._normalizeEmbeddedRelationship(e,i,l)
-r.included=r.included||[],r.included.push(u),c&&r.included.push(...c),s[a]={id:u.id,type:u.type}}var d={data:s}
-n.set(r,`data.relationships.${t}`,d)}},_extractEmbeddedBelongsTo(e,t,r,i){var o=n.get(r,`data.relationships.${t}.data`)
-if(o){var{data:s,included:a}=this._normalizeEmbeddedRelationship(e,i,o)
-r.included=r.included||[],r.included.push(s),a&&r.included.push(...a)
-var l={data:{id:s.id,type:s.type}}
-n.set(r,`data.relationships.${t}`,l)}},_normalizeEmbeddedRelationship(e,t,r){var n=t.type
-t.options.polymorphic&&(n=r.type)
-var i=e.modelFor(n)
-return e.serializerFor(n).normalize(i,r,null)},isEmbeddedRecordsMixin:!0})
-var u=a.extend({serialize:null,deserialize:null}),c=u.extend({deserialize(e,t){if(s.isNone(e)&&!0===t.allowNull)return null
-var r=typeof e
-return"boolean"===r?e:"string"===r?/^(true|t|1)$/i.test(e):"number"===r&&1===e},serialize:(e,t)=>s.isNone(e)&&!0===t.allowNull?null:Boolean(e)}),d=u.extend({deserialize(e){var t=typeof e
-if("string"===t){var r=e.indexOf("+")
-return-1!==r&&e.length-5===r?(r+=3,new Date(e.slice(0,r)+":"+e.slice(r))):new Date(e)}return"number"===t?new Date(e):null==e?e:null},serialize:e=>e instanceof Date&&!isNaN(e)?e.toISOString():null})
-function h(e){return e==e&&e!==1/0&&e!==-1/0}var p=u.extend({deserialize(e){var t
-return""===e||null==e?null:h(t=Number(e))?t:null},serialize(e){var t
-return""===e||null==e?null:h(t=Number(e))?t:null}}),f=u.extend({deserialize:e=>s.isNone(e)?null:String(e),serialize:e=>s.isNone(e)?null:String(e)})
-e.BooleanTransform=c,e.DateTransform=d,e.EmbeddedRecordsMixin=l,e.NumberTransform=p,e.StringTransform=f,e.Transform=u,e.modelHasAttributeOrRelationshipNamedType=function(e){return n.get(e,"attributes").has("type")||n.get(e,"relationshipsByName").has("type")},Object.defineProperty(e,"__esModule",{value:!0})})),define("@ember-data/serializer/index",["exports","@ember/object"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({normalizeResponse:null,serialize:null,normalize:(e,t)=>t})
-e.default=r})),define("@ember-data/serializer/json-api",["exports","@ember/debug","@ember/string","@ember/utils","ember-inflector","@ember-data/serializer/json","@ember-data/store"],(function(e,t,r,n,i,o,s){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var a=o.default.extend({_normalizeDocumentHelper(e){if("object"===(0,n.typeOf)(e.data))e.data=this._normalizeResourceHelper(e.data)
-else if(Array.isArray(e.data)){for(var t=new Array(e.data.length),r=0;r<e.data.length;r++){var i=e.data[r]
-t[r]=this._normalizeResourceHelper(i)}e.data=t}if(Array.isArray(e.included)){for(var o=new Array,s=0;s<e.included.length;s++){var a=e.included[s],l=this._normalizeResourceHelper(a)
-null!==l&&o.push(l)}e.included=o}return e},_normalizeRelationshipDataHelper(e){return e.type=this.modelNameFromPayloadKey(e.type),e},_normalizeResourceHelper(e){var t
-if(t=this.modelNameFromPayloadKey(e.type),"modelNameFromPayloadKey",!this.store._hasModelFor(t))return null
-var r=this.store.modelFor(t),n=this.store.serializerFor(t),{data:i}=n.normalize(r,e)
-return i},pushPayload(e,t){var r=this._normalizeDocumentHelper(t)
-e.push(r)},_normalizeResponse(e,t,r,n,i,o){return this._normalizeDocumentHelper(r)},normalizeQueryRecordResponse(){var e=this._super(...arguments)
-return e},extractAttributes(e,t){var r={}
-return t.attributes&&e.eachAttribute((e=>{var n=this.keyForAttribute(e,"deserialize")
-void 0!==t.attributes[n]&&(r[e]=t.attributes[n])})),r},extractRelationship(e){if("object"===(0,n.typeOf)(e.data)&&(e.data=this._normalizeRelationshipDataHelper(e.data)),Array.isArray(e.data)){for(var t=new Array(e.data.length),r=0;r<e.data.length;r++){var i=e.data[r]
-t[r]=this._normalizeRelationshipDataHelper(i)}e.data=t}return e},extractRelationships(e,t){var r={}
-return t.relationships&&e.eachRelationship(((e,n)=>{var i=this.keyForRelationship(e,n.kind,"deserialize")
-if(void 0!==t.relationships[i]){var o=t.relationships[i]
-r[e]=this.extractRelationship(o)}})),r},_extractType(e,t){return this.modelNameFromPayloadKey(t.type)},modelNameFromPayloadKey:e=>(0,i.singularize)((0,s.normalizeModelName)(e)),payloadKeyFromModelName:e=>(0,i.pluralize)(e),normalize(e,t){t.attributes&&this.normalizeUsingDeclaredMapping(e,t.attributes),t.relationships&&this.normalizeUsingDeclaredMapping(e,t.relationships)
-var r={id:this.extractId(e,t),type:this._extractType(e,t),attributes:this.extractAttributes(e,t),relationships:this.extractRelationships(e,t)}
-return this.applyTransforms(e,r.attributes),{data:r}},keyForAttribute:(e,t)=>(0,r.dasherize)(e),keyForRelationship:(e,t,n)=>(0,r.dasherize)(e),serialize(e,t){var r=this._super(...arguments)
-return r.type=this.payloadKeyFromModelName(e.modelName),{data:r}},serializeAttribute(e,t,r,n){var i=n.type
-if(this._canSerialize(r)){t.attributes=t.attributes||{}
-var o=e.attr(r)
-if(i)o=this.transformFor(i).serialize(o,n.options)
-var s=this._getMappedKey(r,e.type)
-s===r&&(s=this.keyForAttribute(r,"serialize")),t.attributes[s]=o}},serializeBelongsTo(e,t,r){var n=r.key
-if(this._canSerialize(n)){var i,o=e.belongsTo(n)
-if(i=o&&o.record&&!o.record.get("isNew"),null===o||i){t.relationships=t.relationships||{}
-var s=this._getMappedKey(n,e.type)
-s===n&&(s=this.keyForRelationship(n,"belongsTo","serialize"))
-var a=null
-if(o)a={type:this.payloadKeyFromModelName(o.modelName),id:o.id}
-t.relationships[s]={data:a}}}},serializeHasMany(e,t,r){var n=r.key
-if(this.shouldSerializeHasMany(e,n,r)){var i=e.hasMany(n)
-if(void 0!==i){t.relationships=t.relationships||{}
-var o=this._getMappedKey(n,e.type)
-o===n&&this.keyForRelationship&&(o=this.keyForRelationship(n,"hasMany","serialize"))
-for(var s=i.filter((e=>e.record&&!e.record.get("isNew"))),a=new Array(s.length),l=0;l<s.length;l++){var u=i[l],c=this.payloadKeyFromModelName(u.modelName)
-a[l]={type:c,id:u.id}}t.relationships[o]={data:a}}}}})
-var l=a
-e.default=l})),define("@ember-data/serializer/json",["exports","@ember/application","@ember/debug","@ember/object","@ember/polyfills","@ember/utils","@ember-data/serializer","@ember-data/store","@ember-data/store/-private","@ember-data/serializer/-private"],(function(e,t,r,n,i,o,s,a,l,u){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var c=s.default.extend({primaryKey:"id",mergedProperties:["attrs"],applyTransforms(e,t){var r=(0,n.get)(e,"attributes")
-return e.eachTransformedAttribute(((e,n)=>{if(void 0!==t[e]){var i=this.transformFor(n),o=r.get(e)
-t[e]=i.deserialize(t[e],o.options)}})),t},normalizeResponse(e,t,r,n,i){switch(i){case"findRecord":return this.normalizeFindRecordResponse(...arguments)
-case"queryRecord":return this.normalizeQueryRecordResponse(...arguments)
-case"findAll":return this.normalizeFindAllResponse(...arguments)
-case"findBelongsTo":return this.normalizeFindBelongsToResponse(...arguments)
-case"findHasMany":return this.normalizeFindHasManyResponse(...arguments)
-case"findMany":return this.normalizeFindManyResponse(...arguments)
-case"query":return this.normalizeQueryResponse(...arguments)
-case"createRecord":return this.normalizeCreateRecordResponse(...arguments)
-case"deleteRecord":return this.normalizeDeleteRecordResponse(...arguments)
-case"updateRecord":return this.normalizeUpdateRecordResponse(...arguments)}},normalizeFindRecordResponse(e,t,r,n,i){return this.normalizeSingleResponse(...arguments)},normalizeQueryRecordResponse(e,t,r,n,i){return this.normalizeSingleResponse(...arguments)},normalizeFindAllResponse(e,t,r,n,i){return this.normalizeArrayResponse(...arguments)},normalizeFindBelongsToResponse(e,t,r,n,i){return this.normalizeSingleResponse(...arguments)},normalizeFindHasManyResponse(e,t,r,n,i){return this.normalizeArrayResponse(...arguments)},normalizeFindManyResponse(e,t,r,n,i){return this.normalizeArrayResponse(...arguments)},normalizeQueryResponse(e,t,r,n,i){return this.normalizeArrayResponse(...arguments)},normalizeCreateRecordResponse(e,t,r,n,i){return this.normalizeSaveResponse(...arguments)},normalizeDeleteRecordResponse(e,t,r,n,i){return this.normalizeSaveResponse(...arguments)},normalizeUpdateRecordResponse(e,t,r,n,i){return this.normalizeSaveResponse(...arguments)},normalizeSaveResponse(e,t,r,n,i){return this.normalizeSingleResponse(...arguments)},normalizeSingleResponse(e,t,r,n,i){return this._normalizeResponse(e,t,r,n,i,!0)},normalizeArrayResponse(e,t,r,n,i){return this._normalizeResponse(e,t,r,n,i,!1)},_normalizeResponse(e,t,r,n,i,o){var s={data:null,included:[]},a=this.extractMeta(e,t,r)
-if(a&&(s.meta=a),o){var{data:l,included:u}=this.normalize(t,r)
-s.data=l,u&&(s.included=u)}else{for(var c=new Array(r.length),d=0,h=r.length;d<h;d++){var p=r[d],{data:f,included:m}=this.normalize(t,p)
-m&&s.included.push(...m),c[d]=f}s.data=c}return s},normalize(e,t){var r=null
-return t&&(this.normalizeUsingDeclaredMapping(e,t),"object"===(0,o.typeOf)(t.links)&&this.normalizeUsingDeclaredMapping(e,t.links),r={id:this.extractId(e,t),type:e.modelName,attributes:this.extractAttributes(e,t),relationships:this.extractRelationships(e,t)},this.applyTransforms(e,r.attributes)),{data:r}},extractId(e,t){var r=t[(0,n.get)(this,"primaryKey")]
-return(0,l.coerceId)(r)},extractAttributes(e,t){var r,n={}
-return e.eachAttribute((e=>{r=this.keyForAttribute(e,"deserialize"),void 0!==t[r]&&(n[e]=t[r])})),n},extractRelationship(e,t){if((0,o.isNone)(t))return null
-if("object"===(0,o.typeOf)(t)){t.id&&(t.id=(0,l.coerceId)(t.id))
-var r=this.store.modelFor(e)
-return t.type&&!(0,u.modelHasAttributeOrRelationshipNamedType)(r)&&(t.type=this.modelNameFromPayloadKey(t.type)),t}return{id:(0,l.coerceId)(t),type:e}},extractPolymorphicRelationship(e,t,r){return this.extractRelationship(e,t)},extractRelationships(e,t){var r={}
-return e.eachRelationship(((e,n)=>{var i=null,s=this.keyForRelationship(e,n.kind,"deserialize")
-if(void 0!==t[s]){var a=null,l=t[s]
-if("belongsTo"===n.kind)a=n.options.polymorphic?this.extractPolymorphicRelationship(n.type,l,{key:e,resourceHash:t,relationshipMeta:n}):this.extractRelationship(n.type,l)
-else if("hasMany"===n.kind&&!(0,o.isNone)(l))if(a=new Array(l.length),n.options.polymorphic)for(var u=0,c=l.length;u<c;u++){var d=l[u]
-a[u]=this.extractPolymorphicRelationship(n.type,d,{key:e,resourceHash:t,relationshipMeta:n})}else for(var h=0,p=l.length;h<p;h++){var f=l[h]
-a[h]=this.extractRelationship(n.type,f)}i={data:a}}var m=this.keyForLink(e,n.kind)
-if(t.links&&void 0!==t.links[m]){var g=t.links[m];(i=i||{}).links={related:g}}i&&(r[e]=i)})),r},modelNameFromPayloadKey:e=>(0,a.normalizeModelName)(e),normalizeRelationships(e,t){var r
-this.keyForRelationship&&e.eachRelationship(((e,n)=>{e!==(r=this.keyForRelationship(e,n.kind,"deserialize"))&&void 0!==t[r]&&(t[e]=t[r],delete t[r])}))},normalizeUsingDeclaredMapping(e,t){var r,i,o=(0,n.get)(this,"attrs")
-if(o)for(var s in o)r=i=this._getMappedKey(s,e),void 0!==t[i]&&((0,n.get)(e,"attributes").has(s)&&(r=this.keyForAttribute(s)),(0,n.get)(e,"relationshipsByName").has(s)&&(r=this.keyForRelationship(s)),i!==r&&(t[r]=t[i],delete t[i]))},_getMappedKey(e,t){var r,i=(0,n.get)(this,"attrs")
-return i&&i[e]&&((r=i[e]).key&&(r=r.key),"string"==typeof r&&(e=r)),e},_canSerialize(e){var t=(0,n.get)(this,"attrs")
-return!t||!t[e]||!1!==t[e].serialize},_mustSerialize(e){var t=(0,n.get)(this,"attrs")
-return t&&t[e]&&!0===t[e].serialize},shouldSerializeHasMany(e,t,r){var n=e.type.determineRelationshipType(r,this.store)
-return!!this._mustSerialize(t)||this._canSerialize(t)&&("manyToNone"===n||"manyToMany"===n)},serialize(e,t){var r={}
-if(t&&t.includeId){var i=e.id
-i&&(r[(0,n.get)(this,"primaryKey")]=i)}return e.eachAttribute(((t,n)=>{this.serializeAttribute(e,r,t,n)})),e.eachRelationship(((t,n)=>{"belongsTo"===n.kind?this.serializeBelongsTo(e,r,n):"hasMany"===n.kind&&this.serializeHasMany(e,r,n)})),r},serializeIntoHash(e,t,r,n){(0,i.assign)(e,this.serialize(r,n))},serializeAttribute(e,t,r,n){if(this._canSerialize(r)){var i=n.type,o=e.attr(r)
-if(i)o=this.transformFor(i).serialize(o,n.options)
-var s=this._getMappedKey(r,e.type)
-s===r&&this.keyForAttribute&&(s=this.keyForAttribute(r,"serialize")),t[s]=o}},serializeBelongsTo(e,t,r){var n=r.key
-if(this._canSerialize(n)){var i=e.belongsTo(n,{id:!0}),s=this._getMappedKey(n,e.type)
-s===n&&this.keyForRelationship&&(s=this.keyForRelationship(n,"belongsTo","serialize")),(0,o.isNone)(i)?t[s]=null:t[s]=i,r.options.polymorphic&&this.serializePolymorphicType(e,t,r)}},serializeHasMany(e,t,r){var n=r.key
-if(this.shouldSerializeHasMany(e,n,r)){var i=e.hasMany(n,{ids:!0})
-if(void 0!==i){var o=this._getMappedKey(n,e.type)
-o===n&&this.keyForRelationship&&(o=this.keyForRelationship(n,"hasMany","serialize")),t[o]=i}}},serializePolymorphicType(){},extractMeta(e,t,r){if(r&&void 0!==r.meta){var n=r.meta
-return delete r.meta,n}},extractErrors(e,t,r,n){return r&&"object"==typeof r&&r.errors&&(r=(0,l.errorsArrayToHash)(r.errors),this.normalizeUsingDeclaredMapping(t,r),t.eachAttribute((e=>{var t=this.keyForAttribute(e,"deserialize")
-t!==e&&void 0!==r[t]&&(r[e]=r[t],delete r[t])})),t.eachRelationship((e=>{var t=this.keyForRelationship(e,"deserialize")
-t!==e&&void 0!==r[t]&&(r[e]=r[t],delete r[t])}))),r},keyForAttribute:(e,t)=>e,keyForRelationship:(e,t,r)=>e,keyForLink:(e,t)=>e,transformFor(e,r){var n=(0,t.getOwner)(this).lookup("transform:"+e)
-return n}}),d=c
-e.default=d})),define("@ember-data/serializer/rest",["exports","@ember/array","@ember/debug","@ember/string","@ember/utils","ember-inflector","@ember-data/serializer/json","@ember-data/store","@ember-data/store/-private","@ember-data/serializer/-private"],(function(e,t,r,n,i,o,s,a,l,u){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"EmbeddedRecordsMixin",{enumerable:!0,get:function(){return u.EmbeddedRecordsMixin}}),e.default=void 0
-var c=s.default.extend({keyForPolymorphicType(e,t,r){return`${this.keyForRelationship(e)}Type`},_normalizeArray(e,r,n,i){var o={data:[],included:[]},s=e.modelFor(r),a=e.serializerFor(r)
-return(0,t.makeArray)(n).forEach((t=>{var{data:r,included:n}=this._normalizePolymorphicRecord(e,t,i,s,a)
-o.data.push(r),n&&o.included.push(...n)})),o},_normalizePolymorphicRecord(e,t,r,n,i){var o=i,s=n
-if(!(0,u.modelHasAttributeOrRelationshipNamedType)(n)&&t.type){var a=this.modelNameFromPayloadKey(t.type)
-e._hasModelFor(a)&&(o=e.serializerFor(a),s=e.modelFor(a))}return o.normalize(s,t,r)},_normalizeResponse(e,t,r,n,i,o){var s={data:null,included:[]},a=this.extractMeta(e,t,r)
-a&&(s.meta=a)
-for(var u=Object.keys(r),c=0,d=u.length;c<d;c++){var h=u[c],p=h,f=!1
-"_"===h.charAt(0)&&(f=!0,p=h.substr(1))
-var m=this.modelNameFromPayloadKey(p)
-if(e._hasModelFor(m)){var g=!f&&this.isPrimaryType(e,m,t),v=r[h]
-if(null!==v)if(!g||Array.isArray(v)){var{data:b,included:y}=this._normalizeArray(e,m,v,h)
-y&&s.included.push(...y),o?b.forEach((e=>{var t=g&&(0,l.coerceId)(e.id)===n
-g&&!n&&!s.data||t?s.data=e:s.included.push(e)})):g?s.data=b:b&&s.included.push(...b)}else{var{data:_,included:w}=this._normalizePolymorphicRecord(e,v,h,t,this)
-s.data=_,w&&s.included.push(...w)}}}return s},isPrimaryType:(e,t,r)=>(0,a.normalizeModelName)(t)===r.modelName,pushPayload(e,r){var n={data:[],included:[]}
-for(var i in r){var o=this.modelNameFromPayloadKey(i)
-if(e._hasModelFor(o)){var s=e.modelFor(o),a=e.serializerFor(s.modelName);(0,t.makeArray)(r[i]).forEach((e=>{var{data:t,included:r}=a.normalize(s,e,i)
-n.data.push(t),r&&n.included.push(...r)}))}}e.push(n)},modelNameFromPayloadKey:e=>(0,o.singularize)((0,a.normalizeModelName)(e)),serialize(e,t){return this._super(...arguments)},serializeIntoHash(e,t,r,n){e[this.payloadKeyFromModelName(t.modelName)]=this.serialize(r,n)},payloadKeyFromModelName:e=>(0,n.camelize)(e),serializePolymorphicType(e,t,r){var o=r.key,s=this.keyForPolymorphicType(o,r.type,"serialize"),a=e.belongsTo(o);(0,i.isNone)(a)?t[s]=null:t[s]=(0,n.camelize)(a.modelName)},extractPolymorphicRelationship(e,t,r){var{key:n,resourceHash:i,relationshipMeta:o}=r,s=o.options.polymorphic,a=this.keyForPolymorphicType(n,e,"deserialize")
-return s&&void 0!==i[a]&&"object"!=typeof t?{id:t,type:this.modelNameFromPayloadKey(i[a])}:this._super(...arguments)}})
-var d=c
-e.default=d})),define("@ember-data/serializer/transform",["exports","@ember-data/serializer/-private"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.Transform
-e.default=r})),define("@ember-data/store/-private",["exports","@ember/application","@ember/debug","@ember/error","@ember/object","@ember/polyfills","@ember/utils","@ember/array","@ember/runloop","@ember/service","@ember/test","ember","require","rsvp","@ember/string","@ember/array/proxy","@ember/object/computed","@ember/object/promise-proxy-mixin","@ember/object/proxy","@ember/object/evented","@ember/object/mixin","@ember/object/internals","ember-inflector"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p,f,m,g,v,b,y,_,w,O){"use strict"
-n=n&&Object.prototype.hasOwnProperty.call(n,"default")?n.default:n
-"default"in a&&a.default
-u=u&&Object.prototype.hasOwnProperty.call(u,"default")?u.default:u,d=d&&Object.prototype.hasOwnProperty.call(d,"default")?d.default:d,h=h&&Object.prototype.hasOwnProperty.call(h,"default")?h.default:h
-var x="default"in p?p.default:p
-function P(e){return null==e||""===e?null:"string"==typeof e?e:"symbol"==typeof e?e.toString():""+e}function S(e){var t=null
-if("string"==typeof e?t=e.length>0?e:null:"number"!=typeof e||isNaN(e)||(t=""+e),null===t)throw new Error(`Expected id to be a string or number, received ${String(e)}`)
-return t}function T(e){return f.dasherize(e)}m=m&&Object.prototype.hasOwnProperty.call(m,"default")?m.default:m,v=v&&Object.prototype.hasOwnProperty.call(v,"default")?v.default:v,b=b&&Object.prototype.hasOwnProperty.call(b,"default")?b.default:b,y=y&&Object.prototype.hasOwnProperty.call(y,"default")?y.default:y,_=_&&Object.prototype.hasOwnProperty.call(_,"default")?_.default:_
-var E="undefined"!=typeof Symbol?Symbol:e=>`__${e}${Math.floor(Math.random()*Date.now())}__`
-function C(e){return"string"==typeof e&&e.length>0}var k=new WeakMap
-function M(e){return k.has(e)}var A=(()=>{var e="undefined"!=typeof window
-if("undefined"!=typeof FastBoot)return{getRandomValues(e){try{return FastBoot.require("crypto").randomFillSync(e)}catch(t){throw new Error('Using createRecord in Fastboot requires you to add the "crypto" package to "fastbootDependencies" in your package.json')}}}
-if(e&&void 0!==window.crypto)return window.crypto
-if(e&&void 0!==window.msCrypto&&"function"==typeof window.msCrypto.getRandomValues)return window.msCrypto
-throw new Error("ember-data: Cannot find a valid way to generate local identifiers")})()
-for(var R,j,I,D,N=[],F=0;F<256;++F)N[F]=(F+256).toString(16).substr(1)
-function L(){var e,t,r,n=(e=new Uint8Array(16),A.getRandomValues(e))
-return n[6]=15&n[6]|64,n[8]=63&n[8]|128,[(r=N)[(t=n)[0]],r[t[1]],r[t[2]],r[t[3]],"-",r[t[4]],r[t[5]],"-",r[t[6]],r[t[7]],"-",r[t[8]],r[t[9]],"-",r[t[10]],r[t[11]],r[t[12]],r[t[13]],r[t[14]],r[t[15]]].join("")}function z(e,t){if(C(e.lid))return e.lid
-var{type:r,id:n}=e
-return C(n)?`@ember-data:lid-${T(r)}-${n}`:L()}var U=new WeakMap
-function B(e){var t=U.get(e)
-return void 0===t&&(t=new $,U.set(e,t)),t}function H(){}class ${constructor(){this._cache={lids:Object.create(null),types:Object.create(null)},this._generate=void 0,this._update=void 0,this._forget=void 0,this._reset=void 0,this._merge=void 0,this._generate=j||z,this._update=D||H,this._forget=R||H,this._reset=I||H,this._merge=H}__configureMerge(e){this._merge=e||H}_getRecordIdentifier(e,t){if(void 0===t&&(t=!1),M(e))return e
-var r=P(e.lid),n=null!==r?this._cache.lids[r]:void 0
-if(void 0!==n)return n
-var i=T(e.type),o=P(e.id)
-if(!1!==t||i&&o){var s=W(this._cache.types,i)
-if(null!==r&&(n=s.lid[r]),void 0===n&&null!==o&&(n=s.id[o]),void 0===n){var a=this._generate(e,"record")
-if(null!==r&&a!==r)throw new Error("You should not change the <lid> of a RecordIdentifier")
-null===r&&(n=s.lid[a]),!0===t&&(void 0===n&&(n=q(o,i,a),this._cache.lids[n.lid]=n,s.lid[n.lid]=n,s._allIdentifiers.push(n)),null!==n.id&&(s.id[n.id]=n))}return n}}peekRecordIdentifier(e){return this._getRecordIdentifier(e,!1)}getOrCreateRecordIdentifier(e){return this._getRecordIdentifier(e,!0)}createIdentifierForNewRecord(e){var t=this._generate(e,"record"),r=q(e.id||null,e.type,t),n=W(this._cache.types,e.type)
-return this._cache.lids[r.lid]=r,n.lid[t]=r,n._allIdentifiers.push(r),r}updateRecordIdentifier(e,t){var r=this.getOrCreateRecordIdentifier(e),n=P(t.id),i=function(e,t,r,n,i){var{id:o,type:s,lid:a}=t
-if(null!==o&&o!==n&&null!==n){var l=W(e,t.type).id[n]
-return void 0!==l&&l}var u=r.type&&T(r.type)
-if(null!==o&&o===n&&u===s&&r.lid&&r.lid!==a){var c=i[r.lid]
-return void 0!==c&&c}if(null!==o&&o===n&&u&&u!==s&&r.lid&&r.lid===a){var d=W(e,u).id[o]
-return void 0!==d&&d}return!1}(this._cache.types,r,t,n,this._cache.lids)
-if(!i&&t.type&&r.type!==T(t.type)){var s=o.assign({},t)
-delete s.lid,i=this.getOrCreateRecordIdentifier(s)}if(i){var a=W(this._cache.types,r.type)
-r=this._mergeRecordIdentifiers(a,r,i,t,n)}var l=r.id
-if(function(e,t,r){var{id:n,lid:i}=t
-t.type&&T(t.type)
-r(e,t,"record"),void 0!==n&&(e.id=P(n))}(r,t,this._update),l!==(n=r.id)&&null!==n){var u=W(this._cache.types,r.type)
-u.id[n]=r,null!==l&&delete u.id[l]}return r}_mergeRecordIdentifiers(e,t,r,n,i){var o=this._merge(t,r,n),s=o===t?r:t
-return this.forgetRecordIdentifier(s),e.id[i]=o,W(this._cache.types,r.type).id[i]=o,n.lid=o.lid,o}forgetRecordIdentifier(e){var t=this.getOrCreateRecordIdentifier(e),r=W(this._cache.types,t.type)
-null!==t.id&&delete r.id[t.id],delete this._cache.lids[t.lid],delete r.lid[t.lid]
-var n=r._allIdentifiers.indexOf(t)
-r._allIdentifiers.splice(n,1),function(e){k.delete(e)}(e),this._forget(t,"record")}destroy(){this._reset()}}function W(e,t){var r=e[t]
-return void 0===r&&(r={lid:Object.create(null),id:Object.create(null),_allIdentifiers:[]},e[t]=r),r}function q(e,t,r,n,i){var o,s={lid:r,id:e,type:t}
-return o=s,k.set(o,"is-identifier"),s}function V(e,t,r){var n=P(t)
-if(!C(n)){if(C(r))return{type:e,id:n,lid:r}
-throw new Error("Expected either id or lid to be a valid string")}return C(r)?{type:e,id:n,lid:r}:{type:e,id:n}}var G=m.extend(v,{meta:g.reads("content.meta")}),K=b.extend(v)
-function Y(e,t){return K.create({promise:p.Promise.resolve(e,t)})}function Q(e,t){return G.create({promise:p.Promise.resolve(e,t)})}function J(e,t){return Y(e.then((e=>e.getRecord())),t)}var X,Z=new d._Backburner(["normalizeRelationships","syncRelationships","finished"]),ee=/^\/?data\/(attributes|relationships)\/(.*)/,te=/^\/?data/,re="base"
-function ne(e){var t={}
-return s.isPresent(e)&&e.forEach((e=>{if(e.source&&e.source.pointer){var r=e.source.pointer.match(ee)
-r?r=r[2]:-1!==e.source.pointer.search(te)&&(r=re),r&&(t[r]=t[r]||[],t[r].push(e.detail||e.title))}})),t}function ie(e){return(e._internalModel||e.internalModel||e)._recordData||null}function oe(e,t){return function(e){return e._internalModel._recordData._relationships}(e).get(t)}(function(e){e.pending="pending",e.fulfilled="fulfilled",e.rejected="rejected"})(X||(X={}))
-class se{constructor(e,t,r){this.__attributes=null,this._belongsToRelationships=Object.create(null),this._belongsToIds=Object.create(null),this._hasManyRelationships=Object.create(null),this._hasManyIds=Object.create(null),this._internalModel=void 0,this._changedAttributes=void 0,this.identifier=void 0,this.modelName=void 0,this.id=void 0,this.include=void 0,this.adapterOptions=void 0,this._store=r
-var n=this._internalModel=r._internalModelForResource(t)
-this.modelName=t.type,n.hasRecord&&this._attributes,this.id=t.id,this.adapterOptions=e.adapterOptions,this.include=e.include,this.modelName=n.modelName,n.hasRecord&&(this._changedAttributes=ie(n).changedAttributes())}get record(){return this._internalModel.getRecord()}get _attributes(){if(null!==this.__attributes)return this.__attributes
-var e=this.record,t=this.__attributes=Object.create(null)
-return Object.keys(this._store._attributesDefinitionFor(this.modelName)),e.eachAttribute((r=>t[r]=i.get(e,r))),t}get type(){return this._internalModel.modelClass}get isNew(){throw new Error("isNew is only available when custom model class ff is on")}attr(e){if(e in this._attributes)return this._attributes[e]}attributes(){return o.assign({},this._attributes)}changedAttributes(){var e=Object.create(null)
-if(!this._changedAttributes)return e
-for(var t=Object.keys(this._changedAttributes),r=0,n=t.length;r<n;r++){var i=t[r]
-e[i]=this._changedAttributes[i].slice()}return e}belongsTo(e,t){var r,n,i=!(!t||!t.id),o=this._internalModel.store
-if(!0===i&&e in this._belongsToIds)return this._belongsToIds[e]
-if(!1===i&&e in this._belongsToRelationships)return this._belongsToRelationships[e]
-o._relationshipMetaFor(this.modelName,null,e)
-var s=oe(this,e).getData(),a=s&&s.data
-return r=a?o._internalModelForResource(a):null,s&&void 0!==s.data&&(n=r&&!r.isDeleted()?i?r.id:r.createSnapshot():null),i?this._belongsToIds[e]=n:this._belongsToRelationships[e]=n,n}hasMany(e,t){var r,n=!(!t||!t.ids),i=this._hasManyIds[e],o=this._hasManyRelationships[e]
-if(!0===n&&e in this._hasManyIds)return i
-if(!1===n&&e in this._hasManyRelationships)return o
-var s=this._internalModel.store,a=(s._relationshipMetaFor(this.modelName,null,e),oe(this,e).getData())
-return a.data&&(r=[],a.data.forEach((e=>{var t=s._internalModelForResource(e)
-t.isDeleted()||(n?r.push(e.id):r.push(t.createSnapshot()))}))),n?this._hasManyIds[e]=r:this._hasManyRelationships[e]=r,r}eachAttribute(e,t){this.record.eachAttribute(e,t)}eachRelationship(e,t){this.record.eachRelationship(e,t)}serialize(e){return this._store.serializerFor(this.modelName).serialize(this,e)}}function ae(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-return function(){return e.apply(void 0,r)}}function le(e,t){var r=e.finally((()=>{t()||(r._subscribers.length=0)}))
-return r}function ue(e){return!(i.get(e,"isDestroyed")||i.get(e,"isDestroying"))}function ce(e,t,r){return le(p.resolve(e,r).then((t=>e)),(()=>ue(t)))}function de(e,t,r,n,i,o){return e.normalizeResponse(t,r,n,i,o)}var he=y
-class pe{constructor(e,t,r){void 0===r&&(r={}),this._snapshots=void 0,this._recordArray=void 0,this._type=void 0,this.length=void 0,this.meta=void 0,this.adapterOptions=void 0,this.include=void 0,this._snapshots=null,this._recordArray=e,this.length=e.get("length"),this._type=null,this.meta=t,this.adapterOptions=r.adapterOptions,this.include=r.include}get type(){return this._type||(this._type=this._recordArray.get("type"))}get modelName(){return this._recordArray.modelName}snapshots(){return null!==this._snapshots||(this._snapshots=this._recordArray._takeSnapshot()),this._snapshots}}class fe{constructor(e){this._idToModel=Object.create(null),this._models=[],this._metadata=null,this.modelName=e}get(e){return this._idToModel[e]||null}has(e){return!!this._idToModel[e]}get length(){return this._models.length}get recordIdentifiers(){return this._models.map((e=>e.identifier))}set(e,t){this._idToModel[e]=t}add(e,t){t&&(this._idToModel[t]=e),this._models.push(e)}remove(e,t){delete this._idToModel[t]
-var r=this._models.indexOf(e);-1!==r&&this._models.splice(r,1)}contains(e){return-1!==this._models.indexOf(e)}get models(){return this._models}get metadata(){return this._metadata||(this._metadata=Object.create(null))}clear(){var e=this._models
-this._models=[]
-for(var t=0;t<e.length;t++){e[t].unloadRecord()}this._metadata=null}}class me{constructor(){this._map=Object.create(null)}retrieve(e){var t=this._map[e]
-return void 0===t&&(t=this._map[e]=new fe(e)),t}clear(){for(var e=this._map,t=Object.keys(e),r=0;r<t.length;r++){e[t[r]].clear()}}}var ge=new WeakMap,ve=new WeakMap
-function be(e){var t=ge.get(e)
-return void 0===t&&(t=new ye(e),ge.set(e,t)),t}class ye{constructor(e){this._identityMap=void 0,this._newlyCreated=void 0,this.identifierCache=void 0,this.store=e,this.identifierCache=B(e),this.identifierCache.__configureMerge(((e,t,r)=>{var n=e
-e.id!==t.id?n=e.id===r.id?e:t:e.type!==t.type&&(n=e.type===r.type?e:t)
-var i=e===n?t:e,o=this.modelMapFor(e.type),s=o.get(n.lid),a=o.get(i.lid)
-if(s&&a&&s.hasRecord&&a.hasRecord)throw new Error(`Failed to update the 'id' for the RecordIdentifier '${e.type}:${e.id} (${e.lid})' to '${r.id}', because that id is already in use by '${t.type}:${t.id} (${t.lid})'`)
-return a&&o.remove(a,i.lid),null===s&&null===a||(null===s&&null!==a||s&&!s.hasRecord&&a&&a.hasRecord)&&(s&&o.remove(s,n.lid),(s=a)._id=n.id,o.add(s,n.lid)),n})),this._identityMap=new me}lookup(e,t){void 0!==t&&this.identifierCache.getOrCreateRecordIdentifier(t)
-var r=this.identifierCache.getOrCreateRecordIdentifier(e),n=this.peek(r)
-return n?(n.hasScheduledDestroy()&&n.cancelDestroy(),n):this._build(r,!1)}peek(e){return this.modelMapFor(e.type).get(e.lid)}getByResource(e){var t=V(e.type,e.id,e.lid)
-return this.lookup(t)}setRecordId(e,t,r){var n={type:e,id:null,lid:r},i=this.identifierCache.getOrCreateRecordIdentifier(n),o=this.peek(i)
-if(null===o)throw new Error(`Cannot set the id ${t} on the record ${e}:${r} as there is no such record in the cache.`)
-var s=o.id,a=o.modelName
-if(null===s||null!==t){this.peekById(a,t)
-null===i.id&&this.identifierCache.updateRecordIdentifier(i,{type:e,id:t}),o.setId(t)}}peekById(e,t){var r=this.identifierCache.peekRecordIdentifier({type:e,id:t}),n=r?this.modelMapFor(e).get(r.lid):null
-return n&&n.hasScheduledDestroy()&&(n.destroySync(),n=null),n}build(e){return this._build(e,!0)}_build(e,t){if(void 0===t&&(t=!1),!0===t&&e.id)this.peekById(e.type,e.id)
-var r,{identifierCache:n}=this
-r=!0===t?n.createIdentifierForNewRecord(e):e
-var i=new ct(this.store,r)
-return this.modelMapFor(e.type).add(i,r.lid),i}remove(e){var t=this.modelMapFor(e.modelName),r=e.identifier.lid
-t.remove(e,r)
-var{identifier:n}=e
-this.identifierCache.forgetRecordIdentifier(n)}modelMapFor(e){return this._identityMap.retrieve(e)}_newlyCreatedModelsFor(e){return this._newlyCreated.retrieve(e)}clear(e){void 0===e?this._identityMap.clear():this.modelMapFor(e).clear()}}var _e=m.extend(he,{init(e){this._super(e),this.set("content",this.content||null),this.isLoaded=this.isLoaded||!1,this.isUpdating=!1,this.store=this.store||null,this._updatingPromise=null},replace(){throw new Error(`The result of a server query (for all ${this.modelName} types) is immutable. To modify contents, use toArray()`)},type:i.computed("modelName",(function(){return this.modelName?this.store.modelFor(this.modelName):null})).readOnly(),objectAtContent(e){var t=i.get(this,"content").objectAt(e)
-return t?function(e,t){return be(e).lookup(t).getRecord()}(this.store,t):void 0},update(){if(i.get(this,"isUpdating"))return this._updatingPromise
-this.set("isUpdating",!0)
-var e=this._update().finally((()=>{this._updatingPromise=null,this.get("isDestroying")||this.get("isDestroyed")||this.set("isUpdating",!1)}))
-return this._updatingPromise=e,e},_update(){return this.store.findAll(this.modelName,{reload:!0})},save(){var e=`DS: RecordArray#save ${this.modelName}`,t=p.Promise.all(this.invoke("save"),e).then((()=>this),null,"DS: RecordArray#save return RecordArray")
-return G.create({promise:t})},_unregisterFromManager(){this.manager.unregisterRecordArray(this)},willDestroy(){this._unregisterFromManager(),this._dissociateFromOwnRecords(),i.set(this,"content",null),i.set(this,"length",0),this._super(...arguments)},_createSnapshot(e){return new pe(this,this.get("meta"),e)},_dissociateFromOwnRecords(){this.get("content").forEach((e=>{var t=this.manager.getRecordArraysForIdentifier(e)
-t&&t.delete(this)}))},_pushIdentifiers(e){i.get(this,"content").pushObjects(e)},_removeIdentifiers(e){i.get(this,"content").removeObjects(e)},_takeSnapshot(){return i.get(this,"content").map((e=>be(this.store).lookup(e).createSnapshot()))}}),we=_e.extend({init(){this.set("content",this.get("content")||a.A()),this._super(...arguments),this.query=this.query||null,this.links=this.links||null},replace(){throw new Error(`The result of a server query (on ${this.modelName}) is immutable.`)},_update(){var e=i.get(this,"store"),t=i.get(this,"query")
-return e._query(this.modelName,t,this)},_setObjects(e,t){this.get("content").setObjects(e),this.setProperties({isLoaded:!0,isUpdating:!1,meta:o.assign({},t.meta),links:o.assign({},t.links)}),this.manager._associateWithRecordArray(e,this),this.has("didLoad")&&l.once(this,"trigger","didLoad")},_setIdentifiers(e,t){this._setObjects(e,t)}}),Oe=new WeakMap
-function xe(e){return Oe.has(e)||Oe.set(e,new Set),Oe.get(e)}var Pe=new Set([]),Se=new WeakMap,Te=function(e){var t=e
-return M(e)||(t=e.identifier||t),t},Ee=function(e,t){var r=Se.get(t)
-return void 0===r&&(r=e.peek(t)),r},Ce=function(e,t){var r=be(e).peek(t)
-return null!==r&&!r.isHiddenFromRecordArrays()}
-class ke{constructor(e){this.store=e.store,this.isDestroying=!1,this.isDestroyed=!1,this._liveRecordArrays=Object.create(null),this._pendingIdentifiers=Object.create(null),this._adapterPopulatedRecordArrays=[]}getRecordArraysForIdentifier(e){return xe(e)}_flushPendingIdentifiersForModelName(e,t){if(!this.isDestroying&&!this.isDestroyed){for(var r=[],n=0;n<t.length;n++){var i=t[n]
-Pe.delete(i),Ce(this.store,i)||r.push(i)}var o=this._liveRecordArrays[e]
-o&&Ae(this.store,o,t),r.length>0&&Ie(this.store,r)}}_flush(){var e=this._pendingIdentifiers
-for(var t in this._pendingIdentifiers=Object.create(null),e)this._flushPendingIdentifiersForModelName(t,e[t])}_syncLiveRecordArray(e,t){var r=this._pendingIdentifiers[t],n=Array.isArray(r),o=!n||0===r.length,s=be(this.store).modelMapFor(t),a=i.get(s,"length")===i.get(e,"length")
-if(!o||!a){n&&(this._flushPendingIdentifiersForModelName(t,r),delete this._pendingIdentifiers[t])
-for(var l=this._visibleIdentifiersByType(t),u=[],c=0;c<l.length;c++){var d=l[c],h=xe(d)
-!1===h.has(e)&&(h.add(e),u.push(d))}u.length&&e._pushIdentifiers(u)}}_didUpdateAll(e){var t=this._liveRecordArrays[e]
-t&&i.set(t,"isUpdating",!1)}liveRecordArrayFor(e){var t=this._liveRecordArrays[e]
-if(t)this._syncLiveRecordArray(t,e)
-else{var r=this._visibleIdentifiersByType(e)
-t=this.createRecordArray(e,r),this._liveRecordArrays[e]=t}return t}_visibleIdentifiersByType(e){for(var t=be(this.store).modelMapFor(e).recordIdentifiers,r=[],n=0;n<t.length;n++){var i=t[n]
-Ce(this.store,i)&&r.push(i)}return r}createRecordArray(e,t){var r=_e.create({modelName:e,content:a.A(t||[]),store:this.store,isLoaded:!0,manager:this})
-return Array.isArray(t)&&this._associateWithRecordArray(t,r),r}createAdapterPopulatedRecordArray(e,t,r,n){var i
-return Array.isArray(r)?(i=we.create({modelName:e,query:t,content:a.A(r),store:this.store,manager:this,isLoaded:!0,isUpdating:!1,meta:o.assign({},n.meta),links:o.assign({},n.links)}),this._associateWithRecordArray(r,i)):i=we.create({modelName:e,query:t,content:a.A(),store:this.store,manager:this}),this._adapterPopulatedRecordArrays.push(i),i}unregisterRecordArray(e){var t=e.modelName
-if(!Me(this._adapterPopulatedRecordArrays,e)){var r=this._liveRecordArrays[t]
-r&&e===r&&delete this._liveRecordArrays[t]}}_associateWithRecordArray(e,t){for(var r=0,n=e.length;r<n;r++){var i=e[r]
-i=Te(i),this.getRecordArraysForIdentifier(i).add(t)}}recordDidChange(e){if(!this.isDestroying&&!this.isDestroyed){var t=e.type
-e=Te(e)
-var r=be(this.store),n=Ee(r,e)
-if(n&&n._isDematerializing&&Se.set(e,n),!Pe.has(e)){Pe.add(e)
-var i=this._pendingIdentifiers
-1===(i[t]=i[t]||[]).push(e)&&l._backburner.schedule("actions",this,this._flush)}}}willDestroy(){Object.keys(this._liveRecordArrays).forEach((e=>this._liveRecordArrays[e].destroy())),this._adapterPopulatedRecordArrays.forEach((e=>e.destroy())),this.isDestroyed=!0}destroy(){this.isDestroying=!0,l._backburner.schedule("actions",this,this.willDestroy)}}var Me=function(e,t){var r=e.indexOf(t)
-return-1!==r&&(e.splice(r,1),!0)},Ae=function(e,t,r){for(var n=[],i=[],o=0;o<r.length;o++){var s=r[o],a=Ce(e,s),l=xe(s)
-a&&(l.has(t)||(n.push(s),l.add(t))),a||(i.push(s),l.delete(t))}n.length>0&&Re(t,n,be(e)),i.length>0&&je(t,i,be(e))},Re=function(e,t,r){e._pushIdentifiers?e._pushIdentifiers(t):e._pushInternalModels(t.map((e=>Ee(r,e))))},je=function(e,t,r){e._removeIdentifiers?e._removeIdentifiers(t):e._removeInternalModels(t.map((e=>Ee(r,e))))},Ie=function(e,t){for(var r=0;r<t.length;r++)De(e,t[r])},De=function(e,t){var r=xe(t=Te(t)),n=be(e)
-r.forEach((function(e){je(e,[t],n)})),r.clear()}
-function Ne(e){return e&&e.links&&e.links.related}var Fe=new WeakMap
-function Le(e){return be(e.store).peek(Fe.get(e))}class ze{constructor(e,t){this.store=e,Fe.set(this,t)}get recordData(){return this.store.recordDataFor(Fe.get(this),!1)}_resource(){}remoteType(){return Ne(this._resource())?"link":"id"}link(){var e,t=this._resource()
-return Ne(t)&&t.links&&(e=(e=t.links.related)&&"string"!=typeof e?e.href:e),e||null}links(){var e=this._resource()
-return e&&e.links?e.links:null}meta(){var e=null,t=this._resource()
-return t&&t.meta&&"object"==typeof t.meta&&(e=t.meta),e}}Object.defineProperty(ze.prototype,"internalModel",{get(){return Fe.get(this)}})
-class Ue extends ze{constructor(e,t,r,n){super(e,t),this.key=n,this.belongsToRelationship=r,this.type=r.relationshipMeta.type,this.parent=be(e).peek(t).recordReference,this.parentIdentifier=t}id(){var e=null,t=this._resource()
-return t&&t.data&&(e=t.data.id),e}_resource(){return this.recordData.getBelongsTo(this.key)}push(e){return p.resolve(e).then((e=>{var t
-return t=function(e){return ve.get(e)}(e)?e:this.store.push(e),this.belongsToRelationship.setCanonicalRecordData(ie(t)),t}))}value(){var e=this._resource()
-if(e&&e.data){var t=this.store._internalModelForResource(e.data)
-if(t&&t.isLoaded())return t.getRecord()}return null}load(e){return be(this.store).peek(this.parentIdentifier).getBelongsTo(this.key,e)}reload(e){return be(this.store).peek(this.parentIdentifier).reloadBelongsTo(this.key,e).then((e=>this.value()))}}class Be extends ze{constructor(e,t,r,n){super(e,t),this.key=n,this.hasManyRelationship=r,this.type=r.relationshipMeta.type,this.parent=be(e).peek(t).recordReference}_resource(){return this.recordData.getHasMany(this.key)}remoteType(){var e=this._resource()
-return e&&e.links&&e.links.related?"link":"ids"}ids(){var e=this._resource(),t=[]
-return e.data&&(t=e.data.map((e=>e.id))),t}push(e){return p.resolve(e).then((e=>{var t=e
-"object"==typeof e&&e.data&&(t=e.data)
-var r=Le(this),n=t.map((e=>ie(this.store.push(e))))
-return this.hasManyRelationship.computeChanges(n),r.getHasMany(this.hasManyRelationship.key)}))}_isLoaded(){return!!this.hasManyRelationship.hasAnyRelationshipData&&this.hasManyRelationship.members.toArray().every((e=>!0===this.store._internalModelForResource(e.getResourceIdentifier()).isLoaded()))}value(){var e=Le(this)
-return this._isLoaded()?e.getManyArray(this.key):null}load(e){return Le(this).getHasMany(this.key,e)}reload(e){return Le(this).reloadHasMany(this.key,e)}}class He extends ze{get type(){return this.identifier().type}get _id(){var e=this.identifier()
-return e?e.id:null}id(){return this._id}identifier(){return Fe.get(this)}remoteType(){return"identity"}push(e){return p.resolve(e).then((e=>this.store.push(e)))}value(){if(null!==this._id){var e=Le(this)
-if(e&&e.isLoaded())return e.getRecord()}return null}load(){if(null!==this._id)return this.store.findRecord(this.type,this._id)
-throw new Error(`Unable to fetch record of type ${this.type} without an id`)}reload(){if(null!==this._id)return this.store.findRecord(this.type,this._id,{reload:!0})
-throw new Error(`Unable to fetch record of type ${this.type} without an id`)}}function $e(e,t){t.isDirty?e.send("becomeDirty"):e.send("propertyWasReset")}var We={initialState:"uncommitted",isDirty:!0,uncommitted:{didSetProperty:$e,loadingData(){},propertyWasReset(e,t){e.hasChangedAttributes()||e.send("rolledBack")},pushedData(e){e.hasChangedAttributes()||e.transitionTo("loaded.saved")},becomeDirty(){},willCommit(e){e.transitionTo("inFlight")},reloadRecord(e,t){var{resolve:r,options:n}=t
-r(e.store._reloadRecord(e,n))},rolledBack(e){e.transitionTo("loaded.saved"),e.triggerLater("rolledBack")},becameInvalid(e){e.transitionTo("invalid")},rollback(e){e.rollbackAttributes(),e.triggerLater("ready")}},inFlight:{isSaving:!0,didSetProperty:$e,becomeDirty(){},pushedData(){},unloadRecord:Je,willCommit(){},didCommit(e){e.transitionTo("saved"),e.send("invokeLifecycleCallbacks",this.dirtyType)},rolledBack(e){e.triggerLater("rolledBack")},becameInvalid(e){e.transitionTo("invalid"),e.send("invokeLifecycleCallbacks")},becameError(e){e.transitionTo("uncommitted"),e.triggerLater("becameError",e)}},invalid:{isValid:!1,deleteRecord(e){e.transitionTo("deleted.uncommitted")},didSetProperty(e,t){e.removeErrorMessageFromAttribute(t.name),$e(e,t),e.hasErrors()||this.becameValid(e)},becameInvalid(){},becomeDirty(){},pushedData(){},willCommit(e){e.clearErrorMessages(),e.transitionTo("inFlight")},rolledBack(e){e.clearErrorMessages(),e.transitionTo("loaded.saved"),e.triggerLater("ready")},becameValid(e){e.transitionTo("uncommitted")},invokeLifecycleCallbacks(e){e.triggerLater("becameInvalid",e)}}}
-function qe(e){var t,r={}
-for(var n in e)t=e[n],r[n]=t&&"object"==typeof t?qe(t):t
-return r}function Ve(e,t){for(var r in t)e[r]=t[r]
-return e}function Ge(e){return Ve(qe(We),e)}var Ke=Ge({dirtyType:"created",isNew:!0,setup(e){e.updateRecordArrays()}})
-Ke.invalid.rolledBack=function(e){e.transitionTo("deleted.saved"),e.triggerLater("rolledBack")},Ke.uncommitted.rolledBack=function(e){e.transitionTo("deleted.saved"),e.triggerLater("rolledBack")}
-var Ye=Ge({dirtyType:"updated"})
-function Qe(e){e.transitionTo("deleted.saved"),e.send("invokeLifecycleCallbacks")}function Je(e){}Ke.uncommitted.deleteRecord=Qe,Ke.invalid.deleteRecord=Qe,Ke.uncommitted.rollback=function(e){We.uncommitted.rollback.apply(this,arguments),e.transitionTo("deleted.saved")},Ke.uncommitted.pushedData=function(e){e.transitionTo("loaded.updated.uncommitted"),e.triggerLater("didLoad")},Ke.uncommitted.propertyWasReset=function(){},Ye.invalid.becameValid=function(e){e.transitionTo("loaded.saved")},Ye.inFlight.unloadRecord=Je,Ye.uncommitted.deleteRecord=function(e){e.transitionTo("deleted.uncommitted")},Ye.invalid.rolledBack=function(e){e.clearErrorMessages(),e.transitionTo("loaded.saved"),e.triggerLater("rolledBack")}
-var Xe=function e(t,r,n){for(var i in(t=Ve(r?Object.create(r):{},t)).parentState=r,t.stateName=n,t)Object.prototype.hasOwnProperty.call(t,i)&&"parentState"!==i&&"stateName"!==i&&"object"==typeof t[i]&&(t[i]=e(t[i],t,n+"."+i))
-return t}({isEmpty:!1,isLoading:!1,isLoaded:!1,isDirty:!1,isSaving:!1,isDeleted:!1,isNew:!1,isValid:!0,rolledBack(){},unloadRecord(e){},propertyWasReset(){},empty:{isEmpty:!0,loadingData(e,t){e._promiseProxy=t,e.transitionTo("loading")},loadedData(e){e.transitionTo("loaded.created.uncommitted"),e.triggerLater("ready")},pushedData(e){e.transitionTo("loaded.saved"),e.triggerLater("didLoad"),e.triggerLater("ready")},notFound(){}},loading:{isLoading:!0,exit(e){e._promiseProxy=null},loadingData(){},pushedData(e){e.transitionTo("loaded.saved"),e.triggerLater("didLoad"),e.triggerLater("ready"),e.didCleanError()},becameError(e){e.triggerLater("becameError",e)},notFound(e){e.transitionTo("empty")}},loaded:{initialState:"saved",isLoaded:!0,loadingData(){},saved:{setup(e){e.hasChangedAttributes()&&e.adapterDidDirty()},didSetProperty:$e,pushedData(){},becomeDirty(e){e.transitionTo("updated.uncommitted")},willCommit(e){e.transitionTo("updated.inFlight")},reloadRecord(e,t){var{resolve:r,options:n}=t
-r(e.store._reloadRecord(e,n))},deleteRecord(e){e.transitionTo("deleted.uncommitted")},unloadRecord(e){},didCommit(){},notFound(){}},created:Ke,updated:Ye},deleted:{initialState:"uncommitted",dirtyType:"deleted",isDeleted:!0,isLoaded:!0,isDirty:!0,setup(e){e.updateRecordArrays()},uncommitted:{willCommit(e){e.transitionTo("inFlight")},rollback(e){e.rollbackAttributes(),e.triggerLater("ready")},pushedData(){},becomeDirty(){},deleteRecord(){},rolledBack(e){e.transitionTo("loaded.saved"),e.triggerLater("ready"),e.triggerLater("rolledBack")}},inFlight:{isSaving:!0,unloadRecord:Je,willCommit(){},didCommit(e){e.transitionTo("saved"),e.send("invokeLifecycleCallbacks")},becameError(e){e.transitionTo("uncommitted"),e.triggerLater("becameError",e)},becameInvalid(e){e.transitionTo("invalid"),e.triggerLater("becameInvalid",e)}},saved:{isDirty:!1,setup(e){e.removeFromInverseRelationships()},invokeLifecycleCallbacks(e){e.triggerLater("didDelete",e),e.triggerLater("didCommit",e)},willCommit(){},didCommit(){},pushedData(){}},invalid:{isValid:!1,didSetProperty(e,t){e.removeErrorMessageFromAttribute(t.name),$e(e,t),e.hasErrors()||this.becameValid(e)},becameInvalid(){},becomeDirty(){},deleteRecord(){},willCommit(){},rolledBack(e){e.clearErrorMessages(),e.transitionTo("loaded.saved"),e.triggerLater("ready")},becameValid(e){e.transitionTo("uncommitted")}}},invokeLifecycleCallbacks(e,t){"created"===t?e.triggerLater("didCreate",e):e.triggerLater("didUpdate",e),e.triggerLater("didCommit",e)}},null,"root")
-function Ze(e,t){return function(e){return ie(e)._relationships}(e).get(t)}var et,tt,rt,nt,{hasOwnProperty:it}=Object.prototype,ot=!1
-nt=function(){if(!ot){var e=require("@ember-data/model/-private");({ManyArray:et,PromiseBelongsTo:tt,PromiseManyArray:rt}=e),et&&tt&&rt&&(ot=!0)}return ot}
-var st=Object.create(null),at=Object.create(null),lt=Object.create(null)
-function ut(e){return lt[e]||(lt[e]=e.split("."))}class ct{constructor(e,t){this._id=void 0,this._tag=0,this.modelName=void 0,this.clientId=void 0,this.__recordData=void 0,this._isDestroyed=void 0,this.isError=void 0,this._pendingRecordArrayManagerFlush=void 0,this._isDematerializing=void 0,this.isReloading=void 0,this._doNotDestroy=void 0,this.isDestroying=void 0,this._promiseProxy=void 0,this._record=void 0,this._scheduledDestroy=void 0,this._modelClass=void 0,this.__deferredTriggers=void 0,this.__recordArrays=void 0,this._references=void 0,this._recordReference=void 0,this._manyArrayCache=Object.create(null),this._retainedManyArrayCache=Object.create(null),this._relationshipPromisesCache=Object.create(null),this._relationshipProxyCache=Object.create(null),this.currentState=void 0,this.error=void 0,this.store=e,this.identifier=t,nt(),this._id=t.id
-this.modelName=t.type,this.clientId=t.lid,this.__recordData=null,this[d.GUID_KEY]=t.lid,this._promiseProxy=null,this._record=null,this._isDestroyed=!1,this.isError=!1,this._pendingRecordArrayManagerFlush=!1,this._isDematerializing=!1,this._scheduledDestroy=null,this.resetRecord(),this._modelClass=null,this.__deferredTriggers=null,this.__recordArrays=null,this._references=null,this._recordReference=null}get id(){return this.identifier.id}set id(e){if(e!==this._id){var t={type:this.identifier.type,lid:this.identifier.lid,id:e}
-B(this.store).updateRecordIdentifier(this.identifier,t),i.set(this,"_tag",this._tag+1)}}get modelClass(){if(this.store.modelFor)return this._modelClass||(this._modelClass=this.store.modelFor(this.modelName))}get type(){return this.modelClass}get recordReference(){return null===this._recordReference&&(this._recordReference=new He(this.store,this.identifier)),this._recordReference}get _recordData(){if(null===this.__recordData){var e=this.store._createRecordData(this.identifier)
-return this._recordData=e,e}return this.__recordData}set _recordData(e){this.__recordData=e}get references(){return null===this._references&&(this._references=Object.create(null)),this._references}get _deferredTriggers(){return null===this.__deferredTriggers&&(this.__deferredTriggers=[]),this.__deferredTriggers}isHiddenFromRecordArrays(){return!!this.isEmpty()||(e="root.deleted.saved"===this.currentState.stateName,this._isDematerializing||this.hasScheduledDestroy()||this.isDestroyed||e)
-var e}_isRecordFullyDeleted(){return!1}isRecordInUse(){var e=this._record
-return e&&!(e.get("isDestroyed")||e.get("isDestroying"))}isEmpty(){return this.currentState.isEmpty}isLoading(){return this.currentState.isLoading}isLoaded(){return this.currentState.isLoaded}hasDirtyAttributes(){return this.currentState.hasDirtyAttributes}isSaving(){return this.currentState.isSaving}isDeleted(){return this.currentState.isDeleted}isNew(){return this.currentState.isNew}isValid(){return this.currentState.isValid}dirtyType(){return this.currentState.dirtyType}getRecord(e){if(!this._record&&!this._isDematerializing){var{store:r}=this,n={store:r,_internalModel:this,currentState:this.currentState}
-if(n.isError=this.isError,n.adapterError=this.error,void 0!==e){if("id"in e){var i=P(e.id)
-null!==i&&this.setId(i)}var s=r._relationshipsDefinitionFor(this.modelName)
-if(null!==s)for(var a,l=Object.keys(e),u=0;u<l.length;u++){var c=l[u],d=s[c]
-void 0!==d&&(a="hasMany"===d.kind?ht(e[c]):pt(e[c]),e[c]=a)}}var h=this._recordData._initRecordCreateOptions(e)
-o.assign(n,h),t.setOwner(n,t.getOwner(r)),this._record=r._modelFactoryFor(this.modelName).create(n),p=this._record,f=this.identifier,ve.set(p,f),this._triggerDeferredTriggers()}var p,f
-return this._record}resetRecord(){this._record=null,this.isReloading=!1,this.error=null,this.currentState=Xe.empty}dematerializeRecord(){this._isDematerializing=!0,this._doNotDestroy=!1,this._record&&(this._record.destroy(),Object.keys(this._relationshipProxyCache).forEach((e=>{this._relationshipProxyCache[e].destroy&&this._relationshipProxyCache[e].destroy(),delete this._relationshipProxyCache[e]})),Object.keys(this._manyArrayCache).forEach((e=>{var t=this._retainedManyArrayCache[e]=this._manyArrayCache[e]
-delete this._manyArrayCache[e],t&&!t._inverseIsAsync&&t.clear()}))),this.updateRecordArrays(),this._recordData.unloadRecord(),this.resetRecord()}deleteRecord(){this.send("deleteRecord")}save(e){var t="DS: Model#save "+this,r=x.defer(t)
-return this.store.scheduleSave(this,r,e),r.promise}startedReloading(){this.isReloading=!0,this.hasRecord&&i.set(this._record,"isReloading",!0)}finishedReloading(){this.isReloading=!1,this.hasRecord&&i.set(this._record,"isReloading",!1)}reload(e){this.startedReloading()
-var t=this,r="DS: Model#reload of "+this
-return new p.Promise((function(r){t.send("reloadRecord",{resolve:r,options:e})}),r).then((function(){return t.didCleanError(),t}),(function(e){throw t.didError(e),e}),"DS: Model#reload complete, update flags").finally((function(){t.finishedReloading()}))}unloadRecord(){this.isDestroyed||(this.send("unloadRecord"),this.dematerializeRecord(),null===this._scheduledDestroy&&(this._scheduledDestroy=l._backburner.schedule("destroy",this,"_checkForOrphanedInternalModels")))}hasScheduledDestroy(){return!!this._scheduledDestroy}cancelDestroy(){this._doNotDestroy=!0,this._isDematerializing=!1,l.cancel(this._scheduledDestroy),this._scheduledDestroy=null}destroySync(){this._isDematerializing&&this.cancelDestroy(),this._checkForOrphanedInternalModels(),this.isDestroyed||this.isDestroying||this.destroy()}_checkForOrphanedInternalModels(){this._isDematerializing=!1,this._scheduledDestroy=null,this.isDestroyed}eachRelationship(e,t){return this.modelClass.eachRelationship(e,t)}_findBelongsTo(e,t,r,n){return this.store._findBelongsToByJsonApiResource(t,this,r,n).then((r=>dt(this,e,t._relationship,r,null)),(r=>dt(this,e,t._relationship,null,r)))}getBelongsTo(e,t){var r=this._recordData.getBelongsTo(e),n=r&&r.data?B(this.store).getOrCreateRecordIdentifier(r.data):null,i=this.store._relationshipMetaFor(this.modelName,null,e),o=this.store,s=i.options.async,a=void 0===s||s,l={key:e,store:o,originatingInternalModel:this,modelName:i.type}
-if(a){var u=null!==n?o._internalModelForResource(n):null
-if(r._relationship.hasFailedLoadAttempt)return this._relationshipProxyCache[e]
-var c=this._findBelongsTo(e,r,i,t)
-return this._updatePromiseProxyFor("belongsTo",e,{promise:c,content:u?u.getRecord():null,_belongsToState:l})}return null===n?null:o._internalModelForResource(n).getRecord()}getManyArray(e,t){void 0===t&&(t=!1)
-var r=this.store._relationshipMetaFor(this.modelName,null,e),n=this._recordData.getHasMany(e),i=this._manyArrayCache[e]
-if(!i){var o=this.store._getHasManyByJsonApiResource(n),s=!!n._relationship&&n._relationship._inverseIsAsync()
-i=et.create({store:this.store,type:this.store.modelFor(r.type),recordData:this._recordData,meta:n.meta,links:n.links,key:e,isPolymorphic:r.options.polymorphic,initialState:o.slice(),_inverseIsAsync:s,internalModel:this,isLoaded:!t}),this._manyArrayCache[e]=i}return this._retainedManyArrayCache[e]&&(this._retainedManyArrayCache[e].destroy(),delete this._retainedManyArrayCache[e]),i}fetchAsyncHasMany(e,t,r,n,i){var o=this._relationshipPromisesCache[e]
-return o||(o=this.store._findHasManyByJsonApiResource(r,this,t,i).then((()=>(n.retrieveLatest(),n.set("isLoaded",!0),n))).then((t=>dt(this,e,r._relationship,t,null)),(t=>dt(this,e,r._relationship,null,t))),this._relationshipPromisesCache[e]=o,o)}getHasMany(e,t){var r=this._recordData.getHasMany(e),n=this.store._relationshipMetaFor(this.modelName,null,e),i=n.options.async,o=void 0===i||i,s=this.getManyArray(e,o)
-if(o){if(r._relationship.hasFailedLoadAttempt)return this._relationshipProxyCache[e]
-var a=this.fetchAsyncHasMany(e,n,r,s,t)
-return this._updatePromiseProxyFor("hasMany",e,{promise:a,content:s})}return s}_updatePromiseProxyFor(e,t,r){var n=this._relationshipProxyCache[t]
-if(n)void 0!==r.content&&n.set("content",r.content),n.set("promise",r.promise)
-else{var i="hasMany"===e?rt:tt
-this._relationshipProxyCache[t]=i.create(r)}return this._relationshipProxyCache[t]}reloadHasMany(e,t){var r=this._relationshipPromisesCache[e]
-if(r)return r
-var n=this._recordData.getHasMany(e)
-n._relationship&&(n._relationship.setHasFailedLoadAttempt(!1),n._relationship.setShouldForceReload(!0))
-var i=this.store._relationshipMetaFor(this.modelName,null,e),o=this.getManyArray(e),s=this.fetchAsyncHasMany(e,i,n,o,t)
-return this._relationshipProxyCache[e]?this._updatePromiseProxyFor("hasMany",e,{promise:s}):s}reloadBelongsTo(e,t){var r=this._relationshipPromisesCache[e]
-if(r)return r
-var n=this._recordData.getBelongsTo(e)
-n._relationship&&(n._relationship.setHasFailedLoadAttempt(!1),n._relationship.setShouldForceReload(!0))
-var i=this.store._relationshipMetaFor(this.modelName,null,e),o=this._findBelongsTo(e,n,i,t)
-return this._relationshipProxyCache[e]?this._updatePromiseProxyFor("belongsTo",e,{promise:o}):o}destroyFromRecordData(){this._doNotDestroy?this._doNotDestroy=!1:this.destroy()}destroy(){this.isDestroying=!0,Object.keys(this._retainedManyArrayCache).forEach((e=>{this._retainedManyArrayCache[e].destroy(),delete this._retainedManyArrayCache[e]})),be(this.store).remove(this),this._isDestroyed=!0}eachAttribute(e,t){return this.modelClass.eachAttribute(e,t)}inverseFor(e){return this.modelClass.inverseFor(e)}setupData(e){var t=this._recordData.pushData(e,this.hasRecord)
-this.hasRecord&&this._record._notifyProperties(t),this.pushedData()}getAttributeValue(e){return this._recordData.getAttr(e)}setDirtyHasMany(e,t){return this._recordData.setDirtyHasMany(e,ht(t))}setDirtyBelongsTo(e,t){return this._recordData.setDirtyBelongsTo(e,pt(t))}setDirtyAttribute(e,t){if(this.isDeleted())throw new n(`Attempted to set '${e}' on the deleted record ${this}`)
-if(this.getAttributeValue(e)!==t){this._recordData.setDirtyAttribute(e,t)
-var r=this._recordData.isAttrDirty(e)
-this.send("didSetProperty",{name:e,isDirty:r})}return t}get isDestroyed(){return this._isDestroyed}get hasRecord(){return!!this._record}createSnapshot(e){return new se(e||{},this.identifier,this.store)}loadingData(e){this.send("loadingData",e)}loadedData(){this.send("loadedData")}notFound(){this.send("notFound")}pushedData(){this.send("pushedData")}hasChangedAttributes(){return!(this.isLoading()&&!this.isReloading)&&this._recordData.hasChangedAttributes()}changedAttributes(){return this.isLoading()&&!this.isReloading?{}:this._recordData.changedAttributes()}adapterWillCommit(){this._recordData.willCommit(),this.send("willCommit")}adapterDidDirty(){this.send("becomeDirty")}send(e,t){var r=this.currentState
-return r[e]||this._unhandledEvent(r,e,t),r[e](this,t)}manyArrayRecordAdded(e){this.hasRecord&&this._record.notifyHasManyAdded(e)}notifyHasManyChange(e){if(this.hasRecord){var t=this._manyArrayCache[e]
-t&&t.retrieveLatest()}}notifyBelongsToChange(e){this.hasRecord&&this._record.notifyBelongsToChange(e,this._record)}hasManyRemovalCheck(e){var t=this._manyArrayCache[e]||this._retainedManyArrayCache[e],r=!1
-return t&&(r=t.removeUnloadedInternalModel(),this._manyArrayCache[e]&&r&&(this._retainedManyArrayCache[e]=this._manyArrayCache[e],delete this._manyArrayCache[e])),r}notifyPropertyChange(e){this.hasRecord&&this._record.notifyPropertyChange(e)
-var t=this._manyArrayCache[e]||this._retainedManyArrayCache[e]
-if(t){var r=t.removeUnloadedInternalModel()
-this._manyArrayCache[e]&&r&&(this._retainedManyArrayCache[e]=this._manyArrayCache[e],delete this._manyArrayCache[e])}}notifyStateChange(e){this.hasRecord&&(e&&"isNew"!==e||this.getRecord().notifyPropertyChange("isNew"),e&&"isDeleted"!==e||this.getRecord().notifyPropertyChange("isDeleted")),e&&"isDeletionCommitted"!==e||this.updateRecordArrays()}didCreateRecord(){this._recordData.clientDidCreate()}rollbackAttributes(){var e=this._recordData.rollbackAttributes()
-i.get(this,"isError")&&this.didCleanError(),this.send("rolledBack"),this._record&&e&&e.length>0&&this._record._notifyProperties(e)}transitionTo(e){var t,r,n,o,s=function(e){return at[e]||(at[e]=ut(e)[0])}(e),a=this.currentState,l=`${a.stateName}->${e}`
-do{a.exit&&a.exit(this),a=a.parentState}while(!a[s])
-var u=st[l]
-if(u)t=u.setups,r=u.enters,a=u.state
-else{t=[],r=[]
-var c=ut(e)
-for(n=0,o=c.length;n<o;n++)(a=a[c[n]]).enter&&r.push(a),a.setup&&t.push(a)
-st[l]={setups:t,enters:r,state:a}}for(n=0,o=r.length;n<o;n++)r[n].enter(this)
-for(this.currentState=a,this.hasRecord&&i.set(this._record,"currentState",a),n=0,o=t.length;n<o;n++)t[n].setup(this)}_unhandledEvent(e,t,i){var o="Attempted to handle event `"+t+"` "
-throw o+="on "+String(this)+" while in state ",o+=e.stateName+". ",void 0!==i&&(o+="Called with "+r.inspect(i)+"."),new n(o)}triggerLater(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-1===this._deferredTriggers.push(t)&&this.store._updateInternalModel(this)}_triggerDeferredTriggers(){if(this.hasRecord){var e=this._deferredTriggers,t=this._record,r=t.trigger
-if(r&&"function"==typeof r)for(var n=0,i=e.length;n<i;n++){var o=e[n]
-r.apply(t,o)}e.length=0}}removeFromInverseRelationships(e){void 0===e&&(e=!1),this._recordData.removeFromInverseRelationships(e)}preloadData(e){var t={}
-Object.keys(e).forEach((r=>{var n=i.get(e,r)
-this.modelClass.metaForProperty(r).isRelationship?(t.relationships||(t.relationships={}),t.relationships[r]=this._preloadRelationship(r,n)):(t.attributes||(t.attributes={}),t.attributes[r]=n)})),this._recordData.pushData(t)}_preloadRelationship(e,t){var r=this.modelClass.metaForProperty(e),n=r.type
-return{data:"hasMany"===r.kind?t.map((e=>this._convertPreloadRelationshipToJSON(e,n))):this._convertPreloadRelationshipToJSON(t,n)}}_convertPreloadRelationshipToJSON(e,t){return"string"==typeof e||"number"==typeof e?{type:t,id:e}:{type:(r=e._internalModel?e._internalModel:e).modelName,id:r.id}
-var r}updateRecordArrays(){this.store.recordArrayManager.recordDidChange(this.identifier)}setId(e){var t=e!==this._id
-this._id=e,i.set(this,"_tag",this._tag+1),t&&null!==e&&(this.store.setRecordId(this.modelName,e,this.clientId),this._recordData.__setId&&this._recordData.__setId(e)),t&&this.hasRecord&&this.notifyPropertyChange("id")}didError(e){this.error=e,this.isError=!0,this.hasRecord&&this._record.setProperties({isError:!0,adapterError:e})}didCleanError(){this.error=null,this.isError=!1,this.hasRecord&&this._record.setProperties({isError:!1,adapterError:null})}adapterDidCommit(e){this.didCleanError()
-var t=this._recordData.didCommit(e)
-this.send("didCommit"),this.updateRecordArrays(),e&&this._record._notifyProperties(t)}addErrorMessageToAttribute(e,t){i.get(this.getRecord(),"errors")._add(e,t)}removeErrorMessageFromAttribute(e){i.get(this.getRecord(),"errors")._remove(e)}clearErrorMessages(){i.get(this.getRecord(),"errors")._clear()}hasErrors(){return i.get(this.getRecord(),"errors").get("length")>0}adapterDidInvalidate(e,t){var r
-for(r in e)it.call(e,r)&&this.addErrorMessageToAttribute(r,e[r])
-this.send("becameInvalid"),this._recordData.commitWasRejected()}notifyErrorsChange(){var e
-this._recordData.getErrors&&(e=this._recordData.getErrors(this.identifier)||[],this.notifyInvalidErrorsChange(e))}notifyInvalidErrorsChange(e){this.getRecord().invalidErrorsChanged(e)}adapterDidError(e){this.send("becameError"),this.didError(e),this._recordData.commitWasRejected()}toString(){return`<${this.modelName}:${this.id}>`}referenceFor(e,t){var r=this.references[t]
-if(!r){var n=Ze(this,t),i=n.relationshipMeta.kind,o=this.identifier
-"belongsTo"===i?r=new Ue(this.store,o,n,t):"hasMany"===i&&(r=new Be(this.store,o,n,t)),this.references[t]=r}return r}}function dt(e,t,r,n,i){if(delete e._relationshipPromisesCache[t],r.setShouldForceReload(!1),i){r.setHasFailedLoadAttempt(!0)
-var o=e._relationshipProxyCache[t]
-throw o&&"belongsTo"===r.kind&&o.content&&o.content.isDestroying&&o.set("content",null),i}return r.setHasFailedLoadAttempt(!1),r.setRelationshipIsStale(!1),n}function ht(e){return e.map(pt)}function pt(e){if(!e)return null
-if(e.then){var t=e.get&&e.get("content")
-return t?ie(t):null}return ie(e)}Object.defineProperty(ct.prototype,"_recordArrays",{get(){return xe(this.identifier)}})
-var ft=new WeakMap
-class mt{constructor(e,t){this.__store=e,this.modelName=t}get fields(){var e=this.__store._attributesDefinitionFor(this.modelName),t=this.__store._relationshipsDefinitionFor(this.modelName),r=new Map
-return Object.keys(e).forEach((e=>r.set(e,"attribute"))),Object.keys(t).forEach((e=>r.set(e,t[e].kind))),r}get attributes(){var e=this.__store._attributesDefinitionFor(this.modelName)
-return new Map(Object.entries(e))}get relationshipsByName(){var e=this.__store._relationshipsDefinitionFor(this.modelName)
-return new Map(Object.entries(e))}eachAttribute(e,t){var r=this.__store._attributesDefinitionFor(this.modelName)
-Object.keys(r).forEach((n=>{e.call(t,n,r[n])}))}eachRelationship(e,t){var r=this.__store._relationshipsDefinitionFor(this.modelName)
-Object.keys(r).forEach((n=>{e.call(t,n,r[n])}))}eachTransformedAttribute(e,t){var r=this.__store._relationshipsDefinitionFor(this.modelName)
-Object.keys(r).forEach((n=>{r[n].type&&e.call(t,n,r[n])}))}}function gt(e,t,r,n,i,o){var s=a.A(i.map((e=>e.createSnapshot(o.get(e))))),l=t.modelFor(r),u=e.findMany(t,l,n,s),c=`DS: Handle Adapter#findMany of '${r}'`
-if(void 0===u)throw new Error("adapter.findMany returned undefined, this was very likely a mistake")
-return(u=ce(u,t,c)).then((e=>{var n=de(t.serializerFor(r),t,l,e,null,"findMany")
-return t._push(n)}),null,`DS: Extract payload of ${r}`)}function vt(e,t,r,n){var i,s,a=(i=t.data,s=(t,i)=>{var{id:s,type:a}=t
-return function(e,t,r,n,i){var{id:s,type:a}=e
-e.relationships||(e.relationships={})
-var{relationships:l}=e,u=function(e,t,r,n){return function(e,t,r,n){var{_storeWrapper:i}=e,{name:o}=r,{modelName:s}=t,a=i.inverseForRelationship(s,o)
-if(a){var{meta:{kind:l}}=i.relationshipsDefinitionFor(n)[a]
-return{inverseKey:a,kind:l}}}(e,t,r,n)}(r,t,n,a)
-if(u){var{inverseKey:c,kind:d}=u,h=l[c]&&l[c].data
-"hasMany"===d&&void 0===h||(l[c]=l[c]||{},l[c].data=function(e,t,r){var n,{id:i,modelName:s}=r,a={id:i,type:s}
-return"hasMany"===t?(n=e||[]).push(a):(n=e||{},o.assign(n,a)),n}(h,d,t))}}(t,r,e,n),{id:s,type:a}},Array.isArray(i)?i.map(s):s(i)),l={id:r.id,type:r.modelName,relationships:{[n.key]:{meta:t.meta,links:t.links,data:a}}}
-return Array.isArray(t.included)||(t.included=[]),t.included.push(l),t}function bt(e,t,r,n){var i=t.modelFor(r),o=t.peekAll(r),s=o._createSnapshot(n),a=p.Promise.resolve().then((()=>e.findAll(t,i,null,s)))
-return(a=ce(a,t,"DS: Handle Adapter#findAll of "+i)).then((e=>{var n=de(t.serializerFor(r),t,i,e,null,"findAll")
-return t._push(n),t._didUpdateAll(r),o}),null,"DS: Extract payload of findAll ${modelName}")}var yt,_t=E("DEBUG-ts-brand")
-function wt(e){return e}class Ot{constructor(e){this[_t]=void 0,this._willUpdateManyArrays=void 0,this._pendingManyArrayUpdates=void 0,this._store=e,this._willUpdateManyArrays=!1,this._pendingManyArrayUpdates=[]}get identifierCache(){return B(this._store)}_hasModelFor(e){return this._store._hasModelFor(e)}_scheduleManyArrayUpdate(e,t){if((this._pendingManyArrayUpdates=this._pendingManyArrayUpdates||[]).push(e,t),!0!==this._willUpdateManyArrays){this._willUpdateManyArrays=!0
-var r=this._store._backburner
-r.join((()=>{r.schedule("syncRelationships",this,this._flushPendingManyArrayUpdates)}))}}notifyErrorsChange(e,t,r){var n=V(e,t,r),i=B(this._store).getOrCreateRecordIdentifier(n),o=be(this._store).peek(i)
-o&&o.notifyErrorsChange()}_flushPendingManyArrayUpdates(){if(!1!==this._willUpdateManyArrays){var e=this._pendingManyArrayUpdates
-this._pendingManyArrayUpdates=[],this._willUpdateManyArrays=!1
-for(var t=be(this._store),r=0;r<e.length;r+=2){var n=e[r],i=e[r+1],o=t.peek(n)
-o&&o.notifyHasManyChange(i)}}}attributesDefinitionFor(e){return this._store._attributesDefinitionFor(e)}relationshipsDefinitionFor(e){return this._store._relationshipsDefinitionFor(e)}inverseForRelationship(e,t){var r=this._store.modelFor(e)
-return this.relationshipsDefinitionFor(e)[t]._inverseKey(this._store,r)}inverseIsAsyncForRelationship(e,t){var r=this._store.modelFor(e)
-return this.relationshipsDefinitionFor(e)[t]._inverseIsAsync(this._store,r)}notifyPropertyChange(e,t,r,n){var i=V(e,t,r),o=B(this._store).getOrCreateRecordIdentifier(i),s=be(this._store).peek(o)
-s&&s.notifyPropertyChange(n)}notifyHasManyChange(e,t,r,n){var i=V(e,t,r),o=B(this._store).getOrCreateRecordIdentifier(i)
-this._scheduleManyArrayUpdate(o,n)}notifyBelongsToChange(e,t,r,n){var i=V(e,t,r),o=B(this._store).getOrCreateRecordIdentifier(i),s=be(this._store).peek(o)
-s&&s.notifyBelongsToChange(n)}notifyStateChange(e,t,r,n){var i=V(e,t,r),o=B(this._store).getOrCreateRecordIdentifier(i),s=be(this._store).peek(o)
-s&&s.notifyStateChange(n)}recordDataFor(e,t,r){var n,i=!1
-if(t||r){var o=V(e,t,r)
-n=B(this._store).getOrCreateRecordIdentifier(o)}else i=!0,n={type:e}
-return this._store.recordDataFor(n,i)}setRecordId(e,t,r){this._store.setRecordId(e,t,r)}isRecordInUse(e,t,r){var n=V(e,t,r),i=B(this._store).getOrCreateRecordIdentifier(n),o=be(this._store).peek(i)
-return!!o&&o.isRecordInUse()}disconnectRecord(e,t,r){var n=V(e,t,r),i=B(this._store).getOrCreateRecordIdentifier(n),o=be(this._store).peek(i)
-o&&o.destroyFromRecordData()}}var xt,Pt,St=new WeakMap
-class Tt extends u{constructor(){super(...arguments),this._backburner=Z,this.recordArrayManager=new ke({store:this}),this._notificationManager=void 0,this._adapterCache=Object.create(null),this._serializerCache=Object.create(null),this._storeWrapper=new Ot(this),this._pendingSave=[],this._updatedRelationships=[],this._updatedInternalModels=[],this._pendingFetch=new Map,this._fetchManager=void 0,this._schemaDefinitionService=void 0,this._trackedAsyncRequests=void 0,this.shouldAssertMethodCallsOnDestroyedStore=!1,this.shouldTrackAsyncRequests=!1,this.generateStackTracesForTrackedRequests=!1,this._trackAsyncRequestStart=void 0,this._trackAsyncRequestEnd=void 0,this.__asyncWaiter=void 0}getRequestStateService(){}get identifierCache(){return B(this)}_instantiateRecord(e,t,r,n,i){}_internalDeleteRecord(e){e.deleteRecord()}_attributesDefinitionFor(e,t){return t?this.getSchemaDefinitionService().attributesDefinitionFor(t):this.getSchemaDefinitionService().attributesDefinitionFor(e)}_relationshipsDefinitionFor(e,t){return t?this.getSchemaDefinitionService().relationshipsDefinitionFor(t):this.getSchemaDefinitionService().relationshipsDefinitionFor(e)}registerSchemaDefinitionService(e){this._schemaDefinitionService=e}getSchemaDefinitionService(){}_relationshipMetaFor(e,t,r){return this._relationshipsDefinitionFor(e)[r]}modelFor(e){return function(e,t){var r=ft.get(e)
-void 0===r&&(r=Object.create(null),ft.set(e,r))
-var n=r[t]
-return void 0===n&&(n=r[t]=new mt(e,t)),n}(this,e)}_hasModelFor(e){return this.getSchemaDefinitionService().doesTypeExist(e)}createRecord(e,t){return l._backburner.join((()=>this._backburner.join((()=>{var r=T(e),n=o.assign({},t)
-s.isNone(n.id)&&(n.id=this._generateId(r,n)),n.id=P(n.id)
-var i=be(this).build({type:r,id:n.id})
-return i.loadedData(),i.didCreateRecord(),i.getRecord(n)}))))}_generateId(e,t){var r=this.adapterFor(e)
-return r&&r.generateIdForRecord?r.generateIdForRecord(this,e,t):null}deleteRecord(e){e.deleteRecord()}unloadRecord(e){e.unloadRecord()}find(e,t,r){return this.findRecord(e,t)}findRecord(e,t,r){var n=T(e),i=S(t),o=V(n,i),s=be(this).lookup(o)
-return r=r||{},this.hasRecordForId(n,i)?J(this._findRecord(s,r),`DS: Store#findRecord ${n} with id: ${t}`):this._findByInternalModel(s,r)}_findRecord(e,t){if(t.reload)return this._scheduleFetch(e,t)
-var r=e.createSnapshot(t),n=this.adapterFor(e.modelName)
-return void 0===t.reload&&n.shouldReloadRecord&&n.shouldReloadRecord(this,r)?this._scheduleFetch(e,t):(!1===t.backgroundReload||(t.backgroundReload||!n.shouldBackgroundReloadRecord||n.shouldBackgroundReloadRecord(this,r))&&this._scheduleFetch(e,t),p.Promise.resolve(e))}_findByInternalModel(e,t){return void 0===t&&(t={}),t.preload&&e.preloadData(t.preload),J(this._findEmptyInternalModel(e,t),`DS: Store#findRecord ${e.modelName} with id: ${e.id}`)}_findEmptyInternalModel(e,t){return e.isEmpty()?this._scheduleFetch(e,t):e.isLoading()?e._promiseProxy:p.Promise.resolve(e)}findByIds(e,t){for(var r=new Array(t.length),n=T(e),i=0;i<t.length;i++)r[i]=this.findRecord(n,t[i])
-return Q(p.all(r).then(a.A,null,`DS: Store#findByIds of ${n} complete`))}_fetchRecord(e,t){var r=e.modelName
-return function(e,t,r,n,i,o){var s=i.createSnapshot(o),{modelName:a}=i,l=p.Promise.resolve().then((()=>e.findRecord(t,r,n,s))),u=`DS: Handle Adapter#findRecord of '${a}' with id: '${n}'`,{identifier:c}=i
-return(l=ce(l,t,u)).then((e=>{var i=de(t.serializerFor(a),t,r,e,n,"findRecord")
-return i.data.lid=c.lid,t._push(i)}),(e=>{throw i.notFound(),i.isEmpty()&&i.unloadRecord(),e}),`DS: Extract payload of '${a}'`)}(this.adapterFor(r),this,e.type,e.id,e,t)}_scheduleFetchMany(e,t){for(var r=new Array(e.length),n=0;n<e.length;n++)r[n]=this._scheduleFetch(e[n],t)
-return p.Promise.all(r)}_scheduleFetchThroughFetchManager(e,t){void 0===t&&(t={})
-var r=this.generateStackTracesForTrackedRequests
-e.loadingData()
-var n=e.identifier
-return function(e){e.id}(n),this._fetchManager.scheduleFetch(n,t,r).then((t=>{t.data&&!Array.isArray(t.data)&&(t.data.lid=n.lid)
-var r=this._push(t)
-return r&&!Array.isArray(r)?r:e}),(t=>{throw e.notFound(),e.isEmpty()&&e.unloadRecord(),t}))}_scheduleFetch(e,t){if(e._promiseProxy)return e._promiseProxy
-var{id:r,modelName:n}=e,i=p.defer(`Fetching ${n}' with id: ${r}`),o={internalModel:e,resolver:i,options:t},s=i.promise
-e.loadingData(s),0===this._pendingFetch.size&&l._backburner.schedule("actions",this,this.flushAllPendingFetches)
-var a=this._pendingFetch,u=a.get(n)
-return void 0===u&&(u=[],a.set(n,u)),u.push(o),s}flushAllPendingFetches(){this.isDestroyed||this.isDestroying||(this._pendingFetch.forEach(this._flushPendingFetchForType,this),this._pendingFetch.clear())}_flushPendingFetchForType(e,t){for(var r=this,n=r.adapterFor(t),i=!!n.findMany&&n.coalesceFindRequests,o=e.length,s=new Array(o),a=Object.create(null),l=new WeakMap,u=0;u<o;u++){var c=e[u],d=c.internalModel
-s[u]=d,l.set(d,c.options),a[d.id]=c}function h(e){var t=r._fetchRecord(e.internalModel,e.options)
-e.resolver.resolve(t)}function p(e,t){for(var r=Object.create(null),n=0,i=e.length;n<i;n++){var o=e[n],s=a[o.id]
-if(r[o.id]=o,s)s.resolver.resolve(o)}for(var l=[],u=0,c=t.length;u<c;u++){var d=t[u]
-r[d.id]||l.push(d)}l.length&&f(l)}function f(e,t){for(var r=0,n=e.length;r<n;r++){var i=e[r],o=a[i.id]
-o&&o.resolver.reject(t||new Error(`Expected: '${i}' to be present in the adapter provided payload, but it was not found.`))}}if(i){for(var m,g=new Array(o),v=0;v<o;v++)g[v]=s[v].createSnapshot(l.get(S))
-for(var b=0,y=(m=n.groupRecordsForFindMany?n.groupRecordsForFindMany(this,g):[g]).length;b<y;b++){for(var _=m[b],w=m[b].length,O=new Array(w),x=new Array(w),P=0;P<w;P++){var S=_[P]._internalModel
-x[P]=S,O[P]=S.id}if(w>1)(function(e){gt(n,r,t,O,e,l).then((function(t){p(t,e)})).catch((function(t){f(e,t)}))})(x)
-else if(1===O.length){h(a[x[0].id])}}}else for(var T=0;T<o;T++)h(e[T])}getReference(e,t){var r=V(T(e),S(t)),n=B(this).getOrCreateRecordIdentifier(r)
-if(n){if(St.has(n))return St.get(n)
-var i=new He(this,n)
-return St.set(n,i),i}}peekRecord(e,t){var r=T(e),n=S(t)
-if(this.hasRecordForId(r,n)){var i=V(r,n)
-return be(this).lookup(i).getRecord()}return null}_reloadRecord(e,t){var{id:r,modelName:n}=e
-this.adapterFor(n)
-return this._scheduleFetch(e,t)}hasRecordForId(e,t){var r={type:T(e),id:S(t)},n=B(this).peekRecordIdentifier(r),i=n&&be(this).peek(n)
-return!!i&&i.isLoaded()}recordForId(e,t){var r=V(e,S(t))
-return be(this).lookup(r).getRecord()}findMany(e,t){for(var r=new Array(e.length),n=0;n<e.length;n++)r[n]=this._findEmptyInternalModel(e[n],t)
-return p.Promise.all(r)}findHasMany(e,t,r,n){return function(e,t,r,n,i,o){var s=r.createSnapshot(o),a=t.modelFor(i.type),l=n&&"string"!=typeof n?n.href:n,u=e.findHasMany(t,s,l,i),c=`DS: Handle Adapter#findHasMany of '${r.modelName}' : '${i.type}'`
-return(u=le(u=ce(u,t,c),ae(ue,r))).then((e=>{var n=de(t.serializerFor(i.type),t,a,e,null,"findHasMany")
-return n=vt(t,n,r,i),t._push(n)}),null,`DS: Extract payload of '${r.modelName}' : hasMany '${i.type}'`)}(this.adapterFor(e.modelName),this,e,t,r,n)}_findHasManyByJsonApiResource(e,t,r,n){if(!e)return p.resolve([])
-var i=this.adapterFor(r.type),{relationshipIsStale:o,hasDematerializedInverse:s,hasAnyRelationshipData:a,relationshipIsEmpty:l,shouldForceReload:u}=e._relationship,c=Ct(this,e)
-if(e.links&&e.links.related&&("function"==typeof i.findHasMany||void 0===e.data)&&(u||s||o||!c&&!l))return this.findHasMany(t,e.links.related,r,n)
-var d=a&&!l,h=s||l&&Array.isArray(e.data)&&e.data.length>0
-if(!u&&!o&&(d||h)){var f=e.data.map((e=>this._internalModelForResource(e)))
-return this.findMany(f,n)}if(a&&!l||h){var m=e.data.map((e=>this._internalModelForResource(e)))
-return this._scheduleFetchMany(m,n)}return p.resolve([])}_getHasManyByJsonApiResource(e){var t=[]
-return e&&e.data&&(t=e.data.map((e=>this._internalModelForResource(e)))),t}findBelongsTo(e,t,r,n){return function(e,t,r,n,i,o){var s=r.createSnapshot(o),a=t.modelFor(i.type),l=n&&"string"!=typeof n?n.href:n,u=e.findBelongsTo(t,s,l,i),c=`DS: Handle Adapter#findBelongsTo of ${r.modelName} : ${i.type}`
-return(u=le(u=ce(u,t,c),ae(ue,r))).then((e=>{var n=de(t.serializerFor(i.type),t,a,e,null,"findBelongsTo")
-return n.data?(n=vt(t,n,r,i),t._push(n)):null}),null,`DS: Extract payload of ${r.modelName} : ${i.type}`)}(this.adapterFor(e.modelName),this,e,t,r,n)}_fetchBelongsToLinkFromResource(e,t,r,n){return e&&e.links&&e.links.related?this.findBelongsTo(t,e.links.related,r,n).then((e=>e?e.getRecord():null)):p.resolve(null)}_findBelongsToByJsonApiResource(e,t,r,n){if(!e)return p.resolve(null)
-var i=e.data?this._internalModelForResource(e.data):null,{relationshipIsStale:o,hasDematerializedInverse:s,hasAnyRelationshipData:a,relationshipIsEmpty:l,shouldForceReload:u}=e._relationship,c=Ct(this,e),d=e.links&&e.links.related&&(u||s||o||!c&&!l)
-if(i&&i.isLoading())return i._promiseProxy.then((()=>i.getRecord()))
-if(d)return this._fetchBelongsToLinkFromResource(e,t,r,n)
-var h=a&&c&&!l,f=s||l&&e.data,m=void 0===e.data||null===e.data
-if(!u&&!o&&(h||f))return m?p.resolve(null):this._findByInternalModel(i,n)
-var g=!m&&null===e.data.id
-return i&&g?p.resolve(i.getRecord()):i&&!m?this._scheduleFetch(i,n).then((()=>i.getRecord())):p.resolve(null)}query(e,t,r){var n={}
-r&&r.adapterOptions&&(n.adapterOptions=r.adapterOptions)
-var i=T(e)
-return this._query(i,t,null,n)}_query(e,t,r,n){return Q(function(e,t,r,n,i,o){var s=t.modelFor(r)
-i=i||t.recordArrayManager.createAdapterPopulatedRecordArray(r,n)
-var a=p.Promise.resolve().then((()=>e.query(t,s,n,i,o)))
-return(a=ce(a,t,`DS: Handle Adapter#query of ${r}`)).then((e=>{var o=de(t.serializerFor(r),t,s,e,null,"query"),a=t._push(o).map((e=>e.identifier))
-return i?i._setIdentifiers(a,o):i=t.recordArrayManager.createAdapterPopulatedRecordArray(r,n,a,o),i}),null,`DS: Extract payload of query ${r}`)}(this.adapterFor(e),this,e,t,r,n))}queryRecord(e,t,r){var n=T(e),i=this.adapterFor(n),o={}
-return r&&r.adapterOptions&&(o.adapterOptions=r.adapterOptions),Y(function(e,t,r,n,i){var o=t.modelFor(r),s=p.Promise.resolve().then((()=>e.queryRecord(t,o,n,i)))
-return(s=ce(s,t,`DS: Handle Adapter#queryRecord of ${r}`)).then((e=>{var n=de(t.serializerFor(r),t,o,e,null,"queryRecord")
-return t._push(n)}),null,`DS: Extract payload of queryRecord ${r}`)}(i,this,n,t,o).then((e=>e?e.getRecord():null)))}findAll(e,t){var r=T(e)
-return this._fetchAll(r,this.peekAll(r),t)}_fetchAll(e,t,r){void 0===r&&(r={})
-var n=this.adapterFor(e)
-if(r.reload)return i.set(t,"isUpdating",!0),Q(bt(n,this,e,r))
-var o=t._createSnapshot(r)
-return!1!==r.reload&&(n.shouldReloadAll&&n.shouldReloadAll(this,o)||!n.shouldReloadAll&&0===o.length)?(i.set(t,"isUpdating",!0),Q(bt(n,this,e,r))):(!1===r.backgroundReload||(r.backgroundReload||!n.shouldBackgroundReloadAll||n.shouldBackgroundReloadAll(this,o))&&(i.set(t,"isUpdating",!0),bt(n,this,e,r)),Q(p.Promise.resolve(t)))}_didUpdateAll(e){this.recordArrayManager._didUpdateAll(e)}peekAll(e){var t=T(e)
-return this.recordArrayManager.liveRecordArrayFor(t)}unloadAll(e){var t=be(this)
-if(void 0===e)t.clear()
-else{var r=T(e)
-t.clear(r)}}filter(){}scheduleSave(e,t,r){var n=e.createSnapshot(r)
-if(e._isRecordFullyDeleted())return t.resolve(),t.promise
-e.adapterWillCommit(),this._pendingSave.push({snapshot:n,resolver:t}),l._backburner.scheduleOnce("actions",this,this.flushPendingSave)}flushPendingSave(){var e=this._pendingSave.slice()
-this._pendingSave=[]
-for(var t=0,r=e.length;t<r;t++){var n=e[t],i=n.snapshot,o=n.resolver,s=i._internalModel,a=this.adapterFor(s.modelName),l=void 0
-"root.deleted.saved"!==s.currentState.stateName?(l=s.isNew()?"createRecord":s.isDeleted()?"deleteRecord":"updateRecord",o.resolve(Et(a,this,l,i))):o.resolve()}}didSaveRecord(e,t,r){var n
-t&&(n=t.data)
-var i=B(this),o=e.identifier
-"deleteRecord"!==r&&n&&i.updateRecordIdentifier(o,n),e.adapterDidCommit(n)}recordWasInvalid(e,t,r){e.adapterDidInvalidate(t)}recordWasError(e,t){e.adapterDidError(t)}setRecordId(e,t,r){be(this).setRecordId(e,t,r)}_load(e){var t=V(T(e.type),S(e.id),P(e.lid)),r=be(this).lookup(t,e),n="root.loading"===r.currentState.stateName,i=!1===r.currentState.isEmpty&&!n,o=r.identifier
-if(i||n){var s=B(this).updateRecordIdentifier(o,e)
-s!==o&&(o=s,r=be(this).lookup(o))}return r.setupData(e),i||this.recordArrayManager.recordDidChange(o),r}push(e){var t=this._push(e)
-return Array.isArray(t)?t.map((e=>e.getRecord())):null===t?null:t.getRecord()}_push(e){var t=this._backburner.join((()=>{var t,r,n=e.included
-if(n)for(t=0,r=n.length;t<r;t++)this._pushInternalModel(n[t])
-if(Array.isArray(e.data)){r=e.data.length
-var i=new Array(r)
-for(t=0;t<r;t++)i[t]=this._pushInternalModel(e.data[t])
-return i}return null===e.data?null:this._pushInternalModel(e.data)}))
-return t}_pushInternalModel(e){e.type
-return this._load(e)}pushPayload(e,t){var r,n
-if(t){n=t
-var i=T(e)
-r=this.serializerFor(i)}else n=e,r=this.serializerFor("application")
-r.pushPayload(this,n)}reloadManyArray(e,t,r,n){return t.reloadHasMany(r,n)}reloadBelongsTo(e,t,r,n){return t.reloadBelongsTo(r,n)}_internalModelForResource(e){return be(this).getByResource(e)}_internalModelForId(e,t,r){var n=V(e,t,r)
-return be(this).lookup(n)}serializeRecord(e,t){}saveRecord(e,t){}relationshipReferenceFor(e,t){}_createRecordData(e){return this.createRecordDataFor(e.type,e.id,e.lid,this._storeWrapper)}createRecordDataFor(e,t,r,n){void 0===yt&&(yt=h("@ember-data/record-data/-private").RecordData)
-var i=B(this).getOrCreateRecordIdentifier({type:e,id:t,lid:r})
-return new yt(i,n)}__recordDataFor(e){var t=B(this).getOrCreateRecordIdentifier(e)
-return this.recordDataFor(t,!1)}recordDataFor(e,t){var r
-return!0===t?((r=be(this).build({type:e.type,id:null})).loadedData(),r.didCreateRecord()):r=be(this).lookup(e),ie(r)}normalize(e,t){var r=T(e),n=this.serializerFor(r),i=this.modelFor(r)
-return n.normalize(i,t)}newClientId(){}_internalModelsFor(e){return be(this).modelMapFor(e)}adapterFor(e){var r=T(e),{_adapterCache:n}=this,o=n[r]
-if(o)return o
-var s=t.getOwner(this)
-if(void 0!==(o=s.lookup(`adapter:${r}`)))return i.set(o,"store",this),n[r]=o,o
-if(void 0!==(o=n.application||s.lookup("adapter:application")))return i.set(o,"store",this),n[r]=o,n.application=o,o
-var a=this.adapter||"-json-api"
-return void 0!==(o=a?n[a]||s.lookup(`adapter:${a}`):void 0)?(i.set(o,"store",this),n[r]=o,n[a]=o,o):(o=n["-json-api"]||s.lookup("adapter:-json-api"),i.set(o,"store",this),n[r]=o,n["-json-api"]=o,o)}serializerFor(e){var r=T(e),{_serializerCache:n}=this,o=n[r]
-if(o)return o
-var s,a=t.getOwner(this)
-if(void 0!==(o=a.lookup(`serializer:${r}`)))return i.set(o,"store",this),n[r]=o,o
-if(void 0!==(o=n.application||a.lookup("serializer:application")))return i.set(o,"store",this),n[r]=o,n.application=o,o
-var l=this.adapterFor(e)
-return void 0!==(o=(s=i.get(l,"defaultSerializer"))?n[s]||a.lookup(`serializer:${s}`):void 0)?(i.set(o,"store",this),n[r]=o,n[s]=o,o):(o=n["-default"]||a.lookup("serializer:-default"),i.set(o,"store",this),n[r]=o,n["-default"]=o,o)}destroy(){for(var e in this._adapterCache){var t=this._adapterCache[e]
-"function"==typeof t.destroy&&t.destroy()}for(var r in this._serializerCache){var n=this._serializerCache[r]
-"function"==typeof n.destroy&&n.destroy()}return super.destroy()}willDestroy(){super.willDestroy(),this.recordArrayManager.destroy(),B(this).destroy(),this.unloadAll()}_updateRelationshipState(e){1===this._updatedRelationships.push(e)&&this._backburner.join((()=>{this._backburner.schedule("syncRelationships",this,this._flushUpdatedRelationships)}))}_flushUpdatedRelationships(){for(var e=this._updatedRelationships,t=0,r=e.length;t<r;t++)e[t].flushCanonical()
-e.length=0}_updateInternalModel(e){1===this._updatedInternalModels.push(e)&&l._backburner.schedule("actions",this,this._flushUpdatedInternalModels)}_flushUpdatedInternalModels(){for(var e=this._updatedInternalModels,t=0,r=e.length;t<r;t++)e[t]._triggerDeferredTriggers()
-e.length=0}}function Et(e,t,r,n){var i=n._internalModel,o=n.modelName,s=t.modelFor(o),a=p.Promise.resolve().then((()=>e[r](t,s,n))),l=t.serializerFor(o),u=`DS: Extract and notify about ${r} completion of ${i}`
-return(a=le(a=ce(a,t,u),ae(ue,i))).then((e=>(t._backburner.join((()=>{var o,a,u
-e&&((o=de(l,t,s,e,n.id,r)).included&&(u=o.included),a=o.data),t.didSaveRecord(i,{data:a},r),u&&t._push({data:null,included:u})})),i)),(function(e){var r
-e&&!0===e.isAdapterError&&"InvalidError"===e.code?(r="function"==typeof l.extractErrors?l.extractErrors(t,s,e,n.id):ne(e.errors),t.recordWasInvalid(i,r,e)):t.recordWasError(i,e)
-throw e}),u)}function Ct(e,t){var r=B(e)
-return Array.isArray(t.data)?!t.data.reduce(((t,n)=>t||kt(e,r,n).isEmpty()),!1):!t.data||!kt(e,r,t.data).isEmpty()}function kt(e,t,r){var n=t.getOrCreateRecordIdentifier(r)
-return e._internalModelForResource(n)}function Mt(e,r,n){var i=r[n]
-if(!i){if(i=function(e,r){return t.getOwner(e).factoryFor(`model:${r}`)}(e,n),i||(i=xt(e,n)),!i)return null
-var o=i.class
-if(o.isModel)o.modelName&&Object.prototype.hasOwnProperty.call(o,"modelName")||Object.defineProperty(o,"modelName",{value:n})
-r[n]=i}return i}i.defineProperty(Tt.prototype,"defaultAdapter",i.computed("adapter",(function(){var e=this.adapter||"-json-api"
-return this.adapterFor(e)}))),xt=function(){return Pt||(Pt=h("@ember-data/model/-private")._modelForMixin),Pt(...arguments)}
-function At(e){var t
-return t=T(t=e.type||e.key),"hasMany"===e.kind&&(t=O.singularize(t)),t}class Rt{constructor(e){this[_t]=void 0,this._type="",this.__inverseKey="",this.__inverseIsAsync=!0,this.__hasCalculatedInverse=!1,this.parentModelName=void 0,this.inverse=void 0,this.inverseIsAsync=void 0,this.meta=e,this.parentModelName=e.parentModelName}get key(){return this.meta.key}get kind(){return this.meta.kind}get type(){return this._type||(this._type=At(this.meta)),this._type}get options(){return this.meta.options}get name(){return this.meta.name}_inverseKey(e,t){return!1===this.__hasCalculatedInverse&&this._calculateInverse(e,t),this.__inverseKey}_inverseIsAsync(e,t){return!1===this.__hasCalculatedInverse&&this._calculateInverse(e,t),this.__inverseIsAsync}_calculateInverse(e,t){var r,n
-this.__hasCalculatedInverse=!0
-var i,o,s,a,l=null
-i=this.meta,(o=i.options)&&null===o.inverse||(l=t.inverseFor(this.key,e)),l?(r=l.name,n=void 0===(a=(s=l).options&&s.options.async)||a):(r=null,n=!1),this.__inverseKey=r,this.__inverseIsAsync=n}}e.AdapterPopulatedRecordArray=we,e.DeprecatedEvented=he,e.InternalModel=ct,e.PromiseArray=G,e.PromiseObject=K,e.RecordArray=_e,e.RecordArrayManager=ke,e.RecordDataStoreWrapper=Ot,e.RootState=Xe,e.Snapshot=se,e.SnapshotRecordArray=pe,e.Store=class extends Tt{constructor(){super(...arguments),this._modelFactoryCache=Object.create(null),this._relationshipsDefCache=Object.create(null),this._attributesDefCache=Object.create(null)}instantiateRecord(e,r,n,i){var s=e.type,a=this._internalModelForResource(e),l={store:this,_internalModel:a,currentState:a.currentState,container:null}
-o.assign(l,r),t.setOwner(l,t.getOwner(this)),delete l.container
-var u=this._modelFactoryFor(s).create(l)
-return i.subscribe(e,((e,t)=>function(e,t,r,n){if("attributes"===t)r.eachAttribute((t=>{w.cacheFor(r,t)!==n._internalModelForResource(e)._recordData.getAttr(t)&&r.notifyPropertyChange(t)}))
-else if("relationships"===t)r.eachRelationship(((t,i)=>{var o=n._internalModelForResource(e)
-"belongsTo"===i.kind?r.notifyPropertyChange(t):"hasMany"===i.kind&&(i.options.async&&(r.notifyPropertyChange(t),o.hasManyRemovalCheck(t)),o._manyArrayCache[t]&&o._manyArrayCache[t].retrieveLatest())}))
-else if("errors"===t){var i=n._internalModelForResource(e)._recordData.getErrors(e)
-r.invalidErrorsChanged(i)}else"state"===t?(r.notifyPropertyChange("isNew"),r.notifyPropertyChange("isDeleted")):"identity"===t&&r.notifyPropertyChange("id")}(e,t,u,this))),u}teardownRecord(e){e.destroy()}modelFor(e){var t=this._modelFactoryFor(e),r=t&&t.class?t.class:t
-if(r&&r.isModel)return r
-throw new n(`No model was found for '${e}' and no schema handles the type`)}_modelFactoryFor(e){var t=T(e)
-return Mt(this,this._modelFactoryCache,t)}_hasModelFor(e){var t=T(e)
-return null!==Mt(this,this._modelFactoryCache,t)}_relationshipMetaFor(e,t,r){var n=this.modelFor(e)
-return i.get(n,"relationshipsByName").get(r)}_attributesDefinitionFor(e,t){var r=this._attributesDefCache[e]
-if(void 0===r){var n=this.modelFor(e),o=i.get(n,"attributes")
-r=Object.create(null),o.forEach(((e,t)=>r[t]=e)),this._attributesDefCache[e]=r}return r}_relationshipsDefinitionFor(e,t){var r=this._relationshipsDefCache[e]
-if(void 0===r){var n=this.modelFor(e)
-r=i.get(n,"relationshipsObject")||null,this._relationshipsDefCache[e]=r}return r}getSchemaDefinitionService(){throw"schema service is only available when custom model class feature flag is on"}},e._bind=ae,e._guard=le,e._objectIsAlive=ue,e.addSymbol=function(e,t,r){"string"==typeof t?Object.defineProperty(e,t,{value:r,configurable:!1,enumerable:!1,writable:!1}):e[t]=r},e.coerceId=P,e.diffArray=function(e,t){for(var r=e.length,n=t.length,i=Math.min(r,n),o=null,s=0;s<i;s++)if(e[s]!==t[s]){o=s
-break}null===o&&n!==r&&(o=i)
-var a=0,l=0
-if(null!==o){for(var u=i-o,c=1;c<=i;c++)if(e[r-c]!==t[n-c]){u=c-1
-break}a=n-u-o,l=r-u-o}return{firstChangeIndex:o,addedCount:a,removedCount:l}},e.errorsArrayToHash=ne,e.errorsHashToArray=function(e){var t=[]
-return s.isPresent(e)&&Object.keys(e).forEach((r=>{for(var n=a.makeArray(e[r]),i=0;i<n.length;i++){var o="Invalid Attribute",s=`/data/attributes/${r}`
-r===re&&(o="Invalid Document",s="/data"),t.push({title:o,detail:n[i],source:{pointer:s}})}})),t},e.guardDestroyedStore=ce,e.identifierCacheFor=B,e.normalizeModelName=T,e.recordDataFor=ie,e.recordIdentifierFor=function(e){return ve.get(e)},e.relationshipFromMeta=function(e){return new Rt(e)},e.setIdentifierForgetMethod=function(e){R=e},e.setIdentifierGenerationMethod=function(e){j=e},e.setIdentifierResetMethod=function(e){I=e},e.setIdentifierUpdateMethod=function(e){D=e}
-e.symbol=E,e.typeForRelationshipMeta=At,e.upgradeForInternal=wt,Object.defineProperty(e,"__esModule",{value:!0})}))
-define("@ember-data/store/index",["exports","@ember-data/store/-private"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.Store}}),Object.defineProperty(e,"normalizeModelName",{enumerable:!0,get:function(){return t.normalizeModelName}}),Object.defineProperty(e,"setIdentifierGenerationMethod",{enumerable:!0,get:function(){return t.setIdentifierGenerationMethod}}),Object.defineProperty(e,"setIdentifierUpdateMethod",{enumerable:!0,get:function(){return t.setIdentifierUpdateMethod}}),Object.defineProperty(e,"setIdentifierForgetMethod",{enumerable:!0,get:function(){return t.setIdentifierForgetMethod}}),Object.defineProperty(e,"setIdentifierResetMethod",{enumerable:!0,get:function(){return t.setIdentifierResetMethod}}),Object.defineProperty(e,"recordIdentifierFor",{enumerable:!0,get:function(){return t.recordIdentifierFor}})})),define("@ember-decorators/component/index",["exports","@ember/debug","@ember-decorators/utils/collapse-proto","@ember-decorators/utils/decorator"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.layout=e.tagName=e.attributeBindings=e.classNameBindings=e.classNames=e.className=e.attribute=void 0
-const i=(0,n.decoratorWithParams)((function(e,t,n){let i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:[]
-if((0,r.default)(e),!e.hasOwnProperty("attributeBindings")){let t=e.attributeBindings
-e.attributeBindings=Array.isArray(t)?t.slice():[]}let o=i[0]?`${t}:${i[0]}`:t
-return e.attributeBindings.push(o),n&&(n.configurable=!0),n}))
-e.attribute=i
-const o=(0,n.decoratorWithParams)((function(e,t,n){let i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:[]
-if((0,r.default)(e),!e.hasOwnProperty("classNameBindings")){let t=e.classNameBindings
-e.classNameBindings=Array.isArray(t)?t.slice():[]}let o=i.length>0?`${t}:${i.join(":")}`:t
-return e.classNameBindings.push(o),n&&(n.configurable=!0),n}))
-function s(e){return(0,n.decoratorWithRequiredParams)(((t,n)=>{if((0,r.default)(t.prototype),e in t.prototype){let r=t.prototype[e]
-n.unshift(...r)}return t.prototype[e]=n,t}),e)}e.className=o
-const a=s("classNames")
-e.classNames=a
-const l=s("classNameBindings")
-e.classNameBindings=l
-const u=s("attributeBindings")
-e.attributeBindings=u
-const c=(0,n.decoratorWithRequiredParams)(((e,t)=>{let[r]=t
-return e.prototype.tagName=r,e}),"tagName")
-e.tagName=c
-e.layout=function(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return e=>{let[r]=t
-return e.prototype.layout=r,e}}})),define("@ember-decorators/object/index",["exports","@ember/debug","@ember/object","@ember/object/computed","@ember/object/events","@ember/object/observers","@ember-decorators/utils/decorator"],(function(e,t,r,n,i,o,s){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.off=e.on=e.unobserves=e.observes=void 0
-const a=(0,s.decoratorWithRequiredParams)(((e,t,r,i)=>{for(let s of i)(0,n.expandProperties)(s,(r=>{(0,o.addObserver)(e,r,null,t)}))
-return r}),"observes")
-e.observes=a
-const l=(0,s.decoratorWithRequiredParams)(((e,t,r,i)=>{for(let s of i)(0,n.expandProperties)(s,(r=>{(0,o.removeObserver)(e,r,null,t)}))
-return r}),"unobserves")
-e.unobserves=l
-const u=(0,s.decoratorWithRequiredParams)(((e,t,r,n)=>{for(let o of n)(0,i.addListener)(e,o,null,t)
-return r}),"on")
-e.on=u
-const c=(0,s.decoratorWithRequiredParams)(((e,t,r,n)=>{for(let o of n)(0,i.removeListener)(e,o,null,t)
-return r}),"off")
-e.off=c})),define("@ember-decorators/utils/-private/class-field-descriptor",["exports"],(function(e){"use strict"
-function t(e){let[t,r,n]=e
-return 3===e.length&&"object"==typeof t&&null!==t&&"string"==typeof r&&("object"==typeof n&&null!==n&&"enumerable"in n&&"configurable"in n||void 0===n)}Object.defineProperty(e,"__esModule",{value:!0}),e.isFieldDescriptor=t,e.isDescriptor=function(e){return t(e)||function(e){let[t]=e
-return 1===e.length&&"function"==typeof t&&"prototype"in t&&!t.__isComputedDecorator}(e)}})),define("@ember-decorators/utils/collapse-proto",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){"function"==typeof e.constructor.proto&&e.constructor.proto()}})),define("@ember-decorators/utils/decorator",["exports","@ember/debug","@ember-decorators/utils/-private/class-field-descriptor"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.decoratorWithParams=function(e){return function(){for(var t=arguments.length,n=new Array(t),i=0;i<t;i++)n[i]=arguments[i]
-return(0,r.isDescriptor)(n)?e(...n):function(){for(var t=arguments.length,r=new Array(t),i=0;i<t;i++)r[i]=arguments[i]
-return e(...r,n)}}},e.decoratorWithRequiredParams=function(e,t){return function(){for(var t=arguments.length,r=new Array(t),n=0;n<t;n++)r[n]=arguments[n]
-return function(){for(var t=arguments.length,n=new Array(t),i=0;i<t;i++)n[i]=arguments[i]
-return e(...n,r)}}}})),define("@ember/ordered-set/index",["exports","@ember/object/internals","@ember/debug","ember"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let i
-i=class{constructor(){this.clear()}static create(){return new this}clear(){this.presenceSet=Object.create(null),this.list=[],this.size=0}add(e,r){let n=r||(0,t.guidFor)(e),i=this.presenceSet,o=this.list
-return!0!==i[n]&&(i[n]=!0,this.size=o.push(e)),this}delete(e,r){let n=r||(0,t.guidFor)(e),i=this.presenceSet,o=this.list
-if(!0===i[n]){delete i[n]
-let t=o.indexOf(e)
-return t>-1&&o.splice(t,1),this.size=o.length,!0}return!1}isEmpty(){return 0===this.size}has(e){if(0===this.size)return!1
-let r=(0,t.guidFor)(e)
-return!0===this.presenceSet[r]}forEach(e){if(0===this.size)return
-let t=this.list
-if(2===arguments.length)for(let r=0;r<t.length;r++)e.call(arguments[1],t[r])
-else for(let r=0;r<t.length;r++)e(t[r])}toArray(){return this.list.slice()}copy(){let e=new(0,this.constructor)
-e.presenceSet=Object.create(null)
-for(let t in this.presenceSet)e.presenceSet[t]=this.presenceSet[t]
-return e.list=this.toArray(),e.size=this.size,e}}
-var o=i
-e.default=o})),define("@ember/render-modifiers/modifiers/did-insert",["exports","@ember/modifier"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.setModifierManager)((()=>({capabilities:(0,t.capabilities)("3.13",{disableAutoTracking:!0}),createModifier(){},installModifier(e,t,r){let[n,...i]=r.positional
-n(t,i,r.named)},updateModifier(){},destroyModifier(){}})),class{})
-e.default=r})),define("@ember/render-modifiers/modifiers/did-update",["exports","@ember/modifier"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.setModifierManager)((()=>({capabilities:(0,t.capabilities)("3.13",{disableAutoTracking:!0}),createModifier:()=>({element:null}),installModifier(e,t){e.element=t},updateModifier(e,t){let{element:r}=e,[n,...i]=t.positional
-n(r,i,t.named)},destroyModifier(){}})),class{})
-e.default=r})),define("@ember/render-modifiers/modifiers/will-destroy",["exports","@ember/modifier"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.setModifierManager)((()=>({capabilities:(0,t.capabilities)("3.13",{disableAutoTracking:!0}),createModifier:()=>({element:null}),installModifier(e,t){e.element=t},updateModifier(){},destroyModifier(e,t){let{element:r}=e,[n,...i]=t.positional
-n(r,i,t.named)}})),class{})
-e.default=r})),define("@ember/string/cache",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const t=function(){}
-e.default=class{constructor(e,t,n,i){this.size=0,this.misses=0,this.hits=0,this.limit=e,this.func=t,this.key=n,this.store=i||new r}get(e){let r=void 0===this.key?e:this.key(e),n=this.store.get(r)
-return void 0===n?(this.misses++,n=this._set(r,this.func(e))):n===t?(this.hits++,n=void 0):this.hits++,n}set(e,t){let r=void 0===this.key?e:this.key(e)
-return this._set(r,t)}_set(e,r){return this.limit>this.size&&(this.size++,void 0===r?this.store.set(e,t):this.store.set(e,r)),r}purge(){this.store.clear(),this.size=0,this.hits=0,this.misses=0}}
-class r{constructor(){this.data=Object.create(null)}get(e){return this.data[e]}set(e,t){this.data[e]=t}clear(){this.data=Object.create(null)}}})),define("@ember/string/helpers/loc",["exports","@ember/component/helper","@ember/string"],(function(e,t,r){"use strict"
-function n(e){return(0,r.loc)(...e)}Object.defineProperty(e,"__esModule",{value:!0}),e.loc=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("@ember/string/index",["exports","@ember/string/cache","@ember/debug"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.setStrings=function(e){n=e},e.getStrings=function(){return n},e.getString=function(e){return n[e]},e.loc=function(e,t){(!Array.isArray(t)||arguments.length>2)&&(t=Array.prototype.slice.call(arguments,1))
-return _(e=n[e]||e,t)},e.w=function(e){return e.split(/\s+/)},e.decamelize=w,e.dasherize=function(e){return o.get(e)},e.camelize=function(e){return l.get(e)},e.classify=function(e){return h.get(e)},e.underscore=function(e){return m.get(e)},e.capitalize=function(e){return v.get(e)}
-let n={}
-const i=/[ _]/g,o=new t.default(1e3,(e=>w(e).replace(i,"-"))),s=/(-|_|\.|\s)+(.)?/g,a=/(^|\/)([A-Z])/g,l=new t.default(1e3,(e=>e.replace(s,((e,t,r)=>r?r.toUpperCase():"")).replace(a,(e=>e.toLowerCase())))),u=/^(-|_)+(.)?/,c=/(.)(-|_|\.|\s)+(.)?/g,d=/(^|\/|\.)([a-z])/g,h=new t.default(1e3,(e=>{let t=(e,t,r)=>r?`_${r.toUpperCase()}`:"",r=(e,t,r,n)=>t+(n?n.toUpperCase():""),n=e.split("/")
-for(let i=0;i<n.length;i++)n[i]=n[i].replace(u,t).replace(c,r)
-return n.join("/").replace(d,(e=>e.toUpperCase()))})),p=/([a-z\d])([A-Z]+)/g,f=/-|\s+/g,m=new t.default(1e3,(e=>e.replace(p,"$1_$2").replace(f,"_").toLowerCase())),g=/(^|\/)([a-z\u00C0-\u024F])/g,v=new t.default(1e3,(e=>e.replace(g,(e=>e.toUpperCase())))),b=/([a-z\d])([A-Z])/g,y=new t.default(1e3,(e=>e.replace(b,"$1_$2").toLowerCase()))
-function _(e,t){let r=0
-return e.replace(/%@([0-9]+)?/g,((e,n)=>{let i=n?parseInt(n,10)-1:r++,o=i<t.length?t[i]:void 0
-return"string"==typeof o?o:null===o?"(null)":void 0===o?"":String(o)}))}function w(e){return y.get(e)}})),define("@ember/test-waiters/build-waiter",["exports","@ember/debug","@ember/test-waiters/token","@ember/test-waiters/waiter-manager"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e._resetWaiterNames=function(){i=new Set},e.default=function(e){0
-return new o(e)}
-let i
-class o{constructor(e){this.name=e}beginAsync(){return this}endAsync(){}waitUntil(){return!0}debugInfo(){return[]}reset(){}}})),define("@ember/test-waiters/index",["exports","@ember/test-waiters/waiter-manager","@ember/test-waiters/build-waiter","@ember/test-waiters/wait-for-promise","@ember/test-waiters/wait-for"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"register",{enumerable:!0,get:function(){return t.register}}),Object.defineProperty(e,"unregister",{enumerable:!0,get:function(){return t.unregister}}),Object.defineProperty(e,"getWaiters",{enumerable:!0,get:function(){return t.getWaiters}}),Object.defineProperty(e,"_reset",{enumerable:!0,get:function(){return t._reset}}),Object.defineProperty(e,"getPendingWaiterState",{enumerable:!0,get:function(){return t.getPendingWaiterState}}),Object.defineProperty(e,"hasPendingWaiters",{enumerable:!0,get:function(){return t.hasPendingWaiters}}),Object.defineProperty(e,"buildWaiter",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"_resetWaiterNames",{enumerable:!0,get:function(){return r._resetWaiterNames}}),Object.defineProperty(e,"waitForPromise",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"waitFor",{enumerable:!0,get:function(){return i.default}})})),define("@ember/test-waiters/token",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=class{}})),define("@ember/test-waiters/types/index",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0})})),define("@ember/test-waiters/wait-for-promise",["exports","@ember/test-waiters/build-waiter"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){let r=e
-0
-return r};(0,t.default)("@ember/test-waiters:promise-waiter")})),define("@ember/test-waiters/wait-for",["exports","@ember/test-waiters/wait-for-promise","@ember/test-waiters/build-waiter"],(function(e,t,r){"use strict"
-function n(e,t){return e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-let i=t.length<3
-if(i){let[e,r]=t
-return n(e,r)}{let[,,e,r]=t
-return e}};(0,r.default)("@ember/test-waiters:generator-waiter")})),define("@ember/test-waiters/waiter-manager",["exports","ember","@ember/test"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.register=function(e){n.set(e.name,e)},e.unregister=function(e){n.delete(e.name)},e.getWaiters=o,e._reset=function(){for(let e of o())e.isRegistered=!1
-n.clear()},e.getPendingWaiterState=s,e.hasPendingWaiters=a
-const n=function(){let e="TEST_WAITERS",t="undefined"!=typeof Symbol?Symbol.for(e):e,r=i(),n=r[t]
-return void 0===n&&(n=r[t]=new Map),n}()
-function i(){if("undefined"!=typeof globalThis)return globalThis
-if("undefined"!=typeof self)return self
-if("undefined"!=typeof window)return window
-if("undefined"!=typeof global)return global
-throw new Error("unable to locate global object")}function o(){let e=[]
-return n.forEach((t=>{e.push(t)})),e}function s(){let e={pending:0,waiters:{}}
-return n.forEach((t=>{if(!t.waitUntil()){e.pending++
-let r=t.debugInfo()
-e.waiters[t.name]=r||!0}})),e}function a(){return s().pending>0}t.default.Test&&(0,r.registerWaiter)((()=>!a()))})),define("@embroider/macros/es-compat",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return null!=e&&e.__esModule?e:{default:e}}})),define("@embroider/macros/runtime",["exports"],(function(e){"use strict"
-function t(e){return n.packages[e]}function r(){return n.global}Object.defineProperty(e,"__esModule",{value:!0}),e.each=function(e){if(!Array.isArray(e))throw new Error("the argument to the each() macro must be an array")
-return e},e.macroCondition=function(e){return e},e.config=t,e.getGlobalConfig=r,e.isTesting=function(){let e=n.global,t=e&&e["@embroider/macros"]
-return Boolean(t&&t.isTesting)}
-const n={packages:{},global:{"@embroider/macros":{isTesting:!1}}}
-let i="undefined"!=typeof window?window._embroider_macros_runtime_config:void 0
-if(i){let e={config:t,getGlobalConfig:r,setConfig(e,t){n.packages[e]=t},setGlobalConfig(e,t){n.global[e]=t}}
-for(let t of i)t(e)}})),define("@embroider/util/ember-private-api",["exports"],(function(e){"use strict"
-let t
-Object.defineProperty(e,"__esModule",{value:!0}),e.lookupCurriedComponentDefinition=function(e,t){let r=function(e){let t=e.lookup("renderer:-dom")._runtimeResolver
-if(t)return t
-let r=Object.entries(e.__container__.cache).find((e=>e[0].startsWith("template-compiler:main-")))
-if(r)return r[1].resolver.resolver
-throw new Error("@embroider/util couldn't locate the runtime resolver on this ember version")}(t)
-if("function"==typeof r.lookupComponentHandle){let i=r.lookupComponentHandle(e,t)
-if(null!=i)return new n(r.resolve(i),null)}if(!r.lookupComponent(e,t))throw new Error(`Attempted to resolve \`${e}\` via ensureSafeComponent, but nothing was found.`)
-return i(0,e,t,{named:{},positional:[]})},e.isCurriedComponentDefinition=void 0,t=require("@glimmer/runtime")
-let{isCurriedComponentDefinition:r,CurriedComponentDefinition:n,curry:i,CurriedValue:o}=t
-e.isCurriedComponentDefinition=r,r||(e.isCurriedComponentDefinition=r=function(e){return e instanceof o})})),define("@embroider/util/index",["exports","@ember/debug","@ember/application","@embroider/util/ember-private-api","@ember/component/helper"],(function(e,t,r,n,i){"use strict"
-function o(e,t){return"string"==typeof e?function(e,t){let i=(0,r.getOwner)(t)
-return(0,n.lookupCurriedComponentDefinition)(e,i)}(e,t):(0,n.isCurriedComponentDefinition)(e)||null==e?e:function(e,t){let i=(0,r.getOwner)(t),o=function(e,t){let r=t.lookup("service:-ensure-registered")
-return r.register(e,t)}(e,i)
-return(0,n.lookupCurriedComponentDefinition)(o,i)}(e,t)}Object.defineProperty(e,"__esModule",{value:!0}),e.ensureSafeComponent=o,e.EnsureSafeComponentHelper=void 0
-class s extends i.default{compute(e){let[t]=e
-return o(t,this)}}e.EnsureSafeComponentHelper=s})),define("@embroider/util/services/ensure-registered",["exports","@ember/service","@ember/application"],(function(e,t,r){"use strict"
-function n(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class i extends t.default{constructor(){super(...arguments),n(this,"classNonces",new WeakMap),n(this,"nonceCounter",0)}register(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:(0,r.getOwner)(this),n=this.classNonces.get(e)
-return null==n&&(n="-ensure"+this.nonceCounter++,this.classNonces.set(e,n),t.register(`component:${n}`,e)),n}}e.default=i})),define("@glimmer/component/-private/base-component-manager",["exports","@glimmer/component/-private/component"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,r){return class{static create(e){return new this(t(e))}constructor(t){(function(e,t,r){t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r})(this,"capabilities",r),e(this,t)}createComponent(e,r){return new e(t(this),r.named)}getContext(e){return e}}}})),define("@glimmer/component/-private/component",["exports","@glimmer/component/-private/owner","@glimmer/component/-private/destroyables"],(function(e,t,r){"use strict"
-let n
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.ARGS_SET=void 0,e.ARGS_SET=n
-e.default=class{constructor(e,r){var n,i,o
-o=void 0,(i="args")in(n=this)?Object.defineProperty(n,i,{value:o,enumerable:!0,configurable:!0,writable:!0}):n[i]=o,this.args=r,(0,t.setOwner)(this,e)}get isDestroying(){return(0,r.isDestroying)(this)}get isDestroyed(){return(0,r.isDestroyed)(this)}willDestroy(){}}})),define("@glimmer/component/-private/destroyables",["exports","ember"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.isDestroyed=e.isDestroying=void 0
-const r=t.default._isDestroying
-e.isDestroying=r
-const n=t.default._isDestroyed
-e.isDestroyed=n})),define("@glimmer/component/-private/ember-component-manager",["exports","ember","@ember/object","@ember/application","@ember/component","@ember/runloop","@glimmer/component/-private/base-component-manager","@glimmer/component/-private/destroyables"],(function(e,t,r,n,i,o,s,a){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const{setDestroyed:l,setDestroying:u}=a,c=(0,i.capabilities)("3.13",{destructor:!0,asyncLifecycleCallbacks:!1,updateHook:!1}),d=t.default.destroy,h=t.default._registerDestructor
-class p extends((0,s.default)(n.setOwner,n.getOwner,c)){createComponent(e,t){const r=super.createComponent(e,t)
-return h(r,(()=>{r.willDestroy()})),r}destroyComponent(e){d(e)}}var f=p
-e.default=f})),define("@glimmer/component/-private/owner",["exports","@ember/application"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"setOwner",{enumerable:!0,get:function(){return t.setOwner}})}))
-define("@glimmer/component/index",["exports","@ember/component","@glimmer/component/-private/ember-component-manager","@glimmer/component/-private/component"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let i=n.default;(0,t.setComponentManager)((e=>new r.default(e)),i)
-var o=i
-e.default=o})),define("@hashicorp/design-system-components/components/hds/alert/description",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"wnsXkUB8",block:'[[[11,0],[24,0,"hds-alert__description"],[17,1],[12],[18,2,null],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/alert/description.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/alert/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@ember/debug","@ember/object/internals","@glimmer/tracking"],(function(e,t,r,n,i,o,s,a){"use strict"
-var l,u,c
-function d(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function h(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.MAPPING_COLORS_TO_ICONS=e.COLORS=e.DEFAULT_COLOR=e.TYPES=void 0
-const p=(0,r.createTemplateFactory)({id:"Lphr8cFh",block:'[[[11,0],[16,0,[30,0,["classNames"]]],[16,"role",[30,0,["role"]]],[24,"aria-live","polite"],[16,"aria-labelledby",[30,0,["ariaLabelledBy"]]],[17,1],[4,[38,0],[[30,0,["didInsert"]]],null],[12],[1,"\\n"],[41,[30,0,["icon"]],[[[1,"    "],[10,0],[14,0,"hds-alert__icon"],[12],[1,"\\n      "],[8,[39,2],null,[["@name","@size","@stretched","@isInlineBlock"],[[30,0,["icon"]],[30,0,["iconSize"]],true,false]],null],[1,"\\n    "],[13],[1,"\\n"]],[]],null],[1,"\\n  "],[10,0],[14,0,"hds-alert__content"],[12],[1,"\\n    "],[10,0],[14,0,"hds-alert__text"],[12],[1,"\\n      "],[18,2,[[28,[37,4],null,[["Title"],[[50,"hds/alert/title",0,null,null]]]]]],[1,"\\n      "],[18,2,[[28,[37,4],null,[["Description"],[[50,"hds/alert/description",0,null,null]]]]]],[1,"\\n    "],[13],[1,"\\n\\n    "],[10,0],[14,0,"hds-alert__actions"],[12],[1,"\\n      "],[18,2,[[28,[37,4],null,[["Button","Link::Standalone"],[[50,"hds/button",0,null,[["size"],["small"]]],[50,"hds/link/standalone",0,null,[["size"],["small"]]]]]]]],[1,"\\n    "],[13],[1,"\\n    "],[18,2,[[28,[37,4],null,[["Generic"],[[50,"hds/yield",0,null,null]]]]]],[1,"\\n  "],[13],[1,"\\n\\n"],[41,[30,0,["onDismiss"]],[[[1,"    "],[8,[39,6],[[24,0,"hds-alert__dismiss"],[4,[38,7],["click",[30,0,["onDismiss"]]],null]],null,null],[1,"\\n"]],[]],null],[13]],["&attrs","&default"],false,["did-insert","if","flight-icon","yield","hash","component","hds/dismiss-button","on"]]',moduleName:"@hashicorp/design-system-components/components/hds/alert/index.hbs",isStrictMode:!1}),f=["page","inline","compact"]
-e.TYPES=f
-const m="neutral"
-e.DEFAULT_COLOR=m
-const g=["neutral","highlight","success","warning","critical"]
-e.COLORS=g
-const v={neutral:"info",highlight:"info",success:"check-circle",warning:"alert-triangle",critical:"alert-diamond"}
-e.MAPPING_COLORS_TO_ICONS=v
-let b=(l=class extends n.default{constructor(){super(...arguments),d(this,"role",u,this),d(this,"ariaLabelledBy",c,this)}get color(){let{color:e=m}=this.args
-return e}get icon(){let{icon:e}=this.args
-return void 0===e?"compact"===this.args.type?`${v[this.color]}-fill`:v[this.color]:!1!==e&&e}get onDismiss(){let{onDismiss:e}=this.args
-return"function"==typeof e&&e}get iconSize(){return"compact"===this.args.type?"16":"24"}get classNames(){let e=["hds-alert"]
-return e.push(`hds-alert--type-${this.args.type}`),e.push(`hds-alert--color-${this.color}`),e.join(" ")}didInsert(e){e.querySelectorAll(".hds-alert__content button, .hds-alert__content a").length&&(this.role="alertdialog")
-let t=e.querySelector(".hds-alert__title")||e.querySelector(".hds-alert__description")
-if(t){let r=t.getAttribute("id")||(0,s.guidFor)(e)
-t.setAttribute("id",r),this.ariaLabelledBy=r}}},u=h(l.prototype,"role",[a.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return"alert"}}),c=h(l.prototype,"ariaLabelledBy",[a.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h(l.prototype,"didInsert",[i.action],Object.getOwnPropertyDescriptor(l.prototype,"didInsert"),l.prototype),l)
-e.default=b,(0,t.setComponentTemplate)(p,b)})),define("@hashicorp/design-system-components/components/hds/alert/title",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"g38aAmBa",block:'[[[11,0],[24,0,"hds-alert__title"],[17,1],[12],[18,2,null],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/alert/title.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/avatar/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"scks6CC+",block:'[[[11,0],[24,0,"hds-avatar"],[17,1],[24,"aria-hidden","true"],[12],[1,"\\n"],[41,[30,2],[[[1,"    "],[10,"img"],[15,"src",[30,2]],[14,"alt",""],[14,"role","none"],[12],[13],[1,"\\n"]],[]],[[[1,"    "],[8,[39,1],null,[["@name","@size"],["user-circle","24"]],null],[1,"\\n"]],[]]],[13]],["&attrs","@src"],false,["if","flight-icon"]]',moduleName:"@hashicorp/design-system-components/components/hds/avatar/index.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/badge-count/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.COLORS=e.TYPES=e.SIZES=e.DEFAULT_COLOR=e.DEFAULT_TYPE=e.DEFAULT_SIZE=void 0
-const o=(0,r.createTemplateFactory)({id:"Wd0a/z2O",block:'[[[11,0],[16,0,[30,0,["classNames"]]],[17,1],[12],[1,"\\n  "],[1,[30,2]],[1,"\\n"],[13]],["&attrs","@text"],false,[]]',moduleName:"@hashicorp/design-system-components/components/hds/badge-count/index.hbs",isStrictMode:!1}),s="medium"
-e.DEFAULT_SIZE=s
-const a="filled"
-e.DEFAULT_TYPE=a
-const l="neutral"
-e.DEFAULT_COLOR=l
-const u=["small","medium","large"]
-e.SIZES=u
-const c=["filled","inverted","outlined"]
-e.TYPES=c
-const d=["neutral","neutral-dark-mode"]
-e.COLORS=d
-class h extends n.default{get size(){let{size:e=s}=this.args
-return e}get type(){let{type:e=a}=this.args
-return e}get color(){let{color:e=l}=this.args
-return e}get classNames(){let e=["hds-badge-count"]
-return e.push(`hds-badge-count--size-${this.size}`),e.push(`hds-badge-count--type-${this.type}`),e.push(`hds-badge-count--color-${this.color}`),e.join(" ")}}e.default=h,(0,t.setComponentTemplate)(o,h)})),define("@hashicorp/design-system-components/components/hds/badge/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.COLORS=e.TYPES=e.SIZES=e.DEFAULT_COLOR=e.DEFAULT_TYPE=e.DEFAULT_SIZE=void 0
-const o=(0,r.createTemplateFactory)({id:"RUklbbQe",block:'[[[11,0],[16,0,[30,0,["classNames"]]],[17,1],[12],[1,"\\n"],[41,[30,2],[[[1,"    "],[10,0],[14,0,"hds-badge__icon"],[12],[1,"\\n      "],[8,[39,1],null,[["@name","@size","@stretched"],[[30,0,["icon"]],"16",true]],null],[1,"\\n    "],[13],[1,"\\n"]],[]],null],[41,[30,0,["isIconOnly"]],[[[1,"    "],[10,1],[14,0,"sr-only"],[12],[1,[30,0,["text"]]],[13],[1,"\\n"]],[]],[[[1,"    "],[10,0],[14,0,"hds-badge__text"],[12],[1,"\\n      "],[1,[30,0,["text"]]],[1,"\\n    "],[13],[1,"\\n"]],[]]],[13]],["&attrs","@icon"],false,["if","flight-icon"]]',moduleName:"@hashicorp/design-system-components/components/hds/badge/index.hbs",isStrictMode:!1}),s="medium"
-e.DEFAULT_SIZE=s
-const a="filled"
-e.DEFAULT_TYPE=a
-const l="neutral"
-e.DEFAULT_COLOR=l
-const u=["small","medium","large"]
-e.SIZES=u
-const c=["filled","inverted","outlined"]
-e.TYPES=c
-const d=["neutral","neutral-dark-mode","highlight","success","warning","critical"]
-e.COLORS=d
-class h extends n.default{get size(){let{size:e=s}=this.args
-return e}get type(){let{type:e=a}=this.args
-return e}get color(){let{color:e=l}=this.args
-return e}get text(){let{text:e}=this.args
-return e}get icon(){var e
-return null!==(e=this.args.icon)&&void 0!==e?e:null}get isIconOnly(){var e
-return!!this.icon&&(null!==(e=this.args.isIconOnly)&&void 0!==e&&e)}get classNames(){let e=["hds-badge"]
-return e.push(`hds-badge--size-${this.size}`),e.push(`hds-badge--type-${this.type}`),e.push(`hds-badge--color-${this.color}`),e.join(" ")}}e.default=h,(0,t.setComponentTemplate)(o,h)})),define("@hashicorp/design-system-components/components/hds/breadcrumb/index",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"yMqChssT",block:'[[[11,"nav"],[16,0,[30,0,["classNames"]]],[24,"aria-label","breadcrumbs"],[17,1],[12],[1,"\\n  "],[11,"ol"],[24,0,"hds-breadcrumb__list"],[4,[38,0],[[30,0,["didInsert"]]],null],[12],[1,"\\n    "],[18,2,null],[1,"\\n  "],[13],[1,"\\n"],[13]],["&attrs","&default"],false,["did-insert","yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/breadcrumb/index.hbs",isStrictMode:!1}),o=()=>{}
-class s extends n.default{get didInsert(){let{didInsert:e}=this.args
-return"function"==typeof e?e:o}get itemsCanWrap(){var e
-return null===(e=this.args.itemsCanWrap)||void 0===e||e}get classNames(){let e=["hds-breadcrumb"]
-return this.itemsCanWrap&&e.push("hds-breadcrumb--items-can-wrap"),e.join(" ")}}e.default=s,(0,t.setComponentTemplate)(i,s)})),define("@hashicorp/design-system-components/components/hds/breadcrumb/item",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/template","@ember/debug"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const s=(0,r.createTemplateFactory)({id:"q47/lmOy",block:'[[[11,"li"],[24,0,"hds-breadcrumb__item"],[16,5,[30,0,["itemStyle"]]],[17,1],[12],[1,"\\n"],[41,[30,2],[[[1,"    "],[10,0],[14,0,"hds-breadcrumb__current"],[12],[1,"\\n"],[41,[30,3],[[[1,"        "],[10,0],[14,0,"hds-breadcrumb__icon"],[12],[1,"\\n          "],[8,[39,1],null,[["@name","@size","@stretched"],[[30,3],"16",true]],null],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[1,"      "],[10,1],[14,0,"hds-breadcrumb__text"],[12],[1,[30,4]],[13],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[1,"    "],[8,[39,2],[[24,0,"hds-breadcrumb__link"]],[["@models","@query","@route"],[[28,[37,3],[[30,5],[30,6]],null],[28,[37,4],[[30,7]],null],[30,8]]],[["default"],[[[[1,"\\n"],[41,[30,3],[[[1,"        "],[10,0],[14,0,"hds-breadcrumb__icon"],[12],[1,"\\n          "],[8,[39,1],null,[["@name","@size","@stretched"],[[30,3],"16",true]],null],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[1,"      "],[10,1],[14,0,"hds-breadcrumb__text"],[12],[1,[30,4]],[13],[1,"\\n    "]],[]]]]],[1,"\\n"]],[]]],[13]],["&attrs","@current","@icon","@text","@model","@models","@query","@route"],false,["if","flight-icon","link-to","hds-link-to-models","hds-link-to-query"]]',moduleName:"@hashicorp/design-system-components/components/hds/breadcrumb/item.hbs",isStrictMode:!1})
-class a extends n.default{get maxWidth(){let{maxWidth:e}=this.args
-return e||void 0}get itemStyle(){return this.maxWidth?(0,i.htmlSafe)(`max-width: ${this.maxWidth}`):void 0}get classNames(){return["hds-breadcrumb__item"].join(" ")}}e.default=a,(0,t.setComponentTemplate)(s,a)})),define("@hashicorp/design-system-components/components/hds/breadcrumb/truncation",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"M2DexWCm",block:'[[[11,"li"],[24,0,"hds-breadcrumb__item hds-breadcrumb__item--is-truncation"],[17,1],[12],[1,"\\n  "],[8,[39,0],null,null,[["toggle","content"],[[[[1,"\\n      "],[11,"button"],[24,0,"hds-breadcrumb__truncation-toggle"],[24,"aria-label","show more"],[16,"aria-expanded",[52,[30,2,["isOpen"]],"true","false"]],[24,4,"button"],[4,[38,2],["click",[30,2,["onClickToggle"]]],null],[12],[1,"\\n        "],[8,[39,3],null,[["@name","@size","@isInlineBlock"],["more-horizontal","16",false]],null],[1,"\\n      "],[13],[1,"\\n    "]],[2]],[[[1,"\\n      "],[10,0],[14,0,"hds-breadcrumb__truncation-content"],[12],[1,"\\n        "],[10,"ol"],[14,0,"hds-breadcrumb__sublist"],[12],[1,"\\n          "],[18,3,null],[1,"\\n        "],[13],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n"],[13]],["&attrs","t","&default"],false,["hds/disclosure","if","on","flight-icon","yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/breadcrumb/truncation.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/button-set/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"IF6yLYJh",block:'[[[11,0],[24,0,"hds-button-set"],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/button-set/index.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/button/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.ICONPOSITIONS=e.COLORS=e.SIZES=e.DEFAULT_ICONPOSITION=e.DEFAULT_COLOR=e.DEFAULT_SIZE=void 0
-const o=(0,r.createTemplateFactory)({id:"Htszn8Gj",block:'[[[8,[39,0],[[16,0,[30,0,["classNames"]]],[17,1],[16,"aria-label",[52,[30,0,["isIconOnly"]],[30,0,["text"]],null]]],[["@current-when","@models","@query","@replace","@route","@isRouteExternal","@href","@isHrefExternal"],[[30,2],[28,[37,2],[[30,3],[30,4]],null],[28,[37,3],[[30,5]],null],[30,6],[30,7],[30,8],[30,9],[30,10]]],[["default"],[[[[1,"\\n"],[41,[30,0,["isIconOnly"]],[[[1,"    "],[10,0],[14,0,"hds-button__icon"],[12],[1,"\\n      "],[8,[39,4],null,[["@name","@size","@stretched"],[[30,0,["icon"]],[30,0,["iconSize"]],true]],null],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[41,[30,0,["icon"]],[[[41,[28,[37,5],[[30,0,["iconPosition"]],"leading"],null],[[[1,"        "],[10,0],[14,0,"hds-button__icon"],[12],[1,"\\n          "],[8,[39,4],null,[["@name","@size","@stretched"],[[30,0,["icon"]],[30,0,["iconSize"]],true]],null],[1,"\\n        "],[13],[1,"\\n        "],[10,0],[14,0,"hds-button__text"],[12],[1,"\\n          "],[1,[30,0,["text"]]],[1,"\\n        "],[13],[1,"\\n"]],[]],[[[1,"        "],[10,0],[14,0,"hds-button__text"],[12],[1,"\\n          "],[1,[30,0,["text"]]],[1,"\\n        "],[13],[1,"\\n        "],[10,0],[14,0,"hds-button__icon"],[12],[1,"\\n          "],[8,[39,4],null,[["@name","@size","@stretched"],[[30,0,["icon"]],[30,0,["iconSize"]],true]],null],[1,"\\n        "],[13],[1,"\\n"]],[]]]],[]],[[[1,"      "],[10,0],[14,0,"hds-button__text"],[12],[1,"\\n        "],[1,[30,0,["text"]]],[1,"\\n      "],[13],[1,"\\n"]],[]]]],[]]]],[]]]]]],["&attrs","@current-when","@model","@models","@query","@replace","@route","@isRouteExternal","@href","@isHrefExternal"],false,["hds/interactive","if","hds-link-to-models","hds-link-to-query","flight-icon","eq"]]',moduleName:"@hashicorp/design-system-components/components/hds/button/index.hbs",isStrictMode:!1}),s="medium"
-e.DEFAULT_SIZE=s
-const a="primary"
-e.DEFAULT_COLOR=a
-const l="leading"
-e.DEFAULT_ICONPOSITION=l
-const u=["small","medium","large"]
-e.SIZES=u
-const c=["primary","secondary","tertiary","critical"]
-e.COLORS=c
-const d=["leading","trailing"]
-e.ICONPOSITIONS=d
-class h extends n.default{get text(){let{text:e}=this.args
-return e}get size(){let{size:e=s}=this.args
-return e}get color(){let{color:e=a}=this.args
-return e}get icon(){var e
-return null!==(e=this.args.icon)&&void 0!==e?e:null}get isIconOnly(){var e
-return!!this.icon&&(null!==(e=this.args.isIconOnly)&&void 0!==e&&e)}get iconPosition(){let{iconPosition:e=l}=this.args
-return e}get iconSize(){return"large"===this.args.size?"24":"16"}get isFullWidth(){var e
-return null!==(e=this.args.isFullWidth)&&void 0!==e&&e}get classNames(){let e=["hds-button"]
-return e.push(`hds-button--size-${this.size}`),e.push(`hds-button--color-${this.color}`),this.isFullWidth&&e.push("hds-button--width-full"),e.join(" ")}}e.default=h,(0,t.setComponentTemplate)(o,h)})),define("@hashicorp/design-system-components/components/hds/card/container",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.OVERFLOWS=e.BACKGROUNDS=e.LEVELS=e.DEFAULT_OVERFLOW=e.DEFAULT_BACKGROUND=e.DEFAULT_LEVEL=void 0
-const o=(0,r.createTemplateFactory)({id:"1vOTvja6",block:'[[[11,0],[16,0,[30,0,["classNames"]]],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/card/container.hbs",isStrictMode:!1}),s="base"
-e.DEFAULT_LEVEL=s
-const a="neutral-primary"
-e.DEFAULT_BACKGROUND=a
-const l="hidden"
-e.DEFAULT_OVERFLOW=l
-const u=["base","mid","high"]
-e.LEVELS=u
-const c=["neutral-primary","neutral-secondary"]
-e.BACKGROUNDS=c
-const d=["hidden","visible"]
-e.OVERFLOWS=d
-class h extends n.default{get level(){let{level:e=s}=this.args
-return e}get levelHover(){let{levelHover:e}=this.args
-return e}get levelActive(){let{levelActive:e}=this.args
-return e}get background(){let{background:e=a}=this.args
-return e}get overflow(){let{overflow:e=l}=this.args
-return e}get classNames(){let e=["hds-card__container"]
-return e.push(`hds-card__container--level-${this.args.hasBorder?"surface":"elevation"}-${this.level}`),this.levelHover&&e.push(`hds-card__container--hover-level-${this.args.hasBorder?"surface":"elevation"}-${this.levelHover}`),this.levelActive&&e.push(`hds-card__container--active-level-${this.args.hasBorder?"surface":"elevation"}-${this.levelActive}`),e.push(`hds-card__container--background-${this.background}`),e.push(`hds-card__container--overflow-${this.overflow}`),e.join(" ")}}e.default=h,(0,t.setComponentTemplate)(o,h)})),define("@hashicorp/design-system-components/components/hds/disclosure/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object","@ember/runloop"],(function(e,t,r,n,i,o,s){"use strict"
-var a,l,u
-function c(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function d(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const h=(0,r.createTemplateFactory)({id:"ovAr7y9a",block:'[[[11,0],[24,0,"hds-disclosure"],[17,1],[4,[38,0],[[30,0,["didInsert"]]],null],[4,[38,1],["focusout",[30,0,["onFocusOut"]]],null],[4,[38,1],["keyup",[30,0,["onKeyUp"]]],null],[12],[1,"\\n  "],[10,0],[14,0,"hds-disclosure__toggle"],[14,"tabindex","-1"],[12],[1,"\\n    "],[18,2,[[28,[37,3],null,[["onClickToggle","isOpen"],[[30,0,["onClickToggle"]],[30,0,["isOpen"]]]]]]],[1,"\\n  "],[13],[1,"\\n"],[41,[30,0,["isOpen"]],[[[1,"    "],[10,0],[14,0,"hds-disclosure__content"],[14,"tabindex","-1"],[12],[1,"\\n      "],[18,3,[[28,[37,3],null,[["close"],[[30,0,["close"]]]]]]],[1,"\\n    "],[13],[1,"\\n"]],[]],null],[13]],["&attrs","&toggle","&content"],false,["did-insert","on","yield","hash","if"]]',moduleName:"@hashicorp/design-system-components/components/hds/disclosure/index.hbs",isStrictMode:!1})
-let p=(a=class extends n.default{constructor(){super(...arguments),c(this,"isOpen",l,this),c(this,"toggleRef",u,this)}didInsert(e){this.element=e}onClickToggle(e){this.toggleRef||(this.toggleRef=e.currentTarget),this.isOpen=!this.isOpen,this.toggleRef.focus()}onFocusOut(e){e.relatedTarget&&this.element.contains(e.relatedTarget)||this.close()}onKeyUp(e){"Escape"===e.key&&(this.close(),this.toggleRef.focus())}close(){(0,s.schedule)("afterRender",(()=>{this.isOpen=!1,this.args.onClose&&"function"==typeof this.args.onClose&&this.args.onClose()}))}},l=d(a.prototype,"isOpen",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u=d(a.prototype,"toggleRef",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d(a.prototype,"didInsert",[o.action],Object.getOwnPropertyDescriptor(a.prototype,"didInsert"),a.prototype),d(a.prototype,"onClickToggle",[o.action],Object.getOwnPropertyDescriptor(a.prototype,"onClickToggle"),a.prototype),d(a.prototype,"onFocusOut",[o.action],Object.getOwnPropertyDescriptor(a.prototype,"onFocusOut"),a.prototype),d(a.prototype,"onKeyUp",[o.action],Object.getOwnPropertyDescriptor(a.prototype,"onKeyUp"),a.prototype),d(a.prototype,"close",[o.action],Object.getOwnPropertyDescriptor(a.prototype,"close"),a.prototype),a)
-e.default=p,(0,t.setComponentTemplate)(h,p)})),define("@hashicorp/design-system-components/components/hds/dismiss-button/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"b6IfYpsF",block:'[[[11,"button"],[24,0,"hds-dismiss-button"],[24,4,"button"],[24,"aria-label","Dismiss"],[17,1],[12],[1,"\\n  "],[8,[39,0],null,[["@name","@size","@isInlineBlock"],["x","16",false]],null],[1,"\\n"],[13]],["&attrs"],false,["flight-icon"]]',moduleName:"@hashicorp/design-system-components/components/hds/dismiss-button/index.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/dropdown/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.POSITIONS=e.DEFAULT_POSITION=void 0
-const o=(0,r.createTemplateFactory)({id:"dq7oZ1YJ",block:'[[[8,[39,0],[[24,0,"hds-dropdown"],[17,1]],[["@onClose"],[[30,2]]],[["toggle","content"],[[[[1,"\\n    "],[18,6,[[28,[37,2],null,[["ToggleButton","ToggleIcon"],[[50,"hds/dropdown/toggle/button",0,null,[["isOpen","onClick"],[[30,3,["isOpen"]],[30,3,["onClickToggle"]]]]],[50,"hds/dropdown/toggle/icon",0,null,[["isOpen","onClick"],[[30,3,["isOpen"]],[30,3,["onClickToggle"]]]]]]]]]],[1,"\\n  "]],[3]],[[[1,"\\n    "],[11,"ul"],[16,0,[30,0,["listClassNames"]]],[4,[38,4],null,[["width"],[[30,5]]]],[12],[1,"\\n      "],[18,6,[[28,[37,2],null,[["close","CopyItem","Description","Generic","Interactive","Separator","Title"],[[30,4,["close"]],[50,"hds/dropdown/list-item/copy-item",0,null,null],[50,"hds/dropdown/list-item/description",0,null,null],[50,"hds/dropdown/list-item/generic",0,null,null],[50,"hds/dropdown/list-item/interactive",0,null,null],[50,"hds/dropdown/list-item/separator",0,null,null],[50,"hds/dropdown/list-item/title",0,null,null]]]]]],[1,"\\n    "],[13],[1,"\\n  "]],[4]]]]]],["&attrs","@onClose","t","c","@width","&default"],false,["hds/disclosure","yield","hash","component","style"]]',moduleName:"@hashicorp/design-system-components/components/hds/dropdown/index.hbs",isStrictMode:!1}),s="right"
-e.DEFAULT_POSITION=s
-const a=["right","left"]
-e.POSITIONS=a
-class l extends n.default{get listPosition(){let{listPosition:e=s}=this.args
-return e}get listClassNames(){let e=["hds-dropdown-list"]
-return e.push(`hds-dropdown-list--position-${this.listPosition}`),this.args.width&&e.push("hds-dropdown-list--fixed-width"),e.join(" ")}}e.default=l,(0,t.setComponentTemplate)(o,l)})),define("@hashicorp/design-system-components/components/hds/dropdown/list-item/copy-item",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug","@glimmer/tracking","@ember/object"],(function(e,t,r,n,i,o,s){"use strict"
-var a,l
-function u(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const c=(0,r.createTemplateFactory)({id:"SwufzdjH",block:'[[[11,"li"],[16,0,[30,0,["classNames"]]],[17,1],[12],[1,"\\n"],[41,[30,2],[[[1,"    "],[10,0],[14,0,"hds-dropdown-list-item__copy-item-title hds-typography-body-100 hds-font-weight-semibold"],[12],[1,[30,2]],[13],[1,"\\n"]],[]],null],[1,"  "],[11,"button"],[16,0,[29,[[52,[30,0,["isSuccess"]],"is-success"]]]],[24,4,"button"],[4,[38,1],["click",[30,0,["copyCode"]]],null],[12],[1,"\\n    "],[10,0],[14,0,"hds-dropdown-list-item__copy-item-text hds-typography-code-100"],[12],[1,"\\n      "],[1,[30,0,["text"]]],[1,"\\n    "],[13],[1,"\\n    "],[8,[39,2],[[24,0,"hds-dropdown-list-item__copy-item-icon"]],[["@name"],[[29,[[52,[30,0,["isSuccess"]],"clipboard-checked","clipboard-copy"]]]]],null],[1,"\\n  "],[13],[1,"\\n"],[13]],["&attrs","@copyItemTitle"],false,["if","on","flight-icon"]]',moduleName:"@hashicorp/design-system-components/components/hds/dropdown/list-item/copy-item.hbs",isStrictMode:!1})
-let d=(a=class extends n.default{constructor(){var e,t,r,n
-super(...arguments),e=this,t="isSuccess",n=this,(r=l)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}get text(){let{text:e}=this.args
-return e}get classNames(){return["hds-dropdown-list-item","hds-dropdown-list-item--copy-item"].join(" ")}async copyCode(){if(await navigator.clipboard.writeText(this.args.text),navigator.clipboard.readText){await navigator.clipboard.readText()===this.args.text&&(this.isSuccess=!0)}else this.isSuccess=!0
-setTimeout((()=>{this.isSuccess=!1}),1e3)}},l=u(a.prototype,"isSuccess",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),u(a.prototype,"copyCode",[s.action],Object.getOwnPropertyDescriptor(a.prototype,"copyCode"),a.prototype),a)
-e.default=d,(0,t.setComponentTemplate)(c,d)})),define("@hashicorp/design-system-components/components/hds/dropdown/list-item/description",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,r.createTemplateFactory)({id:"Tbkcia0d",block:'[[[11,"li"],[16,0,[30,0,["classNames"]]],[17,1],[12],[1,"\\n  "],[1,[30,0,["text"]]],[1,"\\n"],[13]],["&attrs"],false,[]]',moduleName:"@hashicorp/design-system-components/components/hds/dropdown/list-item/description.hbs",isStrictMode:!1})
-class s extends n.default{get text(){let{text:e}=this.args
-return e}get classNames(){let e=["hds-dropdown-list-item","hds-dropdown-list-item--description"]
-return e.push("hds-typography-body-100"),e.push("hds-font-weight-regular"),e.join(" ")}}e.default=s,(0,t.setComponentTemplate)(o,s)})),define("@hashicorp/design-system-components/components/hds/dropdown/list-item/generic",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"VeEnNbIb",block:'[[[11,"li"],[24,0,"hds-dropdown-list-item hds-dropdown-list-item--generic"],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/dropdown/list-item/generic.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/dropdown/list-item/interactive",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.COLORS=e.DEFAULT_COLOR=void 0
-const o=(0,r.createTemplateFactory)({id:"IzKZ6ELL",block:'[[[10,"li"],[15,0,[30,0,["classNames"]]],[12],[1,"\\n"],[41,[30,1],[[[1,"    "],[11,0],[24,0,"hds-dropdown-list-item__interactive-loading-wrapper"],[17,2],[12],[1,"\\n      "],[10,0],[14,0,"hds-dropdown-list-item__interactive-icon"],[12],[1,"\\n        "],[8,[39,1],null,[["@name","@isInlineBlock"],["loading",false]],null],[1,"\\n      "],[13],[1,"\\n      "],[10,0],[14,0,"hds-dropdown-list-item__interactive-text hds-typography-body-100 hds-font-weight-regular"],[12],[1,"\\n        "],[1,[30,0,["text"]]],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[1,"    "],[8,[39,2],[[17,2]],[["@current-when","@models","@query","@replace","@route","@isRouteExternal","@href","@isHrefExternal"],[[30,3],[28,[37,3],[[30,4],[30,5]],null],[28,[37,4],[[30,6]],null],[30,7],[30,8],[30,9],[30,10],[30,11]]],[["default"],[[[[1,"\\n"],[41,[30,12],[[[1,"        "],[10,0],[14,0,"hds-dropdown-list-item__interactive-icon"],[12],[1,"\\n          "],[8,[39,1],null,[["@name","@isInlineBlock"],[[30,12],false]],null],[1,"\\n        "],[13],[1,"\\n"]],[]],null],[1,"      "],[10,0],[14,0,"hds-dropdown-list-item__interactive-text hds-typography-body-200 hds-font-weight-medium"],[12],[1,"\\n        "],[1,[30,0,["text"]]],[1,"\\n      "],[13],[1,"\\n    "]],[]]]]],[1,"\\n"]],[]]],[13]],["@isLoading","&attrs","@current-when","@model","@models","@query","@replace","@route","@isRouteExternal","@href","@isHrefExternal","@icon"],false,["if","flight-icon","hds/interactive","hds-link-to-models","hds-link-to-query"]]',moduleName:"@hashicorp/design-system-components/components/hds/dropdown/list-item/interactive.hbs",isStrictMode:!1}),s="action"
-e.DEFAULT_COLOR=s
-const a=["action","critical"]
-e.COLORS=a
-class l extends n.default{get text(){let{text:e}=this.args
-return e}get color(){let{color:e=s}=this.args
-return e}get classNames(){let e=["hds-dropdown-list-item","hds-dropdown-list-item--interactive"]
-return e.push(`hds-dropdown-list-item--color-${this.color}`),e.join(" ")}}e.default=l,(0,t.setComponentTemplate)(o,l)})),define("@hashicorp/design-system-components/components/hds/dropdown/list-item/separator",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"mEjA/q0n",block:'[[[11,"li"],[24,0,"hds-dropdown-list-item hds-dropdown-list-item--separator"],[24,"role","separator"],[17,1],[12],[13]],["&attrs"],false,[]]',moduleName:"@hashicorp/design-system-components/components/hds/dropdown/list-item/separator.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/dropdown/list-item/title",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,r.createTemplateFactory)({id:"uR21unKJ",block:'[[[11,"li"],[16,0,[30,0,["classNames"]]],[17,1],[12],[1,"\\n  "],[1,[30,0,["text"]]],[1,"\\n"],[13]],["&attrs"],false,[]]',moduleName:"@hashicorp/design-system-components/components/hds/dropdown/list-item/title.hbs",isStrictMode:!1})
-class s extends n.default{get text(){let{text:e}=this.args
-return e}get classNames(){let e=["hds-dropdown-list-item","hds-dropdown-list-item--title"]
-return e.push("hds-typography-body-100"),e.push("hds-font-weight-semibold"),e.join(" ")}}e.default=s,(0,t.setComponentTemplate)(o,s)})),define("@hashicorp/design-system-components/components/hds/dropdown/toggle/button",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.COLORS=e.DEFAULT_COLOR=void 0
-const o=(0,r.createTemplateFactory)({id:"XPLqbAVV",block:'[[[1,"\\n"],[8,[39,0],[[16,0,[30,0,["classNames"]]],[17,1],[16,"aria-expanded",[52,[30,2],"true","false"]],[4,[38,2],["click",[30,0,["onClick"]]],null]],[["@text","@icon","@iconPosition","@color","@size"],[[30,0,["text"]],"chevron-down","trailing",[30,0,["color"]],[30,3]]],null]],["&attrs","@isOpen","@size"],false,["hds/button","if","on"]]',moduleName:"@hashicorp/design-system-components/components/hds/dropdown/toggle/button.hbs",isStrictMode:!1}),s="primary"
-e.DEFAULT_COLOR=s
-const a=["primary","secondary"]
-e.COLORS=a
-const l=()=>{}
-class u extends n.default{get text(){let{text:e}=this.args
-return e}get color(){let{color:e=s}=this.args
-return e}get onClick(){let{onClick:e}=this.args
-return"function"==typeof e?e:l}get classNames(){let e=["hds-dropdown-toggle-button"]
-return this.args.isOpen&&e.push("hds-dropdown-toggle-button--is-open"),e.join(" ")}}e.default=u,(0,t.setComponentTemplate)(o,u)})),define("@hashicorp/design-system-components/components/hds/dropdown/toggle/icon",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,r.createTemplateFactory)({id:"H10/gm1F",block:'[[[11,"button"],[16,0,[30,0,["classNames"]]],[16,"aria-label",[30,0,["text"]]],[17,1],[16,"aria-expanded",[52,[30,2],"true","false"]],[24,4,"button"],[4,[38,1],["click",[30,0,["onClick"]]],null],[12],[1,"\\n  "],[10,0],[14,0,"hds-dropdown-toggle-icon__wrapper"],[12],[1,"\\n"],[41,[30,3],[[[1,"      "],[10,"img"],[15,"src",[30,3]],[14,"alt",""],[14,"role","presentation"],[14,"height","32"],[14,"width","32"],[12],[13],[1,"\\n"]],[]],[[[41,[30,4],[[[1,"      "],[8,[39,2],null,[["@name","@size"],[[30,4],"24"]],null],[1,"\\n    "]],[]],null]],[]]],[1,"  "],[13],[1,"\\n"],[41,[30,0,["hasChevron"]],[[[1,"    "],[8,[39,2],[[24,0,"hds-dropdown-toggle-icon__chevron"]],[["@name","@isInlineBlock"],["chevron-down",false]],null],[1,"\\n"]],[]],null],[13]],["&attrs","@isOpen","@imageSrc","@icon"],false,["if","on","flight-icon"]]',moduleName:"@hashicorp/design-system-components/components/hds/dropdown/toggle/icon.hbs",isStrictMode:!1}),s=()=>{}
-class a extends n.default{constructor(){super(...arguments),!this.args.icon&&this.args.imageSrc}get text(){let{text:e}=this.args
-return e}get hasChevron(){var e
-return null===(e=this.args.hasChevron)||void 0===e||e}get onClick(){let{onClick:e}=this.args
-return"function"==typeof e?e:s}get classNames(){let e=["hds-dropdown-toggle-icon"]
-return this.args.isOpen&&e.push("hds-dropdown-toggle-icon--is-open"),e.join(" ")}}e.default=a,(0,t.setComponentTemplate)(o,a)})),define("@hashicorp/design-system-components/components/hds/empty-state/body",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"NmE9iB5l",block:'[[[11,0],[24,0,"hds-empty-state__body"],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/empty-state/body.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/empty-state/footer",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"9Q0Wm8Nt",block:'[[[11,0],[24,0,"hds-empty-state__footer"],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/empty-state/footer.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/empty-state/header",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"kDmT6Ye3",block:'[[[11,0],[24,0,"hds-empty-state__header"],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/empty-state/header.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/empty-state/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"ITzP10aF",block:'[[[11,0],[24,0,"hds-empty-state"],[17,1],[12],[1,"\\n  "],[18,2,[[28,[37,1],null,[["Header","Body","Footer"],[[50,"hds/empty-state/header",0,null,null],[50,"hds/empty-state/body",0,null,null],[50,"hds/empty-state/footer",0,null,null]]]]]],[1,"\\n"],[13]],["&attrs","&default"],false,["yield","hash","component"]]',moduleName:"@hashicorp/design-system-components/components/hds/empty-state/index.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/flyout/body",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"RyUNAZNR",block:'[[[11,0],[24,0,"hds-flyout__body"],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/flyout/body.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/flyout/description",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"aSuxJNuY",block:'[[[11,0],[24,0,"hds-flyout__description hds-typography-body-200"],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/flyout/description.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o}))
-define("@hashicorp/design-system-components/components/hds/flyout/header",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"rxX+RZUe",block:'[[[11,0],[24,0,"hds-flyout__header"],[17,1],[12],[1,"\\n"],[41,[30,2],[[[1,"    "],[8,[39,1],[[24,0,"hds-flyout__icon"]],[["@name","@size","@isInlineBlock"],[[30,2],"24",false]],null],[1,"\\n"]],[]],null],[1,"  "],[10,0],[14,0,"hds-flyout__title hds-typography-display-300 hds-font-weight-semibold"],[15,1,[30,3]],[12],[1,"\\n"],[41,[30,4],[[[1,"      "],[10,0],[14,0,"hds-flyout__tagline hds-typography-body-100 hds-font-weight-regular"],[12],[1,"\\n        "],[1,[30,4]],[1,"\\n      "],[13],[1,"\\n"]],[]],null],[1,"    "],[18,6,null],[1,"\\n  "],[13],[1,"\\n  "],[8,[39,3],[[24,0,"hds-flyout__dismiss"],[4,[38,4],["click",[30,5]],null]],null,null],[1,"\\n"],[13]],["&attrs","@icon","@id","@tagline","@onDismiss","&default"],false,["if","flight-icon","yield","hds/dismiss-button","on"]]',moduleName:"@hashicorp/design-system-components/components/hds/flyout/header.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/flyout/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@ember/debug","@hashicorp/design-system-components/components/hds/form/utils/getElementId","@glimmer/tracking"],(function(e,t,r,n,i,o,s,a){"use strict"
-var l,u
-function c(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SIZES=e.DEFAULT_HAS_OVERLAY=e.DEFAULT_SIZE=void 0
-const d=(0,r.createTemplateFactory)({id:"KAl88ZA/",block:'[[[11,"dialog"],[16,0,[30,0,["classNames"]]],[17,1],[16,"aria-labelledby",[30,0,["id"]]],[4,[38,0],[[30,0,["didInsert"]]],null],[4,[38,1],null,[["isActive","focusTrapOptions"],[[30,0,["isOpen"]],[28,[37,2],null,[["onDeactivate","clickOutsideDeactivates"],[[30,0,["onDismiss"]],true]]]]]],[12],[1,"\\n  "],[18,2,[[28,[37,2],null,[["Header"],[[50,"hds/flyout/header",0,null,[["id","onDismiss"],[[30,0,["id"]],[30,0,["onDismiss"]]]]]]]]]],[1,"\\n  "],[18,2,[[28,[37,2],null,[["Description"],[[50,"hds/flyout/description",0,null,null]]]]]],[1,"\\n  "],[18,2,[[28,[37,2],null,[["Body"],[[50,"hds/flyout/body",0,null,null]]]]]],[1,"\\n"],[13],[1,"\\n"],[41,[30,0,["isOpen"]],[[[1,"  "],[10,0],[14,0,"hds-flyout__overlay"],[12],[13],[1,"\\n"]],[]],null]],["&attrs","&default"],false,["did-insert","focus-trap","hash","yield","component","if"]]',moduleName:"@hashicorp/design-system-components/components/hds/flyout/index.hbs",isStrictMode:!1}),h="medium"
-e.DEFAULT_SIZE=h
-e.DEFAULT_HAS_OVERLAY=!0
-const p=["medium","large"]
-e.SIZES=p
-let f=(l=class extends n.default{constructor(){var e,t,r,n
-super(...arguments),e=this,t="isOpen",n=this,(r=u)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}get size(){let{size:e=h}=this.args
-return e}get id(){return(0,s.getElementId)(this)}get classNames(){let e=["hds-flyout"]
-return e.push(`hds-flyout--size-${this.size}`),e.join(" ")}didInsert(e){this.element=e,e.showModal||Promise.all([emberAutoImportDynamic("dialog-polyfill"),emberAutoImportDynamic("dialog-polyfill-css")]).then((t=>{let[r]=t
-const n=r.default
-n.registerDialog&&(n.registerDialog(e),e.classList.add("fixed"))})).catch({}),this.element.addEventListener("close",(()=>{this.args.onClose&&"function"==typeof this.args.onClose&&this.args.onClose(),this.isOpen=!1})),this.element.open||this.open()}open(){this.element.showModal(),this.isOpen=!0,this.args.onOpen&&"function"==typeof this.args.onOpen&&this.args.onOpen()}onDismiss(){this.element.close()}},u=c(l.prototype,"isOpen",[a.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),c(l.prototype,"didInsert",[i.action],Object.getOwnPropertyDescriptor(l.prototype,"didInsert"),l.prototype),c(l.prototype,"open",[i.action],Object.getOwnPropertyDescriptor(l.prototype,"open"),l.prototype),c(l.prototype,"onDismiss",[i.action],Object.getOwnPropertyDescriptor(l.prototype,"onDismiss"),l.prototype),l)
-e.default=f,(0,t.setComponentTemplate)(d,f)})),define("@hashicorp/design-system-components/components/hds/form/checkbox/base",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"NkCMImir",block:'[[[11,"input"],[24,4,"checkbox"],[24,0,"hds-form-checkbox"],[17,1],[16,2,[30,2]],[12],[13]],["&attrs","@value"],false,[]]',moduleName:"@hashicorp/design-system-components/components/hds/form/checkbox/base.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/checkbox/field",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"fFfepgsF",block:'[[[8,[39,0],null,[["@layout","@contextualClass","@extraAriaDescribedBy","@id"],["flag",[30,1],[30,2],[30,3]]],[["default"],[[[[1,"\\n"],[1,"  "],[18,9,[[28,[37,2],null,[["Label","HelperText","Error"],[[30,4,["Label"]],[30,4,["HelperText"]],[30,4,["Error"]]]]]]],[1,"\\n  "],[8,[30,4,["Control"]],null,null,[["default"],[[[[1,"\\n    "],[8,[39,3],[[24,0,"hds-form-field__control"],[16,3,[30,5]],[16,"required",[30,6]],[17,7],[16,1,[30,4,["id"]]],[16,"aria-describedby",[30,4,["ariaDescribedBy"]]]],[["@value"],[[30,8]]],null],[1,"\\n  "]],[]]]]],[1,"\\n"]],[4]]]]]],["@contextualClass","@extraAriaDescribedBy","@id","F","@name","@isRequired","&attrs","@value","&default"],false,["hds/form/field","yield","hash","hds/form/checkbox/base"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/checkbox/field.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/checkbox/group",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"o6FYRVQX",block:'[[[8,[39,0],[[17,1]],[["@layout","@name","@isRequired","@isOptional"],[[30,2],[30,3],[30,4],[30,5]]],[["default"],[[[[1,"\\n"],[1,"  "],[18,7,[[28,[37,2],null,[["Legend","isRequired","isOptional"],[[30,6,["Legend"]],[30,6,["isRequired"]],[30,6,["isOptional"]]]]]]],[1,"\\n  "],[18,7,[[28,[37,2],null,[["HelperText","Error"],[[30,6,["HelperText"]],[30,6,["Error"]]]]]]],[1,"\\n  "],[8,[30,6,["Control"]],null,null,[["default"],[[[[1,"\\n    "],[18,7,[[28,[37,2],null,[["Checkbox::Field"],[[50,"hds/form/checkbox/field",0,null,[["contextualClass","isRequired","name","extraAriaDescribedBy"],["hds-form-group__control-field",[30,4],[30,3],[30,6,["ariaDescribedBy"]]]]]]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[6]]]]]],["&attrs","@layout","@name","@isRequired","@isOptional","F","&default"],false,["hds/form/fieldset","yield","hash","component"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/checkbox/group.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/error/index",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.ID_PREFIX=void 0
-const i=(0,r.createTemplateFactory)({id:"v8L48D0F",block:'[[[11,0],[16,0,[30,0,["classNames"]]],[16,1,[30,0,["id"]]],[17,1],[4,[38,0],[[30,0,["onInsert"]]],null],[12],[1,"\\n  "],[8,[39,1],[[24,0,"hds-form-error__icon"]],[["@name"],["alert-diamond-fill"]],null],[1,"\\n  "],[10,0],[14,0,"hds-form-error__content"],[12],[1,"\\n    "],[18,2,[[28,[37,3],null,[["Message"],[[50,"hds/form/error/message",0,null,null]]]]]],[1,"\\n  "],[13],[1,"\\n"],[13]],["&attrs","&default"],false,["did-insert","flight-icon","yield","hash","component"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/error/index.hbs",isStrictMode:!1}),o="error-"
-e.ID_PREFIX=o
-const s=()=>{}
-class a extends n.default{get id(){let{controlId:e}=this.args
-return e?`error-${e}`:null}get onInsert(){let{onInsert:e}=this.args
-return"function"==typeof e?e:s}get classNames(){let e=["hds-form-error"]
-return e.push("hds-typography-body-100","hds-font-weight-medium"),this.args.contextualClass&&e.push(this.args.contextualClass),e.join(" ")}}e.default=a,(0,t.setComponentTemplate)(i,a)})),define("@hashicorp/design-system-components/components/hds/form/error/message",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"NvWxZRLD",block:'[[[11,2],[24,0,"hds-form-error__message"],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/error/message.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/field/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/debug","@ember/object","@hashicorp/design-system-components/components/hds/form/utils/getElementId","@hashicorp/design-system-components/components/hds/form/utils/setAriaDescribedBy","@ember/runloop"],(function(e,t,r,n,i,o,s,a,l,u){"use strict"
-var c,d,h
-function p(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function f(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.LAYOUT_TYPES=void 0
-const m=(0,r.createTemplateFactory)({id:"U91UZFk2",block:'[[[11,0],[16,0,[30,0,["classNames"]]],[17,1],[4,[38,0],[[30,0,["setAriaDescribedBy"]]],null],[12],[1,"\\n  "],[18,2,[[28,[37,2],null,[["Label"],[[50,"hds/form/label",0,null,[["controlId","isRequired","isOptional","contextualClass"],[[30,0,["id"]],[30,0,["isRequired"]],[30,0,["isOptional"]],"hds-form-field__label"]]]]]]]],[1,"\\n  "],[18,2,[[28,[37,2],null,[["HelperText"],[[50,"hds/form/helper-text",0,null,[["controlId","onInsert","contextualClass"],[[30,0,["id"]],[30,0,["appendDescriptor"]],"hds-form-field__helper-text"]]]]]]]],[1,"\\n  "],[18,2,[[28,[37,2],null,[["Control","id","ariaDescribedBy"],[[50,"hds/yield",0,null,null],[30,0,["id"]],[30,0,["ariaDescribedBy"]]]]]]],[1,"\\n  "],[18,2,[[28,[37,2],null,[["Error"],[[50,"hds/form/error",0,null,[["controlId","onInsert","contextualClass"],[[30,0,["id"]],[30,0,["appendDescriptor"]],"hds-form-field__error"]]]]]]]],[1,"\\n"],[13]],["&attrs","&default"],false,["did-insert","yield","hash","component"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/field/index.hbs",isStrictMode:!1}),g=["vertical","flag"]
-e.LAYOUT_TYPES=g
-let v=(c=class extends n.default{constructor(){super(...arguments),p(this,"ariaDescribedBy",d,this),p(this,"descriptors",h,this)}appendDescriptor(e){this.descriptors.push(e.id)}setAriaDescribedBy(){(0,u.schedule)("afterRender",(()=>{(0,l.setAriaDescribedBy)(this)}))}get layout(){let{layout:e}=this.args
-return e}get id(){return(0,a.getElementId)(this)}get classNames(){let e=[]
-return this.args.layout&&e.push(`hds-form-field--layout-${this.layout}`),this.args.contextualClass&&e.push(this.args.contextualClass),e.join(" ")}get isRequired(){return this.args.isRequired||!1}get isOptional(){return this.args.isOptional||!1}},d=f(c.prototype,"ariaDescribedBy",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return this.args.extraAriaDescribedBy}}),h=f(c.prototype,"descriptors",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return[]}}),f(c.prototype,"appendDescriptor",[s.action],Object.getOwnPropertyDescriptor(c.prototype,"appendDescriptor"),c.prototype),f(c.prototype,"setAriaDescribedBy",[s.action],Object.getOwnPropertyDescriptor(c.prototype,"setAriaDescribedBy"),c.prototype),c)
-e.default=v,(0,t.setComponentTemplate)(m,v)})),define("@hashicorp/design-system-components/components/hds/form/fieldset/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object","@hashicorp/design-system-components/components/hds/form/utils/getElementId","@hashicorp/design-system-components/components/hds/form/utils/setAriaDescribedBy"],(function(e,t,r,n,i,o,s,a){"use strict"
-var l,u,c
-function d(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function h(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const p=(0,r.createTemplateFactory)({id:"olsh2WDP",block:'[[[11,"fieldset"],[16,0,[30,0,["classNames"]]],[16,1,[30,0,["id"]]],[17,1],[4,[38,0],[[30,0,["setAriaDescribedBy"]]],null],[12],[1,"\\n  "],[18,2,[[28,[37,2],null,[["Legend"],[[50,"hds/form/legend",0,null,[["isRequired","isOptional","contextualClass"],[[30,0,["isRequired"]],[30,0,["isOptional"]],"hds-form-group__legend"]]]]]]]],[1,"\\n  "],[18,2,[[28,[37,2],null,[["HelperText"],[[50,"hds/form/helper-text",0,null,[["controlId","onInsert","contextualClass"],[[30,0,["id"]],[30,0,["appendDescriptor"]],"hds-form-group__helper-text"]]]]]]]],[1,"\\n  "],[10,0],[14,0,"hds-form-group__control-fields-wrapper"],[12],[1,"\\n    "],[18,2,[[28,[37,2],null,[["Control","ariaDescribedBy"],[[50,"hds/yield",0,null,null],[30,0,["ariaDescribedBy"]]]]]]],[1,"\\n  "],[13],[1,"\\n  "],[18,2,[[28,[37,2],null,[["Error"],[[50,"hds/form/error",0,null,[["controlId","onInsert","contextualClass"],[[30,0,["id"]],[30,0,["appendDescriptor"]],"hds-form-group__error"]]]]]]]],[1,"\\n"],[13]],["&attrs","&default"],false,["did-insert","yield","hash","component"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/fieldset/index.hbs",isStrictMode:!1})
-let f=(l=class extends n.default{constructor(){super(...arguments),d(this,"ariaDescribedBy",u,this),d(this,"descriptors",c,this)}appendDescriptor(e){this.descriptors.push(e.id)}setAriaDescribedBy(){(0,a.setAriaDescribedBy)(this)}get layout(){var e
-return null!==(e=this.args.layout)&&void 0!==e?e:"vertical"}get id(){return(0,s.getElementId)(this)}get classNames(){let e=["hds-form-group"]
-return e.push(`hds-form-group--layout-${this.layout}`),e.join(" ")}get isRequired(){return this.args.isRequired||!1}get isOptional(){return this.args.isOptional||!1}},u=h(l.prototype,"ariaDescribedBy",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return this.args.extraAriaDescribedBy}}),c=h(l.prototype,"descriptors",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return[]}}),h(l.prototype,"appendDescriptor",[o.action],Object.getOwnPropertyDescriptor(l.prototype,"appendDescriptor"),l.prototype),h(l.prototype,"setAriaDescribedBy",[o.action],Object.getOwnPropertyDescriptor(l.prototype,"setAriaDescribedBy"),l.prototype),l)
-e.default=f,(0,t.setComponentTemplate)(p,f)})),define("@hashicorp/design-system-components/components/hds/form/helper-text/index",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.ID_PREFIX=void 0
-const i=(0,r.createTemplateFactory)({id:"Bm0eJPNn",block:'[[[11,0],[16,0,[30,0,["classNames"]]],[16,1,[30,0,["id"]]],[17,1],[4,[38,0],[[30,0,["onInsert"]]],null],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["&attrs","&default"],false,["did-insert","yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/helper-text/index.hbs",isStrictMode:!1}),o="helper-text-"
-e.ID_PREFIX=o
-const s=()=>{}
-class a extends n.default{get id(){let{controlId:e}=this.args
-return e?`helper-text-${e}`:null}get onInsert(){let{onInsert:e}=this.args
-return"function"==typeof e?e:s}get classNames(){let e=["hds-form-helper-text"]
-return e.push("hds-typography-body-100","hds-font-weight-regular"),this.args.contextualClass&&e.push(this.args.contextualClass),e.join(" ")}}e.default=a,(0,t.setComponentTemplate)(i,a)})),define("@hashicorp/design-system-components/components/hds/form/indicator/index",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"7JBN5I8Q",block:'[[[41,[30,1],[[[1,"  "],[10,1],[14,"aria-hidden","true"],[15,0,[30,0,["classNames"]]],[12],[1,"(Optional)"],[13],[1,"\\n"]],[]],null],[41,[30,2],[[[1,"   "],[8,[39,1],[[24,"aria-hidden","true"],[16,0,[30,0,["classNames"]]]],[["@size","@color","@text"],["small","neutral","Required"]],null],[1,"\\n"]],[]],null]],["@isOptional","@isRequired"],false,["if","hds/badge"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/indicator/index.hbs",isStrictMode:!1})
-class o extends n.default{get classNames(){let e=["hds-form-indicator"]
-return this.args.isOptional&&(e.push("hds-form-indicator--optional"),e.push("hds-typography-body-100","hds-font-weight-regular")),e.join(" ")}}e.default=o,(0,t.setComponentTemplate)(i,o)})),define("@hashicorp/design-system-components/components/hds/form/label/index",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"oi9/j0TW",block:'[[[11,"label"],[16,0,[30,0,["classNames"]]],[16,"for",[30,1]],[17,2],[12],[1,"\\n  "],[18,5,null],[1,"\\n  "],[8,[39,1],null,[["@isRequired","@isOptional"],[[30,3],[30,4]]],null],[1,"\\n"],[13]],["@controlId","&attrs","@isRequired","@isOptional","&default"],false,["yield","hds/form/indicator"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/label/index.hbs",isStrictMode:!1})
-class o extends n.default{get classNames(){let e=["hds-form-label"]
-return e.push("hds-typography-body-200","hds-font-weight-semibold"),this.args.contextualClass&&e.push(this.args.contextualClass),e.join(" ")}}e.default=o,(0,t.setComponentTemplate)(i,o)})),define("@hashicorp/design-system-components/components/hds/form/legend/index",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"FoG30ahC",block:'[[[11,"legend"],[16,0,[30,0,["classNames"]]],[17,1],[12],[1,"\\n  "],[18,4,null],[1,"\\n  "],[8,[39,1],null,[["@isRequired","@isOptional"],[[30,2],[30,3]]],null],[1,"\\n"],[13]],["&attrs","@isRequired","@isOptional","&default"],false,["yield","hds/form/indicator"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/legend/index.hbs",isStrictMode:!1})
-class o extends n.default{get classNames(){let e=["hds-form-legend"]
-return e.push("hds-typography-body-200","hds-font-weight-semibold"),this.args.contextualClass&&e.push(this.args.contextualClass),e.join(" ")}}e.default=o,(0,t.setComponentTemplate)(i,o)})),define("@hashicorp/design-system-components/components/hds/form/radio-card/description",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"5FYrCGiE",block:'[[[11,1],[24,0,"hds-form-radio-card__description hds-typography-body-100"],[17,1],[12],[18,2,null],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/radio-card/description.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/radio-card/group",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"/7USni9M",block:'[[[8,[39,0],[[24,0,"hds-form-group--radio-cards"],[17,1]],[["@layout","@name","@isRequired","@isOptional"],["horizontal",[30,2],[30,3],[30,4]]],[["default"],[[[[1,"\\n"],[1,"  "],[18,9,[[28,[37,2],null,[["Legend","isRequired","isOptional"],[[30,5,["Legend"]],[30,5,["isRequired"]],[30,5,["isOptional"]]]]]]],[1,"\\n  "],[18,9,[[28,[37,2],null,[["HelperText","Error"],[[30,5,["HelperText"]],[30,5,["Error"]]]]]]],[1,"\\n  "],[8,[30,5,["Control"]],null,null,[["default"],[[[[1,"\\n    "],[18,9,[[28,[37,2],null,[["RadioCard"],[[50,"hds/form/radio-card",0,null,[["name","alignment","controlPosition","layout","extraAriaDescribedBy"],[[30,2],[30,6],[30,7],[30,8],[30,5,["ariaDescribedBy"]]]]]]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[5]]]]]],["&attrs","@name","@isRequired","@isOptional","F","@alignment","@controlPosition","@layout","&default"],false,["hds/form/fieldset","yield","hash","component"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/radio-card/group.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/radio-card/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object","@ember/debug","@hashicorp/design-system-components/components/hds/form/utils/setAriaDescribedBy","@ember/runloop"],(function(e,t,r,n,i,o,s,a,l){"use strict"
-var u,c,d
-function h(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function p(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.LAYOUTS=e.ALIGNMENTS=e.CONTROL_POSITIONS=e.DEFAULT_LAYOUT=e.DEFAULT_ALIGNMENT=e.DEFAULT_CONTROL_POSITION=void 0
-const f=(0,r.createTemplateFactory)({id:"G7fsn4zP",block:'[[[11,"label"],[16,0,[30,0,["classNames"]]],[4,[38,0],[[30,0,["setAriaDescribedBy"]]],null],[4,[38,1],null,[["maxWidth"],[[30,1]]]],[12],[1,"\\n  "],[10,1],[14,0,"hds-form-radio-card__content"],[12],[1,"\\n    "],[18,7,[[28,[37,3],null,[["Icon"],[[50,"flight-icon",0,null,[["size","isInlineBlock"],["24",false]]]]]]]],[1,"\\n    "],[18,7,[[28,[37,3],null,[["Label"],[[50,"hds/form/radio-card/label",0,null,null]]]]]],[1,"\\n    "],[18,7,[[28,[37,3],null,[["Badge"],[[50,"hds/badge",0,null,null]]]]]],[1,"\\n    "],[18,7,[[28,[37,3],null,[["Description"],[[50,"hds/form/radio-card/description",0,null,null]]]]]],[1,"\\n    "],[18,7,[[28,[37,3],null,[["Generic"],[[50,"hds/yield",0,null,null]]]]]],[1,"\\n  "],[13],[1,"\\n  "],[10,1],[14,0,"hds-form-radio-card__control-wrapper"],[12],[1,"\\n    "],[8,[39,5],[[24,0,"hds-form-radio-card__control"],[16,3,[30,2]],[16,"checked",[30,3]],[16,"disabled",[30,4]],[16,"aria-describedby",[30,0,["ariaDescribedBy"]]],[17,5]],[["@value"],[[30,6]]],null],[1,"\\n  "],[13],[1,"\\n"],[13]],["@maxWidth","@name","@checked","@disabled","&attrs","@value","&default"],false,["did-insert","style","yield","hash","component","hds/form/radio/base"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/radio-card/index.hbs",isStrictMode:!1}),m="bottom"
-e.DEFAULT_CONTROL_POSITION=m
-const g="left"
-e.DEFAULT_ALIGNMENT=g
-const v="fluid"
-e.DEFAULT_LAYOUT=v
-const b=["bottom","left"]
-e.CONTROL_POSITIONS=b
-const y=["left","center"]
-e.ALIGNMENTS=y
-const _=["fluid","fixed"]
-e.LAYOUTS=_
-let w=(u=class extends n.default{constructor(){super(...arguments),h(this,"ariaDescribedBy",c,this),h(this,"descriptors",d,this)}setAriaDescribedBy(){(0,l.schedule)("afterRender",(()=>{(0,a.setAriaDescribedBy)(this)}))}get controlPosition(){let{controlPosition:e=m}=this.args
-return e}get alignment(){let{alignment:e=g}=this.args
-return e}get layout(){let{layout:e=v}=this.args
-return e}get classNames(){let e=["hds-form-radio-card"]
-return this.args.checked&&e.push("hds-form-radio-card--checked"),this.args.disabled&&e.push("hds-form-radio-card--disabled"),e.push(`hds-form-radio-card--control-${this.controlPosition}`),e.push(`hds-form-radio-card--align-${this.alignment}`),e.push(`hds-form-radio-card--layout-${this.layout}`),e.join(" ")}},c=p(u.prototype,"ariaDescribedBy",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return this.args.extraAriaDescribedBy}}),d=p(u.prototype,"descriptors",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return[]}}),p(u.prototype,"setAriaDescribedBy",[o.action],Object.getOwnPropertyDescriptor(u.prototype,"setAriaDescribedBy"),u.prototype),u)
-e.default=w,(0,t.setComponentTemplate)(f,w)})),define("@hashicorp/design-system-components/components/hds/form/radio-card/label",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"h6OZxfPr",block:'[[[11,1],[24,0,"hds-form-radio-card__label hds-typography-display-300 hds-font-weight-bold"],[17,1],[12],[18,2,null],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/radio-card/label.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/radio/base",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"iCl892cu",block:'[[[11,"input"],[24,4,"radio"],[24,0,"hds-form-radio"],[17,1],[16,2,[30,2]],[12],[13]],["&attrs","@value"],false,[]]',moduleName:"@hashicorp/design-system-components/components/hds/form/radio/base.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/radio/field",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"OPWf7QBt",block:'[[[8,[39,0],null,[["@layout","@contextualClass","@extraAriaDescribedBy","@id"],["flag",[30,1],[30,2],[30,3]]],[["default"],[[[[1,"\\n"],[1,"  "],[18,9,[[28,[37,2],null,[["Label","HelperText","Error"],[[30,4,["Label"]],[30,4,["HelperText"]],[30,4,["Error"]]]]]]],[1,"\\n  "],[8,[30,4,["Control"]],null,null,[["default"],[[[[1,"\\n    "],[8,[39,3],[[24,0,"hds-form-field__control"],[16,3,[30,5]],[16,"required",[30,6]],[17,7],[16,1,[30,4,["id"]]],[16,"aria-describedby",[30,4,["ariaDescribedBy"]]]],[["@value"],[[30,8]]],null],[1,"\\n  "]],[]]]]],[1,"\\n"]],[4]]]]]],["@contextualClass","@extraAriaDescribedBy","@id","F","@name","@isRequired","&attrs","@value","&default"],false,["hds/form/field","yield","hash","hds/form/radio/base"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/radio/field.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/radio/group",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"SNOTiwr3",block:'[[[8,[39,0],[[17,1]],[["@layout","@name","@isRequired","@isOptional"],[[30,2],[30,3],[30,4],[30,5]]],[["default"],[[[[1,"\\n"],[1,"  "],[18,7,[[28,[37,2],null,[["Legend","isRequired","isOptional"],[[30,6,["Legend"]],[30,6,["isRequired"]],[30,6,["isOptional"]]]]]]],[1,"\\n  "],[18,7,[[28,[37,2],null,[["HelperText","Error"],[[30,6,["HelperText"]],[30,6,["Error"]]]]]]],[1,"\\n  "],[8,[30,6,["Control"]],null,null,[["default"],[[[[1,"\\n    "],[18,7,[[28,[37,2],null,[["Radio::Field"],[[50,"hds/form/radio/field",0,null,[["contextualClass","isRequired","name","extraAriaDescribedBy"],["hds-form-group__control-field",[30,4],[30,3],[30,6,["ariaDescribedBy"]]]]]]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[6]]]]]],["&attrs","@layout","@name","@isRequired","@isOptional","F","&default"],false,["hds/form/fieldset","yield","hash","component"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/radio/group.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/select/base",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"Dp3ziYzK",block:'[[[11,"select"],[16,0,[30,0,["classNames"]]],[17,1],[4,[38,0],null,[["width"],[[30,2]]]],[12],[1,"\\n  "],[18,3,[[28,[37,2],null,[["Options"],[[50,"hds/yield",0,null,null]]]]]],[1,"\\n"],[13]],["&attrs","@width","&default"],false,["style","yield","hash","component"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/select/base.hbs",isStrictMode:!1})
-class o extends n.default{get classNames(){let e=["hds-form-select"]
-return e.push("hds-typography-body-200","hds-font-weight-regular"),this.args.isInvalid&&e.push("hds-form-select--is-invalid"),e.join(" ")}}e.default=o,(0,t.setComponentTemplate)(i,o)})),define("@hashicorp/design-system-components/components/hds/form/select/field",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"ksQf0zsy",block:'[[[8,[39,0],null,[["@layout","@extraAriaDescribedBy","@isRequired","@isOptional","@id"],["vertical",[30,1],[30,2],[30,3],[30,4]]],[["default"],[[[[1,"\\n"],[1,"  "],[18,11,[[28,[37,2],null,[["Label","isRequired","isOptional"],[[30,5,["Label"]],[30,5,["isRequired"]],[30,5,["isOptional"]]]]]]],[1,"\\n  "],[18,11,[[28,[37,2],null,[["HelperText","Error"],[[30,5,["HelperText"]],[30,5,["Error"]]]]]]],[1,"\\n  "],[8,[30,5,["Control"]],null,null,[["default"],[[[[1,"\\n    "],[8,[39,3],[[24,0,"hds-form-field__control"],[16,"required",[30,2]],[17,6],[16,1,[30,5,["id"]]],[16,"aria-describedby",[30,5,["ariaDescribedBy"]]]],[["@value","@isInvalid","@width"],[[30,7],[30,8],[30,9]]],[["default"],[[[[1,"\\n      "],[18,11,[[28,[37,2],null,[["Options"],[[30,10,["Options"]]]]]]],[1,"\\n    "]],[10]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[5]]]]]],["@extraAriaDescribedBy","@isRequired","@isOptional","@id","F","&attrs","@value","@isInvalid","@width","S","&default"],false,["hds/form/field","yield","hash","hds/form/select/base"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/select/field.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/text-input/base",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.TYPES=e.DEFAULT_TYPE=void 0
-const o=(0,r.createTemplateFactory)({id:"Rf5DwOys",block:'[[[11,"input"],[16,0,[30,0,["classNames"]]],[17,1],[16,2,[30,2]],[16,4,[30,0,["type"]]],[4,[38,0],null,[["width"],[[30,3]]]],[12],[13]],["&attrs","@value","@width"],false,["style"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/text-input/base.hbs",isStrictMode:!1}),s="text"
-e.DEFAULT_TYPE=s
-const a=["text","email","password","url","search","date","time"]
-e.TYPES=a
-class l extends n.default{get type(){let{type:e=s}=this.args
-return e}get classNames(){let e=["hds-form-text-input"]
-return e.push("hds-typography-body-200","hds-font-weight-regular"),this.args.isInvalid&&e.push("hds-form-text-input--is-invalid"),e.join(" ")}}e.default=l,(0,t.setComponentTemplate)(o,l)})),define("@hashicorp/design-system-components/components/hds/form/text-input/field",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"S7sv1WjM",block:'[[[8,[39,0],null,[["@layout","@extraAriaDescribedBy","@isRequired","@isOptional","@id"],["vertical",[30,1],[30,2],[30,3],[30,4]]],[["default"],[[[[1,"\\n"],[1,"  "],[18,11,[[28,[37,2],null,[["Label","isRequired","isOptional"],[[30,5,["Label"]],[30,5,["isRequired"]],[30,5,["isOptional"]]]]]]],[1,"\\n  "],[18,11,[[28,[37,2],null,[["HelperText","Error"],[[30,5,["HelperText"]],[30,5,["Error"]]]]]]],[1,"\\n  "],[8,[30,5,["Control"]],null,null,[["default"],[[[[1,"\\n    "],[8,[39,3],[[24,0,"hds-form-field__control"],[16,"required",[30,2]],[17,6],[16,1,[30,5,["id"]]],[16,"aria-describedby",[30,5,["ariaDescribedBy"]]]],[["@type","@value","@isInvalid","@width"],[[30,7],[30,8],[30,9],[30,10]]],null],[1,"\\n  "]],[]]]]],[1,"\\n"]],[5]]]]]],["@extraAriaDescribedBy","@isRequired","@isOptional","@id","F","&attrs","@type","@value","@isInvalid","@width","&default"],false,["hds/form/field","yield","hash","hds/form/text-input/base"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/text-input/field.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/textarea/base",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"oXXOJvzN",block:'[[[8,[39,0],[[16,0,[30,0,["classNames"]]],[24,"rows","4"],[17,1],[4,[38,1],null,[["width","height"],[[30,3],[30,4]]]]],[["@value"],[[30,2]]],null]],["&attrs","@value","@width","@height"],false,["textarea","style"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/textarea/base.hbs",isStrictMode:!1})
-class o extends n.default{get classNames(){let e=["hds-form-textarea"]
-return e.push("hds-typography-body-200","hds-font-weight-regular"),this.args.isInvalid&&e.push("hds-form-textarea--is-invalid"),e.join(" ")}}e.default=o,(0,t.setComponentTemplate)(i,o)})),define("@hashicorp/design-system-components/components/hds/form/textarea/field",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"XsetVw5b",block:'[[[8,[39,0],null,[["@layout","@extraAriaDescribedBy","@isRequired","@isOptional","@id"],["vertical",[30,1],[30,2],[30,3],[30,4]]],[["default"],[[[[1,"\\n"],[1,"  "],[18,11,[[28,[37,2],null,[["Label","isRequired","isOptional"],[[30,5,["Label"]],[30,5,["isRequired"]],[30,5,["isOptional"]]]]]]],[1,"\\n  "],[18,11,[[28,[37,2],null,[["HelperText","Error"],[[30,5,["HelperText"]],[30,5,["Error"]]]]]]],[1,"\\n  "],[8,[30,5,["Control"]],null,null,[["default"],[[[[1,"\\n    "],[8,[39,3],[[24,0,"hds-form-field__control"],[16,"required",[30,2]],[17,6],[16,1,[30,5,["id"]]],[16,"aria-describedby",[30,5,["ariaDescribedBy"]]]],[["@value","@isInvalid","@width","@height"],[[30,7],[30,8],[30,9],[30,10]]],null],[1,"\\n  "]],[]]]]],[1,"\\n"]],[5]]]]]],["@extraAriaDescribedBy","@isRequired","@isOptional","@id","F","&attrs","@value","@isInvalid","@width","@height","&default"],false,["hds/form/field","yield","hash","hds/form/textarea/base"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/textarea/field.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/toggle/base",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"F5OEs7Ej",block:'[[[10,0],[15,0,[30,0,["classNames"]]],[12],[1,"\\n  "],[11,"input"],[24,0,"hds-form-toggle__control"],[24,4,"checkbox"],[17,1],[16,2,[30,2]],[24,"role","switch"],[12],[13],[1,"\\n  "],[10,0],[14,0,"hds-form-toggle__facade"],[12],[13],[1,"\\n"],[13]],["&attrs","@value"],false,[]]',moduleName:"@hashicorp/design-system-components/components/hds/form/toggle/base.hbs",isStrictMode:!1})
-class o extends n.default{get classNames(){let e=["hds-form-toggle"]
-return this.args._wrapperClass&&e.push(this.args._wrapperClass),e.join(" ")}}e.default=o,(0,t.setComponentTemplate)(i,o)})),define("@hashicorp/design-system-components/components/hds/form/toggle/field",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"N6fRNbPf",block:'[[[8,[39,0],null,[["@layout","@contextualClass","@extraAriaDescribedBy","@id"],["flag",[30,1],[30,2],[30,3]]],[["default"],[[[[1,"\\n"],[1,"  "],[18,8,[[28,[37,2],null,[["Label","HelperText","Error"],[[30,4,["Label"]],[30,4,["HelperText"]],[30,4,["Error"]]]]]]],[1,"\\n  "],[8,[30,4,["Control"]],null,null,[["default"],[[[[1,"\\n    "],[8,[39,3],[[16,"required",[30,5]],[17,6],[16,1,[30,4,["id"]]],[16,"aria-describedby",[30,4,["ariaDescribedBy"]]]],[["@_wrapperClass","@value"],["hds-form-field__control",[30,7]]],null],[1,"\\n  "]],[]]]]],[1,"\\n"]],[4]]]]]],["@contextualClass","@extraAriaDescribedBy","@id","F","@isRequired","&attrs","@value","&default"],false,["hds/form/field","yield","hash","hds/form/toggle/base"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/toggle/field.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/toggle/group",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"kXaopVmM",block:'[[[8,[39,0],[[17,1]],[["@layout","@isRequired","@isOptional"],[[30,2],[30,3],[30,4]]],[["default"],[[[[1,"\\n"],[1,"  "],[18,6,[[28,[37,2],null,[["Legend","isRequired","isOptional"],[[30,5,["Legend"]],[30,5,["isRequired"]],[30,5,["isOptional"]]]]]]],[1,"\\n  "],[18,6,[[28,[37,2],null,[["HelperText","Error"],[[30,5,["HelperText"]],[30,5,["Error"]]]]]]],[1,"\\n  "],[8,[30,5,["Control"]],null,null,[["default"],[[[[1,"\\n    "],[18,6,[[28,[37,2],null,[["Toggle::Field"],[[50,"hds/form/toggle/field",0,null,[["contextualClass","isRequired","extraAriaDescribedBy"],["hds-form-group__control-field",[30,3],[30,5,["ariaDescribedBy"]]]]]]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[5]]]]]],["&attrs","@layout","@isRequired","@isOptional","F","&default"],false,["hds/form/fieldset","yield","hash","component"]]',moduleName:"@hashicorp/design-system-components/components/hds/form/toggle/group.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/form/utils/getElementId",["exports","@ember/object/internals"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.getElementId=function(e){if(e.args.id)return e.args.id
-e._id||(e._id=(0,t.guidFor)(e))
-return e._id}}))
-define("@hashicorp/design-system-components/components/hds/form/utils/setAriaDescribedBy",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.setAriaDescribedBy=function(e){e.args.extraAriaDescribedBy&&e.descriptors.push(e.args.extraAriaDescribedBy)
-e.descriptors.length&&(e.ariaDescribedBy=e.descriptors.join(" "))}})),define("@hashicorp/design-system-components/components/hds/icon-tile/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.COLORS=e.PRODUCTS=e.SIZES=e.DEFAULT_COLOR=e.DEFAULT_SIZE=void 0
-const o=(0,r.createTemplateFactory)({id:"sPAO1tus",block:'[[[11,0],[16,0,[30,0,["classNames"]]],[24,"aria-hidden","true"],[17,1],[12],[1,"\\n"],[41,[30,2],[[[1,"    "],[10,0],[14,0,"hds-icon-tile__icon"],[12],[1,"\\n      "],[8,[39,1],null,[["@name","@size","@stretched"],[[30,0,["icon"]],[30,0,["iconSize"]],true]],null],[1,"\\n    "],[13],[1,"\\n"]],[]],null],[41,[30,3],[[[1,"    "],[10,0],[14,0,"hds-icon-tile__logo"],[12],[1,"\\n      "],[8,[39,1],null,[["@name","@size","@stretched"],[[30,0,["icon"]],[30,0,["iconSize"]],true]],null],[1,"\\n    "],[13],[1,"\\n"]],[]],null],[41,[30,0,["iconSecondary"]],[[[1,"    "],[10,0],[14,0,"hds-icon-tile__extra"],[12],[1,"\\n      "],[10,0],[14,0,"hds-icon-tile__extra-icon"],[12],[1,"\\n        "],[8,[39,1],null,[["@name","@size","@stretched"],[[30,0,["iconSecondary"]],"16",true]],null],[1,"\\n      "],[13],[1,"\\n    "],[13],[1,"\\n"]],[]],null],[13]],["&attrs","@icon","@logo"],false,["if","flight-icon"]]',moduleName:"@hashicorp/design-system-components/components/hds/icon-tile/index.hbs",isStrictMode:!1}),s="medium"
-e.DEFAULT_SIZE=s
-const a="neutral"
-e.DEFAULT_COLOR=a
-const l=["small","medium","large"]
-e.SIZES=l
-const u=["boundary","consul","hcp","nomad","packer","terraform","vagrant","vault","waypoint"]
-e.PRODUCTS=u
-const c=["neutral",...u]
-e.COLORS=c
-class d extends n.default{get size(){let{size:e=s}=this.args
-return e}get color(){let{color:e=a}=this.args
-return this.logo&&(e=this.logo),e}get icon(){return this.args.logo?`${this.args.logo}-color`:this.args.icon?this.args.icon:null}get iconSize(){return"small"===this.args.size?"16":"24"}get logo(){let{logo:e}=this.args
-return null!=e?e:null}get entity(){let e
-return this.args.logo&&(e="logo"),this.args.icon&&(e="icon"),e}get iconSecondary(){var e
-return null!==(e=this.args.iconSecondary)&&void 0!==e?e:null}get classNames(){let e=["hds-icon-tile"]
-return e.push(`hds-icon-tile--${this.entity}`),e.push(`hds-icon-tile--size-${this.size}`),e.push(`hds-icon-tile--color-${this.color}`),e.join(" ")}}e.default=d,(0,t.setComponentTemplate)(o,d)})),define("@hashicorp/design-system-components/components/hds/interactive/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object"],(function(e,t,r,n,i){"use strict"
-var o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const s=(0,r.createTemplateFactory)({id:"/WUZ2xZ+",block:'[[[41,[30,1],[[[41,[30,0,["isRouteExternal"]],[[[8,[39,1],[[17,2]],[["@current-when","@models","@query","@replace","@route"],[[30,3],[28,[37,2],[[30,4],[30,5]],null],[28,[37,3],[[30,6]],null],[30,7],[30,1]]],[["default"],[[[[18,9,null]],[]]]]]],[]],[[[8,[39,5],[[17,2]],[["@current-when","@models","@query","@replace","@route"],[[30,3],[28,[37,2],[[30,4],[30,5]],null],[28,[37,3],[[30,6]],null],[30,7],[30,1]]],[["default"],[[[[18,9,null]],[]]]]]],[]]]],[]],[[[41,[30,8],[[[41,[30,0,["isHrefExternal"]],[[[11,3],[24,"target","_blank"],[24,"rel","noopener noreferrer"],[17,2],[16,6,[30,8]],[4,[38,6],["keyup",[30,0,["onKeyUp"]]],null],[12],[18,9,null],[13]],[]],[[[11,3],[17,2],[16,6,[30,8]],[4,[38,6],["keyup",[30,0,["onKeyUp"]]],null],[12],[18,9,null],[13]],[]]]],[]],[[[11,"button"],[24,4,"button"],[17,2],[12],[18,9,null],[13]],[]]]],[]]]],["@route","&attrs","@current-when","@model","@models","@query","@replace","@href","&default"],false,["if","link-to-external","hds-link-to-models","hds-link-to-query","yield","link-to","on"]]',moduleName:"@hashicorp/design-system-components/components/hds/interactive/index.hbs",isStrictMode:!1})
-let a=(o=class extends n.default{get isHrefExternal(){var e
-return null===(e=this.args.isHrefExternal)||void 0===e||e}get isRouteExternal(){var e
-return null!==(e=this.args.isRouteExternal)&&void 0!==e&&e}onKeyUp(e){" "!==e.key&&"Space"!==e.code||e.target.click()}},l=o.prototype,u="onKeyUp",c=[i.action],d=Object.getOwnPropertyDescriptor(o.prototype,"onKeyUp"),h=o.prototype,p={},Object.keys(d).forEach((function(e){p[e]=d[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=c.slice().reverse().reduce((function(e,t){return t(l,u,e)||e}),p),h&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(h):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(l,u,p),p=null),o)
-var l,u,c,d,h,p
-e.default=a,(0,t.setComponentTemplate)(s,a)})),define("@hashicorp/design-system-components/components/hds/link/inline",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.COLORS=e.ICONPOSITIONS=e.DEFAULT_COLOR=e.DEFAULT_ICONPOSITION=void 0
-const o=(0,r.createTemplateFactory)({id:"UdDwYmFg",block:'[[[8,[39,0],[[16,0,[30,0,["classNames"]]],[17,1]],[["@current-when","@models","@query","@replace","@route","@isRouteExternal","@href","@isHrefExternal"],[[30,2],[28,[37,1],[[30,3],[30,4]],null],[28,[37,2],[[30,5]],null],[30,6],[30,7],[30,8],[30,9],[30,10]]],[["default"],[[[[41,[28,[37,4],[[30,11],[28,[37,5],[[30,0,["iconPosition"]],"leading"],null]],null],[[[10,1],[14,0,"hds-link-inline__icon hds-link-inline__icon--leading"],[12],[1,"\\n      "],[8,[39,6],null,[["@name","@size","@stretched"],[[30,11],"16",true]],null],[1,"\\n    "],[13]],[]],null],[18,12,null],[41,[28,[37,4],[[30,11],[28,[37,5],[[30,0,["iconPosition"]],"trailing"],null]],null],[[[10,1],[14,0,"hds-link-inline__icon hds-link-inline__icon--trailing"],[12],[1,"\\n      "],[8,[39,6],null,[["@name","@size","@stretched"],[[30,11],"16",true]],null],[1,"\\n    "],[13]],[]],null]],[]]]]]],["&attrs","@current-when","@model","@models","@query","@replace","@route","@isRouteExternal","@href","@isHrefExternal","@icon","&default"],false,["hds/interactive","hds-link-to-models","hds-link-to-query","if","and","eq","flight-icon","yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/link/inline.hbs",isStrictMode:!1}),s="trailing"
-e.DEFAULT_ICONPOSITION=s
-const a="primary"
-e.DEFAULT_COLOR=a
-const l=["leading","trailing"]
-e.ICONPOSITIONS=l
-const u=["primary","secondary"]
-e.COLORS=u
-class c extends n.default{constructor(){super(...arguments),!this.args.href&&this.args.route}get color(){let{color:e=a}=this.args
-return e}get iconPosition(){let{iconPosition:e=s}=this.args
-return e}get classNames(){let e=["hds-link-inline"]
-return e.push(`hds-link-inline--color-${this.color}`),e.push(`hds-link-inline--icon-${this.iconPosition}`),e.join(" ")}}e.default=c,(0,t.setComponentTemplate)(o,c)})),define("@hashicorp/design-system-components/components/hds/link/standalone",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.SIZES=e.COLORS=e.ICONPOSITIONS=e.DEFAULT_SIZE=e.DEFAULT_COLOR=e.DEFAULT_ICONPOSITION=void 0
-const o=(0,r.createTemplateFactory)({id:"TDpREEMJ",block:'[[[8,[39,0],[[16,0,[30,0,["classNames"]]],[17,1]],[["@current-when","@models","@query","@replace","@route","@isRouteExternal","@href","@isHrefExternal"],[[30,2],[28,[37,1],[[30,3],[30,4]],null],[28,[37,2],[[30,5]],null],[30,6],[30,7],[30,8],[30,9],[30,10]]],[["default"],[[[[1,"\\n"],[41,[28,[37,4],[[30,0,["iconPosition"]],"leading"],null],[[[1,"    "],[10,0],[14,0,"hds-link-standalone__icon"],[12],[1,"\\n      "],[8,[39,5],null,[["@name","@size","@stretched"],[[30,0,["icon"]],[30,0,["iconSize"]],true]],null],[1,"\\n    "],[13],[1,"\\n    "],[10,0],[14,0,"hds-link-standalone__text"],[12],[1,"\\n      "],[1,[30,0,["text"]]],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[1,"    "],[10,0],[14,0,"hds-link-standalone__text"],[12],[1,"\\n      "],[1,[30,0,["text"]]],[1,"\\n    "],[13],[1,"\\n    "],[10,0],[14,0,"hds-link-standalone__icon"],[12],[1,"\\n      "],[8,[39,5],null,[["@name","@size","@stretched"],[[30,0,["icon"]],[30,0,["iconSize"]],true]],null],[1,"\\n    "],[13],[1,"\\n"]],[]]]],[]]]]]],["&attrs","@current-when","@model","@models","@query","@replace","@route","@isRouteExternal","@href","@isHrefExternal"],false,["hds/interactive","hds-link-to-models","hds-link-to-query","if","eq","flight-icon"]]',moduleName:"@hashicorp/design-system-components/components/hds/link/standalone.hbs",isStrictMode:!1}),s="leading"
-e.DEFAULT_ICONPOSITION=s
-const a="primary"
-e.DEFAULT_COLOR=a
-const l="medium"
-e.DEFAULT_SIZE=l
-const u=["leading","trailing"]
-e.ICONPOSITIONS=u
-const c=["primary","secondary"]
-e.COLORS=c
-const d=["small","medium","large"]
-e.SIZES=d
-class h extends n.default{constructor(){super(...arguments),!this.args.href&&this.args.route}get text(){let{text:e}=this.args
-return e}get color(){let{color:e=a}=this.args
-return e}get icon(){let{icon:e}=this.args
-return e}get iconPosition(){let{iconPosition:e=s}=this.args
-return e}get size(){let{size:e=l}=this.args
-return e}get iconSize(){return"large"===this.args.size?"24":"16"}get classNames(){let e=["hds-link-standalone"]
-return e.push(`hds-link-standalone--size-${this.size}`),e.push(`hds-link-standalone--color-${this.color}`),e.push(`hds-link-standalone--icon-position-${this.iconPosition}`),e.join(" ")}}e.default=h,(0,t.setComponentTemplate)(o,h)})),define("@hashicorp/design-system-components/components/hds/modal/body",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"18Ka7eIq",block:'[[[11,0],[24,0,"hds-modal__body"],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/modal/body.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/modal/footer",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"Aq7q3AjG",block:'[[[11,0],[24,0,"hds-modal__footer"],[17,1],[12],[1,"\\n  "],[18,3,[[28,[37,1],null,[["close"],[[30,2]]]]]],[1,"\\n"],[13]],["&attrs","@onDismiss","&default"],false,["yield","hash"]]',moduleName:"@hashicorp/design-system-components/components/hds/modal/footer.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/modal/header",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"N9MzMdIW",block:'[[[11,0],[24,0,"hds-modal__header"],[17,1],[12],[1,"\\n"],[41,[30,2],[[[1,"    "],[8,[39,1],[[24,0,"hds-modal__icon"]],[["@name","@size","@isInlineBlock"],[[30,2],"24",false]],null],[1,"\\n"]],[]],null],[1,"  "],[10,0],[14,0,"hds-modal__title hds-typography-display-300 hds-font-weight-semibold"],[15,1,[30,3]],[12],[1,"\\n"],[41,[30,4],[[[1,"      "],[10,0],[14,0,"hds-modal__tagline hds-typography-body-100 hds-font-weight-regular"],[12],[1,"\\n        "],[1,[30,4]],[1,"\\n      "],[13],[1,"\\n"]],[]],null],[1,"    "],[18,6,null],[1,"\\n  "],[13],[1,"\\n  "],[8,[39,3],[[24,0,"hds-modal__dismiss"],[4,[38,4],["click",[30,5]],null]],null,null],[1,"\\n"],[13]],["&attrs","@icon","@id","@tagline","@onDismiss","&default"],false,["if","flight-icon","yield","hds/dismiss-button","on"]]',moduleName:"@hashicorp/design-system-components/components/hds/modal/header.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/modal/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@ember/debug","@hashicorp/design-system-components/components/hds/form/utils/getElementId","@glimmer/tracking"],(function(e,t,r,n,i,o,s,a){"use strict"
-var l,u,c
-function d(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function h(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.COLORS=e.SIZES=e.DEFAULT_COLOR=e.DEFAULT_SIZE=void 0
-const p=(0,r.createTemplateFactory)({id:"uTChSsHT",block:'[[[11,"dialog"],[16,0,[30,0,["classNames"]]],[17,1],[16,"aria-labelledby",[30,0,["id"]]],[4,[38,0],[[30,0,["didInsert"]]],null],[4,[38,1],null,[["isActive","focusTrapOptions"],[[30,0,["isOpen"]],[28,[37,2],null,[["onDeactivate","clickOutsideDeactivates"],[[30,0,["onDismiss"]],true]]]]]],[12],[1,"\\n  "],[18,2,[[28,[37,2],null,[["Header"],[[50,"hds/modal/header",0,null,[["id","onDismiss"],[[30,0,["id"]],[30,0,["onDismiss"]]]]]]]]]],[1,"\\n  "],[18,2,[[28,[37,2],null,[["Body"],[[50,"hds/modal/body",0,null,null]]]]]],[1,"\\n  "],[18,2,[[28,[37,2],null,[["Footer"],[[50,"hds/modal/footer",0,null,[["onDismiss"],[[30,0,["onDismiss"]]]]]]]]]],[1,"\\n"],[13],[1,"\\n"],[41,[30,0,["isOpen"]],[[[1,"  "],[10,0],[14,0,"hds-modal__overlay"],[12],[13],[1,"\\n"]],[]],null]],["&attrs","&default"],false,["did-insert","focus-trap","hash","yield","component","if"]]',moduleName:"@hashicorp/design-system-components/components/hds/modal/index.hbs",isStrictMode:!1}),f="medium"
-e.DEFAULT_SIZE=f
-const m="neutral"
-e.DEFAULT_COLOR=m
-const g=["small","medium","large"]
-e.SIZES=g
-const v=["neutral","warning","critical"]
-e.COLORS=v
-let b=(l=class extends n.default{constructor(){super(...arguments),d(this,"isOpen",u,this),d(this,"isDismissDisabled",c,this)}get size(){let{size:e=f}=this.args
-return e}get color(){let{color:e=m}=this.args
-return e}get id(){return(0,s.getElementId)(this)}get classNames(){let e=["hds-modal"]
-return e.push(`hds-modal--size-${this.size}`),e.push(`hds-modal--color-${this.color}`),e.join(" ")}didInsert(e){this.element=e,e.showModal||Promise.all([emberAutoImportDynamic("dialog-polyfill"),emberAutoImportDynamic("dialog-polyfill-css")]).then((t=>{let[r]=t
-const n=r.default
-n.registerDialog&&(n.registerDialog(e),e.classList.add("fixed"))})).catch({}),this.element.addEventListener("close",(()=>{this.args.onClose&&"function"==typeof this.args.onClose&&this.args.onClose(),this.isDismissDisabled?this.element.parentElement&&this.element.showModal():this.isOpen=!1})),this.element.open||this.open()}open(){this.element.showModal(),this.isOpen=!0,this.args.onOpen&&"function"==typeof this.args.onOpen&&this.args.onOpen()}onDismiss(){this.element.close()}},u=h(l.prototype,"isOpen",[a.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),c=h(l.prototype,"isDismissDisabled",[a.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){var e
-return null!==(e=this.args.isDismissDisabled)&&void 0!==e&&e}}),h(l.prototype,"didInsert",[i.action],Object.getOwnPropertyDescriptor(l.prototype,"didInsert"),l.prototype),h(l.prototype,"open",[i.action],Object.getOwnPropertyDescriptor(l.prototype,"open"),l.prototype),h(l.prototype,"onDismiss",[i.action],Object.getOwnPropertyDescriptor(l.prototype,"onDismiss"),l.prototype),l)
-e.default=b,(0,t.setComponentTemplate)(p,b)})),define("@hashicorp/design-system-components/components/hds/pagination/compact/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@ember/debug","@ember/service"],(function(e,t,r,n,i,o,s){"use strict"
-var a,l
-function u(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const c=(0,r.createTemplateFactory)({id:"bOgejXgY",block:'[[[11,0],[24,0,"hds-pagination"],[17,1],[12],[1,"\\n  "],[10,"nav"],[14,0,"hds-pagination-nav"],[14,"aria-label","Pagination navigation"],[12],[1,"\\n    "],[8,[39,0],null,[["@direction","@showLabel","@route","@query","@model","@models","@replace","@onClick","@disabled"],["prev",[30,0,["showLabels"]],[30,0,["routing","route"]],[30,0,["routing","queryPrev"]],[30,0,["routing","model"]],[30,0,["routing","models"]],[30,0,["routing","replace"]],[30,0,["onPageChange"]],[30,2]]],null],[1,"\\n    "],[8,[39,0],null,[["@direction","@showLabel","@route","@query","@model","@models","@replace","@onClick","@disabled"],["next",[30,0,["showLabels"]],[30,0,["routing","route"]],[30,0,["routing","queryNext"]],[30,0,["routing","model"]],[30,0,["routing","models"]],[30,0,["routing","replace"]],[30,0,["onPageChange"]],[30,3]]],null],[1,"\\n  "],[13],[1,"\\n"],[13]],["&attrs","@isDisabledPrev","@isDisabledNext"],false,["hds/pagination/nav/arrow"]]',moduleName:"@hashicorp/design-system-components/components/hds/pagination/compact/index.hbs",isStrictMode:!1})
-let d=(a=class extends n.default{constructor(){var e,t,r,n
-super(...arguments),e=this,t="router",n=this,(r=l)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})
-let{queryFunction:i}=this.args
-this.hasRouting=void 0!==i}get showLabels(){let{showLabels:e=!0}=this.args
-return e}get routeQueryParams(){var e
-return(null===(e=this.router.currentRoute)||void 0===e?void 0:e.queryParams)||{}}buildQueryParamsObject(e){return this.hasRouting?this.args.queryFunction(e,this.currentPage):{}}get routing(){var e,t,r,n
-let i={route:null!==(e=this.args.route)&&void 0!==e?e:void 0,model:null!==(t=this.args.model)&&void 0!==t?t:void 0,models:null!==(r=this.args.models)&&void 0!==r?r:void 0,replace:null!==(n=this.args.replace)&&void 0!==n?n:void 0}
-return this.hasRouting?(i.queryPrev=this.buildQueryParamsObject("prev"),i.queryNext=this.buildQueryParamsObject("next")):(i.queryPrev=void 0,i.queryNext=void 0),i}onPageChange(e){this.currentPage=e
-let{onPageChange:t}=this.args
-"function"==typeof t&&t(e)}},l=u(a.prototype,"router",[s.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u(a.prototype,"onPageChange",[i.action],Object.getOwnPropertyDescriptor(a.prototype,"onPageChange"),a.prototype),a)
-e.default=d,(0,t.setComponentTemplate)(c,d)})),define("@hashicorp/design-system-components/components/hds/pagination/info/index",["exports","@ember/component","@ember/template-factory","@glimmer/component"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"a0P5JJqh",block:'[[[11,0],[24,0,"hds-pagination-info hds-typography-body-100 hds-font-weight-medium"],[17,1],[12],[1,"\\n  "],[1,[30,2]],[1,"–"],[1,[30,3]],[1,"\\n"],[41,[30,0,["showTotalItems"]],[[[1,"    of\\n    "],[1,[30,4]],[1,"\\n"]],[]],null],[13]],["&attrs","@itemsRangeStart","@itemsRangeEnd","@totalItems"],false,["if"]]',moduleName:"@hashicorp/design-system-components/components/hds/pagination/info/index.hbs",isStrictMode:!1})
-class o extends n.default{get showTotalItems(){var e
-return null===(e=this.args.showTotalItems)||void 0===e||e}}e.default=o,(0,t.setComponentTemplate)(i,o)})),define("@hashicorp/design-system-components/components/hds/pagination/nav/arrow",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@ember/debug"],(function(e,t,r,n,i,o){"use strict"
-var s
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.DIRECTIONS=void 0
-const a=(0,r.createTemplateFactory)({id:"VwL/rJKs",block:'[[[41,[30,1],[[[1,"  "],[8,[39,1],[[16,0,[30,0,["classNames"]]],[16,"aria-label",[30,0,["content","ariaLabel"]]],[16,"disabled",true],[17,2]],null,[["default"],[[[[1,"\\n    "],[8,[39,2],null,[["@name"],[[30,0,["content","icon"]]]],null],[1,"\\n"],[41,[30,0,["showLabel"]],[[[1,"      "],[10,1],[14,0,"hds-pagination-nav__arrow-label"],[14,"aria-hidden","true"],[12],[1,"\\n        "],[1,[30,0,["content","label"]]],[1,"\\n      "],[13],[1,"\\n"]],[]],null],[1,"  "]],[]]]]],[1,"\\n"]],[]],[[[1,"  "],[8,[39,1],[[16,0,[30,0,["classNames"]]],[16,"aria-label",[30,0,["content","ariaLabel"]]],[17,2],[4,[38,5],["click",[30,0,["onClick"]]],null]],[["@route","@query","@models","@replace"],[[30,3],[28,[37,3],[[30,4]],null],[28,[37,4],[[30,5],[30,6]],null],[30,7]]],[["default"],[[[[1,"\\n    "],[8,[39,2],null,[["@name"],[[30,0,["content","icon"]]]],null],[1,"\\n"],[41,[30,0,["showLabel"]],[[[1,"      "],[10,1],[14,0,"hds-pagination-nav__arrow-label"],[14,"aria-hidden","true"],[12],[1,"\\n        "],[1,[30,0,["content","label"]]],[1,"\\n      "],[13],[1,"\\n"]],[]],null],[1,"  "]],[]]]]],[1,"\\n"]],[]]]],["@disabled","&attrs","@route","@query","@model","@models","@replace"],false,["if","hds/interactive","flight-icon","hds-link-to-query","hds-link-to-models","on"]]',moduleName:"@hashicorp/design-system-components/components/hds/pagination/nav/arrow.hbs",isStrictMode:!1}),l=["prev","next"]
-e.DIRECTIONS=l
-let u=(s=class extends n.default{get content(){let e,{direction:t}=this.args
-return"prev"===t&&(e={label:"Previous",icon:"chevron-left",ariaLabel:"Previous page"}),"next"===t&&(e={label:"Next",icon:"chevron-right",ariaLabel:"Next page"}),e}get showLabel(){let{showLabel:e=!0}=this.args
-return e}get classNames(){return["hds-pagination-nav__control","hds-pagination-nav__arrow",`hds-pagination-nav__arrow--direction-${this.args.direction}`,"hds-typography-body-100","hds-font-weight-medium"].join(" ")}onClick(){let{onClick:e}=this.args
-"function"==typeof e&&e(this.args.direction)}},c=s.prototype,d="onClick",h=[i.action],p=Object.getOwnPropertyDescriptor(s.prototype,"onClick"),f=s.prototype,m={},Object.keys(p).forEach((function(e){m[e]=p[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=h.slice().reverse().reduce((function(e,t){return t(c,d,e)||e}),m),f&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(f):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(c,d,m),m=null),s)
-var c,d,h,p,f,m
-e.default=u,(0,t.setComponentTemplate)(a,u)})),define("@hashicorp/design-system-components/components/hds/pagination/nav/ellipsis",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"oqEMhpNP",block:'[[[11,0],[24,0,"hds-pagination-nav__ellipsis"],[17,1],[12],[1,"..."],[13]],["&attrs"],false,[]]',moduleName:"@hashicorp/design-system-components/components/hds/pagination/nav/ellipsis.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/pagination/nav/number",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@ember/debug"],(function(e,t,r,n,i,o){"use strict"
-var s
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const a=(0,r.createTemplateFactory)({id:"A/wZsNbz",block:'[[[8,[39,0],[[16,0,[30,0,["classNames"]]],[17,1],[16,"aria-current",[52,[30,2],"page",null]],[4,[38,4],["click",[30,0,["onClick"]]],null]],[["@route","@query","@models","@replace"],[[30,3],[28,[37,2],[[30,4]],null],[28,[37,3],[[30,5],[30,6]],null],[30,7]]],[["default"],[[[[1,"\\n  "],[10,1],[14,0,"sr-only"],[12],[1,"page "],[13],[1,[30,0,["page"]]],[1,"\\n"]],[]]]]]],["&attrs","@isSelected","@route","@query","@model","@models","@replace"],false,["hds/interactive","if","hds-link-to-query","hds-link-to-models","on"]]',moduleName:"@hashicorp/design-system-components/components/hds/pagination/nav/number.hbs",isStrictMode:!1})
-let l=(s=class extends n.default{get page(){let{page:e}=this.args
-return e}get classNames(){let e=["hds-pagination-nav__control","hds-pagination-nav__number","hds-typography-body-100",'hds-font-weight-medium"']
-return this.args.isSelected&&e.push("hds-pagination-nav__number--is-selected"),e.join(" ")}onClick(){let{onClick:e}=this.args
-"function"==typeof e&&e(this.args.page)}},u=s.prototype,c="onClick",d=[i.action],h=Object.getOwnPropertyDescriptor(s.prototype,"onClick"),p=s.prototype,f={},Object.keys(h).forEach((function(e){f[e]=h[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=d.slice().reverse().reduce((function(e,t){return t(u,c,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,c,f),f=null),s)
-var u,c,d,h,p,f
-e.default=l,(0,t.setComponentTemplate)(a,l)})),define("@hashicorp/design-system-components/components/hds/pagination/numbered/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@glimmer/tracking","@ember/debug","@ember/service"],(function(e,t,r,n,i,o,s,a){"use strict"
-var l,u,c,d
-function h(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function p(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function f(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.elliptize=e.DEFAULT_PAGE_SIZES=void 0
-const m=(0,r.createTemplateFactory)({id:"Cu9+Efdd",block:'[[[11,0],[24,0,"hds-pagination"],[17,1],[12],[1,"\\n"],[41,[30,0,["showInfo"]],[[[1,"    "],[8,[39,1],null,[["@itemsRangeStart","@itemsRangeEnd","@totalItems","@showTotalItems"],[[30,0,["itemsRangeStart"]],[30,0,["itemsRangeEnd"]],[30,2],[30,3]]],null],[1,"\\n"]],[]],null],[1,"\\n  "],[10,"nav"],[14,0,"hds-pagination-nav"],[14,"aria-label","Pagination navigation"],[12],[1,"\\n    "],[8,[39,2],null,[["@direction","@showLabel","@route","@query","@model","@models","@replace","@onClick","@disabled"],["prev",[30,0,["showLabels"]],[30,0,["routing","route"]],[30,0,["routing","queryPrev"]],[30,0,["routing","model"]],[30,0,["routing","models"]],[30,0,["routing","replace"]],[30,0,["onPageChange"]],[30,0,["isDisabledPrev"]]]],null],[1,"\\n"],[41,[30,0,["showPageNumbers"]],[[[1,"      "],[10,"ul"],[14,0,"hds-pagination-nav__page-list"],[12],[1,"\\n"],[42,[28,[37,4],[[28,[37,4],[[30,0,["pages"]]],null]],null],null,[[[1,"          "],[10,"li"],[14,0,"hds-pagination-nav__page-item"],[12],[1,"\\n"],[41,[28,[37,5],[[30,4],"…"],null],[[[1,"              "],[8,[39,6],null,null,null],[1,"\\n"]],[]],[[[1,"              "],[8,[39,7],null,[["@page","@route","@query","@model","@models","@replace","@onClick","@isSelected"],[[30,4],[30,0,["routing","route"]],[28,[37,8],[[30,0,["routing","queryPages"]],[30,4]],null],[30,0,["routing","model"]],[30,0,["routing","models"]],[30,0,["routing","replace"]],[30,0,["onPageChange"]],[52,[28,[37,5],[[30,4],[30,0,["currentPage"]]],null],true,false]]],null],[1,"\\n"]],[]]],[1,"          "],[13],[1,"\\n"]],[4]],null],[1,"      "],[13],[1,"\\n"]],[]],null],[1,"    "],[8,[39,2],null,[["@direction","@showLabel","@route","@query","@model","@models","@replace","@onClick","@disabled"],["next",[30,0,["showLabels"]],[30,0,["routing","route"]],[30,0,["routing","queryNext"]],[30,0,["routing","model"]],[30,0,["routing","models"]],[30,0,["routing","replace"]],[30,0,["onPageChange"]],[30,0,["isDisabledNext"]]]],null],[1,"\\n  "],[13],[1,"\\n\\n"],[41,[30,0,["showSizeSelector"]],[[[1,"    "],[8,[39,9],null,[["@pageSizes","@selectedSize","@onChange"],[[30,0,["pageSizes"]],[30,0,["currentPageSize"]],[30,0,["onPageSizeChange"]]]],null],[1,"\\n"]],[]],null],[13]],["&attrs","@totalItems","@showTotalItems","page"],false,["if","hds/pagination/info","hds/pagination/nav/arrow","each","-track-array","eq","hds/pagination/nav/ellipsis","hds/pagination/nav/number","get","hds/pagination/size-selector"]]',moduleName:"@hashicorp/design-system-components/components/hds/pagination/numbered/index.hbs",isStrictMode:!1}),g=[10,30,50]
-e.DEFAULT_PAGE_SIZES=g
-const v=e=>{let{pages:t,current:r,limit:n=7}=e
-const i=t.length,o="…"
-let s,a,l=[]
-if(i<=n)return t
-r<=i/2?(s=Math.ceil(n/2),a=n-s):(a=Math.ceil(n/2),s=n-a)
-const u=t.slice(0,s),c=t.slice(-a)
-if(u.includes(r)&&u.includes(r+1))c.splice(0,1,o),l=[].concat(u,c)
-else if(c.includes(r-1)&&c.includes(r))u.splice(-1,1,o),l=[].concat(u,c)
-else{const e=(n-5)/2,i=t.slice(r-e-1,r+e)
-l=[].concat(u.shift(),o,i,o,c.pop())}return l}
-e.elliptize=v
-let b=(l=class extends n.default{constructor(){var e,t,r,n,i
-super(...arguments),h(this,"router",u,this),h(this,"_currentPage",c,this),h(this,"_currentPageSize",d,this),p(this,"showInfo",null===(e=this.args.showInfo)||void 0===e||e),p(this,"showLabels",null!==(t=this.args.showLabels)&&void 0!==t&&t),p(this,"showSizeSelector",null===(r=this.args.showSizeSelector)||void 0===r||r),p(this,"showPageNumbers",null===(n=this.args.showPageNumbers)||void 0===n||n),p(this,"isTruncated",null===(i=this.args.isTruncated)||void 0===i||i)
-let{queryFunction:o}=this.args
-this.hasRouting=void 0!==o}get currentPage(){return this.hasRouting?this.args.currentPage:this._currentPage}set currentPage(e){this.hasRouting||(this._currentPage=e)}get currentPageSize(){return this.hasRouting?this.args.currentPageSize:this._currentPageSize}set currentPageSize(e){this.hasRouting||(this._currentPageSize=e)}get pageSizes(){let{pageSizes:e=g}=this.args
-return e}get itemsRangeStart(){return(this.currentPage-1)*this.currentPageSize+1}get itemsRangeEnd(){return this.currentPage*this.currentPageSize<this.args.totalItems?this.itemsRangeStart+this.currentPageSize-1:this.args.totalItems}get pages(){let e=[]
-for(let t=1;t<=this.totalPages;t++)e.push(t)
-return this.isTruncated?v({pages:e,current:this.currentPage}):e}get totalPages(){return Math.max(Math.ceil(this.args.totalItems/this.currentPageSize),1)}get routeQueryParams(){var e
-return(null===(e=this.router.currentRoute)||void 0===e?void 0:e.queryParams)||{}}buildQueryParamsObject(e,t){return this.hasRouting?this.args.queryFunction(e,t):{}}get routing(){var e,t,r,n
-let i={route:null!==(e=this.args.route)&&void 0!==e?e:void 0,model:null!==(t=this.args.model)&&void 0!==t?t:void 0,models:null!==(r=this.args.models)&&void 0!==r?r:void 0,replace:null!==(n=this.args.replace)&&void 0!==n?n:void 0}
-return this.hasRouting?(i.queryPrev=this.buildQueryParamsObject(this.currentPage-1,this.currentPageSize),i.queryNext=this.buildQueryParamsObject(this.currentPage+1,this.currentPageSize),i.queryPages={},this.pages.forEach((e=>i.queryPages[e]=this.buildQueryParamsObject(e,this.currentPageSize)))):(i.queryPrev=void 0,i.queryNext=void 0,i.queryByPage={}),i}get isDisabledPrev(){return 1===this.currentPage}get isDisabledNext(){return this.currentPage===this.totalPages}onPageChange(e){let t
-if(t="prev"===e&&this.currentPage>1?this.currentPage-1:"next"===e&&this.currentPage<this.totalPages?this.currentPage+1:e,t!==this.currentPage){this.currentPage=t
-let{onPageChange:e}=this.args
-"function"==typeof e&&e(this.currentPage,this.currentPageSize)}}onPageSizeChange(e){let{onPageSizeChange:t}=this.args
-if(this.hasRouting){let t=Object.assign({},this.routeQueryParams)
-t=this.buildQueryParamsObject(1,e),this.router.transitionTo({queryParams:t})}else this.currentPage=1,this.currentPageSize=e
-"function"==typeof t&&t(e)}},u=f(l.prototype,"router",[a.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c=f(l.prototype,"_currentPage",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){var e
-return null!==(e=this.args.currentPage)&&void 0!==e?e:1}}),d=f(l.prototype,"_currentPageSize",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){var e
-return null!==(e=this.args.currentPageSize)&&void 0!==e?e:this.pageSizes[0]}}),f(l.prototype,"onPageChange",[i.action],Object.getOwnPropertyDescriptor(l.prototype,"onPageChange"),l.prototype),f(l.prototype,"onPageSizeChange",[i.action],Object.getOwnPropertyDescriptor(l.prototype,"onPageSizeChange"),l.prototype),l)
-e.default=b,(0,t.setComponentTemplate)(m,b)})),define("@hashicorp/design-system-components/components/hds/pagination/size-selector/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug","@ember/object/internals","@ember/object"],(function(e,t,r,n,i,o,s){"use strict"
-var a
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,r.createTemplateFactory)({id:"3WCOZ5U1",block:'[[[11,0],[24,0,"hds-pagination-size-selector"],[17,1],[12],[1,"\\n  "],[10,"label"],[14,0,"hds-typography-body-100 hds-font-weight-medium"],[15,"for",[30,0,["SizeSelectorId"]]],[12],[1,"Items per page"],[13],[1,"\\n  "],[8,[39,0],[[16,1,[30,0,["SizeSelectorId"]]],[4,[38,1],["change",[30,0,["onChange"]]],null]],null,[["default"],[[[[1,"\\n    "],[8,[30,2,["Options"]],null,null,[["default"],[[[[1,"\\n"],[42,[28,[37,3],[[28,[37,3],[[30,0,["pageSizes"]]],null]],null],null,[[[1,"        "],[10,"option"],[15,2,[30,3]],[15,"selected",[52,[28,[37,5],[[30,3],[30,0,["selectedSize"]]],null],true,null]],[12],[1,[30,3]],[13],[1,"\\n"]],[3]],null],[1,"    "]],[]]]]],[1,"\\n  "]],[2]]]]],[1,"\\n"],[13]],["&attrs","S","size"],false,["hds/form/select/base","on","each","-track-array","if","eq"]]',moduleName:"@hashicorp/design-system-components/components/hds/pagination/size-selector/index.hbs",isStrictMode:!1})
-let u=(a=class extends n.default{constructor(){var e,t,r
-super(...arguments),e=this,t="SizeSelectorId",r="pagination-size-selector-"+(0,o.guidFor)(this),t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r}get pageSizes(){let{pageSizes:e}=this.args
-return e}get selectedSize(){let{selectedSize:e}=this.args
-return e}onChange(e){let{onChange:t}=this.args
-"function"==typeof t&&t(parseInt(e.target.value))}},c=a.prototype,d="onChange",h=[s.action],p=Object.getOwnPropertyDescriptor(a.prototype,"onChange"),f=a.prototype,m={},Object.keys(p).forEach((function(e){m[e]=p[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=h.slice().reverse().reduce((function(e,t){return t(c,d,e)||e}),m),f&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(f):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(c,d,m),m=null),a)
-var c,d,h,p,f,m
-e.default=u,(0,t.setComponentTemplate)(l,u)})),define("@hashicorp/design-system-components/components/hds/stepper/step/indicator",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.STATUSES=e.DEFAULT_STATUS=void 0
-const o=(0,r.createTemplateFactory)({id:"qpBW0XOs",block:'[[[11,0],[16,0,[30,0,["classNames"]]],[17,1],[16,"aria-label",[30,2]],[12],[1,"\\n  "],[10,0],[14,0,"hds-stepper-indicator-step__svg-hexagon"],[12],[1,"\\n    "],[10,"svg"],[14,"width","24"],[14,"height","24"],[14,"viewBox","0 0 24 24"],[14,"fill","none"],[14,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[14,"aria-hidden","true"],[12],[1,"\\n      "],[10,"path"],[14,"d","m3.664 6.264 6.99-4.42a2.5 2.5 0 0 1 2.67-.002l7.01 4.422A2.5 2.5 0 0 1 21.5 8.38v7.242a2.5 2.5 0 0 1-1.166 2.115l-7.01 4.422a2.5 2.5 0 0 1-2.67-.002l-6.99-4.42A2.5 2.5 0 0 1 2.5 15.623V8.377a2.5 2.5 0 0 1 1.164-2.113Z"],[14,"stroke-width","1"],[12],[13],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n  "],[10,0],[14,0,"hds-stepper-indicator-step__status"],[12],[1,"\\n"],[41,[28,[37,1],[[30,2],"processing"],null],[[[1,"      "],[8,[39,2],[[24,0,"hds-stepper-indicator-step__icon"]],[["@name","@size"],["loading","16"]],null],[1,"\\n"]],[]],[[[41,[28,[37,1],[[30,2],"complete"],null],[[[1,"      "],[8,[39,2],[[24,0,"hds-stepper-indicator-step__icon"]],[["@name","@size"],["check","16"]],null],[1,"\\n"]],[]],[[[1,"      "],[10,1],[14,0,"hds-stepper-indicator-step__text"],[12],[1,[30,3]],[13],[1,"\\n    "]],[]]]],[]]],[1,"  "],[13],[1,"\\n"],[13]],["&attrs","@status","@text"],false,["if","eq","flight-icon"]]',moduleName:"@hashicorp/design-system-components/components/hds/stepper/step/indicator.hbs",isStrictMode:!1}),s="incomplete"
-e.DEFAULT_STATUS=s
-const a=["incomplete","progress","processing","complete"]
-e.STATUSES=a
-class l extends n.default{get status(){let{status:e=s}=this.args
-return e}get isInteractive(){return this.args.isInteractive||!1}get classNames(){let e=["hds-stepper-indicator-step"]
-return e.push(`hds-stepper-indicator-step--status-${this.status}`),this.isInteractive&&e.push("hds-stepper-indicator-step--is-interactive"),e.join(" ")}}e.default=l,(0,t.setComponentTemplate)(o,l)})),define("@hashicorp/design-system-components/components/hds/stepper/task/indicator",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.MAPPING_STATUS_TO_ICONS=e.STATUSES=e.DEFAULT_STATUS=void 0
-const o=(0,r.createTemplateFactory)({id:"tSY+0BCd",block:'[[[11,0],[16,0,[30,0,["classNames"]]],[17,1],[16,"aria-label",[30,2]],[12],[1,"\\n  "],[8,[39,0],[[24,0,"hds-stepper-indicator-task__icon"]],[["@name","@size"],[[30,0,["iconName"]],"16"]],null],[1,"\\n"],[13]],["&attrs","@status"],false,["flight-icon"]]',moduleName:"@hashicorp/design-system-components/components/hds/stepper/task/indicator.hbs",isStrictMode:!1}),s="incomplete"
-e.DEFAULT_STATUS=s
-const a=["incomplete","progress","processing","complete"]
-e.STATUSES=a
-const l={incomplete:"circle",progress:"circle-half",processing:"loading",complete:"check-circle"}
-e.MAPPING_STATUS_TO_ICONS=l
-class u extends n.default{get status(){let{status:e=s}=this.args
-return e}get isInteractive(){return this.args.isInteractive||!1}get iconName(){return l[this.status]}get classNames(){let e=["hds-stepper-indicator-task"]
-return e.push(`hds-stepper-indicator-task--status-${this.status}`),this.isInteractive&&e.push("hds-stepper-indicator-task--is-interactive"),e.join(" ")}}e.default=u,(0,t.setComponentTemplate)(o,u)})),define("@hashicorp/design-system-components/components/hds/table/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@glimmer/tracking","@ember/debug"],(function(e,t,r,n,i,o,s){"use strict"
-var a,l,u,c
-function d(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function h(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const p=(0,r.createTemplateFactory)({id:"m4UqSzkc",block:'[[[11,"table"],[16,0,[30,0,["classNames"]]],[17,1],[12],[1,"\\n"],[41,[30,2],[[[1,"    "],[10,"caption"],[14,0,"sr-only"],[14,"aria-live","polite"],[12],[1,[30,3]],[1," "],[1,[30,0,["sortedMessageText"]]],[13],[1,"\\n"]],[]],[[[41,[30,3],[[[1,"    "],[10,"caption"],[14,0,"sr-only"],[12],[1,[30,3]],[13],[1,"\\n  "]],[]],null]],[]]],[1,"  "],[10,"thead"],[14,0,"hds-table__thead"],[12],[1,"\\n"],[41,[30,2],[[[1,"      "],[8,[39,1],null,null,[["default"],[[[[1,"\\n"],[42,[28,[37,3],[[28,[37,3],[[30,2]],null]],null],null,[[[41,[30,4,["isSortable"]],[[[1,"            "],[8,[39,4],null,[["@isSorted","@sortOrder","@onClick","@align","@width"],[[28,[37,5],[[30,4,["key"]],[30,0,["sortBy"]]],null],[30,0,["sortOrder"]],[28,[37,6],[[30,0,["setSortBy"]],[30,4,["key"]]],null],[30,4,["align"]],[30,4,["width"]]]],[["default"],[[[[1,"\\n              "],[1,[30,4,["label"]]],[1,"\\n            "]],[]]]]],[1,"\\n"]],[]],[[[1,"            "],[8,[39,7],null,[["@align","@width"],[[30,4,["align"]],[30,4,["width"]]]],[["default"],[[[[1,[30,4,["label"]]]],[]]]]],[1,"\\n"]],[]]]],[4]],null],[1,"      "]],[]]]]],[1,"\\n"]],[]],[[[1,"      "],[18,8,[[28,[37,9],null,[["Tr","Th","ThSort"],[[50,"hds/table/tr",0,null,null],[50,"hds/table/th",0,null,null],[50,"hds/table/th-sort",0,null,null]]]]]],[1,"\\n"]],[]]],[1,"  "],[13],[1,"\\n  "],[10,"tbody"],[14,0,"hds-table__tbody"],[12],[1,"\\n"],[41,[30,2],[[[42,[28,[37,3],[[28,[37,3],[[28,[37,11],[[30,0,["getSortCriteria"]],[30,5]],null]],null]],null],null,[[[1,"        "],[18,9,[[28,[37,9],null,[["Tr","Th","Td","data"],[[50,"hds/table/tr",0,null,null],[50,"hds/table/th",0,null,[["scope"],["row"]]],[50,"hds/table/td",0,null,[["align"],[[30,7]]]],[30,6]]]]]],[1,"\\n"]],[6]],null]],[]],[[[1,"      "],[18,9,[[28,[37,9],null,[["Tr","Th","Td"],[[50,"hds/table/tr",0,null,null],[50,"hds/table/th",0,null,[["scope"],["row"]]],[50,"hds/table/td",0,null,[["align"],[[30,7]]]]]]]]],[1,"\\n"]],[]]],[1,"  "],[13],[1,"\\n"],[13]],["&attrs","@columns","@caption","column","@model","data","@align","&head","&body"],false,["if","hds/table/tr","each","-track-array","hds/table/th-sort","eq","fn","hds/table/th","yield","hash","component","sort-by"]]',moduleName:"@hashicorp/design-system-components/components/hds/table/index.hbs",isStrictMode:!1}),f="medium",m="top"
-let g=(a=class extends n.default{constructor(){super(...arguments),d(this,"sortBy",l,this),d(this,"sortOrder",u,this),d(this,"sortedMessageText",c,this)}get getSortCriteria(){return`${this.sortBy}:${this.sortOrder}`}get isStriped(){var e
-return null!==(e=this.args.isStriped)&&void 0!==e&&e}get isFixedLayout(){var e
-return null!==(e=this.args.isFixedLayout)&&void 0!==e&&e}get density(){let{density:e=f}=this.args
-return e}get valign(){let{valign:e=m}=this.args
-return e}get classNames(){let e=["hds-table"]
-return this.isStriped&&e.push("hds-table--striped"),this.isFixedLayout&&e.push("hds-table--layout-fixed"),this.density&&e.push(`hds-table--density-${this.density}`),this.valign&&e.push(`hds-table--valign-${this.valign}`),e.join(" ")}setSortBy(e){this.sortBy===e?this.sortOrder="asc"===this.sortOrder?"desc":"asc":(this.sortBy=e,this.sortOrder="asc"),this.sortedMessageText=`Sorted by ${this.sortBy} ${this.sortOrder}ending`
-let{onSort:t}=this.args
-"function"==typeof t&&t(this.sortBy,this.sortOrder)}},l=h(a.prototype,"sortBy",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return this.args.sortBy}}),u=h(a.prototype,"sortOrder",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return this.args.sortOrder||"asc"}}),c=h(a.prototype,"sortedMessageText",[o.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),h(a.prototype,"setSortBy",[i.action],Object.getOwnPropertyDescriptor(a.prototype,"setSortBy"),a.prototype),a)
-e.default=g,(0,t.setComponentTemplate)(p,g)})),define("@hashicorp/design-system-components/components/hds/table/td",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,r.createTemplateFactory)({id:"Vad/W6L/",block:'[[[11,"td"],[16,0,[30,0,["classNames"]]],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/table/td.hbs",isStrictMode:!1}),s="left"
-class a extends n.default{get align(){let{align:e=s}=this.args
-return e}get classNames(){let e=["hds-table__td","hds-typography-body-200","hds-font-weight-regular"]
-return this.align&&e.push(`hds-table__td--text-${this.align}`),e.join(" ")}}e.default=a,(0,t.setComponentTemplate)(o,a)})),define("@hashicorp/design-system-components/components/hds/table/th-sort",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,r.createTemplateFactory)({id:"v707eZIt",block:'[[[11,"th"],[16,0,[30,0,["classNames"]]],[16,"aria-sort",[30,0,["ariaSort"]]],[17,1],[24,"scope","col"],[4,[38,0],null,[["width"],[[30,2]]]],[12],[1,"\\n  "],[11,"button"],[24,4,"button"],[4,[38,1],["click",[30,0,["onClick"]]],null],[12],[1,"\\n    "],[10,0],[14,0,"hds-table__th-sort--button-content"],[12],[1,"\\n      "],[10,1],[14,0,"hds-typography-body-200 hds-font-weight-semibold"],[12],[18,3,null],[13],[1,"\\n      "],[8,[39,3],null,[["@name"],[[30,0,["icon"]]]],null],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n"],[13]],["&attrs","@width","&default"],false,["style","on","yield","flight-icon"]]',moduleName:"@hashicorp/design-system-components/components/hds/table/th-sort.hbs",isStrictMode:!1}),s=()=>{},a="left"
-class l extends n.default{get ariaSort(){return this.args.isSorted?"asc"===this.args.sortOrder?"ascending":"descending":void 0}get icon(){return this.args.isSorted&&this.args.sortOrder?"asc"===this.args.sortOrder?"arrow-up":"arrow-down":"swap-vertical"}get align(){let{align:e=a}=this.args
-return e}get onClick(){let{onClick:e}=this.args
-return e||s}get classNames(){let e=["hds-table__th-sort"]
-return this.align&&e.push(`hds-table__th-sort--text-${this.align}`),e.join(" ")}}e.default=l,(0,t.setComponentTemplate)(o,l)})),define("@hashicorp/design-system-components/components/hds/table/th",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,r.createTemplateFactory)({id:"D4kDT7GV",block:'[[[11,"th"],[16,0,[30,0,["classNames"]]],[17,1],[16,"scope",[28,[37,0],[[30,2],"col"],null]],[4,[38,1],null,[["width"],[[30,3]]]],[12],[1,"\\n  "],[18,4,null],[1,"\\n"],[13]],["&attrs","@scope","@width","&default"],false,["or","style","yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/table/th.hbs",isStrictMode:!1}),s="left"
-class a extends n.default{get align(){let{align:e=s}=this.args
-return e}get classNames(){let e=["hds-table__th","hds-typography-body-200","hds-font-weight-semibold"]
-return this.align&&e.push(`hds-table__th--text-${this.align}`),e.join(" ")}}e.default=a,(0,t.setComponentTemplate)(o,a)})),define("@hashicorp/design-system-components/components/hds/table/tr",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"6B4pRUL+",block:'[[[11,"tr"],[24,0,"hds-table__tr"],[17,1],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["&attrs","&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/table/tr.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/tabs/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object","@ember/debug"],(function(e,t,r,n,i,o,s){"use strict"
-var a,l,u,c,d,h
-function p(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function f(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const m=(0,r.createTemplateFactory)({id:"zlvhaY06",block:'[[[11,0],[24,0,"hds-tabs"],[17,1],[4,[38,0],[[30,0,["didInsert"]]],null],[12],[1,"\\n  "],[10,0],[14,0,"hds-tabs__tablist-wrapper"],[12],[1,"\\n    "],[10,"ul"],[14,0,"hds-tabs__tablist"],[14,"role","tablist"],[12],[1,"\\n      "],[18,2,[[28,[37,2],null,[["Tab"],[[50,"hds/tabs/tab",0,null,[["didInsertNode","tabIds","panelIds","selectedTabIndex","onClick","onKeyUp"],[[30,0,["didInsertTab"]],[30,0,["tabIds"]],[30,0,["panelIds"]],[30,0,["selectedTabIndex"]],[30,0,["onClick"]],[30,0,["onKeyUp"]]]]]]]]]],[1,"\\n      "],[10,"li"],[14,0,"hds-tabs__tab-indicator"],[14,"role","presentation"],[12],[13],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n\\n  "],[18,2,[[28,[37,2],null,[["Panel"],[[50,"hds/tabs/panel",0,null,[["didInsertNode","tabIds","panelIds","selectedTabIndex"],[[30,0,["didInsertPanel"]],[30,0,["tabIds"]],[30,0,["panelIds"]],[30,0,["selectedTabIndex"]]]]]]]]]],[1,"\\n"],[13]],["&attrs","&default"],false,["did-insert","yield","hash","component"]]',moduleName:"@hashicorp/design-system-components/components/hds/tabs/index.hbs",isStrictMode:!1})
-let g=(a=class extends n.default{constructor(){super(...arguments),p(this,"tabNodes",l,this),p(this,"tabIds",u,this),p(this,"panelNodes",c,this),p(this,"panelIds",d,this),p(this,"selectedTabIndex",h,this)}didInsert(){let e=0
-this.tabNodes.forEach(((t,r)=>{t.hasAttribute("data-is-selected")&&(e=r)})),this.selectedTabIndex=e,this.setTabIndicator(e)}didInsertTab(e){this.tabNodes=[...this.tabNodes,e],this.tabIds=[...this.tabIds,e.id]}didInsertPanel(e,t){this.panelNodes=[...this.panelNodes,t],this.panelIds=[...this.panelIds,e]}onClick(e,t){this.selectedTabIndex=e,this.setTabIndicator(e),this.tabNodes[e].parentNode.scrollIntoView({behavior:"smooth",block:"nearest",inline:"nearest"}),"function"==typeof this.args.onClickTab&&this.args.onClickTab(t)}onKeyUp(e,t){if(39===t.keyCode){const r=(e+1)%this.tabIds.length
-this.focusTab(r,t)}else if(37===t.keyCode){const r=(e+this.tabIds.length-1)%this.tabIds.length
-this.focusTab(r,t)}else 13!==t.keyCode&&32!==t.keyCode||(this.selectedTabIndex=e)}focusTab(e,t){t.preventDefault(),this.tabNodes[e].focus()}setSelectedPanelFocus(e,t){t.preventDefault(),this.panelNodes[e].focus()}setTabIndicator(e){const t=this.tabNodes[e],r=t.closest(".hds-tabs"),n=t.parentNode.offsetLeft,i=t.parentNode.offsetWidth
-r.style.setProperty("--indicator-left-pos",n+"px"),r.style.setProperty("--indicator-width",i+"px")}},l=f(a.prototype,"tabNodes",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return[]}}),u=f(a.prototype,"tabIds",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return[]}}),c=f(a.prototype,"panelNodes",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return[]}}),d=f(a.prototype,"panelIds",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return[]}}),h=f(a.prototype,"selectedTabIndex",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f(a.prototype,"didInsert",[o.action],Object.getOwnPropertyDescriptor(a.prototype,"didInsert"),a.prototype),f(a.prototype,"didInsertTab",[o.action],Object.getOwnPropertyDescriptor(a.prototype,"didInsertTab"),a.prototype),f(a.prototype,"didInsertPanel",[o.action],Object.getOwnPropertyDescriptor(a.prototype,"didInsertPanel"),a.prototype),f(a.prototype,"onClick",[o.action],Object.getOwnPropertyDescriptor(a.prototype,"onClick"),a.prototype),f(a.prototype,"onKeyUp",[o.action],Object.getOwnPropertyDescriptor(a.prototype,"onKeyUp"),a.prototype),a)
-e.default=g,(0,t.setComponentTemplate)(m,g)})),define("@hashicorp/design-system-components/components/hds/tabs/panel",["exports","@ember/component","@ember/template-factory","@glimmer/component","ember-cached-decorator-polyfill","@ember/object/internals","@ember/object"],(function(e,t,r,n,i,o,s){"use strict"
-var a
-function l(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=(0,r.createTemplateFactory)({id:"1JQZ5mYv",block:'[[[11,"section"],[24,0,"hds-tabs__panel"],[17,1],[24,"role","tabpanel"],[16,"aria-labelledby",[30,0,["tabId"]]],[16,1,[30,0,["panelId"]]],[16,"hidden",[28,[37,0],[[30,0,["isSelected"]]],null]],[4,[38,1],[[30,0,["didInsertNode"]]],null],[12],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["&attrs","&default"],false,["not","did-insert","yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/tabs/panel.hbs",isStrictMode:!1})
-let c=(a=class extends n.default{constructor(){var e,t,r
-super(...arguments),e=this,t="panelId",r="panel-"+(0,o.guidFor)(this),t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r}get nodeIndex(){return this.args.panelIds?this.args.panelIds.indexOf(this.panelId):void 0}get tabId(){return void 0!==this.nodeIndex?this.args.tabIds[this.nodeIndex]:void 0}get isSelected(){return this.nodeIndex===this.args.selectedTabIndex}didInsertNode(e){let{didInsertNode:t}=this.args
-"function"==typeof t&&(this.elementId=e.id,t(this.elementId,...arguments))}},l(a.prototype,"nodeIndex",[i.cached],Object.getOwnPropertyDescriptor(a.prototype,"nodeIndex"),a.prototype),l(a.prototype,"didInsertNode",[s.action],Object.getOwnPropertyDescriptor(a.prototype,"didInsertNode"),a.prototype),a)
-e.default=c,(0,t.setComponentTemplate)(u,c)})),define("@hashicorp/design-system-components/components/hds/tabs/tab",["exports","@ember/component","@ember/template-factory","@glimmer/component","ember-cached-decorator-polyfill","@ember/object/internals","@ember/object"],(function(e,t,r,n,i,o,s){"use strict"
-var a
-function l(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=(0,r.createTemplateFactory)({id:"8OnKI5x7",block:'[[[11,"li"],[16,0,[30,0,["classNames"]]],[17,1],[24,"role","presentation"],[12],[1,"\\n  "],[11,"button"],[24,0,"hds-tabs__tab-button hds-typography-body-200 hds-font-weight-medium"],[24,"role","tab"],[16,1,[30,0,["tabId"]]],[16,"aria-selected",[52,[30,0,["isSelected"]],"true","false"]],[16,"tabindex",[52,[51,[30,0,["isSelected"]]],"-1"]],[16,"data-is-selected",[30,0,["isInitialTab"]]],[24,4,"button"],[4,[38,2],[[30,0,["didInsertNode"]]],null],[4,[38,3],["click",[30,0,["onClick"]]],null],[4,[38,3],["keyup",[30,0,["onKeyUp"]]],null],[12],[1,"\\n"],[41,[30,2],[[[1,"      "],[8,[39,4],[[24,0,"hds-tabs__tab-icon"],[24,"role","presentation"]],[["@name"],[[30,2]]],null],[1,"\\n"]],[]],null],[1,"\\n    "],[18,4,null],[1,"\\n\\n"],[41,[30,3],[[[1,"      "],[8,[39,6],[[24,0,"hds-tabs__tab-count"],[24,"role","presentation"]],[["@text","@size"],[[30,3],"small"]],null],[1,"\\n"]],[]],null],[1,"  "],[13],[1,"\\n"],[13]],["&attrs","@icon","@count","&default"],false,["if","unless","did-insert","on","flight-icon","yield","hds/badge-count"]]',moduleName:"@hashicorp/design-system-components/components/hds/tabs/tab.hbs",isStrictMode:!1})
-let c=(a=class extends n.default{constructor(){var e,t,r
-super(...arguments),e=this,t="tabId",r="tab-"+(0,o.guidFor)(this),t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r}get nodeIndex(){return this.args.tabIds?this.args.tabIds.indexOf(this.tabId):void 0}get panelId(){return void 0!==this.nodeIndex?this.args.panelIds[this.nodeIndex]:void 0}get isSelected(){return void 0!==this.nodeIndex&&this.nodeIndex===this.args.selectedTabIndex}get isInitialTab(){let{isSelected:e}=this.args
-return e}didInsertNode(){let{didInsertNode:e}=this.args
-"function"==typeof e&&e(...arguments)}onClick(){let{onClick:e}=this.args
-if("function"!=typeof e)return!1
-e(this.nodeIndex,...arguments)}onKeyUp(){let{onKeyUp:e}=this.args
-if("function"!=typeof e)return!1
-e(this.nodeIndex,...arguments)}get classNames(){let e=["hds-tabs__tab"]
-return this.isSelected&&e.push("hds-tabs__tab--is-selected"),e.join(" ")}},l(a.prototype,"nodeIndex",[i.cached],Object.getOwnPropertyDescriptor(a.prototype,"nodeIndex"),a.prototype),l(a.prototype,"didInsertNode",[s.action],Object.getOwnPropertyDescriptor(a.prototype,"didInsertNode"),a.prototype),l(a.prototype,"onClick",[s.action],Object.getOwnPropertyDescriptor(a.prototype,"onClick"),a.prototype),l(a.prototype,"onKeyUp",[s.action],Object.getOwnPropertyDescriptor(a.prototype,"onKeyUp"),a.prototype),a)
-e.default=c,(0,t.setComponentTemplate)(u,c)})),define("@hashicorp/design-system-components/components/hds/tag/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/debug"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.COLORS=e.DEFAULT_COLOR=void 0
-const o=(0,r.createTemplateFactory)({id:"lqu2LyP4",block:'[[[11,1],[16,0,[30,0,["classNames"]]],[17,1],[12],[1,"\\n"],[41,[30,0,["onDismiss"]],[[[1,"    "],[11,"button"],[24,0,"hds-tag__dismiss"],[16,"aria-label",[29,["Dismiss ",[30,0,["text"]]]]],[24,4,"button"],[4,[38,1],["click",[30,0,["onDismiss"]]],null],[12],[1,"\\n      "],[8,[39,2],[[24,0,"hds-tag__dismiss-icon"]],[["@name","@size","@isInlineBlock"],["x","16",false]],null],[1,"\\n    "],[13],[1,"\\n"]],[]],null],[41,[28,[37,3],[[30,2],[30,3]],null],[[[1,"    "],[8,[39,4],[[24,0,"hds-tag__link"]],[["@current-when","@models","@query","@replace","@route","@isRouteExternal","@href","@isHrefExternal"],[[30,4],[28,[37,5],[[30,5],[30,6]],null],[28,[37,6],[[30,7]],null],[30,8],[30,3],[30,9],[30,2],[30,10]]],[["default"],[[[[1,"\\n      "],[1,[30,0,["text"]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[]],[[[1,"    "],[10,1],[14,0,"hds-tag__text"],[12],[1,"\\n      "],[1,[30,0,["text"]]],[1,"\\n    "],[13],[1,"\\n"]],[]]],[13]],["&attrs","@href","@route","@current-when","@model","@models","@query","@replace","@isRouteExternal","@isHrefExternal"],false,["if","on","flight-icon","or","hds/interactive","hds-link-to-models","hds-link-to-query"]]',moduleName:"@hashicorp/design-system-components/components/hds/tag/index.hbs",isStrictMode:!1}),s="primary"
-e.DEFAULT_COLOR=s
-const a=["primary","secondary"]
-e.COLORS=a
-class l extends n.default{get onDismiss(){let{onDismiss:e}=this.args
-return"function"==typeof e&&e}get text(){let{text:e}=this.args
-return e}get color(){if(this.args.href||this.args.route){let{color:e=s}=this.args
-return e}return this.args.color,!1}get classNames(){let e=["hds-tag"]
-return this.color&&e.push(`hds-tag--color-${this.color}`),e.join(" ")}}e.default=l,(0,t.setComponentTemplate)(o,l)})),define("@hashicorp/design-system-components/components/hds/toast/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"LgtsYYWa",block:'[[[8,[39,0],[[24,0,"hds-toast"],[17,1]],[["@type","@color","@icon","@onDismiss"],["inline",[30,2],[30,3],[30,4]]],[["default"],[[[[1,"\\n  "],[18,6,[[28,[37,2],null,[["Title","Description","Button","Link::Standalone","Generic"],[[30,5,["Title"]],[30,5,["Description"]],[30,5,["Button"]],[30,5,["Link::Standalone"]],[30,5,["Generic"]]]]]]],[1,"\\n"]],[5]]]]]],["&attrs","@color","@icon","@onDismiss","A","&default"],false,["hds/alert","yield","hash"]]',moduleName:"@hashicorp/design-system-components/components/hds/toast/index.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/components/hds/yield/index",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"Pn4gu8DS",block:'[[[18,1,null]],["&default"],false,["yield"]]',moduleName:"@hashicorp/design-system-components/components/hds/yield/index.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("@hashicorp/design-system-components/helpers/hds-link-to-models",["exports","@ember/component/helper","@ember/debug"],(function(e,t,r){"use strict"
-function n(e){let[t,r]=e
-return t?[t]:r||[]}Object.defineProperty(e,"__esModule",{value:!0}),e.hdsLinkToModels=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i}))
-define("@hashicorp/design-system-components/helpers/hds-link-to-query",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return null!=t?t:{}}Object.defineProperty(e,"__esModule",{value:!0}),e.hdsLinkToQuery=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("@hashicorp/ember-flight-icons/components/flight-icon",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object/internals","@ember/application","@ember/debug","@hashicorp/flight-icons/svg"],(function(e,t,r,n,i,o,s,a){"use strict"
-function l(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=(0,r.createTemplateFactory)({id:"yc/x2Q2j",block:'[[[11,"svg"],[16,0,[30,0,["classNames"]]],[17,1],[16,"aria-hidden",[29,[[52,[30,2],"false","true"]]]],[16,"aria-labelledby",[30,0,["ariaLabelledby"]]],[16,"data-test-icon",[30,3]],[16,"fill",[29,[[30,0,["color"]]]]],[16,1,[30,0,["iconId"]]],[16,"role",[30,0,["role"]]],[16,"width",[29,[[30,0,["svgSize","width"]]]]],[16,"height",[29,[[30,0,["svgSize","height"]]]]],[16,"viewBox",[29,["0 0 ",[30,0,["size"]]," ",[30,0,["size"]]]]],[24,"xmlns","http://www.w3.org/2000/svg","http://www.w3.org/2000/xmlns/"],[12],[1,"\\n"],[41,[30,2],[[[1,"    "],[10,"title"],[15,1,[30,0,["titleId"]]],[12],[1,[30,2]],[13],[1,"\\n    "],[10,"g"],[14,"role","presentation"],[12],[1,"\\n      "],[10,"use"],[15,6,[29,["#flight-",[30,3],"-",[30,0,["size"]]]]],[12],[13],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[1,"    "],[10,"use"],[15,6,[29,["#flight-",[30,3],"-",[30,0,["size"]]]]],[12],[13],[1,"\\n"]],[]]],[13]],["&attrs","@title","@name"],false,["if"]]',moduleName:"@hashicorp/ember-flight-icons/components/flight-icon.hbs",isStrictMode:!1})
-class c extends n.default{constructor(){super(...arguments),l(this,"iconId","icon-"+(0,i.guidFor)(this)),l(this,"titleId","title-"+(0,i.guidFor)(this)),this.args.name&&a.iconNames.includes(this.args.name)}get contextRootURL(){return(0,o.getOwner)(this).resolveRegistration("config:environment").rootURL||"/"}get color(){var e
-return null!==(e=this.args.color)&&void 0!==e?e:"currentColor"}get name(){return this.args.name}get size(){var e
-return null!==(e=this.args.size)&&void 0!==e?e:"16"}get svgSize(){return{width:this.args.stretched?"100%":this.size,height:this.args.stretched?"100%":this.size}}get title(){var e
-return null!==(e=this.args.title)&&void 0!==e?e:null}get role(){return this.args.title?"img":null}get ariaLabelledby(){return this.args.title?this.titleId:null}get classNames(){var e
-let t=["flight-icon"]
-t.push(`flight-icon-${this.name}`)
-return(null===(e=this.args.isInlineBlock)||void 0===e||e)&&!this.args.stretched&&t.push("flight-icon-display-inline"),"loading"===this.name?t.push("flight-icon--animation-loading"):"running"===this.name&&t.push("flight-icon--animation-running"),t.join(" ")}}e.default=c,(0,t.setComponentTemplate)(u,c)})),define("@html-next/vertical-collection/-private",["exports","@ember/object","@ember/object/internals","@ember/array","@ember/runloop","ember-raf-scheduler"],(function(e,t,r,n,i,o){"use strict"
-function s(e,n,i){let o
-switch(n){case"@index":o=i
-break
-case"@identity":o=function(e){let t
-const n=typeof e
-return t="string"===n||"number"===n?e:r.guidFor(e),t}(e)
-break
-default:o=t.get(e,n)}return"number"==typeof o&&(o=String(o)),o}const a=["matches","webkitMatchesSelector","mozMatchesSelector","msMatchesSelector","oMatchesSelector"]
-let l
-function u(e,t){for(void 0===l&&function(e){a.forEach((t=>{void 0===l&&"function"==typeof e[t]&&(l=t)}))}(e);e;){if(e[l](t))return e
-e=e.parentElement}return null}var c=window?window.document:void 0
-let d=0
-class h{constructor(e,t){void 0===e&&(e=null),void 0===t&&(t=null),this.id="VC-"+d++,this.content=e,this.index=t,this.upperBound=void 0!==c?c.createTextNode(""):null,this.lowerBound=void 0!==c?c.createTextNode(""):null,this.rendered=!1}get realUpperBound(){return this.upperBound}get realLowerBound(){return this.lowerBound}getBoundingClientRect(){let{upperBound:e,lowerBound:t}=this,r=1/0,n=-1/0
-for(;e!==t;)e=e.nextSibling,e instanceof Element&&(r=Math.min(r,e.getBoundingClientRect().top),n=Math.max(n,e.getBoundingClientRect().bottom))
-return{top:r,bottom:n,height:n-r}}recycle(e,r){this.index!==r&&t.set(this,"index",r),this.content!==e&&t.set(this,"content",e)}destroy(){t.set(this,"upperBound",null),t.set(this,"lowerBound",null),t.set(this,"content",null),t.set(this,"index",null)}}let p=0
-class f{constructor(e){this.id="OC-"+p++,this.isOccludedContent=!0,void 0!==c?(this.element=c.createElement(e),this.element.className+="occluded-content",this.upperBound=c.createTextNode(""),this.lowerBound=c.createTextNode("")):this.element=null,this.isOccludedContent=!0,this.rendered=!1}getBoundingClientRect(){if(null!==this.element)return this.element.getBoundingClientRect()}addEventListener(e,t){null!==this.element&&this.element.addEventListener(e,t)}removeEventListener(e,t){null!==this.element&&this.element.removeEventListener(e,t)}get realUpperBound(){return this.upperBound}get realLowerBound(){return this.lowerBound}get parentNode(){return null!==this.element?this.element.parentNode:null}get style(){return null!==this.element?this.element.style:{}}set innerHTML(e){null!==this.element&&(this.element.innerHTML=e)}destroy(){t.set(this,"element",null)}}function m(e,t,r,n){let i
-for(;r&&(i=r.nextSibling,e.insertBefore(r,t),r!==n);)r=i}function g(e,t){return e.objectAt?e.objectAt(t):e[t]}function v(e,t){void 0===t&&(t=2)
-const r=Math.pow(10,t)
-return Math.round(e*r)/r}let b=!1
-try{let e=Object.defineProperty({},"passive",{get:()=>(b=!0,b)})
-window.addEventListener("test",null,e)}catch(R){}var y=b
-const _=Object.create(null)
-class w{constructor(){this.elements=new Array(10),this.maxLength=10,this.length=0,this.handlers=new Array(10),this.isPolling=!1,this.isUsingPassive=y}addScrollHandler(e,t){let r,n,i=this.elements.indexOf(e);-1===i?(i=this.length++,i===this.maxLength&&(this.maxLength*=2,this.elements.length=this.maxLength,this.handlers.length=this.maxLength),r=[t],this.elements[i]=e,n=this.handlers[i]={top:e.scrollTop,left:e.scrollLeft,handlers:r},n.passiveHandler=y?function(){w.triggerElementHandlers(e,n)}:_):(n=this.handlers[i],r=n.handlers,r.push(t)),this.isUsingPassive&&1===r.length?e.addEventListener("scroll",n.passiveHandler,{capture:!0,passive:!0}):this.isPolling||this.poll()}removeScrollHandler(e,t){let r=this.elements.indexOf(e),n=this.handlers[r]
-if(!n||!n.handlers)throw new Error("Attempted to remove a handler from an unknown element or an element with no handlers")
-{let r=n.handlers.indexOf(t)
-if(-1===r)throw new Error("Attempted to remove an unknown handler")
-n.handlers.splice(r,1),n.handlers.length||(r=this.elements.indexOf(e),this.handlers.splice(r,1),this.elements.splice(r,1),this.length--,this.maxLength--,0===this.length&&(this.isPolling=!1),this.isUsingPassive&&e.removeEventListener("scroll",n.passiveHandler,{capture:!0,passive:!0}))}}static triggerElementHandlers(e,t){let r=e.scrollTop,n=e.scrollLeft,o=r!==t.top,s=n!==t.left
-t.top=r,t.left=n
-let a={top:r,left:n}
-if(o||s){i.begin()
-for(let e=0;e<t.handlers.length;e++)t.handlers[e](a)
-i.end()}}poll(){this.isPolling=!0,o.scheduler.schedule("sync",(()=>{if(this.isPolling){for(let e=0;e<this.length;e++){let t=this.elements[e],r=this.handlers[e]
-w.triggerElementHandlers(t,r)}this.isPolling=this.length>0,this.isPolling&&this.poll()}}))}}const O=new w
-function x(e,t){O.addScrollHandler(e,t)}function P(e,t){O.removeScrollHandler(e,t)}function S(){Object.defineProperty(this,"scrollTop",{get:()=>document.body.scrollTop||document.documentElement.scrollTop,set(e){document.body.scrollTop=document.documentElement.scrollTop=e}}),Object.defineProperty(this,"scrollLeft",{get:()=>window.scrollX||window.pageXOffset||document.body.scrollLeft||document.documentElement.scrollLeft,set(e){window.scrollX=window.pageXOffset=document.body.scrollLeft=document.documentElement.scrollLeft=e}}),Object.defineProperty(this,"offsetHeight",{get:()=>window.innerHeight})}S.prototype.addEventListener=function(e,t,r){return window.addEventListener(e,t,r)},S.prototype.removeEventListener=function(e,t,r){return window.removeEventListener(e,t,r)},S.prototype.getBoundingClientRect=function(){return{height:window.innerHeight,width:window.innerWidth,top:0,left:0,right:window.innerWidth,bottom:window.innerHeight}}
-var T=new S
-function E(e,t){return-1!==t.indexOf("%")?function(e,t){let r=e.offsetHeight
-return parseFloat(t)*r/100}(e,t):-1!==t.indexOf("em")?function(e,t){const r=-1!==t.indexOf("rem")?document.documentElement:e,n=window.getComputedStyle(r).getPropertyValue("font-size")
-return parseFloat(t)*parseFloat(n)}(e,t):parseInt(t,10)}function C(e,t){const r=e.getBoundingClientRect()
-if(1===t)return r
-const n={}
-for(let i in r)n[i]=r[i]*t
-return n}class k{constructor(e,t){let{bufferSize:r,containerSelector:i,estimateHeight:s,initialRenderCount:a,items:l,key:u,renderAll:d,renderFromLast:h,shouldRecycle:p,startingIndex:m,occlusionTagName:g}=t
-this.token=new o.Token(e),this.bufferSize=r,this.containerSelector=i,this.estimateHeight=s,this.initialRenderCount=a,this.items=l,this.key=u,this.renderAll=d,this.renderFromLast=h,this.shouldRecycle=p,this.startingIndex=m,this.sendAction=()=>{},this._itemContainer=null,this._scrollContainer=null,this._prependOffset=0,this._calculatedEstimateHeight=0,this._collectionOffset=0,this._calculatedScrollContainerHeight=0,this._transformScale=1,this._scrollHandler=e=>{let{top:t}=e
-this._didEarthquake(Math.abs(this._scrollTop-t))&&this.scheduleUpdate()},this._resizeHandler=this.scheduleUpdate.bind(this),this._nextUpdate=null,this._nextLayout=null,this._started=!1,this._didReset=!0,this._didUpdateItems=!1,this._scrollTop=0,this._prevFirstItemIndex=1/0,this._prevLastItemIndex=-1/0,this._prevFirstVisibleIndex=0
-this._prevLastVisibleIndex=0,this._firstReached=!1,this._lastReached=!1,this._prevTotalItems=0,this._prevFirstKey=0,this._prevLastKey=0,this._componentPool=[],this._prependComponentPool=[],this._appendComponentPool=[],this._occludedContentBefore=new f(g),this._occludedContentAfter=new f(g),this._pageUpHandler=this.pageUp.bind(this),this._occludedContentBefore.addEventListener("click",this._pageUpHandler),this._pageDownHandler=this.pageDown.bind(this),this._occludedContentAfter.addEventListener("click",this._pageDownHandler),c&&(this._domPool=c.createDocumentFragment()),this.virtualComponents=n.A([this._occludedContentBefore,this._occludedContentAfter]),this.orderedComponents=[],this._updateVirtualComponents(),this.__ember_meta__=null}destroy(){this.token.cancel()
-for(let e=0;e<this.orderedComponents.length;e++)this.orderedComponents[e].destroy()
-this._occludedContentBefore.removeEventListener("click",this._pageUpHandler),this._occludedContentAfter.removeEventListener("click",this._pageDownHandler),this._occludedContentBefore.destroy(),this._occludedContentAfter.destroy(),this.orderedComponents=null,t.set(this,"virtualComponents",null),this._started&&(P(this._scrollContainer,this._scrollHandler),T.removeEventListener("resize",this._resizeHandler))}schedule(e,t){return o.scheduler.schedule(e,t,this.token)}start(){const{startingIndex:e,containerSelector:t,_occludedContentBefore:r}=this
-if(this._itemContainer=r.element.parentNode,this._scrollContainer="body"===t?T:u(this._itemContainer,t),this._updateConstants(),0!==e){const{renderFromLast:t,_calculatedEstimateHeight:r,_collectionOffset:n,_calculatedScrollContainerHeight:i}=this
-let o=e*r
-t&&(o-=i-r),this._scrollTop=o+n,this._prevFirstVisibleIndex=e}else this._scrollTop=this._scrollContainer.scrollTop
-this._started=!0,this.update(),x(this._scrollContainer,this._scrollHandler),T.addEventListener("resize",this._resizeHandler)}scheduleUpdate(e,t){!0===e&&(this._didUpdateItems=!0),null===this._nextUpdate&&!1!==this._started&&(this._nextUpdate=this.schedule("sync",(()=>{this._nextUpdate=null,this._scrollTop=this._scrollContainer.scrollTop,this.update(t)})))}update(e){!0===this._didUpdateItems&&(this._determineUpdateType(),this._didUpdateItems=!1),this._updateConstants(),this._updateIndexes(),this._updateVirtualComponents(),this.schedule("measure",(()=>{e&&e(),this.afterUpdate()}))}afterUpdate(){const{_prevTotalItems:e}=this,t=this._calculateScrollDiff()
-0!==t&&(this._scrollContainer.scrollTop+=t),this._scrollTop=this._scrollContainer.scrollTop,this._prependOffset=0,0!==e&&this._sendActions(),this._prevFirstItemIndex=this.firstItemIndex,this._prevLastItemIndex=this.lastItemIndex,this._prevFirstVisibleIndex=this.firstVisibleIndex,this._prevLastVisibleIndex=this.lastVisibleIndex,this._didReset=!1}_calculateScrollDiff(){return this._prependOffset+this._scrollTop-this._scrollContainer.scrollTop}_determineUpdateType(){const{items:e,key:r,totalItems:n,_prevTotalItems:i,_prevFirstKey:o,_prevLastKey:a}=this,l=n-i
-!0===function(e,r,n,i,o){const a=t.get(r,"length")
-if(e<=0||e>=a||0===a)return!1
-const l=s(g(r,e),n,e),u=s(g(r,a-1),n,a-1)
-return i===l&&o===u}(l,e,r,o,a)?this.prepend(l):!0===function(e,r,n,i,o){const a=t.get(r,"length")
-if(e<=0||e>=a||0===a)return!1
-const l=s(g(r,0),n,0),u=s(g(r,a-e-1),n,a-e-1)
-return i===l&&o===u}(l,e,r,o,a)?this.append(l):this.reset()
-const u=g(this.items,0),c=g(this.items,this.totalItems-1)
-this._prevTotalItems=n,this._prevFirstKey=n>0?s(u,r,0):0,this._prevLastKey=n>0?s(c,r,n-1):0}_updateConstants(){const{estimateHeight:e,_occludedContentBefore:t,_itemContainer:r,_scrollContainer:n}=this,i=n.offsetHeight,{height:o}=n.getBoundingClientRect()
-let s
-s=i===o||0===o?1:i/o
-const{top:a}=C(t,s),{top:l}=C(n,s)
-let u=0
-if(n instanceof Element){const e=window.getComputedStyle(n).maxHeight
-"none"!==e&&(u=E(n.parentElement,e))}const c="string"==typeof e?E(r,e):e
-this._transformScale=s,this._calculatedEstimateHeight=c,this._calculatedScrollContainerHeight=v(Math.max(i,u)),this._collectionOffset=v(n.scrollTop+a-l)}_updateVirtualComponents(){const{items:e,orderedComponents:t,virtualComponents:r,_componentPool:n,shouldRecycle:o,renderAll:s,_started:a,_didReset:l,_occludedContentBefore:u,_occludedContentAfter:c,totalItems:d}=this
-let p,f,v,b
-for(!0===s?(p=0,f=d-1,v=0,b=0):!1===a?(p=this.startingIndex,f=this.startingIndex+this.initialRenderCount-1,v=0,b=0):(p=this.firstItemIndex,f=this.lastItemIndex,v=this.totalBefore,b=this.totalAfter),f=Math.min(f,d-1);t.length>0&&t[0].index<p;)n.push(t.shift())
-for(;t.length>0&&t[t.length-1].index>f;)n.unshift(t.pop())
-if(l)if(!0===o)for(let i=0;i<t.length;i++){const r=t[i]
-r.recycle(g(e,r.index),r.index)}else for(;t.length>0;)n.push(t.shift())
-let y=t.length>0?t[0].index:p,_=t.length>0?t[t.length-1].index:p-1
-for(;_<f;){let r
-r=!0===o&&n.pop()||new h
-const i=++_
-r.recycle(g(e,i),i),this._appendComponent(r),t.push(r)}for(;y>p;){let r
-r=!0===o&&n.pop()||new h
-const i=--y
-r.recycle(g(e,i),i),this._prependComponent(r),t.unshift(r)}if(n.length>0)if(!0===o)for(let h=n.length-1;h>=0;h--){const t=n[h]
-g(e,t.index)?m(this._domPool,null,t.realUpperBound,t.realLowerBound):(m(this._itemContainer,null,t.realUpperBound,t.realLowerBound),i.run((()=>{r.removeObject(t)})),n.splice(h,1))}else r.removeObjects(n),n.length=0
-const w=p,O=d-f-1,x=1===w?"item":"items",P=1===O?"item":"items"
-u.style.height=`${Math.max(v,0)}px`,u.innerHTML=w>0?`And ${w} ${x} before`:"",c.style.height=`${Math.max(b,0)}px`,c.innerHTML=O>0?`And ${O} ${P} after`:""}_appendComponent(e){const{virtualComponents:t,_occludedContentAfter:r,_appendComponentPool:n,shouldRecycle:i,_itemContainer:o}=this,s=r.realUpperBound
-!0===e.rendered?m(o,s,e.realUpperBound,e.realLowerBound):(t.insertAt(t.length-1,e),e.rendered=!0,i||(n.unshift(e),null===this._nextLayout&&(this._nextLayout=this.schedule("layout",(()=>{for(this._nextLayout=null;n.length>0;){const e=n.pop(),t=r.realUpperBound
-m(this._itemContainer,t,e.realUpperBound,e.realLowerBound)}})))))}_prependComponent(e){const{virtualComponents:t,_occludedContentBefore:r,_prependComponentPool:n,_itemContainer:i}=this,o=r.realLowerBound.nextSibling
-!0===e.rendered?m(i,o,e.realUpperBound,e.realLowerBound):(t.insertAt(t.length-1,e),e.rendered=!0,n.unshift(e),null===this._nextLayout&&(this._nextLayout=this.schedule("layout",(()=>{for(this._nextLayout=null;n.length>0;){const e=n.pop(),t=r.realLowerBound.nextSibling
-m(i,t,e.realUpperBound,e.realLowerBound)}}))))}_sendActions(){const{firstItemIndex:e,lastItemIndex:t,firstVisibleIndex:r,lastVisibleIndex:n,_prevFirstVisibleIndex:i,_prevLastVisibleIndex:o,totalItems:s,_firstReached:a,_lastReached:l,_didReset:u}=this;(u||r!==i)&&this.sendAction("firstVisibleChanged",r),(u||n!==o)&&this.sendAction("lastVisibleChanged",n),!1===a&&0===e&&(this.sendAction("firstReached",e),this._firstReached=!0),!1===l&&t===s-1&&(this.sendAction("lastReached",t),this._lastReached=!0)}prepend(e){this._prevFirstItemIndex+=e,this._prevLastItemIndex+=e,this.orderedComponents.forEach((r=>t.set(r,"index",t.get(r,"index")+e))),this._firstReached=!1,this._prependOffset=e*this._calculatedEstimateHeight}append(){this._lastReached=!1}reset(){this._firstReached=!1,this._lastReached=!1,this._didReset=!0}pageUp(){if(this.renderAll)return
-const{bufferSize:e,firstItemIndex:t,totalComponents:r}=this
-if(0!==t){const n=Math.max(t-r+e,0),i=this.getOffsetForIndex(n)
-this._scrollContainer.scrollTop=i+this._collectionOffset,this.scheduleUpdate()}}pageDown(){if(this.renderAll)return
-const{bufferSize:e,lastItemIndex:t,totalComponents:r,totalItems:n}=this
-if(t!==n-1){const i=Math.min(t+e+1,n-r),o=this.getOffsetForIndex(i)
-this._scrollContainer.scrollTop=o+this._collectionOffset,this.scheduleUpdate()}}get totalComponents(){return Math.min(this.totalItems,this.lastItemIndex-this.firstItemIndex+1)}get visibleTop(){return Math.max(this._scrollTop-this._collectionOffset+this._prependOffset,0)}get visibleMiddle(){return this.visibleTop+this._calculatedScrollContainerHeight/2}get visibleBottom(){return Math.max(this.visibleTop+this._calculatedScrollContainerHeight-1,0)}get totalItems(){return this.items?t.get(this.items,"length"):0}}function M(e,t,r,n){if(void 0===r&&(r=0),void 0===n&&(n=e.length),"function"!=typeof e.fill){for(;r<n;r++)e[r]=t
-return e}e.fill(t,r,n)}class A{constructor(e,t){const r=new Float32Array(new ArrayBuffer(4*e))
-M(r,t),this.length=e,this.defaultValue=t,this._initializeLayers(r,t)}_initializeLayers(e,t){const r=[e]
-let n,i,o,s,a,l
-for(s=o=e,i=e.length;i>2;){if(i=Math.ceil(i/2),o=new Float32Array(new ArrayBuffer(4*i)),void 0!==t)M(o,t*=2),a=s[2*(i-1)]||0,l=s[2*(i-1)+1]||0,o[i-1]=a+l
-else for(n=0;n<i;n++)a=s[2*n],l=s[2*n+1],o[n]=l?a+l:a
-r.unshift(o),s=o}this.total=o.length>0?o.length>1?o[0]+o[1]:o[0]:0,this.layers=r,this.values=e}find(e){const{layers:t,total:r,length:n,values:i}=this,o=t.length
-if(0===n)return{index:0,totalBefore:0,totalAfter:0}
-let s,a,l,u,c,d=0,h=0,p=0
-for(e=Math.min(r-1,e),s=0;s<o;s++)a=t[s],u=d,c=d+1,l=a[u],e>=h+l?(h+=l,d=2*c):d=2*u
-return d/=2,p=r-(h+i[d]),{index:d,totalBefore:h,totalAfter:p}}getOffset(e){const{layers:t,length:r,values:n}=this,i=t.length
-if(0===r)return 0
-let o=0,s=0
-for(let a=0;a<i-1;a++){const r=t[a],n=o,l=o+1
-e>=l*Math.pow(2,i-a-1)?(s+=r[n],o=2*l):o=2*n}return o+1===e&&(s+=n[o]),s}set(e,t){const{layers:r}=this,n=v(t-r[r.length-1][e])
-if(0===n)return n
-let i,o
-for(i=r.length-1;i>=0;i--)o=r[i],o[e]+=n,e=Math.floor(e/2)
-return this.total+=n,n}prepend(e){const{values:t,length:r,defaultValue:n}=this,i=e+r,o=new Float32Array(new ArrayBuffer(4*i))
-o.set(t,e),M(o,n,0,e),this.length=i,this._initializeLayers(o)}append(e){const{values:t,length:r,defaultValue:n}=this,i=e+r,o=new Float32Array(new ArrayBuffer(4*i))
-o.set(t),M(o,n,r),this.length=i,this._initializeLayers(o)}reset(e){const{values:t,length:r,defaultValue:n}=this
-if(r===e)return
-const i=new Float32Array(new ArrayBuffer(4*e))
-r<e?(i.set(t),M(i,n,r)):i.set(function(e,t,r){return"function"==typeof e.subarray?e.subarray(t,r):e.slice(t,r)}(t,0,e)),this.length=e,0===r?this._initializeLayers(i,n):this._initializeLayers(i)}}e.DynamicRadar=class extends k{constructor(e,t){super(e,t),this._firstItemIndex=0,this._lastItemIndex=0,this._totalBefore=0,this._totalAfter=0,this._minHeight=1/0,this._nextIncrementalRender=null,this.skipList=null}destroy(){super.destroy(),this.skipList=null}scheduleUpdate(e,t){null!==this._nextIncrementalRender&&(this._nextIncrementalRender.cancel(),this._nextIncrementalRender=null),super.scheduleUpdate(e,t)}afterUpdate(){null===this._nextIncrementalRender&&null===this._nextUpdate&&(this._nextIncrementalRender=this.schedule("sync",(()=>{this._nextIncrementalRender=null,this._shouldScheduleRerender()&&this.update()}))),super.afterUpdate()}_updateConstants(){super._updateConstants(),this._calculatedEstimateHeight<this._minHeight&&(this._minHeight=this._calculatedEstimateHeight),null===this.skipList?this.skipList=new A(this.totalItems,this._calculatedEstimateHeight):this.skipList.defaultValue=this._calculatedEstimateHeight}_updateIndexes(){const{bufferSize:e,skipList:t,visibleTop:r,visibleBottom:n,totalItems:i,_didReset:o}=this
-if(0===i)return this._firstItemIndex=0,this._lastItemIndex=-1,this._totalBefore=0,void(this._totalAfter=0)
-!1===o&&this._measure()
-const{values:s}=t
-let{totalBefore:a,index:l}=this.skipList.find(r),{totalAfter:u,index:c}=this.skipList.find(n)
-const d=i-1
-let h=l,p=c
-for(let f=e;f>0&&h>0;f--)h--,a-=s[h]
-for(let f=e;f>0&&p<d;f--)p++,u-=s[p]
-this._firstItemIndex=h,this._lastItemIndex=p,this._totalBefore=a,this._totalAfter=u}_calculateScrollDiff(){const{firstItemIndex:e,_prevFirstVisibleIndex:t,_prevFirstItemIndex:r}=this
-let n=0
-if(e<r){const i=Math.min(Math.abs(e-r),t-e)
-n=Math.round(this._measure(i))}return n+super._calculateScrollDiff()}_shouldScheduleRerender(){const{firstItemIndex:e,lastItemIndex:t}=this
-this._updateConstants(),this._measure()
-const{firstVisibleIndex:r,lastVisibleIndex:n}=this
-return r<e||n>t}_measure(e){void 0===e&&(e=null)
-const{orderedComponents:t,skipList:r,_occludedContentBefore:n,_transformScale:i}=this,o=null!==e?Math.min(e,t.length):t.length
-let s=0
-for(let a=0;a<o;a++){const e=t[a],o=t[a-1],l=e.index,{top:u,height:c}=C(e,i)
-let d
-d=void 0!==o?u-C(o,i).bottom:u-C(n,i).bottom
-const h=v(c+d),p=r.set(l,h)
-h<this._minHeight&&(this._minHeight=h),0!==p&&(s+=p)}return s}_didEarthquake(e){return e>this._minHeight/2}get total(){return this.skipList.total}get totalBefore(){return this._totalBefore}get totalAfter(){return this._totalAfter}get firstItemIndex(){return this._firstItemIndex}get lastItemIndex(){return this._lastItemIndex}get firstVisibleIndex(){const{visibleTop:e}=this,{index:t}=this.skipList.find(e)
-return t}get lastVisibleIndex(){const{visibleBottom:e,totalItems:t}=this,{index:r}=this.skipList.find(e)
-return Math.min(r,t-1)}prepend(e){super.prepend(e),this.skipList.prepend(e)}append(e){super.append(e),this.skipList.append(e)}reset(){super.reset(),this.skipList.reset(this.totalItems)}getOffsetForIndex(e){return this._measure(),this.skipList.getOffset(e)}},e.ScrollHandler=w,e.StaticRadar=class extends k{constructor(e,t){super(e,t),this._firstItemIndex=0,this._lastItemIndex=0}_updateIndexes(){const{bufferSize:e,totalItems:t,visibleMiddle:r,_calculatedEstimateHeight:n,_calculatedScrollContainerHeight:i}=this
-if(0===t)return this._firstItemIndex=0,void(this._lastItemIndex=-1)
-const o=t-1,s=Math.floor(r/n),a=Math.min(Math.ceil(i/n),t)
-let l=s-Math.floor(a/2),u=s+Math.ceil(a/2)-1
-l<0&&(l=0,u=a-1),u>o&&(u=o,l=o-(a-1)),l=Math.max(l-e,0),u=Math.min(u+e,o),this._firstItemIndex=l,this._lastItemIndex=u}_didEarthquake(e){return e>this._calculatedEstimateHeight/2}get total(){return this.totalItems*this._calculatedEstimateHeight}get totalBefore(){return this.firstItemIndex*this._calculatedEstimateHeight}get totalAfter(){return this.total-(this.lastItemIndex+1)*this._calculatedEstimateHeight}get firstItemIndex(){return this._firstItemIndex}get lastItemIndex(){return this._lastItemIndex}get firstVisibleIndex(){return Math.ceil(this.visibleTop/this._calculatedEstimateHeight)}get lastVisibleIndex(){return Math.min(Math.ceil(this.visibleBottom/this._calculatedEstimateHeight),this.totalItems)-1}getOffsetForIndex(e){return e*this._calculatedEstimateHeight+1}},e.ViewportContainer=T,e.addScrollHandler=x,e.closestElement=u,e.keyForItem=s,e.objectAt=g,e.removeScrollHandler=P,Object.defineProperty(e,"__esModule",{value:!0})})),define("@html-next/vertical-collection/components/vertical-collection/component",["exports","@ember/debug","@ember/object/computed","@ember/component","@ember/object","@ember/runloop","@html-next/vertical-collection/components/vertical-collection/template","@html-next/vertical-collection/-private","ember-raf-scheduler"],(function(e,t,r,n,i,o,s,a,l){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var u=n.default.extend({layout:s.default,tagName:"",key:"@identity",estimateHeight:null,items:null,staticHeight:!1,shouldRecycle:!0,containerSelector:"*",bufferSize:1,idForFirstItem:null,renderFromLast:!1,renderAll:!1,occlusionTagName:"occluded-content",isEmpty:(0,r.empty)("items"),shouldYieldToInverse:(0,r.readOnly)("isEmpty"),virtualComponents:(0,i.computed)("items.[]","renderAll","estimateHeight","bufferSize",(function(){const{_radar:e}=this,t=this.items
-return e.items=null==t?[]:t,e.estimateHeight=this.estimateHeight,e.renderAll=this.renderAll,e.bufferSize=this.bufferSize,e.scheduleUpdate(!0),e.virtualComponents})),schedule(e,t){return l.scheduler.schedule(e,t,this.token)},_scheduleSendAction(e,t){this._scheduledActions.push([e,t]),null===this._nextSendActions&&(this._nextSendActions=setTimeout((()=>{this._nextSendActions=null,(0,o.run)((()=>{const e=this.items,t=this.key
-this._scheduledActions.forEach((r=>{let[n,o]=r
-const s=(0,a.objectAt)(e,o),l=(0,a.keyForItem)(s,t,o),u=(0,i.get)(this,n)
-"function"==typeof u?u(s,o,l):"string"==typeof u&&this.sendAction(n,s,o,l)})),this._scheduledActions.length=0}))})))},scrollToItem(e){const{_radar:t}=this
-let r=t.getOffsetForIndex(e)
-return t._scrollContainer.scrollTop=r,t._prevFirstVisibleIndex=t._prevFirstItemIndex=e,new Promise((e=>{t.scheduleUpdate(!1,e)}))},didInsertElement(){this.schedule("sync",(()=>{this._radar.start()}))},willDestroy(){this.token.cancel(),this._radar.destroy()
-let e=this.registerAPI
-e&&e(null),clearTimeout(this._nextSendActions)},init(){this._super(),this.token=new l.Token
-const e=this.staticHeight?a.StaticRadar:a.DynamicRadar,t=this.items||[],{bufferSize:r,containerSelector:n,estimateHeight:o,initialRenderCount:s,renderAll:u,renderFromLast:c,shouldRecycle:d,occlusionTagName:h,idForFirstItem:p,key:f}=this,m=function(e,t,r,n){const o=(0,i.get)(e,"length")
-let s=0
-if(null!=t){for(let i=0;i<o;i++)if((0,a.keyForItem)((0,a.objectAt)(e,i),r,i)===t){s=i
-break}}else!0===n&&(s=o-1)
-return s}(t,p,f,c)
-this._radar=new e(this.token,{bufferSize:r,containerSelector:n,estimateHeight:o,initialRenderCount:s,items:t,key:f,renderAll:u,renderFromLast:c,shouldRecycle:d,startingIndex:m,occlusionTagName:h}),this._prevItemsLength=0,this._prevFirstKey=null,this._prevLastKey=null,this._hasAction=null,this._scheduledActions=[],this._nextSendActions=null
-let g=!!this.lastReached,v=!!this.firstReached,b=!!this.lastVisibleChanged,y=!!this.firstVisibleChanged;(g||v||b||y)&&(this._hasAction={lastReached:g,firstReached:v,lastVisibleChanged:b,firstVisibleChanged:y},this._radar.sendAction=(e,t)=>{this._hasAction[e]&&this._scheduleSendAction(e,t)})
-let _=(0,i.get)(this,"registerAPI")
-if(_){_({scrollToItem:this.scrollToItem.bind(this)})}}})
-e.default=u})),define("@html-next/vertical-collection/components/vertical-collection/template",["exports","@ember/template-factory"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.createTemplateFactory)({id:"BlT5dpw+",block:'[[[42,[28,[37,1],[[28,[37,1],[[30,0,["virtualComponents"]]],null]],null],"id",[[[1,[28,[35,2],[[30,1,["upperBound"]]],null]],[41,[30,1,["isOccludedContent"]],[[[2,[28,[37,2],[[30,1,["element"]]],null]]],[]],[[[18,2,[[30,1,["content"]],[30,1,["index"]]]]],[]]],[1,[28,[35,2],[[30,1,["lowerBound"]]],null]]],[1]],null],[1,"\\n"],[41,[30,0,["shouldYieldToInverse"]],[[[1,"  "],[18,3,null],[1,"\\n"]],[]],null]],["virtualComponent","&default","&else"],false,["each","-track-array","unbound","if","yield"]]',moduleName:"@html-next/vertical-collection/components/vertical-collection/template.hbs",isStrictMode:!1})
-e.default=r})),define("block-slots/components/block-slot",["exports","@ember/object/computed","@ember/component","@ember/utils","@ember/object","block-slots/templates/components/block-slot","block-slots/mixins/slots","block-slots/components/yield-slot"],(function(e,t,r,n,i,o,s,a){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l=r.default.extend({layout:o.default,tagName:"",_name:(0,i.computed)("name",(function(){return this.name})),didInsertElement:function(){const e=this.nearestOfType(s.default)
-if(!e._isRegistered(this._name))return e._activateSlot(this._name),void(0,i.set)(this,"slottedComponent",e)
-const r=this.nearestOfType(a.default)
-if(r){(0,i.set)(this,"_yieldSlot",r)
-const e=(0,i.get)(r,"_name")===this._name;(0,i.set)(this,"isTargetSlotYielding",e)
-const o=(0,i.get)(r,"_blockParams")
-e&&(0,n.isPresent)(o)&&o.forEach(((e,r)=>{(0,i.defineProperty)(this,`p${r}`,(0,t.readOnly)(`_yieldSlot._blockParams.${r}`))}))}},willDestroyElement:function(){this.slottedComponent&&this.slottedComponent._deactivateSlot(this._name)}})
-e.default=l})),define("block-slots/components/yield-slot",["exports","@ember/object","@ember/component","block-slots/templates/components/yield-slot","block-slots/mixins/slots"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var o=r.default.extend({layout:n.default,tagName:"",_name:(0,t.computed)("name",(function(){return this.name})),_blockParams:(0,t.computed)("params",(function(){return this.params})),_parentView:(0,t.computed)((function(){return this.nearestOfType(i.default)})),isActive:(0,t.computed)("_parentView._slots.[]","_name",(function(){return(0,t.get)(this,"_parentView._slots").includes((0,t.get)(this,"_name"))}))})
-e.default=o})),define("block-slots/helpers/block-params",["exports","@ember/array","@ember/component/helper"],(function(e,t,r){"use strict"
-function n(e){return(0,t.A)(e.slice())}Object.defineProperty(e,"__esModule",{value:!0}),e.blockParams=n,e.default=void 0
-var i=(0,r.helper)(n)
-e.default=i})),define("block-slots/index",["exports","block-slots/mixins/slots"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default
-e.default=r})),define("block-slots/mixins/slots",["exports","@ember/object","@ember/array","@ember/object/mixin"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=n.default.create({_slots:(0,t.computed)((function(){return(0,r.A)()})),_activateSlot(e){(0,t.get)(this,"_slots").addObject(e)},_deactivateSlot(e){(0,t.get)(this,"_slots").removeObject(e)},_isRegistered(e){return(0,t.get)(this,"_slots").includes(e)}})
-e.default=i})),define("block-slots/templates/components/block-slot",["exports","@ember/template-factory"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.createTemplateFactory)({id:"4ElHEtnG",block:'[[[41,[33,1],[[[1,"  "],[18,1,[[33,3],[33,4],[33,5],[33,6],[33,7],[33,8],[33,9],[33,10],[33,11],[33,12]]],[1,"\\n"]],[]],null]],["&default"],false,["if","isTargetSlotYielding","yield","p0","p1","p2","p3","p4","p5","p6","p7","p8","p9"]]',moduleName:"block-slots/templates/components/block-slot.hbs",isStrictMode:!1})
-e.default=r})),define("block-slots/templates/components/yield-slot",["exports","@ember/template-factory"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.createTemplateFactory)({id:"9HAGpTRk",block:'[[[41,[33,1],[[[1,"  "],[18,1,null],[1,"\\n"]],[]],[[[1,"  "],[18,2,null],[1,"\\n"]],[]]]],["&default","&else"],false,["if","isActive","yield"]]',moduleName:"block-slots/templates/components/yield-slot.hbs",isStrictMode:!1})
-e.default=r})),define("ember-array-fns/helpers/array-concat",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[...t]=e
-return t.reduce(((e,t)=>Array.isArray(t)?e.concat(t):e),[])}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayConcat=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-array-fns/helpers/array-every",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-return!!Array.isArray(t)&&t.every(r)}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayEvery=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-array-fns/helpers/array-filter",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-return Array.isArray(t)?t.filter(r):[]}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayFilter=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-array-fns/helpers/array-find-index",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-return Array.isArray(t)?t.findIndex(r):-1}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayFindIndex=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-array-fns/helpers/array-find",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-if(Array.isArray(t))return t.find(r)}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayFind=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-array-fns/helpers/array-includes",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-return!!Array.isArray(t)&&t.includes(r)}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayIncludes=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-array-fns/helpers/array-index-of",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-return Array.isArray(t)?t.indexOf(r):-1}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayIndexOf=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-array-fns/helpers/array-is-array",["exports","@ember/array","@ember/component/helper"],(function(e,t,r){"use strict"
-function n(e){let[r]=e
-return(0,t.isArray)(r)}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayIsArray=n,e.default=void 0
-var i=(0,r.helper)(n)
-e.default=i})),define("ember-array-fns/helpers/array-is-first-element",["exports","@ember/array","@ember/component/helper"],(function(e,t,r){"use strict"
-function n(e){let[r,n]=e,i=!1
-return(0,t.isArray)(r)&&r.length&&n&&(i=r[0]===n),i}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayIsFirstElement=n,e.default=void 0
-var i=(0,r.helper)(n)
-e.default=i})),define("ember-array-fns/helpers/array-is-last-element",["exports","@ember/array","@ember/component/helper"],(function(e,t,r){"use strict"
-function n(e){let[r,n]=e,i=!1
-return(0,t.isArray)(r)&&r.length&&n&&(i=r[r.length-1]===n),i}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayIsLastElement=n,e.default=void 0
-var i=(0,r.helper)(n)
-e.default=i})),define("ember-array-fns/helpers/array-join",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-return Array.isArray(t)?t.join(r):""}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayJoin=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-array-fns/helpers/array-last-index-of",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-return Array.isArray(t)?t.lastIndexOf(r):-1}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayLastIndexOf=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-array-fns/helpers/array-map",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-return Array.isArray(t)?t.map(r):[]}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayMap=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-array-fns/helpers/array-reduce",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r,n]=e
-return Array.isArray(t)?t.reduce(r,n):[]}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayReduce=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-array-fns/helpers/array-reverse",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Array.isArray(t)?t.reverse():[]}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayReverse=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-array-fns/helpers/array-slice",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let t,[r,n,i]=e
-return t=Array.isArray(r)?void 0===i?r.slice(n):r.slice(n,i):[],t}Object.defineProperty(e,"__esModule",{value:!0}),e.arraySlice=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-array-fns/helpers/array-some",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-return!!Array.isArray(t)&&t.some(r)}Object.defineProperty(e,"__esModule",{value:!0}),e.arraySome=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-array-fns/helpers/array-sort",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-return Array.isArray(t)?t.sort(r):[]}Object.defineProperty(e,"__esModule",{value:!0}),e.arraySort=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n}))
-define("ember-array-fns/helpers/array-splice",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let t,[r,n,i,...o]=e
-return t=Array.isArray(r)?void 0===i?r.splice(i):0===o.length?r.splice(n,i):r.splice(n,i,...o):[],t}Object.defineProperty(e,"__esModule",{value:!0}),e.arraySplice=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-assign-helper/helpers/assign",["exports","@ember/polyfills","@ember/component/helper"],(function(e,t,r){"use strict"
-function n(e){return(0,t.assign)({},...e)}Object.defineProperty(e,"__esModule",{value:!0}),e.assign=n,e.default=void 0
-var i=(0,r.helper)(n)
-e.default=i})),define("ember-basic-dropdown/components/basic-dropdown-content",["exports","@ember/object","@glimmer/component","@glimmer/tracking","@ember/runloop","ember-basic-dropdown/utils/calculate-position","ember-basic-dropdown/utils/scroll-helpers","ember-basic-dropdown/utils/has-moved"],(function(e,t,r,n,i,o,s,a){"use strict"
-var l,u
-function c(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function d(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let h=(l=class extends r.default{constructor(){var e,t,r,n
-super(...arguments),c(this,"transitioningInClass",this.args.transitioningInClass||"ember-basic-dropdown--transitioning-in"),c(this,"transitionedInClass",this.args.transitionedInClass||"ember-basic-dropdown--transitioned-in"),c(this,"transitioningOutClass",this.args.transitioningOutClass||"ember-basic-dropdown--transitioning-out"),c(this,"isTouchDevice",this.args.isTouchDevice||Boolean(!!window&&"ontouchstart"in window)),c(this,"dropdownId",`ember-basic-dropdown-content-${this.args.dropdown.uniqueId}`),c(this,"touchMoveEvent",void 0),c(this,"handleRootMouseDown",void 0),c(this,"scrollableAncestors",[]),c(this,"mutationObserver",void 0),e=this,t="animationClass",n=this,(r=u)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}get destinationElement(){return document.getElementById(this.args.destination)}get animationEnabled(){return!0}noop(){}setup(e){let t=document.querySelector(`[data-ebd-id=${this.args.dropdown.uniqueId}-trigger]`)
-this.handleRootMouseDown=r=>{if(null===r.target)return
-let n=r.target;(0,a.default)(r,this.touchMoveEvent)||e.contains(n)||t&&t.contains(n)||g(n,this.dropdownId)?this.touchMoveEvent=void 0:this.args.dropdown.actions.close(r,!0)},document.addEventListener(this.args.rootEventType,this.handleRootMouseDown,!0),window.addEventListener("resize",this.runloopAwareReposition),window.addEventListener("orientationchange",this.runloopAwareReposition),this.isTouchDevice&&(document.addEventListener("touchstart",this.touchStartHandler,!0),document.addEventListener("touchend",this.handleRootMouseDown,!0)),null!==t&&(this.scrollableAncestors=function(e){let t=[]
-if(e){let r=e.parentNode
-if(null!==r){let e=(0,o.getScrollParent)(r)
-for(;e&&"BODY"!==e.tagName.toUpperCase()&&"HTML"!==e.tagName.toUpperCase();){t.push(e)
-let r=e.parentNode
-e=null===r?void 0:(0,o.getScrollParent)(r)}}}return t}(t)),this.addScrollHandling(e)}teardown(){this.removeGlobalEvents(),this.removeScrollHandling(),this.scrollableAncestors=[],document.removeEventListener(this.args.rootEventType,this.handleRootMouseDown,!0),this.isTouchDevice&&(document.removeEventListener("touchstart",this.touchStartHandler,!0),document.removeEventListener("touchend",this.handleRootMouseDown,!0))}animateIn(e){this.animationEnabled&&m(e,(()=>{this.animationClass=this.transitionedInClass}))}animateOut(e){if(!this.animationEnabled)return
-let t=e.parentElement
-if(null===t)return
-if(this.args.renderInPlace&&(t=t.parentElement),null===t)return
-let r=e.cloneNode(!0)
-r.id=`${r.id}--clone`,r.classList.remove(...this.transitioningInClass.split(" ")),r.classList.add(...this.transitioningOutClass.split(" ")),t.appendChild(r),this.animationClass=this.transitionedInClass,m(r,(function(){t.removeChild(r)}))}setupMutationObserver(e){this.mutationObserver=new MutationObserver((e=>{let t=e.some((e=>p(e.addedNodes)||p(e.removedNodes)))
-t&&this.args.shouldReposition&&(t=this.args.shouldReposition(e,this.args.dropdown)),t&&this.runloopAwareReposition()})),this.mutationObserver.observe(e,{childList:!0,subtree:!0})}teardownMutationObserver(){void 0!==this.mutationObserver&&(this.mutationObserver.disconnect(),this.mutationObserver=void 0)}touchStartHandler(){document.addEventListener("touchmove",this.touchMoveHandler,!0)}touchMoveHandler(e){this.touchMoveEvent=e,document.removeEventListener("touchmove",this.touchMoveHandler,!0)}runloopAwareReposition(){(0,i.join)(this.args.dropdown.actions.reposition)}removeGlobalEvents(){window.removeEventListener("resize",this.runloopAwareReposition),window.removeEventListener("orientationchange",this.runloopAwareReposition)}addScrollHandling(e){if(!0===this.args.preventScroll){let t=t=>{if(null===t.target)return
-let r=t.target
-if(e.contains(r)||e===t.target){const n=(0,s.getAvailableScroll)(r,e)
-let{deltaX:i,deltaY:o}=(0,s.getScrollDeltas)(t)
-i<n.deltaXNegative?(i=n.deltaXNegative,t.preventDefault()):i>n.deltaXPositive?(i=n.deltaXPositive,t.preventDefault()):o<n.deltaYNegative?(o=n.deltaYNegative,t.preventDefault()):o>n.deltaYPositive&&(o=n.deltaYPositive,t.preventDefault()),t.defaultPrevented&&(i||o)&&(0,s.distributeScroll)(i,o,r,e)}else t.preventDefault()}
-document.addEventListener("wheel",t,{capture:!0,passive:!1}),this.removeScrollHandling=()=>{document.removeEventListener("wheel",t,{capture:!0})}}else this.addScrollEvents(),this.removeScrollHandling=this.removeScrollEvents}removeScrollHandling(){}addScrollEvents(){window.addEventListener("scroll",this.runloopAwareReposition),this.scrollableAncestors.forEach((e=>{e.addEventListener("scroll",this.runloopAwareReposition)}))}removeScrollEvents(){window.removeEventListener("scroll",this.runloopAwareReposition),this.scrollableAncestors.forEach((e=>{e.removeEventListener("scroll",this.runloopAwareReposition)}))}},u=d(l.prototype,"animationClass",[n.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return this.animationEnabled?this.transitioningInClass:""}}),d(l.prototype,"setup",[t.action],Object.getOwnPropertyDescriptor(l.prototype,"setup"),l.prototype),d(l.prototype,"teardown",[t.action],Object.getOwnPropertyDescriptor(l.prototype,"teardown"),l.prototype),d(l.prototype,"animateIn",[t.action],Object.getOwnPropertyDescriptor(l.prototype,"animateIn"),l.prototype),d(l.prototype,"animateOut",[t.action],Object.getOwnPropertyDescriptor(l.prototype,"animateOut"),l.prototype),d(l.prototype,"setupMutationObserver",[t.action],Object.getOwnPropertyDescriptor(l.prototype,"setupMutationObserver"),l.prototype),d(l.prototype,"teardownMutationObserver",[t.action],Object.getOwnPropertyDescriptor(l.prototype,"teardownMutationObserver"),l.prototype),d(l.prototype,"touchStartHandler",[t.action],Object.getOwnPropertyDescriptor(l.prototype,"touchStartHandler"),l.prototype),d(l.prototype,"touchMoveHandler",[t.action],Object.getOwnPropertyDescriptor(l.prototype,"touchMoveHandler"),l.prototype),d(l.prototype,"runloopAwareReposition",[t.action],Object.getOwnPropertyDescriptor(l.prototype,"runloopAwareReposition"),l.prototype),d(l.prototype,"removeGlobalEvents",[t.action],Object.getOwnPropertyDescriptor(l.prototype,"removeGlobalEvents"),l.prototype),l)
-function p(e){for(let t=0;t<e.length;t++){const r=e[t]
-if("#comment"!==r.nodeName&&("#text"!==r.nodeName||""!==r.nodeValue))return!0}return!1}function f(e){for(;e&&(!e.classList||!e.classList.contains("ember-basic-dropdown-content"));){if(null===e.parentElement)return null
-e=e.parentElement}return e}function m(e,t){window.requestAnimationFrame((function(){let r=window.getComputedStyle(e)
-if("none"!==r.animationName&&"running"===r.animationPlayState){let r=function(){e.removeEventListener("animationend",r),t()}
-e.addEventListener("animationend",r)}else t()}))}function g(e,t){let r=f(e)
-if(null===r)return!1
-{let e=r.attributes,n=document.querySelector(`[aria-owns=${e.id.value}]`)
-if(null===n)return!1
-let i=f(n)
-if(null===i)return!1
-let o=i.attributes
-return i&&o.id.value===t||g(i,t)}}e.default=h})),define("ember-basic-dropdown/components/basic-dropdown-optional-tag",["exports","@glimmer/component"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{}e.default=r})),define("ember-basic-dropdown/components/basic-dropdown-trigger",["exports","@glimmer/component","@ember/object","ember-basic-dropdown/utils/has-moved"],(function(e,t,r,n){"use strict"
-var i
-function o(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function s(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(i=class extends t.default{constructor(){super(...arguments),o(this,"toggleIsBeingHandledByTouchEvents",!1),o(this,"touchMoveEvent",void 0)}noop(){}handleMouseDown(e){this.args.dropdown.disabled||"mousedown"===this.args.eventType&&0===e.button&&(this.args.stopPropagation&&e.stopPropagation(),this._stopTextSelectionUntilMouseup(),this.toggleIsBeingHandledByTouchEvents?this.toggleIsBeingHandledByTouchEvents=!1:this.args.dropdown.actions.toggle(e))}handleClick(e){"undefined"!=typeof document&&(this.isDestroyed||!this.args.dropdown||this.args.dropdown.disabled||void 0!==this.args.eventType&&"click"!==this.args.eventType||0!==e.button||(this.args.stopPropagation&&e.stopPropagation(),this.toggleIsBeingHandledByTouchEvents?this.toggleIsBeingHandledByTouchEvents=!1:this.args.dropdown.actions.toggle(e)))}handleKeyDown(e){this.args.dropdown.disabled||(13===e.keyCode?this.args.dropdown.actions.toggle(e):32===e.keyCode?(e.preventDefault(),this.args.dropdown.actions.toggle(e)):27===e.keyCode&&this.args.dropdown.actions.close(e))}handleTouchStart(){document.addEventListener("touchmove",this._touchMoveHandler)}handleTouchEnd(e){if(this.toggleIsBeingHandledByTouchEvents=!0,e&&e.defaultPrevented||this.args.dropdown.disabled)return;(0,n.default)(e,this.touchMoveEvent)||this.args.dropdown.actions.toggle(e),this.touchMoveEvent=void 0,document.removeEventListener("touchmove",this._touchMoveHandler)
-let t=e.target
-null!==t&&t.focus(),setTimeout((function(){if(e.target)try{let t=document.createEvent("MouseEvents")
-t.initMouseEvent("click",!0,!0,window,0,0,0,0,0,!1,!1,!1,!1,0,null),e.target.dispatchEvent(t)}catch(e){event=new Event("click"),e.target.dispatchEvent(event)}}),0),e.preventDefault()}removeGlobalHandlers(){"undefined"!=typeof document&&(document.removeEventListener("touchmove",this._touchMoveHandler),document.removeEventListener("mouseup",this._mouseupHandler,!0))}_mouseupHandler(){document.removeEventListener("mouseup",this._mouseupHandler,!0),document.body.classList.remove("ember-basic-dropdown-text-select-disabled")}_touchMoveHandler(e){this.touchMoveEvent=e,document.removeEventListener("touchmove",this._touchMoveHandler)}_stopTextSelectionUntilMouseup(){document.addEventListener("mouseup",this._mouseupHandler,!0),document.body.classList.add("ember-basic-dropdown-text-select-disabled")}},s(i.prototype,"handleMouseDown",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"handleMouseDown"),i.prototype),s(i.prototype,"handleClick",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"handleClick"),i.prototype),s(i.prototype,"handleKeyDown",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"handleKeyDown"),i.prototype),s(i.prototype,"handleTouchStart",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"handleTouchStart"),i.prototype),s(i.prototype,"handleTouchEnd",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"handleTouchEnd"),i.prototype),s(i.prototype,"removeGlobalHandlers",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"removeGlobalHandlers"),i.prototype),s(i.prototype,"_mouseupHandler",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"_mouseupHandler"),i.prototype),s(i.prototype,"_touchMoveHandler",[r.action],Object.getOwnPropertyDescriptor(i.prototype,"_touchMoveHandler"),i.prototype),i)
-e.default=a})),define("ember-basic-dropdown/components/basic-dropdown",["exports","@glimmer/component","@glimmer/tracking","@ember/object","@ember/object/internals","@ember/application","@ember/polyfills","ember-basic-dropdown/utils/calculate-position","@ember/runloop"],(function(e,t,r,n,i,o,s,a,l){"use strict"
-var u,c,d,h,p,f,m,g,v,b,y
-function _(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function w(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function O(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const x={},P=["top","left","right","width","height"]
-let S=(u=class extends t.default{get horizontalPosition(){return this.args.horizontalPosition||"auto"}get verticalPosition(){return this.args.verticalPosition||"auto"}get destination(){return this.args.destination||this._getDestinationId()}get disabled(){let e=this.args.disabled||!1
-return this._previousDisabled!==x&&this._previousDisabled!==e&&(0,l.schedule)("actions",(()=>{e&&this.publicAPI.isOpen&&(this.isOpen=!1),this.args.registerAPI&&this.args.registerAPI(this.publicAPI)})),this._previousDisabled=e,e}get publicAPI(){return{uniqueId:this._uid,isOpen:this.isOpen,disabled:this.disabled,actions:this._actions}}constructor(e,t){super(e,t),_(this,"hPosition",c,this),_(this,"vPosition",d,this),_(this,"top",h,this),_(this,"left",p,this),_(this,"right",f,this),_(this,"width",m,this),_(this,"height",g,this),_(this,"otherStyles",v,this),_(this,"isOpen",b,this),_(this,"renderInPlace",y,this),w(this,"previousVerticalPosition",void 0),w(this,"previousHorizontalPosition",void 0),w(this,"destinationElement",void 0),w(this,"_uid",(0,i.guidFor)(this)),w(this,"_dropdownId",this.args.dropdownId||`ember-basic-dropdown-content-${this._uid}`),w(this,"_previousDisabled",x),w(this,"_actions",{open:this.open,close:this.close,toggle:this.toggle,reposition:this.reposition}),this.args.onInit&&this.args.onInit(this.publicAPI),this.args.registerAPI&&this.args.registerAPI(this.publicAPI)}willDestroy(){super.willDestroy(),this.args.registerAPI&&this.args.registerAPI(null)}open(e){this.isDestroyed||this.publicAPI.disabled||this.publicAPI.isOpen||this.args.onOpen&&!1===this.args.onOpen(this.publicAPI,e)||(this.isOpen=!0,this.args.registerAPI&&this.args.registerAPI(this.publicAPI))}close(e,t){if(this.isDestroyed)return
-if(this.publicAPI.disabled||!this.publicAPI.isOpen)return
-if(this.args.onClose&&!1===this.args.onClose(this.publicAPI,e))return
-if(this.isDestroyed)return
-if(this.hPosition=this.vPosition=null,this.top=this.left=this.right=this.width=this.height=void 0,this.previousVerticalPosition=this.previousHorizontalPosition=void 0,this.isOpen=!1,this.args.registerAPI&&this.args.registerAPI(this.publicAPI),t)return
-let r=document.querySelector(`[data-ebd-id=${this.publicAPI.uniqueId}-trigger]`)
-r&&r.tabIndex>-1&&r.focus()}toggle(e){this.publicAPI.isOpen?this.close(e):this.open(e)}reposition(){if(!this.publicAPI.isOpen)return
-let e=document.getElementById(this._dropdownId),t=document.querySelector(`[data-ebd-id=${this.publicAPI.uniqueId}-trigger]`)
-if(!e||!t)return
-this.destinationElement=this.destinationElement||document.getElementById(this.destination)
-let{horizontalPosition:r,verticalPosition:n,previousHorizontalPosition:i,previousVerticalPosition:o}=this,{renderInPlace:s=!1,matchTriggerWidth:l=!1}=this.args,u=(this.args.calculatePosition||a.default)(t,e,this.destinationElement,{horizontalPosition:r,verticalPosition:n,previousHorizontalPosition:i,previousVerticalPosition:o,renderInPlace:s,matchTriggerWidth:l,dropdown:this})
-return this.applyReposition(t,e,u)}applyReposition(e,t,r){let n={hPosition:r.horizontalPosition,vPosition:r.verticalPosition,otherStyles:(0,s.assign)({},this.otherStyles)}
-if(r.style&&(void 0!==r.style.top&&(n.top=`${r.style.top}px`),void 0!==r.style.left?(n.left=`${r.style.left}px`,n.right=void 0,void 0!==r.style.right&&(r.style.right=void 0)):void 0!==r.style.right&&(n.right=`${r.style.right}px`,n.left=void 0),void 0!==r.style.width&&(n.width=`${r.style.width}px`),void 0!==r.style.height&&(n.height=`${r.style.height}px`),void 0===this.top))for(let i in r.style)void 0!==r.style[i]&&("number"==typeof r.style[i]?t.style.setProperty(i,`${r.style[i]}px`):t.style.setProperty(i,`${r.style[i]}`))
-for(let i in r.style)-1===P.indexOf(i)&&(n.otherStyles,n.otherStyles[i]=r.style[i])
-return this.hPosition=n.hPosition,this.vPosition=n.vPosition,this.top=n.top,this.left=n.left,this.right=n.right,this.width=n.width,this.height=n.height,this.otherStyles=n.otherStyles,this.previousHorizontalPosition=r.horizontalPosition,this.previousVerticalPosition=r.verticalPosition,n}_getDestinationId(){let e=(0,o.getOwner)(this).resolveRegistration("config:environment")
-return e["ember-basic-dropdown"]&&e["ember-basic-dropdown"].destination||"ember-basic-dropdown-wormhole"}},c=O(u.prototype,"hPosition",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return null}}),d=O(u.prototype,"vPosition",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return null}}),h=O(u.prototype,"top",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=O(u.prototype,"left",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=O(u.prototype,"right",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=O(u.prototype,"width",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=O(u.prototype,"height",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v=O(u.prototype,"otherStyles",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return{}}}),b=O(u.prototype,"isOpen",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return this.args.initiallyOpened||!1}}),y=O(u.prototype,"renderInPlace",[r.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return void 0!==this.args.renderInPlace&&this.args.renderInPlace}}),O(u.prototype,"open",[n.action],Object.getOwnPropertyDescriptor(u.prototype,"open"),u.prototype),O(u.prototype,"close",[n.action],Object.getOwnPropertyDescriptor(u.prototype,"close"),u.prototype),O(u.prototype,"toggle",[n.action],Object.getOwnPropertyDescriptor(u.prototype,"toggle"),u.prototype),O(u.prototype,"reposition",[n.action],Object.getOwnPropertyDescriptor(u.prototype,"reposition"),u.prototype),u)
-e.default=S})),define("ember-basic-dropdown/templates/components/basic-dropdown-content",["exports","@ember/template-factory"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.createTemplateFactory)({id:"goMvevpb",block:'[[[41,[30,1,["isOpen"]],[[[1,"  "],[10,0],[14,0,"ember-basic-dropdown-content-wormhole-origin"],[12],[1,"\\n"],[8,[39,1],null,[["@destinationElement","@renderInPlace"],[[30,0,["destinationElement"]],[30,2]]],[["default"],[[[[41,[30,3],[[[1,"        "],[10,0],[14,0,"ember-basic-dropdown-overlay"],[12],[13],[1,"\\n"]],[]],null],[1,"\\n      "],[8,[39,2],[[16,1,[30,0,["dropdownId"]]],[16,0,[29,["ember-basic-dropdown-content ember-basic-dropdown-content--",[30,4],"\\n          ember-basic-dropdown-content--",[30,5],"\\n          ",[30,0,["animationClass"]],[52,[30,2]," ember-basic-dropdown-content--in-place"],"\\n          ",[30,6]]]],[16,"dir",[30,7]],[17,8],[4,[38,3],[[30,10],[28,[37,4],null,[["top","left","right","width","height"],[[30,11],[30,12],[30,13],[30,14],[30,15]]]]],null],[4,[38,5],[[30,0,["setup"]]],null],[4,[38,5],[[30,1,["actions","reposition"]]],null],[4,[38,5],[[30,0,["setupMutationObserver"]]],null],[4,[38,5],[[30,0,["animateIn"]]],null],[4,[38,6],[[30,0,["teardownMutationObserver"]]],null],[4,[38,6],[[30,0,["animateOut"]]],null],[4,[38,6],[[30,0,["teardown"]]],null],[4,[38,7],["focusin",[28,[37,8],[[28,[37,9],[[30,16],[30,0,["noop"]]],null],[30,1]],null]],null],[4,[38,7],["focusout",[28,[37,8],[[28,[37,9],[[30,17],[30,0,["noop"]]],null],[30,1]],null]],null],[4,[38,7],["mouseenter",[28,[37,8],[[28,[37,9],[[30,18],[30,0,["noop"]]],null],[30,1]],null]],null],[4,[38,7],["mouseleave",[28,[37,8],[[28,[37,9],[[30,19],[30,0,["noop"]]],null],[30,1]],null]],null]],[["@htmlTag"],[[30,9]]],[["default"],[[[[1,"\\n        "],[18,20,null],[1,"\\n      "]],[]]]]],[1,"\\n"]],[]]]]],[1,"  "],[13],[1,"\\n"]],[]],[[[1,"  "],[11,0],[16,1,[30,0,["dropdownId"]]],[24,0,"ember-basic-dropdown-content-placeholder"],[4,[38,3],[[28,[37,4],null,[["display"],["none"]]]],null],[12],[13],[1,"\\n"]],[]]]],["@dropdown","@renderInPlace","@overlay","@hPosition","@vPosition","@defaultClass","@dir","&attrs","@htmlTag","@otherStyles","@top","@left","@right","@width","@height","@onFocusIn","@onFocusOut","@onMouseEnter","@onMouseLeave","&default"],false,["if","maybe-in-element","basic-dropdown-optional-tag","style","hash","did-insert","will-destroy","on","fn","or","yield"]]',moduleName:"ember-basic-dropdown/templates/components/basic-dropdown-content.hbs",isStrictMode:!1})
-e.default=r})),define("ember-basic-dropdown/templates/components/basic-dropdown-optional-tag",["exports","@ember/template-factory"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.createTemplateFactory)({id:"lX6h/YZy",block:'[[[41,[30,1],[[[44,[[50,[28,[37,3],[[28,[37,4],[[30,1]],null]],null],0,null,[["tagName"],[[30,1]]]]],[[[1,"    "],[8,[30,2],[[17,3]],null,[["default"],[[[[1,"\\n      "],[18,4,null],[1,"\\n    "]],[]]]]],[1,"\\n"]],[2]]]],[]],[[[1,"  "],[11,0],[17,3],[12],[1,"\\n    "],[18,4,null],[1,"\\n  "],[13],[1,"\\n"]],[]]]],["@htmlTag","Element","&attrs","&default"],false,["if","let","component","ensure-safe-component","-element","yield"]]',moduleName:"ember-basic-dropdown/templates/components/basic-dropdown-optional-tag.hbs",isStrictMode:!1})
-e.default=r})),define("ember-basic-dropdown/templates/components/basic-dropdown-trigger",["exports","@ember/template-factory"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.createTemplateFactory)({id:"y6wEe5du",block:'[[[8,[39,0],[[16,0,[29,["ember-basic-dropdown-trigger\\n    ",[52,[30,1]," ember-basic-dropdown-trigger--in-place"],"\\n    ",[52,[30,2],[28,[37,2],[" ember-basic-dropdown-trigger--",[30,2]],null]],"\\n    ",[52,[30,3],[28,[37,2],[" ember-basic-dropdown-trigger--",[30,3]],null]],"\\n    ",[30,4]]]],[24,"role","button"],[16,"tabindex",[52,[51,[30,5,["disabled"]]],"0"]],[16,"data-ebd-id",[29,[[30,5,["uniqueId"]],"-trigger"]]],[16,"aria-owns",[29,["ember-basic-dropdown-content-",[30,5,["uniqueId"]]]]],[16,"aria-expanded",[29,[[30,5,["isOpen"]]]]],[16,"aria-disabled",[52,[30,5,["disabled"]],"true"]],[17,6],[4,[38,4],[[30,0,["removeGlobalHandlers"]]],null],[4,[38,5],["mousedown",[30,0,["handleMouseDown"]]],null],[4,[38,5],["click",[30,0,["handleClick"]]],null],[4,[38,5],["keydown",[30,0,["handleKeyDown"]]],null],[4,[38,5],["touchstart",[30,0,["handleTouchStart"]]],null],[4,[38,5],["touchend",[30,0,["handleTouchEnd"]]],null],[4,[38,5],["keydown",[28,[37,6],[[28,[37,7],[[30,8],[30,0,["noop"]]],null],[30,5]],null]],null],[4,[38,5],["mousedown",[28,[37,6],[[28,[37,7],[[30,9],[30,0,["noop"]]],null],[30,5]],null]],null],[4,[38,5],["touchend",[28,[37,6],[[28,[37,7],[[30,10],[30,0,["noop"]]],null],[30,5]],null]],null],[4,[38,5],["click",[28,[37,6],[[28,[37,7],[[30,11],[30,0,["noop"]]],null],[30,5]],null]],null],[4,[38,5],["mouseenter",[28,[37,6],[[28,[37,7],[[30,12],[30,0,["noop"]]],null],[30,5]],null]],null],[4,[38,5],["mouseleave",[28,[37,6],[[28,[37,7],[[30,13],[30,0,["noop"]]],null],[30,5]],null]],null],[4,[38,5],["focus",[28,[37,6],[[28,[37,7],[[30,14],[30,0,["noop"]]],null],[30,5]],null]],null],[4,[38,5],["blur",[28,[37,6],[[28,[37,7],[[30,15],[30,0,["noop"]]],null],[30,5]],null]],null],[4,[38,5],["focusin",[28,[37,6],[[28,[37,7],[[30,16],[30,0,["noop"]]],null],[30,5]],null]],null],[4,[38,5],["focusout",[28,[37,6],[[28,[37,7],[[30,17],[30,0,["noop"]]],null],[30,5]],null]],null]],[["@htmlTag"],[[30,7]]],[["default"],[[[[1,"\\n  "],[18,18,null],[1,"\\n"]],[]]]]]],["@renderInPlace","@hPosition","@vPosition","@defaultClass","@dropdown","&attrs","@htmlTag","@onKeyDown","@onMouseDown","@onTouchEnd","@onClick","@onMouseEnter","@onMouseLeave","@onFocus","@onBlur","@onFocusIn","@onFocusOut","&default"],false,["basic-dropdown-optional-tag","if","concat","unless","will-destroy","on","fn","or","yield"]]',moduleName:"ember-basic-dropdown/templates/components/basic-dropdown-trigger.hbs",isStrictMode:!1})
-e.default=r})),define("ember-basic-dropdown/templates/components/basic-dropdown",["exports","@ember/template-factory"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.createTemplateFactory)({id:"sfgijGF2",block:'[[[44,[[28,[37,1],null,[["uniqueId","isOpen","disabled","actions","Trigger","Content"],[[30,0,["publicAPI","uniqueId"]],[30,0,["publicAPI","isOpen"]],[30,0,["publicAPI","disabled"]],[30,0,["publicAPI","actions"]],[52,[28,[37,3],[[30,1],[27]],null],[50,"basic-dropdown-trigger",0,null,[["dropdown","hPosition","renderInPlace","vPosition"],[[28,[37,5],[[30,0,["publicAPI"]]],null],[28,[37,5],[[30,0,["hPosition"]]],null],[28,[37,5],[[30,0,["renderInPlace"]]],null],[28,[37,5],[[30,0,["vPosition"]]],null]]]],[50,[28,[37,6],[[30,1]],null],0,null,[["dropdown","hPosition","renderInPlace","vPosition"],[[28,[37,5],[[30,0,["publicAPI"]]],null],[28,[37,5],[[30,0,["hPosition"]]],null],[28,[37,5],[[30,0,["renderInPlace"]]],null],[28,[37,5],[[30,0,["vPosition"]]],null]]]]],[52,[28,[37,3],[[30,2],[27]],null],[50,"basic-dropdown-content",0,null,[["dropdown","hPosition","renderInPlace","preventScroll","rootEventType","vPosition","destination","top","left","right","width","height","otherStyles"],[[28,[37,5],[[30,0,["publicAPI"]]],null],[28,[37,5],[[30,0,["hPosition"]]],null],[28,[37,5],[[30,0,["renderInPlace"]]],null],[28,[37,5],[[30,3]],null],[28,[37,7],[[30,4],"click"],null],[28,[37,5],[[30,0,["vPosition"]]],null],[28,[37,5],[[30,0,["destination"]]],null],[28,[37,5],[[30,0,["top"]]],null],[28,[37,5],[[30,0,["left"]]],null],[28,[37,5],[[30,0,["right"]]],null],[28,[37,5],[[30,0,["width"]]],null],[28,[37,5],[[30,0,["height"]]],null],[28,[37,5],[[30,0,["otherStyles"]]],null]]]],[50,[28,[37,6],[[30,2]],null],0,null,[["dropdown","hPosition","renderInPlace","preventScroll","rootEventType","vPosition","destination","top","left","right","width","height","otherStyles"],[[28,[37,5],[[30,0,["publicAPI"]]],null],[28,[37,5],[[30,0,["hPosition"]]],null],[28,[37,5],[[30,0,["renderInPlace"]]],null],[28,[37,5],[[30,3]],null],[28,[37,7],[[30,4],"click"],null],[28,[37,5],[[30,0,["vPosition"]]],null],[28,[37,5],[[30,0,["destination"]]],null],[28,[37,5],[[30,0,["top"]]],null],[28,[37,5],[[30,0,["left"]]],null],[28,[37,5],[[30,0,["right"]]],null],[28,[37,5],[[30,0,["width"]]],null],[28,[37,5],[[30,0,["height"]]],null],[28,[37,5],[[30,0,["otherStyles"]]],null]]]]]]]]],[[[41,[30,5],[[[41,[30,0,["renderInPlace"]],[[[1,"    "],[11,0],[24,0,"ember-basic-dropdown"],[17,6],[12],[18,7,[[30,5]]],[13],[1,"\\n"]],[]],[[[1,"    "],[18,7,[[30,5]]],[1,"\\n"]],[]]]],[]],null]],[5]]]],["@triggerComponent","@contentComponent","@preventScroll","@rootEventType","api","&attrs","&default"],false,["let","hash","if","eq","component","readonly","ensure-safe-component","or","yield"]]',moduleName:"ember-basic-dropdown/templates/components/basic-dropdown.hbs",isStrictMode:!1})
-e.default=r})),define("ember-basic-dropdown/utils/calculate-position",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.getScrollParent=function(e){let t=window.getComputedStyle(e),r="absolute"===t.position,n=/(auto|scroll)/
-if("fixed"===t.position)return document.body
-for(let i=e;i=i.parentElement;)if(t=window.getComputedStyle(i),(!r||"static"!==t.position)&&n.test(t.overflow+t.overflowY+t.overflowX))return i
-return document.body},e.default=e.calculateInPlacePosition=e.calculateWormholedPosition=void 0
-let t=(e,t,r,n)=>{let{horizontalPosition:i,verticalPosition:o,matchTriggerWidth:s,previousHorizontalPosition:a,previousVerticalPosition:l}=n,u=window.pageXOffset,c=window.pageYOffset,{left:d,top:h,width:p,height:f}=e.getBoundingClientRect(),{height:m,width:g}=t.getBoundingClientRect(),v=document.body.clientWidth||window.innerWidth,b={},y=r.parentNode,_=window.getComputedStyle(y).position
-for(;"relative"!==_&&"absolute"!==_&&"BODY"!==y.tagName.toUpperCase();)y=y.parentNode,_=window.getComputedStyle(y).position
-if("relative"===_||"absolute"===_){let e=y.getBoundingClientRect()
-d-=e.left,h-=e.top
-let{offsetParent:t}=y
-t&&(d-=t.scrollLeft,h-=t.scrollTop)}g=s?p:g,s&&(b.width=g)
-let w=d+u
-if("auto"===i||"auto-left"===i){let e=Math.min(v,d+g)-Math.max(0,d),t=Math.min(v,d+p)-Math.max(0,d+p-g)
-i=g>e&&t>e?"right":g>t&&e>t?"left":a||"left"}else if("auto-right"===i){let e=Math.min(v,d+g)-Math.max(0,d),t=Math.min(v,d+p)-Math.max(0,d+p-g)
-i=g>t&&e>t?"left":g>e&&t>e?"right":a||"right"}"right"===i?b.right=v-(w+p):b.left="center"===i?w+(p-g)/2:w
-let O=h
-if("relative"===window.getComputedStyle(document.body).getPropertyValue("position")||(O+=c),"above"===o)b.top=O-m
-else if("below"===o)b.top=O+f
-else{let e=O+f+m<c+window.innerHeight,t=h>m
-o=e||t?"below"===l&&!e&&t?"above":"above"===l&&!t&&e?"below":l||(e?"below":"above"):"below",b.top=O+("below"===o?f:-m)}return{horizontalPosition:i,verticalPosition:o,style:b}}
-e.calculateWormholedPosition=t
-let r=(e,t,r,n)=>{let i,{horizontalPosition:o,verticalPosition:s}=n,a={horizontalPosition:"left",verticalPosition:"below",style:{}}
-if("auto"===o){let r=e.getBoundingClientRect()
-i=t.getBoundingClientRect()
-let n=window.pageXOffset+window.innerWidth
-a.horizontalPosition=r.left+i.width>n?"right":"left"}else if("center"===o){let{width:r}=e.getBoundingClientRect(),{width:n}=t.getBoundingClientRect()
-a.style={left:(r-n)/2}}else if("auto-right"===o){let r=e.getBoundingClientRect(),n=t.getBoundingClientRect()
-a.horizontalPosition=r.right>n.width?"right":"left"}else"right"===o&&(a.horizontalPosition="right")
-return"above"===s?(a.verticalPosition=s,i=i||t.getBoundingClientRect(),a.style.top=-i.height):a.verticalPosition="below",a}
-e.calculateInPlacePosition=r
-var n=(e,n,i,o)=>o.renderInPlace?r(e,n,0,o):t(e,n,i,o)
-e.default=n})),define("ember-basic-dropdown/utils/has-moved",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){var r
-if(!t)return!1
-if(null===(r=e.changedTouches)||void 0===r||!r[0]||"stylus"!==t.changedTouches[0].touchType)return!0
-let n=Math.abs(t.changedTouches[0].pageX-e.changedTouches[0].pageX),i=Math.abs(t.changedTouches[0].pageY-e.changedTouches[0].pageY)
-return n>=5||i>=5}})),define("ember-basic-dropdown/utils/scroll-helpers",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.getScrollDeltas=function(e){let{deltaX:r=0,deltaY:i=0,deltaMode:o=t}=e
-if(o!==t){2===o&&(r*=3,i*=3)
-const e=n()
-void 0!==e&&(r*=e,i*=e)}return{deltaX:r,deltaY:i}},e.getScrollLineHeight=n,e.getAvailableScroll=function(e,t){const r={deltaXNegative:0,deltaXPositive:0,deltaYNegative:0,deltaYPositive:0}
-let n,i
-for(;t.contains(e)||t===e;){n=e.scrollWidth-e.clientWidth,i=e.scrollHeight-e.clientHeight,r.deltaXNegative+=-e.scrollLeft,r.deltaXPositive+=n-e.scrollLeft,r.deltaYNegative+=-e.scrollTop,r.deltaYPositive+=i-e.scrollTop
-let t=e.parentNode
-if(null===t)break
-e=t}return r},e.distributeScroll=function(e,t,r,n){const o=i(e,t,r,n)
-let s
-for(let i=0;i<o.length;i++)s=o[i],s.element.scrollLeft=s.scrollLeft,s.element.scrollTop=s.scrollTop},e.LINES_PER_PAGE=e.DOM_DELTA_PAGE=e.DOM_DELTA_LINE=e.DOM_DELTA_PIXEL=void 0
-const t=0
-e.DOM_DELTA_PIXEL=t
-e.DOM_DELTA_LINE=1
-e.DOM_DELTA_PAGE=2
-let r
-function n(){if(void 0===r){const e=document.createElement("iframe")
-e.src="#",e.style.position="absolute",e.style.visibility="hidden",e.style.width="0px",e.style.height="0px",e.style.border="none",document.body.appendChild(e)
-const t=e.contentWindow.document
-t.open(),t.write("<!doctype html><html><head></head><body><span>X</span></body></html>"),t.close()
-let n=t.body
-r=n.firstElementChild.offsetHeight,document.body.removeChild(e)}return r}function i(e,t,r,n){let o=arguments.length>4&&void 0!==arguments[4]?arguments[4]:[]
-const s={element:r,scrollLeft:0,scrollTop:0},a=r.scrollWidth-r.clientWidth,l=r.scrollHeight-r.clientHeight,u={deltaXNegative:-r.scrollLeft,deltaXPositive:a-r.scrollLeft,deltaYNegative:-r.scrollTop,deltaYPositive:l-r.scrollTop},c=window.getComputedStyle(r)
-return"hidden"!==c.overflowX&&(s.scrollLeft=r.scrollLeft+e,e>u.deltaXPositive?e-=u.deltaXPositive:e<u.deltaXNegative?e-=u.deltaXNegative:e=0),"hidden"!==c.overflowY&&(s.scrollTop=r.scrollTop+t,t>u.deltaYPositive?t-=u.deltaYPositive:t<u.deltaYNegative?t-=u.deltaYNegative:t=0),r!==n&&(e||t)?i(e,t,r.parentNode,n,o.concat([s])):o.concat([s])}e.LINES_PER_PAGE=3})),define("ember-cached-decorator-polyfill/index",["exports","@glimmer/tracking/primitives/cache","@ember/debug"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.cached=function(){for(var e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n]
-const[i,o,s]=r
-const a=new WeakMap,l=s.get
-s.get=function(){return a.has(this)||a.set(this,(0,t.createCache)(l.bind(this))),(0,t.getValue)(a.get(this))}}})),define("ember-can/ability",["exports","@ember/object","@ember/string"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{parseProperty(e){return(0,r.camelize)(`can-${e}`)}getAbility(e,r,n){const i=(0,t.get)(this,this.parseProperty(e))
-return"function"==typeof i?i.call(this,r,n):i}}e.default=n})),define("ember-can/computed",["exports","@ember/object","@ember/application","@ember/debug"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.ability=function(e,n){return n=n||e,(0,t.computed)(n,(function(){return(0,r.getOwner)(this).lookup("service:abilities").abilityFor(e,(0,t.get)(this,n))})).readOnly()}})),define("ember-can/helpers/can",["exports","@ember/component/helper","@ember/service"],(function(e,t,r){"use strict"
-var n,i,o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let s=(n=(0,r.inject)("abilities"),i=class extends t.default{constructor(){var e,t,r,n
-super(...arguments),e=this,t="abilities",n=this,(r=o)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}compute(e){let[t,r]=e,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return this.abilities.can(t,r,n)}},a=i.prototype,l="abilities",u=[n],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},h={},Object.keys(c).forEach((function(e){h[e]=c[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=u.slice().reverse().reduce((function(e,t){return t(a,l,e)||e}),h),d&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(d):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(a,l,h),h=null),o=h,i)
-var a,l,u,c,d,h
-e.default=s})),define("ember-can/helpers/cannot",["exports","@ember/component/helper","@ember/service"],(function(e,t,r){"use strict"
-var n,i,o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let s=(n=(0,r.inject)("abilities"),i=class extends t.default{constructor(){var e,t,r,n
-super(...arguments),e=this,t="abilities",n=this,(r=o)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}compute(e){let[t,r]=e,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return this.abilities.cannot(t,r,n)}},a=i.prototype,l="abilities",u=[n],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},h={},Object.keys(c).forEach((function(e){h[e]=c[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=u.slice().reverse().reduce((function(e,t){return t(a,l,e)||e}),h),d&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(d):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(a,l,h),h=null),o=h,i)
-var a,l,u,c,d,h
-e.default=s})),define("ember-can/index",["exports","ember-can/ability"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"Ability",{enumerable:!0,get:function(){return t.default}})})),define("ember-can/initializers/setup-ember-can",["exports","ember-resolver"],(function(e,t){"use strict"
-function r(){}Object.defineProperty(e,"__esModule",{value:!0}),e.initialize=r,e.default=void 0,t.default.reopen({init(){this._super(...arguments),this.set("pluralizedTypes.ability","abilities")}})
-var n={initialize:r}
-e.default=n})),define("ember-can/services/abilities",["exports","@ember/service","ember-can/ability","@ember/debug","@ember/application","ember-can/utils/normalize"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class s extends t.default{parse(e){return(0,o.default)(e)}abilityFor(e,t){let r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},n=(0,i.getOwner)(this).factoryFor(`ability:${e}`)
-void 0!==t&&(r={model:t,...r})
-let o=n.create(r)
-return o}valueFor(e,t,r,n){let i=this.abilityFor(t,r,n),o=i.getAbility(e,r,n)
-return i.destroy(),o}can(e,t,r){let{propertyName:n,abilityName:i}=this.parse(e)
-return!!this.valueFor(n,i,t,r)}cannot(e,t,r){return!this.can(e,t,r)}}e.default=s})),define("ember-can/services/can",["exports","ember-can/services/abilities","@ember/debug"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{parse(){return super.parse(...arguments)}abilityFor(){return super.abilityFor(...arguments)}valueFor(){return super.valueFor(...arguments)}can(){return super.can(...arguments)}cannot(){return super.cannot(...arguments)}}e.default=n})),define("ember-can/utils/normalize",["exports","@ember/string","ember-inflector"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let i=e.split(" "),o=(0,r.singularize)(i.pop()),s=i[i.length-1]
-n.includes(s)&&i.pop()
-return{propertyName:(0,t.camelize)(i.join(" ")),abilityName:o}}
-const n=["of","in","for","to","from","on","as"]})),define("ember-changeset-validations/helpers/changeset",["exports","@ember/component/helper","ember-changeset/helpers/changeset"],(function(e,t,r){"use strict"
-function n(e,t){let[n,i]=e
-return(0,r.changeset)([n,i],t)}Object.defineProperty(e,"__esModule",{value:!0}),e.changeset=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-changeset-validations/index",["exports","validated-changeset"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.lookupValidator
-e.default=r})),define("ember-changeset-validations/utils/get-messages",["exports","@ember/array","@ember/utils","ember-get-config","ember-changeset-validations/utils/messages","ember-changeset-validations/utils/with-defaults"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:requirejs.entries,n=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],u=i.default
-if(n&&(0,r.isPresent)(l))return l
-let c=(0,t.A)(s(e)).find((e=>e===a));(0,r.isPresent)(c)&&(u=(0,o.default)(requireModule(c).default,u))
-return l=u,u}
-const{keys:s}=Object,a=`${n.default.modulePrefix}/validations/messages`
-let l=null})),define("ember-changeset-validations/utils/handle-multiple-validations",["exports","@ember/array","rsvp","@ember/utils","validated-changeset"],(function(e,t,r,n,i){"use strict"
-function o(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],r=(0,t.A)(e).reject((e=>"boolean"===(0,n.typeOf)(e)&&e))
-return 0===r.length||r}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n){let{key:s,newValue:a,oldValue:l,changes:u,content:c}=n,d=(0,t.A)(e.map((e=>e(s,a,l,u,c))))
-if((0,t.A)(d).any(i.isPromise))return(0,r.all)(d).then(o)
-return o(d)}})),define("ember-changeset-validations/utils/messages",["exports","ember-validators/messages","@ember/polyfills","@ember/string"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.assign)({},t.default)
-var o=(0,r.assign)(i,{blank:t.default.present,present:t.default.blank,getDescriptionFor(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:""
-return(0,n.capitalize)((0,n.dasherize)(e).split(/[._-]/g).join(" "))}})
-e.default=o})),define("ember-changeset-validations/utils/to-date",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){const t=Object.prototype.toString.call(e)
-"function"==typeof e&&(e=e())
-return e instanceof Date||"object"==typeof e&&"[object Date]"===t?e:"number"==typeof e||"[object Number]"===t?new Date(e):("string"!=typeof e&&"[object String]"!==t||"undefined"==typeof console||(console.warn("Please use `Date.parse` to parse strings."),console.warn((new Error).stack)),new Date(NaN))}})),define("ember-changeset-validations/utils/validation-errors",["exports","@ember/object","@ember/debug","@ember/polyfills","ember-get-config","ember-changeset-validations/utils/get-messages"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r){let s=(0,t.get)(i.default,"changeset-validations.rawOutput")||!1,a=(0,o.default)(),l=a.getDescriptionFor(e)
-if(r.message)return r.message
-let{type:u,value:c,context:d={}}=r,h=(0,t.get)(a,u)
-if(s)return d=(0,n.assign)({},d,{description:l}),{value:c,type:u,message:h,context:d}
-if(d.message){let t=d.message
-if("function"==typeof t){let r=t(e,u,c,d)
-return r}return a.formatMessage(t,(0,n.assign)({description:l},d))}return a.formatMessage(h,(0,n.assign)({description:l},d))}}))
-define("ember-changeset-validations/utils/with-defaults",["exports","@ember/polyfills"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return(0,t.assign)((0,t.assign)({},r),e)}})),define("ember-changeset-validations/utils/wrap",["exports","@ember/array"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){if((0,t.isArray)(e))return(0,t.A)(e)
-return(0,t.A)([e])}})),define("ember-changeset-validations/validators/confirmation",["exports","ember-changeset-validations/utils/validation-errors","ember-validators/confirmation","@ember/polyfills"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-return function(i,o,s,a){let l=arguments.length>4&&void 0!==arguments[4]?arguments[4]:{},u=(0,n.assign)({},l,a),c=(0,r.default)(o,e,u,i)
-return!0===c||(0,t.default)(i,c)}}})),define("ember-changeset-validations/validators/date",["exports","ember-changeset-validations/utils/validation-errors","ember-changeset-validations/utils/with-defaults","ember-changeset-validations/utils/to-date"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-return e=(0,r.default)(e,{allowBlank:!1,errorFormat:i}),(r,i)=>{let{allowBlank:s}=e,{before:a,onOrBefore:l,after:u,onOrAfter:c,message:d}=e,h="date"
-if(s&&null==i)return!0
-let p=(0,n.default)(i)
-return o(p)?a&&(a=(0,n.default)(a),d=d||`[BEFORE] date is NOT before ${i}`,h="before",p>=a)?(0,t.default)(r,{type:h,value:i,context:{before:a,message:d}}):l&&(l=(0,n.default)(l),d=d||`[ON OR BEFORE] date is NOT on or before ${i}`,h="onOrBefore",p>l)?(0,t.default)(r,{type:h,value:i,context:{onOrBefore:l,message:d}}):u&&(u=(0,n.default)(u),d=d||`[AFTER] date is NOT after ${i}`,h="after",p<=u)?(0,t.default)(r,{type:h,value:i,context:{after:u,message:d}}):!(c&&(c=(0,n.default)(c),d=d||`[ON OR AFTER] date is NOT on or after ${i}`,h="onOrAfter",p<c))||(0,t.default)(r,{type:h,value:i,context:{onOrAfter:c,message:d}}):(0,t.default)(r,{type:h,value:"not a date",context:{value:i,message:d}})}},e.errorFormat=void 0
-const i="MMM Do, YYYY"
-function o(e){return e instanceof Date&&!isNaN(e)}e.errorFormat=i})),define("ember-changeset-validations/validators/exclusion",["exports","ember-changeset-validations/utils/validation-errors","ember-validators/exclusion"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-e.list&&(e.in=e.list)
-return(n,i)=>{let o=(0,r.default)(i,e,null,n)
-return!0===o||(0,t.default)(n,o)}}})),define("ember-changeset-validations/validators/format",["exports","@ember/utils","ember-changeset-validations/utils/validation-errors","ember-validators/format"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},i=!(0,t.isEmpty)(Object.keys(e))
-return(t,o)=>{if(!i)return!0
-let s=(0,n.default)(o,e,null,t)
-return!0===s||(0,r.default)(t,s)}}})),define("ember-changeset-validations/validators/inclusion",["exports","ember-changeset-validations/utils/validation-errors","ember-validators/inclusion"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-e.list&&(e.in=e.list)
-return(n,i)=>{let o=(0,r.default)(i,e,null,n)
-return!0===o||(0,t.default)(n,o)}}})),define("ember-changeset-validations/validators/index",["exports","ember-changeset-validations/validators/date","ember-changeset-validations/validators/presence","ember-changeset-validations/validators/length","ember-changeset-validations/validators/number","ember-changeset-validations/validators/format","ember-changeset-validations/validators/inclusion","ember-changeset-validations/validators/exclusion","ember-changeset-validations/validators/confirmation"],(function(e,t,r,n,i,o,s,a,l){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"validateDate",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"validatePresence",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"validateLength",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"validateNumber",{enumerable:!0,get:function(){return i.default}}),Object.defineProperty(e,"validateFormat",{enumerable:!0,get:function(){return o.default}}),Object.defineProperty(e,"validateInclusion",{enumerable:!0,get:function(){return s.default}}),Object.defineProperty(e,"validateExclusion",{enumerable:!0,get:function(){return a.default}}),Object.defineProperty(e,"validateConfirmation",{enumerable:!0,get:function(){return l.default}})})),define("ember-changeset-validations/validators/length",["exports","ember-changeset-validations/utils/validation-errors","ember-changeset-validations/utils/with-defaults","ember-validators/length"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-return e=(0,r.default)(e,{useBetweenMessage:!0}),(r,i)=>{let o=(0,n.default)(i,e,null,r)
-return!0===o||(0,t.default)(r,o)}}})),define("ember-changeset-validations/validators/number",["exports","ember-changeset-validations/utils/validation-errors","ember-changeset-validations/utils/with-defaults","ember-validators/number"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-e=(0,r.default)(e,{allowString:!0,allowNone:!1}),e.allowBlank&&(e.allowNone=!0)
-return(r,i)=>{let o=(0,n.default)(i,e,null,r)
-return!0===o||(0,t.default)(r,o)}}})),define("ember-changeset-validations/validators/presence",["exports","ember-changeset-validations/utils/validation-errors","ember-validators/presence","@ember/object"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let i
-"boolean"==typeof e?e={presence:e}:e&&void 0!==e.on&&("string"==typeof e.on?i=[e.on]:Array.isArray(e.on)&&(i=e.on),delete e.on)
-return(o,s,a,l,u)=>{if(i&&!i.some((e=>{const t=(0,n.get)(l,e)
-return t||void 0===t&&(0,n.get)(u,e)})))return!0
-let c=(0,r.default)(s,e,null,o)
-return"boolean"==typeof c||"string"==typeof c?c:("present"===c.type?c.type="blank":"blank"===c.type&&(c.type="present"),(0,t.default)(o,c))}}})),define("ember-changeset/helpers/changeset-get",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-return t.get(r)}Object.defineProperty(e,"__esModule",{value:!0}),e.changesetGet=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-changeset/helpers/changeset-set",["exports","@ember/component/helper","validated-changeset"],(function(e,t,r){"use strict"
-function n(e){let[t,n]=e
-if((0,r.isChangeset)(t))return e=>t.set(n,e)}Object.defineProperty(e,"__esModule",{value:!0}),e.changesetSet=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-changeset/helpers/changeset",["exports","@ember/component/helper","ember-changeset","validated-changeset"],(function(e,t,r,n){"use strict"
-function i(e){let[t,i]=e,o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-if(t)return(0,n.isChangeset)(t)?t:(0,n.isObject)(i)?(0,n.isPromise)(t)?t.then((e=>(0,r.Changeset)(e,(0,n.lookupValidator)(i),i,o))):(0,r.Changeset)(t,(0,n.lookupValidator)(i),i,o):(0,n.isPromise)(t)?Promise.resolve(t).then((e=>(0,r.Changeset)(e,i,{},o))):(0,r.Changeset)(t,i,{},o)}Object.defineProperty(e,"__esModule",{value:!0}),e.changeset=i,e.default=void 0
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-changeset/index",["exports","@ember/debug","@ember/object/compat","validated-changeset","@ember/array/proxy","@ember/object/proxy","@ember/object","ember-changeset/utils/merge-deep","ember-changeset/utils/is-object","@glimmer/tracking"],(function(e,t,r,n,i,o,s,a,l,u){"use strict"
-var c,d,h,p
-function f(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function m(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function g(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.buildOldValues=b,e.changeset=O,e.Changeset=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:v,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},n=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{}
-const i=O(e,t,r,n)
-return new Proxy(i,{get:(e,t)=>e.get(t.toString()),set:(e,t,r)=>(e.set(t.toString(),r),!0)})},e.default=e.EmberChangeset=void 0
-const v=()=>!0
-function b(e,t,r){const n=Object.create(null)
-for(let i of t)n[i.key]=r(e,i.key)
-return n}function y(e){return function(e){return!(!e||!(e instanceof o.default||e instanceof i.default))}(e)?y((0,s.get)(e,"content")):e}let _
-_=require("@ember-data/model").default
-let w=(c=class extends n.BufferedChangeset{constructor(){super(...arguments),f(this,"_changes",d,this),f(this,"_errors",h,this),f(this,"_content",p,this),m(this,"isObject",l.default),m(this,"maybeUnwrapProxy",y),m(this,"getDeep",s.get),m(this,"mergeDeep",a.default)}safeGet(e,t){var r,n,i
-return _&&"belongsTo"==(null===(r=e.relationshipFor)||void 0===r||null===(n=r.call(e,t))||void 0===n||null===(i=n.meta)||void 0===i?void 0:i.kind)?e.belongsTo(t).value():(0,s.get)(e,t)}safeSet(e,t,r){return(0,s.set)(e,t,r)}get isValid(){return super.isValid}get isInvalid(){return super.isInvalid}get isPristine(){return super.isPristine}get isDirty(){return super.isDirty}get pendingData(){let e=this._content,t=this._changes,r=this.mergeDeep(Object.create(Object.getPrototypeOf(e)),e,{safeGet:s.get,safeSet:s.set})
-return this.mergeDeep(r,t,{safeGet:s.get,safeSet:s.set})}addError(e,t){return super.addError(e,t),(0,s.notifyPropertyChange)(this,e),t}pushErrors(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n]
-const{value:i,validation:o}=super.pushErrors(e,...r)
-return(0,s.notifyPropertyChange)(this,e),{value:i,validation:o}}_setProperty(e){let{key:t,value:r,oldValue:n}=e
-super._setProperty({key:t,value:r,oldValue:n}),(0,s.notifyPropertyChange)(this,t)}_notifyVirtualProperties(e){((e=super._notifyVirtualProperties(e))||[]).forEach((e=>(0,s.notifyPropertyChange)(this,e)))}_deleteKey(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:""
-const r=super._deleteKey(e,t)
-return(0,s.notifyPropertyChange)(this,t),r}execute(){let e
-if(this.isValid&&this.isDirty){let t=this._content,r=this._changes
-e=b(t,this.changes,this.getDeep),this._content=this.mergeDeep(t,r,{safeGet:s.get,safeSet:s.set})}return this._previousContent=e,this}},d=g(c.prototype,"_changes",[u.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=g(c.prototype,"_errors",[u.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=g(c.prototype,"_content",[u.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g(c.prototype,"isValid",[r.dependentKeyCompat],Object.getOwnPropertyDescriptor(c.prototype,"isValid"),c.prototype),g(c.prototype,"isInvalid",[r.dependentKeyCompat],Object.getOwnPropertyDescriptor(c.prototype,"isInvalid"),c.prototype),g(c.prototype,"isPristine",[r.dependentKeyCompat],Object.getOwnPropertyDescriptor(c.prototype,"isPristine"),c.prototype),g(c.prototype,"isDirty",[r.dependentKeyCompat],Object.getOwnPropertyDescriptor(c.prototype,"isDirty"),c.prototype),c)
-function O(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:v,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},n=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{}
-if(n.changeset)return new n.changeset(e,t,r,n)
-const i=new w(e,t,r,n)
-return i}e.EmberChangeset=w
-e.default=class{constructor(e){const t=O(e,arguments.length>1&&void 0!==arguments[1]?arguments[1]:v,arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},arguments.length>3&&void 0!==arguments[3]?arguments[3]:{})
-return new Proxy(t,{get:(e,t)=>e.get(t.toString()),set:(e,t,r)=>(e.set(t.toString(),r),!0)})}}})),define("ember-changeset/utils/is-object",["exports","@ember/array"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return null!==e&&"object"==typeof e&&!(e instanceof Date||e instanceof RegExp)&&!(0,t.isArray)(e)}})),define("ember-changeset/utils/merge-deep",["exports","validated-changeset"],(function(e,t){"use strict"
-function r(e){return function(e){return!!e&&"object"==typeof e}(e)&&!function(e){let t=Object.prototype.toString.call(e)
-return"[object RegExp]"===t||"[object Date]"===t}(e)}function n(e,t){try{return t in e}catch(r){return!1}}function i(e,t,r){return!function(e,t,r){let n=r.safeGet(e,"constructor.fields")
-return n instanceof Map&&n.has(t)}(e,t,r)&&(n(e,t)&&!(Object.prototype.hasOwnProperty.call(e,t)&&Object.prototype.propertyIsEnumerable.call(e,t)))}function o(e,r,n,i){return Object.keys(e).forEach((s=>{let a=e[s]
-a&&(0,t.isChange)(a)?n[[...i,s].join(".")]=(0,t.getChangeValue)(a):a&&"object"==typeof a&&o(a,r,n,[...i,s])})),n}function s(e,s,l){return function(e){return Object.keys(e)}(s).forEach((u=>{if(i(e,u,l)){if(l.safeSet){const t=o(s,l,{},[])
-if(Object.keys(t).length>0)for(u in t){const r=t[u]
-l.safeSet(e,u,r)}}}else{if(!n(e,u)||!r(s[u])||(0,t.isChange)(s[u])){let r=s[u]
-return(0,t.isChange)(r)?l.safeSet(e,u,(0,t.getChangeValue)(r)):l.safeSet(e,u,(0,t.normalizeObject)(r))}l.safeSet(e,u,a(l.safeGet(e,u),l.safeGet(s,u),l))}})),e}function a(e,t){let r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{}
-r.safeGet=r.safeGet||function(e,t){return e[t]},r.safeSet=r.safeSet||function(e,t,r){return e[t]=r}
-let n=Array.isArray(t),i=Array.isArray(e),o=n===i
-if(!o)return t
-if(n)return t
-try{return s(e,t,r)}catch(a){throw new Error("Unable to `mergeDeep` with your data. Are you trying to merge two ember-data objects? Please file an issue with ember-changeset.")}}Object.defineProperty(e,"__esModule",{value:!0}),e.default=a})),define("ember-cli-app-version/initializer-factory",["exports","ember","@ember/string"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){let i=!1
-return function(){if(!i&&e&&t){let o=(0,r.classify)(e)
-n.register(o,t),i=!0}}}
-const{libraries:n}=t.default})),define("ember-cli-app-version/utils/regexp",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.shaRegExp=e.versionExtendedRegExp=e.versionRegExp=void 0
-e.versionRegExp=/\d+[.]\d+[.]\d+/
-e.versionExtendedRegExp=/\d+[.]\d+[.]\d+-[a-z]*([.]\d+)?/
-e.shaRegExp=/[a-z\d]{8}$/})),define("ember-cli-flash/components/flash-message",["exports","@ember/component","@ember/string","@ember/template","@ember/utils","@ember/runloop","@ember/object","@ember/object/computed","ember-cli-flash/templates/components/flash-message"],(function(e,t,r,n,i,o,s,a,l){"use strict"
-var u,c,d,h,p,f,m,g,v,b,y,_,w,O,x
-function P(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function S(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function T(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const{next:E,cancel:C}=o.run
-let k=(u=(0,a.readOnly)("flash.showProgress"),c=(0,a.not)("exiting"),d=(0,a.and)("showProgress","notExiting"),h=(0,a.readOnly)("flash.exiting"),p=(0,a.bool)("template"),f=(0,s.computed)("messageStyle"),m=(0,s.computed)("flash.type","messageStylePrefix","_defaultMessageStylePrefix"),g=(0,s.computed)("flash.type"),v=(0,s.computed)("flash.{showProgress,timeout}"),b=class extends t.default{constructor(){super(...arguments),S(this,"tagName",""),S(this,"layout",l.default),S(this,"active",!1),S(this,"messageStyle","bootstrap"),P(this,"showProgress",y,this),P(this,"notExiting",_,this),P(this,"showProgressBar",w,this),P(this,"exiting",O,this),P(this,"hasBlock",x,this)}get _defaultMessageStylePrefix(){return"foundation"===this.messageStyle?"alert-box ":"alert alert-"}get alertType(){const e=this.flash.type||""
-return`${this.messageStylePrefix||this._defaultMessageStylePrefix}${e}`}get flashType(){return(0,r.classify)(this.flash.type||"")}get progressDuration(){var e,t
-if(null===(e=this.flash)||void 0===e||!e.showProgress)return!1
-const r=(null===(t=this.flash)||void 0===t?void 0:t.timeout)||0
-return(0,n.htmlSafe)(`transition-duration: ${r}ms`)}_mouseEnter(){(0,i.isPresent)(this.flash)&&this.flash.preventExit()}_mouseLeave(){(0,i.isPresent)(this.flash)&&!this.flash.exiting&&this.flash.allowExit()}_destroyFlashMessage(){this.flash&&this.flash.destroyMessage()}onClick(){var e,t;(null===(e=null===(t=this.flash)||void 0===t?void 0:t.destroyOnClick)||void 0===e||e)&&this._destroyFlashMessage()}onClose(){this._destroyFlashMessage()}onDidInsert(e){const t=E(this,(()=>{(0,s.set)(this,"active",!0)}));(0,s.set)(this,"pendingSet",t),(0,s.set)(this,"_mouseEnterHandler",this._mouseEnter),(0,s.set)(this,"_mouseLeaveHandler",this._mouseLeave),e.addEventListener("mouseenter",this._mouseEnterHandler),e.addEventListener("mouseleave",this._mouseLeaveHandler)}onWillDestroy(e){e.removeEventListener("mouseenter",this._mouseEnterHandler),e.removeEventListener("mouseleave",this._mouseLeaveHandler),C(this.pendingSet),this._destroyFlashMessage()}},y=T(b.prototype,"showProgress",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=T(b.prototype,"notExiting",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=T(b.prototype,"showProgressBar",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=T(b.prototype,"exiting",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=T(b.prototype,"hasBlock",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T(b.prototype,"_defaultMessageStylePrefix",[f],Object.getOwnPropertyDescriptor(b.prototype,"_defaultMessageStylePrefix"),b.prototype),T(b.prototype,"alertType",[m],Object.getOwnPropertyDescriptor(b.prototype,"alertType"),b.prototype),T(b.prototype,"flashType",[g],Object.getOwnPropertyDescriptor(b.prototype,"flashType"),b.prototype),T(b.prototype,"progressDuration",[v],Object.getOwnPropertyDescriptor(b.prototype,"progressDuration"),b.prototype),T(b.prototype,"onClick",[s.action],Object.getOwnPropertyDescriptor(b.prototype,"onClick"),b.prototype),T(b.prototype,"onClose",[s.action],Object.getOwnPropertyDescriptor(b.prototype,"onClose"),b.prototype),T(b.prototype,"onDidInsert",[s.action],Object.getOwnPropertyDescriptor(b.prototype,"onDidInsert"),b.prototype),T(b.prototype,"onWillDestroy",[s.action],Object.getOwnPropertyDescriptor(b.prototype,"onWillDestroy"),b.prototype),b)
-e.default=k})),define("ember-cli-flash/flash/object",["exports","@ember/object/evented","@ember/object","@ember/runloop","ember-cli-flash/utils/computed"],(function(e,t,r,n,i){"use strict"
-var o,s,a
-function l(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let u=(o=(0,i.guidFor)("message").readOnly(),s=class extends(r.default.extend(t.default)){constructor(){var e,t,r,n
-super(...arguments),l(this,"exitTimer",null),l(this,"exiting",!1),l(this,"isExitable",!0),l(this,"initializedTime",null),e=this,t="_guid",n=this,(r=a)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}init(){super.init(...arguments),this.sticky||(this.timerTask(),this._setInitializedTime())}destroyMessage(){this._cancelTimer(),this.exitTaskInstance?((0,n.cancel)(this.exitTaskInstance),this._teardown()):this.exitTimerTask()}exitMessage(){this.isExitable&&(this.exitTimerTask(),this.trigger("didExitMessage"))}willDestroy(){this.onDestroy&&this.onDestroy(),this._cancelTimer(),this._cancelTimer("exitTaskInstance"),super.willDestroy(...arguments)}preventExit(){(0,r.set)(this,"isExitable",!1)}allowExit(){(0,r.set)(this,"isExitable",!0),this._checkIfShouldExit()}timerTask(){if(!this.timeout)return
-const e=(0,n.later)((()=>{this.exitMessage()}),this.timeout);(0,r.set)(this,"timerTaskInstance",e)}exitTimerTask(){if(!this.isDestroyed)if((0,r.set)(this,"exiting",!0),this.extendedTimeout){let e=(0,n.later)((()=>{this._teardown()}),this.extendedTimeout);(0,r.set)(this,"exitTaskInstance",e)}else this._teardown()}_setInitializedTime(){let e=(new Date).getTime()
-return(0,r.set)(this,"initializedTime",e),this.initializedTime}_getElapsedTime(){return(new Date).getTime()-this.initializedTime}_cancelTimer(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"timerTaskInstance"
-this[e]&&(0,n.cancel)(this[e])}_checkIfShouldExit(){this._getElapsedTime()>=this.timeout&&!this.sticky&&(this._cancelTimer(),this.exitMessage())}_teardown(){var e
-const t=null===(e=this.flashService)||void 0===e?void 0:e.queue
-t&&t.removeObject(this),this.destroy(),this.trigger("didDestroyMessage")}},c=s.prototype,d="_guid",h=[o],p={configurable:!0,enumerable:!0,writable:!0,initializer:null},m={},Object.keys(p).forEach((function(e){m[e]=p[e]})),m.enumerable=!!m.enumerable,m.configurable=!!m.configurable,("value"in m||m.initializer)&&(m.writable=!0),m=h.slice().reverse().reduce((function(e,t){return t(c,d,e)||e}),m),f&&void 0!==m.initializer&&(m.value=m.initializer?m.initializer.call(f):void 0,m.initializer=void 0),void 0===m.initializer&&(Object.defineProperty(c,d,m),m=null),a=m,s)
-var c,d,h,p,f,m
-e.default=u})),define("ember-cli-flash/services/flash-messages",["exports","@ember/object/computed","@ember/service","@ember/utils","@ember/debug","@ember/object","@ember/string","@ember/polyfills","@ember/array","ember-cli-flash/flash/object","ember-cli-flash/utils/object-without","@ember/application","ember-cli-flash/utils/flash-message-options","ember-cli-flash/utils/get-with-default"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p){"use strict"
-var f,m,g,v,b,y,_
-function w(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function O(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let x=(f=(0,t.equal)("queue.length",0).readOnly(),m=(0,t.mapBy)("queue","_guid").readOnly(),g=(0,t.sort)("queue",(function(e,t){return e.priority<t.priority?1:e.priority>t.priority?-1:0})).readOnly(),v=class extends r.default{constructor(){super(...arguments),w(this,"isEmpty",b,this),w(this,"_guids",y,this),w(this,"arrangedQueue",_,this),this._setDefaults(),this.queue=(0,l.A)()}willDestroy(){super.willDestroy(...arguments),this.clearMessages()}add(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-return this._enqueue(this._newFlashMessage(e)),this}clearMessages(){const e=this.queue
-if(!(0,n.isNone)(e))return e.forEach((e=>e.destroyMessage())),e.clear(),this}registerTypes(){return(arguments.length>0&&void 0!==arguments[0]?arguments[0]:(0,l.A)()).forEach((e=>this._registerType(e))),this}peekFirst(){return this.queue.firstObject}peekLast(){return this.queue.lastObject}getFlashObject(){return this.peekLast()}_newFlashMessage(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-const t=(0,p.default)(this,"flashMessageDefaults",{}),r=(0,c.default)(t,["types","injectionFactories","preventDuplicates"]),n=(0,a.assign)({},r,{flashService:this})
-for(let i in e){const t=(0,o.get)(e,i),r=this._getOptionOrDefault(i,t);(0,o.set)(n,i,r)}return u.default.create(n)}_getOptionOrDefault(e,t){const r=(0,p.default)(this,"flashMessageDefaults",{}),i=(0,o.get)(r,e)
-return"undefined"===(0,n.typeOf)(t)?i:t}get flashMessageDefaults(){const e=(0,d.getOwner)(this).resolveRegistration("config:environment"),t=(0,p.default)(e,"flashMessageDefaults",{})
-return(0,h.default)(t)}_setDefaults(){const e=(0,p.default)(this,"flashMessageDefaults",{})
-for(let t in e){const r=`default${(0,s.classify)(t)}`;(0,o.set)(this,r,e[t])}this.registerTypes((0,p.default)(this,"defaultTypes",(0,l.A)()))}_registerType(e){var t=this
-this[e]=function(r){let n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-const i=(0,a.assign)({},n)
-return(0,o.setProperties)(i,{message:r,type:e}),t.add(i)}}_hasDuplicate(e){return this._guids.includes(e)}_enqueue(e){const t=e.preventDuplicates
-if("boolean"==typeof t?t:this.defaultPreventDuplicates){const t=e._guid
-if(this._hasDuplicate(t))return}return this.queue.pushObject(e)}},b=O(v.prototype,"isEmpty",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=O(v.prototype,"_guids",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=O(v.prototype,"arrangedQueue",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O(v.prototype,"flashMessageDefaults",[o.computed],Object.getOwnPropertyDescriptor(v.prototype,"flashMessageDefaults"),v.prototype),v)
-e.default=x})),define("ember-cli-flash/templates/components/flash-message",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"/fjXyO40",block:'[[[11,0],[16,0,[29,["flash-message ",[30,0,["alertType"]]," ",[52,[30,0,["exiting"]],"exiting"]," ",[52,[30,0,["active"]],"active"]]]],[24,"role","alert"],[17,1],[4,[38,1],["click",[30,0,["onClick"]]],null],[4,[38,2],[[30,0,["onDidInsert"]]],null],[4,[38,3],[[30,0,["onWillDestroy"]]],null],[12],[1,"\\n"],[41,[48,[30,2]],[[[1,"    "],[18,2,[[30,0],[33,6],[28,[37,7],[[30,0],"onClose"],null]]],[1,"\\n"]],[]],[[[1,"    "],[1,[30,0,["flash","message"]]],[1,"\\n"],[41,[30,0,["showProgressBar"]],[[[1,"      "],[10,0],[14,0,"alert-progress"],[12],[1,"\\n        "],[10,0],[14,0,"alert-progressBar"],[15,5,[30,0,["progressDuration"]]],[12],[13],[1,"\\n      "],[13],[1,"\\n"]],[]],null]],[]]],[13]],["&attrs","&default"],false,["if","on","did-insert","will-destroy","has-block","yield","flash","action"]]',moduleName:"ember-cli-flash/templates/components/flash-message.hbs",isStrictMode:!1})
-e.default=t})),define("ember-cli-flash/utils/computed",["exports","@ember/utils","@ember/object","@ember/object/internals","@ember/array"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.add=function(){for(var e=arguments.length,n=new Array(e),o=0;o<e;o++)n[o]=arguments[o]
-const s=(0,r.computed)({get(){const e=n.map((e=>{const n=(0,r.get)(this,e)
-if("number"===(0,t.typeOf)(n))return n}))
-return(0,i.A)(e).compact().reduce(((e,t)=>e+t))}})
-return s.property.apply(s,n)},e.guidFor=function(e){return(0,r.computed)(e,{get(){const i=(0,r.get)(this,e)
-if(!(0,t.isNone)(i))return(0,n.guidFor)(i.toString())}})}})),define("ember-cli-flash/utils/flash-message-options",["exports","@ember/polyfills"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return(0,t.assign)({timeout:3e3,extendedTimeout:0,priority:100,sticky:!1,showProgress:!1,type:"info",types:["success","info","warning","danger","alert","secondary"],injectionFactories:["route","controller","view","component"],preventDuplicates:!1},e)}})),define("ember-cli-flash/utils/get-with-default",["exports","@ember/object"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r,n){let i=(0,t.get)(e,r)
-if(void 0===i)return n
-return i}})),define("ember-cli-flash/utils/object-compact",["exports","@ember/utils"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){const r={}
-for(let n in e){const i=e[n];(0,t.isPresent)(i)&&(r[n]=i)}return r}})),define("ember-cli-flash/utils/object-only",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[],r={}
-for(let n in e)-1!==t.indexOf(n)&&(r[n]=e[n])
-return r}})),define("ember-cli-flash/utils/object-without",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[],r={}
-for(let n in e)-1===t.indexOf(n)&&(r[n]=e[n])
-return r}})),define("ember-cli-string-helpers/-private/create-string-helper",["exports","@ember/template"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return function(r){let[n]=r
-return(0,t.isHTMLSafe)(n)&&(n=n.string),n=n||"",e(n)}}}))
-define("ember-cli-string-helpers/helpers/capitalize",["exports","@ember/component/helper","@ember/string","ember-cli-string-helpers/-private/create-string-helper"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.capitalize=void 0
-const i=(0,n.default)(r.capitalize)
-e.capitalize=i
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-cli-string-helpers/helpers/classify",["exports","@ember/component/helper","@ember/string","ember-cli-string-helpers/-private/create-string-helper"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.classify=void 0
-const i=(0,n.default)(r.classify)
-e.classify=i
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-cli-string-helpers/helpers/humanize",["exports","@ember/component/helper","@ember/template"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.humanize=i,e.default=void 0
-const n=/_+|-+/g
-function i(e){let[t]=e
-if((0,r.isHTMLSafe)(t)&&(t=t.string),null==t)return""
-let i=t.toLowerCase().replace(n," ")
-return i.charAt(0).toUpperCase()+i.slice(1)}var o=(0,t.helper)(i)
-e.default=o})),define("ember-cli-string-helpers/helpers/lowercase",["exports","@ember/component/helper","ember-cli-string-helpers/utils/lowercase","ember-cli-string-helpers/-private/create-string-helper"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.lowercase=void 0
-const i=(0,n.default)(r.default)
-e.lowercase=i
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-cli-string-helpers/helpers/titleize",["exports","@ember/component/helper","ember-cli-string-helpers/utils/titleize","ember-cli-string-helpers/-private/create-string-helper"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.titleize=void 0
-const i=(0,n.default)(r.default)
-e.titleize=i
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-cli-string-helpers/helpers/truncate",["exports","@ember/component/helper","@ember/template"],(function(e,t,r){"use strict"
-function n(e){let[t,n=140,i=!0]=e,o=i?n-3:n
-return(0,r.isHTMLSafe)(t)&&(t=t.string),t&&t.length>o?i?`${t.substring(0,o)}...`:t.substring(0,o):t}Object.defineProperty(e,"__esModule",{value:!0}),e.truncate=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-cli-string-helpers/helpers/uppercase",["exports","@ember/component/helper","ember-cli-string-helpers/utils/uppercase","ember-cli-string-helpers/-private/create-string-helper"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.uppercase=void 0
-const i=(0,n.default)(r.default)
-e.uppercase=i
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-cli-string-helpers/utils/lowercase",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:""
-if("string"!=typeof e)throw new TypeError("Expected a string, got a "+typeof e)
-return e.toLowerCase()}})),define("ember-cli-string-helpers/utils/titleize",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:""
-if("string"!=typeof e)throw new TypeError("Expected a string, got a "+typeof e)
-return e.toLowerCase().replace(/(?:^|\s|-|\/)\S/g,(function(e){return e.toUpperCase()}))}})),define("ember-cli-string-helpers/utils/trim",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:""
-if("string"!=typeof e)throw new TypeError("Expected a string, got a "+typeof e)
-return e.trim()}})),define("ember-cli-string-helpers/utils/uppercase",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:""
-if("string"!=typeof e)throw new TypeError("Expected a string, got a "+typeof e)
-return e.toUpperCase()}})),define("ember-collection/components/ember-collection",["exports","@ember/array","@ember/component","@ember/object","ember-collection/components/ember-collection/template","ember-collection/utils/identity","ember-collection/utils/needs-revalidate"],(function(e,t,r,n,i,o,s){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class a{constructor(e,t,r,n){this.key=e,this.hidden=!1,this.item=t,this.index=r,this.style=n}}function l(){}var u=r.default.extend({layout:i.default,init(){this._buffer=void 0,this._cellLayout=void 0,this._rawItems=void 0,this._items=void 0,this._scrollLeft=void 0,this._scrollTop=void 0,this._clientWidth=void 0,this._clientHeight=void 0,this._contentSize=void 0,this.contentElement=void 0,this._cells=(0,t.A)(),this._cellMap=Object.create(null),this._super()
-let e=this.getAttr("buffer")
-this._buffer="number"==typeof e?e:5,this._scrollLeft=0|this.getAttr("scroll-left"),this._scrollTop=0|this.getAttr("scroll-top"),this._clientWidth=0|this.getAttr("estimated-width"),this._clientHeight=0|this.getAttr("estimated-height"),this._scrollChange=this.getAttr("scroll-change")},_needsRevalidate(){this.isDestroyed||this.isDestroying||(this._isGlimmer2()?this.rerender():(0,s.default)(this))},didReceiveAttrs(){this._super(),this.updateItems(),this.updateScrollPosition()},willDestroyElement(){this._items&&this._items.removeArrayObserver&&this._items.removeArrayObserver(this,{willChange:l,didChange:"_needsRevalidate"})},updateItems(){this._cellLayout=this.getAttr("cell-layout")
-var e=this.getAttr("items")
-if(this._rawItems!==e){this._items&&this._items.removeArrayObserver&&this._items.removeArrayObserver(this,{willChange:l,didChange:"_needsRevalidate"}),this._rawItems=e
-var r=(0,t.A)(e)
-this.set("_items",r),r&&r.addArrayObserver&&r.addArrayObserver(this,{willChange:l,didChange:"_needsRevalidate"})}},updateScrollPosition(){if(!this._scrollChange)return
-let e=this.getAttr("scroll-left")
-void 0!==e&&(e=parseInt(e,10),this._scrollLeft!==e&&this.set("_scrollLeft",e))
-let t=this.getAttr("scroll-top")
-void 0!==t&&(t=parseInt(t,10),this._scrollTop!==t&&this.set("_scrollTop",t))},updateContentSize(){var e=this._cellLayout.contentSize(this._clientWidth,this._clientHeight)
-void 0!==this._contentSize&&e.width===this._contentSize.width&&e.height===this._contentSize.height||this.set("_contentSize",e)},willRender:function(){this.updateCells(),this.updateContentSize()},updateCells(){if(!this._items)return
-const e=(0,n.get)(this._items,"length")
-this._cellLayout.length!==e&&(this._cellLayout.length=e)
-var t,r,i,s,l,u=this._cellMap,c=Object.create(null),d=this._cellLayout.indexAt(this._scrollLeft,this._scrollTop,this._clientWidth,this._clientHeight),h=this._cellLayout.count(this._scrollLeft,this._scrollTop,this._clientWidth,this._clientHeight),p=this._items,f=Math.min(d,this._buffer)
-d-=f,h+=f,h=Math.min(h+this._buffer,(0,n.get)(p,"length")-d)
-var m=[]
-for(t=0;t<h;t++)i=d+t,s=(0,o.default)(p.objectAt(i)),u&&(l=u[s]),l?(r=this._cellLayout.formatItemStyle(i,this._clientWidth,this._clientHeight),(0,n.set)(l,"style",r),(0,n.set)(l,"hidden",!1),(0,n.set)(l,"key",s),(0,n.set)(l,"index",i),c[s]=l):m.push(i)
-for(t=0;t<this._cells.length;t++)if(!c[(l=this._cells[t]).key])if(m.length){i=m.pop()
-let e=p.objectAt(i)
-s=(0,o.default)(e),r=this._cellLayout.formatItemStyle(i,this._clientWidth,this._clientHeight),(0,n.set)(l,"style",r),(0,n.set)(l,"key",s),(0,n.set)(l,"index",i),(0,n.set)(l,"item",e),(0,n.set)(l,"hidden",!1),c[s]=l}else(0,n.set)(l,"hidden",!0),(0,n.set)(l,"style","height: 0; display: none;")
-for(t=0;t<m.length;t++){i=m[t]
-let e=p.objectAt(i)
-s=(0,o.default)(e),r=this._cellLayout.formatItemStyle(i,this._clientWidth,this._clientHeight),l=new a(s,e,i,r),c[s]=l,this._cells.pushObject(l)}this._cellMap=c},_isGlimmer2(){return!this._renderNode},actions:{scrollChange(e,t){this._scrollChange?this._scrollChange(e,t):e===this._scrollLeft&&t===this._scrollTop||((0,n.set)(this,"_scrollLeft",e),(0,n.set)(this,"_scrollTop",t),this._needsRevalidate())},clientSizeChange(e,t){this._clientWidth===e&&this._clientHeight===t||((0,n.set)(this,"_clientWidth",e),(0,n.set)(this,"_clientHeight",t),this._needsRevalidate())}}})
-e.default=u})),define("ember-collection/components/ember-collection/template",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"MLosnUkK",block:'[[[6,[39,0],null,[["content-size","scroll-left","scroll-top","scrollChange","clientSizeChange"],[[33,1],[33,2],[33,3],[28,[37,4],[[30,0],"scrollChange"],null],[28,[37,4],[[30,0],"clientSizeChange"],null]]],[["default"],[[[[1,"  "],[10,0],[12],[42,[28,[37,6],[[28,[37,6],[[33,7]],null]],null],null,[[[10,0],[22,5,[30,1,["style"]]],[12],[18,2,[[30,1,["item"]],[30,1,["index"]]]],[13]],[1]],null],[13],[1,"\\n"]],[]]]]]],["cell","&default"],false,["ember-native-scrollable","_contentSize","_scrollLeft","_scrollTop","action","each","-track-array","_cells","yield"]]',moduleName:"ember-collection/components/ember-collection/template.hbs",isStrictMode:!1})
-e.default=t})),define("ember-collection/components/ember-native-scrollable",["exports","@ember/runloop","@ember/component","ember-collection/utils/translate","ember-collection/utils/style-properties"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=(0,i.styleProperty)("overflowScrolling")
-var s=r.default.extend({init(){this._clientWidth=0,this._clientHeight=0,this._scrollLeft=0,this._scrollTop=0,this._animationFrame=void 0,this._super()},didReceiveAttrs(){this._contentSize=this.getAttr("content-size"),this._scrollLeft=this.getAttr("scroll-left"),this._scrollTop=this.getAttr("scroll-top")},didInsertElement(){this.contentElement=this.element.firstElementChild,this.applyStyle(),this.applyContentSize(),this.syncScrollFromAttr(),this.startScrollCheck()},didUpdate(){this.applyContentSize(),this.syncScrollFromAttr()},willDestroyElement(){this.cancelScrollCheck(),this.contentElement=void 0},applyStyle(){o?(this.element.style.overflow="scroll",this.element.style[o]="touch"):this.element.style.overflow="auto",(0,n.translate)(this.element,0,0),this.element.style.position="absolute",this.element.style.left=0,this.element.style.top=0,this.element.style.bottom=0,this.element.style.right=0},applyContentSize(){this.contentElement.style.position="relative",this.contentElement.style.width=this._contentSize.width+"px",this.contentElement.style.height=this._contentSize.height+"px"},syncScrollFromAttr(){this._appliedScrollTop!==this._scrollTop&&(this._appliedScrollTop=this._scrollTop,this._scrollTop>=0&&(this.element.scrollTop=this._scrollTop)),this._appliedScrollLeft!==this._scrollLeft&&(this._appliedScrollLeft=this._scrollLeft,this._scrollLeft>=0&&(this.element.scrollLeft=this._scrollLeft))},startScrollCheck(){const e=this
-function t(){e.scrollCheck(),r()}function r(){window.requestAnimationFrame?e._animationFrame=requestAnimationFrame(t):e._animationFrame=setTimeout(t,16)}r()},cancelScrollCheck(){this._animationFrame&&(window.requestAnimationFrame?cancelAnimationFrame(this._animationFrame):clearTimeout(this._animationFrame),this._animationFrame=void 0)},scrollCheck(){let e=this.element,r=e.scrollLeft,n=e.scrollTop,i=!1
-r===this._appliedScrollLeft&&n===this._appliedScrollTop||(i=!0,this._appliedScrollLeft=r,this._appliedScrollTop=n)
-let o=e.clientWidth,s=e.clientHeight,a=!1
-o===this._clientWidth&&s===this._clientHeight||(a=!0,this._clientWidth=o,this._clientHeight=s),(i||a)&&(0,t.join)(this,(function(){i&&this.scrollChange(r,n),a&&this.clientSizeChange(o,s)}))}})
-e.default=s})),define("ember-collection/layouts/grid",["exports","layout-bin-packer/fixed-grid","ember-collection/utils/style-generators"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=class{constructor(e,r){this.length=0,this.bin=new t.default(this,e,r)}contentSize(e){return{width:e,height:this.bin.height(e)}}indexAt(e,t,r,n){return this.bin.visibleStartingIndex(t,r,n)}positionAt(e,t){return this.bin.position(e,t)}widthAt(e){return this.bin.widthAtIndex(e)}heightAt(e){return this.bin.heightAtIndex(e)}count(e,t,r,n){return this.bin.numberVisibleWithin(t,r,n,!0)}formatItemStyle(e,t,n){let i=this.positionAt(e,t,n),o=this.widthAt(e,t,n),s=this.heightAt(e,t,n)
-return(0,r.formatPixelStyle)(i,o,s)}}})),define("ember-collection/layouts/mixed-grid",["exports","layout-bin-packer/shelf-first","ember-collection/utils/style-generators"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=class{constructor(e,r){this.content=e,this.bin=new t.default(e,r)}contentSize(e){return{width:e,height:this.bin.height(e)}}indexAt(e,t,r,n){return this.bin.visibleStartingIndex(t,r,n)}positionAt(e,t,r){return this.bin.position(e,t,r)}widthAt(e){return this.bin.widthAtIndex(e)}heightAt(e){return this.bin.heightAtIndex(e)}count(e,t,r,n){return this.bin.numberVisibleWithin(t,r,n,!0)}formatItemStyle(e,t,n){let i=this.positionAt(e,t,n),o=this.widthAt(e,t,n),s=this.heightAt(e,t,n)
-return(0,r.formatPixelStyle)(i,o,s)}}})),define("ember-collection/layouts/percentage-columns",["exports","@ember/debug","layout-bin-packer/shelf-first","ember-collection/utils/style-generators"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=class{constructor(e,t,n){t.reduce((function(e,t){return e+t}))
-let i=[]
-for(var o=0,s=0;s<e;s++)i.push({width:t[o],height:n,percent:t[o]}),++o>=t.length&&(o=0)
-this.positions=i,this.bin=new r.default(i,100)}contentSize(e){return{width:e,height:this.bin.height(100)}}indexAt(e,t,r,n){return this.bin.visibleStartingIndex(t,100,n)}positionAt(e,t,r){return this.bin.position(e,100,r)}widthAt(e){return this.bin.widthAtIndex(e)}heightAt(e){return this.bin.heightAtIndex(e)}count(e,t,r,n){return this.bin.numberVisibleWithin(t,100,n,!0)}formatItemStyle(e,t,r){let i=this.positionAt(e,100,r),o=this.positions[e].percent,s=this.heightAt(e,100,r),a=Math.floor(i.x/100*t)
-return(0,n.formatPercentageStyle)({x:a,y:i.y},o,s)}}})),define("ember-collection/utils/identity",["exports","@ember/object/internals"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let r,n=typeof e
-r="string"===n||"number"===n?e:(0,t.guidFor)(e)
-return r}})),define("ember-collection/utils/needs-revalidate",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){e._renderNode.isDirty=!0,e._renderNode.ownerNode.emberView.scheduleRevalidate(e._renderNode,e.toString(),"rerendering via needsRevalidate")}})),define("ember-collection/utils/style-generators",["exports","ember-collection/utils/translate"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.formatPixelStyle=function(e,r,n){let i="position:absolute;top:0;left:0;"
-return i+=(0,t.translateCSS)(e.x,e.y),i+="width:"+r+"px;height:"+n+"px;",i},e.formatPercentageStyle=function(e,r,n){let i="position:absolute;top:0;left:0;"
-return i+=(0,t.translateCSS)(e.x,e.y),i+="width:"+r+"%;height:"+n+"px;",i}})),define("ember-collection/utils/style-properties",["exports","@ember/string"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.styleProperty=function(e){return o(e,!1)},e.cssProperty=function(e){return o(e,!0)}
-const r=["webkit","Webkit","ms","Moz","O"],n=["-webkit-","-ms-","-moz-","-o-"],i="undefined"!=typeof document&&document.documentElement&&document.documentElement.style
-function o(e,o){let s=o?(0,t.camelize)(e):e
-if(s in i)return e
-let a=(0,t.capitalize)(s)
-for(let t=0;t<r.length;t++){let s=r[t]+a
-if(s in i)return o?n[t]+e:s}}})),define("ember-collection/utils/translate",["exports","ember-collection/utils/style-properties"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.translatePosition=s,e.translateTransform2D=a,e.translateTransform3D=l,e.translatePositionCSS=u,e.translateTransform2DCSS=c,e.translateTransform3DCSS=d,e.translateCSS=e.translate=e.supports2D=e.supports3D=void 0
-const r=(0,t.cssProperty)("transform"),n=(0,t.styleProperty)("transform"),i=!!(0,t.styleProperty)("perspectiveOrigin")
-e.supports3D=i
-const o=!!n
-function s(e,t,r){e.style.left=t+"px",e.style.top=r+"px"}function a(e,t,r){e.style[n]=h(t,r)}function l(e,t,r){e.style[n]=p(t,r)}function u(e,t){return`left:${e}px;top:${t}px;`}function c(e,t){return`${r}:${h(e,t)};`}function d(e,t){return`${r}:${p(e,t)};`}function h(e,t){return`matrix(1, 0, 0, 1, ${e}, ${t})`}function p(e,t){return`matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, ${e}, ${t}, 0, 1)`}e.supports2D=o
-const f=i?l:o?a:s
-e.translate=f
-const m=i?d:o?c:u
-e.translateCSS=m})),define("ember-composable-helpers/-private/closure-action",["exports","ember"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const{__loader:r}=t.default
-let n={ACTION:null}
-"ember-htmlbars/keywords/closure-action"in r.registry?n=r.require("ember-htmlbars/keywords/closure-action"):"ember-routing-htmlbars/keywords/closure-action"in r.registry&&(n=r.require("ember-routing-htmlbars/keywords/closure-action"))
-var i=n.ACTION
-e.default=i})),define("ember-composable-helpers/-private/get-value-array-and-use-deep-equal-from-params",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let t,r=e[0],n=!1
-2===e.length?t=e[1]:(n=e[1],t=e[2])
-return{currentValue:r,array:t,useDeepEqual:n}}})),define("ember-composable-helpers/helpers/append",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[...t]=e
-return[].concat(...t)}Object.defineProperty(e,"__esModule",{value:!0}),e.append=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-composable-helpers/helpers/call",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-if(t)return r?t.apply(r):t()}Object.defineProperty(e,"__esModule",{value:!0}),e.call=r,e.default=void 0
-var n=t.default.helper(r)
-e.default=n})),define("ember-composable-helpers/helpers/chunk",["exports","@ember/component/helper","@ember/array","ember-composable-helpers/utils/as-array"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.chunk=s,e.default=void 0
-const{max:i,ceil:o}=Math
-function s(e,t){let s=parseInt(e,10),a=i(s,0),l=0
-if((0,r.isArray)(t)&&(l=t.length),t=(0,n.default)(t),!l||a<1)return[]
-{let e=0,r=-1,n=new Array(o(l/a))
-for(;e<l;)n[++r]=t.slice(e,e+=a)
-return n}}var a=(0,t.helper)((function(e){let[t,r]=e
-return s(t,r)}))
-e.default=a})),define("ember-composable-helpers/helpers/compact",["exports","@ember/component/helper","@ember/utils","@ember/array"],(function(e,t,r,n){"use strict"
-function i(e){let t,[i]=e
-return t=Array.isArray(i)||(0,n.isArray)(i)?i:[i],t.filter((e=>(0,r.isPresent)(e)))}Object.defineProperty(e,"__esModule",{value:!0}),e.compact=i,e.default=void 0
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-composable-helpers/helpers/compute",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,...r]=e
-return t(...r)}Object.defineProperty(e,"__esModule",{value:!0}),e.compute=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-composable-helpers/helpers/contains",["exports","@ember/component/helper","ember-composable-helpers/helpers/includes","@ember/debug"],(function(e,t,r,n){"use strict"
-function i(e,t){return(0,r.includes)(e,t)}Object.defineProperty(e,"__esModule",{value:!0}),e.contains=i,e.default=void 0
-var o=(0,t.helper)((function(e){let[t,r]=e
-return i(t,r)}))
-e.default=o}))
-define("ember-composable-helpers/helpers/dec",["exports","@ember/component/helper","@ember/utils"],(function(e,t,r){"use strict"
-function n(e){let[t,n]=e
-if((0,r.isEmpty)(n)&&(n=t,t=void 0),n=Number(n),!isNaN(n))return void 0===t&&(t=1),n-t}Object.defineProperty(e,"__esModule",{value:!0}),e.dec=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-composable-helpers/helpers/drop",["exports","@ember/component/helper","ember-composable-helpers/utils/as-array"],(function(e,t,r){"use strict"
-function n(e){let[t,n]=e
-return(0,r.default)(n).slice(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.drop=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-composable-helpers/helpers/entries",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return t?Object.entries(t):t}Object.defineProperty(e,"__esModule",{value:!0}),e.entries=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-composable-helpers/helpers/filter-by",["exports","@ember/component/helper","@ember/array","@ember/utils","@ember/object","ember-composable-helpers/utils/is-equal","ember-composable-helpers/utils/as-array"],(function(e,t,r,n,i,o,s){"use strict"
-function a(e){let t,[a,l,u]=e
-return!(0,r.isArray)(u)&&(0,r.isArray)(l)&&(u=l,l=void 0),u=(0,s.default)(u),(0,n.isEmpty)(a)||(0,n.isEmpty)(u)?[]:(t=(0,n.isPresent)(l)?"function"==typeof l?e=>l((0,i.get)(e,a)):e=>(0,o.default)((0,i.get)(e,a),l):e=>!!(0,i.get)(e,a),u.filter(t))}Object.defineProperty(e,"__esModule",{value:!0}),e.filterBy=a,e.default=void 0
-var l=(0,t.helper)(a)
-e.default=l})),define("ember-composable-helpers/helpers/filter",["exports","@ember/component/helper","@ember/utils","ember-composable-helpers/utils/as-array"],(function(e,t,r,n){"use strict"
-function i(e){let[t,i]=e
-return(0,r.isEmpty)(t)||!i?[]:(0,n.default)(i).filter(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.filter=i,e.default=void 0
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-composable-helpers/helpers/find-by",["exports","@ember/component/helper","@ember/utils","@ember/array","ember-composable-helpers/utils/as-array"],(function(e,t,r,n,i){"use strict"
-function o(e){let[t,o,s]=e
-return(0,r.isEmpty)(t)?[]:(0,n.A)((0,i.default)(s)).findBy(t,o)}Object.defineProperty(e,"__esModule",{value:!0}),e.findBy=o,e.default=void 0
-var s=(0,t.helper)(o)
-e.default=s})),define("ember-composable-helpers/helpers/flatten",["exports","@ember/component/helper","@ember/array","ember-composable-helpers/utils/as-array"],(function(e,t,r,n){"use strict"
-function i(e){return(0,r.isArray)(e)?(0,n.default)(e).reduce(((e,t)=>e.concat(i(t))),[]):e}Object.defineProperty(e,"__esModule",{value:!0}),e.flatten=i,e.default=void 0
-var o=(0,t.helper)((function(e){let[t]=e
-return i(t)}))
-e.default=o})),define("ember-composable-helpers/helpers/from-entries",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return t?Object.fromEntries(t):t}Object.defineProperty(e,"__esModule",{value:!0}),e.fromEntries=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-composable-helpers/helpers/group-by",["exports","@ember/component/helper","@ember/object","ember-composable-helpers/utils/as-array"],(function(e,t,r,n){"use strict"
-function i(e){let[t,i]=e,o={}
-return(0,n.default)(i).forEach((e=>{let n=(0,r.get)(e,t),i=o[n]
-Array.isArray(i)||(i=[],o[n]=i),i.push(e)})),o}Object.defineProperty(e,"__esModule",{value:!0}),e.groupBy=i,e.default=void 0
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-composable-helpers/helpers/has-next",["exports","@ember/component/helper","@ember/utils","ember-composable-helpers/helpers/next","ember-composable-helpers/utils/is-equal","ember-composable-helpers/-private/get-value-array-and-use-deep-equal-from-params","ember-composable-helpers/utils/as-array"],(function(e,t,r,n,i,o,s){"use strict"
-function a(e,t){let o=arguments.length>2&&void 0!==arguments[2]&&arguments[2],a=(0,s.default)(t),l=(0,n.next)(e,a,o),u=!(0,i.default)(l,e,o)
-return u&&(0,r.isPresent)(l)}Object.defineProperty(e,"__esModule",{value:!0}),e.hasNext=a,e.default=void 0
-var l=(0,t.helper)((function(e){let{currentValue:t,array:r,useDeepEqual:n}=(0,o.default)(e)
-return a(t,r,n)}))
-e.default=l})),define("ember-composable-helpers/helpers/has-previous",["exports","@ember/component/helper","@ember/utils","ember-composable-helpers/helpers/previous","ember-composable-helpers/utils/is-equal","ember-composable-helpers/-private/get-value-array-and-use-deep-equal-from-params","ember-composable-helpers/utils/as-array"],(function(e,t,r,n,i,o,s){"use strict"
-function a(e,t){let o=arguments.length>2&&void 0!==arguments[2]&&arguments[2],a=(0,s.default)(t),l=(0,n.previous)(e,a,o),u=!(0,i.default)(l,e,o)
-return u&&(0,r.isPresent)(l)}Object.defineProperty(e,"__esModule",{value:!0}),e.hasPrevious=a,e.default=void 0
-var l=(0,t.helper)((function(e){let{currentValue:t,array:r,useDeepEqual:n}=(0,o.default)(e)
-return a(t,r,n)}))
-e.default=l})),define("ember-composable-helpers/helpers/inc",["exports","@ember/component/helper","@ember/utils"],(function(e,t,r){"use strict"
-function n(e){let[t,n]=e
-if((0,r.isEmpty)(n)&&(n=t,t=void 0),n=Number(n),!isNaN(n))return void 0===t&&(t=1),n+t}Object.defineProperty(e,"__esModule",{value:!0}),e.inc=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-composable-helpers/helpers/includes",["exports","@ember/array","@ember/component/helper","ember-composable-helpers/utils/as-array"],(function(e,t,r,n){"use strict"
-function i(e,r){if(!(0,t.isArray)(r))return!1
-let i=(0,t.isArray)(e)?e:[e],o=(0,t.A)((0,n.default)(r))
-return(0,n.default)(i).every((e=>o.includes(e)))}Object.defineProperty(e,"__esModule",{value:!0}),e.includes=i,e.default=void 0
-var o=(0,r.helper)((function(e){let[t,r]=e
-return i(t,r)}))
-e.default=o})),define("ember-composable-helpers/helpers/intersect",["exports","@ember/component/helper","@ember/array","ember-composable-helpers/utils/as-array"],(function(e,t,r,n){"use strict"
-function i(e){let[...t]=e,i=(0,n.default)(t).map((e=>(0,r.isArray)(e)?e:[]))
-return i.pop().filter((e=>{for(let t=0;t<i.length;t++){let r=!1,n=i[t]
-for(let t=0;t<n.length;t++)if(n[t]===e){r=!0
-break}if(!1===r)return!1}return!0}))}Object.defineProperty(e,"__esModule",{value:!0}),e.intersect=i,e.default=void 0
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-composable-helpers/helpers/invoke",["exports","@ember/array","@ember/component/helper","rsvp"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.invoke=o,e.default=void 0
-const{all:i}=n.default
-function o(e){let[r,...n]=e,o=n.pop()
-return(0,t.isArray)(o)?function(){let e=o.map((e=>{var t
-return null===(t=e[r])||void 0===t?void 0:t.call(e,...n)}))
-return i(e)}:function(){var e
-return null===(e=o[r])||void 0===e?void 0:e.call(o,...n)}}var s=(0,r.helper)(o)
-e.default=s})),define("ember-composable-helpers/helpers/join",["exports","@ember/component/helper","@ember/array","ember-composable-helpers/utils/as-array"],(function(e,t,r,n){"use strict"
-function i(e){let[t,i]=e,o=(0,n.default)(i)
-return(0,r.isArray)(t)&&(o=t,t=","),o.join(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.join=i,e.default=void 0
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-composable-helpers/helpers/keys",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return t?Object.keys(t):t}Object.defineProperty(e,"__esModule",{value:!0}),e.keys=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-composable-helpers/helpers/map-by",["exports","@ember/component/helper","@ember/object","@ember/utils","ember-composable-helpers/utils/as-array"],(function(e,t,r,n,i){"use strict"
-function o(e){let[t,o]=e
-return(0,n.isEmpty)(t)?[]:(0,i.default)(o).map((e=>(0,r.get)(e,t)))}Object.defineProperty(e,"__esModule",{value:!0}),e.mapBy=o,e.default=void 0
-var s=(0,t.helper)(o)
-e.default=s})),define("ember-composable-helpers/helpers/map",["exports","@ember/component/helper","@ember/utils","ember-composable-helpers/utils/as-array"],(function(e,t,r,n){"use strict"
-function i(e){let[t,i]=e
-return(0,r.isEmpty)(t)?[]:(0,n.default)(i).map(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.map=i,e.default=void 0
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-composable-helpers/helpers/next",["exports","@ember/component/helper","ember-composable-helpers/utils/get-index","@ember/utils","@ember/array","ember-composable-helpers/-private/get-value-array-and-use-deep-equal-from-params","ember-composable-helpers/utils/as-array"],(function(e,t,r,n,i,o,s){"use strict"
-function a(e,t){let o=arguments.length>2&&void 0!==arguments[2]&&arguments[2],a=(0,s.default)(t),l=(0,r.default)(a,e,o),u=a.length-1
-if(!(0,n.isEmpty)(l))return l===u?e:(0,i.A)(a).objectAt(l+1)}Object.defineProperty(e,"__esModule",{value:!0}),e.next=a,e.default=void 0
-var l=(0,t.helper)((function(e){let{currentValue:t,array:r,useDeepEqual:n}=(0,o.default)(e)
-return a(t,r,n)}))
-e.default=l})),define("ember-composable-helpers/helpers/noop",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(){return()=>{}}Object.defineProperty(e,"__esModule",{value:!0}),e.noop=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-composable-helpers/helpers/object-at",["exports","@ember/component/helper","@ember/array"],(function(e,t,r){"use strict"
-function n(e,t){if((0,r.isArray)(t))return e=parseInt(e,10),(0,r.A)(t).objectAt(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.objectAt=n,e.default=void 0
-var i=(0,t.helper)((function(e){let[t,r]=e
-return n(t,r)}))
-e.default=i})),define("ember-composable-helpers/helpers/optional",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return"function"==typeof t?t:e=>e}Object.defineProperty(e,"__esModule",{value:!0}),e.optional=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-composable-helpers/helpers/pick",["exports","@ember/component/helper","@ember/object"],(function(e,t,r){"use strict"
-function n(e){let[t,n]=e
-return function(e){let i=(0,r.get)(e,t)
-if(!n)return i
-n(i)}}Object.defineProperty(e,"__esModule",{value:!0}),e.pick=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-composable-helpers/helpers/pipe-action",["exports","@ember/component/helper","ember-composable-helpers/helpers/pipe","ember-composable-helpers/-private/closure-action"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=r.pipe
-n.default&&(i[n.default]=!0)
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-composable-helpers/helpers/pipe",["exports","@ember/component/helper","ember-composable-helpers/utils/is-promise"],(function(e,t,r){"use strict"
-function n(e,t){return(0,r.default)(e)?e.then(t):t(e)}function i(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[]
-return function(){for(var t=arguments.length,r=new Array(t),i=0;i<t;i++)r[i]=arguments[i]
-return e.reduce(((e,t,i)=>0===i?t(...r):n(e,t)),void 0)}}Object.defineProperty(e,"__esModule",{value:!0}),e.invokeFunction=n,e.pipe=i,e.default=void 0
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-composable-helpers/helpers/previous",["exports","@ember/component/helper","ember-composable-helpers/utils/get-index","@ember/utils","@ember/array","ember-composable-helpers/-private/get-value-array-and-use-deep-equal-from-params"],(function(e,t,r,n,i,o){"use strict"
-function s(e,t){let o=arguments.length>2&&void 0!==arguments[2]&&arguments[2],s=(0,r.default)(t,e,o)
-if(!(0,n.isEmpty)(s))return 0===s?e:(0,i.A)(t).objectAt(s-1)}Object.defineProperty(e,"__esModule",{value:!0}),e.previous=s,e.default=void 0
-var a=(0,t.helper)((function(e){let{currentValue:t,array:r,useDeepEqual:n}=(0,o.default)(e)
-return s(t,r,n)}))
-e.default=a})),define("ember-composable-helpers/helpers/queue",["exports","@ember/component/helper","ember-composable-helpers/utils/is-promise"],(function(e,t,r){"use strict"
-function n(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[]
-return function(){for(var t=arguments.length,n=new Array(t),i=0;i<t;i++)n[i]=arguments[i]
-let o=function(e,t){return(0,r.default)(e)?e.then((()=>t(...n))):t(...n)}
-return e.reduce(((e,t,r)=>0===r?t(...n):o(e,t)),void 0)}}Object.defineProperty(e,"__esModule",{value:!0}),e.queue=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-composable-helpers/helpers/range",["exports","@ember/component/helper","@ember/utils","ember-composable-helpers/utils/comparison"],(function(e,t,r,n){"use strict"
-function i(e){let[t,i,o]=e
-o="boolean"===(0,r.typeOf)(o)&&o
-let s=[]
-if(t<i){let e=o?n.lte:n.lt
-for(let r=t;e(r,i);r++)s.push(r)}if(t>i){let e=o?n.gte:n.gt
-for(let r=t;e(r,i);r--)s.push(r)}return t===i&&o&&s.push(i),s}Object.defineProperty(e,"__esModule",{value:!0}),e.range=i,e.default=void 0
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-composable-helpers/helpers/reduce",["exports","@ember/component/helper","@ember/utils","ember-composable-helpers/utils/as-array"],(function(e,t,r,n){"use strict"
-function i(e){let[t,i,o]=e
-return(0,r.isEmpty)(t)?[]:(0,n.default)(o).reduce(t,i)}Object.defineProperty(e,"__esModule",{value:!0}),e.reduce=i,e.default=void 0
-var o=(0,t.helper)(i)
-e.default=o}))
-define("ember-composable-helpers/helpers/reject-by",["exports","@ember/component/helper","@ember/array","@ember/utils","@ember/object","ember-composable-helpers/utils/is-equal","ember-composable-helpers/utils/as-array"],(function(e,t,r,n,i,o,s){"use strict"
-function a(e){let t,[a,l,u]=e
-return!(0,r.isArray)(u)&&(0,r.isArray)(l)&&(u=l,l=void 0),u=(0,s.default)(u),t=(0,n.isPresent)(l)?"function"==typeof l?e=>!l((0,i.get)(e,a)):e=>!(0,o.default)((0,i.get)(e,a),l):e=>!(0,i.get)(e,a),u.filter(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.rejectBy=a,e.default=void 0
-var l=(0,t.helper)(a)
-e.default=l})),define("ember-composable-helpers/helpers/repeat",["exports","@ember/component/helper","@ember/utils"],(function(e,t,r){"use strict"
-function n(e){let[t,n]=e
-return"number"!==(0,r.typeOf)(t)?[n]:Array.apply(null,{length:t}).map((()=>n))}Object.defineProperty(e,"__esModule",{value:!0}),e.repeat=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-composable-helpers/helpers/reverse",["exports","@ember/component/helper","@ember/array"],(function(e,t,r){"use strict"
-function n(e){let[t]=e
-return(0,r.isArray)(t)?(0,r.A)(t).slice(0).reverse():[t]}Object.defineProperty(e,"__esModule",{value:!0}),e.reverse=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-composable-helpers/helpers/shuffle",["exports","@ember/component/helper","@ember/array","@ember/utils"],(function(e,t,r,n){"use strict"
-function i(e,t){let r,i,o=(e=e.slice(0)).length
-for(t="function"===(0,n.typeOf)(t)&&t||Math.random;o>1;)r=Math.floor(t()*o--),i=e[o],e[o]=e[r],e[r]=i
-return e}Object.defineProperty(e,"__esModule",{value:!0}),e.shuffle=i,e.default=void 0
-var o=(0,t.helper)((function(e){let[t,n]=e
-return void 0===n&&(n=t,t=void 0),(0,r.isArray)(n)?i(n,t):[n]}))
-e.default=o})),define("ember-composable-helpers/helpers/slice",["exports","@ember/component/helper","ember-composable-helpers/utils/as-array"],(function(e,t,r){"use strict"
-function n(e){let[...t]=e,n=t.pop()
-return n=(0,r.default)(n),n.slice(...t)}Object.defineProperty(e,"__esModule",{value:!0}),e.slice=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-composable-helpers/helpers/sort-by",["exports","@ember/object","@ember/utils","@ember/component/helper","ember-composable-helpers/utils/as-array"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.sortBy=d,e.default=void 0
-const o=new Intl.Collator(void 0,{sensitivity:"base"})
-function s(e){if("boolean"==typeof e)return e
-if("number"==typeof e){if(e>0)return!1
-if(e<0)return!0}return e}function a(e,r){return null==e?e:(0,t.get)(e,r)}function l(e,t,n){if((0,r.isEmpty)(e))return 0
-const i=a(t,e),s=a(n,e),l=null==i,u=null==s
-return l&&u?0:u?-1:l?1:i.toLowerCase&&s.toLowerCase?o.compare(s,i):i<s?1:i>s?-1:0}function u(e,t,n){if((0,r.isEmpty)(e))return 0
-const i=a(t,e),s=a(n,e),l=null==i,u=null==s
-return l&&u?0:u?-1:l?1:i.toLowerCase&&s.toLowerCase?o.compare(i,s):i<s?-1:i>s?1:0}class c extends class{constructor(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-let[n]=t
-"function"==typeof n.toArray&&(n=n.toArray()),this.array=[...n]}comparator(e){return"function"==typeof e?e:this.defaultSort(e)}defaultSort(e){let t=u
-return e.match(":desc")&&(t=l),(r,n)=>t(e.replace(/:desc|:asc/,""),r,n)}}{perform(){let e=!1,t=(arguments.length>0&&void 0!==arguments[0]?arguments[0]:[]).map((e=>this.comparator(e))),r=(e,r)=>{for(let n=0;n<t.length;n+=1){let i=t[n](e,r)
-if(0!==i)return i}return 0}
-for(let n=1;n<this.array.length;n+=1){for(let t=0;t<this.array.length-n;t+=1){s(r(this.array[t+1],this.array[t]))&&([this.array[t],this.array[t+1]]=[this.array[t+1],this.array[t]],e=!0)}if(!e)return this.array}}}function d(e){let t=e.slice(),r=(0,i.default)(t.pop()),n=t
-if(!r||!n||0===n.length)return[]
-1===n.length&&Array.isArray(n[0])&&(n=n[0])
-const o=new c(r)
-return o.perform(n),o.array}var h=(0,n.helper)(d)
-e.default=h})),define("ember-composable-helpers/helpers/take",["exports","@ember/component/helper","ember-composable-helpers/utils/as-array"],(function(e,t,r){"use strict"
-function n(e){let[t,n]=e
-return(0,r.default)(n).slice(0,t)}Object.defineProperty(e,"__esModule",{value:!0}),e.take=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-composable-helpers/helpers/toggle-action",["exports","@ember/component/helper","ember-composable-helpers/helpers/toggle","ember-composable-helpers/-private/closure-action"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=r.toggle
-n.default&&(i[n.default]=!0)
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-composable-helpers/helpers/toggle",["exports","@ember/component/helper","@ember/object","@ember/utils"],(function(e,t,r,n){"use strict"
-function i(e){let[t,i,...o]=e
-return function(){let e=(0,r.get)(i,t)
-if((0,n.isPresent)(o)){let n=o.indexOf(e),s=function(e,t){return-1===t||t+1===e?0:t+1}(o.length,n)
-return(0,r.set)(i,t,o[s])}return(0,r.set)(i,t,!e)}}Object.defineProperty(e,"__esModule",{value:!0}),e.toggle=i,e.default=void 0
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-composable-helpers/helpers/union",["exports","@ember/component/helper","ember-composable-helpers/utils/as-array"],(function(e,t,r){"use strict"
-function n(e){let[...t]=e
-return[].concat(...t).filter(((e,t,n)=>(0,r.default)(n).indexOf(e)===t))}Object.defineProperty(e,"__esModule",{value:!0}),e.union=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-composable-helpers/helpers/values",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return t?Object.values(t):t}Object.defineProperty(e,"__esModule",{value:!0}),e.values=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-composable-helpers/helpers/without",["exports","@ember/component/helper","@ember/array"],(function(e,t,r){"use strict"
-function n(e,t){return!!(0,r.isArray)(t)&&((0,r.isArray)(e)&&e.length?t.reduce(((t,n)=>function(e,t){return(0,r.A)(t).includes(e)}(n,e)?t:t.concat(n)),[]):(0,r.A)(t).without(e))}Object.defineProperty(e,"__esModule",{value:!0}),e.without=n,e.default=void 0
-var i=(0,t.helper)((function(e){let[t,r]=e
-return n(t,r)}))
-e.default=i})),define("ember-composable-helpers/index",["exports","ember-composable-helpers/helpers/append","ember-composable-helpers/helpers/chunk","ember-composable-helpers/helpers/compact","ember-composable-helpers/helpers/compute","ember-composable-helpers/helpers/dec","ember-composable-helpers/helpers/drop","ember-composable-helpers/helpers/filter-by","ember-composable-helpers/helpers/filter","ember-composable-helpers/helpers/find-by","ember-composable-helpers/helpers/flatten","ember-composable-helpers/helpers/group-by","ember-composable-helpers/helpers/has-next","ember-composable-helpers/helpers/has-previous","ember-composable-helpers/helpers/inc","ember-composable-helpers/helpers/intersect","ember-composable-helpers/helpers/invoke","ember-composable-helpers/helpers/join","ember-composable-helpers/helpers/map-by","ember-composable-helpers/helpers/map","ember-composable-helpers/helpers/next","ember-composable-helpers/helpers/object-at","ember-composable-helpers/helpers/optional","ember-composable-helpers/helpers/pipe-action","ember-composable-helpers/helpers/pipe","ember-composable-helpers/helpers/previous","ember-composable-helpers/helpers/queue","ember-composable-helpers/helpers/range","ember-composable-helpers/helpers/reduce","ember-composable-helpers/helpers/reject-by","ember-composable-helpers/helpers/repeat","ember-composable-helpers/helpers/reverse","ember-composable-helpers/helpers/shuffle","ember-composable-helpers/helpers/slice","ember-composable-helpers/helpers/sort-by","ember-composable-helpers/helpers/take","ember-composable-helpers/helpers/toggle-action","ember-composable-helpers/helpers/toggle","ember-composable-helpers/helpers/union","ember-composable-helpers/helpers/without"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p,f,m,g,v,b,y,_,w,O,x,P,S,T,E,C,k,M,A,R,j,I,D,N,F,L,z){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"AppendHelper",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"ChunkHelper",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"CompactHelper",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"ComputeHelper",{enumerable:!0,get:function(){return i.default}}),Object.defineProperty(e,"DecHelper",{enumerable:!0,get:function(){return o.default}}),Object.defineProperty(e,"DropHelper",{enumerable:!0,get:function(){return s.default}}),Object.defineProperty(e,"FilterByHelper",{enumerable:!0,get:function(){return a.default}}),Object.defineProperty(e,"FilterHelper",{enumerable:!0,get:function(){return l.default}}),Object.defineProperty(e,"FindByHelper",{enumerable:!0,get:function(){return u.default}}),Object.defineProperty(e,"FlattenHelper",{enumerable:!0,get:function(){return c.default}}),Object.defineProperty(e,"GroupByHelper",{enumerable:!0,get:function(){return d.default}}),Object.defineProperty(e,"HasNextHelper",{enumerable:!0,get:function(){return h.default}}),Object.defineProperty(e,"HasPreviousHelper",{enumerable:!0,get:function(){return p.default}}),Object.defineProperty(e,"IncHelper",{enumerable:!0,get:function(){return f.default}}),Object.defineProperty(e,"IntersectHelper",{enumerable:!0,get:function(){return m.default}}),Object.defineProperty(e,"InvokeHelper",{enumerable:!0,get:function(){return g.default}}),Object.defineProperty(e,"JoinHelper",{enumerable:!0,get:function(){return v.default}}),Object.defineProperty(e,"MapByHelper",{enumerable:!0,get:function(){return b.default}}),Object.defineProperty(e,"MapHelper",{enumerable:!0,get:function(){return y.default}}),Object.defineProperty(e,"NextHelper",{enumerable:!0,get:function(){return _.default}}),Object.defineProperty(e,"ObjectAtHelper",{enumerable:!0,get:function(){return w.default}}),Object.defineProperty(e,"OptionalHelper",{enumerable:!0,get:function(){return O.default}}),Object.defineProperty(e,"PipeActionHelper",{enumerable:!0,get:function(){return x.default}}),Object.defineProperty(e,"PipeHelper",{enumerable:!0,get:function(){return P.default}}),Object.defineProperty(e,"PreviousHelper",{enumerable:!0,get:function(){return S.default}}),Object.defineProperty(e,"QueueHelper",{enumerable:!0,get:function(){return T.default}}),Object.defineProperty(e,"RangeHelper",{enumerable:!0,get:function(){return E.default}}),Object.defineProperty(e,"ReduceHelper",{enumerable:!0,get:function(){return C.default}}),Object.defineProperty(e,"RejectByHelper",{enumerable:!0,get:function(){return k.default}})
-Object.defineProperty(e,"RepeatHelper",{enumerable:!0,get:function(){return M.default}}),Object.defineProperty(e,"ReverseHelper",{enumerable:!0,get:function(){return A.default}}),Object.defineProperty(e,"ShuffleHelper",{enumerable:!0,get:function(){return R.default}}),Object.defineProperty(e,"SliceHelper",{enumerable:!0,get:function(){return j.default}}),Object.defineProperty(e,"SortByHelper",{enumerable:!0,get:function(){return I.default}}),Object.defineProperty(e,"TakeHelper",{enumerable:!0,get:function(){return D.default}}),Object.defineProperty(e,"ToggleActionHelper",{enumerable:!0,get:function(){return N.default}}),Object.defineProperty(e,"ToggleHelper",{enumerable:!0,get:function(){return F.default}}),Object.defineProperty(e,"UnionHelper",{enumerable:!0,get:function(){return L.default}}),Object.defineProperty(e,"WithoutHelper",{enumerable:!0,get:function(){return z.default}})})),define("ember-composable-helpers/utils/as-array",["exports","@ember/array","@ember/object"],(function(e,t,r){"use strict"
-function n(e){return"function"==typeof e.toArray}function i(e){return"function"==typeof e.then}function o(e){if("number"==typeof e)throw new Error("Numbers not supported as arrays [ember-composable-helpers]")
-if("string"==typeof e)return e.split("")
-if(Array.isArray(e))return e
-if((0,t.isArray)(e))return e
-if("object"==typeof e&&null===e)return[]
-if(void 0===e)return[]
-if(e instanceof Set)return Array.from(e.values())
-if(e instanceof Map)return Array.from(e.values())
-if(e instanceof WeakMap)throw new Error("WeakMaps is not supported as arrays [ember-composable-helpers]")
-if(e instanceof WeakSet)throw new Error("WeakSets is not supported as arrays [ember-composable-helpers]")
-if("object"==typeof e){if(i(s=e)&&Object.hasOwnProperty.call(s,"content")){const t=(0,r.get)(e,"content")
-if("object"!=typeof t||null===t)throw new Error("Unknown content type in array-like object [ember-composable-helpers]")
-return n(t)?t.toArray():o(t)}if(i(e))throw new Error("Promise-like objects is not supported as arrays [ember-composable-helpers]")
-if(n(e))return e.toArray()
-if(e instanceof r.default)throw new Error("EmberObjects is not supported as arrays [ember-composable-helpers]")
-return Array.from(Object.values(e))}var s,a
-if(!e)return[]
-if(a=e,!(Symbol.iterator in Object(a)))throw new Error("Argument, passed as array is not iterable [ember-composable-helpers]")
-return e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return t=o(e),Object.isExtensible(t)?t:Array.from(t)
-var t}})),define("ember-composable-helpers/utils/comparison",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.lte=function(e,t){return e<=t},e.lt=function(e,t){return e<t},e.gte=function(e,t){return e>=t},e.gt=function(e,t){return e>t}})),define("ember-composable-helpers/utils/get-index",["exports","@ember/array","ember-composable-helpers/utils/is-equal"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n,i){let o=n
-i&&(o=(0,t.A)(e).find((e=>(0,r.default)(e,n,i))))
-let s=(0,t.A)(e).indexOf(o)
-return s>=0?s:null}})),define("ember-composable-helpers/utils/is-equal",["exports","@ember/utils"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r){let n=arguments.length>2&&void 0!==arguments[2]&&arguments[2]
-return n?JSON.stringify(e)===JSON.stringify(r):(0,t.isEqual)(e,r)||(0,t.isEqual)(r,e)}})),define("ember-composable-helpers/utils/is-object",["exports","@ember/utils"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return"object"===(0,t.typeOf)(e)||"instance"===(0,t.typeOf)(e)}})),define("ember-composable-helpers/utils/is-promise",["exports","@ember/utils","ember-composable-helpers/utils/is-object"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return(0,r.default)(e)&&function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-return"function"===(0,t.typeOf)(e.then)&&"function"===(0,t.typeOf)(e.catch)}(e)}})),define("ember-concurrency-decorators/index",["exports","@ember-decorators/utils/decorator","@ember/debug","ember-concurrency","ember-concurrency-decorators/last-value"],(function(e,t,r,n,i){"use strict"
-function o(e){return"function"==typeof e}function s(e){const t=function(e){return"function"==typeof e.initializer?e.initializer.call(void 0):"function"==typeof e.get?e.get.call(void 0):e.value?e.value:void 0}(e)
-return o(t)||function(e){return"object"==typeof e&&null!==e&&o(e.perform)}(t)?(0,n.task)(t):void 0}function a(e){return(0,n.taskGroup)()}function l(e,t){const r=Object.keys(e)
-for(const n of r){const r=e[n]
-!0===r?t[n]():t[n](r)}return t}function u(e){let r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return(0,t.decoratorWithParams)((function(t,n,i){let[o]=arguments.length>3&&void 0!==arguments[3]?arguments[3]:[]
-const{initializer:s,value:a}=i
-return delete i.initializer,delete i.value,l({...r,...o},e({...i,initializer:s,value:a}))(t,n,i)}))}Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"lastValue",{enumerable:!0,get:function(){return i.default}}),e.enqueueTaskGroup=e.keepLatestTaskGroup=e.dropTaskGroup=e.restartableTaskGroup=e.taskGroup=e.enqueueTask=e.keepLatestTask=e.dropTask=e.restartableTask=e.task=void 0
-const c=u(s)
-e.task=c
-const d=u(s,{restartable:!0})
-e.restartableTask=d
-const h=u(s,{drop:!0})
-e.dropTask=h
-const p=u(s,{keepLatest:!0})
-e.keepLatestTask=p
-const f=u(s,{enqueue:!0})
-e.enqueueTask=f
-const m=u(a)
-e.taskGroup=m
-const g=u(a,{restartable:!0})
-e.restartableTaskGroup=g
-const v=u(a,{drop:!0})
-e.dropTaskGroup=v
-const b=u(a,{keepLatest:!0})
-e.keepLatestTaskGroup=b
-const y=u(a,{enqueue:!0})
-e.enqueueTaskGroup=y})),define("ember-concurrency-decorators/last-value",["exports","@ember-decorators/utils/decorator","@ember/debug","@ember/object"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=(0,t.decoratorWithRequiredParams)((function(e,t,r,i){let[o]=i
-const{initializer:s}=r
-delete r.initializer
-return(0,n.computed)(`${o}.lastSuccessful`,(function(){const e=(0,n.get)(this,`${o}.lastSuccessful`)
-return e?(0,n.get)(e,"value"):s?s.call(this):void 0}))(e,t,r)}))
-e.default=i})),define("ember-concurrency/-private/cancelable-promise-helpers",["exports","@ember/debug","rsvp","ember-concurrency/-private/task-instance","ember-concurrency/-private/external/yieldables"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.hashSettled=e.hash=e.race=e.allSettled=e.all=void 0
-const o=h(r.default.Promise,"all",c)
-e.all=o
-const s=h(r.default,"allSettled",c)
-e.allSettled=s
-const a=h(r.Promise,"race",c)
-e.race=a
-const l=h(r.default,"hash",d)
-e.hash=l
-const u=h(r.default,"hashSettled",d)
-function c(e){return e}function d(e){return Object.keys(e).map((t=>e[t]))}function h(e,t,o){return function(s){let a=o(s)
-a.forEach((e=>{e&&e instanceof n.TaskInstance&&(e.executor.asyncErrorsHandled=!0)}))
-let l=r.default.defer()
-e[t](s).then(l.resolve,l.reject)
-let u=!1,c=()=>{u||(u=!0,a.forEach((e=>{e&&(e instanceof n.TaskInstance?e.cancel():"function"==typeof e[i.cancelableSymbol]&&e[i.cancelableSymbol]())})))},d=l.promise.finally(c)
-return d[i.cancelableSymbol]=c,d}}e.hashSettled=u})),define("ember-concurrency/-private/ember-environment",["exports","ember","rsvp","ember-concurrency/-private/external/environment","@ember/debug","@ember/runloop"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.EMBER_ENVIRONMENT=e.EmberEnvironment=void 0
-class s extends n.Environment{assert(){}async(e){(0,o.join)((()=>(0,o.once)(null,e)))}reportUncaughtRejection(e){(0,o.next)(null,(function(){if(!t.default.onerror)throw e
-t.default.onerror(e)}))}defer(){return(0,r.defer)()}globalDebuggingEnabled(){return t.default.ENV.DEBUG_TASKS}}e.EmberEnvironment=s
-const a=new s
-e.EMBER_ENVIRONMENT=a})),define("ember-concurrency/-private/external/environment",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.Environment=void 0
-e.Environment=class{assert(){}async(){}reportUncaughtRejection(){}defer(){}globalDebuggingEnabled(){}}})),define("ember-concurrency/-private/external/generator-state",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.GeneratorState=e.GeneratorStepResult=void 0
-class t{constructor(e,t,r){this.value=e,this.done=t,this.errored=r}}e.GeneratorStepResult=t
-e.GeneratorState=class{constructor(e){this.done=!1,this.generatorFactory=e,this.iterator=null}step(e,r){try{let n=this.getIterator(),{value:i,done:o}=n[r](e)
-return o?this.finalize(i,!1):new t(i,!1,!1)}catch(n){return this.finalize(n,!0)}}getIterator(){return this.iterator||this.done||(this.iterator=this.generatorFactory()),this.iterator}finalize(e,r){return this.done=!0,this.iterator=null,new t(e,!0,r)}}})),define("ember-concurrency/-private/external/scheduler/policies/bounded-policy",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=class{constructor(e){this.maxConcurrency=e||1}}
-e.default=t})),define("ember-concurrency/-private/external/scheduler/policies/drop-policy",["exports","ember-concurrency/-private/external/scheduler/policies/bounded-policy","ember-concurrency/-private/external/scheduler/policies/execution-states"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const n=(0,r.makeCancelState)("it belongs to a 'drop' Task that was already running")
-class i{constructor(e){this.remainingSlots=e}step(){return this.remainingSlots>0?(this.remainingSlots--,r.STARTED):n}}class o extends t.default{makeReducer(){return new i(this.maxConcurrency)}}var s=o
-e.default=s})),define("ember-concurrency/-private/external/scheduler/policies/enqueued-policy",["exports","ember-concurrency/-private/external/scheduler/policies/bounded-policy","ember-concurrency/-private/external/scheduler/policies/execution-states"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n{constructor(e){this.remainingSlots=e}step(){return this.remainingSlots>0?(this.remainingSlots--,r.STARTED):r.QUEUED}}class i extends t.default{makeReducer(){return new n(this.maxConcurrency)}}var o=i
-e.default=o})),define("ember-concurrency/-private/external/scheduler/policies/execution-states",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.makeCancelState=e.QUEUED=e.STARTED=e.TYPE_QUEUED=e.TYPE_STARTED=e.TYPE_CANCELLED=void 0
-const t="CANCELLED"
-e.TYPE_CANCELLED=t
-const r="STARTED"
-e.TYPE_STARTED=r
-const n="QUEUED"
-e.TYPE_QUEUED=n
-const i={type:r}
-e.STARTED=i
-const o={type:n}
-e.QUEUED=o
-e.makeCancelState=e=>({type:t,reason:e})})),define("ember-concurrency/-private/external/scheduler/policies/keep-latest-policy",["exports","ember-concurrency/-private/external/scheduler/policies/bounded-policy","ember-concurrency/-private/external/scheduler/policies/execution-states"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const n=(0,r.makeCancelState)("it belongs to a 'keepLatest' Task that was already running")
-class i{constructor(e,t){this.remainingSlots=e,this.numToCancel=t}step(){return this.remainingSlots>0?(this.remainingSlots--,r.STARTED):this.numToCancel>0?(this.numToCancel--,n):r.QUEUED}}class o extends t.default{makeReducer(e,t){let r=e+t
-return new i(this.maxConcurrency,r-this.maxConcurrency-1)}}var s=o
-e.default=s}))
-define("ember-concurrency/-private/external/scheduler/policies/restartable-policy",["exports","ember-concurrency/-private/external/scheduler/policies/bounded-policy","ember-concurrency/-private/external/scheduler/policies/execution-states"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const n=(0,r.makeCancelState)("it belongs to a 'restartable' Task that was .perform()ed again")
-class i{constructor(e){this.numToCancel=e}step(){return this.numToCancel>0?(this.numToCancel--,n):r.STARTED}}class o extends t.default{makeReducer(e,t){return new i(e+t-this.maxConcurrency)}}var s=o
-e.default=s})),define("ember-concurrency/-private/external/scheduler/policies/unbounded-policy",["exports","ember-concurrency/-private/external/scheduler/policies/execution-states"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=new class{step(){return t.STARTED}}
-var n=class{makeReducer(){return r}}
-e.default=n})),define("ember-concurrency/-private/external/scheduler/refresh",["exports","ember-concurrency/-private/external/scheduler/policies/execution-states"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=class{constructor(e,t,r){this.stateTracker=t,this.schedulerPolicy=e,this.initialTaskInstances=r,this.startingInstances=[]}process(){let[e,t,r]=this.filterFinishedTaskInstances(),n=this.schedulerPolicy.makeReducer(t,r),i=e.filter((e=>this.setTaskInstanceExecutionState(e,n.step())))
-return this.stateTracker.computeFinalStates((e=>this.applyState(e))),this.startingInstances.forEach((e=>e.start())),i}filterFinishedTaskInstances(){let e=0,t=0
-return[this.initialTaskInstances.filter((r=>{let n=this.stateTracker.stateFor(r.task),i=r.executor.state
-return i.isFinished?(n.onCompletion(r),!1):(i.hasStarted?e+=1:t+=1,!0)})),e,t]}setTaskInstanceExecutionState(e,r){let n=this.stateTracker.stateFor(e.task)
-switch(e.executor.counted||(e.executor.counted=!0,n.onPerformed(e)),r.type){case t.TYPE_CANCELLED:return e.cancel(r.reason),!1
-case t.TYPE_STARTED:return e.executor.state.hasStarted||(this.startingInstances.push(e),n.onStart(e)),n.onRunning(e),!0
-case t.TYPE_QUEUED:return n.onQueued(e),!0}}applyState(e){let{taskable:t}=e
-if(!t.onState)return
-let r=Object.assign({numRunning:e.numRunning,numQueued:e.numQueued,numPerformedInc:e.numPerformedInc},e.attrs)
-t.onState(r,t)}}
-e.default=r})),define("ember-concurrency/-private/external/scheduler/scheduler",["exports","ember-concurrency/-private/external/scheduler/refresh","ember-concurrency/-private/external/scheduler/state-tracker/state-tracker","ember-concurrency/-private/external/scheduler/state-tracker/null-state-tracker"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=class{constructor(e,t){this.schedulerPolicy=e,this.stateTrackingEnabled=t,this.taskInstances=[]}cancelAll(e,t){let r=this.taskInstances.map((r=>{r.task.guids[e]&&r.executor.cancel(t)})).filter((e=>!!e))
-return Promise.all(r)}perform(e){e.onFinalize((()=>this.scheduleRefresh())),this.taskInstances.push(e),this.refresh()}scheduleRefresh(){}refresh(){let e=this.stateTrackingEnabled?new r.default:new n.default,i=new t.default(this.schedulerPolicy,e,this.taskInstances)
-this.taskInstances=i.process()}}
-e.default=i})),define("ember-concurrency/-private/external/scheduler/state-tracker/null-state-tracker",["exports","ember-concurrency/-private/external/scheduler/state-tracker/null-state"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=new t.default
-var n=class{stateFor(){return r}computeFinalStates(){}}
-e.default=n})),define("ember-concurrency/-private/external/scheduler/state-tracker/null-state",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=class{onCompletion(){}onPerformed(){}onStart(){}onRunning(){}onQueued(){}}
-e.default=t})),define("ember-concurrency/-private/external/scheduler/state-tracker/state-tracker",["exports","ember-concurrency/-private/external/scheduler/state-tracker/state"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=class{constructor(){this.states={}}stateFor(e){let r=e.guid,n=this.states[r]
-return n||(n=this.states[r]=new t.default(e)),n}computeFinalStates(e){this.computeRecursiveState(),this.forEachState((t=>e(t)))}computeRecursiveState(){this.forEachState((e=>{let t=e
-e.recurseTaskGroups((e=>{let r=this.stateFor(e)
-r.applyStateFrom(t),t=r}))}))}forEachState(e){Object.keys(this.states).forEach((t=>e(this.states[t])))}}
-e.default=r})),define("ember-concurrency/-private/external/scheduler/state-tracker/state",["exports","ember-concurrency/-private/external/task-instance/completion-states"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=class{constructor(e){this.taskable=e,this.group=e.group,this.numRunning=0,this.numQueued=0,this.numPerformedInc=0,this.attrs={}}onCompletion(e){let r=e.completionState
-this.attrs.lastRunning=null,this.attrs.lastComplete=e,r===t.COMPLETION_SUCCESS?this.attrs.lastSuccessful=e:(r===t.COMPLETION_ERROR?this.attrs.lastErrored=e:r===t.COMPLETION_CANCEL&&(this.attrs.lastCanceled=e),this.attrs.lastIncomplete=e)}onPerformed(e){this.numPerformedInc+=1,this.attrs.lastPerformed=e}onStart(e){this.attrs.last=e}onRunning(e){this.attrs.lastRunning=e,this.numRunning+=1}onQueued(){this.numQueued+=1}recurseTaskGroups(e){let t=this.group
-for(;t;)e(t),t=t.group}applyStateFrom(e){Object.assign(this.attrs,e.attrs),this.numRunning+=e.numRunning,this.numQueued+=e.numQueued,this.numPerformedInc+=e.numPerformedInc}}
-e.default=r})),define("ember-concurrency/-private/external/task-instance/base",["exports","ember-concurrency/-private/external/task-instance/initial-state","ember-concurrency/-private/external/yieldables","ember-concurrency/-private/external/task-instance/cancelation"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.BaseTaskInstance=void 0
-class i{constructor(e){let{task:t,args:r,executor:n,performType:i,hasEnabledEvents:o}=e
-this.task=t,this.args=r,this.performType=i,this.executor=n,this.executor.taskInstance=this,this.hasEnabledEvents=o}setState(){}onStarted(){}onSuccess(){}onError(){}onCancel(){}formatCancelReason(){}selfCancelLoopWarning(){}onFinalize(e){this.executor.onFinalize(e)}proceed(e,t,r){this.executor.proceedChecked(e,t,r)}[r.yieldableSymbol](e,t){return this.executor.onYielded(e,t)}cancel(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:".cancel() was explicitly called"
-this.executor.cancel(new n.CancelRequest(n.CANCEL_KIND_EXPLICIT,e))}then(){return this.executor.promise().then(...arguments)}catch(){return this.executor.promise().catch(...arguments)}finally(){return this.executor.promise().finally(...arguments)}toString(){return`${this.task} TaskInstance`}start(){return this.executor.start(),this}}e.BaseTaskInstance=i,Object.assign(i.prototype,t.INITIAL_STATE),Object.assign(i.prototype,{state:"waiting",isDropped:!1,isRunning:!0})})),define("ember-concurrency/-private/external/task-instance/cancelation",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.didCancel=function(e){return e&&e.name===t},e.CancelRequest=e.CANCEL_KIND_PARENT_CANCEL=e.CANCEL_KIND_LIFESPAN_END=e.CANCEL_KIND_YIELDABLE_CANCEL=e.CANCEL_KIND_EXPLICIT=e.TASK_CANCELATION_NAME=void 0
-const t="TaskCancelation"
-e.TASK_CANCELATION_NAME=t
-e.CANCEL_KIND_EXPLICIT="explicit"
-e.CANCEL_KIND_YIELDABLE_CANCEL="yielded"
-e.CANCEL_KIND_LIFESPAN_END="lifespan_end"
-e.CANCEL_KIND_PARENT_CANCEL="parent_cancel"
-e.CancelRequest=class{constructor(e,t){this.kind=e,this.reason=t,this.promise=new Promise((e=>{this.finalize=e}))}}})),define("ember-concurrency/-private/external/task-instance/completion-states",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.COMPLETION_CANCEL=e.COMPLETION_ERROR=e.COMPLETION_SUCCESS=e.COMPLETION_PENDING=void 0
-e.COMPLETION_PENDING=0
-e.COMPLETION_SUCCESS=1
-e.COMPLETION_ERROR=2
-e.COMPLETION_CANCEL=3})),define("ember-concurrency/-private/external/task-instance/executor",["exports","ember-concurrency/-private/external/generator-state","ember-concurrency/-private/external/task-instance/initial-state","ember-concurrency/-private/external/yieldables","ember-concurrency/-private/external/task-instance/completion-states","ember-concurrency/-private/external/task-instance/cancelation"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.getRunningInstance=function(){return c[c.length-1]},e.TaskInstanceExecutor=e.PERFORM_TYPE_LINKED=e.PERFORM_TYPE_UNLINKED=e.PERFORM_TYPE_DEFAULT=void 0
-const s="PERFORM_TYPE_DEFAULT"
-e.PERFORM_TYPE_DEFAULT=s
-const a="PERFORM_TYPE_UNLINKED"
-e.PERFORM_TYPE_UNLINKED=a
-const l="PERFORM_TYPE_LINKED"
-e.PERFORM_TYPE_LINKED=l
-const u={}
-let c=[]
-e.TaskInstanceExecutor=class{constructor(e){let{generatorFactory:n,env:i,debug:o}=e
-this.generatorState=new t.GeneratorState(n),this.state=Object.assign({},r.INITIAL_STATE),this.index=1,this.disposers=[],this.finalizeCallbacks=[],this.env=i,this.debug=o,this.cancelRequest=null}start(){this.state.hasStarted||this.cancelRequest||(this.setState({hasStarted:!0}),this.proceedSync(n.YIELDABLE_CONTINUE,void 0),this.taskInstance.onStarted())}cancel(e){return this.requestCancel(e)?(this.state.hasStarted?this.proceedWithCancelAsync():this.finalizeWithCancel(),this.cancelRequest.promise):(e.finalize(),e.promise)}setState(e){Object.assign(this.state,e),this.taskInstance.setState(this.state)}proceedChecked(e,t,r){this.state.isFinished||this.advanceIndex(e)&&(t===n.YIELDABLE_CANCEL?(this.requestCancel(new o.CancelRequest(o.CANCEL_KIND_YIELDABLE_CANCEL),r),this.proceedWithCancelAsync()):this.proceedAsync(t,r))}proceedWithCancelAsync(){this.proceedAsync(n.YIELDABLE_RETURN,u)}proceedAsync(e,t){this.advanceIndex(this.index),this.env.async((()=>this.proceedSync(e,t)))}proceedSync(e,t){this.state.isFinished||(this.dispose(),this.generatorState.done?this.handleResolvedReturnedValue(e,t):this.handleResolvedContinueValue(e,t))}handleResolvedContinueValue(e,t){let r=this.index,n=this.generatorStep(t,e)
-this.advanceIndex(r)&&(n.errored?this.finalize(n.value,i.COMPLETION_ERROR):this.handleYieldedValue(n))}handleResolvedReturnedValue(e,t){switch(e){case n.YIELDABLE_CONTINUE:case n.YIELDABLE_RETURN:this.finalize(t,i.COMPLETION_SUCCESS)
-break
-case n.YIELDABLE_THROW:this.finalize(t,i.COMPLETION_ERROR)}}handleYieldedUnknownThenable(e){let t=this.index
-e.then((e=>{this.proceedChecked(t,n.YIELDABLE_CONTINUE,e)}),(e=>{this.proceedChecked(t,n.YIELDABLE_THROW,e)}))}advanceIndex(e){if(this.index===e)return++this.index}handleYieldedValue(e){let t=e.value
-t?(this.addDisposer(t[n.cancelableSymbol]),t[n.yieldableSymbol]?this.invokeYieldable(t):"function"==typeof t.then?this.handleYieldedUnknownThenable(t):this.proceedWithSimpleValue(t)):this.proceedWithSimpleValue(t)}proceedWithSimpleValue(e){this.proceedAsync(n.YIELDABLE_CONTINUE,e)}addDisposer(e){"function"==typeof e&&this.disposers.push(e)}dispose(){let e=this.disposers
-0!==e.length&&(this.disposers=[],e.forEach((e=>e())))}generatorStep(e,t){c.push(this)
-let r=this.generatorState.step(e,t)
-if(c.pop(),this._expectsLinkedYield){let e=r.value
-e&&e.performType===l||console.warn("You performed a .linked() task without immediately yielding/returning it. This is currently unsupported (but might be supported in future version of ember-concurrency)."),this._expectsLinkedYield=!1}return r}maybeResolveDefer(){this.defer&&this.state.isFinished&&(this.state.completionState===i.COMPLETION_SUCCESS?this.defer.resolve(this.state.value):this.defer.reject(this.state.error))}onFinalize(e){this.finalizeCallbacks.push(e),this.state.isFinished&&this.runFinalizeCallbacks()}runFinalizeCallbacks(){this.finalizeCallbacks.forEach((e=>e())),this.finalizeCallbacks=[],this.maybeResolveDefer(),this.maybeThrowUnhandledTaskErrorLater()}promise(){return this.defer||(this.defer=this.env.defer(),this.asyncErrorsHandled=!0,this.maybeResolveDefer()),this.defer.promise}maybeThrowUnhandledTaskErrorLater(){this.asyncErrorsHandled||this.state.completionState!==i.COMPLETION_ERROR||(0,o.didCancel)(this.state.error)||this.env.async((()=>{this.asyncErrorsHandled||this.env.reportUncaughtRejection(this.state.error)}))}requestCancel(e){return!this.cancelRequest&&!this.state.isFinished&&(this.cancelRequest=e,!0)}finalize(e,t){if(this.cancelRequest)return this.finalizeWithCancel()
-let r={completionState:t}
-t===i.COMPLETION_SUCCESS?(r.isSuccessful=!0,r.value=e):t===i.COMPLETION_ERROR?(r.isError=!0,r.error=e):t===i.COMPLETION_CANCEL&&(r.error=e),this.finalizeShared(r)}finalizeWithCancel(){let e=this.taskInstance.formatCancelReason(this.cancelRequest.reason),t=new Error(e)
-this.debugEnabled()&&console.log(e),t.name=o.TASK_CANCELATION_NAME,this.finalizeShared({isCanceled:!0,completionState:i.COMPLETION_CANCEL,error:t,cancelReason:e}),this.cancelRequest.finalize()}debugEnabled(){return this.debug||this.env.globalDebuggingEnabled()}finalizeShared(e){this.index++,e.isFinished=!0,this.setState(e),this.runFinalizeCallbacks(),this.dispatchFinalizeEvents(e.completionState)}dispatchFinalizeEvents(e){switch(e){case i.COMPLETION_SUCCESS:this.taskInstance.onSuccess()
-break
-case i.COMPLETION_ERROR:this.taskInstance.onError(this.state.error)
-break
-case i.COMPLETION_CANCEL:this.taskInstance.onCancel(this.state.cancelReason)}}invokeYieldable(e){try{let t=e[n.yieldableSymbol](this.taskInstance,this.index)
-this.addDisposer(t)}catch(t){this.env.reportUncaughtRejection(t)}}onYielded(e,t){this.asyncErrorsHandled=!0,this.onFinalize((()=>{let r=this.state.completionState
-r===i.COMPLETION_SUCCESS?e.proceed(t,n.YIELDABLE_CONTINUE,this.state.value):r===i.COMPLETION_ERROR?e.proceed(t,n.YIELDABLE_THROW,this.state.error):r===i.COMPLETION_CANCEL&&e.proceed(t,n.YIELDABLE_CANCEL,null)}))
-let r=this.getPerformType()
-if(r!==a)return()=>{this.detectSelfCancelLoop(r,e),this.cancel(new o.CancelRequest(o.CANCEL_KIND_PARENT_CANCEL))}}getPerformType(){return this.taskInstance.performType||s}detectSelfCancelLoop(e,t){if(e!==s)return
-let r=t.executor&&t.executor.cancelRequest
-!r||r.kind!==o.CANCEL_KIND_LIFESPAN_END||this.cancelRequest||this.state.isFinished||this.taskInstance.selfCancelLoopWarning(t)}}})),define("ember-concurrency/-private/external/task-instance/initial-state",["exports","ember-concurrency/-private/external/task-instance/completion-states"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.INITIAL_STATE=void 0
-const r={completionState:t.COMPLETION_PENDING,value:null,error:null,isSuccessful:!1,isError:!1,isCanceled:!1,hasStarted:!1,isFinished:!1}
-e.INITIAL_STATE=r})),define("ember-concurrency/-private/external/task/default-state",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.DEFAULT_STATE=void 0
-const t={last:null,lastRunning:null,lastStarted:null,lastPerformed:null,lastSuccessful:null,lastComplete:null,lastErrored:null,lastCanceled:null,lastIncomplete:null,performCount:0}
-e.DEFAULT_STATE=t,Object.freeze(t)})),define("ember-concurrency/-private/external/task/task-group",["exports","ember-concurrency/-private/external/task/taskable"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.TaskGroup=void 0
-class r extends t.Taskable{}e.TaskGroup=r})),define("ember-concurrency/-private/external/task/task",["exports","ember-concurrency/-private/external/task/taskable","ember-concurrency/-private/external/task-instance/executor"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.Task=void 0
-class n{constructor(e,t,r){this.task=e,this.performType=t,this.linkedObject=r}perform(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return this.task._performShared(t,this.performType,this.linkedObject)}}class i extends t.Taskable{constructor(e){super(e),this.perform=this._perform.bind(this)}linked(){let e=(0,r.getRunningInstance)()
-if(!e)throw new Error("You can only call .linked() from within a task.")
-return new n(this,r.PERFORM_TYPE_LINKED,e)}unlinked(){return new n(this,r.PERFORM_TYPE_UNLINKED,null)}_perform(){}}e.Task=i})),define("ember-concurrency/-private/external/task/taskable",["exports","ember-concurrency/-private/external/task/default-state","ember-concurrency/-private/external/task-instance/cancelation"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.Taskable=void 0
-let n=0
-class i{constructor(e){this.options=e,Object.assign(this,e),this.guid="ec_"+n++,this.guids={},this.guids[this.guid]=!0,this.group&&Object.assign(this.guids,this.group.guids)}cancelAll(e){let{reason:t,cancelRequestKind:n,resetState:i}=e||{}
-t=t||".cancelAll() was explicitly called on the Task"
-let o=new r.CancelRequest(n||r.CANCEL_KIND_EXPLICIT,t)
-return this.scheduler.cancelAll(this.guid,o).then((()=>{i&&this._resetState()}))}_resetState(){this.setState(t.DEFAULT_STATE)}setState(){}}e.Taskable=i,Object.assign(i.prototype,t.DEFAULT_STATE),Object.assign(i.prototype,{numRunning:0,numQueued:0,isRunning:!1,isQueued:!1,isIdle:!0,state:"idle"})})),define("ember-concurrency/-private/external/yieldables",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.animationFrame=function(){return new s},e.rawTimeout=function(e){return new a(e)},e.forever=e.Yieldable=e.YIELDABLE_CANCEL=e.YIELDABLE_RETURN=e.YIELDABLE_THROW=e.YIELDABLE_CONTINUE=e.yieldableSymbol=e.cancelableSymbol=void 0
-const t="__ec_cancel__"
-e.cancelableSymbol=t
-const r="__ec_yieldable__"
-e.yieldableSymbol=r
-const n="next"
-e.YIELDABLE_CONTINUE=n
-e.YIELDABLE_THROW="throw"
-const i="return"
-e.YIELDABLE_RETURN=i
-e.YIELDABLE_CANCEL="cancel"
-class o{constructor(){this.__ec_yieldable__=this.__ec_yieldable__.bind(this),this.__ec_cancel__=this.__ec_cancel__.bind(this)}_deferable(){let e={resolve:void 0,reject:void 0}
-return e.promise=new Promise(((t,r)=>{e.resolve=t,e.reject=r})),e}_toPromise(){let e=this._deferable(),t={proceed(t,r,o){r==n||r==i?e.resolve(o):e.reject(o)}},r=this.__ec_yieldable__(t,0)
-return e.promise.__ec_cancel__=r||this.__ec_cancel__,e.promise}then(){return this._toPromise().then(...arguments)}catch(){return this._toPromise().catch(...arguments)}finally(){return this._toPromise().finally(...arguments)}[r](){}[t](){}}e.Yieldable=o
-class s extends o{constructor(){super(),this.timerId=null}[r](e,t){this.timerId=requestAnimationFrame((()=>{e.proceed(t,n,e._result)}))}[t](){cancelAnimationFrame(this.timerId),this.timerId=null}}class a extends o{constructor(e){super(),this.ms=e,this.timerId=null}[r](e,t){this.timerId=setTimeout((()=>{e.proceed(t,n,e._result)}),this.ms)}[t](){clearTimeout(this.timerId),this.timerId=null}}const l=new class extends o{[r](){}[t](){}}
-e.forever=l})),define("ember-concurrency/-private/helpers",["exports","@ember/object","@ember/debug"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.taskHelperClosure=function(e,r,n,i){let o=n[0],s=n.slice(1)
-return function(){if(o&&"function"==typeof o[r]){for(var e=arguments.length,n=new Array(e),a=0;a<e;a++)n[a]=arguments[a]
-if(i&&i.value){let e=n.pop()
-n.push((0,t.get)(e,i.value))}return o[r](...s,...n)}}}})),define("ember-concurrency/-private/scheduler/ember-scheduler",["exports","ember-concurrency/-private/external/scheduler/scheduler","@ember/runloop"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{scheduleRefresh(){(0,r.once)(this,this.refresh)}}var i=n
-e.default=i})),define("ember-concurrency/-private/task-decorators",["exports","@ember/object","ember-concurrency/-private/task-factory","ember-concurrency/-private/utils"],(function(e,t,r,n){"use strict"
-function i(e,t,n){let i,o=arguments.length>3&&void 0!==arguments[3]?arguments[3]:[],{initializer:s,get:a,value:l}=n
-s?i=s.call(void 0):a?i=a.call(void 0):l&&(i=l),i.displayName=`${t} (task)`
-let u=new WeakMap,c=o[0]||{},d=new r.TaskFactory(t,i,c)
-return d._setupEmberKVO(e),{get(){let e=u.get(this)
-return e||(e=d.createTask(this),u.set(this,e)),e}}}function o(e,t,n){let i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:[],o=new WeakMap,s=i[0]||{},a=new r.TaskGroupFactory(t,null,s)
-return{get(){let e=o.get(this)
-return e||(e=a.createTaskGroup(this),o.set(this,e)),e}}}function s(e){let[t,r,n]=e
-return 3===e.length&&"object"==typeof t&&null!==t&&"string"==typeof r&&("object"==typeof n&&null!==n&&"enumerable"in n&&"configurable"in n||void 0===n)}function a(e){return function(){for(var t=arguments.length,r=new Array(t),n=0;n<t;n++)r[n]=arguments[n]
-return s(r)?e(...r):function(){for(var t=arguments.length,n=new Array(t),i=0;i<t;i++)n[i]=arguments[i]
-return e(...n,r)}}}function l(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return a((function(r,n,i){let[o]=arguments.length>3&&void 0!==arguments[3]?arguments[3]:[],s=Object.assign({},{...t,...o})
-return e(r,n,i,[s])}))}Object.defineProperty(e,"__esModule",{value:!0}),e.restartableTaskGroup=e.keepLatestTaskGroup=e.enqueueTaskGroup=e.dropTaskGroup=e.taskGroup=e.restartableTask=e.keepLatestTask=e.enqueueTask=e.dropTask=e.task=e.lastValue=void 0
-const u=a((function(e,r,i){let[o]=arguments.length>3&&void 0!==arguments[3]?arguments[3]:[]
-const{initializer:s}=i
-if(delete i.initializer,n.USE_TRACKED)return{get(){let e=this[o].lastSuccessful
-return e?e.value:s?s.call(this):void 0}}
-return(0,t.computed)(`${o}.lastSuccessful`,(function(){let e=(0,t.get)(this,`${o}.lastSuccessful`)
-return e?(0,t.get)(e,"value"):s?s.call(this):void 0}))(e,r,i)}))
-e.lastValue=u
-const c=l(i)
-e.task=c
-const d=l(i,{drop:!0})
-e.dropTask=d
-const h=l(i,{enqueue:!0})
-e.enqueueTask=h
-const p=l(i,{keepLatest:!0})
-e.keepLatestTask=p
-const f=l(i,{restartable:!0})
-e.restartableTask=f
-const m=l(o)
-e.taskGroup=m
-const g=l(o,{drop:!0})
-e.dropTaskGroup=g
-const v=l(o,{enqueue:!0})
-e.enqueueTaskGroup=v
-const b=l(o,{keepLatest:!0})
-e.keepLatestTaskGroup=b
-const y=l(o,{restartable:!0})
-e.restartableTaskGroup=y})),define("ember-concurrency/-private/task-factory",["exports","ember-concurrency/-private/external/scheduler/policies/unbounded-policy","ember-concurrency/-private/external/scheduler/policies/enqueued-policy","ember-concurrency/-private/external/scheduler/policies/drop-policy","ember-concurrency/-private/external/scheduler/policies/keep-latest-policy","ember-concurrency/-private/external/scheduler/policies/restartable-policy","@ember/debug","@ember/object","@ember/object/events","@ember/object/observers","@ember/runloop","ember-concurrency/-private/task","ember-concurrency/-private/task-properties","ember-concurrency/-private/task-group","ember-concurrency/-private/scheduler/ember-scheduler"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p,f){"use strict"
-function m(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.TaskGroupFactory=e.TaskFactory=void 0
-let g=0
-function v(e,t,r,n,i,o){if(r)for(let s=0;s<r.length;++s){let a=r[s],l="__ember_concurrency_handler_"+g++
-t[l]=b(n,i,o),e(t,a,null,l)}}function b(e,t,r){return function(){let n=(0,a.get)(this,e)
-r?(0,c.scheduleOnce)("actions",n,t,...arguments):n[t].apply(n,arguments)}}const y=e=>Array.isArray(e)?e:[e],_={cancelOn:(e,t)=>e.addCancelEvents(...y(t)),enqueue:e=>e.setBufferPolicy(r.default),evented:e=>e.setEvented(!0),debug:e=>e.setDebug(!0),drop:e=>e.setBufferPolicy(n.default),group:(e,t)=>e.setGroup(t),keepLatest:e=>e.setBufferPolicy(i.default),maxConcurrency:(e,t)=>e.setMaxConcurrency(t),observes:(e,t)=>e.addObserverKeys(...y(t)),on:(e,t)=>e.addPerformEvents(...y(t)),onState:(e,t)=>e.setOnState(t),restartable:e=>e.setBufferPolicy(o.default)}
-class w{constructor(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"<unknown>",r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{}
-m(this,"_cancelEventNames",[]),m(this,"_debug",null),m(this,"_eventNames",[]),m(this,"_hasUsedModifier",!1),m(this,"_hasSetBufferPolicy",!1),m(this,"_hasEnabledEvents",!1),m(this,"_maxConcurrency",null),m(this,"_observes",[]),m(this,"_onStateCallback",((e,t)=>t.setState(e))),m(this,"_schedulerPolicyClass",t.default),m(this,"_taskGroupPath",null),this.name=e,this.taskDefinition=r,this._processOptions(n)}createTask(e){let t=this._sharedTaskProperties(e)
-return"object"==typeof this.taskDefinition?new d.EncapsulatedTask(Object.assign({taskObj:this.taskDefinition},t)):new d.Task(Object.assign({generatorFactory:t=>this.taskDefinition.apply(e,t)},t))}addCancelEvents(){return this._cancelEventNames.push(...arguments),this}addObserverKeys(){return this._observes.push(...arguments),this}addPerformEvents(){return this._eventNames.push(...arguments),this}setBufferPolicy(e){return this._hasSetBufferPolicy=!0,this._hasUsedModifier=!0,this._schedulerPolicyClass=e,this}setDebug(e){return this._debug=e,this}setEvented(e){return this._hasEnabledEvents=e,this}setMaxConcurrency(e){return this._hasUsedModifier=!0,this._maxConcurrency=e,this}setGroup(e){return this._taskGroupPath=e,this}setName(e){return this.name=e,this}setOnState(e){return this._onStateCallback=e,this}setTaskDefinition(e){return this.taskDefinition=e,this}_processOptions(e){for(let t of Object.keys(e)){let r=e[t]
-_[t]?_[t].call(null,this,r):"function"==typeof h.TaskProperty.prototype[t]&&h.TaskProperty.prototype[t].call(this,r)}}_setupEmberKVO(e){v(l.addListener,e,this._eventNames,this.name,"perform",!1),v(l.addListener,e,this._cancelEventNames,this.name,"cancelAll",!1),v(u.addObserver,e,this._observes,this.name,"perform",!0)}_sharedTaskProperties(e){let t,r,n=this._onStateCallback
-if(this._taskGroupPath)t=e[this._taskGroupPath],r=t.scheduler
-else{let e=new this._schedulerPolicyClass(this._maxConcurrency)
-r=new f.default(e,n)}return{context:e,debug:this._debug,name:this.name,group:t,scheduler:r,hasEnabledEvents:this._hasEnabledEvents,onStateCallback:n}}get taskFn(){return this.taskDefinition}set taskFn(e){this.setTaskDefinition(e)}}e.TaskFactory=w
-e.TaskGroupFactory=class extends w{createTaskGroup(e){let t=this._sharedTaskProperties(e)
-return new p.TaskGroup(t)}}})),define("ember-concurrency/-private/task-group",["exports","ember-concurrency/-private/external/task/task-group","ember-concurrency/-private/taskable-mixin","ember-concurrency/-private/tracked-state"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.TaskGroup=void 0
-class i extends t.TaskGroup{}e.TaskGroup=i,n.TRACKED_INITIAL_TASK_STATE&&Object.defineProperties(i.prototype,n.TRACKED_INITIAL_TASK_STATE),Object.assign(i.prototype,r.TASKABLE_MIXIN)})),define("ember-concurrency/-private/task-instance",["exports","ember-concurrency/-private/external/task-instance/base","ember-concurrency/-private/tracked-state","ember-concurrency/-private/utils"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.TaskInstance=void 0
-class i extends t.BaseTaskInstance{setState(e){let t=this._recomputeState(e);(0,n.assignProperties)(this,{...e,isRunning:!e.isFinished,isDropped:"dropped"===t,state:t})}_recomputeState(e){return e.isDropped?"dropped":e.isCanceled?e.hasStarted?"canceled":"dropped":e.isFinished?"finished":e.hasStarted?"running":"waiting"}onStarted(){this.triggerEvent("started",this)}onSuccess(){this.triggerEvent("succeeded",this)}onError(e){this.triggerEvent("errored",this,e)}onCancel(e){this.triggerEvent("canceled",this,e)}formatCancelReason(e){return`TaskInstance '${this.getName()}' was canceled because ${e}. For more information, see: http://ember-concurrency.com/docs/task-cancelation-help`}getName(){return this.name||(this.name=this.task&&this.task.name||"<unknown>"),this.name}selfCancelLoopWarning(e){let t=`\`${e.getName()}\``,r=`\`${this.getName()}\``
-console.warn(`ember-concurrency detected a potentially hazardous "self-cancel loop" between parent task ${t} and child task ${r}. If you want child task ${r} to be canceled when parent task ${t} is canceled, please change \`.perform()\` to \`.linked().perform()\`. If you want child task ${r} to keep running after parent task ${t} is canceled, change it to \`.unlinked().perform()\``)}triggerEvent(){if(!this.hasEnabledEvents)return
-let e=this.task,t=e.context,r=e&&e.name
-if(t&&t.trigger&&r){for(var n=arguments.length,i=new Array(n),o=0;o<n;o++)i[o]=arguments[o]
-let[e,...s]=i
-t.trigger(`${r}:${e}`,...s)}}}e.TaskInstance=i,r.TRACKED_INITIAL_INSTANCE_STATE&&Object.defineProperties(i.prototype,r.TRACKED_INITIAL_INSTANCE_STATE)})),define("ember-concurrency/-private/task-properties",["exports","ember","@ember/object","@ember/object/computed","ember-concurrency/-private/external/scheduler/policies/enqueued-policy","ember-concurrency/-private/external/scheduler/policies/drop-policy","ember-concurrency/-private/external/scheduler/policies/keep-latest-policy","ember-concurrency/-private/external/scheduler/policies/restartable-policy","ember-concurrency/-private/task-decorators","ember-concurrency/-private/task-factory"],(function(e,t,r,n,i,o,s,a,l,u){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.taskComputed=m,e.task=function(e,t,r){if(d(e)||t&&r)return(0,l.task)(...arguments)
-{let t=m((function(){return t.__ec_task_factory.setTaskDefinition(t.taskFn),t.__ec_task_factory.createTask(this)}))
-return t.taskFn=e,t.__ec_task_factory=new u.TaskFactory,Object.setPrototypeOf(t,h.prototype),t}},e.taskGroup=function(e,t,r){if(d(e)||t&&r)return(0,l.taskGroup)(...arguments)
-{let e=m((function(t){return e.__ec_task_factory.setName(t),e.__ec_task_factory.createTaskGroup(this)}))
-return e.__ec_task_factory=new u.TaskGroupFactory,Object.setPrototypeOf(e,p.prototype),e}},e.TaskGroupProperty=e.TaskProperty=e.propertyModifiers=void 0
-const c={restartable(){return this.__ec_task_factory.setBufferPolicy(a.default),this},enqueue(){return this.__ec_task_factory.setBufferPolicy(i.default),this},drop(){return this.__ec_task_factory.setBufferPolicy(o.default),this},keepLatest(){return this.__ec_task_factory.setBufferPolicy(s.default),this},maxConcurrency(e){return this.__ec_task_factory.setMaxConcurrency(e),this},group(e){return this.__ec_task_factory.setGroup(e),this},evented(){return this.__ec_task_factory.setEvented(!0),this},debug(){return this.__ec_task_factory.setDebug(!0),this},onState(e){return this.__ec_task_factory.setOnState(e),this}}
-function d(e){return!!e&&("function"!=typeof e&&(("object"!=typeof e||!("perform"in e)||"function"!=typeof e.perform)&&Object.getPrototypeOf(e)===Object.prototype))}let h,p
-e.propertyModifiers=c,e.TaskProperty=h,e.TaskGroupProperty=p,e.TaskProperty=h=class{},e.TaskGroupProperty=p=class{},Object.assign(p.prototype,c),Object.assign(h.prototype,c,{setup(e,t){this.callSuperSetup&&this.callSuperSetup(...arguments),this.__ec_task_factory.setName(t),this.__ec_task_factory._setupEmberKVO(e)},on(){return this.__ec_task_factory.addPerformEvents(...arguments),this},cancelOn(){return this.__ec_task_factory.addCancelEvents(...arguments),this},observes(){return this.__ec_task_factory.addObserverKeys(...arguments),this}})
-const f=t.default._setClassicDecorator||t.default._setComputedDecorator
-function m(e){{let t=function(n,i){return void 0!==t.setup&&t.setup(n,i),(0,r.computed)(e)(...arguments)}
-return f(t),t}}})),define("ember-concurrency/-private/task",["exports","@ember/application","@ember/object","@ember/destroyable","ember-concurrency/-private/external/task/task","ember-concurrency/-private/task-instance","ember-concurrency/-private/external/task-instance/executor","ember-concurrency/-private/ember-environment","ember-concurrency/-private/taskable-mixin","ember-concurrency/-private/tracked-state","ember-concurrency/-private/external/task-instance/cancelation"],(function(e,t,r,n,i,o,s,a,l,u,c){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.EncapsulatedTask=e.Task=void 0
-class d extends i.Task{constructor(e){super(e),(0,n.isDestroying)(this.context)||(0,n.registerDestructor)(this.context,(()=>{this.cancelAll({reason:"the object it lives on was destroyed or unrendered",cancelRequestKind:c.CANCEL_KIND_LIFESPAN_END})}))}_perform(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return this._performShared(t,s.PERFORM_TYPE_DEFAULT,null)}_performShared(e,t,r){let i=this._curryArgs?[...this._curryArgs,...e]:e,o=this._taskInstanceFactory(i,t,r)
-return t===s.PERFORM_TYPE_LINKED&&(r._expectsLinkedYield=!0),(0,n.isDestroying)(this.context)&&o.cancel(),this.scheduler.perform(o),o}_taskInstanceFactory(e,t){return new o.TaskInstance({task:this,args:e,executor:new s.TaskInstanceExecutor({generatorFactory:()=>this.generatorFactory(e),env:a.EMBER_ENVIRONMENT,debug:this.debug}),performType:t,hasEnabledEvents:this.hasEnabledEvents})}_curry(){let e=this._clone()
-for(var t=arguments.length,r=new Array(t),n=0;n<t;n++)r[n]=arguments[n]
-return e._curryArgs=[...this._curryArgs||[],...r],e}_clone(){return new d(this.options)}toString(){return`<Task:${this.name}>`}}e.Task=d,u.TRACKED_INITIAL_TASK_STATE&&Object.defineProperties(d.prototype,u.TRACKED_INITIAL_TASK_STATE),Object.assign(d.prototype,l.TASKABLE_MIXIN)
-e.EncapsulatedTask=class extends d{constructor(e){super(e),this.taskObj=e.taskObj,this._encapsulatedTaskStates=new WeakMap,this._encapsulatedTaskInstanceProxies=new WeakMap}_taskInstanceFactory(e,n){let i=(0,t.getOwner)(this.context),l=r.default.extend(this.taskObj).create({context:this.context});(0,t.setOwner)(l,i)
-let u=new o.TaskInstance({task:this,args:e,executor:new s.TaskInstanceExecutor({generatorFactory:()=>l.perform.apply(l,e),env:a.EMBER_ENVIRONMENT,debug:this.debug}),performType:n,hasEnabledEvents:this.hasEnabledEvents})
-return this._encapsulatedTaskStates.set(u,l),this._wrappedEncapsulatedTaskInstance(u)}_wrappedEncapsulatedTaskInstance(e){if(!e)return null
-let t=this._encapsulatedTaskInstanceProxies,n=t.get(e)
-if(!n){let i=this._encapsulatedTaskStates.get(e)
-n=new Proxy(e,{get:(e,t)=>t in e?e[t]:(0,r.get)(i,t.toString()),has:(e,t)=>t in e||t in i,ownKeys:e=>Reflect.ownKeys(e).concat(Reflect.ownKeys(i)),defineProperty(r,n,o){let s=t.get(e)
-return s&&(o.get?o.get=o.get.bind(s):s&&o.set&&(o.set=o.set.bind(s))),n in r?Reflect.defineProperty(r,n,o):Reflect.defineProperty(i,n,o)},getOwnPropertyDescriptor:(e,t)=>t in e?Reflect.getOwnPropertyDescriptor(e,t):Reflect.getOwnPropertyDescriptor(i,t)}),t.set(e,n)}return n}}})),define("ember-concurrency/-private/taskable-mixin",["exports","ember-concurrency/-private/utils"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.TASKABLE_MIXIN=void 0
-const r={_performCount:0,setState(e){this._performCount=this._performCount+(e.numPerformedInc||0)
-let r=e.numRunning>0,n=e.numQueued>0,i=Object.assign({},e,{performCount:this._performCount,isRunning:r,isQueued:n,isIdle:!r&&!n,state:r?"running":"idle"});(0,t.assignProperties)(this,i)},onState(e,t){t.onStateCallback&&t.onStateCallback(e,t)}}
-e.TASKABLE_MIXIN=r})),define("ember-concurrency/-private/tracked-state",["exports","@glimmer/tracking","ember-concurrency/-private/external/task/default-state","ember-concurrency/-private/external/task-instance/initial-state","ember-concurrency/-private/utils"],(function(e,t,r,n,i){"use strict"
-function o(e,r){return Object.keys(e).reduce(((r,n)=>function(e,r,n){const i=Object.getOwnPropertyDescriptor(e,n)
-i.initializer=i.initializer||(()=>e[n]),delete i.value
-const o=(0,t.tracked)(r,n,i)
-return r[n]=o,r}(e,r,n)),r)}let s,a
-Object.defineProperty(e,"__esModule",{value:!0}),e.TRACKED_INITIAL_INSTANCE_STATE=e.TRACKED_INITIAL_TASK_STATE=void 0,e.TRACKED_INITIAL_TASK_STATE=s,e.TRACKED_INITIAL_INSTANCE_STATE=a,i.USE_TRACKED&&(e.TRACKED_INITIAL_TASK_STATE=s=o(r.DEFAULT_STATE,{}),e.TRACKED_INITIAL_TASK_STATE=s=o({numRunning:0,numQueued:0,isRunning:!1,isQueued:!1,isIdle:!0,state:"idle"},s),e.TRACKED_INITIAL_INSTANCE_STATE=a=o(n.INITIAL_STATE,{}),e.TRACKED_INITIAL_INSTANCE_STATE=a=o({state:"waiting",isDropped:!1,isRunning:!1},a),Object.freeze(s),Object.freeze(a))})),define("ember-concurrency/-private/utils",["exports","@ember/object","@ember/runloop","ember-concurrency/-private/ember-environment","ember-concurrency/-private/external/yieldables"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.isEventedObject=function(e){return e&&("function"==typeof e.one&&"function"==typeof e.off||"function"==typeof e.on&&"function"==typeof e.off||"function"==typeof e.addEventListener&&"function"==typeof e.removeEventListener)},e.timeout=function(e){return new a(e)},e.deprecatePrivateModule=function(e){console.warn(`an Ember addon is importing a private ember-concurrency module '${e}' that has moved`)},e.EmberYieldable=e.assignProperties=e.USE_TRACKED=void 0
-e.USE_TRACKED=true
-const o=Object.assign
-e.assignProperties=o
-class s extends i.Yieldable{_deferable(){return n.EMBER_ENVIRONMENT.defer()}}e.EmberYieldable=s
-class a extends s{constructor(e){super(),this.ms=e,this.timerId=null}[i.yieldableSymbol](e,t){this.timerId=(0,r.later)((()=>{e.proceed(t,i.YIELDABLE_CONTINUE,e._result)}),this.ms)}[i.cancelableSymbol](){(0,r.cancel)(this.timerId),this.timerId=null}}})),define("ember-concurrency/-private/wait-for",["exports","@ember/debug","@ember/runloop","@ember/object","@ember/object/observers","ember-concurrency/-private/external/yieldables","ember-concurrency/-private/utils"],(function(e,t,r,n,i,o,s){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.waitForQueue=function(e){return new a(e)},e.waitForEvent=function(e,t){return new l(e,t)},e.waitForProperty=function(e,t,r){return new u(e,t,r)}
-class a extends s.EmberYieldable{constructor(e){super(),this.queueName=e,this.timerId=null}[o.yieldableSymbol](e,t){try{this.timerId=(0,r.schedule)(this.queueName,(()=>{e.proceed(t,o.YIELDABLE_CONTINUE,null)}))}catch(n){e.proceed(t,o.YIELDABLE_THROW,n)}}[o.cancelableSymbol](){(0,r.cancel)(this.timerId),this.timerId=null}}class l extends s.EmberYieldable{constructor(e,t){super(),this.object=e,this.eventName=t,this.fn=null,this.didFinish=!1,this.usesDOMEvents=!1,this.requiresCleanup=!1}[o.yieldableSymbol](e,t){this.fn=r=>{this.didFinish=!0,this[o.cancelableSymbol](),e.proceed(t,o.YIELDABLE_CONTINUE,r)},"function"==typeof this.object.addEventListener?(this.usesDOMEvents=!0,this.object.addEventListener(this.eventName,this.fn)):"function"==typeof this.object.one?this.object.one(this.eventName,this.fn):(this.requiresCleanup=!0,this.object.on(this.eventName,this.fn))}[o.cancelableSymbol](){this.fn&&(this.usesDOMEvents?this.object.removeEventListener(this.eventName,this.fn):this.didFinish&&!this.requiresCleanup||this.object.off(this.eventName,this.fn),this.fn=null)}}class u extends s.EmberYieldable{constructor(e,t){let r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:Boolean
-super(),this.object=e,this.key=t,this.predicateCallback="function"==typeof r?r:e=>e===r,this.observerBound=!1}[o.yieldableSymbol](e,t){this.observerFn=()=>{let r=(0,n.get)(this.object,this.key)
-if(this.predicateCallback(r))return e.proceed(t,o.YIELDABLE_CONTINUE,r),!0},this.observerFn()||((0,i.addObserver)(this.object,this.key,null,this.observerFn),this.observerBound=!0)}[o.cancelableSymbol](){this.observerBound&&this.observerFn&&((0,i.removeObserver)(this.object,this.key,null,this.observerFn),this.observerFn=null)}}}))
-define("ember-concurrency/-task-instance",["exports","ember-concurrency/-private/task-instance","ember-concurrency/-private/utils"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,(0,r.deprecatePrivateModule)("ember-concurrency/-task-instance")
-var n=t.TaskInstance
-e.default=n})),define("ember-concurrency/-task-property",["exports","ember-concurrency/-private/task","ember-concurrency/-private/task-properties","ember-concurrency/-private/utils"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"Task",{enumerable:!0,get:function(){return t.Task}}),Object.defineProperty(e,"TaskProperty",{enumerable:!0,get:function(){return r.TaskProperty}}),(0,n.deprecatePrivateModule)("ember-concurrency/-task-property")})),define("ember-concurrency/helpers/cancel-all",["exports","@ember/component/helper","@ember/debug","ember-concurrency/-private/helpers"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.cancelHelper=i,e.default=void 0
-function i(e){let t=e[0]
-return!t||t.cancelAll,(0,n.taskHelperClosure)("cancel-all","cancelAll",[t,{reason:"the 'cancel-all' template helper was invoked"}])}var o=(0,t.helper)(i)
-e.default=o})),define("ember-concurrency/helpers/perform",["exports","@ember/component/helper","ember-concurrency/-private/helpers"],(function(e,t,r){"use strict"
-function n(e,t){return(0,r.taskHelperClosure)("perform","perform",e,t)}Object.defineProperty(e,"__esModule",{value:!0}),e.performHelper=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-concurrency/helpers/task",["exports","@ember/component/helper"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.helper)((function(e){let[t,...r]=e
-return t._curry(...r)}))
-e.default=r})),define("ember-concurrency/index",["exports","ember-concurrency/-private/utils","ember-concurrency/-private/task-properties","ember-concurrency/-private/task-instance","ember-concurrency/-private/cancelable-promise-helpers","ember-concurrency/-private/wait-for","ember-concurrency/-private/external/task-instance/cancelation","ember-concurrency/-private/external/yieldables","ember-concurrency/-private/task","ember-concurrency/-private/task-group","ember-concurrency/-private/task-decorators"],(function(e,t,r,n,i,o,s,a,l,u,c){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"timeout",{enumerable:!0,get:function(){return t.timeout}}),Object.defineProperty(e,"TaskProperty",{enumerable:!0,get:function(){return r.TaskProperty}}),Object.defineProperty(e,"TaskGroupProperty",{enumerable:!0,get:function(){return r.TaskGroupProperty}}),Object.defineProperty(e,"task",{enumerable:!0,get:function(){return r.task}}),Object.defineProperty(e,"taskGroup",{enumerable:!0,get:function(){return r.taskGroup}}),Object.defineProperty(e,"TaskInstance",{enumerable:!0,get:function(){return n.TaskInstance}}),Object.defineProperty(e,"all",{enumerable:!0,get:function(){return i.all}}),Object.defineProperty(e,"allSettled",{enumerable:!0,get:function(){return i.allSettled}}),Object.defineProperty(e,"hash",{enumerable:!0,get:function(){return i.hash}}),Object.defineProperty(e,"hashSettled",{enumerable:!0,get:function(){return i.hashSettled}}),Object.defineProperty(e,"race",{enumerable:!0,get:function(){return i.race}}),Object.defineProperty(e,"waitForQueue",{enumerable:!0,get:function(){return o.waitForQueue}}),Object.defineProperty(e,"waitForEvent",{enumerable:!0,get:function(){return o.waitForEvent}}),Object.defineProperty(e,"waitForProperty",{enumerable:!0,get:function(){return o.waitForProperty}}),Object.defineProperty(e,"didCancel",{enumerable:!0,get:function(){return s.didCancel}}),Object.defineProperty(e,"animationFrame",{enumerable:!0,get:function(){return a.animationFrame}}),Object.defineProperty(e,"forever",{enumerable:!0,get:function(){return a.forever}}),Object.defineProperty(e,"rawTimeout",{enumerable:!0,get:function(){return a.rawTimeout}}),Object.defineProperty(e,"Task",{enumerable:!0,get:function(){return l.Task}}),Object.defineProperty(e,"TaskGroup",{enumerable:!0,get:function(){return u.TaskGroup}}),Object.defineProperty(e,"dropTask",{enumerable:!0,get:function(){return c.dropTask}}),Object.defineProperty(e,"dropTaskGroup",{enumerable:!0,get:function(){return c.dropTaskGroup}}),Object.defineProperty(e,"enqueueTask",{enumerable:!0,get:function(){return c.enqueueTask}}),Object.defineProperty(e,"enqueueTaskGroup",{enumerable:!0,get:function(){return c.enqueueTaskGroup}}),Object.defineProperty(e,"lastValue",{enumerable:!0,get:function(){return c.lastValue}}),Object.defineProperty(e,"keepLatestTask",{enumerable:!0,get:function(){return c.keepLatestTask}}),Object.defineProperty(e,"keepLatestTaskGroup",{enumerable:!0,get:function(){return c.keepLatestTaskGroup}}),Object.defineProperty(e,"restartableTask",{enumerable:!0,get:function(){return c.restartableTask}}),Object.defineProperty(e,"restartableTaskGroup",{enumerable:!0,get:function(){return c.restartableTaskGroup}})})),define("ember-copy/copy",["exports","@ember/debug","@ember/object","ember-copy/copyable"],(function(e,t,r,n){"use strict"
-function i(e,t,r,o){if("object"!=typeof e||null===e)return e
-let s,a
-if(t&&(a=r.indexOf(e))>=0)return o[a]
-if(t&&r.push(e),Array.isArray(e)){if(s=e.slice(),t)for(o.push(s),a=s.length;--a>=0;)s[a]=i(s[a],t,r,o)}else if(n.default.detect(e))s=e.copy(t,r,o),t&&o.push(s)
-else if(e instanceof Date)s=new Date(e.getTime()),t&&o.push(s)
-else{let n
-for(n in s={},t&&o.push(s),e)Object.prototype.hasOwnProperty.call(e,n)&&"__"!==n.substring(0,2)&&(s[n]=t?i(e[n],t,r,o):e[n])}return s}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){if("object"!=typeof e||null===e)return e
-if(!Array.isArray(e)&&n.default.detect(e))return e.copy(t)
-return i(e,t,t?[]:null,t?[]:null)}})),define("ember-copy/copyable",["exports","@ember/object/mixin"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.create({copy:null})
-e.default=r})),define("ember-copy/index",["exports","ember-copy/copy","ember-copy/copyable"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"copy",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"Copyable",{enumerable:!0,get:function(){return r.default}})})),define("ember-data-model-fragments/array/fragment",["exports","@ember/debug","@ember/utils","@ember/object","ember-data-model-fragments/array/stateful","ember-data-model-fragments/fragment","ember-data-model-fragments/util/instance-of-type"],(function(e,t,r,n,i,o,s){"use strict"
-function a(e,t,r,i){let s,a=(0,n.get)(e,"owner"),l=(0,n.get)(a,"store"),u=(0,n.get)(e,"type"),c=(0,n.get)(e,"options"),d=(0,n.get)(e,"name")
-return r.map(((r,h)=>{(0,n.get)(e,"type")
-if((0,o.isFragment)(r)){s=r
-let e=(0,o.internalModelFor)(s)._recordData.getOwner()
-e||(0,o.setFragmentOwner)(s,a,d)}else s=t[h],s?i?(0,o.setFragmentData)(s,r):(0,n.setProperties)(s,r):s=(0,o.createFragment)(l,u,a,d,c,r)
-return s}))}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=i.default.extend({type:null,options:null,_normalizeData(e){return a(this,this.content,e,!0)},_createSnapshot(){return this.map((e=>e._createSnapshot()))},_flushChangedAttributes(){this.map((e=>{e._flushChangedAttributes()}))},_didCommit(e){this._super(...arguments),this.forEach(((t,r)=>{t._didCommit(e&&e[r])}))},_adapterDidError(e){this._super(...arguments),this.forEach((t=>{t._adapterDidError(e)}))},hasDirtyAttributes:(0,n.computed)("@each.hasDirtyAttributes","_originalState",(function(){return this._super(...arguments)||this.isAny("hasDirtyAttributes")})),rollbackAttributes(){this._super(...arguments),this.invoke("rollbackAttributes")},serialize(){return this.invoke("serialize")},replaceContent(e,t,r){let n=this.content,i=a(this,n.slice(e,e+t),r)
-return n.replace(e,t,i)},addFragment(e){return this.addObject(e)},removeFragment(e){return this.removeObject(e)},createFragment(e){let t=this.owner,r=(0,n.get)(t,"store"),i=this.type,o=r.createFragment(i,e)
-return this.pushObject(o)},willDestroy(){this._super(...arguments),this.forEach((e=>{e.destroy()})),this._originalState.forEach((e=>{e.destroy()}))}})
-var u=l
-e.default=u})),define("ember-data-model-fragments/array/stateful",["exports","@ember/utils","@ember/array/proxy","@ember/array","ember-copy","@ember/object","ember-data-model-fragments/states"],(function(e,t,r,n,i,o,s){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const a=r.default.extend(i.Copyable,{owner:null,name:null,init(){this._super(...arguments),this._pendingData=void 0,(0,o.set)(this,"_originalState",[])},content:(0,o.computed)((function(){return(0,n.A)()})),copy(){return this.map(i.copy)},setupData(e){if(this._pendingData===e)return
-this._pendingData=e
-let t=this._normalizeData((0,n.makeArray)(e)),r=(0,o.get)(this,"content");(0,o.set)(this,"_originalState",t),r.replace(0,(0,o.get)(r,"length"),t),this._pendingData=void 0},_normalizeData:e=>e,_createSnapshot(){return this.toArray()},_flushChangedAttributes(){},_didCommit(e){e?this.setupData(e):(0,o.set)(this,"_originalState",this.toArray())},_adapterDidError(){},hasDirtyAttributes:(0,o.computed)("[]","_originalState",(function(){return 0!==(0,t.compare)(this.toArray(),(0,o.get)(this,"_originalState"))})),rollbackAttributes(){this.setObjects((0,o.get)(this,"_originalState"))},serialize(){return this.toArray()},arrayContentDidChange(){this._super(...arguments)
-let e=(0,o.get)(this,"owner"),t=(0,o.get)(this,"name")
-e._internalModel._recordData.isStateInitializing()||((0,o.get)(this,"hasDirtyAttributes")?(0,s.fragmentDidDirty)(e,t,this):(0,s.fragmentDidReset)(e,t))},toStringExtension(){return`owner(${(0,o.get)(this,"owner.id")})`}})
-var l=a
-e.default=l})),define("ember-data-model-fragments/attributes",["exports","@ember/debug","@ember/object","ember-data-model-fragments/fragment"],(function(e,t,r,n){"use strict"
-function i(e,t,r){let n=`-mf-${e}`
-if(t&&(n+=`$${t}`),r&&r.polymorphic){let e=r.typeKey||"type"
-e="function"==typeof e?"__dynamic__":e,n+=`$${e}`}return n}function o(e,t,i){let o=arguments.length>3&&void 0!==arguments[3]&&arguments[3],s=arguments.length>4&&void 0!==arguments[4]&&arguments[4],a={type:e,isAttribute:!0,isFragment:!0,options:t=t||{}}
-return(0,r.computed)({get(e){let r,a=(0,n.internalModelFor)(this)
-return r=o?a._recordData.getFragmentArray(e,t,i,this,s):a._recordData.getFragment(e,t,i,this),r},set(e,r){let a,l=(0,n.internalModelFor)(this)
-return o?(a=l._recordData.getFragmentArray(e,t,i,this,s),a=l._recordData.setFragmentArrayValue(e,a,r,this,i,t,s)):(a=l._recordData.getFragment(e,t,i,this),a=l._recordData.setFragmentValue(e,a,r,this,i,t)),l._recordData.fragments[e]=a}}).meta(a)}function s(e,t,r,n){return o(e,t,r,!0,n)}Object.defineProperty(e,"__esModule",{value:!0}),e.fragment=function(e,t){return o(i("fragment",e,t=t||{}),t,e)},e.fragmentArray=function(e,t){return t||(t={}),s(i("fragment-array",e,t),t,e,!0)},e.array=function(e,t){"object"==typeof e?(t=e,e=void 0):t||(t={})
-return s(i("array",e),t,null,!1)},e.fragmentOwner=function(){return(0,r.computed)((function(){return(0,n.internalModelFor)(this)._recordData._owner})).meta({isFragmentOwner:!0}).readOnly()}})),define("ember-data-model-fragments/ext",["exports","@ember/debug","@ember-data/store","@ember-data/model","ember-data/-private","@ember-data/serializer/json","ember-data-model-fragments/states","ember-data-model-fragments/record-data","ember-data-model-fragments/fragment","@ember/utils","@ember/object","@ember/application"],(function(e,t,r,n,i,o,s,a,l,u,c,d){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"Store",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"Model",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"JSONSerializer",{enumerable:!0,get:function(){return o.default}})
-const h=i.InternalModel.prototype,p=i.RecordData.prototype
-Object.assign(p,{eachFragmentKey(e){Object.keys(this.fragments).forEach(e)},eachFragmentKeyValue(e){this.eachFragmentKey((t=>{const r=this.getFragment(t)
-r&&e(t,r)}))},getOwner(){return this._owner},setOwner(e){this._owner=e},setName(e){this._name=e},getName(){return this._name},getFragment(e){return this.fragments[e]},didCommit(e){this._attributes&&(this._inFlightAttributes?Object.assign(this._inFlightAttributes,this._attributes):this._inFlightAttributes=this._attributes,this._attributes=null),this._isNew=!1,e?(e.relationships&&this._setupRelationships(e),e.id&&(this.storeWrapper.setRecordId(this.modelName,e.id,this.clientId),this.id=(0,i.coerceId)(e.id)),e=e.attributes,this.eachFragmentKeyValue(((t,r)=>r._didCommit(e[t])))):this.eachFragmentKeyValue(((e,t)=>t._didCommit()))
-const t=this._changedKeys(e)
-return Object.assign(this._data,this._inFlightAttributes,e),this._inFlightAttributes=null,this._updateChangedAttributes(),t}}),r.default.reopen({createRecordDataFor(e,t,r,n){let i
-return i=this.identifierCache.getOrCreateRecordIdentifier({type:e,id:t,lid:r}),new a.default(i,n)},createFragment(e,t){let r
-{const t=this.identifierCache.createIdentifierForNewRecord({type:e})
-r=this._internalModelForResource(t)}r.currentState=s.default.empty,r._recordData._name=null,r._recordData._owner=null,r.send("loadedData")
-let n=r.getRecord()
-return t&&n.setProperties(t),n.trigger("ready"),n._isFragment=!0,n},isFragment(e){if("application"===e||"-default"===e)return!1
-let t=this.modelFor(e)
-return l.default.detect(t)},serializerFor(e){let t=(0,d.getOwner)(this),r=(0,i.normalizeModelName)(e)
-return this.isFragment(r)?function(e,t){let r=e.lookup(`serializer:${t}`)
-return void 0!==r||(r=e.lookup("serializer:-fragment"),void 0!==r||(r=e.lookup("serializer:-default"))),r}(t,r):this._super(...arguments)}}),n.default.reopen({willDestroy(){this._super(...arguments),(0,l.internalModelFor)(this)._recordData.resetFragments()}}),n.default.reopenClass({fields:(0,c.computed)((function(){let e=new Map
-return this.eachComputedProperty(((t,r)=>{r.isFragment?e.set(t,"fragment"):r.isRelationship?e.set(t,r.kind):r.isAttribute&&e.set(t,"attribute")})),e})).readOnly()}),function(e,t,r){let n=e[t]
-e[t]=function(){let e=n.apply(this,arguments)
-return r.call(this,e,arguments)}}(h,"createSnapshot",(function(e){let t=e._attributes
-return Object.keys(t).forEach((e=>{let r=t[e]
-r&&"function"==typeof r._createSnapshot&&(t[e]=r._createSnapshot())})),e})),o.default.reopen({transformFor(e){if(0!==e.indexOf("-mf-"))return this._super(...arguments)
-const t=(0,d.getOwner)(this),r=`transform:${e}`
-if(!t.hasRegistration(r)){const n=e.match(/^-mf-(fragment|fragment-array|array)(?:\$([^$]+))?(?:\$(.+))?$/),i=n[1],o=n[2],s=n[3]
-let a=t.factoryFor(`transform:${i}`)
-a=a&&a.class,a=a.extend({type:o,polymorphicTypeProp:s,store:this.store}),t.register(r,a)}return t.lookup(r)},applyTransforms(e,t){let r=(0,c.get)(e,"attributes")
-return e.eachTransformedAttribute(((e,n)=>{if(void 0===t[e])return
-let i=this.transformFor(n),o=r.get(e)
-t[e]=i.deserialize(t[e],o.options,t)})),t}})})),define("ember-data-model-fragments/fragment",["exports","@ember/debug","ember-copy","@ember/object","ember","ember-data-model-fragments/ext"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.getActualFragmentType=s,e.internalModelFor=a,e.setFragmentOwner=l,e.setFragmentData=u,e.createFragment=function(e,t,r,n,i,o){let a=s(t,i,o,r),c=e.createFragment(a)
-return l(c,r,n),u(c,o),c},e.isFragment=function(e){return e&&e._isFragment},e.default=void 0
-function s(e,t,r,n){if(!t.polymorphic||!r)return e
-let i=t.typeKey||"type"
-return("function"==typeof i?i(r,n):r[i])||e}function a(e){return e._internalModel}function l(e,t,r){let i=a(e)
-return i._recordData._owner=t,i._recordData._name=r,(0,n.get)(e.constructor,"fragmentOwnerProperties").forEach((t=>{e.notifyPropertyChange(t)})),e}function u(e,t){a(e).setupData({attributes:t})}var c=o.Model.extend(i.default.Comparable,r.Copyable,{compare:(e,t)=>e===t?0:1,copy(){let e=this.constructor,t=Object.create(null)
-e.eachAttribute((e=>{t[e]=(0,r.copy)((0,n.get)(this,e))}))
-let i=e.modelName||this._internalModel.modelName
-return this.store.createFragment(i,t)},_flushChangedAttributes(){a(this)._recordData.willCommit()},_didCommit(e){a(this).adapterDidCommit({attributes:e||Object.create(null)})},_adapterDidError(){a(this)._recordData.commitWasRejected()},toStringExtension(){let e=a(this),t=e&&e._recordData._owner
-if(t){return`owner(${(0,n.get)(t,"id")})`}return""}}).reopenClass({fragmentOwnerProperties:(0,n.computed)((function(){let e=[]
-return this.eachComputedProperty(((t,r)=>{r.isFragmentOwner&&e.push(t)})),e})).readOnly()})
-e.default=c})),define("ember-data-model-fragments/index",["exports","ember","ember-data-model-fragments/version","ember-data-model-fragments/fragment","ember-data-model-fragments/array/fragment","ember-data-model-fragments/transforms/fragment","ember-data-model-fragments/transforms/fragment-array","ember-data-model-fragments/transforms/array","ember-data-model-fragments/attributes"],(function(e,t,r,n,i,o,s,a,l){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=t.default.Namespace.create({VERSION:r.default,Fragment:n.default,FragmentArray:i.default,FragmentTransform:o.default,FragmentArrayTransform:s.default,ArrayTransform:a.default,fragment:l.fragment,fragmentArray:l.fragmentArray,array:l.array,fragmentOwner:l.fragmentOwner})
-t.default.libraries&&t.default.libraries.register("Model Fragments",u.VERSION)
-var c=u
-e.default=c})),define("ember-data-model-fragments/record-data",["exports","ember-data/-private","@ember/debug","@ember/utils","@ember/object","ember-copy","ember-data-model-fragments/util/instance-of-type","@ember/array","ember-data-model-fragments/states","ember-data-model-fragments/array/stateful","ember-data-model-fragments/array/fragment","ember-data-model-fragments/fragment"],(function(e,t,r,n,i,o,s,a,l,u,c,d){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.fragmentRecordDatas=e.default=void 0
-let h=new WeakMap
-e.fragmentRecordDatas=h
-class p extends t.RecordData{constructor(e,t){super(e,t),this._record=null,this.fragmentData=Object.create(null),this.serverFragments=Object.create(null),this.inFlightFragments=Object.create(null),this.fragments=Object.create(null),this.fragmentDefs=Object.create(null)
-let r=t.attributesDefinitionFor(e.type,e.id,e.lid)
-Object.keys(r).forEach((e=>{r[e].isFragment&&(this.fragmentDefs[e]=r[e])})),h.set(e,this)}getFragmentDataWithDefault(e,t,r){let n=this.fragmentData[e]
-return void 0!==n?n:function(e,t){let r
-if("function"==typeof e.defaultValue)return e.defaultValue()
-if("defaultValue"in e)r=e.defaultValue
-else{if("array"!==t)return null
-r=[]}return(0,o.copy)(r,!0)}(t,r)}setupFragment(e,t,r,n){this._record=n
-let i=this.getFragmentDataWithDefault(e,t,"object"),o=this.fragments[e]
-return i?(o||(o=(0,d.createFragment)(n.store,r,n,e,t,i),this.serverFragments[e]=o),o):(this.serverFragments[e]=i,i)}getFragment(e,t,r,n){this._record=n
-let i=this.getFragmentWithoutCreating(e)
-return void 0===i?this.setupFragment(e,t,r,n):i}setFragmentArrayValue(e,t,r,n,o,s,d){return this._record=n,(0,a.isArray)(r)?(t||(t=d?c.default.create({type:o,options:s,name:e,owner:n}):u.default.create({options:s,name:e,owner:n})),t.setObjects(r)):null===r&&(t=null,this.fragments[e]=null),n._internalModel._recordData.isStateInitializing()||(this.serverFragments[e]!==t||t&&(0,i.get)(t,"hasDirtyAttributes")?(0,l.fragmentDidDirty)(n,e,t):(0,l.fragmentDidReset)(n,e)),t}setFragmentValue(e,t,r,n,o,s){this._record=n
-let a=n.store
-const u=!t||(0,d.getActualFragmentType)(o,s,r,n)!==t.constructor.modelName
-if(r)if((0,d.isFragment)(r))t=(0,d.setFragmentOwner)(r,n,e)
-else{if(!u)return(0,i.setProperties)(t,r),t
-t=(0,d.createFragment)(a,o,n,e,s,r)}else t=null
-return n._internalModel._recordData.isStateInitializing()||(this.serverFragments[e]!==t?(this.fragments[e]=t,(0,l.fragmentDidDirty)(n,e,t)):(0,l.fragmentDidReset)(n,e)),t}getFragmentArray(e,t,r,n,i){this._record=n
-let o=this.getFragmentDataWithDefault(e,t,"array"),s=this.getFragmentWithoutCreating(e)
-return void 0===s?(s=this.setupFragmentArray(e,n,o,r,t,i),s):s}setupFragmentArray(e,t,r,n,i,o){let s
-return this._record=t,null!==r?(s=o?c.default.create({type:n,options:i,name:e,owner:t}):u.default.create({options:i,name:e,owner:t}),s.setupData(r)):s=null,this.serverFragments[e]=s,s}getFragmentWithoutCreating(e){return void 0!==this.fragments[e]?this.fragments[e]:void 0!==this.inFlightFragments[e]?this.inFlightFragments[e]:void 0!==this.serverFragments[e]?this.serverFragments[e]:void 0}isStillInitializing(e){return!this.getFragmentWithoutCreating(e)||this.isStateInitializing()}isStateInitializing(){return!1}setupFragmentData(e,t){let r=[]
-return e.attributes&&Object.keys(this.fragmentDefs).forEach((n=>{if(t&&void 0!==this.getFragmentWithoutCreating(n)&&r.push(n),n in e.attributes){this.fragmentData[n]=e.attributes[n]
-let r=this.serverFragments[n]
-if(r){let i=[]
-null===e.attributes[n]?delete this.serverFragments[n]:r instanceof u.default?r.setupData(e.attributes[n]):i=r._internalModel._recordData.pushData({attributes:e.attributes[n]},t),t&&i.forEach((e=>r.notifyPropertyChange(e)))}else null===r&&delete this.serverFragments[n]}})),r}pushData(e,t){let r=e,n={}
-r.attributes&&Object.keys(this.fragmentDefs).forEach((e=>{e in r.attributes&&(n[e]=r.attributes[e],delete r.attributes[e])}))
-let i=this.setupFragmentData({attributes:n},t),o=super.pushData(r,t)
-return r.attributes&&Object.assign(r.attributes,n),i.concat(o)}willCommit(){let e,t
-for(e in this.fragments)t=this.fragments[e],t&&(t.content?t.content.forEach((e=>{e._internalModel&&e._internalModel._recordData.willCommit()})):t._internalModel._recordData.willCommit()),delete this.fragments[e],this.inFlightFragments[e]=t
-super.willCommit()}hasChangedAttributes(){return super.hasChangedAttributes()||Object.keys(this.fragmentDefs).some((e=>{const t=this.getFragmentWithoutCreating(e)
-return t&&t.hasDirtyAttributes}))}resetRecord(){super.resetRecord(),this.resetFragments()}resetFragments(){let e,t
-for(e in this.fragments)t=this.fragments[e],t&&(t.destroy(),delete this.fragments[e])
-for(e in this.inFlightFragments)t=this.inFlightFragments[e],t&&(t.destroy(),delete this.inFlightFragments[e])
-for(e in this.serverFragments)t=this.serverFragments[e],t&&(t.destroy(),delete this.serverFragments[e])}changedAttributes(){let e=super.changedAttributes()
-for(let t of Object.keys(this.fragmentDefs)){let r
-if(void 0!==this.inFlightFragments[t]&&(r=this.inFlightFragments[t]),void 0!==this.fragments[t]&&(r=this.fragments[t]),void 0!==r)e[t]=[this.serverFragments[t],this.fragments[t]]
-else{let r,n=this.serverFragments[t]
-n&&n instanceof u.default?r=(0,i.get)(n,"hasDirtyAttributes"):n&&(r=n._internalModel._recordData.hasChangedAttributes()),r&&(e[t]=[n,n])}}return e}rollbackAttributes(){let e=[]
-for(let t in this.fragments)e.push(t),delete this.fragments[t]
-return Object.keys(this.fragmentDefs).forEach((t=>{let r=this.getFragmentWithoutCreating(t)
-r&&(r.rollbackAttributes(),e.push(t))})),e.concat(super.rollbackAttributes())}didCommit(e){let t,r
-r=e&&e.attributes?e.attributes:Object.create(null)
-for(let n in this.inFlightFragments)t=this.inFlightFragments[n],delete this.inFlightFragments[n],this.serverFragments[n]=t
-return Object.keys(this.fragmentDefs).forEach((e=>{if(t=this.serverFragments[e],!t&&r[e]&&this._record){let n=this.fragmentDefs[e],i=n.type.split("$")[1]
-t=n.type.includes("-array")?this.setupFragmentArray(e,this._record,r[e],i,n.options,n.type.includes("fragment-array")):(0,d.createFragment)(this._record.store,n.type.split("$")[1],this._record,e,n.options,r[e]),this._record[e]=t}t&&t._didCommit(r[e]),delete r[e]})),super.didCommit(e)}commitWasRejected(){let e,t
-for(e in this.inFlightFragments)t=this.inFlightFragments[e],delete this.inFlightFragments[e],void 0===this.fragments[e]&&(this.fragments[e]=t),t&&(t.content?t.content.forEach((e=>{e._internalModel&&e._internalModel._recordData.commitWasRejected()})):t._internalModel._recordData.commitWasRejected())
-return super.commitWasRejected(...arguments)}setAttr(e,t){return super.setAttr(e,t)}getAttr(e){return super.getAttr(e)}hasAttr(e){return super.hasAttr(e)}didCreateLocally(){return super.didCreateLocally()}}e.default=p})),define("ember-data-model-fragments/states",["exports","@ember/object","ember-data/-private"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.fragmentDidDirty=s,e.fragmentDidReset=a,e.default=void 0
-const n=function(e){let t=e._recordData._owner
-e._recordData._name
-t&&s(t)}
-let i={isEmpty:!1,isLoading:!1,isLoaded:!1,isDirty:!1,isSaving:!1,isDeleted:!1,isNew:!1,isValid:!0,didSetProperty:r.RootState.loaded.saved.didSetProperty,propertyWasReset(){},becomeDirty(){},rolledBack(){},empty:{isEmpty:!0,loadedData(e){e.transitionTo("loaded.created")},pushedData(e){e.transitionTo("loaded.saved")}},loaded:{unloadRecord(){},pushedData(e){e.transitionTo("saved")},saved:{setup(e){let r=e._recordData._owner,n=e._recordData._name
-r._internalModel._recordData.isStillInitializing(n)||(0,t.get)(r,`${n}.hasDirtyAttributes`)||a(r,n)},pushedData(){},didCommit(){},becomeDirty(e){e.transitionTo("updated")}},created:{isDirty:!0,isNew:!0,setup:n,didCommit(e){e.transitionTo("saved")}},updated:{isDirty:!0,setup:n,propertyWasReset:r.RootState.loaded.updated.uncommitted.propertyWasReset,didCommit(e){e.transitionTo("saved")},rolledBack(e){e.transitionTo("saved")}}}}
-i=function e(t,r,n){(t=function(e,t){for(let r in t)e[r]=t[r]
-return e}(r?Object.create(r):{},t)).parentState=r,t.stateName=n
-for(let i in t)t.hasOwnProperty(i)&&"parentState"!==i&&"stateName"!==i&&"object"==typeof t[i]&&(t[i]=e(t[i],t,`${n}.${i}`))
-return t}(i,null,"root")
-var o=i
-function s(e){e.currentState.isDeleted||e.send("becomeDirty")}function a(e,t){e.currentState.isNew||e.send("propertyWasReset",t)}e.default=o})),define("ember-data-model-fragments/transforms/array",["exports","@ember/debug","@ember/application","@ember/array","@ember/object","@ember-data/serializer/transform","@ember/service"],(function(e,t,r,n,i,o,s){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var a=o.default.extend({store:(0,s.inject)(),type:null,deserialize:function(e){if(null==e)return null
-let t=this.transform
-return e=(0,n.makeArray)(e),t?e.map(t.deserialize,t):e},serialize:function(e){if(null==e)return null
-let t=this.transform
-return e=e.toArray?e.toArray():e,t?e.map(t.serialize,t):e},transform:(0,i.computed)("type",(function(){let e=this.type
-if(!e)return null
-let t=(0,r.getOwner)(this).lookup(`transform:${e}`)
-return t}))})
-e.default=a})),define("ember-data-model-fragments/transforms/fragment-array",["exports","ember-data-model-fragments/transforms/fragment"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({deserialize:function(e,t,r){return null==e?null:e.map((e=>this.deserializeSingle(e,t,r)),this)},serialize:function(e){if(!e)return null
-let t=this.store
-return e.map((e=>{const r=e._createSnapshot?e._createSnapshot():e
-return t.serializerFor(r.modelName||r.constructor.modelName).serialize(r)}))}})
-e.default=r})),define("ember-data-model-fragments/transforms/fragment",["exports","@ember/debug","@ember/object","@ember-data/serializer/transform","@ember-data/serializer/json-api","@ember/service"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var s=n.default.extend({store:(0,o.inject)(),type:null,polymorphicTypeProp:null,deserialize:function(e,t,r){return null==e?null:this.deserializeSingle(e,t,r)},serialize:function(e){if(!e)return null
-let t=this.store
-const r=e._createSnapshot?e._createSnapshot():e
-return t.serializerFor(r.modelName||r.constructor.modelName).serialize(r)},modelNameFor(e,t,r){let n=this.type,i=this.polymorphicTypeProp
-return e&&i&&e[i]?n=e[i]:t&&"function"==typeof t.typeKey&&(n=t.typeKey(e,r)),n},deserializeSingle(e,t,n){let i=this.store,o=this.modelNameFor(e,t,n),s=i.serializerFor(o),a=i.modelFor(o),l=s.normalize(a,e)
-return(0,r.get)(l,"data.attributes")}})
-e.default=s})),define("ember-data-model-fragments/util/instance-of-type",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){return t instanceof e}})),define("ember-data-model-fragments/version",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default="5.0.0-beta.8"})),define("ember-data/-private",["exports","@ember-data/store","@ember/application/namespace","ember","ember-data/version","@ember-data/model/-private","@ember-data/store/-private","@ember-data/record-data/-private"],(function(e,t,r,n,i,o,s,a){"use strict"
-t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t,r=r&&Object.prototype.hasOwnProperty.call(r,"default")?r.default:r,n=n&&Object.prototype.hasOwnProperty.call(n,"default")?n.default:n,i=i&&Object.prototype.hasOwnProperty.call(i,"default")?i.default:i
-var l=r.create({VERSION:i,name:"DS"})
-n.libraries&&n.libraries.registerCoreLibrary("Ember Data",i),e.Store=t,Object.defineProperty(e,"Errors",{enumerable:!0,get:function(){return o.Errors}}),Object.defineProperty(e,"ManyArray",{enumerable:!0,get:function(){return o.ManyArray}}),Object.defineProperty(e,"PromiseManyArray",{enumerable:!0,get:function(){return o.PromiseManyArray}}),Object.defineProperty(e,"AdapterPopulatedRecordArray",{enumerable:!0,get:function(){return s.AdapterPopulatedRecordArray}}),Object.defineProperty(e,"InternalModel",{enumerable:!0,get:function(){return s.InternalModel}}),Object.defineProperty(e,"PromiseArray",{enumerable:!0,get:function(){return s.PromiseArray}}),Object.defineProperty(e,"PromiseObject",{enumerable:!0,get:function(){return s.PromiseObject}}),Object.defineProperty(e,"RecordArray",{enumerable:!0,get:function(){return s.RecordArray}}),Object.defineProperty(e,"RecordArrayManager",{enumerable:!0,get:function(){return s.RecordArrayManager}}),Object.defineProperty(e,"RootState",{enumerable:!0,get:function(){return s.RootState}}),Object.defineProperty(e,"Snapshot",{enumerable:!0,get:function(){return s.Snapshot}}),Object.defineProperty(e,"SnapshotRecordArray",{enumerable:!0,get:function(){return s.SnapshotRecordArray}}),Object.defineProperty(e,"coerceId",{enumerable:!0,get:function(){return s.coerceId}}),Object.defineProperty(e,"normalizeModelName",{enumerable:!0,get:function(){return s.normalizeModelName}}),Object.defineProperty(e,"RecordData",{enumerable:!0,get:function(){return a.RecordData}}),Object.defineProperty(e,"Relationship",{enumerable:!0,get:function(){return a.Relationship}}),e.DS=l,Object.defineProperty(e,"__esModule",{value:!0})})),define("ember-data/adapter",["exports","@ember-data/adapter"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/adapters/errors",["exports","@ember-data/adapter/error"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"AbortError",{enumerable:!0,get:function(){return t.AbortError}}),Object.defineProperty(e,"AdapterError",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"ConflictError",{enumerable:!0,get:function(){return t.ConflictError}}),Object.defineProperty(e,"ForbiddenError",{enumerable:!0,get:function(){return t.ForbiddenError}}),Object.defineProperty(e,"InvalidError",{enumerable:!0,get:function(){return t.InvalidError}}),Object.defineProperty(e,"NotFoundError",{enumerable:!0,get:function(){return t.NotFoundError}}),Object.defineProperty(e,"ServerError",{enumerable:!0,get:function(){return t.ServerError}}),Object.defineProperty(e,"TimeoutError",{enumerable:!0,get:function(){return t.TimeoutError}}),Object.defineProperty(e,"UnauthorizedError",{enumerable:!0,get:function(){return t.UnauthorizedError}}),Object.defineProperty(e,"errorsArrayToHash",{enumerable:!0,get:function(){return t.errorsArrayToHash}}),Object.defineProperty(e,"errorsHashToArray",{enumerable:!0,get:function(){return t.errorsHashToArray}})})),define("ember-data/adapters/json-api",["exports","@ember-data/adapter/json-api"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/adapters/rest",["exports","@ember-data/adapter/rest"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/attr",["exports","@ember-data/model"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.attr}})})),define("ember-data/index",["exports","ember-inflector","@ember/error","@ember/version","@ember-data/adapter","@ember-data/adapter/error","@ember-data/adapter/json-api","@ember-data/adapter/rest","@ember-data/debug","@ember-data/model","@ember-data/serializer","@ember-data/serializer/-private","@ember-data/serializer/json","@ember-data/serializer/json-api","@ember-data/serializer/rest","@ember-data/serializer/transform","@ember-data/store","ember-data/-private","ember-data/setup-container"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p,f,m,g,v,b){"use strict"
-if(Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,n.VERSION.match(/^1\.([0-9]|1[0-2])\./))throw new r.default("Ember Data requires at least Ember 1.13.0, but you have "+n.VERSION+". Please upgrade your version of Ember, then upgrade Ember Data.")
-v.DS.Store=g.default,v.DS.PromiseArray=v.PromiseArray,v.DS.PromiseObject=v.PromiseObject,v.DS.PromiseManyArray=v.PromiseManyArray,v.DS.Model=u.default,v.DS.RootState=v.RootState,v.DS.attr=u.attr,v.DS.Errors=v.Errors,v.DS.InternalModel=v.InternalModel,v.DS.Snapshot=v.Snapshot,v.DS.Adapter=i.default,v.DS.AdapterError=o.default,v.DS.InvalidError=o.InvalidError,v.DS.TimeoutError=o.TimeoutError,v.DS.AbortError=o.AbortError,v.DS.UnauthorizedError=o.UnauthorizedError,v.DS.ForbiddenError=o.ForbiddenError,v.DS.NotFoundError=o.NotFoundError,v.DS.ConflictError=o.ConflictError,v.DS.ServerError=o.ServerError,v.DS.errorsHashToArray=o.errorsHashToArray,v.DS.errorsArrayToHash=o.errorsArrayToHash,v.DS.Serializer=c.default,v.DS.DebugAdapter=l.default,v.DS.RecordArray=v.RecordArray,v.DS.AdapterPopulatedRecordArray=v.AdapterPopulatedRecordArray,v.DS.ManyArray=v.ManyArray,v.DS.RecordArrayManager=v.RecordArrayManager,v.DS.RESTAdapter=a.default,v.DS.BuildURLMixin=i.BuildURLMixin
-v.DS.RESTSerializer=f.default,v.DS.JSONSerializer=h.default,v.DS.JSONAPIAdapter=s.default,v.DS.JSONAPISerializer=p.default,v.DS.Transform=m.default,v.DS.DateTransform=d.DateTransform,v.DS.StringTransform=d.StringTransform,v.DS.NumberTransform=d.NumberTransform,v.DS.BooleanTransform=d.BooleanTransform,v.DS.EmbeddedRecordsMixin=f.EmbeddedRecordsMixin,v.DS.belongsTo=u.belongsTo,v.DS.hasMany=u.hasMany,v.DS.Relationship=v.Relationship,v.DS._setupContainer=b.default,Object.defineProperty(v.DS,"normalizeModelName",{enumerable:!0,writable:!1,configurable:!1,value:g.normalizeModelName})
-var y=v.DS
-e.default=y})),define("ember-data/model",["exports","@ember-data/model"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
-define("ember-data/relationships",["exports","@ember-data/model"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"belongsTo",{enumerable:!0,get:function(){return t.belongsTo}}),Object.defineProperty(e,"hasMany",{enumerable:!0,get:function(){return t.hasMany}})})),define("ember-data/serializer",["exports","@ember-data/serializer"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/serializers/embedded-records-mixin",["exports","@ember-data/serializer/rest"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.EmbeddedRecordsMixin}})})),define("ember-data/serializers/json-api",["exports","@ember-data/serializer/json-api"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/serializers/json",["exports","@ember-data/serializer/json"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/serializers/rest",["exports","@ember-data/serializer/rest"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/setup-container",["exports","@ember/debug","@ember-data/store"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){(function(e){var t=e.inject||e.injection
-t.call(e,"controller","store","service:store"),t.call(e,"route","store","service:store")})(e),function(e){0
-e.registerOptionsForType("serializer",{singleton:!1}),e.registerOptionsForType("adapter",{singleton:!1}),e.hasRegistration("service:store")||e.register("service:store",r.default)}(e)}})),define("ember-data/store",["exports","@ember-data/store"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/transform",["exports","@ember-data/serializer/transform"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/version",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default="3.27.1"})),define("ember-element-helper/helpers/-element",["exports","@ember/component/helper","@ember/debug","@ember/component"],(function(e,t,r,n){"use strict"
-function i(){}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const o=n.default.extend(),s=n.default.extend()
-var a=t.default.extend({init(){this._super(...arguments),this.tagName=i,this.componentClass=null},compute(e,t){let n=e[0]
-return n!==this.tagName&&(this.tagName=n,"string"==typeof n?this.componentClass===o?this.componentClass=s:this.componentClass=o:(this.componentClass=null,(0,r.runInDebug)((()=>{let e="The argument passed to the `element` helper must be a string"
-try{e+=` (you passed \`${n}\`)`}catch(t){}})))),this.componentClass}})
-e.default=a})),define("ember-element-helper/helpers/element",["exports","@ember/component/helper","@ember/debug"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.helper)((function(){return null}))
-e.default=n})),define("ember-get-config/index",["exports","consul-ui/config/environment"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-in-viewport/-private/observer-admin",["exports","intersection-observer-admin"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=class{constructor(){this.instance=new t.default}add(e,t,r,n){return r&&this.addEnterCallback(e,r),n&&this.addExitCallback(e,n),this.instance.observe(e,t)}addEnterCallback(e,t){this.instance.addEnterCallback(e,t)}addExitCallback(e,t){this.instance.addExitCallback(e,t)}unobserve(){this.instance.unobserve(...arguments)}destroy(){this.instance.destroy(...arguments)}}})),define("ember-in-viewport/-private/raf-admin",["exports","raf-pool","ember-in-viewport/utils/is-in-viewport"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.startRAF=function e(t,n,i,o,s,a){let{scrollableArea:l,viewportTolerance:u,viewportSpy:c=!1}=n
-const d=l?document.querySelector(l):void 0,h=d?d.offsetHeight+d.getBoundingClientRect().top:window.innerHeight,p=l?d.offsetWidth+d.getBoundingClientRect().left:window.innerWidth,f=t.getBoundingClientRect()
-if(f){const n=t.getAttribute("data-in-viewport-entered");(function(e,t,r,n,i){let o=arguments.length>5&&void 0!==arguments[5]&&arguments[5]
-const s="true"===o&&!t
-o&&"false"!==o||!t||(e.setAttribute("data-in-viewport-entered",!0),n())
-s&&(i(),r&&e.setAttribute("data-in-viewport-entered",!1))})(t,(0,r.default)(f,h,p,u),c,i,o,n),c||"true"!==n?s(e.bind(this,t,{scrollableArea:l,viewportTolerance:u,viewportSpy:c},i,o,s,a)):a()}},e.default=void 0
-e.default=class{constructor(){this._rafPool=new t.default,this.elementRegistry=new WeakMap}add(){return this._rafPool.add(...arguments)}flush(){return this._rafPool.flush()}remove(){return this._rafPool.remove(...arguments)}reset(){this._rafPool.reset(...arguments),this._rafPool.stop(...arguments)}addEnterCallback(e,t){this.elementRegistry.set(e,Object.assign({},this.elementRegistry.get(e),{enterCallback:t}))}addExitCallback(e,t){this.elementRegistry.set(e,Object.assign({},this.elementRegistry.get(e),{exitCallback:t}))}}})),define("ember-in-viewport/breakpoints",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={mobile:"(max-width: 767px)",tablet:"(min-width: 768px) and (max-width: 991px)",desktop:"(min-width: 992px) and (max-width: 1200px)"}})),define("ember-in-viewport/index",["exports","ember-in-viewport/mixins/in-viewport"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default
-e.default=r})),define("ember-in-viewport/initializers/viewport-config",["exports","@ember/polyfills","ember-in-viewport/utils/can-use-dom"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.initialize=i,e.default=void 0
-const n={viewportEnabled:!0,viewportDidScroll:!0,viewportSpy:!1,viewportScrollSensitivity:1,viewportRefreshRate:100,viewportListeners:[{context:window,event:"scroll"},{context:window,event:"resize"}],viewportTolerance:{top:0,left:0,bottom:0,right:0},intersectionThreshold:0,scrollableArea:null}
-function i(){const e=arguments[1]||arguments[0],r=e.resolveRegistration("config:environment"),{viewportConfig:i={}}=r,o=(0,t.assign)({},n,i)
-e.register("config:in-viewport",o,{instantiate:!1})}r.default&&n.viewportListeners.push({context:document,event:"touchmove"})
-var o={name:"viewport-config",initialize:i}
-e.default=o})),define("ember-in-viewport/mixins/in-viewport",["exports","@ember/polyfills","@ember/object/mixin","@ember/utils","@ember/debug","@ember/service","@ember/object","@ember/runloop","@ember/object/computed","@ember/application","ember-in-viewport/-private/raf-admin","ember-in-viewport/utils/can-use-dom","ember-in-viewport/utils/can-use-raf","ember-in-viewport/utils/find-elem","ember-in-viewport/utils/can-use-intersection-observer","ember-in-viewport/utils/check-scroll-direction"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p,f,m){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const g={},v={}
-var b=r.default.create({_debouncedEventHandler:null,_stopListening:!1,inViewport:(0,o.inject)(),viewportExited:(0,l.not)("viewportEntered").readOnly(),init(){this._super(...arguments)
-let e=(0,t.assign)({viewportUseRAF:(0,h.default)(),viewportEntered:!1,viewportListeners:[]},this._buildOptions())
-e=(0,t.assign)(e,{viewportUseIntersectionObserver:(0,f.default)()}),(0,s.setProperties)(this,e),(0,s.set)(this,"_evtListenerClosures",[])},didInsertElement(){if(this._super(...arguments),!d.default)return;(0,s.get)(this,"viewportEnabled")&&this.watchElement((0,s.get)(this,"element"))},willDestroyElement(){this._super(...arguments),this._unbindListeners((0,s.get)(this,"element"))},_buildOptions(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-const r=(0,u.getOwner)(this)
-if(r)return(0,t.assign)(e,r.lookup("config:in-viewport"))},watchElement(e){this._setInitialViewport(e),this._addObserverIfNotSpying(e);(0,s.get)(this,"viewportDidScroll")&&((0,i.debug)("[viewportDidScroll] This will be false by default in the next major release"),this._bindScrollDirectionListener((0,s.get)(this,"viewportScrollSensitivity"))),(0,s.get)(this,"viewportUseIntersectionObserver")||(0,s.get)(this,"viewportUseRAF")||(0,s.get)(this,"viewportListeners").forEach((t=>{let{context:r,event:n}=t
-r=(0,s.get)(this,"scrollableArea")||r,this._bindListeners(r,n,e)}))},_addObserverIfNotSpying(e){(0,s.get)(this,"viewportSpy")||this.addObserver("viewportEntered",this,(0,a.bind)(this,"_unbindIfEntered",e))},_setInitialViewport(e){const t=this.isDestroyed||this.isDestroying
-if(!e||t)return
-const r=(0,s.get)(this,"inViewport")
-if((0,s.get)(this,"viewportUseIntersectionObserver"))return(0,a.scheduleOnce)("afterRender",this,(()=>{const t=(0,s.get)(this,"scrollableArea"),n=(0,s.get)(this,"viewportTolerance"),i=(0,s.get)(this,"intersectionThreshold")
-r.watchElement(e,{intersectionThreshold:i,viewportTolerance:n,scrollableArea:t},(0,a.bind)(this,this._onEnterIntersection),(0,a.bind)(this,this._onExitIntersection))}))
-if(!(0,s.get)(this,"viewportUseRAF"))return(0,a.scheduleOnce)("afterRender",this,(()=>{this._setViewportEntered(e)}))
-{r.startRAF()
-const t=(0,s.get)(this,"scrollableArea"),n=(0,s.get)(this,"viewportTolerance"),i=(0,s.get)(this,"viewportSpy"),o=()=>{const t=this.isDestroyed||this.isDestroying,r="true"===e.getAttribute("data-in-viewport-entered")
-t||!i&&!r||((0,s.set)(this,"viewportEntered",!0),this.trigger("didEnterViewport"))},a=()=>{!(this.isDestroyed||this.isDestroying)&&i&&((0,s.set)(this,"viewportEntered",!1),this.trigger("didExitViewport"))};(0,c.startRAF)(e,{scrollableArea:t,viewportTolerance:n,viewportSpy:i},o,a,r.addRAF.bind(r,e.id),r.removeRAF.bind(r,e.id))}},_setViewportEntered(e){const t=(0,s.get)(this,"scrollableArea")?document.querySelector((0,s.get)(this,"scrollableArea")):void 0,r=t?t.offsetHeight+t.getBoundingClientRect().top:window.innerHeight,n=t?t.offsetWidth+t.getBoundingClientRect().left:window.innerWidth,i=e.getBoundingClientRect()
-i&&(this._triggerDidAccessViewport((0,s.get)(this,"inViewport").isInViewport(i,r,n,(0,s.get)(this,"viewportTolerance")),(0,s.get)(this,"viewportEntered")),(0,s.get)(this,"viewportUseRAF")&&!(0,s.get)(this,"_stopListening")&&(0,s.get)(this,"inViewport").addRAF((0,s.get)(this,"elementId"),(0,a.bind)(this,this._setViewportEntered,e)))},_onEnterIntersection(){this.isDestroyed||this.isDestroying||(0,s.set)(this,"viewportEntered",!0),this.trigger("didEnterViewport")},_onExitIntersection(){this.isDestroyed||this.isDestroying||(0,s.set)(this,"viewportEntered",!1),this.trigger("didExitViewport")},_triggerDidScrollDirection(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null,t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:1
-const r=(0,s.get)(this,"elementId"),n=g[r],i=v[r],o={top:e.scrollTop,left:e.scrollLeft},a=(0,m.default)(i,o,t)
-a&&a!==n&&(0,s.get)(this,"viewportDidScroll")&&(this.trigger("didScroll",a),g[r]=a),v[r]=o},_triggerDidAccessViewport(){let e=arguments.length>0&&void 0!==arguments[0]&&arguments[0],t=arguments.length>1?arguments[1]:void 0
-if(this.isDestroyed||this.isDestroying)return
-let r=""
-!t&&e&&(r="didEnterViewport"),t&&!e&&(r="didExitViewport"),!(0,s.get)(this,"viewportSpy")&&t||(0,s.set)(this,"viewportEntered",e),r&&this.trigger(r)},_unbindIfEntered(e){(0,s.get)(this,"viewportEntered")&&(this._unbindListeners(e),this.removeObserver("viewportEntered",this,"_unbindIfEntered"),(0,s.set)(this,"viewportEntered",!1))},_debouncedEvent(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++)r[n-1]=arguments[n];(0,a.debounce)(this,(()=>this[e](...r)),(0,s.get)(this,"viewportRefreshRate"))},_bindScrollDirectionListener(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:1
-const t=(0,s.get)(this,"scrollableArea")||window,r=(0,p.default)(t)
-this._debouncedEventHandler=this._debouncedEvent.bind(this,"_triggerDidScrollDirection",r,e),r.addEventListener("scroll",this._debouncedEventHandler,{passive:!0})},_unbindScrollDirectionListener(){const e=(0,s.get)(this,"elementId"),t=(0,s.get)(this,"scrollableArea")||window,r=(0,p.default)(t)
-r&&(r.removeEventListener("scroll",this._debouncedEventHandler,{passive:!0}),delete v[e],delete g[e])},_bindListeners(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null,t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:null,n=(0,p.default)(e),i=()=>this._debouncedEvent("_setViewportEntered",r)
-this._evtListenerClosures.push({event:t,evtListener:i}),n.addEventListener(t,i,!1)},_unbindListeners(e){if((0,s.set)(this,"_stopListening",!0),(0,s.get)(this,"viewportUseIntersectionObserver")&&(0,s.get)(this,"viewportEnabled")&&(0,s.get)(this,"inViewport").unobserveIntersectionObserver(e),!(0,s.get)(this,"viewportUseIntersectionObserver")&&(0,s.get)(this,"viewportUseRAF")){const e=(0,s.get)(this,"elementId");(0,s.get)(this,"inViewport").removeRAF(e)}(0,s.get)(this,"viewportUseIntersectionObserver")||(0,s.get)(this,"viewportUseRAF")||(0,s.get)(this,"viewportListeners").forEach((e=>{let{context:t,event:r}=e
-t=(0,s.get)(this,"scrollableArea")||t
-let n=(0,p.default)(t),{evtListener:i}=this._evtListenerClosures.find((e=>r===e.event))||{}
-n.removeEventListener(r,i,!1)}));(0,s.get)(this,"viewportDidScroll")&&this._unbindScrollDirectionListener()}})
-e.default=b})),define("ember-in-viewport/modifiers/in-viewport",["exports","@ember/debug","@ember/object","@ember/service","ember-modifier","fast-deep-equal"],(function(e,t,r,n,i,o){"use strict"
-var s,a
-function l(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function u(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let c=(s=class extends i.default{constructor(){var e,t,r,n
-super(...arguments),e=this,t="inViewport",n=this,(r=a)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0}),l(this,"name","in-viewport"),l(this,"lastOptions",void 0)}get options(){const{onEnter:e,onExit:t,...r}=this.args.named
-return r}get hasStaleOptions(){return!(0,o.default)(this.options,this.lastOptions)}validateArguments(){}onEnter(){this.args.named.onEnter&&this.args.named.onEnter.call(null,this.element)}onExit(){this.args.named.onExit&&this.args.named.onExit.call(null,this.element)}setupWatcher(){this.inViewport.watchElement(this.element,this.options,this.onEnter,this.onExit),this.lastOptions=this.options}destroyWatcher(){this.inViewport.stopWatching(this.element)}didInstall(){this.setupWatcher()}didUpdateArguments(){this.hasStaleOptions&&(this.destroyWatcher(),this.setupWatcher())}didReceiveArguments(){this.validateArguments()}willRemove(){this.destroyWatcher()}},a=u(s.prototype,"inViewport",[n.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u(s.prototype,"onEnter",[r.action],Object.getOwnPropertyDescriptor(s.prototype,"onEnter"),s.prototype),u(s.prototype,"onExit",[r.action],Object.getOwnPropertyDescriptor(s.prototype,"onExit"),s.prototype),s)
-e.default=c})),define("ember-in-viewport/services/in-viewport",["exports","@ember/service","@ember/object","@ember/polyfills","@ember/application","@ember/debug","@ember/runloop","ember-in-viewport/utils/is-in-viewport","ember-in-viewport/utils/can-use-raf","ember-in-viewport/utils/can-use-intersection-observer","ember-in-viewport/-private/observer-admin","ember-in-viewport/-private/raf-admin"],(function(e,t,r,n,i,o,s,a,l,u,c,d){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const h=()=>{}
-class p extends t.default{init(){super.init(...arguments),(0,r.set)(this,"registry",new WeakMap)
-let e=(0,n.assign)({viewportUseRAF:(0,l.default)()},this._buildOptions())
-e=(0,n.assign)(e,{viewportUseIntersectionObserver:(0,u.default)()}),(0,r.setProperties)(this,e)}startIntersectionObserver(){this.observerAdmin=new c.default}startRAF(){this.rafAdmin=new d.default}watchElement(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=arguments.length>2?arguments[2]:void 0,n=arguments.length>3?arguments[3]:void 0
-if(this.viewportUseIntersectionObserver){this.observerAdmin||this.startIntersectionObserver()
-const i=this.buildObserverOptions(t);(0,s.schedule)("afterRender",this,this.setupIntersectionObserver,e,i,r,n)}else this.rafAdmin||this.startRAF(),(0,s.schedule)("afterRender",this,this._startRaf,e,t,r,n)
-return{onEnter:this.addEnterCallback.bind(this,e),onExit:this.addExitCallback.bind(this,e)}}addEnterCallback(e,t){this.viewportUseIntersectionObserver?this.observerAdmin.addEnterCallback(e,t):this.rafAdmin.addEnterCallback(e,t)}addExitCallback(e,t){this.viewportUseIntersectionObserver?this.observerAdmin.addExitCallback(e,t):this.rafAdmin.addExitCallback(e,t)}addToRegistry(e,t){this.registry&&this.registry.set(e,{observerOptions:t})}setupIntersectionObserver(e,t,r,n){this.isDestroyed||this.isDestroying||(this.addToRegistry(e,t),this.observerAdmin.add(e,t,r,n))}buildObserverOptions(e){let{intersectionThreshold:t=0,scrollableArea:r=null,viewportTolerance:n={}}=e
-const i="string"==typeof r?document.querySelector(r):r instanceof HTMLElement?r:void 0,{top:o=0,left:s=0,bottom:a=0,right:l=0}=n
-return{root:i,rootMargin:`${o}px ${l}px ${a}px ${s}px`,threshold:t}}unobserveIntersectionObserver(e){if(!e)return
-const t=this.registry.get(e)
-"object"==typeof t&&this.observerAdmin.unobserve(e,t.observerOptions)}addRAF(e,t){this.rafAdmin.add(e,t)}removeRAF(e){this.rafAdmin&&this.rafAdmin.remove(e)}isInViewport(){return(0,a.default)(...arguments)}stopWatching(e){this.observerAdmin&&this.unobserveIntersectionObserver(e),this.rafAdmin&&this.removeRAF(e)}willDestroy(){(0,r.set)(this,"registry",null),this.observerAdmin&&(this.observerAdmin.destroy(),(0,r.set)(this,"observerAdmin",null)),this.rafAdmin&&(this.rafAdmin.reset(),(0,r.set)(this,"rafAdmin",null))}_buildOptions(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-const t=(0,i.getOwner)(this)
-if(t)return(0,n.assign)(e,t.lookup("config:in-viewport"))}_startRaf(e,t,r,n){this.isDestroyed||this.isDestroying||(r=r||h,n=n||h,(0,d.startRAF)(e,t,r,n,this.addRAF.bind(this,e.id),this.removeRAF.bind(this,e.id)))}}e.default=p})),define("ember-in-viewport/utils/can-use-dom",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=!("undefined"==typeof window||!window.document||!window.document.createElement)
-e.default=t})),define("ember-in-viewport/utils/can-use-intersection-observer",["exports","ember-in-viewport/utils/can-use-dom"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){if(!t.default)return!1
-return function(e){if("IntersectionObserver"in e&&"IntersectionObserverEntry"in e&&"intersectionRatio"in e.IntersectionObserverEntry.prototype)return"isIntersecting"in e.IntersectionObserverEntry.prototype||Object.defineProperty(e.IntersectionObserverEntry.prototype,"isIntersecting",{get:function(){return this.intersectionRatio>0}}),!0
-return!1}(window)}})),define("ember-in-viewport/utils/can-use-raf",["exports","ember-in-viewport/utils/can-use-dom"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){if(!t.default)return!1
-return function(e,t,r){let n,i=["ms","moz","webkit","o"]
-for(n=0;n<i.length&&!e[t];++n)e[t]=e[`${i[n]}RequestAnimationFrame`],e[r]=e[`${i[n]}CancelAnimationFrame`]||e[`${i[n]}CancelRequestAnimationFrame`]
-return!(!e[t]||!e[r])}(window,"requestAnimationFrame","cancelAnimationFrame")}})),define("ember-in-viewport/utils/check-scroll-direction",["exports","@ember/debug"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null,t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:1
-if(!e)return"none"
-const{top:i,left:o}=t,{top:s,left:a}=e,l={top:r((i-s)/n)*n,left:r((o-a)/n)*n}
-if(l.top>0)return"down"
-if(l.top<0)return"up"
-if(l.left>0)return"right"
-if(l.left<0)return"left"}
-const{floor:r}=Math})),define("ember-in-viewport/utils/find-elem",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let t
-t=e.nodeType===Node.ELEMENT_NODE||e.nodeType===Node.DOCUMENT_NODE||e instanceof Window?e:document.querySelector(e)
-return t}})),define("ember-in-viewport/utils/is-in-viewport",["exports","@ember/polyfills"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0,o=arguments.length>3&&void 0!==arguments[3]?arguments[3]:r
-const{top:s,left:a,bottom:l,right:u,height:c,width:d}=e,h=(0,t.assign)((0,t.assign)({},r),o),{top:p,left:f,bottom:m,right:g}=h
-return s+p>=0&&a+f>=0&&Math.round(l)-m-c<=Math.round(n)&&Math.round(u)-g-d<=Math.round(i)}
-const r={top:0,left:0,bottom:0,right:0}})),define("ember-inflector/index",["exports","ember-inflector/lib/system"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"defaultRules",{enumerable:!0,get:function(){return t.defaultRules}}),Object.defineProperty(e,"pluralize",{enumerable:!0,get:function(){return t.pluralize}}),Object.defineProperty(e,"singularize",{enumerable:!0,get:function(){return t.singularize}}),e.default=void 0
-var r=t.Inflector
-e.default=r})),define("ember-inflector/lib/helpers/pluralize",["exports","ember-inflector","ember-inflector/lib/utils/make-helper"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,r.default)((function(e,r){let n=new Array(...e)
-return 2===n.length&&n.push({withoutCount:r["without-count"]}),(0,t.pluralize)(...n)}))
-e.default=n})),define("ember-inflector/lib/helpers/singularize",["exports","ember-inflector","ember-inflector/lib/utils/make-helper"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,r.default)((function(e){return(0,t.singularize)(e[0])}))
-e.default=n}))
-define("ember-inflector/lib/system",["exports","ember-inflector/lib/system/inflector","ember-inflector/lib/system/string"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"Inflector",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"pluralize",{enumerable:!0,get:function(){return r.pluralize}}),Object.defineProperty(e,"singularize",{enumerable:!0,get:function(){return r.singularize}})})),define("ember-inflector/lib/system/inflections",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={plurals:[[/$/,"s"],[/s$/i,"s"],[/^(ax|test)is$/i,"$1es"],[/(octop|vir)us$/i,"$1i"],[/(octop|vir)i$/i,"$1i"],[/(alias|status|bonus)$/i,"$1es"],[/(bu)s$/i,"$1ses"],[/(buffal|tomat)o$/i,"$1oes"],[/([ti])um$/i,"$1a"],[/([ti])a$/i,"$1a"],[/sis$/i,"ses"],[/(?:([^f])fe|([lr])f)$/i,"$1$2ves"],[/(hive)$/i,"$1s"],[/([^aeiouy]|qu)y$/i,"$1ies"],[/(x|ch|ss|sh)$/i,"$1es"],[/(matr|vert|ind)(?:ix|ex)$/i,"$1ices"],[/^(m|l)ouse$/i,"$1ice"],[/^(m|l)ice$/i,"$1ice"],[/^(ox)$/i,"$1en"],[/^(oxen)$/i,"$1"],[/(quiz)$/i,"$1zes"]],singular:[[/s$/i,""],[/(ss)$/i,"$1"],[/(n)ews$/i,"$1ews"],[/([ti])a$/i,"$1um"],[/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)(sis|ses)$/i,"$1sis"],[/(^analy)(sis|ses)$/i,"$1sis"],[/([^f])ves$/i,"$1fe"],[/(hive)s$/i,"$1"],[/(tive)s$/i,"$1"],[/([lr])ves$/i,"$1f"],[/([^aeiouy]|qu)ies$/i,"$1y"],[/(s)eries$/i,"$1eries"],[/(m)ovies$/i,"$1ovie"],[/(x|ch|ss|sh)es$/i,"$1"],[/^(m|l)ice$/i,"$1ouse"],[/(bus)(es)?$/i,"$1"],[/(o)es$/i,"$1"],[/(shoe)s$/i,"$1"],[/(cris|test)(is|es)$/i,"$1is"],[/^(a)x[ie]s$/i,"$1xis"],[/(octop|vir)(us|i)$/i,"$1us"],[/(alias|status|bonus)(es)?$/i,"$1"],[/^(ox)en/i,"$1"],[/(vert|ind)ices$/i,"$1ex"],[/(matr)ices$/i,"$1ix"],[/(quiz)zes$/i,"$1"],[/(database)s$/i,"$1"]],irregularPairs:[["person","people"],["man","men"],["child","children"],["sex","sexes"],["move","moves"],["cow","kine"],["zombie","zombies"]],uncountable:["equipment","information","rice","money","species","series","fish","sheep","jeans","police"]}})),define("ember-inflector/lib/system/inflector",["exports","@ember/string","ember-inflector/lib/system/inflections"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const n=/^\s*$/,i=/([\w/-]+[_/\s-])([a-z\d]+$)/,o=/([\w/\s-]+)([A-Z][a-z\d]*$)/,s=/[A-Z][a-z\d]*$/
-function a(e,t){for(let r=0,n=t.length;r<n;r++)e.uncountable[t[r].toLowerCase()]=!0}function l(e,t){let r
-for(let n=0,i=t.length;n<i;n++)r=t[n],e.irregular[r[0].toLowerCase()]=r[1],e.irregular[r[1].toLowerCase()]=r[1],e.irregularInverse[r[1].toLowerCase()]=r[0],e.irregularInverse[r[0].toLowerCase()]=r[0]}function u(e){(e=e||{}).uncountable=e.uncountable||c(),e.irregularPairs=e.irregularPairs||c()
-const t=this.rules={plurals:e.plurals||[],singular:e.singular||[],irregular:c(),irregularInverse:c(),uncountable:c()}
-a(t,e.uncountable),l(t,e.irregularPairs),this.enableCache()}if(!Object.create&&!Object.create(null).hasOwnProperty)throw new Error("This browser does not support Object.create(null), please polyfil with es5-sham: http://git.io/yBU2rg")
-function c(){var e=Object.create(null)
-return e._dict=null,delete e._dict,e}u.prototype={enableCache(){this.purgeCache(),this.singularize=function(e){return this._cacheUsed=!0,this._sCache[e]||(this._sCache[e]=this._singularize(e))},this.pluralize=function(e,t){let r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{}
-this._cacheUsed=!0
-var n=[e,t,r.withoutCount]
-return this._pCache[n]||(this._pCache[n]=this._pluralize(e,t,r))}},purgeCache(){this._cacheUsed=!1,this._sCache=c(),this._pCache=c()},disableCache(){this._sCache=null,this._pCache=null,this.singularize=function(e){return this._singularize(e)},this.pluralize=function(){return this._pluralize(...arguments)}},plural(e,t){this._cacheUsed&&this.purgeCache(),this.rules.plurals.push([e,t.toLowerCase()])},singular(e,t){this._cacheUsed&&this.purgeCache(),this.rules.singular.push([e,t.toLowerCase()])},uncountable(e){this._cacheUsed&&this.purgeCache(),a(this.rules,[e.toLowerCase()])},irregular(e,t){this._cacheUsed&&this.purgeCache(),l(this.rules,[[e,t]])},pluralize(){return this._pluralize(...arguments)},_pluralize(e,t){let r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{}
-return void 0===t?this.inflect(e,this.rules.plurals,this.rules.irregular):(1!==parseFloat(e)&&(t=this.inflect(t,this.rules.plurals,this.rules.irregular)),r.withoutCount?t:`${e} ${t}`)},singularize(e){return this._singularize(e)},_singularize(e){return this.inflect(e,this.rules.singular,this.rules.irregularInverse)},inflect(e,r,a){let l,u,c,d,h,p,f,m,g,v
-if(f=!e||n.test(e),m=s.test(e),f)return e
-if(d=e.toLowerCase(),h=i.exec(e)||o.exec(e),h&&(p=h[2].toLowerCase()),v=this.rules.uncountable[d]||this.rules.uncountable[p],v)return e
-for(g in a)if(d.match(g+"$"))return u=a[g],m&&a[p]&&(u=(0,t.capitalize)(u),g=(0,t.capitalize)(g)),e.replace(new RegExp(g,"i"),u)
-for(var b=r.length;b>0&&(l=r[b-1],g=l[0],!g.test(e));b--);return l=l||[],g=l[0],u=l[1],c=e.replace(g,u),c}},u.defaultRules=r.default,u.inflector=new u(r.default)
-var d=u
-e.default=d})),define("ember-inflector/lib/system/string",["exports","ember-inflector/lib/system/inflector"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.pluralize=function(){return t.default.inflector.pluralize(...arguments)},e.singularize=function(e){return t.default.inflector.singularize(e)}})),define("ember-inflector/lib/utils/make-helper",["exports","ember","@ember/component/helper"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){if(r.default)return r.default.helper(e)
-if(t.default.HTMLBars)return t.default.HTMLBars.makeBoundHelper(e)
-return t.default.Handlebars.makeBoundHelper(e)}})),define("ember-intl/-private/error-types",["exports","intl-messageformat"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.MISSING_TRANSLATION=e.MISSING_INTL_API=void 0
-const r=t.ErrorCode.MISSING_INTL_API
-e.MISSING_INTL_API=r
-e.MISSING_TRANSLATION="MISSING_TRANSLATION"})),define("ember-intl/-private/formatters/-base",["exports","@ember/debug"],(function(e,t){"use strict"
-function r(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const n=Object.create(null)
-class i{constructor(e){r(this,"config",void 0),r(this,"readFormatConfig",void 0),r(this,"createNativeFormatter",void 0),this.config=e,this.readFormatConfig=e.readFormatConfig}get options(){return[]}filterKnownOptions(e){if(!e)return n
-const t={}
-for(const r in e)this.options.includes(r)&&(t[r]=e[r])
-return t}readOptions(e){let t=this.filterKnownOptions(e)
-if(e&&"format"in e){t={...this.getNamedFormat(e.format),...t}}return t}validateFormatterOptions(e,t){}getNamedFormat(e){const t=this.readFormatConfig()[this.constructor.type]
-if(t&&t[e])return t[e]}}e.default=i,r(i,"type",void 0)})),define("ember-intl/-private/formatters/-format-datetime",["exports","fast-memoize","ember-intl/-private/formatters/-base"],(function(e,t,r){"use strict"
-function n(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=["localeMatcher","formatMatcher","timeZone","hour12","weekday","era","year","month","day","hour","minute","second","timeZoneName","hourCycle"]
-class o extends r.default{constructor(){super(...arguments),n(this,"createNativeFormatter",(0,t.default)(((e,t)=>new Intl.DateTimeFormat(e,t))))}get options(){return i}format(e,t,r){const n=this.readOptions(r)
-this.validateFormatterOptions(e,n)
-return this.createNativeFormatter(e,n).format(new Date(t))}}e.default=o,n(o,"type",void 0)})),define("ember-intl/-private/formatters/format-date",["exports","ember-intl/-private/formatters/-format-datetime"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{}var n,i,o
-e.default=r,o="date",(i="type")in(n=r)?Object.defineProperty(n,i,{value:o,enumerable:!0,configurable:!0,writable:!0}):n[i]=o})),define("ember-intl/-private/formatters/format-message",["exports","ember","fast-memoize","@ember/string","intl-messageformat","ember-intl/-private/utils/parse"],(function(e,t,r,n,i,o){"use strict"
-function s(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const{Handlebars:{Utils:{escapeExpression:a}}}=t.default
-class l{constructor(e){s(this,"config",void 0),s(this,"readFormatConfig",void 0),s(this,"createNativeFormatter",(0,r.default)(((e,t,r)=>new i.default(e,t,r,{ignoreTag:!0})))),this.config=e,this.readFormatConfig=e.readFormatConfig}format(e,t,r){let i=t
-"string"==typeof t&&(i=(0,o.default)(t))
-const s=r&&r.htmlSafe,l=this.createNativeFormatter(i,e,this.readFormatConfig()),u=s?function(e){if("object"!=typeof e)return
-const t={}
-return Object.keys(e).forEach((r=>{const i=e[r];(0,n.isHTMLSafe)(i)?t[r]=i.toHTML():t[r]="string"==typeof i?a(i):i})),t}(r):r,c=l.format(u)
-return s?(0,n.htmlSafe)(c):c}}e.default=l,s(l,"type","message")})),define("ember-intl/-private/formatters/format-number",["exports","fast-memoize","ember-intl/-private/formatters/-base"],(function(e,t,r){"use strict"
-function n(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=["localeMatcher","style","currency","currencyDisplay","unit","unitDisplay","useGrouping","minimumIntegerDigits","minimumFractionDigits","maximumFractionDigits","minimumSignificantDigits","maximumSignificantDigits","compactDisplay","currencyDisplay","currencySign","notation","signDisplay","unitDisplay","unit"]
-class o extends r.default{constructor(){super(...arguments),n(this,"createNativeFormatter",(0,t.default)(((e,t)=>new Intl.NumberFormat(e,t))))}get options(){return i}format(e,t,r){const n=this.readOptions(r)
-this.validateFormatterOptions(e,n)
-return this.createNativeFormatter(e,n).format(t)}}e.default=o,n(o,"type","number")})),define("ember-intl/-private/formatters/format-relative",["exports","@ember/debug","fast-memoize","intl-messageformat","ember-intl/-private/error-types","ember-intl/-private/formatters/-base"],(function(e,t,r,n,i,o){"use strict"
-function s(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const a=["numeric","style","unit"]
-class l extends o.default{constructor(){super(...arguments),s(this,"createNativeFormatter",(0,r.default)(((e,t)=>{if(!Intl||!Intl.RelativeTimeFormat){const e=new n.FormatError('Intl.RelativeTimeFormat is not available in this environment. Try polyfilling it using "@formatjs/intl-relativetimeformat"',i.MISSING_INTL_API)
-throw this.config.onError({kind:i.MISSING_INTL_API,error:e}),e}return new Intl.RelativeTimeFormat(e,t)})))}get options(){return a}format(e,t,r){var n
-const i=this.readOptions(r)
-this.validateFormatterOptions(e,i)
-const o=null!==(n=null==r?void 0:r.unit)&&void 0!==n?n:i.unit
-return this.createNativeFormatter(e,i).format("number"==typeof t?t:new Date(t).getTime(),o)}}e.default=l,s(l,"type","relative")})),define("ember-intl/-private/formatters/format-time",["exports","ember-intl/-private/formatters/-format-datetime"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{}var n,i,o
-e.default=r,o="time",(i="type")in(n=r)?Object.defineProperty(n,i,{value:o,enumerable:!0,configurable:!0,writable:!0}):n[i]=o})),define("ember-intl/-private/formatters/index",["exports","ember-intl/-private/formatters/format-time","ember-intl/-private/formatters/format-date","ember-intl/-private/formatters/format-number","ember-intl/-private/formatters/format-message","ember-intl/-private/formatters/format-relative"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"FormatTime",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"FormatDate",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"FormatNumber",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"FormatMessage",{enumerable:!0,get:function(){return i.default}}),Object.defineProperty(e,"FormatRelative",{enumerable:!0,get:function(){return o.default}})})),define("ember-intl/-private/store/container",["exports","@ember/object","ember-intl/-private/store/translation"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default.extend({locales:(0,t.computed)("_translationModels",(function(){return Array.from(this._translationModels.keys())})).readOnly(),init(){this._super(),this._translationModels=new Map},createTranslationModel(e){const t=new r.default(e)
-return this._translationModels.set(e,t),this.notifyPropertyChange("locales"),t},findTranslationModel(e){return this._translationModels.get(e)},push(e,t){let r=this.findTranslationModel(e)
-r||(r=this.createTranslationModel(e)),r.addTranslations(t)},has(e,t){const r=this.findTranslationModel(e)
-if(r)return r.has(t)},_lookup(e,t){const r=this.findTranslationModel(e)
-if(r&&r.has(t))return r.find(t)},lookupAst(e,t){const r=this._lookup(e,t)
-if(r)return r.ast},lookup(e,t){const r=this._lookup(e,t)
-if(r)return r.original}})
-e.default=n})),define("ember-intl/-private/store/translation",["exports","ember-intl/-private/utils/flatten","ember-intl/-private/utils/parse"],(function(e,t,r){"use strict"
-function n(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=class{get localeName(){return this._localeName}constructor(e){n(this,"translations",new Map),n(this,"asts",new Map),n(this,"_localeName",void 0),this._localeName=e}addTranslations(e){const n=(0,t.default)(e)
-for(const t in n){let e=n[t]
-"string"!=typeof e&&(e=`${e}`),this.translations.set(t,e),this.asts.set(t,(0,r.default)(e))}}find(e){if(this.has(e))return{ast:this.asts.get(e),original:this.translations.get(e)}}has(e){return this.translations.has(e)}}
-e.default=i})),define("ember-intl/-private/utils/empty-object",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const t=Object.create(null,{constructor:{value:void 0,enumerable:!1,writable:!0}})
-function r(){}r.prototype=t
-var n=r
-e.default=n})),define("ember-intl/-private/utils/flatten",["exports","ember-intl/-private/utils/empty-object"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function e(n){const i=new t.default
-for(const t in n){if(!r.call(n,t))continue
-const o=n[t]
-if("object"==typeof o&&o){const r=e(o)
-for(const e in r)i[`${t}.${e}`]=r[e]}else i[t]=o}return i}
-const r=Object.prototype.hasOwnProperty})),define("ember-intl/-private/utils/get-dom",["exports","@ember/application"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let{renderer:r}=e
-if(!r||!r._dom){let n=t.getOwner?(0,t.getOwner)(e):e.container,i=n.lookup("service:-document")
-if(i)return i
-r=n.lookup("renderer:-dom")}if(r._dom&&r._dom.document)return r._dom.document
-return null}})),define("ember-intl/-private/utils/hydrate",["exports","ember-intl/translations"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){t.default.forEach((t=>{let[r,n]=t
-e.addTranslations(r,n)}))}})),define("ember-intl/-private/utils/is-array-equal",["exports","@ember/array"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r){if(!(0,t.isArray)(e)||!(0,t.isArray)(r))return!1
-if(e===r)return!0
-return e.toString()===r.toString()}})),define("ember-intl/-private/utils/missing-message",["exports","@ember/utils","@ember/debug"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r,n){if((0,t.isEmpty)(r))return`No locale defined.  Unable to resolve translation: "${e}"`
-const i=r.join(", ")
-return`Missing translation "${e}" for locale "${i}"`}})),define("ember-intl/-private/utils/normalize-locale",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){if("string"==typeof e)return e.replace(/_/g,"-").toLowerCase()}})),define("ember-intl/-private/utils/parse",["exports","intl-messageformat-parser"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return(0,t.parse)(e,{normalizeHashtagInPlural:!1,ignoreTag:!0})}})),define("ember-intl/helpers/-format-base",["exports","@ember/component/helper","@ember/application","@ember/utils"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=t.default.extend({intl:null,init(){if(this.constructor===i)throw new Error("FormatHelper is an abstract class, can not be instantiated directly.")
-this._super(),this.intl=(0,r.getOwner)(this).lookup("service:intl"),this.intl.on("localeChanged",this,"recompute")},format(){throw new Error("not implemented")},compute(e,t){let[r]=e
-if((0,n.isEmpty)(r)){var i
-if(null!==(i=t.allowEmpty)&&void 0!==i?i:this.allowEmpty)return
-if(void 0===r)throw new Error(`${this} helper requires value attribute.`)}return this.format(r,t)},willDestroy(){this._super(),this.intl.off("localeChanged",this,"recompute")}})
-var o=i
-e.default=o})),define("ember-intl/helpers/format-date",["exports","ember-intl/helpers/-format-base"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({allowEmpty:!0,format(e,t){return this.intl.formatDate(e,t)}})
-e.default=r})),define("ember-intl/helpers/format-message",["exports","ember-intl/helpers/-format-base"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({format(e,t){return this.intl.formatMessage(e,t)}})
-e.default=r})),define("ember-intl/helpers/format-number",["exports","ember-intl/helpers/-format-base"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({format(e,t){return this.intl.formatNumber(e,t)}})
-e.default=r})),define("ember-intl/helpers/format-relative",["exports","ember-intl/helpers/-format-base"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({format(e,t){return this.intl.formatRelative(e,t)},compute(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return this._super(e,t)}})
-e.default=r})),define("ember-intl/helpers/format-time",["exports","ember-intl/helpers/-format-base"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({format(e,t){return this.intl.formatTime(e,t)}})
-e.default=r}))
-define("ember-intl/helpers/t",["exports","ember-intl/helpers/-format-base"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({format(e,t){return this.intl.t(e,t)}})
-e.default=r})),define("ember-intl/index",["exports","ember-intl/services/intl","ember-intl/macros"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0})
-var n={Service:!0}
-Object.defineProperty(e,"Service",{enumerable:!0,get:function(){return t.default}}),Object.keys(r).forEach((function(t){"default"!==t&&"__esModule"!==t&&(Object.prototype.hasOwnProperty.call(n,t)||t in e&&e[t]===r[t]||Object.defineProperty(e,t,{enumerable:!0,get:function(){return r[t]}}))}))})),define("ember-intl/macros/index",["exports","ember-intl/macros/intl","ember-intl/macros/t"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"intl",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"t",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"raw",{enumerable:!0,get:function(){return r.raw}})})),define("ember-intl/macros/intl",["exports","@ember/object","@ember/application"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){for(var e=arguments.length,i=new Array(e),o=0;o<e;o++)i[o]=arguments[o]
-const s=i.pop(),a=i
-return(0,t.computed)(`${n}.locale`,...a,(function(e){(0,t.get)(this,n)||(0,t.defineProperty)(this,n,{value:(0,r.getOwner)(this).lookup("service:intl"),enumerable:!1})
-const i=(0,t.get)(this,n)
-return s.call(this,i,e,this)}))},e.__intlInjectionName=void 0
-const n=`intl-${Date.now().toString(36)}`
-e.__intlInjectionName=n})),define("ember-intl/macros/t",["exports","@ember/object","ember-intl/-private/utils/empty-object","ember-intl/macros/intl"],(function(e,t,r,n){"use strict"
-function i(e,n){const i=new r.default
-return Object.keys(n).forEach((r=>{i[r]=(0,t.get)(e,n[r])})),i}Object.defineProperty(e,"__esModule",{value:!0}),e.raw=function(e){return new o(e)},e.default=function(e,t){const s=t||new r.default,[a,l]=function(e){const t=new r.default,n=new r.default
-return Object.keys(e).forEach((r=>{const i=e[r]
-i instanceof o?n[r]=i.valueOf():t[r]=i})),[t,n]}(s),u=Object.values(a)
-return(0,n.default)(...u,((t,r,n)=>t.t(e,{...l,...i(n,a)})))}
-class o{constructor(e){(function(e,t,r){t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r})(this,"_value",void 0),this._value=e}valueOf(){return this._value}toString(){return String(this._value)}}})),define("ember-intl/services/intl",["exports","@ember/application","@ember/object","@ember/object/evented","@ember/debug","@ember/array","@ember/service","@ember/runloop","ember-intl/-private/formatters","ember-intl/-private/utils/is-array-equal","ember-intl/-private/utils/normalize-locale","ember-intl/-private/utils/get-dom","ember-intl/-private/utils/hydrate","ember-intl/-private/store/container"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var f=s.default.extend(n.default,{formats:null,locales:r.computed.readOnly("_translationContainer.locales"),locale:(0,r.computed)("_locale",{set(e,t){const n=(0,o.makeArray)(t).map(c.default)
-return(0,u.default)(n,this._locale)||((0,r.set)(this,"_locale",n),(0,a.cancel)(this._timer),this._timer=(0,a.next)((()=>{this.trigger("localeChanged"),this._updateDocumentLanguage(this._locale)}))),this._locale},get(){return(0,r.get)(this,"_locale")}}),primaryLocale:r.computed.readOnly("locale.0"),formatRelative:m("relative"),formatMessage:m("message"),formatNumber:m("number"),formatTime:m("time"),formatDate:m("date"),_translationContainer:null,_locale:null,_timer:null,_formatters:null,init(){this._super(...arguments)
-const e=(0,r.get)(this,"locale")||["en-us"]
-this.setLocale(e),this._owner=(0,t.getOwner)(this),this._translationContainer=p.default.create(),this._formatters=this._createFormatters(),this.formats||(this.formats=this._owner.resolveRegistration("formats:main")||{}),(0,h.default)(this)},willDestroy(){this._super(...arguments),(0,a.cancel)(this._timer)},onError(e){let{error:t}=e
-throw t},lookup(e,t){const r=this._localeWithDefault(t)
-let n
-for(let i=0;i<r.length&&(n=this._translationContainer.lookup(r[i],e),void 0===n);i++);return n},lookupAst(e,t){let r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{}
-const n=this._localeWithDefault(t)
-let i
-for(let o=0;o<n.length&&(i=this._translationContainer.lookupAst(n[o],e),void 0===i);o++);if(void 0===i&&!0!==r.resilient){return this._owner.resolveRegistration("util:intl/missing-message").call(this,e,n,r)}return i},validateKeys:e=>e.forEach((e=>{})),t(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=[e]
-t.default&&(Array.isArray(t.default)?r=[...r,...t.default]:"string"==typeof t.default&&(r=[...r,t.default])),this.validateKeys(r)
-for(let n=0;n<r.length;n++){const e=r[n],i=this.lookupAst(e,t.locale,{...t,resilient:r.length-1!==n})
-if(i)return this.formatMessage(i,t)}},exists(e,t){const r=this._localeWithDefault(t)
-return r.some((t=>this._translationContainer.has(t,e)))},setLocale(e){(0,r.set)(this,"locale",e)},addTranslations(e,t){this._translationContainer.push((0,c.default)(e),t)},translationsFor(e){return this._translationContainer.findTranslationModel((0,c.default)(e),!1)},_localeWithDefault(e){return e?"string"==typeof e?(0,o.makeArray)(e).map(c.default):Array.isArray(e)?e.map(c.default):void 0:(0,r.get)(this,"_locale")||[]},_updateDocumentLanguage(e){const t=(0,d.default)(this)
-if(t){const[r]=e
-t.documentElement.setAttribute("lang",r)}},_createFormatters(){const e={onError:this.onError.bind(this),readFormatConfig:()=>this.formats}
-return{message:new l.FormatMessage(e),relative:new l.FormatRelative(e),number:new l.FormatNumber(e),time:new l.FormatTime(e),date:new l.FormatDate(e)}}})
-function m(e){return function(t,n){let i
-return i=n&&n.locale?this._localeWithDefault(n.locale):(0,r.get)(this,"locale"),this._formatters[e].format(i,t,n)}}e.default=f})),define("ember-intl/translations",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=[["en-us",{common:{brand:{aws:"AWS","aws-iam":"AWS IAM",consul:"Consul","consul-api-gateway":"Consul API Gateway",jwt:"JWT",kubernetes:"Kubernetes",lambda:"AWS Lambda",nomad:"Nomad",oidc:"OIDC",terraform:"Terraform",vault:"Vault"},consul:{accessorid:"AccessorID","api-gateway":"API Gateway",critical:"Critical",datacenter:"Datacenter",destinationname:"Destination Name",displayname:"Display Name",empty:"No checks",failuretolerance:"Fault tolerance",gateway:"Gateway","ingress-gateway":"Ingress Gateway",localbindaddress:"Local Bind Address",localbindport:"Local Bind Port",mesh:"Mesh","mesh-gateway":"Mesh Gateway",name:"Name","node-name":"Node Name","node.meta":"Node Meta","not-registered":"Not Registered",partition:"Admin Partitions",passing:"Passing",peername:"Peer",readreplica:"Read replica",redundancyzone:"Redundancy zone",registered:"Registered",service:"Service","service-name":"Service Name","service.meta":"Service Meta",sourcename:"Source Name",status:"Health Status",tags:"Tags","terminating-gateway":"Terminating Gateway",warning:"Warning"},search:{critical:"Failing","in-mesh":"In service mesh",integrations:"Integrations","not-in-mesh":"Not in service mesh",search:"Search",searchproperty:"Search Across",source:"Source"},sort:{age:{asc:"Oldest to Newest",desc:"Newest to Oldest"},alpha:{asc:"A to Z",desc:"Z to A"},duration:{asc:"Longest to shortest",desc:"Shortest to longest"},numeric:{asc:"Ascending",desc:"Descending"},status:{asc:"Unhealthy to Healthy",desc:"Healthy to Unhealthy"}},ui:{creation:"Creation",enterprisefeature:"Enterprise feature","filtered-by":"Filtered by {item}",maxttl:"Max TTL",name:"Name",remove:"Remove {item}"},validations:{"dns-hostname":{error:"{name} must be a valid DNS hostname.",help:"Must be a valid DNS hostname. Must contain 1-64 characters (numbers, letters, and hyphens), and must begin with a letter.\n",test:"^[a-zA-Z0-9]([a-zA-Z0-9-]'{0,62}'[a-zA-Z0-9])?$"},immutable:{help:"Once created, this cannot be changed."},"server-external-addresses":{help:"Enter a comma separated list of this peer's fallback server address(es) to be used in the event of failed automatic updates. This field is required for HCP-managed clusters.\n"}}},components:{app:{"collapsible-notices":{collapse:"Collapse Banners",expand:"Expand Banners"},complementary:"Complementary",main:"Main",skip_to_content:"Skip to Content",toggle_menu:"Toggle Menu"},consul:{acl:{"search-bar":{kind:{name:"Type",options:{client:"Client",management:"Management"}}}},"auth-method":{"binding-list":{"bind-type":{node:"The bind name value is used as an ACLNodeIdentity.NodeName field in the token that is created.",role:"The bind name value is used as an RoleLink.Name field in the token that is created.",service:"The bind name value is used as an ACLServiceIdentity.ServiceName field in the token that is created."}},"search-bar":{kind:{name:"Type"},locality:{name:"Source",options:{global:"Creates global tokens",local:"Creates local tokens"}}}},"health-check":{"search-bar":{check:{name:"Type",options:{alias:"alias",docker:"docker",grpc:"grpc",http:"http",script:"script",serf:"serf",tcp:"tcp",ttl:"ttl"}},kind:{name:"Kind",options:{node:"Node Check",service:"Service Check"}},sort:{kind:{asc:"Service to Node",desc:"Node to Service",name:"Check Type"},name:{name:"Check Name"}}}},intention:{notice:{permissions:{body:"Permissions are L7 attributes. If any of the following permissions match the request, the Intention will apply. Requests that fail to match any of the provided routes will follow the default ACL policy.",footer:"Learn more about permissions"}},"search-bar":{access:{name:"Permission",options:{allow:"Allow","app-aware":"App aware",deny:"Deny"}},sort:{access:{asc:"Allow to Deny",desc:"Deny to Allow",name:"Permission"},"destination-name":{asc:"Destination: A to Z",desc:"Destination: Z to A",name:"Destination"},precedence:{asc:"Ascending",desc:"Descending",name:"Precedence"},"source-name":{asc:"Source: A to Z",desc:"Source: Z to A",name:"Source"}}}},kv:{"search-bar":{kind:{name:"Type",options:{folder:"Folder",key:"Key"}},sort:{kind:{asc:"Folders to Keys",desc:"Keys to Folders"}}}},peer:{form:{"establish-label":"Establish peering","generate-label":"Generate token"},generate:{addresses:"Server address(es)",name:"Name of peer"},"search-bar":{sort:{state:{asc:"Pending to Deleting",desc:"Deleting to Pending",name:"Status"}},state:{name:"Status",options:{active:"Active",deleting:"Deleting",establishing:"Establishing",failing:"Failing",pending:"Pending",terminated:"Terminated"}}}},policy:{"search-bar":{kind:{name:"Type",options:{"global-management":"Global Management",standard:"Standard"}}}},service:{"search-bar":{"in-mesh":"In service mesh",kind:"Service Type","not-in-mesh":"Not in service mesh"}},"service-instance":{"search-bar":{sort:{name:{name:"Service Name"}}}},source:{header:"This is not a registered Consul service. It’s a routing configuration that routes traffic to real services in Consul. For more information, read our documentation.",links:{documentation:"Documentation"},"menu-title":"About Routing Configs"},token:{"search-bar":{kind:{name:"Type",options:{global:"Global Scope","global-management":"Global Management",local:"Local Scope"}}},secretID:"Secret ID"},"topology-metrics":{popover:{deny:{action:{isExact:"Allow",notExact:"Create"},body:{isExact:"Change the action of this intention to allow.",notExact:"Add an intention that allows these two services to connect."},header:"Connection Denied"},l7:{action:"View",body:"Certain HTTP request info must be identified.",header:"Layer 7 permissions"},"not-defined":{action:"Documentation",body:'Add "{upstream}" as an explicit upstream of "{downstream}" or set the "{downstream}" proxy to "transparent" mode to enable traffic.',header:"No traffic"}},"source-type":{"proxy-registration":{text:"Defined in proxy registration",tooltip:"This connection was defined in a proxy registration."},"routing-config":{text:"Routing configuration",tooltip:"This is not a registered Consul service. It’s a routing configuration that routes traffic to real services in Consul."}},status:{error:"Unable to load metrics","ingress-gateway":"Viewing metrics for Ingress Gateways is not currently supported in the UI.",loading:"Loading metrics","remote-dc":"Unable to fetch metrics for a remote datacenter"}},"transparent-proxy":"Transparent Proxy",upstream:{"search-bar":{instance:{name:"Type"}}}},"copy-button":{error:"There was a problem.",success:"Copied {name}",title:"Copy {name} to the clipboard"}},models:{"auth-method":{BindNamespace:"Bind Namespace",Config:{AllowedRedirectURIs:"Allowed redirect URIs",BoundAudiences:"Bound audiences",BoundIssuer:"Bound issuer",CACert:"CA Cert",ClaimMappings:"Claim Mappings",ClockSkewLeeway:"Clock skew leeway",ExpirationLeeway:"Expiration leeway",Host:"Host",JWKSCACert:"JWKS CA Cert",JWKSURL:"JWKS URL",JWTSupportedAlgs:"JWT supported algorithms",JWTValidationPubKeys:"JWT validation pub keys",ListClaimMappings:"List Claim Mappings",NotBeforeLeeway:"Not before leeway",OIDCClientID:"Client ID",OIDCClientSecret:"Client secret",OIDCDiscoveryCACert:"OIDC discovery CA cert",OIDCDiscoveryURL:"Discovery URL",OIDCScopes:"OIDC scopes",ServiceAccountJWT:"Service account JSON Web Token",VerboseOIDCLogging:"Verbose OIDC logging"},Description:"Description",DisplayName:"Display name",MaxTokenTTL:"Maximum token TTL",Selector:"Selector",TokenLocality:"Token locality",Type:"Type"},"binding-rule":{BindType:"Type",Description:"Description",Selector:"Selector"}},routes:{dc:{acls:{"auth-methods":{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any Auth Methods}\n    other {No Auth Methods were found matching your search}\n  }, or you may not have <code>acl:read</code> permissions to view Auth Methods yet.\n</p>\n",header:"{items, select,\n  0 {Welcome to Auth Methods}\n  other {No Auth Methods found}\n}\n"}},show:{"binding-rules":{index:{empty:{body:"<p>\n  Binding rules allow an operator to express a systematic way of automatically linking roles and service identities to newly created tokens without operator intervention.\n</p>\n",header:"No binding rules"}}},"nspace-rules":{empty:{body:"<p>\n  A set of rules that can control which namespace tokens created via this auth method will be created within. Unlike binding rules, the first matching namespace rule wins.\n</p>\n",header:"No namespace rules"}}}},policies:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any Policies}\n    other {No Policies were found matching your search}\n  }, or you may not have <code>acl:read</code> permissions to view Policies yet.\n</p>\n",header:"{items, select,\n  0 {Welcome to Policies}\n  other {No Policies found}\n}\n"}}},roles:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any Roles}\n    other {No Roles were found matching your search}\n  }, or you may not have <code>acl:read</code> permissions to view Roles yet.\n</p>\n",header:"{items, select,\n  0 {Welcome to Roles}\n  other {No Roles found}\n}\n"}}},tokens:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any Tokens}\n    other {No Tokens were found matching your search}\n  }, or you may not have <code>acl:read</code> permissions to view Tokens yet.\n</p>\n",header:"{items, select,\n  0 {Welcome to Tokens}\n  other {No Tokens found}\n}\n"}}}},intentions:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any Intentions in this Consul cluster}\n    other {No Intentions were found matching your search}\n  }{canUseACLs, select,\n    true {, or you may not have intentions:read permissions access to this view.} \n    other {.}\n  }\n</p>\n",header:"{items, select,\n  0 {Welcome to Intentions}\n  other {No Intentions found}\n}\n"}}},kv:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any K/V pairs in this Consul cluster yet}\n    other {No K/V pairs were found matching your search}\n  }{canUseACLs, select,\n    true {, or you may not have <code>key:read</code> permissions access to this view.}\n    other {.}\n  }\n</p>\n",header:"{items, select,\n  0 {Welcome to Key/Value}\n  other {No Key/Values found}\n}\n"}}},namespaces:{index:{empty:{body:"{items, select,\n  0 {No namespaces were found matching that search{canUseACLs, select,\n    true {, or you may not have access to view the namespaces you are searching for.}\n    other {.}\n  }}\n  other {There don't seem to be any namespaces{canUseACLs, select,\n    true {, or you may not have access to view namespaces yet.}\n    other {.}\n  }}\n}\n",header:"{items, select,\n  0 {Welcome to Namespaces}\n  other {No namespaces found}\n}\n"}}},nodes:{index:{agentless:{notice:{body:"Kubernetes clusters do not require client nodes to run as of Consul 1.14. Kubernetes nodes will not appear in this view.",footer:"View documentation on Consul Dataplane",header:"Consul 1.14 removes client nodes from Kubernetes Service Mesh deployments"}},empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any registered Nodes in this Consul cluster}\n    other {No Nodes were found matching your search}\n  }{canUseACLs, select,\n    true {, or you may not have <code>service:read</code> and <code>node:read</code> permissions access to this view.}\n    other {.}\n  }\n</p>\n",documentation:"Documentation on Nodes",header:"{items, select,\n  0 {Welcome to Nodes}\n  other {No Nodes found}\n}\n",learn:"Take the tutorial"}},show:{healthchecks:{"critical-serf-notice":{body:"<p>\n  This node has a failing serf node check. The health statuses shown on this page are the statuses as they were known before the node became unreachable.\n</p>\n",header:"Failing serf check"},empty:"<p>\n  This Node has no Health Checks{items, select,\n    0 {}\n    other { matching that search}\n  }.\n</p>\n",title:"Health Checks"},metadata:{title:"Metadata"},rtt:{title:"Round Trip Time"},services:{empty:"<p>\n  This Node has no Service Instances{items, select,\n    0 {}\n    other { matching that search}\n  }.\n</p>\n",title:"Service Instances"},sessions:{empty:{body:"<p>\nConsul provides a session mechanism which can be used to build distributed locks. Sessions act as a binding layer between Nodes, Health Checks, and Key/Value data. There are currently no Lock Sessions present{canUseACLs, select,\n  true {, or you may not have <code>key:read</code> or <code>session:read</code> permissions.}\n  other {.}\n}\n</p>\n",header:"Welcome to Lock Sessions"},title:"Lock Sessions"}}},partitions:{index:{empty:{body:"{items, select,\n  0 {There don't seem to be any partitions{canUseACLs, select,\n    true {, or you may not have access to view partitions yet.}\n    other {.}\n  }}\n  other {No partitions were found matching that search{canUseACLs, select,\n    true {, or you may not have access to view the namesapces you are searching}\n    other {.}\n  }}\n}\n",header:"{items, select,\n  0 {Welcome to Partitions}\n  other {No partitions found}\n}\n"}}},peers:{index:{detail:{addresses:{tooltip:"The number of services exported to {name}"},exported:{count:"{count} exported services\n","tab-tooltip":"Services exported to {name}",tooltip:"The number of services exported to {name}"},imported:{count:"{count} imported services\n","tab-tooltip":"Services imported from {name}",tooltip:"The number of services imported from {name}"}},empty:{body:"{items, select,\n  0 {Cluster peering is the recommended way to connect services across or within Consul datacenters. Peering is a one-to-one relationship in which each peer is either a open-source Consul datacenter or a Consul enterprise admin partition. There don't seem to be any peers for this {canUsePartitions, select,\n    true {admin partition}\n    other {datacenter}\n  }}\n  other {No peers were found matching that search}\n}{canUseACLs, select,\n  true {, or you may not have the <code>peering:read</code> permissions to access this view.}\n  other {.}\n}\n",header:"{items, select,\n  0 {Welcome to Peers}\n  other {No peers found}\n}\n"}},show:{addresses:{empty:{body:"<div>There don't seem to be any server addresses for this peer.</div>",header:"No server adddresses."}},exported:{empty:{body:"<div>\n{items, select,\n  0 {Services must be exported from one peer to another to enable service communication across two peers. There don't seem to be any services exported to {name} yet, or you may not have <code>services:read</code> permissions to access to this view.}\n  other {No services where found matching that search, or you may not have access to view the services you are searching for.}\n}\n</div>\n",header:"No visible exported services to {name}"}},imported:{empty:{body:"<div>\n{items, select,\n  0 {Services must be exported from one peer to another to enable service communication across two peers. There don't seem to be any services imported from {name} yet, or you may not have <code>services:read</code> permissions to access to this view.}\n  other {No services where found matching that search, or you may not have access to view the services you are searching for.}\n}\n</div>\n",header:"No visible imported services from {name}"}}}},"routing-config":{source:"Routing Configuration"},services:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any registered services in this Consul cluster}\n    other {No Services were found matching your search}\n  }{canUseACLs, select,\n    true {, or you may not have <code>service:read</code> and <code>node:read</code> access to this view. Use Terraform, Kubernetes CRDs, Vault, or the Consul CLI to register Services.}\n    other {.}\n  }\n</p>\n",header:"{items, select,\n  0 {Welcome to Services}\n  other {No Services found}\n}\n"}},instance:{exposedpaths:{empty:{body:'<p>\n  There are no individual HTTP paths exposed through Envoy for external services like Prometheus. Read more about this in our <a href="{CONSUL_DOCS_URL}/connect/registration/service-registration#expose-paths-configuration-reference" target="_blank" rel="noopener noreferrer">documentation</a>.\n</p>\n'},intro:'<p>\n  The following list shows individual HTTP paths exposed through Envoy for external services like Prometheus. Read more about this in our <a href="{CONSUL_DOCS_URL}/connect/registration/service-registration#expose-paths-configuration-reference" target="_blank" rel="noopener noreferrer">documentation</a>.\n</p>\n'},healthchecks:{"critical-serf-notice":{body:"This instance has a failing serf node check. The health statuses shown on this page are the statuses as they were known before the node became unreachable.",header:"Failing serf check"},empty:"<p>\n  This instance has no health checks{items, select,\n    0 {}\n    other { matching that search}\n  }.\n</p>\n"},upstreams:{empty:"<p>\n  This Service Instance has no Upstreams{items, select,\n    0 {}\n    other { matching that search}\n  }.\n</p>\n","tproxy-mode":{body:'The upstreams listed on this page have been defined in a proxy registration. There may be more upstreams, though, as "transparent" mode is enabled on this proxy.',footer:{link:"/connect/transparent-proxy",text:"Read the documentation"},header:"Transparent proxy mode"}}},show:{instances:{empty:"<p>\n  This Service has no Instances{items, select,\n    0 {}\n    other { matching that search}\n  }.\n</p>\n"},intentions:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any Intentions in this Consul cluster}\n    other {No Intentions were found matching your search}\n  }{canUseACLs, select,\n    true {, or you may not have <code>intentions:read</code> permissions access to this view.}\n    other {.}\n  }\n</p>\n",header:"{items, select,\n  0 {Welcome to Intentions}\n  other {No Intentions found}\n}\n"}}},services:{empty:"<p>\n  There are no Services{items, select,\n    0 {}\n    other { matching that search}\n  }.\n</p>\n",intro:'<p>\n  The following services may receive traffic from external services through this gateway. Learn more about configuring gateways in our <a href="{CONSUL_DOCS_URL}/connect/terminating-gateway" target="_blank" rel="noopener noreferrer">step-by-step guide</a>.\n</p>\n'},tags:{empty:{body:"<p>\n  There are no tags for this Service.\n</p>\n",header:"Welcome to Tags"}},topology:{notice:{"acls-disabled":{body:"Your current ACL settings allow all services to connect to each other. Either create a deny intention between all services, or enable ACLs and set your default ACL policy to deny to improve your security posture and make this topology view reflect the actual upstreams and downstreams of this service.",footer:{link:"{ CONSUL_DOCS_URL }/security/acl/acl-system#configuring-acls","link-text":"Read the documentation"},header:"Restrict which services can connect"},"default-allow":{body:"Your current ACL settings allow all services to connect to each other. Either create a deny intention between all services, or set your default ACL policy to deny to improve your security posture and make this topology view reflect the actual upstreams and downstreams of this service.",footer:{icon:"plus","link-text":"Create a wildcard deny Intention"},header:"Restrict which services can connect"},"filtered-by-acls":{body:"This service may have dependencies you won’t see because you don’t have access to them.",header:"Limited Access"},"no-dependencies":{body:"The service you are viewing currently has no dependencies. You will only see metrics for the current service until dependencies are added.",footer:{link:"{CONSUL_DOCS_URL}/connect/registration/service-registration#upstream-configuration-reference","link-text":"Read the documentation"},header:"No dependencies"},"no-intentions":{body:"There is an upstream registered for this service, but that upstream cannot receive traffic without creating an allow intention.",footer:{icon:"edit","link-text":"Edit Intentions"},header:"Add Intention to allow traffic"},"not-defined-intention":{body:"An Intention was defined that allows traffic between services, but those services are unable to communicate. Define an explicit upstream in the service definition or enable transparent proxy to fix this.",footer:{link:"{CONSUL_DOCS_URL}/connect/registration/service-registration#upstreams","link-text":"Learn how to add upstreams"},header:"Add upstream to allow traffic"},"wildcard-intention":{body:"There is currently a wildcard Intention that allows all services to connect to each other. Change the action of that Intention to deny to improve your security posture and have this topology view reflect the actual upstreams and downstreams of this service.",footer:{icon:"edit","link-text":"Edit wildcard intentions"},header:"Restrict which services can connect"}},notices:{close:"Collapse Banners",open:"Expand Banners"}},upstreams:{empty:"<p>\n  This Service has no Upstreams{items, select,\n    0 {}\n    other { matching that search}\n  }.\n</p>\n",intro:'<p>\n  Upstreams are services that may receive traffic from this gateway. If you are not using Consul DNS, please make sure your <code>Host:</code> header uses the correct domain name for the gateway to correctly proxy to its upstreams. Learn more about configuring gateways in our <a href="{CONSUL_DOCS_URL}/connect/ingress-gateways" target="_blank" rel="noopener noreferrer">documentation</a>.\n</p>\n'}}},show:{cataloghealth:{title:"Health"},license:{documentation:{links:{"applying-new-license":{link:"/tutorials/nomad/hashicorp-enterprise-license?in=consul/enterprise",text:"Applying a new license"},"license-expiration":{link:"/enterprise/license/faq#q-is-there-a-grace-period-when-licenses-expire",text:"License expiration"},"renewing-license":{link:"/enterprise/license/faq#q-how-can-i-renew-a-license",text:"Renewing a license"}},title:"Learn More"},expiry:{expired:{body:"<p>\n  Your license expired on {date} at {time}.\n</p>\n",header:"Expired"},header:"Expiry",valid:{body:"<p>\n  Your license expires on {date} at {time}.\n</p>\n",header:""}},title:"License"},serverstatus:{title:"Server status",tolerance:{header:"Server fault tolerance",immediate:{body:"the number of healthy active voting servers that can fail at once without causing an outage",header:"Immediate"},link:"/architecture/improving-consul-resilience#strategies-to-increase-fault-tolerance","link-text":"Learn how to improve fault tolerance",optimistic:{body:"the number of healthy active and back-up voting servers that can fail gradually without causing an outage",header:"Optimistic"}},unassigned:"Unassigned Zones"},title:"Cluster Overview"}}}}]]})),define("ember-load-initializers/index",["exports","require"],(function(e,t){"use strict"
-function r(e){var r=(0,t.default)(e,null,null,!0)
-if(!r)throw new Error(e+" must export an initializer.")
-var n=r.default
-if(!n)throw new Error(e+" must have a default export")
-return n.name||(n.name=e.slice(e.lastIndexOf("/")+1)),n}function n(e,t){return-1!==e.indexOf(t,e.length-t.length)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){for(var i=t+"/initializers/",o=t+"/instance-initializers/",s=[],a=[],l=Object.keys(requirejs._eak_seen),u=0;u<l.length;u++){var c=l[u]
-0===c.lastIndexOf(i,0)?n(c,"-test")||s.push(c):0===c.lastIndexOf(o,0)&&(n(c,"-test")||a.push(c))}(function(e,t){for(var n=0;n<t.length;n++)e.initializer(r(t[n]))})(e,s),function(e,t){for(var n=0;n<t.length;n++)e.instanceInitializer(r(t[n]))}(e,a)}})),define("ember-math-helpers/helpers/abs",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.abs(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.abs=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/acos",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.acos(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.acos=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/acosh",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.acosh(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.acosh=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/add",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){return e.reduce(((e,t)=>Number(e)+Number(t)))}Object.defineProperty(e,"__esModule",{value:!0}),e.add=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/asin",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.asin(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.asin=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/asinh",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.asinh(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.asinh=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/atan",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.atan(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.atan=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/atan2",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-return Math.atan2(t,r)}Object.defineProperty(e,"__esModule",{value:!0}),e.atan2=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/atanh",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.atanh(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.atanh=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/cbrt",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.cbrt(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.cbrt=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/ceil",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.ceil(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.ceil=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/clz32",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.clz32(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.clz32=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/cos",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.cos(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.cos=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/cosh",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.cosh(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.cosh=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/div",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){return e.reduce(((e,t)=>Number(e)/Number(t)))}Object.defineProperty(e,"__esModule",{value:!0}),e.div=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/exp",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.exp(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.exp=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/expm1",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.expm1(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.expm1=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/floor",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.floor(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.floor=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/fround",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.fround(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.fround=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/gcd",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t=0,n=0]=e
-const i=Math.abs(t),o=Math.abs(n)
-return 0===i?o:0===o?i:r([o,i%o])}Object.defineProperty(e,"__esModule",{value:!0}),e.gcd=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/hypot",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){return Math.hypot(...e)}Object.defineProperty(e,"__esModule",{value:!0}),e.hypot=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/imul",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r]=e
-return Math.imul(t,r)}Object.defineProperty(e,"__esModule",{value:!0}),e.imul=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n}))
-define("ember-math-helpers/helpers/lcm",["exports","@ember/component/helper","ember-math-helpers/helpers/gcd"],(function(e,t,r){"use strict"
-function n(e){let[t=0,n=0]=e
-return 0===t||0===n?0:Math.abs(t*n)/(0,r.gcd)([t,n])}Object.defineProperty(e,"__esModule",{value:!0}),e.lcm=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-math-helpers/helpers/log-e",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.log(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.logE=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/log10",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.log10(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.log10=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/log1p",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.log1p(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.log1p=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/log2",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.log2(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.log2=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/max",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){return Math.max(...e)}Object.defineProperty(e,"__esModule",{value:!0}),e.max=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/min",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){return Math.min(...e)}Object.defineProperty(e,"__esModule",{value:!0}),e.min=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/mod",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){return e.reduce(((e,t)=>Number(e)%Number(t)))}Object.defineProperty(e,"__esModule",{value:!0}),e.mod=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/mult",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){return e.reduce(((e,t)=>Number(e)*Number(t)))}Object.defineProperty(e,"__esModule",{value:!0}),e.mult=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/pow",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){return e.reduce(((e,t)=>Math.pow(e,t)))}Object.defineProperty(e,"__esModule",{value:!0}),e.pow=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/random",["exports","@ember/component/helper","@ember/array"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.random=a,e.default=void 0
-const{min:n,max:i}=Math,o=20,s={decimals:0}
-function a(e){let{decimals:t}=arguments.length>1&&void 0!==arguments[1]?arguments[1]:s
-if("object"==typeof e&&!(0,r.isArray)(e))return t=void 0!==e.decimals?e.decimals:s.decimals,+Math.random().toFixed(i(0,n(o,t)))
-if(e&&1===e.length){const[r]=e
-return+(Math.random()*r).toFixed(i(0,n(o,t)))}if(e&&2===e.length){let[r,s]=e
-return s<r&&([r,s]=[s,r]),+(r+Math.random()*(s-r)).toFixed(i(0,n(o,t)))}return+Math.random().toFixed(i(0,n(o,t)))}var l=(0,t.helper)(a)
-e.default=l})),define("ember-math-helpers/helpers/round",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e,t){return void 0===t||0==+t?Math.round(e):(t=+t,null===(e=+e)||isNaN(e)||"number"!=typeof t||t%1!=0?NaN:e<0?-r(-e,t):(e=e.toString().split("e"),+`${(e=(e=Math.round(+`${e[0]}e${e[1]?+e[1]-t:-t}`)).toString().split("e"))[0]}e${e[1]?+e[1]+t:t}`))}function n(e,t){if(t){if(t.decimals)return r(e[0],-t.decimals)
-if(t.exp)return r(e[0],t.exp)}return Math.round(e[0])}Object.defineProperty(e,"__esModule",{value:!0}),e.round=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-math-helpers/helpers/sign",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.sign(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.sign=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/sin",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.sin(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.sin=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/sqrt",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.sqrt(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.sqrt=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/sub",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){return e.reduce(((e,t)=>Number(e)-Number(t)))}Object.defineProperty(e,"__esModule",{value:!0}),e.sub=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/tan",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.tan(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.tan=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/tanh",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.tanh(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.tanh=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-math-helpers/helpers/trunc",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t]=e
-return Math.trunc(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.trunc=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-maybe-in-element/components/maybe-in-element",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"unpEBlNX",block:'[[[41,[30,1],[[[18,3,null]],[]],[[[40,[[[18,3,null]],[]],"%cursor:0%",[30,2],null]],[]]]],["@renderInPlace","@destinationElement","&default"],false,["if","yield","in-element"]]',moduleName:"ember-maybe-in-element/components/maybe-in-element.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("ember-modifier/-private/class/modifier-manager",["exports","@ember/modifier","@ember/destroyable","ember-modifier/-private/class/modifier","ember-modifier/-private/compat"],(function(e,t,r,n,i){"use strict"
-function o(e){e.willRemove(),e.willDestroy()}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=class{constructor(e){var r,n,i
-r=this,n="capabilities",i=(0,t.capabilities)("3.22"),n in r?Object.defineProperty(r,n,{value:i,enumerable:!0,configurable:!0,writable:!0}):r[n]=i,this.owner=e}createModifier(e,t){const s=new((0,i.isFactory)(e)?e.class:e)(this.owner,t)
-return(0,r.registerDestructor)(s,o),{instance:s,implementsModify:(0,n._implementsModify)(s),element:null}}installModifier(e,t,r){const o=function(e,t){const r=e
-return r.element=t,r}(e,t),{instance:s}=o;(function(e,t){e[n.Element]=t})(s,t),o.implementsModify?s.modify(t,r.positional,r.named):((0,i.consumeArgs)(r),s.didReceiveArguments(),s.didInstall())}updateModifier(e,t){const{instance:r}=e;(function(e,t){e[n.Args]=t})(e.instance,t),e.implementsModify?r.modify(e.element,t.positional,t.named):((0,i.consumeArgs)(t),r.didUpdateArguments(),r.didReceiveArguments())}destroyModifier(e){(0,r.destroy)(e.instance)}}})),define("ember-modifier/-private/class/modifier",["exports","@ember/application","@ember/modifier","ember-modifier/-private/class/modifier-manager","@ember/destroyable","@ember/debug"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.Args=e.Element=e._implementsLegacyHooks=e._implementsModify=void 0
-const s=e=>e.modify!==c.prototype.modify
-e._implementsModify=s
-const a=e=>e.didInstall!==c.prototype.didInstall||e.didUpdateArguments!==c.prototype.didUpdateArguments||e.didReceiveArguments!==c.prototype.didReceiveArguments
-e._implementsLegacyHooks=a
-const l=Symbol("Element")
-e.Element=l
-const u=Symbol("Args")
-e.Args=u
-class c{constructor(e,r){(0,t.setOwner)(this,e),this[u]=r}modify(e,t,r){}didReceiveArguments(){}didUpdateArguments(){}didInstall(){}willRemove(){}willDestroy(){}get isDestroying(){return(0,i.isDestroying)(this)}get isDestroyed(){return(0,i.isDestroyed)(this)}}e.default=c,Object.defineProperty(c.prototype,"args",{enumerable:!0,get(){return this[u]}}),Object.defineProperty(c.prototype,"element",{enumerable:!0,get(){var e
-return null!==(e=this[l])&&void 0!==e?e:null}}),(0,r.setModifierManager)((e=>new n.default(e)),c)})),define("ember-modifier/-private/compat",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.isFactory=function(e){return!1},e.consumeArgs=void 0
-let t=()=>{}
-e.consumeArgs=t,e.consumeArgs=t=function(e){let{positional:t,named:r}=e
-const n=t
-for(let i=0;i<n.length;i++)n[i]
-Object.values(r)}})),define("ember-modifier/-private/function-based/modifier-manager",["exports","@ember/modifier","ember-modifier/-private/compat"],(function(e,t,r){"use strict"
-function n(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=class{constructor(e){var r
-n(this,"capabilities",(0,t.capabilities)("3.22")),n(this,"options",void 0),this.options={eager:null===(r=null==e?void 0:e.eager)||void 0===r||r}}createModifier(e){return{element:null,instance:(0,r.isFactory)(e)?e.class:e}}installModifier(e,t,n){const i=function(e,t){const r=e
-return r.element=t,r}(e,t),{positional:o,named:s}=n,a=e.instance(t,o,s)
-"function"==typeof a&&(i.teardown=a),this.options.eager&&(0,r.consumeArgs)(n)}updateModifier(e,t){e.teardown&&e.teardown()
-const n=e.instance(e.element,t.positional,t.named)
-"function"==typeof n&&(e.teardown=n),this.options.eager&&(0,r.consumeArgs)(t)}destroyModifier(e){"function"==typeof e.teardown&&e.teardown()}}})),define("ember-modifier/-private/function-based/modifier",["exports","@ember/debug","@ember/modifier","ember-modifier/-private/class/modifier","ember-modifier/-private/function-based/modifier-manager"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{eager:!0}
-return(0,r.setModifierManager)((()=>t.eager?o:s),e)}
-const o=new i.default({eager:!0}),s=new i.default({eager:!1})})),define("ember-modifier/-private/functional/modifier-manager",["exports","@ember/modifier"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const r=new WeakMap,n=new WeakMap
-function i(e){const t=n.get(e)
-t&&"function"==typeof t&&t()}function o(e,t,r){const{positional:i,named:o}=r,s=e(t,i,o)
-n.set(e,s)}var s=new class{constructor(){var e,r,n
-e=this,r="capabilities",n=(0,t.capabilities)("3.13"),r in e?Object.defineProperty(e,r,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[r]=n}createModifier(e){return function(){return e.class(...arguments)}}installModifier(e,t,n){r.set(e,t),o(e,t,n)}updateModifier(e,t){const n=r.get(e)
-i(e),o(e,n,t)}destroyModifier(e){i(e)}}
-e.default=s})),define("ember-modifier/-private/functional/modifier",["exports","@ember/modifier","ember-modifier/-private/functional/modifier-manager"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return(0,t.setModifierManager)((()=>r.default),e)}})),define("ember-modifier/-private/interfaces",[],(function(){})),define("ember-modifier/-private/opaque",[],(function(){})),define("ember-modifier/-private/signature",[],(function(){}))
-define("ember-modifier/index",["exports","ember-modifier/-private/class/modifier","ember-modifier/-private/function-based/modifier"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"modifier",{enumerable:!0,get:function(){return r.default}})})),define("ember-on-helper/helpers/on-document",["exports","ember-on-helper/helpers/on"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({compute(e,t){return this._super([document,...e],t)}})
-e.default=r})),define("ember-on-helper/helpers/on-window",["exports","ember-on-helper/helpers/on"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({compute(e,t){return this._super([window,...e],t)}})
-e.default=r})),define("ember-on-helper/helpers/on",["exports","@ember/component/helper","ember-on-helper/utils/event-listener","@ember/debug"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.__counts=function(){return{adds:i,removes:o}},e.default=void 0
-let i=0,o=0
-function s(e,t,n,i){e&&t&&n&&(o++,(0,r.removeEventListener)(e,t,n,i))}var a=t.default.extend({eventTarget:null,eventName:void 0,callback:void 0,eventOptions:void 0,compute(e,t){let[n,o,a]=e
-s(this.eventTarget,this.eventName,this.callback,this.eventOptions),this.eventTarget=n,this.callback=function(e,t,n,o){return i++,(0,r.addEventListener)(e,t,n,o),n}(this.eventTarget,o,a,t),this.eventName=o,this.eventOptions=t},willDestroy(){this._super(),s(this.eventTarget,this.eventName,this.callback,this.eventOptions)}})
-e.default=a})),define("ember-on-helper/utils/event-listener",["exports","@ember/debug"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.addEventListenerOnce=n,e.addEventListener=function(e,t,i,o){const s=i
-r?e.addEventListener(t,s,o):o&&o.once?n(e,t,s,Boolean(o.capture)):e.addEventListener(t,s,Boolean(o&&o.capture))},e.removeEventListener=function(e,t,n,i){r?e.removeEventListener(t,n,i):e.removeEventListener(t,n,Boolean(i&&i.capture))},e.SUPPORTS_EVENT_OPTIONS=void 0
-const r=(()=>{try{const e=document.createElement("div")
-let t,r=0
-return e.addEventListener("click",(()=>r++),{once:!0}),"function"==typeof Event?t=new Event("click"):(t=document.createEvent("Event"),t.initEvent("click",!0,!0)),e.dispatchEvent(t),e.dispatchEvent(t),1===r}catch(e){return!1}})()
-function n(e,t,r){let n=arguments.length>3&&void 0!==arguments[3]&&arguments[3]
-function i(){e.removeEventListener(t,i,n),r()}e.addEventListener(t,i,n)}e.SUPPORTS_EVENT_OPTIONS=r})),define("ember-on-resize-modifier/modifiers/on-resize",["exports","ember-modifier","@ember/service","@ember/object","@ember/debug"],(function(e,t,r,n,i){"use strict"
-var o,s
-function a(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let l=(o=class extends t.default{constructor(){var e,t,r,n
-super(...arguments),e=this,t="resizeObserver",n=this,(r=s)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}get callback(){return this.args.positional[0]}didReceiveArguments(){}didInstall(){this.resizeObserver.observe(this.element,this.handleResize)}willRemove(){this.resizeObserver.unobserve(this.element,this.handleResize)}handleResize(){this.callback(...arguments)}},s=a(o.prototype,"resizeObserver",[r.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a(o.prototype,"handleResize",[n.action],Object.getOwnPropertyDescriptor(o.prototype,"handleResize"),o.prototype),o)
-e.default=l})),define("ember-page-title/helpers/page-title",["exports","@ember/service","@ember/component/helper","@ember/object/internals","@ember/polyfills"],(function(e,t,r,n,i){"use strict"
-var o,s,a
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let l=(o=(0,t.inject)("page-title-list"),s=class extends r.default{get tokenId(){return(0,n.guidFor)(this)}constructor(){var e,t,r,n
-super(...arguments),e=this,t="tokens",n=this,(r=a)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0}),this.tokens.push({id:this.tokenId})}compute(e,t){let r=(0,i.assign)({},t,{id:this.tokenId,title:e.join("")})
-return this.tokens.push(r),this.tokens.scheduleTitleUpdate(),""}willDestroy(){super.willDestroy(),this.tokens.remove(this.tokenId),this.tokens.scheduleTitleUpdate()}},u=s.prototype,c="tokens",d=[o],h={configurable:!0,enumerable:!0,writable:!0,initializer:null},f={},Object.keys(h).forEach((function(e){f[e]=h[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=d.slice().reverse().reduce((function(e,t){return t(u,c,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,c,f),f=null),a=f,s)
-var u,c,d,h,p,f
-e.default=l})),define("ember-page-title/services/page-title-list",["exports","@ember/application","@ember/runloop","@ember/service","@ember/utils","@ember/polyfills","@ember/debug"],(function(e,t,r,n,i,o,s){"use strict"
-var a,l,u,c,d,h
-function p(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function f(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function m(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let g="undefined"!=typeof FastBoot
-const v="routeDidChange"
-let b=(a=(0,n.inject)("page-title"),l=(0,n.inject)("-document"),u=class extends n.default{constructor(){super(...arguments),p(this,"pageTitle",c,this),p(this,"router",d,this),p(this,"document",h,this),f(this,"tokens",[]),f(this,"_defaultConfig",{separator:" | ",prepend:!0,replace:null}),f(this,"scheduleTitleUpdate",(()=>{(0,r.scheduleOnce)("afterRender",this,this._updateTitle)})),this._validateExistingTitleElement()
-let e=(0,t.getOwner)(this).resolveRegistration("config:environment")
-e.pageTitle&&["separator","prepend","replace"].forEach((t=>{(0,i.isEmpty)(e.pageTitle[t])||(this._defaultConfig[t]=e.pageTitle[t])})),this.router.on(v,this.scheduleTitleUpdate)}applyTokenDefaults(e){let t=this._defaultConfig.separator,r=this._defaultConfig.prepend,n=this._defaultConfig.replace
-null==e.separator&&(e.separator=t),null==e.prepend&&null!=r&&(e.prepend=r),null==e.replace&&null!=n&&(e.replace=n)}inheritFromPrevious(e){let t=e.previous
-t&&(null==e.separator&&(e.separator=t.separator),null==e.prepend&&(e.prepend=t.prepend))}push(e){let t=this._findTokenById(e.id)
-if(t){let r=this.tokens.indexOf(t),n=[...this.tokens],i=t.previous
-return e.previous=i,e.next=t.next,this.inheritFromPrevious(e),this.applyTokenDefaults(e),n.splice(r,1,e),void(this.tokens=n)}let r=this.tokens.slice(-1)[0]
-r&&(e.previous=r,r.next=e,this.inheritFromPrevious(e)),this.applyTokenDefaults(e),this.tokens=[...this.tokens,e]}remove(e){let t=this._findTokenById(e),{next:r,previous:n}=t
-r&&(r.previous=n),n&&(n.next=r),t.previous=t.next=null
-let i=[...this.tokens]
-i.splice(i.indexOf(t),1),this.tokens=i}get visibleTokens(){let e=this.tokens,t=e?e.length:0,r=[]
-for(;t--;){let n=e[t]
-if(n.replace){r.unshift(n)
-break}r.unshift(n)}return r}get sortedTokens(){let e=this.visibleTokens,t=!0,r=[],n=[r],i=[]
-return e.forEach((e=>{if(e.front)i.unshift(e)
-else if(e.prepend){t&&(t=!1,r=[],n.push(r))
-let i=r[0]
-i&&((e=(0,o.assign)({},e)).separator=i.separator),r.unshift(e)}else t||(t=!0,r=[],n.push(r)),r.push(e)})),i.concat(n.reduce(((e,t)=>e.concat(t)),[]))}toString(){let e=this.sortedTokens,t=[]
-for(let r=0,n=e.length;r<n;r++){let i=e[r]
-i.title&&(t.push(i.title),r+1<n&&t.push(i.separator))}return t.join("")}willDestroy(){super.willDestroy(),this.router.off(v,this.scheduleTitleUpdate)}_updateTitle(){const e=this.toString()
-g?this.updateFastbootTitle(e):this.document.title=e,this.pageTitle.titleDidUpdate(e)}_validateExistingTitleElement(){}_findTokenById(e){return this.tokens.filter((t=>t.id===e))[0]}updateFastbootTitle(e){if(!g)return
-const t=this.document.head,r=t.childNodes
-for(let o=0;o<r.length;o++){let e=r[o]
-"title"===e.nodeName.toLowerCase()&&t.removeChild(e)}let n=this.document.createElement("title"),i=this.document.createTextNode(e)
-n.appendChild(i),t.appendChild(n)}},c=m(u.prototype,"pageTitle",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=m(u.prototype,"router",[n.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=m(u.prototype,"document",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u)
-e.default=b})),define("ember-page-title/services/page-title",["exports","@ember/service"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class r extends t.default{titleDidUpdate(){}}e.default=r})),define("ember-power-select-with-create/components/power-select-multiple-with-create",["exports","ember-power-select-with-create/components/power-select-with-create","ember-power-select-with-create/templates/components/power-select-with-create"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default.extend({layout:r.default,powerSelectComponentName:"power-select-multiple",actions:{selectOrCreate(e,t){let r=e.filter((e=>e.__isSuggestion__))[0]
-r?this.onCreate(r.__value__,t):this.onChange(e,t)}}})
-e.default=n})),define("ember-power-select-with-create/components/power-select-with-create",["exports","@ember/array","@ember/debug","@ember/component","@ember/object","rsvp","ember-power-select-with-create/templates/components/power-select-with-create","ember-power-select/utils/group-utils"],(function(e,t,r,n,i,o,s,a){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var l=n.default.extend({tagName:"",layout:s.default,matcher:a.defaultMatcher,suggestedOptionComponent:"power-select-with-create/suggested-option",powerSelectComponentName:"power-select",searchEnabled:!0,init(){this._super(...arguments)},optionsArray:(0,i.computed)("options.[]",(function(){let e=this.get("options")
-return e?e.then?e.then((e=>(0,t.A)(e).toArray())):(0,t.A)(e).toArray():(0,t.A)()})),shouldShowCreateOption(e,t){return!this.get("showCreateWhen")||this.get("showCreateWhen")(e,t)},addCreateOption(e,t){this.shouldShowCreateOption(e,t)&&("bottom"===this.get("showCreatePosition")?t.push(this.buildSuggestionForTerm(e)):t.unshift(this.buildSuggestionForTerm(e)))},actions:{searchAndSuggest(e,r){return o.default.resolve(this.get("optionsArray")).then((n=>{if(0===e.length)return n
-let i=this.get("search")
-return i?(0,o.resolve)(i(e,r)).then((t=>(t.toArray&&(t=t.toArray()),this.addCreateOption(e,t),t))):(n=this.filter((0,t.A)(n),e),this.addCreateOption(e,n),n)}))},selectOrCreate(e,t,r){e&&e.__isSuggestion__?this.onCreate(e.__value__,t,r):this.onChange(e,t,r)}},filter(e,t){let r
-return r=this.searchField?(e,t)=>this.matcher((0,i.get)(e,this.searchField),t):(e,t)=>this.matcher(e,t),(0,a.filterOptions)(e||[],t,r)},buildSuggestionForTerm(e){return{__isSuggestion__:!0,__value__:e,text:this.buildSuggestionLabel(e)}},buildSuggestionLabel(e){return this.buildSuggestion?this.buildSuggestion(e):`Add "${e}"...`}})
-e.default=l})),define("ember-power-select-with-create/components/power-select-with-create/suggested-option",["exports","@ember/component","ember-power-select-with-create/templates/components/power-select-with-create/suggested-option"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default.extend({tagName:"",layout:r.default})
-e.default=n})),define("ember-power-select-with-create/templates/components/power-select-with-create",["exports","@ember/template-factory"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.createTemplateFactory)({id:"m3JWTGVX",block:'[[[44,[[50,[30,0,["powerSelectComponentName"]],0,null,null]],[[[1,"  "],[8,[30,1],[[17,2]],[["@afterOptionsComponent","@allowClear","@ariaDescribedBy","@ariaInvalid","@ariaLabel","@ariaLabelledBy","@beforeOptionsComponent","@buildSelection","@calculatePosition","@class","@closeOnSelect","@defaultHighlighted","@destination","@dir","@disabled","@dropdownClass","@extra","@groupComponent","@highlightOnHover","@horizontalPosition","@initiallyOpened","@loadingMessage","@matchTriggerWidth","@matcher","@noMatchesMessage","@onBlur","@onChange","@onClose","@onFocus","@onInput","@onKeydown","@onOpen","@options","@optionsComponent","@placeholder","@placeholderComponent","@preventScroll","@registerAPI","@renderInPlace","@scrollTo","@search","@searchEnabled","@searchField","@searchMessage","@searchMessageComponent","@searchPlaceholder","@selected","@selectedItemComponent","@tabindex","@triggerClass","@triggerComponent","@triggerId","@triggerRole","@typeAheadMatcher","@verticalPosition"],[[30,3],[30,4],[30,5],[30,6],[30,7],[30,8],[30,0,["beforeOptionsComponent"]],[30,9],[30,10],[30,11],[30,12],[30,13],[30,14],[30,15],[30,16],[30,17],[30,18],[30,19],[30,20],[30,21],[30,22],[30,23],[30,24],[30,0,["matcher"]],[30,25],[30,26],[28,[37,2],[[30,0],"selectOrCreate"],null],[30,27],[30,28],[30,29],[30,30],[30,31],[30,0,["optionsArray"]],[30,32],[30,33],[30,34],[30,35],[30,36],[30,37],[30,38],[28,[37,2],[[30,0],"searchAndSuggest"],null],[30,0,["searchEnabled"]],[30,39],[30,40],[30,41],[30,42],[30,43],[30,44],[30,45],[30,46],[30,0,["triggerComponent"]],[30,47],[30,48],[30,49],[30,50]]],[["default"],[[[[1,"\\n"],[41,[30,51,["__isSuggestion__"]],[[[1,"      "],[46,[30,0,["suggestedOptionComponent"]],null,[["option","term"],[[30,51],[30,52]]],null],[1,"\\n"]],[]],[[[1,"      "],[18,53,[[30,51],[30,52]]],[1,"\\n"]],[]]],[1,"  "]],[51,52]]]]],[1,"\\n"]],[1]]]],["Select","&attrs","@afterOptionsComponent","@allowClear","@ariaDescribedBy","@ariaInvalid","@ariaLabel","@ariaLabelledBy","@buildSelection","@calculatePosition","@class","@closeOnSelect","@defaultHighlighted","@destination","@dir","@disabled","@dropdownClass","@extra","@groupComponent","@highlightOnHover","@horizontalPosition","@initiallyOpened","@loadingMessage","@matchTriggerWidth","@noMatchesMessage","@onBlur","@onClose","@onFocus","@onInput","@onKeydown","@onOpen","@optionsComponent","@placeholder","@placeholderComponent","@preventScroll","@registerAPI","@renderInPlace","@scrollTo","@searchField","@searchMessage","@searchMessageComponent","@searchPlaceholder","@selected","@selectedItemComponent","@tabindex","@triggerClass","@triggerId","@triggerRole","@typeAheadMatcher","@verticalPosition","option","term","&default"],false,["let","component","action","if","yield"]]',moduleName:"ember-power-select-with-create/templates/components/power-select-with-create.hbs",isStrictMode:!1})
-e.default=r})),define("ember-power-select-with-create/templates/components/power-select-with-create/suggested-option",["exports","@ember/template-factory"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.createTemplateFactory)({id:"cLzCuqsc",block:'[[[1,[33,0,["text"]]],[1,"\\n"]],[],false,["option"]]',moduleName:"ember-power-select-with-create/templates/components/power-select-with-create/suggested-option.hbs",isStrictMode:!1})
-e.default=r})),define("ember-power-select/components/power-select-multiple",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@ember/utils"],(function(e,t,r,n,i,o){"use strict"
-var s
-function a(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,r.createTemplateFactory)({id:"bj6pwQuH",block:'[[[8,[39,0],[[17,1]],[["@triggerRole","@ariaDescribedBy","@ariaInvalid","@ariaLabel","@ariaLabelledBy","@afterOptionsComponent","@allowClear","@beforeOptionsComponent","@buildSelection","@calculatePosition","@closeOnSelect","@defaultHighlighted","@destination","@disabled","@dropdownClass","@extra","@groupComponent","@horizontalPosition","@initiallyOpened","@loadingMessage","@matcher","@matchTriggerWidth","@noMatchesMessage","@noMatchesMessageComponent","@onBlur","@onChange","@onClose","@onFocus","@onInput","@onKeydown","@onOpen","@options","@optionsComponent","@placeholder","@placeholderComponent","@preventScroll","@registerAPI","@renderInPlace","@required","@scrollTo","@search","@searchEnabled","@searchField","@searchMessage","@searchPlaceholder","@selected","@selectedItemComponent","@eventType","@title","@triggerClass","@triggerComponent","@triggerId","@verticalPosition","@tabindex"],[[30,2],[30,3],[30,4],[30,5],[30,6],[30,7],[30,8],[28,[37,1],[[30,9],null],null],[28,[37,1],[[30,10],[30,0,["defaultBuildSelection"]]],null],[30,11],[30,12],[30,13],[30,14],[30,15],[30,16],[30,17],[30,18],[30,19],[30,20],[30,21],[30,22],[30,23],[30,24],[30,25],[30,26],[30,27],[30,28],[30,0,["handleFocus"]],[30,29],[30,0,["handleKeydown"]],[30,0,["handleOpen"]],[30,30],[30,31],[30,32],[30,33],[30,34],[30,35],[30,36],[30,37],[30,38],[30,39],[30,40],[30,41],[30,42],[30,43],[30,44],[30,45],[30,46],[30,47],[29,["ember-power-select-multiple-trigger ",[30,48]]],[50,[28,[37,1],[[30,49],"power-select-multiple/trigger"],null],0,null,[["tabindex"],[[30,50]]]],[30,51],[30,52],[30,0,["computedTabIndex"]]]],[["default"],[[[[1,"\\n  "],[18,55,[[30,53],[30,54]]],[1,"\\n"]],[53,54]]]]],[1,"\\n"]],["&attrs","@triggerRole","@ariaDescribedBy","@ariaInvalid","@ariaLabel","@ariaLabelledBy","@afterOptionsComponent","@allowClear","@beforeOptionsComponent","@buildSelection","@calculatePosition","@closeOnSelect","@defaultHighlighted","@destination","@disabled","@dropdownClass","@extra","@groupComponent","@horizontalPosition","@initiallyOpened","@loadingMessage","@matcher","@matchTriggerWidth","@noMatchesMessage","@noMatchesMessageComponent","@onBlur","@onChange","@onClose","@onInput","@options","@optionsComponent","@placeholder","@placeholderComponent","@preventScroll","@registerAPI","@renderInPlace","@required","@scrollTo","@search","@searchEnabled","@searchField","@searchMessage","@searchPlaceholder","@selected","@selectedItemComponent","@eventType","@title","@triggerClass","@triggerComponent","@tabindex","@triggerId","@verticalPosition","option","select","&default"],false,["power-select","or","component","yield"]]',moduleName:"ember-power-select/components/power-select-multiple.hbs",isStrictMode:!1})
-let u=(a((s=class extends n.default{get computedTabIndex(){return void 0===this.args.triggerComponent&&this.args.searchEnabled?"-1":this.args.tabindex||"0"}handleOpen(e,t){if(this.args.onOpen&&!1===this.args.onOpen(e,t))return!1
-this.focusInput(e)}handleFocus(e,t){this.args.onFocus&&this.args.onFocus(e,t),this.focusInput(e)}handleKeydown(e,t){return this.args.onKeydown&&!1===this.args.onKeydown(e,t)?(t.stopPropagation(),!1):13===t.keyCode&&e.isOpen?(t.stopPropagation(),void 0!==e.highlighted?e.selected&&-1!==e.selected.indexOf(e.highlighted)?(e.actions.close(t),!1):(e.actions.choose(e.highlighted,t),!1):(e.actions.close(t),!1)):void 0}defaultBuildSelection(e,t){let r=(t.selected||[]).slice(0),n=-1
-for(let i=0;i<r.length;i++)if((0,o.isEqual)(r[i],e)){n=i
-break}return n>-1?r.splice(n,1):r.push(e),r}focusInput(e){if(e){let t=document.querySelector(`#ember-power-select-trigger-multiple-input-${e.uniqueId}`)
-t&&t.focus()}}}).prototype,"handleOpen",[i.action],Object.getOwnPropertyDescriptor(s.prototype,"handleOpen"),s.prototype),a(s.prototype,"handleFocus",[i.action],Object.getOwnPropertyDescriptor(s.prototype,"handleFocus"),s.prototype),a(s.prototype,"handleKeydown",[i.action],Object.getOwnPropertyDescriptor(s.prototype,"handleKeydown"),s.prototype),s)
-e.default=u,(0,t.setComponentTemplate)(l,u)})),define("ember-power-select/components/power-select-multiple/trigger",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@ember/service","@ember/runloop","@ember/debug","@ember/utils","@ember/template"],(function(e,t,r,n,i,o,s,a,l,u){"use strict"
-var c,d
-function h(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function p(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const f=(0,r.createTemplateFactory)({id:"0TljclnC",block:'[[[11,"ul"],[16,1,[29,["ember-power-select-multiple-options-",[30,1,["uniqueId"]]]]],[24,0,"ember-power-select-multiple-options"],[17,2],[4,[38,0],[[30,0,["openChanged"]],[30,1,["isOpen"]]],null],[4,[38,1],["touchstart",[30,0,["chooseOption"]]],null],[4,[38,1],["mousedown",[30,0,["chooseOption"]]],null],[12],[1,"\\n"],[42,[28,[37,3],[[28,[37,3],[[30,1,["selected"]]],null]],null],null,[[[1,"    "],[10,"li"],[15,0,[29,["ember-power-select-multiple-option ",[52,[30,3,["disabled"]],"ember-power-select-multiple-option--disabled"]]]],[12],[1,"\\n"],[41,[51,[30,1,["disabled"]]],[[[1,"        "],[10,1],[14,"role","button"],[14,"aria-label","remove element"],[14,0,"ember-power-select-multiple-remove-btn"],[15,"data-selected-index",[30,4]],[12],[1,"\\n          ×\\n        "],[13],[1,"\\n"]],[]],null],[41,[30,5],[[[1,"        "],[46,[30,5],null,[["extra","option","select"],[[30,6],[30,3],[30,1]]],null],[1,"\\n"]],[]],[[[1,"        "],[18,13,[[30,3],[30,1]]],[1,"\\n"]],[]]],[1,"    "],[13],[1,"\\n"]],[3,4]],[[[41,[28,[37,8],[[30,7],[28,[37,9],[[30,8]],null]],null],[[[1,"      "],[10,1],[14,0,"ember-power-select-placeholder"],[12],[1,[30,7]],[13],[1,"\\n"]],[]],null]],[]]],[41,[30,8],[[[1,"    "],[11,"input"],[24,0,"ember-power-select-trigger-multiple-input"],[24,"autocomplete","off"],[24,"autocorrect","off"],[24,"autocapitalize","off"],[16,"spellcheck",false],[16,1,[29,["ember-power-select-trigger-multiple-input-",[30,1,["uniqueId"]]]]],[16,2,[30,1,["searchText"]]],[16,"aria-controls",[30,9]],[16,5,[30,0,["triggerMultipleInputStyle"]]],[16,"placeholder",[30,0,["maybePlaceholder"]]],[16,"disabled",[30,1,["disabled"]]],[16,"tabindex",[30,10]],[24,4,"search"],[4,[38,1],["focus",[30,11]],null],[4,[38,1],["blur",[30,12]],null],[4,[38,1],["input",[30,0,["handleInput"]]],null],[4,[38,1],["keydown",[30,0,["handleKeydown"]]],null],[4,[38,10],[[30,0,["storeInputStyles"]]],null],[12],[13],[1,"\\n"]],[]],null],[13],[1,"\\n"],[10,1],[14,0,"ember-power-select-status-icon"],[12],[13],[1,"\\n"]],["@select","&attrs","opt","idx","@selectedItemComponent","@extra","@placeholder","@searchEnabled","@listboxId","@tabindex","@onFocus","@onBlur","&default"],false,["did-update","on","each","-track-array","if","unless","component","yield","and","not","did-insert"]]',moduleName:"ember-power-select/components/power-select-multiple/trigger.hbs",isStrictMode:!1}),m=window&&window.navigator?window.navigator.userAgent:"",g=m.indexOf("MSIE ")>-1||m.indexOf("Trident/")>-1
-let v=(c=class extends n.default{constructor(){var e,t,r,n
-super(...arguments),h(this,"inputFont",void 0),h(this,"_lastIsOpen",this.args.select.isOpen),e=this,t="textMeasurer",n=this,(r=d)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}get triggerMultipleInputStyle(){if((0,s.scheduleOnce)("actions",null,this.args.select.actions.reposition),this.args.select.selected&&0!==(0,i.get)(this.args.select.selected,"length")){let e=0
-return this.inputFont&&(e=this.textMeasurer.width(this.args.select.searchText,this.inputFont)),(0,u.htmlSafe)(`width: ${e+25}px`)}return(0,u.htmlSafe)("width: 100%;")}get maybePlaceholder(){if(!g)return this.args.select.selected&&0!==(0,i.get)(this.args.select.selected,"length")?"":this.args.placeholder||""}openChanged(e,t){let[r]=t
-!1===r&&!0===this._lastIsOpen&&(0,s.scheduleOnce)("actions",null,this.args.select.actions.search,""),this._lastIsOpen=r}storeInputStyles(e){let{fontStyle:t,fontVariant:r,fontWeight:n,fontSize:i,lineHeight:o,fontFamily:s}=window.getComputedStyle(e)
-this.inputFont=`${t} ${r} ${n} ${i}/${o} ${s}`}chooseOption(e){if(null===e.target)return
-let t=e.target.getAttribute("data-selected-index")
-if(t){let r=parseInt(t,10)
-e.stopPropagation(),e.preventDefault()
-let n=this.selectedObject(this.args.select.selected,r)
-this.args.select.actions.choose(n)}}handleInput(e){this.args.onInput&&!1===this.args.onInput(e)||this.args.select.actions.open(e)}handleKeydown(e){if(null!==e.target){if(this.args.onKeydown&&!1===this.args.onKeydown(e))return e.stopPropagation(),!1
-if(8===e.keyCode){if(e.stopPropagation(),(0,l.isBlank)(e.target.value)){let t=this.args.select.selected[this.args.select.selected.length-1]
-t&&(this.args.select.actions.select(this.args.buildSelection(t,this.args.select),e),"string"==typeof t?this.args.select.actions.search(t):this.args.select.actions.search((0,i.get)(t,this.args.searchField)),this.args.select.actions.open(e))}}else(e.keyCode>=48&&e.keyCode<=90||32===e.keyCode)&&e.stopPropagation()}}selectedObject(e,t){return"function"==typeof e.objectAt?e.objectAt(t):(0,i.get)(e,t)}},d=p(c.prototype,"textMeasurer",[o.inject],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p(c.prototype,"openChanged",[i.action],Object.getOwnPropertyDescriptor(c.prototype,"openChanged"),c.prototype),p(c.prototype,"storeInputStyles",[i.action],Object.getOwnPropertyDescriptor(c.prototype,"storeInputStyles"),c.prototype),p(c.prototype,"chooseOption",[i.action],Object.getOwnPropertyDescriptor(c.prototype,"chooseOption"),c.prototype),p(c.prototype,"handleInput",[i.action],Object.getOwnPropertyDescriptor(c.prototype,"handleInput"),c.prototype),p(c.prototype,"handleKeydown",[i.action],Object.getOwnPropertyDescriptor(c.prototype,"handleKeydown"),c.prototype),c)
-e.default=v,(0,t.setComponentTemplate)(f,v)})),define("ember-power-select/components/power-select",["exports","@ember/component","@ember/template-factory","@glimmer/component","@glimmer/tracking","@ember/object","@ember/object/observers","@ember/runloop","@ember/utils","@ember/debug","ember-power-select/utils/group-utils","ember-concurrency-decorators","ember-concurrency"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h){"use strict"
-var p,f,m,g,v,b,y,_,w,O,x
-function P(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function S(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function T(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const E=(0,r.createTemplateFactory)({id:"Kd02zOqr",block:'[[[8,[39,0],[[17,1]],[["@horizontalPosition","@destination","@initiallyOpened","@matchTriggerWidth","@preventScroll","@onClose","@onOpen","@renderInPlace","@verticalPosition","@disabled","@calculatePosition"],[[30,2],[30,3],[30,4],[30,0,["matchTriggerWidth"]],[28,[37,1],[[30,5],false],null],[30,0,["handleClose"]],[30,0,["handleOpen"]],[30,6],[30,7],[30,8],[30,9]]],[["default"],[[[[1,"\\n"],[44,[[28,[37,3],[[30,10],[28,[37,4],null,[["selected","highlighted","options","results","resultsCount","loading","isActive","searchText","lastSearchedText","actions"],[[30,0,["selected"]],[30,0,["highlighted"]],[30,0,["options"]],[30,0,["results"]],[30,0,["resultsCount"]],[30,0,["loading"]],[30,0,["isActive"]],[30,0,["searchText"]],[30,0,["lastSearchedText"]],[28,[37,3],[[30,10,["actions"]],[30,0,["_publicAPIActions"]]],null]]]]],null],[28,[37,5],["ember-power-select-options-",[30,10,["uniqueId"]]],null]],[[[1,"    "],[8,[30,10,["Trigger"]],[[16,0,[29,["ember-power-select-trigger ",[30,13],[52,[30,11,["isActive"]]," ember-power-select-trigger--active"]]]],[16,"aria-describedby",[30,14]],[16,"aria-invalid",[30,15]],[16,"aria-label",[30,16]],[16,"aria-labelledby",[30,17]],[16,"aria-required",[30,18]],[16,"role",[28,[37,1],[[30,19],"button"],null]],[16,"title",[30,20]],[16,1,[30,21]],[16,"tabindex",[28,[37,7],[[28,[37,8],[[30,8]],null],[28,[37,1],[[30,22],"0"],null]],null]],[4,[38,9],[[30,0,["_updateOptions"]],[30,24]],null],[4,[38,10],[[30,0,["_updateOptions"]],[30,24]],null],[4,[38,9],[[30,0,["_updateSelected"]],[30,25]],null],[4,[38,10],[[30,0,["_updateSelected"]],[30,25]],null],[4,[38,9],[[30,0,["_registerAPI"]],[30,11]],null],[4,[38,10],[[30,0,["_registerAPI"]],[30,11]],null],[4,[38,10],[[30,0,["_performSearch"]],[30,0,["searchText"]]],null],[4,[38,11],["keydown",[30,0,["handleTriggerKeydown"]]],null],[4,[38,11],["focus",[30,0,["handleFocus"]]],null],[4,[38,11],["blur",[30,0,["handleBlur"]]],null]],[["@eventType"],[[28,[37,1],[[30,23],"mousedown"],null]]],[["default"],[[[[1,"\\n"],[44,[[50,[28,[37,1],[[30,26],"power-select/trigger"],null],0,null,null]],[[[1,"        "],[8,[30,27],null,[["@allowClear","@buildSelection","@loadingMessage","@selectedItemComponent","@select","@searchEnabled","@searchField","@onFocus","@onBlur","@extra","@listboxId","@onInput","@onKeydown","@placeholder","@placeholderComponent"],[[30,28],[30,29],[28,[37,1],[[30,30],"Loading options..."],null],[30,31],[30,11],[30,32],[30,33],[30,0,["handleFocus"]],[30,0,["handleBlur"]],[30,34],[30,12],[30,0,["handleInput"]],[30,0,["handleKeydown"]],[30,35],[30,0,["placeholderComponent"]]]],[["default"],[[[[1,"\\n          "],[18,53,[[30,36],[30,37]]],[1,"\\n        "]],[36,37]]]]],[1,"\\n"]],[27]]],[1,"    "]],[]]]]],[1,"\\n    "],[8,[30,10,["Content"]],[[16,0,[29,["ember-power-select-dropdown",[52,[30,11,["isActive"]]," ember-power-select-dropdown--active"]," ",[30,38]]]]],null,[["default"],[[[[1,"\\n"],[44,[[50,[52,[28,[37,14],[[30,39],[27]],null],"power-select/before-options",[30,39]],0,null,null]],[[[1,"        "],[8,[30,40],null,[["@select","@searchEnabled","@onInput","@onKeydown","@onFocus","@onBlur","@placeholder","@placeholderComponent","@extra","@listboxId","@selectedItemComponent","@searchPlaceholder"],[[30,11],[30,32],[30,0,["handleInput"]],[30,0,["handleKeydown"]],[30,0,["handleFocus"]],[30,0,["handleBlur"]],[30,35],[30,0,["placeholderComponent"]],[30,34],[30,12],[30,31],[30,41]]],null],[1,"\\n"]],[40]]],[41,[30,0,["mustShowSearchMessage"]],[[[44,[[50,[28,[37,1],[[30,42],"power-select/search-message"],null],0,null,null]],[[[1,"          "],[8,[30,43],null,[["@searchMessage","@select"],[[30,0,["searchMessage"]],[30,11]]],null],[1,"\\n"]],[43]]]],[]],[[[41,[30,0,["mustShowNoMessages"]],[[[44,[[50,[28,[37,1],[[30,44],"power-select/no-matches-message"],null],0,null,null]],[[[1,"          "],[8,[30,45],null,[["@noMatchesMessage","@select"],[[30,0,["noMatchesMessage"]],[30,11]]],null],[1,"\\n"]],[45]]]],[]],[[[44,[[50,[28,[37,1],[[30,46],"power-select/options"],null],0,null,null]],[[[1,"          "],[8,[30,47],[[16,1,[30,12]],[24,0,"ember-power-select-options"]],[["@loadingMessage","@select","@options","@groupIndex","@optionsComponent","@extra","@highlightOnHover","@groupComponent"],[[28,[37,1],[[30,30],"Loading options..."],null],[30,11],[30,11,["results"]],"",[30,47],[30,34],[30,0,["highlightOnHover"]],[28,[37,1],[[30,48],"power-select/power-select-group"],null]]],[["default"],[[[[1,"\\n            "],[18,53,[[30,49],[30,50]]],[1,"\\n          "]],[49,50]]]]],[1,"\\n"]],[47]]],[1,"      "]],[]]]],[]]],[44,[[50,[30,51],0,null,null]],[[[1,"        "],[8,[30,52],null,[["@extra","@select"],[[30,34],[30,11]]],null],[1,"\\n"]],[52]]],[1,"    "]],[]]]]],[1,"\\n"]],[11,12]]]],[10]]]]],[1,"\\n"]],["&attrs","@horizontalPosition","@destination","@initiallyOpened","@preventScroll","@renderInPlace","@verticalPosition","@disabled","@calculatePosition","dropdown","publicAPI","listboxId","@triggerClass","@ariaDescribedBy","@ariaInvalid","@ariaLabel","@ariaLabelledBy","@required","@triggerRole","@title","@triggerId","@tabindex","@eventType","@options","@selected","@triggerComponent","Trigger","@allowClear","@buildSelection","@loadingMessage","@selectedItemComponent","@searchEnabled","@searchField","@extra","@placeholder","opt","term","@dropdownClass","@beforeOptionsComponent","BeforeOptions","@searchPlaceholder","@searchMessageComponent","SearchMessage","@noMatchesMessageComponent","NoMatchesMessage","@optionsComponent","Options","@groupComponent","option","select","@afterOptionsComponent","AfterOptions","&default"],false,["basic-dropdown","or","let","assign","hash","concat","if","and","not","did-insert","did-update","on","component","yield","eq"]]',moduleName:"ember-power-select/components/power-select.hbs",isStrictMode:!1}),C=e=>"function"==typeof e.then,k=e=>C(e)&&Object.hasOwnProperty.call(e,"content"),M=e=>"function"==typeof e.cancel
-let A=(p=class extends n.default{constructor(e,t){super(e,t),S(this,"_publicAPIActions",{search:this._search,highlight:this._highlight,select:this._select,choose:this._choose,scrollTo:this._scrollTo}),P(this,"_resolvedOptions",f,this),P(this,"_resolvedSelected",m,this),P(this,"_repeatingChar",g,this),P(this,"_expirableSearchText",v,this),P(this,"_searchResult",b,this),P(this,"isActive",y,this),P(this,"loading",_,this),P(this,"searchText",w,this),P(this,"lastSearchedText",O,this),P(this,"highlighted",x,this),S(this,"storedAPI",void 0),S(this,"_lastOptionsPromise",void 0),S(this,"_lastSelectedPromise",void 0),S(this,"_lastSearchPromise",void 0),S(this,"_filterResultsCache",{results:[],options:[],searchText:this.searchText})}willDestroy(){this._lastSelectedPromise&&k(this._lastSelectedPromise)&&((0,s.removeObserver)(this._lastSelectedPromise,"content",this,this._selectedObserverCallback),this._lastSelectedPromise=void 0),super.willDestroy.apply(this,arguments)}get highlightOnHover(){return void 0===this.args.highlightOnHover||this.args.highlightOnHover}get placeholderComponent(){return this.args.placeholderComponent||"power-select/placeholder"}get searchMessage(){return void 0===this.args.searchMessage?"Type to search":this.args.searchMessage}get noMatchesMessage(){return void 0===this.args.noMatchesMessage?"No results found":this.args.noMatchesMessage}get matchTriggerWidth(){return void 0===this.args.matchTriggerWidth||this.args.matchTriggerWidth}get mustShowSearchMessage(){return!this.loading&&0===this.searchText.length&&!!this.args.search&&!!this.searchMessage&&0===this.resultsCount}get mustShowNoMessages(){return!this.loading&&0===this.resultsCount&&(!this.args.search||this.lastSearchedText.length>0)}get results(){if(this.searchText.length>0){if(this.args.search)return I(this._searchResult||this.options)
-{if(this._filterResultsCache.options===this.options&&this._filterResultsCache.searchText===this.searchText)return this._filterResultsCache.results
-let e=this._filter(this.options,this.searchText)
-return this._filterResultsCache={results:e,options:this.options,searchText:this.searchText},e}}return this.options}get options(){return this._resolvedOptions?I(this._resolvedOptions):this.args.options?I(this.args.options):[]}get resultsCount(){return(0,c.countOptions)(this.results)}get selected(){return this._resolvedSelected?I(this._resolvedSelected):this.args.selected&&"function"!=typeof this.args.selected.then?I(this.args.selected):void 0}handleOpen(e,t){if(this.args.onOpen&&!1===this.args.onOpen(this.storedAPI,t))return!1
-t&&t instanceof KeyboardEvent&&"keydown"===t.type&&(38===t.keyCode||40===t.keyCode)&&t.preventDefault(),this._resetHighlighted()}handleClose(e,t){if(this.args.onClose&&!1===this.args.onClose(this.storedAPI,t))return!1
-this._highlight(void 0)}handleInput(e){if(null===e.target)return
-let t,r=e.target.value
-this.args.onInput&&(t=this.args.onInput(r,this.storedAPI,e),!1===t)||this._publicAPIActions.search("string"==typeof t?t:r)}handleKeydown(e){return(!this.args.onKeydown||!1!==this.args.onKeydown(this.storedAPI,e))&&this._routeKeydown(this.storedAPI,e)}handleTriggerKeydown(e){if(this.args.onKeydown&&!1===this.args.onKeydown(this.storedAPI,e))e.stopImmediatePropagation()
-else if(e.ctrlKey||e.metaKey)e.stopImmediatePropagation()
-else if(e.keyCode>=48&&e.keyCode<=90||j(e))this.triggerTypingTask.perform(e)
-else{if(32!==e.keyCode)return this._routeKeydown(this.storedAPI,e)
-this._handleKeySpace(this.storedAPI,e)}}handleFocus(e){this.isDestroying||(0,a.scheduleOnce)("actions",this,this._updateIsActive,!0),this.args.onFocus&&this.args.onFocus(this.storedAPI,e)}handleBlur(e){this.isDestroying||(0,a.scheduleOnce)("actions",this,this._updateIsActive,!1),this.args.onBlur&&this.args.onBlur(this.storedAPI,e)}_search(e){this.searchText!==e&&(this.searchText=e,this.args.search||(this.lastSearchedText=e,this._resetHighlighted()))}_updateOptions(){if(this.args.options)if(C(this.args.options)){if(this._lastOptionsPromise===this.args.options)return
-let e=this.args.options
-this._lastOptionsPromise=e,this.loading=!0,this._lastOptionsPromise.then((t=>{this._lastOptionsPromise===e&&(this.loading=!1,this._resolvedOptions=t,this._resetHighlighted())})).catch((()=>{this._lastOptionsPromise===e&&(this.loading=!1)}))}else(0,a.scheduleOnce)("actions",this,this._resetHighlighted)}_updateHighlighted(){this.storedAPI.isOpen&&this._resetHighlighted()}_updateSelected(){if(this.args.selected)if("function"==typeof this.args.selected.then){if(this._lastSelectedPromise===this.args.selected)return
-this._lastSelectedPromise&&k(this._lastSelectedPromise)&&(0,s.removeObserver)(this._lastSelectedPromise,"content",this,this._selectedObserverCallback)
-let e=this.args.selected
-e.then((()=>{this.isDestroyed||this.isDestroying||k(e)&&(0,s.addObserver)(e,"content",this,this._selectedObserverCallback)})),this._lastSelectedPromise=e,this._lastSelectedPromise.then((t=>{this._lastSelectedPromise===e&&(this._resolvedSelected=t,this._highlight(t))}))}else this._resolvedSelected=void 0,this._highlight(this.args.selected)}_selectedObserverCallback(){this._resolvedSelected=this._lastSelectedPromise,this._highlight(this._resolvedSelected)}_highlight(e){e&&(0,o.get)(e,"disabled")||(this.highlighted=e)}_select(e,t){(0,l.isEqual)(this.storedAPI.selected,e)||this.args.onChange(e,this.storedAPI,t)}_choose(e,t){let r=this.args.buildSelection?this.args.buildSelection(e,this.storedAPI):e
-this.storedAPI.actions.select(r,t),!1!==this.args.closeOnSelect&&this.storedAPI.actions.close(t)}_scrollTo(e){let t=this.storedAPI
-if(!document||!e)return
-if(this.args.scrollTo)return this.args.scrollTo(e,t)
-let r=document.querySelector(`[aria-controls="ember-power-select-trigger-${t.uniqueId}"]`)
-if(!r)return
-let n=(0,c.indexOfOption)(t.results,e)
-if(-1===n)return
-let i=r.querySelectorAll("[data-option-index]").item(n)
-if(!i)return
-let o=i.offsetTop-r.offsetTop,s=o+i.offsetHeight
-s>r.offsetHeight+r.scrollTop?r.scrollTop=s-r.offsetHeight:o<r.scrollTop&&(r.scrollTop=o)}_registerAPI(e,t){let[r]=t
-this.storedAPI=r,this.args.registerAPI&&(0,a.scheduleOnce)("actions",null,this.args.registerAPI,r)}_performSearch(e,t){let[r]=t
-if(!this.args.search)return
-if(""===r)return this.loading=!1,this.lastSearchedText=r,void(void 0!==this._lastSearchPromise&&(M(this._lastSearchPromise)&&this._lastSearchPromise.cancel(),this._lastSearchPromise=void 0))
-let n=this.args.search(r,this.storedAPI)
-n&&C(n)?(this.loading=!0,void 0!==this._lastSearchPromise&&M(this._lastSearchPromise)&&this._lastSearchPromise.cancel(),this._lastSearchPromise=n,n.then((e=>{this._lastSearchPromise===n&&(this._searchResult=e,this.loading=!1,this.lastSearchedText=r,this._resetHighlighted())})).catch((()=>{this._lastSearchPromise===n&&(this.loading=!1,this.lastSearchedText=r)}))):(this.lastSearchedText=r,this._searchResult=n,this._resetHighlighted())}_defaultBuildSelection(e){return e}_routeKeydown(e,t){return 38===t.keyCode||40===t.keyCode?this._handleKeyUpDown(e,t):13===t.keyCode?this._handleKeyEnter(e,t):9===t.keyCode?this._handleKeyTab(e,t):27===t.keyCode?this._handleKeyESC(e,t):void 0}_handleKeyTab(e,t){e.actions.close(t)}_handleKeyESC(e,t){e.actions.close(t)}_handleKeyEnter(e,t){if(e.isOpen&&void 0!==e.highlighted)return e.actions.choose(e.highlighted,t),t.stopImmediatePropagation(),!1}_handleKeySpace(e,t){null!==t.target&&["TEXTAREA","INPUT"].includes(t.target.nodeName)?t.stopImmediatePropagation():e.isOpen&&void 0!==e.highlighted&&(t.stopImmediatePropagation(),t.preventDefault(),e.actions.choose(e.highlighted,t))}_handleKeyUpDown(e,t){if(e.isOpen){t.preventDefault(),t.stopPropagation()
-let r=40===t.keyCode?1:-1,n=(0,c.advanceSelectableOption)(e.results,e.highlighted,r)
-e.actions.highlight(n),e.actions.scrollTo(n)}else e.actions.open(t)}_resetHighlighted(){let e,t=this.args.defaultHighlighted||c.defaultHighlighted
-e="function"==typeof t?t({results:this.results,highlighted:this.highlighted,selected:this.selected}):t,this._highlight(e)}_filter(e,t){let r=arguments.length>2&&void 0!==arguments[2]&&arguments[2],n=R(this.args.matcher||c.defaultMatcher,c.defaultMatcher,this.args.searchField)
-return(0,c.filterOptions)(e||[],t,n,r)}_updateIsActive(e){this.isActive=e}findWithOffset(e,t,r){let n=arguments.length>3&&void 0!==arguments[3]&&arguments[3],i=R(this.args.typeAheadOptionMatcher||c.defaultTypeAheadMatcher,c.defaultTypeAheadMatcher,this.args.searchField)
-return(0,c.findOptionWithOffset)(e||[],t,i,r,n)}*triggerTypingTask(e){let t,r=1,n=this._repeatingChar,i=e.keyCode
-j(e)&&(i-=48)
-let o=String.fromCharCode(i)
-t=o===this._repeatingChar?o:this._expirableSearchText+o,t.length>1?(r=0,n=""):n=o,this.storedAPI.isOpen&&this.storedAPI.highlighted?r+=(0,c.indexOfOption)(this.storedAPI.options,this.storedAPI.highlighted):!this.storedAPI.isOpen&&this.selected?r+=(0,c.indexOfOption)(this.storedAPI.options,this.selected):r=0,this._expirableSearchText=this._expirableSearchText+o,this._repeatingChar=n
-let s=this.findWithOffset(this.storedAPI.options,t,r,!0)
-void 0!==s&&(this.storedAPI.isOpen?(this.storedAPI.actions.highlight(s),this.storedAPI.actions.scrollTo(s)):this.storedAPI.actions.select(s,e)),yield(0,h.timeout)(1e3),this._expirableSearchText="",this._repeatingChar=""}},f=T(p.prototype,"_resolvedOptions",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),m=T(p.prototype,"_resolvedSelected",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=T(p.prototype,"_repeatingChar",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),v=T(p.prototype,"_expirableSearchText",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),b=T(p.prototype,"_searchResult",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=T(p.prototype,"isActive",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),_=T(p.prototype,"loading",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),w=T(p.prototype,"searchText",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),O=T(p.prototype,"lastSearchedText",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),x=T(p.prototype,"highlighted",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T(p.prototype,"handleOpen",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"handleOpen"),p.prototype),T(p.prototype,"handleClose",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"handleClose"),p.prototype),T(p.prototype,"handleInput",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"handleInput"),p.prototype),T(p.prototype,"handleKeydown",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"handleKeydown"),p.prototype),T(p.prototype,"handleTriggerKeydown",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"handleTriggerKeydown"),p.prototype),T(p.prototype,"handleFocus",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"handleFocus"),p.prototype),T(p.prototype,"handleBlur",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"handleBlur"),p.prototype),T(p.prototype,"_search",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"_search"),p.prototype),T(p.prototype,"_updateOptions",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"_updateOptions"),p.prototype),T(p.prototype,"_updateHighlighted",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"_updateHighlighted"),p.prototype),T(p.prototype,"_updateSelected",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"_updateSelected"),p.prototype),T(p.prototype,"_highlight",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"_highlight"),p.prototype),T(p.prototype,"_select",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"_select"),p.prototype),T(p.prototype,"_choose",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"_choose"),p.prototype),T(p.prototype,"_scrollTo",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"_scrollTo"),p.prototype),T(p.prototype,"_registerAPI",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"_registerAPI"),p.prototype),T(p.prototype,"_performSearch",[o.action],Object.getOwnPropertyDescriptor(p.prototype,"_performSearch"),p.prototype),T(p.prototype,"triggerTypingTask",[d.restartableTask],Object.getOwnPropertyDescriptor(p.prototype,"triggerTypingTask"),p.prototype),p)
-function R(e,t,r){return r&&e===t?(t,n)=>e((0,o.get)(t,r),n):(t,r)=>e(t,r)}function j(e){return e.keyCode>=96&&e.keyCode<=105}e.default=A
-const I=e=>"function"==typeof e.toArray?e.toArray():e;(0,t.setComponentTemplate)(E,A)})),define("ember-power-select/components/power-select/before-options",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/runloop","@ember/object"],(function(e,t,r,n,i,o){"use strict"
-var s
-function a(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,r.createTemplateFactory)({id:"LXEg2yDD",block:'[[[41,[30,1],[[[1,"  "],[10,0],[14,0,"ember-power-select-search"],[12],[1,"\\n    "],[11,"input"],[24,"autocomplete","off"],[24,"autocorrect","off"],[24,"autocapitalize","off"],[16,"spellcheck",false],[24,"role","combobox"],[24,0,"ember-power-select-search-input"],[16,2,[30,2,["searchText"]]],[16,"aria-controls",[30,3]],[16,"placeholder",[30,4]],[24,4,"search"],[4,[38,1],["input",[30,5]],null],[4,[38,1],["focus",[30,6]],null],[4,[38,1],["blur",[30,7]],null],[4,[38,1],["keydown",[30,0,["handleKeydown"]]],null],[4,[38,2],[[30,0,["focusInput"]]],null],[4,[38,3],[[30,0,["clearSearch"]]],null],[12],[13],[1,"\\n  "],[13],[1,"\\n"]],[]],null]],["@searchEnabled","@select","@listboxId","@searchPlaceholder","@onInput","@onFocus","@onBlur"],false,["if","on","did-insert","will-destroy"]]',moduleName:"ember-power-select/components/power-select/before-options.hbs",isStrictMode:!1})
-let u=(a((s=class extends n.default{clearSearch(){(0,i.scheduleOnce)("actions",this.args.select.actions,"search","")}handleKeydown(e){if(!1===this.args.onKeydown(e))return!1
-13===e.keyCode&&this.args.select.actions.close(e)}focusInput(e){(0,i.later)((()=>{!1!==this.args.autofocus&&e.focus()}),0)}}).prototype,"clearSearch",[o.action],Object.getOwnPropertyDescriptor(s.prototype,"clearSearch"),s.prototype),a(s.prototype,"handleKeydown",[o.action],Object.getOwnPropertyDescriptor(s.prototype,"handleKeydown"),s.prototype),a(s.prototype,"focusInput",[o.action],Object.getOwnPropertyDescriptor(s.prototype,"focusInput"),s.prototype),s)
-e.default=u,(0,t.setComponentTemplate)(l,u)})),define("ember-power-select/components/power-select/no-matches-message",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"0m0XHejb",block:'[[[41,[30,1],[[[1,"  "],[10,"ul"],[14,0,"ember-power-select-options"],[14,"role","listbox"],[12],[1,"\\n    "],[10,"li"],[14,0,"ember-power-select-option ember-power-select-option--no-matches-message"],[14,"role","option"],[12],[1,"\\n      "],[1,[30,1]],[1,"\\n    "],[13],[1,"\\n  "],[13],[1,"\\n"]],[]],null]],["@noMatchesMessage"],false,["if"]]',moduleName:"ember-power-select/components/power-select/no-matches-message.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("ember-power-select/components/power-select/options",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object"],(function(e,t,r,n,i){"use strict"
-var o
-function s(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function a(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const l=(0,r.createTemplateFactory)({id:"A7yva44C",block:'[[[11,"ul"],[24,"role","listbox"],[16,"aria-controls",[29,["ember-power-select-trigger-",[30,1,["uniqueId"]]]]],[17,2],[4,[38,0],[[30,0,["addHandlers"]]],null],[4,[38,1],[[30,0,["removeHandlers"]]],null],[12],[1,"\\n"],[41,[30,1,["loading"]],[[[41,[30,3],[[[1,"      "],[10,"li"],[14,0,"ember-power-select-option ember-power-select-option--loading-message"],[14,"role","option"],[12],[1,[30,3]],[13],[1,"\\n"]],[]],null]],[]],null],[44,[[50,[30,4],0,null,null],[50,[30,5],0,null,null]],[[[42,[28,[37,6],[[28,[37,6],[[30,8]],null]],null],null,[[[41,[28,[37,7],[[30,9]],null],[[[1,"        "],[8,[30,6],null,[["@group","@select","@extra"],[[30,9],[30,1],[30,11]]],[["default"],[[[[1,"\\n          "],[8,[30,7],[[24,"role","group"],[24,0,"ember-power-select-options"]],[["@options","@select","@groupIndex","@optionsComponent","@groupComponent","@extra"],[[30,9,["options"]],[30,1],[29,[[30,12],[30,10],"."]],[30,5],[30,4],[30,11]]],[["default"],[[[[1,"\\n            "],[18,14,[[30,13],[30,1]]],[1,"\\n          "]],[13]]]]],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],[[[1,"        "],[10,"li"],[14,0,"ember-power-select-option"],[15,"aria-selected",[29,[[28,[37,9],[[30,9],[30,1,["selected"]]],null]]]],[15,"aria-disabled",[52,[30,9,["disabled"]],"true"]],[15,"aria-current",[29,[[28,[37,10],[[30,9],[30,1,["highlighted"]]],null]]]],[15,"data-option-index",[29,[[30,12],[30,10]]]],[15,"role",[52,[28,[37,10],[[30,9],[30,1,["highlighted"]]],null],"alert","option"]],[12],[1,"\\n          "],[18,14,[[30,9],[30,1]]],[1,"\\n        "],[13],[1,"\\n"]],[]]]],[9,10]],null]],[6,7]]],[13],[1,"\\n"]],["@select","&attrs","@loadingMessage","@groupComponent","@optionsComponent","Group","Options","@options","opt","index","@extra","@groupIndex","option","&default"],false,["did-insert","will-destroy","if","let","component","each","-track-array","ember-power-select-is-group","yield","ember-power-select-is-selected","eq"]]',moduleName:"ember-power-select/components/power-select/options.hbs",isStrictMode:!1}),u=!!window&&"ontouchstart"in window
-var c
-"undefined"==typeof FastBoot&&("function"!=typeof(c=window.Element.prototype).matches&&(c.matches=c.msMatchesSelector||c.mozMatchesSelector||c.webkitMatchesSelector),"function"!=typeof c.closest&&(c.closest=function(e){let t=this
-for(;null!==t&&1===t.nodeType;){if(t.matches(e))return t
-t=t.parentNode}return null}))
-let d=(o=class extends n.default{constructor(){super(...arguments),s(this,"isTouchDevice",u),s(this,"hasMoved",!1),s(this,"mouseOverHandler",(e=>{})),s(this,"mouseUpHandler",(e=>{})),s(this,"touchEndHandler",(e=>{})),s(this,"touchMoveHandler",(e=>{})),s(this,"touchStartHandler",(e=>{}))}addHandlers(e){let t=e.getAttribute("role")
-if("group"===t)return
-let r=(e,t,r)=>{if(null===r.target)return
-let n=r.target.closest("[data-option-index]")
-if(!n)return
-if(n.closest("[aria-disabled=true]"))return
-let i=n.getAttribute("data-option-index")
-null!==i&&e(this._optionFromIndex(i),t,r)}
-this.mouseUpHandler=e=>r(this.args.select.actions.choose,this.args.select,e),e.addEventListener("mouseup",this.mouseUpHandler),this.args.highlightOnHover&&(this.mouseOverHandler=e=>r(this.args.select.actions.highlight,this.args.select,e),e.addEventListener("mouseover",this.mouseOverHandler)),this.isTouchDevice&&(this.touchMoveHandler=t=>{this.hasMoved=!0,e&&e.removeEventListener("touchmove",this.touchMoveHandler)},this.touchStartHandler=t=>{e.addEventListener("touchmove",this.touchMoveHandler)},this.touchEndHandler=e=>{if(null===e.target)return
-let t=e.target.closest("[data-option-index]")
-if(null===t)return
-if(e.preventDefault(),this.hasMoved)return void(this.hasMoved=!1)
-if(t.closest("[aria-disabled=true]"))return
-let r=t.getAttribute("data-option-index")
-null!==r&&this.args.select.actions.choose(this._optionFromIndex(r),e)},e.addEventListener("touchstart",this.touchStartHandler),e.addEventListener("touchend",this.touchEndHandler)),"group"!==t&&this.args.select.actions.scrollTo(this.args.select.highlighted)}removeHandlers(e){e.removeEventListener("mouseup",this.mouseUpHandler),e.removeEventListener("mouseover",this.mouseOverHandler),e.removeEventListener("touchstart",this.touchStartHandler),e.removeEventListener("touchmove",this.touchMoveHandler),e.removeEventListener("touchend",this.touchEndHandler)}_optionFromIndex(e){let t=e.split("."),r=this.args.options[parseInt(t[0],10)]
-for(let n=1;n<t.length;n++)r=r.options[parseInt(t[n],10)]
-return r}},a(o.prototype,"addHandlers",[i.action],Object.getOwnPropertyDescriptor(o.prototype,"addHandlers"),o.prototype),a(o.prototype,"removeHandlers",[i.action],Object.getOwnPropertyDescriptor(o.prototype,"removeHandlers"),o.prototype),o)
-e.default=d,(0,t.setComponentTemplate)(l,d)})),define("ember-power-select/components/power-select/placeholder",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"7iOUtQCZ",block:'[[[41,[30,1],[[[1,"  "],[11,1],[24,0,"ember-power-select-placeholder"],[17,2],[12],[1,[30,1]],[13],[1,"\\n"]],[]],null]],["@placeholder","&attrs"],false,["if"]]',moduleName:"ember-power-select/components/power-select/placeholder.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("ember-power-select/components/power-select/power-select-group",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"UjjiJbiW",block:'[[[10,"li"],[14,0,"ember-power-select-group"],[15,"aria-disabled",[52,[30,1,["disabled"]],"true"]],[14,"role","option"],[12],[1,"\\n  "],[10,1],[14,0,"ember-power-select-group-name"],[12],[1,[30,1,["groupName"]]],[13],[1,"\\n  "],[18,2,null],[1,"\\n"],[13]],["@group","&default"],false,["if","yield"]]',moduleName:"ember-power-select/components/power-select/power-select-group.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("ember-power-select/components/power-select/search-message",["exports","@ember/component","@ember/template-factory","@ember/component/template-only"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=(0,r.createTemplateFactory)({id:"p9iIhoP1",block:'[[[10,"ul"],[14,0,"ember-power-select-options"],[14,"role","listbox"],[12],[1,"\\n  "],[10,"li"],[14,0,"ember-power-select-option ember-power-select-option--search-message"],[14,"role","option"],[12],[1,"\\n    "],[1,[30,1]],[1,"\\n  "],[13],[1,"\\n"],[13]],["@searchMessage"],false,[]]',moduleName:"ember-power-select/components/power-select/search-message.hbs",isStrictMode:!1})
-var o=(0,t.setComponentTemplate)(i,(0,n.default)())
-e.default=o})),define("ember-power-select/components/power-select/trigger",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object"],(function(e,t,r,n,i){"use strict"
-var o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const s=(0,r.createTemplateFactory)({id:"QDEVWq4x",block:'[[[41,[30,1,["selected"]],[[[41,[30,2],[[[1,"    "],[46,[30,2],null,[["extra","option","select"],[[28,[37,2],[[30,3]],null],[28,[37,2],[[30,1,["selected"]]],null],[28,[37,2],[[30,1]],null]]],null],[1,"\\n"]],[]],[[[1,"    "],[10,1],[14,0,"ember-power-select-selected-item"],[12],[18,7,[[30,1,["selected"]],[30,1]]],[13],[1,"\\n"]],[]]],[41,[28,[37,4],[[30,4],[28,[37,5],[[30,1,["disabled"]]],null]],null],[[[1,"    "],[11,1],[24,0,"ember-power-select-clear-btn"],[4,[38,6],["mousedown",[30,0,["clear"]]],null],[4,[38,6],["touchstart",[30,0,["clear"]]],null],[12],[1,"×"],[13],[1,"\\n"]],[]],null]],[]],[[[1,"  "],[46,[30,5],null,[["placeholder"],[[30,6]]],null],[1,"\\n"]],[]]],[10,1],[14,0,"ember-power-select-status-icon"],[12],[13],[1,"\\n"]],["@select","@selectedItemComponent","@extra","@allowClear","@placeholderComponent","@placeholder","&default"],false,["if","component","readonly","yield","and","not","on"]]',moduleName:"ember-power-select/components/power-select/trigger.hbs",isStrictMode:!1})
-let a=(o=class extends n.default{clear(e){if(e.stopPropagation(),this.args.select.actions.select(null),"touchstart"===e.type)return!1}},l=o.prototype,u="clear",c=[i.action],d=Object.getOwnPropertyDescriptor(o.prototype,"clear"),h=o.prototype,p={},Object.keys(d).forEach((function(e){p[e]=d[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=c.slice().reverse().reduce((function(e,t){return t(l,u,e)||e}),p),h&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(h):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(l,u,p),p=null),o)
-var l,u,c,d,h,p
-e.default=a,(0,t.setComponentTemplate)(s,a)})),define("ember-power-select/helpers/ember-power-select-is-group",["exports","@ember/component/helper","ember-power-select/utils/group-utils"],(function(e,t,r){"use strict"
-function n(e){let[t]=e
-return(0,r.isGroup)(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.emberPowerSelectIsGroup=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-power-select/helpers/ember-power-select-is-selected",["exports","@ember/component/helper","@ember/array","@ember/utils"],(function(e,t,r,n){"use strict"
-function i(e){let[t,i]=e
-if(null==i)return!1
-if((0,r.isArray)(i)){for(let e=0;e<i.length;e++)if((0,n.isEqual)(i[e],t))return!0
-return!1}return(0,n.isEqual)(t,i)}Object.defineProperty(e,"__esModule",{value:!0}),e.emberPowerSelectIsSelected=i,e.default=void 0
-var o=(0,t.helper)(i)
-e.default=o})),define("ember-power-select/utils/computed-fallback-if-undefined",["exports","@ember/object"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return(0,t.computed)({get:()=>e,set:(t,r)=>void 0===r?e:r})}})),define("ember-power-select/utils/group-utils",["exports","@ember/array","@ember/object"],(function(e,t,r){"use strict"
-function n(e){return!!e&&!!(0,r.get)(e,"groupName")&&!!(0,r.get)(e,"options")}function i(e){let t=0
-return function e(i){if(i)for(let o=0;o<(0,r.get)(i,"length");o++){let s=i.objectAt?i.objectAt(o):i[o]
-n(s)?e((0,r.get)(s,"options")):t++}}(e),t}function o(e,t){let i=0
-return function e(o){if(!o)return-1
-for(let s=0;s<(0,r.get)(o,"length");s++){let a=o.objectAt?o.objectAt(s):o[s]
-if(n(a)){let t=e((0,r.get)(a,"options"))
-if(t>-1)return t}else{if(a===t)return i
-i++}}return-1}(e)}function s(e,t){let i=0
-return function e(o,s){if(!o||t<0)return{disabled:!1,option:void 0}
-let a=0,l=(0,r.get)(o,"length")
-for(;i<=t&&a<l;){let l=o.objectAt?o.objectAt(a):o[a]
-if(n(l)){let t=e((0,r.get)(l,"options"),s||!!(0,r.get)(l,"disabled"))
-if(t)return t}else{if(i===t)return{disabled:s||!!(0,r.get)(l,"disabled"),option:l}
-i++}a++}}(e,!1)||{disabled:!1,option:void 0}}function a(e,t){let r={groupName:e.groupName,options:t}
-return e.hasOwnProperty("disabled")&&(r.disabled=e.disabled),r}function l(e,t,r){let n=i(e),a=Math.min(Math.max(o(e,t)+r,0),n-1),{disabled:l,option:u}=s(e,a)
-for(;u&&l;){let t=s(e,a+=r)
-l=t.disabled,u=t.option}return u}Object.defineProperty(e,"__esModule",{value:!0}),e.isGroup=n,e.countOptions=i,e.indexOfOption=o,e.optionAtIndex=s,e.findOptionWithOffset=function(e,t,i,o){let s,a=arguments.length>4&&void 0!==arguments[4]&&arguments[4],l=0,u=!1,c=()=>!!u
-return function e(d,h){let p=(0,r.get)(d,"length")
-for(let f=0;f<p;f++){let p=d.objectAt?d.objectAt(f):d[f],m=!!(0,r.get)(p,"disabled")
-if(!a||!m){if(n(p)){if(e((0,r.get)(p,"options"),h||m),c())return}else i(p,t)>=0?(l<o?s||(s=p):u=p,l++):l++
-if(c())return}}}(e,!1),u||s},e.filterOptions=function e(i,o,s){let l=arguments.length>3&&void 0!==arguments[3]&&arguments[3],u=(0,t.A)(),c=(0,r.get)(i,"length")
-for(let t=0;t<c;t++){let c=i.objectAt?i.objectAt(t):i[t]
-if(!l||!(0,r.get)(c,"disabled"))if(n(c)){let t=e((0,r.get)(c,"options"),o,s,l);(0,r.get)(t,"length")>0&&u.push(a(c,t))}else s(c,o)>=0&&u.push(c)}return u},e.defaultHighlighted=function(e){let{results:t,highlighted:r,selected:n}=e,i=r||n
-if(void 0===i||-1===o(t,i))return l(t,i,1)
-return i},e.advanceSelectableOption=l,e.stripDiacritics=c,e.defaultMatcher=function(e,t){return c(e).toUpperCase().indexOf(c(t).toUpperCase())},e.defaultTypeAheadMatcher=function(e,t){return c(e).toUpperCase().startsWith(c(t).toUpperCase())?1:-1}
-const u={"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ω":"ω","ς":"σ"}
-function c(e){return`${e}`.replace(/[^\u0000-\u007E]/g,(function(e){return u[e]||e}))}})),define("ember-raf-scheduler/index",["exports","@ember/runloop","@ember/debug"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.scheduler=e.Scheduler=e.Token=void 0
-class n{constructor(e){this._parent=e,this._cancelled=!1}get cancelled(){return this._cancelled||(this._cancelled=!!this._parent&&this._parent.cancelled)}cancel(){this._cancelled=!0}}e.Token=n
-class i{constructor(){this.sync=[],this.layout=[],this.measure=[],this.affect=[],this.jobs=0,this._nextFlush=null,this.ticks=0}schedule(e,t,r){this.jobs++
-let i=new n(r)
-return this[e].push(function(e,t){return function(){!1===t.cancelled&&e()}}(t,i)),this._flush(),i}forget(e){e&&e.cancel()}_flush(){null===this._nextFlush&&(this._nextFlush=requestAnimationFrame((()=>{this.flush()})))}flush(){let e,r
-if(this.jobs=0,this.sync.length>0){for((0,t.begin)(),r=this.sync,this.sync=[],e=0;e<r.length;e++)r[e]();(0,t.end)()}if(this.layout.length>0)for(r=this.layout,this.layout=[],e=0;e<r.length;e++)r[e]()
-if(this.measure.length>0)for(r=this.measure,this.measure=[],e=0;e<r.length;e++)r[e]()
-if(this.affect.length>0)for(r=this.affect,this.affect=[],e=0;e<r.length;e++)r[e]()
-this._nextFlush=null,this.jobs>0&&this._flush()}}e.Scheduler=i
-const o=new i
-e.scheduler=o
-var s=o
-e.default=s})),define("ember-ref-bucket/helpers/ref-to",["exports","@ember/component/helper","ember-ref-bucket/utils/ref","@ember/destroyable","@ember/application"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class o extends t.default{constructor(){var e,t,r
-super(...arguments),r=null,(t="_watcher")in(e=this)?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r}compute(e,t){let[o]=e,{bucket:s,tracked:a}=t
-const l=s||(0,i.getOwner)(this)
-return this._name!==o&&(this._watcher&&(0,n.unregisterDestructor)(this,this._watcher),this._watcher=(0,r.watchFor)(o,l,(()=>{this.recompute()})),(0,n.registerDestructor)(this,this._watcher),this._name=o),a?(0,r.bucketFor)(l).getTracked(o):(0,r.bucketFor)(l).get(o)}}e.default=o}))
-define("ember-ref-bucket/index",["exports","ember-ref-bucket/utils/ref","@ember/application","ember-ref-bucket/utils/prototype-reference"],(function(e,t,r,n){"use strict"
-function i(e,t,r,n){return null==e?null:"function"==typeof r?(t.has(e)||t.set(e,r.call(n,e)),t.get(e)):e}Object.defineProperty(e,"__esModule",{value:!0}),e.nodeFor=function(e,r){return(0,t.bucketFor)(e).get(r)},e.ref=function(e,r){return function(o,s){const a=new WeakMap
-return"function"==typeof r&&(0,n.addPrototypeReference)(o,s,e),{get(){return i((0,t.bucketFor)(this).get(e),a,r,this)}}}},e.globalRef=function(e,o){return function(s,a){const l=new WeakMap
-return"function"==typeof o&&(0,n.addPrototypeReference)(s,a,e),{get(){return i((0,t.bucketFor)((0,r.getOwner)(this)||(0,t.resolveGlobalRef)()).get(e),l,o,this)}}}},e.trackedRef=function(e,r){return function(o,s){const a=new WeakMap
-return"function"==typeof r&&(0,n.addPrototypeReference)(o,s,e),{get(){return i((0,t.bucketFor)(this).getTracked(e),a,r,this)}}}},e.trackedGlobalRef=function(e,o){return function(s,a){const l=new WeakMap
-return"function"==typeof o&&(0,n.addPrototypeReference)(s,a,e),{get(){return i((0,t.bucketFor)((0,r.getOwner)(this)||(0,t.resolveGlobalRef)()).getTracked(e),l,o,this)}}}},Object.defineProperty(e,"registerNodeDestructor",{enumerable:!0,get:function(){return t.registerNodeDestructor}}),Object.defineProperty(e,"unregisterNodeDestructor",{enumerable:!0,get:function(){return t.unregisterNodeDestructor}})})),define("ember-ref-bucket/modifiers/create-ref",["exports","ember-modifier","@ember/application","@ember/object","@ember/debug","ember-ref-bucket/utils/ref","ember-ref-bucket/utils/prototype-reference","@ember/destroyable"],(function(e,t,r,n,i,o,s,a){"use strict"
-var l
-function u(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let c=(l=class extends t.default{constructor(){super(...arguments),u(this,"_key",void 0),u(this,"_ctx",void 0),u(this,"_element",void 0),u(this,"defaultMutationObserverOptions",{attributes:!1,characterData:!1,childList:!1,subtree:!1}),(0,o.setGlobalRef)((0,r.getOwner)(this)),(0,a.registerDestructor)(this,(()=>{this.cleanMutationObservers(),this.cleanResizeObservers(),(0,o.getNodeDestructors)(this._element).forEach((e=>e()))}))}markDirty(){(0,o.bucketFor)(this._ctx).dirtyTrackedCell(this._key)}cleanMutationObservers(){this._mutationsObserver&&this._mutationsObserver.disconnect()}cleanResizeObservers(){this._resizeObserver&&this._resizeObserver.unobserve(this.element)}installMutationObservers(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-this._mutationsObserver=new MutationObserver(this.markDirty)
-const t=this.getObserverOptions(e)
-delete t.resize,(t.attributes||t.characterdata||t.childlist)&&this._mutationsObserver.observe(this.element,t)}validateTrackedOptions(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-const t=["subtree","attributes","children","resize","character"]
-t.some((t=>t in e))}getObserverOptions(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=!1,r=this.defaultMutationObserverOptions.subtree,n=this.defaultMutationObserverOptions.attributes,i=this.defaultMutationObserverOptions.characterData,o=this.defaultMutationObserverOptions.childList
-return"subtree"in e&&(r=e.subtree),"attributes"in e&&(n=e.attributes),"children"in e&&(o=e.children),"resize"in e&&(t=e.resize),"character"in e&&(i=e.character),{subtree:r,attributes:n,childList:o,resize:t,characterData:i}}installResizeObservers(e){this._resizeObserver=new ResizeObserver(this.markDirty),this._resizeObserver.observe(e)}modify(e,t,r){const n=this.name(t),i=this.ctx(r,t)
-this._key=n,this._ctx=i,this._element=e,this.validateTrackedOptions(r),this.cleanMutationObservers(),this.cleanResizeObservers(),n===this._key&&this._ctx===i||(0,o.bucketFor)(this._ctx).add(this._key,null),(0,o.watchFor)(n,i,(()=>{(0,s.getReferencedKeys)(i,n).forEach((e=>{i[e]}))})),(0,o.bucketFor)(i).add(n,e),this.isTracked(r)&&(this.installMutationObservers(r),this.getObserverOptions(r).resize&&this.installResizeObservers(e))}ctx(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-return e.bucket||(0,r.getOwner)(this)}isTracked(){return(arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}).tracked||!1}name(e){return e[0]}},d=l.prototype,h="markDirty",p=[n.action],f=Object.getOwnPropertyDescriptor(l.prototype,"markDirty"),m=l.prototype,g={},Object.keys(f).forEach((function(e){g[e]=f[e]})),g.enumerable=!!g.enumerable,g.configurable=!!g.configurable,("value"in g||g.initializer)&&(g.writable=!0),g=p.slice().reverse().reduce((function(e,t){return t(d,h,e)||e}),g),m&&void 0!==g.initializer&&(g.value=g.initializer?g.initializer.call(m):void 0,g.initializer=void 0),void 0===g.initializer&&(Object.defineProperty(d,h,g),g=null),l)
-var d,h,p,f,m,g
-e.default=c})),define("ember-ref-bucket/utils/prototype-reference",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.addPrototypeReference=function(e,r,n){t.has(e)||t.set(e,{})
-let i=t.get(e)
-n in i||(i[n]=new Set)
-i[n].add(r)},e.getReferencedKeys=function(e,r){let n=e
-for(;n.__proto__;)if(n=n.__proto__,t.has(n)){let e=t.get(n)
-if(r in e)return Array.from(e[r])}return[]}
-const t=new WeakMap})),define("ember-ref-bucket/utils/ref",["exports","@ember/destroyable","@glimmer/tracking"],(function(e,t,r){"use strict"
-var n,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.setGlobalRef=function(e){o=e},e.resolveGlobalRef=function(){return o},e.getNodeDestructors=function(e){return a.get(e)||[]},e.registerNodeDestructor=function(e,t){a.has(e)||a.set(e,[])
-a.get(e).push(t)},e.unregisterNodeDestructor=function(e,t){const r=a.get(e)||[]
-a.set(e,r.filter((e=>e!==t)))},e.bucketFor=m,e.watchFor=function(e,t,r){return m(t).addNotificationFor(e,r)}
-let o=null
-const s=new WeakMap,a=new WeakMap
-let l=(n=class{constructor(){var e,t,r,n
-e=this,t="value",n=this,(r=i)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}},u=n.prototype,c="value",d=[r.tracked],h={configurable:!0,enumerable:!0,writable:!0,initializer:function(){return null}},f={},Object.keys(h).forEach((function(e){f[e]=h[e]})),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=d.slice().reverse().reduce((function(e,t){return t(u,c,e)||e}),f),p&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(p):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(u,c,f),f=null),i=f,n)
-var u,c,d,h,p,f
-function m(e){const r=e
-if(!s.has(r)){if(s.set(r,{bucket:{},keys:{},createTrackedCell(e){e in this.keys||(this.keys[e]=new l)},get(e){return this.createTrackedCell(e),this.bucket[e]||null},dirtyTrackedCell(e){this.createTrackedCell(e)
-const t=this.keys[e].value
-this.keys[e].value=t},getTracked(e){return this.createTrackedCell(e),this.keys[e].value},add(e,t){this.createTrackedCell(e),this.keys[e].value=t,this.bucket[e]=t,e in this.notificationsFor||(this.notificationsFor[e]=[]),this.notificationsFor[e].forEach((e=>e()))},addNotificationFor(e,t){return e in this.notificationsFor||(this.notificationsFor[e]=[]),this.notificationsFor[e].push(t),()=>{this.notificationsFor[e]=this.notificationsFor[e].filter((e=>e!=e))}},notificationsFor:{}}),(0,t.isDestroyed)(r)||(0,t.isDestroying)(r))try{return s.get(r)}finally{s.delete(r)}(0,t.registerDestructor)(r,(()=>{s.delete(r)}))}return s.get(r)}})),define("ember-render-helpers/helpers/did-insert",["exports","@ember/component/helper","@ember/debug"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{constructor(){var e,t,r
-super(...arguments),r=!1,(t="didRun")in(e=this)?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r}compute(e,t){const r=e[0]
-this.didRun||(this.didRun=!0,r(e.slice(1),t))}}e.default=n})),define("ember-render-helpers/helpers/did-update",["exports","@ember/component/helper","@ember/debug"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class n extends t.default{constructor(){var e,t,r
-super(...arguments),r=!1,(t="didRun")in(e=this)?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r}compute(e,t){const r=e[0]
-if(!this.didRun)return this.didRun=!0,e.forEach((()=>{})),void Object.values(t)
-r(e.slice(1),t)}}e.default=n})),define("ember-render-helpers/helpers/will-destroy",["exports","@ember/component/helper","@ember/debug"],(function(e,t,r){"use strict"
-function n(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class i extends t.default{constructor(){super(...arguments),n(this,"fn",void 0),n(this,"positional",void 0),n(this,"named",void 0)}compute(e,t){const r=e[0]
-this.fn=r,this.positional=e.slice(1),this.named=t}willDestroy(){if(this.fn&&this.positional&&this.named){const{fn:e}=this
-e(this.positional,this.named)}super.willDestroy()}}e.default=i})),define("ember-render-helpers/types",[],(function(){})),define("ember-resize-observer-service/services/resize-observer",["exports","@ember/service","@ember/object","@ember/debug","ember-resize-observer-service/utils/ignore-ro-error"],(function(e,t,r,n,i){"use strict"
-var o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let s=(o=class extends t.default{init(){super.init(...arguments),this.setup()}setup(){this.callbacks=null,this.observer=null,"undefined"==typeof FastBoot&&"undefined"!=typeof window&&window.ResizeObserver&&((0,i.default)(),this.callbacks=new WeakMap,this.observer=new window.ResizeObserver(this.handleResize))}get isEnabled(){return!!this.observer}observe(e,t){if(!this.isEnabled)return
-const r=this.callbacks.get(e)
-r?r.add(t):(this.callbacks.set(e,new Set([t])),this.observer.observe(e))}unobserve(e,t){if(!this.isEnabled)return
-const r=this.callbacks.get(e)
-r&&(r.delete(t),t&&r.size||(this.callbacks.delete(e),this.observer.unobserve(e)))}clear(){this.isEnabled&&(this.callbacks=new WeakMap,this.observer.disconnect())}willDestroy(){this.clear()}handleResize(e){for(const t of e){const e=this.callbacks.get(t.target)
-if(e)for(const r of e)r(t)}}},a=o.prototype,l="handleResize",u=[r.action],c=Object.getOwnPropertyDescriptor(o.prototype,"handleResize"),d=o.prototype,h={},Object.keys(c).forEach((function(e){h[e]=c[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=u.slice().reverse().reduce((function(e,t){return t(a,l,e)||e}),h),d&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(d):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(a,l,h),h=null),o)
-var a,l,u,c,d,h
-e.default=s})),define("ember-resize-observer-service/utils/ignore-ro-error",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){if("function"!=typeof window.onerror)return
-const e=window.onerror
-window.onerror=function(r){if(r===t)return!0
-for(var n=arguments.length,i=new Array(n>1?n-1:0),o=1;o<n;o++)i[o-1]=arguments[o]
-e(r,...i)}}
-const t="ResizeObserver loop limit exceeded"})),define("ember-resolver/features",[],(function(){})),define("ember-resolver/index",["exports","ember-resolver/resolvers/classic"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-resolver/resolver",["exports","ember-resolver/resolvers/classic"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-resolver/resolvers/classic/container-debug-adapter",["exports","@ember/array","@ember/debug/container-debug-adapter","ember-resolver/resolvers/classic/index","@ember/application"],(function(e,t,r,n,i){"use strict"
-function o(e,t,r){let n=t.match(new RegExp("^/?"+r+"/(.+)/"+e+"$"))
-if(null!==n)return n[1]}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var s=r.default.extend({_moduleRegistry:null,init(){this._super(...arguments),this.namespace=(0,i.getOwner)(this).lookup("application:main"),this._moduleRegistry||(this._moduleRegistry=new n.ModuleRegistry)},canCatalogEntriesByType(e){return"model"===e||this._super(...arguments)},catalogEntriesByType(e){let r=this._moduleRegistry.moduleNames(),n=(0,t.A)(),i=this.namespace.modulePrefix
-for(let t=0,s=r.length;t<s;t++){let s=r[t]
-if(-1!==s.indexOf(e)){let t=o(e,s,this.namespace.podModulePrefix||i)
-t||(t=s.split(e+"s/").pop()),n.addObject(t)}}return n}})
-e.default=s})),define("ember-resolver/resolvers/classic/index",["exports","ember","@ember/debug","@ember/object","@ember/string","ember-resolver/utils/class-factory"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.ModuleRegistry=void 0,void 0===requirejs.entries&&(requirejs.entries=requirejs._eak_seen)
-class s{constructor(e){this._entries=e||requirejs.entries}moduleNames(){return Object.keys(this._entries)}has(e){return e in this._entries}get(){return require(...arguments)}}e.ModuleRegistry=s
-const a=n.default.extend({resolveOther:function(e){let t=this.findModuleName(e)
-if(t){let r=this._extractDefaultExport(t,e)
-if(void 0===r)throw new Error(` Expected to find: '${e.fullName}' within '${t}' but got 'undefined'. Did you forget to 'export default' within '${t}'?`)
-return this.shouldWrapInClassFactory(r,e)&&(r=(0,o.default)(r)),r}},parseName:function(e){if(!0===e.parsedName)return e
-let t,r,o,s=e.split("@")
-if(3===s.length){if(0===s[0].length){t=`@${s[1]}`
-let e=s[2].split(":")
-r=e[0],o=e[1]}else t=`@${s[1]}`,r=s[0].slice(0,-1),o=s[2]
-"template:components"===r&&(o=`components/${o}`,r="template")}else if(2===s.length){let e=s[0].split(":")
-if(2===e.length)0===e[1].length?(r=e[0],o=`@${s[1]}`):(t=e[1],r=e[0],o=s[1])
-else{let e=s[1].split(":")
-t=s[0],r=e[0],o=e[1]}"template"===r&&0===t.lastIndexOf("components/",0)&&(o=`components/${o}`,t=t.slice(11))}else s=e.split(":"),r=s[0],o=s[1]
-let a=o,l=(0,n.get)(this,"namespace")
-return{parsedName:!0,fullName:e,prefix:t||this.prefix({type:r}),type:r,fullNameWithoutType:a,name:o,root:l,resolveMethodName:"resolve"+(0,i.classify)(r)}},pluralizedTypes:null,moduleRegistry:null,makeToString(e,t){return this.namespace.modulePrefix+"@"+t+":"},shouldWrapInClassFactory:()=>!1,init(){this._super(),this.moduleBasedResolver=!0,this._moduleRegistry||(this._moduleRegistry=new s),this._normalizeCache=Object.create(null),this.pluralizedTypes=this.pluralizedTypes||Object.create(null),this.pluralizedTypes.config||(this.pluralizedTypes.config="config"),this._deprecatedPodModulePrefix=!1},normalize(e){return this._normalizeCache[e]||(this._normalizeCache[e]=this._normalize(e))},resolve(e){let t,r=this.parseName(e),n=r.resolveMethodName
-return"function"==typeof this[n]&&(t=this[n](r)),null==t&&(t=this.resolveOther(r)),t},_normalize(e){let t=e.split(":")
-if(t.length>1){let e=t[0]
-return"component"===e||"helper"===e||"modifier"===e||"template"===e&&0===t[1].indexOf("components/")?e+":"+t[1].replace(/_/g,"-"):e+":"+(0,i.dasherize)(t[1].replace(/\./g,"/"))}return e},pluralize(e){return this.pluralizedTypes[e]||(this.pluralizedTypes[e]=e+"s")},podBasedLookupWithPrefix(e,t){let r=t.fullNameWithoutType
-return"template"===t.type&&(r=r.replace(/^components\//,"")),e+"/"+r+"/"+t.type},podBasedModuleName(e){let t=this.namespace.podModulePrefix||this.namespace.modulePrefix
-return this.podBasedLookupWithPrefix(t,e)},podBasedComponentsInSubdir(e){let t=this.namespace.podModulePrefix||this.namespace.modulePrefix
-if(t+="/components","component"===e.type||/^components/.test(e.fullNameWithoutType))return this.podBasedLookupWithPrefix(t,e)},resolveEngine(e){let t=e.fullNameWithoutType+"/engine"
-if(this._moduleRegistry.has(t))return this._extractDefaultExport(t)},resolveRouteMap(e){let t=e.fullNameWithoutType,r=t+"/routes"
-if(this._moduleRegistry.has(r)){let e=this._extractDefaultExport(r)
-return e}},resolveTemplate(e){let r=this.resolveOther(e)
-return null==r&&(r=t.default.TEMPLATES[e.fullNameWithoutType]),r},mainModuleName(e){if("main"===e.fullNameWithoutType)return e.prefix+"/"+e.type},defaultModuleName(e){return e.prefix+"/"+this.pluralize(e.type)+"/"+e.fullNameWithoutType},nestedColocationComponentModuleName(e){if("component"===e.type)return e.prefix+"/"+this.pluralize(e.type)+"/"+e.fullNameWithoutType+"/index"},prefix(e){let t=this.namespace.modulePrefix
-return this.namespace[e.type+"Prefix"]&&(t=this.namespace[e.type+"Prefix"]),t},moduleNameLookupPatterns:(0,n.computed)((function(){return[this.podBasedModuleName,this.podBasedComponentsInSubdir,this.mainModuleName,this.defaultModuleName,this.nestedColocationComponentModuleName]})).readOnly(),findModuleName(e,t){let r,n=this.get("moduleNameLookupPatterns")
-for(let i=0,o=n.length;i<o;i++){let o=n[i].call(this,e)
-if(o&&(o=this.chooseModuleName(o,e)),o&&this._moduleRegistry.has(o)&&(r=o),t||this._logLookup(r,e,o),r)return r}},chooseModuleName(e,t){let r=(0,i.underscore)(e)
-if(e!==r&&this._moduleRegistry.has(e)&&this._moduleRegistry.has(r))throw new TypeError(`Ambiguous module names: '${e}' and '${r}'`)
-if(this._moduleRegistry.has(e))return e
-if(this._moduleRegistry.has(r))return r
-let n=e.replace(/\/-([^/]*)$/,"/_$1")
-if(this._moduleRegistry.has(n))return n},lookupDescription(e){let t=this.parseName(e)
-return this.findModuleName(t,!0)},_logLookup(e,r,n){if(!t.default.ENV.LOG_MODULE_RESOLVER&&!r.root.LOG_RESOLVER)return
-let i,o=e?"[✓]":"[ ]"
-i=r.fullName.length>60?".":new Array(60-r.fullName.length).join("."),n||(n=this.lookupDescription(r)),console&&console.info&&console.info(o,r.fullName,i,n)},knownForType(e){let t=this._moduleRegistry.moduleNames(),r=Object.create(null)
-for(let n=0,i=t.length;n<i;n++){let i=t[n],o=this.translateToContainerFullname(e,i)
-o&&(r[o]=!0)}return r},translateToContainerFullname(e,t){let r=this.prefix({type:e}),n=r+"/",i="/"+e,o=t.indexOf(n),s=t.indexOf(i)
-if(0===o&&s===t.length-i.length&&t.length>n.length+i.length)return e+":"+t.slice(o+n.length,s)
-let a=r+"/"+this.pluralize(e)+"/"
-return 0===t.indexOf(a)&&t.length>a.length?e+":"+t.slice(a.length):void 0},_extractDefaultExport(e){let t=this._moduleRegistry.get(e,null,null,!0)
-return t&&t.default&&(t=t.default),t}})
-a.reopenClass({moduleBasedResolver:!0})
-var l=a
-e.default=l})),define("ember-resolver/utils/class-factory",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return{create:t=>"function"==typeof e.extend?e.extend(t):e}}})),define("ember-route-action-helper/-private/internals",["exports"],(function(e){"use strict"
-let t
-Object.defineProperty(e,"__esModule",{value:!0}),t="ember-htmlbars/keywords/closure-action"in Ember.__loader.registry?Ember.__loader.require("ember-htmlbars/keywords/closure-action"):"ember-routing-htmlbars/keywords/closure-action"in Ember.__loader.registry?Ember.__loader.require("ember-routing-htmlbars/keywords/closure-action"):{}
-e.ACTION=t.ACTION})),define("ember-route-action-helper/helpers/route-action",["exports","ember-route-action-helper/-private/internals"],(function(e,t){"use strict"
-function r(e,t){let r,n=Ember.A(function(e){var t=function(e){let t=e._routerMicrolib||e.router
-return{currentInfos:t.currentRouteInfos||t.currentHandlerInfos,mapBy:t.currentRouteInfos?"route":"handler"}}(e)
-const r=t.currentInfos,n=t.mapBy
-return Ember.A(r).mapBy(n).reverse()}(e)).find((e=>{let n=e.actions||e._actions
-return r=n[t],"function"==typeof r}))
-return{action:r,handler:n}}Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Helper.extend({router:Ember.computed((function(){return Ember.getOwner(this).lookup("router:main")})).readOnly(),compute([e,...n]){let i=Ember.get(this,"router")
-Ember.runInDebug((()=>{r(i,e).handler}))
-let o=function(...t){var o=r(i,e)
-let s=o.action,a=o.handler,l=n.concat(t)
-return Ember.run.join(a,s,...l)}
-return o[t.ACTION]=!0,o}})})),define("ember-router-helpers/helpers/is-active",["exports","@ember/service","@ember/component/helper","ember-router-helpers/utils/handle-query-params","ember-router-helpers/utils/track-active-route"],(function(e,t,r,n,i){"use strict"
-var o,s
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let a=(o=class extends r.default{constructor(){var e,t,r,n
-super(...arguments),e=this,t="router",n=this,(r=s)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}compute(e){(0,i.default)(this.router)
-let t=(0,n.default)(e)
-return this.router.isActive(...t)}},l=o.prototype,u="router",c=[t.inject],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(d).forEach((function(e){p[e]=d[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=c.slice().reverse().reduce((function(e,t){return t(l,u,e)||e}),p),h&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(h):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(l,u,p),p=null),s=p,o)
-var l,u,c,d,h,p
-e.default=a})),define("ember-router-helpers/helpers/root-url",["exports","@ember/component/helper","@ember/service"],(function(e,t,r){"use strict"
-var n,i
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let o=(n=class extends t.default{constructor(){var e,t,r,n
-super(...arguments),e=this,t="router",n=this,(r=i)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}compute(){return this.router.rootURL}},s=n.prototype,a="router",l=[r.inject],u={configurable:!0,enumerable:!0,writable:!0,initializer:null},d={},Object.keys(u).forEach((function(e){d[e]=u[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=l.slice().reverse().reduce((function(e,t){return t(s,a,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(s,a,d),d=null),i=d,n)
-var s,a,l,u,c,d
-e.default=o})),define("ember-router-helpers/helpers/route-params",["exports","@ember/service","@ember/component/helper","ember-router-helpers/utils/route-params"],(function(e,t,r,n){"use strict"
-var i,o
-Object.defineProperty(e,"__esModule",{value:!0}),e.setRouteParamsClass=function(e){s=e},e.default=void 0
-let s=n.default
-let a=(i=class extends r.default{constructor(){var e,t,r,n
-super(...arguments),e=this,t="router",n=this,(r=o)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}compute(e){return new s(this.router,e)}},l=i.prototype,u="router",c=[t.inject],d={configurable:!0,enumerable:!0,writable:!0,initializer:null},p={},Object.keys(d).forEach((function(e){p[e]=d[e]})),p.enumerable=!!p.enumerable,p.configurable=!!p.configurable,("value"in p||p.initializer)&&(p.writable=!0),p=c.slice().reverse().reduce((function(e,t){return t(l,u,e)||e}),p),h&&void 0!==p.initializer&&(p.value=p.initializer?p.initializer.call(h):void 0,p.initializer=void 0),void 0===p.initializer&&(Object.defineProperty(l,u,p),p=null),o=p,i)
-var l,u,c,d,h,p
-e.default=a})),define("ember-router-helpers/helpers/transition-to",["exports","@ember/service","@ember/component/helper","ember-router-helpers/utils/handle-query-params"],(function(e,t,r,n){"use strict"
-var i,o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let s=(i=class extends r.default{constructor(){var e,t,r,n
-super(...arguments),e=this,t="router",n=this,(r=o)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}compute(e){return t=>{void 0!==t&&"function"==typeof t.preventDefault&&t.preventDefault()
-let r=(0,n.default)(e)
-return this.router.transitionTo(...r)}}},a=i.prototype,l="router",u=[t.inject],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},h={},Object.keys(c).forEach((function(e){h[e]=c[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=u.slice().reverse().reduce((function(e,t){return t(a,l,e)||e}),h),d&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(d):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(a,l,h),h=null),o=h,i)
-var a,l,u,c,d,h
-e.default=s})),define("ember-router-helpers/helpers/url-for",["exports","@ember/service","@ember/component/helper","ember-router-helpers/utils/handle-query-params"],(function(e,t,r,n){"use strict"
-var i,o
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-let s=(i=class extends r.default{constructor(){var e,t,r,n
-super(...arguments),e=this,t="router",n=this,(r=o)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}compute(e){let t=(0,n.default)(e)
-return this.router.urlFor(...t)}},a=i.prototype,l="router",u=[t.inject],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},h={},Object.keys(c).forEach((function(e){h[e]=c[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=u.slice().reverse().reduce((function(e,t){return t(a,l,e)||e}),h),d&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(d):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(a,l,h),h=null),o=h,i)
-var a,l,u,c,d,h
-e.default=s})),define("ember-router-helpers/utils/handle-query-params",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let t=e[e.length-1]
-t&&t.isQueryParams&&((e=e.slice())[e.length-1]={queryParams:t.values})
-return e}})),define("ember-router-helpers/utils/route-params",["exports","ember-router-helpers/utils/handle-query-params","ember-router-helpers/utils/track-active-route"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default=class{constructor(e,t){this._router=e,this._inputParams=t,this._transitionTo=void 0,this._replaceWith=void 0,this._processedParams=void 0}get isActive(){return(0,r.default)(this._router),this._router.isActive(...this._params)}get url(){return this._router.urlFor(...this._params)}get transitionTo(){return void 0===this._transitionTo&&(this._transitionTo=e=>(void 0!==e&&"function"==typeof e.preventDefault&&e.preventDefault(),this._router.transitionTo(...this._params))),this._transitionTo}get replaceWith(){return void 0===this._replaceWith&&(this._replaceWith=()=>this._router.replaceWith(...this._params)),this._replaceWith}get _params(){return this._processedParams||(this._processedParams=(0,t.default)(this._inputParams)),this._processedParams}}})),define("ember-router-helpers/utils/track-active-route",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){e.currentURL,e.currentRouteName}})),define("ember-set-helper/helpers/set",["exports","@ember/component/helper","@ember/debug","@ember/object"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=(0,t.helper)((function(e){let[t,r,i]=e
-return 3===e.length?()=>(0,n.set)(t,r,i):e=>(0,n.set)(t,r,e)}))
-e.default=i})),define("ember-stargate/components/portal-target",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@ember/service","@ember/debug"],(function(e,t,r,n,i,o,s){"use strict"
-var a,l,u
-function c(e,t,r,n,i){var o={}
-return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const d=(0,r.createTemplateFactory)({id:"DU6aYr6I",block:'[[[11,0],[17,1],[4,[38,0],[[30,0,["register"]]],null],[4,[38,1],[[30,0,["unregister"]]],null],[12],[1,"\\n  "],[18,2,[[30,0,["count"]]]],[1,"\\n"],[13]],["&attrs","&default"],false,["did-insert","will-destroy","yield"]]',moduleName:"ember-stargate/components/portal-target.hbs",isStrictMode:!1})
-let h=(a=(0,o.inject)("-portal"),l=class extends n.default{constructor(){var e,t,r,n
-super(...arguments),e=this,t="portalService",n=this,(r=u)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}get count(){return this.portalService.getPortalCount(this.args.name)}register(e){const t={multiple:this.args.multiple,onChange:this.args.onChange}
-this.portalService.registerTarget(this.args.name,e,t)}unregister(){this.portalService.unregisterTarget(this.args.name)}},u=c(l.prototype,"portalService",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),c(l.prototype,"register",[i.action],Object.getOwnPropertyDescriptor(l.prototype,"register"),l.prototype),c(l.prototype,"unregister",[i.action],Object.getOwnPropertyDescriptor(l.prototype,"unregister"),l.prototype),l)
-e.default=h,(0,t.setComponentTemplate)(d,h)})),define("ember-stargate/components/portal",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/service","@ember/runloop"],(function(e,t,r,n,i,o){"use strict"
-var s,a,l
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const u=(0,r.createTemplateFactory)({id:"qOmMchRA",block:'[[[41,[30,0,["renderInPlace"]],[[[1,"  "],[18,1,null],[1,"\\n"]],[]],[[[41,[30,0,["target"]],[[[41,[30,0,["target","multiple"]],[[[40,[[[1,"      "],[18,1,null],[1,"\\n"]],[]],"%cursor:0%",[30,0,["target","element"]],null]],[]],[[[40,[[[1,"      "],[18,1,null],[1,"\\n"]],[]],"%cursor:1%",[30,0,["target","element"]]]],[]]]],[]],null]],[]]]],["&default"],false,["if","yield","in-element"]]',moduleName:"ember-stargate/components/portal.hbs",isStrictMode:!1})
-let c=(s=(0,i.inject)("-portal"),a=class extends n.default{constructor(){var e,t,r,n
-super(...arguments),e=this,t="portalService",n=this,(r=l)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0}),(0,o.next)((()=>this.portalService.registerPortal(this.args.target)))}get target(){return this.args.target&&this.portalService.getTarget(this.args.target)}get renderInPlace(){return!0===this.args.renderInPlace||!this.target&&"inplace"===this.args.fallback}willDestroy(){super.willDestroy(),(0,o.next)((()=>this.portalService.unregisterPortal(this.args.target)))}},d=a.prototype,h="portalService",p=[s],f={configurable:!0,enumerable:!0,writable:!0,initializer:null},g={},Object.keys(f).forEach((function(e){g[e]=f[e]})),g.enumerable=!!g.enumerable,g.configurable=!!g.configurable,("value"in g||g.initializer)&&(g.writable=!0),g=p.slice().reverse().reduce((function(e,t){return t(d,h,e)||e}),g),m&&void 0!==g.initializer&&(g.value=g.initializer?g.initializer.call(m):void 0,g.initializer=void 0),void 0===g.initializer&&(Object.defineProperty(d,h,g),g=null),l=g,a)
-var d,h,p,f,m,g
-e.default=c,(0,t.setComponentTemplate)(u,c)})),define("ember-stargate/services/-portal",["exports","@ember/service","@ember/debug","tracked-maps-and-sets"],(function(e,t,r,n){"use strict"
-function i(e,t){var r=function(e,t,r){if(!t.has(e))throw new TypeError("attempted to "+r+" private field on non-instance")
-return t.get(e)}(e,t,"get")
-return function(e,t){if(t.get)return t.get.call(e)
-return t.value}(e,r)}function o(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class s{constructor(e,t,r){var n
-o(this,"name",void 0),o(this,"element",void 0),o(this,"multiple",void 0),o(this,"onChange",void 0),this.name=e,this.element=t,this.multiple=null!==(n=r.multiple)&&void 0!==n&&n,this.onChange=r.onChange}}var a=new WeakMap,l=new WeakMap
-class u extends t.default{constructor(){super(...arguments),a.set(this,{writable:!0,value:new n.TrackedMap}),l.set(this,{writable:!0,value:new n.TrackedMap})}getTarget(e){return i(this,a).get(e)}getPortalCount(e){var t
-return null!==(t=i(this,l).get(e))&&void 0!==t?t:0}registerTarget(e,t,r){i(this,a).set(e,new s(e,t,r))}unregisterTarget(e){i(this,a).delete(e)}registerPortal(e){var t
-const r=(null!==(t=i(this,l).get(e))&&void 0!==t?t:0)+1
-i(this,l).set(e,r)
-const n=this.getTarget(e)
-n&&n.onChange&&n.onChange(r)}unregisterPortal(e){var t
-let r=null!==(t=i(this,l).get(e))&&void 0!==t?t:0
-r--,i(this,l).set(e,r)
-const n=this.getTarget(e)
-n&&n.onChange&&n.onChange(r)}}e.default=u}))
-define("ember-string-fns/helpers/string-char-at",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t="",r]=e
-return t.charAt(r)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringCharAt=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-char-code-at",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t="",r]=e
-return t.charCodeAt(r)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringCharCodeAt=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-code-point-at",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t="",r]=e
-return t.codePointAt(r)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringCodePointAt=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-concat",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[...t]=e
-return t.reduce(((e,t)=>e+=t),"")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringConcat=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-ends-with",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r,n=!1]=e,i=!1
-if(t&&r){let e,o=t.length
-o-=r.length,e=n?t.toLowerCase().indexOf(r.toLowerCase(),o):t.indexOf(r,o),i=-1!==e&&e===o}return i}Object.defineProperty(e,"__esModule",{value:!0}),e.stringEndsWith=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-equals",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[...t]=e
-if(t.length<2)return!1
-const r=t.shift()
-return t.every((e=>e===r))}Object.defineProperty(e,"__esModule",{value:!0}),e.stringEquals=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-from-char-code",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[...t]=e
-return String.fromCharCode(...t)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringFromCharCode=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-from-code-point",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[...t]=e
-return String.fromCodePoint(...t)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringFromCodePoint=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-html-safe",["exports","@ember/component/helper"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=(0,t.helper)((function(e){return e}))
-e.default=r})),define("ember-string-fns/helpers/string-includes",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r,n=!1]=e,i=!1
-return t&&r&&(i=n?-1!==t.toLowerCase().indexOf(r.toLowerCase()):-1!==t.indexOf(r)),i}Object.defineProperty(e,"__esModule",{value:!0}),e.stringIncludes=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-index-of",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r,n=!1]=e,i=-1
-return t&&r&&(i=n?t.toLowerCase().indexOf(r.toLowerCase()):t.indexOf(r)),i}Object.defineProperty(e,"__esModule",{value:!0}),e.stringIndexOf=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-last-index-of",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r,n=!1]=e,i=-1
-return t&&r&&(i=n?t.toLowerCase().lastIndexOf(r.toLowerCase()):t.lastIndexOf(r)),i}Object.defineProperty(e,"__esModule",{value:!0}),e.stringLastIndexOf=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-not-equals",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[...t]=e
-if(t.length<2)return!1
-const r=t.shift()
-return t.some((e=>e!==r))}Object.defineProperty(e,"__esModule",{value:!0}),e.stringNotEquals=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-pad-end",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t="",r=" ",n=0]=e,i=t+""
-if((r+"").length>0){for(;i.length<n;)i+=r
-i.length>n&&(i=i.substring(0,n))}return i}Object.defineProperty(e,"__esModule",{value:!0}),e.stringPadEnd=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-pad-start",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t="",r=" ",n=0]=e,i=t+""
-if((r+"").length>0){for(;i.length<n;)i=r+i
-i.length>n&&(i=i.substring(i.length-n,i.length))}return i}Object.defineProperty(e,"__esModule",{value:!0}),e.stringPadStart=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-repeat",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t="",r=0]=e,n=""
-for(let i=0;i<r;i++)n+=t
-return n}Object.defineProperty(e,"__esModule",{value:!0}),e.stringRepeat=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-replace-all",["exports","@ember/component/helper","ember-string-fns/helpers/string-replace"],(function(e,t,r){"use strict"
-function n(e){let[t,n,i="",o=!1]=e
-return(0,r.stringReplace)([t,n,i,o,!0])}Object.defineProperty(e,"__esModule",{value:!0}),e.stringReplaceAll=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-string-fns/helpers/string-replace",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t="",r,n="",i=!1,o=!1]=e
-if(!r)return t
-let s=r
-if(i||o){let e=""
-o&&(e+="g"),i&&(e+="i"),s=new RegExp(r,e)}return t.replace(s,n)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringReplace=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-slice",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let t,[r="",n=0,i]=e
-return t=void 0===i?r.slice(n):r.slice(n,i),t}Object.defineProperty(e,"__esModule",{value:!0}),e.stringSlice=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-split",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t="",r=""]=e
-return t.split(r)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringSplit=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-starts-with",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t,r,n=!1]=e,i=!1
-return t&&r&&(i=n?0===t.toLowerCase().indexOf(r.toLowerCase(),0):0===t.indexOf(r,0)),i}Object.defineProperty(e,"__esModule",{value:!0}),e.stringStartsWith=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-substring",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let t,[r="",n=0,i]=e
-return t=void 0===i?r.substring(n):r.substring(n,i),t}Object.defineProperty(e,"__esModule",{value:!0}),e.stringSubstring=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-to-camel-case",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t=""]=e
-return t.toLowerCase().split(" ").map(((e,t)=>0===t?e:`${e.charAt(0).toUpperCase()}${e.slice(1)}`)).join("")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToCamelCase=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-to-kebab-case",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t=""]=e
-return t.toLowerCase().split(" ").join("-")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToKebabCase=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-to-lower-case",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t=""]=e
-return t.toLowerCase()}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToLowerCase=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-to-pascal-case",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t=""]=e
-return t.toLowerCase().split(" ").map((e=>`${e.charAt(0).toUpperCase()}${e.slice(1)}`)).join("")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToPascalCase=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-to-sentence-case",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t=""]=e
-return t.toLowerCase().replace(/(^\s*\w|[.!?]\s*\w)/g,(e=>e.toUpperCase()))}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToSentenceCase=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-to-snake-case",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t=""]=e
-return t.toLowerCase().split(" ").join("_")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToSnakeCase=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-to-title-case",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t=""]=e
-return t.toLowerCase().split(" ").map((e=>`${e.charAt(0).toUpperCase()}${e.slice(1)}`)).join(" ")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToTitleCase=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-to-upper-case",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t=""]=e
-return t.toUpperCase()}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToUpperCase=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n}))
-define("ember-string-fns/helpers/string-trim-end",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t=""]=e
-return t.replace(/\+|[\s\uFEFF\xA0]+$/g,"")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringTrimEnd=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-trim-start",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t=""]=e
-return t.replace(/^[\s\uFEFF\xA0]+/g,"")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringTrimStart=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-string-fns/helpers/string-trim",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){let[t=""]=e
-return t.trim()}Object.defineProperty(e,"__esModule",{value:!0}),e.stringTrim=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-style-modifier/modifiers/style",["exports","ember-modifier","@ember/string","@ember/debug","@ember/utils"],(function(e,t,r,n,i){"use strict"
-function o(e){return"object"==typeof e&&Boolean(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-class s extends t.default{get styles(){const{positional:e,named:t}=this.args
-return[].concat(...[...e.filter(o),t].map((e=>Object.entries(e).map((e=>{let[t,n]=e
-return[(0,r.dasherize)(t),n]})))))}setStyles(e){const t=this._oldStyles||new Set
-e.forEach((e=>{let[n,i]=e,o=""
-i&&i.includes("!important")&&(o="important",i=i.replace("!important","")),n=(0,r.dasherize)(n),this.element.style.setProperty(n,i,o),t.delete(n)})),t.forEach((e=>this.element.style.removeProperty(e))),this._oldStyles=new Set(e.map((e=>e[0])))}didReceiveArguments(){this.setStyles(this.styles)}}e.default=s})),define("ember-test-waiters/index",["exports","@ember/debug","@ember/test-waiters"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.keys(r).forEach((function(t){"default"!==t&&"__esModule"!==t&&(t in e&&e[t]===r[t]||Object.defineProperty(e,t,{enumerable:!0,get:function(){return r[t]}}))}))})),define("ember-text-measurer/services/text-measurer",["exports","@ember/service"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({init(){this._super(...arguments),this.canvas=document.createElement("canvas"),this.ctx=this.canvas.getContext("2d")},width(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null
-return t&&(this.ctx.font=t),this.ctx.measureText(e).width},lines(e,t){let r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:null
-r&&(this.ctx.font=r)
-let n=e.split(/\n/),i=n.length
-for(let o=0;o<n.length;o++){let e=n[o]
-if(""!==e){let r=e.split(" "),n=0,o=0
-for(;o<r.length-1;o++){let e=this.ctx.measureText(r[o]+" ").width
-n+=e,n>t&&(i++,n=e)}let s=this.ctx.measureText(r[o]).width
-n+=s,n>t&&(i++,n=s)}}return i},fitTextSize(e,t){let r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:null,n=this.width(e,r),i=this.ctx.font.match(/\d+/)[0]
-return Math.floor(parseFloat(i)*t/n)}})
-e.default=r})),define("ember-tracked-storage-polyfill/index",["exports","@glimmer/tracking","@ember/debug"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.createStorage=function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:o
-return new i(e,t)},e.getValue=function(e){return e._value},e.setValue=function(e,t){const{_isEqual:r,_lastValue:n}=e
-r(t,n)||(e._value=e._lastValue=t)}
-var n=function(e,t,r,n){var i,o=arguments.length,s=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n
-if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n)
-else for(var a=e.length-1;a>=0;a--)(i=e[a])&&(s=(o<3?i(s):o>3?i(t,r,s):i(t,r))||s)
-return o>3&&s&&Object.defineProperty(t,r,s),s}
-class i{constructor(e,t){this._value=this._lastValue=e,this._isEqual=t}}function o(e,t){return e===t}n([t.tracked],i.prototype,"_value",void 0)})),define("ember-truth-helpers/helpers/and",["exports","@ember/component/helper","ember-truth-helpers/utils/truth-convert"],(function(e,t,r){"use strict"
-function n(e){for(let t=0,n=e.length;t<n;t++)if(!1===(0,r.default)(e[t]))return e[t]
-return e[e.length-1]}Object.defineProperty(e,"__esModule",{value:!0}),e.and=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-truth-helpers/helpers/equal",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){return e[0]===e[1]}Object.defineProperty(e,"__esModule",{value:!0}),e.equal=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-truth-helpers/helpers/gt",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e,t){let[r,n]=e
-return t.forceNumber&&("number"!=typeof r&&(r=Number(r)),"number"!=typeof n&&(n=Number(n))),r>n}Object.defineProperty(e,"__esModule",{value:!0}),e.gt=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-truth-helpers/helpers/gte",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e,t){let[r,n]=e
-return t.forceNumber&&("number"!=typeof r&&(r=Number(r)),"number"!=typeof n&&(n=Number(n))),r>=n}Object.defineProperty(e,"__esModule",{value:!0}),e.gte=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-truth-helpers/helpers/is-array",["exports","@ember/component/helper","@ember/array"],(function(e,t,r){"use strict"
-function n(e){for(let t=0,n=e.length;t<n;t++)if(!1===(0,r.isArray)(e[t]))return!1
-return!0}Object.defineProperty(e,"__esModule",{value:!0}),e.isArray=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-truth-helpers/helpers/is-empty",["exports","@ember/component/helper","@ember/utils"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=(0,t.helper)((function(e){let[t]=e
-return(0,r.isEmpty)(t)}))
-e.default=n})),define("ember-truth-helpers/helpers/is-equal",["exports","@ember/component/helper","@ember/utils"],(function(e,t,r){"use strict"
-function n(e){let[t,n]=e
-return(0,r.isEqual)(t,n)}Object.defineProperty(e,"__esModule",{value:!0}),e.isEqual=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-truth-helpers/helpers/lt",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e,t){let[r,n]=e
-return t.forceNumber&&("number"!=typeof r&&(r=Number(r)),"number"!=typeof n&&(n=Number(n))),r<n}Object.defineProperty(e,"__esModule",{value:!0}),e.lt=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-truth-helpers/helpers/lte",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e,t){let[r,n]=e
-return t.forceNumber&&("number"!=typeof r&&(r=Number(r)),"number"!=typeof n&&(n=Number(n))),r<=n}Object.defineProperty(e,"__esModule",{value:!0}),e.lte=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-truth-helpers/helpers/not-equal",["exports","@ember/component/helper"],(function(e,t){"use strict"
-function r(e){return e[0]!==e[1]}Object.defineProperty(e,"__esModule",{value:!0}),e.notEqualHelper=r,e.default=void 0
-var n=(0,t.helper)(r)
-e.default=n})),define("ember-truth-helpers/helpers/not",["exports","@ember/component/helper","ember-truth-helpers/utils/truth-convert"],(function(e,t,r){"use strict"
-function n(e){for(let t=0,n=e.length;t<n;t++)if(!0===(0,r.default)(e[t]))return!1
-return!0}Object.defineProperty(e,"__esModule",{value:!0}),e.not=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-truth-helpers/helpers/or",["exports","@ember/component/helper","ember-truth-helpers/utils/truth-convert"],(function(e,t,r){"use strict"
-function n(e){for(let t=0,n=e.length;t<n;t++)if(!0===(0,r.default)(e[t]))return e[t]
-return e[e.length-1]}Object.defineProperty(e,"__esModule",{value:!0}),e.or=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-truth-helpers/helpers/xor",["exports","@ember/component/helper","ember-truth-helpers/utils/truth-convert"],(function(e,t,r){"use strict"
-function n(e){return(0,r.default)(e[0])!==(0,r.default)(e[1])}Object.defineProperty(e,"__esModule",{value:!0}),e.xor=n,e.default=void 0
-var i=(0,t.helper)(n)
-e.default=i})),define("ember-truth-helpers/utils/truth-convert",["exports","@ember/array","@ember/object"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){const n=e&&(0,r.get)(e,"isTruthy")
-if("boolean"==typeof n)return n
-return(0,t.isArray)(e)?0!==(0,r.get)(e,"length"):!!e}})),define("ember-validators/collection",["exports","@ember/debug","@ember/array","@ember/utils","ember-validators/utils/validation-error"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,n,o){let s=t.collection
-if(!0===s&&!(0,r.isArray)(e))return(0,i.default)("collection",e,t)
-if(!1===s&&(0,r.isArray)(e))return(0,i.default)("singular",e,t)
-return!0}})),define("ember-validators/confirmation",["exports","@ember/object","@ember/debug","@ember/utils","ember-validators/utils/validation-error"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r,o,s){let a=r.on
-if(r.allowBlank&&(0,n.isEmpty)(e))return!0
-if(!(0,n.isEqual)(e,(0,t.get)(o,a)))return(0,i.default)("confirmation",e,r)
-return!0}})),define("ember-validators/date",["exports","@ember/object","ember-validators/utils/validation-error"],(function(e,t,r){"use strict"
-function n(e,t,r){if(t){let n=u(t)
-if(!(e instanceof Date)){let i=n?new Date(e,0):new Date(e)
-return new Intl.DateTimeFormat(r,t).format(i)}let i=n?new Date(e.getFullYear(),0):e
-return new Intl.DateTimeFormat(r,t).format(i)}return new Date(e)}function i(e,t,r){return n(e,t,r)}function o(e,t,r){return t&&u(t)?new Date(n(e,t,r),0):new Date(n(e,t,r))}function s(e,t){return e.getTime()===t.getTime()}function a(e,t){return e<t}function l(e,t){return e>t}function u(e){return 1===Object.keys(e).length&&e.year}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n){let u,{locale:c="en-us",format:d,allowBlank:h}=n,{before:p,onOrBefore:f,after:m,onOrAfter:g}=n,v=n.errorFormat||d||{dateStyle:"long"}
-if(h&&null===e||void 0===e||""===e)return!0
-if(e){if(!((b=new Date(e))instanceof Date)||isNaN(b))return(0,r.default)("date",e,n)
-u=o(e,d,c)}else d&&(u=new Intl.DateTimeFormat(c,d).format(new Date)),u=new Date
-var b
-if(p&&(p=o(p,d,c),!a(u,p)))return(0,t.set)(n,"before",i(p,v,c)),(0,r.default)("before",e,n)
-if(f&&(f=o(f,d,c),!function(e,t){return s(e,t)||a(e,t)}(u,f)))return(0,t.set)(n,"onOrBefore",i(f,v,c)),(0,r.default)("onOrBefore",e,n)
-if(m&&(m=o(m,d,c),!l(u,m)))return(0,t.set)(n,"after",i(m,v,c)),(0,r.default)("after",e,n)
-if(g&&(g=o(g,d,c),!function(e,t){return s(e,t)||l(e,t)}(u,g)))return(0,t.set)(n,"onOrAfter",i(g,v,c)),(0,r.default)("onOrAfter",e,n)
-return!0},e.parseDate=n})),define("ember-validators/ds-error",["exports","ember-validators/utils/validation-error","@ember/object"],(function(e,t,r){"use strict"
-function n(e){let t=e.split("."),r=t.pop()
-return t.push("errors"),{path:t.join("."),key:r}}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,i,o,s){let{path:a,key:l}=n(s),u=(0,r.get)(o,a)
-if(u&&u.has&&u.has(l)){let e=u.errorsFor(l)
-return(0,t.default)("ds",null,i,e.length?e[e.length-1].message:[])}return!0},e.getPathAndKey=n})),define("ember-validators/exclusion",["exports","@ember/utils","@ember/debug","ember-validators/utils/validation-error"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r,i,o){let s=r.in,{range:a,allowBlank:l}=r
-if(l&&(0,t.isEmpty)(e))return!0
-if(s&&-1!==s.indexOf(e))return(0,n.default)("exclusion",e,r)
-if(a&&2===a.length){let[i,o]=a
-if((0,t.typeOf)(e)===(0,t.typeOf)(i)&&(0,t.typeOf)(e)===(0,t.typeOf)(o)&&i<=e&&e<=o)return(0,n.default)("exclusion",e,r)}return!0}})),define("ember-validators/format",["exports","@ember/utils","@ember/debug","@ember/object","ember","ember-validators/utils/validation-error"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r,i,l){let{regex:u,type:c,inverse:d=!1,allowBlank:h}=r
-if(h&&(0,t.isEmpty)(e))return!0
-c&&!u&&a[c]&&(u=a[c])
-"email"===c&&(u===a.email&&(u=function(e){let{source:r}=a.email,{allowNonTld:n,minTldLength:i}=e;(0,t.isNone)(i)||"number"!=typeof i||(r=r.replace("[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$",`[a-z0-9]{${i},}(?:[a-z0-9-]*[a-z0-9])?$`))
-n&&(r=r.replace("@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)","@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.?)"))
-return new RegExp(r,"i")}(r)),(0,n.set)(r,"regex",u))
-if(!s(e,"match")||u&&(0,t.isEmpty)(e.match(u))!==d)return(0,o.default)(c||"invalid",e,r)
-return!0},e.regularExpressions=void 0
-const{canInvoke:s}=i.default,a={email:/^[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i,phone:/^([\+]?1\s*[-\/\.]?\s*)?(\((\d{3})\)|(\d{3}))\s*[-\/\.]?\s*(\d{3})\s*[-\/\.]?\s*(\d{4})\s*(([xX]|[eE][xX][tT]?[\.]?|extension)\s*([#*\d]+))*$/,url:/(?:([A-Za-z]+):)?(\/{0,3})[a-zA-Z0-9][a-zA-Z-0-9]*(\.[\w-]+)+([\w.,@?^=%&amp;:\/~+#-{}]*[\w@?^=%&amp;\/~+#-{}])??/}
-e.regularExpressions=a})),define("ember-validators/inclusion",["exports","@ember/debug","@ember/utils","ember-validators/utils/validation-error"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,i,o){let s=t.in,{range:a,allowBlank:l}=t
-if(l&&(0,r.isEmpty)(e))return!0
-if(s&&-1===s.indexOf(e))return(0,n.default)("inclusion",e,t)
-if(a&&2===a.length){let[i,o]=a
-if(!((0,r.typeOf)(e)===(0,r.typeOf)(i)&&(0,r.typeOf)(e)===(0,r.typeOf)(o))||i>e||e>o)return(0,n.default)("inclusion",e,t)}return!0}})),define("ember-validators/index",["exports","@ember/debug","@ember/utils"],(function(e,t,r){"use strict"
-function n(){return require("ember-validators/collection")}function i(){return require("ember-validators/confirmation")}function o(){return require("ember-validators/date")}function s(){return require("ember-validators/ds-error")}function a(){return require("ember-validators/exclusion")}function l(){return require("ember-validators/format")}function u(){return require("ember-validators/inclusion")}function c(){return require("ember-validators/length")}function d(){return require("ember-validators/messages")}function h(){return require("ember-validators/number")}function p(){return require("ember-validators/presence")}Object.defineProperty(e,"__esModule",{value:!0}),e.validate=function(e){let t
-"collection"===e?t=n():"confirmation"===e?t=i():"date"===e?t=o():"ds-error"===e?t=s():"exclusion"===e?t=a():"format"===e?t=l():"inclusion"===e?t=u():"length"===e?t=c():"messages"===e?t=d():"number"===e?t=h():"presence"===e&&(t=p())
-for(var r=arguments.length,f=new Array(r>1?r-1:0),m=1;m<r;m++)f[m-1]=arguments[m]
-return t.default(...f)}})),define("ember-validators/length",["exports","@ember/utils","ember-validators/utils/validation-error"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n){let{allowNone:i=!0,allowBlank:o,useBetweenMessage:s,is:a,min:l,max:u}=n
-if((0,t.isNone)(e))return!!i||(0,r.default)("invalid",e,n)
-if(o&&(0,t.isEmpty)(e))return!0
-let c=e.length
-if(!(0,t.isNone)(a)&&a!==c)return(0,r.default)("wrongLength",e,n)
-if(s&&!(0,t.isNone)(l)&&!(0,t.isNone)(u)&&(c<l||c>u))return(0,r.default)("between",e,n)
-if(!(0,t.isNone)(l)&&l>c)return(0,r.default)("tooShort",e,n)
-if(!(0,t.isNone)(u)&&u<c)return(0,r.default)("tooLong",e,n)
-return!0}}))
-define("ember-validators/messages",["exports","@ember/object","@ember/utils"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n={_regex:/\{(\w+)\}/g,defaultDescription:"This field",getDescriptionFor(e){return(arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}).description||this.defaultDescription},getMessageFor(e){let r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{}
-return this.formatMessage((0,t.get)(this,e),r)},formatMessage(e){let n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},i=e
-return((0,r.isNone)(i)||"string"!=typeof i)&&(i=this.invalid),i.replace(this._regex,((e,r)=>(0,t.get)(n,r)))},accepted:"{description} must be accepted",after:"{description} must be after {after}",before:"{description} must be before {before}",blank:"{description} can't be blank",collection:"{description} must be a collection",confirmation:"{description} doesn't match {on}",date:"{description} must be a valid date",email:"{description} must be a valid email address",empty:"{description} can't be empty",equalTo:"{description} must be equal to {is}",even:"{description} must be even",exclusion:"{description} is reserved",greaterThan:"{description} must be greater than {gt}",greaterThanOrEqualTo:"{description} must be greater than or equal to {gte}",inclusion:"{description} is not included in the list",invalid:"{description} is invalid",lessThan:"{description} must be less than {lt}",lessThanOrEqualTo:"{description} must be less than or equal to {lte}",notAnInteger:"{description} must be an integer",notANumber:"{description} must be a number",odd:"{description} must be odd",onOrAfter:"{description} must be on or after {onOrAfter}",onOrBefore:"{description} must be on or before {onOrBefore}",otherThan:"{description} must be other than {value}",phone:"{description} must be a valid phone number",positive:"{description} must be positive",multipleOf:"{description} must be a multiple of {multipleOf}",present:"{description} must be blank",singular:"{description} can't be a collection",tooLong:"{description} is too long (maximum is {max} characters)",tooShort:"{description} is too short (minimum is {min} characters)",between:"{description} must be between {min} and {max} characters",url:"{description} must be a valid url",wrongLength:"{description} is the wrong length (should be {is} characters)"}
-e.default=n})),define("ember-validators/number",["exports","@ember/utils","ember-validators/utils/validation-error"],(function(e,t,r){"use strict"
-function n(e,t,n){let o=t[e],s=n
-return"is"===e&&s!==o?(0,r.default)("equalTo",n,t):"lt"===e&&s>=o?(0,r.default)("lessThan",n,t):"lte"===e&&s>o?(0,r.default)("lessThanOrEqualTo",n,t):"gt"===e&&s<=o?(0,r.default)("greaterThan",n,t):"gte"===e&&s<o?(0,r.default)("greaterThanOrEqualTo",n,t):"positive"===e&&s<0?(0,r.default)("positive",n,t):"odd"!==e||i(s)&&s%2!=0?"even"!==e||i(s)&&s%2==0?!("multipleOf"===e&&!i(s/o))||(0,r.default)("multipleOf",n,t):(0,r.default)("even",n,t):(0,r.default)("odd",n,t)}function i(e){return"number"==typeof e&&isFinite(e)&&Math.floor(e)===e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,o){let s=Number(e),a=Object.keys(o),{allowBlank:l,allowNone:u=!0,allowString:c,integer:d}=o
-if(u&&(0,t.isNone)(e))return!0
-if(l&&(0,t.isEmpty)(e))return!0
-if((0,t.isEmpty)(e))return(0,r.default)("notANumber",e,o)
-if("string"==typeof e&&!c)return(0,r.default)("notANumber",e,o)
-if(!function(e){return"number"==typeof e&&!isNaN(e)}(s))return(0,r.default)("notANumber",e,o)
-if(d&&!i(s))return(0,r.default)("notAnInteger",e,o)
-for(let t=0;t<a.length;t++){let e=n(a[t],o,s)
-if("boolean"!=typeof e)return e}return!0}})),define("ember-validators/presence",["exports","@ember/debug","@ember/utils","ember-validators/utils/validation-error","ember-validators/utils/unwrap-proxy"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,o,s){let{presence:a,ignoreBlank:l}=t,u=(0,i.default)(e),c=l?(0,r.isPresent)(u):!(0,r.isEmpty)(u)
-if(!0===a&&!c)return(0,n.default)("blank",e,t)
-if(!1===a&&c)return(0,n.default)("present",e,t)
-return!0}})),define("ember-validators/utils/is-promise",["exports","ember"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return!(!e||!r(e,"then"))}
-const{canInvoke:r}=t.default})),define("ember-validators/utils/unwrap-proxy",["exports","@ember/array/proxy","@ember/object/proxy"],(function(e,t,r){"use strict"
-function n(e){return!(!e||!(e instanceof r.default||e instanceof t.default))}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function e(t){return n(t)?e(t.content):t},e.isProxy=n})),define("ember-validators/utils/validation-error",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,r,n){return{type:e,value:t,context:r,message:n}}})),define("ivy-codemirror/components/ivy-codemirror",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Component.extend({tagName:"textarea",codeMirror:Ember.inject.service(),didInsertElement(){this._super(...arguments),this._codeMirror=this.get("codeMirror").fromTextArea(this.get("elementId"),this.get("element")),this.setupCodeMirrorEventHandler("change",this,this.scheduleValueUpdatedAction)},didRender(){this._super(...arguments),this.updateCodeMirrorOptions(),this.updateCodeMirrorValue()},isVisibleDidChange:Ember.observer("isVisible",(function(){this._wasVisible!==this.get("isVisible")&&Ember.run.scheduleOnce("render",this,this.toggleVisibility)})),scheduleValueUpdatedAction(e,t){Ember.run.once(this,this.sendValueUpdatedAction,e.getValue(),e,t)},setupCodeMirrorEventHandler(e,t,r){const n=Ember.run.bind(t,r)
-this._codeMirror.on(e,n),this.one("willDestroyElement",this,(function(){this._codeMirror.off(e,n)}))},sendValueUpdatedAction(...e){this.sendAction("valueUpdated",...e)},toggleVisibility(){const e=this.get("isVisible")
-this._wasVisible!==e&&(this._wasVisible=e,e&&this._codeMirror.refresh())},updateCodeMirrorOption(e,t){this._codeMirror.getOption(e)!==t&&this._codeMirror.setOption(e,t)},updateCodeMirrorOptions(){const e=this.get("options")
-e&&Object.keys(e).forEach((function(t){this.updateCodeMirrorOption(t,e[t])}),this)},updateCodeMirrorValue(){const e=this.get("value")
-e!==this._codeMirror.getValue()&&this._codeMirror.setValue(e||"")},willDestroyElement(){this._super(...arguments),this._codeMirror.toTextArea(),this.get("codeMirror").unregisterInstance(this.get("elementId")),delete this._codeMirror}})})),define("ivy-codemirror/services/code-mirror",["exports","codemirror"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Service.extend({init(){this._super(...arguments),this._instances=Object.create(null)},fromTextArea(e,r){return this.registerInstance(e,t.default.fromTextArea(r))},instanceFor(e){return this._instances[e]},registerInstance(e,t){return this._instances[e]=t,t},signal(e,r,...n){t.default.signal(e,r,...n)},unregisterInstance(e){delete this._instances[e]}})})),define("layout-bin-packer/bin",["exports","layout-bin-packer/entry"],(function(e,t){"use strict"
-function r(e,t){this.width=t||0,this.content=e}function n(e){return function(){throw new TypeError("MustImplement: "+e)}}Object.defineProperty(e,"__esModule",{value:!0}),e.default=r,e.rangeError=function(e,t){throw new RangeError("Parameter must be within: [0 and "+e+") but was: "+t)},r.prototype.objectAt=function(e,t){return e[t]},r.prototype.position=n("position"),r.prototype.flush=n("flush"),r.prototype.height=n("height"),r.prototype.isGrid=n("isGrid"),r.prototype.length=function(){return this.content.length},r.prototype.maxContentOffset=function(e,t){var r=this.height(e)
-return Math.max(r-t,0)},r.prototype.visibleStartingIndex=n("visibleStartingIndex"),r.prototype.numberVisibleWithin=n("numberVisibleWithin"),r.prototype.heightAtIndex=function(e){return this.content[e].height},r.prototype.widthAtIndex=function(e){return this.content[e].width}})),define("layout-bin-packer/entry",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,r,n){this.height=e,this.width=t,this.position={x:r,y:n}}})),define("layout-bin-packer/fixed-grid",["exports","layout-bin-packer/bin"],(function(e,t){"use strict"
-function r(e,t,r){this._elementWidth=t,this._elementHeight=r,this._super$constructor(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=r,r.prototype=Object.create(t.default.prototype),r.prototype._super$constructor=t.default,r.prototype.flush=function(){},r.prototype.isGrid=function(e){return(Math.floor(e/this.widthAtIndex(0))||1)>1},r.prototype.visibleStartingIndex=function(e,t,r){e=Math.min(e,this.maxContentOffset(t,r))
-var n=Math.floor(t/this.widthAtIndex(0))||1
-return Math.floor(e/this.heightAtIndex(0))*n},r.prototype.numberVisibleWithin=function(e,t,r,n){var i=this.visibleStartingIndex(e,t,r),o=Math.floor(t/this.widthAtIndex(0))||1,s=this.length(),a=this.heightAtIndex(0),l=Math.ceil(r/a)*o
-n&&(l+=o)
-var u=s-i
-return Math.max(Math.min(l,u),0)},r.prototype.widthAtIndex=function(){return this._elementWidth},r.prototype.heightAtIndex=function(){return this._elementHeight},r.prototype.position=function(e,t){var r=this.length();(0===r||e>r)&&rangeError(r,e)
-var n=Math.floor(t/this.widthAtIndex(e))||1
-return{x:e%n*this.widthAtIndex(e)|0,y:Math.floor(e/n)*this.heightAtIndex(e)}},r.prototype.height=function(e){if("number"!=typeof e)throw new TypeError("height depends on the first argument of visibleWidth(number)")
-var t=this.length()
-if(0===t)return 0
-var r=Math.max(Math.floor(e/this.widthAtIndex(0),1))
-return r=r>0?r:1,Math.ceil(t/r)*this.heightAtIndex(0)}})),define("layout-bin-packer/shelf-first",["exports","layout-bin-packer/bin","layout-bin-packer/entry"],(function(e,t,r){"use strict"
-function n(e,t){this._super$constructor(e,t),this._positionEntries=[]}Object.defineProperty(e,"__esModule",{value:!0}),e.default=n,n.prototype=Object.create(t.default.prototype),n.prototype._super$constructor=t.default,n.prototype.isGrid=function(e){null!=e&&e!==this.width&&(this.flush(0),this.width=e)
-for(var t=this.length(),r=0;r<t;r++)if(this._entryAt(r).position.x>0)return!0
-return!1},n.prototype.height=function(e){null!=e&&e!==this.width&&(this.flush(0),this.width=e)
-var t=this.length()
-if(0===t)return 0
-for(var r,n=0,i=0,o=t-1;o>=0&&!(i>(r=this._entryAt(o)).position.y);o--)n<r.height&&(n=r.height),i=r.position.y
-return i+n},n.prototype.flush=function(e){var t=this._positionEntries
-t.length>e&&(t.length=e)},n.prototype.numberVisibleWithin=function(e,t,r,n){t!==this.width&&(this.flush(0),this.width=t)
-var i=this.visibleStartingIndex(e,t,r)
-return this._numberVisibleWithin(i,r,n)},n.prototype._entryAt=function(e){var n,i=this.length(),o=this.width
-e>=i&&(0,t.rangeError)(i,e)
-var s,a,l,u,c=this._positionEntries.length,d=0,h=0
-if(e<c)return this._positionEntries[e]
-for(0===c?(s=0,a=0):(s=c-1,h=(n=this._positionEntries[s]).position.x+n.width,d=n.height,a=n.position.y,s++),u=s;u<e+1;u++){var p=this.heightAtIndex(u),f=this.widthAtIndex(u)
-n&&f+h>o?(a=n.position.y+n.height,l=0,h=0,d=p):l=h,p>d&&(d=p),n=this._positionEntries[u]=new r.default(d,f,l,a),h=l+f}return n},n.prototype._numberVisibleWithin=function(e,t,r){var n,i,o,s=0,a=this.length(),l=0,u=0
-u=e>0&&e<a?this._entryAt(e).position.y:0
-for(var c=e;c<a;c++)if(l===(i=(n=this._entryAt(c)).position).y||(l=i.y-u,r&&!o&&(o=n.height)),l<t)s++
-else{if(!r)break
-r=!1,t+=Math.max(o,n.height)+1,s++}return s},n.prototype.position=function(e,r){var n=this.length()
-return(0===n||e>n)&&(0,t.rangeError)(n,e),r!==this.width&&(this.flush(0),this.width=r),this._entryAt(e).position},n.prototype.visibleStartingIndex=function(e,t,r){if(e<=0)return 0
-null!=t&&t!==this.width&&(this.flush(0),this.width=t),e=Math.min(e,this.maxContentOffset(t,r))
-for(var n,i=this.height(),o=this.length(),s=o,a=i;;){var l=a/s
-if(n===(s=Math.min(Math.floor(e/l),o-1)))return s
-var u=this._entryAt(s),c=u.position
-if(n=s,(a=c.y+u.height)>e){for(;a>=e&&(n=s,-1!=--s);)a=(c=(u=this._entryAt(s)).position).y+u.height
-return n}if(e===a){for(;a<=e;)s++,a=(c=(u=this._entryAt(s)).position).y+u.height
-return s}}return-1}})),define("torii/adapters/application",["exports","rsvp","@ember/object"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=r.default.extend({open:()=>new t.Promise((function(){throw new Error("The Torii adapter must implement `open` for a session to be opened")})),fetch:()=>new t.Promise((function(){throw new Error("The Torii adapter must implement `fetch` for a session to be fetched")})),close:()=>new t.Promise((function(){throw new Error("The Torii adapter must implement `close` for a session to be closed")}))})
-e.default=n})),define("torii/bootstrap/routing",["exports","torii/routing/application-route-mixin","torii/routing/authenticated-route-mixin","torii/lib/container-utils"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n){o(e,"route:application",t.default)
-for(var i=0;i<n.length;i++){var s=n[i]
-o(e,"route:"+s,r.default)}}
-var i=null
-function o(e,t,o){const s=(0,n.lookup)(e,t)
-if(s)s.reopen(o)
-else{const o=(0,n.lookupFactory)(e,"route:basic")
-i||(i=o.extend(r.default)),(0,n.register)(e,t,i)}}})),define("torii/bootstrap/session",["exports","torii/services/torii-session"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r){var n="service:"+r
-e.register(n,t.default)}})),define("torii/bootstrap/torii",["exports","torii/providers/linked-in-oauth2","torii/providers/google-oauth2","torii/providers/google-oauth2-bearer","torii/providers/google-oauth2-bearer-v2","torii/providers/facebook-connect","torii/providers/facebook-oauth2","torii/adapters/application","torii/providers/twitter-oauth1","torii/providers/github-oauth2","torii/providers/azure-ad-oauth2","torii/providers/stripe-connect","torii/services/torii","torii/services/popup","torii/services/iframe"],(function(e,t,r,n,i,o,s,a,l,u,c,d,h,p,f){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){e.register("service:torii",h.default),e.register("torii-provider:linked-in-oauth2",t.default),e.register("torii-provider:google-oauth2",r.default),e.register("torii-provider:google-oauth2-bearer",n.default),e.register("torii-provider:google-oauth2-bearer-v2",i.default),e.register("torii-provider:facebook-connect",o.default),e.register("torii-provider:facebook-oauth2",s.default),e.register("torii-provider:twitter",l.default),e.register("torii-provider:github-oauth2",u.default),e.register("torii-provider:azure-ad-oauth2",c.default),e.register("torii-provider:stripe-connect",d.default),e.register("torii-adapter:application",a.default),e.register("torii-service:iframe",f.default),e.register("torii-service:popup",p.default)}})),define("torii/compat/get-router-instance",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return e.get("router")||e.lookup("router:main")}})),define("torii/compat/get-router-lib",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return e._routerMicrolib||e.router}})),define("torii/components/torii-iframe-placeholder",["exports","@ember/component"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({classNames:["torii-iframe-placeholder"]})
-e.default=r})),define("torii/configuration",["exports","@ember/object"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.configurable=function(e,r){return(0,t.computed)((function(){this._super=this._super||function(){throw new Error("should always have _super")}()
-var i="providers."+this.get("name")+"."+e
-let o=n()
-var s=(0,t.get)(o,i)
-if(void 0===s){if(void 0!==r)return"function"==typeof r?r.call(this):r
-throw new Error("Expected configuration value "+e+" to be defined for provider named "+this.get("name"))}return s}))},e.configure=function(e){r=e},e.getConfiguration=n,e.default=void 0
-let r={}
-function n(){return r}e.default={}})),define("torii/lib/assert",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){t||console.error(e)}})),define("torii/lib/container-utils",["exports","@ember/application"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.hasRegistration=function(e,t){return e&&e.hasRegistration?e.hasRegistration(t):e.registry.has(t)},e.register=function(e,t,r){return e&&e.application?e.application.register(t,r):e.registry.register(t,r)},e.lookupFactory=function(e,t){return e&&e.lookupFactory?e.lookupFactory(t):e&&e.resolveRegistration?e.resolveRegistration(t):e&&e.application?e.application.__container__.lookupFactory(t):e.container.lookupFactory(t)},e.lookup=function(e,t){return e&&e.lookup?e.lookup(t):e&&e.application?e.application.__container__.lookup(t):e.container.lookup(t)},e.getOwner=function(e){return t.getOwner?(0,t.getOwner)(e):e.container}})),define("torii/lib/load-initializer",["exports","@ember/application"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){(0,t.onLoad)("Ember.Application",(function(t){t.initializer(e)}))}})),define("torii/lib/load-instance-initializer",["exports","@ember/application"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){(0,t.onLoad)("Ember.Application",(function(t){t.instanceInitializer(e)}))}})),define("torii/lib/parse-query-string",["exports","@ember/object"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({init(){this.validKeys=this.keys},parse(){for(var e=this.url,t=this.validKeys,r={},n=0;n<t.length;n++){var i=t[n],o=new RegExp(i+"=([^&#]*)").exec(e)
-o&&(r[i]=o[1])}return r}})
-e.default=r})),define("torii/lib/popup-id-serializer",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t={serialize:e=>"torii-popup:"+e,deserialize(e){if(!e)return null
-var t=e.match(/^(torii-popup:)(.*)/)
-return t?t[2]:null}}
-e.default=t})),define("torii/lib/query-string",["exports","@ember/array","@ember/string","@ember/object"],(function(e,t,r,n){"use strict"
-function i(e){return e||!1===e}function o(e,t,o){var s=(0,r.camelize)(t),a=(0,n.get)(e,s)
-if(!o){if(!i(a)&&i((0,n.get)(e,t)))throw new Error('Use camelized versions of url params. (Did not find "'+s+'" property but did find "'+t+'".')
-if(!i(a))throw new Error('Missing url param: "'+t+'". (Looked for: property named "'+s+'".')}return i(a)?encodeURIComponent(a):void 0}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var s=n.default.extend({init(){this.obj=this.provider,this.urlParams=(0,t.A)(this.requiredParams.slice()).uniq(),this.optionalUrlParams=(0,t.A)(this.optionalParams?this.optionalParams.slice():[]).uniq(),this.optionalUrlParams.forEach((function(e){if(this.urlParams.indexOf(e)>-1)throw new Error("Required parameters cannot also be optional: '"+e+"'")}),this)},toString(){var e=this.urlParams,r=this.optionalUrlParams,n=this.obj,s=(0,t.A)([])
-return e.forEach((function(e){var t=o(n,e)
-s.push([e,t])})),r.forEach((function(e){var t=function(e,t){return o(e,t,!0)}(n,e)
-i(t)&&s.push([e,t])})),s.map((function(e){return e.join("=")})).join("&")}})
-e.default=s})),define("torii/lib/random-url-safe",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){for(var t="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",r="",n=0;n<e;n++)r+=t.charAt(Math.floor(Math.random()*t.length))
-return r}})),define("torii/lib/required-property",["exports","@ember/object"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=function(){return(0,t.computed)((function(e){throw new Error("Definition of property "+e+" by a subclass is required.")}))}
-e.default=r})),define("torii/lib/state-machine",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Array.prototype.slice,r=Object.keys
-function n(e){var t=e.initialState
-if(this.states=e.states,!this.states)throw new Error("StateMachine needs states")
-if(this.state=this.states[t],!this.state)throw new Error("Missing initial state")
-this.currentStateName=t,this._subscriptions={}
-var r,n,i,o=e.beforeTransitions||[],s=e.afterTransitions||[]
-for(n=0,i=o.length;i>n;n++)r=o[n],this.beforeTransition.call(this,r,r.fn)
-for(n=0,i=s.length;i>n;n++)r=s[n],this.afterTransition.call(this,r,r.fn)}var i=n.SPLAT="*"
-n.transitionTo=function(e){return function(){this.transitionTo(e)}},n.prototype={states:{},toString(){return"<StateMachine currentState:'"+this.currentStateName+"' >"},transitionTo(e){if("."===e.charAt(0)){var t=this.currentStateName.split(".").slice(0,-1)
-e=0<t.length?t.join(".")+e:e.substring(1)}var r=this.states[e],n=this.currentStateName
-if(!r)throw new Error("Unknown State: `"+e+"`")
-this.willTransition(n,e),this.state=r,this.currentStateName=e,this.didTransition(n,e)},beforeTransition(e,t){this._transition("willTransition",e,t)},afterTransition(e,t){this._transition("didTransition",e,t)},_transition(e,t,r){var n,o,s,a,l,u,c=t.from||i,d=t.to||i
-0===d.indexOf("!")?(n=d.substr(1),l=!0):(n=d,l=!1),0===c.indexOf("!")?(o=c.substr(1),u=!0):(o=c,u=!1),a=o.indexOf(i),s=n.indexOf(i),a>=0&&(o=o.substring(a,0)),s>=0&&(n=n.substring(s,0)),this.on(e,(function(e,t){var i=t,c=e
-a>=0&&(c=e.substring(a,0)),s>=0&&(i=t.substring(s,0)),i===n!==l&&c===o!==u&&r.call(this,e,t)}))},willTransition(e,t){this._notify("willTransition",e,t)},didTransition(e,t){this._notify("didTransition",e,t)},_notify(e,t,r){for(var n=this._subscriptions[e]||[],i=0,o=n.length;i<o;i++)n[i].call(this,t,r)},on(e,t){this._subscriptions[e]=this._subscriptions[e]||[],this._subscriptions[e].push(t)},off(e,t){var r=this._subscriptions[e].indexOf(t)
-t?r&&this._subscriptions[e].splice(r,1):this._subscriptions[e]=null},send(e){var r=this.state[e],n=t.call(arguments,1)
-if(r)return r.apply(this,n)
-this.unhandledEvent(e)},trySend(e){var r=this.state[e],n=t.call(arguments,1)
-if(r)return r.apply(this,n)},event(e,t){var i=this.states,o={transition(){var t=function(e,t,r){var n
-if(!t)throw new Error("invalid Transition")
-if(r){n=function(e,t){return(r=e,r.constructor===Array?r:r?[r]:[]).reduce((function(e,r){return e[r]=t,e}),{})
-var r}(t,r)}else{if(t.constructor!==Object)throw new Error("something went wrong")
-n=t}return n}(0,arguments[0],arguments[1])
-r(t).forEach((function(r){var o=t[r];(function(e,t,r,n,i){var o=e[r]
-if(!(r&&n&&o)){var s="invalid transition state: "+(o&&o.currentStateName)+" from: "+r+" to: "+n
-throw new Error(s)}e[r][t]=i})(i,e,r,o,n.transitionTo(o))}))}}
-t.call(o)},unhandledEvent(e){var t="Unknown Event: `"+e+"` for: "+this.toString()
-throw new Error(t)}}
-var o=n
-e.default=o}))
-define("torii/lib/uuid-generator",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t={generate(){var e=(new Date).getTime()
-return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,(function(t){var r=(e+16*Math.random())%16|0
-return e=Math.floor(e/16),("x"===t?r:3&r|8).toString(16)}))}}
-e.default=t})),define("torii/mixins/ui-service-mixin",["exports","@ember/runloop","rsvp","@ember/object/mixin","@ember/object/evented","torii/lib/uuid-generator","torii/lib/popup-id-serializer","torii/lib/parse-query-string","torii/lib/assert","torii/configuration"],(function(e,t,r,n,i,o,s,a,l,u){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.WARNING_KEY=e.CURRENT_REQUEST_KEY=void 0
-const c="__torii_request"
-e.CURRENT_REQUEST_KEY=c
-const d="__torii_redirect_warning"
-e.WARNING_KEY=d
-var h=n.default.create({init(){this._super(...arguments),this.remoteIdGenerator=this.remoteIdGenerator||o.default},open(e,n,i){let o,h=this,p=this.remote
-return new r.Promise((function(r,f){p&&h.close()
-var m=h.remoteIdGenerator.generate()
-o=function(e){var i=s.default.deserialize(e.key)
-if(m===i){var o=function(e,t){return a.default.create({url:e,keys:t}).parse()}(e.newValue,n)
-localStorage.removeItem(e.key),(0,t.run)((function(){r(o)}))}}
-var g=s.default.serialize(m)
-localStorage.setItem(c,g),localStorage.removeItem(d),h.openRemote(e,g,i),h.schedulePolling()
-var v=window.onbeforeunload
-if(window.onbeforeunload=function(){"function"==typeof v&&v(),h.close()},!h.remote||h.remote.closed)return localStorage.removeItem(c),void f(new Error("remote could not open or was closed"))
-h.remote.focus(),h.one("didClose",(function(){if(localStorage.getItem(d)){localStorage.removeItem(d)
-let e=(0,u.getConfiguration)();(0,l.default)("[Torii] Using an OAuth redirect that loads your Ember App is deprecated and will be\n              removed in a future release, as doing so is a potential security vulnerability.\n              Hide this message by setting `allowUnsafeRedirect: true` in your Torii configuration.\n          ",e.allowUnsafeRedirect)}var e=localStorage.getItem(c)
-e&&(localStorage.removeItem(e),localStorage.removeItem(c)),h.timeout=(0,t.later)(h,(function(){f(new Error("remote was closed, authorization was denied, or an authentication message otherwise not received before the window closed."))}),100)})),window.addEventListener("storage",o)})).finally((function(){h.close(),window.removeEventListener("storage",o)}))},close(){this.remote&&(this.closeRemote(),this.remote=null,this.trigger("didClose")),this.cleanUp()},cleanUp(){this.clearTimeout()},schedulePolling(){this.polling=(0,t.later)(this,(function(){this.pollRemote(),this.schedulePolling()}),35)},clearTimeout(){(0,t.cancel)(this.timeout),this.timeout=null},stopPolling:(0,i.on)("didClose",(function(){(0,t.cancel)(this.polling)}))}),p=h
-e.default=p})),define("torii/providers/-private/utils",["exports"],(function(e){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.overrideLoadScript=function(e){t=e},e.resetLoadScript=function(){t=!1},e.loadScript=function(e){if(t)return t(e)
-let r=document.createElement("script"),n=document.getElementsByTagName("script")[0]
-r.src=e,n.parentNode.insertBefore(r,n)}
-let t=!1})),define("torii/providers/azure-ad-oauth2",["exports","@ember/object","torii/providers/oauth2-code","torii/configuration"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=r.default.extend({name:"azure-ad-oauth2",baseUrl:(0,t.computed)((function(){return"https://login.windows.net/"+this.get("tennantId")+"/oauth2/authorize"})),tennantId:(0,n.configurable)("tennantId","common"),requiredUrlParams:["api-version","client_id"],optionalUrlParams:["scope","nonce","response_mode"],responseMode:(0,n.configurable)("responseMode",null),responseParams:(0,t.computed)((function(){return[this.get("responseType"),"state"]})),apiVersion:"1.0",responseType:(0,n.configurable)("responseType","code"),redirectUri:(0,n.configurable)("redirectUri",(function(){return this._super()}))})
-e.default=i})),define("torii/providers/base",["exports","@ember/object","torii/lib/required-property","torii/lib/container-utils","torii/configuration"],(function(e,t,r,n,i){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var o=t.default.extend({name:(0,r.default)(),configNamespace:(0,t.computed)("name",(function(){return"providers."+this.get("name")})),popup:(0,t.computed)("configuredRemoteServiceName",(function(){var e=(0,n.getOwner)(this),t=this.get("configuredRemoteServiceName")||i.default.remoteServiceName||"popup"
-return e.lookup("torii-service:"+t)})),configuredRemoteServiceName:(0,i.configurable)("remoteServiceName",null)})
-e.default=o})),define("torii/providers/facebook-connect",["exports","@ember/runloop","rsvp","torii/providers/base","torii/providers/-private/utils","torii/configuration"],(function(e,t,r,n,i,o){"use strict"
-var s
-function a(e){if(s)return s
-var n=window.fbAsyncInit,o=e.locale
-return delete e.locale,s=new r.Promise((function(r){if(window.FB)return r()
-window.fbAsyncInit=function(){FB.init(e),(0,t.run)(null,r)},(0,i.loadScript)("//connect.facebook.net/"+o+"/sdk.js")})).then((function(){window.fbAsyncInit=n,window.fbAsyncInit&&(window.fbAsyncInit.hasRun=!0,window.fbAsyncInit())}))}function l(e){var t={userId:e.userID,accessToken:e.accessToken,expiresIn:e.expiresIn}
-return e.grantedScopes&&(t.grantedScopes=e.grantedScopes),t}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var u=n.default.extend({name:"facebook-connect",scope:(0,o.configurable)("scope","email"),returnScopes:(0,o.configurable)("returnScopes",!1),appId:(0,o.configurable)("appId"),version:(0,o.configurable)("version","v2.2"),xfbml:(0,o.configurable)("xfbml",!1),channelUrl:(0,o.configurable)("channelUrl",null),locale:(0,o.configurable)("locale","en_US"),init(){this._super(...arguments),a(this.settings())},open(e){void 0===e&&(e={})
-var n=this.get("scope"),i=e.authType,o=this.get("returnScopes")
-return a(this.settings()).then((function(){return function(e,n,i){return new r.Promise((function(r,o){FB.login((function(e){e.authResponse?(0,t.run)(null,r,e.authResponse):(0,t.run)(null,o,e.status)}),{scope:e,return_scopes:n,auth_type:i})}))}(n,o,i)})).then(l)},settings(){return{status:!0,cookie:!0,xfbml:this.get("xfbml"),version:this.get("version"),appId:this.get("appId"),channelUrl:this.get("channelUrl"),locale:this.get("locale")}}}),c=u
-e.default=c})),define("torii/providers/facebook-oauth2",["exports","torii/configuration","torii/providers/oauth2-code","@ember/object"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=r.default.extend({name:"facebook-oauth2",baseUrl:(0,n.computed)("apiVersion",(function(){if(this.get("apiVersion")){if(!/^v(\d)\.(\d)$/.test(this.get("apiVersion")))throw new Error("The Facebook API version must be of the shape 'vX.X'")
-return`https://www.facebook.com/${this.get("apiVersion")}/dialog/oauth`}return"https://www.facebook.com/dialog/oauth"})),requiredUrlParams:["display"],responseParams:["code","state"],scope:(0,t.configurable)("scope","email"),apiVersion:(0,t.configurable)("apiVersion",null),display:"popup",redirectUri:(0,t.configurable)("redirectUri",(function(){return this._super()})),open(){return this._super().then((function(e){if(e.authorizationCode&&"200"===e.authorizationCode)throw new Error("User canceled authorization")
-return e}))}})
-e.default=i})),define("torii/providers/github-oauth2",["exports","torii/providers/oauth2-code","torii/configuration"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default.extend({name:"github-oauth2",baseUrl:"https://github.com/login/oauth/authorize",responseParams:["code","state"],redirectUri:(0,r.configurable)("redirectUri",(function(){return this._super()}))})
-e.default=n})),define("torii/providers/google-oauth2-bearer-v2",["exports","rsvp","@ember/runloop","@ember/polyfills","torii/providers/oauth2-code","torii/configuration"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var s=i.default.extend({name:"google-oauth2-bearer-v2",baseUrl:"https://accounts.google.com/o/oauth2/v2/auth",tokenValidationUrl:"https://www.googleapis.com/oauth2/v2/tokeninfo",optionalUrlParams:["scope","request_visible_actions"],scope:(0,o.configurable)("scope"),requestVisibleActions:(0,o.configurable)("requestVisibleActions",""),responseType:"token",responseParams:["access_token","token_type","expires_in"],redirectUri:(0,o.configurable)("redirectUri"),open(e){var i=this.get("name"),o=this.buildUrl(),s=this.get("redirectUri"),a=this.get("responseParams"),l=this.get("tokenValidationUrl"),u=this.get("apiKey")
-return this.get("popup").open(o,a,e).then((function(e){var o=[]
-if(a.forEach((function(t){void 0===e[t]&&o.push(t)})),o.length)throw new Error("The response from the provider is missing these required response params: "+o.join(", "))
-return new t.Promise((function(t,o){let a=new XMLHttpRequest
-a.overrideMimeType("application/json"),a.onload=function(){var l=JSON.parse(a.responseText)
-l.audience===u?(0,r.run)((()=>t((0,n.assign)(e,{provider:i,redirectUri:s})))):void 0===l.audience?(0,r.run)((()=>o(new Error("Unexpected response from token validation server. The 'audience' field may be missing.")))):(0,r.run)((()=>o(new Error("Access token is invalid or has been tempered with. You may be subject to a 'confused deputy' attack."))))},a.onerror=function(){(0,r.run)((()=>o(new Error(`Token validation request failed with status '${a.statusText}' (server '${l}' '${a.responseText}').`))))},a.open("GET",`${l}?access_token=${encodeURIComponent(e.access_token)}`),a.send()}))}))},fetch:e=>e})
-e.default=s})),define("torii/providers/google-oauth2-bearer",["exports","torii/providers/oauth2-bearer","torii/configuration"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default.extend({name:"google-oauth2-bearer",baseUrl:"https://accounts.google.com/o/oauth2/auth",optionalUrlParams:["scope","request_visible_actions","hd"],requestVisibleActions:(0,r.configurable)("requestVisibleActions",""),responseParams:["access_token"],scope:(0,r.configurable)("scope","email"),redirectUri:(0,r.configurable)("redirectUri","http://localhost:4200/oauth2callback"),hd:(0,r.configurable)("hd","")})
-e.default=n})),define("torii/providers/google-oauth2",["exports","torii/providers/oauth2-code","torii/configuration"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default.extend({name:"google-oauth2",baseUrl:"https://accounts.google.com/o/oauth2/auth",optionalUrlParams:["scope","request_visible_actions","access_type","approval_prompt","hd"],requestVisibleActions:(0,r.configurable)("requestVisibleActions",""),accessType:(0,r.configurable)("accessType",""),responseParams:["code","state"],scope:(0,r.configurable)("scope","email"),approvalPrompt:(0,r.configurable)("approvalPrompt","auto"),redirectUri:(0,r.configurable)("redirectUri","http://localhost:8000/oauth2callback"),hd:(0,r.configurable)("hd","")})
-e.default=n})),define("torii/providers/linked-in-oauth2",["exports","torii/providers/oauth2-code","torii/configuration"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default.extend({name:"linked-in-oauth2",baseUrl:"https://www.linkedin.com/uas/oauth2/authorization",responseParams:["code","state"],redirectUri:(0,r.configurable)("redirectUri",(function(){return this._super()}))})
-e.default=n})),define("torii/providers/oauth1",["exports","torii/providers/base","torii/configuration"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default.extend({name:"oauth1",requestTokenUri:(0,r.configurable)("requestTokenUri"),buildRequestTokenUrl(){return this.get("requestTokenUri")},open(e){var t=this.get("name"),r=this.buildRequestTokenUrl()
-return this.get("popup").open(r,["code"],e).then((function(e){return e.provider=t,e}))}})
-e.default=n})),define("torii/providers/oauth2-bearer",["exports","torii/providers/oauth2-code"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({responseType:"token",open(e){var t=this.get("name"),r=this.buildUrl(),n=this.get("redirectUri"),i=this.get("responseParams")
-return this.get("popup").open(r,i,e).then((function(e){var r=[]
-if(i.forEach((function(t){void 0===e[t]&&r.push(t)})),r.length)throw new Error("The response from the provider is missing these required response params: "+r.join(", "))
-return{authorizationToken:e,provider:t,redirectUri:n}}))}})
-e.default=r})),define("torii/providers/oauth2-code",["exports","@ember/object","torii/providers/base","torii/configuration","torii/lib/query-string","torii/lib/required-property","torii/lib/random-url-safe"],(function(e,t,r,n,i,o,s){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var a=r.default.extend({concatenatedProperties:["requiredUrlParams","optionalUrlParams"],requiredUrlParams:["response_type","client_id","redirect_uri","state"],optionalUrlParams:["scope"],baseUrl:(0,o.default)(),apiKey:(0,n.configurable)("apiKey"),scope:(0,n.configurable)("scope",null),clientId:(0,n.configurable)("clientId",(function(){return this.get("apiKey")})),state:(0,n.configurable)("state",(function(){return this.get("randomState")})),_randomState:null,randomState:(0,t.computed)("_randomState",(function(){var e=this.get("_randomState")
-return e||(e=(0,s.default)(16),this.set("_randomState",e)),e})),responseType:"code",responseParams:(0,o.default)(),redirectUri:(0,n.configurable)("redirectUri",(function(){return`${e=[window.location.protocol,"//",window.location.host,window.location.pathname].join(""),"/"!==e.substr(-1)&&(e+="/"),e}torii/redirect.html`
-var e})),buildQueryString(){var e=this.get("requiredUrlParams"),t=this.get("optionalUrlParams")
-return i.default.create({provider:this,requiredParams:e,optionalParams:t}).toString()},buildUrl(){return[this.get("baseUrl"),this.buildQueryString()].join("?")},open(e){var t=this.get("name"),r=this.buildUrl(),n=this.get("redirectUri"),i=this.get("responseParams"),o=this.get("responseType"),s=this.get("state"),a=-1!==i.indexOf("state")
-return this.get("popup").open(r,i,e).then((function(e){var r=[]
-if(i.forEach((function(t){void 0===e[t]&&r.push(t)})),r.length)throw new Error("The response from the provider is missing these required response params: "+r.join(", "))
-if(a&&e.state!==s)throw new Error('The response from the provider has an incorrect session state param: should be "'+s+'", but is "'+e.state+'"')
-return{authorizationCode:decodeURIComponent(e[o]),provider:t,redirectUri:n}}))}})
-e.default=a})),define("torii/providers/stripe-connect",["exports","torii/providers/oauth2-code","torii/configuration"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var n=t.default.extend({name:"stripe-connect",baseUrl:"https://connect.stripe.com/oauth/authorize",requiredUrlParams:[],optionalUrlParams:["stripe_landing","always_prompt"],responseParams:["code","state"],scope:(0,r.configurable)("scope","read_write"),stripeLanding:(0,r.configurable)("stripeLanding",""),alwaysPrompt:(0,r.configurable)("alwaysPrompt","false"),redirectUri:(0,r.configurable)("redirectUri",(function(){return this._super()}))})
-e.default=n})),define("torii/providers/twitter-oauth1",["exports","torii/providers/oauth1"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var r=t.default.extend({name:"twitter"})
-e.default=r})),define("torii/redirect-handler",["exports","rsvp","@ember/object","@ember/error","torii/mixins/ui-service-mixin","torii/configuration"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.ToriiRedirectError=void 0
-class s extends n.default{constructor(){super(...arguments),this.name="ToriiRedirectError"}}e.ToriiRedirectError=s
-var a=r.default.extend({run(){var e=this.windowObject
-return new t.Promise((function(t,r){var n=e.localStorage.getItem(i.CURRENT_REQUEST_KEY)
-if(e.localStorage.removeItem(i.CURRENT_REQUEST_KEY),n){var a=e.location.toString()
-e.localStorage.setItem(i.WARNING_KEY,"true"),e.localStorage.setItem(n,a),"popup"===(o.default.remoteServiceName||"popup")&&e.close()}else r(new s("Not a torii popup"))}))}})
-a.reopenClass({handle:e=>a.create({windowObject:e}).run()})
-var l=a
-e.default=l})),define("torii/router-dsl-ext",["ember","@ember/routing/router","torii/compat/get-router-lib"],(function(e,t,r){"use strict"
-var n=e.default.RouterDSL.prototype,i=null
-n.authenticatedRoute=function(){this.route.apply(this,arguments),i.push(arguments[0])},t.default.reopen({_initRouterJs(){i=[],this._super.apply(this,arguments),(0,r.default)(this).authenticatedRoutes=i}})})),define("torii/routing/application-route-mixin",["exports","@ember/object/mixin","torii/configuration","@ember/application"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=t.default.create({beforeModel(e){var t=this,r=this._super.apply(this,arguments)
-return r&&r.then?r.then((function(){return t.checkLogin(e)})):t.checkLogin(e)},checkLogin(){let e=(0,r.getConfiguration)()
-return(0,n.getOwner)(this).lookup(`service:${e.sessionServiceName}`).fetch().catch((function(){}))}})
-e.default=i})),define("torii/routing/authenticated-route-mixin",["exports","rsvp","@ember/object/mixin","@ember/object","@ember/application","torii/configuration"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var s=r.default.create({beforeModel(e){var t=this,r=this._super.apply(this,arguments)
-return r&&r.then?r.then((function(){return t.authenticate(e)})):t.authenticate(e)},authenticate(e){var r=(0,o.getConfiguration)(),s=this,a=(0,i.getOwner)(this).lookup(`service:${r.sessionServiceName}`),l=(0,n.get)(a,"isAuthenticated"),u=void 0!==l
-return l?(0,t.resolve)():(a.attemptedTransition=e,u?s.accessDenied(e):a.fetch().catch((function(){return s.accessDenied(a.attemptedTransition)})))},accessDenied(e){e.send("accessDenied",e)}})
-e.default=s})),define("torii/services/iframe",["exports","@ember/object/evented","@ember/object","torii/mixins/ui-service-mixin"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=r.default.extend(t.default,n.default,{openRemote(e){this.remote=document.createElement("iframe"),this.remote.src=e,this.remote.id="torii-iframe"
-document.querySelector(".torii-iframe-placeholder").appendChild(this.remote)},closeRemote(){this.remote.remove()},pollRemote(){null===document.querySelector("#torii-iframe")&&this.trigger("didClose")}})
-e.default=i})),define("torii/services/popup",["exports","@ember/object/evented","@ember/object","torii/mixins/ui-service-mixin"],(function(e,t,r,n){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=r.default.extend(t.default,n.default,{openRemote(e,t,r){var n=function(e){var t=[]
-for(var r in e)if(e.hasOwnProperty(r)){var n
-switch(e[r]){case!0:n="1"
-break
-case!1:n="0"
-break
-default:n=e[r]}t.push(r+"="+n)}return t.join(",")}(function(e){var t=e.width||500,r=e.height||500
-return Object.assign({},{left:screen.width/2-t/2,top:screen.height/2-r/2,width:t,height:r},e)}(r||{}))
-this.remote=window.open(e,t,n)},closeRemote(){},pollRemote(){this.remote&&this.remote.closed&&this.trigger("didClose")}})
-e.default=i})),define("torii/services/torii-session",["exports","ember","rsvp","@ember/service","@ember/object/evented","@ember/object","torii/session/state-machine","torii/lib/container-utils"],(function(e,t,r,n,i,o,s,a){"use strict"
-function l(e,t){var r=e.lookup("torii-adapter:"+t)
-return r||(r=e.lookup("torii-adapter:application")),r}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var u=n.default.extend(t.default._ProxyMixin,{state:null,stateMachine:(0,o.computed)((function(){return(0,s.default)(this)})),setupStateProxy:(0,i.on)("init",(function(){var e=this.get("stateMachine"),t=this
-e.on("didTransition",(function(){t.set("content",e.state),t.set("currentStateName",e.currentStateName)}))})),setUnknownProperty(){},open(e,t){var n=(0,a.getOwner)(this),i=(0,a.getOwner)(this).lookup("service:torii"),o=this.get("stateMachine")
-return new r.Promise((function(e){o.send("startOpen"),e()})).then((function(){return i.open(e,t)})).then((function(t){return l(n,e).open(t)})).then((function(e){return o.send("finishOpen",e),e})).catch((function(e){return o.send("failOpen",e),(0,r.reject)(e)}))},fetch(e,t){var n=(0,a.getOwner)(this),i=this.get("stateMachine")
-return new r.Promise((function(e){i.send("startFetch"),e()})).then((function(){return l(n,e).fetch(t)})).then((function(e){i.send("finishFetch",e)})).catch((function(e){return i.send("failFetch",e),(0,r.reject)(e)}))},close(e,t){var n=(0,a.getOwner)(this),i=this.get("stateMachine")
-return new r.Promise((function(e){i.send("startClose"),e()})).then((function(){return l(n,e).close(t)})).then((function(){i.send("finishClose")})).catch((function(e){return i.send("failClose",e),(0,r.reject)(e)}))}})
-e.default=u})),define("torii/services/torii",["exports","@ember/service","rsvp","torii/lib/container-utils"],(function(e,t,r,n){"use strict"
-function i(e,t){return function(i,o){var s=function(e,t){return e.lookup("torii-provider:"+t)}((0,n.getOwner)(this),i)
-if(!s)throw new Error("Expected a provider named '"+i+"' , did you forget to register it?")
-if(!s[e]){if(t)throw new Error("Expected provider '"+i+"' to define the '"+e+"' method.")
-return r.Promise.resolve({})}return new r.Promise((function(t){t(s[e](o))}))}}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var o=t.default.extend({open:i("open",!0),fetch:i("fetch"),close:i("close")})
-e.default=o})),define("torii/session/state-machine",["exports","torii/lib/state-machine","@ember/object"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){var r=new t.default({initialState:"unauthenticated",states:{unauthenticated:{errorMessage:null,isAuthenticated:!1,startOpen:o("opening",["errorMessage"]),startFetch:o("fetching",["errorMessage"])},authenticated:{currentUser:null,isAuthenticated:!0,startClose:n("closing")},opening:{isWorking:!0,isOpening:!0,finishOpen(e){i(e,this.states.authenticated),this.transitionTo("authenticated")},failOpen(e){this.states.unauthenticated.errorMessage=e,this.transitionTo("unauthenticated")}},fetching:{isWorking:!0,isFetching:!0,finishFetch(e){i(e,this.states.authenticated),this.transitionTo("authenticated")},failFetch(e){this.states.unauthenticated.errorMessage=e,this.transitionTo("unauthenticated")}},closing:{isWorking:!0,isClosing:!0,isAuthenticated:!0,finishClose(){this.transitionTo("unauthenticated")},failClose(e){this.states.unauthenticated.errorMessage=e,this.transitionTo("unauthenticated")}}}})
-return r.session=e,r}
-var n=t.default.transitionTo
-function i(e,t){for(var n in e)e.hasOwnProperty(n)&&(0,r.set)(t,n,e[n])}function o(e,t){return function(){for(var r;r<t.length;r++)this[t[r]]=null
-this.transitionTo(e)}}})),define("tracked-built-ins/-private/array",["exports","ember-tracked-storage-polyfill"],(function(e,t){"use strict"
-function r(e,t){var r=function(e,t,r){if(!t.has(e))throw new TypeError("attempted to "+r+" private field on non-instance")
-return t.get(e)}(e,t,"get")
-return function(e,t){if(t.get)return t.get.call(e)
-return t.value}(e,r)}function n(e,t,r){if(!t.has(e))throw new TypeError("attempted to get private field on non-instance")
-return r}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-const i=new Set([Symbol.iterator,"concat","entries","every","fill","filter","find","findIndex","flat","flatMap","forEach","includes","indexOf","join","keys","lastIndexOf","map","reduce","reduceRight","slice","some","values"])
-function o(e){if("symbol"==typeof e)return null
-const t=Number(e)
-return isNaN(t)?null:t%1==0?t:null}var s=new WeakMap,a=new WeakMap,l=new WeakSet,u=new WeakSet
-class c{static from(e,t,r){return new c(t?Array.from(e,t,r):Array.from(e))}static of(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
-return new c(t)}constructor(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[]
-u.add(this),l.add(this),s.set(this,{writable:!0,value:(0,t.createStorage)(null,(()=>!1))}),a.set(this,{writable:!0,value:new Map})
-let p=e.slice(),f=this,m=new Map
-return new Proxy(p,{get(e,a){let u=o(a)
-if(null!==u)return n(f,l,d).call(f,u),(0,t.getValue)(r(f,s)),e[u]
-if("length"===a)(0,t.getValue)(r(f,s))
-else if(i.has(a)){let n=m.get(a)
-return void 0===n&&(n=function(){return(0,t.getValue)(r(f,s)),e[a](...arguments)},m.set(a,n)),n}return e[a]},set(e,i,a){e[i]=a
-let l=o(i)
-return null!==l?(n(f,u,h).call(f,l),(0,t.setValue)(r(f,s),null)):"length"===i&&(0,t.setValue)(r(f,s),null),!0},getPrototypeOf:()=>c.prototype})}}function d(e){const n=r(this,a)
-let i=n.get(e)
-void 0===i&&(i=(0,t.createStorage)(null,(()=>!1)),n.set(e,i)),(0,t.getValue)(i)}function h(e){const n=r(this,a).get(e)
-n&&(0,t.setValue)(n,null)}var p=c
-e.default=p,Object.setPrototypeOf(c.prototype,Array.prototype)})),define("tracked-built-ins/-private/decorator",["exports","@glimmer/tracking","@ember/debug","tracked-built-ins/-private/map","tracked-built-ins/-private/set","tracked-built-ins/-private/array","tracked-built-ins/-private/object"],(function(e,t,r,n,i,o,s){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r,a){if(void 0!==r&&void 0!==a)return(0,t.tracked)(e,r,a)
-if(Array.isArray(e))return new o.default(e)
-switch(e){case Object:return new s.default
-case Array:return new o.default
-case Map:return new n.TrackedMap
-case WeakMap:return new n.TrackedWeakMap
-case Set:return new i.TrackedSet
-case WeakSet:return new i.TrackedWeakSet}return e instanceof Map?new n.TrackedMap(e):e instanceof WeakMap?new n.TrackedWeakMap:e instanceof Set?new i.TrackedSet(e):e instanceof WeakSet?new i.TrackedWeakSet:new s.default(e)}})),define("tracked-built-ins/-private/map",["exports","ember-tracked-storage-polyfill"],(function(e,t){"use strict"
-let r,n,i
-function o(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.TrackedWeakMap=e.TrackedMap=void 0,r=Symbol.iterator,n=Symbol.toStringTag
-class s{readStorageFor(e){const{storages:r}=this
-let n=r.get(e)
-void 0===n&&(n=(0,t.createStorage)(null,(()=>!1)),r.set(e,n)),(0,t.getValue)(n)}dirtyStorageFor(e){const r=this.storages.get(e)
-r&&(0,t.setValue)(r,null)}constructor(e){o(this,"collection",(0,t.createStorage)(null,(()=>!1))),o(this,"storages",new Map),o(this,"vals",void 0),this.vals=e?new Map(e):new Map}get(e){return this.readStorageFor(e),this.vals.get(e)}has(e){return this.readStorageFor(e),this.vals.has(e)}entries(){return(0,t.getValue)(this.collection),this.vals.entries()}keys(){return(0,t.getValue)(this.collection),this.vals.keys()}values(){return(0,t.getValue)(this.collection),this.vals.values()}forEach(e){(0,t.getValue)(this.collection),this.vals.forEach(e)}get size(){return(0,t.getValue)(this.collection),this.vals.size}[r](){return(0,t.getValue)(this.collection),this.vals[Symbol.iterator]()}get[n](){return this.vals[Symbol.toStringTag]}set(e,r){return this.dirtyStorageFor(e),(0,t.setValue)(this.collection,null),this.vals.set(e,r),this}delete(e){return this.dirtyStorageFor(e),(0,t.setValue)(this.collection,null),this.vals.delete(e)}clear(){this.storages.forEach((e=>(0,t.setValue)(e,null))),(0,t.setValue)(this.collection,null),this.vals.clear()}}e.TrackedMap=s,Object.setPrototypeOf(s.prototype,Map.prototype),i=Symbol.toStringTag
-class a{readStorageFor(e){const{storages:r}=this
-let n=r.get(e)
-void 0===n&&(n=(0,t.createStorage)(null,(()=>!1)),r.set(e,n)),(0,t.getValue)(n)}dirtyStorageFor(e){const r=this.storages.get(e)
-r&&(0,t.setValue)(r,null)}constructor(e){o(this,"storages",new WeakMap),o(this,"vals",void 0),this.vals=e?new WeakMap(e):new WeakMap}get(e){return this.readStorageFor(e),this.vals.get(e)}has(e){return this.readStorageFor(e),this.vals.has(e)}set(e,t){return this.dirtyStorageFor(e),this.vals.set(e,t),this}delete(e){return this.dirtyStorageFor(e),this.vals.delete(e)}get[i](){return this.vals[Symbol.toStringTag]}}e.TrackedWeakMap=a,Object.setPrototypeOf(a.prototype,WeakMap.prototype)})),define("tracked-built-ins/-private/object",["exports","ember-tracked-storage-polyfill"],(function(e,t){"use strict"
-function r(e,t){var r=function(e,t,r){if(!t.has(e))throw new TypeError("attempted to "+r+" private field on non-instance")
-return t.get(e)}(e,t,"get")
-return function(e,t){if(t.get)return t.get.call(e)
-return t.value}(e,r)}function n(e,t,r){if(!t.has(e))throw new TypeError("attempted to get private field on non-instance")
-return r}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var i=new WeakMap,o=new WeakMap,s=new WeakSet,a=new WeakSet,l=new WeakSet
-class u{static fromEntries(e){return new u(Object.fromEntries(e))}constructor(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
-l.add(this),a.add(this),s.add(this),i.set(this,{writable:!0,value:new Map}),o.set(this,{writable:!0,value:(0,t.createStorage)(null,(()=>!1))})
-let p=Object.getPrototypeOf(e),f=Object.getOwnPropertyDescriptors(e),m=Object.create(p)
-for(let t in f)Object.defineProperty(m,t,f[t])
-let g=this
-return new Proxy(m,{get:(e,t)=>(n(g,s,c).call(g,t),e[t]),has:(e,t)=>(n(g,s,c).call(g,t),t in e),ownKeys:e=>((0,t.getValue)(r(g,o)),Reflect.ownKeys(e)),set:(e,t,r)=>(e[t]=r,n(g,a,d).call(g,t),n(g,l,h).call(g),!0),deleteProperty:(e,t)=>(t in e&&(delete e[t],n(g,a,d).call(g,t),n(g,l,h).call(g)),!0),getPrototypeOf:()=>u.prototype})}}function c(e){let n=r(this,i).get(e)
-void 0===n&&(n=(0,t.createStorage)(null,(()=>!1)),r(this,i).set(e,n)),(0,t.getValue)(n)}function d(e){const n=r(this,i).get(e)
-n&&(0,t.setValue)(n,null)}function h(){(0,t.setValue)(r(this,o),null)}e.default=u}))
-define("tracked-built-ins/-private/set",["exports","ember-tracked-storage-polyfill"],(function(e,t){"use strict"
-let r,n,i
-function o(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.TrackedWeakSet=e.TrackedSet=void 0,r=Symbol.iterator,n=Symbol.toStringTag
-class s{storageFor(e){const r=this.storages
-let n=r.get(e)
-return void 0===n&&(n=(0,t.createStorage)(null,(()=>!1)),r.set(e,n)),n}dirtyStorageFor(e){const r=this.storages.get(e)
-r&&(0,t.setValue)(r,null)}constructor(e){o(this,"collection",(0,t.createStorage)(null,(()=>!1))),o(this,"storages",new Map),o(this,"vals",void 0),this.vals=new Set(e)}has(e){return(0,t.getValue)(this.storageFor(e)),this.vals.has(e)}entries(){return(0,t.getValue)(this.collection),this.vals.entries()}keys(){return(0,t.getValue)(this.collection),this.vals.keys()}values(){return(0,t.getValue)(this.collection),this.vals.values()}forEach(e){(0,t.getValue)(this.collection),this.vals.forEach(e)}get size(){return(0,t.getValue)(this.collection),this.vals.size}[r](){return(0,t.getValue)(this.collection),this.vals[Symbol.iterator]()}get[n](){return this.vals[Symbol.toStringTag]}add(e){return this.dirtyStorageFor(e),(0,t.setValue)(this.collection,null),this.vals.add(e),this}delete(e){return this.dirtyStorageFor(e),(0,t.setValue)(this.collection,null),this.vals.delete(e)}clear(){this.storages.forEach((e=>(0,t.setValue)(e,null))),(0,t.setValue)(this.collection,null),this.vals.clear()}}e.TrackedSet=s,Object.setPrototypeOf(s.prototype,Set.prototype),i=Symbol.toStringTag
-class a{storageFor(e){const r=this.storages
-let n=r.get(e)
-return void 0===n&&(n=(0,t.createStorage)(null,(()=>!1)),r.set(e,n)),n}dirtyStorageFor(e){const r=this.storages.get(e)
-r&&(0,t.setValue)(r,null)}constructor(e){o(this,"storages",new WeakMap),o(this,"vals",void 0),this.vals=new WeakSet(e)}has(e){return(0,t.getValue)(this.storageFor(e)),this.vals.has(e)}add(e){return this.vals.add(e),this.dirtyStorageFor(e),this}delete(e){return this.dirtyStorageFor(e),this.vals.delete(e)}get[i](){return this.vals[Symbol.toStringTag]}}e.TrackedWeakSet=a,Object.setPrototypeOf(a.prototype,WeakSet.prototype)})),define("tracked-built-ins/index",["exports","tracked-built-ins/-private/decorator","tracked-built-ins/-private/array","tracked-built-ins/-private/object","tracked-built-ins/-private/map","tracked-built-ins/-private/set"],(function(e,t,r,n,i,o){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"tracked",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"TrackedArray",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"TrackedObject",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"TrackedMap",{enumerable:!0,get:function(){return i.TrackedMap}}),Object.defineProperty(e,"TrackedWeakMap",{enumerable:!0,get:function(){return i.TrackedWeakMap}}),Object.defineProperty(e,"TrackedSet",{enumerable:!0,get:function(){return o.TrackedSet}}),Object.defineProperty(e,"TrackedWeakSet",{enumerable:!0,get:function(){return o.TrackedWeakSet}})})),define("tracked-maps-and-sets/-private/map",["exports","tracked-maps-and-sets/-private/util"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.TrackedWeakMap=e.TrackedMap=void 0
-class r extends Map{get(e){return(0,t.consumeKey)(this,e),super.get(e)}has(e){return(0,t.consumeKey)(this,e),super.has(e)}entries(){return(0,t.consumeCollection)(this),super.entries()}keys(){return(0,t.consumeCollection)(this),super.keys()}values(){return(0,t.consumeCollection)(this),super.values()}forEach(e){(0,t.consumeCollection)(this),super.forEach(e)}get size(){return(0,t.consumeCollection)(this),super.size}set(e,r){return(0,t.dirtyKey)(this,e),(0,t.dirtyCollection)(this),super.set(e,r)}delete(e){return(0,t.dirtyKey)(this,e),(0,t.dirtyCollection)(this),super.delete(e)}clear(){return super.forEach(((e,r)=>(0,t.dirtyKey)(this,r))),(0,t.dirtyCollection)(this),super.clear()}}if(e.TrackedMap=r,void 0!==typeof Symbol){let e=r.prototype[Symbol.iterator]
-Object.defineProperty(r.prototype,Symbol.iterator,{get(){return(0,t.consumeCollection)(this),e}})}class n extends WeakMap{get(e){return(0,t.consumeKey)(this,e),super.get(e)}has(e){return(0,t.consumeKey)(this,e),super.has(e)}set(e,r){return(0,t.dirtyKey)(this,e),super.set(e,r)}delete(e){return(0,t.dirtyKey)(this,e),super.delete(e)}}e.TrackedWeakMap=n})),define("tracked-maps-and-sets/-private/set",["exports","tracked-maps-and-sets/-private/util"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.TrackedWeakSet=e.TrackedSet=void 0
-class r extends Set{has(e){return(0,t.consumeKey)(this,e),super.has(e)}entries(){return(0,t.consumeCollection)(this),super.entries()}keys(){return(0,t.consumeCollection)(this),super.keys()}values(){return(0,t.consumeCollection)(this),super.values()}forEach(e){(0,t.consumeCollection)(this),super.forEach(e)}get size(){return(0,t.consumeCollection)(this),super.size}add(e){return(0,t.dirtyKey)(this,e),(0,t.dirtyCollection)(this),super.add(e)}delete(e){return(0,t.dirtyKey)(this,e),(0,t.dirtyCollection)(this),super.delete(e)}clear(){return super.forEach(((e,r)=>(0,t.dirtyKey)(this,r))),(0,t.dirtyCollection)(this),super.clear()}}if(e.TrackedSet=r,void 0!==typeof Symbol){let e=r.prototype[Symbol.iterator]
-Object.defineProperty(r.prototype,Symbol.iterator,{get(){return(0,t.consumeCollection)(this),e}})}class n extends WeakSet{has(e){return(0,t.consumeKey)(this,e),super.has(e)}add(e){return(0,t.dirtyKey)(this,e),super.add(e)}delete(e){return(0,t.dirtyKey)(this,e),super.delete(e)}}e.TrackedWeakSet=n})),define("tracked-maps-and-sets/-private/util",["exports","@glimmer/tracking"],(function(e,t){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),e.createTag=function(){return new n},e.consumeKey=d,e.dirtyKey=h,e.dirtyCollection=e.consumeCollection=e.dirtyTag=e.consumeTag=void 0
-var r=function(e,t,r,n){var i,o=arguments.length,s=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n
-if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n)
-else for(var a=e.length-1;a>=0;a--)(i=e[a])&&(s=(o<3?i(s):o>3?i(t,r,s):i(t,r))||s)
-return o>3&&s&&Object.defineProperty(t,r,s),s}
-class n{static consumeTag(e){e.__tag_value__}static dirtyTag(e){e.__tag_value__=void 0}}r([t.tracked],n.prototype,"__tag_value__",void 0)
-const i=n.consumeTag
-e.consumeTag=i
-const o=n.dirtyTag
-e.dirtyTag=o
-const s={}
-let a=e=>{d(e,s)}
-e.consumeCollection=a
-let l=e=>{h(e,s)}
-e.dirtyCollection=l,void 0!==Ember&&(e.consumeCollection=a=e=>Ember.get(e,"[]"),e.dirtyCollection=l=e=>Ember.notifyPropertyChange(e,"[]"))
-const u=new WeakMap
-function c(e,t){let r=u.get(e)
-void 0===r&&(r=new Map,u.set(e,r))
-let i=r.get(t)
-return void 0===i&&(i=new n,r.set(t,i)),i}function d(e,t){i(c(e,t))}function h(e,t){o(c(e,t))}})),define("tracked-maps-and-sets/index",["exports","tracked-maps-and-sets/-private/map","tracked-maps-and-sets/-private/set"],(function(e,t,r){"use strict"
-Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"TrackedMap",{enumerable:!0,get:function(){return t.TrackedMap}}),Object.defineProperty(e,"TrackedWeakMap",{enumerable:!0,get:function(){return t.TrackedWeakMap}}),Object.defineProperty(e,"TrackedSet",{enumerable:!0,get:function(){return r.TrackedSet}}),Object.defineProperty(e,"TrackedWeakSet",{enumerable:!0,get:function(){return r.TrackedWeakSet}})}))
diff --git a/agent/uiserver/dist/assets/vendor-c7887d0a48fe1497d1843edc3d5bfbc8.js b/agent/uiserver/dist/assets/vendor-c7887d0a48fe1497d1843edc3d5bfbc8.js
new file mode 100644
index 0000000000000..ef24a3c6e65ce
--- /dev/null
+++ b/agent/uiserver/dist/assets/vendor-c7887d0a48fe1497d1843edc3d5bfbc8.js
@@ -0,0 +1,11488 @@
+window.EmberENV=function(e,t){for(var r in t)e[r]=t[r]
+return e}(window.EmberENV||{},{FEATURES:{},EXTEND_PROTOTYPES:{Date:!1},_APPLICATION_TEMPLATE_WRAPPER:!1,_DEFAULT_ASYNC_OBSERVERS:!0,_JQUERY_INTEGRATION:!1,_TEMPLATE_ONLY_GLIMMER_COMPONENTS:!0})
+var loader,define,requireModule,require,requirejs,runningTests=!1;(function(e){"use strict"
+function t(){var e=Object.create(null)
+return e.__=void 0,delete e.__,e}var r={loader:loader,define:define,requireModule:requireModule,require:require,requirejs:requirejs}
+requirejs=require=requireModule=function(e){for(var t=[],r=c(e,"(require)",t),n=t.length-1;n>=0;n--)t[n].exports()
+return r.module.exports},loader={noConflict:function(t){var n,i
+for(n in t)t.hasOwnProperty(n)&&r.hasOwnProperty(n)&&(i=t[n],e[i]=e[n],e[n]=r[n])},makeDefaultExport:!0}
+var n=t(),i=(t(),0)
+function o(e){throw new Error("an unsupported module was defined, expected `define(id, deps, module)` instead got: `"+e+"` arguments to define`")}var a=["require","exports","module"]
+function s(e,t,r,n){this.uuid=i++,this.id=e,this.deps=!t.length&&r.length?a:t,this.module={exports:{}},this.callback=r,this.hasExportsAsDep=!1,this.isAlias=n,this.reified=new Array(t.length),this.state="new"}function l(){}function u(e){this.id=e}function c(e,t,r){for(var i=n[e]||n[e+"/index"];i&&i.isAlias;)i=n[i.id]||n[i.id+"/index"]
+return i||function(e,t){throw new Error("Could not find module `"+e+"` imported from `"+t+"`")}(e,t),r&&"pending"!==i.state&&"finalized"!==i.state&&(i.findDeps(r),r.push(i)),i}function d(e,t){if("."!==e.charAt(0))return e
+for(var r=e.split("/"),n=t.split("/").slice(0,-1),i=0,o=r.length;i<o;i++){var a=r[i]
+if(".."===a){if(0===n.length)throw new Error("Cannot access parent module of root")
+n.pop()}else{if("."===a)continue
+n.push(a)}}return n.join("/")}function h(e){return!(!n[e]&&!n[e+"/index"])}s.prototype.makeDefaultExport=function(){var e=this.module.exports
+null===e||"object"!=typeof e&&"function"!=typeof e||void 0!==e.default||!Object.isExtensible(e)||(e.default=e)},s.prototype.exports=function(){if("finalized"===this.state||"reifying"===this.state)return this.module.exports
+loader.wrapModules&&(this.callback=loader.wrapModules(this.id,this.callback)),this.reify()
+var e=this.callback.apply(this,this.reified)
+return this.reified.length=0,this.state="finalized",this.hasExportsAsDep&&void 0===e||(this.module.exports=e),loader.makeDefaultExport&&this.makeDefaultExport(),this.module.exports},s.prototype.unsee=function(){this.state="new",this.module={exports:{}}},s.prototype.reify=function(){if("reified"!==this.state){this.state="reifying"
+try{this.reified=this._reify(),this.state="reified"}finally{"reifying"===this.state&&(this.state="errored")}}},s.prototype._reify=function(){for(var e=this.reified.slice(),t=0;t<e.length;t++){var r=e[t]
+e[t]=r.exports?r.exports:r.module.exports()}return e},s.prototype.findDeps=function(e){if("new"===this.state){this.state="pending"
+for(var t=this.deps,r=0;r<t.length;r++){var n=t[r],i=this.reified[r]={exports:void 0,module:void 0}
+"exports"===n?(this.hasExportsAsDep=!0,i.exports=this.module.exports):"require"===n?i.exports=this.makeRequire():"module"===n?i.exports=this.module:i.module=c(d(n,this.id),this.id,e)}}},s.prototype.makeRequire=function(){var e=this.id,t=function(t){return require(d(t,e))}
+return t.default=t,t.moduleId=e,t.has=function(t){return h(d(t,e))},t},(define=function(e,t,r){var i=n[e]
+i&&"new"!==i.state||(arguments.length<2&&o(arguments.length),Array.isArray(t)||(r=t,t=[]),n[e]=r instanceof u?new s(r.id,t,r,!0):new s(e,t,r,!1))}).exports=function(e,t){var r=n[e]
+if(!r||"new"===r.state)return(r=new s(e,[],l,null)).module.exports=t,r.state="finalized",n[e]=r,r},define.alias=function(e,t){return 2===arguments.length?define(t,new u(e)):new u(e)},requirejs.entries=requirejs._eak_seen=n,requirejs.has=h,requirejs.unsee=function(e){c(e,"(unsee)",!1).unsee()},requirejs.clear=function(){requirejs.entries=requirejs._eak_seen=n=t(),t()},define("foo",(function(){})),define("foo/bar",[],(function(){})),define("foo/asdf",["module","exports","require"],(function(e,t,r){r.has("foo/bar")&&r("foo/bar")})),define("foo/baz",[],define.alias("foo")),define("foo/quz",define.alias("foo")),define.alias("foo","foo/qux"),define("foo/bar",["foo","./quz","./baz","./asdf","./bar","../foo"],(function(){})),define("foo/main",["foo/bar"],(function(){})),define.exports("foo/exports",{}),require("foo/exports"),require("foo/main"),require.unsee("foo/bar"),requirejs.clear(),"object"==typeof exports&&"object"==typeof module&&module.exports&&(module.exports={require:require,define:define})})(this),function e(t,r,n){function i(a,s){if(!r[a]){if(!t[a]){var l="function"==typeof require&&require
+if(!s&&l)return l(a,!0)
+if(o)return o(a,!0)
+var u=new Error("Cannot find module '"+a+"'")
+throw u.code="MODULE_NOT_FOUND",u}var c=r[a]={exports:{}}
+t[a][0].call(c.exports,(function(e){return i(t[a][1][e]||e)}),c,c.exports,e,t,r,n)}return r[a].exports}for(var o="function"==typeof require&&require,a=0;a<n.length;a++)i(n[a])
+return i}({1:[function(e,t){e(276),e(212),e(214),e(213),e(216),e(218),e(223),e(217),e(215),e(225),e(224),e(220),e(221),e(219),e(211),e(222),e(226),e(227),e(178),e(180),e(179),e(229),e(228),e(199),e(209),e(210),e(200),e(201),e(202),e(203)
+e(204),e(205),e(206),e(207),e(208),e(182),e(183),e(184),e(185),e(186),e(187),e(188),e(189),e(190),e(191),e(192),e(193),e(194),e(195),e(196),e(197),e(198),e(263),e(268),e(275),e(266),e(258),e(259),e(264),e(269)
+e(271),e(254),e(255),e(256),e(257),e(260),e(261),e(262),e(265),e(267),e(270),e(272),e(273),e(274),e(173),e(175),e(174),e(177),e(176),e(161),e(159),e(166),e(163),e(169),e(171),e(158),e(165),e(155),e(170),e(153)
+e(168),e(167),e(160),e(164),e(152),e(154),e(157),e(156),e(172),e(162),e(245),e(246),e(252),e(247),e(248),e(249),e(250),e(251),e(230),e(181),e(253),e(288),e(289),e(277),e(278),e(283),e(286),e(287),e(281),e(284)
+e(282),e(285),e(279),e(280),e(231),e(232),e(233),e(234),e(235),e(238),e(236),e(237),e(239),e(240),e(241),e(242),e(244),e(243),t.exports=e(50)},{152:152,153:153,154:154,155:155,156:156,157:157,158:158,159:159,160:160,161:161,162:162,163:163,164:164,165:165,166:166,167:167,168:168,169:169,170:170,171:171,172:172,173:173,174:174,175:175,176:176,177:177,178:178,179:179,180:180,181:181,182:182,183:183,184:184,185:185,186:186,187:187,188:188,189:189,190:190,191:191,192:192,193:193,194:194,195:195,196:196,197:197,198:198,199:199,200:200,201:201,202:202,203:203,204:204,205:205,206:206,207:207,208:208,209:209,210:210,211:211,212:212,213:213,214:214,215:215,216:216,217:217,218:218,219:219,220:220,221:221,222:222,223:223,224:224,225:225,226:226,227:227,228:228,229:229,230:230,231:231,232:232,233:233,234:234,235:235,236:236,237:237,238:238,239:239,240:240,241:241,242:242,243:243,244:244,245:245,246:246,247:247,248:248,249:249,250:250,251:251,252:252,253:253,254:254,255:255,256:256,257:257,258:258,259:259,260:260,261:261,262:262,263:263,264:264,265:265,266:266,267:267,268:268,269:269,270:270,271:271,272:272,273:273,274:274,275:275,276:276,277:277,278:278,279:279,280:280,281:281,282:282,283:283,284:284,285:285,286:286,287:287,288:288,289:289,50:50}],2:[function(e,t){e(290),t.exports=e(50).Array.flatMap},{290:290,50:50}],3:[function(e,t){e(291),t.exports=e(50).Array.includes},{291:291,50:50}],4:[function(e,t){e(292),t.exports=e(50).Object.entries},{292:292,50:50}],5:[function(e,t){e(293),t.exports=e(50).Object.getOwnPropertyDescriptors},{293:293,50:50}],6:[function(e,t){e(294),t.exports=e(50).Object.values},{294:294,50:50}],7:[function(e,t){"use strict"
+e(230),e(295),t.exports=e(50).Promise.finally},{230:230,295:295,50:50}],8:[function(e,t){e(296),t.exports=e(50).String.padEnd},{296:296,50:50}],9:[function(e,t){e(297),t.exports=e(50).String.padStart},{297:297,50:50}],10:[function(e,t){e(299),t.exports=e(50).String.trimRight},{299:299,50:50}],11:[function(e,t){e(298),t.exports=e(50).String.trimLeft},{298:298,50:50}],12:[function(e,t){e(300),t.exports=e(149).f("asyncIterator")},{149:149,300:300}],13:[function(e,t){e(30),t.exports=e(16).global},{16:16,30:30}],14:[function(e,t){t.exports=function(e){if("function"!=typeof e)throw TypeError(e+" is not a function!")
+return e}},{}],15:[function(e,t){var r=e(26)
+t.exports=function(e){if(!r(e))throw TypeError(e+" is not an object!")
+return e}},{26:26}],16:[function(e,t){var r=t.exports={version:"2.6.11"}
+"number"==typeof __e&&(__e=r)},{}],17:[function(e,t){var r=e(14)
+t.exports=function(e,t,n){if(r(e),void 0===t)return e
+switch(n){case 1:return function(r){return e.call(t,r)}
+case 2:return function(r,n){return e.call(t,r,n)}
+case 3:return function(r,n,i){return e.call(t,r,n,i)}}return function(){return e.apply(t,arguments)}}},{14:14}],18:[function(e,t){t.exports=!e(21)((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a}))},{21:21}],19:[function(e,t){var r=e(26),n=e(22).document,i=r(n)&&r(n.createElement)
+t.exports=function(e){return i?n.createElement(e):{}}},{22:22,26:26}],20:[function(e,t){var r=e(22),n=e(16),i=e(17),o=e(24),a=e(23),s=function(e,t,l){var u,c,d,h=e&s.F,f=e&s.G,p=e&s.S,m=e&s.P,v=e&s.B,g=e&s.W,b=f?n:n[t]||(n[t]={}),y=b.prototype,_=f?r:p?r[t]:(r[t]||{}).prototype
+for(u in f&&(l=t),l)(c=!h&&_&&void 0!==_[u])&&a(b,u)||(d=c?_[u]:l[u],b[u]=f&&"function"!=typeof _[u]?l[u]:v&&c?i(d,r):g&&_[u]==d?function(e){var t=function(t,r,n){if(this instanceof e){switch(arguments.length){case 0:return new e
+case 1:return new e(t)
+case 2:return new e(t,r)}return new e(t,r,n)}return e.apply(this,arguments)}
+return t.prototype=e.prototype,t}(d):m&&"function"==typeof d?i(Function.call,d):d,m&&((b.virtual||(b.virtual={}))[u]=d,e&s.R&&y&&!y[u]&&o(y,u,d)))}
+s.F=1,s.G=2,s.S=4,s.P=8,s.B=16,s.W=32,s.U=64,s.R=128,t.exports=s},{16:16,17:17,22:22,23:23,24:24}],21:[function(e,t){t.exports=function(e){try{return!!e()}catch(t){return!0}}},{}],22:[function(e,t){var r=t.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")()
+"number"==typeof __g&&(__g=r)},{}],23:[function(e,t){var r={}.hasOwnProperty
+t.exports=function(e,t){return r.call(e,t)}},{}],24:[function(e,t){var r=e(27),n=e(28)
+t.exports=e(18)?function(e,t,i){return r.f(e,t,n(1,i))}:function(e,t,r){return e[t]=r,e}},{18:18,27:27,28:28}],25:[function(e,t){t.exports=!e(18)&&!e(21)((function(){return 7!=Object.defineProperty(e(19)("div"),"a",{get:function(){return 7}}).a}))},{18:18,19:19,21:21}],26:[function(e,t){t.exports=function(e){return"object"==typeof e?null!==e:"function"==typeof e}},{}],27:[function(e,t,r){var n=e(15),i=e(25),o=e(29),a=Object.defineProperty
+r.f=e(18)?Object.defineProperty:function(e,t,r){if(n(e),t=o(t,!0),n(r),i)try{return a(e,t,r)}catch(s){}if("get"in r||"set"in r)throw TypeError("Accessors not supported!")
+return"value"in r&&(e[t]=r.value),e}},{15:15,18:18,25:25,29:29}],28:[function(e,t){t.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},{}],29:[function(e,t){var r=e(26)
+t.exports=function(e,t){if(!r(e))return e
+var n,i
+if(t&&"function"==typeof(n=e.toString)&&!r(i=n.call(e)))return i
+if("function"==typeof(n=e.valueOf)&&!r(i=n.call(e)))return i
+if(!t&&"function"==typeof(n=e.toString)&&!r(i=n.call(e)))return i
+throw TypeError("Can't convert object to primitive value")}},{26:26}],30:[function(e){var t=e(20)
+t(t.G,{global:e(22)})},{20:20,22:22}],31:[function(e,t,r){arguments[4][14][0].apply(r,arguments)},{14:14}],32:[function(e,t){var r=e(46)
+t.exports=function(e,t){if("number"!=typeof e&&"Number"!=r(e))throw TypeError(t)
+return+e}},{46:46}],33:[function(e,t){var r=e(150)("unscopables"),n=Array.prototype
+null==n[r]&&e(70)(n,r,{}),t.exports=function(e){n[r][e]=!0}},{150:150,70:70}],34:[function(e,t){"use strict"
+var r=e(127)(!0)
+t.exports=function(e,t,n){return t+(n?r(e,t).length:1)}},{127:127}],35:[function(e,t){t.exports=function(e,t,r,n){if(!(e instanceof t)||void 0!==n&&n in e)throw TypeError(r+": incorrect invocation!")
+return e}},{}],36:[function(e,t,r){arguments[4][15][0].apply(r,arguments)},{15:15,79:79}],37:[function(e,t){"use strict"
+var r=e(140),n=e(135),i=e(139)
+t.exports=[].copyWithin||function(e,t){var o=r(this),a=i(o.length),s=n(e,a),l=n(t,a),u=arguments.length>2?arguments[2]:void 0,c=Math.min((void 0===u?a:n(u,a))-l,a-s),d=1
+for(l<s&&s<l+c&&(d=-1,l+=c-1,s+=c-1);c-- >0;)l in o?o[s]=o[l]:delete o[s],s+=d,l+=d
+return o}},{135:135,139:139,140:140}],38:[function(e,t){"use strict"
+var r=e(140),n=e(135),i=e(139)
+t.exports=function(e){for(var t=r(this),o=i(t.length),a=arguments.length,s=n(a>1?arguments[1]:void 0,o),l=a>2?arguments[2]:void 0,u=void 0===l?o:n(l,o);u>s;)t[s++]=e
+return t}},{135:135,139:139,140:140}],39:[function(e,t){var r=e(138),n=e(139),i=e(135)
+t.exports=function(e){return function(t,o,a){var s,l=r(t),u=n(l.length),c=i(a,u)
+if(e&&o!=o){for(;u>c;)if((s=l[c++])!=s)return!0}else for(;u>c;c++)if((e||c in l)&&l[c]===o)return e||c||0
+return!e&&-1}}},{135:135,138:138,139:139}],40:[function(e,t){var r=e(52),n=e(75),i=e(140),o=e(139),a=e(43)
+t.exports=function(e,t){var s=1==e,l=2==e,u=3==e,c=4==e,d=6==e,h=5==e||d,f=t||a
+return function(t,a,p){for(var m,v,g=i(t),b=n(g),y=r(a,p,3),_=o(b.length),w=0,E=s?f(t,_):l?f(t,0):void 0;_>w;w++)if((h||w in b)&&(v=y(m=b[w],w,g),e))if(s)E[w]=v
+else if(v)switch(e){case 3:return!0
+case 5:return m
+case 6:return w
+case 2:E.push(m)}else if(c)return!1
+return d?-1:u||c?c:E}}},{139:139,140:140,43:43,52:52,75:75}],41:[function(e,t){var r=e(31),n=e(140),i=e(75),o=e(139)
+t.exports=function(e,t,a,s,l){r(t)
+var u=n(e),c=i(u),d=o(u.length),h=l?d-1:0,f=l?-1:1
+if(a<2)for(;;){if(h in c){s=c[h],h+=f
+break}if(h+=f,l?h<0:d<=h)throw TypeError("Reduce of empty array with no initial value")}for(;l?h>=0:d>h;h+=f)h in c&&(s=t(s,c[h],h,u))
+return s}},{139:139,140:140,31:31,75:75}],42:[function(e,t){var r=e(79),n=e(77),i=e(150)("species")
+t.exports=function(e){var t
+return n(e)&&("function"!=typeof(t=e.constructor)||t!==Array&&!n(t.prototype)||(t=void 0),r(t)&&null===(t=t[i])&&(t=void 0)),void 0===t?Array:t}},{150:150,77:77,79:79}],43:[function(e,t){var r=e(42)
+t.exports=function(e,t){return new(r(e))(t)}},{42:42}],44:[function(e,t){"use strict"
+var r=e(31),n=e(79),i=e(74),o=[].slice,a={},s=function(e,t,r){if(!(t in a)){for(var n=[],i=0;i<t;i++)n[i]="a["+i+"]"
+a[t]=Function("F,a","return new F("+n.join(",")+")")}return a[t](e,r)}
+t.exports=Function.bind||function(e){var t=r(this),a=o.call(arguments,1),l=function(){var r=a.concat(o.call(arguments))
+return this instanceof l?s(t,r.length,r):i(t,r,e)}
+return n(t.prototype)&&(l.prototype=t.prototype),l}},{31:31,74:74,79:79}],45:[function(e,t){var r=e(46),n=e(150)("toStringTag"),i="Arguments"==r(function(){return arguments}())
+t.exports=function(e){var t,o,a
+return void 0===e?"Undefined":null===e?"Null":"string"==typeof(o=function(e,t){try{return e[t]}catch(r){}}(t=Object(e),n))?o:i?r(t):"Object"==(a=r(t))&&"function"==typeof t.callee?"Arguments":a}},{150:150,46:46}],46:[function(e,t){var r={}.toString
+t.exports=function(e){return r.call(e).slice(8,-1)}},{}],47:[function(e,t){"use strict"
+var r=e(97).f,n=e(96),i=e(115),o=e(52),a=e(35),s=e(66),l=e(83),u=e(85),c=e(121),d=e(56),h=e(92).fastKey,f=e(147),p=d?"_s":"size",m=function(e,t){var r,n=h(t)
+if("F"!==n)return e._i[n]
+for(r=e._f;r;r=r.n)if(r.k==t)return r}
+t.exports={getConstructor:function(e,t,l,u){var c=e((function(e,r){a(e,c,t,"_i"),e._t=t,e._i=n(null),e._f=void 0,e._l=void 0,e[p]=0,null!=r&&s(r,l,e[u],e)}))
+return i(c.prototype,{clear:function(){for(var e=f(this,t),r=e._i,n=e._f;n;n=n.n)n.r=!0,n.p&&(n.p=n.p.n=void 0),delete r[n.i]
+e._f=e._l=void 0,e[p]=0},delete:function(e){var r=f(this,t),n=m(r,e)
+if(n){var i=n.n,o=n.p
+delete r._i[n.i],n.r=!0,o&&(o.n=i),i&&(i.p=o),r._f==n&&(r._f=i),r._l==n&&(r._l=o),r[p]--}return!!n},forEach:function(e){f(this,t)
+for(var r,n=o(e,arguments.length>1?arguments[1]:void 0,3);r=r?r.n:this._f;)for(n(r.v,r.k,this);r&&r.r;)r=r.p},has:function(e){return!!m(f(this,t),e)}}),d&&r(c.prototype,"size",{get:function(){return f(this,t)[p]}}),c},def:function(e,t,r){var n,i,o=m(e,t)
+return o?o.v=r:(e._l=o={i:i=h(t,!0),k:t,v:r,p:n=e._l,n:void 0,r:!1},e._f||(e._f=o),n&&(n.n=o),e[p]++,"F"!==i&&(e._i[i]=o)),e},getEntry:m,setStrong:function(e,t,r){l(e,t,(function(e,r){this._t=f(e,t),this._k=r,this._l=void 0}),(function(){for(var e=this._k,t=this._l;t&&t.r;)t=t.p
+return this._t&&(this._l=t=t?t.n:this._t._f)?u(0,"keys"==e?t.k:"values"==e?t.v:[t.k,t.v]):(this._t=void 0,u(1))}),r?"entries":"values",!r,!0),c(t)}}},{115:115,121:121,147:147,35:35,52:52,56:56,66:66,83:83,85:85,92:92,96:96,97:97}],48:[function(e,t){"use strict"
+var r=e(115),n=e(92).getWeak,i=e(36),o=e(79),a=e(35),s=e(66),l=e(40),u=e(69),c=e(147),d=l(5),h=l(6),f=0,p=function(e){return e._l||(e._l=new m)},m=function(){this.a=[]},v=function(e,t){return d(e.a,(function(e){return e[0]===t}))}
+m.prototype={get:function(e){var t=v(this,e)
+if(t)return t[1]},has:function(e){return!!v(this,e)},set:function(e,t){var r=v(this,e)
+r?r[1]=t:this.a.push([e,t])},delete:function(e){var t=h(this.a,(function(t){return t[0]===e}))
+return~t&&this.a.splice(t,1),!!~t}},t.exports={getConstructor:function(e,t,i,l){var d=e((function(e,r){a(e,d,t,"_i"),e._t=t,e._i=f++,e._l=void 0,null!=r&&s(r,i,e[l],e)}))
+return r(d.prototype,{delete:function(e){if(!o(e))return!1
+var r=n(e)
+return!0===r?p(c(this,t)).delete(e):r&&u(r,this._i)&&delete r[this._i]},has:function(e){if(!o(e))return!1
+var r=n(e)
+return!0===r?p(c(this,t)).has(e):r&&u(r,this._i)}}),d},def:function(e,t,r){var o=n(i(t),!0)
+return!0===o?p(e).set(t,r):o[e._i]=r,e},ufstore:p}},{115:115,147:147,35:35,36:36,40:40,66:66,69:69,79:79,92:92}],49:[function(e,t){"use strict"
+var r=e(68),n=e(60),i=e(116),o=e(115),a=e(92),s=e(66),l=e(35),u=e(79),c=e(62),d=e(84),h=e(122),f=e(73)
+t.exports=function(e,t,p,m,v,g){var b=r[e],y=b,_=v?"set":"add",w=y&&y.prototype,E={},x=function(e){var t=w[e]
+i(w,e,"delete"==e||"has"==e?function(e){return!(g&&!u(e))&&t.call(this,0===e?0:e)}:"get"==e?function(e){return g&&!u(e)?void 0:t.call(this,0===e?0:e)}:"add"==e?function(e){return t.call(this,0===e?0:e),this}:function(e,r){return t.call(this,0===e?0:e,r),this})}
+if("function"==typeof y&&(g||w.forEach&&!c((function(){(new y).entries().next()})))){var O=new y,S=O[_](g?{}:-0,1)!=O,T=c((function(){O.has(1)})),M=d((function(e){new y(e)})),A=!g&&c((function(){for(var e=new y,t=5;t--;)e[_](t,t)
+return!e.has(-0)}))
+M||((y=t((function(t,r){l(t,y,e)
+var n=f(new b,t,y)
+return null!=r&&s(r,v,n[_],n),n}))).prototype=w,w.constructor=y),(T||A)&&(x("delete"),x("has"),v&&x("get")),(A||S)&&x(_),g&&w.clear&&delete w.clear}else y=m.getConstructor(t,e,v,_),o(y.prototype,p),a.NEED=!0
+return h(y,e),E[e]=y,n(n.G+n.W+n.F*(y!=b),E),g||m.setStrong(y,e,v),y}},{115:115,116:116,122:122,35:35,60:60,62:62,66:66,68:68,73:73,79:79,84:84,92:92}],50:[function(e,t,r){arguments[4][16][0].apply(r,arguments)},{16:16}],51:[function(e,t){"use strict"
+var r=e(97),n=e(114)
+t.exports=function(e,t,i){t in e?r.f(e,t,n(0,i)):e[t]=i}},{114:114,97:97}],52:[function(e,t,r){arguments[4][17][0].apply(r,arguments)},{17:17,31:31}],53:[function(e,t){"use strict"
+var r=e(62),n=Date.prototype.getTime,i=Date.prototype.toISOString,o=function(e){return e>9?e:"0"+e}
+t.exports=r((function(){return"0385-07-25T07:06:39.999Z"!=i.call(new Date(-50000000000001))}))||!r((function(){i.call(new Date(NaN))}))?function(){if(!isFinite(n.call(this)))throw RangeError("Invalid time value")
+var e=this,t=e.getUTCFullYear(),r=e.getUTCMilliseconds(),i=t<0?"-":t>9999?"+":""
+return i+("00000"+Math.abs(t)).slice(i?-6:-4)+"-"+o(e.getUTCMonth()+1)+"-"+o(e.getUTCDate())+"T"+o(e.getUTCHours())+":"+o(e.getUTCMinutes())+":"+o(e.getUTCSeconds())+"."+(r>99?r:"0"+o(r))+"Z"}:i},{62:62}],54:[function(e,t){"use strict"
+var r=e(36),n=e(141)
+t.exports=function(e){if("string"!==e&&"number"!==e&&"default"!==e)throw TypeError("Incorrect hint")
+return n(r(this),"number"!=e)}},{141:141,36:36}],55:[function(e,t){t.exports=function(e){if(null==e)throw TypeError("Can't call method on  "+e)
+return e}},{}],56:[function(e,t,r){arguments[4][18][0].apply(r,arguments)},{18:18,62:62}],57:[function(e,t,r){arguments[4][19][0].apply(r,arguments)},{19:19,68:68,79:79}],58:[function(e,t){t.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},{}],59:[function(e,t){var r=e(105),n=e(102),i=e(106)
+t.exports=function(e){var t=r(e),o=n.f
+if(o)for(var a,s=o(e),l=i.f,u=0;s.length>u;)l.call(e,a=s[u++])&&t.push(a)
+return t}},{102:102,105:105,106:106}],60:[function(e,t){var r=e(68),n=e(50),i=e(70),o=e(116),a=e(52),s=function(e,t,l){var u,c,d,h,f=e&s.F,p=e&s.G,m=e&s.S,v=e&s.P,g=e&s.B,b=p?r:m?r[t]||(r[t]={}):(r[t]||{}).prototype,y=p?n:n[t]||(n[t]={}),_=y.prototype||(y.prototype={})
+for(u in p&&(l=t),l)d=((c=!f&&b&&void 0!==b[u])?b:l)[u],h=g&&c?a(d,r):v&&"function"==typeof d?a(Function.call,d):d,b&&o(b,u,d,e&s.U),y[u]!=d&&i(y,u,h),v&&_[u]!=d&&(_[u]=d)}
+r.core=n,s.F=1,s.G=2,s.S=4,s.P=8,s.B=16,s.W=32,s.U=64,s.R=128,t.exports=s},{116:116,50:50,52:52,68:68,70:70}],61:[function(e,t){var r=e(150)("match")
+t.exports=function(e){var t=/./
+try{"/./"[e](t)}catch(n){try{return t[r]=!1,!"/./"[e](t)}catch(i){}}return!0}},{150:150}],62:[function(e,t,r){arguments[4][21][0].apply(r,arguments)},{21:21}],63:[function(e,t){"use strict"
+e(246)
+var r=e(116),n=e(70),i=e(62),o=e(55),a=e(150),s=e(118),l=a("species"),u=!i((function(){var e=/./
+return e.exec=function(){var e=[]
+return e.groups={a:"7"},e},"7"!=="".replace(e,"$<a>")})),c=function(){var e=/(?:)/,t=e.exec
+e.exec=function(){return t.apply(this,arguments)}
+var r="ab".split(e)
+return 2===r.length&&"a"===r[0]&&"b"===r[1]}()
+t.exports=function(e,t,d){var h=a(e),f=!i((function(){var t={}
+return t[h]=function(){return 7},7!=""[e](t)})),p=f?!i((function(){var t=!1,r=/a/
+return r.exec=function(){return t=!0,null},"split"===e&&(r.constructor={},r.constructor[l]=function(){return r}),r[h](""),!t})):void 0
+if(!f||!p||"replace"===e&&!u||"split"===e&&!c){var m=/./[h],v=d(o,h,""[e],(function(e,t,r,n,i){return t.exec===s?f&&!i?{done:!0,value:m.call(t,r,n)}:{done:!0,value:e.call(r,t,n)}:{done:!1}})),g=v[0],b=v[1]
+r(String.prototype,e,g),n(RegExp.prototype,h,2==t?function(e,t){return b.call(e,this,t)}:function(e){return b.call(e,this)})}}},{116:116,118:118,150:150,246:246,55:55,62:62,70:70}],64:[function(e,t){"use strict"
+var r=e(36)
+t.exports=function(){var e=r(this),t=""
+return e.global&&(t+="g"),e.ignoreCase&&(t+="i"),e.multiline&&(t+="m"),e.unicode&&(t+="u"),e.sticky&&(t+="y"),t}},{36:36}],65:[function(e,t){"use strict"
+var r=e(77),n=e(79),i=e(139),o=e(52),a=e(150)("isConcatSpreadable")
+t.exports=function e(t,s,l,u,c,d,h,f){for(var p,m,v=c,g=0,b=!!h&&o(h,f,3);g<u;){if(g in l){if(p=b?b(l[g],g,s):l[g],m=!1,n(p)&&(m=void 0!==(m=p[a])?!!m:r(p)),m&&d>0)v=e(t,s,p,i(p.length),v,d-1)-1
+else{if(v>=9007199254740991)throw TypeError()
+t[v]=p}v++}g++}return v}},{139:139,150:150,52:52,77:77,79:79}],66:[function(e,t,r){var n=e(52),i=e(81),o=e(76),a=e(36),s=e(139),l=e(151),u={},c={};(r=t.exports=function(e,t,r,d,h){var f,p,m,v,g=h?function(){return e}:l(e),b=n(r,d,t?2:1),y=0
+if("function"!=typeof g)throw TypeError(e+" is not iterable!")
+if(o(g)){for(f=s(e.length);f>y;y++)if((v=t?b(a(p=e[y])[0],p[1]):b(e[y]))===u||v===c)return v}else for(m=g.call(e);!(p=m.next()).done;)if((v=i(m,b,p.value,t))===u||v===c)return v}).BREAK=u,r.RETURN=c},{139:139,151:151,36:36,52:52,76:76,81:81}],67:[function(e,t){t.exports=e(124)("native-function-to-string",Function.toString)},{124:124}],68:[function(e,t,r){arguments[4][22][0].apply(r,arguments)},{22:22}],69:[function(e,t,r){arguments[4][23][0].apply(r,arguments)},{23:23}],70:[function(e,t,r){arguments[4][24][0].apply(r,arguments)},{114:114,24:24,56:56,97:97}],71:[function(e,t){var r=e(68).document
+t.exports=r&&r.documentElement},{68:68}],72:[function(e,t,r){arguments[4][25][0].apply(r,arguments)},{25:25,56:56,57:57,62:62}],73:[function(e,t){var r=e(79),n=e(120).set
+t.exports=function(e,t,i){var o,a=t.constructor
+return a!==i&&"function"==typeof a&&(o=a.prototype)!==i.prototype&&r(o)&&n&&n(e,o),e}},{120:120,79:79}],74:[function(e,t){t.exports=function(e,t,r){var n=void 0===r
+switch(t.length){case 0:return n?e():e.call(r)
+case 1:return n?e(t[0]):e.call(r,t[0])
+case 2:return n?e(t[0],t[1]):e.call(r,t[0],t[1])
+case 3:return n?e(t[0],t[1],t[2]):e.call(r,t[0],t[1],t[2])
+case 4:return n?e(t[0],t[1],t[2],t[3]):e.call(r,t[0],t[1],t[2],t[3])}return e.apply(r,t)}},{}],75:[function(e,t){var r=e(46)
+t.exports=Object("z").propertyIsEnumerable(0)?Object:function(e){return"String"==r(e)?e.split(""):Object(e)}},{46:46}],76:[function(e,t){var r=e(86),n=e(150)("iterator"),i=Array.prototype
+t.exports=function(e){return void 0!==e&&(r.Array===e||i[n]===e)}},{150:150,86:86}],77:[function(e,t){var r=e(46)
+t.exports=Array.isArray||function(e){return"Array"==r(e)}},{46:46}],78:[function(e,t){var r=e(79),n=Math.floor
+t.exports=function(e){return!r(e)&&isFinite(e)&&n(e)===e}},{79:79}],79:[function(e,t,r){arguments[4][26][0].apply(r,arguments)},{26:26}],80:[function(e,t){var r=e(79),n=e(46),i=e(150)("match")
+t.exports=function(e){var t
+return r(e)&&(void 0!==(t=e[i])?!!t:"RegExp"==n(e))}},{150:150,46:46,79:79}],81:[function(e,t){var r=e(36)
+t.exports=function(e,t,n,i){try{return i?t(r(n)[0],n[1]):t(n)}catch(a){var o=e.return
+throw void 0!==o&&r(o.call(e)),a}}},{36:36}],82:[function(e,t){"use strict"
+var r=e(96),n=e(114),i=e(122),o={}
+e(70)(o,e(150)("iterator"),(function(){return this})),t.exports=function(e,t,a){e.prototype=r(o,{next:n(1,a)}),i(e,t+" Iterator")}},{114:114,122:122,150:150,70:70,96:96}],83:[function(e,t){"use strict"
+var r=e(87),n=e(60),i=e(116),o=e(70),a=e(86),s=e(82),l=e(122),u=e(103),c=e(150)("iterator"),d=!([].keys&&"next"in[].keys()),h=function(){return this}
+t.exports=function(e,t,f,p,m,v,g){s(f,t,p)
+var b,y,_,w=function(e){if(!d&&e in S)return S[e]
+switch(e){case"keys":case"values":return function(){return new f(this,e)}}return function(){return new f(this,e)}},E=t+" Iterator",x="values"==m,O=!1,S=e.prototype,T=S[c]||S["@@iterator"]||m&&S[m],M=T||w(m),A=m?x?w("entries"):M:void 0,P="Array"==t&&S.entries||T
+if(P&&(_=u(P.call(new e)))!==Object.prototype&&_.next&&(l(_,E,!0),r||"function"==typeof _[c]||o(_,c,h)),x&&T&&"values"!==T.name&&(O=!0,M=function(){return T.call(this)}),r&&!g||!d&&!O&&S[c]||o(S,c,M),a[t]=M,a[E]=h,m)if(b={values:x?M:w("values"),keys:v?M:w("keys"),entries:A},g)for(y in b)y in S||i(S,y,b[y])
+else n(n.P+n.F*(d||O),t,b)
+return b}},{103:103,116:116,122:122,150:150,60:60,70:70,82:82,86:86,87:87}],84:[function(e,t){var r=e(150)("iterator"),n=!1
+try{var i=[7][r]()
+i.return=function(){n=!0},Array.from(i,(function(){throw 2}))}catch(o){}t.exports=function(e,t){if(!t&&!n)return!1
+var i=!1
+try{var a=[7],s=a[r]()
+s.next=function(){return{done:i=!0}},a[r]=function(){return s},e(a)}catch(o){}return i}},{150:150}],85:[function(e,t){t.exports=function(e,t){return{value:t,done:!!e}}},{}],86:[function(e,t){t.exports={}},{}],87:[function(e,t){t.exports=!1},{}],88:[function(e,t){var r=Math.expm1
+t.exports=!r||r(10)>22025.465794806718||r(10)<22025.465794806718||-2e-17!=r(-2e-17)?function(e){return 0==(e=+e)?e:e>-1e-6&&e<1e-6?e+e*e/2:Math.exp(e)-1}:r},{}],89:[function(e,t){var r=e(91),n=Math.pow,i=n(2,-52),o=n(2,-23),a=n(2,127)*(2-o),s=n(2,-126)
+t.exports=Math.fround||function(e){var t,n,l=Math.abs(e),u=r(e)
+return l<s?u*(l/s/o+1/i-1/i)*s*o:(n=(t=(1+o/i)*l)-(t-l))>a||n!=n?u*(1/0):u*n}},{91:91}],90:[function(e,t){t.exports=Math.log1p||function(e){return(e=+e)>-1e-8&&e<1e-8?e-e*e/2:Math.log(1+e)}},{}],91:[function(e,t){t.exports=Math.sign||function(e){return 0==(e=+e)||e!=e?e:e<0?-1:1}},{}],92:[function(e,t){var r=e(145)("meta"),n=e(79),i=e(69),o=e(97).f,a=0,s=Object.isExtensible||function(){return!0},l=!e(62)((function(){return s(Object.preventExtensions({}))})),u=function(e){o(e,r,{value:{i:"O"+ ++a,w:{}}})},c=t.exports={KEY:r,NEED:!1,fastKey:function(e,t){if(!n(e))return"symbol"==typeof e?e:("string"==typeof e?"S":"P")+e
+if(!i(e,r)){if(!s(e))return"F"
+if(!t)return"E"
+u(e)}return e[r].i},getWeak:function(e,t){if(!i(e,r)){if(!s(e))return!0
+if(!t)return!1
+u(e)}return e[r].w},onFreeze:function(e){return l&&c.NEED&&s(e)&&!i(e,r)&&u(e),e}}},{145:145,62:62,69:69,79:79,97:97}],93:[function(e,t){var r=e(68),n=e(134).set,i=r.MutationObserver||r.WebKitMutationObserver,o=r.process,a=r.Promise,s="process"==e(46)(o)
+t.exports=function(){var e,t,l,u=function(){var r,n
+for(s&&(r=o.domain)&&r.exit();e;){n=e.fn,e=e.next
+try{n()}catch(i){throw e?l():t=void 0,i}}t=void 0,r&&r.enter()}
+if(s)l=function(){o.nextTick(u)}
+else if(!i||r.navigator&&r.navigator.standalone)if(a&&a.resolve){var c=a.resolve(void 0)
+l=function(){c.then(u)}}else l=function(){n.call(r,u)}
+else{var d=!0,h=document.createTextNode("")
+new i(u).observe(h,{characterData:!0}),l=function(){h.data=d=!d}}return function(r){var n={fn:r,next:void 0}
+t&&(t.next=n),e||(e=n,l()),t=n}}},{134:134,46:46,68:68}],94:[function(e,t){"use strict"
+var r=e(31)
+function n(e){var t,n
+this.promise=new e((function(e,r){if(void 0!==t||void 0!==n)throw TypeError("Bad Promise constructor")
+t=e,n=r})),this.resolve=r(t),this.reject=r(n)}t.exports.f=function(e){return new n(e)}},{31:31}],95:[function(e,t){"use strict"
+var r=e(56),n=e(105),i=e(102),o=e(106),a=e(140),s=e(75),l=Object.assign
+t.exports=!l||e(62)((function(){var e={},t={},r=Symbol(),n="abcdefghijklmnopqrst"
+return e[r]=7,n.split("").forEach((function(e){t[e]=e})),7!=l({},e)[r]||Object.keys(l({},t)).join("")!=n}))?function(e){for(var t=a(e),l=arguments.length,u=1,c=i.f,d=o.f;l>u;)for(var h,f=s(arguments[u++]),p=c?n(f).concat(c(f)):n(f),m=p.length,v=0;m>v;)h=p[v++],r&&!d.call(f,h)||(t[h]=f[h])
+return t}:l},{102:102,105:105,106:106,140:140,56:56,62:62,75:75}],96:[function(e,t){var r=e(36),n=e(98),i=e(58),o=e(123)("IE_PROTO"),a=function(){},s=function(){var t,r=e(57)("iframe"),n=i.length
+for(r.style.display="none",e(71).appendChild(r),r.src="javascript:",(t=r.contentWindow.document).open(),t.write("<script>document.F=Object<\/script>"),t.close(),s=t.F;n--;)delete s.prototype[i[n]]
+return s()}
+t.exports=Object.create||function(e,t){var i
+return null!==e?(a.prototype=r(e),i=new a,a.prototype=null,i[o]=e):i=s(),void 0===t?i:n(i,t)}},{123:123,36:36,57:57,58:58,71:71,98:98}],97:[function(e,t,r){arguments[4][27][0].apply(r,arguments)},{141:141,27:27,36:36,56:56,72:72}],98:[function(e,t){var r=e(97),n=e(36),i=e(105)
+t.exports=e(56)?Object.defineProperties:function(e,t){n(e)
+for(var o,a=i(t),s=a.length,l=0;s>l;)r.f(e,o=a[l++],t[o])
+return e}},{105:105,36:36,56:56,97:97}],99:[function(e,t,r){var n=e(106),i=e(114),o=e(138),a=e(141),s=e(69),l=e(72),u=Object.getOwnPropertyDescriptor
+r.f=e(56)?u:function(e,t){if(e=o(e),t=a(t,!0),l)try{return u(e,t)}catch(r){}if(s(e,t))return i(!n.f.call(e,t),e[t])}},{106:106,114:114,138:138,141:141,56:56,69:69,72:72}],100:[function(e,t){var r=e(138),n=e(101).f,i={}.toString,o="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[]
+t.exports.f=function(e){return o&&"[object Window]"==i.call(e)?function(e){try{return n(e)}catch(t){return o.slice()}}(e):n(r(e))}},{101:101,138:138}],101:[function(e,t,r){var n=e(104),i=e(58).concat("length","prototype")
+r.f=Object.getOwnPropertyNames||function(e){return n(e,i)}},{104:104,58:58}],102:[function(e,t,r){r.f=Object.getOwnPropertySymbols},{}],103:[function(e,t){var r=e(69),n=e(140),i=e(123)("IE_PROTO"),o=Object.prototype
+t.exports=Object.getPrototypeOf||function(e){return e=n(e),r(e,i)?e[i]:"function"==typeof e.constructor&&e instanceof e.constructor?e.constructor.prototype:e instanceof Object?o:null}},{123:123,140:140,69:69}],104:[function(e,t){var r=e(69),n=e(138),i=e(39)(!1),o=e(123)("IE_PROTO")
+t.exports=function(e,t){var a,s=n(e),l=0,u=[]
+for(a in s)a!=o&&r(s,a)&&u.push(a)
+for(;t.length>l;)r(s,a=t[l++])&&(~i(u,a)||u.push(a))
+return u}},{123:123,138:138,39:39,69:69}],105:[function(e,t){var r=e(104),n=e(58)
+t.exports=Object.keys||function(e){return r(e,n)}},{104:104,58:58}],106:[function(e,t,r){r.f={}.propertyIsEnumerable},{}],107:[function(e,t){var r=e(60),n=e(50),i=e(62)
+t.exports=function(e,t){var o=(n.Object||{})[e]||Object[e],a={}
+a[e]=t(o),r(r.S+r.F*i((function(){o(1)})),"Object",a)}},{50:50,60:60,62:62}],108:[function(e,t){var r=e(56),n=e(105),i=e(138),o=e(106).f
+t.exports=function(e){return function(t){for(var a,s=i(t),l=n(s),u=l.length,c=0,d=[];u>c;)a=l[c++],r&&!o.call(s,a)||d.push(e?[a,s[a]]:s[a])
+return d}}},{105:105,106:106,138:138,56:56}],109:[function(e,t){var r=e(101),n=e(102),i=e(36),o=e(68).Reflect
+t.exports=o&&o.ownKeys||function(e){var t=r.f(i(e)),o=n.f
+return o?t.concat(o(e)):t}},{101:101,102:102,36:36,68:68}],110:[function(e,t){var r=e(68).parseFloat,n=e(132).trim
+t.exports=1/r(e(133)+"-0")!=-1/0?function(e){var t=n(String(e),3),i=r(t)
+return 0===i&&"-"==t.charAt(0)?-0:i}:r},{132:132,133:133,68:68}],111:[function(e,t){var r=e(68).parseInt,n=e(132).trim,i=e(133),o=/^[-+]?0[xX]/
+t.exports=8!==r(i+"08")||22!==r(i+"0x16")?function(e,t){var i=n(String(e),3)
+return r(i,t>>>0||(o.test(i)?16:10))}:r},{132:132,133:133,68:68}],112:[function(e,t){t.exports=function(e){try{return{e:!1,v:e()}}catch(t){return{e:!0,v:t}}}},{}],113:[function(e,t){var r=e(36),n=e(79),i=e(94)
+t.exports=function(e,t){if(r(e),n(t)&&t.constructor===e)return t
+var o=i.f(e)
+return(0,o.resolve)(t),o.promise}},{36:36,79:79,94:94}],114:[function(e,t,r){arguments[4][28][0].apply(r,arguments)},{28:28}],115:[function(e,t){var r=e(116)
+t.exports=function(e,t,n){for(var i in t)r(e,i,t[i],n)
+return e}},{116:116}],116:[function(e,t){var r=e(68),n=e(70),i=e(69),o=e(145)("src"),a=e(67),s=(""+a).split("toString")
+e(50).inspectSource=function(e){return a.call(e)},(t.exports=function(e,t,a,l){var u="function"==typeof a
+u&&(i(a,"name")||n(a,"name",t)),e[t]!==a&&(u&&(i(a,o)||n(a,o,e[t]?""+e[t]:s.join(String(t)))),e===r?e[t]=a:l?e[t]?e[t]=a:n(e,t,a):(delete e[t],n(e,t,a)))})(Function.prototype,"toString",(function(){return"function"==typeof this&&this[o]||a.call(this)}))},{145:145,50:50,67:67,68:68,69:69,70:70}],117:[function(e,t){"use strict"
+var r=e(45),n=RegExp.prototype.exec
+t.exports=function(e,t){var i=e.exec
+if("function"==typeof i){var o=i.call(e,t)
+if("object"!=typeof o)throw new TypeError("RegExp exec method returned something other than an Object or null")
+return o}if("RegExp"!==r(e))throw new TypeError("RegExp#exec called on incompatible receiver")
+return n.call(e,t)}},{45:45}],118:[function(e,t){"use strict"
+var r,n,i=e(64),o=RegExp.prototype.exec,a=String.prototype.replace,s=o,l=(r=/a/,n=/b*/g,o.call(r,"a"),o.call(n,"a"),0!==r.lastIndex||0!==n.lastIndex),u=void 0!==/()??/.exec("")[1];(l||u)&&(s=function(e){var t,r,n,s,c=this
+return u&&(r=new RegExp("^"+c.source+"$(?!\\s)",i.call(c))),l&&(t=c.lastIndex),n=o.call(c,e),l&&n&&(c.lastIndex=c.global?n.index+n[0].length:t),u&&n&&n.length>1&&a.call(n[0],r,(function(){for(s=1;s<arguments.length-2;s++)void 0===arguments[s]&&(n[s]=void 0)})),n}),t.exports=s},{64:64}],119:[function(e,t){t.exports=Object.is||function(e,t){return e===t?0!==e||1/e==1/t:e!=e&&t!=t}},{}],120:[function(e,t){var r=e(79),n=e(36),i=function(e,t){if(n(e),!r(t)&&null!==t)throw TypeError(t+": can't set as prototype!")}
+t.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(t,r,n){try{(n=e(52)(Function.call,e(99).f(Object.prototype,"__proto__").set,2))(t,[]),r=!(t instanceof Array)}catch(o){r=!0}return function(e,t){return i(e,t),r?e.__proto__=t:n(e,t),e}}({},!1):void 0),check:i}},{36:36,52:52,79:79,99:99}],121:[function(e,t){"use strict"
+var r=e(68),n=e(97),i=e(56),o=e(150)("species")
+t.exports=function(e){var t=r[e]
+i&&t&&!t[o]&&n.f(t,o,{configurable:!0,get:function(){return this}})}},{150:150,56:56,68:68,97:97}],122:[function(e,t){var r=e(97).f,n=e(69),i=e(150)("toStringTag")
+t.exports=function(e,t,o){e&&!n(e=o?e:e.prototype,i)&&r(e,i,{configurable:!0,value:t})}},{150:150,69:69,97:97}],123:[function(e,t){var r=e(124)("keys"),n=e(145)
+t.exports=function(e){return r[e]||(r[e]=n(e))}},{124:124,145:145}],124:[function(e,t){var r=e(50),n=e(68),i=n["__core-js_shared__"]||(n["__core-js_shared__"]={});(t.exports=function(e,t){return i[e]||(i[e]=void 0!==t?t:{})})("versions",[]).push({version:r.version,mode:e(87)?"pure":"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})},{50:50,68:68,87:87}],125:[function(e,t){var r=e(36),n=e(31),i=e(150)("species")
+t.exports=function(e,t){var o,a=r(e).constructor
+return void 0===a||null==(o=r(a)[i])?t:n(o)}},{150:150,31:31,36:36}],126:[function(e,t){"use strict"
+var r=e(62)
+t.exports=function(e,t){return!!e&&r((function(){t?e.call(null,(function(){}),1):e.call(null)}))}},{62:62}],127:[function(e,t){var r=e(137),n=e(55)
+t.exports=function(e){return function(t,i){var o,a,s=String(n(t)),l=r(i),u=s.length
+return l<0||l>=u?e?"":void 0:(o=s.charCodeAt(l))<55296||o>56319||l+1===u||(a=s.charCodeAt(l+1))<56320||a>57343?e?s.charAt(l):o:e?s.slice(l,l+2):a-56320+(o-55296<<10)+65536}}},{137:137,55:55}],128:[function(e,t){var r=e(80),n=e(55)
+t.exports=function(e,t,i){if(r(t))throw TypeError("String#"+i+" doesn't accept regex!")
+return String(n(e))}},{55:55,80:80}],129:[function(e,t){var r=e(60),n=e(62),i=e(55),o=/"/g,a=function(e,t,r,n){var a=String(i(e)),s="<"+t
+return""!==r&&(s+=" "+r+'="'+String(n).replace(o,"&quot;")+'"'),s+">"+a+"</"+t+">"}
+t.exports=function(e,t){var i={}
+i[e]=t(a),r(r.P+r.F*n((function(){var t=""[e]('"')
+return t!==t.toLowerCase()||t.split('"').length>3})),"String",i)}},{55:55,60:60,62:62}],130:[function(e,t){var r=e(139),n=e(131),i=e(55)
+t.exports=function(e,t,o,a){var s=String(i(e)),l=s.length,u=void 0===o?" ":String(o),c=r(t)
+if(c<=l||""==u)return s
+var d=c-l,h=n.call(u,Math.ceil(d/u.length))
+return h.length>d&&(h=h.slice(0,d)),a?h+s:s+h}},{131:131,139:139,55:55}],131:[function(e,t){"use strict"
+var r=e(137),n=e(55)
+t.exports=function(e){var t=String(n(this)),i="",o=r(e)
+if(o<0||o==1/0)throw RangeError("Count can't be negative")
+for(;o>0;(o>>>=1)&&(t+=t))1&o&&(i+=t)
+return i}},{137:137,55:55}],132:[function(e,t){var r=e(60),n=e(55),i=e(62),o=e(133),a="["+o+"]",s=RegExp("^"+a+a+"*"),l=RegExp(a+a+"*$"),u=function(e,t,n){var a={},s=i((function(){return!!o[e]()||"​…"!="​…"[e]()})),l=a[e]=s?t(c):o[e]
+n&&(a[n]=l),r(r.P+r.F*s,"String",a)},c=u.trim=function(e,t){return e=String(n(e)),1&t&&(e=e.replace(s,"")),2&t&&(e=e.replace(l,"")),e}
+t.exports=u},{133:133,55:55,60:60,62:62}],133:[function(e,t){t.exports="\t\n\v\f\r   ᠎             　\u2028\u2029\ufeff"},{}],134:[function(e,t){var r,n,i,o=e(52),a=e(74),s=e(71),l=e(57),u=e(68),c=u.process,d=u.setImmediate,h=u.clearImmediate,f=u.MessageChannel,p=u.Dispatch,m=0,v={},g=function(){var e=+this
+if(v.hasOwnProperty(e)){var t=v[e]
+delete v[e],t()}},b=function(e){g.call(e.data)}
+d&&h||(d=function(e){for(var t=[],n=1;arguments.length>n;)t.push(arguments[n++])
+return v[++m]=function(){a("function"==typeof e?e:Function(e),t)},r(m),m},h=function(e){delete v[e]},"process"==e(46)(c)?r=function(e){c.nextTick(o(g,e,1))}:p&&p.now?r=function(e){p.now(o(g,e,1))}:f?(i=(n=new f).port2,n.port1.onmessage=b,r=o(i.postMessage,i,1)):u.addEventListener&&"function"==typeof postMessage&&!u.importScripts?(r=function(e){u.postMessage(e+"","*")},u.addEventListener("message",b,!1)):r="onreadystatechange"in l("script")?function(e){s.appendChild(l("script")).onreadystatechange=function(){s.removeChild(this),g.call(e)}}:function(e){setTimeout(o(g,e,1),0)}),t.exports={set:d,clear:h}},{46:46,52:52,57:57,68:68,71:71,74:74}],135:[function(e,t){var r=e(137),n=Math.max,i=Math.min
+t.exports=function(e,t){return(e=r(e))<0?n(e+t,0):i(e,t)}},{137:137}],136:[function(e,t){var r=e(137),n=e(139)
+t.exports=function(e){if(void 0===e)return 0
+var t=r(e),i=n(t)
+if(t!==i)throw RangeError("Wrong length!")
+return i}},{137:137,139:139}],137:[function(e,t){var r=Math.ceil,n=Math.floor
+t.exports=function(e){return isNaN(e=+e)?0:(e>0?n:r)(e)}},{}],138:[function(e,t){var r=e(75),n=e(55)
+t.exports=function(e){return r(n(e))}},{55:55,75:75}],139:[function(e,t){var r=e(137),n=Math.min
+t.exports=function(e){return e>0?n(r(e),9007199254740991):0}},{137:137}],140:[function(e,t){var r=e(55)
+t.exports=function(e){return Object(r(e))}},{55:55}],141:[function(e,t,r){arguments[4][29][0].apply(r,arguments)},{29:29,79:79}],142:[function(e,t){"use strict"
+if(e(56)){var r=e(87),n=e(68),i=e(62),o=e(60),a=e(144),s=e(143),l=e(52),u=e(35),c=e(114),d=e(70),h=e(115),f=e(137),p=e(139),m=e(136),v=e(135),g=e(141),b=e(69),y=e(45),_=e(79),w=e(140),E=e(76),x=e(96),O=e(103),S=e(101).f,T=e(151),M=e(145),A=e(150),P=e(40),C=e(39),k=e(125),R=e(162),j=e(86),D=e(84),N=e(121),I=e(38),L=e(37),F=e(97),z=e(99),U=F.f,H=z.f,B=n.RangeError,V=n.TypeError,$=n.Uint8Array,q=Array.prototype,W=s.ArrayBuffer,G=s.DataView,Y=P(0),K=P(2),J=P(3),Q=P(4),X=P(5),Z=P(6),ee=C(!0),te=C(!1),re=R.values,ne=R.keys,ie=R.entries,oe=q.lastIndexOf,ae=q.reduce,se=q.reduceRight,le=q.join,ue=q.sort,ce=q.slice,de=q.toString,he=q.toLocaleString,fe=A("iterator"),pe=A("toStringTag"),me=M("typed_constructor"),ve=M("def_constructor"),ge=a.CONSTR,be=a.TYPED,ye=a.VIEW,_e=P(1,(function(e,t){return Se(k(e,e[ve]),t)})),we=i((function(){return 1===new $(new Uint16Array([1]).buffer)[0]})),Ee=!!$&&!!$.prototype.set&&i((function(){new $(1).set({})})),xe=function(e,t){var r=f(e)
+if(r<0||r%t)throw B("Wrong offset!")
+return r},Oe=function(e){if(_(e)&&be in e)return e
+throw V(e+" is not a typed array!")},Se=function(e,t){if(!_(e)||!(me in e))throw V("It is not a typed array constructor!")
+return new e(t)},Te=function(e,t){return Me(k(e,e[ve]),t)},Me=function(e,t){for(var r=0,n=t.length,i=Se(e,n);n>r;)i[r]=t[r++]
+return i},Ae=function(e,t,r){U(e,t,{get:function(){return this._d[r]}})},Pe=function(e){var t,r,n,i,o,a,s=w(e),u=arguments.length,c=u>1?arguments[1]:void 0,d=void 0!==c,h=T(s)
+if(null!=h&&!E(h)){for(a=h.call(s),n=[],t=0;!(o=a.next()).done;t++)n.push(o.value)
+s=n}for(d&&u>2&&(c=l(c,arguments[2],2)),t=0,r=p(s.length),i=Se(this,r);r>t;t++)i[t]=d?c(s[t],t):s[t]
+return i},Ce=function(){for(var e=0,t=arguments.length,r=Se(this,t);t>e;)r[e]=arguments[e++]
+return r},ke=!!$&&i((function(){he.call(new $(1))})),Re=function(){return he.apply(ke?ce.call(Oe(this)):Oe(this),arguments)},je={copyWithin:function(e,t){return L.call(Oe(this),e,t,arguments.length>2?arguments[2]:void 0)},every:function(e){return Q(Oe(this),e,arguments.length>1?arguments[1]:void 0)},fill:function(){return I.apply(Oe(this),arguments)},filter:function(e){return Te(this,K(Oe(this),e,arguments.length>1?arguments[1]:void 0))},find:function(e){return X(Oe(this),e,arguments.length>1?arguments[1]:void 0)},findIndex:function(e){return Z(Oe(this),e,arguments.length>1?arguments[1]:void 0)},forEach:function(e){Y(Oe(this),e,arguments.length>1?arguments[1]:void 0)},indexOf:function(e){return te(Oe(this),e,arguments.length>1?arguments[1]:void 0)},includes:function(e){return ee(Oe(this),e,arguments.length>1?arguments[1]:void 0)},join:function(){return le.apply(Oe(this),arguments)},lastIndexOf:function(){return oe.apply(Oe(this),arguments)},map:function(e){return _e(Oe(this),e,arguments.length>1?arguments[1]:void 0)},reduce:function(){return ae.apply(Oe(this),arguments)},reduceRight:function(){return se.apply(Oe(this),arguments)},reverse:function(){for(var e,t=Oe(this).length,r=Math.floor(t/2),n=0;n<r;)e=this[n],this[n++]=this[--t],this[t]=e
+return this},some:function(e){return J(Oe(this),e,arguments.length>1?arguments[1]:void 0)},sort:function(e){return ue.call(Oe(this),e)},subarray:function(e,t){var r=Oe(this),n=r.length,i=v(e,n)
+return new(k(r,r[ve]))(r.buffer,r.byteOffset+i*r.BYTES_PER_ELEMENT,p((void 0===t?n:v(t,n))-i))}},De=function(e,t){return Te(this,ce.call(Oe(this),e,t))},Ne=function(e){Oe(this)
+var t=xe(arguments[1],1),r=this.length,n=w(e),i=p(n.length),o=0
+if(i+t>r)throw B("Wrong length!")
+for(;o<i;)this[t+o]=n[o++]},Ie={entries:function(){return ie.call(Oe(this))},keys:function(){return ne.call(Oe(this))},values:function(){return re.call(Oe(this))}},Le=function(e,t){return _(e)&&e[be]&&"symbol"!=typeof t&&t in e&&String(+t)==String(t)},Fe=function(e,t){return Le(e,t=g(t,!0))?c(2,e[t]):H(e,t)},ze=function(e,t,r){return!(Le(e,t=g(t,!0))&&_(r)&&b(r,"value"))||b(r,"get")||b(r,"set")||r.configurable||b(r,"writable")&&!r.writable||b(r,"enumerable")&&!r.enumerable?U(e,t,r):(e[t]=r.value,e)}
+ge||(z.f=Fe,F.f=ze),o(o.S+o.F*!ge,"Object",{getOwnPropertyDescriptor:Fe,defineProperty:ze}),i((function(){de.call({})}))&&(de=he=function(){return le.call(this)})
+var Ue=h({},je)
+h(Ue,Ie),d(Ue,fe,Ie.values),h(Ue,{slice:De,set:Ne,constructor:function(){},toString:de,toLocaleString:Re}),Ae(Ue,"buffer","b"),Ae(Ue,"byteOffset","o"),Ae(Ue,"byteLength","l"),Ae(Ue,"length","e"),U(Ue,pe,{get:function(){return this[be]}}),t.exports=function(e,t,s,l){var c=e+((l=!!l)?"Clamped":"")+"Array",h="get"+e,f="set"+e,v=n[c],g=v||{},b=v&&O(v),w=!v||!a.ABV,E={},T=v&&v.prototype,M=function(e,r){U(e,r,{get:function(){return function(e,r){var n=e._d
+return n.v[h](r*t+n.o,we)}(this,r)},set:function(e){return function(e,r,n){var i=e._d
+l&&(n=(n=Math.round(n))<0?0:n>255?255:255&n),i.v[f](r*t+i.o,n,we)}(this,r,e)},enumerable:!0})}
+w?(v=s((function(e,r,n,i){u(e,v,c,"_d")
+var o,a,s,l,h=0,f=0
+if(_(r)){if(!(r instanceof W||"ArrayBuffer"==(l=y(r))||"SharedArrayBuffer"==l))return be in r?Me(v,r):Pe.call(v,r)
+o=r,f=xe(n,t)
+var g=r.byteLength
+if(void 0===i){if(g%t)throw B("Wrong length!")
+if((a=g-f)<0)throw B("Wrong length!")}else if((a=p(i)*t)+f>g)throw B("Wrong length!")
+s=a/t}else s=m(r),o=new W(a=s*t)
+for(d(e,"_d",{b:o,o:f,l:a,e:s,v:new G(o)});h<s;)M(e,h++)})),T=v.prototype=x(Ue),d(T,"constructor",v)):i((function(){v(1)}))&&i((function(){new v(-1)}))&&D((function(e){new v,new v(null),new v(1.5),new v(e)}),!0)||(v=s((function(e,r,n,i){var o
+return u(e,v,c),_(r)?r instanceof W||"ArrayBuffer"==(o=y(r))||"SharedArrayBuffer"==o?void 0!==i?new g(r,xe(n,t),i):void 0!==n?new g(r,xe(n,t)):new g(r):be in r?Me(v,r):Pe.call(v,r):new g(m(r))})),Y(b!==Function.prototype?S(g).concat(S(b)):S(g),(function(e){e in v||d(v,e,g[e])})),v.prototype=T,r||(T.constructor=v))
+var A=T[fe],P=!!A&&("values"==A.name||null==A.name),C=Ie.values
+d(v,me,!0),d(T,be,c),d(T,ye,!0),d(T,ve,v),(l?new v(1)[pe]==c:pe in T)||U(T,pe,{get:function(){return c}}),E[c]=v,o(o.G+o.W+o.F*(v!=g),E),o(o.S,c,{BYTES_PER_ELEMENT:t}),o(o.S+o.F*i((function(){g.of.call(v,1)})),c,{from:Pe,of:Ce}),"BYTES_PER_ELEMENT"in T||d(T,"BYTES_PER_ELEMENT",t),o(o.P,c,je),N(c),o(o.P+o.F*Ee,c,{set:Ne}),o(o.P+o.F*!P,c,Ie),r||T.toString==de||(T.toString=de),o(o.P+o.F*i((function(){new v(1).slice()})),c,{slice:De}),o(o.P+o.F*(i((function(){return[1,2].toLocaleString()!=new v([1,2]).toLocaleString()}))||!i((function(){T.toLocaleString.call([1,2])}))),c,{toLocaleString:Re}),j[c]=P?A:C,r||P||d(T,fe,C)}}else t.exports=function(){}},{101:101,103:103,114:114,115:115,121:121,125:125,135:135,136:136,137:137,139:139,140:140,141:141,143:143,144:144,145:145,150:150,151:151,162:162,35:35,37:37,38:38,39:39,40:40,45:45,52:52,56:56,60:60,62:62,68:68,69:69,70:70,76:76,79:79,84:84,86:86,87:87,96:96,97:97,99:99}],143:[function(e,t,r){"use strict"
+var n=e(68),i=e(56),o=e(87),a=e(144),s=e(70),l=e(115),u=e(62),c=e(35),d=e(137),h=e(139),f=e(136),p=e(101).f,m=e(97).f,v=e(38),g=e(122),b=n.ArrayBuffer,y=n.DataView,_=n.Math,w=n.RangeError,E=n.Infinity,x=b,O=_.abs,S=_.pow,T=_.floor,M=_.log,A=_.LN2,P=i?"_b":"buffer",C=i?"_l":"byteLength",k=i?"_o":"byteOffset"
+function R(e,t,r){var n,i,o,a=new Array(r),s=8*r-t-1,l=(1<<s)-1,u=l>>1,c=23===t?S(2,-24)-S(2,-77):0,d=0,h=e<0||0===e&&1/e<0?1:0
+for((e=O(e))!=e||e===E?(i=e!=e?1:0,n=l):(n=T(M(e)/A),e*(o=S(2,-n))<1&&(n--,o*=2),(e+=n+u>=1?c/o:c*S(2,1-u))*o>=2&&(n++,o/=2),n+u>=l?(i=0,n=l):n+u>=1?(i=(e*o-1)*S(2,t),n+=u):(i=e*S(2,u-1)*S(2,t),n=0));t>=8;a[d++]=255&i,i/=256,t-=8);for(n=n<<t|i,s+=t;s>0;a[d++]=255&n,n/=256,s-=8);return a[--d]|=128*h,a}function j(e,t,r){var n,i=8*r-t-1,o=(1<<i)-1,a=o>>1,s=i-7,l=r-1,u=e[l--],c=127&u
+for(u>>=7;s>0;c=256*c+e[l],l--,s-=8);for(n=c&(1<<-s)-1,c>>=-s,s+=t;s>0;n=256*n+e[l],l--,s-=8);if(0===c)c=1-a
+else{if(c===o)return n?NaN:u?-E:E
+n+=S(2,t),c-=a}return(u?-1:1)*n*S(2,c-t)}function D(e){return e[3]<<24|e[2]<<16|e[1]<<8|e[0]}function N(e){return[255&e]}function I(e){return[255&e,e>>8&255]}function L(e){return[255&e,e>>8&255,e>>16&255,e>>24&255]}function F(e){return R(e,52,8)}function z(e){return R(e,23,4)}function U(e,t,r){m(e.prototype,t,{get:function(){return this[r]}})}function H(e,t,r,n){var i=f(+r)
+if(i+t>e[C])throw w("Wrong index!")
+var o=e[P]._b,a=i+e[k],s=o.slice(a,a+t)
+return n?s:s.reverse()}function B(e,t,r,n,i,o){var a=f(+r)
+if(a+t>e[C])throw w("Wrong index!")
+for(var s=e[P]._b,l=a+e[k],u=n(+i),c=0;c<t;c++)s[l+c]=u[o?c:t-c-1]}if(a.ABV){if(!u((function(){b(1)}))||!u((function(){new b(-1)}))||u((function(){return new b,new b(1.5),new b(NaN),"ArrayBuffer"!=b.name}))){for(var V,$=(b=function(e){return c(this,b),new x(f(e))}).prototype=x.prototype,q=p(x),W=0;q.length>W;)(V=q[W++])in b||s(b,V,x[V])
+o||($.constructor=b)}var G=new y(new b(2)),Y=y.prototype.setInt8
+G.setInt8(0,2147483648),G.setInt8(1,2147483649),!G.getInt8(0)&&G.getInt8(1)||l(y.prototype,{setInt8:function(e,t){Y.call(this,e,t<<24>>24)},setUint8:function(e,t){Y.call(this,e,t<<24>>24)}},!0)}else b=function(e){c(this,b,"ArrayBuffer")
+var t=f(e)
+this._b=v.call(new Array(t),0),this[C]=t},y=function(e,t,r){c(this,y,"DataView"),c(e,b,"DataView")
+var n=e[C],i=d(t)
+if(i<0||i>n)throw w("Wrong offset!")
+if(i+(r=void 0===r?n-i:h(r))>n)throw w("Wrong length!")
+this[P]=e,this[k]=i,this[C]=r},i&&(U(b,"byteLength","_l"),U(y,"buffer","_b"),U(y,"byteLength","_l"),U(y,"byteOffset","_o")),l(y.prototype,{getInt8:function(e){return H(this,1,e)[0]<<24>>24},getUint8:function(e){return H(this,1,e)[0]},getInt16:function(e){var t=H(this,2,e,arguments[1])
+return(t[1]<<8|t[0])<<16>>16},getUint16:function(e){var t=H(this,2,e,arguments[1])
+return t[1]<<8|t[0]},getInt32:function(e){return D(H(this,4,e,arguments[1]))},getUint32:function(e){return D(H(this,4,e,arguments[1]))>>>0},getFloat32:function(e){return j(H(this,4,e,arguments[1]),23,4)},getFloat64:function(e){return j(H(this,8,e,arguments[1]),52,8)},setInt8:function(e,t){B(this,1,e,N,t)},setUint8:function(e,t){B(this,1,e,N,t)},setInt16:function(e,t){B(this,2,e,I,t,arguments[2])},setUint16:function(e,t){B(this,2,e,I,t,arguments[2])},setInt32:function(e,t){B(this,4,e,L,t,arguments[2])},setUint32:function(e,t){B(this,4,e,L,t,arguments[2])},setFloat32:function(e,t){B(this,4,e,z,t,arguments[2])},setFloat64:function(e,t){B(this,8,e,F,t,arguments[2])}})
+g(b,"ArrayBuffer"),g(y,"DataView"),s(y.prototype,a.VIEW,!0),r.ArrayBuffer=b,r.DataView=y},{101:101,115:115,122:122,136:136,137:137,139:139,144:144,35:35,38:38,56:56,62:62,68:68,70:70,87:87,97:97}],144:[function(e,t){for(var r,n=e(68),i=e(70),o=e(145),a=o("typed_array"),s=o("view"),l=!(!n.ArrayBuffer||!n.DataView),u=l,c=0,d="Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array".split(",");c<9;)(r=n[d[c++]])?(i(r.prototype,a,!0),i(r.prototype,s,!0)):u=!1
+t.exports={ABV:l,CONSTR:u,TYPED:a,VIEW:s}},{145:145,68:68,70:70}],145:[function(e,t){var r=0,n=Math.random()
+t.exports=function(e){return"Symbol(".concat(void 0===e?"":e,")_",(++r+n).toString(36))}},{}],146:[function(e,t){var r=e(68).navigator
+t.exports=r&&r.userAgent||""},{68:68}],147:[function(e,t){var r=e(79)
+t.exports=function(e,t){if(!r(e)||e._t!==t)throw TypeError("Incompatible receiver, "+t+" required!")
+return e}},{79:79}],148:[function(e,t){var r=e(68),n=e(50),i=e(87),o=e(149),a=e(97).f
+t.exports=function(e){var t=n.Symbol||(n.Symbol=i?{}:r.Symbol||{})
+"_"==e.charAt(0)||e in t||a(t,e,{value:o.f(e)})}},{149:149,50:50,68:68,87:87,97:97}],149:[function(e,t,r){r.f=e(150)},{150:150}],150:[function(e,t){var r=e(124)("wks"),n=e(145),i=e(68).Symbol,o="function"==typeof i;(t.exports=function(e){return r[e]||(r[e]=o&&i[e]||(o?i:n)("Symbol."+e))}).store=r},{124:124,145:145,68:68}],151:[function(e,t){var r=e(45),n=e(150)("iterator"),i=e(86)
+t.exports=e(50).getIteratorMethod=function(e){if(null!=e)return e[n]||e["@@iterator"]||i[r(e)]}},{150:150,45:45,50:50,86:86}],152:[function(e){var t=e(60)
+t(t.P,"Array",{copyWithin:e(37)}),e(33)("copyWithin")},{33:33,37:37,60:60}],153:[function(e){"use strict"
+var t=e(60),r=e(40)(4)
+t(t.P+t.F*!e(126)([].every,!0),"Array",{every:function(e){return r(this,e,arguments[1])}})},{126:126,40:40,60:60}],154:[function(e){var t=e(60)
+t(t.P,"Array",{fill:e(38)}),e(33)("fill")},{33:33,38:38,60:60}],155:[function(e){"use strict"
+var t=e(60),r=e(40)(2)
+t(t.P+t.F*!e(126)([].filter,!0),"Array",{filter:function(e){return r(this,e,arguments[1])}})},{126:126,40:40,60:60}],156:[function(e){"use strict"
+var t=e(60),r=e(40)(6),n="findIndex",i=!0
+n in[]&&Array(1)[n]((function(){i=!1})),t(t.P+t.F*i,"Array",{findIndex:function(e){return r(this,e,arguments.length>1?arguments[1]:void 0)}}),e(33)(n)},{33:33,40:40,60:60}],157:[function(e){"use strict"
+var t=e(60),r=e(40)(5),n=!0
+"find"in[]&&Array(1).find((function(){n=!1})),t(t.P+t.F*n,"Array",{find:function(e){return r(this,e,arguments.length>1?arguments[1]:void 0)}}),e(33)("find")},{33:33,40:40,60:60}],158:[function(e){"use strict"
+var t=e(60),r=e(40)(0),n=e(126)([].forEach,!0)
+t(t.P+t.F*!n,"Array",{forEach:function(e){return r(this,e,arguments[1])}})},{126:126,40:40,60:60}],159:[function(e){"use strict"
+var t=e(52),r=e(60),n=e(140),i=e(81),o=e(76),a=e(139),s=e(51),l=e(151)
+r(r.S+r.F*!e(84)((function(e){Array.from(e)})),"Array",{from:function(e){var r,u,c,d,h=n(e),f="function"==typeof this?this:Array,p=arguments.length,m=p>1?arguments[1]:void 0,v=void 0!==m,g=0,b=l(h)
+if(v&&(m=t(m,p>2?arguments[2]:void 0,2)),null==b||f==Array&&o(b))for(u=new f(r=a(h.length));r>g;g++)s(u,g,v?m(h[g],g):h[g])
+else for(d=b.call(h),u=new f;!(c=d.next()).done;g++)s(u,g,v?i(d,m,[c.value,g],!0):c.value)
+return u.length=g,u}})},{139:139,140:140,151:151,51:51,52:52,60:60,76:76,81:81,84:84}],160:[function(e){"use strict"
+var t=e(60),r=e(39)(!1),n=[].indexOf,i=!!n&&1/[1].indexOf(1,-0)<0
+t(t.P+t.F*(i||!e(126)(n)),"Array",{indexOf:function(e){return i?n.apply(this,arguments)||0:r(this,e,arguments[1])}})},{126:126,39:39,60:60}],161:[function(e){var t=e(60)
+t(t.S,"Array",{isArray:e(77)})},{60:60,77:77}],162:[function(e,t){"use strict"
+var r=e(33),n=e(85),i=e(86),o=e(138)
+t.exports=e(83)(Array,"Array",(function(e,t){this._t=o(e),this._i=0,this._k=t}),(function(){var e=this._t,t=this._k,r=this._i++
+return!e||r>=e.length?(this._t=void 0,n(1)):n(0,"keys"==t?r:"values"==t?e[r]:[r,e[r]])}),"values"),i.Arguments=i.Array,r("keys"),r("values"),r("entries")},{138:138,33:33,83:83,85:85,86:86}],163:[function(e){"use strict"
+var t=e(60),r=e(138),n=[].join
+t(t.P+t.F*(e(75)!=Object||!e(126)(n)),"Array",{join:function(e){return n.call(r(this),void 0===e?",":e)}})},{126:126,138:138,60:60,75:75}],164:[function(e){"use strict"
+var t=e(60),r=e(138),n=e(137),i=e(139),o=[].lastIndexOf,a=!!o&&1/[1].lastIndexOf(1,-0)<0
+t(t.P+t.F*(a||!e(126)(o)),"Array",{lastIndexOf:function(e){if(a)return o.apply(this,arguments)||0
+var t=r(this),s=i(t.length),l=s-1
+for(arguments.length>1&&(l=Math.min(l,n(arguments[1]))),l<0&&(l=s+l);l>=0;l--)if(l in t&&t[l]===e)return l||0
+return-1}})},{126:126,137:137,138:138,139:139,60:60}],165:[function(e){"use strict"
+var t=e(60),r=e(40)(1)
+t(t.P+t.F*!e(126)([].map,!0),"Array",{map:function(e){return r(this,e,arguments[1])}})},{126:126,40:40,60:60}],166:[function(e){"use strict"
+var t=e(60),r=e(51)
+t(t.S+t.F*e(62)((function(){function e(){}return!(Array.of.call(e)instanceof e)})),"Array",{of:function(){for(var e=0,t=arguments.length,n=new("function"==typeof this?this:Array)(t);t>e;)r(n,e,arguments[e++])
+return n.length=t,n}})},{51:51,60:60,62:62}],167:[function(e){"use strict"
+var t=e(60),r=e(41)
+t(t.P+t.F*!e(126)([].reduceRight,!0),"Array",{reduceRight:function(e){return r(this,e,arguments.length,arguments[1],!0)}})},{126:126,41:41,60:60}],168:[function(e){"use strict"
+var t=e(60),r=e(41)
+t(t.P+t.F*!e(126)([].reduce,!0),"Array",{reduce:function(e){return r(this,e,arguments.length,arguments[1],!1)}})},{126:126,41:41,60:60}],169:[function(e){"use strict"
+var t=e(60),r=e(71),n=e(46),i=e(135),o=e(139),a=[].slice
+t(t.P+t.F*e(62)((function(){r&&a.call(r)})),"Array",{slice:function(e,t){var r=o(this.length),s=n(this)
+if(t=void 0===t?r:t,"Array"==s)return a.call(this,e,t)
+for(var l=i(e,r),u=i(t,r),c=o(u-l),d=new Array(c),h=0;h<c;h++)d[h]="String"==s?this.charAt(l+h):this[l+h]
+return d}})},{135:135,139:139,46:46,60:60,62:62,71:71}],170:[function(e){"use strict"
+var t=e(60),r=e(40)(3)
+t(t.P+t.F*!e(126)([].some,!0),"Array",{some:function(e){return r(this,e,arguments[1])}})},{126:126,40:40,60:60}],171:[function(e){"use strict"
+var t=e(60),r=e(31),n=e(140),i=e(62),o=[].sort,a=[1,2,3]
+t(t.P+t.F*(i((function(){a.sort(void 0)}))||!i((function(){a.sort(null)}))||!e(126)(o)),"Array",{sort:function(e){return void 0===e?o.call(n(this)):o.call(n(this),r(e))}})},{126:126,140:140,31:31,60:60,62:62}],172:[function(e){e(121)("Array")},{121:121}],173:[function(e){var t=e(60)
+t(t.S,"Date",{now:function(){return(new Date).getTime()}})},{60:60}],174:[function(e){var t=e(60),r=e(53)
+t(t.P+t.F*(Date.prototype.toISOString!==r),"Date",{toISOString:r})},{53:53,60:60}],175:[function(e){"use strict"
+var t=e(60),r=e(140),n=e(141)
+t(t.P+t.F*e(62)((function(){return null!==new Date(NaN).toJSON()||1!==Date.prototype.toJSON.call({toISOString:function(){return 1}})})),"Date",{toJSON:function(){var e=r(this),t=n(e)
+return"number"!=typeof t||isFinite(t)?e.toISOString():null}})},{140:140,141:141,60:60,62:62}],176:[function(e){var t=e(150)("toPrimitive"),r=Date.prototype
+t in r||e(70)(r,t,e(54))},{150:150,54:54,70:70}],177:[function(e){var t=Date.prototype,r=t.toString,n=t.getTime
+new Date(NaN)+""!="Invalid Date"&&e(116)(t,"toString",(function(){var e=n.call(this)
+return e==e?r.call(this):"Invalid Date"}))},{116:116}],178:[function(e){var t=e(60)
+t(t.P,"Function",{bind:e(44)})},{44:44,60:60}],179:[function(e){"use strict"
+var t=e(79),r=e(103),n=e(150)("hasInstance"),i=Function.prototype
+n in i||e(97).f(i,n,{value:function(e){if("function"!=typeof this||!t(e))return!1
+if(!t(this.prototype))return e instanceof this
+for(;e=r(e);)if(this.prototype===e)return!0
+return!1}})},{103:103,150:150,79:79,97:97}],180:[function(e){var t=e(97).f,r=Function.prototype,n=/^\s*function ([^ (]*)/
+"name"in r||e(56)&&t(r,"name",{configurable:!0,get:function(){try{return(""+this).match(n)[1]}catch(e){return""}}})},{56:56,97:97}],181:[function(e,t){"use strict"
+var r=e(47),n=e(147)
+t.exports=e(49)("Map",(function(e){return function(){return e(this,arguments.length>0?arguments[0]:void 0)}}),{get:function(e){var t=r.getEntry(n(this,"Map"),e)
+return t&&t.v},set:function(e,t){return r.def(n(this,"Map"),0===e?0:e,t)}},r,!0)},{147:147,47:47,49:49}],182:[function(e){var t=e(60),r=e(90),n=Math.sqrt,i=Math.acosh
+t(t.S+t.F*!(i&&710==Math.floor(i(Number.MAX_VALUE))&&i(1/0)==1/0),"Math",{acosh:function(e){return(e=+e)<1?NaN:e>94906265.62425156?Math.log(e)+Math.LN2:r(e-1+n(e-1)*n(e+1))}})},{60:60,90:90}],183:[function(e){var t=e(60),r=Math.asinh
+t(t.S+t.F*!(r&&1/r(0)>0),"Math",{asinh:function e(t){return isFinite(t=+t)&&0!=t?t<0?-e(-t):Math.log(t+Math.sqrt(t*t+1)):t}})},{60:60}],184:[function(e){var t=e(60),r=Math.atanh
+t(t.S+t.F*!(r&&1/r(-0)<0),"Math",{atanh:function(e){return 0==(e=+e)?e:Math.log((1+e)/(1-e))/2}})},{60:60}],185:[function(e){var t=e(60),r=e(91)
+t(t.S,"Math",{cbrt:function(e){return r(e=+e)*Math.pow(Math.abs(e),1/3)}})},{60:60,91:91}],186:[function(e){var t=e(60)
+t(t.S,"Math",{clz32:function(e){return(e>>>=0)?31-Math.floor(Math.log(e+.5)*Math.LOG2E):32}})},{60:60}],187:[function(e){var t=e(60),r=Math.exp
+t(t.S,"Math",{cosh:function(e){return(r(e=+e)+r(-e))/2}})},{60:60}],188:[function(e){var t=e(60),r=e(88)
+t(t.S+t.F*(r!=Math.expm1),"Math",{expm1:r})},{60:60,88:88}],189:[function(e){var t=e(60)
+t(t.S,"Math",{fround:e(89)})},{60:60,89:89}],190:[function(e){var t=e(60),r=Math.abs
+t(t.S,"Math",{hypot:function(e,t){for(var n,i,o=0,a=0,s=arguments.length,l=0;a<s;)l<(n=r(arguments[a++]))?(o=o*(i=l/n)*i+1,l=n):o+=n>0?(i=n/l)*i:n
+return l===1/0?1/0:l*Math.sqrt(o)}})},{60:60}],191:[function(e){var t=e(60),r=Math.imul
+t(t.S+t.F*e(62)((function(){return-5!=r(4294967295,5)||2!=r.length})),"Math",{imul:function(e,t){var r=+e,n=+t,i=65535&r,o=65535&n
+return 0|i*o+((65535&r>>>16)*o+i*(65535&n>>>16)<<16>>>0)}})},{60:60,62:62}],192:[function(e){var t=e(60)
+t(t.S,"Math",{log10:function(e){return Math.log(e)*Math.LOG10E}})},{60:60}],193:[function(e){var t=e(60)
+t(t.S,"Math",{log1p:e(90)})},{60:60,90:90}],194:[function(e){var t=e(60)
+t(t.S,"Math",{log2:function(e){return Math.log(e)/Math.LN2}})},{60:60}],195:[function(e){var t=e(60)
+t(t.S,"Math",{sign:e(91)})},{60:60,91:91}],196:[function(e){var t=e(60),r=e(88),n=Math.exp
+t(t.S+t.F*e(62)((function(){return-2e-17!=!Math.sinh(-2e-17)})),"Math",{sinh:function(e){return Math.abs(e=+e)<1?(r(e)-r(-e))/2:(n(e-1)-n(-e-1))*(Math.E/2)}})},{60:60,62:62,88:88}],197:[function(e){var t=e(60),r=e(88),n=Math.exp
+t(t.S,"Math",{tanh:function(e){var t=r(e=+e),i=r(-e)
+return t==1/0?1:i==1/0?-1:(t-i)/(n(e)+n(-e))}})},{60:60,88:88}],198:[function(e){var t=e(60)
+t(t.S,"Math",{trunc:function(e){return(e>0?Math.floor:Math.ceil)(e)}})},{60:60}],199:[function(e){"use strict"
+var t=e(68),r=e(69),n=e(46),i=e(73),o=e(141),a=e(62),s=e(101).f,l=e(99).f,u=e(97).f,c=e(132).trim,d=t.Number,h=d,f=d.prototype,p="Number"==n(e(96)(f)),m="trim"in String.prototype,v=function(e){var t=o(e,!1)
+if("string"==typeof t&&t.length>2){var r,n,i,a=(t=m?t.trim():c(t,3)).charCodeAt(0)
+if(43===a||45===a){if(88===(r=t.charCodeAt(2))||120===r)return NaN}else if(48===a){switch(t.charCodeAt(1)){case 66:case 98:n=2,i=49
+break
+case 79:case 111:n=8,i=55
+break
+default:return+t}for(var s,l=t.slice(2),u=0,d=l.length;u<d;u++)if((s=l.charCodeAt(u))<48||s>i)return NaN
+return parseInt(l,n)}}return+t}
+if(!d(" 0o1")||!d("0b1")||d("+0x1")){d=function(e){var t=arguments.length<1?0:e,r=this
+return r instanceof d&&(p?a((function(){f.valueOf.call(r)})):"Number"!=n(r))?i(new h(v(t)),r,d):v(t)}
+for(var g,b=e(56)?s(h):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger".split(","),y=0;b.length>y;y++)r(h,g=b[y])&&!r(d,g)&&u(d,g,l(h,g))
+d.prototype=f,f.constructor=d,e(116)(t,"Number",d)}},{101:101,116:116,132:132,141:141,46:46,56:56,62:62,68:68,69:69,73:73,96:96,97:97,99:99}],200:[function(e){var t=e(60)
+t(t.S,"Number",{EPSILON:Math.pow(2,-52)})},{60:60}],201:[function(e){var t=e(60),r=e(68).isFinite
+t(t.S,"Number",{isFinite:function(e){return"number"==typeof e&&r(e)}})},{60:60,68:68}],202:[function(e){var t=e(60)
+t(t.S,"Number",{isInteger:e(78)})},{60:60,78:78}],203:[function(e){var t=e(60)
+t(t.S,"Number",{isNaN:function(e){return e!=e}})},{60:60}],204:[function(e){var t=e(60),r=e(78),n=Math.abs
+t(t.S,"Number",{isSafeInteger:function(e){return r(e)&&n(e)<=9007199254740991}})},{60:60,78:78}],205:[function(e){var t=e(60)
+t(t.S,"Number",{MAX_SAFE_INTEGER:9007199254740991})},{60:60}],206:[function(e){var t=e(60)
+t(t.S,"Number",{MIN_SAFE_INTEGER:-9007199254740991})},{60:60}],207:[function(e){var t=e(60),r=e(110)
+t(t.S+t.F*(Number.parseFloat!=r),"Number",{parseFloat:r})},{110:110,60:60}],208:[function(e){var t=e(60),r=e(111)
+t(t.S+t.F*(Number.parseInt!=r),"Number",{parseInt:r})},{111:111,60:60}],209:[function(e){"use strict"
+var t=e(60),r=e(137),n=e(32),i=e(131),o=1..toFixed,a=Math.floor,s=[0,0,0,0,0,0],l="Number.toFixed: incorrect invocation!",u=function(e,t){for(var r=-1,n=t;++r<6;)n+=e*s[r],s[r]=n%1e7,n=a(n/1e7)},c=function(e){for(var t=6,r=0;--t>=0;)r+=s[t],s[t]=a(r/e),r=r%e*1e7},d=function(){for(var e=6,t="";--e>=0;)if(""!==t||0===e||0!==s[e]){var r=String(s[e])
+t=""===t?r:t+i.call("0",7-r.length)+r}return t},h=function(e,t,r){return 0===t?r:t%2==1?h(e,t-1,r*e):h(e*e,t/2,r)}
+t(t.P+t.F*(!!o&&("0.000"!==8e-5.toFixed(3)||"1"!==.9.toFixed(0)||"1.25"!==1.255.toFixed(2)||"1000000000000000128"!==(0xde0b6b3a7640080).toFixed(0))||!e(62)((function(){o.call({})}))),"Number",{toFixed:function(e){var t,o,a,s,f=n(this,l),p=r(e),m="",v="0"
+if(p<0||p>20)throw RangeError(l)
+if(f!=f)return"NaN"
+if(f<=-1e21||f>=1e21)return String(f)
+if(f<0&&(m="-",f=-f),f>1e-21)if(o=(t=function(e){for(var t=0,r=e;r>=4096;)t+=12,r/=4096
+for(;r>=2;)t+=1,r/=2
+return t}(f*h(2,69,1))-69)<0?f*h(2,-t,1):f/h(2,t,1),o*=4503599627370496,(t=52-t)>0){for(u(0,o),a=p;a>=7;)u(1e7,0),a-=7
+for(u(h(10,a,1),0),a=t-1;a>=23;)c(1<<23),a-=23
+c(1<<a),u(1,1),c(2),v=d()}else u(0,o),u(1<<-t,0),v=d()+i.call("0",p)
+return v=p>0?m+((s=v.length)<=p?"0."+i.call("0",p-s)+v:v.slice(0,s-p)+"."+v.slice(s-p)):m+v}})},{131:131,137:137,32:32,60:60,62:62}],210:[function(e){"use strict"
+var t=e(60),r=e(62),n=e(32),i=1..toPrecision
+t(t.P+t.F*(r((function(){return"1"!==i.call(1,void 0)}))||!r((function(){i.call({})}))),"Number",{toPrecision:function(e){var t=n(this,"Number#toPrecision: incorrect invocation!")
+return void 0===e?i.call(t):i.call(t,e)}})},{32:32,60:60,62:62}],211:[function(e){var t=e(60)
+t(t.S+t.F,"Object",{assign:e(95)})},{60:60,95:95}],212:[function(e){var t=e(60)
+t(t.S,"Object",{create:e(96)})},{60:60,96:96}],213:[function(e){var t=e(60)
+t(t.S+t.F*!e(56),"Object",{defineProperties:e(98)})},{56:56,60:60,98:98}],214:[function(e){var t=e(60)
+t(t.S+t.F*!e(56),"Object",{defineProperty:e(97).f})},{56:56,60:60,97:97}],215:[function(e){var t=e(79),r=e(92).onFreeze
+e(107)("freeze",(function(e){return function(n){return e&&t(n)?e(r(n)):n}}))},{107:107,79:79,92:92}],216:[function(e){var t=e(138),r=e(99).f
+e(107)("getOwnPropertyDescriptor",(function(){return function(e,n){return r(t(e),n)}}))},{107:107,138:138,99:99}],217:[function(e){e(107)("getOwnPropertyNames",(function(){return e(100).f}))},{100:100,107:107}],218:[function(e){var t=e(140),r=e(103)
+e(107)("getPrototypeOf",(function(){return function(e){return r(t(e))}}))},{103:103,107:107,140:140}],219:[function(e){var t=e(79)
+e(107)("isExtensible",(function(e){return function(r){return!!t(r)&&(!e||e(r))}}))},{107:107,79:79}],220:[function(e){var t=e(79)
+e(107)("isFrozen",(function(e){return function(r){return!t(r)||!!e&&e(r)}}))},{107:107,79:79}],221:[function(e){var t=e(79)
+e(107)("isSealed",(function(e){return function(r){return!t(r)||!!e&&e(r)}}))},{107:107,79:79}],222:[function(e){var t=e(60)
+t(t.S,"Object",{is:e(119)})},{119:119,60:60}],223:[function(e){var t=e(140),r=e(105)
+e(107)("keys",(function(){return function(e){return r(t(e))}}))},{105:105,107:107,140:140}],224:[function(e){var t=e(79),r=e(92).onFreeze
+e(107)("preventExtensions",(function(e){return function(n){return e&&t(n)?e(r(n)):n}}))},{107:107,79:79,92:92}],225:[function(e){var t=e(79),r=e(92).onFreeze
+e(107)("seal",(function(e){return function(n){return e&&t(n)?e(r(n)):n}}))},{107:107,79:79,92:92}],226:[function(e){var t=e(60)
+t(t.S,"Object",{setPrototypeOf:e(120).set})},{120:120,60:60}],227:[function(e){"use strict"
+var t=e(45),r={}
+r[e(150)("toStringTag")]="z",r+""!="[object z]"&&e(116)(Object.prototype,"toString",(function(){return"[object "+t(this)+"]"}),!0)},{116:116,150:150,45:45}],228:[function(e){var t=e(60),r=e(110)
+t(t.G+t.F*(parseFloat!=r),{parseFloat:r})},{110:110,60:60}],229:[function(e){var t=e(60),r=e(111)
+t(t.G+t.F*(parseInt!=r),{parseInt:r})},{111:111,60:60}],230:[function(e){"use strict"
+var t,r,n,i,o=e(87),a=e(68),s=e(52),l=e(45),u=e(60),c=e(79),d=e(31),h=e(35),f=e(66),p=e(125),m=e(134).set,v=e(93)(),g=e(94),b=e(112),y=e(146),_=e(113),w=a.TypeError,E=a.process,x=E&&E.versions,O=x&&x.v8||"",S=a.Promise,T="process"==l(E),M=function(){},A=r=g.f,P=!!function(){try{var t=S.resolve(1),r=(t.constructor={})[e(150)("species")]=function(e){e(M,M)}
+return(T||"function"==typeof PromiseRejectionEvent)&&t.then(M)instanceof r&&0!==O.indexOf("6.6")&&-1===y.indexOf("Chrome/66")}catch(n){}}(),C=function(e){var t
+return!(!c(e)||"function"!=typeof(t=e.then))&&t},k=function(e,t){if(!e._n){e._n=!0
+var r=e._c
+v((function(){for(var n=e._v,i=1==e._s,o=0,a=function(t){var r,o,a,s=i?t.ok:t.fail,l=t.resolve,u=t.reject,c=t.domain
+try{s?(i||(2==e._h&&D(e),e._h=1),!0===s?r=n:(c&&c.enter(),r=s(n),c&&(c.exit(),a=!0)),r===t.promise?u(w("Promise-chain cycle")):(o=C(r))?o.call(r,l,u):l(r)):u(n)}catch(d){c&&!a&&c.exit(),u(d)}};r.length>o;)a(r[o++])
+e._c=[],e._n=!1,t&&!e._h&&R(e)}))}},R=function(e){m.call(a,(function(){var t,r,n,i=e._v,o=j(e)
+if(o&&(t=b((function(){T?E.emit("unhandledRejection",i,e):(r=a.onunhandledrejection)?r({promise:e,reason:i}):(n=a.console)&&n.error&&n.error("Unhandled promise rejection",i)})),e._h=T||j(e)?2:1),e._a=void 0,o&&t.e)throw t.v}))},j=function(e){return 1!==e._h&&0===(e._a||e._c).length},D=function(e){m.call(a,(function(){var t
+T?E.emit("rejectionHandled",e):(t=a.onrejectionhandled)&&t({promise:e,reason:e._v})}))},N=function(e){var t=this
+t._d||(t._d=!0,(t=t._w||t)._v=e,t._s=2,t._a||(t._a=t._c.slice()),k(t,!0))},I=function(e){var t,r=this
+if(!r._d){r._d=!0,r=r._w||r
+try{if(r===e)throw w("Promise can't be resolved itself");(t=C(e))?v((function(){var n={_w:r,_d:!1}
+try{t.call(e,s(I,n,1),s(N,n,1))}catch(i){N.call(n,i)}})):(r._v=e,r._s=1,k(r,!1))}catch(n){N.call({_w:r,_d:!1},n)}}}
+P||(S=function(e){h(this,S,"Promise","_h"),d(e),t.call(this)
+try{e(s(I,this,1),s(N,this,1))}catch(r){N.call(this,r)}},(t=function(){this._c=[],this._a=void 0,this._s=0,this._d=!1,this._v=void 0,this._h=0,this._n=!1}).prototype=e(115)(S.prototype,{then:function(e,t){var r=A(p(this,S))
+return r.ok="function"!=typeof e||e,r.fail="function"==typeof t&&t,r.domain=T?E.domain:void 0,this._c.push(r),this._a&&this._a.push(r),this._s&&k(this,!1),r.promise},catch:function(e){return this.then(void 0,e)}}),n=function(){var e=new t
+this.promise=e,this.resolve=s(I,e,1),this.reject=s(N,e,1)},g.f=A=function(e){return e===S||e===i?new n(e):r(e)}),u(u.G+u.W+u.F*!P,{Promise:S}),e(122)(S,"Promise"),e(121)("Promise"),i=e(50).Promise,u(u.S+u.F*!P,"Promise",{reject:function(e){var t=A(this)
+return(0,t.reject)(e),t.promise}}),u(u.S+u.F*(o||!P),"Promise",{resolve:function(e){return _(o&&this===i?S:this,e)}}),u(u.S+u.F*!(P&&e(84)((function(e){S.all(e).catch(M)}))),"Promise",{all:function(e){var t=this,r=A(t),n=r.resolve,i=r.reject,o=b((function(){var r=[],o=0,a=1
+f(e,!1,(function(e){var s=o++,l=!1
+r.push(void 0),a++,t.resolve(e).then((function(e){l||(l=!0,r[s]=e,--a||n(r))}),i)})),--a||n(r)}))
+return o.e&&i(o.v),r.promise},race:function(e){var t=this,r=A(t),n=r.reject,i=b((function(){f(e,!1,(function(e){t.resolve(e).then(r.resolve,n)}))}))
+return i.e&&n(i.v),r.promise}})},{112:112,113:113,115:115,121:121,122:122,125:125,134:134,146:146,150:150,31:31,35:35,45:45,50:50,52:52,60:60,66:66,68:68,79:79,84:84,87:87,93:93,94:94}],231:[function(e){var t=e(60),r=e(31),n=e(36),i=(e(68).Reflect||{}).apply,o=Function.apply
+t(t.S+t.F*!e(62)((function(){i((function(){}))})),"Reflect",{apply:function(e,t,a){var s=r(e),l=n(a)
+return i?i(s,t,l):o.call(s,t,l)}})},{31:31,36:36,60:60,62:62,68:68}],232:[function(e){var t=e(60),r=e(96),n=e(31),i=e(36),o=e(79),a=e(62),s=e(44),l=(e(68).Reflect||{}).construct,u=a((function(){function e(){}return!(l((function(){}),[],e)instanceof e)})),c=!a((function(){l((function(){}))}))
+t(t.S+t.F*(u||c),"Reflect",{construct:function(e,t){n(e),i(t)
+var a=arguments.length<3?e:n(arguments[2])
+if(c&&!u)return l(e,t,a)
+if(e==a){switch(t.length){case 0:return new e
+case 1:return new e(t[0])
+case 2:return new e(t[0],t[1])
+case 3:return new e(t[0],t[1],t[2])
+case 4:return new e(t[0],t[1],t[2],t[3])}var d=[null]
+return d.push.apply(d,t),new(s.apply(e,d))}var h=a.prototype,f=r(o(h)?h:Object.prototype),p=Function.apply.call(e,f,t)
+return o(p)?p:f}})},{31:31,36:36,44:44,60:60,62:62,68:68,79:79,96:96}],233:[function(e){var t=e(97),r=e(60),n=e(36),i=e(141)
+r(r.S+r.F*e(62)((function(){Reflect.defineProperty(t.f({},1,{value:1}),1,{value:2})})),"Reflect",{defineProperty:function(e,r,o){n(e),r=i(r,!0),n(o)
+try{return t.f(e,r,o),!0}catch(a){return!1}}})},{141:141,36:36,60:60,62:62,97:97}],234:[function(e){var t=e(60),r=e(99).f,n=e(36)
+t(t.S,"Reflect",{deleteProperty:function(e,t){var i=r(n(e),t)
+return!(i&&!i.configurable)&&delete e[t]}})},{36:36,60:60,99:99}],235:[function(e){"use strict"
+var t=e(60),r=e(36),n=function(e){this._t=r(e),this._i=0
+var t,n=this._k=[]
+for(t in e)n.push(t)}
+e(82)(n,"Object",(function(){var e,t=this._k
+do{if(this._i>=t.length)return{value:void 0,done:!0}}while(!((e=t[this._i++])in this._t))
+return{value:e,done:!1}})),t(t.S,"Reflect",{enumerate:function(e){return new n(e)}})},{36:36,60:60,82:82}],236:[function(e){var t=e(99),r=e(60),n=e(36)
+r(r.S,"Reflect",{getOwnPropertyDescriptor:function(e,r){return t.f(n(e),r)}})},{36:36,60:60,99:99}],237:[function(e){var t=e(60),r=e(103),n=e(36)
+t(t.S,"Reflect",{getPrototypeOf:function(e){return r(n(e))}})},{103:103,36:36,60:60}],238:[function(e){var t=e(99),r=e(103),n=e(69),i=e(60),o=e(79),a=e(36)
+i(i.S,"Reflect",{get:function e(i,s){var l,u,c=arguments.length<3?i:arguments[2]
+return a(i)===c?i[s]:(l=t.f(i,s))?n(l,"value")?l.value:void 0!==l.get?l.get.call(c):void 0:o(u=r(i))?e(u,s,c):void 0}})},{103:103,36:36,60:60,69:69,79:79,99:99}],239:[function(e){var t=e(60)
+t(t.S,"Reflect",{has:function(e,t){return t in e}})},{60:60}],240:[function(e){var t=e(60),r=e(36),n=Object.isExtensible
+t(t.S,"Reflect",{isExtensible:function(e){return r(e),!n||n(e)}})},{36:36,60:60}],241:[function(e){var t=e(60)
+t(t.S,"Reflect",{ownKeys:e(109)})},{109:109,60:60}],242:[function(e){var t=e(60),r=e(36),n=Object.preventExtensions
+t(t.S,"Reflect",{preventExtensions:function(e){r(e)
+try{return n&&n(e),!0}catch(t){return!1}}})},{36:36,60:60}],243:[function(e){var t=e(60),r=e(120)
+r&&t(t.S,"Reflect",{setPrototypeOf:function(e,t){r.check(e,t)
+try{return r.set(e,t),!0}catch(n){return!1}}})},{120:120,60:60}],244:[function(e){var t=e(97),r=e(99),n=e(103),i=e(69),o=e(60),a=e(114),s=e(36),l=e(79)
+o(o.S,"Reflect",{set:function e(o,u,c){var d,h,f=arguments.length<4?o:arguments[3],p=r.f(s(o),u)
+if(!p){if(l(h=n(o)))return e(h,u,c,f)
+p=a(0)}if(i(p,"value")){if(!1===p.writable||!l(f))return!1
+if(d=r.f(f,u)){if(d.get||d.set||!1===d.writable)return!1
+d.value=c,t.f(f,u,d)}else t.f(f,u,a(0,c))
+return!0}return void 0!==p.set&&(p.set.call(f,c),!0)}})},{103:103,114:114,36:36,60:60,69:69,79:79,97:97,99:99}],245:[function(e){var t=e(68),r=e(73),n=e(97).f,i=e(101).f,o=e(80),a=e(64),s=t.RegExp,l=s,u=s.prototype,c=/a/g,d=/a/g,h=new s(c)!==c
+if(e(56)&&(!h||e(62)((function(){return d[e(150)("match")]=!1,s(c)!=c||s(d)==d||"/a/i"!=s(c,"i")})))){s=function(e,t){var n=this instanceof s,i=o(e),c=void 0===t
+return!n&&i&&e.constructor===s&&c?e:r(h?new l(i&&!c?e.source:e,t):l((i=e instanceof s)?e.source:e,i&&c?a.call(e):t),n?this:u,s)}
+for(var f=function(e){e in s||n(s,e,{configurable:!0,get:function(){return l[e]},set:function(t){l[e]=t}})},p=i(l),m=0;p.length>m;)f(p[m++])
+u.constructor=s,s.prototype=u,e(116)(t,"RegExp",s)}e(121)("RegExp")},{101:101,116:116,121:121,150:150,56:56,62:62,64:64,68:68,73:73,80:80,97:97}],246:[function(e){"use strict"
+var t=e(118)
+e(60)({target:"RegExp",proto:!0,forced:t!==/./.exec},{exec:t})},{118:118,60:60}],247:[function(e){e(56)&&"g"!=/./g.flags&&e(97).f(RegExp.prototype,"flags",{configurable:!0,get:e(64)})},{56:56,64:64,97:97}],248:[function(e){"use strict"
+var t=e(36),r=e(139),n=e(34),i=e(117)
+e(63)("match",1,(function(e,o,a,s){return[function(t){var r=e(this),n=null==t?void 0:t[o]
+return void 0!==n?n.call(t,r):new RegExp(t)[o](String(r))},function(e){var o=s(a,e,this)
+if(o.done)return o.value
+var l=t(e),u=String(this)
+if(!l.global)return i(l,u)
+var c=l.unicode
+l.lastIndex=0
+for(var d,h=[],f=0;null!==(d=i(l,u));){var p=String(d[0])
+h[f]=p,""===p&&(l.lastIndex=n(u,r(l.lastIndex),c)),f++}return 0===f?null:h}]}))},{117:117,139:139,34:34,36:36,63:63}],249:[function(e){"use strict"
+var t=e(36),r=e(140),n=e(139),i=e(137),o=e(34),a=e(117),s=Math.max,l=Math.min,u=Math.floor,c=/\$([$&`']|\d\d?|<[^>]*>)/g,d=/\$([$&`']|\d\d?)/g
+e(63)("replace",2,(function(e,h,f,p){return[function(t,r){var n=e(this),i=null==t?void 0:t[h]
+return void 0!==i?i.call(t,n,r):f.call(String(n),t,r)},function(e,r){var u=p(f,e,this,r)
+if(u.done)return u.value
+var c=t(e),d=String(this),h="function"==typeof r
+h||(r=String(r))
+var v=c.global
+if(v){var g=c.unicode
+c.lastIndex=0}for(var b=[];;){var y=a(c,d)
+if(null===y)break
+if(b.push(y),!v)break
+""===String(y[0])&&(c.lastIndex=o(d,n(c.lastIndex),g))}for(var _,w="",E=0,x=0;x<b.length;x++){y=b[x]
+for(var O=String(y[0]),S=s(l(i(y.index),d.length),0),T=[],M=1;M<y.length;M++)T.push(void 0===(_=y[M])?_:String(_))
+var A=y.groups
+if(h){var P=[O].concat(T,S,d)
+void 0!==A&&P.push(A)
+var C=String(r.apply(void 0,P))}else C=m(O,d,S,T,A,r)
+S>=E&&(w+=d.slice(E,S)+C,E=S+O.length)}return w+d.slice(E)}]
+function m(e,t,n,i,o,a){var s=n+e.length,l=i.length,h=d
+return void 0!==o&&(o=r(o),h=c),f.call(a,h,(function(r,a){var c
+switch(a.charAt(0)){case"$":return"$"
+case"&":return e
+case"`":return t.slice(0,n)
+case"'":return t.slice(s)
+case"<":c=o[a.slice(1,-1)]
+break
+default:var d=+a
+if(0===d)return r
+if(d>l){var h=u(d/10)
+return 0===h?r:h<=l?void 0===i[h-1]?a.charAt(1):i[h-1]+a.charAt(1):r}c=i[d-1]}return void 0===c?"":c}))}}))},{117:117,137:137,139:139,140:140,34:34,36:36,63:63}],250:[function(e){"use strict"
+var t=e(36),r=e(119),n=e(117)
+e(63)("search",1,(function(e,i,o,a){return[function(t){var r=e(this),n=null==t?void 0:t[i]
+return void 0!==n?n.call(t,r):new RegExp(t)[i](String(r))},function(e){var i=a(o,e,this)
+if(i.done)return i.value
+var s=t(e),l=String(this),u=s.lastIndex
+r(u,0)||(s.lastIndex=0)
+var c=n(s,l)
+return r(s.lastIndex,u)||(s.lastIndex=u),null===c?-1:c.index}]}))},{117:117,119:119,36:36,63:63}],251:[function(e){"use strict"
+var t=e(80),r=e(36),n=e(125),i=e(34),o=e(139),a=e(117),s=e(118),l=e(62),u=Math.min,c=[].push,d="length",h=!l((function(){RegExp(4294967295,"y")}))
+e(63)("split",2,(function(e,l,f,p){var m
+return m="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1)[d]||2!="ab".split(/(?:ab)*/)[d]||4!=".".split(/(.?)(.?)/)[d]||".".split(/()()/)[d]>1||"".split(/.?/)[d]?function(e,r){var n=String(this)
+if(void 0===e&&0===r)return[]
+if(!t(e))return f.call(n,e,r)
+for(var i,o,a,l=[],u=(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.unicode?"u":"")+(e.sticky?"y":""),h=0,p=void 0===r?4294967295:r>>>0,m=new RegExp(e.source,u+"g");(i=s.call(m,n))&&!((o=m.lastIndex)>h&&(l.push(n.slice(h,i.index)),i[d]>1&&i.index<n[d]&&c.apply(l,i.slice(1)),a=i[0][d],h=o,l[d]>=p));)m.lastIndex===i.index&&m.lastIndex++
+return h===n[d]?!a&&m.test("")||l.push(""):l.push(n.slice(h)),l[d]>p?l.slice(0,p):l}:"0".split(void 0,0)[d]?function(e,t){return void 0===e&&0===t?[]:f.call(this,e,t)}:f,[function(t,r){var n=e(this),i=null==t?void 0:t[l]
+return void 0!==i?i.call(t,n,r):m.call(String(n),t,r)},function(e,t){var s=p(m,e,this,t,m!==f)
+if(s.done)return s.value
+var l=r(e),c=String(this),d=n(l,RegExp),v=l.unicode,g=(l.ignoreCase?"i":"")+(l.multiline?"m":"")+(l.unicode?"u":"")+(h?"y":"g"),b=new d(h?l:"^(?:"+l.source+")",g),y=void 0===t?4294967295:t>>>0
+if(0===y)return[]
+if(0===c.length)return null===a(b,c)?[c]:[]
+for(var _=0,w=0,E=[];w<c.length;){b.lastIndex=h?w:0
+var x,O=a(b,h?c:c.slice(w))
+if(null===O||(x=u(o(b.lastIndex+(h?0:w)),c.length))===_)w=i(c,w,v)
+else{if(E.push(c.slice(_,w)),E.length===y)return E
+for(var S=1;S<=O.length-1;S++)if(E.push(O[S]),E.length===y)return E
+w=_=x}}return E.push(c.slice(_)),E}]}))},{117:117,118:118,125:125,139:139,34:34,36:36,62:62,63:63,80:80}],252:[function(e){"use strict"
+e(247)
+var t=e(36),r=e(64),n=e(56),i=/./.toString,o=function(t){e(116)(RegExp.prototype,"toString",t,!0)}
+e(62)((function(){return"/a/b"!=i.call({source:"a",flags:"b"})}))?o((function(){var e=t(this)
+return"/".concat(e.source,"/","flags"in e?e.flags:!n&&e instanceof RegExp?r.call(e):void 0)})):"toString"!=i.name&&o((function(){return i.call(this)}))},{116:116,247:247,36:36,56:56,62:62,64:64}],253:[function(e,t){"use strict"
+var r=e(47),n=e(147)
+t.exports=e(49)("Set",(function(e){return function(){return e(this,arguments.length>0?arguments[0]:void 0)}}),{add:function(e){return r.def(n(this,"Set"),e=0===e?0:e,e)}},r)},{147:147,47:47,49:49}],254:[function(e){"use strict"
+e(129)("anchor",(function(e){return function(t){return e(this,"a","name",t)}}))},{129:129}],255:[function(e){"use strict"
+e(129)("big",(function(e){return function(){return e(this,"big","","")}}))},{129:129}],256:[function(e){"use strict"
+e(129)("blink",(function(e){return function(){return e(this,"blink","","")}}))},{129:129}],257:[function(e){"use strict"
+e(129)("bold",(function(e){return function(){return e(this,"b","","")}}))},{129:129}],258:[function(e){"use strict"
+var t=e(60),r=e(127)(!1)
+t(t.P,"String",{codePointAt:function(e){return r(this,e)}})},{127:127,60:60}],259:[function(e){"use strict"
+var t=e(60),r=e(139),n=e(128),i="".endsWith
+t(t.P+t.F*e(61)("endsWith"),"String",{endsWith:function(e){var t=n(this,e,"endsWith"),o=arguments.length>1?arguments[1]:void 0,a=r(t.length),s=void 0===o?a:Math.min(r(o),a),l=String(e)
+return i?i.call(t,l,s):t.slice(s-l.length,s)===l}})},{128:128,139:139,60:60,61:61}],260:[function(e){"use strict"
+e(129)("fixed",(function(e){return function(){return e(this,"tt","","")}}))},{129:129}],261:[function(e){"use strict"
+e(129)("fontcolor",(function(e){return function(t){return e(this,"font","color",t)}}))},{129:129}],262:[function(e){"use strict"
+e(129)("fontsize",(function(e){return function(t){return e(this,"font","size",t)}}))},{129:129}],263:[function(e){var t=e(60),r=e(135),n=String.fromCharCode,i=String.fromCodePoint
+t(t.S+t.F*(!!i&&1!=i.length),"String",{fromCodePoint:function(e){for(var t,i=[],o=arguments.length,a=0;o>a;){if(t=+arguments[a++],r(t,1114111)!==t)throw RangeError(t+" is not a valid code point")
+i.push(t<65536?n(t):n(55296+((t-=65536)>>10),t%1024+56320))}return i.join("")}})},{135:135,60:60}],264:[function(e){"use strict"
+var t=e(60),r=e(128)
+t(t.P+t.F*e(61)("includes"),"String",{includes:function(e){return!!~r(this,e,"includes").indexOf(e,arguments.length>1?arguments[1]:void 0)}})},{128:128,60:60,61:61}],265:[function(e){"use strict"
+e(129)("italics",(function(e){return function(){return e(this,"i","","")}}))},{129:129}],266:[function(e){"use strict"
+var t=e(127)(!0)
+e(83)(String,"String",(function(e){this._t=String(e),this._i=0}),(function(){var e,r=this._t,n=this._i
+return n>=r.length?{value:void 0,done:!0}:(e=t(r,n),this._i+=e.length,{value:e,done:!1})}))},{127:127,83:83}],267:[function(e){"use strict"
+e(129)("link",(function(e){return function(t){return e(this,"a","href",t)}}))},{129:129}],268:[function(e){var t=e(60),r=e(138),n=e(139)
+t(t.S,"String",{raw:function(e){for(var t=r(e.raw),i=n(t.length),o=arguments.length,a=[],s=0;i>s;)a.push(String(t[s++])),s<o&&a.push(String(arguments[s]))
+return a.join("")}})},{138:138,139:139,60:60}],269:[function(e){var t=e(60)
+t(t.P,"String",{repeat:e(131)})},{131:131,60:60}],270:[function(e){"use strict"
+e(129)("small",(function(e){return function(){return e(this,"small","","")}}))},{129:129}],271:[function(e){"use strict"
+var t=e(60),r=e(139),n=e(128),i="".startsWith
+t(t.P+t.F*e(61)("startsWith"),"String",{startsWith:function(e){var t=n(this,e,"startsWith"),o=r(Math.min(arguments.length>1?arguments[1]:void 0,t.length)),a=String(e)
+return i?i.call(t,a,o):t.slice(o,o+a.length)===a}})},{128:128,139:139,60:60,61:61}],272:[function(e){"use strict"
+e(129)("strike",(function(e){return function(){return e(this,"strike","","")}}))},{129:129}],273:[function(e){"use strict"
+e(129)("sub",(function(e){return function(){return e(this,"sub","","")}}))},{129:129}],274:[function(e){"use strict"
+e(129)("sup",(function(e){return function(){return e(this,"sup","","")}}))},{129:129}],275:[function(e){"use strict"
+e(132)("trim",(function(e){return function(){return e(this,3)}}))},{132:132}],276:[function(e){"use strict"
+var t=e(68),r=e(69),n=e(56),i=e(60),o=e(116),a=e(92).KEY,s=e(62),l=e(124),u=e(122),c=e(145),d=e(150),h=e(149),f=e(148),p=e(59),m=e(77),v=e(36),g=e(79),b=e(140),y=e(138),_=e(141),w=e(114),E=e(96),x=e(100),O=e(99),S=e(102),T=e(97),M=e(105),A=O.f,P=T.f,C=x.f,k=t.Symbol,R=t.JSON,j=R&&R.stringify,D=d("_hidden"),N=d("toPrimitive"),I={}.propertyIsEnumerable,L=l("symbol-registry"),F=l("symbols"),z=l("op-symbols"),U=Object.prototype,H="function"==typeof k&&!!S.f,B=t.QObject,V=!B||!B.prototype||!B.prototype.findChild,$=n&&s((function(){return 7!=E(P({},"a",{get:function(){return P(this,"a",{value:7}).a}})).a}))?function(e,t,r){var n=A(U,t)
+n&&delete U[t],P(e,t,r),n&&e!==U&&P(U,t,n)}:P,q=function(e){var t=F[e]=E(k.prototype)
+return t._k=e,t},W=H&&"symbol"==typeof k.iterator?function(e){return"symbol"==typeof e}:function(e){return e instanceof k},G=function(e,t,n){return e===U&&G(z,t,n),v(e),t=_(t,!0),v(n),r(F,t)?(n.enumerable?(r(e,D)&&e[D][t]&&(e[D][t]=!1),n=E(n,{enumerable:w(0,!1)})):(r(e,D)||P(e,D,w(1,{})),e[D][t]=!0),$(e,t,n)):P(e,t,n)},Y=function(e,t){v(e)
+for(var r,n=p(t=y(t)),i=0,o=n.length;o>i;)G(e,r=n[i++],t[r])
+return e},K=function(e){var t=I.call(this,e=_(e,!0))
+return!(this===U&&r(F,e)&&!r(z,e))&&(!(t||!r(this,e)||!r(F,e)||r(this,D)&&this[D][e])||t)},J=function(e,t){if(e=y(e),t=_(t,!0),e!==U||!r(F,t)||r(z,t)){var n=A(e,t)
+return!n||!r(F,t)||r(e,D)&&e[D][t]||(n.enumerable=!0),n}},Q=function(e){for(var t,n=C(y(e)),i=[],o=0;n.length>o;)r(F,t=n[o++])||t==D||t==a||i.push(t)
+return i},X=function(e){for(var t,n=e===U,i=C(n?z:y(e)),o=[],a=0;i.length>a;)!r(F,t=i[a++])||n&&!r(U,t)||o.push(F[t])
+return o}
+H||(o((k=function(){if(this instanceof k)throw TypeError("Symbol is not a constructor!")
+var e=c(arguments.length>0?arguments[0]:void 0),t=function(n){this===U&&t.call(z,n),r(this,D)&&r(this[D],e)&&(this[D][e]=!1),$(this,e,w(1,n))}
+return n&&V&&$(U,e,{configurable:!0,set:t}),q(e)}).prototype,"toString",(function(){return this._k})),O.f=J,T.f=G,e(101).f=x.f=Q,e(106).f=K,S.f=X,n&&!e(87)&&o(U,"propertyIsEnumerable",K,!0),h.f=function(e){return q(d(e))}),i(i.G+i.W+i.F*!H,{Symbol:k})
+for(var Z="hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","),ee=0;Z.length>ee;)d(Z[ee++])
+for(var te=M(d.store),re=0;te.length>re;)f(te[re++])
+i(i.S+i.F*!H,"Symbol",{for:function(e){return r(L,e+="")?L[e]:L[e]=k(e)},keyFor:function(e){if(!W(e))throw TypeError(e+" is not a symbol!")
+for(var t in L)if(L[t]===e)return t},useSetter:function(){V=!0},useSimple:function(){V=!1}}),i(i.S+i.F*!H,"Object",{create:function(e,t){return void 0===t?E(e):Y(E(e),t)},defineProperty:G,defineProperties:Y,getOwnPropertyDescriptor:J,getOwnPropertyNames:Q,getOwnPropertySymbols:X})
+var ne=s((function(){S.f(1)}))
+i(i.S+i.F*ne,"Object",{getOwnPropertySymbols:function(e){return S.f(b(e))}}),R&&i(i.S+i.F*(!H||s((function(){var e=k()
+return"[null]"!=j([e])||"{}"!=j({a:e})||"{}"!=j(Object(e))}))),"JSON",{stringify:function(e){for(var t,r,n=[e],i=1;arguments.length>i;)n.push(arguments[i++])
+if(r=t=n[1],(g(t)||void 0!==e)&&!W(e))return m(t)||(t=function(e,t){if("function"==typeof r&&(t=r.call(this,e,t)),!W(t))return t}),n[1]=t,j.apply(R,n)}}),k.prototype[N]||e(70)(k.prototype,N,k.prototype.valueOf),u(k,"Symbol"),u(Math,"Math",!0),u(t.JSON,"JSON",!0)},{100:100,101:101,102:102,105:105,106:106,114:114,116:116,122:122,124:124,138:138,140:140,141:141,145:145,148:148,149:149,150:150,36:36,56:56,59:59,60:60,62:62,68:68,69:69,70:70,77:77,79:79,87:87,92:92,96:96,97:97,99:99}],277:[function(e){"use strict"
+var t=e(60),r=e(144),n=e(143),i=e(36),o=e(135),a=e(139),s=e(79),l=e(68).ArrayBuffer,u=e(125),c=n.ArrayBuffer,d=n.DataView,h=r.ABV&&l.isView,f=c.prototype.slice,p=r.VIEW
+t(t.G+t.W+t.F*(l!==c),{ArrayBuffer:c}),t(t.S+t.F*!r.CONSTR,"ArrayBuffer",{isView:function(e){return h&&h(e)||s(e)&&p in e}}),t(t.P+t.U+t.F*e(62)((function(){return!new c(2).slice(1,void 0).byteLength})),"ArrayBuffer",{slice:function(e,t){if(void 0!==f&&void 0===t)return f.call(i(this),e)
+for(var r=i(this).byteLength,n=o(e,r),s=o(void 0===t?r:t,r),l=new(u(this,c))(a(s-n)),h=new d(this),p=new d(l),m=0;n<s;)p.setUint8(m++,h.getUint8(n++))
+return l}}),e(121)("ArrayBuffer")},{121:121,125:125,135:135,139:139,143:143,144:144,36:36,60:60,62:62,68:68,79:79}],278:[function(e){var t=e(60)
+t(t.G+t.W+t.F*!e(144).ABV,{DataView:e(143).DataView})},{143:143,144:144,60:60}],279:[function(e){e(142)("Float32",4,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],280:[function(e){e(142)("Float64",8,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],281:[function(e){e(142)("Int16",2,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],282:[function(e){e(142)("Int32",4,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],283:[function(e){e(142)("Int8",1,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],284:[function(e){e(142)("Uint16",2,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],285:[function(e){e(142)("Uint32",4,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],286:[function(e){e(142)("Uint8",1,(function(e){return function(t,r,n){return e(this,t,r,n)}}))},{142:142}],287:[function(e){e(142)("Uint8",1,(function(e){return function(t,r,n){return e(this,t,r,n)}}),!0)},{142:142}],288:[function(e,t){"use strict"
+var r,n=e(68),i=e(40)(0),o=e(116),a=e(92),s=e(95),l=e(48),u=e(79),c=e(147),d=e(147),h=!n.ActiveXObject&&"ActiveXObject"in n,f=a.getWeak,p=Object.isExtensible,m=l.ufstore,v=function(e){return function(){return e(this,arguments.length>0?arguments[0]:void 0)}},g={get:function(e){if(u(e)){var t=f(e)
+return!0===t?m(c(this,"WeakMap")).get(e):t?t[this._i]:void 0}},set:function(e,t){return l.def(c(this,"WeakMap"),e,t)}},b=t.exports=e(49)("WeakMap",v,g,l,!0,!0)
+d&&h&&(s((r=l.getConstructor(v,"WeakMap")).prototype,g),a.NEED=!0,i(["delete","has","get","set"],(function(e){var t=b.prototype,n=t[e]
+o(t,e,(function(t,i){if(u(t)&&!p(t)){this._f||(this._f=new r)
+var o=this._f[e](t,i)
+return"set"==e?this:o}return n.call(this,t,i)}))})))},{116:116,147:147,40:40,48:48,49:49,68:68,79:79,92:92,95:95}],289:[function(e){"use strict"
+var t=e(48),r=e(147)
+e(49)("WeakSet",(function(e){return function(){return e(this,arguments.length>0?arguments[0]:void 0)}}),{add:function(e){return t.def(r(this,"WeakSet"),e,!0)}},t,!1,!0)},{147:147,48:48,49:49}],290:[function(e){"use strict"
+var t=e(60),r=e(65),n=e(140),i=e(139),o=e(31),a=e(43)
+t(t.P,"Array",{flatMap:function(e){var t,s,l=n(this)
+return o(e),t=i(l.length),s=a(l,0),r(s,l,l,t,0,1,e,arguments[1]),s}}),e(33)("flatMap")},{139:139,140:140,31:31,33:33,43:43,60:60,65:65}],291:[function(e){"use strict"
+var t=e(60),r=e(39)(!0)
+t(t.P,"Array",{includes:function(e){return r(this,e,arguments.length>1?arguments[1]:void 0)}}),e(33)("includes")},{33:33,39:39,60:60}],292:[function(e){var t=e(60),r=e(108)(!0)
+t(t.S,"Object",{entries:function(e){return r(e)}})},{108:108,60:60}],293:[function(e){var t=e(60),r=e(109),n=e(138),i=e(99),o=e(51)
+t(t.S,"Object",{getOwnPropertyDescriptors:function(e){for(var t,a,s=n(e),l=i.f,u=r(s),c={},d=0;u.length>d;)void 0!==(a=l(s,t=u[d++]))&&o(c,t,a)
+return c}})},{109:109,138:138,51:51,60:60,99:99}],294:[function(e){var t=e(60),r=e(108)(!1)
+t(t.S,"Object",{values:function(e){return r(e)}})},{108:108,60:60}],295:[function(e){"use strict"
+var t=e(60),r=e(50),n=e(68),i=e(125),o=e(113)
+t(t.P+t.R,"Promise",{finally:function(e){var t=i(this,r.Promise||n.Promise),a="function"==typeof e
+return this.then(a?function(r){return o(t,e()).then((function(){return r}))}:e,a?function(r){return o(t,e()).then((function(){throw r}))}:e)}})},{113:113,125:125,50:50,60:60,68:68}],296:[function(e){"use strict"
+var t=e(60),r=e(130),n=e(146),i=/Version\/10\.\d+(\.\d+)?( Mobile\/\w+)? Safari\//.test(n)
+t(t.P+t.F*i,"String",{padEnd:function(e){return r(this,e,arguments.length>1?arguments[1]:void 0,!1)}})},{130:130,146:146,60:60}],297:[function(e){"use strict"
+var t=e(60),r=e(130),n=e(146),i=/Version\/10\.\d+(\.\d+)?( Mobile\/\w+)? Safari\//.test(n)
+t(t.P+t.F*i,"String",{padStart:function(e){return r(this,e,arguments.length>1?arguments[1]:void 0,!0)}})},{130:130,146:146,60:60}],298:[function(e){"use strict"
+e(132)("trimLeft",(function(e){return function(){return e(this,1)}}),"trimStart")},{132:132}],299:[function(e){"use strict"
+e(132)("trimRight",(function(e){return function(){return e(this,2)}}),"trimEnd")},{132:132}],300:[function(e){e(148)("asyncIterator")},{148:148}],301:[function(e){for(var t=e(162),r=e(105),n=e(116),i=e(68),o=e(70),a=e(86),s=e(150),l=s("iterator"),u=s("toStringTag"),c=a.Array,d={CSSRuleList:!0,CSSStyleDeclaration:!1,CSSValueList:!1,ClientRectList:!1,DOMRectList:!1,DOMStringList:!1,DOMTokenList:!0,DataTransferItemList:!1,FileList:!1,HTMLAllCollection:!1,HTMLCollection:!1,HTMLFormElement:!1,HTMLSelectElement:!1,MediaList:!0,MimeTypeArray:!1,NamedNodeMap:!1,NodeList:!0,PaintRequestList:!1,Plugin:!1,PluginArray:!1,SVGLengthList:!1,SVGNumberList:!1,SVGPathSegList:!1,SVGPointList:!1,SVGStringList:!1,SVGTransformList:!1,SourceBufferList:!1,StyleSheetList:!0,TextTrackCueList:!1,TextTrackList:!1,TouchList:!1},h=r(d),f=0;f<h.length;f++){var p,m=h[f],v=d[m],g=i[m],b=g&&g.prototype
+if(b&&(b[l]||o(b,l,c),b[u]||o(b,u,m),a[m]=c,v))for(p in t)b[p]||n(b,p,t[p],!0)}},{105:105,116:116,150:150,162:162,68:68,70:70,86:86}],302:[function(e){var t=e(60),r=e(134)
+t(t.G+t.B,{setImmediate:r.set,clearImmediate:r.clear})},{134:134,60:60}],303:[function(e){var t=e(68),r=e(60),n=e(146),i=[].slice,o=/MSIE .\./.test(n),a=function(e){return function(t,r){var n=arguments.length>2,o=!!n&&i.call(arguments,2)
+return e(n?function(){("function"==typeof t?t:Function(t)).apply(this,o)}:t,r)}}
+r(r.G+r.B+r.F*o,{setTimeout:a(t.setTimeout),setInterval:a(t.setInterval)})},{146:146,60:60,68:68}],304:[function(e,t){e(303),e(302),e(301),t.exports=e(50)},{301:301,302:302,303:303,50:50}],305:[function(e,t){var r=function(e){"use strict"
+var t=Object.prototype,r=t.hasOwnProperty,n="function"==typeof Symbol?Symbol:{},i=n.iterator||"@@iterator",o=n.asyncIterator||"@@asyncIterator",a=n.toStringTag||"@@toStringTag"
+function s(e,t,r,n){var i=t&&t.prototype instanceof c?t:c,o=Object.create(i.prototype),a=new E(n||[])
+return o._invoke=function(e,t,r){var n="suspendedStart"
+return function(i,o){if("executing"===n)throw new Error("Generator is already running")
+if("completed"===n){if("throw"===i)throw o
+return O()}for(r.method=i,r.arg=o;;){var a=r.delegate
+if(a){var s=y(a,r)
+if(s){if(s===u)continue
+return s}}if("next"===r.method)r.sent=r._sent=r.arg
+else if("throw"===r.method){if("suspendedStart"===n)throw n="completed",r.arg
+r.dispatchException(r.arg)}else"return"===r.method&&r.abrupt("return",r.arg)
+n="executing"
+var c=l(e,t,r)
+if("normal"===c.type){if(n=r.done?"completed":"suspendedYield",c.arg===u)continue
+return{value:c.arg,done:r.done}}"throw"===c.type&&(n="completed",r.method="throw",r.arg=c.arg)}}}(e,r,a),o}function l(e,t,r){try{return{type:"normal",arg:e.call(t,r)}}catch(n){return{type:"throw",arg:n}}}e.wrap=s
+var u={}
+function c(){}function d(){}function h(){}var f={}
+f[i]=function(){return this}
+var p=Object.getPrototypeOf,m=p&&p(p(x([])))
+m&&m!==t&&r.call(m,i)&&(f=m)
+var v=h.prototype=c.prototype=Object.create(f)
+function g(e){["next","throw","return"].forEach((function(t){e[t]=function(e){return this._invoke(t,e)}}))}function b(e,t){var n
+this._invoke=function(i,o){function a(){return new t((function(n,a){(function n(i,o,a,s){var u=l(e[i],e,o)
+if("throw"!==u.type){var c=u.arg,d=c.value
+return d&&"object"==typeof d&&r.call(d,"__await")?t.resolve(d.__await).then((function(e){n("next",e,a,s)}),(function(e){n("throw",e,a,s)})):t.resolve(d).then((function(e){c.value=e,a(c)}),(function(e){return n("throw",e,a,s)}))}s(u.arg)})(i,o,n,a)}))}return n=n?n.then(a,a):a()}}function y(e,t){var r=e.iterator[t.method]
+if(void 0===r){if(t.delegate=null,"throw"===t.method){if(e.iterator.return&&(t.method="return",t.arg=void 0,y(e,t),"throw"===t.method))return u
+t.method="throw",t.arg=new TypeError("The iterator does not provide a 'throw' method")}return u}var n=l(r,e.iterator,t.arg)
+if("throw"===n.type)return t.method="throw",t.arg=n.arg,t.delegate=null,u
+var i=n.arg
+return i?i.done?(t[e.resultName]=i.value,t.next=e.nextLoc,"return"!==t.method&&(t.method="next",t.arg=void 0),t.delegate=null,u):i:(t.method="throw",t.arg=new TypeError("iterator result is not an object"),t.delegate=null,u)}function _(e){var t={tryLoc:e[0]}
+1 in e&&(t.catchLoc=e[1]),2 in e&&(t.finallyLoc=e[2],t.afterLoc=e[3]),this.tryEntries.push(t)}function w(e){var t=e.completion||{}
+t.type="normal",delete t.arg,e.completion=t}function E(e){this.tryEntries=[{tryLoc:"root"}],e.forEach(_,this),this.reset(!0)}function x(e){if(e){var t=e[i]
+if(t)return t.call(e)
+if("function"==typeof e.next)return e
+if(!isNaN(e.length)){var n=-1,o=function t(){for(;++n<e.length;)if(r.call(e,n))return t.value=e[n],t.done=!1,t
+return t.value=void 0,t.done=!0,t}
+return o.next=o}}return{next:O}}function O(){return{value:void 0,done:!0}}return d.prototype=v.constructor=h,h.constructor=d,h[a]=d.displayName="GeneratorFunction",e.isGeneratorFunction=function(e){var t="function"==typeof e&&e.constructor
+return!!t&&(t===d||"GeneratorFunction"===(t.displayName||t.name))},e.mark=function(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,h):(e.__proto__=h,a in e||(e[a]="GeneratorFunction")),e.prototype=Object.create(v),e},e.awrap=function(e){return{__await:e}},g(b.prototype),b.prototype[o]=function(){return this},e.AsyncIterator=b,e.async=function(t,r,n,i,o){void 0===o&&(o=Promise)
+var a=new b(s(t,r,n,i),o)
+return e.isGeneratorFunction(r)?a:a.next().then((function(e){return e.done?e.value:a.next()}))},g(v),v[a]="Generator",v[i]=function(){return this},v.toString=function(){return"[object Generator]"},e.keys=function(e){var t=[]
+for(var r in e)t.push(r)
+return t.reverse(),function r(){for(;t.length;){var n=t.pop()
+if(n in e)return r.value=n,r.done=!1,r}return r.done=!0,r}},e.values=x,E.prototype={constructor:E,reset:function(e){if(this.prev=0,this.next=0,this.sent=this._sent=void 0,this.done=!1,this.delegate=null,this.method="next",this.arg=void 0,this.tryEntries.forEach(w),!e)for(var t in this)"t"===t.charAt(0)&&r.call(this,t)&&!isNaN(+t.slice(1))&&(this[t]=void 0)},stop:function(){this.done=!0
+var e=this.tryEntries[0].completion
+if("throw"===e.type)throw e.arg
+return this.rval},dispatchException:function(e){if(this.done)throw e
+var t=this
+function n(r,n){return a.type="throw",a.arg=e,t.next=r,n&&(t.method="next",t.arg=void 0),!!n}for(var i=this.tryEntries.length-1;i>=0;--i){var o=this.tryEntries[i],a=o.completion
+if("root"===o.tryLoc)return n("end")
+if(o.tryLoc<=this.prev){var s=r.call(o,"catchLoc"),l=r.call(o,"finallyLoc")
+if(s&&l){if(this.prev<o.catchLoc)return n(o.catchLoc,!0)
+if(this.prev<o.finallyLoc)return n(o.finallyLoc)}else if(s){if(this.prev<o.catchLoc)return n(o.catchLoc,!0)}else{if(!l)throw new Error("try statement without catch or finally")
+if(this.prev<o.finallyLoc)return n(o.finallyLoc)}}}},abrupt:function(e,t){for(var n=this.tryEntries.length-1;n>=0;--n){var i=this.tryEntries[n]
+if(i.tryLoc<=this.prev&&r.call(i,"finallyLoc")&&this.prev<i.finallyLoc){var o=i
+break}}o&&("break"===e||"continue"===e)&&o.tryLoc<=t&&t<=o.finallyLoc&&(o=null)
+var a=o?o.completion:{}
+return a.type=e,a.arg=t,o?(this.method="next",this.next=o.finallyLoc,u):this.complete(a)},complete:function(e,t){if("throw"===e.type)throw e.arg
+return"break"===e.type||"continue"===e.type?this.next=e.arg:"return"===e.type?(this.rval=this.arg=e.arg,this.method="return",this.next="end"):"normal"===e.type&&t&&(this.next=t),u},finish:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var r=this.tryEntries[t]
+if(r.finallyLoc===e)return this.complete(r.completion,r.afterLoc),w(r),u}},catch:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var r=this.tryEntries[t]
+if(r.tryLoc===e){var n=r.completion
+if("throw"===n.type){var i=n.arg
+w(r)}return i}}throw new Error("illegal catch attempt")},delegateYield:function(e,t,r){return this.delegate={iterator:x(e),resultName:t,nextLoc:r},"next"===this.method&&(this.arg=void 0),u}},e}("object"==typeof t?t.exports:{})
+try{regeneratorRuntime=r}catch(n){Function("r","regeneratorRuntime = r")(r)}},{}],306:[function(e){"use strict"
+e(307)
+var t,r=(t=e(13))&&t.__esModule?t:{default:t}
+r.default._babelPolyfill&&"undefined"!=typeof console&&console.warn&&console.warn("@babel/polyfill is loaded more than once on this page. This is probably not desirable/intended and may have consequences if different versions of the polyfills are applied sequentially. If you do need to load the polyfill more than once, use @babel/polyfill/noConflict instead to bypass the warning."),r.default._babelPolyfill=!0},{13:13,307:307}],307:[function(e){"use strict"
+e(1),e(3),e(2),e(9),e(8),e(11),e(10),e(12),e(5),e(6),e(4),e(7),e(304),e(305)},{1:1,10:10,11:11,12:12,2:2,3:3,304:304,305:305,4:4,5:5,6:6,7:7,8:8,9:9}]},{},[306]),function(){
+/*!
+ * @overview  Ember - JavaScript Application Framework
+ * @copyright Copyright 2011-2020 Tilde Inc. and contributors
+ *            Portions Copyright 2006-2011 Strobe Inc.
+ *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
+ * @license   Licensed under MIT license
+ *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
+ * @version   3.20.6
+ */
+var e,t,r
+mainContext=this,function(){var n,i
+function o(e,r){var a=e,s=n[a]
+s||(s=n[a+="/index"])
+var l=i[a]
+if(void 0!==l)return l
+l=i[a]={},s||function(e,t){throw t?new Error("Could not find module "+e+" required by: "+t):new Error("Could not find module "+e)}(e,r)
+for(var u=s.deps,c=s.callback,d=new Array(u.length),h=0;h<u.length;h++)"exports"===u[h]?d[h]=l:"require"===u[h]?d[h]=t:d[h]=o(u[h],a)
+return c.apply(this,d),l}"undefined"==typeof window&&"undefined"!=typeof process&&"[object process]"==={}.toString.call(process)||(r=this.Ember=this.Ember||{}),void 0===r&&(r={}),void 0===r.__loader?(n=Object.create(null),i=Object.create(null),e=function(e,t,r){var i={}
+r?(i.deps=t,i.callback=r):(i.deps=[],i.callback=t),n[e]=i},(t=function(e){return o(e,null)}).default=t,t.has=function(e){return Boolean(n[e])||Boolean(n[e+"/index"])},t._eak_seen=n,r.__loader={define:e,require:t,registry:n}):(e=r.__loader.define,t=r.__loader.require)}(),e("@ember/-internals/browser-environment/index",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.hasDOM=e.isFirefox=e.isChrome=e.userAgent=e.history=e.location=e.window=void 0
+var t="object"==typeof self&&null!==self&&self.Object===Object&&"undefined"!=typeof Window&&self.constructor===Window&&"object"==typeof document&&null!==document&&self.document===document&&"object"==typeof location&&null!==location&&self.location===location&&"object"==typeof history&&null!==history&&self.history===history&&"object"==typeof navigator&&null!==navigator&&self.navigator===navigator&&"string"==typeof navigator.userAgent
+e.hasDOM=t
+var r=t?self:null
+e.window=r
+var n=t?self.location:null
+e.location=n
+var i=t?self.history:null
+e.history=i
+var o=t?self.navigator.userAgent:"Lynx (textmode)"
+e.userAgent=o
+var a=!!t&&(Boolean(r.chrome)&&!r.opera)
+e.isChrome=a
+var s=!!t&&"undefined"!=typeof InstallTrigger
+e.isFirefox=s})),e("@ember/-internals/console/index",["exports","@ember/debug","@ember/deprecated-features"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n
+r.LOGGER&&(n={log(){return console.log(...arguments)},warn(){return console.warn(...arguments)},error(){return console.error(...arguments)},info(){return console.info(...arguments)},debug(){return console.debug?console.debug(...arguments):console.info(...arguments)},assert(){return console.assert(...arguments)}})
+var i=n
+e.default=i})),e("@ember/-internals/container/index",["exports","@ember/-internals/owner","@ember/-internals/utils","@ember/debug","@ember/polyfills"],(function(e,t,r,n,i){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.privatize=function([e]){var t=y[e]
+if(t)return t
+var[n,i]=e.split(":")
+return y[e]=(0,r.intern)(`${n}:${i}-${_}`)},e.getFactoryFor=function(e){return e[p]},e.setFactoryFor=m,e.INIT_FACTORY=e.Container=e.Registry=void 0
+class o{constructor(e,t={}){this.registry=e,this.owner=t.owner||null,this.cache=(0,r.dictionary)(t.cache||null),this.factoryManagerCache=(0,r.dictionary)(t.factoryManagerCache||null),this.isDestroyed=!1,this.isDestroying=!1}lookup(e,t){if(this.isDestroyed)throw new Error("Can not call `.lookup` after the owner has been destroyed")
+return l(this,this.registry.normalize(e),t)}destroy(){this.isDestroying=!0,h(this)}finalizeDestroy(){f(this),this.isDestroyed=!0}reset(e){this.isDestroyed||(void 0===e?(h(this),f(this)):function(e,t){var r=e.cache[t]
+delete e.factoryManagerCache[t],r&&(delete e.cache[t],r.destroy&&r.destroy())}(this,this.registry.normalize(e)))}ownerInjection(){var e={}
+return(0,t.setOwner)(e,this.owner),e}factoryFor(e,t={}){if(this.isDestroyed)throw new Error("Can not call `.factoryFor` after the owner has been destroyed")
+var r=this.registry.normalize(e)
+if(!t.source&&!t.namespace||(r=this.registry.expandLocalLookup(e,t)))return u(this,r,e)}}function a(e,t){return!1!==e.registry.getOption(t,"singleton")}function s(e,t){return!1!==e.registry.getOption(t,"instantiate")}function l(e,t,r={}){var n=t
+if(!r.source&&!r.namespace||(n=e.registry.expandLocalLookup(t,r))){if(!1!==r.singleton){var i=e.cache[n]
+if(void 0!==i)return i}return function(e,t,r,n){var i=u(e,t,r)
+if(void 0===i)return
+if(function(e,t,{instantiate:r,singleton:n}){return!1!==n&&!1!==r&&a(e,t)&&s(e,t)}(e,r,n)){var o=e.cache[t]=i.create()
+return e.isDestroying&&"function"==typeof o.destroy&&o.destroy(),o}if(function(e,t,{instantiate:r,singleton:n}){return!1!==r&&(!1!==n||a(e,t))&&s(e,t)}(e,r,n))return i.create()
+if(function(e,t,{instantiate:r,singleton:n}){return!1!==n&&!r&&a(e,t)&&!s(e,t)}(e,r,n)||function(e,t,{instantiate:r,singleton:n}){return!(!1!==r||!1!==n&&a(e,t)||s(e,t))}(e,r,n))return i.class
+throw new Error("Could not create factory")}(e,n,t,r)}}function u(e,t,r){var n=e.factoryManagerCache[t]
+if(void 0!==n)return n
+var i=e.registry.resolve(t)
+if(void 0!==i){0
+var o=new v(e,i,r,t)
+return e.factoryManagerCache[t]=o,o}}function c(e,t,r){for(var n=r.injections,i=0;i<t.length;i++){var{property:o,specifier:s,source:u}=t[i]
+n[o]=u?l(e,s,{source:u}):l(e,s),r.isDynamic||(r.isDynamic=!a(e,s))}}function d(e,r){var n=e.registry,[i]=r.split(":")
+return function(e,r,n){var i={};(0,t.setOwner)(i,e.owner)
+var o={injections:i,isDynamic:!1}
+return void 0!==r&&c(e,r,o),void 0!==n&&c(e,n,o),o}(e,n.getTypeInjections(i),n.getInjections(r))}function h(e){for(var t=e.cache,r=Object.keys(t),n=0;n<r.length;n++){var i=t[r[n]]
+i.destroy&&i.destroy()}}function f(e){e.cache=(0,r.dictionary)(null),e.factoryManagerCache=(0,r.dictionary)(null)}e.Container=o
+var p=(0,r.symbol)("INIT_FACTORY")
+function m(e,t){e[p]=t}e.INIT_FACTORY=p
+class v{constructor(e,t,r,n){this.container=e,this.owner=e.owner,this.class=t,this.fullName=r,this.normalizedName=n,this.madeToString=void 0,this.injections=void 0,m(this,this)}toString(){return void 0===this.madeToString&&(this.madeToString=this.container.registry.makeToString(this.class,this.fullName)),this.madeToString}create(e){var{container:t}=this
+if(t.isDestroyed)throw new Error(`Can not create new instances after the owner has been destroyed (you attempted to create ${this.fullName})`)
+var r=this.injections
+if(void 0===r){var{injections:n,isDynamic:o}=d(this.container,this.normalizedName)
+m(n,this),r=n,o||(this.injections=n)}return void 0!==e&&(r=(0,i.assign)({},r,e)),this.class.create(r)}}var g=/^[^:]+:[^:]+$/
+class b{constructor(e={}){this.fallback=e.fallback||null,this.resolver=e.resolver||null,this.registrations=(0,r.dictionary)(e.registrations||null),this._typeInjections=(0,r.dictionary)(null),this._injections=(0,r.dictionary)(null),this._localLookupCache=Object.create(null),this._normalizeCache=(0,r.dictionary)(null),this._resolveCache=(0,r.dictionary)(null),this._failSet=new Set,this._options=(0,r.dictionary)(null),this._typeOptions=(0,r.dictionary)(null)}container(e){return new o(this,e)}register(e,t,r={}){var n=this.normalize(e)
+this._failSet.delete(n),this.registrations[n]=t,this._options[n]=r}unregister(e){var t=this.normalize(e)
+this._localLookupCache=Object.create(null),delete this.registrations[t],delete this._resolveCache[t],delete this._options[t],this._failSet.delete(t)}resolve(e,t){var r=function(e,t,r){var n=t
+if(void 0!==r&&(r.source||r.namespace)&&!(n=e.expandLocalLookup(t,r)))return
+var i,o=e._resolveCache[n]
+if(void 0!==o)return o
+if(e._failSet.has(n))return
+e.resolver&&(i=e.resolver.resolve(n))
+void 0===i&&(i=e.registrations[n])
+void 0===i?e._failSet.add(n):e._resolveCache[n]=i
+return i}(this,this.normalize(e),t)
+return void 0===r&&null!==this.fallback&&(r=this.fallback.resolve(...arguments)),r}describe(e){return null!==this.resolver&&this.resolver.lookupDescription?this.resolver.lookupDescription(e):null!==this.fallback?this.fallback.describe(e):e}normalizeFullName(e){return null!==this.resolver&&this.resolver.normalize?this.resolver.normalize(e):null!==this.fallback?this.fallback.normalizeFullName(e):e}normalize(e){return this._normalizeCache[e]||(this._normalizeCache[e]=this.normalizeFullName(e))}makeToString(e,t){return null!==this.resolver&&this.resolver.makeToString?this.resolver.makeToString(e,t):null!==this.fallback?this.fallback.makeToString(e,t):e.toString()}has(e,t){if(!this.isValidFullName(e))return!1
+var r=t&&t.source&&this.normalize(t.source),n=t&&t.namespace||void 0
+return function(e,t,r,n){return void 0!==e.resolve(t,{source:r,namespace:n})}(this,this.normalize(e),r,n)}optionsForType(e,t){this._typeOptions[e]=t}getOptionsForType(e){var t=this._typeOptions[e]
+return void 0===t&&null!==this.fallback&&(t=this.fallback.getOptionsForType(e)),t}options(e,t){var r=this.normalize(e)
+this._options[r]=t}getOptions(e){var t=this.normalize(e),r=this._options[t]
+return void 0===r&&null!==this.fallback&&(r=this.fallback.getOptions(e)),r}getOption(e,t){var r=this._options[e]
+if(void 0!==r&&void 0!==r[t])return r[t]
+var n=e.split(":")[0]
+return(r=this._typeOptions[n])&&void 0!==r[t]?r[t]:null!==this.fallback?this.fallback.getOption(e,t):void 0}typeInjection(e,t,r){r.split(":")[0];(this._typeInjections[e]||(this._typeInjections[e]=[])).push({property:t,specifier:r})}injection(e,t,r){var n=this.normalize(r)
+if(-1===e.indexOf(":"))return this.typeInjection(e,t,n)
+var i=this.normalize(e);(this._injections[i]||(this._injections[i]=[])).push({property:t,specifier:n})}knownForType(e){for(var t,n,o=(0,r.dictionary)(null),a=Object.keys(this.registrations),s=0;s<a.length;s++){var l=a[s]
+l.split(":")[0]===e&&(o[l]=!0)}return null!==this.fallback&&(t=this.fallback.knownForType(e)),null!==this.resolver&&this.resolver.knownForType&&(n=this.resolver.knownForType(e)),(0,i.assign)({},t,o,n)}isValidFullName(e){return g.test(e)}getInjections(e){var t=this._injections[e]
+if(null!==this.fallback){var r=this.fallback.getInjections(e)
+void 0!==r&&(t=void 0===t?r:t.concat(r))}return t}getTypeInjections(e){var t=this._typeInjections[e]
+if(null!==this.fallback){var r=this.fallback.getTypeInjections(e)
+void 0!==r&&(t=void 0===t?r:t.concat(r))}return t}expandLocalLookup(e,t){return null!==this.resolver&&this.resolver.expandLocalLookup?function(e,t,r,n){var i=e._localLookupCache,o=i[t]
+o||(o=i[t]=Object.create(null))
+var a=n||r,s=o[a]
+if(void 0!==s)return s
+var l=e.resolver.expandLocalLookup(t,r,n)
+return o[a]=l}(this,this.normalize(e),this.normalize(t.source),t.namespace):null!==this.fallback?this.fallback.expandLocalLookup(e,t):null}}e.Registry=b
+var y=(0,r.dictionary)(null),_=`${Math.random()}${Date.now()}`.replace(".","")})),e("@ember/-internals/environment/index",["exports","@ember/deprecated-features"],(function(e,t){"use strict"
+function r(e){return e&&e.Object===Object?e:void 0}Object.defineProperty(e,"__esModule",{value:!0}),e.getLookup=function(){return o.lookup},e.setLookup=function(e){o.lookup=e},e.getENV=function(){return a},e.ENV=e.context=e.global=void 0
+var n,i=r((n="object"==typeof global&&global)&&void 0===n.nodeType?n:void 0)||r("object"==typeof self&&self)||r("object"==typeof window&&window)||"undefined"!=typeof mainContext&&mainContext||new Function("return this")()
+e.global=i
+var o=function(e,t){return void 0===t?{imports:e,exports:e,lookup:e}:{imports:t.imports||e,exports:t.exports||e,lookup:t.lookup||e}}(i,i.Ember)
+e.context=o
+var a={ENABLE_OPTIONAL_FEATURES:!1,EXTEND_PROTOTYPES:{Array:!0,Function:!0,String:!0},LOG_STACKTRACE_ON_DEPRECATION:!0,LOG_VERSION:!0,RAISE_ON_DEPRECATION:!1,STRUCTURED_PROFILE:!1,_APPLICATION_TEMPLATE_WRAPPER:!0,_TEMPLATE_ONLY_GLIMMER_COMPONENTS:!1,_DEBUG_RENDER_TREE:!1,_JQUERY_INTEGRATION:!0,_DEFAULT_ASYNC_OBSERVERS:!1,_RERENDER_LOOP_LIMIT:1e3,EMBER_LOAD_HOOKS:{},FEATURES:{}}
+e.ENV=a,(e=>{if("object"==typeof e&&null!==e){for(var r in e)if(Object.prototype.hasOwnProperty.call(e,r)&&"EXTEND_PROTOTYPES"!==r&&"EMBER_LOAD_HOOKS"!==r){var n=a[r]
+!0===n?a[r]=!1!==e[r]:!1===n&&(a[r]=!0===e[r])}var{EXTEND_PROTOTYPES:i}=e
+if(void 0!==i)if("object"==typeof i&&null!==i)a.EXTEND_PROTOTYPES.String=!1!==i.String,t.FUNCTION_PROTOTYPE_EXTENSIONS&&(a.EXTEND_PROTOTYPES.Function=!1!==i.Function),a.EXTEND_PROTOTYPES.Array=!1!==i.Array
+else{var o=!1!==i
+a.EXTEND_PROTOTYPES.String=o,t.FUNCTION_PROTOTYPE_EXTENSIONS&&(a.EXTEND_PROTOTYPES.Function=o),a.EXTEND_PROTOTYPES.Array=o}var{EMBER_LOAD_HOOKS:s}=e
+if("object"==typeof s&&null!==s)for(var l in s)if(Object.prototype.hasOwnProperty.call(s,l)){var u=s[l]
+Array.isArray(u)&&(a.EMBER_LOAD_HOOKS[l]=u.filter(e=>"function"==typeof e))}var{FEATURES:c}=e
+if("object"==typeof c&&null!==c)for(var d in c)Object.prototype.hasOwnProperty.call(c,d)&&(a.FEATURES[d]=!0===c[d])
+0}})(i.EmberENV)})),e("@ember/-internals/error-handling/index",["exports"],(function(e){"use strict"
+var t
+Object.defineProperty(e,"__esModule",{value:!0}),e.getOnerror=function(){return t},e.setOnerror=function(e){t=e},e.getDispatchOverride=function(){return r},e.setDispatchOverride=function(e){r=e},e.onErrorTarget=void 0
+var r,n={get onerror(){return t}}
+e.onErrorTarget=n})),e("@ember/-internals/extension-support/index",["exports","@ember/-internals/extension-support/lib/data_adapter","@ember/-internals/extension-support/lib/container_debug_adapter"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"DataAdapter",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"ContainerDebugAdapter",{enumerable:!0,get:function(){return r.default}})})),e("@ember/-internals/extension-support/lib/container_debug_adapter",["exports","@ember/string","@ember/-internals/runtime"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=r.Object.extend({resolver:null,canCatalogEntriesByType:e=>"model"!==e&&"template"!==e,catalogEntriesByType(e){var n=(0,r.A)(r.Namespace.NAMESPACES),i=(0,r.A)(),o=new RegExp((0,t.classify)(e)+"$")
+return n.forEach(e=>{for(var n in e)if(Object.prototype.hasOwnProperty.call(e,n)&&o.test(n)){var a=e[n]
+"class"===(0,r.typeOf)(a)&&i.push((0,t.dasherize)(n.replace(o,"")))}}),i}})
+e.default=n})),e("@ember/-internals/extension-support/lib/data_adapter",["exports","@ember/-internals/owner","@ember/runloop","@ember/-internals/metal","@ember/string","@ember/-internals/runtime"],(function(e,t,r,n,i,o){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var a=o.Object.extend({init(){this._super(...arguments),this.releaseMethods=(0,o.A)()},containerDebugAdapter:void 0,attributeLimit:3,acceptsModelName:!0,releaseMethods:(0,o.A)(),getFilters:()=>(0,o.A)(),watchModelTypes(e,t){var r=this.getModelTypes(),n=(0,o.A)()
+e(r.map(e=>{var r=e.klass,i=this.wrapModelType(r,e.name)
+return n.push(this.observeModelType(e.name,t)),i}))
+var i=()=>{n.forEach(e=>e()),this.releaseMethods.removeObject(i)}
+return this.releaseMethods.pushObject(i),i},_nameToClass(e){if("string"==typeof e){var r=(0,t.getOwner)(this).factoryFor("model:"+e)
+e=r&&r.class}return e},watchRecords(e,t,r,i){var a,s=(0,o.A)(),l=this._nameToClass(e),u=this.getRecords(l,e)
+function c(e){r([e])}var d=u.map(e=>(s.push(this.observeRecord(e,c)),this.wrapRecord(e))),h={didChange:(e,r,o,a)=>{for(var l=r;l<r+a;l++){var u=(0,n.objectAt)(e,l),d=this.wrapRecord(u)
+s.push(this.observeRecord(u,c)),t([d])}o&&i(r,o)},willChange(){return this}}
+return(0,n.addArrayObserver)(u,this,h),a=()=>{s.forEach(e=>e()),(0,n.removeArrayObserver)(u,this,h),this.releaseMethods.removeObject(a)},t(d),this.releaseMethods.pushObject(a),a},willDestroy(){this._super(...arguments),this.releaseMethods.forEach(e=>e())},detect:()=>!1,columnsForType:()=>(0,o.A)(),observeModelType(e,t){var i=this._nameToClass(e),o=this.getRecords(i,e)
+function a(){t([this.wrapModelType(i,e)])}var s={didChange(e,t,n,i){(n>0||i>0)&&(0,r.scheduleOnce)("actions",this,a)},willChange(){return this}};(0,n.addArrayObserver)(o,this,s)
+return()=>(0,n.removeArrayObserver)(o,this,s)},wrapModelType(e,t){var r=this.getRecords(e,t)
+return{name:t,count:(0,n.get)(r,"length"),columns:this.columnsForType(e),object:e}},getModelTypes(){var e,t=this.get("containerDebugAdapter")
+return e=t.canCatalogEntriesByType("model")?t.catalogEntriesByType("model"):this._getObjectsOnNamespaces(),e=(0,o.A)(e).map(e=>({klass:this._nameToClass(e),name:e})),e=(0,o.A)(e).filter(e=>this.detect(e.klass)),(0,o.A)(e)},_getObjectsOnNamespaces(){var e=(0,o.A)(o.Namespace.NAMESPACES),t=(0,o.A)()
+return e.forEach(e=>{for(var r in e)if(Object.prototype.hasOwnProperty.call(e,r)&&this.detect(e[r])){var n=(0,i.dasherize)(r)
+t.push(n)}}),t},getRecords:()=>(0,o.A)(),wrapRecord(e){var t={object:e}
+return t.columnValues=this.getRecordColumnValues(e),t.searchKeywords=this.getRecordKeywords(e),t.filterValues=this.getRecordFilterValues(e),t.color=this.getRecordColor(e),t},getRecordColumnValues:()=>({}),getRecordKeywords:()=>(0,o.A)(),getRecordFilterValues:()=>({}),getRecordColor:()=>null,observeRecord:()=>function(){}})
+e.default=a})),e("@ember/-internals/glimmer/index",["exports","@ember/polyfills","@glimmer/opcode-compiler","@ember/-internals/metal","@ember/-internals/owner","@ember/-internals/runtime","@ember/-internals/utils","@ember/-internals/views","@ember/debug","@glimmer/reference","@glimmer/runtime","@glimmer/validator","@ember/-internals/browser-environment","@ember/instrumentation","@ember/service","@ember/runloop","@ember/-internals/environment","@glimmer/util","@ember/deprecated-features","@ember/string","@ember/-internals/container","@glimmer/node","@ember/-internals/routing","@ember/component/template-only","@ember/error","rsvp"],(function(e,t,r,n,i,o,a,s,l,u,c,d,h,f,p,m,v,g,b,y,_,w,E,x,O,S){"use strict"
+function T(e){return"function"==typeof e}Object.defineProperty(e,"__esModule",{value:!0}),e.template=A,e.helper=K,e.escapeExpression=function(e){if("string"!=typeof e){if(e&&e.toHTML)return e.toHTML()
+if(null==e)return""
+if(!e)return String(e)
+e=String(e)}if(!X.test(e))return e
+return e.replace(Z,ee)},e.htmlSafe=te,e.isHTMLSafe=re,e._resetRenderers=function(){zr.length=0},e.renderSettled=function(){null===Br&&(Br=S.default.defer(),(0,m.getCurrentRunLoop)()||m.backburner.schedule("actions",null,Hr))
+return Br.promise},e.getTemplate=function(e){if(Object.prototype.hasOwnProperty.call(Gr,e))return Gr[e]},e.setTemplate=function(e,t){return Gr[e]=t},e.hasTemplate=function(e){return Object.prototype.hasOwnProperty.call(Gr,e)},e.getTemplates=function(){return Gr},e.setTemplates=function(e){Gr=e},e.setupEngineRegistry=function(e){e.optionsForType("template",{instantiate:!1}),e.register("view:-outlet",rn),e.register("template:-outlet",tn),e.injection("view:-outlet","template","template:-outlet"),e.register(_.privatize`template:components/-default`,Zr),e.optionsForType("helper",{instantiate:!1}),e.register("helper:loc",Xr),e.register("component:-text-field",z),e.register("component:-checkbox",L),e.register("component:link-to",$),e.register("component:input",Qr),e.register("template:components/input",en),e.register("component:textarea",U),v.ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS||e.register(_.privatize`component:-default`,N)},e.setupApplicationRegistry=function(e){e.injection("renderer","env","-environment:main"),e.register("service:-dom-builder",{create({bootOptions:e}){var{_renderMode:t}=e
+switch(t){case"serialize":return w.serializeBuilder.bind(null)
+case"rehydrate":return c.rehydrationBuilder.bind(null)
+default:return c.clientBuilder.bind(null)}}}),e.injection("service:-dom-builder","bootOptions","-environment:main"),e.injection("renderer","builder","service:-dom-builder"),e.register(_.privatize`template:-root`,P),e.injection("renderer","rootTemplate",_.privatize`template:-root`),e.register("renderer:-dom",Wr),e.register("renderer:-inert",qr),e.injection("renderer","document","service:-document")},e._registerMacros=function(e){Dr.push(e)},e.capabilities=function(e,t={}){var r
+return r="3.13"!==e||Boolean(t.updateHook),{asyncLifeCycleCallbacks:Boolean(t.asyncLifecycleCallbacks),destructor:Boolean(t.destructor),updateHook:r}},e.setComponentManager=function(e,t){var r
+r=b.COMPONENT_MANAGER_STRING_LOOKUP&&"string"==typeof e?function(t){return t.lookup("component-manager:"+e)}:e
+return Sr({factory:r,internal:!1,type:"component"},t)},e.getComponentManager=function(e){var t=Tr(e)
+return t&&!t.internal&&"component"===t.type?t.factory:void 0},e.setModifierManager=function(e,t){return Sr({factory:e,internal:!1,type:"modifier"},t)},e.getModifierManager=Mr,e.modifierCapabilities=function(e,t={}){return{disableAutoTracking:Boolean(t.disableAutoTracking)}},e.setComponentTemplate=function(e,t){return gr.set(t,e),t},e.getComponentTemplate=yr,Object.defineProperty(e,"DOMChanges",{enumerable:!0,get:function(){return c.DOMChanges}}),Object.defineProperty(e,"DOMTreeConstruction",{enumerable:!0,get:function(){return c.DOMTreeConstruction}}),Object.defineProperty(e,"isSerializationFirstNode",{enumerable:!0,get:function(){return c.isSerializationFirstNode}}),Object.defineProperty(e,"NodeDOMTreeConstruction",{enumerable:!0,get:function(){return w.NodeDOMTreeConstruction}}),e.OutletView=e.INVOKE=e.AbstractComponentManager=e._experimentalMacros=e.InteractiveRenderer=e.InertRenderer=e.Renderer=e.SafeString=e.Helper=e.Component=e.LinkComponent=e.TextArea=e.TextField=e.Checkbox=e.templateCacheCounters=e.RootTemplate=void 0
+var M={cacheHit:0,cacheMiss:0}
+function A(e){var n=(0,r.templateFactory)(e),i=new WeakMap,o=n.meta,a=e=>{var r=i.get(e)
+return void 0===r?(M.cacheMiss++,r=n.create((0,t.assign)({owner:e},o)),i.set(e,r)):M.cacheHit++,r}
+return a.__id=n.id,a.__meta=o,a}e.templateCacheCounters=M
+var P=A({id:"s5o9bxSn",block:'{"symbols":[],"statements":[[1,[30,[36,0],[[32,0]],null]]],"hasEval":false,"upvars":["component"]}',meta:{moduleName:"packages/@ember/-internals/glimmer/lib/templates/root.hbs"}})
+e.RootTemplate=P
+var C=(0,a.enumerableSymbol)("ARGS"),k=(0,a.enumerableSymbol)("HAS_BLOCK"),R=(0,a.symbol)("DIRTY_TAG"),j=(0,a.symbol)("IS_DISPATCHING_ATTRS"),D=(0,a.symbol)("BOUNDS"),N=s.CoreView.extend(s.ChildViewsSupport,s.ViewStateSupport,s.ClassNamesSupport,o.TargetActionSupport,s.ActionSupport,s.ViewMixin,{isComponent:!0,init(){this._super(...arguments),this[j]=!1,this[R]=(0,d.createTag)(),this[D]=null},rerender(){(0,d.dirtyTag)(this[R]),this._super()},[n.PROPERTY_DID_CHANGE](e,t){if(!this[j]){var r=this[C],i=void 0!==r?r[e]:void 0
+void 0!==i&&void 0!==i[u.UPDATE_REFERENCED_VALUE]&&i[u.UPDATE_REFERENCED_VALUE](2===arguments.length?t:(0,n.get)(this,e))}},getAttr(e){return this.get(e)},readDOMAttr(e){var t=(0,s.getViewElement)(this),r=t,n="http://www.w3.org/2000/svg"===r.namespaceURI,{type:i,normalized:o}=(0,c.normalizeProperty)(r,e)
+return n||"attr"===i?r.getAttribute(o):r[o]},didReceiveAttrs(){},didRender(){},willRender(){},didUpdateAttrs(){},willUpdate(){},didUpdate(){}})
+e.Component=N,N.toString=()=>"@ember/component",N.reopenClass({isComponentFactory:!0,positionalParams:[]})
+var I=A({id:"SWbqsLhV",block:'{"symbols":[],"statements":[],"hasEval":false,"upvars":[]}',meta:{moduleName:"packages/@ember/-internals/glimmer/lib/templates/empty.hbs"}}),L=N.extend({layout:I,classNames:["ember-checkbox"],tagName:"input",attributeBindings:["type","checked","indeterminate","disabled","tabindex","name","autofocus","required","form"],type:"checkbox",disabled:!1,indeterminate:!1,didInsertElement(){this._super(...arguments),this.element.indeterminate=Boolean(this.indeterminate)},change(){(0,n.set)(this,"checked",this.element.checked)}})
+e.Checkbox=L,L.toString=()=>"@ember/component/checkbox"
+var F=h.hasDOM?Object.create(null):null
+var z=N.extend(s.TextSupport,{layout:I,classNames:["ember-text-field"],tagName:"input",attributeBindings:["accept","autocomplete","autosave","dir","formaction","formenctype","formmethod","formnovalidate","formtarget","height","inputmode","lang","list","type","max","min","multiple","name","pattern","size","step","value","width"],value:"",type:(0,n.computed)({get:()=>"text",set(e,t){var r="text"
+return function(e){if(!h.hasDOM)return Boolean(e)
+if(e in F)return F[e]
+var t=document.createElement("input")
+try{t.type=e}catch(r){}return F[e]=t.type===e}(t)&&(r=t),r}}),size:null,pattern:null,min:null,max:null})
+e.TextField=z,z.toString=()=>"@ember/component/text-field"
+var U=N.extend(s.TextSupport,{classNames:["ember-text-area"],layout:I,tagName:"textarea",attributeBindings:["rows","cols","name","selectionEnd","selectionStart","autocomplete","wrap","lang","dir","value"],rows:null,cols:null})
+e.TextArea=U,U.toString=()=>"@ember/component/text-area"
+var H=A({id:"uDKxl8ne",block:'{"symbols":["&default"],"statements":[[6,[37,0],[[27,[32,1]]],null,[["default","else"],[{"statements":[[18,1,null]],"parameters":[]},{"statements":[[1,[32,0,["linkTitle"]]]],"parameters":[]}]]]],"hasEval":false,"upvars":["if"]}',meta:{moduleName:"packages/@ember/-internals/glimmer/lib/templates/link-to.hbs"}}),B=Object.freeze({toString:()=>"UNDEFINED"}),V=Object.freeze({}),$=N.extend({layout:H,tagName:"a",route:B,model:B,models:B,query:B,"current-when":null,title:null,rel:null,tabindex:null,target:null,activeClass:"active",loadingClass:"loading",disabledClass:"disabled",replace:!1,attributeBindings:["href","title","rel","tabindex","target"],classNameBindings:["active","loading","disabled","transitioningIn","transitioningOut"],eventName:"click",init(){this._super(...arguments)
+var{eventName:e}=this
+this.on(e,this,this._invoke)},_routing:(0,p.inject)("-routing"),_currentRoute:(0,n.alias)("_routing.currentRouteName"),_currentRouterState:(0,n.alias)("_routing.currentState"),_targetRouterState:(0,n.alias)("_routing.targetState"),_route:(0,n.computed)("route","_currentRouterState",(function(){var{route:e}=this
+return e===B?this._currentRoute:e})),_models:(0,n.computed)("model","models",(function(){var{model:e,models:t}=this
+return e!==B?[e]:t!==B?t:[]})),_query:(0,n.computed)("query",(function(){var{query:e}=this
+return e===B?V:(0,t.assign)({},e)})),disabled:(0,n.computed)({get:()=>!1,set(e,t){return this._isDisabled=t,!!t&&this.disabledClass}}),active:(0,n.computed)("activeClass","_active",(function(){return!!this._active&&this.activeClass})),_active:(0,n.computed)("_currentRouterState","_route","_models","_query","loading","current-when",(function(){var{_currentRouterState:e}=this
+return!!e&&this._isActive(e)})),willBeActive:(0,n.computed)("_currentRouterState","_targetRouterState","_route","_models","_query","loading","current-when",(function(){var{_currentRouterState:e,_targetRouterState:t}=this
+if(e!==t)return this._isActive(t)})),_isActive(e){if(this.loading)return!1
+var t=this["current-when"]
+if("boolean"==typeof t)return t
+var r=Boolean(t)
+t=r?t.split(" "):[this._route]
+for(var{_models:n,_query:i,_routing:o}=this,a=0;a<t.length;a++)if(o.isActiveForRoute(n,i,t[a],e,r))return!0
+return!1},transitioningIn:(0,n.computed)("_active","willBeActive",(function(){return!0===this.willBeActive&&!this._active&&"ember-transitioning-in"})),transitioningOut:(0,n.computed)("_active","willBeActive",(function(){return!(!1!==this.willBeActive||!this._active)&&"ember-transitioning-out"})),_invoke(e){if(!(0,s.isSimpleClick)(e))return!0
+var{bubbles:t,preventDefault:r}=this,n=this.element.target,i=!n||"_self"===n
+if(!1!==r&&i&&e.preventDefault(),!1===t&&e.stopPropagation(),this._isDisabled)return!1
+if(this.loading)return!1
+if(!i)return!1
+var{_route:o,_models:a,_query:l,replace:u}=this,c={queryParams:l,routeName:o}
+return(0,f.flaggedInstrument)("interaction.link-to",c,this._generateTransition(c,o,a,l,u)),!1},_generateTransition(e,t,r,n,i){var{_routing:o}=this
+return()=>{e.transition=o.transitionTo(t,r,n,i)}},href:(0,n.computed)("_currentRouterState","_route","_models","_query","tagName","loading","loadingHref",(function(){if("a"===this.tagName){if(this.loading)return this.loadingHref
+var{_route:e,_models:t,_query:r,_routing:n}=this
+return n.generateURL(e,t,r)}})),loading:(0,n.computed)("_route","_modelsAreLoaded","loadingClass",(function(){var{_route:e,_modelsAreLoaded:t}=this
+if(!t||null==e)return this.loadingClass})),_modelsAreLoaded:(0,n.computed)("_models",(function(){for(var{_models:e}=this,t=0;t<e.length;t++){var r=e[t]
+if(null==r)return!1}return!0})),loadingHref:"#",didReceiveAttrs(){var{disabledWhen:e}=this
+void 0!==e&&this.set("disabled",e)
+var{params:t}=this
+if(t&&0!==t.length){t=t.slice(),this[k]||this.set("linkTitle",t.shift())
+var r=t[t.length-1]
+r&&r.isQueryParams?this.set("query",t.pop().values):this.set("query",B),0===t.length?this.set("route",B):this.set("route",t.shift()),this.set("model",B),this.set("models",t)}else{var{_models:n}=this
+if(n.length>0){var i=n[n.length-1]
+"object"==typeof i&&null!==i&&i.isQueryParams&&(this.query=i.values,n.pop())}}}})
+e.LinkComponent=$,$.toString=()=>"@ember/routing/link-component",$.reopenClass({positionalParams:"params"})
+var q=(0,a.symbol)("RECOMPUTE_TAG")
+function W(e){return void 0!==e.destroy}var G=o.FrameworkObject.extend({init(){this._super(...arguments),this[q]=(0,d.createTag)()},recompute(){(0,m.join)(()=>(0,d.dirtyTag)(this[q]))}})
+e.Helper=G,G.isHelperFactory=!0
+class Y{constructor(e){this.compute=e,this.isHelperFactory=!0}create(){return{compute:this.compute}}}function K(e){return new Y(e)}class J{constructor(e){this.string=e}toString(){return""+this.string}toHTML(){return this.toString()}}e.SafeString=J
+var Q={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;","=":"&#x3D;"},X=/[&<>"'`=]/,Z=/[&<>"'`=]/g
+function ee(e){return Q[e]}function te(e){return null==e?e="":"string"!=typeof e&&(e=String(e)),new J(e)}function re(e){return null!==e&&"object"==typeof e&&"function"==typeof e.toHTML}class ne{constructor(e){this.resolver=e}lookupHelper(e,t){return this.resolver.lookupHelper(e,t)}lookupModifier(e,t){return this.resolver.lookupModifier(e,t)}lookupComponent(e,t){var r=this.resolver.lookupComponentHandle(e,t)
+if(null===r)return null
+var{manager:n,state:i}=this.resolver.resolve(r),o=n.getCapabilities(i)
+return function(e,t){return!t.dynamicLayout}(0,o)?{handle:r,capabilities:o,compilable:n.getJitStaticLayout(i,this.resolver)}:{handle:r,capabilities:o,compilable:null}}lookupPartial(e,t){return this.resolver.lookupPartial(e,t)}resolve(e){return this.resolver.resolve(e)}}class ie{prepareArgs(e,t){return null}didCreateElement(e,t,r){}didRenderLayout(e,t){}didCreate(e){}update(e,t){}didUpdateLayout(e,t){}didUpdate(e){}}function oe(e){return{object:`${e.name}:${e.outlet}`}}e.AbstractComponentManager=ie
+var ae={dynamicLayout:!1,dynamicTag:!1,prepareArgs:!1,createArgs:v.ENV._DEBUG_RENDER_TREE,attributeHook:!1,elementHook:!1,createCaller:!1,dynamicScope:!0,updateHook:v.ENV._DEBUG_RENDER_TREE,createInstance:!0,wrapped:!1,willDestroy:!1}
+class se extends ie{create(e,t,r,n){var i=n.outletState,o=t.ref
+n.outletState=o
+var a={self:new u.ComponentRootReference(t.controller,e),environment:e,finalize:(0,f._instrumentStart)("render.outlet",oe,t)}
+if(v.ENV._DEBUG_RENDER_TREE){a.outlet={name:t.outlet},e.extra.debugRenderTree.create(a.outlet,{type:"outlet",name:a.outlet.name,args:c.EMPTY_ARGS,instance:void 0,template:void 0})
+var s=i.value(),l=s&&s.render&&s.render.owner,d=o.value().render.owner
+if(l&&l!==d){var h=d,p=h.mountPoint
+a.engine={mountPoint:p},e.extra.debugRenderTree.create(a.engine,{type:"engine",name:p,args:c.EMPTY_ARGS,instance:h,template:void 0})}e.extra.debugRenderTree.create(a,{type:"route-template",name:t.name,args:r.capture(),instance:t.controller,template:t.template}),(0,c.registerDestructor)(a,()=>{a.environment.extra.debugRenderTree.willDestroy(a),a.engine&&a.environment.extra.debugRenderTree.willDestroy(a.engine),a.environment.extra.debugRenderTree.willDestroy(a.outlet)})}return a}getJitStaticLayout({template:e},t){return(0,g.unwrapTemplate)(e).asLayout()}getCapabilities(){return ae}getSelf({self:e}){return e}getTag(){return v.ENV._DEBUG_RENDER_TREE?(0,d.createTag)():d.CONSTANT_TAG}didRenderLayout(e,t){e.finalize(),v.ENV._DEBUG_RENDER_TREE&&(e.environment.extra.debugRenderTree.didRender(e,t),e.engine&&e.environment.extra.debugRenderTree.didRender(e.engine,t),e.environment.extra.debugRenderTree.didRender(e.outlet,t))}update(e){v.ENV._DEBUG_RENDER_TREE&&(e.environment.extra.debugRenderTree.update(e.outlet),e.engine&&e.environment.extra.debugRenderTree.update(e.engine),e.environment.extra.debugRenderTree.update(e))}didUpdateLayout(e,t){v.ENV._DEBUG_RENDER_TREE&&(e.environment.extra.debugRenderTree.didRender(e,t),e.engine&&e.environment.extra.debugRenderTree.didRender(e.engine,t),e.environment.extra.debugRenderTree.didRender(e.outlet,t))}getDestroyable(e){return v.ENV._DEBUG_RENDER_TREE?e:null}}var le=new se
+class ue{constructor(e,t=le){this.state=e,this.manager=t}}function ce(){}class de{constructor(e,t,r,n,i){this.environment=e,this.component=t,this.args=r,this.finalizer=n,this.hasWrappedElement=i,this.classRef=null,this.classRef=null,this.argsRevision=null===r?0:(0,d.valueForTag)(r.tag),this.rootRef=new u.ComponentRootReference(t,e),(0,c.registerDestructor)(this,()=>this.willDestroy(),!0),(0,c.registerDestructor)(this,()=>this.component.destroy())}willDestroy(){var{component:e,environment:t}=this
+if(t.isInteractive){e.trigger("willDestroyElement"),e.trigger("willClearRender")
+var r=(0,s.getViewElement)(e)
+r&&((0,s.clearElementView)(r),(0,s.clearViewElement)(e))}e.renderer.unregister(e)}finalize(){var{finalizer:e}=this
+e(),this.finalizer=ce}}class he extends u.HelperRootReference{constructor(e,t,r){var n=t=>{var r,{positional:n,named:i}=t,o=n.value(),a=i.value()
+return r=e.compute(o,a),e[q]&&(0,d.consumeTag)(e[q]),r}
+super(n,t,r)}}class fe extends u.RootReference{constructor(e,t,r,n){super(t),this.inner=e,this.env=t}value(){return this.inner}get(e){var t=this.value()
+return(0,a.isObject)(t)?new pe(t[e],this.env,this,e):c.PrimitiveReference.create(t)}}class pe extends fe{}function me(e,t){for(var r=e,n=0;n<t.length;n++)r=r.get(t[n])
+return r}function ve(e,t){return e.get(t)}function ge(e,t){return"attrs"===t[0]&&(t.shift(),1===t.length)?ve(e,t[0]):me(e,t)}var be,ye,_e={parse(e){var t=e.indexOf(":")
+if(-1===t)return[e,e,!0]
+var r=e.substring(0,t),n=e.substring(t+1)
+return[r,n,!1]},install(e,t,r,i,o){var[a,s,l]=r
+if("id"===s){var u=(0,n.get)(e,a)
+return null==u&&(u=e.elementId),u=c.PrimitiveReference.create(u),void i.setAttribute("id",u,!0,null)}var d=a.indexOf(".")>-1,h=d?ge(t,a.split(".")):ve(t,a)
+b.EMBER_COMPONENT_IS_VISIBLE&&"style"===s&&void 0!==be&&(h=new be(t,h,ve(t,"isVisible"),o)),i.setAttribute(s,h,!1,null)}},we=te("display: none;")
+b.EMBER_COMPONENT_IS_VISIBLE&&(be=class{constructor(e,t,r,n){this.inner=t,this.isVisible=r,this.env=n,this.tag=(0,d.combine)([t.tag,r.tag])}value(){var e=this.inner.value(),t=this.isVisible.value()
+if(!1!==t)return e
+if(e){var r=e+" display: none;"
+return re(e)?te(r):r}return we}get(){return c.UNDEFINED_REFERENCE}},ye=(e,t,r)=>{t.setAttribute("style",new be(e,c.UNDEFINED_REFERENCE,e.get("isVisible"),r),!1,null)})
+var Ee={install(e,t,r,n){var[i,o,a]=r.split(":")
+if(""===i)n.setAttribute("class",c.PrimitiveReference.create(o),!0,null)
+else{var s,l=i.indexOf(".")>-1,u=l?i.split("."):[],d=l?ge(t,u):ve(t,i)
+s=void 0===o?new xe(d,l?u[u.length-1]:i):new Oe(d,o,a),n.setAttribute("class",s,!1,null)}}}
+class xe{constructor(e,t){this.inner=e,this.path=t,this.tag=e.tag,this.dasherizedPath=null}value(){var e=this.inner.value()
+if(!0===e){var{path:t,dasherizedPath:r}=this
+return r||(this.dasherizedPath=(0,y.dasherize)(t))}return e||0===e?String(e):null}}class Oe{constructor(e,t=null,r=null){this.inner=e,this.truthy=t,this.falsy=r,this.tag=e.tag}value(){var{inner:e,truthy:t,falsy:r}=this
+return e.value()?t:r}}var Se=(0,a.symbol)("INVOKE")
+e.INVOKE=Se
+var Te=(0,a.symbol)("SOURCE")
+class Me extends u.RootReference{constructor(e,t){super(t),this.inner=e,this.tag=e.tag,this[Te]=e}value(){return this.inner.value()}get(e){return this.inner.get(e)}[u.UPDATE_REFERENCED_VALUE](e){return this.inner[u.UPDATE_REFERENCED_VALUE](e)}[Se](e){return this.inner[u.UPDATE_REFERENCED_VALUE](e)}}var Ae=(0,a.symbol)("ACTION")
+function Pe(e){return e}function Ce(e,t,r,n){var i,o
+if("function"==typeof r[Se])i=r,o=r[Se]
+else{var a=typeof r
+"string"===a?(i=t,o=t.actions&&t.actions[r]):"function"===a&&(i=e,o=r)}return(...e)=>{var t={target:i,args:e,label:"@glimmer/closure-action"}
+return(0,f.flaggedInstrument)("interaction.ember-action",t,()=>(0,m.join)(i,o,...n(e)))}}function ke(e){var t=e.names,r=e.value(),n=Object.create(null),i=Object.create(null)
+n[C]=i
+for(var o=0;o<t.length;o++){var a=t[o],s=e.get(a),l=r[a]
+"function"==typeof l&&l[Ae]?r[a]=l:s[u.UPDATE_REFERENCED_VALUE]&&(r[a]=new je(s,l)),i[a]=s,n[a]=l}return n.attrs=r,n}var Re=(0,a.symbol)("REF")
+class je{constructor(e,t){this[s.MUTABLE_CELL]=!0,this[Re]=e,this.value=t}update(e){this[Re][u.UPDATE_REFERENCED_VALUE](e)}}var De=function(e,t){var r={}
+for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&t.indexOf(n)<0&&(r[n]=e[n])
+if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var i=0
+for(n=Object.getOwnPropertySymbols(e);i<n.length;i++)t.indexOf(n[i])<0&&Object.prototype.propertyIsEnumerable.call(e,n[i])&&(r[n[i]]=e[n[i]])}return r}
+var Ne=_.privatize`template:components/-default`,Ie=[];(0,l.debugFreeze)(Ie)
+class Le extends ie{templateFor(e){var t,{layout:r,layoutName:n}=e,o=(0,i.getOwner)(e)
+if(void 0===r)if(void 0!==n){var a=o.lookup("template:"+n)
+t=a}else t=o.lookup(Ne)
+else{if(!T(r))return r
+t=r}return t(o)}getJitStaticLayout(e,t){return(0,g.unwrapTemplate)(e.template).asLayout()}getJitDynamicLayout(e){var t=e.component,r=this.templateFor(t)
+return v.ENV._DEBUG_RENDER_TREE&&e.environment.extra.debugRenderTree.setTemplate(e,r),r}getTagName(e){var{component:t,hasWrappedElement:r}=e
+return r?t&&t.tagName||"div":null}getCapabilities(e){return e.capabilities}prepareArgs(e,r){if(r.named.has("__ARGS__")){var n=r.named.capture().map,{__ARGS__:i}=n,o=De(n,["__ARGS__"])
+return{positional:Ie,named:(0,t.assign)({},o,i.value())}}var a,{positionalParams:s}=e.ComponentClass.class
+if(null==s||0===r.positional.length)return null
+if("string"==typeof s)a={[s]:r.positional.capture()},(0,t.assign)(a,r.named.capture().map)
+else{if(!(Array.isArray(s)&&s.length>0))return null
+var l=Math.min(s.length,r.positional.length)
+a={},(0,t.assign)(a,r.named.capture().map)
+for(var u=0;u<l;u++){var c=s[u]
+a[c]=r.positional.at(u)}}return{positional:g.EMPTY_ARRAY,named:a}}create(e,t,r,n,i,o){var a=n.view,l=t.ComponentClass,u=r.named.capture(),d=ke(u);(function(e,t){e.named.has("id")&&(t.elementId=t.id)})(r,d),d.parentView=a,d[k]=o,d._target=i.value(),t.template&&(d.layout=t.template)
+var h=l.create(d),p=(0,f._instrumentStart)("render.component",Fe,h)
+n.view=h,null!=a&&(0,s.addChildView)(a,h),h.trigger("didReceiveAttrs")
+var m=""!==h.tagName
+m||(e.isInteractive&&h.trigger("willRender"),h._transitionTo("hasElement"),e.isInteractive&&h.trigger("willInsertElement"))
+var g=new de(e,h,u,p,m)
+return r.named.has("class")&&(g.classRef=r.named.get("class")),e.isInteractive&&m&&h.trigger("willRender"),v.ENV._DEBUG_RENDER_TREE&&(e.extra.debugRenderTree.create(g,{type:"component",name:t.name,args:r.capture(),instance:h,template:t.template}),(0,c.registerDestructor)(g,()=>{e.extra.debugRenderTree.willDestroy(g)})),g}getSelf({rootRef:e}){return e}didCreateElement({component:e,classRef:t,environment:r,rootRef:n},i,o){(0,s.setViewElement)(e,i),(0,s.setElementView)(i,e)
+var{attributeBindings:l,classNames:u,classNameBindings:d}=e
+if(l&&l.length)(function(e,t,r,n,i){for(var o=[],s=e.length-1;-1!==s;){var l=e[s],u=_e.parse(l),d=u[1];-1===o.indexOf(d)&&(o.push(d),_e.install(t,r,u,n,i)),s--}if(-1===o.indexOf("id")){var h=t.elementId?t.elementId:(0,a.guidFor)(t)
+n.setAttribute("id",c.PrimitiveReference.create(h),!1,null)}b.EMBER_COMPONENT_IS_VISIBLE&&void 0!==ye&&-1===o.indexOf("style")&&ye(r,n,i)})(l,e,n,o,r)
+else{var h=e.elementId?e.elementId:(0,a.guidFor)(e)
+o.setAttribute("id",c.PrimitiveReference.create(h),!1,null),b.EMBER_COMPONENT_IS_VISIBLE&&ye(n,o,r)}if(t){var f=new xe(t,t.propertyKey)
+o.setAttribute("class",f,!1,null)}u&&u.length&&u.forEach(e=>{o.setAttribute("class",c.PrimitiveReference.create(e),!1,null)}),d&&d.length&&d.forEach(e=>{Ee.install(i,n,e,o)}),o.setAttribute("class",c.PrimitiveReference.create("ember-view"),!1,null),"ariaRole"in e&&o.setAttribute("role",ve(n,"ariaRole"),!1,null),e._transitionTo("hasElement"),r.isInteractive&&e.trigger("willInsertElement")}didRenderLayout(e,t){e.component[D]=t,e.finalize(),v.ENV._DEBUG_RENDER_TREE&&e.environment.extra.debugRenderTree.didRender(e,t)}getTag({args:e,component:t}){return e?(0,d.combine)([e.tag,t[R]]):t[R]}didCreate({component:e,environment:t}){t.isInteractive&&(e._transitionTo("inDOM"),e.trigger("didInsertElement"),e.trigger("didRender"))}update(e){var{component:t,args:r,argsRevision:n,environment:i}=e
+if(v.ENV._DEBUG_RENDER_TREE&&i.extra.debugRenderTree.update(e),e.finalizer=(0,f._instrumentStart)("render.component",ze,t),r&&!(0,d.validateTag)(r.tag,n)){var o=ke(r)
+e.argsRevision=(0,d.valueForTag)(r.tag),t[j]=!0,t.setProperties(o),t[j]=!1,t.trigger("didUpdateAttrs"),t.trigger("didReceiveAttrs")}i.isInteractive&&(t.trigger("willUpdate"),t.trigger("willRender"))}didUpdateLayout(e,t){e.finalize(),v.ENV._DEBUG_RENDER_TREE&&e.environment.extra.debugRenderTree.didRender(e,t)}didUpdate({component:e,environment:t}){t.isInteractive&&(e.trigger("didUpdate"),e.trigger("didRender"))}getDestroyable(e){return e}}function Fe(e){return e.instrumentDetails({initialRender:!0})}function ze(e){return e.instrumentDetails({initialRender:!1})}var Ue={dynamicLayout:!0,dynamicTag:!0,prepareArgs:!0,createArgs:!0,attributeHook:!0,elementHook:!0,createCaller:!0,dynamicScope:!0,updateHook:!0,createInstance:!0,wrapped:!0,willDestroy:!0},He=new Le
+class Be{constructor(e,t,r,n){this.name=e,this.ComponentClass=t,this.template=r,this.args=n,this.manager=He,this.state={name:e,ComponentClass:t,template:r,capabilities:Ue}}}class Ve extends Le{constructor(e){super(),this.component=e}getJitStaticLayout(e){var t=this.templateFor(this.component)
+return(0,g.unwrapTemplate)(t).asWrappedLayout()}create(e,t,r,n){var i=this.component,o=(0,f._instrumentStart)("render.component",Fe,i)
+n.view=i
+var a=""!==i.tagName
+a||(e.isInteractive&&i.trigger("willRender"),i._transitionTo("hasElement"),e.isInteractive&&i.trigger("willInsertElement"))
+var s=new de(e,i,null,o,a)
+return v.ENV._DEBUG_RENDER_TREE&&e.extra.debugRenderTree.create(s,{type:"component",name:t.name,args:c.EMPTY_ARGS,instance:i,template:t.template}),s}}var $e,qe,We={dynamicLayout:!1,dynamicTag:!0,prepareArgs:!1,createArgs:!1,attributeHook:!0,elementHook:!0,createCaller:!0,dynamicScope:!0,updateHook:!0,createInstance:!0,wrapped:!0,willDestroy:!1}
+class Ge{constructor(e){this.component=e
+var t=new Ve(e)
+this.manager=t
+var r=(0,_.getFactoryFor)(e)
+this.state={name:r.fullName.slice(10),capabilities:We,ComponentClass:r}}getTag({component:e}){return e[R]}}function Ye(e){return qe||(qe=document.createElement("a")),qe.href=e,qe.protocol}function Ke(e){var t=null
+return"string"==typeof e&&(t=$e.parse(e).protocol),null===t?":":t}var Je=0
+function Qe(e){return"root"===e.type||"argument"===e.type||"property"===e.type||"iterator"===e.type}class Xe{constructor(e){this.id=Je++,this.value=e}get(){return this.value}release(){this.value=null}toString(){var e="Ref "+this.id
+if(null===this.value)return e+" (released)"
+try{return`${e}: ${this.value}`}catch(t){return e}}}var Ze=String.prototype.repeat||function(e){return new Array(e+1).join(this)}
+class et{constructor(){this.stack=new g.Stack,this.refs=new WeakMap,this.roots=new Set,this.nodes=new WeakMap,this.pathNodes=new WeakMap}begin(){this.reset()}create(e,r){var n=(0,t.assign)({},r,{bounds:null,refs:new Set,paths:new Set})
+this.nodes.set(e,n),this.appendChild(n,e),this.enter(e)}update(e){this.enter(e)}setTemplate(e,t){this.nodeFor(e).template=t}didRender(e,t){this.nodeFor(e).bounds=t,this.exit()}willDestroy(e){(0,g.expect)(this.refs.get(e),"BUG: missing ref").release()}commit(){this.reset()}capture(){return this.captureRefs(this.roots)}createPath(e,t,r,n){var{current:i}=this.stack
+if(null!==i){var o,a=(0,g.expect)(this.nodes.get(i),"BUG: Attempted to create a path, but there is no current render node")
+if(null===n)o=a
+else{var{named:s}=a.args,l=s.references.indexOf(n);-1!==l?o={parent:a,type:"argument",name:"@"+s.names[l],paths:new Set}:(this.pathNodes.has(n)||this.createPath(n,"this","root",null),o=this.pathNodes.get(n))}var u={name:t,type:r,parent:o,paths:new Set}
+o.paths.add(u),this.pathNodes.set(e,u)}}logRenderStackForPath(e){for(var t=(0,g.expect)(this.pathNodes.get(e),"BUG: Attempted to create a log for a path reference, but no node exist for that reference"),r=[];void 0!==t&&Qe(t);){if("iterator"===t.type){var n=`${t.parent.name}[${t.name}]`
+r.push(n),t=t.parent}else r.unshift(t.name)
+t=t.parent}for(var i=[r.join(".")];void 0!==t;)"outlet"!==t.type&&"-top-level"!==t.name?(i.unshift(t.name),t=t.parent):t=t.parent
+return i.map((e,t)=>{return`${r=" ",n=2*t,Ze.call(r,n)}${e}`
+var r,n}).join("\n")}reset(){if(0!==this.stack.size)for(;!this.stack.isEmpty();)this.stack.pop()}enter(e){this.stack.push(e)}exit(){this.stack.pop()}nodeFor(e){return(0,g.expect)(this.nodes.get(e),"BUG: missing node")}appendChild(e,t){var r=this.stack.current,n=new Xe(t)
+if(this.refs.set(t,n),r){var i=this.nodeFor(r)
+i.refs.add(n),e.parent=i}else this.roots.add(n)}captureRefs(e){var t=[]
+return e.forEach(r=>{var n=r.get()
+n?t.push(this.captureNode("render-node:"+r.id,n)):e.delete(r)}),t}captureNode(e,t){var r=this.nodeFor(t),{type:n,name:i,args:o,instance:a,refs:s}=r,l=this.captureTemplate(r),u=this.captureBounds(r),c=this.captureRefs(s)
+return{id:e,type:n,name:i,args:o.value(),instance:a,template:l,bounds:u,children:c}}captureTemplate({template:e}){return e&&(0,g.unwrapTemplate)(e).referrer.moduleName||null}captureBounds(e){var t=(0,g.expect)(e.bounds,"BUG: missing bounds")
+return{parentElement:t.parentElement(),firstNode:t.firstNode(),lastNode:t.lastNode()}}}class tt{constructor(e){this.inner=e,this.valueTag=(0,d.createUpdatableTag)(),this.tag=(0,d.combine)([e.tag,this.valueTag])}value(){var e=this.inner.value(),t=(0,n.tagForObject)(e)
+return(0,a.isProxy)(e)&&(e=(0,o._contentFor)(e)),(0,d.updateTag)(this.valueTag,t),new rt(e)}get(e){return this.inner.get(e)}}class rt{constructor(e){this.inner=e}}function nt(e){return e instanceof rt?function(e){if(t=e,null===t||"object"!=typeof t&&"function"!=typeof t)return null
+var t
+return Array.isArray(e)||(0,a.isEmberArray)(e)?st.fromIndexable(e):a.HAS_NATIVE_SYMBOL&&ht(e)?ct.from(e):dt(e)?st.fromForEachable(e):st.fromIndexable(e)}(e.inner):function(e){if(!(0,a.isObject)(e))return null
+return Array.isArray(e)?ot.from(e):(0,a.isEmberArray)(e)?at.from(e):a.HAS_NATIVE_SYMBOL&&ht(e)?ut.from(e):dt(e)?ot.fromForEachable(e):null}(e)}class it{constructor(e){this.length=e,this.position=0}isEmpty(){return!1}memoFor(e){return e}next(){var{length:e,position:t}=this
+if(t>=e)return null
+var r=this.valueFor(t),n=this.memoFor(t)
+return this.position++,{value:r,memo:n}}}class ot extends it{constructor(e){super(e.length),this.array=e}static from(e){return e.length>0?new this(e):null}static fromForEachable(e){var t=[]
+return e.forEach(e=>t.push(e)),this.from(t)}valueFor(e){return this.array[e]}}class at extends it{constructor(e){super(e.length),this.array=e}static from(e){return e.length>0?new this(e):null}valueFor(e){return(0,n.objectAt)(this.array,e)}}class st extends it{constructor(e,t){super(t.length),this.keys=e,this.values=t}static fromIndexable(e){var t=Object.keys(e),{length:r}=t
+if(0===r)return null
+for(var n=[],i=0;i<r;i++){var o,a=t[i]
+o=e[a],(0,d.isTracking)()&&((0,d.consumeTag)((0,d.tagFor)(e,a)),Array.isArray(o)&&(0,d.consumeTag)((0,d.tagFor)(o,"[]"))),n.push(o)}return new this(t,n)}static fromForEachable(e){var t=[],r=[],n=0,i=!1
+return e.forEach((function(e,o){(i=i||arguments.length>=2)&&t.push(o),r.push(e),n++})),0===n?null:i?new this(t,r):new ot(r)}valueFor(e){return this.values[e]}memoFor(e){return this.keys[e]}}class lt{constructor(e,t){this.iterable=e,this.result=t,this.position=0}static from(e){var t=e[Symbol.iterator](),r=t.next(),{done:n}=r
+return n?null:new this(t,r)}isEmpty(){return!1}next(){var{iterable:e,result:t,position:r}=this
+if(t.done)return null
+var n=this.valueFor(t,r),i=this.memoFor(t,r)
+return this.position++,this.result=e.next(),{value:n,memo:i}}}class ut extends lt{valueFor(e){return e.value}memoFor(e,t){return t}}class ct extends lt{valueFor(e){return e.value[1]}memoFor(e){return e.value[0]}}function dt(e){return"function"==typeof e.forEach}function ht(e){return"function"==typeof e[Symbol.iterator]}function ft(e){return(0,a.isProxy)(e)?((0,d.consumeTag)((0,n.tagForProperty)(e,"content")),Boolean((0,n.get)(e,"isTruthy"))):(0,o.isArray)(e)?((0,d.consumeTag)((0,n.tagForProperty)(e,"[]")),0!==e.length):Boolean(e)}(0,d.setPropertyDidChange)(()=>m.backburner.ensureInstance()),(0,c.setScheduleDestroy)((e,t)=>{(0,m.schedule)("actions",null,t,e)}),(0,c.setScheduleDestroyed)(e=>{(0,m.schedule)("destroy",null,e)})
+class pt{constructor(e){this.owner=e,v.ENV._DEBUG_RENDER_TREE&&(this._debugRenderTree=new et)}get debugRenderTree(){if(v.ENV._DEBUG_RENDER_TREE)return this._debugRenderTree
+throw new Error("Can't access debug render tree outside of the inspector (_DEBUG_RENDER_TREE flag is disabled)")}begin(){v.ENV._DEBUG_RENDER_TREE&&this.debugRenderTree.begin()}commit(){v.ENV._DEBUG_RENDER_TREE&&this.debugRenderTree.commit()}}class mt{constructor(e,t){this.toBool=ft,this.toIterator=nt,this.getProp=n._getProp,this.getPath=n.get,this.setPath=n.set,this.extra=new pt(e),this.isInteractive=t,function(e){var t
+if(h.hasDOM&&(t=Ye.call(e,"foobar:baz")),"foobar:"===t)e.protocolForURL=Ye
+else if("object"==typeof URL)$e=URL,e.protocolForURL=Ke
+else{if("undefined"==typeof module||"function"!=typeof module.require)throw new Error("Could not find valid URL parsing mechanism for URL Sanitization")
+$e=module.require("url"),e.protocolForURL=Ke}}(this)}protocolForURL(e){return e}getTemplatePathDebugContext(e){return"While rendering:\n\n"+this.extra.debugRenderTree.logRenderStackForPath(e)}setTemplatePathDebugContext(e,t,r){var n="root"
+e instanceof u.IterationItemReference?n="iterator":e instanceof u.PropertyReference&&(n="property"),this.extra.debugRenderTree.createPath(e,t,n,r)}onTransactionBegin(){this.extra.begin()}onTransactionCommit(){this.extra.commit()}}var vt={dynamicLayout:!1,dynamicTag:!1,prepareArgs:!1,createArgs:!0,attributeHook:!1,elementHook:!1,createCaller:!1,dynamicScope:!0,updateHook:!0,createInstance:!0,wrapped:!1,willDestroy:!1}
+function gt(e){return e.capabilities.asyncLifeCycleCallbacks}function bt(e){return e.capabilities.updateHook}var yt=new class extends ie{create(e,t,r){var i,{delegate:o}=t,s=r.capture(),l=s.named,u={},h=e=>l.get(e).tag
+if(a.HAS_NATIVE_PROXY){var f={get(e,t){if(l.has(t)){var r=l.get(t)
+return(0,d.consumeTag)(r.tag),r.value()}if(t===n.CUSTOM_TAG_FOR)return h},has:(e,t)=>l.has(t),ownKeys:()=>l.names,getOwnPropertyDescriptor:()=>({enumerable:!0,configurable:!0})}
+0,u=new Proxy(u,f)}else Object.defineProperty(u,n.CUSTOM_TAG_FOR,{configurable:!1,enumerable:!1,value:h}),l.names.forEach(e=>{Object.defineProperty(u,e,{enumerable:!0,configurable:!0,get(){var t=l.get(e)
+return(0,d.consumeTag)(t.tag),t.value()}})})
+i={named:u,positional:s.positional.value()}
+var p=o.createComponent(t.ComponentClass.class,i),m=new _t(o,p,s,e,u)
+return v.ENV._DEBUG_RENDER_TREE&&(e.extra.debugRenderTree.create(m,{type:"component",name:t.name,args:r.capture(),instance:p,template:t.template}),(0,c.registerDestructor)(m,()=>{e.extra.debugRenderTree.willDestroy(m)})),m}update(e){v.ENV._DEBUG_RENDER_TREE&&e.env.extra.debugRenderTree.update(e)
+var t,{delegate:r,component:n,args:i,namedArgsProxy:o}=e
+t={named:o,positional:i.positional.value()},bt(r)&&r.updateComponent(n,t)}didCreate({delegate:e,component:t}){gt(e)&&e.didCreateComponent(t)}didUpdate({delegate:e,component:t}){(function(e){return gt(e)&&bt(e)})(e)&&e.didUpdateComponent(t)}getContext({delegate:e,component:t}){e.getContext(t)}getSelf({env:e,delegate:t,component:r}){return new u.ComponentRootReference(t.getContext(r),e)}getDestroyable(e){return e}getCapabilities({delegate:e}){return(0,t.assign)({},vt,{updateHook:v.ENV._DEBUG_RENDER_TREE||e.capabilities.updateHook})}getTag({args:e}){return(0,d.isConstTagged)(e)?(0,d.createTag)():e.tag}didRenderLayout(e,t){v.ENV._DEBUG_RENDER_TREE&&e.env.extra.debugRenderTree.didRender(e,t)}didUpdateLayout(e,t){v.ENV._DEBUG_RENDER_TREE&&e.env.extra.debugRenderTree.didRender(e,t)}getJitStaticLayout(e){return(0,g.unwrapTemplate)(e.template).asLayout()}}
+class _t{constructor(e,t,r,n,i){this.delegate=e,this.component=t,this.args=r,this.env=n,this.namedArgsProxy=i,function(e){return e.capabilities.destructor}(e)&&(0,c.registerDestructor)(this,()=>e.destroyComponent(t))}}class wt{constructor(e,t,r,n){this.name=e,this.ComponentClass=t,this.delegate=r,this.template=n,this.manager=yt,this.state={name:e,ComponentClass:t,template:n,delegate:r}}}class Et{constructor(e,t,r){this.manager=e,this.state={ComponentClass:t,layout:r}}}class xt extends ie{constructor(e){super(),this.owner=e}getJitStaticLayout({layout:e}){return(0,g.unwrapTemplate)(e).asLayout()}}var Ot={dynamicLayout:!1,dynamicTag:!1,prepareArgs:!1,createArgs:v.ENV._DEBUG_RENDER_TREE,attributeHook:!1,elementHook:!1,createCaller:!1,dynamicScope:!1,updateHook:v.ENV._DEBUG_RENDER_TREE,createInstance:!0,wrapped:!1,willDestroy:!1}
+var St=new class extends ie{getJitStaticLayout({template:e}){return(0,g.unwrapTemplate)(e).asLayout()}getCapabilities(){return Ot}create(e,{name:t,template:r},n){if(v.ENV._DEBUG_RENDER_TREE){var i={environment:e}
+return e.extra.debugRenderTree.create(i,{type:"component",name:t,args:n.capture(),instance:null,template:r}),(0,c.registerDestructor)(i,()=>{i.environment.extra.debugRenderTree.willDestroy(i)}),i}return null}getSelf(){return c.NULL_REFERENCE}getTag(){return v.ENV._DEBUG_RENDER_TREE?(0,d.createTag)():d.CONSTANT_TAG}getDestroyable(e){return v.ENV._DEBUG_RENDER_TREE?e:null}didRenderLayout(e,t){v.ENV._DEBUG_RENDER_TREE&&e.environment.extra.debugRenderTree.didRender(e,t)}update(e){v.ENV._DEBUG_RENDER_TREE&&e.environment.extra.debugRenderTree.update(e)}didUpdateLayout(e,t){v.ENV._DEBUG_RENDER_TREE&&e.environment.extra.debugRenderTree.didRender(e,t)}}
+class Tt{constructor(e,t){this.name=e,this.template=t,this.manager=St}get state(){return this}}var Mt=e=>e.positional.at(0),At=e=>e.positional.at(0)
+function Pt({positional:e}){return"checkbox"===e.at(0).value()?"-checkbox":"-text-field"}function Ct({positional:e}){var t=e.at(0).value().split("."),r=t[t.length-1],n=e.at(1).value()
+return!0===n?(0,y.dasherize)(r):n||0===n?String(n):""}class kt{constructor(e){this.inner=e,this.valueTag=(0,d.createUpdatableTag)(),this.tag=(0,d.combine)([e.tag,this.valueTag])}value(){var e=this.inner.value(),t=(0,a.isObject)(e)?(0,n.tagForProperty)(e,"[]"):d.CONSTANT_TAG
+return(0,d.updateTag)(this.valueTag,t),e}get(e){return this.inner.get(e)}}var Rt=e=>(e=>null==e||"function"!=typeof e.toString)(e)?"":String(e)
+function jt({positional:e}){return e.value().map(Rt).join("")}function Dt(){var e=null
+return e}var Nt=Dt()
+function It({positional:e}){var t=e.at(0)
+return(...r)=>{var[n,...i]=e.value()
+return"function"==typeof t[Se]?t[Se](...i,...r):n.call(Nt,...i,...r)}}function Lt({positional:e}){var t=e.at(0).value()
+if((0,a.isObject)(t)){var r=e.at(1).value()
+return(0,n.get)(t,String(r))}}class Ft extends u.HelperRootReference{constructor(e,t){super(Lt,e,t),this.sourceReference=e.positional.at(0),this.pathReference=e.positional.at(1)}[u.UPDATE_REFERENCED_VALUE](e){var t=this.sourceReference.value()
+if((0,a.isObject)(t)){var r=String(this.pathReference.value());(0,n.set)(t,r,e)}}}function zt(e){return e.named.capture()}function Ut({positional:e}){var t=e.at(0),r=e.at(1),n=e.at(2)
+return!0===ft(t.value())?r.value():void 0!==n?n.value():void 0}function Ht({positional:e}){var t=e.at(0),r=e.at(2),n=e.at(1)
+return!0===ft(t.value())?void 0!==r?r.value():void 0:n.value()}function Bt({positional:e}){console.log(...e.value())}function Vt({positional:e,named:r}){return new E.QueryParams((0,t.assign)({},r.value()))}class $t extends u.RootReference{constructor(e,t){super(t),this.inner=e,this.tag=e.tag}get[Se](){return this.inner[Se]}value(){return this.inner.value()}get(e){return this.inner.get(e)}}var qt=["alt","shift","meta","ctrl"],Wt=/^click|mouse|touch/
+var Gt={registeredActions:s.ActionManager.registeredActions,registerAction(e){var{actionId:t}=e
+return s.ActionManager.registeredActions[t]=e,t},unregisterAction(e){var{actionId:t}=e
+delete s.ActionManager.registeredActions[t]}}
+class Yt{constructor(e,t,r,n,i,o,a,s,l){this.element=e,this.actionId=t,this.actionName=r,this.actionArgs=n,this.namedArgs=i,this.positional=o,this.implicitTarget=a,this.dom=s,this.eventName=this.getEventName(),this.tag=l,(0,c.registerDestructor)(this,()=>Gt.unregisterAction(this))}getEventName(){return this.namedArgs.get("on").value()||"click"}getActionArgs(){for(var e=new Array(this.actionArgs.length),t=0;t<this.actionArgs.length;t++)e[t]=this.actionArgs[t].value()
+return e}getTarget(){var{implicitTarget:e,namedArgs:t}=this
+return t.has("target")?t.get("target").value():e.value()}handler(e){var{actionName:t,namedArgs:r}=this,n=r.get("bubbles"),i=r.get("preventDefault"),o=r.get("allowedKeys"),a=this.getTarget(),l=!1!==n.value()
+return!function(e,t){if(null==t){if(Wt.test(e.type))return(0,s.isSimpleClick)(e)
+t=""}if(t.indexOf("any")>=0)return!0
+for(var r=0;r<qt.length;r++)if(e[qt[r]+"Key"]&&-1===t.indexOf(qt[r]))return!1
+return!0}(e,o.value())||(!1!==i.value()&&e.preventDefault(),l||e.stopPropagation(),(0,m.join)(()=>{var e=this.getActionArgs(),r={args:e,target:a,name:null}
+"function"!=typeof t[Se]?"function"!=typeof t?(r.name=t,a.send?(0,f.flaggedInstrument)("interaction.ember-action",r,()=>{a.send.apply(a,[t,...e])}):(0,f.flaggedInstrument)("interaction.ember-action",r,()=>{a[t].apply(a,e)})):(0,f.flaggedInstrument)("interaction.ember-action",r,()=>{t.apply(a,e)}):(0,f.flaggedInstrument)("interaction.ember-action",r,()=>{t[Se].apply(t,e)})}),l)}}class Kt{create(e,t,r,n,i){var o,s,l,{named:u,positional:c,tag:d}=r.capture()
+if(c.length>1)if(o=c.at(0),(l=c.at(1))[Se])s=l
+else{l.propertyKey
+s=l.value()}for(var h=[],f=2;f<c.length;f++)h.push(c.at(f))
+var p=(0,a.uuid)(),m=new Yt(e,p,s,h,u,c,o,i,d)
+return m}install(e){var{dom:t,element:r,actionId:n}=e
+Gt.registerAction(e),t.setAttribute(r,"data-ember-action",""),t.setAttribute(r,"data-ember-action-"+n,n)}update(e){var{positional:t}=e,r=t.at(1)
+r[Se]||(e.actionName=r.value()),e.eventName=e.getEventName()}getTag(e){return e.tag}getDestroyable(e){return e}}class Jt{constructor(e,t,r,n){this.name=e,this.ModifierClass=t,this.delegate=r,this.state={ModifierClass:t,name:e,delegate:r},this.manager=n?Xt:Zt}}class Qt{constructor(e,t,r,n){this.element=e,this.delegate=t,this.modifier=r,this.args=n,this.tag=(0,d.createUpdatableTag)(),(0,c.registerDestructor)(this,()=>t.destroyModifier(r,n.value()))}}var Xt=new class{create(e,t,r){var{delegate:n,ModifierClass:i}=t,o=r.capture(),a=t.delegate.createModifier(i,o.value())
+return new Qt(e,n,a,o)}getTag({args:e,tag:t}){return(0,d.combine)([t,e.tag])}install(e){var{element:t,args:r,delegate:n,modifier:i,tag:o}=e,{capabilities:a}=n
+if(!0===a.disableAutoTracking)(0,d.untrack)(()=>n.installModifier(i,t,r.value()))
+else{var s=(0,d.track)(()=>n.installModifier(i,t,r.value()),!1);(0,d.updateTag)(o,s)}}update(e){var{args:t,delegate:r,modifier:n,tag:i}=e,{capabilities:o}=r
+if(!0===o.disableAutoTracking)(0,d.untrack)(()=>r.updateModifier(n,t.value()))
+else{var a=(0,d.track)(()=>r.updateModifier(n,t.value()),!1);(0,d.updateTag)(i,a)}}getDestroyable(e){return e}},Zt=new class{create(){return null}getTag(){return d.CONSTANT_TAG}install(){}update(){}getDestroyable(){return null}},er=Dt(),tr=(()=>{try{var e,t=document.createElement("div"),r=0
+return t.addEventListener("click",()=>r++,{once:!0}),"function"==typeof Event?e=new Event("click"):(e=document.createEvent("Event")).initEvent("click",!0,!0),t.dispatchEvent(e),t.dispatchEvent(e),1===r}catch(n){return!1}})()
+class rr{constructor(e,t,r){this.shouldUpdate=!0,this.owner=e,this.element=t,this.args=r,this.tag=r.tag}updateFromArgs(){var e,{args:t}=this,{once:r,passive:n,capture:i}=t.named.value()
+r!==this.once&&(this.once=r,this.shouldUpdate=!0),n!==this.passive&&(this.passive=n,this.shouldUpdate=!0),i!==this.capture&&(this.capture=i,this.shouldUpdate=!0),r||n||i?e=this.options={once:r,passive:n,capture:i}:this.options=void 0
+var o=t.positional.at(0).value()
+o!==this.eventName&&(this.eventName=o,this.shouldUpdate=!0)
+var a=t.positional.at(1),s=a.value()
+s!==this.userProvidedCallback&&(this.userProvidedCallback=s,this.shouldUpdate=!0)
+var l=!1===tr&&r||!1
+if(this.shouldUpdate)if(l)var u=this.callback=function(t){return!tr&&r&&or(this,o,u,e),s.call(er,t)}
+else this.callback=s}}var nr=0,ir=0
+function or(e,t,r,n){ir++,tr?e.removeEventListener(t,r,n):void 0!==n&&n.capture?e.removeEventListener(t,r,!0):e.removeEventListener(t,r)}function ar(e,t,r,n){nr++,tr?e.addEventListener(t,r,n):void 0!==n&&n.capture?e.addEventListener(t,r,!0):e.addEventListener(t,r)}class sr{constructor(e,t){this.SUPPORTS_EVENT_OPTIONS=tr,this.isInteractive=t,this.owner=e}get counters(){return{adds:nr,removes:ir}}create(e,t,r){if(!this.isInteractive)return null
+var n=r.capture()
+return new rr(this.owner,e,n)}getTag(e){return null===e?d.CONSTANT_TAG:e.tag}install(e){if(null!==e){e.updateFromArgs()
+var{element:t,eventName:r,callback:n,options:i}=e
+ar(t,r,n,i),(0,c.registerDestructor)(e,()=>or(t,r,n,i)),e.shouldUpdate=!1}}update(e){if(null!==e){var{element:t,eventName:r,callback:n,options:i}=e
+e.updateFromArgs(),e.shouldUpdate&&(or(t,r,n,i),ar(e.element,e.eventName,e.callback,e.options),e.shouldUpdate=!1)}}getDestroyable(e){return e}}var lr={dynamicLayout:!0,dynamicTag:!1,prepareArgs:!1,createArgs:!0,attributeHook:!1,elementHook:!1,createCaller:!0,dynamicScope:!0,updateHook:!0,createInstance:!0,wrapped:!1,willDestroy:!1}
+var ur=new class extends ie{getJitDynamicLayout(e,t){var r=e.engine.lookup("template:application")(e.engine)
+return v.ENV._DEBUG_RENDER_TREE&&e.environment.extra.debugRenderTree.setTemplate(e.controller,r),r}getCapabilities(){return lr}create(e,{name:t},r){var n=e.extra.owner.buildChildEngineInstance(t)
+n.boot()
+var i,o,a,s,l=n.factoryFor("controller:application")||(0,E.generateControllerFactory)(n,"application")
+if(r.named.has("model")&&(s=r.named.get("model")),void 0===s)i=l.create(),o=new u.ComponentRootReference(i,e),a={engine:n,controller:i,self:o,environment:e}
+else{var d=s.value()
+i=l.create({model:d}),o=new u.ComponentRootReference(i,e),a={engine:n,controller:i,self:o,modelRef:s,environment:e}}return v.ENV._DEBUG_RENDER_TREE&&(e.extra.debugRenderTree.create(a,{type:"engine",name:t,args:r.capture(),instance:n,template:void 0}),e.extra.debugRenderTree.create(i,{type:"route-template",name:"application",args:r.capture(),instance:i,template:void 0}),(0,c.registerDestructor)(n,()=>{e.extra.debugRenderTree.willDestroy(i),e.extra.debugRenderTree.willDestroy(a)})),a}getSelf({self:e}){return e}getTag(e){var t=d.CONSTANT_TAG
+return e.modelRef&&(t=e.modelRef.tag),v.ENV._DEBUG_RENDER_TREE&&(0,d.isConstTag)(t)&&(t=(0,d.createTag)()),t}getDestroyable(e){return e.engine}didRenderLayout(e,t){v.ENV._DEBUG_RENDER_TREE&&(e.environment.extra.debugRenderTree.didRender(e.controller,t),e.environment.extra.debugRenderTree.didRender(e,t))}update(e){var{controller:t,environment:r,modelRef:n}=e
+void 0!==n&&t.set("model",n.value()),v.ENV._DEBUG_RENDER_TREE&&(r.extra.debugRenderTree.update(e),r.extra.debugRenderTree.update(e.controller))}didUpdateLayout(e,t){v.ENV._DEBUG_RENDER_TREE&&(e.environment.extra.debugRenderTree.didRender(e.controller,t),e.environment.extra.debugRenderTree.didRender(e,t))}}
+class cr{constructor(e){this.manager=ur,this.state={name:e}}}class dr{constructor(e,t,r){this.nameRef=e,this.env=t,this.args=r,this._lastName=null,this._lastDef=null,this.tag=e.tag}value(){var{env:e,nameRef:t,args:r}=this,n=t.value()
+return"string"==typeof n?this._lastName===n?this._lastDef:e.extra.owner.hasRegistration("engine:"+n)?(this._lastName=n,this._lastDef=(0,c.curry)(new cr(n),r),this._lastDef):null:(this._lastDef=null,this._lastName=null,null)}get(){return c.UNDEFINED_REFERENCE}}class hr{constructor(e){this.outletState=e,this.tag=(0,d.createTag)()}get(e){return new pr(this,e)}value(){return this.outletState}update(e){this.outletState.outlets.main=e,(0,d.dirtyTag)(this.tag)}}class fr{constructor(e,t){this.parentStateRef=e,this.outletNameRef=t,this.tag=(0,d.combine)([e.tag,t.tag])}value(){var e=this.parentStateRef.value(),t=void 0===e?void 0:e.outlets
+return void 0===t?void 0:t[this.outletNameRef.value()]}get(e){return new pr(this,e)}}class pr{constructor(e,t){this.parent=e,this.key=t,this.tag=e.tag}get(e){return new pr(this,e)}value(){var e=this.parent.value()
+return e&&e[this.key]}}class mr extends u.RootReference{constructor(e,t){super(t),this.parent=e,this.tag=e.tag}value(){var e=this.parent.value()
+if(void 0!==e){var{render:t}=e
+if(void 0!==t)return t.model}}}class vr{constructor(e,t){this.outletRef=e,this.env=t,this.definition=null,this.lastState=null,this.tag=e.tag}value(){var e=function(e){var t=e.value()
+if(void 0===t)return null
+var r=t.render
+if(void 0===r)return null
+var n=r.template
+if(void 0===n)return null
+T(n)&&(n=n(r.owner))
+return{ref:e,name:r.name,outlet:r.outlet,template:n,controller:r.controller,model:r.model}}(this.outletRef)
+if(function(e,t){if(null===e)return null===t
+if(null===t)return!1
+return e.template===t.template&&e.controller===t.controller}(e,this.lastState))return this.definition
+this.lastState=e
+var t,r,n,i,o,a=null
+if(null!==e){var s=(t=this.outletRef,r=this.env,n=t.tag,i=new mr(t,r),(o=(0,g.dict)()).model=i,{tag:n,positional:c.EMPTY_ARGS.positional,named:{tag:n,map:o,names:["model"],references:[i],length:1,has:e=>"model"===e,get:e=>"model"===e?i:c.UNDEFINED_REFERENCE,value:()=>({model:i.value()})},length:1,value(){return{named:this.named.value(),positional:this.positional.value()}}})
+a=(0,c.curry)(new ue(e),s)}return this.definition=a}get(e){return c.UNDEFINED_REFERENCE}}var gr=new WeakMap,br=Object.getPrototypeOf
+function yr(e){for(var t=e;null!=t;){var r=gr.get(t)
+if(void 0!==r)return r
+t=br(t)}return null}var _r,wr,Er,xr=new WeakMap,Or=Object.getPrototypeOf
+function Sr(e,t){return xr.set(t,e),t}function Tr(e){for(var t=e;null!=t;){var r=xr.get(t)
+if(void 0!==r)return r
+t=Or(t)}return null}function Mr(e){var t=Tr(e)
+return t&&!t.internal&&"modifier"===t.type?t.factory:void 0}function Ar(e){return{object:"component:"+e}}function Pr(e,t){return{source:void 0!==e?"template:"+e:void 0,namespace:t}}function Cr(e,t,r){var n=function(e,t,r){var n="component:"+e
+return t.factoryFor(n,r)||null}(t,e,r)
+if(null!==n&&void 0!==n.class){var i=yr(n.class)
+if(null!==i)return{component:n,layout:i}}var o=function(e,t,r){var n="template:components/"+e
+return t.lookup(n,r)||null}(t,e,r)
+return null===n&&null===o?null:{component:n,layout:o}}b.PARTIALS&&(_r=function(e,t){if(null!==e){var r=wr(t,Er(e),e)
+return r}},wr=function(e,t,r){if(b.PARTIALS){if(!r)return
+if(!e)throw new O.default("Container was not found when looking up a views template. This is most likely due to manually instantiating an Ember.View. See: http://git.io/EKPpnA")
+return e.lookup("template:"+t)||e.lookup("template:"+r)}},Er=function(e){var t=e.split("/"),r=t[t.length-1]
+return t[t.length-1]="_"+r,t.join("/")})
+var kr={if:function(e,t){return new u.HelperRootReference(Ut,e.capture(),t.env)},action:function(e,t){var r,{named:i,positional:o}=e,a=o.capture(),[s,l,...u]=a.references,c=l.propertyKey,h=i.has("target")?i.get("target"):s,f=function(e,t){var r,i
+t.length>0&&(r=e=>t.map(e=>e.value()).concat(e))
+e&&(i=t=>{var r=e.value()
+return r&&t.length>0&&(t[0]=(0,n.get)(t[0],r)),t})
+return r&&i?e=>i(r(e)):r||i||Pe}(i.has("value")&&i.get("value"),u)
+return(r="function"==typeof l[Se]?Ce(l,l,l[Se],f,c):(0,d.isConstTagged)(h)&&(0,d.isConstTagged)(l)?Ce(s.value(),h.value(),l.value(),f,c):function(e,t,r,n,i){0
+return(...o)=>Ce(e,t.value(),r.value(),n,i)(...o)}(s.value(),h,l,f,c))[Ae]=!0,new fe(r,t.env)},array:function(e){return e.positional.capture()},concat:function(e,t){return new u.HelperRootReference(jt,e.capture(),t.env)},fn:function(e,t){var r=It
+return new u.HelperRootReference(r,e.capture(),t.env)},get:function(e,t){var r=e.positional.at(0),n=e.positional.at(1)
+if((0,d.isConstTagged)(n)){var i=n.value()
+return null==i||""===i?c.NULL_REFERENCE:"string"==typeof i&&i.indexOf(".")>-1?me(r,i.split(".")):r.get(String(i))}return new Ft(e.capture(),t.env)},hash:zt,log:function(e,t){return new u.HelperRootReference(Bt,e.capture(),t.env)},mut:function(e,t){var r=e.positional.at(0)
+return"function"==typeof r[Se]?r:new Me(r,t.env)},"query-params":function(e,t){return new u.HelperRootReference(Vt,e.capture(),t.env)},readonly:function(e,t){var r=function(e){return e[Te]||e}(e.positional.at(0))
+return new $t(r,t.env)},unbound:function(e,t){return new fe(e.positional.at(0).value(),t.env)},unless:function(e,t){return new u.HelperRootReference(Ht,e.capture(),t.env)},"-hash":zt,"-each-in":function(e){return new tt(e.positional.at(0))},"-input-type":function(e,t){return new u.HelperRootReference(Pt,e.capture(),t.env)},"-normalize-class":function(e,t){return new u.HelperRootReference(Ct,e.capture(),t.env)},"-track-array":function(e){return new kt(e.positional.at(0))},"-get-dynamic-var":c.getDynamicVar,"-mount":function(e,t){var r=t.env,n=e.positional.at(0),i=null
+if(e.named.has("model")){var o=e.named.capture(),{tag:a}=o
+0,i={tag:a,positional:c.EMPTY_ARGS.positional,named:o,length:1,value(){return{named:this.named.value(),positional:this.positional.value()}}}}return new dr(n,r,i)},"-outlet":function(e,t){var r,n=t.dynamicScope()
+return r=0===e.positional.length?new u.ConstReference("main"):e.positional.at(0),new vr(new fr(n.outletState,r),t.env)},"-assert-implicit-component-helper-argument":Mt,"-in-el-null":At}
+class Rr{constructor(e,t){this.handles=[void 0],this.objToHandle=new WeakMap,this.builtInHelpers=kr,this.componentDefinitionCache=new Map,this.componentDefinitionCount=0,this.helperDefinitionCount=0,this.isInteractive=t,this.builtInModifiers={action:{manager:new Kt,state:null},on:{manager:new sr(e,t),state:null}}}lookupComponent(e,t){var r=this.lookupComponentHandle(e,t)
+return null===r?null:this.resolve(r)}lookupComponentHandle(e,t){var r=this.handles.length,n=this.handle(this._lookupComponentDefinition(e,t))
+return r===n&&this.componentDefinitionCount++,n}resolve(e){return this.handles[e]}lookupHelper(e,t){var r=this.handles.length,n=this._lookupHelper(e,t)
+if(null!==n){var i=this.handle(n)
+return r===i&&this.helperDefinitionCount++,i}return null}lookupModifier(e,t){return this.handle(this._lookupModifier(e,t))}lookupPartial(e,t){if(b.PARTIALS){var r=this._lookupPartial(e,t)
+return this.handle(r)}return null}compilable(){}handle(e){if(null==e)return null
+var t=this.objToHandle.get(e)
+return void 0===t&&(t=this.handles.push(e)-1,this.objToHandle.set(e,t)),t}_lookupHelper(e,t){var r=this.builtInHelpers[e]
+if(void 0!==r)return r
+var{moduleName:n}=t,i=t.owner,o=e,a=Pr(n,void 0),s=i.factoryFor("helper:"+o,a)||i.factoryFor("helper:"+o)
+return function(e){return"object"==typeof e&&null!==e&&e.class&&e.class.isHelperFactory}(s)?(e,t)=>{var r=s.create()
+if(W(r)){var n={};(0,c.registerDestructor)(n,()=>r.destroy(),!0),t.associateDestroyable(n)}else 0
+return new he(r,e.capture(),t.env)}:null}_lookupPartial(e,t){var n=t.owner,i=_r(e,n)(n)
+return new r.PartialDefinitionImpl(e,i)}_lookupModifier(e,t){var r=this.builtInModifiers[e]
+if(void 0===r){var n=t.owner,i=n.factoryFor("modifier:"+e)
+if(void 0!==i){var o=Mr(i.class)(n)
+return new Jt(e,i,o,this.isInteractive)}}return r}_parseNameForNamespace(e){var t=e,r=void 0,n=e.indexOf("::")
+return-1!==n&&(t=e.slice(n+2),r=e.slice(0,n)),{name:t,namespace:r}}_lookupComponentDefinition(e,t){var r,n,i=e,o=t.owner,{moduleName:a}=t,s=function(e,t,r){if(r.source||r.namespace){var n=Cr(e,t,r)
+if(null!==n)return n}return Cr(e,t)}(o,i,Pr(a,void 0))
+if(null===s)return null
+n=null===s.component?r=s.layout(o):s.component
+var l=this.componentDefinitionCache.get(n)
+if(void 0!==l)return l
+void 0===r&&null!==s.layout&&(r=s.layout(o))
+var u=(0,f._instrumentStart)("render.getComponentDefinition",Ar,i),c=null
+if(null===s.component?v.ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS&&(c=new Tt(i,r)):(0,x.isTemplateOnlyComponent)(s.component.class)&&(c=new Tt(i,r)),null!==s.component){var d=s.component.class,h=Tr(d)
+if(null!==h&&"component"===h.type){var{factory:p}=h
+c=h.internal?new Et(p(o),d,r):new wt(i,s.component,p(o),void 0!==r?r:o.lookup(_.privatize`template:components/-default`)(o))}}return null===c&&(c=new Be(i,s.component||o.factoryFor(_.privatize`component:-default`),r)),u(),this.componentDefinitionCache.set(n,c),c}}function jr(e){return null===e?null:[e[0].map(e=>"@"+e),e[1]]}var Dr=[]
+function Nr(e,t,n,i){var o=i.resolver.lookupComponent(e,i.meta.referrer)
+return null!==o?(0,r.staticComponent)(o,[null===t?[]:t,jr(n),r.EMPTY_BLOCKS]):r.UNHANDLED}function Ir(e,t,n,i,o){var a=o.resolver.lookupComponent(e,o.meta.referrer)
+return null!==a?(0,r.staticComponent)(a,[t,jr(n),i]):r.NONE}e._experimentalMacros=Dr
+class Lr{constructor(e,t){this.view=e,this.outletState=t}child(){return new Lr(this.view,this.outletState)}get(e){return this.outletState}set(e,t){return this.outletState=t,t}}class Fr{constructor(e,t,r,n,i,o,a,l){this.root=e,this.runtime=t,this.id=(0,s.getViewId)(e),this.result=void 0,this.destroyed=!1,this.render=()=>{var e,s=(0,g.unwrapTemplate)(n).asLayout().compile(r),u=(0,c.renderJitMain)(t,r,i,l(t.env,{element:o,nextSibling:null}),(0,g.unwrapHandle)(s),a)
+do{e=u.next()}while(!e.done)
+var d=this.result=e.value
+this.render=()=>d.rerender({alwaysRevalidate:!1})}}isFor(e){return this.root===e}destroy(){var{result:e,runtime:{env:t}}=this
+this.destroyed=!0,this.runtime=void 0,this.root=null,this.result=void 0,this.render=void 0,void 0!==e&&(0,c.inTransaction)(t,()=>(0,c.destroy)(e))}}var zr=[]
+function Ur(e){var t=zr.indexOf(e)
+zr.splice(t,1)}function Hr(){}var Br=null
+var Vr=0
+m.backburner.on("begin",(function(){for(var e=0;e<zr.length;e++)zr[e]._scheduleRevalidate()})),m.backburner.on("end",(function(){for(var e=0;e<zr.length;e++)if(!zr[e]._isValid()){if(Vr>v.ENV._RERENDER_LOOP_LIMIT)throw Vr=0,zr[e].destroy(),new Error("infinite rendering invalidation detected")
+return Vr++,m.backburner.join(null,Hr)}Vr=0,function(){if(null!==Br){var e=Br.resolve
+Br=null,m.backburner.join(null,e)}}()}))
+class $r{constructor(e,t,n,i,o,a=!1,s=c.clientBuilder){this._inRenderTransaction=!1,this._lastRevision=-1,this._destroyed=!1,this._rootTemplate=i(e),this._viewRegistry=o,this._destinedForDOM=a,this._roots=[],this._removedRoots=[],this._builder=s
+var l=this._runtimeResolver=new Rr(e,n.isInteractive),u=new ne(l),d=this._context=(0,r.JitContext)(u);(function(e){var{inlines:t,blocks:r}=e
+t.addMissing(Nr),r.addMissing(Ir)
+for(var n=0;n<Dr.length;n++){(0,Dr[n])(r,t)}})(d.macros)
+var h=new mt(e,n.isInteractive)
+this._runtime=(0,c.JitRuntime)({appendOperations:n.hasDOM?new c.DOMTreeConstruction(t):new w.NodeDOMTreeConstruction(t),updateOperations:new c.DOMChanges(t)},h,d,l)}get debugRenderTree(){return this._runtime.env.extra.debugRenderTree}appendOutletView(e,r){var n=function(e){if(v.ENV._APPLICATION_TEMPLATE_WRAPPER){var r=(0,t.assign)({},ae,{dynamicTag:!0,elementHook:!0,wrapped:!0}),n=new class extends se{getTagName(e){return"div"}getJitStaticLayout({template:e}){return(0,g.unwrapTemplate)(e).asWrappedLayout()}getCapabilities(){return r}didCreateElement(e,t,r){t.setAttribute("class","ember-view"),t.setAttribute("id",(0,a.guidFor)(e))}}
+return new ue(e.state,n)}return new ue(e.state)}(e)
+this._appendDefinition(e,(0,c.curry)(n),r)}appendTo(e,t){var r=new Ge(e)
+this._appendDefinition(e,(0,c.curry)(r),t)}_appendDefinition(e,t,r){var n=new fe(t,this._runtime.env),i=new Lr(null,c.UNDEFINED_REFERENCE),o=new Fr(e,this._runtime,this._context,this._rootTemplate,n,r,i,this._builder)
+this._renderRoot(o)}rerender(){this._scheduleRevalidate()}register(e){var t=(0,s.getViewId)(e)
+this._viewRegistry[t]=e}unregister(e){delete this._viewRegistry[(0,s.getViewId)(e)]}remove(e){e._transitionTo("destroying"),this.cleanupRootFor(e),this._destinedForDOM&&e.trigger("didDestroyElement")}cleanupRootFor(e){if(!this._destroyed)for(var t=this._roots,r=this._roots.length;r--;){var n=t[r]
+n.isFor(e)&&(n.destroy(),t.splice(r,1))}}destroy(){this._destroyed||(this._destroyed=!0,this._clearAllRoots())}getBounds(e){var t=e[D]
+return{parentElement:t.parentElement(),firstNode:t.firstNode(),lastNode:t.lastNode()}}createElement(e){return this._runtime.env.getAppendOperations().createElement(e)}_renderRoot(e){var t,{_roots:r}=this
+r.push(e),1===r.length&&(t=this,zr.push(t)),this._renderRootsTransaction()}_renderRoots(){var e,{_roots:t,_runtime:r,_removedRoots:n}=this
+do{e=t.length,(0,c.inTransaction)(r.env,()=>{for(var r=0;r<t.length;r++){var i=t[r]
+i.destroyed?n.push(i):r>=e||i.render()}this._lastRevision=(0,d.valueForTag)(d.CURRENT_TAG)})}while(t.length>e)
+for(;n.length;){var i=n.pop(),o=t.indexOf(i)
+t.splice(o,1)}0===this._roots.length&&Ur(this)}_renderRootsTransaction(){if(!this._inRenderTransaction){this._inRenderTransaction=!0
+var e=!1
+try{this._renderRoots(),e=!0}finally{e||(this._lastRevision=(0,d.valueForTag)(d.CURRENT_TAG)),this._inRenderTransaction=!1}}}_clearAllRoots(){for(var e=this._roots,t=0;t<e.length;t++){e[t].destroy()}this._removedRoots.length=0,this._roots=[],e.length&&Ur(this)}_scheduleRevalidate(){m.backburner.scheduleOnce("render",this,this._revalidate)}_isValid(){return this._destroyed||0===this._roots.length||(0,d.validateTag)(d.CURRENT_TAG,this._lastRevision)}_revalidate(){this._isValid()||this._renderRootsTransaction()}}e.Renderer=$r
+class qr extends $r{static create(e){var{document:t,env:r,rootTemplate:n,_viewRegistry:o,builder:a}=e
+return new this((0,i.getOwner)(e),t,r,n,o,!1,a)}getElement(e){throw new Error("Accessing `this.element` is not allowed in non-interactive environments (such as FastBoot).")}}e.InertRenderer=qr
+class Wr extends $r{static create(e){var{document:t,env:r,rootTemplate:n,_viewRegistry:o,builder:a}=e
+return new this((0,i.getOwner)(e),t,r,n,o,!0,a)}getElement(e){return(0,s.getViewElement)(e)}}e.InteractiveRenderer=Wr
+var Gr={}
+var Yr={dynamicLayout:!1,dynamicTag:!1,prepareArgs:!0,createArgs:!0,attributeHook:!1,elementHook:!1,createCaller:!0,dynamicScope:!1,updateHook:!0,createInstance:!0,wrapped:!1,willDestroy:!1},Kr=[];(0,l.debugFreeze)(Kr)
+class Jr extends xt{getCapabilities(){return Yr}prepareArgs(e,t){var r=t.named.capture().map
+return{positional:Kr,named:{__ARGS__:new u.ConstReference(r),type:t.named.get("type")}}}create(e,{ComponentClass:t,layout:r},n,i,o){var a=n.named.get("type"),s=t.create({caller:o.value(),type:a.value()}),l={env:e,type:a,instance:s}
+return v.ENV._DEBUG_RENDER_TREE&&(e.extra.debugRenderTree.create(l,{type:"component",name:"input",args:n.capture(),instance:s,template:r}),(0,c.registerDestructor)(s,()=>e.extra.debugRenderTree.willDestroy(l))),l}getSelf({env:e,instance:t}){return new u.ComponentRootReference(t,e)}getTag(){return v.ENV._DEBUG_RENDER_TREE?(0,d.createTag)():d.CONSTANT_TAG}didRenderLayout(e,t){v.ENV._DEBUG_RENDER_TREE&&e.env.extra.debugRenderTree.didRender(e,t)}update(e){(0,n.set)(e.instance,"type",e.type.value()),v.ENV._DEBUG_RENDER_TREE&&e.env.extra.debugRenderTree.update(e)}didUpdateLayout(e,t){v.ENV._DEBUG_RENDER_TREE&&e.env.extra.debugRenderTree.didRender(e,t)}getDestroyable(e){return e.instance}}var Qr=o.Object.extend({isCheckbox:(0,n.computed)("type",(function(){return"checkbox"===this.type}))})
+Sr({factory:e=>new Jr(e),internal:!0,type:"component"},Qr),Qr.toString=()=>"@ember/component/input"
+var Xr=K((function(e){return y.loc.apply(null,e)})),Zr=A({id:"RLf1peEf",block:'{"symbols":["&default"],"statements":[[18,1,null]],"hasEval":false,"upvars":[]}',meta:{moduleName:"packages/@ember/-internals/glimmer/lib/templates/component.hbs"}}),en=A({id:"ExnzE3OS",block:'{"symbols":["Checkbox","TextField","@__ARGS__","&attrs"],"statements":[[6,[37,2],[[30,[36,1],["-checkbox"],null],[30,[36,1],["-text-field"],null]],null,[["default"],[{"statements":[[6,[37,0],[[32,0,["isCheckbox"]]],null,[["default","else"],[{"statements":[[8,[32,1],[[17,4]],[["@target","@__ARGS__"],[[32,0,["caller"]],[32,3]]],null]],"parameters":[]},{"statements":[[8,[32,2],[[17,4]],[["@target","@__ARGS__"],[[32,0,["caller"]],[32,3]]],null]],"parameters":[]}]]]],"parameters":[1,2]}]]]],"hasEval":false,"upvars":["if","component","let"]}',meta:{moduleName:"packages/@ember/-internals/glimmer/lib/templates/input.hbs"}}),tn=A({id:"vA+C0Wde",block:'{"symbols":[],"statements":[[1,[30,[36,1],[[30,[36,0],null,null]],null]]],"hasEval":false,"upvars":["-outlet","component"]}',meta:{moduleName:"packages/@ember/-internals/glimmer/lib/templates/outlet.hbs"}})
+class rn{constructor(e,t,r,n){this._environment=e,this.renderer=t,this.owner=r,this.template=n
+var i=this.ref=new hr({outlets:{main:void 0},render:{owner:r,into:void 0,outlet:"main",name:"-top-level",controller:void 0,model:void 0,template:n}})
+this.state={ref:i,name:"-top-level",outlet:"main",template:n,controller:void 0,model:void 0}}static extend(e){return class extends rn{static create(r){return r?super.create((0,t.assign)({},e,r)):super.create(e)}}}static reopenClass(e){(0,t.assign)(this,e)}static create(e){var{_environment:t,renderer:r,template:n}=e,o=(0,i.getOwner)(e),a=n(o)
+return new rn(t,r,o,a)}appendTo(e){var t
+t=this._environment.hasDOM&&"string"==typeof e?document.querySelector(e):e,(0,m.schedule)("render",this.renderer,"appendOutletView",this,t)}rerender(){}setOutletState(e){this.ref.update(e)}destroy(){}}e.OutletView=rn})),e("@ember/-internals/meta/index",["exports","@ember/-internals/meta/lib/meta"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"counters",{enumerable:!0,get:function(){return t.counters}}),Object.defineProperty(e,"Meta",{enumerable:!0,get:function(){return t.Meta}}),Object.defineProperty(e,"meta",{enumerable:!0,get:function(){return t.meta}}),Object.defineProperty(e,"peekMeta",{enumerable:!0,get:function(){return t.peekMeta}}),Object.defineProperty(e,"setMeta",{enumerable:!0,get:function(){return t.setMeta}}),Object.defineProperty(e,"UNDEFINED",{enumerable:!0,get:function(){return t.UNDEFINED}})})),e("@ember/-internals/meta/lib/meta",["exports","@ember/-internals/utils","@ember/debug","@glimmer/runtime"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.setMeta=d,e.peekMeta=h,e.counters=e.meta=e.Meta=e.UNDEFINED=void 0
+var i,o=Object.prototype
+e.counters=i
+var a=(0,t.symbol)("undefined")
+e.UNDEFINED=a
+var s=1
+class l{constructor(e){this._listenersVersion=1,this._inheritedEnd=-1,this._flattenedVersion=0,this._parent=void 0,this._descriptors=void 0,this._mixins=void 0,this._lazyChains=void 0,this._values=void 0,this._tags=void 0,this._revisions=void 0,this._isInit=!1,this.source=e,this.proto=void 0===e.constructor?void 0:e.constructor.prototype,this._listeners=void 0}get parent(){var e=this._parent
+if(void 0===e){var t=u(this.source)
+this._parent=e=null===t||t===o?null:f(t)}return e}setSourceDestroying(){}setSourceDestroyed(){}isSourceDestroying(){return(0,n.isDestroying)(this.source)}isSourceDestroyed(){return(0,n.isDestroyed)(this.source)}setInitializing(){this._isInit=!0}unsetInitializing(){this._isInit=!1}isInitializing(){return this._isInit}isPrototypeMeta(e){return this.proto===this.source&&this.source===e}_getOrCreateOwnMap(e){return this[e]||(this[e]=Object.create(null))}_getOrCreateOwnSet(e){return this[e]||(this[e]=new Set)}_findInheritedMap(e,t){for(var r=this;null!==r;){var n=r[e]
+if(void 0!==n){var i=n.get(t)
+if(void 0!==i)return i}r=r.parent}}_hasInInheritedSet(e,t){for(var r=this;null!==r;){var n=r[e]
+if(void 0!==n&&n.has(t))return!0
+r=r.parent}return!1}valueFor(e){var t=this._values
+return void 0!==t?t[e]:void 0}setValueFor(e,t){this._getOrCreateOwnMap("_values")[e]=t}revisionFor(e){var t=this._revisions
+return void 0!==t?t[e]:void 0}setRevisionFor(e,t){this._getOrCreateOwnMap("_revisions")[e]=t}writableLazyChainsFor(e){var t=this._getOrCreateOwnMap("_lazyChains"),r=t[e]
+return void 0===r&&(r=t[e]=[]),r}readableLazyChainsFor(e){var t=this._lazyChains
+if(void 0!==t)return t[e]}addMixin(e){this._getOrCreateOwnSet("_mixins").add(e)}hasMixin(e){return this._hasInInheritedSet("_mixins",e)}forEachMixins(e){for(var t,r=this;null!==r;){var n=r._mixins
+void 0!==n&&(t=void 0===t?new Set:t,n.forEach(r=>{t.has(r)||(t.add(r),e(r))})),r=r.parent}}writeDescriptors(e,t){(this._descriptors||(this._descriptors=new Map)).set(e,t)}peekDescriptors(e){var t=this._findInheritedMap("_descriptors",e)
+return t===a?void 0:t}removeDescriptors(e){this.writeDescriptors(e,a)}forEachDescriptors(e){for(var t,r=this;null!==r;){var n=r._descriptors
+void 0!==n&&(t=void 0===t?new Set:t,n.forEach((r,n)=>{t.has(n)||(t.add(n),r!==a&&e(n,r))})),r=r.parent}}addToListeners(e,t,r,n,i){this.pushListener(e,t,r,n?1:0,i)}removeFromListeners(e,t,r){this.pushListener(e,t,r,2)}pushListener(e,t,r,n,i=!1){var o=this.writableListeners(),a=p(o,e,t,r)
+if(-1!==a&&a<this._inheritedEnd&&(o.splice(a,1),this._inheritedEnd--,a=-1),-1===a)o.push({event:e,target:t,method:r,kind:n,sync:i})
+else{var s=o[a]
+2===n&&2!==s.kind?o.splice(a,1):(s.kind=n,s.sync=i)}}writableListeners(){return this._flattenedVersion!==s||this.source!==this.proto&&-1!==this._inheritedEnd||s++,-1===this._inheritedEnd&&(this._inheritedEnd=0,this._listeners=[]),this._listeners}flattenedListeners(){if(this._flattenedVersion<s){0
+var e=this.parent
+if(null!==e){var t=e.flattenedListeners()
+if(void 0!==t)if(void 0===this._listeners)this._listeners=t
+else{var r=this._listeners
+this._inheritedEnd>0&&(r.splice(0,this._inheritedEnd),this._inheritedEnd=0)
+for(var n=0;n<t.length;n++){var i=t[n];-1===p(r,i.event,i.target,i.method)&&(r.unshift(i),this._inheritedEnd++)}}}this._flattenedVersion=s}return this._listeners}matchingListeners(e){var t,r=this.flattenedListeners()
+if(void 0!==r)for(var n=0;n<r.length;n++){var i=r[n]
+i.event!==e||0!==i.kind&&1!==i.kind||(void 0===t&&(t=[]),t.push(i.target,i.method,1===i.kind))}return t}observerEvents(){var e,t=this.flattenedListeners()
+if(void 0!==t)for(var r=0;r<t.length;r++){var n=t[r]
+0!==n.kind&&1!==n.kind||-1===n.event.indexOf(":change")||(void 0===e&&(e=[]),e.push(n))}return e}}e.Meta=l
+var u=Object.getPrototypeOf,c=new WeakMap
+function d(e,t){c.set(e,t)}function h(e){var t=c.get(e)
+if(void 0!==t)return t
+for(var r=u(e);null!==r;){if(void 0!==(t=c.get(r)))return t.proto!==r&&(t.proto=r),t
+r=u(r)}return null}var f=function(e){var t=h(e)
+if(null!==t&&t.source===e)return t
+var r=new l(e)
+return d(e,r),r}
+function p(e,t,r,n){for(var i=e.length-1;i>=0;i--){var o=e[i]
+if(o.event===t&&o.target===r&&o.method===n)return i}return-1}e.meta=f})),e("@ember/-internals/metal/index",["exports","@ember/-internals/meta","@ember/-internals/utils","@ember/debug","@ember/-internals/environment","@ember/runloop","@glimmer/runtime","@glimmer/validator","@ember/polyfills","@ember/error","ember/version","@ember/deprecated-features","@ember/-internals/owner"],(function(e,t,r,n,i,o,a,s,l,u,c,d,h){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.computed=Ae,e.autoComputed=function(...e){return ie(new Te(e),Me)},e.isComputed=function(e,t){return Boolean(ae(e,t))},e.getCachedValueFor=function(e,r){var n=(0,t.peekMeta)(e)
+if(n)return n.valueFor(r)},e.alias=function(e){return ie(new ke(e),Ce)},e.deprecateProperty=function(e,t,r){Object.defineProperty(e,t,{configurable:!0,enumerable:!1,set(e){Ee(this,r,e)},get(){return be(this,r)}})},e._getPath=_e,e.get=be,e.getWithDefault=function(e,t,r){var n=be(e,t)
+if(void 0===n)return r
+return n},e._getProp=ye,e.set=Ee,e.trySet=function(e,t,r){return Ee(e,t,r,!0)},e.objectAt=$,e.replace=function(e,t,r,n=V){Array.isArray(e)?q(e,t,r,n):e.replace(t,r,n)},e.replaceInNativeArray=q,e.addArrayObserver=function(e,t,r){return W(e,t,r,f,!1)},e.removeArrayObserver=function(e,t,r){return W(e,t,r,p,!0)},e.arrayContentWillChange=H,e.arrayContentDidChange=B,e.eachProxyArrayWillChange=function(e,t,r,n){var i=De.get(e)
+void 0!==i&&i.arrayWillChange(e,t,r,n)},e.eachProxyArrayDidChange=function(e,t,r,n){var i=De.get(e)
+void 0!==i&&i.arrayDidChange(e,t,r,n)},e.addListener=f,e.hasListeners=function(e,r){var n=(0,t.peekMeta)(e)
+if(null===n)return!1
+var i=n.matchingListeners(r)
+return void 0!==i&&i.length>0},e.on=function(...e){var t=e.pop(),n=e
+return(0,r.setListeners)(t,n),t},e.removeListener=p,e.sendEvent=m,e.isNone=function(e){return null==e},e.isEmpty=Ne,e.isBlank=Ie
+function f(e,r,n,i,o,a=!0){i||"function"!=typeof n||(i=n,n=null),(0,t.meta)(e).addToListeners(r,n,i,!0===o,a)}function p(e,r,n,i){var o,a
+"object"==typeof n?(o=n,a=i):(o=null,a=n),(0,t.meta)(e).removeFromListeners(r,o,a)}function m(e,r,n,i,o){if(void 0===i){var a=void 0===o?(0,t.peekMeta)(e):o
+i=null!==a?a.matchingListeners(r):void 0}if(void 0===i||0===i.length)return!1
+for(var s=i.length-3;s>=0;s-=3){var l=i[s],u=i[s+1],c=i[s+2]
+if(u){c&&p(e,r,l,u),l||(l=e)
+var d=typeof u
+"string"!==d&&"symbol"!==d||(u=l[u]),u.apply(l,n)}}return!0}e.isPresent=function(e){return!Ie(e)},e.beginPropertyChanges=F,e.changeProperties=U,e.endPropertyChanges=z,e.notifyPropertyChange=L,e.defineProperty=he,e.isElementDescriptor=X,e.nativeDescDecorator=Z,e.descriptorForDecorator=se,e.descriptorForProperty=ae,e.isClassicDecorator=le,e.setClassicDecorator=ue,e.getProperties=function(e,t){var r={},n=arguments,i=1
+2===arguments.length&&Array.isArray(t)&&(i=0,n=arguments[1])
+for(;i<n.length;i++)r[n[i]]=be(e,n[i])
+return r},e.setProperties=function(e,t){if(null===t||"object"!=typeof t)return t
+return U(()=>{for(var r,n=Object.keys(t),i=0;i<n.length;i++)r=n[i],Ee(e,r,t[r])}),t},e.expandProperties=de,e.addObserver=_,e.activateObserver=x,e.removeObserver=w,e.flushAsyncObservers=function(e=!0){var r=(0,s.valueForTag)(s.CURRENT_TAG)
+if(A===r)return
+A=r,y.forEach((r,n)=>{var i=(0,t.peekMeta)(n)
+r.forEach((r,a)=>{if(!(0,s.validateTag)(r.tag,r.lastRevision)){var l=()=>{try{m(n,a,[n,r.path],void 0,i)}finally{r.tag=J(n,r.path,(0,s.tagMetaFor)(n),(0,t.peekMeta)(n)),r.lastRevision=(0,s.valueForTag)(r.tag)}}
+e?(0,o.schedule)("actions",l):l()}})})},e.mixin=function(e,...t){return at(e,t),e},e.observer=function(...e){var t,n,o,a=e.pop()
+"function"==typeof a?(t=a,n=e,o=!i.ENV._DEFAULT_ASYNC_OBSERVERS):(t=a.fn,n=a.dependentKeys,o=a.sync)
+for(var s=[],l=0;l<n.length;++l)de(n[l],e=>s.push(e))
+return(0,r.setObservers)(t,{paths:s,sync:o}),t},e.applyMixin=at,e.inject=function(e,...t){var r=X(t),n=r?void 0:t[0],i=(r||t[1],function(t){var r=(0,h.getOwner)(this)||this.container
+return r.lookup(`${e}:${n||t}`,{source:void 0,namespace:void 0})})
+0
+var o=Ae({get:i,set(e,t){he(this,e,null,t)}})
+return r?o(t[0],t[1],t[2]):o},e.tagForProperty=j,e.tagForObject=function(e){if((0,r.isObject)(e))return(0,s.tagFor)(e,R)
+return s.CONSTANT_TAG},e.markObjectAsDirty=D,e.tracked=mt,e.addNamespace=function(e){He.unprocessedNamespaces=!0,Ve.push(e)},e.classToString=Ye,e.findNamespace=function(e){Ue||Ge()
+return $e[e]}
+e.findNamespaces=qe,e.processNamespace=We,e.processAllNamespaces=Ge,e.removeNamespace=function(e){var t=(0,r.getName)(e)
+delete $e[t],Ve.splice(Ve.indexOf(e),1),t in i.context.lookup&&e===i.context.lookup[t]&&(i.context.lookup[t]=void 0)},e.isNamespaceSearchDisabled=function(){return Ue},e.setNamespaceSearchDisabled=function(e){Ue=Boolean(e)},Object.defineProperty(e,"createCache",{enumerable:!0,get:function(){return s.createCache}}),Object.defineProperty(e,"getValue",{enumerable:!0,get:function(){return s.getValue}}),Object.defineProperty(e,"isConst",{enumerable:!0,get:function(){return s.isConst}}),e.NAMESPACES_BY_ID=e.NAMESPACES=e.CUSTOM_TAG_FOR=e.DEBUG_INJECTION_FUNCTIONS=e.aliasMethod=e.Mixin=e.SYNC_OBSERVERS=e.ASYNC_OBSERVERS=e.Libraries=e.libraries=e.PROPERTY_DID_CHANGE=e.PROXY_CONTENT=e.ComputedProperty=e._globalsComputed=void 0
+function v(e){return e+":change"}var g=!i.ENV._DEFAULT_ASYNC_OBSERVERS,b=new Map
+e.SYNC_OBSERVERS=b
+var y=new Map
+function _(e,r,n,i,o=g){var a=v(r)
+f(e,a,n,i,!1,o)
+var s=(0,t.peekMeta)(e)
+null!==s&&(s.isPrototypeMeta(e)||s.isInitializing())||x(e,a,o)}function w(e,r,n,i,o=g){var a=v(r),s=(0,t.peekMeta)(e)
+null!==s&&(s.isPrototypeMeta(e)||s.isInitializing())||T(e,a,o),p(e,a,n,i)}function E(e,t){var r=!0===t?b:y
+return r.has(e)||(r.set(e,new Map),(0,a.registerDestructor)(e,()=>function(e){b.size>0&&b.delete(e)
+y.size>0&&y.delete(e)}(e),!0)),r.get(e)}function x(e,r,n=!1){var i=E(e,n)
+if(i.has(r))i.get(r).count++
+else{var[o]=r.split(":"),a=J(e,o,(0,s.tagMetaFor)(e),(0,t.peekMeta)(e))
+i.set(r,{count:1,path:o,tag:a,lastRevision:(0,s.valueForTag)(a),suspended:!1})}}e.ASYNC_OBSERVERS=y
+var O=!1,S=[]
+function T(e,t,r=!1){if(!0!==O){var n=!0===r?b:y,i=n.get(e)
+if(void 0!==i){var o=i.get(t)
+o.count--,0===o.count&&(i.delete(t),0===i.size&&n.delete(e))}}else S.push([e,t,r])}function M(e){y.has(e)&&y.get(e).forEach(r=>{r.tag=J(e,r.path,(0,s.tagMetaFor)(e),(0,t.peekMeta)(e)),r.lastRevision=(0,s.valueForTag)(r.tag)}),b.has(e)&&b.get(e).forEach(r=>{r.tag=J(e,r.path,(0,s.tagMetaFor)(e),(0,t.peekMeta)(e)),r.lastRevision=(0,s.valueForTag)(r.tag)})}var A=0
+function P(){b.forEach((e,r)=>{var n=(0,t.peekMeta)(r)
+e.forEach((e,i)=>{if(!e.suspended&&!(0,s.validateTag)(e.tag,e.lastRevision))try{e.suspended=!0,m(r,i,[r,e.path],void 0,n)}finally{e.tag=J(r,e.path,(0,s.tagMetaFor)(r),(0,t.peekMeta)(r)),e.lastRevision=(0,s.valueForTag)(e.tag),e.suspended=!1}})})}function C(e,t,r){var n=b.get(e)
+if(n){var i=n.get(v(t))
+i&&(i.suspended=r)}}var k=(0,r.enumerableSymbol)("CUSTOM_TAG_FOR")
+e.CUSTOM_TAG_FOR=k
+var R=(0,r.symbol)("SELF_TAG")
+function j(e,t,r=!1,n){if("function"==typeof e[k])return e[k](t,r)
+var i=(0,s.tagFor)(e,t,n)
+return i}function D(e,t){(0,s.dirtyTagFor)(e,t),(0,s.dirtyTagFor)(e,R)}var N=(0,r.enumerableSymbol)("PROPERTY_DID_CHANGE")
+e.PROPERTY_DID_CHANGE=N
+var I=0
+function L(e,r,n,i){var o=void 0===n?(0,t.peekMeta)(e):n
+null!==o&&(o.isInitializing()||o.isPrototypeMeta(e))||(D(e,r),I<=0&&P(),N in e&&(4===arguments.length?e[N](r,i):e[N](r)))}function F(){I++,O=!0}function z(){--I<=0&&(P(),function(){for(var[e,t,r]of(O=!1,S))T(e,t,r)
+S=[]}())}function U(e){F()
+try{e()}finally{z()}}function H(e,t,r,n){return void 0===t?(t=0,r=n=-1):(void 0===r&&(r=-1),void 0===n&&(n=-1)),m(e,"@array:before",[e,t,r,n]),e}function B(e,r,n,i,o=!0){void 0===r?(r=0,n=i=-1):(void 0===n&&(n=-1),void 0===i&&(i=-1))
+var a=(0,t.peekMeta)(e)
+if(o&&((i<0||n<0||i-n!=0)&&L(e,"length",a),L(e,"[]",a)),m(e,"@array:change",[e,r,n,i]),null!==a){var s=-1===n?0:n,l=e.length-((-1===i?0:i)-s),u=r<0?l+r:r
+if(void 0!==a.revisionFor("firstObject")&&0===u&&L(e,"firstObject",a),void 0!==a.revisionFor("lastObject"))l-1<u+s&&L(e,"lastObject",a)}return e}var V=Object.freeze([])
+function $(e,t){return Array.isArray(e)?e[t]:e.objectAt(t)}function q(e,t,r,n){if(H(e,t,r,n.length),n.length<=6e4)e.splice(t,r,...n)
+else{e.splice(t,r)
+for(var i=0;i<n.length;i+=6e4){var o=n.slice(i,i+6e4)
+e.splice(t+i,0,...o)}}B(e,t,r,n.length)}function W(e,t,r,n,i){var o=r&&r.willChange||"arrayWillChange",a=r&&r.didChange||"arrayDidChange",s=e.hasArrayObservers
+return n(e,"@array:before",t,o),n(e,"@array:change",t,a),s===i&&L(e,"hasArrayObservers"),e}var G=new l._WeakSet
+function Y(e,n,i){var o=e.readableLazyChainsFor(n)
+if(void 0!==o){if((0,r.isObject)(i))for(var a=0;a<o.length;a++){var[l,u]=o[a];(0,s.updateTag)(l,J(i,u,(0,s.tagMetaFor)(i),(0,t.peekMeta)(i)))}o.length=0}}function K(e,t,r,n){for(var i=[],o=0;o<t.length;o++)Q(i,e,t[o],r,n)
+return(0,s.combine)(i)}function J(e,t,r,n){return(0,s.combine)(Q([],e,t,r,n))}function Q(e,n,i,o,a){for(var l,u,c=n,d=o,h=a,f=i.length,p=-1;;){var m=p+1
+if(-1===(p=i.indexOf(".",m))&&(p=f),"@each"===(l=i.slice(m,p))&&p!==f){m=p+1,p=i.indexOf(".",m)
+var v=c.length
+if("number"!=typeof v||!Array.isArray(c)&&!("objectAt"in c))break
+if(0===v){e.push(j(c,"[]"))
+break}l=-1===p?i.slice(m):i.slice(m,p)
+for(var g=0;g<v;g++){var b=$(c,g)
+b&&e.push(j(b,l,!0))}e.push(j(c,"[]",!0,d))
+break}var y=j(c,l,!0,d)
+if(u=null!==h?h.peekDescriptors(l):void 0,e.push(y),p===f){G.has(u)&&c[l]
+break}if(void 0===u)c=l in c||"function"!=typeof c.unknownProperty?c[l]:c.unknownProperty(l)
+else if(G.has(u))c=c[l]
+else{var _=h.source===c?h:(0,t.meta)(c),w=_.revisionFor(l)
+if(void 0===w||!(0,s.validateTag)(y,w)){var E=_.writableLazyChainsFor(l),x=i.substr(p+1),O=(0,s.createUpdatableTag)()
+E.push([O,x]),e.push(O)
+break}c=_.valueFor(l)}if(!(0,r.isObject)(c))break
+d=(0,s.tagMetaFor)(c),h=(0,t.peekMeta)(c)}return e}function X(e){var[t,r,n]=e
+return 3===e.length&&("function"==typeof t||"object"==typeof t&&null!==t)&&"string"==typeof r&&("object"==typeof n&&null!==n||void 0===n)}function Z(e){var t=function(){return e}
+return ue(t),t}class ee{constructor(){this.enumerable=!0,this.configurable=!0,this._dependentKeys=void 0,this._meta=void 0}setup(e,t,r,n){n.writeDescriptors(t,this)}teardown(e,t,r){r.removeDescriptors(t)}}function te(e,t){return function(){return t.get(this,e)}}function re(e,t){var r=function(r){return t.set(this,e,r)}
+return ne.add(r),r}var ne=new l._WeakSet
+function ie(e,r){var n=function(r,n,i,o){var a=3===arguments.length?(0,t.meta)(r):o
+e.setup(r,n,i,a)
+var s={enumerable:e.enumerable,configurable:e.configurable,get:te(n,e),set:re(n,e)}
+return s}
+return ue(n,e),Object.setPrototypeOf(n,r.prototype),n}var oe=new WeakMap
+function ae(e,r,n){var i=void 0===n?(0,t.peekMeta)(e):n
+if(null!==i)return i.peekDescriptors(r)}function se(e){return oe.get(e)}function le(e){return"function"==typeof e&&oe.has(e)}function ue(e,t=!0){oe.set(e,t)}var ce=/\.@each$/
+function de(e,t){var r=e.indexOf("{")
+r<0?t(e.replace(ce,".[]")):function e(t,r,n,i){var o,a,s=r.indexOf("}"),l=0,u=r.substring(n+1,s).split(","),c=r.substring(s+1)
+t+=r.substring(0,n),a=u.length
+for(;l<a;)(o=c.indexOf("{"))<0?i((t+u[l++]+c).replace(ce,".[]")):e(t+u[l++],c,o,i)}("",e,r,t)}function he(e,r,n,i,o){var a=void 0===o?(0,t.meta)(e):o,s=ae(e,r,a),l=void 0!==s
+l&&s.teardown(e,r,a),le(n)?fe(e,r,n,a):null==n?pe(e,r,i,l,!0):Object.defineProperty(e,r,n),a.isPrototypeMeta(e)||M(e)}function fe(e,t,r,n){var i
+return i=r(e,t,void 0,n),Object.defineProperty(e,t,i),r}function pe(e,t,r,n,i=!0){return!0===n||!1===i?Object.defineProperty(e,t,{configurable:!0,enumerable:i,writable:!0,value:r}):e[t]=r,r}var me=new r.Cache(1e3,e=>e.indexOf("."))
+function ve(e){return"string"==typeof e&&-1!==me.get(e)}var ge=(0,r.symbol)("PROXY_CONTENT")
+function be(e,t){return ve(t)?_e(e,t):ye(e,t)}function ye(e,t){var n,i=typeof e,o="object"===i
+return o||"function"===i?(void 0===(n=e[t])&&o&&!(t in e)&&"function"==typeof e.unknownProperty&&(n=e.unknownProperty(t)),(0,s.isTracking)()&&((0,s.consumeTag)((0,s.tagFor)(e,t)),(Array.isArray(n)||(0,r.isEmberArray)(n))&&(0,s.consumeTag)((0,s.tagFor)(n,"[]")))):n=e[t],n}function _e(e,t){for(var r=e,n="string"==typeof t?t.split("."):t,i=0;i<n.length;i++){if(null==r||r.isDestroyed)return
+r=ye(r,n[i])}return r}e.PROXY_CONTENT=ge,ye("foo","a"),ye("foo",1),ye({},"a"),ye({},1),ye({unkonwnProperty(){}},"a"),ye({unkonwnProperty(){}},1),be({},"foo"),be({},"foo.bar")
+var we={}
+function Ee(e,t,n,i){if(!e.isDestroyed){if(ve(t))return xe(e,t,n,i)
+var o,a=(0,r.lookupDescriptor)(e,t)
+return null!==a&&ne.has(a.set)?(e[t]=n,n):(void 0!==(o=e[t])||"object"!=typeof e||t in e||"function"!=typeof e.setUnknownProperty?(e[t]=n,o!==n&&L(e,t)):e.setUnknownProperty(t,n),n)}}function xe(e,t,r,n){var i=t.split("."),o=i.pop(),a=_e(e,i)
+if(null!=a)return Ee(a,o,r)
+if(!n)throw new u.default(`Property set failed: object in path "${i.join(".")}" could not be found.`)}(0,r.setProxy)(we),(0,s.track)(()=>ye({},"a")),(0,s.track)(()=>ye({},1)),(0,s.track)(()=>ye({a:[]},"a")),(0,s.track)(()=>ye({a:we},"a"))
+function Oe(){}class Se extends ee{constructor(e){super(),this._volatile=!1,this._readOnly=!1,this._hasConfig=!1,this._getter=void 0,this._setter=void 0
+var t=e[e.length-1]
+if("function"==typeof t||null!==t&&"object"==typeof t){this._hasConfig=!0
+var r=e.pop()
+if("function"==typeof r)this._getter=r
+else{var n=r
+this._getter=n.get||Oe,this._setter=n.set}}e.length>0&&this._property(...e)}setup(e,t,r,n){if(super.setup(e,t,r,n),!1===this._hasConfig){var{get:i,set:o}=r
+void 0!==i&&(this._getter=i),void 0!==o&&(this._setter=function(e,t){var r=o.call(this,t)
+return void 0!==i&&void 0===r?i.call(this):r})}}_property(...e){var t=[]
+function r(e){t.push(e)}for(var n=0;n<e.length;n++)de(e[n],r)
+this._dependentKeys=t}get(e,r){if(this._volatile)return this._getter.call(e,r)
+var n,i=(0,t.meta)(e),o=(0,s.tagMetaFor)(e),a=(0,s.tagFor)(e,r,o),l=i.revisionFor(r)
+if(void 0!==l&&(0,s.validateTag)(a,l))n=i.valueFor(r)
+else{var{_getter:u,_dependentKeys:c}=this;(0,s.untrack)(()=>{n=u.call(e,r)}),void 0!==c&&(0,s.updateTag)(a,K(e,c,o,i)),i.setValueFor(r,n),i.setRevisionFor(r,(0,s.valueForTag)(a)),Y(i,r,n)}return(0,s.consumeTag)(a),Array.isArray(n)&&(0,s.consumeTag)((0,s.tagFor)(n,"[]")),n}set(e,r,n){if(this._readOnly&&this._throwReadOnlyError(e,r),!this._setter)return this.clobberSet(e,r,n)
+if(this._volatile)return this.volatileSet(e,r,n)
+var i,o=(0,t.meta)(e)
+o.isInitializing()&&void 0!==this._dependentKeys&&this._dependentKeys.length>0&&"function"==typeof e[N]&&e.isComponent&&_(e,r,()=>{e[N](r)},void 0,!0)
+try{F(),i=this._set(e,r,n,o),Y(o,r,i)
+var a=(0,s.tagMetaFor)(e),l=(0,s.tagFor)(e,r,a),{_dependentKeys:u}=this
+void 0!==u&&(0,s.updateTag)(l,K(e,u,a,o)),o.setRevisionFor(r,(0,s.valueForTag)(l))}finally{z()}return i}_throwReadOnlyError(e,t){throw new u.default(`Cannot set read-only property "${t}" on object: ${(0,r.inspect)(e)}`)}clobberSet(e,r,n){return he(e,r,null,(0,t.meta)(e).valueFor(r)),Ee(e,r,n),n}volatileSet(e,t,r){return this._setter.call(e,t,r)}_set(e,t,r,n){var i,o=void 0!==n.revisionFor(t),a=n.valueFor(t),{_setter:s}=this
+C(e,t,!0)
+try{i=s.call(e,t,r,a)}finally{C(e,t,!1)}return o&&a===i||(n.setValueFor(t,i),L(e,t,n,r)),i}teardown(e,t,r){this._volatile||void 0!==r.revisionFor(t)&&(r.setRevisionFor(t,void 0),r.setValueFor(t,void 0)),super.teardown(e,t,r)}}e.ComputedProperty=Se
+class Te extends Se{get(e,r){if(this._volatile)return this._getter.call(e,r)
+var n,i=(0,t.meta)(e),o=(0,s.tagMetaFor)(e),a=(0,s.tagFor)(e,r,o),l=i.revisionFor(r)
+if(void 0!==l&&(0,s.validateTag)(a,l))n=i.valueFor(r)
+else{var{_getter:u}=this,c=(0,s.track)(()=>{n=u.call(e,r)});(0,s.updateTag)(a,c),i.setValueFor(r,n),i.setRevisionFor(r,(0,s.valueForTag)(a)),Y(i,r,n)}return(0,s.consumeTag)(a),Array.isArray(n)&&(0,s.consumeTag)((0,s.tagFor)(n,"[]",o)),n}}class Me extends Function{readOnly(){var e=se(this)
+return e._readOnly=!0,this}volatile(){return se(this)._volatile=!0,this}property(...e){return se(this)._property(...e),this}meta(e){var t=se(this)
+return 0===arguments.length?t._meta||{}:(t._meta=e,this)}get _getter(){return se(this)._getter}set enumerable(e){se(this).enumerable=e}}function Ae(...e){return X(e)?ie(new Se([]),Me)(e[0],e[1],e[2]):ie(new Se(e),Me)}var Pe=Ae.bind(null)
+e._globalsComputed=Pe
+class Ce extends Function{readOnly(){return se(this).readOnly(),this}oneWay(){return se(this).oneWay(),this}meta(e){var t=se(this)
+if(0===arguments.length)return t._meta||{}
+t._meta=e}}class ke extends ee{constructor(e){super(),this.altKey=e}setup(e,t,r,n){super.setup(e,t,r,n),G.add(this)}get(e,r){var n,i=(0,t.meta)(e),o=(0,s.tagMetaFor)(e),a=(0,s.tagFor)(e,r,o);(0,s.untrack)(()=>{n=be(e,this.altKey)})
+var l=i.revisionFor(r)
+return void 0!==l&&(0,s.validateTag)(a,l)||((0,s.updateTag)(a,J(e,this.altKey,o,i)),i.setRevisionFor(r,(0,s.valueForTag)(a)),Y(i,r,n)),(0,s.consumeTag)(a),n}set(e,t,r){return Ee(e,this.altKey,r)}readOnly(){this.set=Re}oneWay(){this.set=je}}function Re(e,t){throw new u.default(`Cannot set read-only property '${t}' on object: ${(0,r.inspect)(e)}`)}function je(e,t,r){return he(e,t,null),Ee(e,t,r)}var De=new WeakMap
+function Ne(e){var t=null==e
+if(t)return t
+if("number"==typeof e.size)return!e.size
+var r=typeof e
+if("object"===r){var n=be(e,"size")
+if("number"==typeof n)return!n}if("number"==typeof e.length&&"function"!==r)return!e.length
+if("object"===r){var i=be(e,"length")
+if("number"==typeof i)return!i}return!1}function Ie(e){return Ne(e)||"string"==typeof e&&!1===/\S/.test(e)}class Le{constructor(){this._registry=[],this._coreLibIndex=0}_getLibraryByName(e){for(var t=this._registry,r=t.length,n=0;n<r;n++)if(t[n].name===e)return t[n]}register(e,t,r){var n=this._registry.length
+this._getLibraryByName(e)||(r&&(n=this._coreLibIndex++),this._registry.splice(n,0,{name:e,version:t}))}registerCoreLibrary(e,t){this.register(e,t,!0)}deRegister(e){var t,r=this._getLibraryByName(e)
+r&&(t=this._registry.indexOf(r),this._registry.splice(t,1))}}e.Libraries=Le
+var Fe=new Le
+e.libraries=Fe,Fe.registerCoreLibrary("Ember",c.default)
+var ze=Object.prototype.hasOwnProperty,Ue=!1,He={_set:0,_unprocessedNamespaces:!1,get unprocessedNamespaces(){return this._unprocessedNamespaces},set unprocessedNamespaces(e){this._set++,this._unprocessedNamespaces=e}},Be=!1,Ve=[]
+e.NAMESPACES=Ve
+var $e=Object.create(null)
+function qe(){if(He.unprocessedNamespaces)for(var e,t=i.context.lookup,n=Object.keys(t),o=0;o<n.length;o++){var a=n[o]
+if((e=a.charCodeAt(0))>=65&&e<=90){var s=Ke(t,a)
+s&&(0,r.setName)(s,a)}}}function We(e){(function e(t,n,i){var o=t.length,a=t.join(".")
+for(var s in $e[a]=n,(0,r.setName)(n,a),n)if(ze.call(n,s)){var l=n[s]
+if(t[o]=s,l&&l.toString===Ye&&void 0===(0,r.getName)(l))(0,r.setName)(l,t.join("."))
+else if(l&&l.isNamespace){if(i.has(l))continue
+i.add(l),e(t,l,i)}}t.length=o})([e.toString()],e,new Set)}function Ge(){var e=He.unprocessedNamespaces
+if(e&&(qe(),He.unprocessedNamespaces=!1),e||Be){for(var t=Ve,r=0;r<t.length;r++)We(t[r])
+Be=!1}}function Ye(){var e=(0,r.getName)(this)
+return void 0!==e||(e=function(e){var t
+if(!Ue){if(Ge(),void 0!==(t=(0,r.getName)(e)))return t
+var n=e
+do{if((n=Object.getPrototypeOf(n))===Function.prototype||n===Object.prototype)break
+if(void 0!==(t=(0,r.getName)(e))){t=`(subclass of ${t})`
+break}}while(void 0===t)}return t||"(unknown)"}(this),(0,r.setName)(this,e)),e}function Ke(e,t){try{var r=e[t]
+return(null!==r&&"object"==typeof r||"function"==typeof r)&&r.isNamespace&&r}catch(n){}}e.NAMESPACES_BY_ID=$e
+var Je,Qe=Array.prototype.concat,{isArray:Xe}=Array
+function Ze(e,t,r,n){var i=r[e]||n[e]
+return t[e]&&(i=i?Qe.call(i,t[e]):t[e]),i}function et(e,t,n,i){if(!0===n)return t
+var o=n._getter
+if(void 0===o)return t
+var a=i[e],s="function"==typeof a?se(a):a
+if(void 0===s||!0===s)return t
+var l=s._getter
+if(void 0===l)return t
+var u,c=(0,r.wrap)(o,l),d=n._setter,h=s._setter
+if(u=void 0!==h?void 0!==d?(0,r.wrap)(d,h):h:d,c!==o||u!==d){var f=n._dependentKeys||[],p=new Se([...f,{get:c,set:u}])
+return p._readOnly=n._readOnly,p._volatile=n._volatile,p._meta=n._meta,p.enumerable=n.enumerable,ie(p,Se)}return t}function tt(e,t,n,i){if(void 0!==i[e])return t
+var o=n[e]
+return"function"==typeof o?(0,r.wrap)(t,o):t}function rt(e,t,n){var i=n[e],o=(0,r.makeArray)(i).concat((0,r.makeArray)(t))
+return o}function nt(e,t,n){var i=n[e]
+if(!i)return t
+for(var o=(0,l.assign)({},i),a=!1,s=Object.keys(t),u=0;u<s.length;u++){var c=s[u],d=t[c]
+"function"==typeof d?(a=!0,o[c]=tt(c,d,i,{})):o[c]=d}return a&&(o._super=r.ROOT),o}function it(e,t,r,n,i,o,a){for(var s=Ze("concatenatedProperties",t,n,i),l=Ze("mergedProperties",t,n,i),u=Object.keys(t),c=0;c<u.length;c++){var d=u[c],h=t[d]
+if(void 0!==h){if(-1===o.indexOf(d)){o.push(d)
+var f=e.peekDescriptors(d)
+if(void 0===f){var p=n[d]=i[d]
+"function"==typeof p&&ot(i,d,p,!1)}else r[d]=f,a.push(d),f.teardown(i,d,e)}var m="function"==typeof h
+if(m){var v=se(h)
+if(void 0!==v){r[d]=et(d,h,v,r),n[d]=void 0
+continue}}s&&s.indexOf(d)>=0||"concatenatedProperties"===d||"mergedProperties"===d?h=rt(d,h,n):l&&l.indexOf(d)>-1?h=nt(d,h,n):m&&(h=tt(d,h,n,r)),n[d]=h,r[d]=void 0}}}function ot(e,t,n,i){var o=(0,r.observerListenerMetaFor)(n)
+if(void 0!==o){var{observers:a,listeners:s}=o
+if(void 0!==a)for(var l=i?_:w,u=0;u<a.paths.length;u++)l(e,a.paths[u],null,t,a.sync)
+if(void 0!==s)for(var c=i?f:p,d=0;d<s.length;d++)c(e,s[d],null,t)}}function at(e,n,i=!1){var o=Object.create(null),a=Object.create(null),s=(0,t.meta)(e),l=[],u=[]
+e._super=r.ROOT,function e(t,r,n,i,o,a,s){for(var l,u=0;u<t.length;u++)if(l=t[u],dt.has(l)){if(r.hasMixin(l))continue
+r.addMixin(l)
+var{properties:c,mixins:d}=l
+void 0!==c?it(r,c,n,i,o,a,s):void 0!==d&&(e(d,r,n,i,o,a,s),void 0!==l._without&&l._without.forEach(e=>{var t=a.indexOf(e);-1!==t&&a.splice(t,1)}))}else it(r,l,n,i,o,a,s)}(n,s,o,a,e,l,u)
+for(var c=0;c<l.length;c++){var h=l[c],f=a[h],p=o[h]
+if(d.ALIAS_METHOD)for(;void 0!==f&&lt(f);){var m=Je(e,f,o,a)
+p=m.desc,f=m.value}void 0!==f?("function"==typeof f&&ot(e,h,f,!0),pe(e,h,f,-1!==u.indexOf(h),!i)):void 0!==p&&fe(e,h,p,s)}return s.isPrototypeMeta(e)||M(e),e}d.ALIAS_METHOD&&(Je=function(e,t,r,n){var i,o=t.methodName,a=r[o],s=n[o]
+return void 0!==a||void 0!==s||(void 0!==(i=ae(e,o))?(a=i,s=void 0):(a=void 0,s=e[o])),{desc:a,value:s}})
+var st,lt,ut,ct,dt=new l._WeakSet
+class ht{constructor(e,t){dt.add(this),this.properties=function(e){if(void 0!==e)for(var t=Object.keys(e),r=0;r<t.length;r++){var n=t[r],i=Object.getOwnPropertyDescriptor(e,n)
+void 0===i.get&&void 0===i.set||Object.defineProperty(e,n,{value:Z(i)})}return e}(t),this.mixins=ft(e),this.ownerConstructor=void 0,this._without=void 0}static create(...e){Be=!0
+return new this(e,void 0)}static mixins(e){var r=(0,t.peekMeta)(e),n=[]
+return null===r||r.forEachMixins(e=>{e.properties||n.push(e)}),n}reopen(...e){if(0!==e.length){if(this.properties){var t=new ht(void 0,this.properties)
+this.properties=void 0,this.mixins=[t]}else this.mixins||(this.mixins=[])
+return this.mixins=this.mixins.concat(ft(e)),this}}apply(e,t=!1){return at(e,[this],t)}applyPartial(e){return at(e,[this])}detect(e){if("object"!=typeof e||null===e)return!1
+if(dt.has(e))return function e(t,r,n=new Set){if(n.has(t))return!1
+if(n.add(t),t===r)return!0
+var i=t.mixins
+if(i)return i.some(t=>e(t,r,n))
+return!1}(e,this)
+var r=(0,t.peekMeta)(e)
+return null!==r&&r.hasMixin(this)}without(...e){var t=new ht([this])
+return t._without=e,t}keys(){return function e(t,r=new Set,n=new Set){if(n.has(t))return
+if(n.add(t),t.properties)for(var i=Object.keys(t.properties),o=0;o<i.length;o++)r.add(i[o])
+else t.mixins&&t.mixins.forEach(t=>e(t,r,n))
+return r}(this)}toString(){return"(unknown mixin)"}}function ft(e){var t=e&&e.length||0,r=void 0
+if(t>0){r=new Array(t)
+for(var n=0;n<t;n++){var i=e[n]
+dt.has(i)?r[n]=i:r[n]=new ht(void 0,i)}}return r}if(e.Mixin=ht,ht.prototype.toString=Ye,d.ALIAS_METHOD){var pt=new l._WeakSet
+lt=e=>pt.has(e),st=class{constructor(e){this.methodName=e,pt.add(this)}}}function mt(...e){if(!X(e)){var t=e[0],r=t?t.initializer:void 0,n=t?t.value:void 0,i=function(e,t){return vt([e,t,{initializer:r||(()=>n)}])}
+return ue(i),i}return vt(e)}function vt([e,n,i]){var{getter:o,setter:a}=(0,s.trackedData)(n,i?i.initializer:void 0)
+function l(){var e=o(this)
+return(Array.isArray(e)||(0,r.isEmberArray)(e))&&(0,s.consumeTag)((0,s.tagFor)(e,"[]")),e}function u(e){a(this,e),(0,s.dirtyTagFor)(this,R)}var c={enumerable:!0,configurable:!0,isTracked:!0,get:l,set:u}
+return ne.add(u),(0,t.meta)(e).writeDescriptors(n,new gt(l,u)),c}e.aliasMethod=ut,d.ALIAS_METHOD&&(e.aliasMethod=ut=function(e){return new st(e)}),e.DEBUG_INJECTION_FUNCTIONS=ct
+class gt{constructor(e,t){this._get=e,this._set=t,G.add(this)}get(e){return this._get.call(e)}set(e,t,r){this._set.call(e,r)}}})),e("@ember/-internals/owner/index",["exports","@ember/-internals/utils","@ember/debug"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.getOwner=function(e){var t=e[n]
+void 0===t&&(t=e[r])
+return t},e.setOwner=function(e,t){e[n]=t,e[r]=t},e.OWNER=e.LEGACY_OWNER=void 0
+var r=(0,t.enumerableSymbol)("LEGACY_OWNER")
+e.LEGACY_OWNER=r
+var n=(0,t.symbol)("OWNER")
+e.OWNER=n})),e("@ember/-internals/routing/index",["exports","@ember/-internals/routing/lib/ext/controller","@ember/-internals/routing/lib/location/api","@ember/-internals/routing/lib/location/none_location","@ember/-internals/routing/lib/location/hash_location","@ember/-internals/routing/lib/location/history_location","@ember/-internals/routing/lib/location/auto_location","@ember/-internals/routing/lib/system/generate_controller","@ember/-internals/routing/lib/system/controller_for","@ember/-internals/routing/lib/system/dsl","@ember/-internals/routing/lib/system/router","@ember/-internals/routing/lib/system/route","@ember/-internals/routing/lib/system/query_params","@ember/-internals/routing/lib/services/routing","@ember/-internals/routing/lib/services/router","@ember/-internals/routing/lib/system/cache"],(function(e,t,r,n,i,o,a,s,l,u,c,d,h,f,p,m){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"Location",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"NoneLocation",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"HashLocation",{enumerable:!0,get:function(){return i.default}}),Object.defineProperty(e,"HistoryLocation",{enumerable:!0,get:function(){return o.default}}),Object.defineProperty(e,"AutoLocation",{enumerable:!0,get:function(){return a.default}}),Object.defineProperty(e,"generateController",{enumerable:!0,get:function(){return s.default}}),Object.defineProperty(e,"generateControllerFactory",{enumerable:!0,get:function(){return s.generateControllerFactory}}),Object.defineProperty(e,"controllerFor",{enumerable:!0,get:function(){return l.default}}),Object.defineProperty(e,"RouterDSL",{enumerable:!0,get:function(){return u.default}}),Object.defineProperty(e,"Router",{enumerable:!0,get:function(){return c.default}}),Object.defineProperty(e,"Route",{enumerable:!0,get:function(){return d.default}}),Object.defineProperty(e,"QueryParams",{enumerable:!0,get:function(){return h.default}}),Object.defineProperty(e,"RoutingService",{enumerable:!0,get:function(){return f.default}}),Object.defineProperty(e,"RouterService",{enumerable:!0,get:function(){return p.default}}),Object.defineProperty(e,"BucketCache",{enumerable:!0,get:function(){return m.default}})})),e("@ember/-internals/routing/lib/ext/controller",["exports","@ember/-internals/metal","@ember/controller/lib/controller_mixin","@ember/-internals/routing/lib/utils"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,r.default.reopen({concatenatedProperties:["queryParams"],queryParams:null,_qpDelegate:null,_qpChanged(e,r){var n=r.indexOf(".[]"),i=-1===n?r:r.slice(0,n);(0,e._qpDelegate)(i,(0,t.get)(e,i))},transitionToRoute(...e){var r=(0,t.get)(this,"target")
+return(r.transitionToRoute||r.transitionTo).apply(r,(0,n.prefixRouteNameArg)(this,e))},replaceRoute(...e){var r=(0,t.get)(this,"target")
+return(r.replaceRoute||r.replaceWith).apply(r,(0,n.prefixRouteNameArg)(this,e))}})
+var i=r.default
+e.default=i})),e("@ember/-internals/routing/lib/location/api",["exports","@ember/debug"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t={create(e){var t=e&&e.implementation,r=this.implementations[t]
+return r.create(...arguments)},implementations:{}}
+e.default=t})),e("@ember/-internals/routing/lib/location/auto_location",["exports","@ember/-internals/browser-environment","@ember/-internals/metal","@ember/-internals/owner","@ember/-internals/runtime","@ember/-internals/utils","@ember/debug","@ember/-internals/routing/lib/location/util"],(function(e,t,r,n,i,o,a,s){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.getHistoryPath=c,e.getHashPath=d,e.default=void 0
+class l extends i.Object{constructor(){super(...arguments),this.implementation="auto"}detect(){var e=this.rootURL,t=function(e){var{location:t,userAgent:r,history:n,documentMode:i,global:o,rootURL:a}=e,l="none",u=!1,h=(0,s.getFullPath)(t)
+if((0,s.supportsHistory)(r,n)){var f=c(a,t)
+h===f?l="history":"/#"===h.substr(0,2)?(n.replaceState({path:f},"",f),l="history"):(u=!0,(0,s.replacePath)(t,f))}else if((0,s.supportsHashChange)(i,o)){var p=d(a,t)
+h===p||"/"===h&&"/#/"===p?l="hash":(u=!0,(0,s.replacePath)(t,p))}if(u)return!1
+return l}({location:this.location,history:this.history,userAgent:this.userAgent,rootURL:e,documentMode:this.documentMode,global:this.global})
+!1===t&&((0,r.set)(this,"cancelRouterSetup",!0),t="none")
+var i=(0,n.getOwner)(this).lookup("location:"+t);(0,r.set)(i,"rootURL",e),(0,r.set)(this,"concreteImplementation",i)}willDestroy(){var{concreteImplementation:e}=this
+e&&e.destroy()}}function u(e){return function(...t){var{concreteImplementation:r}=this
+return(0,o.tryInvoke)(r,e,t)}}function c(e,t){var r,n,i=(0,s.getPath)(t),o=(0,s.getHash)(t),a=(0,s.getQuery)(t)
+i.indexOf(e)
+return"#/"===o.substr(0,2)?(r=(n=o.substr(1).split("#")).shift(),"/"===i.charAt(i.length-1)&&(r=r.substr(1)),i+=r+a,n.length&&(i+="#"+n.join("#"))):i+=a+o,i}function d(e,t){var r=e,n=c(e,t).substr(e.length)
+return""!==n&&("/"!==n[0]&&(n="/"+n),r+="#"+n),r}e.default=l,l.reopen({rootURL:"/",initState:u("initState"),getURL:u("getURL"),setURL:u("setURL"),replaceURL:u("replaceURL"),onUpdateURL:u("onUpdateURL"),formatURL:u("formatURL"),location:t.location,history:t.history,global:t.window,userAgent:t.userAgent,cancelRouterSetup:!1})})),e("@ember/-internals/routing/lib/location/hash_location",["exports","@ember/-internals/metal","@ember/-internals/runtime","@ember/runloop","@ember/-internals/routing/lib/location/util"],(function(e,t,r,n,i){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class o extends r.Object{constructor(){super(...arguments),this.implementation="hash"}init(){(0,t.set)(this,"location",this._location||window.location),this._hashchangeHandler=void 0}getHash(){return(0,i.getHash)(this.location)}getURL(){var e=this.getHash().substr(1),t=e
+return"/"!==t[0]&&(t="/",e&&(t+="#"+e)),t}setURL(e){this.location.hash=e,(0,t.set)(this,"lastSetURL",e)}replaceURL(e){this.location.replace("#"+e),(0,t.set)(this,"lastSetURL",e)}onUpdateURL(e){this._removeEventListener(),this._hashchangeHandler=(0,n.bind)(this,(function(){var r=this.getURL()
+this.lastSetURL!==r&&((0,t.set)(this,"lastSetURL",null),e(r))})),window.addEventListener("hashchange",this._hashchangeHandler)}formatURL(e){return"#"+e}willDestroy(){this._removeEventListener()}_removeEventListener(){this._hashchangeHandler&&window.removeEventListener("hashchange",this._hashchangeHandler)}}e.default=o})),e("@ember/-internals/routing/lib/location/history_location",["exports","@ember/-internals/metal","@ember/-internals/runtime","@ember/-internals/routing/lib/location/util"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var i=!1
+function o(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,(function(e){var t
+return t=16*Math.random()|0,("x"===e?t:3&t|8).toString(16)}))}class a extends r.Object{constructor(){super(...arguments),this.implementation="history",this.rootURL="/"}getHash(){return(0,n.getHash)(this.location)}init(){this._super(...arguments)
+var e=document.querySelector("base"),r=""
+null!==e&&e.hasAttribute("href")&&(r=e.getAttribute("href")),(0,t.set)(this,"baseURL",r),(0,t.set)(this,"location",this.location||window.location),this._popstateHandler=void 0}initState(){var e=this.history||window.history;(0,t.set)(this,"history",e)
+var{state:r}=e,n=this.formatURL(this.getURL())
+r&&r.path===n?this._previousURL=this.getURL():this.replaceState(n)}getURL(){var{location:e,rootURL:t,baseURL:r}=this,n=e.pathname
+t=t.replace(/\/$/,""),r=r.replace(/\/$/,"")
+var i=n.replace(new RegExp(`^${r}(?=/|$)`),"").replace(new RegExp(`^${t}(?=/|$)`),"").replace(/\/\//g,"/")
+return i+=(e.search||"")+this.getHash()}setURL(e){var{state:t}=this.history
+e=this.formatURL(e),t&&t.path===e||this.pushState(e)}replaceURL(e){var{state:t}=this.history
+e=this.formatURL(e),t&&t.path===e||this.replaceState(e)}pushState(e){var t={path:e,uuid:o()}
+this.history.pushState(t,null,e),this._previousURL=this.getURL()}replaceState(e){var t={path:e,uuid:o()}
+this.history.replaceState(t,null,e),this._previousURL=this.getURL()}onUpdateURL(e){this._removeEventListener(),this._popstateHandler=()=>{(i||(i=!0,this.getURL()!==this._previousURL))&&e(this.getURL())},window.addEventListener("popstate",this._popstateHandler)}formatURL(e){var{rootURL:t,baseURL:r}=this
+return""!==e?(t=t.replace(/\/$/,""),r=r.replace(/\/$/,"")):"/"===r[0]&&"/"===t[0]&&(r=r.replace(/\/$/,"")),r+t+e}willDestroy(){this._removeEventListener()}_removeEventListener(){this._popstateHandler&&window.removeEventListener("popstate",this._popstateHandler)}}e.default=a})),e("@ember/-internals/routing/lib/location/none_location",["exports","@ember/-internals/metal","@ember/-internals/runtime","@ember/debug"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends r.Object{constructor(){super(...arguments),this.implementation="none"}detect(){var{rootURL:e}=this}getURL(){var{path:e,rootURL:t}=this
+return t=t.replace(/\/$/,""),e.replace(new RegExp(`^${t}(?=/|$)`),"")}setURL(e){(0,t.set)(this,"path",e)}onUpdateURL(e){this.updateCallback=e}handleURL(e){(0,t.set)(this,"path",e),this.updateCallback(e)}formatURL(e){var{rootURL:t}=this
+return""!==e&&(t=t.replace(/\/$/,"")),t+e}}e.default=n,n.reopen({path:"",rootURL:"/"})})),e("@ember/-internals/routing/lib/location/util",["exports"],(function(e){"use strict"
+function t(e){var t=e.pathname
+return"/"!==t[0]&&(t="/"+t),t}function r(e){return e.search}function n(e){return void 0!==e.hash?e.hash.substr(0):""}function i(e){var t=e.origin
+return t||(t=`${e.protocol}//${e.hostname}`,e.port&&(t+=":"+e.port)),t}Object.defineProperty(e,"__esModule",{value:!0}),e.getPath=t,e.getQuery=r,e.getHash=n,e.getFullPath=function(e){return t(e)+r(e)+n(e)},e.getOrigin=i,e.supportsHashChange=function(e,t){return t&&"onhashchange"in t&&(void 0===e||e>7)},e.supportsHistory=function(e,t){if((-1!==e.indexOf("Android 2.")||-1!==e.indexOf("Android 4.0"))&&-1!==e.indexOf("Mobile Safari")&&-1===e.indexOf("Chrome")&&-1===e.indexOf("Windows Phone"))return!1
+return Boolean(t&&"pushState"in t)},e.replacePath=function(e,t){e.replace(i(e)+t)}})),e("@ember/-internals/routing/lib/services/router",["exports","@ember/-internals/runtime","@ember/debug","@ember/object/computed","@ember/service","@glimmer/validator","@ember/-internals/routing/lib/utils"],(function(e,t,r,n,i,o,a){"use strict"
+function s(e,t){return"/"===t?e:e.substr(t.length,e.length)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class l extends i.default{init(){super.init(...arguments),this._router.on("routeWillChange",e=>{this.trigger("routeWillChange",e)}),this._router.on("routeDidChange",e=>{this.trigger("routeDidChange",e)})}transitionTo(...e){if((0,a.resemblesURL)(e[0]))return this._router._doURLTransition("transitionTo",e[0])
+var{routeName:t,models:r,queryParams:n}=(0,a.extractRouteArgs)(e),i=this._router._doTransition(t,r,n,!0)
+return i._keepDefaultQueryParamValues=!0,i}replaceWith(){return this.transitionTo(...arguments).method("replace")}urlFor(e,...t){return this._router.generate(e,...t)}isActive(...e){var{routeName:t,models:r,queryParams:n}=(0,a.extractRouteArgs)(e),i=this._router._routerMicrolib
+return(0,o.consumeTag)((0,o.tagFor)(this._router,"currentURL")),!!i.isActiveIntent(t,r)&&(!(Object.keys(n).length>0)||(this._router._prepareQueryParams(t,r,n,!0),(0,a.shallowEqual)(n,i.state.queryParams)))}recognize(e){var t=s(e,this.rootURL)
+return this._router._routerMicrolib.recognize(t)}recognizeAndLoad(e){var t=s(e,this.rootURL)
+return this._router._routerMicrolib.recognizeAndLoad(t)}}e.default=l,l.reopen(t.Evented,{currentRouteName:(0,n.readOnly)("_router.currentRouteName"),currentURL:(0,n.readOnly)("_router.currentURL"),location:(0,n.readOnly)("_router.location"),rootURL:(0,n.readOnly)("_router.rootURL"),currentRoute:(0,n.readOnly)("_router.currentRoute")})})),e("@ember/-internals/routing/lib/services/routing",["exports","@ember/object/computed","@ember/polyfills","@ember/service"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class i extends n.default{hasRoute(e){return this.router.hasRoute(e)}transitionTo(e,t,r,n){var i=this.router._doTransition(e,t,r)
+return n&&i.method("replace"),i}normalizeQueryParams(e,t,r){this.router._prepareQueryParams(e,t,r)}generateURL(e,t,n){var i=this.router
+if(i._routerMicrolib){var o={}
+return n&&((0,r.assign)(o,n),this.normalizeQueryParams(e,t,o)),i.generate(e,...t,{queryParams:o})}}isActiveForRoute(e,t,r,n,i){var o=this.router._routerMicrolib.recognizer.handlersFor(r),a=o[o.length-1].handler,s=function(e,t){for(var r=0,n=0;n<t.length&&(r+=t[n].names.length,t[n].handler!==e);n++);return r}(r,o)
+return e.length>s&&(r=a),n.isActiveIntent(r,e,t,!i)}}e.default=i,i.reopen({targetState:(0,t.readOnly)("router.targetState"),currentState:(0,t.readOnly)("router.currentState"),currentRouteName:(0,t.readOnly)("router.currentRouteName"),currentPath:(0,t.readOnly)("router.currentPath")})})),e("@ember/-internals/routing/lib/system/cache",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=class{constructor(){this.cache=new Map}has(e){return this.cache.has(e)}stash(e,t,r){var n=this.cache.get(e)
+void 0===n&&(n=new Map,this.cache.set(e,n)),n.set(t,r)}lookup(e,t,r){if(!this.has(e))return r
+var n=this.cache.get(e)
+return n.has(t)?n.get(t):r}}})),e("@ember/-internals/routing/lib/system/controller_for",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,r){return e.lookup("controller:"+t,r)}})),e("@ember/-internals/routing/lib/system/dsl",["exports","@ember/debug","@ember/polyfills"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=0
+function i(e){return"function"==typeof e}class o{constructor(e=null,t){this.explicitIndex=!1,this.parent=e,this.enableLoadingSubstates=Boolean(t&&t.enableLoadingSubstates),this.matches=[],this.options=t}route(e,t,r){var n,l=null,u=`/_unused_dummy_error_path_route_${e}/:error`
+if(i(t)?(n={},l=t):i(r)?(n=t,l=r):n=t||{},this.enableLoadingSubstates&&(s(this,e+"_loading",{resetNamespace:n.resetNamespace}),s(this,e+"_error",{resetNamespace:n.resetNamespace,path:u})),l){var c=a(this,e,n.resetNamespace),d=new o(c,this.options)
+s(d,"loading"),s(d,"error",{path:u}),l.call(d),s(this,e,n,d.generate())}else s(this,e,n)}push(e,t,n,i){var o=t.split(".")
+if(this.options.engineInfo){var a=t.slice(this.options.engineInfo.fullName.length+1),s=(0,r.assign)({localFullName:a},this.options.engineInfo)
+i&&(s.serializeMethod=i),this.options.addRouteForEngine(t,s)}else if(i)throw new Error(`Defining a route serializer on route '${t}' outside an Engine is not allowed.`)
+""!==e&&"/"!==e&&"index"!==o[o.length-1]||(this.explicitIndex=!0),this.matches.push(e,t,n)}generate(){var e=this.matches
+return this.explicitIndex||this.route("index",{path:"/"}),t=>{for(var r=0;r<e.length;r+=3)t(e[r]).to(e[r+1],e[r+2])}}mount(e,t={}){var i=this.options.resolveRouteMap(e),l=e
+t.as&&(l=t.as)
+var u,c=a(this,l,t.resetNamespace),d={name:e,instanceId:n++,mountPoint:c,fullName:c},h=t.path
+"string"!=typeof h&&(h="/"+l)
+var f=`/_unused_dummy_error_path_route_${l}/:error`
+if(i){var p=!1,m=this.options.engineInfo
+m&&(p=!0,this.options.engineInfo=d)
+var v=(0,r.assign)({engineInfo:d},this.options),g=new o(c,v)
+s(g,"loading"),s(g,"error",{path:f}),i.class.call(g),u=g.generate(),p&&(this.options.engineInfo=m)}var b=(0,r.assign)({localFullName:"application"},d)
+if(this.enableLoadingSubstates){var y=l+"_loading",_="application_loading",w=(0,r.assign)({localFullName:_},d)
+s(this,y,{resetNamespace:t.resetNamespace}),this.options.addRouteForEngine(y,w),y=l+"_error",_="application_error",w=(0,r.assign)({localFullName:_},d),s(this,y,{resetNamespace:t.resetNamespace,path:f}),this.options.addRouteForEngine(y,w)}this.options.addRouteForEngine(c,b),this.push(h,c,u)}}function a(e,t,r){return function(e){return"application"!==e.parent}(e)&&!0!==r?`${e.parent}.${t}`:t}function s(e,t,r={},n){var i=a(e,t,r.resetNamespace)
+"string"!=typeof r.path&&(r.path="/"+t),e.push(r.path,i,n,r.serialize)}e.default=o})),e("@ember/-internals/routing/lib/system/engines",[],(function(){})),e("@ember/-internals/routing/lib/system/generate_controller",["exports","@ember/-internals/metal","@ember/debug"],(function(e){"use strict"
+function t(e,t){var r=e.factoryFor("controller:basic").class
+r=r.extend({toString:()=>`(generated ${t} controller)`})
+var n="controller:"+t
+return e.register(n,r),e.factoryFor(n)}Object.defineProperty(e,"__esModule",{value:!0}),e.generateControllerFactory=t,e.default=function(e,r){t(e,r)
+var n="controller:"+r,i=e.lookup(n)
+0
+return i}}))
+e("@ember/-internals/routing/lib/system/query_params",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=class{constructor(e=null){this.isQueryParams=!0,this.values=e}}})),e("@ember/-internals/routing/lib/system/route-info",[],(function(){})),e("@ember/-internals/routing/lib/system/route",["exports","@ember/polyfills","@ember/-internals/metal","@ember/-internals/owner","@ember/-internals/runtime","@ember/-internals/utils","@ember/debug","@ember/deprecated-features","@ember/object/compat","@ember/runloop","@ember/string","router_js","@ember/-internals/routing/lib/utils","@ember/-internals/routing/lib/system/generate_controller"],(function(e,t,r,n,i,o,a,s,l,u,c,d,h,f){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.defaultSerialize=v,e.hasDefaultSerialize=function(e){return e.serialize===v},e.default=e.ROUTER_EVENT_DEPRECATIONS=e.ROUTE_CONNECTIONS=void 0
+var p,m=new WeakMap
+function v(e,t){if(!(t.length<1)&&e){var n={}
+if(1===t.length){var[i]=t
+i in e?n[i]=(0,r.get)(e,i):/_id$/.test(i)&&(n[i]=(0,r.get)(e,"id"))}else n=(0,r.getProperties)(e,t)
+return n}}e.ROUTE_CONNECTIONS=m
+class g extends i.Object{constructor(){super(...arguments),this.context={}}_setRouteName(e){this.routeName=e,this.fullRouteName=w((0,n.getOwner)(this),e)}_stashNames(e,t){if(!this._names){var n=this._names=e._names
+n.length||(n=(e=t)&&e._names||[])
+for(var i=(0,r.get)(this,"_qp.qps"),o=new Array(n.length),a=0;a<n.length;++a)o[a]=`${e.name}.${n[a]}`
+for(var s=0;s<i.length;++s){var l=i[s]
+"model"===l.scope&&(l.parts=o)}}}_activeQPChanged(e,t){this._router._activeQPChanged(e.scopedPropertyName,t)}_updatingQPChanged(e){this._router._updatingQPChanged(e.urlKey)}paramsFor(e){var r=(0,n.getOwner)(this).lookup("route:"+e)
+if(void 0===r)return{}
+var i=this._router._routerMicrolib.activeTransition,o=i?i[d.STATE_SYMBOL]:this._router._routerMicrolib.state,a=r.fullRouteName,s=(0,t.assign)({},o.params[a]),l=y(r,o)
+return Object.keys(l).reduce((e,t)=>(e[t]=l[t],e),s)}serializeQueryParamKey(e){return e}serializeQueryParam(e,t,r){return this._router._serializeQueryParam(e,r)}deserializeQueryParam(e,t,r){return this._router._deserializeQueryParam(e,r)}_optionsForQueryParam(e){return(0,r.get)(this,"queryParams."+e.urlKey)||(0,r.get)(this,"queryParams."+e.prop)||{}}resetController(e,t,r){return this}exit(){this.deactivate(),this.trigger("deactivate"),this.teardownViews()}_internalReset(e,t){var n=this.controller
+n._qpDelegate=(0,r.get)(this,"_qp.states.inactive"),this.resetController(n,e,t)}enter(){m.set(this,[]),this.activate(),this.trigger("activate")}deactivate(){}activate(){}transitionTo(...e){return this._router.transitionTo(...(0,h.prefixRouteNameArg)(this,e))}intermediateTransitionTo(...e){var[t,...r]=(0,h.prefixRouteNameArg)(this,e)
+this._router.intermediateTransitionTo(t,...r)}refresh(){return this._router._routerMicrolib.refresh(this)}replaceWith(...e){return this._router.replaceWith(...(0,h.prefixRouteNameArg)(this,e))}setup(e,t){var n,i=this.controllerName||this.routeName,a=this.controllerFor(i,!0)
+if(n=a||this.generateController(i),!this.controller){var s=(0,r.get)(this,"_qp"),u=void 0!==s?(0,r.get)(s,"propertyNames"):[];(function(e,t){t.forEach(t=>{if(void 0===(0,r.descriptorForProperty)(e,t)){var n=(0,o.lookupDescriptor)(e,t)
+null===n||"function"!=typeof n.get&&"function"!=typeof n.set||(0,r.defineProperty)(e,t,(0,l.dependentKeyCompat)({get:n.get,set:n.set}))}(0,r.addObserver)(e,t+".[]",e,e._qpChanged,!1)})})(n,u),this.controller=n}var c=(0,r.get)(this,"_qp"),f=c.states
+if(n._qpDelegate=f.allowOverrides,t){(0,h.stashParamNames)(this._router,t[d.STATE_SYMBOL].routeInfos)
+var p=this._bucketCache,m=t[d.PARAMS_SYMBOL]
+c.propertyNames.forEach(e=>{var t=c.map[e]
+t.values=m
+var i=(0,h.calculateCacheKey)(t.route.fullRouteName,t.parts,t.values),o=p.lookup(i,e,t.undecoratedDefaultValue);(0,r.set)(n,e,o)})
+var v=y(this,t[d.STATE_SYMBOL]);(0,r.setProperties)(n,v)}this.setupController(n,e,t),this._environment.options.shouldRender&&this.renderTemplate(n,e),(0,r.flushAsyncObservers)(!1)}_qpChanged(e,t,r){if(r){var n=this._bucketCache,i=(0,h.calculateCacheKey)(r.route.fullRouteName,r.parts,r.values)
+n.stash(i,e,t)}}beforeModel(){}afterModel(){}redirect(){}contextDidChange(){this.currentModel=this.context}model(e,n){var i,o,a,s=(0,r.get)(this,"_qp.map")
+for(var l in e)if(!("queryParams"===l||s&&l in s)){var u=l.match(/^(.*)_id$/)
+null!==u&&(i=u[1],a=e[l]),o=!0}if(!i){if(o)return(0,t.assign)({},e)
+if(n.resolveIndex<1)return
+return n[d.STATE_SYMBOL].routeInfos[n.resolveIndex-1].context}return this.findModel(i,a)}deserialize(e,t){return this.model(this._paramsFor(this.routeName,e),t)}findModel(...e){return(0,r.get)(this,"store").find(...e)}setupController(e,t,n){e&&void 0!==t&&(0,r.set)(e,"model",t)}controllerFor(e,t){var r=(0,n.getOwner)(this),i=r.lookup("route:"+e)
+i&&i.controllerName&&(e=i.controllerName)
+var o=r.lookup("controller:"+e)
+return o}generateController(e){var t=(0,n.getOwner)(this)
+return(0,f.default)(t,e)}modelFor(e){var t,r=(0,n.getOwner)(this),i=this._router&&this._router._routerMicrolib?this._router._routerMicrolib.activeTransition:void 0
+t=r.routable&&void 0!==i?w(r,e):e
+var o=r.lookup("route:"+t)
+if(null!=i){var a=o&&o.routeName||t
+if(Object.prototype.hasOwnProperty.call(i.resolvedModels,a))return i.resolvedModels[a]}return o&&o.currentModel}renderTemplate(e,t){this.render()}render(e,t){var r=function(e,t,r){var i,o=!t&&!r
+o||("object"!=typeof t||r?i=t:(i=e.templateName||e.routeName,r=t))
+var a,s,l,u,c,d=(0,n.getOwner)(e),h=void 0
+r&&(l=r.into&&r.into.replace(/\//g,"."),u=r.outlet,h=r.controller,c=r.model)
+u=u||"main",o?(a=e.routeName,s=e.templateName||a):(a=i.replace(/\//g,"."),s=a)
+void 0===h&&(h=o?e.controllerName||d.lookup("controller:"+a):d.lookup("controller:"+a)||e.controllerName||e.routeName)
+if("string"==typeof h){var f=h
+h=d.lookup("controller:"+f)}void 0===c?c=e.currentModel:h.set("model",c)
+var p,m=d.lookup("template:"+s)
+l&&(p=b(e))&&l===p.routeName&&(l=void 0)
+var v={owner:d,into:l,outlet:u,name:a,controller:h,model:c,template:void 0!==m?m(d):e._topLevelViewTemplate(d)}
+return v}(this,e,t)
+m.get(this).push(r),(0,u.once)(this._router,"_setOutlets")}disconnectOutlet(e){var t,r
+e&&("string"==typeof e?t=e:(t=e.outlet,r=e.parentView?e.parentView.replace(/\//g,"."):void 0)),t=t||"main",this._disconnectOutlet(t,r)
+for(var n=this._router._routerMicrolib.currentRouteInfos,i=0;i<n.length;i++)n[i].route._disconnectOutlet(t,r)}_disconnectOutlet(e,t){var r=b(this)
+r&&t===r.routeName&&(t=void 0)
+for(var n=m.get(this),i=0;i<n.length;i++){var o=n[i]
+o.outlet===e&&o.into===t&&(n[i]={owner:o.owner,into:o.into,outlet:o.outlet,name:o.name,controller:void 0,template:void 0,model:void 0},(0,u.once)(this._router,"_setOutlets"))}}willDestroy(){this.teardownViews()}teardownViews(){var e=m.get(this)
+void 0!==e&&e.length>0&&(m.set(this,[]),(0,u.once)(this._router,"_setOutlets"))}buildRouteInfoMetadata(){}}function b(e){var t=function(e,t,r=0){if(!t)return
+for(var n=0;n<t.length;n++)if(t[n].route===e)return t[n+r]
+return}(e,e._router._routerMicrolib.state.routeInfos,-1)
+return t&&t.route}function y(e,n){n.queryParamsFor=n.queryParamsFor||{}
+var i=e.fullRouteName
+if(n.queryParamsFor[i])return n.queryParamsFor[i]
+for(var o=function(e,r){return r.fullQueryParams||(r.fullQueryParams={},(0,t.assign)(r.fullQueryParams,r.queryParams),e._deserializeQueryParams(r.routeInfos,r.fullQueryParams)),r.fullQueryParams}(e._router,n),a=n.queryParamsFor[i]={},s=(0,r.get)(e,"_qp.qps"),l=0;l<s.length;++l){var u=s[l],c=u.prop in o
+a[u.prop]=c?o[u.prop]:_(u.defaultValue)}return a}function _(e){return Array.isArray(e)?(0,i.A)(e.slice()):e}function w(e,t){if(e.routable){var r=e.mountPoint
+return"application"===t?r:`${r}.${t}`}return t}g.reopenClass({isRouteFactory:!0}),g.prototype.serialize=v,g.reopen(i.ActionHandler,i.Evented,{mergedProperties:["queryParams"],queryParams:{},templateName:null,_names:null,controllerName:null,store:(0,r.computed)({get(){var e=(0,n.getOwner)(this)
+this.routeName,(0,r.get)(this,"_router.namespace")
+return{find(t,r){var n=e.factoryFor("model:"+t)
+if(n)return(n=n.class).find(r)}}},set(e,t){(0,r.defineProperty)(this,e,null,t)}}),_qp:(0,r.computed)((function(){var e,o=this.controllerName||this.routeName,a=(0,n.getOwner)(this),s=a.lookup("controller:"+o),l=(0,r.get)(this,"queryParams"),u=Object.keys(l).length>0
+if(s){var c=(0,r.get)(s,"queryParams")||{}
+e=function(e,r){var n={},i={defaultValue:!0,type:!0,scope:!0,as:!0}
+for(var o in e)if(Object.prototype.hasOwnProperty.call(e,o)){var a={};(0,t.assign)(a,e[o],r[o]),n[o]=a,i[o]=!0}for(var s in r)if(Object.prototype.hasOwnProperty.call(r,s)&&!i[s]){var l={};(0,t.assign)(l,r[s],e[s]),n[s]=l}return n}((0,h.normalizeControllerQueryParams)(c),l)}else u&&(s=(0,f.default)(a,o),e=l)
+var d=[],p={},m=[]
+for(var v in e)if(Object.prototype.hasOwnProperty.call(e,v)&&"unknownProperty"!==v&&"_super"!==v){var g=e[v],b=g.scope||"model",y=void 0
+"controller"===b&&(y=[])
+var w=g.as||this.serializeQueryParamKey(v),E=(0,r.get)(s,v)
+E=_(E)
+var x=g.type||(0,i.typeOf)(E),O=this.serializeQueryParam(E,w,x),S=`${o}:${v}`,T={undecoratedDefaultValue:(0,r.get)(s,v),defaultValue:E,serializedDefaultValue:O,serializedValue:O,type:x,urlKey:w,prop:v,scopedPropertyName:S,controllerName:o,route:this,parts:y,values:null,scope:b}
+p[v]=p[w]=p[S]=T,d.push(T),m.push(v)}return{qps:d,map:p,propertyNames:m,states:{inactive:(e,t)=>{var r=p[e]
+this._qpChanged(e,t,r)},active:(e,t)=>{var r=p[e]
+return this._qpChanged(e,t,r),this._activeQPChanged(r,t)},allowOverrides:(e,t)=>{var r=p[e]
+return this._qpChanged(e,t,r),this._updatingQPChanged(r)}}}})),send(...e){if(this._router&&this._router._routerMicrolib||!(0,a.isTesting)())this._router.send(...e)
+else{var t=e.shift(),r=this.actions[t]
+if(r)return r.apply(this,e)}},actions:{queryParamsDidChange(e,t,n){for(var i=(0,r.get)(this,"_qp").map,o=Object.keys(e).concat(Object.keys(n)),a=0;a<o.length;++a){var s=i[o[a]]
+if(s&&(0,r.get)(this._optionsForQueryParam(s),"refreshModel")&&this._router.currentState){this.refresh()
+break}}return!0},finalizeQueryParamChange(e,t,n){if("application"!==this.fullRouteName)return!0
+if(n){var i,o=n[d.STATE_SYMBOL].routeInfos,a=this._router,s=a._queryParamsFor(o),l=a._qpUpdates,u=!1;(0,h.stashParamNames)(a,o)
+for(var c=0;c<s.qps.length;++c){var f=s.qps[c],p=f.route,m=p.controller,v=f.urlKey in e&&f.urlKey,g=void 0,b=void 0
+if(l.has(f.urlKey)?(g=(0,r.get)(m,f.prop),b=p.serializeQueryParam(g,f.urlKey,f.type)):v?void 0!==(b=e[v])&&(g=p.deserializeQueryParam(b,f.urlKey,f.type)):(b=f.serializedDefaultValue,g=_(f.defaultValue)),m._qpDelegate=(0,r.get)(p,"_qp.states.inactive"),b!==f.serializedValue){if(n.queryParamsOnly&&!1!==i){var y=p._optionsForQueryParam(f),w=(0,r.get)(y,"replace")
+w?i=!0:!1===w&&(i=!1)}(0,r.set)(m,f.prop,g),u=!0}f.serializedValue=b,f.serializedDefaultValue===b&&!n._keepDefaultQueryParamValues||t.push({value:b,visible:!0,key:v||f.urlKey})}!0===u&&(0,r.flushAsyncObservers)(!1),i&&n.method("replace"),s.qps.forEach(e=>{var t=(0,r.get)(e.route,"_qp")
+e.route.controller._qpDelegate=(0,r.get)(t,"states.active")}),a._qpUpdates.clear()}}}}),e.ROUTER_EVENT_DEPRECATIONS=p,s.ROUTER_EVENTS&&(e.ROUTER_EVENT_DEPRECATIONS=p={on(e){this._super(...arguments)}},g.reopen(p,{_paramsFor(e,t){return void 0!==this._router._routerMicrolib.activeTransition?this.paramsFor(e):t}}))
+var E=g
+e.default=E})),e("@ember/-internals/routing/lib/system/router",["exports","@ember/-internals/metal","@ember/-internals/owner","@ember/-internals/runtime","@ember/debug","@ember/deprecated-features","@ember/error","@ember/polyfills","@ember/runloop","@ember/-internals/routing/lib/location/api","@ember/-internals/routing/lib/utils","@ember/-internals/routing/lib/system/dsl","@ember/-internals/routing/lib/system/route","@ember/-internals/routing/lib/system/router_state","router_js"],(function(e,t,r,n,i,o,a,s,l,u,c,d,h,f,p){"use strict"
+function m(){M(this),this._cancelSlowTransitionTimer(),this.notifyPropertyChange("url"),this.set("currentState",this.targetState),(0,l.once)(this,this.trigger,"didTransition")}function v(e,t,r){(0,l.once)(this,this.trigger,"willTransition",r)}function g(){return this}Object.defineProperty(e,"__esModule",{value:!0}),e.triggerEvent=S,e.default=void 0
+var{slice:b}=Array.prototype
+class y extends n.Object{constructor(){super(...arguments),this.currentURL=null,this.currentRouteName=null,this.currentPath=null,this.currentRoute=null,this._qpCache=Object.create(null),this._qpUpdates=new Set,this._queuedQPChanges={},this._toplevelView=null,this._handledErrors=new Set,this._engineInstances=Object.create(null),this._engineInfoByRoute=Object.create(null),this.currentState=null,this.targetState=null,this._resetQueuedQueryParameterChanges()}_initRouterJs(){var e=(0,t.get)(this,"location"),n=this,i=(0,r.getOwner)(this),a=Object.create(null)
+class s extends p.default{getRoute(e){var t=e,r=i,o=n._engineInfoByRoute[t]
+o&&(r=n._getEngineInstance(o),t=o.localFullName)
+var s="route:"+t,l=r.lookup(s)
+if(a[e])return l
+if(a[e]=!0,!l){var u=r.factoryFor("route:basic").class
+r.register(s,u.extend()),l=r.lookup(s)}if(l._setRouteName(t),o&&!(0,h.hasDefaultSerialize)(l))throw new Error("Defining a custom serialize method on an Engine route is not supported.")
+return l}getSerializer(e){var t=n._engineInfoByRoute[e]
+if(t)return t.serializeMethod||h.defaultSerialize}updateURL(r){(0,l.once)(()=>{e.setURL(r),(0,t.set)(n,"currentURL",r)})}didTransition(e){o.ROUTER_EVENTS&&n.didTransition,n.didTransition(e)}willTransition(e,t,r){o.ROUTER_EVENTS&&n.willTransition,n.willTransition(e,t,r)}triggerEvent(e,t,r,i){return S.bind(n)(e,t,r,i)}routeWillChange(e){n.trigger("routeWillChange",e)}routeDidChange(e){n.set("currentRoute",e.to),(0,l.once)(()=>{n.trigger("routeDidChange",e)})}transitionDidError(e,t){return e.wasAborted||t.isAborted?(0,p.logAbort)(t):(t.trigger(!1,"error",e.error,t,e.route),n._isErrorHandled(e.error)?(t.rollback(),this.routeDidChange(t),e.error):(t.abort(),e.error))}replaceURL(r){if(e.replaceURL){(0,l.once)(()=>{e.replaceURL(r),(0,t.set)(n,"currentURL",r)})}else this.updateURL(r)}}var u=this._routerMicrolib=new s,c=this.constructor.dslCallbacks||[g],d=this._buildDSL()
+d.route("application",{path:"/",resetNamespace:!0,overrideNameAssertion:!0},(function(){for(var e=0;e<c.length;e++)c[e].call(this)})),u.map(d.generate())}_buildDSL(){var e=this._hasModuleBasedResolver(),t=this,n=(0,r.getOwner)(this),i={enableLoadingSubstates:e,resolveRouteMap:e=>n.factoryFor("route-map:"+e),addRouteForEngine(e,r){t._engineInfoByRoute[e]||(t._engineInfoByRoute[e]=r)}}
+return new d.default(null,i)}_resetQueuedQueryParameterChanges(){this._queuedQPChanges={}}_hasModuleBasedResolver(){var e=(0,r.getOwner)(this)
+if(!e)return!1
+var n=(0,t.get)(e,"application.__registry__.resolver.moduleBasedResolver")
+return Boolean(n)}startRouting(){var e=(0,t.get)(this,"initialURL")
+if(this.setupRouter()){void 0===e&&(e=(0,t.get)(this,"location").getURL())
+var r=this.handleURL(e)
+if(r&&r.error)throw r.error}}setupRouter(){this._setupLocation()
+var e=(0,t.get)(this,"location")
+return!(0,t.get)(e,"cancelRouterSetup")&&(this._initRouterJs(),e.onUpdateURL(e=>{this.handleURL(e)}),!0)}_setOutlets(){if(!this.isDestroying&&!this.isDestroyed){var e=this._routerMicrolib.currentRouteInfos
+if(e){for(var t,n=null,i=0;i<e.length;i++){var o=e[i].route,a=h.ROUTE_CONNECTIONS.get(o),s=void 0
+if(0===a.length)s=R(n,t,o)
+else for(var l=0;l<a.length;l++){var u=k(n,t,a[l])
+n=u.liveRoutes
+var{name:c,outlet:d}=u.ownState.render
+c!==o.routeName&&"main"!==d||(s=u.ownState)}t=s}if(n)if(this._toplevelView)this._toplevelView.setOutletState(n)
+else{var f=(0,r.getOwner)(this),p=f.factoryFor("view:-outlet")
+this._toplevelView=p.create(),this._toplevelView.setOutletState(n),f.lookup("-application-instance:main").didCreateRootView(this._toplevelView)}}}}handleURL(e){var t=e.split(/#(.+)?/)[0]
+return this._doURLTransition("handleURL",t)}_doURLTransition(e,t){var r=this._routerMicrolib[e](t||"/")
+return A(r,this),r}transitionTo(...e){if((0,c.resemblesURL)(e[0]))return this._doURLTransition("transitionTo",e[0])
+var{routeName:t,models:r,queryParams:n}=(0,c.extractRouteArgs)(e)
+return this._doTransition(t,r,n)}intermediateTransitionTo(e,...t){this._routerMicrolib.intermediateTransitionTo(e,...t),M(this)}replaceWith(...e){return this.transitionTo(...e).method("replace")}generate(e,...t){var r=this._routerMicrolib.generate(e,...t)
+return this.location.formatURL(r)}isActive(e){return this._routerMicrolib.isActive(e)}isActiveIntent(e,t,r){return this.currentState.isActiveIntent(e,t,r)}send(e,...t){this._routerMicrolib.trigger(e,...t)}hasRoute(e){return this._routerMicrolib.hasRoute(e)}reset(){this._routerMicrolib&&this._routerMicrolib.reset()}willDestroy(){this._toplevelView&&(this._toplevelView.destroy(),this._toplevelView=null),this._super(...arguments),this.reset()
+var e=this._engineInstances
+for(var t in e)for(var r in e[t])(0,l.run)(e[t][r],"destroy")}_activeQPChanged(e,t){this._queuedQPChanges[e]=t,(0,l.once)(this,this._fireQueryParamTransition)}_updatingQPChanged(e){this._qpUpdates.add(e)}_fireQueryParamTransition(){this.transitionTo({queryParams:this._queuedQPChanges}),this._resetQueuedQueryParameterChanges()}_setupLocation(){var e=this.location,n=this.rootURL,i=(0,r.getOwner)(this)
+if("string"==typeof e&&i){var o=i.lookup("location:"+e)
+if(void 0!==o)e=(0,t.set)(this,"location",o)
+else{var a={implementation:e}
+e=(0,t.set)(this,"location",u.default.create(a))}}null!==e&&"object"==typeof e&&(n&&(0,t.set)(e,"rootURL",n),"function"==typeof e.detect&&e.detect(),"function"==typeof e.initState&&e.initState())}_serializeQueryParams(e,t){P(this,e,t,(e,r,i)=>{if(i)delete t[e],t[i.urlKey]=i.route.serializeQueryParam(r,i.urlKey,i.type)
+else{if(void 0===r)return
+t[e]=this._serializeQueryParam(r,(0,n.typeOf)(r))}})}_serializeQueryParam(e,t){return null==e?e:"array"===t?JSON.stringify(e):""+e}_deserializeQueryParams(e,t){P(this,e,t,(e,r,n)=>{n&&(delete t[e],t[n.prop]=n.route.deserializeQueryParam(r,n.urlKey,n.type))})}_deserializeQueryParam(e,t){return null==e?e:"boolean"===t?"true"===e:"number"===t?Number(e).valueOf():"array"===t?(0,n.A)(JSON.parse(e)):e}_pruneDefaultQueryParamValues(e,t){var r=this._queryParamsFor(e)
+for(var n in t){var i=r.map[n]
+i&&i.serializedDefaultValue===t[n]&&delete t[n]}}_doTransition(e,t,r,n){var i=e||(0,c.getActiveTargetName)(this._routerMicrolib),o={}
+this._processActiveTransitionQueryParams(i,t,o,r),(0,s.assign)(o,r),this._prepareQueryParams(i,t,o,Boolean(n))
+var a=this._routerMicrolib.transitionTo(i,...t,{queryParams:o})
+return A(a,this),a}_processActiveTransitionQueryParams(e,t,r,n){if(this._routerMicrolib.activeTransition){var i={},o=this._qpUpdates,a=this._routerMicrolib.activeTransition[p.QUERY_PARAMS_SYMBOL]
+for(var l in a)o.has(l)||(i[l]=a[l])
+this._fullyScopeQueryParams(e,t,n),this._fullyScopeQueryParams(e,t,i),(0,s.assign)(r,i)}}_prepareQueryParams(e,t,r,n){var i=T(this,e,t)
+this._hydrateUnsuppliedQueryParams(i,r,Boolean(n)),this._serializeQueryParams(i.routeInfos,r),n||this._pruneDefaultQueryParamValues(i.routeInfos,r)}_getQPMeta(e){var r=e.route
+return r&&(0,t.get)(r,"_qp")}_queryParamsFor(e){var t=e.length,r=e[t-1].name,n=this._qpCache[r]
+if(void 0!==n)return n
+for(var i,o,a=!0,l={},u=[],c=0;c<t;++c)if(i=this._getQPMeta(e[c])){for(var d=0;d<i.qps.length;d++)o=i.qps[d],u.push(o);(0,s.assign)(l,i.map)}else a=!1
+var h={qps:u,map:l}
+return a&&(this._qpCache[r]=h),h}_fullyScopeQueryParams(e,t,r){for(var n,i=T(this,e,t).routeInfos,o=0,a=i.length;o<a;++o)if(n=this._getQPMeta(i[o]))for(var s=void 0,l=void 0,u=0,c=n.qps.length;u<c;++u)(l=(s=n.qps[u]).prop in r&&s.prop||s.scopedPropertyName in r&&s.scopedPropertyName||s.urlKey in r&&s.urlKey)&&l!==s.scopedPropertyName&&(r[s.scopedPropertyName]=r[l],delete r[l])}_hydrateUnsuppliedQueryParams(e,t,r){for(var n,i,o,a=e.routeInfos,s=this._bucketCache,l=0;l<a.length;++l)if(n=this._getQPMeta(a[l]))for(var u=0,d=n.qps.length;u<d;++u)if(i=n.qps[u],o=i.prop in t&&i.prop||i.scopedPropertyName in t&&i.scopedPropertyName||i.urlKey in t&&i.urlKey)o!==i.scopedPropertyName&&(t[i.scopedPropertyName]=t[o],delete t[o])
+else{var h=(0,c.calculateCacheKey)(i.route.fullRouteName,i.parts,e.params)
+t[i.scopedPropertyName]=s.lookup(h,i.prop,i.defaultValue)}}_scheduleLoadingEvent(e,t){this._cancelSlowTransitionTimer(),this._slowTransitionTimer=(0,l.scheduleOnce)("routerTransitions",this,"_handleSlowTransition",e,t)}_handleSlowTransition(e,t){if(this._routerMicrolib.activeTransition){var r=new f.default(this,this._routerMicrolib,this._routerMicrolib.activeTransition[p.STATE_SYMBOL])
+this.set("targetState",r),e.trigger(!0,"loading",e,t)}}_cancelSlowTransitionTimer(){this._slowTransitionTimer&&(0,l.cancel)(this._slowTransitionTimer),this._slowTransitionTimer=null}_markErrorAsHandled(e){this._handledErrors.add(e)}_isErrorHandled(e){return this._handledErrors.has(e)}_clearHandledError(e){this._handledErrors.delete(e)}_getEngineInstance({name:e,instanceId:t,mountPoint:n}){var i=this._engineInstances
+i[e]||(i[e]=Object.create(null))
+var o=i[e][t]
+if(!o){var a=(0,r.getOwner)(this);(o=a.buildChildEngineInstance(e,{routable:!0,mountPoint:n})).boot(),i[e][t]=o}return o}}function _(e,t){for(var r=e.length-1;r>=0;--r){var n=e[r],i=n.route
+if(void 0!==i&&!0!==t(i,n))return}}var w={willResolveModel(e,t,r){this._scheduleLoadingEvent(t,r)},error(e,t,r){var n=this,i=e[e.length-1]
+_(e,(e,r)=>{if(r!==i){var o=x(e,"error")
+if(o)return n._markErrorAsHandled(t),n.intermediateTransitionTo(o,t),!1}var a=E(e,"error")
+return!a||(n._markErrorAsHandled(t),n.intermediateTransitionTo(a,t),!1)}),function(e,t){var r,n=[]
+r=e&&"object"==typeof e&&"object"==typeof e.errorThrown?e.errorThrown:e
+t&&n.push(t)
+r&&(r.message&&n.push(r.message),r.stack&&n.push(r.stack),"string"==typeof r&&n.push(r))
+console.error(...n)}(t,"Error while processing route: "+r.targetName)},loading(e,t){var r=this,n=e[e.length-1]
+_(e,(e,i)=>{if(i!==n){var o=x(e,"loading")
+if(o)return r.intermediateTransitionTo(o),!1}var a=E(e,"loading")
+return a?(r.intermediateTransitionTo(a),!1):t.pivotHandler!==e})}}
+function E(e,t){var n=(0,r.getOwner)(e),{routeName:i,fullRouteName:o,_router:a}=e,s=`${o}_${t}`
+return O(n,a,`${i}_${t}`,s)?s:""}function x(e,t){var n=(0,r.getOwner)(e),{routeName:i,fullRouteName:o,_router:a}=e,s="application"===o?t:`${o}.${t}`
+return O(n,a,"application"===i?t:`${i}.${t}`,s)?s:""}function O(e,t,r,n){var i=t.hasRoute(n),o=e.hasRegistration("template:"+r)||e.hasRegistration("route:"+r)
+return i&&o}function S(e,t,r,n){if(!e){if(t)return
+throw new a.default(`Can't trigger action '${r}' because your app hasn't finished transitioning into its first route. To trigger an action on destination routes during a transition, you can call \`.send()\` on the \`Transition\` object passed to the \`model/beforeModel/afterModel\` hooks.`)}for(var i,o,s=!1,l=e.length-1;l>=0;l--)if(o=(i=e[l].route)&&i.actions&&i.actions[r]){if(!0!==o.apply(i,n))return void("error"===r&&i._router._markErrorAsHandled(n[0]))
+s=!0}var u=w[r]
+if(u)u.apply(this,[e,...n])
+else if(!s&&!t)throw new a.default(`Nothing handled the action '${r}'. If you did handle the action, this error can be caused by returning true from an action handler in a controller, causing the action to bubble.`)}function T(e,t,r){for(var n=e._routerMicrolib.applyIntent(t,r),{routeInfos:i,params:o}=n,a=0;a<i.length;++a){var s=i[a]
+s.isResolved?o[s.name]=s.params:o[s.name]=s.serialize(s.context)}return n}function M(e){var n=e._routerMicrolib.currentRouteInfos
+if(0!==n.length){var i=y._routePath(n),a=n[n.length-1].name,s=e.get("location").getURL();(0,t.set)(e,"currentPath",i),(0,t.set)(e,"currentRouteName",a),(0,t.set)(e,"currentURL",s)
+var l=(0,r.getOwner)(e).lookup("controller:application")
+l&&o.APP_CTRL_ROUTER_PROPS&&("currentPath"in l||Object.defineProperty(l,"currentPath",{get:()=>(0,t.get)(e,"currentPath")}),(0,t.notifyPropertyChange)(l,"currentPath"),"currentRouteName"in l||Object.defineProperty(l,"currentRouteName",{get:()=>(0,t.get)(e,"currentRouteName")}),(0,t.notifyPropertyChange)(l,"currentRouteName"))}}function A(e,t){var r=new f.default(t,t._routerMicrolib,e[p.STATE_SYMBOL])
+t.currentState||t.set("currentState",r),t.set("targetState",r),e.promise=e.catch(e=>{if(!t._isErrorHandled(e))throw e
+t._clearHandledError(e)},"Transition Error")}function P(e,t,r,n){var i=e._queryParamsFor(t)
+for(var o in r){if(Object.prototype.hasOwnProperty.call(r,o))n(o,r[o],i.map[o])}}function C(e,t){if(e)for(var r=[e];r.length>0;){var n=r.shift()
+if(n.render.name===t)return n
+var i=n.outlets
+for(var o in i)r.push(i[o])}}function k(e,r,n){var i,o={render:n,outlets:Object.create(null),wasUsed:!1}
+return(i=n.into?C(e,n.into):r)?(0,t.set)(i.outlets,n.outlet,o):e=o,{liveRoutes:e,ownState:o}}function R(e,t,{routeName:r}){var n=C(e,r)
+return n||(t.outlets.main={render:{name:r,outlet:"main"},outlets:{}},t)}y.reopenClass({map(e){return this.dslCallbacks||(this.dslCallbacks=[],this.reopenClass({dslCallbacks:this.dslCallbacks})),this.dslCallbacks.push(e),this},_routePath(e){var t,r,n=[]
+function i(e,t){for(var r=0;r<e.length;++r)if(e[r]!==t[r])return!1
+return!0}for(var o=1;o<e.length;o++){for(t=e[o].name.split("."),r=b.call(n);r.length&&!i(r,t);)r.shift()
+n.push(...t.slice(r.length))}return n.join(".")}}),y.reopen(n.Evented,{didTransition:m,willTransition:v,rootURL:"/",location:"hash",url:(0,t.computed)((function(){var e=(0,t.get)(this,"location")
+if("string"!=typeof e)return e.getURL()}))}),o.ROUTER_EVENTS&&y.reopen(h.ROUTER_EVENT_DEPRECATIONS)
+var j=y
+e.default=j})),e("@ember/-internals/routing/lib/system/router_state",["exports","@ember/polyfills","@ember/-internals/routing/lib/utils"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=class{constructor(e,t,r){this.emberRouter=e,this.router=t,this.routerJsState=r}isActiveIntent(e,n,i,o){var a=this.routerJsState
+if(!this.router.isActiveIntent(e,n,void 0,a))return!1
+if(o&&Object.keys(i).length>0){var s=(0,t.assign)({},i)
+return this.emberRouter._prepareQueryParams(e,n,s),(0,r.shallowEqual)(s,a.queryParams)}return!0}}})),e("@ember/-internals/routing/lib/system/transition",[],(function(){})),e("@ember/-internals/routing/lib/utils",["exports","@ember/-internals/metal","@ember/-internals/owner","@ember/error","@ember/polyfills","router_js"],(function(e,t,r,n,i,o){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.extractRouteArgs=function(e){var t,r=(e=e.slice())[e.length-1]
+t=r&&Object.prototype.hasOwnProperty.call(r,"queryParams")?e.pop().queryParams:{}
+return{routeName:e.shift(),models:e,queryParams:t}},e.getActiveTargetName=function(e){var t=e.activeTransition?e.activeTransition[o.STATE_SYMBOL].routeInfos:e.state.routeInfos
+return t[t.length-1].name},e.stashParamNames=function(e,t){if(t._namesStashed)return
+for(var r,n=t[t.length-1].name,i=e._routerMicrolib.recognizer.handlersFor(n),o=0;o<t.length;++o){var a=t[o],s=i[o].names
+s.length&&(r=a),a._names=s,a.route._stashNames(a,r)}t._namesStashed=!0},e.calculateCacheKey=function(e,r=[],n){for(var i="",o=0;o<r.length;++o){var l=r[o],u=s(e,l),c=void 0
+if(n)if(u&&u in n){var d=0===l.indexOf(u)?l.substr(u.length+1):l
+c=(0,t.get)(n[u],d)}else c=(0,t.get)(n,l)
+i+=`::${l}:${c}`}return e+i.replace(a,"-")},e.normalizeControllerQueryParams=function(e){for(var t={},r=0;r<e.length;++r)l(e[r],t)
+return t},e.resemblesURL=u,e.prefixRouteNameArg=function(e,t){var i=t[0],o=(0,r.getOwner)(e),a=o.mountPoint
+if(o.routable&&"string"==typeof i){if(u(i))throw new n.default("Programmatic transitions by URL cannot be used within an Engine. Please use the route name instead.")
+i=`${a}.${i}`,t[0]=i}return t},e.shallowEqual=function(e,t){var r,n=0,i=0
+for(r in e)if(Object.prototype.hasOwnProperty.call(e,r)){if(e[r]!==t[r])return!1
+n++}for(r in t)Object.prototype.hasOwnProperty.call(t,r)&&i++
+return n===i}
+var a=/\./g
+function s(e,t){for(var r=e.split("."),n="",i=0;i<r.length;i++){var o=r.slice(0,i+1).join(".")
+if(0!==t.indexOf(o))break
+n=o}return n}function l(e,t){var r,n=e
+for(var o in"string"==typeof n&&((r={})[n]={as:null},n=r),n){if(!Object.prototype.hasOwnProperty.call(n,o))return
+var a=n[o]
+"string"==typeof a&&(a={as:a}),r=t[o]||{as:null,scope:"model"},(0,i.assign)(r,a),t[o]=r}}function u(e){return"string"==typeof e&&(""===e||"/"===e[0])}})),e("@ember/-internals/runtime/index",["exports","@ember/-internals/runtime/lib/system/object","@ember/-internals/runtime/lib/mixins/registry_proxy","@ember/-internals/runtime/lib/mixins/container_proxy","@ember/-internals/runtime/lib/copy","@ember/-internals/runtime/lib/compare","@ember/-internals/runtime/lib/is-equal","@ember/-internals/runtime/lib/mixins/array","@ember/-internals/runtime/lib/mixins/comparable","@ember/-internals/runtime/lib/system/namespace","@ember/-internals/runtime/lib/system/array_proxy","@ember/-internals/runtime/lib/system/object_proxy","@ember/-internals/runtime/lib/system/core_object","@ember/-internals/runtime/lib/mixins/action_handler","@ember/-internals/runtime/lib/mixins/copyable","@ember/-internals/runtime/lib/mixins/enumerable","@ember/-internals/runtime/lib/mixins/-proxy","@ember/-internals/runtime/lib/mixins/observable","@ember/-internals/runtime/lib/mixins/mutable_enumerable","@ember/-internals/runtime/lib/mixins/target_action_support","@ember/-internals/runtime/lib/mixins/evented","@ember/-internals/runtime/lib/mixins/promise_proxy","@ember/-internals/runtime/lib/ext/rsvp","@ember/-internals/runtime/lib/type-of","@ember/-internals/runtime/lib/ext/function"],(function(e,t,r,n,i,o,a,s,l,u,c,d,h,f,p,m,v,g,b,y,_,w,E,x){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"Object",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"FrameworkObject",{enumerable:!0,get:function(){return t.FrameworkObject}}),Object.defineProperty(e,"RegistryProxyMixin",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"ContainerProxyMixin",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"copy",{enumerable:!0,get:function(){return i.default}}),Object.defineProperty(e,"compare",{enumerable:!0,get:function(){return o.default}}),Object.defineProperty(e,"isEqual",{enumerable:!0,get:function(){return a.default}}),Object.defineProperty(e,"Array",{enumerable:!0,get:function(){return s.default}}),Object.defineProperty(e,"NativeArray",{enumerable:!0,get:function(){return s.NativeArray}}),Object.defineProperty(e,"A",{enumerable:!0,get:function(){return s.A}}),Object.defineProperty(e,"MutableArray",{enumerable:!0,get:function(){return s.MutableArray}}),Object.defineProperty(e,"removeAt",{enumerable:!0,get:function(){return s.removeAt}}),Object.defineProperty(e,"uniqBy",{enumerable:!0,get:function(){return s.uniqBy}}),Object.defineProperty(e,"isArray",{enumerable:!0,get:function(){return s.isArray}}),Object.defineProperty(e,"Comparable",{enumerable:!0,get:function(){return l.default}}),Object.defineProperty(e,"Namespace",{enumerable:!0,get:function(){return u.default}}),Object.defineProperty(e,"ArrayProxy",{enumerable:!0,get:function(){return c.default}}),Object.defineProperty(e,"ObjectProxy",{enumerable:!0,get:function(){return d.default}}),Object.defineProperty(e,"CoreObject",{enumerable:!0,get:function(){return h.default}}),Object.defineProperty(e,"ActionHandler",{enumerable:!0,get:function(){return f.default}}),Object.defineProperty(e,"Copyable",{enumerable:!0,get:function(){return p.default}}),Object.defineProperty(e,"Enumerable",{enumerable:!0,get:function(){return m.default}}),Object.defineProperty(e,"_ProxyMixin",{enumerable:!0,get:function(){return v.default}}),Object.defineProperty(e,"_contentFor",{enumerable:!0,get:function(){return v.contentFor}}),Object.defineProperty(e,"Observable",{enumerable:!0,get:function(){return g.default}}),Object.defineProperty(e,"MutableEnumerable",{enumerable:!0,get:function(){return b.default}}),Object.defineProperty(e,"TargetActionSupport",{enumerable:!0,get:function(){return y.default}}),Object.defineProperty(e,"Evented",{enumerable:!0,get:function(){return _.default}}),Object.defineProperty(e,"PromiseProxyMixin",{enumerable:!0,get:function(){return w.default}})
+Object.defineProperty(e,"RSVP",{enumerable:!0,get:function(){return E.default}}),Object.defineProperty(e,"onerrorDefault",{enumerable:!0,get:function(){return E.onerrorDefault}}),Object.defineProperty(e,"typeOf",{enumerable:!0,get:function(){return x.typeOf}})})),e("@ember/-internals/runtime/lib/compare",["exports","@ember/-internals/runtime/lib/type-of","@ember/-internals/runtime/lib/mixins/comparable"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function e(o,a){if(o===a)return 0
+var s=(0,t.typeOf)(o),l=(0,t.typeOf)(a)
+if("instance"===s&&r.default.detect(o)&&o.constructor.compare)return o.constructor.compare(o,a)
+if("instance"===l&&r.default.detect(a)&&a.constructor.compare)return-1*a.constructor.compare(a,o)
+var u=i(n[s],n[l])
+if(0!==u)return u
+switch(s){case"boolean":case"number":return i(o,a)
+case"string":return i(o.localeCompare(a),0)
+case"array":for(var c=o.length,d=a.length,h=Math.min(c,d),f=0;f<h;f++){var p=e(o[f],a[f])
+if(0!==p)return p}return i(c,d)
+case"instance":return r.default.detect(o)?o.compare(o,a):0
+case"date":return i(o.getTime(),a.getTime())
+default:return 0}}
+var n={undefined:0,null:1,boolean:2,number:3,string:4,array:5,object:6,instance:7,function:8,class:9,date:10}
+function i(e,t){var r=e-t
+return(r>0)-(r<0)}})),e("@ember/-internals/runtime/lib/copy",["exports","@ember/debug","@ember/-internals/runtime/lib/system/object","@ember/-internals/runtime/lib/mixins/copyable"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){if("object"!=typeof e||null===e)return e
+if(!Array.isArray(e)&&n.default.detect(e))return e.copy(t)
+return function e(t,r,i,o){if("object"!=typeof t||null===t)return t
+var a,s
+if(r&&(s=i.indexOf(t))>=0)return o[s]
+r&&i.push(t)
+if(Array.isArray(t)){if(a=t.slice(),r)for(o.push(a),s=a.length;--s>=0;)a[s]=e(a[s],r,i,o)}else if(n.default.detect(t))a=t.copy(r,i,o),r&&o.push(a)
+else if(t instanceof Date)a=new Date(t.getTime()),r&&o.push(a)
+else{var l
+for(l in a={},r&&o.push(a),t)Object.prototype.hasOwnProperty.call(t,l)&&"__"!==l.substring(0,2)&&(a[l]=r?e(t[l],r,i,o):t[l])}return a}(e,t,t?[]:null,t?[]:null)}})),e("@ember/-internals/runtime/lib/ext/function",["@ember/-internals/environment","@ember/-internals/metal","@ember/debug","@ember/deprecated-features"],(function(e,t,r,n){"use strict"
+n.FUNCTION_PROTOTYPE_EXTENSIONS&&e.ENV.EXTEND_PROTOTYPES.Function&&Object.defineProperties(Function.prototype,{property:{configurable:!0,enumerable:!1,writable:!0,value:function(){return(0,t.computed)(...arguments,this)}},observes:{configurable:!0,enumerable:!1,writable:!0,value:function(){return(0,t.observer)(...arguments,this)}},on:{configurable:!0,enumerable:!1,writable:!0,value:function(){return(0,t.on)(...arguments,this)}}})})),e("@ember/-internals/runtime/lib/ext/rsvp",["exports","rsvp","@ember/runloop","@ember/-internals/error-handling","@ember/debug"],(function(e,t,r,n){"use strict"
+function i(e){var t=function(e){if(!e)return
+if(e.errorThrown)return function(e){var t=e.errorThrown
+"string"==typeof t&&(t=new Error(t))
+return Object.defineProperty(t,"__reason_with_error_thrown__",{value:e,enumerable:!1}),t}(e)
+if("UnrecognizedURLError"===e.name)return
+if("TransitionAborted"===e.name)return
+return e}(e)
+if(t){var r=(0,n.getDispatchOverride)()
+if(!r)throw t
+r(t)}}Object.defineProperty(e,"__esModule",{value:!0}),e.onerrorDefault=i,e.default=void 0,t.configure("async",(e,t)=>{r.backburner.schedule("actions",null,e,t)}),t.configure("after",e=>{r.backburner.schedule(r._rsvpErrorQueue,null,e)}),t.on("error",i)
+var o=t
+e.default=o})),e("@ember/-internals/runtime/lib/is-equal",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){if(e&&"function"==typeof e.isEqual)return e.isEqual(t)
+if(e instanceof Date&&t instanceof Date)return e.getTime()===t.getTime()
+return e===t}})),e("@ember/-internals/runtime/lib/mixins/-proxy",["exports","@ember/-internals/meta","@ember/-internals/metal","@ember/-internals/utils","@ember/debug","@glimmer/validator"],(function(e,t,r,n,i,o){"use strict"
+function a(e){var t=(0,r.get)(e,"content")
+return(0,o.updateTag)((0,r.tagForObject)(e),(0,r.tagForObject)(t)),t}Object.defineProperty(e,"__esModule",{value:!0}),e.contentFor=a,e.default=void 0
+var s=r.Mixin.create({content:null,init(){this._super(...arguments),(0,n.setProxy)(this),(0,r.tagForObject)(this)},willDestroy(){this.set("content",null),this._super(...arguments)},isTruthy:(0,r.computed)("content",(function(){return Boolean((0,r.get)(this,"content"))})),[r.CUSTOM_TAG_FOR](e,t){var i=(0,o.tagMetaFor)(this),s=(0,o.tagFor)(this,e,i)
+if(e in this)return s
+var l=[s,(0,o.tagFor)(this,"content",i)],u=a(this)
+return(0,n.isObject)(u)&&l.push((0,r.tagForProperty)(u,e,t)),(0,o.combine)(l)},unknownProperty(e){var t=a(this)
+if(t)return(0,r.get)(t,e)},setUnknownProperty(e,n){var i=(0,t.meta)(this)
+if(i.isInitializing()||i.isPrototypeMeta(this))return(0,r.defineProperty)(this,e,null,n),n
+var o=a(this)
+return(0,r.set)(o,e,n)}})
+e.default=s})),e("@ember/-internals/runtime/lib/mixins/action_handler",["exports","@ember/-internals/metal","@ember/debug"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.Mixin.create({mergedProperties:["actions"],send(e,...r){if(this.actions&&this.actions[e]&&!(!0===this.actions[e].apply(this,r)))return
+var n=(0,t.get)(this,"target")
+n&&n.send(...arguments)}})
+e.default=r})),e("@ember/-internals/runtime/lib/mixins/array",["exports","@ember/-internals/metal","@ember/-internals/utils","@ember/debug","@ember/-internals/runtime/lib/mixins/enumerable","@ember/-internals/runtime/lib/compare","@ember/-internals/environment","@ember/-internals/runtime/lib/mixins/observable","@ember/-internals/runtime/lib/mixins/mutable_enumerable","@ember/-internals/runtime/lib/type-of"],(function(e,t,r,n,i,o,a,s,l,u){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.uniqBy=h,e.removeAt=y,e.isArray=w,e.default=e.MutableArray=e.NativeArray=e.A=void 0
+var c=Object.freeze([]),d=e=>e
+function h(e,r=d){var n=M(),i=new Set,o="function"==typeof r?r:e=>(0,t.get)(e,r)
+return e.forEach(e=>{var t=o(e)
+i.has(t)||(i.add(t),n.push(e))}),n}function f(e,r){var n=2===arguments.length
+return n?n=>r===(0,t.get)(n,e):r=>Boolean((0,t.get)(r,e))}function p(e,r,n){for(var i=e.length,o=n;o<i;o++){if(r((0,t.objectAt)(e,o),o,e))return o}return-1}function m(e,r,n){var i=p(e,r.bind(n),0)
+return-1===i?void 0:(0,t.objectAt)(e,i)}function v(e,t,r){return-1!==p(e,t.bind(r),0)}function g(e,t,r){var n=t.bind(r)
+return-1===p(e,(e,t,r)=>!n(e,t,r),0)}function b(e,t,r=0,n){var i=e.length
+return r<0&&(r+=i),p(e,n&&t!=t?e=>e!=e:e=>e===t,r)}function y(e,r,n=1){return(0,t.replace)(e,r,n,c),e}function _(e,r,n){return(0,t.replace)(e,r,0,[n]),n}function w(e){var t=e
+if(!t||t.setInterval)return!1
+if(Array.isArray(t)||O.detect(t))return!0
+var r=(0,u.typeOf)(t)
+if("array"===r)return!0
+var n=t.length
+return"number"==typeof n&&n==n&&"object"===r}function E(){var e=(0,t.computed)(...arguments)
+return e.enumerable=!1,e}function x(e){return this.map(r=>(0,t.get)(r,e))}var O=t.Mixin.create(i.default,{init(){this._super(...arguments),(0,r.setEmberArray)(this)},objectsAt(e){return e.map(e=>(0,t.objectAt)(this,e))},"[]":E({get(){return this},set(e,t){return this.replace(0,this.length,t),this}}),firstObject:E((function(){return(0,t.objectAt)(this,0)})).readOnly(),lastObject:E((function(){return(0,t.objectAt)(this,this.length-1)})).readOnly(),slice(e=0,r){var n=M(),i=this.length
+for(e<0&&(e=i+e),void 0===r||r>i?r=i:r<0&&(r=i+r);e<r;)n[n.length]=(0,t.objectAt)(this,e++)
+return n},indexOf(e,t){return b(this,e,t,!1)},lastIndexOf(e,r){var n=this.length;(void 0===r||r>=n)&&(r=n-1),r<0&&(r+=n)
+for(var i=r;i>=0;i--)if((0,t.objectAt)(this,i)===e)return i
+return-1},addArrayObserver(e,r){return(0,t.addArrayObserver)(this,e,r)},removeArrayObserver(e,r){return(0,t.removeArrayObserver)(this,e,r)},hasArrayObservers:(0,t.nativeDescDecorator)({configurable:!0,enumerable:!1,get(){return(0,t.hasListeners)(this,"@array:change")||(0,t.hasListeners)(this,"@array:before")}}),arrayContentWillChange(e,r,n){return(0,t.arrayContentWillChange)(this,e,r,n)},arrayContentDidChange(e,r,n){return(0,t.arrayContentDidChange)(this,e,r,n)},forEach(e,t=null){for(var r=this.length,n=0;n<r;n++){var i=this.objectAt(n)
+e.call(t,i,n,this)}return this},getEach:x,setEach(e,r){return this.forEach(n=>(0,t.set)(n,e,r))},map(e,t=null){var r=M()
+return this.forEach((n,i,o)=>r[i]=e.call(t,n,i,o)),r},mapBy:x,filter(e,t=null){var r=M()
+return this.forEach((n,i,o)=>{e.call(t,n,i,o)&&r.push(n)}),r},reject(e,t=null){return this.filter((function(){return!e.apply(t,arguments)}))},filterBy(){return this.filter(f(...arguments))},rejectBy(){return this.reject(f(...arguments))},find(e,t=null){return m(this,e,t)},findBy(){return m(this,f(...arguments))},every(e,t=null){return g(this,e,t)},isEvery(){return g(this,f(...arguments))},any(e,t=null){return v(this,e,t)},isAny(){return v(this,f(...arguments))},reduce(e,t){var r=t
+return this.forEach((function(t,n){r=e(r,t,n,this)}),this),r},invoke(e,...t){var n=M()
+return this.forEach(i=>n.push((0,r.tryInvoke)(i,e,t))),n},toArray(){return this.map(e=>e)},compact(){return this.filter(e=>null!=e)},includes(e,t){return-1!==b(this,e,t,!0)},sortBy(){var e=arguments
+return this.toArray().sort((r,n)=>{for(var i=0;i<e.length;i++){var a=e[i],s=(0,t.get)(r,a),l=(0,t.get)(n,a),u=(0,o.default)(s,l)
+if(u)return u}return 0})},uniq(){return h(this)},uniqBy(e){return h(this,e)},without(e){if(!this.includes(e))return this
+var t=e==e?t=>t!==e:e=>e==e
+return this.filter(t)}}),S=t.Mixin.create(O,l.default,{clear(){var e=this.length
+return 0===e||this.replace(0,e,c),this},insertAt(e,t){return _(this,e,t),this},removeAt(e,t){return y(this,e,t)},pushObject(e){return _(this,this.length,e)},pushObjects(e){return this.replace(this.length,0,e),this},popObject(){var e=this.length
+if(0===e)return null
+var r=(0,t.objectAt)(this,e-1)
+return this.removeAt(e-1,1),r},shiftObject(){if(0===this.length)return null
+var e=(0,t.objectAt)(this,0)
+return this.removeAt(0),e},unshiftObject(e){return _(this,0,e)},unshiftObjects(e){return this.replace(0,0,e),this},reverseObjects(){var e=this.length
+if(0===e)return this
+var t=this.toArray().reverse()
+return this.replace(0,e,t),this},setObjects(e){if(0===e.length)return this.clear()
+var t=this.length
+return this.replace(0,t,e),this},removeObject(e){for(var r=this.length||0;--r>=0;){(0,t.objectAt)(this,r)===e&&this.removeAt(r)}return this},removeObjects(e){(0,t.beginPropertyChanges)()
+for(var r=e.length-1;r>=0;r--)this.removeObject(e[r])
+return(0,t.endPropertyChanges)(),this},addObject(e){return this.includes(e)||this.pushObject(e),this},addObjects(e){return(0,t.beginPropertyChanges)(),e.forEach(e=>this.addObject(e)),(0,t.endPropertyChanges)(),this}})
+e.MutableArray=S
+var T=t.Mixin.create(S,s.default,{objectAt(e){return this[e]},replace(e,r,n=c){return(0,t.replaceInNativeArray)(this,e,r,n),this}})
+e.NativeArray=T
+var M,A=["length"]
+T.keys().forEach(e=>{Array.prototype[e]&&A.push(e)}),e.NativeArray=T=T.without(...A),e.A=M,a.ENV.EXTEND_PROTOTYPES.Array?(T.apply(Array.prototype,!0),e.A=M=function(e){return e||[]}):e.A=M=function(e){return e||(e=[]),O.detect(e)?e:T.apply(e)}
+var P=O
+e.default=P})),e("@ember/-internals/runtime/lib/mixins/comparable",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.Mixin.create({compare:null})
+e.default=r})),e("@ember/-internals/runtime/lib/mixins/container_proxy",["exports","@ember/runloop","@ember/-internals/metal"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n={__container__:null,ownerInjection(){return this.__container__.ownerInjection()},lookup(e,t){return this.__container__.lookup(e,t)},destroy(){var e=this.__container__
+e&&(0,t.join)(()=>{e.destroy(),(0,t.schedule)("destroy",e,"finalizeDestroy")}),this._super()},factoryFor(e,t={}){return this.__container__.factoryFor(e,t)}},i=r.Mixin.create(n)
+e.default=i})),e("@ember/-internals/runtime/lib/mixins/copyable",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.Mixin.create({copy:null})
+e.default=r})),e("@ember/-internals/runtime/lib/mixins/enumerable",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.Mixin.create()
+e.default=r})),e("@ember/-internals/runtime/lib/mixins/evented",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.Mixin.create({on(e,r,n){return(0,t.addListener)(this,e,r,n),this},one(e,r,n){return(0,t.addListener)(this,e,r,n,!0),this},trigger(e,...r){(0,t.sendEvent)(this,e,r)},off(e,r,n){return(0,t.removeListener)(this,e,r,n),this},has(e){return(0,t.hasListeners)(this,e)}})
+e.default=r})),e("@ember/-internals/runtime/lib/mixins/mutable_enumerable",["exports","@ember/-internals/runtime/lib/mixins/enumerable","@ember/-internals/metal"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=r.Mixin.create(t.default)
+e.default=n})),e("@ember/-internals/runtime/lib/mixins/observable",["exports","@ember/-internals/meta","@ember/-internals/metal","@ember/debug"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=r.Mixin.create({get(e){return(0,r.get)(this,e)},getProperties(...e){return(0,r.getProperties)(...[this].concat(e))},set(e,t){return(0,r.set)(this,e,t)},setProperties(e){return(0,r.setProperties)(this,e)},beginPropertyChanges(){return(0,r.beginPropertyChanges)(),this},endPropertyChanges(){return(0,r.endPropertyChanges)(),this},notifyPropertyChange(e){return(0,r.notifyPropertyChange)(this,e),this},addObserver(e,t,n,i){return(0,r.addObserver)(this,e,t,n,i),this},removeObserver(e,t,n,i){return(0,r.removeObserver)(this,e,t,n,i),this},hasObserverFor(e){return(0,r.hasListeners)(this,e+":change")},getWithDefault(e,t){return(0,r.getWithDefault)(this,e,t)},incrementProperty(e,t=1){return(0,r.set)(this,e,(parseFloat((0,r.get)(this,e))||0)+t)},decrementProperty(e,t=1){return(0,r.set)(this,e,((0,r.get)(this,e)||0)-t)},toggleProperty(e){return(0,r.set)(this,e,!(0,r.get)(this,e))},cacheFor(e){var r=(0,t.peekMeta)(this)
+if(null!==r)return r.valueFor(e)}})
+e.default=n})),e("@ember/-internals/runtime/lib/mixins/promise_proxy",["exports","@ember/-internals/metal","@ember/error"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=t.Mixin.create({reason:null,isPending:(0,t.computed)("isSettled",(function(){return!(0,t.get)(this,"isSettled")})).readOnly(),isSettled:(0,t.computed)("isRejected","isFulfilled",(function(){return(0,t.get)(this,"isRejected")||(0,t.get)(this,"isFulfilled")})).readOnly(),isRejected:!1,isFulfilled:!1,promise:(0,t.computed)({get(){throw new r.default("PromiseProxy's promise must be set")},set(e,r){return function(e,r){return(0,t.setProperties)(e,{isFulfilled:!1,isRejected:!1}),r.then(r=>(e.isDestroyed||e.isDestroying||(0,t.setProperties)(e,{content:r,isFulfilled:!0}),r),r=>{throw e.isDestroyed||e.isDestroying||(0,t.setProperties)(e,{reason:r,isRejected:!0}),r},"Ember: PromiseProxy")}(this,r)}}),then:i("then"),catch:i("catch"),finally:i("finally")})
+function i(e){return function(){var r=(0,t.get)(this,"promise")
+return r[e](...arguments)}}e.default=n})),e("@ember/-internals/runtime/lib/mixins/registry_proxy",["exports","@ember/debug","@ember/-internals/metal"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=r.Mixin.create({__registry__:null,resolveRegistration(e,t){return this.__registry__.resolve(e,t)},register:i("register"),unregister:i("unregister"),hasRegistration:i("has"),registeredOption:i("getOption"),registerOptions:i("options"),registeredOptions:i("getOptions"),registerOptionsForType:i("optionsForType"),registeredOptionsForType:i("getOptionsForType"),inject:i("injection")})
+function i(e){return function(){return this.__registry__[e](...arguments)}}e.default=n})),e("@ember/-internals/runtime/lib/mixins/target_action_support",["exports","@ember/-internals/environment","@ember/-internals/metal","@ember/debug"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=r.Mixin.create({target:null,action:null,actionContext:null,actionContextObject:(0,r.computed)("actionContext",(function(){var e=(0,r.get)(this,"actionContext")
+if("string"==typeof e){var n=(0,r.get)(this,e)
+return void 0===n&&(n=(0,r.get)(t.context.lookup,e)),n}return e})),triggerAction(e={}){var{action:n,target:i,actionContext:o}=e
+if((n=n||(0,r.get)(this,"action"),i=i||function(e){var n=(0,r.get)(e,"target")
+if(n){if("string"==typeof n){var i=(0,r.get)(e,n)
+return void 0===i&&(i=(0,r.get)(t.context.lookup,n)),i}return n}if(e._target)return e._target
+return null}(this),void 0===o&&(o=(0,r.get)(this,"actionContextObject")||this),i&&n)&&!1!==(i.send?i.send(...[n].concat(o)):i[n](...[].concat(o))))return!0
+return!1}})
+e.default=n})),e("@ember/-internals/runtime/lib/system/array_proxy",["exports","@ember/-internals/metal","@ember/-internals/utils","@ember/-internals/runtime/lib/system/object","@ember/-internals/runtime/lib/mixins/array","@ember/debug","@glimmer/validator"],(function(e,t,r,n,i,o,a){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var s={willChange:"_arrangedContentArrayWillChange",didChange:"_arrangedContentArrayDidChange"}
+class l extends n.default{init(){super.init(...arguments),this._objectsDirtyIndex=0,this._objects=null,this._lengthDirty=!0,this._length=0,this._arrangedContent=null,this._arrangedContentIsUpdating=!1,this._arrangedContentTag=null,this._arrangedContentRevision=null,this._lengthTag=null,this._arrTag=null}[t.PROPERTY_DID_CHANGE](){this._revalidate()}[t.CUSTOM_TAG_FOR](e){return"[]"===e?(this._revalidate(),this._arrTag):"length"===e?(this._revalidate(),this._lengthTag):(0,a.tagFor)(this,e)}willDestroy(){this._removeArrangedContentArrayObserver()}objectAtContent(e){return(0,t.objectAt)((0,t.get)(this,"arrangedContent"),e)}replace(e,t,r){this.replaceContent(e,t,r)}replaceContent(e,r,n){(0,t.get)(this,"content").replace(e,r,n)}objectAt(e){if(this._revalidate(),null===this._objects&&(this._objects=[]),-1!==this._objectsDirtyIndex&&e>=this._objectsDirtyIndex){var r=(0,t.get)(this,"arrangedContent")
+if(r)for(var n=this._objects.length=(0,t.get)(r,"length"),i=this._objectsDirtyIndex;i<n;i++)this._objects[i]=this.objectAtContent(i)
+else this._objects.length=0
+this._objectsDirtyIndex=-1}return this._objects[e]}get length(){if(this._revalidate(),this._lengthDirty){var e=(0,t.get)(this,"arrangedContent")
+this._length=e?(0,t.get)(e,"length"):0,this._lengthDirty=!1}return(0,a.consumeTag)(this._lengthTag),this._length}set length(e){var r,n=this.length-e
+if(0!==n){n<0&&(r=new Array(-n),n=0)
+var i=(0,t.get)(this,"content")
+i&&((0,t.replace)(i,e,n,r),this._invalidate())}}_updateArrangedContentArray(e){var r=null===this._objects?0:this._objects.length,n=e?(0,t.get)(e,"length"):0
+this._removeArrangedContentArrayObserver(),this.arrayContentWillChange(0,r,n),this._invalidate(),this.arrayContentDidChange(0,r,n),this._addArrangedContentArrayObserver(e)}_addArrangedContentArrayObserver(e){e&&!e.isDestroyed&&((0,t.addArrayObserver)(e,this,s),this._arrangedContent=e)}_removeArrangedContentArrayObserver(){this._arrangedContent&&(0,t.removeArrayObserver)(this._arrangedContent,this,s)}_arrangedContentArrayWillChange(){}_arrangedContentArrayDidChange(e,r,n,i){this.arrayContentWillChange(r,n,i)
+var o=r
+o<0&&(o+=(0,t.get)(this._arrangedContent,"length")+n-i);(-1===this._objectsDirtyIndex||this._objectsDirtyIndex>o)&&(this._objectsDirtyIndex=o),this._lengthDirty=!0,this.arrayContentDidChange(r,n,i)}_invalidate(){this._objectsDirtyIndex=0,this._lengthDirty=!0}_revalidate(){if(!0!==this._arrangedContentIsUpdating&&(null===this._arrangedContentTag||!(0,a.validateTag)(this._arrangedContentTag,this._arrangedContentRevision))){var e=this.get("arrangedContent")
+null===this._arrangedContentTag?this._addArrangedContentArrayObserver(e):(this._arrangedContentIsUpdating=!0,this._updateArrangedContentArray(e),this._arrangedContentIsUpdating=!1)
+var n=this._arrangedContentTag=(0,a.tagFor)(this,"arrangedContent")
+this._arrangedContentRevision=(0,a.valueForTag)(this._arrangedContentTag),(0,r.isObject)(e)?(this._lengthTag=(0,a.combine)([n,(0,t.tagForProperty)(e,"length")]),this._arrTag=(0,a.combine)([n,(0,t.tagForProperty)(e,"[]")])):this._lengthTag=this._arrTag=n}}}e.default=l,l.reopen(i.MutableArray,{arrangedContent:(0,t.alias)("content"),arrayContentDidChange(e,r,n){return(0,t.arrayContentDidChange)(this,e,r,n,!1)}})})),e("@ember/-internals/runtime/lib/system/core_object",["exports","@ember/-internals/container","@ember/-internals/owner","@ember/polyfills","@ember/-internals/utils","@ember/-internals/meta","@ember/-internals/metal","@ember/-internals/runtime/lib/mixins/action_handler","@ember/debug","@glimmer/runtime"],(function(e,t,r,n,i,o,a,s,l,u){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var c=a.Mixin.prototype.reopen,d=new n._WeakSet,h=new WeakMap,f=new Set
+function p(e){f.has(e)||e.destroy()}function m(e,t){var r=(0,o.meta)(e)
+if(void 0!==t)for(var s=e.concatenatedProperties,l=e.mergedProperties,u=void 0!==s&&s.length>0,c=void 0!==l&&l.length>0,d=Object.keys(t),h=0;h<d.length;h++){var f=d[h],p=t[f],m=(0,a.descriptorForProperty)(e,f,r),v=void 0!==m
+if(!v){if(u&&s.indexOf(f)>-1){var g=e[f]
+p=g?(0,i.makeArray)(g).concat(p):(0,i.makeArray)(p)}if(c&&l.indexOf(f)>-1){var b=e[f]
+p=(0,n.assign)({},b,p)}}v?m.set(e,f,p):"function"!=typeof e.setUnknownProperty||f in e?e[f]=p:e.setUnknownProperty(f,p)}e.init(t),r.unsetInitializing()
+var y=r.observerEvents()
+if(void 0!==y)for(var _=0;_<y.length;_++)(0,a.activateObserver)(e,y[_].event,y[_].sync);(0,a.sendEvent)(e,"init",void 0,void 0,void 0,r)}class v{constructor(e){this[r.OWNER]=e,this.constructor.proto()
+var t=this;(0,u.registerDestructor)(t,p,!0),(0,u.registerDestructor)(t,()=>t.willDestroy()),(0,o.meta)(t).setInitializing()}set[r.LEGACY_OWNER](e){}reopen(...e){return(0,a.applyMixin)(this,e),this}init(){}get isDestroyed(){return(0,u.isDestroyed)(this)}set isDestroyed(e){}get isDestroying(){return(0,u.isDestroying)(this)}set isDestroying(e){}destroy(){f.add(this)
+try{(0,u.destroy)(this)}finally{f.delete(this)}return this}willDestroy(){}toString(){var e="function"==typeof this.toStringExtension?":"+this.toStringExtension():""
+return`<${(0,i.getName)(this)||(0,t.getFactoryFor)(this)||this.constructor.toString()}:${(0,i.guidFor)(this)}${e}>`}static extend(){var e=class extends(this){}
+return c.apply(e.PrototypeMixin,arguments),e}static create(e,n){var i
+return void 0!==e?(i=new this((0,r.getOwner)(e)),(0,t.setFactoryFor)(i,(0,t.getFactoryFor)(e))):i=new this,m(i,void 0===n?e:g.apply(this,arguments)),i}static reopen(){return this.willReopen(),c.apply(this.PrototypeMixin,arguments),this}static willReopen(){var e=this.prototype
+d.has(e)&&(d.delete(e),h.has(this)&&h.set(this,a.Mixin.create(this.PrototypeMixin)))}static reopenClass(){return(0,a.applyMixin)(this,arguments),this}static detect(e){if("function"!=typeof e)return!1
+for(;e;){if(e===this)return!0
+e=e.superclass}return!1}static detectInstance(e){return e instanceof this}static metaForProperty(e){var t=this.proto(),r=(0,a.descriptorForProperty)(t,e)
+return r._meta||{}}static eachComputedProperty(e,t=this){this.proto()
+var r={};(0,o.meta)(this.prototype).forEachDescriptors((n,i)=>{if(i.enumerable){var o=i._meta||r
+e.call(t,n,o)}})}static get PrototypeMixin(){var e=h.get(this)
+return void 0===e&&((e=a.Mixin.create()).ownerConstructor=this,h.set(this,e)),e}static get superclass(){var e=Object.getPrototypeOf(this)
+return e!==Function.prototype?e:void 0}static proto(){var e=this.prototype
+if(!d.has(e)){d.add(e)
+var t=this.superclass
+t&&t.proto(),h.has(this)&&this.PrototypeMixin.apply(e)}return e}}function g(...e){for(var{concatenatedProperties:t,mergedProperties:r}=this,o=void 0!==t&&t.length>0,a=void 0!==r&&r.length>0,s={},l=0;l<e.length;l++)for(var u=e[l],c=Object.keys(u),d=0,h=c.length;d<h;d++){var f=c[d],p=u[f]
+if(o&&t.indexOf(f)>-1){var m=s[f]
+p=m?(0,i.makeArray)(m).concat(p):(0,i.makeArray)(p)}if(a&&r.indexOf(f)>-1){var v=s[f]
+p=(0,n.assign)({},v,p)}s[f]=p}return s}if(v.toString=a.classToString,(0,i.setName)(v,"Ember.CoreObject"),v.isClass=!0,v.isMethod=!1,!i.HAS_NATIVE_SYMBOL){var b=new WeakMap,y=new WeakMap
+Object.defineProperty(v.prototype,r.OWNER,{get(){return b.get(this)},set(e){b.set(this,e)}}),Object.defineProperty(v.prototype,t.INIT_FACTORY,{get(){return y.get(this)},set(e){y.set(this,e)}})}var _=v
+e.default=_})),e("@ember/-internals/runtime/lib/system/namespace",["exports","@ember/-internals/metal","@ember/-internals/utils","@ember/-internals/runtime/lib/system/object"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class i extends n.default{init(){(0,t.addNamespace)(this)}toString(){var e=(0,t.get)(this,"name")||(0,t.get)(this,"modulePrefix")
+return e||((0,t.findNamespaces)(),void 0===(e=(0,r.getName)(this))&&(e=(0,r.guidFor)(this),(0,r.setName)(this,e)),e)}nameClasses(){(0,t.processNamespace)(this)}destroy(){(0,t.removeNamespace)(this),super.destroy()}}e.default=i,i.prototype.isNamespace=!0,i.NAMESPACES=t.NAMESPACES,i.NAMESPACES_BY_ID=t.NAMESPACES_BY_ID,i.processAll=t.processAllNamespaces,i.byName=t.findNamespace})),e("@ember/-internals/runtime/lib/system/object",["exports","@ember/-internals/container","@ember/-internals/utils","@ember/-internals/metal","@ember/-internals/runtime/lib/system/core_object","@ember/-internals/runtime/lib/mixins/observable","@ember/debug"],(function(e,t,r,n,i,o){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.FrameworkObject=e.default=void 0
+class a extends i.default{get _debugContainerKey(){var e=(0,t.getFactoryFor)(this)
+return void 0!==e&&e.fullName}}var s
+e.default=a,(0,r.setName)(a,"Ember.Object"),o.default.apply(a.prototype),e.FrameworkObject=s,e.FrameworkObject=s=class extends i.default{get _debugContainerKey(){var e=(0,t.getFactoryFor)(this)
+return void 0!==e&&e.fullName}},o.default.apply(s.prototype)}))
+e("@ember/-internals/runtime/lib/system/object_proxy",["exports","@ember/-internals/runtime/lib/system/object","@ember/-internals/runtime/lib/mixins/-proxy"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{}e.default=n,n.PrototypeMixin.reopen(r.default)})),e("@ember/-internals/runtime/lib/type-of",["exports","@ember/-internals/runtime/lib/system/core_object"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.typeOf=function(e){if(null===e)return"null"
+if(void 0===e)return"undefined"
+var i=r[n.call(e)]||"object"
+"function"===i?t.default.detect(e)&&(i="class"):"object"===i&&(e instanceof Error?i="error":e instanceof t.default?i="instance":e instanceof Date&&(i="date"))
+return i}
+var r={"[object Boolean]":"boolean","[object Number]":"number","[object String]":"string","[object Function]":"function","[object AsyncFunction]":"function","[object Array]":"array","[object Date]":"date","[object RegExp]":"regexp","[object Object]":"object","[object FileList]":"filelist"},{toString:n}=Object.prototype})),e("@ember/-internals/utils/index",["exports","@ember/polyfills","@ember/debug"],(function(e,t){"use strict"
+function r(e){var t={}
+for(var r in t[e]=1,t)if(r===e)return r
+return e}function n(e){return null!==e&&("object"==typeof e||"function"==typeof e)}Object.defineProperty(e,"__esModule",{value:!0}),e.enumerableSymbol=d,e.isInternalSymbol=function(e){return-1!==c.indexOf(e)},e.dictionary=function(e){var t=Object.create(e)
+return t._dict=null,delete t._dict,t},e.uuid=o,e.generateGuid=function(e,t="ember"){var r=t+o()
+n(e)&&a.set(e,r)
+return r},e.guidFor=function(e){var t
+if(n(e))void 0===(t=a.get(e))&&(t="ember"+o(),a.set(e,t))
+else if(void 0===(t=s.get(e))){var r=typeof e
+t="string"===r?"st"+o():"number"===r?"nu"+o():"symbol"===r?"sy"+o():"("+e+")",s.set(e,t)}return t},e.intern=r,e.wrap=function(e,t){if(!_(e))return e
+if(!O.has(t)&&_(t))return S(e,S(t,y))
+return S(e,t)},e.observerListenerMetaFor=function(e){return E.get(e)},e.setObservers=function(e,t){x(e).observers=t},e.setListeners=function(e,t){x(e).listeners=t},e.inspect=function(e){if("number"==typeof e&&2===arguments.length)return this
+return R(e,0)},e.lookupDescriptor=D,e.canInvoke=N,e.tryInvoke=function(e,t,r){if(N(e,t)){return e[t].apply(e,r)}},e.makeArray=function(e){if(null==e)return[]
+return I(e)?e:[e]},e.getName=function(e){return L.get(e)},e.setName=function(e,t){n(e)&&L.set(e,t)},e.toString=function e(t){if("string"==typeof t)return t
+if(null===t)return"null"
+if(void 0===t)return"undefined"
+if(Array.isArray(t)){for(var r="",n=0;n<t.length;n++)n>0&&(r+=","),z(t[n])||(r+=e(t[n]))
+return r}if("function"==typeof t.toString)return t.toString()
+return F.call(t)},e.isObject=n,e.isProxy=function(e){if(n(e))return H.has(e)
+return!1},e.setProxy=function(e){n(e)&&H.add(e)},e.setEmberArray=function(e){q.add(e)},e.isEmberArray=function(e){return q.has(e)},e.setWithMandatorySetter=e.teardownMandatorySetter=e.setupMandatorySetter=e.Cache=e.HAS_NATIVE_PROXY=e.HAS_NATIVE_SYMBOL=e.ROOT=e.checkHasSuper=e.GUID_KEY=e.getDebugName=e.symbol=void 0
+var i=0
+function o(){return++i}var a=new WeakMap,s=new Map,l=r("__ember"+Date.now())
+e.GUID_KEY=l
+var u="function"==typeof Symbol&&"symbol"==typeof Symbol()
+e.HAS_NATIVE_SYMBOL=u
+var c=[]
+function d(e){var t=r(`__${e}${l+Math.floor(Math.random()*Date.now())}__`)
+return t}var h,f=u?Symbol:d
+e.symbol=f
+var p=h
+e.getDebugName=p
+var m=/\.(_super|call\(this|apply\(this)/,v=Function.prototype.toString,g=v.call((function(){return this})).indexOf("return this")>-1?function(e){return m.test(v.call(e))}:function(){return!0}
+e.checkHasSuper=g
+var b=new WeakMap,y=Object.freeze((function(){}))
+function _(e){var t=b.get(e)
+return void 0===t&&(t=g(e),b.set(e,t)),t}e.ROOT=y,b.set(y,!1)
+class w{constructor(){this.listeners=void 0,this.observers=void 0}}var E=new WeakMap
+function x(e){var t=E.get(e)
+return void 0===t&&(t=new w,E.set(e,t)),t}var O=new t._WeakSet
+function S(e,t){function r(){var r=this._super
+this._super=t
+var n=e.apply(this,arguments)
+return this._super=r,n}O.add(r)
+var n=E.get(e)
+return void 0!==n&&E.set(r,n),r}var{toString:T}=Object.prototype,{toString:M}=Function.prototype,{isArray:A}=Array,{keys:P}=Object,{stringify:C}=JSON,k=/^[\w$]+$/
+function R(e,r,n){var i=!1
+switch(typeof e){case"undefined":return"undefined"
+case"object":if(null===e)return"null"
+if(A(e)){i=!0
+break}if(e.toString===T||void 0===e.toString)break
+return e.toString()
+case"function":return e.toString===M?e.name?`[Function:${e.name}]`:"[Function]":e.toString()
+case"string":return C(e)
+case"symbol":case"boolean":case"number":default:return e.toString()}if(void 0===n)n=new t._WeakSet
+else if(n.has(e))return"[Circular]"
+return n.add(e),i?function(e,t,r){if(t>4)return"[Array]"
+for(var n="[",i=0;i<e.length;i++){if(n+=0===i?" ":", ",i>=100){n+=`... ${e.length-100} more items`
+break}n+=R(e[i],t,r)}return n+=" ]"}(e,r+1,n):function(e,t,r){if(t>4)return"[Object]"
+for(var n="{",i=P(e),o=0;o<i.length;o++){if(n+=0===o?" ":", ",o>=100){n+=`... ${i.length-100} more keys`
+break}var a=i[o]
+n+=j(a)+": "+R(e[a],t,r)}return n+=" }"}(e,r+1,n)}function j(e){return k.test(e)?e:C(e)}function D(e,t){var r=e
+do{var n=Object.getOwnPropertyDescriptor(r,t)
+if(void 0!==n)return n
+r=Object.getPrototypeOf(r)}while(null!==r)
+return null}function N(e,t){return null!=e&&"function"==typeof e[t]}var{isArray:I}=Array
+var L=new WeakMap
+var F=Object.prototype.toString
+function z(e){return null==e}var U="function"==typeof Proxy
+e.HAS_NATIVE_PROXY=U
+var H=new t._WeakSet
+e.Cache=class{constructor(e,t,r){this.limit=e,this.func=t,this.store=r,this.size=0,this.misses=0,this.hits=0,this.store=r||new Map}get(e){return this.store.has(e)?(this.hits++,this.store.get(e)):(this.misses++,this.set(e,this.func(e)))}set(e,t){return this.limit>this.size&&(this.size++,this.store.set(e,t)),t}purge(){this.store.clear(),this.size=0,this.hits=0,this.misses=0}}
+var B,V,$,q=new t._WeakSet
+e.setupMandatorySetter=B,e.teardownMandatorySetter=V,e.setWithMandatorySetter=$})),e("@ember/-internals/views/index",["exports","@ember/-internals/views/lib/system/jquery","@ember/-internals/views/lib/system/utils","@ember/-internals/views/lib/system/event_dispatcher","@ember/-internals/views/lib/component_lookup","@ember/-internals/views/lib/mixins/text_support","@ember/-internals/views/lib/views/core_view","@ember/-internals/views/lib/mixins/class_names_support","@ember/-internals/views/lib/mixins/child_views_support","@ember/-internals/views/lib/mixins/view_state_support","@ember/-internals/views/lib/mixins/view_support","@ember/-internals/views/lib/mixins/action_support","@ember/-internals/views/lib/compat/attrs","@ember/-internals/views/lib/system/action_manager"],(function(e,t,r,n,i,o,a,s,l,u,c,d,h,f){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"jQuery",{enumerable:!0,get:function(){return t.jQuery}}),Object.defineProperty(e,"jQueryDisabled",{enumerable:!0,get:function(){return t.jQueryDisabled}}),Object.defineProperty(e,"addChildView",{enumerable:!0,get:function(){return r.addChildView}}),Object.defineProperty(e,"isSimpleClick",{enumerable:!0,get:function(){return r.isSimpleClick}}),Object.defineProperty(e,"getViewBounds",{enumerable:!0,get:function(){return r.getViewBounds}}),Object.defineProperty(e,"getViewClientRects",{enumerable:!0,get:function(){return r.getViewClientRects}}),Object.defineProperty(e,"getViewBoundingClientRect",{enumerable:!0,get:function(){return r.getViewBoundingClientRect}}),Object.defineProperty(e,"getRootViews",{enumerable:!0,get:function(){return r.getRootViews}}),Object.defineProperty(e,"getChildViews",{enumerable:!0,get:function(){return r.getChildViews}}),Object.defineProperty(e,"getViewId",{enumerable:!0,get:function(){return r.getViewId}}),Object.defineProperty(e,"getElementView",{enumerable:!0,get:function(){return r.getElementView}}),Object.defineProperty(e,"getViewElement",{enumerable:!0,get:function(){return r.getViewElement}}),Object.defineProperty(e,"setElementView",{enumerable:!0,get:function(){return r.setElementView}}),Object.defineProperty(e,"setViewElement",{enumerable:!0,get:function(){return r.setViewElement}}),Object.defineProperty(e,"clearElementView",{enumerable:!0,get:function(){return r.clearElementView}}),Object.defineProperty(e,"clearViewElement",{enumerable:!0,get:function(){return r.clearViewElement}}),Object.defineProperty(e,"constructStyleDeprecationMessage",{enumerable:!0,get:function(){return r.constructStyleDeprecationMessage}}),Object.defineProperty(e,"EventDispatcher",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"ComponentLookup",{enumerable:!0,get:function(){return i.default}}),Object.defineProperty(e,"TextSupport",{enumerable:!0,get:function(){return o.default}}),Object.defineProperty(e,"CoreView",{enumerable:!0,get:function(){return a.default}}),Object.defineProperty(e,"ClassNamesSupport",{enumerable:!0,get:function(){return s.default}}),Object.defineProperty(e,"ChildViewsSupport",{enumerable:!0,get:function(){return l.default}}),Object.defineProperty(e,"ViewStateSupport",{enumerable:!0,get:function(){return u.default}}),Object.defineProperty(e,"ViewMixin",{enumerable:!0,get:function(){return c.default}}),Object.defineProperty(e,"ActionSupport",{enumerable:!0,get:function(){return d.default}}),Object.defineProperty(e,"MUTABLE_CELL",{enumerable:!0,get:function(){return h.MUTABLE_CELL}}),Object.defineProperty(e,"ActionManager",{enumerable:!0,get:function(){return f.default}})})),e("@ember/-internals/views/lib/compat/attrs",["exports","@ember/-internals/utils"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.MUTABLE_CELL=void 0
+var r=(0,t.symbol)("MUTABLE_CELL")
+e.MUTABLE_CELL=r})),e("@ember/-internals/views/lib/compat/fallback-view-registry",["exports","@ember/-internals/utils"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=(0,t.dictionary)(null)
+e.default=r})),e("@ember/-internals/views/lib/component_lookup",["exports","@ember/-internals/runtime"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.Object.extend({componentFor(e,t,r){var n="component:"+e
+return t.factoryFor(n,r)},layoutFor(e,t,r){var n="template:components/"+e
+return t.lookup(n,r)}})
+e.default=r})),e("@ember/-internals/views/lib/mixins/action_support",["exports","@ember/-internals/utils","@ember/-internals/metal","@ember/debug","@ember/-internals/views/lib/compat/attrs","@ember/deprecated-features"],(function(e,t,r,n,i,o){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var a={send(e,...t){var n=this.actions&&this.actions[e]
+if(n&&!(!0===n.apply(this,t)))return
+var i=(0,r.get)(this,"target")
+i&&i.send(...arguments)}}
+if(o.SEND_ACTION){var s=function(e,t){return t&&t[i.MUTABLE_CELL]&&(t=t.value),t}
+a.sendAction=function(e,...t){var n
+void 0===e&&(e="action"),n=(0,r.get)(this,"attrs."+e)||(0,r.get)(this,e),void 0!==(n=s(this,n))&&("function"==typeof n?n(...t):this.triggerAction({action:n,actionContext:t}))}}var l=r.Mixin.create(a)
+e.default=l})),e("@ember/-internals/views/lib/mixins/child_views_support",["exports","@ember/-internals/metal","@ember/-internals/views/lib/system/utils"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=t.Mixin.create({childViews:(0,t.nativeDescDecorator)({configurable:!1,enumerable:!1,get(){return(0,r.getChildViews)(this)}}),appendChild(e){(0,r.addChildView)(this,e)}})
+e.default=n})),e("@ember/-internals/views/lib/mixins/class_names_support",["exports","@ember/-internals/metal","@ember/debug"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=Object.freeze([]),n=t.Mixin.create({concatenatedProperties:["classNames","classNameBindings"],init(){this._super(...arguments)},classNames:r,classNameBindings:r})
+e.default=n})),e("@ember/-internals/views/lib/mixins/text_support",["exports","@ember/-internals/metal","@ember/-internals/runtime","@ember/debug","@ember/deprecated-features","@ember/-internals/views"],(function(e,t,r,n,i,o){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var a={13:"insertNewline",27:"cancel"},s=t.Mixin.create(r.TargetActionSupport,{value:"",attributeBindings:["autocapitalize","autocorrect","autofocus","disabled","form","maxlength","minlength","placeholder","readonly","required","selectionDirection","spellcheck","tabindex","title"],placeholder:null,disabled:!1,maxlength:null,init(){this._super(...arguments),this.on("paste",this,this._elementValueDidChange),this.on("cut",this,this._elementValueDidChange),this.on("input",this,this._elementValueDidChange)},bubbles:!1,interpretKeyEvents(e){var t=a[e.keyCode]
+if(this._elementValueDidChange(),t)return this[t](e)},_elementValueDidChange(){(0,t.set)(this,"value",this.element.value)},change(e){this._elementValueDidChange(e)},insertNewline(e){l("enter",this,e),l("insert-newline",this,e)},cancel(e){l("escape-press",this,e)},focusIn(e){l("focus-in",this,e)},focusOut(e){this._elementValueDidChange(e),l("focus-out",this,e)},keyPress(e){l("key-press",this,e)},keyUp(e){this.interpretKeyEvents(e),l("key-up",this,e)},keyDown(e){l("key-down",this,e)}})
+function l(e,r,n){var a=(0,t.get)(r,"attrs."+e)
+null!==a&&"object"==typeof a&&!0===a[o.MUTABLE_CELL]&&(a=a.value),void 0===a&&(a=(0,t.get)(r,e))
+var s=(0,t.get)(r,"value")
+if(i.SEND_ACTION&&"string"==typeof a){r.triggerAction({action:a,actionContext:[s,n]})}else"function"==typeof a&&a(s,n)
+a&&!(0,t.get)(r,"bubbles")&&n.stopPropagation()}e.default=s})),e("@ember/-internals/views/lib/mixins/view_state_support",["exports","@ember/-internals/metal"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.Mixin.create({_transitionTo(e){var t=this._currentState,r=this._currentState=this._states[e]
+this._state=e,t&&t.exit&&t.exit(this),r.enter&&r.enter(this)}})
+e.default=r})),e("@ember/-internals/views/lib/mixins/view_support",["exports","@ember/-internals/utils","@ember/-internals/metal","@ember/debug","@ember/-internals/browser-environment","@ember/-internals/views/lib/system/utils","@ember/-internals/views/lib/system/jquery","@ember/deprecated-features"],(function(e,t,r,n,i,o,a,s){"use strict"
+function l(){return this}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var u={concatenatedProperties:["attributeBindings"],nearestOfType(e){for(var t=this.parentView,n=e instanceof r.Mixin?t=>e.detect(t):t=>e.detect(t.constructor);t;){if(n(t))return t
+t=t.parentView}},nearestWithProperty(e){for(var t=this.parentView;t;){if(e in t)return t
+t=t.parentView}},rerender(){return this._currentState.rerender(this)},element:(0,r.nativeDescDecorator)({configurable:!1,enumerable:!1,get(){return this.renderer.getElement(this)}}),appendTo(e){var t
+return t=i.hasDOM&&"string"==typeof e?document.querySelector(e):e,this.renderer.appendTo(this,t),this},append(){return this.appendTo(document.body)},elementId:null,willInsertElement:l,didInsertElement:l,willClearRender:l,destroy(){this._super(...arguments),this._currentState.destroy(this)},willDestroyElement:l,didDestroyElement:l,parentViewDidChange:l,tagName:null,init(){this._super(...arguments),this.elementId||""===this.tagName||(this.elementId=(0,t.guidFor)(this))},handleEvent(e,t){return this._currentState.handleEvent(this,e,t)}}
+s.JQUERY_INTEGRATION&&(u.$=function(e){if(this.element)return e?(0,a.jQuery)(e,this.element):(0,a.jQuery)(this.element)})
+var c=r.Mixin.create(u)
+e.default=c})),e("@ember/-internals/views/lib/system/action_manager",["exports"],(function(e){"use strict"
+function t(){}Object.defineProperty(e,"__esModule",{value:!0}),e.default=t,t.registeredActions={}})),e("@ember/-internals/views/lib/system/event_dispatcher",["exports","@ember/-internals/owner","@ember/polyfills","@ember/debug","@ember/-internals/metal","@ember/-internals/runtime","@ember/-internals/views","@ember/-internals/views/lib/system/jquery","@ember/-internals/views/lib/system/action_manager","@ember/-internals/views/lib/system/jquery_event_deprecation","@ember/-internals/views/lib/system/utils","@ember/deprecated-features"],(function(e,t,r,n,i,o,a,s,l,u,c,d){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var h={mouseenter:"mouseover",mouseleave:"mouseout"},f=o.Object.extend({events:(0,r.assign)({touchstart:"touchStart",touchmove:"touchMove",touchend:"touchEnd",touchcancel:"touchCancel",keydown:"keyDown",keyup:"keyUp",keypress:"keyPress",mousedown:"mouseDown",mouseup:"mouseUp",contextmenu:"contextMenu",click:"click",dblclick:"doubleClick",focusin:"focusIn",focusout:"focusOut",submit:"submit",input:"input",change:"change",dragstart:"dragStart",drag:"drag",dragenter:"dragEnter",dragleave:"dragLeave",dragover:"dragOver",drop:"drop",dragend:"dragEnd"},d.MOUSE_ENTER_LEAVE_MOVE_EVENTS?{mouseenter:"mouseEnter",mouseleave:"mouseLeave",mousemove:"mouseMove"}:{}),rootElement:"body",init(){this._super(),this._eventHandlers=Object.create(null)},setup(e,t){var n=this._finalEvents=(0,r.assign)({},(0,i.get)(this,"events"),e)
+null!=t&&(0,i.set)(this,"rootElement",t)
+var o,a=(0,i.get)(this,"rootElement")
+if(!d.JQUERY_INTEGRATION||s.jQueryDisabled)(o="string"!=typeof a?a:document.querySelector(a)).classList.add("ember-application")
+else if((o=(0,s.jQuery)(a)).addClass("ember-application"),!o.is(".ember-application"))throw new TypeError(`Unable to add 'ember-application' class to root element (${o.selector||o[0].tagName}). Make sure you set rootElement to the body or an element in the body.`)
+for(var l in n)Object.prototype.hasOwnProperty.call(n,l)&&this.setupHandler(o,l,n[l])},setupHandler(e,t,r){if(null!==r)if(!d.JQUERY_INTEGRATION||s.jQueryDisabled){var n=(e,t)=>{var n=(0,a.getElementView)(e),i=!0
+return n&&(i=n.handleEvent(r,t)),i},i=(e,t)=>{var n=e.getAttribute("data-ember-action"),i=l.default.registeredActions[n]
+if(""===n){var o=e.attributes,a=o.length
+i=[]
+for(var s=0;s<a;s++){var u=o.item(s)
+0===u.name.indexOf("data-ember-action-")&&(i=i.concat(l.default.registeredActions[u.value]))}}if(i){for(var c=!0,d=0;d<i.length;d++){var h=i[d]
+h&&h.eventName===r&&(c=h.handler(t)&&c)}return c}}
+if(d.MOUSE_ENTER_LEAVE_MOVE_EVENTS&&void 0!==h[t]){var o=h[t],f=t,p=(e,t)=>{var r=document.createEvent("MouseEvent")
+return r.initMouseEvent(e,!1,!1,t.view,t.detail,t.screenX,t.screenY,t.clientX,t.clientY,t.ctrlKey,t.altKey,t.shiftKey,t.metaKey,t.button,t.relatedTarget),Object.defineProperty(r,"target",{value:t.target,enumerable:!0}),r},m=this._eventHandlers[o]=e=>{for(var t=e.target,r=e.relatedTarget;t&&1===t.nodeType&&(null===r||r!==t&&!(0,c.contains)(t,r));)(0,a.getElementView)(t)?n(t,p(f,e)):t.hasAttribute("data-ember-action")&&i(t,p(f,e)),t=t.parentNode}
+e.addEventListener(o,m)}else{var v=this._eventHandlers[t]=e=>{var t=e.target
+do{if((0,a.getElementView)(t)){if(!1===n(t,e)){e.preventDefault(),e.stopPropagation()
+break}if(!0===e.cancelBubble)break}else if("function"==typeof t.hasAttribute&&t.hasAttribute("data-ember-action")&&!1===i(t,e))break
+t=t.parentNode}while(t&&1===t.nodeType)}
+e.addEventListener(t,v)}}else e.on(t+".ember",".ember-view",(function(e){var t=(0,a.getElementView)(this),n=!0
+return t&&(n=t.handleEvent(r,(0,u.default)(e))),n})),e.on(t+".ember","[data-ember-action]",e=>{var t=e.currentTarget.attributes,n=[]
+e=(0,u.default)(e)
+for(var i=0;i<t.length;i++){var o=t.item(i)
+if(-1!==o.name.lastIndexOf("data-ember-action-",0)){var a=l.default.registeredActions[o.value]
+a&&a.eventName===r&&-1===n.indexOf(a)&&(a.handler(e),n.push(a))}}})},destroy(){var e,t=(0,i.get)(this,"rootElement")
+if(e=t.nodeType?t:document.querySelector(t)){if(!d.JQUERY_INTEGRATION||s.jQueryDisabled)for(var r in this._eventHandlers)e.removeEventListener(r,this._eventHandlers[r])
+else(0,s.jQuery)(t).off(".ember","**")
+return e.classList.remove("ember-application"),this._super(...arguments)}},toString:()=>"(EventDispatcher)"})
+e.default=f})),e("@ember/-internals/views/lib/system/jquery",["exports","@ember/-internals/environment","@ember/-internals/browser-environment","@ember/deprecated-features"],(function(e,t,r,n){"use strict"
+var i
+Object.defineProperty(e,"__esModule",{value:!0}),e.jQueryDisabled=e.jQuery=void 0,e.jQuery=i
+var o=!n.JQUERY_INTEGRATION||!1===t.ENV._JQUERY_INTEGRATION
+e.jQueryDisabled=o,n.JQUERY_INTEGRATION&&r.hasDOM&&(e.jQuery=i=t.context.imports.jQuery,!o&&i?i.event.addProp?i.event.addProp("dataTransfer"):["dragstart","drag","dragenter","dragleave","dragover","drop","dragend"].forEach(e=>{i.event.fixHooks[e]={props:["dataTransfer"]}}):(e.jQuery=i=void 0,e.jQueryDisabled=o=!0))})),e("@ember/-internals/views/lib/system/jquery_event_deprecation",["exports","@ember/debug","@ember/-internals/environment","@ember/-internals/utils","@ember/deprecated-features"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return e}})),e("@ember/-internals/views/lib/system/utils",["exports","@ember/-internals/owner","@ember/-internals/utils","@ember/debug"],(function(e,t,r){"use strict"
+function n(e){return""!==e.tagName&&e.elementId?e.elementId:(0,r.guidFor)(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.isSimpleClick=function(e){var t=e.shiftKey||e.metaKey||e.altKey||e.ctrlKey,r=e.which>1
+return!t&&!r},e.constructStyleDeprecationMessage=function(e){return'Binding style attributes may introduce cross-site scripting vulnerabilities; please ensure that values being bound are properly escaped. For more information, including how to disable this warning, see https://emberjs.com/deprecations/v1.x/#toc_binding-style-attributes. Style affected: "'+e+'"'},e.getRootViews=function(e){var t=e.lookup("-view-registry:main"),r=[]
+return Object.keys(t).forEach(e=>{var n=t[e]
+null===n.parentView&&r.push(n)}),r},e.getViewId=n,e.getElementView=function(e){return i.get(e)||null},e.getViewElement=function(e){return o.get(e)||null},e.setElementView=function(e,t){i.set(e,t)},e.setViewElement=function(e,t){o.set(e,t)},e.clearElementView=function(e){i.delete(e)},e.clearViewElement=function(e){o.delete(e)},e.getChildViews=function(e){var r=(0,t.getOwner)(e).lookup("-view-registry:main")
+return l(e,r)},e.initChildViews=s,e.addChildView=function(e,t){var r=a.get(e)
+void 0===r&&(r=s(e))
+r.add(n(t))},e.collectChildViews=l,e.getViewBounds=u,e.getViewRange=c,e.getViewClientRects=function(e){return c(e).getClientRects()},e.getViewBoundingClientRect=function(e){return c(e).getBoundingClientRect()},e.matches=function(e,t){return d.call(e,t)},e.contains=function(e,t){if(void 0!==e.contains)return e.contains(t)
+var r=t.parentNode
+for(;r&&(r=r.parentNode);)if(r===e)return!0
+return!1},e.elMatches=void 0
+var i=new WeakMap,o=new WeakMap
+var a=new WeakMap
+function s(e){var t=new Set
+return a.set(e,t),t}function l(e,t){var r=[],n=a.get(e)
+return void 0!==n&&n.forEach(e=>{var n=t[e]
+!n||n.isDestroying||n.isDestroyed||r.push(n)}),r}function u(e){return e.renderer.getBounds(e)}function c(e){var t=u(e),r=document.createRange()
+return r.setStartBefore(t.firstNode),r.setEndAfter(t.lastNode),r}var d="undefined"!=typeof Element?Element.prototype.matches||Element.prototype.matchesSelector||Element.prototype.mozMatchesSelector||Element.prototype.msMatchesSelector||Element.prototype.oMatchesSelector||Element.prototype.webkitMatchesSelector:void 0
+e.elMatches=d})),e("@ember/-internals/views/lib/views/core_view",["exports","@ember/-internals/runtime","@ember/-internals/views/lib/views/states"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=t.FrameworkObject.extend(t.Evented,t.ActionHandler,{isView:!0,_states:r.default,init(){if(this._super(...arguments),this._state="preRender",this._currentState=this._states.preRender,!this.renderer)throw new Error(`Cannot instantiate a component without a renderer. Please ensure that you are creating ${this} with a proper container/registry.`)},parentView:null,instrumentDetails(e){return e.object=this.toString(),e.containerKey=this._debugContainerKey,e.view=this,e},trigger(e,...t){this._super(...arguments)
+var r=this[e]
+if("function"==typeof r)return r.apply(this,t)},has(e){return"function"==typeof this[e]||this._super(e)}})
+n.reopenClass({isViewFactory:!0})
+var i=n
+e.default=i})),e("@ember/-internals/views/lib/views/states",["exports","@ember/-internals/views/lib/views/states/pre_render","@ember/-internals/views/lib/views/states/has_element","@ember/-internals/views/lib/views/states/in_dom","@ember/-internals/views/lib/views/states/destroying"],(function(e,t,r,n,i){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var o=Object.freeze({preRender:t.default,inDOM:n.default,hasElement:r.default,destroying:i.default})
+e.default=o})),e("@ember/-internals/views/lib/views/states/default",["exports","@ember/error"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r={appendChild(){throw new t.default("You can't use appendChild outside of the rendering process")},handleEvent:()=>!0,rerender(){},destroy(){}},n=Object.freeze(r)
+e.default=n})),e("@ember/-internals/views/lib/views/states/destroying",["exports","@ember/polyfills","@ember/error","@ember/-internals/views/lib/views/states/default"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var i=(0,t.assign)({},n.default,{appendChild(){throw new r.default("You can't call appendChild on a view being destroyed")},rerender(){throw new r.default("You can't call rerender on a view being destroyed")}}),o=Object.freeze(i)
+e.default=o})),e("@ember/-internals/views/lib/views/states/has_element",["exports","@ember/polyfills","@ember/-internals/views/lib/views/states/default","@ember/runloop","@ember/instrumentation"],(function(e,t,r,n,i){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var o=(0,t.assign)({},r.default,{rerender(e){e.renderer.rerender(e)},destroy(e){e.renderer.remove(e)},handleEvent:(e,t,r)=>!e.has(t)||(0,i.flaggedInstrument)("interaction."+t,{event:r,view:e},()=>(0,n.join)(e,e.trigger,t,r))}),a=Object.freeze(o)
+e.default=a})),e("@ember/-internals/views/lib/views/states/in_dom",["exports","@ember/-internals/utils","@ember/polyfills","@ember/error","@ember/-internals/views/lib/views/states/has_element"],(function(e,t,r,n,i){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var o=(0,r.assign)({},i.default,{enter(e){e.renderer.register(e)}}),a=Object.freeze(o)
+e.default=a})),e("@ember/-internals/views/lib/views/states/pre_render",["exports","@ember/-internals/views/lib/views/states/default","@ember/polyfills"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=(0,r.assign)({},t.default),i=Object.freeze(n)
+e.default=i})),e("@ember/application/globals-resolver",["exports","@ember/-internals/utils","@ember/-internals/metal","@ember/debug","@ember/string","@ember/-internals/runtime","@ember/-internals/glimmer","@ember/deprecated-features"],(function(e,t,r,n,i,o,a,s){"use strict"
+var l
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,s.GLOBALS_RESOLVER&&(l=class extends o.Object{static create(e){return super.create(e)}init(){this._parseNameCache=(0,t.dictionary)(null)}normalize(e){var[t,r]=e.split(":")
+return"template"!==t?`${t}:${r.replace(/(\.|_|-)./g,e=>e.charAt(1).toUpperCase())}`:e}resolve(e){var t,r=this.parseName(e),n=r.resolveMethodName
+return this[n]&&(t=this[n](r)),t=t||this.resolveOther(r)}parseName(e){return this._parseNameCache[e]||(this._parseNameCache[e]=this._parseName(e))}_parseName(e){var[t,n]=e.split(":"),o=n,a=(0,r.get)(this,"namespace"),s=o.lastIndexOf("/"),l=-1!==s?o.slice(0,s):null
+if("template"!==t&&-1!==s){var u=o.split("/")
+o=u[u.length-1]
+var c=(0,i.capitalize)(u.slice(0,-1).join("."))
+a=(0,r.findNamespace)(c)}var d="main"===n?"Main":(0,i.classify)(t)
+if(!o||!t)throw new TypeError(`Invalid fullName: \`${e}\`, must be of the form \`type:name\` `)
+return{fullName:e,type:t,fullNameWithoutType:n,dirname:l,name:o,root:a,resolveMethodName:"resolve"+d}}lookupDescription(e){var t,r=this.parseName(e)
+return"template"===r.type?"template at "+r.fullNameWithoutType.replace(/\./g,"/"):(t=`${r.root}.${(0,i.classify)(r.name).replace(/\./g,"")}`,"model"!==r.type&&(t+=(0,i.classify)(r.type)),t)}makeToString(e){return e.toString()}useRouterNaming(e){"basic"===e.name?e.name="":e.name=e.name.replace(/\./g,"_")}resolveTemplate(e){var t=e.fullNameWithoutType.replace(/\./g,"/")
+return(0,a.getTemplate)(t)||(0,a.getTemplate)((0,i.decamelize)(t))}resolveView(e){return this.useRouterNaming(e),this.resolveOther(e)}resolveController(e){return this.useRouterNaming(e),this.resolveOther(e)}resolveRoute(e){return this.useRouterNaming(e),this.resolveOther(e)}resolveModel(e){var t=(0,i.classify)(e.name)
+return(0,r.get)(e.root,t)}resolveHelper(e){return this.resolveOther(e)}resolveOther(e){var t=(0,i.classify)(e.name)+(0,i.classify)(e.type)
+return(0,r.get)(e.root,t)}resolveMain(e){var t=(0,i.classify)(e.type)
+return(0,r.get)(e.root,t)}knownForType(e){for(var n=(0,r.get)(this,"namespace"),o=(0,i.classify)(e),a=new RegExp(o+"$"),s=(0,t.dictionary)(null),l=Object.keys(n),u=0;u<l.length;u++){var c=l[u]
+if(a.test(c))s[this.translateToContainerFullname(e,c)]=!0}return s}translateToContainerFullname(e,t){var r=(0,i.classify)(e),n=t.slice(0,-1*r.length)
+return`${e}:${(0,i.dasherize)(n)}`}})
+var u=l
+e.default=u})),e("@ember/application/index",["exports","@ember/-internals/owner","@ember/application/lib/lazy_load","@ember/application/lib/application"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"getOwner",{enumerable:!0,get:function(){return t.getOwner}}),Object.defineProperty(e,"setOwner",{enumerable:!0,get:function(){return t.setOwner}}),Object.defineProperty(e,"onLoad",{enumerable:!0,get:function(){return r.onLoad}}),Object.defineProperty(e,"runLoadHooks",{enumerable:!0,get:function(){return r.runLoadHooks}}),Object.defineProperty(e,"_loaded",{enumerable:!0,get:function(){return r._loaded}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return n.default}})})),e("@ember/application/instance",["exports","@ember/polyfills","@ember/-internals/metal","@ember/-internals/browser-environment","@ember/-internals/views","@ember/engine/instance","@ember/-internals/glimmer"],(function(e,t,r,n,i,o,a){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var s=o.default.extend({application:null,customEvents:null,rootElement:null,init(){this._super(...arguments),this.application._watchInstance(this),this.register("-application-instance:main",this,{instantiate:!1})},_bootSync(e){return this._booted||(e=new l(e),this.setupRegistry(e),e.rootElement?this.rootElement=e.rootElement:this.rootElement=this.application.rootElement,e.location&&(0,r.set)(this.router,"location",e.location),this.application.runInstanceInitializers(this),e.isInteractive&&this.setupEventDispatcher(),this._booted=!0),this},setupRegistry(e){this.constructor.setupRegistry(this.__registry__,e)},router:(0,r.computed)((function(){return this.lookup("router:main")})).readOnly(),didCreateRootView(e){e.appendTo(this.rootElement)},startRouting(){this.router.startRouting(),this._didSetupRouter=!0},setupRouter(){this._didSetupRouter||(this._didSetupRouter=!0,this.router.setupRouter())},handleURL(e){return this.setupRouter(),this.router.handleURL(e)},setupEventDispatcher(){var e=this.lookup("event_dispatcher:main"),n=(0,r.get)(this.application,"customEvents"),i=(0,r.get)(this,"customEvents"),o=(0,t.assign)({},n,i)
+return e.setup(o,this.rootElement),e},getURL(){return this.router.url},visit(e){this.setupRouter()
+var t=this.__container__.lookup("-environment:main"),n=this.router,i=()=>t.options.shouldRender?(0,a.renderSettled)().then(()=>this):this,o=e=>{if(e.error)throw e.error
+if("TransitionAborted"===e.name&&n._routerMicrolib.activeTransition)return n._routerMicrolib.activeTransition.then(i,o)
+throw"TransitionAborted"===e.name?new Error(e.message):e},s=(0,r.get)(n,"location")
+return s.setURL(e),n.handleURL(s.getURL()).then(i,o)},willDestroy(){this._super(...arguments),this.application._unwatchInstance(this)}})
+s.reopenClass({setupRegistry(e,t={}){t.toEnvironment||(t=new l(t)),e.register("-environment:main",t.toEnvironment(),{instantiate:!1}),e.register("service:-document",t.document,{instantiate:!1}),this._super(e,t)}})
+class l{constructor(e={}){this.jQuery=i.jQuery,this.isInteractive=n.hasDOM,this._renderMode=e._renderMode,void 0!==e.isBrowser?this.isBrowser=Boolean(e.isBrowser):this.isBrowser=n.hasDOM,this.isBrowser||(this.jQuery=null,this.isInteractive=!1,this.location="none"),void 0!==e.shouldRender?this.shouldRender=Boolean(e.shouldRender):this.shouldRender=!0,this.shouldRender||(this.jQuery=null,this.isInteractive=!1),e.document?this.document=e.document:this.document="undefined"!=typeof document?document:null,e.rootElement&&(this.rootElement=e.rootElement),void 0!==e.location&&(this.location=e.location),void 0!==e.jQuery&&(this.jQuery=e.jQuery),void 0!==e.isInteractive&&(this.isInteractive=Boolean(e.isInteractive))}toEnvironment(){var e=(0,t.assign)({},n)
+return e.hasDOM=this.isBrowser,e.isInteractive=this.isInteractive,e._renderMode=this._renderMode,e.options=this,e}}var u=s
+e.default=u})),e("@ember/application/lib/application",["exports","@ember/-internals/utils","@ember/-internals/environment","@ember/-internals/browser-environment","@ember/debug","@ember/runloop","@ember/-internals/metal","@ember/application/lib/lazy_load","@ember/-internals/runtime","@ember/-internals/views","@ember/-internals/routing","@ember/application/instance","@ember/engine","@ember/-internals/container","@ember/-internals/glimmer","@ember/deprecated-features"],(function(e,t,r,n,i,o,a,s,l,u,c,d,h,f,p,m){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var v=!1,g=h.default.extend({rootElement:"body",eventDispatcher:null,customEvents:null,autoboot:!0,_globalsMode:!0,_applicationInstances:null,init(){this._super(...arguments),this.$||(this.$=u.jQuery),v||(v=!0,m.JQUERY_INTEGRATION&&n.hasDOM&&!u.jQueryDisabled&&a.libraries.registerCoreLibrary("jQuery",(0,u.jQuery)().jquery)),this._readinessDeferrals=1,this._booted=!1,this._applicationInstances=new Set,this.autoboot=this._globalsMode=Boolean(this.autoboot),this._globalsMode&&this._prepareForGlobalsMode(),this.autoboot&&this.waitForDOMReady()},buildInstance(e={}){return e.base=this,e.application=this,d.default.create(e)},_watchInstance(e){this._applicationInstances.add(e)},_unwatchInstance(e){return this._applicationInstances.delete(e)},_prepareForGlobalsMode(){this.Router=(this.Router||c.Router).extend(),this._buildDeprecatedInstance()},_buildDeprecatedInstance(){var e=this.buildInstance()
+this.__deprecatedInstance__=e,this.__container__=e.__container__},waitForDOMReady(){!this.$||this.$.isReady?(0,o.schedule)("actions",this,"domReady"):this.$().ready((0,o.bind)(this,"domReady"))},domReady(){this.isDestroying||this.isDestroyed||this._bootSync()},deferReadiness(){this._readinessDeferrals++},advanceReadiness(){this._readinessDeferrals--,0===this._readinessDeferrals&&(0,o.once)(this,this.didBecomeReady)},boot(){if(this._bootPromise)return this._bootPromise
+try{this._bootSync()}catch(e){}return this._bootPromise},_bootSync(){if(!(this._booted||this.isDestroying||this.isDestroyed)){var e=this._bootResolver=l.RSVP.defer()
+this._bootPromise=e.promise
+try{this.runInitializers(),(0,s.runLoadHooks)("application",this),this.advanceReadiness()}catch(t){throw e.reject(t),t}}},reset(){var e=this.__deprecatedInstance__
+this._readinessDeferrals=1,this._bootPromise=null,this._bootResolver=null,this._booted=!1,(0,o.join)(this,(function(){(0,o.run)(e,"destroy"),this._buildDeprecatedInstance(),(0,o.schedule)("actions",this,"_bootSync")}))},didBecomeReady(){if(!this.isDestroying&&!this.isDestroyed)try{var e
+if((0,i.isTesting)()||((0,a.processAllNamespaces)(),(0,a.setNamespaceSearchDisabled)(!0)),this.autoboot)(e=this._globalsMode?this.__deprecatedInstance__:this.buildInstance())._bootSync(),this.ready(),e.startRouting()
+this._bootResolver.resolve(this),this._booted=!0}catch(t){throw this._bootResolver.reject(t),t}},ready(){return this},willDestroy(){this._super(...arguments),(0,a.setNamespaceSearchDisabled)(!1),s._loaded.application===this&&(s._loaded.application=void 0),this._applicationInstances.size&&(this._applicationInstances.forEach(e=>e.destroy()),this._applicationInstances.clear())},visit(e,t){return this.boot().then(()=>{var r=this.buildInstance()
+return r.boot(t).then(()=>r.visit(e)).catch(e=>{throw(0,o.run)(r,"destroy"),e})})}})
+g.reopenClass({buildRegistry(){var e=this._super(...arguments)
+return function(e){e.register("router:main",c.Router.extend()),e.register("-view-registry:main",{create:()=>(0,t.dictionary)(null)}),e.register("route:basic",c.Route),e.register("event_dispatcher:main",u.EventDispatcher),e.injection("router:main","namespace","application:main"),e.register("location:auto",c.AutoLocation),e.register("location:hash",c.HashLocation),e.register("location:history",c.HistoryLocation),e.register("location:none",c.NoneLocation),e.register(f.privatize`-bucket-cache:main`,{create:()=>new c.BucketCache}),e.register("service:router",c.RouterService),e.injection("service:router","_router","router:main")}(e),(0,p.setupApplicationRegistry)(e),e}})
+var b=g
+e.default=b})),e("@ember/application/lib/lazy_load",["exports","@ember/-internals/environment","@ember/-internals/browser-environment"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.onLoad=function(e,t){var r=i[e]
+n[e]=n[e]||[],n[e].push(t),r&&t(r)},e.runLoadHooks=function(e,t){if(i[e]=t,r.window&&"function"==typeof CustomEvent){var o=new CustomEvent(e,{detail:t,name:e})
+r.window.dispatchEvent(o)}n[e]&&n[e].forEach(e=>e(t))},e._loaded=void 0
+var n=t.ENV.EMBER_LOAD_HOOKS||{},i={},o=i
+e._loaded=o}))
+e("@ember/canary-features/index",["exports","@ember/-internals/environment","@ember/polyfills"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.isEnabled=function(e){var r=i[e]
+return!0===r||!1===r?r:!!t.ENV.ENABLE_OPTIONAL_FEATURES},e.EMBER_CACHE_API=e.EMBER_GLIMMER_IN_ELEMENT=e.EMBER_ROUTING_MODEL_ARG=e.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE=e.EMBER_CUSTOM_COMPONENT_ARG_PROXY=e.EMBER_MODULE_UNIFICATION=e.EMBER_NAMED_BLOCKS=e.EMBER_IMPROVED_INSTRUMENTATION=e.EMBER_LIBRARIES_ISREGISTERED=e.FEATURES=e.DEFAULT_FEATURES=void 0
+var n={EMBER_LIBRARIES_ISREGISTERED:!1,EMBER_IMPROVED_INSTRUMENTATION:!1,EMBER_NAMED_BLOCKS:!1,EMBER_MODULE_UNIFICATION:!1,EMBER_CUSTOM_COMPONENT_ARG_PROXY:!0,EMBER_GLIMMER_SET_COMPONENT_TEMPLATE:!0,EMBER_ROUTING_MODEL_ARG:!0,EMBER_GLIMMER_IN_ELEMENT:!0,EMBER_CACHE_API:!1}
+e.DEFAULT_FEATURES=n
+var i=(0,r.assign)(n,t.ENV.FEATURES)
+function o(e){return!(!t.ENV.ENABLE_OPTIONAL_FEATURES||null!==e)||e}e.FEATURES=i
+var a=o(i.EMBER_LIBRARIES_ISREGISTERED)
+e.EMBER_LIBRARIES_ISREGISTERED=a
+var s=o(i.EMBER_IMPROVED_INSTRUMENTATION)
+e.EMBER_IMPROVED_INSTRUMENTATION=s
+var l=o(i.EMBER_NAMED_BLOCKS)
+e.EMBER_NAMED_BLOCKS=l
+var u=o(i.EMBER_MODULE_UNIFICATION)
+e.EMBER_MODULE_UNIFICATION=u
+var c=o(i.EMBER_CUSTOM_COMPONENT_ARG_PROXY)
+e.EMBER_CUSTOM_COMPONENT_ARG_PROXY=c
+var d=o(i.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE)
+e.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE=d
+var h=o(i.EMBER_ROUTING_MODEL_ARG)
+e.EMBER_ROUTING_MODEL_ARG=h
+var f=o(i.EMBER_GLIMMER_IN_ELEMENT)
+e.EMBER_GLIMMER_IN_ELEMENT=f
+var p=o(i.EMBER_CACHE_API)
+e.EMBER_CACHE_API=p})),e("@ember/component/index",["exports","@ember/-internals/glimmer"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"Component",{enumerable:!0,get:function(){return t.Component}})})),e("@ember/component/template-only",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return new t(e)},e.isTemplateOnlyComponent=function(e){return e instanceof t},e.TemplateOnlyComponent=void 0
+class t{constructor(e="@ember/component/template-only"){this.moduleName=e}toString(){return this.moduleName}}e.TemplateOnlyComponent=t})),e("@ember/controller/index",["exports","@ember/-internals/runtime","@ember/-internals/metal","@ember/controller/lib/controller_mixin"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.inject=function(){return(0,r.inject)("controller",...arguments)},e.default=void 0
+var i=t.FrameworkObject.extend(n.default)
+e.default=i})),e("@ember/controller/lib/controller_mixin",["exports","@ember/-internals/metal","@ember/-internals/runtime","@ember/-internals/utils"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var i=(0,n.symbol)("MODEL"),o=t.Mixin.create(r.ActionHandler,{isController:!0,target:null,store:null,model:(0,t.computed)({get(){return this[i]},set(e,t){return this[i]=t}})})
+e.default=o})),e("@ember/debug/index",["exports","@ember/-internals/browser-environment","@ember/error","@ember/debug/lib/deprecate","@ember/debug/lib/testing","@ember/debug/lib/warn","@ember/debug/lib/capture-render-tree"],(function(e,t,r,n,i,o,a){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"registerDeprecationHandler",{enumerable:!0,get:function(){return n.registerHandler}}),Object.defineProperty(e,"isTesting",{enumerable:!0,get:function(){return i.isTesting}}),Object.defineProperty(e,"setTesting",{enumerable:!0,get:function(){return i.setTesting}}),Object.defineProperty(e,"registerWarnHandler",{enumerable:!0,get:function(){return o.registerHandler}}),Object.defineProperty(e,"captureRenderTree",{enumerable:!0,get:function(){return a.default}}),e._warnIfUsingStrippedFeatureFlags=e.getDebugFunction=e.setDebugFunction=e.deprecateFunc=e.runInDebug=e.debugFreeze=e.debugSeal=e.deprecate=e.debug=e.warn=e.info=e.assert=void 0
+var s=()=>{},l=s
+e.assert=l
+var u=s
+e.info=u
+var c=s
+e.warn=c
+var d=s
+e.debug=d
+var h=s
+e.deprecate=h
+var f=s
+e.debugSeal=f
+var p=s
+e.debugFreeze=p
+var m=s
+e.runInDebug=m
+var v=s
+e.setDebugFunction=v
+var g=s
+e.getDebugFunction=g
+var b=function(){return arguments[arguments.length-1]}
+e.deprecateFunc=b,e._warnIfUsingStrippedFeatureFlags=void 0})),e("@ember/debug/lib/capture-render-tree",["exports","@glimmer/util"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){var r=(0,t.expect)(e.lookup("-environment:main"),"BUG: owner is missing -environment:main").isInteractive?"renderer:-dom":"renderer:-inert"
+return(0,t.expect)(e.lookup(r),"BUG: owner is missing "+r).debugRenderTree.capture()}})),e("@ember/debug/lib/deprecate",["exports","@ember/-internals/environment","@ember/debug/index","@ember/debug/lib/handlers"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.missingOptionsUntilDeprecation=e.missingOptionsIdDeprecation=e.missingOptionsDeprecation=e.registerHandler=e.default=void 0
+var t,r,n,i=()=>{}
+e.registerHandler=i,e.missingOptionsDeprecation=t,e.missingOptionsIdDeprecation=r,e.missingOptionsUntilDeprecation=n
+var o=()=>{},a=o
+e.default=a})),e("@ember/debug/lib/handlers",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.invoke=e.registerHandler=e.HANDLERS=void 0
+var t={}
+e.HANDLERS=t
+var r=()=>{}
+e.registerHandler=r
+var n=()=>{}
+e.invoke=n})),e("@ember/debug/lib/testing",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.isTesting=function(){return t},e.setTesting=function(e){t=Boolean(e)}
+var t=!1})),e("@ember/debug/lib/warn",["exports","@ember/debug/index","@ember/debug/lib/handlers"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.missingOptionsDeprecation=e.missingOptionsIdDeprecation=e.registerHandler=e.default=void 0
+var t=()=>{}
+e.registerHandler=t
+var r,n,i=()=>{}
+e.missingOptionsDeprecation=r,e.missingOptionsIdDeprecation=n
+var o=i
+e.default=o})),e("@ember/deprecated-features/index",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.GLOBALS_RESOLVER=e.PARTIALS=e.EMBER_COMPONENT_IS_VISIBLE=e.MOUSE_ENTER_LEAVE_MOVE_EVENTS=e.FUNCTION_PROTOTYPE_EXTENSIONS=e.APP_CTRL_ROUTER_PROPS=e.ALIAS_METHOD=e.JQUERY_INTEGRATION=e.COMPONENT_MANAGER_STRING_LOOKUP=e.ROUTER_EVENTS=e.MERGE=e.LOGGER=e.EMBER_EXTEND_PROTOTYPES=e.SEND_ACTION=void 0
+e.SEND_ACTION=!0
+e.EMBER_EXTEND_PROTOTYPES=!0
+e.LOGGER=!0
+e.MERGE=!0
+e.ROUTER_EVENTS=!0
+e.COMPONENT_MANAGER_STRING_LOOKUP=!0
+e.JQUERY_INTEGRATION=!0
+e.ALIAS_METHOD=!0
+e.APP_CTRL_ROUTER_PROPS=!0
+e.FUNCTION_PROTOTYPE_EXTENSIONS=!0
+e.MOUSE_ENTER_LEAVE_MOVE_EVENTS=!0
+e.EMBER_COMPONENT_IS_VISIBLE=!0
+e.PARTIALS=!0
+e.GLOBALS_RESOLVER=!0})),e("@ember/engine/index",["exports","@ember/engine/lib/engine-parent","@ember/-internals/utils","@ember/controller","@ember/-internals/runtime","@ember/-internals/container","dag-map","@ember/debug","@ember/-internals/metal","@ember/application/globals-resolver","@ember/engine/instance","@ember/-internals/routing","@ember/-internals/extension-support","@ember/-internals/views","@ember/-internals/glimmer"],(function(e,t,r,n,i,o,a,s,l,u,c,d,h,f,p){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"getEngineParent",{enumerable:!0,get:function(){return t.getEngineParent}}),Object.defineProperty(e,"setEngineParent",{enumerable:!0,get:function(){return t.setEngineParent}}),e.default=void 0
+var m=i.Namespace.extend(i.RegistryProxyMixin,{init(){this._super(...arguments),this.buildRegistry()},_initializersRan:!1,ensureInitializers(){this._initializersRan||(this.runInitializers(),this._initializersRan=!0)},buildInstance(e={}){return this.ensureInitializers(),e.base=this,c.default.create(e)},buildRegistry(){return this.__registry__=this.constructor.buildRegistry(this)},initializer(e){this.constructor.initializer(e)},instanceInitializer(e){this.constructor.instanceInitializer(e)},runInitializers(){this._runInitializer("initializers",(e,t)=>{t.initialize(this)})},runInstanceInitializers(e){this._runInitializer("instanceInitializers",(t,r)=>{r.initialize(e)})},_runInitializer(e,t){for(var r,n=(0,l.get)(this.constructor,e),i=function(e){var t=[]
+for(var r in e)t.push(r)
+return t}(n),o=new a.default,s=0;s<i.length;s++)r=n[i[s]],o.add(r.name,r,r.before,r.after)
+o.topsort(t)}})
+function v(e){var t={namespace:e}
+return((0,l.get)(e,"Resolver")||u.default).create(t)}function g(e){return function(t){if(void 0!==this.superclass[e]&&this.superclass[e]===this[e]){var r={}
+r[e]=Object.create(this[e]),this.reopenClass(r)}this[e][t.name]=t}}m.reopenClass({initializers:Object.create(null),instanceInitializers:Object.create(null),initializer:g("initializers","initializer"),instanceInitializer:g("instanceInitializers","instance initializer"),buildRegistry(e){var t=new o.Registry({resolver:v(e)})
+return t.set=l.set,t.register("application:main",e,{instantiate:!1}),function(e){e.optionsForType("component",{singleton:!1}),e.optionsForType("view",{singleton:!1}),e.register("controller:basic",n.default,{instantiate:!1}),e.injection("view","_viewRegistry","-view-registry:main"),e.injection("renderer","_viewRegistry","-view-registry:main"),e.injection("route","_topLevelViewTemplate","template:-outlet"),e.injection("view:-outlet","namespace","application:main"),e.injection("controller","target","router:main"),e.injection("controller","namespace","application:main"),e.injection("router","_bucketCache",o.privatize`-bucket-cache:main`),e.injection("route","_bucketCache",o.privatize`-bucket-cache:main`),e.injection("route","_router","router:main"),e.register("service:-routing",d.RoutingService),e.injection("service:-routing","router","router:main"),e.register("resolver-for-debugging:main",e.resolver,{instantiate:!1}),e.injection("container-debug-adapter:main","resolver","resolver-for-debugging:main"),e.injection("data-adapter:main","containerDebugAdapter","container-debug-adapter:main"),e.register("container-debug-adapter:main",h.ContainerDebugAdapter),e.register("component-lookup:main",f.ComponentLookup)}(t),(0,p.setupEngineRegistry)(t),t},resolver:null,Resolver:null})
+var b=m
+e.default=b})),e("@ember/engine/instance",["exports","@ember/-internals/runtime","@ember/debug","@ember/error","@ember/-internals/container","@ember/-internals/utils","@ember/engine/lib/engine-parent"],(function(e,t,r,n,i,o,a){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var s=t.Object.extend(t.RegistryProxyMixin,t.ContainerProxyMixin,{base:null,init(){this._super(...arguments),(0,o.guidFor)(this)
+var e=this.base
+e||(e=this.application,this.base=e)
+var t=this.__registry__=new i.Registry({fallback:e.__registry__})
+this.__container__=t.container({owner:this}),this._booted=!1},boot(e){return this._bootPromise||(this._bootPromise=new t.RSVP.Promise(t=>t(this._bootSync(e)))),this._bootPromise},_bootSync(e){return this._booted||(this.cloneParentDependencies(),this.setupRegistry(e),this.base.runInstanceInitializers(this),this._booted=!0),this},setupRegistry(e=this.__container__.lookup("-environment:main")){this.constructor.setupRegistry(this.__registry__,e)},unregister(e){this.__container__.reset(e),this._super(...arguments)},buildChildEngineInstance(e,t={}){var r=this.lookup("engine:"+e)
+if(!r)throw new n.default(`You attempted to mount the engine '${e}', but it is not registered with its parent.`)
+var i=r.buildInstance(t)
+return(0,a.setEngineParent)(i,this),i},cloneParentDependencies(){var e=(0,a.getEngineParent)(this);["route:basic","service:-routing"].forEach(t=>this.register(t,e.resolveRegistration(t)))
+var t=e.lookup("-environment:main")
+this.register("-environment:main",t,{instantiate:!1})
+var r=["router:main",i.privatize`-bucket-cache:main`,"-view-registry:main","renderer:-"+(t.isInteractive?"dom":"inert"),"service:-document"]
+t.isInteractive&&r.push("event_dispatcher:main"),r.forEach(t=>this.register(t,e.lookup(t),{instantiate:!1})),this.inject("view","_environment","-environment:main"),this.inject("route","_environment","-environment:main")}})
+s.reopenClass({setupRegistry(e,t){t&&(e.injection("view","_environment","-environment:main"),e.injection("route","_environment","-environment:main"),t.isInteractive?(e.injection("view","renderer","renderer:-dom"),e.injection("component","renderer","renderer:-dom")):(e.injection("view","renderer","renderer:-inert"),e.injection("component","renderer","renderer:-inert")))}})
+var l=s
+e.default=l})),e("@ember/engine/lib/engine-parent",["exports","@ember/-internals/utils"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.getEngineParent=function(e){return e[r]},e.setEngineParent=function(e,t){e[r]=t}
+var r=(0,t.symbol)("ENGINE_PARENT")})),e("@ember/error/index",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Error
+e.default=t})),e("@ember/instrumentation/index",["exports","@ember/-internals/environment"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.instrument=u,e._instrumentStart=h,e.subscribe=function(e,t){for(var i,o=e.split("."),a=[],s=0;s<o.length;s++)"*"===(i=o[s])?a.push("[^\\.]*"):a.push(i)
+var l=a.join("\\.")
+l+="(\\..*)?"
+var u={pattern:e,regex:new RegExp(`^${l}$`),object:t}
+return r.push(u),n={},u},e.unsubscribe=function(e){for(var t=0,i=0;i<r.length;i++)r[i]===e&&(t=i)
+r.splice(t,1),n={}},e.reset=function(){r.length=0,n={}},e.flaggedInstrument=e.subscribers=void 0
+var r=[]
+e.subscribers=r
+var n={}
+var i,o,a,s=(i="undefined"!=typeof window&&window.performance||{},(o=i.now||i.mozNow||i.webkitNow||i.msNow||i.oNow)?o.bind(i):Date.now)
+function l(e){return"function"==typeof e}function u(e,t,n,i){var o,a,s
+if(arguments.length<=3&&l(t)?(a=t,s=n):(o=t,a=n,s=i),0===r.length)return a.call(s)
+var u=o||{},f=h(e,()=>u)
+return f===d?a.call(s):c(a,f,u,s)}function c(e,t,r,n){try{return e.call(n)}catch(i){throw r.exception=i,i}finally{t()}}function d(){}function h(e,i,o){if(0===r.length)return d
+var a=n[e]
+if(a||(a=function(e){for(var t,i=[],o=0;o<r.length;o++)(t=r[o]).regex.test(e)&&i.push(t.object)
+return n[e]=i,i}(e)),0===a.length)return d
+var l,u=i(o),c=t.ENV.STRUCTURED_PROFILE
+c&&(l=`${e}: ${u.object}`,console.time(l))
+for(var h=[],f=s(),p=0;p<a.length;p++){var m=a[p]
+h.push(m.before(e,f,u))}return function(){for(var t=s(),r=0;r<a.length;r++){var n=a[r]
+"function"==typeof n.after&&n.after(e,t,u,h[r])}c&&console.timeEnd(l)}}e.flaggedInstrument=a,e.flaggedInstrument=a=function(e,t,r){return r()}})),e("@ember/modifier/index",["exports","@ember/-internals/glimmer"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"setModifierManager",{enumerable:!0,get:function(){return t.setModifierManager}}),Object.defineProperty(e,"capabilties",{enumerable:!0,get:function(){return t.modifierCapabilities}})})),e("@ember/object/compat",["exports","@ember/-internals/metal","@ember/debug","@glimmer/validator"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.dependentKeyCompat=o
+var i=function(e,t,r){var{get:i}=r
+return void 0!==i&&(r.get=function(){var e,r=(0,n.tagFor)(this,t),o=(0,n.track)(()=>{e=i.call(this)})
+return(0,n.updateTag)(r,o),(0,n.consumeTag)(o),e}),r}
+function o(e,r,n){if(!(0,t.isElementDescriptor)([e,r,n])){n=e
+var o=function(e,t){return i(0,t,n)}
+return(0,t.setClassicDecorator)(o),o}return i(0,r,n)}(0,t.setClassicDecorator)(o)})),e("@ember/object/computed",["exports","@ember/object/lib/computed/computed_macros","@ember/object/lib/computed/reduce_computed_macros"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"empty",{enumerable:!0,get:function(){return t.empty}}),Object.defineProperty(e,"notEmpty",{enumerable:!0,get:function(){return t.notEmpty}}),Object.defineProperty(e,"none",{enumerable:!0,get:function(){return t.none}}),Object.defineProperty(e,"not",{enumerable:!0,get:function(){return t.not}}),Object.defineProperty(e,"bool",{enumerable:!0,get:function(){return t.bool}}),Object.defineProperty(e,"match",{enumerable:!0,get:function(){return t.match}}),Object.defineProperty(e,"equal",{enumerable:!0,get:function(){return t.equal}}),Object.defineProperty(e,"gt",{enumerable:!0,get:function(){return t.gt}}),Object.defineProperty(e,"gte",{enumerable:!0,get:function(){return t.gte}}),Object.defineProperty(e,"lt",{enumerable:!0,get:function(){return t.lt}}),Object.defineProperty(e,"lte",{enumerable:!0,get:function(){return t.lte}}),Object.defineProperty(e,"oneWay",{enumerable:!0,get:function(){return t.oneWay}}),Object.defineProperty(e,"readOnly",{enumerable:!0,get:function(){return t.readOnly}}),Object.defineProperty(e,"deprecatingAlias",{enumerable:!0,get:function(){return t.deprecatingAlias}}),Object.defineProperty(e,"and",{enumerable:!0,get:function(){return t.and}}),Object.defineProperty(e,"or",{enumerable:!0,get:function(){return t.or}}),Object.defineProperty(e,"sum",{enumerable:!0,get:function(){return r.sum}}),Object.defineProperty(e,"min",{enumerable:!0,get:function(){return r.min}}),Object.defineProperty(e,"max",{enumerable:!0,get:function(){return r.max}}),Object.defineProperty(e,"map",{enumerable:!0,get:function(){return r.map}}),Object.defineProperty(e,"sort",{enumerable:!0,get:function(){return r.sort}}),Object.defineProperty(e,"setDiff",{enumerable:!0,get:function(){return r.setDiff}}),Object.defineProperty(e,"mapBy",{enumerable:!0,get:function(){return r.mapBy}}),Object.defineProperty(e,"filter",{enumerable:!0,get:function(){return r.filter}}),Object.defineProperty(e,"filterBy",{enumerable:!0,get:function(){return r.filterBy}}),Object.defineProperty(e,"uniq",{enumerable:!0,get:function(){return r.uniq}}),Object.defineProperty(e,"uniqBy",{enumerable:!0,get:function(){return r.uniqBy}}),Object.defineProperty(e,"union",{enumerable:!0,get:function(){return r.union}}),Object.defineProperty(e,"intersect",{enumerable:!0,get:function(){return r.intersect}})
+Object.defineProperty(e,"collect",{enumerable:!0,get:function(){return r.collect}})})),e("@ember/object/index",["exports","@ember/debug","@ember/polyfills","@ember/-internals/metal"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.action=a
+var i=new WeakMap
+function o(e,t,n){if(void 0!==e.constructor&&"function"==typeof e.constructor.proto&&e.constructor.proto(),!Object.prototype.hasOwnProperty.call(e,"actions")){var o=e.actions
+e.actions=o?(0,r.assign)({},o):{}}return e.actions[t]=n,{get(){var e=i.get(this)
+void 0===e&&(e=new Map,i.set(this,e))
+var t=e.get(n)
+return void 0===t&&(t=n.bind(this),e.set(n,t)),t}}}function a(e,t,r){var i
+if(!(0,n.isElementDescriptor)([e,t,r])){i=e
+var a=function(e,t){return o(e,t,i)}
+return(0,n.setClassicDecorator)(a),a}return o(e,t,i=r.value)}(0,n.setClassicDecorator)(a)})),e("@ember/object/lib/computed/computed_macros",["exports","@ember/-internals/metal","@ember/debug"],(function(e,t){"use strict"
+function r(e,r){return(...e)=>{var n=function(e,r){var n=[]
+function i(e){n.push(e)}for(var o=0;o<r.length;o++){var a=r[o];(0,t.expandProperties)(a,i)}return n}(0,e)
+return(0,t.computed)(...n,(function(){for(var e=n.length-1,i=0;i<e;i++){var o=(0,t.get)(this,n[i])
+if(!r(o))return o}return(0,t.get)(this,n[e])}))}}Object.defineProperty(e,"__esModule",{value:!0}),e.empty=function(e){return(0,t.computed)(e+".length",(function(){return(0,t.isEmpty)((0,t.get)(this,e))}))},e.notEmpty=function(e){return(0,t.computed)(e+".length",(function(){return!(0,t.isEmpty)((0,t.get)(this,e))}))},e.none=function(e){return(0,t.computed)(e,(function(){return(0,t.isNone)((0,t.get)(this,e))}))},e.not=function(e){return(0,t.computed)(e,(function(){return!(0,t.get)(this,e)}))},e.bool=function(e){return(0,t.computed)(e,(function(){return Boolean((0,t.get)(this,e))}))},e.match=function(e,r){return(0,t.computed)(e,(function(){var n=(0,t.get)(this,e)
+return r.test(n)}))},e.equal=function(e,r){return(0,t.computed)(e,(function(){return(0,t.get)(this,e)===r}))},e.gt=function(e,r){return(0,t.computed)(e,(function(){return(0,t.get)(this,e)>r}))},e.gte=function(e,r){return(0,t.computed)(e,(function(){return(0,t.get)(this,e)>=r}))},e.lt=function(e,r){return(0,t.computed)(e,(function(){return(0,t.get)(this,e)<r}))},e.lte=function(e,r){return(0,t.computed)(e,(function(){return(0,t.get)(this,e)<=r}))},e.oneWay=function(e){return(0,t.alias)(e).oneWay()},e.readOnly=function(e){return(0,t.alias)(e).readOnly()},e.deprecatingAlias=function(e){return(0,t.computed)(e,{get(r){return(0,t.get)(this,e)},set(r,n){return(0,t.set)(this,e,n),n}})},e.or=e.and=void 0
+var n=r(0,e=>e)
+e.and=n
+var i=r(0,e=>!e)
+e.or=i})),e("@ember/object/lib/computed/reduce_computed_macros",["exports","@ember/debug","@ember/-internals/metal","@ember/-internals/runtime"],(function(e,t,r,n){"use strict"
+function i(e,t,n){return(0,r.computed)(e+".[]",(function(){var i=(0,r.get)(this,e)
+return null===i||"object"!=typeof i?n:i.reduce(t,n,this)})).readOnly()}function o(e,t,i){var o
+return/@each/.test(e)?o=e.replace(/\.@each.*$/,""):(o=e,e+=".[]"),(0,r.computed)(e,...t,(function(){var e=(0,r.get)(this,o)
+return(0,n.isArray)(e)?(0,n.A)(i.call(this,e)):(0,n.A)()})).readOnly()}function a(e,t){var i=e.map(e=>e+".[]")
+return(0,r.computed)(...i,(function(){return(0,n.A)(t.call(this,e))})).readOnly()}function s(e,t,r){return void 0===r&&"function"==typeof t&&(r=t,t=[]),o(e,t,(function(e){return e.map(r,this)}))}function l(e,t,r){return void 0===r&&"function"==typeof t&&(r=t,t=[]),o(e,t,(function(e){return e.filter(r,this)}))}function u(...e){return a(e,(function(e){var t=(0,n.A)(),i=new Set
+return e.forEach(e=>{var o=(0,r.get)(this,e);(0,n.isArray)(o)&&o.forEach(e=>{i.has(e)||(i.add(e),t.push(e))})}),t}))}Object.defineProperty(e,"__esModule",{value:!0}),e.sum=function(e){return i(e,(e,t)=>e+t,0,"sum")},e.max=function(e){return i(e,(e,t)=>Math.max(e,t),-1/0,"max")},e.min=function(e){return i(e,(e,t)=>Math.min(e,t),1/0,"min")},e.map=s,e.mapBy=function(e,t){return s(`${e}.@each.${t}`,e=>(0,r.get)(e,t))},e.filter=l,e.filterBy=function(e,t,n){var i
+i=2===arguments.length?e=>(0,r.get)(e,t):e=>(0,r.get)(e,t)===n
+return l(`${e}.@each.${t}`,i)},e.uniq=u,e.uniqBy=function(e,t){return(0,r.computed)(e+".[]",(function(){var i=(0,r.get)(this,e)
+return(0,n.isArray)(i)?(0,n.uniqBy)(i,t):(0,n.A)()})).readOnly()},e.intersect=function(...e){return a(e,(function(e){var t=e.map(e=>{var t=(0,r.get)(this,e)
+return(0,n.isArray)(t)?t:[]}),i=t.pop().filter(e=>{for(var r=0;r<t.length;r++){for(var n=!1,i=t[r],o=0;o<i.length;o++)if(i[o]===e){n=!0
+break}if(!1===n)return!1}return!0})
+return(0,n.A)(i)}),"intersect")},e.setDiff=function(e,t){return(0,r.computed)(e+".[]",t+".[]",(function(){var i=(0,r.get)(this,e),o=(0,r.get)(this,t)
+return(0,n.isArray)(i)?(0,n.isArray)(o)?i.filter(e=>-1===o.indexOf(e)):(0,n.A)(i):(0,n.A)()})).readOnly()},e.collect=function(...e){return a(e,(function(){var t=e.map(e=>{var t=(0,r.get)(this,e)
+return void 0===t?null:t})
+return(0,n.A)(t)}),"collect")},e.sort=function(e,t,r){void 0!==r||Array.isArray(t)||(r=t,t=[])
+return"function"==typeof r?d(e,t,r):h(e,r)},e.union=void 0
+var c=u
+function d(e,t,r){return o(e,t,(function(e){return e.slice().sort((e,t)=>r.call(this,e,t))}))}function h(e,t){return(0,r.autoComputed)((function(){var i=(0,r.get)(this,t),o="@this"===e,a=function(e){return e.map(e=>{var[t,r]=e.split(":")
+return[t,r=r||"asc"]})}(i),s=o?this:(0,r.get)(this,e)
+return(0,n.isArray)(s)?0===a.length?(0,n.A)(s.slice()):function(e,t){return(0,n.A)(e.slice().sort((e,i)=>{for(var o=0;o<t.length;o++){var[a,s]=t[o],l=(0,n.compare)((0,r.get)(e,a),(0,r.get)(i,a))
+if(0!==l)return"desc"===s?-1*l:l}return 0}))}(s,a):(0,n.A)()})).readOnly()}e.union=c})),e("@ember/polyfills/index",["exports","@ember/deprecated-features","@ember/polyfills/lib/merge","@ember/polyfills/lib/assign","@ember/polyfills/lib/weak_set"],(function(e,t,r,n,i){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"assign",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"assignPolyfill",{enumerable:!0,get:function(){return n.assign}}),Object.defineProperty(e,"_WeakSet",{enumerable:!0,get:function(){return i.default}}),e.merge=void 0
+var o=t.MERGE?r.default:void 0
+e.merge=o})),e("@ember/polyfills/lib/assign",["exports"],(function(e){"use strict"
+function t(e){for(var t=1;t<arguments.length;t++){var r=arguments[t]
+if(r)for(var n=Object.keys(r),i=0;i<n.length;i++){var o=n[i]
+e[o]=r[o]}}return e}Object.defineProperty(e,"__esModule",{value:!0}),e.assign=t,e.default=void 0
+var{assign:r}=Object,n=r||t
+e.default=n})),e("@ember/polyfills/lib/merge",["exports","@ember/debug"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){if(null===t||"object"!=typeof t)return e
+for(var r,n=Object.keys(t),i=0;i<n.length;i++)r=n[i],e[r]=t[r]
+return e}})),e("@ember/polyfills/lib/weak_set",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t="function"==typeof WeakSet?WeakSet:class{constructor(){this._map=new WeakMap}add(e){return this._map.set(e,!0),this}delete(e){return this._map.delete(e)}has(e){return this._map.has(e)}}
+e.default=t})),e("@ember/runloop/index",["exports","@ember/debug","@ember/-internals/error-handling","@ember/-internals/metal","backburner"],(function(e,t,r,n,i){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.getCurrentRunLoop=function(){return o},e.run=u,e.join=d,e.begin=function(){l.begin()},e.end=function(){l.end()},e.schedule=function(){return l.schedule(...arguments)},e.hasScheduledTimers=function(){return l.hasTimers()},e.cancelTimers=function(){l.cancelTimers()},e.later=function(){return l.later(...arguments)},e.once=function(...e){return e.unshift("actions"),l.scheduleOnce(...e)},e.scheduleOnce=function(){return l.scheduleOnce(...arguments)},e.next=function(...e){return e.push(1),l.later(...e)},e.cancel=function(e){return l.cancel(e)},e.debounce=function(){return l.debounce(...arguments)},e.throttle=function(){return l.throttle(...arguments)},e.bind=e._globalsRun=e.backburner=e.queues=e._rsvpErrorQueue=void 0
+var o=null
+var a=`${Math.random()}${Date.now()}`.replace(".","")
+e._rsvpErrorQueue=a
+var s=["actions","routerTransitions","render","afterRender","destroy",a]
+e.queues=s
+var l=new i.default(s,{defaultQueue:"actions",onBegin:function(e){o=e},onEnd:function(e,t){o=t,(0,n.flushAsyncObservers)()},onErrorTarget:r.onErrorTarget,onErrorMethod:"onerror",flush:function(e,t){"render"!==e&&e!==a||(0,n.flushAsyncObservers)(),t()}})
+function u(){return l.run(...arguments)}e.backburner=l
+var c=u.bind(null)
+function d(){return l.join(...arguments)}e._globalsRun=c
+e.bind=(...e)=>(...t)=>d(...e.concat(t))})),e("@ember/service/index",["exports","@ember/-internals/runtime","@ember/-internals/metal"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.inject=function(){return(0,r.inject)("service",...arguments)},e.default=void 0
+var n=t.FrameworkObject.extend()
+n.reopenClass({isServiceFactory:!0})
+var i=n
+e.default=i})),e("@ember/string/index",["exports","@ember/string/lib/string_registry","@ember/-internals/environment","@ember/-internals/utils"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.loc=w,e.w=E,e.decamelize=x,e.dasherize=O,e.camelize=S,e.classify=T,e.underscore=M,e.capitalize=A,Object.defineProperty(e,"_getStrings",{enumerable:!0,get:function(){return t.getStrings}}),Object.defineProperty(e,"_setStrings",{enumerable:!0,get:function(){return t.setStrings}})
+var i=/[ _]/g,o=new n.Cache(1e3,e=>x(e).replace(i,"-")),a=/(-|_|\.|\s)+(.)?/g,s=/(^|\/)([A-Z])/g,l=new n.Cache(1e3,e=>e.replace(a,(e,t,r)=>r?r.toUpperCase():"").replace(s,e=>e.toLowerCase())),u=/^(-|_)+(.)?/,c=/(.)(-|_|\.|\s)+(.)?/g,d=/(^|\/|\.)([a-z])/g,h=new n.Cache(1e3,e=>{for(var t=(e,t,r)=>r?"_"+r.toUpperCase():"",r=(e,t,r,n)=>t+(n?n.toUpperCase():""),n=e.split("/"),i=0;i<n.length;i++)n[i]=n[i].replace(u,t).replace(c,r)
+return n.join("/").replace(d,e=>e.toUpperCase())}),f=/([a-z\d])([A-Z]+)/g,p=/-|\s+/g,m=new n.Cache(1e3,e=>e.replace(f,"$1_$2").replace(p,"_").toLowerCase()),v=/(^|\/)([a-z\u00C0-\u024F])/g,g=new n.Cache(1e3,e=>e.replace(v,e=>e.toUpperCase())),b=/([a-z\d])([A-Z])/g,y=new n.Cache(1e3,e=>e.replace(b,"$1_$2").toLowerCase())
+function _(e,t){var r=0
+return e.replace(/%@([0-9]+)?/g,(e,n)=>{var i=n?parseInt(n,10)-1:r++,o=i<t.length?t[i]:void 0
+return"string"==typeof o?o:null===o?"(null)":void 0===o?"":String(o)})}function w(e,r){return(!Array.isArray(r)||arguments.length>2)&&(r=Array.prototype.slice.call(arguments,1)),_(e=(0,t.getString)(e)||e,r)}function E(e){return e.split(/\s+/)}function x(e){return y.get(e)}function O(e){return o.get(e)}function S(e){return l.get(e)}function T(e){return h.get(e)}function M(e){return m.get(e)}function A(e){return g.get(e)}r.ENV.EXTEND_PROTOTYPES.String&&Object.defineProperties(String.prototype,{w:{configurable:!0,enumerable:!1,writeable:!0,value(){return E(this)}},loc:{configurable:!0,enumerable:!1,writeable:!0,value(...e){return w(this,e)}},camelize:{configurable:!0,enumerable:!1,writeable:!0,value(){return S(this)}},decamelize:{configurable:!0,enumerable:!1,writeable:!0,value(){return x(this)}},dasherize:{configurable:!0,enumerable:!1,writeable:!0,value(){return O(this)}},underscore:{configurable:!0,enumerable:!1,writeable:!0,value(){return M(this)}},classify:{configurable:!0,enumerable:!1,writeable:!0,value(){return T(this)}},capitalize:{configurable:!0,enumerable:!1,writeable:!0,value(){return A(this)}}})}))
+e("@ember/string/lib/string_registry",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.setStrings=function(e){t=e},e.getStrings=function(){return t},e.getString=function(e){return t[e]}
+var t={}})),e("@glimmer/encoder",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.InstructionEncoderImpl=void 0
+e.InstructionEncoderImpl=class{constructor(e){this.buffer=e,this.size=0}encode(e,t){if(e>255)throw new Error(`Opcode type over 8-bits. Got ${e}.`)
+var r=e|t|arguments.length-2<<8
+this.buffer.push(r)
+for(var n=2;n<arguments.length;n++){var i=arguments[n]
+if("number"==typeof i&&i>2147483647)throw new Error(`Operand over 32-bits. Got ${i}.`)
+this.buffer.push(i)}this.size=this.buffer.length}patch(e,t){if(-1!==this.buffer[e+1])throw new Error("Trying to patch operand in populated slot instead of a reserved slot.")
+this.buffer[e+1]=t}}})),e("@glimmer/env",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.CI=e.DEBUG=void 0
+e.DEBUG=!1
+e.CI=!1})),e("@glimmer/low-level",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.Stack=e.Storage=void 0
+e.Storage=class{constructor(){this.array=[],this.next=0}add(e){var{next:t,array:r}=this
+if(t===r.length)this.next++
+else{var n=r[t]
+this.next=n}return this.array[t]=e,t}deref(e){return this.array[e]}drop(e){this.array[e]=this.next,this.next=e}}
+class t{constructor(e=[]){this.vec=e}clone(){return new t(this.vec.slice())}sliceFrom(e){return new t(this.vec.slice(e))}slice(e,r){return new t(this.vec.slice(e,r))}copy(e,t){this.vec[t]=this.vec[e]}writeRaw(e,t){this.vec[e]=t}getRaw(e){return this.vec[e]}reset(){this.vec.length=0}len(){return this.vec.length}}e.Stack=t})),e("@glimmer/node",["exports","@glimmer/runtime","@simple-dom/document"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.serializeBuilder=function(e,t){return o.forInitialRender(e,t)},e.NodeDOMTreeConstruction=void 0
+class n extends t.DOMTreeConstruction{constructor(e){super(e||(0,r.default)())}setupUselessElement(){}insertHTMLBefore(e,r,n){var i=this.document.createRawHTMLSection(n)
+return e.insertBefore(i,r),new t.ConcreteBounds(e,i,i)}createElement(e){return this.document.createElement(e)}setAttribute(e,t,r){e.setAttribute(t,r)}}e.NodeDOMTreeConstruction=n
+var i=new WeakMap
+class o extends t.NewElementBuilder{constructor(){super(...arguments),this.serializeBlockDepth=0}__openBlock(){var{tagName:e}=this.element
+if("TITLE"!==e&&"SCRIPT"!==e&&"STYLE"!==e){var t=this.serializeBlockDepth++
+this.__appendComment(`%+b:${t}%`)}super.__openBlock()}__closeBlock(){var{tagName:e}=this.element
+if(super.__closeBlock(),"TITLE"!==e&&"SCRIPT"!==e&&"STYLE"!==e){var t=--this.serializeBlockDepth
+this.__appendComment(`%-b:${t}%`)}}__appendHTML(e){var{tagName:r}=this.element
+if("TITLE"===r||"SCRIPT"===r||"STYLE"===r)return super.__appendHTML(e)
+var n=this.__appendComment("%glmr%")
+if("TABLE"===r){var i=e.indexOf("<")
+if(i>-1)"tr"===e.slice(i+1,i+3)&&(e=`<tbody>${e}</tbody>`)}""===e?this.__appendComment("% %"):super.__appendHTML(e)
+var o=this.__appendComment("%glmr%")
+return new t.ConcreteBounds(this.element,n,o)}__appendText(e){var{tagName:t}=this.element,r=function(e){var{element:t,nextSibling:r}=e
+return null===r?t.lastChild:r.previousSibling}(this)
+return"TITLE"===t||"SCRIPT"===t||"STYLE"===t?super.__appendText(e):""===e?this.__appendComment("% %"):(r&&3===r.nodeType&&this.__appendComment("%|%"),super.__appendText(e))}closeElement(){return i.has(this.element)&&(i.delete(this.element),super.closeElement()),super.closeElement()}openElement(e){return"tr"===e&&"TBODY"!==this.element.tagName&&"THEAD"!==this.element.tagName&&"TFOOT"!==this.element.tagName&&(this.openElement("tbody"),i.set(this.constructing,!0),this.flushElement(null)),super.openElement(e)}pushRemoteElement(e,t,r=null){var{dom:n}=this,i=n.createElement("script")
+return i.setAttribute("glmr",t),n.insertBefore(e,i,r),super.pushRemoteElement(e,t,r)}}})),e("@glimmer/opcode-compiler",["exports","@glimmer/vm","@glimmer/util","@glimmer/program","@glimmer/encoder"],(function(e,t,r,n,i){"use strict"
+function o(e){return{type:"array",value:e}}function a(e){return{type:"string-array",value:e}}function s(e){return{type:"template-meta",value:e}}function l(e){return{type:"other",value:e}}function u(e){return{type:"label",value:e}}Object.defineProperty(e,"__esModule",{value:!0}),e.compileStatements=Q,e.compilable=J,e.staticComponent=function(e,t){var[r,n,i]=t
+if(null===e)return R
+var{compilable:o,capabilities:a,handle:s}=e
+return o?[se(80,s),fe({capabilities:a||c,layout:o,attrs:null,params:r,hash:n,blocks:i})]:[se(80,s),me({capabilities:a||c,attrs:null,params:r,hash:n,atNames:!0,blocks:i})]},e.invokeStaticBlockWithStack=_,e.invokeStaticBlock=y,e.compileStd=we,e.meta=ce,e.templateFactory=Ae,e.Component=function(e,t){var n=Ae(JSON.parse(e))
+return(0,r.unwrapTemplate)(n.create(t)).asLayout()},e.resolveLayoutForTag=h,e.syntaxCompilationContext=function(e,t){return{program:e,macros:t}},e.Context=function(e={},t="aot",r=new z){return{program:new Oe(new d(e),t),macros:r}},e.JitContext=function(e={},t=new z){return{program:new Se(new d(e)),macros:t}},e.AotContext=function(e={},t=new z){return{program:new Oe(new d(e),"aot"),macros:t}},e.templateCompilationContext=B,e.DefaultCompileTimeResolverDelegate=e.MINIMAL_CAPABILITIES=e.DEFAULT_CAPABILITIES=e.JitProgramCompilationContext=e.ProgramCompilationContext=e.EMPTY_BLOCKS=e.WrappedBuilder=e.PartialDefinitionImpl=e.StdLib=e.debugCompiler=e.NONE=e.UNHANDLED=e.MacrosImpl=void 0
+e.DEFAULT_CAPABILITIES={dynamicLayout:!0,dynamicTag:!0,prepareArgs:!0,createArgs:!0,attributeHook:!1,elementHook:!1,dynamicScope:!0,createCaller:!1,updateHook:!0,createInstance:!0,wrapped:!1,willDestroy:!1}
+var c={dynamicLayout:!1,dynamicTag:!1,prepareArgs:!1,createArgs:!1,attributeHook:!1,elementHook:!1,dynamicScope:!1,createCaller:!1,updateHook:!1,createInstance:!1,wrapped:!1,willDestroy:!1}
+e.MINIMAL_CAPABILITIES=c
+class d{constructor(e){this.inner=e}lookupHelper(e,t){if(this.inner.lookupHelper){var r=this.inner.lookupHelper(e,t)
+if(void 0===r)throw new Error(`Unexpected helper (${e} from ${JSON.stringify(t)}) (lookupHelper returned undefined)`)
+return r}throw new Error("Can't compile global helper invocations without an implementation of lookupHelper")}lookupModifier(e,t){if(this.inner.lookupModifier){var r=this.inner.lookupModifier(e,t)
+if(void 0===r)throw new Error(`Unexpected modifier (${e} from ${JSON.stringify(t)}) (lookupModifier returned undefined)`)
+return r}throw new Error("Can't compile global modifier invocations without an implementation of lookupModifier")}lookupComponent(e,t){if(this.inner.lookupComponent){var r=this.inner.lookupComponent(e,t)
+if(void 0===r)throw new Error(`Unexpected component (${e} from ${JSON.stringify(t)}) (lookupComponent returned undefined)`)
+return r}throw new Error("Can't compile global component invocations without an implementation of lookupComponent")}lookupPartial(e,t){if(this.inner.lookupPartial){var r=this.inner.lookupPartial(e,t)
+if(void 0===r)throw new Error(`Unexpected partial (${e} from ${JSON.stringify(t)}) (lookupPartial returned undefined)`)
+return r}throw new Error("Can't compile global partial invocations without an implementation of lookupPartial")}resolve(e){if(this.inner.resolve)return this.inner.resolve(e)
+throw new Error("Compile-time debugging requires an implementation of resolve")}}function h(e,{resolver:t,meta:{referrer:r}}){var n=t.lookupComponent(e,r)
+if(null===n)return n
+var{handle:i,compilable:o,capabilities:a}=n
+return{handle:i,compilable:o,capabilities:a||c}}function f(e){return[p(e),se(31)]}function p(e){return se(30,"number"==typeof e&&(0,r.isSmallInt)(e)?{type:"immediate",value:e}:function(e){return{type:"primitive",value:e}}(e))}function m({handle:e,params:r,hash:n}){return[se(0),se("SimpleArgs",{params:r,hash:n,atNames:!1}),se(16,e),se(1),se(36,t.$v0)]}function v(e,t){return[se(59),se(58,a(e)),t(),se(60)]}function g(e,t){return[se("SimpleArgs",{params:t,hash:null,atNames:!0}),se(24,e),se(25),se("Option",se("JitCompileBlock")),se(64),se(40),se(1)]}function b(e){return[w(e&&e.symbolTable),se(62),se("PushCompilable",e)]}function y(e){return[se(0),se("PushCompilable",e),se("JitCompileBlock"),se(2),se(1)]}function _(e,r){var{parameters:n}=e.symbolTable,i=n.length,o=Math.min(r,i)
+if(0===o)return y(e)
+var a=[]
+if(a.push(se(0)),o){a.push(se(39))
+for(var s=0;s<o;s++)a.push(se(33,t.$fp,r-s)),a.push(se(19,n[s]))}return a.push(se("PushCompilable",e)),a.push(se("JitCompileBlock")),a.push(se(2)),o&&a.push(se(40)),a.push(se(1)),a}function w(e){return e?se(63,{type:"serializable",value:e}):p(null)}function E(e){var t=[],r=0
+e((function(e,n){t.push({match:e,callback:n,label:"CLAUSE"+r++})}))
+var n=[se(69,2),se(68),se(32),se("StartLabels")]
+for(var i of t.slice(0,-1))n.push(se(67,u(i.label),i.match))
+for(var o=t.length-1;o>=0;o--){var a=t[o]
+n.push(se("Label",a.label),se(34,2),a.callback()),0!==o&&n.push(se(4,u("END")))}return n.push(se("Label","END"),se("StopLabels"),se(70)),n}function x({args:e,body:t}){var{count:r,actions:n}=e()
+return[se("StartLabels"),se(0),se(6,u("ENDINITIAL")),n,se(69,r),t(),se("Label","FINALLY"),se(70),se(5),se("Label","ENDINITIAL"),se(1),se("StopLabels")]}function O({args:e,ifTrue:t,ifFalse:r}){return x({args:e,body:()=>{var e=[se(66,u("ELSE")),t(),se(4,u("FINALLY")),se("Label","ELSE")]
+return r&&e.push(r()),e}})}function S(e,t){var{encoder:n,syntax:{program:{mode:i,constants:o}}}=e
+switch(t.op){case"Option":return I(e,function(e){var t=e.op1
+return null===t?R:t}(t))
+case"Label":return n.label(t.op1)
+case"StartLabels":return n.startLabels()
+case"StopLabels":return n.stopLabels()
+case"JitCompileBlock":return I(e,function(e){return"jit"===e?se(61):R}(i))
+case"GetComponentLayout":return n.push(o,function(e){return"aot"===e?94:95}(i),t.op1)
+case"SetBlock":return n.push(o,function(e){return"aot"===e?20:21}(i),t.op1)
+default:return(0,r.exhausted)(t)}}function T(e,t){F(e,function(e,t){switch(t.op){case"CompileBlock":return function(e,t){return function(e,t){var[,r,n,i,o]=e,a=te(o,t.meta),s=re(r,t.meta,"Expected block head to be a string")
+if("string"!=typeof s)return s
+return t.syntax.macros.blocks.compile(s,n||[],i,a,t)}(t.op1,e)}(e,t)
+case"CompileInline":return function(e,t){var{inline:r,ifUnhandled:n}=t.op1,i=function(e,t){return t.syntax.macros.inlines.compile(e,t)}(r,e)
+return N(i)?i:n(r)}(e,t)
+case"InvokeStatic":return function(e,t){var r=t.op1
+if("aot"===e.program.mode){var n=r.compile(e)
+return"number"!=typeof n?se("Error",{problem:"Invalid block",start:0,end:0}):se(3,n===Y?()=>r.compile(e):n)}return[se(29,l(t.op1)),se(61),se(2)]}(e.syntax,t)
+case"Args":return function({params:e,hash:t,blocks:n,atNames:i}){for(var o=[],s=n.names,l=0;l<s.length;l++)o.push(b(n.get(s[l])))
+var{count:u,actions:c}=ue(e)
+o.push(c)
+var d=u<<4
+i&&(d|=8)
+n&&(d|=7)
+var h=r.EMPTY_ARRAY
+if(t){h=t[0]
+for(var f=t[1],p=0;p<f.length;p++)o.push(se("Expr",f[p]))}return o.push(se(84,a(h),a(s),d)),o}(t.op1)
+case"PushCompilable":return function(e,t){if(null===e)return p(null)
+if("aot"===t.program.mode){var r=e.compile(t)
+return"number"!=typeof r?se("Error",{problem:"Compile Error (TODO: thread better)",start:0,end:0}):p(r)}return se(29,l(e))}(t.op1,e.syntax)
+case"DynamicComponent":return function(e,t){var{definition:r,attrs:n,params:i,args:o,blocks:a,atNames:s}=t.op1,l=n&&n.length>0?X(n,e.meta):null,u=Array.isArray(a)||null===a?te(a,e.meta):a
+return pe(e.meta,{definition:r,attrs:l,params:i,hash:o,atNames:s,blocks:u})}(e,t)
+case"IfResolvedComponent":return function(e,t){var{name:r,attrs:n,blocks:i,staticTemplate:o,dynamicTemplate:a,orElse:s}=t.op1,l=h(r,{resolver:e.syntax.program.resolverDelegate,meta:e.meta}),{meta:u}=e
+if(null!==l){var{handle:c,capabilities:d,compilable:f}=l,p=X(n,u),m=te(i,u)
+return null!==f?o(c,d,f,{attrs:p,blocks:m}):a(c,d,{attrs:p,blocks:m})}if(s)return s()
+throw new Error("Compile Error: Cannot find component "+r)}(e,t)
+default:return(0,r.exhausted)(t)}}(e,t))}function M(e,t,r){void 0!==r.op3?e.push(t,r.op,r.op1,r.op2,r.op3):void 0!==r.op2?e.push(t,r.op,r.op1,r.op2):void 0!==r.op1?e.push(t,r.op,r.op1):e.push(t,r.op)}e.DefaultCompileTimeResolverDelegate=d
+class A{constructor(){this.names={},this.funcs=[]}add(e,t){this.names[e]=this.funcs.push(t)-1}compile(e,t){var r=e[0],n=this.names[r]
+return(0,this.funcs[n])(e,t)}}var P=new A
+function C(e,t){if(void 0===t||0===t.length)return e
+Array.isArray(e)||(e=[e])
+for(var r=0;r<t.length;r++)e.push(se(23,t[r]))
+return e}function k(e,t,n,i){switch(n.op){case"SimpleArgs":L(e,t,function(e,t,n){var i=[],{count:o,actions:s}=ue(e)
+i.push(s)
+var l=o<<4
+n&&(l|=8)
+var u=r.EMPTY_ARRAY
+if(t){u=t[0]
+for(var c=t[1],d=0;d<c.length;d++)i.push(se("Expr",c[d]))}return i.push(se(84,a(u),a(r.EMPTY_ARRAY),l)),i}(n.op1.params,n.op1.hash,n.op1.atNames),i)
+break
+case"Expr":L(e,t,(h=n.op1,f=t.meta,Array.isArray(h)?P.compile(h,f):[p(h),se(31)]),i)
+break
+case"IfResolved":L(e,t,function(e,{op1:t}){var{kind:r,name:n,andThen:i,orElse:o,span:a}=t,s=function(e,t,r,n){switch(t){case"Modifier":return e.lookupModifier(r,n)
+case"Helper":return e.lookupHelper(r,n)
+case"ComponentDefinition":var i=e.lookupComponent(r,n)
+return i&&i.handle}}(e.syntax.program.resolverDelegate,r,n,e.meta.referrer)
+return null!==s?i(s):o?o():ae(`Unexpected ${r} ${n}`,a.start,a.end)}(t,n),i)
+break
+case"ResolveFree":throw new Error("Unimplemented HighLevelResolutionOpcode.ResolveFree")
+case"ResolveContextualFree":var{freeVar:o,context:s}=n.op1
+if(t.meta.asPartial){L(e,t,[se(105,t.meta.upvars[o])],i)
+break}switch(s){case 1:var l=t.meta.upvars[o]
+L(e,t,[se(22,0),se(23,l)],i)
+break
+case 0:var u=t.syntax.program.resolverDelegate,c=t.meta.upvars[o],d=u.lookupHelper(c,t.meta.referrer)
+L(e,t,d?m({handle:d,params:null,hash:null}):[se(22,0),se(23,c)],i)
+break
+default:throw new Error("unimplemented: Can't evaluate expression in context "+s)}break
+default:return(0,r.exhausted)(n)}var h,f}P.add(31,([,e])=>{var t=[]
+for(var r of e)t.push(se("Expr",r))
+return t.push(se(28,e.length)),t}),P.add(30,([,e,r,n],i)=>{if(function(e,t){if(!Array.isArray(e))return!1
+if(n=e,n[0]>=34){var r=e[1]
+return!(!t.upvars||"component"!==t.upvars[r])}var n
+return!1}(e,i)){if(!r||0===r.length)return se("Error",{problem:"component helper requires at least one argument",start:0,end:0})
+var[o,...a]=r
+return function({definition:e,params:r,hash:n,atNames:i},o){return[se(0),se("SimpleArgs",{params:r,hash:n,atNames:i}),se(88),se("Expr",e),se(79,s(o)),se(1),se(36,t.$v0)]}({definition:o,params:a,hash:n,atNames:!1},i.referrer)}var l=re(e,i,"Expected call head to be a string")
+return"string"!=typeof l?l:se("IfResolved",{kind:"Helper",name:l,andThen:e=>m({handle:e,params:r,hash:n}),span:{start:0,end:0}})}),P.add(32,([,e,t])=>C(se(22,e),t)),P.add(33,([,e,t])=>C(se("ResolveFree",e),t)),P.add(34,([,e,t])=>C(se("ResolveContextualFree",{freeVar:e,context:0}),t)),P.add(35,([,e,t])=>C(se("ResolveContextualFree",{freeVar:e,context:1}),t)),P.add(36,([,e,t])=>C(se("ResolveContextualFree",{freeVar:e,context:2}),t)),P.add(37,([,e,t])=>C(se("ResolveContextualFree",{freeVar:e,context:3}),t)),P.add(38,([,e,t])=>C(se("ResolveContextualFree",{freeVar:e,context:4}),t)),P.add(39,([,e,t])=>C(se("ResolveContextualFree",{freeVar:e,context:5}),t)),P.add(29,()=>f(void 0)),P.add(27,([,e])=>[se("Expr",e),se(26)]),P.add(28,([,e])=>[se("Expr",e),se(25),se("JitCompileBlock"),se(27)])
+var R={"no-action":!0}
+e.NONE=R
+var j={"not-handled":!0}
+function D(e){return e&&!!e["no-action"]}function N(e){return!e||!e["not-handled"]}function I(e,t){if(!D(t))if(Array.isArray(t))for(var r of t)I(e,r)
+else"Simple"===t.type?S(e,t):M(e.encoder,e.syntax.program.constants,t)}function L(e,t,n,i){if(!D(n))if(Array.isArray(n))for(var o of n)L(e,t,o,i)
+else if("Number"===n.type)M(e,i,n)
+else if("Resolution"===n.type)k(e,t,n,i)
+else if("Simple"===n.type)S(t,n)
+else{if("Error"!==n.type)throw(0,r.assertNever)(n,"unexpected action kind")
+e.error({problem:n.op1.problem,span:{start:n.op1.start,end:n.op1.end}})}}function F(e,t){if(!D(t))if(Array.isArray(t))for(var n of t)F(e,n)
+else if("Number"===t.type)M(e.encoder,e.syntax.program.constants,t)
+else if("Compile"===t.type)T(e,t)
+else if("Resolution"===t.type)k(e.encoder,e,t,e.syntax.program.constants)
+else if("Simple"===t.type)S(e,t)
+else if("Error"!==t.type)throw(0,r.assertNever)(t,"unexpected action type")}e.UNHANDLED=j
+class z{constructor(){var{blocks:e,inlines:r}=function(e,r){return e.add("if",(e,t,r)=>{if(!e||1!==e.length)throw new Error("SYNTAX ERROR: #if requires a single argument")
+return O({args:()=>({count:1,actions:[se("Expr",e[0]),se(71)]}),ifTrue:()=>y(r.get("default")),ifFalse:()=>r.has("else")?y(r.get("else")):R})}),e.add("unless",(e,t,r)=>{if(!e||1!==e.length)throw new Error("SYNTAX ERROR: #unless requires a single argument")
+return O({args:()=>({count:1,actions:[se("Expr",e[0]),se(71)]}),ifTrue:()=>r.has("else")?y(r.get("else")):R,ifFalse:()=>y(r.get("default"))})}),e.add("with",(e,r,n)=>{if(!e||1!==e.length)throw new Error("SYNTAX ERROR: #with requires a single argument")
+return O({args:()=>({count:2,actions:[se("Expr",e[0]),se(33,t.$sp,0),se(71)]}),ifTrue:()=>_(n.get("default"),1),ifFalse:()=>n.has("else")?y(n.get("else")):R})}),e.add("let",(e,t,r)=>{if(!e)return ae("let requires arguments",0,0)
+var{count:n,actions:i}=ue(e)
+return[i,_(r.get("default"),n)]}),e.add("each",(e,r,n)=>x({args(){var t
+return(t=r&&"key"===r[0][0]?[se("Expr",r[1][0])]:[f(null)]).push(se("Expr",e[0])),{count:2,actions:t}},body(){var e=[se(74),se(66,u("ELSE")),se(0),se(33,t.$fp,1),se(6,u("ITER")),se(72,u("BODY")),se("Label","ITER"),se(75,u("BREAK")),se("Label","BODY"),_(n.get("default"),2),se(34,2),se(4,u("FINALLY")),se("Label","BREAK"),se(73),se(1),se(4,u("FINALLY")),se("Label","ELSE")]
+return n.has("else")&&e.push(y(n.get("else"))),e}})),e.add("in-element",(e,r,n)=>{if(!e||1!==e.length)throw new Error("SYNTAX ERROR: #in-element requires a single argument")
+return O({args(){for(var[n,i]=r,o=[],a=0;a<n.length;a++){var s=n[a]
+if("guid"!==s&&"insertBefore"!==s)throw new Error(`SYNTAX ERROR: #in-element does not take a \`${n[0]}\` option`)
+o.push(se("Expr",i[a]))}return o.push(se("Expr",e[0]),se(33,t.$sp,0)),{count:4,actions:o}},ifTrue:()=>[se(50),y(n.get("default")),se(56)]})}),e.add("-with-dynamic-vars",(e,t,r)=>{if(t){var[n,i]=t,{actions:o}=ue(i)
+return[o,v(n,()=>y(r.get("default")))]}return y(r.get("default"))}),e.add("component",(e,t,r,n)=>{if("string"==typeof e[0]){var i=he(n,e[0],t,r.get("default"))
+if(N(i))return i}var[o,...a]=e
+return se("DynamicComponent",{definition:o,attrs:null,params:a,args:t,atNames:!1,blocks:r})}),r.add("component",(e,t,r,n)=>{var i=t&&t[0]
+if("string"==typeof i){var o=he(n,i,r,null)
+if(o!==j)return o}var[a,...s]=t
+return pe(n.meta,{definition:a,attrs:null,params:s,hash:r,atNames:!1,blocks:ee})}),{blocks:e,inlines:r}}(new U,new H)
+this.blocks=e,this.inlines=r}}e.MacrosImpl=z
+class U{constructor(){this.names=(0,r.dict)(),this.funcs=[]}add(e,t){this.funcs.push(t),this.names[e]=this.funcs.length-1}addMissing(e){this.missing=e}compile(e,t,r,n,i){var o=this.names[e],a={resolver:i.syntax.program.resolverDelegate,meta:i.meta}
+return void 0===o?(0,this.missing)(e,t,r,n,a):(0,this.funcs[o])(t,r,n,a)}}class H{constructor(){this.names=(0,r.dict)(),this.funcs=[]}add(e,t){this.funcs.push(t),this.names[e]=this.funcs.length-1}addMissing(e){this.missing=e}compile(e,t){var r,n,i,[,o]=e
+if(!Array.isArray(o))return j
+if(30===o[0]){var a=re(o[1],t.meta,"Expected head of call to be a string")
+if("string"!=typeof a)return a
+r=a,n=o[2],i=o[3]}else{if(!ie(o))return j
+var s=ne(o,t.meta)
+if(null===s)return j
+r=s,n=null,i=null}var l=this.names[r],u={resolver:t.syntax.program.resolverDelegate,meta:t.meta}
+return void 0===l&&this.missing?(0,this.missing)(r,n,i,u):void 0!==l?(0,this.funcs[l])(r,n,i,u):j}}function B(e,t){return{syntax:e,encoder:new le,meta:t}}var V=new A,$=["class","id","value","name","type","style","href"],q=["div","span","p","a"]
+function W(e){return"string"==typeof e?e:q[e]}function G(e){return"string"==typeof e?e:$[e]}V.add(3,e=>se(42,e[1])),V.add(13,()=>se(55)),V.add(12,()=>se(54)),V.add(4,(e,t)=>{var[,r,n,i]=e,o=re(r,t,"Expected modifier head to be a string")
+return"string"!=typeof o?o:se("IfResolved",{kind:"Modifier",name:o,andThen:e=>[se(0),se("SimpleArgs",{params:n,hash:i,atNames:!1}),se(57,e),se(1)],span:{start:0,end:0}})}),V.add(14,([,e,t,r])=>se(51,G(e),t,null!=r?r:null)),V.add(24,([,e,t,r])=>se(108,G(e),t,null!=r?r:null)),V.add(15,([,e,t,r])=>[se("Expr",t),se(52,G(e),!1,null!=r?r:null)]),V.add(22,([,e,t,r])=>[se("Expr",t),se(52,G(e),!0,null!=r?r:null)]),V.add(16,([,e,t,r])=>[se("Expr",t),se(53,G(e),!1,null!=r?r:null)]),V.add(23,([,e,t,r])=>[se("Expr",t),se(53,G(e),!0,null!=r?r:null)]),V.add(10,([,e])=>se(48,W(e))),V.add(11,([,e])=>[se(91),se(48,W(e))]),V.add(8,([,e,t,r,n])=>"string"==typeof e?se("IfResolvedComponent",{name:e,attrs:t,blocks:n,staticTemplate:(e,t,n,{blocks:i,attrs:o})=>[se(80,e),fe({capabilities:t,layout:n,attrs:o,params:null,hash:r,blocks:i})],dynamicTemplate:(e,t,{attrs:n,blocks:i})=>[se(80,e),me({capabilities:t,attrs:n,params:null,hash:r,atNames:!0,blocks:i})]}):se("DynamicComponent",{definition:e,attrs:t,params:null,args:r,blocks:n,atNames:!0})),V.add(19,([,e,r],n)=>O({args:()=>({count:2,actions:[se("Expr",e),se(33,t.$sp,0)]}),ifTrue:()=>[se(104,s(n.referrer),a(n.evalSymbols),o(r)),se(40),se(1)]})),V.add(18,([,e,t])=>g(e,t)),V.add(17,([,e])=>g(e,r.EMPTY_ARRAY)),V.add(26,([,e],t)=>se(106,a(t.evalSymbols),o(e))),V.add(1,e=>{var[,t]=e
+return se("CompileInline",{inline:e,ifUnhandled:()=>[se(0),se("Expr",t),se(3,{type:"stdlib",value:"cautious-append"}),se(1)]})}),V.add(2,e=>{var[,t]=e
+return"string"==typeof t?se(41,t):[se(0),se("Expr",t),se(3,{type:"stdlib",value:"trusting-append"}),se(1)]}),V.add(6,e=>se("CompileBlock",e))
+var Y=-1
+class K{constructor(e,t,r){this.statements=e,this.meta=t,this.symbolTable=r,this.compiled=null}compile(e){return function(e,t){if(null!==e.compiled)return e.compiled
+e.compiled=Y
+var{statements:r,meta:i}=e,o=Q(r,i,t)
+return(0,n.patchStdlibs)(t.program),e.compiled=o,o}(this,e)}}function J(e){var t=e.block
+return new K(t.statements,ce(e),{symbols:t.symbols,hasEval:t.hasEval})}function Q(e,t,r){for(var n=V,i=B(r,t),o=0;o<e.length;o++)F(i,n.compile(e[o],i.meta))
+return i.encoder.commit(r.program.heap,t.size)}function X(e,t){var n=Array.isArray(e)?{statements:e,parameters:r.EMPTY_ARRAY}:e
+return new K(n.statements,t,{parameters:n.parameters})}class Z{constructor(e){this.blocks=e,this.names=e?Object.keys(e):[]}get(e){return this.blocks&&this.blocks[e]||null}has(e){var{blocks:t}=this
+return null!==t&&e in t}with(e,t){var{blocks:n}=this
+return new Z(n?(0,r.assign)({},n,{[e]:t}):{[e]:t})}get hasAny(){return null!==this.blocks}}var ee=new Z(null)
+function te(e,t){if(null===e)return ee
+for(var n=(0,r.dict)(),[i,o]=e,a=0;a<i.length;a++)n[i[a]]=X(o[a],t)
+return new Z(n)}function re(e,t,r){if(!t.upvars)return ae(r+", but there were no free variables in the template",0,0)
+if(!Array.isArray(e))throw new Error(`${r}, got ${JSON.stringify(e)}`)
+if(ie(e)){var n=ne(e,t)
+if(null!==n)return n}throw new Error(`${r}, got ${JSON.stringify(e)}`)}function ne(e,t){return 3===e.length&&e[2].length>0?null:function(e){return e[0]>=33}(e)?t.upvars[e[1]]:null}function ie(e){return e.length>=2&&e[0]>=32}e.EMPTY_BLOCKS=ee,e.debugCompiler=void 0
+class oe{constructor(){this.labels=(0,r.dict)(),this.targets=[]}label(e,t){this.labels[e]=t}target(e,t){this.targets.push({at:e,target:t})}patch(e){for(var{targets:t,labels:r}=this,n=0;n<t.length;n++){var{at:i,target:o}=t[n],a=r[o]-i
+e.patch(i,a)}}}function ae(e,t,r){return se("Error",{problem:e,start:t,end:r})}function se(e,t,r,n){if("number"==typeof e)return void 0!==n?{type:"Number",op:e,op1:t,op2:r,op3:n}:void 0!==r?{type:"Number",op:e,op1:t,op2:r}:void 0!==t?{type:"Number",op:e,op1:t}:{type:"Number",op:e}
+var i
+if(function(e){return"CompileInline"===e||"CompileBlock"===e||"InvokeStatic"===e||"PushCompilable"===e||"Args"===e||"IfResolvedComponent"===e||"DynamicComponent"===e}(e))i="Compile"
+else if(function(e){return"IfResolved"===e||"Expr"===e||"SimpleArgs"===e||"ResolveFree"===e||"ResolveContextualFree"===e}(e))i="Resolution"
+else if(function(e){return"Label"===e||"Option"===e||"GetComponentLayout"===e||"StartLabels"===e||"StopLabels"===e||"SimpleArgs"===e||"JitCompileBlock"===e||"SetBlock"===e}(e))i="Simple"
+else{if(!function(e){return"Error"===e}(e))throw new Error("Exhausted "+e)
+i="Error"}return void 0===t?{type:i,op:e,op1:void 0}:{type:i,op:e,op1:t}}class le{constructor(){this.labelsStack=new r.Stack,this.encoder=new i.InstructionEncoderImpl([]),this.errors=[]}error(e){this.encoder.encode(30,0),this.errors.push(e)}commit(e,t){this.encoder.encode(5,1024)
+var r=function(e,t,r){for(var n=e.malloc(),i=0;i<r.length;i++){var o=r[i]
+"function"==typeof o?e.pushPlaceholder(o):"object"==typeof o?e.pushStdlib(o):e.push(o)}return e.finishMalloc(n,t),n}(e,t,this.encoder.buffer)
+return this.errors.length?{errors:this.errors,handle:r}:r}push(e,r,...n){if((0,t.isMachineOp)(r)){var i=n.map((t,r)=>this.operand(e,t,r))
+return this.encoder.encode(r,1024,...i)}var o=n.map((t,r)=>this.operand(e,t,r))
+return this.encoder.encode(r,0,...o)}operand(e,t,n){return t&&"object"==typeof t&&"label"===t.type?(this.currentLabels.target(this.encoder.size+n,t.value),-1):function(e,t){if("number"==typeof t||"function"==typeof t)return t
+if("boolean"==typeof t)return!0===t?1:0
+if("string"==typeof t)return e.value(t)
+if(null===t)return 0
+switch(t.type){case"string-array":return e.array(t.value)
+case"serializable":return e.serializable(t.value)
+case"stdlib":return t
+case"immediate":return(0,r.encodeImmediate)(t.value)
+case"primitive":case"template-meta":case"array":case"other":return(0,r.encodeHandle)(e.value(t.value))
+case"lookup":throw(0,r.unreachable)("lookup not reachable")
+default:return(0,r.exhausted)(t)}}(e,t)}get currentLabels(){return this.labelsStack.current}label(e){this.currentLabels.label(e,this.encoder.size)}startLabels(){this.labelsStack.push(new oe)}stopLabels(){this.labelsStack.pop().patch(this.encoder)}}function ue(e){if(!e)return{count:0,actions:R}
+for(var t=[],r=0;r<e.length;r++)t.push(se("Expr",e[r]))
+return{count:e.length,actions:t}}function ce(e){return{asPartial:e.asPartial||!1,evalSymbols:de(e),upvars:e.block.upvars,referrer:e.referrer,size:e.block.symbols.length}}function de(e){var{block:t}=e
+return t.hasEval?t.symbols:null}function he(e,t,r,n){var i=h(t,e)
+if(null!==i){var{compilable:o,handle:a,capabilities:s}=i
+if(o){if(r)for(var l=0;l<r.length;l+=2)r[l][0]="@"+r[l][0]
+var u=[se(80,a)]
+return u.push(fe({capabilities:s,layout:o,attrs:null,params:null,hash:r,blocks:new Z({default:n})})),u}}return j}function fe({capabilities:e,layout:r,attrs:n,params:i,hash:o,blocks:a}){var{symbolTable:s}=r
+if(s.hasEval||e.prepareArgs)return me({capabilities:e,attrs:n,params:i,hash:o,atNames:!0,blocks:a,layout:r})
+var l=[se(36,t.$s0),se(33,t.$sp,1),se(35,t.$s0)],{symbols:u}=s
+e.createArgs&&l.push(se(0),se("SimpleArgs",{params:i,hash:o,atNames:!0})),l.push(se(100)),e.dynamicScope&&l.push(se(59)),e.createInstance&&l.push(se(89,0|a.has("default"),t.$s0)),e.createArgs&&l.push(se(1)),l.push(se(0),se(90,t.$s0))
+var c=[]
+l.push(se(92,t.$s0)),c.push({symbol:0,isBlock:!1})
+for(var d=0;d<u.length;d++){var h=u[d]
+switch(h.charAt(0)){case"&":var f=void 0;(f="&attrs"===h?n:a.get(h.slice(1)))?(l.push(b(f)),c.push({symbol:d+1,isBlock:!0})):(l.push(b(null)),c.push({symbol:d+1,isBlock:!0}))
+break
+case"@":if(!o)break
+var[p,m]=o,v=h,g=p.indexOf(v);-1!==g&&(l.push(se("Expr",m[g])),c.push({symbol:d+1,isBlock:!1}))}}l.push(se(37,u.length+1,Object.keys(a).length>0?1:0))
+for(var y=c.length-1;y>=0;y--){var{symbol:_,isBlock:w}=c[y]
+w?l.push(se("SetBlock",_)):l.push(se(19,_))}return l.push(se("InvokeStatic",r)),e.createInstance&&l.push(se(103,t.$s0)),l.push(se(1),se(40)),e.dynamicScope&&l.push(se(60)),l.push(se(101),se(35,t.$s0)),l}function pe(e,{definition:r,attrs:n,params:i,hash:o,atNames:a,blocks:l}){return x({args:()=>({count:2,actions:[se("Expr",r),se(33,t.$sp,0)]}),body:()=>[se(66,u("ELSE")),se(83,s(e.referrer)),se(81),me({capabilities:!0,attrs:n,params:i,hash:o,atNames:a,blocks:l}),se("Label","ELSE")]})}function me({capabilities:e,attrs:r,params:n,hash:i,atNames:o,blocks:a,layout:s}){var l=!!a,u=!0===e||e.prepareArgs||!(!i||0===i[0].length),c=a.with("attrs",r)
+return[se(36,t.$s0),se(33,t.$sp,1),se(35,t.$s0),se(0),se("Args",{params:n,hash:i,blocks:c,atNames:o}),se(87,t.$s0),ve(c.has("default"),l,u,()=>{var e
+return(e=s?[w(s.symbolTable),se("PushCompilable",s),se("JitCompileBlock")]:[se("GetComponentLayout",t.$s0)]).push(se(98,t.$s0)),e}),se(35,t.$s0)]}function ve(e,r,n,i=null){var o=[se(100),se(59),se(89,0|e,t.$s0)]
+return i&&o.push(i()),o.push(se(90,t.$s0),se(92,t.$s0),se(38,t.$s0),se(19,0),se(97,t.$s0),n?se(17,t.$s0):R,r?se(18,t.$s0):R,se(34,1),se(99,t.$s0),se(103,t.$s0),se(1),se(40),se(60),se(101)),o}function ge(e){return X(e.block.statements,ce(e))}class be{constructor(e,t,r){this.main=e,this.trustingGuardedAppend=t,this.cautiousGuardedAppend=r}get"trusting-append"(){return this.trustingGuardedAppend}get"cautious-append"(){return this.cautiousGuardedAppend}getAppend(e){return e?this.trustingGuardedAppend:this.cautiousGuardedAppend}}function ye(){return[se(76,t.$s0),ve(!1,!1,!0)]}function _e(e){return[se(78),E(r=>{r(1,()=>e?[se(68),se(43)]:se(47)),r(0,()=>[se(82),se(81),[se(36,t.$s0),se(33,t.$sp,1),se(35,t.$s0),se(0),se(85),se(87,t.$s0),ve(!1,!1,!0,()=>[se("GetComponentLayout",t.$s0),se(98,t.$s0)]),se(35,t.$s0)]]),r(3,()=>[se(68),se(44)]),r(4,()=>[se(68),se(45)]),r(5,()=>[se(68),se(46)])})]}function we(e){var t=xe(e,ye),r=xe(e,()=>_e(!0)),n=xe(e,()=>_e(!1))
+return new be(t,r,n)}e.StdLib=be
+var Ee={asPartial:!1,evalSymbols:null,upvars:null,referrer:{},size:0}
+function xe(e,t){var r=new le,n=new z
+I({encoder:r,meta:Ee,syntax:{macros:n,program:e}},t())
+var i=r.commit(e.heap,0)
+if("number"!=typeof i)throw new Error("Unexpected errors compiling std")
+return i}class Oe{constructor(e,t){this.mode=t,this.constants=new n.WriteOnlyConstants,this.heap=new n.HeapImpl,this.resolverDelegate=e,this.stdlib=we(this)}}e.ProgramCompilationContext=Oe
+class Se{constructor(e){this.constants=new n.JitConstants,this.heap=new n.HeapImpl,this.mode="jit",this.resolverDelegate=e,this.stdlib=we(this)}}e.JitProgramCompilationContext=Se
+e.PartialDefinitionImpl=class{constructor(e,t){this.name=e,this.template=t}getPartial(e){var t=(0,r.unwrapTemplate)(this.template).asPartial(),n=t.compile(e)
+return{symbolTable:t.symbolTable,handle:n}}}
+class Te{constructor(e){this.layout=e,this.compiled=null
+var{block:t}=e,r=t.symbols.slice(),n=r.indexOf("&attrs")
+this.attrsBlockNumber=-1===n?r.push("&attrs"):n+1,this.symbolTable={hasEval:t.hasEval,symbols:r}}compile(e){if(null!==this.compiled)return this.compiled
+var i,o,a,s,l=ce(this.layout),c=B(e,l)
+F(c,(i=this.layout,o=this.attrsBlockNumber,[se("StartLabels"),(a=t.$s1,s=()=>[se(93,t.$s0),se(31),se(33,t.$sp,0)],[se(36,a),s(),se(35,a)]),se(66,u("BODY")),se(36,t.$s1),se(91),se(49),se(102,t.$s0),g(o,r.EMPTY_ARRAY),se(54),se("Label","BODY"),y(ge(i)),se(36,t.$s1),se(66,u("END")),se(55),se("Label","END"),se(35,t.$s1),se("StopLabels")]))
+var d=c.encoder.commit(c.syntax.program.heap,l.size)
+return"number"!=typeof d||(this.compiled=d,(0,n.patchStdlibs)(c.syntax.program)),d}}e.WrappedBuilder=Te
+var Me=0
+function Ae({id:e,meta:t,block:n}){var i,o=e||"client-"+Me++
+return{id:o,meta:t,create:e=>{var a=e?(0,r.assign)({},e,t):t
+return i||(i=JSON.parse(n)),new Pe({id:o,block:i,referrer:a})}}}class Pe{constructor(e){this.parsedLayout=e,this.result="ok",this.layout=null,this.partial=null,this.wrappedLayout=null
+var{block:t}=e
+this.symbols=t.symbols,this.hasEval=t.hasEval,this.referrer=e.referrer,this.id=e.id||"client-"+Me++}asLayout(){return this.layout?this.layout:this.layout=J((0,r.assign)({},this.parsedLayout,{asPartial:!1}))}asPartial(){return this.partial?this.partial:this.layout=J((0,r.assign)({},this.parsedLayout,{asPartial:!0}))}asWrappedLayout(){return this.wrappedLayout?this.wrappedLayout:this.wrappedLayout=new Te((0,r.assign)({},this.parsedLayout,{asPartial:!1}))}}})),e("@glimmer/program",["exports","@glimmer/util"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.hydrateHeap=function(e){return new c(e)},e.hydrateProgram=function(e){var t=new c(e.heap),r=new a(e.constants)
+return new d(r,t)},e.patchStdlibs=function(e){e.heap.patchStdlibs(e.stdlib)},e.programArtifacts=m,e.artifacts=function(e){return m(e.program)},e.RuntimeOpImpl=e.RuntimeProgramImpl=e.HeapImpl=e.RuntimeHeapImpl=e.JitConstants=e.RuntimeConstantsImpl=e.WriteOnlyConstants=void 0
+var r=Object.freeze([]),n=(0,t.constants)(r),i=n.indexOf(r)
+class o{constructor(){this.values=n.slice(),this.indexMap=new Map(this.values.map((e,t)=>[e,t]))}value(e){var t=this.indexMap,r=t.get(e)
+return void 0===r&&(r=this.values.push(e)-1,t.set(e,r)),r}array(e){if(0===e.length)return i
+for(var t=new Array(e.length),r=0;r<e.length;r++)t[r]=this.value(e[r])
+return this.value(t)}serializable(e){var t=JSON.stringify(e)
+return this.value(t)}toPool(){return this.values}}e.WriteOnlyConstants=o
+class a{constructor(e){this.values=e}getValue(e){return this.values[e]}getArray(e){for(var t=this.getValue(e),r=new Array(t.length),n=0;n<t.length;n++){var i=t[n]
+r[n]=this.getValue(i)}return r}getSerializable(e){return JSON.parse(this.values[e])}}e.RuntimeConstantsImpl=a
+e.JitConstants=class extends o{constructor(){super(...arguments),this.reifiedArrs={[i]:r}}templateMeta(e){return this.value(e)}getValue(e){return this.values[e]}getArray(e){var t=this.reifiedArrs,r=t[e]
+if(void 0===r){var n=this.getValue(e)
+r=new Array(n.length)
+for(var i=0;i<n.length;i++)r[i]=this.getValue(n[i])
+t[e]=r}return r}getSerializable(e){return JSON.parse(this.getValue(e))}}
+class s{constructor(e){this.heap=e,this.offset=0}get size(){return 1+((768&this.heap.getbyaddr(this.offset))>>8)}get isMachine(){return 1024&this.heap.getbyaddr(this.offset)?1:0}get type(){return 255&this.heap.getbyaddr(this.offset)}get op1(){return this.heap.getbyaddr(this.offset+1)}get op2(){return this.heap.getbyaddr(this.offset+2)}get op3(){return this.heap.getbyaddr(this.offset+3)}}function l(e,t){return t|e<<2}function u(e,t){return e|t<<30}e.RuntimeOpImpl=s
+class c{constructor(e){var{buffer:t,table:r}=e
+this.heap=new Int32Array(t),this.table=r}getaddr(e){return this.table[e]}getbyaddr(e){return this.heap[e]}sizeof(e){return f(this.table,e)}scopesizeof(e){return p(this.table,e)}}e.RuntimeHeapImpl=c
+e.HeapImpl=class{constructor(){this.placeholders=[],this.stdlibs=[],this.offset=0,this.handle=0,this.capacity=1048576,this.heap=new Int32Array(1048576),this.table=[]}push(e){this.sizeCheck(),this.heap[this.offset++]=e}sizeCheck(){if(0===this.capacity){var e=h(this.heap,0,this.offset)
+this.heap=new Int32Array(e.length+1048576),this.heap.set(e,0),this.capacity=1048576}this.capacity--}getbyaddr(e){return this.heap[e]}setbyaddr(e,t){this.heap[e]=t}malloc(){this.table.push(this.offset,0,0)
+var e=this.handle
+return this.handle+=3,e}finishMalloc(e,t){this.table[e+1]=l(t,0)}size(){return this.offset}getaddr(e){return this.table[e]}gethandle(e){this.table.push(e,l(0,3),0)
+var t=this.handle
+return this.handle+=3,t}sizeof(e){return f(this.table,e)}scopesizeof(e){return p(this.table,e)}free(e){var t=this.table[e+1]
+this.table[e+1]=u(t,1)}compact(){for(var e=0,{table:t,table:{length:r},heap:n}=this,i=0;i<r;i+=3){var o=t[i],a=t[i+1],s=a&Size.SIZE_MASK,l=0&a
+if(2!==l)if(1===l)t[i+1]=u(a,2),e+=s
+else if(0===l){for(var c=o;c<=i+s;c++)n[c-e]=n[c]
+t[i]=o-e}else 3===l&&(t[i]=o-e)}this.offset=this.offset-e}pushPlaceholder(e){this.sizeCheck()
+var t=this.offset++
+this.heap[t]=2147483647,this.placeholders.push([t,e])}pushStdlib(e){this.sizeCheck()
+var t=this.offset++
+this.heap[t]=2147483647,this.stdlibs.push([t,e])}patchPlaceholders(){for(var{placeholders:e}=this,t=0;t<e.length;t++){var[r,n]=e[t]
+this.setbyaddr(r,n())}}patchStdlibs(e){for(var{stdlibs:t}=this,r=0;r<t.length;r++){var[n,{value:i}]=t[r]
+this.setbyaddr(n,e[i])}this.stdlibs=[]}capture(e,t=this.offset){this.patchPlaceholders(),this.patchStdlibs(e)
+var r=h(this.heap,0,t).buffer
+return{handle:this.handle,table:this.table,buffer:r}}}
+class d{constructor(e,t){this.constants=e,this.heap=t,this._opcode=new s(this.heap)}static hydrate(e){var t=new c(e.heap),r=new a(e.constants)
+return new d(r,t)}opcode(e){return this._opcode.offset=e,this._opcode}}function h(e,t,r){if(void 0!==e.slice)return e.slice(t,r)
+for(var n=new Int32Array(r);t<r;t++)n[t]=e[t]
+return n}function f(){return-1}function p(e,t){return e[t+1]>>2}function m(e){return{heap:e.heap.capture(e.stdlib),constants:e.constants.toPool()}}e.RuntimeProgramImpl=d})),e("@glimmer/reference",["exports","@glimmer/util","@glimmer/validator"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.isModified=function(e){return e!==n},e.IterationItemReference=e.PropertyReference=e.HelperRootReference=e.ComponentRootReference=e.RootReference=e.UPDATE_REFERENCED_VALUE=e.IterableReference=e.ConstReference=e.ReferenceCache=e.CachedReference=void 0
+e.CachedReference=class{constructor(){this.lastRevision=null,this.lastValue=null}value(){var{tag:e,lastRevision:t,lastValue:n}=this
+return null!==t&&(0,r.validateTag)(e,t)||(n=this.lastValue=this.compute(),this.lastRevision=(0,r.valueForTag)(e)),n}invalidate(){this.lastRevision=null}}
+e.ReferenceCache=class{constructor(e){this.lastValue=null,this.lastRevision=null,this.initialized=!1,this.tag=e.tag,this.reference=e}peek(){return this.initialized?this.lastValue:this.initialize()}revalidate(){if(!this.initialized)return this.initialize()
+var{reference:e,lastRevision:t}=this,i=e.tag
+if((0,r.validateTag)(i,t))return n
+var{lastValue:o}=this,a=e.value()
+return this.lastRevision=(0,r.valueForTag)(i),a===o?n:(this.lastValue=a,a)}initialize(){var{reference:e}=this,t=this.lastValue=e.value()
+return this.lastRevision=(0,r.valueForTag)(e.tag),this.initialized=!0,t}}
+var n=(0,t.symbol)("NOT_MODIFIED")
+var i=new class{constructor(e){this.inner=e,this.tag=r.CONSTANT_TAG}value(){return this.inner}get(e){return i}}(void 0)
+e.ConstReference=class{constructor(e){this.inner=e,this.tag=r.CONSTANT_TAG}value(){return this.inner}get(e){return i}}
+var o=(0,t.symbol)("UPDATE_REFERENCED_VALUE")
+e.UPDATE_REFERENCED_VALUE=o
+class a{constructor(e){this.env=e,this.children=(0,t.dict)(),this.tag=r.CONSTANT_TAG}get(e){var t=this.children[e]
+return void 0===t&&(t=this.children[e]=new s(this,e,this.env)),t}}e.RootReference=a
+e.ComponentRootReference=class extends a{constructor(e,t){super(t),this.inner=e}value(){return this.inner}}
+e.HelperRootReference=class extends a{constructor(e,t,n,i){super(n),this.fn=e,this.args=t,this.computeRevision=null,this.computeTag=null,(0,r.isConstTagged)(t)&&this.compute()
+var{tag:o,computeTag:a}=this
+if(null!==a&&(0,r.isConstTag)(a))o=this.tag=r.CONSTANT_TAG,this.computeRevision=(0,r.valueForTag)(o)
+else{var s=this.valueTag=(0,r.createUpdatableTag)()
+o=this.tag=(0,r.combine)([t.tag,s]),null!==a&&((0,r.updateTag)(s,a),this.computeRevision=(0,r.valueForTag)(o))}}compute(){this.computeTag=(0,r.track)(()=>{this.computeValue=this.fn(this.args)},!1)}value(){var{tag:e,computeRevision:t}=this
+return null!==t&&(0,r.validateTag)(e,t)||(this.compute(),(0,r.updateTag)(this.valueTag,this.computeTag),this.computeRevision=(0,r.valueForTag)(e)),this.computeValue}}
+class s{constructor(e,n,i){this.parentReference=e,this.propertyKey=n,this.env=i,this.children=(0,t.dict)(),this.lastRevision=null
+var o=this.valueTag=(0,r.createUpdatableTag)(),a=e.tag
+this.tag=(0,r.combine)([a,o])}value(){var{tag:e,lastRevision:n,lastValue:i,parentReference:o,valueTag:a,propertyKey:s}=this
+if(null===n||!(0,r.validateTag)(e,n)){var l=o.value()
+if((0,t.isDict)(l)){var u=(0,r.track)(()=>{i=this.env.getPath(l,s)},!1);(0,r.updateTag)(a,u)}else i=void 0
+this.lastValue=i,this.lastRevision=(0,r.valueForTag)(e)}return i}get(e){var t=this.children[e]
+return void 0===t&&(t=this.children[e]=new s(this,e,this.env)),t}[o](e){var{parentReference:t,propertyKey:r}=this,n=t.value()
+this.env.setPath(n,r,e)}}e.PropertyReference=s
+class l{constructor(e,n,i,o){this.parentReference=e,this.itemValue=n,this.env=o,this.tag=(0,r.createUpdatableTag)(),this.children=(0,t.dict)()}value(){return this.itemValue}update(e){var{itemValue:t}=this
+e!==t&&((0,r.dirtyTag)(this.tag),this.itemValue=e)}get(e){var t=this.children[e]
+return void 0===t&&(t=this.children[e]=new s(this,e,this.env)),t}}e.IterationItemReference=l
+var u={},c=(e,t)=>t,d=(e,t)=>String(t),h=e=>null===e?u:e
+function f(e,t){switch(e){case"@key":return v(c)
+case"@index":return v(d)
+case"@identity":return v(h)
+default:return function(e,t){return v(r=>t(r,e))}(e,t)}}class p{get weakMap(){return void 0===this._weakMap&&(this._weakMap=new WeakMap),this._weakMap}get primitiveMap(){return void 0===this._primitiveMap&&(this._primitiveMap=new Map),this._primitiveMap}set(e,r){(0,t.isObject)(e)||"function"==typeof e?this.weakMap.set(e,r):this.primitiveMap.set(e,r)}get(e){return(0,t.isObject)(e)||"function"==typeof e?this.weakMap.get(e):this.primitiveMap.get(e)}}var m=new p
+function v(e){var t=new p
+return(r,n)=>{var i=e(r,n),o=t.get(i)||0
+return t.set(i,o+1),0===o?i:function(e,t){var r=m.get(e)
+void 0===r&&(r=[],m.set(e,r))
+var n=r[t]
+return void 0===n&&(n={value:e,count:t},r[t]=n),n}(i,o)}}e.IterableReference=class{constructor(e,t,r){this.parentRef=e,this.key=t,this.env=r,this.iterator=null,this.tag=e.tag}value(){return!this.isEmpty()}isEmpty(){return(this.iterator=this.createIterator()).isEmpty()}next(){var e=this.iterator.next()
+return null===e&&(this.iterator=null),e}createIterator(){var{parentRef:e,key:r,env:n}=this,i=e.value(),o=f(r,n.getPath)
+if(Array.isArray(i))return new b(i,o)
+var a=n.toIterator(i)
+return null===a?new b(t.EMPTY_ARRAY,()=>null):new g(a,o)}childRefFor(e,t){var{parentRef:r,env:n}=this
+return new l(r,t,"",n)}}
+class g{constructor(e,t){this.inner=e,this.keyFor=t}isEmpty(){return this.inner.isEmpty()}next(){var e=this.inner.next()
+return null!==e&&(e.key=this.keyFor(e.value,e.memo)),e}}class b{constructor(e,t){this.iterator=e,this.keyFor=t,this.pos=0,0===e.length?this.current={kind:"empty"}:this.current={kind:"first",value:e[this.pos]}}isEmpty(){return"empty"===this.current.kind}next(){var e,t=this.current
+if("first"===t.kind)this.current={kind:"progress"},e=t.value
+else{if(this.pos>=this.iterator.length-1)return null
+e=this.iterator[++this.pos]}var{keyFor:r}=this
+return{key:r(e,this.pos),value:e,memo:this.pos}}}})),e("@glimmer/runtime",["exports","@glimmer/util","@glimmer/reference","@glimmer/validator","@glimmer/program","@glimmer/vm","@glimmer/low-level"],(function(e,t,r,n,i,o,a){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.clear=b,e.capabilityFlagsFrom=rt,e.hasCapability=it,e.resetDebuggerCallback=function(){At=Mt},e.setDebuggerCallback=function(e){At=e},e.curry=function(e,t=null){return new st(e,t)},e.isCurriedComponentDefinition=at,e.isWhitespace=function(e){return Y.test(e)},e.normalizeProperty=pe,e.AotRuntime=function(e,t,r={},n={}){return{env:new He(e,n),resolver:new Ye(r),program:i.RuntimeProgramImpl.hydrate(t)}},e.JitRuntime=function(e,t={},r,n={}){return{env:new He(e,t),program:new i.RuntimeProgramImpl(r.program.constants,r.program.heap),resolver:new Ye(n)}},e.inTransaction=function(e,t){if(e[Fe])t()
+else{e.begin()
+try{t()}finally{e.commit()}}},e.getDynamicVar=function(e,t){var r=t.dynamicScope(),n=e.positional.at(0)
+return new Dt(r,n)},e.renderAot=function(e,t,r,n=ne){var i=L.forInitialRender(e.env,r),o=new jt,a=lr.initial(e,{self:n,dynamicScope:o,treeBuilder:i,handle:t})
+return new hr(a)},e.renderAotComponent=function(e,t,r,n,i={},o=new jt){var a,s=lr.empty(e,{treeBuilder:t,handle:r,dynamicScope:o}),l=lt(s.runtime.resolver,n),{manager:u,state:c}=l
+if(!Et(rt(u.getCapabilities(c)),u))throw new Error("Cannot invoke components with dynamic layouts as a root component.")
+a=u.getAotStaticLayout(c,s.runtime.resolver)
+return pr(s,a,l,i)},e.renderAotMain=function(e,t,r,n,i=new jt){var o=lr.initial(e,{self:t,dynamicScope:i,treeBuilder:r,handle:n})
+return new hr(o)},e.renderJitComponent=function(e,r,n,i,o,a={},s=new jt){var l,u=dr.empty(e,{treeBuilder:r,handle:i,dynamicScope:s},n),c=lt(u.runtime.resolver,o),{manager:d,state:h}=c
+if(!Et(rt(d.getCapabilities(h)),d))throw new Error("Cannot invoke components with dynamic layouts as a root component.")
+var f=d.getJitStaticLayout(h,u.runtime.resolver),p=(0,t.unwrapHandle)(f.compile(n))
+if(Array.isArray(p)){var m=p[0]
+throw new Error(`Compile Error: ${m.problem} ${m.span.start}..${m.span.end} :: TODO (thread better)`)}l={handle:p,symbolTable:f.symbolTable}
+return pr(u,l,c,a)},e.renderJitMain=function(e,t,r,n,i,o=new jt){var a=dr.initial(e,t,{self:r,dynamicScope:o,treeBuilder:n,handle:i})
+return new hr(a)},e.renderSync=fr,e.dynamicAttribute=Me,e.clientBuilder=function(e,t){return L.forInitialRender(e,t)},e.isSerializationFirstNode=mr,e.rehydrationBuilder=function(e,t){return gr.forInitialRender(e,t)},e.destroy=k,e.registerDestructor=S,e.unregisterDestructor=function(e,t,r=!1){0
+var n=x(e),i=!0===r?"eagerDestructors":"destructors"
+n[i]=E(n[i],t,!1)},e.associateDestroyableChild=O,e.isDestroying=j,e.isDestroyed=function(e){var t=y.get(e)
+return void 0!==t&&t.state>=2}
+e.setScheduleDestroy=function(t){e._scheduleDestroy=T=t},e.setScheduleDestroyed=function(t){e._scheduleDestroyed=C=t},e._destroyChildren=R,e.TEMPLATE_ONLY_COMPONENT=e.SimpleComponentManager=e._scheduleDestroyed=e._scheduleDestroy=e.assertDestroyablesDestroyed=e.enableDestroyableTracking=e.SERIALIZATION_FIRST_NODE_STRING=e.RehydrateBuilder=e.RemoteLiveBlock=e.UpdatableBlockImpl=e.NewElementBuilder=e.SimpleDynamicAttribute=e.DynamicAttribute=e.CapturedPositionalArgumentsImpl=e.CapturedNamedArgumentsImpl=e.CapturedArgumentsImpl=e.EMPTY_ARGS=e.LowLevelVM=e.UpdatingVM=e.UNDEFINED_REFERENCE=e.PrimitiveReference=e.NULL_REFERENCE=e.ConditionalReference=e.ScopeImpl=e.EnvironmentImpl=e.DefaultDynamicScope=e.DOMTreeConstruction=e.IDOMChanges=e.DOMChanges=e.MINIMAL_CAPABILITIES=e.DEFAULT_CAPABILITIES=e.CurriedComponentDefinition=e.CursorImpl=e.ConcreteBounds=void 0
+var s=(0,t.symbol)("INNER_VM"),l=(0,t.symbol)("DESTROYABLE_STACK"),u=(0,t.symbol)("STACKS"),c=(0,t.symbol)("REGISTERS"),d=(0,t.symbol)("HEAP"),h=(0,t.symbol)("CONSTANTS"),f=(0,t.symbol)("ARGS");(0,t.symbol)("PC")
+class p{constructor(e,t){this.element=e,this.nextSibling=t}}e.CursorImpl=p
+class m{constructor(e,t,r){this.parentNode=e,this.first=t,this.last=r}parentElement(){return this.parentNode}firstNode(){return this.first}lastNode(){return this.last}}e.ConcreteBounds=m
+class v{constructor(e,t){this.parentNode=e,this.node=t}parentElement(){return this.parentNode}firstNode(){return this.node}lastNode(){return this.node}}function g(e,t){for(var r=e.parentElement(),n=e.firstNode(),i=e.lastNode(),o=n;;){var a=o.nextSibling
+if(r.insertBefore(o,t),o===i)return a
+o=a}}function b(e){for(var t=e.parentElement(),r=e.firstNode(),n=e.lastNode(),i=r;;){var o=i.nextSibling
+if(t.removeChild(i),i===n)return o
+i=o}}var y=new WeakMap
+function _(e,t){return null===e?t:Array.isArray(e)?(e.push(t),e):[e,t]}function w(e,t){if(Array.isArray(e))for(var r=0;r<e.length;r++)t(e[r])
+else null!==e&&t(e)}function E(e,t){if(Array.isArray(e)&&e.length>1){var r=e.indexOf(t)
+return e.splice(r,1),e}return null}function x(e){var t=y.get(e)
+return void 0===t&&(t={parents:null,children:null,eagerDestructors:null,destructors:null,state:0},y.set(e,t)),t}function O(e,t){var r=x(e),n=x(t)
+return r.children=_(r.children,t),n.parents=_(n.parents,e),t}function S(e,t,r=!1){var n=x(e),i=!0===r?"eagerDestructors":"destructors"
+return n[i]=_(n[i],t),t}var T=()=>{}
+e._scheduleDestroy=T
+var M,A,P,C=()=>{}
+function k(e){var t=x(e)
+if(!(t.state>=1)){var{parents:r,children:n,eagerDestructors:i,destructors:o}=t
+t.state=1,w(n,k),w(i,t=>t(e)),w(o,t=>T(e,t)),C(()=>{w(r,t=>function(e,t){var r=x(t)
+0===r.state&&(r.children=E(r.children,e))}(e,t)),t.state=2})}}function R(e){var{children:t}=x(e)
+w(t,k)}function j(e){var t=y.get(e)
+return void 0!==t&&t.state>=1}e._scheduleDestroyed=C,e.enableDestroyableTracking=M,e.assertDestroyablesDestroyed=A
+class D{constructor(e){this.node=e}firstNode(){return this.node}}class N{constructor(e){this.node=e}lastNode(){return this.node}}var I=(0,t.symbol)("CURSOR_STACK")
+class L{constructor(e,r,n){this.constructing=null,this.operations=null,this[P]=new t.Stack,this.modifierStack=new t.Stack,this.blockStack=new t.Stack,this.pushElement(r,n),this.env=e,this.dom=e.getAppendOperations(),this.updateOperations=e.getDOM()}static forInitialRender(e,t){return new this(e,t.element,t.nextSibling).initialize()}static resume(e,t){var r=new this(e,t.parentElement(),t.reset(e)).initialize()
+return r.pushLiveBlock(t),r}initialize(){return this.pushSimpleBlock(),this}debugBlocks(){return this.blockStack.toArray()}get element(){return this[I].current.element}get nextSibling(){return this[I].current.nextSibling}get hasBlocks(){return this.blockStack.size>0}block(){return this.blockStack.current}popElement(){this[I].pop(),this[I].current}pushSimpleBlock(){return this.pushLiveBlock(new F(this.element))}pushUpdatableBlock(){return this.pushLiveBlock(new U(this.element))}pushBlockList(e){return this.pushLiveBlock(new H(this.element,e))}pushLiveBlock(e,t=!1){var r=this.blockStack.current
+return null!==r&&(t||r.didAppendBounds(e)),this.__openBlock(),this.blockStack.push(e),e}popBlock(){return this.block().finalize(this),this.__closeBlock(),this.blockStack.pop()}__openBlock(){}__closeBlock(){}openElement(e){var t=this.__openElement(e)
+return this.constructing=t,t}__openElement(e){return this.dom.createElement(e,this.element)}flushElement(e){var t=this.element,r=this.constructing
+this.__flushElement(t,r),this.constructing=null,this.operations=null,this.pushModifiers(e),this.pushElement(r,null),this.didOpenElement(r)}__flushElement(e,t){this.dom.insertBefore(e,t,this.nextSibling)}closeElement(){return this.willCloseElement(),this.popElement(),this.popModifiers()}pushRemoteElement(e,t,r){return this.__pushRemoteElement(e,t,r)}__pushRemoteElement(e,t,r){if(this.pushElement(e,r),void 0===r)for(;e.lastChild;)e.removeChild(e.lastChild)
+var n=new z(e)
+return this.pushLiveBlock(n,!0)}popRemoteElement(){this.popBlock(),this.popElement()}pushElement(e,t=null){this[I].push(new p(e,t))}pushModifiers(e){this.modifierStack.push(e)}popModifiers(){return this.modifierStack.pop()}didAppendBounds(e){return this.block().didAppendBounds(e),e}didAppendNode(e){return this.block().didAppendNode(e),e}didOpenElement(e){return this.block().openElement(e),e}willCloseElement(){this.block().closeElement()}appendText(e){return this.didAppendNode(this.__appendText(e))}__appendText(e){var{dom:t,element:r,nextSibling:n}=this,i=t.createTextNode(e)
+return t.insertBefore(r,i,n),i}__appendNode(e){return this.dom.insertBefore(this.element,e,this.nextSibling),e}__appendFragment(e){var t=e.firstChild
+if(t){var r=new m(this.element,t,e.lastChild)
+return this.dom.insertBefore(this.element,e,this.nextSibling),r}return new v(this.element,this.__appendComment(""))}__appendHTML(e){return this.dom.insertHTMLBefore(this.element,this.nextSibling,e)}appendDynamicHTML(e){var t=this.trustedContent(e)
+this.didAppendBounds(t)}appendDynamicText(e){var t=this.untrustedContent(e)
+return this.didAppendNode(t),t}appendDynamicFragment(e){var t=this.__appendFragment(e)
+this.didAppendBounds(t)}appendDynamicNode(e){var t=this.__appendNode(e),r=new v(this.element,t)
+this.didAppendBounds(r)}trustedContent(e){return this.__appendHTML(e)}untrustedContent(e){return this.__appendText(e)}appendComment(e){return this.didAppendNode(this.__appendComment(e))}__appendComment(e){var{dom:t,element:r,nextSibling:n}=this,i=t.createComment(e)
+return t.insertBefore(r,i,n),i}__setAttribute(e,t,r){this.dom.setAttribute(this.constructing,e,t,r)}__setProperty(e,t){this.constructing[e]=t}setStaticAttribute(e,t,r){this.__setAttribute(e,t,r)}setDynamicAttribute(e,t,r,n){var i=this.constructing,o=this.env.attributeFor(i,e,r,n)
+return o.set(this,t,this.env),o}}e.NewElementBuilder=L,P=I
+class F{constructor(e){this.parent=e,this.first=null,this.last=null,this.nesting=0}parentElement(){return this.parent}firstNode(){return this.first.firstNode()}lastNode(){return this.last.lastNode()}openElement(e){this.didAppendNode(e),this.nesting++}closeElement(){this.nesting--}didAppendNode(e){0===this.nesting&&(this.first||(this.first=new D(e)),this.last=new N(e))}didAppendBounds(e){0===this.nesting&&(this.first||(this.first=e),this.last=e)}finalize(e){null===this.first&&e.appendComment("")}}class z extends F{constructor(e){super(e),S(this,()=>{this.parentElement()===this.firstNode().parentNode&&b(this)})}}e.RemoteLiveBlock=z
+class U extends F{reset(){k(this)
+var e=b(this)
+return this.first=null,this.last=null,this.nesting=0,e}}e.UpdatableBlockImpl=U
+class H{constructor(e,t){this.parent=e,this.boundList=t,this.parent=e,this.boundList=t}parentElement(){return this.parent}firstNode(){return this.boundList[0].firstNode()}lastNode(){var e=this.boundList
+return e[e.length-1].lastNode()}openElement(e){}closeElement(){}didAppendNode(e){}didAppendBounds(e){}finalize(e){}}var B={foreignObject:1,desc:1,title:1},V=Object.create(null)
+class ${constructor(e){this.document=e,this.setupUselessElement()}setupUselessElement(){this.uselessElement=this.document.createElement("div")}createElement(e,t){var r,n
+if(t?(r="http://www.w3.org/2000/svg"===t.namespaceURI||"svg"===e,n=!!B[t.tagName]):(r="svg"===e,n=!1),r&&!n){if(V[e])throw new Error(`Cannot create a ${e} inside an SVG context`)
+return this.document.createElementNS("http://www.w3.org/2000/svg",e)}return this.document.createElement(e)}insertBefore(e,t,r){e.insertBefore(t,r)}insertHTMLBefore(e,t,r){if(""===r){var n=this.createComment("")
+return e.insertBefore(n,t),new m(e,n,n)}var i,o=t?t.previousSibling:e.lastChild
+if(null===t)e.insertAdjacentHTML("beforeend",r),i=e.lastChild
+else if(t instanceof HTMLElement)t.insertAdjacentHTML("beforebegin",r),i=t.previousSibling
+else{var{uselessElement:a}=this
+e.insertBefore(a,t),a.insertAdjacentHTML("beforebegin",r),i=a.previousSibling,e.removeChild(a)}var s=o?o.nextSibling:e.firstChild
+return new m(e,s,i)}createTextNode(e){return this.document.createTextNode(e)}createComment(e){return this.document.createComment(e)}}function q(e,r,n){if(!e)return r
+if(!function(e,t){var r=e.createElementNS(t,"svg")
+try{r.insertAdjacentHTML("beforeend","<circle></circle>")}catch(n){}finally{return 1!==r.childNodes.length||"http://www.w3.org/2000/svg"!==r.firstChild.namespaceURI}}(e,n))return r
+var i=e.createElement("div")
+return class extends r{insertHTMLBefore(e,r,o){return""===o||e.namespaceURI!==n?super.insertHTMLBefore(e,r,o):function(e,r,n,i){var o
+if("FOREIGNOBJECT"===e.tagName.toUpperCase()){var a="<svg><foreignObject>"+n+"</foreignObject></svg>";(0,t.clearElement)(r),r.insertAdjacentHTML("afterbegin",a),o=r.firstChild.firstChild}else{var s="<svg>"+n+"</svg>";(0,t.clearElement)(r),r.insertAdjacentHTML("afterbegin",s),o=r.firstChild}return function(e,t,r){for(var n=e.firstChild,i=n,o=n;o;){var a=o.nextSibling
+t.insertBefore(o,r),i=o,o=a}return new m(t,n,i)}(o,e,i)}(e,i,o,r)}}}function W(e,t){return e&&function(e){var t=e.createElement("div")
+if(t.appendChild(e.createTextNode("first")),t.insertAdjacentHTML("beforeend","second"),2===t.childNodes.length)return!1
+return!0}(e)?class extends t{constructor(e){super(e),this.uselessComment=e.createComment("")}insertHTMLBefore(e,t,r){if(""===r)return super.insertHTMLBefore(e,t,r)
+var n=!1,i=t?t.previousSibling:e.lastChild
+i&&i instanceof Text&&(n=!0,e.insertBefore(this.uselessComment,t))
+var o=super.insertHTMLBefore(e,t,r)
+return n&&e.removeChild(this.uselessComment),o}}:t}["b","big","blockquote","body","br","center","code","dd","div","dl","dt","em","embed","h1","h2","h3","h4","h5","h6","head","hr","i","img","li","listing","main","meta","nobr","ol","p","pre","ruby","s","small","span","strong","strike","sub","sup","table","tt","u","ul","var"].forEach(e=>V[e]=1)
+var G,Y=/[\t-\r \xA0\u1680\u180E\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]/,K="undefined"==typeof document?null:document;(function(e){class t extends ${createElementNS(e,t){return this.document.createElementNS(e,t)}setAttribute(e,t,r,n=null){n?e.setAttributeNS(n,t,r):e.setAttribute(t,r)}}e.TreeConstruction=t
+var r=t
+r=W(K,r),r=q(K,r,"http://www.w3.org/2000/svg"),e.DOMTreeConstruction=r})(G||(G={}))
+class J extends ${constructor(e){super(e),this.document=e,this.namespace=null}setAttribute(e,t,r){e.setAttribute(t,r)}removeAttribute(e,t){e.removeAttribute(t)}insertAfter(e,t,r){this.insertBefore(e,t,r.nextSibling)}}e.IDOMChanges=J
+var Q=J
+Q=W(K,Q)
+var X=Q=q(K,Q,"http://www.w3.org/2000/svg")
+e.DOMChanges=X
+var Z=G.DOMTreeConstruction
+e.DOMTreeConstruction=Z
+class ee extends r.ConstReference{static create(e){return void 0===e?ne:null===e?ie:!0===e?oe:!1===e?ae:"number"==typeof e?new re(e):new te(e)}constructor(e){super(e)}get(e){return ne}}e.PrimitiveReference=ee
+class te extends ee{constructor(){super(...arguments),this.lengthReference=null}get(e){if("length"===e){var{lengthReference:t}=this
+return null===t&&(t=this.lengthReference=new re(this.inner.length)),t}return super.get(e)}}class re extends ee{constructor(e){super(e)}}var ne=new re(void 0)
+e.UNDEFINED_REFERENCE=ne
+var ie=new re(null)
+e.NULL_REFERENCE=ie
+var oe=new re(!0),ae=new re(!1)
+class se{constructor(e,t=le){this.inner=e,this.toBool=t,this._tag=(0,n.createUpdatableTag)(),this.tag=(0,n.combine)([e.tag,this._tag])}value(){var e,{toBool:t,inner:r}=this,i=(0,n.track)(()=>e=t(r.value()))
+return(0,n.updateTag)(this._tag,i),e}}function le(e){return!!e}function ue(e){return ce(e)?"":String(e)}function ce(e){return null==e||"function"!=typeof e.toString}function de(e){return"object"==typeof e&&null!==e&&"function"==typeof e.toHTML}function he(e){return"object"==typeof e&&null!==e&&"number"==typeof e.nodeType}function fe(e){return"string"==typeof e}function pe(e,t){var r,n,i,o,a
+if(t in e)n=t,r="prop"
+else{var s=t.toLowerCase()
+s in e?(r="prop",n=s):(r="attr",n=t)}return"prop"===r&&("style"===n.toLowerCase()||(i=e.tagName,o=n,(a=me[i.toUpperCase()])&&a[o.toLowerCase()]))&&(r="attr"),{normalized:n,type:r}}e.ConditionalReference=se
+var me={INPUT:{form:!0,autocorrect:!0,list:!0},SELECT:{form:!0},OPTION:{form:!0},TEXTAREA:{form:!0},LABEL:{form:!0},FIELDSET:{form:!0},LEGEND:{form:!0},OBJECT:{form:!0},BUTTON:{form:!0}}
+var ve,ge=["javascript:","vbscript:"],be=["A","BODY","LINK","IMG","IFRAME","BASE","FORM"],ye=["EMBED"],_e=["href","src","background","action"],we=["src"]
+function Ee(e,t){return-1!==e.indexOf(t)}function xe(e,t){return(null===e||Ee(be,e))&&Ee(_e,t)}function Oe(e,t){return null!==e&&(Ee(ye,e)&&Ee(we,t))}function Se(e,t){return xe(e,t)||Oe(e,t)}function Te(e,t,r,n){var i=null
+if(null==n)return n
+if(de(n))return n.toHTML()
+i=t?t.tagName.toUpperCase():null
+var o=ue(n)
+if(xe(i,r)){var a=e.protocolForURL(o)
+if(Ee(ge,a))return"unsafe:"+o}return Oe(i,r)?"unsafe:"+o:o}function Me(e,t,r){var{tagName:n,namespaceURI:i}=e,o={element:e,name:t,namespace:r}
+if("http://www.w3.org/2000/svg"===i)return Ae(n,t,o)
+var{type:a,normalized:s}=pe(e,t)
+return"attr"===a?Ae(n,s,o):function(e,t,r){if(Se(e,t))return new Re(t,r)
+if(function(e,t){return("INPUT"===e||"TEXTAREA"===e)&&"value"===t}(e,t))return new De(t,r)
+if(function(e,t){return"OPTION"===e&&"selected"===t}(e,t))return new Ne(t,r)
+return new ke(t,r)}(n,s,o)}function Ae(e,t,r){return Se(e,t)?new je(r):new Ce(r)}class Pe{constructor(e){this.attribute=e}}e.DynamicAttribute=Pe
+class Ce extends Pe{set(e,t,r){var n=Ie(t)
+if(null!==n){var{name:i,namespace:o}=this.attribute
+e.__setAttribute(i,n,o)}}update(e,t){var r=Ie(e),{element:n,name:i}=this.attribute
+null===r?n.removeAttribute(i):n.setAttribute(i,r)}}e.SimpleDynamicAttribute=Ce
+class ke extends Pe{constructor(e,t){super(t),this.normalizedName=e}set(e,t,r){null!=t&&(this.value=t,e.__setProperty(this.normalizedName,t))}update(e,t){var{element:r}=this.attribute
+this.value!==e&&(r[this.normalizedName]=this.value=e,null==e&&this.removeAttribute())}removeAttribute(){var{element:e,namespace:t}=this.attribute
+t?e.removeAttributeNS(t,this.normalizedName):e.removeAttribute(this.normalizedName)}}class Re extends ke{set(e,t,r){var{element:n,name:i}=this.attribute,o=Te(r,n,i,t)
+super.set(e,o,r)}update(e,t){var{element:r,name:n}=this.attribute,i=Te(t,r,n,e)
+super.update(i,t)}}class je extends Ce{set(e,t,r){var{element:n,name:i}=this.attribute,o=Te(r,n,i,t)
+super.set(e,o,r)}update(e,t){var{element:r,name:n}=this.attribute,i=Te(t,r,n,e)
+super.update(i,t)}}class De extends ke{set(e,t){e.__setProperty("value",ue(t))}update(e){var t=this.attribute.element,r=t.value,n=ue(e)
+r!==n&&(t.value=n)}}class Ne extends ke{set(e,t){null!=t&&!1!==t&&e.__setProperty("selected",!0)}update(e){var t=this.attribute.element
+t.selected=!!e}}function Ie(e){return!1===e||null==e||void 0===e.toString?null:!0===e?"":"function"==typeof e?null:String(e)}class Le{constructor(e,t,r,n){this.slots=e,this.callerScope=t,this.evalScope=r,this.partialMap=n}static root(e,t=0){for(var r=new Array(t+1),n=0;n<=t;n++)r[n]=ne
+return new Le(r,null,null,null).init({self:e})}static sized(e=0){for(var t=new Array(e+1),r=0;r<=e;r++)t[r]=ne
+return new Le(t,null,null,null)}init({self:e}){return this.slots[0]=e,this}getSelf(){return this.get(0)}getSymbol(e){return this.get(e)}getBlock(e){var t=this.get(e)
+return t===ne?null:t}getEvalScope(){return this.evalScope}getPartialMap(){return this.partialMap}bind(e,t){this.set(e,t)}bindSelf(e){this.set(0,e)}bindSymbol(e,t){this.set(e,t)}bindBlock(e,t){this.set(e,t)}bindEvalScope(e){this.evalScope=e}bindPartialMap(e){this.partialMap=e}bindCallerScope(e){this.callerScope=e}getCallerScope(){return this.callerScope}child(){return new Le(this.slots.slice(),this.callerScope,this.evalScope,this.partialMap)}get(e){if(e>=this.slots.length)throw new RangeError(`BUG: cannot get $${e} from scope; length=${this.slots.length}`)
+return this.slots[e]}set(e,t){if(e>=this.slots.length)throw new RangeError(`BUG: cannot get $${e} from scope; length=${this.slots.length}`)
+this.slots[e]=t}}e.ScopeImpl=Le
+var Fe=(0,t.symbol)("TRANSACTION")
+class ze{constructor(){this.scheduledInstallManagers=[],this.scheduledInstallModifiers=[],this.scheduledUpdateModifierManagers=[],this.scheduledUpdateModifiers=[],this.createdComponents=[],this.createdManagers=[],this.updatedComponents=[],this.updatedManagers=[]}didCreate(e,t){this.createdComponents.push(e),this.createdManagers.push(t)}didUpdate(e,t){this.updatedComponents.push(e),this.updatedManagers.push(t)}scheduleInstallModifier(e,t){this.scheduledInstallModifiers.push(e),this.scheduledInstallManagers.push(t)}scheduleUpdateModifier(e,t){this.scheduledUpdateModifiers.push(e),this.scheduledUpdateModifierManagers.push(t)}commit(){for(var{createdComponents:e,createdManagers:t}=this,r=0;r<e.length;r++){var n=e[r]
+t[r].didCreate(n)}for(var{updatedComponents:i,updatedManagers:o}=this,a=0;a<i.length;a++){var s=i[a]
+o[a].didUpdate(s)}for(var{scheduledInstallManagers:l,scheduledInstallModifiers:u}=this,c=0;c<l.length;c++){var d=u[c]
+l[c].install(d)}for(var{scheduledUpdateModifierManagers:h,scheduledUpdateModifiers:f}=this,p=0;p<h.length;p++){var m=f[p]
+h[p].update(m)}}}function Ue(e,t){var r=void 0!==e?e:t
+return r}class He{constructor(e,t){this.delegate=t,this[ve]=null,this.extra=this.delegate.extra,this.isInteractive="boolean"!=typeof this.delegate.isInteractive||this.delegate.isInteractive,this.protocolForURL=Ue(this.delegate.protocolForURL,Be),this.attributeFor=Ue(this.delegate.attributeFor,Ve),this.getProp=Ue(this.delegate.getProp,$e),this.getPath=Ue(this.delegate.getPath,$e),this.setPath=Ue(this.delegate.setPath,qe),this.toBool=Ue(this.delegate.toBool,We),this.toIterator=Ue(this.delegate.toIterator,Ge),e.appendOperations?(this.appendOperations=e.appendOperations,this.updateOperations=e.updateOperations):e.document&&(this.appendOperations=new Z(e.document),this.updateOperations=new J(e.document))}getTemplatePathDebugContext(e){return void 0!==this.delegate.getTemplatePathDebugContext?this.delegate.getTemplatePathDebugContext(e):""}setTemplatePathDebugContext(e,t,r){void 0!==this.delegate.setTemplatePathDebugContext&&this.delegate.setTemplatePathDebugContext(e,t,r)}toConditionalReference(e){return new se(e,this.delegate.toBool)}getAppendOperations(){return this.appendOperations}getDOM(){return this.updateOperations}begin(){void 0!==this.delegate.onTransactionBegin&&this.delegate.onTransactionBegin(),this[Fe]=new ze}get transaction(){return this[Fe]}didCreate(e,t){this.transaction.didCreate(e,t)}didUpdate(e,t){this.transaction.didUpdate(e,t)}scheduleInstallModifier(e,t){this.isInteractive&&this.transaction.scheduleInstallModifier(e,t)}scheduleUpdateModifier(e,t){this.isInteractive&&this.transaction.scheduleUpdateModifier(e,t)}commit(){var e=this.transaction
+this[Fe]=null,e.commit(),void 0!==this.delegate.onTransactionCommit&&this.delegate.onTransactionCommit()}}function Be(e){return"object"==typeof URL||"undefined"==typeof URL?function(e){if("undefined"==typeof window){var t=/^([a-z][a-z0-9.+-]*:)?(\/\/)?([\S\s]*)/i.exec(e)
+return t&&t[1]?t[1].toLowerCase():""}var r=window.document.createElement("a")
+return r.href=e,r.protocol}(e):"undefined"!=typeof document?new URL(e,document.baseURI).protocol:new URL(e,"https://www.example.com").protocol}function Ve(e,t,r,n){return Me(e,t,n)}function $e(e,t){return e[t]}function qe(e,t,r){return e[t]=r}function We(e){return Boolean(e)}function Ge(e){return e&&e[Symbol.iterator]?e[Symbol.iterator]():null}e.EnvironmentImpl=He,ve=Fe
+class Ye{constructor(e){this.inner=e}lookupComponent(e,t){if(this.inner.lookupComponent){var r=this.inner.lookupComponent(e,t)
+if(void 0===r)throw new Error(`Unexpected component ${e} (from ${t}) (lookupComponent returned undefined)`)
+return r}throw new Error("lookupComponent not implemented on RuntimeResolver.")}lookupPartial(e,t){if(this.inner.lookupPartial){var r=this.inner.lookupPartial(e,t)
+if(void 0===r)throw new Error(`Unexpected partial ${e} (from ${t}) (lookupPartial returned undefined)`)
+return r}throw new Error("lookupPartial not implemented on RuntimeResolver.")}resolve(e){if(this.inner.resolve){var t=this.inner.resolve(e)
+if(void 0===t)throw new Error(`Unexpected handle ${e} (resolve returned undefined)`)
+return t}throw new Error("resolve not implemented on RuntimeResolver.")}compilable(e){if(this.inner.compilable){var t=this.inner.compilable(e)
+if(void 0===t)throw new Error(`Unable to compile ${name} (compilable returned undefined)`)
+return t}throw new Error("compilable not implemented on RuntimeResolver.")}getInvocation(e){if(this.inner.getInvocation){var t=this.inner.getInvocation(e)
+if(void 0===t)throw new Error(`Unable to get invocation for ${JSON.stringify(e)} (getInvocation returned undefined)`)
+return t}throw new Error("getInvocation not implemented on RuntimeResolver.")}}var Ke,Je=new class{constructor(){this.evaluateOpcode=(0,t.fillNulls)(107).slice()}add(e,t,r="syscall"){this.evaluateOpcode[e]={syscall:"machine"!==r,evaluate:t}}debugBefore(e,t){return{sp:void 0,pc:e.fetchValue(o.$pc),name:void 0,params:void 0,type:t.type,isMachine:t.isMachine,size:t.size,state:void 0}}debugAfter(e,t){}evaluate(e,t,r){var n=this.evaluateOpcode[r]
+n.syscall?n.evaluate(e,t):n.evaluate(e[s],t)}}
+class Qe extends class{constructor(){(0,t.initializeGuid)(this)}}{}function Xe(e){for(var t=[],r=0;r<e.length;r++){var i=e[r].tag
+i!==n.CONSTANT_TAG&&t.push(i)}return(0,n.createCombinatorTag)(t)}class Ze extends r.CachedReference{constructor(e){super(),this.parts=e,this.tag=Xe(e)}compute(){for(var e=new Array,t=0;t<this.parts.length;t++){var r=this.parts[t].value()
+null!=r&&(e[t]=et(r))}return e.length>0?e.join(""):null}}function et(e){return"function"!=typeof e.toString?"":String(e)}function tt(e){return e===ne}function rt(e){return 0|(e.dynamicLayout?1:0)|(e.dynamicTag?2:0)|(e.prepareArgs?4:0)|(e.createArgs?8:0)|(e.attributeHook?16:0)|(e.elementHook?32:0)|(e.dynamicScope?64:0)|(e.createCaller?128:0)|(e.updateHook?256:0)|(e.createInstance?512:0)|(e.wrapped?1024:0)|(e.willDestroy?2048:0)}function nt(e,t,r){return!!(t&r)}function it(e,t){return!!(e&t)}Je.add(16,(e,{op1:t})=>{var r=e.stack,n=e.runtime.resolver.resolve(t)(r.popJs(),e)
+e.loadValue(o.$v0,n)}),Je.add(22,(e,{op1:t})=>{var r=e.referenceForSymbol(t)
+e.stack.pushJs(r)}),Je.add(19,(e,{op1:t})=>{var r=e.stack.pop()
+e.scope().bindSymbol(t,r)}),Je.add(21,(e,{op1:t})=>{var r=e.stack.popJs(),n=e.stack.popJs(),i=e.stack.popJs(),o=i?[r,n,i]:null
+e.scope().bindBlock(t,o)},"jit"),Je.add(20,(e,{op1:t})=>{var r=e.stack.popSmallInt(),n=e.stack.popJs(),i=e.stack.popJs(),o=i?[r,n,i]:null
+e.scope().bindBlock(t,o)}),Je.add(105,(e,{op1:t})=>{var r=e[h].getValue(t),n=e.scope().getPartialMap()[r]
+void 0===n&&(n=e.getSelf().get(r)),e.stack.pushJs(n)}),Je.add(37,(e,{op1:t})=>{e.pushRootScope(t)}),Je.add(23,(e,{op1:t})=>{var r=e[h].getValue(t),n=e.stack.popJs()
+e.stack.pushJs(n.get(r))}),Je.add(24,(e,{op1:t})=>{var{stack:r}=e,n=e.scope().getBlock(t)
+null===n?r.pushNull():r.pushJs(n)}),Je.add(25,e=>{var{stack:t}=e,r=t.popJs()
+if(r&&!tt(r)){var[n,i,o]=r
+t.pushJs(o),t.pushJs(i),"number"==typeof n?t.pushSmallInt(n):t.pushJs(n)}else t.pushNull(),t.pushNull(),t.pushNull()}),Je.add(26,e=>{var{stack:t}=e,r=t.pop()
+r&&!tt(r)?t.pushJs(oe):t.pushJs(ae)}),Je.add(27,e=>{e.stack.pop(),e.stack.popJs()
+var t=e.stack.popJs(),r=t&&t.parameters.length
+e.stack.pushJs(r?oe:ae)}),Je.add(28,(e,{op1:t})=>{for(var r=new Array(t),n=t;n>0;n--){r[n-1]=e.stack.pop()}e.stack.pushJs(new Ze(r))})
+var ot=(0,t.symbol)("CURRIED COMPONENT DEFINITION")
+function at(e){return!(!e||!e[ot])}class st{constructor(e,t){this.inner=e,this.args=t,this[Ke]=!0}unwrap(e){e.realloc(this.offset)
+for(var t=this;;){var{args:r,inner:n}=t
+if(r&&(e.positional.prepend(r.positional),e.named.merge(r.named)),!at(n))return n
+t=n}}get offset(){var{inner:e,args:t}=this,r=t?t.positional.length:0
+return at(e)?r+e.offset:r}}function lt(e,t,r){return e.lookupComponent(t,r)}e.CurriedComponentDefinition=st,Ke=ot
+class ut{constructor(e){this.list=e,this.tag=Xe(e),this.list=e}value(){for(var e=[],{list:t}=this,r=0;r<t.length;r++){var n=ue(t[r].value())
+n&&e.push(n)}return 0===e.length?null:e.join(" ")}}class ct{constructor(e,t,r,n){this.inner=e,this.resolver=t,this.meta=r,this.args=n,this.tag=e.tag,this.lastValue=null,this.lastDefinition=null}value(){var{inner:e,lastValue:t}=this,r=e.value()
+if(r===t)return this.lastDefinition
+var n=null
+if(at(r))n=r
+else if("string"==typeof r&&r){var{resolver:i,meta:o}=this
+n=lt(i,r,o)}return n=this.curry(n),this.lastValue=r,this.lastDefinition=n,n}get(){return ne}curry(e){var{args:t}=this
+return!t&&at(e)?e:e?new st(e,t):null}}class dt extends Qe{constructor(e,t,r){super(),this.node=e,this.reference=t,this.lastValue=r,this.type="dynamic-text",this.tag=t.tag,this.lastRevision=(0,n.valueForTag)(this.tag)}evaluate(){var{reference:e,tag:t}=this;(0,n.validateTag)(t,this.lastRevision)||(this.lastRevision=(0,n.valueForTag)(t),this.update(e.value()))}update(e){var t,{lastValue:r}=this
+e!==r&&((t=ce(e)?"":fe(e)?e:String(e))!==r&&(this.node.nodeValue=this.lastValue=t))}}class ht{constructor(e){this.inner=e,this.tag=e.tag}value(){var e,t=this.inner.value()
+return function(e){return fe(e)||ce(e)||"boolean"==typeof e||"number"==typeof e}(t)?1:(e=t)&&e[ot]?0:de(t)?3:function(e){return he(e)&&11===e.nodeType}(t)?4:he(t)?5:1}}Je.add(43,e=>{var t=e.stack.popJs().value(),r=ce(t)?"":String(t)
+e.elements().appendDynamicHTML(r)}),Je.add(44,e=>{var t=e.stack.popJs().value().toHTML(),r=ce(t)?"":t
+e.elements().appendDynamicHTML(r)}),Je.add(47,e=>{var t=e.stack.popJs(),r=t.value(),i=ce(r)?"":String(r),o=e.elements().appendDynamicText(i);(0,n.isConstTagged)(t)||e.updateWith(new dt(o,t,i))}),Je.add(45,e=>{var t=e.stack.popJs().value()
+e.elements().appendDynamicFragment(t)}),Je.add(46,e=>{var t=e.stack.popJs().value()
+e.elements().appendDynamicNode(t)}),Je.add(39,e=>e.pushChildScope()),Je.add(40,e=>e.popScope()),Je.add(59,e=>e.pushDynamicScope()),Je.add(60,e=>e.popDynamicScope()),Je.add(29,(e,{op1:r})=>{e.stack.pushJs(e[h].getValue((0,t.decodeHandle)(r)))}),Je.add(30,(e,{op1:r})=>{var n=e.stack
+if((0,t.isNonPrimitiveHandle)(r)){var i=e[h].getValue((0,t.decodeHandle)(r))
+n.pushJs(i)}else n.pushRaw(r)}),Je.add(31,e=>{var t=e.stack
+t.pushJs(ee.create(t.pop()))}),Je.add(32,e=>{var t=e.stack
+t.pushSmallInt(t.peekJs().value())}),Je.add(33,(e,{op1:t,op2:r})=>{var n=e.fetchValue(t)-r
+e.stack.dup(n)}),Je.add(34,(e,{op1:t})=>{e.stack.pop(t)}),Je.add(35,(e,{op1:t})=>{e.load(t)}),Je.add(36,(e,{op1:t})=>{e.fetch(t)}),Je.add(58,(e,{op1:t})=>{var r=e[h].getArray(t)
+e.bindDynamicScope(r)}),Je.add(69,(e,{op1:t})=>{e.enter(t)}),Je.add(70,e=>{e.exit()}),Je.add(63,(e,{op1:t})=>{e.stack.pushJs(e[h].getSerializable(t))}),Je.add(62,e=>{e.stack.pushJs(e.scope())}),Je.add(61,e=>{var t=e.stack,r=t.pop()
+r?t.pushSmallInt(e.compile(r)):t.pushNull()},"jit"),Je.add(64,e=>{var{stack:t}=e,r=t.pop(),n=t.popJs(),i=t.popJs(),o=t.pop()
+if(null===i)return e.pushFrame(),void e.pushScope(n)
+var a=n,s=i.parameters,l=s.length
+if(l>0){a=a.child()
+for(var u=0;u<l;u++)a.bindSymbol(s[u],o.at(u))}e.pushFrame(),e.pushScope(a),e.call(r)}),Je.add(65,(e,{op1:t})=>{var i=e.stack.popJs()
+if((0,n.isConstTagged)(i))i.value()&&e.goto(t)
+else{var o=new r.ReferenceCache(i)
+o.peek()&&e.goto(t),e.updateWith(new ft(o))}}),Je.add(66,(e,{op1:t})=>{var i=e.stack.popJs()
+if((0,n.isConstTagged)(i))i.value()||e.goto(t)
+else{var o=new r.ReferenceCache(i)
+o.peek()||e.goto(t),e.updateWith(new ft(o))}}),Je.add(67,(e,{op1:t,op2:r})=>{e.stack.peekSmallInt()===r&&e.goto(t)}),Je.add(68,e=>{var t=e.stack.peekJs();(0,n.isConstTagged)(t)||e.updateWith(ft.initialize(new r.ReferenceCache(t)))}),Je.add(71,e=>{var{env:t,stack:r}=e
+r.pushJs(t.toConditionalReference(r.popJs()))})
+class ft extends Qe{constructor(e){super(),this.type="assert",this.tag=e.tag,this.cache=e}static initialize(e){var t=new ft(e)
+return e.peek(),t}evaluate(e){var{cache:t}=this;(0,r.isModified)(t.revalidate())&&e.throw()}}class pt extends Qe{constructor(e){super(),this.index=e,this.type="jump-if-not-modified",this.tag=n.CONSTANT_TAG,this.lastRevision=n.INITIAL}finalize(e,t){this.tag=e,this.target=t}evaluate(e){var{tag:t,target:r,lastRevision:i}=this
+!e.alwaysRevalidate&&(0,n.validateTag)(t,i)&&e.goto(r)}didModify(){this.lastRevision=(0,n.valueForTag)(this.tag)}}class mt extends Qe{constructor(e){super(),this.target=e,this.type="did-modify",this.tag=n.CONSTANT_TAG}evaluate(){this.target.didModify()}}Je.add(41,(e,{op1:t})=>{e.elements().appendText(e[h].getValue(t))}),Je.add(42,(e,{op1:t})=>{e.elements().appendComment(e[h].getValue(t))}),Je.add(48,(e,{op1:t})=>{e.elements().openElement(e[h].getValue(t))}),Je.add(49,e=>{var t=e.stack.popJs().value()
+e.elements().openElement(t)}),Je.add(50,e=>{var t,i,o=e.stack.popJs(),a=e.stack.popJs(),s=e.stack.popJs().value()
+if((0,n.isConstTagged)(o))t=o.value()
+else{var l=new r.ReferenceCache(o)
+t=l.peek(),e.updateWith(new ft(l))}if(void 0!==a.value())if((0,n.isConstTagged)(a))i=a.value()
+else{var u=new r.ReferenceCache(a)
+i=u.peek(),e.updateWith(new ft(u))}var c=e.elements().pushRemoteElement(t,s,i)
+c&&e.associateDestroyable(c)}),Je.add(56,e=>{e.elements().popRemoteElement()}),Je.add(54,e=>{var t=e.fetchValue(o.$t0),r=null
+t&&(r=t.flush(e),e.loadValue(o.$t0,null)),e.elements().flushElement(r)}),Je.add(55,e=>{var t=e.elements().closeElement()
+t&&t.forEach(([t,r])=>{e.env.scheduleInstallModifier(r,t)
+var n=t.getDestroyable(r)
+n&&e.associateDestroyable(n)})}),Je.add(57,(e,{op1:t})=>{var{manager:r,state:i}=e.runtime.resolver.resolve(t),a=e.stack.popJs(),{constructing:s,updateOperations:l}=e.elements(),u=e.dynamicScope(),c=r.create(s,i,a,u,l)
+e.fetchValue(o.$t0).addModifier(r,c)
+var d=r.getTag(c);(0,n.isConstTag)(d)||e.updateWith(new vt(d,r,c))})
+class vt extends Qe{constructor(e,t,r){super(),this.tag=e,this.manager=t,this.modifier=r,this.type="update-modifier",this.lastUpdated=(0,n.valueForTag)(e)}evaluate(e){var{manager:t,modifier:r,tag:i,lastUpdated:o}=this;(0,n.validateTag)(i,o)||(e.env.scheduleUpdateModifier(r,t),this.lastUpdated=(0,n.valueForTag)(i))}}Je.add(51,(e,{op1:t,op2:r,op3:n})=>{var i=e[h].getValue(t),o=e[h].getValue(r),a=n?e[h].getValue(n):null
+e.elements().setStaticAttribute(i,o,a)}),Je.add(52,(e,{op1:t,op2:r,op3:i})=>{var o=e[h].getValue(t),a=e.stack.popJs(),s=a.value(),l=i?e[h].getValue(i):null,u=e.elements().setDynamicAttribute(o,s,!!r,l);(0,n.isConstTagged)(a)||e.updateWith(new gt(a,u))})
+class gt extends Qe{constructor(e,t){super(),this.reference=e,this.attribute=t,this.type="patch-element"
+var{tag:r}=e
+this.tag=r,this.lastRevision=(0,n.valueForTag)(r)}evaluate(e){var{attribute:t,reference:r,tag:i}=this;(0,n.validateTag)(i,this.lastRevision)||(t.update(r.value(),e.env),this.lastRevision=(0,n.valueForTag)(i))}}var bt=(0,t.symbol)("COMPONENT_INSTANCE")
+Je.add(77,e=>{var t=e.stack,r=t.popJs()
+t.pushJs(new se(r,at))}),Je.add(78,e=>{var t=e.stack,r=t.peekJs()
+t.pushJs(new ht(r))}),Je.add(79,(e,{op1:r})=>{var n=e.stack,i=n.popJs(),a=n.popJs(),s=e[h].getValue((0,t.decodeHandle)(r)),l=e.runtime.resolver
+e.loadValue(o.$v0,new ct(i,l,s,a))}),Je.add(80,(e,{op1:t})=>{var r=e.runtime.resolver.resolve(t),{manager:n}=r,i=rt(n.getCapabilities(r.state)),o={[bt]:!0,definition:r,manager:n,capabilities:i,state:null,handle:null,table:null,lookup:null}
+e.stack.pushJs(o)}),Je.add(83,(e,{op1:r})=>{var n,i=e.stack,a=i.popJs().value(),s=e[h].getValue((0,t.decodeHandle)(r))
+if(e.loadValue(o.$t1,null),"string"==typeof a){n=lt(e.runtime.resolver,a,s)}else{if(!at(a))throw(0,t.unreachable)()
+n=a}i.pushJs(n)}),Je.add(81,e=>{var t,r,{stack:n}=e,i=n.pop()
+at(i)?r=t=null:t=rt((r=i.manager).getCapabilities(i.state)),n.pushJs({definition:i,capabilities:t,manager:r,state:null,handle:null,table:null})}),Je.add(82,e=>{var r,n=e.stack,i=n.popJs().value()
+if(!at(i))throw(0,t.unreachable)()
+r=i,n.pushJs(r)}),Je.add(84,(e,{op1:r,op2:n,op3:i})=>{var o=e.stack,a=e[h].getArray(r),s=i>>4,l=8&i,u=7&i?e[h].getArray(n):t.EMPTY_ARRAY
+e[f].setup(o,a,u,s,!!l),o.pushJs(e[f])}),Je.add(85,e=>{var{stack:t}=e
+t.pushJs(e[f].empty(t))}),Je.add(88,e=>{var t=e.stack,r=t.popJs().capture()
+t.pushJs(r)}),Je.add(87,(e,{op1:t})=>{var r=e.stack,n=e.fetchValue(t),i=r.popJs(),{definition:o}=n
+at(o)&&(o=function(e,t,r){var n=e.definition=t.unwrap(r),{manager:i,state:o}=n
+return e.manager=i,e.capabilities=rt(i.getCapabilities(o)),n}(n,o,i))
+var{manager:a,state:s}=o
+if(nt(0,n.capabilities,4)){var l=i.blocks.values,u=i.blocks.names,c=a.prepareArgs(s,i)
+if(c){i.clear()
+for(var d=0;d<l.length;d++){var h=l[d]
+"number"==typeof h?r.pushSmallInt(h):r.pushJs(h)}for(var{positional:f,named:p}=c,m=f.length,v=0;v<m;v++)r.pushJs(f[v])
+for(var g=Object.keys(p),b=0;b<g.length;b++)r.pushJs(p[g[b]])
+i.setup(r,g,u,m,!1)}r.pushJs(i)}else r.pushJs(i)}),Je.add(89,(e,{op1:t,op2:r})=>{var i=e.fetchValue(r),{definition:o,manager:a}=i,s=i.capabilities=rt(a.getCapabilities(o.state))
+if(!nt(0,s,512))throw new Error("BUG")
+var l=null
+nt(0,s,64)&&(l=e.dynamicScope())
+var u=1&t,c=null
+nt(0,s,8)&&(c=e.stack.peekJs())
+var d=null
+nt(0,s,128)&&(d=e.getSelf())
+var h=a.create(e.env,o.state,c,l,d,!!u)
+i.state=h
+var f=a.getTag(h)
+nt(0,s,256)&&!(0,n.isConstTag)(f)&&e.updateWith(new St(f,h,a,l))}),Je.add(90,(e,{op1:t})=>{var{manager:r,state:n,capabilities:i}=e.fetchValue(t),o=r.getDestroyable(n)
+o&&e.associateDestroyable(o)}),Je.add(100,e=>{e.beginCacheGroup(),e.elements().pushSimpleBlock()}),Je.add(91,e=>{e.loadValue(o.$t0,new yt)}),Je.add(53,(e,{op1:t,op2:r,op3:n})=>{var i=e[h].getValue(t),a=e.stack.popJs(),s=n?e[h].getValue(n):null
+e.fetchValue(o.$t0).setAttribute(i,a,!!r,s)}),Je.add(108,(e,{op1:t,op2:r,op3:n})=>{var i=e[h].getValue(t),a=e[h].getValue(r),s=n?e[h].getValue(n):null
+e.fetchValue(o.$t0).setStaticAttribute(i,a,s)})
+class yt{constructor(){this.attributes=(0,t.dict)(),this.classes=[],this.modifiers=[]}setAttribute(e,t,r,n){var i={value:t,namespace:n,trusting:r}
+"class"===e&&this.classes.push(t),this.attributes[e]=i}setStaticAttribute(e,t,r){var n={value:t,namespace:r}
+"class"===e&&this.classes.push(t),this.attributes[e]=n}addModifier(e,t){this.modifiers.push([e,t])}flush(e){var t,r=this.attributes
+for(var n in this.attributes)if("type"!==n){var i=this.attributes[n]
+"class"===n?wt(e,"class",_t(this.classes),i.namespace,i.trusting):wt(e,n,i.value,i.namespace,i.trusting)}else t=r[n]
+return void 0!==t&&wt(e,"type",t.value,t.namespace,t.trusting),this.modifiers}}function _t(e){return 0===e.length?"":1===e.length?e[0]:function(e){for(var t=0;t<e.length;t++)if("string"!=typeof e[t])return!1
+return!0}(e)?e.join(" "):function(e){for(var t=0;t<e.length;t++){var r=e[t]
+"string"==typeof r&&(e[t]=ee.create(r))}return new ut(e)}(e)}function wt(e,t,r,i,o=!1){if("string"==typeof r)e.elements().setStaticAttribute(t,r,i)
+else{var a=e.elements().setDynamicAttribute(t,r.value(),o,i);(0,n.isConstTagged)(r)||e.updateWith(new gt(r,a))}}function Et(e){return!1===nt(0,e,1)}function xt(e){return!0===nt(0,e,1)}function Ot(e,t,r,n,i){var o=r.table.symbols.indexOf(e),a=n.get(t);-1!==o&&i.scope().bindBlock(o+1,a),r.lookup&&(r.lookup[e]=a)}Je.add(102,(e,{op1:t})=>{var{definition:r,state:n}=e.fetchValue(t),{manager:i}=r,a=e.fetchValue(o.$t0)
+i.didCreateElement(n,e.elements().constructing,a)}),Je.add(92,(e,{op1:t})=>{var{definition:r,state:n}=e.fetchValue(t),{manager:i}=r
+e.stack.pushJs(i.getSelf(n))}),Je.add(93,(e,{op1:t})=>{var{definition:r,state:n}=e.fetchValue(t),{manager:i}=r,o=i.getTagName(n)
+e.stack.pushJs(o)}),Je.add(95,(e,{op1:r})=>{var n,i=e.fetchValue(r),o=i.manager,{definition:a}=i,{stack:s}=e,{capabilities:l}=i
+if(Et(l,o))n=o.getJitStaticLayout(a.state,e.runtime.resolver)
+else{if(!xt(l,o))throw(0,t.unreachable)()
+var u=(0,t.unwrapTemplate)(o.getJitDynamicLayout(i.state,e.runtime.resolver))
+n=it(l,1024)?u.asWrappedLayout():u.asLayout()}var c=n.compile(e.context)
+s.pushJs(n.symbolTable),s.pushSmallInt(c)},"jit"),Je.add(94,(e,{op1:r})=>{var n,i=e.fetchValue(r),{manager:o,definition:a}=i,{stack:s}=e,{state:l,capabilities:u}=i,{state:c}=a
+if(Et(u,o))n=o.getAotStaticLayout(c,e.runtime.resolver)
+else{if(!xt(u,o))throw(0,t.unreachable)()
+n=o.getAotDynamicLayout(l,e.runtime.resolver)}s.pushJs(n.symbolTable),s.pushSmallInt(n.handle)}),Je.add(76,(e,{op1:t})=>{var r=e.stack.popJs(),n=e.stack.popJs(),{manager:i}=r,o=rt(i.getCapabilities(r.state)),a={[bt]:!0,definition:r,manager:i,capabilities:o,state:null,handle:n.handle,table:n.symbolTable,lookup:null}
+e.loadValue(t,a)}),Je.add(98,(e,{op1:t})=>{var{stack:r}=e,n=r.popSmallInt(),i=r.popJs(),o=e.fetchValue(t)
+o.handle=n,o.table=i}),Je.add(38,(e,{op1:t})=>{var{symbols:r}=e.fetchValue(t).table
+e.pushRootScope(r.length+1)}),Je.add(97,(e,{op1:r})=>{var n=e.fetchValue(r)
+if(n.table.hasEval){var i=n.lookup=(0,t.dict)()
+e.scope().bindEvalScope(i)}}),Je.add(17,(e,{op1:t})=>{for(var r=e.fetchValue(t),n=e.scope(),i=e.stack.peekJs(),o=i.named.atNames,a=o.length-1;a>=0;a--){var s=o[a],l=r.table.symbols.indexOf(o[a]),u=i.named.get(s,!0);-1!==l&&n.bindSymbol(l+1,u),r.lookup&&(r.lookup[s]=u)}}),Je.add(18,(e,{op1:t})=>{for(var r=e.fetchValue(t),{blocks:n}=e.stack.peekJs(),i=0;i<n.names.length;i++)Ot(n.symbolNames[i],n.names[i],r,n,e)}),Je.add(99,(e,{op1:t})=>{var r=e.fetchValue(t)
+e.call(r.handle)}),Je.add(103,(e,{op1:t})=>{var{manager:r,state:n,capabilities:i}=e.fetchValue(t),o=e.elements().popBlock()
+if(!nt(0,i,512))throw new Error("BUG")
+r.didRenderLayout(n,o),e.env.didCreate(n,r),e.updateWith(new Tt(r,n,o))}),Je.add(101,e=>{e.commitCacheGroup()})
+class St extends Qe{constructor(e,t,r,n){super(),this.tag=e,this.component=t,this.manager=r,this.dynamicScope=n,this.type="update-component"}evaluate(e){var{component:t,manager:r,dynamicScope:n}=this
+r.update(t,n)}}class Tt extends Qe{constructor(e,t,r){super(),this.manager=e,this.component=t,this.bounds=r,this.type="did-update-layout",this.tag=n.CONSTANT_TAG}evaluate(e){var{manager:t,component:r,bounds:n}=this
+t.didUpdateLayout(r,n),e.env.didUpdate(r,t)}}function Mt(e,t){console.info("Use `context`, and `get(<path>)` to debug this template."),t("this")}var At=Mt
+class Pt{constructor(e,r,n){this.scope=e,this.locals=(0,t.dict)()
+for(var i=0;i<n.length;i++){var o=n[i],a=r[o-1],s=e.getSymbol(o)
+this.locals[a]=s}}get(e){var t,{scope:r,locals:n}=this,i=e.split("."),[o,...a]=e.split("."),s=r.getEvalScope()
+return"this"===o?t=r.getSelf():n[o]?t=n[o]:0===o.indexOf("@")&&s[o]?t=s[o]:(t=this.scope.getSelf(),a=i),a.reduce((e,t)=>e.get(t),t)}}Je.add(106,(e,{op1:r,op2:n})=>{var i=e[h].getArray(r),o=e[h].getValue((0,t.decodeHandle)(n)),a=new Pt(e.scope(),i,o)
+At(e.getSelf().value(),e=>a.get(e).value())}),Je.add(104,(e,{op1:r,op2:n,op3:i})=>{var{[h]:o,stack:a}=e,s=a.popJs().value(),l=o.getValue((0,t.decodeHandle)(r)),u=o.getArray(n),c=o.getValue((0,t.decodeHandle)(i)),d=e.runtime.resolver.lookupPartial(s,l),f=e.runtime.resolver.resolve(d),{symbolTable:p,handle:m}=f.getPartial(e.context),v=p.symbols,g=e.scope(),b=e.pushRootScope(v.length),y=g.getEvalScope()
+b.bindEvalScope(y),b.bindSelf(g.getSelf())
+for(var _=Object.create(g.getPartialMap()),w=0;w<c.length;w++){var E=c[w],x=u[E-1],O=g.getSymbol(E)
+_[x]=O}if(y)for(var S=0;S<v.length;S++){var T=S+1,M=y[v[S]]
+void 0!==M&&b.bind(T,M)}b.bindPartialMap(_),e.pushFrame(),e.call((0,t.unwrapHandle)(m))},"jit"),Je.add(74,e=>{var t=e.stack,n=t.popJs(),i=t.popJs().value(),o=null===i?"@identity":String(i),a=new r.IterableReference(n,o,e.env)
+t.pushJs(a),t.pushJs(a)}),Je.add(72,(e,{op1:t})=>{e.enterList(t)}),Je.add(73,e=>{e.exitList()}),Je.add(75,(e,{op1:t})=>{var r=e.stack.peekJs(),n=r.next()
+if(n){var i=e.enterItem(r,n)
+e.registerItem(i)}else e.goto(t)})
+e.DEFAULT_CAPABILITIES={dynamicLayout:!0,dynamicTag:!0,prepareArgs:!0,createArgs:!0,attributeHook:!1,elementHook:!1,dynamicScope:!0,createCaller:!1,updateHook:!0,createInstance:!0,wrapped:!1,willDestroy:!1}
+var Ct={dynamicLayout:!1,dynamicTag:!1,prepareArgs:!1,createArgs:!1,attributeHook:!1,elementHook:!1,dynamicScope:!1,createCaller:!1,updateHook:!1,createInstance:!1,wrapped:!1,willDestroy:!1}
+e.MINIMAL_CAPABILITIES=Ct
+class kt{getCapabilities(e){return Ct}prepareArgs(e,t){throw new Error("Unimplemented prepareArgs in SimpleComponentManager")}create(e,t,r,n,i,o){throw new Error("Unimplemented create in SimpleComponentManager")}getSelf(e){return ne}getTag(e){throw new Error("Unimplemented getTag in SimpleComponentManager")}didRenderLayout(e,t){throw new Error("Unimplemented didRenderLayout in SimpleComponentManager")}didCreate(e){throw new Error("Unimplemented didCreate in SimpleComponentManager")}update(e,t){throw new Error("Unimplemented update in SimpleComponentManager")}didUpdateLayout(e,t){throw new Error("Unimplemented didUpdateLayout in SimpleComponentManager")}didUpdate(e){throw new Error("Unimplemented didUpdate in SimpleComponentManager")}getDestroyable(e){return null}}e.SimpleComponentManager=kt
+var Rt={state:null,manager:new kt}
+e.TEMPLATE_ONLY_COMPONENT=Rt
+class jt{constructor(e){this.bucket=e?(0,t.assign)({},e):{}}get(e){return this.bucket[e]}set(e,t){return this.bucket[e]=t}child(){return new jt(this.bucket)}}e.DefaultDynamicScope=jt
+class Dt{constructor(e,t){this.scope=e,this.nameRef=t
+var r=this.varTag=(0,n.createUpdatableTag)()
+this.tag=(0,n.combine)([t.tag,r])}value(){return this.getVar().value()}get(e){return this.getVar().get(e)}getVar(){var e=String(this.nameRef.value()),t=this.scope.get(e)
+return(0,n.updateTag)(this.varTag,t.tag),t}}class Nt{constructor(){this.stack=null,this.positional=new It,this.named=new Ft,this.blocks=new Ht}empty(e){var t=e[c][o.$sp]+1
+return this.named.empty(e,t),this.positional.empty(e,t),this.blocks.empty(e,t),this}setup(e,t,r,n,i){this.stack=e
+var a=this.named,s=t.length,l=e[c][o.$sp]-s+1
+a.setup(e,l,s,t,i)
+var u=l-n
+this.positional.setup(e,u,n)
+var d=this.blocks,h=r.length,f=u-3*h
+d.setup(e,f,h,r)}get tag(){return Xe([this.positional,this.named])}get base(){return this.blocks.base}get length(){return this.positional.length+this.named.length+3*this.blocks.length}at(e){return this.positional.at(e)}realloc(e){var{stack:t}=this
+if(e>0&&null!==t){for(var{positional:r,named:n}=this,i=r.base+e,a=r.length+n.length-1;a>=0;a--)t.copy(a+r.base,a+i)
+r.base+=e,n.base+=e,t[c][o.$sp]+=e}}capture(){var e=0===this.positional.length?Gt:this.positional.capture(),t=0===this.named.length?Wt:this.named.capture()
+return new Vt(this.tag,e,t,this.length)}clear(){var{stack:e,length:t}=this
+t>0&&null!==e&&e.pop(t)}}class It{constructor(){this.base=0,this.length=0,this.stack=null,this._tag=null,this._references=null}empty(e,r){this.stack=e,this.base=r,this.length=0,this._tag=n.CONSTANT_TAG,this._references=t.EMPTY_ARRAY}setup(e,r,i){this.stack=e,this.base=r,this.length=i,0===i?(this._tag=n.CONSTANT_TAG,this._references=t.EMPTY_ARRAY):(this._tag=null,this._references=null)}get tag(){var e=this._tag
+return e||(e=this._tag=Xe(this.references)),e}at(e){var{base:t,length:r,stack:n}=this
+return e<0||e>=r?ne:n.get(e,t)}capture(){return new Lt(this.tag,this.references)}prepend(e){var t=e.length
+if(t>0){var{base:r,length:n,stack:i}=this
+this.base=r-=t,this.length=n+t
+for(var o=0;o<t;o++)i.set(e.at(o),o,r)
+this._tag=null,this._references=null}}get references(){var e=this._references
+if(!e){var{stack:t,base:r,length:n}=this
+e=this._references=t.slice(r,r+n)}return e}}class Lt{constructor(e,t,r=t.length){this.tag=e,this.references=t,this.length=r}static empty(){return new Lt(n.CONSTANT_TAG,t.EMPTY_ARRAY,0)}at(e){return this.references[e]}value(){return this.references.map(this.valueOf)}get(e){var{references:t,length:r}=this
+if("length"===e)return ee.create(r)
+var n=parseInt(e,10)
+return n<0||n>=r?ne:t[n]}valueOf(e){return e.value()}}e.CapturedPositionalArgumentsImpl=Lt
+class Ft{constructor(){this.base=0,this.length=0,this._references=null,this._names=t.EMPTY_ARRAY,this._atNames=t.EMPTY_ARRAY}empty(e,r){this.stack=e,this.base=r,this.length=0,this._references=t.EMPTY_ARRAY,this._names=t.EMPTY_ARRAY,this._atNames=t.EMPTY_ARRAY}setup(e,r,n,i,o){this.stack=e,this.base=r,this.length=n,0===n?(this._references=t.EMPTY_ARRAY,this._names=t.EMPTY_ARRAY,this._atNames=t.EMPTY_ARRAY):(this._references=null,o?(this._names=null,this._atNames=i):(this._names=i,this._atNames=null))}get tag(){return Xe(this.references)}get names(){var e=this._names
+return e||(e=this._names=this._atNames.map(this.toSyntheticName)),e}get atNames(){var e=this._atNames
+return e||(e=this._atNames=this._names.map(this.toAtName)),e}has(e){return-1!==this.names.indexOf(e)}get(e,t=!1){var{base:r,stack:n}=this,i=(t?this.atNames:this.names).indexOf(e)
+return-1===i?ne:n.get(i,r)}capture(){return new zt(this.tag,this.names,this.references)}merge(e){var{length:t}=e
+if(t>0){for(var{names:r,length:n,stack:i}=this,{names:o}=e,a=r.slice(),s=0;s<t;s++){var l=o[s];-1===a.indexOf(l)&&(n=a.push(l),i.pushJs(e.references[s]))}this.length=n,this._references=null,this._names=a,this._atNames=null}}get references(){var e=this._references
+if(!e){var{base:t,length:r,stack:n}=this
+e=this._references=n.slice(t,t+r)}return e}toSyntheticName(e){return e.slice(1)}toAtName(e){return"@"+e}}class zt{constructor(e,t,r){this.tag=e,this.names=t,this.references=r,this.length=t.length,this._map=null}get map(){var e=this._map
+if(!e){var{names:r,references:n}=this
+e=this._map=(0,t.dict)()
+for(var i=0;i<r.length;i++){e[r[i]]=n[i]}}return e}has(e){return-1!==this.names.indexOf(e)}get(e){var{names:t,references:r}=this,n=t.indexOf(e)
+return-1===n?ne:r[n]}value(){for(var{names:e,references:r}=this,n=(0,t.dict)(),i=0;i<e.length;i++){n[e[i]]=r[i].value()}return n}}function Ut(e){return"&"+e}e.CapturedNamedArgumentsImpl=zt
+class Ht{constructor(){this.internalValues=null,this._symbolNames=null,this.internalTag=null,this.names=t.EMPTY_ARRAY,this.length=0,this.base=0}empty(e,r){this.stack=e,this.names=t.EMPTY_ARRAY,this.base=r,this.length=0,this._symbolNames=null,this.internalTag=n.CONSTANT_TAG,this.internalValues=t.EMPTY_ARRAY}setup(e,r,i,o){this.stack=e,this.names=o,this.base=r,this.length=i,this._symbolNames=null,0===i?(this.internalTag=n.CONSTANT_TAG,this.internalValues=t.EMPTY_ARRAY):(this.internalTag=null,this.internalValues=null)}get values(){var e=this.internalValues
+if(!e){var{base:t,length:r,stack:n}=this
+e=this.internalValues=n.slice(t,t+3*r)}return e}has(e){return-1!==this.names.indexOf(e)}get(e){var t=this.names.indexOf(e)
+if(-1===t)return null
+var{base:r,stack:n}=this,i=n.get(3*t,r),o=n.get(3*t+1,r),a=n.get(3*t+2,r)
+return null===a?null:[a,o,i]}capture(){return new Bt(this.names,this.values)}get symbolNames(){var e=this._symbolNames
+return null===e&&(e=this._symbolNames=this.names.map(Ut)),e}}class Bt{constructor(e,t){this.names=e,this.values=t,this.length=e.length}has(e){return-1!==this.names.indexOf(e)}get(e){var t=this.names.indexOf(e)
+return-1===t?null:[this.values[3*t+2],this.values[3*t+1],this.values[3*t]]}}class Vt{constructor(e,t,r,n){this.tag=e,this.positional=t,this.named=r,this.length=n}value(){return{named:this.named.value(),positional:this.positional.value()}}}e.CapturedArgumentsImpl=Vt
+var $t,qt,Wt=new zt(n.CONSTANT_TAG,t.EMPTY_ARRAY,t.EMPTY_ARRAY),Gt=new Lt(n.CONSTANT_TAG,t.EMPTY_ARRAY),Yt=new Vt(n.CONSTANT_TAG,Gt,Wt,0)
+e.EMPTY_ARGS=Yt
+class Kt{constructor(e,t,r,n,i){this.stack=e,this.heap=t,this.program=r,this.externs=n,this.registers=i,this.currentOpSize=0}fetchRegister(e){return this.registers[e]}loadRegister(e,t){this.registers[e]=t}setPc(e){this.registers[o.$pc]=e}pushFrame(){this.stack.pushSmallInt(this.registers[o.$ra]),this.stack.pushSmallInt(this.registers[o.$fp]),this.registers[o.$fp]=this.registers[o.$sp]-1}popFrame(){this.registers[o.$sp]=this.registers[o.$fp]-1,this.registers[o.$ra]=this.stack.get(0),this.registers[o.$fp]=this.stack.get(1)}pushSmallFrame(){this.stack.pushSmallInt(this.registers[o.$ra])}popSmallFrame(){this.registers[o.$ra]=this.stack.popSmallInt()}goto(e){this.setPc(this.target(e))}target(e){return this.registers[o.$pc]+e-this.currentOpSize}call(e){this.registers[o.$ra]=this.registers[o.$pc],this.setPc(this.heap.getaddr(e))}returnTo(e){this.registers[o.$ra]=this.target(e)}return(){this.setPc(this.registers[o.$ra])}nextStatement(){var{registers:e,program:t}=this,r=e[o.$pc]
+if(-1===r)return null
+var n=t.opcode(r),i=this.currentOpSize=n.size
+return this.registers[o.$pc]+=i,n}evaluateOuter(e,t){this.evaluateInner(e,t)}evaluateInner(e,t){e.isMachine?this.evaluateMachine(e):this.evaluateSyscall(e,t)}evaluateMachine(e){switch(e.type){case 0:return this.pushFrame()
+case 1:return this.popFrame()
+case 3:return this.call(e.op1)
+case 2:return this.call(this.stack.popSmallInt())
+case 4:return this.goto(e.op1)
+case 5:return this.return()
+case 6:return this.returnTo(e.op1)}}evaluateSyscall(e,t){Je.evaluate(t,e,e.type)}}class Jt{constructor(e,{alwaysRevalidate:r=!1}){this.frameStack=new t.Stack,this.env=e,this.dom=e.getDOM(),this.alwaysRevalidate=r}execute(e,t){var{frameStack:r}=this
+for(this.try(e,t);!r.isEmpty();){var n=this.frame.nextStatement()
+void 0!==n?n.evaluate(this):r.pop()}}get frame(){return this.frameStack.current}goto(e){this.frame.goto(e)}try(e,t){this.frameStack.push(new rr(e,t))}throw(){this.frame.handleException(),this.frameStack.pop()}}e.UpdatingVM=Jt
+class Qt{constructor(e,t){this.state=e,this.resumeCallback=t}resume(e,t){return this.resumeCallback(e,this.state,t)}}class Xt extends Qe{constructor(e,t,r,n){super(),this.state=e,this.runtime=t,this.type="block",this.children=n,this.bounds=r}parentElement(){return this.bounds.parentElement()}firstNode(){return this.bounds.firstNode()}lastNode(){return this.bounds.lastNode()}evaluate(e){e.try(this.children,null)}}class Zt extends Xt{constructor(e,t,r,i){super(e,t,r,i),this.type="try",this.tag=this._tag=(0,n.createUpdatableTag)()}didInitializeChildren(){(0,n.updateTag)(this._tag,Xe(this.children))}evaluate(e){e.try(this.children,this)}handleException(){var{state:e,bounds:t,runtime:r}=this
+R(this)
+var n=L.resume(r.env,t),i=e.resume(r,n),o=[],a=this.children=[]
+O(this,i.execute(e=>{e.pushUpdating(o),e.updateWith(this),e.pushUpdating(a)}).drop)}}class er extends Zt{constructor(e,t,r,n,i,o){super(e,t,r,[]),this.key=n,this.memo=i,this.value=o,this.retained=!1,this.index=-1}updateReferences(e){this.retained=!0,this.value.update(e.value),this.memo.update(e.memo)}shouldRemove(){return!this.retained}reset(){this.retained=!1}}class tr extends Xt{constructor(e,t,r,i,o){super(e,t,r,i),this.iterableRef=o,this.type="list-block",this.lastIterated=n.INITIAL,this.opcodeMap=new Map,this.marker=null
+var a=this._tag=(0,n.createUpdatableTag)()
+this.tag=(0,n.combine)([o.tag,a])}initializeChild(e){e.index=this.children.length-1,this.opcodeMap.set(e.key,e)}didInitializeChildren(){this.lastIterated=(0,n.valueForTag)(this.tag),(0,n.updateTag)(this._tag,Xe(this.children))}evaluate(e){var{iterableRef:t,lastIterated:r}=this
+if(!(0,n.validateTag)(t.tag,r)){var{bounds:i}=this,{dom:o}=e,a=this.marker=o.createComment("")
+o.insertAfter(i.parentElement(),a,i.lastNode())
+var s=this.sync()
+this.parentElement().removeChild(a),this.marker=null,s&&(0,n.updateTag)(this._tag,Xe(this.children)),this.lastIterated=(0,n.valueForTag)(this.iterableRef.tag)}super.evaluate(e)}sync(){var{iterableRef:e,opcodeMap:t,children:r}=this,n=0,i=0,o=!1
+for(this.children=this.bounds.boundList=[];;){var a=e.next()
+if(null===a)break
+for(var s=r[n],{key:l}=a;void 0!==s&&!0===s.retained;)s=r[++n]
+if(void 0!==s&&s.key===l)this.retainItem(s,a),n++
+else if(t.has(l)){var u=t.get(l)
+if(u.index<i)this.moveItem(u,a,s)
+else{i=u.index
+for(var c=!1,d=n+1;d<i;d++)if(!1===r[d].retained){c=!0
+break}!1===c?(this.retainItem(u,a),n=i+1):(this.moveItem(u,a,s),n++)}}else o=!0,this.insertItem(a,s)}for(var h=0;h<r.length;h++){var f=r[h]
+!1===f.retained?(o=!0,this.deleteItem(f)):f.reset()}return o}retainItem(e,t){var{children:r}=this
+e.memo.update(t.memo),e.value.update(t.value),e.retained=!0,e.index=r.length,r.push(e)}insertItem(e,t){var{opcodeMap:r,bounds:n,state:i,runtime:o,iterableRef:a,children:s}=this,{key:l}=e,u=void 0===t?this.marker:t.firstNode(),c=L.forInitialRender(o.env,{element:n.parentElement(),nextSibling:u})
+i.resume(o,c).execute(t=>{t.pushUpdating()
+var n=t.enterItem(a,e)
+n.index=s.length,s.push(n),r.set(l,n),O(this,n)})}moveItem(e,t,r){var n,{children:i}=this
+e.memo.update(t.memo),e.value.update(t.value),e.retained=!0,void 0===r?g(e,this.marker):e.lastNode().nextSibling!==(n=r.firstNode())&&g(e,n),e.index=i.length,i.push(e)}deleteItem(e){k(e),b(e),this.opcodeMap.delete(e.key)}}class rr{constructor(e,t){this.ops=e,this.exceptionHandler=t,this.current=0}goto(e){this.current=e}nextStatement(){return this.ops[this.current++]}handleException(){this.exceptionHandler&&this.exceptionHandler.handleException()}}class nr{constructor(e,t,r,n){this.env=e,this.updating=t,this.bounds=r,this.drop=n,O(this,n),S(this,()=>b(this.bounds))}rerender({alwaysRevalidate:e=!1}={alwaysRevalidate:!1}){var{env:t,updating:r}=this
+new Jt(t,{alwaysRevalidate:e}).execute(r,this)}parentElement(){return this.bounds.parentElement()}firstNode(){return this.bounds.firstNode()}lastNode(){return this.bounds.lastNode()}handleException(){throw"this should never happen"}}class ir{constructor(e=new a.Stack,r){this.inner=e,this.js=(0,t.constants)(),void 0!==r&&(this.js=this.js.concat(r))}slice(e,t){var r=[]
+if(-1===e)return r
+for(var n=e;n<t;n++)r.push(this.get(n))
+return r}copy(e,t){this.inner.copy(e,t)}writeJs(e,r){var n=this.js.length
+this.js.push(r),this.inner.writeRaw(e,(0,t.encodeHandle)(n))}writeSmallInt(e,r){this.inner.writeRaw(e,(0,t.encodeImmediate)(r))}writeTrue(e){this.inner.writeRaw(e,1)}writeFalse(e){this.inner.writeRaw(e,0)}writeNull(e){this.inner.writeRaw(e,2)}writeUndefined(e){this.inner.writeRaw(e,3)}writeRaw(e,t){this.inner.writeRaw(e,t)}getJs(e){var r=this.inner.getRaw(e)
+return this.js[(0,t.decodeHandle)(r)]}getSmallInt(e){var r=this.inner.getRaw(e)
+return(0,t.decodeImmediate)(r)}get(e){var r=0|this.inner.getRaw(e)
+return(0,t.isHandle)(r)?this.js[(0,t.decodeHandle)(r)]:(0,t.decodeImmediate)(r)}reset(){this.inner.reset(),this.js.length=0}get length(){return this.inner.len()}}class or{constructor(){this.scope=new t.Stack,this.dynamicScope=new t.Stack,this.updating=new t.Stack,this.cache=new t.Stack,this.list=new t.Stack}}class ar{constructor(e,{pc:r,scope:n,dynamicScope:i,stack:a},p){this.runtime=e,this.elementStack=p,this[$t]=new or,this[qt]=new t.Stack,this.s0=null,this.s1=null,this.t0=null,this.t1=null,this.v0=null
+var m=class{constructor(e,t){this.stack=e,this[c]=t}static restore(e){for(var r=new ir,n=0;n<e.length;n++){var i=e[n]
+"number"==typeof i&&(0,t.isSmallInt)(i)?r.writeRaw(n,(0,t.encodeImmediate)(i)):!0===i?r.writeTrue(n):!1===i?r.writeFalse(n):null===i?r.writeNull(n):void 0===i?r.writeUndefined(n):r.writeJs(n,i)}return new this(r,[0,-1,e.length-1,0])}pushJs(e){this.stack.writeJs(++this[c][o.$sp],e)}pushSmallInt(e){this.stack.writeSmallInt(++this[c][o.$sp],e)}pushTrue(){this.stack.writeTrue(++this[c][o.$sp])}pushFalse(){this.stack.writeFalse(++this[c][o.$sp])}pushNull(){this.stack.writeNull(++this[c][o.$sp])}pushUndefined(){this.stack.writeUndefined(++this[c][o.$sp])}pushRaw(e){this.stack.writeRaw(++this[c][o.$sp],e)}dup(e=this[c][o.$sp]){this.stack.copy(e,++this[c][o.$sp])}copy(e,t){this.stack.copy(e,t)}popJs(e=1){var t=this.stack.getJs(this[c][o.$sp])
+return this[c][o.$sp]-=e,t}popSmallInt(e=1){var t=this.stack.getSmallInt(this[c][o.$sp])
+return this[c][o.$sp]-=e,t}pop(e=1){var t=this.stack.get(this[c][o.$sp])
+return this[c][o.$sp]-=e,t}peekJs(e=0){return this.stack.getJs(this[c][o.$sp]-e)}peekSmallInt(e=0){return this.stack.getSmallInt(this[c][o.$sp]-e)}peek(e=0){return this.stack.get(this[c][o.$sp]-e)}get(e,t=this[c][o.$fp]){return this.stack.get(t+e)}set(e,t,r=this[c][o.$fp]){this.stack.writeJs(r+t,e)}slice(e,t){return this.stack.slice(e,t)}capture(e){var t=this[c][o.$sp]+1,r=t-e
+return this.stack.slice(r,t)}reset(){this.stack.reset()}toArray(){return console.log(this[c]),this.stack.slice(this[c][o.$fp],this[c][o.$sp]+1)}}.restore(a)
+m[c][o.$pc]=r,m[c][o.$sp]=a.length-1,m[c][o.$fp]=-1,this[d]=this.program.heap,this[h]=this.program.constants,this.elementStack=p,this[u].scope.push(n),this[u].dynamicScope.push(i),this[f]=new Nt,this[s]=new Kt(m,this[d],e.program,{debugBefore:e=>Je.debugBefore(this,e),debugAfter:e=>{Je.debugAfter(this,e)}},m[c]),this.destructor={},this[l].push(this.destructor)}get stack(){return this[s].stack}get pc(){return this[s].fetchRegister(o.$pc)}fetch(e){var t=this.fetchValue(e)
+this.stack.pushJs(t)}load(e){var t=this.stack.pop()
+this.loadValue(e,t)}fetchValue(e){if((0,o.isLowLevelRegister)(e))return this[s].fetchRegister(e)
+switch(e){case o.$s0:return this.s0
+case o.$s1:return this.s1
+case o.$t0:return this.t0
+case o.$t1:return this.t1
+case o.$v0:return this.v0}}loadValue(e,t){switch((0,o.isLowLevelRegister)(e)&&this[s].loadRegister(e,t),e){case o.$s0:this.s0=t
+break
+case o.$s1:this.s1=t
+break
+case o.$t0:this.t0=t
+break
+case o.$t1:this.t1=t
+break
+case o.$v0:this.v0=t}}pushFrame(){this[s].pushFrame()}popFrame(){this[s].popFrame()}goto(e){this[s].goto(e)}call(e){this[s].call(e)}returnTo(e){this[s].returnTo(e)}return(){this[s].return()}get program(){return this.runtime.program}get env(){return this.runtime.env}captureState(e,t=this[s].fetchRegister(o.$pc)){return{pc:t,dynamicScope:this.dynamicScope(),scope:this.scope(),stack:this.stack.capture(e)}}beginCacheGroup(){var e=this.updating(),t=new pt(e.length)
+e.push(t),this[u].cache.push(t)}commitCacheGroup(){var e=this.updating(),t=this[u].cache.pop(),r=function(e,t){for(var r=[],i=t;i<e.length;i++){var o=e[i].tag
+o!==n.CONSTANT_TAG&&r.push(o)}return(0,n.createCombinatorTag)(r)}(e,t.index)
+e.push(new mt(t)),t.finalize(r,e.length)}enter(e){var t=this.capture(e),r=this.elements().pushUpdatableBlock(),n=new Zt(t,this.runtime,r,[])
+this.didEnter(n)}enterItem(e,{key:t,value:r,memo:n}){var{stack:i}=this,o=e.childRefFor(t,r),a=e.childRefFor(t,n)
+i.pushJs(o),i.pushJs(a)
+var s=this.capture(2),l=this.elements().pushUpdatableBlock(),u=new er(s,this.runtime,l,t,a,o)
+return this.didEnter(u),u}registerItem(e){this.listBlock().initializeChild(e)}enterList(e){var t=[],r=this[s].target(e),n=this.capture(0,r),i=this.elements().pushBlockList(t),o=this.stack.peekJs(),a=new tr(n,this.runtime,i,t,o)
+this[u].list.push(a),this.didEnter(a)}didEnter(e){this.associateDestroyable(e),this[l].push(e),this.updateWith(e),this.pushUpdating(e.children)}exit(){this[l].pop(),this.elements().popBlock(),this.popUpdating()
+var e=this.updating()
+e[e.length-1].didInitializeChildren()}exitList(){this.exit(),this[u].list.pop()}pushUpdating(e=[]){this[u].updating.push(e)}popUpdating(){return this[u].updating.pop()}updateWith(e){this.updating().push(e)}listBlock(){return this[u].list.current}associateDestroyable(e){O(this[l].current,e)}tryUpdating(){return this[u].updating.current}updating(){return this[u].updating.current}elements(){return this.elementStack}scope(){return this[u].scope.current}dynamicScope(){return this[u].dynamicScope.current}pushChildScope(){this[u].scope.push(this.scope().child())}pushDynamicScope(){var e=this.dynamicScope().child()
+return this[u].dynamicScope.push(e),e}pushRootScope(e){var t=Le.sized(e)
+return this[u].scope.push(t),t}pushScope(e){this[u].scope.push(e)}popScope(){this[u].scope.pop()}popDynamicScope(){this[u].dynamicScope.pop()}getSelf(){return this.scope().getSelf()}referenceForSymbol(e){return this.scope().getSymbol(e)}execute(e){var t
+e&&e(this)
+try{for(;!(t=this.next()).done;);}finally{for(var r=this.elements();r.hasBlocks;)r.popBlock()}return t.value}next(){var e,{env:t,elementStack:r}=this,n=this[s].nextStatement()
+return null!==n?(this[s].evaluateOuter(n,this),e={done:!1,value:null}):(this.stack.reset(),e={done:!0,value:new nr(t,this.popUpdating(),r.popBlock(),this.destructor)}),e}bindDynamicScope(e){for(var t=this.dynamicScope(),r=e.length-1;r>=0;r--){var n=e[r]
+t.set(n,this.stack.popJs())}}}function sr(e,t=Le.root(ne,0),r){return{pc:e,scope:t,dynamicScope:r,stack:[]}}e.LowLevelVM=ar,$t=u,qt=l
+class lr extends ar{static empty(e,{handle:t,treeBuilder:r,dynamicScope:n}){var i=ur(e,sr(e.program.heap.getaddr(t),Le.root(ne,0),n),r)
+return i.pushUpdating(),i}static initial(e,{handle:t,self:r,treeBuilder:n,dynamicScope:i}){var o=e.program.heap.scopesizeof(t),a=Le.root(r,o),s=e.program.heap.getaddr(t),l=ur(e,sr(s,a,i),n)
+return l.pushUpdating(),l}capture(e,t=this[s].fetchRegister(o.$pc)){return new Qt(this.captureState(e,t),ur)}}function ur(e,t,r){return new lr(e,t,r)}function cr(e){return(t,r,n)=>new dr(t,r,n,e)}class dr extends ar{constructor(e,t,r,n){super(e,t,r),this.context=n,this.resume=cr(this.context)}static initial(e,t,{handle:r,self:n,dynamicScope:i,treeBuilder:o}){var a=e.program.heap.scopesizeof(r),s=Le.root(n,a),l=sr(e.program.heap.getaddr(r),s,i),u=cr(t)(e,l,o)
+return u.pushUpdating(),u}static empty(e,{handle:t,treeBuilder:r,dynamicScope:n},i){var o=cr(i)(e,sr(e.program.heap.getaddr(t),Le.root(ne,0),n),r)
+return o.pushUpdating(),o}capture(e,t=this[s].fetchRegister(o.$pc)){return new Qt(this.captureState(e,t),this.resume)}compile(e){return(0,t.unwrapHandle)(e.compile(this.context))}}class hr{constructor(e){this.vm=e}next(){return this.vm.next()}sync(){return fr(this.vm.runtime.env,this)}}function fr(e,t){try{var r
+e.begin()
+do{r=t.next()}while(!r.done)
+return r.value}finally{e.commit()}}function pr(e,t,r,n){var i=Object.keys(n).map(e=>[e,n[e]]),o=["main","else","attrs"],a=i.map(([e])=>"@"+e)
+e.pushFrame()
+for(var s=0;s<3*o.length;s++)e.stack.pushNull()
+return e.stack.pushNull(),i.forEach(([,t])=>{e.stack.pushJs(t)}),e[f].setup(e.stack,a,o,0,!0),e.stack.pushJs(e[f]),e.stack.pushJs(t),e.stack.pushJs(r),new hr(e)}function mr(e){return"%+b:0%"===e.nodeValue}e.SERIALIZATION_FIRST_NODE_STRING="%+b:0%"
+class vr extends p{constructor(e,t,r){super(e,t),this.startingBlockDepth=r,this.candidate=null,this.injectedOmittedNode=!1,this.openBlockDepth=r-1}}class gr extends L{constructor(e,t,r){if(super(e,t,r),this.unmatchedAttributes=null,this.blockDepth=0,r)throw new Error("Rehydration with nextSibling not supported")
+for(var n=this.currentCursor.element.firstChild;!(null===n||br(n)&&mr(n));)n=n.nextSibling
+this.candidate=n}get currentCursor(){return this[I].current}get candidate(){return this.currentCursor?this.currentCursor.candidate:null}set candidate(e){this.currentCursor.candidate=e}disableRehydration(e){var t=this.currentCursor
+t.candidate=null,t.nextSibling=e}enableRehydration(e){var t=this.currentCursor
+t.candidate=e,t.nextSibling=null}pushElement(e,t=null){var r=new vr(e,t,this.blockDepth||0)
+null!==this.candidate&&(r.candidate=e.firstChild,this.candidate=e.nextSibling),this[I].push(r)}clearMismatch(e){var t=e,r=this.currentCursor
+if(null!==r){var n=r.openBlockDepth
+if(n>=r.startingBlockDepth)for(;t;){if(yr(t))if(n>=_r(t))break
+t=this.remove(t)}else for(;null!==t;)t=this.remove(t)
+this.disableRehydration(t)}}__openBlock(){var{currentCursor:e}=this
+if(null!==e){var t=this.blockDepth
+this.blockDepth++
+var{candidate:r}=e
+if(null!==r){var n,{tagName:i}=e.element
+8===(n=r).nodeType&&0===n.nodeValue.lastIndexOf("%+b:",0)&&_r(r)===t?(this.candidate=this.remove(r),e.openBlockDepth=t):"TITLE"!==i&&"SCRIPT"!==i&&"STYLE"!==i&&this.clearMismatch(r)}}}__closeBlock(){var{currentCursor:e}=this
+if(null!==e){var t=e.openBlockDepth
+this.blockDepth--
+var{candidate:r}=e,n=!1
+if(null!==r)if(n=!0,yr(r)&&_r(r)===t){var i=this.remove(r)
+this.candidate=i,e.openBlockDepth--}else this.clearMismatch(r),n=!1
+if(!1===n){var o=e.nextSibling
+if(null!==o&&yr(o)&&_r(o)===this.blockDepth){var a=this.remove(o)
+this.enableRehydration(a),e.openBlockDepth--}}}}__appendNode(e){var{candidate:t}=this
+return t||super.__appendNode(e)}__appendHTML(e){var t=this.markerBounds()
+if(t){var r=t.firstNode(),n=t.lastNode(),i=new m(this.element,r.nextSibling,n.previousSibling),o=this.remove(r)
+return this.remove(n),null!==o&&xr(o)&&(this.candidate=this.remove(o),null!==this.candidate&&this.clearMismatch(this.candidate)),i}return super.__appendHTML(e)}remove(e){var t=e.parentNode,r=e.nextSibling
+return t.removeChild(e),r}markerBounds(){var e=this.candidate
+if(e&&Er(e)){for(var t=e,r=t.nextSibling;r&&!Er(r);)r=r.nextSibling
+return new m(this.element,t,r)}return null}__appendText(e){var{candidate:t}=this
+return t?3===t.nodeType?(t.nodeValue!==e&&(t.nodeValue=e),this.candidate=t.nextSibling,t):function(e){return 8===e.nodeType&&"%|%"===e.nodeValue}(t)||xr(t)&&""===e?(this.candidate=this.remove(t),this.__appendText(e)):(this.clearMismatch(t),super.__appendText(e)):super.__appendText(e)}__appendComment(e){var t=this.candidate
+return t&&br(t)?(t.nodeValue!==e&&(t.nodeValue=e),this.candidate=t.nextSibling,t):(t&&this.clearMismatch(t),super.__appendComment(e))}__openElement(e){var t=this.candidate
+if(t&&wr(t)&&function(e,t){if("http://www.w3.org/2000/svg"===e.namespaceURI)return e.tagName===t
+return e.tagName===t.toUpperCase()}(t,e))return this.unmatchedAttributes=[].slice.call(t.attributes),t
+if(t){if(wr(t)&&"TBODY"===t.tagName)return this.pushElement(t,null),this.currentCursor.injectedOmittedNode=!0,this.__openElement(e)
+this.clearMismatch(t)}return super.__openElement(e)}__setAttribute(e,t,r){var n=this.unmatchedAttributes
+if(n){var i=Or(n,e)
+if(i)return i.value!==t&&(i.value=t),void n.splice(n.indexOf(i),1)}return super.__setAttribute(e,t,r)}__setProperty(e,t){var r=this.unmatchedAttributes
+if(r){var n=Or(r,e)
+if(n)return n.value!==t&&(n.value=t),void r.splice(r.indexOf(n),1)}return super.__setProperty(e,t)}__flushElement(e,t){var{unmatchedAttributes:r}=this
+if(r){for(var n=0;n<r.length;n++)this.constructing.removeAttribute(r[n].name)
+this.unmatchedAttributes=null}else super.__flushElement(e,t)}willCloseElement(){var{candidate:e,currentCursor:t}=this
+null!==e&&this.clearMismatch(e),t&&t.injectedOmittedNode&&this.popElement(),super.willCloseElement()}getMarker(e,t){var r=e.querySelector(`script[glmr="${t}"]`)
+return r||null}__pushRemoteElement(e,t,r){var n=this.getMarker(e,t)
+if(void 0===r){for(;null!==e.firstChild&&e.firstChild!==n;)this.remove(e.firstChild)
+r=null}var i=new vr(e,null,this.blockDepth)
+this[I].push(i),null===n?this.disableRehydration(r):this.candidate=this.remove(n)
+var o=new z(e)
+return this.pushLiveBlock(o,!0)}didAppendBounds(e){if(super.didAppendBounds(e),this.candidate){var t=e.lastNode()
+this.candidate=t&&t.nextSibling}return e}}function br(e){return 8===e.nodeType}function yr(e){return 8===e.nodeType&&0===e.nodeValue.lastIndexOf("%-b:",0)}function _r(e){return parseInt(e.nodeValue.slice(4),10)}function wr(e){return 1===e.nodeType}function Er(e){return 8===e.nodeType&&"%glmr%"===e.nodeValue}function xr(e){return 8===e.nodeType&&"% %"===e.nodeValue}function Or(e,t){for(var r=0;r<e.length;r++){var n=e[r]
+if(n.name===t)return n}}e.RehydrateBuilder=gr})),e("@glimmer/util",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.assertNever=function(e,t="unexpected unreachable branch"){console.log("unreachable",e),console.trace(`${t} :: ${JSON.stringify(e)} (${e})`)},e.assert=function(e,t){if(!e)throw new Error(t||"assertion failure")},e.deprecate=function(e){console.warn("DEPRECATION: "+e)},e.dict=o,e.isDict=function(e){return null!=e},e.isObject=function(e){return"object"==typeof e&&null!==e},e.ensureGuid=i,e.initializeGuid=n,e.isSerializationFirstNode=function(e){return"%+b:0%"===e.nodeValue},e.assign=function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t]
+if(null!==r&&"object"==typeof r)for(var n=a(r),i=0;i<n.length;i++){var o=n[i]
+e[o]=r[o]}}return e},e.fillNulls=function(e){for(var t=new Array(e),r=0;r<e;r++)t[r]=null
+return t},e.values=function(e){var t=[]
+for(var r in e)t.push(e[r])
+return t},e.clearElement=function(e){var t=e.firstChild
+for(;t;){var r=t.nextSibling
+e.removeChild(t),t=r}},e.keys=function(e){return Object.keys(e)},e.unwrap=function(e){if(null==e)throw new Error("Expected value to be present")
+return e},e.expect=function(e,t){if(null==e)throw new Error(t)
+return e},e.unreachable=function(e="unreachable"){return new Error(e)},e.exhausted=function(e){throw new Error("Exhausted "+e)},e.strip=function(e,...t){for(var r="",n=0;n<e.length;n++){var i=e[n],o=void 0!==t[n]?String(t[n]):""
+r+=`${i}${o}`}var a=r.split("\n")
+for(;a.length&&a[0].match(/^\s*$/);)a.shift()
+for(;a.length&&a[a.length-1].match(/^\s*$/);)a.pop()
+var s=1/0
+for(var l of a){var u=l.match(/^\s*/)[0].length
+s=Math.min(s,u)}var c=[]
+for(var d of a)c.push(d.slice(s))
+return c.join("\n")},e.isHandle=function(e){return e>=0},e.isNonPrimitiveHandle=function(e){return e>3},e.constants=function(...e){return[!1,!0,null,void 0,...e]},e.isSmallInt=function(e){return e%1==0&&e<=536870911&&e>=-536870912},e.encodeNegative=u,e.decodeNegative=c,e.encodePositive=d,e.decodePositive=h,e.encodeHandle=function(e){return e},e.decodeHandle=function(e){return e}
+e.encodeImmediate=f,e.decodeImmediate=p,e.unwrapHandle=function(e){if("number"==typeof e)return e
+var t=e.errors[0]
+throw new Error(`Compile Error: ${t.problem} @ ${t.span.start}..${t.span.end}`)},e.unwrapTemplate=function(e){if("error"===e.result)throw new Error(`Compile Error: ${e.problem} @ ${e.span.start}..${e.span.end}`)
+return e},e.extractHandle=function(e){return"number"==typeof e?e:e.handle},e.isOkHandle=function(e){return"number"==typeof e},e.isErrHandle=function(e){return"number"==typeof e},e.symbol=e.tuple=e.verifySteps=e.logStep=e.endTestSteps=e.beginTestSteps=e.debugToString=e.SERIALIZATION_FIRST_NODE_STRING=e.Stack=e.DictSet=e.EMPTY_ARRAY=void 0
+var t=Object.freeze([])
+e.EMPTY_ARRAY=t
+var r=0
+function n(e){return e._guid=++r}function i(e){return e._guid||n(e)}function o(){return Object.create(null)}e.DictSet=class{constructor(){this.dict=o()}add(e){return"string"==typeof e?this.dict[e]=e:this.dict[i(e)]=e,this}delete(e){"string"==typeof e?delete this.dict[e]:e._guid&&delete this.dict[e._guid]}}
+e.Stack=class{constructor(){this.stack=[],this.current=null}get size(){return this.stack.length}push(e){this.current=e,this.stack.push(e)}pop(){var e=this.stack.pop(),t=this.stack.length
+return this.current=0===t?null:this.stack[t-1],void 0===e?null:e}nth(e){var t=this.stack.length
+return t<e?null:this.stack[t-e]}isEmpty(){return 0===this.stack.length}toArray(){return this.stack}}
+e.SERIALIZATION_FIRST_NODE_STRING="%+b:0%"
+var{keys:a}=Object
+e.tuple=(...e)=>e
+var s,l="undefined"!=typeof Symbol?Symbol:e=>`__${e}${Math.floor(Math.random()*Date.now())}__`
+function u(e){return-536870913&e}function c(e){return 536870912|e}function d(e){return~e}function h(e){return~e}function f(e){return(e|=0)<0?u(e):d(e)}function p(e){return(e|=0)>-536870913?h(e):c(e)}e.symbol=l,[1,-1].forEach(e=>p(f(e)))
+var m=s
+e.debugToString=m,e.beginTestSteps=void 0,e.endTestSteps=void 0,e.verifySteps=void 0,e.logStep=void 0})),e("@glimmer/validator",["exports","@ember/polyfills"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.bump=function(){a++},e.combine=E,e.createCombinatorTag=x,e.createTag=function(){return new h(0)},e.createUpdatableTag=m,e.isConstTagged=function({tag:e}){return e===v},e.isConstTag=g,e.validateTag=u,e.valueForTag=l,e.dirtyTagFor=P,e.tagFor=k,e.tagMetaFor=C,e.setPropertyDidChange=function(e){M=e},e.beginTrackFrame=N,e.endTrackFrame=I,e.consumeTag=L,e.isTracking=function(){return null!==j},e.track=function(e){var t
+N()
+try{e()}finally{t=I()}return t},e.memo=function(e,t){var r=V(e,t),n=()=>$(r)
+return n[F]=r,n},e.untrack=function(e){D.push(j),j=null
+try{e()}finally{j=D.pop()}},e.isConstMemo=function(e){return!!function(e){return F in e}(e)&&q(e[F])},e.createCache=V,e.isConst=q,e.getValue=$,e.trackedData=function(e,t){var r=new WeakMap,n="function"==typeof t
+return{getter:function(i){var o
+return L(k(i,e)),n&&!r.has(i)?(o=t.call(i),r.set(i,o)):o=r.get(i),o},setter:function(t,n){P(t,e),r.set(t,n)}}},e.deprecateMutationsInAutotrackingTransaction=e.runInAutotrackingTransaction=e.setAutotrackingTransactionEnv=e.VOLATILE=e.VOLATILE_TAG=e.VolatileTag=e.updateTag=e.INITIAL=e.dirtyTag=e.CURRENT_TAG=e.CurrentTag=e.CONSTANT=e.CONSTANT_TAG=e.COMPUTE=e.ALLOW_CYCLES=void 0
+var t,r,n,i="undefined"!=typeof Symbol?Symbol:e=>`__${e}${Math.floor(Math.random()*Date.now())}__`,o="undefined"!=typeof Symbol?Symbol.for:e=>"__GLIMMER_VALIDATOR_SYMBOL_FOR_"+e
+e.runInAutotrackingTransaction=t,e.deprecateMutationsInAutotrackingTransaction=r,e.setAutotrackingTransactionEnv=n
+e.CONSTANT=0
+e.INITIAL=1
+e.VOLATILE=NaN
+var a=1
+var s=i("TAG_COMPUTE")
+function l(e){return e[s]()}function u(e,t){return t>=e[s]()}e.COMPUTE=s
+var c,d=i("TAG_TYPE")
+e.ALLOW_CYCLES=c
+class h{constructor(e){this.revision=1,this.lastChecked=1,this.lastValue=1,this.isUpdating=!1,this.subtag=null,this.subtagBufferCache=null,this[d]=e}[s](){var{lastChecked:e}=this
+if(!0===this.isUpdating)this.lastChecked=++a
+else if(e!==a){this.isUpdating=!0,this.lastChecked=a
+try{var{subtag:t,revision:r}=this
+if(null!==t)if(Array.isArray(t))for(var n=0;n<t.length;n++){var i=t[n][s]()
+r=Math.max(i,r)}else{var o=t[s]()
+o===this.subtagBufferCache?r=Math.max(r,this.lastValue):(this.subtagBufferCache=null,r=Math.max(r,o))}this.lastValue=r}finally{this.isUpdating=!1}}return this.lastValue}static updateTag(e,t){var r=e,n=t
+n===v?r.subtag=null:(r.subtagBufferCache=n[s](),r.subtag=n)}static dirtyTag(e){e.revision=++a}}var f=h.dirtyTag
+e.dirtyTag=f
+var p=h.updateTag
+function m(){return new h(1)}e.updateTag=p
+var v=new h(3)
+function g(e){return e===v}e.CONSTANT_TAG=v
+class b{[s](){return NaN}}e.VolatileTag=b
+var y=new b
+e.VOLATILE_TAG=y
+class _{[s](){return a}}e.CurrentTag=_
+var w=new _
+function E(e){for(var t=[],r=0,n=e.length;r<n;r++){var i=e[r]
+i!==v&&t.push(i)}return x(t)}function x(e){switch(e.length){case 0:return v
+case 1:return e[0]
+default:var t=new h(2)
+return t.subtag=e,t}}e.CURRENT_TAG=w
+var O=m(),S=m(),T=m()
+l(O),f(O),l(O),p(O,E([S,T])),l(O),f(S),l(O),f(T),l(O),p(O,T),l(O),f(T),l(O)
+var M=function(){}
+var A=new WeakMap
+function P(e,t){var r=A.get(e)
+if(void 0!==r){var n=r.get(t)
+void 0!==n&&(f(n),M())}}function C(e){var t=A.get(e)
+return void 0===t&&(t=new Map,A.set(e,t)),t}function k(e,t,r){var n=void 0===r?C(e):r,i=n.get(t)
+return void 0===i&&(i=m(),n.set(t,i)),i}class R{constructor(){this.tags=new Set,this.last=null}add(e){this.tags.add(e),this.last=e}combine(){var{tags:e}=this
+if(0===e.size)return v
+if(1===e.size)return this.last
+var t=[]
+return e.forEach(e=>t.push(e)),E(t)}}var j=null,D=[]
+function N(){D.push(j),j=new R}function I(){var e=j
+return j=D.pop(),e.combine()}function L(e){null!==j&&j.add(e)}var F=i("CACHE_KEY")
+var z=i("FN"),U=i("LAST_VALUE"),H=i("TAG"),B=i("SNAPSHOT")
+i("DEBUG_LABEL")
+function V(e){var t={[z]:e,[U]:void 0,[H]:void 0,[B]:-1}
+return t}function $(e){W(e,"getValue")
+var t=e[z],r=e[H],n=e[B]
+if(void 0!==r&&u(r,n))L(r)
+else{N()
+try{e[U]=t()}finally{r=I(),e[H]=r,e[B]=l(r),L(r)}}return e[U]}function q(e){W(e,"isConst")
+var t=e[H]
+return g(t)}function W(){0}var G=function(){if("undefined"!=typeof globalThis)return globalThis
+if("undefined"!=typeof self)return self
+if("undefined"!=typeof window)return window
+if("undefined"!=typeof global)return global
+throw new Error("unable to locate global object")}(),Y=o("GLIMMER_VALIDATOR_REGISTRATION")
+if(!0===G[Y])throw new Error("The `@glimmer/validator` library has been included twice in this application. It could be different versions of the package, or the same version included twice by mistake. `@glimmer/validator` depends on having a single copy of the package in use at any time in an application, even if they are the same version. You must dedupe your build to remove the duplicate packages in order to prevent this error.")
+G[Y]=!0})),e("@glimmer/vm",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.isMachineOp=function(e){return e>=0&&e<=15},e.isOp=function(e){return e>=16},e.isLowLevelRegister=function(e){return e<=3},e.$v0=e.$t1=e.$t0=e.$s1=e.$s0=e.$sp=e.$ra=e.$fp=e.$pc=e.TemporaryRegister=e.SavedRegister=void 0
+e.$pc=0
+e.$ra=1
+e.$fp=2
+e.$sp=3
+e.$s0=4
+e.$s1=5
+e.$t0=6
+e.$t1=7
+var t,r
+e.$v0=8,e.SavedRegister=t,function(e){e[e.s0=4]="s0",e[e.s1=5]="s1"}(t||(e.SavedRegister=t={})),e.TemporaryRegister=r,function(e){e[e.t0=6]="t0",e[e.t1=7]="t1"}(r||(e.TemporaryRegister=r={}))})),e("@glimmer/wire-format",["exports"],(function(e){"use strict"
+function t(e){return function(t){return Array.isArray(t)&&t[0]===e}}Object.defineProperty(e,"__esModule",{value:!0}),e.is=t,e.isAttribute=function(e){return 14===e[0]||15===e[0]||22===e[0]||16===e[0]||24===e[0]||23===e[0]||17===e[0]||4===e[0]},e.isArgument=function(e){return 21===e[0]||20===e[0]},e.isHelper=function(e){return Array.isArray(e)&&30===e[0]},e.isGet=e.isFlushElement=void 0
+var r=t(12)
+e.isFlushElement=r
+var n=t(32)
+e.isGet=n})),e("@simple-dom/document",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=[]
+function r(e,t,r){for(var n=0;n<e.length;n++){var i=e[n]
+if(i.namespaceURI===t&&i.localName===r)return n}return-1}function n(e,t){return"http://www.w3.org/1999/xhtml"===e?t.toLowerCase():t}function i(e,t,n){var i=r(e,t,n)
+return-1===i?null:e[i].value}function o(e,t,n){var i=r(e,t,n);-1!==i&&e.splice(i,1)}function a(e,n,i,o,a){"string"!=typeof a&&(a=""+a)
+var{attributes:s}=e
+if(s===t)s=e.attributes=[]
+else{var l=r(s,n,o)
+if(-1!==l)return void(s[l].value=a)}s.push({localName:o,name:null===i?o:i+":"+o,namespaceURI:n,prefix:i,specified:!0,value:a})}class s{constructor(e){this.node=e,this.stale=!0,this._length=0}get length(){if(this.stale){this.stale=!1
+for(var e=0,t=this.node.firstChild;null!==t;e++)this[e]=t,t=t.nextSibling
+var r=this._length
+for(this._length=e;e<r;e++)delete this[e]}return this._length}item(e){return e<this.length?this[e]:null}}function l(e,r){var n=function(e){var r
+1===e.nodeType&&(r=e.namespaceURI)
+var n=new h(e.ownerDocument,e.nodeType,e.nodeName,e.nodeValue,r)
+1===e.nodeType&&(n.attributes=function(e){if(e===t)return t
+for(var r=[],n=0;n<e.length;n++){var i=e[n]
+r.push({localName:i.localName,name:i.name,namespaceURI:i.namespaceURI,prefix:i.prefix,specified:!0,value:i.value})}return r}(e.attributes))
+return n}(e)
+if(r)for(var i=e.firstChild,o=i;null!==i;)o=i.nextSibling,n.appendChild(i.cloneNode(!0)),i=o
+return n}function u(e,t,r){d(e),function(e,t,r,n){if(11===t.nodeType)return void function(e,t,r,n){var i=e.firstChild
+if(null===i)return
+e.firstChild=null,e.lastChild=null
+var o=i,a=i
+i.previousSibling=r,null===r?t.firstChild=i:r.nextSibling=i
+for(;null!==a;)a.parentNode=t,o=a,a=a.nextSibling
+o.nextSibling=n,null===n?t.lastChild=o:n.previousSibling=o}(t,e,r,n)
+null!==t.parentNode&&c(t.parentNode,t)
+t.parentNode=e,t.previousSibling=r,t.nextSibling=n,null===r?e.firstChild=t:r.nextSibling=t
+null===n?e.lastChild=t:n.previousSibling=t}(e,t,null===r?e.lastChild:r.previousSibling,r)}function c(e,t){d(e),function(e,t,r,n){t.parentNode=null,t.previousSibling=null,t.nextSibling=null,null===r?e.firstChild=n:r.nextSibling=n
+null===n?e.lastChild=r:n.previousSibling=r}(e,t,t.previousSibling,t.nextSibling)}function d(e){var t=e._childNodes
+void 0!==t&&(t.stale=!0)}class h{constructor(e,r,n,i,o){this.ownerDocument=e,this.nodeType=r,this.nodeName=n,this.nodeValue=i,this.namespaceURI=o,this.parentNode=null,this.previousSibling=null,this.nextSibling=null,this.firstChild=null,this.lastChild=null,this.attributes=t,this._childNodes=void 0}get tagName(){return this.nodeName}get childNodes(){var e=this._childNodes
+return void 0===e&&(e=this._childNodes=new s(this)),e}cloneNode(e){return l(this,!0===e)}appendChild(e){return u(this,e,null),e}insertBefore(e,t){return u(this,e,t),e}removeChild(e){return c(this,e),e}insertAdjacentHTML(e,t){var r,n,i=new h(this.ownerDocument,-1,"#raw",t,void 0)
+switch(e){case"beforebegin":r=this.parentNode,n=this
+break
+case"afterbegin":r=this,n=this.firstChild
+break
+case"beforeend":r=this,n=null
+break
+case"afterend":r=this.parentNode,n=this.nextSibling
+break
+default:throw new Error("invalid position")}if(null===r)throw new Error(e+" requires a parentNode")
+u(r,i,n)}getAttribute(e){var t=n(this.namespaceURI,e)
+return i(this.attributes,null,t)}getAttributeNS(e,t){return i(this.attributes,e,t)}setAttribute(e,t){a(this,null,null,n(this.namespaceURI,e),t)}setAttributeNS(e,t,r){var[n,i]=function(e){var t=e,r=null,n=e.indexOf(":")
+return-1!==n&&(r=e.slice(0,n),t=e.slice(n+1)),[r,t]}(t)
+a(this,e,n,i,r)}removeAttribute(e){var t=n(this.namespaceURI,e)
+o(this.attributes,null,t)}removeAttributeNS(e,t){o(this.attributes,e,t)}get doctype(){return this.firstChild}get documentElement(){return this.lastChild}get head(){return this.documentElement.firstChild}get body(){return this.documentElement.lastChild}createElement(e){return new h(this,1,e.toUpperCase(),null,"http://www.w3.org/1999/xhtml")}createElementNS(e,t){var r="http://www.w3.org/1999/xhtml"===e?t.toUpperCase():t
+return new h(this,1,r,null,e)}createTextNode(e){return new h(this,3,"#text",e,void 0)}createComment(e){return new h(this,8,"#comment",e,void 0)}createRawHTMLSection(e){return new h(this,-1,"#raw",e,void 0)}createDocumentFragment(){return new h(this,11,"#document-fragment",null,void 0)}}var f=function(){var e=new h(null,9,"#document",null,"http://www.w3.org/1999/xhtml"),t=new h(e,10,"html",null,"http://www.w3.org/1999/xhtml"),r=new h(e,1,"HTML",null,"http://www.w3.org/1999/xhtml"),n=new h(e,1,"HEAD",null,"http://www.w3.org/1999/xhtml"),i=new h(e,1,"BODY",null,"http://www.w3.org/1999/xhtml")
+return r.appendChild(n),r.appendChild(i),e.appendChild(t),e.appendChild(r),e}
+e.default=f})),e("backburner",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.buildPlatform=i,e.default=void 0
+var t=setTimeout,r=()=>{}
+function n(e){if("function"==typeof Promise){var r=Promise.resolve()
+return()=>r.then(e)}if("function"==typeof MutationObserver){var n=0,i=new MutationObserver(e),o=document.createTextNode("")
+return i.observe(o,{characterData:!0}),()=>(n=++n%2,o.data=""+n,n)}return()=>t(e,0)}function i(e){var t=r
+return{setTimeout:(e,t)=>setTimeout(e,t),clearTimeout:e=>clearTimeout(e),now:()=>Date.now(),next:n(e),clearNext:t}}var o=/\d+/
+function a(e){var t=typeof e
+return"number"===t&&e==e||"string"===t&&o.test(e)}function s(e){return e.onError||e.onErrorTarget&&e.onErrorTarget[e.onErrorMethod]}function l(e,t,r){for(var n=-1,i=0,o=r.length;i<o;i+=4)if(r[i]===e&&r[i+1]===t){n=i
+break}return n}function u(e,t,r){for(var n=-1,i=2,o=r.length;i<o;i+=6)if(r[i]===e&&r[i+1]===t){n=i-2
+break}return n}function c(e,t,r=0){for(var n=[],i=0;i<e.length;i+=t){var o=e[i+3+r],a={target:e[i+0+r],method:e[i+1+r],args:e[i+2+r],stack:void 0!==o&&"stack"in o?o.stack:""}
+n.push(a)}return n}function d(e,t){for(var r,n,i=0,o=t.length-6;i<o;)e>=t[r=i+(n=(o-i)/6)-n%6]?i=r+6:o=r
+return e>=t[i]?i+6:i}class h{constructor(e,t={},r={}){this._queueBeingFlushed=[],this.targetQueues=new Map,this.index=0,this._queue=[],this.name=e,this.options=t,this.globalOptions=r}stackFor(e){if(e<this._queue.length){var t=this._queue[3*e+4]
+return t?t.stack:null}}flush(e){var t,r,{before:n,after:i}=this.options
+this.targetQueues.clear(),0===this._queueBeingFlushed.length&&(this._queueBeingFlushed=this._queue,this._queue=[]),void 0!==n&&n()
+var o=this._queueBeingFlushed
+if(o.length>0){var a=s(this.globalOptions)
+r=a?this.invokeWithOnError:this.invoke
+for(var l=this.index;l<o.length;l+=4)if(this.index+=4,null!==(t=o[l+1])&&r(o[l],t,o[l+2],a,o[l+3]),this.index!==this._queueBeingFlushed.length&&this.globalOptions.mustYield&&this.globalOptions.mustYield())return 1}void 0!==i&&i(),this._queueBeingFlushed.length=0,this.index=0,!1!==e&&this._queue.length>0&&this.flush(!0)}hasWork(){return this._queueBeingFlushed.length>0||this._queue.length>0}cancel({target:e,method:t}){var r=this._queue,n=this.targetQueues.get(e)
+void 0!==n&&n.delete(t)
+var i=l(e,t,r)
+return i>-1?(r.splice(i,4),!0):(i=l(e,t,r=this._queueBeingFlushed))>-1&&(r[i+1]=null,!0)}push(e,t,r,n){return this._queue.push(e,t,r,n),{queue:this,target:e,method:t}}pushUnique(e,t,r,n){var i=this.targetQueues.get(e)
+void 0===i&&(i=new Map,this.targetQueues.set(e,i))
+var o=i.get(t)
+if(void 0===o){var a=this._queue.push(e,t,r,n)-4
+i.set(t,a)}else{var s=this._queue
+s[o+2]=r,s[o+3]=n}return{queue:this,target:e,method:t}}_getDebugInfo(e){if(e)return c(this._queue,4)}invoke(e,t,r){void 0===r?t.call(e):t.apply(e,r)}invokeWithOnError(e,t,r,n,i){try{void 0===r?t.call(e):t.apply(e,r)}catch(o){n(o,i)}}}class f{constructor(e=[],t){this.queues={},this.queueNameIndex=0,this.queueNames=e,e.reduce((function(e,r){return e[r]=new h(r,t[r],t),e}),this.queues)}schedule(e,t,r,n,i,o){var a=this.queues[e]
+if(void 0===a)throw new Error(`You attempted to schedule an action in a queue (${e}) that doesn't exist`)
+if(null==r)throw new Error(`You attempted to schedule an action in a queue (${e}) for a method that doesn't exist`)
+return this.queueNameIndex=0,i?a.pushUnique(t,r,n,o):a.push(t,r,n,o)}flush(e=!1){for(var t,r,n=this.queueNames.length;this.queueNameIndex<n;)if(r=this.queueNames[this.queueNameIndex],!1===(t=this.queues[r]).hasWork()){if(this.queueNameIndex++,e&&this.queueNameIndex<n)return 1}else if(1===t.flush(!1))return 1}_getDebugInfo(e){if(e){for(var t,r,n={},i=this.queueNames.length,o=0;o<i;)r=this.queueNames[o],t=this.queues[r],n[r]=t._getDebugInfo(e),o++
+return n}}}function p(e){for(var t=e(),r=t.next();!1===r.done;)r.value(),r=t.next()}var m=function(){},v=Object.freeze([])
+function g(){var e,t,r,n=arguments.length
+if(0===n);else if(1===n)r=null,t=arguments[0]
+else{var i=2,o=arguments[0],a=arguments[1],s=typeof a
+if("function"===s?(r=o,t=a):null!==o&&"string"===s&&a in o?t=(r=o)[a]:"function"==typeof o&&(i=1,r=null,t=o),n>i){var l=n-i
+e=new Array(l)
+for(var u=0;u<l;u++)e[u]=arguments[u+i]}}return[r,t,e]}function b(){var e,t,r,n,i
+return 2===arguments.length?(t=arguments[0],i=arguments[1],e=null):([e,t,n]=g(...arguments),void 0===n?i=0:a(i=n.pop())||(r=!0===i,i=n.pop())),[e,t,n,i=parseInt(i,10),r]}var y=0,_=0,w=0,E=0,x=0,O=0,S=0,T=0,M=0,A=0,P=0,C=0,k=0,R=0,j=0,D=0,N=0,I=0,L=0,F=0,z=0
+class U{constructor(e,t){this.DEBUG=!1,this.currentInstance=null,this.instanceStack=[],this._eventCallbacks={end:[],begin:[]},this._timerTimeoutId=null,this._timers=[],this._autorun=!1,this._autorunStack=null,this.queueNames=e,this.options=t||{},"string"==typeof this.options.defaultQueue?this._defaultQueue=this.options.defaultQueue:this._defaultQueue=this.queueNames[0],this._onBegin=this.options.onBegin||m,this._onEnd=this.options.onEnd||m,this._boundRunExpiredTimers=this._runExpiredTimers.bind(this),this._boundAutorunEnd=()=>{L++,!1!==this._autorun&&(this._autorun=!1,this._autorunStack=null,this._end(!0))}
+var r=this.options._buildPlatform||i
+this._platform=r(this._boundAutorunEnd)}get counters(){return{begin:_,end:w,events:{begin:E,end:0},autoruns:{created:I,completed:L},run:x,join:O,defer:S,schedule:T,scheduleIterable:M,deferOnce:A,scheduleOnce:P,setTimeout:C,later:k,throttle:R,debounce:j,cancelTimers:D,cancel:N,loops:{total:F,nested:z}}}get defaultQueue(){return this._defaultQueue}begin(){_++
+var e,t=this.options,r=this.currentInstance
+return!1!==this._autorun?(e=r,this._cancelAutorun()):(null!==r&&(z++,this.instanceStack.push(r)),F++,e=this.currentInstance=new f(this.queueNames,t),E++,this._trigger("begin",e,r)),this._onBegin(e,r),e}end(){w++,this._end(!1)}on(e,t){if("function"!=typeof t)throw new TypeError("Callback must be a function")
+var r=this._eventCallbacks[e]
+if(void 0===r)throw new TypeError(`Cannot on() event ${e} because it does not exist`)
+r.push(t)}off(e,t){var r=this._eventCallbacks[e]
+if(!e||void 0===r)throw new TypeError(`Cannot off() event ${e} because it does not exist`)
+var n=!1
+if(t)for(var i=0;i<r.length;i++)r[i]===t&&(n=!0,r.splice(i,1),i--)
+if(!n)throw new TypeError("Cannot off() callback that does not exist")}run(){x++
+var[e,t,r]=g(...arguments)
+return this._run(e,t,r)}join(){O++
+var[e,t,r]=g(...arguments)
+return this._join(e,t,r)}defer(e,t,r,...n){return S++,this.schedule(e,t,r,...n)}schedule(e,...t){T++
+var[r,n,i]=g(...t),o=this.DEBUG?new Error:void 0
+return this._ensureInstance().schedule(e,r,n,i,!1,o)}scheduleIterable(e,t){M++
+var r=this.DEBUG?new Error:void 0
+return this._ensureInstance().schedule(e,null,p,[t],!1,r)}deferOnce(e,t,r,...n){return A++,this.scheduleOnce(e,t,r,...n)}scheduleOnce(e,...t){P++
+var[r,n,i]=g(...t),o=this.DEBUG?new Error:void 0
+return this._ensureInstance().schedule(e,r,n,i,!0,o)}setTimeout(){return C++,this.later(...arguments)}later(){k++
+var[e,t,r,n]=function(){var[e,t,r]=g(...arguments),n=0,i=void 0!==r?r.length:0
+if(i>0){var o=r[i-1]
+a(o)&&(n=parseInt(r.pop(),10))}return[e,t,r,n]}(...arguments)
+return this._later(e,t,r,n)}throttle(){R++
+var e,[t,r,n,i,o=!0]=b(...arguments),a=u(t,r,this._timers)
+if(-1===a)e=this._later(t,r,o?v:n,i),o&&this._join(t,r,n)
+else{e=this._timers[a+1]
+var s=a+4
+this._timers[s]!==v&&(this._timers[s]=n)}return e}debounce(){j++
+var e,[t,r,n,i,o=!1]=b(...arguments),a=this._timers,s=u(t,r,a)
+if(-1===s)e=this._later(t,r,o?v:n,i),o&&this._join(t,r,n)
+else{var l=this._platform.now()+i,c=s+4
+a[c]===v&&(n=v),e=a[s+1]
+var h=d(l,a)
+if(s+6===h)a[s]=l,a[c]=n
+else{var f=this._timers[s+5]
+this._timers.splice(h,0,l,e,t,r,n,f),this._timers.splice(s,6)}0===s&&this._reinstallTimerTimeout()}return e}cancelTimers(){D++,this._clearTimerTimeout(),this._timers=[],this._cancelAutorun()}hasTimers(){return this._timers.length>0||this._autorun}cancel(e){if(N++,null==e)return!1
+var t=typeof e
+return"number"===t?this._cancelLaterTimer(e):!("object"!==t||!e.queue||!e.method)&&e.queue.cancel(e)}ensureInstance(){this._ensureInstance()}getDebugInfo(){if(this.DEBUG)return{autorun:this._autorunStack,counters:this.counters,timers:c(this._timers,6,2),instanceStack:[this.currentInstance,...this.instanceStack].map(e=>e&&e._getDebugInfo(this.DEBUG))}}_end(e){var t=this.currentInstance,r=null
+if(null===t)throw new Error("end called without begin")
+var n,i=!1
+try{n=t.flush(e)}finally{if(!i)if(i=!0,1===n){var o=this.queueNames[t.queueNameIndex]
+this._scheduleAutorun(o)}else this.currentInstance=null,this.instanceStack.length>0&&(r=this.instanceStack.pop(),this.currentInstance=r),this._trigger("end",t,r),this._onEnd(t,r)}}_join(e,t,r){return null===this.currentInstance?this._run(e,t,r):void 0===e&&void 0===r?t():t.apply(e,r)}_run(e,t,r){var n=s(this.options)
+if(this.begin(),n)try{return t.apply(e,r)}catch(i){n(i)}finally{this.end()}else try{return t.apply(e,r)}finally{this.end()}}_cancelAutorun(){this._autorun&&(this._platform.clearNext(),this._autorun=!1,this._autorunStack=null)}_later(e,t,r,n){var i=this.DEBUG?new Error:void 0,o=this._platform.now()+n,a=y++
+if(0===this._timers.length)this._timers.push(o,a,e,t,r,i),this._installTimerTimeout()
+else{var s=d(o,this._timers)
+this._timers.splice(s,0,o,a,e,t,r,i),this._reinstallTimerTimeout()}return a}_cancelLaterTimer(e){for(var t=1;t<this._timers.length;t+=6)if(this._timers[t]===e)return this._timers.splice(t-1,6),1===t&&this._reinstallTimerTimeout(),!0
+return!1}_trigger(e,t,r){var n=this._eventCallbacks[e]
+if(void 0!==n)for(var i=0;i<n.length;i++)n[i](t,r)}_runExpiredTimers(){this._timerTimeoutId=null,this._timers.length>0&&(this.begin(),this._scheduleExpiredTimers(),this.end())}_scheduleExpiredTimers(){for(var e=this._timers,t=0,r=e.length,n=this._defaultQueue,i=this._platform.now();t<r;t+=6){if(e[t]>i)break
+var o=e[t+4]
+if(o!==v){var a=e[t+2],s=e[t+3],l=e[t+5]
+this.currentInstance.schedule(n,a,s,o,!1,l)}}e.splice(0,t),this._installTimerTimeout()}_reinstallTimerTimeout(){this._clearTimerTimeout(),this._installTimerTimeout()}_clearTimerTimeout(){null!==this._timerTimeoutId&&(this._platform.clearTimeout(this._timerTimeoutId),this._timerTimeoutId=null)}_installTimerTimeout(){if(0!==this._timers.length){var e=this._timers[0],t=this._platform.now(),r=Math.max(0,e-t)
+this._timerTimeoutId=this._platform.setTimeout(this._boundRunExpiredTimers,r)}}_ensureInstance(){var e=this.currentInstance
+return null===e&&(this._autorunStack=this.DEBUG?new Error:void 0,e=this.begin(),this._scheduleAutorun(this.queueNames[0])),e}_scheduleAutorun(e){I++
+var t=this._platform.next,r=this.options.flush
+r?r(e,t):t(),this._autorun=!0}}U.Queue=h,U.buildPlatform=i,U.buildNext=n
+var H=U
+e.default=H})),e("dag-map",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=function(){function e(){this._vertices=new r}return e.prototype.add=function(e,t,r,n){if(!e)throw new Error("argument `key` is required")
+var i=this._vertices,o=i.add(e)
+if(o.val=t,r)if("string"==typeof r)i.addEdge(o,i.add(r))
+else for(var a=0;a<r.length;a++)i.addEdge(o,i.add(r[a]))
+if(n)if("string"==typeof n)i.addEdge(i.add(n),o)
+else for(a=0;a<n.length;a++)i.addEdge(i.add(n[a]),o)},e.prototype.addEdges=function(e,t,r,n){this.add(e,t,r,n)},e.prototype.each=function(e){this._vertices.walk(e)},e.prototype.topsort=function(e){this.each(e)},e}()
+e.default=t
+var r=function(){function e(){this.length=0,this.stack=new n,this.path=new n,this.result=new n}return e.prototype.add=function(e){if(!e)throw new Error("missing key")
+for(var t,r=0|this.length,n=0;n<r;n++)if((t=this[n]).key===e)return t
+return this.length=r+1,this[r]={idx:r,key:e,val:void 0,out:!1,flag:!1,length:0}},e.prototype.addEdge=function(e,t){this.check(e,t.key)
+for(var r=0|t.length,n=0;n<r;n++)if(t[n]===e.idx)return
+t.length=r+1,t[r]=e.idx,e.out=!0},e.prototype.walk=function(e){this.reset()
+for(var t=0;t<this.length;t++){var r=this[t]
+r.out||this.visit(r,"")}this.each(this.result,e)},e.prototype.check=function(e,t){if(e.key===t)throw new Error("cycle detected: "+t+" <- "+t)
+if(0!==e.length){for(var r=0;r<e.length;r++){if(this[e[r]].key===t)throw new Error("cycle detected: "+t+" <- "+e.key+" <- "+t)}if(this.reset(),this.visit(e,t),this.path.length>0){var n="cycle detected: "+t
+throw this.each(this.path,(function(e){n+=" <- "+e})),new Error(n)}}},e.prototype.reset=function(){this.stack.length=0,this.path.length=0,this.result.length=0
+for(var e=0,t=this.length;e<t;e++)this[e].flag=!1},e.prototype.visit=function(e,t){var r=this.stack,n=this.path,i=this.result
+for(r.push(e.idx);r.length;){var o=0|r.pop()
+if(o>=0){var a=this[o]
+if(a.flag)continue
+if(a.flag=!0,n.push(o),t===a.key)break
+r.push(~o),this.pushIncoming(a)}else n.pop(),i.push(~o)}},e.prototype.pushIncoming=function(e){for(var t=this.stack,r=e.length-1;r>=0;r--){var n=e[r]
+this[n].flag||t.push(n)}},e.prototype.each=function(e,t){for(var r=0,n=e.length;r<n;r++){var i=this[e[r]]
+t(i.key,i.val)}},e}(),n=function(){function e(){this.length=0}return e.prototype.push=function(e){this[this.length++]=0|e},e.prototype.pop=function(){return 0|this[--this.length]},e}()})),e("ember-babel",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.wrapNativeSuper=function(e){if(i.has(e))return i.get(e)
+function r(){}return r.prototype=Object.create(e.prototype,{constructor:{value:r,enumerable:!1,writable:!0,configurable:!0}}),i.set(e,r),t(r,e)},e.classCallCheck=function(){0},e.inheritsLoose=function(e,r){0
+e.prototype=Object.create(null===r?null:r.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),null!==r&&t(e,r)},e.taggedTemplateLiteralLoose=function(e,t){t||(t=e.slice(0))
+return e.raw=t,e},e.createClass=function(e,t,r){null!=t&&o(e.prototype,t)
+null!=r&&o(e,r)
+return e},e.assertThisInitialized=a,e.possibleConstructorReturn=s,e.objectDestructuringEmpty=function(){0},e.createSuper=function(e){return function(){var t,i=r(e)
+if(n){var o=r(this).constructor
+t=Reflect.construct(i,arguments,o)}else t=i.apply(this,arguments)
+return s(this,t)}},e.createForOfIteratorHelperLoose=function(e){var t=0
+if("undefined"==typeof Symbol||null==e[Symbol.iterator]){if(Array.isArray(e)||(e=function(e,t){if(!e)return
+if("string"==typeof e)return l(e,t)
+var r=Object.prototype.toString.call(e).slice(8,-1)
+"Object"===r&&e.constructor&&(r=e.constructor.name)
+if("Map"===r||"Set"===r)return Array.from(r)
+if("Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r))return l(e,t)}(e)))return function(){return t>=e.length?{done:!0}:{done:!1,value:e[t++]}}
+throw new TypeError("Invalid attempt to iterate non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}return(t=e[Symbol.iterator]()).next.bind(t)}
+var t=Object.setPrototypeOf,r=Object.getPrototypeOf,n="object"==typeof Reflect&&"function"==typeof Reflect.construct,i=new Map
+function o(e,t){for(var r=0;r<t.length;r++){var n=t[r]
+n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function a(e){return e}function s(e,t){return"object"==typeof t&&null!==t||"function"==typeof t?t:e}function l(e,t){(null==t||t>e.length)&&(t=e.length)
+for(var r=new Array(t),n=0;n<t;n++)r[n]=e[n]
+return r}})),e("ember/index",["exports","require","@ember/-internals/environment","node-module","@ember/-internals/utils","@ember/-internals/container","@ember/instrumentation","@ember/-internals/meta","@ember/-internals/metal","@ember/canary-features","@ember/debug","backburner","@ember/-internals/console","@ember/controller","@ember/controller/lib/controller_mixin","@ember/string","@ember/service","@ember/object","@ember/object/compat","@ember/object/computed","@ember/-internals/runtime","@ember/-internals/glimmer","ember/version","@ember/-internals/views","@ember/-internals/routing","@ember/-internals/extension-support","@ember/error","@ember/runloop","@ember/-internals/error-handling","@ember/-internals/owner","@ember/application","@ember/application/globals-resolver","@ember/application/instance","@ember/engine","@ember/engine/instance","@ember/polyfills","@ember/deprecated-features","@ember/component/template-only","@glimmer/runtime"],(function(e,t,r,n,i,o,a,s,l,u,c,d,h,f,p,m,v,g,b,y,_,w,E,x,O,S,T,M,A,P,C,k,R,j,D,N,I,L,F){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var z="object"==typeof r.context.imports.Ember&&r.context.imports.Ember||{}
+z.isNamespace=!0,z.toString=function(){return"Ember"},Object.defineProperty(z,"ENV",{get:r.getENV,enumerable:!1}),Object.defineProperty(z,"lookup",{get:r.getLookup,set:r.setLookup,enumerable:!1}),I.EMBER_EXTEND_PROTOTYPES&&Object.defineProperty(z,"EXTEND_PROTOTYPES",{enumerable:!1,get:()=>r.ENV.EXTEND_PROTOTYPES}),z.getOwner=P.getOwner,z.setOwner=P.setOwner,z.Application=C.default,z.ApplicationInstance=R.default,Object.defineProperty(z,"Resolver",{get:()=>k.default}),Object.defineProperty(z,"DefaultResolver",{get:()=>z.Resolver}),z.Engine=j.default,z.EngineInstance=D.default,z.assign=N.assign,z.merge=N.merge,z.generateGuid=i.generateGuid,z.GUID_KEY=i.GUID_KEY,z.guidFor=i.guidFor,z.inspect=i.inspect,z.makeArray=i.makeArray,z.canInvoke=i.canInvoke,z.tryInvoke=i.tryInvoke,z.wrap=i.wrap,z.uuid=i.uuid,z.Container=o.Container,z.Registry=o.Registry,z.assert=c.assert,z.warn=c.warn,z.debug=c.debug,z.deprecate=c.deprecate
+z.deprecateFunc=c.deprecateFunc,z.runInDebug=c.runInDebug,z.Error=T.default,z.Debug={registerDeprecationHandler:c.registerDeprecationHandler,registerWarnHandler:c.registerWarnHandler,isComputed:l.isComputed},z.instrument=a.instrument,z.subscribe=a.subscribe,z.Instrumentation={instrument:a.instrument,subscribe:a.subscribe,unsubscribe:a.unsubscribe,reset:a.reset},z.run=M._globalsRun,z.run.backburner=M.backburner,z.run.begin=M.begin,z.run.bind=M.bind,z.run.cancel=M.cancel,z.run.debounce=M.debounce,z.run.end=M.end,z.run.hasScheduledTimers=M.hasScheduledTimers,z.run.join=M.join,z.run.later=M.later,z.run.next=M.next,z.run.once=M.once,z.run.schedule=M.schedule,z.run.scheduleOnce=M.scheduleOnce,z.run.throttle=M.throttle,z.run.cancelTimers=M.cancelTimers,Object.defineProperty(z.run,"currentRunLoop",{get:M.getCurrentRunLoop,enumerable:!1})
+var U=l._globalsComputed
+if(z.computed=U,z._descriptor=l.nativeDescDecorator,z._tracked=l.tracked,U.alias=l.alias,z.cacheFor=l.getCachedValueFor,z.ComputedProperty=l.ComputedProperty,z._setClassicDecorator=l.setClassicDecorator,z.meta=s.meta,z.get=l.get,z.getWithDefault=l.getWithDefault,z._getPath=l._getPath,z.set=l.set,z.trySet=l.trySet,z.FEATURES=(0,N.assign)({isEnabled:u.isEnabled},u.FEATURES),z._Cache=i.Cache,z.on=l.on,z.addListener=l.addListener,z.removeListener=l.removeListener,z.sendEvent=l.sendEvent,z.hasListeners=l.hasListeners,z.isNone=l.isNone,z.isEmpty=l.isEmpty,z.isBlank=l.isBlank,z.isPresent=l.isPresent,z.notifyPropertyChange=l.notifyPropertyChange,z.beginPropertyChanges=l.beginPropertyChanges,z.endPropertyChanges=l.endPropertyChanges,z.changeProperties=l.changeProperties,z.platform={defineProperty:!0,hasPropertyAccessors:!0},z.defineProperty=l.defineProperty,z.destroy=F.destroy,z.libraries=l.libraries,z.getProperties=l.getProperties,z.setProperties=l.setProperties,z.expandProperties=l.expandProperties,z.addObserver=l.addObserver,z.removeObserver=l.removeObserver,z.aliasMethod=l.aliasMethod,z.observer=l.observer,z.mixin=l.mixin,z.Mixin=l.Mixin,Object.defineProperty(z,"onerror",{get:A.getOnerror,set:A.setOnerror,enumerable:!1}),Object.defineProperty(z,"testing",{get:c.isTesting,set:c.setTesting,enumerable:!1}),z._Backburner=d.default,I.LOGGER&&(z.Logger=h.default),z.A=_.A,z.String={loc:m.loc,w:m.w,dasherize:m.dasherize,decamelize:m.decamelize,camelize:m.camelize,classify:m.classify,underscore:m.underscore,capitalize:m.capitalize},z.Object=_.Object,z._RegistryProxyMixin=_.RegistryProxyMixin,z._ContainerProxyMixin=_.ContainerProxyMixin,z.compare=_.compare,z.copy=_.copy,z.isEqual=_.isEqual,z.inject=function(){},z.inject.service=v.inject,z.inject.controller=f.inject,z.Array=_.Array,z.Comparable=_.Comparable,z.Enumerable=_.Enumerable,z.ArrayProxy=_.ArrayProxy,z.ObjectProxy=_.ObjectProxy,z.ActionHandler=_.ActionHandler,z.CoreObject=_.CoreObject,z.NativeArray=_.NativeArray,z.Copyable=_.Copyable,z.MutableEnumerable=_.MutableEnumerable,z.MutableArray=_.MutableArray,z.TargetActionSupport=_.TargetActionSupport,z.Evented=_.Evented,z.PromiseProxyMixin=_.PromiseProxyMixin,z.Observable=_.Observable,z.typeOf=_.typeOf,z.isArray=_.isArray,z.Object=_.Object,z.onLoad=C.onLoad,z.runLoadHooks=C.runLoadHooks,z.Controller=f.default,z.ControllerMixin=p.default,z.Service=v.default,z._ProxyMixin=_._ProxyMixin,z.RSVP=_.RSVP,z.Namespace=_.Namespace,z._action=g.action,z._dependentKeyCompat=b.dependentKeyCompat,U.empty=y.empty,U.notEmpty=y.notEmpty,U.none=y.none,U.not=y.not,U.bool=y.bool,U.match=y.match,U.equal=y.equal,U.gt=y.gt,U.gte=y.gte,U.lt=y.lt,U.lte=y.lte,U.oneWay=y.oneWay,U.reads=y.oneWay,U.readOnly=y.readOnly,U.deprecatingAlias=y.deprecatingAlias,U.and=y.and,U.or=y.or,U.sum=y.sum,U.min=y.min,U.max=y.max,U.map=y.map,U.sort=y.sort,U.setDiff=y.setDiff,U.mapBy=y.mapBy,U.filter=y.filter,U.filterBy=y.filterBy,U.uniq=y.uniq,U.uniqBy=y.uniqBy,U.union=y.union,U.intersect=y.intersect,U.collect=y.collect,Object.defineProperty(z,"STRINGS",{configurable:!1,get:m._getStrings,set:m._setStrings}),Object.defineProperty(z,"BOOTED",{configurable:!1,enumerable:!1,get:l.isNamespaceSearchDisabled,set:l.setNamespaceSearchDisabled}),z.Component=w.Component,w.Helper.helper=w.helper,z.Helper=w.Helper,z.Checkbox=w.Checkbox,z.TextField=w.TextField,z.TextArea=w.TextArea,z.LinkComponent=w.LinkComponent,z._setComponentManager=w.setComponentManager,z._componentManagerCapabilities=w.capabilities,z._setModifierManager=w.setModifierManager,z._modifierManagerCapabilities=w.modifierCapabilities,z._getComponentTemplate=w.getComponentTemplate,z._setComponentTemplate=w.setComponentTemplate,z._templateOnlyComponent=L.default,z._captureRenderTree=c.captureRenderTree,z.Handlebars={template:w.template,Utils:{escapeExpression:w.escapeExpression}},z.HTMLBars={template:w.template},r.ENV.EXTEND_PROTOTYPES.String&&(String.prototype.htmlSafe=function(){return(0,w.htmlSafe)(this)}),z.String.htmlSafe=w.htmlSafe,z.String.isHTMLSafe=w.isHTMLSafe,Object.defineProperty(z,"TEMPLATES",{get:w.getTemplates,set:w.setTemplates,configurable:!1,enumerable:!1}),z.VERSION=E.default,I.JQUERY_INTEGRATION&&!x.jQueryDisabled&&Object.defineProperty(z,"$",{get:()=>x.jQuery,configurable:!0,enumerable:!0}),z.ViewUtils={isSimpleClick:x.isSimpleClick,getElementView:x.getElementView,getViewElement:x.getViewElement,getViewBounds:x.getViewBounds,getViewClientRects:x.getViewClientRects,getViewBoundingClientRect:x.getViewBoundingClientRect,getRootViews:x.getRootViews,getChildViews:x.getChildViews,isSerializationFirstNode:w.isSerializationFirstNode},z.TextSupport=x.TextSupport,z.ComponentLookup=x.ComponentLookup,z.EventDispatcher=x.EventDispatcher,z.Location=O.Location,z.AutoLocation=O.AutoLocation,z.HashLocation=O.HashLocation,z.HistoryLocation=O.HistoryLocation,z.NoneLocation=O.NoneLocation,z.controllerFor=O.controllerFor,z.generateControllerFactory=O.generateControllerFactory,z.generateController=O.generateController,z.RouterDSL=O.RouterDSL,z.Router=O.Router,z.Route=O.Route,(0,C.runLoadHooks)("Ember.Application",C.default),z.DataAdapter=S.DataAdapter,z.ContainerDebugAdapter=S.ContainerDebugAdapter,(0,t.has)("ember-template-compiler")&&(0,t.default)("ember-template-compiler"),(0,t.has)("ember-testing")){var H=(0,t.default)("ember-testing")
+z.Test=H.Test,z.Test.Adapter=H.Adapter,z.Test.QUnitAdapter=H.QUnitAdapter,z.setupForTesting=H.setupForTesting}(0,C.runLoadHooks)("Ember")
+var B=z
+e.default=B,n.IS_NODE?n.module.exports=z:r.context.exports.Ember=r.context.exports.Em=z})),e("ember/version",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default="3.20.6"})),e("node-module/index",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.require=e.module=e.IS_NODE=void 0
+var t,r,n="object"==typeof module&&"function"==typeof module.require
+e.IS_NODE=n,e.module=t,e.require=r,n?(e.module=t=module,e.require=r=module.require):(e.module=t=null,e.require=r=null)})),e("route-recognizer",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Object.create
+function r(){var e=t(null)
+return e.__=void 0,delete e.__,e}var n=function(e,t,r){this.path=e,this.matcher=t,this.delegate=r}
+n.prototype.to=function(e,t){var r=this.delegate
+if(r&&r.willAddRoute&&(e=r.willAddRoute(this.matcher.target,e)),this.matcher.add(this.path,e),t){if(0===t.length)throw new Error("You must have an argument in the function passed to `to`")
+this.matcher.addChild(this.path,e,t,this.delegate)}}
+var i=function(e){this.routes=r(),this.children=r(),this.target=e}
+function o(e,t,r){return function(i,a){var s=e+i
+if(!a)return new n(s,t,r)
+a(o(s,t,r))}}function a(e,t,r){for(var n=0,i=0;i<e.length;i++)n+=e[i].path.length
+var o={path:t=t.substr(n),handler:r}
+e.push(o)}i.prototype.add=function(e,t){this.routes[e]=t},i.prototype.addChild=function(e,t,r,n){var a=new i(t)
+this.children[e]=a
+var s=o(e,a,n)
+n&&n.contextEntered&&n.contextEntered(t,s),r(s)}
+function s(e){return e.split("/").map(u).join("/")}var l=/%|\//g
+function u(e){return e.length<3||-1===e.indexOf("%")?e:decodeURIComponent(e).replace(l,encodeURIComponent)}var c=/%(?:2(?:4|6|B|C)|3(?:B|D|A)|40)/g
+function d(e){return encodeURIComponent(e).replace(c,decodeURIComponent)}var h=/(\/|\.|\*|\+|\?|\||\(|\)|\[|\]|\{|\}|\\)/g,f=Array.isArray,p=Object.prototype.hasOwnProperty
+function m(e,t){if("object"!=typeof e||null===e)throw new Error("You must pass an object as the second argument to `generate`.")
+if(!p.call(e,t))throw new Error("You must provide param `"+t+"` to `generate`.")
+var r=e[t],n="string"==typeof r?r:""+r
+if(0===n.length)throw new Error("You must provide a param `"+t+"`.")
+return n}var v=[]
+v[0]=function(e,t){for(var r=t,n=e.value,i=0;i<n.length;i++){var o=n.charCodeAt(i)
+r=r.put(o,!1,!1)}return r},v[1]=function(e,t){return t.put(47,!0,!0)},v[2]=function(e,t){return t.put(-1,!1,!0)},v[4]=function(e,t){return t}
+var g=[]
+g[0]=function(e){return e.value.replace(h,"\\$1")},g[1]=function(){return"([^/]+)"},g[2]=function(){return"(.+)"},g[4]=function(){return""}
+var b=[]
+b[0]=function(e){return e.value},b[1]=function(e,t){var r=m(t,e.value)
+return A.ENCODE_AND_DECODE_PATH_SEGMENTS?d(r):r},b[2]=function(e,t){return m(t,e.value)},b[4]=function(){return""}
+var y=Object.freeze({}),_=Object.freeze([])
+function w(e,t,r){t.length>0&&47===t.charCodeAt(0)&&(t=t.substr(1))
+for(var n=t.split("/"),i=void 0,o=void 0,a=0;a<n.length;a++){var s,l=n[a],c=0
+12&(s=2<<(c=""===l?4:58===l.charCodeAt(0)?1:42===l.charCodeAt(0)?2:0))&&(l=l.slice(1),(i=i||[]).push(l),(o=o||[]).push(0!=(4&s))),14&s&&r[c]++,e.push({type:c,value:u(l)})}return{names:i||_,shouldDecodes:o||_}}function E(e,t,r){return e.char===t&&e.negate===r}var x=function(e,t,r,n,i){this.states=e,this.id=t,this.char=r,this.negate=n,this.nextStates=i?t:null,this.pattern="",this._regex=void 0,this.handlers=void 0,this.types=void 0}
+function O(e,t){return e.negate?e.char!==t&&-1!==e.char:e.char===t||-1===e.char}function S(e,t){for(var r=[],n=0,i=e.length;n<i;n++){var o=e[n]
+r=r.concat(o.match(t))}return r}x.prototype.regex=function(){return this._regex||(this._regex=new RegExp(this.pattern)),this._regex},x.prototype.get=function(e,t){var r=this.nextStates
+if(null!==r)if(f(r))for(var n=0;n<r.length;n++){var i=this.states[r[n]]
+if(E(i,e,t))return i}else{var o=this.states[r]
+if(E(o,e,t))return o}},x.prototype.put=function(e,t,r){var n
+if(n=this.get(e,t))return n
+var i=this.states
+return n=new x(i,i.length,e,t,r),i[i.length]=n,null==this.nextStates?this.nextStates=n.id:f(this.nextStates)?this.nextStates.push(n.id):this.nextStates=[this.nextStates,n.id],n},x.prototype.match=function(e){var t=this.nextStates
+if(!t)return[]
+var r=[]
+if(f(t))for(var n=0;n<t.length;n++){var i=this.states[t[n]]
+O(i,e)&&r.push(i)}else{var o=this.states[t]
+O(o,e)&&r.push(o)}return r}
+var T=function(e){this.length=0,this.queryParams=e||{}}
+function M(e){var t
+e=e.replace(/\+/gm,"%20")
+try{t=decodeURIComponent(e)}catch(r){t=""}return t}T.prototype.splice=Array.prototype.splice,T.prototype.slice=Array.prototype.slice,T.prototype.push=Array.prototype.push
+var A=function(){this.names=r()
+var e=[],t=new x(e,0,-1,!0,!1)
+e[0]=t,this.states=e,this.rootState=t}
+A.prototype.add=function(e,t){for(var r,n=this.rootState,i="^",o=[0,0,0],a=new Array(e.length),s=[],l=!0,u=0,c=0;c<e.length;c++){for(var d=e[c],h=w(s,d.path,o),f=h.names,p=h.shouldDecodes;u<s.length;u++){var m=s[u]
+4!==m.type&&(l=!1,n=n.put(47,!1,!1),i+="/",n=v[m.type](m,n),i+=g[m.type](m))}a[c]={handler:d.handler,names:f,shouldDecodes:p}}l&&(n=n.put(47,!1,!1),i+="/"),n.handlers=a,n.pattern=i+"$",n.types=o,"object"==typeof t&&null!==t&&t.as&&(r=t.as),r&&(this.names[r]={segments:s,handlers:a})},A.prototype.handlersFor=function(e){var t=this.names[e]
+if(!t)throw new Error("There is no route named "+e)
+for(var r=new Array(t.handlers.length),n=0;n<t.handlers.length;n++){var i=t.handlers[n]
+r[n]=i}return r},A.prototype.hasRoute=function(e){return!!this.names[e]},A.prototype.generate=function(e,t){var r=this.names[e],n=""
+if(!r)throw new Error("There is no route named "+e)
+for(var i=r.segments,o=0;o<i.length;o++){var a=i[o]
+4!==a.type&&(n+="/",n+=b[a.type](a,t))}return"/"!==n.charAt(0)&&(n="/"+n),t&&t.queryParams&&(n+=this.generateQueryString(t.queryParams)),n},A.prototype.generateQueryString=function(e){var t=[],r=Object.keys(e)
+r.sort()
+for(var n=0;n<r.length;n++){var i=r[n],o=e[i]
+if(null!=o){var a=encodeURIComponent(i)
+if(f(o))for(var s=0;s<o.length;s++){var l=i+"[]="+encodeURIComponent(o[s])
+t.push(l)}else a+="="+encodeURIComponent(o),t.push(a)}}return 0===t.length?"":"?"+t.join("&")},A.prototype.parseQueryString=function(e){for(var t=e.split("&"),r={},n=0;n<t.length;n++){var i=t[n].split("="),o=M(i[0]),a=o.length,s=!1,l=void 0
+1===i.length?l="true":(a>2&&"[]"===o.slice(a-2)&&(s=!0,r[o=o.slice(0,a-2)]||(r[o]=[])),l=i[1]?M(i[1]):""),s?r[o].push(l):r[o]=l}return r},A.prototype.recognize=function(e){var t,r=[this.rootState],n={},i=!1,o=e.indexOf("#");-1!==o&&(e=e.substr(0,o))
+var a=e.indexOf("?")
+if(-1!==a){var l=e.substr(a+1,e.length)
+e=e.substr(0,a),n=this.parseQueryString(l)}"/"!==e.charAt(0)&&(e="/"+e)
+var u=e
+A.ENCODE_AND_DECODE_PATH_SEGMENTS?e=s(e):(e=decodeURI(e),u=decodeURI(u))
+var c=e.length
+c>1&&"/"===e.charAt(c-1)&&(e=e.substr(0,c-1),u=u.substr(0,u.length-1),i=!0)
+for(var d=0;d<e.length&&(r=S(r,e.charCodeAt(d))).length;d++);for(var h=[],f=0;f<r.length;f++)r[f].handlers&&h.push(r[f])
+r=function(e){return e.sort((function(e,t){var r=e.types||[0,0,0],n=r[0],i=r[1],o=r[2],a=t.types||[0,0,0],s=a[0],l=a[1],u=a[2]
+if(o!==u)return o-u
+if(o){if(n!==s)return s-n
+if(i!==l)return l-i}return i!==l?i-l:n!==s?s-n:0}))}(h)
+var p=h[0]
+return p&&p.handlers&&(i&&p.pattern&&"(.+)$"===p.pattern.slice(-5)&&(u+="/"),t=function(e,t,r){var n=e.handlers,i=e.regex()
+if(!i||!n)throw new Error("state not initialized")
+var o=t.match(i),a=1,s=new T(r)
+s.length=n.length
+for(var l=0;l<n.length;l++){var u=n[l],c=u.names,d=u.shouldDecodes,h=y,f=!1
+if(c!==_&&d!==_)for(var p=0;p<c.length;p++){f=!0
+var m=c[p],v=o&&o[a++]
+h===y&&(h={}),A.ENCODE_AND_DECODE_PATH_SEGMENTS&&d[p]?h[m]=v&&decodeURIComponent(v):h[m]=v}s[l]={handler:u.handler,params:h,isDynamic:f}}return s}(p,u,n)),t},A.VERSION="0.3.4",A.ENCODE_AND_DECODE_PATH_SEGMENTS=!0,A.Normalizer={normalizeSegment:u,normalizePath:s,encodePathSegment:d},A.prototype.map=function(e,t){var r=new i
+e(o("",r,this.delegate)),function e(t,r,n,i){for(var o=r.routes,s=Object.keys(o),l=0;l<s.length;l++){var u=s[l],c=t.slice()
+a(c,u,o[u])
+var d=r.children[u]
+d?e(c,d,n,i):n.call(i,c)}}([],r,(function(e){t?t(this,e):this.add(e)}),this)}
+var P=A
+e.default=P})),e("router_js",["exports","@ember/polyfills","rsvp","route-recognizer"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.logAbort=_,e.InternalRouteInfo=e.TransitionError=e.TransitionState=e.QUERY_PARAMS_SYMBOL=e.PARAMS_SYMBOL=e.STATE_SYMBOL=e.InternalTransition=e.default=void 0
+var i=function(){function e(t){var r=Error.call(this,t)
+this.name="TransitionAborted",this.message=t||"TransitionAborted",Error.captureStackTrace?Error.captureStackTrace(this,e):this.stack=r.stack}return e.prototype=Object.create(Error.prototype),e.prototype.constructor=e,e}(),o=Array.prototype.slice,a=Object.prototype.hasOwnProperty
+function s(e,t){for(var r in t)a.call(t,r)&&(e[r]=t[r])}function l(e){var t,r=e&&e.length
+if(r&&r>0){var n=e[r-1]
+if(function(e){return e&&a.call(e,"queryParams")}(n))return t=n.queryParams,[o.call(e,0,r-1),t]}return[e,null]}function u(e){for(var t in e){var r=e[t]
+if("number"==typeof r)e[t]=""+r
+else if(Array.isArray(r))for(var n=0,i=r.length;n<i;n++)r[n]=""+r[n]}}function c(e,...t){if(e.log)if(2===t.length){var[r,n]=t
+e.log("Transition #"+r+": "+n)}else{var[i]=t
+e.log(i)}}function d(e){return"string"==typeof e||e instanceof String||"number"==typeof e||e instanceof Number}function h(e,t){for(var r=0,n=e.length;r<n&&!1!==t(e[r]);r++);}function f(e,t){var r,n={all:{},changed:{},removed:{}}
+s(n.all,t)
+var i=!1
+for(r in u(e),u(t),e)a.call(e,r)&&(a.call(t,r)||(i=!0,n.removed[r]=e[r]))
+for(r in t)if(a.call(t,r)){var o=e[r],l=t[r]
+if(p(o)&&p(l))if(o.length!==l.length)n.changed[r]=t[r],i=!0
+else for(var c=0,d=o.length;c<d;c++)o[c]!==l[c]&&(n.changed[r]=t[r],i=!0)
+else e[r]!==t[r]&&(n.changed[r]=t[r],i=!0)}return i?n:void 0}function p(e){return Array.isArray(e)}function m(e){return"Router: "+e}var v="__STATE__-2619860001345920-3322w3"
+e.STATE_SYMBOL=v
+var g="__PARAMS__-261986232992830203-23323"
+e.PARAMS_SYMBOL=g
+var b="__QPS__-2619863929824844-32323"
+e.QUERY_PARAMS_SYMBOL=b
+class y{constructor(e,t,n,i,o){if(this.from=null,this.to=void 0,this.isAborted=!1,this.isActive=!0,this.urlMethod="update",this.resolveIndex=0,this.queryParamsOnly=!1,this.isTransition=!0,this.isCausedByAbortingTransition=!1,this.isCausedByInitialTransition=!1,this.isCausedByAbortingReplaceTransition=!1,this._visibleQueryParams={},this[v]=n||e.state,this.intent=t,this.router=e,this.data=t&&t.data||{},this.resolvedModels={},this[b]={},this.promise=void 0,this.error=void 0,this[g]={},this.routeInfos=[],this.targetName=void 0,this.pivotHandler=void 0,this.sequence=-1,i)return this.promise=r.Promise.reject(i),void(this.error=i)
+if(this.isCausedByAbortingTransition=!!o,this.isCausedByInitialTransition=!!o&&(o.isCausedByInitialTransition||0===o.sequence),this.isCausedByAbortingReplaceTransition=!!o&&"replace"===o.urlMethod&&(!o.isCausedByAbortingTransition||o.isCausedByAbortingReplaceTransition),n){this[g]=n.params,this[b]=n.queryParams,this.routeInfos=n.routeInfos
+var a=n.routeInfos.length
+a&&(this.targetName=n.routeInfos[a-1].name)
+for(var s=0;s<a;++s){var l=n.routeInfos[s]
+if(!l.isResolved)break
+this.pivotHandler=l.route}this.sequence=e.currentSequence++,this.promise=n.resolve(()=>this.isAborted?r.Promise.reject(!1,m("Transition aborted - reject")):r.Promise.resolve(!0),this).catch(e=>r.Promise.reject(this.router.transitionDidError(e,this)),m("Handle Abort"))}else this.promise=r.Promise.resolve(this[v]),this[g]={}}then(e,t,r){return this.promise.then(e,t,r)}catch(e,t){return this.promise.catch(e,t)}finally(e,t){return this.promise.finally(e,t)}abort(){this.rollback()
+var e=new y(this.router,void 0,void 0,void 0)
+return e.to=this.from,e.from=this.from,e.isAborted=!0,this.router.routeWillChange(e),this.router.routeDidChange(e),this}rollback(){this.isAborted||(c(this.router,this.sequence,this.targetName+": transition was aborted"),void 0!==this.intent&&null!==this.intent&&(this.intent.preTransitionState=this.router.state),this.isAborted=!0,this.isActive=!1,this.router.activeTransition=void 0)}redirect(e){this.rollback(),this.router.routeWillChange(e)}retry(){this.abort()
+var e=this.router.transitionByIntent(this.intent,!1)
+return null!==this.urlMethod&&e.method(this.urlMethod),e}method(e){return this.urlMethod=e,this}send(e=!1,t,r,n,i){this.trigger(e,t,r,n,i)}trigger(e=!1,t,...r){"string"==typeof e&&(t=e,e=!1),this.router.triggerEvent(this[v].routeInfos.slice(0,this.resolveIndex+1),e,t,r)}followRedirects(){var e=this.router
+return this.promise.catch((function(t){return e.activeTransition?e.activeTransition.followRedirects():r.Promise.reject(t)}))}toString(){return"Transition (sequence "+this.sequence+")"}log(e){c(this.router,this.sequence,e)}}function _(e){return c(e.router,e.sequence,"detected abort."),new i}function w(e){return"object"==typeof e&&e instanceof y&&e.isTransition}e.InternalTransition=y
+var E=new WeakMap
+function x(e,r={},n=!1){return e.map((i,o)=>{var{name:a,params:s,paramNames:l,context:u,route:c}=i
+if(E.has(i)&&n){var d=E.get(i),h=O(d=function(e,r){var n={get metadata(){return S(e)}}
+if(!Object.isExtensible(r)||r.hasOwnProperty("metadata"))return Object.freeze((0,t.assign)({},r,n))
+return(0,t.assign)(r,n)}(c,d),u)
+return E.set(i,h),h}var f={find(t,r){var n,i=[]
+3===t.length&&(i=e.map(e=>E.get(e)))
+for(var o=0;e.length>o;o++)if(n=E.get(e[o]),t.call(r,n,o,i))return n},get name(){return a},get paramNames(){return l},get metadata(){return S(i.route)},get parent(){var t=e[o-1]
+return void 0===t?null:E.get(t)},get child(){var t=e[o+1]
+return void 0===t?null:E.get(t)},get localName(){var e=this.name.split(".")
+return e[e.length-1]},get params(){return s},get queryParams(){return r}}
+return n&&(f=O(f,u)),E.set(i,f),f})}function O(e,r){var n={get attributes(){return r}}
+return!Object.isExtensible(e)||e.hasOwnProperty("attributes")?Object.freeze((0,t.assign)({},e,n)):(0,t.assign)(e,n)}function S(e){return null!=e&&void 0!==e.buildRouteInfoMetadata?e.buildRouteInfoMetadata():null}class T{constructor(e,t,r,n){this._routePromise=void 0,this._route=null,this.params={},this.isResolved=!1,this.name=t,this.paramNames=r,this.router=e,n&&this._processRoute(n)}getModel(e){return r.Promise.resolve(this.context)}serialize(e){return this.params||{}}resolve(e,t){return r.Promise.resolve(this.routePromise).then(t=>this.checkForAbort(e,t)).then(()=>this.runBeforeModelHook(t)).then(()=>this.checkForAbort(e,null)).then(()=>this.getModel(t)).then(t=>this.checkForAbort(e,t)).then(e=>this.runAfterModelHook(t,e)).then(e=>this.becomeResolved(t,e))}becomeResolved(e,t){var r,n=this.serialize(t)
+e&&(this.stashResolvedModel(e,t),e[g]=e[g]||{},e[g][this.name]=n)
+var i=t===this.context
+!("context"in this)&&i||(r=t)
+var o=E.get(this),a=new M(this.router,this.name,this.paramNames,n,this.route,r)
+return void 0!==o&&E.set(a,o),a}shouldSupercede(e){if(!e)return!0
+var t=e.context===this.context
+return e.name!==this.name||"context"in this&&!t||this.hasOwnProperty("params")&&!function(e,t){if(!e!=!t)return!1
+if(!e)return!0
+for(var r in e)if(e.hasOwnProperty(r)&&e[r]!==t[r])return!1
+return!0}(this.params,e.params)}get route(){return null!==this._route?this._route:this.fetchRoute()}set route(e){this._route=e}get routePromise(){return this._routePromise||this.fetchRoute(),this._routePromise}set routePromise(e){this._routePromise=e}log(e,t){e.log&&e.log(this.name+": "+t)}updateRoute(e){return e._internalName=this.name,this.route=e}runBeforeModelHook(e){var t
+return e.trigger&&e.trigger(!0,"willResolveModel",e,this.route),this.route&&void 0!==this.route.beforeModel&&(t=this.route.beforeModel(e)),w(t)&&(t=null),r.Promise.resolve(t)}runAfterModelHook(e,t){var n,i,o=this.name
+return this.stashResolvedModel(e,t),void 0!==this.route&&void 0!==this.route.afterModel&&(n=this.route.afterModel(t,e)),n=w(i=n)?null:i,r.Promise.resolve(n).then(()=>e.resolvedModels[o])}checkForAbort(e,t){return r.Promise.resolve(e()).then((function(){return t}),null)}stashResolvedModel(e,t){e.resolvedModels=e.resolvedModels||{},e.resolvedModels[this.name]=t}fetchRoute(){var e=this.router.getRoute(this.name)
+return this._processRoute(e)}_processRoute(e){return this.routePromise=r.Promise.resolve(e),null!==(t=e)&&"object"==typeof t&&"function"==typeof t.then?(this.routePromise=this.routePromise.then(e=>this.updateRoute(e)),this.route=void 0):e?this.updateRoute(e):void 0
+var t}}e.InternalRouteInfo=T
+class M extends T{constructor(e,t,r,n,i,o){super(e,t,r,i),this.params=n,this.isResolved=!0,this.context=o}resolve(e,t){return t&&t.resolvedModels&&(t.resolvedModels[this.name]=this.context),r.Promise.resolve(this)}}class A extends T{constructor(e,t,r,n,i){super(e,t,r,i),this.params={},this.params=n}getModel(e){var t=this.params
+e&&e[b]&&(s(t={},this.params),t.queryParams=e[b])
+var n=this.route,i=void 0
+return n.deserialize?i=n.deserialize(t,e):n.model&&(i=n.model(t,e)),i&&w(i)&&(i=void 0),r.Promise.resolve(i)}}class P extends T{constructor(e,t,r,n){super(e,t,r),this.context=n,this.serializer=this.router.getSerializer(t)}getModel(e){return void 0!==this.router.log&&this.router.log(this.name+": resolving provided model"),super.getModel(e)}serialize(e){var{paramNames:t,context:r}=this
+e||(e=r)
+var n={}
+if(d(e))return n[t[0]]=e,n
+if(this.serializer)return this.serializer.call(null,e,t)
+if(void 0!==this.route&&this.route.serialize)return this.route.serialize(e,t)
+if(1===t.length){var i=t[0]
+return/_id$/.test(i)?n[i]=e.id:n[i]=e,n}}}class C{constructor(e,t={}){this.router=e,this.data=t}}class k{constructor(){this.routeInfos=[],this.queryParams={},this.params={}}promiseLabel(e){var t=""
+return h(this.routeInfos,(function(e){return""!==t&&(t+="."),t+=e.name,!0})),m("'"+t+"': "+e)}resolve(e,t){var n=this.params
+h(this.routeInfos,e=>(n[e.name]=e.params||{},!0)),t.resolveIndex=0
+var i=this,o=!1
+return r.Promise.resolve(null,this.promiseLabel("Start transition")).then(l,null,this.promiseLabel("Resolve route")).catch((function(e){var n=i.routeInfos,a=t.resolveIndex>=n.length?n.length-1:t.resolveIndex
+return r.Promise.reject(new R(e,i.routeInfos[a].route,o,i))}),this.promiseLabel("Handle error"))
+function a(){return r.Promise.resolve(e(),i.promiseLabel("Check if should continue")).catch((function(e){return o=!0,r.Promise.reject(e)}),i.promiseLabel("Handle abort"))}function s(e){var r=i.routeInfos[t.resolveIndex].isResolved
+if(i.routeInfos[t.resolveIndex++]=e,!r){var{route:n}=e
+void 0!==n&&n.redirect&&n.redirect(e.context,t)}return a().then(l,null,i.promiseLabel("Resolve route"))}function l(){return t.resolveIndex===i.routeInfos.length?i:i.routeInfos[t.resolveIndex].resolve(a,t).then(s,null,i.promiseLabel("Proceed"))}}}e.TransitionState=k
+class R{constructor(e,t,r,n){this.error=e,this.route=t,this.wasAborted=r,this.state=n}}e.TransitionError=R
+class j extends C{constructor(e,t,r,n=[],i={},o){super(e,o),this.preTransitionState=void 0,this.name=t,this.pivotHandler=r,this.contexts=n,this.queryParams=i}applyToState(e,t){var r=l([this.name].concat(this.contexts))[0],n=this.router.recognizer.handlersFor(r[0]),i=n[n.length-1].handler
+return this.applyToHandlers(e,n,i,t,!1)}applyToHandlers(e,t,r,n,i){var o,a,l=new k,u=this.contexts.slice(0),c=t.length
+if(this.pivotHandler)for(o=0,a=t.length;o<a;++o)if(t[o].handler===this.pivotHandler._internalName){c=o
+break}for(o=t.length-1;o>=0;--o){var d=t[o],h=d.handler,f=e.routeInfos[o],p=null
+if(p=d.names.length>0?o>=c?this.createParamHandlerInfo(h,d.names,u,f):this.getHandlerInfoForDynamicSegment(h,d.names,u,f,r,o):this.createParamHandlerInfo(h,d.names,u,f),i){p=p.becomeResolved(null,p.context)
+var m=f&&f.context
+d.names.length>0&&void 0!==f.context&&p.context===m&&(p.params=f&&f.params),p.context=m}var v=f;(o>=c||p.shouldSupercede(f))&&(c=Math.min(o,c),v=p),n&&!i&&(v=v.becomeResolved(null,v.context)),l.routeInfos.unshift(v)}if(u.length>0)throw new Error("More context objects were passed than there are dynamic segments for the route: "+r)
+return n||this.invalidateChildren(l.routeInfos,c),s(l.queryParams,this.queryParams||{}),l}invalidateChildren(e,t){for(var r=t,n=e.length;r<n;++r){if(e[r].isResolved){var{name:i,params:o,route:a,paramNames:s}=e[r]
+e[r]=new A(this.router,i,s,o,a)}}}getHandlerInfoForDynamicSegment(e,t,r,n,i,o){var a
+if(r.length>0){if(d(a=r[r.length-1]))return this.createParamHandlerInfo(e,t,r,n)
+r.pop()}else{if(n&&n.name===e)return n
+if(!this.preTransitionState)return n
+var s=this.preTransitionState.routeInfos[o]
+a=s&&s.context}return new P(this.router,e,t,a)}createParamHandlerInfo(e,t,r,n){for(var i={},o=t.length,a=[];o--;){var s=n&&e===n.name&&n.params||{},l=r[r.length-1],u=t[o]
+d(l)?i[u]=""+r.pop():s.hasOwnProperty(u)?i[u]=s[u]:a.push(u)}if(a.length>0)throw new Error(`You didn't provide enough string/numeric parameters to satisfy all of the dynamic segments for route ${e}. Missing params: `+a)
+return new A(this.router,e,t,i)}}var D=function(){function e(t){var r=Error.call(this,t)
+this.name="UnrecognizedURLError",this.message=t||"UnrecognizedURL",Error.captureStackTrace?Error.captureStackTrace(this,e):this.stack=r.stack}return e.prototype=Object.create(Error.prototype),e.prototype.constructor=e,e}()
+class N extends C{constructor(e,t,r){super(e,r),this.url=t,this.preTransitionState=void 0}applyToState(e){var t,r,n=new k,i=this.router.recognizer.recognize(this.url)
+if(!i)throw new D(this.url)
+var o=!1,a=this.url
+function l(e){if(e&&e.inaccessibleByURL)throw new D(a)
+return e}for(t=0,r=i.length;t<r;++t){var u=i[t],c=u.handler,d=[]
+this.router.recognizer.hasRoute(c)&&(d=this.router.recognizer.handlersFor(c)[t].names)
+var h=new A(this.router,c,d,u.params),f=h.route
+f?l(f):h.routePromise=h.routePromise.then(l)
+var p=e.routeInfos[t]
+o||h.shouldSupercede(p)?(o=!0,n.routeInfos[t]=h):n.routeInfos[t]=p}return s(n.queryParams,i.queryParams),n}}function I(e,t){if(e.length!==t.length)return!1
+for(var r=0,n=e.length;r<n;++r)if(e[r]!==t[r])return!1
+return!0}function L(e,t){if(!e&&!t)return!0
+if(!e&&t||e&&!t)return!1
+var r=Object.keys(e),n=Object.keys(t)
+if(r.length!==n.length)return!1
+for(var i=0,o=r.length;i<o;++i){var a=r[i]
+if(e[a]!==t[a])return!1}return!0}var F=class{constructor(e){this._lastQueryParams={},this.state=void 0,this.oldState=void 0,this.activeTransition=void 0,this.currentRouteInfos=void 0,this._changedQueryParams=void 0,this.currentSequence=0,this.log=e,this.recognizer=new n.default,this.reset()}map(e){this.recognizer.map(e,(function(e,t){for(var r=t.length-1,n=!0;r>=0&&n;--r){var i=t[r],o=i.handler
+e.add(t,{as:o}),n="/"===i.path||""===i.path||".index"===o.slice(-6)}}))}hasRoute(e){return this.recognizer.hasRoute(e)}queryParamsTransition(e,t,r,n){if(this.fireQueryParamDidChange(n,e),!t&&this.activeTransition)return this.activeTransition
+var i=new y(this,void 0,void 0)
+return i.queryParamsOnly=!0,r.queryParams=this.finalizeQueryParamChange(n.routeInfos,n.queryParams,i),i[b]=n.queryParams,this.toReadOnlyInfos(i,n),this.routeWillChange(i),i.promise=i.promise.then(e=>(i.isAborted||(this._updateURL(i,r),this.didTransition(this.currentRouteInfos),this.toInfos(i,n.routeInfos,!0),this.routeDidChange(i)),e),null,m("Transition complete")),i}transitionByIntent(e,t){try{return this.getTransitionByIntent(e,t)}catch(r){return new y(this,e,void 0,r,void 0)}}recognize(e){var t=new N(this,e),r=this.generateNewState(t)
+if(null===r)return r
+var n=x(r.routeInfos,r.queryParams)
+return n[n.length-1]}recognizeAndLoad(e){var t=new N(this,e),n=this.generateNewState(t)
+if(null===n)return r.Promise.reject(`URL ${e} was not recognized`)
+var i=new y(this,t,n,void 0)
+return i.then(()=>{var e=x(n.routeInfos,i[b],!0)
+return e[e.length-1]})}generateNewState(e){try{return e.applyToState(this.state,!1)}catch(t){return null}}getTransitionByIntent(e,t){var r,n=!!this.activeTransition,i=n?this.activeTransition[v]:this.state,o=e.applyToState(i,t),a=f(i.queryParams,o.queryParams)
+if(I(o.routeInfos,i.routeInfos)){if(a){var s=this.queryParamsTransition(a,n,i,o)
+return s.queryParamsOnly=!0,s}return this.activeTransition||new y(this,void 0,void 0)}if(t){var l=new y(this,void 0,void 0)
+return this.toReadOnlyInfos(l,o),this.setupContexts(o),this.routeWillChange(l),this.activeTransition}return r=new y(this,e,o,void 0,this.activeTransition),function(e,t){if(e.length!==t.length)return!1
+for(var r=0,n=e.length;r<n;++r){if(e[r].name!==t[r].name)return!1
+if(!L(e[r].params,t[r].params))return!1}return!0}(o.routeInfos,i.routeInfos)&&(r.queryParamsOnly=!0),this.toReadOnlyInfos(r,o),this.activeTransition&&this.activeTransition.redirect(r),this.activeTransition=r,r.promise=r.promise.then(e=>this.finalizeTransition(r,e),null,m("Settle transition promise when transition is finalized")),n||this.notifyExistingHandlers(o,r),this.fireQueryParamDidChange(o,a),r}doTransition(e,t=[],r=!1){var n,i=t[t.length-1],o={}
+if(void 0!==i&&i.hasOwnProperty("queryParams")&&(o=t.pop().queryParams),void 0===e){c(this,"Updating query params")
+var{routeInfos:a}=this.state
+n=new j(this,a[a.length-1].name,void 0,[],o)}else"/"===e.charAt(0)?(c(this,"Attempting URL transition to "+e),n=new N(this,e)):(c(this,"Attempting transition to "+e),n=new j(this,e,void 0,t,o))
+return this.transitionByIntent(n,r)}finalizeTransition(e,t){try{c(e.router,e.sequence,"Resolved all models on destination route; finalizing transition.")
+var n=t.routeInfos
+return this.setupContexts(t,e),e.isAborted?(this.state.routeInfos=this.currentRouteInfos,r.Promise.reject(_(e))):(this._updateURL(e,t),e.isActive=!1,this.activeTransition=void 0,this.triggerEvent(this.currentRouteInfos,!0,"didTransition",[]),this.didTransition(this.currentRouteInfos),this.toInfos(e,t.routeInfos,!0),this.routeDidChange(e),c(this,e.sequence,"TRANSITION COMPLETE."),n[n.length-1].route)}catch(a){if(!(a instanceof i)){var o=e[v].routeInfos
+e.trigger(!0,"error",a,e,o[o.length-1].route),e.abort()}throw a}}setupContexts(e,t){var r,n,i,o=this.partitionRoutes(this.state,e)
+for(r=0,n=o.exited.length;r<n;r++)delete(i=o.exited[r].route).context,void 0!==i&&(void 0!==i._internalReset&&i._internalReset(!0,t),void 0!==i.exit&&i.exit(t))
+var a=this.oldState=this.state
+this.state=e
+var s=this.currentRouteInfos=o.unchanged.slice()
+try{for(r=0,n=o.reset.length;r<n;r++)void 0!==(i=o.reset[r].route)&&void 0!==i._internalReset&&i._internalReset(!1,t)
+for(r=0,n=o.updatedContext.length;r<n;r++)this.routeEnteredOrUpdated(s,o.updatedContext[r],!1,t)
+for(r=0,n=o.entered.length;r<n;r++)this.routeEnteredOrUpdated(s,o.entered[r],!0,t)}catch(l){throw this.state=a,this.currentRouteInfos=a.routeInfos,l}this.state.queryParams=this.finalizeQueryParamChange(s,e.queryParams,t)}fireQueryParamDidChange(e,t){t&&(this._changedQueryParams=t.all,this.triggerEvent(e.routeInfos,!0,"queryParamsDidChange",[t.changed,t.all,t.removed]),this._changedQueryParams=void 0)}routeEnteredOrUpdated(e,t,r,n){var o=t.route,a=t.context
+function s(o){if(r&&void 0!==o.enter&&o.enter(n),n&&n.isAborted)throw new i
+if(o.context=a,void 0!==o.contextDidChange&&o.contextDidChange(),void 0!==o.setup&&o.setup(a,n),n&&n.isAborted)throw new i
+return e.push(t),o}return void 0===o?t.routePromise=t.routePromise.then(s):s(o),!0}partitionRoutes(e,t){var r,n,i,o=e.routeInfos,a=t.routeInfos,s={updatedContext:[],exited:[],entered:[],unchanged:[],reset:[]},l=!1
+for(n=0,i=a.length;n<i;n++){var u=o[n],c=a[n]
+u&&u.route===c.route||(r=!0),r?(s.entered.push(c),u&&s.exited.unshift(u)):l||u.context!==c.context?(l=!0,s.updatedContext.push(c)):s.unchanged.push(u)}for(n=a.length,i=o.length;n<i;n++)s.exited.unshift(o[n])
+return s.reset=s.updatedContext.slice(),s.reset.reverse(),s}_updateURL(e,t){var r=e.urlMethod
+if(r){for(var{routeInfos:n}=t,{name:i}=n[n.length-1],o={},a=n.length-1;a>=0;--a){var l=n[a]
+s(o,l.params),l.route.inaccessibleByURL&&(r=null)}if(r){o.queryParams=e._visibleQueryParams||t.queryParams
+var u=this.recognizer.generate(i,o),c=e.isCausedByInitialTransition,d="replace"===r&&!e.isCausedByAbortingTransition,h=e.queryParamsOnly&&"replace"===r,f="replace"===r&&e.isCausedByAbortingReplaceTransition
+c||d||h||f?this.replaceURL(u):this.updateURL(u)}}}finalizeQueryParamChange(e,t,r){for(var n in t)t.hasOwnProperty(n)&&null===t[n]&&delete t[n]
+var i=[]
+this.triggerEvent(e,!0,"finalizeQueryParamChange",[t,i,r]),r&&(r._visibleQueryParams={})
+for(var o={},a=0,s=i.length;a<s;++a){var l=i[a]
+o[l.key]=l.value,r&&!1!==l.visible&&(r._visibleQueryParams[l.key]=l.value)}return o}toReadOnlyInfos(e,t){var r=this.state.routeInfos
+this.fromInfos(e,r),this.toInfos(e,t.routeInfos),this._lastQueryParams=t.queryParams}fromInfos(e,r){if(void 0!==e&&r.length>0){var n=x(r,(0,t.assign)({},this._lastQueryParams),!0)
+e.from=n[n.length-1]||null}}toInfos(e,r,n=!1){if(void 0!==e&&r.length>0){var i=x(r,(0,t.assign)({},e[b]),n)
+e.to=i[i.length-1]||null}}notifyExistingHandlers(e,t){var r,n,i,o,a=this.state.routeInfos
+for(n=a.length,r=0;r<n&&(i=a[r],(o=e.routeInfos[r])&&i.name===o.name);r++)o.isResolved
+this.triggerEvent(a,!0,"willTransition",[t]),this.routeWillChange(t),this.willTransition(a,e.routeInfos,t)}reset(){this.state&&h(this.state.routeInfos.slice().reverse(),(function(e){var t=e.route
+return void 0!==t&&void 0!==t.exit&&t.exit(),!0})),this.oldState=void 0,this.state=new k,this.currentRouteInfos=void 0}handleURL(e){return"/"!==e.charAt(0)&&(e="/"+e),this.doTransition(e).method(null)}transitionTo(e,...t){return"object"==typeof e?(t.push(e),this.doTransition(void 0,t,!1)):this.doTransition(e,t)}intermediateTransitionTo(e,...t){return this.doTransition(e,t,!0)}refresh(e){var t=this.activeTransition,r=t?t[v]:this.state,n=r.routeInfos
+void 0===e&&(e=n[0].route),c(this,"Starting a refresh transition")
+var i=n[n.length-1].name,o=new j(this,i,e,[],this._changedQueryParams||r.queryParams),a=this.transitionByIntent(o,!1)
+return t&&"replace"===t.urlMethod&&a.method(t.urlMethod),a}replaceWith(e){return this.doTransition(e).method("replace")}generate(e,...t){for(var r=l(t),n=r[0],i=r[1],o=new j(this,e,void 0,n).applyToState(this.state,!1),a={},u=0,c=o.routeInfos.length;u<c;++u){s(a,o.routeInfos[u].serialize())}return a.queryParams=i,this.recognizer.generate(e,a)}applyIntent(e,t){var r=new j(this,e,void 0,t),n=this.activeTransition&&this.activeTransition[v]||this.state
+return r.applyToState(n,!1)}isActiveIntent(e,t,r,n){var i,o=n||this.state,a=o.routeInfos
+if(!a.length)return!1
+var l=a[a.length-1].name,u=this.recognizer.handlersFor(l),c=0
+for(i=u.length;c<i&&a[c].name!==e;++c);if(c===u.length)return!1
+var d=new k
+d.routeInfos=a.slice(0,c+1),u=u.slice(0,c+1)
+var h=I(new j(this,l,void 0,t).applyToHandlers(d,u,l,!0,!0).routeInfos,d.routeInfos)
+if(!r||!h)return h
+var p={}
+s(p,r)
+var m=o.queryParams
+for(var v in m)m.hasOwnProperty(v)&&p.hasOwnProperty(v)&&(p[v]=m[v])
+return h&&!f(p,r)}isActive(e,...t){var r=l(t)
+return this.isActiveIntent(e,r[0],r[1])}trigger(e,...t){this.triggerEvent(this.currentRouteInfos,!1,e,t)}}
+e.default=F})),e("rsvp",["exports"],(function(e){"use strict"
+function r(e){var t=e._promiseCallbacks
+return t||(t=e._promiseCallbacks={}),t}Object.defineProperty(e,"__esModule",{value:!0}),e.asap=K,e.all=C,e.allSettled=R,e.race=j,e.hash=N,e.hashSettled=L,e.rethrow=F,e.defer=z,e.denodeify=M,e.configure=o,e.on=fe,e.off=pe,e.resolve=B,e.reject=V,e.map=H,e.filter=W,e.async=e.EventTarget=e.Promise=e.cast=e.default=void 0
+var n={mixin(e){return e.on=this.on,e.off=this.off,e.trigger=this.trigger,e._promiseCallbacks=void 0,e},on(e,t){if("function"!=typeof t)throw new TypeError("Callback must be a function")
+var n=r(this),i=n[e]
+i||(i=n[e]=[]),-1===i.indexOf(t)&&i.push(t)},off(e,t){var n=r(this)
+if(t){var i=n[e],o=i.indexOf(t);-1!==o&&i.splice(o,1)}else n[e]=[]},trigger(e,t,n){var i=r(this)[e]
+if(i)for(var o=0;o<i.length;o++)(0,i[o])(t,n)}}
+e.EventTarget=n
+var i={instrument:!1}
+function o(e,t){if(2!==arguments.length)return i[e]
+i[e]=t}n.mixin(i)
+var a=[]
+function s(e,t,r){1===a.push({name:e,payload:{key:t._guidKey,id:t._id,eventName:e,detail:t._result,childId:r&&r._id,label:t._label,timeStamp:Date.now(),error:i["instrument-with-stack"]?new Error(t._label):null}})&&setTimeout(()=>{for(var e=0;e<a.length;e++){var t=a[e],r=t.payload
+r.guid=r.key+r.id,r.childGuid=r.key+r.childId,r.error&&(r.stack=r.error.stack),i.trigger(t.name,t.payload)}a.length=0},50)}function l(e,t){if(e&&"object"==typeof e&&e.constructor===this)return e
+var r=new this(u,t)
+return d(r,e),r}function u(){}function c(e,t,r){t.constructor===e.constructor&&r===b&&e.constructor.resolve===l?function(e,t){1===t._state?f(e,t._result):2===t._state?(t._onError=null,p(e,t._result)):m(t,void 0,r=>{t===r?f(e,r):d(e,r)},t=>p(e,t))}(e,t):"function"==typeof r?function(e,t,r){i.async(e=>{var n=!1,i=function(e,t,r,n){try{e.call(t,r,n)}catch(i){return i}}(r,t,r=>{n||(n=!0,t===r?f(e,r):d(e,r))},t=>{n||(n=!0,p(e,t))},e._label)
+!n&&i&&(n=!0,p(e,i))},e)}(e,t,r):f(e,t)}function d(e,t){if(e===t)f(e,t)
+else if(i=typeof(n=t),null===n||"object"!==i&&"function"!==i)f(e,t)
+else{var r
+try{r=t.then}catch(o){return void p(e,o)}c(e,t,r)}var n,i}function h(e){e._onError&&e._onError(e._result),v(e)}function f(e,t){void 0===e._state&&(e._result=t,e._state=1,0===e._subscribers.length?i.instrument&&s("fulfilled",e):i.async(v,e))}function p(e,t){void 0===e._state&&(e._state=2,e._result=t,i.async(h,e))}function m(e,t,r,n){var o=e._subscribers,a=o.length
+e._onError=null,o[a]=t,o[a+1]=r,o[a+2]=n,0===a&&e._state&&i.async(v,e)}function v(e){var t=e._subscribers,r=e._state
+if(i.instrument&&s(1===r?"fulfilled":"rejected",e),0!==t.length){for(var n,o,a=e._result,l=0;l<t.length;l+=3)n=t[l],o=t[l+r],n?g(r,n,o,a):o(a)
+e._subscribers.length=0}}function g(e,t,r,n){var i,o,a="function"==typeof r,s=!0
+if(a)try{i=r(n)}catch(l){s=!1,o=l}else i=n
+void 0!==t._state||(i===t?p(t,new TypeError("A promises callback cannot return that same promise.")):!1===s?p(t,o):a?d(t,i):1===e?f(t,i):2===e&&p(t,i))}function b(e,t,r){var n=this._state
+if(1===n&&!e||2===n&&!t)return i.instrument&&s("chained",this,this),this
+this._onError=null
+var o=new this.constructor(u,r),a=this._result
+if(i.instrument&&s("chained",this,o),void 0===n)m(this,o,e,t)
+else{var l=1===n?e:t
+i.async(()=>g(n,o,l,a))}return o}class y{constructor(e,t,r,n){this._instanceConstructor=e,this.promise=new e(u,n),this._abortOnReject=r,this._isUsingOwnPromise=e===x,this._isUsingOwnResolve=e.resolve===l,this._init(...arguments)}_init(e,t){var r=t.length||0
+this.length=r,this._remaining=r,this._result=new Array(r),this._enumerate(t)}_enumerate(e){for(var t=this.length,r=this.promise,n=0;void 0===r._state&&n<t;n++)this._eachEntry(e[n],n,!0)
+this._checkFullfillment()}_checkFullfillment(){if(0===this._remaining){var e=this._result
+f(this.promise,e),this._result=null}}_settleMaybeThenable(e,t,r){var n=this._instanceConstructor
+if(this._isUsingOwnResolve){var i,o,a=!0
+try{i=e.then}catch(l){a=!1,o=l}if(i===b&&void 0!==e._state)e._onError=null,this._settledAt(e._state,t,e._result,r)
+else if("function"!=typeof i)this._settledAt(1,t,e,r)
+else if(this._isUsingOwnPromise){var s=new n(u)
+!1===a?p(s,o):(c(s,e,i),this._willSettleAt(s,t,r))}else this._willSettleAt(new n(t=>t(e)),t,r)}else this._willSettleAt(n.resolve(e),t,r)}_eachEntry(e,t,r){null!==e&&"object"==typeof e?this._settleMaybeThenable(e,t,r):this._setResultAt(1,t,e,r)}_settledAt(e,t,r,n){var i=this.promise
+void 0===i._state&&(this._abortOnReject&&2===e?p(i,r):(this._setResultAt(e,t,r,n),this._checkFullfillment()))}_setResultAt(e,t,r,n){this._remaining--,this._result[t]=r}_willSettleAt(e,t,r){m(e,void 0,e=>this._settledAt(1,t,e,r),e=>this._settledAt(2,t,e,r))}}function _(e,t,r){this._remaining--,this._result[t]=1===e?{state:"fulfilled",value:r}:{state:"rejected",reason:r}}var w="rsvp_"+Date.now()+"-",E=0
+class x{constructor(e,t){this._id=E++,this._label=t,this._state=void 0,this._result=void 0,this._subscribers=[],i.instrument&&s("created",this),u!==e&&("function"!=typeof e&&function(){throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")}(),this instanceof x?function(e,t){var r=!1
+try{t(t=>{r||(r=!0,d(e,t))},t=>{r||(r=!0,p(e,t))})}catch(n){p(e,n)}}(this,e):function(){throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")}())}_onError(e){i.after(()=>{this._onError&&i.trigger("error",e,this._label)})}catch(e,t){return this.then(void 0,e,t)}finally(e,t){var r=this.constructor
+return"function"==typeof e?this.then(t=>r.resolve(e()).then(()=>t),t=>r.resolve(e()).then(()=>{throw t})):this.then(e,e)}}function O(e,t){for(var r={},n=e.length,i=new Array(n),o=0;o<n;o++)i[o]=e[o]
+for(var a=0;a<t.length;a++){r[t[a]]=i[a+1]}return r}function S(e){for(var t=e.length,r=new Array(t-1),n=1;n<t;n++)r[n-1]=e[n]
+return r}function T(e,t){return{then:(r,n)=>e.call(t,r,n)}}function M(e,t){var r=function(){for(var r=arguments.length,n=new Array(r+1),i=!1,o=0;o<r;++o){var a=arguments[o]
+if(!i){if(null!==a&&"object"==typeof a)if(a.constructor===x)i=!0
+else try{i=a.then}catch(c){var s=new x(u)
+return p(s,c),s}else i=!1
+i&&!0!==i&&(a=T(i,a))}n[o]=a}var l=new x(u)
+return n[r]=function(e,r){e?p(l,e):void 0===t?d(l,r):!0===t?d(l,S(arguments)):Array.isArray(t)?d(l,O(arguments,t)):d(l,r)},i?P(l,n,e,this):A(l,n,e,this)}
+return r.__proto__=e,r}function A(e,t,r,n){try{r.apply(n,t)}catch(i){p(e,i)}return e}function P(e,t,r,n){return x.all(t).then(t=>A(e,t,r,n))}function C(e,t){return x.all(e,t)}e.Promise=x,x.cast=l,x.all=function(e,t){return Array.isArray(e)?new y(this,e,!0,t).promise:this.reject(new TypeError("Promise.all must be called with an array"),t)},x.race=function(e,t){var r=new this(u,t)
+if(!Array.isArray(e))return p(r,new TypeError("Promise.race must be called with an array")),r
+for(var n=0;void 0===r._state&&n<e.length;n++)m(this.resolve(e[n]),void 0,e=>d(r,e),e=>p(r,e))
+return r},x.resolve=l,x.reject=function(e,t){var r=new this(u,t)
+return p(r,e),r},x.prototype._guidKey=w,x.prototype.then=b
+class k extends y{constructor(e,t,r){super(e,t,!1,r)}}function R(e,t){return Array.isArray(e)?new k(x,e,t).promise:x.reject(new TypeError("Promise.allSettled must be called with an array"),t)}function j(e,t){return x.race(e,t)}k.prototype._setResultAt=_
+class D extends y{constructor(e,t,r=!0,n){super(e,t,r,n)}_init(e,t){this._result={},this._enumerate(t)}_enumerate(e){var t,r,n=Object.keys(e),i=n.length,o=this.promise
+this._remaining=i
+for(var a=0;void 0===o._state&&a<i;a++)r=e[t=n[a]],this._eachEntry(r,t,!0)
+this._checkFullfillment()}}function N(e,t){return x.resolve(e,t).then((function(e){if(null===e||"object"!=typeof e)throw new TypeError("Promise.hash must be called with an object")
+return new D(x,e,t).promise}))}class I extends D{constructor(e,t,r){super(e,t,!1,r)}}function L(e,t){return x.resolve(e,t).then((function(e){if(null===e||"object"!=typeof e)throw new TypeError("hashSettled must be called with an object")
+return new I(x,e,!1,t).promise}))}function F(e){throw setTimeout(()=>{throw e}),e}function z(e){var t={resolve:void 0,reject:void 0}
+return t.promise=new x((e,r)=>{t.resolve=e,t.reject=r},e),t}I.prototype._setResultAt=_
+class U extends y{constructor(e,t,r,n){super(e,t,!0,n,r)}_init(e,t,r,n,i){var o=t.length||0
+this.length=o,this._remaining=o,this._result=new Array(o),this._mapFn=i,this._enumerate(t)}_setResultAt(e,t,r,n){if(n)try{this._eachEntry(this._mapFn(r,t),t,!1)}catch(i){this._settledAt(2,t,i,!1)}else this._remaining--,this._result[t]=r}}function H(e,t,r){return"function"!=typeof t?x.reject(new TypeError("map expects a function as a second argument"),r):x.resolve(e,r).then((function(e){if(!Array.isArray(e))throw new TypeError("map must be called with an array")
+return new U(x,e,t,r).promise}))}function B(e,t){return x.resolve(e,t)}function V(e,t){return x.reject(e,t)}var $={}
+class q extends U{_checkFullfillment(){if(0===this._remaining&&null!==this._result){var e=this._result.filter(e=>e!==$)
+f(this.promise,e),this._result=null}}_setResultAt(e,t,r,n){if(n){this._result[t]=r
+var i,o=!0
+try{i=this._mapFn(r,t)}catch(a){o=!1,this._settledAt(2,t,a,!1)}o&&this._eachEntry(i,t,!1)}else this._remaining--,r||(this._result[t]=$)}}function W(e,t,r){return"function"!=typeof t?x.reject(new TypeError("filter expects function as a second argument"),r):x.resolve(e,r).then((function(e){if(!Array.isArray(e))throw new TypeError("filter must be called with an array")
+return new q(x,e,t,r).promise}))}var G,Y=0
+function K(e,t){ue[Y]=e,ue[Y+1]=t,2===(Y+=2)&&re()}var J="undefined"!=typeof window?window:void 0,Q=J||{},X=Q.MutationObserver||Q.WebKitMutationObserver,Z="undefined"==typeof self&&"undefined"!=typeof process&&"[object process]"==={}.toString.call(process),ee="undefined"!=typeof Uint8ClampedArray&&"undefined"!=typeof importScripts&&"undefined"!=typeof MessageChannel
+function te(){return()=>setTimeout(ce,1)}var re,ne,ie,oe,ae,se,le,ue=new Array(1e3)
+function ce(){for(var e=0;e<Y;e+=2){(0,ue[e])(ue[e+1]),ue[e]=void 0,ue[e+1]=void 0}Y=0}Z?(se=process.nextTick,le=process.versions.node.match(/^(?:(\d+)\.)?(?:(\d+)\.)?(\*|\d+)$/),Array.isArray(le)&&"0"===le[1]&&"10"===le[2]&&(se=setImmediate),re=()=>se(ce)):X?(ie=0,oe=new X(ce),ae=document.createTextNode(""),oe.observe(ae,{characterData:!0}),re=()=>ae.data=ie=++ie%2):ee?((ne=new MessageChannel).port1.onmessage=ce,re=()=>ne.port2.postMessage(0)):re=void 0===J&&"function"==typeof t?function(){try{var e=Function("return this")().require("vertx")
+return void 0!==(G=e.runOnLoop||e.runOnContext)?function(){G(ce)}:te()}catch(t){return te()}}():te(),i.async=K,i.after=e=>setTimeout(e,0)
+var de=B
+e.cast=de
+var he=(e,t)=>i.async(e,t)
+function fe(){i.on(...arguments)}function pe(){i.off(...arguments)}if(e.async=he,"undefined"!=typeof window&&"object"==typeof window.__PROMISE_INSTRUMENTATION__){var me=window.__PROMISE_INSTRUMENTATION__
+for(var ve in o("instrument",!0),me)me.hasOwnProperty(ve)&&fe(ve,me[ve])}var ge={asap:K,cast:de,Promise:x,EventTarget:n,all:C,allSettled:R,race:j,hash:N,hashSettled:L,rethrow:F,defer:z,denodeify:M,configure:o,on:fe,off:pe,resolve:B,reject:V,map:H,async:he,filter:W}
+e.default=ge})),t("ember")}(),(()=>{"use strict"
+{const e=Ember.__loader.require("@glimmer/runtime")
+Ember._registerDestructor=e.registerDestructor,Ember._unregisterDestructor=e.unregisterDestructor,Ember._associateDestroyableChild=e.associateDestroyableChild,Ember._isDestroying=e.isDestroying,Ember._isDestroyed=e.isDestroyed,Ember._assertDestroyablesDestroyed=e.assertDestroyablesDestroyed,Ember._enableDestroyableTracking=e.enableDestroyableTracking}})(),function(e){if("object"==typeof exports&&"object"==typeof module)module.exports=e()
+else{if("function"==typeof define&&define.amd)return define([],e);(this||window).CodeMirror=e()}}((function(){"use strict"
+var e=navigator.userAgent,t=navigator.platform,r=/gecko\/\d/i.test(e),n=/MSIE \d/.test(e),i=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(e),o=n||i,a=o&&(n?document.documentMode||6:i[1]),s=/WebKit\//.test(e),l=s&&/Qt\/\d+\.\d+/.test(e),u=/Chrome\//.test(e),c=/Opera\//.test(e),d=/Apple Computer/.test(navigator.vendor),h=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(e),f=/PhantomJS/.test(e),p=/AppleWebKit/.test(e)&&/Mobile\/\w+/.test(e),m=p||/Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(e),v=p||/Mac/.test(t),g=/\bCrOS\b/.test(e),b=/win/i.test(t),y=c&&e.match(/Version\/(\d*\.\d*)/)
+y&&(y=Number(y[1])),y&&y>=15&&(c=!1,s=!0)
+var _=v&&(l||c&&(null==y||y<12.11)),w=r||o&&a>=9,E=!1,x=!1
+function O(e,t){if(!(this instanceof O))return new O(e,t)
+this.options=t=t?Eo(t):{},Eo(Xr,t,!1),I(t)
+var r=t.value
+"string"==typeof r&&(r=new gi(r,t.mode,null,t.lineSeparator)),this.doc=r
+var n=new O.inputStyles[t.inputStyle](this),i=this.display=new S(e,r,n)
+i.wrapper.CodeMirror=this,R(this),C(this),t.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap"),t.autofocus&&!m&&i.input.focus(),U(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,delayingBlurEvent:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,selectingText:!1,draggingText:!1,highlight:new co,keySeq:null,specialChars:null}
+var l=this
+for(var u in o&&a<11&&setTimeout((function(){l.display.input.reset(!0)}),20),function(e){var t=e.display
+Gi(t.scroller,"mousedown",Kt(e,ur)),Gi(t.scroller,"dblclick",o&&a<11?Kt(e,(function(t){if(!to(e,t)){var r=lr(e,t)
+if(r&&!dr(e,t)&&!sr(e.display,t)){Hi(t)
+var n=e.findWordAt(r)
+He(e.doc,n.anchor,n.head)}}})):function(t){to(e,t)||Hi(t)})
+w||Gi(t.scroller,"contextmenu",(function(t){kr(e,t)}))
+var r,n={end:0}
+function i(){t.activeTouch&&(r=setTimeout((function(){t.activeTouch=null}),1e3),(n=t.activeTouch).end=+new Date)}function s(e,t){if(null==t.left)return!0
+var r=t.left-e.left,n=t.top-e.top
+return r*r+n*n>400}Gi(t.scroller,"touchstart",(function(i){if(!to(e,i)&&!function(e){if(1!=e.touches.length)return!1
+var t=e.touches[0]
+return t.radiusX<=1&&t.radiusY<=1}(i)){clearTimeout(r)
+var o=+new Date
+t.activeTouch={start:o,moved:!1,prev:o-n.end<=300?n:null},1==i.touches.length&&(t.activeTouch.left=i.touches[0].pageX,t.activeTouch.top=i.touches[0].pageY)}})),Gi(t.scroller,"touchmove",(function(){t.activeTouch&&(t.activeTouch.moved=!0)})),Gi(t.scroller,"touchend",(function(r){var n=t.activeTouch
+if(n&&!sr(t,r)&&null!=n.left&&!n.moved&&new Date-n.start<300){var o,a=e.coordsChar(t.activeTouch,"page")
+o=!n.prev||s(n,n.prev)?new je(a,a):!n.prev.prev||s(n,n.prev.prev)?e.findWordAt(a):new je(fe(a.line,0),Le(e.doc,fe(a.line+1,0))),e.setSelection(o.anchor,o.head),e.focus(),Hi(r)}i()})),Gi(t.scroller,"touchcancel",i),Gi(t.scroller,"scroll",(function(){t.scroller.clientHeight&&(mr(e,t.scroller.scrollTop),vr(e,t.scroller.scrollLeft,!0),Qi(e,"scroll",e))})),Gi(t.scroller,"mousewheel",(function(t){_r(e,t)})),Gi(t.scroller,"DOMMouseScroll",(function(t){_r(e,t)})),Gi(t.wrapper,"scroll",(function(){t.wrapper.scrollTop=t.wrapper.scrollLeft=0})),t.dragFunctions={enter:function(t){to(e,t)||$i(t)},over:function(t){to(e,t)||(function(e,t){var r=lr(e,t)
+if(!r)return
+var n=document.createDocumentFragment()
+rt(e,r,n),e.display.dragCursor||(e.display.dragCursor=ko("div",null,"CodeMirror-cursors CodeMirror-dragcursors"),e.display.lineSpace.insertBefore(e.display.dragCursor,e.display.cursorDiv))
+jo(e.display.dragCursor,n)}(e,t),$i(t))},start:function(t){(function(e,t){if(o&&(!e.state.draggingText||+new Date-hr<100))return void $i(t)
+if(to(e,t)||sr(e.display,t))return
+if(t.dataTransfer.setData("Text",e.getSelection()),t.dataTransfer.effectAllowed="copyMove",t.dataTransfer.setDragImage&&!d){var r=ko("img",null,null,"position: fixed; left: 0; top: 0;")
+r.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",c&&(r.width=r.height=1,e.display.wrapper.appendChild(r),r._top=r.offsetTop),t.dataTransfer.setDragImage(r,0,0),c&&r.parentNode.removeChild(r)}})(e,t)},drop:Kt(e,fr),leave:function(t){to(e,t)||pr(e)}}
+var l=t.input.getField()
+Gi(l,"keyup",(function(t){Mr.call(e,t)})),Gi(l,"keydown",Kt(e,Tr)),Gi(l,"keypress",Kt(e,Ar)),Gi(l,"focus",xo(Pr,e)),Gi(l,"blur",xo(Cr,e))}(this),function(){if(Ho)return
+Gi(window,"resize",(function(){null==e&&(e=setTimeout((function(){e=null,Uo(ar)}),100))})),Gi(window,"blur",(function(){Uo(Cr)})),Ho=!0
+var e}(),Ht(this),this.curOp.forceUpdate=!0,wi(this,r),t.autofocus&&!m||l.hasFocus()?setTimeout(xo(Pr,this),20):Cr(this),Zr)Zr.hasOwnProperty(u)&&Zr[u](this,t[u],tn)
+q(this),t.finishInit&&t.finishInit(this)
+for(var h=0;h<an.length;++h)an[h](this)
+Bt(this),s&&t.lineWrapping&&"optimizelegibility"==getComputedStyle(i.lineDiv).textRendering&&(i.lineDiv.style.textRendering="auto")}function S(e,t,n){var i=this
+this.input=n,i.scrollbarFiller=ko("div",null,"CodeMirror-scrollbar-filler"),i.scrollbarFiller.setAttribute("cm-not-content","true"),i.gutterFiller=ko("div",null,"CodeMirror-gutter-filler"),i.gutterFiller.setAttribute("cm-not-content","true"),i.lineDiv=ko("div",null,"CodeMirror-code"),i.selectionDiv=ko("div",null,null,"position: relative; z-index: 1"),i.cursorDiv=ko("div",null,"CodeMirror-cursors"),i.measure=ko("div",null,"CodeMirror-measure"),i.lineMeasure=ko("div",null,"CodeMirror-measure"),i.lineSpace=ko("div",[i.measure,i.lineMeasure,i.selectionDiv,i.cursorDiv,i.lineDiv],null,"position: relative; outline: none"),i.mover=ko("div",[ko("div",[i.lineSpace],"CodeMirror-lines")],null,"position: relative"),i.sizer=ko("div",[i.mover],"CodeMirror-sizer"),i.sizerWidth=null,i.heightForcer=ko("div",null,null,"position: absolute; height: "+oo+"px; width: 1px;"),i.gutters=ko("div",null,"CodeMirror-gutters"),i.lineGutter=null,i.scroller=ko("div",[i.sizer,i.heightForcer,i.gutters],"CodeMirror-scroll"),i.scroller.setAttribute("tabIndex","-1"),i.wrapper=ko("div",[i.scrollbarFiller,i.gutterFiller,i.scroller],"CodeMirror"),o&&a<8&&(i.gutters.style.zIndex=-1,i.scroller.style.paddingRight=0),s||r&&m||(i.scroller.draggable=!0),e&&(e.appendChild?e.appendChild(i.wrapper):e(i.wrapper)),i.viewFrom=i.viewTo=t.first,i.reportedViewFrom=i.reportedViewTo=t.first,i.view=[],i.renderedView=null,i.externalMeasured=null,i.viewOffset=0,i.lastWrapHeight=i.lastWrapWidth=0
+i.updateLineNumbers=null,i.nativeBarWidth=i.barHeight=i.barWidth=0,i.scrollbarsClipped=!1,i.lineNumWidth=i.lineNumInnerWidth=i.lineNumChars=null,i.alignWidgets=!1,i.cachedCharWidth=i.cachedTextHeight=i.cachedPaddingH=null,i.maxLine=null,i.maxLineLength=0,i.maxLineChanged=!1,i.wheelDX=i.wheelDY=i.wheelStartX=i.wheelStartY=null,i.shift=!1,i.selForContextMenu=null,i.activeTouch=null,n.init(i)}function T(e){e.doc.mode=O.getMode(e.options,e.doc.modeOption),M(e)}function M(e){e.doc.iter((function(e){e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null)})),e.doc.frontier=e.doc.first,ot(e,100),e.state.modeGen++,e.curOp&&er(e)}function A(e){var t=Nt(e.display),r=e.options.lineWrapping,n=r&&Math.max(5,e.display.scroller.clientWidth/It(e.display)-3)
+return function(i){if(Bn(e.doc,i))return 0
+var o=0
+if(i.widgets)for(var a=0;a<i.widgets.length;a++)i.widgets[a].height&&(o+=i.widgets[a].height)
+return r?o+(Math.ceil(i.text.length/n)||1)*t:o+t}}function P(e){var t=e.doc,r=A(e)
+t.iter((function(e){var t=r(e)
+t!=e.height&&Si(e,t)}))}function C(e){e.display.wrapper.className=e.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+e.options.theme.replace(/(^|\s)\s*/g," cm-s-"),Ot(e)}function k(e){R(e),er(e),setTimeout((function(){$(e)}),20)}function R(e){var t=e.display.gutters,r=e.options.gutters
+Ro(t)
+for(var n=0;n<r.length;++n){var i=r[n],o=t.appendChild(ko("div",null,"CodeMirror-gutter "+i))
+"CodeMirror-linenumbers"==i&&(e.display.lineGutter=o,o.style.width=(e.display.lineNumWidth||1)+"px")}t.style.display=n?"":"none",j(e)}function j(e){var t=e.display.gutters.offsetWidth
+e.display.sizer.style.marginLeft=t+"px"}function D(e){if(0==e.height)return 0
+for(var t,r=e.text.length,n=e;t=In(n);){n=(i=t.find(0,!0)).from.line,r+=i.from.ch-i.to.ch}for(n=e;t=Ln(n);){var i=t.find(0,!0)
+r-=n.text.length-i.from.ch,r+=(n=i.to.line).text.length-i.to.ch}return r}function N(e){var t=e.display,r=e.doc
+t.maxLine=Ei(r,r.first),t.maxLineLength=D(t.maxLine),t.maxLineChanged=!0,r.iter((function(e){var r=D(e)
+r>t.maxLineLength&&(t.maxLineLength=r,t.maxLine=e)}))}function I(e){var t=bo(e.gutters,"CodeMirror-linenumbers");-1==t&&e.lineNumbers?e.gutters=e.gutters.concat(["CodeMirror-linenumbers"]):t>-1&&!e.lineNumbers&&(e.gutters=e.gutters.slice(0),e.gutters.splice(t,1))}function L(e){var t=e.display,r=t.gutters.offsetWidth,n=Math.round(e.doc.height+ut(e.display))
+return{clientHeight:t.scroller.clientHeight,viewHeight:t.wrapper.clientHeight,scrollWidth:t.scroller.scrollWidth,clientWidth:t.scroller.clientWidth,viewWidth:t.wrapper.clientWidth,barLeft:e.options.fixedGutter?r:0,docHeight:n,scrollHeight:n+dt(e)+t.barHeight,nativeBarWidth:t.nativeBarWidth,gutterWidth:r}}function F(e,t,r){this.cm=r
+var n=this.vert=ko("div",[ko("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar"),i=this.horiz=ko("div",[ko("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar")
+e(n),e(i),Gi(n,"scroll",(function(){n.clientHeight&&t(n.scrollTop,"vertical")})),Gi(i,"scroll",(function(){i.clientWidth&&t(i.scrollLeft,"horizontal")})),this.checkedZeroWidth=!1,o&&a<8&&(this.horiz.style.minHeight=this.vert.style.minWidth="18px")}function z(){}function U(e){e.display.scrollbars&&(e.display.scrollbars.clear(),e.display.scrollbars.addClass&&Lo(e.display.wrapper,e.display.scrollbars.addClass)),e.display.scrollbars=new O.scrollbarModel[e.options.scrollbarStyle]((function(t){e.display.wrapper.insertBefore(t,e.display.scrollbarFiller),Gi(t,"mousedown",(function(){e.state.focused&&setTimeout((function(){e.display.input.focus()}),0)})),t.setAttribute("cm-not-content","true")}),(function(t,r){"horizontal"==r?vr(e,t):mr(e,t)}),e),e.display.scrollbars.addClass&&Fo(e.display.wrapper,e.display.scrollbars.addClass)}function H(e,t){t||(t=L(e))
+var r=e.display.barWidth,n=e.display.barHeight
+B(e,t)
+for(var i=0;i<4&&r!=e.display.barWidth||n!=e.display.barHeight;i++)r!=e.display.barWidth&&e.options.lineWrapping&&Z(e),B(e,L(e)),r=e.display.barWidth,n=e.display.barHeight}function B(e,t){var r=e.display,n=r.scrollbars.update(t)
+r.sizer.style.paddingRight=(r.barWidth=n.right)+"px",r.sizer.style.paddingBottom=(r.barHeight=n.bottom)+"px",r.heightForcer.style.borderBottom=n.bottom+"px solid transparent",n.right&&n.bottom?(r.scrollbarFiller.style.display="block",r.scrollbarFiller.style.height=n.bottom+"px",r.scrollbarFiller.style.width=n.right+"px"):r.scrollbarFiller.style.display="",n.bottom&&e.options.coverGutterNextToScrollbar&&e.options.fixedGutter?(r.gutterFiller.style.display="block",r.gutterFiller.style.height=n.bottom+"px",r.gutterFiller.style.width=t.gutterWidth+"px"):r.gutterFiller.style.display=""}function V(e,t,r){var n=r&&null!=r.top?Math.max(0,r.top):e.scroller.scrollTop
+n=Math.floor(n-lt(e))
+var i=r&&null!=r.bottom?r.bottom:n+e.wrapper.clientHeight,o=Mi(t,n),a=Mi(t,i)
+if(r&&r.ensure){var s=r.ensure.from.line,l=r.ensure.to.line
+s<o?(o=s,a=Mi(t,Ai(Ei(t,s))+e.wrapper.clientHeight)):Math.min(l,t.lastLine())>=a&&(o=Mi(t,Ai(Ei(t,l))-e.wrapper.clientHeight),a=l)}return{from:o,to:Math.max(a,o+1)}}function $(e){var t=e.display,r=t.view
+if(t.alignWidgets||t.gutters.firstChild&&e.options.fixedGutter){for(var n=G(t)-t.scroller.scrollLeft+e.doc.scrollLeft,i=t.gutters.offsetWidth,o=n+"px",a=0;a<r.length;a++)if(!r[a].hidden){e.options.fixedGutter&&r[a].gutter&&(r[a].gutter.style.left=o)
+var s=r[a].alignable
+if(s)for(var l=0;l<s.length;l++)s[l].style.left=o}e.options.fixedGutter&&(t.gutters.style.left=n+i+"px")}}function q(e){if(!e.options.lineNumbers)return!1
+var t=e.doc,r=W(e.options,t.first+t.size-1),n=e.display
+if(r.length!=n.lineNumChars){var i=n.measure.appendChild(ko("div",[ko("div",r)],"CodeMirror-linenumber CodeMirror-gutter-elt")),o=i.firstChild.offsetWidth,a=i.offsetWidth-o
+return n.lineGutter.style.width="",n.lineNumInnerWidth=Math.max(o,n.lineGutter.offsetWidth-a)+1,n.lineNumWidth=n.lineNumInnerWidth+a,n.lineNumChars=n.lineNumInnerWidth?r.length:-1,n.lineGutter.style.width=n.lineNumWidth+"px",j(e),!0}return!1}function W(e,t){return String(e.lineNumberFormatter(t+e.firstLineNumber))}function G(e){return e.scroller.getBoundingClientRect().left-e.sizer.getBoundingClientRect().left}function Y(e,t,r){var n=e.display
+this.viewport=t,this.visible=V(n,e.doc,t),this.editorIsHidden=!n.wrapper.offsetWidth,this.wrapperHeight=n.wrapper.clientHeight,this.wrapperWidth=n.wrapper.clientWidth,this.oldDisplayWidth=ht(e),this.force=r,this.dims=te(e),this.events=[]}function K(e,t){var r=e.display,n=e.doc
+if(t.editorIsHidden)return rr(e),!1
+if(!t.force&&t.visible.from>=r.viewFrom&&t.visible.to<=r.viewTo&&(null==r.updateLineNumbers||r.updateLineNumbers>=r.viewTo)&&r.renderedView==r.view&&0==or(e))return!1
+q(e)&&(rr(e),t.dims=te(e))
+var i=n.first+n.size,o=Math.max(t.visible.from-e.options.viewportMargin,n.first),a=Math.min(i,t.visible.to+e.options.viewportMargin)
+r.viewFrom<o&&o-r.viewFrom<20&&(o=Math.max(n.first,r.viewFrom)),r.viewTo>a&&r.viewTo-a<20&&(a=Math.min(i,r.viewTo)),x&&(o=Un(e.doc,o),a=Hn(e.doc,a))
+var l=o!=r.viewFrom||a!=r.viewTo||r.lastWrapHeight!=t.wrapperHeight||r.lastWrapWidth!=t.wrapperWidth;(function(e,t,r){var n=e.display
+0==n.view.length||t>=n.viewTo||r<=n.viewFrom?(n.view=Zt(e,t,r),n.viewFrom=t):(n.viewFrom>t?n.view=Zt(e,t,n.viewFrom).concat(n.view):n.viewFrom<t&&(n.view=n.view.slice(nr(e,t))),n.viewFrom=t,n.viewTo<r?n.view=n.view.concat(Zt(e,n.viewTo,r)):n.viewTo>r&&(n.view=n.view.slice(0,nr(e,r))))
+n.viewTo=r})(e,o,a),r.viewOffset=Ai(Ei(e.doc,r.viewFrom)),e.display.mover.style.top=r.viewOffset+"px"
+var u=or(e)
+if(!l&&0==u&&!t.force&&r.renderedView==r.view&&(null==r.updateLineNumbers||r.updateLineNumbers>=r.viewTo))return!1
+var c=No()
+return u>4&&(r.lineDiv.style.display="none"),function(e,t,r){var n=e.display,i=e.options.lineNumbers,o=n.lineDiv,a=o.firstChild
+function l(t){var r=t.nextSibling
+return s&&v&&e.display.currentWheelTarget==t?t.style.display="none":t.parentNode.removeChild(t),r}for(var u=n.view,c=n.viewFrom,d=0;d<u.length;d++){var h=u[d]
+if(h.hidden);else if(h.node&&h.node.parentNode==o){for(;a!=h.node;)a=l(a)
+var f=i&&null!=t&&t<=c&&h.lineNumber
+h.changes&&(bo(h.changes,"gutter")>-1&&(f=!1),re(e,h,c,r)),f&&(Ro(h.lineNumber),h.lineNumber.appendChild(document.createTextNode(W(e.options,c)))),a=h.node.nextSibling}else{var p=ue(e,h,c,r)
+o.insertBefore(p,a)}c+=h.size}for(;a;)a=l(a)}(e,r.updateLineNumbers,t.dims),u>4&&(r.lineDiv.style.display=""),r.renderedView=r.view,c&&No()!=c&&c.offsetHeight&&c.focus(),Ro(r.cursorDiv),Ro(r.selectionDiv),r.gutters.style.height=r.sizer.style.minHeight=0,l&&(r.lastWrapHeight=t.wrapperHeight,r.lastWrapWidth=t.wrapperWidth,ot(e,400)),r.updateLineNumbers=null,!0}function J(e,t){for(var r=t.viewport,n=!0;(n&&e.options.lineWrapping&&t.oldDisplayWidth!=ht(e)||(r&&null!=r.top&&(r={top:Math.min(e.doc.height+ut(e.display)-ft(e),r.top)}),t.visible=V(e.display,e.doc,r),!(t.visible.from>=e.display.viewFrom&&t.visible.to<=e.display.viewTo)))&&K(e,t);n=!1){Z(e)
+var i=L(e)
+et(e),H(e,i),X(e,i)}t.signal(e,"update",e),e.display.viewFrom==e.display.reportedViewFrom&&e.display.viewTo==e.display.reportedViewTo||(t.signal(e,"viewportChange",e,e.display.viewFrom,e.display.viewTo),e.display.reportedViewFrom=e.display.viewFrom,e.display.reportedViewTo=e.display.viewTo)}function Q(e,t){var r=new Y(e,t)
+if(K(e,r)){Z(e),J(e,r)
+var n=L(e)
+et(e),H(e,n),X(e,n),r.finish()}}function X(e,t){e.display.sizer.style.minHeight=t.docHeight+"px",e.display.heightForcer.style.top=t.docHeight+"px",e.display.gutters.style.height=t.docHeight+e.display.barHeight+dt(e)+"px"}function Z(e){for(var t=e.display,r=t.lineDiv.offsetTop,n=0;n<t.view.length;n++){var i,s=t.view[n]
+if(!s.hidden){if(o&&a<8){var l=s.node.offsetTop+s.node.offsetHeight
+i=l-r,r=l}else{var u=s.node.getBoundingClientRect()
+i=u.bottom-u.top}var c=s.line.height-i
+if(i<2&&(i=Nt(t)),(c>.001||c<-.001)&&(Si(s.line,i),ee(s.line),s.rest))for(var d=0;d<s.rest.length;d++)ee(s.rest[d])}}}function ee(e){if(e.widgets)for(var t=0;t<e.widgets.length;++t)e.widgets[t].height=e.widgets[t].node.parentNode.offsetHeight}function te(e){for(var t=e.display,r={},n={},i=t.gutters.clientLeft,o=t.gutters.firstChild,a=0;o;o=o.nextSibling,++a)r[e.options.gutters[a]]=o.offsetLeft+o.clientLeft+i,n[e.options.gutters[a]]=o.clientWidth
+return{fixedPos:G(t),gutterTotalWidth:t.gutters.offsetWidth,gutterLeft:r,gutterWidth:n,wrapperWidth:t.wrapper.clientWidth}}function re(e,t,r,n){for(var i=0;i<t.changes.length;i++){var o=t.changes[i]
+"text"==o?oe(e,t):"gutter"==o?se(e,t,r,n):"class"==o?ae(t):"widget"==o&&le(e,t,n)}t.changes=null}function ne(e){return e.node==e.text&&(e.node=ko("div",null,null,"position: relative"),e.text.parentNode&&e.text.parentNode.replaceChild(e.node,e.text),e.node.appendChild(e.text),o&&a<8&&(e.node.style.zIndex=2)),e.node}function ie(e,t){var r=e.display.externalMeasured
+return r&&r.line==t.line?(e.display.externalMeasured=null,t.measure=r.measure,r.built):ai(e,t)}function oe(e,t){var r=t.text.className,n=ie(e,t)
+t.text==t.node&&(t.node=n.pre),t.text.parentNode.replaceChild(n.pre,t.text),t.text=n.pre,n.bgClass!=t.bgClass||n.textClass!=t.textClass?(t.bgClass=n.bgClass,t.textClass=n.textClass,ae(t)):r&&(t.text.className=r)}function ae(e){(function(e){var t=e.bgClass?e.bgClass+" "+(e.line.bgClass||""):e.line.bgClass
+if(t&&(t+=" CodeMirror-linebackground"),e.background)t?e.background.className=t:(e.background.parentNode.removeChild(e.background),e.background=null)
+else if(t){var r=ne(e)
+e.background=r.insertBefore(ko("div",null,t),r.firstChild)}})(e),e.line.wrapClass?ne(e).className=e.line.wrapClass:e.node!=e.text&&(e.node.className="")
+var t=e.textClass?e.textClass+" "+(e.line.textClass||""):e.line.textClass
+e.text.className=t||""}function se(e,t,r,n){if(t.gutter&&(t.node.removeChild(t.gutter),t.gutter=null),t.gutterBackground&&(t.node.removeChild(t.gutterBackground),t.gutterBackground=null),t.line.gutterClass){var i=ne(t)
+t.gutterBackground=ko("div",null,"CodeMirror-gutter-background "+t.line.gutterClass,"left: "+(e.options.fixedGutter?n.fixedPos:-n.gutterTotalWidth)+"px; width: "+n.gutterTotalWidth+"px"),i.insertBefore(t.gutterBackground,t.text)}var o=t.line.gutterMarkers
+if(e.options.lineNumbers||o){i=ne(t)
+var a=t.gutter=ko("div",null,"CodeMirror-gutter-wrapper","left: "+(e.options.fixedGutter?n.fixedPos:-n.gutterTotalWidth)+"px")
+if(e.display.input.setUneditable(a),i.insertBefore(a,t.text),t.line.gutterClass&&(a.className+=" "+t.line.gutterClass),!e.options.lineNumbers||o&&o["CodeMirror-linenumbers"]||(t.lineNumber=a.appendChild(ko("div",W(e.options,r),"CodeMirror-linenumber CodeMirror-gutter-elt","left: "+n.gutterLeft["CodeMirror-linenumbers"]+"px; width: "+e.display.lineNumInnerWidth+"px"))),o)for(var s=0;s<e.options.gutters.length;++s){var l=e.options.gutters[s],u=o.hasOwnProperty(l)&&o[l]
+u&&a.appendChild(ko("div",[u],"CodeMirror-gutter-elt","left: "+n.gutterLeft[l]+"px; width: "+n.gutterWidth[l]+"px"))}}}function le(e,t,r){t.alignable&&(t.alignable=null)
+for(var n=t.node.firstChild;n;n=i){var i=n.nextSibling
+"CodeMirror-linewidget"==n.className&&t.node.removeChild(n)}ce(e,t,r)}function ue(e,t,r,n){var i=ie(e,t)
+return t.text=t.node=i.pre,i.bgClass&&(t.bgClass=i.bgClass),i.textClass&&(t.textClass=i.textClass),ae(t),se(e,t,r,n),ce(e,t,n),t.node}function ce(e,t,r){if(de(e,t.line,t,r,!0),t.rest)for(var n=0;n<t.rest.length;n++)de(e,t.rest[n],t,r,!1)}function de(e,t,r,n,i){if(t.widgets)for(var o=ne(r),a=0,s=t.widgets;a<s.length;++a){var l=s[a],u=ko("div",[l.node],"CodeMirror-linewidget")
+l.handleMouseEvents||u.setAttribute("cm-ignore-events","true"),he(l,u,r,n),e.display.input.setUneditable(u),i&&l.above?o.insertBefore(u,r.gutter||r.text):o.appendChild(u),Zi(l,"redraw")}}function he(e,t,r,n){if(e.noHScroll){(r.alignable||(r.alignable=[])).push(t)
+var i=n.wrapperWidth
+t.style.left=n.fixedPos+"px",e.coverGutter||(i-=n.gutterTotalWidth,t.style.paddingLeft=n.gutterTotalWidth+"px"),t.style.width=i+"px"}e.coverGutter&&(t.style.zIndex=5,t.style.position="relative",e.noHScroll||(t.style.marginLeft=-n.gutterTotalWidth+"px"))}F.prototype=Eo({update:function(e){var t=e.scrollWidth>e.clientWidth+1,r=e.scrollHeight>e.clientHeight+1,n=e.nativeBarWidth
+if(r){this.vert.style.display="block",this.vert.style.bottom=t?n+"px":"0"
+var i=e.viewHeight-(t?n:0)
+this.vert.firstChild.style.height=Math.max(0,e.scrollHeight-e.clientHeight+i)+"px"}else this.vert.style.display="",this.vert.firstChild.style.height="0"
+if(t){this.horiz.style.display="block",this.horiz.style.right=r?n+"px":"0",this.horiz.style.left=e.barLeft+"px"
+var o=e.viewWidth-e.barLeft-(r?n:0)
+this.horiz.firstChild.style.width=e.scrollWidth-e.clientWidth+o+"px"}else this.horiz.style.display="",this.horiz.firstChild.style.width="0"
+return!this.checkedZeroWidth&&e.clientHeight>0&&(0==n&&this.zeroWidthHack(),this.checkedZeroWidth=!0),{right:r?n:0,bottom:t?n:0}},setScrollLeft:function(e){this.horiz.scrollLeft!=e&&(this.horiz.scrollLeft=e),this.disableHoriz&&this.enableZeroWidthBar(this.horiz,this.disableHoriz)},setScrollTop:function(e){this.vert.scrollTop!=e&&(this.vert.scrollTop=e),this.disableVert&&this.enableZeroWidthBar(this.vert,this.disableVert)},zeroWidthHack:function(){var e=v&&!h?"12px":"18px"
+this.horiz.style.height=this.vert.style.width=e,this.horiz.style.pointerEvents=this.vert.style.pointerEvents="none",this.disableHoriz=new co,this.disableVert=new co},enableZeroWidthBar:function(e,t){e.style.pointerEvents="auto",t.set(1e3,(function r(){var n=e.getBoundingClientRect()
+document.elementFromPoint(n.left+1,n.bottom-1)!=e?e.style.pointerEvents="none":t.set(1e3,r)}))},clear:function(){var e=this.horiz.parentNode
+e.removeChild(this.horiz),e.removeChild(this.vert)}},F.prototype),z.prototype=Eo({update:function(){return{bottom:0,right:0}},setScrollLeft:function(){},setScrollTop:function(){},clear:function(){}},z.prototype),O.scrollbarModel={native:F,null:z},Y.prototype.signal=function(e,t){no(e,t)&&this.events.push(arguments)},Y.prototype.finish=function(){for(var e=0;e<this.events.length;e++)Qi.apply(null,this.events[e])}
+var fe=O.Pos=function(e,t){if(!(this instanceof fe))return new fe(e,t)
+this.line=e,this.ch=t},pe=O.cmpPos=function(e,t){return e.line-t.line||e.ch-t.ch}
+function me(e){return fe(e.line,e.ch)}function ve(e,t){return pe(e,t)<0?t:e}function ge(e,t){return pe(e,t)<0?e:t}function be(e){e.state.focused||(e.display.input.focus(),Pr(e))}var ye=null
+function _e(e,t,r,n,i){var o=e.doc
+e.display.shift=!1,n||(n=o.sel)
+var a=e.state.pasteIncoming||"paste"==i,s=o.splitLines(t),l=null
+if(a&&n.ranges.length>1)if(ye&&ye.text.join("\n")==t){if(n.ranges.length%ye.text.length==0){l=[]
+for(var u=0;u<ye.text.length;u++)l.push(o.splitLines(ye.text[u]))}}else s.length==n.ranges.length&&(l=yo(s,(function(e){return[e]})))
+for(u=n.ranges.length-1;u>=0;u--){var c=n.ranges[u],d=c.from(),h=c.to()
+c.empty()&&(r&&r>0?d=fe(d.line,d.ch-r):e.state.overwrite&&!a?h=fe(h.line,Math.min(Ei(o,h.line).text.length,h.ch+vo(s).length)):ye&&ye.lineWise&&ye.text.join("\n")==t&&(d=h=fe(d.line,0)))
+var f=e.curOp.updateInput,p={from:d,to:h,text:l?l[u%l.length]:s,origin:i||(a?"paste":e.state.cutIncoming?"cut":"+input")}
+Lr(e.doc,p),Zi(e,"inputRead",e,p)}t&&!a&&Ee(e,t),qr(e),e.curOp.updateInput=f,e.curOp.typing=!0,e.state.pasteIncoming=e.state.cutIncoming=!1}function we(e,t){var r=e.clipboardData&&e.clipboardData.getData("text/plain")
+if(r)return e.preventDefault(),t.isReadOnly()||t.options.disableInput||Yt(t,(function(){_e(t,r,0,null,"paste")})),!0}function Ee(e,t){if(e.options.electricChars&&e.options.smartIndent)for(var r=e.doc.sel,n=r.ranges.length-1;n>=0;n--){var i=r.ranges[n]
+if(!(i.head.ch>100||n&&r.ranges[n-1].head.line==i.head.line)){var o=e.getModeAt(i.head),a=!1
+if(o.electricChars){for(var s=0;s<o.electricChars.length;s++)if(t.indexOf(o.electricChars.charAt(s))>-1){a=Gr(e,i.head.line,"smart")
+break}}else o.electricInput&&o.electricInput.test(Ei(e.doc,i.head.line).text.slice(0,i.head.ch))&&(a=Gr(e,i.head.line,"smart"))
+a&&Zi(e,"electricInput",e,i.head.line)}}}function xe(e){for(var t=[],r=[],n=0;n<e.doc.sel.ranges.length;n++){var i=e.doc.sel.ranges[n].head.line,o={anchor:fe(i,0),head:fe(i+1,0)}
+r.push(o),t.push(e.getRange(o.anchor,o.head))}return{text:t,ranges:r}}function Oe(e){e.setAttribute("autocorrect","off"),e.setAttribute("autocapitalize","off"),e.setAttribute("spellcheck","false")}function Se(e){this.cm=e,this.prevInput="",this.pollingFast=!1,this.polling=new co,this.inaccurateSelection=!1,this.hasSelection=!1,this.composing=null}function Te(){var e=ko("textarea",null,null,"position: absolute; padding: 0; width: 1px; height: 1em; outline: none"),t=ko("div",[e],null,"overflow: hidden; position: relative; width: 3px; height: 0px;")
+return s?e.style.width="1000px":e.setAttribute("wrap","off"),p&&(e.style.border="1px solid black"),Oe(e),t}function Me(e){this.cm=e,this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null,this.polling=new co,this.gracePeriod=!1}function Ae(e,t){var r=vt(e,t.line)
+if(!r||r.hidden)return null
+var n=Ei(e.doc,t.line),i=pt(r,n,t.line),o=Pi(n),a="left"
+o&&(a=sa(o,t.ch)%2?"right":"left")
+var s=wt(i.map,t.ch,a)
+return s.offset="right"==s.collapse?s.end:s.start,s}function Pe(e,t){return t&&(e.bad=!0),e}function Ce(e,t,r){var n
+if(t==e.display.lineDiv){if(!(n=e.display.lineDiv.childNodes[r]))return Pe(e.clipPos(fe(e.display.viewTo-1)),!0)
+t=null,r=0}else for(n=t;;n=n.parentNode){if(!n||n==e.display.lineDiv)return null
+if(n.parentNode&&n.parentNode==e.display.lineDiv)break}for(var i=0;i<e.display.view.length;i++){var o=e.display.view[i]
+if(o.node==n)return ke(o,t,r)}}function ke(e,t,r){var n=e.text.firstChild,i=!1
+if(!t||!Do(n,t))return Pe(fe(Ti(e.line),0),!0)
+if(t==n&&(i=!0,t=n.childNodes[r],r=0,!t)){var o=e.rest?vo(e.rest):e.line
+return Pe(fe(Ti(o),o.text.length),i)}var a=3==t.nodeType?t:null,s=t
+for(a||1!=t.childNodes.length||3!=t.firstChild.nodeType||(a=t.firstChild,r&&(r=a.nodeValue.length));s.parentNode!=n;)s=s.parentNode
+var l=e.measure,u=l.maps
+function c(t,r,n){for(var i=-1;i<(u?u.length:0);i++)for(var o=i<0?l.map:u[i],a=0;a<o.length;a+=3){var s=o[a+2]
+if(s==t||s==r){var c=Ti(i<0?e.line:e.rest[i]),d=o[a]+n
+return(n<0||s!=t)&&(d=o[a+(n?1:0)]),fe(c,d)}}}var d=c(a,s,r)
+if(d)return Pe(d,i)
+for(var h=s.nextSibling,f=a?a.nodeValue.length-r:0;h;h=h.nextSibling){if(d=c(h,h.firstChild,0))return Pe(fe(d.line,d.ch-f),i)
+f+=h.textContent.length}var p=s.previousSibling
+for(f=r;p;p=p.previousSibling){if(d=c(p,p.firstChild,-1))return Pe(fe(d.line,d.ch+f),i)
+f+=h.textContent.length}}function Re(e,t){this.ranges=e,this.primIndex=t}function je(e,t){this.anchor=e,this.head=t}function De(e,t){var r=e[t]
+e.sort((function(e,t){return pe(e.from(),t.from())})),t=bo(e,r)
+for(var n=1;n<e.length;n++){var i=e[n],o=e[n-1]
+if(pe(o.to(),i.from())>=0){var a=ge(o.from(),i.from()),s=ve(o.to(),i.to()),l=o.empty()?i.from()==i.head:o.from()==o.head
+n<=t&&--t,e.splice(--n,2,new je(l?s:a,l?a:s))}}return new Re(e,t)}function Ne(e,t){return new Re([new je(e,t||e)],0)}function Ie(e,t){return Math.max(e.first,Math.min(t,e.first+e.size-1))}function Le(e,t){if(t.line<e.first)return fe(e.first,0)
+var r=e.first+e.size-1
+return t.line>r?fe(r,Ei(e,r).text.length):function(e,t){var r=e.ch
+return null==r||r>t?fe(e.line,t):r<0?fe(e.line,0):e}(t,Ei(e,t.line).text.length)}function Fe(e,t){return t>=e.first&&t<e.first+e.size}function ze(e,t){for(var r=[],n=0;n<t.length;n++)r[n]=Le(e,t[n])
+return r}function Ue(e,t,r,n){if(e.cm&&e.cm.display.shift||e.extend){var i=t.anchor
+if(n){var o=pe(r,i)<0
+o!=pe(n,i)<0?(i=r,r=n):o!=pe(r,n)<0&&(r=n)}return new je(i,r)}return new je(n||r,r)}function He(e,t,r,n){We(e,new Re([Ue(e,e.sel.primary(),t,r)],0),n)}function Be(e,t,r){for(var n=[],i=0;i<e.sel.ranges.length;i++)n[i]=Ue(e,e.sel.ranges[i],t[i],null)
+We(e,De(n,e.sel.primIndex),r)}function Ve(e,t,r,n){var i=e.sel.ranges.slice(0)
+i[t]=r,We(e,De(i,e.sel.primIndex),n)}function $e(e,t,r,n){We(e,Ne(t,r),n)}function qe(e,t,r){var n=e.history.done,i=vo(n)
+i&&i.ranges?(n[n.length-1]=t,Ge(e,t,r)):We(e,t,r)}function We(e,t,r){Ge(e,t,r),function(e,t,r,n){var i=e.history,o=n&&n.origin
+r==i.lastSelOp||o&&i.lastSelOrigin==o&&(i.lastModTime==i.lastSelTime&&i.lastOrigin==o||function(e,t,r,n){var i=t.charAt(0)
+return"*"==i||"+"==i&&r.ranges.length==n.ranges.length&&r.somethingSelected()==n.somethingSelected()&&new Date-e.history.lastSelTime<=(e.cm?e.cm.options.historyEventDelay:500)}(e,o,vo(i.done),t))?i.done[i.done.length-1]=t:Di(t,i.done)
+i.lastSelTime=+new Date,i.lastSelOrigin=o,i.lastSelOp=r,n&&!1!==n.clearRedo&&Ri(i.undone)}(e,e.sel,e.cm?e.cm.curOp.id:NaN,r)}function Ge(e,t,r){(no(e,"beforeSelectionChange")||e.cm&&no(e.cm,"beforeSelectionChange"))&&(t=function(e,t,r){var n={ranges:t.ranges,update:function(t){this.ranges=[]
+for(var r=0;r<t.length;r++)this.ranges[r]=new je(Le(e,t[r].anchor),Le(e,t[r].head))},origin:r&&r.origin}
+return Qi(e,"beforeSelectionChange",e,n),e.cm&&Qi(e.cm,"beforeSelectionChange",e.cm,n),n.ranges!=t.ranges?De(n.ranges,n.ranges.length-1):t}(e,t,r))
+var n=r&&r.bias||(pe(t.primary().head,e.sel.primary().head)<0?-1:1)
+Ye(e,Je(e,t,n,!0)),r&&!1===r.scroll||!e.cm||qr(e.cm)}function Ye(e,t){t.equals(e.sel)||(e.sel=t,e.cm&&(e.cm.curOp.updateInput=e.cm.curOp.selectionChanged=!0,ro(e.cm)),Zi(e,"cursorActivity",e))}function Ke(e){Ye(e,Je(e,e.sel,null,!1))}function Je(e,t,r,n){for(var i,o=0;o<t.ranges.length;o++){var a=t.ranges[o],s=t.ranges.length==e.sel.ranges.length&&e.sel.ranges[o],l=Xe(e,a.anchor,s&&s.anchor,r,n),u=Xe(e,a.head,s&&s.head,r,n);(i||l!=a.anchor||u!=a.head)&&(i||(i=t.ranges.slice(0,o)),i[o]=new je(l,u))}return i?De(i,t.primIndex):t}function Qe(e,t,r,n,i){var o=Ei(e,t.line)
+if(o.markedSpans)for(var a=0;a<o.markedSpans.length;++a){var s=o.markedSpans[a],l=s.marker
+if((null==s.from||(l.inclusiveLeft?s.from<=t.ch:s.from<t.ch))&&(null==s.to||(l.inclusiveRight?s.to>=t.ch:s.to>t.ch))){if(i&&(Qi(l,"beforeCursorEnter"),l.explicitlyCleared)){if(o.markedSpans){--a
+continue}break}if(!l.atomic)continue
+if(r){var u,c=l.find(n<0?1:-1)
+if((n<0?l.inclusiveRight:l.inclusiveLeft)&&(c=Ze(e,c,-n,c&&c.line==t.line?o:null)),c&&c.line==t.line&&(u=pe(c,r))&&(n<0?u<0:u>0))return Qe(e,c,t,n,i)}var d=l.find(n<0?-1:1)
+return(n<0?l.inclusiveLeft:l.inclusiveRight)&&(d=Ze(e,d,n,d.line==t.line?o:null)),d?Qe(e,d,t,n,i):null}}return t}function Xe(e,t,r,n,i){var o=n||1,a=Qe(e,t,r,o,i)||!i&&Qe(e,t,r,o,!0)||Qe(e,t,r,-o,i)||!i&&Qe(e,t,r,-o,!0)
+return a||(e.cantEdit=!0,fe(e.first,0))}function Ze(e,t,r,n){return r<0&&0==t.ch?t.line>e.first?Le(e,fe(t.line-1)):null:r>0&&t.ch==(n||Ei(e,t.line)).text.length?t.line<e.first+e.size-1?fe(t.line+1,0):null:new fe(t.line,t.ch+r)}function et(e){e.display.input.showSelection(e.display.input.prepareSelection())}function tt(e,t){for(var r=e.doc,n={},i=n.cursors=document.createDocumentFragment(),o=n.selection=document.createDocumentFragment(),a=0;a<r.sel.ranges.length;a++)if(!1!==t||a!=r.sel.primIndex){var s=r.sel.ranges[a]
+if(!(s.from().line>=e.display.viewTo||s.to().line<e.display.viewFrom)){var l=s.empty();(l||e.options.showCursorWhenSelecting)&&rt(e,s.head,i),l||nt(e,s,o)}}return n}function rt(e,t,r){var n=Ct(e,t,"div",null,null,!e.options.singleCursorHeightPerLine),i=r.appendChild(ko("div"," ","CodeMirror-cursor"))
+if(i.style.left=n.left+"px",i.style.top=n.top+"px",i.style.height=Math.max(0,n.bottom-n.top)*e.options.cursorHeight+"px",n.other){var o=r.appendChild(ko("div"," ","CodeMirror-cursor CodeMirror-secondarycursor"))
+o.style.display="",o.style.left=n.other.left+"px",o.style.top=n.other.top+"px",o.style.height=.85*(n.other.bottom-n.other.top)+"px"}}function nt(e,t,r){var n=e.display,i=e.doc,o=document.createDocumentFragment(),a=ct(e.display),s=a.left,l=Math.max(n.sizerWidth,ht(e)-n.sizer.offsetLeft)-a.right
+function u(e,t,r,n){t<0&&(t=0),t=Math.round(t),n=Math.round(n),o.appendChild(ko("div",null,"CodeMirror-selected","position: absolute; left: "+e+"px; top: "+t+"px; width: "+(null==r?l-e:r)+"px; height: "+(n-t)+"px"))}function c(t,r,n){var o,a,c=Ei(i,t),d=c.text.length
+function h(r,n){return Pt(e,fe(t,r),"div",c,n)}return function(e,t,r,n){if(!e)return n(t,r,"ltr")
+for(var i=!1,o=0;o<e.length;++o){var a=e[o];(a.from<r&&a.to>t||t==r&&a.to==t)&&(n(Math.max(a.from,t),Math.min(a.to,r),1==a.level?"rtl":"ltr"),i=!0)}i||n(t,r,"ltr")}(Pi(c),r||0,null==n?d:n,(function(e,t,i){var c,f,p,m=h(e,"left")
+if(e==t)c=m,f=p=m.left
+else{if(c=h(t-1,"right"),"rtl"==i){var v=m
+m=c,c=v}f=m.left,p=c.right}null==r&&0==e&&(f=s),c.top-m.top>3&&(u(f,m.top,null,m.bottom),f=s,m.bottom<c.top&&u(f,m.bottom,null,c.top)),null==n&&t==d&&(p=l),(!o||m.top<o.top||m.top==o.top&&m.left<o.left)&&(o=m),(!a||c.bottom>a.bottom||c.bottom==a.bottom&&c.right>a.right)&&(a=c),f<s+1&&(f=s),u(f,c.top,p-f,c.bottom)})),{start:o,end:a}}var d=t.from(),h=t.to()
+if(d.line==h.line)c(d.line,d.ch,h.ch)
+else{var f=Ei(i,d.line),p=Ei(i,h.line),m=zn(f)==zn(p),v=c(d.line,d.ch,m?f.text.length+1:null).end,g=c(h.line,m?0:null,h.ch).start
+m&&(v.top<g.top-2?(u(v.right,v.top,null,v.bottom),u(s,g.top,g.left,g.bottom)):u(v.right,v.top,g.left-v.right,v.bottom)),v.bottom<g.top&&u(s,v.bottom,null,g.top)}r.appendChild(o)}function it(e){if(e.state.focused){var t=e.display
+clearInterval(t.blinker)
+var r=!0
+t.cursorDiv.style.visibility="",e.options.cursorBlinkRate>0?t.blinker=setInterval((function(){t.cursorDiv.style.visibility=(r=!r)?"":"hidden"}),e.options.cursorBlinkRate):e.options.cursorBlinkRate<0&&(t.cursorDiv.style.visibility="hidden")}}function ot(e,t){e.doc.mode.startState&&e.doc.frontier<e.display.viewTo&&e.state.highlight.set(t,xo(at,e))}function at(e){var t=e.doc
+if(t.frontier<t.first&&(t.frontier=t.first),!(t.frontier>=e.display.viewTo)){var r=+new Date+e.options.workTime,n=ln(t.mode,st(e,t.frontier)),i=[]
+t.iter(t.frontier,Math.min(t.first+t.size,e.display.viewTo+500),(function(o){if(t.frontier>=e.display.viewFrom){var a=o.styles,s=o.text.length>e.options.maxHighlightLength,l=ei(e,o,s?ln(t.mode,n):n,!0)
+o.styles=l.styles
+var u=o.styleClasses,c=l.classes
+c?o.styleClasses=c:u&&(o.styleClasses=null)
+for(var d=!a||a.length!=o.styles.length||u!=c&&(!u||!c||u.bgClass!=c.bgClass||u.textClass!=c.textClass),h=0;!d&&h<a.length;++h)d=a[h]!=o.styles[h]
+d&&i.push(t.frontier),o.stateAfter=s?n:ln(t.mode,n)}else o.text.length<=e.options.maxHighlightLength&&ri(e,o.text,n),o.stateAfter=t.frontier%5==0?ln(t.mode,n):null
+if(++t.frontier,+new Date>r)return ot(e,e.options.workDelay),!0})),i.length&&Yt(e,(function(){for(var t=0;t<i.length;t++)tr(e,i[t],"text")}))}}function st(e,t,r){var n=e.doc,i=e.display
+if(!n.mode.startState)return!0
+var o=function(e,t,r){for(var n,i,o=e.doc,a=r?-1:t-(e.doc.mode.innerMode?1e3:100),s=t;s>a;--s){if(s<=o.first)return o.first
+var l=Ei(o,s-1)
+if(l.stateAfter&&(!r||s<=o.frontier))return s
+var u=ho(l.text,null,e.options.tabSize);(null==i||n>u)&&(i=s-1,n=u)}return i}(e,t,r),a=o>n.first&&Ei(n,o-1).stateAfter
+return a=a?ln(n.mode,a):un(n.mode),n.iter(o,t,(function(r){ri(e,r.text,a)
+var s=o==t-1||o%5==0||o>=i.viewFrom&&o<i.viewTo
+r.stateAfter=s?ln(n.mode,a):null,++o})),r&&(n.frontier=o),a}function lt(e){return e.lineSpace.offsetTop}function ut(e){return e.mover.offsetHeight-e.lineSpace.offsetHeight}function ct(e){if(e.cachedPaddingH)return e.cachedPaddingH
+var t=jo(e.measure,ko("pre","x")),r=window.getComputedStyle?window.getComputedStyle(t):t.currentStyle,n={left:parseInt(r.paddingLeft),right:parseInt(r.paddingRight)}
+return isNaN(n.left)||isNaN(n.right)||(e.cachedPaddingH=n),n}function dt(e){return oo-e.display.nativeBarWidth}function ht(e){return e.display.scroller.clientWidth-dt(e)-e.display.barWidth}function ft(e){return e.display.scroller.clientHeight-dt(e)-e.display.barHeight}function pt(e,t,r){if(e.line==t)return{map:e.measure.map,cache:e.measure.cache}
+for(var n=0;n<e.rest.length;n++)if(e.rest[n]==t)return{map:e.measure.maps[n],cache:e.measure.caches[n]}
+for(n=0;n<e.rest.length;n++)if(Ti(e.rest[n])>r)return{map:e.measure.maps[n],cache:e.measure.caches[n],before:!0}}function mt(e,t,r,n){return bt(e,gt(e,t),r,n)}function vt(e,t){if(t>=e.display.viewFrom&&t<e.display.viewTo)return e.display.view[nr(e,t)]
+var r=e.display.externalMeasured
+return r&&t>=r.lineN&&t<r.lineN+r.size?r:void 0}function gt(e,t){var r=Ti(t),n=vt(e,r)
+n&&!n.text?n=null:n&&n.changes&&(re(e,n,r,te(e)),e.curOp.forceUpdate=!0),n||(n=function(e,t){var r=Ti(t=zn(t)),n=e.display.externalMeasured=new Xt(e.doc,t,r)
+n.lineN=r
+var i=n.built=ai(e,n)
+return n.text=i.pre,jo(e.display.lineMeasure,i.pre),n}(e,t))
+var i=pt(n,t,r)
+return{line:t,view:n,rect:null,map:i.map,cache:i.cache,before:i.before,hasHeights:!1}}function bt(e,t,r,n,i){t.before&&(r=-1)
+var s,l=r+(n||"")
+return t.cache.hasOwnProperty(l)?s=t.cache[l]:(t.rect||(t.rect=t.view.text.getBoundingClientRect()),t.hasHeights||(function(e,t,r){var n=e.options.lineWrapping,i=n&&ht(e)
+if(!t.measure.heights||n&&t.measure.width!=i){var o=t.measure.heights=[]
+if(n){t.measure.width=i
+for(var a=t.text.firstChild.getClientRects(),s=0;s<a.length-1;s++){var l=a[s],u=a[s+1]
+Math.abs(l.bottom-u.bottom)>2&&o.push((l.bottom+u.top)/2-r.top)}}o.push(r.bottom-r.top)}}(e,t.view,t.rect),t.hasHeights=!0),(s=function(e,t,r,n){var i,s=wt(t.map,r,n),l=s.node,u=s.start,c=s.end,d=s.collapse
+if(3==l.nodeType){for(var h=0;h<4;h++){for(;u&&Co(t.line.text.charAt(s.coverStart+u));)--u
+for(;s.coverStart+c<s.coverEnd&&Co(t.line.text.charAt(s.coverStart+c));)++c
+if(o&&a<9&&0==u&&c==s.coverEnd-s.coverStart)i=l.parentNode.getBoundingClientRect()
+else if(o&&e.options.lineWrapping){var f=Ao(l,u,c).getClientRects()
+i=f.length?f["right"==n?f.length-1:0]:_t}else i=Ao(l,u,c).getBoundingClientRect()||_t
+if(i.left||i.right||0==u)break
+c=u,u-=1,d="right"}o&&a<11&&(i=function(e,t){if(!window.screen||null==screen.logicalXDPI||screen.logicalXDPI==screen.deviceXDPI||!function(e){if(null!=Qo)return Qo
+var t=jo(e,ko("span","x")),r=t.getBoundingClientRect(),n=Ao(t,0,1).getBoundingClientRect()
+return Qo=Math.abs(r.left-n.left)>1}(e))return t
+var r=screen.logicalXDPI/screen.deviceXDPI,n=screen.logicalYDPI/screen.deviceYDPI
+return{left:t.left*r,right:t.right*r,top:t.top*n,bottom:t.bottom*n}}(e.display.measure,i))}else{u>0&&(d=n="right"),i=e.options.lineWrapping&&(f=l.getClientRects()).length>1?f["right"==n?f.length-1:0]:l.getBoundingClientRect()}if(o&&a<9&&!u&&(!i||!i.left&&!i.right)){var p=l.parentNode.getClientRects()[0]
+i=p?{left:p.left,right:p.left+It(e.display),top:p.top,bottom:p.bottom}:_t}var m=i.top-t.rect.top,v=i.bottom-t.rect.top,g=(m+v)/2,b=t.view.measure.heights
+for(h=0;h<b.length-1&&!(g<b[h]);h++);var y=h?b[h-1]:0,_=b[h],w={left:("right"==d?i.right:i.left)-t.rect.left,right:("left"==d?i.left:i.right)-t.rect.left,top:y,bottom:_}
+i.left||i.right||(w.bogus=!0)
+e.options.singleCursorHeightPerLine||(w.rtop=m,w.rbottom=v)
+return w}(e,t,r,n)).bogus||(t.cache[l]=s)),{left:s.left,right:s.right,top:i?s.rtop:s.top,bottom:i?s.rbottom:s.bottom}}Se.prototype=Eo({init:function(e){var t=this,r=this.cm,n=this.wrapper=Te(),i=this.textarea=n.firstChild
+function s(e){if(!to(r,e)){if(r.somethingSelected())ye={lineWise:!1,text:r.getSelections()},t.inaccurateSelection&&(t.prevInput="",t.inaccurateSelection=!1,i.value=ye.text.join("\n"),go(i))
+else{if(!r.options.lineWiseCopyCut)return
+var n=xe(r)
+ye={lineWise:!0,text:n.text},"cut"==e.type?r.setSelections(n.ranges,null,so):(t.prevInput="",i.value=n.text.join("\n"),go(i))}"cut"==e.type&&(r.state.cutIncoming=!0)}}e.wrapper.insertBefore(n,e.wrapper.firstChild),p&&(i.style.width="0px"),Gi(i,"input",(function(){o&&a>=9&&t.hasSelection&&(t.hasSelection=null),t.poll()})),Gi(i,"paste",(function(e){to(r,e)||we(e,r)||(r.state.pasteIncoming=!0,t.fastPoll())})),Gi(i,"cut",s),Gi(i,"copy",s),Gi(e.scroller,"paste",(function(n){sr(e,n)||to(r,n)||(r.state.pasteIncoming=!0,t.focus())})),Gi(e.lineSpace,"selectstart",(function(t){sr(e,t)||Hi(t)})),Gi(i,"compositionstart",(function(){var e=r.getCursor("from")
+t.composing&&t.composing.range.clear(),t.composing={start:e,range:r.markText(e,r.getCursor("to"),{className:"CodeMirror-composing"})}})),Gi(i,"compositionend",(function(){t.composing&&(t.poll(),t.composing.range.clear(),t.composing=null)}))},prepareSelection:function(){var e=this.cm,t=e.display,r=e.doc,n=tt(e)
+if(e.options.moveInputWithCursor){var i=Ct(e,r.sel.primary().head,"div"),o=t.wrapper.getBoundingClientRect(),a=t.lineDiv.getBoundingClientRect()
+n.teTop=Math.max(0,Math.min(t.wrapper.clientHeight-10,i.top+a.top-o.top)),n.teLeft=Math.max(0,Math.min(t.wrapper.clientWidth-10,i.left+a.left-o.left))}return n},showSelection:function(e){var t=this.cm.display
+jo(t.cursorDiv,e.cursors),jo(t.selectionDiv,e.selection),null!=e.teTop&&(this.wrapper.style.top=e.teTop+"px",this.wrapper.style.left=e.teLeft+"px")},reset:function(e){if(!this.contextMenuPending){var t,r,n=this.cm,i=n.doc
+if(n.somethingSelected()){this.prevInput=""
+var s=i.sel.primary(),l=(t=Jo&&(s.to().line-s.from().line>100||(r=n.getSelection()).length>1e3))?"-":r||n.getSelection()
+this.textarea.value=l,n.state.focused&&go(this.textarea),o&&a>=9&&(this.hasSelection=l)}else e||(this.prevInput=this.textarea.value="",o&&a>=9&&(this.hasSelection=null))
+this.inaccurateSelection=t}},getField:function(){return this.textarea},supportsTouch:function(){return!1},focus:function(){if("nocursor"!=this.cm.options.readOnly&&(!m||No()!=this.textarea))try{this.textarea.focus()}catch(Go){}},blur:function(){this.textarea.blur()},resetPosition:function(){this.wrapper.style.top=this.wrapper.style.left=0},receivedFocus:function(){this.slowPoll()},slowPoll:function(){var e=this
+e.pollingFast||e.polling.set(this.cm.options.pollInterval,(function(){e.poll(),e.cm.state.focused&&e.slowPoll()}))},fastPoll:function(){var e=!1,t=this
+t.pollingFast=!0,t.polling.set(20,(function r(){t.poll()||e?(t.pollingFast=!1,t.slowPoll()):(e=!0,t.polling.set(60,r))}))},poll:function(){var e=this.cm,t=this.textarea,r=this.prevInput
+if(this.contextMenuPending||!e.state.focused||Ko(t)&&!r&&!this.composing||e.isReadOnly()||e.options.disableInput||e.state.keySeq)return!1
+var n=t.value
+if(n==r&&!e.somethingSelected())return!1
+if(o&&a>=9&&this.hasSelection===n||v&&/[\uf700-\uf7ff]/.test(n))return e.display.input.reset(),!1
+if(e.doc.sel==e.display.selForContextMenu){var i=n.charCodeAt(0)
+if(8203!=i||r||(r="​"),8666==i)return this.reset(),this.cm.execCommand("undo")}for(var s=0,l=Math.min(r.length,n.length);s<l&&r.charCodeAt(s)==n.charCodeAt(s);)++s
+var u=this
+return Yt(e,(function(){_e(e,n.slice(s),r.length-s,null,u.composing?"*compose":null),n.length>1e3||n.indexOf("\n")>-1?t.value=u.prevInput="":u.prevInput=n,u.composing&&(u.composing.range.clear(),u.composing.range=e.markText(u.composing.start,e.getCursor("to"),{className:"CodeMirror-composing"}))})),!0},ensurePolled:function(){this.pollingFast&&this.poll()&&(this.pollingFast=!1)},onKeyPress:function(){o&&a>=9&&(this.hasSelection=null),this.fastPoll()},onContextMenu:function(e){var t=this,r=t.cm,n=r.display,i=t.textarea,l=lr(r,e),u=n.scroller.scrollTop
+if(l&&!c){r.options.resetSelectionOnContextMenu&&-1==r.doc.sel.contains(l)&&Kt(r,We)(r.doc,Ne(l),so)
+var d=i.style.cssText,h=t.wrapper.style.cssText
+t.wrapper.style.cssText="position: absolute"
+var f=t.wrapper.getBoundingClientRect()
+if(i.style.cssText="position: absolute; width: 30px; height: 30px; top: "+(e.clientY-f.top-5)+"px; left: "+(e.clientX-f.left-5)+"px; z-index: 1000; background: "+(o?"rgba(255, 255, 255, .05)":"transparent")+"; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);",s)var p=window.scrollY
+if(n.input.focus(),s&&window.scrollTo(null,p),n.input.reset(),r.somethingSelected()||(i.value=t.prevInput=" "),t.contextMenuPending=!0,n.selForContextMenu=r.doc.sel,clearTimeout(n.detectingSelectAll),o&&a>=9&&v(),w){$i(e)
+var m=function(){Ji(window,"mouseup",m),setTimeout(g,20)}
+Gi(window,"mouseup",m)}else setTimeout(g,50)}function v(){if(null!=i.selectionStart){var e=r.somethingSelected(),o="​"+(e?i.value:"")
+i.value="⇚",i.value=o,t.prevInput=e?"":"​",i.selectionStart=1,i.selectionEnd=o.length,n.selForContextMenu=r.doc.sel}}function g(){if(t.contextMenuPending=!1,t.wrapper.style.cssText=h,i.style.cssText=d,o&&a<9&&n.scrollbars.setScrollTop(n.scroller.scrollTop=u),null!=i.selectionStart){(!o||o&&a<9)&&v()
+var e=0,s=function(){n.selForContextMenu==r.doc.sel&&0==i.selectionStart&&i.selectionEnd>0&&"​"==t.prevInput?Kt(r,cn.selectAll)(r):e++<10?n.detectingSelectAll=setTimeout(s,500):n.input.reset()}
+n.detectingSelectAll=setTimeout(s,200)}}},readOnlyChanged:function(e){e||this.reset()},setUneditable:_o,needsContentAttribute:!1},Se.prototype),Me.prototype=Eo({init:function(e){var t=this,r=t.cm,n=t.div=e.lineDiv
+function i(e){if(!to(r,e)){if(r.somethingSelected())ye={lineWise:!1,text:r.getSelections()},"cut"==e.type&&r.replaceSelection("",null,"cut")
+else{if(!r.options.lineWiseCopyCut)return
+var t=xe(r)
+ye={lineWise:!0,text:t.text},"cut"==e.type&&r.operation((function(){r.setSelections(t.ranges,0,so),r.replaceSelection("",null,"cut")}))}if(e.clipboardData&&!p)e.preventDefault(),e.clipboardData.clearData(),e.clipboardData.setData("text/plain",ye.text.join("\n"))
+else{var n=Te(),i=n.firstChild
+r.display.lineSpace.insertBefore(n,r.display.lineSpace.firstChild),i.value=ye.text.join("\n")
+var o=document.activeElement
+go(i),setTimeout((function(){r.display.lineSpace.removeChild(n),o.focus()}),50)}}}Oe(n),Gi(n,"paste",(function(e){to(r,e)||we(e,r)})),Gi(n,"compositionstart",(function(e){var n=e.data
+if(t.composing={sel:r.doc.sel,data:n,startData:n},n){var i=r.doc.sel.primary(),o=r.getLine(i.head.line).indexOf(n,Math.max(0,i.head.ch-n.length))
+o>-1&&o<=i.head.ch&&(t.composing.sel=Ne(fe(i.head.line,o),fe(i.head.line,o+n.length)))}})),Gi(n,"compositionupdate",(function(e){t.composing.data=e.data})),Gi(n,"compositionend",(function(e){var r=t.composing
+r&&(e.data==r.startData||/\u200b/.test(e.data)||(r.data=e.data),setTimeout((function(){r.handled||t.applyComposition(r),t.composing==r&&(t.composing=null)}),50))})),Gi(n,"touchstart",(function(){t.forceCompositionEnd()})),Gi(n,"input",(function(){t.composing||!r.isReadOnly()&&t.pollContent()||Yt(t.cm,(function(){er(r)}))})),Gi(n,"copy",i),Gi(n,"cut",i)},prepareSelection:function(){var e=tt(this.cm,!1)
+return e.focus=this.cm.state.focused,e},showSelection:function(e,t){e&&this.cm.display.view.length&&((e.focus||t)&&this.showPrimarySelection(),this.showMultipleSelections(e))},showPrimarySelection:function(){var e=window.getSelection(),t=this.cm.doc.sel.primary(),n=Ce(this.cm,e.anchorNode,e.anchorOffset),i=Ce(this.cm,e.focusNode,e.focusOffset)
+if(!n||n.bad||!i||i.bad||0!=pe(ge(n,i),t.from())||0!=pe(ve(n,i),t.to())){var o=Ae(this.cm,t.from()),a=Ae(this.cm,t.to())
+if(o||a){var s=this.cm.display.view,l=e.rangeCount&&e.getRangeAt(0)
+if(o){if(!a){var u=s[s.length-1].measure,c=u.maps?u.maps[u.maps.length-1]:u.map
+a={node:c[c.length-1],offset:c[c.length-2]-c[c.length-3]}}}else o={node:s[0].measure.map[2],offset:0}
+try{var d=Ao(o.node,o.offset,a.offset,a.node)}catch(Go){}d&&(!r&&this.cm.state.focused?(e.collapse(o.node,o.offset),d.collapsed||e.addRange(d)):(e.removeAllRanges(),e.addRange(d)),l&&null==e.anchorNode?e.addRange(l):r&&this.startGracePeriod()),this.rememberSelection()}}},startGracePeriod:function(){var e=this
+clearTimeout(this.gracePeriod),this.gracePeriod=setTimeout((function(){e.gracePeriod=!1,e.selectionChanged()&&e.cm.operation((function(){e.cm.curOp.selectionChanged=!0}))}),20)},showMultipleSelections:function(e){jo(this.cm.display.cursorDiv,e.cursors),jo(this.cm.display.selectionDiv,e.selection)},rememberSelection:function(){var e=window.getSelection()
+this.lastAnchorNode=e.anchorNode,this.lastAnchorOffset=e.anchorOffset,this.lastFocusNode=e.focusNode,this.lastFocusOffset=e.focusOffset},selectionInEditor:function(){var e=window.getSelection()
+if(!e.rangeCount)return!1
+var t=e.getRangeAt(0).commonAncestorContainer
+return Do(this.div,t)},focus:function(){"nocursor"!=this.cm.options.readOnly&&this.div.focus()},blur:function(){this.div.blur()},getField:function(){return this.div},supportsTouch:function(){return!0},receivedFocus:function(){var e=this
+this.selectionInEditor()?this.pollSelection():Yt(this.cm,(function(){e.cm.curOp.selectionChanged=!0})),this.polling.set(this.cm.options.pollInterval,(function t(){e.cm.state.focused&&(e.pollSelection(),e.polling.set(e.cm.options.pollInterval,t))}))},selectionChanged:function(){var e=window.getSelection()
+return e.anchorNode!=this.lastAnchorNode||e.anchorOffset!=this.lastAnchorOffset||e.focusNode!=this.lastFocusNode||e.focusOffset!=this.lastFocusOffset},pollSelection:function(){if(!this.composing&&!this.gracePeriod&&this.selectionChanged()){var e=window.getSelection(),t=this.cm
+this.rememberSelection()
+var r=Ce(t,e.anchorNode,e.anchorOffset),n=Ce(t,e.focusNode,e.focusOffset)
+r&&n&&Yt(t,(function(){We(t.doc,Ne(r,n),so),(r.bad||n.bad)&&(t.curOp.selectionChanged=!0)}))}},pollContent:function(){var e,t=this.cm,r=t.display,n=t.doc.sel.primary(),i=n.from(),o=n.to()
+if(i.line<r.viewFrom||o.line>r.viewTo-1)return!1
+if(i.line==r.viewFrom||0==(e=nr(t,i.line)))var a=Ti(r.view[0].line),s=r.view[0].node
+else a=Ti(r.view[e].line),s=r.view[e-1].node.nextSibling
+var l=nr(t,o.line)
+if(l==r.view.length-1)var u=r.viewTo-1,c=r.lineDiv.lastChild
+else u=Ti(r.view[l+1].line)-1,c=r.view[l+1].node.previousSibling
+for(var d=t.doc.splitLines(function(e,t,r,n,i){var o="",a=!1,s=e.doc.lineSeparator()
+function l(t){if(1==t.nodeType){var r=t.getAttribute("cm-text")
+if(null!=r)return""==r&&(r=t.textContent.replace(/\u200b/g,"")),void(o+=r)
+var u,c=t.getAttribute("cm-marker")
+if(c){var d=e.findMarks(fe(n,0),fe(i+1,0),(p=+c,function(e){return e.id==p}))
+return void(d.length&&(u=d[0].find())&&(o+=xi(e.doc,u.from,u.to).join(s)))}if("false"==t.getAttribute("contenteditable"))return
+for(var h=0;h<t.childNodes.length;h++)l(t.childNodes[h]);/^(pre|div|p)$/i.test(t.nodeName)&&(a=!0)}else if(3==t.nodeType){var f=t.nodeValue
+if(!f)return
+a&&(o+=s,a=!1),o+=f}var p}for(;l(t),t!=r;)t=t.nextSibling
+return o}(t,s,c,a,u)),h=xi(t.doc,fe(a,0),fe(u,Ei(t.doc,u).text.length));d.length>1&&h.length>1;)if(vo(d)==vo(h))d.pop(),h.pop(),u--
+else{if(d[0]!=h[0])break
+d.shift(),h.shift(),a++}for(var f=0,p=0,m=d[0],v=h[0],g=Math.min(m.length,v.length);f<g&&m.charCodeAt(f)==v.charCodeAt(f);)++f
+for(var b=vo(d),y=vo(h),_=Math.min(b.length-(1==d.length?f:0),y.length-(1==h.length?f:0));p<_&&b.charCodeAt(b.length-p-1)==y.charCodeAt(y.length-p-1);)++p
+d[d.length-1]=b.slice(0,b.length-p),d[0]=d[0].slice(f)
+var w=fe(a,f),E=fe(u,h.length?vo(h).length-p:0)
+return d.length>1||d[0]||pe(w,E)?(Br(t.doc,d,w,E,"+input"),!0):void 0},ensurePolled:function(){this.forceCompositionEnd()},reset:function(){this.forceCompositionEnd()},forceCompositionEnd:function(){this.composing&&!this.composing.handled&&(this.applyComposition(this.composing),this.composing.handled=!0,this.div.blur(),this.div.focus())},applyComposition:function(e){this.cm.isReadOnly()?Kt(this.cm,er)(this.cm):e.data&&e.data!=e.startData&&Kt(this.cm,_e)(this.cm,e.data,0,e.sel)},setUneditable:function(e){e.contentEditable="false"},onKeyPress:function(e){e.preventDefault(),this.cm.isReadOnly()||Kt(this.cm,_e)(this.cm,String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),0)},readOnlyChanged:function(e){this.div.contentEditable=String("nocursor"!=e)},onContextMenu:_o,resetPosition:_o,needsContentAttribute:!0},Me.prototype),O.inputStyles={textarea:Se,contenteditable:Me},Re.prototype={primary:function(){return this.ranges[this.primIndex]},equals:function(e){if(e==this)return!0
+if(e.primIndex!=this.primIndex||e.ranges.length!=this.ranges.length)return!1
+for(var t=0;t<this.ranges.length;t++){var r=this.ranges[t],n=e.ranges[t]
+if(0!=pe(r.anchor,n.anchor)||0!=pe(r.head,n.head))return!1}return!0},deepCopy:function(){for(var e=[],t=0;t<this.ranges.length;t++)e[t]=new je(me(this.ranges[t].anchor),me(this.ranges[t].head))
+return new Re(e,this.primIndex)},somethingSelected:function(){for(var e=0;e<this.ranges.length;e++)if(!this.ranges[e].empty())return!0
+return!1},contains:function(e,t){t||(t=e)
+for(var r=0;r<this.ranges.length;r++){var n=this.ranges[r]
+if(pe(t,n.from())>=0&&pe(e,n.to())<=0)return r}return-1}},je.prototype={from:function(){return ge(this.anchor,this.head)},to:function(){return ve(this.anchor,this.head)},empty:function(){return this.head.line==this.anchor.line&&this.head.ch==this.anchor.ch}}
+var yt,_t={left:0,right:0,top:0,bottom:0}
+function wt(e,t,r){for(var n,i,o,a,s=0;s<e.length;s+=3){var l=e[s],u=e[s+1]
+if(t<l?(i=0,o=1,a="left"):t<u?o=(i=t-l)+1:(s==e.length-3||t==u&&e[s+3]>t)&&(i=(o=u-l)-1,t>=u&&(a="right")),null!=i){if(n=e[s+2],l==u&&r==(n.insertLeft?"left":"right")&&(a=r),"left"==r&&0==i)for(;s&&e[s-2]==e[s-3]&&e[s-1].insertLeft;)n=e[2+(s-=3)],a="left"
+if("right"==r&&i==u-l)for(;s<e.length-3&&e[s+3]==e[s+4]&&!e[s+5].insertLeft;)n=e[(s+=3)+2],a="right"
+break}}return{node:n,start:i,end:o,collapse:a,coverStart:l,coverEnd:u}}function Et(e){if(e.measure&&(e.measure.cache={},e.measure.heights=null,e.rest))for(var t=0;t<e.rest.length;t++)e.measure.caches[t]={}}function xt(e){e.display.externalMeasure=null,Ro(e.display.lineMeasure)
+for(var t=0;t<e.display.view.length;t++)Et(e.display.view[t])}function Ot(e){xt(e),e.display.cachedCharWidth=e.display.cachedTextHeight=e.display.cachedPaddingH=null,e.options.lineWrapping||(e.display.maxLineChanged=!0),e.display.lineNumChars=null}function St(){return window.pageXOffset||(document.documentElement||document.body).scrollLeft}function Tt(){return window.pageYOffset||(document.documentElement||document.body).scrollTop}function Mt(e,t,r,n){if(t.widgets)for(var i=0;i<t.widgets.length;++i)if(t.widgets[i].above){var o=Wn(t.widgets[i])
+r.top+=o,r.bottom+=o}if("line"==n)return r
+n||(n="local")
+var a=Ai(t)
+if("local"==n?a+=lt(e.display):a-=e.display.viewOffset,"page"==n||"window"==n){var s=e.display.lineSpace.getBoundingClientRect()
+a+=s.top+("window"==n?0:Tt())
+var l=s.left+("window"==n?0:St())
+r.left+=l,r.right+=l}return r.top+=a,r.bottom+=a,r}function At(e,t,r){if("div"==r)return t
+var n=t.left,i=t.top
+if("page"==r)n-=St(),i-=Tt()
+else if("local"==r||!r){var o=e.display.sizer.getBoundingClientRect()
+n+=o.left,i+=o.top}var a=e.display.lineSpace.getBoundingClientRect()
+return{left:n-a.left,top:i-a.top}}function Pt(e,t,r,n,i){return n||(n=Ei(e.doc,t.line)),Mt(e,n,mt(e,n,t.ch,i),r)}function Ct(e,t,r,n,i,o){function a(t,a){var s=bt(e,i,t,a?"right":"left",o)
+return a?s.left=s.right:s.right=s.left,Mt(e,n,s,r)}function s(e,t){var r=l[t],n=r.level%2
+return e==ea(r)&&t&&r.level<l[t-1].level?(e=ta(r=l[--t])-(r.level%2?0:1),n=!0):e==ta(r)&&t<l.length-1&&r.level<l[t+1].level&&(e=ea(r=l[++t])-r.level%2,n=!1),n&&e==r.to&&e>r.from?a(e-1):a(e,n)}n=n||Ei(e.doc,t.line),i||(i=gt(e,n))
+var l=Pi(n),u=t.ch
+if(!l)return a(u)
+var c=s(u,sa(l,u))
+return null!=Xo&&(c.other=s(u,Xo)),c}function kt(e,t){var r=0
+t=Le(e.doc,t)
+e.options.lineWrapping||(r=It(e.display)*t.ch)
+var n=Ei(e.doc,t.line),i=Ai(n)+lt(e.display)
+return{left:r,right:r,top:i,bottom:i+n.height}}function Rt(e,t,r,n){var i=fe(e,t)
+return i.xRel=n,r&&(i.outside=!0),i}function jt(e,t,r){var n=e.doc
+if((r+=e.display.viewOffset)<0)return Rt(n.first,0,!0,-1)
+var i=Mi(n,r),o=n.first+n.size-1
+if(i>o)return Rt(n.first+n.size-1,Ei(n,o).text.length,!0,1)
+t<0&&(t=0)
+for(var a=Ei(n,i);;){var s=Dt(e,a,i,t,r),l=Ln(a),u=l&&l.find(0,!0)
+if(!l||!(s.ch>u.from.ch||s.ch==u.from.ch&&s.xRel>0))return s
+i=Ti(a=u.to.line)}}function Dt(e,t,r,n,i){var o=i-Ai(t),a=!1,s=2*e.display.wrapper.clientWidth,l=gt(e,t)
+function u(n){var i=Ct(e,fe(r,n),"line",t,l)
+return a=!0,o>i.bottom?i.left-s:o<i.top?i.left+s:(a=!1,i.left)}var c=Pi(t),d=t.text.length,h=ra(t),f=na(t),p=u(h),m=a,v=u(f),g=a
+if(n>v)return Rt(r,f,g,1)
+for(;;){if(c?f==h||f==ua(t,h,1):f-h<=1){for(var b=n<p||n-p<=v-n?h:f,y=n-(b==h?p:v);Co(t.text.charAt(b));)++b
+return Rt(r,b,b==h?m:g,y<-1?-1:y>1?1:0)}var _=Math.ceil(d/2),w=h+_
+if(c){w=h
+for(var E=0;E<_;++E)w=ua(t,w,1)}var x=u(w)
+x>n?(f=w,v=x,(g=a)&&(v+=1e3),d=_):(h=w,p=x,m=a,d-=_)}}function Nt(e){if(null!=e.cachedTextHeight)return e.cachedTextHeight
+if(null==yt){yt=ko("pre")
+for(var t=0;t<49;++t)yt.appendChild(document.createTextNode("x")),yt.appendChild(ko("br"))
+yt.appendChild(document.createTextNode("x"))}jo(e.measure,yt)
+var r=yt.offsetHeight/50
+return r>3&&(e.cachedTextHeight=r),Ro(e.measure),r||1}function It(e){if(null!=e.cachedCharWidth)return e.cachedCharWidth
+var t=ko("span","xxxxxxxxxx"),r=ko("pre",[t])
+jo(e.measure,r)
+var n=t.getBoundingClientRect(),i=(n.right-n.left)/10
+return i>2&&(e.cachedCharWidth=i),i||10}var Lt,Ft,zt=null,Ut=0
+function Ht(e){e.curOp={cm:e,viewChanged:!1,startHeight:e.doc.height,forceUpdate:!1,updateInput:null,typing:!1,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:!1,updateMaxLine:!1,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:!1,id:++Ut},zt?zt.ops.push(e.curOp):e.curOp.ownsGroup=zt={ops:[e.curOp],delayedCallbacks:[]}}function Bt(e){var t=e.curOp.ownsGroup
+if(t)try{(function(e){var t=e.delayedCallbacks,r=0
+do{for(;r<t.length;r++)t[r].call(null)
+for(var n=0;n<e.ops.length;n++){var i=e.ops[n]
+if(i.cursorActivityHandlers)for(;i.cursorActivityCalled<i.cursorActivityHandlers.length;)i.cursorActivityHandlers[i.cursorActivityCalled++].call(null,i.cm)}}while(r<t.length)})(t)}finally{zt=null
+for(var r=0;r<t.ops.length;r++)t.ops[r].cm.curOp=null;(function(e){for(var t=e.ops,r=0;r<t.length;r++)Vt(t[r])
+for(r=0;r<t.length;r++)$t(t[r])
+for(r=0;r<t.length;r++)qt(t[r])
+for(r=0;r<t.length;r++)Wt(t[r])
+for(r=0;r<t.length;r++)Gt(t[r])})(t)}}function Vt(e){var t=e.cm,r=t.display;(function(e){var t=e.display
+!t.scrollbarsClipped&&t.scroller.offsetWidth&&(t.nativeBarWidth=t.scroller.offsetWidth-t.scroller.clientWidth,t.heightForcer.style.height=dt(e)+"px",t.sizer.style.marginBottom=-t.nativeBarWidth+"px",t.sizer.style.borderRightWidth=dt(e)+"px",t.scrollbarsClipped=!0)})(t),e.updateMaxLine&&N(t),e.mustUpdate=e.viewChanged||e.forceUpdate||null!=e.scrollTop||e.scrollToPos&&(e.scrollToPos.from.line<r.viewFrom||e.scrollToPos.to.line>=r.viewTo)||r.maxLineChanged&&t.options.lineWrapping,e.update=e.mustUpdate&&new Y(t,e.mustUpdate&&{top:e.scrollTop,ensure:e.scrollToPos},e.forceUpdate)}function $t(e){e.updatedDisplay=e.mustUpdate&&K(e.cm,e.update)}function qt(e){var t=e.cm,r=t.display
+e.updatedDisplay&&Z(t),e.barMeasure=L(t),r.maxLineChanged&&!t.options.lineWrapping&&(e.adjustWidthTo=mt(t,r.maxLine,r.maxLine.text.length).left+3,t.display.sizerWidth=e.adjustWidthTo,e.barMeasure.scrollWidth=Math.max(r.scroller.clientWidth,r.sizer.offsetLeft+e.adjustWidthTo+dt(t)+t.display.barWidth),e.maxScrollLeft=Math.max(0,r.sizer.offsetLeft+e.adjustWidthTo-ht(t))),(e.updatedDisplay||e.selectionChanged)&&(e.preparedSelection=r.input.prepareSelection(e.focus))}function Wt(e){var t=e.cm
+null!=e.adjustWidthTo&&(t.display.sizer.style.minWidth=e.adjustWidthTo+"px",e.maxScrollLeft<t.doc.scrollLeft&&vr(t,Math.min(t.display.scroller.scrollLeft,e.maxScrollLeft),!0),t.display.maxLineChanged=!1)
+var r=e.focus&&e.focus==No()&&(!document.hasFocus||document.hasFocus())
+e.preparedSelection&&t.display.input.showSelection(e.preparedSelection,r),(e.updatedDisplay||e.startHeight!=t.doc.height)&&H(t,e.barMeasure),e.updatedDisplay&&X(t,e.barMeasure),e.selectionChanged&&it(t),t.state.focused&&e.updateInput&&t.display.input.reset(e.typing),r&&be(e.cm)}function Gt(e){var t=e.cm,r=t.display,n=t.doc
+if(e.updatedDisplay&&J(t,e.update),null==r.wheelStartX||null==e.scrollTop&&null==e.scrollLeft&&!e.scrollToPos||(r.wheelStartX=r.wheelStartY=null),null==e.scrollTop||r.scroller.scrollTop==e.scrollTop&&!e.forceScroll||(n.scrollTop=Math.max(0,Math.min(r.scroller.scrollHeight-r.scroller.clientHeight,e.scrollTop)),r.scrollbars.setScrollTop(n.scrollTop),r.scroller.scrollTop=n.scrollTop),null==e.scrollLeft||r.scroller.scrollLeft==e.scrollLeft&&!e.forceScroll||(n.scrollLeft=Math.max(0,Math.min(r.scroller.scrollWidth-r.scroller.clientWidth,e.scrollLeft)),r.scrollbars.setScrollLeft(n.scrollLeft),r.scroller.scrollLeft=n.scrollLeft,$(t)),e.scrollToPos){var i=function(e,t,r,n){null==n&&(n=0)
+for(var i=0;i<5;i++){var o=!1,a=Ct(e,t),s=r&&r!=t?Ct(e,r):a,l=Vr(e,Math.min(a.left,s.left),Math.min(a.top,s.top)-n,Math.max(a.left,s.left),Math.max(a.bottom,s.bottom)+n),u=e.doc.scrollTop,c=e.doc.scrollLeft
+if(null!=l.scrollTop&&(mr(e,l.scrollTop),Math.abs(e.doc.scrollTop-u)>1&&(o=!0)),null!=l.scrollLeft&&(vr(e,l.scrollLeft),Math.abs(e.doc.scrollLeft-c)>1&&(o=!0)),!o)break}return a}(t,Le(n,e.scrollToPos.from),Le(n,e.scrollToPos.to),e.scrollToPos.margin)
+e.scrollToPos.isCursor&&t.state.focused&&function(e,t){if(to(e,"scrollCursorIntoView"))return
+var r=e.display,n=r.sizer.getBoundingClientRect(),i=null
+t.top+n.top<0?i=!0:t.bottom+n.top>(window.innerHeight||document.documentElement.clientHeight)&&(i=!1)
+if(null!=i&&!f){var o=ko("div","​",null,"position: absolute; top: "+(t.top-r.viewOffset-lt(e.display))+"px; height: "+(t.bottom-t.top+dt(e)+r.barHeight)+"px; left: "+t.left+"px; width: 2px;")
+e.display.lineSpace.appendChild(o),o.scrollIntoView(i),e.display.lineSpace.removeChild(o)}}(t,i)}var o=e.maybeHiddenMarkers,a=e.maybeUnhiddenMarkers
+if(o)for(var s=0;s<o.length;++s)o[s].lines.length||Qi(o[s],"hide")
+if(a)for(s=0;s<a.length;++s)a[s].lines.length&&Qi(a[s],"unhide")
+r.wrapper.offsetHeight&&(n.scrollTop=t.display.scroller.scrollTop),e.changeObjs&&Qi(t,"changes",t,e.changeObjs),e.update&&e.update.finish()}function Yt(e,t){if(e.curOp)return t()
+Ht(e)
+try{return t()}finally{Bt(e)}}function Kt(e,t){return function(){if(e.curOp)return t.apply(e,arguments)
+Ht(e)
+try{return t.apply(e,arguments)}finally{Bt(e)}}}function Jt(e){return function(){if(this.curOp)return e.apply(this,arguments)
+Ht(this)
+try{return e.apply(this,arguments)}finally{Bt(this)}}}function Qt(e){return function(){var t=this.cm
+if(!t||t.curOp)return e.apply(this,arguments)
+Ht(t)
+try{return e.apply(this,arguments)}finally{Bt(t)}}}function Xt(e,t,r){this.line=t,this.rest=function(e){var t,r
+for(;t=Ln(e);)e=t.find(1,!0).line,(r||(r=[])).push(e)
+return r}(t),this.size=this.rest?Ti(vo(this.rest))-r+1:1,this.node=this.text=null,this.hidden=Bn(e,t)}function Zt(e,t,r){for(var n,i=[],o=t;o<r;o=n){var a=new Xt(e.doc,Ei(e.doc,o),o)
+n=o+a.size,i.push(a)}return i}function er(e,t,r,n){null==t&&(t=e.doc.first),null==r&&(r=e.doc.first+e.doc.size),n||(n=0)
+var i=e.display
+if(n&&r<i.viewTo&&(null==i.updateLineNumbers||i.updateLineNumbers>t)&&(i.updateLineNumbers=t),e.curOp.viewChanged=!0,t>=i.viewTo)x&&Un(e.doc,t)<i.viewTo&&rr(e)
+else if(r<=i.viewFrom)x&&Hn(e.doc,r+n)>i.viewFrom?rr(e):(i.viewFrom+=n,i.viewTo+=n)
+else if(t<=i.viewFrom&&r>=i.viewTo)rr(e)
+else if(t<=i.viewFrom){(o=ir(e,r,r+n,1))?(i.view=i.view.slice(o.index),i.viewFrom=o.lineN,i.viewTo+=n):rr(e)}else if(r>=i.viewTo){var o;(o=ir(e,t,t,-1))?(i.view=i.view.slice(0,o.index),i.viewTo=o.lineN):rr(e)}else{var a=ir(e,t,t,-1),s=ir(e,r,r+n,1)
+a&&s?(i.view=i.view.slice(0,a.index).concat(Zt(e,a.lineN,s.lineN)).concat(i.view.slice(s.index)),i.viewTo+=n):rr(e)}var l=i.externalMeasured
+l&&(r<l.lineN?l.lineN+=n:t<l.lineN+l.size&&(i.externalMeasured=null))}function tr(e,t,r){e.curOp.viewChanged=!0
+var n=e.display,i=e.display.externalMeasured
+if(i&&t>=i.lineN&&t<i.lineN+i.size&&(n.externalMeasured=null),!(t<n.viewFrom||t>=n.viewTo)){var o=n.view[nr(e,t)]
+if(null!=o.node){var a=o.changes||(o.changes=[]);-1==bo(a,r)&&a.push(r)}}}function rr(e){e.display.viewFrom=e.display.viewTo=e.doc.first,e.display.view=[],e.display.viewOffset=0}function nr(e,t){if(t>=e.display.viewTo)return null
+if((t-=e.display.viewFrom)<0)return null
+for(var r=e.display.view,n=0;n<r.length;n++)if((t-=r[n].size)<0)return n}function ir(e,t,r,n){var i,o=nr(e,t),a=e.display.view
+if(!x||r==e.doc.first+e.doc.size)return{index:o,lineN:r}
+for(var s=0,l=e.display.viewFrom;s<o;s++)l+=a[s].size
+if(l!=t){if(n>0){if(o==a.length-1)return null
+i=l+a[o].size-t,o++}else i=l-t
+t+=i,r+=i}for(;Un(e.doc,r)!=r;){if(o==(n<0?0:a.length-1))return null
+r+=n*a[o-(n<0?1:0)].size,o+=n}return{index:o,lineN:r}}function or(e){for(var t=e.display.view,r=0,n=0;n<t.length;n++){var i=t[n]
+i.hidden||i.node&&!i.changes||++r}return r}function ar(e){var t=e.display
+t.lastWrapHeight==t.wrapper.clientHeight&&t.lastWrapWidth==t.wrapper.clientWidth||(t.cachedCharWidth=t.cachedTextHeight=t.cachedPaddingH=null,t.scrollbarsClipped=!1,e.setSize())}function sr(e,t){for(var r=qi(t);r!=e.wrapper;r=r.parentNode)if(!r||1==r.nodeType&&"true"==r.getAttribute("cm-ignore-events")||r.parentNode==e.sizer&&r!=e.mover)return!0}function lr(e,t,r,n){var i=e.display
+if(!r&&"true"==qi(t).getAttribute("cm-not-content"))return null
+var o,a,s=i.lineSpace.getBoundingClientRect()
+try{o=t.clientX-s.left,a=t.clientY-s.top}catch(t){return null}var l,u=jt(e,o,a)
+if(n&&1==u.xRel&&(l=Ei(e.doc,u.line).text).length==u.ch){var c=ho(l,l.length,e.options.tabSize)-l.length
+u=fe(u.line,Math.max(0,Math.round((o-ct(e.display).left)/It(e.display))-c))}return u}function ur(e){var t=this,r=t.display
+if(!(to(t,e)||r.activeTouch&&r.input.supportsTouch()))if(r.shift=e.shiftKey,sr(r,e))s||(r.scroller.draggable=!1,setTimeout((function(){r.scroller.draggable=!0}),100))
+else if(!dr(t,e)){var n=lr(t,e)
+switch(window.focus(),Wi(e)){case 1:t.state.selectingText?t.state.selectingText(e):n?function(e,t,r){o?setTimeout(xo(be,e),0):e.curOp.focus=No()
+var n,i=+new Date
+Ft&&Ft.time>i-400&&0==pe(Ft.pos,r)?n="triple":Lt&&Lt.time>i-400&&0==pe(Lt.pos,r)?(n="double",Ft={time:i,pos:r}):(n="single",Lt={time:i,pos:r})
+var l,u=e.doc.sel,c=v?t.metaKey:t.ctrlKey
+e.options.dragDrop&&$o&&!e.isReadOnly()&&"single"==n&&(l=u.contains(r))>-1&&(pe((l=u.ranges[l]).from(),r)<0||r.xRel>0)&&(pe(l.to(),r)>0||r.xRel<0)?function(e,t,r,n){var i=e.display,l=+new Date,u=Kt(e,(function(c){s&&(i.scroller.draggable=!1),e.state.draggingText=!1,Ji(document,"mouseup",u),Ji(i.scroller,"drop",u),Math.abs(t.clientX-c.clientX)+Math.abs(t.clientY-c.clientY)<10&&(Hi(c),!n&&+new Date-200<l&&He(e.doc,r),s||o&&9==a?setTimeout((function(){document.body.focus(),i.input.focus()}),20):i.input.focus())}))
+s&&(i.scroller.draggable=!0)
+e.state.draggingText=u,i.scroller.dragDrop&&i.scroller.dragDrop()
+Gi(document,"mouseup",u),Gi(i.scroller,"drop",u)}(e,t,r,c):function(e,t,r,n,i){var o=e.display,a=e.doc
+Hi(t)
+var s,l,u=a.sel,c=u.ranges
+i&&!t.shiftKey?(l=a.sel.contains(r),s=l>-1?c[l]:new je(r,r)):(s=a.sel.primary(),l=a.sel.primIndex)
+if(g?t.shiftKey&&t.metaKey:t.altKey)n="rect",i||(s=new je(r,r)),r=lr(e,t,!0,!0),l=-1
+else if("double"==n){var d=e.findWordAt(r)
+s=e.display.shift||a.extend?Ue(a,s,d.anchor,d.head):d}else if("triple"==n){var h=new je(fe(r.line,0),Le(a,fe(r.line+1,0)))
+s=e.display.shift||a.extend?Ue(a,s,h.anchor,h.head):h}else s=Ue(a,s,r)
+i?-1==l?(l=c.length,We(a,De(c.concat([s]),l),{scroll:!1,origin:"*mouse"})):c.length>1&&c[l].empty()&&"single"==n&&!t.shiftKey?(We(a,De(c.slice(0,l).concat(c.slice(l+1)),0),{scroll:!1,origin:"*mouse"}),u=a.sel):Ve(a,l,s,lo):(l=0,We(a,new Re([s],0),lo),u=a.sel)
+var f=r
+var p=o.wrapper.getBoundingClientRect(),m=0
+function v(t){var i=++m,c=lr(e,t,!0,"rect"==n)
+if(c)if(0!=pe(c,f)){e.curOp.focus=No(),function(t){if(0!=pe(f,t))if(f=t,"rect"==n){for(var i=[],o=e.options.tabSize,c=ho(Ei(a,r.line).text,r.ch,o),d=ho(Ei(a,t.line).text,t.ch,o),h=Math.min(c,d),p=Math.max(c,d),m=Math.min(r.line,t.line),v=Math.min(e.lastLine(),Math.max(r.line,t.line));m<=v;m++){var g=Ei(a,m).text,b=fo(g,h,o)
+h==p?i.push(new je(fe(m,b),fe(m,b))):g.length>b&&i.push(new je(fe(m,b),fe(m,fo(g,p,o))))}i.length||i.push(new je(r,r)),We(a,De(u.ranges.slice(0,l).concat(i),l),{origin:"*mouse",scroll:!1}),e.scrollIntoView(t)}else{var y=s,_=y.anchor,w=t
+if("single"!=n){if("double"==n)var E=e.findWordAt(t)
+else E=new je(fe(t.line,0),Le(a,fe(t.line+1,0)))
+pe(E.anchor,_)>0?(w=E.head,_=ge(y.from(),E.anchor)):(w=E.anchor,_=ve(y.to(),E.head))}(i=u.ranges.slice(0))[l]=new je(Le(a,_),w),We(a,De(i,l),lo)}}(c)
+var d=V(o,a);(c.line>=d.to||c.line<d.from)&&setTimeout(Kt(e,(function(){m==i&&v(t)})),150)}else{var h=t.clientY<p.top?-20:t.clientY>p.bottom?20:0
+h&&setTimeout(Kt(e,(function(){m==i&&(o.scroller.scrollTop+=h,v(t))})),50)}}function b(t){e.state.selectingText=!1,m=1/0,Hi(t),o.input.focus(),Ji(document,"mousemove",y),Ji(document,"mouseup",_),a.history.lastSelOrigin=null}var y=Kt(e,(function(e){Wi(e)?v(e):b(e)})),_=Kt(e,b)
+e.state.selectingText=_,Gi(document,"mousemove",y),Gi(document,"mouseup",_)}(e,t,r,n,c)}(t,e,n):qi(e)==r.scroller&&Hi(e)
+break
+case 2:s&&(t.state.lastMiddleDown=+new Date),n&&He(t.doc,n),setTimeout((function(){r.input.focus()}),20),Hi(e)
+break
+case 3:w?kr(t,e):function(e){e.state.delayingBlurEvent=!0,setTimeout((function(){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1,Cr(e))}),100)}(t)}}}function cr(e,t,r,n){try{var i=t.clientX,o=t.clientY}catch(t){return!1}if(i>=Math.floor(e.display.gutters.getBoundingClientRect().right))return!1
+n&&Hi(t)
+var a=e.display,s=a.lineDiv.getBoundingClientRect()
+if(o>s.bottom||!no(e,r))return Vi(t)
+o-=s.top-a.viewOffset
+for(var l=0;l<e.options.gutters.length;++l){var u=a.gutters.childNodes[l]
+if(u&&u.getBoundingClientRect().right>=i){var c=Mi(e.doc,o),d=e.options.gutters[l]
+return Qi(e,r,e,c,d,t),Vi(t)}}}function dr(e,t){return cr(e,t,"gutterClick",!0)}var hr=0
+function fr(e){var t=this
+if(pr(t),!to(t,e)&&!sr(t.display,e)){Hi(e),o&&(hr=+new Date)
+var r=lr(t,e,!0),n=e.dataTransfer.files
+if(r&&!t.isReadOnly())if(n&&n.length&&window.FileReader&&window.File)for(var i=n.length,a=Array(i),s=0,l=function(e,n){if(!t.options.allowDropFileTypes||-1!=bo(t.options.allowDropFileTypes,e.type)){var o=new FileReader
+o.onload=Kt(t,(function(){var e=o.result
+if(/[\x00-\x08\x0e-\x1f]{2}/.test(e)&&(e=""),a[n]=e,++s==i){var l={from:r=Le(t.doc,r),to:r,text:t.doc.splitLines(a.join(t.doc.lineSeparator())),origin:"paste"}
+Lr(t.doc,l),qe(t.doc,Ne(r,Rr(l)))}})),o.readAsText(e)}},u=0;u<i;++u)l(n[u],u)
+else{if(t.state.draggingText&&t.doc.sel.contains(r)>-1)return t.state.draggingText(e),void setTimeout((function(){t.display.input.focus()}),20)
+try{if(a=e.dataTransfer.getData("Text")){if(t.state.draggingText&&!(v?e.altKey:e.ctrlKey))var c=t.listSelections()
+if(Ge(t.doc,Ne(r,r)),c)for(u=0;u<c.length;++u)Br(t.doc,"",c[u].anchor,c[u].head,"drag")
+t.replaceSelection(a,"around","paste"),t.display.input.focus()}}catch(e){}}}}function pr(e){e.display.dragCursor&&(e.display.lineSpace.removeChild(e.display.dragCursor),e.display.dragCursor=null)}function mr(e,t){Math.abs(e.doc.scrollTop-t)<2||(e.doc.scrollTop=t,r||Q(e,{top:t}),e.display.scroller.scrollTop!=t&&(e.display.scroller.scrollTop=t),e.display.scrollbars.setScrollTop(t),r&&Q(e),ot(e,100))}function vr(e,t,r){(r?t==e.doc.scrollLeft:Math.abs(e.doc.scrollLeft-t)<2)||(t=Math.min(t,e.display.scroller.scrollWidth-e.display.scroller.clientWidth),e.doc.scrollLeft=t,$(e),e.display.scroller.scrollLeft!=t&&(e.display.scroller.scrollLeft=t),e.display.scrollbars.setScrollLeft(t))}var gr=0,br=null
+o?br=-.53:r?br=15:u?br=-.7:d&&(br=-1/3)
+var yr=function(e){var t=e.wheelDeltaX,r=e.wheelDeltaY
+return null==t&&e.detail&&e.axis==e.HORIZONTAL_AXIS&&(t=e.detail),null==r&&e.detail&&e.axis==e.VERTICAL_AXIS?r=e.detail:null==r&&(r=e.wheelDelta),{x:t,y:r}}
+function _r(e,t){var n=yr(t),i=n.x,o=n.y,a=e.display,l=a.scroller,u=l.scrollWidth>l.clientWidth,d=l.scrollHeight>l.clientHeight
+if(i&&u||o&&d){if(o&&v&&s)e:for(var h=t.target,f=a.view;h!=l;h=h.parentNode)for(var p=0;p<f.length;p++)if(f[p].node==h){e.display.currentWheelTarget=h
+break e}if(i&&!r&&!c&&null!=br)return o&&d&&mr(e,Math.max(0,Math.min(l.scrollTop+o*br,l.scrollHeight-l.clientHeight))),vr(e,Math.max(0,Math.min(l.scrollLeft+i*br,l.scrollWidth-l.clientWidth))),(!o||o&&d)&&Hi(t),void(a.wheelStartX=null)
+if(o&&null!=br){var m=o*br,g=e.doc.scrollTop,b=g+a.wrapper.clientHeight
+m<0?g=Math.max(0,g+m-50):b=Math.min(e.doc.height,b+m+50),Q(e,{top:g,bottom:b})}gr<20&&(null==a.wheelStartX?(a.wheelStartX=l.scrollLeft,a.wheelStartY=l.scrollTop,a.wheelDX=i,a.wheelDY=o,setTimeout((function(){if(null!=a.wheelStartX){var e=l.scrollLeft-a.wheelStartX,t=l.scrollTop-a.wheelStartY,r=t&&a.wheelDY&&t/a.wheelDY||e&&a.wheelDX&&e/a.wheelDX
+a.wheelStartX=a.wheelStartY=null,r&&(br=(br*gr+r)/(gr+1),++gr)}}),200)):(a.wheelDX+=i,a.wheelDY+=o))}}function wr(e,t,r){if("string"==typeof t&&!(t=cn[t]))return!1
+e.display.input.ensurePolled()
+var n=e.display.shift,i=!1
+try{e.isReadOnly()&&(e.state.suppressEdits=!0),r&&(e.display.shift=!1),i=t(e)!=ao}finally{e.display.shift=n,e.state.suppressEdits=!1}return i}O.wheelEventPixels=function(e){var t=yr(e)
+return t.x*=br,t.y*=br,t}
+var Er=new co
+function xr(e,t,r,n){var i=e.state.keySeq
+if(i){if(pn(t))return"handled"
+Er.set(50,(function(){e.state.keySeq==i&&(e.state.keySeq=null,e.display.input.reset())})),t=i+" "+t}var o=function(e,t,r){for(var n=0;n<e.state.keyMaps.length;n++){var i=fn(t,e.state.keyMaps[n],r,e)
+if(i)return i}return e.options.extraKeys&&fn(t,e.options.extraKeys,r,e)||fn(t,e.options.keyMap,r,e)}(e,t,n)
+return"multi"==o&&(e.state.keySeq=t),"handled"==o&&Zi(e,"keyHandled",e,t,r),"handled"!=o&&"multi"!=o||(Hi(r),it(e)),i&&!o&&/\'$/.test(t)?(Hi(r),!0):!!o}function Or(e,t){var r=mn(t,!0)
+return!!r&&(t.shiftKey&&!e.state.keySeq?xr(e,"Shift-"+r,t,(function(t){return wr(e,t,!0)}))||xr(e,r,t,(function(t){if("string"==typeof t?/^go[A-Z]/.test(t):t.motion)return wr(e,t)})):xr(e,r,t,(function(t){return wr(e,t)})))}var Sr=null
+function Tr(e){var t=this
+if(t.curOp.focus=No(),!to(t,e)){o&&a<11&&27==e.keyCode&&(e.returnValue=!1)
+var r=e.keyCode
+t.display.shift=16==r||e.shiftKey
+var n=Or(t,e)
+c&&(Sr=n?r:null,n||88!=r||Jo||!(v?e.metaKey:e.ctrlKey)||t.replaceSelection("",null,"cut")),18!=r||/\bCodeMirror-crosshair\b/.test(t.display.lineDiv.className)||function(e){var t=e.display.lineDiv
+function r(e){18!=e.keyCode&&e.altKey||(Lo(t,"CodeMirror-crosshair"),Ji(document,"keyup",r),Ji(document,"mouseover",r))}Fo(t,"CodeMirror-crosshair"),Gi(document,"keyup",r),Gi(document,"mouseover",r)}(t)}}function Mr(e){16==e.keyCode&&(this.doc.sel.shift=!1),to(this,e)}function Ar(e){var t=this
+if(!(sr(t.display,e)||to(t,e)||e.ctrlKey&&!e.altKey||v&&e.metaKey)){var r=e.keyCode,n=e.charCode
+if(c&&r==Sr)return Sr=null,void Hi(e)
+if(!c||e.which&&!(e.which<10)||!Or(t,e))(function(e,t,r){return xr(e,"'"+r+"'",t,(function(t){return wr(e,t,!0)}))})(t,e,String.fromCharCode(null==n?r:n))||t.display.input.onKeyPress(e)}}function Pr(e){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1),"nocursor"!=e.options.readOnly&&(e.state.focused||(Qi(e,"focus",e),e.state.focused=!0,Fo(e.display.wrapper,"CodeMirror-focused"),e.curOp||e.display.selForContextMenu==e.doc.sel||(e.display.input.reset(),s&&setTimeout((function(){e.display.input.reset(!0)}),20)),e.display.input.receivedFocus()),it(e))}function Cr(e){e.state.delayingBlurEvent||(e.state.focused&&(Qi(e,"blur",e),e.state.focused=!1,Lo(e.display.wrapper,"CodeMirror-focused")),clearInterval(e.display.blinker),setTimeout((function(){e.state.focused||(e.display.shift=!1)}),150))}function kr(e,t){sr(e.display,t)||function(e,t){return!!no(e,"gutterContextMenu")&&cr(e,t,"gutterContextMenu",!1)}(e,t)||to(e,t,"contextmenu")||e.display.input.onContextMenu(t)}var Rr=O.changeEnd=function(e){return e.text?fe(e.from.line+e.text.length-1,vo(e.text).length+(1==e.text.length?e.from.ch:0)):e.to}
+function jr(e,t){if(pe(e,t.from)<0)return e
+if(pe(e,t.to)<=0)return Rr(t)
+var r=e.line+t.text.length-(t.to.line-t.from.line)-1,n=e.ch
+return e.line==t.to.line&&(n+=Rr(t).ch-t.to.ch),fe(r,n)}function Dr(e,t){for(var r=[],n=0;n<e.sel.ranges.length;n++){var i=e.sel.ranges[n]
+r.push(new je(jr(i.anchor,t),jr(i.head,t)))}return De(r,e.sel.primIndex)}function Nr(e,t,r){return e.line==t.line?fe(r.line,e.ch-t.ch+r.ch):fe(r.line+(e.line-t.line),e.ch)}function Ir(e,t,r){var n={canceled:!1,from:t.from,to:t.to,text:t.text,origin:t.origin,cancel:function(){this.canceled=!0}}
+return r&&(n.update=function(t,r,n,i){t&&(this.from=Le(e,t)),r&&(this.to=Le(e,r)),n&&(this.text=n),void 0!==i&&(this.origin=i)}),Qi(e,"beforeChange",e,n),e.cm&&Qi(e.cm,"beforeChange",e.cm,n),n.canceled?null:{from:n.from,to:n.to,text:n.text,origin:n.origin}}function Lr(e,t,r){if(e.cm){if(!e.cm.curOp)return Kt(e.cm,Lr)(e,t,r)
+if(e.cm.state.suppressEdits)return}if(!(no(e,"beforeChange")||e.cm&&no(e.cm,"beforeChange"))||(t=Ir(e,t,!0))){var n=E&&!r&&function(e,t,r){var n=null
+if(e.iter(t.line,r.line+1,(function(e){if(e.markedSpans)for(var t=0;t<e.markedSpans.length;++t){var r=e.markedSpans[t].marker
+!r.readOnly||n&&-1!=bo(n,r)||(n||(n=[])).push(r)}})),!n)return null
+for(var i=[{from:t,to:r}],o=0;o<n.length;++o)for(var a=n[o],s=a.find(0),l=0;l<i.length;++l){var u=i[l]
+if(!(pe(u.to,s.from)<0||pe(u.from,s.to)>0)){var c=[l,1],d=pe(u.from,s.from),h=pe(u.to,s.to);(d<0||!a.inclusiveLeft&&!d)&&c.push({from:u.from,to:s.from}),(h>0||!a.inclusiveRight&&!h)&&c.push({from:s.to,to:u.to}),i.splice.apply(i,c),l+=c.length-1}}return i}(e,t.from,t.to)
+if(n)for(var i=n.length-1;i>=0;--i)Fr(e,{from:n[i].from,to:n[i].to,text:i?[""]:t.text})
+else Fr(e,t)}}function Fr(e,t){if(1!=t.text.length||""!=t.text[0]||0!=pe(t.from,t.to)){var r=Dr(e,t)
+ji(e,t,r,e.cm?e.cm.curOp.id:NaN),Hr(e,t,r,Mn(e,t))
+var n=[]
+_i(e,(function(e,r){r||-1!=bo(n,e.history)||(Ui(e.history,t),n.push(e.history)),Hr(e,t,null,Mn(e,t))}))}}function zr(e,t,r){if(!e.cm||!e.cm.state.suppressEdits){for(var n,i=e.history,o=e.sel,a="undo"==t?i.done:i.undone,s="undo"==t?i.undone:i.done,l=0;l<a.length&&(n=a[l],r?!n.ranges||n.equals(e.sel):n.ranges);l++);if(l!=a.length){for(i.lastOrigin=i.lastSelOrigin=null;(n=a.pop()).ranges;){if(Di(n,s),r&&!n.equals(e.sel))return void We(e,n,{clearRedo:!1})
+o=n}var u=[]
+Di(o,s),s.push({changes:u,generation:i.generation}),i.generation=n.generation||++i.maxGeneration
+var c=no(e,"beforeChange")||e.cm&&no(e.cm,"beforeChange")
+for(l=n.changes.length-1;l>=0;--l){var d=n.changes[l]
+if(d.origin=t,c&&!Ir(e,d,!1))return void(a.length=0)
+u.push(ki(e,d))
+var h=l?Dr(e,d):vo(a)
+Hr(e,d,h,Pn(e,d)),!l&&e.cm&&e.cm.scrollIntoView({from:d.from,to:Rr(d)})
+var f=[]
+_i(e,(function(e,t){t||-1!=bo(f,e.history)||(Ui(e.history,d),f.push(e.history)),Hr(e,d,null,Pn(e,d))}))}}}}function Ur(e,t){if(0!=t&&(e.first+=t,e.sel=new Re(yo(e.sel.ranges,(function(e){return new je(fe(e.anchor.line+t,e.anchor.ch),fe(e.head.line+t,e.head.ch))})),e.sel.primIndex),e.cm)){er(e.cm,e.first,e.first-t,t)
+for(var r=e.cm.display,n=r.viewFrom;n<r.viewTo;n++)tr(e.cm,n,"gutter")}}function Hr(e,t,r,n){if(e.cm&&!e.cm.curOp)return Kt(e.cm,Hr)(e,t,r,n)
+if(t.to.line<e.first)Ur(e,t.text.length-1-(t.to.line-t.from.line))
+else if(!(t.from.line>e.lastLine())){if(t.from.line<e.first){var i=t.text.length-1-(e.first-t.from.line)
+Ur(e,i),t={from:fe(e.first,0),to:fe(t.to.line+i,t.to.ch),text:[vo(t.text)],origin:t.origin}}var o=e.lastLine()
+t.to.line>o&&(t={from:t.from,to:fe(o,Ei(e,o).text.length),text:[t.text[0]],origin:t.origin}),t.removed=xi(e,t.from,t.to),r||(r=Dr(e,t)),e.cm?function(e,t,r){var n=e.doc,i=e.display,o=t.from,a=t.to,s=!1,l=o.line
+e.options.lineWrapping||(l=Ti(zn(Ei(n,o.line))),n.iter(l,a.line+1,(function(e){if(e==i.maxLine)return s=!0,!0})))
+n.sel.contains(t.from,t.to)>-1&&ro(e)
+fi(n,t,r,A(e)),e.options.lineWrapping||(n.iter(l,o.line+t.text.length,(function(e){var t=D(e)
+t>i.maxLineLength&&(i.maxLine=e,i.maxLineLength=t,i.maxLineChanged=!0,s=!1)})),s&&(e.curOp.updateMaxLine=!0))
+n.frontier=Math.min(n.frontier,o.line),ot(e,400)
+var u=t.text.length-(a.line-o.line)-1
+t.full?er(e):o.line!=a.line||1!=t.text.length||hi(e.doc,t)?er(e,o.line,a.line+1,u):tr(e,o.line,"text")
+var c=no(e,"changes"),d=no(e,"change")
+if(d||c){var h={from:o,to:a,text:t.text,removed:t.removed,origin:t.origin}
+d&&Zi(e,"change",e,h),c&&(e.curOp.changeObjs||(e.curOp.changeObjs=[])).push(h)}e.display.selForContextMenu=null}(e.cm,t,n):fi(e,t,n),Ge(e,r,so)}}function Br(e,t,r,n,i){if(n||(n=r),pe(n,r)<0){var o=n
+n=r,r=o}"string"==typeof t&&(t=e.splitLines(t)),Lr(e,{from:r,to:n,text:t,origin:i})}function Vr(e,t,r,n,i){var o=e.display,a=Nt(e.display)
+r<0&&(r=0)
+var s=e.curOp&&null!=e.curOp.scrollTop?e.curOp.scrollTop:o.scroller.scrollTop,l=ft(e),u={}
+i-r>l&&(i=r+l)
+var c=e.doc.height+ut(o),d=r<a,h=i>c-a
+if(r<s)u.scrollTop=d?0:r
+else if(i>s+l){var f=Math.min(r,(h?c:i)-l)
+f!=s&&(u.scrollTop=f)}var p=e.curOp&&null!=e.curOp.scrollLeft?e.curOp.scrollLeft:o.scroller.scrollLeft,m=ht(e)-(e.options.fixedGutter?o.gutters.offsetWidth:0),v=n-t>m
+return v&&(n=t+m),t<10?u.scrollLeft=0:t<p?u.scrollLeft=Math.max(0,t-(v?0:10)):n>m+p-3&&(u.scrollLeft=n+(v?0:10)-m),u}function $r(e,t,r){null==t&&null==r||Wr(e),null!=t&&(e.curOp.scrollLeft=(null==e.curOp.scrollLeft?e.doc.scrollLeft:e.curOp.scrollLeft)+t),null!=r&&(e.curOp.scrollTop=(null==e.curOp.scrollTop?e.doc.scrollTop:e.curOp.scrollTop)+r)}function qr(e){Wr(e)
+var t=e.getCursor(),r=t,n=t
+e.options.lineWrapping||(r=t.ch?fe(t.line,t.ch-1):t,n=fe(t.line,t.ch+1)),e.curOp.scrollToPos={from:r,to:n,margin:e.options.cursorScrollMargin,isCursor:!0}}function Wr(e){var t=e.curOp.scrollToPos
+if(t){e.curOp.scrollToPos=null
+var r=kt(e,t.from),n=kt(e,t.to),i=Vr(e,Math.min(r.left,n.left),Math.min(r.top,n.top)-t.margin,Math.max(r.right,n.right),Math.max(r.bottom,n.bottom)+t.margin)
+e.scrollTo(i.scrollLeft,i.scrollTop)}}function Gr(e,t,r,n){var i,o=e.doc
+null==r&&(r="add"),"smart"==r&&(o.mode.indent?i=st(e,t):r="prev")
+var a=e.options.tabSize,s=Ei(o,t),l=ho(s.text,null,a)
+s.stateAfter&&(s.stateAfter=null)
+var u,c=s.text.match(/^\s*/)[0]
+if(n||/\S/.test(s.text)){if("smart"==r&&((u=o.mode.indent(i,s.text.slice(c.length),s.text))==ao||u>150)){if(!n)return
+r="prev"}}else u=0,r="not"
+"prev"==r?u=t>o.first?ho(Ei(o,t-1).text,null,a):0:"add"==r?u=l+e.options.indentUnit:"subtract"==r?u=l-e.options.indentUnit:"number"==typeof r&&(u=l+r),u=Math.max(0,u)
+var d="",h=0
+if(e.options.indentWithTabs)for(var f=Math.floor(u/a);f;--f)h+=a,d+="\t"
+if(h<u&&(d+=mo(u-h)),d!=c)return Br(o,d,fe(t,0),fe(t,c.length),"+input"),s.stateAfter=null,!0
+for(f=0;f<o.sel.ranges.length;f++){var p=o.sel.ranges[f]
+if(p.head.line==t&&p.head.ch<c.length){Ve(o,f,new je(h=fe(t,c.length),h))
+break}}}function Yr(e,t,r,n){var i=t,o=t
+return"number"==typeof t?o=Ei(e,Ie(e,t)):i=Ti(t),null==i?null:(n(o,i)&&e.cm&&tr(e.cm,i,r),o)}function Kr(e,t){for(var r=e.doc.sel.ranges,n=[],i=0;i<r.length;i++){for(var o=t(r[i]);n.length&&pe(o.from,vo(n).to)<=0;){var a=n.pop()
+if(pe(a.from,o.from)<0){o.from=a.from
+break}}n.push(o)}Yt(e,(function(){for(var t=n.length-1;t>=0;t--)Br(e.doc,"",n[t].from,n[t].to,"+delete")
+qr(e)}))}function Jr(e,t,r,n,i){var o=t.line,a=t.ch,s=r,l=Ei(e,o)
+function u(t){var n,s=(i?ua:ca)(l,a,r,!0)
+if(null==s){if(t||(n=o+r)<e.first||n>=e.first+e.size||(o=n,!(l=Ei(e,n))))return!1
+a=i?(r<0?na:ra)(l):r<0?l.text.length:0}else a=s
+return!0}if("char"==n)u()
+else if("column"==n)u(!0)
+else if("word"==n||"group"==n)for(var c=null,d="group"==n,h=e.cm&&e.cm.getHelper(t,"wordChars"),f=!0;!(r<0)||u(!f);f=!1){var p=l.text.charAt(a)||"\n",m=To(p,h)?"w":d&&"\n"==p?"n":!d||/\s/.test(p)?null:"p"
+if(!d||f||m||(m="s"),c&&c!=m){r<0&&(r=1,u())
+break}if(m&&(c=m),r>0&&!u(!f))break}var v=Xe(e,fe(o,a),t,s,!0)
+return pe(t,v)||(v.hitSide=!0),v}function Qr(e,t,r,n){var i,o=e.doc,a=t.left
+if("page"==n){var s=Math.min(e.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight)
+i=t.top+r*(s-(r<0?1.5:.5)*Nt(e.display))}else"line"==n&&(i=r>0?t.bottom+3:t.top-3)
+for(;;){var l=jt(e,a,i)
+if(!l.outside)break
+if(r<0?i<=0:i>=o.height){l.hitSide=!0
+break}i+=5*r}return l}O.prototype={constructor:O,focus:function(){window.focus(),this.display.input.focus()},setOption:function(e,t){var r=this.options,n=r[e]
+r[e]==t&&"mode"!=e||(r[e]=t,Zr.hasOwnProperty(e)&&Kt(this,Zr[e])(this,t,n))},getOption:function(e){return this.options[e]},getDoc:function(){return this.doc},addKeyMap:function(e,t){this.state.keyMaps[t?"push":"unshift"](vn(e))},removeKeyMap:function(e){for(var t=this.state.keyMaps,r=0;r<t.length;++r)if(t[r]==e||t[r].name==e)return t.splice(r,1),!0},addOverlay:Jt((function(e,t){var r=e.token?e:O.getMode(this.options,e)
+if(r.startState)throw new Error("Overlays may not be stateful.")
+this.state.overlays.push({mode:r,modeSpec:e,opaque:t&&t.opaque}),this.state.modeGen++,er(this)})),removeOverlay:Jt((function(e){for(var t=this.state.overlays,r=0;r<t.length;++r){var n=t[r].modeSpec
+if(n==e||"string"==typeof e&&n.name==e)return t.splice(r,1),this.state.modeGen++,void er(this)}})),indentLine:Jt((function(e,t,r){"string"!=typeof t&&"number"!=typeof t&&(t=null==t?this.options.smartIndent?"smart":"prev":t?"add":"subtract"),Fe(this.doc,e)&&Gr(this,e,t,r)})),indentSelection:Jt((function(e){for(var t=this.doc.sel.ranges,r=-1,n=0;n<t.length;n++){var i=t[n]
+if(i.empty())i.head.line>r&&(Gr(this,i.head.line,e,!0),r=i.head.line,n==this.doc.sel.primIndex&&qr(this))
+else{var o=i.from(),a=i.to(),s=Math.max(r,o.line)
+r=Math.min(this.lastLine(),a.line-(a.ch?0:1))+1
+for(var l=s;l<r;++l)Gr(this,l,e)
+var u=this.doc.sel.ranges
+0==o.ch&&t.length==u.length&&u[n].from().ch>0&&Ve(this.doc,n,new je(o,u[n].to()),so)}}})),getTokenAt:function(e,t){return Xn(this,e,t)},getLineTokens:function(e,t){return Xn(this,fe(e),t,!0)},getTokenTypeAt:function(e){e=Le(this.doc,e)
+var t,r=ti(this,Ei(this.doc,e.line)),n=0,i=(r.length-1)/2,o=e.ch
+if(0==o)t=r[2]
+else for(;;){var a=n+i>>1
+if((a?r[2*a-1]:0)>=o)i=a
+else{if(!(r[2*a+1]<o)){t=r[2*a+2]
+break}n=a+1}}var s=t?t.indexOf("cm-overlay "):-1
+return s<0?t:0==s?null:t.slice(0,s-1)},getModeAt:function(e){var t=this.doc.mode
+return t.innerMode?O.innerMode(t,this.getTokenAt(e).state).mode:t},getHelper:function(e,t){return this.getHelpers(e,t)[0]},getHelpers:function(e,t){var r=[]
+if(!sn.hasOwnProperty(t))return r
+var n=sn[t],i=this.getModeAt(e)
+if("string"==typeof i[t])n[i[t]]&&r.push(n[i[t]])
+else if(i[t])for(var o=0;o<i[t].length;o++){var a=n[i[t][o]]
+a&&r.push(a)}else i.helperType&&n[i.helperType]?r.push(n[i.helperType]):n[i.name]&&r.push(n[i.name])
+for(o=0;o<n._global.length;o++){var s=n._global[o]
+s.pred(i,this)&&-1==bo(r,s.val)&&r.push(s.val)}return r},getStateAfter:function(e,t){var r=this.doc
+return st(this,(e=Ie(r,null==e?r.first+r.size-1:e))+1,t)},cursorCoords:function(e,t){var r=this.doc.sel.primary()
+return Ct(this,null==e?r.head:"object"==typeof e?Le(this.doc,e):e?r.from():r.to(),t||"page")},charCoords:function(e,t){return Pt(this,Le(this.doc,e),t||"page")},coordsChar:function(e,t){return jt(this,(e=At(this,e,t||"page")).left,e.top)},lineAtHeight:function(e,t){return e=At(this,{top:e,left:0},t||"page").top,Mi(this.doc,e+this.display.viewOffset)},heightAtLine:function(e,t){var r,n=!1
+if("number"==typeof e){var i=this.doc.first+this.doc.size-1
+e<this.doc.first?e=this.doc.first:e>i&&(e=i,n=!0),r=Ei(this.doc,e)}else r=e
+return Mt(this,r,{top:0,left:0},t||"page").top+(n?this.doc.height-Ai(r):0)},defaultTextHeight:function(){return Nt(this.display)},defaultCharWidth:function(){return It(this.display)},setGutterMarker:Jt((function(e,t,r){return Yr(this.doc,e,"gutter",(function(e){var n=e.gutterMarkers||(e.gutterMarkers={})
+return n[t]=r,!r&&Mo(n)&&(e.gutterMarkers=null),!0}))})),clearGutter:Jt((function(e){var t=this,r=t.doc,n=r.first
+r.iter((function(r){r.gutterMarkers&&r.gutterMarkers[e]&&(r.gutterMarkers[e]=null,tr(t,n,"gutter"),Mo(r.gutterMarkers)&&(r.gutterMarkers=null)),++n}))})),lineInfo:function(e){if("number"==typeof e){if(!Fe(this.doc,e))return null
+var t=e
+if(!(e=Ei(this.doc,e)))return null}else{if(null==(t=Ti(e)))return null}return{line:t,handle:e,text:e.text,gutterMarkers:e.gutterMarkers,textClass:e.textClass,bgClass:e.bgClass,wrapClass:e.wrapClass,widgets:e.widgets}},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(e,t,r,n,i){var o,a,s,l,u,c,d=this.display,h=(e=Ct(this,Le(this.doc,e))).bottom,f=e.left
+if(t.style.position="absolute",t.setAttribute("cm-ignore-events","true"),this.display.input.setUneditable(t),d.sizer.appendChild(t),"over"==n)h=e.top
+else if("above"==n||"near"==n){var p=Math.max(d.wrapper.clientHeight,this.doc.height),m=Math.max(d.sizer.clientWidth,d.lineSpace.clientWidth);("above"==n||e.bottom+t.offsetHeight>p)&&e.top>t.offsetHeight?h=e.top-t.offsetHeight:e.bottom+t.offsetHeight<=p&&(h=e.bottom),f+t.offsetWidth>m&&(f=m-t.offsetWidth)}t.style.top=h+"px",t.style.left=t.style.right="","right"==i?(f=d.sizer.clientWidth-t.offsetWidth,t.style.right="0px"):("left"==i?f=0:"middle"==i&&(f=(d.sizer.clientWidth-t.offsetWidth)/2),t.style.left=f+"px"),r&&(o=this,a=f,s=h,l=f+t.offsetWidth,u=h+t.offsetHeight,null!=(c=Vr(o,a,s,l,u)).scrollTop&&mr(o,c.scrollTop),null!=c.scrollLeft&&vr(o,c.scrollLeft))},triggerOnKeyDown:Jt(Tr),triggerOnKeyPress:Jt(Ar),triggerOnKeyUp:Mr,execCommand:function(e){if(cn.hasOwnProperty(e))return cn[e].call(null,this)},triggerElectric:Jt((function(e){Ee(this,e)})),findPosH:function(e,t,r,n){var i=1
+t<0&&(i=-1,t=-t)
+for(var o=0,a=Le(this.doc,e);o<t&&!(a=Jr(this.doc,a,i,r,n)).hitSide;++o);return a},moveH:Jt((function(e,t){var r=this
+r.extendSelectionsBy((function(n){return r.display.shift||r.doc.extend||n.empty()?Jr(r.doc,n.head,e,t,r.options.rtlMoveVisually):e<0?n.from():n.to()}),uo)})),deleteH:Jt((function(e,t){var r=this.doc.sel,n=this.doc
+r.somethingSelected()?n.replaceSelection("",null,"+delete"):Kr(this,(function(r){var i=Jr(n,r.head,e,t,!1)
+return e<0?{from:i,to:r.head}:{from:r.head,to:i}}))})),findPosV:function(e,t,r,n){var i=1,o=n
+t<0&&(i=-1,t=-t)
+for(var a=0,s=Le(this.doc,e);a<t;++a){var l=Ct(this,s,"div")
+if(null==o?o=l.left:l.left=o,(s=Qr(this,l,i,r)).hitSide)break}return s},moveV:Jt((function(e,t){var r=this,n=this.doc,i=[],o=!r.display.shift&&!n.extend&&n.sel.somethingSelected()
+if(n.extendSelectionsBy((function(a){if(o)return e<0?a.from():a.to()
+var s=Ct(r,a.head,"div")
+null!=a.goalColumn&&(s.left=a.goalColumn),i.push(s.left)
+var l=Qr(r,s,e,t)
+return"page"==t&&a==n.sel.primary()&&$r(r,null,Pt(r,l,"div").top-s.top),l}),uo),i.length)for(var a=0;a<n.sel.ranges.length;a++)n.sel.ranges[a].goalColumn=i[a]})),findWordAt:function(e){var t=Ei(this.doc,e.line).text,r=e.ch,n=e.ch
+if(t){var i=this.getHelper(e,"wordChars");(e.xRel<0||n==t.length)&&r?--r:++n
+for(var o=t.charAt(r),a=To(o,i)?function(e){return To(e,i)}:/\s/.test(o)?function(e){return/\s/.test(e)}:function(e){return!/\s/.test(e)&&!To(e)};r>0&&a(t.charAt(r-1));)--r
+for(;n<t.length&&a(t.charAt(n));)++n}return new je(fe(e.line,r),fe(e.line,n))},toggleOverwrite:function(e){null!=e&&e==this.state.overwrite||((this.state.overwrite=!this.state.overwrite)?Fo(this.display.cursorDiv,"CodeMirror-overwrite"):Lo(this.display.cursorDiv,"CodeMirror-overwrite"),Qi(this,"overwriteToggle",this,this.state.overwrite))},hasFocus:function(){return this.display.input.getField()==No()},isReadOnly:function(){return!(!this.options.readOnly&&!this.doc.cantEdit)},scrollTo:Jt((function(e,t){null==e&&null==t||Wr(this),null!=e&&(this.curOp.scrollLeft=e),null!=t&&(this.curOp.scrollTop=t)})),getScrollInfo:function(){var e=this.display.scroller
+return{left:e.scrollLeft,top:e.scrollTop,height:e.scrollHeight-dt(this)-this.display.barHeight,width:e.scrollWidth-dt(this)-this.display.barWidth,clientHeight:ft(this),clientWidth:ht(this)}},scrollIntoView:Jt((function(e,t){if(null==e?(e={from:this.doc.sel.primary().head,to:null},null==t&&(t=this.options.cursorScrollMargin)):"number"==typeof e?e={from:fe(e,0),to:null}:null==e.from&&(e={from:e,to:null}),e.to||(e.to=e.from),e.margin=t||0,null!=e.from.line)Wr(this),this.curOp.scrollToPos=e
+else{var r=Vr(this,Math.min(e.from.left,e.to.left),Math.min(e.from.top,e.to.top)-e.margin,Math.max(e.from.right,e.to.right),Math.max(e.from.bottom,e.to.bottom)+e.margin)
+this.scrollTo(r.scrollLeft,r.scrollTop)}})),setSize:Jt((function(e,t){var r=this
+function n(e){return"number"==typeof e||/^\d+$/.test(String(e))?e+"px":e}null!=e&&(r.display.wrapper.style.width=n(e)),null!=t&&(r.display.wrapper.style.height=n(t)),r.options.lineWrapping&&xt(this)
+var i=r.display.viewFrom
+r.doc.iter(i,r.display.viewTo,(function(e){if(e.widgets)for(var t=0;t<e.widgets.length;t++)if(e.widgets[t].noHScroll){tr(r,i,"widget")
+break}++i})),r.curOp.forceUpdate=!0,Qi(r,"refresh",this)})),operation:function(e){return Yt(this,e)},refresh:Jt((function(){var e=this.display.cachedTextHeight
+er(this),this.curOp.forceUpdate=!0,Ot(this),this.scrollTo(this.doc.scrollLeft,this.doc.scrollTop),j(this),(null==e||Math.abs(e-Nt(this.display))>.5)&&P(this),Qi(this,"refresh",this)})),swapDoc:Jt((function(e){var t=this.doc
+return t.cm=null,wi(this,e),Ot(this),this.display.input.reset(),this.scrollTo(e.scrollLeft,e.scrollTop),this.curOp.forceScroll=!0,Zi(this,"swapDoc",this,t),t})),getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},io(O)
+var Xr=O.defaults={},Zr=O.optionHandlers={}
+function en(e,t,r,n){O.defaults[e]=t,r&&(Zr[e]=n?function(e,t,n){n!=tn&&r(e,t,n)}:r)}var tn=O.Init={toString:function(){return"CodeMirror.Init"}}
+en("value","",(function(e,t){e.setValue(t)}),!0),en("mode",null,(function(e,t){e.doc.modeOption=t,T(e)}),!0),en("indentUnit",2,T,!0),en("indentWithTabs",!1),en("smartIndent",!0),en("tabSize",4,(function(e){M(e),Ot(e),er(e)}),!0),en("lineSeparator",null,(function(e,t){if(e.doc.lineSep=t,t){var r=[],n=e.doc.first
+e.doc.iter((function(e){for(var i=0;;){var o=e.text.indexOf(t,i)
+if(-1==o)break
+i=o+t.length,r.push(fe(n,o))}n++}))
+for(var i=r.length-1;i>=0;i--)Br(e.doc,t,r[i],fe(r[i].line,r[i].ch+t.length))}})),en("specialChars",/[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g,(function(e,t,r){e.state.specialChars=new RegExp(t.source+(t.test("\t")?"":"|\t"),"g"),r!=O.Init&&e.refresh()})),en("specialCharPlaceholder",(function(e){var t=ko("span","•","cm-invalidchar")
+return t.title="\\u"+e.charCodeAt(0).toString(16),t.setAttribute("aria-label",t.title),t}),(function(e){e.refresh()}),!0),en("electricChars",!0),en("inputStyle",m?"contenteditable":"textarea",(function(){throw new Error("inputStyle can not (yet) be changed in a running editor")}),!0),en("rtlMoveVisually",!b),en("wholeLineUpdateBefore",!0),en("theme","default",(function(e){C(e),k(e)}),!0),en("keyMap","default",(function(e,t,r){var n=vn(t),i=r!=O.Init&&vn(r)
+i&&i.detach&&i.detach(e,n),n.attach&&n.attach(e,i||null)})),en("extraKeys",null),en("lineWrapping",!1,(function(e){e.options.lineWrapping?(Fo(e.display.wrapper,"CodeMirror-wrap"),e.display.sizer.style.minWidth="",e.display.sizerWidth=null):(Lo(e.display.wrapper,"CodeMirror-wrap"),N(e)),P(e),er(e),Ot(e),setTimeout((function(){H(e)}),100)}),!0),en("gutters",[],(function(e){I(e.options),k(e)}),!0),en("fixedGutter",!0,(function(e,t){e.display.gutters.style.left=t?G(e.display)+"px":"0",e.refresh()}),!0),en("coverGutterNextToScrollbar",!1,(function(e){H(e)}),!0),en("scrollbarStyle","native",(function(e){U(e),H(e),e.display.scrollbars.setScrollTop(e.doc.scrollTop),e.display.scrollbars.setScrollLeft(e.doc.scrollLeft)}),!0),en("lineNumbers",!1,(function(e){I(e.options),k(e)}),!0),en("firstLineNumber",1,k,!0),en("lineNumberFormatter",(function(e){return e}),k,!0),en("showCursorWhenSelecting",!1,et,!0),en("resetSelectionOnContextMenu",!0),en("lineWiseCopyCut",!0),en("readOnly",!1,(function(e,t){"nocursor"==t?(Cr(e),e.display.input.blur(),e.display.disabled=!0):e.display.disabled=!1,e.display.input.readOnlyChanged(t)})),en("disableInput",!1,(function(e,t){t||e.display.input.reset()}),!0),en("dragDrop",!0,(function(e,t,r){if(!t!=!(r&&r!=O.Init)){var n=e.display.dragFunctions,i=t?Gi:Ji
+i(e.display.scroller,"dragstart",n.start),i(e.display.scroller,"dragenter",n.enter),i(e.display.scroller,"dragover",n.over),i(e.display.scroller,"dragleave",n.leave),i(e.display.scroller,"drop",n.drop)}}))
+en("allowDropFileTypes",null),en("cursorBlinkRate",530),en("cursorScrollMargin",0),en("cursorHeight",1,et,!0),en("singleCursorHeightPerLine",!0,et,!0),en("workTime",100),en("workDelay",100),en("flattenSpans",!0,M,!0),en("addModeClass",!1,M,!0),en("pollInterval",100),en("undoDepth",200,(function(e,t){e.doc.history.undoDepth=t})),en("historyEventDelay",1250),en("viewportMargin",10,(function(e){e.refresh()}),!0),en("maxHighlightLength",1e4,M,!0),en("moveInputWithCursor",!0,(function(e,t){t||e.display.input.resetPosition()})),en("tabindex",null,(function(e,t){e.display.input.getField().tabIndex=t||""})),en("autofocus",null)
+var rn=O.modes={},nn=O.mimeModes={}
+O.defineMode=function(e,t){O.defaults.mode||"null"==e||(O.defaults.mode=e),arguments.length>2&&(t.dependencies=Array.prototype.slice.call(arguments,2)),rn[e]=t},O.defineMIME=function(e,t){nn[e]=t},O.resolveMode=function(e){if("string"==typeof e&&nn.hasOwnProperty(e))e=nn[e]
+else if(e&&"string"==typeof e.name&&nn.hasOwnProperty(e.name)){var t=nn[e.name]
+"string"==typeof t&&(t={name:t}),(e=wo(t,e)).name=t.name}else if("string"==typeof e&&/^[\w\-]+\/[\w\-]+\+xml$/.test(e))return O.resolveMode("application/xml")
+return"string"==typeof e?{name:e}:e||{name:"null"}},O.getMode=function(e,t){t=O.resolveMode(t)
+var r=rn[t.name]
+if(!r)return O.getMode(e,"text/plain")
+var n=r(e,t)
+if(on.hasOwnProperty(t.name)){var i=on[t.name]
+for(var o in i)i.hasOwnProperty(o)&&(n.hasOwnProperty(o)&&(n["_"+o]=n[o]),n[o]=i[o])}if(n.name=t.name,t.helperType&&(n.helperType=t.helperType),t.modeProps)for(var o in t.modeProps)n[o]=t.modeProps[o]
+return n},O.defineMode("null",(function(){return{token:function(e){e.skipToEnd()}}})),O.defineMIME("text/plain","null")
+var on=O.modeExtensions={}
+O.extendMode=function(e,t){Eo(t,on.hasOwnProperty(e)?on[e]:on[e]={})},O.defineExtension=function(e,t){O.prototype[e]=t},O.defineDocExtension=function(e,t){gi.prototype[e]=t},O.defineOption=en
+var an=[]
+O.defineInitHook=function(e){an.push(e)}
+var sn=O.helpers={}
+O.registerHelper=function(e,t,r){sn.hasOwnProperty(e)||(sn[e]=O[e]={_global:[]}),sn[e][t]=r},O.registerGlobalHelper=function(e,t,r,n){O.registerHelper(e,t,n),sn[e]._global.push({pred:r,val:n})}
+var ln=O.copyState=function(e,t){if(!0===t)return t
+if(e.copyState)return e.copyState(t)
+var r={}
+for(var n in t){var i=t[n]
+i instanceof Array&&(i=i.concat([])),r[n]=i}return r},un=O.startState=function(e,t,r){return!e.startState||e.startState(t,r)}
+O.innerMode=function(e,t){for(;e.innerMode;){var r=e.innerMode(t)
+if(!r||r.mode==e)break
+t=r.state,e=r.mode}return r||{mode:e,state:t}}
+var cn=O.commands={selectAll:function(e){e.setSelection(fe(e.firstLine(),0),fe(e.lastLine()),so)},singleSelection:function(e){e.setSelection(e.getCursor("anchor"),e.getCursor("head"),so)},killLine:function(e){Kr(e,(function(t){if(t.empty()){var r=Ei(e.doc,t.head.line).text.length
+return t.head.ch==r&&t.head.line<e.lastLine()?{from:t.head,to:fe(t.head.line+1,0)}:{from:t.head,to:fe(t.head.line,r)}}return{from:t.from(),to:t.to()}}))},deleteLine:function(e){Kr(e,(function(t){return{from:fe(t.from().line,0),to:Le(e.doc,fe(t.to().line+1,0))}}))},delLineLeft:function(e){Kr(e,(function(e){return{from:fe(e.from().line,0),to:e.from()}}))},delWrappedLineLeft:function(e){Kr(e,(function(t){var r=e.charCoords(t.head,"div").top+5
+return{from:e.coordsChar({left:0,top:r},"div"),to:t.from()}}))},delWrappedLineRight:function(e){Kr(e,(function(t){var r=e.charCoords(t.head,"div").top+5,n=e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:r},"div")
+return{from:t.from(),to:n}}))},undo:function(e){e.undo()},redo:function(e){e.redo()},undoSelection:function(e){e.undoSelection()},redoSelection:function(e){e.redoSelection()},goDocStart:function(e){e.extendSelection(fe(e.firstLine(),0))},goDocEnd:function(e){e.extendSelection(fe(e.lastLine()))},goLineStart:function(e){e.extendSelectionsBy((function(t){return ia(e,t.head.line)}),{origin:"+move",bias:1})},goLineStartSmart:function(e){e.extendSelectionsBy((function(t){return oa(e,t.head)}),{origin:"+move",bias:1})},goLineEnd:function(e){e.extendSelectionsBy((function(t){return function(e,t){var r,n=Ei(e.doc,t)
+for(;r=Ln(n);)n=r.find(1,!0).line,t=null
+var i=Pi(n),o=i?i[0].level%2?ra(n):na(n):n.text.length
+return fe(null==t?Ti(n):t,o)}(e,t.head.line)}),{origin:"+move",bias:-1})},goLineRight:function(e){e.extendSelectionsBy((function(t){var r=e.charCoords(t.head,"div").top+5
+return e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:r},"div")}),uo)},goLineLeft:function(e){e.extendSelectionsBy((function(t){var r=e.charCoords(t.head,"div").top+5
+return e.coordsChar({left:0,top:r},"div")}),uo)},goLineLeftSmart:function(e){e.extendSelectionsBy((function(t){var r=e.charCoords(t.head,"div").top+5,n=e.coordsChar({left:0,top:r},"div")
+return n.ch<e.getLine(n.line).search(/\S/)?oa(e,t.head):n}),uo)},goLineUp:function(e){e.moveV(-1,"line")},goLineDown:function(e){e.moveV(1,"line")},goPageUp:function(e){e.moveV(-1,"page")},goPageDown:function(e){e.moveV(1,"page")},goCharLeft:function(e){e.moveH(-1,"char")},goCharRight:function(e){e.moveH(1,"char")},goColumnLeft:function(e){e.moveH(-1,"column")},goColumnRight:function(e){e.moveH(1,"column")},goWordLeft:function(e){e.moveH(-1,"word")},goGroupRight:function(e){e.moveH(1,"group")},goGroupLeft:function(e){e.moveH(-1,"group")},goWordRight:function(e){e.moveH(1,"word")},delCharBefore:function(e){e.deleteH(-1,"char")},delCharAfter:function(e){e.deleteH(1,"char")},delWordBefore:function(e){e.deleteH(-1,"word")},delWordAfter:function(e){e.deleteH(1,"word")},delGroupBefore:function(e){e.deleteH(-1,"group")},delGroupAfter:function(e){e.deleteH(1,"group")},indentAuto:function(e){e.indentSelection("smart")},indentMore:function(e){e.indentSelection("add")},indentLess:function(e){e.indentSelection("subtract")},insertTab:function(e){e.replaceSelection("\t")},insertSoftTab:function(e){for(var t=[],r=e.listSelections(),n=e.options.tabSize,i=0;i<r.length;i++){var o=r[i].from(),a=ho(e.getLine(o.line),o.ch,n)
+t.push(mo(n-a%n))}e.replaceSelections(t)},defaultTab:function(e){e.somethingSelected()?e.indentSelection("add"):e.execCommand("insertTab")},transposeChars:function(e){Yt(e,(function(){for(var t=e.listSelections(),r=[],n=0;n<t.length;n++){var i=t[n].head,o=Ei(e.doc,i.line).text
+if(o)if(i.ch==o.length&&(i=new fe(i.line,i.ch-1)),i.ch>0)i=new fe(i.line,i.ch+1),e.replaceRange(o.charAt(i.ch-1)+o.charAt(i.ch-2),fe(i.line,i.ch-2),i,"+transpose")
+else if(i.line>e.doc.first){var a=Ei(e.doc,i.line-1).text
+a&&e.replaceRange(o.charAt(0)+e.doc.lineSeparator()+a.charAt(a.length-1),fe(i.line-1,a.length-1),fe(i.line,1),"+transpose")}r.push(new je(i,i))}e.setSelections(r)}))},newlineAndIndent:function(e){Yt(e,(function(){for(var t=e.listSelections().length,r=0;r<t;r++){var n=e.listSelections()[r]
+e.replaceRange(e.doc.lineSeparator(),n.anchor,n.head,"+input"),e.indentLine(n.from().line+1,null,!0)}qr(e)}))},openLine:function(e){e.replaceSelection("\n","start")},toggleOverwrite:function(e){e.toggleOverwrite()}},dn=O.keyMap={}
+function hn(e){for(var t,r,n,i,o=e.split(/-(?!$)/),a=(e=o[o.length-1],0);a<o.length-1;a++){var s=o[a]
+if(/^(cmd|meta|m)$/i.test(s))i=!0
+else if(/^a(lt)?$/i.test(s))t=!0
+else if(/^(c|ctrl|control)$/i.test(s))r=!0
+else{if(!/^s(hift)$/i.test(s))throw new Error("Unrecognized modifier name: "+s)
+n=!0}}return t&&(e="Alt-"+e),r&&(e="Ctrl-"+e),i&&(e="Cmd-"+e),n&&(e="Shift-"+e),e}dn.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"},dn.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"},dn.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars","Ctrl-O":"openLine"},dn.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight","Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]},dn.default=v?dn.macDefault:dn.pcDefault,O.normalizeKeyMap=function(e){var t={}
+for(var r in e)if(e.hasOwnProperty(r)){var n=e[r]
+if(/^(name|fallthrough|(de|at)tach)$/.test(r))continue
+if("..."==n){delete e[r]
+continue}for(var i=yo(r.split(" "),hn),o=0;o<i.length;o++){var a,s
+o==i.length-1?(s=i.join(" "),a=n):(s=i.slice(0,o+1).join(" "),a="...")
+var l=t[s]
+if(l){if(l!=a)throw new Error("Inconsistent bindings for "+s)}else t[s]=a}delete e[r]}for(var u in t)e[u]=t[u]
+return e}
+var fn=O.lookupKey=function(e,t,r,n){var i=(t=vn(t)).call?t.call(e,n):t[e]
+if(!1===i)return"nothing"
+if("..."===i)return"multi"
+if(null!=i&&r(i))return"handled"
+if(t.fallthrough){if("[object Array]"!=Object.prototype.toString.call(t.fallthrough))return fn(e,t.fallthrough,r,n)
+for(var o=0;o<t.fallthrough.length;o++){var a=fn(e,t.fallthrough[o],r,n)
+if(a)return a}}},pn=O.isModifierKey=function(e){var t="string"==typeof e?e:Zo[e.keyCode]
+return"Ctrl"==t||"Alt"==t||"Shift"==t||"Mod"==t},mn=O.keyName=function(e,t){if(c&&34==e.keyCode&&e.char)return!1
+var r=Zo[e.keyCode],n=r
+return null!=n&&!e.altGraphKey&&(e.altKey&&"Alt"!=r&&(n="Alt-"+n),(_?e.metaKey:e.ctrlKey)&&"Ctrl"!=r&&(n="Ctrl-"+n),(_?e.ctrlKey:e.metaKey)&&"Cmd"!=r&&(n="Cmd-"+n),!t&&e.shiftKey&&"Shift"!=r&&(n="Shift-"+n),n)}
+function vn(e){return"string"==typeof e?dn[e]:e}O.fromTextArea=function(e,t){if((t=t?Eo(t):{}).value=e.value,!t.tabindex&&e.tabIndex&&(t.tabindex=e.tabIndex),!t.placeholder&&e.placeholder&&(t.placeholder=e.placeholder),null==t.autofocus){var r=No()
+t.autofocus=r==e||null!=e.getAttribute("autofocus")&&r==document.body}function n(){e.value=s.getValue()}if(e.form&&(Gi(e.form,"submit",n),!t.leaveSubmitMethodAlone)){var i=e.form,o=i.submit
+try{var a=i.submit=function(){n(),i.submit=o,i.submit(),i.submit=a}}catch(Go){}}t.finishInit=function(t){t.save=n,t.getTextArea=function(){return e},t.toTextArea=function(){t.toTextArea=isNaN,n(),e.parentNode.removeChild(t.getWrapperElement()),e.style.display="",e.form&&(Ji(e.form,"submit",n),"function"==typeof e.form.submit&&(e.form.submit=o))}},e.style.display="none"
+var s=O((function(t){e.parentNode.insertBefore(t,e.nextSibling)}),t)
+return s}
+var gn=O.StringStream=function(e,t){this.pos=this.start=0,this.string=e,this.tabSize=t||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0}
+gn.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return this.pos==this.lineStart},peek:function(){return this.string.charAt(this.pos)||void 0},next:function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},eat:function(e){var t=this.string.charAt(this.pos)
+if("string"==typeof e)var r=t==e
+else r=t&&(e.test?e.test(t):e(t))
+if(r)return++this.pos,t},eatWhile:function(e){for(var t=this.pos;this.eat(e););return this.pos>t},eatSpace:function(){for(var e=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos
+return this.pos>e},skipToEnd:function(){this.pos=this.string.length},skipTo:function(e){var t=this.string.indexOf(e,this.pos)
+if(t>-1)return this.pos=t,!0},backUp:function(e){this.pos-=e},column:function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=ho(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-(this.lineStart?ho(this.string,this.lineStart,this.tabSize):0)},indentation:function(){return ho(this.string,null,this.tabSize)-(this.lineStart?ho(this.string,this.lineStart,this.tabSize):0)},match:function(e,t,r){if("string"!=typeof e){var n=this.string.slice(this.pos).match(e)
+return n&&n.index>0?null:(n&&!1!==t&&(this.pos+=n[0].length),n)}var i=function(e){return r?e.toLowerCase():e}
+if(i(this.string.substr(this.pos,e.length))==i(e))return!1!==t&&(this.pos+=e.length),!0},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(e,t){this.lineStart+=e
+try{return t()}finally{this.lineStart-=e}}}
+var bn=0,yn=O.TextMarker=function(e,t){this.lines=[],this.type=t,this.doc=e,this.id=++bn}
+io(yn),yn.prototype.clear=function(){if(!this.explicitlyCleared){var e=this.doc.cm,t=e&&!e.curOp
+if(t&&Ht(e),no(this,"clear")){var r=this.find()
+r&&Zi(this,"clear",r.from,r.to)}for(var n=null,i=null,o=0;o<this.lines.length;++o){var a=this.lines[o],s=Sn(a.markedSpans,this)
+e&&!this.collapsed?tr(e,Ti(a),"text"):e&&(null!=s.to&&(i=Ti(a)),null!=s.from&&(n=Ti(a))),a.markedSpans=Tn(a.markedSpans,s),null==s.from&&this.collapsed&&!Bn(this.doc,a)&&e&&Si(a,Nt(e.display))}if(e&&this.collapsed&&!e.options.lineWrapping)for(o=0;o<this.lines.length;++o){var l=zn(this.lines[o]),u=D(l)
+u>e.display.maxLineLength&&(e.display.maxLine=l,e.display.maxLineLength=u,e.display.maxLineChanged=!0)}null!=n&&e&&this.collapsed&&er(e,n,i+1),this.lines.length=0,this.explicitlyCleared=!0,this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,e&&Ke(e.doc)),e&&Zi(e,"markerCleared",e,this),t&&Bt(e),this.parent&&this.parent.clear()}},yn.prototype.find=function(e,t){var r,n
+null==e&&"bookmark"==this.type&&(e=1)
+for(var i=0;i<this.lines.length;++i){var o=this.lines[i],a=Sn(o.markedSpans,this)
+if(null!=a.from&&(r=fe(t?o:Ti(o),a.from),-1==e))return r
+if(null!=a.to&&(n=fe(t?o:Ti(o),a.to),1==e))return n}return r&&{from:r,to:n}},yn.prototype.changed=function(){var e=this.find(-1,!0),t=this,r=this.doc.cm
+e&&r&&Yt(r,(function(){var n=e.line,i=Ti(e.line),o=vt(r,i)
+if(o&&(Et(o),r.curOp.selectionChanged=r.curOp.forceUpdate=!0),r.curOp.updateMaxLine=!0,!Bn(t.doc,n)&&null!=t.height){var a=t.height
+t.height=null
+var s=Wn(t)-a
+s&&Si(n,n.height+s)}}))},yn.prototype.attachLine=function(e){if(!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp
+t.maybeHiddenMarkers&&-1!=bo(t.maybeHiddenMarkers,this)||(t.maybeUnhiddenMarkers||(t.maybeUnhiddenMarkers=[])).push(this)}this.lines.push(e)},yn.prototype.detachLine=function(e){if(this.lines.splice(bo(this.lines,e),1),!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp;(t.maybeHiddenMarkers||(t.maybeHiddenMarkers=[])).push(this)}}
+bn=0
+function _n(e,t,r,n,i){if(n&&n.shared)return function(e,t,r,n,i){(n=Eo(n)).shared=!1
+var o=[_n(e,t,r,n,i)],a=o[0],s=n.widgetNode
+return _i(e,(function(e){s&&(n.widgetNode=s.cloneNode(!0)),o.push(_n(e,Le(e,t),Le(e,r),n,i))
+for(var l=0;l<e.linked.length;++l)if(e.linked[l].isParent)return
+a=vo(o)})),new wn(o,a)}(e,t,r,n,i)
+if(e.cm&&!e.cm.curOp)return Kt(e.cm,_n)(e,t,r,n,i)
+var o=new yn(e,i),a=pe(t,r)
+if(n&&Eo(n,o,!1),a>0||0==a&&!1!==o.clearWhenEmpty)return o
+if(o.replacedWith&&(o.collapsed=!0,o.widgetNode=ko("span",[o.replacedWith],"CodeMirror-widget"),n.handleMouseEvents||o.widgetNode.setAttribute("cm-ignore-events","true"),n.insertLeft&&(o.widgetNode.insertLeft=!0)),o.collapsed){if(Fn(e,t.line,t,r,o)||t.line!=r.line&&Fn(e,r.line,t,r,o))throw new Error("Inserting collapsed marker partially overlapping an existing one")
+x=!0}o.addToHistory&&ji(e,{from:t,to:r,origin:"markText"},e.sel,NaN)
+var s,l=t.line,u=e.cm
+if(e.iter(l,r.line+1,(function(e){u&&o.collapsed&&!u.options.lineWrapping&&zn(e)==u.display.maxLine&&(s=!0),o.collapsed&&l!=t.line&&Si(e,0),function(e,t){e.markedSpans=e.markedSpans?e.markedSpans.concat([t]):[t],t.marker.attachLine(e)}(e,new On(o,l==t.line?t.ch:null,l==r.line?r.ch:null)),++l})),o.collapsed&&e.iter(t.line,r.line+1,(function(t){Bn(e,t)&&Si(t,0)})),o.clearOnEnter&&Gi(o,"beforeCursorEnter",(function(){o.clear()})),o.readOnly&&(E=!0,(e.history.done.length||e.history.undone.length)&&e.clearHistory()),o.collapsed&&(o.id=++bn,o.atomic=!0),u){if(s&&(u.curOp.updateMaxLine=!0),o.collapsed)er(u,t.line,r.line+1)
+else if(o.className||o.title||o.startStyle||o.endStyle||o.css)for(var c=t.line;c<=r.line;c++)tr(u,c,"text")
+o.atomic&&Ke(u.doc),Zi(u,"markerAdded",u,o)}return o}var wn=O.SharedTextMarker=function(e,t){this.markers=e,this.primary=t
+for(var r=0;r<e.length;++r)e[r].parent=this}
+function En(e){return e.findMarks(fe(e.first,0),e.clipPos(fe(e.lastLine())),(function(e){return e.parent}))}function xn(e){for(var t=0;t<e.length;t++){var r=e[t],n=[r.primary.doc]
+_i(r.primary.doc,(function(e){n.push(e)}))
+for(var i=0;i<r.markers.length;i++){var o=r.markers[i];-1==bo(n,o.doc)&&(o.parent=null,r.markers.splice(i--,1))}}}function On(e,t,r){this.marker=e,this.from=t,this.to=r}function Sn(e,t){if(e)for(var r=0;r<e.length;++r){var n=e[r]
+if(n.marker==t)return n}}function Tn(e,t){for(var r,n=0;n<e.length;++n)e[n]!=t&&(r||(r=[])).push(e[n])
+return r}function Mn(e,t){if(t.full)return null
+var r=Fe(e,t.from.line)&&Ei(e,t.from.line).markedSpans,n=Fe(e,t.to.line)&&Ei(e,t.to.line).markedSpans
+if(!r&&!n)return null
+var i=t.from.ch,o=t.to.ch,a=0==pe(t.from,t.to),s=function(e,t,r){if(e)for(var n,i=0;i<e.length;++i){var o=e[i],a=o.marker
+if(null==o.from||(a.inclusiveLeft?o.from<=t:o.from<t)||o.from==t&&"bookmark"==a.type&&(!r||!o.marker.insertLeft)){var s=null==o.to||(a.inclusiveRight?o.to>=t:o.to>t);(n||(n=[])).push(new On(a,o.from,s?null:o.to))}}return n}(r,i,a),l=function(e,t,r){if(e)for(var n,i=0;i<e.length;++i){var o=e[i],a=o.marker
+if(null==o.to||(a.inclusiveRight?o.to>=t:o.to>t)||o.from==t&&"bookmark"==a.type&&(!r||o.marker.insertLeft)){var s=null==o.from||(a.inclusiveLeft?o.from<=t:o.from<t);(n||(n=[])).push(new On(a,s?null:o.from-t,null==o.to?null:o.to-t))}}return n}(n,o,a),u=1==t.text.length,c=vo(t.text).length+(u?i:0)
+if(s)for(var d=0;d<s.length;++d){if(null==(h=s[d]).to)(f=Sn(l,h.marker))?u&&(h.to=null==f.to?null:f.to+c):h.to=i}if(l)for(d=0;d<l.length;++d){var h,f
+if(null!=(h=l[d]).to&&(h.to+=c),null==h.from)(f=Sn(s,h.marker))||(h.from=c,u&&(s||(s=[])).push(h))
+else h.from+=c,u&&(s||(s=[])).push(h)}s&&(s=An(s)),l&&l!=s&&(l=An(l))
+var p=[s]
+if(!u){var m,v=t.text.length-2
+if(v>0&&s)for(d=0;d<s.length;++d)null==s[d].to&&(m||(m=[])).push(new On(s[d].marker,null,null))
+for(d=0;d<v;++d)p.push(m)
+p.push(l)}return p}function An(e){for(var t=0;t<e.length;++t){var r=e[t]
+null!=r.from&&r.from==r.to&&!1!==r.marker.clearWhenEmpty&&e.splice(t--,1)}return e.length?e:null}function Pn(e,t){var r=function(e,t){var r=t["spans_"+e.id]
+if(!r)return null
+for(var n=0,i=[];n<t.text.length;++n)i.push(Ii(r[n]))
+return i}(e,t),n=Mn(e,t)
+if(!r)return n
+if(!n)return r
+for(var i=0;i<r.length;++i){var o=r[i],a=n[i]
+if(o&&a)e:for(var s=0;s<a.length;++s){for(var l=a[s],u=0;u<o.length;++u)if(o[u].marker==l.marker)continue e
+o.push(l)}else a&&(r[i]=a)}return r}function Cn(e){var t=e.markedSpans
+if(t){for(var r=0;r<t.length;++r)t[r].marker.detachLine(e)
+e.markedSpans=null}}function kn(e,t){if(t){for(var r=0;r<t.length;++r)t[r].marker.attachLine(e)
+e.markedSpans=t}}function Rn(e){return e.inclusiveLeft?-1:0}function jn(e){return e.inclusiveRight?1:0}function Dn(e,t){var r=e.lines.length-t.lines.length
+if(0!=r)return r
+var n=e.find(),i=t.find(),o=pe(n.from,i.from)||Rn(e)-Rn(t)
+if(o)return-o
+var a=pe(n.to,i.to)||jn(e)-jn(t)
+return a||t.id-e.id}function Nn(e,t){var r,n=x&&e.markedSpans
+if(n)for(var i,o=0;o<n.length;++o)(i=n[o]).marker.collapsed&&null==(t?i.from:i.to)&&(!r||Dn(r,i.marker)<0)&&(r=i.marker)
+return r}function In(e){return Nn(e,!0)}function Ln(e){return Nn(e,!1)}function Fn(e,t,r,n,i){var o=Ei(e,t),a=x&&o.markedSpans
+if(a)for(var s=0;s<a.length;++s){var l=a[s]
+if(l.marker.collapsed){var u=l.marker.find(0),c=pe(u.from,r)||Rn(l.marker)-Rn(i),d=pe(u.to,n)||jn(l.marker)-jn(i)
+if(!(c>=0&&d<=0||c<=0&&d>=0)&&(c<=0&&(l.marker.inclusiveRight&&i.inclusiveLeft?pe(u.to,r)>=0:pe(u.to,r)>0)||c>=0&&(l.marker.inclusiveRight&&i.inclusiveLeft?pe(u.from,n)<=0:pe(u.from,n)<0)))return!0}}}function zn(e){for(var t;t=In(e);)e=t.find(-1,!0).line
+return e}function Un(e,t){var r=Ei(e,t),n=zn(r)
+return r==n?t:Ti(n)}function Hn(e,t){if(t>e.lastLine())return t
+var r,n=Ei(e,t)
+if(!Bn(e,n))return t
+for(;r=Ln(n);)n=r.find(1,!0).line
+return Ti(n)+1}function Bn(e,t){var r=x&&t.markedSpans
+if(r)for(var n,i=0;i<r.length;++i)if((n=r[i]).marker.collapsed){if(null==n.from)return!0
+if(!n.marker.widgetNode&&0==n.from&&n.marker.inclusiveLeft&&Vn(e,t,n))return!0}}function Vn(e,t,r){if(null==r.to){var n=r.marker.find(1,!0)
+return Vn(e,n.line,Sn(n.line.markedSpans,r.marker))}if(r.marker.inclusiveRight&&r.to==t.text.length)return!0
+for(var i,o=0;o<t.markedSpans.length;++o)if((i=t.markedSpans[o]).marker.collapsed&&!i.marker.widgetNode&&i.from==r.to&&(null==i.to||i.to!=r.from)&&(i.marker.inclusiveLeft||r.marker.inclusiveRight)&&Vn(e,t,i))return!0}io(wn),wn.prototype.clear=function(){if(!this.explicitlyCleared){this.explicitlyCleared=!0
+for(var e=0;e<this.markers.length;++e)this.markers[e].clear()
+Zi(this,"clear")}},wn.prototype.find=function(e,t){return this.primary.find(e,t)}
+var $n=O.LineWidget=function(e,t,r){if(r)for(var n in r)r.hasOwnProperty(n)&&(this[n]=r[n])
+this.doc=e,this.node=t}
+function qn(e,t,r){Ai(t)<(e.curOp&&e.curOp.scrollTop||e.doc.scrollTop)&&$r(e,null,r)}function Wn(e){if(null!=e.height)return e.height
+var t=e.doc.cm
+if(!t)return 0
+if(!Do(document.body,e.node)){var r="position: relative;"
+e.coverGutter&&(r+="margin-left: -"+t.display.gutters.offsetWidth+"px;"),e.noHScroll&&(r+="width: "+t.display.wrapper.clientWidth+"px;"),jo(t.display.measure,ko("div",[e.node],null,r))}return e.height=e.node.parentNode.offsetHeight}io($n),$n.prototype.clear=function(){var e=this.doc.cm,t=this.line.widgets,r=this.line,n=Ti(r)
+if(null!=n&&t){for(var i=0;i<t.length;++i)t[i]==this&&t.splice(i--,1)
+t.length||(r.widgets=null)
+var o=Wn(this)
+Si(r,Math.max(0,r.height-o)),e&&Yt(e,(function(){qn(e,r,-o),tr(e,n,"widget")}))}},$n.prototype.changed=function(){var e=this.height,t=this.doc.cm,r=this.line
+this.height=null
+var n=Wn(this)-e
+n&&(Si(r,r.height+n),t&&Yt(t,(function(){t.curOp.forceUpdate=!0,qn(t,r,n)})))}
+var Gn=O.Line=function(e,t,r){this.text=e,kn(this,t),this.height=r?r(this):1}
+function Yn(e){e.parent=null,Cn(e)}function Kn(e,t){if(e)for(;;){var r=e.match(/(?:^|\s+)line-(background-)?(\S+)/)
+if(!r)break
+e=e.slice(0,r.index)+e.slice(r.index+r[0].length)
+var n=r[1]?"bgClass":"textClass"
+null==t[n]?t[n]=r[2]:new RegExp("(?:^|s)"+r[2]+"(?:$|s)").test(t[n])||(t[n]+=" "+r[2])}return e}function Jn(e,t){if(e.blankLine)return e.blankLine(t)
+if(e.innerMode){var r=O.innerMode(e,t)
+return r.mode.blankLine?r.mode.blankLine(r.state):void 0}}function Qn(e,t,r,n){for(var i=0;i<10;i++){n&&(n[0]=O.innerMode(e,r).mode)
+var o=e.token(t,r)
+if(t.pos>t.start)return o}throw new Error("Mode "+e.name+" failed to advance stream.")}function Xn(e,t,r,n){function i(e){return{start:d.start,end:d.pos,string:d.current(),type:o||null,state:e?ln(a.mode,c):c}}var o,a=e.doc,s=a.mode
+t=Le(a,t)
+var l,u=Ei(a,t.line),c=st(e,t.line,r),d=new gn(u.text,e.options.tabSize)
+for(n&&(l=[]);(n||d.pos<t.ch)&&!d.eol();)d.start=d.pos,o=Qn(s,d,c),n&&l.push(i(!0))
+return n?l:i()}function Zn(e,t,r,n,i,o,a){var s=r.flattenSpans
+null==s&&(s=e.options.flattenSpans)
+var l,u=0,c=null,d=new gn(t,e.options.tabSize),h=e.options.addModeClass&&[null]
+for(""==t&&Kn(Jn(r,n),o);!d.eol();){if(d.pos>e.options.maxHighlightLength?(s=!1,a&&ri(e,t,n,d.pos),d.pos=t.length,l=null):l=Kn(Qn(r,d,n,h),o),h){var f=h[0].name
+f&&(l="m-"+(l?f+" "+l:f))}if(!s||c!=l){for(;u<d.start;)i(u=Math.min(d.start,u+5e4),c)
+c=l}d.start=d.pos}for(;u<d.pos;){var p=Math.min(d.pos,u+5e4)
+i(p,c),u=p}}function ei(e,t,r,n){var i=[e.state.modeGen],o={}
+Zn(e,t.text,e.doc.mode,r,(function(e,t){i.push(e,t)}),o,n)
+for(var a=0;a<e.state.overlays.length;++a){var s=e.state.overlays[a],l=1,u=0
+Zn(e,t.text,s.mode,!0,(function(e,t){for(var r=l;u<e;){var n=i[l]
+n>e&&i.splice(l,1,e,i[l+1],n),l+=2,u=Math.min(e,n)}if(t)if(s.opaque)i.splice(r,l-r,e,"cm-overlay "+t),l=r+2
+else for(;r<l;r+=2){var o=i[r+1]
+i[r+1]=(o?o+" ":"")+"cm-overlay "+t}}),o)}return{styles:i,classes:o.bgClass||o.textClass?o:null}}function ti(e,t,r){if(!t.styles||t.styles[0]!=e.state.modeGen){var n=st(e,Ti(t)),i=ei(e,t,t.text.length>e.options.maxHighlightLength?ln(e.doc.mode,n):n)
+t.stateAfter=n,t.styles=i.styles,i.classes?t.styleClasses=i.classes:t.styleClasses&&(t.styleClasses=null),r===e.doc.frontier&&e.doc.frontier++}return t.styles}function ri(e,t,r,n){var i=e.doc.mode,o=new gn(t,e.options.tabSize)
+for(o.start=o.pos=n||0,""==t&&Jn(i,r);!o.eol();)Qn(i,o,r),o.start=o.pos}io(Gn),Gn.prototype.lineNo=function(){return Ti(this)}
+var ni={},ii={}
+function oi(e,t){if(!e||/^\s*$/.test(e))return null
+var r=t.addModeClass?ii:ni
+return r[e]||(r[e]=e.replace(/\S+/g,"cm-$&"))}function ai(e,t){var r=ko("span",null,null,s?"padding-right: .1px":null),n={pre:ko("pre",[r],"CodeMirror-line"),content:r,col:0,pos:0,cm:e,splitSpaces:(o||s)&&e.getOption("lineWrapping")}
+t.measure={}
+for(var i=0;i<=(t.rest?t.rest.length:0);i++){var a,l=i?t.rest[i-1]:t.line
+n.pos=0,n.addToken=si,Wo(e.display.measure)&&(a=Pi(l))&&(n.addToken=ui(n.addToken,a)),n.map=[],di(l,n,ti(e,l,t!=e.display.externalMeasured&&Ti(l))),l.styleClasses&&(l.styleClasses.bgClass&&(n.bgClass=zo(l.styleClasses.bgClass,n.bgClass||"")),l.styleClasses.textClass&&(n.textClass=zo(l.styleClasses.textClass,n.textClass||""))),0==n.map.length&&n.map.push(0,0,n.content.appendChild(qo(e.display.measure))),0==i?(t.measure.map=n.map,t.measure.cache={}):((t.measure.maps||(t.measure.maps=[])).push(n.map),(t.measure.caches||(t.measure.caches=[])).push({}))}if(s){var u=n.content.lastChild;(/\bcm-tab\b/.test(u.className)||u.querySelector&&u.querySelector(".cm-tab"))&&(n.content.className="cm-tab-wrap-hack")}return Qi(e,"renderLine",e,t.line,n.pre),n.pre.className&&(n.textClass=zo(n.pre.className,n.textClass||"")),n}function si(e,t,r,n,i,s,l){if(t){var u=e.splitSpaces?t.replace(/ {3,}/g,li):t,c=e.cm.state.specialChars,d=!1
+if(c.test(t)){b=document.createDocumentFragment()
+for(var h=0;;){c.lastIndex=h
+var f=c.exec(t),p=f?f.index-h:t.length-h
+if(p){var m=document.createTextNode(u.slice(h,h+p))
+o&&a<9?b.appendChild(ko("span",[m])):b.appendChild(m),e.map.push(e.pos,e.pos+p,m),e.col+=p,e.pos+=p}if(!f)break
+if(h+=p+1,"\t"==f[0]){var v=e.cm.options.tabSize,g=v-e.col%v;(m=b.appendChild(ko("span",mo(g),"cm-tab"))).setAttribute("role","presentation"),m.setAttribute("cm-text","\t"),e.col+=g}else if("\r"==f[0]||"\n"==f[0]){(m=b.appendChild(ko("span","\r"==f[0]?"␍":"␤","cm-invalidchar"))).setAttribute("cm-text",f[0]),e.col+=1}else{(m=e.cm.options.specialCharPlaceholder(f[0])).setAttribute("cm-text",f[0]),o&&a<9?b.appendChild(ko("span",[m])):b.appendChild(m),e.col+=1}e.map.push(e.pos,e.pos+1,m),e.pos++}}else{e.col+=t.length
+var b=document.createTextNode(u)
+e.map.push(e.pos,e.pos+t.length,b),o&&a<9&&(d=!0),e.pos+=t.length}if(r||n||i||d||l){var y=r||""
+n&&(y+=n),i&&(y+=i)
+var _=ko("span",[b],y,l)
+return s&&(_.title=s),e.content.appendChild(_)}e.content.appendChild(b)}}function li(e){for(var t=" ",r=0;r<e.length-2;++r)t+=r%2?" ":" "
+return t+=" "}function ui(e,t){return function(r,n,i,o,a,s,l){i=i?i+" cm-force-border":"cm-force-border"
+for(var u=r.pos,c=u+n.length;;){for(var d=0;d<t.length;d++){var h=t[d]
+if(h.to>u&&h.from<=u)break}if(h.to>=c)return e(r,n,i,o,a,s,l)
+e(r,n.slice(0,h.to-u),i,o,null,s,l),o=null,n=n.slice(h.to-u),u=h.to}}}function ci(e,t,r,n){var i=!n&&r.widgetNode
+i&&e.map.push(e.pos,e.pos+t,i),!n&&e.cm.display.input.needsContentAttribute&&(i||(i=e.content.appendChild(document.createElement("span"))),i.setAttribute("cm-marker",r.id)),i&&(e.cm.display.input.setUneditable(i),e.content.appendChild(i)),e.pos+=t}function di(e,t,r){var n=e.markedSpans,i=e.text,o=0
+if(n)for(var a,s,l,u,c,d,h,f=i.length,p=0,m=(S=1,""),v=0;;){if(v==p){l=u=c=d=s="",h=null,v=1/0
+for(var g,b=[],y=0;y<n.length;++y){var _=n[y],w=_.marker
+"bookmark"==w.type&&_.from==p&&w.widgetNode?b.push(w):_.from<=p&&(null==_.to||_.to>p||w.collapsed&&_.to==p&&_.from==p)?(null!=_.to&&_.to!=p&&v>_.to&&(v=_.to,u=""),w.className&&(l+=" "+w.className),w.css&&(s=(s?s+";":"")+w.css),w.startStyle&&_.from==p&&(c+=" "+w.startStyle),w.endStyle&&_.to==v&&(g||(g=[])).push(w.endStyle,_.to),w.title&&!d&&(d=w.title),w.collapsed&&(!h||Dn(h.marker,w)<0)&&(h=_)):_.from>p&&v>_.from&&(v=_.from)}if(g)for(y=0;y<g.length;y+=2)g[y+1]==v&&(u+=" "+g[y])
+if(!h||h.from==p)for(y=0;y<b.length;++y)ci(t,0,b[y])
+if(h&&(h.from||0)==p){if(ci(t,(null==h.to?f+1:h.to)-p,h.marker,null==h.from),null==h.to)return
+h.to==p&&(h=!1)}}if(p>=f)break
+for(var E=Math.min(f,v);;){if(m){var x=p+m.length
+if(!h){var O=x>E?m.slice(0,E-p):m
+t.addToken(t,O,a?a+l:l,c,p+O.length==v?u:"",d,s)}if(x>=E){m=m.slice(E-p),p=E
+break}p=x,c=""}m=i.slice(o,o=r[S++]),a=oi(r[S++],t.cm.options)}}else for(var S=1;S<r.length;S+=2)t.addToken(t,i.slice(o,o=r[S]),oi(r[S+1],t.cm.options))}function hi(e,t){return 0==t.from.ch&&0==t.to.ch&&""==vo(t.text)&&(!e.cm||e.cm.options.wholeLineUpdateBefore)}function fi(e,t,r,n){function i(e){return r?r[e]:null}function o(e,r,i){(function(e,t,r,n){e.text=t,e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null),null!=e.order&&(e.order=null),Cn(e),kn(e,r)
+var i=n?n(e):1
+i!=e.height&&Si(e,i)})(e,r,i,n),Zi(e,"change",e,t)}function a(e,t){for(var r=e,o=[];r<t;++r)o.push(new Gn(u[r],i(r),n))
+return o}var s=t.from,l=t.to,u=t.text,c=Ei(e,s.line),d=Ei(e,l.line),h=vo(u),f=i(u.length-1),p=l.line-s.line
+if(t.full)e.insert(0,a(0,u.length)),e.remove(u.length,e.size-u.length)
+else if(hi(e,t)){var m=a(0,u.length-1)
+o(d,d.text,f),p&&e.remove(s.line,p),m.length&&e.insert(s.line,m)}else if(c==d){if(1==u.length)o(c,c.text.slice(0,s.ch)+h+c.text.slice(l.ch),f)
+else(m=a(1,u.length-1)).push(new Gn(h+c.text.slice(l.ch),f,n)),o(c,c.text.slice(0,s.ch)+u[0],i(0)),e.insert(s.line+1,m)}else if(1==u.length)o(c,c.text.slice(0,s.ch)+u[0]+d.text.slice(l.ch),i(0)),e.remove(s.line+1,p)
+else{o(c,c.text.slice(0,s.ch)+u[0],i(0)),o(d,h+d.text.slice(l.ch),f)
+m=a(1,u.length-1)
+p>1&&e.remove(s.line+1,p-1),e.insert(s.line+1,m)}Zi(e,"change",e,t)}function pi(e){this.lines=e,this.parent=null
+for(var t=0,r=0;t<e.length;++t)e[t].parent=this,r+=e[t].height
+this.height=r}function mi(e){this.children=e
+for(var t=0,r=0,n=0;n<e.length;++n){var i=e[n]
+t+=i.chunkSize(),r+=i.height,i.parent=this}this.size=t,this.height=r,this.parent=null}pi.prototype={chunkSize:function(){return this.lines.length},removeInner:function(e,t){for(var r=e,n=e+t;r<n;++r){var i=this.lines[r]
+this.height-=i.height,Yn(i),Zi(i,"delete")}this.lines.splice(e,t)},collapse:function(e){e.push.apply(e,this.lines)},insertInner:function(e,t,r){this.height+=r,this.lines=this.lines.slice(0,e).concat(t).concat(this.lines.slice(e))
+for(var n=0;n<t.length;++n)t[n].parent=this},iterN:function(e,t,r){for(var n=e+t;e<n;++e)if(r(this.lines[e]))return!0}},mi.prototype={chunkSize:function(){return this.size},removeInner:function(e,t){this.size-=t
+for(var r=0;r<this.children.length;++r){var n=this.children[r],i=n.chunkSize()
+if(e<i){var o=Math.min(t,i-e),a=n.height
+if(n.removeInner(e,o),this.height-=a-n.height,i==o&&(this.children.splice(r--,1),n.parent=null),0==(t-=o))break
+e=0}else e-=i}if(this.size-t<25&&(this.children.length>1||!(this.children[0]instanceof pi))){var s=[]
+this.collapse(s),this.children=[new pi(s)],this.children[0].parent=this}},collapse:function(e){for(var t=0;t<this.children.length;++t)this.children[t].collapse(e)},insertInner:function(e,t,r){this.size+=t.length,this.height+=r
+for(var n=0;n<this.children.length;++n){var i=this.children[n],o=i.chunkSize()
+if(e<=o){if(i.insertInner(e,t,r),i.lines&&i.lines.length>50){for(var a=i.lines.length%25+25,s=a;s<i.lines.length;){var l=new pi(i.lines.slice(s,s+=25))
+i.height-=l.height,this.children.splice(++n,0,l),l.parent=this}i.lines=i.lines.slice(0,a),this.maybeSpill()}break}e-=o}},maybeSpill:function(){if(!(this.children.length<=10)){var e=this
+do{var t=new mi(e.children.splice(e.children.length-5,5))
+if(e.parent){e.size-=t.size,e.height-=t.height
+var r=bo(e.parent.children,e)
+e.parent.children.splice(r+1,0,t)}else{var n=new mi(e.children)
+n.parent=e,e.children=[n,t],e=n}t.parent=e.parent}while(e.children.length>10)
+e.parent.maybeSpill()}},iterN:function(e,t,r){for(var n=0;n<this.children.length;++n){var i=this.children[n],o=i.chunkSize()
+if(e<o){var a=Math.min(t,o-e)
+if(i.iterN(e,a,r))return!0
+if(0==(t-=a))break
+e=0}else e-=o}}}
+var vi=0,gi=O.Doc=function(e,t,r,n){if(!(this instanceof gi))return new gi(e,t,r,n)
+null==r&&(r=0),mi.call(this,[new pi([new Gn("",null)])]),this.first=r,this.scrollTop=this.scrollLeft=0,this.cantEdit=!1,this.cleanGeneration=1,this.frontier=r
+var i=fe(r,0)
+this.sel=Ne(i),this.history=new Ci(null),this.id=++vi,this.modeOption=t,this.lineSep=n,this.extend=!1,"string"==typeof e&&(e=this.splitLines(e)),fi(this,{from:i,to:i,text:e}),We(this,Ne(i),so)}
+gi.prototype=wo(mi.prototype,{constructor:gi,iter:function(e,t,r){r?this.iterN(e-this.first,t-e,r):this.iterN(this.first,this.first+this.size,e)},insert:function(e,t){for(var r=0,n=0;n<t.length;++n)r+=t[n].height
+this.insertInner(e-this.first,t,r)},remove:function(e,t){this.removeInner(e-this.first,t)},getValue:function(e){var t=Oi(this,this.first,this.first+this.size)
+return!1===e?t:t.join(e||this.lineSeparator())},setValue:Qt((function(e){var t=fe(this.first,0),r=this.first+this.size-1
+Lr(this,{from:t,to:fe(r,Ei(this,r).text.length),text:this.splitLines(e),origin:"setValue",full:!0},!0),We(this,Ne(t))})),replaceRange:function(e,t,r,n){Br(this,e,t=Le(this,t),r=r?Le(this,r):t,n)},getRange:function(e,t,r){var n=xi(this,Le(this,e),Le(this,t))
+return!1===r?n:n.join(r||this.lineSeparator())},getLine:function(e){var t=this.getLineHandle(e)
+return t&&t.text},getLineHandle:function(e){if(Fe(this,e))return Ei(this,e)},getLineNumber:function(e){return Ti(e)},getLineHandleVisualStart:function(e){return"number"==typeof e&&(e=Ei(this,e)),zn(e)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(e){return Le(this,e)},getCursor:function(e){var t=this.sel.primary()
+return null==e||"head"==e?t.head:"anchor"==e?t.anchor:"end"==e||"to"==e||!1===e?t.to():t.from()},listSelections:function(){return this.sel.ranges},somethingSelected:function(){return this.sel.somethingSelected()},setCursor:Qt((function(e,t,r){$e(this,Le(this,"number"==typeof e?fe(e,t||0):e),null,r)})),setSelection:Qt((function(e,t,r){$e(this,Le(this,e),Le(this,t||e),r)})),extendSelection:Qt((function(e,t,r){He(this,Le(this,e),t&&Le(this,t),r)})),extendSelections:Qt((function(e,t){Be(this,ze(this,e),t)})),extendSelectionsBy:Qt((function(e,t){Be(this,ze(this,yo(this.sel.ranges,e)),t)})),setSelections:Qt((function(e,t,r){if(e.length){for(var n=0,i=[];n<e.length;n++)i[n]=new je(Le(this,e[n].anchor),Le(this,e[n].head))
+null==t&&(t=Math.min(e.length-1,this.sel.primIndex)),We(this,De(i,t),r)}})),addSelection:Qt((function(e,t,r){var n=this.sel.ranges.slice(0)
+n.push(new je(Le(this,e),Le(this,t||e))),We(this,De(n,n.length-1),r)})),getSelection:function(e){for(var t,r=this.sel.ranges,n=0;n<r.length;n++){var i=xi(this,r[n].from(),r[n].to())
+t=t?t.concat(i):i}return!1===e?t:t.join(e||this.lineSeparator())},getSelections:function(e){for(var t=[],r=this.sel.ranges,n=0;n<r.length;n++){var i=xi(this,r[n].from(),r[n].to())
+!1!==e&&(i=i.join(e||this.lineSeparator())),t[n]=i}return t},replaceSelection:function(e,t,r){for(var n=[],i=0;i<this.sel.ranges.length;i++)n[i]=e
+this.replaceSelections(n,t,r||"+input")},replaceSelections:Qt((function(e,t,r){for(var n=[],i=this.sel,o=0;o<i.ranges.length;o++){var a=i.ranges[o]
+n[o]={from:a.from(),to:a.to(),text:this.splitLines(e[o]),origin:r}}var s=t&&"end"!=t&&function(e,t,r){for(var n=[],i=fe(e.first,0),o=i,a=0;a<t.length;a++){var s=t[a],l=Nr(s.from,i,o),u=Nr(Rr(s),i,o)
+if(i=s.to,o=u,"around"==r){var c=e.sel.ranges[a],d=pe(c.head,c.anchor)<0
+n[a]=new je(d?u:l,d?l:u)}else n[a]=new je(l,l)}return new Re(n,e.sel.primIndex)}(this,n,t)
+for(o=n.length-1;o>=0;o--)Lr(this,n[o])
+s?qe(this,s):this.cm&&qr(this.cm)})),undo:Qt((function(){zr(this,"undo")})),redo:Qt((function(){zr(this,"redo")})),undoSelection:Qt((function(){zr(this,"undo",!0)})),redoSelection:Qt((function(){zr(this,"redo",!0)})),setExtending:function(e){this.extend=e},getExtending:function(){return this.extend},historySize:function(){for(var e=this.history,t=0,r=0,n=0;n<e.done.length;n++)e.done[n].ranges||++t
+for(n=0;n<e.undone.length;n++)e.undone[n].ranges||++r
+return{undo:t,redo:r}},clearHistory:function(){this.history=new Ci(this.history.maxGeneration)},markClean:function(){this.cleanGeneration=this.changeGeneration(!0)},changeGeneration:function(e){return e&&(this.history.lastOp=this.history.lastSelOp=this.history.lastOrigin=null),this.history.generation},isClean:function(e){return this.history.generation==(e||this.cleanGeneration)},getHistory:function(){return{done:Li(this.history.done),undone:Li(this.history.undone)}},setHistory:function(e){var t=this.history=new Ci(this.history.maxGeneration)
+t.done=Li(e.done.slice(0),null,!0),t.undone=Li(e.undone.slice(0),null,!0)},addLineClass:Qt((function(e,t,r){return Yr(this,e,"gutter"==t?"gutter":"class",(function(e){var n="text"==t?"textClass":"background"==t?"bgClass":"gutter"==t?"gutterClass":"wrapClass"
+if(e[n]){if(Io(r).test(e[n]))return!1
+e[n]+=" "+r}else e[n]=r
+return!0}))})),removeLineClass:Qt((function(e,t,r){return Yr(this,e,"gutter"==t?"gutter":"class",(function(e){var n="text"==t?"textClass":"background"==t?"bgClass":"gutter"==t?"gutterClass":"wrapClass",i=e[n]
+if(!i)return!1
+if(null==r)e[n]=null
+else{var o=i.match(Io(r))
+if(!o)return!1
+var a=o.index+o[0].length
+e[n]=i.slice(0,o.index)+(o.index&&a!=i.length?" ":"")+i.slice(a)||null}return!0}))})),addLineWidget:Qt((function(e,t,r){return function(e,t,r,n){var i=new $n(e,r,n),o=e.cm
+return o&&i.noHScroll&&(o.display.alignWidgets=!0),Yr(e,t,"widget",(function(t){var r=t.widgets||(t.widgets=[])
+if(null==i.insertAt?r.push(i):r.splice(Math.min(r.length-1,Math.max(0,i.insertAt)),0,i),i.line=t,o&&!Bn(e,t)){var n=Ai(t)<e.scrollTop
+Si(t,t.height+Wn(i)),n&&$r(o,null,i.height),o.curOp.forceUpdate=!0}return!0})),i}(this,e,t,r)})),removeLineWidget:function(e){e.clear()},markText:function(e,t,r){return _n(this,Le(this,e),Le(this,t),r,r&&r.type||"range")},setBookmark:function(e,t){var r={replacedWith:t&&(null==t.nodeType?t.widget:t),insertLeft:t&&t.insertLeft,clearWhenEmpty:!1,shared:t&&t.shared,handleMouseEvents:t&&t.handleMouseEvents}
+return _n(this,e=Le(this,e),e,r,"bookmark")},findMarksAt:function(e){var t=[],r=Ei(this,(e=Le(this,e)).line).markedSpans
+if(r)for(var n=0;n<r.length;++n){var i=r[n];(null==i.from||i.from<=e.ch)&&(null==i.to||i.to>=e.ch)&&t.push(i.marker.parent||i.marker)}return t},findMarks:function(e,t,r){e=Le(this,e),t=Le(this,t)
+var n=[],i=e.line
+return this.iter(e.line,t.line+1,(function(o){var a=o.markedSpans
+if(a)for(var s=0;s<a.length;s++){var l=a[s]
+null!=l.to&&i==e.line&&e.ch>=l.to||null==l.from&&i!=e.line||null!=l.from&&i==t.line&&l.from>=t.ch||r&&!r(l.marker)||n.push(l.marker.parent||l.marker)}++i})),n},getAllMarks:function(){var e=[]
+return this.iter((function(t){var r=t.markedSpans
+if(r)for(var n=0;n<r.length;++n)null!=r[n].from&&e.push(r[n].marker)})),e},posFromIndex:function(e){var t,r=this.first,n=this.lineSeparator().length
+return this.iter((function(i){var o=i.text.length+n
+if(o>e)return t=e,!0
+e-=o,++r})),Le(this,fe(r,t))},indexFromPos:function(e){var t=(e=Le(this,e)).ch
+if(e.line<this.first||e.ch<0)return 0
+var r=this.lineSeparator().length
+return this.iter(this.first,e.line,(function(e){t+=e.text.length+r})),t},copy:function(e){var t=new gi(Oi(this,this.first,this.first+this.size),this.modeOption,this.first,this.lineSep)
+return t.scrollTop=this.scrollTop,t.scrollLeft=this.scrollLeft,t.sel=this.sel,t.extend=!1,e&&(t.history.undoDepth=this.history.undoDepth,t.setHistory(this.getHistory())),t},linkedDoc:function(e){e||(e={})
+var t=this.first,r=this.first+this.size
+null!=e.from&&e.from>t&&(t=e.from),null!=e.to&&e.to<r&&(r=e.to)
+var n=new gi(Oi(this,t,r),e.mode||this.modeOption,t,this.lineSep)
+return e.sharedHist&&(n.history=this.history),(this.linked||(this.linked=[])).push({doc:n,sharedHist:e.sharedHist}),n.linked=[{doc:this,isParent:!0,sharedHist:e.sharedHist}],function(e,t){for(var r=0;r<t.length;r++){var n=t[r],i=n.find(),o=e.clipPos(i.from),a=e.clipPos(i.to)
+if(pe(o,a)){var s=_n(e,o,a,n.primary,n.primary.type)
+n.markers.push(s),s.parent=n}}}(n,En(this)),n},unlinkDoc:function(e){if(e instanceof O&&(e=e.doc),this.linked)for(var t=0;t<this.linked.length;++t){if(this.linked[t].doc==e){this.linked.splice(t,1),e.unlinkDoc(this),xn(En(this))
+break}}if(e.history==this.history){var r=[e.id]
+_i(e,(function(e){r.push(e.id)}),!0),e.history=new Ci(null),e.history.done=Li(this.history.done,r),e.history.undone=Li(this.history.undone,r)}},iterLinkedDocs:function(e){_i(this,e)},getMode:function(){return this.mode},getEditor:function(){return this.cm},splitLines:function(e){return this.lineSep?e.split(this.lineSep):Yo(e)},lineSeparator:function(){return this.lineSep||"\n"}}),gi.prototype.eachLine=gi.prototype.iter
+var bi="iter insert remove copy getEditor constructor".split(" ")
+for(var yi in gi.prototype)gi.prototype.hasOwnProperty(yi)&&bo(bi,yi)<0&&(O.prototype[yi]=function(e){return function(){return e.apply(this.doc,arguments)}}(gi.prototype[yi]))
+function _i(e,t,r){(function e(n,i,o){if(n.linked)for(var a=0;a<n.linked.length;++a){var s=n.linked[a]
+if(s.doc!=i){var l=o&&s.sharedHist
+r&&!l||(t(s.doc,l),e(s.doc,n,l))}}})(e,null,!0)}function wi(e,t){if(t.cm)throw new Error("This document is already in use.")
+e.doc=t,t.cm=e,P(e),T(e),e.options.lineWrapping||N(e),e.options.mode=t.modeOption,er(e)}function Ei(e,t){if((t-=e.first)<0||t>=e.size)throw new Error("There is no line "+(t+e.first)+" in the document.")
+for(var r=e;!r.lines;)for(var n=0;;++n){var i=r.children[n],o=i.chunkSize()
+if(t<o){r=i
+break}t-=o}return r.lines[t]}function xi(e,t,r){var n=[],i=t.line
+return e.iter(t.line,r.line+1,(function(e){var o=e.text
+i==r.line&&(o=o.slice(0,r.ch)),i==t.line&&(o=o.slice(t.ch)),n.push(o),++i})),n}function Oi(e,t,r){var n=[]
+return e.iter(t,r,(function(e){n.push(e.text)})),n}function Si(e,t){var r=t-e.height
+if(r)for(var n=e;n;n=n.parent)n.height+=r}function Ti(e){if(null==e.parent)return null
+for(var t=e.parent,r=bo(t.lines,e),n=t.parent;n;t=n,n=n.parent)for(var i=0;n.children[i]!=t;++i)r+=n.children[i].chunkSize()
+return r+t.first}function Mi(e,t){var r=e.first
+e:do{for(var n=0;n<e.children.length;++n){var i=e.children[n],o=i.height
+if(t<o){e=i
+continue e}t-=o,r+=i.chunkSize()}return r}while(!e.lines)
+for(n=0;n<e.lines.length;++n){var a=e.lines[n].height
+if(t<a)break
+t-=a}return r+n}function Ai(e){for(var t=0,r=(e=zn(e)).parent,n=0;n<r.lines.length;++n){var i=r.lines[n]
+if(i==e)break
+t+=i.height}for(var o=r.parent;o;o=(r=o).parent)for(n=0;n<o.children.length;++n){var a=o.children[n]
+if(a==r)break
+t+=a.height}return t}function Pi(e){var t=e.order
+return null==t&&(t=e.order=da(e.text)),t}function Ci(e){this.done=[],this.undone=[],this.undoDepth=1/0,this.lastModTime=this.lastSelTime=0,this.lastOp=this.lastSelOp=null,this.lastOrigin=this.lastSelOrigin=null,this.generation=this.maxGeneration=e||1}function ki(e,t){var r={from:me(t.from),to:Rr(t),text:xi(e,t.from,t.to)}
+return Ni(e,r,t.from.line,t.to.line+1),_i(e,(function(e){Ni(e,r,t.from.line,t.to.line+1)}),!0),r}function Ri(e){for(;e.length;){if(!vo(e).ranges)break
+e.pop()}}function ji(e,t,r,n){var i=e.history
+i.undone.length=0
+var o,a=+new Date
+if((i.lastOp==n||i.lastOrigin==t.origin&&t.origin&&("+"==t.origin.charAt(0)&&e.cm&&i.lastModTime>a-e.cm.options.historyEventDelay||"*"==t.origin.charAt(0)))&&(o=function(e,t){return t?(Ri(e.done),vo(e.done)):e.done.length&&!vo(e.done).ranges?vo(e.done):e.done.length>1&&!e.done[e.done.length-2].ranges?(e.done.pop(),vo(e.done)):void 0}(i,i.lastOp==n))){var s=vo(o.changes)
+0==pe(t.from,t.to)&&0==pe(t.from,s.to)?s.to=Rr(t):o.changes.push(ki(e,t))}else{var l=vo(i.done)
+for(l&&l.ranges||Di(e.sel,i.done),o={changes:[ki(e,t)],generation:i.generation},i.done.push(o);i.done.length>i.undoDepth;)i.done.shift(),i.done[0].ranges||i.done.shift()}i.done.push(r),i.generation=++i.maxGeneration,i.lastModTime=i.lastSelTime=a,i.lastOp=i.lastSelOp=n,i.lastOrigin=i.lastSelOrigin=t.origin,s||Qi(e,"historyAdded")}function Di(e,t){var r=vo(t)
+r&&r.ranges&&r.equals(e)||t.push(e)}function Ni(e,t,r,n){var i=t["spans_"+e.id],o=0
+e.iter(Math.max(e.first,r),Math.min(e.first+e.size,n),(function(r){r.markedSpans&&((i||(i=t["spans_"+e.id]={}))[o]=r.markedSpans),++o}))}function Ii(e){if(!e)return null
+for(var t,r=0;r<e.length;++r)e[r].marker.explicitlyCleared?t||(t=e.slice(0,r)):t&&t.push(e[r])
+return t?t.length?t:null:e}function Li(e,t,r){for(var n=0,i=[];n<e.length;++n){var o=e[n]
+if(o.ranges)i.push(r?Re.prototype.deepCopy.call(o):o)
+else{var a=o.changes,s=[]
+i.push({changes:s})
+for(var l=0;l<a.length;++l){var u,c=a[l]
+if(s.push({from:c.from,to:c.to,text:c.text}),t)for(var d in c)(u=d.match(/^spans_(\d+)$/))&&bo(t,Number(u[1]))>-1&&(vo(s)[d]=c[d],delete c[d])}}}return i}function Fi(e,t,r,n){r<e.line?e.line+=n:t<e.line&&(e.line=t,e.ch=0)}function zi(e,t,r,n){for(var i=0;i<e.length;++i){var o=e[i],a=!0
+if(o.ranges){o.copied||((o=e[i]=o.deepCopy()).copied=!0)
+for(var s=0;s<o.ranges.length;s++)Fi(o.ranges[s].anchor,t,r,n),Fi(o.ranges[s].head,t,r,n)}else{for(s=0;s<o.changes.length;++s){var l=o.changes[s]
+if(r<l.from.line)l.from=fe(l.from.line+n,l.from.ch),l.to=fe(l.to.line+n,l.to.ch)
+else if(t<=l.to.line){a=!1
+break}}a||(e.splice(0,i+1),i=0)}}}function Ui(e,t){var r=t.from.line,n=t.to.line,i=t.text.length-(n-r)-1
+zi(e.done,r,n,i),zi(e.undone,r,n,i)}io(gi)
+var Hi=O.e_preventDefault=function(e){e.preventDefault?e.preventDefault():e.returnValue=!1},Bi=O.e_stopPropagation=function(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0}
+function Vi(e){return null!=e.defaultPrevented?e.defaultPrevented:0==e.returnValue}var $i=O.e_stop=function(e){Hi(e),Bi(e)}
+function qi(e){return e.target||e.srcElement}function Wi(e){var t=e.which
+return null==t&&(1&e.button?t=1:2&e.button?t=3:4&e.button&&(t=2)),v&&e.ctrlKey&&1==t&&(t=3),t}var Gi=O.on=function(e,t,r){if(e.addEventListener)e.addEventListener(t,r,!1)
+else if(e.attachEvent)e.attachEvent("on"+t,r)
+else{var n=e._handlers||(e._handlers={});(n[t]||(n[t]=[])).push(r)}},Yi=[]
+function Ki(e,t,r){var n=e._handlers&&e._handlers[t]
+return r?n&&n.length>0?n.slice():Yi:n||Yi}var Ji=O.off=function(e,t,r){if(e.removeEventListener)e.removeEventListener(t,r,!1)
+else if(e.detachEvent)e.detachEvent("on"+t,r)
+else for(var n=Ki(e,t,!1),i=0;i<n.length;++i)if(n[i]==r){n.splice(i,1)
+break}},Qi=O.signal=function(e,t){var r=Ki(e,t,!0)
+if(r.length)for(var n=Array.prototype.slice.call(arguments,2),i=0;i<r.length;++i)r[i].apply(null,n)},Xi=null
+function Zi(e,t){var r=Ki(e,t,!1)
+if(r.length){var n,i=Array.prototype.slice.call(arguments,2)
+zt?n=zt.delayedCallbacks:Xi?n=Xi:(n=Xi=[],setTimeout(eo,0))
+for(var o=0;o<r.length;++o)n.push(a(r[o]))}function a(e){return function(){e.apply(null,i)}}}function eo(){var e=Xi
+Xi=null
+for(var t=0;t<e.length;++t)e[t]()}function to(e,t,r){return"string"==typeof t&&(t={type:t,preventDefault:function(){this.defaultPrevented=!0}}),Qi(e,r||t.type,e,t),Vi(t)||t.codemirrorIgnore}function ro(e){var t=e._handlers&&e._handlers.cursorActivity
+if(t)for(var r=e.curOp.cursorActivityHandlers||(e.curOp.cursorActivityHandlers=[]),n=0;n<t.length;++n)-1==bo(r,t[n])&&r.push(t[n])}function no(e,t){return Ki(e,t).length>0}function io(e){e.prototype.on=function(e,t){Gi(this,e,t)},e.prototype.off=function(e,t){Ji(this,e,t)}}var oo=30,ao=O.Pass={toString:function(){return"CodeMirror.Pass"}},so={scroll:!1},lo={origin:"*mouse"},uo={origin:"+move"}
+function co(){this.id=null}co.prototype.set=function(e,t){clearTimeout(this.id),this.id=setTimeout(t,e)}
+var ho=O.countColumn=function(e,t,r,n,i){null==t&&-1==(t=e.search(/[^\s\u00a0]/))&&(t=e.length)
+for(var o=n||0,a=i||0;;){var s=e.indexOf("\t",o)
+if(s<0||s>=t)return a+(t-o)
+a+=s-o,a+=r-a%r,o=s+1}},fo=O.findColumn=function(e,t,r){for(var n=0,i=0;;){var o=e.indexOf("\t",n);-1==o&&(o=e.length)
+var a=o-n
+if(o==e.length||i+a>=t)return n+Math.min(a,t-i)
+if(i+=o-n,n=o+1,(i+=r-i%r)>=t)return n}},po=[""]
+function mo(e){for(;po.length<=e;)po.push(vo(po)+" ")
+return po[e]}function vo(e){return e[e.length-1]}var go=function(e){e.select()}
+function bo(e,t){for(var r=0;r<e.length;++r)if(e[r]==t)return r
+return-1}function yo(e,t){for(var r=[],n=0;n<e.length;n++)r[n]=t(e[n],n)
+return r}function _o(){}function wo(e,t){var r
+return Object.create?r=Object.create(e):(_o.prototype=e,r=new _o),t&&Eo(t,r),r}function Eo(e,t,r){for(var n in t||(t={}),e)!e.hasOwnProperty(n)||!1===r&&t.hasOwnProperty(n)||(t[n]=e[n])
+return t}function xo(e){var t=Array.prototype.slice.call(arguments,1)
+return function(){return e.apply(null,t)}}p?go=function(e){e.selectionStart=0,e.selectionEnd=e.value.length}:o&&(go=function(e){try{e.select()}catch(t){}})
+var Oo=/[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/,So=O.isWordChar=function(e){return/\w/.test(e)||e>"€"&&(e.toUpperCase()!=e.toLowerCase()||Oo.test(e))}
+function To(e,t){return t?!!(t.source.indexOf("\\w")>-1&&So(e))||t.test(e):So(e)}function Mo(e){for(var t in e)if(e.hasOwnProperty(t)&&e[t])return!1
+return!0}var Ao,Po=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/
+function Co(e){return e.charCodeAt(0)>=768&&Po.test(e)}function ko(e,t,r,n){var i=document.createElement(e)
+if(r&&(i.className=r),n&&(i.style.cssText=n),"string"==typeof t)i.appendChild(document.createTextNode(t))
+else if(t)for(var o=0;o<t.length;++o)i.appendChild(t[o])
+return i}function Ro(e){for(var t=e.childNodes.length;t>0;--t)e.removeChild(e.firstChild)
+return e}function jo(e,t){return Ro(e).appendChild(t)}Ao=document.createRange?function(e,t,r,n){var i=document.createRange()
+return i.setEnd(n||e,r),i.setStart(e,t),i}:function(e,t,r){var n=document.body.createTextRange()
+try{n.moveToElementText(e.parentNode)}catch(Go){return n}return n.collapse(!0),n.moveEnd("character",r),n.moveStart("character",t),n}
+var Do=O.contains=function(e,t){if(3==t.nodeType&&(t=t.parentNode),e.contains)return e.contains(t)
+do{if(11==t.nodeType&&(t=t.host),t==e)return!0}while(t=t.parentNode)}
+function No(){for(var e=document.activeElement;e&&e.root&&e.root.activeElement;)e=e.root.activeElement
+return e}function Io(e){return new RegExp("(^|\\s)"+e+"(?:$|\\s)\\s*")}o&&a<11&&(No=function(){try{return document.activeElement}catch(Go){return document.body}})
+var Lo=O.rmClass=function(e,t){var r=e.className,n=Io(t).exec(r)
+if(n){var i=r.slice(n.index+n[0].length)
+e.className=r.slice(0,n.index)+(i?n[1]+i:"")}},Fo=O.addClass=function(e,t){var r=e.className
+Io(t).test(r)||(e.className+=(r?" ":"")+t)}
+function zo(e,t){for(var r=e.split(" "),n=0;n<r.length;n++)r[n]&&!Io(r[n]).test(t)&&(t+=" "+r[n])
+return t}function Uo(e){if(document.body.getElementsByClassName)for(var t=document.body.getElementsByClassName("CodeMirror"),r=0;r<t.length;r++){var n=t[r].CodeMirror
+n&&e(n)}}var Ho=!1
+var Bo,Vo,$o=function(){if(o&&a<9)return!1
+var e=ko("div")
+return"draggable"in e||"dragDrop"in e}()
+function qo(e){if(null==Bo){var t=ko("span","​")
+jo(e,ko("span",[t,document.createTextNode("x")])),0!=e.firstChild.offsetHeight&&(Bo=t.offsetWidth<=1&&t.offsetHeight>2&&!(o&&a<8))}var r=Bo?ko("span","​"):ko("span"," ",null,"display: inline-block; width: 1px; margin-right: -1px")
+return r.setAttribute("cm-text",""),r}function Wo(e){if(null!=Vo)return Vo
+var t=jo(e,document.createTextNode("AخA")),r=Ao(t,0,1).getBoundingClientRect()
+if(!r||r.left==r.right)return!1
+var n=Ao(t,1,2).getBoundingClientRect()
+return Vo=n.right-r.right<3}var Go,Yo=O.splitLines=3!="\n\nb".split(/\n/).length?function(e){for(var t=0,r=[],n=e.length;t<=n;){var i=e.indexOf("\n",t);-1==i&&(i=e.length)
+var o=e.slice(t,"\r"==e.charAt(i-1)?i-1:i),a=o.indexOf("\r");-1!=a?(r.push(o.slice(0,a)),t+=a+1):(r.push(o),t=i+1)}return r}:function(e){return e.split(/\r\n?|\n/)},Ko=window.getSelection?function(e){try{return e.selectionStart!=e.selectionEnd}catch(Go){return!1}}:function(e){try{var t=e.ownerDocument.selection.createRange()}catch(Go){}return!(!t||t.parentElement()!=e)&&0!=t.compareEndPoints("StartToEnd",t)},Jo="oncopy"in(Go=ko("div"))||(Go.setAttribute("oncopy","return;"),"function"==typeof Go.oncopy),Qo=null
+var Xo,Zo=O.keyNames={3:"Enter",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",61:"=",91:"Mod",92:"Mod",93:"Mod",106:"*",107:"=",109:"-",110:".",111:"/",127:"Delete",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"}
+function ea(e){return e.level%2?e.to:e.from}function ta(e){return e.level%2?e.from:e.to}function ra(e){var t=Pi(e)
+return t?ea(t[0]):0}function na(e){var t=Pi(e)
+return t?ta(vo(t)):e.text.length}function ia(e,t){var r=Ei(e.doc,t),n=zn(r)
+n!=r&&(t=Ti(n))
+var i=Pi(n),o=i?i[0].level%2?na(n):ra(n):0
+return fe(t,o)}function oa(e,t){var r=ia(e,t.line),n=Ei(e.doc,r.line),i=Pi(n)
+if(!i||0==i[0].level){var o=Math.max(0,n.text.search(/\S/)),a=t.line==r.line&&t.ch<=o&&t.ch
+return fe(r.line,a?0:o)}return r}function aa(e,t,r){var n=e[0].level
+return t==n||r!=n&&t<r}function sa(e,t){Xo=null
+for(var r,n=0;n<e.length;++n){var i=e[n]
+if(i.from<t&&i.to>t)return n
+if(i.from==t||i.to==t){if(null!=r)return aa(e,i.level,e[r].level)?(i.from!=i.to&&(Xo=r),n):(i.from!=i.to&&(Xo=n),r)
+r=n}}return r}function la(e,t,r,n){if(!n)return t+r
+do{t+=r}while(t>0&&Co(e.text.charAt(t)))
+return t}function ua(e,t,r,n){var i=Pi(e)
+if(!i)return ca(e,t,r,n)
+for(var o=sa(i,t),a=i[o],s=la(e,t,a.level%2?-r:r,n);;){if(s>a.from&&s<a.to)return s
+if(s==a.from||s==a.to)return sa(i,s)==o?s:r>0==(a=i[o+=r]).level%2?a.to:a.from
+if(!(a=i[o+=r]))return null
+s=r>0==a.level%2?la(e,a.to,-1,n):la(e,a.from,1,n)}}function ca(e,t,r,n){var i=t+r
+if(n)for(;i>0&&Co(e.text.charAt(i));)i+=r
+return i<0||i>e.text.length?null:i}(function(){for(var e=0;e<10;e++)Zo[e+48]=Zo[e+96]=String(e)
+for(e=65;e<=90;e++)Zo[e]=String.fromCharCode(e)
+for(e=1;e<=12;e++)Zo[e+111]=Zo[e+63235]="F"+e})()
+var da=function(){var e=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,t=/[stwN]/,r=/[LRr]/,n=/[Lb1n]/,i=/[1n]/
+function o(e,t,r){this.level=e,this.from=t,this.to=r}return function(a){if(!e.test(a))return!1
+for(var s,l=a.length,u=[],c=0;c<l;++c)u.push(v=(s=a.charCodeAt(c))<=247?"bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN".charAt(s):1424<=s&&s<=1524?"R":1536<=s&&s<=1773?"rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm".charAt(s-1536):1774<=s&&s<=2220?"r":8192<=s&&s<=8203?"w":8204==s?"b":"L")
+c=0
+for(var d="L";c<l;++c){"m"==(v=u[c])?u[c]=d:d=v}c=0
+for(var h="L";c<l;++c){"1"==(v=u[c])&&"r"==h?u[c]="n":r.test(v)&&(h=v,"r"==v&&(u[c]="R"))}for(c=1,d=u[0];c<l-1;++c){"+"==(v=u[c])&&"1"==d&&"1"==u[c+1]?u[c]="1":","!=v||d!=u[c+1]||"1"!=d&&"n"!=d||(u[c]=d),d=v}for(c=0;c<l;++c){if(","==(v=u[c]))u[c]="N"
+else if("%"==v){for(var f=c+1;f<l&&"%"==u[f];++f);for(var p=c&&"!"==u[c-1]||f<l&&"1"==u[f]?"1":"N",m=c;m<f;++m)u[m]=p
+c=f-1}}for(c=0,h="L";c<l;++c){var v=u[c]
+"L"==h&&"1"==v?u[c]="L":r.test(v)&&(h=v)}for(c=0;c<l;++c)if(t.test(u[c])){for(f=c+1;f<l&&t.test(u[f]);++f);var g="L"==(c?u[c-1]:"L"),b="L"==(f<l?u[f]:"L")
+for(p=g||b?"L":"R",m=c;m<f;++m)u[m]=p
+c=f-1}var y,_=[]
+for(c=0;c<l;)if(n.test(u[c])){var w=c
+for(++c;c<l&&n.test(u[c]);++c);_.push(new o(0,w,c))}else{var E=c,x=_.length
+for(++c;c<l&&"L"!=u[c];++c);for(m=E;m<c;)if(i.test(u[m])){E<m&&_.splice(x,0,new o(1,E,m))
+var O=m
+for(++m;m<c&&i.test(u[m]);++m);_.splice(x,0,new o(2,O,m)),E=m}else++m
+E<c&&_.splice(x,0,new o(1,E,c))}return 1==_[0].level&&(y=a.match(/^\s+/))&&(_[0].from=y[0].length,_.unshift(new o(0,0,y[0].length))),1==vo(_).level&&(y=a.match(/\s+$/))&&(vo(_).to-=y[0].length,_.push(new o(0,l-y[0].length,l))),2==_[0].level&&_.unshift(new o(1,_[0].to,_[0].to)),_[0].level!=vo(_).level&&_.push(new o(_[0].level,l,l)),_}}()
+return O.version="5.15.2",O})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}((function(e){"use strict"
+var t="CodeMirror-lint-markers"
+function r(e){e.parentNode&&e.parentNode.removeChild(e)}function n(t,n,i){var o=function(t,r){var n=document.createElement("div")
+function i(t){if(!n.parentNode)return e.off(document,"mousemove",i)
+n.style.top=Math.max(0,t.clientY-n.offsetHeight-5)+"px",n.style.left=t.clientX+5+"px"}return n.className="CodeMirror-lint-tooltip",n.appendChild(r.cloneNode(!0)),document.body.appendChild(n),e.on(document,"mousemove",i),i(t),null!=n.style.opacity&&(n.style.opacity=1),n}(t,n)
+function a(){var t
+e.off(i,"mouseout",a),o&&((t=o).parentNode&&(null==t.style.opacity&&r(t),t.style.opacity=0,setTimeout((function(){r(t)}),600)),o=null)}var s=setInterval((function(){if(o)for(var e=i;;e=e.parentNode){if(e&&11==e.nodeType&&(e=e.host),e==document.body)return
+if(!e){a()
+break}}if(!o)return clearInterval(s)}),400)
+e.on(i,"mouseout",a)}function i(e,t,r){this.marked=[],this.options=t,this.timeout=null,this.hasGutter=r,this.onMouseOver=function(t){(function(e,t){var r=t.target||t.srcElement
+if(!/\bCodeMirror-lint-mark-/.test(r.className))return
+for(var i=r.getBoundingClientRect(),o=(i.left+i.right)/2,a=(i.top+i.bottom)/2,l=e.findMarksAt(e.coordsChar({left:o,top:a},"client")),u=[],c=0;c<l.length;++c){var d=l[c].__annotation
+d&&u.push(d)}u.length&&function(e,t){for(var r=t.target||t.srcElement,i=document.createDocumentFragment(),o=0;o<e.length;o++){var a=e[o]
+i.appendChild(s(a))}n(t,i,r)}(u,t)})(e,t)},this.waitingFor=0}function o(e){var r=e.state.lint
+r.hasGutter&&e.clearGutter(t)
+for(var n=0;n<r.marked.length;++n)r.marked[n].clear()
+r.marked.length=0}function a(t,r,i,o){var a=document.createElement("div"),s=a
+return a.className="CodeMirror-lint-marker-"+r,i&&((s=a.appendChild(document.createElement("div"))).className="CodeMirror-lint-marker-multiple"),0!=o&&e.on(s,"mouseover",(function(e){n(e,t,s)})),a}function s(e){var t=e.severity
+t||(t="error")
+var r=document.createElement("div")
+return r.className="CodeMirror-lint-message-"+t,r.appendChild(document.createTextNode(e.message)),r}function l(t){var r=t.state.lint.options,n=r.options||r,i=r.getAnnotations||t.getHelper(e.Pos(0,0),"lint")
+i&&(r.async||i.async?function(t,r,n){var i=t.state.lint,o=++i.waitingFor
+function a(){o=-1,t.off("change",a)}t.on("change",a),r(t.getValue(),(function(r,n){t.off("change",a),i.waitingFor==o&&(n&&r instanceof e&&(r=n),u(t,r))}),n,t)}(t,i,n):u(t,i(t.getValue(),n,t)))}function u(e,r){o(e)
+for(var n,i,l=e.state.lint,u=l.options,c=function(e){for(var t=[],r=0;r<e.length;++r){var n=e[r],i=n.from.line;(t[i]||(t[i]=[])).push(n)}return t}(r),d=0;d<c.length;++d){var h=c[d]
+if(h){for(var f=null,p=l.hasGutter&&document.createDocumentFragment(),m=0;m<h.length;++m){var v=h[m],g=v.severity
+g||(g="error"),i=g,f="error"==(n=f)?n:i,u.formatAnnotation&&(v=u.formatAnnotation(v)),l.hasGutter&&p.appendChild(s(v)),v.to&&l.marked.push(e.markText(v.from,v.to,{className:"CodeMirror-lint-mark-"+g,__annotation:v}))}l.hasGutter&&e.setGutterMarker(d,t,a(p,f,h.length>1,l.options.tooltips))}}u.onUpdateLinting&&u.onUpdateLinting(r,c,e)}function c(e){var t=e.state.lint
+t&&(clearTimeout(t.timeout),t.timeout=setTimeout((function(){l(e)}),t.options.delay||500))}e.defineOption("lint",!1,(function(r,n,a){if(a&&a!=e.Init&&(o(r),!1!==r.state.lint.options.lintOnChange&&r.off("change",c),e.off(r.getWrapperElement(),"mouseover",r.state.lint.onMouseOver),clearTimeout(r.state.lint.timeout),delete r.state.lint),n){for(var s=r.getOption("gutters"),u=!1,d=0;d<s.length;++d)s[d]==t&&(u=!0)
+var h=r.state.lint=new i(r,(f=n)instanceof Function?{getAnnotations:f}:(f&&!0!==f||(f={}),f),u)
+!1!==h.options.lintOnChange&&r.on("change",c),0!=h.options.tooltips&&e.on(r.getWrapperElement(),"mouseover",h.onMouseOver),l(r)}var f})),e.defineExtension("performLint",(function(){this.state.lint&&l(this)}))})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}((function(e){"use strict"
+e.registerHelper("lint","json",(function(t){var r=[]
+jsonlint.parseError=function(t,n){var i=n.loc
+r.push({from:e.Pos(i.first_line-1,i.first_column),to:e.Pos(i.last_line-1,i.last_column),message:t})}
+try{jsonlint.parse(t)}catch(n){}return r}))})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}((function(e){"use strict"
+e.registerHelper("lint","yaml",(function(t){var r=[]
+try{jsyaml.load(t)}catch(i){var n=i.mark
+r.push({from:e.Pos(n.line,n.column),to:e.Pos(n.line,n.column),message:i.message})}return r}))})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror"),"cjs"):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],(function(t){e(t,"amd")})):e(CodeMirror,"plain")}((function(e,t){e.modeURL||(e.modeURL="../mode/%N/%N.js")
+var r={}
+function n(t,r){var n=e.modes[t].dependencies
+if(!n)return r()
+for(var i=[],o=0;o<n.length;++o)e.modes.hasOwnProperty(n[o])||i.push(n[o])
+if(!i.length)return r()
+var a=function(e,t){var r=t
+return function(){0==--r&&e()}}(r,i.length)
+for(o=0;o<i.length;++o)e.requireMode(i[o],a)}e.requireMode=function(i,o){if("string"!=typeof i&&(i=i.name),e.modes.hasOwnProperty(i))return n(i,o)
+if(r.hasOwnProperty(i))return r[i].push(o)
+var a=e.modeURL.replace(/%N/g,i)
+if("plain"==t){var s=document.createElement("script")
+s.src=a
+var l=document.getElementsByTagName("script")[0],u=r[i]=[o]
+e.on(s,"load",(function(){n(i,(function(){for(var e=0;e<u.length;++e)u[e]()}))})),l.parentNode.insertBefore(s,l)}else"cjs"==t?(require(a),o()):"amd"==t&&requirejs([a],o)},e.autoLoadMode=function(t,r){e.modes.hasOwnProperty(r)||e.requireMode(r,(function(){t.setOption("mode",t.getOption("mode"))}))}})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}((function(e){"use strict"
+function t(e,t){if(!e.hasOwnProperty(t))throw new Error("Undefined state "+t+" in simple mode")}function r(e,t){if(!e)return/(?:)/
+var r=""
+return e instanceof RegExp?(e.ignoreCase&&(r="i"),e=e.source):e=String(e),new RegExp((!1===t?"":"^")+"(?:"+e+")",r)}function n(e,n){(e.next||e.push)&&t(n,e.next||e.push),this.regex=r(e.regex),this.token=function(e){if(!e)return null
+if("string"==typeof e)return e.replace(/\./g," ")
+for(var t=[],r=0;r<e.length;r++)t.push(e[r]&&e[r].replace(/\./g," "))
+return t}(e.token),this.data=e}function i(e,t){return function(r,n){if(n.pending){var i=n.pending.shift()
+return 0==n.pending.length&&(n.pending=null),r.pos+=i.text.length,i.token}if(n.local){if(n.local.end&&r.match(n.local.end)){var o=n.local.endToken||null
+return n.local=n.localState=null,o}var s
+o=n.local.mode.token(r,n.localState)
+return n.local.endScan&&(s=n.local.endScan.exec(r.current()))&&(r.pos=r.start+s.index),o}for(var l=e[n.state],u=0;u<l.length;u++){var c=l[u],d=(!c.data.sol||r.sol())&&r.match(c.regex)
+if(d){if(c.data.next?n.state=c.data.next:c.data.push?((n.stack||(n.stack=[])).push(n.state),n.state=c.data.push):c.data.pop&&n.stack&&n.stack.length&&(n.state=n.stack.pop()),c.data.mode&&a(t,n,c.data.mode,c.token),c.data.indent&&n.indent.push(r.indentation()+t.indentUnit),c.data.dedent&&n.indent.pop(),d.length>2){n.pending=[]
+for(var h=2;h<d.length;h++)d[h]&&n.pending.push({text:d[h],token:c.token[h-1]})
+return r.backUp(d[0].length-(d[1]?d[1].length:0)),c.token[0]}return c.token&&c.token.join?c.token[0]:c.token}}return r.next(),null}}function o(e,t){if(e===t)return!0
+if(!e||"object"!=typeof e||!t||"object"!=typeof t)return!1
+var r=0
+for(var n in e)if(e.hasOwnProperty(n)){if(!t.hasOwnProperty(n)||!o(e[n],t[n]))return!1
+r++}for(var n in t)t.hasOwnProperty(n)&&r--
+return 0==r}function a(t,n,i,a){var s
+if(i.persistent)for(var l=n.persistentStates;l&&!s;l=l.next)(i.spec?o(i.spec,l.spec):i.mode==l.mode)&&(s=l)
+var u=s?s.mode:i.mode||e.getMode(t,i.spec),c=s?s.state:e.startState(u)
+i.persistent&&!s&&(n.persistentStates={mode:u,spec:i.spec,state:c,next:n.persistentStates}),n.localState=c,n.local={mode:u,end:i.end&&r(i.end),endScan:i.end&&!1!==i.forceEnd&&r(i.end,!1),endToken:a&&a.join?a[a.length-1]:a}}function s(t,r){return function(n,i,o){if(n.local&&n.local.mode.indent)return n.local.mode.indent(n.localState,i,o)
+if(null==n.indent||n.local||r.dontIndentStates&&function(e,t){for(var r=0;r<t.length;r++)if(t[r]===e)return!0}(n.state,r.dontIndentStates)>-1)return e.Pass
+var a=n.indent.length-1,s=t[n.state]
+e:for(;;){for(var l=0;l<s.length;l++){var u=s[l]
+if(u.data.dedent&&!1!==u.data.dedentIfLineStart){var c=u.regex.exec(i)
+if(c&&c[0]){a--,(u.next||u.push)&&(s=t[u.next||u.push]),i=i.slice(c[0].length)
+continue e}}}break}return a<0?0:n.indent[a]}}e.defineSimpleMode=function(t,r){e.defineMode(t,(function(t){return e.simpleMode(t,r)}))},e.simpleMode=function(r,o){t(o,"start")
+var a={},l=o.meta||{},u=!1
+for(var c in o)if(c!=l&&o.hasOwnProperty(c))for(var d=a[c]=[],h=o[c],f=0;f<h.length;f++){var p=h[f]
+d.push(new n(p,o)),(p.indent||p.dedent)&&(u=!0)}var m={startState:function(){return{state:"start",pending:null,local:null,localState:null,indent:u?[]:null}},copyState:function(t){var r={state:t.state,pending:t.pending,local:t.local,localState:null,indent:t.indent&&t.indent.slice(0)}
+t.localState&&(r.localState=e.copyState(t.local.mode,t.localState)),t.stack&&(r.stack=t.stack.slice(0))
+for(var n=t.persistentStates;n;n=n.next)r.persistentStates={mode:n.mode,spec:n.spec,state:n.state==t.localState?r.localState:e.copyState(n.mode,n.state),next:r.persistentStates}
+return r},token:i(a,r),innerMode:function(e){return e.local&&{mode:e.local.mode,state:e.localState}},indent:s(a,l)}
+if(l)for(var v in l)l.hasOwnProperty(v)&&(m[v]=l[v])
+return m}})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}((function(e){"use strict"
+e.multiplexingMode=function(t){var r=Array.prototype.slice.call(arguments,1)
+function n(e,t,r,n){if("string"==typeof t){var i=e.indexOf(t,r)
+return n&&i>-1?i+t.length:i}var o=t.exec(r?e.slice(r):e)
+return o?o.index+r+(n?o[0].length:0):-1}return{startState:function(){return{outer:e.startState(t),innerActive:null,inner:null}},copyState:function(r){return{outer:e.copyState(t,r.outer),innerActive:r.innerActive,inner:r.innerActive&&e.copyState(r.innerActive.mode,r.inner)}},token:function(i,o){if(o.innerActive){var a=o.innerActive
+u=i.string
+if(!a.close&&i.sol())return o.innerActive=o.inner=null,this.token(i,o)
+if((d=a.close?n(u,a.close,i.pos,a.parseDelimiters):-1)==i.pos&&!a.parseDelimiters)return i.match(a.close),o.innerActive=o.inner=null,a.delimStyle&&a.delimStyle+" "+a.delimStyle+"-close"
+d>-1&&(i.string=u.slice(0,d))
+var s=a.mode.token(i,o.inner)
+return d>-1&&(i.string=u),d==i.pos&&a.parseDelimiters&&(o.innerActive=o.inner=null),a.innerStyle&&(s=s?s+" "+a.innerStyle:a.innerStyle),s}for(var l=1/0,u=i.string,c=0;c<r.length;++c){var d,h=r[c]
+if((d=n(u,h.open,i.pos))==i.pos)return h.parseDelimiters||i.match(h.open),o.innerActive=h,o.inner=e.startState(h.mode,t.indent?t.indent(o.outer,""):0),h.delimStyle&&h.delimStyle+" "+h.delimStyle+"-open";-1!=d&&d<l&&(l=d)}l!=1/0&&(i.string=u.slice(0,l))
+var f=t.token(i,o.outer)
+return l!=1/0&&(i.string=u),f},indent:function(r,n){var i=r.innerActive?r.innerActive.mode:t
+return i.indent?i.indent(r.innerActive?r.inner:r.outer,n):e.Pass},blankLine:function(n){var i=n.innerActive?n.innerActive.mode:t
+if(i.blankLine&&i.blankLine(n.innerActive?n.inner:n.outer),n.innerActive)"\n"===n.innerActive.close&&(n.innerActive=n.inner=null)
+else for(var o=0;o<r.length;++o){var a=r[o]
+"\n"===a.open&&(n.innerActive=a,n.inner=e.startState(a.mode,i.indent?i.indent(n.outer,""):0))}},electricChars:t.electricChars,innerMode:function(e){return e.inner?{state:e.inner,mode:e.innerActive.mode}:{state:e.outer,mode:t}}}}})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("bower_components/codemirror/lib/codemirror"),require("bower_components/codemirror/addon/mode/simple")):"function"==typeof define&&define.amd?define(["bower_components/codemirror/lib/codemirror","bower_components/codemirror/addon/mode/simple"],e):e(CodeMirror)}((function(e){"use strict"
+e.defineMode("htmlhandlebars",(function(t){return e.multiplexingMode(e.getMode(t,"text/html"),{open:"{{",close:"}}",mode:e.getMode(t,"handlebars"),parseDelimiters:!0})})),e.defineMIME("text/x-handlebars-template","htmlhandlebars")})),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../lib/codemirror"),require("../addon/search/searchcursor"),require("../addon/edit/matchbrackets")):"function"==typeof define&&define.amd?define(["../lib/codemirror","../addon/search/searchcursor","../addon/edit/matchbrackets"],e):e(CodeMirror)}((function(e){"use strict"
+var t=e.keyMap.sublime={fallthrough:"default"},r=e.commands,n=e.Pos,i=e.keyMap.default==e.keyMap.macDefault,o=i?"Cmd-":"Ctrl-"
+function a(t,r){t.extendSelectionsBy((function(i){return t.display.shift||t.doc.extend||i.empty()?function(t,r,i){if(i<0&&0==r.ch)return t.clipPos(n(r.line-1))
+var o=t.getLine(r.line)
+if(i>0&&r.ch>=o.length)return t.clipPos(n(r.line+1,0))
+for(var a,s="start",l=r.ch,u=i<0?0:o.length,c=0;l!=u;l+=i,c++){var d=o.charAt(i<0?l-1:l),h="_"!=d&&e.isWordChar(d)?"w":"o"
+if("w"==h&&d.toUpperCase()==d&&(h="W"),"start"==s)"o"!=h&&(s="in",a=h)
+else if("in"==s&&a!=h){if("w"==a&&"W"==h&&i<0&&l--,"W"==a&&"w"==h&&i>0){a="w"
+continue}break}}return n(r.line,l)}(t.doc,i.head,r):r<0?i.from():i.to()}))}r[t["Alt-Left"]="goSubwordLeft"]=function(e){a(e,-1)},r[t["Alt-Right"]="goSubwordRight"]=function(e){a(e,1)},i&&(t["Cmd-Left"]="goLineStartSmart")
+var s=i?"Ctrl-Alt-":"Ctrl-"
+function l(t,r){if(t.isReadOnly())return e.Pass
+t.operation((function(){for(var e=t.listSelections().length,i=[],o=-1,a=0;a<e;a++){var s=t.listSelections()[a].head
+if(!(s.line<=o)){var l=n(s.line+(r?0:1),0)
+t.replaceRange("\n",l,null,"+insertLine"),t.indentLine(l.line,null,!0),i.push({head:l,anchor:l}),o=s.line+1}}t.setSelections(i)})),t.execCommand("indentAuto")}function u(t,r){for(var i=r.ch,o=i,a=t.getLine(r.line);i&&e.isWordChar(a.charAt(i-1));)--i
+for(;o<a.length&&e.isWordChar(a.charAt(o));)++o
+return{from:n(r.line,i),to:n(r.line,o),word:a.slice(i,o)}}r[t[s+"Up"]="scrollLineUp"]=function(e){var t=e.getScrollInfo()
+if(!e.somethingSelected()){var r=e.lineAtHeight(t.top+t.clientHeight,"local")
+e.getCursor().line>=r&&e.execCommand("goLineUp")}e.scrollTo(null,t.top-e.defaultTextHeight())},r[t[s+"Down"]="scrollLineDown"]=function(e){var t=e.getScrollInfo()
+if(!e.somethingSelected()){var r=e.lineAtHeight(t.top,"local")+1
+e.getCursor().line<=r&&e.execCommand("goLineDown")}e.scrollTo(null,t.top+e.defaultTextHeight())},r[t["Shift-"+o+"L"]="splitSelectionByLine"]=function(e){for(var t=e.listSelections(),r=[],i=0;i<t.length;i++)for(var o=t[i].from(),a=t[i].to(),s=o.line;s<=a.line;++s)a.line>o.line&&s==a.line&&0==a.ch||r.push({anchor:s==o.line?o:n(s,0),head:s==a.line?a:n(s)})
+e.setSelections(r,0)},t["Shift-Tab"]="indentLess",r[t.Esc="singleSelectionTop"]=function(e){var t=e.listSelections()[0]
+e.setSelection(t.anchor,t.head,{scroll:!1})},r[t[o+"L"]="selectLine"]=function(e){for(var t=e.listSelections(),r=[],i=0;i<t.length;i++){var o=t[i]
+r.push({anchor:n(o.from().line,0),head:n(o.to().line+1,0)})}e.setSelections(r)},t["Shift-Ctrl-K"]="deleteLine",r[t[o+"Enter"]="insertLineAfter"]=function(e){return l(e,!1)},r[t["Shift-"+o+"Enter"]="insertLineBefore"]=function(e){return l(e,!0)},r[t[o+"D"]="selectNextOccurrence"]=function(t){var r=t.getCursor("from"),i=t.getCursor("to"),o=t.state.sublimeFindFullWord==t.doc.sel
+if(0==e.cmpPos(r,i)){var a=u(t,r)
+if(!a.word)return
+t.setSelection(a.from,a.to),o=!0}else{var s=t.getRange(r,i),l=o?new RegExp("\\b"+s+"\\b"):s,c=t.getSearchCursor(l,i);(c.findNext()||(c=t.getSearchCursor(l,n(t.firstLine(),0))).findNext())&&t.addSelection(c.from(),c.to())}o&&(t.state.sublimeFindFullWord=t.doc.sel)}
+function c(e){var t=e.getCursor(),r=e.scanForBracket(t,-1)
+if(r)for(;;){var i=e.scanForBracket(t,1)
+if(!i)return
+if(i.ch=="(){}[]".charAt("(){}[]".indexOf(r.ch)+1))return e.setSelection(n(r.pos.line,r.pos.ch+1),i.pos,!1),!0
+t=n(i.pos.line,i.pos.ch+1)}}r[t["Shift-"+o+"Space"]="selectScope"]=function(e){c(e)||e.execCommand("selectAll")},r[t["Shift-"+o+"M"]="selectBetweenBrackets"]=function(t){if(!c(t))return e.Pass},r[t[o+"M"]="goToBracket"]=function(t){t.extendSelectionsBy((function(r){var i=t.scanForBracket(r.head,1)
+if(i&&0!=e.cmpPos(i.pos,r.head))return i.pos
+var o=t.scanForBracket(r.head,-1)
+return o&&n(o.pos.line,o.pos.ch+1)||r.head}))}
+var d=i?"Cmd-Ctrl-":"Shift-Ctrl-"
+function h(t,r){if(t.isReadOnly())return e.Pass
+for(var i,o=t.listSelections(),a=[],s=0;s<o.length;s++){var l=o[s]
+if(!l.empty()){for(var u=l.from().line,c=l.to().line;s<o.length-1&&o[s+1].from().line==c;)c=l[++s].to().line
+a.push(u,c)}}a.length?i=!0:a.push(t.firstLine(),t.lastLine()),t.operation((function(){for(var e=[],o=0;o<a.length;o+=2){var s=a[o],l=a[o+1],u=n(s,0),c=n(l),d=t.getRange(u,c,!1)
+r?d.sort():d.sort((function(e,t){var r=e.toUpperCase(),n=t.toUpperCase()
+return r!=n&&(e=r,t=n),e<t?-1:e==t?0:1})),t.replaceRange(d,u,c),i&&e.push({anchor:u,head:c})}i&&t.setSelections(e,0)}))}r[t[d+"Up"]="swapLineUp"]=function(t){if(t.isReadOnly())return e.Pass
+for(var r=t.listSelections(),i=[],o=t.firstLine()-1,a=[],s=0;s<r.length;s++){var l=r[s],u=l.from().line-1,c=l.to().line
+a.push({anchor:n(l.anchor.line-1,l.anchor.ch),head:n(l.head.line-1,l.head.ch)}),0!=l.to().ch||l.empty()||--c,u>o?i.push(u,c):i.length&&(i[i.length-1]=c),o=c}t.operation((function(){for(var e=0;e<i.length;e+=2){var r=i[e],o=i[e+1],s=t.getLine(r)
+t.replaceRange("",n(r,0),n(r+1,0),"+swapLine"),o>t.lastLine()?t.replaceRange("\n"+s,n(t.lastLine()),null,"+swapLine"):t.replaceRange(s+"\n",n(o,0),null,"+swapLine")}t.setSelections(a),t.scrollIntoView()}))},r[t[d+"Down"]="swapLineDown"]=function(t){if(t.isReadOnly())return e.Pass
+for(var r=t.listSelections(),i=[],o=t.lastLine()+1,a=r.length-1;a>=0;a--){var s=r[a],l=s.to().line+1,u=s.from().line
+0!=s.to().ch||s.empty()||l--,l<o?i.push(l,u):i.length&&(i[i.length-1]=u),o=u}t.operation((function(){for(var e=i.length-2;e>=0;e-=2){var r=i[e],o=i[e+1],a=t.getLine(r)
+r==t.lastLine()?t.replaceRange("",n(r-1),n(r),"+swapLine"):t.replaceRange("",n(r,0),n(r+1,0),"+swapLine"),t.replaceRange(a+"\n",n(o,0),null,"+swapLine")}t.scrollIntoView()}))},r[t[o+"/"]="toggleCommentIndented"]=function(e){e.toggleComment({indent:!0})},r[t[o+"J"]="joinLines"]=function(e){for(var t=e.listSelections(),r=[],i=0;i<t.length;i++){for(var o=t[i],a=o.from(),s=a.line,l=o.to().line;i<t.length-1&&t[i+1].from().line==l;)l=t[++i].to().line
+r.push({start:s,end:l,anchor:!o.empty()&&a})}e.operation((function(){for(var t=0,i=[],o=0;o<r.length;o++){for(var a,s=r[o],l=s.anchor&&n(s.anchor.line-t,s.anchor.ch),u=s.start;u<=s.end;u++){var c=u-t
+u==s.end&&(a=n(c,e.getLine(c).length+1)),c<e.lastLine()&&(e.replaceRange(" ",n(c),n(c+1,/^\s*/.exec(e.getLine(c+1))[0].length)),++t)}i.push({anchor:l||a,head:a})}e.setSelections(i,0)}))},r[t["Shift-"+o+"D"]="duplicateLine"]=function(e){e.operation((function(){for(var t=e.listSelections().length,r=0;r<t;r++){var i=e.listSelections()[r]
+i.empty()?e.replaceRange(e.getLine(i.head.line)+"\n",n(i.head.line,0)):e.replaceRange(e.getRange(i.from(),i.to()),i.from())}e.scrollIntoView()}))},t[o+"T"]="transposeChars",r[t.F9="sortLines"]=function(e){h(e,!0)},r[t[o+"F9"]="sortLinesInsensitive"]=function(e){h(e,!1)},r[t.F2="nextBookmark"]=function(e){var t=e.state.sublimeBookmarks
+if(t)for(;t.length;){var r=t.shift(),n=r.find()
+if(n)return t.push(r),e.setSelection(n.from,n.to)}},r[t["Shift-F2"]="prevBookmark"]=function(e){var t=e.state.sublimeBookmarks
+if(t)for(;t.length;){t.unshift(t.pop())
+var r=t[t.length-1].find()
+if(r)return e.setSelection(r.from,r.to)
+t.pop()}},r[t[o+"F2"]="toggleBookmark"]=function(e){for(var t=e.listSelections(),r=e.state.sublimeBookmarks||(e.state.sublimeBookmarks=[]),n=0;n<t.length;n++){for(var i=t[n].from(),o=t[n].to(),a=e.findMarks(i,o),s=0;s<a.length;s++)if(a[s].sublimeBookmark){a[s].clear()
+for(var l=0;l<r.length;l++)r[l]==a[s]&&r.splice(l--,1)
+break}s==a.length&&r.push(e.markText(i,o,{sublimeBookmark:!0,clearWhenEmpty:!1}))}},r[t["Shift-"+o+"F2"]="clearBookmarks"]=function(e){var t=e.state.sublimeBookmarks
+if(t)for(var r=0;r<t.length;r++)t[r].clear()
+t.length=0},r[t["Alt-F2"]="selectBookmarks"]=function(e){var t=e.state.sublimeBookmarks,r=[]
+if(t)for(var n=0;n<t.length;n++){var i=t[n].find()
+i?r.push({anchor:i.from,head:i.to}):t.splice(n--,0)}r.length&&e.setSelections(r,0)},t["Alt-Q"]="wrapLines"
+var f=o+"K "
+function p(t,r){t.operation((function(){for(var n=t.listSelections(),i=[],o=[],a=0;a<n.length;a++){(l=n[a]).empty()?(i.push(a),o.push("")):o.push(r(t.getRange(l.from(),l.to())))}t.replaceSelections(o,"around","case")
+var s
+for(a=i.length-1;a>=0;a--){var l=n[i[a]]
+if(!(s&&e.cmpPos(l.head,s)>0)){var c=u(t,l.head)
+s=c.from,t.replaceRange(r(c.word),c.from,c.to)}}}))}function m(t){var r=t.getCursor("from"),n=t.getCursor("to")
+if(0==e.cmpPos(r,n)){var i=u(t,r)
+if(!i.word)return
+r=i.from,n=i.to}return{from:r,to:n,query:t.getRange(r,n),word:i}}function v(e,t){var r=m(e)
+if(r){var i=r.query,o=e.getSearchCursor(i,t?r.to:r.from);(t?o.findNext():o.findPrevious())?e.setSelection(o.from(),o.to()):(o=e.getSearchCursor(i,t?n(e.firstLine(),0):e.clipPos(n(e.lastLine()))),(t?o.findNext():o.findPrevious())?e.setSelection(o.from(),o.to()):r.word&&e.setSelection(r.from,r.to))}}t[f+o+"Backspace"]="delLineLeft",r[t[f+o+"K"]="delLineRight"]=function(e){e.operation((function(){for(var t=e.listSelections(),r=t.length-1;r>=0;r--)e.replaceRange("",t[r].anchor,n(t[r].to().line),"+delete")
+e.scrollIntoView()}))},r[t[f+o+"U"]="upcaseAtCursor"]=function(e){p(e,(function(e){return e.toUpperCase()}))},r[t[f+o+"L"]="downcaseAtCursor"]=function(e){p(e,(function(e){return e.toLowerCase()}))},r[t[f+o+"Space"]="setSublimeMark"]=function(e){e.state.sublimeMark&&e.state.sublimeMark.clear(),e.state.sublimeMark=e.setBookmark(e.getCursor())},r[t[f+o+"A"]="selectToSublimeMark"]=function(e){var t=e.state.sublimeMark&&e.state.sublimeMark.find()
+t&&e.setSelection(e.getCursor(),t)},r[t[f+o+"W"]="deleteToSublimeMark"]=function(t){var r=t.state.sublimeMark&&t.state.sublimeMark.find()
+if(r){var n=t.getCursor(),i=r
+if(e.cmpPos(n,i)>0){var o=i
+i=n,n=o}t.state.sublimeKilled=t.getRange(n,i),t.replaceRange("",n,i)}},r[t[f+o+"X"]="swapWithSublimeMark"]=function(e){var t=e.state.sublimeMark&&e.state.sublimeMark.find()
+t&&(e.state.sublimeMark.clear(),e.state.sublimeMark=e.setBookmark(e.getCursor()),e.setCursor(t))},r[t[f+o+"Y"]="sublimeYank"]=function(e){null!=e.state.sublimeKilled&&e.replaceSelection(e.state.sublimeKilled,null,"paste")},t[f+o+"G"]="clearBookmarks",r[t[f+o+"C"]="showInCenter"]=function(e){var t=e.cursorCoords(null,"local")
+e.scrollTo(null,(t.top+t.bottom)/2-e.getScrollInfo().clientHeight/2)},r[t["Shift-Alt-Up"]="selectLinesUpward"]=function(e){e.operation((function(){for(var t=e.listSelections(),r=0;r<t.length;r++){var i=t[r]
+i.head.line>e.firstLine()&&e.addSelection(n(i.head.line-1,i.head.ch))}}))},r[t["Shift-Alt-Down"]="selectLinesDownward"]=function(e){e.operation((function(){for(var t=e.listSelections(),r=0;r<t.length;r++){var i=t[r]
+i.head.line<e.lastLine()&&e.addSelection(n(i.head.line+1,i.head.ch))}}))},r[t[o+"F3"]="findUnder"]=function(e){v(e,!0)},r[t["Shift-"+o+"F3"]="findUnderPrevious"]=function(e){v(e,!1)},r[t["Alt-F3"]="findAllUnder"]=function(e){var t=m(e)
+if(t){for(var r=e.getSearchCursor(t.query),n=[],i=-1;r.findNext();)n.push({anchor:r.from(),head:r.to()}),r.from().line<=t.from.line&&r.from().ch<=t.from.ch&&i++
+e.setSelections(n,i)}},t["Shift-"+o+"["]="fold",t["Shift-"+o+"]"]="unfold",t[f+o+"0"]=t[f+o+"j"]="unfoldAll",t[o+"I"]="findIncremental",t["Shift-"+o+"I"]="findIncrementalReverse",t[o+"H"]="replace",t.F3="findNext",t["Shift-F3"]="findPrev",e.normalizeKeyMap(t)})),define("codemirror",[],(function(){"use strict"
+return{default:CodeMirror}})),define("@ember-data/adapter/-private",["exports","require","ember-inflector"],(function(e,t,r){"use strict"
+var n="default"in t?t.default:t,i=/\r?\n/
+var o=/\[\]$/
+function a(e,t,r){void 0!==r&&(null===r&&(r=""),r="function"==typeof r?r():r,e[e.length]=`${encodeURIComponent(t)}=${encodeURIComponent(r)}`)}var s=null
+var l=Ember.Mixin.create({buildURL(e,t,r,n,i){switch(n){case"findRecord":return this.urlForFindRecord(t,e,r)
+case"findAll":return this.urlForFindAll(e,r)
+case"query":return this.urlForQuery(i,e)
+case"queryRecord":return this.urlForQueryRecord(i,e)
+case"findMany":return this.urlForFindMany(t,e,r)
+case"findHasMany":return this.urlForFindHasMany(t,e,r)
+case"findBelongsTo":return this.urlForFindBelongsTo(t,e,r)
+case"createRecord":return this.urlForCreateRecord(e,r)
+case"updateRecord":return this.urlForUpdateRecord(t,e,r)
+case"deleteRecord":return this.urlForDeleteRecord(t,e,r)
+default:return this._buildURL(e,t)}},_buildURL(e,t){var r,n=[],i=Ember.get(this,"host"),o=this.urlPrefix()
+return e&&(r=this.pathForType(e))&&n.push(r),t&&n.push(encodeURIComponent(t)),o&&n.unshift(o),n=n.join("/"),!i&&n&&"/"!==n.charAt(0)&&(n="/"+n),n},urlForFindRecord(e,t,r){return this._buildURL(t,e)},urlForFindAll(e,t){return this._buildURL(e)},urlForQuery(e,t){return this._buildURL(t)},urlForQueryRecord(e,t){return this._buildURL(t)},urlForFindMany(e,t,r){return this._buildURL(t)},urlForFindHasMany(e,t,r){return this._buildURL(t,e)},urlForFindBelongsTo(e,t,r){return this._buildURL(t,e)},urlForCreateRecord(e,t){return this._buildURL(e)},urlForUpdateRecord(e,t,r){return this._buildURL(t,e)},urlForDeleteRecord(e,t,r){return this._buildURL(t,e)},urlPrefix(e,t){var r=Ember.get(this,"host"),n=Ember.get(this,"namespace")
+if(r&&"/"!==r||(r=""),e)return/^\/\//.test(e)||/http(s)?:\/\//.test(e)?e:"/"===e.charAt(0)?`${r}${e}`:`${t}/${e}`
+var i=[]
+return r&&i.push(r),n&&i.push(n),i.join("/")},pathForType(e){var t=Ember.String.camelize(e)
+return r.pluralize(t)}})
+e.BuildURLMixin=l,e.determineBodyPromise=function(e,t){return(r=e.text(),Ember.RSVP.resolve(r).catch(e=>e)).then(r=>function(e,t,r){var n,i=r
+if(!e.ok)return r
+var o=e.status,a=""===r||null===r,s=204===o||205===o||"HEAD"===t.method
+if(!e.ok||!s&&!a){try{i=JSON.parse(r)}catch(l){if(!(l instanceof SyntaxError))return l
+l.payload=r,n=l}return n||i}}(e,t,r))
+var r},e.fetch=function(){if(null!==s)return s()
+if(t.has("fetch")){var e=n("fetch").default
+s=()=>e}else{if("function"!=typeof fetch)throw new Error("cannot find the `fetch` module or the `fetch` global. Did you mean to install the `ember-fetch` addon?")
+s=()=>fetch}return s()},e.parseResponseHeaders=function(e){var t=Object.create(null)
+if(!e)return t
+for(var r=e.split(i),n=0;n<r.length;n++){for(var o=r[n],a=0,s=!1;a<o.length;a++)if(58===o.charCodeAt(a)){s=!0
+break}if(!1!==s){var l=o.substring(0,a).trim(),u=o.substring(a+1,o.length).trim()
+if(u)t[l.toLowerCase()]=u,t[l]=u}}return t},e.serializeIntoHash=function(e,t,r,n={includeId:!0}){var i=e.serializerFor(t.modelName)
+if("function"==typeof i.serializeIntoHash){var o={}
+return i.serializeIntoHash(o,t,r,n),o}return i.serialize(r,n)},e.serializeQueryParams=function(e){var t=[]
+return function e(r,n){var i,s,l
+if(r)if(Array.isArray(n))for(i=0,s=n.length;i<s;i++)o.test(r)?a(t,r,n[i]):e(r+"["+("object"==typeof n[i]?i:"")+"]",n[i])
+else if(function(e){return"[object Object]"===Object.prototype.toString.call(e)}(n))for(l in n)e(r+"["+l+"]",n[l])
+else a(t,r,n)
+else if(Array.isArray(n))for(i=0,s=n.length;i<s;i++)a(t,n[i].name,n[i].value)
+else for(l in n)e(l,n[l])
+return t}("",e).join("&").replace(/%20/g,"+")},Object.defineProperty(e,"__esModule",{value:!0})})),define("@ember-data/adapter/error",["exports","@ember-data/store/-private"],(function(e,t){"use strict"
+function r(e,t="Adapter operation failed"){this.isAdapterError=!0
+var r=Ember.Error.call(this,t)
+r&&(this.stack=r.stack,this.description=r.description,this.fileName=r.fileName,this.lineNumber=r.lineNumber,this.message=r.message,this.name=r.name,this.number=r.number),this.errors=e||[{title:"Adapter Error",detail:t}]}Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"errorsHashToArray",{enumerable:!0,get:function(){return t.errorsHashToArray}}),Object.defineProperty(e,"errorsArrayToHash",{enumerable:!0,get:function(){return t.errorsArrayToHash}}),e.ServerError=e.ConflictError=e.NotFoundError=e.ForbiddenError=e.UnauthorizedError=e.AbortError=e.TimeoutError=e.InvalidError=e.default=void 0
+var n=r
+function i(e){return function({message:t}={}){return o(e,t)}}function o(e,t){var r=function(r,n){e.call(this,r,n||t)}
+return r.prototype=Object.create(e.prototype),r.extend=i(r),r}e.default=n,r.prototype=Object.create(Ember.Error.prototype),r.prototype.code="AdapterError",r.extend=i(r)
+var a=o(r,"The adapter rejected the commit because it was invalid")
+e.InvalidError=a,a.prototype.code="InvalidError"
+var s=o(r,"The adapter operation timed out")
+e.TimeoutError=s,s.prototype.code="TimeoutError"
+var l=o(r,"The adapter operation was aborted")
+e.AbortError=l,l.prototype.code="AbortError"
+var u=o(r,"The adapter operation is unauthorized")
+e.UnauthorizedError=u,u.prototype.code="UnauthorizedError"
+var c=o(r,"The adapter operation is forbidden")
+e.ForbiddenError=c,c.prototype.code="ForbiddenError"
+var d=o(r,"The adapter could not find the resource")
+e.NotFoundError=d,d.prototype.code="NotFoundError"
+var h=o(r,"The adapter operation failed due to a conflict")
+e.ConflictError=h,h.prototype.code="ConflictError"
+var f=o(r,"The adapter operation failed due to a server error")
+e.ServerError=f,f.prototype.code="ServerError"})),define("@ember-data/adapter/index",["exports","@ember-data/adapter/-private"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"BuildURLMixin",{enumerable:!0,get:function(){return t.BuildURLMixin}}),e.default=void 0
+var r=Ember.Object.extend({defaultSerializer:"-default",findRecord:null,findAll:null,query:null,queryRecord:null,generateIdForRecord:null,serialize:(e,t)=>e.serialize(t),createRecord:null,updateRecord:null,deleteRecord:null,coalesceFindRequests:!0,findMany:null,groupRecordsForFindMany:(e,t)=>[t],shouldReloadRecord:()=>!1,shouldReloadAll:(e,t)=>!t.length,shouldBackgroundReloadRecord:()=>!0,shouldBackgroundReloadAll:()=>!0})
+e.default=r})),define("@ember-data/adapter/json-api",["exports","ember-inflector","@ember-data/adapter/-private","@ember-data/adapter/rest"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var i=n.default.extend({defaultSerializer:"-json-api",_defaultContentType:"application/vnd.api+json",ajaxOptions(e,t,r={}){var n=this._super(e,t,r)
+return n.headers.Accept=n.headers.Accept||"application/vnd.api+json",n},coalesceFindRequests:!1,findMany(e,t,r,n){var i=this.buildURL(t.modelName,r,n,"findMany")
+return this.ajax(i,"GET",{data:{filter:{id:r.join(",")}}})},pathForType(e){var r=Ember.String.dasherize(e)
+return(0,t.pluralize)(r)},updateRecord(e,t,n){var i=(0,r.serializeIntoHash)(e,t,n),o=this.buildURL(t.modelName,n.id,n,"updateRecord")
+return this.ajax(o,"PATCH",{data:i})}})
+e.default=i})),define("@ember-data/adapter/rest",["exports","@ember-data/adapter","@ember-data/adapter/error","@ember-data/adapter/-private"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.fetchOptions=d,e.default=void 0
+var i="undefined"!=typeof jQuery,o="undefined"!=typeof najax
+function a(e,t,r,n){var i
+try{i=e.handleResponse(n.status,n.headers,t,r)}catch(o){return Ember.RSVP.Promise.reject(o)}return i&&i.isAdapterError?Ember.RSVP.Promise.reject(i):i}function s(e,t,n,i){var o
+if(i.errorThrown instanceof Error&&""!==t)o=i.errorThrown
+else if("timeout"===i.textStatus)o=new r.TimeoutError
+else if("abort"===i.textStatus||0===i.status)o=function(e,t){var{method:n,url:i,errorThrown:o}=e,{status:a}=t,s=[{title:"Adapter Error",detail:`Request failed: ${n} ${i} ${o||""}`.trim(),status:a}]
+return new r.AbortError(s)}(n,i)
+else try{o=e.handleResponse(i.status,i.headers,t||i.errorThrown,n)}catch(a){o=a}return o}function l(e){return{status:e.status,textStatus:e.textStatus,headers:c(e.headers)}}function u(e){return{status:e.status,textStatus:e.statusText,headers:(0,n.parseResponseHeaders)(e.getAllResponseHeaders())}}function c(e){var t={}
+return e&&e.forEach((e,r)=>t[r]=e),t}function d(e){if(e.credentials="same-origin",e.data)if("GET"===e.method||"HEAD"===e.method){if(Object.keys(e.data).length){var t=e.url.indexOf("?")>-1?"&":"?"
+e.url+=`${t}${(0,n.serializeQueryParams)(e.data)}`}}else"[object Object]"===Object.prototype.toString.call(e.data)?e.body=JSON.stringify(e.data):e.body=e.data
+return e}var h=t.default.extend(t.BuildURLMixin,{defaultSerializer:"-rest",_defaultContentType:"application/json; charset=utf-8",fastboot:Ember.computed({get(){return this._fastboot?this._fastboot:this._fastboot=Ember.getOwner(this).lookup("service:fastboot")},set(e,t){return this._fastboot=t}}),useFetch:Ember.computed((function(){var e=Ember.getOwner(this).resolveRegistration("config:environment")
+return!!(e&&e.EmberENV&&!1===e.EmberENV._JQUERY_INTEGRATION)||!o&&!i})),sortQueryParams(e){var t=Object.keys(e),r=t.length
+if(r<2)return e
+for(var n={},i=t.sort(),o=0;o<r;o++)n[i[o]]=e[i[o]]
+return n},coalesceFindRequests:!1,findRecord(e,t,r,n){var i=this.buildURL(t.modelName,r,n,"findRecord"),o=this.buildQuery(n)
+return this.ajax(i,"GET",{data:o})},findAll(e,t,r,n){var i=this.buildQuery(n),o=this.buildURL(t.modelName,null,n,"findAll")
+return r&&(i.since=r),this.ajax(o,"GET",{data:i})},query(e,t,r){var n=this.buildURL(t.modelName,null,null,"query",r)
+return this.sortQueryParams&&(r=this.sortQueryParams(r)),this.ajax(n,"GET",{data:r})},queryRecord(e,t,r){var n=this.buildURL(t.modelName,null,null,"queryRecord",r)
+return this.sortQueryParams&&(r=this.sortQueryParams(r)),this.ajax(n,"GET",{data:r})},findMany(e,t,r,n){var i=this.buildURL(t.modelName,r,n,"findMany")
+return this.ajax(i,"GET",{data:{ids:r}})},findHasMany(e,t,r,n){var i=t.id,o=t.modelName
+return r=this.urlPrefix(r,this.buildURL(o,i,t,"findHasMany")),this.ajax(r,"GET")},findBelongsTo(e,t,r,n){var i=t.id,o=t.modelName
+return r=this.urlPrefix(r,this.buildURL(o,i,t,"findBelongsTo")),this.ajax(r,"GET")},createRecord(e,t,r){var i=this.buildURL(t.modelName,null,r,"createRecord"),o=(0,n.serializeIntoHash)(e,t,r)
+return this.ajax(i,"POST",{data:o})},updateRecord(e,t,r){var i=(0,n.serializeIntoHash)(e,t,r,{}),o=r.id,a=this.buildURL(t.modelName,o,r,"updateRecord")
+return this.ajax(a,"PUT",{data:i})},deleteRecord(e,t,r){var n=r.id
+return this.ajax(this.buildURL(t.modelName,n,r,"deleteRecord"),"DELETE")},_stripIDFromURL(e,t){var r,n,i=this.buildURL(t.modelName,t.id,t).split("/"),o=i[i.length-1],a=t.id
+return decodeURIComponent(o)===a?i[i.length-1]="":(r=o,n="?id="+a,("function"!=typeof String.prototype.endsWith?-1!==r.indexOf(n,r.length-n.length):r.endsWith(n))&&(i[i.length-1]=o.substring(0,o.length-a.length-1))),i.join("/")},maxURLLength:2048,groupRecordsForFindMany(e,t){var r=new Map,n=this,i=this.maxURLLength
+t.forEach(t=>{var i=n._stripIDFromURL(e,t)
+r.has(i)||r.set(i,[]),r.get(i).push(t)})
+var o=[]
+return r.forEach(t=>{(function(t,r,i){var o=0,a=n._stripIDFromURL(e,t[0]),s=[[]]
+return t.forEach(e=>{var t=encodeURIComponent(e.id).length+i
+a.length+o+t>=r&&(o=0,s.push([])),o+=t
+var n=s.length-1
+s[n].push(e)}),s})(t,i,"&ids%5B%5D=".length).forEach(e=>o.push(e))}),o},handleResponse(e,t,n,i){if(this.isSuccess(e,t,n))return n
+if(this.isInvalid(e,t,n))return new r.InvalidError(n.errors)
+var o=this.normalizeErrorResponse(e,t,n),a=this.generatedDetailedMessage(e,t,n,i)
+switch(e){case 401:return new r.UnauthorizedError(o,a)
+case 403:return new r.ForbiddenError(o,a)
+case 404:return new r.NotFoundError(o,a)
+case 409:return new r.ConflictError(o,a)
+default:if(e>=500)return new r.ServerError(o,a)}return new r.default(o,a)},isSuccess:e=>e>=200&&e<300||304===e,isInvalid:e=>422===e,ajax(e,t,r){var i,o=this,c=Ember.get(this,"useFetch"),d={url:e,method:t},h=o.ajaxOptions(e,t,r)
+return c?this._fetchRequest(h).then(e=>(i=e,(0,n.determineBodyPromise)(e,d))).then(e=>{if(!i.ok||e instanceof Error)throw function(e,t,r,n,i){var o=l(r)
+200===o.status&&t instanceof Error?(o.errorThrown=t,t=o.errorThrown.payload):(o.errorThrown=n,t=e.parseErrorResponse(t))
+return s(e,t,i,o)}(o,e,i,null,d)
+return function(e,t,r,n){var i=l(r)
+return a(e,t,n,i)}(o,e,i,d)}):new Ember.RSVP.Promise((function(e,t){h.success=function(t,r,n){var i=function(e,t,r,n){var i=u(r)
+return a(e,t,n,i)}(o,t,n,d)
+Ember.run.join(null,e,i)},h.error=function(e,r,n){var i=function(e,t,r,n){var i=u(t)
+i.errorThrown=r
+var o=e.parseErrorResponse(t.responseText)
+return s(e,o,n,i)}(o,e,n,d)
+Ember.run.join(null,t,i)},o._ajax(h)}),"DS: RESTAdapter#ajax "+t+" to "+e)},_ajaxRequest(e){jQuery.ajax(e)},_najaxRequest(e){if(!o)throw new Error("najax does not seem to be defined in your app. Did you override it via `addOrOverrideSandboxGlobals` in the fastboot server?")
+najax(e)},_fetchRequest(e){var t=(0,n.fetch)()
+if(t)return t(e.url,e)
+throw new Error("cannot find the `fetch` module or the `fetch` global. Did you mean to install the `ember-fetch` addon?")},_ajax(e){Ember.get(this,"useFetch")?this._fetchRequest(e):Ember.get(this,"fastboot.isFastBoot")?this._najaxRequest(e):this._ajaxRequest(e)},ajaxOptions(e,t,r){r=Ember.assign({url:e,method:t,type:t},r)
+var n=Ember.get(this,"headers")
+void 0!==n?r.headers=Ember.assign({},n,r.headers):r.headers||(r.headers={})
+var i=r.contentType||this._defaultContentType
+return Ember.get(this,"useFetch")?(r.data&&"GET"!==r.type&&(r.headers["Content-Type"]||r.headers["content-type"]||(r.headers["content-type"]=i)),r=d(r,this)):(r.data&&"GET"!==r.type&&(r=Ember.assign(r,{contentType:i})),r=function(e,t){e.dataType="json",e.context=t,e.data&&"GET"!==e.type&&(e.data=JSON.stringify(e.data))
+return e.beforeSend=function(t){Object.keys(e.headers).forEach(r=>t.setRequestHeader(r,e.headers[r]))},e}(r,this)),r.url=this._ajaxURL(r.url),r},_ajaxURL(e){if(Ember.get(this,"fastboot.isFastBoot")){var t=Ember.get(this,"fastboot.request.protocol"),r=Ember.get(this,"fastboot.request.host")
+if(/^\/\//.test(e))return`${t}${e}`
+if(!/^https?:\/\//.test(e))try{return`${t}//${r}${e}`}catch(n){throw new Error("You are using Ember Data with no host defined in your adapter. This will attempt to use the host of the FastBoot request, which is not configured for the current host of this request. Please set the hostWhitelist property for in your environment.js. FastBoot Error: "+n.message)}}return e},parseErrorResponse(e){var t=e
+try{t=JSON.parse(e)}catch(r){}return t},normalizeErrorResponse:(e,t,r)=>r&&"object"==typeof r&&r.errors?r.errors:[{status:""+e,title:"The backend responded with an error",detail:""+r}],generatedDetailedMessage:function(e,t,r,n){var i,o=t["content-type"]||"Empty Content-Type"
+return i="text/html"===o&&r.length>250?"[Omitted Lengthy HTML]":r,["Ember Data Request "+(n.method+" "+n.url)+" returned a "+e,"Payload ("+o+")",i].join("\n")},buildQuery(e){var t={}
+if(e){var{include:r}=e
+r&&(t.include=r)}return t}})
+e.default=h})),define("@ember-data/debug/index",["exports","@ember-data/debug/setup"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=Ember.DataAdapter.extend({store:Ember.inject.service("store"),getFilters:()=>[{name:"isNew",desc:"New"},{name:"isModified",desc:"Modified"},{name:"isClean",desc:"Clean"}],_nameToClass(e){return Ember.get(this,"store").modelFor(e)},watchModelTypes(e,r){var n=Ember.get(this,"store"),i=n._createRecordData,o=[],a=(0,t.typesMapFor)(n)
+a.forEach((t,i)=>{this.watchTypeIfUnseen(n,a,i,e,r,o)}),n._createRecordData=t=>(this.watchTypeIfUnseen(n,a,t.type,e,r,o),i.call(n,t))
+var s=()=>{o.forEach(e=>e()),n._createRecordData=i,a.forEach((e,t)=>{a.set(t,!1)}),this.releaseMethods.removeObject(s)}
+return this.releaseMethods.pushObject(s),s},watchTypeIfUnseen(e,t,r,n,i,o){if(!0!==t.get(r)){var a=e.modelFor(r),s=this.wrapModelType(a,r)
+o.push(this.observeModelType(r,i)),n([s]),t.set(r,!0)}},columnNameToDesc:e=>Ember.String.capitalize(Ember.String.underscore(e).replace(/_/g," ").trim()),columnsForType(e){var t=[{name:"id",desc:"Id"}],r=0,n=this
+return Ember.get(e,"attributes").forEach((e,i)=>{if(r++>n.attributeLimit)return!1
+var o=this.columnNameToDesc(i)
+t.push({name:i,desc:o})}),t},getRecords(e,t){if(arguments.length<2){var r=e._debugContainerKey
+if(r){var n=r.match(/model:(.*)/)
+null!==n&&(t=n[1])}}return this.get("store").peekAll(t)},getRecordColumnValues(e){var t=0,r={id:Ember.get(e,"id")}
+return e.eachAttribute(n=>{if(t++>this.attributeLimit)return!1
+r[n]=Ember.get(e,n)}),r},getRecordKeywords(e){var t=[],r=Ember.A(["id"])
+return e.eachAttribute(e=>r.push(e)),r.forEach(r=>t.push(Ember.get(e,r))),t},getRecordFilterValues:e=>({isNew:e.get("isNew"),isModified:e.get("hasDirtyAttributes")&&!e.get("isNew"),isClean:!e.get("hasDirtyAttributes")}),getRecordColor(e){var t="black"
+return e.get("isNew")?t="green":e.get("hasDirtyAttributes")&&(t="blue"),t},observeRecord(e,t){var r=Ember.A(),n=Ember.A(["id","isNew","hasDirtyAttributes"])
+e.eachAttribute(e=>n.push(e))
+var i=this
+n.forEach((function(n){var o=function(){t(i.wrapRecord(e))}
+Ember.addObserver(e,n,o),r.push((function(){Ember.removeObserver(e,n,o)}))}))
+return function(){r.forEach(e=>e())}}})
+e.default=r})),define("@ember-data/debug/setup",["exports","@ember-data/store"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.typesMapFor=n,e.default=void 0
+var r=new WeakMap
+function n(e){var t=r.get(e)
+return void 0===t&&(t=new Map,r.set(e,t)),t}var i=t.default.prototype._createRecordData
+t.default.prototype._createRecordData=function(e){var t=n(this)
+return t.has(e.type)||t.set(e.type,!1),i.call(this,e)}
+var o={name:"@ember-data/data-adapter",initialize(){}}
+e.default=o})),define("@ember-data/model/-private",["exports","@ember-data/store/-private","@ember-data/store"],(function(e,t,r){"use strict"
+function n(e){return(...t)=>function(e){var[t,r,n]=e
+return 3===e.length&&("function"==typeof t||"object"==typeof t&&null!==t)&&"string"==typeof r&&("object"==typeof n&&null!==n&&"enumerable"in n&&"configurable"in n||void 0===n)}(t)?e()(...t):e(...t)}var i=n((function(e,r){"object"==typeof e?(r=e,e=void 0):r=r||{}
+var n={type:e,isAttribute:!0,kind:"attribute",options:r}
+return Ember.computed({get(e){var n=this._internalModel
+return function(e,r){return t.recordDataFor(e).hasAttr(r)}(n,e)?n.getAttributeValue(e):function(e,t,r){if("function"==typeof t.defaultValue)return t.defaultValue.apply(null,arguments)
+var n=t.defaultValue
+return n}(this,r,e)},set(e,t){return this._internalModel.setDirtyAttribute(e,t)}}).meta(n)}))
+var o=n((function(e,t){var n,i
+"object"==typeof e?(n=e,i=void 0):(n=t,i=e),"string"==typeof i&&(i=r.normalizeModelName(i))
+var o={type:i,isRelationship:!0,options:n=n||{},kind:"belongsTo",name:"Belongs To",key:null}
+return Ember.computed({get(e){return this._internalModel.getBelongsTo(e)},set(e,t){return this._internalModel.setDirtyBelongsTo(e,t),this._internalModel.getBelongsTo(e)}}).meta(o)}))
+var a=n((function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{},"string"==typeof e&&(e=r.normalizeModelName(e))
+var n={type:e,options:t,isRelationship:!0,kind:"hasMany",name:"Has Many",key:null}
+return Ember.computed({get(e){return this._internalModel.getHasMany(e)},set(e,t){var r=this._internalModel
+return r.setDirtyHasMany(e,t),r.getHasMany(e)}}).meta(n)})),s=Ember.ArrayProxy.extend(t.DeprecatedEvented,{_registerHandlers(e,t){this._registeredHandlers={becameInvalid:e,becameValid:t}},errorsByAttributeName:Ember.computed((function(){return new Map})),errorsFor(e){var t=Ember.get(this,"errorsByAttributeName"),r=t.get(e)
+return void 0===r&&(r=Ember.A(),t.set(e,r)),Ember.get(r,"[]"),r},messages:Ember.computed.mapBy("content","message"),content:Ember.computed((function(){return Ember.A()})),unknownProperty(e){var t=this.errorsFor(e)
+if(0!==t.length)return t},isEmpty:Ember.computed.not("length").readOnly(),add(e,t){var r=Ember.get(this,"isEmpty")
+this._add(e,t),r&&!Ember.get(this,"isEmpty")&&this._registeredHandlers&&this._registeredHandlers.becameInvalid()},_add(e,t){t=this._findOrCreateMessages(e,t),this.addObjects(t),this.errorsFor(e).addObjects(t),this.notifyPropertyChange(e)},_findOrCreateMessages(e,t){for(var r=this.errorsFor(e),n=Ember.makeArray(t),i=new Array(n.length),o=0;o<n.length;o++){var a=n[o],s=r.findBy("message",a)
+i[o]=s||{attribute:e,message:a}}return i},remove(e){Ember.get(this,"isEmpty")||(this._remove(e),Ember.get(this,"isEmpty")&&this._registeredHandlers&&this._registeredHandlers.becameValid())},_remove(e){if(!Ember.get(this,"isEmpty")){var t=this.rejectBy("attribute",e)
+Ember.get(this,"content").setObjects(t)
+for(var r=this.errorsFor(e),n=0;n<r.length;n++)r[n].attribute===e&&r.replace(n,1)
+Ember.get(this,"errorsByAttributeName").delete(e),this.notifyPropertyChange(e),this.notifyPropertyChange("length")}},clear(){Ember.get(this,"isEmpty")||(this._clear(),this._registeredHandlers&&this._registeredHandlers.becameValid())},_clear(){if(!Ember.get(this,"isEmpty")){var e=Ember.get(this,"errorsByAttributeName"),t=[]
+e.forEach((function(e,r){t.push(r)})),e.clear(),t.forEach(e=>{this.notifyPropertyChange(e)}),Ember.ArrayProxy.prototype.clear.call(this)}},has(e){return this.errorsFor(e).length>0}}),l=Ember.computed((function(){var e=new Map
+return Ember.get(this,"relationshipsByName").forEach(t=>{var{type:r}=t
+e.has(r)||e.set(r,[]),e.get(r).push(t)}),e})).readOnly(),u=Ember.computed((function(){this.modelName
+var e=Ember.A()
+return this.eachComputedProperty((r,n)=>{if(n.isRelationship){n.key=r
+var i=t.typeForRelationshipMeta(n)
+e.includes(i)||e.push(i)}}),e})).readOnly(),c=Ember.computed((function(){var e=Object.create(null),r=this.modelName
+return this.eachComputedProperty((n,i)=>{i.isRelationship&&(i.key=n,i.name=n,i.parentModelName=r,e[n]=t.relationshipFromMeta(i))}),e})),d=Ember.computed((function(){for(var e=new Map,t=Ember.get(this,"relationshipsObject"),r=Object.keys(t),n=0;n<r.length;n++){var i=t[r[n]]
+e.set(i.key,i)}return e})).readOnly(),{changeProperties:h}=Ember
+var f,p,m=Ember.computed("currentState",(function(e){return Ember.get(this._internalModel.currentState,e)})).readOnly(),v=(Ember.computed("errors.length",(function(){return!(this.get("errors.length")>0)})).readOnly(),m)
+f=m,p=m
+var g=Ember.Object.extend(t.DeprecatedEvented,{init(){this._super(...arguments)},_notifyNetworkChanges:function(){["isValid"].forEach(e=>this.notifyPropertyChange(e))},isEmpty:m,isLoading:m,isLoaded:m,hasDirtyAttributes:Ember.computed("currentState.isDirty",(function(){return this.get("currentState.isDirty")})),isSaving:m,isDeleted:f,isNew:p,isValid:v,_markInvalidRequestAsClean(){},dirtyType:m,isError:!1,_markErrorRequestAsClean(){this._errorRequests=[],this._lastError=null,this._notifyNetworkChanges()},isReloading:!1,currentState:t.RootState.empty,_internalModel:null,store:null,errors:Ember.computed((function(){var e=s.create()
+return e._registerHandlers(()=>{this.send("becameInvalid")},()=>{this.send("becameValid")}),e})).readOnly(),invalidErrorsChanged(e){},_addErrorMessageToAttribute(e,t){this.get("errors")._add(e,t)},_clearErrorMessages(){this.get("errors")._clear()},adapterError:null,serialize(e){return this._internalModel.createSnapshot().serialize(e)},ready:null,didLoad:null,didUpdate:null,didCreate:null,didDelete:null,becameInvalid:null,becameError:null,rolledBack:null,send(e,t){return this._internalModel.send(e,t)},transitionTo(e){return this._internalModel.transitionTo(e)},deleteRecord(){this._internalModel.deleteRecord()},destroyRecord(e){return this.deleteRecord(),this.save(e)},unloadRecord(){this.isDestroyed||this._internalModel.unloadRecord()},_notifyProperties(e){h(()=>{for(var t,r=0,n=e.length;r<n;r++)t=e[r],this.notifyPropertyChange(t)})},changedAttributes(){return this._internalModel.changedAttributes()},rollbackAttributes(){this._internalModel.rollbackAttributes()},_createSnapshot(){return this._internalModel.createSnapshot()},toStringExtension(){return this._internalModel&&this._internalModel.id},save(e){return t.PromiseObject.create({promise:this._internalModel.save(e).then(()=>this)})},reload(e){var r
+return"object"==typeof e&&null!==e&&e.adapterOptions&&(r={adapterOptions:e.adapterOptions}),t.PromiseObject.create({promise:this._internalModel.reload(r).then(()=>this)})},attr(){},belongsTo(e){return this._internalModel.referenceFor("belongsTo",e)},hasMany(e){return this._internalModel.referenceFor("hasMany",e)},_debugInfo(){var e=["id"],t={},r=[]
+this.eachAttribute(t=>e.push(t))
+var n=[{name:"Attributes",properties:e,expand:!0}]
+return this.eachRelationship((e,i)=>{var o=t[i.kind]
+void 0===o&&(o=t[i.kind]=[],n.push({name:i.kind,properties:o,expand:!0})),o.push(e),r.push(e)}),n.push({name:"Flags",properties:["isLoaded","hasDirtyAttributes","isSaving","isDeleted","isError","isNew","isValid"]}),{propertyInfo:{includeOtherProperties:!0,groups:n,expensiveProperties:r}}},notifyBelongsToChange(e){this.notifyPropertyChange(e)},eachRelationship(e,t){this.constructor.eachRelationship(e,t)},relationshipFor(e){return Ember.get(this.constructor,"relationshipsByName").get(e)},inverseFor(e){return this.constructor.inverseFor(e,this._internalModel.store)},notifyHasManyAdded(e){this.notifyPropertyChange(e)},eachAttribute(e,t){this.constructor.eachAttribute(e,t)}})
+g.reopen({trigger(e){var t=this[e]
+if("function"==typeof t){for(var r=arguments.length,n=new Array(r-1),i=1;i<r;i++)n[i-1]=arguments[i]
+t.apply(this,n)}this.has(e)&&this._super(...arguments)}}),Object.defineProperty(g.prototype,"data",{configurable:!1,get(){return t.recordDataFor(this)._data}}),g.reopen({toJSON(e){var t=this._internalModel.store.serializerFor("-default"),r=this._internalModel.createSnapshot()
+return t.serialize(r,e)}})
+var b={configurable:!1,set(e){var r=t.coerceId(e)
+null!==r&&this._internalModel.setId(r)},get(){return Ember.get(this._internalModel,"_tag"),this._internalModel.id}}
+Object.defineProperty(g.prototype,"id",b),g.reopenClass({isModel:!0,modelName:null,typeForRelationship(e,t){var r=Ember.get(this,"relationshipsByName").get(e)
+return r&&t.modelFor(r.type)},inverseMap:Ember.computed((function(){return Object.create(null)})),inverseFor(e,t){var r=Ember.get(this,"inverseMap")
+if(r[e])return r[e]
+var n=this._findInverseFor(e,t)
+return r[e]=n,n},_findInverseFor(e,t){var r=this.typeForRelationship(e,t)
+if(!r)return null
+var n,i,o,a,s=this.metaForProperty(e),l=s.options
+if(null===l.inverse)return null
+if(l.inverse)n=l.inverse,i=(o=Ember.get(r,"relationshipsByName").get(n)).kind,a=o.options
+else{s.type,s.parentModelName
+var u=function e(t,r,n,i){var o=i||[],a=Ember.get(r,"relationships")
+if(!a)return o
+var s=a.get(t.modelName),l=Array.isArray(s)?s.filter(e=>{var t=r.metaForProperty(e.name).options
+return!t.inverse&&null!==t.inverse||n===t.inverse}):null
+return l&&o.push.apply(o,l),t.superclass&&e(t.superclass,r,n,o),o}(this,r,e)
+if(0===u.length)return null
+var c=u.filter(t=>{var n=r.metaForProperty(t.name).options
+return e===n.inverse})
+1===c.length&&(u=c),n=u[0].name,i=u[0].kind,a=u[0].options}return{type:r,name:n,kind:i,options:a}},relationships:l,relationshipNames:Ember.computed((function(){var e={hasMany:[],belongsTo:[]}
+return this.eachComputedProperty((t,r)=>{r.isRelationship&&e[r.kind].push(t)}),e})),relatedTypes:u,relationshipsByName:d,relationshipsObject:c,fields:Ember.computed((function(){var e=new Map
+return this.eachComputedProperty((t,r)=>{r.isRelationship?e.set(t,r.kind):r.isAttribute&&e.set(t,"attribute")}),e})).readOnly(),eachRelationship(e,t){Ember.get(this,"relationshipsByName").forEach((r,n)=>{e.call(t,n,r)})},eachRelatedType(e,t){for(var r=Ember.get(this,"relatedTypes"),n=0;n<r.length;n++){var i=r[n]
+e.call(t,i)}},determineRelationshipType(e,t){var r=e.key,n=e.kind,i=this.inverseFor(r,t)
+return i?"belongsTo"===i.kind?"belongsTo"===n?"oneToOne":"manyToOne":"belongsTo"===n?"oneToMany":"manyToMany":"belongsTo"===n?"oneToNone":"manyToNone"},attributes:Ember.computed((function(){var e=new Map
+return this.eachComputedProperty((t,r)=>{r.isAttribute&&(r.name=t,e.set(t,r))}),e})).readOnly(),transformedAttributes:Ember.computed((function(){var e=new Map
+return this.eachAttribute((t,r)=>{r.type&&e.set(t,r.type)}),e})).readOnly(),eachAttribute(e,t){Ember.get(this,"attributes").forEach((r,n)=>{e.call(t,n,r)})},eachTransformedAttribute(e,t){Ember.get(this,"transformedAttributes").forEach((r,n)=>{e.call(t,n,r)})},toString(){return"model:"+Ember.get(this,"modelName")}})
+var y=Ember.Object.extend(Ember.MutableArray,t.DeprecatedEvented,{_inverseIsAsync:!1,isLoaded:!1,init(){this._super(...arguments),this.isLoaded=this.isLoaded||!1,this.length=0,this.promise=null,this.meta=this.meta||null,this.isPolymorphic=this.isPolymorphic||!1,this.currentState=[],this.flushCanonical(this.initialState,!1),this.initialState=void 0},anyUnloaded(){return!!this.currentState.filter(e=>e._isDematerializing||!e.isLoaded())[0]},removeUnloadedInternalModel(){for(var e=0;e<this.currentState.length;++e){var t=this.currentState[e]
+if(t._isDematerializing||!t.isLoaded())return this.arrayContentWillChange(e,1,0),this.currentState.splice(e,1),this.set("length",this.currentState.length),this.arrayContentDidChange(e,1,0),!0}return!1},objectAt(e){var t=this.currentState[e]
+if(void 0!==t)return t.getRecord()},flushCanonical(e,r=!0){if(t._objectIsAlive(this)){var n=t.diffArray(this.currentState,e)
+null!==n.firstChangeIndex&&(this.arrayContentWillChange(n.firstChangeIndex,n.removedCount,n.addedCount),this.set("length",e.length),this.currentState=e.slice(),this.arrayContentDidChange(n.firstChangeIndex,n.removedCount,n.addedCount),r&&n.addedCount>0&&this.internalModel.manyArrayRecordAdded(this.get("key")))}},replace(e,r,n){var i
+r>0&&(i=this.currentState.slice(e,e+r),this.get("recordData").removeFromHasMany(this.get("key"),i.map(e=>t.recordDataFor(e)))),n&&this.get("recordData").addToHasMany(this.get("key"),n.map(e=>t.recordDataFor(e)),e),this.retrieveLatest()},retrieveLatest(){var e=this.get("recordData").getHasMany(this.get("key")),t=this.store._getHasManyByJsonApiResource(e)
+e.meta&&this.set("meta",e.meta),e.links&&this.set("links",e.links),this.flushCanonical(t,!0)},reload(e){return this.get("store").reloadManyArray(this,this.get("internalModel"),this.get("key"),e)},save(){var e=this,r="DS: ManyArray#save "+Ember.get(this,"type"),n=Ember.RSVP.all(this.invoke("save"),r).then(()=>e,null,"DS: ManyArray#save return ManyArray")
+return t.PromiseArray.create({promise:n})},createRecord(e){var t=Ember.get(this,"store"),r=Ember.get(this,"type"),n=t.createRecord(r.modelName,e)
+return this.pushObject(n),n}}),_=t.PromiseObject.extend({meta:Ember.computed((function(){})),reload(e){var{key:t,store:r,originatingInternalModel:n}=this._belongsToState
+return r.reloadBelongsTo(this,n,t,e).then(()=>this)}}),w=t.PromiseArray.extend({links:Ember.computed.reads("content.links"),reload(e){return this.set("promise",this.get("content").reload(e)),this},createRecord:E("createRecord"),on:E("on"),one:E("one"),trigger:E("trigger"),off:E("off"),has:E("has")})
+function E(e){return function(){return Ember.get(this,"content")[e](...arguments)}}e.Errors=s,e.ManyArray=y,e.Model=g,e.PromiseBelongsTo=_,e.PromiseManyArray=w,e._modelForMixin=function(e,t){var r=Ember.getOwner(e),n=r.factoryFor("mixin:"+t),i=n&&n.class
+if(i){var o=g.extend(i)
+o.reopenClass({__isMixin:!0,__mixin:i}),r.register("model:"+t,o)}return r.factoryFor("model:"+t)},e.attr=i,e.belongsTo=o,e.hasMany=a,Object.defineProperty(e,"__esModule",{value:!0})})),define("@ember-data/model/index",["exports","@ember-data/model/-private"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.Model}}),Object.defineProperty(e,"attr",{enumerable:!0,get:function(){return t.attr}}),Object.defineProperty(e,"belongsTo",{enumerable:!0,get:function(){return t.belongsTo}}),Object.defineProperty(e,"hasMany",{enumerable:!0,get:function(){return t.hasMany}})})),define("@ember-data/record-data/-private",["exports","@ember-data/store/-private","@ember/ordered-set"],(function(e,t,r){"use strict"
+function n(e){return null==e||""===e?null:"string"==typeof e?e:"symbol"==typeof e?e.toString():""+e}function i(e){switch(typeof e){case"object":return e
+case"string":return{href:e}}return null}r=r&&Object.prototype.hasOwnProperty.call(r,"default")?r.default:r
+class o extends r{static create(){return new this}addWithIndex(e,t){var r=Ember.guidFor(e),n=this.presenceSet,i=this.list
+if(!0!==n[r])return n[r]=!0,null==t?i.push(e):i.splice(t,0,e),this.size+=1,this}deleteWithIndex(e,t){var r=Ember.guidFor(e),n=this.presenceSet,i=this.list
+if(!0===n[r]){delete n[r]
+var o=void 0!==t?t:i.indexOf(e)
+return o>-1&&i.splice(o,1),this.size=i.length,!0}return!1}}function a(e){return(t.recordDataFor(e)||e)._relationships}function s(e,t){return a(e).get(t)}function l(e,r){return function(e){return(t.recordDataFor(e)||e)._implicitRelationships}(e)[r]}class u{constructor(e,t,r,n,i){this.inverseIsAsync=void 0,this.kind=void 0,this.recordData=void 0,this.members=void 0,this.canonicalMembers=void 0,this.store=void 0,this.key=void 0,this.inverseKey=void 0,this.isAsync=void 0,this.isPolymorphic=void 0,this.relationshipMeta=void 0,this.inverseKeyForImplicit=void 0,this.meta=void 0,this.__inverseMeta=void 0,this._tempModelName=void 0,this.shouldForceReload=!1,this.relationshipIsStale=void 0,this.hasDematerializedInverse=void 0,this.hasAnyRelationshipData=void 0,this.relationshipIsEmpty=void 0,this.hasFailedLoadAttempt=!1,this.links=void 0,this.willSync=void 0,this.inverseIsAsync=i,this.kind=r.kind
+var a=r.options.async,s=r.options.polymorphic
+this.recordData=n,this.members=new o,this.canonicalMembers=new o,this.store=e,this.key=r.key||null,this.inverseKey=t,this.isAsync=void 0===a||a,this.isPolymorphic=void 0!==s&&s,this.relationshipMeta=r,this.inverseKeyForImplicit=this._tempModelName+this.key,this.meta=null,this.__inverseMeta=void 0,this.relationshipIsStale=!1,this.hasDematerializedInverse=!1,this.hasAnyRelationshipData=!1,this.relationshipIsEmpty=!0}get isNew(){return this.recordData.isNew()}_inverseIsAsync(){return!!this.inverseIsAsync}_inverseIsSync(){return!(!this.inverseKey||this.inverseIsAsync)}_hasSupportForImplicitRelationships(e){return void 0!==e._implicitRelationships&&null!==e._implicitRelationships}_hasSupportForRelationships(e){return void 0!==e._relationships&&null!==e._relationships}get _inverseMeta(){if(void 0===this.__inverseMeta){var e=null
+if(this.inverseKey){var t=this.relationshipMeta.type,r=this.store.modelFor(t)
+e=Ember.get(r,"relationshipsByName").get(this.inverseKey)}this.__inverseMeta=e}return this.__inverseMeta}recordDataDidDematerialize(){var e=this.inverseKey
+e&&this.forAllMembers(t=>{if(this._hasSupportForRelationships(t)){var r=s(t,e),n=t.getBelongsTo(e)._relationship
+n&&n.inverseRecordData&&this.recordData!==n.inverseRecordData||r.inverseDidDematerialize(this.recordData)}})}forAllMembers(e){for(var t=Object.create(null),r=0;r<this.members.list.length;r++){var n=this.members.list[r],i=Ember.guidFor(n)
+t[i]||(t[i]=!0,e(n))}for(var o=0;o<this.canonicalMembers.list.length;o++){var a=this.canonicalMembers.list[o],s=Ember.guidFor(a)
+t[s]||(t[s]=!0,e(a))}}inverseDidDematerialize(e){!this.isAsync||e&&e.isNew()?(this.removeRecordDataFromOwn(e),this.removeCanonicalRecordDataFromOwn(e),this.setRelationshipIsEmpty(!0)):this.setHasDematerializedInverse(!0)}updateMeta(e){this.meta=e}clear(){for(var e=this.members.list;e.length>0;){var t=e[0]
+this.removeRecordData(t)}for(var r=this.canonicalMembers.list;r.length>0;){var n=r[0]
+this.removeCanonicalRecordData(n)}}removeAllRecordDatasFromOwn(){this.setRelationshipIsStale(!0),this.members.clear()}removeAllCanonicalRecordDatasFromOwn(){this.canonicalMembers.clear(),this.flushCanonicalLater()}removeRecordDatas(e){e.forEach(e=>this.removeRecordData(e))}addRecordDatas(e,t){e.forEach(e=>{this.addRecordData(e,t),void 0!==t&&t++})}addCanonicalRecordDatas(e,t){for(var r=0;r<e.length;r++)void 0!==t?this.addCanonicalRecordData(e[r],r+t):this.addCanonicalRecordData(e[r])}addCanonicalRecordData(e,t){this.canonicalMembers.has(e)||(this.canonicalMembers.add(e),this.setupInverseRelationship(e)),this.flushCanonicalLater(),this.setHasAnyRelationshipData(!0)}setupInverseRelationship(e){if(this.inverseKey){if(!this._hasSupportForRelationships(e))return
+s(e,this.inverseKey).addCanonicalRecordData(this.recordData)}else{if(!this._hasSupportForImplicitRelationships(e))return
+var t=e._implicitRelationships,r=t[this.inverseKeyForImplicit]
+r||(r=t[this.inverseKeyForImplicit]=new u(this.store,this.key,{options:{async:this.isAsync}},e)),r.addCanonicalRecordData(this.recordData)}}removeCanonicalRecordDatas(e,t){for(var r=0;r<e.length;r++)void 0!==t?this.removeCanonicalRecordData(e[r],r+t):this.removeCanonicalRecordData(e[r])}removeCanonicalRecordData(e,t){this.canonicalMembers.has(e)&&(this.removeCanonicalRecordDataFromOwn(e,t),this.inverseKey?this.removeCanonicalRecordDataFromInverse(e):this._hasSupportForImplicitRelationships(e)&&e._implicitRelationships[this.inverseKeyForImplicit]&&e._implicitRelationships[this.inverseKeyForImplicit].removeCanonicalRecordData(this.recordData)),this.flushCanonicalLater()}addRecordData(e,t){this.members.has(e)||(this.members.addWithIndex(e,t),this.notifyRecordRelationshipAdded(e,t),this._hasSupportForRelationships(e)&&this.inverseKey?s(e,this.inverseKey).addRecordData(this.recordData):this._hasSupportForImplicitRelationships(e)&&(e._implicitRelationships[this.inverseKeyForImplicit]||(e._implicitRelationships[this.inverseKeyForImplicit]=new u(this.store,this.key,{options:{async:this.isAsync}},e,this.isAsync)),e._implicitRelationships[this.inverseKeyForImplicit].addRecordData(this.recordData))),this.setHasAnyRelationshipData(!0)}removeRecordData(e){this.members.has(e)&&(this.removeRecordDataFromOwn(e),this.inverseKey?this.removeRecordDataFromInverse(e):this._hasSupportForImplicitRelationships(e)&&e._implicitRelationships[this.inverseKeyForImplicit]&&e._implicitRelationships[this.inverseKeyForImplicit].removeRecordData(this.recordData))}removeRecordDataFromInverse(e){if(this._hasSupportForRelationships(e)&&this.inverseKey){var t=s(e,this.inverseKey)
+t&&t.removeRecordDataFromOwn(this.recordData)}}removeRecordDataFromOwn(e,t){this.members.delete(e)}removeCanonicalRecordDataFromInverse(e){if(this._hasSupportForRelationships(e)&&this.inverseKey){var t=s(e,this.inverseKey)
+t&&t.removeCanonicalRecordDataFromOwn(this.recordData)}}removeCanonicalRecordDataFromOwn(e,t){this.canonicalMembers.deleteWithIndex(e,t),this.flushCanonicalLater()}removeCompletelyFromInverse(){if(this.inverseKey||this.inverseKeyForImplicit){var e,t=Object.create(null),r=this.recordData
+e=this.inverseKey?e=>{var n=Ember.guidFor(e)
+if(this._hasSupportForRelationships(e)&&void 0===t[n]){if(this.inverseKey)s(e,this.inverseKey).removeCompletelyFromOwn(r)
+t[n]=!0}}:e=>{var n=Ember.guidFor(e)
+this._hasSupportForImplicitRelationships(e)&&void 0===t[n]&&(l(e,this.inverseKeyForImplicit).removeCompletelyFromOwn(r),t[n]=!0)},this.members.forEach(e),this.canonicalMembers.forEach(e),this.isAsync||this.clear()}}removeCompletelyFromOwn(e){this.canonicalMembers.delete(e),this.members.delete(e)}flushCanonical(){var e=this.members.list
+this.willSync=!1
+for(var t=[],r=0;r<e.length;r++)e[r].isNew()&&t.push(e[r])
+this.members=this.canonicalMembers.copy()
+for(var n=0;n<t.length;n++)this.members.add(t[n])}flushCanonicalLater(){this.willSync||(this.willSync=!0,this.store._updateRelationshipState(this))}updateLinks(e){this.links=e}updateRecordDatasFromAdapter(e){this.setHasAnyRelationshipData(!0),this.computeChanges(e)}computeChanges(e){}notifyRecordRelationshipAdded(e,t){}setHasAnyRelationshipData(e){this.hasAnyRelationshipData=e}setHasDematerializedInverse(e){this.hasDematerializedInverse=e}setRelationshipIsStale(e){this.relationshipIsStale=e}setRelationshipIsEmpty(e){this.relationshipIsEmpty=e}setShouldForceReload(e){this.shouldForceReload=e}setHasFailedLoadAttempt(e){this.hasFailedLoadAttempt=e}push(e,t){var r=!1,n=!1
+if(e.meta&&this.updateMeta(e.meta),void 0!==e.data)r=!0,this.updateData(e.data,t)
+else if(!1===this.isAsync&&!this.hasAnyRelationshipData){r=!0
+var o="hasMany"===this.kind?[]:null
+this.updateData(o,t)}if(e.links){var a=this.links
+if(this.updateLinks(e.links),e.links.related){var s=i(e.links.related),l=a&&a.related?i(a.related):null,u=l?l.href:null
+s&&s.href&&s.href!==u&&(n=!0)}}if(this.setHasFailedLoadAttempt(!1),r){var c=null===e.data||Array.isArray(e.data)&&0===e.data.length
+this.setHasAnyRelationshipData(!0),this.setRelationshipIsStale(!1),this.setHasDematerializedInverse(!1),this.setRelationshipIsEmpty(c)}else if(n&&(this.setRelationshipIsStale(!0),!t)){var d=this.recordData
+this.recordData.storeWrapper.notifyPropertyChange(d.modelName,d.id,d.clientId,this.key)}}localStateIsEmpty(){}updateData(e,t){}destroy(){}}class c extends u{constructor(e,t,r,n,i){super(e,t,r,n,i),this.inverseRecordData=void 0,this.canonicalState=void 0,this.key=void 0,this.key=r.key,this.inverseRecordData=null,this.canonicalState=null,this.key=r.key}setRecordData(e){e?this.addRecordData(e):this.inverseRecordData&&this.removeRecordData(this.inverseRecordData),this.setHasAnyRelationshipData(!0),this.setRelationshipIsStale(!1),this.setRelationshipIsEmpty(!1)}setCanonicalRecordData(e){e?this.addCanonicalRecordData(e):this.canonicalState&&this.removeCanonicalRecordData(this.canonicalState),this.flushCanonicalLater()}setInitialCanonicalRecordData(e){e&&(this.canonicalMembers.add(e),this.members.add(e),this.inverseRecordData=this.canonicalState=e,this.setupInverseRelationship(e))}addCanonicalRecordData(e){this.canonicalMembers.has(e)||(this.canonicalState&&this.removeCanonicalRecordData(this.canonicalState),this.canonicalState=e,super.addCanonicalRecordData(e),this.setHasAnyRelationshipData(!0),this.setRelationshipIsEmpty(!1))}inverseDidDematerialize(){super.inverseDidDematerialize(this.inverseRecordData),this.notifyBelongsToChange()}removeCompletelyFromOwn(e){super.removeCompletelyFromOwn(e),this.canonicalState===e&&(this.canonicalState=null),this.inverseRecordData===e&&(this.inverseRecordData=null,this.notifyBelongsToChange())}removeCompletelyFromInverse(){super.removeCompletelyFromInverse(),this.inverseRecordData=null}flushCanonical(){this.inverseRecordData&&this.inverseRecordData.isNew()&&!this.canonicalState?this.willSync=!1:(this.inverseRecordData!==this.canonicalState&&(this.inverseRecordData=this.canonicalState,this.notifyBelongsToChange()),super.flushCanonical())}addRecordData(e){this.members.has(e)||(this.inverseRecordData&&this.removeRecordData(this.inverseRecordData),this.inverseRecordData=e,super.addRecordData(e),this.notifyBelongsToChange())}removeRecordDataFromOwn(e){this.members.has(e)&&(this.inverseRecordData=null,super.removeRecordDataFromOwn(e),this.notifyBelongsToChange())}removeAllRecordDatasFromOwn(){super.removeAllRecordDatasFromOwn(),this.inverseRecordData=null,this.notifyBelongsToChange()}notifyBelongsToChange(){var e=this.recordData
+this.recordData.storeWrapper.notifyBelongsToChange(e.modelName,e.id,e.clientId,this.key)}removeCanonicalRecordDataFromOwn(e,t){this.canonicalMembers.has(e)&&(this.canonicalState=null,this.setHasAnyRelationshipData(!0),this.setRelationshipIsEmpty(!0),super.removeCanonicalRecordDataFromOwn(e,t))}removeAllCanonicalRecordDatasFromOwn(){super.removeAllCanonicalRecordDatasFromOwn(),this.canonicalState=null}getData(){var e,t={}
+return this.inverseRecordData&&(e=this.inverseRecordData.getResourceIdentifier()),null===this.inverseRecordData&&this.hasAnyRelationshipData&&(e=null),this.links&&(t.links=this.links),void 0!==e&&(t.data=e),this.meta&&(t.meta=this.meta),t._relationship=this,t}updateData(e,t){var r
+Ember.isNone(e)&&(r=null),null!==r&&(r=this.recordData.storeWrapper.recordDataFor(e.type,e.id)),t?this.setInitialCanonicalRecordData(r):this.setCanonicalRecordData(r)}}class d extends u{constructor(e,t,r,n,i){super(e,t,r,n,i),this.canonicalState=void 0,this.currentState=void 0,this._willUpdateManyArray=void 0,this._pendingManyArrayUpdates=void 0,this.key=void 0,this.canonicalState=[],this.currentState=[],this._willUpdateManyArray=!1,this._pendingManyArrayUpdates=null,this.key=r.key}addCanonicalRecordData(e,t){this.canonicalMembers.has(e)||(void 0!==t?this.canonicalState.splice(t,0,e):this.canonicalState.push(e),super.addCanonicalRecordData(e,t))}inverseDidDematerialize(e){super.inverseDidDematerialize(e),this.isAsync&&this.notifyManyArrayIsStale()}addRecordData(e,t){this.members.has(e)||(super.addRecordData(e,t),void 0===t&&(t=this.currentState.length),this.currentState.splice(t,0,e),this.notifyHasManyChange())}removeCanonicalRecordDataFromOwn(e,t){var r=t
+this.canonicalMembers.has(e)&&(void 0===r&&(r=this.canonicalState.indexOf(e)),r>-1&&this.canonicalState.splice(r,1),super.removeCanonicalRecordDataFromOwn(e,t))}removeAllCanonicalRecordDatasFromOwn(){super.removeAllCanonicalRecordDatasFromOwn(),this.canonicalMembers.clear(),this.canonicalState.splice(0,this.canonicalState.length),super.removeAllCanonicalRecordDatasFromOwn()}removeCompletelyFromOwn(e){super.removeCompletelyFromOwn(e)
+var t=this.canonicalState.indexOf(e);-1!==t&&this.canonicalState.splice(t,1),this.removeRecordDataFromOwn(e)}flushCanonical(){var e=this.canonicalState,t=this.currentState.filter(t=>t.isNew()&&-1===e.indexOf(t))
+e=e.concat(t),this.currentState=e,super.flushCanonical(),this.notifyHasManyChange()}removeRecordDataFromOwn(e,t){super.removeRecordDataFromOwn(e,t)
+var r=t||this.currentState.indexOf(e);-1!==r&&(this.currentState.splice(r,1),this.notifyHasManyChange())}notifyRecordRelationshipAdded(){this.notifyHasManyChange()}computeChanges(e=[]){for(var t=this.canonicalMembers.toArray(),r=t.length-1;r>=0;r--)this.removeCanonicalRecordData(t[r],r)
+for(var n=0,i=e.length;n<i;n++)this.addCanonicalRecordData(e[n],n)}setInitialRecordDatas(e){if(!1!==Array.isArray(e)&&e&&0!==e.length){for(var t=0;t<e.length;t++){var r=e[t]
+this.canonicalMembers.has(r)||(this.canonicalMembers.add(r),this.members.add(r),this.setupInverseRelationship(r))}this.canonicalState=this.canonicalMembers.toArray()}}notifyManyArrayIsStale(){var e=this.recordData
+e.storeWrapper.notifyPropertyChange(e.modelName,e.id,e.clientId,this.key)}notifyHasManyChange(){var e=this.recordData
+e.storeWrapper.notifyHasManyChange(e.modelName,e.id,e.clientId,this.key)}getData(){var e={}
+return this.hasAnyRelationshipData&&(e.data=this.currentState.map(e=>e.getResourceIdentifier())),this.links&&(e.links=this.links),this.meta&&(e.meta=this.meta),e._relationship=this,e}updateData(e,t){var r
+if(Ember.isNone(e))r=void 0
+else{r=new Array(e.length)
+for(var n=0;n<e.length;n++)r[n]=this.recordData.storeWrapper.recordDataFor(e[n].type,e[n].id)}t?this.setInitialRecordDatas(r):this.updateRecordDatasFromAdapter(r)}}class h{constructor(e){this.recordData=e,this._store=void 0,this._storeWrapper=void 0,this.initializedRelationships=void 0,this.initializedRelationships=Object.create(null),this._storeWrapper=t.upgradeForInternal(e.storeWrapper),this._store=this._storeWrapper._store}has(e){return!!this.initializedRelationships[e]}forEach(e){var t=this.initializedRelationships
+Object.keys(t).forEach(r=>{e(r,t[r])})}get(e){var t=this.initializedRelationships,r=t[e]
+if(!r){var n=this.recordData,i=this.recordData.storeWrapper.relationshipsDefinitionFor(this.recordData.modelName)[e]
+i&&(r=t[e]=function(e,t,r,n){var i=r.storeWrapper.inverseForRelationship(r.modelName,n),o=r.storeWrapper.inverseIsAsyncForRelationship(r.modelName,n)
+return"hasMany"===e.kind?new d(t,i,e,r,o):new c(t,i,e,r,o)}(i,this._store,n,e))}return r}}var f=1
+class p{constructor(e,t){this.identifier=e,this.storeWrapper=t,this._errors=void 0,this.__relationships=void 0,this.__implicitRelationships=void 0,this.modelName=void 0,this.clientId=void 0,this.id=void 0,this.isDestroyed=void 0,this._isNew=void 0,this._bfsId=void 0,this.__attributes=void 0,this.__inFlightAttributes=void 0,this.__data=void 0,this._scheduledDestroy=void 0,this._isDeleted=void 0,this._isDeletionCommited=void 0,this._directlyRelatedRecordDatasIterable=()=>{var e=this._relationships.initializedRelationships,t=Object.keys(e).map(t=>e[t]),r=0,n=0,i=0
+return{iterator:()=>({next:()=>{var e=(()=>{for(;r<t.length;){for(;n<2;){for(var e=0===n?t[r].members.list:t[r].canonicalMembers.list;i<e.length;)return e[i++]
+i=0,n++}n=0,r++}})()
+return{value:e,done:void 0===e}}})}},this.modelName=e.type,this.clientId=e.lid,this.id=e.id,this.__relationships=null,this.__implicitRelationships=null,this.isDestroyed=!1,this._isNew=!1,this._isDeleted=!1,this._bfsId=0,this.reset()}getResourceIdentifier(){return this.identifier}pushData(e,t){var r
+return this._isNew&&(this._isNew=!1,this.notifyStateChange()),t&&(r=this._changedKeys(e.attributes)),Ember.assign(this._data,e.attributes),this.__attributes&&this._updateChangedAttributes(),e.relationships&&this._setupRelationships(e),e.id&&(this.id=n(e.id)),r}willCommit(){this._inFlightAttributes=this._attributes,this._attributes=null}hasChangedAttributes(){return null!==this.__attributes&&Object.keys(this.__attributes).length>0}_clearErrors(){}getErrors(){return[]}isEmpty(){return null===this.__attributes&&null===this.__inFlightAttributes&&null===this.__data}deleteRecord(){this._isDeleted=!0,this.notifyStateChange()}isDeleted(){return this._isDeleted}setIsDeleted(e){this._isDeleted=e,this._isNew&&this._deletionConfirmed(),this.notifyStateChange()}isDeletionCommitted(){return this._isDeletionCommited}reset(){this.__attributes=null,this.__inFlightAttributes=null,this.__data=null,this._errors=void 0}_setupRelationships(e){for(var t=this.storeWrapper.relationshipsDefinitionFor(this.modelName),r=Object.keys(t),n=0;n<r.length;n++){var i=r[n]
+if(e.relationships[i]){var o=e.relationships[i]
+this._relationships.get(i).push(o)}}}_updateChangedAttributes(){for(var e=this.changedAttributes(),t=Object.keys(e),r=this._attributes,n=0,i=t.length;n<i;n++){var o=t[n],a=e[o]
+a[0]===a[1]&&delete r[o]}}changedAttributes(){for(var e=this._data,t=this._attributes,r=this._inFlightAttributes,n=Ember.assign({},r,t),i=Object.create(null),o=Object.keys(n),a=0,s=o.length;a<s;a++){var l=o[a]
+i[l]=[e[l],n[l]]}return i}isNew(){return this._isNew}rollbackAttributes(){var e
+return this._isDeleted=!1,this.hasChangedAttributes()&&(e=Object.keys(this._attributes),this._attributes=null),this.isNew()&&(this.removeFromInverseRelationships(!0),this._isDeleted=!0,this._isNew=!1),this._inFlightAttributes=null,this._clearErrors(),this.notifyStateChange(),e}_deletionConfirmed(){this.removeFromInverseRelationships()}didCommit(e){this._isDeleted&&(this._deletionConfirmed(),this._isDeletionCommited=!0),this._isNew=!1
+var t=null
+e&&(e.relationships&&this._setupRelationships(e),e.id&&(this.storeWrapper.setRecordId(this.modelName,e.id,this.clientId),this.id=n(e.id)),t=e.attributes||null)
+var r=this._changedKeys(t)
+return Ember.assign(this._data,this.__inFlightAttributes,t),this._inFlightAttributes=null,this._updateChangedAttributes(),this._clearErrors(),this.notifyStateChange(),r}notifyStateChange(){}getHasMany(e){return this._relationships.get(e).getData()}setDirtyHasMany(e,t){var r=this._relationships.get(e)
+r.clear(),r.addRecordDatas(t)}addToHasMany(e,t,r){this._relationships.get(e).addRecordDatas(t,r)}removeFromHasMany(e,t){this._relationships.get(e).removeRecordDatas(t)}commitWasRejected(e,t){var r=Object.keys(this._inFlightAttributes)
+if(r.length>0)for(var n=this._attributes,i=0;i<r.length;i++)void 0===n[r[i]]&&(n[r[i]]=this._inFlightAttributes[r[i]])
+this._inFlightAttributes=null}getBelongsTo(e){return this._relationships.get(e).getData()}setDirtyBelongsTo(e,t){this._relationships.get(e).setRecordData(t)}setDirtyAttribute(e,t){this._attributes[e]=t,t===(e in this._inFlightAttributes?this._inFlightAttributes[e]:this._data[e])&&delete this._attributes[e]}__setId(e){this.id!==e&&(this.id=e)}getAttr(e){return e in this._attributes?this._attributes[e]:e in this._inFlightAttributes?this._inFlightAttributes[e]:this._data[e]}hasAttr(e){return e in this._attributes||e in this._inFlightAttributes||e in this._data}unloadRecord(){this.isDestroyed||(this._destroyRelationships(),this.reset(),this._scheduledDestroy||(this._scheduledDestroy=Ember.run.backburner.schedule("destroy",this,"_cleanupOrphanedRecordDatas")))}_cleanupOrphanedRecordDatas(){var e=this._allRelatedRecordDatas()
+if(function(e){for(var t=0;t<e.length;++t)if(e[t].isRecordInUse())return!1
+return!0}(e))for(var t=0;t<e.length;++t){var r=e[t]
+r.isDestroyed||r.destroy()}this._scheduledDestroy=null}destroy(){this._relationships.forEach((e,t)=>t.destroy()),this.isDestroyed=!0,this.storeWrapper.disconnectRecord(this.modelName,this.id,this.clientId)}isRecordInUse(){return this.storeWrapper.isRecordInUse(this.modelName,this.id,this.clientId)}_allRelatedRecordDatas(){var e=[],t=[],r=f++
+for(t.push(this),this._bfsId=r;t.length>0;){var n=t.shift()
+e.push(n)
+for(var i=this._directlyRelatedRecordDatasIterable().iterator(),o=i.next();!o.done;o=i.next()){var a=o.value
+a instanceof p&&a._bfsId<r&&(t.push(a),a._bfsId=r)}}return e}isAttrDirty(e){return void 0!==this._attributes[e]&&(void 0!==this._inFlightAttributes[e]?this._inFlightAttributes[e]:this._data[e])!==this._attributes[e]}get _attributes(){return null===this.__attributes&&(this.__attributes=Object.create(null)),this.__attributes}set _attributes(e){this.__attributes=e}get _relationships(){return null===this.__relationships&&(this.__relationships=new h(this)),this.__relationships}get _data(){return null===this.__data&&(this.__data=Object.create(null)),this.__data}set _data(e){this.__data=e}get _implicitRelationships(){if(null===this.__implicitRelationships){var e=Object.create(null)
+return this.__implicitRelationships=e,e}return this.__implicitRelationships}get _inFlightAttributes(){return null===this.__inFlightAttributes&&(this.__inFlightAttributes=Object.create(null)),this.__inFlightAttributes}set _inFlightAttributes(e){this.__inFlightAttributes=e}_initRecordCreateOptions(e){var t={}
+if(void 0!==e)for(var{modelName:r,storeWrapper:n}=this,i=n.attributesDefinitionFor(r),o=n.relationshipsDefinitionFor(r),a=this._relationships,s=Object.keys(e),l=0;l<s.length;l++){var u=s[l],c=e[u]
+if("id"!==u){var d=o[u]||i[u],h=void 0
+switch(void 0!==d?d.kind:null){case"attribute":this.setDirtyAttribute(u,c)
+break
+case"belongsTo":this.setDirtyBelongsTo(u,c),(h=a.get(u)).setHasAnyRelationshipData(!0),h.setRelationshipIsEmpty(!1)
+break
+case"hasMany":this.setDirtyHasMany(u,c),(h=a.get(u)).setHasAnyRelationshipData(!0),h.setRelationshipIsEmpty(!1)
+break
+default:t[u]=c}}else this.id=c}return t}removeFromInverseRelationships(e=!1){this._relationships.forEach((t,r)=>{r.removeCompletelyFromInverse(),!0===e&&r.clear()}),this.__relationships=null
+var t=this._implicitRelationships
+this.__implicitRelationships=null,Object.keys(t).forEach(r=>{var n=t[r]
+n.removeCompletelyFromInverse(),!0===e&&n.clear()})}_destroyRelationships(){this._relationships.forEach((e,t)=>m(t))
+var e=this._implicitRelationships
+this.__implicitRelationships=null,Object.keys(e).forEach(t=>{m(e[t])})}clientDidCreate(){this._isNew=!0}_changedKeys(e){var t=[]
+if(e){var r,n,i,o,a,s=Object.keys(e),l=s.length,u=this.hasChangedAttributes()
+for(u&&(a=this._attributes),r=Ember.assign(Object.create(null),this._data,this.__inFlightAttributes),n=0;n<l;n++)i=e[o=s[n]],!0===u&&void 0!==a[o]||Ember.isEqual(r[o],i)||t.push(o)}return t}toString(){return`<${this.modelName}:${this.id}>`}}function m(e){e.recordDataDidDematerialize(),e._inverseIsSync()&&(e.removeAllRecordDatasFromOwn(),e.removeAllCanonicalRecordDatasFromOwn())}e.BelongsToRelationship=c,e.ManyRelationship=d,e.RecordData=p,e.Relationship=u,e.relationshipStateFor=s,e.relationshipsFor=a,Object.defineProperty(e,"__esModule",{value:!0})})),define("@ember-data/serializer/-private",["exports"],(function(e){"use strict"
+var t=Ember.Mixin.create({normalize(e,t,r){var n=this._super(e,t,r)
+return this._extractEmbeddedRecords(this,this.store,e,n)},keyForRelationship(e,t,r){return"serialize"===r&&this.hasSerializeRecordsOption(e)||"deserialize"===r&&this.hasDeserializeRecordsOption(e)?this.keyForAttribute(e,r):this._super(e,t,r)||e},serializeBelongsTo(e,t,r){var n=r.key
+if(this.noSerializeOptionSpecified(n))this._super(e,t,r)
+else{var i=this.hasSerializeIdsOption(n),o=this.hasSerializeRecordsOption(n),a=e.belongsTo(n)
+if(i){var s=this._getMappedKey(r.key,e.type)
+s===r.key&&this.keyForRelationship&&(s=this.keyForRelationship(r.key,r.kind,"serialize")),a?(t[s]=a.id,r.options.polymorphic&&this.serializePolymorphicType(e,t,r)):t[s]=null}else o&&this._serializeEmbeddedBelongsTo(e,t,r)}},_serializeEmbeddedBelongsTo(e,t,r){var n=e.belongsTo(r.key),i=this._getMappedKey(r.key,e.type)
+i===r.key&&this.keyForRelationship&&(i=this.keyForRelationship(r.key,r.kind,"serialize")),n?(t[i]=n.serialize({includeId:!0}),this.removeEmbeddedForeignKey(e,n,r,t[i]),r.options.polymorphic&&this.serializePolymorphicType(e,t,r)):t[i]=null},serializeHasMany(e,t,r){var n=r.key
+if(this.noSerializeOptionSpecified(n))this._super(e,t,r)
+else if(this.hasSerializeIdsOption(n)){var i=this._getMappedKey(r.key,e.type)
+i===r.key&&this.keyForRelationship&&(i=this.keyForRelationship(r.key,r.kind,"serialize")),t[i]=e.hasMany(n,{ids:!0})}else this.hasSerializeRecordsOption(n)?this._serializeEmbeddedHasMany(e,t,r):this.hasSerializeIdsAndTypesOption(n)&&this._serializeHasManyAsIdsAndTypes(e,t,r)},_serializeHasManyAsIdsAndTypes(e,t,r){var n=this.keyForAttribute(r.key,"serialize"),i=e.hasMany(r.key)
+t[n]=Ember.A(i).map((function(e){return{id:e.id,type:e.modelName}}))},_serializeEmbeddedHasMany(e,t,r){var n=this._getMappedKey(r.key,e.type)
+n===r.key&&this.keyForRelationship&&(n=this.keyForRelationship(r.key,r.kind,"serialize")),t[n]=this._generateSerializedHasMany(e,r)},_generateSerializedHasMany(e,t){for(var r=e.hasMany(t.key),n=Ember.A(r),i=new Array(n.length),o=0;o<n.length;o++){var a=n[o],s=a.serialize({includeId:!0})
+this.removeEmbeddedForeignKey(e,a,t,s),i[o]=s}return i},removeEmbeddedForeignKey(e,t,r,n){if("belongsTo"===r.kind){var i=e.type.inverseFor(r.key,this.store)
+if(i){var o=i.name,a=this.store.serializerFor(t.modelName).keyForRelationship(o,i.kind,"deserialize")
+a&&delete n[a]}}},hasEmbeddedAlwaysOption(e){var t=this.attrsOption(e)
+return t&&"always"===t.embedded},hasSerializeRecordsOption(e){var t=this.hasEmbeddedAlwaysOption(e),r=this.attrsOption(e)
+return t||r&&"records"===r.serialize},hasSerializeIdsOption(e){var t=this.attrsOption(e)
+return t&&("ids"===t.serialize||"id"===t.serialize)},hasSerializeIdsAndTypesOption(e){var t=this.attrsOption(e)
+return t&&("ids-and-types"===t.serialize||"id-and-type"===t.serialize)},noSerializeOptionSpecified(e){var t=this.attrsOption(e)
+return!(t&&(t.serialize||t.embedded))},hasDeserializeRecordsOption(e){var t=this.hasEmbeddedAlwaysOption(e),r=this.attrsOption(e)
+return t||r&&"records"===r.deserialize},attrsOption(e){var t=this.get("attrs")
+return t&&(t[Ember.String.camelize(e)]||t[e])},_extractEmbeddedRecords(e,t,r,n){return r.eachRelationship((r,i)=>{e.hasDeserializeRecordsOption(r)&&("hasMany"===i.kind&&this._extractEmbeddedHasMany(t,r,n,i),"belongsTo"===i.kind&&this._extractEmbeddedBelongsTo(t,r,n,i))}),n},_extractEmbeddedHasMany(e,t,r,n){var i=Ember.get(r,`data.relationships.${t}.data`)
+if(i){for(var o=new Array(i.length),a=0;a<i.length;a++){var s=i[a],{data:l,included:u}=this._normalizeEmbeddedRelationship(e,n,s)
+r.included=r.included||[],r.included.push(l),u&&r.included.push(...u),o[a]={id:l.id,type:l.type}}var c={data:o}
+Ember.set(r,"data.relationships."+t,c)}},_extractEmbeddedBelongsTo(e,t,r,n){var i=Ember.get(r,`data.relationships.${t}.data`)
+if(i){var{data:o,included:a}=this._normalizeEmbeddedRelationship(e,n,i)
+r.included=r.included||[],r.included.push(o),a&&r.included.push(...a)
+var s={data:{id:o.id,type:o.type}}
+Ember.set(r,"data.relationships."+t,s)}},_normalizeEmbeddedRelationship(e,t,r){var n=t.type
+t.options.polymorphic&&(n=r.type)
+var i=e.modelFor(n)
+return e.serializerFor(n).normalize(i,r,null)},isEmbeddedRecordsMixin:!0})
+var r=Ember.Object.extend({serialize:null,deserialize:null}),n=r.extend({deserialize(e,t){if(Ember.isNone(e)&&!0===t.allowNull)return null
+var r=typeof e
+return"boolean"===r?e:"string"===r?/^(true|t|1)$/i.test(e):"number"===r&&1===e},serialize:(e,t)=>Ember.isNone(e)&&!0===t.allowNull?null:Boolean(e)}),i=r.extend({deserialize(e){var t=typeof e
+if("string"===t){var r=e.indexOf("+")
+return-1!==r&&e.length-5===r?(r+=3,new Date(e.slice(0,r)+":"+e.slice(r))):new Date(e)}return"number"===t?new Date(e):null==e?e:null},serialize:e=>e instanceof Date&&!isNaN(e)?e.toISOString():null})
+function o(e){return e==e&&e!==1/0&&e!==-1/0}var a=r.extend({deserialize(e){var t
+return""===e||null==e?null:o(t=Number(e))?t:null},serialize(e){var t
+return""===e||null==e?null:o(t=Number(e))?t:null}}),s=r.extend({deserialize:e=>Ember.isNone(e)?null:String(e),serialize:e=>Ember.isNone(e)?null:String(e)})
+e.BooleanTransform=n,e.DateTransform=i,e.EmbeddedRecordsMixin=t,e.NumberTransform=a,e.StringTransform=s,e.Transform=r,e.modelHasAttributeOrRelationshipNamedType=function(e){return Ember.get(e,"attributes").has("type")||Ember.get(e,"relationshipsByName").has("type")},Object.defineProperty(e,"__esModule",{value:!0})})),define("@ember-data/serializer/index",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Object.extend({normalizeResponse:null,serialize:null,normalize:(e,t)=>t})
+e.default=t})),define("@ember-data/serializer/json-api",["exports","ember-inflector","@ember-data/serializer/json","@ember-data/store"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var i=r.default.extend({_normalizeDocumentHelper(e){if("object"===Ember.typeOf(e.data))e.data=this._normalizeResourceHelper(e.data)
+else if(Array.isArray(e.data)){for(var t=new Array(e.data.length),r=0;r<e.data.length;r++){var n=e.data[r]
+t[r]=this._normalizeResourceHelper(n)}e.data=t}if(Array.isArray(e.included)){for(var i=new Array,o=0;o<e.included.length;o++){var a=e.included[o],s=this._normalizeResourceHelper(a)
+null!==s&&i.push(s)}e.included=i}return e},_normalizeRelationshipDataHelper(e){return e.type=this.modelNameFromPayloadKey(e.type),e},_normalizeResourceHelper(e){var t
+if(t=this.modelNameFromPayloadKey(e.type),"modelNameFromPayloadKey",!this.store._hasModelFor(t))return null
+var r=this.store.modelFor(t),n=this.store.serializerFor(t),{data:i}=n.normalize(r,e)
+return i},pushPayload(e,t){var r=this._normalizeDocumentHelper(t)
+e.push(r)},_normalizeResponse(e,t,r,n,i,o){return this._normalizeDocumentHelper(r)},normalizeQueryRecordResponse(){var e=this._super(...arguments)
+return e},extractAttributes(e,t){var r={}
+return t.attributes&&e.eachAttribute(e=>{var n=this.keyForAttribute(e,"deserialize")
+void 0!==t.attributes[n]&&(r[e]=t.attributes[n])}),r},extractRelationship(e){if("object"===Ember.typeOf(e.data)&&(e.data=this._normalizeRelationshipDataHelper(e.data)),Array.isArray(e.data)){for(var t=new Array(e.data.length),r=0;r<e.data.length;r++){var n=e.data[r]
+t[r]=this._normalizeRelationshipDataHelper(n)}e.data=t}return e},extractRelationships(e,t){var r={}
+return t.relationships&&e.eachRelationship((e,n)=>{var i=this.keyForRelationship(e,n.kind,"deserialize")
+if(void 0!==t.relationships[i]){var o=t.relationships[i]
+r[e]=this.extractRelationship(o)}}),r},_extractType(e,t){return this.modelNameFromPayloadKey(t.type)},modelNameFromPayloadKey:e=>(0,t.singularize)((0,n.normalizeModelName)(e)),payloadKeyFromModelName:e=>(0,t.pluralize)(e),normalize(e,t){t.attributes&&this.normalizeUsingDeclaredMapping(e,t.attributes),t.relationships&&this.normalizeUsingDeclaredMapping(e,t.relationships)
+var r={id:this.extractId(e,t),type:this._extractType(e,t),attributes:this.extractAttributes(e,t),relationships:this.extractRelationships(e,t)}
+return this.applyTransforms(e,r.attributes),{data:r}},keyForAttribute:e=>Ember.String.dasherize(e),keyForRelationship:e=>Ember.String.dasherize(e),serialize(e,t){var r=this._super(...arguments)
+return r.type=this.payloadKeyFromModelName(e.modelName),{data:r}},serializeAttribute(e,t,r,n){var i=n.type
+if(this._canSerialize(r)){t.attributes=t.attributes||{}
+var o=e.attr(r)
+if(i)o=this.transformFor(i).serialize(o,n.options)
+var a=this._getMappedKey(r,e.type)
+a===r&&(a=this.keyForAttribute(r,"serialize")),t.attributes[a]=o}},serializeBelongsTo(e,t,r){var n=r.key
+if(this._canSerialize(n)){var i,o=e.belongsTo(n)
+if(i=o&&o.record&&!o.record.get("isNew"),null===o||i){t.relationships=t.relationships||{}
+var a=this._getMappedKey(n,e.type)
+a===n&&(a=this.keyForRelationship(n,"belongsTo","serialize"))
+var s=null
+if(o)s={type:this.payloadKeyFromModelName(o.modelName),id:o.id}
+t.relationships[a]={data:s}}}},serializeHasMany(e,t,r){var n=r.key
+if(this.shouldSerializeHasMany(e,n,r)){var i=e.hasMany(n)
+if(void 0!==i){t.relationships=t.relationships||{}
+var o=this._getMappedKey(n,e.type)
+o===n&&this.keyForRelationship&&(o=this.keyForRelationship(n,"hasMany","serialize"))
+for(var a=i.filter(e=>e.record&&!e.record.get("isNew")),s=new Array(a.length),l=0;l<a.length;l++){var u=i[l],c=this.payloadKeyFromModelName(u.modelName)
+s[l]={type:c,id:u.id}}t.relationships[o]={data:s}}}}})
+var o=i
+e.default=o})),define("@ember-data/serializer/json",["exports","@ember-data/serializer","@ember-data/store","@ember-data/store/-private","@ember-data/serializer/-private"],(function(e,t,r,n,i){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var o=t.default.extend({primaryKey:"id",mergedProperties:["attrs"],applyTransforms(e,t){var r=Ember.get(e,"attributes")
+return e.eachTransformedAttribute((e,n)=>{if(void 0!==t[e]){var i=this.transformFor(n),o=r.get(e)
+t[e]=i.deserialize(t[e],o.options)}}),t},normalizeResponse(e,t,r,n,i){switch(i){case"findRecord":return this.normalizeFindRecordResponse(...arguments)
+case"queryRecord":return this.normalizeQueryRecordResponse(...arguments)
+case"findAll":return this.normalizeFindAllResponse(...arguments)
+case"findBelongsTo":return this.normalizeFindBelongsToResponse(...arguments)
+case"findHasMany":return this.normalizeFindHasManyResponse(...arguments)
+case"findMany":return this.normalizeFindManyResponse(...arguments)
+case"query":return this.normalizeQueryResponse(...arguments)
+case"createRecord":return this.normalizeCreateRecordResponse(...arguments)
+case"deleteRecord":return this.normalizeDeleteRecordResponse(...arguments)
+case"updateRecord":return this.normalizeUpdateRecordResponse(...arguments)}},normalizeFindRecordResponse(e,t,r,n,i){return this.normalizeSingleResponse(...arguments)},normalizeQueryRecordResponse(e,t,r,n,i){return this.normalizeSingleResponse(...arguments)},normalizeFindAllResponse(e,t,r,n,i){return this.normalizeArrayResponse(...arguments)},normalizeFindBelongsToResponse(e,t,r,n,i){return this.normalizeSingleResponse(...arguments)},normalizeFindHasManyResponse(e,t,r,n,i){return this.normalizeArrayResponse(...arguments)},normalizeFindManyResponse(e,t,r,n,i){return this.normalizeArrayResponse(...arguments)},normalizeQueryResponse(e,t,r,n,i){return this.normalizeArrayResponse(...arguments)},normalizeCreateRecordResponse(e,t,r,n,i){return this.normalizeSaveResponse(...arguments)},normalizeDeleteRecordResponse(e,t,r,n,i){return this.normalizeSaveResponse(...arguments)},normalizeUpdateRecordResponse(e,t,r,n,i){return this.normalizeSaveResponse(...arguments)},normalizeSaveResponse(e,t,r,n,i){return this.normalizeSingleResponse(...arguments)},normalizeSingleResponse(e,t,r,n,i){return this._normalizeResponse(e,t,r,n,i,!0)},normalizeArrayResponse(e,t,r,n,i){return this._normalizeResponse(e,t,r,n,i,!1)},_normalizeResponse(e,t,r,n,i,o){var a={data:null,included:[]},s=this.extractMeta(e,t,r)
+if(s&&(a.meta=s),o){var{data:l,included:u}=this.normalize(t,r)
+a.data=l,u&&(a.included=u)}else{for(var c=new Array(r.length),d=0,h=r.length;d<h;d++){var f=r[d],{data:p,included:m}=this.normalize(t,f)
+m&&a.included.push(...m),c[d]=p}a.data=c}return a},normalize(e,t){var r=null
+return t&&(this.normalizeUsingDeclaredMapping(e,t),"object"===Ember.typeOf(t.links)&&this.normalizeUsingDeclaredMapping(e,t.links),r={id:this.extractId(e,t),type:e.modelName,attributes:this.extractAttributes(e,t),relationships:this.extractRelationships(e,t)},this.applyTransforms(e,r.attributes)),{data:r}},extractId(e,t){var r=t[Ember.get(this,"primaryKey")]
+return(0,n.coerceId)(r)},extractAttributes(e,t){var r,n={}
+return e.eachAttribute(e=>{r=this.keyForAttribute(e,"deserialize"),void 0!==t[r]&&(n[e]=t[r])}),n},extractRelationship(e,t){if(Ember.isNone(t))return null
+if("object"===Ember.typeOf(t)){t.id&&(t.id=(0,n.coerceId)(t.id))
+var r=this.store.modelFor(e)
+return t.type&&!(0,i.modelHasAttributeOrRelationshipNamedType)(r)&&(t.type=this.modelNameFromPayloadKey(t.type)),t}return{id:(0,n.coerceId)(t),type:e}},extractPolymorphicRelationship(e,t,r){return this.extractRelationship(e,t)},extractRelationships(e,t){var r={}
+return e.eachRelationship((e,n)=>{var i=null,o=this.keyForRelationship(e,n.kind,"deserialize")
+if(void 0!==t[o]){var a=null,s=t[o]
+if("belongsTo"===n.kind)a=n.options.polymorphic?this.extractPolymorphicRelationship(n.type,s,{key:e,resourceHash:t,relationshipMeta:n}):this.extractRelationship(n.type,s)
+else if("hasMany"===n.kind&&!Ember.isNone(s))if(a=new Array(s.length),n.options.polymorphic)for(var l=0,u=s.length;l<u;l++){var c=s[l]
+a[l]=this.extractPolymorphicRelationship(n.type,c,{key:e,resourceHash:t,relationshipMeta:n})}else for(var d=0,h=s.length;d<h;d++){var f=s[d]
+a[d]=this.extractRelationship(n.type,f)}i={data:a}}var p=this.keyForLink(e,n.kind)
+if(t.links&&void 0!==t.links[p]){var m=t.links[p];(i=i||{}).links={related:m}}i&&(r[e]=i)}),r},modelNameFromPayloadKey:e=>(0,r.normalizeModelName)(e),normalizeRelationships(e,t){var r
+this.keyForRelationship&&e.eachRelationship((e,n)=>{e!==(r=this.keyForRelationship(e,n.kind,"deserialize"))&&void 0!==t[r]&&(t[e]=t[r],delete t[r])})},normalizeUsingDeclaredMapping(e,t){var r,n,i=Ember.get(this,"attrs")
+if(i)for(var o in i)r=n=this._getMappedKey(o,e),void 0!==t[n]&&(Ember.get(e,"attributes").has(o)&&(r=this.keyForAttribute(o)),Ember.get(e,"relationshipsByName").has(o)&&(r=this.keyForRelationship(o)),n!==r&&(t[r]=t[n],delete t[n]))},_getMappedKey(e,t){var r,n=Ember.get(this,"attrs")
+return n&&n[e]&&((r=n[e]).key&&(r=r.key),"string"==typeof r&&(e=r)),e},_canSerialize(e){var t=Ember.get(this,"attrs")
+return!t||!t[e]||!1!==t[e].serialize},_mustSerialize(e){var t=Ember.get(this,"attrs")
+return t&&t[e]&&!0===t[e].serialize},shouldSerializeHasMany(e,t,r){var n=e.type.determineRelationshipType(r,this.store)
+return!!this._mustSerialize(t)||this._canSerialize(t)&&("manyToNone"===n||"manyToMany"===n)},serialize(e,t){var r={}
+if(t&&t.includeId){var n=e.id
+n&&(r[Ember.get(this,"primaryKey")]=n)}return e.eachAttribute((t,n)=>{this.serializeAttribute(e,r,t,n)}),e.eachRelationship((t,n)=>{"belongsTo"===n.kind?this.serializeBelongsTo(e,r,n):"hasMany"===n.kind&&this.serializeHasMany(e,r,n)}),r},serializeIntoHash(e,t,r,n){Ember.assign(e,this.serialize(r,n))},serializeAttribute(e,t,r,n){if(this._canSerialize(r)){var i=n.type,o=e.attr(r)
+if(i)o=this.transformFor(i).serialize(o,n.options)
+var a=this._getMappedKey(r,e.type)
+a===r&&this.keyForAttribute&&(a=this.keyForAttribute(r,"serialize")),t[a]=o}},serializeBelongsTo(e,t,r){var n=r.key
+if(this._canSerialize(n)){var i=e.belongsTo(n,{id:!0}),o=this._getMappedKey(n,e.type)
+o===n&&this.keyForRelationship&&(o=this.keyForRelationship(n,"belongsTo","serialize")),Ember.isNone(i)?t[o]=null:t[o]=i,r.options.polymorphic&&this.serializePolymorphicType(e,t,r)}},serializeHasMany(e,t,r){var n=r.key
+if(this.shouldSerializeHasMany(e,n,r)){var i=e.hasMany(n,{ids:!0})
+if(void 0!==i){var o=this._getMappedKey(n,e.type)
+o===n&&this.keyForRelationship&&(o=this.keyForRelationship(n,"hasMany","serialize")),t[o]=i}}},serializePolymorphicType(){},extractMeta(e,t,r){if(r&&void 0!==r.meta){var n=r.meta
+return delete r.meta,n}},extractErrors(e,t,r,i){return r&&"object"==typeof r&&r.errors&&(r=(0,n.errorsArrayToHash)(r.errors),this.normalizeUsingDeclaredMapping(t,r),t.eachAttribute(e=>{var t=this.keyForAttribute(e,"deserialize")
+t!==e&&void 0!==r[t]&&(r[e]=r[t],delete r[t])}),t.eachRelationship(e=>{var t=this.keyForRelationship(e,"deserialize")
+t!==e&&void 0!==r[t]&&(r[e]=r[t],delete r[t])})),r},keyForAttribute:e=>e,keyForRelationship:e=>e,keyForLink:e=>e,transformFor(e,t){var r=Ember.getOwner(this).lookup("transform:"+e)
+return r}})
+e.default=o})),define("@ember-data/serializer/rest",["exports","ember-inflector","@ember-data/serializer/json","@ember-data/store","@ember-data/store/-private","@ember-data/serializer/-private"],(function(e,t,r,n,i,o){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"EmbeddedRecordsMixin",{enumerable:!0,get:function(){return o.EmbeddedRecordsMixin}}),e.default=void 0
+var a=r.default.extend({keyForPolymorphicType(e,t,r){return this.keyForRelationship(e)+"Type"},_normalizeArray(e,t,r,n){var i={data:[],included:[]},o=e.modelFor(t),a=e.serializerFor(t)
+return Ember.makeArray(r).forEach(t=>{var{data:r,included:s}=this._normalizePolymorphicRecord(e,t,n,o,a)
+i.data.push(r),s&&i.included.push(...s)}),i},_normalizePolymorphicRecord(e,t,r,n,i){var a=i,s=n
+if(!(0,o.modelHasAttributeOrRelationshipNamedType)(n)&&t.type){var l=this.modelNameFromPayloadKey(t.type)
+e._hasModelFor(l)&&(a=e.serializerFor(l),s=e.modelFor(l))}return a.normalize(s,t,r)},_normalizeResponse(e,t,r,n,o,a){var s={data:null,included:[]},l=this.extractMeta(e,t,r)
+l&&(s.meta=l)
+for(var u=Object.keys(r),c=0,d=u.length;c<d;c++){var h=u[c],f=h,p=!1
+"_"===h.charAt(0)&&(p=!0,f=h.substr(1))
+var m=this.modelNameFromPayloadKey(f)
+if(e._hasModelFor(m)){var v=!p&&this.isPrimaryType(e,m,t),g=r[h]
+if(null!==g)if(!v||Array.isArray(g)){var{data:b,included:y}=this._normalizeArray(e,m,g,h)
+y&&s.included.push(...y),a?b.forEach(e=>{var t=v&&(0,i.coerceId)(e.id)===n
+v&&!n&&!s.data||t?s.data=e:s.included.push(e)}):v?s.data=b:b&&s.included.push(...b)}else{var{data:_,included:w}=this._normalizePolymorphicRecord(e,g,h,t,this)
+s.data=_,w&&s.included.push(...w)}}}return s},isPrimaryType:(e,t,r)=>(0,n.normalizeModelName)(t)===r.modelName,pushPayload(e,t){var r={data:[],included:[]}
+for(var n in t){var i=this.modelNameFromPayloadKey(n)
+if(e._hasModelFor(i)){var o=e.modelFor(i),a=e.serializerFor(o.modelName)
+Ember.makeArray(t[n]).forEach(e=>{var{data:t,included:i}=a.normalize(o,e,n)
+r.data.push(t),i&&r.included.push(...i)})}}e.push(r)},modelNameFromPayloadKey:e=>(0,t.singularize)((0,n.normalizeModelName)(e)),serialize(e,t){return this._super(...arguments)},serializeIntoHash(e,t,r,n){e[this.payloadKeyFromModelName(t.modelName)]=this.serialize(r,n)},payloadKeyFromModelName:e=>Ember.String.camelize(e),serializePolymorphicType(e,t,r){var n=r.key,i=this.keyForPolymorphicType(n,r.type,"serialize"),o=e.belongsTo(n)
+Ember.isNone(o)?t[i]=null:t[i]=Ember.String.camelize(o.modelName)},extractPolymorphicRelationship(e,t,r){var{key:n,resourceHash:i,relationshipMeta:o}=r,a=o.options.polymorphic,s=this.keyForPolymorphicType(n,e,"deserialize")
+return a&&void 0!==i[s]&&"object"!=typeof t?{id:t,type:this.modelNameFromPayloadKey(i[s])}:this._super(...arguments)}})
+var s=a
+e.default=s})),define("@ember-data/serializer/transform",["exports","@ember-data/serializer/-private"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.Transform
+e.default=r}))
+define("@ember-data/store/-private",["exports","require","ember-inflector"],(function(e,t,r){"use strict"
+function n(e){return null==e||""===e?null:"string"==typeof e?e:"symbol"==typeof e?e.toString():""+e}function i(e){var t=null
+if("string"==typeof e?t=e.length>0?e:null:"number"!=typeof e||isNaN(e)||(t=""+e),null===t)throw new Error("Expected id to be a string or number, received "+String(e))
+return t}function o(e){return Ember.String.dasherize(e)}t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t
+var a="undefined"!=typeof Symbol?Symbol:e=>`__${e}${Math.floor(Math.random()*Date.now())}__`
+function s(e){return"string"==typeof e&&e.length>0}var l=new WeakMap
+var u=(()=>{var e="undefined"!=typeof window
+if("undefined"!=typeof FastBoot)return{getRandomValues(e){try{return FastBoot.require("crypto").randomFillSync(e)}catch(t){throw new Error('Using createRecord in Fastboot requires you to add the "crypto" package to "fastbootDependencies" in your package.json')}}}
+if(e&&void 0!==window.crypto)return window.crypto
+if(e&&void 0!==window.msCrypto&&"function"==typeof window.msCrypto.getRandomValues)return window.msCrypto
+throw new Error("ember-data: Cannot find a valid way to generate local identifiers")})()
+for(var c,d,h,f,p=[],m=0;m<256;++m)p[m]=(m+256).toString(16).substr(1)
+function v(){var e,t,r,n=(e=new Uint8Array(16),u.getRandomValues(e))
+return n[6]=15&n[6]|64,n[8]=63&n[8]|128,[(r=p)[(t=n)[0]],r[t[1]],r[t[2]],r[t[3]],"-",r[t[4]],r[t[5]],"-",r[t[6]],r[t[7]],"-",r[t[8]],r[t[9]],"-",r[t[10]],r[t[11]],r[t[12]],r[t[13]],r[t[14]],r[t[15]]].join("")}function g(e){if(s(e.lid))return e.lid
+var{type:t,id:r}=e
+return s(r)?`@ember-data:lid-${o(t)}-${r}`:v()}var b=new WeakMap
+function y(e){var t=b.get(e)
+return void 0===t&&(t=new w,b.set(e,t)),t}function _(){}class w{constructor(){this._cache={lids:Object.create(null),types:Object.create(null)},this._generate=void 0,this._update=void 0,this._forget=void 0,this._reset=void 0,this._merge=void 0,this._generate=d||g,this._update=f||_,this._forget=c||_,this._reset=h||_,this._merge=_}__configureMerge(e){this._merge=e||_}_getRecordIdentifier(e,t=!1){if(function(e){return l.has(e)}(e))return e
+var r=n(e.lid),i=null!==r?this._cache.lids[r]:void 0
+if(void 0!==i)return i
+var a=o(e.type),s=n(e.id)
+if(!1!==t||a&&s){var u=E(this._cache.types,a)
+if(null!==r&&(i=u.lid[r]),void 0===i&&null!==s&&(i=u.id[s]),void 0===i){var c=this._generate(e,"record")
+if(null!==r&&c!==r)throw new Error("You should not change the <lid> of a RecordIdentifier")
+null===r&&(i=u.lid[c]),!0===t&&(void 0===i&&(i=x(s,a,c,"record",!1),this._cache.lids[i.lid]=i,u.lid[i.lid]=i,u._allIdentifiers.push(i)),null!==i.id&&(u.id[i.id]=i))}return i}}peekRecordIdentifier(e){return this._getRecordIdentifier(e,!1)}getOrCreateRecordIdentifier(e){return this._getRecordIdentifier(e,!0)}createIdentifierForNewRecord(e){var t=this._generate(e,"record"),r=x(e.id||null,e.type,t,"record",!0),n=E(this._cache.types,e.type)
+return this._cache.lids[r.lid]=r,n.lid[t]=r,n._allIdentifiers.push(r),r}updateRecordIdentifier(e,t){var r=this.getOrCreateRecordIdentifier(e),i=r.id,a=n(t.id),s=E(this._cache.types,r.type),l=function(e,t,r,n,i){var{id:a,type:s,lid:l}=t
+if(null!==a&&a!==n&&null!==n){var u=E(e,t.type).id[n]
+return void 0!==u&&u}var c=r.type&&o(r.type)
+if(null!==a&&a===n&&c===s&&r.lid&&r.lid!==l){var d=i[r.lid]
+return void 0!==d&&d}if(null!==a&&a===n&&c&&c!==s&&r.lid&&r.lid===l){var h=E(e,c).id[a]
+return void 0!==h&&h}return!1}(this._cache.types,r,t,a,this._cache.lids)
+if(l&&(r=this._mergeRecordIdentifiers(s,r,l,t,a)),i=r.id,function(e,t,r){var{id:i,lid:a}=t
+t.type&&o(t.type)
+r(e,t,"record"),void 0!==i&&(e.id=n(i))}(r,t,this._update),i!==(a=r.id)&&null!==a){var u=E(this._cache.types,r.type)
+u.id[a]=r,null!==i&&delete u.id[i]}return r}_mergeRecordIdentifiers(e,t,r,n,i){var o=this._merge(t,r,n),a=o===t?r:t
+return this.forgetRecordIdentifier(a),e.id[i]=o,E(this._cache.types,r.type).id[i]=o,n.lid=o.lid,o}forgetRecordIdentifier(e){var t=this.getOrCreateRecordIdentifier(e),r=E(this._cache.types,t.type)
+null!==t.id&&delete r.id[t.id],delete this._cache.lids[t.lid],delete r.lid[t.lid]
+var n=r._allIdentifiers.indexOf(t)
+r._allIdentifiers.splice(n,1),function(e){l.delete(e)}(e),this._forget(t,"record")}destroy(){this._reset()}}function E(e,t){var r=e[t]
+return void 0===r&&(r={lid:Object.create(null),id:Object.create(null),_allIdentifiers:[]},e[t]=r),r}function x(e,t,r){var n,i={lid:r,id:e,type:t}
+return n=i,l.set(n,"is-identifier"),i}function O(e,t,r){var i=n(t)
+if(!s(i)){if(s(r))return{type:e,id:i,lid:r}
+throw new Error("Expected either id or lid to be a valid string")}return s(r)?{type:e,id:i,lid:r}:{type:e,id:i}}var S=Ember.ArrayProxy.extend(Ember.PromiseProxyMixin,{meta:Ember.computed.reads("content.meta")}),T=Ember.ObjectProxy.extend(Ember.PromiseProxyMixin)
+function M(e,t){return T.create({promise:Ember.RSVP.Promise.resolve(e,t)})}function A(e,t){return S.create({promise:Ember.RSVP.Promise.resolve(e,t)})}function P(e,t){return M(e.then(e=>e.getRecord()),t)}var C,k=new Ember._Backburner(["normalizeRelationships","syncRelationships","finished"]),R=/^\/?data\/(attributes|relationships)\/(.*)/,j=/^\/?data/
+function D(e){var t={}
+return Ember.isPresent(e)&&e.forEach(e=>{if(e.source&&e.source.pointer){var r=e.source.pointer.match(R)
+r?r=r[2]:-1!==e.source.pointer.search(j)&&(r="base"),r&&(t[r]=t[r]||[],t[r].push(e.detail||e.title))}}),t}function N(e){return(e._internalModel||e.internalModel||e)._recordData||null}function I(e,t){return function(e){return e._internalModel._recordData._relationships}(e).get(t)}(function(e){e.pending="pending",e.fulfilled="fulfilled",e.rejected="rejected"})(C||(C={}))
+class L{constructor(e,t,r){this._store=r,this.__attributes=null,this._belongsToRelationships=Object.create(null),this._belongsToIds=Object.create(null),this._hasManyRelationships=Object.create(null),this._hasManyIds=Object.create(null),this._internalModel=void 0,this._changedAttributes=void 0,this.identifier=void 0,this.modelName=void 0,this.id=void 0,this.include=void 0,this.adapterOptions=void 0
+var n=this._internalModel=r._internalModelForResource(t)
+this.modelName=t.type,n.hasRecord&&this._attributes,this.id=t.id,this.adapterOptions=e.adapterOptions,this.include=e.include,this.modelName=n.modelName,n.hasRecord&&(this._changedAttributes=N(n).changedAttributes())}get record(){return this._internalModel.getRecord()}get _attributes(){if(null!==this.__attributes)return this.__attributes
+var e=this.record,t=this.__attributes=Object.create(null)
+return Object.keys(this._store._attributesDefinitionFor(this.modelName)),e.eachAttribute(r=>t[r]=Ember.get(e,r)),t}get type(){return this._internalModel.modelClass}get isNew(){throw new Error("isNew is only available when custom model class ff is on")}attr(e){if(e in this._attributes)return this._attributes[e]}attributes(){return Ember.assign({},this._attributes)}changedAttributes(){var e=Object.create(null)
+if(!this._changedAttributes)return e
+for(var t=Object.keys(this._changedAttributes),r=0,n=t.length;r<n;r++){var i=t[r]
+e[i]=this._changedAttributes[i].slice()}return e}belongsTo(e,t){var r,n,i=!(!t||!t.id),o=this._internalModel.store
+if(!0===i&&e in this._belongsToIds)return this._belongsToIds[e]
+if(!1===i&&e in this._belongsToRelationships)return this._belongsToRelationships[e]
+o._relationshipMetaFor(this.modelName,null,e)
+var a=I(this,e).getData(),s=a&&a.data
+return r=s?o._internalModelForResource(s):null,a&&void 0!==a.data&&(n=r&&!r.isDeleted()?i?r.id:r.createSnapshot():null),i?this._belongsToIds[e]=n:this._belongsToRelationships[e]=n,n}hasMany(e,t){var r,n=!(!t||!t.ids),i=this._hasManyIds[e],o=this._hasManyRelationships[e]
+if(!0===n&&e in this._hasManyIds)return i
+if(!1===n&&e in this._hasManyRelationships)return o
+var a=this._internalModel.store,s=(a._relationshipMetaFor(this.modelName,null,e),I(this,e).getData())
+return s.data&&(r=[],s.data.forEach(e=>{var t=a._internalModelForResource(e)
+t.isDeleted()||(n?r.push(e.id):r.push(t.createSnapshot()))})),n?this._hasManyIds[e]=r:this._hasManyRelationships[e]=r,r}eachAttribute(e,t){this.record.eachAttribute(e,t)}eachRelationship(e,t){this.record.eachRelationship(e,t)}serialize(e){return this._store.serializerFor(this.modelName).serialize(this,e)}}function F(e,...t){return function(){return e.apply(void 0,t)}}function z(e,t){var r=e.finally(()=>{t()||(r._subscribers.length=0)})
+return r}function U(e){return!(Ember.get(e,"isDestroyed")||Ember.get(e,"isDestroying"))}function H(e,t,r){return z(Ember.RSVP.resolve(e,r).then(()=>e),()=>U(t))}function B(e,t,r,n,i,o){return e.normalizeResponse(t,r,n,i,o)}Ember.run.backburner
+class V{constructor(e){this.modelName=e,this._idToModel=Object.create(null),this._models=[],this._metadata=null}get(e){return this._idToModel[e]||null}has(e){return!!this._idToModel[e]}get length(){return this._models.length}set(e,t){this._idToModel[e]=t}add(e,t){t&&(this._idToModel[t]=e),this._models.push(e)}remove(e,t){delete this._idToModel[t]
+var r=this._models.indexOf(e);-1!==r&&this._models.splice(r,1)}contains(e){return-1!==this._models.indexOf(e)}get models(){return this._models}get metadata(){return this._metadata||(this._metadata=Object.create(null))}clear(){var e=this._models
+this._models=[]
+for(var t=0;t<e.length;t++){e[t].unloadRecord()}this._metadata=null}}class ${constructor(){this._map=Object.create(null)}retrieve(e){var t=this._map[e]
+return void 0===t&&(t=this._map[e]=new V(e)),t}clear(){for(var e=this._map,t=Object.keys(e),r=0;r<t.length;r++){e[t[r]].clear()}}}var q=new WeakMap,W=new WeakMap
+function G(e){var t=q.get(e)
+return void 0===t&&(t=new Y(e),q.set(e,t)),t}class Y{constructor(e){this.store=e,this._identityMap=void 0,this._newlyCreated=void 0,this.identifierCache=void 0,this.identifierCache=y(e),this.identifierCache.__configureMerge((e,t,r)=>{var n=e
+e.id!==t.id?n=e.id===r.id?e:t:e.type!==t.type&&(n=e.type===r.type?e:t)
+var i=e===n?t:e,o=this.modelMapFor(e.type),a=o.get(n.lid),s=o.get(i.lid)
+if(a&&s&&a.hasRecord&&s.hasRecord)throw new Error(`Failed to update the 'id' for the RecordIdentifier '${e}' to '${r.id}', because that id is already in use by '${t}'`)
+return s&&o.remove(s,i.lid),null===a&&null===s||(null===a&&null!==s||a&&!a.hasRecord&&s&&s.hasRecord)&&(a&&o.remove(a,n.lid),(a=s)._id=n.id,o.add(a,n.lid)),n}),this._identityMap=new $}lookup(e,t){void 0!==t&&this.identifierCache.getOrCreateRecordIdentifier(t)
+var r=this.identifierCache.getOrCreateRecordIdentifier(e),n=this.peek(r)
+return n?(n.hasScheduledDestroy()&&n.cancelDestroy(),n):this._build(r,!1)}peek(e){return this.modelMapFor(e.type).get(e.lid)}getByResource(e){var t=O(e.type,e.id,e.lid)
+return this.lookup(t)}setRecordId(e,t,r){var n={type:e,id:null,lid:r},i=this.identifierCache.getOrCreateRecordIdentifier(n),o=this.peek(i)
+if(null===o)throw new Error(`Cannot set the id ${t} on the record ${e}:${r} as there is no such record in the cache.`)
+var a=o.id,s=o.modelName
+if(null===a||null!==t){this.peekById(s,t)
+null===i.id&&this.identifierCache.updateRecordIdentifier(i,{type:e,id:t}),o.setId(t)}}peekById(e,t){var r=this.identifierCache.peekRecordIdentifier({type:e,id:t}),n=r?this.modelMapFor(e).get(r.lid):null
+return n&&n.hasScheduledDestroy()&&(n.destroySync(),n=null),n}build(e){return this._build(e,!0)}_build(e,t=!1){if(!0===t&&e.id)this.peekById(e.type,e.id)
+var r,{identifierCache:n}=this
+r=!0===t?n.createIdentifierForNewRecord(e):e
+var i=new we(this.store,r)
+return this.modelMapFor(e.type).add(i,r.lid),i}remove(e){var t=this.modelMapFor(e.modelName),r=e.identifier.lid
+t.remove(e,r)
+var{identifier:n}=e
+this.identifierCache.forgetRecordIdentifier(n)}modelMapFor(e){return this._identityMap.retrieve(e)}_newlyCreatedModelsFor(e){return this._newlyCreated.retrieve(e)}clear(e){void 0===e?this._identityMap.clear():this.modelMapFor(e).clear()}}function K(e){return e&&e.links&&e.links.related}var J=new WeakMap
+class Q{constructor(e,t){this.store=e,this.recordData=void 0,J.set(this,t)}_resource(){}remoteType(){return K(this._resource())?"link":"id"}link(){var e,t=this._resource()
+return K(t)&&t.links&&(e=(e=t.links.related)&&"string"!=typeof e?e.href:e),e||null}meta(){var e=null,t=this._resource()
+return t&&t.meta&&"object"==typeof t.meta&&(e=t.meta),e}}Q.prototype.links=function(){var e=this._resource()
+return e&&e.links?e.links:null},Object.defineProperty(Q.prototype,"internalModel",{get(){return J.get(this)}})
+class X extends Q{constructor(e,t,r,n){super(e,t),this.key=n,this.belongsToRelationship=r,this.type=r.relationshipMeta.type,this.parent=t.recordReference,this.parentInternalModel=t}id(){var e=null,t=this._resource()
+return t&&t.data&&(e=t.data.id),e}_resource(){var e
+return null===(e=J.get(this))||void 0===e?void 0:e._recordData.getBelongsTo(this.key)}push(e){return Ember.RSVP.resolve(e).then(e=>{var t
+return t=function(e){return W.get(e)}(e)?e:this.store.push(e),this.belongsToRelationship.setCanonicalRecordData(N(t)),t})}value(){var e=this.parentInternalModel.store,t=this._resource()
+if(t&&t.data){var r=e._internalModelForResource(t.data)
+if(r&&r.isLoaded())return r.getRecord()}return null}load(e){return this.parentInternalModel.getBelongsTo(this.key,e)}reload(e){return this.parentInternalModel.reloadBelongsTo(this.key,e).then(()=>this.value())}}class Z extends Q{constructor(e,t,r,n){super(e,t),this.key=n,this.hasManyRelationship=r,this.type=r.relationshipMeta.type,this.parent=t.recordReference,this.parentInternalModel=t}_resource(){var e
+return null===(e=J.get(this))||void 0===e?void 0:e._recordData.getHasMany(this.key)}remoteType(){var e=this._resource()
+return e&&e.links&&e.links.related?"link":"ids"}ids(){var e=this._resource(),t=[]
+return e.data&&(t=e.data.map(e=>e.id)),t}push(e){return Ember.RSVP.resolve(e).then(e=>{var t=e
+"object"==typeof e&&e.data&&(t=e.data)
+var r=J.get(this),n=t.map(e=>N(this.store.push(e)))
+return this.hasManyRelationship.computeChanges(n),r.getHasMany(this.hasManyRelationship.key)})}_isLoaded(){return!!this.hasManyRelationship.hasAnyRelationshipData&&this.hasManyRelationship.members.toArray().every(e=>!0===this.parentInternalModel.store._internalModelForResource(e.getResourceIdentifier()).isLoaded())}value(){var e=J.get(this)
+return this._isLoaded()?e.getManyArray(this.key):null}load(e){return J.get(this).getHasMany(this.key,e)}reload(e){return J.get(this).reloadHasMany(this.key,e)}}class ee extends Q{get type(){return J.get(this).modelName}get _id(){return J.get(this).id}id(){return this._id}remoteType(){return"identity"}push(e){return Ember.RSVP.resolve(e).then(e=>this.store.push(e))}value(){if(null!==this._id){var e=J.get(this)
+if(e&&e.isLoaded())return e.getRecord()}return null}load(){if(null!==this._id)return this.store.findRecord(this.type,this._id)
+throw new Error(`Unable to fetch record of type ${this.type} without an id`)}reload(){if(null!==this._id)return this.store.findRecord(this.type,this._id,{reload:!0})
+throw new Error(`Unable to fetch record of type ${this.type} without an id`)}}function te(e,t){t.isDirty?e.send("becomeDirty"):e.send("propertyWasReset")}var re={initialState:"uncommitted",isDirty:!0,uncommitted:{didSetProperty:te,loadingData(){},propertyWasReset(e,t){e.hasChangedAttributes()||e.send("rolledBack")},pushedData(e){e.hasChangedAttributes()||e.transitionTo("loaded.saved")},becomeDirty(){},willCommit(e){e.transitionTo("inFlight")},reloadRecord(e,{resolve:t,options:r}){t(e.store._reloadRecord(e,r))},rolledBack(e){e.transitionTo("loaded.saved"),e.triggerLater("rolledBack")},becameInvalid(e){e.transitionTo("invalid")},rollback(e){e.rollbackAttributes(),e.triggerLater("ready")}},inFlight:{isSaving:!0,didSetProperty:te,becomeDirty(){},pushedData(){},unloadRecord:le,willCommit(){},didCommit(e){e.transitionTo("saved"),e.send("invokeLifecycleCallbacks",this.dirtyType)},rolledBack(e){e.triggerLater("rolledBack")},becameInvalid(e){e.transitionTo("invalid"),e.send("invokeLifecycleCallbacks")},becameError(e){e.transitionTo("uncommitted"),e.triggerLater("becameError",e)}},invalid:{isValid:!1,deleteRecord(e){e.transitionTo("deleted.uncommitted")},didSetProperty(e,t){e.removeErrorMessageFromAttribute(t.name),te(e,t),e.hasErrors()||this.becameValid(e)},becameInvalid(){},becomeDirty(){},pushedData(){},willCommit(e){e.clearErrorMessages(),e.transitionTo("inFlight")},rolledBack(e){e.clearErrorMessages(),e.transitionTo("loaded.saved"),e.triggerLater("ready")},becameValid(e){e.transitionTo("uncommitted")},invokeLifecycleCallbacks(e){e.triggerLater("becameInvalid",e)}}}
+function ne(e,t){for(var r in t)e[r]=t[r]
+return e}function ie(e){return ne(function e(t){var r,n={}
+for(var i in t)r=t[i],n[i]=r&&"object"==typeof r?e(r):r
+return n}(re),e)}var oe=ie({dirtyType:"created",isNew:!0,setup(e){e.updateRecordArrays()}})
+oe.invalid.rolledBack=function(e){e.transitionTo("deleted.saved"),e.triggerLater("rolledBack")},oe.uncommitted.rolledBack=function(e){e.transitionTo("deleted.saved"),e.triggerLater("rolledBack")}
+var ae=ie({dirtyType:"updated"})
+function se(e){e.transitionTo("deleted.saved"),e.send("invokeLifecycleCallbacks")}function le(){}oe.uncommitted.deleteRecord=se,oe.invalid.deleteRecord=se,oe.uncommitted.rollback=function(e){re.uncommitted.rollback.apply(this,arguments),e.transitionTo("deleted.saved")},oe.uncommitted.pushedData=function(e){e.transitionTo("loaded.updated.uncommitted"),e.triggerLater("didLoad")},oe.uncommitted.propertyWasReset=function(){},ae.invalid.becameValid=function(e){e.transitionTo("loaded.saved")},ae.inFlight.unloadRecord=le,ae.uncommitted.deleteRecord=function(e){e.transitionTo("deleted.uncommitted")},ae.invalid.rolledBack=function(e){e.clearErrorMessages(),e.transitionTo("loaded.saved"),e.triggerLater("rolledBack")}
+var ue=function e(t,r,n){for(var i in(t=ne(r?Object.create(r):{},t)).parentState=r,t.stateName=n,t)Object.prototype.hasOwnProperty.call(t,i)&&"parentState"!==i&&"stateName"!==i&&"object"==typeof t[i]&&(t[i]=e(t[i],t,n+"."+i))
+return t}({isEmpty:!1,isLoading:!1,isLoaded:!1,isDirty:!1,isSaving:!1,isDeleted:!1,isNew:!1,isValid:!0,rolledBack(){},unloadRecord(e){},propertyWasReset(){},empty:{isEmpty:!0,loadingData(e,t){e._promiseProxy=t,e.transitionTo("loading")},loadedData(e){e.transitionTo("loaded.created.uncommitted"),e.triggerLater("ready")},pushedData(e){e.transitionTo("loaded.saved"),e.triggerLater("didLoad"),e.triggerLater("ready")},notFound(){}},loading:{isLoading:!0,exit(e){e._promiseProxy=null},loadingData(){},pushedData(e){e.transitionTo("loaded.saved"),e.triggerLater("didLoad"),e.triggerLater("ready"),e.didCleanError()},becameError(e){e.triggerLater("becameError",e)},notFound(e){e.transitionTo("empty")}},loaded:{initialState:"saved",isLoaded:!0,loadingData(){},saved:{setup(e){e.hasChangedAttributes()&&e.adapterDidDirty()},didSetProperty:te,pushedData(){},becomeDirty(e){e.transitionTo("updated.uncommitted")},willCommit(e){e.transitionTo("updated.inFlight")},reloadRecord(e,{resolve:t,options:r}){t(e.store._reloadRecord(e,r))},deleteRecord(e){e.transitionTo("deleted.uncommitted")},unloadRecord(e){},didCommit(){},notFound(){}},created:oe,updated:ae},deleted:{initialState:"uncommitted",dirtyType:"deleted",isDeleted:!0,isLoaded:!0,isDirty:!0,setup(e){e.updateRecordArrays()},uncommitted:{willCommit(e){e.transitionTo("inFlight")},rollback(e){e.rollbackAttributes(),e.triggerLater("ready")},pushedData(){},becomeDirty(){},deleteRecord(){},rolledBack(e){e.transitionTo("loaded.saved"),e.triggerLater("ready"),e.triggerLater("rolledBack")}},inFlight:{isSaving:!0,unloadRecord:le,willCommit(){},didCommit(e){e.transitionTo("saved"),e.send("invokeLifecycleCallbacks")},becameError(e){e.transitionTo("uncommitted"),e.triggerLater("becameError",e)},becameInvalid(e){e.transitionTo("invalid"),e.triggerLater("becameInvalid",e)}},saved:{isDirty:!1,setup(e){e.removeFromInverseRelationships()},invokeLifecycleCallbacks(e){e.triggerLater("didDelete",e),e.triggerLater("didCommit",e)},willCommit(){},didCommit(){},pushedData(){}},invalid:{isValid:!1,didSetProperty(e,t){e.removeErrorMessageFromAttribute(t.name),te(e,t),e.hasErrors()||this.becameValid(e)},becameInvalid(){},becomeDirty(){},deleteRecord(){},willCommit(){},rolledBack(e){e.clearErrorMessages(),e.transitionTo("loaded.saved"),e.triggerLater("ready")},becameValid(e){e.transitionTo("uncommitted")}}},invokeLifecycleCallbacks(e,t){"created"===t?e.triggerLater("didCreate",e):e.triggerLater("didUpdate",e),e.triggerLater("didCommit",e)}},null,"root")
+function ce(e,t){return function(e){return N(e)._relationships}(e).get(t)}var de,he,fe,pe,{hasOwnProperty:me}=Object.prototype,ve=!1
+pe=function(){if(!ve){var e=require("@ember-data/model/-private");({ManyArray:de,PromiseBelongsTo:he,PromiseManyArray:fe}=e),de&&he&&fe&&(ve=!0)}return ve}
+var ge=Object.create(null),be=Object.create(null),ye=Object.create(null)
+function _e(e){return ye[e]||(ye[e]=e.split("."))}class we{constructor(e,t){this.store=e,this.identifier=t,this._id=void 0,this._tag=0,this.modelName=void 0,this.clientId=void 0,this.__recordData=void 0,this._isDestroyed=void 0,this.isError=void 0,this._pendingRecordArrayManagerFlush=void 0,this._isDematerializing=void 0,this.isReloading=void 0,this._doNotDestroy=void 0,this.isDestroying=void 0,this._promiseProxy=void 0,this._record=void 0,this._scheduledDestroy=void 0,this._modelClass=void 0,this.__deferredTriggers=void 0,this.__recordArrays=void 0,this._references=void 0,this._recordReference=void 0,this._manyArrayCache=Object.create(null),this._retainedManyArrayCache=Object.create(null),this._relationshipPromisesCache=Object.create(null),this._relationshipProxyCache=Object.create(null),this.currentState=void 0,this.error=void 0,pe(),this._id=t.id
+this.modelName=t.type,this.clientId=t.lid,this.__recordData=null,this[Ember.GUID_KEY]=t.lid,this._promiseProxy=null,this._record=null,this._isDestroyed=!1,this.isError=!1,this._pendingRecordArrayManagerFlush=!1,this._isDematerializing=!1,this._scheduledDestroy=null,this.resetRecord(),this._modelClass=null,this.__deferredTriggers=null,this.__recordArrays=null,this._references=null,this._recordReference=null}get id(){return this.identifier.id}set id(e){if(e!==this._id){var t={type:this.identifier.type,lid:this.identifier.lid,id:e}
+y(this.store).updateRecordIdentifier(this.identifier,t),Ember.set(this,"_tag",this._tag+1)}}get modelClass(){if(this.store.modelFor)return this._modelClass||(this._modelClass=this.store.modelFor(this.modelName))}get type(){return this.modelClass}get recordReference(){return null===this._recordReference&&(this._recordReference=new ee(this.store,this)),this._recordReference}get _recordData(){if(null===this.__recordData){var e=this.store._createRecordData(this.identifier)
+return this._recordData=e,e}return this.__recordData}set _recordData(e){this.__recordData=e}get _recordArrays(){return null===this.__recordArrays&&(this.__recordArrays=new Set),this.__recordArrays}get references(){return null===this._references&&(this._references=Object.create(null)),this._references}get _deferredTriggers(){return null===this.__deferredTriggers&&(this.__deferredTriggers=[]),this.__deferredTriggers}isHiddenFromRecordArrays(){return!!this.isEmpty()||(e="root.deleted.saved"===this.currentState.stateName,this._isDematerializing||this.hasScheduledDestroy()||this.isDestroyed||e)
+var e}_isRecordFullyDeleted(){return!1}isRecordInUse(){var e=this._record
+return e&&!(e.get("isDestroyed")||e.get("isDestroying"))}isEmpty(){return this.currentState.isEmpty}isLoading(){return this.currentState.isLoading}isLoaded(){return this.currentState.isLoaded}hasDirtyAttributes(){return this.currentState.hasDirtyAttributes}isSaving(){return this.currentState.isSaving}isDeleted(){return this.currentState.isDeleted}isNew(){return this.currentState.isNew}isValid(){return this.currentState.isValid}dirtyType(){return this.currentState.dirtyType}getRecord(e){if(!this._record&&!this._isDematerializing){var{store:t}=this,r={store:t,_internalModel:this,currentState:this.currentState}
+if(r.isError=this.isError,r.adapterError=this.error,void 0!==e){if("id"in e){var i=n(e.id)
+null!==i&&this.setId(i)}var o=t._relationshipsDefinitionFor(this.modelName)
+if(null!==o)for(var a,s=Object.keys(e),l=0;l<s.length;l++){var u=s[l],c=o[u]
+void 0!==c&&(a="hasMany"===c.kind?xe(e[u]):Oe(e[u]),e[u]=a)}}var d=this._recordData._initRecordCreateOptions(e)
+Ember.assign(r,d),Ember.setOwner(r,Ember.getOwner(t)),this._record=t._modelFactoryFor(this.modelName).create(r),h=this._record,f=this.identifier,W.set(h,f),this._triggerDeferredTriggers()}var h,f
+return this._record}resetRecord(){this._record=null,this.isReloading=!1,this.error=null,this.currentState=ue.empty}dematerializeRecord(){this._isDematerializing=!0,this._doNotDestroy=!1,this._record&&(this._record.destroy(),Object.keys(this._relationshipProxyCache).forEach(e=>{this._relationshipProxyCache[e].destroy&&this._relationshipProxyCache[e].destroy(),delete this._relationshipProxyCache[e]}),Object.keys(this._manyArrayCache).forEach(e=>{var t=this._retainedManyArrayCache[e]=this._manyArrayCache[e]
+delete this._manyArrayCache[e],t&&!t._inverseIsAsync&&t.clear()})),this._recordData.unloadRecord(),this.resetRecord(),this.updateRecordArrays()}deleteRecord(){this.send("deleteRecord")}save(e){var t="DS: Model#save "+this,r=Ember.RSVP.defer(t)
+return this.store.scheduleSave(this,r,e),r.promise}startedReloading(){this.isReloading=!0,this.hasRecord&&Ember.set(this._record,"isReloading",!0)}finishedReloading(){this.isReloading=!1,this.hasRecord&&Ember.set(this._record,"isReloading",!1)}reload(e){this.startedReloading()
+var t=this,r="DS: Model#reload of "+this
+return new Ember.RSVP.Promise((function(r){t.send("reloadRecord",{resolve:r,options:e})}),r).then((function(){return t.didCleanError(),t}),(function(e){throw t.didError(e),e}),"DS: Model#reload complete, update flags").finally((function(){t.finishedReloading()}))}unloadRecord(){this.isDestroyed||(this.send("unloadRecord"),this.dematerializeRecord(),null===this._scheduledDestroy&&(this._scheduledDestroy=Ember.run.backburner.schedule("destroy",this,"_checkForOrphanedInternalModels")))}hasScheduledDestroy(){return!!this._scheduledDestroy}cancelDestroy(){this._doNotDestroy=!0,this._isDematerializing=!1,Ember.run.cancel(this._scheduledDestroy),this._scheduledDestroy=null}destroySync(){this._isDematerializing&&this.cancelDestroy(),this._checkForOrphanedInternalModels(),this.isDestroyed||this.isDestroying||this.destroy()}_checkForOrphanedInternalModels(){this._isDematerializing=!1,this._scheduledDestroy=null,this.isDestroyed}eachRelationship(e,t){return this.modelClass.eachRelationship(e,t)}_findBelongsTo(e,t,r,n){return this.store._findBelongsToByJsonApiResource(t,this,r,n).then(r=>Ee(this,e,t._relationship,r,null),r=>Ee(this,e,t._relationship,null,r))}getBelongsTo(e,t){var r=this._recordData.getBelongsTo(e),n=r&&r.data?y(this.store).getOrCreateRecordIdentifier(r.data):null,i=this.store._relationshipMetaFor(this.modelName,null,e),o=this.store,a=i.options.async,s=void 0===a||a,l={key:e,store:o,originatingInternalModel:this,modelName:i.type}
+if(s){var u=null!==n?o._internalModelForResource(n):null
+if(r._relationship.hasFailedLoadAttempt)return this._relationshipProxyCache[e]
+var c=this._findBelongsTo(e,r,i,t)
+return this._updatePromiseProxyFor("belongsTo",e,{promise:c,content:u?u.getRecord():null,_belongsToState:l})}return null===n?null:o._internalModelForResource(n).getRecord()}getManyArray(e,t=!1){var r=this.store._relationshipMetaFor(this.modelName,null,e),n=this._recordData.getHasMany(e),i=this._manyArrayCache[e]
+if(!i){var o=this.store._getHasManyByJsonApiResource(n),a=!!n._relationship&&n._relationship._inverseIsAsync()
+i=de.create({store:this.store,type:this.store.modelFor(r.type),recordData:this._recordData,meta:n.meta,links:n.links,key:e,isPolymorphic:r.options.polymorphic,initialState:o.slice(),_inverseIsAsync:a,internalModel:this,isLoaded:!t}),this._manyArrayCache[e]=i}return this._retainedManyArrayCache[e]&&(this._retainedManyArrayCache[e].destroy(),delete this._retainedManyArrayCache[e]),i}fetchAsyncHasMany(e,t,r,n,i){var o=this._relationshipPromisesCache[e]
+return o||(o=this.store._findHasManyByJsonApiResource(r,this,t,i).then(()=>(n.retrieveLatest(),n.set("isLoaded",!0),n)).then(t=>Ee(this,e,r._relationship,t,null),t=>Ee(this,e,r._relationship,null,t)),this._relationshipPromisesCache[e]=o,o)}getHasMany(e,t){var r=this._recordData.getHasMany(e),n=this.store._relationshipMetaFor(this.modelName,null,e),i=n.options.async,o=void 0===i||i,a=this.getManyArray(e,o)
+if(o){if(r._relationship.hasFailedLoadAttempt)return this._relationshipProxyCache[e]
+var s=this.fetchAsyncHasMany(e,n,r,a,t)
+return this._updatePromiseProxyFor("hasMany",e,{promise:s,content:a})}return a}_updatePromiseProxyFor(e,t,r){var n=this._relationshipProxyCache[t]
+if(n)void 0!==r.content&&n.set("content",r.content),n.set("promise",r.promise)
+else{var i="hasMany"===e?fe:he
+this._relationshipProxyCache[t]=i.create(r)}return this._relationshipProxyCache[t]}reloadHasMany(e,t){var r=this._relationshipPromisesCache[e]
+if(r)return r
+var n=this._recordData.getHasMany(e)
+n._relationship&&(n._relationship.setHasFailedLoadAttempt(!1),n._relationship.setShouldForceReload(!0))
+var i=this.store._relationshipMetaFor(this.modelName,null,e),o=this.getManyArray(e),a=this.fetchAsyncHasMany(e,i,n,o,t)
+return this._relationshipProxyCache[e]?this._updatePromiseProxyFor("hasMany",e,{promise:a}):a}reloadBelongsTo(e,t){var r=this._relationshipPromisesCache[e]
+if(r)return r
+var n=this._recordData.getBelongsTo(e)
+n._relationship&&(n._relationship.setHasFailedLoadAttempt(!1),n._relationship.setShouldForceReload(!0))
+var i=this.store._relationshipMetaFor(this.modelName,null,e),o=this._findBelongsTo(e,n,i,t)
+return this._relationshipProxyCache[e]?this._updatePromiseProxyFor("belongsTo",e,{promise:o}):o}destroyFromRecordData(){this._doNotDestroy?this._doNotDestroy=!1:this.destroy()}destroy(){this.isDestroying=!0,Object.keys(this._retainedManyArrayCache).forEach(e=>{this._retainedManyArrayCache[e].destroy(),delete this._retainedManyArrayCache[e]}),G(this.store).remove(this),this._isDestroyed=!0}eachAttribute(e,t){return this.modelClass.eachAttribute(e,t)}inverseFor(e){return this.modelClass.inverseFor(e)}setupData(e){var t=this._recordData.pushData(e,this.hasRecord)
+this.hasRecord&&this._record._notifyProperties(t),this.pushedData()}getAttributeValue(e){return this._recordData.getAttr(e)}setDirtyHasMany(e,t){return this._recordData.setDirtyHasMany(e,xe(t))}setDirtyBelongsTo(e,t){return this._recordData.setDirtyBelongsTo(e,Oe(t))}setDirtyAttribute(e,t){if(this.isDeleted())throw new Ember.Error(`Attempted to set '${e}' to '${t}' on the deleted record ${this}`)
+if(this.getAttributeValue(e)!==t){this._recordData.setDirtyAttribute(e,t)
+var r=this._recordData.isAttrDirty(e)
+this.send("didSetProperty",{name:e,isDirty:r})}return t}get isDestroyed(){return this._isDestroyed}get hasRecord(){return!!this._record}createSnapshot(e){return new L(e||{},this.identifier,this.store)}loadingData(e){this.send("loadingData",e)}loadedData(){this.send("loadedData")}notFound(){this.send("notFound")}pushedData(){this.send("pushedData")}hasChangedAttributes(){return!(this.isLoading()&&!this.isReloading)&&this._recordData.hasChangedAttributes()}changedAttributes(){return this.isLoading()&&!this.isReloading?{}:this._recordData.changedAttributes()}adapterWillCommit(){this._recordData.willCommit(),this.send("willCommit")}adapterDidDirty(){this.send("becomeDirty")}send(e,t){var r=this.currentState
+return r[e]||this._unhandledEvent(r,e,t),r[e](this,t)}manyArrayRecordAdded(e){this.hasRecord&&this._record.notifyHasManyAdded(e)}notifyHasManyChange(e){if(this.hasRecord){var t=this._manyArrayCache[e]
+t&&t.retrieveLatest()}}notifyBelongsToChange(e){this.hasRecord&&this._record.notifyBelongsToChange(e,this._record)}hasManyRemovalCheck(e){var t=this._manyArrayCache[e]||this._retainedManyArrayCache[e],r=!1
+return t&&(r=t.removeUnloadedInternalModel(),this._manyArrayCache[e]&&r&&(this._retainedManyArrayCache[e]=this._manyArrayCache[e],delete this._manyArrayCache[e])),r}notifyPropertyChange(e){this.hasRecord&&this._record.notifyPropertyChange(e)
+var t=this._manyArrayCache[e]||this._retainedManyArrayCache[e]
+if(t){var r=t.removeUnloadedInternalModel()
+this._manyArrayCache[e]&&r&&(this._retainedManyArrayCache[e]=this._manyArrayCache[e],delete this._manyArrayCache[e])}}notifyStateChange(e){this.hasRecord&&(e&&"isNew"!==e||this.getRecord().notifyPropertyChange("isNew"),e&&"isDeleted"!==e||this.getRecord().notifyPropertyChange("isDeleted")),e&&"isDeletionCommitted"!==e||this.updateRecordArrays()}didCreateRecord(){this._recordData.clientDidCreate()}rollbackAttributes(){var e=this._recordData.rollbackAttributes()
+Ember.get(this,"isError")&&this.didCleanError(),this.send("rolledBack"),this._record&&e&&e.length>0&&this._record._notifyProperties(e)}transitionTo(e){var t,r,n,i,o=function(e){return be[e]||(be[e]=_e(e)[0])}(e),a=this.currentState,s=`${a.stateName}->${e}`
+do{a.exit&&a.exit(this),a=a.parentState}while(!a[o])
+var l=ge[s]
+if(l)t=l.setups,r=l.enters,a=l.state
+else{t=[],r=[]
+var u=_e(e)
+for(n=0,i=u.length;n<i;n++)(a=a[u[n]]).enter&&r.push(a),a.setup&&t.push(a)
+ge[s]={setups:t,enters:r,state:a}}for(n=0,i=r.length;n<i;n++)r[n].enter(this)
+for(this.currentState=a,this.hasRecord&&Ember.set(this._record,"currentState",a),n=0,i=t.length;n<i;n++)t[n].setup(this)}_unhandledEvent(e,t,r){var n="Attempted to handle event `"+t+"` "
+throw n+="on "+String(this)+" while in state ",n+=e.stateName+". ",void 0!==r&&(n+="Called with "+Ember.inspect(r)+"."),new Ember.Error(n)}triggerLater(...e){1===this._deferredTriggers.push(e)&&this.store._updateInternalModel(this)}_triggerDeferredTriggers(){if(this.hasRecord){var e=this._deferredTriggers,t=this._record,r=t.trigger
+if(r&&"function"==typeof r)for(var n=0,i=e.length;n<i;n++){var o=e[n]
+r.apply(t,o)}e.length=0}}removeFromInverseRelationships(e=!1){this._recordData.removeFromInverseRelationships(e)}preloadData(e){var t={}
+Object.keys(e).forEach(r=>{var n=Ember.get(e,r)
+this.modelClass.metaForProperty(r).isRelationship?(t.relationships||(t.relationships={}),t.relationships[r]=this._preloadRelationship(r,n)):(t.attributes||(t.attributes={}),t.attributes[r]=n)}),this._recordData.pushData(t)}_preloadRelationship(e,t){var r=this.modelClass.metaForProperty(e),n=r.type
+return{data:"hasMany"===r.kind?t.map(e=>this._convertPreloadRelationshipToJSON(e,n)):this._convertPreloadRelationshipToJSON(t,n)}}_convertPreloadRelationshipToJSON(e,t){return"string"==typeof e||"number"==typeof e?{type:t,id:e}:{type:(r=e._internalModel?e._internalModel:e).modelName,id:r.id}
+var r}updateRecordArrays(){this.store.recordArrayManager.recordDidChange(this)}setId(e){var t=e!==this._id
+this._id=e,Ember.set(this,"_tag",this._tag+1),t&&null!==e&&(this.store.setRecordId(this.modelName,e,this.clientId),this._recordData.__setId&&this._recordData.__setId(e)),t&&this.hasRecord&&this.notifyPropertyChange("id")}didError(e){this.error=e,this.isError=!0,this.hasRecord&&this._record.setProperties({isError:!0,adapterError:e})}didCleanError(){this.error=null,this.isError=!1,this.hasRecord&&this._record.setProperties({isError:!1,adapterError:null})}adapterDidCommit(e){this.didCleanError()
+var t=this._recordData.didCommit(e)
+this.send("didCommit"),this.updateRecordArrays(),e&&this._record._notifyProperties(t)}addErrorMessageToAttribute(e,t){Ember.get(this.getRecord(),"errors")._add(e,t)}removeErrorMessageFromAttribute(e){Ember.get(this.getRecord(),"errors")._remove(e)}clearErrorMessages(){Ember.get(this.getRecord(),"errors")._clear()}hasErrors(){return Ember.get(this.getRecord(),"errors").get("length")>0}adapterDidInvalidate(e,t){var r
+for(r in e)me.call(e,r)&&this.addErrorMessageToAttribute(r,e[r])
+this.send("becameInvalid"),this._recordData.commitWasRejected()}notifyErrorsChange(){var e
+this._recordData.getErrors&&(e=this._recordData.getErrors(this.identifier)||[],this.notifyInvalidErrorsChange(e))}notifyInvalidErrorsChange(e){this.getRecord().invalidErrorsChanged(e)}adapterDidError(e){this.send("becameError"),this.didError(e),this._recordData.commitWasRejected()}toString(){return`<${this.modelName}:${this.id}>`}referenceFor(e,t){var r=this.references[t]
+if(!r){var n=ce(this,t),i=n.relationshipMeta.kind
+"belongsTo"===i?r=new X(this.store,this,n,t):"hasMany"===i&&(r=new Z(this.store,this,n,t)),this.references[t]=r}return r}}function Ee(e,t,r,n,i){if(delete e._relationshipPromisesCache[t],r.setShouldForceReload(!1),i){r.setHasFailedLoadAttempt(!0)
+var o=e._relationshipProxyCache[t]
+throw o&&"belongsTo"===r.kind&&o.content&&o.content.isDestroying&&o.set("content",null),i}return r.setHasFailedLoadAttempt(!1),r.setRelationshipIsStale(!1),n}function xe(e){return e.map(Oe)}function Oe(e){if(!e)return null
+if(e.then){var t=e.get&&e.get("content")
+return t?N(t):null}return N(e)}var Se=new WeakMap
+class Te{constructor(e,t){this.__store=e,this.modelName=t}get fields(){var e=this.__store._attributesDefinitionFor(this.modelName),t=this.__store._relationshipsDefinitionFor(this.modelName),r=new Map
+return Object.keys(e).forEach(e=>r.set(e,"attribute")),Object.keys(t).forEach(e=>r.set(e,t[e].kind)),r}get attributes(){var e=this.__store._attributesDefinitionFor(this.modelName)
+return new Map(Object.entries(e))}get relationshipsByName(){var e=this.__store._relationshipsDefinitionFor(this.modelName)
+return new Map(Object.entries(e))}eachAttribute(e,t){var r=this.__store._attributesDefinitionFor(this.modelName)
+Object.keys(r).forEach(n=>{e.call(t,n,r[n])})}eachRelationship(e,t){var r=this.__store._relationshipsDefinitionFor(this.modelName)
+Object.keys(r).forEach(n=>{e.call(t,n,r[n])})}eachTransformedAttribute(e,t){var r=this.__store._relationshipsDefinitionFor(this.modelName)
+Object.keys(r).forEach(n=>{r[n].type&&e.call(t,n,r[n])})}}var Me=Ember.Evented
+class Ae{constructor(e,t,r={}){this._snapshots=void 0,this._recordArray=void 0,this._type=void 0,this.length=void 0,this.meta=void 0,this.adapterOptions=void 0,this.include=void 0,this._snapshots=null,this._recordArray=e,this.length=e.get("length"),this._type=null,this.meta=t,this.adapterOptions=r.adapterOptions,this.include=r.include}get type(){return this._type||(this._type=this._recordArray.get("type"))}get modelName(){return this._recordArray.modelName}snapshots(){return null!==this._snapshots||(this._snapshots=this._recordArray._takeSnapshot()),this._snapshots}}var Pe=Ember.ArrayProxy.extend(Me,{init(){this._super(...arguments),this.set("content",this.content||null),this.isLoaded=this.isLoaded||!1,this.isUpdating=!1,this.store=this.store||null,this._updatingPromise=null},replace(){throw new Error(`The result of a server query (for all ${this.modelName} types) is immutable. To modify contents, use toArray()`)},type:Ember.computed("modelName",(function(){return this.modelName?this.store.modelFor(this.modelName):null})).readOnly(),objectAtContent(e){var t=Ember.get(this,"content").objectAt(e)
+return t&&t.getRecord()},update(){if(Ember.get(this,"isUpdating"))return this._updatingPromise
+this.set("isUpdating",!0)
+var e=this._update().finally(()=>{this._updatingPromise=null,this.get("isDestroying")||this.get("isDestroyed")||this.set("isUpdating",!1)})
+return this._updatingPromise=e,e},_update(){return this.store.findAll(this.modelName,{reload:!0})},_pushInternalModels(e){Ember.get(this,"content").pushObjects(e)},_removeInternalModels(e){Ember.get(this,"content").removeObjects(e)},save(){var e="DS: RecordArray#save "+this.modelName,t=Ember.RSVP.Promise.all(this.invoke("save"),e).then(()=>this,null,"DS: RecordArray#save return RecordArray")
+return S.create({promise:t})},_dissociateFromOwnRecords(){this.get("content").forEach(e=>{var t=e.__recordArrays
+t&&t.delete(this)})},_unregisterFromManager(){this.manager.unregisterRecordArray(this)},willDestroy(){this._unregisterFromManager(),this._dissociateFromOwnRecords(),Ember.set(this,"content",null),Ember.set(this,"length",0),this._super(...arguments)},_createSnapshot(e){return new Ae(this,this.get("meta"),e)},_takeSnapshot(){return Ember.get(this,"content").map(e=>e.createSnapshot())}}),Ce=Pe.extend({init(){this.set("content",this.get("content")||Ember.A()),this._super(...arguments),this.query=this.query||null,this.links=this.links||null},replace(){throw new Error(`The result of a server query (on ${this.modelName}) is immutable.`)},_update(){var e=Ember.get(this,"store"),t=Ember.get(this,"query")
+return e._query(this.modelName,t,this)},_setInternalModels(e,t){this.get("content").setObjects(e),this.setProperties({isLoaded:!0,isUpdating:!1,meta:Ember.assign({},t.meta),links:Ember.assign({},t.links)}),this.manager._associateWithRecordArray(e,this),this.has("didLoad")&&Ember.run.once(this,"trigger","didLoad")}}),ke=Ember.run.backburner
+class Re{constructor(e){this.store=e.store,this.isDestroying=!1,this.isDestroyed=!1,this._liveRecordArrays=Object.create(null),this._pending=Object.create(null),this._adapterPopulatedRecordArrays=[]}recordDidChange(e){var t=e.modelName
+if(!e._pendingRecordArrayManagerFlush){e._pendingRecordArrayManagerFlush=!0
+var r=this._pending
+1===(r[t]=r[t]||[]).push(e)&&ke.schedule("actions",this,this._flush)}}_flushPendingInternalModelsForModelName(e,t){for(var r=[],n=0;n<t.length;n++){var i=t[n]
+i._pendingRecordArrayManagerFlush=!1,i.isHiddenFromRecordArrays()&&r.push(i)}var o=this._liveRecordArrays[e]
+o&&function(e,t){for(var r=[],n=[],i=0;i<t.length;i++){var o=t[i],a=o.isHiddenFromRecordArrays(),s=o._recordArrays
+a||o.isEmpty()||s.has(e)||(r.push(o),s.add(e)),a&&(n.push(o),s.delete(e))}r.length>0&&e._pushInternalModels(r)
+n.length>0&&e._removeInternalModels(n)}(o,t),r.length>0&&function(e){for(var t=0;t<e.length;t++)De(e[t])}(r)}_flush(){var e=this._pending
+for(var t in this._pending=Object.create(null),e)this._flushPendingInternalModelsForModelName(t,e[t])}_syncLiveRecordArray(e,t){var r=this._pending[t],n=Array.isArray(r),i=!n||0===r.length,o=G(this.store).modelMapFor(t),a=Ember.get(o,"length")===Ember.get(e,"length")
+if(!i||!a){n&&(this._flushPendingInternalModelsForModelName(t,r),delete this._pending[t])
+for(var s=this._visibleInternalModelsByType(t),l=[],u=0;u<s.length;u++){var c=s[u],d=c._recordArrays
+!1===d.has(e)&&(d.add(e),l.push(c))}l.length&&e._pushInternalModels(l)}}_didUpdateAll(e){var t=this._liveRecordArrays[e]
+t&&Ember.set(t,"isUpdating",!1)}liveRecordArrayFor(e){var t=this._liveRecordArrays[e]
+if(t)this._syncLiveRecordArray(t,e)
+else{var r=this._visibleInternalModelsByType(e)
+t=this.createRecordArray(e,r),this._liveRecordArrays[e]=t}return t}_visibleInternalModelsByType(e){for(var t=G(this.store).modelMapFor(e)._models,r=[],n=0;n<t.length;n++){var i=t[n]
+!1===i.isHiddenFromRecordArrays()&&r.push(i)}return r}createRecordArray(e,t){var r=Pe.create({modelName:e,content:Ember.A(t||[]),store:this.store,isLoaded:!0,manager:this})
+return Array.isArray(t)&&Ne(t,r),r}createAdapterPopulatedRecordArray(e,t,r,n){var i
+return Array.isArray(r)?Ne(r,i=Ce.create({modelName:e,query:t,content:Ember.A(r),store:this.store,manager:this,isLoaded:!0,isUpdating:!1,meta:Ember.assign({},n.meta),links:Ember.assign({},n.links)})):i=Ce.create({modelName:e,query:t,content:Ember.A(),store:this.store,manager:this}),this._adapterPopulatedRecordArrays.push(i),i}unregisterRecordArray(e){var t=e.modelName
+if(!function(e,t){var r=e.indexOf(t)
+if(-1!==r)return e.splice(r,1),!0
+return!1}(this._adapterPopulatedRecordArrays,e)){var r=this._liveRecordArrays[t]
+r&&e===r&&delete this._liveRecordArrays[t]}}_associateWithRecordArray(e,t){Ne(e,t)}willDestroy(){Object.keys(this._liveRecordArrays).forEach(e=>this._liveRecordArrays[e].destroy()),this._adapterPopulatedRecordArrays.forEach(je),this.isDestroyed=!0}destroy(){this.isDestroying=!0,ke.schedule("actions",this,this.willDestroy)}}function je(e){e.destroy()}function De(e){var t=e._recordArrays
+t.forEach((function(t){t._removeInternalModels([e])})),t.clear()}function Ne(e,t){for(var r=0,n=e.length;r<n;r++){e[r]._recordArrays.add(t)}}function Ie(e,t,r,n,i,o){var a=Ember.A(i.map(e=>e.createSnapshot(o.get(e)))),s=t.modelFor(r),l=e.findMany(t,s,n,a),u=`DS: Handle Adapter#findMany of '${r}'`
+if(void 0===l)throw new Error("adapter.findMany returned undefined, this was very likely a mistake")
+return(l=H(l,t,u)).then(e=>{var n=B(t.serializerFor(r),t,s,e,null,"findMany")
+return t._push(n)},null,"DS: Extract payload of "+r)}function Le(e,t,r,n){var i=function(e,t){return Array.isArray(e)?e.map(t):t(e)}(t.data,t=>{var{id:i,type:o}=t
+return function(e,t,r,n){var{id:i,type:o}=e
+e.relationships||(e.relationships={})
+var{relationships:a}=e,s=function(e,t,r,n){return function({_storeWrapper:e},t,r,n){var{name:i}=r,{modelName:o}=t,a=e.inverseForRelationship(o,i)
+if(a){var{meta:{kind:s}}=e.relationshipsDefinitionFor(n)[a]
+return{inverseKey:a,kind:s}}}(e,t,r,n)}(r,t,n,o)
+if(s){var{inverseKey:l,kind:u}=s,c=a[l]&&a[l].data
+"hasMany"===u&&void 0===c||(a[l]=a[l]||{},a[l].data=function(e,t,{id:r,modelName:n}){var i,o={id:r,type:n}
+"hasMany"===t?(i=e||[]).push(o):(i=e||{},Ember.assign(i,o))
+return i}(c,u,t))}}(t,r,e,n),{id:i,type:o}}),o={id:r.id,type:r.modelName,relationships:{[n.key]:{meta:t.meta,links:t.links,data:i}}}
+return Array.isArray(t.included)||(t.included=[]),t.included.push(o),t}function Fe(e,t,r,n){var i=t.modelFor(r),o=t.peekAll(r),a=o._createSnapshot(n),s=Ember.RSVP.Promise.resolve().then(()=>e.findAll(t,i,null,a))
+return(s=H(s,t,"DS: Handle Adapter#findAll of "+i)).then(e=>{var n=B(t.serializerFor(r),t,i,e,null,"findAll")
+return t._push(n),t._didUpdateAll(r),o},null,"DS: Extract payload of findAll ${modelName}")}var ze,Ue=a("DEBUG-ts-brand")
+function He(e){return e}class Be{constructor(e){this._store=e,this[Ue]=void 0,this._willUpdateManyArrays=void 0,this._pendingManyArrayUpdates=void 0,this._willUpdateManyArrays=!1,this._pendingManyArrayUpdates=[]}get identifierCache(){return y(this._store)}_hasModelFor(e){return this._store._hasModelFor(e)}_scheduleManyArrayUpdate(e,t){if((this._pendingManyArrayUpdates=this._pendingManyArrayUpdates||[]).push(e,t),!0!==this._willUpdateManyArrays){this._willUpdateManyArrays=!0
+var r=this._store._backburner
+r.join(()=>{r.schedule("syncRelationships",this,this._flushPendingManyArrayUpdates)})}}notifyErrorsChange(e,t,r){var n=O(e,t,r),i=y(this._store).getOrCreateRecordIdentifier(n),o=G(this._store).peek(i)
+o&&o.notifyErrorsChange()}_flushPendingManyArrayUpdates(){if(!1!==this._willUpdateManyArrays){var e=this._pendingManyArrayUpdates
+this._pendingManyArrayUpdates=[],this._willUpdateManyArrays=!1
+for(var t=G(this._store),r=0;r<e.length;r+=2){var n=e[r],i=e[r+1],o=t.peek(n)
+o&&o.notifyHasManyChange(i)}}}attributesDefinitionFor(e){return this._store._attributesDefinitionFor(e)}relationshipsDefinitionFor(e){return this._store._relationshipsDefinitionFor(e)}inverseForRelationship(e,t){var r=this._store.modelFor(e)
+return this.relationshipsDefinitionFor(e)[t]._inverseKey(this._store,r)}inverseIsAsyncForRelationship(e,t){var r=this._store.modelFor(e)
+return this.relationshipsDefinitionFor(e)[t]._inverseIsAsync(this._store,r)}notifyPropertyChange(e,t,r,n){var i=O(e,t,r),o=y(this._store).getOrCreateRecordIdentifier(i),a=G(this._store).peek(o)
+a&&a.notifyPropertyChange(n)}notifyHasManyChange(e,t,r,n){var i=O(e,t,r),o=y(this._store).getOrCreateRecordIdentifier(i)
+this._scheduleManyArrayUpdate(o,n)}notifyBelongsToChange(e,t,r,n){var i=O(e,t,r),o=y(this._store).getOrCreateRecordIdentifier(i),a=G(this._store).peek(o)
+a&&a.notifyBelongsToChange(n)}notifyStateChange(e,t,r,n){var i=O(e,t,r),o=y(this._store).getOrCreateRecordIdentifier(i),a=G(this._store).peek(o)
+a&&a.notifyStateChange(n)}recordDataFor(e,t,r){var n,i=!1
+if(t||r){var o=O(e,t,r)
+n=y(this._store).getOrCreateRecordIdentifier(o)}else i=!0,n={type:e}
+return this._store.recordDataFor(n,i)}setRecordId(e,t,r){this._store.setRecordId(e,t,r)}isRecordInUse(e,t,r){var n=O(e,t,r),i=y(this._store).getOrCreateRecordIdentifier(n),o=G(this._store).peek(i)
+return!!o&&o.isRecordInUse()}disconnectRecord(e,t,r){var n=O(e,t,r),i=y(this._store).getOrCreateRecordIdentifier(n),o=G(this._store).peek(i)
+o&&o.destroyFromRecordData()}}var Ve,$e,qe=Ember.run.backburner,{ENV:We}=Ember
+class Ge extends Ember.Service{constructor(){super(...arguments),this._backburner=k,this.recordArrayManager=new Re({store:this}),this._notificationManager=void 0,this._adapterCache=Object.create(null),this._serializerCache=Object.create(null),this._storeWrapper=new Be(this),this._pendingSave=[],this._updatedRelationships=[],this._updatedInternalModels=[],this._pendingFetch=new Map,this._fetchManager=void 0,this._schemaDefinitionService=void 0,this._trackedAsyncRequests=void 0,this.shouldAssertMethodCallsOnDestroyedStore=!1,this.shouldTrackAsyncRequests=!1,this.generateStackTracesForTrackedRequests=!1,this._trackAsyncRequestStart=void 0,this._trackAsyncRequestEnd=void 0,this.__asyncWaiter=void 0}getRequestStateService(){}get identifierCache(){return y(this)}_instantiateRecord(e,t,r,n,i){}_internalDeleteRecord(e){e.deleteRecord()}_attributesDefinitionFor(e,t){return t?this.getSchemaDefinitionService().attributesDefinitionFor(t):this.getSchemaDefinitionService().attributesDefinitionFor(e)}_relationshipsDefinitionFor(e,t){return t?this.getSchemaDefinitionService().relationshipsDefinitionFor(t):this.getSchemaDefinitionService().relationshipsDefinitionFor(e)}registerSchemaDefinitionService(e){this._schemaDefinitionService=e}getSchemaDefinitionService(){}_relationshipMetaFor(e,t,r){return this._relationshipsDefinitionFor(e)[r]}modelFor(e){return function(e,t){var r=Se.get(e)
+void 0===r&&(r=Object.create(null),Se.set(e,r))
+var n=r[t]
+return void 0===n&&(n=r[t]=new Te(e,t)),n}(this,e)}_hasModelFor(e){return this.getSchemaDefinitionService().doesTypeExist(e)}createRecord(e,t){return qe.join(()=>this._backburner.join(()=>{var r=o(e),i=Ember.assign({},t)
+Ember.isNone(i.id)&&(i.id=this._generateId(r,i)),i.id=n(i.id)
+var a=G(this).build({type:r,id:i.id})
+return a.loadedData(),a.didCreateRecord(),a.getRecord(i)}))}_generateId(e,t){var r=this.adapterFor(e)
+return r&&r.generateIdForRecord?r.generateIdForRecord(this,e,t):null}deleteRecord(e){e.deleteRecord()}unloadRecord(e){e.unloadRecord()}find(e,t,r){return this.findRecord(e,t)}findRecord(e,t,r){var n=o(e),a=i(t),s=O(n,a),l=G(this).lookup(s)
+return r=r||{},this.hasRecordForId(n,a)?P(this._findRecord(l,r),`DS: Store#findRecord ${n} with id: ${t}`):this._findByInternalModel(l,r)}_findRecord(e,t){if(t.reload)return this._scheduleFetch(e,t)
+var r=e.createSnapshot(t),n=this.adapterFor(e.modelName)
+return void 0===t.reload&&n.shouldReloadRecord&&n.shouldReloadRecord(this,r)?this._scheduleFetch(e,t):(!1===t.backgroundReload||(t.backgroundReload||!n.shouldBackgroundReloadRecord||n.shouldBackgroundReloadRecord(this,r))&&this._scheduleFetch(e,t),Ember.RSVP.Promise.resolve(e))}_findByInternalModel(e,t={}){return t.preload&&e.preloadData(t.preload),P(this._findEmptyInternalModel(e,t),`DS: Store#findRecord ${e.modelName} with id: ${e.id}`)}_findEmptyInternalModel(e,t){return e.isEmpty()?this._scheduleFetch(e,t):e.isLoading()?e._promiseProxy:Ember.RSVP.Promise.resolve(e)}findByIds(e,t){for(var r=new Array(t.length),n=o(e),i=0;i<t.length;i++)r[i]=this.findRecord(n,t[i])
+return A(Ember.RSVP.all(r).then(Ember.A,null,`DS: Store#findByIds of ${n} complete`))}_fetchRecord(e,t){var r=e.modelName
+return function(e,t,r,n,i,o){var a=i.createSnapshot(o),{modelName:s}=i,l=Ember.RSVP.Promise.resolve().then(()=>e.findRecord(t,r,n,a)),u=`DS: Handle Adapter#findRecord of '${s}' with id: '${n}'`,{identifier:c}=i
+return(l=H(l,t,u)).then(e=>{var i=B(t.serializerFor(s),t,r,e,n,"findRecord")
+return i.data.lid=c.lid,t._push(i)},e=>{throw i.notFound(),i.isEmpty()&&i.unloadRecord(),e},`DS: Extract payload of '${s}'`)}(this.adapterFor(r),this,e.type,e.id,e,t)}_scheduleFetchMany(e,t){for(var r=new Array(e.length),n=0;n<e.length;n++)r[n]=this._scheduleFetch(e[n],t)
+return Ember.RSVP.Promise.all(r)}_scheduleFetchThroughFetchManager(e,t={}){var r=this.generateStackTracesForTrackedRequests
+e.loadingData()
+var n=e.identifier
+return function(e){e.id}(n),this._fetchManager.scheduleFetch(n,t,r).then(t=>{t.data&&!Array.isArray(t.data)&&(t.data.lid=n.lid)
+var r=this._push(t)
+return r&&!Array.isArray(r)?r:e},t=>{throw e.notFound(),e.isEmpty()&&e.unloadRecord(),t})}_scheduleFetch(e,t){if(e._promiseProxy)return e._promiseProxy
+var{id:r,modelName:n}=e,i=Ember.RSVP.defer(`Fetching ${n}' with id: ${r}`),o={internalModel:e,resolver:i,options:t},a=i.promise
+e.loadingData(a),0===this._pendingFetch.size&&qe.schedule("actions",this,this.flushAllPendingFetches)
+var s=this._pendingFetch,l=s.get(n)
+return void 0===l&&(l=[],s.set(n,l)),l.push(o),a}flushAllPendingFetches(){this.isDestroyed||this.isDestroying||(this._pendingFetch.forEach(this._flushPendingFetchForType,this),this._pendingFetch.clear())}_flushPendingFetchForType(e,t){for(var r=this,n=r.adapterFor(t),i=!!n.findMany&&n.coalesceFindRequests,o=e.length,a=new Array(o),s=Object.create(null),l=new WeakMap,u=0;u<o;u++){var c=e[u],d=c.internalModel
+a[u]=d,l.set(d,c.options),s[d.id]=c}function h(e){var t=r._fetchRecord(e.internalModel,e.options)
+e.resolver.resolve(t)}function f(e,t){for(var r=Object.create(null),n=0,i=e.length;n<i;n++){var o=e[n],a=s[o.id]
+if(r[o.id]=o,a)a.resolver.resolve(o)}for(var l=[],u=0,c=t.length;u<c;u++){var d=t[u]
+r[d.id]||l.push(d)}l.length&&p(l)}function p(e,t){for(var r=0,n=e.length;r<n;r++){var i=e[r],o=s[i.id]
+o&&o.resolver.reject(t||new Error(`Expected: '${i}' to be present in the adapter provided payload, but it was not found.`))}}if(i){for(var m,v=new Array(o),g=0;g<o;g++)v[g]=a[g].createSnapshot(l.get(S))
+for(var b=0,y=(m=n.groupRecordsForFindMany?n.groupRecordsForFindMany(this,v):[v]).length;b<y;b++){for(var _=m[b],w=m[b].length,E=new Array(w),x=new Array(w),O=0;O<w;O++){var S=_[O]._internalModel
+x[O]=S,E[O]=S.id}if(w>1)(function(e){Ie(n,r,t,E,e,l).then((function(t){f(t,e)})).catch((function(t){p(e,t)}))})(x)
+else if(1===E.length){h(s[x[0].id])}}}else for(var T=0;T<o;T++)h(e[T])}getReference(e,t){var r=O(o(e),i(t))
+return G(this).lookup(r).recordReference}peekRecord(e,t){var r=o(e),n=i(t)
+if(this.hasRecordForId(r,n)){var a=O(r,n)
+return G(this).lookup(a).getRecord()}return null}_reloadRecord(e,t){var{id:r,modelName:n}=e
+this.adapterFor(n)
+return this._scheduleFetch(e,t)}hasRecordForId(e,t){var r={type:o(e),id:i(t)},n=y(this).peekRecordIdentifier(r),a=n&&G(this).peek(n)
+return!!a&&a.isLoaded()}recordForId(e,t){var r=O(e,i(t))
+return G(this).lookup(r).getRecord()}findMany(e,t){for(var r=new Array(e.length),n=0;n<e.length;n++)r[n]=this._findEmptyInternalModel(e[n],t)
+return Ember.RSVP.Promise.all(r)}findHasMany(e,t,r,n){return function(e,t,r,n,i,o){var a=r.createSnapshot(o),s=t.modelFor(i.type),l=!n||"string"==typeof n?n:n.href,u=e.findHasMany(t,a,l,i),c=`DS: Handle Adapter#findHasMany of '${r.modelName}' : '${i.type}'`
+return(u=z(u=H(u,t,c),F(U,r))).then(e=>{var n=B(t.serializerFor(i.type),t,s,e,null,"findHasMany")
+return n=Le(t,n,r,i),t._push(n)},null,`DS: Extract payload of '${r.modelName}' : hasMany '${i.type}'`)}(this.adapterFor(e.modelName),this,e,t,r,n)}_findHasManyByJsonApiResource(e,t,r,n){if(!e)return Ember.RSVP.resolve([])
+var i=this.adapterFor(r.type),{relationshipIsStale:o,hasDematerializedInverse:a,hasAnyRelationshipData:s,relationshipIsEmpty:l,shouldForceReload:u}=e._relationship,c=Ke(this,e)
+if(e.links&&e.links.related&&("function"==typeof i.findHasMany||void 0===e.data)&&(u||a||o||!c&&!l))return this.findHasMany(t,e.links.related,r,n)
+var d=s&&!l,h=a||l&&Array.isArray(e.data)&&e.data.length>0
+if(!u&&!o&&(d||h)){var f=e.data.map(e=>this._internalModelForResource(e))
+return this.findMany(f,n)}if(s&&!l||h){var p=e.data.map(e=>this._internalModelForResource(e))
+return this._scheduleFetchMany(p,n)}return Ember.RSVP.resolve([])}_getHasManyByJsonApiResource(e){var t=[]
+return e&&e.data&&(t=e.data.map(e=>this._internalModelForResource(e))),t}findBelongsTo(e,t,r,n){return function(e,t,r,n,i,o){var a=r.createSnapshot(o),s=t.modelFor(i.type),l=!n||"string"==typeof n?n:n.href,u=e.findBelongsTo(t,a,l,i),c=`DS: Handle Adapter#findBelongsTo of ${r.modelName} : ${i.type}`
+return(u=z(u=H(u,t,c),F(U,r))).then(e=>{var n=B(t.serializerFor(i.type),t,s,e,null,"findBelongsTo")
+return n.data?(n=Le(t,n,r,i),t._push(n)):null},null,`DS: Extract payload of ${r.modelName} : ${i.type}`)}(this.adapterFor(e.modelName),this,e,t,r,n)}_fetchBelongsToLinkFromResource(e,t,r,n){return e&&e.links&&e.links.related?this.findBelongsTo(t,e.links.related,r,n).then(e=>e?e.getRecord():null):Ember.RSVP.resolve(null)}_findBelongsToByJsonApiResource(e,t,r,n){if(!e)return Ember.RSVP.resolve(null)
+var i=e.data?this._internalModelForResource(e.data):null,{relationshipIsStale:o,hasDematerializedInverse:a,hasAnyRelationshipData:s,relationshipIsEmpty:l,shouldForceReload:u}=e._relationship,c=Ke(this,e),d=e.links&&e.links.related&&(u||a||o||!c&&!l)
+if(i&&i.isLoading())return i._promiseProxy.then(()=>i.getRecord())
+if(d)return this._fetchBelongsToLinkFromResource(e,t,r,n)
+var h=s&&c&&!l,f=a||l&&e.data,p=void 0===e.data||null===e.data
+if(!u&&!o&&(h||f))return p?Ember.RSVP.resolve(null):this._findByInternalModel(i,n)
+var m=!p&&null===e.data.id
+return i&&m?Ember.RSVP.resolve(i.getRecord()):i&&!p?this._scheduleFetch(i,n).then(()=>i.getRecord()):Ember.RSVP.resolve(null)}query(e,t,r){var n={}
+r&&r.adapterOptions&&(n.adapterOptions=r.adapterOptions)
+var i=o(e)
+return this._query(i,t,null,n)}_query(e,t,r,n){return A(function(e,t,r,n,i,o){var a=t.modelFor(r)
+i=i||t.recordArrayManager.createAdapterPopulatedRecordArray(r,n)
+var s=Ember.RSVP.Promise.resolve().then(()=>e.query(t,a,n,i,o))
+return(s=H(s,t,"DS: Handle Adapter#query of "+r)).then(e=>{var o=B(t.serializerFor(r),t,a,e,null,"query"),s=t._push(o)
+return i?i._setInternalModels(s,o):i=t.recordArrayManager.createAdapterPopulatedRecordArray(r,n,s,o),i},null,"DS: Extract payload of query "+r)}(this.adapterFor(e),this,e,t,r,n))}queryRecord(e,t,r){var n=o(e),i=this.adapterFor(n),a={}
+return r&&r.adapterOptions&&(a.adapterOptions=r.adapterOptions),M(function(e,t,r,n,i){var o=t.modelFor(r),a=Ember.RSVP.Promise.resolve().then(()=>e.queryRecord(t,o,n,i))
+return(a=H(a,t,"DS: Handle Adapter#queryRecord of "+r)).then(e=>{var n=B(t.serializerFor(r),t,o,e,null,"queryRecord")
+return t._push(n)},null,"DS: Extract payload of queryRecord "+r)}(i,this,n,t,a).then(e=>e?e.getRecord():null))}findAll(e,t){var r=o(e)
+return this._fetchAll(r,this.peekAll(r),t)}_fetchAll(e,t,r={}){var n=this.adapterFor(e)
+if(r.reload)return Ember.set(t,"isUpdating",!0),A(Fe(n,this,e,r))
+var i=t._createSnapshot(r)
+return!1!==r.reload&&(n.shouldReloadAll&&n.shouldReloadAll(this,i)||!n.shouldReloadAll&&0===i.length)?(Ember.set(t,"isUpdating",!0),A(Fe(n,this,e,r))):(!1===r.backgroundReload||(r.backgroundReload||!n.shouldBackgroundReloadAll||n.shouldBackgroundReloadAll(this,i))&&(Ember.set(t,"isUpdating",!0),Fe(n,this,e,r)),A(Ember.RSVP.Promise.resolve(t)))}_didUpdateAll(e){this.recordArrayManager._didUpdateAll(e)}peekAll(e){var t=o(e)
+return this.recordArrayManager.liveRecordArrayFor(t)}unloadAll(e){var t=G(this)
+if(void 0===e)t.clear()
+else{var r=o(e)
+t.clear(r)}}filter(){}scheduleSave(e,t,r){var n=e.createSnapshot(r)
+if(e._isRecordFullyDeleted())return t.resolve(),t.promise
+e.adapterWillCommit(),this._pendingSave.push({snapshot:n,resolver:t}),qe.scheduleOnce("actions",this,this.flushPendingSave)}flushPendingSave(){var e=this._pendingSave.slice()
+this._pendingSave=[]
+for(var t=0,r=e.length;t<r;t++){var n=e[t],i=n.snapshot,o=n.resolver,a=i._internalModel,s=this.adapterFor(a.modelName),l=void 0
+"root.deleted.saved"!==a.currentState.stateName?(l=a.isNew()?"createRecord":a.isDeleted()?"deleteRecord":"updateRecord",o.resolve(Ye(s,this,l,i))):o.resolve()}}didSaveRecord(e,t,r){var n
+t&&(n=t.data)
+var i=y(this),o=e.identifier
+"deleteRecord"!==r&&n&&i.updateRecordIdentifier(o,n),e.adapterDidCommit(n)}recordWasInvalid(e,t,r){e.adapterDidInvalidate(t)}recordWasError(e,t){e.adapterDidError(t)}setRecordId(e,t,r){G(this).setRecordId(e,t,r)}_load(e){var t=O(o(e.type),i(e.id),n(e.lid)),r=G(this).lookup(t,e),a="root.loading"===r.currentState.stateName,s=!1===r.currentState.isEmpty&&!a
+if(s||a){var l=r.identifier,u=y(this).updateRecordIdentifier(l,e)
+u!==l&&(l=u,r=G(this).lookup(l))}return r.setupData(e),s||this.recordArrayManager.recordDidChange(r),r}push(e){var t=this._push(e)
+return Array.isArray(t)?t.map(e=>e.getRecord()):null===t?null:t.getRecord()}_push(e){return this._backburner.join(()=>{var t,r,n=e.included
+if(n)for(t=0,r=n.length;t<r;t++)this._pushInternalModel(n[t])
+if(Array.isArray(e.data)){r=e.data.length
+var i=new Array(r)
+for(t=0;t<r;t++)i[t]=this._pushInternalModel(e.data[t])
+return i}return null===e.data?null:this._pushInternalModel(e.data)})}_pushInternalModel(e){e.type
+return this._load(e)}pushPayload(e,t){var r,n
+if(t){n=t
+var i=o(e)
+r=this.serializerFor(i)}else n=e,r=this.serializerFor("application")
+r.pushPayload(this,n)}reloadManyArray(e,t,r,n){return t.reloadHasMany(r,n)}reloadBelongsTo(e,t,r,n){return t.reloadBelongsTo(r,n)}_internalModelForResource(e){return G(this).getByResource(e)}_internalModelForId(e,t,r){var n=O(e,t,r)
+return G(this).lookup(n)}serializeRecord(e,t){}saveRecord(e,t){}relationshipReferenceFor(e,t){}_createRecordData(e){return this.createRecordDataFor(e.type,e.id,e.lid,this._storeWrapper)}createRecordDataFor(e,r,n,i){void 0===ze&&(ze=t("@ember-data/record-data/-private").RecordData)
+var o=y(this).getOrCreateRecordIdentifier({type:e,id:r,lid:n})
+return new ze(o,i)}__recordDataFor(e){var t=y(this).getOrCreateRecordIdentifier(e)
+return this.recordDataFor(t,!1)}recordDataFor(e,t){var r
+return!0===t?((r=G(this).build({type:e.type,id:null})).loadedData(),r.didCreateRecord()):r=G(this).lookup(e),N(r)}normalize(e,t){var r=o(e),n=this.serializerFor(r),i=this.modelFor(r)
+return n.normalize(i,t)}newClientId(){}_internalModelsFor(e){return G(this).modelMapFor(e)}adapterFor(e){var t=o(e),{_adapterCache:r}=this,n=r[t]
+if(n)return n
+var i=Ember.getOwner(this)
+if(void 0!==(n=i.lookup("adapter:"+t)))return Ember.set(n,"store",this),r[t]=n,n
+if(void 0!==(n=r.application||i.lookup("adapter:application")))return Ember.set(n,"store",this),r[t]=n,r.application=n,n
+var a=this.adapter||"-json-api"
+return void 0!==(n=a?r[a]||i.lookup("adapter:"+a):void 0)?(Ember.set(n,"store",this),r[t]=n,r[a]=n,n):(n=r["-json-api"]||i.lookup("adapter:-json-api"),Ember.set(n,"store",this),r[t]=n,r["-json-api"]=n,n)}serializerFor(e){var t=o(e),{_serializerCache:r}=this,n=r[t]
+if(n)return n
+var i,a=Ember.getOwner(this)
+if(void 0!==(n=a.lookup("serializer:"+t)))return Ember.set(n,"store",this),r[t]=n,n
+if(void 0!==(n=r.application||a.lookup("serializer:application")))return Ember.set(n,"store",this),r[t]=n,r.application=n,n
+var s=this.adapterFor(e)
+return void 0!==(n=(i=Ember.get(s,"defaultSerializer"))?r[i]||a.lookup("serializer:"+i):void 0)?(Ember.set(n,"store",this),r[t]=n,r[i]=n,n):(n=r["-default"]||a.lookup("serializer:-default"),Ember.set(n,"store",this),r[t]=n,r["-default"]=n,n)}destroy(){for(var e in this._adapterCache){var t=this._adapterCache[e]
+"function"==typeof t.destroy&&t.destroy()}for(var r in this._serializerCache){var n=this._serializerCache[r]
+"function"==typeof n.destroy&&n.destroy()}return super.destroy()}willDestroy(){super.willDestroy(),this.recordArrayManager.destroy(),y(this).destroy(),this.unloadAll()}_updateRelationshipState(e){1===this._updatedRelationships.push(e)&&this._backburner.join(()=>{this._backburner.schedule("syncRelationships",this,this._flushUpdatedRelationships)})}_flushUpdatedRelationships(){for(var e=this._updatedRelationships,t=0,r=e.length;t<r;t++)e[t].flushCanonical()
+e.length=0}_updateInternalModel(e){1===this._updatedInternalModels.push(e)&&qe.schedule("actions",this,this._flushUpdatedInternalModels)}_flushUpdatedInternalModels(){for(var e=this._updatedInternalModels,t=0,r=e.length;t<r;t++)e[t]._triggerDeferredTriggers()
+e.length=0}}function Ye(e,t,r,n){var i=n._internalModel,o=n.modelName,a=t.modelFor(o),s=Ember.RSVP.Promise.resolve().then(()=>e[r](t,a,n)),l=t.serializerFor(o),u=`DS: Extract and notify about ${r} completion of ${i}`
+return(s=z(s=H(s,t,u),F(U,i))).then(e=>(t._backburner.join(()=>{var o,s,u
+e&&((o=B(l,t,a,e,n.id,r)).included&&(u=o.included),s=o.data),t.didSaveRecord(i,{data:s},r),u&&t._push({data:null,included:u})}),i),(function(e){var r
+e&&!0===e.isAdapterError&&"InvalidError"===e.code?(r="function"==typeof l.extractErrors?l.extractErrors(t,a,e,n.id):D(e.errors),t.recordWasInvalid(i,r,e)):t.recordWasError(i,e)
+throw e}),u)}function Ke(e,t){var r=y(e)
+return Array.isArray(t.data)?!t.data.reduce((t,n)=>t||Je(e,r,n).isEmpty(),!1):!t.data||!Je(e,r,t.data).isEmpty()}function Je(e,t,r){var n=t.getOrCreateRecordIdentifier(r)
+return e._internalModelForResource(n)}function Qe(e,t,r){var n=t[r]
+if(!n){if((n=function(e,t){return Ember.getOwner(e).factoryFor("model:"+t)}(e,r))||(n=Ve(e,r)),!n)return null
+var i=n.class
+if(i.isModel)i.modelName&&Object.prototype.hasOwnProperty.call(i,"modelName")||Object.defineProperty(i,"modelName",{value:r})
+t[r]=n}return n}Ember.defineProperty(Ge.prototype,"defaultAdapter",Ember.computed("adapter",(function(){var e=this.adapter||"-json-api"
+return this.adapterFor(e)}))),Ve=function(){return $e||($e=t("@ember-data/model/-private")._modelForMixin),$e(...arguments)}
+function Xe(e){var t
+return t=o(t=e.type||e.key),"hasMany"===e.kind&&(t=r.singularize(t)),t}class Ze{constructor(e){this.meta=e,this[Ue]=void 0,this._type="",this.__inverseKey="",this.__inverseIsAsync=!0,this.__hasCalculatedInverse=!1,this.parentModelName=void 0,this.inverse=void 0,this.inverseIsAsync=void 0,this.parentModelName=e.parentModelName}get key(){return this.meta.key}get kind(){return this.meta.kind}get type(){return this._type||(this._type=Xe(this.meta)),this._type}get options(){return this.meta.options}get name(){return this.meta.name}_inverseKey(e,t){return!1===this.__hasCalculatedInverse&&this._calculateInverse(e,t),this.__inverseKey}_inverseIsAsync(e,t){return!1===this.__hasCalculatedInverse&&this._calculateInverse(e,t),this.__inverseIsAsync}_calculateInverse(e,t){var r,n
+this.__hasCalculatedInverse=!0
+var i,o,a,s,l=null
+i=this.meta,(o=i.options)&&null===o.inverse||(l=t.inverseFor(this.key,e)),l?(r=l.name,n=void 0===(s=(a=l).options&&a.options.async)||s):(r=null,n=!1),this.__inverseKey=r,this.__inverseIsAsync=n}}e.AdapterPopulatedRecordArray=Ce,e.DeprecatedEvented=Me,e.InternalModel=we,e.PromiseArray=S,e.PromiseObject=T,e.RecordArray=Pe,e.RecordArrayManager=Re,e.RecordDataStoreWrapper=Be,e.RootState=ue,e.Snapshot=L,e.SnapshotRecordArray=Ae,e.Store=class extends Ge{constructor(...e){super(...e),this._modelFactoryCache=Object.create(null),this._relationshipsDefCache=Object.create(null),this._attributesDefCache=Object.create(null)}instantiateRecord(e,t,r,n){var i=e.type,o=this._internalModelForResource(e),a={store:this,_internalModel:o,currentState:o.currentState,container:null}
+Ember.assign(a,t),Ember.setOwner(a,Ember.getOwner(this)),delete a.container
+var s=this._modelFactoryFor(i).create(a)
+return n.subscribe(e,(e,t)=>function(e,t,r,n){if("attributes"===t)r.eachAttribute(t=>{Ember.cacheFor(r,t)!==n._internalModelForResource(e)._recordData.getAttr(t)&&r.notifyPropertyChange(t)})
+else if("relationships"===t)r.eachRelationship((t,i)=>{var o=n._internalModelForResource(e)
+"belongsTo"===i.kind?r.notifyPropertyChange(t):"hasMany"===i.kind&&(i.options.async&&(r.notifyPropertyChange(t),o.hasManyRemovalCheck(t)),o._manyArrayCache[t]&&o._manyArrayCache[t].retrieveLatest())})
+else if("errors"===t){var i=n._internalModelForResource(e)._recordData.getErrors(e)
+r.invalidErrorsChanged(i)}else"state"===t?(r.notifyPropertyChange("isNew"),r.notifyPropertyChange("isDeleted")):"identity"===t&&r.notifyPropertyChange("id")}(e,t,s,this)),s}teardownRecord(e){e.destroy()}modelFor(e){var t=this._modelFactoryFor(e),r=t&&t.class?t.class:t
+if(r&&r.isModel)return r
+throw new Ember.Error(`No model was found for '${e}' and no schema handles the type`)}_modelFactoryFor(e){var t=o(e)
+return Qe(this,this._modelFactoryCache,t)}_hasModelFor(e){var t=o(e)
+return null!==Qe(this,this._modelFactoryCache,t)}_relationshipMetaFor(e,t,r){var n=this.modelFor(e)
+return Ember.get(n,"relationshipsByName").get(r)}_attributesDefinitionFor(e,t){var r=this._attributesDefCache[e]
+if(void 0===r){var n=this.modelFor(e),i=Ember.get(n,"attributes")
+r=Object.create(null),i.forEach((e,t)=>r[t]=e),this._attributesDefCache[e]=r}return r}_relationshipsDefinitionFor(e,t){var r=this._relationshipsDefCache[e]
+if(void 0===r){var n=this.modelFor(e)
+r=Ember.get(n,"relationshipsObject")||null,this._relationshipsDefCache[e]=r}return r}getSchemaDefinitionService(){throw"schema service is only available when custom model class feature flag is on"}},e._bind=F,e._guard=z,e._objectIsAlive=U,e.coerceId=n,e.diffArray=function(e,t){for(var r=e.length,n=t.length,i=Math.min(r,n),o=null,a=0;a<i;a++)if(e[a]!==t[a]){o=a
+break}null===o&&n!==r&&(o=i)
+var s=0,l=0
+if(null!==o){for(var u=i-o,c=1;c<=i;c++)if(e[r-c]!==t[n-c]){u=c-1
+break}s=n-u-o,l=r-u-o}return{firstChangeIndex:o,addedCount:s,removedCount:l}},e.errorsArrayToHash=D,e.errorsHashToArray=function(e){var t=[]
+return Ember.isPresent(e)&&Object.keys(e).forEach(r=>{for(var n=Ember.makeArray(e[r]),i=0;i<n.length;i++){var o="Invalid Attribute",a="/data/attributes/"+r
+"base"===r&&(o="Invalid Document",a="/data"),t.push({title:o,detail:n[i],source:{pointer:a}})}}),t},e.guardDestroyedStore=H,e.identifierCacheFor=y,e.normalizeModelName=o,e.recordDataFor=N,e.recordIdentifierFor=function(e){return W.get(e)},e.relationshipFromMeta=function(e){return new Ze(e)},e.setIdentifierForgetMethod=function(e){c=e},e.setIdentifierGenerationMethod=function(e){d=e},e.setIdentifierResetMethod=function(e){h=e},e.setIdentifierUpdateMethod=function(e){f=e},e.typeForRelationshipMeta=Xe
+e.upgradeForInternal=He,Object.defineProperty(e,"__esModule",{value:!0})})),define("@ember-data/store/index",["exports","@ember-data/store/-private"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.Store}}),Object.defineProperty(e,"normalizeModelName",{enumerable:!0,get:function(){return t.normalizeModelName}}),Object.defineProperty(e,"setIdentifierGenerationMethod",{enumerable:!0,get:function(){return t.setIdentifierGenerationMethod}}),Object.defineProperty(e,"setIdentifierUpdateMethod",{enumerable:!0,get:function(){return t.setIdentifierUpdateMethod}}),Object.defineProperty(e,"setIdentifierForgetMethod",{enumerable:!0,get:function(){return t.setIdentifierForgetMethod}}),Object.defineProperty(e,"setIdentifierResetMethod",{enumerable:!0,get:function(){return t.setIdentifierResetMethod}}),Object.defineProperty(e,"recordIdentifierFor",{enumerable:!0,get:function(){return t.recordIdentifierFor}})})),define("@ember-decorators/component/index",["exports","@ember-decorators/utils/collapse-proto","@ember-decorators/utils/decorator"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.layout=e.tagName=e.attributeBindings=e.classNameBindings=e.classNames=e.className=e.attribute=void 0
+const n=(0,r.decoratorWithParams)((e,r,n,i=[])=>{if((0,t.default)(e),!e.hasOwnProperty("attributeBindings")){let t=e.attributeBindings
+e.attributeBindings=Array.isArray(t)?t.slice():[]}let o=i[0]?`${r}:${i[0]}`:r
+return e.attributeBindings.push(o),n&&(n.configurable=!0),n})
+e.attribute=n
+const i=(0,r.decoratorWithParams)((e,r,n,i=[])=>{if((0,t.default)(e),!e.hasOwnProperty("classNameBindings")){let t=e.classNameBindings
+e.classNameBindings=Array.isArray(t)?t.slice():[]}let o=i.length>0?`${r}:${i.join(":")}`:r
+return e.classNameBindings.push(o),n&&(n.configurable=!0),n})
+function o(e){return(0,r.decoratorWithRequiredParams)((r,n)=>{if((0,t.default)(r.prototype),e in r.prototype){let t=r.prototype[e]
+n.unshift(...t)}return r.prototype[e]=n,r},e)}e.className=i
+const a=o("classNames")
+e.classNames=a
+const s=o("classNameBindings")
+e.classNameBindings=s
+const l=o("attributeBindings")
+e.attributeBindings=l
+const u=(0,r.decoratorWithRequiredParams)((e,t)=>{let[r]=t
+return e.prototype.tagName=r,e},"tagName")
+e.tagName=u
+e.layout=(...e)=>t=>{let[r]=e
+return t.prototype.layout=r,t}})),define("@ember-decorators/object/index",["exports","@ember-decorators/utils/decorator"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.off=e.on=e.unobserves=e.observes=void 0
+const r=(0,t.decoratorWithRequiredParams)((e,t,r,n)=>{for(let i of n)Ember.expandProperties(i,r=>{Ember.addObserver(e,r,null,t)})
+return r},"observes")
+e.observes=r
+const n=(0,t.decoratorWithRequiredParams)((e,t,r,n)=>{for(let i of n)Ember.expandProperties(i,r=>{Ember.removeObserver(e,r,null,t)})
+return r},"unobserves")
+e.unobserves=n
+const i=(0,t.decoratorWithRequiredParams)((e,t,r,n)=>{for(let i of n)Ember.addListener(e,i,null,t)
+return r},"on")
+e.on=i
+const o=(0,t.decoratorWithRequiredParams)((e,t,r,n)=>{for(let i of n)Ember.removeListener(e,i,null,t)
+return r},"off")
+e.off=o})),define("@ember-decorators/utils/-private/class-field-descriptor",["exports"],(function(e){"use strict"
+function t(e){let[t,r,n]=e
+return 3===e.length&&"object"==typeof t&&null!==t&&"string"==typeof r&&("object"==typeof n&&null!==n&&"enumerable"in n&&"configurable"in n||void 0===n)}Object.defineProperty(e,"__esModule",{value:!0}),e.isFieldDescriptor=t,e.isDescriptor=function(e){return t(e)||function(e){let[t]=e
+return 1===e.length&&"function"==typeof t&&"prototype"in t&&!t.__isComputedDecorator}(e)}})),define("@ember-decorators/utils/collapse-proto",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){"function"==typeof e.constructor.proto&&e.constructor.proto()}})),define("@ember-decorators/utils/decorator",["exports","@ember-decorators/utils/-private/class-field-descriptor"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.decoratorWithParams=function(e){return function(...r){return(0,t.isDescriptor)(r)?e(...r):(...t)=>e(...t,r)}},e.decoratorWithRequiredParams=function(e){return function(...t){return(...r)=>e(...r,t)}}})),define("@ember/ordered-set/index",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+let t
+t=class{constructor(){this.clear()}static create(){return new this}clear(){this.presenceSet=Object.create(null),this.list=[],this.size=0}add(e,t){let r=t||Ember.guidFor(e),n=this.presenceSet,i=this.list
+return!0!==n[r]&&(n[r]=!0,this.size=i.push(e)),this}delete(e,t){let r=t||Ember.guidFor(e),n=this.presenceSet,i=this.list
+if(!0===n[r]){delete n[r]
+let t=i.indexOf(e)
+return t>-1&&i.splice(t,1),this.size=i.length,!0}return!1}isEmpty(){return 0===this.size}has(e){if(0===this.size)return!1
+let t=Ember.guidFor(e)
+return!0===this.presenceSet[t]}forEach(e){if(0===this.size)return
+let t=this.list
+if(2===arguments.length)for(let r=0;r<t.length;r++)e.call(arguments[1],t[r])
+else for(let r=0;r<t.length;r++)e(t[r])}toArray(){return this.list.slice()}copy(){let e=new(0,this.constructor)
+e.presenceSet=Object.create(null)
+for(let t in this.presenceSet)e.presenceSet[t]=this.presenceSet[t]
+return e.list=this.toArray(),e.size=this.size,e}},e.default=t})),define("@ember/render-modifiers/modifiers/did-insert",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember._setModifierManager(()=>({capabilities:Ember._modifierManagerCapabilities("3.13",{disableAutoTracking:!0}),createModifier(){},installModifier(e,t,r){let[n,...i]=r.positional
+n(t,i,r.named)},updateModifier(){},destroyModifier(){}}),class{})
+e.default=t})),define("@ember/render-modifiers/modifiers/did-update",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember._setModifierManager(()=>({capabilities:Ember._modifierManagerCapabilities("3.13",{disableAutoTracking:!0}),createModifier:()=>({element:null}),installModifier(e,t){e.element=t},updateModifier({element:e},t){let[r,...n]=t.positional
+r(e,n,t.named)},destroyModifier(){}}),class{})
+e.default=t})),define("@ember/render-modifiers/modifiers/will-destroy",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember._setModifierManager(()=>({capabilities:Ember._modifierManagerCapabilities("3.13",{disableAutoTracking:!0}),createModifier:()=>({element:null}),installModifier(e,t){e.element=t},updateModifier(){},destroyModifier({element:e},t){let[r,...n]=t.positional
+r(e,n,t.named)}}),class{})
+e.default=t})),define("@embroider/macros/runtime",["exports"],(function(e){"use strict"
+function t(e){return n.packages[e]}function r(){return n.global}Object.defineProperty(e,"__esModule",{value:!0}),e.each=function(e){if(!Array.isArray(e))throw new Error("the argument to the each() macro must be an array")
+return e},e.macroCondition=function(e){return e},e.config=t,e.getGlobalConfig=r,e.isTesting=function(){let e=n.global,t=e&&e["@embroider/macros"]
+return Boolean(t&&t.isTesting)}
+const n={packages:{},global:{"@embroider/macros":{isTesting:!1}}}
+let i="undefined"!=typeof window?window._embroider_macros_runtime_config:void 0
+if(i){let e={config:t,getGlobalConfig:r,setConfig(e,t){n.packages[e]=t},setGlobalConfig(e,t){n.global[e]=t}}
+for(let t of i)t(e)}})),define("@embroider/util/ember-private-api",["exports"],(function(e){"use strict"
+let t
+Object.defineProperty(e,"__esModule",{value:!0}),e.lookupCurriedComponentDefinition=function(e,t){let r=function(e){let t=e.lookup("renderer:-dom")._runtimeResolver
+if(t)return t
+let r=Object.entries(e.__container__.cache).find(e=>e[0].startsWith("template-compiler:main-"))
+if(r)return r[1].resolver.resolver
+throw new Error("@embroider/util couldn't locate the runtime resolver on this ember version")}(t)
+if("function"==typeof r.lookupComponentHandle){let i=r.lookupComponentHandle(e,function(e){return{owner:e}}(t))
+if(null!=i)return new n(r.resolve(i),null)}if(!r.lookupComponent(e,t))throw new Error(`Attempted to resolve \`${e}\` via ensureSafeComponent, but nothing was found.`)
+return i(0,e,t,{named:{},positional:[]})},e.isCurriedComponentDefinition=void 0,t=window.Ember.__loader.require("@glimmer/runtime")
+let{isCurriedComponentDefinition:r,CurriedComponentDefinition:n,curry:i,CurriedValue:o}=t
+e.isCurriedComponentDefinition=r,r||(e.isCurriedComponentDefinition=r=function(e){return e instanceof o})})),define("@embroider/util/index",["exports","@embroider/util/ember-private-api"],(function(e,t){"use strict"
+function r(e,r){return"string"==typeof e?function(e,r){let n=Ember.getOwner(r)
+return(0,t.lookupCurriedComponentDefinition)(e,n)}(e,r):(0,t.isCurriedComponentDefinition)(e)||null==e?e:function(e,r){let n=Ember.getOwner(r),i=function(e,t){let r=t.lookup("service:-ensure-registered")
+return r.register(e,t)}(e,n)
+return(0,t.lookupCurriedComponentDefinition)(i,n)}(e,r)}Object.defineProperty(e,"__esModule",{value:!0}),e.ensureSafeComponent=r,e.EnsureSafeComponentHelper=void 0
+class n extends Ember.Helper{compute([e]){return r(e,this)}}e.EnsureSafeComponentHelper=n})),define("@embroider/util/services/ensure-registered",["exports"],(function(e){"use strict"
+function t(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends Ember.Service{constructor(...e){super(...e),t(this,"classNonces",new WeakMap),t(this,"nonceCounter",0)}register(e,t=Ember.getOwner(this)){let r=this.classNonces.get(e)
+return null==r&&(r="-ensure"+this.nonceCounter++,this.classNonces.set(e,r),t.register("component:"+r,e)),r}}e.default=r})),define("@glimmer/component/-private/base-component-manager",["exports","@glimmer/component/-private/component"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,r){return class{static create(e){return new this(t(e))}constructor(t){(function(e,t,r){t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r})(this,"capabilities",r),e(this,t)}createComponent(e,r){return new e(t(this),r.named)}getContext(e){return e}}}})),define("@glimmer/component/-private/component",["exports","@glimmer/component/-private/owner","@glimmer/component/-private/destroyables"],(function(e,t,r){"use strict"
+let n
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.ARGS_SET=void 0,e.ARGS_SET=n
+e.default=class{constructor(e,r){var n,i,o
+o=void 0,(i="args")in(n=this)?Object.defineProperty(n,i,{value:o,enumerable:!0,configurable:!0,writable:!0}):n[i]=o,this.args=r,(0,t.setOwner)(this,e)}get isDestroying(){return(0,r.isDestroying)(this)}get isDestroyed(){return(0,r.isDestroyed)(this)}willDestroy(){}}})),define("@glimmer/component/-private/destroyables",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.isDestroyed=e.isDestroying=void 0
+const t=Ember.__loader.require("@glimmer/runtime").isDestroying
+e.isDestroying=t
+const r=Ember.__loader.require("@glimmer/runtime").isDestroyed
+e.isDestroyed=r})),define("@glimmer/component/-private/ember-component-manager",["exports","@glimmer/component/-private/base-component-manager","@glimmer/component/-private/destroyables"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const{setDestroyed:n,setDestroying:i}=r,o=Ember._componentManagerCapabilities("3.13",{destructor:!0,asyncLifecycleCallbacks:!1,updateHook:!1}),a=Ember.destroy,s=Ember.__loader.require("@glimmer/runtime").registerDestructor
+class l extends((0,t.default)(Ember.setOwner,Ember.getOwner,o)){createComponent(e,t){const r=super.createComponent(e,t)
+return s(r,()=>{r.willDestroy()}),r}destroyComponent(e){a(e)}}var u=l
+e.default=u})),define("@glimmer/component/-private/owner",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.setOwner=void 0
+var t=Ember.setOwner
+e.setOwner=t})),define("@glimmer/component/index",["exports","@glimmer/component/-private/ember-component-manager","@glimmer/component/-private/component"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let n=r.default
+Ember._setComponentManager(e=>new t.default(e),n)
+var i=n
+e.default=i})),define("block-slots/components/block-slot",["exports","block-slots/templates/components/block-slot","block-slots/mixins/slots","block-slots/components/yield-slot"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var i=Ember.Component.extend({layout:t.default,tagName:"",_name:Ember.computed("name",(function(){return this.name})),didInsertElement:function(){const e=this.nearestOfType(r.default)
+if(!e._isRegistered(this._name))return e._activateSlot(this._name),void Ember.set(this,"slottedComponent",e)
+const t=this.nearestOfType(n.default)
+if(t){Ember.set(this,"_yieldSlot",t)
+const e=Ember.get(t,"_name")===this._name
+Ember.set(this,"isTargetSlotYielding",e)
+const r=Ember.get(t,"_blockParams")
+e&&Ember.isPresent(r)&&r.forEach((e,t)=>{Ember.defineProperty(this,"p"+t,Ember.computed.readOnly("_yieldSlot._blockParams."+t))})}},willDestroyElement:function(){this.slottedComponent&&this.slottedComponent._deactivateSlot(this._name)}})
+e.default=i})),define("block-slots/components/yield-slot",["exports","block-slots/templates/components/yield-slot","block-slots/mixins/slots"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.Component.extend({layout:t.default,tagName:"",_name:Ember.computed("name",(function(){return this.name})),_blockParams:Ember.computed("params",(function(){return this.params})),_parentView:Ember.computed((function(){return this.nearestOfType(r.default)})),isActive:Ember.computed("_parentView._slots.[]","_name",(function(){return Ember.get(this,"_parentView._slots").includes(Ember.get(this,"_name"))}))})
+e.default=n})),define("block-slots/helpers/block-params",["exports"],(function(e){"use strict"
+function t(e){return Ember.A(e.slice())}Object.defineProperty(e,"__esModule",{value:!0}),e.blockParams=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("block-slots/index",["exports","block-slots/mixins/slots"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.default
+e.default=r})),define("block-slots/mixins/slots",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Mixin.create({_slots:Ember.computed((function(){return Ember.A()})),_activateSlot(e){Ember.get(this,"_slots").addObject(e)},_deactivateSlot(e){Ember.get(this,"_slots").removeObject(e)},_isRegistered(e){return Ember.get(this,"_slots").includes(e)}})
+e.default=t})),define("block-slots/templates/components/block-slot",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"U4fYBtYO",block:'{"symbols":["&default"],"statements":[[6,[37,11],[[35,10]],null,[["default"],[{"statements":[[2,"  "],[18,1,[[35,9],[35,8],[35,7],[35,6],[35,5],[35,4],[35,3],[35,2],[35,1],[35,0]]],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["p9","p8","p7","p6","p5","p4","p3","p2","p1","p0","isTargetSlotYielding","if"]}',meta:{moduleName:"block-slots/templates/components/block-slot.hbs"}})
+e.default=t})),define("block-slots/templates/components/yield-slot",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"YCQMOgCK",block:'{"symbols":["&else","&default"],"statements":[[6,[37,1],[[35,0]],null,[["default","else"],[{"statements":[[2,"  "],[18,2,null],[2,"\\n"]],"parameters":[]},{"statements":[[2,"  "],[18,1,null],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["isActive","if"]}',meta:{moduleName:"block-slots/templates/components/yield-slot.hbs"}})
+e.default=t})),define("ember-array-fns/helpers/array-concat",["exports"],(function(e){"use strict"
+function t([...e]){return e.reduce((e,t)=>Array.isArray(t)?e.concat(t):e,[])}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayConcat=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-every",["exports"],(function(e){"use strict"
+function t([e,t]){return!!Array.isArray(e)&&e.every(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayEvery=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r}))
+define("ember-array-fns/helpers/array-filter",["exports"],(function(e){"use strict"
+function t([e,t]){return Array.isArray(e)?e.filter(t):[]}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayFilter=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-find-index",["exports"],(function(e){"use strict"
+function t([e,t]){return Array.isArray(e)?e.findIndex(t):-1}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayFindIndex=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-find",["exports"],(function(e){"use strict"
+function t([e,t]){if(Array.isArray(e))return e.find(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayFind=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-includes",["exports"],(function(e){"use strict"
+function t([e,t]){return!!Array.isArray(e)&&e.includes(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayIncludes=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-index-of",["exports"],(function(e){"use strict"
+function t([e,t]){return Array.isArray(e)?e.indexOf(t):-1}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayIndexOf=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-is-array",["exports"],(function(e){"use strict"
+function t([e]){return Ember.isArray(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayIsArray=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-is-first-element",["exports"],(function(e){"use strict"
+function t([e,t]){let r=!1
+return Ember.isArray(e)&&e.length&&t&&(r=e[0]===t),r}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayIsFirstElement=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-is-last-element",["exports"],(function(e){"use strict"
+function t([e,t]){let r=!1
+return Ember.isArray(e)&&e.length&&t&&(r=e[e.length-1]===t),r}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayIsLastElement=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-join",["exports"],(function(e){"use strict"
+function t([e,t]){return Array.isArray(e)?e.join(t):""}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayJoin=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-last-index-of",["exports"],(function(e){"use strict"
+function t([e,t]){return Array.isArray(e)?e.lastIndexOf(t):-1}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayLastIndexOf=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-map",["exports"],(function(e){"use strict"
+function t([e,t]){return Array.isArray(e)?e.map(t):[]}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayMap=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-reduce",["exports"],(function(e){"use strict"
+function t([e,t,r]){return Array.isArray(e)?e.reduce(t,r):[]}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayReduce=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-reverse",["exports"],(function(e){"use strict"
+function t([e]){return Array.isArray(e)?e.reverse():[]}Object.defineProperty(e,"__esModule",{value:!0}),e.arrayReverse=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-slice",["exports"],(function(e){"use strict"
+function t([e,t,r]){let n
+return n=Array.isArray(e)?void 0===r?e.slice(t):e.slice(t,r):[],n}Object.defineProperty(e,"__esModule",{value:!0}),e.arraySlice=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-some",["exports"],(function(e){"use strict"
+function t([e,t]){return!!Array.isArray(e)&&e.some(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.arraySome=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-sort",["exports"],(function(e){"use strict"
+function t([e,t]){return Array.isArray(e)?e.sort(t):[]}Object.defineProperty(e,"__esModule",{value:!0}),e.arraySort=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-array-fns/helpers/array-splice",["exports"],(function(e){"use strict"
+function t([e,t,r,...n]){let i
+return i=Array.isArray(e)?void 0===r?e.splice(r):0===n.length?e.splice(t,r):e.splice(t,r,...n):[],i}Object.defineProperty(e,"__esModule",{value:!0}),e.arraySplice=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-assign-helper/helpers/assign",["exports"],(function(e){"use strict"
+function t(e){return Ember.assign({},...e)}Object.defineProperty(e,"__esModule",{value:!0}),e.assign=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-basic-dropdown/components/basic-dropdown-content",["exports","@glimmer/component","ember-basic-dropdown/utils/calculate-position","ember-basic-dropdown/utils/scroll-helpers","ember-basic-dropdown/utils/has-moved"],(function(e,t,r,n,i){"use strict"
+var o,a,s,l,u,c,d,h,f,p,m,v,g
+function b(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function y(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let _=(o=Ember._tracked,a=Ember._action,s=Ember._action,l=Ember._action,u=Ember._action,c=Ember._action,d=Ember._action,h=Ember._action,f=Ember._action,p=Ember._action,m=Ember._action,v=class extends t.default{constructor(...e){var t,r,n,i
+super(...e),b(this,"transitioningInClass",this.args.transitioningInClass||"ember-basic-dropdown--transitioning-in"),b(this,"transitionedInClass",this.args.transitionedInClass||"ember-basic-dropdown--transitioned-in"),b(this,"transitioningOutClass",this.args.transitioningOutClass||"ember-basic-dropdown--transitioning-out"),b(this,"isTouchDevice",this.args.isTouchDevice||Boolean(!!window&&"ontouchstart"in window)),b(this,"dropdownId","ember-basic-dropdown-content-"+this.args.dropdown.uniqueId),b(this,"touchMoveEvent",void 0),b(this,"handleRootMouseDown",void 0),b(this,"scrollableAncestors",[]),b(this,"mutationObserver",void 0),t=this,r="animationClass",i=this,(n=g)&&Object.defineProperty(t,r,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(i):void 0})}get destinationElement(){return document.getElementById(this.args.destination)}get animationEnabled(){return!0}noop(){}setup(e){let t=document.querySelector(`[data-ebd-id=${this.args.dropdown.uniqueId}-trigger]`)
+this.handleRootMouseDown=r=>{if(null===r.target)return
+let n=r.target;(0,i.default)(r,this.touchMoveEvent)||e.contains(n)||t&&t.contains(n)?this.touchMoveEvent=void 0:!function e(t,r){let n=E(t)
+if(null===n)return!1
+{let t=n.attributes,i=document.querySelector(`[aria-owns=${t.id.value}]`)
+if(null===i)return!1
+let o=E(i)
+if(null===o)return!1
+let a=o.attributes
+return o&&a.id.value===r||e(o,r)}}(n,this.dropdownId)?this.args.dropdown.actions.close(r,!0):this.touchMoveEvent=void 0},document.addEventListener(this.args.rootEventType,this.handleRootMouseDown,!0),window.addEventListener("resize",this.runloopAwareReposition),window.addEventListener("orientationchange",this.runloopAwareReposition),this.isTouchDevice&&(document.addEventListener("touchstart",this.touchStartHandler,!0),document.addEventListener("touchend",this.handleRootMouseDown,!0)),null!==t&&(this.scrollableAncestors=function(e){let t=[]
+if(e){let n=e.parentNode
+if(null!==n){let e=(0,r.getScrollParent)(n)
+for(;e&&"BODY"!==e.tagName.toUpperCase()&&"HTML"!==e.tagName.toUpperCase();){t.push(e)
+let n=e.parentNode
+e=null===n?void 0:(0,r.getScrollParent)(n)}}}return t}(t)),this.addScrollHandling(e)}teardown(){this.removeGlobalEvents(),this.removeScrollHandling(),this.scrollableAncestors=[],document.removeEventListener(this.args.rootEventType,this.handleRootMouseDown,!0),this.isTouchDevice&&(document.removeEventListener("touchstart",this.touchStartHandler,!0),document.removeEventListener("touchend",this.handleRootMouseDown,!0))}animateIn(e){this.animationEnabled&&x(e,()=>{this.animationClass=this.transitionedInClass})}animateOut(e){if(!this.animationEnabled)return
+let t=e.parentElement
+if(null===t)return
+if(this.args.renderInPlace&&(t=t.parentElement),null===t)return
+let r=e.cloneNode(!0)
+r.id=r.id+"--clone",r.classList.remove(...this.transitioningInClass.split(" ")),r.classList.add(...this.transitioningOutClass.split(" ")),t.appendChild(r),this.animationClass=this.transitionedInClass,x(r,(function(){t.removeChild(r)}))}setupMutationObserver(e){this.mutationObserver=new MutationObserver(e=>{let t=e.some(e=>w(e.addedNodes)||w(e.removedNodes))
+t&&this.args.shouldReposition&&(t=this.args.shouldReposition(e,this.args.dropdown)),t&&this.runloopAwareReposition()}),this.mutationObserver.observe(e,{childList:!0,subtree:!0})}teardownMutationObserver(){void 0!==this.mutationObserver&&(this.mutationObserver.disconnect(),this.mutationObserver=void 0)}touchStartHandler(){document.addEventListener("touchmove",this.touchMoveHandler,!0)}touchMoveHandler(e){this.touchMoveEvent=e,document.removeEventListener("touchmove",this.touchMoveHandler,!0)}runloopAwareReposition(){Ember.run.join(this.args.dropdown.actions.reposition)}removeGlobalEvents(){window.removeEventListener("resize",this.runloopAwareReposition),window.removeEventListener("orientationchange",this.runloopAwareReposition)}addScrollHandling(e){if(!0===this.args.preventScroll){let t=t=>{if(null===t.target)return
+let r=t.target
+if(e.contains(r)||e===t.target){const i=(0,n.getAvailableScroll)(r,e)
+let{deltaX:o,deltaY:a}=(0,n.getScrollDeltas)(t)
+o<i.deltaXNegative?(o=i.deltaXNegative,t.preventDefault()):o>i.deltaXPositive?(o=i.deltaXPositive,t.preventDefault()):a<i.deltaYNegative?(a=i.deltaYNegative,t.preventDefault()):a>i.deltaYPositive&&(a=i.deltaYPositive,t.preventDefault()),t.defaultPrevented&&(o||a)&&(0,n.distributeScroll)(o,a,r,e)}else t.preventDefault()}
+document.addEventListener("wheel",t,{capture:!0,passive:!1}),this.removeScrollHandling=()=>{document.removeEventListener("wheel",t,{capture:!0})}}else this.addScrollEvents(),this.removeScrollHandling=this.removeScrollEvents}removeScrollHandling(){}addScrollEvents(){window.addEventListener("scroll",this.runloopAwareReposition),this.scrollableAncestors.forEach(e=>{e.addEventListener("scroll",this.runloopAwareReposition)})}removeScrollEvents(){window.removeEventListener("scroll",this.runloopAwareReposition),this.scrollableAncestors.forEach(e=>{e.removeEventListener("scroll",this.runloopAwareReposition)})}},g=y(v.prototype,"animationClass",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return this.animationEnabled?this.transitioningInClass:""}}),y(v.prototype,"setup",[a],Object.getOwnPropertyDescriptor(v.prototype,"setup"),v.prototype),y(v.prototype,"teardown",[s],Object.getOwnPropertyDescriptor(v.prototype,"teardown"),v.prototype),y(v.prototype,"animateIn",[l],Object.getOwnPropertyDescriptor(v.prototype,"animateIn"),v.prototype),y(v.prototype,"animateOut",[u],Object.getOwnPropertyDescriptor(v.prototype,"animateOut"),v.prototype),y(v.prototype,"setupMutationObserver",[c],Object.getOwnPropertyDescriptor(v.prototype,"setupMutationObserver"),v.prototype),y(v.prototype,"teardownMutationObserver",[d],Object.getOwnPropertyDescriptor(v.prototype,"teardownMutationObserver"),v.prototype),y(v.prototype,"touchStartHandler",[h],Object.getOwnPropertyDescriptor(v.prototype,"touchStartHandler"),v.prototype),y(v.prototype,"touchMoveHandler",[f],Object.getOwnPropertyDescriptor(v.prototype,"touchMoveHandler"),v.prototype),y(v.prototype,"runloopAwareReposition",[p],Object.getOwnPropertyDescriptor(v.prototype,"runloopAwareReposition"),v.prototype),y(v.prototype,"removeGlobalEvents",[m],Object.getOwnPropertyDescriptor(v.prototype,"removeGlobalEvents"),v.prototype),v)
+function w(e){for(let t=0;t<e.length;t++){const r=e[t]
+if("#comment"!==r.nodeName&&("#text"!==r.nodeName||""!==r.nodeValue))return!0}return!1}function E(e){for(;e&&(!e.classList||!e.classList.contains("ember-basic-dropdown-content"));){if(null===e.parentElement)return null
+e=e.parentElement}return e}function x(e,t){window.requestAnimationFrame((function(){let r=window.getComputedStyle(e)
+if("none"!==r.animationName&&"running"===r.animationPlayState){let r=function(){e.removeEventListener("animationend",r),t()}
+e.addEventListener("animationend",r)}else t()}))}e.default=_})),define("ember-basic-dropdown/components/basic-dropdown-optional-tag",["exports","@glimmer/component"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends t.default{}e.default=r})),define("ember-basic-dropdown/components/basic-dropdown-trigger",["exports","@glimmer/component","ember-basic-dropdown/utils/has-moved"],(function(e,t,r){"use strict"
+var n,i,o,a,s,l,u,c,d
+function h(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function f(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let p=(n=Ember._action,i=Ember._action,o=Ember._action,a=Ember._action,s=Ember._action,l=Ember._action,u=Ember._action,c=Ember._action,f((d=class extends t.default{constructor(...e){super(...e),h(this,"toggleIsBeingHandledByTouchEvents",!1),h(this,"touchMoveEvent",void 0)}noop(){}handleMouseDown(e){this.args.dropdown.disabled||"mousedown"===this.args.eventType&&0===e.button&&(this.args.stopPropagation&&e.stopPropagation(),this._stopTextSelectionUntilMouseup(),this.toggleIsBeingHandledByTouchEvents?this.toggleIsBeingHandledByTouchEvents=!1:this.args.dropdown.actions.toggle(e))}handleClick(e){"undefined"!=typeof document&&(this.isDestroyed||!this.args.dropdown||this.args.dropdown.disabled||void 0!==this.args.eventType&&"click"!==this.args.eventType||0!==e.button||(this.args.stopPropagation&&e.stopPropagation(),this.toggleIsBeingHandledByTouchEvents?this.toggleIsBeingHandledByTouchEvents=!1:this.args.dropdown.actions.toggle(e)))}handleKeyDown(e){this.args.dropdown.disabled||(13===e.keyCode?this.args.dropdown.actions.toggle(e):32===e.keyCode?(e.preventDefault(),this.args.dropdown.actions.toggle(e)):27===e.keyCode&&this.args.dropdown.actions.close(e))}handleTouchStart(){document.addEventListener("touchmove",this._touchMoveHandler)}handleTouchEnd(e){if(this.toggleIsBeingHandledByTouchEvents=!0,e&&e.defaultPrevented||this.args.dropdown.disabled)return;(0,r.default)(e,this.touchMoveEvent)||this.args.dropdown.actions.toggle(e),this.touchMoveEvent=void 0,document.removeEventListener("touchmove",this._touchMoveHandler)
+let t=e.target
+null!==t&&t.focus(),setTimeout((function(){if(e.target)try{let t=document.createEvent("MouseEvents")
+t.initMouseEvent("click",!0,!0,window,0,0,0,0,0,!1,!1,!1,!1,0,null),e.target.dispatchEvent(t)}catch(e){event=new Event("click"),e.target.dispatchEvent(event)}}),0),e.preventDefault()}removeGlobalHandlers(){"undefined"!=typeof document&&(document.removeEventListener("touchmove",this._touchMoveHandler),document.removeEventListener("mouseup",this._mouseupHandler,!0))}_mouseupHandler(){document.removeEventListener("mouseup",this._mouseupHandler,!0),document.body.classList.remove("ember-basic-dropdown-text-select-disabled")}_touchMoveHandler(e){this.touchMoveEvent=e,document.removeEventListener("touchmove",this._touchMoveHandler)}_stopTextSelectionUntilMouseup(){document.addEventListener("mouseup",this._mouseupHandler,!0),document.body.classList.add("ember-basic-dropdown-text-select-disabled")}}).prototype,"handleMouseDown",[n],Object.getOwnPropertyDescriptor(d.prototype,"handleMouseDown"),d.prototype),f(d.prototype,"handleClick",[i],Object.getOwnPropertyDescriptor(d.prototype,"handleClick"),d.prototype),f(d.prototype,"handleKeyDown",[o],Object.getOwnPropertyDescriptor(d.prototype,"handleKeyDown"),d.prototype),f(d.prototype,"handleTouchStart",[a],Object.getOwnPropertyDescriptor(d.prototype,"handleTouchStart"),d.prototype),f(d.prototype,"handleTouchEnd",[s],Object.getOwnPropertyDescriptor(d.prototype,"handleTouchEnd"),d.prototype),f(d.prototype,"removeGlobalHandlers",[l],Object.getOwnPropertyDescriptor(d.prototype,"removeGlobalHandlers"),d.prototype),f(d.prototype,"_mouseupHandler",[u],Object.getOwnPropertyDescriptor(d.prototype,"_mouseupHandler"),d.prototype),f(d.prototype,"_touchMoveHandler",[c],Object.getOwnPropertyDescriptor(d.prototype,"_touchMoveHandler"),d.prototype),d)
+e.default=p})),define("ember-basic-dropdown/components/basic-dropdown",["exports","@glimmer/component","ember-basic-dropdown/utils/calculate-position"],(function(e,t,r){"use strict"
+var n,i,o,a,s,l,u,c,d,h,f,p,m,v,g,b,y,_,w,E,x,O,S,T,M
+function A(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function P(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function C(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const k={},R=["top","left","right","width","height"]
+let j=(n=Ember._tracked,i=Ember._tracked,o=Ember._tracked,a=Ember._tracked,s=Ember._tracked,l=Ember._tracked,u=Ember._tracked,c=Ember._tracked,d=Ember._tracked,h=Ember._tracked,f=Ember._action,p=Ember._action,m=Ember._action,v=Ember._action,g=class extends t.default{get horizontalPosition(){return this.args.horizontalPosition||"auto"}get verticalPosition(){return this.args.verticalPosition||"auto"}get destination(){return this.args.destination||this._getDestinationId()}get disabled(){let e=this.args.disabled||!1
+return this._previousDisabled!==k&&this._previousDisabled!==e&&Ember.run.schedule("actions",()=>{e&&this.publicAPI.isOpen&&(this.isOpen=!1),this.args.registerAPI&&this.args.registerAPI(this.publicAPI)}),this._previousDisabled=e,e}get publicAPI(){return{uniqueId:this._uid,isOpen:this.isOpen,disabled:this.disabled,actions:this._actions}}constructor(e,t){super(e,t),A(this,"hPosition",b,this),A(this,"vPosition",y,this),A(this,"top",_,this),A(this,"left",w,this),A(this,"right",E,this),A(this,"width",x,this),A(this,"height",O,this),A(this,"otherStyles",S,this),A(this,"isOpen",T,this),A(this,"renderInPlace",M,this),P(this,"previousVerticalPosition",void 0),P(this,"previousHorizontalPosition",void 0),P(this,"destinationElement",void 0),P(this,"_uid",Ember.guidFor(this)),P(this,"_dropdownId",this.args.dropdownId||"ember-basic-dropdown-content-"+this._uid),P(this,"_previousDisabled",k),P(this,"_actions",{open:this.open,close:this.close,toggle:this.toggle,reposition:this.reposition}),this.args.onInit&&this.args.onInit(this.publicAPI),this.args.registerAPI&&this.args.registerAPI(this.publicAPI)}willDestroy(){super.willDestroy(),this.args.registerAPI&&this.args.registerAPI(null)}open(e){this.isDestroyed||this.publicAPI.disabled||this.publicAPI.isOpen||this.args.onOpen&&!1===this.args.onOpen(this.publicAPI,e)||(this.isOpen=!0,this.args.registerAPI&&this.args.registerAPI(this.publicAPI))}close(e,t){if(this.isDestroyed)return
+if(this.publicAPI.disabled||!this.publicAPI.isOpen)return
+if(this.args.onClose&&!1===this.args.onClose(this.publicAPI,e))return
+if(this.isDestroyed)return
+if(this.hPosition=this.vPosition=null,this.top=this.left=this.right=this.width=this.height=void 0,this.previousVerticalPosition=this.previousHorizontalPosition=void 0,this.isOpen=!1,this.args.registerAPI&&this.args.registerAPI(this.publicAPI),t)return
+let r=document.querySelector(`[data-ebd-id=${this.publicAPI.uniqueId}-trigger]`)
+r&&r.tabIndex>-1&&r.focus()}toggle(e){this.publicAPI.isOpen?this.close(e):this.open(e)}reposition(){if(!this.publicAPI.isOpen)return
+let e=document.getElementById(this._dropdownId),t=document.querySelector(`[data-ebd-id=${this.publicAPI.uniqueId}-trigger]`)
+if(!e||!t)return
+this.destinationElement=this.destinationElement||document.getElementById(this.destination)
+let{horizontalPosition:n,verticalPosition:i,previousHorizontalPosition:o,previousVerticalPosition:a}=this,{renderInPlace:s=!1,matchTriggerWidth:l=!1}=this.args,u=(this.args.calculatePosition||r.default)(t,e,this.destinationElement,{horizontalPosition:n,verticalPosition:i,previousHorizontalPosition:o,previousVerticalPosition:a,renderInPlace:s,matchTriggerWidth:l,dropdown:this})
+return this.applyReposition(t,e,u)}applyReposition(e,t,r){let n={hPosition:r.horizontalPosition,vPosition:r.verticalPosition,otherStyles:Ember.assign({},this.otherStyles)}
+if(r.style&&(void 0!==r.style.top&&(n.top=r.style.top+"px"),void 0!==r.style.left?(n.left=r.style.left+"px",n.right=void 0,void 0!==r.style.right&&(r.style.right=void 0)):void 0!==r.style.right&&(n.right=r.style.right+"px",n.left=void 0),void 0!==r.style.width&&(n.width=r.style.width+"px"),void 0!==r.style.height&&(n.height=r.style.height+"px"),void 0===this.top))for(let i in r.style)void 0!==r.style[i]&&("number"==typeof r.style[i]?t.style.setProperty(i,r.style[i]+"px"):t.style.setProperty(i,""+r.style[i]))
+for(let i in r.style)-1===R.indexOf(i)&&(n.otherStyles,n.otherStyles[i]=r.style[i])
+return this.hPosition=n.hPosition,this.vPosition=n.vPosition,this.top=n.top,this.left=n.left,this.right=n.right,this.width=n.width,this.height=n.height,this.otherStyles=n.otherStyles,this.previousHorizontalPosition=r.horizontalPosition,this.previousVerticalPosition=r.verticalPosition,n}_getDestinationId(){let e=Ember.getOwner(this).resolveRegistration("config:environment")
+return e["ember-basic-dropdown"]&&e["ember-basic-dropdown"].destination||"ember-basic-dropdown-wormhole"}},b=C(g.prototype,"hPosition",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return null}}),y=C(g.prototype,"vPosition",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return null}}),_=C(g.prototype,"top",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=C(g.prototype,"left",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=C(g.prototype,"right",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=C(g.prototype,"width",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=C(g.prototype,"height",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=C(g.prototype,"otherStyles",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return{}}}),T=C(g.prototype,"isOpen",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return this.args.initiallyOpened||!1}}),M=C(g.prototype,"renderInPlace",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return void 0!==this.args.renderInPlace&&this.args.renderInPlace}}),C(g.prototype,"open",[f],Object.getOwnPropertyDescriptor(g.prototype,"open"),g.prototype),C(g.prototype,"close",[p],Object.getOwnPropertyDescriptor(g.prototype,"close"),g.prototype),C(g.prototype,"toggle",[m],Object.getOwnPropertyDescriptor(g.prototype,"toggle"),g.prototype),C(g.prototype,"reposition",[v],Object.getOwnPropertyDescriptor(g.prototype,"reposition"),g.prototype),g)
+e.default=j})),define("ember-basic-dropdown/templates/components/basic-dropdown-content",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"R3nPwnxq",block:'{"symbols":["@renderInPlace","@overlay","@htmlTag","@defaultClass","@vPosition","@hPosition","@dir","&attrs","@height","@width","@right","@left","@top","@otherStyles","@dropdown","@onFocusIn","@onFocusOut","@onMouseEnter","@onMouseLeave","&default"],"statements":[[6,[37,2],[[32,15,["isOpen"]]],null,[["default","else"],[{"statements":[[2,"  "],[10,"div"],[14,0,"ember-basic-dropdown-content-wormhole-origin"],[12],[2,"\\n"],[8,"maybe-in-element",[],[["@destinationElement","@renderInPlace"],[[32,0,["destinationElement"]],[32,1]]],[["default"],[{"statements":[[6,[37,2],[[32,2]],null,[["default"],[{"statements":[[2,"        "],[10,"div"],[14,0,"ember-basic-dropdown-overlay"],[12],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n      "],[8,"basic-dropdown-optional-tag",[[16,1,[32,0,["dropdownId"]]],[16,0,[31,["ember-basic-dropdown-content ember-basic-dropdown-content--",[32,6],"\\n          ember-basic-dropdown-content--",[32,5],"\\n          ",[32,0,["animationClass"]],[30,[36,2],[[32,1]," ember-basic-dropdown-content--in-place"],null],"\\n          ",[32,4]]]],[16,"dir",[32,7]],[17,8],[4,[38,1],[[32,14],[30,[36,0],null,[["top","left","right","width","height"],[[32,13],[32,12],[32,11],[32,10],[32,9]]]]],null],[4,[38,3],[[32,0,["setup"]]],null],[4,[38,3],[[32,15,["actions","reposition"]]],null],[4,[38,3],[[32,0,["setupMutationObserver"]]],null],[4,[38,3],[[32,0,["animateIn"]]],null],[4,[38,4],[[32,0,["teardownMutationObserver"]]],null],[4,[38,4],[[32,0,["animateOut"]]],null],[4,[38,4],[[32,0,["teardown"]]],null],[4,[38,7],["focusin",[30,[36,6],[[30,[36,5],[[32,16],[32,0,["noop"]]],null],[32,15]],null]],null],[4,[38,7],["focusout",[30,[36,6],[[30,[36,5],[[32,17],[32,0,["noop"]]],null],[32,15]],null]],null],[4,[38,7],["mouseenter",[30,[36,6],[[30,[36,5],[[32,18],[32,0,["noop"]]],null],[32,15]],null]],null],[4,[38,7],["mouseleave",[30,[36,6],[[30,[36,5],[[32,19],[32,0,["noop"]]],null],[32,15]],null]],null]],[["@htmlTag"],[[32,3]]],[["default"],[{"statements":[[2,"\\n        "],[18,20,null],[2,"\\n      "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]}]]],[2,"  "],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"  "],[11,"div"],[16,1,[32,0,["dropdownId"]]],[24,0,"ember-basic-dropdown-content-placeholder"],[4,[38,1],[[30,[36,0],null,[["display"],["none"]]]],null],[12],[13],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["hash","style","if","did-insert","will-destroy","or","fn","on"]}',meta:{moduleName:"ember-basic-dropdown/templates/components/basic-dropdown-content.hbs"}})
+e.default=t})),define("ember-basic-dropdown/templates/components/basic-dropdown-optional-tag",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"Q9DGvJ5B",block:'{"symbols":["Element","&attrs","&default","@htmlTag"],"statements":[[6,[37,4],[[32,4]],null,[["default","else"],[{"statements":[[6,[37,3],[[30,[36,2],[[30,[36,1],[[30,[36,0],[[32,4]],null]],null]],[["tagName"],[[32,4]]]]],null,[["default"],[{"statements":[[2,"    "],[8,[32,1],[[17,2]],[[],[]],[["default"],[{"statements":[[2,"\\n      "],[18,3,null],[2,"\\n    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[1]}]]]],"parameters":[]},{"statements":[[2,"  "],[11,"div"],[17,2],[12],[2,"\\n    "],[18,3,null],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["-element","ensure-safe-component","component","let","if"]}',meta:{moduleName:"ember-basic-dropdown/templates/components/basic-dropdown-optional-tag.hbs"}})
+e.default=t})),define("ember-basic-dropdown/templates/components/basic-dropdown-trigger",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"jZRzzMg+",block:'{"symbols":["@htmlTag","@defaultClass","@vPosition","@hPosition","@renderInPlace","@dropdown","&attrs","@onKeyDown","@onMouseDown","@onTouchEnd","@onClick","@onMouseEnter","@onMouseLeave","@onFocus","@onBlur","@onFocusIn","@onFocusOut","&default"],"statements":[[8,"basic-dropdown-optional-tag",[[16,0,[31,["ember-basic-dropdown-trigger\\n    ",[30,[36,1],[[32,5]," ember-basic-dropdown-trigger--in-place"],null],"\\n    ",[30,[36,1],[[32,4],[30,[36,0],[" ember-basic-dropdown-trigger--",[32,4]],null]],null],"\\n    ",[30,[36,1],[[32,3],[30,[36,0],[" ember-basic-dropdown-trigger--",[32,3]],null]],null],"\\n    ",[32,2]]]],[24,"role","button"],[16,"tabindex",[30,[36,2],[[32,6,["disabled"]],"0"],null]],[16,"data-ebd-id",[31,[[32,6,["uniqueId"]],"-trigger"]]],[16,"aria-owns",[31,["ember-basic-dropdown-content-",[32,6,["uniqueId"]]]]],[16,"aria-expanded",[31,[[32,6,["isOpen"]]]]],[16,"aria-disabled",[30,[36,1],[[32,6,["disabled"]],"true"],null]],[17,7],[4,[38,3],[[32,0,["removeGlobalHandlers"]]],null],[4,[38,4],["mousedown",[32,0,["handleMouseDown"]]],null],[4,[38,4],["click",[32,0,["handleClick"]]],null],[4,[38,4],["keydown",[32,0,["handleKeyDown"]]],null],[4,[38,4],["touchstart",[32,0,["handleTouchStart"]]],null],[4,[38,4],["touchend",[32,0,["handleTouchEnd"]]],null],[4,[38,4],["keydown",[30,[36,6],[[30,[36,5],[[32,8],[32,0,["noop"]]],null],[32,6]],null]],null],[4,[38,4],["mousedown",[30,[36,6],[[30,[36,5],[[32,9],[32,0,["noop"]]],null],[32,6]],null]],null],[4,[38,4],["touchend",[30,[36,6],[[30,[36,5],[[32,10],[32,0,["noop"]]],null],[32,6]],null]],null],[4,[38,4],["click",[30,[36,6],[[30,[36,5],[[32,11],[32,0,["noop"]]],null],[32,6]],null]],null],[4,[38,4],["mouseenter",[30,[36,6],[[30,[36,5],[[32,12],[32,0,["noop"]]],null],[32,6]],null]],null],[4,[38,4],["mouseleave",[30,[36,6],[[30,[36,5],[[32,13],[32,0,["noop"]]],null],[32,6]],null]],null],[4,[38,4],["focus",[30,[36,6],[[30,[36,5],[[32,14],[32,0,["noop"]]],null],[32,6]],null]],null],[4,[38,4],["blur",[30,[36,6],[[30,[36,5],[[32,15],[32,0,["noop"]]],null],[32,6]],null]],null],[4,[38,4],["focusin",[30,[36,6],[[30,[36,5],[[32,16],[32,0,["noop"]]],null],[32,6]],null]],null],[4,[38,4],["focusout",[30,[36,6],[[30,[36,5],[[32,17],[32,0,["noop"]]],null],[32,6]],null]],null]],[["@htmlTag"],[[32,1]]],[["default"],[{"statements":[[2,"\\n  "],[18,18,null],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["concat","if","unless","will-destroy","on","or","fn"]}',meta:{moduleName:"ember-basic-dropdown/templates/components/basic-dropdown-trigger.hbs"}})
+e.default=t})),define("ember-basic-dropdown/templates/components/basic-dropdown",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"ywIj04f8",block:'{"symbols":["api","&default","&attrs","@rootEventType","@preventScroll","@contentComponent","@triggerComponent"],"statements":[[6,[37,7],[[30,[36,6],null,[["uniqueId","isOpen","disabled","actions","Trigger","Content"],[[32,0,["publicAPI","uniqueId"]],[32,0,["publicAPI","isOpen"]],[32,0,["publicAPI","disabled"]],[32,0,["publicAPI","actions"]],[30,[36,0],[[30,[36,5],[[32,7],[29]],null],[30,[36,4],["basic-dropdown-trigger"],[["dropdown","hPosition","renderInPlace","vPosition"],[[30,[36,1],[[32,0,["publicAPI"]]],null],[30,[36,1],[[32,0,["hPosition"]]],null],[30,[36,1],[[32,0,["renderInPlace"]]],null],[30,[36,1],[[32,0,["vPosition"]]],null]]]],[30,[36,4],[[30,[36,3],[[32,7]],null]],[["dropdown","hPosition","renderInPlace","vPosition"],[[30,[36,1],[[32,0,["publicAPI"]]],null],[30,[36,1],[[32,0,["hPosition"]]],null],[30,[36,1],[[32,0,["renderInPlace"]]],null],[30,[36,1],[[32,0,["vPosition"]]],null]]]]],null],[30,[36,0],[[30,[36,5],[[32,6],[29]],null],[30,[36,4],["basic-dropdown-content"],[["dropdown","hPosition","renderInPlace","preventScroll","rootEventType","vPosition","destination","top","left","right","width","height","otherStyles"],[[30,[36,1],[[32,0,["publicAPI"]]],null],[30,[36,1],[[32,0,["hPosition"]]],null],[30,[36,1],[[32,0,["renderInPlace"]]],null],[30,[36,1],[[32,5]],null],[30,[36,2],[[32,4],"click"],null],[30,[36,1],[[32,0,["vPosition"]]],null],[30,[36,1],[[32,0,["destination"]]],null],[30,[36,1],[[32,0,["top"]]],null],[30,[36,1],[[32,0,["left"]]],null],[30,[36,1],[[32,0,["right"]]],null],[30,[36,1],[[32,0,["width"]]],null],[30,[36,1],[[32,0,["height"]]],null],[30,[36,1],[[32,0,["otherStyles"]]],null]]]],[30,[36,4],[[30,[36,3],[[32,6]],null]],[["dropdown","hPosition","renderInPlace","preventScroll","rootEventType","vPosition","destination","top","left","right","width","height","otherStyles"],[[30,[36,1],[[32,0,["publicAPI"]]],null],[30,[36,1],[[32,0,["hPosition"]]],null],[30,[36,1],[[32,0,["renderInPlace"]]],null],[30,[36,1],[[32,5]],null],[30,[36,2],[[32,4],"click"],null],[30,[36,1],[[32,0,["vPosition"]]],null],[30,[36,1],[[32,0,["destination"]]],null],[30,[36,1],[[32,0,["top"]]],null],[30,[36,1],[[32,0,["left"]]],null],[30,[36,1],[[32,0,["right"]]],null],[30,[36,1],[[32,0,["width"]]],null],[30,[36,1],[[32,0,["height"]]],null],[30,[36,1],[[32,0,["otherStyles"]]],null]]]]],null]]]]],null,[["default"],[{"statements":[[6,[37,0],[[32,0,["renderInPlace"]]],null,[["default","else"],[{"statements":[[2,"    "],[11,"div"],[24,0,"ember-basic-dropdown"],[17,3],[12],[18,2,[[32,1]]],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[18,2,[[32,1]]],[2,"\\n"]],"parameters":[]}]]]],"parameters":[1]}]]]],"hasEval":false,"upvars":["if","readonly","or","ensure-safe-component","component","eq","hash","with"]}',meta:{moduleName:"ember-basic-dropdown/templates/components/basic-dropdown.hbs"}})
+e.default=t})),define("ember-basic-dropdown/utils/calculate-position",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.getScrollParent=function(e){let t=window.getComputedStyle(e),r="absolute"===t.position,n=/(auto|scroll)/
+if("fixed"===t.position)return document.body
+for(let i=e;i=i.parentElement;)if(t=window.getComputedStyle(i),(!r||"static"!==t.position)&&n.test(t.overflow+t.overflowY+t.overflowX))return i
+return document.body},e.default=e.calculateInPlacePosition=e.calculateWormholedPosition=void 0
+let t=(e,t,r,{horizontalPosition:n,verticalPosition:i,matchTriggerWidth:o,previousHorizontalPosition:a,previousVerticalPosition:s})=>{let l=window.pageXOffset,u=window.pageYOffset,{left:c,top:d,width:h,height:f}=e.getBoundingClientRect(),{height:p,width:m}=t.getBoundingClientRect(),v=document.body.clientWidth||window.innerWidth,g={},b=r.parentNode,y=window.getComputedStyle(b).position
+for(;"relative"!==y&&"absolute"!==y&&"BODY"!==b.tagName.toUpperCase();)b=b.parentNode,y=window.getComputedStyle(b).position
+if("relative"===y||"absolute"===y){let e=b.getBoundingClientRect()
+c-=e.left,d-=e.top
+let{offsetParent:t}=b
+t&&(c-=t.scrollLeft,d-=t.scrollTop)}m=o?h:m,o&&(g.width=m)
+let _=c+l
+if("auto"===n||"auto-left"===n){let e=Math.min(v,c+m)-Math.max(0,c),t=Math.min(v,c+h)-Math.max(0,c+h-m)
+n=m>e&&t>e?"right":m>t&&e>t?"left":a||"left"}else if("auto-right"===n){let e=Math.min(v,c+m)-Math.max(0,c),t=Math.min(v,c+h)-Math.max(0,c+h-m)
+n=m>t&&e>t?"left":m>e&&t>e?"right":a||"right"}"right"===n?g.right=v-(_+h):g.left="center"===n?_+(h-m)/2:_
+let w=d
+if("relative"===window.getComputedStyle(document.body).getPropertyValue("position")||(w+=u),"above"===i)g.top=w-p
+else if("below"===i)g.top=w+f
+else{let e=w+f+p<u+window.innerHeight,t=d>p
+i=e||t?"below"===s&&!e&&t?"above":"above"===s&&!t&&e?"below":s||(e?"below":"above"):"below",g.top=w+("below"===i?f:-p)}return{horizontalPosition:n,verticalPosition:i,style:g}}
+e.calculateWormholedPosition=t
+let r=(e,t,r,{horizontalPosition:n,verticalPosition:i})=>{let o,a={horizontalPosition:"left",verticalPosition:"below",style:{}}
+if("auto"===n){let r=e.getBoundingClientRect()
+o=t.getBoundingClientRect()
+let n=window.pageXOffset+window.innerWidth
+a.horizontalPosition=r.left+o.width>n?"right":"left"}else if("center"===n){let{width:r}=e.getBoundingClientRect(),{width:n}=t.getBoundingClientRect()
+a.style={left:(r-n)/2}}else if("auto-right"===n){let r=e.getBoundingClientRect(),n=t.getBoundingClientRect()
+a.horizontalPosition=r.right>n.width?"right":"left"}else"right"===n&&(a.horizontalPosition="right")
+return"above"===i?(a.verticalPosition=i,o=o||t.getBoundingClientRect(),a.style.top=-o.height):a.verticalPosition="below",a}
+e.calculateInPlacePosition=r
+var n=(e,n,i,o)=>o.renderInPlace?r(e,n,0,o):t(e,n,i,o)
+e.default=n})),define("ember-basic-dropdown/utils/has-moved",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){var r
+if(!t)return!1
+if(null===(r=e.changedTouches)||void 0===r||!r[0]||"stylus"!==t.changedTouches[0].touchType)return!0
+let n=Math.abs(t.changedTouches[0].pageX-e.changedTouches[0].pageX),i=Math.abs(t.changedTouches[0].pageY-e.changedTouches[0].pageY)
+return n>=5||i>=5}})),define("ember-basic-dropdown/utils/scroll-helpers",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.getScrollDeltas=function({deltaX:e=0,deltaY:t=0,deltaMode:n=0}){if(0!==n){2===n&&(e*=3,t*=3)
+const i=r()
+void 0!==i&&(e*=i,t*=i)}return{deltaX:e,deltaY:t}},e.getScrollLineHeight=r,e.getAvailableScroll=function(e,t){const r={deltaXNegative:0,deltaXPositive:0,deltaYNegative:0,deltaYPositive:0}
+let n,i
+for(;t.contains(e)||t===e;){n=e.scrollWidth-e.clientWidth,i=e.scrollHeight-e.clientHeight,r.deltaXNegative+=-e.scrollLeft,r.deltaXPositive+=n-e.scrollLeft,r.deltaYNegative+=-e.scrollTop,r.deltaYPositive+=i-e.scrollTop
+let t=e.parentNode
+if(null===t)break
+e=t}return r},e.distributeScroll=function(e,t,r,n){const i=function e(t,r,n,i,o=[]){const a={element:n,scrollLeft:0,scrollTop:0},s=n.scrollWidth-n.clientWidth,l=n.scrollHeight-n.clientHeight,u={deltaXNegative:-n.scrollLeft,deltaXPositive:s-n.scrollLeft,deltaYNegative:-n.scrollTop,deltaYPositive:l-n.scrollTop},c=window.getComputedStyle(n)
+"hidden"!==c.overflowX&&(a.scrollLeft=n.scrollLeft+t,t>u.deltaXPositive?t-=u.deltaXPositive:t<u.deltaXNegative?t-=u.deltaXNegative:t=0)
+"hidden"!==c.overflowY&&(a.scrollTop=n.scrollTop+r,r>u.deltaYPositive?r-=u.deltaYPositive:r<u.deltaYNegative?r-=u.deltaYNegative:r=0)
+if(n!==i&&(t||r))return e(t,r,n.parentNode,i,o.concat([a]))
+return o.concat([a])}(e,t,r,n)
+let o
+for(let a=0;a<i.length;a++)o=i[a],o.element.scrollLeft=o.scrollLeft,o.element.scrollTop=o.scrollTop},e.LINES_PER_PAGE=e.DOM_DELTA_PAGE=e.DOM_DELTA_LINE=e.DOM_DELTA_PIXEL=void 0
+e.DOM_DELTA_PIXEL=0
+e.DOM_DELTA_LINE=1
+e.DOM_DELTA_PAGE=2
+e.LINES_PER_PAGE=3
+let t=void 0
+function r(){if(void 0===t){const e=document.createElement("iframe")
+e.src="#",e.style.position="absolute",e.style.visibility="hidden",e.style.width="0px",e.style.height="0px",e.style.border="none",document.body.appendChild(e)
+const r=e.contentWindow.document
+r.open(),r.write("<!doctype html><html><head></head><body><span>X</span></body></html>"),r.close()
+let n=r.body
+t=n.firstElementChild.offsetHeight,document.body.removeChild(e)}return t}})),define("ember-can/ability",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class t extends Ember.Object{parseProperty(e){return Ember.String.camelize("can-"+e)}getAbility(e){return this.get(this.parseProperty(e))}}e.default=t}))
+define("ember-can/computed",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.ability=function(e,t){return t=t||e,Ember.computed(t,(function(){return Ember.getOwner(this).lookup("service:abilities").abilityFor(e,Ember.get(this,t))})).readOnly()}})),define("ember-can/helpers/can",["exports"],(function(e){"use strict"
+var t,r,n
+function i(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let o=(t=Ember.inject.service("abilities"),r=class extends Ember.Helper{constructor(...e){var t,r,o,a
+super(...e),t=this,r="abilities",a=this,(o=n)&&Object.defineProperty(t,r,{enumerable:o.enumerable,configurable:o.configurable,writable:o.writable,value:o.initializer?o.initializer.call(a):void 0}),i(this,"ability",void 0),i(this,"propertyName",void 0)}compute([e,t],r){let{abilityName:n,propertyName:i}=this.abilities.parse(e),o=this.abilities.abilityFor(n,t,r)
+return i=o.parseProperty(i),this._removeAbilityObserver(),this._addAbilityObserver(o,i),Ember.get(o,i)}destroy(){return this._removeAbilityObserver(),super.destroy(...arguments)}_addAbilityObserver(e,t){Ember.setProperties(this,{ability:e,propertyName:t}),Ember.addObserver(this,"ability."+t,this,"recompute")}_removeAbilityObserver(){Ember.removeObserver(this,"ability."+this.propertyName,this,"recompute"),this.ability&&this.ability.destroy(),Ember.setProperties(this,{ability:null,propertyName:null})}},a=r.prototype,s="abilities",l=[t],u={configurable:!0,enumerable:!0,writable:!0,initializer:null},d={},Object.keys(u).forEach((function(e){d[e]=u[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=l.slice().reverse().reduce((function(e,t){return t(a,s,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(a,s,d),d=null),n=d,r)
+var a,s,l,u,c,d
+e.default=o})),define("ember-can/helpers/cannot",["exports","ember-can/helpers/can"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends t.default{compute(){return!super.compute(...arguments)}}e.default=r})),define("ember-can/index",["exports","ember-can/ability"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"Ability",{enumerable:!0,get:function(){return t.default}})})),define("ember-can/initializers/setup-ember-can",["exports","ember-resolver"],(function(e,t){"use strict"
+function r(){}Object.defineProperty(e,"__esModule",{value:!0}),e.initialize=r,e.default=void 0,t.default.reopen({init(){this._super(...arguments),this.set("pluralizedTypes.ability","abilities")}})
+var n={initialize:r}
+e.default=n})),define("ember-can/services/abilities",["exports","ember-can/ability","ember-can/utils/normalize"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends Ember.Service{parse(e){return(0,r.default)(e)}abilityFor(e,t,r={}){let n=Ember.getOwner(this).factoryFor("ability:"+e)
+void 0!==t&&(r={model:t,...r})
+let i=n.create(r)
+return i}valueFor(e,t,r,n){let i=this.abilityFor(t,r,n),o=i.getAbility(e)
+return i.destroy(),o}can(e,t,r){let{propertyName:n,abilityName:i}=this.parse(e)
+return!!this.valueFor(n,i,t,r)}cannot(e,t,r){return!this.can(e,t,r)}}e.default=n})),define("ember-can/services/can",["exports","ember-can/services/abilities"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends t.default{parse(){return super.parse(...arguments)}abilityFor(){return super.abilityFor(...arguments)}valueFor(){return super.valueFor(...arguments)}can(){return super.can(...arguments)}cannot(){return super.cannot(...arguments)}}e.default=r})),define("ember-can/utils/normalize",["exports","ember-inflector"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let n=e.split(" "),i=(0,t.singularize)(n.pop()),o=n[n.length-1]
+r.includes(o)&&n.pop()
+return{propertyName:Ember.String.camelize(n.join(" ")),abilityName:i}}
+const r=["of","in","for","to","from","on","as"]})),define("ember-changeset-conditional-validations/validators/sometimes",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){if(Array.isArray(arguments[0])){return arguments[0].map(r)}return r(arguments[0])
+function r(e){return function(r,n,i,o,a){let s={get(e){if(e.includes(".")){let t=Ember.get(o,e)
+if(void 0!==t)return t
+let r=e.split("."),n=r.pop(),i=r.join("."),s=Ember.get(o,i)
+return s&&s.hasOwnProperty&&s.hasOwnProperty(n)?t:Ember.get(a,e)}return o.hasOwnProperty(e)?Ember.get(o,e):Ember.get(a,e)}}
+return!t.call(s,o,a)||e(r,n,i,o,a)}}}})),define("ember-changeset-validations/helpers/changeset",["exports","ember-changeset/helpers/changeset"],(function(e,t){"use strict"
+function r([e,r],n){return(0,t.changeset)([e,r],n)}Object.defineProperty(e,"__esModule",{value:!0}),e.changeset=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-changeset-validations/index",["exports","validated-changeset"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.lookupValidator
+e.default=r})),define("ember-changeset-validations/utils/get-messages",["exports","ember-get-config","ember-changeset-validations/utils/messages","ember-changeset-validations/utils/with-defaults"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=requirejs.entries,t=!0){let s=r.default
+if(t&&Ember.isPresent(a))return a
+let l=Ember.A(i(e)).find(e=>e===o)
+Ember.isPresent(l)&&(s=(0,n.default)(requireModule(l).default,s))
+return a=s,s}
+const{keys:i}=Object,o=t.default.modulePrefix+"/validations/messages"
+let a=null})),define("ember-changeset-validations/utils/handle-multiple-validations",["exports","validated-changeset"],(function(e,t){"use strict"
+function r(e=[]){let t=Ember.A(e).reject(e=>"boolean"===Ember.typeOf(e)&&e)
+return 0===Ember.get(t,"length")||t}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,{key:n,newValue:i,oldValue:o,changes:a,content:s}){let l=Ember.A(e.map(e=>e(n,i,o,a,s)))
+if(Ember.A(l).any(t.isPromise))return Ember.RSVP.all(l).then(r)
+return r(l)}})),define("ember-changeset-validations/utils/messages",["exports","ember-validators/messages"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r=Ember.assign({},t.default)
+var n=Ember.assign(r,{blank:t.default.present,present:t.default.blank,getDescriptionFor:(e="")=>Ember.String.capitalize(Ember.String.dasherize(e).split(/[._-]/g).join(" "))})
+e.default=n})),define("ember-changeset-validations/utils/to-date",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){const t=Object.prototype.toString.call(e)
+return e instanceof Date||"object"==typeof e&&"[object Date]"===t?e:"number"==typeof e||"[object Number]"===t?new Date(e):("string"!=typeof e&&"[object String]"!==t||"undefined"==typeof console||(console.warn("Please use `Date.parse` to parse strings."),console.warn((new Error).stack)),new Date(NaN))}})),define("ember-changeset-validations/utils/validation-errors",["exports","ember-get-config","ember-changeset-validations/utils/get-messages"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n){let i=Ember.get(t.default,"changeset-validations.rawOutput")||!1,o=(0,r.default)(),a=o.getDescriptionFor(e)
+if(n.message)return n.message
+let{type:s,value:l,context:u={}}=n
+if(u.message){let t=u.message
+if("function"==typeof t){let r=t(e,s,l,u)
+return r}return o.formatMessage(t,Ember.assign({description:a},u))}let c=Ember.get(o,s)
+return i?(u=Ember.assign({},u,{description:a}),{value:l,type:s,message:c,context:u}):o.formatMessage(c,Ember.assign({description:a},u))}})),define("ember-changeset-validations/utils/with-defaults",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e={},t={}){return Ember.assign(Ember.assign({},t),e)}})),define("ember-changeset-validations/utils/wrap",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){if(Ember.isArray(e))return Ember.A(e)
+return Ember.A([e])}})),define("ember-changeset-validations/validators/confirmation",["exports","ember-changeset-validations/utils/validation-errors","ember-validators"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e={}){return(n,i,o,a,s={})=>{let l=Ember.assign({},s,a),u=(0,r.validate)("confirmation",i,e,l,n)
+return!0===u||(0,t.default)(n,u)}}})),define("ember-changeset-validations/validators/date",["exports","ember-changeset-validations/utils/validation-errors","ember-changeset-validations/utils/with-defaults","ember-changeset-validations/utils/to-date"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e={}){return e=(0,r.default)(e,{allowBlank:!1,errorFormat:"MMM Do, YYYY"}),(r,i)=>{let{allowBlank:o}=e,{before:a,onOrBefore:s,after:l,onOrAfter:u,message:c}=e,d="date"
+if(o&&null==i)return!0
+let h=(0,n.default)(i)
+return(f=h)instanceof Date&&!isNaN(f)?a&&(a=(0,n.default)(a),c=c||"[BEFORE] date is NOT before "+i,d="before",h>=a)?(0,t.default)(r,{type:d,value:i,context:{before:a,message:c}}):s&&(s=(0,n.default)(s),c=c||"[ON OR BEFORE] date is NOT on or before "+i,d="onOrBefore",h>s)?(0,t.default)(r,{type:d,value:i,context:{onOrBefore:s,message:c}}):l&&(l=(0,n.default)(l),c=c||"[AFTER] date is NOT after "+i,d="after",h<=l)?(0,t.default)(r,{type:d,value:i,context:{after:l,message:c}}):!(u&&(u=(0,n.default)(u),c=c||"[ON OR AFTER] date is NOT on or after "+i,d="onOrAfter",h<u))||(0,t.default)(r,{type:d,value:i,context:{onOrAfter:u,message:c}}):(0,t.default)(r,{type:d,value:"not a date",context:{value:i,message:c}})
+var f}},e.errorFormat=void 0
+e.errorFormat="MMM Do, YYYY"})),define("ember-changeset-validations/validators/exclusion",["exports","ember-changeset-validations/utils/validation-errors","ember-validators"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e={}){e.list&&(e.in=e.list)
+return(n,i)=>{let o=(0,r.validate)("exclusion",i,e,null,n)
+return!0===o||(0,t.default)(n,o)}}})),define("ember-changeset-validations/validators/format",["exports","ember-changeset-validations/utils/validation-errors","ember-validators"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e={}){let n=!Ember.isEmpty(Object.keys(e))
+return(i,o)=>{if(!n)return!0
+let a=(0,r.validate)("format",o,e,null,i)
+return!0===a||(0,t.default)(i,a)}}})),define("ember-changeset-validations/validators/inclusion",["exports","ember-changeset-validations/utils/validation-errors","ember-validators"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e={}){e.list&&(e.in=e.list)
+return(n,i)=>{let o=(0,r.validate)("inclusion",i,e,null,n)
+return!0===o||(0,t.default)(n,o)}}})),define("ember-changeset-validations/validators/index",["exports","ember-changeset-validations/validators/date","ember-changeset-validations/validators/presence","ember-changeset-validations/validators/length","ember-changeset-validations/validators/number","ember-changeset-validations/validators/format","ember-changeset-validations/validators/inclusion","ember-changeset-validations/validators/exclusion","ember-changeset-validations/validators/confirmation"],(function(e,t,r,n,i,o,a,s,l){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"validateDate",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"validatePresence",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"validateLength",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"validateNumber",{enumerable:!0,get:function(){return i.default}}),Object.defineProperty(e,"validateFormat",{enumerable:!0,get:function(){return o.default}}),Object.defineProperty(e,"validateInclusion",{enumerable:!0,get:function(){return a.default}}),Object.defineProperty(e,"validateExclusion",{enumerable:!0,get:function(){return s.default}}),Object.defineProperty(e,"validateConfirmation",{enumerable:!0,get:function(){return l.default}})})),define("ember-changeset-validations/validators/length",["exports","ember-changeset-validations/utils/validation-errors","ember-changeset-validations/utils/with-defaults","ember-validators"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e={}){return e=(0,r.default)(e,{useBetweenMessage:!0}),(r,i)=>{let o=(0,n.validate)("length",i,e,null,r)
+return!0===o||(0,t.default)(r,o)}}})),define("ember-changeset-validations/validators/number",["exports","ember-changeset-validations/utils/validation-errors","ember-changeset-validations/utils/with-defaults","ember-validators"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e={}){(e=(0,r.default)(e,{allowString:!0,allowNone:!1})).allowBlank&&(e.allowNone=!0)
+return(r,i)=>{let o=(0,n.validate)("number",i,e,null,r)
+return!0===o||(0,t.default)(r,o)}}})),define("ember-changeset-validations/validators/presence",["exports","ember-changeset-validations/utils/validation-errors","ember-validators"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let n
+"boolean"==typeof e?e={presence:e}:e&&void 0!==e.on&&("string"==typeof e.on?n=[e.on]:Array.isArray(e.on)&&(n=e.on),delete e.on)
+return(i,o,a,s,l)=>{if(n&&!n.some(e=>s[e]||void 0===s[e]&&l[e]))return!0
+let u=(0,r.validate)("presence",o,e,null,i)
+return"boolean"==typeof u||"string"==typeof u?u:("present"===u.type?u.type="blank":"blank"===u.type&&(u.type="present"),(0,t.default)(i,u))}}})),define("ember-changeset/helpers/changeset-get",["exports"],(function(e){"use strict"
+function t([e,t]){return e.get(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.changesetGet=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-changeset/helpers/changeset-set",["exports","validated-changeset"],(function(e,t){"use strict"
+function r([e,r]){if((0,t.isChangeset)(e))return t=>e.set(r,t)}Object.defineProperty(e,"__esModule",{value:!0}),e.changesetSet=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-changeset/helpers/changeset",["exports","ember-changeset","validated-changeset"],(function(e,t,r){"use strict"
+function n([e,n],i={}){if(e)return(0,r.isChangeset)(e)?e:(0,r.isObject)(n)?(0,r.isPromise)(e)?e.then(e=>(0,t.Changeset)(e,(0,r.lookupValidator)(n),n,i)):(0,t.Changeset)(e,(0,r.lookupValidator)(n),n,i):(0,r.isPromise)(e)?Promise.resolve(e).then(e=>(0,t.Changeset)(e,n,{},i)):(0,t.Changeset)(e,n,{},i)}Object.defineProperty(e,"__esModule",{value:!0}),e.changeset=n,e.default=void 0
+var i=Ember.Helper.helper(n)
+e.default=i}))
+define("ember-changeset/index",["exports","validated-changeset","ember-changeset/utils/merge-deep","ember-changeset/utils/is-object"],(function(e,t,r,n){"use strict"
+var i,o,a,s,l,u,c,d,h,f,p
+function m(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function v(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function g(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.buildOldValues=y,e.changeset=E,e.Changeset=function(e,t=b,r={},n={}){const i=E(e,t,r,n)
+return new Proxy(i,{get:(e,t)=>e.get(t.toString()),set:(e,t,r)=>(e.set(t.toString(),r),!0)})},e.default=e.EmberChangeset=void 0
+const b=()=>!0
+function y(e,t,r){const n=Object.create(null)
+for(let i of t)n[i.key]=r(e,i.key)
+return n}function _(e){return function(e){return!(!e||!(e instanceof Ember.ObjectProxy||e instanceof Ember.ArrayProxy))}(e)?_(Ember.get(e,"content")):e}let w=(i=Ember._tracked,o=Ember._tracked,a=Ember._tracked,s=Ember._dependentKeyCompat,l=Ember._dependentKeyCompat,u=Ember._dependentKeyCompat,c=Ember._dependentKeyCompat,d=class extends t.BufferedChangeset{constructor(...e){super(...e),m(this,"_changes",h,this),m(this,"_errors",f,this),m(this,"_content",p,this),v(this,"isObject",n.default),v(this,"maybeUnwrapProxy",_),v(this,"getDeep",Ember.get)}safeGet(e,t){return Ember.get(e,t)}safeSet(e,t,r){return Ember.set(e,t,r)}get isValid(){return super.isValid}get isInvalid(){return super.isInvalid}get isPristine(){return super.isPristine}get isDirty(){return super.isDirty}get pendingData(){let e=this._content,t=this._changes,n=(0,r.default)(Object.create(Object.getPrototypeOf(e)),e,{safeGet:Ember.get,safeSet:Ember.set})
+return(0,r.default)(n,t,{safeGet:Ember.get,safeSet:Ember.set})}addError(e,t){return super.addError(e,t),Ember.notifyPropertyChange(this,e),t}pushErrors(e,...t){const{value:r,validation:n}=super.pushErrors(e,...t)
+return Ember.notifyPropertyChange(this,e),{value:r,validation:n}}_setProperty({key:e,value:t,oldValue:r}){super._setProperty({key:e,value:t,oldValue:r}),Ember.notifyPropertyChange(this,e)}_notifyVirtualProperties(e){((e=super._notifyVirtualProperties(e))||[]).forEach(e=>Ember.notifyPropertyChange(this,e))}_deleteKey(e,t=""){const r=super._deleteKey(e,t)
+return Ember.notifyPropertyChange(this,t),r}execute(){let e
+if(this.isValid&&this.isDirty){let t=this._content,n=this._changes
+e=y(t,this.changes,this.getDeep),this._content=(0,r.default)(t,n,{safeGet:Ember.get,safeSet:Ember.set})}return this._previousContent=e,this}},h=g(d.prototype,"_changes",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),f=g(d.prototype,"_errors",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p=g(d.prototype,"_content",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g(d.prototype,"isValid",[s],Object.getOwnPropertyDescriptor(d.prototype,"isValid"),d.prototype),g(d.prototype,"isInvalid",[l],Object.getOwnPropertyDescriptor(d.prototype,"isInvalid"),d.prototype),g(d.prototype,"isPristine",[u],Object.getOwnPropertyDescriptor(d.prototype,"isPristine"),d.prototype),g(d.prototype,"isDirty",[c],Object.getOwnPropertyDescriptor(d.prototype,"isDirty"),d.prototype),d)
+function E(e,t=b,r={},n={}){if(n.changeset)return new n.changeset(e,t,r,n)
+return new w(e,t,r,n)}e.EmberChangeset=w
+e.default=class{constructor(e,t=b,r={},n={}){const i=E(e,t,r,n)
+return new Proxy(i,{get:(e,t)=>e.get(t.toString()),set:(e,t,r)=>(e.set(t.toString(),r),!0)})}}})),define("ember-changeset/utils/is-object",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return null!==e&&"object"==typeof e&&!(e instanceof Date||e instanceof RegExp)&&!Ember.isArray(e)}})),define("ember-changeset/utils/merge-deep",["exports","validated-changeset"],(function(e,t){"use strict"
+function r(e){return function(e){return!!e&&"object"==typeof e}(e)&&!function(e){let t=Object.prototype.toString.call(e)
+return"[object RegExp]"===t||"[object Date]"===t}(e)}function n(e,t){try{return t in e}catch(r){return!1}}function i(e,t,r){return!function(e,t,r){let n=r.safeGet(e,"constructor.fields")
+return n instanceof Map&&n.has(t)}(e,t,r)&&(n(e,t)&&!(Object.prototype.hasOwnProperty.call(e,t)&&Object.prototype.propertyIsEnumerable.call(e,t)))}function o(e,o,s){return function(e){return Object.keys(e)}(o).forEach(l=>{if(i(e,l,s)){if(s.safeSet){const r=function e(r,n,i,o){return Object.keys(r).forEach(a=>{let s=r[a]
+s&&Object.prototype.hasOwnProperty.call(s,"value")&&s instanceof t.Change?i[[...o,a].join(".")]=s.value:s&&"object"==typeof s&&e(s,n,i,[...o,a])}),i}(o,s,{},[])
+if(Object.keys(r).length>0)for(l in r){const t=r[l]
+s.safeSet(e,l,t)}}}else{if(!n(e,l)||!r(o[l])||o[l]instanceof t.Change){let r=o[l]
+return r&&r instanceof t.Change?s.safeSet(e,l,r.value):s.safeSet(e,l,(0,t.normalizeObject)(r))}s.safeSet(e,l,a(s.safeGet(e,l),s.safeGet(o,l),s))}}),e}function a(e,t,r={}){r.safeGet=r.safeGet||function(e,t){return e[t]},r.safeSet=r.safeSet||function(e,t,r){return e[t]=r}
+let n=Array.isArray(t)
+if(!(n===Array.isArray(e)))return t
+if(n)return t
+try{return o(e,t,r)}catch(i){throw new Error("Unable to `mergeDeep` with your data. Are you trying to merge two ember-data objects? Please file an issue with ember-changeset.")}}Object.defineProperty(e,"__esModule",{value:!0}),e.default=a})),define("ember-cli-app-version/initializer-factory",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r){let n=!1
+return function(){if(!n&&e&&r){let i=Ember.String.classify(e)
+t.register(i,r),n=!0}}}
+const t=Ember.libraries})),define("ember-cli-app-version/utils/regexp",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+e.versionRegExp=/\d+[.]\d+[.]\d+/,e.versionExtendedRegExp=/\d+[.]\d+[.]\d+-[a-z]*([.]\d+)?/,e.shaRegExp=/[a-z\d]{8}$/})),define("ember-cli-flash/components/flash-message",["exports","ember-cli-flash/templates/components/flash-message"],(function(e,t){"use strict"
+var r,n,i,o,a,s,l,u,c,d,h,f,p,m,v,g,b,y,_
+function w(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function E(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function x(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const{next:O,cancel:S}=Ember.run
+let T=(r=Ember.computed.readOnly("flash.showProgress"),n=Ember.computed.not("exiting"),i=Ember.computed.and("showProgress","notExiting"),o=Ember.computed.readOnly("flash.exiting"),a=Ember.computed.bool("template"),s=Ember.computed("messageStyle"),l=Ember.computed("flash.type","messageStylePrefix","_defaultMessageStylePrefix"),u=Ember.computed("flash.type"),c=Ember.computed("flash.{showProgress,timeout}"),d=Ember._action,h=Ember._action,f=Ember._action,p=Ember._action,m=class extends Ember.Component{constructor(...e){super(...e),E(this,"tagName",""),E(this,"layout",t.default),E(this,"active",!1),E(this,"messageStyle","bootstrap"),w(this,"showProgress",v,this),w(this,"notExiting",g,this),w(this,"showProgressBar",b,this),w(this,"exiting",y,this),w(this,"hasBlock",_,this)}get _defaultMessageStylePrefix(){return"foundation"===this.messageStyle?"alert-box ":"alert alert-"}get alertType(){const e=this.flash.type||""
+return`${this.messageStylePrefix||this._defaultMessageStylePrefix}${e}`}get flashType(){return Ember.String.classify(this.flash.type||"")}get progressDuration(){var e,t
+if(null===(e=this.flash)||void 0===e||!e.showProgress)return!1
+const r=(null===(t=this.flash)||void 0===t?void 0:t.timeout)||0
+return Ember.String.htmlSafe(`transition-duration: ${r}ms`)}_mouseEnter(){Ember.isPresent(this.flash)&&this.flash.preventExit()}_mouseLeave(){Ember.isPresent(this.flash)&&!this.flash.exiting&&this.flash.allowExit()}_destroyFlashMessage(){this.flash&&this.flash.destroyMessage()}onClick(){var e,t;(null===(e=null===(t=this.flash)||void 0===t?void 0:t.destroyOnClick)||void 0===e||e)&&this._destroyFlashMessage()}onClose(){this._destroyFlashMessage()}onDidInsert(e){const t=O(this,()=>{Ember.set(this,"active",!0)})
+Ember.set(this,"pendingSet",t),Ember.set(this,"_mouseEnterHandler",this._mouseEnter),Ember.set(this,"_mouseLeaveHandler",this._mouseLeave),e.addEventListener("mouseenter",this._mouseEnterHandler),e.addEventListener("mouseleave",this._mouseLeaveHandler)}onWillDestroy(e){e.removeEventListener("mouseenter",this._mouseEnterHandler),e.removeEventListener("mouseleave",this._mouseLeaveHandler),S(this.pendingSet),this._destroyFlashMessage()}},v=x(m.prototype,"showProgress",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),g=x(m.prototype,"notExiting",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),b=x(m.prototype,"showProgressBar",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),y=x(m.prototype,"exiting",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=x(m.prototype,"hasBlock",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x(m.prototype,"_defaultMessageStylePrefix",[s],Object.getOwnPropertyDescriptor(m.prototype,"_defaultMessageStylePrefix"),m.prototype),x(m.prototype,"alertType",[l],Object.getOwnPropertyDescriptor(m.prototype,"alertType"),m.prototype),x(m.prototype,"flashType",[u],Object.getOwnPropertyDescriptor(m.prototype,"flashType"),m.prototype),x(m.prototype,"progressDuration",[c],Object.getOwnPropertyDescriptor(m.prototype,"progressDuration"),m.prototype),x(m.prototype,"onClick",[d],Object.getOwnPropertyDescriptor(m.prototype,"onClick"),m.prototype),x(m.prototype,"onClose",[h],Object.getOwnPropertyDescriptor(m.prototype,"onClose"),m.prototype),x(m.prototype,"onDidInsert",[f],Object.getOwnPropertyDescriptor(m.prototype,"onDidInsert"),m.prototype),x(m.prototype,"onWillDestroy",[p],Object.getOwnPropertyDescriptor(m.prototype,"onWillDestroy"),m.prototype),m)
+e.default=T})),define("ember-cli-flash/flash/object",["exports","ember-cli-flash/utils/computed"],(function(e,t){"use strict"
+var r,n,i
+function o(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let a=(r=(0,t.guidFor)("message").readOnly(),n=class extends(Ember.Object.extend(Ember.Evented)){constructor(...e){var t,r,n,a
+super(...e),o(this,"exitTimer",null),o(this,"exiting",!1),o(this,"isExitable",!0),o(this,"initializedTime",null),t=this,r="_guid",a=this,(n=i)&&Object.defineProperty(t,r,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(a):void 0})}init(){super.init(...arguments),this.sticky||(this.timerTask(),this._setInitializedTime())}destroyMessage(){this._cancelTimer(),this.exitTaskInstance?(Ember.run.cancel(this.exitTaskInstance),this._teardown()):this.exitTimerTask()}exitMessage(){this.isExitable&&(this.exitTimerTask(),this.trigger("didExitMessage"))}willDestroy(){this.onDestroy&&this.onDestroy(),this._cancelTimer(),this._cancelTimer("exitTaskInstance"),super.willDestroy(...arguments)}preventExit(){Ember.set(this,"isExitable",!1)}allowExit(){Ember.set(this,"isExitable",!0),this._checkIfShouldExit()}timerTask(){if(!this.timeout)return
+const e=Ember.run.later(()=>{this.exitMessage()},this.timeout)
+Ember.set(this,"timerTaskInstance",e)}exitTimerTask(){if(!this.isDestroyed)if(Ember.set(this,"exiting",!0),this.extendedTimeout){let e=Ember.run.later(()=>{this._teardown()},this.extendedTimeout)
+Ember.set(this,"exitTaskInstance",e)}else this._teardown()}_setInitializedTime(){let e=(new Date).getTime()
+return Ember.set(this,"initializedTime",e),this.initializedTime}_getElapsedTime(){return(new Date).getTime()-this.initializedTime}_cancelTimer(e="timerTaskInstance"){this[e]&&Ember.run.cancel(this[e])}_checkIfShouldExit(){this._getElapsedTime()>=this.timeout&&!this.sticky&&(this._cancelTimer(),this.exitMessage())}_teardown(){var e
+const t=null===(e=this.flashService)||void 0===e?void 0:e.queue
+t&&t.removeObject(this),this.destroy(),this.trigger("didDestroyMessage")}},s=n.prototype,l="_guid",u=[r],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},h={},Object.keys(c).forEach((function(e){h[e]=c[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=u.slice().reverse().reduce((function(e,t){return t(s,l,e)||e}),h),d&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(d):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(s,l,h),h=null),i=h,n)
+var s,l,u,c,d,h
+e.default=a})),define("ember-cli-flash/services/flash-messages",["exports","ember-cli-flash/flash/object","ember-cli-flash/utils/object-without","ember-cli-flash/utils/flash-message-options","ember-cli-flash/utils/get-with-default"],(function(e,t,r,n,i){"use strict"
+var o,a,s,l,u,c,d,h
+function f(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function p(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let m=(o=Ember.computed.equal("queue.length",0).readOnly(),a=Ember.computed.mapBy("queue","_guid").readOnly(),s=Ember.computed.sort("queue",(function(e,t){return e.priority<t.priority?1:e.priority>t.priority?-1:0})).readOnly(),l=Ember.computed,u=class extends Ember.Service{constructor(){super(...arguments),f(this,"isEmpty",c,this),f(this,"_guids",d,this),f(this,"arrangedQueue",h,this),this._setDefaults(),this.queue=Ember.A()}willDestroy(){super.willDestroy(...arguments),this.clearMessages()}add(e={}){return this._enqueue(this._newFlashMessage(e)),this}clearMessages(){const e=this.queue
+if(!Ember.isNone(e))return e.forEach(e=>e.destroyMessage()),e.clear(),this}registerTypes(e=Ember.A()){return e.forEach(e=>this._registerType(e)),this}peekFirst(){return this.queue.firstObject}peekLast(){return this.queue.lastObject}getFlashObject(){return this.peekLast()}_newFlashMessage(e={}){const n=(0,i.default)(this,"flashMessageDefaults",{}),o=(0,r.default)(n,["types","injectionFactories","preventDuplicates"]),a=Ember.assign({},o,{flashService:this})
+for(let t in e){const r=Ember.get(e,t),n=this._getOptionOrDefault(t,r)
+Ember.set(a,t,n)}return t.default.create(a)}_getOptionOrDefault(e,t){const r=(0,i.default)(this,"flashMessageDefaults",{}),n=Ember.get(r,e)
+return"undefined"===Ember.typeOf(t)?n:t}get flashMessageDefaults(){const e=Ember.getOwner(this).resolveRegistration("config:environment"),t=(0,i.default)(e,"flashMessageDefaults",{})
+return(0,n.default)(t)}_setDefaults(){const e=(0,i.default)(this,"flashMessageDefaults",{})
+for(let t in e){const r="default"+Ember.String.classify(t)
+Ember.set(this,r,e[t])}this.registerTypes((0,i.default)(this,"defaultTypes",Ember.A()))}_registerType(e){this[e]=(t,r={})=>{const n=Ember.assign({},r)
+return Ember.setProperties(n,{message:t,type:e}),this.add(n)}}_hasDuplicate(e){return this._guids.includes(e)}_enqueue(e){const t=e.preventDuplicates
+if("boolean"==typeof t?t:this.defaultPreventDuplicates){const t=e._guid
+if(this._hasDuplicate(t))return}return this.queue.pushObject(e)}},c=p(u.prototype,"isEmpty",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d=p(u.prototype,"_guids",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),h=p(u.prototype,"arrangedQueue",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),p(u.prototype,"flashMessageDefaults",[l],Object.getOwnPropertyDescriptor(u.prototype,"flashMessageDefaults"),u.prototype),u)
+e.default=m})),define("ember-cli-flash/templates/components/flash-message",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"zPP1j7Xk",block:'{"symbols":["&default","&attrs"],"statements":[[11,"div"],[16,0,[31,["flash-message ",[32,0,["alertType"]]," ",[30,[36,0],[[32,0,["exiting"]],"exiting"],null]," ",[30,[36,0],[[32,0,["active"]],"active"],null]]]],[24,"role","alert"],[17,2],[4,[38,3],["click",[32,0,["onClick"]]],null],[4,[38,4],[[32,0,["onDidInsert"]]],null],[4,[38,5],[[32,0,["onWillDestroy"]]],null],[12],[2,"\\n"],[6,[37,0],[[27,[32,1]]],null,[["default","else"],[{"statements":[[2,"    "],[18,1,[[32,0],[35,2],[30,[36,1],[[32,0],"onClose"],null]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[1,[32,0,["flash","message"]]],[2,"\\n"],[6,[37,0],[[32,0,["showProgressBar"]]],null,[["default"],[{"statements":[[2,"      "],[10,"div"],[14,0,"alert-progress"],[12],[2,"\\n        "],[10,"div"],[14,0,"alert-progressBar"],[15,5,[32,0,["progressDuration"]]],[12],[13],[2,"\\n      "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[13]],"hasEval":false,"upvars":["if","action","flash","on","did-insert","will-destroy"]}',meta:{moduleName:"ember-cli-flash/templates/components/flash-message.hbs"}})
+e.default=t})),define("ember-cli-flash/utils/computed",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.add=function(...e){const t=Ember.computed({get(){const t=e.map(e=>{const t=Ember.get(this,e)
+if("number"===Ember.typeOf(t))return t})
+return Ember.A(t).compact().reduce((e,t)=>e+t)}})
+return t.property.apply(t,e)},e.guidFor=function(e){return Ember.computed(e,{get(){const t=Ember.get(this,e)
+if(!Ember.isNone(t))return Ember.guidFor(t.toString())}})}})),define("ember-cli-flash/utils/flash-message-options",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return Ember.assign({timeout:3e3,extendedTimeout:0,priority:100,sticky:!1,showProgress:!1,type:"info",types:["success","info","warning","danger","alert","secondary"],injectionFactories:["route","controller","view","component"],preventDuplicates:!1},e)}})),define("ember-cli-flash/utils/get-with-default",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,r){let n=Ember.get(e,t)
+if(void 0===n)return r
+return n}})),define("ember-cli-flash/utils/object-compact",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){const t={}
+for(let r in e){const n=e[r]
+Ember.isPresent(n)&&(t[r]=n)}return t}})),define("ember-cli-flash/utils/object-only",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e={},t=[]){let r={}
+for(let n in e)-1!==t.indexOf(n)&&(r[n]=e[n])
+return r}})),define("ember-cli-flash/utils/object-without",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e={},t=[]){let r={}
+for(let n in e)-1===t.indexOf(n)&&(r[n]=e[n])
+return r}})),define("ember-cli-string-helpers/-private/create-string-helper",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return function([t]){return Ember.String.isHTMLSafe(t)&&(t=t.string),e(t=t||"")}}})),define("ember-cli-string-helpers/helpers/capitalize",["exports","ember-cli-string-helpers/-private/create-string-helper"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.capitalize=void 0
+const r=(0,t.default)(Ember.String.capitalize)
+e.capitalize=r
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-cli-string-helpers/helpers/classify",["exports","ember-cli-string-helpers/-private/create-string-helper"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.classify=void 0
+const r=(0,t.default)(Ember.String.classify)
+e.classify=r
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-cli-string-helpers/helpers/humanize",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.humanize=r,e.default=void 0
+const t=/_+|-+/g
+function r([e]){if(Ember.String.isHTMLSafe(e)&&(e=e.string),null==e)return""
+let r=e.toLowerCase().replace(t," ")
+return r.charAt(0).toUpperCase()+r.slice(1)}var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-cli-string-helpers/helpers/lowercase",["exports","ember-cli-string-helpers/utils/lowercase","ember-cli-string-helpers/-private/create-string-helper"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.lowercase=void 0
+const n=(0,r.default)(t.default)
+e.lowercase=n
+var i=Ember.Helper.helper(n)
+e.default=i})),define("ember-cli-string-helpers/helpers/titleize",["exports","ember-cli-string-helpers/utils/titleize","ember-cli-string-helpers/-private/create-string-helper"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.titleize=void 0
+const n=(0,r.default)(t.default)
+e.titleize=n
+var i=Ember.Helper.helper(n)
+e.default=i})),define("ember-cli-string-helpers/helpers/truncate",["exports"],(function(e){"use strict"
+function t([e,t=140,r=!0]){let n=r?t-3:t
+return Ember.String.isHTMLSafe(e)&&(e=e.string),e&&e.length>n?r?e.substring(0,n)+"...":e.substring(0,n):e}Object.defineProperty(e,"__esModule",{value:!0}),e.truncate=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-cli-string-helpers/helpers/uppercase",["exports","ember-cli-string-helpers/utils/uppercase","ember-cli-string-helpers/-private/create-string-helper"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.uppercase=void 0
+const n=(0,r.default)(t.default)
+e.uppercase=n
+var i=Ember.Helper.helper(n)
+e.default=i})),define("ember-cli-string-helpers/utils/lowercase",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=""){if("string"!=typeof e)throw new TypeError("Expected a string, got a "+typeof e)
+return e.toLowerCase()}})),define("ember-cli-string-helpers/utils/titleize",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=""){if("string"!=typeof e)throw new TypeError("Expected a string, got a "+typeof e)
+return e.toLowerCase().replace(/(?:^|\s|-|\/)\S/g,(function(e){return e.toUpperCase()}))}})),define("ember-cli-string-helpers/utils/trim",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=""){if("string"!=typeof e)throw new TypeError("Expected a string, got a "+typeof e)
+return e.trim()}})),define("ember-cli-string-helpers/utils/uppercase",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=""){if("string"!=typeof e)throw new TypeError("Expected a string, got a "+typeof e)
+return e.toUpperCase()}})),define("ember-collection/components/ember-collection",["exports","ember-collection/components/ember-collection/template","ember-collection/utils/identity","ember-collection/utils/needs-revalidate"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class i{constructor(e,t,r,n){this.key=e,this.hidden=!1,this.item=t,this.index=r,this.style=n}}function o(){}var a=Ember.Component.extend({layout:t.default,init(){this._buffer=void 0,this._cellLayout=void 0,this._rawItems=void 0,this._items=void 0,this._scrollLeft=void 0,this._scrollTop=void 0,this._clientWidth=void 0,this._clientHeight=void 0,this._contentSize=void 0,this.contentElement=void 0,this._cells=Ember.A(),this._cellMap=Object.create(null),this._super()
+let e=this.getAttr("buffer")
+this._buffer="number"==typeof e?e:5,this._scrollLeft=0|this.getAttr("scroll-left"),this._scrollTop=0|this.getAttr("scroll-top"),this._clientWidth=0|this.getAttr("estimated-width"),this._clientHeight=0|this.getAttr("estimated-height"),this._scrollChange=this.getAttr("scroll-change")},_needsRevalidate(){this.isDestroyed||this.isDestroying||(this._isGlimmer2()?this.rerender():(0,n.default)(this))},didReceiveAttrs(){this._super(),this.updateItems(),this.updateScrollPosition()},willDestroyElement(){this._items&&this._items.removeArrayObserver&&this._items.removeArrayObserver(this,{willChange:o,didChange:"_needsRevalidate"})},updateItems(){this._cellLayout=this.getAttr("cell-layout")
+var e=this.getAttr("items")
+if(this._rawItems!==e){this._items&&this._items.removeArrayObserver&&this._items.removeArrayObserver(this,{willChange:o,didChange:"_needsRevalidate"}),this._rawItems=e
+var t=Ember.A(e)
+this.set("_items",t),t&&t.addArrayObserver&&t.addArrayObserver(this,{willChange:o,didChange:"_needsRevalidate"})}},updateScrollPosition(){if(!this._scrollChange)return
+let e=this.getAttr("scroll-left")
+void 0!==e&&(e=parseInt(e,10),this._scrollLeft!==e&&this.set("_scrollLeft",e))
+let t=this.getAttr("scroll-top")
+void 0!==t&&(t=parseInt(t,10),this._scrollTop!==t&&this.set("_scrollTop",t))},updateContentSize(){var e=this._cellLayout.contentSize(this._clientWidth,this._clientHeight)
+void 0!==this._contentSize&&e.width===this._contentSize.width&&e.height===this._contentSize.height||this.set("_contentSize",e)},willRender:function(){this.updateCells(),this.updateContentSize()},updateCells(){if(!this._items)return
+const e=Ember.get(this._items,"length")
+this._cellLayout.length!==e&&(this._cellLayout.length=e)
+var t,n,o,a,s,l=this._cellMap,u=Object.create(null),c=this._cellLayout.indexAt(this._scrollLeft,this._scrollTop,this._clientWidth,this._clientHeight),d=this._cellLayout.count(this._scrollLeft,this._scrollTop,this._clientWidth,this._clientHeight),h=this._items,f=Math.min(c,this._buffer)
+c-=f,d+=f,d=Math.min(d+this._buffer,Ember.get(h,"length")-c)
+var p=[]
+for(t=0;t<d;t++)o=c+t,a=(0,r.default)(h.objectAt(o)),l&&(s=l[a]),s?(n=this._cellLayout.formatItemStyle(o,this._clientWidth,this._clientHeight),Ember.set(s,"style",n),Ember.set(s,"hidden",!1),Ember.set(s,"key",a),Ember.set(s,"index",o),u[a]=s):p.push(o)
+for(t=0;t<this._cells.length;t++)if(!u[(s=this._cells[t]).key])if(p.length){o=p.pop()
+let e=h.objectAt(o)
+a=(0,r.default)(e),n=this._cellLayout.formatItemStyle(o,this._clientWidth,this._clientHeight),Ember.set(s,"style",n),Ember.set(s,"key",a),Ember.set(s,"index",o),Ember.set(s,"item",e),Ember.set(s,"hidden",!1),u[a]=s}else Ember.set(s,"hidden",!0),Ember.set(s,"style","height: 0; display: none;")
+for(t=0;t<p.length;t++){o=p[t]
+let e=h.objectAt(o)
+a=(0,r.default)(e),n=this._cellLayout.formatItemStyle(o,this._clientWidth,this._clientHeight),s=new i(a,e,o,n),u[a]=s,this._cells.pushObject(s)}this._cellMap=u},_isGlimmer2(){return!this._renderNode},actions:{scrollChange(e,t){this._scrollChange?this._scrollChange(e,t):e===this._scrollLeft&&t===this._scrollTop||(Ember.set(this,"_scrollLeft",e),Ember.set(this,"_scrollTop",t),this._needsRevalidate())},clientSizeChange(e,t){this._clientWidth===e&&this._clientHeight===t||(Ember.set(this,"_clientWidth",e),Ember.set(this,"_clientHeight",t),this._needsRevalidate())}}})
+e.default=a})),define("ember-collection/components/ember-collection/template",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"jwll0iti",block:'{"symbols":["cell","&default"],"statements":[[6,[37,7],null,[["content-size","scroll-left","scroll-top","scrollChange","clientSizeChange"],[[35,6],[35,5],[35,4],[30,[36,3],[[32,0],"scrollChange"],null],[30,[36,3],[[32,0],"clientSizeChange"],null]]],[["default"],[{"statements":[[2,"  "],[10,"div"],[12],[6,[37,2],[[30,[36,1],[[30,[36,1],[[35,0]],null]],null]],null,[["default"],[{"statements":[[10,"div"],[22,5,[32,1,["style"]]],[12],[18,2,[[32,1,["item"]],[32,1,["index"]]]],[13]],"parameters":[1]}]]],[13],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["_cells","-track-array","each","action","_scrollTop","_scrollLeft","_contentSize","ember-native-scrollable"]}',meta:{moduleName:"ember-collection/components/ember-collection/template.hbs"}})
+e.default=t})),define("ember-collection/components/ember-native-scrollable",["exports","ember-collection/utils/translate","ember-collection/utils/style-properties"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=(0,r.styleProperty)("overflowScrolling")
+var i=Ember.Component.extend({init(){this._clientWidth=0,this._clientHeight=0,this._scrollLeft=0,this._scrollTop=0,this._animationFrame=void 0,this._super()},didReceiveAttrs(){this._contentSize=this.getAttr("content-size"),this._scrollLeft=this.getAttr("scroll-left"),this._scrollTop=this.getAttr("scroll-top")},didInsertElement(){this.contentElement=this.element.firstElementChild,this.applyStyle(),this.applyContentSize(),this.syncScrollFromAttr(),this.startScrollCheck()},didUpdate(){this.applyContentSize(),this.syncScrollFromAttr()},willDestroyElement(){this.cancelScrollCheck(),this.contentElement=void 0},applyStyle(){n?(this.element.style.overflow="scroll",this.element.style[n]="touch"):this.element.style.overflow="auto",(0,t.translate)(this.element,0,0),this.element.style.position="absolute",this.element.style.left=0,this.element.style.top=0,this.element.style.bottom=0,this.element.style.right=0},applyContentSize(){this.contentElement.style.position="relative",this.contentElement.style.width=this._contentSize.width+"px",this.contentElement.style.height=this._contentSize.height+"px"},syncScrollFromAttr(){this._appliedScrollTop!==this._scrollTop&&(this._appliedScrollTop=this._scrollTop,this._scrollTop>=0&&(this.element.scrollTop=this._scrollTop)),this._appliedScrollLeft!==this._scrollLeft&&(this._appliedScrollLeft=this._scrollLeft,this._scrollLeft>=0&&(this.element.scrollLeft=this._scrollLeft))},startScrollCheck(){const e=this
+function t(){e.scrollCheck(),r()}function r(){window.requestAnimationFrame?e._animationFrame=requestAnimationFrame(t):e._animationFrame=setTimeout(t,16)}r()},cancelScrollCheck(){this._animationFrame&&(window.requestAnimationFrame?cancelAnimationFrame(this._animationFrame):clearTimeout(this._animationFrame),this._animationFrame=void 0)},scrollCheck(){let e=this.element,t=e.scrollLeft,r=e.scrollTop,n=!1
+t===this._appliedScrollLeft&&r===this._appliedScrollTop||(n=!0,this._appliedScrollLeft=t,this._appliedScrollTop=r)
+let i=e.clientWidth,o=e.clientHeight,a=!1
+i===this._clientWidth&&o===this._clientHeight||(a=!0,this._clientWidth=i,this._clientHeight=o),(n||a)&&Ember.run.join(this,(function(){n&&this.scrollChange(t,r),a&&this.clientSizeChange(i,o)}))}})
+e.default=i}))
+define("ember-collection/layouts/grid",["exports","layout-bin-packer/fixed-grid","ember-collection/utils/style-generators"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=class{constructor(e,r){this.length=0,this.bin=new t.default(this,e,r)}contentSize(e){return{width:e,height:this.bin.height(e)}}indexAt(e,t,r,n){return this.bin.visibleStartingIndex(t,r,n)}positionAt(e,t){return this.bin.position(e,t)}widthAt(e){return this.bin.widthAtIndex(e)}heightAt(e){return this.bin.heightAtIndex(e)}count(e,t,r,n){return this.bin.numberVisibleWithin(t,r,n,!0)}formatItemStyle(e,t,n){let i=this.positionAt(e,t,n),o=this.widthAt(e,t,n),a=this.heightAt(e,t,n)
+return(0,r.formatPixelStyle)(i,o,a)}}})),define("ember-collection/layouts/mixed-grid",["exports","layout-bin-packer/shelf-first","ember-collection/utils/style-generators"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=class{constructor(e,r){this.content=e,this.bin=new t.default(e,r)}contentSize(e){return{width:e,height:this.bin.height(e)}}indexAt(e,t,r,n){return this.bin.visibleStartingIndex(t,r,n)}positionAt(e,t,r){return this.bin.position(e,t,r)}widthAt(e){return this.bin.widthAtIndex(e)}heightAt(e){return this.bin.heightAtIndex(e)}count(e,t,r,n){return this.bin.numberVisibleWithin(t,r,n,!0)}formatItemStyle(e,t,n){let i=this.positionAt(e,t,n),o=this.widthAt(e,t,n),a=this.heightAt(e,t,n)
+return(0,r.formatPixelStyle)(i,o,a)}}})),define("ember-collection/layouts/percentage-columns",["exports","layout-bin-packer/shelf-first","ember-collection/utils/style-generators"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=class{constructor(e,r,n){r.reduce((function(e,t){return e+t}))
+let i=[]
+for(var o=0,a=0;a<e;a++)i.push({width:r[o],height:n,percent:r[o]}),++o>=r.length&&(o=0)
+this.positions=i,this.bin=new t.default(i,100)}contentSize(e){return{width:e,height:this.bin.height(100)}}indexAt(e,t,r,n){return this.bin.visibleStartingIndex(t,100,n)}positionAt(e,t,r){return this.bin.position(e,100,r)}widthAt(e){return this.bin.widthAtIndex(e)}heightAt(e){return this.bin.heightAtIndex(e)}count(e,t,r,n){return this.bin.numberVisibleWithin(t,100,n,!0)}formatItemStyle(e,t,n){let i=this.positionAt(e,100,n),o=this.positions[e].percent,a=this.heightAt(e,100,n),s=Math.floor(i.x/100*t)
+return(0,r.formatPercentageStyle)({x:s,y:i.y},o,a)}}})),define("ember-collection/utils/identity",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let t,r=typeof e
+t="string"===r||"number"===r?e:Ember.guidFor(e)
+return t}})),define("ember-collection/utils/needs-revalidate",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){e._renderNode.isDirty=!0,e._renderNode.ownerNode.emberView.scheduleRevalidate(e._renderNode,e.toString(),"rerendering via needsRevalidate")}})),define("ember-collection/utils/style-generators",["exports","ember-collection/utils/translate"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.formatPixelStyle=function(e,r,n){let i="position:absolute;top:0;left:0;"
+return i+=(0,t.translateCSS)(e.x,e.y),i+="width:"+r+"px;height:"+n+"px;",i},e.formatPercentageStyle=function(e,r,n){let i="position:absolute;top:0;left:0;"
+return i+=(0,t.translateCSS)(e.x,e.y),i+="width:"+r+"%;height:"+n+"px;",i}})),define("ember-collection/utils/style-properties",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.styleProperty=function(e){return i(e,!1)},e.cssProperty=function(e){return i(e,!0)}
+const t=["webkit","Webkit","ms","Moz","O"],r=["-webkit-","-ms-","-moz-","-o-"],n="undefined"!=typeof document&&document.documentElement&&document.documentElement.style
+function i(e,i){let o=i?Ember.String.camelize(e):e
+if(o in n)return e
+let a=Ember.String.capitalize(o)
+for(let s=0;s<t.length;s++){let o=t[s]+a
+if(o in n)return i?r[s]+e:o}}})),define("ember-collection/utils/translate",["exports","ember-collection/utils/style-properties"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.translatePosition=a,e.translateTransform2D=s,e.translateTransform3D=l,e.translatePositionCSS=u,e.translateTransform2DCSS=c,e.translateTransform3DCSS=d,e.translateCSS=e.translate=e.supports2D=e.supports3D=void 0
+const r=(0,t.cssProperty)("transform"),n=(0,t.styleProperty)("transform"),i=!!(0,t.styleProperty)("perspectiveOrigin")
+e.supports3D=i
+const o=!!n
+function a(e,t,r){e.style.left=t+"px",e.style.top=r+"px"}function s(e,t,r){e.style[n]=h(t,r)}function l(e,t,r){e.style[n]=f(t,r)}function u(e,t){return`left:${e}px;top:${t}px;`}function c(e,t){return`${r}:${h(e,t)};`}function d(e,t){return`${r}:${f(e,t)};`}function h(e,t){return`matrix(1, 0, 0, 1, ${e}, ${t})`}function f(e,t){return`matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, ${e}, ${t}, 0, 1)`}e.supports2D=o
+const p=i?l:o?s:a
+e.translate=p
+const m=i?d:o?c:u
+e.translateCSS=m})),define("ember-composable-helpers/-private/closure-action",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const{__loader:t}=Ember
+let r={ACTION:null}
+"ember-htmlbars/keywords/closure-action"in t.registry?r=t.require("ember-htmlbars/keywords/closure-action"):"ember-routing-htmlbars/keywords/closure-action"in t.registry&&(r=t.require("ember-routing-htmlbars/keywords/closure-action"))
+var n=r.ACTION
+e.default=n})),define("ember-composable-helpers/-private/get-value-array-and-use-deep-equal-from-params",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let t,r=e[0],n=!1
+2===e.length?t=e[1]:(n=e[1],t=e[2])
+return{currentValue:r,array:t,useDeepEqual:n}}})),define("ember-composable-helpers/helpers/append",["exports"],(function(e){"use strict"
+function t([...e]){return[].concat(...e)}Object.defineProperty(e,"__esModule",{value:!0}),e.append=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/chunk",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.chunk=n,e.default=void 0
+const{max:t,ceil:r}=Math
+function n(e,n){let i=parseInt(e,10),o=t(i,0),a=0
+if(Ember.isArray(n)&&(a=n.length),!a||o<1)return[]
+{let e=0,t=-1,i=new Array(r(a/o))
+for(;e<a;)i[++t]=n.slice(e,e+=o)
+return i}}var i=Ember.Helper.helper((function([e,t]){return n(e,t)}))
+e.default=i})),define("ember-composable-helpers/helpers/compact",["exports"],(function(e){"use strict"
+function t([e]){let t
+return t=Array.isArray(e)?e:[e],t.filter(e=>Ember.isPresent(e))}Object.defineProperty(e,"__esModule",{value:!0}),e.compact=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/compute",["exports"],(function(e){"use strict"
+function t([e,...t]){return e(...t)}Object.defineProperty(e,"__esModule",{value:!0}),e.compute=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/contains",["exports","ember-composable-helpers/utils/includes"],(function(e,t){"use strict"
+function r(e,r){return(0,t.default)(Ember.A(r),e)}function n(e,t){return!!Ember.isArray(t)&&(Ember.isArray(e)?e.reduce((e,n)=>e&&r(n,t),!0):r(e,t))}Object.defineProperty(e,"__esModule",{value:!0}),e.contains=n,e.default=void 0
+var i=Ember.Helper.helper((function([e,t]){return n(e,t)}))
+e.default=i})),define("ember-composable-helpers/helpers/dec",["exports"],(function(e){"use strict"
+function t([e,t]){if(Ember.isEmpty(t)&&(t=e,e=void 0),t=Number(t),!isNaN(t))return void 0===e&&(e=1),t-e}Object.defineProperty(e,"__esModule",{value:!0}),e.dec=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/drop",["exports"],(function(e){"use strict"
+function t([e,t]){return t||(t=[]),t.slice(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.drop=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/entries",["exports"],(function(e){"use strict"
+function t([e]){return e?Object.entries(e):e}Object.defineProperty(e,"__esModule",{value:!0}),e.keys=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/filter-by",["exports","ember-composable-helpers/utils/is-equal"],(function(e,t){"use strict"
+function r([e,r,n]){if(!Ember.isArray(n)&&Ember.isArray(r)&&(n=r,r=void 0),Ember.isEmpty(e)||Ember.isEmpty(n))return[]
+let i
+return i=Ember.isPresent(r)?"function"==typeof r?t=>r(Ember.get(t,e)):n=>(0,t.default)(Ember.get(n,e),r):t=>!!Ember.get(t,e),n.filter(i)}Object.defineProperty(e,"__esModule",{value:!0}),e.filterBy=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-composable-helpers/helpers/filter",["exports"],(function(e){"use strict"
+function t([e,t]){return Ember.isEmpty(e)||!t?[]:t.filter(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.filter=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/find-by",["exports"],(function(e){"use strict"
+function t([e,t,r]){return Ember.isEmpty(e)?[]:Ember.A(r).findBy(e,t)}Object.defineProperty(e,"__esModule",{value:!0}),e.findBy=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/flatten",["exports"],(function(e){"use strict"
+function t(e){return Ember.isArray(e)?e.reduce((e,r)=>e.concat(t(r)),[]):e}Object.defineProperty(e,"__esModule",{value:!0}),e.flatten=t,e.default=void 0
+var r=Ember.Helper.helper((function([e]){return t(e)}))
+e.default=r})),define("ember-composable-helpers/helpers/from-entries",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function([e]){return e?Object.fromEntries(e):e}))
+e.default=t})),define("ember-composable-helpers/helpers/group-by",["exports"],(function(e){"use strict"
+function t([e,t]){let r={}
+return t.forEach(t=>{let n=Ember.get(t,e),i=r[n]
+Array.isArray(i)||(i=[],r[n]=i),i.push(t)}),r}Object.defineProperty(e,"__esModule",{value:!0}),e.groupBy=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/has-next",["exports","ember-composable-helpers/helpers/next","ember-composable-helpers/utils/is-equal","ember-composable-helpers/-private/get-value-array-and-use-deep-equal-from-params"],(function(e,t,r,n){"use strict"
+function i(e,n,i=!1){n||(n=[])
+let o=(0,t.next)(e,n,i)
+return!(0,r.default)(o,e,i)&&Ember.isPresent(o)}Object.defineProperty(e,"__esModule",{value:!0}),e.hasNext=i,e.default=void 0
+var o=Ember.Helper.helper((function(e){let{currentValue:t,array:r,useDeepEqual:o}=(0,n.default)(e)
+return i(t,r,o)}))
+e.default=o})),define("ember-composable-helpers/helpers/has-previous",["exports","ember-composable-helpers/helpers/previous","ember-composable-helpers/utils/is-equal","ember-composable-helpers/-private/get-value-array-and-use-deep-equal-from-params"],(function(e,t,r,n){"use strict"
+function i(e,n,i=!1){n||(n=[])
+let o=(0,t.previous)(e,n,i)
+return!(0,r.default)(o,e,i)&&Ember.isPresent(o)}Object.defineProperty(e,"__esModule",{value:!0}),e.hasPrevious=i,e.default=void 0
+var o=Ember.Helper.helper((function(e){let{currentValue:t,array:r,useDeepEqual:o}=(0,n.default)(e)
+return i(t,r,o)}))
+e.default=o})),define("ember-composable-helpers/helpers/inc",["exports"],(function(e){"use strict"
+function t([e,t]){if(Ember.isEmpty(t)&&(t=e,e=void 0),t=Number(t),!isNaN(t))return void 0===e&&(e=1),t+e}Object.defineProperty(e,"__esModule",{value:!0}),e.inc=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/intersect",["exports"],(function(e){"use strict"
+function t([...e]){return e.map(e=>Ember.isArray(e)?e:[]).pop().filter(t=>{for(let r=0;r<e.length;r++){let n=!1,i=e[r]
+for(let e=0;e<i.length;e++)if(i[e]===t){n=!0
+break}if(!1===n)return!1}return!0})}Object.defineProperty(e,"__esModule",{value:!0}),e.intersect=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/invoke",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.invoke=r,e.default=void 0
+const{all:t}=Ember.RSVP
+function r([e,...r]){let n=r.pop()
+return Ember.isArray(n)?function(){let i=n.map(t=>Ember.tryInvoke(t,e,r))
+return t(i)}:function(){return Ember.tryInvoke(n,e,r)}}var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-composable-helpers/helpers/join",["exports"],(function(e){"use strict"
+function t([e,t]){return t||(t=[]),Ember.isArray(e)&&(t=e,e=","),t.join(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.join=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r}))
+define("ember-composable-helpers/helpers/keys",["exports"],(function(e){"use strict"
+function t([e]){return e?Object.keys(e):e}Object.defineProperty(e,"__esModule",{value:!0}),e.keys=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/map-by",["exports"],(function(e){"use strict"
+function t([e,t]){return Ember.isEmpty(e)?[]:(t||(t=[]),t.map(t=>Ember.get(t,e)))}Object.defineProperty(e,"__esModule",{value:!0}),e.mapBy=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/map",["exports"],(function(e){"use strict"
+function t([e,t]){return Ember.isEmpty(e)?[]:t.map(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.map=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/next",["exports","ember-composable-helpers/utils/get-index","ember-composable-helpers/-private/get-value-array-and-use-deep-equal-from-params"],(function(e,t,r){"use strict"
+function n(e,r,n=!1){r||(r=[])
+let i=(0,t.default)(r,e,n),o=r.length-1
+if(!Ember.isEmpty(i))return i===o?e:Ember.A(r).objectAt(i+1)}Object.defineProperty(e,"__esModule",{value:!0}),e.next=n,e.default=void 0
+var i=Ember.Helper.helper((function(e){let{currentValue:t,array:i,useDeepEqual:o}=(0,r.default)(e)
+return n(t,i,o)}))
+e.default=i})),define("ember-composable-helpers/helpers/noop",["exports"],(function(e){"use strict"
+function t(){return()=>{}}Object.defineProperty(e,"__esModule",{value:!0}),e.noop=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/object-at",["exports"],(function(e){"use strict"
+function t(e,t){if(Ember.isArray(t))return e=parseInt(e,10),Ember.A(t).objectAt(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.objectAt=t,e.default=void 0
+var r=Ember.Helper.helper((function([e,r]){return t(e,r)}))
+e.default=r})),define("ember-composable-helpers/helpers/optional",["exports"],(function(e){"use strict"
+function t([e]){return"function"==typeof e?e:e=>e}Object.defineProperty(e,"__esModule",{value:!0}),e.optional=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/pipe-action",["exports","ember-composable-helpers/helpers/pipe","ember-composable-helpers/-private/closure-action"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=t.pipe
+r.default&&(n[r.default]=!0)
+var i=Ember.Helper.helper(n)
+e.default=i})),define("ember-composable-helpers/helpers/pipe",["exports","ember-composable-helpers/utils/is-promise"],(function(e,t){"use strict"
+function r(e,r){return(0,t.default)(e)?e.then(r):r(e)}function n(e=[]){return function(...t){return e.reduce((e,n,i)=>0===i?n(...t):r(e,n),void 0)}}Object.defineProperty(e,"__esModule",{value:!0}),e.invokeFunction=r,e.pipe=n,e.default=void 0
+var i=Ember.Helper.helper(n)
+e.default=i})),define("ember-composable-helpers/helpers/previous",["exports","ember-composable-helpers/utils/get-index","ember-composable-helpers/-private/get-value-array-and-use-deep-equal-from-params"],(function(e,t,r){"use strict"
+function n(e,r,n=!1){let i=(0,t.default)(r,e,n)
+if(!Ember.isEmpty(i))return 0===i?e:Ember.A(r).objectAt(i-1)}Object.defineProperty(e,"__esModule",{value:!0}),e.previous=n,e.default=void 0
+var i=Ember.Helper.helper((function(e){let{currentValue:t,array:i,useDeepEqual:o}=(0,r.default)(e)
+return n(t,i,o)}))
+e.default=i})),define("ember-composable-helpers/helpers/queue",["exports","ember-composable-helpers/utils/is-promise"],(function(e,t){"use strict"
+function r(e=[]){return function(...r){return e.reduce((e,n,i)=>0===i?n(...r):function(e,n){return(0,t.default)(e)?e.then(()=>n(...r)):n(...r)}(e,n),void 0)}}Object.defineProperty(e,"__esModule",{value:!0}),e.queue=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-composable-helpers/helpers/range",["exports","ember-composable-helpers/utils/comparison"],(function(e,t){"use strict"
+function r([e,r,n]){n="boolean"===Ember.typeOf(n)&&n
+let i=[]
+if(e<r){let o=n?t.lte:t.lt
+for(let t=e;o(t,r);t++)i.push(t)}if(e>r){let o=n?t.gte:t.gt
+for(let t=e;o(t,r);t--)i.push(t)}return e===r&&n&&i.push(r),i}Object.defineProperty(e,"__esModule",{value:!0}),e.range=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-composable-helpers/helpers/reduce",["exports"],(function(e){"use strict"
+function t([e,t,r]){return Ember.isEmpty(e)?[]:r.reduce(e,t)}Object.defineProperty(e,"__esModule",{value:!0}),e.reduce=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/reject-by",["exports","ember-composable-helpers/utils/is-equal"],(function(e,t){"use strict"
+function r([e,r,n]){let i
+return!Ember.isArray(n)&&Ember.isArray(r)&&(n=r,r=void 0),n||(n=[]),i=Ember.isPresent(r)?"function"==typeof r?t=>!r(Ember.get(t,e)):n=>!(0,t.default)(Ember.get(n,e),r):t=>!Ember.get(t,e),n.filter(i)}Object.defineProperty(e,"__esModule",{value:!0}),e.rejectBy=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-composable-helpers/helpers/repeat",["exports"],(function(e){"use strict"
+function t([e,t]){return"number"!==Ember.typeOf(e)?[t]:Array.apply(null,{length:e}).map(()=>t)}Object.defineProperty(e,"__esModule",{value:!0}),e.repeat=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/reverse",["exports"],(function(e){"use strict"
+function t([e]){return Ember.isArray(e)?Ember.A(e).slice(0).reverse():[e]}Object.defineProperty(e,"__esModule",{value:!0}),e.reverse=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/shuffle",["exports"],(function(e){"use strict"
+function t(e,t){let r,n,i=(e=e.slice(0)).length
+for(t="function"===Ember.typeOf(t)&&t||Math.random;i>1;)r=Math.floor(t()*i--),n=e[i],e[i]=e[r],e[r]=n
+return e}Object.defineProperty(e,"__esModule",{value:!0}),e.shuffle=t,e.default=void 0
+var r=Ember.Helper.helper((function([e,r]){return void 0===r&&(r=e,e=void 0),Ember.isArray(r)?t(r,e):[r]}))
+e.default=r})),define("ember-composable-helpers/helpers/slice",["exports"],(function(e){"use strict"
+function t([...e]){let t=e.pop()
+return t||(t=[]),t.slice(...e)}Object.defineProperty(e,"__esModule",{value:!0}),e.slice=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/sort-by",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.extend({compute(e){let t=e.slice(),r=t.pop(),[n]=t
+return("function"===Ember.typeOf(n)||Ember.isArray(n))&&(t=n),Ember.set(this,"array",r),Ember.set(this,"sortProps",t),Ember.isEmpty(t)&&Ember.defineProperty(this,"content",[]),"function"==typeof t?Ember.defineProperty(this,"content",Ember.computed.sort("array",t)):Ember.defineProperty(this,"content",Ember.computed.sort("array","sortProps")),this.content}})
+e.default=t})),define("ember-composable-helpers/helpers/take",["exports"],(function(e){"use strict"
+function t([e,t]){return t||(t=[]),t.slice(0,e)}Object.defineProperty(e,"__esModule",{value:!0}),e.take=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/toggle-action",["exports","ember-composable-helpers/helpers/toggle","ember-composable-helpers/-private/closure-action"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=t.toggle
+r.default&&(n[r.default]=!0)
+var i=Ember.Helper.helper(n)
+e.default=i})),define("ember-composable-helpers/helpers/toggle",["exports"],(function(e){"use strict"
+function t([e,t,...r]){return function(){let n=Ember.get(t,e)
+if(Ember.isPresent(r)){let i=r.indexOf(n),o=function(e,t){return-1===t||t+1===e?0:t+1}(r.length,i)
+return Ember.set(t,e,r[o])}return Ember.set(t,e,!n)}}Object.defineProperty(e,"__esModule",{value:!0}),e.toggle=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/union",["exports"],(function(e){"use strict"
+function t([...e]){return[].concat(...e).filter((e,t,r)=>r.indexOf(e)===t)}Object.defineProperty(e,"__esModule",{value:!0}),e.union=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-composable-helpers/helpers/values",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function([e]){return e?Object.values(e):e}))
+e.default=t})),define("ember-composable-helpers/helpers/without",["exports","ember-composable-helpers/utils/includes"],(function(e,t){"use strict"
+function r(e,r){return!!Ember.isArray(r)&&(Ember.isArray(e)&&e.length?r.reduce((r,n)=>function(e,r){return(0,t.default)(Ember.A(r),e)}(n,e)?r:r.concat(n),[]):Ember.A(r).without(e))}Object.defineProperty(e,"__esModule",{value:!0}),e.without=r,e.default=void 0
+var n=Ember.Helper.helper((function([e,t]){return r(e,t)}))
+e.default=n})),define("ember-composable-helpers/index",["exports","ember-composable-helpers/helpers/append","ember-composable-helpers/helpers/chunk","ember-composable-helpers/helpers/compact","ember-composable-helpers/helpers/compute","ember-composable-helpers/helpers/contains","ember-composable-helpers/helpers/dec","ember-composable-helpers/helpers/drop","ember-composable-helpers/helpers/filter-by","ember-composable-helpers/helpers/filter","ember-composable-helpers/helpers/find-by","ember-composable-helpers/helpers/flatten","ember-composable-helpers/helpers/group-by","ember-composable-helpers/helpers/has-next","ember-composable-helpers/helpers/has-previous","ember-composable-helpers/helpers/inc","ember-composable-helpers/helpers/intersect","ember-composable-helpers/helpers/invoke","ember-composable-helpers/helpers/join","ember-composable-helpers/helpers/map-by","ember-composable-helpers/helpers/map","ember-composable-helpers/helpers/next","ember-composable-helpers/helpers/object-at","ember-composable-helpers/helpers/optional","ember-composable-helpers/helpers/pipe-action","ember-composable-helpers/helpers/pipe","ember-composable-helpers/helpers/previous","ember-composable-helpers/helpers/queue","ember-composable-helpers/helpers/range","ember-composable-helpers/helpers/reduce","ember-composable-helpers/helpers/reject-by","ember-composable-helpers/helpers/repeat","ember-composable-helpers/helpers/reverse","ember-composable-helpers/helpers/shuffle","ember-composable-helpers/helpers/slice","ember-composable-helpers/helpers/sort-by","ember-composable-helpers/helpers/take","ember-composable-helpers/helpers/toggle-action","ember-composable-helpers/helpers/toggle","ember-composable-helpers/helpers/union","ember-composable-helpers/helpers/without"],(function(e,t,r,n,i,o,a,s,l,u,c,d,h,f,p,m,v,g,b,y,_,w,E,x,O,S,T,M,A,P,C,k,R,j,D,N,I,L,F,z,U){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"AppendHelper",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"ChunkHelper",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"CompactHelper",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"ComputeHelper",{enumerable:!0,get:function(){return i.default}}),Object.defineProperty(e,"ContainsHelper",{enumerable:!0,get:function(){return o.default}}),Object.defineProperty(e,"DecHelper",{enumerable:!0,get:function(){return a.default}}),Object.defineProperty(e,"DropHelper",{enumerable:!0,get:function(){return s.default}}),Object.defineProperty(e,"FilterByHelper",{enumerable:!0,get:function(){return l.default}}),Object.defineProperty(e,"FilterHelper",{enumerable:!0,get:function(){return u.default}}),Object.defineProperty(e,"FindByHelper",{enumerable:!0,get:function(){return c.default}}),Object.defineProperty(e,"FlattenHelper",{enumerable:!0,get:function(){return d.default}}),Object.defineProperty(e,"GroupByHelper",{enumerable:!0,get:function(){return h.default}}),Object.defineProperty(e,"HasNextHelper",{enumerable:!0,get:function(){return f.default}}),Object.defineProperty(e,"HasPreviousHelper",{enumerable:!0,get:function(){return p.default}}),Object.defineProperty(e,"IncHelper",{enumerable:!0,get:function(){return m.default}}),Object.defineProperty(e,"IntersectHelper",{enumerable:!0,get:function(){return v.default}}),Object.defineProperty(e,"InvokeHelper",{enumerable:!0,get:function(){return g.default}}),Object.defineProperty(e,"JoinHelper",{enumerable:!0,get:function(){return b.default}}),Object.defineProperty(e,"MapByHelper",{enumerable:!0,get:function(){return y.default}}),Object.defineProperty(e,"MapHelper",{enumerable:!0,get:function(){return _.default}}),Object.defineProperty(e,"NextHelper",{enumerable:!0,get:function(){return w.default}}),Object.defineProperty(e,"ObjectAtHelper",{enumerable:!0,get:function(){return E.default}}),Object.defineProperty(e,"OptionalHelper",{enumerable:!0,get:function(){return x.default}}),Object.defineProperty(e,"PipeActionHelper",{enumerable:!0,get:function(){return O.default}}),Object.defineProperty(e,"PipeHelper",{enumerable:!0,get:function(){return S.default}}),Object.defineProperty(e,"PreviousHelper",{enumerable:!0,get:function(){return T.default}}),Object.defineProperty(e,"QueueHelper",{enumerable:!0,get:function(){return M.default}}),Object.defineProperty(e,"RangeHelper",{enumerable:!0,get:function(){return A.default}}),Object.defineProperty(e,"ReduceHelper",{enumerable:!0,get:function(){return P.default}})
+Object.defineProperty(e,"RejectByHelper",{enumerable:!0,get:function(){return C.default}}),Object.defineProperty(e,"RepeatHelper",{enumerable:!0,get:function(){return k.default}}),Object.defineProperty(e,"ReverseHelper",{enumerable:!0,get:function(){return R.default}}),Object.defineProperty(e,"ShuffleHelper",{enumerable:!0,get:function(){return j.default}}),Object.defineProperty(e,"SliceHelper",{enumerable:!0,get:function(){return D.default}}),Object.defineProperty(e,"SortByHelper",{enumerable:!0,get:function(){return N.default}}),Object.defineProperty(e,"TakeHelper",{enumerable:!0,get:function(){return I.default}}),Object.defineProperty(e,"ToggleActionHelper",{enumerable:!0,get:function(){return L.default}}),Object.defineProperty(e,"ToggleHelper",{enumerable:!0,get:function(){return F.default}}),Object.defineProperty(e,"UnionHelper",{enumerable:!0,get:function(){return z.default}}),Object.defineProperty(e,"WithoutHelper",{enumerable:!0,get:function(){return U.default}})})),define("ember-composable-helpers/utils/comparison",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.lte=function(e,t){return e<=t},e.lt=function(e,t){return e<t},e.gte=function(e,t){return e>=t},e.gt=function(e,t){return e>t}})),define("ember-composable-helpers/utils/get-index",["exports","ember-composable-helpers/utils/is-equal"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r,n){let i=r
+n&&(i=Ember.A(e).find(e=>(0,t.default)(e,r,n)))
+let o=Ember.A(e).indexOf(i)
+return o>=0?o:null}})),define("ember-composable-helpers/utils/includes",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,...t){return(e.includes||e.contains).apply(e,t)}})),define("ember-composable-helpers/utils/is-equal",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,r=!1){return r?JSON.stringify(e)===JSON.stringify(t):Ember.isEqual(e,t)||Ember.isEqual(t,e)}}))
+define("ember-composable-helpers/utils/is-object",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return"object"===Ember.typeOf(e)||"instance"===Ember.typeOf(e)}})),define("ember-composable-helpers/utils/is-promise",["exports","ember-composable-helpers/utils/is-object"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return(0,t.default)(e)&&function(e={}){return"function"===Ember.typeOf(e.then)&&"function"===Ember.typeOf(e.catch)}(e)}})),define("ember-concurrency-decorators/index",["exports","@ember-decorators/utils/decorator","ember-concurrency","ember-concurrency-decorators/last-value"],(function(e,t,r,n){"use strict"
+function i(e){return"function"==typeof e}function o(e){const t=function(e){return"function"==typeof e.initializer?e.initializer.call(void 0):"function"==typeof e.get?e.get.call(void 0):e.value?e.value:void 0}(e)
+return i(t)||function(e){return"object"==typeof e&&null!==e&&i(e.perform)}(t)?(0,r.task)(t):void 0}function a(){return(0,r.taskGroup)()}function s(e,r={}){return(0,t.decoratorWithParams)((t,n,i,[o]=[])=>{const{initializer:a,value:s}=i
+return delete i.initializer,delete i.value,function(e,t){const r=Object.keys(e)
+for(const n of r){const r=e[n]
+!0===r?t[n]():t[n](r)}return t}({...r,...o},e({...i,initializer:a,value:s}))(t,n,i)})}Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"lastValue",{enumerable:!0,get:function(){return n.default}}),e.enqueueTaskGroup=e.keepLatestTaskGroup=e.dropTaskGroup=e.restartableTaskGroup=e.taskGroup=e.enqueueTask=e.keepLatestTask=e.dropTask=e.restartableTask=e.task=void 0
+const l=s(o)
+e.task=l
+const u=s(o,{restartable:!0})
+e.restartableTask=u
+const c=s(o,{drop:!0})
+e.dropTask=c
+const d=s(o,{keepLatest:!0})
+e.keepLatestTask=d
+const h=s(o,{enqueue:!0})
+e.enqueueTask=h
+const f=s(a)
+e.taskGroup=f
+const p=s(a,{restartable:!0})
+e.restartableTaskGroup=p
+const m=s(a,{drop:!0})
+e.dropTaskGroup=m
+const v=s(a,{keepLatest:!0})
+e.keepLatestTaskGroup=v
+const g=s(a,{enqueue:!0})
+e.enqueueTaskGroup=g})),define("ember-concurrency-decorators/last-value",["exports","@ember-decorators/utils/decorator"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=(0,t.decoratorWithRequiredParams)((function(e,t,r,[n]){const{initializer:i}=r
+delete r.initializer
+return Ember.computed(n+".lastSuccessful",(function(){const e=Ember.get(this,n+".lastSuccessful")
+return e?Ember.get(e,"value"):i?i.call(this):void 0}))(e,t,r)}))
+e.default=r})),define("ember-concurrency/-private/cancelable-promise-helpers",["exports","ember-concurrency/-private/task-instance","ember-concurrency/-private/external/yieldables"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.hashSettled=e.hash=e.race=e.allSettled=e.all=void 0
+const n=c(Ember.RSVP.Promise,"all",l)
+e.all=n
+const i=c(Ember.RSVP,"allSettled",l)
+e.allSettled=i
+const o=c(Ember.RSVP.Promise,"race",l)
+e.race=o
+const a=c(Ember.RSVP,"hash",u)
+e.hash=a
+const s=c(Ember.RSVP,"hashSettled",u)
+function l(e){return e}function u(e){return Object.keys(e).map(t=>e[t])}function c(e,n,i){return function(o){let a=i(o)
+a.forEach(e=>{e&&e instanceof t.TaskInstance&&(e.executor.asyncErrorsHandled=!0)})
+let s=Ember.RSVP.defer()
+e[n](o).then(s.resolve,s.reject)
+let l=!1,u=()=>{l||(l=!0,a.forEach(e=>{e&&(e instanceof t.TaskInstance?e.cancel():"function"==typeof e[r.cancelableSymbol]&&e[r.cancelableSymbol]())}))},c=s.promise.finally(u)
+return c[r.cancelableSymbol]=u,c}}e.hashSettled=s})),define("ember-concurrency/-private/ember-environment",["exports","ember-concurrency/-private/external/environment"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.EMBER_ENVIRONMENT=e.EmberEnvironment=void 0
+class r extends t.Environment{assert(...e){}async(e){Ember.run.join(()=>Ember.run.once(null,e))}reportUncaughtRejection(e){Ember.run.next(null,(function(){if(!Ember.onerror)throw e
+Ember.onerror(e)}))}defer(){return Ember.RSVP.defer()}globalDebuggingEnabled(){return Ember.ENV.DEBUG_TASKS}}e.EmberEnvironment=r
+const n=new r
+e.EMBER_ENVIRONMENT=n})),define("ember-concurrency/-private/external/environment",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.Environment=void 0
+e.Environment=class{assert(){}async(){}reportUncaughtRejection(){}defer(){}globalDebuggingEnabled(){}}})),define("ember-concurrency/-private/external/generator-state",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.GeneratorState=e.GeneratorStepResult=void 0
+class t{constructor(e,t,r){this.value=e,this.done=t,this.errored=r}}e.GeneratorStepResult=t
+e.GeneratorState=class{constructor(e){this.done=!1,this.generatorFactory=e,this.iterator=null}step(e,r){try{let n=this.getIterator(),{value:i,done:o}=n[r](e)
+return o?this.finalize(i,!1):new t(i,!1,!1)}catch(n){return this.finalize(n,!0)}}getIterator(){return this.iterator||this.done||(this.iterator=this.generatorFactory()),this.iterator}finalize(e,r){return this.done=!0,this.iterator=null,new t(e,!0,r)}}})),define("ember-concurrency/-private/external/scheduler/policies/bounded-policy",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=class{constructor(e){this.maxConcurrency=e||1}}
+e.default=t})),define("ember-concurrency/-private/external/scheduler/policies/drop-policy",["exports","ember-concurrency/-private/external/scheduler/policies/bounded-policy","ember-concurrency/-private/external/scheduler/policies/execution-states"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=(0,r.makeCancelState)("it belongs to a 'drop' Task that was already running")
+class i{constructor(e){this.remainingSlots=e}step(){return this.remainingSlots>0?(this.remainingSlots--,r.STARTED):n}}class o extends t.default{makeReducer(){return new i(this.maxConcurrency)}}var a=o
+e.default=a})),define("ember-concurrency/-private/external/scheduler/policies/enqueued-policy",["exports","ember-concurrency/-private/external/scheduler/policies/bounded-policy","ember-concurrency/-private/external/scheduler/policies/execution-states"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n{constructor(e){this.remainingSlots=e}step(){return this.remainingSlots>0?(this.remainingSlots--,r.STARTED):r.QUEUED}}class i extends t.default{makeReducer(){return new n(this.maxConcurrency)}}var o=i
+e.default=o})),define("ember-concurrency/-private/external/scheduler/policies/execution-states",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.makeCancelState=e.QUEUED=e.STARTED=e.TYPE_QUEUED=e.TYPE_STARTED=e.TYPE_CANCELLED=void 0
+e.TYPE_CANCELLED="CANCELLED"
+e.TYPE_STARTED="STARTED"
+e.TYPE_QUEUED="QUEUED"
+const t={type:"STARTED"}
+e.STARTED=t
+const r={type:"QUEUED"}
+e.QUEUED=r
+e.makeCancelState=e=>({type:"CANCELLED",reason:e})})),define("ember-concurrency/-private/external/scheduler/policies/keep-latest-policy",["exports","ember-concurrency/-private/external/scheduler/policies/bounded-policy","ember-concurrency/-private/external/scheduler/policies/execution-states"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=(0,r.makeCancelState)("it belongs to a 'keepLatest' Task that was already running")
+class i{constructor(e,t){this.remainingSlots=e,this.numToCancel=t}step(){return this.remainingSlots>0?(this.remainingSlots--,r.STARTED):this.numToCancel>0?(this.numToCancel--,n):r.QUEUED}}class o extends t.default{makeReducer(e,t){let r=e+t
+return new i(this.maxConcurrency,r-this.maxConcurrency-1)}}var a=o
+e.default=a})),define("ember-concurrency/-private/external/scheduler/policies/restartable-policy",["exports","ember-concurrency/-private/external/scheduler/policies/bounded-policy","ember-concurrency/-private/external/scheduler/policies/execution-states"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const n=(0,r.makeCancelState)("it belongs to a 'restartable' Task that was .perform()ed again")
+class i{constructor(e){this.numToCancel=e}step(){return this.numToCancel>0?(this.numToCancel--,n):r.STARTED}}class o extends t.default{makeReducer(e,t){return new i(e+t-this.maxConcurrency)}}var a=o
+e.default=a})),define("ember-concurrency/-private/external/scheduler/policies/unbounded-policy",["exports","ember-concurrency/-private/external/scheduler/policies/execution-states"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r=new class{step(){return t.STARTED}}
+var n=class{makeReducer(){return r}}
+e.default=n})),define("ember-concurrency/-private/external/scheduler/refresh",["exports","ember-concurrency/-private/external/scheduler/policies/execution-states"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=class{constructor(e,t,r){this.stateTracker=t,this.schedulerPolicy=e,this.initialTaskInstances=r,this.startingInstances=[]}process(){let[e,t,r]=this.filterFinishedTaskInstances(),n=this.schedulerPolicy.makeReducer(t,r),i=e.filter(e=>this.setTaskInstanceExecutionState(e,n.step()))
+return this.stateTracker.computeFinalStates(e=>this.applyState(e)),this.startingInstances.forEach(e=>e.start()),i}filterFinishedTaskInstances(){let e=0,t=0
+return[this.initialTaskInstances.filter(r=>{let n=this.stateTracker.stateFor(r.task),i=r.executor.state
+return i.isFinished?(n.onCompletion(r),!1):(i.hasStarted?e+=1:t+=1,!0)}),e,t]}setTaskInstanceExecutionState(e,r){let n=this.stateTracker.stateFor(e.task)
+switch(e.executor.counted||(e.executor.counted=!0,n.onPerformed(e)),r.type){case t.TYPE_CANCELLED:return e.cancel(r.reason),!1
+case t.TYPE_STARTED:return e.executor.state.hasStarted||(this.startingInstances.push(e),n.onStart(e)),n.onRunning(e),!0
+case t.TYPE_QUEUED:return n.onQueued(e),!0}}applyState(e){let{taskable:t}=e
+if(!t.onState)return
+let r=Object.assign({numRunning:e.numRunning,numQueued:e.numQueued,numPerformedInc:e.numPerformedInc},e.attrs)
+t.onState(r,t)}}
+e.default=r})),define("ember-concurrency/-private/external/scheduler/scheduler",["exports","ember-concurrency/-private/external/scheduler/refresh","ember-concurrency/-private/external/scheduler/state-tracker/state-tracker","ember-concurrency/-private/external/scheduler/state-tracker/null-state-tracker"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var i=class{constructor(e,t){this.schedulerPolicy=e,this.stateTrackingEnabled=t,this.taskInstances=[]}cancelAll(e,t){let r=this.taskInstances.map(r=>{r.task.guids[e]&&r.executor.cancel(t)}).filter(e=>!!e)
+return Promise.all(r)}perform(e){e.onFinalize(()=>this.scheduleRefresh()),this.taskInstances.push(e),this.refresh()}scheduleRefresh(){}refresh(){let e=this.stateTrackingEnabled?new r.default:new n.default,i=new t.default(this.schedulerPolicy,e,this.taskInstances)
+this.taskInstances=i.process()}}
+e.default=i})),define("ember-concurrency/-private/external/scheduler/state-tracker/null-state-tracker",["exports","ember-concurrency/-private/external/scheduler/state-tracker/null-state"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r=new t.default
+var n=class{stateFor(){return r}computeFinalStates(){}}
+e.default=n})),define("ember-concurrency/-private/external/scheduler/state-tracker/null-state",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=class{onCompletion(){}onPerformed(){}onStart(){}onRunning(){}onQueued(){}}
+e.default=t})),define("ember-concurrency/-private/external/scheduler/state-tracker/state-tracker",["exports","ember-concurrency/-private/external/scheduler/state-tracker/state"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=class{constructor(){this.states={}}stateFor(e){let r=e.guid,n=this.states[r]
+return n||(n=this.states[r]=new t.default(e)),n}computeFinalStates(e){this.computeRecursiveState(),this.forEachState(t=>e(t))}computeRecursiveState(){this.forEachState(e=>{let t=e
+e.recurseTaskGroups(e=>{let r=this.stateFor(e)
+r.applyStateFrom(t),t=r})})}forEachState(e){Object.keys(this.states).forEach(t=>e(this.states[t]))}}
+e.default=r})),define("ember-concurrency/-private/external/scheduler/state-tracker/state",["exports","ember-concurrency/-private/external/task-instance/completion-states"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=class{constructor(e){this.taskable=e,this.group=e.group,this.numRunning=0,this.numQueued=0,this.numPerformedInc=0,this.attrs={}}onCompletion(e){let r=e.completionState
+this.attrs.lastRunning=null,this.attrs.lastComplete=e,r===t.COMPLETION_SUCCESS?this.attrs.lastSuccessful=e:(r===t.COMPLETION_ERROR?this.attrs.lastErrored=e:r===t.COMPLETION_CANCEL&&(this.attrs.lastCanceled=e),this.attrs.lastIncomplete=e)}onPerformed(e){this.numPerformedInc+=1,this.attrs.lastPerformed=e}onStart(e){this.attrs.last=e}onRunning(e){this.attrs.lastRunning=e,this.numRunning+=1}onQueued(){this.numQueued+=1}recurseTaskGroups(e){let t=this.group
+for(;t;)e(t),t=t.group}applyStateFrom(e){Object.assign(this.attrs,e.attrs),this.numRunning+=e.numRunning,this.numQueued+=e.numQueued,this.numPerformedInc+=e.numPerformedInc}}
+e.default=r})),define("ember-concurrency/-private/external/task-instance/base",["exports","ember-concurrency/-private/external/task-instance/initial-state","ember-concurrency/-private/external/yieldables","ember-concurrency/-private/external/task-instance/cancelation"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.BaseTaskInstance=void 0
+class i{constructor({task:e,args:t,executor:r,performType:n,hasEnabledEvents:i}){this.task=e,this.args=t,this.performType=n,this.executor=r,this.executor.taskInstance=this,this.hasEnabledEvents=i}setState(){}onStarted(){}onSuccess(){}onError(){}onCancel(){}formatCancelReason(){}selfCancelLoopWarning(){}onFinalize(e){this.executor.onFinalize(e)}proceed(e,t,r){this.executor.proceedChecked(e,t,r)}[r.yieldableSymbol](e,t){return this.executor.onYielded(e,t)}cancel(e=".cancel() was explicitly called"){this.executor.cancel(new n.CancelRequest(n.CANCEL_KIND_EXPLICIT,e))}then(...e){return this.executor.promise().then(...e)}catch(...e){return this.executor.promise().catch(...e)}finally(...e){return this.executor.promise().finally(...e)}toString(){return this.task+" TaskInstance"}start(){return this.executor.start(),this}}e.BaseTaskInstance=i,Object.assign(i.prototype,t.INITIAL_STATE),Object.assign(i.prototype,{state:"waiting",isDropped:!1,isRunning:!0})})),define("ember-concurrency/-private/external/task-instance/cancelation",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.didCancel=function(e){return e&&"TaskCancelation"===e.name},e.CancelRequest=e.CANCEL_KIND_PARENT_CANCEL=e.CANCEL_KIND_LIFESPAN_END=e.CANCEL_KIND_YIELDABLE_CANCEL=e.CANCEL_KIND_EXPLICIT=e.TASK_CANCELATION_NAME=void 0
+e.TASK_CANCELATION_NAME="TaskCancelation"
+e.CANCEL_KIND_EXPLICIT="explicit"
+e.CANCEL_KIND_YIELDABLE_CANCEL="yielded"
+e.CANCEL_KIND_LIFESPAN_END="lifespan_end"
+e.CANCEL_KIND_PARENT_CANCEL="parent_cancel"
+e.CancelRequest=class{constructor(e,t){this.kind=e,this.reason=t,this.promise=new Promise(e=>{this.finalize=e})}}})),define("ember-concurrency/-private/external/task-instance/completion-states",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.COMPLETION_CANCEL=e.COMPLETION_ERROR=e.COMPLETION_SUCCESS=e.COMPLETION_PENDING=void 0
+e.COMPLETION_PENDING=0
+e.COMPLETION_SUCCESS=1
+e.COMPLETION_ERROR=2
+e.COMPLETION_CANCEL=3})),define("ember-concurrency/-private/external/task-instance/executor",["exports","ember-concurrency/-private/external/generator-state","ember-concurrency/-private/external/task-instance/initial-state","ember-concurrency/-private/external/yieldables","ember-concurrency/-private/external/task-instance/completion-states","ember-concurrency/-private/external/task-instance/cancelation"],(function(e,t,r,n,i,o){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.getRunningInstance=function(){return s[s.length-1]},e.TaskInstanceExecutor=e.PERFORM_TYPE_LINKED=e.PERFORM_TYPE_UNLINKED=e.PERFORM_TYPE_DEFAULT=void 0
+e.PERFORM_TYPE_DEFAULT="PERFORM_TYPE_DEFAULT"
+e.PERFORM_TYPE_UNLINKED="PERFORM_TYPE_UNLINKED"
+e.PERFORM_TYPE_LINKED="PERFORM_TYPE_LINKED"
+const a={}
+let s=[]
+e.TaskInstanceExecutor=class{constructor({generatorFactory:e,env:n,debug:i}){this.generatorState=new t.GeneratorState(e),this.state=Object.assign({},r.INITIAL_STATE),this.index=1,this.disposers=[],this.finalizeCallbacks=[],this.env=n,this.debug=i,this.cancelRequest=null}start(){this.state.hasStarted||this.cancelRequest||(this.setState({hasStarted:!0}),this.proceedSync(n.YIELDABLE_CONTINUE,void 0),this.taskInstance.onStarted())}cancel(e){return this.requestCancel(e)?(this.state.hasStarted?this.proceedWithCancelAsync():this.finalizeWithCancel(),this.cancelRequest.promise):(e.finalize(),e.promise)}setState(e){Object.assign(this.state,e),this.taskInstance.setState(this.state)}proceedChecked(e,t,r){this.state.isFinished||this.advanceIndex(e)&&(t===n.YIELDABLE_CANCEL?(this.requestCancel(new o.CancelRequest(o.CANCEL_KIND_YIELDABLE_CANCEL),r),this.proceedWithCancelAsync()):this.proceedAsync(t,r))}proceedWithCancelAsync(){this.proceedAsync(n.YIELDABLE_RETURN,a)}proceedAsync(e,t){this.advanceIndex(this.index),this.env.async(()=>this.proceedSync(e,t))}proceedSync(e,t){this.state.isFinished||(this.dispose(),this.generatorState.done?this.handleResolvedReturnedValue(e,t):this.handleResolvedContinueValue(e,t))}handleResolvedContinueValue(e,t){let r=this.index,n=this.generatorStep(t,e)
+this.advanceIndex(r)&&(n.errored?this.finalize(n.value,i.COMPLETION_ERROR):this.handleYieldedValue(n))}handleResolvedReturnedValue(e,t){switch(e){case n.YIELDABLE_CONTINUE:case n.YIELDABLE_RETURN:this.finalize(t,i.COMPLETION_SUCCESS)
+break
+case n.YIELDABLE_THROW:this.finalize(t,i.COMPLETION_ERROR)}}handleYieldedUnknownThenable(e){let t=this.index
+e.then(e=>{this.proceedChecked(t,n.YIELDABLE_CONTINUE,e)},e=>{this.proceedChecked(t,n.YIELDABLE_THROW,e)})}advanceIndex(e){if(this.index===e)return++this.index}handleYieldedValue(e){let t=e.value
+t?(this.addDisposer(t[n.cancelableSymbol]),t[n.yieldableSymbol]?this.invokeYieldable(t):"function"==typeof t.then?this.handleYieldedUnknownThenable(t):this.proceedWithSimpleValue(t)):this.proceedWithSimpleValue(t)}proceedWithSimpleValue(e){this.proceedAsync(n.YIELDABLE_CONTINUE,e)}addDisposer(e){"function"==typeof e&&this.disposers.push(e)}dispose(){let e=this.disposers
+0!==e.length&&(this.disposers=[],e.forEach(e=>e()))}generatorStep(e,t){s.push(this)
+let r=this.generatorState.step(e,t)
+if(s.pop(),this._expectsLinkedYield){let e=r.value
+e&&"PERFORM_TYPE_LINKED"===e.performType||console.warn("You performed a .linked() task without immediately yielding/returning it. This is currently unsupported (but might be supported in future version of ember-concurrency)."),this._expectsLinkedYield=!1}return r}maybeResolveDefer(){this.defer&&this.state.isFinished&&(this.state.completionState===i.COMPLETION_SUCCESS?this.defer.resolve(this.state.value):this.defer.reject(this.state.error))}onFinalize(e){this.finalizeCallbacks.push(e),this.state.isFinished&&this.runFinalizeCallbacks()}runFinalizeCallbacks(){this.finalizeCallbacks.forEach(e=>e()),this.finalizeCallbacks=[],this.maybeResolveDefer(),this.maybeThrowUnhandledTaskErrorLater()}promise(){return this.defer||(this.defer=this.env.defer(),this.asyncErrorsHandled=!0,this.maybeResolveDefer()),this.defer.promise}maybeThrowUnhandledTaskErrorLater(){this.asyncErrorsHandled||this.state.completionState!==i.COMPLETION_ERROR||(0,o.didCancel)(this.state.error)||this.env.async(()=>{this.asyncErrorsHandled||this.env.reportUncaughtRejection(this.state.error)})}requestCancel(e){return!this.cancelRequest&&!this.state.isFinished&&(this.cancelRequest=e,!0)}finalize(e,t){if(this.cancelRequest)return this.finalizeWithCancel()
+let r={completionState:t}
+t===i.COMPLETION_SUCCESS?(r.isSuccessful=!0,r.value=e):t===i.COMPLETION_ERROR?(r.isError=!0,r.error=e):t===i.COMPLETION_CANCEL&&(r.error=e),this.finalizeShared(r)}finalizeWithCancel(){let e=this.taskInstance.formatCancelReason(this.cancelRequest.reason),t=new Error(e)
+this.debugEnabled()&&console.log(e),t.name=o.TASK_CANCELATION_NAME,this.finalizeShared({isCanceled:!0,completionState:i.COMPLETION_CANCEL,error:t,cancelReason:e}),this.cancelRequest.finalize()}debugEnabled(){return this.debug||this.env.globalDebuggingEnabled()}finalizeShared(e){this.index++,e.isFinished=!0,this.setState(e),this.runFinalizeCallbacks(),this.dispatchFinalizeEvents(e.completionState)}dispatchFinalizeEvents(e){switch(e){case i.COMPLETION_SUCCESS:this.taskInstance.onSuccess()
+break
+case i.COMPLETION_ERROR:this.taskInstance.onError(this.state.error)
+break
+case i.COMPLETION_CANCEL:this.taskInstance.onCancel(this.state.cancelReason)}}invokeYieldable(e){try{let t=e[n.yieldableSymbol](this.taskInstance,this.index)
+this.addDisposer(t)}catch(t){this.env.reportUncaughtRejection(t)}}onYielded(e,t){this.asyncErrorsHandled=!0,this.onFinalize(()=>{let r=this.state.completionState
+r===i.COMPLETION_SUCCESS?e.proceed(t,n.YIELDABLE_CONTINUE,this.state.value):r===i.COMPLETION_ERROR?e.proceed(t,n.YIELDABLE_THROW,this.state.error):r===i.COMPLETION_CANCEL&&e.proceed(t,n.YIELDABLE_CANCEL,null)})
+let r=this.getPerformType()
+if("PERFORM_TYPE_UNLINKED"!==r)return()=>{this.detectSelfCancelLoop(r,e),this.cancel(new o.CancelRequest(o.CANCEL_KIND_PARENT_CANCEL))}}getPerformType(){return this.taskInstance.performType||"PERFORM_TYPE_DEFAULT"}detectSelfCancelLoop(e,t){if("PERFORM_TYPE_DEFAULT"!==e)return
+let r=t.executor&&t.executor.cancelRequest
+!r||r.kind!==o.CANCEL_KIND_LIFESPAN_END||this.cancelRequest||this.state.isFinished||this.taskInstance.selfCancelLoopWarning(t)}}})),define("ember-concurrency/-private/external/task-instance/initial-state",["exports","ember-concurrency/-private/external/task-instance/completion-states"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.INITIAL_STATE=void 0
+const r={completionState:t.COMPLETION_PENDING,value:null,error:null,isSuccessful:!1,isError:!1,isCanceled:!1,hasStarted:!1,isFinished:!1}
+e.INITIAL_STATE=r})),define("ember-concurrency/-private/external/task/default-state",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.DEFAULT_STATE=void 0
+const t={last:null,lastRunning:null,lastStarted:null,lastPerformed:null,lastSuccessful:null,lastComplete:null,lastErrored:null,lastCanceled:null,lastIncomplete:null,performCount:0}
+e.DEFAULT_STATE=t,Object.freeze(t)})),define("ember-concurrency/-private/external/task/task-group",["exports","ember-concurrency/-private/external/task/taskable"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.TaskGroup=void 0
+class r extends t.Taskable{}e.TaskGroup=r})),define("ember-concurrency/-private/external/task/task",["exports","ember-concurrency/-private/external/task/taskable","ember-concurrency/-private/external/task-instance/executor"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.Task=void 0
+class n{constructor(e,t,r){this.task=e,this.performType=t,this.linkedObject=r}perform(...e){return this.task._performShared(e,this.performType,this.linkedObject)}}class i extends t.Taskable{constructor(e){super(e),this.perform=this._perform.bind(this)}linked(){let e=(0,r.getRunningInstance)()
+if(!e)throw new Error("You can only call .linked() from within a task.")
+return new n(this,r.PERFORM_TYPE_LINKED,e)}unlinked(){return new n(this,r.PERFORM_TYPE_UNLINKED,null)}_perform(){}}e.Task=i})),define("ember-concurrency/-private/external/task/taskable",["exports","ember-concurrency/-private/external/task/default-state","ember-concurrency/-private/external/task-instance/cancelation"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.Taskable=void 0
+let n=0
+class i{constructor(e){this.options=e,Object.assign(this,e),this.guid="ec_"+n++,this.guids={},this.guids[this.guid]=!0,this.group&&Object.assign(this.guids,this.group.guids)}cancelAll(e){let{reason:t,cancelRequestKind:n,resetState:i}=e||{}
+t=t||".cancelAll() was explicitly called on the Task"
+let o=new r.CancelRequest(n||r.CANCEL_KIND_EXPLICIT,t)
+return this.scheduler.cancelAll(this.guid,o).then(()=>{i&&this._resetState()})}_resetState(){this.setState(t.DEFAULT_STATE)}setState(){}}e.Taskable=i,Object.assign(i.prototype,t.DEFAULT_STATE),Object.assign(i.prototype,{numRunning:0,numQueued:0,isRunning:!1,isQueued:!1,isIdle:!0,state:"idle"})}))
+define("ember-concurrency/-private/external/yieldables",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.animationFrame=function(){return new r},e.rawTimeout=function(e){return new n(e)},e.forever=e.Yieldable=e.YIELDABLE_CANCEL=e.YIELDABLE_RETURN=e.YIELDABLE_THROW=e.YIELDABLE_CONTINUE=e.yieldableSymbol=e.cancelableSymbol=void 0
+e.cancelableSymbol="__ec_cancel__"
+e.yieldableSymbol="__ec_yieldable__"
+e.YIELDABLE_CONTINUE="next"
+e.YIELDABLE_THROW="throw"
+e.YIELDABLE_RETURN="return"
+e.YIELDABLE_CANCEL="cancel"
+class t{constructor(){this.__ec_yieldable__=this.__ec_yieldable__.bind(this),this.__ec_cancel__=this.__ec_cancel__.bind(this)}_deferable(){let e={resolve:void 0,reject:void 0}
+return e.promise=new Promise((t,r)=>{e.resolve=t,e.reject=r}),e}_toPromise(){let e=this._deferable(),t={proceed(t,r,n){"next"==r||"return"==r?e.resolve(n):e.reject(n)}},r=this.__ec_yieldable__(t,0)
+return e.promise.__ec_cancel__=r||this.__ec_cancel__,e.promise}then(...e){return this._toPromise().then(...e)}catch(...e){return this._toPromise().catch(...e)}finally(...e){return this._toPromise().finally(...e)}__ec_yieldable__(){}__ec_cancel__(){}}e.Yieldable=t
+class r extends t{constructor(){super(),this.timerId=null}__ec_yieldable__(e,t){this.timerId=requestAnimationFrame(()=>{e.proceed(t,"next",e._result)})}__ec_cancel__(){cancelAnimationFrame(this.timerId),this.timerId=null}}class n extends t{constructor(e){super(),this.ms=e,this.timerId=null}__ec_yieldable__(e,t){this.timerId=setTimeout(()=>{e.proceed(t,"next",e._result)},this.ms)}__ec_cancel__(){clearTimeout(this.timerId),this.timerId=null}}const i=new class extends t{__ec_yieldable__(){}__ec_cancel__(){}}
+e.forever=i})),define("ember-concurrency/-private/helpers",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.taskHelperClosure=function(e,t,r,n){let i=r[0],o=r.slice(1)
+return function(...e){if(i&&"function"==typeof i[t]){if(n&&n.value){let t=e.pop()
+e.push(Ember.get(t,n.value))}return i[t](...o,...e)}}}})),define("ember-concurrency/-private/scheduler/ember-scheduler",["exports","ember-concurrency/-private/external/scheduler/scheduler"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends t.default{scheduleRefresh(){Ember.run.once(this,this.refresh)}}var n=r
+e.default=n})),define("ember-concurrency/-private/task-decorators",["exports","ember-concurrency/-private/task-factory","ember-concurrency/-private/utils"],(function(e,t,r){"use strict"
+function n(e,r,n,i=[]){let o,{initializer:a,get:s,value:l}=n
+a?o=a.call(void 0):s?o=s.call(void 0):l&&(o=l),o.displayName=r+" (task)"
+let u=new WeakMap,c=i[0]||{},d=new t.TaskFactory(r,o,c)
+return d._setupEmberKVO(e),{get(){let e=u.get(this)
+return e||(e=d.createTask(this),u.set(this,e)),e}}}function i(e,r,n,i=[]){let o=new WeakMap,a=i[0]||{},s=new t.TaskGroupFactory(r,null,a)
+return{get(){let e=o.get(this)
+return e||(e=s.createTaskGroup(this),o.set(this,e)),e}}}function o(e){return function(...t){return function(e){let[t,r,n]=e
+return 3===e.length&&"object"==typeof t&&null!==t&&"string"==typeof r&&("object"==typeof n&&null!==n&&"enumerable"in n&&"configurable"in n||void 0===n)}(t)?e(...t):(...r)=>e(...r,t)}}function a(e,t={}){return o((r,n,i,[o]=[])=>{let a=Object.assign({},{...t,...o})
+return e(r,n,i,[a])})}Object.defineProperty(e,"__esModule",{value:!0}),e.restartableTaskGroup=e.keepLatestTaskGroup=e.enqueueTaskGroup=e.dropTaskGroup=e.taskGroup=e.restartableTask=e.keepLatestTask=e.enqueueTask=e.dropTask=e.task=e.lastValue=void 0
+const s=o((e,t,n,[i]=[])=>{const{initializer:o}=n
+if(delete n.initializer,r.USE_TRACKED)return{get(){let e=this[i].lastSuccessful
+return e?e.value:o?o.call(this):void 0}}
+return Ember.computed(i+".lastSuccessful",(function(){let e=Ember.get(this,i+".lastSuccessful")
+return e?Ember.get(e,"value"):o?o.call(this):void 0}))(e,t,n)})
+e.lastValue=s
+const l=a(n)
+e.task=l
+const u=a(n,{drop:!0})
+e.dropTask=u
+const c=a(n,{enqueue:!0})
+e.enqueueTask=c
+const d=a(n,{keepLatest:!0})
+e.keepLatestTask=d
+const h=a(n,{restartable:!0})
+e.restartableTask=h
+const f=a(i)
+e.taskGroup=f
+const p=a(i,{drop:!0})
+e.dropTaskGroup=p
+const m=a(i,{enqueue:!0})
+e.enqueueTaskGroup=m
+const v=a(i,{keepLatest:!0})
+e.keepLatestTaskGroup=v
+const g=a(i,{restartable:!0})
+e.restartableTaskGroup=g})),define("ember-concurrency/-private/task-factory",["exports","ember-concurrency/-private/external/scheduler/policies/unbounded-policy","ember-concurrency/-private/external/scheduler/policies/enqueued-policy","ember-concurrency/-private/external/scheduler/policies/drop-policy","ember-concurrency/-private/external/scheduler/policies/keep-latest-policy","ember-concurrency/-private/external/scheduler/policies/restartable-policy","ember-concurrency/-private/task","ember-concurrency/-private/task-properties","ember-concurrency/-private/task-group","ember-concurrency/-private/scheduler/ember-scheduler"],(function(e,t,r,n,i,o,a,s,l,u){"use strict"
+function c(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.TaskGroupFactory=e.TaskFactory=void 0
+let d=0
+function h(e,t,r,n,i,o){if(r)for(let a=0;a<r.length;++a){let s=r[a],l="__ember_concurrency_handler_"+d++
+t[l]=f(n,i,o),e(t,s,null,l)}}function f(e,t,r){return function(){let n=Ember.get(this,e)
+r?Ember.run.scheduleOnce("actions",n,t,...arguments):n[t].apply(n,arguments)}}const p=e=>Array.isArray(e)?e:[e],m={cancelOn:(e,t)=>e.addCancelEvents(...p(t)),enqueue:e=>e.setBufferPolicy(r.default),evented:e=>e.setEvented(!0),debug:e=>e.setDebug(!0),drop:e=>e.setBufferPolicy(n.default),group:(e,t)=>e.setGroup(t),keepLatest:e=>e.setBufferPolicy(i.default),maxConcurrency:(e,t)=>e.setMaxConcurrency(t),observes:(e,t)=>e.addObserverKeys(...p(t)),on:(e,t)=>e.addPerformEvents(...p(t)),onState:(e,t)=>e.setOnState(t),restartable:e=>e.setBufferPolicy(o.default)}
+class v{constructor(e="<unknown>",r=null,n={}){c(this,"_cancelEventNames",[]),c(this,"_debug",null),c(this,"_eventNames",[]),c(this,"_hasUsedModifier",!1),c(this,"_hasSetBufferPolicy",!1),c(this,"_hasEnabledEvents",!1),c(this,"_maxConcurrency",null),c(this,"_observes",[]),c(this,"_onStateCallback",(e,t)=>t.setState(e)),c(this,"_schedulerPolicyClass",t.default),c(this,"_taskGroupPath",null),this.name=e,this.taskDefinition=r,this._processOptions(n)}createTask(e){let t=this._sharedTaskProperties(e)
+return"object"==typeof this.taskDefinition?new a.EncapsulatedTask(Object.assign({taskObj:this.taskDefinition},t)):new a.Task(Object.assign({generatorFactory:t=>this.taskDefinition.apply(e,t)},t))}addCancelEvents(...e){return this._cancelEventNames.push(...e),this}addObserverKeys(...e){return this._observes.push(...e),this}addPerformEvents(...e){return this._eventNames.push(...e),this}setBufferPolicy(e){return this._hasSetBufferPolicy=!0,this._hasUsedModifier=!0,this._schedulerPolicyClass=e,this}setDebug(e){return this._debug=e,this}setEvented(e){return this._hasEnabledEvents=e,this}setMaxConcurrency(e){return this._hasUsedModifier=!0,this._maxConcurrency=e,this}setGroup(e){return this._taskGroupPath=e,this}setName(e){return this.name=e,this}setOnState(e){return this._onStateCallback=e,this}setTaskDefinition(e){return this.taskDefinition=e,this}_processOptions(e){for(let t of Object.keys(e)){let r=e[t]
+m[t]?m[t].call(null,this,r):"function"==typeof s.TaskProperty.prototype[t]&&s.TaskProperty.prototype[t].call(this,r)}}_setupEmberKVO(e){h(Ember.addListener,e,this._eventNames,this.name,"perform",!1),h(Ember.addListener,e,this._cancelEventNames,this.name,"cancelAll",!1),h(Ember.addObserver,e,this._observes,this.name,"perform",!0)}_sharedTaskProperties(e){let t,r,n=this._onStateCallback
+if(this._taskGroupPath)t=e[this._taskGroupPath],r=t.scheduler
+else{let e=new this._schedulerPolicyClass(this._maxConcurrency)
+r=new u.default(e,n)}return{context:e,debug:this._debug,name:this.name,group:t,scheduler:r,hasEnabledEvents:this._hasEnabledEvents,onStateCallback:n}}get taskFn(){return this.taskDefinition}set taskFn(e){this.setTaskDefinition(e)}}e.TaskFactory=v
+e.TaskGroupFactory=class extends v{createTaskGroup(e){let t=this._sharedTaskProperties(e)
+return new l.TaskGroup(t)}}})),define("ember-concurrency/-private/task-group",["exports","ember-concurrency/-private/external/task/task-group","ember-concurrency/-private/taskable-mixin","ember-concurrency/-private/tracked-state"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.TaskGroup=void 0
+class i extends t.TaskGroup{}e.TaskGroup=i,n.TRACKED_INITIAL_TASK_STATE&&Object.defineProperties(i.prototype,n.TRACKED_INITIAL_TASK_STATE),Object.assign(i.prototype,r.TASKABLE_MIXIN)})),define("ember-concurrency/-private/task-instance",["exports","ember-concurrency/-private/external/task-instance/base","ember-concurrency/-private/tracked-state","ember-concurrency/-private/utils"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.TaskInstance=void 0
+class i extends t.BaseTaskInstance{setState(e){let t=this._recomputeState(e);(0,n.assignProperties)(this,{...e,isRunning:!e.isFinished,isDropped:"dropped"===t,state:t})}_recomputeState(e){return e.isDropped?"dropped":e.isCanceled?e.hasStarted?"canceled":"dropped":e.isFinished?"finished":e.hasStarted?"running":"waiting"}onStarted(){this.triggerEvent("started",this)}onSuccess(){this.triggerEvent("succeeded",this)}onError(e){this.triggerEvent("errored",this,e)}onCancel(e){this.triggerEvent("canceled",this,e)}formatCancelReason(e){return`TaskInstance '${this.getName()}' was canceled because ${e}. For more information, see: http://ember-concurrency.com/docs/task-cancelation-help`}getName(){return this.name||(this.name=this.task&&this.task.name||"<unknown>"),this.name}selfCancelLoopWarning(e){let t=`\`${e.getName()}\``,r=`\`${this.getName()}\``
+console.warn(`ember-concurrency detected a potentially hazardous "self-cancel loop" between parent task ${t} and child task ${r}. If you want child task ${r} to be canceled when parent task ${t} is canceled, please change \`.perform()\` to \`.linked().perform()\`. If you want child task ${r} to keep running after parent task ${t} is canceled, change it to \`.unlinked().perform()\``)}triggerEvent(...e){if(!this.hasEnabledEvents)return
+let t=this.task,r=t.context,n=t&&t.name
+if(r&&r.trigger&&n){let[t,...i]=e
+r.trigger(`${n}:${t}`,...i)}}}e.TaskInstance=i,r.TRACKED_INITIAL_INSTANCE_STATE&&Object.defineProperties(i.prototype,r.TRACKED_INITIAL_INSTANCE_STATE)})),define("ember-concurrency/-private/task-properties",["exports","ember-concurrency/-private/external/scheduler/policies/enqueued-policy","ember-concurrency/-private/external/scheduler/policies/drop-policy","ember-concurrency/-private/external/scheduler/policies/keep-latest-policy","ember-concurrency/-private/external/scheduler/policies/restartable-policy","ember-concurrency/-private/task-decorators","ember-concurrency/-private/task-factory"],(function(e,t,r,n,i,o,a){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.taskComputed=f,e.task=function(e,t,r){if(u(e)||t&&r)return(0,o.task)(...arguments)
+{let t=f((function(){return t[s].setTaskDefinition(t.taskFn),t[s].createTask(this)}))
+return t.taskFn=e,t[s]=new a.TaskFactory,Object.setPrototypeOf(t,c.prototype),t}},e.taskGroup=function(e,t,r){if(u(e)||t&&r)return(0,o.taskGroup)(...arguments)
+{let e=f((function(t){return e[s].setName(t),e[s].createTaskGroup(this)}))
+return e[s]=new a.TaskGroupFactory,Object.setPrototypeOf(e,d.prototype),e}},e.TaskGroupProperty=e.TaskProperty=e.propertyModifiers=void 0
+let s="__ec_task_factory"
+const l={restartable(){return this[s].setBufferPolicy(i.default),this},enqueue(){return this[s].setBufferPolicy(t.default),this},drop(){return this[s].setBufferPolicy(r.default),this},keepLatest(){return this[s].setBufferPolicy(n.default),this},maxConcurrency(e){return this[s].setMaxConcurrency(e),this},group(e){return this[s].setGroup(e),this},evented(){return this[s].setEvented(!0),this},debug(){return this[s].setDebug(!0),this},onState(e){return this[s].setOnState(e),this}}
+function u(e){return!!e&&("function"!=typeof e&&(("object"!=typeof e||!("perform"in e)||"function"!=typeof e.perform)&&Object.getPrototypeOf(e)===Object.prototype))}let c,d
+e.propertyModifiers=l,e.TaskProperty=c,e.TaskGroupProperty=d,e.TaskProperty=c=class{},e.TaskGroupProperty=d=class{},Object.assign(d.prototype,l),Object.assign(c.prototype,l,{setup(e,t){this.callSuperSetup&&this.callSuperSetup(...arguments),this[s].setName(t),this[s]._setupEmberKVO(e)},on(){return this[s].addPerformEvents(...arguments),this},cancelOn(){return this[s].addCancelEvents(...arguments),this},observes(){return this[s].addObserverKeys(...arguments),this}})
+const h=Ember._setClassicDecorator||Ember._setComputedDecorator
+function f(e){{let t=function(r,n){return void 0!==t.setup&&t.setup(r,n),Ember.computed(e)(...arguments)}
+return h(t),t}}})),define("ember-concurrency/-private/task",["exports","ember-concurrency/-private/external/task/task","ember-concurrency/-private/task-instance","ember-concurrency/-private/external/task-instance/executor","ember-concurrency/-private/ember-environment","ember-concurrency/-private/taskable-mixin","ember-concurrency/-private/tracked-state","ember-concurrency/-private/external/task-instance/cancelation"],(function(e,t,r,n,i,o,a,s){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.EncapsulatedTask=e.Task=void 0
+class l extends t.Task{constructor(e){super(e),Ember._isDestroying(this.context)||Ember._registerDestructor(this.context,()=>{this.cancelAll({reason:"the object it lives on was destroyed or unrendered",cancelRequestKind:s.CANCEL_KIND_LIFESPAN_END})})}_perform(...e){return this._performShared(e,n.PERFORM_TYPE_DEFAULT,null)}_performShared(e,t,r){let i=this._curryArgs?[...this._curryArgs,...e]:e,o=this._taskInstanceFactory(i,t,r)
+return t===n.PERFORM_TYPE_LINKED&&(r._expectsLinkedYield=!0),Ember._isDestroying(this.context)&&o.cancel(),this.scheduler.perform(o),o}_taskInstanceFactory(e,t){return new r.TaskInstance({task:this,args:e,executor:new n.TaskInstanceExecutor({generatorFactory:()=>this.generatorFactory(e),env:i.EMBER_ENVIRONMENT,debug:this.debug}),performType:t,hasEnabledEvents:this.hasEnabledEvents})}_curry(...e){let t=this._clone()
+return t._curryArgs=[...this._curryArgs||[],...e],t}_clone(){return new l(this.options)}toString(){return`<Task:${this.name}>`}}e.Task=l,a.TRACKED_INITIAL_TASK_STATE&&Object.defineProperties(l.prototype,a.TRACKED_INITIAL_TASK_STATE),Object.assign(l.prototype,o.TASKABLE_MIXIN)
+e.EncapsulatedTask=class extends l{constructor(e){super(e),this.taskObj=e.taskObj,this._encapsulatedTaskStates=new WeakMap,this._encapsulatedTaskInstanceProxies=new WeakMap}_taskInstanceFactory(e,t){let o=Ember.getOwner(this.context),a=Ember.Object.extend(this.taskObj).create({context:this.context})
+Ember.setOwner(a,o)
+let s=new r.TaskInstance({task:this,args:e,executor:new n.TaskInstanceExecutor({generatorFactory:()=>a.perform.apply(a,e),env:i.EMBER_ENVIRONMENT,debug:this.debug}),performType:t,hasEnabledEvents:this.hasEnabledEvents})
+return this._encapsulatedTaskStates.set(s,a),this._wrappedEncapsulatedTaskInstance(s)}_wrappedEncapsulatedTaskInstance(e){if(!e)return null
+let t=this._encapsulatedTaskInstanceProxies,r=t.get(e)
+if(!r){let n=this._encapsulatedTaskStates.get(e)
+r=new Proxy(e,{get:(e,t)=>t in e?e[t]:Ember.get(n,t.toString()),has:(e,t)=>t in e||t in n,ownKeys:e=>Reflect.ownKeys(e).concat(Reflect.ownKeys(n)),defineProperty(r,i,o){let a=t.get(e)
+return a&&(o.get?o.get=o.get.bind(a):a&&o.set&&(o.set=o.set.bind(a))),i in r?Reflect.defineProperty(r,i,o):Reflect.defineProperty(n,i,o)},getOwnPropertyDescriptor:(e,t)=>t in e?Reflect.getOwnPropertyDescriptor(e,t):Reflect.getOwnPropertyDescriptor(n,t)}),t.set(e,r)}return r}}})),define("ember-concurrency/-private/taskable-mixin",["exports","ember-concurrency/-private/utils"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.TASKABLE_MIXIN=void 0
+const r={_performCount:0,setState(e){this._performCount=this._performCount+(e.numPerformedInc||0)
+let r=e.numRunning>0,n=e.numQueued>0,i=Object.assign({},e,{performCount:this._performCount,isRunning:r,isQueued:n,isIdle:!r&&!n,state:r?"running":"idle"});(0,t.assignProperties)(this,i)},onState(e,t){t.onStateCallback&&t.onStateCallback(e,t)}}
+e.TASKABLE_MIXIN=r})),define("ember-concurrency/-private/tracked-state",["exports","ember-concurrency/-private/external/task/default-state","ember-concurrency/-private/external/task-instance/initial-state","ember-concurrency/-private/utils"],(function(e,t,r,n){"use strict"
+function i(e,t){return Object.keys(e).reduce((t,r)=>function(e,t,r){const n=Object.getOwnPropertyDescriptor(e,r)
+n.initializer=n.initializer||(()=>e[r]),delete n.value
+const i=Ember._tracked(t,r,n)
+return t[r]=i,t}(e,t,r),t)}let o,a
+Object.defineProperty(e,"__esModule",{value:!0}),e.TRACKED_INITIAL_INSTANCE_STATE=e.TRACKED_INITIAL_TASK_STATE=void 0,e.TRACKED_INITIAL_TASK_STATE=o,e.TRACKED_INITIAL_INSTANCE_STATE=a,n.USE_TRACKED&&(e.TRACKED_INITIAL_TASK_STATE=o=i(t.DEFAULT_STATE,{}),e.TRACKED_INITIAL_TASK_STATE=o=i({numRunning:0,numQueued:0,isRunning:!1,isQueued:!1,isIdle:!0,state:"idle"},o),e.TRACKED_INITIAL_INSTANCE_STATE=a=i(r.INITIAL_STATE,{}),e.TRACKED_INITIAL_INSTANCE_STATE=a=i({state:"waiting",isDropped:!1,isRunning:!1},a),Object.freeze(o),Object.freeze(a))})),define("ember-concurrency/-private/utils",["exports","ember-concurrency/-private/ember-environment","ember-concurrency/-private/external/yieldables"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.isEventedObject=function(e){return e&&("function"==typeof e.one&&"function"==typeof e.off||"function"==typeof e.on&&"function"==typeof e.off||"function"==typeof e.addEventListener&&"function"==typeof e.removeEventListener)},e.timeout=function(e){return new o(e)},e.deprecatePrivateModule=function(e){console.warn(`an Ember addon is importing a private ember-concurrency module '${e}' that has moved`)},e.EmberYieldable=e.assignProperties=e.USE_TRACKED=void 0
+e.USE_TRACKED=!0
+const n=Object.assign
+e.assignProperties=n
+class i extends r.Yieldable{_deferable(){return t.EMBER_ENVIRONMENT.defer()}}e.EmberYieldable=i
+class o extends i{constructor(e){super(),this.ms=e,this.timerId=null}[r.yieldableSymbol](e,t){this.timerId=Ember.run.later(()=>{e.proceed(t,r.YIELDABLE_CONTINUE,e._result)},this.ms)}[r.cancelableSymbol](){Ember.run.cancel(this.timerId),this.timerId=null}}})),define("ember-concurrency/-private/wait-for",["exports","ember-concurrency/-private/external/yieldables","ember-concurrency/-private/utils"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.waitForQueue=function(e){return new n(e)},e.waitForEvent=function(e,t){return new i(e,t)},e.waitForProperty=function(e,t,r){return new o(e,t,r)}
+class n extends r.EmberYieldable{constructor(e){super(),this.queueName=e,this.timerId=null}[t.yieldableSymbol](e,r){try{this.timerId=Ember.run.schedule(this.queueName,()=>{e.proceed(r,t.YIELDABLE_CONTINUE,null)})}catch(n){e.proceed(r,t.YIELDABLE_THROW,n)}}[t.cancelableSymbol](){Ember.run.cancel(this.timerId),this.timerId=null}}class i extends r.EmberYieldable{constructor(e,t){super(),this.object=e,this.eventName=t,this.fn=null,this.didFinish=!1,this.usesDOMEvents=!1,this.requiresCleanup=!1}[t.yieldableSymbol](e,r){this.fn=n=>{this.didFinish=!0,this[t.cancelableSymbol](),e.proceed(r,t.YIELDABLE_CONTINUE,n)},"function"==typeof this.object.addEventListener?(this.usesDOMEvents=!0,this.object.addEventListener(this.eventName,this.fn)):"function"==typeof this.object.one?this.object.one(this.eventName,this.fn):(this.requiresCleanup=!0,this.object.on(this.eventName,this.fn))}[t.cancelableSymbol](){this.fn&&(this.usesDOMEvents?this.object.removeEventListener(this.eventName,this.fn):this.didFinish&&!this.requiresCleanup||this.object.off(this.eventName,this.fn),this.fn=null)}}class o extends r.EmberYieldable{constructor(e,t,r=Boolean){super(),this.object=e,this.key=t,this.predicateCallback="function"==typeof r?r:e=>e===r,this.observerBound=!1}[t.yieldableSymbol](e,r){this.observerFn=()=>{let n=Ember.get(this.object,this.key)
+if(this.predicateCallback(n))return e.proceed(r,t.YIELDABLE_CONTINUE,n),!0},this.observerFn()||(Ember.addObserver(this.object,this.key,null,this.observerFn),this.observerBound=!0)}[t.cancelableSymbol](){this.observerBound&&this.observerFn&&(Ember.removeObserver(this.object,this.key,null,this.observerFn),this.observerFn=null)}}})),define("ember-concurrency/-task-instance",["exports","ember-concurrency/-private/task-instance","ember-concurrency/-private/utils"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,(0,r.deprecatePrivateModule)("ember-concurrency/-task-instance")
+var n=t.TaskInstance
+e.default=n})),define("ember-concurrency/-task-property",["exports","ember-concurrency/-private/task","ember-concurrency/-private/task-properties","ember-concurrency/-private/utils"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"Task",{enumerable:!0,get:function(){return t.Task}}),Object.defineProperty(e,"TaskProperty",{enumerable:!0,get:function(){return r.TaskProperty}}),(0,n.deprecatePrivateModule)("ember-concurrency/-task-property")})),define("ember-concurrency/helpers/cancel-all",["exports","ember-concurrency/-private/helpers"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.cancelHelper=r,e.default=void 0
+function r(e){let r=e[0]
+return!r||r.cancelAll,(0,t.taskHelperClosure)("cancel-all","cancelAll",[r,{reason:"the 'cancel-all' template helper was invoked"}])}var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-concurrency/helpers/perform",["exports","ember-concurrency/-private/helpers"],(function(e,t){"use strict"
+function r(e,r){return(0,t.taskHelperClosure)("perform","perform",e,r)}Object.defineProperty(e,"__esModule",{value:!0}),e.performHelper=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-concurrency/helpers/task",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function([e,...t]){return e._curry(...t)}))
+e.default=t})),define("ember-concurrency/index",["exports","ember-concurrency/-private/utils","ember-concurrency/-private/task-properties","ember-concurrency/-private/task-instance","ember-concurrency/-private/cancelable-promise-helpers","ember-concurrency/-private/wait-for","ember-concurrency/-private/external/task-instance/cancelation","ember-concurrency/-private/external/yieldables","ember-concurrency/-private/task","ember-concurrency/-private/task-group","ember-concurrency/-private/task-decorators"],(function(e,t,r,n,i,o,a,s,l,u,c){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"timeout",{enumerable:!0,get:function(){return t.timeout}}),Object.defineProperty(e,"TaskProperty",{enumerable:!0,get:function(){return r.TaskProperty}}),Object.defineProperty(e,"TaskGroupProperty",{enumerable:!0,get:function(){return r.TaskGroupProperty}}),Object.defineProperty(e,"task",{enumerable:!0,get:function(){return r.task}}),Object.defineProperty(e,"taskGroup",{enumerable:!0,get:function(){return r.taskGroup}}),Object.defineProperty(e,"TaskInstance",{enumerable:!0,get:function(){return n.TaskInstance}}),Object.defineProperty(e,"all",{enumerable:!0,get:function(){return i.all}}),Object.defineProperty(e,"allSettled",{enumerable:!0,get:function(){return i.allSettled}}),Object.defineProperty(e,"hash",{enumerable:!0,get:function(){return i.hash}}),Object.defineProperty(e,"hashSettled",{enumerable:!0,get:function(){return i.hashSettled}}),Object.defineProperty(e,"race",{enumerable:!0,get:function(){return i.race}}),Object.defineProperty(e,"waitForQueue",{enumerable:!0,get:function(){return o.waitForQueue}}),Object.defineProperty(e,"waitForEvent",{enumerable:!0,get:function(){return o.waitForEvent}}),Object.defineProperty(e,"waitForProperty",{enumerable:!0,get:function(){return o.waitForProperty}}),Object.defineProperty(e,"didCancel",{enumerable:!0,get:function(){return a.didCancel}}),Object.defineProperty(e,"animationFrame",{enumerable:!0,get:function(){return s.animationFrame}}),Object.defineProperty(e,"forever",{enumerable:!0,get:function(){return s.forever}}),Object.defineProperty(e,"rawTimeout",{enumerable:!0,get:function(){return s.rawTimeout}}),Object.defineProperty(e,"Task",{enumerable:!0,get:function(){return l.Task}}),Object.defineProperty(e,"TaskGroup",{enumerable:!0,get:function(){return u.TaskGroup}}),Object.defineProperty(e,"dropTask",{enumerable:!0,get:function(){return c.dropTask}}),Object.defineProperty(e,"dropTaskGroup",{enumerable:!0,get:function(){return c.dropTaskGroup}}),Object.defineProperty(e,"enqueueTask",{enumerable:!0,get:function(){return c.enqueueTask}}),Object.defineProperty(e,"enqueueTaskGroup",{enumerable:!0,get:function(){return c.enqueueTaskGroup}}),Object.defineProperty(e,"lastValue",{enumerable:!0,get:function(){return c.lastValue}}),Object.defineProperty(e,"keepLatestTask",{enumerable:!0,get:function(){return c.keepLatestTask}}),Object.defineProperty(e,"keepLatestTaskGroup",{enumerable:!0,get:function(){return c.keepLatestTaskGroup}}),Object.defineProperty(e,"restartableTask",{enumerable:!0,get:function(){return c.restartableTask}}),Object.defineProperty(e,"restartableTaskGroup",{enumerable:!0,get:function(){return c.restartableTaskGroup}})})),define("ember-copy/copy",["exports","ember-copy/copyable"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r){if("object"!=typeof e||null===e)return e
+if(!Array.isArray(e)&&t.default.detect(e))return e.copy(r)
+return function e(r,n,i,o){if("object"!=typeof r||null===r)return r
+let a,s
+if(n&&(s=i.indexOf(r))>=0)return o[s]
+if(Array.isArray(r)){if(a=r.slice(),n)for(s=a.length;--s>=0;)a[s]=e(a[s],n,i,o)}else if(t.default.detect(r))a=r.copy(n,i,o)
+else if(r instanceof Date)a=new Date(r.getTime())
+else{let t
+for(t in a={},r)Object.prototype.hasOwnProperty.call(r,t)&&"__"!==t.substring(0,2)&&(a[t]=n?e(r[t],n,i,o):r[t])}n&&(i.push(r),o.push(a))
+return a}(e,r,r?[]:null,r?[]:null)}})),define("ember-copy/copyable",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Mixin.create({copy:null})})),define("ember-copy/index",["exports","ember-copy/copy","ember-copy/copyable"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"copy",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"Copyable",{enumerable:!0,get:function(){return r.default}})})),define("ember-data-model-fragments/array/fragment",["exports","ember-data-model-fragments/array/stateful","ember-data-model-fragments/fragment","ember-data-model-fragments/util/instance-of-type"],(function(e,t,r){"use strict"
+function n(e,t,n,i){let o,a=Ember.get(e,"owner"),s=Ember.get(a,"store"),l=Ember.get(e,"type"),u=Ember.get(e,"options"),c=Ember.get(e,"name")
+return n.map((n,d)=>{Ember.get(e,"type")
+if((0,r.isFragment)(n)){o=n
+let e=(0,r.internalModelFor)(o)._recordData.getOwner()
+e||(0,r.setFragmentOwner)(o,a,c)}else o=t[d],o?i?(0,r.setFragmentData)(o,n):Ember.setProperties(o,n):o=(0,r.createFragment)(s,l,a,c,u,n)
+return o})}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var i=t.default.extend({type:null,options:null,_normalizeData(e){return n(this,Ember.get(this,"content"),e,!0)},_createSnapshot(){return this.map(e=>e._createSnapshot())},_flushChangedAttributes(){this.map(e=>{e._flushChangedAttributes()})},_didCommit(e){this._super(...arguments),this.forEach((t,r)=>{t._didCommit(e&&e[r])})},_adapterDidError(e){this._super(...arguments),this.forEach(t=>{t._adapterDidError(e)})},hasDirtyAttributes:Ember.computed("@each.hasDirtyAttributes","_originalState",(function(){return this._super(...arguments)||this.isAny("hasDirtyAttributes")})),rollbackAttributes(){this._super(...arguments),this.invoke("rollbackAttributes")},serialize(){return this.invoke("serialize")},replaceContent(e,t,r){let i=Ember.get(this,"content"),o=n(this,i.slice(e,e+t),r)
+return i.replace(e,t,o)},addFragment(e){return this.addObject(e)},removeFragment(e){return this.removeObject(e)},createFragment(e){let t=Ember.get(this,"owner"),r=Ember.get(t,"store"),n=Ember.get(this,"type"),i=r.createFragment(n,e)
+return this.pushObject(i)},willDestroy(){this._super(...arguments),this.forEach(e=>{e.destroy()}),this._originalState.forEach(e=>{e.destroy()})}})
+e.default=i})),define("ember-data-model-fragments/array/stateful",["exports","ember-copy","ember-data-model-fragments/states"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.ArrayProxy.extend(t.Copyable,{owner:null,name:null,init(){this._super(...arguments),this._pendingData=void 0,Ember.set(this,"_originalState",[])},content:Ember.computed((function(){return Ember.A()})),copy(){return this.map(t.copy)},setupData(e){if(this._pendingData===e)return
+this._pendingData=e
+let t=this._normalizeData(Ember.makeArray(e)),r=Ember.get(this,"content")
+Ember.set(this,"_originalState",t),r.replace(0,Ember.get(r,"length"),t),this._pendingData=void 0},_normalizeData:e=>e,_createSnapshot(){return this.toArray()},_flushChangedAttributes(){},_didCommit(e){e?this.setupData(e):Ember.set(this,"_originalState",this.toArray())},_adapterDidError(){},hasDirtyAttributes:Ember.computed("[]","_originalState",(function(){return 0!==Ember.compare(this.toArray(),Ember.get(this,"_originalState"))})),rollbackAttributes(){this.setObjects(Ember.get(this,"_originalState"))},serialize(){return this.toArray()},arrayContentDidChange(){this._super(...arguments)
+let e=Ember.get(this,"owner"),t=Ember.get(this,"name")
+Ember.get(this,"hasDirtyAttributes")?(0,r.fragmentDidDirty)(e,t,this):(0,r.fragmentDidReset)(e,t)},toStringExtension(){return`owner(${Ember.get(this,"owner.id")})`}})
+e.default=n})),define("ember-data-model-fragments/attributes",["exports","ember-data-model-fragments/fragment"],(function(e,t){"use strict"
+function r(e,t,r){let n="-mf-"+e
+if(t&&(n+="$"+t),r&&r.polymorphic){n+="$"+(r.typeKey||"type")}return n}function n(e,r,n,i=!1,o=!1){let a={type:e,isAttribute:!0,isFragment:!0,options:r=r||{}}
+return Ember.computed({get(e){let a,s=(0,t.internalModelFor)(this)
+return a=i?s._recordData.getFragmentArray(e,r,n,this,o):s._recordData.getFragment(e,r,n,this),a},set(e,a){let s,l=(0,t.internalModelFor)(this)
+return i?(s=l._recordData.getFragmentArray(e,r,n,this,o),s=l._recordData.setFragmentArrayValue(e,s,a,this,n,r,o)):(s=l._recordData.getFragment(e,r,n,this),s=l._recordData.setFragmentValue(e,s,a,this,n,r)),l._recordData.fragments[e]=s}}).meta(a)}function i(e,t,r,i){return n(e,t,r,!0,i)}Object.defineProperty(e,"__esModule",{value:!0}),e.fragment=function(e,t){return n(r("fragment",e,t=t||{}),t,e)},e.fragmentArray=function(e,t){return t||(t={}),i(r("fragment-array",e,t),t,e,!0)},e.array=function(e,t){"object"==typeof e?(t=e,e=void 0):t||(t={})
+return i(r("array",e),t,null,!1)},e.fragmentOwner=function(){return Ember.computed((function(){return(0,t.internalModelFor)(this)._recordData._owner})).meta({isFragmentOwner:!0}).readOnly()}})),define("ember-data-model-fragments/ext",["exports","ember-data/store","ember-data/model","ember-data/-private","ember-data/serializers/json","ember-data-model-fragments/states","ember-data-model-fragments/record-data","ember-data-model-fragments/fragment"],(function(e,t,r,n,i,o,a,s){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"Store",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"Model",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"JSONSerializer",{enumerable:!0,get:function(){return i.default}})
+const l=n.InternalModel.prototype,u=n.RecordData.prototype
+Ember.assign(u,{eachFragmentKey(e){this._fragments=this._fragments||Object.create({}),Object.keys(this._fragments).forEach(e)},eachFragmentKeyValue(e){this.eachFragmentKey(t=>{const r=this.getFragment(t)
+r&&e(t,r)})},getOwner(){return this._owner},setOwner(e){this._owner=e},setName(e){this._name=e},getName(){return this._name},getFragment(e){return this._fragments=this._fragments||Object.create({}),this._fragments[e]},setFragment(e,t){return this._fragments=this._fragments||Object.create({}),this._fragments[e]=t,this._fragments[e]},didCommit(e){this._isNew=!1,e?(e.relationships&&this._setupRelationships(e),e.id&&(this.storeWrapper.setRecordId(this.modelName,e.id,this.clientId),this.id=(0,n.coerceId)(e.id)),e=e.attributes,this.eachFragmentKeyValue((t,r)=>r._didCommit(e[t]))):this.eachFragmentKeyValue((e,t)=>t._didCommit())
+const t=this._changedKeys(e)
+return Ember.assign(this._data,this.__inFlightAttributes,this._attributes,e),this._attributes=null,this._inFlightAttributes=null,this._updateChangedAttributes(),t}}),t.default.reopen({createRecordDataFor(e,t,r,n){let i
+return i=this.identifierCache.getOrCreateRecordIdentifier({type:e,id:t,lid:r}),new a.default(i,n)},createFragment(e,t){let r
+{const t=this.identifierCache.createIdentifierForNewRecord({type:e})
+r=this._internalModelForResource(t)}r.currentState=o.default.empty,r._recordData._name=null,r._recordData._owner=null,r.loadedData()
+let n=r.getRecord()
+return t&&n.setProperties(t),n.trigger("ready"),n._isFragment=!0,n},isFragment(e){if("application"===e||"-default"===e)return!1
+let t=this.modelFor(e)
+return s.default.detect(t)},serializerFor(e){let t=Ember.getOwner(this),r=(0,n.normalizeModelName)(e)
+return this.isFragment(r)?function(e,t){let r=e.lookup("serializer:"+t)
+return void 0!==r?r:(r=e.lookup("serializer:-fragment"),void 0!==r||(r=e.lookup("serializer:-default")),r)}(t,r):this._super(...arguments)}}),r.default.reopen({willDestroy(){this._super(...arguments),(0,s.internalModelFor)(this)._recordData.resetFragments()}}),r.default.reopenClass({fields:Ember.computed((function(){let e=new Map
+return this.eachComputedProperty((t,r)=>{r.isFragment?e.set(t,"fragment"):r.isRelationship?e.set(t,r.kind):r.isAttribute&&e.set(t,"attribute")}),e})).readOnly()}),function(e,t,r){let n=e[t]
+e[t]=function(){let e=n.apply(this,arguments)
+return r.call(this,e,arguments)}}(l,"createSnapshot",(function(e){let t=e._attributes
+return Object.keys(t).forEach(e=>{let r=t[e]
+r&&"function"==typeof r._createSnapshot&&(t[e]=r._createSnapshot())}),e})),i.default.reopen({transformFor(e){if(0!==e.indexOf("-mf-"))return this._super(...arguments)
+const t=Ember.getOwner(this),r="transform:"+e
+if(!t.hasRegistration(r)){const n=e.match(/^-mf-(fragment|fragment-array|array)(?:\$([^$]+))?(?:\$(.+))?$/),i=n[1],o=n[2],a=n[3]
+let s=t.factoryFor("transform:"+i)
+s=s&&s.class,s=s.extend({type:o,polymorphicTypeProp:a,store:this.store}),t.register(r,s)}return t.lookup(r)}})})),define("ember-data-model-fragments/fragment",["exports","ember-copy","ember-data-model-fragments/ext"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.getActualFragmentType=n,e.internalModelFor=i,e.setFragmentOwner=o,e.setFragmentData=a,e.createFragment=function(e,t,r,i,s,l){let u=n(t,s,l),c=e.createFragment(u)
+return o(c,r,i),a(c,l),c},e.isFragment=function(e){return e&&e._isFragment},e.default=void 0
+function n(e,t,r){if(!t.polymorphic||!r)return e
+return r[t.typeKey||"type"]||e}function i(e){return e._internalModel}function o(e,t,r){let n=i(e)
+return n._recordData._owner=t,n._recordData._name=r,Ember.get(e.constructor,"fragmentOwnerProperties").forEach(t=>{e.notifyPropertyChange(t)}),e}function a(e,t){i(e).setupData({attributes:t})}var s=r.Model.extend(Ember.Comparable,t.Copyable,{compare:(e,t)=>e===t?0:1,copy(){let e=this.constructor,r=Object.create(null)
+e.eachAttribute(e=>{r[e]=(0,t.copy)(Ember.get(this,e))})
+let n=e.modelName||this._internalModel.modelName
+return this.store.createFragment(n,r)},_flushChangedAttributes(){i(this)._recordData.willCommit()},_didCommit(e){i(this).adapterDidCommit({attributes:e||Object.create(null)})},_adapterDidError(){i(this)._recordData.commitWasRejected()},toStringExtension(){let e=i(this),t=e&&e._recordData._owner
+if(t){return`owner(${Ember.get(t,"id")})`}return""}}).reopenClass({fragmentOwnerProperties:Ember.computed((function(){let e=[]
+return this.eachComputedProperty((t,r)=>{r.isFragmentOwner&&e.push(t)}),e})).readOnly()})
+e.default=s})),define("ember-data-model-fragments/index",["exports","ember-data-model-fragments/version","ember-data-model-fragments/fragment","ember-data-model-fragments/array/fragment","ember-data-model-fragments/transforms/fragment","ember-data-model-fragments/transforms/fragment-array","ember-data-model-fragments/transforms/array","ember-data-model-fragments/attributes"],(function(e,t,r,n,i,o,a,s){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const l=Ember.Namespace.create({VERSION:t.default,Fragment:r.default,FragmentArray:n.default,FragmentTransform:i.default,FragmentArrayTransform:o.default,ArrayTransform:a.default,fragment:s.fragment,fragmentArray:s.fragmentArray,array:s.array,fragmentOwner:s.fragmentOwner})
+Ember.libraries&&Ember.libraries.register("Model Fragments",l.VERSION)
+var u=l
+e.default=u})),define("ember-data-model-fragments/record-data",["exports","ember-data/-private","ember-copy","ember-data-model-fragments/util/instance-of-type","ember-data-model-fragments/states","ember-data-model-fragments/array/stateful","ember-data-model-fragments/array/fragment","ember-data-model-fragments/fragment"],(function(e,t,r,n,i,o,a,s){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.fragmentRecordDatas=e.default=void 0
+let l=new WeakMap
+e.fragmentRecordDatas=l
+class u extends t.RecordData{constructor(e,t){super(e,t),this.fragmentData=Object.create(null),this.serverFragments=Object.create(null),this.inFlightFragments=Object.create(null),this.fragments=Object.create(null),this.fragmentNames=[]
+let r=t.attributesDefinitionFor(e.type,e.id,e.lid)
+Object.keys(r).forEach(e=>{r[e].isFragment&&this.fragmentNames.push(e)}),l.set(e,this)}getFragmentDataWithDefault(e,t,n){let i=this.fragmentData[e]
+return void 0!==i?i:function(e,t){let n
+if("function"==typeof e.defaultValue)return e.defaultValue()
+if("defaultValue"in e)n=e.defaultValue
+else{if("array"!==t)return null
+n=[]}return(0,r.copy)(n,!0)}(t,n)}setupFragment(e,t,r,n){let i=this.getFragmentDataWithDefault(e,t,"object"),o=this.fragments[e]
+return i?(o||(o=(0,s.createFragment)(n.store,r,n,e,t,i),this.serverFragments[e]=o),o):(this.serverFragments[e]=i,i)}getFragment(e,t,r,n){let i=this.getFragmentWithoutCreating(e)
+return void 0===i?this.setupFragment(e,t,r,n):i}setFragmentArrayValue(e,t,r,n,s,l,u){return Ember.isArray(r)?(t||(t=u?a.default.create({type:s,options:l,name:e,owner:n}):o.default.create({options:l,name:e,owner:n})),t.setObjects(r)):null===r&&(t=null,this.fragments[e]=null),this.serverFragments[e]!==t||Ember.get(t,"hasDirtyAttributes")?(0,i.fragmentDidDirty)(n,e,t):(0,i.fragmentDidReset)(n,e),t}setFragmentValue(e,t,r,n,o,a){let l=n.store
+if(r)if((0,s.isFragment)(r))t=(0,s.setFragmentOwner)(r,n,e)
+else{if(t)return Ember.setProperties(t,r),t
+t=(0,s.createFragment)(l,o,n,e,a,r)}else t=null
+return this.getFragment(e,a,o,n)!==t?(this.fragments[e]=t,(0,i.fragmentDidDirty)(n,e,t)):(0,i.fragmentDidReset)(n,e),t}getFragmentArray(e,t,r,n,i){let o=this.getFragmentDataWithDefault(e,t,"array"),a=this.getFragmentWithoutCreating(e)
+return void 0===a?(a=this.setupFragmentArray(e,n,o,r,t,i),a):a}setupFragmentArray(e,t,r,n,i,s){let l
+return null!==r?(l=s?a.default.create({type:n,options:i,name:e,owner:t}):o.default.create({options:i,name:e,owner:t}),l.setupData(r)):l=null,this.serverFragments[e]=l,l}getFragmentWithoutCreating(e){return void 0!==this.fragments[e]?this.fragments[e]:void 0!==this.inFlightFragments[e]?this.inFlightFragments[e]:void 0!==this.serverFragments[e]?this.serverFragments[e]:void 0}setupFragmentData(e,t){let r=[]
+return e.attributes&&this.fragmentNames.forEach(n=>{if(t&&void 0!==this.getFragmentWithoutCreating(n)&&r.push(n),n in e.attributes){this.fragmentData[n]=e.attributes[n]
+let r=this.serverFragments[n]
+if(r){let i=[]
+r instanceof o.default?r.setupData(e.attributes[n]):i=r._internalModel._recordData.pushData({attributes:e.attributes[n]},t),t&&i.forEach(e=>r.notifyPropertyChange(e))}else null===r&&delete this.serverFragments[n]}}),r}pushData(e,t){let r=e,n={}
+r.attributes&&this.fragmentNames.forEach(e=>{e in r.attributes&&(n[e]=r.attributes[e],delete r.attributes[e])})
+let i=this.setupFragmentData({attributes:n},t),o=super.pushData(r,t)
+return r.attributes&&Ember.assign(r.attributes,n),i.concat(o)}willCommit(){let e,t
+for(e in this.fragments)t=this.fragments[e],t&&(t.content?t.content.forEach(e=>{e._internalModel&&e._internalModel._recordData.willCommit()}):t._internalModel._recordData.willCommit()),delete this.fragments[e],this.inFlightFragments[e]=t
+super.willCommit()}hasChangedAttributes(){return null!==this.__attributes&&Object.keys(this.__attributes).length>0}resetRecord(){super.resetRecord(),this.resetFragments()}resetFragments(){let e,t
+for(e in this.fragments)t=this.fragments[e],t&&(t.destroy(),delete this.fragments[e])
+for(e in this.inFlightFragments)t=this.inFlightFragments[e],t&&(t.destroy(),delete this.inFlightFragments[e])
+for(e in this.serverFragments)t=this.serverFragments[e],t&&(t.destroy(),delete this.serverFragments[e])}changedAttributes(){let e=super.changedAttributes()
+for(let t of this.fragmentNames){let r
+if(void 0!==this.inFlightFragments[t]&&(r=this.inFlightFragments[t]),void 0!==this.fragments[t]&&(r=this.fragments[t]),void 0!==r)e[t]=[this.serverFragments[t],this.fragments[t]]
+else{let r,n=this.serverFragments[t]
+n&&n instanceof o.default?r=Ember.get(n,"hasDirtyAttributes"):n&&(r=n._internalModel._recordData.hasChangedAttributes()),r&&(e[t]=[n,n])}}return e}rollbackAttributes(){let e=[]
+for(let t in this.fragments)e.push(t),delete this.fragments[t]
+return this.fragmentNames.forEach(t=>{let r=this.getFragmentWithoutCreating(t)
+r&&(r.rollbackAttributes(),e.push(t))}),e.concat(super.rollbackAttributes())}didCommit(e){let t,r
+r=e&&e.attributes?e.attributes:Object.create(null)
+for(let n in this.inFlightFragments)t=this.inFlightFragments[n],delete this.inFlightFragments[n],this.serverFragments[n]=t
+return this.fragmentNames.forEach(e=>{t=this.serverFragments[e],t&&t._didCommit(r[e]),delete r[e]}),super.didCommit(e)}commitWasRejected(){let e,t
+for(e in this.inFlightFragments)t=this.inFlightFragments[e],delete this.inFlightFragments[e],void 0===this.fragments[e]&&(this.fragments[e]=t),t&&(t.content?t.content.forEach(e=>{e._internalModel&&e._internalModel._recordData.commitWasRejected()}):t._internalModel._recordData.commitWasRejected())
+return super.commitWasRejected()}setAttr(e,t){return super.setAttr(e,t)}getAttr(e){return super.getAttr(e)}hasAttr(e){return super.hasAttr(e)}didCreateLocally(){return super.didCreateLocally()}}e.default=u})),define("ember-data-model-fragments/states",["exports","ember-data/-private"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.fragmentDidDirty=o,e.fragmentDidReset=a,e.default=void 0
+const r=function(e){let t=e._recordData._owner
+e._recordData._name
+t&&o(t)}
+let n={isEmpty:!1,isLoading:!1,isLoaded:!1,isDirty:!1,isSaving:!1,isDeleted:!1,isNew:!1,isValid:!0,didSetProperty:t.RootState.loaded.saved.didSetProperty,propertyWasReset(){},becomeDirty(){},rolledBack(){},empty:{isEmpty:!0,loadedData(e){e.transitionTo("loaded.created")},pushedData(e){e.transitionTo("loaded.saved")}},loaded:{unloadRecord(){},pushedData(e){e.transitionTo("saved")},saved:{setup(e){let t=e._recordData._owner,r=e._recordData._name
+t._internalModel._recordData.getFragmentWithoutCreating(r)&&(Ember.get(t,r+".hasDirtyAttributes")||a(t,r))},pushedData(){},didCommit(){},becomeDirty(e){e.transitionTo("updated")}},created:{isDirty:!0,isNew:!0,setup:r,didCommit(e){e.transitionTo("saved")}},updated:{isDirty:!0,setup:r,propertyWasReset:t.RootState.loaded.updated.uncommitted.propertyWasReset,didCommit(e){e.transitionTo("saved")},rolledBack(e){e.transitionTo("saved")}}}}
+n=function e(t,r,n){(t=function(e,t){for(let r in t)e[r]=t[r]
+return e}(r?Object.create(r):{},t)).parentState=r,t.stateName=n
+for(let i in t)t.hasOwnProperty(i)&&"parentState"!==i&&"stateName"!==i&&"object"==typeof t[i]&&(t[i]=e(t[i],t,`${n}.${i}`))
+return t}(n,null,"root")
+var i=n
+function o(e){e.currentState.isDeleted||e.send("becomeDirty")}function a(e,t){e.currentState.isNew||e.send("propertyWasReset",t)}e.default=i}))
+define("ember-data-model-fragments/transforms/array",["exports","ember-data/transform"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.default.extend({store:Ember.inject.service(),type:null,deserialize:function(e){if(null==e)return null
+let t=Ember.get(this,"transform")
+return e=Ember.makeArray(e),t?e.map(t.deserialize,t):e},serialize:function(e){if(null==e)return null
+let t=Ember.get(this,"transform")
+return e=e.toArray?e.toArray():e,t?e.map(t.serialize,t):e},transform:Ember.computed("type",(function(){let e=this.get("type")
+if(!e)return null
+let t=Ember.getOwner(this).lookup("transform:"+e)
+return t}))})
+e.default=r})),define("ember-data-model-fragments/transforms/fragment-array",["exports","ember-data-model-fragments/transforms/fragment"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.default.extend({deserialize:function(e){return null==e?null:e.map(e=>this.deserializeSingle(e),this)},serialize:function(e){if(!e)return null
+let t=this.store
+return e.map(e=>t.serializerFor(e.modelName).serialize(e))}})
+e.default=r})),define("ember-data-model-fragments/transforms/fragment",["exports","ember-data/transform","ember-data/serializers/json-api"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.default.extend({store:Ember.inject.service(),type:null,polymorphicTypeProp:null,deserialize:function(e){return null==e?null:this.deserializeSingle(e)},serialize:function(e){if(!e)return null
+return this.store.serializerFor(e.modelName).serialize(e)},modelNameFor(e){let t=Ember.get(this,"type"),r=Ember.get(this,"polymorphicTypeProp")
+return e&&r&&e[r]&&(t=e[r]),t},deserializeSingle(e){let t=this.store,r=this.modelNameFor(e),n=t.serializerFor(r),i=t.modelFor(r),o=n.normalize(i,e)
+return Ember.get(o,"data.attributes")}})
+e.default=r})),define("ember-data-model-fragments/util/instance-of-type",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){return t instanceof e}})),define("ember-data-model-fragments/version",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default="5.0.0-beta.0"})),define("ember-data/-private",["exports","@ember-data/store","ember-data/version","@ember-data/model/-private","@ember-data/store/-private","@ember-data/record-data/-private"],(function(e,t,r,n,i,o){"use strict"
+t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t,r=r&&Object.prototype.hasOwnProperty.call(r,"default")?r.default:r
+var a=Ember.Namespace.create({VERSION:r,name:"DS"})
+Ember.libraries&&Ember.libraries.registerCoreLibrary("Ember Data",r),e.Store=t,Object.defineProperty(e,"Errors",{enumerable:!0,get:function(){return n.Errors}}),Object.defineProperty(e,"ManyArray",{enumerable:!0,get:function(){return n.ManyArray}}),Object.defineProperty(e,"PromiseManyArray",{enumerable:!0,get:function(){return n.PromiseManyArray}}),Object.defineProperty(e,"AdapterPopulatedRecordArray",{enumerable:!0,get:function(){return i.AdapterPopulatedRecordArray}}),Object.defineProperty(e,"InternalModel",{enumerable:!0,get:function(){return i.InternalModel}}),Object.defineProperty(e,"PromiseArray",{enumerable:!0,get:function(){return i.PromiseArray}}),Object.defineProperty(e,"PromiseObject",{enumerable:!0,get:function(){return i.PromiseObject}}),Object.defineProperty(e,"RecordArray",{enumerable:!0,get:function(){return i.RecordArray}}),Object.defineProperty(e,"RecordArrayManager",{enumerable:!0,get:function(){return i.RecordArrayManager}}),Object.defineProperty(e,"RootState",{enumerable:!0,get:function(){return i.RootState}}),Object.defineProperty(e,"Snapshot",{enumerable:!0,get:function(){return i.Snapshot}}),Object.defineProperty(e,"SnapshotRecordArray",{enumerable:!0,get:function(){return i.SnapshotRecordArray}}),Object.defineProperty(e,"coerceId",{enumerable:!0,get:function(){return i.coerceId}}),Object.defineProperty(e,"normalizeModelName",{enumerable:!0,get:function(){return i.normalizeModelName}}),Object.defineProperty(e,"RecordData",{enumerable:!0,get:function(){return o.RecordData}}),Object.defineProperty(e,"Relationship",{enumerable:!0,get:function(){return o.Relationship}}),e.DS=a,Object.defineProperty(e,"__esModule",{value:!0})})),define("ember-data/adapter",["exports","@ember-data/adapter"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/adapters/errors",["exports","@ember-data/adapter/error"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"AbortError",{enumerable:!0,get:function(){return t.AbortError}}),Object.defineProperty(e,"AdapterError",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"ConflictError",{enumerable:!0,get:function(){return t.ConflictError}}),Object.defineProperty(e,"ForbiddenError",{enumerable:!0,get:function(){return t.ForbiddenError}}),Object.defineProperty(e,"InvalidError",{enumerable:!0,get:function(){return t.InvalidError}}),Object.defineProperty(e,"NotFoundError",{enumerable:!0,get:function(){return t.NotFoundError}}),Object.defineProperty(e,"ServerError",{enumerable:!0,get:function(){return t.ServerError}}),Object.defineProperty(e,"TimeoutError",{enumerable:!0,get:function(){return t.TimeoutError}}),Object.defineProperty(e,"UnauthorizedError",{enumerable:!0,get:function(){return t.UnauthorizedError}}),Object.defineProperty(e,"errorsArrayToHash",{enumerable:!0,get:function(){return t.errorsArrayToHash}}),Object.defineProperty(e,"errorsHashToArray",{enumerable:!0,get:function(){return t.errorsHashToArray}})})),define("ember-data/adapters/json-api",["exports","@ember-data/adapter/json-api"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/adapters/rest",["exports","@ember-data/adapter/rest"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/attr",["exports","@ember-data/model"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.attr}})})),define("ember-data/index",["exports","ember-inflector","@ember-data/adapter","@ember-data/adapter/error","@ember-data/adapter/json-api","@ember-data/adapter/rest","@ember-data/debug","@ember-data/model","@ember-data/serializer","@ember-data/serializer/-private","@ember-data/serializer/json","@ember-data/serializer/json-api","@ember-data/serializer/rest","@ember-data/serializer/transform","@ember-data/store","ember-data/-private","ember-data/initialize-store-service","ember-data/setup-container"],(function(e,t,r,n,i,o,a,s,l,u,c,d,h,f,p,m,v,g){"use strict"
+if(Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,Ember.VERSION.match(/^1\.([0-9]|1[0-2])\./))throw new Ember.Error("Ember Data requires at least Ember 1.13.0, but you have "+Ember.VERSION+". Please upgrade your version of Ember, then upgrade Ember Data.")
+m.DS.Store=p.default,m.DS.PromiseArray=m.PromiseArray,m.DS.PromiseObject=m.PromiseObject,m.DS.PromiseManyArray=m.PromiseManyArray,m.DS.Model=s.default,m.DS.RootState=m.RootState,m.DS.attr=s.attr,m.DS.Errors=m.Errors,m.DS.InternalModel=m.InternalModel,m.DS.Snapshot=m.Snapshot,m.DS.Adapter=r.default,m.DS.AdapterError=n.default,m.DS.InvalidError=n.InvalidError,m.DS.TimeoutError=n.TimeoutError,m.DS.AbortError=n.AbortError,m.DS.UnauthorizedError=n.UnauthorizedError,m.DS.ForbiddenError=n.ForbiddenError,m.DS.NotFoundError=n.NotFoundError,m.DS.ConflictError=n.ConflictError,m.DS.ServerError=n.ServerError,m.DS.errorsHashToArray=n.errorsHashToArray,m.DS.errorsArrayToHash=n.errorsArrayToHash,m.DS.Serializer=l.default,m.DS.DebugAdapter=a.default,m.DS.RecordArray=m.RecordArray,m.DS.AdapterPopulatedRecordArray=m.AdapterPopulatedRecordArray,m.DS.ManyArray=m.ManyArray,m.DS.RecordArrayManager=m.RecordArrayManager,m.DS.RESTAdapter=o.default,m.DS.BuildURLMixin=r.BuildURLMixin
+m.DS.RESTSerializer=h.default,m.DS.JSONSerializer=c.default,m.DS.JSONAPIAdapter=i.default,m.DS.JSONAPISerializer=d.default,m.DS.Transform=f.default,m.DS.DateTransform=u.DateTransform,m.DS.StringTransform=u.StringTransform,m.DS.NumberTransform=u.NumberTransform,m.DS.BooleanTransform=u.BooleanTransform,m.DS.EmbeddedRecordsMixin=h.EmbeddedRecordsMixin,m.DS.belongsTo=s.belongsTo,m.DS.hasMany=s.hasMany,m.DS.Relationship=m.Relationship,m.DS._setupContainer=g.default,m.DS._initializeStoreService=v.default,Object.defineProperty(m.DS,"normalizeModelName",{enumerable:!0,writable:!1,configurable:!1,value:p.normalizeModelName})
+var b=m.DS
+e.default=b})),define("ember-data/initialize-store-service",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){(e.lookup?e:e.container).lookup("service:store")}})),define("ember-data/model",["exports","@ember-data/model"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/relationships",["exports","@ember-data/model"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"belongsTo",{enumerable:!0,get:function(){return t.belongsTo}}),Object.defineProperty(e,"hasMany",{enumerable:!0,get:function(){return t.hasMany}})})),define("ember-data/serializer",["exports","@ember-data/serializer"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/serializers/embedded-records-mixin",["exports","@ember-data/serializer/rest"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.EmbeddedRecordsMixin}})})),define("ember-data/serializers/json-api",["exports","@ember-data/serializer/json-api"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/serializers/json",["exports","@ember-data/serializer/json"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/serializers/rest",["exports","@ember-data/serializer/rest"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/setup-container",["exports","@ember-data/store"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){(function(e){var t=e.inject||e.injection
+t.call(e,"controller","store","service:store"),t.call(e,"route","store","service:store")})(e),function(e){0
+e.registerOptionsForType("serializer",{singleton:!1}),e.registerOptionsForType("adapter",{singleton:!1}),e.hasRegistration("service:store")||e.register("service:store",t.default)}(e)}})),define("ember-data/store",["exports","@ember-data/store"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/transform",["exports","@ember-data/serializer/transform"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-data/version",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default="3.20.5"})),define("ember-element-helper/helpers/-element",["exports"],(function(e){"use strict"
+function t(){}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r=Ember.Component.extend(),n=Ember.Component.extend()
+var i=Ember.Helper.extend({init(){this._super(...arguments),this.tagName=t,this.componentClass=null},compute(e,t){let i=e[0]
+return i!==this.tagName&&(this.tagName=i,"string"==typeof i?this.componentClass===r?this.componentClass=n:this.componentClass=r:(this.componentClass=null,Ember.runInDebug(()=>{let e="The argument passed to the `element` helper must be a string"
+try{e+=` (you passed \`${i}\`)`}catch(t){}}))),this.componentClass}})
+e.default=i})),define("ember-element-helper/helpers/element",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function(){return null}))
+e.default=t})),define("ember-get-config/index",["exports","consul-ui/config/environment"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-in-viewport/-private/observer-admin",["exports","intersection-observer-admin"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=class{constructor(){this.instance=new t.default}add(e,t,r,n){return r&&this.addEnterCallback(e,r),n&&this.addExitCallback(e,n),this.instance.observe(e,t)}addEnterCallback(e,t){this.instance.addEnterCallback(e,t)}addExitCallback(e,t){this.instance.addExitCallback(e,t)}unobserve(...e){this.instance.unobserve(...e)}destroy(...e){this.instance.destroy(...e)}}})),define("ember-in-viewport/-private/raf-admin",["exports","raf-pool","ember-in-viewport/utils/is-in-viewport"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.startRAF=function e(t,{scrollableArea:n,viewportTolerance:i,viewportSpy:o=!1},a,s,l,u){const c=n?document.querySelector(n):void 0,d=c?c.offsetHeight+c.getBoundingClientRect().top:window.innerHeight,h=n?c.offsetWidth+c.getBoundingClientRect().left:window.innerWidth,f=t.getBoundingClientRect()
+if(f){const c=t.getAttribute("data-in-viewport-entered");(function(e,t,r,n,i,o=!1){const a="true"===o&&!t
+o&&"false"!==o||!t||(e.setAttribute("data-in-viewport-entered",!0),n())
+a&&(i(),r&&e.setAttribute("data-in-viewport-entered",!1))})(t,(0,r.default)(f,d,h,i),o,a,s,c),o||"true"!==c?l(e.bind(this,t,{scrollableArea:n,viewportTolerance:i,viewportSpy:o},a,s,l,u)):u()}},e.default=void 0
+e.default=class{constructor(){this._rafPool=new t.default,this.elementRegistry=new WeakMap}add(...e){return this._rafPool.add(...e)}flush(){return this._rafPool.flush()}remove(...e){return this._rafPool.remove(...e)}reset(...e){this._rafPool.reset(...e),this._rafPool.stop(...e)}addEnterCallback(e,t){this.elementRegistry.set(e,Object.assign({},this.elementRegistry.get(e),{enterCallback:t}))}addExitCallback(e,t){this.elementRegistry.set(e,Object.assign({},this.elementRegistry.get(e),{exitCallback:t}))}}})),define("ember-in-viewport/breakpoints",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={mobile:"(max-width: 767px)",tablet:"(min-width: 768px) and (max-width: 991px)",desktop:"(min-width: 992px) and (max-width: 1200px)"}}))
+define("ember-in-viewport/index",["exports","ember-in-viewport/mixins/in-viewport"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.default
+e.default=r})),define("ember-in-viewport/initializers/viewport-config",["exports","ember-in-viewport/utils/can-use-dom"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.initialize=n,e.default=void 0
+const r={viewportEnabled:!0,viewportDidScroll:!0,viewportSpy:!1,viewportScrollSensitivity:1,viewportRefreshRate:100,viewportListeners:[{context:window,event:"scroll"},{context:window,event:"resize"}],viewportTolerance:{top:0,left:0,bottom:0,right:0},intersectionThreshold:0,scrollableArea:null}
+function n(){const e=arguments[1]||arguments[0],t=e.resolveRegistration("config:environment"),{viewportConfig:n={}}=t,i=Ember.assign({},r,n)
+e.register("config:in-viewport",i,{instantiate:!1})}t.default&&r.viewportListeners.push({context:document,event:"touchmove"})
+var i={name:"viewport-config",initialize:n}
+e.default=i})),define("ember-in-viewport/mixins/in-viewport",["exports","ember-in-viewport/-private/raf-admin","ember-in-viewport/utils/can-use-dom","ember-in-viewport/utils/can-use-raf","ember-in-viewport/utils/find-elem","ember-in-viewport/utils/can-use-intersection-observer","ember-in-viewport/utils/check-scroll-direction"],(function(e,t,r,n,i,o,a){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const s={},l={}
+var u=Ember.Mixin.create({_debouncedEventHandler:null,_stopListening:!1,inViewport:Ember.inject.service(),viewportExited:Ember.computed.not("viewportEntered").readOnly(),init(){this._super(...arguments)
+let e=Ember.assign({viewportUseRAF:(0,n.default)(),viewportEntered:!1,viewportListeners:[]},this._buildOptions())
+e=Ember.assign(e,{viewportUseIntersectionObserver:(0,o.default)()}),Ember.setProperties(this,e),Ember.set(this,"_evtListenerClosures",[])},didInsertElement(){if(this._super(...arguments),!r.default)return
+Ember.get(this,"viewportEnabled")&&this.watchElement(Ember.get(this,"element"))},willDestroyElement(){this._super(...arguments),this._unbindListeners(Ember.get(this,"element"))},_buildOptions(e={}){const t=Ember.getOwner(this)
+if(t)return Ember.assign(e,t.lookup("config:in-viewport"))},watchElement(e){this._setInitialViewport(e),this._addObserverIfNotSpying(e)
+Ember.get(this,"viewportDidScroll")&&(Ember.debug("[viewportDidScroll] This will be false by default in the next major release"),this._bindScrollDirectionListener(Ember.get(this,"viewportScrollSensitivity"))),Ember.get(this,"viewportUseIntersectionObserver")||Ember.get(this,"viewportUseRAF")||Ember.get(this,"viewportListeners").forEach(t=>{let{context:r,event:n}=t
+r=Ember.get(this,"scrollableArea")||r,this._bindListeners(r,n,e)})},_addObserverIfNotSpying(e){Ember.get(this,"viewportSpy")||this.addObserver("viewportEntered",this,Ember.run.bind(this,"_unbindIfEntered",e))},_setInitialViewport(e){const r=this.isDestroyed||this.isDestroying
+if(!e||r)return
+const n=Ember.get(this,"inViewport")
+if(Ember.get(this,"viewportUseIntersectionObserver"))return Ember.run.scheduleOnce("afterRender",this,()=>{const t=Ember.get(this,"scrollableArea"),r=Ember.get(this,"viewportTolerance"),i=Ember.get(this,"intersectionThreshold")
+n.watchElement(e,{intersectionThreshold:i,viewportTolerance:r,scrollableArea:t},Ember.run.bind(this,this._onEnterIntersection),Ember.run.bind(this,this._onExitIntersection))})
+if(!Ember.get(this,"viewportUseRAF"))return Ember.run.scheduleOnce("afterRender",this,()=>{this._setViewportEntered(e)})
+{n.startRAF()
+const r=Ember.get(this,"scrollableArea"),i=Ember.get(this,"viewportTolerance"),o=Ember.get(this,"viewportSpy"),a=()=>{const t=this.isDestroyed||this.isDestroying,r="true"===e.getAttribute("data-in-viewport-entered")
+t||!o&&!r||(Ember.set(this,"viewportEntered",!0),this.trigger("didEnterViewport"))},s=()=>{!(this.isDestroyed||this.isDestroying)&&o&&(Ember.set(this,"viewportEntered",!1),this.trigger("didExitViewport"))};(0,t.startRAF)(e,{scrollableArea:r,viewportTolerance:i,viewportSpy:o},a,s,n.addRAF.bind(n,e.id),n.removeRAF.bind(n,e.id))}},_setViewportEntered(e){const t=Ember.get(this,"scrollableArea")?document.querySelector(Ember.get(this,"scrollableArea")):void 0,r=t?t.offsetHeight+t.getBoundingClientRect().top:window.innerHeight,n=t?t.offsetWidth+t.getBoundingClientRect().left:window.innerWidth,i=e.getBoundingClientRect()
+i&&(this._triggerDidAccessViewport(Ember.get(this,"inViewport").isInViewport(i,r,n,Ember.get(this,"viewportTolerance")),Ember.get(this,"viewportEntered")),Ember.get(this,"viewportUseRAF")&&!Ember.get(this,"_stopListening")&&Ember.get(this,"inViewport").addRAF(Ember.get(this,"elementId"),Ember.run.bind(this,this._setViewportEntered,e)))},_onEnterIntersection(){this.isDestroyed||this.isDestroying||Ember.set(this,"viewportEntered",!0),this.trigger("didEnterViewport")},_onExitIntersection(){this.isDestroyed||this.isDestroying||Ember.set(this,"viewportEntered",!1),this.trigger("didExitViewport")},_triggerDidScrollDirection(e=null,t=1){const r=Ember.get(this,"elementId"),n=s[r],i=l[r],o={top:e.scrollTop,left:e.scrollLeft},u=(0,a.default)(i,o,t)
+u&&u!==n&&Ember.get(this,"viewportDidScroll")&&(this.trigger("didScroll",u),s[r]=u),l[r]=o},_triggerDidAccessViewport(e=!1,t){if(this.isDestroyed||this.isDestroying)return
+let r=""
+!t&&e&&(r="didEnterViewport"),t&&!e&&(r="didExitViewport"),!Ember.get(this,"viewportSpy")&&t||Ember.set(this,"viewportEntered",e),r&&this.trigger(r)},_unbindIfEntered(e){Ember.get(this,"viewportEntered")&&(this._unbindListeners(e),this.removeObserver("viewportEntered",this,"_unbindIfEntered"),Ember.set(this,"viewportEntered",!1))},_debouncedEvent(e,...t){Ember.run.debounce(this,()=>this[e](...t),Ember.get(this,"viewportRefreshRate"))},_bindScrollDirectionListener(e=1){const t=Ember.get(this,"scrollableArea")||window,r=(0,i.default)(t)
+this._debouncedEventHandler=this._debouncedEvent.bind(this,"_triggerDidScrollDirection",r,e),r.addEventListener("scroll",this._debouncedEventHandler,{passive:!0})},_unbindScrollDirectionListener(){const e=Ember.get(this,"elementId"),t=Ember.get(this,"scrollableArea")||window,r=(0,i.default)(t)
+r&&(r.removeEventListener("scroll",this._debouncedEventHandler,{passive:!0}),delete l[e],delete s[e])},_bindListeners(e=null,t=null,r=null){let n=(0,i.default)(e),o=()=>this._debouncedEvent("_setViewportEntered",r)
+this._evtListenerClosures.push({event:t,evtListener:o}),n.addEventListener(t,o,!1)},_unbindListeners(e){if(Ember.set(this,"_stopListening",!0),Ember.get(this,"viewportUseIntersectionObserver")&&Ember.get(this,"viewportEnabled")&&Ember.get(this,"inViewport").unobserveIntersectionObserver(e),!Ember.get(this,"viewportUseIntersectionObserver")&&Ember.get(this,"viewportUseRAF")){const e=Ember.get(this,"elementId")
+Ember.get(this,"inViewport").removeRAF(e)}Ember.get(this,"viewportUseIntersectionObserver")||Ember.get(this,"viewportUseRAF")||Ember.get(this,"viewportListeners").forEach(e=>{let{context:t,event:r}=e
+t=Ember.get(this,"scrollableArea")||t
+let n=(0,i.default)(t),{evtListener:o}=this._evtListenerClosures.find(e=>r===e.event)||{}
+n.removeEventListener(r,o,!1)})
+Ember.get(this,"viewportDidScroll")&&this._unbindScrollDirectionListener()}})
+e.default=u})),define("ember-in-viewport/modifiers/in-viewport",["exports","ember-modifier","fast-deep-equal"],(function(e,t,r){"use strict"
+var n,i,o,a,s
+function l(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function u(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let c=(n=Ember.inject.service,i=Ember._action,o=Ember._action,a=class extends t.default{constructor(...e){var t,r,n,i
+super(...e),t=this,r="inViewport",i=this,(n=s)&&Object.defineProperty(t,r,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(i):void 0}),l(this,"name","in-viewport"),l(this,"lastOptions",void 0)}get options(){const{onEnter:e,onExit:t,...r}=this.args.named
+return r}get hasStaleOptions(){return!(0,r.default)(this.options,this.lastOptions)}validateArguments(){}onEnter(){this.args.named.onEnter&&this.args.named.onEnter.call(null,this.element)}onExit(){this.args.named.onExit&&this.args.named.onExit.call(null,this.element)}setupWatcher(){this.inViewport.watchElement(this.element,this.options,this.onEnter,this.onExit),this.lastOptions=this.options}destroyWatcher(){this.inViewport.stopWatching(this.element)}didInstall(){this.setupWatcher()}didUpdateArguments(){this.hasStaleOptions&&(this.destroyWatcher(),this.setupWatcher())}didReceiveArguments(){this.validateArguments()}willRemove(){this.destroyWatcher()}},s=u(a.prototype,"inViewport",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u(a.prototype,"onEnter",[i],Object.getOwnPropertyDescriptor(a.prototype,"onEnter"),a.prototype),u(a.prototype,"onExit",[o],Object.getOwnPropertyDescriptor(a.prototype,"onExit"),a.prototype),a)
+e.default=c})),define("ember-in-viewport/services/in-viewport",["exports","ember-in-viewport/utils/is-in-viewport","ember-in-viewport/utils/can-use-raf","ember-in-viewport/utils/can-use-intersection-observer","ember-in-viewport/-private/observer-admin","ember-in-viewport/-private/raf-admin"],(function(e,t,r,n,i,o){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const a=()=>{}
+class s extends Ember.Service{init(){super.init(...arguments),Ember.set(this,"registry",new WeakMap)
+let e=Ember.assign({viewportUseRAF:(0,r.default)()},this._buildOptions())
+e=Ember.assign(e,{viewportUseIntersectionObserver:(0,n.default)()}),Ember.setProperties(this,e)}startIntersectionObserver(){this.observerAdmin=new i.default}startRAF(){this.rafAdmin=new o.default}watchElement(e,t={},r,n){if(this.viewportUseIntersectionObserver){this.observerAdmin||this.startIntersectionObserver()
+const i=this.buildObserverOptions(t)
+Ember.run.schedule("afterRender",this,this.setupIntersectionObserver,e,i,r,n)}else this.rafAdmin||this.startRAF(),Ember.run.schedule("afterRender",this,this._startRaf,e,t,r,n)
+return{onEnter:this.addEnterCallback.bind(this,e),onExit:this.addExitCallback.bind(this,e)}}addEnterCallback(e,t){this.viewportUseIntersectionObserver?this.observerAdmin.addEnterCallback(e,t):this.rafAdmin.addEnterCallback(e,t)}addExitCallback(e,t){this.viewportUseIntersectionObserver?this.observerAdmin.addExitCallback(e,t):this.rafAdmin.addExitCallback(e,t)}addToRegistry(e,t){this.registry&&this.registry.set(e,{observerOptions:t})}setupIntersectionObserver(e,t,r,n){this.isDestroyed||this.isDestroying||(this.addToRegistry(e,t),this.observerAdmin.add(e,t,r,n))}buildObserverOptions({intersectionThreshold:e=0,scrollableArea:t=null,viewportTolerance:r={}}){const n="string"==typeof t?document.querySelector(t):t instanceof HTMLElement?t:void 0,{top:i=0,left:o=0,bottom:a=0,right:s=0}=r
+return{root:n,rootMargin:`${i}px ${s}px ${a}px ${o}px`,threshold:e}}unobserveIntersectionObserver(e){if(!e)return
+const t=this.registry.get(e)
+"object"==typeof t&&this.observerAdmin.unobserve(e,t.observerOptions)}addRAF(e,t){this.rafAdmin.add(e,t)}removeRAF(e){this.rafAdmin&&this.rafAdmin.remove(e)}isInViewport(...e){return(0,t.default)(...e)}stopWatching(e){this.observerAdmin&&this.unobserveIntersectionObserver(e),this.rafAdmin&&this.removeRAF(e)}willDestroy(){Ember.set(this,"registry",null),this.observerAdmin&&(this.observerAdmin.destroy(),Ember.set(this,"observerAdmin",null)),this.rafAdmin&&(this.rafAdmin.reset(),Ember.set(this,"rafAdmin",null))}_buildOptions(e={}){const t=Ember.getOwner(this)
+if(t)return Ember.assign(e,t.lookup("config:in-viewport"))}_startRaf(e,t,r,n){this.isDestroyed||this.isDestroying||(r=r||a,n=n||a,(0,o.startRAF)(e,t,r,n,this.addRAF.bind(this,e.id),this.removeRAF.bind(this,e.id)))}}e.default=s})),define("ember-in-viewport/utils/can-use-dom",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=!("undefined"==typeof window||!window.document||!window.document.createElement)
+e.default=t})),define("ember-in-viewport/utils/can-use-intersection-observer",["exports","ember-in-viewport/utils/can-use-dom"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){if(!t.default)return!1
+return function(e){if("IntersectionObserver"in e&&"IntersectionObserverEntry"in e&&"intersectionRatio"in e.IntersectionObserverEntry.prototype)return"isIntersecting"in e.IntersectionObserverEntry.prototype||Object.defineProperty(e.IntersectionObserverEntry.prototype,"isIntersecting",{get:function(){return this.intersectionRatio>0}}),!0
+return!1}(window)}})),define("ember-in-viewport/utils/can-use-raf",["exports","ember-in-viewport/utils/can-use-dom"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){if(!t.default)return!1
+return function(e,t,r){let n,i=["ms","moz","webkit","o"]
+for(n=0;n<i.length&&!e[t];++n)e[t]=e[i[n]+"RequestAnimationFrame"],e[r]=e[i[n]+"CancelAnimationFrame"]||e[i[n]+"CancelRequestAnimationFrame"]
+return!(!e[t]||!e[r])}(window,"requestAnimationFrame","cancelAnimationFrame")}})),define("ember-in-viewport/utils/check-scroll-direction",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e=null,r={},n=1){if(!e)return"none"
+const{top:i,left:o}=r,{top:a,left:s}=e,l={top:t((i-a)/n)*n,left:t((o-s)/n)*n}
+if(l.top>0)return"down"
+if(l.top<0)return"up"
+if(l.left>0)return"right"
+if(l.left<0)return"left"}
+const{floor:t}=Math})),define("ember-in-viewport/utils/find-elem",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let t
+t=e.nodeType===Node.ELEMENT_NODE||e.nodeType===Node.DOCUMENT_NODE||e instanceof Window?e:document.querySelector(e)
+return t}})),define("ember-in-viewport/utils/is-in-viewport",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e={},r=0,n=0,i=t){const{top:o,left:a,bottom:s,right:l,height:u,width:c}=e,d=Ember.assign(Ember.assign({},t),i),{top:h,left:f,bottom:p,right:m}=d
+return o+h>=0&&a+f>=0&&Math.round(s)-p-u<=Math.round(r)&&Math.round(l)-m-c<=Math.round(n)}
+const t={top:0,left:0,bottom:0,right:0}})),define("ember-inflector/index",["exports","ember-inflector/lib/system"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"defaultRules",{enumerable:!0,get:function(){return t.defaultRules}}),Object.defineProperty(e,"pluralize",{enumerable:!0,get:function(){return t.pluralize}}),Object.defineProperty(e,"singularize",{enumerable:!0,get:function(){return t.singularize}}),e.default=void 0
+var r=t.Inflector
+e.default=r})),define("ember-inflector/lib/ext/string",["ember-inflector/lib/system/string"],(function(e){"use strict";(!0===Ember.ENV.EXTEND_PROTOTYPES||Ember.ENV.EXTEND_PROTOTYPES.String)&&(Object.defineProperty(String.prototype,"pluralize",{get:()=>(Ember.deprecate("String.prototype.pluralize() is deprecated. Please explicitly: import { pluralize } from 'ember-inflector';",!1,{id:"ember-inflector.globals",until:"3.0.0"}),function(){return(0,e.pluralize)(this)})},{configurable:!0}),Object.defineProperty(String.prototype,"singularize",{get:()=>(Ember.deprecate("String.prototype.singularize() is deprecated. Please explicitly: import { singularize } from 'ember-inflector';",!1,{id:"ember-inflector.globals",until:"3.0.0"}),function(){return(0,e.singularize)(this)})},{configurable:!0}))})),define("ember-inflector/lib/helpers/pluralize",["exports","ember-inflector","ember-inflector/lib/utils/make-helper"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=(0,r.default)((function(e,r){let n=new Array(...e)
+return 2===n.length&&n.push({withoutCount:r["without-count"]}),(0,t.pluralize)(...n)}))
+e.default=n})),define("ember-inflector/lib/helpers/singularize",["exports","ember-inflector","ember-inflector/lib/utils/make-helper"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=(0,r.default)((function(e){return(0,t.singularize)(e[0])}))
+e.default=n})),define("ember-inflector/lib/system",["exports","ember-inflector/lib/system/inflector","ember-inflector/lib/system/string"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"Inflector",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"pluralize",{enumerable:!0,get:function(){return r.pluralize}}),Object.defineProperty(e,"singularize",{enumerable:!0,get:function(){return r.singularize}})})),define("ember-inflector/lib/system/inflections",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default={plurals:[[/$/,"s"],[/s$/i,"s"],[/^(ax|test)is$/i,"$1es"],[/(octop|vir)us$/i,"$1i"],[/(octop|vir)i$/i,"$1i"],[/(alias|status|bonus)$/i,"$1es"],[/(bu)s$/i,"$1ses"],[/(buffal|tomat)o$/i,"$1oes"],[/([ti])um$/i,"$1a"],[/([ti])a$/i,"$1a"],[/sis$/i,"ses"],[/(?:([^f])fe|([lr])f)$/i,"$1$2ves"],[/(hive)$/i,"$1s"],[/([^aeiouy]|qu)y$/i,"$1ies"],[/(x|ch|ss|sh)$/i,"$1es"],[/(matr|vert|ind)(?:ix|ex)$/i,"$1ices"],[/^(m|l)ouse$/i,"$1ice"],[/^(m|l)ice$/i,"$1ice"],[/^(ox)$/i,"$1en"],[/^(oxen)$/i,"$1"],[/(quiz)$/i,"$1zes"]],singular:[[/s$/i,""],[/(ss)$/i,"$1"],[/(n)ews$/i,"$1ews"],[/([ti])a$/i,"$1um"],[/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)(sis|ses)$/i,"$1sis"],[/(^analy)(sis|ses)$/i,"$1sis"],[/([^f])ves$/i,"$1fe"],[/(hive)s$/i,"$1"],[/(tive)s$/i,"$1"],[/([lr])ves$/i,"$1f"],[/([^aeiouy]|qu)ies$/i,"$1y"],[/(s)eries$/i,"$1eries"],[/(m)ovies$/i,"$1ovie"],[/(x|ch|ss|sh)es$/i,"$1"],[/^(m|l)ice$/i,"$1ouse"],[/(bus)(es)?$/i,"$1"],[/(o)es$/i,"$1"],[/(shoe)s$/i,"$1"],[/(cris|test)(is|es)$/i,"$1is"],[/^(a)x[ie]s$/i,"$1xis"],[/(octop|vir)(us|i)$/i,"$1us"],[/(alias|status|bonus)(es)?$/i,"$1"],[/^(ox)en/i,"$1"],[/(vert|ind)ices$/i,"$1ex"],[/(matr)ices$/i,"$1ix"],[/(quiz)zes$/i,"$1"],[/(database)s$/i,"$1"]],irregularPairs:[["person","people"],["man","men"],["child","children"],["sex","sexes"],["move","moves"],["cow","kine"],["zombie","zombies"]],uncountable:["equipment","information","rice","money","species","series","fish","sheep","jeans","police"]}})),define("ember-inflector/lib/system/inflector",["exports","ember-inflector/lib/system/inflections"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r=/^\s*$/,n=/([\w/-]+[_/\s-])([a-z\d]+$)/,i=/([\w/\s-]+)([A-Z][a-z\d]*$)/,o=/[A-Z][a-z\d]*$/
+function a(e,t){for(let r=0,n=t.length;r<n;r++)e.uncountable[t[r].toLowerCase()]=!0}function s(e,t){let r
+for(let n=0,i=t.length;n<i;n++)r=t[n],e.irregular[r[0].toLowerCase()]=r[1],e.irregular[r[1].toLowerCase()]=r[1],e.irregularInverse[r[1].toLowerCase()]=r[0],e.irregularInverse[r[0].toLowerCase()]=r[0]}function l(e){(e=e||{}).uncountable=e.uncountable||u(),e.irregularPairs=e.irregularPairs||u()
+const t=this.rules={plurals:e.plurals||[],singular:e.singular||[],irregular:u(),irregularInverse:u(),uncountable:u()}
+a(t,e.uncountable),s(t,e.irregularPairs),this.enableCache()}if(!Object.create&&!Object.create(null).hasOwnProperty)throw new Error("This browser does not support Object.create(null), please polyfil with es5-sham: http://git.io/yBU2rg")
+function u(){var e=Object.create(null)
+return e._dict=null,delete e._dict,e}l.prototype={enableCache(){this.purgeCache(),this.singularize=function(e){return this._cacheUsed=!0,this._sCache[e]||(this._sCache[e]=this._singularize(e))},this.pluralize=function(e,t,r={}){this._cacheUsed=!0
+var n=[e,t,r.withoutCount]
+return this._pCache[n]||(this._pCache[n]=this._pluralize(e,t,r))}},purgeCache(){this._cacheUsed=!1,this._sCache=u(),this._pCache=u()},disableCache(){this._sCache=null,this._pCache=null,this.singularize=function(e){return this._singularize(e)},this.pluralize=function(){return this._pluralize(...arguments)}},plural(e,t){this._cacheUsed&&this.purgeCache(),this.rules.plurals.push([e,t.toLowerCase()])},singular(e,t){this._cacheUsed&&this.purgeCache(),this.rules.singular.push([e,t.toLowerCase()])},uncountable(e){this._cacheUsed&&this.purgeCache(),a(this.rules,[e.toLowerCase()])},irregular(e,t){this._cacheUsed&&this.purgeCache(),s(this.rules,[[e,t]])},pluralize(){return this._pluralize(...arguments)},_pluralize(e,t,r={}){return void 0===t?this.inflect(e,this.rules.plurals,this.rules.irregular):(1!==parseFloat(e)&&(t=this.inflect(t,this.rules.plurals,this.rules.irregular)),r.withoutCount?t:`${e} ${t}`)},singularize(e){return this._singularize(e)},_singularize(e){return this.inflect(e,this.rules.singular,this.rules.irregularInverse)},inflect(e,t,a){let s,l,u,c,d,h,f,p,m,v
+if(f=!e||r.test(e),p=o.test(e),f)return e
+if(c=e.toLowerCase(),d=n.exec(e)||i.exec(e),d&&(h=d[2].toLowerCase()),v=this.rules.uncountable[c]||this.rules.uncountable[h],v)return e
+for(m in a)if(c.match(m+"$"))return l=a[m],p&&a[h]&&(l=Ember.String.capitalize(l),m=Ember.String.capitalize(m)),e.replace(new RegExp(m,"i"),l)
+for(var g=t.length;g>0&&(s=t[g-1],m=s[0],!m.test(e));g--);return s=s||[],m=s[0],l=s[1],u=e.replace(m,l),u}},l.defaultRules=t.default,l.inflector=new l(t.default)
+var c=l
+e.default=c})),define("ember-inflector/lib/system/string",["exports","ember-inflector/lib/system/inflector"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.pluralize=function(){return t.default.inflector.pluralize(...arguments)},e.singularize=function(e){return t.default.inflector.singularize(e)}})),define("ember-inflector/lib/utils/make-helper",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){if(Ember.Helper)return Ember.Helper.helper(e)
+if(Ember.HTMLBars)return Ember.HTMLBars.makeBoundHelper(e)
+return Ember.Handlebars.makeBoundHelper(e)}})),define("ember-intl/-private/error-types",["exports","intl-messageformat"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.MISSING_TRANSLATION=e.MISSING_INTL_API=void 0
+const r=t.ErrorCode.MISSING_INTL_API
+e.MISSING_INTL_API=r
+e.MISSING_TRANSLATION="MISSING_TRANSLATION"})),define("ember-intl/-private/formatters/-base",["exports"],(function(e){"use strict"
+function t(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const r=Object.create(null)
+class n{constructor(e){t(this,"config",void 0),t(this,"readFormatConfig",void 0),t(this,"createNativeFormatter",void 0),this.config=e,this.readFormatConfig=e.readFormatConfig}get options(){return[]}filterKnownOptions(e){if(!e)return r
+const t={}
+for(const r in e)this.options.includes(r)&&(t[r]=e[r])
+return t}readOptions(e){let t=this.filterKnownOptions(e)
+if(e&&"format"in e){t={...this.getNamedFormat(e.format),...t}}return t}validateFormatterOptions(e,t){}getNamedFormat(e){const t=this.readFormatConfig()[this.constructor.type]
+if(t&&t[e])return t[e]}}e.default=n,t(n,"type",void 0)})),define("ember-intl/-private/formatters/-format-datetime",["exports","fast-memoize","ember-intl/-private/formatters/-base"],(function(e,t,r){"use strict"
+function n(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const i=["localeMatcher","formatMatcher","timeZone","hour12","weekday","era","year","month","day","hour","minute","second","timeZoneName","hourCycle"]
+class o extends r.default{constructor(...e){super(...e),n(this,"createNativeFormatter",(0,t.default)((e,t)=>new Intl.DateTimeFormat(e,t)))}get options(){return i}format(e,t,r){const n=this.readOptions(r)
+this.validateFormatterOptions(e,n)
+return this.createNativeFormatter(e,n).format(new Date(t))}}e.default=o,n(o,"type",void 0)})),define("ember-intl/-private/formatters/format-date",["exports","ember-intl/-private/formatters/-format-datetime"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends t.default{}var n,i,o
+e.default=r,o="date",(i="type")in(n=r)?Object.defineProperty(n,i,{value:o,enumerable:!0,configurable:!0,writable:!0}):n[i]=o})),define("ember-intl/-private/formatters/format-message",["exports","fast-memoize","intl-messageformat","ember-intl/-private/utils/parse"],(function(e,t,r,n){"use strict"
+function i(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const{Handlebars:{Utils:{escapeExpression:o}}}=Ember
+class a{constructor(e){i(this,"config",void 0),i(this,"readFormatConfig",void 0),i(this,"createNativeFormatter",(0,t.default)((e,t,n)=>new r.default(e,t,n,{ignoreTag:!0}))),this.config=e,this.readFormatConfig=e.readFormatConfig}format(e,t,r){let i=t
+"string"==typeof t&&(i=(0,n.default)(t))
+const a=r&&r.htmlSafe,s=this.createNativeFormatter(i,e,this.readFormatConfig()),l=a?function(e){if("object"!=typeof e)return
+const t={}
+return Object.keys(e).forEach(r=>{const n=e[r]
+Ember.String.isHTMLSafe(n)?t[r]=n.toHTML():t[r]="string"==typeof n?o(n):n}),t}(r):r,u=s.format(l)
+return a?Ember.String.htmlSafe(u):u}}e.default=a,i(a,"type","message")})),define("ember-intl/-private/formatters/format-number",["exports","fast-memoize","ember-intl/-private/formatters/-base"],(function(e,t,r){"use strict"
+function n(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const i=["localeMatcher","style","currency","currencyDisplay","unit","unitDisplay","useGrouping","minimumIntegerDigits","minimumFractionDigits","maximumFractionDigits","minimumSignificantDigits","maximumSignificantDigits","compactDisplay","currencyDisplay","currencySign","notation","signDisplay","unitDisplay","unit"]
+class o extends r.default{constructor(...e){super(...e),n(this,"createNativeFormatter",(0,t.default)((e,t)=>new Intl.NumberFormat(e,t)))}get options(){return i}format(e,t,r){const n=this.readOptions(r)
+this.validateFormatterOptions(e,n)
+return this.createNativeFormatter(e,n).format(t)}}e.default=o,n(o,"type","number")})),define("ember-intl/-private/formatters/format-relative",["exports","fast-memoize","intl-messageformat","ember-intl/-private/error-types","ember-intl/-private/formatters/-base"],(function(e,t,r,n,i){"use strict"
+function o(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const a=["numeric","style","unit"]
+class s extends i.default{constructor(...e){super(...e),o(this,"createNativeFormatter",(0,t.default)((e,t)=>{if(!Intl||!Intl.RelativeTimeFormat){const e=new r.FormatError('Intl.RelativeTimeFormat is not available in this environment. Try polyfilling it using "@formatjs/intl-relativetimeformat"',n.MISSING_INTL_API)
+throw this.config.onError({kind:n.MISSING_INTL_API,error:e}),e}return new Intl.RelativeTimeFormat(e,t)}))}get options(){return a}format(e,t,r){var n
+const i=this.readOptions(r)
+this.validateFormatterOptions(e,i)
+const o=null!==(n=null==r?void 0:r.unit)&&void 0!==n?n:i.unit
+return this.createNativeFormatter(e,i).format("number"==typeof t?t:new Date(t).getTime(),o)}}e.default=s,o(s,"type","relative")})),define("ember-intl/-private/formatters/format-time",["exports","ember-intl/-private/formatters/-format-datetime"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends t.default{}var n,i,o
+e.default=r,o="time",(i="type")in(n=r)?Object.defineProperty(n,i,{value:o,enumerable:!0,configurable:!0,writable:!0}):n[i]=o})),define("ember-intl/-private/formatters/index",["exports","ember-intl/-private/formatters/format-time","ember-intl/-private/formatters/format-date","ember-intl/-private/formatters/format-number","ember-intl/-private/formatters/format-message","ember-intl/-private/formatters/format-relative"],(function(e,t,r,n,i,o){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"FormatTime",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"FormatDate",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"FormatNumber",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"FormatMessage",{enumerable:!0,get:function(){return i.default}}),Object.defineProperty(e,"FormatRelative",{enumerable:!0,get:function(){return o.default}})})),define("ember-intl/-private/store/container",["exports","ember-intl/-private/store/translation"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=Ember.Object.extend({locales:Ember.computed("_translationModels",(function(){return Array.from(this._translationModels.keys())})).readOnly(),init(){this._super(),this._translationModels=new Map},createTranslationModel(e){const r=new t.default(e)
+return this._translationModels.set(e,r),this.notifyPropertyChange("locales"),r},findTranslationModel(e){return this._translationModels.get(e)},push(e,t){let r=this.findTranslationModel(e)
+r||(r=this.createTranslationModel(e)),r.addTranslations(t)},has(e,t){const r=this.findTranslationModel(e)
+if(r)return r.has(t)},_lookup(e,t){const r=this.findTranslationModel(e)
+if(r&&r.has(t))return r.find(t)},lookupAst(e,t){const r=this._lookup(e,t)
+if(r)return r.ast},lookup(e,t){const r=this._lookup(e,t)
+if(r)return r.original}})
+e.default=r}))
+define("ember-intl/-private/store/translation",["exports","ember-intl/-private/utils/flatten","ember-intl/-private/utils/parse"],(function(e,t,r){"use strict"
+function n(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var i=class{get localeName(){return this._localeName}constructor(e){n(this,"translations",new Map),n(this,"asts",new Map),n(this,"_localeName",void 0),this._localeName=e}addTranslations(e){const n=(0,t.default)(e)
+for(const t in n){let e=n[t]
+"string"!=typeof e&&(e=""+e),this.translations.set(t,e),this.asts.set(t,(0,r.default)(e))}}find(e){if(this.has(e))return{ast:this.asts.get(e),original:this.translations.get(e)}}has(e){return this.translations.has(e)}}
+e.default=i})),define("ember-intl/-private/utils/empty-object",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Object.create(null,{constructor:{value:void 0,enumerable:!1,writable:!0}})
+function r(){}r.prototype=t
+var n=r
+e.default=n})),define("ember-intl/-private/utils/flatten",["exports","ember-intl/-private/utils/empty-object"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function e(n){const i=new t.default
+for(const t in n){if(!r.call(n,t))continue
+const o=n[t]
+if("object"==typeof o&&o){const r=e(o)
+for(const e in r)i[`${t}.${e}`]=r[e]}else i[t]=o}return i}
+const r=Object.prototype.hasOwnProperty})),define("ember-intl/-private/utils/get-dom",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let{renderer:t}=e
+if(!t||!t._dom){let r=Ember.getOwner?Ember.getOwner(e):e.container,n=r.lookup("service:-document")
+if(n)return n
+t=r.lookup("renderer:-dom")}if(t._dom&&t._dom.document)return t._dom.document
+return null}})),define("ember-intl/-private/utils/hydrate",["exports","ember-intl/translations"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){t.default.forEach(([t,r])=>{e.addTranslations(t,r)})}})),define("ember-intl/-private/utils/is-array-equal",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){if(!Ember.isArray(e)||!Ember.isArray(t))return!1
+if(e===t)return!0
+return e.toString()===t.toString()}})),define("ember-intl/-private/utils/missing-message",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){if(Ember.isEmpty(t))return`No locale defined.  Unable to resolve translation: "${e}"`
+const r=t.join(", ")
+return`Missing translation "${e}" for locale "${r}"`}})),define("ember-intl/-private/utils/normalize-locale",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){if("string"==typeof e)return e.replace(/_/g,"-").toLowerCase()}})),define("ember-intl/-private/utils/parse",["exports","intl-messageformat-parser"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return(0,t.parse)(e,{normalizeHashtagInPlural:!1,ignoreTag:!0})}})),define("ember-intl/helpers/-format-base",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.Helper.extend({intl:null,init(){if(this.constructor===t)throw new Error("FormatHelper is an abstract class, can not be instantiated directly.")
+this._super(),this.intl=Ember.getOwner(this).lookup("service:intl"),this.intl.on("localeChanged",this,"recompute")},format(){throw new Error("not implemented")},compute([e],t){if(Ember.isEmpty(e)){var r
+if(null!==(r=t.allowEmpty)&&void 0!==r?r:this.allowEmpty)return
+if(void 0===e)throw new Error(this+" helper requires value attribute.")}return this.format(e,t)},willDestroy(){this._super(),this.intl.off("localeChanged",this,"recompute")}})
+var r=t
+e.default=r})),define("ember-intl/helpers/format-date",["exports","ember-intl/helpers/-format-base"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.default.extend({allowEmpty:!0,format(e,t){return this.intl.formatDate(e,t)}})
+e.default=r})),define("ember-intl/helpers/format-message",["exports","ember-intl/helpers/-format-base"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.default.extend({format(e,t){return this.intl.formatMessage(e,t)}})
+e.default=r})),define("ember-intl/helpers/format-number",["exports","ember-intl/helpers/-format-base"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.default.extend({format(e,t){return this.intl.formatNumber(e,t)}})
+e.default=r})),define("ember-intl/helpers/format-relative",["exports","ember-intl/helpers/-format-base"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.default.extend({format(e,t){return this.intl.formatRelative(e,t)},compute(e,t={}){return this._super(e,t)}})
+e.default=r})),define("ember-intl/helpers/format-time",["exports","ember-intl/helpers/-format-base"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.default.extend({format(e,t){return this.intl.formatTime(e,t)}})
+e.default=r})),define("ember-intl/helpers/t",["exports","ember-intl/helpers/-format-base"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.default.extend({format(e,t){return this.intl.t(e,t)}})
+e.default=r})),define("ember-intl/index",["exports","ember-intl/services/intl","ember-intl/macros"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var n={Service:!0}
+Object.defineProperty(e,"Service",{enumerable:!0,get:function(){return t.default}}),Object.keys(r).forEach((function(t){"default"!==t&&"__esModule"!==t&&(Object.prototype.hasOwnProperty.call(n,t)||t in e&&e[t]===r[t]||Object.defineProperty(e,t,{enumerable:!0,get:function(){return r[t]}}))}))})),define("ember-intl/macros/index",["exports","ember-intl/macros/intl","ember-intl/macros/t"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"intl",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"t",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"raw",{enumerable:!0,get:function(){return r.raw}})})),define("ember-intl/macros/intl",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(...e){const r=e.pop(),n=e
+return Ember.computed(t+".locale",...n,(function(e){Ember.get(this,t)||Ember.defineProperty(this,t,{value:Ember.getOwner(this).lookup("service:intl"),enumerable:!1})
+const n=Ember.get(this,t)
+return r.call(this,n,e,this)}))},e.__intlInjectionName=void 0
+const t="intl-"+Date.now().toString(36)
+e.__intlInjectionName=t})),define("ember-intl/macros/t",["exports","ember-intl/-private/utils/empty-object","ember-intl/macros/intl"],(function(e,t,r){"use strict"
+function n(e,r){const n=new t.default
+return Object.keys(r).forEach(t=>{n[t]=Ember.get(e,r[t])}),n}Object.defineProperty(e,"__esModule",{value:!0}),e.raw=function(e){return new i(e)},e.default=function(e,o){const a=o||new t.default,[s,l]=function(e){const r=new t.default,n=new t.default
+return Object.keys(e).forEach(t=>{const o=e[t]
+o instanceof i?n[t]=o.valueOf():r[t]=o}),[r,n]}(a),u=Object.values(s)
+return(0,r.default)(...u,(t,r,i)=>t.t(e,{...l,...n(i,s)}))}
+class i{constructor(e){(function(e,t,r){t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r})(this,"_value",void 0),this._value=e}valueOf(){return this._value}toString(){return String(this._value)}}})),define("ember-intl/services/intl",["exports","ember-intl/-private/formatters","ember-intl/-private/utils/is-array-equal","ember-intl/-private/utils/normalize-locale","ember-intl/-private/utils/get-dom","ember-intl/-private/utils/hydrate","ember-intl/-private/store/container"],(function(e,t,r,n,i,o,a){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var s=Ember.Service.extend(Ember.Evented,{formats:null,locales:Ember.computed.readOnly("_translationContainer.locales"),locale:Ember.computed("_locale",{set(e,t){const i=Ember.makeArray(t).map(n.default)
+return(0,r.default)(i,this._locale)||(Ember.set(this,"_locale",i),Ember.run.cancel(this._timer),this._timer=Ember.run.next(()=>{this.trigger("localeChanged"),this._updateDocumentLanguage(this._locale)})),this._locale},get(){return Ember.get(this,"_locale")}}),primaryLocale:Ember.computed.readOnly("locale.0"),formatRelative:l("relative"),formatMessage:l("message"),formatNumber:l("number"),formatTime:l("time"),formatDate:l("date"),_translationContainer:null,_locale:null,_timer:null,_formatters:null,init(){this._super(...arguments)
+const e=Ember.get(this,"locale")||["en-us"]
+this.setLocale(e),this._owner=Ember.getOwner(this),this._translationContainer=a.default.create(),this._formatters=this._createFormatters(),this.formats||(this.formats=this._owner.resolveRegistration("formats:main")||{}),(0,o.default)(this)},willDestroy(){this._super(...arguments),Ember.run.cancel(this._timer)},onError({error:e}){throw e},lookup(e,t){const r=this._localeWithDefault(t)
+let n
+for(let i=0;i<r.length&&(n=this._translationContainer.lookup(r[i],e),void 0===n);i++);return n},lookupAst(e,t,r={}){const n=this._localeWithDefault(t)
+let i
+for(let o=0;o<n.length&&(i=this._translationContainer.lookupAst(n[o],e),void 0===i);o++);if(void 0===i&&!0!==r.resilient){return this._owner.resolveRegistration("util:intl/missing-message").call(this,e,n,r)}return i},validateKeys:e=>e.forEach(()=>{}),t(e,t={}){let r=[e]
+t.default&&(Array.isArray(t.default)?r=[...r,...t.default]:"string"==typeof t.default&&(r=[...r,t.default])),this.validateKeys(r)
+for(let n=0;n<r.length;n++){const e=r[n],i=this.lookupAst(e,t.locale,{...t,resilient:r.length-1!==n})
+if(i)return this.formatMessage(i,t)}},exists(e,t){const r=this._localeWithDefault(t)
+return r.some(t=>this._translationContainer.has(t,e))},setLocale(e){Ember.set(this,"locale",e)},addTranslations(e,t){this._translationContainer.push((0,n.default)(e),t)},translationsFor(e){return this._translationContainer.findTranslationModel((0,n.default)(e),!1)},_localeWithDefault(e){return e?"string"==typeof e?Ember.makeArray(e).map(n.default):Array.isArray(e)?e.map(n.default):void 0:Ember.get(this,"_locale")||[]},_updateDocumentLanguage(e){const t=(0,i.default)(this)
+if(t){const[r]=e
+t.documentElement.setAttribute("lang",r)}},_createFormatters(){const e={onError:this.onError.bind(this),readFormatConfig:()=>this.formats}
+return{message:new t.FormatMessage(e),relative:new t.FormatRelative(e),number:new t.FormatNumber(e),time:new t.FormatTime(e),date:new t.FormatDate(e)}}})
+function l(e){return function(t,r){let n
+return n=r&&r.locale?this._localeWithDefault(r.locale):Ember.get(this,"locale"),this._formatters[e].format(n,t,r)}}e.default=s})),define("ember-intl/translations",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=[["en-us",{common:{brand:{aws:"AWS","aws-iam":"AWS IAM",consul:"Consul","consul-api-gateway":"Consul API Gateway",jwt:"JWT",kubernetes:"Kubernetes",nomad:"Nomad",oidc:"OIDC",terraform:"Terraform",vault:"Vault"},consul:{accessorid:"AccessorID",critical:"Critical",datacenter:"Datacenter",destinationname:"Destination Name",displayname:"Display Name",empty:"No checks",failuretolerance:"Fault tolerance",gateway:"Gateway","ingress-gateway":"Ingress Gateway",localbindaddress:"Local Bind Address",localbindport:"Local Bind Port",mesh:"Mesh","mesh-gateway":"Mesh Gateway",name:"Name","node-name":"Node Name","node.meta":"Node Meta","not-registered":"Not Registered",passing:"Passing",readreplica:"Read replica",redundancyzone:"Redundancy zone",registered:"Registered",service:"Service","service-name":"Service Name","service.meta":"Service Meta",sourcename:"Source Name",status:"Health Status",tags:"Tags","terminating-gateway":"Terminating Gateway",warning:"Warning"},search:{critical:"Failing","in-mesh":"In service mesh",integrations:"Integrations","not-in-mesh":"Not in service mesh",search:"Search",searchproperty:"Search Across",source:"Source"},sort:{age:{asc:"Oldest to Newest",desc:"Newest to Oldest"},alpha:{asc:"A to Z",desc:"Z to A"},duration:{asc:"Longest to shortest",desc:"Shortest to longest"},numeric:{asc:"Ascending",desc:"Descending"},status:{asc:"Unhealthy to Healthy",desc:"Healthy to Unhealthy"}},ui:{creation:"Creation",enterprisefeature:"Enterprise feature","filtered-by":"Filtered by {item}",maxttl:"Max TTL",name:"Name",remove:"Remove {item}"}},components:{app:{"collapsible-notices":{collapse:"Collapse Banners",expand:"Expand Banners"},complementary:"Complementary",main:"Main",skip_to_content:"Skip to Content",toggle_menu:"Toggle Menu"},consul:{acl:{"search-bar":{kind:{name:"Type",options:{client:"Client",management:"Management"}}}},"auth-method":{"binding-list":{"bind-type":{node:"The bind name value is used as an ACLNodeIdentity.NodeName field in the token that is created.",role:"The bind name value is used as an RoleLink.Name field in the token that is created.",service:"The bind name value is used as an ACLServiceIdentity.ServiceName field in the token that is created."}},"search-bar":{kind:{name:"Type"},locality:{name:"Source",options:{global:"Creates global tokens",local:"Creates local tokens"}}}},"health-check":{"search-bar":{check:{name:"Type",options:{alias:"alias",docker:"docker",grpc:"grpc",http:"http",script:"script",serf:"serf",tcp:"tcp",ttl:"ttl"}},kind:{name:"Kind",options:{node:"Node Check",service:"Service Check"}},sort:{kind:{asc:"Service to Node",desc:"Node to Service",name:"Check Type"},name:{name:"Check Name"}}}},intention:{notice:{permissions:{body:"Permissions are L7 attributes. If any of the following permissions match the request, the Intention will apply. Requests that fail to match any of the provided routes will follow the default ACL policy.",footer:"Learn more about permissions"}},"search-bar":{access:{name:"Permission",options:{allow:"Allow","app-aware":"App aware",deny:"Deny"}},sort:{access:{asc:"Allow to Deny",desc:"Deny to Allow",name:"Permission"},"destination-name":{asc:"Destination: A to Z",desc:"Destination: Z to A",name:"Destination"},precedence:{asc:"Ascending",desc:"Descending",name:"Precedence"},"source-name":{asc:"Source: A to Z",desc:"Source: Z to A",name:"Source"}}}},kv:{"search-bar":{kind:{name:"Type",options:{folder:"Folder",key:"Key"}},sort:{kind:{asc:"Folders to Keys",desc:"Keys to Folders"}}}},policy:{"search-bar":{kind:{name:"Type",options:{"global-management":"Global Management",standard:"Standard"}}}},service:{"search-bar":{"in-mesh":"In service mesh",kind:"Service Type","not-in-mesh":"Not in service mesh"}},"service-instance":{"search-bar":{sort:{name:{name:"Service Name"}}}},source:{header:"This is not a registered Consul service. It’s a routing configuration that routes traffic to real services in Consul. For more information, read our documentation.",links:{documentation:"Documentation"},"menu-title":"About Routing Configs"},token:{"search-bar":{kind:{name:"Type",options:{global:"Global Scope","global-management":"Global Management",local:"Local Scope"}}},secretID:"Secret ID"},"topology-metrics":{popover:{deny:{action:{isExact:"Allow",notExact:"Create"},body:{isExact:"Change the action of this intention to allow.",notExact:"Add an intention that allows these two services to connect."},header:"Connection Denied"},l7:{action:"View",body:"Certain HTTP request info must be identified.",header:"Layer 7 permissions"},"not-defined":{action:"Documentation",body:'Add "{upstream}" as an explicit upstream of "{downstream}" or set the "{downstream}" proxy to "transparent" mode to enable traffic.',header:"No traffic"}},"source-type":{"proxy-registration":{text:"Defined in proxy registration",tooltip:"This connection was defined in a proxy registration."},"routing-config":{text:"Routing configuration",tooltip:"This is not a registered Consul service. It’s a routing configuration that routes traffic to real services in Consul."}},status:{error:"Unable to load metrics","ingress-gateway":"Viewing metrics for Ingress Gateways is not currently supported in the UI.",loading:"Loading metrics","remote-dc":"Unable to fetch metrics for a remote datacenter"}},"transparent-proxy":"Transparent Proxy",upstream:{"search-bar":{instance:{name:"Type"}}}},"copy-button":{error:"There was a problem.",success:"Copied {name}",title:"Copy {name} to the clipboard"}},models:{"auth-method":{BindNamespace:"Bind Namespace",Config:{AllowedRedirectURIs:"Allowed redirect URIs",BoundAudiences:"Bound audiences",BoundIssuer:"Bound issuer",CACert:"CA Cert",ClaimMappings:"Claim Mappings",ClockSkewLeeway:"Clock skew leeway",ExpirationLeeway:"Expiration leeway",Host:"Host",JWKSCACert:"JWKS CA Cert",JWKSURL:"JWKS URL",JWTSupportedAlgs:"JWT supported algorithms",JWTValidationPubKeys:"JWT validation pub keys",ListClaimMappings:"List Claim Mappings",NotBeforeLeeway:"Not before leeway",OIDCClientID:"Client ID",OIDCClientSecret:"Client secret",OIDCDiscoveryCACert:"OIDC discovery CA cert",OIDCDiscoveryURL:"Discovery URL",OIDCScopes:"OIDC scopes",ServiceAccountJWT:"Service account JSON Web Token",VerboseOIDCLogging:"Verbose OIDC logging"},Description:"Description",DisplayName:"Display name",MaxTokenTTL:"Maximum token TTL",Selector:"Selector",TokenLocality:"Token locality",Type:"Type"},"binding-rule":{BindType:"Type",Description:"Description",Selector:"Selector"}},routes:{dc:{acls:{"auth-methods":{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any Auth Methods}\n    other {No Auth Methods were found matching your search}\n  }, or you may not have <code>acl:read</code> permissions to view Auth Methods yet.\n</p>\n",header:"{items, select,\n  0 {Welcome to Auth Methods}\n  other {No Auth Methods found}\n}\n"}},show:{"binding-rules":{empty:{body:"<p>\n  Binding rules allow an operator to express a systematic way of automatically linking roles and service identities to newly created tokens without operator intervention.\n</p>\n",header:"No Binding Rules"}},"nspace-rules":{empty:{body:"<p>\n  A set of rules that can control which namespace tokens created via this auth method will be created within. Unlike binding rules, the first matching namespace rule wins.\n</p>\n",header:"No Namespace Rules"}}}},policies:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any Policies}\n    other {No Policies were found matching your search}\n  }, or you may not have <code>acl:read</code> permissions to view Policies yet.\n</p>\n",header:"{items, select,\n  0 {Welcome to Policies}\n  other {No Policies found}\n}\n"}}},roles:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any Roles}\n    other {No Roles were found matching your search}\n  }, or you may not have <code>acl:read</code> permissions to view Roles yet.\n</p>\n",header:"{items, select,\n  0 {Welcome to Roles}\n  other {No Roles found}\n}\n"}}},tokens:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any Tokens}\n    other {No Tokens were found matching your search}\n  }, or you may not have <code>acl:read</code> permissions to view Tokens yet.\n</p>\n",header:"{items, select,\n  0 {Welcome to Tokens}\n  other {No Tokens found}\n}\n"}}}},intentions:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any Intentions in this Consul cluster}\n    other {No Intentions were found matching your search}\n  }, or you may not have <code>intentions:read</code> permissions access to this view.\n</p>\n",header:"{items, select,\n  0 {Welcome to Intentions}\n  other {No Intentions found}\n}\n"}}},kv:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any K/V pairs in this Consul cluster yet}\n    other {No K/V pairs were found matching your search}\n  }, or you may not have <code>key:read</code> permissions access to this view.\n</p>\n",header:"{items, select,\n  0 {Welcome to Key/Value}\n  other {No Key/Values found}\n}\n"}}},nodes:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any registered Nodes in this Consul cluster}\n    other {No Nodes were found matching your search}\n}, or you may not have <code>service:read</code> and <code>node:read</code> permissions access to this view.\n</p>\n",header:"{items, select,\n  0 {Welcome to Nodes}\n  other {No Nodes found}\n}\n"}},show:{healthchecks:{"critical-serf-notice":{body:"<p>\n  This node has a failing serf node check. The health statuses shown on this page are the statuses as they were known before the node became unreachable.\n</p>\n",header:"Failing serf check"},empty:"<p>\n  This Node has no Health Checks{items, select,\n    0 {}\n    other { matching that search}\n  }.\n</p>\n",title:"Health Checks"},metadata:{title:"Metadata"},rtt:{title:"Round Trip Time"},services:{empty:"<p>\n  This Node has no Service Instances{items, select,\n    0 {}\n    other { matching that search}\n  }.\n</p>\n",title:"Service Instances"},sessions:{body:"<p>\nConsul provides a session mechanism which can be used to build distributed locks. Sessions act as a binding layer between Nodes, Health Checks, and Key/Value data. There are currently no Lock Sessions present, or you may not have <code>key:read</code> or <code>session:read</code> permissions.\n</p>\n",header:"Welcome to Lock Sessions",title:"Lock Sessions"}}},"routing-config":{source:"Routing Configuration"},services:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any registered services in this Consul cluster}\n    other {No Services were found matching your search}\n}, or you may not have <code>service:read</code> and <code>node:read</code> access to this view. Use Terraform, Kubernetes CRDs, Vault, or the Consul CLI to register Services.\n</p>\n",header:"{items, select,\n  0 {Welcome to Services}\n  other {No Services found}\n}\n"}},instance:{exposedpaths:{empty:{body:'<p>\n  There are no individual HTTP paths exposed through Envoy for external services like Prometheus. Read more about this in our <a href="{CONSUL_DOCS_URL}/connect/registration/service-registration#expose-paths-configuration-reference" target="_blank" rel="noopener noreferrer">documentation</a>.\n</p>\n'},intro:'<p>\n  The following list shows individual HTTP paths exposed through Envoy for external services like Prometheus. Read more about this in our <a href="{CONSUL_DOCS_URL}/connect/registration/service-registration#expose-paths-configuration-reference" target="_blank" rel="noopener noreferrer">documentation</a>.\n</p>\n'},healthchecks:{"critical-serf-notice":{body:"<p>\n  This instance has a failing serf node check. The health statuses shown on this page are the statuses as they were known before the node became unreachable.\n</p>\n",header:"Failing serf check"},empty:"<p>\n  This instance has no health checks{items, select,\n    0 {}\n    other { matching that search}\n  }.\n</p>\n"},upstreams:{empty:"<p>\n  This Service Instance has no Upstreams{items, select,\n    0 {}\n    other { matching that search}\n  }.\n</p>\n","tproxy-mode":{body:'<p>\n  The upstreams listed on this page have been defined in a proxy registration. There may be more upstreams, though, as "transparent" mode is enabled on this proxy.\n</p>\n',footer:'<p>\n  <a href="{CONSUL_DOCS_URL}/connect/transparent-proxy" target="_blank" rel="noopener noreferrer">Read the documentation\n</p>\n',header:"Transparent proxy mode"}}},show:{instances:{empty:"<p>\n  This Service has no Instances{items, select,\n    0 {}\n    other { matching that search}\n  }.\n</p>\n"},intentions:{index:{empty:{body:"<p>\n  {items, select,\n    0 {There don't seem to be any Intentions in this Consul cluster}\n    other {No Intentions were found matching your search}\n  }, or you may not have <code>intentions:read</code> permissions access to this view.\n</p>\n",header:"{items, select,\n  0 {Welcome to Intentions}\n  other {No Intentions found}\n}\n"}}},services:{empty:"<p>\n  There are no Services{items, select,\n    0 {}\n    other { matching that search}\n  }.\n</p>\n",intro:'<p>\n  The following services may receive traffic from external services through this gateway. Learn more about configuring gateways in our <a href="{CONSUL_DOCS_URL}/connect/terminating-gateway" target="_blank" rel="noopener noreferrer">step-by-step guide</a>.\n</p>\n'},tags:{empty:{body:"<p>\n  There are no tags for this Service.\n</p>\n",header:"Welcome to Tags"}},topology:{notice:{"acls-disabled":{body:"This connect-native service may have dependencies, but Consul isn't aware of them when ACLs are disabled. Enable ACLs to make this view more useful.",footer:'<p>\n  <a href="{CONSUL_DOCS_URL}/security/acl/acl-system#configuring-acls" target="_blank" rel="noopener noreferrer">Read the documentation</a>\n</p>\n',header:"Enable ACLs"},"default-allow":{body:"Your Intention settings are currently set to default allow. This means that this view will show connections to every service in your cluster. We recommend changing your Intention settings to default deny and creating specific Intentions for upstream and downstream services for this view to be useful.",footer:'<p>\n  <a href="{route_intentions}">Edit Intentions</a>\n</p>\n',header:"Intentions are set to default allow"},"filtered-by-acls":{body:"This service may have dependencies you won’t see because you don’t have access to them.",header:"Limited Access"},"no-dependencies":{body:"The service you are viewing currently has no dependencies. You will only see metrics for the current service until dependencies are added.",footer:'<p>\n  <a href="{CONSUL_DOCS_URL}/connect/registration/service-registration#upstream-configuration-reference" target="_blank" rel="noopener noreferrer">Read the documentation</a>\n</p>\n',header:"No dependencies"},"not-defined-intention":{body:"There appears to be an Intention allowing traffic, but the services are unable to communicate until that connection is enabled by defining an explicit upstream or proxies are set to 'transparent' mode.",footer:'<p>\n  <a href="{CONSUL_DOCS_URL}/connect/registration/service-registration#upstreams" target="_blank" rel="noopener noreferrer">Read the documentation</a>\n</p>\n',header:"Connections are not explicitly defined"},"wildcard-intention":{body:"One or more of your Intentions are set to allow traffic to and/or from all other services in a namespace. This Topology view will show all of those connections if that remains unchanged. We recommend setting more specific Intentions for upstream and downstream services to make this visualization more useful.",footer:'<p>\n  <a href="{route_intentions}">Edit Intentions</a>\n</p>\n',header:"Permissive Intention"}},notices:{close:"Collapse Banners",open:"Expand Banners"}},upstreams:{empty:"<p>\n  This Service has no Upstreams{items, select,\n    0 {}\n    other { matching that search}\n  }.\n</p>\n",intro:'<p>\n  Upstreams are services that may receive traffic from this gateway. If you are not using Consul DNS, please make sure your <code>Host:</code> header uses the correct domain name for the gateway to correctly proxy to its upstreams. Learn more about configuring gateways in our <a href="{CONSUL_DOCS_URL}/connect/ingress-gateways" target="_blank" rel="noopener noreferrer">documentation</a>.\n</p>\n'}}},show:{cataloghealth:{title:"Health"},license:{documentation:{body:'<ul>\n  <li>\n    <a href="{CONSUL_DOCS_URL}/enterprise/license/faq#q-is-there-a-grace-period-when-licenses-expire" target="_blank" rel="noopener noreferrer">\n      License expiration\n    </a>\n  </li>\n  <li>\n    <a href="{CONSUL_DOCS_URL}/enterprise/license/faq#q-how-can-i-renew-a-license" target="_blank" rel="noopener noreferrer">\n      Renewing a license\n    </a>\n  </li>\n  <li>\n    <a href="{CONSUL_DOCS_LEARN_URL}/tutorials/nomad/hashicorp-enterprise-license?in=consul/enterprise" target="_blank" rel="noopener noreferrer">\n      Applying a new license\n    </a>\n  </li>\n</ul>\n',title:"Learn More"},expiry:{expired:{body:"<p>\n  Your license expired on {date} at {time}.\n</p>\n",header:"Expired"},header:"Expiry",valid:{body:"<p>\n  Your license expires on {date} at {time}.\n</p>\n",header:""}},title:"License"},serverstatus:{title:"Server status",tolerance:{header:"Server fault tolerance",immediate:{body:"the number of healthy active voting servers that can fail at once without causing an outage",header:"Immediate"},link:'<a href="{CONSUL_DOCS_URL}/architecture/improving-consul-resilience#strategies-to-increase-fault-tolerance" target="_blank" rel="noopener noreferrer">Learn how to improve fault tolerance</a>\n',optimistic:{body:"the number of healthy active and back-up voting servers that can fail gradually without causing an outage",header:"Optimistic"}},unassigned:"Unassigned Zones"},title:"Cluster Overview"}}}}]]})),define("ember-load-initializers/index",["exports","require"],(function(e,t){"use strict"
+function r(e){var r=(0,t.default)(e,null,null,!0)
+if(!r)throw new Error(e+" must export an initializer.")
+var n=r.default
+if(!n)throw new Error(e+" must have a default export")
+return n.name||(n.name=e.slice(e.lastIndexOf("/")+1)),n}function n(e,t){return-1!==e.indexOf(t,e.length-t.length)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){for(var i=t+"/initializers/",o=t+"/instance-initializers/",a=[],s=[],l=Object.keys(requirejs._eak_seen),u=0;u<l.length;u++){var c=l[u]
+0===c.lastIndexOf(i,0)?n(c,"-test")||a.push(c):0===c.lastIndexOf(o,0)&&(n(c,"-test")||s.push(c))}(function(e,t){for(var n=0;n<t.length;n++)e.initializer(r(t[n]))})(e,a),function(e,t){for(var n=0;n<t.length;n++)e.instanceInitializer(r(t[n]))}(e,s)}})),define("ember-math-helpers/helpers/abs",["exports"],(function(e){"use strict"
+function t([e]){return Math.abs(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.abs=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/acos",["exports"],(function(e){"use strict"
+function t([e]){return Math.acos(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.acos=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/acosh",["exports"],(function(e){"use strict"
+function t([e]){return Math.acosh(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.acosh=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/add",["exports"],(function(e){"use strict"
+function t(e){return e.reduce((e,t)=>Number(e)+Number(t))}Object.defineProperty(e,"__esModule",{value:!0}),e.add=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/asin",["exports"],(function(e){"use strict"
+function t([e]){return Math.asin(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.asin=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/asinh",["exports"],(function(e){"use strict"
+function t([e]){return Math.asinh(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.asinh=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/atan",["exports"],(function(e){"use strict"
+function t([e]){return Math.atan(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.atan=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r}))
+define("ember-math-helpers/helpers/atan2",["exports"],(function(e){"use strict"
+function t([e,t]){return Math.atan2(e,t)}Object.defineProperty(e,"__esModule",{value:!0}),e.atan2=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/atanh",["exports"],(function(e){"use strict"
+function t([e]){return Math.atanh(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.atanh=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/cbrt",["exports"],(function(e){"use strict"
+function t([e]){return Math.cbrt(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.cbrt=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/ceil",["exports"],(function(e){"use strict"
+function t([e]){return Math.ceil(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.ceil=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/clz32",["exports"],(function(e){"use strict"
+function t([e]){return Math.clz32(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.clz32=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/cos",["exports"],(function(e){"use strict"
+function t([e]){return Math.cos(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.cos=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/cosh",["exports"],(function(e){"use strict"
+function t([e]){return Math.cosh(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.cosh=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/div",["exports"],(function(e){"use strict"
+function t(e){return e.reduce((e,t)=>Number(e)/Number(t))}Object.defineProperty(e,"__esModule",{value:!0}),e.div=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/exp",["exports"],(function(e){"use strict"
+function t([e]){return Math.exp(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.exp=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/expm1",["exports"],(function(e){"use strict"
+function t([e]){return Math.expm1(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.expm1=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/floor",["exports"],(function(e){"use strict"
+function t([e]){return Math.floor(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.floor=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/fround",["exports"],(function(e){"use strict"
+function t([e]){return Math.fround(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.fround=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/gcd",["exports"],(function(e){"use strict"
+function t([e=0,r=0]){const n=Math.abs(e),i=Math.abs(r)
+return 0===n?i:0===i?n:t([i,n%i])}Object.defineProperty(e,"__esModule",{value:!0}),e.gcd=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/hypot",["exports"],(function(e){"use strict"
+function t(e){return Math.hypot(...e)}Object.defineProperty(e,"__esModule",{value:!0}),e.hypot=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/imul",["exports"],(function(e){"use strict"
+function t([e,t]){return Math.imul(e,t)}Object.defineProperty(e,"__esModule",{value:!0}),e.imul=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/lcm",["exports","ember-math-helpers/helpers/gcd"],(function(e,t){"use strict"
+function r([e=0,r=0]){return 0===e||0===r?0:Math.abs(e*r)/(0,t.gcd)([e,r])}Object.defineProperty(e,"__esModule",{value:!0}),e.lcm=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-math-helpers/helpers/log-e",["exports"],(function(e){"use strict"
+function t([e]){return Math.log(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.logE=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/log10",["exports"],(function(e){"use strict"
+function t([e]){return Math.log10(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.log10=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/log1p",["exports"],(function(e){"use strict"
+function t([e]){return Math.log1p(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.log1p=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/log2",["exports"],(function(e){"use strict"
+function t([e]){return Math.log2(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.log2=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/max",["exports"],(function(e){"use strict"
+function t(e){return Math.max(...e)}Object.defineProperty(e,"__esModule",{value:!0}),e.max=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/min",["exports"],(function(e){"use strict"
+function t(e){return Math.min(...e)}Object.defineProperty(e,"__esModule",{value:!0}),e.min=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/mod",["exports"],(function(e){"use strict"
+function t(e){return e.reduce((e,t)=>Number(e)%Number(t))}Object.defineProperty(e,"__esModule",{value:!0}),e.mod=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/mult",["exports"],(function(e){"use strict"
+function t(e){return e.reduce((e,t)=>Number(e)*Number(t))}Object.defineProperty(e,"__esModule",{value:!0}),e.mult=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/pow",["exports"],(function(e){"use strict"
+function t(e){return e.reduce((e,t)=>Math.pow(e,t))}Object.defineProperty(e,"__esModule",{value:!0}),e.pow=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/random",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.random=i,e.default=void 0
+const{min:t,max:r}=Math,n={decimals:0}
+function i(e,{decimals:i}=n){if("object"==typeof e&&!Ember.isArray(e))return i=void 0!==e.decimals?e.decimals:n.decimals,+Math.random().toFixed(r(0,t(20,i)))
+if(e&&1===e.length){const[n]=e
+return+(Math.random()*n).toFixed(r(0,t(20,i)))}if(e&&2===e.length){let[n,o]=e
+return o<n&&([n,o]=[o,n]),+(n+Math.random()*(o-n)).toFixed(r(0,t(20,i)))}return+Math.random().toFixed(r(0,t(20,i)))}var o=Ember.Helper.helper(i)
+e.default=o})),define("ember-math-helpers/helpers/round",["exports"],(function(e){"use strict"
+function t(e,r){return void 0===r||0==+r?Math.round(e):(r=+r,null===(e=+e)||isNaN(e)||"number"!=typeof r||r%1!=0?NaN:e<0?-t(-e,r):(e=e.toString().split("e"),+`${(e=(e=Math.round(+`${e[0]}e${e[1]?+e[1]-r:-r}`)).toString().split("e"))[0]}e${e[1]?+e[1]+r:r}`))}function r(e,r){if(r){if(r.decimals)return t(e[0],-r.decimals)
+if(r.exp)return t(e[0],r.exp)}return Math.round(e[0])}Object.defineProperty(e,"__esModule",{value:!0}),e.round=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-math-helpers/helpers/sign",["exports"],(function(e){"use strict"
+function t([e]){return Math.sign(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.sign=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/sin",["exports"],(function(e){"use strict"
+function t([e]){return Math.sin(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.sin=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/sqrt",["exports"],(function(e){"use strict"
+function t([e]){return Math.sqrt(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.sqrt=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r}))
+define("ember-math-helpers/helpers/sub",["exports"],(function(e){"use strict"
+function t(e){return e.reduce((e,t)=>Number(e)-Number(t))}Object.defineProperty(e,"__esModule",{value:!0}),e.sub=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/tan",["exports"],(function(e){"use strict"
+function t([e]){return Math.tan(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.tan=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/tanh",["exports"],(function(e){"use strict"
+function t([e]){return Math.tanh(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.tanh=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-math-helpers/helpers/trunc",["exports"],(function(e){"use strict"
+function t([e]){return Math.trunc(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.trunc=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-maybe-in-element/components/maybe-in-element",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"9+K2ojil",block:'{"symbols":["&default","@destinationElement","@renderInPlace"],"statements":[[6,[37,1],[[32,3]],null,[["default","else"],[{"statements":[[18,1,null]],"parameters":[]},{"statements":[[6,[37,0],[[32,2]],[["guid","insertBefore"],["%cursor:0%",null]],[["default"],[{"statements":[[18,1,null]],"parameters":[]}]]]],"parameters":[]}]]]],"hasEval":false,"upvars":["in-element","if"]}',meta:{moduleName:"ember-maybe-in-element/components/maybe-in-element.hbs"}})
+var r=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=r})),define("ember-modifier/-private/class/modifier-manager",["exports"],(function(e){"use strict"
+function t(e){e.willRemove(),e.willDestroy()}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=class{constructor(e){var t,r,n
+this.owner=e,t=this,r="capabilities",n=Ember._modifierManagerCapabilities("3.13"),r in t?Object.defineProperty(t,r,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[r]=n}createModifier(e,r){const n=new(0,e.class)(this.owner,r)
+return Ember._registerDestructor(n,t),n}installModifier(e,t){e.element=t,e.didReceiveArguments(),e.didInstall()}updateModifier(e,t){Ember.set(e,"args",t),e.didUpdateArguments(),e.didReceiveArguments()}destroyModifier(e){Ember.destroy(e)}}})),define("ember-modifier/-private/class/modifier",["exports","ember-modifier/-private/class/modifier-manager"],(function(e,t){"use strict"
+function r(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n{constructor(e,t){r(this,"args",void 0),r(this,"element",null),Ember.setOwner(this,e),this.args=t}didReceiveArguments(){}didUpdateArguments(){}didInstall(){}willRemove(){}willDestroy(){}get isDestroying(){return Ember._isDestroying(this)}get isDestroyed(){return Ember._isDestroyed(this)}}e.default=n,Ember._setModifierManager(e=>new t.default(e),n)})),define("ember-modifier/-private/functional/modifier-manager",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=new WeakMap,r=new WeakMap
+function n(e){const t=r.get(e)
+t&&"function"==typeof t&&t()}function i(e,t,n){const{positional:i,named:o}=n,a=e(t,i,o)
+r.set(e,a)}var o=new class{constructor(){var e,t,r
+e=this,t="capabilities",r=Ember._modifierManagerCapabilities("3.13"),t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r}createModifier(e){return(...t)=>e.class(...t)}installModifier(e,r,n){t.set(e,r),i(e,r,n)}updateModifier(e,r){const o=t.get(e)
+n(e),i(e,o,r)}destroyModifier(e){n(e)}}
+e.default=o})),define("ember-modifier/-private/functional/modifier",["exports","ember-modifier/-private/functional/modifier-manager"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return Ember._setModifierManager(()=>t.default,e)}})),define("ember-modifier/-private/interfaces",[],(function(){})),define("ember-modifier/index",["exports","ember-modifier/-private/class/modifier","ember-modifier/-private/functional/modifier","ember-modifier/-private/interfaces"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}}),Object.defineProperty(e,"modifier",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"ModifierArgs",{enumerable:!0,get:function(){return n.ModifierArgs}})})),define("ember-named-blocks-polyfill/helpers/-has-block-params",["exports","ember-named-blocks-polyfill"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function(e){let[t,r,n]=e
+return t?r in t&&t[r]>0:n}))
+e.default=t})),define("ember-named-blocks-polyfill/helpers/-has-block",["exports","ember-named-blocks-polyfill"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function(e){let[t,r,n]=e
+return t?r in t:n}))
+e.default=t})),define("ember-named-blocks-polyfill/helpers/-is-named-block-invocation",["exports","ember-named-blocks-polyfill"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=Ember.Helper.helper((function(e){return(0,t.isNamedBlockInvocation)(e[0],e[1])}))
+e.default=r})),define("ember-named-blocks-polyfill/helpers/-named-block-invocation",["exports","ember-named-blocks-polyfill"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=Ember.Helper.helper((function(e){return(0,t.namedBlockInvocation)(e[0])}))
+e.default=r})),define("ember-named-blocks-polyfill/index",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.namedBlockInvocation=function(e){let r=Object.create(null)
+return Object.defineProperty(r,"toString",{configurable:!0,enumerable:!1,writable:!1,value:()=>`{{yield to=${JSON.stringify(e)}}}`}),t.set(r,e),r},e.isNamedBlockInvocation=function(e,r){return"object"==typeof e&&null!==e&&t.has(e)?r===t.get(e):"default"===r},e.isBlocksInfo=function(e){return"object"==typeof e&&null!==e&&null===Object.getPrototypeOf(e)&&Object.values(e).every(e=>"number"==typeof e)}
+const t=new WeakMap})),define("ember-on-helper/helpers/on-document",["exports","ember-on-helper/helpers/on"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.default.extend({compute(e,t){return this._super([document,...e],t)}})
+e.default=r})),define("ember-on-helper/helpers/on-window",["exports","ember-on-helper/helpers/on"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=t.default.extend({compute(e,t){return this._super([window,...e],t)}})
+e.default=r})),define("ember-on-helper/helpers/on",["exports","ember-on-helper/utils/event-listener"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.__counts=function(){return{adds:r,removes:n}},e.default=void 0
+let r=0,n=0
+function i(e,r,i,o){e&&r&&i&&(n++,(0,t.removeEventListener)(e,r,i,o))}var o=Ember.Helper.extend({eventTarget:null,eventName:void 0,callback:void 0,eventOptions:void 0,compute([e,n,o],a){i(this.eventTarget,this.eventName,this.callback,this.eventOptions),this.eventTarget=e,this.callback=function(e,n,i,o){return r++,(0,t.addEventListener)(e,n,i,o),i}(this.eventTarget,n,o,a),this.eventName=n,this.eventOptions=a},willDestroy(){this._super(),i(this.eventTarget,this.eventName,this.callback,this.eventOptions)}})
+e.default=o})),define("ember-on-helper/utils/event-listener",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.addEventListenerOnce=r,e.addEventListener=function(e,n,i,o){const a=i
+t?e.addEventListener(n,a,o):o&&o.once?r(e,n,a,Boolean(o.capture)):e.addEventListener(n,a,Boolean(o&&o.capture))},e.removeEventListener=function(e,r,n,i){t?e.removeEventListener(r,n,i):e.removeEventListener(r,n,Boolean(i&&i.capture))},e.SUPPORTS_EVENT_OPTIONS=void 0
+const t=(()=>{try{const e=document.createElement("div")
+let t,r=0
+return e.addEventListener("click",()=>r++,{once:!0}),"function"==typeof Event?t=new Event("click"):(t=document.createEvent("Event"),t.initEvent("click",!0,!0)),e.dispatchEvent(t),e.dispatchEvent(t),1===r}catch(e){return!1}})()
+function r(e,t,r,n=!1){e.addEventListener(t,(function i(){e.removeEventListener(t,i,n),r()}),n)}e.SUPPORTS_EVENT_OPTIONS=t})),define("ember-on-resize-modifier/modifiers/on-resize",["exports","ember-modifier"],(function(e,t){"use strict"
+var r,n,i,o
+function a(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let s=(r=Ember.inject.service,n=Ember._action,i=class extends t.default{constructor(...e){var t,r,n,i
+super(...e),t=this,r="resizeObserver",i=this,(n=o)&&Object.defineProperty(t,r,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(i):void 0})}get callback(){return this.args.positional[0]}didReceiveArguments(){}didInstall(){this.resizeObserver.observe(this.element,this.handleResize)}willRemove(){this.resizeObserver.unobserve(this.element,this.handleResize)}handleResize(...e){this.callback(...e)}},o=a(i.prototype,"resizeObserver",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a(i.prototype,"handleResize",[n],Object.getOwnPropertyDescriptor(i.prototype,"handleResize"),i.prototype),i)
+e.default=s})),define("ember-page-title/helpers/page-title",["exports"],(function(e){"use strict"
+var t,r,n
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let i=(t=Ember.inject.service("page-title-list"),r=class extends Ember.Helper{constructor(...e){var t,r,i,o
+super(...e),t=this,r="tokens",o=this,(i=n)&&Object.defineProperty(t,r,{enumerable:i.enumerable,configurable:i.configurable,writable:i.writable,value:i.initializer?i.initializer.call(o):void 0})}get tokenId(){return Ember.guidFor(this)}init(){super.init(...arguments),this.tokens.push({id:this.tokenId})}compute(e,t){let r=Ember.assign({},t,{id:this.tokenId,title:e.join("")})
+return this.tokens.push(r),this.tokens.scheduleTitleUpdate(),""}willDestroy(){super.willDestroy(),this.tokens.remove(this.tokenId),this.tokens.scheduleTitleUpdate()}},o=r.prototype,a="tokens",s=[t],l={configurable:!0,enumerable:!0,writable:!0,initializer:null},c={},Object.keys(l).forEach((function(e){c[e]=l[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=s.slice().reverse().reduce((function(e,t){return t(o,a,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(o,a,c),c=null),n=c,r)
+var o,a,s,l,u,c
+e.default=i})),define("ember-page-title/services/page-title-list",["exports"],(function(e){"use strict"
+var t,r,n,i,o,a,s
+function l(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function u(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function c(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let d="undefined"!=typeof FastBoot
+const h="routeDidChange"
+let f=(t=Ember.inject.service,r=Ember.inject.service,n=Ember.inject.service("-document"),i=class extends Ember.Service{constructor(...e){super(...e),l(this,"pageTitle",o,this),l(this,"router",a,this),l(this,"document",s,this),u(this,"tokens",[]),u(this,"_defaultConfig",{separator:" | ",prepend:!0,replace:null}),u(this,"scheduleTitleUpdate",()=>{Ember.run.scheduleOnce("afterRender",this,this._updateTitle)})}init(){super.init(),this._validateExistingTitleElement()
+let e=Ember.getOwner(this).resolveRegistration("config:environment")
+e.pageTitle&&["separator","prepend","replace"].forEach(t=>{Ember.isEmpty(e.pageTitle[t])||(this._defaultConfig[t]=e.pageTitle[t])}),this.router.on(h,this.scheduleTitleUpdate)}applyTokenDefaults(e){let t=this._defaultConfig.separator,r=this._defaultConfig.prepend,n=this._defaultConfig.replace
+null==e.separator&&(e.separator=t),null==e.prepend&&null!=r&&(e.prepend=r),null==e.replace&&null!=n&&(e.replace=n)}inheritFromPrevious(e){let t=e.previous
+t&&(null==e.separator&&(e.separator=t.separator),null==e.prepend&&(e.prepend=t.prepend))}push(e){let t=this._findTokenById(e.id)
+if(t){let r=this.tokens.indexOf(t),n=[...this.tokens],i=t.previous
+return e.previous=i,e.next=t.next,this.inheritFromPrevious(e),this.applyTokenDefaults(e),n.splice(r,1,e),void(this.tokens=n)}let r=this.tokens.slice(-1)[0]
+r&&(e.previous=r,r.next=e,this.inheritFromPrevious(e)),this.applyTokenDefaults(e),this.tokens=[...this.tokens,e]}remove(e){let t=this._findTokenById(e),{next:r,previous:n}=t
+r&&(r.previous=n),n&&(n.next=r),t.previous=t.next=null
+let i=[...this.tokens]
+i.splice(i.indexOf(t),1),this.tokens=i}get visibleTokens(){let e=this.tokens,t=e?e.length:0,r=[]
+for(;t--;){let n=e[t]
+if(n.replace){r.unshift(n)
+break}r.unshift(n)}return r}get sortedTokens(){let e=this.visibleTokens,t=!0,r=[],n=[r],i=[]
+return e.forEach(e=>{if(e.front)i.unshift(e)
+else if(e.prepend){t&&(t=!1,r=[],n.push(r))
+let i=r[0]
+i&&((e=Ember.assign({},e)).separator=i.separator),r.unshift(e)}else t||(t=!0,r=[],n.push(r)),r.push(e)}),i.concat(n.reduce((e,t)=>e.concat(t),[]))}toString(){let e=this.sortedTokens,t=[]
+for(let r=0,n=e.length;r<n;r++){let i=e[r]
+i.title&&(t.push(i.title),r+1<n&&t.push(i.separator))}return t.join("")}willDestroy(){super.willDestroy(),this.router.off(h,this.scheduleTitleUpdate)}_updateTitle(){const e=this.toString()
+d?this.updateFastbootTitle(e):this.document.title=e,this.pageTitle.titleDidUpdate(e)}_validateExistingTitleElement(){}_findTokenById(e){return this.tokens.filter(t=>t.id===e)[0]}updateFastbootTitle(e){if(!d)return
+const t=this.document.head,r=t.childNodes
+for(let o=0;o<r.length;o++){let e=r[o]
+"title"===e.nodeName.toLowerCase()&&t.removeChild(e)}let n=this.document.createElement("title"),i=this.document.createTextNode(e)
+n.appendChild(i),t.appendChild(n)}},o=c(i.prototype,"pageTitle",[t],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a=c(i.prototype,"router",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=c(i.prototype,"document",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),i)
+e.default=f})),define("ember-page-title/services/page-title",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class t extends Ember.Service{titleDidUpdate(){}}e.default=t})),define("ember-power-select-with-create/components/power-select-multiple-with-create",["exports","ember-power-select-with-create/components/power-select-with-create","ember-power-select-with-create/templates/components/power-select-with-create"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=t.default.extend({layout:r.default,powerSelectComponentName:"power-select-multiple",actions:{selectOrCreate(e,t){let r=e.filter(e=>e.__isSuggestion__)[0]
+r?this.onCreate(r.__value__,t):this.onChange(e,t)}}})
+e.default=n})),define("ember-power-select-with-create/components/power-select-with-create",["exports","ember-power-select-with-create/templates/components/power-select-with-create","ember-power-select/utils/group-utils"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.Component.extend({tagName:"",layout:t.default,matcher:r.defaultMatcher,suggestedOptionComponent:"power-select-with-create/suggested-option",powerSelectComponentName:"power-select",searchEnabled:!0,init(){this._super(...arguments)},optionsArray:Ember.computed("options.[]",(function(){let e=this.get("options")
+return e?e.then?e.then(e=>Ember.A(e).toArray()):Ember.A(e).toArray():Ember.A()})),shouldShowCreateOption(e,t){return!this.get("showCreateWhen")||this.get("showCreateWhen")(e,t)},addCreateOption(e,t){this.shouldShowCreateOption(e,t)&&("bottom"===this.get("showCreatePosition")?t.push(this.buildSuggestionForTerm(e)):t.unshift(this.buildSuggestionForTerm(e)))},actions:{searchAndSuggest(e,t){return Ember.RSVP.resolve(this.get("optionsArray")).then(r=>{if(0===e.length)return r
+let n=this.get("search")
+return n?Ember.RSVP.resolve(n(e,t)).then(t=>(t.toArray&&(t=t.toArray()),this.addCreateOption(e,t),t)):(r=this.filter(Ember.A(r),e),this.addCreateOption(e,r),r)})},selectOrCreate(e,t,r){e&&e.__isSuggestion__?this.onCreate(e.__value__,t,r):this.onChange(e,t,r)}},filter(e,t){let n
+return n=this.searchField?(e,t)=>this.matcher(Ember.get(e,this.searchField),t):(e,t)=>this.matcher(e,t),(0,r.filterOptions)(e||[],t,n)},buildSuggestionForTerm(e){return{__isSuggestion__:!0,__value__:e,text:this.buildSuggestionLabel(e)}},buildSuggestionLabel(e){return this.buildSuggestion?this.buildSuggestion(e):`Add "${e}"...`}})
+e.default=n})),define("ember-power-select-with-create/components/power-select-with-create/suggested-option",["exports","ember-power-select-with-create/templates/components/power-select-with-create/suggested-option"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var r=Ember.Component.extend({tagName:"",layout:t.default})
+e.default=r})),define("ember-power-select-with-create/templates/components/power-select-with-create",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"tPAUjYtD",block:'{"symbols":["Select","option","term","&default","@afterOptionsComponent","@allowClear","@ariaDescribedBy","@ariaInvalid","@ariaLabel","@ariaLabelledBy","@buildSelection","@calculatePosition","@class","@closeOnSelect","@defaultHighlighted","@destination","@dir","@disabled","@dropdownClass","@extra","@groupComponent","@highlightOnHover","@horizontalPosition","@initiallyOpened","@loadingMessage","@matchTriggerWidth","@noMatchesMessage","@onBlur","@onClose","@onFocus","@onInput","@onKeydown","@onOpen","@optionsComponent","@placeholder","@placeholderComponent","@preventScroll","@registerAPI","@renderInPlace","@scrollTo","@searchField","@searchMessage","@searchMessageComponent","@searchPlaceholder","@selected","@selectedItemComponent","@tabindex","@triggerClass","@triggerId","@triggerRole","@typeAheadMatcher","@verticalPosition","&attrs"],"statements":[[6,[37,3],[[30,[36,0],[[32,0,["powerSelectComponentName"]]],null]],null,[["default"],[{"statements":[[2,"  "],[8,[32,1],[[17,53]],[["@afterOptionsComponent","@allowClear","@ariaDescribedBy","@ariaInvalid","@ariaLabel","@ariaLabelledBy","@beforeOptionsComponent","@buildSelection","@calculatePosition","@class","@closeOnSelect","@defaultHighlighted","@destination","@dir","@disabled","@dropdownClass","@extra","@groupComponent","@highlightOnHover","@horizontalPosition","@initiallyOpened","@loadingMessage","@matchTriggerWidth","@matcher","@noMatchesMessage","@onBlur","@onChange","@onClose","@onFocus","@onInput","@onKeydown","@onOpen","@options","@optionsComponent","@placeholder","@placeholderComponent","@preventScroll","@registerAPI","@renderInPlace","@scrollTo","@search","@searchEnabled","@searchField","@searchMessage","@searchMessageComponent","@searchPlaceholder","@selected","@selectedItemComponent","@tabindex","@triggerClass","@triggerComponent","@triggerId","@triggerRole","@typeAheadMatcher","@verticalPosition"],[[32,5],[32,6],[32,7],[32,8],[32,9],[32,10],[32,0,["beforeOptionsComponent"]],[32,11],[32,12],[32,13],[32,14],[32,15],[32,16],[32,17],[32,18],[32,19],[32,20],[32,21],[32,22],[32,23],[32,24],[32,25],[32,26],[32,0,["matcher"]],[32,27],[32,28],[30,[36,1],[[32,0],"selectOrCreate"],null],[32,29],[32,30],[32,31],[32,32],[32,33],[32,0,["optionsArray"]],[32,34],[32,35],[32,36],[32,37],[32,38],[32,39],[32,40],[30,[36,1],[[32,0],"searchAndSuggest"],null],[32,0,["searchEnabled"]],[32,41],[32,42],[32,43],[32,44],[32,45],[32,46],[32,47],[32,48],[32,0,["triggerComponent"]],[32,49],[32,50],[32,51],[32,52]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,2],[[32,2,["__isSuggestion__"]]],null,[["default","else"],[{"statements":[[2,"      "],[1,[30,[36,0],[[32,0,["suggestedOptionComponent"]]],[["option","term"],[[32,2],[32,3]]]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"      "],[18,4,[[32,2],[32,3]]],[2,"\\n"]],"parameters":[]}]]],[2,"  "]],"parameters":[2,3]}]]],[2,"\\n"]],"parameters":[1]}]]]],"hasEval":false,"upvars":["component","action","if","let"]}',meta:{moduleName:"ember-power-select-with-create/templates/components/power-select-with-create.hbs"}})
+e.default=t})),define("ember-power-select-with-create/templates/components/power-select-with-create/suggested-option",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.HTMLBars.template({id:"BhTDM3xa",block:'{"symbols":[],"statements":[[1,[35,0,["text"]]],[2,"\\n"]],"hasEval":false,"upvars":["option"]}',meta:{moduleName:"ember-power-select-with-create/templates/components/power-select-with-create/suggested-option.hbs"}})
+e.default=t})),define("ember-power-select/components/power-select-multiple",["exports","@glimmer/component"],(function(e,t){"use strict"
+var r,n,i,o
+function a(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const s=Ember.HTMLBars.template({id:"yobBUtyD",block:'{"symbols":["option","select","@triggerRole","@ariaDescribedBy","@ariaInvalid","@ariaLabel","@ariaLabelledBy","@afterOptionsComponent","@allowClear","@beforeOptionsComponent","@buildSelection","@calculatePosition","@closeOnSelect","@defaultHighlighted","@destination","@disabled","@dropdownClass","@extra","@groupComponent","@horizontalPosition","@initiallyOpened","@loadingMessage","@matcher","@matchTriggerWidth","@noMatchesMessage","@noMatchesMessageComponent","@onBlur","@onChange","@onClose","@onInput","@options","@optionsComponent","@placeholder","@placeholderComponent","@preventScroll","@registerAPI","@renderInPlace","@required","@scrollTo","@search","@searchEnabled","@searchField","@searchMessage","@searchPlaceholder","@selected","@selectedItemComponent","@eventType","@title","@triggerClass","@tabindex","@triggerComponent","@triggerId","@verticalPosition","&attrs","&default"],"statements":[[8,"power-select",[[17,54]],[["@triggerRole","@ariaDescribedBy","@ariaInvalid","@ariaLabel","@ariaLabelledBy","@afterOptionsComponent","@allowClear","@beforeOptionsComponent","@buildSelection","@calculatePosition","@closeOnSelect","@defaultHighlighted","@destination","@disabled","@dropdownClass","@extra","@groupComponent","@horizontalPosition","@initiallyOpened","@loadingMessage","@matcher","@matchTriggerWidth","@noMatchesMessage","@noMatchesMessageComponent","@onBlur","@onChange","@onClose","@onFocus","@onInput","@onKeydown","@onOpen","@options","@optionsComponent","@placeholder","@placeholderComponent","@preventScroll","@registerAPI","@renderInPlace","@required","@scrollTo","@search","@searchEnabled","@searchField","@searchMessage","@searchPlaceholder","@selected","@selectedItemComponent","@eventType","@title","@triggerClass","@triggerComponent","@triggerId","@verticalPosition","@tabindex"],[[32,3],[32,4],[32,5],[32,6],[32,7],[32,8],[32,9],[30,[36,0],[[32,10],null],null],[30,[36,0],[[32,11],[32,0,["defaultBuildSelection"]]],null],[32,12],[32,13],[32,14],[32,15],[32,16],[32,17],[32,18],[32,19],[32,20],[32,21],[32,22],[32,23],[32,24],[32,25],[32,26],[32,27],[32,28],[32,29],[32,0,["handleFocus"]],[32,30],[32,0,["handleKeydown"]],[32,0,["handleOpen"]],[32,31],[32,32],[32,33],[32,34],[32,35],[32,36],[32,37],[32,38],[32,39],[32,40],[32,41],[32,42],[32,43],[32,44],[32,45],[32,46],[32,47],[32,48],[31,["ember-power-select-multiple-trigger ",[32,49]]],[30,[36,1],[[30,[36,0],[[32,51],"power-select-multiple/trigger"],null]],[["tabindex"],[[32,50]]]],[32,52],[32,53],[32,0,["computedTabIndex"]]]],[["default"],[{"statements":[[2,"\\n  "],[18,55,[[32,1],[32,2]]],[2,"\\n"]],"parameters":[1,2]}]]],[2,"\\n"]],"hasEval":false,"upvars":["or","component"]}',meta:{moduleName:"ember-power-select/components/power-select-multiple.hbs"}})
+let l=(r=Ember._action,n=Ember._action,i=Ember._action,a((o=class extends t.default{get computedTabIndex(){return void 0===this.args.triggerComponent&&this.args.searchEnabled?"-1":this.args.tabindex||"0"}handleOpen(e,t){if(this.args.onOpen&&!1===this.args.onOpen(e,t))return!1
+this.focusInput(e)}handleFocus(e,t){this.args.onFocus&&this.args.onFocus(e,t),this.focusInput(e)}handleKeydown(e,t){return this.args.onKeydown&&!1===this.args.onKeydown(e,t)?(t.stopPropagation(),!1):13===t.keyCode&&e.isOpen?(t.stopPropagation(),void 0!==e.highlighted?e.selected&&-1!==e.selected.indexOf(e.highlighted)?(e.actions.close(t),!1):(e.actions.choose(e.highlighted,t),!1):(e.actions.close(t),!1)):void 0}defaultBuildSelection(e,t){let r=(t.selected||[]).slice(0),n=-1
+for(let i=0;i<r.length;i++)if(Ember.isEqual(r[i],e)){n=i
+break}return n>-1?r.splice(n,1):r.push(e),r}focusInput(e){if(e){let t=document.querySelector("#ember-power-select-trigger-multiple-input-"+e.uniqueId)
+t&&t.focus()}}}).prototype,"handleOpen",[r],Object.getOwnPropertyDescriptor(o.prototype,"handleOpen"),o.prototype),a(o.prototype,"handleFocus",[n],Object.getOwnPropertyDescriptor(o.prototype,"handleFocus"),o.prototype),a(o.prototype,"handleKeydown",[i],Object.getOwnPropertyDescriptor(o.prototype,"handleKeydown"),o.prototype),o)
+e.default=l,Ember._setComponentTemplate(s,l)}))
+define("ember-power-select/components/power-select-multiple/trigger",["exports","@glimmer/component"],(function(e,t){"use strict"
+var r,n,i,o,a,s,l,u
+function c(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function d(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const h=Ember.HTMLBars.template({id:"Ph+5uods",block:'{"symbols":["opt","idx","@select","@listboxId","@tabindex","@onFocus","@onBlur","@placeholder","@searchEnabled","&default","@extra","@selectedItemComponent","&attrs"],"statements":[[11,"ul"],[16,1,[31,["ember-power-select-multiple-options-",[32,3,["uniqueId"]]]]],[24,0,"ember-power-select-multiple-options"],[17,13],[4,[38,7],[[32,0,["openChanged"]],[32,3,["isOpen"]]],null],[4,[38,0],["touchstart",[32,0,["chooseOption"]]],null],[4,[38,0],["mousedown",[32,0,["chooseOption"]]],null],[12],[2,"\\n"],[6,[37,9],[[30,[36,8],[[30,[36,8],[[32,3,["selected"]]],null]],null]],null,[["default","else"],[{"statements":[[2,"    "],[10,"li"],[15,0,[31,["ember-power-select-multiple-option ",[30,[36,4],[[32,1,["disabled"]],"ember-power-select-multiple-option--disabled"],null]]]],[12],[2,"\\n"],[6,[37,6],[[32,3,["disabled"]]],null,[["default"],[{"statements":[[2,"        "],[10,"span"],[14,"role","button"],[14,"aria-label","remove element"],[14,0,"ember-power-select-multiple-remove-btn"],[15,"data-selected-index",[32,2]],[12],[2,"\\n          ×\\n        "],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,4],[[32,12]],null,[["default","else"],[{"statements":[[2,"        "],[1,[30,[36,5],[[32,12]],[["extra","option","select"],[[32,11],[32,1],[32,3]]]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[18,10,[[32,1],[32,3]]],[2,"\\n"]],"parameters":[]}]]],[2,"    "],[13],[2,"\\n"]],"parameters":[1,2]},{"statements":[[6,[37,4],[[30,[36,3],[[32,8],[30,[36,2],[[32,9]],null]],null]],null,[["default"],[{"statements":[[2,"      "],[10,"span"],[14,0,"ember-power-select-placeholder"],[12],[1,[32,8]],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[6,[37,4],[[32,9]],null,[["default"],[{"statements":[[2,"    "],[11,"input"],[24,0,"ember-power-select-trigger-multiple-input"],[24,"autocomplete","off"],[24,"autocorrect","off"],[24,"autocapitalize","off"],[16,"spellcheck",false],[16,1,[31,["ember-power-select-trigger-multiple-input-",[32,3,["uniqueId"]]]]],[16,2,[32,3,["searchText"]]],[16,"aria-controls",[32,4]],[16,5,[32,0,["triggerMultipleInputStyle"]]],[16,"placeholder",[32,0,["maybePlaceholder"]]],[16,"disabled",[32,3,["disabled"]]],[16,"tabindex",[32,5]],[24,4,"search"],[4,[38,0],["focus",[32,6]],null],[4,[38,0],["blur",[32,7]],null],[4,[38,0],["input",[32,0,["handleInput"]]],null],[4,[38,0],["keydown",[32,0,["handleKeydown"]]],null],[4,[38,1],[[32,0,["storeInputStyles"]]],null],[12],[13],[2,"\\n"]],"parameters":[]}]]],[13],[2,"\\n"],[10,"span"],[14,0,"ember-power-select-status-icon"],[12],[13],[2,"\\n"]],"hasEval":false,"upvars":["on","did-insert","not","and","if","component","unless","did-update","-track-array","each"]}',meta:{moduleName:"ember-power-select/components/power-select-multiple/trigger.hbs"}}),f=window&&window.navigator?window.navigator.userAgent:"",p=f.indexOf("MSIE ")>-1||f.indexOf("Trident/")>-1
+let m=(r=Ember.inject.service,n=Ember._action,i=Ember._action,o=Ember._action,a=Ember._action,s=Ember._action,l=class extends t.default{constructor(...e){var t,r,n,i
+super(...e),c(this,"inputFont",void 0),c(this,"_lastIsOpen",this.args.select.isOpen),t=this,r="textMeasurer",i=this,(n=u)&&Object.defineProperty(t,r,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(i):void 0})}get triggerMultipleInputStyle(){if(Ember.run.scheduleOnce("actions",null,this.args.select.actions.reposition),this.args.select.selected&&0!==Ember.get(this.args.select.selected,"length")){let e=0
+return this.inputFont&&(e=this.textMeasurer.width(this.args.select.searchText,this.inputFont)),Ember.String.htmlSafe(`width: ${e+25}px`)}return Ember.String.htmlSafe("width: 100%;")}get maybePlaceholder(){if(!p)return this.args.select.selected&&0!==Ember.get(this.args.select.selected,"length")?"":this.args.placeholder||""}openChanged(e,[t]){!1===t&&!0===this._lastIsOpen&&Ember.run.scheduleOnce("actions",null,this.args.select.actions.search,""),this._lastIsOpen=t}storeInputStyles(e){let{fontStyle:t,fontVariant:r,fontWeight:n,fontSize:i,lineHeight:o,fontFamily:a}=window.getComputedStyle(e)
+this.inputFont=`${t} ${r} ${n} ${i}/${o} ${a}`}chooseOption(e){if(null===e.target)return
+let t=e.target.getAttribute("data-selected-index")
+if(t){let r=parseInt(t,10)
+e.stopPropagation(),e.preventDefault()
+let n=this.selectedObject(this.args.select.selected,r)
+this.args.select.actions.choose(n)}}handleInput(e){this.args.onInput&&!1===this.args.onInput(e)||this.args.select.actions.open(e)}handleKeydown(e){if(null!==e.target){if(this.args.onKeydown&&!1===this.args.onKeydown(e))return e.stopPropagation(),!1
+if(8===e.keyCode){if(e.stopPropagation(),Ember.isBlank(e.target.value)){let t=this.args.select.selected[this.args.select.selected.length-1]
+t&&(this.args.select.actions.select(this.args.buildSelection(t,this.args.select),e),"string"==typeof t?this.args.select.actions.search(t):this.args.select.actions.search(Ember.get(t,this.args.searchField)),this.args.select.actions.open(e))}}else(e.keyCode>=48&&e.keyCode<=90||32===e.keyCode)&&e.stopPropagation()}}selectedObject(e,t){return"function"==typeof e.objectAt?e.objectAt(t):Ember.get(e,t)}},u=d(l.prototype,"textMeasurer",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),d(l.prototype,"openChanged",[n],Object.getOwnPropertyDescriptor(l.prototype,"openChanged"),l.prototype),d(l.prototype,"storeInputStyles",[i],Object.getOwnPropertyDescriptor(l.prototype,"storeInputStyles"),l.prototype),d(l.prototype,"chooseOption",[o],Object.getOwnPropertyDescriptor(l.prototype,"chooseOption"),l.prototype),d(l.prototype,"handleInput",[a],Object.getOwnPropertyDescriptor(l.prototype,"handleInput"),l.prototype),d(l.prototype,"handleKeydown",[s],Object.getOwnPropertyDescriptor(l.prototype,"handleKeydown"),l.prototype),l)
+e.default=m,Ember._setComponentTemplate(h,m)})),define("ember-power-select/components/power-select",["exports","@glimmer/component","ember-power-select/utils/group-utils","ember-concurrency-decorators","ember-concurrency"],(function(e,t,r,n,i){"use strict"
+var o,a,s,l,u,c,d,h,f,p,m,v,g,b,y,_,w,E,x,O,S,T,M,A,P,C,k,R,j,D,N,I,L,F,z,U,H,B
+function V(e,t,r,n){r&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0})}function $(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function q(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const W=Ember.HTMLBars.template({id:"mzybs8/S",block:'{"symbols":["dropdown","publicAPI","listboxId","AfterOptions","Options","option","select","NoMatchesMessage","SearchMessage","BeforeOptions","Trigger","opt","term","@extra","@loadingMessage","@groupComponent","&default","@optionsComponent","@noMatchesMessageComponent","@searchMessageComponent","@searchEnabled","@placeholder","@selectedItemComponent","@searchPlaceholder","@allowClear","@buildSelection","@searchField","@eventType","@triggerClass","@ariaDescribedBy","@ariaInvalid","@ariaLabel","@ariaLabelledBy","@required","@triggerRole","@title","@triggerId","@tabindex","@disabled","@options","@selected","@triggerComponent","@dropdownClass","@beforeOptionsComponent","@afterOptionsComponent","@horizontalPosition","@destination","@initiallyOpened","@preventScroll","@renderInPlace","@verticalPosition","@calculatePosition","&attrs"],"statements":[[8,"basic-dropdown",[[17,53]],[["@horizontalPosition","@destination","@initiallyOpened","@matchTriggerWidth","@preventScroll","@onClose","@onOpen","@renderInPlace","@verticalPosition","@disabled","@calculatePosition"],[[32,46],[32,47],[32,48],[32,0,["matchTriggerWidth"]],[30,[36,0],[[32,49],false],null],[32,0,["handleClose"]],[32,0,["handleOpen"]],[32,50],[32,51],[32,39],[32,52]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,2],[[30,[36,11],[[32,1],[30,[36,12],null,[["selected","highlighted","options","results","resultsCount","loading","isActive","searchText","lastSearchedText","actions"],[[32,0,["selected"]],[32,0,["highlighted"]],[32,0,["options"]],[32,0,["results"]],[32,0,["resultsCount"]],[32,0,["loading"]],[32,0,["isActive"]],[32,0,["searchText"]],[32,0,["lastSearchedText"]],[30,[36,11],[[32,1,["actions"]],[32,0,["_publicAPIActions"]]],null]]]]],null],[30,[36,10],["ember-power-select-options-",[32,1,["uniqueId"]]],null]],null,[["default"],[{"statements":[[2,"    "],[8,[32,1,["Trigger"]],[[16,0,[31,["ember-power-select-trigger ",[32,29],[30,[36,3],[[32,2,["isActive"]]," ember-power-select-trigger--active"],null]]]],[16,"aria-describedby",[32,30]],[16,"aria-invalid",[32,31]],[16,"aria-label",[32,32]],[16,"aria-labelledby",[32,33]],[16,"aria-required",[32,34]],[16,"role",[30,[36,0],[[32,35],"button"],null]],[16,"title",[32,36]],[16,1,[32,37]],[16,"tabindex",[30,[36,5],[[30,[36,4],[[32,39]],null],[30,[36,0],[[32,38],"0"],null]],null]],[4,[38,6],[[32,0,["_updateOptions"]],[32,40]],null],[4,[38,7],[[32,0,["_updateOptions"]],[32,40]],null],[4,[38,6],[[32,0,["_updateSelected"]],[32,41]],null],[4,[38,7],[[32,0,["_updateSelected"]],[32,41]],null],[4,[38,6],[[32,0,["_registerAPI"]],[32,2]],null],[4,[38,7],[[32,0,["_registerAPI"]],[32,2]],null],[4,[38,7],[[32,0,["_performSearch"]],[32,0,["searchText"]]],null],[4,[38,8],["keydown",[32,0,["handleTriggerKeydown"]]],null],[4,[38,8],["focus",[32,0,["handleFocus"]]],null],[4,[38,8],["blur",[32,0,["handleBlur"]]],null]],[["@eventType"],[[30,[36,0],[[32,28],"mousedown"],null]]],[["default"],[{"statements":[[2,"\\n"],[6,[37,2],[[30,[36,1],[[30,[36,0],[[32,42],"power-select/trigger"],null]],null]],null,[["default"],[{"statements":[[2,"        "],[8,[32,11],[],[["@allowClear","@buildSelection","@loadingMessage","@selectedItemComponent","@select","@searchEnabled","@searchField","@onFocus","@onBlur","@extra","@listboxId","@onInput","@onKeydown","@placeholder","@placeholderComponent"],[[32,25],[32,26],[30,[36,0],[[32,15],"Loading options..."],null],[32,23],[32,2],[32,21],[32,27],[32,0,["handleFocus"]],[32,0,["handleBlur"]],[32,14],[32,3],[32,0,["handleInput"]],[32,0,["handleKeydown"]],[32,22],[32,0,["placeholderComponent"]]]],[["default"],[{"statements":[[2,"\\n          "],[18,17,[[32,12],[32,13]]],[2,"\\n        "]],"parameters":[12,13]}]]],[2,"\\n"]],"parameters":[11]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n    "],[8,[32,1,["Content"]],[[16,0,[31,["ember-power-select-dropdown",[30,[36,3],[[32,2,["isActive"]]," ember-power-select-dropdown--active"],null]," ",[32,43]]]]],[[],[]],[["default"],[{"statements":[[2,"\\n"],[6,[37,2],[[30,[36,1],[[30,[36,3],[[30,[36,9],[[32,44],[29]],null],"power-select/before-options",[32,44]],null]],null]],null,[["default"],[{"statements":[[2,"        "],[8,[32,10],[],[["@select","@searchEnabled","@onInput","@onKeydown","@onFocus","@onBlur","@placeholder","@placeholderComponent","@extra","@listboxId","@selectedItemComponent","@searchPlaceholder"],[[32,2],[32,21],[32,0,["handleInput"]],[32,0,["handleKeydown"]],[32,0,["handleFocus"]],[32,0,["handleBlur"]],[32,22],[32,0,["placeholderComponent"]],[32,14],[32,3],[32,23],[32,24]]],null],[2,"\\n"]],"parameters":[10]}]]],[6,[37,3],[[32,0,["mustShowSearchMessage"]]],null,[["default","else"],[{"statements":[[6,[37,2],[[30,[36,1],[[30,[36,0],[[32,20],"power-select/search-message"],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,9],[],[["@searchMessage","@select"],[[32,0,["searchMessage"]],[32,2]]],null],[2,"\\n"]],"parameters":[9]}]]]],"parameters":[]},{"statements":[[6,[37,3],[[32,0,["mustShowNoMessages"]]],null,[["default","else"],[{"statements":[[6,[37,2],[[30,[36,1],[[30,[36,0],[[32,19],"power-select/no-matches-message"],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,8],[],[["@noMatchesMessage","@select"],[[32,0,["noMatchesMessage"]],[32,2]]],null],[2,"\\n"]],"parameters":[8]}]]]],"parameters":[]},{"statements":[[6,[37,2],[[30,[36,1],[[30,[36,0],[[32,18],"power-select/options"],null]],null]],null,[["default"],[{"statements":[[2,"          "],[8,[32,5],[[16,1,[32,3]],[24,0,"ember-power-select-options"]],[["@loadingMessage","@select","@options","@groupIndex","@optionsComponent","@extra","@highlightOnHover","@groupComponent"],[[30,[36,0],[[32,15],"Loading options..."],null],[32,2],[32,2,["results"]],"",[32,5],[32,14],[32,0,["highlightOnHover"]],[30,[36,0],[[32,16],"power-select/power-select-group"],null]]],[["default"],[{"statements":[[2,"\\n            "],[18,17,[[32,6],[32,7]]],[2,"\\n          "]],"parameters":[6,7]}]]],[2,"\\n"]],"parameters":[5]}]]],[2,"      "]],"parameters":[]}]]]],"parameters":[]}]]],[6,[37,2],[[30,[36,1],[[32,45]],null]],null,[["default"],[{"statements":[[2,"        "],[8,[32,4],[],[["@extra","@select"],[[32,14],[32,2]]],null],[2,"\\n"]],"parameters":[4]}]]],[2,"    "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[2,3]}]]]],"parameters":[1]}]]],[2,"\\n"]],"hasEval":false,"upvars":["or","component","let","if","not","and","did-insert","did-update","on","eq","concat","assign","hash"]}',meta:{moduleName:"ember-power-select/components/power-select.hbs"}}),G=e=>"function"==typeof e.then,Y=e=>G(e)&&Object.hasOwnProperty.call(e,"content"),K=e=>"function"==typeof e.cancel
+let J=(o=Ember._tracked,a=Ember._tracked,s=Ember._tracked,l=Ember._tracked,u=Ember._tracked,c=Ember._tracked,d=Ember._tracked,h=Ember._tracked,f=Ember._tracked,p=Ember._tracked,m=Ember._action,v=Ember._action,g=Ember._action,b=Ember._action,y=Ember._action,_=Ember._action,w=Ember._action,E=Ember._action,x=Ember._action,O=Ember._action,S=Ember._action,T=Ember._action,M=Ember._action,A=Ember._action,P=Ember._action,C=Ember._action,k=Ember._action,R=class extends t.default{constructor(e,t){super(e,t),$(this,"_publicAPIActions",{search:this._search,highlight:this._highlight,select:this._select,choose:this._choose,scrollTo:this._scrollTo}),V(this,"_resolvedOptions",j,this),V(this,"_resolvedSelected",D,this),V(this,"_repeatingChar",N,this),V(this,"_expirableSearchText",I,this),V(this,"_searchResult",L,this),V(this,"isActive",F,this),V(this,"loading",z,this),V(this,"searchText",U,this),V(this,"lastSearchedText",H,this),V(this,"highlighted",B,this),$(this,"storedAPI",void 0),$(this,"_lastOptionsPromise",void 0),$(this,"_lastSelectedPromise",void 0),$(this,"_lastSearchPromise",void 0),$(this,"_filterResultsCache",{results:[],options:[],searchText:this.searchText})}willDestroy(){this._lastSelectedPromise&&Y(this._lastSelectedPromise)&&(Ember.removeObserver(this._lastSelectedPromise,"content",this,this._selectedObserverCallback),this._lastSelectedPromise=void 0),super.willDestroy.apply(this,arguments)}get highlightOnHover(){return void 0===this.args.highlightOnHover||this.args.highlightOnHover}get placeholderComponent(){return this.args.placeholderComponent||"power-select/placeholder"}get searchMessage(){return void 0===this.args.searchMessage?"Type to search":this.args.searchMessage}get noMatchesMessage(){return void 0===this.args.noMatchesMessage?"No results found":this.args.noMatchesMessage}get matchTriggerWidth(){return void 0===this.args.matchTriggerWidth||this.args.matchTriggerWidth}get mustShowSearchMessage(){return!this.loading&&0===this.searchText.length&&!!this.args.search&&!!this.searchMessage&&0===this.resultsCount}get mustShowNoMessages(){return!this.loading&&0===this.resultsCount&&(!this.args.search||this.lastSearchedText.length>0)}get results(){if(this.searchText.length>0){if(this.args.search)return Z(this._searchResult||this.options)
+{if(this._filterResultsCache.options===this.options&&this._filterResultsCache.searchText===this.searchText)return this._filterResultsCache.results
+let e=this._filter(this.options,this.searchText)
+return this._filterResultsCache={results:e,options:this.options,searchText:this.searchText},e}}return this.options}get options(){return this._resolvedOptions?Z(this._resolvedOptions):this.args.options?Z(this.args.options):[]}get resultsCount(){return(0,r.countOptions)(this.results)}get selected(){return this._resolvedSelected?Z(this._resolvedSelected):this.args.selected&&"function"!=typeof this.args.selected.then?Z(this.args.selected):void 0}handleOpen(e,t){if(this.args.onOpen&&!1===this.args.onOpen(this.storedAPI,t))return!1
+t&&t instanceof KeyboardEvent&&"keydown"===t.type&&(38===t.keyCode||40===t.keyCode)&&t.preventDefault(),this._resetHighlighted()}handleClose(e,t){if(this.args.onClose&&!1===this.args.onClose(this.storedAPI,t))return!1
+this._highlight(void 0)}handleInput(e){if(null===e.target)return
+let t,r=e.target.value
+this.args.onInput&&(t=this.args.onInput(r,this.storedAPI,e),!1===t)||this._publicAPIActions.search("string"==typeof t?t:r)}handleKeydown(e){return(!this.args.onKeydown||!1!==this.args.onKeydown(this.storedAPI,e))&&this._routeKeydown(this.storedAPI,e)}handleTriggerKeydown(e){if(this.args.onKeydown&&!1===this.args.onKeydown(this.storedAPI,e))e.stopImmediatePropagation()
+else if(e.ctrlKey||e.metaKey)e.stopImmediatePropagation()
+else if(e.keyCode>=48&&e.keyCode<=90||X(e))this.triggerTypingTask.perform(e)
+else{if(32!==e.keyCode)return this._routeKeydown(this.storedAPI,e)
+this._handleKeySpace(this.storedAPI,e)}}handleFocus(e){this.isDestroying||Ember.run.scheduleOnce("actions",this,this._updateIsActive,!0),this.args.onFocus&&this.args.onFocus(this.storedAPI,e)}handleBlur(e){this.isDestroying||Ember.run.scheduleOnce("actions",this,this._updateIsActive,!1),this.args.onBlur&&this.args.onBlur(this.storedAPI,e)}_search(e){this.searchText!==e&&(this.searchText=e,this.args.search||(this.lastSearchedText=e,this._resetHighlighted()))}_updateOptions(){if(this.args.options)if(G(this.args.options)){if(this._lastOptionsPromise===this.args.options)return
+let e=this.args.options
+this._lastOptionsPromise=e,this.loading=!0,this._lastOptionsPromise.then(t=>{this._lastOptionsPromise===e&&(this.loading=!1,this._resolvedOptions=t,this._resetHighlighted())}).catch(()=>{this._lastOptionsPromise===e&&(this.loading=!1)})}else Ember.run.scheduleOnce("actions",this,this._resetHighlighted)}_updateHighlighted(){this.storedAPI.isOpen&&this._resetHighlighted()}_updateSelected(){if(this.args.selected)if("function"==typeof this.args.selected.then){if(this._lastSelectedPromise===this.args.selected)return
+this._lastSelectedPromise&&Y(this._lastSelectedPromise)&&Ember.removeObserver(this._lastSelectedPromise,"content",this,this._selectedObserverCallback)
+let e=this.args.selected
+e.then(()=>{this.isDestroyed||this.isDestroying||Y(e)&&Ember.addObserver(e,"content",this,this._selectedObserverCallback)}),this._lastSelectedPromise=e,this._lastSelectedPromise.then(t=>{this._lastSelectedPromise===e&&(this._resolvedSelected=t,this._highlight(t))})}else this._resolvedSelected=void 0,this._highlight(this.args.selected)}_selectedObserverCallback(){this._resolvedSelected=this._lastSelectedPromise,this._highlight(this._resolvedSelected)}_highlight(e){e&&Ember.get(e,"disabled")||(this.highlighted=e)}_select(e,t){Ember.isEqual(this.storedAPI.selected,e)||this.args.onChange(e,this.storedAPI,t)}_choose(e,t){let r=this.args.buildSelection?this.args.buildSelection(e,this.storedAPI):e
+this.storedAPI.actions.select(r,t),!1!==this.args.closeOnSelect&&this.storedAPI.actions.close(t)}_scrollTo(e){let t=this.storedAPI
+if(!document||!e)return
+if(this.args.scrollTo)return this.args.scrollTo(e,t)
+let n=document.querySelector(`[aria-controls="ember-power-select-trigger-${t.uniqueId}"]`)
+if(!n)return
+let i=(0,r.indexOfOption)(t.results,e)
+if(-1===i)return
+let o=n.querySelectorAll("[data-option-index]").item(i)
+if(!o)return
+let a=o.offsetTop-n.offsetTop,s=a+o.offsetHeight
+s>n.offsetHeight+n.scrollTop?n.scrollTop=s-n.offsetHeight:a<n.scrollTop&&(n.scrollTop=a)}_registerAPI(e,[t]){this.storedAPI=t,this.args.registerAPI&&Ember.run.scheduleOnce("actions",null,this.args.registerAPI,t)}_performSearch(e,[t]){if(!this.args.search)return
+if(""===t)return this.loading=!1,this.lastSearchedText=t,void(void 0!==this._lastSearchPromise&&(K(this._lastSearchPromise)&&this._lastSearchPromise.cancel(),this._lastSearchPromise=void 0))
+let r=this.args.search(t,this.storedAPI)
+r&&G(r)?(this.loading=!0,void 0!==this._lastSearchPromise&&K(this._lastSearchPromise)&&this._lastSearchPromise.cancel(),this._lastSearchPromise=r,r.then(e=>{this._lastSearchPromise===r&&(this._searchResult=e,this.loading=!1,this.lastSearchedText=t,this._resetHighlighted())}).catch(()=>{this._lastSearchPromise===r&&(this.loading=!1,this.lastSearchedText=t)})):(this.lastSearchedText=t,this._searchResult=r,this._resetHighlighted())}_defaultBuildSelection(e){return e}_routeKeydown(e,t){return 38===t.keyCode||40===t.keyCode?this._handleKeyUpDown(e,t):13===t.keyCode?this._handleKeyEnter(e,t):9===t.keyCode?this._handleKeyTab(e,t):27===t.keyCode?this._handleKeyESC(e,t):void 0}_handleKeyTab(e,t){e.actions.close(t)}_handleKeyESC(e,t){e.actions.close(t)}_handleKeyEnter(e,t){if(e.isOpen&&void 0!==e.highlighted)return e.actions.choose(e.highlighted,t),t.stopImmediatePropagation(),!1}_handleKeySpace(e,t){null!==t.target&&["TEXTAREA","INPUT"].includes(t.target.nodeName)?t.stopImmediatePropagation():e.isOpen&&void 0!==e.highlighted&&(t.stopImmediatePropagation(),t.preventDefault(),e.actions.choose(e.highlighted,t))}_handleKeyUpDown(e,t){if(e.isOpen){t.preventDefault(),t.stopPropagation()
+let n=40===t.keyCode?1:-1,i=(0,r.advanceSelectableOption)(e.results,e.highlighted,n)
+e.actions.highlight(i),e.actions.scrollTo(i)}else e.actions.open(t)}_resetHighlighted(){let e,t=this.args.defaultHighlighted||r.defaultHighlighted
+e="function"==typeof t?t({results:this.results,highlighted:this.highlighted,selected:this.selected}):t,this._highlight(e)}_filter(e,t,n=!1){let i=Q(this.args.matcher||r.defaultMatcher,r.defaultMatcher,this.args.searchField)
+return(0,r.filterOptions)(e||[],t,i,n)}_updateIsActive(e){this.isActive=e}findWithOffset(e,t,n,i=!1){let o=Q(this.args.typeAheadOptionMatcher||r.defaultTypeAheadMatcher,r.defaultTypeAheadMatcher,this.args.searchField)
+return(0,r.findOptionWithOffset)(e||[],t,o,n,i)}*triggerTypingTask(e){let t,n=1,o=this._repeatingChar,a=e.keyCode
+X(e)&&(a-=48)
+let s=String.fromCharCode(a)
+t=s===this._repeatingChar?s:this._expirableSearchText+s,t.length>1?(n=0,o=""):o=s,this.storedAPI.isOpen&&this.storedAPI.highlighted?n+=(0,r.indexOfOption)(this.storedAPI.options,this.storedAPI.highlighted):!this.storedAPI.isOpen&&this.selected?n+=(0,r.indexOfOption)(this.storedAPI.options,this.selected):n=0,this._expirableSearchText=this._expirableSearchText+s,this._repeatingChar=o
+let l=this.findWithOffset(this.storedAPI.options,t,n,!0)
+void 0!==l&&(this.storedAPI.isOpen?(this.storedAPI.actions.highlight(l),this.storedAPI.actions.scrollTo(l)):this.storedAPI.actions.select(l,e)),yield(0,i.timeout)(1e3),this._expirableSearchText="",this._repeatingChar=""}},j=q(R.prototype,"_resolvedOptions",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=q(R.prototype,"_resolvedSelected",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=q(R.prototype,"_repeatingChar",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),I=q(R.prototype,"_expirableSearchText",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),L=q(R.prototype,"_searchResult",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=q(R.prototype,"isActive",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),z=q(R.prototype,"loading",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return!1}}),U=q(R.prototype,"searchText",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),H=q(R.prototype,"lastSearchedText",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),B=q(R.prototype,"highlighted",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),q(R.prototype,"handleOpen",[m],Object.getOwnPropertyDescriptor(R.prototype,"handleOpen"),R.prototype),q(R.prototype,"handleClose",[v],Object.getOwnPropertyDescriptor(R.prototype,"handleClose"),R.prototype),q(R.prototype,"handleInput",[g],Object.getOwnPropertyDescriptor(R.prototype,"handleInput"),R.prototype),q(R.prototype,"handleKeydown",[b],Object.getOwnPropertyDescriptor(R.prototype,"handleKeydown"),R.prototype),q(R.prototype,"handleTriggerKeydown",[y],Object.getOwnPropertyDescriptor(R.prototype,"handleTriggerKeydown"),R.prototype),q(R.prototype,"handleFocus",[_],Object.getOwnPropertyDescriptor(R.prototype,"handleFocus"),R.prototype),q(R.prototype,"handleBlur",[w],Object.getOwnPropertyDescriptor(R.prototype,"handleBlur"),R.prototype),q(R.prototype,"_search",[E],Object.getOwnPropertyDescriptor(R.prototype,"_search"),R.prototype),q(R.prototype,"_updateOptions",[x],Object.getOwnPropertyDescriptor(R.prototype,"_updateOptions"),R.prototype),q(R.prototype,"_updateHighlighted",[O],Object.getOwnPropertyDescriptor(R.prototype,"_updateHighlighted"),R.prototype),q(R.prototype,"_updateSelected",[S],Object.getOwnPropertyDescriptor(R.prototype,"_updateSelected"),R.prototype),q(R.prototype,"_highlight",[T],Object.getOwnPropertyDescriptor(R.prototype,"_highlight"),R.prototype),q(R.prototype,"_select",[M],Object.getOwnPropertyDescriptor(R.prototype,"_select"),R.prototype),q(R.prototype,"_choose",[A],Object.getOwnPropertyDescriptor(R.prototype,"_choose"),R.prototype),q(R.prototype,"_scrollTo",[P],Object.getOwnPropertyDescriptor(R.prototype,"_scrollTo"),R.prototype),q(R.prototype,"_registerAPI",[C],Object.getOwnPropertyDescriptor(R.prototype,"_registerAPI"),R.prototype),q(R.prototype,"_performSearch",[k],Object.getOwnPropertyDescriptor(R.prototype,"_performSearch"),R.prototype),q(R.prototype,"triggerTypingTask",[n.restartableTask],Object.getOwnPropertyDescriptor(R.prototype,"triggerTypingTask"),R.prototype),R)
+function Q(e,t,r){return r&&e===t?(t,n)=>e(Ember.get(t,r),n):(t,r)=>e(t,r)}function X(e){return e.keyCode>=96&&e.keyCode<=105}e.default=J
+const Z=e=>"function"==typeof e.toArray?e.toArray():e
+Ember._setComponentTemplate(W,J)})),define("ember-power-select/components/power-select/before-options",["exports","@glimmer/component"],(function(e,t){"use strict"
+var r,n,i,o
+function a(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const s=Ember.HTMLBars.template({id:"JCvYnh3q",block:'{"symbols":["@select","@listboxId","@searchPlaceholder","@onInput","@onFocus","@onBlur","@searchEnabled"],"statements":[[6,[37,3],[[32,7]],null,[["default"],[{"statements":[[2,"  "],[10,"div"],[14,0,"ember-power-select-search"],[12],[2,"\\n    "],[11,"input"],[24,"autocomplete","off"],[24,"autocorrect","off"],[24,"autocapitalize","off"],[16,"spellcheck",false],[24,"role","combobox"],[24,0,"ember-power-select-search-input"],[16,2,[32,1,["searchText"]]],[16,"aria-controls",[32,2]],[16,"placeholder",[32,3]],[24,4,"search"],[4,[38,0],["input",[32,4]],null],[4,[38,0],["focus",[32,5]],null],[4,[38,0],["blur",[32,6]],null],[4,[38,0],["keydown",[32,0,["handleKeydown"]]],null],[4,[38,1],[[32,0,["focusInput"]]],null],[4,[38,2],[[32,0,["clearSearch"]]],null],[12],[13],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["on","did-insert","will-destroy","if"]}',meta:{moduleName:"ember-power-select/components/power-select/before-options.hbs"}})
+let l=(r=Ember._action,n=Ember._action,i=Ember._action,a((o=class extends t.default{clearSearch(){Ember.run.scheduleOnce("actions",this.args.select.actions,"search","")}handleKeydown(e){if(!1===this.args.onKeydown(e))return!1
+13===e.keyCode&&this.args.select.actions.close(e)}focusInput(e){Ember.run.later(()=>{!1!==this.args.autofocus&&e.focus()},0)}}).prototype,"clearSearch",[r],Object.getOwnPropertyDescriptor(o.prototype,"clearSearch"),o.prototype),a(o.prototype,"handleKeydown",[n],Object.getOwnPropertyDescriptor(o.prototype,"handleKeydown"),o.prototype),a(o.prototype,"focusInput",[i],Object.getOwnPropertyDescriptor(o.prototype,"focusInput"),o.prototype),o)
+e.default=l,Ember._setComponentTemplate(s,l)})),define("ember-power-select/components/power-select/no-matches-message",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"9kdvJj2b",block:'{"symbols":["@noMatchesMessage"],"statements":[[6,[37,0],[[32,1]],null,[["default"],[{"statements":[[2,"  "],[10,"ul"],[14,0,"ember-power-select-options"],[14,"role","listbox"],[12],[2,"\\n    "],[10,"li"],[14,0,"ember-power-select-option ember-power-select-option--no-matches-message"],[14,"role","option"],[12],[2,"\\n      "],[1,[32,1]],[2,"\\n    "],[13],[2,"\\n  "],[13],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["if"]}',meta:{moduleName:"ember-power-select/components/power-select/no-matches-message.hbs"}})
+var r=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=r})),define("ember-power-select/components/power-select/options",["exports","@glimmer/component"],(function(e,t){"use strict"
+var r,n,i
+function o(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function a(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const s=Ember.HTMLBars.template({id:"PR3uZfwY",block:'{"symbols":["Group","Options","opt","index","option","@select","@groupIndex","&default","@extra","@optionsComponent","@groupComponent","@options","@loadingMessage","&attrs"],"statements":[[11,"ul"],[24,"role","listbox"],[16,"aria-controls",[31,["ember-power-select-trigger-",[32,6,["uniqueId"]]]]],[17,14],[4,[38,6],[[32,0,["addHandlers"]]],null],[4,[38,7],[[32,0,["removeHandlers"]]],null],[12],[2,"\\n"],[6,[37,1],[[32,6,["loading"]]],null,[["default"],[{"statements":[[6,[37,1],[[32,13]],null,[["default"],[{"statements":[[2,"      "],[10,"li"],[14,0,"ember-power-select-option ember-power-select-option--loading-message"],[14,"role","option"],[12],[1,[32,13]],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]],[6,[37,9],[[30,[36,8],[[32,11]],null],[30,[36,8],[[32,10]],null]],null,[["default"],[{"statements":[[6,[37,5],[[30,[36,4],[[30,[36,4],[[32,12]],null]],null]],null,[["default"],[{"statements":[[6,[37,1],[[30,[36,3],[[32,3]],null]],null,[["default","else"],[{"statements":[[2,"        "],[8,[32,1],[],[["@group","@select","@extra"],[[32,3],[32,6],[32,9]]],[["default"],[{"statements":[[2,"\\n          "],[8,[32,2],[[24,"role","group"],[24,0,"ember-power-select-options"]],[["@options","@select","@groupIndex","@optionsComponent","@groupComponent","@extra"],[[32,3,["options"]],[32,6],[31,[[32,7],[32,4],"."]],[32,10],[32,11],[32,9]]],[["default"],[{"statements":[[2,"\\n            "],[18,8,[[32,5],[32,6]]],[2,"\\n          "]],"parameters":[5]}]]],[2,"\\n        "]],"parameters":[]}]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"        "],[10,"li"],[14,0,"ember-power-select-option"],[15,"aria-selected",[31,[[30,[36,0],[[32,3],[32,6,["selected"]]],null]]]],[15,"aria-disabled",[30,[36,1],[[32,3,["disabled"]],"true"],null]],[15,"aria-current",[31,[[30,[36,2],[[32,3],[32,6,["highlighted"]]],null]]]],[15,"data-option-index",[31,[[32,7],[32,4]]]],[15,"role",[30,[36,1],[[30,[36,2],[[32,3],[32,6,["highlighted"]]],null],"alert","option"],null]],[12],[2,"\\n          "],[18,8,[[32,3],[32,6]]],[2,"\\n        "],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[3,4]}]]]],"parameters":[1,2]}]]],[13],[2,"\\n"]],"hasEval":false,"upvars":["ember-power-select-is-selected","if","eq","ember-power-select-is-group","-track-array","each","did-insert","will-destroy","component","let"]}',meta:{moduleName:"ember-power-select/components/power-select/options.hbs"}}),l=!!window&&"ontouchstart"in window
+var u
+"undefined"==typeof FastBoot&&("function"!=typeof(u=window.Element.prototype).matches&&(u.matches=u.msMatchesSelector||u.mozMatchesSelector||u.webkitMatchesSelector),"function"!=typeof u.closest&&(u.closest=function(e){let t=this
+for(;null!==t&&1===t.nodeType;){if(t.matches(e))return t
+t=t.parentNode}return null}))
+let c=(r=Ember._action,n=Ember._action,a((i=class extends t.default{constructor(...e){super(...e),o(this,"isTouchDevice",l),o(this,"hasMoved",!1),o(this,"mouseOverHandler",()=>{}),o(this,"mouseUpHandler",()=>{}),o(this,"touchEndHandler",()=>{}),o(this,"touchMoveHandler",()=>{}),o(this,"touchStartHandler",()=>{})}addHandlers(e){let t=e.getAttribute("role")
+if("group"===t)return
+let r=(e,t,r)=>{if(null===r.target)return
+let n=r.target.closest("[data-option-index]")
+if(!n)return
+if(n.closest("[aria-disabled=true]"))return
+let i=n.getAttribute("data-option-index")
+null!==i&&e(this._optionFromIndex(i),t,r)}
+this.mouseUpHandler=e=>r(this.args.select.actions.choose,this.args.select,e),e.addEventListener("mouseup",this.mouseUpHandler),this.args.highlightOnHover&&(this.mouseOverHandler=e=>r(this.args.select.actions.highlight,this.args.select,e),e.addEventListener("mouseover",this.mouseOverHandler)),this.isTouchDevice&&(this.touchMoveHandler=()=>{this.hasMoved=!0,e&&e.removeEventListener("touchmove",this.touchMoveHandler)},this.touchStartHandler=()=>{e.addEventListener("touchmove",this.touchMoveHandler)},this.touchEndHandler=e=>{if(null===e.target)return
+let t=e.target.closest("[data-option-index]")
+if(null===t)return
+if(e.preventDefault(),this.hasMoved)return void(this.hasMoved=!1)
+if(t.closest("[aria-disabled=true]"))return
+let r=t.getAttribute("data-option-index")
+null!==r&&this.args.select.actions.choose(this._optionFromIndex(r),e)},e.addEventListener("touchstart",this.touchStartHandler),e.addEventListener("touchend",this.touchEndHandler)),"group"!==t&&this.args.select.actions.scrollTo(this.args.select.highlighted)}removeHandlers(e){e.removeEventListener("mouseup",this.mouseUpHandler),e.removeEventListener("mouseover",this.mouseOverHandler),e.removeEventListener("touchstart",this.touchStartHandler),e.removeEventListener("touchmove",this.touchMoveHandler),e.removeEventListener("touchend",this.touchEndHandler)}_optionFromIndex(e){let t=e.split("."),r=this.args.options[parseInt(t[0],10)]
+for(let n=1;n<t.length;n++)r=r.options[parseInt(t[n],10)]
+return r}}).prototype,"addHandlers",[r],Object.getOwnPropertyDescriptor(i.prototype,"addHandlers"),i.prototype),a(i.prototype,"removeHandlers",[n],Object.getOwnPropertyDescriptor(i.prototype,"removeHandlers"),i.prototype),i)
+e.default=c,Ember._setComponentTemplate(s,c)})),define("ember-power-select/components/power-select/placeholder",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"fyXJq24a",block:'{"symbols":["&attrs","@placeholder"],"statements":[[6,[37,0],[[32,2]],null,[["default"],[{"statements":[[2,"  "],[11,"span"],[24,0,"ember-power-select-placeholder"],[17,1],[12],[1,[32,2]],[13],[2,"\\n"]],"parameters":[]}]]]],"hasEval":false,"upvars":["if"]}',meta:{moduleName:"ember-power-select/components/power-select/placeholder.hbs"}})
+var r=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=r})),define("ember-power-select/components/power-select/power-select-group",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"gRIzKR0I",block:'{"symbols":["@group","&default"],"statements":[[10,"li"],[14,0,"ember-power-select-group"],[15,"aria-disabled",[30,[36,0],[[32,1,["disabled"]],"true"],null]],[14,"role","option"],[12],[2,"\\n  "],[10,"span"],[14,0,"ember-power-select-group-name"],[12],[1,[32,1,["groupName"]]],[13],[2,"\\n  "],[18,2,null],[2,"\\n"],[13]],"hasEval":false,"upvars":["if"]}',meta:{moduleName:"ember-power-select/components/power-select/power-select-group.hbs"}})
+var r=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=r})),define("ember-power-select/components/power-select/search-message",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const t=Ember.HTMLBars.template({id:"oe+4Lxk0",block:'{"symbols":["@searchMessage"],"statements":[[10,"ul"],[14,0,"ember-power-select-options"],[14,"role","listbox"],[12],[2,"\\n  "],[10,"li"],[14,0,"ember-power-select-option ember-power-select-option--search-message"],[14,"role","option"],[12],[2,"\\n    "],[1,[32,1]],[2,"\\n  "],[13],[2,"\\n"],[13]],"hasEval":false,"upvars":[]}',meta:{moduleName:"ember-power-select/components/power-select/search-message.hbs"}})
+var r=Ember._setComponentTemplate(t,Ember._templateOnlyComponent())
+e.default=r})),define("ember-power-select/components/power-select/trigger",["exports","@glimmer/component"],(function(e,t){"use strict"
+var r,n
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const i=Ember.HTMLBars.template({id:"pvEf5syi",block:'{"symbols":["@placeholder","@placeholderComponent","@select","&default","@extra","@selectedItemComponent","@allowClear"],"statements":[[6,[37,3],[[32,3,["selected"]]],null,[["default","else"],[{"statements":[[6,[37,3],[[32,6]],null,[["default","else"],[{"statements":[[2,"    "],[1,[30,[36,0],[[32,6]],[["extra","option","select"],[[30,[36,2],[[32,5]],null],[30,[36,2],[[32,3,["selected"]]],null],[30,[36,2],[[32,3]],null]]]]],[2,"\\n"]],"parameters":[]},{"statements":[[2,"    "],[10,"span"],[14,0,"ember-power-select-selected-item"],[12],[18,4,[[32,3,["selected"]],[32,3]]],[13],[2,"\\n"]],"parameters":[]}]]],[6,[37,3],[[30,[36,5],[[32,7],[30,[36,4],[[32,3,["disabled"]]],null]],null]],null,[["default"],[{"statements":[[2,"    "],[11,"span"],[24,0,"ember-power-select-clear-btn"],[4,[38,1],["mousedown",[32,0,["clear"]]],null],[4,[38,1],["touchstart",[32,0,["clear"]]],null],[12],[2,"×"],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[2,"  "],[1,[30,[36,0],[[32,2]],[["placeholder"],[[32,1]]]]],[2,"\\n"]],"parameters":[]}]]],[10,"span"],[14,0,"ember-power-select-status-icon"],[12],[13],[2,"\\n"]],"hasEval":false,"upvars":["component","on","readonly","if","not","and"]}',meta:{moduleName:"ember-power-select/components/power-select/trigger.hbs"}})
+let o=(r=Ember._action,n=class extends t.default{clear(e){if(e.stopPropagation(),this.args.select.actions.select(null),"touchstart"===e.type)return!1}},a=n.prototype,s="clear",l=[r],u=Object.getOwnPropertyDescriptor(n.prototype,"clear"),c=n.prototype,d={},Object.keys(u).forEach((function(e){d[e]=u[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=l.slice().reverse().reduce((function(e,t){return t(a,s,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(a,s,d),d=null),n)
+var a,s,l,u,c,d
+e.default=o,Ember._setComponentTemplate(i,o)})),define("ember-power-select/helpers/ember-power-select-is-group",["exports","ember-power-select/utils/group-utils"],(function(e,t){"use strict"
+function r([e]){return(0,t.isGroup)(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.emberPowerSelectIsGroup=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-power-select/helpers/ember-power-select-is-selected",["exports"],(function(e){"use strict"
+function t([e,t]){if(null==t)return!1
+if(Ember.isArray(t)){for(let r=0;r<t.length;r++)if(Ember.isEqual(t[r],e))return!0
+return!1}return Ember.isEqual(e,t)}Object.defineProperty(e,"__esModule",{value:!0}),e.emberPowerSelectIsSelected=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-power-select/utils/computed-fallback-if-undefined",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return Ember.computed({get:()=>e,set:(t,r)=>void 0===r?e:r})}})),define("ember-power-select/utils/group-utils",["exports"],(function(e){"use strict"
+function t(e){return!!e&&!!Ember.get(e,"groupName")&&!!Ember.get(e,"options")}function r(e){let r=0
+return function e(n){if(n)for(let i=0;i<Ember.get(n,"length");i++){let o=n.objectAt?n.objectAt(i):n[i]
+t(o)?e(Ember.get(o,"options")):r++}}(e),r}function n(e,r){let n=0
+return function e(i){if(!i)return-1
+for(let o=0;o<Ember.get(i,"length");o++){let a=i.objectAt?i.objectAt(o):i[o]
+if(t(a)){let t=e(Ember.get(a,"options"))
+if(t>-1)return t}else{if(a===r)return n
+n++}}return-1}(e)}function i(e,r){let n=0
+return function e(i,o){if(!i||r<0)return{disabled:!1,option:void 0}
+let a=0,s=Ember.get(i,"length")
+for(;n<=r&&a<s;){let s=i.objectAt?i.objectAt(a):i[a]
+if(t(s)){let t=e(Ember.get(s,"options"),o||!!Ember.get(s,"disabled"))
+if(t)return t}else{if(n===r)return{disabled:o||!!Ember.get(s,"disabled"),option:s}
+n++}a++}}(e,!1)||{disabled:!1,option:void 0}}function o(e,t){let r={groupName:e.groupName,options:t}
+return e.hasOwnProperty("disabled")&&(r.disabled=e.disabled),r}function a(e,t,o){let a=r(e),s=Math.min(Math.max(n(e,t)+o,0),a-1),{disabled:l,option:u}=i(e,s)
+for(;u&&l;){let t=i(e,s+=o)
+l=t.disabled,u=t.option}return u}Object.defineProperty(e,"__esModule",{value:!0}),e.isGroup=t,e.countOptions=r,e.indexOfOption=n,e.optionAtIndex=i,e.findOptionWithOffset=function(e,r,n,i,o=!1){let a,s=0,l=!1,u=()=>!!l
+return function e(c,d){let h=Ember.get(c,"length")
+for(let f=0;f<h;f++){let h=c.objectAt?c.objectAt(f):c[f],p=!!Ember.get(h,"disabled")
+if(!o||!p){if(t(h)){if(e(Ember.get(h,"options"),d||p),u())return}else n(h,r)>=0?(s<i?a||(a=h):l=h,s++):s++
+if(u())return}}}(e,!1),l||a},e.filterOptions=function e(r,n,i,a=!1){let s=Ember.A(),l=Ember.get(r,"length")
+for(let u=0;u<l;u++){let l=r.objectAt?r.objectAt(u):r[u]
+if(!a||!Ember.get(l,"disabled"))if(t(l)){let t=e(Ember.get(l,"options"),n,i,a)
+Ember.get(t,"length")>0&&s.push(o(l,t))}else i(l,n)>=0&&s.push(l)}return s},e.defaultHighlighted=function({results:e,highlighted:t,selected:r}){let i=t||r
+if(void 0===i||-1===n(e,i))return a(e,i,1)
+return i},e.advanceSelectableOption=a,e.stripDiacritics=l,e.defaultMatcher=function(e,t){return l(e).toUpperCase().indexOf(l(t).toUpperCase())},e.defaultTypeAheadMatcher=function(e,t){return l(e).toUpperCase().startsWith(l(t).toUpperCase())?1:-1}
+const s={"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ω":"ω","ς":"σ"}
+function l(e){return(""+e).replace(/[^\u0000-\u007E]/g,(function(e){return s[e]||e}))}})),define("ember-ref-modifier/modifiers/ref",["exports"],(function(e){"use strict"
+function t(e){return"object"==typeof e&&null!==e&&!Array.isArray(e)}function r(e){return"string"==typeof e}function n([e,t]){return"function"==typeof e?{cb:e}:{target:e,propName:t}}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var i=Ember._setModifierManager(()=>({_runCache:new Set,capabilities:Ember._modifierManagerCapabilities?Ember._modifierManagerCapabilities("3.13"):void 0,createModifier:()=>({element:void 0,propName:void 0,cb:void 0,target:void 0}),installModifier(e,i,{positional:o}){const{propName:a,target:s,cb:l}=n(o)
+if(l)return e.cb=l,void this._runInContext(l,i)
+r(a)&&t(s)&&(this._setInContext(s,a,i),e.propName=a,e.target=s),e.element=i},updateModifier(e,{positional:i}){const{propName:o,target:a,cb:s}=n(i)
+if(s)return e.cb=s,void this._runInContext(s,e.element)
+r(o)&&t(a)&&(r(e.propName)&&t(e.target)&&Ember.get(a,o)!==Ember.get(e.target,e.propName)&&this._setInContext(e.target,e.propName,null),this._setInContext(a,o,e.element),e.propName=o,e.target=a)},_setInContext(e,t,r){const n=Ember.run.next(this,"_setValues",e,t,r)
+this._runCache.add(n)},_runInContext(e,t){const r=Ember.run.next(this,"_runCb",e,t)
+this._runCache.add(r)},_runCb(e,t){e(t)},_setValues(e,t,r){e.isDestroyed||e.isDestroying||Ember.set(e,t,r)},destroyModifier({target:e,propName:n,cb:i}){this._runCache.forEach(e=>Ember.run.cancel(e)),i||r(n)&&t(e)&&this._setInContext(e,n,null)}}),class{})
+e.default=i})),define("ember-render-helpers/helpers/did-insert",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class t extends Ember.Helper{constructor(...e){var t,r,n
+super(...e),n=!1,(r="didRun")in(t=this)?Object.defineProperty(t,r,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[r]=n}compute(e,t){const r=e[0]
+this.didRun||(this.didRun=!0,r(e.slice(1),t))}}e.default=t})),define("ember-render-helpers/helpers/did-update",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class t extends Ember.Helper{constructor(...e){var t,r,n
+super(...e),n=!1,(r="didRun")in(t=this)?Object.defineProperty(t,r,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[r]=n}compute(e,t){const r=e[0]
+if(!this.didRun)return this.didRun=!0,e.forEach(()=>{}),void Object.values(t)
+r(e.slice(1),t)}}e.default=t})),define("ember-render-helpers/helpers/will-destroy",["exports"],(function(e){"use strict"
+function t(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class r extends Ember.Helper{constructor(...e){super(...e),t(this,"fn",void 0),t(this,"positional",void 0),t(this,"named",void 0)}compute(e,t){const r=e[0]
+this.fn=r,this.positional=e.slice(1),this.named=t}willDestroy(){if(this.fn&&this.positional&&this.named){const{fn:e}=this
+e(this.positional,this.named)}super.willDestroy()}}e.default=r})),define("ember-render-helpers/types",[],(function(){})),define("ember-require-module/index",["exports","require"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r="default"){if(t.default.has(e))return(0,t.default)(e)[r]}})),define("ember-resize-observer-service/services/resize-observer",["exports","ember-resize-observer-service/utils/ignore-ro-error"],(function(e,t){"use strict"
+var r,n
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let i=(r=Ember._action,n=class extends Ember.Service{init(...e){super.init(...e),this.setup()}setup(){this.callbacks=null,this.observer=null,"undefined"==typeof FastBoot&&"undefined"!=typeof window&&window.ResizeObserver&&((0,t.default)(),this.callbacks=new WeakMap,this.observer=new window.ResizeObserver(this.handleResize))}get isEnabled(){return!!this.observer}observe(e,t){if(!this.isEnabled)return
+const r=this.callbacks.get(e)
+r?r.add(t):(this.callbacks.set(e,new Set([t])),this.observer.observe(e))}unobserve(e,t){if(!this.isEnabled)return
+const r=this.callbacks.get(e)
+r&&(r.delete(t),t&&r.size||(this.callbacks.delete(e),this.observer.unobserve(e)))}clear(){this.isEnabled&&(this.callbacks=new WeakMap,this.observer.disconnect())}willDestroy(){this.clear()}handleResize(e){for(const t of e){const e=this.callbacks.get(t.target)
+if(e)for(const r of e)r(t)}}},o=n.prototype,a="handleResize",s=[r],l=Object.getOwnPropertyDescriptor(n.prototype,"handleResize"),u=n.prototype,c={},Object.keys(l).forEach((function(e){c[e]=l[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=s.slice().reverse().reduce((function(e,t){return t(o,a,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(o,a,c),c=null),n)
+var o,a,s,l,u,c
+e.default=i})),define("ember-resize-observer-service/utils/ignore-ro-error",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){if("function"!=typeof window.onerror)return
+const e=window.onerror
+window.onerror=(t,...r)=>{if("ResizeObserver loop limit exceeded"===t)return!0
+e(t,...r)}}})),define("ember-resolver/features",[],(function(){})),define("ember-resolver/index",["exports","ember-resolver/resolvers/classic"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-resolver/resolver",["exports","ember-resolver/resolvers/classic"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("ember-resolver/resolvers/classic/container-debug-adapter",["exports","ember-resolver/resolvers/classic/index"],(function(e,t){"use strict"
+function r(e,t,r){let n=t.match(new RegExp("^/?"+r+"/(.+)/"+e+"$"))
+if(null!==n)return n[1]}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var n=Ember.ContainerDebugAdapter.extend({_moduleRegistry:null,init(){this._super(...arguments),this._moduleRegistry||(this._moduleRegistry=new t.ModuleRegistry)},canCatalogEntriesByType(e){return"model"===e||this._super(...arguments)},catalogEntriesByType(e){let t=this._moduleRegistry.moduleNames(),n=Ember.A(),i=this.namespace.modulePrefix
+for(let o=0,a=t.length;o<a;o++){let a=t[o]
+if(-1!==a.indexOf(e)){let t=r(e,a,this.namespace.podModulePrefix||i)
+t||(t=a.split(e+"s/").pop()),n.addObject(t)}}return n}})
+e.default=n})),define("ember-resolver/resolvers/classic/index",["exports","ember-resolver/utils/class-factory"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.ModuleRegistry=void 0,void 0===requirejs.entries&&(requirejs.entries=requirejs._eak_seen)
+class r{constructor(e){this._entries=e||requirejs.entries}moduleNames(){return Object.keys(this._entries)}has(e){return e in this._entries}get(e){return require(e)}}e.ModuleRegistry=r
+const n=Ember.Object.extend({resolveOther:function(e){let r=this.findModuleName(e)
+if(r){let n=this._extractDefaultExport(r,e)
+if(void 0===n)throw new Error(` Expected to find: '${e.fullName}' within '${r}' but got 'undefined'. Did you forget to 'export default' within '${r}'?`)
+return this.shouldWrapInClassFactory(n,e)&&(n=(0,t.default)(n)),n}},parseName:function(e){if(!0===e.parsedName)return e
+let t,r,n,i=e.split("@")
+if(3===i.length){if(0===i[0].length){t="@"+i[1]
+let e=i[2].split(":")
+r=e[0],n=e[1]}else t="@"+i[1],r=i[0].slice(0,-1),n=i[2]
+"template:components"===r&&(n="components/"+n,r="template")}else if(2===i.length){let e=i[0].split(":")
+if(2===e.length)0===e[1].length?(r=e[0],n="@"+i[1]):(t=e[1],r=e[0],n=i[1])
+else{let e=i[1].split(":")
+t=i[0],r=e[0],n=e[1]}"template"===r&&0===t.lastIndexOf("components/",0)&&(n="components/"+n,t=t.slice(11))}else i=e.split(":"),r=i[0],n=i[1]
+let o=n,a=Ember.get(this,"namespace")
+return{parsedName:!0,fullName:e,prefix:t||this.prefix({type:r}),type:r,fullNameWithoutType:o,name:n,root:a,resolveMethodName:"resolve"+Ember.String.classify(r)}},pluralizedTypes:null,moduleRegistry:null,makeToString(e,t){return this.namespace.modulePrefix+"@"+t+":"},shouldWrapInClassFactory:()=>!1,init(){this._super(),this.moduleBasedResolver=!0,this._moduleRegistry||(this._moduleRegistry=new r),this._normalizeCache=Object.create(null),this.pluralizedTypes=this.pluralizedTypes||Object.create(null),this.pluralizedTypes.config||(this.pluralizedTypes.config="config"),this._deprecatedPodModulePrefix=!1},normalize(e){return this._normalizeCache[e]||(this._normalizeCache[e]=this._normalize(e))},resolve(e){let t,r=this.parseName(e),n=r.resolveMethodName
+return"function"==typeof this[n]&&(t=this[n](r)),null==t&&(t=this.resolveOther(r)),t},_normalize(e){let t=e.split(":")
+if(t.length>1){let e=t[0]
+return"component"===e||"helper"===e||"modifier"===e||"template"===e&&0===t[1].indexOf("components/")?e+":"+t[1].replace(/_/g,"-"):e+":"+Ember.String.dasherize(t[1].replace(/\./g,"/"))}return e},pluralize(e){return this.pluralizedTypes[e]||(this.pluralizedTypes[e]=e+"s")},podBasedLookupWithPrefix(e,t){let r=t.fullNameWithoutType
+return"template"===t.type&&(r=r.replace(/^components\//,"")),e+"/"+r+"/"+t.type},podBasedModuleName(e){let t=this.namespace.podModulePrefix||this.namespace.modulePrefix
+return this.podBasedLookupWithPrefix(t,e)},podBasedComponentsInSubdir(e){let t=this.namespace.podModulePrefix||this.namespace.modulePrefix
+if(t+="/components","component"===e.type||/^components/.test(e.fullNameWithoutType))return this.podBasedLookupWithPrefix(t,e)},resolveEngine(e){let t=e.fullNameWithoutType+"/engine"
+if(this._moduleRegistry.has(t))return this._extractDefaultExport(t)},resolveRouteMap(e){let t=e.fullNameWithoutType,r=t+"/routes"
+if(this._moduleRegistry.has(r)){let e=this._extractDefaultExport(r)
+return e}},resolveTemplate(e){let t=this.resolveOther(e)
+return null==t&&(t=Ember.TEMPLATES[e.fullNameWithoutType]),t},mainModuleName(e){if("main"===e.fullNameWithoutType)return e.prefix+"/"+e.type},defaultModuleName(e){return e.prefix+"/"+this.pluralize(e.type)+"/"+e.fullNameWithoutType},nestedColocationComponentModuleName(e){if("component"===e.type)return e.prefix+"/"+this.pluralize(e.type)+"/"+e.fullNameWithoutType+"/index"},prefix(e){let t=this.namespace.modulePrefix
+return this.namespace[e.type+"Prefix"]&&(t=this.namespace[e.type+"Prefix"]),t},moduleNameLookupPatterns:Ember.computed((function(){return[this.podBasedModuleName,this.podBasedComponentsInSubdir,this.mainModuleName,this.defaultModuleName,this.nestedColocationComponentModuleName]})).readOnly(),findModuleName(e,t){let r,n=this.get("moduleNameLookupPatterns")
+for(let i=0,o=n.length;i<o;i++){let o=n[i].call(this,e)
+if(o&&(o=this.chooseModuleName(o,e)),o&&this._moduleRegistry.has(o)&&(r=o),t||this._logLookup(r,e,o),r)return r}},chooseModuleName(e,t){let r=Ember.String.underscore(e)
+if(e!==r&&this._moduleRegistry.has(e)&&this._moduleRegistry.has(r))throw new TypeError(`Ambiguous module names: '${e}' and '${r}'`)
+if(this._moduleRegistry.has(e))return e
+if(this._moduleRegistry.has(r))return r
+let n=e.replace(/\/-([^/]*)$/,"/_$1")
+if(this._moduleRegistry.has(n))return n},lookupDescription(e){let t=this.parseName(e)
+return this.findModuleName(t,!0)},_logLookup(e,t,r){if(!Ember.ENV.LOG_MODULE_RESOLVER&&!t.root.LOG_RESOLVER)return
+let n,i=e?"[✓]":"[ ]"
+n=t.fullName.length>60?".":new Array(60-t.fullName.length).join("."),r||(r=this.lookupDescription(t)),console&&console.info&&console.info(i,t.fullName,n,r)},knownForType(e){let t=this._moduleRegistry.moduleNames(),r=Object.create(null)
+for(let n=0,i=t.length;n<i;n++){let i=t[n],o=this.translateToContainerFullname(e,i)
+o&&(r[o]=!0)}return r},translateToContainerFullname(e,t){let r=this.prefix({type:e}),n=r+"/",i="/"+e,o=t.indexOf(n),a=t.indexOf(i)
+if(0===o&&a===t.length-i.length&&t.length>n.length+i.length)return e+":"+t.slice(o+n.length,a)
+let s=r+"/"+this.pluralize(e)+"/"
+return 0===t.indexOf(s)&&t.length>s.length?e+":"+t.slice(s.length):void 0},_extractDefaultExport(e){let t=require(e,null,null,!0)
+return t&&t.default&&(t=t.default),t}})
+n.reopenClass({moduleBasedResolver:!0})
+var i=n
+e.default=i})),define("ember-resolver/utils/class-factory",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return{create:t=>"function"==typeof e.extend?e.extend(t):e}}})),define("ember-route-action-helper/-private/internals",["exports"],(function(e){"use strict"
+let t
+Object.defineProperty(e,"__esModule",{value:!0}),t="ember-htmlbars/keywords/closure-action"in Ember.__loader.registry?Ember.__loader.require("ember-htmlbars/keywords/closure-action"):"ember-routing-htmlbars/keywords/closure-action"in Ember.__loader.registry?Ember.__loader.require("ember-routing-htmlbars/keywords/closure-action"):{}
+e.ACTION=t.ACTION})),define("ember-route-action-helper/helpers/route-action",["exports","ember-route-action-helper/-private/internals"],(function(e,t){"use strict"
+function r(e,t){let r,n=Ember.A(function(e){var t=function(e){let t=e._routerMicrolib||e.router
+return{currentInfos:t.currentRouteInfos||t.currentHandlerInfos,mapBy:t.currentRouteInfos?"route":"handler"}}(e)
+const r=t.currentInfos,n=t.mapBy
+return Ember.A(r).mapBy(n).reverse()}(e)).find(e=>{let n=e.actions||e._actions
+return r=n[t],"function"==typeof r})
+return{action:r,handler:n}}Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Helper.extend({router:Ember.computed((function(){return Ember.getOwner(this).lookup("router:main")})).readOnly(),compute([e,...n]){let i=Ember.get(this,"router")
+Ember.runInDebug(()=>{r(i,e).handler})
+let o=function(...t){var o=r(i,e)
+let a=o.action,s=o.handler,l=n.concat(t)
+return Ember.run.join(s,a,...l)}
+return o[t.ACTION]=!0,o}})})),define("ember-router-helpers/helpers/is-active",["exports","ember-router-helpers/utils/handle-query-params","ember-router-helpers/utils/track-active-route"],(function(e,t,r){"use strict"
+var n,i,o
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let a=(n=Ember.inject.service,i=class extends Ember.Helper{constructor(...e){var t,r,n,i
+super(...e),t=this,r="router",i=this,(n=o)&&Object.defineProperty(t,r,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(i):void 0})}compute(e){(0,r.default)(this.router)
+let n=(0,t.default)(e)
+return this.router.isActive(...n)}},s=i.prototype,l="router",u=[n],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},h={},Object.keys(c).forEach((function(e){h[e]=c[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=u.slice().reverse().reduce((function(e,t){return t(s,l,e)||e}),h),d&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(d):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(s,l,h),h=null),o=h,i)
+var s,l,u,c,d,h
+e.default=a}))
+define("ember-router-helpers/helpers/root-url",["exports"],(function(e){"use strict"
+var t,r,n
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let i=(t=Ember.inject.service,r=class extends Ember.Helper{constructor(...e){var t,r,i,o
+super(...e),t=this,r="router",o=this,(i=n)&&Object.defineProperty(t,r,{enumerable:i.enumerable,configurable:i.configurable,writable:i.writable,value:i.initializer?i.initializer.call(o):void 0})}compute(){return this.router.rootURL}},o=r.prototype,a="router",s=[t],l={configurable:!0,enumerable:!0,writable:!0,initializer:null},c={},Object.keys(l).forEach((function(e){c[e]=l[e]})),c.enumerable=!!c.enumerable,c.configurable=!!c.configurable,("value"in c||c.initializer)&&(c.writable=!0),c=s.slice().reverse().reduce((function(e,t){return t(o,a,e)||e}),c),u&&void 0!==c.initializer&&(c.value=c.initializer?c.initializer.call(u):void 0,c.initializer=void 0),void 0===c.initializer&&(Object.defineProperty(o,a,c),c=null),n=c,r)
+var o,a,s,l,u,c
+e.default=i})),define("ember-router-helpers/helpers/route-params",["exports","ember-router-helpers/utils/route-params"],(function(e,t){"use strict"
+var r,n,i
+Object.defineProperty(e,"__esModule",{value:!0}),e.setRouteParamsClass=function(e){o=e},e.default=void 0
+let o=t.default
+let a=(r=Ember.inject.service,n=class extends Ember.Helper{constructor(...e){var t,r,n,o
+super(...e),t=this,r="router",o=this,(n=i)&&Object.defineProperty(t,r,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(o):void 0})}compute(e){return new o(this.router,e)}},s=n.prototype,l="router",u=[r],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},h={},Object.keys(c).forEach((function(e){h[e]=c[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=u.slice().reverse().reduce((function(e,t){return t(s,l,e)||e}),h),d&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(d):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(s,l,h),h=null),i=h,n)
+var s,l,u,c,d,h
+e.default=a})),define("ember-router-helpers/helpers/transition-to",["exports","ember-router-helpers/utils/handle-query-params"],(function(e,t){"use strict"
+var r,n,i
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let o=(r=Ember.inject.service,n=class extends Ember.Helper{constructor(...e){var t,r,n,o
+super(...e),t=this,r="router",o=this,(n=i)&&Object.defineProperty(t,r,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(o):void 0})}compute(e){return r=>{void 0!==r&&"function"==typeof r.preventDefault&&r.preventDefault()
+let n=(0,t.default)(e)
+return this.router.transitionTo(...n)}}},a=n.prototype,s="router",l=[r],u={configurable:!0,enumerable:!0,writable:!0,initializer:null},d={},Object.keys(u).forEach((function(e){d[e]=u[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=l.slice().reverse().reduce((function(e,t){return t(a,s,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(a,s,d),d=null),i=d,n)
+var a,s,l,u,c,d
+e.default=o})),define("ember-router-helpers/helpers/url-for",["exports","ember-router-helpers/utils/handle-query-params"],(function(e,t){"use strict"
+var r,n,i
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let o=(r=Ember.inject.service,n=class extends Ember.Helper{constructor(...e){var t,r,n,o
+super(...e),t=this,r="router",o=this,(n=i)&&Object.defineProperty(t,r,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(o):void 0})}compute(e){let r=(0,t.default)(e)
+return this.router.urlFor(...r)}},a=n.prototype,s="router",l=[r],u={configurable:!0,enumerable:!0,writable:!0,initializer:null},d={},Object.keys(u).forEach((function(e){d[e]=u[e]})),d.enumerable=!!d.enumerable,d.configurable=!!d.configurable,("value"in d||d.initializer)&&(d.writable=!0),d=l.slice().reverse().reduce((function(e,t){return t(a,s,e)||e}),d),c&&void 0!==d.initializer&&(d.value=d.initializer?d.initializer.call(c):void 0,d.initializer=void 0),void 0===d.initializer&&(Object.defineProperty(a,s,d),d=null),i=d,n)
+var a,s,l,u,c,d
+e.default=o})),define("ember-router-helpers/utils/handle-query-params",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let t=e[e.length-1]
+t&&t.isQueryParams&&((e=e.slice())[e.length-1]={queryParams:t.values})
+return e}})),define("ember-router-helpers/utils/route-params",["exports","ember-router-helpers/utils/handle-query-params","ember-router-helpers/utils/track-active-route"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=class{constructor(e,t){this._router=e,this._inputParams=t,this._transitionTo=void 0,this._replaceWith=void 0,this._processedParams=void 0}get isActive(){return(0,r.default)(this._router),this._router.isActive(...this._params)}get url(){return this._router.urlFor(...this._params)}get transitionTo(){return void 0===this._transitionTo&&(this._transitionTo=e=>(void 0!==e&&"function"==typeof e.preventDefault&&e.preventDefault(),this._router.transitionTo(...this._params))),this._transitionTo}get replaceWith(){return void 0===this._replaceWith&&(this._replaceWith=()=>this._router.replaceWith(...this._params)),this._replaceWith}get _params(){return this._processedParams||(this._processedParams=(0,t.default)(this._inputParams)),this._processedParams}}})),define("ember-router-helpers/utils/track-active-route",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){e.currentURL,e.currentRouteName}})),define("ember-set-helper/helpers/set",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function(e){let[t,r,n]=e
+return 3===e.length?()=>Ember.set(t,r,n):e=>Ember.set(t,r,e)}))
+e.default=t})),define("ember-stargate/components/portal-target",["exports","@glimmer/component"],(function(e,t){"use strict"
+var r,n,i,o,a
+function s(e,t,r,n,i){var o={}
+return Object.keys(n).forEach((function(e){o[e]=n[e]})),o.enumerable=!!o.enumerable,o.configurable=!!o.configurable,("value"in o||o.initializer)&&(o.writable=!0),o=r.slice().reverse().reduce((function(r,n){return n(e,t,r)||r}),o),i&&void 0!==o.initializer&&(o.value=o.initializer?o.initializer.call(i):void 0,o.initializer=void 0),void 0===o.initializer&&(Object.defineProperty(e,t,o),o=null),o}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const l=Ember.HTMLBars.template({id:"wU8EGdCa",block:'{"symbols":["&attrs","&default"],"statements":[[11,"div"],[17,1],[4,[38,0],[[32,0,["register"]]],null],[4,[38,1],[[32,0,["unregister"]]],null],[12],[2,"\\n  "],[18,2,[[32,0,["count"]]]],[2,"\\n"],[13]],"hasEval":false,"upvars":["did-insert","will-destroy"]}',meta:{moduleName:"ember-stargate/components/portal-target.hbs"}})
+let u=(r=Ember.inject.service("-portal"),n=Ember._action,i=Ember._action,o=class extends t.default{constructor(...e){var t,r,n,i
+super(...e),t=this,r="portalService",i=this,(n=a)&&Object.defineProperty(t,r,{enumerable:n.enumerable,configurable:n.configurable,writable:n.writable,value:n.initializer?n.initializer.call(i):void 0})}get count(){return this.portalService.getPortalCount(this.args.name)}register(e){const t={multiple:this.args.multiple,onChange:this.args.onChange}
+this.portalService.registerTarget(this.args.name,e,t)}unregister(){this.portalService.unregisterTarget(this.args.name)}},a=s(o.prototype,"portalService",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s(o.prototype,"register",[n],Object.getOwnPropertyDescriptor(o.prototype,"register"),o.prototype),s(o.prototype,"unregister",[i],Object.getOwnPropertyDescriptor(o.prototype,"unregister"),o.prototype),o)
+e.default=u,Ember._setComponentTemplate(l,u)})),define("ember-stargate/components/portal",["exports","@glimmer/component"],(function(e,t){"use strict"
+var r,n,i
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+const o=Ember.HTMLBars.template({id:"opUXZjsH",block:'{"symbols":["&default"],"statements":[[6,[37,1],[[32,0,["renderInPlace"]]],null,[["default","else"],[{"statements":[[2,"  "],[18,1,null],[2,"\\n"]],"parameters":[]},{"statements":[[6,[37,1],[[32,0,["target"]]],null,[["default"],[{"statements":[[6,[37,1],[[32,0,["target","multiple"]]],null,[["default","else"],[{"statements":[[6,[37,0],[[32,0,["target","element"]]],[["guid","insertBefore"],["%cursor:1%",null]],[["default"],[{"statements":[[2,"      "],[18,1,null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[6,[37,0],[[32,0,["target","element"]]],[["guid","insertBefore"],["%cursor:0%",[29]]],[["default"],[{"statements":[[2,"      "],[18,1,null],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"parameters":[]}]]]],"hasEval":false,"upvars":["in-element","if"]}',meta:{moduleName:"ember-stargate/components/portal.hbs"}})
+let a=(r=Ember.inject.service("-portal"),n=class extends t.default{constructor(){var e,t,r,n
+super(...arguments),e=this,t="portalService",n=this,(r=i)&&Object.defineProperty(e,t,{enumerable:r.enumerable,configurable:r.configurable,writable:r.writable,value:r.initializer?r.initializer.call(n):void 0}),Ember.run.next(()=>this.portalService.registerPortal(this.args.target))}get target(){return this.args.target&&this.portalService.getTarget(this.args.target)}get renderInPlace(){return!0===this.args.renderInPlace||!this.target&&"inplace"===this.args.fallback}willDestroy(){super.willDestroy(),Ember.run.next(()=>this.portalService.unregisterPortal(this.args.target))}},s=n.prototype,l="portalService",u=[r],c={configurable:!0,enumerable:!0,writable:!0,initializer:null},h={},Object.keys(c).forEach((function(e){h[e]=c[e]})),h.enumerable=!!h.enumerable,h.configurable=!!h.configurable,("value"in h||h.initializer)&&(h.writable=!0),h=u.slice().reverse().reduce((function(e,t){return t(s,l,e)||e}),h),d&&void 0!==h.initializer&&(h.value=h.initializer?h.initializer.call(d):void 0,h.initializer=void 0),void 0===h.initializer&&(Object.defineProperty(s,l,h),h=null),i=h,n)
+var s,l,u,c,d,h
+e.default=a,Ember._setComponentTemplate(o,a)})),define("ember-stargate/services/-portal",["exports","tracked-maps-and-sets"],(function(e,t){"use strict"
+function r(e,t){return function(e,t){if(t.get)return t.get.call(e)
+return t.value}(e,function(e,t,r){if(!t.has(e))throw new TypeError("attempted to "+r+" private field on non-instance")
+return t.get(e)}(e,t,"get"))}function n(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class i{constructor(e,t,r){var i
+n(this,"name",void 0),n(this,"element",void 0),n(this,"multiple",void 0),n(this,"onChange",void 0),this.name=e,this.element=t,this.multiple=null!==(i=r.multiple)&&void 0!==i&&i,this.onChange=r.onChange}}var o=new WeakMap,a=new WeakMap
+class s extends Ember.Service{constructor(...e){super(...e),o.set(this,{writable:!0,value:new t.TrackedMap}),a.set(this,{writable:!0,value:new t.TrackedMap})}getTarget(e){return r(this,o).get(e)}getPortalCount(e){var t
+return null!==(t=r(this,a).get(e))&&void 0!==t?t:0}registerTarget(e,t,n){r(this,o).set(e,new i(e,t,n))}unregisterTarget(e){r(this,o).delete(e)}registerPortal(e){var t
+const n=(null!==(t=r(this,a).get(e))&&void 0!==t?t:0)+1
+r(this,a).set(e,n)
+const i=this.getTarget(e)
+i&&i.onChange&&i.onChange(n)}unregisterPortal(e){var t
+let n=null!==(t=r(this,a).get(e))&&void 0!==t?t:0
+n--,r(this,a).set(e,n)
+const i=this.getTarget(e)
+i&&i.onChange&&i.onChange(n)}}e.default=s})),define("ember-string-fns/helpers/string-char-at",["exports"],(function(e){"use strict"
+function t([e="",t]){return e.charAt(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringCharAt=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-char-code-at",["exports"],(function(e){"use strict"
+function t([e="",t]){return e.charCodeAt(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringCharCodeAt=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-code-point-at",["exports"],(function(e){"use strict"
+function t([e="",t]){return e.codePointAt(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringCodePointAt=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-concat",["exports"],(function(e){"use strict"
+function t([...e]){return e.reduce((e,t)=>e+=t,"")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringConcat=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-ends-with",["exports"],(function(e){"use strict"
+function t([e,t,r=!1]){let n=!1
+if(e&&t){let i,o=e.length
+o-=t.length,i=r?e.toLowerCase().indexOf(t.toLowerCase(),o):e.indexOf(t,o),n=-1!==i&&i===o}return n}Object.defineProperty(e,"__esModule",{value:!0}),e.stringEndsWith=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-equals",["exports"],(function(e){"use strict"
+function t([...e]){if(e.length<2)return!1
+const t=e.shift()
+return e.every(e=>e===t)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringEquals=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-from-char-code",["exports"],(function(e){"use strict"
+function t([...e]){return String.fromCharCode(...e)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringFromCharCode=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-from-code-point",["exports"],(function(e){"use strict"
+function t([...e]){return String.fromCodePoint(...e)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringFromCodePoint=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-html-safe",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function(e){return e}))
+e.default=t})),define("ember-string-fns/helpers/string-includes",["exports"],(function(e){"use strict"
+function t([e,t,r=!1]){let n=!1
+return e&&t&&(n=r?-1!==e.toLowerCase().indexOf(t.toLowerCase()):-1!==e.indexOf(t)),n}Object.defineProperty(e,"__esModule",{value:!0}),e.stringIncludes=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-index-of",["exports"],(function(e){"use strict"
+function t([e,t,r=!1]){let n=-1
+return e&&t&&(n=r?e.toLowerCase().indexOf(t.toLowerCase()):e.indexOf(t)),n}Object.defineProperty(e,"__esModule",{value:!0}),e.stringIndexOf=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-last-index-of",["exports"],(function(e){"use strict"
+function t([e,t,r=!1]){let n=-1
+return e&&t&&(n=r?e.toLowerCase().lastIndexOf(t.toLowerCase()):e.lastIndexOf(t)),n}Object.defineProperty(e,"__esModule",{value:!0}),e.stringLastIndexOf=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-not-equals",["exports"],(function(e){"use strict"
+function t([...e]){if(e.length<2)return!1
+const t=e.shift()
+return e.some(e=>e!==t)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringNotEquals=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-pad-end",["exports"],(function(e){"use strict"
+function t([e="",t=" ",r=0]){let n=e+""
+if((t+"").length>0){for(;n.length<r;)n+=t
+n.length>r&&(n=n.substring(0,r))}return n}Object.defineProperty(e,"__esModule",{value:!0}),e.stringPadEnd=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-pad-start",["exports"],(function(e){"use strict"
+function t([e="",t=" ",r=0]){let n=e+""
+if((t+"").length>0){for(;n.length<r;)n=t+n
+n.length>r&&(n=n.substring(n.length-r,n.length))}return n}Object.defineProperty(e,"__esModule",{value:!0}),e.stringPadStart=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-repeat",["exports"],(function(e){"use strict"
+function t([e="",t=0]){let r=""
+for(let n=0;n<t;n++)r+=e
+return r}Object.defineProperty(e,"__esModule",{value:!0}),e.stringRepeat=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-replace-all",["exports","ember-string-fns/helpers/string-replace"],(function(e,t){"use strict"
+function r([e,r,n="",i=!1]){return(0,t.stringReplace)([e,r,n,i,!0])}Object.defineProperty(e,"__esModule",{value:!0}),e.stringReplaceAll=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-string-fns/helpers/string-replace",["exports"],(function(e){"use strict"
+function t([e="",t,r="",n=!1,i=!1]){if(!t)return e
+let o=t
+if(n||i){let e=""
+i&&(e+="g"),n&&(e+="i"),o=new RegExp(t,e)}return e.replace(o,r)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringReplace=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-slice",["exports"],(function(e){"use strict"
+function t([e="",t=0,r]){let n
+return n=void 0===r?e.slice(t):e.slice(t,r),n}Object.defineProperty(e,"__esModule",{value:!0}),e.stringSlice=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r}))
+define("ember-string-fns/helpers/string-split",["exports"],(function(e){"use strict"
+function t([e="",t=""]){return e.split(t)}Object.defineProperty(e,"__esModule",{value:!0}),e.stringSplit=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-starts-with",["exports"],(function(e){"use strict"
+function t([e,t,r=!1]){let n=!1
+return e&&t&&(n=r?0===e.toLowerCase().indexOf(t.toLowerCase(),0):0===e.indexOf(t,0)),n}Object.defineProperty(e,"__esModule",{value:!0}),e.stringStartsWith=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-substring",["exports"],(function(e){"use strict"
+function t([e="",t=0,r]){let n
+return n=void 0===r?e.substring(t):e.substring(t,r),n}Object.defineProperty(e,"__esModule",{value:!0}),e.stringSubstring=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-to-camel-case",["exports"],(function(e){"use strict"
+function t([e=""]){return e.toLowerCase().split(" ").map((e,t)=>0===t?e:`${e.charAt(0).toUpperCase()}${e.slice(1)}`).join("")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToCamelCase=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-to-kebab-case",["exports"],(function(e){"use strict"
+function t([e=""]){return e.toLowerCase().split(" ").join("-")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToKebabCase=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-to-lower-case",["exports"],(function(e){"use strict"
+function t([e=""]){return e.toLowerCase()}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToLowerCase=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-to-pascal-case",["exports"],(function(e){"use strict"
+function t([e=""]){return e.toLowerCase().split(" ").map(e=>`${e.charAt(0).toUpperCase()}${e.slice(1)}`).join("")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToPascalCase=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-to-sentence-case",["exports"],(function(e){"use strict"
+function t([e=""]){return e.toLowerCase().replace(/(^\s*\w|[.!?]\s*\w)/g,e=>e.toUpperCase())}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToSentenceCase=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-to-snake-case",["exports"],(function(e){"use strict"
+function t([e=""]){return e.toLowerCase().split(" ").join("_")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToSnakeCase=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-to-title-case",["exports"],(function(e){"use strict"
+function t([e=""]){return e.toLowerCase().split(" ").map(e=>`${e.charAt(0).toUpperCase()}${e.slice(1)}`).join(" ")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToTitleCase=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-to-upper-case",["exports"],(function(e){"use strict"
+function t([e=""]){return e.toUpperCase()}Object.defineProperty(e,"__esModule",{value:!0}),e.stringToUpperCase=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-trim-end",["exports"],(function(e){"use strict"
+function t([e=""]){return e.replace(/\+|[\s\uFEFF\xA0]+$/g,"")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringTrimEnd=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-trim-start",["exports"],(function(e){"use strict"
+function t([e=""]){return e.replace(/^[\s\uFEFF\xA0]+/g,"")}Object.defineProperty(e,"__esModule",{value:!0}),e.stringTrimStart=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-string-fns/helpers/string-trim",["exports"],(function(e){"use strict"
+function t([e=""]){return e.trim()}Object.defineProperty(e,"__esModule",{value:!0}),e.stringTrim=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-style-modifier/modifiers/style",["exports","ember-modifier"],(function(e,t){"use strict"
+function r(e){return"object"==typeof e&&Boolean(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+class n extends t.default{get styles(){const{positional:e,named:t}=this.args
+return[].concat(...[...e.filter(r),t].map(e=>Object.entries(e).map(([e,t])=>[Ember.String.dasherize(e),t])))}setStyles(e){const t=this._oldStyles||new Set
+e.forEach(([e,r])=>{let n=""
+r&&r.includes("!important")&&(n="important",r=r.replace("!important","")),e=Ember.String.dasherize(e),this.element.style.setProperty(e,r,n),t.delete(e)}),t.forEach(e=>this.element.style.removeProperty(e)),this._oldStyles=new Set(e.map(e=>e[0]))}didReceiveArguments(){this.setStyles(this.styles)}}e.default=n})),define("ember-test-waiters/build-waiter",["exports","ember-test-waiters","ember-test-waiters/noop-test-waiter"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){0
+return new r.default(e)}})),define("ember-test-waiters/index",["exports","ember-test-waiters/waiter-manager","ember-test-waiters/test-waiter","ember-test-waiters/build-waiter","ember-test-waiters/wait-for-promise"],(function(e,t,r,n,i){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"register",{enumerable:!0,get:function(){return t.register}}),Object.defineProperty(e,"unregister",{enumerable:!0,get:function(){return t.unregister}}),Object.defineProperty(e,"getWaiters",{enumerable:!0,get:function(){return t.getWaiters}}),Object.defineProperty(e,"_reset",{enumerable:!0,get:function(){return t._reset}}),Object.defineProperty(e,"getPendingWaiterState",{enumerable:!0,get:function(){return t.getPendingWaiterState}}),Object.defineProperty(e,"hasPendingWaiters",{enumerable:!0,get:function(){return t.hasPendingWaiters}}),Object.defineProperty(e,"TestWaiter",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"buildWaiter",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"waitForPromise",{enumerable:!0,get:function(){return i.default}})})),define("ember-test-waiters/noop-test-waiter",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+e.default=class{constructor(e){this.name=e}beginAsync(){return this}endAsync(){}waitUntil(){return!0}debugInfo(){return[]}reset(){}}})),define("ember-test-waiters/test-waiter",["exports","ember-test-waiters/waiter-manager"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+let r=0
+function n(){return r++}e.default=class{constructor(e,t){this.isRegistered=!1,this.items=new Map,this.name=e,this.nextToken=t||n}register(){this.isRegistered||((0,t.register)(this),this.isRegistered=!0)}beginAsync(e=this.nextToken(),t){if(this.register(),this.items.has(e))throw new Error(`beginAsync called for ${e} but it is already pending.`)
+let r=new Error
+return this.items.set(e,{get stack(){return r.stack},label:t}),e}endAsync(e){if(!this.items.has(e))throw new Error(`endAsync called for ${e} but it is not currently pending.`)
+this.items.delete(e)}waitUntil(){return 0===this.items.size}debugInfo(){return[...this.items.values()]}reset(){this.items.clear()}}})),define("ember-test-waiters/types/index",[],(function(){})),define("ember-test-waiters/wait-for-promise",["exports","ember-test-waiters/test-waiter"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){let t=e
+0
+return t}
+new t.default("promise-waiter")})),define("ember-test-waiters/waiter-manager",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.register=function(e){t.set(e.name,e)},e.unregister=function(e){t.delete(e.name)},e.getWaiters=function(){return[...t.values()]},e._reset=function(){t.clear()},e.getPendingWaiterState=r,e.hasPendingWaiters=n
+const t=new Map
+function r(){let e={pending:0,waiters:{}}
+return t.forEach(t=>{if(!t.waitUntil()){e.pending++
+let r=t.debugInfo()
+e.waiters[t.name]=r||!0}}),e}function n(){return r().pending>0}Ember.Test&&Ember.Test.registerWaiter(()=>!n())})),define("ember-text-measurer/services/text-measurer",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Service.extend({init(){this._super(...arguments),this.canvas=document.createElement("canvas"),this.ctx=this.canvas.getContext("2d")},width(e,t=null){return t&&(this.ctx.font=t),this.ctx.measureText(e).width},lines(e,t,r=null){r&&(this.ctx.font=r)
+let n=e.split(/\n/),i=n.length
+for(let o=0;o<n.length;o++){let e=n[o]
+if(""!==e){let r=e.split(" "),n=0,o=0
+for(;o<r.length-1;o++){let e=this.ctx.measureText(r[o]+" ").width
+n+=e,n>t&&(i++,n=e)}let a=this.ctx.measureText(r[o]).width
+n+=a,n>t&&(i++,n=a)}}return i},fitTextSize(e,t,r=null){let n=this.width(e,r),i=this.ctx.font.match(/\d+/)[0]
+return Math.floor(parseFloat(i)*t/n)}})
+e.default=t})),define("ember-truth-helpers/helpers/and",["exports","ember-truth-helpers/utils/truth-convert"],(function(e,t){"use strict"
+function r(e){for(let r=0,n=e.length;r<n;r++)if(!1===(0,t.default)(e[r]))return e[r]
+return e[e.length-1]}Object.defineProperty(e,"__esModule",{value:!0}),e.and=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-truth-helpers/helpers/equal",["exports"],(function(e){"use strict"
+function t(e){return e[0]===e[1]}Object.defineProperty(e,"__esModule",{value:!0}),e.equal=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-truth-helpers/helpers/gt",["exports"],(function(e){"use strict"
+function t([e,t],r){return r.forceNumber&&("number"!=typeof e&&(e=Number(e)),"number"!=typeof t&&(t=Number(t))),e>t}Object.defineProperty(e,"__esModule",{value:!0}),e.gt=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-truth-helpers/helpers/gte",["exports"],(function(e){"use strict"
+function t([e,t],r){return r.forceNumber&&("number"!=typeof e&&(e=Number(e)),"number"!=typeof t&&(t=Number(t))),e>=t}Object.defineProperty(e,"__esModule",{value:!0}),e.gte=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-truth-helpers/helpers/is-array",["exports"],(function(e){"use strict"
+function t(e){for(let t=0,r=e.length;t<r;t++)if(!1===Ember.isArray(e[t]))return!1
+return!0}Object.defineProperty(e,"__esModule",{value:!0}),e.isArray=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-truth-helpers/helpers/is-empty",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
+var t=Ember.Helper.helper((function([e]){return Ember.isEmpty(e)}))
+e.default=t})),define("ember-truth-helpers/helpers/is-equal",["exports"],(function(e){"use strict"
+function t([e,t]){return Ember.isEqual(e,t)}Object.defineProperty(e,"__esModule",{value:!0}),e.isEqual=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r}))
+define("ember-truth-helpers/helpers/lt",["exports"],(function(e){"use strict"
+function t([e,t],r){return r.forceNumber&&("number"!=typeof e&&(e=Number(e)),"number"!=typeof t&&(t=Number(t))),e<t}Object.defineProperty(e,"__esModule",{value:!0}),e.lt=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-truth-helpers/helpers/lte",["exports"],(function(e){"use strict"
+function t([e,t],r){return r.forceNumber&&("number"!=typeof e&&(e=Number(e)),"number"!=typeof t&&(t=Number(t))),e<=t}Object.defineProperty(e,"__esModule",{value:!0}),e.lte=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-truth-helpers/helpers/not-equal",["exports"],(function(e){"use strict"
+function t(e){return e[0]!==e[1]}Object.defineProperty(e,"__esModule",{value:!0}),e.notEqualHelper=t,e.default=void 0
+var r=Ember.Helper.helper(t)
+e.default=r})),define("ember-truth-helpers/helpers/not",["exports","ember-truth-helpers/utils/truth-convert"],(function(e,t){"use strict"
+function r(e){for(let r=0,n=e.length;r<n;r++)if(!0===(0,t.default)(e[r]))return!1
+return!0}Object.defineProperty(e,"__esModule",{value:!0}),e.not=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-truth-helpers/helpers/or",["exports","ember-truth-helpers/utils/truth-convert"],(function(e,t){"use strict"
+function r(e){for(let r=0,n=e.length;r<n;r++)if(!0===(0,t.default)(e[r]))return e[r]
+return e[e.length-1]}Object.defineProperty(e,"__esModule",{value:!0}),e.or=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-truth-helpers/helpers/xor",["exports","ember-truth-helpers/utils/truth-convert"],(function(e,t){"use strict"
+function r(e){return(0,t.default)(e[0])!==(0,t.default)(e[1])}Object.defineProperty(e,"__esModule",{value:!0}),e.xor=r,e.default=void 0
+var n=Ember.Helper.helper(r)
+e.default=n})),define("ember-truth-helpers/utils/truth-convert",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){const t=e&&Ember.get(e,"isTruthy")
+if("boolean"==typeof t)return t
+return Ember.isArray(e)?0!==Ember.get(e,"length"):!!e}})),define("ember-validators/collection",["exports","ember-validators/utils/validation-error"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r){let n=Ember.get(r,"collection")
+if(!0===n&&!Ember.isArray(e))return(0,t.default)("collection",e,r)
+if(!1===n&&Ember.isArray(e))return(0,t.default)("singular",e,r)
+return!0}})),define("ember-validators/confirmation",["exports","ember-validators/utils/validation-error"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r,n){let i=Ember.get(r,"on")
+if(Ember.get(r,"allowBlank")&&Ember.isEmpty(e))return!0
+if(!Ember.isEqual(e,Ember.get(n,i)))return(0,t.default)("confirmation",e,r)
+return!0}})),define("ember-validators/date",["exports","ember-validators/utils/validation-error","ember-require-module"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r){if(!n)throw new Error("MomentJS is required to use the Date validator.")
+let o=Ember.getWithDefault(r,"errorFormat","MMM Do, YYYY")
+var a=Ember.getProperties(r,["format","precision","allowBlank"])
+let s=a.format,l=a.precision,u=a.allowBlank
+var c=Ember.getProperties(r,["before","onOrBefore","after","onOrAfter"])
+let d,h=c.before,f=c.onOrBefore,p=c.after,m=c.onOrAfter
+if(u&&Ember.isEmpty(e))return!0
+if(s){d=i(e,s,!0)
+if(!i(e,s).isValid())return(0,t.default)("date",e,r)
+if(!d.isValid())return(0,t.default)("wrongDateFormat",e,r)}else if(d=i(e),!d.isValid())return(0,t.default)("date",e,r)
+if(h&&(h=i(h,s),!d.isBefore(h,l)))return Ember.set(r,"before",h.format(o)),(0,t.default)("before",e,r)
+if(f&&(f=i(f,s),!d.isSameOrBefore(f,l)))return Ember.set(r,"onOrBefore",f.format(o)),(0,t.default)("onOrBefore",e,r)
+if(p&&(p=i(p,s),!d.isAfter(p,l)))return Ember.set(r,"after",p.format(o)),(0,t.default)("after",e,r)
+if(m&&(m=i(m,s),!d.isSameOrAfter(m,l)))return Ember.set(r,"onOrAfter",m.format(o)),(0,t.default)("onOrAfter",e,r)
+return!0},e.parseDate=i
+const n=(0,r.default)("moment")
+function i(e,t,r=!1){return"now"===e||Ember.isEmpty(e)?n():Ember.isNone(t)?n(new Date(e)):n(e,t,r)}})),define("ember-validators/ds-error",["exports","ember-require-module","ember-validators/utils/validation-error"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,o,a){if(!n)throw new Error("Ember-Data is required to use the DS Error validator.")
+var s=i(a)
+let l=s.path,u=s.key,c=Ember.get(o,l)
+if(!Ember.isNone(c)&&c instanceof n.Errors&&c.has(u))return(0,r.default)("ds",null,t,Ember.get(c.errorsFor(u),"lastObject.message"))
+return!0},e.getPathAndKey=i
+const n=(0,t.default)("ember-data")
+function i(e){let t=e.split("."),r=t.pop()
+return t.push("errors"),{path:t.join("."),key:r}}})),define("ember-validators/exclusion",["exports","ember-validators/utils/validation-error"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n){let i=Ember.get(n,"in")
+var o=Ember.getProperties(n,["range","allowBlank"])
+let a=o.range
+if(o.allowBlank&&Ember.isEmpty(e))return!0
+if(i&&-1!==i.indexOf(e))return(0,t.default)("exclusion",e,n)
+if(a&&2===a.length){var s=r(a,2)
+let i=s[0],o=s[1]
+if(Ember.typeOf(e)===Ember.typeOf(i)&&Ember.typeOf(e)===Ember.typeOf(o)&&i<=e&&e<=o)return(0,t.default)("exclusion",e,n)}return!0}
+var r=function(e,t){if(Array.isArray(e))return e
+if(Symbol.iterator in Object(e))return function(e,t){var r=[],n=!0,i=!1,o=void 0
+try{for(var a,s=e[Symbol.iterator]();!(n=(a=s.next()).done)&&(r.push(a.value),!t||r.length!==t);n=!0);}catch(l){i=!0,o=l}finally{try{!n&&s.return&&s.return()}finally{if(i)throw o}}return r}(e,t)
+throw new TypeError("Invalid attempt to destructure non-iterable instance")}})),define("ember-validators/format",["exports","ember-validators/utils/validation-error"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.regularExpressions=void 0,e.default=function(e,i){var o=Ember.getProperties(i,["regex","type","inverse","allowBlank"])
+let a=o.regex,s=o.type
+var l=o.inverse
+let u=void 0!==l&&l
+if(o.allowBlank&&Ember.isEmpty(e))return!0
+s&&!a&&n[s]&&(a=n[s])
+"email"===s&&(a===n.email&&(a=function(e){let t=n.email.source
+var r=Ember.getProperties(e,["allowNonTld","minTldLength"])
+let i=r.allowNonTld,o=r.minTldLength
+Ember.isNone(o)||"number"!=typeof o||(t=t.replace("[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$",`[a-z0-9]{${o},}(?:[a-z0-9-]*[a-z0-9])?$`))
+i&&(t=t.replace("@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)","@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.?)"))
+return new RegExp(t,"i")}(i)),Ember.set(i,"regex",a))
+if(!r(e,"match")||a&&Ember.isEmpty(e.match(a))!==u)return(0,t.default)(s||"invalid",e,i)
+return!0}
+const r=Ember.canInvoke,n=e.regularExpressions={email:/^[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i,phone:/^([\+]?1\s*[-\/\.]?\s*)?(\((\d{3})\)|(\d{3}))\s*[-\/\.]?\s*(\d{3})\s*[-\/\.]?\s*(\d{4})\s*(([xX]|[eE][xX][tT]?[\.]?|extension)\s*([#*\d]+))*$/,url:/(?:([A-Za-z]+):)?(\/{0,3})[a-zA-Z0-9][a-zA-Z-0-9]*(\.[\w-]+)+([\w.,@?^=%&amp;:\/~+#-{}]*[\w@?^=%&amp;\/~+#-{}])??/}})),define("ember-validators/inclusion",["exports","ember-validators/utils/validation-error"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n){let i=Ember.get(n,"in")
+var o=Ember.getProperties(n,["range","allowBlank"])
+let a=o.range
+if(o.allowBlank&&Ember.isEmpty(e))return!0
+if(i&&-1===i.indexOf(e))return(0,t.default)("inclusion",e,n)
+if(a&&2===a.length){var s=r(a,2)
+let i=s[0],o=s[1]
+if(!(Ember.typeOf(e)===Ember.typeOf(i)&&Ember.typeOf(e)===Ember.typeOf(o))||i>e||e>o)return(0,t.default)("inclusion",e,n)}return!0}
+var r=function(e,t){if(Array.isArray(e))return e
+if(Symbol.iterator in Object(e))return function(e,t){var r=[],n=!0,i=!1,o=void 0
+try{for(var a,s=e[Symbol.iterator]();!(n=(a=s.next()).done)&&(r.push(a.value),!t||r.length!==t);n=!0);}catch(l){i=!0,o=l}finally{try{!n&&s.return&&s.return()}finally{if(i)throw o}}return r}(e,t)
+throw new TypeError("Invalid attempt to destructure non-iterable instance")}})),define("ember-validators/index",["exports","ember-require-module"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.validate=function(e,...r){let n=(0,t.default)("ember-validators/"+e)
+return n(...r)}})),define("ember-validators/length",["exports","ember-validators/utils/validation-error"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r){var n=Ember.getProperties(r,["allowNone","allowBlank","useBetweenMessage","is","min","max"]),i=n.allowNone
+let o=void 0===i||i,a=n.allowBlank,s=n.useBetweenMessage,l=n.is,u=n.min,c=n.max
+if(Ember.isNone(e))return!!o||(0,t.default)("invalid",e,r)
+if(a&&Ember.isEmpty(e))return!0
+let d=Ember.get(e,"length")
+if(!Ember.isNone(l)&&l!==d)return(0,t.default)("wrongLength",e,r)
+if(s&&!Ember.isNone(u)&&!Ember.isNone(c)&&(d<u||d>c))return(0,t.default)("between",e,r)
+if(!Ember.isNone(u)&&u>d)return(0,t.default)("tooShort",e,r)
+if(!Ember.isNone(c)&&c<d)return(0,t.default)("tooLong",e,r)
+return!0}})),define("ember-validators/messages",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default={_regex:/\{(\w+)\}/g,defaultDescription:"This field",getDescriptionFor(e,t={}){return Ember.get(t,"description")||Ember.get(this,"defaultDescription")},getMessageFor(e,t={}){return this.formatMessage(Ember.get(this,e),t)},formatMessage(e,t={}){let r=e
+return(Ember.isNone(r)||"string"!=typeof r)&&(r=Ember.get(this,"invalid")),r.replace(Ember.get(this,"_regex"),(e,r)=>Ember.get(t,r))},accepted:"{description} must be accepted",after:"{description} must be after {after}",before:"{description} must be before {before}",blank:"{description} can't be blank",collection:"{description} must be a collection",confirmation:"{description} doesn't match {on}",date:"{description} must be a valid date",email:"{description} must be a valid email address",empty:"{description} can't be empty",equalTo:"{description} must be equal to {is}",even:"{description} must be even",exclusion:"{description} is reserved",greaterThan:"{description} must be greater than {gt}",greaterThanOrEqualTo:"{description} must be greater than or equal to {gte}",inclusion:"{description} is not included in the list",invalid:"{description} is invalid",lessThan:"{description} must be less than {lt}",lessThanOrEqualTo:"{description} must be less than or equal to {lte}",notAnInteger:"{description} must be an integer",notANumber:"{description} must be a number",odd:"{description} must be odd",onOrAfter:"{description} must be on or after {onOrAfter}",onOrBefore:"{description} must be on or before {onOrBefore}",otherThan:"{description} must be other than {value}",phone:"{description} must be a valid phone number",positive:"{description} must be positive",multipleOf:"{description} must be a multiple of {multipleOf}",present:"{description} must be blank",singular:"{description} can't be a collection",tooLong:"{description} is too long (maximum is {max} characters)",tooShort:"{description} is too short (minimum is {min} characters)",between:"{description} must be between {min} and {max} characters",url:"{description} must be a valid url",wrongDateFormat:"{description} must be in the format of {format}",wrongLength:"{description} is the wrong length (should be {is} characters)"}})),define("ember-validators/number",["exports","ember-validators/utils/validation-error"],(function(e,t){"use strict"
+function r(e,r,i){let o=Ember.get(r,e),a=i
+return"is"===e&&a!==o?(0,t.default)("equalTo",i,r):"lt"===e&&a>=o?(0,t.default)("lessThan",i,r):"lte"===e&&a>o?(0,t.default)("lessThanOrEqualTo",i,r):"gt"===e&&a<=o?(0,t.default)("greaterThan",i,r):"gte"===e&&a<o?(0,t.default)("greaterThanOrEqualTo",i,r):"positive"===e&&a<0?(0,t.default)("positive",i,r):"odd"===e&&a%2==0?(0,t.default)("odd",i,r):"even"===e&&a%2!=0?(0,t.default)("even",i,r):!("multipleOf"===e&&!n(a/o))||(0,t.default)("multipleOf",i,r)}function n(e){return"number"==typeof e&&isFinite(e)&&Math.floor(e)===e}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,i){let o=Number(e),a=Object.keys(i)
+var s=Ember.getProperties(i,["allowBlank","allowNone","allowString","integer"])
+let l=s.allowBlank
+var u=s.allowNone
+let c=void 0===u||u,d=s.allowString,h=s.integer
+if(c&&Ember.isNone(e))return!0
+if(l&&Ember.isEmpty(e))return!0
+if(Ember.isEmpty(e))return(0,t.default)("notANumber",e,i)
+if("string"==typeof e&&!d)return(0,t.default)("notANumber",e,i)
+if(!function(e){return"number"==typeof e&&!isNaN(e)}(o))return(0,t.default)("notANumber",e,i)
+if(h&&!n(o))return(0,t.default)("notAnInteger",e,i)
+for(let t=0;t<a.length;t++){let e=r(a[t],i,o)
+if("boolean"!=typeof e)return e}return!0}})),define("ember-validators/presence",["exports","ember-validators/utils/validation-error","ember-validators/utils/unwrap-proxy"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n){var i=Ember.getProperties(n,["presence","ignoreBlank"])
+let o=i.presence,a=i.ignoreBlank,s=(0,r.default)(e),l=a?Ember.isPresent(s):!Ember.isEmpty(s)
+if(!0===o&&!l)return(0,t.default)("blank",e,n)
+if(!1===o&&l)return(0,t.default)("present",e,n)
+return!0}})),define("ember-validators/utils/is-promise",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return!(!e||!t(e,"then"))}
+const t=Ember.canInvoke})),define("ember-validators/utils/unwrap-proxy",["exports"],(function(e){"use strict"
+function t(e){return!(!e||!(e instanceof Ember.ObjectProxy||e instanceof Ember.ArrayProxy))}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function e(r){return t(r)?e(Ember.get(r,"content")):r},e.isProxy=t})),define("ember-validators/utils/validation-error",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,r,n){return{type:e,value:t,context:r,message:n}}})),define("ivy-codemirror/components/ivy-codemirror",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Component.extend({tagName:"textarea",codeMirror:Ember.inject.service(),didInsertElement(){this._super(...arguments),this._codeMirror=this.get("codeMirror").fromTextArea(this.get("elementId"),this.get("element")),this.setupCodeMirrorEventHandler("change",this,this.scheduleValueUpdatedAction)},didRender(){this._super(...arguments),this.updateCodeMirrorOptions(),this.updateCodeMirrorValue()},isVisibleDidChange:Ember.observer("isVisible",(function(){this._wasVisible!==this.get("isVisible")&&Ember.run.scheduleOnce("render",this,this.toggleVisibility)})),scheduleValueUpdatedAction(e,t){Ember.run.once(this,this.sendValueUpdatedAction,e.getValue(),e,t)},setupCodeMirrorEventHandler(e,t,r){const n=Ember.run.bind(t,r)
+this._codeMirror.on(e,n),this.one("willDestroyElement",this,(function(){this._codeMirror.off(e,n)}))},sendValueUpdatedAction(...e){this.sendAction("valueUpdated",...e)},toggleVisibility(){const e=this.get("isVisible")
+this._wasVisible!==e&&(this._wasVisible=e,e&&this._codeMirror.refresh())},updateCodeMirrorOption(e,t){this._codeMirror.getOption(e)!==t&&this._codeMirror.setOption(e,t)},updateCodeMirrorOptions(){const e=this.get("options")
+e&&Object.keys(e).forEach((function(t){this.updateCodeMirrorOption(t,e[t])}),this)},updateCodeMirrorValue(){const e=this.get("value")
+e!==this._codeMirror.getValue()&&this._codeMirror.setValue(e||"")},willDestroyElement(){this._super(...arguments),this._codeMirror.toTextArea(),this.get("codeMirror").unregisterInstance(this.get("elementId")),delete this._codeMirror}})})),define("ivy-codemirror/services/code-mirror",["exports","codemirror"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Service.extend({init(){this._super(...arguments),this._instances=Object.create(null)},fromTextArea(e,r){return this.registerInstance(e,t.default.fromTextArea(r))},instanceFor(e){return this._instances[e]},registerInstance(e,t){return this._instances[e]=t,t},signal(e,r,...n){t.default.signal(e,r,...n)},unregisterInstance(e){delete this._instances[e]}})})),define("layout-bin-packer/bin",["exports","layout-bin-packer/entry"],(function(e){"use strict"
+function t(e,t){this.width=t||0,this.content=e}function r(e){return function(){throw new TypeError("MustImplement: "+e)}}Object.defineProperty(e,"__esModule",{value:!0}),e.default=t,e.rangeError=function(e,t){throw new RangeError("Parameter must be within: [0 and "+e+") but was: "+t)},t.prototype.objectAt=function(e,t){return e[t]},t.prototype.position=r("position"),t.prototype.flush=r("flush"),t.prototype.height=r("height"),t.prototype.isGrid=r("isGrid"),t.prototype.length=function(){return this.content.length},t.prototype.maxContentOffset=function(e,t){var r=this.height(e)
+return Math.max(r-t,0)},t.prototype.visibleStartingIndex=r("visibleStartingIndex"),t.prototype.numberVisibleWithin=r("numberVisibleWithin"),t.prototype.heightAtIndex=function(e){return this.content[e].height},t.prototype.widthAtIndex=function(e){return this.content[e].width}})),define("layout-bin-packer/entry",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t,r,n){this.height=e,this.width=t,this.position={x:r,y:n}}})),define("layout-bin-packer/fixed-grid",["exports","layout-bin-packer/bin"],(function(e,t){"use strict"
+function r(e,t,r){this._elementWidth=t,this._elementHeight=r,this._super$constructor(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=r,r.prototype=Object.create(t.default.prototype),r.prototype._super$constructor=t.default,r.prototype.flush=function(){},r.prototype.isGrid=function(e){return(Math.floor(e/this.widthAtIndex(0))||1)>1},r.prototype.visibleStartingIndex=function(e,t,r){e=Math.min(e,this.maxContentOffset(t,r))
+var n=Math.floor(t/this.widthAtIndex(0))||1
+return Math.floor(e/this.heightAtIndex(0))*n},r.prototype.numberVisibleWithin=function(e,t,r,n){var i=this.visibleStartingIndex(e,t,r),o=Math.floor(t/this.widthAtIndex(0))||1,a=this.length(),s=this.heightAtIndex(0),l=Math.ceil(r/s)*o
+n&&(l+=o)
+var u=a-i
+return Math.max(Math.min(l,u),0)},r.prototype.widthAtIndex=function(){return this._elementWidth},r.prototype.heightAtIndex=function(){return this._elementHeight},r.prototype.position=function(e,t){var r=this.length();(0===r||e>r)&&rangeError(r,e)
+var n=Math.floor(t/this.widthAtIndex(e))||1
+return{x:e%n*this.widthAtIndex(e)|0,y:Math.floor(e/n)*this.heightAtIndex(e)}},r.prototype.height=function(e){if("number"!=typeof e)throw new TypeError("height depends on the first argument of visibleWidth(number)")
+var t=this.length()
+if(0===t)return 0
+var r=Math.max(Math.floor(e/this.widthAtIndex(0),1))
+return r=r>0?r:1,Math.ceil(t/r)*this.heightAtIndex(0)}})),define("layout-bin-packer/shelf-first",["exports","layout-bin-packer/bin","layout-bin-packer/entry"],(function(e,t,r){"use strict"
+function n(e,t){this._super$constructor(e,t),this._positionEntries=[]}Object.defineProperty(e,"__esModule",{value:!0}),e.default=n,n.prototype=Object.create(t.default.prototype),n.prototype._super$constructor=t.default,n.prototype.isGrid=function(e){null!=e&&e!==this.width&&(this.flush(0),this.width=e)
+for(var t=this.length(),r=0;r<t;r++)if(this._entryAt(r).position.x>0)return!0
+return!1},n.prototype.height=function(e){null!=e&&e!==this.width&&(this.flush(0),this.width=e)
+var t=this.length()
+if(0===t)return 0
+for(var r,n=0,i=0,o=t-1;o>=0&&!(i>(r=this._entryAt(o)).position.y);o--)n<r.height&&(n=r.height),i=r.position.y
+return i+n},n.prototype.flush=function(e){var t=this._positionEntries
+t.length>e&&(t.length=e)},n.prototype.numberVisibleWithin=function(e,t,r,n){t!==this.width&&(this.flush(0),this.width=t)
+var i=this.visibleStartingIndex(e,t,r)
+return this._numberVisibleWithin(i,r,n)},n.prototype._entryAt=function(e){var n,i=this.length(),o=this.width
+e>=i&&(0,t.rangeError)(i,e)
+var a,s,l,u,c=this._positionEntries.length,d=0,h=0
+if(e<c)return this._positionEntries[e]
+for(0===c?(a=0,s=0):(a=c-1,h=(n=this._positionEntries[a]).position.x+n.width,d=n.height,s=n.position.y,a++),u=a;u<e+1;u++){var f=this.heightAtIndex(u),p=this.widthAtIndex(u)
+n&&p+h>o?(s=n.position.y+n.height,l=0,h=0,d=f):l=h,f>d&&(d=f),n=this._positionEntries[u]=new r.default(d,p,l,s),h=l+p}return n},n.prototype._numberVisibleWithin=function(e,t,r){var n,i,o,a=0,s=this.length(),l=0,u=0
+u=e>0&&e<s?this._entryAt(e).position.y:0
+for(var c=e;c<s;c++)if(l===(i=(n=this._entryAt(c)).position).y||(l=i.y-u,r&&!o&&(o=n.height)),l<t)a++
+else{if(!r)break
+r=!1,t+=Math.max(o,n.height)+1,a++}return a},n.prototype.position=function(e,r){var n=this.length()
+return(0===n||e>n)&&(0,t.rangeError)(n,e),r!==this.width&&(this.flush(0),this.width=r),this._entryAt(e).position},n.prototype.visibleStartingIndex=function(e,t,r){if(e<=0)return 0
+null!=t&&t!==this.width&&(this.flush(0),this.width=t),e=Math.min(e,this.maxContentOffset(t,r))
+for(var n,i=this.height(),o=this.length(),a=o,s=i;;){var l=s/a
+if(n===(a=Math.min(Math.floor(e/l),o-1)))return a
+var u=this._entryAt(a),c=u.position
+if(n=a,(s=c.y+u.height)>e){for(;s>=e&&(n=a,-1!=--a);)s=(c=(u=this._entryAt(a)).position).y+u.height
+return n}if(e===s){for(;s<=e;)a++,s=(c=(u=this._entryAt(a)).position).y+u.height
+return a}}return-1}})),define("torii/adapters/application",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var t=Ember.Object.extend({open:()=>new Ember.RSVP.Promise((function(){throw new Error("The Torii adapter must implement `open` for a session to be opened")})),fetch:()=>new Ember.RSVP.Promise((function(){throw new Error("The Torii adapter must implement `fetch` for a session to be fetched")})),close:()=>new Ember.RSVP.Promise((function(){throw new Error("The Torii adapter must implement `close` for a session to be closed")}))})
+e.default=t})),define("torii/bootstrap/routing",["exports","torii/routing/application-route-mixin","torii/routing/authenticated-route-mixin","torii/lib/container-utils"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,n){o(e,"route:application",t.default)
+for(var i=0;i<n.length;i++){var a=n[i]
+o(e,"route:"+a,r.default)}}
+var i=null
+function o(e,t,o){var a,s=(0,n.lookup)(e,t)
+s?s.reopen(o):(a=(0,n.lookupFactory)(e,"route:basic"),i||(i=a.extend(r.default)),(0,n.register)(e,t,i))}}))
+define("torii/bootstrap/session",["exports","torii/services/torii-session"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,r){var n="service:"+r
+e.register(n,t.default),e.inject(n,"torii","service:torii"),e.inject("route",r,n),e.inject("controller",r,n)}})),define("torii/bootstrap/torii",["exports","torii/providers/linked-in-oauth2","torii/providers/google-oauth2","torii/providers/google-oauth2-bearer","torii/providers/google-oauth2-bearer-v2","torii/providers/facebook-connect","torii/providers/facebook-oauth2","torii/adapters/application","torii/providers/twitter-oauth1","torii/providers/github-oauth2","torii/providers/azure-ad-oauth2","torii/providers/stripe-connect","torii/providers/edmodo-connect","torii/services/torii","torii/services/popup","torii/services/iframe"],(function(e,t,r,n,i,o,a,s,l,u,c,d,h,f,p,m){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){e.register("service:torii",f.default),e.register("torii-provider:linked-in-oauth2",t.default),e.register("torii-provider:google-oauth2",r.default),e.register("torii-provider:google-oauth2-bearer",n.default),e.register("torii-provider:google-oauth2-bearer-v2",i.default),e.register("torii-provider:facebook-connect",o.default),e.register("torii-provider:facebook-oauth2",a.default),e.register("torii-provider:twitter",l.default),e.register("torii-provider:github-oauth2",u.default),e.register("torii-provider:azure-ad-oauth2",c.default),e.register("torii-provider:stripe-connect",d.default),e.register("torii-provider:edmodo-connect",h.default),e.register("torii-adapter:application",s.default),e.register("torii-service:iframe",m.default),e.register("torii-service:popup",p.default)}})),define("torii/compat/get-router-instance",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return e.get("router")||e.lookup("router:main")}})),define("torii/compat/get-router-lib",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){return e._routerMicrolib||e.router}})),define("torii/components/torii-iframe-placeholder",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Component.extend({classNames:["torii-iframe-placeholder"]})})),define("torii/configuration",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+let t={}
+function r(){return t}e.configurable=function(e,t){return Ember.computed((function(){this._super=this._super||function(){throw new Error("should always have _super")}()
+var n="providers."+this.get("name")+"."+e
+let i=r()
+var o=Ember.get(i,n)
+if(void 0===o){if(void 0!==t)return"function"==typeof t?t.call(this):t
+throw new Error("Expected configuration value "+e+" to be defined for provider named "+this.get("name"))}return o}))},e.configure=function(e){t=e},e.getConfiguration=r,e.default={}})),define("torii/lib/assert",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e,t){t||console.error(e)}})),define("torii/lib/container-utils",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.hasRegistration=function(e,t){return e&&e.hasRegistration?e.hasRegistration(t):e.registry.has(t)},e.register=function(e,t,r){return e&&e.application?e.application.register(t,r):e.registry.register(t,r)},e.lookupFactory=function(e,t){return e&&e.lookupFactory?e.lookupFactory(t):e&&e.resolveRegistration?e.resolveRegistration(t):e&&e.application?e.application.__container__.lookupFactory(t):e.container.lookupFactory(t)},e.lookup=function(e,t){return e&&e.lookup?e.lookup(t):e&&e.application?e.application.__container__.lookup(t):e.container.lookup(t)},e.getOwner=function(e){return Ember.getOwner?Ember.getOwner(e):e.container}})),define("torii/lib/load-initializer",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){Ember.onLoad("Ember.Application",(function(t){t.initializer(e)}))}})),define("torii/lib/load-instance-initializer",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){Ember.onLoad("Ember.Application",(function(t){t.instanceInitializer(e)}))}})),define("torii/lib/parse-query-string",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Object.extend({init(){this.validKeys=this.keys},parse(){for(var e=this.url,t=this.validKeys,r={},n=0;n<t.length;n++){var i=t[n],o=new RegExp(i+"=([^&#]*)").exec(e)
+o&&(r[i]=o[1])}return r}})})),define("torii/lib/popup-id-serializer",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var t={serialize:e=>"torii-popup:"+e,deserialize(e){if(!e)return null
+var t=e.match(/^(torii-popup:)(.*)/)
+return t?t[2]:null}}
+e.default=t})),define("torii/lib/query-string",["exports"],(function(e){"use strict"
+function t(e){return e||!1===e}function r(e,r,n){var i=Ember.String.camelize(r),o=Ember.get(e,i)
+if(!n){if(!t(o)&&t(Ember.get(e,r)))throw new Error('Use camelized versions of url params. (Did not find "'+i+'" property but did find "'+r+'".')
+if(!t(o))throw new Error('Missing url param: "'+r+'". (Looked for: property named "'+i+'".')}return t(o)?encodeURIComponent(o):void 0}Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Object.extend({init(){this.obj=this.provider,this.urlParams=Ember.A(this.requiredParams.slice()).uniq(),this.optionalUrlParams=Ember.A(this.optionalParams?this.optionalParams.slice():[]).uniq(),this.optionalUrlParams.forEach((function(e){if(this.urlParams.indexOf(e)>-1)throw new Error("Required parameters cannot also be optional: '"+e+"'")}),this)},toString(){var e=this.urlParams,n=this.optionalUrlParams,i=this.obj,o=Ember.A([])
+return e.forEach((function(e){var t=r(i,e)
+o.push([e,t])})),n.forEach((function(e){var n=function(e,t){return r(e,t,!0)}(i,e)
+t(n)&&o.push([e,n])})),o.map((function(e){return e.join("=")})).join("&")}})})),define("torii/lib/random-url-safe",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){for(var t="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",r="",n=0;n<e;n++)r+=t.charAt(Math.floor(Math.random()*t.length))
+return r}})),define("torii/lib/required-property",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){return Ember.computed((function(e){throw new Error("Definition of property "+e+" by a subclass is required.")}))}})),define("torii/lib/state-machine",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var t=Array.prototype.slice,r=Object.keys
+function n(e){var t=e.initialState
+if(this.states=e.states,!this.states)throw new Error("StateMachine needs states")
+if(this.state=this.states[t],!this.state)throw new Error("Missing initial state")
+this.currentStateName=t,this._subscriptions={}
+var r,n,i,o=e.beforeTransitions||[],a=e.afterTransitions||[]
+for(n=0,i=o.length;i>n;n++)r=o[n],this.beforeTransition.call(this,r,r.fn)
+for(n=0,i=a.length;i>n;n++)r=a[n],this.afterTransition.call(this,r,r.fn)}var i=n.SPLAT="*"
+n.transitionTo=function(e){return function(){this.transitionTo(e)}},n.prototype={states:{},toString(){return"<StateMachine currentState:'"+this.currentStateName+"' >"},transitionTo(e){if("."===e.charAt(0)){var t=this.currentStateName.split(".").slice(0,-1)
+e=0<t.length?t.join(".")+e:e.substring(1)}var r=this.states[e],n=this.currentStateName
+if(!r)throw new Error("Unknown State: `"+e+"`")
+this.willTransition(n,e),this.state=r,this.currentStateName=e,this.didTransition(n,e)},beforeTransition(e,t){this._transition("willTransition",e,t)},afterTransition(e,t){this._transition("didTransition",e,t)},_transition(e,t,r){var n,o,a,s,l,u,c=t.from||i,d=t.to||i
+0===d.indexOf("!")?(n=d.substr(1),l=!0):(n=d,l=!1),0===c.indexOf("!")?(o=c.substr(1),u=!0):(o=c,u=!1),s=o.indexOf(i),a=n.indexOf(i),s>=0&&(o=o.substring(s,0)),a>=0&&(n=n.substring(a,0)),this.on(e,(function(e,t){var i=t,c=e
+s>=0&&(c=e.substring(s,0)),a>=0&&(i=t.substring(a,0)),i===n!==l&&c===o!==u&&r.call(this,e,t)}))},willTransition(e,t){this._notify("willTransition",e,t)},didTransition(e,t){this._notify("didTransition",e,t)},_notify(e,t,r){for(var n=this._subscriptions[e]||[],i=0,o=n.length;i<o;i++)n[i].call(this,t,r)},on(e,t){this._subscriptions[e]=this._subscriptions[e]||[],this._subscriptions[e].push(t)},off(e,t){var r=this._subscriptions[e].indexOf(t)
+t?r&&this._subscriptions[e].splice(r,1):this._subscriptions[e]=null},send(e){var r=this.state[e],n=t.call(arguments,1)
+if(r)return r.apply(this,n)
+this.unhandledEvent(e)},trySend(e){var r=this.state[e],n=t.call(arguments,1)
+if(r)return r.apply(this,n)},event(e,t){var i=this.states,o={transition(){var t=function(e,t,r){var n
+if(!t)throw new Error("invalid Transition")
+if(r){n=function(e,t){return(r=e,r.constructor===Array?r:r?[r]:[]).reduce((function(e,r){return e[r]=t,e}),{})
+var r}(t,r)}else{if(t.constructor!==Object)throw new Error("something went wrong")
+n=t}return n}(0,arguments[0],arguments[1])
+r(t).forEach((function(r){var o=t[r];(function(e,t,r,n,i){var o=e[r]
+if(!(r&&n&&o)){var a="invalid transition state: "+(o&&o.currentStateName)+" from: "+r+" to: "+n
+throw new Error(a)}e[r][t]=i})(i,e,r,o,n.transitionTo(o))}))}}
+t.call(o)},unhandledEvent(e){var t="Unknown Event: `"+e+"` for: "+this.toString()
+throw new Error(t)}},e.default=n})),define("torii/lib/uuid-generator",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var t={generate(){var e=(new Date).getTime()
+return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,(function(t){var r=(e+16*Math.random())%16|0
+return e=Math.floor(e/16),("x"===t?r:3&r|8).toString(16)}))}}
+e.default=t})),define("torii/load-initializers",["exports","torii/lib/load-initializer","torii/lib/load-instance-initializer","torii/initializers/initialize-torii","torii/initializers/initialize-torii-callback","torii/initializers/initialize-torii-session","torii/instance-initializers/setup-routes","torii/instance-initializers/walk-providers"],(function(e,t,r,n,i,o,a,s){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(){(0,t.default)(i.default),(0,t.default)(n.default),(0,t.default)(o.default),(0,r.default)(s.default),(0,r.default)(a.default)}})),define("torii/mixins/ui-service-mixin",["exports","torii/lib/uuid-generator","torii/lib/popup-id-serializer","torii/lib/parse-query-string","torii/lib/assert","torii/configuration"],(function(e,t,r,n,i,o){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.WARNING_KEY=e.CURRENT_REQUEST_KEY=void 0
+const a=e.CURRENT_REQUEST_KEY="__torii_request",s=e.WARNING_KEY="__torii_redirect_warning"
+var l=Ember.Mixin.create({init(){this._super(...arguments),this.remoteIdGenerator=this.remoteIdGenerator||t.default},open(e,t,l){let u,c=this,d=this.remote
+return new Ember.RSVP.Promise((function(h,f){d&&c.close()
+var p=c.remoteIdGenerator.generate()
+u=function(e){var i=r.default.deserialize(e.key)
+if(p===i){var o=function(e,t){return n.default.create({url:e,keys:t}).parse()}(e.newValue,t)
+localStorage.removeItem(e.key),Ember.run((function(){h(o)}))}}
+var m=r.default.serialize(p)
+localStorage.setItem(a,m),localStorage.removeItem(s),c.openRemote(e,m,l),c.schedulePolling()
+var v=window.onbeforeunload
+if(window.onbeforeunload=function(){"function"==typeof v&&v(),c.close()},!c.remote||c.remote.closed)return localStorage.removeItem(a),void f(new Error("remote could not open or was closed"))
+c.remote.focus(),c.one("didClose",(function(){if(localStorage.getItem(s)){localStorage.removeItem(s)
+let e=(0,o.getConfiguration)();(0,i.default)("[Torii] Using an OAuth redirect that loads your Ember App is deprecated and will be\n              removed in a future release, as doing so is a potential security vulnerability.\n              Hide this message by setting `allowUnsafeRedirect: true` in your Torii configuration.\n          ",e.allowUnsafeRedirect)}var e=localStorage.getItem(a)
+e&&(localStorage.removeItem(e),localStorage.removeItem(a)),c.timeout=Ember.run.later(c,(function(){f(new Error("remote was closed, authorization was denied, or an authentication message otherwise not received before the window closed."))}),100)})),window.addEventListener("storage",u)})).finally((function(){c.close(),window.removeEventListener("storage",u)}))},close(){this.remote&&(this.closeRemote(),this.remote=null,this.trigger("didClose")),this.cleanUp()},cleanUp(){this.clearTimeout()},schedulePolling(){this.polling=Ember.run.later(this,(function(){this.pollRemote(),this.schedulePolling()}),35)},clearTimeout(){Ember.run.cancel(this.timeout),this.timeout=null},stopPolling:Ember.on("didClose",(function(){Ember.run.cancel(this.polling)}))})
+e.default=l})),define("torii/providers/-private/utils",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.overrideLoadScript=function(e){t=e},e.resetLoadScript=function(){t=!1},e.loadScript=function(e){if(t)return t(e)
+let r=document.createElement("script"),n=document.getElementsByTagName("script")[0]
+r.src=e,n.parentNode.insertBefore(r,n)}
+let t=!1})),define("torii/providers/azure-ad-oauth2",["exports","torii/providers/oauth2-code","torii/configuration"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var n=t.default.extend({name:"azure-ad-oauth2",baseUrl:Ember.computed((function(){return"https://login.windows.net/"+this.get("tennantId")+"/oauth2/authorize"})),tennantId:(0,r.configurable)("tennantId","common"),requiredUrlParams:["api-version","client_id"],optionalUrlParams:["scope","nonce","response_mode"],responseMode:(0,r.configurable)("responseMode",null),responseParams:Ember.computed((function(){return[this.get("responseType"),"state"]})),apiVersion:"1.0",responseType:(0,r.configurable)("responseType","code"),redirectUri:(0,r.configurable)("redirectUri",(function(){return this._super()}))})
+e.default=n})),define("torii/providers/base",["exports","torii/lib/required-property","torii/lib/container-utils","torii/configuration"],(function(e,t,r,n){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var i=Ember.Object.extend({name:(0,t.default)(),configNamespace:Ember.computed("name",(function(){return"providers."+this.get("name")})),popup:Ember.computed("configuredRemoteServiceName",(function(){var e=(0,r.getOwner)(this),t=this.get("configuredRemoteServiceName")||n.default.remoteServiceName||"popup"
+return e.lookup("torii-service:"+t)})),configuredRemoteServiceName:(0,n.configurable)("remoteServiceName",null)})
+e.default=i})),define("torii/providers/edmodo-connect",["exports","torii/providers/oauth2-bearer","torii/configuration"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=t.default.extend({name:"edmodo-connect",baseUrl:"https://api.edmodo.com/oauth/authorize",responseParams:["access_token"],redirectUri:(0,r.configurable)("redirectUri"),scope:(0,r.configurable)("scope","basic")})})),define("torii/providers/facebook-connect",["exports","torii/providers/base","torii/providers/-private/utils","torii/configuration"],(function(e,t,r,n){"use strict"
+var i
+function o(e){if(i)return i
+var t=window.fbAsyncInit,n=e.locale
+return delete e.locale,i=new Ember.RSVP.Promise((function(t){if(window.FB)return t()
+window.fbAsyncInit=function(){FB.init(e),Ember.run(null,t)},(0,r.loadScript)("//connect.facebook.net/"+n+"/sdk.js")})).then((function(){window.fbAsyncInit=t,window.fbAsyncInit&&(window.fbAsyncInit.hasRun=!0,window.fbAsyncInit())}))}function a(e){var t={userId:e.userID,accessToken:e.accessToken,expiresIn:e.expiresIn}
+return e.grantedScopes&&(t.grantedScopes=e.grantedScopes),t}Object.defineProperty(e,"__esModule",{value:!0})
+var s=t.default.extend({name:"facebook-connect",scope:(0,n.configurable)("scope","email"),returnScopes:(0,n.configurable)("returnScopes",!1),appId:(0,n.configurable)("appId"),version:(0,n.configurable)("version","v2.2"),xfbml:(0,n.configurable)("xfbml",!1),channelUrl:(0,n.configurable)("channelUrl",null),locale:(0,n.configurable)("locale","en_US"),init(){this._super(...arguments),o(this.settings())},open(e){void 0===e&&(e={})
+var t=this.get("scope"),r=e.authType,n=this.get("returnScopes")
+return o(this.settings()).then((function(){return function(e,t,r){return new Ember.RSVP.Promise((function(n,i){FB.login((function(e){e.authResponse?Ember.run(null,n,e.authResponse):Ember.run(null,i,e.status)}),{scope:e,return_scopes:t,auth_type:r})}))}(t,n,r)})).then(a)},settings(){return{status:!0,cookie:!0,xfbml:this.get("xfbml"),version:this.get("version"),appId:this.get("appId"),channelUrl:this.get("channelUrl"),locale:this.get("locale")}}})
+e.default=s})),define("torii/providers/facebook-oauth2",["exports","torii/configuration","torii/providers/oauth2-code"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=r.default.extend({name:"facebook-oauth2",baseUrl:"https://www.facebook.com/dialog/oauth",requiredUrlParams:["display"],responseParams:["code","state"],scope:(0,t.configurable)("scope","email"),display:"popup",redirectUri:(0,t.configurable)("redirectUri",(function(){return this._super()})),open(){return this._super().then((function(e){if(e.authorizationCode&&"200"===e.authorizationCode)throw new Error("User canceled authorization")
+return e}))}})})),define("torii/providers/github-oauth2",["exports","torii/providers/oauth2-code","torii/configuration"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var n=t.default.extend({name:"github-oauth2",baseUrl:"https://github.com/login/oauth/authorize",responseParams:["code","state"],redirectUri:(0,r.configurable)("redirectUri",(function(){return this._super()}))})
+e.default=n})),define("torii/providers/google-oauth2-bearer-v2",["exports","torii/providers/oauth2-code","torii/configuration"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var n=t.default.extend({name:"google-oauth2-bearer-v2",baseUrl:"https://accounts.google.com/o/oauth2/v2/auth",tokenValidationUrl:"https://www.googleapis.com/oauth2/v2/tokeninfo",optionalUrlParams:["scope","request_visible_actions"],scope:(0,r.configurable)("scope"),requestVisibleActions:(0,r.configurable)("requestVisibleActions",""),responseType:"token",responseParams:["access_token","token_type","expires_in"],redirectUri:(0,r.configurable)("redirectUri"),open(e){var t=this.get("name"),r=this.buildUrl(),n=this.get("redirectUri"),i=this.get("responseParams"),o=this.get("tokenValidationUrl"),a=this.get("apiKey")
+return this.get("popup").open(r,i,e).then((function(e){var r=[]
+if(i.forEach((function(t){void 0===e[t]&&r.push(t)})),r.length)throw new Error("The response from the provider is missing these required response params: "+r.join(", "))
+return new Ember.RSVP.Promise((function(r,i){let s=new XMLHttpRequest
+s.overrideMimeType("application/json"),s.onload=function(){var o=JSON.parse(s.responseText)
+o.audience===a?Ember.run(()=>r(Ember.assign(e,{provider:t,redirectUri:n}))):void 0===o.audience?Ember.run(()=>i(new Error("Unexpected response from token validation server. The 'audience' field may be missing."))):Ember.run(()=>i(new Error("Access token is invalid or has been tempered with. You may be subject to a 'confused deputy' attack.")))},s.onerror=function(){Ember.run(()=>i(new Error(`Token validation request failed with status '${s.statusText}' (server '${o}' '${s.responseText}').`)))},s.open("GET",`${o}?access_token=${encodeURIComponent(e.access_token)}`),s.send()}))}))},fetch:e=>e})
+e.default=n})),define("torii/providers/google-oauth2-bearer",["exports","torii/providers/oauth2-bearer","torii/configuration"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var n=t.default.extend({name:"google-oauth2-bearer",baseUrl:"https://accounts.google.com/o/oauth2/auth",optionalUrlParams:["scope","request_visible_actions","hd"],requestVisibleActions:(0,r.configurable)("requestVisibleActions",""),responseParams:["access_token"],scope:(0,r.configurable)("scope","email"),redirectUri:(0,r.configurable)("redirectUri","http://localhost:4200/oauth2callback"),hd:(0,r.configurable)("hd","")})
+e.default=n})),define("torii/providers/google-oauth2",["exports","torii/providers/oauth2-code","torii/configuration"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var n=t.default.extend({name:"google-oauth2",baseUrl:"https://accounts.google.com/o/oauth2/auth",optionalUrlParams:["scope","request_visible_actions","access_type","approval_prompt","hd"],requestVisibleActions:(0,r.configurable)("requestVisibleActions",""),accessType:(0,r.configurable)("accessType",""),responseParams:["code","state"],scope:(0,r.configurable)("scope","email"),approvalPrompt:(0,r.configurable)("approvalPrompt","auto"),redirectUri:(0,r.configurable)("redirectUri","http://localhost:8000/oauth2callback"),hd:(0,r.configurable)("hd","")})
+e.default=n})),define("torii/providers/linked-in-oauth2",["exports","torii/providers/oauth2-code","torii/configuration"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var n=t.default.extend({name:"linked-in-oauth2",baseUrl:"https://www.linkedin.com/uas/oauth2/authorization",responseParams:["code","state"],redirectUri:(0,r.configurable)("redirectUri",(function(){return this._super()}))})
+e.default=n}))
+define("torii/providers/oauth1",["exports","torii/providers/base","torii/configuration"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var n=t.default.extend({name:"oauth1",requestTokenUri:(0,r.configurable)("requestTokenUri"),buildRequestTokenUrl(){return this.get("requestTokenUri")},open(e){var t=this.get("name"),r=this.buildRequestTokenUrl()
+return this.get("popup").open(r,["code"],e).then((function(e){return e.provider=t,e}))}})
+e.default=n})),define("torii/providers/oauth2-bearer",["exports","torii/providers/oauth2-code"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var r=t.default.extend({responseType:"token",open(e){var t=this.get("name"),r=this.buildUrl(),n=this.get("redirectUri"),i=this.get("responseParams")
+return this.get("popup").open(r,i,e).then((function(e){var r=[]
+if(i.forEach((function(t){void 0===e[t]&&r.push(t)})),r.length)throw new Error("The response from the provider is missing these required response params: "+r.join(", "))
+return{authorizationToken:e,provider:t,redirectUri:n}}))}})
+e.default=r})),define("torii/providers/oauth2-code",["exports","torii/providers/base","torii/configuration","torii/lib/query-string","torii/lib/required-property","torii/lib/random-url-safe"],(function(e,t,r,n,i,o){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var a=t.default.extend({concatenatedProperties:["requiredUrlParams","optionalUrlParams"],requiredUrlParams:["response_type","client_id","redirect_uri","state"],optionalUrlParams:["scope"],baseUrl:(0,i.default)(),apiKey:(0,r.configurable)("apiKey"),scope:(0,r.configurable)("scope",null),clientId:(0,r.configurable)("clientId",(function(){return this.get("apiKey")})),state:(0,r.configurable)("state",(function(){return this.get("randomState")})),_randomState:null,randomState:Ember.computed("_randomState",(function(){var e=this.get("_randomState")
+return e||(e=(0,o.default)(16),this.set("_randomState",e)),e})),responseType:"code",responseParams:(0,i.default)(),redirectUri:(0,r.configurable)("redirectUri",(function(){return("/"!==(e=[window.location.protocol,"//",window.location.host,window.location.pathname].join("")).substr(-1)&&(e+="/"),e)+"torii/redirect.html"
+var e})),buildQueryString(){var e=this.get("requiredUrlParams"),t=this.get("optionalUrlParams")
+return n.default.create({provider:this,requiredParams:e,optionalParams:t}).toString()},buildUrl(){return[this.get("baseUrl"),this.buildQueryString()].join("?")},open(e){var t=this.get("name"),r=this.buildUrl(),n=this.get("redirectUri"),i=this.get("responseParams"),o=this.get("responseType"),a=this.get("state"),s=-1!==i.indexOf("state")
+return this.get("popup").open(r,i,e).then((function(e){var r=[]
+if(i.forEach((function(t){void 0===e[t]&&r.push(t)})),r.length)throw new Error("The response from the provider is missing these required response params: "+r.join(", "))
+if(s&&e.state!==a)throw new Error('The response from the provider has an incorrect session state param: should be "'+a+'", but is "'+e.state+'"')
+return{authorizationCode:decodeURIComponent(e[o]),provider:t,redirectUri:n}}))}})
+e.default=a})),define("torii/providers/stripe-connect",["exports","torii/providers/oauth2-code","torii/configuration"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=t.default.extend({name:"stripe-connect",baseUrl:"https://connect.stripe.com/oauth/authorize",requiredUrlParams:[],optionalUrlParams:["stripe_landing","always_prompt"],responseParams:["code","state"],scope:(0,r.configurable)("scope","read_write"),stripeLanding:(0,r.configurable)("stripeLanding",""),alwaysPrompt:(0,r.configurable)("alwaysPrompt","false"),redirectUri:(0,r.configurable)("redirectUri",(function(){return this._super()}))})})),define("torii/providers/twitter-oauth1",["exports","torii/providers/oauth1"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=t.default.extend({name:"twitter"})})),define("torii/redirect-handler",["exports","torii/mixins/ui-service-mixin","torii/configuration"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.ToriiRedirectError=void 0
+class n extends Ember.Error{constructor(){super(...arguments),this.name="ToriiRedirectError"}}e.ToriiRedirectError=n
+var i=Ember.Object.extend({run(){var e=this.windowObject
+return new Ember.RSVP.Promise((function(i,o){var a=e.localStorage.getItem(t.CURRENT_REQUEST_KEY)
+if(e.localStorage.removeItem(t.CURRENT_REQUEST_KEY),a){var s=e.location.toString()
+e.localStorage.setItem(t.WARNING_KEY,"true"),e.localStorage.setItem(a,s),"popup"===(r.default.remoteServiceName||"popup")&&e.close()}else o(new n("Not a torii popup"))}))}})
+i.reopenClass({handle:e=>i.create({windowObject:e}).run()}),e.default=i})),define("torii/router-dsl-ext",["torii/compat/get-router-lib"],(function(e){"use strict"
+var t=Ember.RouterDSL.prototype,r=null
+t.authenticatedRoute=function(){this.route.apply(this,arguments),r.push(arguments[0])},Ember.Router.reopen({_initRouterJs(){r=[],this._super.apply(this,arguments),(0,e.default)(this).authenticatedRoutes=r}})})),define("torii/routing/application-route-mixin",["exports","torii/configuration"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Mixin.create({beforeModel(e){var t=this,r=this._super.apply(this,arguments)
+return r&&r.then?r.then((function(){return t.checkLogin(e)})):t.checkLogin(e)},checkLogin(){let e=(0,t.getConfiguration)()
+return this.get(e.sessionServiceName).fetch().catch((function(){}))}})})),define("torii/routing/authenticated-route-mixin",["exports","torii/configuration"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Mixin.create({beforeModel(e){var t=this,r=this._super.apply(this,arguments)
+return r&&r.then?r.then((function(){return t.authenticate(e)})):t.authenticate(e)},authenticate(e){var r=(0,t.getConfiguration)(),n=this,i=this.get(r.sessionServiceName),o=this.get(r.sessionServiceName+".isAuthenticated"),a=void 0!==o
+return o?Ember.RSVP.resolve():(i.attemptedTransition=e,a?n.accessDenied(e):i.fetch().catch((function(){return n.accessDenied(e)})))},accessDenied(e){e.send("accessDenied",e)}})})),define("torii/services/iframe",["exports","torii/mixins/ui-service-mixin"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var r=Ember.Object.extend(Ember.Evented,t.default,{openRemote(e){this.remote=document.createElement("iframe"),this.remote.src=e,this.remote.id="torii-iframe"
+document.querySelector(".torii-iframe-placeholder").appendChild(this.remote)},closeRemote(){this.remote.remove()},pollRemote(){null===document.querySelector("#torii-iframe")&&this.trigger("didClose")}})
+e.default=r})),define("torii/services/popup",["exports","torii/mixins/ui-service-mixin"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0})
+var r=Ember.Object.extend(Ember.Evented,t.default,{openRemote(e,t,r){var n=function(e){var t=[]
+for(var r in e)if(e.hasOwnProperty(r)){var n
+switch(e[r]){case!0:n="1"
+break
+case!1:n="0"
+break
+default:n=e[r]}t.push(r+"="+n)}return t.join(",")}(function(e){var t=e.width||500,r=e.height||500
+return Ember.merge({left:screen.width/2-t/2,top:screen.height/2-r/2,width:t,height:r},e)}(r||{}))
+this.remote=window.open(e,t,n)},closeRemote(){},pollRemote(){this.remote&&this.remote.closed&&this.trigger("didClose")}})
+e.default=r})),define("torii/services/torii-session",["exports","torii/session/state-machine","torii/lib/container-utils"],(function(e,t,r){"use strict"
+function n(e,t){var r=e.lookup("torii-adapter:"+t)
+return r||(r=e.lookup("torii-adapter:application")),r}Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Service.extend(Ember._ProxyMixin,{state:null,stateMachine:Ember.computed((function(){return(0,t.default)(this)})),setupStateProxy:Ember.on("init",(function(){var e=this.get("stateMachine"),t=this
+e.on("didTransition",(function(){t.set("content",e.state),t.set("currentStateName",e.currentStateName)}))})),setUnknownProperty(){},open(e,t){var i=(0,r.getOwner)(this),o=(0,r.getOwner)(this).lookup("service:torii"),a=this.get("stateMachine")
+return new Ember.RSVP.Promise((function(e){a.send("startOpen"),e()})).then((function(){return o.open(e,t)})).then((function(t){return n(i,e).open(t)})).then((function(e){return a.send("finishOpen",e),e})).catch((function(e){return a.send("failOpen",e),Ember.RSVP.reject(e)}))},fetch(e,t){var i=(0,r.getOwner)(this),o=this.get("stateMachine")
+return new Ember.RSVP.Promise((function(e){o.send("startFetch"),e()})).then((function(){return n(i,e).fetch(t)})).then((function(e){o.send("finishFetch",e)})).catch((function(e){return o.send("failFetch",e),Ember.RSVP.reject(e)}))},close(e,t){var i=(0,r.getOwner)(this),o=this.get("stateMachine")
+return new Ember.RSVP.Promise((function(e){o.send("startClose"),e()})).then((function(){return n(i,e).close(t)})).then((function(){o.send("finishClose")})).catch((function(e){return o.send("failClose",e),Ember.RSVP.reject(e)}))}})})),define("torii/services/torii",["exports","torii/lib/container-utils"],(function(e,t){"use strict"
+function r(e,r){return function(n,i){var o=function(e,t){return e.lookup("torii-provider:"+t)}((0,t.getOwner)(this),n)
+if(!o)throw new Error("Expected a provider named '"+n+"' , did you forget to register it?")
+if(!o[e]){if(r)throw new Error("Expected provider '"+n+"' to define the '"+e+"' method.")
+return Ember.RSVP.Promise.resolve({})}return new Ember.RSVP.Promise((function(t){t(o[e](i))}))}}Object.defineProperty(e,"__esModule",{value:!0}),e.default=Ember.Service.extend({open:r("open",!0),fetch:r("fetch"),close:r("close")})})),define("torii/session/state-machine",["exports","torii/lib/state-machine"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(e){var o=new t.default({initialState:"unauthenticated",states:{unauthenticated:{errorMessage:null,isAuthenticated:!1,startOpen:i("opening",["errorMessage"]),startFetch:i("fetching",["errorMessage"])},authenticated:{currentUser:null,isAuthenticated:!0,startClose:r("closing")},opening:{isWorking:!0,isOpening:!0,finishOpen(e){n(e,this.states.authenticated),this.transitionTo("authenticated")},failOpen(e){this.states.unauthenticated.errorMessage=e,this.transitionTo("unauthenticated")}},fetching:{isWorking:!0,isFetching:!0,finishFetch(e){n(e,this.states.authenticated),this.transitionTo("authenticated")},failFetch(e){this.states.unauthenticated.errorMessage=e,this.transitionTo("unauthenticated")}},closing:{isWorking:!0,isClosing:!0,isAuthenticated:!0,finishClose(){this.transitionTo("unauthenticated")},failClose(e){this.states.unauthenticated.errorMessage=e,this.transitionTo("unauthenticated")}}}})
+return o.session=e,o}
+var r=t.default.transitionTo
+function n(e,t){for(var r in e)e.hasOwnProperty(r)&&(t[r]=e[r])}function i(e,t){return function(){for(var r;r<t.length;r++)this[t[r]]=null
+this.transitionTo(e)}}})),define("tracked-maps-and-sets/-private/map",["exports","tracked-maps-and-sets/-private/util"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.TrackedWeakMap=e.TrackedMap=void 0
+class r extends Map{get(e){return(0,t.consumeKey)(this,e),super.get(e)}has(e){return(0,t.consumeKey)(this,e),super.has(e)}entries(){return(0,t.consumeCollection)(this),super.entries()}keys(){return(0,t.consumeCollection)(this),super.keys()}values(){return(0,t.consumeCollection)(this),super.values()}forEach(e){(0,t.consumeCollection)(this),super.forEach(e)}get size(){return(0,t.consumeCollection)(this),super.size}set(e,r){return(0,t.dirtyKey)(this,e),(0,t.dirtyCollection)(this),super.set(e,r)}delete(e){return(0,t.dirtyKey)(this,e),(0,t.dirtyCollection)(this),super.delete(e)}clear(){return super.forEach((e,r)=>(0,t.dirtyKey)(this,r)),(0,t.dirtyCollection)(this),super.clear()}}if(e.TrackedMap=r,void 0!==typeof Symbol){let e=r.prototype[Symbol.iterator]
+Object.defineProperty(r.prototype,Symbol.iterator,{get(){return(0,t.consumeCollection)(this),e}})}class n extends WeakMap{get(e){return(0,t.consumeKey)(this,e),super.get(e)}has(e){return(0,t.consumeKey)(this,e),super.has(e)}set(e,r){return(0,t.dirtyKey)(this,e),super.set(e,r)}delete(e){return(0,t.dirtyKey)(this,e),super.delete(e)}}e.TrackedWeakMap=n})),define("tracked-maps-and-sets/-private/set",["exports","tracked-maps-and-sets/-private/util"],(function(e,t){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.TrackedWeakSet=e.TrackedSet=void 0
+class r extends Set{has(e){return(0,t.consumeKey)(this,e),super.has(e)}entries(){return(0,t.consumeCollection)(this),super.entries()}keys(){return(0,t.consumeCollection)(this),super.keys()}values(){return(0,t.consumeCollection)(this),super.values()}forEach(e){(0,t.consumeCollection)(this),super.forEach(e)}get size(){return(0,t.consumeCollection)(this),super.size}add(e){return(0,t.dirtyKey)(this,e),(0,t.dirtyCollection)(this),super.add(e)}delete(e){return(0,t.dirtyKey)(this,e),(0,t.dirtyCollection)(this),super.delete(e)}clear(){return super.forEach((e,r)=>(0,t.dirtyKey)(this,r)),(0,t.dirtyCollection)(this),super.clear()}}if(e.TrackedSet=r,void 0!==typeof Symbol){let e=r.prototype[Symbol.iterator]
+Object.defineProperty(r.prototype,Symbol.iterator,{get(){return(0,t.consumeCollection)(this),e}})}class n extends WeakSet{has(e){return(0,t.consumeKey)(this,e),super.has(e)}add(e){return(0,t.dirtyKey)(this,e),super.add(e)}delete(e){return(0,t.dirtyKey)(this,e),super.delete(e)}}e.TrackedWeakSet=n})),define("tracked-maps-and-sets/-private/util",["exports"],(function(e){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),e.createTag=function(){return new r},e.consumeKey=c,e.dirtyKey=d,e.dirtyCollection=e.consumeCollection=e.dirtyTag=e.consumeTag=void 0
+var t=function(e,t,r,n){var i,o=arguments.length,a=o<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n
+if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(e,t,r,n)
+else for(var s=e.length-1;s>=0;s--)(i=e[s])&&(a=(o<3?i(a):o>3?i(t,r,a):i(t,r))||a)
+return o>3&&a&&Object.defineProperty(t,r,a),a}
+class r{static consumeTag(e){e.__tag_value__}static dirtyTag(e){e.__tag_value__=void 0}}t([Ember._tracked],r.prototype,"__tag_value__",void 0)
+const n=r.consumeTag
+e.consumeTag=n
+const i=r.dirtyTag
+e.dirtyTag=i
+const o={}
+let a=e=>{c(e,o)}
+e.consumeCollection=a
+let s=e=>{d(e,o)}
+e.dirtyCollection=s,void 0!==Ember&&(e.consumeCollection=a=e=>Ember.get(e,"[]"),e.dirtyCollection=s=e=>Ember.notifyPropertyChange(e,"[]"))
+const l=new WeakMap
+function u(e,t){let n=l.get(e)
+void 0===n&&(n=new Map,l.set(e,n))
+let i=n.get(t)
+return void 0===i&&(i=new r,n.set(t,i)),i}function c(e,t){n(u(e,t))}function d(e,t){i(u(e,t))}})),define("tracked-maps-and-sets/index",["exports","tracked-maps-and-sets/-private/map","tracked-maps-and-sets/-private/set"],(function(e,t,r){"use strict"
+Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"TrackedMap",{enumerable:!0,get:function(){return t.TrackedMap}}),Object.defineProperty(e,"TrackedWeakMap",{enumerable:!0,get:function(){return t.TrackedWeakMap}}),Object.defineProperty(e,"TrackedSet",{enumerable:!0,get:function(){return r.TrackedSet}}),Object.defineProperty(e,"TrackedWeakSet",{enumerable:!0,get:function(){return r.TrackedWeakSet}})}))
+var __ember_auto_import__=function(e){function t(t){for(var n,a,s=t[0],l=t[1],u=t[2],d=0,h=[];d<s.length;d++)a=s[d],Object.prototype.hasOwnProperty.call(i,a)&&i[a]&&h.push(i[a][0]),i[a]=0
+for(n in l)Object.prototype.hasOwnProperty.call(l,n)&&(e[n]=l[n])
+for(c&&c(t);h.length;)h.shift()()
+return o.push.apply(o,u||[]),r()}function r(){for(var e,t=0;t<o.length;t++){for(var r=o[t],n=!0,s=1;s<r.length;s++){var l=r[s]
+0!==i[l]&&(n=!1)}n&&(o.splice(t--,1),e=a(a.s=r[0]))}return e}var n={},i={0:0},o=[]
+function a(t){if(n[t])return n[t].exports
+var r=n[t]={i:t,l:!1,exports:{}}
+return e[t].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.m=e,a.c=n,a.d=function(e,t,r){a.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e
+if(4&t&&"object"==typeof e&&e&&e.__esModule)return e
+var r=Object.create(null)
+if(a.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)a.d(r,n,function(t){return e[t]}.bind(null,n))
+return r},a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e}
+return a.d(t,"a",t),t},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.p=""
+var s=window.webpackJsonp_ember_auto_import_=window.webpackJsonp_ember_auto_import_||[],l=s.push.bind(s)
+s.push=t,s=s.slice()
+for(var u=0;u<s.length;u++)t(s[u])
+var c=l
+return o.push([57,2]),r()}({29:function(){window._eai_r=require,window._eai_d=define},57:function(e,t,r){r(29),e.exports=r(58)},58:function(e,t,r){var n,i,o
+"undefined"!=typeof document&&(r.p=(n=document.querySelectorAll("script"))[n.length-1].src.replace(/\/[^/]*$/,"/")),e.exports=(i=_eai_d,o=_eai_r,window.emberAutoImportDynamic=function(e){return 1===arguments.length?o("_eai_dyn_"+e):o("_eai_dynt_"+e)(Array.prototype.slice.call(arguments,1))},i("@lit/reactive-element",[],(function(){return r(128)})),i("@xstate/fsm",[],(function(){return r(59)})),i("a11y-dialog",[],(function(){return r(60)})),i("base64-js",[],(function(){return r(61)})),i("clipboard",[],(function(){return r(62)})),i("d3-array",[],(function(){return r(5)})),i("d3-scale",[],(function(){return r(122)})),i("d3-scale-chromatic",[],(function(){return r(126)})),i("d3-selection",[],(function(){return r(124)})),i("d3-shape",[],(function(){return r(123)})),i("dayjs",[],(function(){return r(63)})),i("dayjs/plugin/calendar",[],(function(){return r(64)})),i("dayjs/plugin/relativeTime",[],(function(){return r(65)})),i("deepmerge",[],(function(){return r(66)})),i("fast-deep-equal",[],(function(){return r(67)})),i("fast-memoize",[],(function(){return r(28)})),i("flat",[],(function(){return r(68)})),i("intersection-observer-admin",[],(function(){return r(69)})),i("intl-messageformat",[],(function(){return r(127)})),i("intl-messageformat-parser",[],(function(){return r(27)})),i("mnemonist/multi-map",[],(function(){return r(70)})),i("mnemonist/set",[],(function(){return r(73)})),i("ngraph.graph",[],(function(){return r(74)})),i("parse-duration",[],(function(){return r(76)})),i("pretty-ms",[],(function(){return r(77)})),i("raf-pool",[],(function(){return r(79)})),i("tippy.js",[],(function(){return r(125)})),i("validated-changeset",[],(function(){return r(80)})),void i("wayfarer",[],(function(){return r(81)})))}});(window.webpackJsonp_ember_auto_import_=window.webpackJsonp_ember_auto_import_||[]).push([[2],[function(e,t,r){"use strict"
+r.d(t,"b",(function(){return i})),r.d(t,"a",(function(){return o})),r.d(t,"c",(function(){return a}))
+
+;/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+var n=function(e,t){return(n=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r])})(e,t)}
+function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Class extends value "+String(t)+" is not a constructor or null")
+function r(){this.constructor=e}n(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}var o=function(){return(o=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var i in t=arguments[r])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i])
+return e}).apply(this,arguments)}
+function a(e,t){for(var r=0,n=t.length,i=e.length;r<n;r++,i++)e[i]=t[r]
+return e}Object.create,Object.create},function(e,t){"use strict"
+t.a=function(e,t){return e<t?-1:e>t?1:e>=t?0:NaN}},function(e,t,r){"use strict"
+var n,i
+function o(e){return e.type===n.literal}function a(e){return e.type===n.argument}function s(e){return e.type===n.number}function l(e){return e.type===n.date}function u(e){return e.type===n.time}function c(e){return e.type===n.select}function d(e){return e.type===n.plural}function h(e){return e.type===n.pound}function f(e){return e.type===n.tag}function p(e){return!(!e||"object"!=typeof e||e.type!==i.number)}function m(e){return!(!e||"object"!=typeof e||e.type!==i.dateTime)}function v(e){return{type:n.literal,value:e}}function g(e,t){return{type:n.number,value:e,style:t}}r.d(t,"b",(function(){return n})),r.d(t,"a",(function(){return i})),r.d(t,"h",(function(){return o})),r.d(t,"e",(function(){return a})),r.d(t,"i",(function(){return s})),r.d(t,"f",(function(){return l})),r.d(t,"o",(function(){return u})),r.d(t,"m",(function(){return c})),r.d(t,"k",(function(){return d})),r.d(t,"l",(function(){return h})),r.d(t,"n",(function(){return f})),r.d(t,"j",(function(){return p})),r.d(t,"g",(function(){return m})),r.d(t,"c",(function(){return v})),r.d(t,"d",(function(){return g})),function(e){e[e.literal=0]="literal",e[e.argument=1]="argument",e[e.number=2]="number",e[e.date=3]="date",e[e.time=4]="time",e[e.select=5]="select",e[e.plural=6]="plural",e[e.pound=7]="pound",e[e.tag=8]="tag"}(n||(n={})),function(e){e[e.number=0]="number",e[e.dateTime=1]="dateTime"}(i||(i={}))},,,function(e,t,r){"use strict"
+r.r(t),r.d(t,"bisect",(function(){return n.d})),r.d(t,"bisectRight",(function(){return n.c})),r.d(t,"bisectLeft",(function(){return n.b})),r.d(t,"bisectCenter",(function(){return n.a})),r.d(t,"ascending",(function(){return i.a})),r.d(t,"bisector",(function(){return o.a})),r.d(t,"count",(function(){return a})),r.d(t,"cross",(function(){return c})),r.d(t,"cumsum",(function(){return d})),r.d(t,"descending",(function(){return h})),r.d(t,"deviation",(function(){return p})),r.d(t,"extent",(function(){return m})),r.d(t,"Adder",(function(){return v})),r.d(t,"fsum",(function(){return g})),r.d(t,"fcumsum",(function(){return b})),r.d(t,"group",(function(){return T})),r.d(t,"groups",(function(){return M})),r.d(t,"index",(function(){return C})),r.d(t,"indexes",(function(){return k})),r.d(t,"rollup",(function(){return A})),r.d(t,"rollups",(function(){return P})),r.d(t,"groupSort",(function(){return I})),r.d(t,"bin",(function(){return V})),r.d(t,"histogram",(function(){return V})),r.d(t,"thresholdFreedmanDiaconis",(function(){return q})),r.d(t,"thresholdScott",(function(){return W})),r.d(t,"thresholdSturges",(function(){return B})),r.d(t,"max",(function(){return G.a})),r.d(t,"maxIndex",(function(){return Y})),r.d(t,"mean",(function(){return K})),r.d(t,"median",(function(){return J})),r.d(t,"merge",(function(){return Q})),r.d(t,"min",(function(){return X.a})),r.d(t,"minIndex",(function(){return Z})),r.d(t,"nice",(function(){return H})),r.d(t,"pairs",(function(){return ee})),r.d(t,"permute",(function(){return D})),r.d(t,"quantile",(function(){return $.a})),r.d(t,"quantileSorted",(function(){return $.b})),r.d(t,"quickselect",(function(){return re.a})),r.d(t,"range",(function(){return ne.a})),r.d(t,"least",(function(){return ie})),r.d(t,"leastIndex",(function(){return oe})),r.d(t,"greatest",(function(){return ae})),r.d(t,"greatestIndex",(function(){return se})),r.d(t,"scan",(function(){return le})),r.d(t,"shuffle",(function(){return ue})),r.d(t,"shuffler",(function(){return ce})),r.d(t,"sum",(function(){return de})),r.d(t,"ticks",(function(){return U.a})),r.d(t,"tickIncrement",(function(){return U.b})),r.d(t,"tickStep",(function(){return U.c})),r.d(t,"transpose",(function(){return he})),r.d(t,"variance",(function(){return f})),r.d(t,"zip",(function(){return pe})),r.d(t,"every",(function(){return me})),r.d(t,"some",(function(){return ve})),r.d(t,"filter",(function(){return ge})),r.d(t,"map",(function(){return be})),r.d(t,"reduce",(function(){return ye})),r.d(t,"reverse",(function(){return _e})),r.d(t,"sort",(function(){return N})),r.d(t,"difference",(function(){return we})),r.d(t,"disjoint",(function(){return Ee})),r.d(t,"intersection",(function(){return Oe})),r.d(t,"subset",(function(){return Te})),r.d(t,"superset",(function(){return Se})),r.d(t,"union",(function(){return Me})),r.d(t,"InternMap",(function(){return y})),r.d(t,"InternSet",(function(){return _}))
+var n=r(11),i=r(1),o=r(18)
+function a(e,t){let r=0
+if(void 0===t)for(let n of e)null!=n&&(n=+n)>=n&&++r
+else{let n=-1
+for(let i of e)null!=(i=t(i,++n,e))&&(i=+i)>=i&&++r}return r}function s(e){return 0|e.length}function l(e){return!(e>0)}function u(e){return"object"!=typeof e||"length"in e?e:Array.from(e)}function c(...e){const t="function"==typeof e[e.length-1]&&function(e){return t=>e(...t)}(e.pop()),r=(e=e.map(u)).map(s),n=e.length-1,i=new Array(n+1).fill(0),o=[]
+if(n<0||r.some(l))return o
+for(;;){o.push(i.map((t,r)=>e[r][t]))
+let a=n
+for(;++i[a]===r[a];){if(0===a)return t?o.map(t):o
+i[a--]=0}}}function d(e,t){var r=0,n=0
+return Float64Array.from(e,void 0===t?e=>r+=+e||0:i=>r+=+t(i,n++,e)||0)}var h=function(e,t){return t<e?-1:t>e?1:t>=e?0:NaN}
+function f(e,t){let r,n=0,i=0,o=0
+if(void 0===t)for(let a of e)null!=a&&(a=+a)>=a&&(r=a-i,i+=r/++n,o+=r*(a-i))
+else{let a=-1
+for(let s of e)null!=(s=t(s,++a,e))&&(s=+s)>=s&&(r=s-i,i+=r/++n,o+=r*(s-i))}if(n>1)return o/(n-1)}function p(e,t){const r=f(e,t)
+return r?Math.sqrt(r):r}var m=function(e,t){let r,n
+if(void 0===t)for(const i of e)null!=i&&(void 0===r?i>=i&&(r=n=i):(r>i&&(r=i),n<i&&(n=i)))
+else{let i=-1
+for(let o of e)null!=(o=t(o,++i,e))&&(void 0===r?o>=o&&(r=n=o):(r>o&&(r=o),n<o&&(n=o)))}return[r,n]}
+class v{constructor(){this._partials=new Float64Array(32),this._n=0}add(e){const t=this._partials
+let r=0
+for(let n=0;n<this._n&&n<32;n++){const i=t[n],o=e+i,a=Math.abs(e)<Math.abs(i)?e-(o-i):i-(o-e)
+a&&(t[r++]=a),e=o}return t[r]=e,this._n=r+1,this}valueOf(){const e=this._partials
+let t,r,n,i=this._n,o=0
+if(i>0){for(o=e[--i];i>0&&(t=o,r=e[--i],o=t+r,n=r-(o-t),!n););i>0&&(n<0&&e[i-1]<0||n>0&&e[i-1]>0)&&(r=2*n,t=o+r,r==t-o&&(o=t))}return o}}function g(e,t){const r=new v
+if(void 0===t)for(let n of e)(n=+n)&&r.add(n)
+else{let n=-1
+for(let i of e)(i=+t(i,++n,e))&&r.add(i)}return+r}function b(e,t){const r=new v
+let n=-1
+return Float64Array.from(e,void 0===t?e=>r.add(+e||0):i=>r.add(+t(i,++n,e)||0))}class y extends Map{constructor(e,t=O){if(super(),Object.defineProperties(this,{_intern:{value:new Map},_key:{value:t}}),null!=e)for(const[r,n]of e)this.set(r,n)}get(e){return super.get(w(this,e))}has(e){return super.has(w(this,e))}set(e,t){return super.set(E(this,e),t)}delete(e){return super.delete(x(this,e))}}class _ extends Set{constructor(e,t=O){if(super(),Object.defineProperties(this,{_intern:{value:new Map},_key:{value:t}}),null!=e)for(const r of e)this.add(r)}has(e){return super.has(w(this,e))}add(e){return super.add(E(this,e))}delete(e){return super.delete(x(this,e))}}function w({_intern:e,_key:t},r){const n=t(r)
+return e.has(n)?e.get(n):r}function E({_intern:e,_key:t},r){const n=t(r)
+return e.has(n)?e.get(n):(e.set(n,r),r)}function x({_intern:e,_key:t},r){const n=t(r)
+return e.has(n)&&(r=e.get(r),e.delete(n)),r}function O(e){return null!==e&&"object"==typeof e?e.valueOf():e}var S=function(e){return e}
+function T(e,...t){return j(e,S,S,t)}function M(e,...t){return j(e,Array.from,S,t)}function A(e,t,...r){return j(e,S,t,r)}function P(e,t,...r){return j(e,Array.from,t,r)}function C(e,...t){return j(e,S,R,t)}function k(e,...t){return j(e,Array.from,R,t)}function R(e){if(1!==e.length)throw new Error("duplicate key")
+return e[0]}function j(e,t,r,n){return function e(i,o){if(o>=n.length)return r(i)
+const a=new y,s=n[o++]
+let l=-1
+for(const t of i){const e=s(t,++l,i),r=a.get(e)
+r?r.push(t):a.set(e,[t])}for(const[t,r]of a)a.set(t,e(r,o))
+return t(a)}(e,0)}var D=function(e,t){return Array.from(t,t=>e[t])}
+function N(e,...t){if("function"!=typeof e[Symbol.iterator])throw new TypeError("values is not iterable")
+e=Array.from(e)
+let[r=i.a]=t
+if(1===r.length||t.length>1){const n=Uint32Array.from(e,(e,t)=>t)
+return t.length>1?(t=t.map(t=>e.map(t)),n.sort((e,r)=>{for(const n of t){const t=Object(i.a)(n[e],n[r])
+if(t)return t}})):(r=e.map(r),n.sort((e,t)=>Object(i.a)(r[e],r[t]))),D(e,n)}return e.sort(r)}function I(e,t,r){return(1===t.length?N(A(e,t,r),([e,t],[r,n])=>Object(i.a)(t,n)||Object(i.a)(e,r)):N(T(e,r),([e,r],[n,o])=>t(r,o)||Object(i.a)(e,n))).map(([e])=>e)}var L=Array.prototype,F=L.slice,z=(L.map,function(e){return function(){return e}}),U=r(6)
+function H(e,t,r){let n
+for(;;){const i=Object(U.b)(e,t,r)
+if(i===n||0===i||!isFinite(i))return[e,t]
+i>0?(e=Math.floor(e/i)*i,t=Math.ceil(t/i)*i):i<0&&(e=Math.ceil(e*i)/i,t=Math.floor(t*i)/i),n=i}}var B=function(e){return Math.ceil(Math.log(a(e))/Math.LN2)+1},V=function(){var e=S,t=m,r=B
+function i(i){Array.isArray(i)||(i=Array.from(i))
+var o,a,s=i.length,l=new Array(s)
+for(o=0;o<s;++o)l[o]=e(i[o],o,i)
+var u=t(l),c=u[0],d=u[1],h=r(l,c,d)
+if(!Array.isArray(h)){const e=d,r=+h
+if(t===m&&([c,d]=H(c,d,r)),(h=Object(U.a)(c,d,r))[h.length-1]>=d)if(e>=d&&t===m){const e=Object(U.b)(c,d,r)
+isFinite(e)&&(e>0?d=(Math.floor(d/e)+1)*e:e<0&&(d=(Math.ceil(d*-e)+1)/-e))}else h.pop()}for(var f=h.length;h[0]<=c;)h.shift(),--f
+for(;h[f-1]>d;)h.pop(),--f
+var p,v=new Array(f+1)
+for(o=0;o<=f;++o)(p=v[o]=[]).x0=o>0?h[o-1]:c,p.x1=o<f?h[o]:d
+for(o=0;o<s;++o)c<=(a=l[o])&&a<=d&&v[Object(n.d)(h,a,0,f)].push(i[o])
+return v}return i.value=function(t){return arguments.length?(e="function"==typeof t?t:z(t),i):e},i.domain=function(e){return arguments.length?(t="function"==typeof e?e:z([e[0],e[1]]),i):t},i.thresholds=function(e){return arguments.length?(r="function"==typeof e?e:Array.isArray(e)?z(F.call(e)):z(e),i):r},i},$=r(10),q=function(e,t,r){return Math.ceil((r-t)/(2*(Object($.a)(e,.75)-Object($.a)(e,.25))*Math.pow(a(e),-1/3)))},W=function(e,t,r){return Math.ceil((r-t)/(3.5*p(e)*Math.pow(a(e),-1/3)))},G=r(19)
+function Y(e,t){let r,n=-1,i=-1
+if(void 0===t)for(const o of e)++i,null!=o&&(r<o||void 0===r&&o>=o)&&(r=o,n=i)
+else for(let o of e)null!=(o=t(o,++i,e))&&(r<o||void 0===r&&o>=o)&&(r=o,n=i)
+return n}function K(e,t){let r=0,n=0
+if(void 0===t)for(let i of e)null!=i&&(i=+i)>=i&&(++r,n+=i)
+else{let i=-1
+for(let o of e)null!=(o=t(o,++i,e))&&(o=+o)>=o&&(++r,n+=o)}if(r)return n/r}var J=function(e,t){return Object($.a)(e,.5,t)}
+function Q(e){return Array.from(function*(e){for(const t of e)yield*t}(e))}var X=r(12)
+function Z(e,t){let r,n=-1,i=-1
+if(void 0===t)for(const o of e)++i,null!=o&&(r>o||void 0===r&&o>=o)&&(r=o,n=i)
+else for(let o of e)null!=(o=t(o,++i,e))&&(r>o||void 0===r&&o>=o)&&(r=o,n=i)
+return n}function ee(e,t=te){const r=[]
+let n,i=!1
+for(const o of e)i&&r.push(t(n,o)),n=o,i=!0
+return r}function te(e,t){return[e,t]}var re=r(26),ne=r(37)
+function ie(e,t=i.a){let r,n=!1
+if(1===t.length){let o
+for(const a of e){const e=t(a);(n?Object(i.a)(e,o)<0:0===Object(i.a)(e,e))&&(r=a,o=e,n=!0)}}else for(const i of e)(n?t(i,r)<0:0===t(i,i))&&(r=i,n=!0)
+return r}function oe(e,t=i.a){if(1===t.length)return Z(e,t)
+let r,n=-1,o=-1
+for(const i of e)++o,(n<0?0===t(i,i):t(i,r)<0)&&(r=i,n=o)
+return n}function ae(e,t=i.a){let r,n=!1
+if(1===t.length){let o
+for(const a of e){const e=t(a);(n?Object(i.a)(e,o)>0:0===Object(i.a)(e,e))&&(r=a,o=e,n=!0)}}else for(const i of e)(n?t(i,r)>0:0===t(i,i))&&(r=i,n=!0)
+return r}function se(e,t=i.a){if(1===t.length)return Y(e,t)
+let r,n=-1,o=-1
+for(const i of e)++o,(n<0?0===t(i,i):t(i,r)>0)&&(r=i,n=o)
+return n}function le(e,t){const r=oe(e,t)
+return r<0?void 0:r}var ue=ce(Math.random)
+function ce(e){return function(t,r=0,n=t.length){let i=n-(r=+r)
+for(;i;){const n=e()*i--|0,o=t[i+r]
+t[i+r]=t[n+r],t[n+r]=o}return t}}function de(e,t){let r=0
+if(void 0===t)for(let n of e)(n=+n)&&(r+=n)
+else{let n=-1
+for(let i of e)(i=+t(i,++n,e))&&(r+=i)}return r}var he=function(e){if(!(i=e.length))return[]
+for(var t=-1,r=Object(X.a)(e,fe),n=new Array(r);++t<r;)for(var i,o=-1,a=n[t]=new Array(i);++o<i;)a[o]=e[o][t]
+return n}
+function fe(e){return e.length}var pe=function(){return he(arguments)}
+function me(e,t){if("function"!=typeof t)throw new TypeError("test is not a function")
+let r=-1
+for(const n of e)if(!t(n,++r,e))return!1
+return!0}function ve(e,t){if("function"!=typeof t)throw new TypeError("test is not a function")
+let r=-1
+for(const n of e)if(t(n,++r,e))return!0
+return!1}function ge(e,t){if("function"!=typeof t)throw new TypeError("test is not a function")
+const r=[]
+let n=-1
+for(const i of e)t(i,++n,e)&&r.push(i)
+return r}function be(e,t){if("function"!=typeof e[Symbol.iterator])throw new TypeError("values is not iterable")
+if("function"!=typeof t)throw new TypeError("mapper is not a function")
+return Array.from(e,(r,n)=>t(r,n,e))}function ye(e,t,r){if("function"!=typeof t)throw new TypeError("reducer is not a function")
+const n=e[Symbol.iterator]()
+let i,o,a=-1
+if(arguments.length<3){if(({done:i,value:r}=n.next()),i)return;++a}for(;({done:i,value:o}=n.next()),!i;)r=t(r,o,++a,e)
+return r}function _e(e){if("function"!=typeof e[Symbol.iterator])throw new TypeError("values is not iterable")
+return Array.from(e).reverse()}function we(e,...t){e=new Set(e)
+for(const r of t)for(const t of r)e.delete(t)
+return e}function Ee(e,t){const r=t[Symbol.iterator](),n=new Set
+for(const i of e){if(n.has(i))return!1
+let e,t
+for(;({value:e,done:t}=r.next())&&!t;){if(Object.is(i,e))return!1
+n.add(e)}}return!0}function xe(e){return e instanceof Set?e:new Set(e)}function Oe(e,...t){e=new Set(e),t=t.map(xe)
+e:for(const r of e)for(const n of t)if(!n.has(r)){e.delete(r)
+continue e}return e}function Se(e,t){const r=e[Symbol.iterator](),n=new Set
+for(const i of t){if(n.has(i))continue
+let e,t
+for(;({value:e,done:t}=r.next());){if(t)return!1
+if(n.add(e),Object.is(i,e))break}}return!0}function Te(e,t){return Se(t,e)}function Me(...e){const t=new Set
+for(const r of e)for(const e of r)t.add(e)
+return t}},function(e,t,r){"use strict"
+r.d(t,"b",(function(){return a})),r.d(t,"c",(function(){return s}))
+var n=Math.sqrt(50),i=Math.sqrt(10),o=Math.sqrt(2)
+function a(e,t,r){var a=(t-e)/Math.max(0,r),s=Math.floor(Math.log(a)/Math.LN10),l=a/Math.pow(10,s)
+return s>=0?(l>=n?10:l>=i?5:l>=o?2:1)*Math.pow(10,s):-Math.pow(10,-s)/(l>=n?10:l>=i?5:l>=o?2:1)}function s(e,t,r){var a=Math.abs(t-e)/Math.max(0,r),s=Math.pow(10,Math.floor(Math.log(a)/Math.LN10)),l=a/s
+return l>=n?s*=10:l>=i?s*=5:l>=o&&(s*=2),t<e?-s:s}t.a=function(e,t,r){var n,i,o,s,l=-1
+if(r=+r,(e=+e)==(t=+t)&&r>0)return[e]
+if((n=t<e)&&(i=e,e=t,t=i),0===(s=a(e,t,r))||!isFinite(s))return[]
+if(s>0)for(e=Math.ceil(e/s),t=Math.floor(t/s),o=new Array(i=Math.ceil(t-e+1));++l<i;)o[l]=(e+l)*s
+else for(s=-s,e=Math.ceil(e*s),t=Math.floor(t*s),o=new Array(i=Math.ceil(t-e+1));++l<i;)o[l]=(e+l)/s
+return n&&o.reverse(),o}},function(e,t,r){"use strict"
+function n(e,t){var r=Object.create(e.prototype)
+for(var n in t)r[n]=t[n]
+return r}r.d(t,"b",(function(){return n})),t.a=function(e,t,r){e.prototype=t.prototype=r,r.constructor=e}},function(e,t,r){"use strict"
+r.d(t,"c",(function(){return o})),r.d(t,"b",(function(){return a})),r.d(t,"a",(function(){return s}))
+var n=r(14)
+function i(e,t){return function(r){return e+r*t}}function o(e,t){var r=t-e
+return r?i(e,r>180||r<-180?r-360*Math.round(r/360):r):Object(n.a)(isNaN(e)?t:e)}function a(e){return 1==(e=+e)?s:function(t,r){return r-t?function(e,t,r){return e=Math.pow(e,r),t=Math.pow(t,r)-e,r=1/r,function(n){return Math.pow(e+n*t,r)}}(t,r,e):Object(n.a)(isNaN(t)?r:t)}}function s(e,t){var r=t-e
+return r?i(e,r):Object(n.a)(isNaN(e)?t:e)}},function(e,t,r){"use strict"
+r.d(t,"a",(function(){return i})),r.d(t,"d",(function(){return o})),r.d(t,"c",(function(){return a})),r.d(t,"e",(function(){return _})),r.d(t,"g",(function(){return x})),r.d(t,"f",(function(){return O})),r.d(t,"b",(function(){return S}))
+var n=r(7)
+function i(){}var o=.7,a=1/o,s="\\s*([+-]?\\d+)\\s*",l="\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)\\s*",u="\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)%\\s*",c=/^#([0-9a-f]{3,8})$/,d=new RegExp("^rgb\\("+[s,s,s]+"\\)$"),h=new RegExp("^rgb\\("+[u,u,u]+"\\)$"),f=new RegExp("^rgba\\("+[s,s,s,l]+"\\)$"),p=new RegExp("^rgba\\("+[u,u,u,l]+"\\)$"),m=new RegExp("^hsl\\("+[l,u,u]+"\\)$"),v=new RegExp("^hsla\\("+[l,u,u,l]+"\\)$"),g={aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074}
+function b(){return this.rgb().formatHex()}function y(){return this.rgb().formatRgb()}function _(e){var t,r
+return e=(e+"").trim().toLowerCase(),(t=c.exec(e))?(r=t[1].length,t=parseInt(t[1],16),6===r?w(t):3===r?new S(t>>8&15|t>>4&240,t>>4&15|240&t,(15&t)<<4|15&t,1):8===r?E(t>>24&255,t>>16&255,t>>8&255,(255&t)/255):4===r?E(t>>12&15|t>>8&240,t>>8&15|t>>4&240,t>>4&15|240&t,((15&t)<<4|15&t)/255):null):(t=d.exec(e))?new S(t[1],t[2],t[3],1):(t=h.exec(e))?new S(255*t[1]/100,255*t[2]/100,255*t[3]/100,1):(t=f.exec(e))?E(t[1],t[2],t[3],t[4]):(t=p.exec(e))?E(255*t[1]/100,255*t[2]/100,255*t[3]/100,t[4]):(t=m.exec(e))?P(t[1],t[2]/100,t[3]/100,1):(t=v.exec(e))?P(t[1],t[2]/100,t[3]/100,t[4]):g.hasOwnProperty(e)?w(g[e]):"transparent"===e?new S(NaN,NaN,NaN,0):null}function w(e){return new S(e>>16&255,e>>8&255,255&e,1)}function E(e,t,r,n){return n<=0&&(e=t=r=NaN),new S(e,t,r,n)}function x(e){return e instanceof i||(e=_(e)),e?new S((e=e.rgb()).r,e.g,e.b,e.opacity):new S}function O(e,t,r,n){return 1===arguments.length?x(e):new S(e,t,r,null==n?1:n)}function S(e,t,r,n){this.r=+e,this.g=+t,this.b=+r,this.opacity=+n}function T(){return"#"+A(this.r)+A(this.g)+A(this.b)}function M(){var e=this.opacity
+return(1===(e=isNaN(e)?1:Math.max(0,Math.min(1,e)))?"rgb(":"rgba(")+Math.max(0,Math.min(255,Math.round(this.r)||0))+", "+Math.max(0,Math.min(255,Math.round(this.g)||0))+", "+Math.max(0,Math.min(255,Math.round(this.b)||0))+(1===e?")":", "+e+")")}function A(e){return((e=Math.max(0,Math.min(255,Math.round(e)||0)))<16?"0":"")+e.toString(16)}function P(e,t,r,n){return n<=0?e=t=r=NaN:r<=0||r>=1?e=t=NaN:t<=0&&(e=NaN),new k(e,t,r,n)}function C(e){if(e instanceof k)return new k(e.h,e.s,e.l,e.opacity)
+if(e instanceof i||(e=_(e)),!e)return new k
+if(e instanceof k)return e
+var t=(e=e.rgb()).r/255,r=e.g/255,n=e.b/255,o=Math.min(t,r,n),a=Math.max(t,r,n),s=NaN,l=a-o,u=(a+o)/2
+return l?(s=t===a?(r-n)/l+6*(r<n):r===a?(n-t)/l+2:(t-r)/l+4,l/=u<.5?a+o:2-a-o,s*=60):l=u>0&&u<1?0:s,new k(s,l,u,e.opacity)}function k(e,t,r,n){this.h=+e,this.s=+t,this.l=+r,this.opacity=+n}function R(e,t,r){return 255*(e<60?t+(r-t)*e/60:e<180?r:e<240?t+(r-t)*(240-e)/60:t)}Object(n.a)(i,_,{copy:function(e){return Object.assign(new this.constructor,this,e)},displayable:function(){return this.rgb().displayable()},hex:b,formatHex:b,formatHsl:function(){return C(this).formatHsl()},formatRgb:y,toString:y}),Object(n.a)(S,O,Object(n.b)(i,{brighter:function(e){return e=null==e?a:Math.pow(a,e),new S(this.r*e,this.g*e,this.b*e,this.opacity)},darker:function(e){return e=null==e?o:Math.pow(o,e),new S(this.r*e,this.g*e,this.b*e,this.opacity)},rgb:function(){return this},displayable:function(){return-.5<=this.r&&this.r<255.5&&-.5<=this.g&&this.g<255.5&&-.5<=this.b&&this.b<255.5&&0<=this.opacity&&this.opacity<=1},hex:T,formatHex:T,formatRgb:M,toString:M})),Object(n.a)(k,(function(e,t,r,n){return 1===arguments.length?C(e):new k(e,t,r,null==n?1:n)}),Object(n.b)(i,{brighter:function(e){return e=null==e?a:Math.pow(a,e),new k(this.h,this.s,this.l*e,this.opacity)},darker:function(e){return e=null==e?o:Math.pow(o,e),new k(this.h,this.s,this.l*e,this.opacity)},rgb:function(){var e=this.h%360+360*(this.h<0),t=isNaN(e)||isNaN(this.s)?0:this.s,r=this.l,n=r+(r<.5?r:1-r)*t,i=2*r-n
+return new S(R(e>=240?e-240:e+120,i,n),R(e,i,n),R(e<120?e+240:e-120,i,n),this.opacity)},displayable:function(){return(0<=this.s&&this.s<=1||isNaN(this.s))&&0<=this.l&&this.l<=1&&0<=this.opacity&&this.opacity<=1},formatHsl:function(){var e=this.opacity
+return(1===(e=isNaN(e)?1:Math.max(0,Math.min(1,e)))?"hsl(":"hsla(")+(this.h||0)+", "+100*(this.s||0)+"%, "+100*(this.l||0)+"%"+(1===e?")":", "+e+")")}}))},function(e,t,r){"use strict"
+r.d(t,"a",(function(){return s})),r.d(t,"b",(function(){return l}))
+var n=r(19),i=r(12),o=r(26),a=r(20)
+function s(e,t,r){if(s=(e=Float64Array.from(Object(a.b)(e,r))).length){if((t=+t)<=0||s<2)return Object(i.a)(e)
+if(t>=1)return Object(n.a)(e)
+var s,l=(s-1)*t,u=Math.floor(l),c=Object(n.a)(Object(o.a)(e,u).subarray(0,u+1))
+return c+(Object(i.a)(e.subarray(u+1))-c)*(l-u)}}function l(e,t,r=a.a){if(n=e.length){if((t=+t)<=0||n<2)return+r(e[0],0,e)
+if(t>=1)return+r(e[n-1],n-1,e)
+var n,i=(n-1)*t,o=Math.floor(i),s=+r(e[o],o,e)
+return s+(+r(e[o+1],o+1,e)-s)*(i-o)}}},function(e,t,r){"use strict"
+r.d(t,"c",(function(){return s})),r.d(t,"b",(function(){return l})),r.d(t,"a",(function(){return u}))
+var n=r(1),i=r(18),o=r(20)
+const a=Object(i.a)(n.a),s=a.right,l=a.left,u=Object(i.a)(o.a).center
+t.d=s},function(e,t,r){"use strict"
+function n(e,t){let r
+if(void 0===t)for(const n of e)null!=n&&(r>n||void 0===r&&n>=n)&&(r=n)
+else{let n=-1
+for(let i of e)null!=(i=t(i,++n,e))&&(r>i||void 0===r&&i>=i)&&(r=i)}return r}r.d(t,"a",(function(){return n}))},,function(e,t){"use strict"
+t.a=e=>()=>e},,,,function(e,t,r){"use strict"
+var n=r(1)
+t.a=function(e){let t=e,r=e
+function i(e,t,n,i){for(null==n&&(n=0),null==i&&(i=e.length);n<i;){const o=n+i>>>1
+r(e[o],t)<0?n=o+1:i=o}return n}return 1===e.length&&(t=(t,r)=>e(t)-r,r=function(e){return(t,r)=>Object(n.a)(e(t),r)}(e)),{left:i,center:function(e,r,n,o){null==n&&(n=0),null==o&&(o=e.length)
+const a=i(e,r,n,o-1)
+return a>n&&t(e[a-1],r)>-t(e[a],r)?a-1:a},right:function(e,t,n,i){for(null==n&&(n=0),null==i&&(i=e.length);n<i;){const o=n+i>>>1
+r(e[o],t)>0?i=o:n=o+1}return n}}}},function(e,t,r){"use strict"
+function n(e,t){let r
+if(void 0===t)for(const n of e)null!=n&&(r<n||void 0===r&&n>=n)&&(r=n)
+else{let n=-1
+for(let i of e)null!=(i=t(i,++n,e))&&(r<i||void 0===r&&i>=i)&&(r=i)}return r}r.d(t,"a",(function(){return n}))},function(e,t,r){"use strict"
+function*n(e,t){if(void 0===t)for(let r of e)null!=r&&(r=+r)>=r&&(yield r)
+else{let r=-1
+for(let n of e)null!=(n=t(n,++r,e))&&(n=+n)>=n&&(yield n)}}r.d(t,"b",(function(){return n})),t.a=function(e){return null===e?NaN:+e}},,,,,,function(e,t,r){"use strict"
+r.d(t,"a",(function(){return i}))
+var n=r(1)
+function i(e,t,r=0,a=e.length-1,s=n.a){for(;a>r;){if(a-r>600){const n=a-r+1,o=t-r+1,l=Math.log(n),u=.5*Math.exp(2*l/3),c=.5*Math.sqrt(l*u*(n-u)/n)*(o-n/2<0?-1:1)
+i(e,t,Math.max(r,Math.floor(t-o*u/n+c)),Math.min(a,Math.floor(t+(n-o)*u/n+c)),s)}const n=e[t]
+let l=r,u=a
+for(o(e,r,t),s(e[a],n)>0&&o(e,r,a);l<u;){for(o(e,l,u),++l,--u;s(e[l],n)<0;)++l
+for(;s(e[u],n)>0;)--u}0===s(e[r],n)?o(e,r,u):(++u,o(e,u,a)),u<=t&&(r=u+1),t<=u&&(a=u-1)}return e}function o(e,t,r){const n=e[t]
+e[t]=e[r],e[r]=n}},function(e,t,r){"use strict"
+r.r(t),r.d(t,"TYPE",(function(){return i.b})),r.d(t,"SKELETON_TYPE",(function(){return i.a})),r.d(t,"isLiteralElement",(function(){return i.h})),r.d(t,"isArgumentElement",(function(){return i.e})),r.d(t,"isNumberElement",(function(){return i.i})),r.d(t,"isDateElement",(function(){return i.f})),r.d(t,"isTimeElement",(function(){return i.o})),r.d(t,"isSelectElement",(function(){return i.m})),r.d(t,"isPluralElement",(function(){return i.k})),r.d(t,"isPoundElement",(function(){return i.l})),r.d(t,"isTagElement",(function(){return i.n})),r.d(t,"isNumberSkeleton",(function(){return i.j})),r.d(t,"isDateTimeSkeleton",(function(){return i.g})),r.d(t,"createLiteralElement",(function(){return i.c})),r.d(t,"createNumberElement",(function(){return i.d})),r.d(t,"SyntaxError",(function(){return m})),r.d(t,"pegParse",(function(){return v})),r.d(t,"parse",(function(){return b}))
+var n=r(0),i=r(2),o=/(?:[Eec]{1,6}|G{1,5}|[Qq]{1,5}|(?:[yYur]+|U{1,5})|[ML]{1,5}|d{1,2}|D{1,3}|F{1}|[abB]{1,5}|[hkHK]{1,2}|w{1,2}|W{1}|m{1,2}|s{1,2}|[zZOvVxX]{1,4})(?=([^']*'[^']*')*[^']*$)/g,a=/^\.(?:(0+)(\*)?|(#+)|(0+)(#+))$/g,s=/^(@+)?(\+|#+)?$/g,l=/(\*)(0+)|(#+)(0+)|(0+)/g,u=/^(0+)$/
+function c(e){var t={}
+return e.replace(s,(function(e,r,n){return"string"!=typeof n?(t.minimumSignificantDigits=r.length,t.maximumSignificantDigits=r.length):"+"===n?t.minimumSignificantDigits=r.length:"#"===r[0]?t.maximumSignificantDigits=r.length:(t.minimumSignificantDigits=r.length,t.maximumSignificantDigits=r.length+("string"==typeof n?n.length:0)),""})),t}function d(e){switch(e){case"sign-auto":return{signDisplay:"auto"}
+case"sign-accounting":case"()":return{currencySign:"accounting"}
+case"sign-always":case"+!":return{signDisplay:"always"}
+case"sign-accounting-always":case"()!":return{signDisplay:"always",currencySign:"accounting"}
+case"sign-except-zero":case"+?":return{signDisplay:"exceptZero"}
+case"sign-accounting-except-zero":case"()?":return{signDisplay:"exceptZero",currencySign:"accounting"}
+case"sign-never":case"+_":return{signDisplay:"never"}}}function h(e){var t
+if("E"===e[0]&&"E"===e[1]?(t={notation:"engineering"},e=e.slice(2)):"E"===e[0]&&(t={notation:"scientific"},e=e.slice(1)),t){var r=e.slice(0,2)
+if("+!"===r?(t.signDisplay="always",e=e.slice(2)):"+?"===r&&(t.signDisplay="exceptZero",e=e.slice(2)),!u.test(e))throw new Error("Malformed concise eng/scientific notation")
+t.minimumIntegerDigits=e.length}return t}function f(e){return d(e)||{}}function p(e){for(var t={},r=0,i=e;r<i.length;r++){var o=i[r]
+switch(o.stem){case"percent":case"%":t.style="percent"
+continue
+case"%x100":t.style="percent",t.scale=100
+continue
+case"currency":t.style="currency",t.currency=o.options[0]
+continue
+case"group-off":case",_":t.useGrouping=!1
+continue
+case"precision-integer":case".":t.maximumFractionDigits=0
+continue
+case"measure-unit":case"unit":t.style="unit",t.unit=o.options[0].replace(/^(.*?)-/,"")
+continue
+case"compact-short":case"K":t.notation="compact",t.compactDisplay="short"
+continue
+case"compact-long":case"KK":t.notation="compact",t.compactDisplay="long"
+continue
+case"scientific":t=Object(n.a)(Object(n.a)(Object(n.a)({},t),{notation:"scientific"}),o.options.reduce((function(e,t){return Object(n.a)(Object(n.a)({},e),f(t))}),{}))
+continue
+case"engineering":t=Object(n.a)(Object(n.a)(Object(n.a)({},t),{notation:"engineering"}),o.options.reduce((function(e,t){return Object(n.a)(Object(n.a)({},e),f(t))}),{}))
+continue
+case"notation-simple":t.notation="standard"
+continue
+case"unit-width-narrow":t.currencyDisplay="narrowSymbol",t.unitDisplay="narrow"
+continue
+case"unit-width-short":t.currencyDisplay="code",t.unitDisplay="short"
+continue
+case"unit-width-full-name":t.currencyDisplay="name",t.unitDisplay="long"
+continue
+case"unit-width-iso-code":t.currencyDisplay="symbol"
+continue
+case"scale":t.scale=parseFloat(o.options[0])
+continue
+case"integer-width":if(o.options.length>1)throw new RangeError("integer-width stems only accept a single optional option")
+o.options[0].replace(l,(function(e,r,n,i,o,a){if(r)t.minimumIntegerDigits=n.length
+else{if(i&&o)throw new Error("We currently do not support maximum integer digits")
+if(a)throw new Error("We currently do not support exact integer digits")}return""}))
+continue}if(u.test(o.stem))t.minimumIntegerDigits=o.stem.length
+else if(a.test(o.stem)){if(o.options.length>1)throw new RangeError("Fraction-precision stems only accept a single optional option")
+o.stem.replace(a,(function(e,r,n,i,o,a){return"*"===n?t.minimumFractionDigits=r.length:i&&"#"===i[0]?t.maximumFractionDigits=i.length:o&&a?(t.minimumFractionDigits=o.length,t.maximumFractionDigits=o.length+a.length):(t.minimumFractionDigits=r.length,t.maximumFractionDigits=r.length),""})),o.options.length&&(t=Object(n.a)(Object(n.a)({},t),c(o.options[0])))}else if(s.test(o.stem))t=Object(n.a)(Object(n.a)({},t),c(o.stem))
+else{var p=d(o.stem)
+p&&(t=Object(n.a)(Object(n.a)({},t),p))
+var m=h(o.stem)
+m&&(t=Object(n.a)(Object(n.a)({},t),m))}}return t}var m=function(e){function t(r,n,i,o){var a=e.call(this)||this
+return a.message=r,a.expected=n,a.found=i,a.location=o,a.name="SyntaxError","function"==typeof Error.captureStackTrace&&Error.captureStackTrace(a,t),a}return Object(n.b)(t,e),t.buildMessage=function(e,t){function r(e){return e.charCodeAt(0).toString(16).toUpperCase()}function n(e){return e.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,(function(e){return"\\x0"+r(e)})).replace(/[\x10-\x1F\x7F-\x9F]/g,(function(e){return"\\x"+r(e)}))}function i(e){return e.replace(/\\/g,"\\\\").replace(/\]/g,"\\]").replace(/\^/g,"\\^").replace(/-/g,"\\-").replace(/\0/g,"\\0").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/[\x00-\x0F]/g,(function(e){return"\\x0"+r(e)})).replace(/[\x10-\x1F\x7F-\x9F]/g,(function(e){return"\\x"+r(e)}))}function o(e){switch(e.type){case"literal":return'"'+n(e.text)+'"'
+case"class":var t=e.parts.map((function(e){return Array.isArray(e)?i(e[0])+"-"+i(e[1]):i(e)}))
+return"["+(e.inverted?"^":"")+t+"]"
+case"any":return"any character"
+case"end":return"end of input"
+case"other":return e.description}}return"Expected "+function(e){var t,r,n=e.map(o)
+if(n.sort(),n.length>0){for(t=1,r=1;t<n.length;t++)n[t-1]!==n[t]&&(n[r]=n[t],r++)
+n.length=r}switch(n.length){case 1:return n[0]
+case 2:return n[0]+" or "+n[1]
+default:return n.slice(0,-1).join(", ")+", or "+n[n.length-1]}}(e)+" but "+((a=t)?'"'+n(a)+'"':"end of input")+" found."
+var a},t}(Error),v=function(e,t){t=void 0!==t?t:{}
+var r,a={},s={start:Ce},l=Ce,u=Oe("<",!1),c=function(e){return e.join("")},d=Oe("#",!1),h=Te("tagElement"),f=Oe("/>",!1),v=Oe(">",!1),g=Oe("</",!1),b=Te("argumentElement"),y=Oe("{",!1),_=Oe("}",!1),w=Te("numberSkeletonId"),E=/^['\/{}]/,x=Se(["'","/","{","}"],!1,!1),O={type:"any"},S=Te("numberSkeletonTokenOption"),T=Oe("/",!1),M=Te("numberSkeletonToken"),A=Oe("::",!1),P=function(e){return rt.pop(),e.replace(/\s*$/,"")},C=Oe(",",!1),k=Oe("number",!1),R=function(e,t,r){return Object(n.a)({type:"number"===t?i.b.number:"date"===t?i.b.date:i.b.time,style:r&&r[2],value:e},it())},j=Oe("'",!1),D=/^[^']/,N=Se(["'"],!0,!1),I=/^[^a-zA-Z'{}]/,L=Se([["a","z"],["A","Z"],"'","{","}"],!0,!1),F=/^[a-zA-Z]/,z=Se([["a","z"],["A","Z"]],!1,!1),U=Oe("date",!1),H=Oe("time",!1),B=Oe("plural",!1),V=Oe("selectordinal",!1),$=Oe("offset:",!1),q=Oe("select",!1),W=Oe("=",!1),G=Te("whitespace"),Y=/^[\t-\r \x85\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000]/,K=Se([["\t","\r"]," ","…"," "," ",[" "," "],"\u2028","\u2029"," "," ","　"],!1,!1),J=Te("syntax pattern"),Q=/^[!-\/:-@[-\^`{-~\xA1-\xA7\xA9\xAB\xAC\xAE\xB0\xB1\xB6\xBB\xBF\xD7\xF7\u2010-\u2027\u2030-\u203E\u2041-\u2053\u2055-\u205E\u2190-\u245F\u2500-\u2775\u2794-\u2BFF\u2E00-\u2E7F\u3001-\u3003\u3008-\u3020\u3030\uFD3E\uFD3F\uFE45\uFE46]/,X=Se([["!","/"],[":","@"],["[","^"],"`",["{","~"],["¡","§"],"©","«","¬","®","°","±","¶","»","¿","×","÷",["‐","‧"],["‰","‾"],["⁁","⁓"],["⁕","⁞"],["←","⑟"],["─","❵"],["➔","⯿"],["⸀","⹿"],["、","〃"],["〈","〠"],"〰","﴾","﴿","﹅","﹆"],!1,!1),Z=Te("optional whitespace"),ee=Te("number"),te=Oe("-",!1),re=(Te("apostrophe"),Te("double apostrophes")),ne=Oe("''",!1),ie=Oe("\n",!1),oe=Te("argNameOrNumber"),ae=Te("validTag"),se=Te("argNumber"),le=Oe("0",!1),ue=/^[1-9]/,ce=Se([["1","9"]],!1,!1),de=/^[0-9]/,he=Se([["0","9"]],!1,!1),fe=Te("argName"),pe=Te("tagName"),me=0,ve=0,ge=[{line:1,column:1}],be=0,ye=[],_e=0
+if(void 0!==t.startRule){if(!(t.startRule in s))throw new Error("Can't start parsing from rule \""+t.startRule+'".')
+l=s[t.startRule]}function we(){return e.substring(ve,me)}function Ee(){return Ae(ve,me)}function xe(e,t){throw function(e,t){return new m(e,[],"",t)}(e,t=void 0!==t?t:Ae(ve,me))}function Oe(e,t){return{type:"literal",text:e,ignoreCase:t}}function Se(e,t,r){return{type:"class",parts:e,inverted:t,ignoreCase:r}}function Te(e){return{type:"other",description:e}}function Me(t){var r,n=ge[t]
+if(n)return n
+for(r=t-1;!ge[r];)r--
+for(n={line:(n=ge[r]).line,column:n.column};r<t;)10===e.charCodeAt(r)?(n.line++,n.column=1):n.column++,r++
+return ge[t]=n,n}function Ae(e,t){var r=Me(e),n=Me(t)
+return{start:{offset:e,line:r.line,column:r.column},end:{offset:t,line:n.line,column:n.column}}}function Pe(e){me<be||(me>be&&(be=me,ye=[]),ye.push(e))}function Ce(){return ke()}function ke(){var e,t
+for(e=[],t=Re();t!==a;)e.push(t),t=Re()
+return e}function Re(){var t,r
+return t=me,ve=me,(ot?a:void 0)!==a&&(r=function(){var e,t,r,o,s,l,u
+return _e++,(e=Ne())===a&&(e=me,(t=Ie())!==a&&(r=ke())!==a&&(o=Le())!==a?(ve=e,l=r,(s=t)!==(u=o)&&xe('Mismatch tag "'+s+'" !== "'+u+'"',Ee()),e=t=Object(n.a)({type:i.b.tag,value:s,children:l},it())):(me=e,e=a)),_e--,e===a&&(t=a,0===_e&&Pe(h)),e}())!==a?(ve=t,t=r):(me=t,t=a),t===a&&(t=function(){var e,t,r
+return e=me,(t=je())!==a&&(ve=e,r=t,t=Object(n.a)({type:i.b.literal,value:r},it())),t}())===a&&(t=function(){var t,r,o,s,l
+return _e++,t=me,123===e.charCodeAt(me)?(r="{",me++):(r=a,0===_e&&Pe(y)),r!==a&&Ge()!==a&&(o=Xe())!==a&&Ge()!==a?(125===e.charCodeAt(me)?(s="}",me++):(s=a,0===_e&&Pe(_)),s!==a?(ve=t,l=o,t=r=Object(n.a)({type:i.b.argument,value:l},it())):(me=t,t=a)):(me=t,t=a),_e--,t===a&&(r=a,0===_e&&Pe(b)),t}())===a&&(t=function(){var t
+return(t=function(){var t,r,o,s,l,u,c,d,h
+return t=me,123===e.charCodeAt(me)?(r="{",me++):(r=a,0===_e&&Pe(y)),r!==a&&Ge()!==a&&(o=Xe())!==a&&Ge()!==a?(44===e.charCodeAt(me)?(s=",",me++):(s=a,0===_e&&Pe(C)),s!==a&&Ge()!==a?("number"===e.substr(me,6)?(l="number",me+=6):(l=a,0===_e&&Pe(k)),l!==a&&Ge()!==a?(u=me,44===e.charCodeAt(me)?(c=",",me++):(c=a,0===_e&&Pe(C)),c!==a&&(d=Ge())!==a&&(h=function(){var t,r,o
+return t=me,"::"===e.substr(me,2)?(r="::",me+=2):(r=a,0===_e&&Pe(A)),r!==a&&(o=function(){var e,t,r,o
+if(e=me,t=[],(r=Ue())!==a)for(;r!==a;)t.push(r),r=Ue()
+else t=a
+return t!==a&&(ve=e,o=t,t=Object(n.a)({type:i.a.number,tokens:o,parsedOptions:at?p(o):{}},it())),t}())!==a?(ve=t,t=r=o):(me=t,t=a),t===a&&(t=me,ve=me,rt.push("numberArgStyle"),(r=(r=!0)?void 0:a)!==a&&(o=je())!==a?(ve=t,t=r=P(o)):(me=t,t=a)),t}())!==a?u=c=[c,d,h]:(me=u,u=a),u===a&&(u=null),u!==a&&(c=Ge())!==a?(125===e.charCodeAt(me)?(d="}",me++):(d=a,0===_e&&Pe(_)),d!==a?(ve=t,t=r=R(o,l,u)):(me=t,t=a)):(me=t,t=a)):(me=t,t=a)):(me=t,t=a)):(me=t,t=a),t}())===a&&(t=function(){var t,r,s,l,u,c,d,h,f
+return t=me,123===e.charCodeAt(me)?(r="{",me++):(r=a,0===_e&&Pe(y)),r!==a&&Ge()!==a&&(s=Xe())!==a&&Ge()!==a?(44===e.charCodeAt(me)?(l=",",me++):(l=a,0===_e&&Pe(C)),l!==a&&Ge()!==a?("date"===e.substr(me,4)?(u="date",me+=4):(u=a,0===_e&&Pe(U)),u===a&&("time"===e.substr(me,4)?(u="time",me+=4):(u=a,0===_e&&Pe(H))),u!==a&&Ge()!==a?(c=me,44===e.charCodeAt(me)?(d=",",me++):(d=a,0===_e&&Pe(C)),d!==a&&(h=Ge())!==a&&(f=function(){var t,r,s
+return t=me,"::"===e.substr(me,2)?(r="::",me+=2):(r=a,0===_e&&Pe(A)),r!==a&&(s=function(){var t,r,s,l,u,c,d
+if(t=me,r=me,s=[],(l=He())===a&&(l=Be()),l!==a)for(;l!==a;)s.push(l),(l=He())===a&&(l=Be())
+else s=a
+return(r=s!==a?e.substring(r,me):s)!==a&&(ve=t,u=r,r=Object(n.a)({type:i.a.dateTime,pattern:u,parsedOptions:at?(c=u,d={},c.replace(o,(function(e){var t=e.length
+switch(e[0]){case"G":d.era=4===t?"long":5===t?"narrow":"short"
+break
+case"y":d.year=2===t?"2-digit":"numeric"
+break
+case"Y":case"u":case"U":case"r":throw new RangeError("`Y/u/U/r` (year) patterns are not supported, use `y` instead")
+case"q":case"Q":throw new RangeError("`q/Q` (quarter) patterns are not supported")
+case"M":case"L":d.month=["numeric","2-digit","short","long","narrow"][t-1]
+break
+case"w":case"W":throw new RangeError("`w/W` (week) patterns are not supported")
+case"d":d.day=["numeric","2-digit"][t-1]
+break
+case"D":case"F":case"g":throw new RangeError("`D/F/g` (day) patterns are not supported, use `d` instead")
+case"E":d.weekday=4===t?"short":5===t?"narrow":"short"
+break
+case"e":if(t<4)throw new RangeError("`e..eee` (weekday) patterns are not supported")
+d.weekday=["short","long","narrow","short"][t-4]
+break
+case"c":if(t<4)throw new RangeError("`c..ccc` (weekday) patterns are not supported")
+d.weekday=["short","long","narrow","short"][t-4]
+break
+case"a":d.hour12=!0
+break
+case"b":case"B":throw new RangeError("`b/B` (period) patterns are not supported, use `a` instead")
+case"h":d.hourCycle="h12",d.hour=["numeric","2-digit"][t-1]
+break
+case"H":d.hourCycle="h23",d.hour=["numeric","2-digit"][t-1]
+break
+case"K":d.hourCycle="h11",d.hour=["numeric","2-digit"][t-1]
+break
+case"k":d.hourCycle="h24",d.hour=["numeric","2-digit"][t-1]
+break
+case"j":case"J":case"C":throw new RangeError("`j/J/C` (hour) patterns are not supported, use `h/H/K/k` instead")
+case"m":d.minute=["numeric","2-digit"][t-1]
+break
+case"s":d.second=["numeric","2-digit"][t-1]
+break
+case"S":case"A":throw new RangeError("`S/A` (second) patterns are not supported, use `s` instead")
+case"z":d.timeZoneName=t<4?"short":"long"
+break
+case"Z":case"O":case"v":case"V":case"X":case"x":throw new RangeError("`Z/O/v/V/X/x` (timeZone) patterns are not supported, use `z` instead")}return""})),d):{}},it())),r}())!==a?(ve=t,t=r=s):(me=t,t=a),t===a&&(t=me,ve=me,rt.push("dateOrTimeArgStyle"),(r=(r=!0)?void 0:a)!==a&&(s=je())!==a?(ve=t,t=r=P(s)):(me=t,t=a)),t}())!==a?c=d=[d,h,f]:(me=c,c=a),c===a&&(c=null),c!==a&&(d=Ge())!==a?(125===e.charCodeAt(me)?(h="}",me++):(h=a,0===_e&&Pe(_)),h!==a?(ve=t,t=r=R(s,u,c)):(me=t,t=a)):(me=t,t=a)):(me=t,t=a)):(me=t,t=a)):(me=t,t=a),t}()),t}())===a&&(t=function(){var t,r,o,s,l,u,c,d,h,f,p
+if(t=me,123===e.charCodeAt(me)?(r="{",me++):(r=a,0===_e&&Pe(y)),r!==a)if(Ge()!==a)if((o=Xe())!==a)if(Ge()!==a)if(44===e.charCodeAt(me)?(s=",",me++):(s=a,0===_e&&Pe(C)),s!==a)if(Ge()!==a)if("plural"===e.substr(me,6)?(l="plural",me+=6):(l=a,0===_e&&Pe(B)),l===a&&("selectordinal"===e.substr(me,13)?(l="selectordinal",me+=13):(l=a,0===_e&&Pe(V))),l!==a)if(Ge()!==a)if(44===e.charCodeAt(me)?(u=",",me++):(u=a,0===_e&&Pe(C)),u!==a)if(Ge()!==a)if(c=me,"offset:"===e.substr(me,7)?(d="offset:",me+=7):(d=a,0===_e&&Pe($)),d!==a&&(h=Ge())!==a&&(f=Ye())!==a?c=d=[d,h,f]:(me=c,c=a),c===a&&(c=null),c!==a)if((d=Ge())!==a){if(h=[],(f=$e())!==a)for(;f!==a;)h.push(f),f=$e()
+else h=a
+h!==a&&(f=Ge())!==a?(125===e.charCodeAt(me)?(p="}",me++):(p=a,0===_e&&Pe(_)),p!==a?(ve=t,t=r=function(e,t,r,o){return Object(n.a)({type:i.b.plural,pluralType:"plural"===t?"cardinal":"ordinal",value:e,offset:r?r[2]:0,options:o.reduce((function(e,t){var r=t.id,n=t.value,i=t.location
+return r in e&&xe('Duplicate option "'+r+'" in plural element: "'+we()+'"',Ee()),e[r]={value:n,location:i},e}),{})},it())}(o,l,c,h)):(me=t,t=a)):(me=t,t=a)}else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+return t}())===a&&(t=function(){var t,r,o,s,l,u,c,d,h
+if(t=me,123===e.charCodeAt(me)?(r="{",me++):(r=a,0===_e&&Pe(y)),r!==a)if(Ge()!==a)if((o=Xe())!==a)if(Ge()!==a)if(44===e.charCodeAt(me)?(s=",",me++):(s=a,0===_e&&Pe(C)),s!==a)if(Ge()!==a)if("select"===e.substr(me,6)?(l="select",me+=6):(l=a,0===_e&&Pe(q)),l!==a)if(Ge()!==a)if(44===e.charCodeAt(me)?(u=",",me++):(u=a,0===_e&&Pe(C)),u!==a)if(Ge()!==a){if(c=[],(d=Ve())!==a)for(;d!==a;)c.push(d),d=Ve()
+else c=a
+c!==a&&(d=Ge())!==a?(125===e.charCodeAt(me)?(h="}",me++):(h=a,0===_e&&Pe(_)),h!==a?(ve=t,r=function(e,t){return Object(n.a)({type:i.b.select,value:e,options:t.reduce((function(e,t){var r=t.id,n=t.value,i=t.location
+return r in e&&xe('Duplicate option "'+r+'" in select element: "'+we()+'"',Ee()),e[r]={value:n,location:i},e}),{})},it())}(o,c),t=r):(me=t,t=a)):(me=t,t=a)}else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+else me=t,t=a
+return t}())===a&&(t=function(){var t,r
+return t=me,35===e.charCodeAt(me)?(r="#",me++):(r=a,0===_e&&Pe(d)),r!==a&&(ve=t,r=Object(n.a)({type:i.b.pound},it())),r}()),t}function je(){var t,r,n,i
+if(t=me,ve=me,(r=(r=ot)?void 0:a)!==a){if(n=[],(i=Ke())===a&&(i=Je())===a&&(i=Qe())===a&&(60===e.charCodeAt(me)?(i="<",me++):(i=a,0===_e&&Pe(u))),i!==a)for(;i!==a;)n.push(i),(i=Ke())===a&&(i=Je())===a&&(i=Qe())===a&&(60===e.charCodeAt(me)?(i="<",me++):(i=a,0===_e&&Pe(u)))
+else n=a
+n!==a?(ve=t,t=r=c(n)):(me=t,t=a)}else me=t,t=a
+if(t===a){if(t=me,r=[],(n=Ke())===a&&(n=Je())===a&&(n=Qe())===a&&(n=De()),n!==a)for(;n!==a;)r.push(n),(n=Ke())===a&&(n=Je())===a&&(n=Qe())===a&&(n=De())
+else r=a
+r!==a&&(ve=t,r=c(r)),t=r}return t}function De(){var t,r,n
+return t=me,r=me,_e++,(n=Ie())===a&&(n=Le())===a&&(n=Ne()),_e--,n===a?r=void 0:(me=r,r=a),r!==a?(60===e.charCodeAt(me)?(n="<",me++):(n=a,0===_e&&Pe(u)),n!==a?(ve=t,t=r="<"):(me=t,t=a)):(me=t,t=a),t}function Ne(){var t,r,o,s,l,c,d
+return t=me,r=me,60===e.charCodeAt(me)?(o="<",me++):(o=a,0===_e&&Pe(u)),o!==a&&(s=Ze())!==a&&(l=Ge())!==a?("/>"===e.substr(me,2)?(c="/>",me+=2):(c=a,0===_e&&Pe(f)),c!==a?r=o=[o,s,l,c]:(me=r,r=a)):(me=r,r=a),r!==a&&(ve=t,d=r,r=Object(n.a)({type:i.b.literal,value:d.join("")},it())),r}function Ie(){var t,r,n,i
+return t=me,60===e.charCodeAt(me)?(r="<",me++):(r=a,0===_e&&Pe(u)),r!==a&&(n=Ze())!==a?(62===e.charCodeAt(me)?(i=">",me++):(i=a,0===_e&&Pe(v)),i!==a?(ve=t,t=r=n):(me=t,t=a)):(me=t,t=a),t}function Le(){var t,r,n,i
+return t=me,"</"===e.substr(me,2)?(r="</",me+=2):(r=a,0===_e&&Pe(g)),r!==a&&(n=Ze())!==a?(62===e.charCodeAt(me)?(i=">",me++):(i=a,0===_e&&Pe(v)),i!==a?(ve=t,t=r=n):(me=t,t=a)):(me=t,t=a),t}function Fe(){var t,r,n,i,o
+if(_e++,t=me,r=[],n=me,i=me,_e++,(o=qe())===a&&(E.test(e.charAt(me))?(o=e.charAt(me),me++):(o=a,0===_e&&Pe(x))),_e--,o===a?i=void 0:(me=i,i=a),i!==a?(e.length>me?(o=e.charAt(me),me++):(o=a,0===_e&&Pe(O)),o!==a?n=i=[i,o]:(me=n,n=a)):(me=n,n=a),n!==a)for(;n!==a;)r.push(n),n=me,i=me,_e++,(o=qe())===a&&(E.test(e.charAt(me))?(o=e.charAt(me),me++):(o=a,0===_e&&Pe(x))),_e--,o===a?i=void 0:(me=i,i=a),i!==a?(e.length>me?(o=e.charAt(me),me++):(o=a,0===_e&&Pe(O)),o!==a?n=i=[i,o]:(me=n,n=a)):(me=n,n=a)
+else r=a
+return t=r!==a?e.substring(t,me):r,_e--,t===a&&(r=a,0===_e&&Pe(w)),t}function ze(){var t,r,n
+return _e++,t=me,47===e.charCodeAt(me)?(r="/",me++):(r=a,0===_e&&Pe(T)),r!==a&&(n=Fe())!==a?(ve=t,t=r=n):(me=t,t=a),_e--,t===a&&(r=a,0===_e&&Pe(S)),t}function Ue(){var e,t,r,n
+if(_e++,e=me,Ge()!==a)if((t=Fe())!==a){for(r=[],n=ze();n!==a;)r.push(n),n=ze()
+r!==a?(ve=e,e=function(e,t){return{stem:e,options:t}}(t,r)):(me=e,e=a)}else me=e,e=a
+else me=e,e=a
+return _e--,e===a&&0===_e&&Pe(M),e}function He(){var t,r,n,i
+if(t=me,39===e.charCodeAt(me)?(r="'",me++):(r=a,0===_e&&Pe(j)),r!==a){if(n=[],(i=Ke())===a&&(D.test(e.charAt(me))?(i=e.charAt(me),me++):(i=a,0===_e&&Pe(N))),i!==a)for(;i!==a;)n.push(i),(i=Ke())===a&&(D.test(e.charAt(me))?(i=e.charAt(me),me++):(i=a,0===_e&&Pe(N)))
+else n=a
+n!==a?(39===e.charCodeAt(me)?(i="'",me++):(i=a,0===_e&&Pe(j)),i!==a?t=r=[r,n,i]:(me=t,t=a)):(me=t,t=a)}else me=t,t=a
+if(t===a)if(t=[],(r=Ke())===a&&(I.test(e.charAt(me))?(r=e.charAt(me),me++):(r=a,0===_e&&Pe(L))),r!==a)for(;r!==a;)t.push(r),(r=Ke())===a&&(I.test(e.charAt(me))?(r=e.charAt(me),me++):(r=a,0===_e&&Pe(L)))
+else t=a
+return t}function Be(){var t,r
+if(t=[],F.test(e.charAt(me))?(r=e.charAt(me),me++):(r=a,0===_e&&Pe(z)),r!==a)for(;r!==a;)t.push(r),F.test(e.charAt(me))?(r=e.charAt(me),me++):(r=a,0===_e&&Pe(z))
+else t=a
+return t}function Ve(){var t,r,i,o,s,l,u
+return t=me,Ge()!==a&&(r=tt())!==a&&Ge()!==a?(123===e.charCodeAt(me)?(i="{",me++):(i=a,0===_e&&Pe(y)),i!==a?(ve=me,rt.push("select"),void 0!==a&&(o=ke())!==a?(125===e.charCodeAt(me)?(s="}",me++):(s=a,0===_e&&Pe(_)),s!==a?(ve=t,l=r,u=o,rt.pop(),t=Object(n.a)({id:l,value:u},it())):(me=t,t=a)):(me=t,t=a)):(me=t,t=a)):(me=t,t=a),t}function $e(){var t,r,i,o,s,l,u
+return t=me,Ge()!==a&&(r=function(){var t,r,n,i
+return t=me,r=me,61===e.charCodeAt(me)?(n="=",me++):(n=a,0===_e&&Pe(W)),n!==a&&(i=Ye())!==a?r=n=[n,i]:(me=r,r=a),(t=r!==a?e.substring(t,me):r)===a&&(t=tt()),t}())!==a&&Ge()!==a?(123===e.charCodeAt(me)?(i="{",me++):(i=a,0===_e&&Pe(y)),i!==a?(ve=me,rt.push("plural"),void 0!==a&&(o=ke())!==a?(125===e.charCodeAt(me)?(s="}",me++):(s=a,0===_e&&Pe(_)),s!==a?(ve=t,l=r,u=o,rt.pop(),t=Object(n.a)({id:l,value:u},it())):(me=t,t=a)):(me=t,t=a)):(me=t,t=a)):(me=t,t=a),t}function qe(){var t
+return _e++,Y.test(e.charAt(me))?(t=e.charAt(me),me++):(t=a,0===_e&&Pe(K)),_e--,t===a&&0===_e&&Pe(G),t}function We(){var t
+return _e++,Q.test(e.charAt(me))?(t=e.charAt(me),me++):(t=a,0===_e&&Pe(X)),_e--,t===a&&0===_e&&Pe(J),t}function Ge(){var t,r,n
+for(_e++,t=me,r=[],n=qe();n!==a;)r.push(n),n=qe()
+return t=r!==a?e.substring(t,me):r,_e--,t===a&&(r=a,0===_e&&Pe(Z)),t}function Ye(){var t,r,n,i
+return _e++,t=me,45===e.charCodeAt(me)?(r="-",me++):(r=a,0===_e&&Pe(te)),r===a&&(r=null),r!==a&&(n=et())!==a?(ve=t,t=r=(i=n)?r?-i:i:0):(me=t,t=a),_e--,t===a&&(r=a,0===_e&&Pe(ee)),t}function Ke(){var t,r
+return _e++,t=me,"''"===e.substr(me,2)?(r="''",me+=2):(r=a,0===_e&&Pe(ne)),r!==a&&(ve=t,r="'"),_e--,(t=r)===a&&(r=a,0===_e&&Pe(re)),t}function Je(){var t,r,n,i,o,s
+if(t=me,39===e.charCodeAt(me)?(r="'",me++):(r=a,0===_e&&Pe(j)),r!==a)if((n=function(){var t,r,n,i,o
+return t=me,r=me,e.length>me?(n=e.charAt(me),me++):(n=a,0===_e&&Pe(O)),n!==a?(ve=me,(i=(i="<"===(o=n)||">"===o||"{"===o||"}"===o||nt()&&"#"===o)?void 0:a)!==a?r=n=[n,i]:(me=r,r=a)):(me=r,r=a),t=r!==a?e.substring(t,me):r}())!==a){for(i=me,o=[],"''"===e.substr(me,2)?(s="''",me+=2):(s=a,0===_e&&Pe(ne)),s===a&&(D.test(e.charAt(me))?(s=e.charAt(me),me++):(s=a,0===_e&&Pe(N)));s!==a;)o.push(s),"''"===e.substr(me,2)?(s="''",me+=2):(s=a,0===_e&&Pe(ne)),s===a&&(D.test(e.charAt(me))?(s=e.charAt(me),me++):(s=a,0===_e&&Pe(N)));(i=o!==a?e.substring(i,me):o)!==a?(39===e.charCodeAt(me)?(o="'",me++):(o=a,0===_e&&Pe(j)),o===a&&(o=null),o!==a?(ve=t,t=r=n+i.replace("''","'")):(me=t,t=a)):(me=t,t=a)}else me=t,t=a
+else me=t,t=a
+return t}function Qe(){var t,r,n,i
+return t=me,r=me,e.length>me?(n=e.charAt(me),me++):(n=a,0===_e&&Pe(O)),n!==a?(ve=me,(i=(i=function(e){return!("<"===e||"{"===e||nt()&&"#"===e||rt.length>1&&"}"===e)}(n))?void 0:a)!==a?r=n=[n,i]:(me=r,r=a)):(me=r,r=a),r===a&&(10===e.charCodeAt(me)?(r="\n",me++):(r=a,0===_e&&Pe(ie))),r!==a?e.substring(t,me):r}function Xe(){var t,r
+return _e++,t=me,(r=et())===a&&(r=tt()),t=r!==a?e.substring(t,me):r,_e--,t===a&&(r=a,0===_e&&Pe(oe)),t}function Ze(){var t,r
+return _e++,t=me,(r=et())===a&&(r=function(){var t,r,n,i,o
+if(_e++,t=me,r=[],45===e.charCodeAt(me)?(n="-",me++):(n=a,0===_e&&Pe(te)),n===a&&(n=me,i=me,_e++,(o=qe())===a&&(o=We()),_e--,o===a?i=void 0:(me=i,i=a),i!==a?(e.length>me?(o=e.charAt(me),me++):(o=a,0===_e&&Pe(O)),o!==a?n=i=[i,o]:(me=n,n=a)):(me=n,n=a)),n!==a)for(;n!==a;)r.push(n),45===e.charCodeAt(me)?(n="-",me++):(n=a,0===_e&&Pe(te)),n===a&&(n=me,i=me,_e++,(o=qe())===a&&(o=We()),_e--,o===a?i=void 0:(me=i,i=a),i!==a?(e.length>me?(o=e.charAt(me),me++):(o=a,0===_e&&Pe(O)),o!==a?n=i=[i,o]:(me=n,n=a)):(me=n,n=a))
+else r=a
+return t=r!==a?e.substring(t,me):r,_e--,t===a&&(r=a,0===_e&&Pe(pe)),t}()),t=r!==a?e.substring(t,me):r,_e--,t===a&&(r=a,0===_e&&Pe(ae)),t}function et(){var t,r,n,i,o
+if(_e++,t=me,48===e.charCodeAt(me)?(r="0",me++):(r=a,0===_e&&Pe(le)),r!==a&&(ve=t,r=0),(t=r)===a){if(t=me,r=me,ue.test(e.charAt(me))?(n=e.charAt(me),me++):(n=a,0===_e&&Pe(ce)),n!==a){for(i=[],de.test(e.charAt(me))?(o=e.charAt(me),me++):(o=a,0===_e&&Pe(he));o!==a;)i.push(o),de.test(e.charAt(me))?(o=e.charAt(me),me++):(o=a,0===_e&&Pe(he))
+i!==a?r=n=[n,i]:(me=r,r=a)}else me=r,r=a
+r!==a&&(ve=t,r=parseInt(r.join(""),10)),t=r}return _e--,t===a&&(r=a,0===_e&&Pe(se)),t}function tt(){var t,r,n,i,o
+if(_e++,t=me,r=[],n=me,i=me,_e++,(o=qe())===a&&(o=We()),_e--,o===a?i=void 0:(me=i,i=a),i!==a?(e.length>me?(o=e.charAt(me),me++):(o=a,0===_e&&Pe(O)),o!==a?n=i=[i,o]:(me=n,n=a)):(me=n,n=a),n!==a)for(;n!==a;)r.push(n),n=me,i=me,_e++,(o=qe())===a&&(o=We()),_e--,o===a?i=void 0:(me=i,i=a),i!==a?(e.length>me?(o=e.charAt(me),me++):(o=a,0===_e&&Pe(O)),o!==a?n=i=[i,o]:(me=n,n=a)):(me=n,n=a)
+else r=a
+return t=r!==a?e.substring(t,me):r,_e--,t===a&&(r=a,0===_e&&Pe(fe)),t}var rt=["root"]
+function nt(){return"plural"===rt[rt.length-1]}function it(){return t&&t.captureLocation?{location:Ee()}:{}}var ot=t&&t.ignoreTag,at=t&&t.shouldParseSkeleton
+if((r=l())!==a&&me===e.length)return r
+throw r!==a&&me<e.length&&Pe({type:"end"}),function(e,t,r){return new m(m.buildMessage(e,t),e,t,r)}(ye,be<e.length?e.charAt(be):null,be<e.length?Ae(be,be+1):Ae(be,be))},g=/(^|[^\\])#/g
+function b(e,t){t=Object(n.a)({normalizeHashtagInPlural:!0,shouldParseSkeleton:!0},t||{})
+var r=v(e,t)
+return t.normalizeHashtagInPlural&&function e(t){t.forEach((function(t){(Object(i.k)(t)||Object(i.m)(t))&&Object.keys(t.options).forEach((function(r){for(var o,a=t.options[r],s=-1,l=void 0,u=0;u<a.value.length;u++){var c=a.value[u]
+if(Object(i.h)(c)&&g.test(c.value)){s=u,l=c
+break}}if(l){var d=l.value.replace(g,"$1{"+t.value+", number}"),h=v(d);(o=a.value).splice.apply(o,Object(n.c)([s,1],h))}e(a.value)}))}))}(r),r}},function(e){function t(e,t,r,n){var i,o=null==(i=n)||"number"==typeof i||"boolean"==typeof i?n:r(n),a=t.get(o)
+return void 0===a&&(a=e.call(this,n),t.set(o,a)),a}function r(e,t,r){var n=Array.prototype.slice.call(arguments,3),i=r(n),o=t.get(i)
+return void 0===o&&(o=e.apply(this,n),t.set(i,o)),o}function n(e,t,r,n,i){return r.bind(t,e,n,i)}function i(e,i){return n(e,this,1===e.length?t:r,i.cache.create(),i.serializer)}function o(){return JSON.stringify(arguments)}function a(){this.cache=Object.create(null)}a.prototype.has=function(e){return e in this.cache},a.prototype.get=function(e){return this.cache[e]},a.prototype.set=function(e,t){this.cache[e]=t}
+var s={create:function(){return new a}}
+e.exports=function(e,t){var r=t&&t.cache?t.cache:s,n=t&&t.serializer?t.serializer:o
+return(t&&t.strategy?t.strategy:i)(e,{cache:r,serializer:n})},e.exports.strategies={variadic:function(e,t){return n(e,this,r,t.cache.create(),t.serializer)},monadic:function(e,r){return n(e,this,t,r.cache.create(),r.serializer)}}},,,,,,,function(e,t,r){"use strict"
+r.d(t,"b",(function(){return s}))
+var n=r(9)
+function i(e,t,r,n,i){var o=e*e,a=o*e
+return((1-3*e+3*o-a)*t+(4-6*o+3*a)*r+(1+3*e+3*o-3*a)*n+a*i)/6}var o=r(8)
+function a(e){return function(t){var r,i,o=t.length,a=new Array(o),s=new Array(o),l=new Array(o)
+for(r=0;r<o;++r)i=Object(n.f)(t[r]),a[r]=i.r||0,s[r]=i.g||0,l[r]=i.b||0
+return a=e(a),s=e(s),l=e(l),i.opacity=1,function(e){return i.r=a(e),i.g=s(e),i.b=l(e),i+""}}}t.a=function e(t){var r=Object(o.b)(t)
+function i(e,t){var i=r((e=Object(n.f)(e)).r,(t=Object(n.f)(t)).r),a=r(e.g,t.g),s=r(e.b,t.b),l=Object(o.a)(e.opacity,t.opacity)
+return function(t){return e.r=i(t),e.g=a(t),e.b=s(t),e.opacity=l(t),e+""}}return i.gamma=e,i}(1)
+var s=a((function(e){var t=e.length-1
+return function(r){var n=r<=0?r=0:r>=1?(r=1,t-1):Math.floor(r*t),o=e[n],a=e[n+1],s=n>0?e[n-1]:2*o-a,l=n<t-1?e[n+2]:2*a-o
+return i((r-n/t)*t,s,o,a,l)}}))
+a((function(e){var t=e.length
+return function(r){var n=Math.floor(((r%=1)<0?++r:r)*t),o=e[(n+t-1)%t],a=e[n%t],s=e[(n+1)%t],l=e[(n+2)%t]
+return i((r-n/t)*t,o,a,s,l)}}))},,function(e,t){"use strict"
+t.a=function(e,t,r){e=+e,t=+t,r=(i=arguments.length)<2?(t=e,e=0,1):i<3?1:+r
+for(var n=-1,i=0|Math.max(0,Math.ceil((t-e)/r)),o=new Array(i);++n<i;)o[n]=e+n*r
+return o}},function(e){function t(e,t){if(!e)throw new Error(t||"AssertionError")}t.notEqual=function(e,r,n){t(e!=r,n)},t.notOk=function(e,r){t(!e,r)},t.equal=function(e,r,n){t(e==r,n)},t.ok=t,e.exports=t},,,,,,,,,,,,,,,,,,,,,function(e,t,r){"use strict"
+
+;/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */function n(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator]
+if(!r)return e
+var n,i,o=r.call(e),a=[]
+try{for(;(void 0===t||t-- >0)&&!(n=o.next()).done;)a.push(n.value)}catch(e){i={error:e}}finally{try{n&&!n.done&&(r=o.return)&&r.call(o)}finally{if(i)throw i.error}}return a}var i
+r.r(t),r.d(t,"InterpreterStatus",(function(){return i})),r.d(t,"assign",(function(){return s})),r.d(t,"createMachine",(function(){return f})),r.d(t,"interpret",(function(){return m})),function(e){e[e.NotStarted=0]="NotStarted",e[e.Running=1]="Running",e[e.Stopped=2]="Stopped"}(i||(i={}))
+var o={type:"xstate.init"}
+function a(e){return void 0===e?[]:[].concat(e)}function s(e){return{type:"xstate.assign",assignment:e}}function l(e,t){return"string"==typeof(e="string"==typeof e&&t&&t[e]?t[e]:e)?{type:e}:"function"==typeof e?{type:e.name,exec:e}:e}function u(e){return function(t){return e===t}}function c(e){return"string"==typeof e?{type:e}:e}function d(e,t){return{value:e,context:t,actions:[],changed:!1,matches:u(e)}}function h(e,t,r){var n=t,i=!1
+return[e.filter((function(e){if("xstate.assign"===e.type){i=!0
+var t=Object.assign({},n)
+return"function"==typeof e.assignment?t=e.assignment(n,r):Object.keys(e.assignment).forEach((function(i){t[i]="function"==typeof e.assignment[i]?e.assignment[i](n,r):e.assignment[i]})),n=t,!1}return!0})),n,i]}function f(e,t){void 0===t&&(t={})
+var r=n(h(a(e.states[e.initial].entry).map((function(e){return l(e,t.actions)})),e.context,o),2),i=r[0],s=r[1],f={config:e,_options:t,initialState:{value:e.initial,actions:i,context:s,matches:u(e.initial)},transition:function(t,r){var i,o,s="string"==typeof t?{value:t,context:e.context}:t,p=s.value,m=s.context,v=c(r),g=e.states[p]
+if(g.on){var b=a(g.on[v.type])
+try{for(var y=function(e){var t="function"==typeof Symbol&&Symbol.iterator,r=t&&e[t],n=0
+if(r)return r.call(e)
+if(e&&"number"==typeof e.length)return{next:function(){return e&&n>=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}}
+throw new TypeError(t?"Object is not iterable.":"Symbol.iterator is not defined.")}(b),_=y.next();!_.done;_=y.next()){var w=_.value
+if(void 0===w)return d(p,m)
+var E="string"==typeof w?{target:w}:w,x=E.target,O=E.actions,S=void 0===O?[]:O,T=E.cond,M=void 0===x
+if((void 0===T?function(){return!0}:T)(m,v)){var A=e.states[null!=x?x:p],P=n(h((M?a(S):[].concat(g.exit,S,A.entry).filter((function(e){return e}))).map((function(e){return l(e,f._options.actions)})),m,v),3),C=P[0],k=P[1],R=P[2],j=null!=x?x:p
+return{value:j,context:k,actions:C,changed:x!==p||C.length>0||R,matches:u(j)}}}}catch(e){i={error:e}}finally{try{_&&!_.done&&(o=y.return)&&o.call(y)}finally{if(i)throw i.error}}}return d(p,m)}}
+return f}var p=function(e,t){return e.actions.forEach((function(r){var n=r.exec
+return n&&n(e.context,t)}))}
+function m(e){var t=e.initialState,r=i.NotStarted,n=new Set,a={_machine:e,send:function(o){r===i.Running&&(t=e.transition(t,o),p(t,c(o)),n.forEach((function(e){return e(t)})))},subscribe:function(e){return n.add(e),e(t),{unsubscribe:function(){return n.delete(e)}}},start:function(n){if(n){var s="object"==typeof n?n:{context:e.config.context,value:n}
+t={value:s.value,actions:[],context:s.context,matches:u(s.value)}}return r=i.Running,p(t,o),a},stop:function(){return r=i.Stopped,n.clear(),a},get state(){return t},get status(){return r}}
+return a}},function(e,t,r){"use strict"
+r.r(t)
+var n=['a[href]:not([tabindex^="-"])','area[href]:not([tabindex^="-"])','input:not([type="hidden"]):not([type="radio"]):not([disabled]):not([tabindex^="-"])','input[type="radio"]:not([disabled]):not([tabindex^="-"]):checked','select:not([disabled]):not([tabindex^="-"])','textarea:not([disabled]):not([tabindex^="-"])','button:not([disabled]):not([tabindex^="-"])','iframe:not([tabindex^="-"])','audio[controls]:not([tabindex^="-"])','video[controls]:not([tabindex^="-"])','[contenteditable]:not([tabindex^="-"])','[tabindex]:not([tabindex^="-"])']
+function i(e,t){this._show=this.show.bind(this),this._hide=this.hide.bind(this),this._maintainFocus=this._maintainFocus.bind(this),this._bindKeypress=this._bindKeypress.bind(this),this._previouslyFocused=null,this.container=e,this.dialog=e.querySelector('dialog, [role="dialog"], [role="alertdialog"]'),this.role=this.dialog.getAttribute("role")||"dialog",this.useDialog="show"in this.dialog,this._listeners={},this.create(t)}function o(e){return Array.prototype.slice.call(e)}function a(e,t){return o((t||document).querySelectorAll(e))}function s(e){var t=l(e),r=e.querySelector("[autofocus]")||t[0]
+r&&r.focus()}function l(e){return a(n.join(","),e).filter((function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)}))}function u(){a("[data-a11y-dialog]").forEach((function(e){new i(e,e.getAttribute("data-a11y-dialog")||void 0)}))}i.prototype.create=function(e){var t,r
+return this._targets=this._targets||function(e){return NodeList.prototype.isPrototypeOf(e)?o(e):Element.prototype.isPrototypeOf(e)?[e]:"string"==typeof e?a(e):void 0}(e)||((r=o((t=this.container).parentNode.childNodes).filter((function(e){return 1===e.nodeType}))).splice(r.indexOf(t),1),r),this.shown=this.dialog.hasAttribute("open"),this.dialog.setAttribute("role",this.role),this.useDialog?(this.container.setAttribute("data-a11y-dialog-native",""),this.container.removeAttribute("aria-hidden")):this.shown?this.container.removeAttribute("aria-hidden"):this.container.setAttribute("aria-hidden",!0),this._openers=a('[data-a11y-dialog-show="'+this.container.id+'"]'),this._openers.forEach(function(e){e.addEventListener("click",this._show)}.bind(this)),this._closers=a("[data-a11y-dialog-hide]",this.container).concat(a('[data-a11y-dialog-hide="'+this.container.id+'"]')),this._closers.forEach(function(e){e.addEventListener("click",this._hide)}.bind(this)),this._fire("create"),this},i.prototype.show=function(e){return this.shown||(this.shown=!0,this._previouslyFocused=document.activeElement,this.useDialog?this.dialog.showModal(e instanceof Event?void 0:e):(this.dialog.setAttribute("open",""),this.container.removeAttribute("aria-hidden"),this._targets.forEach((function(e){e.hasAttribute("aria-hidden")&&e.setAttribute("data-a11y-dialog-original-aria-hidden",e.getAttribute("aria-hidden")),e.setAttribute("aria-hidden","true")}))),s(this.dialog),document.body.addEventListener("focus",this._maintainFocus,!0),document.addEventListener("keydown",this._bindKeypress),this._fire("show",e)),this},i.prototype.hide=function(e){return this.shown?(this.shown=!1,this.useDialog?this.dialog.close(e instanceof Event?void 0:e):(this.dialog.removeAttribute("open"),this.container.setAttribute("aria-hidden","true"),this._targets.forEach((function(e){e.hasAttribute("data-a11y-dialog-original-aria-hidden")?(e.setAttribute("aria-hidden",e.getAttribute("data-a11y-dialog-original-aria-hidden")),e.removeAttribute("data-a11y-dialog-original-aria-hidden")):e.removeAttribute("aria-hidden")}))),this._previouslyFocused&&this._previouslyFocused.focus&&this._previouslyFocused.focus(),document.body.removeEventListener("focus",this._maintainFocus,!0),document.removeEventListener("keydown",this._bindKeypress),this._fire("hide",e),this):this},i.prototype.destroy=function(){return this.hide(),this._openers.forEach(function(e){e.removeEventListener("click",this._show)}.bind(this)),this._closers.forEach(function(e){e.removeEventListener("click",this._hide)}.bind(this)),this._fire("destroy"),this._listeners={},this},i.prototype.on=function(e,t){return void 0===this._listeners[e]&&(this._listeners[e]=[]),this._listeners[e].push(t),this},i.prototype.off=function(e,t){var r=(this._listeners[e]||[]).indexOf(t)
+return r>-1&&this._listeners[e].splice(r,1),this},i.prototype._fire=function(e,t){(this._listeners[e]||[]).forEach(function(e){e(this.container,t)}.bind(this))},i.prototype._bindKeypress=function(e){this.dialog.contains(document.activeElement)&&(this.shown&&27===e.which&&"alertdialog"!==this.role&&(e.preventDefault(),this.hide(e)),this.shown&&9===e.which&&function(e,t){var r=l(e),n=r.indexOf(document.activeElement)
+t.shiftKey&&0===n?(r[r.length-1].focus(),t.preventDefault()):t.shiftKey||n!==r.length-1||(r[0].focus(),t.preventDefault())}(this.dialog,e))},i.prototype._maintainFocus=function(e){var t=e.target.getAttribute("data-a11y-dialog-show")
+this.shown&&!this.container.contains(e.target)&&t===this.container.id&&s(this.container)},"undefined"!=typeof document&&("loading"===document.readyState?document.addEventListener("DOMContentLoaded",u):window.requestAnimationFrame?window.requestAnimationFrame(u):window.setTimeout(u,16)),t.default=i},function(e,t){"use strict"
+t.byteLength=function(e){var t=l(e),r=t[0],n=t[1]
+return 3*(r+n)/4-n},t.toByteArray=function(e){var t,r,o=l(e),a=o[0],s=o[1],u=new i(function(e,t,r){return 3*(t+r)/4-r}(0,a,s)),c=0,d=s>0?a-4:a
+for(r=0;r<d;r+=4)t=n[e.charCodeAt(r)]<<18|n[e.charCodeAt(r+1)]<<12|n[e.charCodeAt(r+2)]<<6|n[e.charCodeAt(r+3)],u[c++]=t>>16&255,u[c++]=t>>8&255,u[c++]=255&t
+return 2===s&&(t=n[e.charCodeAt(r)]<<2|n[e.charCodeAt(r+1)]>>4,u[c++]=255&t),1===s&&(t=n[e.charCodeAt(r)]<<10|n[e.charCodeAt(r+1)]<<4|n[e.charCodeAt(r+2)]>>2,u[c++]=t>>8&255,u[c++]=255&t),u},t.fromByteArray=function(e){for(var t,n=e.length,i=n%3,o=[],a=0,s=n-i;a<s;a+=16383)o.push(u(e,a,a+16383>s?s:a+16383))
+return 1===i?(t=e[n-1],o.push(r[t>>2]+r[t<<4&63]+"==")):2===i&&(t=(e[n-2]<<8)+e[n-1],o.push(r[t>>10]+r[t>>4&63]+r[t<<2&63]+"=")),o.join("")}
+for(var r=[],n=[],i="undefined"!=typeof Uint8Array?Uint8Array:Array,o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",a=0,s=o.length;a<s;++a)r[a]=o[a],n[o.charCodeAt(a)]=a
+function l(e){var t=e.length
+if(t%4>0)throw new Error("Invalid string. Length must be a multiple of 4")
+var r=e.indexOf("=")
+return-1===r&&(r=t),[r,r===t?0:4-r%4]}function u(e,t,n){for(var i,o,a=[],s=t;s<n;s+=3)i=(e[s]<<16&16711680)+(e[s+1]<<8&65280)+(255&e[s+2]),a.push(r[(o=i)>>18&63]+r[o>>12&63]+r[o>>6&63]+r[63&o])
+return a.join("")}n["-".charCodeAt(0)]=62,n["_".charCodeAt(0)]=63},function(e){
+/*!
+ * clipboard.js v2.0.8
+ * https://clipboardjs.com/
+ *
+ * Licensed MIT © Zeno Rocha
+ */
+var t
+t=function(){return function(){var e={134:function(e,t,r){"use strict"
+r.d(t,{default:function(){return b}})
+var n=r(279),i=r.n(n),o=r(370),a=r.n(o),s=r(817),l=r.n(s)
+function u(e){return(u="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function c(e,t){for(var r=0;r<t.length;r++){var n=t[r]
+n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}var d=function(){function e(t){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this.resolveOptions(t),this.initSelection()}var t,r
+return t=e,(r=[{key:"resolveOptions",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
+this.action=e.action,this.container=e.container,this.emitter=e.emitter,this.target=e.target,this.text=e.text,this.trigger=e.trigger,this.selectedText=""}},{key:"initSelection",value:function(){this.text?this.selectFake():this.target&&this.selectTarget()}},{key:"createFakeElement",value:function(){var e="rtl"===document.documentElement.getAttribute("dir")
+this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[e?"right":"left"]="-9999px"
+var t=window.pageYOffset||document.documentElement.scrollTop
+return this.fakeElem.style.top="".concat(t,"px"),this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,this.fakeElem}},{key:"selectFake",value:function(){var e=this,t=this.createFakeElement()
+this.fakeHandlerCallback=function(){return e.removeFake()},this.fakeHandler=this.container.addEventListener("click",this.fakeHandlerCallback)||!0,this.container.appendChild(t),this.selectedText=l()(t),this.copyText(),this.removeFake()}},{key:"removeFake",value:function(){this.fakeHandler&&(this.container.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(this.container.removeChild(this.fakeElem),this.fakeElem=null)}},{key:"selectTarget",value:function(){this.selectedText=l()(this.target),this.copyText()}},{key:"copyText",value:function(){var e
+try{e=document.execCommand(this.action)}catch(t){e=!1}this.handleResult(e)}},{key:"handleResult",value:function(e){this.emitter.emit(e?"success":"error",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})}},{key:"clearSelection",value:function(){this.trigger&&this.trigger.focus(),document.activeElement.blur(),window.getSelection().removeAllRanges()}},{key:"destroy",value:function(){this.removeFake()}},{key:"action",set:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"copy"
+if(this._action=e,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function(){return this._action}},{key:"target",set:function(e){if(void 0!==e){if(!e||"object"!==u(e)||1!==e.nodeType)throw new Error('Invalid "target" value, use a valid Element')
+if("copy"===this.action&&e.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute')
+if("cut"===this.action&&(e.hasAttribute("readonly")||e.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes')
+this._target=e}},get:function(){return this._target}}])&&c(t.prototype,r),e}()
+function h(e){return(h="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function f(e,t){for(var r=0;r<t.length;r++){var n=t[r]
+n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function p(e,t){return(p=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function m(e,t){return!t||"object"!==h(t)&&"function"!=typeof t?function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called")
+return e}(e):t}function v(e){return(v=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function g(e,t){var r="data-clipboard-".concat(e)
+if(t.hasAttribute(r))return t.getAttribute(r)}var b=function(e){!function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function")
+e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&p(e,t)}(o,e)
+var t,r,n,i=function(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1
+if(Reflect.construct.sham)return!1
+if("function"==typeof Proxy)return!0
+try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(e){return!1}}()
+return function(){var r,n=v(e)
+if(t){var i=v(this).constructor
+r=Reflect.construct(n,arguments,i)}else r=n.apply(this,arguments)
+return m(this,r)}}(o)
+function o(e,t){var r
+return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,o),(r=i.call(this)).resolveOptions(t),r.listenClick(e),r}return t=o,n=[{key:"isSupported",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:["copy","cut"],t="string"==typeof e?[e]:e,r=!!document.queryCommandSupported
+return t.forEach((function(e){r=r&&!!document.queryCommandSupported(e)})),r}}],(r=[{key:"resolveOptions",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}
+this.action="function"==typeof e.action?e.action:this.defaultAction,this.target="function"==typeof e.target?e.target:this.defaultTarget,this.text="function"==typeof e.text?e.text:this.defaultText,this.container="object"===h(e.container)?e.container:document.body}},{key:"listenClick",value:function(e){var t=this
+this.listener=a()(e,"click",(function(e){return t.onClick(e)}))}},{key:"onClick",value:function(e){var t=e.delegateTarget||e.currentTarget
+this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new d({action:this.action(t),target:this.target(t),text:this.text(t),container:this.container,trigger:t,emitter:this})}},{key:"defaultAction",value:function(e){return g("action",e)}},{key:"defaultTarget",value:function(e){var t=g("target",e)
+if(t)return document.querySelector(t)}},{key:"defaultText",value:function(e){return g("text",e)}},{key:"destroy",value:function(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)}}])&&f(t.prototype,r),n&&f(t,n),o}(i())},828:function(e){if("undefined"!=typeof Element&&!Element.prototype.matches){var t=Element.prototype
+t.matches=t.matchesSelector||t.mozMatchesSelector||t.msMatchesSelector||t.oMatchesSelector||t.webkitMatchesSelector}e.exports=function(e,t){for(;e&&9!==e.nodeType;){if("function"==typeof e.matches&&e.matches(t))return e
+e=e.parentNode}}},438:function(e,t,r){var n=r(828)
+function i(e,t,r,n,i){var a=o.apply(this,arguments)
+return e.addEventListener(r,a,i),{destroy:function(){e.removeEventListener(r,a,i)}}}function o(e,t,r,i){return function(r){r.delegateTarget=n(r.target,t),r.delegateTarget&&i.call(e,r)}}e.exports=function(e,t,r,n,o){return"function"==typeof e.addEventListener?i.apply(null,arguments):"function"==typeof r?i.bind(null,document).apply(null,arguments):("string"==typeof e&&(e=document.querySelectorAll(e)),Array.prototype.map.call(e,(function(e){return i(e,t,r,n,o)})))}},879:function(e,t){t.node=function(e){return void 0!==e&&e instanceof HTMLElement&&1===e.nodeType},t.nodeList=function(e){var r=Object.prototype.toString.call(e)
+return void 0!==e&&("[object NodeList]"===r||"[object HTMLCollection]"===r)&&"length"in e&&(0===e.length||t.node(e[0]))},t.string=function(e){return"string"==typeof e||e instanceof String},t.fn=function(e){return"[object Function]"===Object.prototype.toString.call(e)}},370:function(e,t,r){var n=r(879),i=r(438)
+e.exports=function(e,t,r){if(!e&&!t&&!r)throw new Error("Missing required arguments")
+if(!n.string(t))throw new TypeError("Second argument must be a String")
+if(!n.fn(r))throw new TypeError("Third argument must be a Function")
+if(n.node(e))return function(e,t,r){return e.addEventListener(t,r),{destroy:function(){e.removeEventListener(t,r)}}}(e,t,r)
+if(n.nodeList(e))return function(e,t,r){return Array.prototype.forEach.call(e,(function(e){e.addEventListener(t,r)})),{destroy:function(){Array.prototype.forEach.call(e,(function(e){e.removeEventListener(t,r)}))}}}(e,t,r)
+if(n.string(e))return function(e,t,r){return i(document.body,e,t,r)}(e,t,r)
+throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList")}},817:function(e){e.exports=function(e){var t
+if("SELECT"===e.nodeName)e.focus(),t=e.value
+else if("INPUT"===e.nodeName||"TEXTAREA"===e.nodeName){var r=e.hasAttribute("readonly")
+r||e.setAttribute("readonly",""),e.select(),e.setSelectionRange(0,e.value.length),r||e.removeAttribute("readonly"),t=e.value}else{e.hasAttribute("contenteditable")&&e.focus()
+var n=window.getSelection(),i=document.createRange()
+i.selectNodeContents(e),n.removeAllRanges(),n.addRange(i),t=n.toString()}return t}},279:function(e){function t(){}t.prototype={on:function(e,t,r){var n=this.e||(this.e={})
+return(n[e]||(n[e]=[])).push({fn:t,ctx:r}),this},once:function(e,t,r){var n=this
+function i(){n.off(e,i),t.apply(r,arguments)}return i._=t,this.on(e,i,r)},emit:function(e){for(var t=[].slice.call(arguments,1),r=((this.e||(this.e={}))[e]||[]).slice(),n=0,i=r.length;n<i;n++)r[n].fn.apply(r[n].ctx,t)
+return this},off:function(e,t){var r=this.e||(this.e={}),n=r[e],i=[]
+if(n&&t)for(var o=0,a=n.length;o<a;o++)n[o].fn!==t&&n[o].fn._!==t&&i.push(n[o])
+return i.length?r[e]=i:delete r[e],this}},e.exports=t,e.exports.TinyEmitter=t}},t={}
+function r(n){if(t[n])return t[n].exports
+var i=t[n]={exports:{}}
+return e[n](i,i.exports,r),i.exports}return r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e}
+return r.d(t,{a:t}),t},r.d=function(e,t){for(var n in t)r.o(t,n)&&!r.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r(134)}().default},e.exports=t()},function(e){e.exports=function(){"use strict"
+var e="millisecond",t="second",r="minute",n="hour",i="day",o="week",a="month",s="quarter",l="year",u="date",c=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[^0-9]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,d=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,h={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_")},f=function(e,t,r){var n=String(e)
+return!n||n.length>=t?e:""+Array(t+1-n.length).join(r)+e},p={s:f,z:function(e){var t=-e.utcOffset(),r=Math.abs(t),n=Math.floor(r/60),i=r%60
+return(t<=0?"+":"-")+f(n,2,"0")+":"+f(i,2,"0")},m:function e(t,r){if(t.date()<r.date())return-e(r,t)
+var n=12*(r.year()-t.year())+(r.month()-t.month()),i=t.clone().add(n,a),o=r-i<0,s=t.clone().add(n+(o?-1:1),a)
+return+(-(n+(r-i)/(o?i-s:s-i))||0)},a:function(e){return e<0?Math.ceil(e)||0:Math.floor(e)},p:function(c){return{M:a,y:l,w:o,d:i,D:u,h:n,m:r,s:t,ms:e,Q:s}[c]||String(c||"").toLowerCase().replace(/s$/,"")},u:function(e){return void 0===e}},m="en",v={}
+v[m]=h
+var g=function(e){return e instanceof w},b=function(e,t,r){var n
+if(!e)return m
+if("string"==typeof e)v[e]&&(n=e),t&&(v[e]=t,n=e)
+else{var i=e.name
+v[i]=e,n=i}return!r&&n&&(m=n),n||!r&&m},y=function(e,t){if(g(e))return e.clone()
+var r="object"==typeof t?t:{}
+return r.date=e,r.args=arguments,new w(r)},_=p
+_.l=b,_.i=g,_.w=function(e,t){return y(e,{locale:t.$L,utc:t.$u,x:t.$x,$offset:t.$offset})}
+var w=function(){function h(e){this.$L=b(e.locale,null,!0),this.parse(e)}var f=h.prototype
+return f.parse=function(e){this.$d=function(e){var t=e.date,r=e.utc
+if(null===t)return new Date(NaN)
+if(_.u(t))return new Date
+if(t instanceof Date)return new Date(t)
+if("string"==typeof t&&!/Z$/i.test(t)){var n=t.match(c)
+if(n){var i=n[2]-1||0,o=(n[7]||"0").substring(0,3)
+return r?new Date(Date.UTC(n[1],i,n[3]||1,n[4]||0,n[5]||0,n[6]||0,o)):new Date(n[1],i,n[3]||1,n[4]||0,n[5]||0,n[6]||0,o)}}return new Date(t)}(e),this.$x=e.x||{},this.init()},f.init=function(){var e=this.$d
+this.$y=e.getFullYear(),this.$M=e.getMonth(),this.$D=e.getDate(),this.$W=e.getDay(),this.$H=e.getHours(),this.$m=e.getMinutes(),this.$s=e.getSeconds(),this.$ms=e.getMilliseconds()},f.$utils=function(){return _},f.isValid=function(){return!("Invalid Date"===this.$d.toString())},f.isSame=function(e,t){var r=y(e)
+return this.startOf(t)<=r&&r<=this.endOf(t)},f.isAfter=function(e,t){return y(e)<this.startOf(t)},f.isBefore=function(e,t){return this.endOf(t)<y(e)},f.$g=function(e,t,r){return _.u(e)?this[t]:this.set(r,e)},f.unix=function(){return Math.floor(this.valueOf()/1e3)},f.valueOf=function(){return this.$d.getTime()},f.startOf=function(e,s){var c=this,d=!!_.u(s)||s,h=_.p(e),f=function(e,t){var r=_.w(c.$u?Date.UTC(c.$y,t,e):new Date(c.$y,t,e),c)
+return d?r:r.endOf(i)},p=function(e,t){return _.w(c.toDate()[e].apply(c.toDate("s"),(d?[0,0,0,0]:[23,59,59,999]).slice(t)),c)},m=this.$W,v=this.$M,g=this.$D,b="set"+(this.$u?"UTC":"")
+switch(h){case l:return d?f(1,0):f(31,11)
+case a:return d?f(1,v):f(0,v+1)
+case o:var y=this.$locale().weekStart||0,w=(m<y?m+7:m)-y
+return f(d?g-w:g+(6-w),v)
+case i:case u:return p(b+"Hours",0)
+case n:return p(b+"Minutes",1)
+case r:return p(b+"Seconds",2)
+case t:return p(b+"Milliseconds",3)
+default:return this.clone()}},f.endOf=function(e){return this.startOf(e,!1)},f.$set=function(o,s){var c,d=_.p(o),h="set"+(this.$u?"UTC":""),f=(c={},c[i]=h+"Date",c[u]=h+"Date",c[a]=h+"Month",c[l]=h+"FullYear",c[n]=h+"Hours",c[r]=h+"Minutes",c[t]=h+"Seconds",c[e]=h+"Milliseconds",c)[d],p=d===i?this.$D+(s-this.$W):s
+if(d===a||d===l){var m=this.clone().set(u,1)
+m.$d[f](p),m.init(),this.$d=m.set(u,Math.min(this.$D,m.daysInMonth())).$d}else f&&this.$d[f](p)
+return this.init(),this},f.set=function(e,t){return this.clone().$set(e,t)},f.get=function(e){return this[_.p(e)]()},f.add=function(e,s){var u,c=this
+e=Number(e)
+var d=_.p(s),h=function(t){var r=y(c)
+return _.w(r.date(r.date()+Math.round(t*e)),c)}
+if(d===a)return this.set(a,this.$M+e)
+if(d===l)return this.set(l,this.$y+e)
+if(d===i)return h(1)
+if(d===o)return h(7)
+var f=(u={},u[r]=6e4,u[n]=36e5,u[t]=1e3,u)[d]||1,p=this.$d.getTime()+e*f
+return _.w(p,this)},f.subtract=function(e,t){return this.add(-1*e,t)},f.format=function(e){var t=this
+if(!this.isValid())return"Invalid Date"
+var r=e||"YYYY-MM-DDTHH:mm:ssZ",n=_.z(this),i=this.$locale(),o=this.$H,a=this.$m,s=this.$M,l=i.weekdays,u=i.months,c=function(e,n,i,o){return e&&(e[n]||e(t,r))||i[n].substr(0,o)},h=function(e){return _.s(o%12||12,e,"0")},f=i.meridiem||function(e,t,r){var n=e<12?"AM":"PM"
+return r?n.toLowerCase():n},p={YY:String(this.$y).slice(-2),YYYY:this.$y,M:s+1,MM:_.s(s+1,2,"0"),MMM:c(i.monthsShort,s,u,3),MMMM:c(u,s),D:this.$D,DD:_.s(this.$D,2,"0"),d:String(this.$W),dd:c(i.weekdaysMin,this.$W,l,2),ddd:c(i.weekdaysShort,this.$W,l,3),dddd:l[this.$W],H:String(o),HH:_.s(o,2,"0"),h:h(1),hh:h(2),a:f(o,a,!0),A:f(o,a,!1),m:String(a),mm:_.s(a,2,"0"),s:String(this.$s),ss:_.s(this.$s,2,"0"),SSS:_.s(this.$ms,3,"0"),Z:n}
+return r.replace(d,(function(e,t){return t||p[e]||n.replace(":","")}))},f.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},f.diff=function(e,u,c){var d,h=_.p(u),f=y(e),p=6e4*(f.utcOffset()-this.utcOffset()),m=this-f,v=_.m(this,f)
+return v=(d={},d[l]=v/12,d[a]=v,d[s]=v/3,d[o]=(m-p)/6048e5,d[i]=(m-p)/864e5,d[n]=m/36e5,d[r]=m/6e4,d[t]=m/1e3,d)[h]||m,c?v:_.a(v)},f.daysInMonth=function(){return this.endOf(a).$D},f.$locale=function(){return v[this.$L]},f.locale=function(e,t){if(!e)return this.$L
+var r=this.clone(),n=b(e,t,!0)
+return n&&(r.$L=n),r},f.clone=function(){return _.w(this.$d,this)},f.toDate=function(){return new Date(this.valueOf())},f.toJSON=function(){return this.isValid()?this.toISOString():null},f.toISOString=function(){return this.$d.toISOString()},f.toString=function(){return this.$d.toUTCString()},h}(),E=w.prototype
+return y.prototype=E,[["$ms",e],["$s",t],["$m",r],["$H",n],["$W",i],["$M",a],["$y",l],["$D",u]].forEach((function(e){E[e[1]]=function(t){return this.$g(t,e[0],e[1])}})),y.extend=function(e,t){return e.$i||(e(t,w,y),e.$i=!0),y},y.locale=b,y.isDayjs=g,y.unix=function(e){return y(1e3*e)},y.en=v[m],y.Ls=v,y.p={},y}()},function(e){e.exports=function(){"use strict"
+return function(e,t,r){var n="h:mm A",i={lastDay:"[Yesterday at] "+n,sameDay:"[Today at] "+n,nextDay:"[Tomorrow at] "+n,nextWeek:"dddd [at] "+n,lastWeek:"[Last] dddd [at] "+n,sameElse:"MM/DD/YYYY"}
+t.prototype.calendar=function(e,t){var n=t||this.$locale().calendar||i,o=r(e||void 0).startOf("d"),a=this.diff(o,"d",!0),s=a<-6?"sameElse":a<-1?"lastWeek":a<0?"lastDay":a<1?"sameDay":a<2?"nextDay":a<7?"nextWeek":"sameElse",l=n[s]||i[s]
+return"function"==typeof l?l.call(this,r()):this.format(l)}}}()},function(e){e.exports=function(){"use strict"
+return function(e,t,r){e=e||{}
+var n=t.prototype,i={future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"}
+function o(e,t,r,i){return n.fromToBase(e,t,r,i)}r.en.relativeTime=i,n.fromToBase=function(t,n,o,a,s){for(var l,u,c,d=o.$locale().relativeTime||i,h=e.thresholds||[{l:"s",r:44,d:"second"},{l:"m",r:89},{l:"mm",r:44,d:"minute"},{l:"h",r:89},{l:"hh",r:21,d:"hour"},{l:"d",r:35},{l:"dd",r:25,d:"day"},{l:"M",r:45},{l:"MM",r:10,d:"month"},{l:"y",r:17},{l:"yy",d:"year"}],f=h.length,p=0;p<f;p+=1){var m=h[p]
+m.d&&(l=a?r(t).diff(o,m.d,!0):o.diff(t,m.d,!0))
+var v=(e.rounding||Math.round)(Math.abs(l))
+if(c=l>0,v<=m.r||!m.r){v<=1&&p>0&&(m=h[p-1])
+var g=d[m.l]
+s&&(v=s(""+v)),u="string"==typeof g?g.replace("%d",v):g(v,n,m.l,c)
+break}}if(n)return u
+var b=c?d.future:d.past
+return"function"==typeof b?b(u):b.replace("%s",u)},n.to=function(e,t){return o(e,t,this,!0)},n.from=function(e,t){return o(e,t,this)}
+var a=function(e){return e.$u?r.utc():r()}
+n.toNow=function(e){return this.to(a(this),e)},n.fromNow=function(e){return this.from(a(this),e)}}}()},function(e){"use strict"
+var t=function(e){return function(e){return!!e&&"object"==typeof e}(e)&&!function(e){var t=Object.prototype.toString.call(e)
+return"[object RegExp]"===t||"[object Date]"===t||function(e){return e.$$typeof===r}(e)}(e)},r="function"==typeof Symbol&&Symbol.for?Symbol.for("react.element"):60103
+function n(e,t){return!1!==t.clone&&t.isMergeableObject(e)?s((r=e,Array.isArray(r)?[]:{}),e,t):e
+var r}function i(e,t,r){return e.concat(t).map((function(e){return n(e,r)}))}function o(e){return Object.keys(e).concat(function(e){return Object.getOwnPropertySymbols?Object.getOwnPropertySymbols(e).filter((function(t){return e.propertyIsEnumerable(t)})):[]}(e))}function a(e,t){try{return t in e}catch(e){return!1}}function s(e,r,l){(l=l||{}).arrayMerge=l.arrayMerge||i,l.isMergeableObject=l.isMergeableObject||t,l.cloneUnlessOtherwiseSpecified=n
+var u=Array.isArray(r)
+return u===Array.isArray(e)?u?l.arrayMerge(e,r,l):function(e,t,r){var i={}
+return r.isMergeableObject(e)&&o(e).forEach((function(t){i[t]=n(e[t],r)})),o(t).forEach((function(o){(function(e,t){return a(e,t)&&!(Object.hasOwnProperty.call(e,t)&&Object.propertyIsEnumerable.call(e,t))})(e,o)||(a(e,o)&&r.isMergeableObject(t[o])?i[o]=function(e,t){if(!t.customMerge)return s
+var r=t.customMerge(e)
+return"function"==typeof r?r:s}(o,r)(e[o],t[o],r):i[o]=n(t[o],r))})),i}(e,r,l):n(r,l)}s.all=function(e,t){if(!Array.isArray(e))throw new Error("first argument should be an array")
+return e.reduce((function(e,r){return s(e,r,t)}),{})}
+var l=s
+e.exports=l},function(e){"use strict"
+var t=Array.isArray,r=Object.keys,n=Object.prototype.hasOwnProperty
+e.exports=function e(i,o){if(i===o)return!0
+if(i&&o&&"object"==typeof i&&"object"==typeof o){var a,s,l,u=t(i),c=t(o)
+if(u&&c){if((s=i.length)!=o.length)return!1
+for(a=s;0!=a--;)if(!e(i[a],o[a]))return!1
+return!0}if(u!=c)return!1
+var d=i instanceof Date,h=o instanceof Date
+if(d!=h)return!1
+if(d&&h)return i.getTime()==o.getTime()
+var f=i instanceof RegExp,p=o instanceof RegExp
+if(f!=p)return!1
+if(f&&p)return i.toString()==o.toString()
+var m=r(i)
+if((s=m.length)!==r(o).length)return!1
+for(a=s;0!=a--;)if(!n.call(o,m[a]))return!1
+for(a=s;0!=a--;)if(!e(i[l=m[a]],o[l]))return!1
+return!0}return i!=i&&o!=o}},function(e){function t(e){return e&&e.constructor&&"function"==typeof e.constructor.isBuffer&&e.constructor.isBuffer(e)}function r(e){return e}function n(e,n){const i=(n=n||{}).delimiter||".",o=n.maxDepth,a=n.transformKey||r,s={}
+return function e(r,l,u){u=u||1,Object.keys(r).forEach((function(c){const d=r[c],h=n.safe&&Array.isArray(d),f=Object.prototype.toString.call(d),p=t(d),m="[object Object]"===f||"[object Array]"===f,v=l?l+i+a(c):a(c)
+if(!h&&!p&&m&&Object.keys(d).length&&(!n.maxDepth||u<o))return e(d,v,u+1)
+s[v]=d}))}(e),s}e.exports=n,n.flatten=n,n.unflatten=function e(i,o){const a=(o=o||{}).delimiter||".",s=o.overwrite||!1,l=o.transformKey||r,u={}
+if(t(i)||"[object Object]"!==Object.prototype.toString.call(i))return i
+function c(e){const t=Number(e)
+return isNaN(t)||-1!==e.indexOf(".")||o.object?e:t}return i=Object.keys(i).reduce((function(e,t){const r=Object.prototype.toString.call(i[t])
+return"[object Object]"!==r&&"[object Array]"!==r||function(e){const t=Object.prototype.toString.call(e),r="[object Object]"===t
+return!e||("[object Array]"===t?!e.length:r?!Object.keys(e).length:void 0)}(i[t])?(e[t]=i[t],e):function(e,t,r){return Object.keys(r).reduce((function(t,n){return t[e+a+n]=r[n],t}),t)}(t,e,n(i[t],o))}),{}),Object.keys(i).forEach((function(t){const r=t.split(a).map(l)
+let n=c(r.shift()),d=c(r[0]),h=u
+for(;void 0!==d;){if("__proto__"===n)return
+const e=Object.prototype.toString.call(h[n]),t="[object Object]"===e||"[object Array]"===e
+if(!s&&!t&&void 0!==h[n])return;(s&&!t||!s&&null==h[n])&&(h[n]="number"!=typeof d||o.object?{}:[]),h=h[n],r.length>0&&(n=c(r.shift()),d=c(r[0]))}h[n]=e(i[t],o)})),u}},function(e,t,r){"use strict"
+r.r(t)
+var n,i=function(){function e(){this.registry=new WeakMap}return e.prototype.elementExists=function(e){return this.registry.has(e)},e.prototype.getElement=function(e){return this.registry.get(e)},e.prototype.addElement=function(e,t){e&&this.registry.set(e,t||{})},e.prototype.removeElement=function(e){this.registry.delete(e)},e.prototype.destroyRegistry=function(){this.registry=new WeakMap},e}(),o=function(){}
+!function(e){e.enter="enter",e.exit="exit"}(n||(n={}))
+var a,s=function(){function e(){this.registry=new i}return e.prototype.addCallback=function(e,t,r){var i,o,a
+e===n.enter?((i={})[n.enter]=r,a=i):((o={})[n.exit]=r,a=o),this.registry.addElement(t,Object.assign({},this.registry.getElement(t),a))},e.prototype.dispatchCallback=function(e,t,r){if(e===n.enter){var i=this.registry.getElement(t).enter;(void 0===i?o:i)(r)}else{var a=this.registry.getElement(t).exit;(void 0===a?o:a)(r)}},e}(),l=(a=function(e,t){return(a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r])})(e,t)},function(e,t){function r(){this.constructor=e}a(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}),u=function(e){function t(){var t=e.call(this)||this
+return t.elementRegistry=new i,t}return l(t,e),t.prototype.observe=function(e,t){void 0===t&&(t={}),e&&(this.elementRegistry.addElement(e,t),this.setupObserver(e,t))},t.prototype.unobserve=function(e,t){var r=this.findMatchingRootEntry(t)
+r&&r.intersectionObserver.unobserve(e)},t.prototype.addEnterCallback=function(e,t){this.addCallback(n.enter,e,t)},t.prototype.addExitCallback=function(e,t){this.addCallback(n.exit,e,t)},t.prototype.dispatchEnterCallback=function(e,t){this.dispatchCallback(n.enter,e,t)},t.prototype.dispatchExitCallback=function(e,t){this.dispatchCallback(n.exit,e,t)},t.prototype.destroy=function(){this.elementRegistry.destroyRegistry()},t.prototype.setupOnIntersection=function(e){var t=this
+return function(r){return t.onIntersection(e,r)}},t.prototype.setupObserver=function(e,t){var r,n,i=t.root,o=void 0===i?window:i,a=this.findRootFromRegistry(o)
+if(a&&(n=this.determineMatchingElements(t,a)),n){var s=n.elements,l=n.intersectionObserver
+s.push(e),l&&l.observe(e)}else{var u={elements:[e],intersectionObserver:l=this.newObserver(e,t),options:t},c=this.stringifyOptions(t)
+a?a[c]=u:this.elementRegistry.addElement(o,((r={})[c]=u,r))}},t.prototype.newObserver=function(e,t){var r=t.root,n=t.rootMargin,i=t.threshold,o=new IntersectionObserver(this.setupOnIntersection(t).bind(this),{root:r,rootMargin:n,threshold:i})
+return o.observe(e),o},t.prototype.onIntersection=function(e,t){var r=this
+t.forEach((function(t){var n=t.isIntersecting,i=t.intersectionRatio,o=e.threshold||0
+Array.isArray(o)&&(o=o[o.length-1])
+var a=r.findMatchingRootEntry(e)
+n||i>o?a&&a.elements.some((function(e){return!(!e||e!==t.target||(r.dispatchEnterCallback(e,t),0))})):a&&a.elements.some((function(e){return!(!e||e!==t.target||(r.dispatchExitCallback(e,t),0))}))}))},t.prototype.findRootFromRegistry=function(e){if(this.elementRegistry)return this.elementRegistry.getElement(e)},t.prototype.findMatchingRootEntry=function(e){var t=e.root,r=void 0===t?window:t,n=this.findRootFromRegistry(r)
+if(n)return n[this.stringifyOptions(e)]},t.prototype.determineMatchingElements=function(e,t){var r=this,n=Object.keys(t).filter((function(n){var i=t[n].options
+return r.areOptionsSame(e,i)}))[0]
+return t[n]},t.prototype.areOptionsSame=function(e,t){if(e===t)return!0
+var r=Object.prototype.toString.call(e),n=Object.prototype.toString.call(t)
+if(r!==n)return!1
+if("[object Object]"!==r&&"[object Object]"!==n)return e===t
+if(e&&t&&"object"==typeof e&&"object"==typeof t)for(var i in e)if(Object.prototype.hasOwnProperty.call(e,i)&&!1===this.areOptionsSame(e[i],t[i]))return!1
+return!0},t.prototype.stringifyOptions=function(e){var t=e.root
+return JSON.stringify(e,(function(e,r){if("root"===e&&t){var n=Array.prototype.slice.call(t.classList).reduce((function(e,t){return e+t}),"")
+return t.id+"-"+n}return r}))},t}(s)
+t.default=u},function(e,t,r){var n=r(71),i=r(72)
+function o(e){this.Container=e||Array,this.items=new Map,this.clear(),Object.defineProperty(this.items,"constructor",{value:o,enumerable:!1})}o.prototype.clear=function(){this.size=0,this.dimension=0,this.items.clear()},o.prototype.set=function(e,t){var r,n=this.items.get(e)
+return n||(this.dimension++,n=new this.Container,this.items.set(e,n)),this.Container===Set?(r=n.size,n.add(t),r<n.size&&this.size++):(n.push(t),this.size++),this},o.prototype.delete=function(e){var t=this.items.get(e)
+return!!t&&(this.size-=this.Container===Set?t.size:t.length,this.dimension--,this.items.delete(e),!0)},o.prototype.remove=function(e,t){var r,n,i=this.items.get(e)
+return!!i&&(this.Container===Set?((r=i.delete(t))&&this.size--,0===i.size&&(this.items.delete(e),this.dimension--),r):-1!==(n=i.indexOf(t))&&(this.size--,1===i.length?(this.items.delete(e),this.dimension--,!0):(i.splice(n,1),!0)))},o.prototype.has=function(e){return this.items.has(e)},o.prototype.get=function(e){return this.items.get(e)},o.prototype.multiplicity=function(e){var t=this.items.get(e)
+return void 0===t?0:this.Container===Set?t.size:t.length},o.prototype.count=o.prototype.multiplicity,o.prototype.forEach=function(e,t){var r
+function n(n){e.call(t,n,r)}t=arguments.length>1?t:this,this.items.forEach((function(e,t){r=t,e.forEach(n)}))},o.prototype.forEachAssociation=function(e,t){t=arguments.length>1?t:this,this.items.forEach(e,t)},o.prototype.keys=function(){return this.items.keys()},o.prototype.values=function(){var e,t,r,i,o=this.items.values(),a=!1
+return this.Container===Set?new n((function r(){if(!a){if((t=o.next()).done)return{done:!0}
+a=!0,e=t.value.values()}return(t=e.next()).done?(a=!1,r()):{done:!1,value:t.value}})):new n((function n(){if(!a){if((t=o.next()).done)return{done:!0}
+a=!0,e=t.value,r=0,i=e.length}return r>=i?(a=!1,n()):{done:!1,value:e[r++]}}))},o.prototype.entries=function(){var e,t,r,i,o,a=this.items.entries(),s=!1
+return this.Container===Set?new n((function n(){if(!s){if((t=a.next()).done)return{done:!0}
+s=!0,r=t.value[0],e=t.value[1].values()}return(t=e.next()).done?(s=!1,n()):{done:!1,value:[r,t.value]}})):new n((function n(){if(!s){if((t=a.next()).done)return{done:!0}
+s=!0,r=t.value[0],e=t.value[1],i=0,o=e.length}return i>=o?(s=!1,n()):{done:!1,value:[r,e[i++]]}}))},o.prototype.containers=function(){return this.items.values()},o.prototype.associations=function(){return this.items.entries()},"undefined"!=typeof Symbol&&(o.prototype[Symbol.iterator]=o.prototype.entries),o.prototype.inspect=function(){return this.items},"undefined"!=typeof Symbol&&(o.prototype[Symbol.for("nodejs.util.inspect.custom")]=o.prototype.inspect),o.prototype.toJSON=function(){return this.items},o.from=function(e,t){var r=new o(t)
+return i(e,(function(e,t){r.set(t,e)})),r},e.exports=o},function(e){function t(e){Object.defineProperty(this,"_next",{writable:!1,enumerable:!1,value:e}),this.done=!1}t.prototype.next=function(){if(this.done)return{done:!0}
+var e=this._next()
+return e.done&&(this.done=!0),e},"undefined"!=typeof Symbol&&(t.prototype[Symbol.iterator]=function(){return this}),t.of=function(){var e=arguments,r=e.length,n=0
+return new t((function(){return n>=r?{done:!0}:{done:!1,value:e[n++]}}))},t.empty=function(){var e=new t(null)
+return e.done=!0,e},t.is=function(e){return e instanceof t||"object"==typeof e&&null!==e&&"function"==typeof e.next},e.exports=t},function(e){var t="undefined"!=typeof ArrayBuffer,r="undefined"!=typeof Symbol
+function n(e,n){var i,o,a,s,l
+if(!e)throw new Error("obliterator/forEach: invalid iterable.")
+if("function"!=typeof n)throw new Error("obliterator/forEach: expecting a callback.")
+if(Array.isArray(e)||t&&ArrayBuffer.isView(e)||"string"==typeof e||"[object Arguments]"===e.toString())for(a=0,s=e.length;a<s;a++)n(e[a],a)
+else if("function"!=typeof e.forEach)if(r&&Symbol.iterator in e&&"function"!=typeof e.next&&(e=e[Symbol.iterator]()),"function"!=typeof e.next)for(o in e)e.hasOwnProperty(o)&&n(e[o],o)
+else for(i=e,a=0;!0!==(l=i.next()).done;)n(l.value,a),a++
+else e.forEach(n)}n.forEachWithNullKeys=function(e,n){var i,o,a,s,l
+if(!e)throw new Error("obliterator/forEachWithNullKeys: invalid iterable.")
+if("function"!=typeof n)throw new Error("obliterator/forEachWithNullKeys: expecting a callback.")
+if(Array.isArray(e)||t&&ArrayBuffer.isView(e)||"string"==typeof e||"[object Arguments]"===e.toString())for(a=0,s=e.length;a<s;a++)n(e[a],null)
+else if(e instanceof Set)e.forEach((function(e){n(e,null)}))
+else if("function"!=typeof e.forEach)if(r&&Symbol.iterator in e&&"function"!=typeof e.next&&(e=e[Symbol.iterator]()),"function"!=typeof e.next)for(o in e)e.hasOwnProperty(o)&&n(e[o],o)
+else for(i=e,a=0;!0!==(l=i.next()).done;)n(l.value,null),a++
+else e.forEach(n)},e.exports=n},function(e,t){t.intersection=function(){if(arguments.length<2)throw new Error("mnemonist/Set.intersection: needs at least two arguments.")
+var e,t,r=new Set,n=1/0,i=null,o=arguments.length
+for(t=0;t<o;t++){if(0===(e=arguments[t]).size)return r
+e.size<n&&(n=e.size,i=e)}for(var a,s,l,u,c=i.values();!(a=c.next()).done;){for(s=a.value,l=!0,t=0;t<o;t++)if((u=arguments[t])!==i&&!u.has(s)){l=!1
+break}l&&r.add(s)}return r},t.union=function(){if(arguments.length<2)throw new Error("mnemonist/Set.union: needs at least two arguments.")
+var e,t,r,n=new Set,i=arguments.length
+for(e=0;e<i;e++)for(t=arguments[e].values();!(r=t.next()).done;)n.add(r.value)
+return n},t.difference=function(e,t){if(!e.size)return new Set
+if(!t.size)return new Set(e)
+for(var r,n=new Set,i=e.values();!(r=i.next()).done;)t.has(r.value)||n.add(r.value)
+return n},t.symmetricDifference=function(e,t){for(var r,n=new Set,i=e.values();!(r=i.next()).done;)t.has(r.value)||n.add(r.value)
+for(i=t.values();!(r=i.next()).done;)e.has(r.value)||n.add(r.value)
+return n},t.isSubset=function(e,t){var r,n=e.values()
+if(e===t)return!0
+if(e.size>t.size)return!1
+for(;!(r=n.next()).done;)if(!t.has(r.value))return!1
+return!0},t.isSuperset=function(e,r){return t.isSubset(r,e)},t.add=function(e,t){for(var r,n=t.values();!(r=n.next()).done;)e.add(r.value)},t.subtract=function(e,t){for(var r,n=t.values();!(r=n.next()).done;)e.delete(r.value)},t.intersect=function(e,t){for(var r,n=e.values();!(r=n.next()).done;)t.has(r.value)||e.delete(r.value)},t.disjunct=function(e,t){for(var r,n=e.values(),i=[];!(r=n.next()).done;)t.has(r.value)&&i.push(r.value)
+for(n=t.values();!(r=n.next()).done;)e.has(r.value)||e.add(r.value)
+for(var o=0,a=i.length;o<a;o++)e.delete(i[o])},t.intersectionSize=function(e,t){var r
+if(e.size>t.size&&(r=e,e=t,t=r),0===e.size)return 0
+if(e===t)return e.size
+for(var n,i=e.values(),o=0;!(n=i.next()).done;)t.has(n.value)&&o++
+return o},t.unionSize=function(e,r){var n=t.intersectionSize(e,r)
+return e.size+r.size-n},t.jaccard=function(e,r){var n=t.intersectionSize(e,r)
+return 0===n?0:n/(e.size+r.size-n)},t.overlap=function(e,r){var n=t.intersectionSize(e,r)
+return 0===n?0:n/Math.min(e.size,r.size)}},function(e,t,r){e.exports=function(e){if("uniqueLinkId"in(e=e||{})&&(console.warn("ngraph.graph: Starting from version 0.14 `uniqueLinkId` is deprecated.\nUse `multigraph` option instead\n","\n","Note: there is also change in default behavior: From now on each graph\nis considered to be not a multigraph by default (each edge is unique)."),e.multigraph=e.uniqueLinkId),void 0===e.multigraph&&(e.multigraph=!1),"function"!=typeof Map)throw new Error("ngraph.graph requires `Map` to be defined. Please polyfill it before using ngraph")
+var t=new Map,r=[],u={},c=0,d=e.multigraph?function(e,t,r){var n=l(e,t),i=u.hasOwnProperty(n)
+if(i||T(e,t)){i||(u[n]=0)
+var o="@"+ ++u[n]
+n=l(e+o,t+o)}return new s(e,t,r,n)}:function(e,t,r){return new s(e,t,r,l(e,t))},h=[],f=M,p=M,m=M,v=M,g={addNode:_,addLink:function(e,t,n){m()
+var i=w(e)||_(e),o=w(t)||_(t),s=d(e,t,n)
+return r.push(s),a(i,s),e!==t&&a(o,s),f(s,"add"),v(),s},removeLink:S,removeNode:E,getNode:w,getNodeCount:x,getLinkCount:O,getLinksCount:O,getNodesCount:x,getLinks:function(e){var t=w(e)
+return t?t.links:null},forEachNode:C,forEachLinkedNode:function(e,r,n){var i=w(e)
+if(i&&i.links&&"function"==typeof r)return n?function(e,r,n){for(var i=0;i<e.length;++i){var o=e[i]
+if(o.fromId===r&&n(t.get(o.toId),o))return!0}}(i.links,e,r):function(e,r,n){for(var i=0;i<e.length;++i){var o=e[i],a=o.fromId===r?o.toId:o.fromId
+if(n(t.get(a),o))return!0}}(i.links,e,r)},forEachLink:function(e){var t,n
+if("function"==typeof e)for(t=0,n=r.length;t<n;++t)e(r[t])},beginUpdate:m,endUpdate:v,clear:function(){m(),C((function(e){E(e.id)})),v()},hasLink:T,hasNode:w,getLink:T}
+return n(g),function(){var e=g.on
+g.on=function(){return g.beginUpdate=m=A,g.endUpdate=v=P,f=b,p=y,g.on=e,e.apply(g,arguments)}}(),g
+function b(e,t){h.push({link:e,changeType:t})}function y(e,t){h.push({node:e,changeType:t})}function _(e,r){if(void 0===e)throw new Error("Invalid node identifier")
+m()
+var n=w(e)
+return n?(n.data=r,p(n,"update")):(n=new o(e,r),p(n,"add")),t.set(e,n),v(),n}function w(e){return t.get(e)}function E(e){var r=w(e)
+if(!r)return!1
+m()
+var n=r.links
+if(n){r.links=null
+for(var i=0;i<n.length;++i)S(n[i])}return t.delete(e),p(r,"remove"),v(),!0}function x(){return t.size}function O(){return r.length}function S(e){if(!e)return!1
+var t=i(e,r)
+if(t<0)return!1
+m(),r.splice(t,1)
+var n=w(e.fromId),o=w(e.toId)
+return n&&(t=i(e,n.links))>=0&&n.links.splice(t,1),o&&(t=i(e,o.links))>=0&&o.links.splice(t,1),f(e,"remove"),v(),!0}function T(e,t){var r,n=w(e)
+if(!n||!n.links)return null
+for(r=0;r<n.links.length;++r){var i=n.links[r]
+if(i.fromId===e&&i.toId===t)return i}return null}function M(){}function A(){c+=1}function P(){0==(c-=1)&&h.length>0&&(g.fire("changed",h),h.length=0)}function C(e){if("function"!=typeof e)throw new Error("Function is expected to iterate over graph nodes. You passed "+e)
+for(var r=t.values(),n=r.next();!n.done;){if(e(n.value))return!0
+n=r.next()}}}
+var n=r(75)
+function i(e,t){if(!t)return-1
+if(t.indexOf)return t.indexOf(e)
+var r,n=t.length
+for(r=0;r<n;r+=1)if(t[r]===e)return r
+return-1}function o(e,t){this.id=e,this.links=null,this.data=t}function a(e,t){e.links?e.links.push(t):e.links=[t]}function s(e,t,r,n){this.fromId=e,this.toId=t,this.data=r,this.id=n}function l(e,t){return e.toString()+"👉 "+t.toString()}},function(e){e.exports=function(e){!function(e){if(!e)throw new Error("Eventify cannot use falsy object as events subject")
+for(var t=["on","fire","off"],r=0;r<t.length;++r)if(e.hasOwnProperty(t[r]))throw new Error("Subject cannot be eventified, since it already has property '"+t[r]+"'")}(e)
+var t=function(e){var t=Object.create(null)
+return{on:function(r,n,i){if("function"!=typeof n)throw new Error("callback is expected to be a function")
+var o=t[r]
+return o||(o=t[r]=[]),o.push({callback:n,ctx:i}),e},off:function(r,n){if(void 0===r)return t=Object.create(null),e
+if(t[r])if("function"!=typeof n)delete t[r]
+else for(var i=t[r],o=0;o<i.length;++o)i[o].callback===n&&i.splice(o,1)
+return e},fire:function(r){var n,i=t[r]
+if(!i)return e
+arguments.length>1&&(n=Array.prototype.splice.call(arguments,1))
+for(var o=0;o<i.length;++o){var a=i[o]
+a.callback.apply(a.ctx,n)}return e}}}(e)
+return e.on=t.on,e.off=t.off,e.fire=t.fire,e}},function(e,t,r){"use strict"
+r.r(t)
+let n=/(-?(?:\d+\.?\d*|\d*\.?\d+)(?:e[-+]?\d+)?)\s*([\p{L}]*)/giu
+function i(e="",t="ms"){var r=null
+return(e=(e+"").replace(/(\d)[,_](\d)/g,"$1$2")).replace(n,(function(e,t,n){(n=o(n))&&(r=(r||0)+parseFloat(t,10)*n)})),r&&r/(o(t)||1)}function o(e){return i[e]||i[e.toLowerCase().replace(/s$/,"")]}i.nanosecond=i.ns=1e-6,i["µs"]=i["μs"]=i.us=i.microsecond=.001,i.millisecond=i.ms=i[""]=1,i.second=i.sec=i.s=1e3*i.ms,i.minute=i.min=i.m=60*i.s,i.hour=i.hr=i.h=60*i.m,i.day=i.d=24*i.h,i.week=i.wk=i.w=7*i.d,i.month=i.b=30.4375*i.d,i.year=i.yr=i.y=365.25*i.d,t.default=i},function(e,t,r){"use strict"
+const n=r(78)
+e.exports=(e,t={})=>{if(!Number.isFinite(e))throw new TypeError("Expected a finite number")
+t.colonNotation&&(t.compact=!1,t.formatSubMilliseconds=!1,t.separateMilliseconds=!1,t.verbose=!1),t.compact&&(t.secondsDecimalDigits=0,t.millisecondsDecimalDigits=0)
+const r=[],i=(e,n,i,o)=>{if(!(0!==r.length&&t.colonNotation||0!==e||t.colonNotation&&"m"===i))return
+let a,s
+if(o=(o||e||"0").toString(),t.colonNotation){a=r.length>0?":":"",s=""
+const e=o.includes(".")?o.split(".")[0].length:o.length,t=r.length>0?2:1
+o="0".repeat(Math.max(0,t-e))+o}else a="",s=t.verbose?" "+(l=n,1===e?l:l+"s"):i
+var l
+r.push(a+o+s)},o=n(e)
+if(i(Math.trunc(o.days/365),"year","y"),i(o.days%365,"day","d"),i(o.hours,"hour","h"),i(o.minutes,"minute","m"),t.separateMilliseconds||t.formatSubMilliseconds||!t.colonNotation&&e<1e3)if(i(o.seconds,"second","s"),t.formatSubMilliseconds)i(o.milliseconds,"millisecond","ms"),i(o.microseconds,"microsecond","µs"),i(o.nanoseconds,"nanosecond","ns")
+else{const e=o.milliseconds+o.microseconds/1e3+o.nanoseconds/1e6,r="number"==typeof t.millisecondsDecimalDigits?t.millisecondsDecimalDigits:0,n=e>=1?Math.round(e):Math.ceil(e),a=r?e.toFixed(r):n
+i(Number.parseFloat(a,10),"millisecond","ms",a)}else{const r=((e,t)=>{const r=Math.floor(e*10**t+1e-7)
+return(Math.round(r)/10**t).toFixed(t)})(e/1e3%60,"number"==typeof t.secondsDecimalDigits?t.secondsDecimalDigits:1),n=t.keepDecimalsOnWholeSeconds?r:r.replace(/\.0+$/,"")
+i(Number.parseFloat(n,10),"second","s",n)}if(0===r.length)return"0"+(t.verbose?" milliseconds":"ms")
+if(t.compact)return r[0]
+if("number"==typeof t.unitCount){const e=t.colonNotation?"":" "
+return r.slice(0,Math.max(t.unitCount,1)).join(e)}return t.colonNotation?r.join(""):r.join(" ")}},function(e){"use strict"
+e.exports=e=>{if("number"!=typeof e)throw new TypeError("Expected a number")
+const t=e>0?Math.floor:Math.ceil
+return{days:t(e/864e5),hours:t(e/36e5)%24,minutes:t(e/6e4)%60,seconds:t(e/1e3)%60,milliseconds:t(e)%1e3,microseconds:t(1e3*e)%1e3,nanoseconds:t(1e6*e)%1e3}}},function(e,t,r){"use strict"
+var n
+r.r(t)
+var i=function(){function e(){this.pool=[],this.flush()}return e.prototype.flush=function(){var e=this
+n=window.requestAnimationFrame((function(){var t=e.pool
+e.reset(),t.forEach((function(e){e[Object.keys(e)[0]]()})),e.flush()}))},e.prototype.add=function(e,t){var r
+return this.pool.push(((r={})[e]=t,r)),t},e.prototype.remove=function(e){this.pool=this.pool.filter((function(t){return!t[e]}))},e.prototype.reset=function(){this.pool=[]},e.prototype.stop=function(){window.cancelAnimationFrame(n)},e}()
+t.default=i},function(e,t,r){"use strict"
+r.r(t),r.d(t,"BufferedChangeset",(function(){return ie})),r.d(t,"CHANGESET",(function(){return T})),r.d(t,"Change",(function(){return n})),r.d(t,"Changeset",(function(){return se})),r.d(t,"Err",(function(){return o})),r.d(t,"ValidatedChangeset",(function(){return ae})),r.d(t,"buildOldValues",(function(){return N})),r.d(t,"changeset",(function(){return oe})),r.d(t,"getDeep",(function(){return d})),r.d(t,"getKeyValues",(function(){return l})),r.d(t,"isChangeset",(function(){return M})),r.d(t,"isObject",(function(){return i})),r.d(t,"isPromise",(function(){return u})),r.d(t,"keyInObject",(function(){return A})),r.d(t,"lookupValidator",(function(){return h})),r.d(t,"mergeDeep",(function(){return W})),r.d(t,"mergeNested",(function(){return D})),r.d(t,"normalizeObject",(function(){return _})),r.d(t,"objectWithout",(function(){return U})),r.d(t,"pureAssign",(function(){return E})),r.d(t,"setDeep",(function(){return R})),r.d(t,"take",(function(){return H}))
+var n=function(e){this.value=e}
+function i(e){return null!==e&&"object"==typeof e&&!(e instanceof Date||e instanceof RegExp)&&!Array.isArray(e)}var o=function(e,t){this.value=e,this.validation=t},a=function(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator]
+if(!r)return e
+var n,i,o=r.call(e),a=[]
+try{for(;(void 0===t||t-- >0)&&!(n=o.next()).done;)a.push(n.value)}catch(e){i={error:e}}finally{try{n&&!n.done&&(r=o.return)&&r.call(o)}finally{if(i)throw i.error}}return a},s=function(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(a(arguments[t]))
+return e}
+function l(e,t){void 0===t&&(t=[])
+var r=[]
+for(var n in e)e[n]&&i(e[n])&&(Object.prototype.hasOwnProperty.call(e[n],"value")?r.push({key:s(t,[n]).join("."),value:e[n].value}):"value"!==n&&r.push.apply(r,s(l(e[n],s(t,[n])))))
+return r}function u(e){return i(e)&&function(e){return!!(e&&e.then&&e.catch&&e.finally&&"function"==typeof e.then&&"function"==typeof e.catch&&"function"==typeof e.finally)}(e)}function c(e){return function(e,t,r,n){return new(r||(r=Promise))((function(i,o){function a(e){try{l(n.next(e))}catch(e){o(e)}}function s(e){try{l(n.throw(e))}catch(e){o(e)}}function l(e){var t
+e.done?i(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(a,s)}l((n=n.apply(e,t||[])).next())}))}(this,void 0,void 0,(function(){var t,r
+return function(e,t){var r,n,i,o,a={label:0,sent:function(){if(1&i[0])throw i[1]
+return i[1]},trys:[],ops:[]}
+return o={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o
+function s(o){return function(s){return function(o){if(r)throw new TypeError("Generator is already executing.")
+for(;a;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i
+switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o
+break
+case 4:return a.label++,{value:o[1],done:!1}
+case 5:a.label++,n=o[1],o=[0]
+continue
+case 7:o=a.ops.pop(),a.trys.pop()
+continue
+default:if(!((i=(i=a.trys).length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){a=0
+continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){a.label=o[1]
+break}if(6===o[0]&&a.label<i[1]){a.label=i[1],i=o
+break}if(i&&a.label<i[2]){a.label=i[2],a.ops.push(o)
+break}i[2]&&a.ops.pop(),a.trys.pop()
+continue}o=t.call(e,a)}catch(e){o=[6,e],n=0}finally{r=i=0}if(5&o[0])throw o[1]
+return{value:o[0]?o[1]:void 0,done:!0}}([o,s])}}}(this,(function(n){switch(n.label){case 0:return n.trys.push([0,2,,3]),[4,Promise.all(e)]
+case 1:return t=n.sent(),[2,0===(r=t.filter((function(e){return"boolean"!=typeof e&&e}))).length||r]
+case 2:return[2,n.sent()]
+case 3:return[2]}}))}))}function d(e,t){var r=e
+if(-1===t.indexOf("."))return r[t]
+for(var n="string"==typeof t?t.split("."):t,i=0;i<n.length;i++){if(null==r)return
+r=r[n[i]]}return r}function h(e){return function(t){var r=t.key,n=t.newValue,o=t.oldValue,a=t.changes,s=t.content,l=d(e||{},r)
+if(l&&l.validate&&(l=l.validate.bind(l)),!l||i(l))return!0
+if(Array.isArray(l)&&l.some((function(e){return"function"!=typeof e})))return!0
+if(Array.isArray(l))return function(e,t){var r=t.key,n=t.newValue,i=t.oldValue,o=t.changes,a=t.content,s=Array.from(e.map((function(e){return e(r,n,i,o,a)})))
+return s.some(u)?Promise.all(s).then(c):function(e){var t=e.filter((function(e){return"boolean"!=typeof e&&e}))
+return 0===t.length||t}(s)}(l,{key:r,newValue:n,oldValue:o,changes:a,content:s})
+var h=l(r,n,o,a,s)
+return u(h)?h.then((function(e){return e})):h}}var f=function(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator]
+if(!r)return e
+var n,i,o=r.call(e),a=[]
+try{for(;(void 0===t||t-- >0)&&!(n=o.next()).done;)a.push(n.value)}catch(e){i={error:e}}finally{try{n&&!n.done&&(r=o.return)&&r.call(o)}finally{if(i)throw i.error}}return a},p=function(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(f(arguments[t]))
+return e},m=function(){function e(){this.listeners=[]}return e.prototype.addListener=function(e){var t=this
+return this.listeners.push(e),function(){return t.removeListener(e)}},e.prototype.removeListener=function(e){for(var t=0;t<this.listeners.length;t++)if(this.listeners[t]===e)return void this.listeners.splice(t,1)},e.prototype.trigger=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t]
+this.listeners.forEach((function(t){return t.apply(void 0,p(e))}))},e}()
+function v(e,t){void 0===e._eventedNotifiers&&(e._eventedNotifiers={})
+var r=e._eventedNotifiers[t]
+return r||(r=e._eventedNotifiers[t]=new m),r}var g,b=function(e){var t="function"==typeof Symbol&&Symbol.iterator,r=t&&e[t],n=0
+if(r)return r.call(e)
+if(e&&"number"==typeof e.length)return{next:function(){return e&&n>=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}}
+throw new TypeError(t?"Object is not iterable.":"Symbol.iterator is not defined.")},y=function(){return(y=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var i in t=arguments[r])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i])
+return e}).apply(this,arguments)}
+function _(e){if(!e||!i(e))return e
+if(e instanceof n)return e.value
+var t=y({},e)
+for(var r in t){var o=t[r]
+o&&i(o)&&(Object.prototype.hasOwnProperty.call(o,"value")&&o instanceof n?t[r]=o.value:t[r]=_(o))}return t}function w(e){for(var t in e){if(e[t]instanceof n)return!0
+if(i(e[t])){var r=w(e[t])
+if(r)return r}}return!1}function E(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t]
+return e.reduce((function(e,t){return Object.defineProperties(e,g(t))}),{})}g=void 0!==Object.getOwnPropertyDescriptors?Object.getOwnPropertyDescriptors:function(e){var t={}
+return Object.keys(e).forEach((function(r){t[r]=Object.getOwnPropertyDescriptor(e,r)})),t}
+var x=function(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator]
+if(!r)return e
+var n,i,o=r.call(e),a=[]
+try{for(;(void 0===t||t-- >0)&&!(n=o.next()).done;)a.push(n.value)}catch(e){i={error:e}}finally{try{n&&!n.done&&(r=o.return)&&r.call(o)}finally{if(i)throw i.error}}return a},O=function(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(x(arguments[t]))
+return e}
+function S(e){return e?function e(t,r,n,o){var a,s
+void 0===o&&(o=[])
+try{for(var l=function(e){var t="function"==typeof Symbol&&Symbol.iterator,r=t&&e[t],n=0
+if(r)return r.call(e)
+if(e&&"number"==typeof e.length)return{next:function(){return e&&n>=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}}
+throw new TypeError(t?"Object is not iterable.":"Symbol.iterator is not defined.")}(n),u=l.next();!u.done;u=l.next()){var c=u.value,d=t[c]
+"function"==typeof d.validate?r[c]=d:i(d)?e(d,r,Object.keys(d),O(o,[c])):("function"==typeof d||Array.isArray(d)&&d.every((function(e){return"function"==typeof e})))&&(r[O(o,[c]).join(".")]=d)}}catch(e){a={error:e}}finally{try{u&&!u.done&&(s=l.return)&&s.call(l)}finally{if(a)throw a.error}}return r}(e,{},Object.keys(e)):{}}var T="__CHANGESET__"
+function M(e){return e&&e.__changeset__===T}function A(e,t){var r=function(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator]
+if(!r)return e
+var n,i,o=r.call(e),a=[]
+try{for(;(void 0===t||t-- >0)&&!(n=o.next()).done;)a.push(n.value)}catch(e){i={error:e}}finally{try{n&&!n.done&&(r=o.return)&&r.call(o)}finally{if(i)throw i.error}}return a}(t.split(".")),n=r[0],i=r.slice(1)
+if(!n||!(n in e))return!1
+if(!i.length)return!!e[n]
+var o=e[n]
+return null!==o&&"object"==typeof o&&A(e[n],i.join("."))}var P=function(){return(P=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var i in t=arguments[r])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i])
+return e}).apply(this,arguments)}
+function C(e,t){var r=function(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator]
+if(!r)return e
+var n,i,o=r.call(e),a=[]
+try{for(;(void 0===t||t-- >0)&&!(n=o.next()).done;)a.push(n.value)}catch(e){i={error:e}}finally{try{n&&!n.done&&(r=o.return)&&r.call(o)}finally{if(i)throw i.error}}return a}(t.slice(-1),1)[0],n=Object.keys(e).filter((function(e){return e!==r})).reduce((function(t,r){return t[r]=e[r],t}),Object.create(null))
+return P({},n)}function k(e){return"__proto__"!==e&&"constructor"!==e&&"prototype"!==e}function R(e,t,r,o){void 0===o&&(o={safeSet:void 0})
+var a=function(e){return e.split(".")}(t).filter(k),s=e
+if(o.safeSet=o.safeSet||function(e,t,r){return e[t]=r},1===a.length)return o.safeSet(e,t,r),e
+for(var l=0;l<a.length;l++){var u=a[l],c=i(e[u])
+if(c){if(c&&e[u]instanceof n){if(i(e[u].value)){var d=C(e[u].value,a),h=r instanceof n?r.value:r
+e[u]=new n(R(d,a.slice(1,a.length).join("."),h,o))
+break}o.safeSet(e,u,{})}}else o.safeSet(e,u,{})
+if(l===a.length-1){o.safeSet(e,u,r)
+break}e=e[u]}return s}var j=Object.keys
+function D(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t]
+var r={}
+return e.forEach((function(e){return j(e).forEach((function(t){return R(r,t,e[t])}))})),r}function N(e,t,r){var n,i,o=Object.create(null)
+try{for(var a=function(e){var t="function"==typeof Symbol&&Symbol.iterator,r=t&&e[t],n=0
+if(r)return r.call(e)
+if(e&&"number"==typeof e.length)return{next:function(){return e&&n>=e.length&&(e=void 0),{value:e&&e[n++],done:!e}}}
+throw new TypeError(t?"Object is not iterable.":"Symbol.iterator is not defined.")}(t),s=a.next();!s.done;s=a.next()){var l=s.value
+o[l.key]=r(e,l.key)}}catch(e){n={error:e}}finally{try{s&&!s.done&&(i=a.return)&&i.call(a)}finally{if(n)throw n.error}}return o}var I=function(){return(I=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++)for(var i in t=arguments[r])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i])
+return e}).apply(this,arguments)},L={get:function(e,t){var r
+if(!("symbol"==typeof t||e.changes.hasOwnProperty&&e.changes.hasOwnProperty(t)&&void 0===(r=e.safeGet(e.changes,t)))){if(r instanceof n)return r.value
+if(i(r)){var o=e.children[t]
+if(void 0===o&&e.content){var a=e.safeGet(e.content,t)
+o=e.children[t]=new z(r,a,e.safeGet)}if(o)return o.proxy}if(void 0!==r)return r
+if(e.content){var s=e.content
+if(e.safeGet(s,t))return e.safeGet(s,t)}return"function"==typeof e[t]||e.hasOwnProperty(t)?e[t]:void 0}},ownKeys:function(e){return Reflect.ownKeys(e.changes)},getOwnPropertyDescriptor:function(e,t){return Reflect.getOwnPropertyDescriptor(e.changes,t)},has:function(e,t){return Reflect.has(e.changes,t)},set:function(e,t,r){return t.startsWith("_")?Reflect.set(e,t,r):Reflect.set(e.changes,t,new n(r))}}
+function F(e,t){return e[t]}var z=function(){function e(e,t,r){void 0===e&&(e={}),void 0===t&&(t={}),void 0===r&&(r=F),this.safeGet=r,this.changes=e,this.content=t,this.proxy=new Proxy(this,L),this.children=Object.create(null)}return e.prototype.get=function(e){return this.safeGet(this.changes,e)},e.prototype.set=function(e,t){return R(this.changes,e,t)},e.prototype.unwrap=function(){var e=this.changes
+if(i(e)){e=_(e)
+var t=this.content
+if(i(t))return e=_(e),I(I({},t),e)}return e},e}()
+function U(e){for(var t=[],r=1;r<arguments.length;r++)t[r-1]=arguments[r]
+return t.reduce((function(t,r){return Object.keys(r).filter((function(t){return-1===e.indexOf(t)||!r.hasOwnProperty(t)})).forEach((function(e){return t[e]=r[e]})),t}),{})}function H(e,t){void 0===e&&(e={}),void 0===t&&(t=[])
+var r={}
+for(var n in e)-1!==t.indexOf(n)&&(r[n]=e[n])
+return r}var B=function(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator]
+if(!r)return e
+var n,i,o=r.call(e),a=[]
+try{for(;(void 0===t||t-- >0)&&!(n=o.next()).done;)a.push(n.value)}catch(e){i={error:e}}finally{try{n&&!n.done&&(r=o.return)&&r.call(o)}finally{if(i)throw i.error}}return a},V=function(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(B(arguments[t]))
+return e}
+function $(e,t){try{return t in e}catch(e){return!1}}function q(e,t,r){return function(e){return Object.keys(e).concat(function(e){return Object.getOwnPropertySymbols?Object.getOwnPropertySymbols(e).filter((function(t){return e.propertyIsEnumerable(t)})):[]}(e))}(t).forEach((function(i){if(function(e,t){return $(e,t)&&!(Object.hasOwnProperty.call(e,t)&&Object.propertyIsEnumerable.call(e,t))}(e,i)){if(r.safeSet){var o=function e(t,r,i,o){return Object.keys(t).forEach((function(a){var s=t[a]
+s&&s.hasOwnProperty("value")&&s instanceof n?i[V(o,[a]).join(".")]=s.value:"object"==typeof s&&e(s,r,i,V(o,[a]))})),i}(t,r,{},[])
+if(Object.keys(o).length>0)for(i in o){var a=o[i]
+r.safeSet(e,i,a)}}}else{if(!$(e,i)||!function(e){return function(e){return!!e&&"object"==typeof e}(e)&&!function(e){var t=Object.prototype.toString.call(e)
+return"[object RegExp]"===t||"[object Date]"===t}(e)}(t[i])||t[i]instanceof n){var s=t[i]
+return s&&s instanceof n?r.safeSet(e,i,s.value):r.safeSet(e,i,_(s))}r.safeSet(e,i,W(r.safeGet(e,i),r.safeGet(t,i),r))}})),e}function W(e,t,r){void 0===r&&(r={safeGet:void 0,safeSet:void 0}),r.safeGet=r.safeGet||function(e,t){return e[t]},r.safeSet=r.safeSet||function(e,t,r){return e[t]=r}
+var n=Array.isArray(t)
+return n===Array.isArray(e)?n?t:q(e,t,r):t}var G=function(e,t,r,n){return new(r||(r=Promise))((function(i,o){function a(e){try{l(n.next(e))}catch(e){o(e)}}function s(e){try{l(n.throw(e))}catch(e){o(e)}}function l(e){var t
+e.done?i(e.value):(t=e.value,t instanceof r?t:new r((function(e){e(t)}))).then(a,s)}l((n=n.apply(e,t||[])).next())}))},Y=function(e,t){var r,n,i,o,a={label:0,sent:function(){if(1&i[0])throw i[1]
+return i[1]},trys:[],ops:[]}
+return o={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o
+function s(o){return function(s){return function(o){if(r)throw new TypeError("Generator is already executing.")
+for(;a;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i
+switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o
+break
+case 4:return a.label++,{value:o[1],done:!1}
+case 5:a.label++,n=o[1],o=[0]
+continue
+case 7:o=a.ops.pop(),a.trys.pop()
+continue
+default:if(!((i=(i=a.trys).length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){a=0
+continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){a.label=o[1]
+break}if(6===o[0]&&a.label<i[1]){a.label=i[1],i=o
+break}if(i&&a.label<i[2]){a.label=i[2],a.ops.push(o)
+break}i[2]&&a.ops.pop(),a.trys.pop()
+continue}o=t.call(e,a)}catch(e){o=[6,e],n=0}finally{r=i=0}if(5&o[0])throw o[1]
+return{value:o[0]?o[1]:void 0,done:!0}}([o,s])}}},K=function(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator]
+if(!r)return e
+var n,i,o=r.call(e),a=[]
+try{for(;(void 0===t||t-- >0)&&!(n=o.next()).done;)a.push(n.value)}catch(e){i={error:e}}finally{try{n&&!n.done&&(r=o.return)&&r.call(o)}finally{if(i)throw i.error}}return a},J=function(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(K(arguments[t]))
+return e},Q=Object.keys,X="_content",Z="_changes",ee="_errors",te=function(){return!0},re={skipValidate:!1}
+function ne(e){return e}var ie=function(){function e(e,t,r,n){void 0===t&&(t=te),void 0===r&&(r={}),void 0===n&&(n={}),this.validateFn=t,this.validationMap=r,this.__changeset__=T,this._eventedNotifiers={},this.isObject=i,this.maybeUnwrapProxy=ne,this.setDeep=R,this.getDeep=d,this[X]=e,this._previousContent=e,this[Z]={},this[ee]={},this._validator=t,this._options=E(re,n),this._runningValidations={}}return e.prototype.on=function(e,t){return v(this,e).addListener(t)},e.prototype.off=function(e,t){return v(this,e).removeListener(t)},e.prototype.trigger=function(e){for(var t=[],r=1;r<arguments.length;r++)t[r-1]=arguments[r]
+var n=v(this,e)
+n&&n.trigger.apply(n,J(t))},e.prototype.safeGet=function(e,t){return e[t]},e.prototype.safeSet=function(e,t,r){return e[t]=r},Object.defineProperty(e.prototype,"_bareChanges",{get:function(){var e=this[Z]
+return Q(e).reduce((function(t,r){return t[r]=e[r].value,t}),Object.create(null))},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"changes",{get:function(){return l(this[Z])},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"errors",{get:function(){return function e(t,r){void 0===r&&(r=[])
+var n=[]
+for(var a in t)t[a]&&i(t[a])&&(Object.prototype.hasOwnProperty.call(t[a],"value")&&t[a]instanceof o?n.push({key:s(r,[a]).join("."),validation:t[a].validation,value:t[a].value}):"value"!==a&&n.push.apply(n,s(e(t[a],s(r,[a])))))
+return n}(this[ee])},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"change",{get:function(){var e=this[Z]
+return w(this[Z])?_(e):{}},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"error",{get:function(){return this[ee]},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"data",{get:function(){return this[X]},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"isValid",{get:function(){return 0===l(this[ee]).length},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"isPristine",{get:function(){var e=Object.keys(this[Z]),t=this._options.changesetKeys
+return Array.isArray(t)&&t.length&&(e=e.filter((function(e){return t.includes(e)}))),0===e.length||!w(this[Z])},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"isInvalid",{get:function(){return!this.isValid},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"isDirty",{get:function(){return!this.isPristine},enumerable:!1,configurable:!0}),e.prototype.setUnknownProperty=function(e,t){var r=this._options,n=r.changesetKeys
+if(!(Array.isArray(n)&&n.length>0)||n.find((function(t){return e.match(t)}))){var i=r.skipValidate,o=this[X],a=this.safeGet(o,e)
+if(i)return this._setProperty({key:e,value:t,oldValue:a}),void this._handleValidation(!0,{key:e,value:t})
+this._setProperty({key:e,value:t,oldValue:a}),this._validateKey(e,t)}},e.prototype.toString=function(){return"changeset:"+E(this[X],{}).toString()},e.prototype.prepare=function(e){var t=e(this._bareChanges)
+if(this.isObject(t),this.isObject(t)){var r=Q(t).reduce((function(e,r){return e[r]=new n(t[r]),e}),{})
+this[Z]=r}return this},e.prototype.execute=function(){var e
+if(this.isValid&&this.isDirty){var t=this[X],r=this[Z]
+e=N(t,this.changes,this.getDeep),this[X]=W(t,r)}return this.trigger("execute"),this[Z]={},this._previousContent=e,this},e.prototype.save=function(e){return G(this,void 0,void 0,(function(){var t,r,n,i,o
+return Y(this,(function(a){switch(a.label){case 0:t=this[X],r=Promise.resolve(this),this.execute(),"function"==typeof t.save?r=t.save(e):"function"==typeof this.safeGet(t,"save")&&(n=this.maybeUnwrapProxy(t).save())&&(r=n),a.label=1
+case 1:return a.trys.push([1,3,,4]),[4,r]
+case 2:return i=a.sent(),this.rollback(),[2,i]
+case 3:throw o=a.sent(),this._previousContent&&(this[X]=W(t,this._previousContent,{safeGet:this.safeGet,safeSet:this.safeSet})),o
+case 4:return[2]}}))}))},e.prototype.merge=function(e){var t=this[X]
+if(M(e),e[X],this.isPristine&&e.isPristine)return this
+var r=this[Z],n=e[Z],i=this[ee],o=e[ee],a=new ae(t,this._validator),s=U(Q(n),i),l=U(Q(o),r),u=D(s,o),c=D(l,n)
+return a[ee]=u,a[Z]=c,a._notifyVirtualProperties(),a},e.prototype.rollback=function(){var e=this._rollbackKeys()
+return this[Z]={},this[ee]={},this._notifyVirtualProperties(e),this.trigger("afterRollback"),this},e.prototype.rollbackInvalid=function(e){var t=this,r=Q(this[ee])
+return e?(this._notifyVirtualProperties([e]),this[ee]=this._deleteKey(ee,e),r.indexOf(e)>-1&&(this[Z]=this._deleteKey(Z,e))):(this._notifyVirtualProperties(),this[ee]={},r.forEach((function(e){t[Z]=t._deleteKey(Z,e)}))),this},e.prototype.rollbackProperty=function(e){return this[Z]=this._deleteKey(Z,e),this[ee]=this._deleteKey(ee,e),this},e.prototype.validate=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t]
+return G(this,void 0,void 0,(function(){var t,r=this
+return Y(this,(function(){return 0!==Q(this.validationMap).length||e.length?(e=e.length>0?e:Q(S(this.validationMap)),t=e.map((function(e){var t=r[e],n=t instanceof z?t.unwrap():t
+return r._validateKey(e,n)})),[2,Promise.all(t)]):[2,Promise.resolve(null)]}))}))},e.prototype.addError=function(e,t){var r,n=this
+if(function(e){return n.isObject(e)&&!Array.isArray(e)}(t))t.hasOwnProperty("value")||t.value,t.hasOwnProperty("validation"),r=new o(t.value,t.validation)
+else{var i=this[e]
+r=new o(i,t)}var a=this[ee]
+return this[ee]=this.setDeep(a,e,r,{safeSet:this.safeSet}),t},e.prototype.pushErrors=function(e){for(var t=[],r=1;r<arguments.length;r++)t[r-1]=arguments[r]
+var n=this[ee],i=this.getDeep(n,e)||new o(null,[]),a=i.validation,s=this[e]
+!Array.isArray(a)&&Boolean(a)&&(i.validation=[a])
+var l=i.validation
+a=J(l,t)
+var u=new o(s,a)
+return this[ee]=this.setDeep(n,e,u,{safeSet:this.safeSet}),{value:s,validation:a}},e.prototype.snapshot=function(){var e=this[Z],t=this[ee]
+return{changes:Q(e).reduce((function(t,r){return t[r]=e[r].value,t}),{}),errors:Q(t).reduce((function(e,r){var n=t[r]
+return e[r]={value:n.value,validation:n.validation},e}),{})}},e.prototype.restore=function(e){var t=e.changes,r=e.errors,i=Q(t).reduce((function(e,r){return e[r]=new n(t[r]),e}),{}),a=Q(r).reduce((function(e,t){var n=r[t]
+return e[t]=new o(n.value,n.validation),e}),{})
+return this[Z]=i,this[ee]=a,this._notifyVirtualProperties(),this},e.prototype.cast=function(e){void 0===e&&(e=[])
+var t=this[Z]
+if(Array.isArray(e)&&0===e.length)return this
+var r=H(t,Q(t).filter((function(t){return e.includes(t)})))
+return this[Z]=r,this},e.prototype.isValidating=function(e){var t=this._runningValidations,r=Q(t)
+return e?r.includes(e):r.length>0},e.prototype._validateKey=function(e,t){var r=this,n=this[X],i=this.getDeep(n,e),o=this._validate(e,t,i)
+if(this.trigger("beforeValidation",e),u(o))return this._setIsValidating(e,!0),o.then((function(n){return r._setIsValidating(e,!1),r._handleValidation(n,{key:e,value:t})})).then((function(t){return r.trigger("afterValidation",e),t}))
+var a=this._handleValidation(o,{key:e,value:t})
+return this.trigger("afterValidation",e),a},e.prototype._handleValidation=function(e,t){var r=t.key,n=t.value,i=!0===e||Array.isArray(e)&&1===e.length&&!0===e[0]
+return this[ee]=this._deleteKey(ee,r),i?n:this.addError(r,{value:n,validation:e})},e.prototype._validate=function(e,t,r){var n=this._validator,i=this[X]
+if("function"==typeof n){var o=n({key:e,newValue:t,oldValue:r,changes:this.change,content:i})
+return"boolean"!=typeof o&&!Boolean(o)||o}return!0},e.prototype._setProperty=function(e){var t=e.key,r=e.value,i=e.oldValue,o=this[Z]
+if(i!==r){var a=this.setDeep(o,t,new n(r),{safeSet:this.safeSet})
+this[Z]=a}else A(o,t)&&(this[Z]=this._deleteKey(Z,t))},e.prototype._setIsValidating=function(e,t){var r=this._runningValidations,n=r[e]||0
+t||1!==n?this.setDeep(r,e,t?n+1:n-1):delete r[e]},e.prototype._notifyVirtualProperties=function(e){return e||(e=this._rollbackKeys()),e},e.prototype._rollbackKeys=function(){var e=this[Z],t=this[ee]
+return J(new Set(J(Q(e),Q(t))))},e.prototype._deleteKey=function(e,t){void 0===t&&(t="")
+var r=this[e],n=t.split(".")
+if(1===n.length&&r.hasOwnProperty(t))delete r[t]
+else if(r[n[0]])for(var i=K(n),o=i[0],a=i.slice(1),s=r,l=r[o],u=o;this.isObject(l)&&u;){var c=l;(void 0!==c.value||c.validation)&&delete s[u],s=l,(u=a.shift())&&(l=l[u])}return r},e.prototype.get=function(e){var t=K(e.split(".")),r=t[0],i=t.slice(1),o=this[Z],a=this[X]
+if(Object.prototype.hasOwnProperty.call(o,r)){var s=this.getDeep(o,e)
+if(!this.isObject(s)&&void 0!==s)return s}if(Object.prototype.hasOwnProperty.call(o,r)&&w(o)){var l=o[r],u=_(l)
+if(this.isObject(u)){var c=this.maybeUnwrapProxy(this.getDeep(u,i.join(".")))
+if(void 0===c&&function(e,t,r){var i,o
+if(e instanceof n)return!1
+var a=t.split("."),s=e
+try{for(var l=b(a),u=l.next();!u.done;u=l.next()){var c=u.value
+if(!s)return!1
+if(a[a.length-1]!==c&&r(s,c)instanceof n)return!0
+s=r(s,c)}}catch(e){i={error:e}}finally{try{u&&!u.done&&(o=l.return)&&o.call(l)}finally{if(i)throw i.error}}return!1}(o,e,this.safeGet)&&!function(e,t,r){var n,i,o=t.split("."),a=e
+try{for(var s=b(o),l=s.next();!l.done;l=s.next()){var u=l.value
+if(!a||!Object.prototype.hasOwnProperty.call(a,u))return!1
+a=r(a,u)}}catch(e){n={error:e}}finally{try{l&&!l.done&&(i=s.return)&&i.call(s)}finally{if(n)throw n.error}}return!0}(o,e,this.safeGet)&&this.getDeep(a,e))return
+if(this.isObject(c)){if(c instanceof n)return c.value
+var d=this.safeGet(a,r),h=this.getDeep(d,i.join(".")),f=function(e,t){var r=e
+if(-1===t.indexOf("."))return r[t]
+for(var i="string"==typeof t?t.split("."):t,o=0;o<i.length;o++){if(null==r)return
+r=r[i[o]]instanceof n?r[i[o]].value:r[i[o]]}return r}(o,e)
+return new z(f,h,this.getDeep).proxy}if(void 0!==c)return c}if(l instanceof n&&0===i.length)return l.value}if(r in this||e in this)return this.getDeep(this,e)
+var p=this.maybeUnwrapProxy(this.getDeep(a,e))
+return this.isObject(p)?((f=this.getDeep(o,e))||(f=this.getDeep(this.setDeep(o,e,{}),e)),new z(f,p,this.getDeep).proxy):p},e.prototype.set=function(e,t){this.hasOwnProperty(e)||A(this,e)?this[e]=t:this.setUnknownProperty(e,t)},e}()
+function oe(e,t,r,n){return new ie(e,t,r,n)}var ae=function(e,t,r,n){var i=oe(e,t,r,n)
+return new Proxy(i,{get:function(e,t){return e.get(t.toString())},set:function(e,t,r){return e.set(t.toString(),r),!0}})}
+function se(e,t,r,n){var i=oe(e,t,r,n)
+return new Proxy(i,{get:function(e,t){return e.get(t.toString())},set:function(e,t,r){return e.set(t.toString(),r),!0}})}},function(e,t,r){var n=r(38),i=r(82)
+e.exports=function e(t){if(!(this instanceof e))return new e(t)
+var r=(t||"").replace(/^\//,""),o=i()
+return a._trie=o,a.on=function(e,t){if(n.equal(typeof e,"string"),n.equal(typeof t,"function"),e=e||"/",t._wayfarer&&t._trie)o.mount(e,t._trie.trie)
+else{var r=o.create(e)
+r.cb=t,r.route=e}return a},a.emit=a,a.match=s,a._wayfarer=!0,a
+function a(e){var t=s(e),r=new Array(arguments.length)
+r[0]=t.params
+for(var n=1;n<r.length;n++)r[n]=arguments[n]
+return t.cb.apply(t.cb,r)}function s(e){n.notEqual(e,void 0,"'route' must be defined")
+var t=o.match(e)
+if(t&&t.cb)return new l(t)
+var i=o.match(r)
+if(i&&i.cb)return new l(i)
+throw new Error("route '"+e+"' did not match")}function l(e){this.cb=e.cb,this.route=e.route,this.params=e.params}}},function(e,t,r){var n=r(38)
+function i(){if(!(this instanceof i))return new i
+this.trie={nodes:{}}}function o(e,t){return Object.prototype.hasOwnProperty.call(e,t)}e.exports=i,i.prototype.create=function(e){n.equal(typeof e,"string","route should be a string")
+var t=e.replace(/^\//,"").split("/")
+return function e(r,n){var i=o(t,r)&&t[r]
+if(!1===i)return n
+var a=null
+return/^:|^\*/.test(i)?(o(n.nodes,"$$")?a=n.nodes.$$:(a={nodes:{}},n.nodes.$$=a),"*"===i[0]&&(n.wildcard=!0),n.name=i.replace(/^:|^\*/,"")):o(n.nodes,i)?a=n.nodes[i]:(a={nodes:{}},n.nodes[i]=a),e(r+1,a)}(0,this.trie)},i.prototype.match=function(e){n.equal(typeof e,"string","route should be a string")
+var t=e.replace(/^\//,"").split("/"),r={},i=function e(n,i){if(void 0!==i){var a=t[n]
+if(void 0===a)return i
+if(o(i.nodes,a))return e(n+1,i.nodes[a])
+if(i.name){try{r[i.name]=decodeURIComponent(a)}catch(t){return e(n,void 0)}return e(n+1,i.nodes.$$)}if(i.wildcard){try{r.wildcard=decodeURIComponent(t.slice(n).join("/"))}catch(t){return e(n,void 0)}return i.nodes.$$}return e(n+1)}}(0,this.trie)
+if(i)return(i=Object.assign({},i)).params=r,i},i.prototype.mount=function(e,t){n.equal(typeof e,"string","route should be a string"),n.equal(typeof t,"object","trie should be a object")
+var r=e.replace(/^\//,"").split("/"),i=null,o=null
+if(1===r.length)o=r[0],i=this.create(o)
+else{var a=r.join("/")
+o=r[0],i=this.create(a)}Object.assign(i.nodes,t.nodes),t.name&&(i.name=t.name),i.nodes[""]&&(Object.keys(i.nodes[""]).forEach((function(e){"nodes"!==e&&(i[e]=i.nodes[""][e])})),Object.assign(i.nodes,i.nodes[""].nodes),delete i.nodes[""].nodes)}},,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,function(e,t,r){"use strict"
+r.r(t),r.d(t,"scaleBand",(function(){return l})),r.d(t,"scalePoint",(function(){return c})),r.d(t,"scaleIdentity",(function(){return X})),r.d(t,"scaleLinear",(function(){return Q})),r.d(t,"scaleLog",(function(){return se})),r.d(t,"scaleSymlog",(function(){return de})),r.d(t,"scaleOrdinal",(function(){return s})),r.d(t,"scaleImplicit",(function(){return a})),r.d(t,"scalePow",(function(){return ve})),r.d(t,"scaleSqrt",(function(){return ge})),r.d(t,"scaleRadial",(function(){return _e})),r.d(t,"scaleQuantile",(function(){return xe})),r.d(t,"scaleQuantize",(function(){return Oe})),r.d(t,"scaleThreshold",(function(){return Se})),r.d(t,"scaleTime",(function(){return Ir})),r.d(t,"scaleUtc",(function(){return Vr})),r.d(t,"scaleSequential",(function(){return Wr})),r.d(t,"scaleSequentialLog",(function(){return Gr})),r.d(t,"scaleSequentialPow",(function(){return Kr})),r.d(t,"scaleSequentialSqrt",(function(){return Jr})),r.d(t,"scaleSequentialSymlog",(function(){return Yr})),r.d(t,"scaleSequentialQuantile",(function(){return Qr})),r.d(t,"scaleDiverging",(function(){return en})),r.d(t,"scaleDivergingLog",(function(){return tn})),r.d(t,"scaleDivergingPow",(function(){return nn})),r.d(t,"scaleDivergingSqrt",(function(){return on})),r.d(t,"scaleDivergingSymlog",(function(){return rn})),r.d(t,"tickFormat",(function(){return K}))
+var n=r(37)
+function i(e,t){switch(arguments.length){case 0:break
+case 1:this.range(e)
+break
+default:this.range(t).domain(e)}return this}function o(e,t){switch(arguments.length){case 0:break
+case 1:"function"==typeof e?this.interpolator(e):this.range(e)
+break
+default:this.domain(e),"function"==typeof t?this.interpolator(t):this.range(t)}return this}const a=Symbol("implicit")
+function s(){var e=new Map,t=[],r=[],n=a
+function o(i){var o=i+"",s=e.get(o)
+if(!s){if(n!==a)return n
+e.set(o,s=t.push(i))}return r[(s-1)%r.length]}return o.domain=function(r){if(!arguments.length)return t.slice()
+t=[],e=new Map
+for(const n of r){const r=n+""
+e.has(r)||e.set(r,t.push(n))}return o},o.range=function(e){return arguments.length?(r=Array.from(e),o):r.slice()},o.unknown=function(e){return arguments.length?(n=e,o):n},o.copy=function(){return s(t,r).unknown(n)},i.apply(o,arguments),o}function l(){var e,t,r=s().unknown(void 0),o=r.domain,a=r.range,u=0,c=1,d=!1,h=0,f=0,p=.5
+function m(){var r=o().length,i=c<u,s=i?c:u,l=i?u:c
+e=(l-s)/Math.max(1,r-h+2*f),d&&(e=Math.floor(e)),s+=(l-s-e*(r-h))*p,t=e*(1-h),d&&(s=Math.round(s),t=Math.round(t))
+var m=Object(n.a)(r).map((function(t){return s+e*t}))
+return a(i?m.reverse():m)}return delete r.unknown,r.domain=function(e){return arguments.length?(o(e),m()):o()},r.range=function(e){return arguments.length?([u,c]=e,u=+u,c=+c,m()):[u,c]},r.rangeRound=function(e){return[u,c]=e,u=+u,c=+c,d=!0,m()},r.bandwidth=function(){return t},r.step=function(){return e},r.round=function(e){return arguments.length?(d=!!e,m()):d},r.padding=function(e){return arguments.length?(h=Math.min(1,f=+e),m()):h},r.paddingInner=function(e){return arguments.length?(h=Math.min(1,e),m()):h},r.paddingOuter=function(e){return arguments.length?(f=+e,m()):f},r.align=function(e){return arguments.length?(p=Math.max(0,Math.min(1,e)),m()):p},r.copy=function(){return l(o(),[u,c]).round(d).paddingInner(h).paddingOuter(f).align(p)},i.apply(m(),arguments)}function u(e){var t=e.copy
+return e.padding=e.paddingOuter,delete e.paddingInner,delete e.paddingOuter,e.copy=function(){return u(t())},e}function c(){return u(l.apply(null,arguments).paddingInner(1))}var d=r(6),h=r(11),f=r(9),p=r(35),m=function(e,t){t||(t=[])
+var r,n=e?Math.min(t.length,e.length):0,i=t.slice()
+return function(o){for(r=0;r<n;++r)i[r]=e[r]*(1-o)+t[r]*o
+return i}}
+function v(e,t){var r,n=t?t.length:0,i=e?Math.min(n,e.length):0,o=new Array(i),a=new Array(n)
+for(r=0;r<i;++r)o[r]=O(e[r],t[r])
+for(;r<n;++r)a[r]=t[r]
+return function(e){for(r=0;r<i;++r)a[r]=o[r](e)
+return a}}var g=function(e,t){var r=new Date
+return e=+e,t=+t,function(n){return r.setTime(e*(1-n)+t*n),r}},b=function(e,t){return e=+e,t=+t,function(r){return e*(1-r)+t*r}},y=function(e,t){var r,n={},i={}
+for(r in null!==e&&"object"==typeof e||(e={}),null!==t&&"object"==typeof t||(t={}),t)r in e?n[r]=O(e[r],t[r]):i[r]=t[r]
+return function(e){for(r in n)i[r]=n[r](e)
+return i}},_=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,w=new RegExp(_.source,"g"),E=function(e,t){var r,n,i,o=_.lastIndex=w.lastIndex=0,a=-1,s=[],l=[]
+for(e+="",t+="";(r=_.exec(e))&&(n=w.exec(t));)(i=n.index)>o&&(i=t.slice(o,i),s[a]?s[a]+=i:s[++a]=i),(r=r[0])===(n=n[0])?s[a]?s[a]+=n:s[++a]=n:(s[++a]=null,l.push({i:a,x:b(r,n)})),o=w.lastIndex
+return o<t.length&&(i=t.slice(o),s[a]?s[a]+=i:s[++a]=i),s.length<2?l[0]?function(e){return function(t){return e(t)+""}}(l[0].x):function(e){return function(){return e}}(t):(t=l.length,function(e){for(var r,n=0;n<t;++n)s[(r=l[n]).i]=r.x(e)
+return s.join("")})},x=r(14),O=function(e,t){var r,n=typeof t
+return null==t||"boolean"===n?Object(x.a)(t):("number"===n?b:"string"===n?(r=Object(f.e)(t))?(t=r,p.a):E:t instanceof f.e?p.a:t instanceof Date?g:function(e){return ArrayBuffer.isView(e)&&!(e instanceof DataView)}(t)?m:Array.isArray(t)?v:"function"!=typeof t.valueOf&&"function"!=typeof t.toString||isNaN(t)?y:b)(e,t)},S=function(e,t){return e=+e,t=+t,function(r){return Math.round(e*(1-r)+t*r)}}
+function T(e){return+e}var M=[0,1]
+function A(e){return e}function P(e,t){return(t-=e=+e)?function(r){return(r-e)/t}:(r=isNaN(t)?NaN:.5,function(){return r})
+var r}function C(e,t,r){var n=e[0],i=e[1],o=t[0],a=t[1]
+return i<n?(n=P(i,n),o=r(a,o)):(n=P(n,i),o=r(o,a)),function(e){return o(n(e))}}function k(e,t,r){var n=Math.min(e.length,t.length)-1,i=new Array(n),o=new Array(n),a=-1
+for(e[n]<e[0]&&(e=e.slice().reverse(),t=t.slice().reverse());++a<n;)i[a]=P(e[a],e[a+1]),o[a]=r(t[a],t[a+1])
+return function(t){var r=Object(h.d)(e,t,1,n)-1
+return o[r](i[r](t))}}function R(e,t){return t.domain(e.domain()).range(e.range()).interpolate(e.interpolate()).clamp(e.clamp()).unknown(e.unknown())}function j(){var e,t,r,n,i,o,a=M,s=M,l=O,u=A
+function c(){var e,t,r,l=Math.min(a.length,s.length)
+return u!==A&&(e=a[0],t=a[l-1],e>t&&(r=e,e=t,t=r),u=function(r){return Math.max(e,Math.min(t,r))}),n=l>2?k:C,i=o=null,d}function d(t){return isNaN(t=+t)?r:(i||(i=n(a.map(e),s,l)))(e(u(t)))}return d.invert=function(r){return u(t((o||(o=n(s,a.map(e),b)))(r)))},d.domain=function(e){return arguments.length?(a=Array.from(e,T),c()):a.slice()},d.range=function(e){return arguments.length?(s=Array.from(e),c()):s.slice()},d.rangeRound=function(e){return s=Array.from(e),l=S,c()},d.clamp=function(e){return arguments.length?(u=!!e||A,c()):u!==A},d.interpolate=function(e){return arguments.length?(l=e,c()):l},d.unknown=function(e){return arguments.length?(r=e,d):r},function(r,n){return e=r,t=n,c()}}function D(){return j()(A,A)}var N=/^(?:(.)?([<>=^]))?([+\-( ])?([$#])?(0)?(\d+)?(,)?(\.\d+)?(~)?([a-z%])?$/i
+function I(e){if(!(t=N.exec(e)))throw new Error("invalid format: "+e)
+var t
+return new L({fill:t[1],align:t[2],sign:t[3],symbol:t[4],zero:t[5],width:t[6],comma:t[7],precision:t[8]&&t[8].slice(1),trim:t[9],type:t[10]})}function L(e){this.fill=void 0===e.fill?" ":e.fill+"",this.align=void 0===e.align?">":e.align+"",this.sign=void 0===e.sign?"-":e.sign+"",this.symbol=void 0===e.symbol?"":e.symbol+"",this.zero=!!e.zero,this.width=void 0===e.width?void 0:+e.width,this.comma=!!e.comma,this.precision=void 0===e.precision?void 0:+e.precision,this.trim=!!e.trim,this.type=void 0===e.type?"":e.type+""}function F(e,t){if((r=(e=t?e.toExponential(t-1):e.toExponential()).indexOf("e"))<0)return null
+var r,n=e.slice(0,r)
+return[n.length>1?n[0]+n.slice(2):n,+e.slice(r+1)]}I.prototype=L.prototype,L.prototype.toString=function(){return this.fill+this.align+this.sign+this.symbol+(this.zero?"0":"")+(void 0===this.width?"":Math.max(1,0|this.width))+(this.comma?",":"")+(void 0===this.precision?"":"."+Math.max(0,0|this.precision))+(this.trim?"~":"")+this.type}
+var z,U,H,B,V=function(e){return(e=F(Math.abs(e)))?e[1]:NaN},$=function(e,t){var r=F(e,t)
+if(!r)return e+""
+var n=r[0],i=r[1]
+return i<0?"0."+new Array(-i).join("0")+n:n.length>i+1?n.slice(0,i+1)+"."+n.slice(i+1):n+new Array(i-n.length+2).join("0")},q={"%":(e,t)=>(100*e).toFixed(t),b:e=>Math.round(e).toString(2),c:e=>e+"",d:function(e){return Math.abs(e=Math.round(e))>=1e21?e.toLocaleString("en").replace(/,/g,""):e.toString(10)},e:(e,t)=>e.toExponential(t),f:(e,t)=>e.toFixed(t),g:(e,t)=>e.toPrecision(t),o:e=>Math.round(e).toString(8),p:(e,t)=>$(100*e,t),r:$,s:function(e,t){var r=F(e,t)
+if(!r)return e+""
+var n=r[0],i=r[1],o=i-(z=3*Math.max(-8,Math.min(8,Math.floor(i/3))))+1,a=n.length
+return o===a?n:o>a?n+new Array(o-a+1).join("0"):o>0?n.slice(0,o)+"."+n.slice(o):"0."+new Array(1-o).join("0")+F(e,Math.max(0,t+o-1))[0]},X:e=>Math.round(e).toString(16).toUpperCase(),x:e=>Math.round(e).toString(16)},W=function(e){return e},G=Array.prototype.map,Y=["y","z","a","f","p","n","µ","m","","k","M","G","T","P","E","Z","Y"]
+function K(e,t,r,n){var i,o=Object(d.c)(e,t,r)
+switch((n=I(null==n?",f":n)).type){case"s":var a=Math.max(Math.abs(e),Math.abs(t))
+return null!=n.precision||isNaN(i=function(e,t){return Math.max(0,3*Math.max(-8,Math.min(8,Math.floor(V(t)/3)))-V(Math.abs(e)))}(o,a))||(n.precision=i),B(n,a)
+case"":case"e":case"g":case"p":case"r":null!=n.precision||isNaN(i=function(e,t){return e=Math.abs(e),t=Math.abs(t)-e,Math.max(0,V(t)-V(e))+1}(o,Math.max(Math.abs(e),Math.abs(t))))||(n.precision=i-("e"===n.type))
+break
+case"f":case"%":null!=n.precision||isNaN(i=function(e){return Math.max(0,-V(Math.abs(e)))}(o))||(n.precision=i-2*("%"===n.type))}return H(n)}function J(e){var t=e.domain
+return e.ticks=function(e){var r=t()
+return Object(d.a)(r[0],r[r.length-1],null==e?10:e)},e.tickFormat=function(e,r){var n=t()
+return K(n[0],n[n.length-1],null==e?10:e,r)},e.nice=function(r){null==r&&(r=10)
+var n,i,o=t(),a=0,s=o.length-1,l=o[a],u=o[s],c=10
+for(u<l&&(i=l,l=u,u=i,i=a,a=s,s=i);c-- >0;){if((i=Object(d.b)(l,u,r))===n)return o[a]=l,o[s]=u,t(o)
+if(i>0)l=Math.floor(l/i)*i,u=Math.ceil(u/i)*i
+else{if(!(i<0))break
+l=Math.ceil(l*i)/i,u=Math.floor(u*i)/i}n=i}return e},e}function Q(){var e=D()
+return e.copy=function(){return R(e,Q())},i.apply(e,arguments),J(e)}function X(e){var t
+function r(e){return isNaN(e=+e)?t:e}return r.invert=r,r.domain=r.range=function(t){return arguments.length?(e=Array.from(t,T),r):e.slice()},r.unknown=function(e){return arguments.length?(t=e,r):t},r.copy=function(){return X(e).unknown(t)},e=arguments.length?Array.from(e,T):[0,1],J(r)}function Z(e,t){var r,n=0,i=(e=e.slice()).length-1,o=e[n],a=e[i]
+return a<o&&(r=n,n=i,i=r,r=o,o=a,a=r),e[n]=t.floor(o),e[i]=t.ceil(a),e}function ee(e){return Math.log(e)}function te(e){return Math.exp(e)}function re(e){return-Math.log(-e)}function ne(e){return-Math.exp(-e)}function ie(e){return isFinite(e)?+("1e"+e):e<0?0:e}function oe(e){return function(t){return-e(-t)}}function ae(e){var t,r,n=e(ee,te),i=n.domain,o=10
+function a(){return t=function(e){return e===Math.E?Math.log:10===e&&Math.log10||2===e&&Math.log2||(e=Math.log(e),function(t){return Math.log(t)/e})}(o),r=function(e){return 10===e?ie:e===Math.E?Math.exp:function(t){return Math.pow(e,t)}}(o),i()[0]<0?(t=oe(t),r=oe(r),e(re,ne)):e(ee,te),n}return n.base=function(e){return arguments.length?(o=+e,a()):o},n.domain=function(e){return arguments.length?(i(e),a()):i()},n.ticks=function(e){var n,a=i(),s=a[0],l=a[a.length-1];(n=l<s)&&(f=s,s=l,l=f)
+var u,c,h,f=t(s),p=t(l),m=null==e?10:+e,v=[]
+if(!(o%1)&&p-f<m){if(f=Math.floor(f),p=Math.ceil(p),s>0){for(;f<=p;++f)for(c=1,u=r(f);c<o;++c)if(!((h=u*c)<s)){if(h>l)break
+v.push(h)}}else for(;f<=p;++f)for(c=o-1,u=r(f);c>=1;--c)if(!((h=u*c)<s)){if(h>l)break
+v.push(h)}2*v.length<m&&(v=Object(d.a)(s,l,m))}else v=Object(d.a)(f,p,Math.min(p-f,m)).map(r)
+return n?v.reverse():v},n.tickFormat=function(e,i){if(null==i&&(i=10===o?".0e":","),"function"!=typeof i&&(i=H(i)),e===1/0)return i
+null==e&&(e=10)
+var a=Math.max(1,o*e/n.ticks().length)
+return function(e){var n=e/r(Math.round(t(e)))
+return n*o<o-.5&&(n*=o),n<=a?i(e):""}},n.nice=function(){return i(Z(i(),{floor:function(e){return r(Math.floor(t(e)))},ceil:function(e){return r(Math.ceil(t(e)))}}))},n}function se(){var e=ae(j()).domain([1,10])
+return e.copy=function(){return R(e,se()).base(e.base())},i.apply(e,arguments),e}function le(e){return function(t){return Math.sign(t)*Math.log1p(Math.abs(t/e))}}function ue(e){return function(t){return Math.sign(t)*Math.expm1(Math.abs(t))*e}}function ce(e){var t=1,r=e(le(t),ue(t))
+return r.constant=function(r){return arguments.length?e(le(t=+r),ue(t)):t},J(r)}function de(){var e=ce(j())
+return e.copy=function(){return R(e,de()).constant(e.constant())},i.apply(e,arguments)}function he(e){return function(t){return t<0?-Math.pow(-t,e):Math.pow(t,e)}}function fe(e){return e<0?-Math.sqrt(-e):Math.sqrt(e)}function pe(e){return e<0?-e*e:e*e}function me(e){var t=e(A,A),r=1
+function n(){return 1===r?e(A,A):.5===r?e(fe,pe):e(he(r),he(1/r))}return t.exponent=function(e){return arguments.length?(r=+e,n()):r},J(t)}function ve(){var e=me(j())
+return e.copy=function(){return R(e,ve()).exponent(e.exponent())},i.apply(e,arguments),e}function ge(){return ve.apply(null,arguments).exponent(.5)}function be(e){return Math.sign(e)*e*e}function ye(e){return Math.sign(e)*Math.sqrt(Math.abs(e))}function _e(){var e,t=D(),r=[0,1],n=!1
+function o(r){var i=ye(t(r))
+return isNaN(i)?e:n?Math.round(i):i}return o.invert=function(e){return t.invert(be(e))},o.domain=function(e){return arguments.length?(t.domain(e),o):t.domain()},o.range=function(e){return arguments.length?(t.range((r=Array.from(e,T)).map(be)),o):r.slice()},o.rangeRound=function(e){return o.range(e).round(!0)},o.round=function(e){return arguments.length?(n=!!e,o):n},o.clamp=function(e){return arguments.length?(t.clamp(e),o):t.clamp()},o.unknown=function(t){return arguments.length?(e=t,o):e},o.copy=function(){return _e(t.domain(),r).round(n).clamp(t.clamp()).unknown(e)},i.apply(o,arguments),J(o)}U=function(e){var t,r,n=void 0===e.grouping||void 0===e.thousands?W:(t=G.call(e.grouping,Number),r=e.thousands+"",function(e,n){for(var i=e.length,o=[],a=0,s=t[0],l=0;i>0&&s>0&&(l+s+1>n&&(s=Math.max(1,n-l)),o.push(e.substring(i-=s,i+s)),!((l+=s+1)>n));)s=t[a=(a+1)%t.length]
+return o.reverse().join(r)}),i=void 0===e.currency?"":e.currency[0]+"",o=void 0===e.currency?"":e.currency[1]+"",a=void 0===e.decimal?".":e.decimal+"",s=void 0===e.numerals?W:function(e){return function(t){return t.replace(/[0-9]/g,(function(t){return e[+t]}))}}(G.call(e.numerals,String)),l=void 0===e.percent?"%":e.percent+"",u=void 0===e.minus?"−":e.minus+"",c=void 0===e.nan?"NaN":e.nan+""
+function d(e){var t=(e=I(e)).fill,r=e.align,d=e.sign,h=e.symbol,f=e.zero,p=e.width,m=e.comma,v=e.precision,g=e.trim,b=e.type
+"n"===b?(m=!0,b="g"):q[b]||(void 0===v&&(v=12),g=!0,b="g"),(f||"0"===t&&"="===r)&&(f=!0,t="0",r="=")
+var y="$"===h?i:"#"===h&&/[boxX]/.test(b)?"0"+b.toLowerCase():"",_="$"===h?o:/[%p]/.test(b)?l:"",w=q[b],E=/[defgprs%]/.test(b)
+function x(e){var i,o,l,h=y,x=_
+if("c"===b)x=w(e)+x,e=""
+else{var O=(e=+e)<0||1/e<0
+if(e=isNaN(e)?c:w(Math.abs(e),v),g&&(e=function(e){e:for(var t,r=e.length,n=1,i=-1;n<r;++n)switch(e[n]){case".":i=t=n
+break
+case"0":0===i&&(i=n),t=n
+break
+default:if(!+e[n])break e
+i>0&&(i=0)}return i>0?e.slice(0,i)+e.slice(t+1):e}(e)),O&&0==+e&&"+"!==d&&(O=!1),h=(O?"("===d?d:u:"-"===d||"("===d?"":d)+h,x=("s"===b?Y[8+z/3]:"")+x+(O&&"("===d?")":""),E)for(i=-1,o=e.length;++i<o;)if(48>(l=e.charCodeAt(i))||l>57){x=(46===l?a+e.slice(i+1):e.slice(i))+x,e=e.slice(0,i)
+break}}m&&!f&&(e=n(e,1/0))
+var S=h.length+e.length+x.length,T=S<p?new Array(p-S+1).join(t):""
+switch(m&&f&&(e=n(T+e,T.length?p-x.length:1/0),T=""),r){case"<":e=h+e+x+T
+break
+case"=":e=h+T+e+x
+break
+case"^":e=T.slice(0,S=T.length>>1)+h+e+x+T.slice(S)
+break
+default:e=T+h+e+x}return s(e)}return v=void 0===v?6:/[gprs]/.test(b)?Math.max(1,Math.min(21,v)):Math.max(0,Math.min(20,v)),x.toString=function(){return e+""},x}return{format:d,formatPrefix:function(e,t){var r=d(((e=I(e)).type="f",e)),n=3*Math.max(-8,Math.min(8,Math.floor(V(t)/3))),i=Math.pow(10,-n),o=Y[8+n/3]
+return function(e){return r(i*e)+o}}}}({thousands:",",grouping:[3],currency:["$",""]}),H=U.format,B=U.formatPrefix
+var we=r(10),Ee=r(1)
+function xe(){var e,t=[],r=[],n=[]
+function o(){var e=0,i=Math.max(1,r.length)
+for(n=new Array(i-1);++e<i;)n[e-1]=Object(we.b)(t,e/i)
+return a}function a(t){return isNaN(t=+t)?e:r[Object(h.d)(n,t)]}return a.invertExtent=function(e){var i=r.indexOf(e)
+return i<0?[NaN,NaN]:[i>0?n[i-1]:t[0],i<n.length?n[i]:t[t.length-1]]},a.domain=function(e){if(!arguments.length)return t.slice()
+t=[]
+for(let r of e)null==r||isNaN(r=+r)||t.push(r)
+return t.sort(Ee.a),o()},a.range=function(e){return arguments.length?(r=Array.from(e),o()):r.slice()},a.unknown=function(t){return arguments.length?(e=t,a):e},a.quantiles=function(){return n.slice()},a.copy=function(){return xe().domain(t).range(r).unknown(e)},i.apply(a,arguments)}function Oe(){var e,t=0,r=1,n=1,o=[.5],a=[0,1]
+function s(t){return t<=t?a[Object(h.d)(o,t,0,n)]:e}function l(){var e=-1
+for(o=new Array(n);++e<n;)o[e]=((e+1)*r-(e-n)*t)/(n+1)
+return s}return s.domain=function(e){return arguments.length?([t,r]=e,t=+t,r=+r,l()):[t,r]},s.range=function(e){return arguments.length?(n=(a=Array.from(e)).length-1,l()):a.slice()},s.invertExtent=function(e){var i=a.indexOf(e)
+return i<0?[NaN,NaN]:i<1?[t,o[0]]:i>=n?[o[n-1],r]:[o[i-1],o[i]]},s.unknown=function(t){return arguments.length?(e=t,s):s},s.thresholds=function(){return o.slice()},s.copy=function(){return Oe().domain([t,r]).range(a).unknown(e)},i.apply(J(s),arguments)}function Se(){var e,t=[.5],r=[0,1],n=1
+function o(i){return i<=i?r[Object(h.d)(t,i,0,n)]:e}return o.domain=function(e){return arguments.length?(t=Array.from(e),n=Math.min(t.length,r.length-1),o):t.slice()},o.range=function(e){return arguments.length?(r=Array.from(e),n=Math.min(t.length,r.length-1),o):r.slice()},o.invertExtent=function(e){var n=r.indexOf(e)
+return[t[n-1],t[n]]},o.unknown=function(t){return arguments.length?(e=t,o):e},o.copy=function(){return Se().domain(t).range(r).unknown(e)},i.apply(o,arguments)}var Te=r(18),Me=new Date,Ae=new Date
+function Pe(e,t,r,n){function i(t){return e(t=0===arguments.length?new Date:new Date(+t)),t}return i.floor=function(t){return e(t=new Date(+t)),t},i.ceil=function(r){return e(r=new Date(r-1)),t(r,1),e(r),r},i.round=function(e){var t=i(e),r=i.ceil(e)
+return e-t<r-e?t:r},i.offset=function(e,r){return t(e=new Date(+e),null==r?1:Math.floor(r)),e},i.range=function(r,n,o){var a,s=[]
+if(r=i.ceil(r),o=null==o?1:Math.floor(o),!(r<n&&o>0))return s
+do{s.push(a=new Date(+r)),t(r,o),e(r)}while(a<r&&r<n)
+return s},i.filter=function(r){return Pe((function(t){if(t>=t)for(;e(t),!r(t);)t.setTime(t-1)}),(function(e,n){if(e>=e)if(n<0)for(;++n<=0;)for(;t(e,-1),!r(e););else for(;--n>=0;)for(;t(e,1),!r(e););}))},r&&(i.count=function(t,n){return Me.setTime(+t),Ae.setTime(+n),e(Me),e(Ae),Math.floor(r(Me,Ae))},i.every=function(e){return e=Math.floor(e),isFinite(e)&&e>0?e>1?i.filter(n?function(t){return n(t)%e==0}:function(t){return i.count(0,t)%e==0}):i:null}),i}var Ce=Pe((function(e){e.setMonth(0,1),e.setHours(0,0,0,0)}),(function(e,t){e.setFullYear(e.getFullYear()+t)}),(function(e,t){return t.getFullYear()-e.getFullYear()}),(function(e){return e.getFullYear()}))
+Ce.every=function(e){return isFinite(e=Math.floor(e))&&e>0?Pe((function(t){t.setFullYear(Math.floor(t.getFullYear()/e)*e),t.setMonth(0,1),t.setHours(0,0,0,0)}),(function(t,r){t.setFullYear(t.getFullYear()+r*e)})):null}
+var ke=Ce,Re=(Ce.range,Pe((function(e){e.setDate(1),e.setHours(0,0,0,0)}),(function(e,t){e.setMonth(e.getMonth()+t)}),(function(e,t){return t.getMonth()-e.getMonth()+12*(t.getFullYear()-e.getFullYear())}),(function(e){return e.getMonth()}))),je=Re
+function De(e){return Pe((function(t){t.setDate(t.getDate()-(t.getDay()+7-e)%7),t.setHours(0,0,0,0)}),(function(e,t){e.setDate(e.getDate()+7*t)}),(function(e,t){return(t-e-6e4*(t.getTimezoneOffset()-e.getTimezoneOffset()))/6048e5}))}Re.range
+var Ne=De(0),Ie=De(1),Le=De(2),Fe=De(3),ze=De(4),Ue=De(5),He=De(6),Be=(Ne.range,Ie.range,Le.range,Fe.range,ze.range,Ue.range,He.range,Pe(e=>e.setHours(0,0,0,0),(e,t)=>e.setDate(e.getDate()+t),(e,t)=>(t-e-6e4*(t.getTimezoneOffset()-e.getTimezoneOffset()))/864e5,e=>e.getDate()-1)),Ve=Be,$e=(Be.range,Pe((function(e){e.setTime(e-e.getMilliseconds()-1e3*e.getSeconds()-6e4*e.getMinutes())}),(function(e,t){e.setTime(+e+36e5*t)}),(function(e,t){return(t-e)/36e5}),(function(e){return e.getHours()}))),qe=$e,We=($e.range,Pe((function(e){e.setTime(e-e.getMilliseconds()-1e3*e.getSeconds())}),(function(e,t){e.setTime(+e+6e4*t)}),(function(e,t){return(t-e)/6e4}),(function(e){return e.getMinutes()}))),Ge=We,Ye=(We.range,Pe((function(e){e.setTime(e-e.getMilliseconds())}),(function(e,t){e.setTime(+e+1e3*t)}),(function(e,t){return(t-e)/1e3}),(function(e){return e.getUTCSeconds()}))),Ke=Ye,Je=(Ye.range,Pe((function(){}),(function(e,t){e.setTime(+e+t)}),(function(e,t){return t-e})))
+Je.every=function(e){return e=Math.floor(e),isFinite(e)&&e>0?e>1?Pe((function(t){t.setTime(Math.floor(t/e)*e)}),(function(t,r){t.setTime(+t+r*e)}),(function(t,r){return(r-t)/e})):Je:null}
+var Qe=Je
+function Xe(e){return Pe((function(t){t.setUTCDate(t.getUTCDate()-(t.getUTCDay()+7-e)%7),t.setUTCHours(0,0,0,0)}),(function(e,t){e.setUTCDate(e.getUTCDate()+7*t)}),(function(e,t){return(t-e)/6048e5}))}Je.range
+var Ze=Xe(0),et=Xe(1),tt=Xe(2),rt=Xe(3),nt=Xe(4),it=Xe(5),ot=Xe(6),at=(Ze.range,et.range,tt.range,rt.range,nt.range,it.range,ot.range,Pe((function(e){e.setUTCHours(0,0,0,0)}),(function(e,t){e.setUTCDate(e.getUTCDate()+t)}),(function(e,t){return(t-e)/864e5}),(function(e){return e.getUTCDate()-1}))),st=at,lt=(at.range,Pe((function(e){e.setUTCMonth(0,1),e.setUTCHours(0,0,0,0)}),(function(e,t){e.setUTCFullYear(e.getUTCFullYear()+t)}),(function(e,t){return t.getUTCFullYear()-e.getUTCFullYear()}),(function(e){return e.getUTCFullYear()})))
+lt.every=function(e){return isFinite(e=Math.floor(e))&&e>0?Pe((function(t){t.setUTCFullYear(Math.floor(t.getUTCFullYear()/e)*e),t.setUTCMonth(0,1),t.setUTCHours(0,0,0,0)}),(function(t,r){t.setUTCFullYear(t.getUTCFullYear()+r*e)})):null}
+var ut=lt
+function ct(e){if(0<=e.y&&e.y<100){var t=new Date(-1,e.m,e.d,e.H,e.M,e.S,e.L)
+return t.setFullYear(e.y),t}return new Date(e.y,e.m,e.d,e.H,e.M,e.S,e.L)}function dt(e){if(0<=e.y&&e.y<100){var t=new Date(Date.UTC(-1,e.m,e.d,e.H,e.M,e.S,e.L))
+return t.setUTCFullYear(e.y),t}return new Date(Date.UTC(e.y,e.m,e.d,e.H,e.M,e.S,e.L))}function ht(e,t,r){return{y:e,m:t,d:r,H:0,M:0,S:0,L:0}}lt.range
+var ft,pt,mt,vt={"-":"",_:" ",0:"0"},gt=/^\s*\d+/,bt=/^%/,yt=/[\\^$*+?|[\]().{}]/g
+function _t(e,t,r){var n=e<0?"-":"",i=(n?-e:e)+"",o=i.length
+return n+(o<r?new Array(r-o+1).join(t)+i:i)}function wt(e){return e.replace(yt,"\\$&")}function Et(e){return new RegExp("^(?:"+e.map(wt).join("|")+")","i")}function xt(e){return new Map(e.map((e,t)=>[e.toLowerCase(),t]))}function Ot(e,t,r){var n=gt.exec(t.slice(r,r+1))
+return n?(e.w=+n[0],r+n[0].length):-1}function St(e,t,r){var n=gt.exec(t.slice(r,r+1))
+return n?(e.u=+n[0],r+n[0].length):-1}function Tt(e,t,r){var n=gt.exec(t.slice(r,r+2))
+return n?(e.U=+n[0],r+n[0].length):-1}function Mt(e,t,r){var n=gt.exec(t.slice(r,r+2))
+return n?(e.V=+n[0],r+n[0].length):-1}function At(e,t,r){var n=gt.exec(t.slice(r,r+2))
+return n?(e.W=+n[0],r+n[0].length):-1}function Pt(e,t,r){var n=gt.exec(t.slice(r,r+4))
+return n?(e.y=+n[0],r+n[0].length):-1}function Ct(e,t,r){var n=gt.exec(t.slice(r,r+2))
+return n?(e.y=+n[0]+(+n[0]>68?1900:2e3),r+n[0].length):-1}function kt(e,t,r){var n=/^(Z)|([+-]\d\d)(?::?(\d\d))?/.exec(t.slice(r,r+6))
+return n?(e.Z=n[1]?0:-(n[2]+(n[3]||"00")),r+n[0].length):-1}function Rt(e,t,r){var n=gt.exec(t.slice(r,r+1))
+return n?(e.q=3*n[0]-3,r+n[0].length):-1}function jt(e,t,r){var n=gt.exec(t.slice(r,r+2))
+return n?(e.m=n[0]-1,r+n[0].length):-1}function Dt(e,t,r){var n=gt.exec(t.slice(r,r+2))
+return n?(e.d=+n[0],r+n[0].length):-1}function Nt(e,t,r){var n=gt.exec(t.slice(r,r+3))
+return n?(e.m=0,e.d=+n[0],r+n[0].length):-1}function It(e,t,r){var n=gt.exec(t.slice(r,r+2))
+return n?(e.H=+n[0],r+n[0].length):-1}function Lt(e,t,r){var n=gt.exec(t.slice(r,r+2))
+return n?(e.M=+n[0],r+n[0].length):-1}function Ft(e,t,r){var n=gt.exec(t.slice(r,r+2))
+return n?(e.S=+n[0],r+n[0].length):-1}function zt(e,t,r){var n=gt.exec(t.slice(r,r+3))
+return n?(e.L=+n[0],r+n[0].length):-1}function Ut(e,t,r){var n=gt.exec(t.slice(r,r+6))
+return n?(e.L=Math.floor(n[0]/1e3),r+n[0].length):-1}function Ht(e,t,r){var n=bt.exec(t.slice(r,r+1))
+return n?r+n[0].length:-1}function Bt(e,t,r){var n=gt.exec(t.slice(r))
+return n?(e.Q=+n[0],r+n[0].length):-1}function Vt(e,t,r){var n=gt.exec(t.slice(r))
+return n?(e.s=+n[0],r+n[0].length):-1}function $t(e,t){return _t(e.getDate(),t,2)}function qt(e,t){return _t(e.getHours(),t,2)}function Wt(e,t){return _t(e.getHours()%12||12,t,2)}function Gt(e,t){return _t(1+Ve.count(ke(e),e),t,3)}function Yt(e,t){return _t(e.getMilliseconds(),t,3)}function Kt(e,t){return Yt(e,t)+"000"}function Jt(e,t){return _t(e.getMonth()+1,t,2)}function Qt(e,t){return _t(e.getMinutes(),t,2)}function Xt(e,t){return _t(e.getSeconds(),t,2)}function Zt(e){var t=e.getDay()
+return 0===t?7:t}function er(e,t){return _t(Ne.count(ke(e)-1,e),t,2)}function tr(e){var t=e.getDay()
+return t>=4||0===t?ze(e):ze.ceil(e)}function rr(e,t){return e=tr(e),_t(ze.count(ke(e),e)+(4===ke(e).getDay()),t,2)}function nr(e){return e.getDay()}function ir(e,t){return _t(Ie.count(ke(e)-1,e),t,2)}function or(e,t){return _t(e.getFullYear()%100,t,2)}function ar(e,t){return _t((e=tr(e)).getFullYear()%100,t,2)}function sr(e,t){return _t(e.getFullYear()%1e4,t,4)}function lr(e,t){var r=e.getDay()
+return _t((e=r>=4||0===r?ze(e):ze.ceil(e)).getFullYear()%1e4,t,4)}function ur(e){var t=e.getTimezoneOffset()
+return(t>0?"-":(t*=-1,"+"))+_t(t/60|0,"0",2)+_t(t%60,"0",2)}function cr(e,t){return _t(e.getUTCDate(),t,2)}function dr(e,t){return _t(e.getUTCHours(),t,2)}function hr(e,t){return _t(e.getUTCHours()%12||12,t,2)}function fr(e,t){return _t(1+st.count(ut(e),e),t,3)}function pr(e,t){return _t(e.getUTCMilliseconds(),t,3)}function mr(e,t){return pr(e,t)+"000"}function vr(e,t){return _t(e.getUTCMonth()+1,t,2)}function gr(e,t){return _t(e.getUTCMinutes(),t,2)}function br(e,t){return _t(e.getUTCSeconds(),t,2)}function yr(e){var t=e.getUTCDay()
+return 0===t?7:t}function _r(e,t){return _t(Ze.count(ut(e)-1,e),t,2)}function wr(e){var t=e.getUTCDay()
+return t>=4||0===t?nt(e):nt.ceil(e)}function Er(e,t){return e=wr(e),_t(nt.count(ut(e),e)+(4===ut(e).getUTCDay()),t,2)}function xr(e){return e.getUTCDay()}function Or(e,t){return _t(et.count(ut(e)-1,e),t,2)}function Sr(e,t){return _t(e.getUTCFullYear()%100,t,2)}function Tr(e,t){return _t((e=wr(e)).getUTCFullYear()%100,t,2)}function Mr(e,t){return _t(e.getUTCFullYear()%1e4,t,4)}function Ar(e,t){var r=e.getUTCDay()
+return _t((e=r>=4||0===r?nt(e):nt.ceil(e)).getUTCFullYear()%1e4,t,4)}function Pr(){return"+0000"}function Cr(){return"%"}function kr(e){return+e}function Rr(e){return Math.floor(+e/1e3)}function jr(e){return new Date(e)}function Dr(e){return e instanceof Date?+e:+new Date(+e)}function Nr(e,t,r,n,i,o,a,s,l){var u=D(),c=u.invert,h=u.domain,f=l(".%L"),p=l(":%S"),m=l("%I:%M"),v=l("%I %p"),g=l("%a %d"),b=l("%b %d"),y=l("%B"),_=l("%Y"),w=[[a,1,1e3],[a,5,5e3],[a,15,15e3],[a,30,3e4],[o,1,6e4],[o,5,3e5],[o,15,9e5],[o,30,18e5],[i,1,36e5],[i,3,108e5],[i,6,216e5],[i,12,432e5],[n,1,864e5],[n,2,1728e5],[r,1,6048e5],[t,1,2592e6],[t,3,7776e6],[e,1,31536e6]]
+function E(s){return(a(s)<s?f:o(s)<s?p:i(s)<s?m:n(s)<s?v:t(s)<s?r(s)<s?g:b:e(s)<s?y:_)(s)}function x(t,r,n){if(null==t&&(t=10),"number"==typeof t){var i,o=Math.abs(n-r)/t,a=Object(Te.a)((function(e){return e[2]})).right(w,o)
+return a===w.length?(i=Object(d.c)(r/31536e6,n/31536e6,t),t=e):a?(i=(a=w[o/w[a-1][2]<w[a][2]/o?a-1:a])[1],t=a[0]):(i=Math.max(Object(d.c)(r,n,t),1),t=s),t.every(i)}return t}return u.invert=function(e){return new Date(c(e))},u.domain=function(e){return arguments.length?h(Array.from(e,Dr)):h().map(jr)},u.ticks=function(e){var t,r=h(),n=r[0],i=r[r.length-1],o=i<n
+return o&&(t=n,n=i,i=t),t=(t=x(e,n,i))?t.range(n,i+1):[],o?t.reverse():t},u.tickFormat=function(e,t){return null==t?E:l(t)},u.nice=function(e){var t=h()
+return(e=x(e,t[0],t[t.length-1]))?h(Z(t,e)):u},u.copy=function(){return R(u,Nr(e,t,r,n,i,o,a,s,l))},u}function Ir(){return i.apply(Nr(ke,je,Ne,Ve,qe,Ge,Ke,Qe,pt).domain([new Date(2e3,0,1),new Date(2e3,0,2)]),arguments)}ft=function(e){var t=e.dateTime,r=e.date,n=e.time,i=e.periods,o=e.days,a=e.shortDays,s=e.months,l=e.shortMonths,u=Et(i),c=xt(i),d=Et(o),h=xt(o),f=Et(a),p=xt(a),m=Et(s),v=xt(s),g=Et(l),b=xt(l),y={a:function(e){return a[e.getDay()]},A:function(e){return o[e.getDay()]},b:function(e){return l[e.getMonth()]},B:function(e){return s[e.getMonth()]},c:null,d:$t,e:$t,f:Kt,g:ar,G:lr,H:qt,I:Wt,j:Gt,L:Yt,m:Jt,M:Qt,p:function(e){return i[+(e.getHours()>=12)]},q:function(e){return 1+~~(e.getMonth()/3)},Q:kr,s:Rr,S:Xt,u:Zt,U:er,V:rr,w:nr,W:ir,x:null,X:null,y:or,Y:sr,Z:ur,"%":Cr},_={a:function(e){return a[e.getUTCDay()]},A:function(e){return o[e.getUTCDay()]},b:function(e){return l[e.getUTCMonth()]},B:function(e){return s[e.getUTCMonth()]},c:null,d:cr,e:cr,f:mr,g:Tr,G:Ar,H:dr,I:hr,j:fr,L:pr,m:vr,M:gr,p:function(e){return i[+(e.getUTCHours()>=12)]},q:function(e){return 1+~~(e.getUTCMonth()/3)},Q:kr,s:Rr,S:br,u:yr,U:_r,V:Er,w:xr,W:Or,x:null,X:null,y:Sr,Y:Mr,Z:Pr,"%":Cr},w={a:function(e,t,r){var n=f.exec(t.slice(r))
+return n?(e.w=p.get(n[0].toLowerCase()),r+n[0].length):-1},A:function(e,t,r){var n=d.exec(t.slice(r))
+return n?(e.w=h.get(n[0].toLowerCase()),r+n[0].length):-1},b:function(e,t,r){var n=g.exec(t.slice(r))
+return n?(e.m=b.get(n[0].toLowerCase()),r+n[0].length):-1},B:function(e,t,r){var n=m.exec(t.slice(r))
+return n?(e.m=v.get(n[0].toLowerCase()),r+n[0].length):-1},c:function(e,r,n){return O(e,t,r,n)},d:Dt,e:Dt,f:Ut,g:Ct,G:Pt,H:It,I:It,j:Nt,L:zt,m:jt,M:Lt,p:function(e,t,r){var n=u.exec(t.slice(r))
+return n?(e.p=c.get(n[0].toLowerCase()),r+n[0].length):-1},q:Rt,Q:Bt,s:Vt,S:Ft,u:St,U:Tt,V:Mt,w:Ot,W:At,x:function(e,t,n){return O(e,r,t,n)},X:function(e,t,r){return O(e,n,t,r)},y:Ct,Y:Pt,Z:kt,"%":Ht}
+function E(e,t){return function(r){var n,i,o,a=[],s=-1,l=0,u=e.length
+for(r instanceof Date||(r=new Date(+r));++s<u;)37===e.charCodeAt(s)&&(a.push(e.slice(l,s)),null!=(i=vt[n=e.charAt(++s)])?n=e.charAt(++s):i="e"===n?" ":"0",(o=t[n])&&(n=o(r,i)),a.push(n),l=s+1)
+return a.push(e.slice(l,s)),a.join("")}}function x(e,t){return function(r){var n,i,o=ht(1900,void 0,1)
+if(O(o,e,r+="",0)!=r.length)return null
+if("Q"in o)return new Date(o.Q)
+if("s"in o)return new Date(1e3*o.s+("L"in o?o.L:0))
+if(t&&!("Z"in o)&&(o.Z=0),"p"in o&&(o.H=o.H%12+12*o.p),void 0===o.m&&(o.m="q"in o?o.q:0),"V"in o){if(o.V<1||o.V>53)return null
+"w"in o||(o.w=1),"Z"in o?(i=(n=dt(ht(o.y,0,1))).getUTCDay(),n=i>4||0===i?et.ceil(n):et(n),n=st.offset(n,7*(o.V-1)),o.y=n.getUTCFullYear(),o.m=n.getUTCMonth(),o.d=n.getUTCDate()+(o.w+6)%7):(i=(n=ct(ht(o.y,0,1))).getDay(),n=i>4||0===i?Ie.ceil(n):Ie(n),n=Ve.offset(n,7*(o.V-1)),o.y=n.getFullYear(),o.m=n.getMonth(),o.d=n.getDate()+(o.w+6)%7)}else("W"in o||"U"in o)&&("w"in o||(o.w="u"in o?o.u%7:"W"in o?1:0),i="Z"in o?dt(ht(o.y,0,1)).getUTCDay():ct(ht(o.y,0,1)).getDay(),o.m=0,o.d="W"in o?(o.w+6)%7+7*o.W-(i+5)%7:o.w+7*o.U-(i+6)%7)
+return"Z"in o?(o.H+=o.Z/100|0,o.M+=o.Z%100,dt(o)):ct(o)}}function O(e,t,r,n){for(var i,o,a=0,s=t.length,l=r.length;a<s;){if(n>=l)return-1
+if(37===(i=t.charCodeAt(a++))){if(i=t.charAt(a++),!(o=w[i in vt?t.charAt(a++):i])||(n=o(e,r,n))<0)return-1}else if(i!=r.charCodeAt(n++))return-1}return n}return y.x=E(r,y),y.X=E(n,y),y.c=E(t,y),_.x=E(r,_),_.X=E(n,_),_.c=E(t,_),{format:function(e){var t=E(e+="",y)
+return t.toString=function(){return e},t},parse:function(e){var t=x(e+="",!1)
+return t.toString=function(){return e},t},utcFormat:function(e){var t=E(e+="",_)
+return t.toString=function(){return e},t},utcParse:function(e){var t=x(e+="",!0)
+return t.toString=function(){return e},t}}}({dateTime:"%x, %X",date:"%-m/%-d/%Y",time:"%-I:%M:%S %p",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]}),pt=ft.format,ft.parse,mt=ft.utcFormat,ft.utcParse
+var Lr=Pe((function(e){e.setUTCDate(1),e.setUTCHours(0,0,0,0)}),(function(e,t){e.setUTCMonth(e.getUTCMonth()+t)}),(function(e,t){return t.getUTCMonth()-e.getUTCMonth()+12*(t.getUTCFullYear()-e.getUTCFullYear())}),(function(e){return e.getUTCMonth()})),Fr=Lr,zr=(Lr.range,Pe((function(e){e.setUTCMinutes(0,0,0)}),(function(e,t){e.setTime(+e+36e5*t)}),(function(e,t){return(t-e)/36e5}),(function(e){return e.getUTCHours()}))),Ur=zr,Hr=(zr.range,Pe((function(e){e.setUTCSeconds(0,0)}),(function(e,t){e.setTime(+e+6e4*t)}),(function(e,t){return(t-e)/6e4}),(function(e){return e.getUTCMinutes()}))),Br=Hr
+function Vr(){return i.apply(Nr(ut,Fr,Ze,st,Ur,Br,Ke,Qe,mt).domain([Date.UTC(2e3,0,1),Date.UTC(2e3,0,2)]),arguments)}function $r(){var e,t,r,n,i,o=0,a=1,s=A,l=!1
+function u(t){return isNaN(t=+t)?i:s(0===r?.5:(t=(n(t)-e)*r,l?Math.max(0,Math.min(1,t)):t))}function c(e){return function(t){var r,n
+return arguments.length?([r,n]=t,s=e(r,n),u):[s(0),s(1)]}}return u.domain=function(i){return arguments.length?([o,a]=i,e=n(o=+o),t=n(a=+a),r=e===t?0:1/(t-e),u):[o,a]},u.clamp=function(e){return arguments.length?(l=!!e,u):l},u.interpolator=function(e){return arguments.length?(s=e,u):s},u.range=c(O),u.rangeRound=c(S),u.unknown=function(e){return arguments.length?(i=e,u):i},function(i){return n=i,e=i(o),t=i(a),r=e===t?0:1/(t-e),u}}function qr(e,t){return t.domain(e.domain()).interpolator(e.interpolator()).clamp(e.clamp()).unknown(e.unknown())}function Wr(){var e=J($r()(A))
+return e.copy=function(){return qr(e,Wr())},o.apply(e,arguments)}function Gr(){var e=ae($r()).domain([1,10])
+return e.copy=function(){return qr(e,Gr()).base(e.base())},o.apply(e,arguments)}function Yr(){var e=ce($r())
+return e.copy=function(){return qr(e,Yr()).constant(e.constant())},o.apply(e,arguments)}function Kr(){var e=me($r())
+return e.copy=function(){return qr(e,Kr()).exponent(e.exponent())},o.apply(e,arguments)}function Jr(){return Kr.apply(null,arguments).exponent(.5)}function Qr(){var e=[],t=A
+function r(r){if(!isNaN(r=+r))return t((Object(h.d)(e,r,1)-1)/(e.length-1))}return r.domain=function(t){if(!arguments.length)return e.slice()
+e=[]
+for(let r of t)null==r||isNaN(r=+r)||e.push(r)
+return e.sort(Ee.a),r},r.interpolator=function(e){return arguments.length?(t=e,r):t},r.range=function(){return e.map((r,n)=>t(n/(e.length-1)))},r.quantiles=function(t){return Array.from({length:t+1},(r,n)=>Object(we.a)(e,n/t))},r.copy=function(){return Qr(t).domain(e)},o.apply(r,arguments)}function Xr(e,t){void 0===t&&(t=e,e=O)
+for(var r=0,n=t.length-1,i=t[0],o=new Array(n<0?0:n);r<n;)o[r]=e(i,i=t[++r])
+return function(e){var t=Math.max(0,Math.min(n-1,Math.floor(e*=n)))
+return o[t](e-t)}}function Zr(){var e,t,r,n,i,o,a,s=0,l=.5,u=1,c=1,d=A,h=!1
+function f(e){return isNaN(e=+e)?a:(e=.5+((e=+o(e))-t)*(c*e<c*t?n:i),d(h?Math.max(0,Math.min(1,e)):e))}function p(e){return function(t){var r,n,i
+return arguments.length?([r,n,i]=t,d=Xr(e,[r,n,i]),f):[d(0),d(.5),d(1)]}}return f.domain=function(a){return arguments.length?([s,l,u]=a,e=o(s=+s),t=o(l=+l),r=o(u=+u),n=e===t?0:.5/(t-e),i=t===r?0:.5/(r-t),c=t<e?-1:1,f):[s,l,u]},f.clamp=function(e){return arguments.length?(h=!!e,f):h},f.interpolator=function(e){return arguments.length?(d=e,f):d},f.range=p(O),f.rangeRound=p(S),f.unknown=function(e){return arguments.length?(a=e,f):a},function(a){return o=a,e=a(s),t=a(l),r=a(u),n=e===t?0:.5/(t-e),i=t===r?0:.5/(r-t),c=t<e?-1:1,f}}function en(){var e=J(Zr()(A))
+return e.copy=function(){return qr(e,en())},o.apply(e,arguments)}function tn(){var e=ae(Zr()).domain([.1,1,10])
+return e.copy=function(){return qr(e,tn()).base(e.base())},o.apply(e,arguments)}function rn(){var e=ce(Zr())
+return e.copy=function(){return qr(e,rn()).constant(e.constant())},o.apply(e,arguments)}function nn(){var e=me(Zr())
+return e.copy=function(){return qr(e,nn()).exponent(e.exponent())},o.apply(e,arguments)}function on(){return nn.apply(null,arguments).exponent(.5)}Hr.range},function(e,t,r){"use strict"
+r.r(t),r.d(t,"arc",(function(){return P})),r.d(t,"area",(function(){return L})),r.d(t,"line",(function(){return I})),r.d(t,"pie",(function(){return U})),r.d(t,"areaRadial",(function(){return W})),r.d(t,"radialArea",(function(){return W})),r.d(t,"lineRadial",(function(){return q})),r.d(t,"radialLine",(function(){return q})),r.d(t,"pointRadial",(function(){return G})),r.d(t,"linkHorizontal",(function(){return ee})),r.d(t,"linkVertical",(function(){return te})),r.d(t,"linkRadial",(function(){return re})),r.d(t,"symbol",(function(){return _e})),r.d(t,"symbols",(function(){return ye})),r.d(t,"symbolCircle",(function(){return ne})),r.d(t,"symbolCross",(function(){return ie})),r.d(t,"symbolDiamond",(function(){return se})),r.d(t,"symbolSquare",(function(){return he})),r.d(t,"symbolStar",(function(){return de})),r.d(t,"symbolTriangle",(function(){return pe})),r.d(t,"symbolWye",(function(){return be})),r.d(t,"curveBasisClosed",(function(){return Te})),r.d(t,"curveBasisOpen",(function(){return Ae})),r.d(t,"curveBasis",(function(){return Oe})),r.d(t,"curveBumpX",(function(){return Ce})),r.d(t,"curveBumpY",(function(){return ke})),r.d(t,"curveBundle",(function(){return je})),r.d(t,"curveCardinalClosed",(function(){return Fe})),r.d(t,"curveCardinalOpen",(function(){return Ue})),r.d(t,"curveCardinal",(function(){return Ie})),r.d(t,"curveCatmullRomClosed",(function(){return qe})),r.d(t,"curveCatmullRomOpen",(function(){return Ge})),r.d(t,"curveCatmullRom",(function(){return Ve})),r.d(t,"curveLinearClosed",(function(){return Ke})),r.d(t,"curveLinear",(function(){return j})),r.d(t,"curveMonotoneX",(function(){return nt})),r.d(t,"curveMonotoneY",(function(){return it})),r.d(t,"curveNatural",(function(){return st})),r.d(t,"curveStep",(function(){return ut})),r.d(t,"curveStepAfter",(function(){return dt})),r.d(t,"curveStepBefore",(function(){return ct})),r.d(t,"stack",(function(){return vt})),r.d(t,"stackOffsetExpand",(function(){return gt})),r.d(t,"stackOffsetDiverging",(function(){return bt})),r.d(t,"stackOffsetNone",(function(){return ht})),r.d(t,"stackOffsetSilhouette",(function(){return yt})),r.d(t,"stackOffsetWiggle",(function(){return _t})),r.d(t,"stackOrderAppearance",(function(){return wt})),r.d(t,"stackOrderAscending",(function(){return xt})),r.d(t,"stackOrderDescending",(function(){return St})),r.d(t,"stackOrderInsideOut",(function(){return Tt})),r.d(t,"stackOrderNone",(function(){return ft})),r.d(t,"stackOrderReverse",(function(){return Mt}))
+const n=Math.PI,i=2*n,o=i-1e-6
+function a(){this._x0=this._y0=this._x1=this._y1=null,this._=""}function s(){return new a}a.prototype=s.prototype={constructor:a,moveTo:function(e,t){this._+="M"+(this._x0=this._x1=+e)+","+(this._y0=this._y1=+t)},closePath:function(){null!==this._x1&&(this._x1=this._x0,this._y1=this._y0,this._+="Z")},lineTo:function(e,t){this._+="L"+(this._x1=+e)+","+(this._y1=+t)},quadraticCurveTo:function(e,t,r,n){this._+="Q"+ +e+","+ +t+","+(this._x1=+r)+","+(this._y1=+n)},bezierCurveTo:function(e,t,r,n,i,o){this._+="C"+ +e+","+ +t+","+ +r+","+ +n+","+(this._x1=+i)+","+(this._y1=+o)},arcTo:function(e,t,r,i,o){e=+e,t=+t,r=+r,i=+i,o=+o
+var a=this._x1,s=this._y1,l=r-e,u=i-t,c=a-e,d=s-t,h=c*c+d*d
+if(o<0)throw new Error("negative radius: "+o)
+if(null===this._x1)this._+="M"+(this._x1=e)+","+(this._y1=t)
+else if(h>1e-6)if(Math.abs(d*l-u*c)>1e-6&&o){var f=r-a,p=i-s,m=l*l+u*u,v=f*f+p*p,g=Math.sqrt(m),b=Math.sqrt(h),y=o*Math.tan((n-Math.acos((m+h-v)/(2*g*b)))/2),_=y/b,w=y/g
+Math.abs(_-1)>1e-6&&(this._+="L"+(e+_*c)+","+(t+_*d)),this._+="A"+o+","+o+",0,0,"+ +(d*f>c*p)+","+(this._x1=e+w*l)+","+(this._y1=t+w*u)}else this._+="L"+(this._x1=e)+","+(this._y1=t)},arc:function(e,t,r,a,s,l){e=+e,t=+t,l=!!l
+var u=(r=+r)*Math.cos(a),c=r*Math.sin(a),d=e+u,h=t+c,f=1^l,p=l?a-s:s-a
+if(r<0)throw new Error("negative radius: "+r)
+null===this._x1?this._+="M"+d+","+h:(Math.abs(this._x1-d)>1e-6||Math.abs(this._y1-h)>1e-6)&&(this._+="L"+d+","+h),r&&(p<0&&(p=p%i+i),p>o?this._+="A"+r+","+r+",0,1,"+f+","+(e-u)+","+(t-c)+"A"+r+","+r+",0,1,"+f+","+(this._x1=d)+","+(this._y1=h):p>1e-6&&(this._+="A"+r+","+r+",0,"+ +(p>=n)+","+f+","+(this._x1=e+r*Math.cos(s))+","+(this._y1=t+r*Math.sin(s))))},rect:function(e,t,r,n){this._+="M"+(this._x0=this._x1=+e)+","+(this._y0=this._y1=+t)+"h"+ +r+"v"+ +n+"h"+-r+"Z"},toString:function(){return this._}}
+var l=s,u=function(e){return function(){return e}},c=Math.abs,d=Math.atan2,h=Math.cos,f=Math.max,p=Math.min,m=Math.sin,v=Math.sqrt,g=Math.PI,b=g/2,y=2*g
+function _(e){return e>1?0:e<-1?g:Math.acos(e)}function w(e){return e>=1?b:e<=-1?-b:Math.asin(e)}function E(e){return e.innerRadius}function x(e){return e.outerRadius}function O(e){return e.startAngle}function S(e){return e.endAngle}function T(e){return e&&e.padAngle}function M(e,t,r,n,i,o,a,s){var l=r-e,u=n-t,c=a-i,d=s-o,h=d*l-c*u
+if(!(h*h<1e-12))return[e+(h=(c*(t-o)-d*(e-i))/h)*l,t+h*u]}function A(e,t,r,n,i,o,a){var s=e-r,l=t-n,u=(a?o:-o)/v(s*s+l*l),c=u*l,d=-u*s,h=e+c,p=t+d,m=r+c,g=n+d,b=(h+m)/2,y=(p+g)/2,_=m-h,w=g-p,E=_*_+w*w,x=i-o,O=h*g-m*p,S=(w<0?-1:1)*v(f(0,x*x*E-O*O)),T=(O*w-_*S)/E,M=(-O*_-w*S)/E,A=(O*w+_*S)/E,P=(-O*_+w*S)/E,C=T-b,k=M-y,R=A-b,j=P-y
+return C*C+k*k>R*R+j*j&&(T=A,M=P),{cx:T,cy:M,x01:-c,y01:-d,x11:T*(i/x-1),y11:M*(i/x-1)}}var P=function(){var e=E,t=x,r=u(0),n=null,i=O,o=S,a=T,s=null
+function f(){var u,f,E=+e.apply(this,arguments),x=+t.apply(this,arguments),O=i.apply(this,arguments)-b,S=o.apply(this,arguments)-b,T=c(S-O),P=S>O
+if(s||(s=u=l()),x<E&&(f=x,x=E,E=f),x>1e-12)if(T>y-1e-12)s.moveTo(x*h(O),x*m(O)),s.arc(0,0,x,O,S,!P),E>1e-12&&(s.moveTo(E*h(S),E*m(S)),s.arc(0,0,E,S,O,P))
+else{var C,k,R=O,j=S,D=O,N=S,I=T,L=T,F=a.apply(this,arguments)/2,z=F>1e-12&&(n?+n.apply(this,arguments):v(E*E+x*x)),U=p(c(x-E)/2,+r.apply(this,arguments)),H=U,B=U
+if(z>1e-12){var V=w(z/E*m(F)),$=w(z/x*m(F));(I-=2*V)>1e-12?(D+=V*=P?1:-1,N-=V):(I=0,D=N=(O+S)/2),(L-=2*$)>1e-12?(R+=$*=P?1:-1,j-=$):(L=0,R=j=(O+S)/2)}var q=x*h(R),W=x*m(R),G=E*h(N),Y=E*m(N)
+if(U>1e-12){var K,J=x*h(j),Q=x*m(j),X=E*h(D),Z=E*m(D)
+if(T<g&&(K=M(q,W,X,Z,J,Q,G,Y))){var ee=q-K[0],te=W-K[1],re=J-K[0],ne=Q-K[1],ie=1/m(_((ee*re+te*ne)/(v(ee*ee+te*te)*v(re*re+ne*ne)))/2),oe=v(K[0]*K[0]+K[1]*K[1])
+H=p(U,(E-oe)/(ie-1)),B=p(U,(x-oe)/(ie+1))}}L>1e-12?B>1e-12?(C=A(X,Z,q,W,x,B,P),k=A(J,Q,G,Y,x,B,P),s.moveTo(C.cx+C.x01,C.cy+C.y01),B<U?s.arc(C.cx,C.cy,B,d(C.y01,C.x01),d(k.y01,k.x01),!P):(s.arc(C.cx,C.cy,B,d(C.y01,C.x01),d(C.y11,C.x11),!P),s.arc(0,0,x,d(C.cy+C.y11,C.cx+C.x11),d(k.cy+k.y11,k.cx+k.x11),!P),s.arc(k.cx,k.cy,B,d(k.y11,k.x11),d(k.y01,k.x01),!P))):(s.moveTo(q,W),s.arc(0,0,x,R,j,!P)):s.moveTo(q,W),E>1e-12&&I>1e-12?H>1e-12?(C=A(G,Y,J,Q,E,-H,P),k=A(q,W,X,Z,E,-H,P),s.lineTo(C.cx+C.x01,C.cy+C.y01),H<U?s.arc(C.cx,C.cy,H,d(C.y01,C.x01),d(k.y01,k.x01),!P):(s.arc(C.cx,C.cy,H,d(C.y01,C.x01),d(C.y11,C.x11),!P),s.arc(0,0,E,d(C.cy+C.y11,C.cx+C.x11),d(k.cy+k.y11,k.cx+k.x11),P),s.arc(k.cx,k.cy,H,d(k.y11,k.x11),d(k.y01,k.x01),!P))):s.arc(0,0,E,N,D,P):s.lineTo(G,Y)}else s.moveTo(0,0)
+if(s.closePath(),u)return s=null,u+""||null}return f.centroid=function(){var r=(+e.apply(this,arguments)+ +t.apply(this,arguments))/2,n=(+i.apply(this,arguments)+ +o.apply(this,arguments))/2-g/2
+return[h(n)*r,m(n)*r]},f.innerRadius=function(t){return arguments.length?(e="function"==typeof t?t:u(+t),f):e},f.outerRadius=function(e){return arguments.length?(t="function"==typeof e?e:u(+e),f):t},f.cornerRadius=function(e){return arguments.length?(r="function"==typeof e?e:u(+e),f):r},f.padRadius=function(e){return arguments.length?(n=null==e?null:"function"==typeof e?e:u(+e),f):n},f.startAngle=function(e){return arguments.length?(i="function"==typeof e?e:u(+e),f):i},f.endAngle=function(e){return arguments.length?(o="function"==typeof e?e:u(+e),f):o},f.padAngle=function(e){return arguments.length?(a="function"==typeof e?e:u(+e),f):a},f.context=function(e){return arguments.length?(s=null==e?null:e,f):s},f},C=Array.prototype.slice,k=function(e){return"object"==typeof e&&"length"in e?e:Array.from(e)}
+function R(e){this._context=e}R.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._point=0},lineEnd:function(){(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(e,t){switch(e=+e,t=+t,this._point){case 0:this._point=1,this._line?this._context.lineTo(e,t):this._context.moveTo(e,t)
+break
+case 1:this._point=2
+default:this._context.lineTo(e,t)}}}
+var j=function(e){return new R(e)}
+function D(e){return e[0]}function N(e){return e[1]}var I=function(e,t){var r=u(!0),n=null,i=j,o=null
+function a(a){var s,u,c,d=(a=k(a)).length,h=!1
+for(null==n&&(o=i(c=l())),s=0;s<=d;++s)!(s<d&&r(u=a[s],s,a))===h&&((h=!h)?o.lineStart():o.lineEnd()),h&&o.point(+e(u,s,a),+t(u,s,a))
+if(c)return o=null,c+""||null}return e="function"==typeof e?e:void 0===e?D:u(e),t="function"==typeof t?t:void 0===t?N:u(t),a.x=function(t){return arguments.length?(e="function"==typeof t?t:u(+t),a):e},a.y=function(e){return arguments.length?(t="function"==typeof e?e:u(+e),a):t},a.defined=function(e){return arguments.length?(r="function"==typeof e?e:u(!!e),a):r},a.curve=function(e){return arguments.length?(i=e,null!=n&&(o=i(n)),a):i},a.context=function(e){return arguments.length?(null==e?n=o=null:o=i(n=e),a):n},a},L=function(e,t,r){var n=null,i=u(!0),o=null,a=j,s=null
+function c(u){var c,d,h,f,p,m=(u=k(u)).length,v=!1,g=new Array(m),b=new Array(m)
+for(null==o&&(s=a(p=l())),c=0;c<=m;++c){if(!(c<m&&i(f=u[c],c,u))===v)if(v=!v)d=c,s.areaStart(),s.lineStart()
+else{for(s.lineEnd(),s.lineStart(),h=c-1;h>=d;--h)s.point(g[h],b[h])
+s.lineEnd(),s.areaEnd()}v&&(g[c]=+e(f,c,u),b[c]=+t(f,c,u),s.point(n?+n(f,c,u):g[c],r?+r(f,c,u):b[c]))}if(p)return s=null,p+""||null}function d(){return I().defined(i).curve(a).context(o)}return e="function"==typeof e?e:void 0===e?D:u(+e),t="function"==typeof t?t:u(void 0===t?0:+t),r="function"==typeof r?r:void 0===r?N:u(+r),c.x=function(t){return arguments.length?(e="function"==typeof t?t:u(+t),n=null,c):e},c.x0=function(t){return arguments.length?(e="function"==typeof t?t:u(+t),c):e},c.x1=function(e){return arguments.length?(n=null==e?null:"function"==typeof e?e:u(+e),c):n},c.y=function(e){return arguments.length?(t="function"==typeof e?e:u(+e),r=null,c):t},c.y0=function(e){return arguments.length?(t="function"==typeof e?e:u(+e),c):t},c.y1=function(e){return arguments.length?(r=null==e?null:"function"==typeof e?e:u(+e),c):r},c.lineX0=c.lineY0=function(){return d().x(e).y(t)},c.lineY1=function(){return d().x(e).y(r)},c.lineX1=function(){return d().x(n).y(t)},c.defined=function(e){return arguments.length?(i="function"==typeof e?e:u(!!e),c):i},c.curve=function(e){return arguments.length?(a=e,null!=o&&(s=a(o)),c):a},c.context=function(e){return arguments.length?(null==e?o=s=null:s=a(o=e),c):o},c},F=function(e,t){return t<e?-1:t>e?1:t>=e?0:NaN},z=function(e){return e},U=function(){var e=z,t=F,r=null,n=u(0),i=u(y),o=u(0)
+function a(a){var s,l,u,c,d,h=(a=k(a)).length,f=0,p=new Array(h),m=new Array(h),v=+n.apply(this,arguments),g=Math.min(y,Math.max(-y,i.apply(this,arguments)-v)),b=Math.min(Math.abs(g)/h,o.apply(this,arguments)),_=b*(g<0?-1:1)
+for(s=0;s<h;++s)(d=m[p[s]=s]=+e(a[s],s,a))>0&&(f+=d)
+for(null!=t?p.sort((function(e,r){return t(m[e],m[r])})):null!=r&&p.sort((function(e,t){return r(a[e],a[t])})),s=0,u=f?(g-h*_)/f:0;s<h;++s,v=c)l=p[s],c=v+((d=m[l])>0?d*u:0)+_,m[l]={data:a[l],index:s,value:d,startAngle:v,endAngle:c,padAngle:b}
+return m}return a.value=function(t){return arguments.length?(e="function"==typeof t?t:u(+t),a):e},a.sortValues=function(e){return arguments.length?(t=e,r=null,a):t},a.sort=function(e){return arguments.length?(r=e,t=null,a):r},a.startAngle=function(e){return arguments.length?(n="function"==typeof e?e:u(+e),a):n},a.endAngle=function(e){return arguments.length?(i="function"==typeof e?e:u(+e),a):i},a.padAngle=function(e){return arguments.length?(o="function"==typeof e?e:u(+e),a):o},a},H=V(j)
+function B(e){this._curve=e}function V(e){function t(t){return new B(e(t))}return t._curve=e,t}function $(e){var t=e.curve
+return e.angle=e.x,delete e.x,e.radius=e.y,delete e.y,e.curve=function(e){return arguments.length?t(V(e)):t()._curve},e}B.prototype={areaStart:function(){this._curve.areaStart()},areaEnd:function(){this._curve.areaEnd()},lineStart:function(){this._curve.lineStart()},lineEnd:function(){this._curve.lineEnd()},point:function(e,t){this._curve.point(t*Math.sin(e),t*-Math.cos(e))}}
+var q=function(){return $(I().curve(H))},W=function(){var e=L().curve(H),t=e.curve,r=e.lineX0,n=e.lineX1,i=e.lineY0,o=e.lineY1
+return e.angle=e.x,delete e.x,e.startAngle=e.x0,delete e.x0,e.endAngle=e.x1,delete e.x1,e.radius=e.y,delete e.y,e.innerRadius=e.y0,delete e.y0,e.outerRadius=e.y1,delete e.y1,e.lineStartAngle=function(){return $(r())},delete e.lineX0,e.lineEndAngle=function(){return $(n())},delete e.lineX1,e.lineInnerRadius=function(){return $(i())},delete e.lineY0,e.lineOuterRadius=function(){return $(o())},delete e.lineY1,e.curve=function(e){return arguments.length?t(V(e)):t()._curve},e},G=function(e,t){return[(t=+t)*Math.cos(e-=Math.PI/2),t*Math.sin(e)]}
+function Y(e){return e.source}function K(e){return e.target}function J(e){var t=Y,r=K,n=D,i=N,o=null
+function a(){var a,s=C.call(arguments),u=t.apply(this,s),c=r.apply(this,s)
+if(o||(o=a=l()),e(o,+n.apply(this,(s[0]=u,s)),+i.apply(this,s),+n.apply(this,(s[0]=c,s)),+i.apply(this,s)),a)return o=null,a+""||null}return a.source=function(e){return arguments.length?(t=e,a):t},a.target=function(e){return arguments.length?(r=e,a):r},a.x=function(e){return arguments.length?(n="function"==typeof e?e:u(+e),a):n},a.y=function(e){return arguments.length?(i="function"==typeof e?e:u(+e),a):i},a.context=function(e){return arguments.length?(o=null==e?null:e,a):o},a}function Q(e,t,r,n,i){e.moveTo(t,r),e.bezierCurveTo(t=(t+n)/2,r,t,i,n,i)}function X(e,t,r,n,i){e.moveTo(t,r),e.bezierCurveTo(t,r=(r+i)/2,n,r,n,i)}function Z(e,t,r,n,i){var o=G(t,r),a=G(t,r=(r+i)/2),s=G(n,r),l=G(n,i)
+e.moveTo(o[0],o[1]),e.bezierCurveTo(a[0],a[1],s[0],s[1],l[0],l[1])}function ee(){return J(Q)}function te(){return J(X)}function re(){var e=J(Z)
+return e.angle=e.x,delete e.x,e.radius=e.y,delete e.y,e}var ne={draw:function(e,t){var r=Math.sqrt(t/g)
+e.moveTo(r,0),e.arc(0,0,r,0,y)}},ie={draw:function(e,t){var r=Math.sqrt(t/5)/2
+e.moveTo(-3*r,-r),e.lineTo(-r,-r),e.lineTo(-r,-3*r),e.lineTo(r,-3*r),e.lineTo(r,-r),e.lineTo(3*r,-r),e.lineTo(3*r,r),e.lineTo(r,r),e.lineTo(r,3*r),e.lineTo(-r,3*r),e.lineTo(-r,r),e.lineTo(-3*r,r),e.closePath()}},oe=Math.sqrt(1/3),ae=2*oe,se={draw:function(e,t){var r=Math.sqrt(t/ae),n=r*oe
+e.moveTo(0,-r),e.lineTo(n,0),e.lineTo(0,r),e.lineTo(-n,0),e.closePath()}},le=Math.sin(g/10)/Math.sin(7*g/10),ue=Math.sin(y/10)*le,ce=-Math.cos(y/10)*le,de={draw:function(e,t){var r=Math.sqrt(.8908130915292852*t),n=ue*r,i=ce*r
+e.moveTo(0,-r),e.lineTo(n,i)
+for(var o=1;o<5;++o){var a=y*o/5,s=Math.cos(a),l=Math.sin(a)
+e.lineTo(l*r,-s*r),e.lineTo(s*n-l*i,l*n+s*i)}e.closePath()}},he={draw:function(e,t){var r=Math.sqrt(t),n=-r/2
+e.rect(n,n,r,r)}},fe=Math.sqrt(3),pe={draw:function(e,t){var r=-Math.sqrt(t/(3*fe))
+e.moveTo(0,2*r),e.lineTo(-fe*r,-r),e.lineTo(fe*r,-r),e.closePath()}},me=Math.sqrt(3)/2,ve=1/Math.sqrt(12),ge=3*(ve/2+1),be={draw:function(e,t){var r=Math.sqrt(t/ge),n=r/2,i=r*ve,o=n,a=r*ve+r,s=-o,l=a
+e.moveTo(n,i),e.lineTo(o,a),e.lineTo(s,l),e.lineTo(-.5*n-me*i,me*n+-.5*i),e.lineTo(-.5*o-me*a,me*o+-.5*a),e.lineTo(-.5*s-me*l,me*s+-.5*l),e.lineTo(-.5*n+me*i,-.5*i-me*n),e.lineTo(-.5*o+me*a,-.5*a-me*o),e.lineTo(-.5*s+me*l,-.5*l-me*s),e.closePath()}},ye=[ne,ie,se,he,de,pe,be],_e=function(e,t){var r=null
+function n(){var n
+if(r||(r=n=l()),e.apply(this,arguments).draw(r,+t.apply(this,arguments)),n)return r=null,n+""||null}return e="function"==typeof e?e:u(e||ne),t="function"==typeof t?t:u(void 0===t?64:+t),n.type=function(t){return arguments.length?(e="function"==typeof t?t:u(t),n):e},n.size=function(e){return arguments.length?(t="function"==typeof e?e:u(+e),n):t},n.context=function(e){return arguments.length?(r=null==e?null:e,n):r},n},we=function(){}
+function Ee(e,t,r){e._context.bezierCurveTo((2*e._x0+e._x1)/3,(2*e._y0+e._y1)/3,(e._x0+2*e._x1)/3,(e._y0+2*e._y1)/3,(e._x0+4*e._x1+t)/6,(e._y0+4*e._y1+r)/6)}function xe(e){this._context=e}xe.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=NaN,this._point=0},lineEnd:function(){switch(this._point){case 3:Ee(this,this._x1,this._y1)
+case 2:this._context.lineTo(this._x1,this._y1)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(e,t){switch(e=+e,t=+t,this._point){case 0:this._point=1,this._line?this._context.lineTo(e,t):this._context.moveTo(e,t)
+break
+case 1:this._point=2
+break
+case 2:this._point=3,this._context.lineTo((5*this._x0+this._x1)/6,(5*this._y0+this._y1)/6)
+default:Ee(this,e,t)}this._x0=this._x1,this._x1=e,this._y0=this._y1,this._y1=t}}
+var Oe=function(e){return new xe(e)}
+function Se(e){this._context=e}Se.prototype={areaStart:we,areaEnd:we,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._y0=this._y1=this._y2=this._y3=this._y4=NaN,this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x2,this._y2),this._context.closePath()
+break
+case 2:this._context.moveTo((this._x2+2*this._x3)/3,(this._y2+2*this._y3)/3),this._context.lineTo((this._x3+2*this._x2)/3,(this._y3+2*this._y2)/3),this._context.closePath()
+break
+case 3:this.point(this._x2,this._y2),this.point(this._x3,this._y3),this.point(this._x4,this._y4)}},point:function(e,t){switch(e=+e,t=+t,this._point){case 0:this._point=1,this._x2=e,this._y2=t
+break
+case 1:this._point=2,this._x3=e,this._y3=t
+break
+case 2:this._point=3,this._x4=e,this._y4=t,this._context.moveTo((this._x0+4*this._x1+e)/6,(this._y0+4*this._y1+t)/6)
+break
+default:Ee(this,e,t)}this._x0=this._x1,this._x1=e,this._y0=this._y1,this._y1=t}}
+var Te=function(e){return new Se(e)}
+function Me(e){this._context=e}Me.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=NaN,this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(e,t){switch(e=+e,t=+t,this._point){case 0:this._point=1
+break
+case 1:this._point=2
+break
+case 2:this._point=3
+var r=(this._x0+4*this._x1+e)/6,n=(this._y0+4*this._y1+t)/6
+this._line?this._context.lineTo(r,n):this._context.moveTo(r,n)
+break
+case 3:this._point=4
+default:Ee(this,e,t)}this._x0=this._x1,this._x1=e,this._y0=this._y1,this._y1=t}}
+var Ae=function(e){return new Me(e)}
+class Pe{constructor(e,t){this._context=e,this._x=t}areaStart(){this._line=0}areaEnd(){this._line=NaN}lineStart(){this._point=0}lineEnd(){(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line}point(e,t){switch(e=+e,t=+t,this._point){case 0:this._point=1,this._line?this._context.lineTo(e,t):this._context.moveTo(e,t)
+break
+case 1:this._point=2
+default:this._x?this._context.bezierCurveTo(this._x0=(this._x0+e)/2,this._y0,this._x0,t,e,t):this._context.bezierCurveTo(this._x0,this._y0=(this._y0+t)/2,e,this._y0,e,t)}this._x0=e,this._y0=t}}function Ce(e){return new Pe(e,!0)}function ke(e){return new Pe(e,!1)}function Re(e,t){this._basis=new xe(e),this._beta=t}Re.prototype={lineStart:function(){this._x=[],this._y=[],this._basis.lineStart()},lineEnd:function(){var e=this._x,t=this._y,r=e.length-1
+if(r>0)for(var n,i=e[0],o=t[0],a=e[r]-i,s=t[r]-o,l=-1;++l<=r;)n=l/r,this._basis.point(this._beta*e[l]+(1-this._beta)*(i+n*a),this._beta*t[l]+(1-this._beta)*(o+n*s))
+this._x=this._y=null,this._basis.lineEnd()},point:function(e,t){this._x.push(+e),this._y.push(+t)}}
+var je=function e(t){function r(e){return 1===t?new xe(e):new Re(e,t)}return r.beta=function(t){return e(+t)},r}(.85)
+function De(e,t,r){e._context.bezierCurveTo(e._x1+e._k*(e._x2-e._x0),e._y1+e._k*(e._y2-e._y0),e._x2+e._k*(e._x1-t),e._y2+e._k*(e._y1-r),e._x2,e._y2)}function Ne(e,t){this._context=e,this._k=(1-t)/6}Ne.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x2,this._y2)
+break
+case 3:De(this,this._x1,this._y1)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(e,t){switch(e=+e,t=+t,this._point){case 0:this._point=1,this._line?this._context.lineTo(e,t):this._context.moveTo(e,t)
+break
+case 1:this._point=2,this._x1=e,this._y1=t
+break
+case 2:this._point=3
+default:De(this,e,t)}this._x0=this._x1,this._x1=this._x2,this._x2=e,this._y0=this._y1,this._y1=this._y2,this._y2=t}}
+var Ie=function e(t){function r(e){return new Ne(e,t)}return r.tension=function(t){return e(+t)},r}(0)
+function Le(e,t){this._context=e,this._k=(1-t)/6}Le.prototype={areaStart:we,areaEnd:we,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN,this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x3,this._y3),this._context.closePath()
+break
+case 2:this._context.lineTo(this._x3,this._y3),this._context.closePath()
+break
+case 3:this.point(this._x3,this._y3),this.point(this._x4,this._y4),this.point(this._x5,this._y5)}},point:function(e,t){switch(e=+e,t=+t,this._point){case 0:this._point=1,this._x3=e,this._y3=t
+break
+case 1:this._point=2,this._context.moveTo(this._x4=e,this._y4=t)
+break
+case 2:this._point=3,this._x5=e,this._y5=t
+break
+default:De(this,e,t)}this._x0=this._x1,this._x1=this._x2,this._x2=e,this._y0=this._y1,this._y1=this._y2,this._y2=t}}
+var Fe=function e(t){function r(e){return new Le(e,t)}return r.tension=function(t){return e(+t)},r}(0)
+function ze(e,t){this._context=e,this._k=(1-t)/6}ze.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(e,t){switch(e=+e,t=+t,this._point){case 0:this._point=1
+break
+case 1:this._point=2
+break
+case 2:this._point=3,this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2)
+break
+case 3:this._point=4
+default:De(this,e,t)}this._x0=this._x1,this._x1=this._x2,this._x2=e,this._y0=this._y1,this._y1=this._y2,this._y2=t}}
+var Ue=function e(t){function r(e){return new ze(e,t)}return r.tension=function(t){return e(+t)},r}(0)
+function He(e,t,r){var n=e._x1,i=e._y1,o=e._x2,a=e._y2
+if(e._l01_a>1e-12){var s=2*e._l01_2a+3*e._l01_a*e._l12_a+e._l12_2a,l=3*e._l01_a*(e._l01_a+e._l12_a)
+n=(n*s-e._x0*e._l12_2a+e._x2*e._l01_2a)/l,i=(i*s-e._y0*e._l12_2a+e._y2*e._l01_2a)/l}if(e._l23_a>1e-12){var u=2*e._l23_2a+3*e._l23_a*e._l12_a+e._l12_2a,c=3*e._l23_a*(e._l23_a+e._l12_a)
+o=(o*u+e._x1*e._l23_2a-t*e._l12_2a)/c,a=(a*u+e._y1*e._l23_2a-r*e._l12_2a)/c}e._context.bezierCurveTo(n,i,o,a,e._x2,e._y2)}function Be(e,t){this._context=e,this._alpha=t}Be.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x2,this._y2)
+break
+case 3:this.point(this._x2,this._y2)}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(e,t){if(e=+e,t=+t,this._point){var r=this._x2-e,n=this._y2-t
+this._l23_a=Math.sqrt(this._l23_2a=Math.pow(r*r+n*n,this._alpha))}switch(this._point){case 0:this._point=1,this._line?this._context.lineTo(e,t):this._context.moveTo(e,t)
+break
+case 1:this._point=2
+break
+case 2:this._point=3
+default:He(this,e,t)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=e,this._y0=this._y1,this._y1=this._y2,this._y2=t}}
+var Ve=function e(t){function r(e){return t?new Be(e,t):new Ne(e,0)}return r.alpha=function(t){return e(+t)},r}(.5)
+function $e(e,t){this._context=e,this._alpha=t}$e.prototype={areaStart:we,areaEnd:we,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x3,this._y3),this._context.closePath()
+break
+case 2:this._context.lineTo(this._x3,this._y3),this._context.closePath()
+break
+case 3:this.point(this._x3,this._y3),this.point(this._x4,this._y4),this.point(this._x5,this._y5)}},point:function(e,t){if(e=+e,t=+t,this._point){var r=this._x2-e,n=this._y2-t
+this._l23_a=Math.sqrt(this._l23_2a=Math.pow(r*r+n*n,this._alpha))}switch(this._point){case 0:this._point=1,this._x3=e,this._y3=t
+break
+case 1:this._point=2,this._context.moveTo(this._x4=e,this._y4=t)
+break
+case 2:this._point=3,this._x5=e,this._y5=t
+break
+default:He(this,e,t)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=e,this._y0=this._y1,this._y1=this._y2,this._y2=t}}
+var qe=function e(t){function r(e){return t?new $e(e,t):new Le(e,0)}return r.alpha=function(t){return e(+t)},r}(.5)
+function We(e,t){this._context=e,this._alpha=t}We.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN,this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(e,t){if(e=+e,t=+t,this._point){var r=this._x2-e,n=this._y2-t
+this._l23_a=Math.sqrt(this._l23_2a=Math.pow(r*r+n*n,this._alpha))}switch(this._point){case 0:this._point=1
+break
+case 1:this._point=2
+break
+case 2:this._point=3,this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2)
+break
+case 3:this._point=4
+default:He(this,e,t)}this._l01_a=this._l12_a,this._l12_a=this._l23_a,this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a,this._x0=this._x1,this._x1=this._x2,this._x2=e,this._y0=this._y1,this._y1=this._y2,this._y2=t}}
+var Ge=function e(t){function r(e){return t?new We(e,t):new ze(e,0)}return r.alpha=function(t){return e(+t)},r}(.5)
+function Ye(e){this._context=e}Ye.prototype={areaStart:we,areaEnd:we,lineStart:function(){this._point=0},lineEnd:function(){this._point&&this._context.closePath()},point:function(e,t){e=+e,t=+t,this._point?this._context.lineTo(e,t):(this._point=1,this._context.moveTo(e,t))}}
+var Ke=function(e){return new Ye(e)}
+function Je(e){return e<0?-1:1}function Qe(e,t,r){var n=e._x1-e._x0,i=t-e._x1,o=(e._y1-e._y0)/(n||i<0&&-0),a=(r-e._y1)/(i||n<0&&-0),s=(o*i+a*n)/(n+i)
+return(Je(o)+Je(a))*Math.min(Math.abs(o),Math.abs(a),.5*Math.abs(s))||0}function Xe(e,t){var r=e._x1-e._x0
+return r?(3*(e._y1-e._y0)/r-t)/2:t}function Ze(e,t,r){var n=e._x0,i=e._y0,o=e._x1,a=e._y1,s=(o-n)/3
+e._context.bezierCurveTo(n+s,i+s*t,o-s,a-s*r,o,a)}function et(e){this._context=e}function tt(e){this._context=new rt(e)}function rt(e){this._context=e}function nt(e){return new et(e)}function it(e){return new tt(e)}function ot(e){this._context=e}function at(e){var t,r,n=e.length-1,i=new Array(n),o=new Array(n),a=new Array(n)
+for(i[0]=0,o[0]=2,a[0]=e[0]+2*e[1],t=1;t<n-1;++t)i[t]=1,o[t]=4,a[t]=4*e[t]+2*e[t+1]
+for(i[n-1]=2,o[n-1]=7,a[n-1]=8*e[n-1]+e[n],t=1;t<n;++t)r=i[t]/o[t-1],o[t]-=r,a[t]-=r*a[t-1]
+for(i[n-1]=a[n-1]/o[n-1],t=n-2;t>=0;--t)i[t]=(a[t]-i[t+1])/o[t]
+for(o[n-1]=(e[n]+i[n-1])/2,t=0;t<n-1;++t)o[t]=2*e[t+1]-i[t+1]
+return[i,o]}et.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=this._t0=NaN,this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x1,this._y1)
+break
+case 3:Ze(this,this._t0,Xe(this,this._t0))}(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line=1-this._line},point:function(e,t){var r=NaN
+if(t=+t,(e=+e)!==this._x1||t!==this._y1){switch(this._point){case 0:this._point=1,this._line?this._context.lineTo(e,t):this._context.moveTo(e,t)
+break
+case 1:this._point=2
+break
+case 2:this._point=3,Ze(this,Xe(this,r=Qe(this,e,t)),r)
+break
+default:Ze(this,this._t0,r=Qe(this,e,t))}this._x0=this._x1,this._x1=e,this._y0=this._y1,this._y1=t,this._t0=r}}},(tt.prototype=Object.create(et.prototype)).point=function(e,t){et.prototype.point.call(this,t,e)},rt.prototype={moveTo:function(e,t){this._context.moveTo(t,e)},closePath:function(){this._context.closePath()},lineTo:function(e,t){this._context.lineTo(t,e)},bezierCurveTo:function(e,t,r,n,i,o){this._context.bezierCurveTo(t,e,n,r,o,i)}},ot.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x=[],this._y=[]},lineEnd:function(){var e=this._x,t=this._y,r=e.length
+if(r)if(this._line?this._context.lineTo(e[0],t[0]):this._context.moveTo(e[0],t[0]),2===r)this._context.lineTo(e[1],t[1])
+else for(var n=at(e),i=at(t),o=0,a=1;a<r;++o,++a)this._context.bezierCurveTo(n[0][o],i[0][o],n[1][o],i[1][o],e[a],t[a]);(this._line||0!==this._line&&1===r)&&this._context.closePath(),this._line=1-this._line,this._x=this._y=null},point:function(e,t){this._x.push(+e),this._y.push(+t)}}
+var st=function(e){return new ot(e)}
+function lt(e,t){this._context=e,this._t=t}lt.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x=this._y=NaN,this._point=0},lineEnd:function(){0<this._t&&this._t<1&&2===this._point&&this._context.lineTo(this._x,this._y),(this._line||0!==this._line&&1===this._point)&&this._context.closePath(),this._line>=0&&(this._t=1-this._t,this._line=1-this._line)},point:function(e,t){switch(e=+e,t=+t,this._point){case 0:this._point=1,this._line?this._context.lineTo(e,t):this._context.moveTo(e,t)
+break
+case 1:this._point=2
+default:if(this._t<=0)this._context.lineTo(this._x,t),this._context.lineTo(e,t)
+else{var r=this._x*(1-this._t)+e*this._t
+this._context.lineTo(r,this._y),this._context.lineTo(r,t)}}this._x=e,this._y=t}}
+var ut=function(e){return new lt(e,.5)}
+function ct(e){return new lt(e,0)}function dt(e){return new lt(e,1)}var ht=function(e,t){if((i=e.length)>1)for(var r,n,i,o=1,a=e[t[0]],s=a.length;o<i;++o)for(n=a,a=e[t[o]],r=0;r<s;++r)a[r][1]+=a[r][0]=isNaN(n[r][1])?n[r][0]:n[r][1]},ft=function(e){for(var t=e.length,r=new Array(t);--t>=0;)r[t]=t
+return r}
+function pt(e,t){return e[t]}function mt(e){const t=[]
+return t.key=e,t}var vt=function(){var e=u([]),t=ft,r=ht,n=pt
+function i(i){var o,a,s=Array.from(e.apply(this,arguments),mt),l=s.length,u=-1
+for(const e of i)for(o=0,++u;o<l;++o)(s[o][u]=[0,+n(e,s[o].key,u,i)]).data=e
+for(o=0,a=k(t(s));o<l;++o)s[a[o]].index=o
+return r(s,a),s}return i.keys=function(t){return arguments.length?(e="function"==typeof t?t:u(Array.from(t)),i):e},i.value=function(e){return arguments.length?(n="function"==typeof e?e:u(+e),i):n},i.order=function(e){return arguments.length?(t=null==e?ft:"function"==typeof e?e:u(Array.from(e)),i):t},i.offset=function(e){return arguments.length?(r=null==e?ht:e,i):r},i},gt=function(e,t){if((n=e.length)>0){for(var r,n,i,o=0,a=e[0].length;o<a;++o){for(i=r=0;r<n;++r)i+=e[r][o][1]||0
+if(i)for(r=0;r<n;++r)e[r][o][1]/=i}ht(e,t)}},bt=function(e,t){if((s=e.length)>0)for(var r,n,i,o,a,s,l=0,u=e[t[0]].length;l<u;++l)for(o=a=0,r=0;r<s;++r)(i=(n=e[t[r]][l])[1]-n[0])>0?(n[0]=o,n[1]=o+=i):i<0?(n[1]=a,n[0]=a+=i):(n[0]=0,n[1]=i)},yt=function(e,t){if((r=e.length)>0){for(var r,n=0,i=e[t[0]],o=i.length;n<o;++n){for(var a=0,s=0;a<r;++a)s+=e[a][n][1]||0
+i[n][1]+=i[n][0]=-s/2}ht(e,t)}},_t=function(e,t){if((i=e.length)>0&&(n=(r=e[t[0]]).length)>0){for(var r,n,i,o=0,a=1;a<n;++a){for(var s=0,l=0,u=0;s<i;++s){for(var c=e[t[s]],d=c[a][1]||0,h=(d-(c[a-1][1]||0))/2,f=0;f<s;++f){var p=e[t[f]]
+h+=(p[a][1]||0)-(p[a-1][1]||0)}l+=d,u+=h*d}r[a-1][1]+=r[a-1][0]=o,l&&(o-=u/l)}r[a-1][1]+=r[a-1][0]=o,ht(e,t)}},wt=function(e){var t=e.map(Et)
+return ft(e).sort((function(e,r){return t[e]-t[r]}))}
+function Et(e){for(var t,r=-1,n=0,i=e.length,o=-1/0;++r<i;)(t=+e[r][1])>o&&(o=t,n=r)
+return n}var xt=function(e){var t=e.map(Ot)
+return ft(e).sort((function(e,r){return t[e]-t[r]}))}
+function Ot(e){for(var t,r=0,n=-1,i=e.length;++n<i;)(t=+e[n][1])&&(r+=t)
+return r}var St=function(e){return xt(e).reverse()},Tt=function(e){var t,r,n=e.length,i=e.map(Ot),o=wt(e),a=0,s=0,l=[],u=[]
+for(t=0;t<n;++t)r=o[t],a<s?(a+=i[r],l.push(r)):(s+=i[r],u.push(r))
+return u.reverse().concat(l)},Mt=function(e){return ft(e).reverse()}},function(e,t,r){"use strict"
+r.r(t),r.d(t,"create",(function(){return be})),r.d(t,"creator",(function(){return l})),r.d(t,"local",(function(){return _e})),r.d(t,"matcher",(function(){return p})),r.d(t,"namespace",(function(){return o})),r.d(t,"namespaces",(function(){return i})),r.d(t,"pointer",(function(){return xe})),r.d(t,"pointers",(function(){return Oe})),r.d(t,"select",(function(){return ge})),r.d(t,"selectAll",(function(){return Se})),r.d(t,"selection",(function(){return ve})),r.d(t,"selector",(function(){return c})),r.d(t,"selectorAll",(function(){return f})),r.d(t,"style",(function(){return L})),r.d(t,"window",(function(){return j}))
+var n="http://www.w3.org/1999/xhtml",i={svg:"http://www.w3.org/2000/svg",xhtml:n,xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"},o=function(e){var t=e+="",r=t.indexOf(":")
+return r>=0&&"xmlns"!==(t=e.slice(0,r))&&(e=e.slice(r+1)),i.hasOwnProperty(t)?{space:i[t],local:e}:e}
+function a(e){return function(){var t=this.ownerDocument,r=this.namespaceURI
+return r===n&&t.documentElement.namespaceURI===n?t.createElement(e):t.createElementNS(r,e)}}function s(e){return function(){return this.ownerDocument.createElementNS(e.space,e.local)}}var l=function(e){var t=o(e)
+return(t.local?s:a)(t)}
+function u(){}var c=function(e){return null==e?u:function(){return this.querySelector(e)}},d=function(e){return"object"==typeof e&&"length"in e?e:Array.from(e)}
+function h(){return[]}var f=function(e){return null==e?h:function(){return this.querySelectorAll(e)}},p=function(e){return function(){return this.matches(e)}}
+function m(e){return function(t){return t.matches(e)}}var v=Array.prototype.find
+function g(){return this.firstElementChild}var b=Array.prototype.filter
+function y(){return this.children}var _=function(e){return new Array(e.length)}
+function w(e,t){this.ownerDocument=e.ownerDocument,this.namespaceURI=e.namespaceURI,this._next=null,this._parent=e,this.__data__=t}w.prototype={constructor:w,appendChild:function(e){return this._parent.insertBefore(e,this._next)},insertBefore:function(e,t){return this._parent.insertBefore(e,t)},querySelector:function(e){return this._parent.querySelector(e)},querySelectorAll:function(e){return this._parent.querySelectorAll(e)}}
+var E=function(e){return function(){return e}}
+function x(e,t,r,n,i,o){for(var a,s=0,l=t.length,u=o.length;s<u;++s)(a=t[s])?(a.__data__=o[s],n[s]=a):r[s]=new w(e,o[s])
+for(;s<l;++s)(a=t[s])&&(i[s]=a)}function O(e,t,r,n,i,o,a){var s,l,u,c=new Map,d=t.length,h=o.length,f=new Array(d)
+for(s=0;s<d;++s)(l=t[s])&&(f[s]=u=a.call(l,l.__data__,s,t)+"",c.has(u)?i[s]=l:c.set(u,l))
+for(s=0;s<h;++s)u=a.call(e,o[s],s,o)+"",(l=c.get(u))?(n[s]=l,l.__data__=o[s],c.delete(u)):r[s]=new w(e,o[s])
+for(s=0;s<d;++s)(l=t[s])&&c.get(f[s])===l&&(i[s]=l)}function S(e){return e.__data__}function T(e,t){return e<t?-1:e>t?1:e>=t?0:NaN}function M(e){return function(){this.removeAttribute(e)}}function A(e){return function(){this.removeAttributeNS(e.space,e.local)}}function P(e,t){return function(){this.setAttribute(e,t)}}function C(e,t){return function(){this.setAttributeNS(e.space,e.local,t)}}function k(e,t){return function(){var r=t.apply(this,arguments)
+null==r?this.removeAttribute(e):this.setAttribute(e,r)}}function R(e,t){return function(){var r=t.apply(this,arguments)
+null==r?this.removeAttributeNS(e.space,e.local):this.setAttributeNS(e.space,e.local,r)}}var j=function(e){return e.ownerDocument&&e.ownerDocument.defaultView||e.document&&e||e.defaultView}
+function D(e){return function(){this.style.removeProperty(e)}}function N(e,t,r){return function(){this.style.setProperty(e,t,r)}}function I(e,t,r){return function(){var n=t.apply(this,arguments)
+null==n?this.style.removeProperty(e):this.style.setProperty(e,n,r)}}function L(e,t){return e.style.getPropertyValue(t)||j(e).getComputedStyle(e,null).getPropertyValue(t)}function F(e){return function(){delete this[e]}}function z(e,t){return function(){this[e]=t}}function U(e,t){return function(){var r=t.apply(this,arguments)
+null==r?delete this[e]:this[e]=r}}function H(e){return e.trim().split(/^|\s+/)}function B(e){return e.classList||new V(e)}function V(e){this._node=e,this._names=H(e.getAttribute("class")||"")}function $(e,t){for(var r=B(e),n=-1,i=t.length;++n<i;)r.add(t[n])}function q(e,t){for(var r=B(e),n=-1,i=t.length;++n<i;)r.remove(t[n])}function W(e){return function(){$(this,e)}}function G(e){return function(){q(this,e)}}function Y(e,t){return function(){(t.apply(this,arguments)?$:q)(this,e)}}function K(){this.textContent=""}function J(e){return function(){this.textContent=e}}function Q(e){return function(){var t=e.apply(this,arguments)
+this.textContent=null==t?"":t}}function X(){this.innerHTML=""}function Z(e){return function(){this.innerHTML=e}}function ee(e){return function(){var t=e.apply(this,arguments)
+this.innerHTML=null==t?"":t}}function te(){this.nextSibling&&this.parentNode.appendChild(this)}function re(){this.previousSibling&&this.parentNode.insertBefore(this,this.parentNode.firstChild)}function ne(){return null}function ie(){var e=this.parentNode
+e&&e.removeChild(this)}function oe(){var e=this.cloneNode(!1),t=this.parentNode
+return t?t.insertBefore(e,this.nextSibling):e}function ae(){var e=this.cloneNode(!0),t=this.parentNode
+return t?t.insertBefore(e,this.nextSibling):e}function se(e){return e.trim().split(/^|\s+/).map((function(e){var t="",r=e.indexOf(".")
+return r>=0&&(t=e.slice(r+1),e=e.slice(0,r)),{type:e,name:t}}))}function le(e){return function(){var t=this.__on
+if(t){for(var r,n=0,i=-1,o=t.length;n<o;++n)r=t[n],e.type&&r.type!==e.type||r.name!==e.name?t[++i]=r:this.removeEventListener(r.type,r.listener,r.options);++i?t.length=i:delete this.__on}}}function ue(e,t,r){return function(){var n,i=this.__on,o=function(e){return function(t){e.call(this,t,this.__data__)}}(t)
+if(i)for(var a=0,s=i.length;a<s;++a)if((n=i[a]).type===e.type&&n.name===e.name)return this.removeEventListener(n.type,n.listener,n.options),this.addEventListener(n.type,n.listener=o,n.options=r),void(n.value=t)
+this.addEventListener(e.type,o,r),n={type:e.type,name:e.name,value:t,listener:o,options:r},i?i.push(n):this.__on=[n]}}function ce(e,t,r){var n=j(e),i=n.CustomEvent
+"function"==typeof i?i=new i(t,r):(i=n.document.createEvent("Event"),r?(i.initEvent(t,r.bubbles,r.cancelable),i.detail=r.detail):i.initEvent(t,!1,!1)),e.dispatchEvent(i)}function de(e,t){return function(){return ce(this,e,t)}}function he(e,t){return function(){return ce(this,e,t.apply(this,arguments))}}V.prototype={add:function(e){this._names.indexOf(e)<0&&(this._names.push(e),this._node.setAttribute("class",this._names.join(" ")))},remove:function(e){var t=this._names.indexOf(e)
+t>=0&&(this._names.splice(t,1),this._node.setAttribute("class",this._names.join(" ")))},contains:function(e){return this._names.indexOf(e)>=0}}
+var fe=[null]
+function pe(e,t){this._groups=e,this._parents=t}function me(){return new pe([[document.documentElement]],fe)}pe.prototype=me.prototype={constructor:pe,select:function(e){"function"!=typeof e&&(e=c(e))
+for(var t=this._groups,r=t.length,n=new Array(r),i=0;i<r;++i)for(var o,a,s=t[i],l=s.length,u=n[i]=new Array(l),d=0;d<l;++d)(o=s[d])&&(a=e.call(o,o.__data__,d,s))&&("__data__"in o&&(a.__data__=o.__data__),u[d]=a)
+return new pe(n,this._parents)},selectAll:function(e){e="function"==typeof e?function(e){return function(){var t=e.apply(this,arguments)
+return null==t?[]:d(t)}}(e):f(e)
+for(var t=this._groups,r=t.length,n=[],i=[],o=0;o<r;++o)for(var a,s=t[o],l=s.length,u=0;u<l;++u)(a=s[u])&&(n.push(e.call(a,a.__data__,u,s)),i.push(a))
+return new pe(n,i)},selectChild:function(e){return this.select(null==e?g:function(e){return function(){return v.call(this.children,e)}}("function"==typeof e?e:m(e)))},selectChildren:function(e){return this.selectAll(null==e?y:function(e){return function(){return b.call(this.children,e)}}("function"==typeof e?e:m(e)))},filter:function(e){"function"!=typeof e&&(e=p(e))
+for(var t=this._groups,r=t.length,n=new Array(r),i=0;i<r;++i)for(var o,a=t[i],s=a.length,l=n[i]=[],u=0;u<s;++u)(o=a[u])&&e.call(o,o.__data__,u,a)&&l.push(o)
+return new pe(n,this._parents)},data:function(e,t){if(!arguments.length)return Array.from(this,S)
+var r=t?O:x,n=this._parents,i=this._groups
+"function"!=typeof e&&(e=E(e))
+for(var o=i.length,a=new Array(o),s=new Array(o),l=new Array(o),u=0;u<o;++u){var c=n[u],h=i[u],f=h.length,p=d(e.call(c,c&&c.__data__,u,n)),m=p.length,v=s[u]=new Array(m),g=a[u]=new Array(m),b=l[u]=new Array(f)
+r(c,h,v,g,b,p,t)
+for(var y,_,w=0,T=0;w<m;++w)if(y=v[w]){for(w>=T&&(T=w+1);!(_=g[T])&&++T<m;);y._next=_||null}}return(a=new pe(a,n))._enter=s,a._exit=l,a},enter:function(){return new pe(this._enter||this._groups.map(_),this._parents)},exit:function(){return new pe(this._exit||this._groups.map(_),this._parents)},join:function(e,t,r){var n=this.enter(),i=this,o=this.exit()
+return n="function"==typeof e?e(n):n.append(e+""),null!=t&&(i=t(i)),null==r?o.remove():r(o),n&&i?n.merge(i).order():i},merge:function(e){if(!(e instanceof pe))throw new Error("invalid merge")
+for(var t=this._groups,r=e._groups,n=t.length,i=r.length,o=Math.min(n,i),a=new Array(n),s=0;s<o;++s)for(var l,u=t[s],c=r[s],d=u.length,h=a[s]=new Array(d),f=0;f<d;++f)(l=u[f]||c[f])&&(h[f]=l)
+for(;s<n;++s)a[s]=t[s]
+return new pe(a,this._parents)},selection:function(){return this},order:function(){for(var e=this._groups,t=-1,r=e.length;++t<r;)for(var n,i=e[t],o=i.length-1,a=i[o];--o>=0;)(n=i[o])&&(a&&4^n.compareDocumentPosition(a)&&a.parentNode.insertBefore(n,a),a=n)
+return this},sort:function(e){function t(t,r){return t&&r?e(t.__data__,r.__data__):!t-!r}e||(e=T)
+for(var r=this._groups,n=r.length,i=new Array(n),o=0;o<n;++o){for(var a,s=r[o],l=s.length,u=i[o]=new Array(l),c=0;c<l;++c)(a=s[c])&&(u[c]=a)
+u.sort(t)}return new pe(i,this._parents).order()},call:function(){var e=arguments[0]
+return arguments[0]=this,e.apply(null,arguments),this},nodes:function(){return Array.from(this)},node:function(){for(var e=this._groups,t=0,r=e.length;t<r;++t)for(var n=e[t],i=0,o=n.length;i<o;++i){var a=n[i]
+if(a)return a}return null},size:function(){let e=0
+for(const t of this)++e
+return e},empty:function(){return!this.node()},each:function(e){for(var t=this._groups,r=0,n=t.length;r<n;++r)for(var i,o=t[r],a=0,s=o.length;a<s;++a)(i=o[a])&&e.call(i,i.__data__,a,o)
+return this},attr:function(e,t){var r=o(e)
+if(arguments.length<2){var n=this.node()
+return r.local?n.getAttributeNS(r.space,r.local):n.getAttribute(r)}return this.each((null==t?r.local?A:M:"function"==typeof t?r.local?R:k:r.local?C:P)(r,t))},style:function(e,t,r){return arguments.length>1?this.each((null==t?D:"function"==typeof t?I:N)(e,t,null==r?"":r)):L(this.node(),e)},property:function(e,t){return arguments.length>1?this.each((null==t?F:"function"==typeof t?U:z)(e,t)):this.node()[e]},classed:function(e,t){var r=H(e+"")
+if(arguments.length<2){for(var n=B(this.node()),i=-1,o=r.length;++i<o;)if(!n.contains(r[i]))return!1
+return!0}return this.each(("function"==typeof t?Y:t?W:G)(r,t))},text:function(e){return arguments.length?this.each(null==e?K:("function"==typeof e?Q:J)(e)):this.node().textContent},html:function(e){return arguments.length?this.each(null==e?X:("function"==typeof e?ee:Z)(e)):this.node().innerHTML},raise:function(){return this.each(te)},lower:function(){return this.each(re)},append:function(e){var t="function"==typeof e?e:l(e)
+return this.select((function(){return this.appendChild(t.apply(this,arguments))}))},insert:function(e,t){var r="function"==typeof e?e:l(e),n=null==t?ne:"function"==typeof t?t:c(t)
+return this.select((function(){return this.insertBefore(r.apply(this,arguments),n.apply(this,arguments)||null)}))},remove:function(){return this.each(ie)},clone:function(e){return this.select(e?ae:oe)},datum:function(e){return arguments.length?this.property("__data__",e):this.node().__data__},on:function(e,t,r){var n,i,o=se(e+""),a=o.length
+if(!(arguments.length<2)){for(s=t?ue:le,n=0;n<a;++n)this.each(s(o[n],t,r))
+return this}var s=this.node().__on
+if(s)for(var l,u=0,c=s.length;u<c;++u)for(n=0,l=s[u];n<a;++n)if((i=o[n]).type===l.type&&i.name===l.name)return l.value},dispatch:function(e,t){return this.each(("function"==typeof t?he:de)(e,t))},[Symbol.iterator]:function*(){for(var e=this._groups,t=0,r=e.length;t<r;++t)for(var n,i=e[t],o=0,a=i.length;o<a;++o)(n=i[o])&&(yield n)}}
+var ve=me,ge=function(e){return"string"==typeof e?new pe([[document.querySelector(e)]],[document.documentElement]):new pe([[e]],fe)},be=function(e){return ge(l(e).call(document.documentElement))},ye=0
+function _e(){return new we}function we(){this._="@"+(++ye).toString(36)}we.prototype=_e.prototype={constructor:we,get:function(e){for(var t=this._;!(t in e);)if(!(e=e.parentNode))return
+return e[t]},set:function(e,t){return e[this._]=t},remove:function(e){return this._ in e&&delete e[this._]},toString:function(){return this._}}
+var Ee=function(e){let t
+for(;t=e.sourceEvent;)e=t
+return e},xe=function(e,t){if(e=Ee(e),void 0===t&&(t=e.currentTarget),t){var r=t.ownerSVGElement||t
+if(r.createSVGPoint){var n=r.createSVGPoint()
+return n.x=e.clientX,n.y=e.clientY,[(n=n.matrixTransform(t.getScreenCTM().inverse())).x,n.y]}if(t.getBoundingClientRect){var i=t.getBoundingClientRect()
+return[e.clientX-i.left-t.clientLeft,e.clientY-i.top-t.clientTop]}}return[e.pageX,e.pageY]},Oe=function(e,t){return e.target&&(e=Ee(e),void 0===t&&(t=e.currentTarget),e=e.touches||[e]),Array.from(e,e=>xe(e,t))},Se=function(e){return"string"==typeof e?new pe([document.querySelectorAll(e)],[document.documentElement]):new pe([null==e?[]:d(e)],fe)}},function(e,t,r){"use strict"
+function n(e){var t=e.getBoundingClientRect()
+return{width:t.width,height:t.height,top:t.top,right:t.right,bottom:t.bottom,left:t.left,x:t.left,y:t.top}}function i(e){if(null==e)return window
+if("[object Window]"!==e.toString()){var t=e.ownerDocument
+return t&&t.defaultView||window}return e}function o(e){var t=i(e)
+return{scrollLeft:t.pageXOffset,scrollTop:t.pageYOffset}}function a(e){return e instanceof i(e).Element||e instanceof Element}function s(e){return e instanceof i(e).HTMLElement||e instanceof HTMLElement}function l(e){return"undefined"!=typeof ShadowRoot&&(e instanceof i(e).ShadowRoot||e instanceof ShadowRoot)}function u(e){return e?(e.nodeName||"").toLowerCase():null}function c(e){return((a(e)?e.ownerDocument:e.document)||window.document).documentElement}function d(e){return n(c(e)).left+o(e).scrollLeft}function h(e){return i(e).getComputedStyle(e)}function f(e){var t=h(e),r=t.overflow,n=t.overflowX,i=t.overflowY
+return/auto|scroll|overlay|hidden/.test(r+i+n)}function p(e,t,r){void 0===r&&(r=!1)
+var a,l,h=c(t),p=n(e),m=s(t),v={scrollLeft:0,scrollTop:0},g={x:0,y:0}
+return(m||!m&&!r)&&(("body"!==u(t)||f(h))&&(v=(a=t)!==i(a)&&s(a)?{scrollLeft:(l=a).scrollLeft,scrollTop:l.scrollTop}:o(a)),s(t)?((g=n(t)).x+=t.clientLeft,g.y+=t.clientTop):h&&(g.x=d(h))),{x:p.left+v.scrollLeft-g.x,y:p.top+v.scrollTop-g.y,width:p.width,height:p.height}}function m(e){var t=n(e),r=e.offsetWidth,i=e.offsetHeight
+return Math.abs(t.width-r)<=1&&(r=t.width),Math.abs(t.height-i)<=1&&(i=t.height),{x:e.offsetLeft,y:e.offsetTop,width:r,height:i}}function v(e){return"html"===u(e)?e:e.assignedSlot||e.parentNode||(l(e)?e.host:null)||c(e)}function g(e,t){var r
+void 0===t&&(t=[])
+var n=function e(t){return["html","body","#document"].indexOf(u(t))>=0?t.ownerDocument.body:s(t)&&f(t)?t:e(v(t))}(e),o=n===(null==(r=e.ownerDocument)?void 0:r.body),a=i(n),l=o?[a].concat(a.visualViewport||[],f(n)?n:[]):n,c=t.concat(l)
+return o?c:c.concat(g(v(l)))}function b(e){return["table","td","th"].indexOf(u(e))>=0}function y(e){return s(e)&&"fixed"!==h(e).position?e.offsetParent:null}function _(e){for(var t=i(e),r=y(e);r&&b(r)&&"static"===h(r).position;)r=y(r)
+return r&&("html"===u(r)||"body"===u(r)&&"static"===h(r).position)?t:r||function(e){for(var t=-1!==navigator.userAgent.toLowerCase().indexOf("firefox"),r=v(e);s(r)&&["html","body"].indexOf(u(r))<0;){var n=h(r)
+if("none"!==n.transform||"none"!==n.perspective||"paint"===n.contain||-1!==["transform","perspective"].indexOf(n.willChange)||t&&"filter"===n.willChange||t&&n.filter&&"none"!==n.filter)return r
+r=r.parentNode}return null}(e)||t}r.r(t),r.d(t,"animateFill",(function(){return Je})),r.d(t,"createSingleton",(function(){return Ge})),r.d(t,"delegate",(function(){return Ke})),r.d(t,"followCursor",(function(){return et})),r.d(t,"hideAll",(function(){return qe})),r.d(t,"inlinePositioning",(function(){return tt})),r.d(t,"roundArrow",(function(){return oe})),r.d(t,"sticky",(function(){return rt}))
+var w="top",E="bottom",x="right",O="left",S=[w,E,x,O],T=S.reduce((function(e,t){return e.concat([t+"-start",t+"-end"])}),[]),M=[].concat(S,["auto"]).reduce((function(e,t){return e.concat([t,t+"-start",t+"-end"])}),[]),A=["beforeRead","read","afterRead","beforeMain","main","afterMain","beforeWrite","write","afterWrite"]
+var P={placement:"bottom",modifiers:[],strategy:"absolute"}
+function C(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r]
+return!t.some((function(e){return!(e&&"function"==typeof e.getBoundingClientRect)}))}var k={passive:!0},R={name:"eventListeners",enabled:!0,phase:"write",fn:function(){},effect:function(e){var t=e.state,r=e.instance,n=e.options,o=n.scroll,a=void 0===o||o,s=n.resize,l=void 0===s||s,u=i(t.elements.popper),c=[].concat(t.scrollParents.reference,t.scrollParents.popper)
+return a&&c.forEach((function(e){e.addEventListener("scroll",r.update,k)})),l&&u.addEventListener("resize",r.update,k),function(){a&&c.forEach((function(e){e.removeEventListener("scroll",r.update,k)})),l&&u.removeEventListener("resize",r.update,k)}},data:{}}
+function j(e){return e.split("-")[0]}function D(e){return e.split("-")[1]}function N(e){return["top","bottom"].indexOf(e)>=0?"x":"y"}function I(e){var t,r=e.reference,n=e.element,i=e.placement,o=i?j(i):null,a=i?D(i):null,s=r.x+r.width/2-n.width/2,l=r.y+r.height/2-n.height/2
+switch(o){case w:t={x:s,y:r.y-n.height}
+break
+case E:t={x:s,y:r.y+r.height}
+break
+case x:t={x:r.x+r.width,y:l}
+break
+case O:t={x:r.x-n.width,y:l}
+break
+default:t={x:r.x,y:r.y}}var u=o?N(o):null
+if(null!=u){var c="y"===u?"height":"width"
+switch(a){case"start":t[u]=t[u]-(r[c]/2-n[c]/2)
+break
+case"end":t[u]=t[u]+(r[c]/2-n[c]/2)}}return t}var L={name:"popperOffsets",enabled:!0,phase:"read",fn:function(e){var t=e.state,r=e.name
+t.modifiersData[r]=I({reference:t.rects.reference,element:t.rects.popper,strategy:"absolute",placement:t.placement})},data:{}},F=Math.max,z=Math.min,U=Math.round,H={top:"auto",right:"auto",bottom:"auto",left:"auto"}
+function B(e){var t,r=e.popper,n=e.popperRect,o=e.placement,a=e.offsets,s=e.position,l=e.gpuAcceleration,u=e.adaptive,d=e.roundOffsets,f=!0===d?function(e){var t=e.x,r=e.y,n=window.devicePixelRatio||1
+return{x:U(U(t*n)/n)||0,y:U(U(r*n)/n)||0}}(a):"function"==typeof d?d(a):a,p=f.x,m=void 0===p?0:p,v=f.y,g=void 0===v?0:v,b=a.hasOwnProperty("x"),y=a.hasOwnProperty("y"),S=O,T=w,M=window
+if(u){var A=_(r),P="clientHeight",C="clientWidth"
+A===i(r)&&"static"!==h(A=c(r)).position&&(P="scrollHeight",C="scrollWidth"),A=A,o===w&&(T=E,g-=A[P]-n.height,g*=l?1:-1),o===O&&(S=x,m-=A[C]-n.width,m*=l?1:-1)}var k,R=Object.assign({position:s},u&&H)
+return l?Object.assign({},R,((k={})[T]=y?"0":"",k[S]=b?"0":"",k.transform=(M.devicePixelRatio||1)<2?"translate("+m+"px, "+g+"px)":"translate3d("+m+"px, "+g+"px, 0)",k)):Object.assign({},R,((t={})[T]=y?g+"px":"",t[S]=b?m+"px":"",t.transform="",t))}var V={name:"applyStyles",enabled:!0,phase:"write",fn:function(e){var t=e.state
+Object.keys(t.elements).forEach((function(e){var r=t.styles[e]||{},n=t.attributes[e]||{},i=t.elements[e]
+s(i)&&u(i)&&(Object.assign(i.style,r),Object.keys(n).forEach((function(e){var t=n[e]
+!1===t?i.removeAttribute(e):i.setAttribute(e,!0===t?"":t)})))}))},effect:function(e){var t=e.state,r={popper:{position:t.options.strategy,left:"0",top:"0",margin:"0"},arrow:{position:"absolute"},reference:{}}
+return Object.assign(t.elements.popper.style,r.popper),t.styles=r,t.elements.arrow&&Object.assign(t.elements.arrow.style,r.arrow),function(){Object.keys(t.elements).forEach((function(e){var n=t.elements[e],i=t.attributes[e]||{},o=Object.keys(t.styles.hasOwnProperty(e)?t.styles[e]:r[e]).reduce((function(e,t){return e[t]="",e}),{})
+s(n)&&u(n)&&(Object.assign(n.style,o),Object.keys(i).forEach((function(e){n.removeAttribute(e)})))}))}},requires:["computeStyles"]},$={left:"right",right:"left",bottom:"top",top:"bottom"}
+function q(e){return e.replace(/left|right|bottom|top/g,(function(e){return $[e]}))}var W={start:"end",end:"start"}
+function G(e){return e.replace(/start|end/g,(function(e){return W[e]}))}function Y(e,t){var r=t.getRootNode&&t.getRootNode()
+if(e.contains(t))return!0
+if(r&&l(r)){var n=t
+do{if(n&&e.isSameNode(n))return!0
+n=n.parentNode||n.host}while(n)}return!1}function K(e){return Object.assign({},e,{left:e.x,top:e.y,right:e.x+e.width,bottom:e.y+e.height})}function J(e,t){return"viewport"===t?K(function(e){var t=i(e),r=c(e),n=t.visualViewport,o=r.clientWidth,a=r.clientHeight,s=0,l=0
+return n&&(o=n.width,a=n.height,/^((?!chrome|android).)*safari/i.test(navigator.userAgent)||(s=n.offsetLeft,l=n.offsetTop)),{width:o,height:a,x:s+d(e),y:l}}(e)):s(t)?function(e){var t=n(e)
+return t.top=t.top+e.clientTop,t.left=t.left+e.clientLeft,t.bottom=t.top+e.clientHeight,t.right=t.left+e.clientWidth,t.width=e.clientWidth,t.height=e.clientHeight,t.x=t.left,t.y=t.top,t}(t):K(function(e){var t,r=c(e),n=o(e),i=null==(t=e.ownerDocument)?void 0:t.body,a=F(r.scrollWidth,r.clientWidth,i?i.scrollWidth:0,i?i.clientWidth:0),s=F(r.scrollHeight,r.clientHeight,i?i.scrollHeight:0,i?i.clientHeight:0),l=-n.scrollLeft+d(e),u=-n.scrollTop
+return"rtl"===h(i||r).direction&&(l+=F(r.clientWidth,i?i.clientWidth:0)-a),{width:a,height:s,x:l,y:u}}(c(e)))}function Q(e,t,r){var n="clippingParents"===t?function(e){var t=g(v(e)),r=["absolute","fixed"].indexOf(h(e).position)>=0&&s(e)?_(e):e
+return a(r)?t.filter((function(e){return a(e)&&Y(e,r)&&"body"!==u(e)})):[]}(e):[].concat(t),i=[].concat(n,[r]),o=i[0],l=i.reduce((function(t,r){var n=J(e,r)
+return t.top=F(n.top,t.top),t.right=z(n.right,t.right),t.bottom=z(n.bottom,t.bottom),t.left=F(n.left,t.left),t}),J(e,o))
+return l.width=l.right-l.left,l.height=l.bottom-l.top,l.x=l.left,l.y=l.top,l}function X(e){return Object.assign({},{top:0,right:0,bottom:0,left:0},e)}function Z(e,t){return t.reduce((function(t,r){return t[r]=e,t}),{})}function ee(e,t){void 0===t&&(t={})
+var r=t,i=r.placement,o=void 0===i?e.placement:i,s=r.boundary,l=void 0===s?"clippingParents":s,u=r.rootBoundary,d=void 0===u?"viewport":u,h=r.elementContext,f=void 0===h?"popper":h,p=r.altBoundary,m=void 0!==p&&p,v=r.padding,g=void 0===v?0:v,b=X("number"!=typeof g?g:Z(g,S)),y="popper"===f?"reference":"popper",_=e.elements.reference,O=e.rects.popper,T=e.elements[m?y:f],M=Q(a(T)?T:T.contextElement||c(e.elements.popper),l,d),A=n(_),P=I({reference:A,element:O,strategy:"absolute",placement:o}),C=K(Object.assign({},O,P)),k="popper"===f?C:A,R={top:M.top-k.top+b.top,bottom:k.bottom-M.bottom+b.bottom,left:M.left-k.left+b.left,right:k.right-M.right+b.right},j=e.modifiersData.offset
+if("popper"===f&&j){var D=j[o]
+Object.keys(R).forEach((function(e){var t=[x,E].indexOf(e)>=0?1:-1,r=[w,E].indexOf(e)>=0?"y":"x"
+R[e]+=D[r]*t}))}return R}function te(e,t,r){return F(e,z(t,r))}function re(e,t,r){return void 0===r&&(r={x:0,y:0}),{top:e.top-t.height-r.y,right:e.right-t.width+r.x,bottom:e.bottom-t.height+r.y,left:e.left-t.width-r.x}}function ne(e){return[w,x,E,O].some((function(t){return e[t]>=0}))}var ie=function(e){void 0===e&&(e={})
+var t=e,r=t.defaultModifiers,n=void 0===r?[]:r,i=t.defaultOptions,o=void 0===i?P:i
+return function(e,t,r){void 0===r&&(r=o)
+var i,s,l={placement:"bottom",orderedModifiers:[],options:Object.assign({},P,o),modifiersData:{},elements:{reference:e,popper:t},attributes:{},styles:{}},u=[],c=!1,d={state:l,setOptions:function(r){h(),l.options=Object.assign({},o,l.options,r),l.scrollParents={reference:a(e)?g(e):e.contextElement?g(e.contextElement):[],popper:g(t)}
+var i=function(e){var t=function(e){var t=new Map,r=new Set,n=[]
+return e.forEach((function(e){t.set(e.name,e)})),e.forEach((function(e){r.has(e.name)||function e(i){r.add(i.name),[].concat(i.requires||[],i.requiresIfExists||[]).forEach((function(n){if(!r.has(n)){var i=t.get(n)
+i&&e(i)}})),n.push(i)}(e)})),n}(e)
+return A.reduce((function(e,r){return e.concat(t.filter((function(e){return e.phase===r})))}),[])}(function(e){var t=e.reduce((function(e,t){var r=e[t.name]
+return e[t.name]=r?Object.assign({},r,t,{options:Object.assign({},r.options,t.options),data:Object.assign({},r.data,t.data)}):t,e}),{})
+return Object.keys(t).map((function(e){return t[e]}))}([].concat(n,l.options.modifiers)))
+return l.orderedModifiers=i.filter((function(e){return e.enabled})),l.orderedModifiers.forEach((function(e){var t=e.name,r=e.options,n=void 0===r?{}:r,i=e.effect
+if("function"==typeof i){var o=i({state:l,name:t,instance:d,options:n})
+u.push(o||function(){})}})),d.update()},forceUpdate:function(){if(!c){var e=l.elements,t=e.reference,r=e.popper
+if(C(t,r)){l.rects={reference:p(t,_(r),"fixed"===l.options.strategy),popper:m(r)},l.reset=!1,l.placement=l.options.placement,l.orderedModifiers.forEach((function(e){return l.modifiersData[e.name]=Object.assign({},e.data)}))
+for(var n=0;n<l.orderedModifiers.length;n++)if(!0!==l.reset){var i=l.orderedModifiers[n],o=i.fn,a=i.options,s=void 0===a?{}:a,u=i.name
+"function"==typeof o&&(l=o({state:l,options:s,name:u,instance:d})||l)}else l.reset=!1,n=-1}}},update:(i=function(){return new Promise((function(e){d.forceUpdate(),e(l)}))},function(){return s||(s=new Promise((function(e){Promise.resolve().then((function(){s=void 0,e(i())}))}))),s}),destroy:function(){h(),c=!0}}
+if(!C(e,t))return d
+function h(){u.forEach((function(e){return e()})),u=[]}return d.setOptions(r).then((function(e){!c&&r.onFirstUpdate&&r.onFirstUpdate(e)})),d}}({defaultModifiers:[R,L,{name:"computeStyles",enabled:!0,phase:"beforeWrite",fn:function(e){var t=e.state,r=e.options,n=r.gpuAcceleration,i=void 0===n||n,o=r.adaptive,a=void 0===o||o,s=r.roundOffsets,l=void 0===s||s,u={placement:j(t.placement),popper:t.elements.popper,popperRect:t.rects.popper,gpuAcceleration:i}
+null!=t.modifiersData.popperOffsets&&(t.styles.popper=Object.assign({},t.styles.popper,B(Object.assign({},u,{offsets:t.modifiersData.popperOffsets,position:t.options.strategy,adaptive:a,roundOffsets:l})))),null!=t.modifiersData.arrow&&(t.styles.arrow=Object.assign({},t.styles.arrow,B(Object.assign({},u,{offsets:t.modifiersData.arrow,position:"absolute",adaptive:!1,roundOffsets:l})))),t.attributes.popper=Object.assign({},t.attributes.popper,{"data-popper-placement":t.placement})},data:{}},V,{name:"offset",enabled:!0,phase:"main",requires:["popperOffsets"],fn:function(e){var t=e.state,r=e.options,n=e.name,i=r.offset,o=void 0===i?[0,0]:i,a=M.reduce((function(e,r){return e[r]=function(e,t,r){var n=j(e),i=[O,w].indexOf(n)>=0?-1:1,o="function"==typeof r?r(Object.assign({},t,{placement:e})):r,a=o[0],s=o[1]
+return a=a||0,s=(s||0)*i,[O,x].indexOf(n)>=0?{x:s,y:a}:{x:a,y:s}}(r,t.rects,o),e}),{}),s=a[t.placement],l=s.x,u=s.y
+null!=t.modifiersData.popperOffsets&&(t.modifiersData.popperOffsets.x+=l,t.modifiersData.popperOffsets.y+=u),t.modifiersData[n]=a}},{name:"flip",enabled:!0,phase:"main",fn:function(e){var t=e.state,r=e.options,n=e.name
+if(!t.modifiersData[n]._skip){for(var i=r.mainAxis,o=void 0===i||i,a=r.altAxis,s=void 0===a||a,l=r.fallbackPlacements,u=r.padding,c=r.boundary,d=r.rootBoundary,h=r.altBoundary,f=r.flipVariations,p=void 0===f||f,m=r.allowedAutoPlacements,v=t.options.placement,g=j(v),b=l||(g!==v&&p?function(e){if("auto"===j(e))return[]
+var t=q(e)
+return[G(e),t,G(t)]}(v):[q(v)]),y=[v].concat(b).reduce((function(e,r){return e.concat("auto"===j(r)?function(e,t){void 0===t&&(t={})
+var r=t,n=r.placement,i=r.boundary,o=r.rootBoundary,a=r.padding,s=r.flipVariations,l=r.allowedAutoPlacements,u=void 0===l?M:l,c=D(n),d=c?s?T:T.filter((function(e){return D(e)===c})):S,h=d.filter((function(e){return u.indexOf(e)>=0}))
+0===h.length&&(h=d)
+var f=h.reduce((function(t,r){return t[r]=ee(e,{placement:r,boundary:i,rootBoundary:o,padding:a})[j(r)],t}),{})
+return Object.keys(f).sort((function(e,t){return f[e]-f[t]}))}(t,{placement:r,boundary:c,rootBoundary:d,padding:u,flipVariations:p,allowedAutoPlacements:m}):r)}),[]),_=t.rects.reference,A=t.rects.popper,P=new Map,C=!0,k=y[0],R=0;R<y.length;R++){var N=y[R],I=j(N),L="start"===D(N),F=[w,E].indexOf(I)>=0,z=F?"width":"height",U=ee(t,{placement:N,boundary:c,rootBoundary:d,altBoundary:h,padding:u}),H=F?L?x:O:L?E:w
+_[z]>A[z]&&(H=q(H))
+var B=q(H),V=[]
+if(o&&V.push(U[I]<=0),s&&V.push(U[H]<=0,U[B]<=0),V.every((function(e){return e}))){k=N,C=!1
+break}P.set(N,V)}if(C)for(var $=function(e){var t=y.find((function(t){var r=P.get(t)
+if(r)return r.slice(0,e).every((function(e){return e}))}))
+if(t)return k=t,"break"},W=p?3:1;W>0&&"break"!==$(W);W--);t.placement!==k&&(t.modifiersData[n]._skip=!0,t.placement=k,t.reset=!0)}},requiresIfExists:["offset"],data:{_skip:!1}},{name:"preventOverflow",enabled:!0,phase:"main",fn:function(e){var t=e.state,r=e.options,n=e.name,i=r.mainAxis,o=void 0===i||i,a=r.altAxis,s=void 0!==a&&a,l=r.boundary,u=r.rootBoundary,c=r.altBoundary,d=r.padding,h=r.tether,f=void 0===h||h,p=r.tetherOffset,v=void 0===p?0:p,g=ee(t,{boundary:l,rootBoundary:u,padding:d,altBoundary:c}),b=j(t.placement),y=D(t.placement),S=!y,T=N(b),M="x"===T?"y":"x",A=t.modifiersData.popperOffsets,P=t.rects.reference,C=t.rects.popper,k="function"==typeof v?v(Object.assign({},t.rects,{placement:t.placement})):v,R={x:0,y:0}
+if(A){if(o||s){var I="y"===T?w:O,L="y"===T?E:x,U="y"===T?"height":"width",H=A[T],B=A[T]+g[I],V=A[T]-g[L],$=f?-C[U]/2:0,q="start"===y?P[U]:C[U],W="start"===y?-C[U]:-P[U],G=t.elements.arrow,Y=f&&G?m(G):{width:0,height:0},K=t.modifiersData["arrow#persistent"]?t.modifiersData["arrow#persistent"].padding:{top:0,right:0,bottom:0,left:0},J=K[I],Q=K[L],X=te(0,P[U],Y[U]),Z=S?P[U]/2-$-X-J-k:q-X-J-k,re=S?-P[U]/2+$+X+Q+k:W+X+Q+k,ne=t.elements.arrow&&_(t.elements.arrow),ie=ne?"y"===T?ne.clientTop||0:ne.clientLeft||0:0,oe=t.modifiersData.offset?t.modifiersData.offset[t.placement][T]:0,ae=A[T]+Z-oe-ie,se=A[T]+re-oe
+if(o){var le=te(f?z(B,ae):B,H,f?F(V,se):V)
+A[T]=le,R[T]=le-H}if(s){var ue="x"===T?w:O,ce="x"===T?E:x,de=A[M],he=de+g[ue],fe=de-g[ce],pe=te(f?z(he,ae):he,de,f?F(fe,se):fe)
+A[M]=pe,R[M]=pe-de}}t.modifiersData[n]=R}},requiresIfExists:["offset"]},{name:"arrow",enabled:!0,phase:"main",fn:function(e){var t,r=e.state,n=e.name,i=e.options,o=r.elements.arrow,a=r.modifiersData.popperOffsets,s=j(r.placement),l=N(s),u=[O,x].indexOf(s)>=0?"height":"width"
+if(o&&a){var c=function(e,t){return X("number"!=typeof(e="function"==typeof e?e(Object.assign({},t.rects,{placement:t.placement})):e)?e:Z(e,S))}(i.padding,r),d=m(o),h="y"===l?w:O,f="y"===l?E:x,p=r.rects.reference[u]+r.rects.reference[l]-a[l]-r.rects.popper[u],v=a[l]-r.rects.reference[l],g=_(o),b=g?"y"===l?g.clientHeight||0:g.clientWidth||0:0,y=p/2-v/2,T=c[h],M=b-d[u]-c[f],A=b/2-d[u]/2+y,P=te(T,A,M),C=l
+r.modifiersData[n]=((t={})[C]=P,t.centerOffset=P-A,t)}},effect:function(e){var t=e.state,r=e.options.element,n=void 0===r?"[data-popper-arrow]":r
+null!=n&&("string"!=typeof n||(n=t.elements.popper.querySelector(n)))&&Y(t.elements.popper,n)&&(t.elements.arrow=n)},requires:["popperOffsets"],requiresIfExists:["preventOverflow"]},{name:"hide",enabled:!0,phase:"main",requiresIfExists:["preventOverflow"],fn:function(e){var t=e.state,r=e.name,n=t.rects.reference,i=t.rects.popper,o=t.modifiersData.preventOverflow,a=ee(t,{elementContext:"reference"}),s=ee(t,{altBoundary:!0}),l=re(a,n),u=re(s,i,o),c=ne(l),d=ne(u)
+t.modifiersData[r]={referenceClippingOffsets:l,popperEscapeOffsets:u,isReferenceHidden:c,hasPopperEscaped:d},t.attributes.popper=Object.assign({},t.attributes.popper,{"data-popper-reference-hidden":c,"data-popper-escaped":d})}}]}),oe='<svg width="16" height="6" xmlns="http://www.w3.org/2000/svg"><path d="M0 6s1.796-.013 4.67-3.615C5.851.9 6.93.006 8 0c1.07-.006 2.148.887 3.343 2.385C14.233 6.005 16 6 16 6H0z"></svg>',ae={passive:!0,capture:!0}
+function se(e,t,r){if(Array.isArray(e)){var n=e[t]
+return null==n?Array.isArray(r)?r[t]:r:n}return e}function le(e,t){var r={}.toString.call(e)
+return 0===r.indexOf("[object")&&r.indexOf(t+"]")>-1}function ue(e,t){return"function"==typeof e?e.apply(void 0,t):e}function ce(e,t){return 0===t?e:function(n){clearTimeout(r),r=setTimeout((function(){e(n)}),t)}
+var r}function de(e,t){var r=Object.assign({},e)
+return t.forEach((function(e){delete r[e]})),r}function he(e){return[].concat(e)}function fe(e,t){-1===e.indexOf(t)&&e.push(t)}function pe(e){return e.split("-")[0]}function me(e){return[].slice.call(e)}function ve(){return document.createElement("div")}function ge(e){return["Element","Fragment"].some((function(t){return le(e,t)}))}function be(e){return le(e,"MouseEvent")}function ye(e){return!(!e||!e._tippy||e._tippy.reference!==e)}function _e(e,t){e.forEach((function(e){e&&(e.style.transitionDuration=t+"ms")}))}function we(e,t){e.forEach((function(e){e&&e.setAttribute("data-state",t)}))}function Ee(e){var t,r=he(e)[0]
+return(null==r||null==(t=r.ownerDocument)?void 0:t.body)?r.ownerDocument:document}function xe(e,t,r){var n=t+"EventListener";["transitionend","webkitTransitionEnd"].forEach((function(t){e[n](t,r)}))}var Oe={isTouch:!1},Se=0
+function Te(){Oe.isTouch||(Oe.isTouch=!0,window.performance&&document.addEventListener("mousemove",Me))}function Me(){var e=performance.now()
+e-Se<20&&(Oe.isTouch=!1,document.removeEventListener("mousemove",Me)),Se=e}function Ae(){var e=document.activeElement
+if(ye(e)){var t=e._tippy
+e.blur&&!t.state.isVisible&&e.blur()}}var Pe="undefined"!=typeof window&&"undefined"!=typeof document?navigator.userAgent:"",Ce=/MSIE |Trident\//.test(Pe),ke=Object.assign({appendTo:function(){return document.body},aria:{content:"auto",expanded:"auto"},delay:0,duration:[300,250],getReferenceClientRect:null,hideOnClick:!0,ignoreAttributes:!1,interactive:!1,interactiveBorder:2,interactiveDebounce:0,moveTransition:"",offset:[0,10],onAfterUpdate:function(){},onBeforeUpdate:function(){},onCreate:function(){},onDestroy:function(){},onHidden:function(){},onHide:function(){},onMount:function(){},onShow:function(){},onShown:function(){},onTrigger:function(){},onUntrigger:function(){},onClickOutside:function(){},placement:"top",plugins:[],popperOptions:{},render:null,showOnCreate:!1,touch:!0,trigger:"mouseenter focus",triggerTarget:null},{animateFill:!1,followCursor:!1,inlinePositioning:!1,sticky:!1},{},{allowHTML:!1,animation:"fade",arrow:!0,content:"",inertia:!1,maxWidth:350,role:"tooltip",theme:"",zIndex:9999}),Re=Object.keys(ke)
+function je(e){var t=(e.plugins||[]).reduce((function(t,r){var n=r.name,i=r.defaultValue
+return n&&(t[n]=void 0!==e[n]?e[n]:i),t}),{})
+return Object.assign({},e,{},t)}function De(e,t){var r=Object.assign({},t,{content:ue(t.content,[e])},t.ignoreAttributes?{}:function(e,t){return(t?Object.keys(je(Object.assign({},ke,{plugins:t}))):Re).reduce((function(t,r){var n=(e.getAttribute("data-tippy-"+r)||"").trim()
+if(!n)return t
+if("content"===r)t[r]=n
+else try{t[r]=JSON.parse(n)}catch(e){t[r]=n}return t}),{})}(e,t.plugins))
+return r.aria=Object.assign({},ke.aria,{},r.aria),r.aria={expanded:"auto"===r.aria.expanded?t.interactive:r.aria.expanded,content:"auto"===r.aria.content?t.interactive?null:"describedby":r.aria.content},r}function Ne(e,t){e.innerHTML=t}function Ie(e){var t=ve()
+return!0===e?t.className="tippy-arrow":(t.className="tippy-svg-arrow",ge(e)?t.appendChild(e):Ne(t,e)),t}function Le(e,t){ge(t.content)?(Ne(e,""),e.appendChild(t.content)):"function"!=typeof t.content&&(t.allowHTML?Ne(e,t.content):e.textContent=t.content)}function Fe(e){var t=e.firstElementChild,r=me(t.children)
+return{box:t,content:r.find((function(e){return e.classList.contains("tippy-content")})),arrow:r.find((function(e){return e.classList.contains("tippy-arrow")||e.classList.contains("tippy-svg-arrow")})),backdrop:r.find((function(e){return e.classList.contains("tippy-backdrop")}))}}function ze(e){var t=ve(),r=ve()
+r.className="tippy-box",r.setAttribute("data-state","hidden"),r.setAttribute("tabindex","-1")
+var n=ve()
+function i(r,n){var i=Fe(t),o=i.box,a=i.content,s=i.arrow
+n.theme?o.setAttribute("data-theme",n.theme):o.removeAttribute("data-theme"),"string"==typeof n.animation?o.setAttribute("data-animation",n.animation):o.removeAttribute("data-animation"),n.inertia?o.setAttribute("data-inertia",""):o.removeAttribute("data-inertia"),o.style.maxWidth="number"==typeof n.maxWidth?n.maxWidth+"px":n.maxWidth,n.role?o.setAttribute("role",n.role):o.removeAttribute("role"),r.content===n.content&&r.allowHTML===n.allowHTML||Le(a,e.props),n.arrow?s?r.arrow!==n.arrow&&(o.removeChild(s),o.appendChild(Ie(n.arrow))):o.appendChild(Ie(n.arrow)):s&&o.removeChild(s)}return n.className="tippy-content",n.setAttribute("data-state","hidden"),Le(n,e.props),t.appendChild(r),r.appendChild(n),i(e.props,e.props),{popper:t,onUpdate:i}}ze.$$tippy=!0
+var Ue=1,He=[],Be=[]
+function Ve(e,t){var r,n,i,o,a,s,l,u,c,d=De(e,Object.assign({},ke,{},je((r=t,Object.keys(r).reduce((function(e,t){return void 0!==r[t]&&(e[t]=r[t]),e}),{}))))),h=!1,f=!1,p=!1,m=!1,v=[],g=ce(Y,d.interactiveDebounce),b=Ue++,y=(c=d.plugins).filter((function(e,t){return c.indexOf(e)===t})),_={id:b,reference:e,popper:ve(),popperInstance:null,props:d,state:{isEnabled:!0,isVisible:!1,isDestroyed:!1,isMounted:!1,isShown:!1},plugins:y,clearDelayTimeouts:function(){clearTimeout(n),clearTimeout(i),cancelAnimationFrame(o)},setProps:function(t){if(!_.state.isDestroyed){D("onBeforeUpdate",[_,t]),W()
+var r=_.props,n=De(e,Object.assign({},_.props,{},t,{ignoreAttributes:!0}))
+_.props=n,q(),r.interactiveDebounce!==n.interactiveDebounce&&(L(),g=ce(Y,n.interactiveDebounce)),r.triggerTarget&&!n.triggerTarget?he(r.triggerTarget).forEach((function(e){e.removeAttribute("aria-expanded")})):n.triggerTarget&&e.removeAttribute("aria-expanded"),I(),j(),x&&x(r,n),_.popperInstance&&(X(),ee().forEach((function(e){requestAnimationFrame(e._tippy.popperInstance.forceUpdate)}))),D("onAfterUpdate",[_,t])}},setContent:function(e){_.setProps({content:e})},show:function(){var e=_.state.isVisible,t=_.state.isDestroyed,r=!_.state.isEnabled,n=Oe.isTouch&&!_.props.touch,i=se(_.props.duration,0,ke.duration)
+if(!(e||t||r||n||P().hasAttribute("disabled")||(D("onShow",[_],!1),!1===_.props.onShow(_)))){if(_.state.isVisible=!0,A()&&(E.style.visibility="visible"),j(),H(),_.state.isMounted||(E.style.transition="none"),A()){var o=k()
+_e([o.box,o.content],0)}l=function(){var e
+if(_.state.isVisible&&!m){if(m=!0,E.offsetHeight,E.style.transition=_.props.moveTransition,A()&&_.props.animation){var t=k(),r=t.box,n=t.content
+_e([r,n],i),we([r,n],"visible")}N(),I(),fe(Be,_),null==(e=_.popperInstance)||e.forceUpdate(),_.state.isMounted=!0,D("onMount",[_]),_.props.animation&&A()&&function(e){V(e,(function(){_.state.isShown=!0,D("onShown",[_])}))}(i)}},function(){var e,t=_.props.appendTo,r=P();(e=_.props.interactive&&t===ke.appendTo||"parent"===t?r.parentNode:ue(t,[r])).contains(E)||e.appendChild(E),X()}()}},hide:function(){var e=!_.state.isVisible,t=_.state.isDestroyed,r=!_.state.isEnabled,n=se(_.props.duration,1,ke.duration)
+if(!(e||t||r)&&(D("onHide",[_],!1),!1!==_.props.onHide(_))){if(_.state.isVisible=!1,_.state.isShown=!1,m=!1,h=!1,A()&&(E.style.visibility="hidden"),L(),B(),j(),A()){var i=k(),o=i.box,a=i.content
+_.props.animation&&(_e([o,a],n),we([o,a],"hidden"))}N(),I(),_.props.animation?A()&&function(e,t){V(e,(function(){!_.state.isVisible&&E.parentNode&&E.parentNode.contains(E)&&t()}))}(n,_.unmount):_.unmount()}},hideWithInteractivity:function(e){C().addEventListener("mousemove",g),fe(He,g),g(e)},enable:function(){_.state.isEnabled=!0},disable:function(){_.hide(),_.state.isEnabled=!1},unmount:function(){_.state.isVisible&&_.hide(),_.state.isMounted&&(Z(),ee().forEach((function(e){e._tippy.unmount()})),E.parentNode&&E.parentNode.removeChild(E),Be=Be.filter((function(e){return e!==_})),_.state.isMounted=!1,D("onHidden",[_]))},destroy:function(){_.state.isDestroyed||(_.clearDelayTimeouts(),_.unmount(),W(),delete e._tippy,_.state.isDestroyed=!0,D("onDestroy",[_]))}}
+if(!d.render)return _
+var w=d.render(_),E=w.popper,x=w.onUpdate
+E.setAttribute("data-tippy-root",""),E.id="tippy-"+_.id,_.popper=E,e._tippy=_,E._tippy=_
+var O=y.map((function(e){return e.fn(_)})),S=e.hasAttribute("aria-expanded")
+return q(),I(),j(),D("onCreate",[_]),d.showOnCreate&&te(),E.addEventListener("mouseenter",(function(){_.props.interactive&&_.state.isVisible&&_.clearDelayTimeouts()})),E.addEventListener("mouseleave",(function(e){_.props.interactive&&_.props.trigger.indexOf("mouseenter")>=0&&(C().addEventListener("mousemove",g),g(e))})),_
+function T(){var e=_.props.touch
+return Array.isArray(e)?e:[e,0]}function M(){return"hold"===T()[0]}function A(){var e
+return!!(null==(e=_.props.render)?void 0:e.$$tippy)}function P(){return u||e}function C(){var e=P().parentNode
+return e?Ee(e):document}function k(){return Fe(E)}function R(e){return _.state.isMounted&&!_.state.isVisible||Oe.isTouch||a&&"focus"===a.type?0:se(_.props.delay,e?0:1,ke.delay)}function j(){E.style.pointerEvents=_.props.interactive&&_.state.isVisible?"":"none",E.style.zIndex=""+_.props.zIndex}function D(e,t,r){var n
+void 0===r&&(r=!0),O.forEach((function(r){r[e]&&r[e].apply(void 0,t)})),r&&(n=_.props)[e].apply(n,t)}function N(){var t=_.props.aria
+if(t.content){var r="aria-"+t.content,n=E.id
+he(_.props.triggerTarget||e).forEach((function(e){var t=e.getAttribute(r)
+if(_.state.isVisible)e.setAttribute(r,t?t+" "+n:n)
+else{var i=t&&t.replace(n,"").trim()
+i?e.setAttribute(r,i):e.removeAttribute(r)}}))}}function I(){!S&&_.props.aria.expanded&&he(_.props.triggerTarget||e).forEach((function(e){_.props.interactive?e.setAttribute("aria-expanded",_.state.isVisible&&e===P()?"true":"false"):e.removeAttribute("aria-expanded")}))}function L(){C().removeEventListener("mousemove",g),He=He.filter((function(e){return e!==g}))}function F(e){if(!(Oe.isTouch&&(p||"mousedown"===e.type)||_.props.interactive&&E.contains(e.target))){if(P().contains(e.target)){if(Oe.isTouch)return
+if(_.state.isVisible&&_.props.trigger.indexOf("click")>=0)return}else D("onClickOutside",[_,e])
+!0===_.props.hideOnClick&&(_.clearDelayTimeouts(),_.hide(),f=!0,setTimeout((function(){f=!1})),_.state.isMounted||B())}}function z(){p=!0}function U(){p=!1}function H(){var e=C()
+e.addEventListener("mousedown",F,!0),e.addEventListener("touchend",F,ae),e.addEventListener("touchstart",U,ae),e.addEventListener("touchmove",z,ae)}function B(){var e=C()
+e.removeEventListener("mousedown",F,!0),e.removeEventListener("touchend",F,ae),e.removeEventListener("touchstart",U,ae),e.removeEventListener("touchmove",z,ae)}function V(e,t){var r=k().box
+function n(e){e.target===r&&(xe(r,"remove",n),t())}if(0===e)return t()
+xe(r,"remove",s),xe(r,"add",n),s=n}function $(t,r,n){void 0===n&&(n=!1),he(_.props.triggerTarget||e).forEach((function(e){e.addEventListener(t,r,n),v.push({node:e,eventType:t,handler:r,options:n})}))}function q(){var e
+M()&&($("touchstart",G,{passive:!0}),$("touchend",K,{passive:!0})),(e=_.props.trigger,e.split(/\s+/).filter(Boolean)).forEach((function(e){if("manual"!==e)switch($(e,G),e){case"mouseenter":$("mouseleave",K)
+break
+case"focus":$(Ce?"focusout":"blur",J)
+break
+case"focusin":$("focusout",J)}}))}function W(){v.forEach((function(e){var t=e.node,r=e.eventType,n=e.handler,i=e.options
+t.removeEventListener(r,n,i)})),v=[]}function G(e){var t,r=!1
+if(_.state.isEnabled&&!Q(e)&&!f){var n="focus"===(null==(t=a)?void 0:t.type)
+a=e,u=e.currentTarget,I(),!_.state.isVisible&&be(e)&&He.forEach((function(t){return t(e)})),"click"===e.type&&(_.props.trigger.indexOf("mouseenter")<0||h)&&!1!==_.props.hideOnClick&&_.state.isVisible?r=!0:te(e),"click"===e.type&&(h=!r),r&&!n&&re(e)}}function Y(e){var t=e.target,r=P().contains(t)||E.contains(t)
+"mousemove"===e.type&&r||function(e,t){var r=t.clientX,n=t.clientY
+return e.every((function(e){var t=e.popperRect,i=e.popperState,o=e.props.interactiveBorder,a=pe(i.placement),s=i.modifiersData.offset
+if(!s)return!0
+var l="bottom"===a?s.top.y:0,u="top"===a?s.bottom.y:0,c="right"===a?s.left.x:0,d="left"===a?s.right.x:0,h=t.top-n+l>o,f=n-t.bottom-u>o,p=t.left-r+c>o,m=r-t.right-d>o
+return h||f||p||m}))}(ee().concat(E).map((function(e){var t,r=null==(t=e._tippy.popperInstance)?void 0:t.state
+return r?{popperRect:e.getBoundingClientRect(),popperState:r,props:d}:null})).filter(Boolean),e)&&(L(),re(e))}function K(e){Q(e)||_.props.trigger.indexOf("click")>=0&&h||(_.props.interactive?_.hideWithInteractivity(e):re(e))}function J(e){_.props.trigger.indexOf("focusin")<0&&e.target!==P()||_.props.interactive&&e.relatedTarget&&E.contains(e.relatedTarget)||re(e)}function Q(e){return!!Oe.isTouch&&M()!==e.type.indexOf("touch")>=0}function X(){Z()
+var t=_.props,r=t.popperOptions,n=t.placement,i=t.offset,o=t.getReferenceClientRect,a=t.moveTransition,s=A()?Fe(E).arrow:null,u=o?{getBoundingClientRect:o,contextElement:o.contextElement||P()}:e,c=[{name:"offset",options:{offset:i}},{name:"preventOverflow",options:{padding:{top:2,bottom:2,left:5,right:5}}},{name:"flip",options:{padding:5}},{name:"computeStyles",options:{adaptive:!a}},{name:"$$tippy",enabled:!0,phase:"beforeWrite",requires:["computeStyles"],fn:function(e){var t=e.state
+if(A()){var r=k().box;["placement","reference-hidden","escaped"].forEach((function(e){"placement"===e?r.setAttribute("data-placement",t.placement):t.attributes.popper["data-popper-"+e]?r.setAttribute("data-"+e,""):r.removeAttribute("data-"+e)})),t.attributes.popper={}}}}]
+A()&&s&&c.push({name:"arrow",options:{element:s,padding:3}}),c.push.apply(c,(null==r?void 0:r.modifiers)||[]),_.popperInstance=ie(u,E,Object.assign({},r,{placement:n,onFirstUpdate:l,modifiers:c}))}function Z(){_.popperInstance&&(_.popperInstance.destroy(),_.popperInstance=null)}function ee(){return me(E.querySelectorAll("[data-tippy-root]"))}function te(e){_.clearDelayTimeouts(),e&&D("onTrigger",[_,e]),H()
+var t=R(!0),r=T(),i=r[0],o=r[1]
+Oe.isTouch&&"hold"===i&&o&&(t=o),t?n=setTimeout((function(){_.show()}),t):_.show()}function re(e){if(_.clearDelayTimeouts(),D("onUntrigger",[_,e]),_.state.isVisible){if(!(_.props.trigger.indexOf("mouseenter")>=0&&_.props.trigger.indexOf("click")>=0&&["mouseleave","mousemove"].indexOf(e.type)>=0&&h)){var t=R(!1)
+t?i=setTimeout((function(){_.state.isVisible&&_.hide()}),t):o=requestAnimationFrame((function(){_.hide()}))}}else B()}}function $e(e,t){void 0===t&&(t={})
+var r=ke.plugins.concat(t.plugins||[])
+document.addEventListener("touchstart",Te,ae),window.addEventListener("blur",Ae)
+var n=Object.assign({},t,{plugins:r}),i=function(e){return ge(e)?[e]:function(e){return le(e,"NodeList")}(e)?me(e):Array.isArray(e)?e:me(document.querySelectorAll(e))}(e).reduce((function(e,t){var r=t&&Ve(t,n)
+return r&&e.push(r),e}),[])
+return ge(e)?i[0]:i}$e.defaultProps=ke,$e.setDefaultProps=function(e){Object.keys(e).forEach((function(t){ke[t]=e[t]}))},$e.currentInput=Oe
+var qe=function(e){var t=void 0===e?{}:e,r=t.exclude,n=t.duration
+Be.forEach((function(e){var t=!1
+if(r&&(t=ye(r)?e.reference===r:e.popper===r.popper),!t){var i=e.props.duration
+e.setProps({duration:n}),e.hide(),e.state.isDestroyed||e.setProps({duration:i})}}))},We=Object.assign({},V,{effect:function(e){var t=e.state,r={popper:{position:t.options.strategy,left:"0",top:"0",margin:"0"},arrow:{position:"absolute"},reference:{}}
+Object.assign(t.elements.popper.style,r.popper),t.styles=r,t.elements.arrow&&Object.assign(t.elements.arrow.style,r.arrow)}}),Ge=function(e,t){var r
+void 0===t&&(t={})
+var n,i=e,o=[],a=t.overrides,s=[],l=!1
+function u(){o=i.map((function(e){return e.reference}))}function c(e){i.forEach((function(t){e?t.enable():t.disable()}))}function d(e){return i.map((function(t){var r=t.setProps
+return t.setProps=function(i){r(i),t.reference===n&&e.setProps(i)},function(){t.setProps=r}}))}function h(e,t){var r=o.indexOf(t)
+if(t!==n){n=t
+var s=(a||[]).concat("content").reduce((function(e,t){return e[t]=i[r].props[t],e}),{})
+e.setProps(Object.assign({},s,{getReferenceClientRect:"function"==typeof s.getReferenceClientRect?s.getReferenceClientRect:function(){return t.getBoundingClientRect()}}))}}c(!1),u()
+var f={fn:function(){return{onDestroy:function(){c(!0)},onHidden:function(){n=null},onClickOutside:function(e){e.props.showOnCreate&&!l&&(l=!0,n=null)},onShow:function(e){e.props.showOnCreate&&!l&&(l=!0,h(e,o[0]))},onTrigger:function(e,t){h(e,t.currentTarget)}}}},p=$e(ve(),Object.assign({},de(t,["overrides"]),{plugins:[f].concat(t.plugins||[]),triggerTarget:o,popperOptions:Object.assign({},t.popperOptions,{modifiers:[].concat((null==(r=t.popperOptions)?void 0:r.modifiers)||[],[We])})})),m=p.show
+p.show=function(e){if(m(),!n&&null==e)return h(p,o[0])
+if(!n||null!=e){if("number"==typeof e)return o[e]&&h(p,o[e])
+if(i.includes(e)){var t=e.reference
+return h(p,t)}return o.includes(e)?h(p,e):void 0}},p.showNext=function(){var e=o[0]
+if(!n)return p.show(0)
+var t=o.indexOf(n)
+p.show(o[t+1]||e)},p.showPrevious=function(){var e=o[o.length-1]
+if(!n)return p.show(e)
+var t=o.indexOf(n),r=o[t-1]||e
+p.show(r)}
+var v=p.setProps
+return p.setProps=function(e){a=e.overrides||a,v(e)},p.setInstances=function(e){c(!0),s.forEach((function(e){return e()})),i=e,c(!1),u(),d(p),p.setProps({triggerTarget:o})},s=d(p),p},Ye={mouseover:"mouseenter",focusin:"focus",click:"click"}
+function Ke(e,t){var r=[],n=[],i=!1,o=t.target,a=de(t,["target"]),s=Object.assign({},a,{trigger:"manual",touch:!1}),l=Object.assign({},a,{showOnCreate:!0}),u=$e(e,s)
+function c(e){if(e.target&&!i){var r=e.target.closest(o)
+if(r){var a=r.getAttribute("data-tippy-trigger")||t.trigger||ke.trigger
+if(!r._tippy&&!("touchstart"===e.type&&"boolean"==typeof l.touch||"touchstart"!==e.type&&a.indexOf(Ye[e.type])<0)){var s=$e(r,l)
+s&&(n=n.concat(s))}}}}function d(e,t,n,i){void 0===i&&(i=!1),e.addEventListener(t,n,i),r.push({node:e,eventType:t,handler:n,options:i})}return he(u).forEach((function(e){var t=e.destroy,o=e.enable,a=e.disable
+e.destroy=function(e){void 0===e&&(e=!0),e&&n.forEach((function(e){e.destroy()})),n=[],r.forEach((function(e){var t=e.node,r=e.eventType,n=e.handler,i=e.options
+t.removeEventListener(r,n,i)})),r=[],t()},e.enable=function(){o(),n.forEach((function(e){return e.enable()})),i=!1},e.disable=function(){a(),n.forEach((function(e){return e.disable()})),i=!0},function(e){var t=e.reference
+d(t,"touchstart",c,ae),d(t,"mouseover",c),d(t,"focusin",c),d(t,"click",c)}(e)})),u}var Je={name:"animateFill",defaultValue:!1,fn:function(e){var t
+if(!(null==(t=e.props.render)?void 0:t.$$tippy))return{}
+var r=Fe(e.popper),n=r.box,i=r.content,o=e.props.animateFill?function(){var e=ve()
+return e.className="tippy-backdrop",we([e],"hidden"),e}():null
+return{onCreate:function(){o&&(n.insertBefore(o,n.firstElementChild),n.setAttribute("data-animatefill",""),n.style.overflow="hidden",e.setProps({arrow:!1,animation:"shift-away"}))},onMount:function(){if(o){var e=n.style.transitionDuration,t=Number(e.replace("ms",""))
+i.style.transitionDelay=Math.round(t/10)+"ms",o.style.transitionDuration=e,we([o],"visible")}},onShow:function(){o&&(o.style.transitionDuration="0ms")},onHide:function(){o&&we([o],"hidden")}}}},Qe={clientX:0,clientY:0},Xe=[]
+function Ze(e){var t=e.clientX,r=e.clientY
+Qe={clientX:t,clientY:r}}var et={name:"followCursor",defaultValue:!1,fn:function(e){var t=e.reference,r=Ee(e.props.triggerTarget||t),n=!1,i=!1,o=!0,a=e.props
+function s(){return"initial"===e.props.followCursor&&e.state.isVisible}function l(){r.addEventListener("mousemove",d)}function u(){r.removeEventListener("mousemove",d)}function c(){n=!0,e.setProps({getReferenceClientRect:null}),n=!1}function d(r){var n=!r.target||t.contains(r.target),i=e.props.followCursor,o=r.clientX,a=r.clientY,s=t.getBoundingClientRect(),l=o-s.left,u=a-s.top
+!n&&e.props.interactive||e.setProps({getReferenceClientRect:function(){var e=t.getBoundingClientRect(),r=o,n=a
+"initial"===i&&(r=e.left+l,n=e.top+u)
+var s="horizontal"===i?e.top:n,c="vertical"===i?e.right:r,d="horizontal"===i?e.bottom:n,h="vertical"===i?e.left:r
+return{width:c-h,height:d-s,top:s,right:c,bottom:d,left:h}}})}function h(){e.props.followCursor&&(Xe.push({instance:e,doc:r}),function(e){e.addEventListener("mousemove",Ze)}(r))}function f(){0===(Xe=Xe.filter((function(t){return t.instance!==e}))).filter((function(e){return e.doc===r})).length&&function(e){e.removeEventListener("mousemove",Ze)}(r)}return{onCreate:h,onDestroy:f,onBeforeUpdate:function(){a=e.props},onAfterUpdate:function(t,r){var o=r.followCursor
+n||void 0!==o&&a.followCursor!==o&&(f(),o?(h(),!e.state.isMounted||i||s()||l()):(u(),c()))},onMount:function(){e.props.followCursor&&!i&&(o&&(d(Qe),o=!1),s()||l())},onTrigger:function(e,t){be(t)&&(Qe={clientX:t.clientX,clientY:t.clientY}),i="focus"===t.type},onHidden:function(){e.props.followCursor&&(c(),u(),o=!0)}}}},tt={name:"inlinePositioning",defaultValue:!1,fn:function(e){var t,r=e.reference,n=-1,i=!1,o={name:"tippyInlinePositioning",enabled:!0,phase:"afterWrite",fn:function(i){var o=i.state
+e.props.inlinePositioning&&(t!==o.placement&&e.setProps({getReferenceClientRect:function(){return function(e){return function(e,t,r,n){if(r.length<2||null===e)return t
+if(2===r.length&&n>=0&&r[0].left>r[1].right)return r[n]||t
+switch(e){case"top":case"bottom":var i=r[0],o=r[r.length-1],a="top"===e,s=i.top,l=o.bottom,u=a?i.left:o.left,c=a?i.right:o.right
+return{top:s,bottom:l,left:u,right:c,width:c-u,height:l-s}
+case"left":case"right":var d=Math.min.apply(Math,r.map((function(e){return e.left}))),h=Math.max.apply(Math,r.map((function(e){return e.right}))),f=r.filter((function(t){return"left"===e?t.left===d:t.right===h})),p=f[0].top,m=f[f.length-1].bottom
+return{top:p,bottom:m,left:d,right:h,width:h-d,height:m-p}
+default:return t}}(pe(e),r.getBoundingClientRect(),me(r.getClientRects()),n)}(o.placement)}}),t=o.placement)}}
+function a(){var t
+i||(t=function(e,t){var r
+return{popperOptions:Object.assign({},e.popperOptions,{modifiers:[].concat(((null==(r=e.popperOptions)?void 0:r.modifiers)||[]).filter((function(e){return e.name!==t.name})),[t])})}}(e.props,o),i=!0,e.setProps(t),i=!1)}return{onCreate:a,onAfterUpdate:a,onTrigger:function(t,r){if(be(r)){var i=me(e.reference.getClientRects()),o=i.find((function(e){return e.left-2<=r.clientX&&e.right+2>=r.clientX&&e.top-2<=r.clientY&&e.bottom+2>=r.clientY}))
+n=i.indexOf(o)}},onUntrigger:function(){n=-1}}}},rt={name:"sticky",defaultValue:!1,fn:function(e){var t=e.reference,r=e.popper
+function n(t){return!0===e.props.sticky||e.props.sticky===t}var i=null,o=null
+function a(){var s=n("reference")?(e.popperInstance?e.popperInstance.state.elements.reference:t).getBoundingClientRect():null,l=n("popper")?r.getBoundingClientRect():null;(s&&nt(i,s)||l&&nt(o,l))&&e.popperInstance&&e.popperInstance.update(),i=s,o=l,e.state.isMounted&&requestAnimationFrame(a)}return{onMount:function(){e.props.sticky&&a()}}}}
+function nt(e,t){return!e||!t||e.top!==t.top||e.right!==t.right||e.bottom!==t.bottom||e.left!==t.left}$e.setDefaultProps({render:ze}),t.default=$e},function(e,t,r){"use strict"
+r.r(t),r.d(t,"schemeCategory10",(function(){return i})),r.d(t,"schemeAccent",(function(){return o})),r.d(t,"schemeDark2",(function(){return a})),r.d(t,"schemePaired",(function(){return s})),r.d(t,"schemePastel1",(function(){return l})),r.d(t,"schemePastel2",(function(){return u})),r.d(t,"schemeSet1",(function(){return c})),r.d(t,"schemeSet2",(function(){return d})),r.d(t,"schemeSet3",(function(){return h})),r.d(t,"schemeTableau10",(function(){return f})),r.d(t,"interpolateBrBG",(function(){return g})),r.d(t,"schemeBrBG",(function(){return v})),r.d(t,"interpolatePRGn",(function(){return y})),r.d(t,"schemePRGn",(function(){return b})),r.d(t,"interpolatePiYG",(function(){return w})),r.d(t,"schemePiYG",(function(){return _})),r.d(t,"interpolatePuOr",(function(){return x})),r.d(t,"schemePuOr",(function(){return E})),r.d(t,"interpolateRdBu",(function(){return S})),r.d(t,"schemeRdBu",(function(){return O})),r.d(t,"interpolateRdGy",(function(){return M})),r.d(t,"schemeRdGy",(function(){return T})),r.d(t,"interpolateRdYlBu",(function(){return P})),r.d(t,"schemeRdYlBu",(function(){return A})),r.d(t,"interpolateRdYlGn",(function(){return k})),r.d(t,"schemeRdYlGn",(function(){return C})),r.d(t,"interpolateSpectral",(function(){return j})),r.d(t,"schemeSpectral",(function(){return R})),r.d(t,"interpolateBuGn",(function(){return N})),r.d(t,"schemeBuGn",(function(){return D})),r.d(t,"interpolateBuPu",(function(){return L})),r.d(t,"schemeBuPu",(function(){return I})),r.d(t,"interpolateGnBu",(function(){return z})),r.d(t,"schemeGnBu",(function(){return F})),r.d(t,"interpolateOrRd",(function(){return H})),r.d(t,"schemeOrRd",(function(){return U})),r.d(t,"interpolatePuBuGn",(function(){return V})),r.d(t,"schemePuBuGn",(function(){return B})),r.d(t,"interpolatePuBu",(function(){return q})),r.d(t,"schemePuBu",(function(){return $})),r.d(t,"interpolatePuRd",(function(){return G})),r.d(t,"schemePuRd",(function(){return W})),r.d(t,"interpolateRdPu",(function(){return K})),r.d(t,"schemeRdPu",(function(){return Y})),r.d(t,"interpolateYlGnBu",(function(){return Q})),r.d(t,"schemeYlGnBu",(function(){return J})),r.d(t,"interpolateYlGn",(function(){return Z})),r.d(t,"schemeYlGn",(function(){return X})),r.d(t,"interpolateYlOrBr",(function(){return te})),r.d(t,"schemeYlOrBr",(function(){return ee})),r.d(t,"interpolateYlOrRd",(function(){return ne})),r.d(t,"schemeYlOrRd",(function(){return re})),r.d(t,"interpolateBlues",(function(){return oe})),r.d(t,"schemeBlues",(function(){return ie})),r.d(t,"interpolateGreens",(function(){return se})),r.d(t,"schemeGreens",(function(){return ae})),r.d(t,"interpolateGreys",(function(){return ue})),r.d(t,"schemeGreys",(function(){return le})),r.d(t,"interpolatePurples",(function(){return de})),r.d(t,"schemePurples",(function(){return ce})),r.d(t,"interpolateReds",(function(){return fe})),r.d(t,"schemeReds",(function(){return he})),r.d(t,"interpolateOranges",(function(){return me})),r.d(t,"schemeOranges",(function(){return pe})),r.d(t,"interpolateCividis",(function(){return ve})),r.d(t,"interpolateCubehelixDefault",(function(){return De})),r.d(t,"interpolateRainbow",(function(){return Fe})),r.d(t,"interpolateWarm",(function(){return Ne})),r.d(t,"interpolateCool",(function(){return Ie})),r.d(t,"interpolateSinebow",(function(){return Be})),r.d(t,"interpolateTurbo",(function(){return Ve})),r.d(t,"interpolateViridis",(function(){return qe})),r.d(t,"interpolateMagma",(function(){return We})),r.d(t,"interpolateInferno",(function(){return Ge})),r.d(t,"interpolatePlasma",(function(){return Ye}))
+var n=function(e){for(var t=e.length/6|0,r=new Array(t),n=0;n<t;)r[n]="#"+e.slice(6*n,6*++n)
+return r},i=n("1f77b4ff7f0e2ca02cd627289467bd8c564be377c27f7f7fbcbd2217becf"),o=n("7fc97fbeaed4fdc086ffff99386cb0f0027fbf5b17666666"),a=n("1b9e77d95f027570b3e7298a66a61ee6ab02a6761d666666"),s=n("a6cee31f78b4b2df8a33a02cfb9a99e31a1cfdbf6fff7f00cab2d66a3d9affff99b15928"),l=n("fbb4aeb3cde3ccebc5decbe4fed9a6ffffcce5d8bdfddaecf2f2f2"),u=n("b3e2cdfdcdaccbd5e8f4cae4e6f5c9fff2aef1e2cccccccc"),c=n("e41a1c377eb84daf4a984ea3ff7f00ffff33a65628f781bf999999"),d=n("66c2a5fc8d628da0cbe78ac3a6d854ffd92fe5c494b3b3b3"),h=n("8dd3c7ffffb3bebadafb807280b1d3fdb462b3de69fccde5d9d9d9bc80bdccebc5ffed6f"),f=n("4e79a7f28e2ce1575976b7b259a14fedc949af7aa1ff9da79c755fbab0ab"),p=r(35),m=e=>Object(p.b)(e[e.length-1]),v=new Array(3).concat("d8b365f5f5f55ab4ac","a6611adfc27d80cdc1018571","a6611adfc27df5f5f580cdc1018571","8c510ad8b365f6e8c3c7eae55ab4ac01665e","8c510ad8b365f6e8c3f5f5f5c7eae55ab4ac01665e","8c510abf812ddfc27df6e8c3c7eae580cdc135978f01665e","8c510abf812ddfc27df6e8c3f5f5f5c7eae580cdc135978f01665e","5430058c510abf812ddfc27df6e8c3c7eae580cdc135978f01665e003c30","5430058c510abf812ddfc27df6e8c3f5f5f5c7eae580cdc135978f01665e003c30").map(n),g=m(v),b=new Array(3).concat("af8dc3f7f7f77fbf7b","7b3294c2a5cfa6dba0008837","7b3294c2a5cff7f7f7a6dba0008837","762a83af8dc3e7d4e8d9f0d37fbf7b1b7837","762a83af8dc3e7d4e8f7f7f7d9f0d37fbf7b1b7837","762a839970abc2a5cfe7d4e8d9f0d3a6dba05aae611b7837","762a839970abc2a5cfe7d4e8f7f7f7d9f0d3a6dba05aae611b7837","40004b762a839970abc2a5cfe7d4e8d9f0d3a6dba05aae611b783700441b","40004b762a839970abc2a5cfe7d4e8f7f7f7d9f0d3a6dba05aae611b783700441b").map(n),y=m(b),_=new Array(3).concat("e9a3c9f7f7f7a1d76a","d01c8bf1b6dab8e1864dac26","d01c8bf1b6daf7f7f7b8e1864dac26","c51b7de9a3c9fde0efe6f5d0a1d76a4d9221","c51b7de9a3c9fde0eff7f7f7e6f5d0a1d76a4d9221","c51b7dde77aef1b6dafde0efe6f5d0b8e1867fbc414d9221","c51b7dde77aef1b6dafde0eff7f7f7e6f5d0b8e1867fbc414d9221","8e0152c51b7dde77aef1b6dafde0efe6f5d0b8e1867fbc414d9221276419","8e0152c51b7dde77aef1b6dafde0eff7f7f7e6f5d0b8e1867fbc414d9221276419").map(n),w=m(_),E=new Array(3).concat("998ec3f7f7f7f1a340","5e3c99b2abd2fdb863e66101","5e3c99b2abd2f7f7f7fdb863e66101","542788998ec3d8daebfee0b6f1a340b35806","542788998ec3d8daebf7f7f7fee0b6f1a340b35806","5427888073acb2abd2d8daebfee0b6fdb863e08214b35806","5427888073acb2abd2d8daebf7f7f7fee0b6fdb863e08214b35806","2d004b5427888073acb2abd2d8daebfee0b6fdb863e08214b358067f3b08","2d004b5427888073acb2abd2d8daebf7f7f7fee0b6fdb863e08214b358067f3b08").map(n),x=m(E),O=new Array(3).concat("ef8a62f7f7f767a9cf","ca0020f4a58292c5de0571b0","ca0020f4a582f7f7f792c5de0571b0","b2182bef8a62fddbc7d1e5f067a9cf2166ac","b2182bef8a62fddbc7f7f7f7d1e5f067a9cf2166ac","b2182bd6604df4a582fddbc7d1e5f092c5de4393c32166ac","b2182bd6604df4a582fddbc7f7f7f7d1e5f092c5de4393c32166ac","67001fb2182bd6604df4a582fddbc7d1e5f092c5de4393c32166ac053061","67001fb2182bd6604df4a582fddbc7f7f7f7d1e5f092c5de4393c32166ac053061").map(n),S=m(O),T=new Array(3).concat("ef8a62ffffff999999","ca0020f4a582bababa404040","ca0020f4a582ffffffbababa404040","b2182bef8a62fddbc7e0e0e09999994d4d4d","b2182bef8a62fddbc7ffffffe0e0e09999994d4d4d","b2182bd6604df4a582fddbc7e0e0e0bababa8787874d4d4d","b2182bd6604df4a582fddbc7ffffffe0e0e0bababa8787874d4d4d","67001fb2182bd6604df4a582fddbc7e0e0e0bababa8787874d4d4d1a1a1a","67001fb2182bd6604df4a582fddbc7ffffffe0e0e0bababa8787874d4d4d1a1a1a").map(n),M=m(T),A=new Array(3).concat("fc8d59ffffbf91bfdb","d7191cfdae61abd9e92c7bb6","d7191cfdae61ffffbfabd9e92c7bb6","d73027fc8d59fee090e0f3f891bfdb4575b4","d73027fc8d59fee090ffffbfe0f3f891bfdb4575b4","d73027f46d43fdae61fee090e0f3f8abd9e974add14575b4","d73027f46d43fdae61fee090ffffbfe0f3f8abd9e974add14575b4","a50026d73027f46d43fdae61fee090e0f3f8abd9e974add14575b4313695","a50026d73027f46d43fdae61fee090ffffbfe0f3f8abd9e974add14575b4313695").map(n),P=m(A),C=new Array(3).concat("fc8d59ffffbf91cf60","d7191cfdae61a6d96a1a9641","d7191cfdae61ffffbfa6d96a1a9641","d73027fc8d59fee08bd9ef8b91cf601a9850","d73027fc8d59fee08bffffbfd9ef8b91cf601a9850","d73027f46d43fdae61fee08bd9ef8ba6d96a66bd631a9850","d73027f46d43fdae61fee08bffffbfd9ef8ba6d96a66bd631a9850","a50026d73027f46d43fdae61fee08bd9ef8ba6d96a66bd631a9850006837","a50026d73027f46d43fdae61fee08bffffbfd9ef8ba6d96a66bd631a9850006837").map(n),k=m(C),R=new Array(3).concat("fc8d59ffffbf99d594","d7191cfdae61abdda42b83ba","d7191cfdae61ffffbfabdda42b83ba","d53e4ffc8d59fee08be6f59899d5943288bd","d53e4ffc8d59fee08bffffbfe6f59899d5943288bd","d53e4ff46d43fdae61fee08be6f598abdda466c2a53288bd","d53e4ff46d43fdae61fee08bffffbfe6f598abdda466c2a53288bd","9e0142d53e4ff46d43fdae61fee08be6f598abdda466c2a53288bd5e4fa2","9e0142d53e4ff46d43fdae61fee08bffffbfe6f598abdda466c2a53288bd5e4fa2").map(n),j=m(R),D=new Array(3).concat("e5f5f999d8c92ca25f","edf8fbb2e2e266c2a4238b45","edf8fbb2e2e266c2a42ca25f006d2c","edf8fbccece699d8c966c2a42ca25f006d2c","edf8fbccece699d8c966c2a441ae76238b45005824","f7fcfde5f5f9ccece699d8c966c2a441ae76238b45005824","f7fcfde5f5f9ccece699d8c966c2a441ae76238b45006d2c00441b").map(n),N=m(D),I=new Array(3).concat("e0ecf49ebcda8856a7","edf8fbb3cde38c96c688419d","edf8fbb3cde38c96c68856a7810f7c","edf8fbbfd3e69ebcda8c96c68856a7810f7c","edf8fbbfd3e69ebcda8c96c68c6bb188419d6e016b","f7fcfde0ecf4bfd3e69ebcda8c96c68c6bb188419d6e016b","f7fcfde0ecf4bfd3e69ebcda8c96c68c6bb188419d810f7c4d004b").map(n),L=m(I),F=new Array(3).concat("e0f3dba8ddb543a2ca","f0f9e8bae4bc7bccc42b8cbe","f0f9e8bae4bc7bccc443a2ca0868ac","f0f9e8ccebc5a8ddb57bccc443a2ca0868ac","f0f9e8ccebc5a8ddb57bccc44eb3d32b8cbe08589e","f7fcf0e0f3dbccebc5a8ddb57bccc44eb3d32b8cbe08589e","f7fcf0e0f3dbccebc5a8ddb57bccc44eb3d32b8cbe0868ac084081").map(n),z=m(F),U=new Array(3).concat("fee8c8fdbb84e34a33","fef0d9fdcc8afc8d59d7301f","fef0d9fdcc8afc8d59e34a33b30000","fef0d9fdd49efdbb84fc8d59e34a33b30000","fef0d9fdd49efdbb84fc8d59ef6548d7301f990000","fff7ecfee8c8fdd49efdbb84fc8d59ef6548d7301f990000","fff7ecfee8c8fdd49efdbb84fc8d59ef6548d7301fb300007f0000").map(n),H=m(U),B=new Array(3).concat("ece2f0a6bddb1c9099","f6eff7bdc9e167a9cf02818a","f6eff7bdc9e167a9cf1c9099016c59","f6eff7d0d1e6a6bddb67a9cf1c9099016c59","f6eff7d0d1e6a6bddb67a9cf3690c002818a016450","fff7fbece2f0d0d1e6a6bddb67a9cf3690c002818a016450","fff7fbece2f0d0d1e6a6bddb67a9cf3690c002818a016c59014636").map(n),V=m(B),$=new Array(3).concat("ece7f2a6bddb2b8cbe","f1eef6bdc9e174a9cf0570b0","f1eef6bdc9e174a9cf2b8cbe045a8d","f1eef6d0d1e6a6bddb74a9cf2b8cbe045a8d","f1eef6d0d1e6a6bddb74a9cf3690c00570b0034e7b","fff7fbece7f2d0d1e6a6bddb74a9cf3690c00570b0034e7b","fff7fbece7f2d0d1e6a6bddb74a9cf3690c00570b0045a8d023858").map(n),q=m($),W=new Array(3).concat("e7e1efc994c7dd1c77","f1eef6d7b5d8df65b0ce1256","f1eef6d7b5d8df65b0dd1c77980043","f1eef6d4b9dac994c7df65b0dd1c77980043","f1eef6d4b9dac994c7df65b0e7298ace125691003f","f7f4f9e7e1efd4b9dac994c7df65b0e7298ace125691003f","f7f4f9e7e1efd4b9dac994c7df65b0e7298ace125698004367001f").map(n),G=m(W),Y=new Array(3).concat("fde0ddfa9fb5c51b8a","feebe2fbb4b9f768a1ae017e","feebe2fbb4b9f768a1c51b8a7a0177","feebe2fcc5c0fa9fb5f768a1c51b8a7a0177","feebe2fcc5c0fa9fb5f768a1dd3497ae017e7a0177","fff7f3fde0ddfcc5c0fa9fb5f768a1dd3497ae017e7a0177","fff7f3fde0ddfcc5c0fa9fb5f768a1dd3497ae017e7a017749006a").map(n),K=m(Y),J=new Array(3).concat("edf8b17fcdbb2c7fb8","ffffcca1dab441b6c4225ea8","ffffcca1dab441b6c42c7fb8253494","ffffccc7e9b47fcdbb41b6c42c7fb8253494","ffffccc7e9b47fcdbb41b6c41d91c0225ea80c2c84","ffffd9edf8b1c7e9b47fcdbb41b6c41d91c0225ea80c2c84","ffffd9edf8b1c7e9b47fcdbb41b6c41d91c0225ea8253494081d58").map(n),Q=m(J),X=new Array(3).concat("f7fcb9addd8e31a354","ffffccc2e69978c679238443","ffffccc2e69978c67931a354006837","ffffccd9f0a3addd8e78c67931a354006837","ffffccd9f0a3addd8e78c67941ab5d238443005a32","ffffe5f7fcb9d9f0a3addd8e78c67941ab5d238443005a32","ffffe5f7fcb9d9f0a3addd8e78c67941ab5d238443006837004529").map(n),Z=m(X),ee=new Array(3).concat("fff7bcfec44fd95f0e","ffffd4fed98efe9929cc4c02","ffffd4fed98efe9929d95f0e993404","ffffd4fee391fec44ffe9929d95f0e993404","ffffd4fee391fec44ffe9929ec7014cc4c028c2d04","ffffe5fff7bcfee391fec44ffe9929ec7014cc4c028c2d04","ffffe5fff7bcfee391fec44ffe9929ec7014cc4c02993404662506").map(n),te=m(ee),re=new Array(3).concat("ffeda0feb24cf03b20","ffffb2fecc5cfd8d3ce31a1c","ffffb2fecc5cfd8d3cf03b20bd0026","ffffb2fed976feb24cfd8d3cf03b20bd0026","ffffb2fed976feb24cfd8d3cfc4e2ae31a1cb10026","ffffccffeda0fed976feb24cfd8d3cfc4e2ae31a1cb10026","ffffccffeda0fed976feb24cfd8d3cfc4e2ae31a1cbd0026800026").map(n),ne=m(re),ie=new Array(3).concat("deebf79ecae13182bd","eff3ffbdd7e76baed62171b5","eff3ffbdd7e76baed63182bd08519c","eff3ffc6dbef9ecae16baed63182bd08519c","eff3ffc6dbef9ecae16baed64292c62171b5084594","f7fbffdeebf7c6dbef9ecae16baed64292c62171b5084594","f7fbffdeebf7c6dbef9ecae16baed64292c62171b508519c08306b").map(n),oe=m(ie),ae=new Array(3).concat("e5f5e0a1d99b31a354","edf8e9bae4b374c476238b45","edf8e9bae4b374c47631a354006d2c","edf8e9c7e9c0a1d99b74c47631a354006d2c","edf8e9c7e9c0a1d99b74c47641ab5d238b45005a32","f7fcf5e5f5e0c7e9c0a1d99b74c47641ab5d238b45005a32","f7fcf5e5f5e0c7e9c0a1d99b74c47641ab5d238b45006d2c00441b").map(n),se=m(ae),le=new Array(3).concat("f0f0f0bdbdbd636363","f7f7f7cccccc969696525252","f7f7f7cccccc969696636363252525","f7f7f7d9d9d9bdbdbd969696636363252525","f7f7f7d9d9d9bdbdbd969696737373525252252525","fffffff0f0f0d9d9d9bdbdbd969696737373525252252525","fffffff0f0f0d9d9d9bdbdbd969696737373525252252525000000").map(n),ue=m(le),ce=new Array(3).concat("efedf5bcbddc756bb1","f2f0f7cbc9e29e9ac86a51a3","f2f0f7cbc9e29e9ac8756bb154278f","f2f0f7dadaebbcbddc9e9ac8756bb154278f","f2f0f7dadaebbcbddc9e9ac8807dba6a51a34a1486","fcfbfdefedf5dadaebbcbddc9e9ac8807dba6a51a34a1486","fcfbfdefedf5dadaebbcbddc9e9ac8807dba6a51a354278f3f007d").map(n),de=m(ce),he=new Array(3).concat("fee0d2fc9272de2d26","fee5d9fcae91fb6a4acb181d","fee5d9fcae91fb6a4ade2d26a50f15","fee5d9fcbba1fc9272fb6a4ade2d26a50f15","fee5d9fcbba1fc9272fb6a4aef3b2ccb181d99000d","fff5f0fee0d2fcbba1fc9272fb6a4aef3b2ccb181d99000d","fff5f0fee0d2fcbba1fc9272fb6a4aef3b2ccb181da50f1567000d").map(n),fe=m(he),pe=new Array(3).concat("fee6cefdae6be6550d","feeddefdbe85fd8d3cd94701","feeddefdbe85fd8d3ce6550da63603","feeddefdd0a2fdae6bfd8d3ce6550da63603","feeddefdd0a2fdae6bfd8d3cf16913d948018c2d04","fff5ebfee6cefdd0a2fdae6bfd8d3cf16913d948018c2d04","fff5ebfee6cefdd0a2fdae6bfd8d3cf16913d94801a636037f2704").map(n),me=m(pe),ve=function(e){return e=Math.max(0,Math.min(1,e)),"rgb("+Math.max(0,Math.min(255,Math.round(-4.54-e*(35.34-e*(2381.73-e*(6402.7-e*(7024.72-2710.57*e)))))))+", "+Math.max(0,Math.min(255,Math.round(32.49+e*(170.73+e*(52.82-e*(131.46-e*(176.58-67.37*e)))))))+", "+Math.max(0,Math.min(255,Math.round(81.24+e*(442.36-e*(2482.43-e*(6167.24-e*(6614.94-2475.67*e)))))))+")"},ge=r(7),be=r(9)
+const ye=Math.PI/180,_e=180/Math.PI
+var we=1.78277,Ee=-.29227,xe=-.90649,Oe=1.97294,Se=Oe*xe,Te=Oe*we,Me=we*Ee- -.14861*xe
+function Ae(e){if(e instanceof Ce)return new Ce(e.h,e.s,e.l,e.opacity)
+e instanceof be.b||(e=Object(be.g)(e))
+var t=e.r/255,r=e.g/255,n=e.b/255,i=(Me*n+Se*t-Te*r)/(Me+Se-Te),o=n-i,a=(Oe*(r-i)-Ee*o)/xe,s=Math.sqrt(a*a+o*o)/(Oe*i*(1-i)),l=s?Math.atan2(a,o)*_e-120:NaN
+return new Ce(l<0?l+360:l,s,i,e.opacity)}function Pe(e,t,r,n){return 1===arguments.length?Ae(e):new Ce(e,t,r,null==n?1:n)}function Ce(e,t,r,n){this.h=+e,this.s=+t,this.l=+r,this.opacity=+n}Object(ge.a)(Ce,Pe,Object(ge.b)(be.a,{brighter:function(e){return e=null==e?be.c:Math.pow(be.c,e),new Ce(this.h,this.s,this.l*e,this.opacity)},darker:function(e){return e=null==e?be.d:Math.pow(be.d,e),new Ce(this.h,this.s,this.l*e,this.opacity)},rgb:function(){var e=isNaN(this.h)?0:(this.h+120)*ye,t=+this.l,r=isNaN(this.s)?0:this.s*t*(1-t),n=Math.cos(e),i=Math.sin(e)
+return new be.b(255*(t+r*(-.14861*n+we*i)),255*(t+r*(Ee*n+xe*i)),255*(t+r*(Oe*n)),this.opacity)}}))
+var ke=r(8)
+function Re(e){return function t(r){function n(t,n){var i=e((t=Pe(t)).h,(n=Pe(n)).h),o=Object(ke.a)(t.s,n.s),a=Object(ke.a)(t.l,n.l),s=Object(ke.a)(t.opacity,n.opacity)
+return function(e){return t.h=i(e),t.s=o(e),t.l=a(Math.pow(e,r)),t.opacity=s(e),t+""}}return r=+r,n.gamma=t,n}(1)}Re(ke.c)
+var je=Re(ke.a),De=je(Pe(300,.5,0),Pe(-240,.5,1)),Ne=je(Pe(-100,.75,.35),Pe(80,1.5,.8)),Ie=je(Pe(260,.75,.35),Pe(80,1.5,.8)),Le=Pe(),Fe=function(e){(e<0||e>1)&&(e-=Math.floor(e))
+var t=Math.abs(e-.5)
+return Le.h=360*e-100,Le.s=1.5-1.5*t,Le.l=.8-.9*t,Le+""},ze=Object(be.f)(),Ue=Math.PI/3,He=2*Math.PI/3,Be=function(e){var t
+return e=(.5-e)*Math.PI,ze.r=255*(t=Math.sin(e))*t,ze.g=255*(t=Math.sin(e+Ue))*t,ze.b=255*(t=Math.sin(e+He))*t,ze+""},Ve=function(e){return e=Math.max(0,Math.min(1,e)),"rgb("+Math.max(0,Math.min(255,Math.round(34.61+e*(1172.33-e*(10793.56-e*(33300.12-e*(38394.49-14825.05*e)))))))+", "+Math.max(0,Math.min(255,Math.round(23.31+e*(557.33+e*(1225.33-e*(3574.96-e*(1073.77+707.56*e)))))))+", "+Math.max(0,Math.min(255,Math.round(27.2+e*(3211.1-e*(15327.97-e*(27814-e*(22569.18-6838.66*e)))))))+")"}
+function $e(e){var t=e.length
+return function(r){return e[Math.max(0,Math.min(t-1,Math.floor(r*t)))]}}var qe=$e(n("44015444025645045745055946075a46085c460a5d460b5e470d60470e6147106347116447136548146748166848176948186a481a6c481b6d481c6e481d6f481f70482071482173482374482475482576482677482878482979472a7a472c7a472d7b472e7c472f7d46307e46327e46337f463480453581453781453882443983443a83443b84433d84433e85423f854240864241864142874144874045884046883f47883f48893e49893e4a893e4c8a3d4d8a3d4e8a3c4f8a3c508b3b518b3b528b3a538b3a548c39558c39568c38588c38598c375a8c375b8d365c8d365d8d355e8d355f8d34608d34618d33628d33638d32648e32658e31668e31678e31688e30698e306a8e2f6b8e2f6c8e2e6d8e2e6e8e2e6f8e2d708e2d718e2c718e2c728e2c738e2b748e2b758e2a768e2a778e2a788e29798e297a8e297b8e287c8e287d8e277e8e277f8e27808e26818e26828e26828e25838e25848e25858e24868e24878e23888e23898e238a8d228b8d228c8d228d8d218e8d218f8d21908d21918c20928c20928c20938c1f948c1f958b1f968b1f978b1f988b1f998a1f9a8a1e9b8a1e9c891e9d891f9e891f9f881fa0881fa1881fa1871fa28720a38620a48621a58521a68522a78522a88423a98324aa8325ab8225ac8226ad8127ad8128ae8029af7f2ab07f2cb17e2db27d2eb37c2fb47c31b57b32b67a34b67935b77937b87838b9773aba763bbb753dbc743fbc7340bd7242be7144bf7046c06f48c16e4ac16d4cc26c4ec36b50c46a52c56954c56856c66758c7655ac8645cc8635ec96260ca6063cb5f65cb5e67cc5c69cd5b6ccd5a6ece5870cf5773d05675d05477d1537ad1517cd2507fd34e81d34d84d44b86d54989d5488bd6468ed64590d74393d74195d84098d83e9bd93c9dd93ba0da39a2da37a5db36a8db34aadc32addc30b0dd2fb2dd2db5de2bb8de29bade28bddf26c0df25c2df23c5e021c8e020cae11fcde11dd0e11cd2e21bd5e21ad8e219dae319dde318dfe318e2e418e5e419e7e419eae51aece51befe51cf1e51df4e61ef6e620f8e621fbe723fde725")),We=$e(n("00000401000501010601010802010902020b02020d03030f03031204041405041606051806051a07061c08071e0907200a08220b09240c09260d0a290e0b2b100b2d110c2f120d31130d34140e36150e38160f3b180f3d19103f1a10421c10441d11471e114920114b21114e22115024125325125527125829115a2a115c2c115f2d11612f116331116533106734106936106b38106c390f6e3b0f703d0f713f0f72400f74420f75440f764510774710784910784a10794c117a4e117b4f127b51127c52137c54137d56147d57157e59157e5a167e5c167f5d177f5f187f601880621980641a80651a80671b80681c816a1c816b1d816d1d816e1e81701f81721f817320817521817621817822817922827b23827c23827e24828025828125818326818426818627818827818928818b29818c29818e2a81902a81912b81932b80942c80962c80982d80992d809b2e7f9c2e7f9e2f7fa02f7fa1307ea3307ea5317ea6317da8327daa337dab337cad347cae347bb0357bb2357bb3367ab5367ab73779b83779ba3878bc3978bd3977bf3a77c03a76c23b75c43c75c53c74c73d73c83e73ca3e72cc3f71cd4071cf4070d0416fd2426fd3436ed5446dd6456cd8456cd9466bdb476adc4869de4968df4a68e04c67e24d66e34e65e44f64e55064e75263e85362e95462ea5661eb5760ec5860ed5a5fee5b5eef5d5ef05f5ef1605df2625df2645cf3655cf4675cf4695cf56b5cf66c5cf66e5cf7705cf7725cf8745cf8765cf9785df9795df97b5dfa7d5efa7f5efa815ffb835ffb8560fb8761fc8961fc8a62fc8c63fc8e64fc9065fd9266fd9467fd9668fd9869fd9a6afd9b6bfe9d6cfe9f6dfea16efea36ffea571fea772fea973feaa74feac76feae77feb078feb27afeb47bfeb67cfeb77efeb97ffebb81febd82febf84fec185fec287fec488fec68afec88cfeca8dfecc8ffecd90fecf92fed194fed395fed597fed799fed89afdda9cfddc9efddea0fde0a1fde2a3fde3a5fde5a7fde7a9fde9aafdebacfcecaefceeb0fcf0b2fcf2b4fcf4b6fcf6b8fcf7b9fcf9bbfcfbbdfcfdbf")),Ge=$e(n("00000401000501010601010802010a02020c02020e03021004031204031405041706041907051b08051d09061f0a07220b07240c08260d08290e092b10092d110a30120a32140b34150b37160b39180c3c190c3e1b0c411c0c431e0c451f0c48210c4a230c4c240c4f260c51280b53290b552b0b572d0b592f0a5b310a5c320a5e340a5f3609613809623909633b09643d09653e0966400a67420a68440a68450a69470b6a490b6a4a0c6b4c0c6b4d0d6c4f0d6c510e6c520e6d540f6d550f6d57106e59106e5a116e5c126e5d126e5f136e61136e62146e64156e65156e67166e69166e6a176e6c186e6d186e6f196e71196e721a6e741a6e751b6e771c6d781c6d7a1d6d7c1d6d7d1e6d7f1e6c801f6c82206c84206b85216b87216b88226a8a226a8c23698d23698f24699025689225689326679526679727669827669a28659b29649d29649f2a63a02a63a22b62a32c61a52c60a62d60a82e5fa92e5eab2f5ead305dae305cb0315bb1325ab3325ab43359b63458b73557b93556ba3655bc3754bd3853bf3952c03a51c13a50c33b4fc43c4ec63d4dc73e4cc83f4bca404acb4149cc4248ce4347cf4446d04545d24644d34743d44842d54a41d74b3fd84c3ed94d3dda4e3cdb503bdd513ade5238df5337e05536e15635e25734e35933e45a31e55c30e65d2fe75e2ee8602de9612bea632aeb6429eb6628ec6726ed6925ee6a24ef6c23ef6e21f06f20f1711ff1731df2741cf3761bf37819f47918f57b17f57d15f67e14f68013f78212f78410f8850ff8870ef8890cf98b0bf98c0af98e09fa9008fa9207fa9407fb9606fb9706fb9906fb9b06fb9d07fc9f07fca108fca309fca50afca60cfca80dfcaa0ffcac11fcae12fcb014fcb216fcb418fbb61afbb81dfbba1ffbbc21fbbe23fac026fac228fac42afac62df9c72ff9c932f9cb35f8cd37f8cf3af7d13df7d340f6d543f6d746f5d949f5db4cf4dd4ff4df53f4e156f3e35af3e55df2e661f2e865f2ea69f1ec6df1ed71f1ef75f1f179f2f27df2f482f3f586f3f68af4f88ef5f992f6fa96f8fb9af9fc9dfafda1fcffa4")),Ye=$e(n("0d088710078813078916078a19068c1b068d1d068e20068f2206902406912605912805922a05932c05942e05952f059631059733059735049837049938049a3a049a3c049b3e049c3f049c41049d43039e44039e46039f48039f4903a04b03a14c02a14e02a25002a25102a35302a35502a45601a45801a45901a55b01a55c01a65e01a66001a66100a76300a76400a76600a76700a86900a86a00a86c00a86e00a86f00a87100a87201a87401a87501a87701a87801a87a02a87b02a87d03a87e03a88004a88104a78305a78405a78606a68707a68808a68a09a58b0aa58d0ba58e0ca48f0da4910ea3920fa39410a29511a19613a19814a099159f9a169f9c179e9d189d9e199da01a9ca11b9ba21d9aa31e9aa51f99a62098a72197a82296aa2395ab2494ac2694ad2793ae2892b02991b12a90b22b8fb32c8eb42e8db52f8cb6308bb7318ab83289ba3388bb3488bc3587bd3786be3885bf3984c03a83c13b82c23c81c33d80c43e7fc5407ec6417dc7427cc8437bc9447aca457acb4679cc4778cc4977cd4a76ce4b75cf4c74d04d73d14e72d24f71d35171d45270d5536fd5546ed6556dd7566cd8576bd9586ada5a6ada5b69db5c68dc5d67dd5e66de5f65de6164df6263e06363e16462e26561e26660e3685fe4695ee56a5de56b5de66c5ce76e5be76f5ae87059e97158e97257ea7457eb7556eb7655ec7754ed7953ed7a52ee7b51ef7c51ef7e50f07f4ff0804ef1814df1834cf2844bf3854bf3874af48849f48948f58b47f58c46f68d45f68f44f79044f79143f79342f89441f89540f9973ff9983ef99a3efa9b3dfa9c3cfa9e3bfb9f3afba139fba238fca338fca537fca636fca835fca934fdab33fdac33fdae32fdaf31fdb130fdb22ffdb42ffdb52efeb72dfeb82cfeba2cfebb2bfebd2afebe2afec029fdc229fdc328fdc527fdc627fdc827fdca26fdcb26fccd25fcce25fcd025fcd225fbd324fbd524fbd724fad824fada24f9dc24f9dd25f8df25f8e125f7e225f7e425f6e626f6e826f5e926f5eb27f4ed27f3ee27f3f027f2f227f1f426f1f525f0f724f0f921"))},function(e,t,r){"use strict"
+r.r(t),r.d(t,"PART_TYPE",(function(){return u})),r.d(t,"isFormatXMLElementFn",(function(){return p})),r.d(t,"formatToParts",(function(){return m})),r.d(t,"IntlMessageFormat",(function(){return b})),r.d(t,"ErrorCode",(function(){return n})),r.d(t,"FormatError",(function(){return c})),r.d(t,"InvalidValueError",(function(){return d})),r.d(t,"InvalidValueTypeError",(function(){return h})),r.d(t,"MissingValueError",(function(){return f}))
+var n,i=r(0),o=r(27),a=r(28),s=r.n(a),l=r(2)
+!function(e){e.MISSING_VALUE="MISSING_VALUE",e.INVALID_VALUE="INVALID_VALUE",e.MISSING_INTL_API="MISSING_INTL_API"}(n||(n={}))
+var u,c=function(e){function t(t,r,n){var i=e.call(this,t)||this
+return i.code=r,i.originalMessage=n,i}return Object(i.b)(t,e),t.prototype.toString=function(){return"[formatjs Error: "+this.code+"] "+this.message},t}(Error),d=function(e){function t(t,r,i,o){return e.call(this,'Invalid values for "'+t+'": "'+r+'". Options are "'+Object.keys(i).join('", "')+'"',n.INVALID_VALUE,o)||this}return Object(i.b)(t,e),t}(c),h=function(e){function t(t,r,i){return e.call(this,'Value for "'+t+'" must be of type '+r,n.INVALID_VALUE,i)||this}return Object(i.b)(t,e),t}(c),f=function(e){function t(t,r){return e.call(this,'The intl string context variable "'+t+'" was not provided to the string "'+r+'"',n.MISSING_VALUE,r)||this}return Object(i.b)(t,e),t}(c)
+function p(e){return"function"==typeof e}function m(e,t,r,i,o,a,s){if(1===e.length&&Object(l.h)(e[0]))return[{type:u.literal,value:e[0].value}]
+for(var v=[],g=0,b=e;g<b.length;g++){var y=b[g]
+if(Object(l.h)(y))v.push({type:u.literal,value:y.value})
+else if(Object(l.l)(y))"number"==typeof a&&v.push({type:u.literal,value:r.getNumberFormat(t).format(a)})
+else{var _=y.value
+if(!o||!(_ in o))throw new f(_,s)
+var w=o[_]
+if(Object(l.e)(y))w&&"string"!=typeof w&&"number"!=typeof w||(w="string"==typeof w||"number"==typeof w?String(w):""),v.push({type:"string"==typeof w?u.literal:u.object,value:w})
+else if(Object(l.f)(y)){var E="string"==typeof y.style?i.date[y.style]:Object(l.g)(y.style)?y.style.parsedOptions:void 0
+v.push({type:u.literal,value:r.getDateTimeFormat(t,E).format(w)})}else if(Object(l.o)(y))E="string"==typeof y.style?i.time[y.style]:Object(l.g)(y.style)?y.style.parsedOptions:void 0,v.push({type:u.literal,value:r.getDateTimeFormat(t,E).format(w)})
+else if(Object(l.i)(y))(E="string"==typeof y.style?i.number[y.style]:Object(l.j)(y.style)?y.style.parsedOptions:void 0)&&E.scale&&(w*=E.scale||1),v.push({type:u.literal,value:r.getNumberFormat(t,E).format(w)})
+else{if(Object(l.n)(y)){var x=y.children,O=y.value,S=o[O]
+if(!p(S))throw new h(O,"function",s)
+var T=S(m(x,t,r,i,o,a).map((function(e){return e.value})))
+Array.isArray(T)||(T=[T]),v.push.apply(v,T.map((function(e){return{type:"string"==typeof e?u.literal:u.object,value:e}})))}if(Object(l.m)(y)){if(!(M=y.options[w]||y.options.other))throw new d(y.value,w,Object.keys(y.options),s)
+v.push.apply(v,m(M.value,t,r,i,o))}else if(Object(l.k)(y)){var M
+if(!(M=y.options["="+w])){if(!Intl.PluralRules)throw new c('Intl.PluralRules is not available in this environment.\nTry polyfilling it using "@formatjs/intl-pluralrules"\n',n.MISSING_INTL_API,s)
+var A=r.getPluralRules(t,{type:y.pluralType}).select(w-(y.offset||0))
+M=y.options[A]||y.options.other}if(!M)throw new d(y.value,w,Object.keys(y.options),s)
+v.push.apply(v,m(M.value,t,r,i,o,w-(y.offset||0)))}}}}return function(e){return e.length<2?e:e.reduce((function(e,t){var r=e[e.length-1]
+return r&&r.type===u.literal&&t.type===u.literal?r.value+=t.value:e.push(t),e}),[])}(v)}function v(e){return{create:function(){return{has:function(t){return t in e},get:function(t){return e[t]},set:function(t,r){e[t]=r}}}}}!function(e){e[e.literal=0]="literal",e[e.object=1]="object"}(u||(u={}))
+var g=s.a||a,b=function(){function e(t,r,n,o){var a,s=this
+if(void 0===r&&(r=e.defaultLocale),this.formatterCache={number:{},dateTime:{},pluralRules:{}},this.format=function(e){var t=s.formatToParts(e)
+if(1===t.length)return t[0].value
+var r=t.reduce((function(e,t){return e.length&&t.type===u.literal&&"string"==typeof e[e.length-1]?e[e.length-1]+=t.value:e.push(t.value),e}),[])
+return r.length<=1?r[0]||"":r},this.formatToParts=function(e){return m(s.ast,s.locales,s.formatters,s.formats,e,void 0,s.message)},this.resolvedOptions=function(){return{locale:Intl.NumberFormat.supportedLocalesOf(s.locales)[0]}},this.getAst=function(){return s.ast},"string"==typeof t){if(this.message=t,!e.__parse)throw new TypeError("IntlMessageFormat.__parse must be set to process `message` of type `string`")
+this.ast=e.__parse(t,{normalizeHashtagInPlural:!1,ignoreTag:null==o?void 0:o.ignoreTag})}else this.ast=t
+if(!Array.isArray(this.ast))throw new TypeError("A message must be provided as a String or AST.")
+this.formats=function(e,t){return t?Object.keys(e).reduce((function(r,n){var o,a
+return r[n]=(o=e[n],(a=t[n])?Object(i.a)(Object(i.a)(Object(i.a)({},o||{}),a||{}),Object.keys(o).reduce((function(e,t){return e[t]=Object(i.a)(Object(i.a)({},o[t]),a[t]||{}),e}),{})):o),r}),Object(i.a)({},e)):e}(e.formats,n),this.locales=r,this.formatters=o&&o.formatters||(void 0===(a=this.formatterCache)&&(a={number:{},dateTime:{},pluralRules:{}}),{getNumberFormat:g((function(){for(var e,t=[],r=0;r<arguments.length;r++)t[r]=arguments[r]
+return new((e=Intl.NumberFormat).bind.apply(e,Object(i.c)([void 0],t)))}),{cache:v(a.number),strategy:g.strategies.variadic}),getDateTimeFormat:g((function(){for(var e,t=[],r=0;r<arguments.length;r++)t[r]=arguments[r]
+return new((e=Intl.DateTimeFormat).bind.apply(e,Object(i.c)([void 0],t)))}),{cache:v(a.dateTime),strategy:g.strategies.variadic}),getPluralRules:g((function(){for(var e,t=[],r=0;r<arguments.length;r++)t[r]=arguments[r]
+return new((e=Intl.PluralRules).bind.apply(e,Object(i.c)([void 0],t)))}),{cache:v(a.pluralRules),strategy:g.strategies.variadic})})}return Object.defineProperty(e,"defaultLocale",{get:function(){return e.memoizedDefaultLocale||(e.memoizedDefaultLocale=(new Intl.NumberFormat).resolvedOptions().locale),e.memoizedDefaultLocale},enumerable:!1,configurable:!0}),e.memoizedDefaultLocale=null,e.__parse=o.parse,e.formats={number:{currency:{style:"currency"},percent:{style:"percent"}},date:{short:{month:"numeric",day:"numeric",year:"2-digit"},medium:{month:"short",day:"numeric",year:"numeric"},long:{month:"long",day:"numeric",year:"numeric"},full:{weekday:"long",month:"long",day:"numeric",year:"numeric"}},time:{short:{hour:"numeric",minute:"numeric"},medium:{hour:"numeric",minute:"numeric",second:"numeric"},long:{hour:"numeric",minute:"numeric",second:"numeric",timeZoneName:"short"},full:{hour:"numeric",minute:"numeric",second:"numeric",timeZoneName:"short"}}},e}()
+t.default=b},function(e,t,r){"use strict"
+r.r(t),r.d(t,"CSSResult",(function(){return a})),r.d(t,"adoptStyles",(function(){return u})),r.d(t,"css",(function(){return l})),r.d(t,"getCompatibleStyle",(function(){return c})),r.d(t,"supportsAdoptingStyleSheets",(function(){return n})),r.d(t,"unsafeCSS",(function(){return s})),r.d(t,"ReactiveElement",(function(){return b})),r.d(t,"defaultConverter",(function(){return m})),r.d(t,"notEqual",(function(){return v}))
+
+;/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+const n=window.ShadowRoot&&(void 0===window.ShadyCSS||window.ShadyCSS.nativeShadow)&&"adoptedStyleSheets"in Document.prototype&&"replace"in CSSStyleSheet.prototype,i=Symbol(),o=new Map
+class a{constructor(e,t){if(this._$cssResult$=!0,t!==i)throw Error("CSSResult is not constructable. Use `unsafeCSS` or `css` instead.")
+this.cssText=e}get styleSheet(){let e=o.get(this.cssText)
+return n&&void 0===e&&(o.set(this.cssText,e=new CSSStyleSheet),e.replaceSync(this.cssText)),e}toString(){return this.cssText}}const s=e=>new a("string"==typeof e?e:e+"",i),l=(e,...t)=>{const r=1===e.length?e[0]:t.reduce((t,r,n)=>t+(e=>{if(!0===e._$cssResult$)return e.cssText
+if("number"==typeof e)return e
+throw Error("Value passed to 'css' function must be a 'css' function result: "+e+". Use 'unsafeCSS' to pass non-literal values, but take care to ensure page security.")})(r)+e[n+1],e[0])
+return new a(r,i)},u=(e,t)=>{n?e.adoptedStyleSheets=t.map(e=>e instanceof CSSStyleSheet?e:e.styleSheet):t.forEach(t=>{const r=document.createElement("style"),n=window.litNonce
+void 0!==n&&r.setAttribute("nonce",n),r.textContent=t.cssText,e.appendChild(r)})},c=n?e=>e:e=>e instanceof CSSStyleSheet?(e=>{let t=""
+for(const r of e.cssRules)t+=r.cssText
+return s(t)})(e):e
+/**
+ * @license
+ * Copyright 2017 Google LLC
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+var d
+const h=window.trustedTypes,f=h?h.emptyScript:"",p=window.reactiveElementPolyfillSupport,m={toAttribute(e,t){switch(t){case Boolean:e=e?f:null
+break
+case Object:case Array:e=null==e?e:JSON.stringify(e)}return e},fromAttribute(e,t){let r=e
+switch(t){case Boolean:r=null!==e
+break
+case Number:r=null===e?null:Number(e)
+break
+case Object:case Array:try{r=JSON.parse(e)}catch(e){r=null}}return r}},v=(e,t)=>t!==e&&(t==t||e==e),g={attribute:!0,type:String,converter:m,reflect:!1,hasChanged:v}
+class b extends HTMLElement{constructor(){super(),this._$Et=new Map,this.isUpdatePending=!1,this.hasUpdated=!1,this._$Ei=null,this.o()}static addInitializer(e){var t
+null!==(t=this.l)&&void 0!==t||(this.l=[]),this.l.push(e)}static get observedAttributes(){this.finalize()
+const e=[]
+return this.elementProperties.forEach((t,r)=>{const n=this._$Eh(r,t)
+void 0!==n&&(this._$Eu.set(n,r),e.push(n))}),e}static createProperty(e,t=g){if(t.state&&(t.attribute=!1),this.finalize(),this.elementProperties.set(e,t),!t.noAccessor&&!this.prototype.hasOwnProperty(e)){const r="symbol"==typeof e?Symbol():"__"+e,n=this.getPropertyDescriptor(e,r,t)
+void 0!==n&&Object.defineProperty(this.prototype,e,n)}}static getPropertyDescriptor(e,t,r){return{get(){return this[t]},set(n){const i=this[e]
+this[t]=n,this.requestUpdate(e,i,r)},configurable:!0,enumerable:!0}}static getPropertyOptions(e){return this.elementProperties.get(e)||g}static finalize(){if(this.hasOwnProperty("finalized"))return!1
+this.finalized=!0
+const e=Object.getPrototypeOf(this)
+if(e.finalize(),this.elementProperties=new Map(e.elementProperties),this._$Eu=new Map,this.hasOwnProperty("properties")){const e=this.properties,t=[...Object.getOwnPropertyNames(e),...Object.getOwnPropertySymbols(e)]
+for(const r of t)this.createProperty(r,e[r])}return this.elementStyles=this.finalizeStyles(this.styles),!0}static finalizeStyles(e){const t=[]
+if(Array.isArray(e)){const r=new Set(e.flat(1/0).reverse())
+for(const e of r)t.unshift(c(e))}else void 0!==e&&t.push(c(e))
+return t}static _$Eh(e,t){const r=t.attribute
+return!1===r?void 0:"string"==typeof r?r:"string"==typeof e?e.toLowerCase():void 0}o(){var e
+this._$Ep=new Promise(e=>this.enableUpdating=e),this._$AL=new Map,this._$Em(),this.requestUpdate(),null===(e=this.constructor.l)||void 0===e||e.forEach(e=>e(this))}addController(e){var t,r;(null!==(t=this._$Eg)&&void 0!==t?t:this._$Eg=[]).push(e),void 0!==this.renderRoot&&this.isConnected&&(null===(r=e.hostConnected)||void 0===r||r.call(e))}removeController(e){var t
+null===(t=this._$Eg)||void 0===t||t.splice(this._$Eg.indexOf(e)>>>0,1)}_$Em(){this.constructor.elementProperties.forEach((e,t)=>{this.hasOwnProperty(t)&&(this._$Et.set(t,this[t]),delete this[t])})}createRenderRoot(){var e
+const t=null!==(e=this.shadowRoot)&&void 0!==e?e:this.attachShadow(this.constructor.shadowRootOptions)
+return u(t,this.constructor.elementStyles),t}connectedCallback(){var e
+void 0===this.renderRoot&&(this.renderRoot=this.createRenderRoot()),this.enableUpdating(!0),null===(e=this._$Eg)||void 0===e||e.forEach(e=>{var t
+return null===(t=e.hostConnected)||void 0===t?void 0:t.call(e)})}enableUpdating(e){}disconnectedCallback(){var e
+null===(e=this._$Eg)||void 0===e||e.forEach(e=>{var t
+return null===(t=e.hostDisconnected)||void 0===t?void 0:t.call(e)})}attributeChangedCallback(e,t,r){this._$AK(e,r)}_$ES(e,t,r=g){var n,i
+const o=this.constructor._$Eh(e,r)
+if(void 0!==o&&!0===r.reflect){const a=(null!==(i=null===(n=r.converter)||void 0===n?void 0:n.toAttribute)&&void 0!==i?i:m.toAttribute)(t,r.type)
+this._$Ei=e,null==a?this.removeAttribute(o):this.setAttribute(o,a),this._$Ei=null}}_$AK(e,t){var r,n,i
+const o=this.constructor,a=o._$Eu.get(e)
+if(void 0!==a&&this._$Ei!==a){const e=o.getPropertyOptions(a),s=e.converter,l=null!==(i=null!==(n=null===(r=s)||void 0===r?void 0:r.fromAttribute)&&void 0!==n?n:"function"==typeof s?s:null)&&void 0!==i?i:m.fromAttribute
+this._$Ei=a,this[a]=l(t,e.type),this._$Ei=null}}requestUpdate(e,t,r){let n=!0
+void 0!==e&&(((r=r||this.constructor.getPropertyOptions(e)).hasChanged||v)(this[e],t)?(this._$AL.has(e)||this._$AL.set(e,t),!0===r.reflect&&this._$Ei!==e&&(void 0===this._$E_&&(this._$E_=new Map),this._$E_.set(e,r))):n=!1),!this.isUpdatePending&&n&&(this._$Ep=this._$EC())}async _$EC(){this.isUpdatePending=!0
+try{await this._$Ep}catch(e){Promise.reject(e)}const e=this.scheduleUpdate()
+return null!=e&&await e,!this.isUpdatePending}scheduleUpdate(){return this.performUpdate()}performUpdate(){var e
+if(!this.isUpdatePending)return
+this.hasUpdated,this._$Et&&(this._$Et.forEach((e,t)=>this[t]=e),this._$Et=void 0)
+let t=!1
+const r=this._$AL
+try{t=this.shouldUpdate(r),t?(this.willUpdate(r),null===(e=this._$Eg)||void 0===e||e.forEach(e=>{var t
+return null===(t=e.hostUpdate)||void 0===t?void 0:t.call(e)}),this.update(r)):this._$EU()}catch(e){throw t=!1,this._$EU(),e}t&&this._$AE(r)}willUpdate(e){}_$AE(e){var t
+null===(t=this._$Eg)||void 0===t||t.forEach(e=>{var t
+return null===(t=e.hostUpdated)||void 0===t?void 0:t.call(e)}),this.hasUpdated||(this.hasUpdated=!0,this.firstUpdated(e)),this.updated(e)}_$EU(){this._$AL=new Map,this.isUpdatePending=!1}get updateComplete(){return this.getUpdateComplete()}getUpdateComplete(){return this._$Ep}shouldUpdate(e){return!0}update(e){void 0!==this._$E_&&(this._$E_.forEach((e,t)=>this._$ES(t,this[t],e)),this._$E_=void 0),this._$EU()}updated(e){}firstUpdated(e){}}b.finalized=!0,b.elementProperties=new Map,b.elementStyles=[],b.shadowRootOptions={mode:"open"},null==p||p({ReactiveElement:b}),(null!==(d=globalThis.reactiveElementVersions)&&void 0!==d?d:globalThis.reactiveElementVersions=[]).push("1.2.1")}]])
diff --git a/agent/uiserver/dist/assets/vendor-cf03d69ba4d9fa5934f04dca689d187f.css b/agent/uiserver/dist/assets/vendor-cf03d69ba4d9fa5934f04dca689d187f.css
deleted file mode 100644
index 39bde0e81cbcc..0000000000000
--- a/agent/uiserver/dist/assets/vendor-cf03d69ba4d9fa5934f04dca689d187f.css
+++ /dev/null
@@ -1 +0,0 @@
-.ember-basic-dropdown,.ember-basic-dropdown-content,.ember-basic-dropdown-content *,.ember-power-select-dropdown *{box-sizing:border-box}.ember-power-select-trigger,.ember-power-select-trigger--active,.ember-power-select-trigger:focus{border-top:1px solid #aaa;border-bottom:1px solid #aaa;border-right:1px solid #aaa;border-left:1px solid #aaa}.ember-basic-dropdown{position:relative}.ember-basic-dropdown-content{position:absolute;width:auto;z-index:1000;background-color:#fff}.ember-basic-dropdown-content--left{left:0}.ember-basic-dropdown-content--right{right:0}.ember-basic-dropdown-overlay{position:fixed;background:rgba(0,0,0,.5);width:100%;height:100%;z-index:10;top:0;left:0;pointer-events:none}.ember-basic-dropdown-content-wormhole-origin{display:inline}.ember-power-select-trigger{position:relative;border-radius:4px;background-color:#fff;line-height:1.75;overflow-x:hidden;text-overflow:ellipsis;min-height:1.75em;user-select:none;-webkit-user-select:none;color:inherit}.ember-power-select-trigger:after{content:"";display:table;clear:both}.ember-power-select-trigger--active,.ember-power-select-trigger:focus{box-shadow:none}.ember-basic-dropdown-trigger--below.ember-power-select-trigger[aria-expanded=true],.ember-basic-dropdown-trigger--in-place.ember-power-select-trigger[aria-expanded=true]{border-bottom-left-radius:0;border-bottom-right-radius:0}.ember-basic-dropdown-trigger--above.ember-power-select-trigger[aria-expanded=true]{border-top-left-radius:0;border-top-right-radius:0}.ember-power-select-placeholder{color:#999;display:block;overflow-x:hidden;white-space:nowrap;text-overflow:ellipsis}.ember-power-select-status-icon{position:absolute;display:inline-block;width:0;height:0;top:0;bottom:0;margin:auto;border-style:solid;border-width:7px 4px 0;border-color:#aaa transparent transparent;right:5px}.ember-basic-dropdown-trigger[aria-expanded=true] .ember-power-select-status-icon{transform:rotate(180deg)}.ember-power-select-clear-btn{position:absolute;cursor:pointer;right:25px}.ember-power-select-trigger-multiple-input{font-family:inherit;font-size:inherit;border:none;display:inline-block;line-height:inherit;-webkit-appearance:none;outline:0;padding:0;float:left;background-color:transparent;text-indent:2px}.ember-power-select-trigger-multiple-input:disabled{background-color:#eee}.ember-power-select-trigger-multiple-input::placeholder{opacity:1;color:#999}.ember-power-select-trigger-multiple-input::-webkit-input-placeholder{opacity:1;color:#999}.ember-power-select-trigger-multiple-input::-moz-placeholder{opacity:1;color:#999}.ember-power-select-trigger-multiple-input::-ms-input-placeholder{opacity:1;color:#999}.ember-power-select-multiple-options{padding:0;margin:0}.ember-power-select-multiple-option{border:1px solid gray;border-radius:4px;color:#333;background-color:#e4e4e4;padding:0 4px;display:inline-block;line-height:1.45;float:left;margin:2px 0 2px 3px}.ember-power-select-multiple-remove-btn{cursor:pointer}.ember-power-select-multiple-remove-btn:not(:hover){opacity:.5}.ember-power-select-search{padding:4px}.ember-power-select-search-input{border:1px solid #aaa;border-radius:0;width:100%;font-size:inherit;line-height:inherit;padding:0 5px}.ember-power-select-search-input:focus{border:1px solid #aaa;box-shadow:none}.ember-power-select-dropdown{border-left:1px solid #aaa;border-right:1px solid #aaa;line-height:1.75;border-radius:4px;box-shadow:none;overflow:hidden;color:inherit}.ember-power-select-dropdown.ember-basic-dropdown-content--above{border-top:1px solid #aaa;border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.ember-power-select-dropdown.ember-basic-dropdown-content--below,.ember-power-select-dropdown.ember-basic-dropdown-content--in-place{border-top:none;border-bottom:1px solid #aaa;border-top-left-radius:0;border-top-right-radius:0}.ember-power-select-dropdown.ember-basic-dropdown-content--in-place{width:100%}.ember-power-select-options{list-style:none;margin:0;padding:0;user-select:none;-webkit-user-select:none}.ember-power-select-options[role=listbox]{overflow-y:auto;-webkit-overflow-scrolling:touch;max-height:12.25em}.ember-power-select-option{cursor:pointer;padding:0 8px}.ember-power-select-group[aria-disabled=true]{color:#999;cursor:not-allowed}.ember-power-select-group[aria-disabled=true] .ember-power-select-option,.ember-power-select-option[aria-disabled=true]{color:#999;pointer-events:none;cursor:not-allowed}.ember-power-select-option[aria-selected=true]{background-color:#ddd}.ember-power-select-option[aria-current=true]{background-color:#5897fb;color:#fff}.ember-power-select-group-name{cursor:default;font-weight:700}.ember-power-select-trigger[aria-disabled=true]{background-color:#eee}.ember-power-select-trigger{padding:0 16px 0 0}.ember-power-select-placeholder,.ember-power-select-selected-item{margin-left:8px}.ember-power-select-group .ember-power-select-group .ember-power-select-group-name{padding-left:24px}.ember-power-select-group .ember-power-select-group .ember-power-select-option{padding-left:40px}.ember-power-select-group .ember-power-select-option{padding-left:24px}.ember-power-select-group .ember-power-select-group-name{padding-left:8px}.ember-power-select-trigger[dir=rtl]{padding:0 0 0 16px}.ember-power-select-trigger[dir=rtl] .ember-power-select-placeholder,.ember-power-select-trigger[dir=rtl] .ember-power-select-selected-item{margin-right:8px}.ember-power-select-trigger[dir=rtl] .ember-power-select-multiple-option,.ember-power-select-trigger[dir=rtl] .ember-power-select-trigger-multiple-input{float:right}.ember-power-select-trigger[dir=rtl] .ember-power-select-status-icon{left:5px;right:initial}.ember-power-select-trigger[dir=rtl] .ember-power-select-clear-btn{left:25px;right:initial}.ember-power-select-dropdown[dir=rtl] .ember-power-select-group .ember-power-select-group .ember-power-select-group-name{padding-right:24px}.ember-power-select-dropdown[dir=rtl] .ember-power-select-group .ember-power-select-group .ember-power-select-option{padding-right:40px}.ember-power-select-dropdown[dir=rtl] .ember-power-select-group .ember-power-select-option{padding-right:24px}.ember-power-select-dropdown[dir=rtl] .ember-power-select-group .ember-power-select-group-name{padding-right:8px}.CodeMirror{font-family:monospace;height:300px;color:#000}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-ruler{border-left:1px solid #ccc;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:none!important;-webkit-user-select:none;-moz-user-select:none;user-select:none}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:none;font-variant-ligatures:none}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0 0}.CodeMirror-lint-markers{width:16px}.CodeMirror-lint-tooltip{background-color:#ffd;border:1px solid #000;border-radius:4px;color:#000;font-family:monospace;font-size:10pt;overflow:hidden;padding:2px 5px;position:fixed;white-space:pre;white-space:pre-wrap;z-index:100;max-width:600px;opacity:0;transition:opacity .4s;-moz-transition:opacity .4s;-webkit-transition:opacity .4s;-o-transition:opacity .4s;-ms-transition:opacity .4s}.CodeMirror-lint-mark-error,.CodeMirror-lint-mark-warning{background-position:left bottom;background-repeat:repeat-x}.CodeMirror-lint-mark-error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==)}.CodeMirror-lint-mark-warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=)}.CodeMirror-lint-marker-error,.CodeMirror-lint-marker-warning{background-position:center center;background-repeat:no-repeat;cursor:pointer;display:inline-block;height:16px;width:16px;vertical-align:middle;position:relative}.CodeMirror-lint-message-error,.CodeMirror-lint-message-warning{padding-left:18px;background-position:top left;background-repeat:no-repeat}.CodeMirror-lint-marker-error,.CodeMirror-lint-message-error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=)}.CodeMirror-lint-marker-warning,.CodeMirror-lint-message-warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEX/uwDvrwD/uwD/uwD/uwD/uwD/uwD/uwD/uwD6twD/uwAAAADurwD2tQD7uAD+ugAAAAD/uwDhmeTRAAAADHRSTlMJ8mN1EYcbmiixgACm7WbuAAAAVklEQVR42n3PUQqAIBBFUU1LLc3u/jdbOJoW1P08DA9Gba8+YWJ6gNJoNYIBzAA2chBth5kLmG9YUoG0NHAUwFXwO9LuBQL1giCQb8gC9Oro2vp5rncCIY8L8uEx5ZkAAAAASUVORK5CYII=)}.CodeMirror-lint-marker-multiple{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAMAAADzjKfhAAAACVBMVEUAAAAAAAC/v7914kyHAAAAAXRSTlMAQObYZgAAACNJREFUeNo1ioEJAAAIwmz/H90iFFSGJgFMe3gaLZ0od+9/AQZ0ADosbYraAAAAAElFTkSuQmCC);background-repeat:no-repeat;background-position:right bottom;width:100%;height:100%}.flight-icon{display:block}.flight-icon-display-inline{display:inline-block}@keyframes hds-flight-icon-animation-rotation{to{transform:rotate(360deg)}}.flight-icon--animation-loading,.flight-icon--animation-running{animation:hds-flight-icon-animation-rotation 9s linear infinite}@media (prefers-reduced-motion:no-preference){.flight-icon--animation-loading{animation-duration:.7s}.flight-icon--animation-running{animation-duration:1s}}.flight-sprite-container{position:absolute;width:0;height:0;visibility:hidden}.occluded-content{display:block;position:relative;width:100%;min-height:.01px;color:transparent}table .occluded-content,tbody .occluded-content,tfoot .occluded-content,thead .occluded-content{display:table-row;position:relative;width:100%}ol .occluded-content,ul .occluded-content{display:list-item;position:relative;width:100%;list-style-type:none;height:0}
\ No newline at end of file
diff --git a/agent/uiserver/dist/index.html b/agent/uiserver/dist/index.html
index 10d0e3e31350a..53bdb8963eade 100644
--- a/agent/uiserver/dist/index.html
+++ b/agent/uiserver/dist/index.html
@@ -8,15 +8,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     
     
-<meta name="consul-ui/config/environment" content="%7B%22modulePrefix%22%3A%22consul-ui%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2Fui%2F%22%2C%22locationType%22%3A%22fsm-with-optional%22%2C%22historySupportMiddleware%22%3Atrue%2C%22torii%22%3A%7B%22disableRedirectInitializer%22%3Afalse%7D%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_DEFAULT_ASYNC_OBSERVERS%22%3Atrue%2C%22_JQUERY_INTEGRATION%22%3Afalse%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22name%22%3A%22consul-ui%22%2C%22version%22%3A%222.2.0%2B63204b51%22%7D%2C%22resizeServiceDefaults%22%3A%7B%22injectionFactories%22%3A%5B%22view%22%2C%22controller%22%2C%22component%22%5D%7D%2C%22CONSUL_COPYRIGHT_YEAR%22%3A%222023%22%2C%22CONSUL_GIT_SHA%22%3A%2263204b518%22%2C%22CONSUL_VERSION%22%3A%221.16.0-dev%5Cn%22%2C%22CONSUL_BINARY_TYPE%22%3A%22oss%22%2C%22CONSUL_UI_DISABLE_REALTIME%22%3Afalse%2C%22CONSUL_UI_DISABLE_ANCHOR_SELECTION%22%3Afalse%2C%22operatorConfig%22%3A%7B%22APIPrefix%22%3A%22%22%7D%2C%22CONSUL_HOME_URL%22%3A%22https%3A%2F%2Fwww.consul.io%22%2C%22CONSUL_REPO_ISSUES_URL%22%3A%22https%3A%2F%2Fgithub.com%2Fhashicorp%2Fconsul%2Fissues%2Fnew%2Fchoose%22%2C%22CONSUL_DOCS_URL%22%3A%22https%3A%2F%2Fwww.consul.io%2Fdocs%22%2C%22CONSUL_DOCS_LEARN_URL%22%3A%22https%3A%2F%2Flearn.hashicorp.com%22%2C%22CONSUL_DOCS_API_URL%22%3A%22https%3A%2F%2Fwww.consul.io%2Fapi%22%2C%22CONSUL_DOCS_DEVELOPER_URL%22%3A%22https%3A%2F%2Fdeveloper.hashicorp.com%2Fconsul%2Fdocs%22%2C%22CONSUL_COPYRIGHT_URL%22%3A%22https%3A%2F%2Fwww.hashicorp.com%22%2C%22exportApplicationGlobal%22%3Afalse%7D" />
+<meta name="consul-ui/config/environment" content="%7B%22modulePrefix%22%3A%22consul-ui%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2Fui%2F%22%2C%22locationType%22%3A%22fsm-with-optional%22%2C%22historySupportMiddleware%22%3Atrue%2C%22torii%22%3A%7B%22disableRedirectInitializer%22%3Afalse%7D%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_DEFAULT_ASYNC_OBSERVERS%22%3Atrue%2C%22_JQUERY_INTEGRATION%22%3Afalse%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22name%22%3A%22consul-ui%22%2C%22version%22%3A%222.2.0%2B89053cb2%22%7D%2C%22resizeServiceDefaults%22%3A%7B%22injectionFactories%22%3A%5B%22view%22%2C%22controller%22%2C%22component%22%5D%7D%2C%22CONSUL_COPYRIGHT_YEAR%22%3A%222022%22%2C%22CONSUL_GIT_SHA%22%3A%2289053cb29%22%2C%22CONSUL_VERSION%22%3A%221.13.0%22%2C%22CONSUL_BINARY_TYPE%22%3A%22oss%22%2C%22CONSUL_UI_DISABLE_REALTIME%22%3Afalse%2C%22CONSUL_UI_DISABLE_ANCHOR_SELECTION%22%3Afalse%2C%22operatorConfig%22%3A%7B%7D%2C%22CONSUL_HOME_URL%22%3A%22https%3A%2F%2Fwww.consul.io%22%2C%22CONSUL_REPO_ISSUES_URL%22%3A%22https%3A%2F%2Fgithub.com%2Fhashicorp%2Fconsul%2Fissues%2Fnew%2Fchoose%22%2C%22CONSUL_DOCS_URL%22%3A%22https%3A%2F%2Fwww.consul.io%2Fdocs%22%2C%22CONSUL_DOCS_LEARN_URL%22%3A%22https%3A%2F%2Flearn.hashicorp.com%22%2C%22CONSUL_DOCS_API_URL%22%3A%22https%3A%2F%2Fwww.consul.io%2Fapi%22%2C%22CONSUL_COPYRIGHT_URL%22%3A%22https%3A%2F%2Fwww.hashicorp.com%22%2C%22browserify%22%3A%7B%22tests%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%7D" />
 
-  <!-- CONSUL_VERSION: 1.16.0-dev
- -->
+  <!-- CONSUL_VERSION: 1.13.0 -->
   <link rel="icon" href="{{.ContentPath}}assets/favicon.ico">
   <link rel="icon" href="{{.ContentPath}}assets/favicon.svg" type="image/svg+xml">
   <link rel="apple-touch-icon" href="{{.ContentPath}}assets/apple-touch-icon-01cd4680782fbb5bc02301347df9903d.png">
-  <link integrity="" rel="stylesheet" href="{{.ContentPath}}assets/vendor-cf03d69ba4d9fa5934f04dca689d187f.css">
-  <link integrity="" rel="stylesheet" href="{{.ContentPath}}assets/consul-ui-f5d0ec3be8cca14adb133c8e2f488419.css">
+  <link integrity="" rel="stylesheet" href="{{.ContentPath}}assets/vendor-69ef69e98b7d14d1513f8056b6c6b48d.css">
+  <link integrity="" rel="stylesheet" href="{{.ContentPath}}assets/consul-ui-20fef69ea9b73df740a420526b12c7fb.css">
   
 
     
@@ -47,51 +46,40 @@ <h2>JavaScript Required</h2>
   </script>
   <script type="application/json" data-consul-ui-fs>
   {
-    "text-encoding/encoding-indexes.js": "{{.ContentPath}}assets/encoding-indexes-50f27403be5972eae4831f5b69db1f80.js",
-    "text-encoding/encoding.js": "{{.ContentPath}}assets/encoding-022884ab2a5bd42b6f4fff580fa0dd34.js",
-    "css.escape/css.escape.js": "{{.ContentPath}}assets/css.escape-fe4db48c9e3f272a6d12cf1312de889e.js",
-    "codemirror/mode/javascript/javascript.js": "{{.ContentPath}}assets/codemirror/mode/javascript/javascript-a5e5d64b0f9ff6b6e21f5f48aa1ef464.js",
-    "codemirror/mode/ruby/ruby.js": "{{.ContentPath}}assets/codemirror/mode/ruby/ruby-2b9a2a4b4d14d9fa6f6edcda84a260e6.js",
-    "codemirror/mode/yaml/yaml.js": "{{.ContentPath}}assets/codemirror/mode/yaml/yaml-39582b60e653cf0b8d42292ddfabefb2.js",
-    "codemirror/mode/xml/xml.js": "{{.ContentPath}}assets/codemirror/mode/xml/xml-80f64aaafa6af7844d14f32f3219bb26.js"
+    "text-encoding/encoding-indexes.js": "{{.ContentPath}}assets/encoding-indexes-75eea16b259716db4fd162ee283d2ae5.js",
+    "text-encoding/encoding.js": "{{.ContentPath}}assets/encoding-cdb50fbdab6d4d3fdf574dd784f77d27.js",
+    "css.escape/css.escape.js": "{{.ContentPath}}assets/css.escape-851839b3ea1d0b4eb4c7089446df5e9f.js",
+    "codemirror/mode/javascript/javascript.js": "{{.ContentPath}}assets/codemirror/mode/javascript/javascript-77218cd1268ea6df75775114ae086566.js",
+    "codemirror/mode/ruby/ruby.js": "{{.ContentPath}}assets/codemirror/mode/ruby/ruby-ea43ca3a3bdd63a52811e8464d66134b.js",
+    "codemirror/mode/yaml/yaml.js": "{{.ContentPath}}assets/codemirror/mode/yaml/yaml-3f129a000349e3075be0f65719884b61.js",
+    "codemirror/mode/xml/xml.js": "{{.ContentPath}}assets/codemirror/mode/xml/xml-10ec8b8cc61ef0fbd25b27a599fdcd60.js"
   }
   </script>
-  <script src="{{.ContentPath}}assets/consul-ui/services-faa0d1867ff0795f940a4199bcf17128.js"></script>
-  <script src="{{.ContentPath}}assets/consul-ui/routes-c69d5bf72b7c740af5e6ce29eefe65bf.js"></script>
-  <script src="{{.ContentPath}}assets/consul-lock-sessions/routes-7718d309039e9f8b3b185656b6dd7f05.js"></script>
+  <script src="{{.ContentPath}}assets/consul-ui/services-a17470cdfbd4a4096117ac0103802226.js"></script>
+  <script src="{{.ContentPath}}assets/consul-ui/routes-e55bc65732ba7c0352d43313fd9563e6.js"></script>
+  <script src="{{.ContentPath}}assets/consul-lock-sessions/routes-f2c5ce353830c89f540358e7f174e0bf.js"></script>
 
 
 {{if .ACLsEnabled}}
-  <script src="{{.ContentPath}}assets/consul-acls/routes-0c01f9c463b81fdc3929288f31c23040.js"></script>
-{{end}}
-{{if .PeeringEnabled}}
-  <script src="{{.ContentPath}}assets/consul-peerings/services-e5a754eca7f3fbb406035f10b8dfbb77.js"></script>
-  <script src="{{.ContentPath}}assets/consul-peerings/routes-989d6de4b58a54c8638e37694240f29a.js"></script>
+  <script src="{{.ContentPath}}assets/consul-acls/routes-75a2ac7d38caf09cfee2a4e2bc49dcf7.js"></script>
 {{end}}
 {{if .PartitionsEnabled}}
-  <script src="{{.ContentPath}}assets/consul-partitions/services-1a3b6937a8bc5f6e68df884b1650eaf0.js"></script>
-  <script src="{{.ContentPath}}assets/consul-partitions/routes-1bdd3b7ae99c7d7ce0425b2412f10d5e.js"></script>
+  <script src="{{.ContentPath}}assets/consul-partitions/services-85621f245f195fe1ce177064bfb04504.js"></script>
+  <script src="{{.ContentPath}}assets/consul-partitions/routes-cba490481425519435d142c743bbc3d3.js"></script>
 {{end}}
 {{if .NamespacesEnabled}}
-  <script src="{{.ContentPath}}assets/consul-nspaces/routes-71c32de6a0307211d1299dac7688bfbf.js"></script>
-{{end}}
-{{if .HCPEnabled}}
-  <script src="{{.ContentPath}}assets/consul-hcp/services-51af43ae095119987dadf6f2392a59b3.js"></script>
-  <script src="{{.ContentPath}}assets/consul-hcp/routes-282630d2b2c8bf766b7e0d4f512828cc.js"></script>
+  <script src="{{.ContentPath}}assets/consul-nspaces/routes-f939ed42e9b83f9d1bbc5256be68e77c.js"></script>
 {{end}}
 
-  <script src="{{.ContentPath}}assets/init-fe2561b45ce1429092f4a9a2bbb9ce71.js"></script>
-  <script src="{{.ContentPath}}assets/vendor-aeac0d1e27f3b95c9b4bad3aac59a219.js"></script>
-<script src="{{.ContentPath}}assets/chunk.412.2df22e4bf69d8f15ebdb.js"></script>
-<script src="{{.ContentPath}}assets/chunk.143.ff39f0b820a97e2c6d5d.js"></script>
+  <script src="{{.ContentPath}}assets/init-21ea65714d133467454b601efc15e2dd.js"></script>
+  <script src="{{.ContentPath}}assets/vendor-c7887d0a48fe1497d1843edc3d5bfbc8.js"></script>
   
-  <script src="{{.ContentPath}}assets/metrics-providers/consul-5e97a9af114229497d43377450c54418.js"></script>
-  <script src="{{.ContentPath}}assets/metrics-providers/prometheus-8779f1c99f6a15611567154767f1f674.js"></script>
+  <script src="{{.ContentPath}}assets/metrics-providers/consul-31d7e3b0ef7c58d62338c7d7aeaaf545.js"></script>
+  <script src="{{.ContentPath}}assets/metrics-providers/prometheus-5f31ba3b7ffd850fa916a0a76933e968.js"></script>
   {{ range .ExtraScripts }} <script src="{{.}}"></script> {{ end }}
-  <script src="{{.ContentPath}}assets/consul-ui-7444626e95c5ba30e9097f92995f0238.js"></script>
+  <script src="{{.ContentPath}}assets/consul-ui-e58b85f0a8e1fb15ded242e5b25b171c.js"></script>
   
 
-    <svg width="0" height="0" class="flight-sprite-container" aria-hidden="true"><defs><linearGradient id="amazon-ecs-color-24__paint0_linear_1587_73" x1="13.489" x2="2.176" y1="7" y2="12.37" gradientUnits="userSpaceOnUse"><stop offset=".261" stop-color="#F7981D"/><stop offset=".697" stop-color="#F37731"/><stop offset="1" stop-color="#F1623E"/></linearGradient><linearGradient id="amazon-ecs-color-24__paint1_linear_1587_73" x1="13.489" x2="2.176" y1="7" y2="12.37" gradientUnits="userSpaceOnUse"><stop offset=".261" stop-color="#F7981D"/><stop offset=".697" stop-color="#F37731"/><stop offset="1" stop-color="#F1623E"/></linearGradient><linearGradient id="amazon-ecs-color-16__paint0_linear_1587_77" x1="9.248" x2=".634" y1="3.807" y2="7.896" gradientUnits="userSpaceOnUse"><stop offset=".261" stop-color="#F7981D"/><stop offset=".697" stop-color="#F37731"/><stop offset="1" stop-color="#F1623E"/></linearGradient><linearGradient id="amazon-ecs-color-16__paint1_linear_1587_77" x1="9.248" x2=".634" y1="3.807" y2="7.896" gradientUnits="userSpaceOnUse"><stop offset=".261" stop-color="#F7981D"/><stop offset=".697" stop-color="#F37731"/><stop offset="1" stop-color="#F1623E"/></linearGradient><linearGradient id="amazon-eks-color-24__paint0_linear_879_136" x1="15.383" x2="12.246" y1="14.57" y2="7.514" gradientUnits="userSpaceOnUse"><stop stop-color="#426DDB"/><stop offset="1" stop-color="#3B4BDB"/></linearGradient><linearGradient id="amazon-eks-color-24__paint1_linear_879_136" x1="22.99" x2="13.995" y1="15.694" y2=".202" gradientUnits="userSpaceOnUse"><stop stop-color="#426DDB"/><stop offset="1" stop-color="#3B4BDB"/></linearGradient><linearGradient id="amazon-eks-color-24__paint2_linear_879_136" x1="14.046" x2="4.239" y1="22.021" y2="4.702" gradientUnits="userSpaceOnUse"><stop stop-color="#2775FF"/><stop offset="1" stop-color="#188DFF"/></linearGradient><linearGradient id="amazon-eks-color-16__paint0_linear_879_141" x1="10.691" x2="8.521" y1="9.879" y2="4.634" gradientUnits="userSpaceOnUse"><stop stop-color="#426DDB"/><stop offset="1" stop-color="#3B4BDB"/></linearGradient><linearGradient id="amazon-eks-color-16__paint1_linear_879_141" x1="15.693" x2="9.546" y1="10.544" y2="-.213" gradientUnits="userSpaceOnUse"><stop stop-color="#426DDB"/><stop offset="1" stop-color="#3B4BDB"/></linearGradient><linearGradient id="amazon-eks-color-16__paint2_linear_879_141" x1="9.433" x2="2.732" y1="14.904" y2="2.88" gradientUnits="userSpaceOnUse"><stop stop-color="#2775FF"/><stop offset="1" stop-color="#188DFF"/></linearGradient><linearGradient id="azure-aks-color-24__paint0_linear_2372_167" x1="5.267" x2="11.633" y1="5.8" y2="5.8" gradientUnits="userSpaceOnUse"><stop stop-color="#B77AF4"/><stop offset="1" stop-color="#773ADC"/></linearGradient><linearGradient id="azure-aks-color-24__paint1_linear_2372_167" x1="12.145" x2="18.5" y1="5.856" y2="5.856" gradientUnits="userSpaceOnUse"><stop stop-color="#B77AF4"/><stop offset="1" stop-color="#773ADC"/></linearGradient><linearGradient id="azure-aks-color-24__paint2_linear_2372_167" x1="2.011" x2="8.367" y1="11.778" y2="11.778" gradientUnits="userSpaceOnUse"><stop stop-color="#B77AF4"/><stop offset="1" stop-color="#773ADC"/></linearGradient><linearGradient id="azure-aks-color-24__paint3_linear_2372_167" x1="8.867" x2="15.222" y1="11.733" y2="11.733" gradientUnits="userSpaceOnUse"><stop stop-color="#B77AF4"/><stop offset="1" stop-color="#773ADC"/></linearGradient><linearGradient id="azure-aks-color-24__paint4_linear_2372_167" x1="15.722" x2="22.089" y1="11.789" y2="11.789" gradientUnits="userSpaceOnUse"><stop stop-color="#B77AF4"/><stop offset="1" stop-color="#773ADC"/></linearGradient><linearGradient id="azure-aks-color-24__paint5_linear_2372_167" x1="5.189" x2="11.556" y1="17.822" y2="17.822" gradientUnits="userSpaceOnUse"><stop stop-color="#B77AF4"/><stop offset="1" stop-color="#773ADC"/></linearGradient><linearGradient id="azure-aks-color-24__paint6_linear_2372_167" x1="12.056" x2="18.422" y1="17.867" y2="17.867" gradientUnits="userSpaceOnUse"><stop stop-color="#B77AF4"/><stop offset="1" stop-color="#773ADC"/></linearGradient><linearGradient id="azure-aks-color-16__paint0_linear_2372_185" x1="3.287" x2="7.743" y1="3.96" y2="3.96" gradientUnits="userSpaceOnUse"><stop stop-color="#B77AF4"/><stop offset="1" stop-color="#773ADC"/></linearGradient><linearGradient id="azure-aks-color-16__paint1_linear_2372_185" x1="8.101" x2="12.55" y1="3.999" y2="3.999" gradientUnits="userSpaceOnUse"><stop stop-color="#B77AF4"/><stop offset="1" stop-color="#773ADC"/></linearGradient><linearGradient id="azure-aks-color-16__paint2_linear_2372_185" x1="1.008" x2="5.457" y1="8.144" y2="8.144" gradientUnits="userSpaceOnUse"><stop stop-color="#B77AF4"/><stop offset="1" stop-color="#773ADC"/></linearGradient><linearGradient id="azure-aks-color-16__paint3_linear_2372_185" x1="5.807" x2="10.255" y1="8.113" y2="8.113" gradientUnits="userSpaceOnUse"><stop stop-color="#B77AF4"/><stop offset="1" stop-color="#773ADC"/></linearGradient><linearGradient id="azure-aks-color-16__paint4_linear_2372_185" x1="10.605" x2="15.062" y1="8.152" y2="8.152" gradientUnits="userSpaceOnUse"><stop stop-color="#B77AF4"/><stop offset="1" stop-color="#773ADC"/></linearGradient><linearGradient id="azure-aks-color-16__paint5_linear_2372_185" x1="3.232" x2="7.689" y1="12.376" y2="12.376" gradientUnits="userSpaceOnUse"><stop stop-color="#B77AF4"/><stop offset="1" stop-color="#773ADC"/></linearGradient><linearGradient id="azure-aks-color-16__paint6_linear_2372_185" x1="8.039" x2="12.495" y1="12.407" y2="12.407" gradientUnits="userSpaceOnUse"><stop stop-color="#B77AF4"/><stop offset="1" stop-color="#773ADC"/></linearGradient><linearGradient id="azure-devops-color-24__paint0_linear_707_113" x1="12" x2="12" y1="20.944" y2="3.034" gradientUnits="userSpaceOnUse"><stop stop-color="#0078D4"/><stop offset=".16" stop-color="#1380DA"/><stop offset=".53" stop-color="#3C91E5"/><stop offset=".82" stop-color="#559CEC"/><stop offset="1" stop-color="#5EA0EF"/></linearGradient><linearGradient id="azure-devops-color-16__paint0_linear_707_116" x1="8" x2="8" y1="14.956" y2="1.026" gradientUnits="userSpaceOnUse"><stop stop-color="#0078D4"/><stop offset=".16" stop-color="#1380DA"/><stop offset=".53" stop-color="#3C91E5"/><stop offset=".82" stop-color="#559CEC"/><stop offset="1" stop-color="#5EA0EF"/></linearGradient><linearGradient id="azure-vms-color-24__paint0_linear_2372_258" x1="12" x2="12" y1="16.333" y2="3" gradientUnits="userSpaceOnUse"><stop stop-color="#0078D4"/><stop offset=".82" stop-color="#5EA0EF"/></linearGradient><linearGradient id="azure-vms-color-24__paint1_linear_2372_258" x1="12" x2="12" y1="21.478" y2="16.333" gradientUnits="userSpaceOnUse"><stop offset=".15" stop-color="#CCC"/><stop offset="1" stop-color="#707070"/></linearGradient><linearGradient id="azure-vms-color-16__paint0_linear_2372_267" x1="8" x2="8" y1="11.333" y2="2" gradientUnits="userSpaceOnUse"><stop stop-color="#0078D4"/><stop offset=".82" stop-color="#5EA0EF"/></linearGradient><linearGradient id="azure-vms-color-16__paint1_linear_2372_267" x1="8" x2="8" y1="14.934" y2="11.333" gradientUnits="userSpaceOnUse"><stop offset=".15" stop-color="#CCC"/><stop offset="1" stop-color="#707070"/></linearGradient><linearGradient id="bitbucket-color-24__paint0_linear_707_129" x1="17.29" x2="10.339" y1="7.014" y2="16.89" gradientUnits="userSpaceOnUse"><stop offset=".18" stop-color="#0052CC"/><stop offset="1" stop-color="#2684FF"/></linearGradient><linearGradient id="bitbucket-color-16__paint0_linear_707_135" x1="11.544" x2="6.918" y1="4.676" y2="11.282" gradientUnits="userSpaceOnUse"><stop offset=".18" stop-color="#0052CC"/><stop offset="1" stop-color="#2684FF"/></linearGradient><linearGradient id="grafana-color-24__paint0_linear_2372_362" x1="12.002" x2="12.002" y1="26.488" y2="8.223" gradientUnits="userSpaceOnUse"><stop stop-color="#FFF200"/><stop offset="1" stop-color="#F15A29"/></linearGradient><linearGradient id="grafana-color-16__paint0_linear_2372_364" x1="7.502" x2="7.502" y1="18.142" y2="5.356" gradientUnits="userSpaceOnUse"><stop stop-color="#FFF200"/><stop offset="1" stop-color="#F15A29"/></linearGradient><linearGradient id="infracost-color-24__paint0_linear_2372_391" x1="22" x2="-2.03" y1="2" y2="13.775" gradientUnits="userSpaceOnUse"><stop stop-color="#E7B28C"/><stop offset=".497" stop-color="#BD62B6"/><stop offset="1" stop-color="#6658C5"/></linearGradient><linearGradient id="infracost-color-16__paint0_linear_2372_396" x1="15" x2="-1.821" y1="1" y2="9.242" gradientUnits="userSpaceOnUse"><stop stop-color="#E7B28C"/><stop offset=".497" stop-color="#BD62B6"/><stop offset="1" stop-color="#6658C5"/></linearGradient><linearGradient id="microsoft-teams-color-24__paint0_linear_2372_478" x1="3.778" x2="10.13" y1="6.406" y2="17.776" gradientUnits="userSpaceOnUse"><stop stop-color="#5A62C3"/><stop offset=".5" stop-color="#4D55BD"/><stop offset="1" stop-color="#3940AB"/></linearGradient><linearGradient id="microsoft-teams-color-16__paint0_linear_2372_494" x1="2.244" x2="6.906" y1="4.46" y2="12.548" gradientUnits="userSpaceOnUse"><stop stop-color="#5A62C3"/><stop offset=".5" stop-color="#4D55BD"/><stop offset="1" stop-color="#3940AB"/></linearGradient><linearGradient id="pack-color-24__paint0_linear_1133_275" x1="19.631" x2="19.631" y1="12.504" y2="20.119" gradientUnits="userSpaceOnUse"><stop stop-color="#FC72C7"/><stop offset="1" stop-color="#DE156C"/></linearGradient><linearGradient id="pack-color-24__paint1_linear_1133_275" x1="14.381" x2="14.381" y1="3.504" y2="11.119" gradientUnits="userSpaceOnUse"><stop stop-color="#8896DB"/><stop offset="1" stop-color="#47529D"/></linearGradient><linearGradient id="pack-color-24__paint2_linear_1133_275" x1="9.131" x2="9.131" y1="12.504" y2="20.119" gradientUnits="userSpaceOnUse"><stop stop-color="#757CBA"/><stop offset="1" stop-color="#252960"/></linearGradient><linearGradient id="pack-color-16__paint0_linear_1133_286" x1="6.004" x2="6.004" y1="8.502" y2="13.262" gradientUnits="userSpaceOnUse"><stop stop-color="#757CBA"/><stop offset="1" stop-color="#252960"/></linearGradient><linearGradient id="pack-color-16__paint1_linear_1133_286" x1="13.004" x2="13.004" y1="8.503" y2="13.262" gradientUnits="userSpaceOnUse"><stop stop-color="#FC72C7"/><stop offset="1" stop-color="#DE156C"/></linearGradient><linearGradient id="pack-color-16__paint2_linear_1133_286" x1="9.504" x2="9.504" y1="3.002" y2="7.762" gradientUnits="userSpaceOnUse"><stop stop-color="#8896DB"/><stop offset="1" stop-color="#47529D"/></linearGradient></defs><symbol id="flight-loading-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M12 2.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19zM1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12z" opacity=".2"/><path d="M11.25 1.75A.75.75 0 0112 1c6.075 0 11 4.925 11 11a.75.75 0 01-1.5 0A9.5 9.5 0 0012 2.5a.75.75 0 01-.75-.75z"/></g></symbol><symbol id="flight-loading-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8z" opacity=".2"/><path d="M7.25.75A.75.75 0 018 0a8 8 0 018 8 .75.75 0 01-1.5 0A6.5 6.5 0 008 1.5a.75.75 0 01-.75-.75z"/></g></symbol><symbol id="flight-running-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M12 2.5a9.47 9.47 0 00-6.88 2.948.75.75 0 01-1.085-1.034A10.97 10.97 0 0112 1a10.97 10.97 0 017.965 3.414.75.75 0 11-1.086 1.034A9.47 9.47 0 0012 2.5zM2.351 8.451a.75.75 0 01.515.928A9.506 9.506 0 002.5 12c0 4.48 3.102 8.237 7.276 9.238a.75.75 0 01-.35 1.459C4.593 21.537 1 17.189 1 12c0-1.051.148-2.07.424-3.034a.75.75 0 01.927-.515zm19.297 0a.75.75 0 01.928.515C22.852 9.93 23 10.949 23 12c0 5.19-3.593 9.538-8.426 10.697a.75.75 0 11-.35-1.459c4.174-1 7.276-4.758 7.276-9.238 0-.91-.128-1.79-.366-2.621a.75.75 0 01.514-.928z"/><path d="M12 5.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM4 12a8 8 0 1116 0 8 8 0 01-16 0z" opacity=".2"/></g></symbol><symbol id="flight-running-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8 1.5a6.48 6.48 0 00-4.707 2.017.75.75 0 11-1.086-1.034A7.98 7.98 0 018 0a7.98 7.98 0 015.793 2.483.75.75 0 11-1.086 1.034A6.48 6.48 0 008 1.5zM1.236 5.279a.75.75 0 01.514.927 6.503 6.503 0 004.727 8.115.75.75 0 11-.349 1.459 8.003 8.003 0 01-5.82-9.986.75.75 0 01.928-.515zm13.528 0a.75.75 0 01.928.515 8.003 8.003 0 01-5.82 9.986.75.75 0 01-.35-1.459 6.503 6.503 0 004.728-8.115.75.75 0 01.514-.927z"/><path d="M8 4.5a3.5 3.5 0 100 7 3.5 3.5 0 000-7zM3 8a5 5 0 1110 0A5 5 0 013 8z" opacity=".2"/></g></symbol><symbol id="flight-apple-24" viewBox="0 0 24 24"><path d="M15.073 5.203c.62-.747 1.057-1.772 1.057-2.797 0-.15-.01-.289-.042-.406-1.004.043-2.21.673-2.937 1.527-.566.64-1.1 1.676-1.1 2.702 0 .16.032.31.043.363.064.01.17.02.267.02.908 0 2.04-.597 2.712-1.409zm.705 1.634c-1.506 0-2.734.918-3.513.918-.844 0-1.933-.864-3.257-.864C6.52 6.89 4 8.95 4 12.828c0 2.424.929 4.986 2.082 6.63C7.075 20.848 7.94 22 9.19 22c1.238 0 1.783-.822 3.32-.822 1.56 0 1.901.8 3.268.8 1.356 0 2.264-1.238 3.107-2.466.961-1.41 1.356-2.776 1.367-2.84-.075-.022-2.67-1.079-2.67-4.047 0-2.563 2.04-3.716 2.157-3.802-1.345-1.932-3.395-1.986-3.961-1.986z"/></symbol><symbol id="flight-apple-16" viewBox="0 0 16 16"><path d="M10.167 3.242c.435-.523.742-1.24.742-1.958 0-.105-.008-.202-.03-.284-.704.03-1.55.47-2.06 1.069-.397.448-.772 1.173-.772 1.891 0 .112.023.217.03.254.045.008.12.015.188.015.636 0 1.43-.419 1.902-.987zm.495 1.144c-1.057 0-1.918.643-2.465.643-.591 0-1.355-.606-2.284-.606C4.168 4.423 2.4 5.866 2.4 8.58c0 1.697.652 3.491 1.46 4.642C4.557 14.193 5.164 15 6.04 15c.869 0 1.251-.575 2.33-.575 1.093 0 1.333.56 2.292.56.95 0 1.587-.867 2.18-1.727.673-.986.95-1.943.958-1.988-.053-.015-1.873-.755-1.873-2.833 0-1.794 1.431-2.6 1.513-2.66-.943-1.354-2.381-1.391-2.778-1.391z"/></symbol><symbol id="flight-apple-color-24" viewBox="0 0 24 24"><path fill="#000" d="M15.073 5.203c.62-.747 1.057-1.772 1.057-2.797 0-.15-.01-.289-.042-.406-1.004.043-2.21.673-2.937 1.527-.566.64-1.1 1.676-1.1 2.702 0 .16.032.31.043.363.064.01.17.02.267.02.908 0 2.04-.597 2.712-1.409zm.705 1.634c-1.506 0-2.734.918-3.513.918-.844 0-1.933-.864-3.257-.864C6.52 6.89 4 8.95 4 12.828c0 2.424.929 4.986 2.082 6.63C7.075 20.848 7.94 22 9.19 22c1.238 0 1.783-.822 3.32-.822 1.56 0 1.901.8 3.268.8 1.356 0 2.264-1.238 3.107-2.466.961-1.41 1.356-2.776 1.367-2.84-.075-.022-2.67-1.079-2.67-4.047 0-2.563 2.04-3.716 2.157-3.802-1.345-1.932-3.395-1.986-3.961-1.986z"/></symbol><symbol id="flight-apple-color-16" viewBox="0 0 16 16"><path fill="#000" d="M10.167 3.242c.435-.523.742-1.24.742-1.958 0-.105-.008-.202-.03-.284-.704.03-1.55.47-2.06 1.069-.397.448-.772 1.173-.772 1.891 0 .112.023.217.03.254.045.008.12.015.188.015.636 0 1.43-.419 1.902-.987zm.495 1.144c-1.057 0-1.918.643-2.465.643-.591 0-1.355-.606-2.284-.606C4.168 4.423 2.4 5.866 2.4 8.58c0 1.697.652 3.49 1.46 4.642C4.557 14.193 5.164 15 6.04 15c.869 0 1.251-.575 2.33-.575 1.093 0 1.333.56 2.292.56.95 0 1.587-.867 2.18-1.727.673-.986.95-1.943.958-1.988-.053-.015-1.873-.755-1.873-2.833 0-1.794 1.431-2.6 1.513-2.66-.943-1.354-2.381-1.391-2.778-1.391z"/></symbol><symbol id="flight-alibaba-24" viewBox="0 0 24 24"><g><path d="M15.21 11.248H8.805v1.44h6.405v-1.44z"/><path d="M18.405 6h-4.233l1.022 1.456 3.1.944c.574.176.942.72.926 1.28v4.64a1.34 1.34 0 01-.927 1.28l-3.082.944L14.171 18h4.233a3.196 3.196 0 003.195-3.2V9.2c.016-1.76-1.422-3.2-3.195-3.2zM5.595 6h4.232L8.805 7.456 5.722 8.4c-.575.176-.942.72-.926 1.28v4.64c0 .576.367 1.104.926 1.28l3.083.944L9.827 18H5.595A3.207 3.207 0 012.4 14.8V9.2C2.4 7.44 3.838 6 5.595 6z"/></g></symbol><symbol id="flight-alibaba-16" viewBox="0 0 16 16"><g><path d="M10.676 7.373H5.338v1.2h5.338v-1.2z"/><path d="M13.338 3H9.81l.852 1.213L13.244 5c.48.147.786.6.773 1.067v3.866c0 .48-.307.92-.772 1.067l-2.57.787L9.81 13h3.528C14.815 13 16 11.8 16 10.333V5.667C16.013 4.2 14.815 3 13.338 3zM2.662 3H6.19l-.852 1.213L2.768 5c-.478.147-.785.6-.771 1.067v3.866c0 .48.306.92.772 1.067l2.569.787L6.19 13H2.662A2.672 2.672 0 010 10.333V5.667A2.672 2.672 0 012.662 3z"/></g></symbol><symbol id="flight-alibaba-color-24" viewBox="0 0 24 24"><g fill="#ED6B1E"><path d="M15.21 11.248H8.805v1.44h6.405v-1.44z"/><path d="M18.405 6h-4.233l1.022 1.456 3.1.944c.574.176.942.72.926 1.28v4.64a1.34 1.34 0 01-.927 1.28l-3.082.944L14.171 18h4.233a3.196 3.196 0 003.195-3.2V9.2c.016-1.76-1.422-3.2-3.195-3.2zM5.595 6h4.232L8.805 7.456 5.722 8.4c-.575.176-.942.72-.926 1.28v4.64c0 .576.367 1.104.926 1.28l3.083.944L9.827 18H5.595A3.207 3.207 0 012.4 14.8V9.2C2.4 7.44 3.838 6 5.595 6z"/></g></symbol><symbol id="flight-alibaba-color-16" viewBox="0 0 16 16"><g fill="#ED6B1E"><path d="M10.676 7.373H5.338v1.2h5.338v-1.2z"/><path d="M13.338 3H9.81l.852 1.213L13.244 5c.48.147.786.6.773 1.067v3.866c0 .48-.307.92-.772 1.067l-2.57.787L9.81 13h3.528C14.815 13 16 11.8 16 10.333V5.667C16.013 4.2 14.815 3 13.338 3zM2.662 3H6.19l-.852 1.213L2.768 5c-.478.147-.785.6-.771 1.067v3.866c0 .48.306.92.772 1.067l2.569.787L6.19 13H2.662A2.672 2.672 0 010 10.333V5.667A2.672 2.672 0 012.662 3z"/></g></symbol><symbol id="flight-amazon-ecs-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M20.369 15.2l-2.571-1.996V9.49a.65.65 0 00-.311-.554l-3.68-2.254V3.817l6.562 3.84V15.2zm.995-8.474l-7.88-4.614a.67.67 0 00-.664-.006.652.652 0 00-.332.566v4.373c0 .226.119.435.311.554l3.68 2.254v3.668c0 .2.094.388.253.512l3.889 3.022a.658.658 0 00.695.073.65.65 0 00.372-.585V7.286a.648.648 0 00-.324-.56zM11.89 21.634l-8.57-4.317v-9.66L9.859 3.8v2.867l-3.596 2.25a.653.653 0 00-.306.552v5.993a.65.65 0 00.366.584l5.2 2.547a.667.667 0 00.592-.003l4.082-2.054 2.742 2.284-7.05 2.814zm4.822-6.373a.67.67 0 00-.724-.082l-4.176 2.1-4.535-2.221V9.826l3.594-2.25a.65.65 0 00.307-.552V2.653a.66.66 0 00-.997-.56L2.322 6.726a.65.65 0 00-.322.56v10.43c0 .245.138.47.36.58l9.198 4.634a.66.66 0 00.546.023l8.345-3.328a.65.65 0 00.178-1.104l-3.916-3.26z" clip-rule="evenodd"/></symbol><symbol id="flight-amazon-ecs-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M14.495 10.057l-1.958-1.52v-2.83a.495.495 0 00-.238-.422L9.496 3.568V1.384l5 2.927v5.746zm.759-6.457L9.25.085a.51.51 0 00-.506-.004.496.496 0 00-.253.431v3.332c0 .172.09.332.237.422l2.804 1.717v2.795c0 .152.071.296.193.39l2.962 2.303a.502.502 0 00.53.055.496.496 0 00.283-.446V4.028a.493.493 0 00-.246-.428zM8.034 14.96l-6.53-3.289V4.31L6.488 1.37v2.185L3.747 5.27a.497.497 0 00-.232.42v4.567c0 .188.107.36.279.445l3.962 1.94c.141.07.309.068.45-.002l3.11-1.565 2.09 1.74-5.371 2.144zm3.675-4.855a.51.51 0 00-.552-.063l-3.182 1.6L4.52 9.95V5.963l2.738-1.715a.496.496 0 00.234-.42V.498a.502.502 0 00-.76-.426L.745 3.6a.496.496 0 00-.245.428v7.946c0 .187.106.358.274.442l7.008 3.53a.504.504 0 00.416.018l6.358-2.536a.496.496 0 00.136-.841l-2.983-2.483z" clip-rule="evenodd"/></symbol><symbol id="flight-amazon-ecs-color-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path fill="url(#amazon-ecs-color-24__paint0_linear_1587_73)" d="M11.89 21.634l-8.571-4.317v-9.66L9.859 3.8v2.867l-3.596 2.25a.653.653 0 00-.306.552v5.993a.65.65 0 00.366.584l5.2 2.547a.667.667 0 00.592-.003l4.082-2.054 2.742 2.284-7.05 2.814zm4.821-6.373a.67.67 0 00-.724-.082l-4.176 2.1-4.535-2.221V9.826l3.594-2.25a.65.65 0 00.307-.552V2.653a.66.66 0 00-.997-.56L2.322 6.726a.65.65 0 00-.322.56v10.43c0 .245.138.47.36.58l9.198 4.634a.66.66 0 00.546.023l8.345-3.328a.65.65 0 00.178-1.104l-3.916-3.26z"/><path fill="url(#amazon-ecs-color-24__paint1_linear_1587_73)" d="M20.38 15.179l-2.57-1.996V9.47a.65.65 0 00-.311-.554l-3.68-2.255V3.796l6.562 3.84v7.543zm.996-8.474l-7.88-4.614a.67.67 0 00-.664-.006.652.652 0 00-.332.566v4.373c0 .225.119.435.311.554l3.68 2.254V13.5c0 .2.094.39.253.513l3.889 3.022a.659.659 0 00.695.073.65.65 0 00.372-.585V7.265a.648.648 0 00-.324-.56z"/></g></symbol><symbol id="flight-amazon-ecs-color-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path fill="url(#amazon-ecs-color-16__paint0_linear_1587_77)" d="M8.03 14.95l-6.526-3.287V4.307l4.98-2.936v2.183L3.746 5.267a.497.497 0 00-.233.42v4.563c0 .189.107.36.279.445l3.96 1.94c.14.07.308.067.45-.003l3.108-1.564 2.088 1.74L8.03 14.95zm3.672-4.852a.51.51 0 00-.552-.063l-3.18 1.6-3.453-1.692V5.959l2.737-1.713a.496.496 0 00.234-.42V.497a.502.502 0 00-.76-.426L.746 3.598a.495.495 0 00-.245.427v7.942c0 .186.105.357.274.442l7.004 3.528a.503.503 0 00.416.018l6.354-2.535a.495.495 0 00.136-.84l-2.982-2.482z"/><path fill="url(#amazon-ecs-color-16__paint1_linear_1587_77)" d="M14.496 10.035l-1.958-1.52V5.688a.495.495 0 00-.237-.422L9.5 3.549V1.367l4.997 2.925v5.743zm.758-6.453l-6-3.513a.51.51 0 00-.506-.004.496.496 0 00-.253.43v3.33c0 .172.09.332.237.422l2.802 1.717v2.792c0 .152.071.296.193.39l2.96 2.301a.502.502 0 00.53.056.495.495 0 00.283-.446V4.01a.493.493 0 00-.246-.427z"/></g></symbol><symbol id="flight-amazon-eks-24" viewBox="0 0 24 24"><g><path d="M12.126 17.948l4.55-2.626a.25.25 0 01.251 0l4.061 2.344a.251.251 0 010 .435l-8.862 5.115a.25.25 0 01-.252 0L2.125 17.59A.251.251 0 012 17.372V6.117c0-.09.048-.172.125-.217L10.988.784a.251.251 0 01.377.217V5.69a.25.25 0 01-.126.217L6.69 8.534a.252.252 0 00-.126.217v5.987c0 .09.048.172.126.217l5.185 2.993a.25.25 0 00.252 0z"/><path d="M12.76 5.907l4.551 2.627a.252.252 0 01.126.217v5.254c0 .09.048.172.125.217l4.061 2.344A.251.251 0 0022 16.35V6.117a.251.251 0 00-.125-.217L13.012.784a.251.251 0 00-.377.217V5.69c0 .09.048.172.126.217z"/><path d="M9.866 8.473h.924v2.725l2.661-2.725h1.22l-2.92 3.002 3.104 3.465h-1.182l-2.883-3.233v3.233h-.924V8.473z"/></g></symbol><symbol id="flight-amazon-eks-16" viewBox="0 0 16 16"><g><path d="M8.088 12.098l3.185-1.81a.178.178 0 01.176 0l2.843 1.615a.172.172 0 010 .3l-6.204 3.524a.178.178 0 01-.176 0L1.088 11.85A.173.173 0 011 11.7V3.947c0-.061.033-.118.088-.15L7.292.274a.176.176 0 01.264.15v3.23a.172.172 0 01-.088.15l-3.186 1.81a.173.173 0 00-.088.149v4.124c0 .062.034.119.088.15l3.63 2.062c.054.03.122.03.176 0z"/><path d="M8.532 3.803l3.186 1.81a.173.173 0 01.088.149v3.62c0 .06.033.118.088.149l2.842 1.615a.176.176 0 00.264-.15V3.947a.173.173 0 00-.088-.15L8.708.274a.176.176 0 00-.264.15v3.23c0 .062.034.119.088.15z"/><path d="M6.381 10.148h.897V8.121l1.837 2.027h1.164L7.997 7.642l2.168-2.195H8.963L7.278 7.146V5.447h-.897v4.701z"/></g></symbol><symbol id="flight-amazon-eks-color-24" viewBox="0 0 24 24"><path fill="url(#amazon-eks-color-24__paint0_linear_879_136)" d="M9.866 8.473h.924v2.725l2.661-2.725h1.22l-2.92 3.002 3.105 3.465h-1.183l-2.883-3.233v3.233h-.924V8.473z"/><path fill="url(#amazon-eks-color-24__paint1_linear_879_136)" d="M12.76 5.907l4.551 2.627a.252.252 0 01.126.217v5.254c0 .09.048.172.125.217l4.061 2.344A.251.251 0 0022 16.35V6.117a.251.251 0 00-.125-.217L13.012.784a.251.251 0 00-.377.217V5.69c0 .09.048.172.126.217z"/><path fill="url(#amazon-eks-color-24__paint2_linear_879_136)" d="M16.676 15.322l-4.55 2.626a.25.25 0 01-.252 0L6.69 14.955a.252.252 0 01-.126-.217V8.75c0-.09.048-.172.126-.217l4.55-2.627a.25.25 0 00.126-.217V1a.251.251 0 00-.377-.217L2.125 5.9A.251.251 0 002 6.117v11.255c0 .09.048.172.125.217l9.75 5.627a.25.25 0 00.25 0l8.863-5.115a.251.251 0 000-.435l-4.06-2.344a.25.25 0 00-.252 0z"/></symbol><symbol id="flight-amazon-eks-color-16" viewBox="0 0 16 16"><path fill="url(#amazon-eks-color-16__paint0_linear_879_141)" fill-rule="evenodd" d="M6.381 10.148h.897V8.121l1.837 2.027h1.164L7.997 7.642l2.169-2.195H8.963L7.278 7.146V5.447h-.897v4.701z" clip-rule="evenodd"/><path fill="url(#amazon-eks-color-16__paint1_linear_879_141)" d="M8.532 3.803l3.186 1.81a.173.173 0 01.088.149v3.62c0 .06.033.118.088.149l2.842 1.615a.176.176 0 00.264-.15V3.947a.173.173 0 00-.088-.15L8.708.274a.176.176 0 00-.264.15v3.23c0 .062.034.119.088.15z"/><path fill="url(#amazon-eks-color-16__paint2_linear_879_141)" d="M11.273 10.288l-3.185 1.81a.178.178 0 01-.176 0l-3.63-2.062a.173.173 0 01-.088-.15V5.762c0-.062.034-.119.088-.15l3.186-1.81a.172.172 0 00.088-.15V.424a.176.176 0 00-.264-.15L1.088 3.798a.173.173 0 00-.088.15V11.7c0 .061.033.118.088.15l6.824 3.876c.054.03.122.03.176 0l6.204-3.524a.172.172 0 000-.3l-2.843-1.615a.178.178 0 00-.176 0z"/></symbol><symbol id="flight-auth0-24" viewBox="0 0 24 24"><path d="M17.849 3H12l1.807 5.63h5.849l-4.732 3.358 1.808 5.663c3.046-2.218 4.041-5.575 2.924-9.02L17.849 3zM4.344 8.63h5.849L12 3H6.152L4.344 8.63c-1.117 3.446-.122 6.802 2.924 9.02l1.808-5.662-4.732-3.357zm2.924 9.02L12 21l4.732-3.35L12 14.244 7.268 17.65z"/></symbol><symbol id="flight-auth0-16" viewBox="0 0 16 16"><path d="M12.549 1h-4.55l1.407 4.38h4.548l-3.68 2.61 1.406 4.405c2.37-1.725 3.143-4.336 2.274-7.016L12.55 1zM2.045 5.38h4.55L8 1H3.45L2.045 5.38c-.868 2.68-.094 5.29 2.275 7.015L5.725 7.99l-3.68-2.612zm2.275 7.015L8 15l3.68-2.605L8 9.745l-3.68 2.65z"/></symbol><symbol id="flight-auth0-color-24" viewBox="0 0 24 24"><path fill="#000" d="M17.848 3H12l1.807 5.63h5.849l-4.732 3.358 1.807 5.663c3.046-2.218 4.042-5.575 2.925-9.02L17.848 3zM4.344 8.63h5.848L12 3H6.15L4.344 8.63c-1.117 3.446-.122 6.802 2.924 9.02l1.808-5.662-4.732-3.357zm2.924 9.02L12 21l4.731-3.35L12 14.244 7.268 17.65z"/></symbol><symbol id="flight-auth0-color-16" viewBox="0 0 16 16"><path fill="#000" d="M12.549 1h-4.55l1.407 4.38h4.548l-3.68 2.61 1.406 4.405c2.37-1.725 3.143-4.336 2.274-7.016L12.55 1zM2.045 5.38h4.55L8 1H3.45L2.045 5.38c-.868 2.68-.094 5.29 2.275 7.015L5.725 7.99l-3.68-2.612zm2.275 7.015L8 15l3.68-2.605L8 9.745l-3.68 2.65z"/></symbol><symbol id="flight-aws-24" viewBox="0 0 24 24"><g><path d="M6.895 10.085c0 .288.031.521.086.692.062.172.14.359.249.561a.338.338 0 01.054.18c0 .077-.047.155-.148.233l-.49.327a.373.373 0 01-.202.07c-.078 0-.156-.039-.234-.11a2.407 2.407 0 01-.28-.365 6.028 6.028 0 01-.241-.46c-.607.717-1.37 1.075-2.288 1.075-.654 0-1.176-.187-1.557-.56-.381-.374-.576-.873-.576-1.495 0-.662.234-1.2.708-1.605.475-.404 1.105-.607 1.907-.607.265 0 .537.023.825.062.288.04.584.102.895.172v-.569c0-.591-.125-1.004-.366-1.246-.249-.24-.67-.358-1.268-.358a3.54 3.54 0 00-.84.102 6.2 6.2 0 00-.841.264 2.232 2.232 0 01-.273.101.477.477 0 01-.124.024c-.11 0-.164-.078-.164-.242V5.95c0-.125.016-.218.055-.273A.583.583 0 012 5.514c.272-.14.599-.257.98-.35a4.716 4.716 0 011.214-.148c.926 0 1.604.21 2.04.63.427.42.645 1.06.645 1.916v2.522h.016zm-3.16 1.183c.257 0 .522-.047.802-.14.28-.094.529-.265.74-.498.124-.148.217-.312.264-.499.046-.187.078-.412.078-.677v-.327a6.493 6.493 0 00-.716-.133 5.86 5.86 0 00-.732-.046c-.521 0-.903.1-1.16.311-.256.21-.381.506-.381.896 0 .366.093.638.288.825.187.195.46.288.817.288zm6.25.841c-.14 0-.234-.023-.296-.078-.062-.047-.117-.156-.164-.304L7.696 5.71a1.365 1.365 0 01-.07-.312c0-.124.063-.195.187-.195h.763c.148 0 .249.024.303.078.063.047.11.156.156.304l1.308 5.155 1.214-5.155c.039-.156.085-.257.147-.304a.535.535 0 01.312-.078h.622c.148 0 .25.024.312.078.062.047.117.156.148.304l1.23 5.217 1.346-5.217c.046-.156.1-.257.155-.304a.508.508 0 01.304-.078h.724c.124 0 .194.063.194.195 0 .039-.008.078-.015.125a1.104 1.104 0 01-.055.194l-1.876 6.02c-.046.155-.1.256-.163.303a.497.497 0 01-.296.078h-.669c-.148 0-.249-.024-.311-.078-.063-.055-.117-.156-.148-.312l-1.206-5.022-1.199 5.015c-.039.155-.085.257-.148.311-.062.055-.171.078-.311.078h-.67zm10 .21a5.15 5.15 0 01-1.198-.14c-.39-.093-.693-.195-.895-.311-.125-.07-.21-.148-.242-.218a.55.55 0 01-.046-.218v-.398c0-.163.062-.24.179-.24a.44.44 0 01.14.022c.047.016.117.047.194.078.265.117.553.21.857.273.31.062.614.093.926.093.49 0 .871-.085 1.136-.257a.839.839 0 00.405-.74.758.758 0 00-.21-.544c-.14-.148-.405-.28-.787-.405l-1.128-.35c-.568-.18-.988-.445-1.245-.795a1.856 1.856 0 01-.39-1.129c0-.327.07-.615.21-.864.14-.25.328-.467.561-.639a2.47 2.47 0 01.81-.405 3.39 3.39 0 01.98-.132c.171 0 .35.008.521.031.18.024.343.055.506.086.156.039.304.078.444.124.14.047.249.094.327.14a.673.673 0 01.233.195.42.42 0 01.07.257V6.2c0 .164-.062.25-.179.25a.81.81 0 01-.295-.094 3.559 3.559 0 00-1.495-.304c-.443 0-.793.07-1.035.218-.241.148-.365.374-.365.693 0 .218.077.405.233.553.156.148.444.296.856.428l1.105.35c.56.18.965.429 1.207.748.24.32.358.685.358 1.09 0 .335-.07.639-.203.903-.14.265-.327.499-.568.686-.241.194-.53.335-.864.436a3.7 3.7 0 01-1.113.163z"/><path fill-rule="evenodd" d="M21.456 16.103c-2.56 1.892-6.28 2.897-9.48 2.897-4.482 0-8.522-1.659-11.572-4.415-.242-.218-.024-.514.264-.343 3.3 1.916 7.37 3.076 11.58 3.076 2.841 0 5.962-.592 8.834-1.806.428-.195.794.28.374.591z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M22.522 14.889c-.327-.42-2.164-.203-2.996-.101-.25.03-.288-.187-.063-.35 1.463-1.029 3.868-.733 4.148-.39.28.35-.077 2.756-1.447 3.909-.21.179-.413.085-.32-.148.312-.771 1.005-2.508.678-2.92z" clip-rule="evenodd"/></g></symbol><symbol id="flight-aws-16" viewBox="0 0 16 16"><g><path d="M4.51 7.687c0 .197.02.357.058.475.042.117.096.245.17.384a.233.233 0 01.037.123c0 .053-.032.107-.1.16l-.336.224a.255.255 0 01-.138.048c-.054 0-.107-.026-.16-.074a1.652 1.652 0 01-.192-.251 4.137 4.137 0 01-.164-.315c-.416.491-.937.737-1.565.737-.447 0-.804-.129-1.064-.385-.261-.256-.394-.598-.394-1.025 0-.454.16-.822.484-1.1.325-.278.756-.416 1.304-.416.18 0 .367.016.564.042.197.027.4.07.612.118v-.39c0-.406-.085-.689-.25-.854-.17-.166-.458-.246-.868-.246-.186 0-.377.022-.574.07a4.23 4.23 0 00-.575.181 1.525 1.525 0 01-.186.07.326.326 0 01-.085.016c-.075 0-.112-.054-.112-.166v-.262c0-.085.01-.15.037-.186a.399.399 0 01.15-.113c.185-.096.409-.176.67-.24.26-.07.537-.101.83-.101.633 0 1.096.144 1.394.432.293.288.442.726.442 1.314v1.73h.01zm-2.161.811c.175 0 .356-.032.548-.096.192-.064.362-.182.505-.342a.848.848 0 00.181-.341c.032-.129.054-.283.054-.465V7.03a4.43 4.43 0 00-.49-.09 3.996 3.996 0 00-.5-.033c-.357 0-.617.07-.793.214-.176.144-.26.347-.26.614 0 .25.063.437.196.566.128.133.314.197.559.197zm4.273.577c-.096 0-.16-.016-.202-.054-.043-.032-.08-.106-.112-.208l-1.25-4.127a.938.938 0 01-.048-.214c0-.085.042-.133.127-.133h.522c.1 0 .17.016.207.053.043.032.075.107.107.208l.894 3.535.83-3.535c.026-.106.058-.176.101-.208a.365.365 0 01.213-.053h.426c.1 0 .17.016.212.053.043.032.08.107.102.208l.84 3.578.92-3.578a.459.459 0 01.107-.208.347.347 0 01.208-.053h.495c.085 0 .133.043.133.133 0 .027-.006.054-.01.086a.768.768 0 01-.038.133l-1.283 4.127c-.031.107-.069.177-.111.209a.34.34 0 01-.203.053h-.457c-.101 0-.17-.016-.213-.053-.043-.038-.08-.107-.101-.214L8.213 5.37l-.82 3.439c-.026.107-.058.176-.1.213-.043.038-.118.054-.213.054h-.458zm6.838.144a3.51 3.51 0 01-.82-.096c-.266-.064-.473-.134-.612-.214-.085-.048-.143-.101-.165-.15a.38.38 0 01-.031-.149v-.272c0-.112.042-.166.122-.166a.3.3 0 01.096.016c.032.011.08.032.133.054.18.08.378.144.585.187.213.042.42.064.633.064.336 0 .596-.059.777-.176a.575.575 0 00.277-.508.52.52 0 00-.144-.373c-.095-.102-.276-.193-.537-.278l-.772-.24c-.388-.123-.676-.305-.851-.545a1.275 1.275 0 01-.266-.774c0-.224.048-.422.143-.593.096-.17.224-.32.384-.438.16-.122.34-.213.553-.277.213-.064.436-.091.67-.091.118 0 .24.005.357.021.122.016.234.038.346.06.106.026.208.052.303.085.096.032.17.064.224.096a.461.461 0 01.16.133.289.289 0 01.047.176v.251c0 .112-.042.171-.122.171a.552.552 0 01-.202-.064 2.428 2.428 0 00-1.022-.208c-.303 0-.543.048-.708.15-.165.1-.25.256-.25.475 0 .149.053.277.16.379.106.101.303.202.585.293l.756.24c.383.123.66.294.825.513.165.219.244.47.244.748 0 .23-.047.437-.138.619a1.435 1.435 0 01-.388.47c-.165.133-.362.23-.591.299-.24.075-.49.112-.761.112z"/><path fill-rule="evenodd" d="M14.465 11.813c-1.75 1.297-4.294 1.986-6.481 1.986-3.065 0-5.827-1.137-7.913-3.027-.165-.15-.016-.353.18-.235 2.257 1.313 5.04 2.109 7.92 2.109 1.941 0 4.075-.406 6.039-1.239.293-.133.543.192.255.406z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M15.194 10.98c-.223-.287-1.479-.138-2.048-.069-.17.022-.197-.128-.043-.24 1-.705 2.645-.502 2.836-.267.192.24-.053 1.89-.99 2.68-.143.123-.281.06-.217-.1.212-.53.686-1.72.462-2.003z" clip-rule="evenodd"/></g></symbol><symbol id="flight-aws-color-24" viewBox="0 0 24 24"><path fill="#252F3E" d="M6.895 10.085c0 .288.031.521.085.692.063.172.14.359.25.561a.338.338 0 01.054.18c0 .077-.047.155-.148.233l-.49.327a.373.373 0 01-.203.07c-.077 0-.155-.039-.233-.11a2.408 2.408 0 01-.28-.365 6.031 6.031 0 01-.241-.46c-.607.717-1.37 1.075-2.288 1.075-.654 0-1.176-.187-1.557-.56-.381-.374-.576-.873-.576-1.495 0-.662.234-1.2.708-1.605.475-.404 1.105-.607 1.907-.607.265 0 .537.023.825.062.288.04.584.102.895.172v-.569c0-.591-.125-1.004-.366-1.246-.249-.24-.67-.358-1.268-.358a3.54 3.54 0 00-.84.102 6.2 6.2 0 00-.841.264 2.234 2.234 0 01-.273.101.477.477 0 01-.124.024c-.11 0-.164-.078-.164-.242V5.95c0-.125.016-.218.055-.273A.583.583 0 012 5.514c.272-.14.599-.257.98-.35a4.716 4.716 0 011.214-.148c.926 0 1.604.21 2.04.63.427.42.645 1.06.645 1.916v2.522h.016zm-3.16 1.183c.257 0 .522-.047.802-.14.28-.094.529-.265.74-.498.124-.148.217-.312.264-.499.046-.187.078-.412.078-.677v-.327a6.494 6.494 0 00-.716-.133 5.86 5.86 0 00-.732-.046c-.521 0-.903.1-1.16.311-.256.21-.381.506-.381.896 0 .366.093.638.288.825.187.195.46.288.817.288zm6.25.841c-.14 0-.234-.023-.296-.078-.062-.047-.117-.156-.164-.304L7.696 5.71a1.364 1.364 0 01-.07-.312c0-.124.063-.195.187-.195h.763c.148 0 .249.024.303.078.063.047.11.156.156.304l1.308 5.155 1.214-5.155c.039-.156.085-.257.147-.304a.535.535 0 01.312-.078h.622c.148 0 .25.024.312.078.062.047.117.156.148.304l1.23 5.217 1.346-5.217c.046-.156.1-.257.155-.304a.508.508 0 01.304-.078h.724c.124 0 .194.063.194.195 0 .039-.008.078-.015.125a1.104 1.104 0 01-.055.194l-1.876 6.02c-.046.155-.1.256-.163.303a.497.497 0 01-.296.078h-.669c-.148 0-.249-.024-.311-.078-.063-.055-.117-.156-.148-.312l-1.206-5.022-1.199 5.015c-.039.155-.086.257-.148.311-.062.055-.171.078-.311.078h-.67zm10 .21a5.15 5.15 0 01-1.198-.14c-.39-.093-.693-.195-.895-.311-.125-.07-.21-.148-.242-.218a.55.55 0 01-.046-.218v-.398c0-.163.062-.24.179-.24a.44.44 0 01.14.022c.047.016.117.047.194.078.265.117.553.21.857.273.31.062.614.093.926.093.49 0 .871-.085 1.136-.257a.838.838 0 00.404-.74.758.758 0 00-.21-.544c-.14-.148-.404-.28-.786-.405l-1.128-.35c-.568-.18-.988-.445-1.245-.795a1.856 1.856 0 01-.39-1.129c0-.327.07-.615.21-.864.14-.25.328-.467.561-.639a2.47 2.47 0 01.81-.405 3.39 3.39 0 01.98-.132c.171 0 .35.008.521.031.18.024.343.055.506.086.156.039.304.078.444.124.14.047.249.094.327.14a.673.673 0 01.233.195.42.42 0 01.07.257V6.2c0 .164-.062.25-.179.25a.81.81 0 01-.295-.094 3.559 3.559 0 00-1.495-.304c-.443 0-.793.07-1.035.218-.241.148-.365.374-.365.693 0 .218.077.405.233.553.156.148.444.296.856.428l1.105.35c.56.18.965.429 1.207.748.24.32.358.685.358 1.09 0 .335-.07.639-.203.903-.14.265-.327.499-.568.686-.241.194-.53.335-.864.436a3.7 3.7 0 01-1.113.163z"/><g fill="#F90" fill-rule="evenodd" clip-rule="evenodd"><path d="M21.456 16.103c-2.56 1.892-6.28 2.897-9.48 2.897-4.482 0-8.522-1.659-11.572-4.415-.242-.218-.024-.514.264-.343 3.3 1.916 7.37 3.076 11.58 3.076 2.841 0 5.962-.592 8.834-1.806.428-.195.794.28.374.591z"/><path d="M22.522 14.889c-.327-.42-2.164-.203-2.996-.101-.25.03-.288-.187-.063-.35 1.463-1.029 3.868-.733 4.148-.39.28.35-.077 2.756-1.447 3.909-.21.179-.413.085-.32-.148.312-.771 1.005-2.508.678-2.92z"/></g></symbol><symbol id="flight-aws-color-16" viewBox="0 0 16 16"><path fill="#252F3E" d="M4.51 7.687c0 .197.02.357.058.475.042.117.096.245.17.384a.233.233 0 01.037.123c0 .053-.032.107-.1.16l-.336.224a.255.255 0 01-.138.048c-.054 0-.107-.026-.16-.074a1.652 1.652 0 01-.192-.251 4.137 4.137 0 01-.165-.315c-.415.491-.936.737-1.564.737-.447 0-.804-.129-1.064-.385-.261-.256-.394-.598-.394-1.025 0-.454.16-.822.484-1.1.325-.278.756-.416 1.304-.416.18 0 .367.016.564.042.197.027.4.07.612.118v-.39c0-.406-.085-.689-.25-.854-.17-.166-.458-.246-.868-.246-.186 0-.377.022-.574.07a4.23 4.23 0 00-.575.181 1.525 1.525 0 01-.186.07.326.326 0 01-.085.016c-.075 0-.112-.054-.112-.166v-.262c0-.085.01-.15.037-.186a.399.399 0 01.15-.113c.185-.096.409-.176.67-.24.26-.07.537-.101.83-.101.633 0 1.096.144 1.394.432.293.288.442.726.442 1.314v1.73h.01zm-2.161.811c.175 0 .356-.032.548-.096.191-.064.362-.182.505-.342a.848.848 0 00.181-.341c.032-.129.054-.283.054-.465V7.03a4.43 4.43 0 00-.49-.09 3.996 3.996 0 00-.5-.033c-.357 0-.618.07-.793.214-.176.144-.26.347-.26.614 0 .25.063.437.196.566.128.133.314.197.559.197zm4.273.577c-.096 0-.16-.016-.202-.054-.043-.032-.08-.106-.112-.208l-1.25-4.127a.938.938 0 01-.049-.214c0-.085.043-.133.128-.133h.522c.1 0 .17.016.207.053.043.032.075.107.107.208l.894 3.535.83-3.535c.026-.106.058-.176.1-.208a.365.365 0 01.214-.053h.425c.102 0 .17.016.213.053.043.032.08.107.101.208l.841 3.578.92-3.578a.458.458 0 01.107-.208.346.346 0 01.208-.053h.495c.085 0 .133.043.133.133 0 .027-.006.054-.01.086a.76.76 0 01-.038.133l-1.283 4.127c-.032.107-.069.177-.111.209a.34.34 0 01-.203.053h-.457c-.101 0-.17-.016-.213-.053-.043-.038-.08-.107-.101-.214L8.213 5.37l-.82 3.439c-.026.107-.058.176-.1.213-.043.038-.118.054-.213.054h-.458zm6.838.144a3.51 3.51 0 01-.82-.096c-.266-.064-.473-.134-.612-.214-.085-.048-.143-.101-.165-.15a.378.378 0 01-.031-.149v-.272c0-.112.042-.166.122-.166a.3.3 0 01.096.016c.032.011.08.032.133.054.18.08.378.144.585.187.213.042.42.064.633.064.336 0 .596-.059.777-.176a.575.575 0 00.277-.508.52.52 0 00-.144-.373c-.095-.102-.276-.193-.537-.278l-.772-.24c-.388-.123-.676-.305-.851-.545a1.275 1.275 0 01-.266-.774c0-.224.048-.422.143-.593.096-.17.224-.32.384-.438.16-.122.34-.213.553-.277.213-.064.436-.091.67-.091.118 0 .24.005.357.021.122.016.234.038.346.06.106.026.208.052.303.085.096.032.17.064.224.096a.46.46 0 01.16.133.289.289 0 01.047.176v.251c0 .112-.042.171-.122.171a.552.552 0 01-.202-.064 2.427 2.427 0 00-1.022-.208c-.303 0-.543.048-.708.15-.165.1-.25.256-.25.475 0 .149.053.277.16.379.106.101.303.202.585.293l.756.24c.383.123.66.294.825.513.165.219.244.47.244.748 0 .23-.047.437-.138.619a1.436 1.436 0 01-.388.47c-.165.133-.362.23-.591.299-.24.075-.49.112-.761.112z"/><g fill="#F90" fill-rule="evenodd" clip-rule="evenodd"><path d="M14.465 11.813c-1.75 1.297-4.294 1.986-6.481 1.986-3.065 0-5.827-1.137-7.913-3.027-.165-.15-.016-.353.18-.235 2.257 1.313 5.04 2.109 7.92 2.109 1.941 0 4.075-.406 6.039-1.239.293-.133.543.192.255.406z"/><path d="M15.194 10.98c-.223-.287-1.479-.138-2.048-.069-.17.022-.197-.128-.043-.24 1-.705 2.645-.502 2.836-.267.192.24-.053 1.89-.99 2.68-.143.123-.281.06-.218-.1.213-.53.687-1.72.463-2.003z"/></g></symbol><symbol id="flight-aws-cloudwatch-24" viewBox="0 0 24 24"><g><path d="M9.346 2.006l.041.013.164.066a18.598 18.598 0 00.566.217l.244.09.206.082a11.573 11.573 0 00.456.175l.222.082.215.085.225.09.243.089.208.076c.185.07.37.14.554.212l.19.076a14.984 14.984 0 00.43.166c.066.023.131.047.196.072.08.03.159.062.237.094l.252.099c.075.029.15.056.226.083.073.027.147.053.22.081l.21.084a11.554 11.554 0 00.473.18c.075.027.15.054.223.082l.21.084c.069.028.138.056.209.083.081.031.164.061.246.09l.207.077c.072.027.143.055.218.085l.069.027c0 1.332-.002 2.48-.003 3.626C16.5 9.519 16.5 10.667 16.5 12l-7 .456v4.46l-.176.035V2a.701.701 0 00.022.006zM21 17.57c-.023.008-.046.016-.068.027l-8.836 4.338a.493.493 0 01-.088.034l-.002-.014V18.88l.295-.102.396-.137a1887.202 1887.202 0 002.634-.921l.815-.284.813-.282.581-.203h.001l.58-.203a927.627 927.627 0 012.225-.773h.002l.544-.189a.195.195 0 00.043-.024.433.433 0 01.02-.012l.044-.006L21 17.57z"/><path d="M3.02 17.564L3 17.57v-1.81h.015l.03-.002.03-.002.016.01c.013.008.025.016.04.021.513.18 1.027.358 1.54.537l1.94.676c.78.27 1.558.542 2.337.814l3.044 1.063.006.002.009.002v3.075l-.001.004v.004l.002.006-.034-.012-.023-.01a.627.627 0 01-.038-.016l-8.852-4.347-.04-.02zM9.324 2v14.951l-.034-.007-.06-.012-1.755-.532-.172-.053-.079-.024v-.4a1.49 1.49 0 01.002-.075V5.58l-.002-.11V3.026l.02-.011.039-.02 1.979-.973c.014-.007.03-.012.045-.017L9.324 2zM18.479 12.748H18.2v-.002a.492.492 0 00-.088-.008h-1.115l-.329.001-.164.001-.165.005-.276.009-.236.011-.092.006-.067.003-.201.013-.208.017-.306.023-.216.012-.135.006-.246.016-.22.017-.3.023c-.066.005-.131.008-.197.011a11.022 11.022 0 00-.579.039l-.305.023c-.132.01-.264.017-.396.024l-.156.009-.261.016h-.001l-.588.042-.132.008a7.598 7.598 0 00-.159.01c-.08.005-.16.011-.239.018l-.274.021-.225.012-.111.006h-.01c-.017 0-.033-.002-.038.022l.104.014.287.035c.039.004.078.006.116.008l.1.007.717.074h.001l.261.03.123.013.08.01.052.007.014-.003.017-.002a.881.881 0 01.065-.01l.145-.012.242-.02.242-.026.278-.03c.104-.01.21-.018.314-.027l.229-.02.455-.044.146-.014.097-.009.097-.009.15-.016a29.8 29.8 0 01.235-.024l.168-.014.204-.018.186-.02.185-.02c.07-.007.14-.012.211-.018l.176-.015.445-.043.149-.015.1-.009.1-.01.19-.019.196-.02.184-.016.188-.016.416-.041.114-.01.228-.022c.007 0 .013-.007.02-.012a.107.107 0 01.008-.008h.001l-.009.008c-.006.006-.012.011-.019.012l-.171.016a19.747 19.747 0 00-.337.033l-.25.024-.184.017-.188.016-.259.026-.127.013-.1.01-.1.009-.149.015a60.931 60.931 0 01-.638.06 12.598 12.598 0 00-.396.038l-.169.017a19.072 19.072 0 01-.372.033l-.233.024-.152.016-.097.009-.097.009-.256.025a51.508 51.508 0 01-.57.052l-.318.028-.277.03-.243.025c-.08.008-.161.014-.242.021a36.98 36.98 0 00-.145.012.873.873 0 00-.096.014l-.055-.006a41.313 41.313 0 00-.461-.052l-.718-.075a2.347 2.347 0 00-.103-.007c-.038-.002-.075-.004-.112-.008-.106-.012-.21-.025-.316-.039l-.076-.01-.079-.003v3.537c0 .024 0 .048-.002.072v.396l.006.002.066.021 1.433.424.27.077.146.041.062-.016c.042-.01.084-.02.125-.032a217.764 217.764 0 001.009-.3c.278-.083.557-.165.835-.246l.005-.002a808.737 808.737 0 001.057-.312l.422-.125.595-.176.008-.002.593-.175.483-.144h.001l.482-.144.723-.212h.002c.071-.02.071-.02.072-.095l.004-.36-.002-.025c-.002-.023-.004-.047-.004-.07v-2.546zM6.22 16.021l.108.031.014.001-.002-.013.001-.001.001-.074V5.297l-.027.004c-.018.002-.036.004-.053.01l-1.356.512c-.058.022-.088.065-.088.129v9.44l-.003.073-.002.029.008.098.022.007.049.016 1.113.344.215.062z"/></g></symbol><symbol id="flight-aws-cloudwatch-16" viewBox="0 0 16 16"><g><path d="M6.407 1.004l.029.01.113.045.203.08c.063.024.127.048.19.07l.17.064.142.056a8.142 8.142 0 00.471.179l.15.059a9.923 9.923 0 00.47.177l.384.147.132.053a10.5 10.5 0 00.299.115c.045.016.09.032.136.05l.165.065.174.069.157.058.153.056.146.058.159.063c.056.022.113.042.17.063a7.208 7.208 0 01.3.115c.048.019.096.039.145.057a11.408 11.408 0 00.315.116l.15.06.049.018-.002 2.518-.002 2.52-4.861.316v3.097l-.123.025-.023-.005-.042-.009L5.107 11l-.119-.037-.054-.017v-.278-.025V3.485 1.712l.013-.007.027-.014c.458-.226.916-.45 1.375-.675a.237.237 0 01.03-.012L6.392 1l.016.004zM14.5 11.812l-.01.004a.404.404 0 00-.037.015l-6.136 3.013a.338.338 0 01-.042.016l-.02.008v-2.146l.204-.07.275-.096 1.174-.41a580.853 580.853 0 011.217-.425l.003-.001.566-.197.4-.14h.002l.005-.002.4-.14a574.277 574.277 0 011.544-.536l.38-.131c.01-.004.02-.01.03-.017l.003-.002a.224.224 0 01.01-.006l.032-.004v1.267zM2.014 11.808L2 11.812v-1.257h.01l.02-.001.022-.002a.279.279 0 01.011.007.123.123 0 00.027.015l1.071.373 1.348.47 1.621.564 2.116.74.009.001V14.868l-.023-.009-.016-.007a.447.447 0 01-.026-.011l-6.148-3.019-.028-.014z"/><path d="M12.75 8.464h-.194v-.002l-.022-.002c-.013-.001-.026-.003-.04-.003H11.494l-.114.001a25.784 25.784 0 01-.307.01l-.163.008-.065.004-.046.002a9.47 9.47 0 00-.14.009l-.144.011a17.39 17.39 0 01-.362.025 9.811 9.811 0 00-.265.016l-.153.011-.209.016-.136.008-.097.005a7.02 7.02 0 00-.305.022l-.212.016-.275.016-.108.007-.182.011-.408.03a6.7 6.7 0 01-.092.004l-.11.007-.166.013-.191.015-.156.008-.078.004h-.007c-.01 0-.022-.001-.025.016l.072.009c.066.008.132.017.2.024a1.3 1.3 0 00.08.006 102.76 102.76 0 01.568.057l.18.02.086.01c.019.001.038.004.056.006l.036.005.022-.004a13.189 13.189 0 01.893-.087l.158-.013.316-.03.102-.01.067-.007.067-.006.105-.01c.054-.007.109-.012.163-.017l.117-.01.141-.013.13-.014.128-.014.146-.012a11.738 11.738 0 00.432-.04l.103-.01.14-.014a19.513 19.513 0 00.267-.027l.128-.011.13-.012.29-.028.078-.008.159-.014c.005 0 .009-.005.013-.009l.003-.003.003-.002-.001.002-.005.003c-.004.004-.008.008-.013.009l-.118.011-.12.01-.115.013-.173.016-.128.012-.13.011-.18.019-.089.008-.139.013-.103.01a46.895 46.895 0 01-.443.042l-.135.011-.14.015-.118.013-.127.011c-.043.004-.088.007-.13.012l-.162.016-.107.01a6.927 6.927 0 01-.067.007l-.067.007-.177.017-.24.023-.156.014-.222.019a13.189 13.189 0 00-.36.038 12.034 12.034 0 01-.27.023.607.607 0 00-.044.006l-.022.004-.038-.004-.053-.007-.267-.03c-.166-.017-.332-.035-.499-.051a1.662 1.662 0 00-.071-.005l-.078-.006-.219-.027-.053-.007-.055-.002v2.456l-.001.05v.275l.004.002.046.014c.331.099.663.197.995.294.062.019.125.037.188.054l.1.029.02-.005.024-.006c.029-.007.058-.014.087-.023l.333-.1.367-.108c.193-.058.387-.114.58-.171l.445-.13.293-.088c.097-.03.195-.058.293-.087l.83-.245.334-.1h.003l.334-.1.503-.147c.05-.014.05-.014.05-.066l.003-.25-.001-.017a.575.575 0 01-.003-.05V8.465zM4.236 10.737l.075.021h.009V10.75 3.29l-.018.002c-.012.002-.025.003-.037.007l-.941.356c-.04.015-.061.045-.061.09V10.3a.803.803 0 01-.003.05v.02l.005.069.015.005a246.573 246.573 0 00.807.25l.15.043z"/></g></symbol><symbol id="flight-aws-cloudwatch-color-24" viewBox="0 0 24 24"><path fill="#759C3E" d="M21 17.57c-.023.008-.046.016-.068.027l-8.836 4.338c-.028.014-.06.023-.088.034l-.002-.014v-.06-3.015l.691-.24a1887.202 1887.202 0 002.634-.92c.543-.19 1.086-.377 1.628-.566l1.162-.406c.56-.195 1.119-.39 1.678-.583l1.093-.379c.022-.008.041-.024.062-.036l.045-.006v1.825H21z"/><path fill="#C6CDBD" d="M3.02 17.564L3 17.57v-1.81h.015c.001.027.004.054.004.08v1.196l.002.529z"/><path fill="#759C3E" d="M9.324 2c.02.006.043.011.063.02.152.06.303.122.456.18.172.066.346.127.518.193.147.056.292.118.44.174.147.057.297.107.444.164.147.056.292.118.44.174.149.057.3.11.45.166.186.07.371.14.555.212.14.055.279.113.419.168.131.05.265.095.397.146.164.063.325.13.489.193.147.056.297.108.445.164.148.057.293.118.44.174.155.06.312.114.467.172.14.054.278.114.419.167.15.057.302.11.453.167.094.035.187.073.287.112v7.996c-.148.004-.294.007-.442.013-.11.004-.219.011-.328.017-.09.005-.179.01-.268.017-.17.013-.342.028-.514.04-.117.008-.234.012-.35.018l-.246.016c-.174.013-.348.028-.521.04-.112.008-.224.012-.336.018l-.231.015c-.171.013-.342.028-.514.04-.183.012-.368.022-.552.033l-.26.016-.59.042c-.096.006-.193.01-.29.017-.171.012-.342.028-.514.04-.112.008-.224.012-.336.018-.019 0-.042-.007-.047.022l-.079-.004V16.697l-.003.096c-.015 0-.03-.003-.044 0l-.405.093c-.104.023-.208.044-.312.065V2.125 2z"/><path fill="#4B612C" d="M9.324 2v14.95c-.031-.006-.064-.01-.095-.018L7.476 16.4l-.25-.077v-.4-.075V5.58 3.026c.02-.01.038-.022.058-.031l1.979-.973c.02-.009.04-.015.061-.022z"/><path fill="#759C3E" d="M18.201 12.748h.278V15.294c0 .031.003.063.006.095l-.004.36c-.001.075-.001.075-.074.095l-.723.212-.966.288-1.196.353-.844.25-1.475.434-1.009.3c-.062.02-.125.033-.187.049l.001-.03v-4.34c.032-.005.064-.011.096-.014.129-.011.258-.02.387-.033.173-.017.346-.038.52-.055.18-.017.361-.03.543-.047.2-.019.401-.04.601-.058l.194-.018.385-.04.372-.033c.124-.012.248-.027.371-.04.13-.012.258-.02.387-.032.198-.018.396-.039.594-.058l.2-.019.386-.039c.124-.011.248-.02.372-.033l.416-.04.342-.033c.01 0 .019-.013.028-.02h-.001z"/><path fill="#4B612C" d="M3.02 17.564l-.001-.528V15.84c0-.027-.003-.054-.005-.08l.06-.005c.019.011.036.025.056.031.771.27 1.542.537 2.313.806l3.505 1.22 3.058 1.069v3.075l-.031.001-.062-.026-8.852-4.347-.04-.02z"/><path fill="#B7CA9D" d="M12.007 18.88l-3.059-1.068c-1.168-.408-2.336-.814-3.504-1.22-.771-.27-1.542-.537-2.313-.806-.02-.008-.037-.021-.056-.031.02-.008.038-.021.058-.024.194-.03.388-.057.582-.085l.56-.079.442-.064.096-.01.008.098.07.024c.372.114.743.23 1.114.343.107.033.215.062.322.094h.015c.015 0 .03.002.045 0 .186-.032.372-.066.558-.096.092-.014.186-.023.28-.034v.4l.25.078 1.755.531c.03.01.062.013.094.019.104-.022.208-.042.312-.065l.405-.093c.014-.003.03 0 .044 0v.372l.073.023 1.433.424.416.118c.062-.016.125-.03.187-.048l1.009-.3c.491-.146.983-.29 1.475-.434l.844-.251 1.196-.353.966-.287c.241-.072.482-.142.723-.212.073-.021.073-.02.074-.096 0-.12.003-.24.004-.36.138.018.276.034.413.053.157.021.315.045.472.068l.457.065.464.067.45.065c.056.008.113.015.169.024.016.002.03.013.044.02-.02.012-.04.027-.063.036l-1.092.378-1.678.583-1.162.406c-.542.19-1.085.377-1.628.566l-.943.33-1.69.591-.691.24z"/><path fill="#4B612C" d="M6.328 16.052c-.108-.031-.216-.061-.323-.093a369.49 369.49 0 01-1.113-.344l-.071-.023-.008-.098c.002-.034.005-.068.005-.102v-9.44c0-.064.03-.107.088-.13l1.356-.51c.025-.01.053-.01.08-.015v10.742l-.014.014z"/><path fill="#759C3E" d="M6.34 16.039l.001-.074V5.363v-.066c.069.011.138.02.205.034l.612.135c.021.005.045.002.066.003l.002.11v10.27l-.002.074c-.093.01-.187.02-.28.034-.185.03-.37.064-.557.096-.014.002-.03.001-.045.001l-.001-.015z"/><path fill="#B6C99B" d="M18.201 12.748c-.01.007-.018.02-.028.02l-.342.031-.416.042c-.123.011-.248.02-.372.033l-.386.038-.2.02-.594.057c-.129.012-.258.02-.387.033-.124.012-.247.028-.37.04-.124.012-.248.02-.373.033-.129.012-.257.026-.386.039l-.193.018c-.2.02-.4.04-.601.058-.181.016-.362.03-.543.048-.174.016-.347.037-.52.054-.129.013-.258.022-.387.033-.032.003-.064.01-.096.015l-.132-.017-.384-.042-.718-.075c-.072-.007-.144-.007-.216-.015-.13-.015-.26-.032-.39-.049.005-.029.028-.022.047-.022.112-.006.223-.01.336-.018.17-.012.342-.027.513-.04.097-.007.194-.01.291-.017l.589-.042.26-.016c.185-.01.369-.02.553-.033.17-.011.342-.027.513-.04l.231-.015c.113-.007.224-.01.336-.018.174-.012.348-.027.521-.04l.246-.016c.117-.006.234-.01.351-.018.171-.012.342-.027.514-.04l.268-.016.328-.018.441-.013.493-.002h1.114c.03 0 .06.005.089.008v.002z"/><path fill="#596F39" d="M11.975 21.957l.03-.002.002.015-.033-.013z"/><path fill="#4B612C" d="M10.167 13.163c.13.017.26.034.392.049.071.007.144.008.215.015a145.612 145.612 0 011.102.117l.132.017v4.34l-.001.03c-.139-.04-.278-.079-.416-.12-.478-.14-.956-.281-1.433-.423a2.33 2.33 0 01-.073-.023v-.372l.003-.096V13.16l.079.004z"/><path fill="#567031" d="M6.34 16.039l.002.014h-.015l.013-.014z"/></symbol><symbol id="flight-aws-cloudwatch-color-16" viewBox="0 0 16 16"><path fill="#759C3E" d="M14 11.899l-.045.019-5.89 3.037c-.02.01-.04.016-.06.024v-.01-.042-2.11a1291.057 1291.057 0 002.216-.813c.361-.133.723-.264 1.085-.396l.775-.285 1.118-.408.729-.265c.015-.005.028-.016.042-.025l.03-.004v1.278z"/><path fill="#C6CDBD" d="M2.014 11.895L2 11.899V10.63h.01c0 .019.003.038.003.056v.838l.001.37z"/><path fill="#759C3E" d="M6.216 1c.014.005.029.008.042.014.101.042.202.085.304.126l.345.135c.098.04.195.083.294.122.098.04.198.075.296.115.098.04.194.082.293.122.1.04.2.076.3.116l.37.148c.093.039.186.08.28.117.087.036.176.067.264.103.11.044.217.091.326.135.098.04.198.075.297.115.098.04.195.083.293.122.103.042.208.08.311.12.094.038.186.08.28.117.1.04.201.077.302.117.062.024.124.05.19.078V8.52l-.293.01c-.074.003-.146.008-.22.012a6.5 6.5 0 00-.178.011c-.114.01-.228.02-.342.028-.078.006-.156.008-.234.013l-.164.011c-.116.01-.232.02-.347.028-.075.006-.15.008-.224.013a6.474 6.474 0 00-.154.01c-.114.01-.228.02-.343.028-.122.009-.245.016-.368.023l-.174.012-.392.029c-.065.004-.13.007-.194.012-.114.008-.228.02-.343.028-.074.005-.149.008-.224.012-.012.001-.028-.004-.031.016l-.053-.003v2.476c0 .022 0 .044-.002.067-.01 0-.02-.002-.03 0l-.27.065-.207.046V1.088 1z"/><path fill="#4B612C" d="M6.216 1v10.465c-.02-.004-.042-.007-.063-.013l-1.17-.372-.167-.054v-.28l.001-.052V3.505 1.718l.038-.022 1.32-.68c.013-.007.027-.011.04-.016h.001z"/><path fill="#759C3E" d="M12.134 8.523h.185v1.783c0 .022.003.044.004.066l-.003.252c0 .053 0 .053-.048.067l-.483.148-.644.202-.797.247-.563.175-.983.304-.673.21c-.04.013-.083.023-.124.034v-.02-3.039c.022-.003.043-.008.064-.01.086-.008.172-.014.258-.023.116-.012.231-.027.347-.038.12-.013.241-.022.362-.034.133-.012.267-.027.401-.04l.129-.013c.085-.009.171-.019.257-.027.082-.009.165-.015.248-.023.082-.01.165-.02.247-.028.086-.009.172-.015.258-.023l.396-.04.134-.014c.085-.009.171-.019.257-.027l.248-.023.277-.029.228-.022c.007-.001.013-.01.019-.014z"/><path fill="#4B612C" d="M2.014 11.895l-.002-.37v-.837l-.002-.056.04-.003c.012.007.024.017.037.021l1.542.564 2.336.855 2.04.748v2.11l-.001.042h-.021c-.014-.005-.028-.01-.04-.017L2.04 11.909l-.026-.014z"/><path fill="#B7CA9D" d="M8.005 12.816l-2.04-.748-2.336-.854-1.542-.564c-.013-.005-.025-.015-.037-.022.013-.005.025-.014.039-.017l.387-.059.374-.055.295-.045.064-.007.005.069.047.016c.248.08.495.161.743.24.07.024.143.044.214.066l.01.001h.03c.124-.023.248-.047.372-.068.062-.01.124-.016.186-.024v.28l.167.055 1.17.372c.02.006.042.009.063.013l.208-.046c.09-.02.18-.043.27-.065.01-.002.02 0 .03 0v.26l.048.017.955.296c.092.029.185.056.278.083.041-.01.083-.02.124-.033l.673-.21.983-.304.563-.176.797-.247.644-.201c.161-.05.322-.1.483-.148.048-.015.048-.015.048-.067l.003-.253c.092.013.184.024.276.038.105.014.21.031.314.047l.305.046.31.047.3.045c.037.006.075.01.112.017.01.002.02.01.03.014-.014.008-.027.019-.042.025l-.729.265-1.118.408-.775.284-1.085.396-.63.231-1.126.414-.46.168z"/><path fill="#4B612C" d="M4.218 10.837c-.071-.022-.143-.043-.214-.066l-.743-.24-.047-.017-.005-.068.003-.072V3.766c0-.045.02-.075.059-.09.3-.12.602-.24.904-.358.016-.007.035-.007.053-.01v7.519l-.01.01z"/><path fill="#759C3E" d="M4.227 10.827v-.051-7.422-.046c.046.008.092.013.137.024.136.03.272.063.408.094.014.003.03.002.044.003l.001.077V10.746c-.063.008-.126.014-.187.024-.124.021-.248.045-.372.067-.01.002-.02 0-.03 0v-.01z"/><path fill="#B6C99B" d="M12.134 8.523c-.006.005-.012.014-.019.014-.076.009-.152.015-.228.023l-.277.029c-.082.008-.165.014-.248.023-.086.008-.172.018-.257.027l-.134.013c-.132.014-.264.028-.396.04-.086.009-.172.015-.258.023-.082.009-.165.02-.247.028-.082.009-.165.015-.248.023l-.257.028-.129.013-.401.04c-.12.012-.241.021-.362.033-.116.012-.23.027-.347.039l-.258.023c-.021.002-.042.006-.063.01l-.088-.012-.256-.03-.48-.052c-.047-.005-.095-.005-.143-.01-.087-.01-.173-.023-.26-.034.003-.02.019-.016.03-.016l.225-.012c.114-.009.228-.02.342-.028l.194-.012.393-.03.174-.011c.122-.008.245-.014.368-.023.114-.008.228-.019.342-.028.051-.004.103-.008.154-.01l.224-.013.347-.028.164-.011c.078-.005.156-.007.234-.013.114-.008.228-.019.343-.028l.178-.012c.073-.004.146-.009.22-.011.097-.005.195-.007.293-.01l.329-.001h.743c.02 0 .039.004.059.005v.001z"/><path fill="#596F39" d="M7.983 14.97l.02-.001.002.01-.022-.01z"/><path fill="#4B612C" d="M6.778 8.814c.087.012.174.024.261.034.048.006.096.006.144.01l.478.053.256.03c.03.003.059.008.088.012v3.058c-.093-.027-.186-.054-.278-.083l-.955-.296-.049-.017v-.26l.002-.067V8.812l.053.003z"/><path fill="#567031" d="M4.228 10.827l.001.012-.01-.001.01-.01h-.001z"/></symbol><symbol id="flight-aws-ec2-24" viewBox="0 0 24 24"><g><path d="M10.002.991l1.995-.99L22 4.97v14.058L11.997 24l-1.995-.99V.99zM8.257 1.857l-1.543.767v18.752l1.543.767V1.857zM4.11 3.918L5.34 3.31v17.382l-1.232-.61V3.919zM3 4.471v15.058l-1-.497V4.968l1-.497z"/></g></symbol><symbol id="flight-aws-ec2-16" viewBox="0 0 16 16"><g><path d="M6.602.66L7.998 0 15 3.314v9.372L7.998 16l-1.396-.66V.66zM5.38 1.238L4.3 1.75v12.502l1.08.51V1.239zM2.476 2.612l.863-.406v11.588l-.863-.406V2.612zM1.7 2.98V13.02l-.7-.332V3.312l.7-.33z"/></g></symbol><symbol id="flight-aws-ec2-color-24" viewBox="0 0 24 24"><path fill="#9D5025" d="M3.003 4.47L2 4.967v14.064l1.003.499 4.06-7.167-4.06-7.895z"/><path fill="#F58536" d="M5.341 18.985l-2.338.546V4.469L5.341 5v13.985z"/><path fill="#9D5025" d="M4.11 3.918L5.34 3.31l5.852 9.324-5.852 8.058-1.232-.61V3.919z"/><path fill="#F58536" d="M8.257 19.872l-2.916.819V3.309l2.916.822v15.74z"/><path fill="#9D5025" d="M6.714 2.624l1.543-.767 8.633 11.796-8.633 8.49-1.543-.767V2.624z"/><path fill="#F58536" d="M11.997 20.784l-3.74 1.359V1.857l3.74 1.362v17.565z"/><path fill="#9D5025" d="M10.002.991L11.997 0l9.34 12.68L11.997 24l-1.995-.991V.99z"/><path fill="#F58536" d="M22 19.03L11.997 24V0L22 4.97v14.06z"/></symbol><symbol id="flight-aws-ec2-color-16" viewBox="0 0 16 16"><path fill="#9D5025" d="M1.702 2.98L1 3.312v9.376l.702.332 2.842-4.777L1.702 2.98z"/><path fill="#F58536" d="M3.339 12.657l-1.637.363V2.98l1.637.353v9.324z"/><path fill="#9D5025" d="M2.476 2.612l.863-.406 4.096 6.216-4.096 5.372-.863-.406V2.612z"/><path fill="#F58536" d="M5.38 13.248l-2.041.546V2.206l2.04.548v10.494z"/><path fill="#9D5025" d="M4.3 1.75l1.08-.512 6.043 7.864-6.043 5.66-1.08-.511V1.749z"/><path fill="#F58536" d="M7.998 13.856l-2.618.906V1.238l2.618.908v11.71z"/><path fill="#9D5025" d="M6.602.66L7.998 0l6.538 8.453L7.998 16l-1.396-.66V.66z"/><path fill="#F58536" d="M15 12.686L7.998 16V0L15 3.314v9.372z"/></symbol><symbol id="flight-aws-lambda-24" viewBox="0 0 24 24"><path d="M12.048 12.523c-.075.104-.139.19-.2.277l-2.912 4.19c-.903 1.3-1.807 2.598-2.712 3.895a.182.182 0 01-.129.073 872.9 872.9 0 01-3.831-.04c-.014 0-.029-.004-.057-.009a.664.664 0 01.036-.076l2.673-4.048 2.372-3.587 2.63-3.986c.129-.196.263-.389.386-.588a.238.238 0 00.026-.177c-.236-.735-.476-1.469-.717-2.202-.103-.315-.21-.627-.307-.943-.03-.101-.082-.132-.188-.132-.803.003-1.6.003-2.4.003-.153 0-.153 0-.153-.147 0-.962 0-1.923-.003-2.884 0-.107.036-.131.139-.131 1.61.002 3.222.002 4.834 0a.158.158 0 01.106.024c.031.021.054.052.064.088l2.549 6.263 2.974 7.303c.308.755.618 1.51.922 2.268.037.092.075.11.17.081.844-.255 1.69-.503 2.535-.759.106-.032.145-.01.178.093.288.884.581 1.766.873 2.65.01.03.018.061.03.104-.06.021-.117.046-.176.061l-5.756 1.785c-.091.028-.119-.002-.15-.078-.585-1.45-1.172-2.9-1.76-4.349l-1.728-4.257c-.087-.213-.172-.427-.258-.64-.014-.037-.033-.069-.06-.125z"/></symbol><symbol id="flight-aws-lambda-16" viewBox="0 0 16 16"><path d="M7.983 8.37c-.053.073-.098.133-.141.194L5.775 11.5c-.64.91-1.282 1.82-1.924 2.73a.128.128 0 01-.092.051c-.906-.007-1.813-.017-2.719-.028-.01 0-.02-.003-.04-.006a.455.455 0 01.025-.053 13977.496 13977.496 0 015.446-8.146c.092-.138.188-.273.275-.413a.165.165 0 00.018-.124c-.167-.515-.338-1.03-.508-1.543-.073-.22-.15-.44-.218-.66-.022-.072-.059-.094-.134-.093-.57.002-1.136.001-1.704.001-.108 0-.108 0-.108-.103 0-.674 0-1.347-.002-2.021 0-.075.026-.092.099-.092 1.143.002 2.286.002 3.43 0a.113.113 0 01.076.017.107.107 0 01.045.061 18266.184 18266.184 0 003.92 9.51c.218.53.438 1.059.654 1.59.026.064.053.076.12.056.6-.178 1.2-.352 1.8-.531.075-.023.102-.008.126.064.204.62.412 1.239.62 1.858l.02.073c-.043.015-.083.032-.124.043l-4.085 1.25c-.065.02-.085 0-.106-.054l-1.25-3.048-1.226-2.984-.183-.449c-.01-.026-.023-.048-.043-.087z"/></symbol><symbol id="flight-aws-lambda-color-24" viewBox="0 0 24 24"><path fill="#FA7E14" d="M11.976 12.528c-.076.104-.14.19-.202.277l-2.953 4.196c-.915 1.3-1.831 2.601-2.749 3.9a.183.183 0 01-.13.074 913.41 913.41 0 01-3.885-.04c-.014 0-.029-.005-.057-.01a.653.653 0 01.036-.075l2.71-4.055 2.405-3.59c.889-1.33 1.777-2.661 2.665-3.993.131-.196.268-.389.392-.589a.236.236 0 00.027-.177c-.24-.736-.483-1.47-.727-2.205-.104-.315-.213-.627-.311-.944-.032-.101-.084-.132-.191-.132-.814.003-1.623.002-2.434.002-.154 0-.155 0-.155-.146 0-.963 0-1.926-.003-2.889 0-.107.037-.13.141-.13 1.633.002 3.267.002 4.9 0a.162.162 0 01.109.024c.032.02.054.052.064.087a26142.71 26142.71 0 005.6 13.585c.312.757.626 1.513.935 2.271.037.093.075.11.171.082.857-.256 1.715-.504 2.57-.76.108-.033.147-.01.18.092.293.886.59 1.77.886 2.654.01.03.018.061.03.104-.061.022-.119.046-.178.062-1.946.595-3.89 1.19-5.835 1.787-.093.028-.12-.003-.152-.078-.593-1.452-1.189-2.904-1.785-4.355l-1.752-4.263-.261-.641c-.014-.037-.033-.069-.06-.125z"/></symbol><symbol id="flight-aws-lambda-color-16" viewBox="0 0 16 16"><path fill="#FA7E14" d="M7.983 8.37c-.053.073-.098.133-.141.194L5.775 11.5c-.64.91-1.282 1.82-1.924 2.73a.128.128 0 01-.092.051c-.906-.007-1.813-.017-2.719-.028-.01 0-.02-.003-.04-.006a.455.455 0 01.025-.053 13977.496 13977.496 0 015.446-8.146c.092-.138.188-.273.275-.413a.165.165 0 00.018-.124c-.167-.515-.338-1.03-.508-1.543-.073-.22-.15-.44-.218-.66-.022-.072-.059-.094-.134-.093-.57.002-1.136.001-1.704.001-.108 0-.108 0-.108-.103 0-.674 0-1.347-.002-2.021 0-.075.026-.092.099-.092 1.143.002 2.286.002 3.43 0a.113.113 0 01.076.017.107.107 0 01.045.061 18266.184 18266.184 0 003.92 9.51c.218.53.438 1.059.654 1.59.026.064.053.076.12.056.6-.178 1.2-.352 1.8-.531.075-.023.102-.008.126.064.204.62.412 1.239.62 1.858l.02.073c-.043.015-.083.032-.124.043l-4.085 1.25c-.065.02-.085 0-.106-.054l-1.25-3.048-1.226-2.984-.183-.449c-.01-.026-.023-.048-.043-.087z"/></symbol><symbol id="flight-aws-s3-24" viewBox="0 0 24 24"><g><path d="M8.888 3.32l3.028-1.632 3.028 1.632.006 4.517-3.025.504-3.037-.509V3.32z"/><path d="M4.793 5.24l3.345.949v2.278l2.298.385-2.285.254v5.843l2.294.268-2.294.426v2.33l-3.358.864v-.012l-1.12-.508V5.77l1.12-.51v-.02zM15.7 15.643v2.815l3.197.374 1.43-.816V6.07l-1.43-.816-3.2.374.004 2.844-2.282.38 2.28.254v5.843l-2.29.268 2.29.426z"/><path d="M8.9 16.267l3.029-.562 3.02.562v4.428l-3.024 1.617-3.024-1.617v-4.428zM8.9 9.777l3.025-.336 3.025.336v4.505l-3.025.353-3.024-.353V9.777z"/></g></symbol><symbol id="flight-aws-s3-16" viewBox="0 0 16 16"><g><path d="M6.258 1.687L8.439.5l2.182 1.187.005 3.285-2.18.367-2.188-.37V1.687z"/><path d="M3.307 3.083l2.41.69V5.43l1.656.28-1.647.185v4.25l1.653.195-1.653.31v1.695l-2.419.627v-.008l-.807-.37V3.469l.807-.37v-.016zM11.166 10.65v2.047l2.304.272 1.03-.594V3.688l-1.03-.594-2.306.272.003 2.068-1.645.277 1.644.184v4.25l-1.651.195 1.651.31z"/><path d="M6.267 11.103l2.182-.409 2.177.41v3.22L8.446 15.5l-2.18-1.176v-3.22zM6.267 6.383l2.18-.244 2.179.244V9.66l-2.18.257-2.18-.257V6.383z"/></g></symbol><symbol id="flight-aws-s3-color-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path fill="#E25444" d="M18.897 5.254l-3.49 6.789 3.49 6.789 1.43-.816V6.07l-1.43-.816z"/><path fill="#7B1D13" d="M18.897 5.254l-6.981.816-3.554 5.973 3.554 5.973 6.981.816V5.254z"/><path fill="#58150D" d="M4.808 5.254l-1.135.516v12.546l1.135.516 7.108-6.789-7.108-6.79z"/><path fill="#E25444" d="M4.793 5.24l7.132 2.024v9.74l-7.132 1.833V5.24z"/><path fill="#58150D" d="M11.929 8.333l-3.028-.496 3.028-3.514 3.02 3.514-3.02.496z"/><path fill="#58150D" d="M14.95 7.837l-3.025.504-3.024-.504V4.323M11.929 15.705l-3.028.573 3.028 3.017 3.02-3.017-3.02-.573z"/><path fill="#7B1D13" d="M11.916 1.688L8.888 3.32v4.512l3.037-.874-.009-5.27zM11.925 9.441l-3.024.336v4.505l3.024.353V9.441zM11.925 17.042l-3.024-.775v4.428l3.024 1.617v-5.27z"/><path fill="#E25444" d="M14.95 16.267l-3.025.775v5.27l3.025-1.617v-4.428zM11.925 9.441l3.025.336v4.505l-3.025.353V9.441zM11.916 1.688l3.028 1.632v4.512l-3.028-.86V1.688z"/></g></symbol><symbol id="flight-aws-s3-color-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path fill="#E25444" d="M13.481 3.094l-2.52 4.937 2.52 4.938 1.033-.594V3.687l-1.033-.593z"/><path fill="#7B1D13" d="M13.481 3.094l-5.042.594L5.873 8.03l2.566 4.344 5.042.594V3.094z"/><path fill="#58150D" d="M3.306 3.094l-.82.375v9.125l.82.375L8.44 8.03 3.306 3.094z"/><path fill="#E25444" d="M3.295 3.083l5.151 1.473v7.083l-5.15 1.333V3.083z"/><path fill="#58150D" d="M8.449 5.333l-2.187-.36 2.187-2.556 2.182 2.555-2.182.361z"/><path fill="#58150D" d="M10.63 4.972l-2.184.367-2.184-.367V2.417M8.449 10.694l-2.187.417 2.187 2.195 2.182-2.195-2.182-.417z"/><path fill="#7B1D13" d="M8.44.5L6.251 1.688v3.28l2.194-.635L8.44.5zM8.446 6.139l-2.184.244V9.66l2.184.257V6.139zM8.446 11.667l-2.184-.564v3.22L8.446 15.5v-3.833z"/><path fill="#E25444" d="M10.63 11.103l-2.184.564V15.5l2.184-1.176v-3.22zM8.446 6.139l2.184.244V9.66l-2.184.257V6.139zM8.44.5l2.186 1.188v3.28L8.44 4.345V.5z"/></g></symbol><symbol id="flight-azure-24" viewBox="0 0 24 24"><g><path d="M11.275 18.199l4.575-.808.043-.01-2.353-2.793a400.617 400.617 0 01-2.353-2.808c0-.013 2.43-6.693 2.443-6.717.004-.008 1.658 2.842 4.008 6.908 2.2 3.807 4.015 6.946 4.031 6.976L21.7 19l-14.957-.002 4.532-.8zM2.3 17.347c0-.004 1.109-1.925 2.464-4.27l2.464-4.262 2.871-2.406A1076.68 1076.68 0 0112.98 4a.504.504 0 01-.046.116l-3.118 6.676-3.062 6.557-2.227.002c-1.225.002-2.227 0-2.227-.004z"/></g></symbol><symbol id="flight-azure-16" viewBox="0 0 16 16"><g><path d="M7.47 12.412l3.348-.592.031-.007-1.722-2.049a291.474 291.474 0 01-1.723-2.058c0-.01 1.779-4.909 1.789-4.926a788.95 788.95 0 012.934 5.066l2.95 5.115.023.039-10.948-.001 3.317-.587zM.9 11.788c0-.003.811-1.412 1.803-3.131L4.507 5.53l2.102-1.764C7.765 2.797 8.714 2 8.717 2a.37.37 0 01-.033.085L6.4 6.981 4.16 11.789l-1.63.002c-.897.001-1.63 0-1.63-.003z"/></g></symbol><symbol id="flight-azure-color-24" viewBox="0 0 24 24"><g fill="#0089D6"><path d="M11.275 18.199l4.575-.808.043-.01-2.353-2.793a400.617 400.617 0 01-2.353-2.808c0-.013 2.43-6.693 2.443-6.717.004-.008 1.658 2.842 4.008 6.908 2.2 3.807 4.015 6.946 4.031 6.976L21.7 19l-14.957-.002 4.532-.8zM2.3 17.347c0-.004 1.109-1.925 2.464-4.27l2.464-4.262 2.871-2.406A1076.68 1076.68 0 0112.98 4a.504.504 0 01-.046.116l-3.118 6.676-3.062 6.557-2.227.002c-1.225.002-2.227 0-2.227-.004z"/></g></symbol><symbol id="flight-azure-color-16" viewBox="0 0 16 16"><g fill="#0089D6"><path d="M7.47 12.412l3.348-.592.031-.007-1.722-2.049a291.474 291.474 0 01-1.723-2.058c0-.01 1.779-4.909 1.789-4.926a788.95 788.95 0 012.934 5.066l2.95 5.115.023.039-10.948-.001 3.317-.587zM.9 11.788c0-.003.811-1.412 1.803-3.131L4.507 5.53l2.102-1.764C7.765 2.797 8.714 2 8.717 2a.37.37 0 01-.033.085L6.4 6.981 4.16 11.789l-1.63.002c-.897.001-1.63 0-1.63-.003z"/></g></symbol><symbol id="flight-azure-aks-24" viewBox="0 0 24 24"><g><path d="M5.267 3.589L8.444 3l3.19 1.089v3.233L8.477 8.587V8.6l-.022-.005-.012.005-3.177-.678V3.59zM12.145 3.644l3.177-.588L18.5 4.144v3.223L15.333 8.65v.005l-.007-.002-.004.002-3.177-.678V3.644zM2 13.867l.011.002v.031l3.178.678L8.378 13.3v-3.233l-3.189-1.09-2.802.52-.387.07v4.3zM8.867 9.522l3.177-.589 3.178 1.09v3.233l-3.155 1.28v.008l-.015-.003-.008.003-.948-.205-2.23-.472.001-4.345zM15.722 9.578l3.178-.59.012.005.021-.004V9l3.156 1.078v3.233l-3.19 1.278-3.177-.678V9.578zM8.4 15.034v-.056l-3.21.622-.001 4.333 3.178.69.011-.005.022.004v-.013l1.968-.796 1.02-.39a.2.2 0 00.083-.055l.085-.035v-3.222L8.4 15.034zM12.056 15.655v4.334l3.177.678.012-.005.022.005v-.014l3.155-1.264v-3.233l-3.189-1.09-3.177.59z"/></g></symbol><symbol id="flight-azure-aks-16" viewBox="0 0 16 16"><g><path d="M3.287 2.412L5.51 2l2.232.762v2.264l-2.209.885v.009l-.015-.003-.008.003-2.217-.473-.007-.001V2.412zM10.325 2.039l2.225.762v2.256l-2.217.899v.003l-.005-.001h-.002L8.1 5.485V2.451l2.224-.412zM1 9.607l.008.001v.022l2.224.474 2.232-.894V6.947l-2.232-.763-1.97.365L1 6.597v3.01zM5.807 6.566l2.224-.413 2.224.763v2.263l-2.208.896v.006l-.01-.002-.006.002-.652-.141-1.572-.333V6.566zM10.605 6.604l2.225-.412.008.003.015-.003V6.2l2.21.754v2.264l-2.233.894-2.225-.474V6.604zM5.48 10.424v-.04l-2.244.435-.004.001v3.033l2.225.482.008-.003.015.004v-.01l1.374-.555.718-.275a.14.14 0 00.058-.039l.059-.024v-2.255l-2.209-.755zM10.263 10.447l-2.224.412v3.033l2.224.475.008-.004.016.004v-.01l2.208-.885V11.21l-2.232-.762z"/></g></symbol><symbol id="flight-azure-aks-color-24" viewBox="0 0 24 24"><path fill="url(#azure-aks-color-24__paint0_linear_2372_167)" d="M8.444 3l-3.177.589v4.333l3.177.678 3.19-1.278V4.09L8.443 3z"/><path fill="#341A6E" d="M5.267 3.589v4.333l3.21.678V3.044l-3.21.545zm1.355 4l-.9-.178V4.078l.9-.145V7.59zm1.4.255L6.99 7.678V3.867l1.033-.178v4.155z"/><path fill="url(#azure-aks-color-24__paint1_linear_2372_167)" d="M15.322 3.056l-3.177.588v4.334l3.177.678 3.178-1.29V4.145l-3.178-1.088z"/><path fill="#341A6E" d="M12.145 3.644v4.334l3.188.678V3.1l-3.188.544zm1.344 4l-.9-.177V4.133l.9-.144v3.655zm1.4.256l-1.033-.167v-3.81l1.033-.19V7.9z"/><path fill="url(#azure-aks-color-24__paint2_linear_2372_167)" d="M5.189 8.978l-3.178.589V13.9l3.178.678L8.378 13.3v-3.233l-3.189-1.09z"/><path fill="#341A6E" d="M2 9.567v4.3l3.211.677V8.99L2 9.567zm1.344 4.01l-.9-.188v-3.333l.9-.156v3.678zm1.412.29L3.722 13.7V9.844l1.034-.177v4.2z"/><path fill="url(#azure-aks-color-24__paint3_linear_2372_167)" d="M12.044 8.933l-3.177.59v4.333l3.177.688 3.178-1.288v-3.234l-3.178-1.089z"/><path fill="#341A6E" d="M8.867 9.522v4.345l3.2.677V8.99l-3.2.533zm1.344 4.011l-.9-.189v-3.333l.9-.155v3.677zm1.4.245l-1.033-.167V9.8l1.033-.178v4.156z"/><path fill="url(#azure-aks-color-24__paint4_linear_2372_167)" d="M18.9 8.989l-3.178.589v4.333l3.178.678 3.189-1.278v-3.233l-3.19-1.09z"/><path fill="#341A6E" d="M15.722 9.578v4.289l3.211.677V8.99l-3.21.589zm1.356 4.01l-.9-.188v-3.333l.9-.156v3.678zm1.4.245l-1.034-.166V9.856l1.034-.178v4.155z"/><path fill="url(#azure-aks-color-24__paint5_linear_2372_167)" d="M8.367 15.022l-3.178.578v4.333l3.178.69 3.189-1.29v-3.222l-3.19-1.089z"/><path fill="#341A6E" d="M5.189 15.6v4.333l3.211.69v-5.645L5.19 15.6zm1.356 4.011l-.9-.189V16.09l.9-.156v3.678zm1.4.256L6.91 19.7v-3.822l1.034-.178v4.167z"/><path fill="url(#azure-aks-color-24__paint6_linear_2372_167)" d="M15.233 15.067l-3.177.588v4.334l3.177.678 3.19-1.278v-3.233l-3.19-1.09z"/><path fill="#341A6E" d="M12.056 15.655v4.334l3.21.678V15.11l-3.21.544zm1.355 4.012l-.9-.19v-3.333l.9-.155v3.678zm1.4.244l-1.033-.167v-3.81l1.033-.178v4.155z"/></symbol><symbol id="flight-azure-aks-color-16" viewBox="0 0 16 16"><path fill="url(#azure-aks-color-16__paint0_linear_2372_185)" d="M5.511 2l-2.224.412v3.034l2.224.474 2.232-.894V2.762L5.511 2z"/><path fill="#341A6E" d="M3.287 2.412v3.034l2.247.474V2.031l-2.247.381zm.949 2.8l-.63-.124V2.754l.63-.1v2.558zm.98.18l-.724-.118V2.607l.724-.125v2.91z"/><path fill="url(#azure-aks-color-16__paint1_linear_2372_185)" d="M10.325 2.039l-2.224.412v3.033l2.224.475 2.225-.902V2.8l-2.225-.762z"/><path fill="#341A6E" d="M8.101 2.451v3.033l2.232.475V2.07l-2.232.381zm.941 2.8l-.63-.124V2.793l.63-.1V5.25zm.98.179L9.3 5.313V2.646l.723-.133V5.43z"/><path fill="url(#azure-aks-color-16__paint2_linear_2372_185)" d="M3.232 6.184l-2.224.413V9.63l2.224.474 2.232-.894V6.947l-2.232-.763z"/><path fill="#341A6E" d="M1 6.597v3.01l2.248.474V6.192L1 6.597zm.941 2.807l-.63-.132V6.94l.63-.109v2.574zm.988.203l-.723-.117V6.791l.723-.124v2.94z"/><path fill="url(#azure-aks-color-16__paint3_linear_2372_185)" d="M8.031 6.153l-2.224.413v3.033l2.224.482 2.224-.902V6.916l-2.224-.763z"/><path fill="#341A6E" d="M5.807 6.566v3.04l2.24.475V6.192l-2.24.374zm.94 2.807l-.63-.132V6.908l.63-.11v2.575zm.98.171l-.723-.116V6.76l.724-.124v2.908z"/><path fill="url(#azure-aks-color-16__paint4_linear_2372_185)" d="M12.83 6.192l-2.225.412v3.034l2.225.474 2.232-.894V6.954l-2.232-.762z"/><path fill="#341A6E" d="M10.605 6.604v3.003l2.248.474V6.192l-2.248.412zm.95 2.808l-.63-.132V6.947l.63-.11v2.575zm.98.171l-.724-.116V6.799l.723-.125v2.91z"/><path fill="url(#azure-aks-color-16__paint5_linear_2372_185)" d="M5.457 10.415l-2.225.405v3.033l2.225.482 2.232-.902v-2.255l-2.232-.763z"/><path fill="#341A6E" d="M3.232 10.82v3.033l2.248.483v-3.952l-2.248.436zm.95 2.808l-.63-.132v-2.334l.63-.109v2.575zm.98.179l-.724-.117v-2.675l.723-.125v2.917z"/><path fill="url(#azure-aks-color-16__paint6_linear_2372_185)" d="M10.263 10.447l-2.224.412v3.033l2.224.475 2.232-.895V11.21l-2.232-.762z"/><path fill="#341A6E" d="M8.039 10.859v3.033l2.248.475v-3.89l-2.248.382zm.949 2.808l-.63-.133v-2.333l.63-.109v2.575zm.98.17l-.724-.116v-2.668l.724-.124v2.909z"/></symbol><symbol id="flight-azure-blob-storage-24" viewBox="0 0 24 24"><g><path d="M11.266 14.461l-.017.185a12.3 12.3 0 01-.046.46.854.854 0 01-.071.223c-.047.109-.137.166-.257.18-.29.034-.391-.11-.45-.353-.078-.322-.07-.649-.053-.976l.001-.024c.007-.123.013-.246.057-.363.027-.069.055-.138.094-.201.118-.195.457-.177.569-.028a.606.606 0 01.106.264c.023.152.037.305.05.456l.017.176v.001zM12.822 9.741c-.087.253-.093.514-.088.794-.009.25.006.515.088.772.037.116.107.207.23.23.136.024.276.027.382-.093a.69.69 0 00.156-.382 3.933 3.933 0 000-1.071 1.014 1.014 0 00-.092-.31c-.035-.07-.102-.148-.173-.17-.2-.063-.418-.02-.503.23z"/><path fill-rule="evenodd" d="M14.61 8.1v1.663h1.653l.005.06c.004.037.007.07.007.105v6.281c0 .117 0 .233-.057.343-.1.192-.247.317-.473.334l-.06.004c-.096.007-.192.014-.287.014h-6.91c-.107 0-.215-.006-.319-.026a.565.565 0 01-.449-.491 1.68 1.68 0 01-.005-.17V8.795c0-.145.007-.284.092-.414.107-.167.263-.241.45-.273a.955.955 0 01.162-.007h6.191zm-4.847 6.572a11.816 11.816 0 00-.011-.162c.006-.286.03-.57.125-.84.106-.3.288-.534.618-.632.282-.084.558-.071.82.045a.71.71 0 01.398.416c.153.434.18.878.128 1.33a2.09 2.09 0 01-.13.56.87.87 0 01-.768.575 1.448 1.448 0 01-.464-.019.774.774 0 01-.533-.416 1.47 1.47 0 01-.153-.51 5.518 5.518 0 01-.03-.347zm4.461-4.35l.02.168c-.014.29-.045.576-.138.853-.107.318-.306.554-.647.631-.333.076-.663.063-.95-.156-.154-.117-.233-.28-.284-.46-.118-.415-.117-.838-.07-1.26.027-.241.08-.484.231-.689.181-.247.431-.365.737-.385.186-.012.365.015.536.084.105.042.198.11.271.201.16.2.237.425.258.675.01.113.023.226.036.338zm-.08 5.316a.432.432 0 01-.068.285h-.001l-.033.002c-.03.002-.06.004-.092.004h-.445c-.33 0-.659-.001-.988.003-.143.002-.184-.05-.184-.176v-.05c0-.032 0-.063.002-.094.006-.092.038-.123.134-.126.083-.003.166-.002.249-.002h.225c.032-.106.041-1.67.014-1.869l-.036.013c-.025.009-.05.018-.072.03l-.131.077c-.059.035-.118.07-.178.102a.37.37 0 01-.114.034c-.053.008-.09-.013-.092-.069a2.18 2.18 0 01.001-.249c.002-.03.027-.065.052-.085.043-.036.092-.066.14-.097l.023-.014c.044-.029.089-.056.133-.083.084-.05.167-.102.246-.158a.573.573 0 01.352-.099c.059 0 .118.008.182.016l.098.01v2.43c.026 0 .05.003.072.004.04.004.076.007.113.008h.24c.114.005.15.041.158.153zM11.2 9.072v2.446l.001.002h.399c.132 0 .157.021.165.15.004.073-.007.148-.017.221-.007.05-.043.075-.096.073h-1.486c-.15 0-.163-.013-.18-.162a.467.467 0 01-.003-.04c-.01-.218.014-.243.232-.243h.295c.086-.004.097-.015.099-.103v-.321V9.653a1.18 1.18 0 01-.036.011c-.025.008-.046.014-.065.024l-.147.08c-.063.036-.126.071-.19.104a.586.586 0 01-.103.037l-.047.014a.487.487 0 01-.032-.342.183.183 0 01.074-.103c.19-.128.381-.253.577-.372a.358.358 0 01.126-.038l.039-.007a.713.713 0 01.23 0c.053.007.108.013.165.011z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M21.784 12.867l.216-.361-.082-.141a41.483 41.483 0 00-.563-.957l-.348-.601-.394-.68c-.19-.324-.381-.647-.573-.97l-.216-.36-.322-.542c-.113-.192-.225-.386-.337-.579a130.69 130.69 0 00-.224-.384c-.195-.335-.391-.671-.589-1.006l-.383-.642-.16-.27-.122-.202-.242-.405-.027-.046c-.124-.21-.25-.422-.368-.636-.035-.063-.077-.09-.148-.083a.534.534 0 01-.094 0H9.426c-.772 0-1.543 0-2.314-.002-.098 0-.15.033-.196.117-.234.41-.472.817-.71 1.224l-.12.204A203.265 203.265 0 014.98 7.417c-.21.354-.418.708-.625 1.062l-.236.406a79.386 79.386 0 01-.611 1.04l-.202.338a293.841 293.841 0 00-.461.78l-.152.253-.244.41c-.143.24-.283.482-.424.724-.025.043-.036.083-.005.133.06.099.117.198.174.297l.124.213.187.31c.086.144.173.287.257.432.097.166.192.333.288.5.114.202.23.403.347.603.142.242.287.483.432.724l.307.512a47.009 47.009 0 01.384.657l.27.457.268.458c.233.395.464.79.696 1.186l.166.287a51.102 51.102 0 00.512.869c.156.262.312.523.464.787.06.103.122.145.248.145 2.127-.004 4.255-.003 6.383-.003h3.354c.083.001.134-.017.179-.097.273-.482.554-.96.835-1.439.131-.223.264-.445.397-.668.122-.205.245-.411.366-.617l.486-.83.427-.732c.185-.316.373-.632.561-.946l.18-.298c.092-.151.183-.302.273-.455l.301-.522c.109-.19.217-.38.328-.568.188-.32.379-.638.57-.958zM6.968 16.203V8.81c0-.189.013-.374.082-.554.106-.28.285-.5.538-.662a1.5 1.5 0 01.837-.224h1.158c1.739 0 3.477 0 5.215-.003.112 0 .182.041.252.114.081.085.166.166.25.247l.136.132.136.136c.079.08.158.159.238.236l.41.392c.137.13.274.26.41.392.054.052.108.106.16.16.059.059.117.118.176.174.043.041.054.085.054.14-.001.185 0 .369 0 .553v6.15c0 .051 0 .102-.003.152-.032.493-.266.86-.702 1.111-.236.136-.49.168-.756.168h-7.15c-.197 0-.393-.01-.577-.089-.38-.164-.651-.424-.79-.816a1.512 1.512 0 01-.074-.516z" clip-rule="evenodd"/></g></symbol><symbol id="flight-azure-blob-storage-16" viewBox="0 0 16 16"><g><path d="M7.486 9.384l-.012.13c-.01.11-.019.218-.032.325a.607.607 0 01-.05.158c-.033.077-.096.117-.18.127-.203.024-.274-.078-.315-.25-.054-.226-.049-.457-.037-.688l.001-.017a.826.826 0 01.04-.256.85.85 0 01.065-.142c.083-.138.32-.125.399-.02a.43.43 0 01.074.186c.016.107.026.215.035.322l.012.125zM8.575 6.053c-.06.178-.065.362-.062.56-.006.176.004.363.062.545.026.082.075.146.16.162.097.017.194.02.268-.066a.489.489 0 00.11-.27 2.8 2.8 0 000-.755.72.72 0 00-.064-.22c-.025-.048-.072-.103-.122-.119-.14-.044-.292-.013-.352.163z"/><path fill-rule="evenodd" d="M9.827 4.895v1.173h1.157c0 .015.002.029.003.042.003.027.005.05.005.074v4.434c0 .083 0 .165-.04.242-.07.136-.172.224-.33.236l-.043.003c-.067.005-.134.01-.2.01H5.54c-.075 0-.15-.005-.223-.019a.397.397 0 01-.314-.347 1.194 1.194 0 01-.004-.12V5.386c0-.103.005-.2.064-.293A.432.432 0 015.38 4.9c.037-.006.076-.006.114-.005H9.827zM6.434 9.533l-.008-.114c.004-.202.021-.402.088-.593.073-.212.201-.377.432-.446.197-.06.391-.05.574.031a.5.5 0 01.278.294c.108.307.126.62.09.94-.015.135-.04.267-.09.394a.61.61 0 01-.538.406c-.11.012-.219.01-.325-.013a.542.542 0 01-.373-.294 1.044 1.044 0 01-.107-.36 3.931 3.931 0 01-.021-.245zm3.123-3.07l.013.118c-.01.206-.031.407-.096.602-.075.225-.214.391-.453.446-.233.053-.464.044-.666-.11a.585.585 0 01-.198-.325 2.319 2.319 0 01-.049-.89.986.986 0 01.162-.486.655.655 0 01.516-.272c.13-.008.256.011.375.06.074.03.138.077.19.142.112.14.166.3.18.476.007.08.017.16.026.239zM9.5 10.215a.307.307 0 01-.047.201l-.024.002c-.02.001-.042.003-.064.003h-.312c-.23-.001-.46-.002-.691.002-.1.001-.129-.036-.129-.124v-.037-.066c.005-.064.028-.086.095-.088.058-.002.116-.002.174-.001h.158c.022-.076.029-1.18.01-1.32a.727.727 0 01-.025.01.297.297 0 00-.051.02l-.092.055c-.04.024-.082.049-.124.072a.258.258 0 01-.08.024c-.037.005-.063-.01-.065-.049a1.552 1.552 0 01.001-.176c.002-.02.019-.045.037-.06.03-.025.064-.046.098-.068l.016-.01.093-.059c.058-.036.117-.071.172-.111a.399.399 0 01.246-.07c.042 0 .083.006.128.011l.068.008v1.714l.05.004.08.005h.169c.078.003.104.03.11.108zM7.44 5.58v1.727l.001.001H7.721c.092 0 .11.015.115.106a.805.805 0 01-.012.156c-.005.035-.03.053-.067.052h-1.04c-.105 0-.115-.01-.126-.114a.335.335 0 01-.003-.028c-.007-.155.01-.173.163-.173h.206c.06-.002.069-.01.07-.072v-.227V5.991L7 5.997a.256.256 0 00-.045.017 6.093 6.093 0 00-.103.057 4.65 4.65 0 01-.133.073c-.022.012-.047.019-.072.026l-.033.01a.346.346 0 01-.022-.242.13.13 0 01.051-.072c.133-.09.267-.179.405-.263a.25.25 0 01.088-.027.912.912 0 00.026-.005c.055-.011.107-.005.162 0 .037.005.075.01.116.008z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M14.849 8.259L15 8.004l-.057-.1-.155-.268-.107-.181a122.096 122.096 0 01-.376-.65 120.445 120.445 0 00-.677-1.165l-.151-.254-.225-.382c-.08-.136-.158-.273-.237-.41l-.156-.27a157.852 157.852 0 00-.68-1.164l-.113-.19-.085-.143-.17-.286-.018-.032a21.755 21.755 0 01-.258-.449c-.025-.044-.054-.063-.104-.058a.372.372 0 01-.066 0H6.198c-.54 0-1.08 0-1.62-.002-.069 0-.105.023-.138.082-.163.29-.33.577-.497.865l-.083.144-.39.67-.192.325a109.22 109.22 0 00-.795 1.363l-.199.344a56.291 56.291 0 01-.37.628l-.162.275-.161.275-.107.18-.17.288c-.1.17-.199.341-.297.512-.018.03-.026.058-.004.094.042.07.082.14.122.21l.087.15.13.218c.061.102.122.203.181.305.068.117.134.235.201.353.08.143.16.285.243.426l.303.51.215.363.157.271a41.4 41.4 0 00.3.515l.188.323.487.837.117.203c.06.106.121.212.183.317l.175.296c.109.185.218.37.325.556.041.072.085.102.173.102 1.49-.003 2.979-.002 4.468-.002h2.348c.058 0 .094-.012.126-.068.191-.34.388-.679.585-1.016.091-.158.184-.315.277-.472l.257-.436.34-.586.298-.516a108.318 108.318 0 01.71-1.2c.072-.122.141-.245.211-.368.076-.134.152-.268.23-.4.132-.226.265-.451.399-.677zM4.477 10.614V5.395c0-.133.01-.263.057-.39a.94.94 0 01.377-.468c.178-.116.376-.158.586-.158h.811c1.217 0 2.434 0 3.65-.002.079 0 .128.029.177.08.057.06.116.117.175.175l.095.093.095.096c.055.056.11.112.167.166l.287.277.287.277.112.113.123.123c.03.028.038.06.038.098v4.732c0 .036 0 .072-.002.107a.926.926 0 01-.492.784 1.023 1.023 0 01-.53.12H5.486a1 1 0 01-.403-.064.952.952 0 01-.605-.94z" clip-rule="evenodd"/></g></symbol><symbol id="flight-azure-blob-storage-color-24" viewBox="0 0 24 24"><path fill="#2378BC" d="M22 12.506c-.264.441-.527.879-.786 1.32-.213.36-.417.727-.63 1.089-.147.253-.302.501-.452.753-.188.315-.376.63-.561.947-.305.52-.607 1.041-.913 1.56-.253.43-.51.857-.763 1.286-.281.478-.562.957-.835 1.44-.045.08-.096.097-.18.097-.692-.002-1.383-.001-2.076-.001-2.553 0-5.107-.001-7.66.003-.126 0-.189-.042-.248-.145-.233-.405-.476-.804-.714-1.207-.144-.244-.285-.49-.428-.736-.232-.396-.463-.791-.696-1.186-.179-.305-.36-.61-.538-.915-.129-.219-.254-.439-.384-.657-.245-.412-.496-.822-.74-1.236-.214-.366-.42-.737-.634-1.103-.145-.25-.297-.495-.444-.742-.1-.17-.195-.341-.298-.51-.031-.05-.02-.09.005-.133.14-.242.281-.483.424-.724.13-.222.264-.443.396-.664l.46-.779c.177-.296.356-.592.53-.889.175-.297.346-.597.52-.895.207-.354.415-.708.625-1.062.182-.308.367-.615.55-.924.186-.315.371-.632.556-.948.278-.475.557-.95.83-1.428.046-.084.098-.117.196-.117.964.003 1.928.002 2.892.002h6.804c.031 0 .062.003.094 0 .07-.007.113.02.148.083.127.23.261.456.395.682.12.203.242.405.363.608.182.304.364.607.544.911.198.335.393.67.59 1.006.187.321.372.643.56.963.178.301.359.601.538.902.192.323.384.646.573.97.249.427.494.855.742 1.281.112.193.23.384.342.577.1.168.197.339.302.522v-.001zm-15.032-.02v3.717c0 .175.015.346.075.516.138.392.41.652.789.816.184.08.38.089.576.09h7.151c.265 0 .52-.034.756-.169.436-.25.67-.618.702-1.111.004-.065.003-.131.003-.197v-5.883c0-.258-.002-.516 0-.775 0-.055-.011-.099-.054-.14-.114-.108-.222-.225-.336-.334-.273-.262-.547-.521-.82-.784-.126-.122-.25-.248-.374-.372-.129-.126-.26-.249-.386-.379a.318.318 0 00-.252-.114c-2.124.004-4.249.003-6.373.003-.3 0-.583.06-.837.224a1.333 1.333 0 00-.538.662c-.069.18-.082.365-.082.554v3.677z"/><path fill="#FAFDFE" d="M6.968 12.487V8.81c0-.188.013-.374.082-.554.106-.28.285-.5.538-.662a1.5 1.5 0 01.836-.224c2.125 0 4.25 0 6.374-.003a.32.32 0 01.252.114c.125.13.257.253.386.38.125.123.248.25.374.371.273.263.547.522.82.784.114.11.222.226.336.335.043.04.055.084.054.14-.002.258 0 .516 0 .774v5.883c0 .066.001.131-.003.197-.031.494-.265.861-.702 1.111-.236.136-.49.168-.756.168H8.408c-.196 0-.392-.01-.576-.089-.38-.163-.651-.424-.79-.816-.059-.17-.074-.34-.074-.516v-3.716zM14.61 8.1H8.47c-.071 0-.144-.005-.214.007-.186.031-.342.106-.449.273-.084.13-.092.269-.092.414v7.408c0 .061-.001.123.005.184a.565.565 0 00.45.49c.104.02.211.027.318.027 2.304.002 4.607.002 6.91 0 .116 0 .232-.01.347-.018.226-.017.373-.142.473-.334.06-.114.057-.237.057-.359V11.91 9.927c0-.05-.007-.101-.012-.165H14.61V8.099z"/><path fill="#2478BD" d="M14.61 8.1v1.663h1.653c.005.064.012.114.012.165V16.193c0 .122.003.245-.057.359-.1.192-.247.317-.473.334-.116.008-.231.018-.346.018H8.488c-.107 0-.215-.006-.319-.026a.565.565 0 01-.449-.491c-.006-.061-.005-.123-.005-.184V8.795c0-.145.007-.284.092-.414.107-.167.263-.241.45-.273.069-.011.141-.007.213-.007h6.141V8.1zm-4.858 6.41c.013.17.02.34.04.51.024.176.068.348.154.509.117.218.29.362.533.416.152.034.307.035.464.02a.87.87 0 00.768-.576 2.09 2.09 0 00.13-.56 2.942 2.942 0 00-.128-1.33.71.71 0 00-.398-.416 1.156 1.156 0 00-.82-.045c-.33.098-.512.332-.618.632-.095.27-.12.554-.124.84h-.001zm4.492-4.02c-.019-.168-.041-.337-.056-.506a1.206 1.206 0 00-.258-.675.658.658 0 00-.271-.201 1.203 1.203 0 00-.536-.084c-.306.02-.556.138-.737.385-.15.205-.204.448-.231.688-.047.423-.048.846.07 1.262.051.18.13.342.283.459.288.219.618.232.951.156.34-.077.54-.313.647-.631a3.08 3.08 0 00.138-.852zm-.168 5.433a.432.432 0 00.068-.285c-.008-.112-.044-.148-.157-.152-.08-.002-.161 0-.241-.001-.057-.002-.113-.008-.185-.013v-2.428c-.104-.01-.192-.026-.28-.027a.573.573 0 00-.352.1c-.122.086-.253.159-.38.24-.055.035-.112.07-.162.111-.025.02-.05.056-.052.085a2.18 2.18 0 00-.001.25c.002.055.04.076.091.068a.37.37 0 00.115-.034c.105-.057.205-.12.309-.179.032-.018.07-.028.108-.043.027.2.018 1.763-.014 1.87h-.126c-.116 0-.232-.002-.348 0-.096.004-.128.035-.134.127-.004.048-.001.096-.002.144 0 .125.04.178.184.176.478-.007.955-.002 1.433-.003.044 0 .088-.004.125-.006h.001zm-2.875-4.405V9.072c-.142.004-.266-.039-.396-.011-.055.011-.117.016-.164.045-.196.12-.388.244-.577.372a.183.183 0 00-.074.103.487.487 0 00.032.342c.052-.017.104-.028.15-.05.113-.06.224-.124.337-.185.028-.014.06-.022.101-.035v1.304c0 .153.002.306 0 .46-.002.087-.013.098-.1.101-.098.003-.196 0-.294 0-.218 0-.242.026-.232.245l.003.04c.017.148.03.16.18.16h1.486c.053.003.09-.023.096-.072.01-.073.02-.148.017-.22-.008-.13-.033-.15-.165-.151-.124-.001-.248 0-.399 0v-.002z"/><path fill="#F9FCFE" d="M9.751 14.51c.005-.286.03-.57.125-.84.105-.3.288-.534.618-.632.281-.084.558-.071.82.045a.71.71 0 01.397.416c.153.434.18.878.129 1.33a2.09 2.09 0 01-.13.56.87.87 0 01-.768.575 1.417 1.417 0 01-.464-.019.776.776 0 01-.533-.416 1.459 1.459 0 01-.153-.51c-.022-.168-.028-.34-.042-.51h.001zm1.515-.049c-.02-.207-.035-.421-.067-.632a.6.6 0 00-.106-.264c-.113-.149-.451-.166-.57.028a1.24 1.24 0 00-.093.201c-.047.124-.051.255-.058.387-.017.327-.025.654.053.976.059.243.16.387.45.353.12-.013.21-.07.257-.18a.834.834 0 00.07-.223c.027-.212.043-.425.064-.645zM14.243 10.49a3.08 3.08 0 01-.138.853c-.107.318-.305.554-.646.631-.334.076-.664.063-.951-.156-.154-.117-.232-.28-.283-.46-.119-.415-.117-.839-.07-1.26.025-.242.08-.483.23-.689.182-.247.432-.365.737-.385.187-.013.366.016.536.084.106.042.198.11.272.201.16.2.236.425.258.675.014.169.036.338.055.506zm-1.51.046c-.008.25.007.514.088.772.037.116.107.207.23.23.137.024.276.027.382-.094a.694.694 0 00.156-.382 3.933 3.933 0 000-1.07 1.014 1.014 0 00-.091-.311c-.035-.07-.103-.147-.173-.169-.201-.063-.418-.02-.504.23-.086.253-.093.514-.088.794z"/><path fill="#FAFCFE" d="M14.075 15.924c-.037.002-.081.007-.125.007-.477 0-.955-.004-1.433.002-.144.002-.183-.051-.183-.176 0-.048-.002-.096 0-.144.007-.091.039-.123.135-.126.117-.003.233-.001.349-.001h.125c.032-.107.041-1.67.014-1.87-.038.015-.075.025-.108.043-.103.059-.204.122-.308.18a.368.368 0 01-.115.033c-.052.008-.09-.013-.092-.069-.002-.082-.006-.166.001-.249.003-.03.028-.064.052-.085.051-.041.107-.076.163-.111.127-.08.258-.154.38-.24a.567.567 0 01.351-.1c.088.001.176.016.28.027v2.428c.073.005.129.011.185.013.08.002.16-.002.241 0 .113.004.15.041.157.153a.435.435 0 01-.068.285zM11.2 11.519c.15 0 .275-.002.4 0 .132 0 .157.021.164.15.004.074-.006.148-.017.22-.007.05-.043.075-.095.074H10.165c-.15 0-.162-.013-.18-.162a.467.467 0 01-.003-.04c-.01-.218.015-.243.232-.243.099 0 .197.002.295-.001.087-.003.098-.014.099-.102.002-.153 0-.306 0-.46V9.653c-.04.013-.072.02-.1.035-.114.06-.224.126-.338.184-.046.024-.098.034-.15.051a.487.487 0 01-.032-.343.183.183 0 01.074-.103c.19-.127.382-.252.578-.371.046-.029.109-.033.164-.045.13-.028.253.015.396.011v2.448z"/><path fill="#267ABE" d="M11.266 14.461c-.02.22-.036.433-.063.645a.854.854 0 01-.071.223c-.047.109-.137.166-.257.18-.29.034-.391-.11-.45-.353-.078-.322-.07-.649-.053-.976.007-.132.01-.263.058-.387.027-.069.055-.138.094-.201.118-.195.457-.177.569-.028a.606.606 0 01.106.264c.032.21.046.425.067.632v.001zM12.733 10.535c-.005-.28.002-.541.089-.794.085-.25.302-.293.503-.23.07.022.138.1.173.17.048.094.077.203.092.31.051.356.046.714 0 1.07a.69.69 0 01-.156.383c-.106.12-.246.117-.382.093-.123-.023-.194-.114-.23-.23a2.276 2.276 0 01-.088-.772z"/></symbol><symbol id="flight-azure-blob-storage-color-16" viewBox="0 0 16 16"><path fill="#2378BC" d="M15 8.004c-.184.312-.369.62-.55.932-.15.255-.292.513-.44.768-.104.179-.212.354-.317.532l-.394.668c-.213.367-.424.736-.638 1.102-.177.303-.358.605-.534.908a73.14 73.14 0 00-.585 1.016c-.032.056-.067.069-.126.069-.484-.002-.968-.001-1.453-.001-1.787 0-3.575-.001-5.362.002-.088 0-.132-.03-.174-.102-.163-.286-.333-.568-.5-.852l-.3-.52c-.161-.28-.323-.558-.486-.837l-.377-.646c-.09-.154-.178-.31-.269-.463-.172-.292-.347-.581-.517-.873-.15-.259-.295-.52-.444-.779-.102-.176-.209-.349-.311-.524-.07-.12-.137-.24-.209-.36-.022-.035-.014-.063.004-.093l.296-.512.277-.468.323-.55c.123-.21.249-.418.37-.628.123-.21.243-.42.365-.631.145-.25.29-.5.437-.75l.385-.652.39-.67c.194-.335.39-.67.58-1.008.032-.059.069-.082.137-.082.675.002 1.35.002 2.025.002h4.828c.05-.005.08.014.104.058.09.162.183.322.276.481.084.144.17.286.255.43.127.214.255.428.38.643.139.236.276.473.413.71.131.227.26.454.393.68.124.212.25.424.376.636l.401.685.52.905c.078.136.16.27.24.406l.21.369H15zM4.477 7.991v2.623c0 .123.01.244.053.364.097.277.287.46.552.576a1 1 0 00.404.063h5.005c.186 0 .364-.023.53-.119a.926.926 0 00.491-.784c.003-.046.002-.093.002-.139V6.422v-.547c0-.038-.008-.07-.037-.098-.08-.077-.156-.16-.236-.236-.19-.186-.383-.368-.574-.554-.088-.086-.174-.175-.262-.262-.09-.09-.182-.176-.27-.268a.222.222 0 00-.176-.08c-1.487.002-2.975.002-4.462.002-.21 0-.408.042-.585.158a.94.94 0 00-.435.858v2.596z"/><path fill="#FAFDFE" d="M4.477 7.99V5.396a.94.94 0 01.435-.859c.177-.115.375-.157.585-.157 1.487 0 2.975 0 4.462-.002.078 0 .127.029.176.08.088.092.18.179.27.268.088.087.174.176.262.262.19.186.383.368.574.554.08.077.155.159.235.236.03.028.038.06.038.098V10.575c0 .046 0 .093-.002.14a.923.923 0 01-.492.784 1.019 1.019 0 01-.529.118H5.486a.998.998 0 01-.404-.063.95.95 0 01-.552-.576 1.095 1.095 0 01-.053-.364V7.991zm5.35-3.096H5.528c-.05 0-.1-.003-.15.005a.43.43 0 00-.314.192.512.512 0 00-.064.293v5.23c0 .042-.001.086.004.129a.398.398 0 00.314.346c.073.014.148.019.223.019 1.613.001 3.225.001 4.837 0 .081 0 .162-.007.243-.013.158-.012.261-.1.331-.236.042-.08.04-.166.04-.253V7.584v-1.4c0-.036-.005-.072-.009-.117H9.827V4.893z"/><path fill="#2478BD" d="M9.827 4.894v1.174h1.157c.003.045.008.08.008.116v4.423c0 .086.002.173-.04.253-.07.136-.172.224-.33.236-.082.005-.162.013-.243.013H5.541c-.074 0-.15-.005-.223-.019a.397.397 0 01-.314-.347C5 10.701 5 10.657 5 10.614v-5.23c0-.102.006-.2.065-.292a.432.432 0 01.314-.192c.05-.008.1-.005.15-.005h4.298v-.001zm-3.4 4.525c.009.12.013.24.028.36.016.124.047.245.107.36a.543.543 0 00.373.293c.107.024.215.025.325.013a.61.61 0 00.538-.406c.05-.127.075-.26.09-.394.037-.32.018-.633-.09-.94a.5.5 0 00-.278-.294.803.803 0 00-.573-.031c-.231.07-.36.234-.433.446a1.888 1.888 0 00-.087.593zM9.57 6.58c-.013-.119-.029-.238-.04-.357a.856.856 0 00-.18-.476.461.461 0 00-.19-.142.836.836 0 00-.375-.06.655.655 0 00-.516.272.986.986 0 00-.162.486c-.032.298-.033.597.05.89.036.128.09.242.198.324.2.155.432.164.666.11.238-.054.377-.22.452-.445a2.19 2.19 0 00.097-.601zm-.118 3.835a.307.307 0 00.048-.2c-.005-.08-.031-.106-.11-.108-.056-.002-.113 0-.169-.001-.04-.001-.079-.006-.13-.009V8.384c-.072-.007-.134-.018-.196-.019a.399.399 0 00-.246.07c-.085.061-.177.113-.265.17-.04.025-.079.05-.114.079-.018.014-.035.039-.036.06a1.552 1.552 0 00-.001.175c0 .04.027.054.064.049a.258.258 0 00.08-.024c.073-.04.144-.085.216-.126.023-.014.05-.02.076-.03.019.14.012 1.243-.01 1.319h-.088c-.081 0-.162-.002-.244 0-.067.003-.09.025-.094.09-.002.034 0 .068 0 .102 0 .088.027.125.128.124.334-.005.669-.002 1.003-.002.03 0 .061-.003.088-.005zm-2.012-3.11V5.58c-.1.003-.186-.027-.277-.008-.04.008-.083.012-.115.032-.137.084-.272.172-.404.263a.13.13 0 00-.052.072.346.346 0 00.022.242c.037-.012.073-.02.105-.036.08-.041.157-.087.236-.13.02-.01.043-.015.071-.025v1.245c-.001.062-.009.07-.07.072-.068.002-.137 0-.206 0-.152 0-.17.018-.162.173 0 .009 0 .018.002.028.012.105.021.114.126.114h1.04c.037 0 .063-.017.067-.052a.806.806 0 00.012-.156c-.005-.09-.023-.105-.115-.106h-.28v-.001z"/><path fill="#F9FCFE" d="M6.426 9.419c.004-.202.02-.402.087-.593.074-.212.202-.377.433-.446.197-.06.39-.05.573.031.128.058.23.153.279.294.107.307.126.62.09.94-.015.135-.04.268-.091.394a.61.61 0 01-.537.406.984.984 0 01-.326-.013.544.544 0 01-.372-.294 1.035 1.035 0 01-.108-.36c-.015-.119-.02-.24-.029-.36h.001zm1.06-.035c-.014-.146-.024-.297-.047-.446a.426.426 0 00-.074-.186c-.079-.105-.316-.118-.399.02a.883.883 0 00-.065.141c-.033.088-.036.18-.04.273-.012.232-.018.462.037.69.04.171.112.273.315.249a.208.208 0 00.18-.127.592.592 0 00.049-.158c.019-.15.03-.3.044-.455zM9.57 6.582a2.19 2.19 0 01-.096.601c-.075.225-.214.391-.453.446-.233.053-.464.044-.666-.11a.585.585 0 01-.198-.325 2.32 2.32 0 01-.049-.89.984.984 0 01.162-.486.655.655 0 01.516-.272.841.841 0 01.375.06c.074.03.138.077.19.142.112.14.166.3.18.476.01.12.026.238.04.357zm-1.056.031c-.006.177.004.363.06.545.027.082.076.147.162.162.096.018.193.02.267-.065a.492.492 0 00.11-.27 2.8 2.8 0 000-.756.72.72 0 00-.064-.22c-.025-.048-.072-.103-.122-.118-.14-.045-.292-.014-.352.162-.06.178-.065.363-.062.56z"/><path fill="#FAFCFE" d="M9.453 10.417c-.026.001-.057.005-.088.005-.334 0-.669-.003-1.003.001-.1.002-.128-.036-.128-.124 0-.034-.002-.068 0-.102.005-.064.027-.087.095-.089.08-.002.162 0 .243 0h.088c.023-.075.029-1.18.01-1.32-.027.01-.053.017-.076.03-.072.042-.142.087-.215.127a.255.255 0 01-.08.023c-.037.006-.063-.009-.065-.048-.002-.058-.004-.117 0-.176.002-.021.02-.045.037-.06.036-.03.075-.054.114-.079.088-.056.18-.108.266-.17a.395.395 0 01.246-.07c.061.001.123.012.196.02v1.714c.05.003.09.008.13.009.055.001.112-.002.168 0 .079.003.104.029.11.108a.309.309 0 01-.047.201h-.001zM7.44 7.307h.28c.092.001.11.015.115.107a.803.803 0 01-.012.155c-.005.035-.03.053-.067.052h-1.04c-.105 0-.114-.01-.126-.114a.334.334 0 01-.003-.028c-.007-.154.01-.172.163-.172h.206c.06-.003.069-.01.07-.073V6.91v-.92c-.028.01-.051.014-.07.025-.08.042-.157.088-.237.13-.032.016-.069.023-.105.035a.346.346 0 01-.022-.242.13.13 0 01.051-.072c.134-.09.268-.178.405-.263.032-.02.076-.023.115-.031.09-.02.177.01.277.008V7.307z"/><path fill="#267ABE" d="M7.486 9.384c-.014.155-.025.306-.044.455a.607.607 0 01-.05.158c-.032.077-.095.117-.18.127-.202.024-.273-.078-.314-.25-.055-.226-.05-.457-.037-.688.004-.093.007-.186.04-.273a.85.85 0 01.066-.142c.082-.138.32-.125.398-.02a.43.43 0 01.074.186c.023.15.033.3.047.447zM8.514 6.613c-.004-.198 0-.382.061-.56.06-.176.212-.207.353-.163.049.016.096.07.12.12a.72.72 0 01.065.219 2.8 2.8 0 010 .756.489.489 0 01-.11.27c-.073.084-.171.082-.267.065-.086-.016-.135-.08-.16-.162a1.621 1.621 0 01-.062-.545z"/></symbol><symbol id="flight-azure-devops-24" viewBox="0 0 24 24"><path d="M21 6.37v10.945L16.5 21l-6.975-2.54v2.518L5.576 15.82l11.509.9V6.864L21 6.371zm-3.836.551L10.706 3v2.573L4.778 7.315 3 9.595v5.18L5.543 15.9v-6.64l11.62-2.338z"/></symbol><symbol id="flight-azure-devops-16" viewBox="0 0 16 16"><path d="M15 3.622v8.512L11.5 15l-5.425-1.975v1.958L3.004 10.97l8.951.7V4.005L15 3.622zm-2.984.428L6.994 1v2.001L2.382 4.356 1 6.13v4.029l1.978.873V5.869l9.038-1.818z"/></symbol><symbol id="flight-azure-devops-color-24" viewBox="0 0 24 24"><path fill="url(#azure-devops-color-24__paint0_linear_707_113)" d="M21 6.37v10.945L16.5 21l-6.975-2.54v2.518L5.576 15.82l11.509.9V6.864L21 6.371zm-3.836.551L10.706 3v2.573L4.778 7.315 3 9.595v5.18L5.543 15.9v-6.64l11.62-2.338z"/></symbol><symbol id="flight-azure-devops-color-16" viewBox="0 0 16 16"><path fill="url(#azure-devops-color-16__paint0_linear_707_116)" d="M15 3.622v8.512L11.5 15l-5.425-1.975v1.958L3.004 10.97l8.951.7V4.005L15 3.622zm-2.984.428L6.994 1v2.001L2.382 4.356 1 6.13v4.029l1.978.873V5.869l9.038-1.818z"/></symbol><symbol id="flight-azure-vms-24" viewBox="0 0 24 24"><g><path d="M9.152 7.703L12 6.088l2.848 1.615L12 9.36 9.152 7.703zM12.497 9.65L15.1 8.135v3.03L12.497 9.65zM12.25 10.085l2.598 1.512-2.598 1.474v-2.986zM11.75 10.085v2.986l-2.598-1.474 2.598-1.512zM8.9 8.135v3.03l2.603-1.515L8.9 8.135z"/><path fill-rule="evenodd" d="M21.333 3H2.667A.667.667 0 002 3.667v12c0 .368.298.666.667.666h7.366c0 2.3-.066 3.723-2.044 4.034A1.111 1.111 0 007 21.477h10a1.11 1.11 0 00-.989-1.11c-1.978-.312-2.055-1.734-2.055-4.034h7.377a.667.667 0 00.667-.666v-12A.667.667 0 0021.333 3zM15.6 7.554L12 5.513 8.4 7.554v4.192l3.6 2.041 3.6-2.041V7.554z" clip-rule="evenodd"/></g></symbol><symbol id="flight-azure-vms-16" viewBox="0 0 16 16"><g><path d="M6.006 5.309L8 4.172 9.994 5.31 8 6.475 6.006 5.31zM8.348 6.679l1.822-1.066v2.132L8.348 6.679zM8.175 6.985l1.819 1.064-1.819 1.036v-2.1zM7.825 6.985v2.1L6.006 8.05l1.82-1.064zM5.83 5.613v2.132l1.822-1.066L5.83 5.613z"/><path fill-rule="evenodd" d="M14.533 2H1.467A.468.468 0 001 2.469v8.443c0 .259.209.469.467.469h5.156c0 1.618-.046 2.618-1.43 2.837A.776.776 0 004.5 15h7a.784.784 0 00-.692-.782c-1.385-.219-1.44-1.22-1.44-2.837h5.165c.258 0 .467-.21.467-.47V2.47A.468.468 0 0014.533 2zM10.52 5.204L8 3.768 5.48 5.204v2.95L8 9.59l2.52-1.437V5.204z" clip-rule="evenodd"/></g></symbol><symbol id="flight-azure-vms-color-24" viewBox="0 0 24 24"><path fill="url(#azure-vms-color-24__paint0_linear_2372_258)" d="M21.333 3H2.667A.667.667 0 002 3.667v12c0 .368.298.666.667.666h18.666a.667.667 0 00.667-.666v-12A.667.667 0 0021.333 3z"/><path fill="#50E6FF" d="M15.333 7.722V11.6L12 13.556v-3.89l3.333-1.944z"/><path fill="#C3F1FF" d="M15.333 7.722L12 9.678 8.667 7.722 12 5.778l3.333 1.944z"/><path fill="#9CEBFF" d="M12 9.678v3.878L8.667 11.6V7.722L12 9.678z"/><path fill="#C3F1FF" d="M8.667 11.6L12 9.667v3.889L8.667 11.6z"/><path fill="#9CEBFF" d="M15.333 11.6L12 9.667v3.889l3.333-1.956z"/><path fill="url(#azure-vms-color-24__paint1_linear_2372_258)" d="M16.011 20.367c-1.978-.312-2.055-1.734-2.055-4.034h-3.923c0 2.3-.066 3.723-2.044 4.034A1.112 1.112 0 007 21.477h10a1.111 1.111 0 00-.989-1.11z"/></symbol><symbol id="flight-azure-vms-color-16" viewBox="0 0 16 16"><path fill="url(#azure-vms-color-16__paint0_linear_2372_267)" d="M14.533 2H1.467A.467.467 0 001 2.467v8.4c0 .257.209.466.467.466h13.066a.467.467 0 00.467-.466v-8.4A.467.467 0 0014.533 2z"/><path fill="#50E6FF" d="M10.333 5.306V8.02L8 9.389V6.667l2.333-1.361z"/><path fill="#C3F1FF" d="M10.333 5.306L8 6.674 5.667 5.306 8 3.944l2.333 1.362z"/><path fill="#9CEBFF" d="M8 6.674V9.39L5.667 8.02V5.306L8 6.674z"/><path fill="#C3F1FF" d="M5.667 8.02L8 6.667v2.722L5.667 8.02z"/><path fill="#9CEBFF" d="M10.333 8.02L8 6.667v2.722l2.333-1.369z"/><path fill="url(#azure-vms-color-16__paint1_linear_2372_267)" d="M10.808 14.157c-1.385-.218-1.44-1.214-1.44-2.824H6.624c0 1.61-.046 2.606-1.43 2.824a.778.778 0 00-.693.777h7a.777.777 0 00-.692-.777z"/></symbol><symbol id="flight-bitbucket-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M2.153 3.225A.64.64 0 012.643 3l18.715.003a.64.64 0 01.634.744L19.289 20.45a.644.644 0 01-.634.54H5.572a.874.874 0 01-.847-.717L2.008 3.743a.64.64 0 01.145-.518zm7.765 11.722h4.187l1.011-5.897H8.804l1.114 5.897z" clip-rule="evenodd"/></symbol><symbol id="flight-bitbucket-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M1.403 2.15A.43.43 0 011.73 2l12.54.002a.43.43 0 01.424.496l-1.81 11.135a.43.43 0 01-.425.36H3.693a.585.585 0 01-.568-.478l-1.82-11.02a.425.425 0 01.098-.345zm5.203 7.814H9.41l.677-3.93H5.859l.747 3.93z" clip-rule="evenodd"/></symbol><symbol id="flight-bitbucket-color-24" viewBox="0 0 24 24"><path fill="#2684FF" fill-rule="evenodd" d="M2.153 3.225A.64.64 0 012.643 3l18.715.003a.64.64 0 01.634.744L19.289 20.45a.644.644 0 01-.634.54H5.572a.874.874 0 01-.847-.717L2.008 3.743a.64.64 0 01.145-.518zm7.765 11.722h4.187l1.011-5.897H8.804l1.114 5.897z" clip-rule="evenodd"/><path fill="url(#bitbucket-color-24__paint0_linear_707_129)" d="M21.138 9.05h-6.005l-1.001 5.897H9.918L5.011 20.79a.871.871 0 00.56.21h13.085c.315 0 .583-.23.634-.54l1.848-11.41z"/></symbol><symbol id="flight-bitbucket-color-16" viewBox="0 0 16 16"><path fill="#2684FF" fill-rule="evenodd" d="M1.403 2.15A.43.43 0 011.73 2l12.54.002a.43.43 0 01.424.496l-1.81 11.135a.43.43 0 01-.425.36H3.693a.585.585 0 01-.568-.478l-1.82-11.02a.425.425 0 01.098-.345zm5.203 7.814H9.41l.677-3.93H5.859l.747 3.93z" clip-rule="evenodd"/><path fill="url(#bitbucket-color-16__paint0_linear_707_135)" d="M14.122 6.033H10.1l-.67 3.931H6.604L3.317 13.86c.105.09.238.139.376.14h8.766a.43.43 0 00.425-.36l1.238-7.607z"/></symbol><symbol id="flight-bridgecrew-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M5.687 14.595c.013-.03.05-.05.087-.069.017-.008.034-.017.048-.027a3.245 3.245 0 006.032-.178l.727 1.111-.414.382a62.853 62.853 0 01-.001.002l.415-.384c1.436 1.311 3.477 1.374 4.56.173l-.968-.973c-1.022.594-1.825.552-2.473-.132a1.695 1.695 0 01-.164-2.253c.545-.704 1.527-.915 2.293-.489.076.043.147.094.218.145l.104.073.336-.355c.213-.225.427-.45.645-.682l-.425-.325c.142-.528.01-1.019-.258-1.47-.499-.84-1.316-1.291-2.193-1.647-.977-.396-1.959-.783-2.94-1.17-.394-.154-.788-.31-1.181-.465l.065-.081.066-.083c1.115-1.405 2.506-1.643 3.991-.624.501.343.972.763 1.357 1.227 1.386 1.67 2.752 3.356 4.117 5.043l1.097 1.354c.499.616.93 1.269 1.109 2.053.204.902-.09 1.634-.796 2.212-.791.647-1.739.935-2.735 1.109-1.365.237-2.73.477-4.095.716h-.002c-1.63.287-3.26.573-4.89.855-.784.136-1.572.241-2.361.347-.127.017-.257.008-.387-.002a4.251 4.251 0 00-.174-.01h-.005c-.862-.012-1.536-.344-1.954-1.108-.487-.659-.697-1.421-.839-2.203l-.258-1.426v-.001c-.461-2.544-.923-5.088-1.357-7.636a6.27 6.27 0 01-.039-1.774c.14-1.16.907-1.826 2.096-1.83.575-.002 1.185.043 1.72.23a70.82 70.82 0 013.01 1.157c.396.16.792.319 1.19.475-.007.02-.012.041-.018.062-.013.046-.027.093-.049.135-.154.297-.31.594-.466.89-.297.563-.593 1.126-.88 1.693-.184.363-.352.735-.52 1.106l-.218.479-.347.149-.534.23V7.726H5.562v.368c0 .441-.002.882-.004 1.323-.005 1.11-.01 2.219.016 3.327.01.403.082.804.155 1.204.033.183.066.367.093.55-.015.01-.032.019-.05.028-.036.019-.072.039-.085.068z" clip-rule="evenodd"/><path d="M8.133 9.74c.166-.368.333-.737.515-1.097.287-.567.584-1.13.88-1.693l.467-.89c.022-.042.035-.089.048-.135l.018-.062h.073l1.18.466c.982.387 1.964.773 2.941 1.17.878.355 1.694.807 2.193 1.646.269.452.4.942.258 1.471l-.069-.035c-.04-.02-.08-.04-.12-.062-1.59-.839-3.54-.265-4.392 1.295-.06.11-.112.222-.17.343l-.08.17c-.372-.98-1.02-1.653-1.994-2.01-.647-.237-1.307-.204-1.97-.089l.222-.488zM10.577 13.252c-.018-.976-.823-1.728-1.826-1.707-.971.021-1.762.813-1.754 1.757.008.974.847 1.772 1.84 1.752a1.771 1.771 0 001.74-1.802z"/></g></symbol><symbol id="flight-bridgecrew-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9.71 8.77c-.117.104-.237.207-.357.309l-.163.14c.453.47 1.016.499 1.731.09l.678.67c-.758.825-2.186.782-3.192-.12l-.29.264c-.223.202-.445.404-.672.601.227-.197.449-.4.672-.602l.29-.263c-.17-.254-.34-.508-.509-.764a2.251 2.251 0 01-.802 1.046 2.291 2.291 0 01-3.42-.923c-.01.007-.022.013-.034.019-.026.013-.052.027-.06.047l-.152.336-.07.154.063-.14.158-.35c.01-.02.035-.034.06-.047.013-.006.024-.012.034-.019a11.74 11.74 0 00-.065-.378c-.05-.275-.102-.551-.108-.828a81.944 81.944 0 01-.011-2.287l.002-.91v-.253h1.028v1.979l.373-.158.243-.102.153-.33c.117-.255.235-.51.364-.76.2-.39.408-.776.615-1.163l.327-.612c.015-.03.025-.061.034-.093l.013-.043c-.279-.107-.556-.217-.834-.327-.698-.275-1.396-.551-2.106-.795C3.33 2.029 2.902 1.998 2.5 2c-.832.003-1.37.461-1.467 1.258-.049.4-.042.822.027 1.22.304 1.751.627 3.5.95 5.25l.18.98c.1.538.247 1.062.587 1.514.293.526.765.755 1.368.764h.004c.04 0 .081.003.122.006.09.006.182.013.27.001a45.379 45.379 0 001.654-.238c1.14-.194 2.281-.391 3.422-.588h.002c.955-.165 1.91-.33 2.866-.493.698-.119 1.361-.317 1.915-.762.495-.397.7-.9.557-1.52-.125-.54-.427-.989-.776-1.412l-.768-.93v-.001c-.956-1.16-1.912-2.319-2.882-3.467-.27-.319-.6-.608-.95-.844-1.04-.7-2.013-.537-2.794.43l-.046.056-.046.056.826.32c.687.266 1.375.532 2.06.804.614.245 1.185.556 1.534 1.132.188.31.28.648.181 1.011l.297.224-.45.469-.236.243c-.226.437-.59.755-.955 1.073l-.227.2-.014.013zm0 0l.014-.014.227-.2c.364-.318.73-.636.955-1.073l-.073-.05c-.05-.035-.1-.07-.152-.099a1.28 1.28 0 00-1.606.336 1.15 1.15 0 00.115 1.549l.165-.142c.12-.102.239-.203.355-.308zm-5.562 4.215c.585-.067 1.06-.355 1.491-.712-.432.357-.908.647-1.495.713h.004zm3.11-2.099l.004-.002-.756.655c.252-.217.502-.435.753-.653zM5.138 6.281l.156-.335c.117-.253.233-.507.36-.755.201-.39.409-.776.616-1.163l.327-.612c.015-.03.025-.061.034-.093l.013-.043.05.001.827.32c.687.266 1.375.532 2.059.804.614.245 1.186.556 1.535 1.132.188.31.28.648.18 1.011l-.048-.024a4.734 4.734 0 01-.084-.042c-1.113-.577-2.478-.182-3.074.89-.042.075-.079.153-.119.236l-.056.117c-.26-.673-.714-1.137-1.396-1.382-.453-.163-.915-.14-1.38-.061v-.001zm1.867 2.08c-.013-.671-.576-1.188-1.279-1.174-.679.015-1.233.56-1.227 1.208.006.67.593 1.219 1.288 1.205.687-.014 1.231-.568 1.218-1.239z" clip-rule="evenodd"/></symbol><symbol id="flight-bridgecrew-color-24" viewBox="0 0 24 24"><path fill="#662FFE" d="M10.134 5.863l.132-.165c1.115-1.405 2.506-1.643 3.991-.624.501.343.972.763 1.357 1.227 1.758 2.117 3.482 4.26 5.214 6.397.499.616.93 1.269 1.109 2.053.204.902-.09 1.634-.796 2.212-.791.647-1.739.935-2.735 1.109-2.996.52-5.99 1.052-8.987 1.571-.784.136-1.572.241-2.361.347-.185.025-.377-.006-.565-.012.837-.096 1.518-.516 2.135-1.037.873-.735 1.724-1.495 2.578-2.251.466-.412.918-.839 1.376-1.258 1.436 1.31 3.476 1.374 4.559.173l-.968-.973c-1.022.594-1.825.552-2.473-.132.254-.224.513-.444.763-.673.619-.568 1.298-1.084 1.689-1.851l.98-1.037-.425-.325c.142-.528.01-1.019-.258-1.47-.499-.84-1.316-1.291-2.193-1.647-1.37-.555-2.747-1.091-4.122-1.635v.001z"/><path fill="#062982" d="M4.538 18.87c-.487-.66-.697-1.421-.839-2.203-.546-3.02-1.1-6.039-1.615-9.063a6.27 6.27 0 01-.039-1.774c.14-1.16.907-1.826 2.096-1.83.575-.002 1.185.043 1.72.23 1.418.496 2.803 1.082 4.2 1.632-.021.066-.035.136-.067.197-.448.861-.908 1.717-1.346 2.583-.263.52-.494 1.055-.738 1.585l-.88.378V7.727H5.561v.368c0 1.55-.024 3.101.012 4.65.014.586.162 1.17.248 1.754-.046.031-.116.052-.134.095-.36.817-.73 1.631-1.066 2.458-.24.588-.139 1.207-.084 1.816v.001z"/><path fill="#01147D" d="M7.91 10.228c.245-.529.475-1.065.738-1.585.439-.866.898-1.722 1.347-2.583.031-.06.045-.13.066-.197h.073c1.374.544 2.752 1.08 4.121 1.636.878.355 1.694.807 2.193 1.646.269.452.4.942.258 1.47-.063-.031-.127-.063-.19-.096-1.588-.839-3.54-.265-4.39 1.295-.087.159-.16.325-.25.513-.373-.98-1.02-1.653-1.995-2.01-.647-.237-1.307-.204-1.97-.089zM4.537 18.87c-.054-.61-.155-1.229.085-1.818.336-.826.705-1.64 1.065-2.457.019-.043.089-.065.135-.096a3.245 3.245 0 006.032-.178l.727 1.111c-.458.42-.91.847-1.375 1.259-.854.756-1.706 1.515-2.579 2.251-.617.52-1.298.94-2.135 1.037-.862-.013-1.536-.345-1.954-1.109z"/><path fill="#02157E" d="M13.699 14.5a1.696 1.696 0 01-.163-2.253c.545-.704 1.527-.915 2.293-.489.114.064.215.146.322.219-.39.767-1.07 1.283-1.688 1.85-.25.23-.509.45-.764.674zM8.75 11.545c1.004-.021 1.809.73 1.827 1.707a1.771 1.771 0 01-1.74 1.802c-.993.02-1.832-.778-1.84-1.752-.008-.944.783-1.736 1.754-1.757z"/></symbol><symbol id="flight-bridgecrew-color-16" viewBox="0 0 16 16"><path fill="#662FFE" d="M6.694 3.281l.092-.113c.78-.967 1.755-1.13 2.794-.43.35.236.68.525.95.844 1.23 1.456 2.437 2.93 3.65 4.398.349.423.651.872.776 1.411.143.62-.063 1.124-.557 1.521-.554.445-1.217.643-1.915.762-2.097.358-4.193.724-6.29 1.08-.55.094-1.101.167-1.653.24-.13.016-.264-.005-.396-.009.586-.066 1.063-.355 1.495-.713.61-.506 1.207-1.028 1.805-1.548.326-.283.642-.576.962-.865 1.006.902 2.434.945 3.192.12a721.45 721.45 0 00-.678-.67c-.715.409-1.278.38-1.731-.09.178-.154.36-.305.534-.463.434-.39.91-.745 1.182-1.273l.686-.712-.297-.224c.1-.363.008-.7-.18-1.011-.35-.576-.921-.887-1.536-1.132-.958-.381-1.923-.75-2.885-1.124v.001z"/><path fill="#062982" d="M2.776 12.223c-.34-.453-.487-.977-.586-1.514-.383-2.076-.77-4.152-1.131-6.232a4.235 4.235 0 01-.027-1.219c.097-.797.635-1.255 1.467-1.258.403-.002.83.03 1.204.158.992.341 1.962.744 2.94 1.122-.015.046-.025.094-.047.136-.314.592-.636 1.18-.942 1.775-.185.358-.346.726-.517 1.09l-.616.26V4.562H3.493v.253c0 1.066-.016 2.132.009 3.197.01.403.113.804.174 1.206-.032.021-.082.036-.095.065-.252.562-.51 1.122-.745 1.69-.168.405-.098.83-.06 1.249z"/><path fill="#01147D" d="M5.137 6.281c.171-.363.333-.732.517-1.09.307-.594.629-1.183.943-1.775.022-.042.031-.09.046-.135h.05c.963.374 1.927.743 2.886 1.124.614.245 1.186.556 1.535 1.132.188.31.28.648.18 1.011-.044-.022-.089-.043-.132-.066-1.113-.577-2.478-.182-3.074.89-.06.11-.112.224-.175.353-.26-.673-.714-1.137-1.396-1.382-.453-.163-.915-.14-1.38-.061zM2.776 12.223c-.038-.42-.108-.845.06-1.25.235-.568.493-1.128.745-1.69.013-.028.062-.043.094-.065a2.291 2.291 0 003.421.923c.386-.273.644-.637.802-1.046l.509.765c-.32.289-.638.582-.963.865-.598.52-1.194 1.042-1.805 1.548-.432.357-.908.647-1.495.713-.603-.01-1.074-.238-1.367-.763z"/><path fill="#02157E" d="M9.19 9.22a1.15 1.15 0 01-.115-1.55 1.28 1.28 0 011.606-.336c.079.043.15.1.225.15-.274.528-.75.882-1.182 1.273-.175.157-.356.308-.535.462zM5.725 7.187c.703-.014 1.266.503 1.279 1.174.013.67-.531 1.225-1.218 1.239-.695.014-1.282-.535-1.288-1.205-.006-.648.548-1.194 1.227-1.208z"/></symbol><symbol id="flight-cisco-24" viewBox="0 0 24 24"><g><path d="M7.256 9.868V11.7c-.001.302-.148.495-.408.546a.482.482 0 01-.56-.414 1.223 1.223 0 01-.01-.168V6.583c0-.326.135-.516.404-.573a.481.481 0 01.566.417c.007.06.008.12.008.18v3.261zM5.91 13.961v1.121a1.636 1.636 0 00-.786-.207c-.468-.01-.86.232-1.023.633-.283.698.182 1.423.93 1.448.268.009.524-.045.768-.162l.084-.038.012-.005.008.002a.166.166 0 00.012.004v.19c0 .267 0 .535-.002.803 0 .025-.032.066-.055.072-.626.16-1.244.18-1.838-.135-.775-.41-1.097-1.212-1.026-2.01.107-1.197 1.1-1.947 2.248-1.835a3.863 3.863 0 01.56.095l.109.024zM15.978 15.082V13.95l-.21-.036c-.154-.027-.307-.054-.46-.07-1.143-.115-2.138.631-2.246 1.834-.068.754.203 1.542.946 1.973.613.356 1.261.338 1.92.17.021-.005.052-.04.052-.062.002-.274.002-.548.002-.828v-.19l-.045.02-.074.035a1.63 1.63 0 01-.756.16c-.753-.019-1.224-.748-.939-1.45.163-.399.556-.64 1.024-.63.274.005.535.068.786.207z"/><path fill-rule="evenodd" d="M21.015 15.946c0-1.17-.862-2.05-2.01-2.05-1.141-.002-2.017.887-2.018 2.047-.002 1.159.877 2.058 2.011 2.057 1.136-.001 2.016-.897 2.017-2.054zm-1.007-.004a1.016 1.016 0 01-1.013 1.043c-.56 0-1.004-.46-1.003-1.041 0-.58.445-1.038 1.006-1.038.563 0 1.005.454 1.01 1.036z" clip-rule="evenodd"/><path d="M11.856 14.854v-.801c-.347-.08-.69-.143-1.04-.127a1.576 1.576 0 00-.828.251c-.634.426-.688 1.393-.1 1.852.191.148.406.244.638.31.161.046.325.114.462.212.168.12.146.348-.026.465a.638.638 0 01-.19.085c-.252.07-.508.054-.762.012-.121-.02-.241-.047-.362-.075l-.158-.034v.891c.287.083 1.03.127 1.314.086.3-.043.584-.128.832-.314.617-.461.635-1.402.024-1.868-.129-.099-.28-.167-.431-.235l-.114-.052a3.194 3.194 0 00-.232-.095c-.075-.028-.15-.056-.222-.09a.274.274 0 01-.17-.277.246.246 0 01.203-.234c.173-.036.352-.067.526-.059.147.007.293.034.44.062.066.012.13.025.196.035zM16.775 9.121v.821l.001 1.804c.001.347.3.577.621.487.225-.064.355-.26.355-.543V6.549c0-.024 0-.049-.002-.073-.03-.328-.304-.535-.608-.46-.224.055-.366.247-.367.504v2.601zM7.26 13.961h.964v3.934H7.26v-3.934zM20.37 9.935v-.362-.307c0-.287.001-.574-.002-.86a.692.692 0 00-.04-.246.475.475 0 00-.547-.286.492.492 0 00-.385.492 232.81 232.81 0 000 2.408c0 .07.019.145.046.21a.482.482 0 00.925-.194c.004-.285.003-.57.003-.855zM15.125 9.934v.808c-.002.313-.2.529-.484.53-.29 0-.492-.218-.493-.535V8.4c0-.318.203-.536.492-.535.29.001.484.216.484.54v1.528zM9.88 9.931v-.618-.909c-.002-.32-.2-.537-.489-.537-.29 0-.488.215-.489.537v2.335c0 .317.205.534.495.532.282-.001.481-.219.482-.531V9.93zM3.657 9.56v-.385-.77c0-.302.156-.512.395-.536.283-.029.485.13.542.435.023.123.038.25.039.375.004.686.004 1.373.001 2.059-.001.382-.321.626-.654.507a.494.494 0 01-.323-.48V9.56zM11.529 10.089a45.21 45.21 0 010 .326v.356c.005.278.196.487.45.5.28.013.503-.167.516-.454.017-.38.018-.761 0-1.14a.47.47 0 00-.516-.455c-.255.016-.445.225-.45.502v.365zM1.98 10.255v.163l-.001.354c-.005.288-.216.5-.49.5-.274-.002-.483-.214-.486-.504a50.483 50.483 0 010-1.046.489.489 0 01.49-.5c.272.001.481.216.486.504v.529zM22.02 10.09v.16l-.001.161v.356c.005.288.207.5.475.504.278.004.495-.2.5-.49.008-.353.007-.706.001-1.06a.487.487 0 00-.492-.5c-.272.003-.48.22-.483.51-.002.12-.001.24 0 .359z"/></g></symbol><symbol id="flight-cisco-16" viewBox="0 0 16 16"><g><path d="M4.55 6.579V7.8c0 .201-.108.33-.296.364-.192.034-.38-.093-.408-.276a.75.75 0 01-.008-.112V4.388c0-.217.099-.343.295-.381.193-.038.386.092.411.277.005.04.006.08.006.12V6.58zM3.572 9.308v.747a1.275 1.275 0 00-.573-.138c-.34-.007-.625.154-.744.422-.205.465.133.948.677.965.195.006.381-.03.558-.108l.062-.025.008-.003h.006l.009.003v.127c0 .178 0 .356-.002.535 0 .017-.023.044-.04.048-.455.107-.904.12-1.336-.09-.564-.273-.798-.807-.747-1.34.078-.798.8-1.298 1.635-1.223.076.007.152.015.227.027.06.01.12.023.18.036l.08.017zM10.893 10.055v-.756c-.052-.007-.102-.016-.153-.024a4.935 4.935 0 00-.334-.046c-.831-.077-1.555.42-1.634 1.222-.05.503.148 1.028.688 1.316.446.237.918.225 1.396.114.016-.004.038-.028.038-.043.002-.182.002-.364.002-.551v-.127l-.033.014-.054.023a1.277 1.277 0 01-.55.107c-.547-.013-.89-.5-.682-.967.118-.266.404-.427.744-.42.2.003.39.045.572.138z"/><path fill-rule="evenodd" d="M14.556 10.63c0-.78-.626-1.366-1.462-1.367-.83 0-1.466.592-1.467 1.366-.001.772.638 1.372 1.463 1.37.826 0 1.466-.597 1.466-1.369zm-.732-.002c.004.387-.323.695-.737.695-.407 0-.73-.307-.73-.694.001-.386.325-.692.733-.692.409 0 .73.303.734.69z" clip-rule="evenodd"/><path d="M7.895 9.903v-.535a3.023 3.023 0 00-.757-.084c-.214.01-.419.055-.602.167-.46.285-.5.93-.072 1.235.139.099.295.163.464.207.117.03.237.076.336.14.122.08.106.233-.019.31a.488.488 0 01-.138.058c-.184.046-.37.036-.555.007a5.303 5.303 0 01-.262-.049l-.115-.023v.594c.208.056.749.085.955.058a1.36 1.36 0 00.606-.21c.448-.307.46-.935.017-1.245-.094-.066-.204-.112-.314-.157a6.167 6.167 0 01-.083-.035c-.055-.024-.112-.043-.168-.063a2.566 2.566 0 01-.162-.06c-.08-.034-.13-.097-.124-.184.006-.086.068-.142.148-.157.126-.023.256-.044.383-.039.107.005.213.023.32.042l.142.023zM11.473 5.547V7.83c.002.232.219.385.452.325.163-.042.258-.173.258-.362V4.366c0-.016 0-.032-.002-.049-.021-.218-.22-.356-.44-.307a.331.331 0 00-.268.337v1.2zM4.553 9.308h.7v2.622h-.7V9.308zM14.087 6.624V6.177v-.573a.425.425 0 00-.03-.164c-.064-.146-.227-.221-.398-.19a.335.335 0 00-.28.328c-.004.535-.002 1.07 0 1.605 0 .046.014.096.034.14a.357.357 0 00.392.187.33.33 0 00.281-.317c.002-.19.002-.38.001-.57zM10.272 6.622v.54a.337.337 0 01-.351.352.341.341 0 01-.359-.356V5.6a.34.34 0 01.358-.357c.211.001.352.144.352.36v1.018zM6.458 6.62v-.412-.605c-.001-.214-.145-.359-.355-.359s-.355.144-.356.358V7.16a.34.34 0 00.36.355.34.34 0 00.35-.354v-.54zM1.933 6.374v-.257-.514c0-.201.113-.341.286-.357.207-.019.353.086.395.29.017.082.028.167.028.25.003.458.003.915.001 1.372a.353.353 0 01-.476.339.331.331 0 01-.234-.32l-.001-.574v-.23zM7.657 6.725a23.847 23.847 0 010 .218l.001.237a.334.334 0 00.327.334c.203.009.366-.111.375-.302a7.751 7.751 0 000-.761c-.01-.19-.177-.314-.375-.303a.337.337 0 00-.327.335v.242zM.712 6.837v.344c-.004.192-.157.334-.356.333-.2 0-.352-.142-.354-.335a30.86 30.86 0 010-.697c.002-.192.158-.335.356-.334.199 0 .35.144.354.336v.353zM15.287 6.726V7.178c.003.192.15.334.345.336.202.003.36-.133.364-.326.006-.236.005-.472 0-.707-.003-.194-.158-.334-.358-.333a.342.342 0 00-.35.34c-.002.079-.002.159-.002.238z"/></g></symbol><symbol id="flight-cisco-color-24" viewBox="0 0 24 24"><g fill="#02A5DD"><path d="M7.256 9.868V11.7c-.001.302-.148.495-.408.546a.482.482 0 01-.56-.414 1.223 1.223 0 01-.01-.168V6.583c0-.326.135-.516.404-.573a.481.481 0 01.566.417c.007.06.008.12.008.18v3.261zM5.91 13.961v1.121a1.636 1.636 0 00-.786-.207c-.468-.01-.86.232-1.023.633-.283.698.182 1.423.93 1.448.268.009.524-.045.768-.162l.084-.038.012-.005.008.002a.166.166 0 00.012.004v.19c0 .267 0 .535-.002.803 0 .025-.032.066-.055.072-.626.16-1.244.18-1.838-.135-.775-.41-1.097-1.212-1.026-2.01.107-1.197 1.1-1.947 2.248-1.835a3.863 3.863 0 01.56.095l.109.024zM15.978 15.082V13.95l-.21-.036c-.154-.027-.307-.054-.46-.07-1.143-.115-2.138.631-2.246 1.834-.068.754.203 1.542.946 1.973.613.356 1.261.338 1.92.17.021-.005.052-.04.052-.062.002-.274.002-.548.002-.828v-.19l-.045.02-.074.035a1.63 1.63 0 01-.756.16c-.753-.019-1.224-.748-.939-1.45.163-.399.556-.64 1.024-.63.274.005.535.068.786.207z"/><path fill-rule="evenodd" d="M21.015 15.946c0-1.17-.862-2.05-2.01-2.05-1.141-.002-2.017.887-2.018 2.047-.002 1.159.877 2.058 2.011 2.057 1.136-.001 2.016-.897 2.017-2.054zm-1.007-.004a1.016 1.016 0 01-1.013 1.043c-.56 0-1.004-.46-1.003-1.041 0-.58.445-1.038 1.006-1.038.563 0 1.005.454 1.01 1.036z" clip-rule="evenodd"/><path d="M11.856 14.854v-.801c-.347-.08-.69-.143-1.04-.127a1.576 1.576 0 00-.828.251c-.634.426-.688 1.393-.1 1.852.191.148.406.244.638.31.161.046.325.114.462.212.168.12.146.348-.026.465a.638.638 0 01-.19.085c-.252.07-.508.054-.762.012-.121-.02-.241-.047-.362-.075l-.158-.034v.891c.287.083 1.03.127 1.314.086.3-.043.584-.128.832-.314.617-.461.635-1.402.024-1.868-.129-.099-.28-.167-.431-.235l-.114-.052a3.194 3.194 0 00-.232-.095c-.075-.028-.15-.056-.222-.09a.274.274 0 01-.17-.277.246.246 0 01.203-.234c.173-.036.352-.067.526-.059.147.007.293.034.44.062.066.012.13.025.196.035zM16.775 9.121v.821l.001 1.804c.001.347.3.577.621.487.225-.064.355-.26.355-.543V6.549c0-.024 0-.049-.002-.073-.03-.328-.304-.535-.608-.46-.224.055-.366.247-.367.504v2.601zM7.26 13.961h.964v3.934H7.26v-3.934zM20.37 9.935v-.362-.307c0-.287.001-.574-.002-.86a.692.692 0 00-.04-.246.475.475 0 00-.547-.286.492.492 0 00-.385.492 232.81 232.81 0 000 2.408c0 .07.019.145.046.21a.482.482 0 00.925-.194c.004-.285.003-.57.003-.855zM15.125 9.934v.808c-.002.313-.2.529-.484.53-.29 0-.492-.218-.493-.535V8.4c0-.318.203-.536.492-.535.29.001.484.216.484.54v1.528zM9.88 9.931v-.618-.909c-.002-.32-.2-.537-.489-.537-.29 0-.488.215-.489.537v2.335c0 .317.205.534.495.532.282-.001.481-.219.482-.531V9.93zM3.657 9.56v-.385-.77c0-.302.156-.512.395-.536.283-.029.485.13.542.435.023.123.038.25.039.375.004.686.004 1.373.001 2.059-.001.382-.321.626-.654.507a.494.494 0 01-.323-.48V9.56zM11.529 10.089a45.21 45.21 0 010 .326v.356c.005.278.196.487.45.5.28.013.503-.167.516-.454.017-.38.018-.761 0-1.14a.47.47 0 00-.516-.455c-.255.016-.445.225-.45.502v.365zM1.98 10.255v.163l-.001.354c-.005.288-.216.5-.49.5-.274-.002-.483-.214-.486-.504a50.483 50.483 0 010-1.046.489.489 0 01.49-.5c.272.001.481.216.486.504v.529zM22.02 10.09v.16l-.001.161v.356c.005.288.207.5.475.504.278.004.495-.2.5-.49.008-.353.007-.706.001-1.06a.487.487 0 00-.492-.5c-.272.003-.48.22-.483.51-.002.12-.001.24 0 .359z"/></g></symbol><symbol id="flight-cisco-color-16" viewBox="0 0 16 16"><g fill="#02A5DD"><path d="M4.55 6.579V7.8c0 .201-.108.33-.296.364-.192.034-.38-.093-.408-.276a.75.75 0 01-.008-.112V4.388c0-.217.099-.343.295-.381.193-.038.386.092.411.277.005.04.006.08.006.12V6.58zM3.572 9.308v.747a1.275 1.275 0 00-.573-.138c-.34-.007-.625.154-.744.422-.205.465.133.948.677.965.195.006.381-.03.558-.108l.062-.025.008-.003h.006l.009.003v.127c0 .178 0 .356-.002.535 0 .017-.023.044-.04.048-.455.107-.904.12-1.336-.09-.564-.273-.798-.807-.747-1.34.078-.798.8-1.298 1.635-1.223.076.007.152.015.227.027.06.01.12.023.18.036l.08.017zM10.893 10.055v-.756c-.052-.007-.102-.016-.153-.024a4.935 4.935 0 00-.334-.046c-.831-.077-1.555.42-1.634 1.222-.05.503.148 1.028.688 1.316.446.237.918.225 1.396.114.016-.004.038-.028.038-.043.002-.182.002-.364.002-.551v-.127l-.033.014-.054.023a1.277 1.277 0 01-.55.107c-.547-.013-.89-.5-.682-.967.118-.266.404-.427.744-.42.2.003.39.045.572.138z"/><path fill-rule="evenodd" d="M14.556 10.63c0-.78-.626-1.366-1.462-1.367-.83 0-1.466.592-1.467 1.366-.001.772.638 1.372 1.463 1.37.826 0 1.466-.597 1.466-1.369zm-.732-.002c.004.387-.323.695-.737.695-.407 0-.73-.307-.73-.694.001-.386.325-.692.733-.692.409 0 .73.303.734.69z" clip-rule="evenodd"/><path d="M7.895 9.903v-.535a3.023 3.023 0 00-.757-.084c-.214.01-.419.055-.602.167-.46.285-.5.93-.072 1.235.139.099.295.163.464.207.117.03.237.076.336.14.122.08.106.233-.019.31a.488.488 0 01-.138.058c-.184.046-.37.036-.555.007a5.303 5.303 0 01-.262-.049l-.115-.023v.594c.208.056.749.085.955.058a1.36 1.36 0 00.606-.21c.448-.307.46-.935.017-1.245-.094-.066-.204-.112-.314-.157a6.167 6.167 0 01-.083-.035c-.055-.024-.112-.043-.168-.063a2.566 2.566 0 01-.162-.06c-.08-.034-.13-.097-.124-.184.006-.086.068-.142.148-.157.126-.023.256-.044.383-.039.107.005.213.023.32.042l.142.023zM11.473 5.547V7.83c.002.232.219.385.452.325.163-.042.258-.173.258-.362V4.366c0-.016 0-.032-.002-.049-.021-.218-.22-.356-.44-.307a.331.331 0 00-.268.337v1.2zM4.553 9.308h.7v2.622h-.7V9.308zM14.087 6.624V6.177v-.573a.425.425 0 00-.03-.164c-.064-.146-.227-.221-.398-.19a.335.335 0 00-.28.328c-.004.535-.002 1.07 0 1.605 0 .046.014.096.034.14a.357.357 0 00.392.187.33.33 0 00.281-.317c.002-.19.002-.38.001-.57zM10.272 6.622v.54a.337.337 0 01-.351.352.341.341 0 01-.359-.356V5.6a.34.34 0 01.358-.357c.211.001.352.144.352.36v1.018zM6.458 6.62v-.412-.605c-.001-.214-.145-.359-.355-.359s-.355.144-.356.358V7.16a.34.34 0 00.36.355.34.34 0 00.35-.354v-.54zM1.933 6.374v-.257-.514c0-.201.113-.341.286-.357.207-.019.353.086.395.29.017.082.028.167.028.25.003.458.003.915.001 1.372a.353.353 0 01-.476.339.331.331 0 01-.234-.32l-.001-.574v-.23zM7.657 6.725a23.847 23.847 0 010 .218l.001.237a.334.334 0 00.327.334c.203.009.366-.111.375-.302a7.751 7.751 0 000-.761c-.01-.19-.177-.314-.375-.303a.337.337 0 00-.327.335v.242zM.712 6.837v.344c-.004.192-.157.334-.356.333-.2 0-.352-.142-.354-.335a30.86 30.86 0 010-.697c.002-.192.158-.335.356-.334.199 0 .35.144.354.336v.353zM15.287 6.726V7.178c.003.192.15.334.345.336.202.003.36-.133.364-.326.006-.236.005-.472 0-.707-.003-.194-.158-.334-.358-.333a.342.342 0 00-.35.34c-.002.079-.002.159-.002.238z"/></g></symbol><symbol id="flight-codepen-24" viewBox="0 0 24 24"><g><path d="M6.368 11.023v1.954L7.828 12l-1.46-.977zM11.414 9.6V6.874L6.833 9.93l2.046 1.368L11.414 9.6zM17.163 9.93L12.58 6.874V9.6l2.535 1.698 2.047-1.368zM6.833 14.074l4.581 3.052V14.4l-2.535-1.698-2.046 1.372zM12.581 14.4v2.726l4.582-3.052-2.047-1.372-2.535 1.698zM12 10.619L9.93 12 12 13.381 14.065 12 12 10.619z"/><path d="M12 1C5.926 1 1 5.926 1 12s4.926 11 11 11 11-4.926 11-11S18.074 1 12 1zm6.8 13.074c0 .028 0 .052-.005.075 0 .01-.004.018-.004.023-.005.019-.005.033-.01.051-.004.01-.004.019-.009.028l-.014.042-.014.028c-.005.014-.014.028-.018.037-.005.01-.01.019-.019.028-.01.014-.014.023-.023.037a.097.097 0 01-.019.024c-.01.009-.018.023-.028.032l-.023.023c-.01.01-.023.019-.033.028-.009.005-.018.014-.027.019-.005 0-.005.005-.01.01l-6.223 4.148a.592.592 0 01-.651 0L5.45 14.563c-.004 0-.004-.005-.01-.01-.008-.004-.018-.014-.027-.018-.01-.01-.023-.019-.033-.028l-.023-.023c-.01-.01-.018-.019-.028-.033-.004-.01-.014-.018-.018-.023a.102.102 0 01-.024-.037.097.097 0 00-.018-.028c-.01-.014-.014-.028-.019-.037l-.014-.028-.014-.042c-.004-.01-.004-.019-.01-.028a.167.167 0 01-.008-.051c0-.01-.005-.019-.005-.024-.005-.023-.005-.05-.005-.074V9.935c0-.028 0-.051.005-.075 0-.009.005-.018.005-.023.004-.018.004-.032.009-.051.005-.01.005-.019.01-.028l.013-.042.014-.028c.005-.014.014-.028.019-.037a.097.097 0 01.018-.028l.024-.037c.004-.01.014-.019.018-.023.01-.01.019-.023.028-.033l.023-.023c.01-.01.024-.019.033-.028.01-.005.019-.014.028-.019.005 0 .005-.004.01-.009l6.218-4.144a.584.584 0 01.646 0l6.219 4.144c.005 0 .005.005.01.01.008.004.018.013.027.018.01.01.023.019.033.028l.023.023c.01.01.018.019.028.033.01.01.014.018.018.023.01.01.019.023.024.037.004.01.009.019.018.028a.14.14 0 01.019.037l.014.028.014.042c.004.01.004.019.01.028.004.014.008.033.008.051 0 .01.005.019.005.023.005.024.005.052.005.075v4.14h.009z"/><path d="M17.633 12.977v-1.954L16.166 12l1.465.977z"/></g></symbol><symbol id="flight-codepen-16" viewBox="0 0 16 16"><g><path d="M4.416 7.378v1.244L5.346 8l-.93-.622zM7.627 6.473V4.738L4.712 6.683l1.302.87 1.613-1.08zM11.285 6.683L8.37 4.738v1.735l1.613 1.08 1.302-.87zM4.712 9.32l2.915 1.942V9.527l-1.613-1.08-1.302.873zM8.37 9.527v1.735l2.915-1.942-1.302-.873-1.613 1.08zM8 7.12L6.683 8 8 8.879 9.314 8 8 7.12z"/><path d="M8 1a7 7 0 10.001 14.001A7 7 0 008 1zm4.327 8.32c0 .018 0 .033-.003.047 0 .006-.003.012-.003.015l-.006.033c-.002.006-.002.012-.005.018l-.01.026-.008.018c-.003.009-.01.018-.012.024a.06.06 0 01-.012.017l-.015.024a.065.065 0 01-.012.015c-.005.006-.011.015-.017.02l-.015.015c-.006.006-.015.012-.02.018-.007.003-.013.009-.019.012-.003 0-.003.003-.005.006l-3.96 2.64a.377.377 0 01-.414 0L3.832 9.631c-.003 0-.003-.003-.006-.006l-.018-.012c-.006-.006-.015-.012-.02-.018l-.016-.014a.129.129 0 01-.017-.021c-.003-.006-.01-.012-.012-.015a.064.064 0 01-.015-.024.062.062 0 00-.012-.017l-.012-.024-.009-.018-.008-.026-.006-.018a.106.106 0 01-.006-.033c0-.006-.003-.012-.003-.015-.003-.014-.003-.032-.003-.047V6.686c0-.018 0-.033.003-.048 0-.005.003-.011.003-.014l.006-.033.006-.018.008-.026.01-.018c.002-.009.008-.018.011-.024a.062.062 0 01.012-.017l.015-.024a.065.065 0 01.012-.015c.006-.006.011-.015.017-.02l.015-.015c.006-.006.015-.012.02-.018.007-.003.013-.01.019-.012.003 0 .003-.003.006-.006L7.79 3.741a.372.372 0 01.411 0l3.958 2.637c.002 0 .002.003.005.006l.018.012.021.018.015.014c.006.006.012.012.018.021l.011.015a.065.065 0 01.015.024.06.06 0 00.012.017.087.087 0 01.012.024l.009.018.009.026c.003.006.003.012.005.018.004.009.006.02.006.033 0 .006.003.012.003.014a.251.251 0 01.003.048V9.32h.006z"/><path d="M11.584 8.622V7.378L10.652 8l.932.622z"/></g></symbol><symbol id="flight-codepen-color-24" viewBox="0 0 24 24"><g fill="#000"><path d="M6.368 11.023v1.954L7.828 12l-1.46-.977zM11.414 9.6V6.874L6.833 9.93l2.046 1.368L11.414 9.6zM17.163 9.93L12.58 6.874V9.6l2.535 1.698 2.047-1.368zM6.833 14.074l4.581 3.052V14.4l-2.535-1.698-2.046 1.372zM12.581 14.4v2.726l4.582-3.052-2.047-1.372-2.535 1.698zM12 10.619L9.93 12 12 13.381 14.065 12 12 10.619z"/><path d="M12 1C5.926 1 1 5.926 1 12s4.926 11 11 11 11-4.926 11-11S18.074 1 12 1zm6.8 13.074c0 .028 0 .052-.005.075 0 .01-.004.018-.004.023-.005.019-.005.033-.01.051-.004.01-.004.019-.009.028l-.014.042-.014.028c-.005.014-.014.028-.018.037-.005.01-.01.019-.019.028-.01.014-.014.023-.023.037a.097.097 0 01-.019.024c-.01.009-.018.023-.028.032l-.023.023c-.01.01-.023.019-.033.028-.009.005-.018.014-.027.019-.005 0-.005.005-.01.01l-6.223 4.148a.592.592 0 01-.651 0L5.45 14.563c-.004 0-.004-.005-.01-.01-.008-.004-.018-.014-.027-.018-.01-.01-.023-.019-.033-.028l-.023-.023c-.01-.01-.018-.019-.028-.033-.004-.01-.014-.018-.018-.023a.102.102 0 01-.024-.037.097.097 0 00-.018-.028c-.01-.014-.014-.028-.019-.037l-.014-.028-.014-.042c-.004-.01-.004-.019-.01-.028a.167.167 0 01-.008-.051c0-.01-.005-.019-.005-.024-.005-.023-.005-.05-.005-.074V9.935c0-.028 0-.051.005-.075 0-.009.005-.018.005-.023.004-.018.004-.032.009-.051.005-.01.005-.019.01-.028l.013-.042.014-.028c.005-.014.014-.028.019-.037a.097.097 0 01.018-.028l.024-.037c.004-.01.014-.019.018-.023.01-.01.019-.023.028-.033l.023-.023c.01-.01.024-.019.033-.028.01-.005.019-.014.028-.019.005 0 .005-.004.01-.009l6.218-4.144a.584.584 0 01.646 0l6.219 4.144c.005 0 .005.005.01.01.008.004.018.013.027.018.01.01.023.019.033.028l.023.023c.01.01.018.019.028.033.01.01.014.018.018.023.01.01.019.023.024.037.004.01.009.019.018.028a.14.14 0 01.019.037l.014.028.014.042c.004.01.004.019.01.028.004.014.008.033.008.051 0 .01.005.019.005.023.005.024.005.052.005.075v4.14h.009z"/><path d="M17.633 12.977v-1.954L16.166 12l1.465.977z"/></g><path fill="#fff" fill-rule="evenodd" d="M18.8 14.074c0 .028 0 .052-.005.075 0 .01-.004.018-.004.023-.005.019-.005.033-.01.051-.004.01-.004.019-.009.028l-.014.042-.014.028c-.005.014-.014.028-.018.037a.096.096 0 01-.02.028l-.022.037c-.005.01-.014.019-.019.024-.01.009-.018.023-.028.032l-.023.023c-.01.01-.023.019-.033.028-.009.005-.018.014-.027.019-.005 0-.005.005-.01.01l-6.223 4.148a.593.593 0 01-.651 0L5.45 14.563c-.005 0-.005-.005-.01-.01-.008-.004-.018-.014-.027-.018-.01-.01-.023-.019-.033-.028l-.023-.023c-.01-.01-.018-.019-.028-.033a.1.1 0 00-.018-.023.102.102 0 01-.024-.037c-.004-.01-.009-.019-.018-.028-.01-.014-.014-.028-.019-.037l-.014-.028-.014-.042c-.004-.01-.004-.019-.01-.028a.168.168 0 01-.008-.051c0-.01-.005-.019-.005-.024-.005-.023-.005-.05-.005-.074V9.935c0-.028 0-.051.005-.075 0-.009.005-.018.005-.023.004-.018.004-.032.009-.051.005-.01.005-.019.01-.028l.013-.042.014-.028c.005-.014.014-.028.019-.037.004-.01.009-.018.018-.028l.024-.037a.101.101 0 01.018-.023c.01-.01.019-.023.028-.033l.023-.023c.01-.01.024-.019.033-.028.01-.005.019-.014.028-.019.004 0 .004-.004.01-.009l6.218-4.144a.584.584 0 01.646 0l6.219 4.144c.005 0 .005.005.01.01.008.004.018.013.027.018.01.01.023.019.033.028l.023.023c.01.01.018.019.028.033.01.01.014.018.018.023a.1.1 0 01.024.037c.004.01.009.019.018.028.01.014.014.023.019.037l.014.028.014.042c.004.01.004.019.01.028.004.014.008.033.008.051 0 .01.005.019.005.023.005.024.005.052.005.075v4.14h.009zM6.367 12.977v-1.954L7.829 12l-1.46.977zm5.047-6.103V9.6l-2.535 1.698L6.833 9.93l4.581-3.056zm1.167 0l4.582 3.056-2.047 1.368L12.581 9.6V6.874zm-1.167 10.252l-4.581-3.052 2.046-1.372 2.535 1.698v2.726zm1.167 0V14.4l2.535-1.698 2.047 1.372-4.582 3.052zM9.931 12L12 10.618 14.065 12 12 13.38 9.93 12zm7.701-.977v1.954L16.167 12l1.465-.977z" clip-rule="evenodd"/></symbol><symbol id="flight-codepen-color-16" viewBox="0 0 16 16"><g fill="#000"><path d="M4.416 7.378v1.244L5.346 8l-.93-.622zM7.627 6.473V4.738L4.712 6.683l1.302.87 1.613-1.08zM11.285 6.683L8.37 4.738v1.735l1.613 1.08 1.302-.87zM4.712 9.32l2.915 1.942V9.527l-1.613-1.08-1.302.873zM8.37 9.527v1.735l2.915-1.942-1.302-.873-1.613 1.08zM8 7.12L6.683 8 8 8.879 9.314 8 8 7.12z"/><path d="M8 1a7 7 0 10.001 14.001A7 7 0 008 1zm4.327 8.32c0 .018 0 .033-.003.047 0 .006-.003.012-.003.015l-.006.033c-.002.006-.002.012-.005.018l-.01.026-.008.018c-.003.009-.01.018-.012.024a.06.06 0 01-.012.017l-.015.024a.065.065 0 01-.012.015c-.005.006-.011.015-.017.02l-.015.015c-.006.006-.015.012-.02.018-.007.003-.013.009-.019.012-.003 0-.003.003-.005.006l-3.96 2.64a.377.377 0 01-.414 0L3.832 9.631c-.003 0-.003-.003-.006-.006l-.018-.012c-.006-.006-.015-.012-.02-.018l-.016-.014a.129.129 0 01-.017-.021c-.003-.006-.01-.012-.012-.015a.064.064 0 01-.015-.024.062.062 0 00-.012-.017l-.012-.024-.009-.018-.008-.026-.006-.018a.106.106 0 01-.006-.033c0-.006-.003-.012-.003-.015-.003-.014-.003-.032-.003-.047V6.686c0-.018 0-.033.003-.048 0-.005.003-.011.003-.014l.006-.033.006-.018.008-.026.01-.018c.002-.009.008-.018.011-.024a.062.062 0 01.012-.017l.015-.024a.065.065 0 01.012-.015c.006-.006.011-.015.017-.02l.015-.015c.006-.006.015-.012.02-.018.007-.003.013-.01.019-.012.003 0 .003-.003.006-.006L7.79 3.741a.372.372 0 01.411 0l3.958 2.637c.002 0 .002.003.005.006l.018.012.021.018.015.014c.006.006.012.012.018.021l.011.015a.065.065 0 01.015.024.06.06 0 00.012.017.087.087 0 01.012.024l.009.018.009.026c.003.006.003.012.005.018.004.009.006.02.006.033 0 .006.003.012.003.014a.251.251 0 01.003.048V9.32h.006z"/><path d="M11.584 8.622V7.378L10.652 8l.932.622z"/></g><path fill="#fff" fill-rule="evenodd" d="M12.327 9.32c0 .018 0 .033-.003.048 0 .003 0 .006-.002.01v.004a.14.14 0 00-.004.017c0 .003 0 .007-.002.012v.004a.044.044 0 00-.004.009c0 .002 0 .004-.002.006v.003l-.01.026-.008.018-.009.018-.003.006a.06.06 0 01-.012.017l-.003.006-.004.006a.33.33 0 01-.02.027.129.129 0 00-.008.01l-.01.01-.014.015a.135.135 0 01-.01.01.118.118 0 00-.01.008l-.01.006-.009.006-.003.003-.003.003-3.96 2.64a.377.377 0 01-.414 0L3.832 9.631l-.003-.003-.002-.003-.01-.006-.008-.006a.13.13 0 00-.01-.009.127.127 0 01-.01-.009l-.016-.014a.129.129 0 01-.017-.021.065.065 0 00-.012-.015.064.064 0 01-.015-.024.062.062 0 00-.012-.017l-.009-.018-.003-.006-.009-.018-.009-.026-.003-.01-.002-.008a.106.106 0 01-.006-.033l-.002-.01-.001-.005c-.003-.014-.003-.032-.003-.047V6.686c0-.018 0-.033.003-.047l.001-.01.002-.005.003-.017c0-.003 0-.007.002-.011V6.59l.003-.009.003-.009.01-.026.008-.018a.104.104 0 01.009-.018l.003-.006a.062.062 0 01.012-.017l.007-.012.008-.012a.065.065 0 01.012-.015l.008-.01c.003-.004.006-.008.01-.01l.014-.015a.131.131 0 01.01-.01c.004-.002.008-.005.01-.008l.004-.002.006-.004a.062.062 0 01.009-.006l.003-.003.002-.003L7.79 3.741a.371.371 0 01.411 0l3.957 2.637.004.003.002.003.01.006.005.004.003.002a.091.091 0 00.006.005l.005.004.01.009.015.014.017.021.008.01.004.005a.065.065 0 01.015.024.06.06 0 00.012.017.087.087 0 01.012.024l.009.018.008.026c.002.003.003.006.003.01l.003.008c.003.01.006.02.006.033l.002.01.001.005a.251.251 0 01.003.047V9.32h.006zm-7.911-.698V7.378L5.345 8l-.93.622zm3.211-3.884v1.735l-1.613 1.08-1.302-.87 2.915-1.945zm.743 0l2.915 1.945-1.302.87-1.613-1.08V4.738zm-.743 6.524L4.712 9.32l1.302-.873 1.613 1.08v1.735zm.743 0V9.527l1.613-1.08 1.302.873-2.915 1.942zM8 8.879L6.683 8 8 7.121 9.314 8 8 8.88zm3.584-1.5v1.243L10.652 8l.932-.622z" clip-rule="evenodd"/></symbol><symbol id="flight-datadog-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M18.91 16.198L17.22 15.1l-1.41 2.317-1.641-.472-1.445 2.168.074.683 7.854-1.423-.456-4.826-1.286 2.65zm-7.324-2.08l1.26-.171c.204.09.346.124.59.185.382.098.822.191 1.475-.132.152-.074.468-.358.596-.52l5.163-.922.526 6.269-8.844 1.567-.766-6.277zm9.59-2.26l-.51.096-.978-9.948L3.006 3.91 5.061 20.31l1.953-.279c-.156-.219-.399-.483-.813-.823-.575-.47-.372-1.267-.033-1.771.449-.852 2.761-1.934 2.63-3.295-.047-.495-.127-1.14-.594-1.58-.017.183.014.36.014.36s-.191-.242-.287-.57c-.095-.126-.17-.166-.27-.334-.072.195-.063.42-.063.42s-.157-.364-.182-.672c-.093.138-.117.4-.117.4s-.204-.575-.157-.885c-.093-.27-.369-.804-.29-2.019.508.351 1.629.268 2.066-.365.145-.21.244-.782-.073-1.91-.203-.723-.707-1.8-.903-2.208l-.023.017c.103.329.316 1.019.398 1.353.248 1.015.314 1.368.198 1.836-.099.406-.336.672-.938.97-.601.298-1.4-.428-1.45-.468-.585-.458-1.037-1.205-1.088-1.568-.052-.397.233-.636.377-.96-.206.057-.435.16-.435.16s.274-.279.611-.52a3.61 3.61 0 00.37-.27c-.214-.003-.387.003-.387.003s.356-.189.725-.327c-.27-.011-.528-.001-.528-.001s.793-.35 1.42-.606c.432-.174.853-.122 1.09.214.31.441.637.68 1.328.829.425-.185.554-.28 1.088-.423.47-.508.838-.574.838-.574s-.183.165-.232.424c.266-.206.558-.378.558-.378s-.113.137-.218.355l.024.036c.311-.183.676-.328.676-.328s-.104.13-.226.298c.234-.002.709.01.893.03 1.089.024 1.315-1.143 1.733-1.29.523-.183.757-.294 1.648.567.765.739 1.363 2.062 1.066 2.359-.249.246-.74-.096-1.284-.763a2.866 2.866 0 01-.606-1.301c-.086-.448-.42-.708-.42-.708s.194.425.194.8c0 .204.026.97.36 1.399-.034.063-.05.31-.086.358-.388-.461-1.222-.792-1.358-.889.46.37 1.518 1.223 1.925 2.04.384.771.157 1.48.352 1.662.055.053.826.998.974 1.473.26.827.016 1.696-.323 2.236l-.945.145c-.139-.038-.232-.057-.356-.128.068-.119.204-.416.205-.477l-.053-.092c-.294.41-.787.808-1.197 1.037-.536.299-1.154.253-1.556.13-1.142-.346-2.222-1.105-2.482-1.304 0 0-.008.159.04.195.289.319.948.897 1.586 1.3l-1.36.146.643 4.92c-.285.04-.329.06-.64.104-.276-.955-.801-1.579-1.376-1.942-.507-.32-1.206-.392-1.875-.262l-.043.049a2.447 2.447 0 011.579.37c.554.344 1 1.234 1.164 1.769.21.684.356 1.416-.21 2.192-.403.552-1.579.857-2.529.197.254.402.597.73 1.059.792.685.091 1.336-.026 1.783-.478.383-.387.586-1.195.532-2.046l.605-.086.218 1.527 10.016-1.186-.818-7.838zM15.083 7.71c-.028.063-.072.104-.006.308l.004.012.01.026.028.061c.12.24.25.465.468.58.056-.01.115-.016.175-.019.205-.009.334.023.416.067a.852.852 0 00.005-.186c-.016-.303.061-.817-.53-1.088-.224-.102-.537-.07-.642.056a.261.261 0 01.05.011c.158.054.05.108.022.172zm1.658 2.825c-.077-.042-.44-.026-.695.004-.485.056-1.01.222-1.124.31-.21.16-.114.436.04.55.433.318.812.53 1.212.479.246-.032.463-.415.616-.762.105-.24.105-.497-.049-.581zm-4.299-2.45c.137-.128-.682-.296-1.317.13-.469.315-.484.989-.035 1.37.045.039.082.065.116.087a4.097 4.097 0 011.182-.343c.095-.104.206-.288.178-.62-.037-.451-.385-.38-.124-.624z" clip-rule="evenodd"/></symbol><symbol id="flight-datadog-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M12.886 10.938l-1.157-.767-.965 1.622-1.122-.33-.988 1.517.05.478 5.374-.996-.313-3.378-.879 1.854zm-5.01-1.456l.861-.12c.14.064.237.088.404.13.26.069.562.134 1.009-.092.104-.052.32-.251.408-.365l3.532-.644.36 4.388L8.4 13.876l-.524-4.394zm6.56-1.581l-.348.067-.67-6.964L2.004 2.336l1.407 11.481 1.335-.195a3.03 3.03 0 00-.556-.576c-.393-.33-.254-.888-.022-1.24.307-.596 1.889-1.354 1.8-2.307-.033-.346-.088-.797-.407-1.106-.012.128.01.252.01.252s-.132-.169-.197-.398c-.065-.088-.116-.117-.185-.234-.05.136-.043.294-.043.294s-.107-.255-.125-.47a.752.752 0 00-.08.279s-.139-.403-.107-.62c-.064-.188-.252-.562-.199-1.412.348.245 1.115.187 1.414-.256.1-.147.167-.548-.05-1.337-.139-.506-.483-1.26-.618-1.546l-.016.012c.071.23.217.713.273.947.17.71.215.958.136 1.285-.068.285-.23.471-.642.68-.412.208-.958-.3-.993-.328-.4-.32-.709-.844-.744-1.098-.035-.278.16-.445.258-.672-.14.04-.298.112-.298.112s.188-.195.419-.364c.095-.063.152-.104.252-.188-.146-.003-.264.002-.264.002s.243-.133.496-.23c-.185-.007-.362 0-.362 0s.544-.245.973-.424c.295-.122.583-.086.745.15.212.308.436.476.909.58.29-.13.379-.197.744-.297.321-.355.573-.401.573-.401s-.125.115-.158.297c.182-.145.382-.265.382-.265s-.078.096-.15.249l.017.025c.213-.129.463-.23.463-.23s-.072.091-.156.209c.16-.002.486.006.612.02.745.017.9-.8 1.185-.902.358-.129.518-.206 1.128.396.523.518.932 1.444.73 1.652-.171.172-.507-.068-.879-.534a2.026 2.026 0 01-.415-.911c-.059-.313-.288-.495-.288-.495s.133.297.133.56c0 .142.018.678.246.979-.022.044-.033.217-.058.25-.265-.323-.836-.554-.929-.622.315.26 1.039.856 1.317 1.428.263.54.108 1.035.24 1.164.039.037.566.698.668 1.03.177.58.01 1.188-.222 1.566l-.647.101c-.094-.026-.158-.04-.243-.09.047-.082.14-.29.14-.333l-.036-.065a2.737 2.737 0 01-.819.726c-.367.21-.79.177-1.065.092-.781-.243-1.52-.774-1.698-.914 0 0-.005.112.028.137.197.223.648.628 1.085.91l-.93.102.44 3.444c-.196.029-.226.042-.44.073-.187-.669-.547-1.105-.94-1.36-.347-.223-.825-.274-1.283-.183l-.03.034c.319-.033.695.014 1.08.26.38.24.685.863.797 1.238.144.479.244.991-.144 1.534-.275.386-1.08.6-1.73.138.174.281.409.51.725.554.469.064.914-.018 1.22-.334.262-.27.4-.836.364-1.432l.414-.06.15 1.069 6.852-.83-.56-5.487zm-4.168-2.905c-.02.044-.05.073-.005.216l.003.008.007.019.02.042c.08.168.17.326.32.406.038-.006.078-.01.12-.013a.546.546 0 01.284.047.607.607 0 00.003-.13c-.01-.212.042-.573-.363-.762-.153-.072-.367-.05-.439.04a.175.175 0 01.034.007c.108.038.035.075.015.12zm1.134 1.978c-.053-.03-.301-.018-.475.003-.333.04-.691.155-.77.217-.143.111-.078.305.027.384.297.223.556.372.83.336.168-.022.317-.29.422-.534.072-.167.072-.348-.034-.406zM8.461 5.259c.093-.09-.467-.207-.902.09-.32.221-.33.693-.024.96.03.027.056.046.08.06a2.75 2.75 0 01.809-.24c.065-.072.14-.2.121-.434-.025-.315-.263-.265-.084-.436z" clip-rule="evenodd"/></symbol><symbol id="flight-datadog-color-24" viewBox="0 0 24 24"><path fill="#632CA6" fill-rule="evenodd" d="M18.91 16.198L17.22 15.1l-1.41 2.317-1.641-.472-1.445 2.168.074.683 7.854-1.423-.456-4.826-1.286 2.65zm-7.324-2.08l1.26-.171c.204.09.346.124.59.185.382.098.822.191 1.475-.132.152-.074.468-.358.596-.52l5.163-.922.526 6.269-8.844 1.567-.766-6.277zm9.59-2.26l-.51.096-.978-9.948L3.006 3.91 5.061 20.31l1.953-.279c-.156-.219-.399-.483-.813-.823-.575-.47-.372-1.267-.033-1.771.449-.852 2.761-1.934 2.63-3.295-.047-.495-.127-1.14-.594-1.58-.017.183.014.36.014.36s-.191-.242-.287-.57c-.095-.126-.17-.166-.27-.334-.072.195-.063.42-.063.42s-.157-.364-.182-.672c-.093.138-.117.4-.117.4s-.204-.575-.157-.885c-.093-.27-.369-.804-.29-2.019.508.351 1.629.268 2.066-.365.145-.21.244-.782-.073-1.91-.203-.723-.707-1.8-.903-2.208l-.023.017c.103.329.316 1.019.398 1.353.248 1.015.314 1.368.198 1.836-.099.406-.336.672-.938.97-.601.298-1.4-.428-1.45-.468-.585-.458-1.037-1.205-1.088-1.568-.052-.397.233-.636.377-.96-.206.057-.435.16-.435.16s.274-.279.611-.52a3.61 3.61 0 00.37-.27c-.214-.003-.387.003-.387.003s.356-.189.725-.327c-.27-.011-.528-.001-.528-.001s.793-.35 1.42-.606c.432-.174.853-.122 1.09.214.31.441.637.68 1.328.829.425-.185.554-.28 1.088-.423.47-.508.838-.574.838-.574s-.183.165-.232.424c.266-.206.558-.378.558-.378s-.113.137-.218.355l.024.036c.311-.183.676-.328.676-.328s-.104.13-.226.298c.234-.002.709.01.893.03 1.089.024 1.315-1.143 1.733-1.29.523-.183.757-.294 1.648.567.765.739 1.363 2.062 1.066 2.359-.249.246-.74-.096-1.284-.763a2.866 2.866 0 01-.606-1.301c-.086-.448-.42-.708-.42-.708s.194.425.194.8c0 .204.026.97.36 1.399-.034.063-.05.31-.086.358-.388-.461-1.222-.792-1.358-.889.46.37 1.518 1.223 1.925 2.04.384.771.157 1.48.352 1.662.055.053.826.998.974 1.473.26.827.016 1.696-.323 2.236l-.945.145c-.139-.038-.232-.057-.356-.128.068-.119.204-.416.205-.477l-.053-.092c-.294.41-.787.808-1.197 1.037-.536.299-1.154.253-1.556.13-1.142-.346-2.222-1.105-2.482-1.304 0 0-.008.159.04.195.289.319.948.897 1.586 1.3l-1.36.146.643 4.92c-.285.04-.329.06-.64.104-.276-.955-.801-1.579-1.376-1.942-.507-.32-1.206-.392-1.875-.262l-.043.049a2.447 2.447 0 011.579.37c.554.344 1 1.234 1.164 1.769.21.684.356 1.416-.21 2.192-.403.552-1.579.857-2.529.197.254.402.597.73 1.059.792.685.091 1.336-.026 1.783-.478.383-.387.586-1.195.532-2.046l.605-.086.218 1.527 10.016-1.186-.818-7.838zM15.083 7.71c-.028.063-.072.104-.006.308l.004.012.01.026.028.061c.12.24.25.465.468.58.056-.01.115-.016.175-.019.205-.009.334.023.416.067a.852.852 0 00.005-.186c-.016-.303.061-.817-.53-1.088-.224-.102-.537-.07-.642.056a.261.261 0 01.05.011c.158.054.05.108.022.172zm1.658 2.825c-.077-.042-.44-.026-.695.004-.485.056-1.01.222-1.124.31-.21.16-.114.436.04.55.433.318.812.53 1.212.479.246-.032.463-.415.616-.762.105-.24.105-.497-.049-.581zm-4.299-2.45c.137-.128-.682-.296-1.317.13-.469.315-.484.989-.035 1.37.045.039.082.065.116.087a4.097 4.097 0 011.182-.343c.095-.104.206-.288.178-.62-.037-.451-.385-.38-.124-.624z" clip-rule="evenodd"/></symbol><symbol id="flight-datadog-color-16" viewBox="0 0 16 16"><path fill="#632CA6" fill-rule="evenodd" d="M12.886 10.938l-1.157-.767-.965 1.622-1.122-.33-.988 1.517.05.478 5.374-.996-.313-3.378-.879 1.854zm-5.01-1.456l.861-.12c.14.064.237.088.404.13.26.069.562.134 1.009-.092.104-.052.32-.251.408-.365l3.532-.644.36 4.388L8.4 13.876l-.524-4.394zm6.56-1.581l-.348.067-.67-6.964L2.004 2.336l1.407 11.481 1.335-.195a3.03 3.03 0 00-.556-.576c-.393-.33-.254-.888-.022-1.24.307-.596 1.889-1.354 1.8-2.307-.033-.346-.088-.797-.407-1.106-.012.128.01.252.01.252s-.132-.169-.197-.398c-.065-.088-.116-.117-.185-.234-.05.136-.043.294-.043.294s-.107-.255-.125-.47a.752.752 0 00-.08.279s-.139-.403-.107-.62c-.064-.188-.252-.562-.199-1.412.348.245 1.115.187 1.414-.256.1-.147.167-.548-.05-1.337-.139-.506-.483-1.26-.618-1.546l-.016.012c.071.23.217.713.273.947.17.71.215.958.136 1.285-.068.285-.23.471-.642.68-.412.208-.958-.3-.993-.328-.4-.32-.709-.844-.744-1.098-.035-.278.16-.445.258-.672-.14.04-.298.112-.298.112s.188-.195.419-.364c.095-.063.152-.104.252-.188-.146-.003-.264.002-.264.002s.243-.133.496-.23c-.185-.007-.362 0-.362 0s.544-.245.973-.424c.295-.122.583-.086.745.15.212.308.436.476.909.58.29-.13.379-.197.744-.297.321-.355.573-.401.573-.401s-.125.115-.158.297c.182-.145.382-.265.382-.265s-.078.096-.15.249l.017.025c.213-.129.463-.23.463-.23s-.072.091-.156.209c.16-.002.486.006.612.02.745.017.9-.8 1.185-.902.358-.129.518-.206 1.128.396.523.518.932 1.444.73 1.652-.171.172-.507-.068-.879-.534a2.026 2.026 0 01-.415-.911c-.059-.313-.288-.495-.288-.495s.133.297.133.56c0 .142.018.678.246.979-.022.044-.033.217-.058.25-.265-.323-.836-.554-.929-.622.315.26 1.039.856 1.317 1.428.263.54.108 1.035.24 1.164.039.037.566.698.668 1.03.177.58.01 1.188-.222 1.566l-.647.101c-.094-.026-.158-.04-.243-.09.047-.082.14-.29.14-.333l-.036-.065a2.737 2.737 0 01-.819.726c-.367.21-.79.177-1.065.092-.781-.243-1.52-.774-1.698-.914 0 0-.005.112.028.137.197.223.648.628 1.085.91l-.93.102.44 3.444c-.196.029-.226.042-.44.073-.187-.669-.547-1.105-.94-1.36-.347-.223-.825-.274-1.283-.183l-.03.034c.319-.033.695.014 1.08.26.38.24.685.863.797 1.238.144.479.244.991-.144 1.534-.275.386-1.08.6-1.73.138.174.281.409.51.725.554.469.064.914-.018 1.22-.334.262-.27.4-.836.364-1.432l.414-.06.15 1.069 6.852-.83-.56-5.487zm-4.168-2.905c-.02.044-.05.073-.005.216l.003.008.007.019.02.042c.08.168.17.326.32.406.038-.006.078-.01.12-.013a.546.546 0 01.284.047.607.607 0 00.003-.13c-.01-.212.042-.573-.363-.762-.153-.072-.367-.05-.439.04a.175.175 0 01.034.007c.108.038.035.075.015.12zm1.134 1.978c-.053-.03-.301-.018-.475.003-.333.04-.691.155-.77.217-.143.111-.078.305.027.384.297.223.556.372.83.336.168-.022.317-.29.422-.534.072-.167.072-.348-.034-.406zM8.461 5.259c.093-.09-.467-.207-.902.09-.32.221-.33.693-.024.96.03.027.056.046.08.06a2.75 2.75 0 01.809-.24c.065-.072.14-.2.121-.434-.025-.315-.263-.265-.084-.436z" clip-rule="evenodd"/></symbol><symbol id="flight-digital-ocean-24" viewBox="0 0 24 24"><g><path d="M12 18.011V21.8c6.422 0 11.411-6.2 9.311-12.933-.911-2.934-3.256-5.267-6.189-6.19C8.4.578 2.2 5.578 2.2 11.99h3.789c0-4.022 3.989-7.133 8.222-5.6A5.68 5.68 0 0117.6 9.778c1.543 4.23-1.572 8.215-5.589 8.222v-3.767H8.233v3.778H12z"/><path d="M8.233 20.922h-2.91v-2.91h2.91v2.91zM2.889 18.011h2.433v-2.433H2.89v2.433z"/></g></symbol><symbol id="flight-digital-ocean-16" viewBox="0 0 16 16"><g><path d="M8 12.208v2.652c4.495 0 7.988-4.34 6.518-9.053a6.642 6.642 0 00-4.333-4.333C5.48.004 1.14 3.504 1.14 7.992h2.652c0-2.815 2.792-4.993 5.756-3.92a3.975 3.975 0 012.372 2.372c1.08 2.961-1.1 5.75-3.912 5.756V9.563H5.363v2.645H8z"/><path d="M5.363 14.245H3.325v-2.037h2.038v2.037zM1.622 12.208h1.703v-1.704H1.622v1.704z"/></g></symbol><symbol id="flight-digital-ocean-color-24" viewBox="0 0 24 24"><g fill="#0080FF"><path d="M12 18.011V21.8c6.422 0 11.411-6.2 9.311-12.933-.911-2.934-3.256-5.267-6.189-6.19C8.4.578 2.2 5.578 2.2 11.99h3.789c0-4.022 3.989-7.133 8.222-5.6A5.68 5.68 0 0117.6 9.778c1.543 4.23-1.572 8.215-5.589 8.222v-3.767H8.233v3.778H12z"/><path d="M8.233 20.922h-2.91v-2.91h2.91v2.91zM2.889 18.011h2.433v-2.433H2.89v2.433z"/></g></symbol><symbol id="flight-digital-ocean-color-16" viewBox="0 0 16 16"><g fill="#0080FF"><path d="M8 12.208v2.652c4.495 0 7.988-4.34 6.518-9.053a6.642 6.642 0 00-4.333-4.333C5.48.004 1.14 3.504 1.14 7.992h2.652c0-2.815 2.792-4.993 5.756-3.92a3.975 3.975 0 012.372 2.372c1.08 2.961-1.1 5.75-3.912 5.756V9.563H5.363v2.645H8z"/><path d="M5.363 14.245H3.325v-2.037h2.038v2.037zM1.622 12.208h1.703v-1.704H1.622v1.704z"/></g></symbol><symbol id="flight-docker-24" viewBox="0 0 24 24"><path d="M17.97 7.445l.207-.31.36.217.159.112c.385.294 1.194 1.045 1.37 2.288.306-.053.616-.08.926-.082.734 0 1.227.17 1.508.309l.143.078.094.061.263.212-.09.272a2.775 2.775 0 01-.648.99c-.398.407-1.098.887-2.211.949l-.245.006h-.203c-.509 1.329-1.193 2.823-2.34 4.165a9.708 9.708 0 01-2.393 2.022 11.005 11.005 0 01-3.505 1.314c-.885.17-1.784.255-2.685.252-1.994 0-3.753-.391-4.836-1.076-.966-.61-1.71-1.605-2.208-2.957A11.082 11.082 0 011 12.422a.704.704 0 01.595-.7l.093-.007H16.18l.128-.009.204-.022c.353-.046.889-.15 1.267-.367-.452-.737-.58-1.6-.37-2.519.09-.384.228-.754.413-1.1l.148-.253zM4.974 9.14l.054.01c.05.017.09.058.107.11l.008.056v1.786l-.008.055a.173.173 0 01-.108.111l-.053.009H3.032a.17.17 0 01-.161-.12l-.009-.055V9.315l.009-.055a.173.173 0 01.107-.111l.054-.01h1.942zm2.676 0l.054.01c.05.017.09.058.107.11l.009.056v1.786l-.01.055a.173.173 0 01-.106.111l-.054.009H5.708a.171.171 0 01-.162-.12l-.009-.055V9.316c0-.078.05-.144.117-.167l.054-.01H7.65zm2.717 0l.054.01c.05.017.09.058.107.11l.008.056v1.786l-.008.055a.172.172 0 01-.108.111l-.053.009H8.425a.17.17 0 01-.161-.12l-.009-.055V9.315l.009-.055a.173.173 0 01.107-.111l.054-.01h1.942zm2.684 0l.054.009c.051.017.091.059.108.111l.009.056v1.786c0 .077-.05.143-.117.166l-.053.009H11.11a.17.17 0 01-.161-.12l-.01-.055V9.315l.01-.055a.173.173 0 01.107-.111l.054-.01h1.942zm2.709 0l.054.009c.05.017.09.059.108.111l.008.056v1.786c0 .077-.049.143-.117.166l-.053.009h-1.942a.17.17 0 01-.161-.12l-.009-.055V9.315l.009-.055a.173.173 0 01.107-.111l.054-.01h1.942zM7.65 6.57l.054.01c.05.017.09.058.107.11l.009.055v1.786a.176.176 0 01-.116.167l-.054.01H5.708a.172.172 0 01-.162-.121l-.008-.056V6.745c0-.077.049-.143.116-.166l.054-.009H7.65zm2.717 0l.053.01c.05.017.09.058.108.11l.008.055v1.786a.176.176 0 01-.115.167l-.054.01H8.425a.171.171 0 01-.161-.121l-.009-.056V6.745l.009-.055a.173.173 0 01.107-.11l.054-.01h1.942zm2.684 0c.075 0 .14.05.162.12l.009.055v1.786c0 .078-.05.144-.117.167l-.053.01H11.11a.171.171 0 01-.161-.121l-.01-.056V6.745l.01-.055a.173.173 0 01.107-.11l.054-.01h1.942zm0-2.57c.075 0 .14.05.162.12l.009.055v1.787c0 .078-.05.143-.117.166l-.053.01H11.11a.17.17 0 01-.161-.12l-.01-.056V4.175l.01-.055a.173.173 0 01.107-.111L11.11 4h1.942z"/></symbol><symbol id="flight-docker-16" viewBox="0 0 16 16"><path d="M12.342 4.536l.15-.227.262.159.116.083c.28.216.869.768.996 1.684.223-.04.448-.06.673-.06.534 0 .893.124 1.097.227l.105.057.068.045.191.156-.066.2a2.044 2.044 0 01-.47.73c-.29.299-.8.652-1.609.698l-.178.005h-.148c-.37.977-.867 2.078-1.702 3.066a7.081 7.081 0 01-1.74 1.488 7.941 7.941 0 01-2.549.968c-.644.125-1.298.187-1.953.185-1.45 0-2.73-.288-3.517-.792-.703-.449-1.243-1.182-1.606-2.177a8.25 8.25 0 01-.461-2.83.516.516 0 01.432-.516l.068-.005h10.54l.092-.007.149-.016c.256-.034.646-.11.92-.27-.328-.543-.421-1.178-.268-1.854a3.3 3.3 0 01.3-.81l.108-.187zM2.89 5.784l.04.007a.127.127 0 01.077.082l.006.04v1.315l-.006.041a.127.127 0 01-.078.082l-.039.006H1.478a.124.124 0 01-.117-.088l-.007-.04V5.912l.007-.04a.127.127 0 01.078-.083l.039-.006H2.89zm1.947 0l.039.007a.127.127 0 01.078.082l.006.04v1.315l-.007.041a.127.127 0 01-.078.082l-.039.006H3.424a.125.125 0 01-.117-.088L3.3 7.23V5.913a.13.13 0 01.085-.123l.039-.007h1.413zm1.976 0l.039.007a.127.127 0 01.077.082l.007.04v1.315l-.007.041a.127.127 0 01-.078.082l-.039.006H5.4a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.039-.006h1.413zm1.952 0l.039.007a.127.127 0 01.078.082l.007.04v1.315a.13.13 0 01-.085.123l-.04.006H7.353a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.04-.006h1.412zm1.97 0l.039.007a.127.127 0 01.078.082l.006.04v1.315a.13.13 0 01-.085.123l-.039.006H9.322a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.04-.006h1.411zM4.835 3.892l.04.007a.127.127 0 01.077.081l.007.041v1.315a.13.13 0 01-.085.123l-.039.007H3.424a.125.125 0 01-.117-.09l-.007-.04V4.021a.13.13 0 01.085-.122l.039-.007h1.412zm1.976 0l.04.007a.127.127 0 01.077.081l.007.041v1.315a.13.13 0 01-.085.123l-.039.007H5.4a.125.125 0 01-.117-.09l-.006-.04V4.021l.006-.04a.127.127 0 01.078-.082l.039-.007h1.412zm1.953 0c.054 0 .1.037.117.088l.007.041v1.315a.13.13 0 01-.085.123l-.04.007H7.353a.125.125 0 01-.117-.09l-.006-.04V4.021l.006-.04a.127.127 0 01.078-.082l.04-.007h1.412zm0-1.892c.054 0 .1.037.117.088l.007.04v1.316a.13.13 0 01-.085.123l-.04.006H7.353a.124.124 0 01-.117-.088l-.006-.04V2.128l.006-.04a.127.127 0 01.078-.082L7.353 2h1.412z"/></symbol><symbol id="flight-docker-color-24" viewBox="0 0 24 24"><path fill="#2396ED" d="M17.97 7.445l.207-.31.36.217.159.112c.385.294 1.194 1.045 1.37 2.288.306-.053.616-.08.926-.082.734 0 1.227.17 1.508.309l.143.078.094.061.263.212-.09.272a2.775 2.775 0 01-.648.99c-.398.407-1.098.887-2.211.949l-.245.006h-.203c-.509 1.329-1.193 2.823-2.34 4.165a9.708 9.708 0 01-2.393 2.022 11.005 11.005 0 01-3.505 1.314c-.885.17-1.784.255-2.685.252-1.994 0-3.753-.391-4.836-1.076-.966-.61-1.71-1.605-2.208-2.957A11.082 11.082 0 011 12.422a.704.704 0 01.595-.7l.093-.007H16.18l.128-.009.204-.022c.353-.046.889-.15 1.267-.367-.452-.737-.58-1.6-.37-2.519.09-.384.228-.754.413-1.1l.148-.253zM4.974 9.14l.054.01c.05.017.09.058.107.11l.008.056v1.786l-.008.055a.173.173 0 01-.108.111l-.053.009H3.032a.17.17 0 01-.161-.12l-.009-.055V9.315l.009-.055a.173.173 0 01.107-.111l.054-.01h1.942zm2.676 0l.054.01c.05.017.09.058.107.11l.009.056v1.786l-.01.055a.173.173 0 01-.106.111l-.054.009H5.708a.171.171 0 01-.162-.12l-.009-.055V9.316c0-.078.05-.144.117-.167l.054-.01H7.65zm2.717 0l.054.01c.05.017.09.058.107.11l.008.056v1.786l-.008.055a.172.172 0 01-.108.111l-.053.009H8.425a.17.17 0 01-.161-.12l-.009-.055V9.315l.009-.055a.173.173 0 01.107-.111l.054-.01h1.942zm2.684 0l.054.009c.051.017.091.059.108.111l.009.056v1.786c0 .077-.05.143-.117.166l-.053.009H11.11a.17.17 0 01-.161-.12l-.01-.055V9.315l.01-.055a.173.173 0 01.107-.111l.054-.01h1.942zm2.709 0l.054.009c.05.017.09.059.108.111l.008.056v1.786c0 .077-.049.143-.117.166l-.053.009h-1.942a.17.17 0 01-.161-.12l-.009-.055V9.315l.009-.055a.173.173 0 01.107-.111l.054-.01h1.942zM7.65 6.57l.054.01c.05.017.09.058.107.11l.009.055v1.786a.176.176 0 01-.116.167l-.054.01H5.708a.172.172 0 01-.162-.121l-.008-.056V6.745c0-.077.049-.143.116-.166l.054-.009H7.65zm2.717 0l.053.01c.05.017.09.058.108.11l.008.055v1.786a.176.176 0 01-.115.167l-.054.01H8.425a.171.171 0 01-.161-.121l-.009-.056V6.745l.009-.055a.173.173 0 01.107-.11l.054-.01h1.942zm2.684 0c.075 0 .14.05.162.12l.009.055v1.786c0 .078-.05.144-.117.167l-.053.01H11.11a.171.171 0 01-.161-.121l-.01-.056V6.745l.01-.055a.173.173 0 01.107-.11l.054-.01h1.942zm0-2.57c.075 0 .14.05.162.12l.009.055v1.787c0 .078-.05.143-.117.166l-.053.01H11.11a.17.17 0 01-.161-.12l-.01-.056V4.175l.01-.055a.173.173 0 01.107-.111L11.11 4h1.942z"/></symbol><symbol id="flight-docker-color-16" viewBox="0 0 16 16"><path fill="#2396ED" d="M12.342 4.536l.15-.227.262.159.116.083c.28.216.869.768.996 1.684.223-.04.448-.06.673-.06.534 0 .893.124 1.097.227l.105.057.068.045.191.156-.066.2a2.044 2.044 0 01-.47.73c-.29.299-.8.652-1.609.698l-.178.005h-.148c-.37.977-.867 2.078-1.702 3.066a7.081 7.081 0 01-1.74 1.488 7.941 7.941 0 01-2.549.968c-.644.125-1.298.187-1.953.185-1.45 0-2.73-.288-3.517-.792-.703-.449-1.243-1.182-1.606-2.177a8.25 8.25 0 01-.461-2.83.516.516 0 01.432-.516l.068-.005h10.54l.092-.007.149-.016c.256-.034.646-.11.92-.27-.328-.543-.421-1.178-.268-1.854a3.3 3.3 0 01.3-.81l.108-.187zM2.89 5.784l.04.007a.127.127 0 01.077.082l.006.04v1.315l-.006.041a.127.127 0 01-.078.082l-.039.006H1.478a.124.124 0 01-.117-.088l-.007-.04V5.912l.007-.04a.127.127 0 01.078-.083l.039-.006H2.89zm1.947 0l.039.007a.127.127 0 01.078.082l.006.04v1.315l-.007.041a.127.127 0 01-.078.082l-.039.006H3.424a.125.125 0 01-.117-.088L3.3 7.23V5.913a.13.13 0 01.085-.123l.039-.007h1.413zm1.976 0l.039.007a.127.127 0 01.077.082l.007.04v1.315l-.007.041a.127.127 0 01-.078.082l-.039.006H5.4a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.039-.006h1.413zm1.952 0l.039.007a.127.127 0 01.078.082l.007.04v1.315a.13.13 0 01-.085.123l-.04.006H7.353a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.04-.006h1.412zm1.97 0l.039.007a.127.127 0 01.078.082l.006.04v1.315a.13.13 0 01-.085.123l-.039.006H9.322a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.04-.006h1.411zM4.835 3.892l.04.007a.127.127 0 01.077.081l.007.041v1.315a.13.13 0 01-.085.123l-.039.007H3.424a.125.125 0 01-.117-.09l-.007-.04V4.021a.13.13 0 01.085-.122l.039-.007h1.412zm1.976 0l.04.007a.127.127 0 01.077.081l.007.041v1.315a.13.13 0 01-.085.123l-.039.007H5.4a.125.125 0 01-.117-.09l-.006-.04V4.021l.006-.04a.127.127 0 01.078-.082l.039-.007h1.412zm1.953 0c.054 0 .1.037.117.088l.007.041v1.315a.13.13 0 01-.085.123l-.04.007H7.353a.125.125 0 01-.117-.09l-.006-.04V4.021l.006-.04a.127.127 0 01.078-.082l.04-.007h1.412zm0-1.892c.054 0 .1.037.117.088l.007.04v1.316a.13.13 0 01-.085.123l-.04.006H7.353a.124.124 0 01-.117-.088l-.006-.04V2.128l.006-.04a.127.127 0 01.078-.082L7.353 2h1.412z"/></symbol><symbol id="flight-f5-24" viewBox="0 0 24 24"><path d="M20.253 6.354c-.123.506-.187 1.031-.305 1.568a56.737 56.737 0 00-5.24-.406c-.16.502-.31.993-.482 1.53 3.311.204 4.92 1.076 5.875 2.104.928 1.04 1.125 2.19 1.071 3.256-.12 1.734-.884 2.83-1.933 3.642-1.061.8-2.345 1.197-3.373 1.283-1.515.114-3.542-.247-3.973-.511-.26-.59-.516-1.186-.791-1.835-.067-.138-.11-.28.08-.445.295-.282.578-.556.877-.845.132-.13.278-.25.389-.065.407.629.79 1.206 1.172 1.78.434.641 1.096 1.226 2.543 1.128 1.215-.108 2.14-1.028 2.238-2.04.107-1.872-1.788-3.2-6.713-3.625.945-2.853 1.867-5.614 2.603-7.809 1.17.054 2.253.15 3.288.283.765.097 1.476.276 2.19.358A9.978 9.978 0 0011.998 2C6.477 2 2 6.477 2 12a9.953 9.953 0 001.947 5.926c.423.003.717-.091.749-.274.039-.191.006-.487-.027-.785-.2-1.962-.271-4.081-.196-6.204-.507.022-.962.045-1.399.07.018-.392.04-.764.07-1.152.432-.041.888-.077 1.39-.12.021-.338.046-.665.075-.996.225-2.025 2.357-3.263 4.134-3.741.788-.192 1.27-.253 1.648-.273.137-.004.284-.01.431-.01.368 0 .742.035.979.196.383.287.761.573 1.164.89.04.055.084.14-.016.287-.185.217-.363.423-.551.646-.108.131-.288.096-.44.055a46.47 46.47 0 00-.93-.46c-.56-.25-1.14-.506-1.785-.48-.403.032-.793.444-.833 1.007a84.509 84.509 0 00-.125 2.69 142.94 142.94 0 013.412-.057l-.001.788c-.384.171-.746.345-1.131.52-.794.009-1.55.015-2.31.028-.036 2.266-.002 4.523.1 6.61.02.315.035.634.125.848.109.269.733.476 2.092.553.005.236.012.46.02.689-2.212-.065-4.337-.276-6.04-.583A9.968 9.968 0 0012 22c5.524 0 10-4.477 10-10a9.952 9.952 0 00-1.746-5.646z"/></symbol><symbol id="flight-f5-16" viewBox="0 0 16 16"><path d="M13.777 4.048c-.086.354-.13.722-.213 1.098a39.715 39.715 0 00-3.668-.285c-.112.351-.217.696-.337 1.071 2.318.143 3.444.754 4.112 1.473.65.728.788 1.533.75 2.28-.084 1.213-.619 1.98-1.353 2.549a4.712 4.712 0 01-2.361.898c-1.061.08-2.48-.173-2.782-.358-.182-.414-.36-.83-.553-1.285-.047-.096-.077-.196.056-.31.206-.199.405-.39.613-.593.093-.09.195-.174.273-.045.285.44.552.844.82 1.246.304.449.768.858 1.78.79.851-.076 1.498-.72 1.567-1.428.075-1.31-1.251-2.24-4.699-2.538.662-1.997 1.306-3.93 1.822-5.466a27.93 27.93 0 012.302.198c.535.068 1.033.193 1.532.25a7 7 0 00-11.076 8.555c.297.002.502-.064.525-.192.027-.133.004-.34-.02-.549a32.121 32.121 0 01-.136-4.343c-.355.015-.674.031-.98.05.013-.276.028-.536.05-.807.302-.029.621-.054.972-.084.015-.237.032-.466.053-.697.157-1.418 1.65-2.285 2.893-2.62.552-.134.89-.176 1.154-.19.096-.003.2-.007.302-.007.258 0 .52.024.685.137.268.2.533.4.815.623.028.038.059.098-.011.201l-.386.452c-.076.092-.201.067-.307.039a32.529 32.529 0 00-.652-.323c-.392-.174-.798-.354-1.25-.336-.281.023-.554.311-.582.706-.04.6-.066 1.215-.088 1.882a100.06 100.06 0 012.389-.04l-.001.552c-.27.12-.523.241-.792.364-.556.006-1.085.01-1.617.02a72.993 72.993 0 00.07 4.627c.014.22.024.444.088.593.076.189.513.334 1.464.387l.014.483c-1.549-.046-3.036-.194-4.228-.408a7 7 0 0010.991-8.62z"/></symbol><symbol id="flight-f5-color-24" viewBox="0 0 24 24"><path fill="#E4002B" d="M20.253 6.354c-.123.506-.187 1.031-.305 1.568a56.737 56.737 0 00-5.24-.406c-.16.502-.31.993-.482 1.53 3.311.204 4.92 1.076 5.875 2.104.928 1.04 1.125 2.19 1.071 3.256-.12 1.734-.884 2.83-1.933 3.642-1.061.8-2.345 1.197-3.373 1.283-1.515.114-3.542-.247-3.973-.511-.26-.59-.516-1.186-.791-1.835-.067-.138-.11-.28.08-.445.295-.282.578-.556.877-.845.132-.13.278-.25.389-.065.407.629.79 1.206 1.172 1.78.434.641 1.096 1.226 2.543 1.128 1.215-.108 2.14-1.028 2.238-2.04.107-1.872-1.788-3.2-6.713-3.625.945-2.853 1.867-5.614 2.603-7.809 1.17.054 2.253.15 3.288.283.765.097 1.476.276 2.19.358A9.978 9.978 0 0011.998 2C6.477 2 2 6.477 2 12a9.953 9.953 0 001.947 5.926c.423.003.717-.091.749-.274.039-.191.006-.487-.027-.785-.2-1.962-.271-4.081-.196-6.204-.507.022-.962.045-1.399.07.018-.392.04-.764.07-1.152.432-.041.888-.077 1.39-.12.021-.338.046-.665.075-.996.225-2.025 2.357-3.263 4.134-3.741.788-.192 1.27-.253 1.648-.273.137-.004.284-.01.431-.01.368 0 .742.035.979.196.383.287.761.573 1.164.89.04.055.084.14-.016.287-.185.217-.363.423-.551.646-.108.131-.288.096-.44.055a46.47 46.47 0 00-.93-.46c-.56-.25-1.14-.506-1.785-.48-.403.032-.793.444-.833 1.007a84.509 84.509 0 00-.125 2.69 142.94 142.94 0 013.412-.057l-.001.788c-.384.171-.746.345-1.131.52-.794.009-1.55.015-2.31.028-.036 2.266-.002 4.523.1 6.61.02.315.035.634.125.848.109.269.733.476 2.092.553.005.236.012.46.02.689-2.212-.065-4.337-.276-6.04-.583A9.968 9.968 0 0012 22c5.524 0 10-4.477 10-10a9.952 9.952 0 00-1.746-5.646z"/><path fill="#fff" d="M21.172 14.406c.053-1.067-.144-2.216-1.072-3.256-.954-1.028-2.563-1.9-5.874-2.104.172-.537.322-1.028.481-1.53 1.98.07 3.741.212 5.24.406.118-.537.183-1.062.305-1.568a9.89 9.89 0 00-.483-.649c-.713-.082-1.424-.26-2.19-.358a39.903 39.903 0 00-3.287-.283c-.737 2.195-1.658 4.956-2.603 7.81 4.925.426 6.82 1.753 6.713 3.626-.098 1.011-1.023 1.931-2.239 2.04-1.446.097-2.108-.487-2.542-1.128-.383-.576-.765-1.152-1.173-1.78-.11-.185-.257-.065-.388.064-.299.29-.582.563-.877.846-.19.165-.148.306-.08.444.275.65.532 1.245.79 1.836.432.264 2.459.625 3.974.511 1.028-.086 2.312-.483 3.373-1.283 1.049-.814 1.813-1.91 1.932-3.644z"/><path fill="#fff" d="M3.946 17.926c.19.257.391.505.604.743 1.704.306 3.829.518 6.041.582l-.02-.689c-1.359-.077-1.983-.284-2.092-.553-.09-.213-.106-.532-.126-.847a103.977 103.977 0 01-.1-6.61c.76-.014 1.517-.02 2.31-.029.386-.175.748-.349 1.132-.52l.002-.788a143.01 143.01 0 00-3.412.056c.031-.952.069-1.832.124-2.69.04-.563.43-.975.833-1.007.645-.025 1.225.231 1.785.48.31.15.615.299.931.461.152.04.331.076.44-.056.187-.222.366-.429.55-.645.1-.148.057-.233.016-.287a56.679 56.679 0 00-1.164-.89c-.237-.16-.61-.196-.979-.196-.146 0-.294.005-.43.01-.379.02-.86.08-1.65.272-1.775.479-3.908 1.717-4.133 3.742-.03.331-.053.658-.075.997-.501.042-.958.078-1.389.12-.031.387-.053.76-.07 1.151.436-.025.891-.048 1.399-.07a45.987 45.987 0 00.195 6.204c.033.299.066.594.027.785-.032.183-.325.277-.749.274z"/></symbol><symbol id="flight-f5-color-16" viewBox="0 0 16 16"><path fill="#E4002B" d="M13.777 4.048c-.086.354-.13.722-.213 1.098a39.715 39.715 0 00-3.668-.285c-.112.351-.217.696-.337 1.071 2.318.143 3.444.754 4.112 1.473.65.728.788 1.533.75 2.28-.084 1.213-.619 1.98-1.353 2.549a4.712 4.712 0 01-2.361.898c-1.061.08-2.48-.173-2.782-.358-.182-.414-.36-.83-.553-1.285-.047-.096-.077-.196.056-.31.206-.199.405-.39.613-.593.093-.09.195-.174.273-.045.285.44.552.844.82 1.246.304.449.768.858 1.78.79.851-.076 1.498-.72 1.567-1.428.075-1.31-1.251-2.24-4.699-2.538.662-1.997 1.306-3.93 1.822-5.466a27.93 27.93 0 012.302.198c.535.068 1.033.193 1.532.25a7 7 0 00-11.076 8.555c.297.002.502-.064.525-.192.027-.133.004-.34-.02-.549a32.121 32.121 0 01-.136-4.343c-.355.015-.674.031-.98.05.013-.276.028-.536.05-.807.302-.029.621-.054.972-.084.015-.237.032-.466.053-.697.157-1.418 1.65-2.285 2.893-2.62.552-.134.89-.176 1.154-.19.096-.003.2-.007.302-.007.258 0 .52.024.685.137.268.2.533.4.815.623.028.038.059.098-.011.201l-.386.452c-.076.092-.201.067-.307.039a32.529 32.529 0 00-.652-.323c-.392-.174-.798-.354-1.25-.336-.281.023-.554.311-.582.706-.04.6-.066 1.215-.088 1.882a100.06 100.06 0 012.389-.04l-.001.552c-.27.12-.523.241-.792.364-.556.006-1.085.01-1.617.02a72.993 72.993 0 00.07 4.627c.014.22.024.444.088.593.076.189.513.334 1.464.387l.014.483c-1.549-.046-3.036-.194-4.228-.408a7 7 0 0010.991-8.62z"/><path fill="#fff" d="M14.42 9.684c.038-.746-.1-1.55-.75-2.279-.667-.72-1.794-1.33-4.112-1.473.12-.375.226-.72.337-1.071 1.386.049 2.62.148 3.668.285.083-.376.128-.744.214-1.098a6.937 6.937 0 00-.339-.455c-.499-.057-.996-.182-1.532-.25a27.93 27.93 0 00-2.301-.198c-.516 1.536-1.16 3.469-1.822 5.467 3.447.298 4.773 1.227 4.699 2.538-.069.708-.716 1.352-1.567 1.428-1.013.068-1.476-.34-1.78-.79-.268-.403-.535-.806-.82-1.246-.078-.129-.18-.045-.273.045-.209.203-.407.394-.614.592-.132.116-.103.215-.056.311.193.455.373.871.554 1.285.302.185 1.72.438 2.782.358a4.714 4.714 0 002.36-.898c.735-.57 1.27-1.337 1.353-2.55z"/><path fill="#fff" d="M2.363 12.148c.132.18.273.354.422.52 1.193.215 2.68.363 4.23.408-.006-.16-.01-.317-.015-.483-.951-.053-1.388-.198-1.464-.386-.064-.15-.075-.373-.088-.594a72.784 72.784 0 01-.07-4.627c.532-.01 1.061-.014 1.617-.02.27-.123.523-.244.792-.364v-.551c-.823.003-1.604.017-2.387.039.022-.667.048-1.282.087-1.883.028-.394.301-.683.583-.705.451-.018.857.162 1.25.336.216.105.43.209.651.323.106.028.232.052.307-.04l.386-.451c.07-.104.04-.163.011-.201a39.675 39.675 0 00-.815-.624c-.165-.112-.427-.136-.685-.136-.102 0-.206.004-.301.007-.265.014-.602.056-1.154.19-1.244.335-2.736 1.202-2.894 2.62-.02.231-.037.46-.052.697-.351.03-.671.055-.973.084-.022.271-.037.532-.05.806.306-.018.625-.033.98-.049a32.19 32.19 0 00.137 4.343c.023.209.046.416.019.55-.022.127-.228.193-.524.191z"/></symbol><symbol id="flight-facebook-24" viewBox="0 0 24 24"><path d="M23 12c0-6.076-4.924-11-11-11S1 5.924 1 12c0 5.491 4.022 10.042 9.281 10.867V15.18H7.488V12h2.793V9.577c0-2.757 1.642-4.28 4.155-4.28 1.204 0 2.462.215 2.462.215v2.707h-1.387c-1.367 0-1.792.848-1.792 1.719V12h3.05l-.487 3.18h-2.563v7.687C18.979 22.042 23 17.49 23 12z"/></symbol><symbol id="flight-facebook-16" viewBox="0 0 16 16"><path d="M15 8a7 7 0 00-7-7 7 7 0 00-1.094 13.915v-4.892H5.13V8h1.777V6.458c0-1.754 1.045-2.724 2.644-2.724.766 0 1.567.137 1.567.137v1.723h-.883c-.87 0-1.14.54-1.14 1.093V8h1.941l-.31 2.023H9.094v4.892A7.001 7.001 0 0015 8z"/></symbol><symbol id="flight-facebook-color-24" viewBox="0 0 24 24"><path fill="#1877F2" d="M23 12c0-6.076-4.924-11-11-11S1 5.924 1 12c0 5.491 4.022 10.042 9.281 10.867V15.18H7.488V12h2.793V9.577c0-2.757 1.642-4.28 4.155-4.28 1.204 0 2.462.215 2.462.215v2.707h-1.387c-1.367 0-1.792.848-1.792 1.719V12h3.05l-.487 3.18h-2.563v7.687C18.979 22.042 23 17.49 23 12z"/><path fill="#fff" d="M16.282 15.18L16.77 12h-3.051V9.937c0-.87.425-1.718 1.792-1.718h1.387V5.512s-1.258-.215-2.462-.215c-2.513 0-4.155 1.523-4.155 4.28V12H7.488v3.18h2.793v7.687a11.065 11.065 0 003.438 0V15.18h2.563z"/></symbol><symbol id="flight-facebook-color-16" viewBox="0 0 16 16"><path fill="#1877F2" d="M15 8a7 7 0 00-7-7 7 7 0 00-1.094 13.915v-4.892H5.13V8h1.777V6.458c0-1.754 1.045-2.724 2.644-2.724.766 0 1.567.137 1.567.137v1.723h-.883c-.87 0-1.14.54-1.14 1.093V8h1.941l-.31 2.023H9.094v4.892A7.001 7.001 0 0015 8z"/><path fill="#fff" d="M10.725 10.023L11.035 8H9.094V6.687c0-.553.27-1.093 1.14-1.093h.883V3.87s-.801-.137-1.567-.137c-1.6 0-2.644.97-2.644 2.724V8H5.13v2.023h1.777v4.892a7.037 7.037 0 002.188 0v-4.892h1.63z"/></symbol><symbol id="flight-figma-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M5 5.742C5 3.675 6.687 2 8.768 2h6.464C17.313 2 19 3.675 19 5.742c0 1.308-.676 2.46-1.7 3.129a3.732 3.732 0 011.7 3.13c0 2.066-1.687 3.741-3.768 3.741h-.081a3.768 3.768 0 01-2.534-.972v3.448c0 2.094-1.73 3.782-3.83 3.782C6.713 22 5 20.33 5 18.258c0-1.308.676-2.46 1.7-3.129A3.732 3.732 0 015 12c0-1.309.676-2.46 1.7-3.129A3.732 3.732 0 015 5.741zm6.383 3.742H8.768A2.525 2.525 0 006.234 12a2.525 2.525 0 002.518 2.516H11.383V9.484zM12.617 12a2.525 2.525 0 002.534 2.516h.081c1.4 0 2.534-1.126 2.534-2.516a2.525 2.525 0 00-2.534-2.516h-.081A2.525 2.525 0 0012.617 12zm-3.85 3.742h-.015a2.525 2.525 0 00-2.518 2.516c0 1.385 1.15 2.516 2.554 2.516 1.427 0 2.595-1.15 2.595-2.556v-2.476H8.768zm0-12.516h2.616v5.032H8.768a2.525 2.525 0 01-2.534-2.516 2.525 2.525 0 012.534-2.516zm3.85 5.032V3.226h2.615c1.4 0 2.534 1.126 2.534 2.516a2.525 2.525 0 01-2.534 2.516h-2.615z" clip-rule="evenodd"/></symbol><symbol id="flight-figma-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3 3.62C3 2.172 4.205 1 5.691 1h4.618C11.795 1 13 2.173 13 3.62a2.6 2.6 0 01-1.215 2.19A2.6 2.6 0 0113 8c0 1.447-1.205 2.62-2.691 2.62h-.059a2.723 2.723 0 01-1.81-.681v2.413C8.44 13.818 7.205 15 5.707 15 4.223 15 3 13.83 3 12.38a2.6 2.6 0 011.215-2.19A2.6 2.6 0 013 8a2.6 2.6 0 011.215-2.19A2.6 2.6 0 013 3.62zm4.56 2.619H5.69c-1 0-1.81.788-1.81 1.761 0 .97.805 1.755 1.799 1.761h1.879V6.24zM8.44 8c0 .973.811 1.761 1.81 1.761h.059c1 0 1.81-.788 1.81-1.76 0-.974-.81-1.762-1.81-1.762h-.059c-.999 0-1.81.788-1.81 1.761zm-2.749 2.62H5.68c-.994.005-1.798.792-1.798 1.76 0 .97.82 1.762 1.824 1.762 1.019 0 1.853-.805 1.853-1.79V10.62H5.691zm0-8.762H7.56v3.523H5.691c-1 0-1.81-.789-1.81-1.762 0-.972.81-1.761 1.81-1.761zm2.75 3.523V1.858h1.868c1 0 1.81.789 1.81 1.761 0 .973-.81 1.762-1.81 1.762H8.44z" clip-rule="evenodd"/></symbol><symbol id="flight-figma-color-24" viewBox="0 0 24 24"><path fill="#1ABCFE" d="M12.5 12c0-1.841 1.455-3.333 3.25-3.333S19 10.159 19 12c0 1.84-1.455 3.333-3.25 3.333S12.5 13.841 12.5 12z"/><path fill="#0ACF83" d="M6 18.667c0-1.841 1.455-3.334 3.25-3.334h3.25v3.334c0 1.84-1.455 3.333-3.25 3.333S6 20.508 6 18.667z"/><path fill="#FF7262" d="M12.5 2v6.667h3.25c1.795 0 3.25-1.493 3.25-3.334C19 3.493 17.545 2 15.75 2H12.5z"/><path fill="#F24E1E" d="M6 5.333c0 1.841 1.455 3.334 3.25 3.334h3.25V2H9.25C7.455 2 6 3.492 6 5.333z"/><path fill="#A259FF" d="M6 12c0 1.84 1.455 3.333 3.25 3.333h3.25V8.667H9.25C7.455 8.667 6 10.159 6 12z"/></symbol><symbol id="flight-figma-color-16" viewBox="0 0 16 16"><path fill="#1ABCFE" d="M8.55 8c0-1.289 1.019-2.333 2.275-2.333C12.082 5.667 13.1 6.71 13.1 8c0 1.289-1.018 2.333-2.275 2.333C9.57 10.333 8.55 9.29 8.55 8z"/><path fill="#0ACF83" d="M4 12.667c0-1.289 1.019-2.334 2.275-2.334H8.55v2.334C8.55 13.955 7.531 15 6.275 15S4 13.955 4 12.667z"/><path fill="#FF7262" d="M8.55 1v4.667h2.275c1.257 0 2.275-1.045 2.275-2.334C13.1 2.045 12.082 1 10.825 1H8.55z"/><path fill="#F24E1E" d="M4 3.333c0 1.289 1.019 2.334 2.275 2.334H8.55V1H6.275C5.019 1 4 2.045 4 3.333z"/><path fill="#A259FF" d="M4 8c0 1.289 1.019 2.333 2.275 2.333H8.55V5.667H6.275C5.019 5.667 4 6.71 4 8z"/></symbol><symbol id="flight-gcp-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M17.157 5.95l.004.004a7.78 7.78 0 012.355 3.78 5.599 5.599 0 012.23 6.317A5.645 5.645 0 0116.306 20l-8.692-.002c-1.227.005-2.427-.429-3.408-1.163l-.002.003a5.608 5.608 0 01-1.91-6.252 5.612 5.612 0 012.108-2.804A7.853 7.853 0 019.71 4.326a7.913 7.913 0 017.448 1.624zm1.322 8.434a2.165 2.165 0 01-2.172 2.16l-8.692-.004s-.428 0-.915-.226a2.156 2.156 0 01-1.231-2.26 2.165 2.165 0 011.843-1.834 2.174 2.174 0 012.285 1.249l2.52-2.505a5.647 5.647 0 00-3.367-2.09l.018-.02c1.546-1.689 4.168-1.91 5.954-.473l.002.001a4.302 4.302 0 011.583 3.413v.43c1.2 0 2.172.967 2.172 2.16z" clip-rule="evenodd"/></symbol><symbol id="flight-gcp-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M11.87 3.465l-.002-.003a5.935 5.935 0 00-5.586-1.217 5.89 5.89 0 00-3.98 4.092 4.206 4.206 0 00-.149 6.792 4.255 4.255 0 002.558.87h6.52a4.234 4.234 0 004.078-2.961A4.2 4.2 0 0013.637 6.3a5.835 5.835 0 00-1.767-2.835zm-7.828 7.78c.21.095.438.16.67.16l6.518.002c.9 0 1.63-.725 1.63-1.619s-.73-1.619-1.63-1.619v-.323a3.226 3.226 0 00-1.187-2.56h-.002c-1.339-1.078-3.305-.912-4.465.354l-.014.015c.996.2 1.897.751 2.525 1.568L6.198 9.101a1.63 1.63 0 00-3.097.439 1.617 1.617 0 00.942 1.704l-.001.001z" clip-rule="evenodd"/></symbol><symbol id="flight-gcp-color-24" viewBox="0 0 24 24"><path fill="#EA4335" d="M15.084 8.501l2.516-2-.443-.551A7.913 7.913 0 009.71 4.326a7.853 7.853 0 00-5.304 5.446c-.04.15.416-.13.618-.075l3.476-.57s.17-.166.269-.273c1.546-1.689 4.168-1.91 5.954-.473l.362.12z"/><path fill="#4285F4" d="M19.516 9.733a7.78 7.78 0 00-2.361-3.784l-2.44 2.426a4.301 4.301 0 011.592 3.42v.43c1.2 0 2.172.967 2.172 2.16a2.165 2.165 0 01-2.172 2.158l-4.343-.003-.433.046v3.344l.433.07h4.343c2.49.02 4.7-1.585 5.438-3.95a5.599 5.599 0 00-2.23-6.317z"/><path fill="#34A853" d="M7.615 19.998h4.343V16.54H7.615c-.31 0-.615-.087-.897-.215l-.61.188-1.75 1.728-.153.597c.982.737 2.18 1.166 3.41 1.16z"/><path fill="#FBBC05" d="M7.615 8.763a5.646 5.646 0 00-5.32 3.823 5.608 5.608 0 001.91 6.251l2.52-2.512a2.156 2.156 0 01-1.256-2.272 2.165 2.165 0 011.843-1.833 2.174 2.174 0 012.285 1.249l2.52-2.505a5.654 5.654 0 00-4.502-2.201z"/></symbol><symbol id="flight-gcp-color-16" viewBox="0 0 16 16"><path fill="#EA4335" d="M10.313 5.376l1.887-1.5-.332-.414a5.935 5.935 0 00-5.586-1.217 5.89 5.89 0 00-3.978 4.084c-.03.113.312-.098.463-.056l2.608-.428s.127-.124.201-.205c1.16-1.266 3.126-1.432 4.465-.354l.272.09z"/><path fill="#4285F4" d="M13.637 6.3a5.835 5.835 0 00-1.77-2.838l-1.83 1.82a3.226 3.226 0 011.193 2.564v.323c.9 0 1.63.725 1.63 1.62 0 .893-.73 1.619-1.63 1.619l-3.257-.003-.325.035v2.507l.325.053h3.257a4.234 4.234 0 004.08-2.962A4.199 4.199 0 0013.636 6.3z"/><path fill="#34A853" d="M4.711 13.999H7.97v-2.594H4.71c-.232 0-.461-.066-.672-.161l-.458.14-1.313 1.297-.114.447a4.254 4.254 0 002.557.87z"/><path fill="#FBBC05" d="M4.711 5.572A4.234 4.234 0 00.721 8.44a4.206 4.206 0 001.433 4.688l1.89-1.884a1.617 1.617 0 01.44-3.079 1.63 1.63 0 011.714.936l1.89-1.878A4.24 4.24 0 004.71 5.572z"/></symbol><symbol id="flight-gitlab-24" viewBox="0 0 24 24"><path d="M21.964 13.292l-1.12-3.363-2.218-6.673a.383.383 0 00-.363-.255.383.383 0 00-.364.255l-2.217 6.669H8.316L6.1 3.256A.382.382 0 005.736 3a.382.382 0 00-.363.256L3.16 9.925l-1.12 3.367a.736.736 0 00.275.833L12 21l9.683-6.875a.737.737 0 00.28-.833z"/></symbol><symbol id="flight-gitlab-16" viewBox="0 0 16 16"><path d="M14.975 8.904L14.19 6.55l-1.552-4.67a.268.268 0 00-.255-.18.268.268 0 00-.254.18l-1.552 4.667H5.422L3.87 1.879a.267.267 0 00-.254-.179.267.267 0 00-.254.18l-1.55 4.667-.784 2.357a.515.515 0 00.193.583l6.78 4.812 6.778-4.812a.516.516 0 00.196-.583z"/></symbol><symbol id="flight-gitlab-color-24" viewBox="0 0 24 24"><path fill="#FC6D26" d="M21.964 13.292l-1.12-3.363-2.218-6.673a.383.383 0 00-.363-.255.383.383 0 00-.364.255l-2.217 6.669H8.316L6.1 3.256A.382.382 0 005.736 3a.382.382 0 00-.363.256L3.16 9.925l-1.12 3.367a.736.736 0 00.275.833L12 21l9.683-6.875a.737.737 0 00.28-.833z"/><path fill="#E24329" d="M12 20.995l3.683-11.071H8.319L12 20.994z"/><path fill="#FC6D26" d="M12 20.995L8.316 9.924H3.162L12 20.994z"/><path fill="#FCA326" d="M3.158 9.927l-1.12 3.364a.736.736 0 00.276.833L12 21 3.158 9.927z"/><path fill="#E24329" d="M3.16 9.927h5.16L6.1 3.26a.383.383 0 00-.364-.256.383.383 0 00-.364.256L3.16 9.927z"/><path fill="#FC6D26" d="M12 20.995l3.683-11.071h5.162L12 20.994z"/><path fill="#FCA326" d="M20.842 9.927l1.12 3.364a.734.734 0 01-.276.833L12 20.994l8.84-11.067h.002z"/><path fill="#E24329" d="M20.844 9.927h-5.16l2.217-6.667a.382.382 0 01.363-.256c.165 0 .311.103.363.256l2.217 6.667z"/></symbol><symbol id="flight-gitlab-color-16" viewBox="0 0 16 16"><path fill="#FC6D26" d="M14.975 8.904L14.19 6.55l-1.552-4.67a.268.268 0 00-.255-.18.268.268 0 00-.254.18l-1.552 4.667H5.422L3.87 1.879a.267.267 0 00-.254-.179.267.267 0 00-.254.18l-1.55 4.667-.784 2.357a.515.515 0 00.193.583l6.78 4.812 6.778-4.812a.516.516 0 00.196-.583z"/><path fill="#E24329" d="M8 14.296l2.578-7.75H5.423L8 14.296z"/><path fill="#FC6D26" d="M8 14.296l-2.579-7.75H1.813L8 14.296z"/><path fill="#FCA326" d="M1.81 6.549l-.784 2.354a.515.515 0 00.193.583L8 14.3 1.81 6.55z"/><path fill="#E24329" d="M1.812 6.549h3.612L3.87 1.882a.268.268 0 00-.254-.18.268.268 0 00-.255.18L1.812 6.549z"/><path fill="#FC6D26" d="M8 14.296l2.578-7.75h3.614L8 14.296z"/><path fill="#FCA326" d="M14.19 6.549l.783 2.354a.514.514 0 01-.193.583L8 14.296l6.188-7.747h.001z"/><path fill="#E24329" d="M14.19 6.549H10.58l1.551-4.667a.267.267 0 01.255-.18c.115 0 .217.073.254.18l1.552 4.667z"/></symbol><symbol id="flight-github-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 2C6.477 2 2 6.476 2 11.997c0 4.417 2.865 8.163 6.839 9.485.5.092.682-.216.682-.482 0-.236-.008-.865-.013-1.7-2.782.604-3.369-1.34-3.369-1.34-.454-1.155-1.11-1.462-1.11-1.462-.908-.62.069-.608.069-.608 1.003.07 1.531 1.03 1.531 1.03.892 1.528 2.341 1.087 2.91.831.092-.646.35-1.086.636-1.336-2.22-.252-4.555-1.11-4.555-4.94 0-1.092.39-1.985 1.029-2.683-.103-.253-.446-1.27.098-2.646 0 0 .84-.269 2.75 1.025A9.581 9.581 0 0112 6.834c.85.004 1.705.115 2.504.337 1.909-1.294 2.747-1.025 2.747-1.025.546 1.376.202 2.393.1 2.646.64.698 1.028 1.591 1.028 2.682 0 3.84-2.339 4.686-4.566 4.933.359.309.678.919.678 1.852 0 1.336-.012 2.414-.012 2.741 0 .268.18.58.688.482 3.97-1.325 6.833-5.07 6.833-9.485C22 6.476 17.522 2 12 2z" clip-rule="evenodd"/></symbol><symbol id="flight-github-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 1C4.133 1 1 4.13 1 7.993c0 3.09 2.006 5.71 4.787 6.635.35.064.478-.152.478-.337 0-.166-.006-.606-.01-1.19-1.947.423-2.357-.937-2.357-.937-.319-.808-.778-1.023-.778-1.023-.635-.434.048-.425.048-.425.703.05 1.073.72 1.073.72.624 1.07 1.638.76 2.037.582.063-.452.244-.76.444-.935-1.554-.176-3.188-.776-3.188-3.456 0-.763.273-1.388.72-1.876-.072-.177-.312-.888.07-1.85 0 0 .586-.189 1.924.716A6.711 6.711 0 018 4.381c.595.003 1.194.08 1.753.236 1.336-.905 1.923-.717 1.923-.717.382.963.142 1.674.07 1.85.448.49.72 1.114.72 1.877 0 2.686-1.638 3.278-3.197 3.45.251.216.475.643.475 1.296 0 .934-.009 1.688-.009 1.918 0 .187.127.404.482.336A6.996 6.996 0 0015 7.993 6.997 6.997 0 008 1z" clip-rule="evenodd"/></symbol><symbol id="flight-github-color-24" viewBox="0 0 24 24"><path fill="#161514" fill-rule="evenodd" d="M12 2C6.477 2 2 6.476 2 11.997c0 4.417 2.865 8.163 6.839 9.485.5.092.682-.216.682-.482 0-.236-.008-.865-.013-1.7-2.782.604-3.369-1.34-3.369-1.34-.454-1.155-1.11-1.462-1.11-1.462-.908-.62.069-.608.069-.608 1.003.07 1.531 1.03 1.531 1.03.892 1.528 2.341 1.087 2.91.831.092-.646.35-1.086.636-1.336-2.22-.252-4.555-1.11-4.555-4.94 0-1.092.39-1.985 1.029-2.683-.103-.253-.446-1.27.098-2.646 0 0 .84-.269 2.75 1.025A9.581 9.581 0 0112 6.834c.85.004 1.705.115 2.504.337 1.909-1.294 2.747-1.025 2.747-1.025.546 1.376.202 2.393.1 2.646.64.698 1.028 1.591 1.028 2.682 0 3.84-2.339 4.686-4.566 4.933.359.309.678.919.678 1.852 0 1.336-.012 2.414-.012 2.741 0 .268.18.58.688.482 3.97-1.325 6.833-5.07 6.833-9.485C22 6.476 17.522 2 12 2z" clip-rule="evenodd"/></symbol><symbol id="flight-github-color-16" viewBox="0 0 16 16"><path fill="#161514" fill-rule="evenodd" d="M8 1C4.133 1 1 4.13 1 7.993c0 3.09 2.006 5.71 4.787 6.635.35.064.478-.152.478-.337 0-.166-.006-.606-.01-1.19-1.947.423-2.357-.937-2.357-.937-.319-.808-.778-1.023-.778-1.023-.635-.434.048-.425.048-.425.703.05 1.073.72 1.073.72.624 1.07 1.638.76 2.037.582.063-.452.244-.76.444-.935-1.554-.176-3.188-.776-3.188-3.456 0-.763.273-1.388.72-1.876-.072-.177-.312-.888.07-1.85 0 0 .586-.189 1.924.716A6.711 6.711 0 018 4.381c.595.003 1.194.08 1.753.236 1.336-.905 1.923-.717 1.923-.717.382.963.142 1.674.07 1.85.448.49.72 1.114.72 1.877 0 2.686-1.638 3.278-3.197 3.45.251.216.475.643.475 1.296 0 .934-.009 1.688-.009 1.918 0 .187.127.404.482.336A6.996 6.996 0 0015 7.993 6.997 6.997 0 008 1z" clip-rule="evenodd"/></symbol><symbol id="flight-google-24" viewBox="0 0 24 24"><path d="M16.036 7.457a5.434 5.434 0 00-3.836-1.5c-2.609 0-4.824 1.76-5.614 4.13a5.99 5.99 0 000 3.83h.003c.794 2.366 3.006 4.126 5.615 4.126 1.346 0 2.502-.345 3.398-.953v-.003a4.63 4.63 0 002-3.038H12.2v-3.85h9.432c.117.668.172 1.351.172 2.031 0 3.041-1.086 5.613-2.978 7.354l.002.002C17.171 21.115 14.897 22 12.2 22c-3.781 0-7.238-2.131-8.936-5.508a10.008 10.008 0 010-8.98A9.998 9.998 0 0112.2 2.001a9.61 9.61 0 016.69 2.601l-2.854 2.855z"/></symbol><symbol id="flight-google-16" viewBox="0 0 16 16"><path d="M10.84 4.82a3.837 3.837 0 00-2.7-1.05c-1.837 0-3.397 1.233-3.953 2.891a4.17 4.17 0 000 2.68h.003c.558 1.657 2.115 2.889 3.952 2.889.948 0 1.761-.241 2.392-.667v-.002a3.239 3.239 0 001.407-2.127H8.14V6.74h6.64c.082.468.121.946.121 1.422 0 2.129-.765 3.929-2.096 5.148l.001.001C11.64 14.38 10.038 15 8.14 15a7.044 7.044 0 01-6.29-3.855 6.97 6.97 0 010-6.287A7.042 7.042 0 018.139 1a6.786 6.786 0 014.71 1.821L10.84 4.82z"/></symbol><symbol id="flight-google-color-24" viewBox="0 0 24 24"><path fill="#4285F4" d="M21.804 12.23c0-.68-.055-1.363-.173-2.032H12.2v3.85h5.4a4.629 4.629 0 01-1.998 3.04v2.498h3.222c1.893-1.742 2.98-4.314 2.98-7.356z"/><path fill="#34A853" d="M12.2 22c2.697 0 4.971-.886 6.628-2.414l-3.222-2.499c-.897.61-2.054.956-3.402.956-2.61 0-4.821-1.76-5.615-4.127H3.264v2.576A10 10 0 0012.2 22z"/><path fill="#FBBC04" d="M6.585 13.916a5.99 5.99 0 010-3.828V7.512H3.264a10.008 10.008 0 000 8.98l3.321-2.576z"/><path fill="#EA4335" d="M12.2 5.958a5.434 5.434 0 013.836 1.499l2.855-2.855A9.61 9.61 0 0012.2 2.001a9.998 9.998 0 00-8.936 5.511l3.321 2.576c.79-2.37 3.006-4.13 5.615-4.13z"/></symbol><symbol id="flight-google-color-16" viewBox="0 0 16 16"><path fill="#4285F4" d="M14.9 8.161c0-.476-.039-.954-.121-1.422h-6.64v2.695h3.802a3.24 3.24 0 01-1.407 2.127v1.75h2.269c1.332-1.22 2.097-3.02 2.097-5.15z"/><path fill="#34A853" d="M8.14 15c1.898 0 3.499-.62 4.665-1.69l-2.268-1.749c-.631.427-1.446.669-2.395.669-1.836 0-3.393-1.232-3.952-2.888H1.85v1.803A7.044 7.044 0 008.14 15z"/><path fill="#FBBC04" d="M4.187 9.342a4.17 4.17 0 010-2.68V4.859H1.849a6.97 6.97 0 000 6.286l2.338-1.803z"/><path fill="#EA4335" d="M8.14 3.77a3.837 3.837 0 012.7 1.05l2.01-1.999a6.786 6.786 0 00-4.71-1.82 7.042 7.042 0 00-6.29 3.858L4.186 6.66c.556-1.658 2.116-2.89 3.952-2.89z"/></symbol><symbol id="flight-grafana-24" viewBox="0 0 24 24"><path d="M20.979 10.822a6.478 6.478 0 00-.19-1.146 7.21 7.21 0 00-1.46-2.854 4.169 4.169 0 00-.508-.563c.275-1.124-.338-2.097-.338-2.097-1.058-.065-1.713.324-1.967.52a.296.296 0 00-.127-.044c-.17-.065-.36-.152-.55-.195-.19-.065-.38-.108-.571-.173-.19-.043-.402-.086-.614-.13-.042 0-.063 0-.105-.021C14.083 2.627 12.772 2 12.772 2c-1.46.951-1.755 2.292-1.755 2.292s0 .022-.022.086l-.253.065a2.048 2.048 0 01-.339.108c-.106.044-.233.087-.338.13-.212.108-.445.216-.656.324-.212.13-.423.26-.613.39-.022-.022-.043-.022-.043-.022-2.03-.778-3.828.195-3.828.195-.17 2.205.804 3.61 1.015 3.87-.042.13-.085.28-.127.41a11.893 11.893 0 00-.338 1.557c0 .087-.021.152-.021.238C3.55 12.551 3 14.497 3 14.497c1.565 1.838 3.405 1.968 3.405 1.968.233.432.508.822.804 1.21.127.152.254.303.402.455-.571 1.665.085 3.07.085 3.07 1.755.065 2.897-.778 3.13-.973.17.065.36.108.529.151.529.152 1.079.217 1.628.26h.677c.825 1.21 2.264 1.362 2.264 1.362 1.036-1.103 1.078-2.205 1.078-2.443v-.022-.043-.043c.212-.152.423-.325.614-.498a7.61 7.61 0 001.079-1.275c.02-.044.063-.087.084-.13 1.163.065 1.988-.735 1.988-.735-.19-1.233-.888-1.838-1.036-1.968l-.021-.021h-.021s-.022 0-.022-.022c0-.065.022-.151.022-.216 0-.13.02-.26.02-.411V14v-.238-.108-.216l-.02-.108c-.022-.13-.043-.281-.085-.411a5.097 5.097 0 00-.592-1.492 5.468 5.468 0 00-.994-1.21 5.22 5.22 0 00-1.248-.822c-.444-.195-.91-.346-1.375-.39a7.553 7.553 0 00-.698-.043h-.106H14.358c-.127.022-.232.022-.36.043a3.916 3.916 0 00-2.284 1.363 3.709 3.709 0 00-.634 1.08c-.148.39-.233.779-.254 1.168V13.18c.021.194.063.389.106.562.106.367.254.691.465.95.19.282.444.498.698.693.254.173.529.303.804.389.275.087.529.108.783.108H14.02c.042 0 .063 0 .085-.021.02 0 .063-.022.084-.022.064-.022.106-.022.17-.043l.317-.13c.105-.043.19-.108.275-.173.02-.022.042-.043.063-.043a.187.187 0 00.021-.281c-.063-.087-.169-.108-.254-.044-.02.022-.042.022-.063.044-.063.043-.148.064-.233.086l-.253.065c-.043 0-.085.021-.127.021h-.402a2.046 2.046 0 01-.592-.172 2.23 2.23 0 01-.55-.368 2.063 2.063 0 01-.424-.54 2.416 2.416 0 01-.232-.692c-.021-.13-.021-.238-.021-.368v-.151-.044c0-.065.02-.13.02-.194a2.62 2.62 0 01.762-1.427c.106-.108.212-.195.317-.26.106-.086.233-.151.36-.216.127-.065.254-.108.402-.151.127-.043.275-.065.423-.065h.444c.148.021.318.043.466.065.296.065.592.173.867.346.55.302 1.015.8 1.311 1.383.148.303.254.606.296.93.021.087.021.173.021.238v.519c0 .086-.02.173-.02.26 0 .086-.022.172-.043.259l-.064.26a4.585 4.585 0 01-.677 1.47 4.187 4.187 0 01-1.628 1.362c-.317.151-.656.26-1.015.324-.17.022-.36.043-.53.065h-.274c-.085 0-.19 0-.275-.022a4.907 4.907 0 01-1.121-.216c-.36-.108-.72-.26-1.037-.432a5.717 5.717 0 01-1.734-1.47 6.578 6.578 0 01-.613-.952 6.4 6.4 0 01-.402-1.06c-.106-.367-.148-.735-.19-1.102v-.433-.13c0-.194.02-.367.042-.561.02-.195.063-.39.084-.563.043-.194.085-.367.127-.562.106-.367.233-.735.381-1.06a5.635 5.635 0 011.565-2.096c.127-.109.254-.195.402-.303.127-.087.275-.173.423-.26.064-.043.148-.065.212-.108a.353.353 0 01.105-.043c.043-.022.085-.043.106-.043.148-.065.317-.13.466-.173.042-.022.084-.022.126-.043.043-.022.085-.022.127-.044a3.42 3.42 0 00.233-.065c.042-.021.085-.021.127-.021.042 0 .084-.022.127-.022.042 0 .084-.021.127-.021l.063-.022h.064c.042 0 .084-.022.127-.022.042 0 .084-.021.148-.021.042 0 .105-.022.148-.022h1.057c.318.022.614.043.91.108a6.11 6.11 0 011.67.562c.508.26.974.563 1.354.908l.064.065.063.065c.043.043.085.087.148.13l.127.13.127.13c.17.172.317.367.466.562.275.367.507.735.676 1.102.022.022.022.043.043.065.02.022.02.043.02.065l.064.13.064.13.063.13c.064.172.127.323.17.475.084.238.148.454.19.649.021.064.084.13.169.108a.146.146 0 00.148-.152c.127-.324.127-.562.106-.821z"/></symbol><symbol id="flight-grafana-16" viewBox="0 0 16 16"><path d="M13.985 7.175a4.408 4.408 0 00-.138-.802 5.035 5.035 0 00-1.054-1.998 2.96 2.96 0 00-.366-.393c.198-.787-.245-1.468-.245-1.468-.764-.046-1.237.227-1.42.363-.031-.015-.062-.03-.092-.03-.122-.046-.26-.106-.397-.137-.138-.045-.275-.075-.413-.12-.137-.031-.29-.061-.443-.092-.03 0-.046 0-.076-.015C9.005 1.44 8.058 1 8.058 1 7.004 1.666 6.79 2.604 6.79 2.604s0 .015-.016.06l-.183.046c-.076.03-.168.06-.244.076-.077.03-.168.06-.245.09-.153.076-.32.152-.473.228-.153.09-.306.181-.443.272-.016-.015-.03-.015-.03-.015-1.467-.545-2.766.136-2.766.136-.122 1.544.58 2.528.733 2.71-.03.09-.06.196-.091.287a8.104 8.104 0 00-.245 1.09c0 .06-.015.106-.015.166C1.397 8.386 1 9.748 1 9.748c1.13 1.287 2.46 1.377 2.46 1.377.167.303.366.575.58.848.092.106.183.212.29.318a3.014 3.014 0 00.061 2.149c1.268.045 2.093-.545 2.261-.681.122.045.26.076.382.106.382.106.78.151 1.176.181h.49c.595.848 1.634.954 1.634.954.748-.772.779-1.544.779-1.71v-.015-.03-.03c.153-.107.305-.228.443-.35a5.37 5.37 0 00.779-.892c.015-.03.046-.06.061-.09.84.045 1.436-.515 1.436-.515-.138-.863-.642-1.287-.749-1.378l-.015-.015h-.015s-.015 0-.015-.015c0-.045.015-.106.015-.151 0-.091.015-.182.015-.288V9.4v-.166-.076-.152l-.015-.075c-.015-.091-.03-.197-.061-.288a3.506 3.506 0 00-.428-1.044 3.856 3.856 0 00-.718-.848 3.784 3.784 0 00-.901-.575 3.347 3.347 0 00-.993-.272c-.168-.015-.336-.03-.504-.03H9.37 9.204c-.092.015-.169.015-.26.03-.336.06-.642.181-.932.348-.275.166-.52.363-.718.605a2.579 2.579 0 00-.459.757 2.63 2.63 0 00-.183.817v.393c.015.137.046.273.077.394.076.258.183.485.336.666.137.197.32.348.504.485.183.12.382.212.58.272.199.06.382.076.565.076h.244c.031 0 .047 0 .062-.015.015 0 .046-.015.061-.015.046-.016.076-.016.122-.03l.23-.092a.869.869 0 00.198-.12c.015-.016.03-.03.046-.03a.129.129 0 00.015-.198c-.046-.06-.122-.075-.183-.03-.015.015-.03.015-.046.03-.046.03-.107.046-.168.06l-.183.046c-.03 0-.061.015-.092.015H8.73a1.519 1.519 0 01-.825-.378 1.452 1.452 0 01-.306-.378 1.655 1.655 0 01-.168-.485c-.015-.09-.015-.166-.015-.257v-.106-.03c0-.046.015-.091.015-.136.061-.364.26-.727.55-1 .077-.075.153-.136.23-.181.076-.06.167-.106.259-.151.092-.046.183-.076.29-.106a.993.993 0 01.306-.046h.321c.107.015.229.03.336.046.214.045.427.12.626.242.397.212.733.56.947.969.107.211.183.423.214.65.015.06.015.121.015.167v.363c0 .06-.015.121-.015.182 0 .06-.015.12-.03.181l-.046.182c-.03.121-.077.242-.123.363a3.183 3.183 0 01-.366.666 3.002 3.002 0 01-1.91 1.18c-.122.016-.26.03-.382.046h-.198c-.061 0-.138 0-.199-.015a3.637 3.637 0 01-.81-.151 4.068 4.068 0 01-.748-.303 4.098 4.098 0 01-1.696-1.695 4.398 4.398 0 01-.29-.742c-.076-.257-.107-.514-.137-.772v-.302-.091c0-.136.015-.258.03-.394s.046-.272.061-.393c.03-.137.061-.258.092-.394a5.33 5.33 0 01.275-.741c.214-.47.504-.893.855-1.226.092-.091.184-.167.275-.243.092-.075.184-.136.29-.211a5.39 5.39 0 01.306-.182c.046-.03.107-.045.153-.076a.26.26 0 01.076-.03.26.26 0 01.077-.03c.107-.046.229-.091.336-.121.03-.015.06-.015.091-.03.03-.016.061-.016.092-.03.061-.016.122-.031.168-.046.03-.015.061-.015.092-.015.03 0 .06-.016.091-.016.03 0 .061-.015.092-.015l.046-.015h.046c.03 0 .06-.015.091-.015.03 0 .061-.015.107-.015.03 0 .077-.015.107-.015h.764c.23.015.443.03.657.075.428.076.84.212 1.207.394.366.182.702.393.977.636l.046.045.046.045c.03.03.061.061.107.091l.092.091.091.09c.123.122.23.258.336.394.199.258.367.515.49.772.014.015.014.03.03.046.015.015.015.03.015.045l.046.09.046.092.045.09c.046.122.092.228.123.333.06.167.107.318.137.455.015.045.061.09.122.075a.104.104 0 00.107-.106c.092-.227.092-.393.077-.575z"/></symbol><symbol id="flight-grafana-color-24" viewBox="0 0 24 24"><path fill="url(#grafana-color-24__paint0_linear_2372_362)" d="M20.979 10.822a6.478 6.478 0 00-.19-1.146 7.21 7.21 0 00-1.46-2.854 4.169 4.169 0 00-.508-.563c.275-1.124-.338-2.097-.338-2.097-1.058-.065-1.713.324-1.967.52a.296.296 0 00-.127-.044c-.17-.065-.36-.152-.55-.195-.19-.065-.38-.108-.571-.173-.19-.043-.402-.086-.614-.13-.042 0-.063 0-.105-.021C14.083 2.627 12.772 2 12.772 2c-1.46.951-1.755 2.292-1.755 2.292s0 .022-.022.086l-.253.065a2.048 2.048 0 01-.339.108c-.106.044-.233.087-.338.13-.212.108-.445.216-.656.324-.212.13-.423.26-.613.39-.022-.022-.043-.022-.043-.022-2.03-.778-3.828.195-3.828.195-.17 2.205.804 3.61 1.015 3.87-.042.13-.085.28-.127.41a11.893 11.893 0 00-.338 1.557c0 .087-.021.152-.021.238C3.55 12.551 3 14.497 3 14.497c1.565 1.838 3.405 1.968 3.405 1.968.233.432.508.822.804 1.21.127.152.254.303.402.455-.571 1.665.085 3.07.085 3.07 1.755.065 2.897-.778 3.13-.973.17.065.36.108.529.151.529.152 1.079.217 1.628.26h.677c.825 1.21 2.264 1.362 2.264 1.362 1.036-1.103 1.078-2.205 1.078-2.443v-.022-.043-.043c.212-.152.423-.325.614-.498a7.61 7.61 0 001.079-1.275c.02-.044.063-.087.084-.13 1.163.065 1.988-.735 1.988-.735-.19-1.233-.888-1.838-1.036-1.968l-.021-.021h-.021s-.022 0-.022-.022c0-.065.022-.151.022-.216 0-.13.02-.26.02-.411V14v-.238-.108-.216l-.02-.108c-.022-.13-.043-.281-.085-.411a5.097 5.097 0 00-.592-1.492 5.468 5.468 0 00-.994-1.21 5.22 5.22 0 00-1.248-.822c-.444-.195-.91-.346-1.375-.39a7.553 7.553 0 00-.698-.043h-.106H14.358c-.127.022-.232.022-.36.043a3.916 3.916 0 00-2.284 1.363 3.709 3.709 0 00-.634 1.08c-.148.39-.233.779-.254 1.168V13.18c.021.194.063.389.106.562.106.367.254.691.465.95.19.282.444.498.698.693.254.173.529.303.804.389.275.087.529.108.783.108H14.02c.042 0 .063 0 .085-.021.02 0 .063-.022.084-.022.064-.022.106-.022.17-.043l.317-.13c.105-.043.19-.108.275-.173.02-.022.042-.043.063-.043a.187.187 0 00.021-.281c-.063-.087-.169-.108-.254-.044-.02.022-.042.022-.063.044-.063.043-.148.064-.233.086l-.253.065c-.043 0-.085.021-.127.021h-.402a2.046 2.046 0 01-.592-.172 2.23 2.23 0 01-.55-.368 2.063 2.063 0 01-.424-.54 2.416 2.416 0 01-.232-.692c-.021-.13-.021-.238-.021-.368v-.151-.044c0-.065.02-.13.02-.194a2.62 2.62 0 01.762-1.427c.106-.108.212-.195.317-.26.106-.086.233-.151.36-.216.127-.065.254-.108.402-.151.127-.043.275-.065.423-.065h.444c.148.021.318.043.466.065.296.065.592.173.867.346.55.302 1.015.8 1.311 1.383.148.303.254.606.296.93.021.087.021.173.021.238v.519c0 .086-.02.173-.02.26 0 .086-.022.172-.043.259l-.064.26a4.585 4.585 0 01-.677 1.47 4.187 4.187 0 01-1.628 1.362c-.317.151-.656.26-1.015.324-.17.022-.36.043-.53.065h-.274c-.085 0-.19 0-.275-.022a4.907 4.907 0 01-1.121-.216c-.36-.108-.72-.26-1.037-.432a5.717 5.717 0 01-1.734-1.47 6.578 6.578 0 01-.613-.952 6.4 6.4 0 01-.402-1.06c-.106-.367-.148-.735-.19-1.102v-.433-.13c0-.194.02-.367.042-.561.02-.195.063-.39.084-.563.043-.194.085-.367.127-.562.106-.367.233-.735.381-1.06a5.635 5.635 0 011.565-2.096c.127-.109.254-.195.402-.303.127-.087.275-.173.423-.26.064-.043.148-.065.212-.108a.353.353 0 01.105-.043c.043-.022.085-.043.106-.043.148-.065.317-.13.466-.173.042-.022.084-.022.126-.043.043-.022.085-.022.127-.044a3.42 3.42 0 00.233-.065c.042-.021.085-.021.127-.021.042 0 .084-.022.127-.022.042 0 .084-.021.127-.021l.063-.022h.064c.042 0 .084-.022.127-.022.042 0 .084-.021.148-.021.042 0 .105-.022.148-.022h1.057c.318.022.614.043.91.108a6.11 6.11 0 011.67.562c.508.26.974.563 1.354.908l.064.065.063.065c.043.043.085.087.148.13l.127.13.127.13c.17.172.317.367.466.562.275.367.507.735.676 1.102.022.022.022.043.043.065.02.022.02.043.02.065l.064.13.064.13.063.13c.064.172.127.323.17.475.084.238.148.454.19.649.021.064.084.13.169.108a.146.146 0 00.148-.152c.127-.324.127-.562.106-.821z"/></symbol><symbol id="flight-grafana-color-16" viewBox="0 0 16 16"><path fill="url(#grafana-color-16__paint0_linear_2372_364)" d="M13.985 7.175a4.408 4.408 0 00-.138-.802 5.035 5.035 0 00-1.054-1.998 2.96 2.96 0 00-.366-.393c.198-.787-.245-1.468-.245-1.468-.764-.046-1.237.227-1.42.363-.031-.015-.062-.03-.092-.03-.122-.046-.26-.106-.397-.137-.138-.045-.275-.075-.413-.12-.137-.031-.29-.061-.443-.092-.03 0-.046 0-.076-.015C9.005 1.44 8.058 1 8.058 1 7.004 1.666 6.79 2.604 6.79 2.604s0 .015-.016.06l-.183.046c-.076.03-.168.06-.244.076-.077.03-.168.06-.245.09-.153.076-.32.152-.473.228-.153.09-.306.181-.443.272-.016-.015-.03-.015-.03-.015-1.467-.545-2.766.136-2.766.136-.122 1.544.58 2.528.733 2.71-.03.09-.06.196-.091.287a8.104 8.104 0 00-.245 1.09c0 .06-.015.106-.015.166C1.397 8.386 1 9.748 1 9.748c1.13 1.287 2.46 1.377 2.46 1.377.167.303.366.575.58.848.092.106.183.212.29.318a3.014 3.014 0 00.061 2.149c1.268.045 2.093-.545 2.261-.681.122.045.26.076.382.106.382.106.78.151 1.176.181h.49c.595.848 1.634.954 1.634.954.748-.772.779-1.544.779-1.71v-.015-.03-.03c.153-.107.305-.228.443-.35a5.37 5.37 0 00.779-.892c.015-.03.046-.06.061-.09.84.045 1.436-.515 1.436-.515-.138-.863-.642-1.287-.749-1.378l-.015-.015h-.015s-.015 0-.015-.015c0-.045.015-.106.015-.151 0-.091.015-.182.015-.288V9.4v-.166-.076-.152l-.015-.075c-.015-.091-.03-.197-.061-.288a3.506 3.506 0 00-.428-1.044 3.856 3.856 0 00-.718-.848 3.784 3.784 0 00-.901-.575 3.347 3.347 0 00-.993-.272c-.168-.015-.336-.03-.504-.03H9.37 9.204c-.092.015-.169.015-.26.03-.336.06-.642.181-.932.348-.275.166-.52.363-.718.605a2.579 2.579 0 00-.459.757 2.63 2.63 0 00-.183.817v.393c.015.137.046.273.077.394.076.258.183.485.336.666.137.197.32.348.504.485.183.12.382.212.58.272.199.06.382.076.565.076h.244c.031 0 .047 0 .062-.015.015 0 .046-.015.061-.015.046-.016.076-.016.122-.03l.23-.092a.869.869 0 00.198-.12c.015-.016.03-.03.046-.03a.129.129 0 00.015-.198c-.046-.06-.122-.075-.183-.03-.015.015-.03.015-.046.03-.046.03-.107.046-.168.06l-.183.046c-.03 0-.061.015-.092.015H8.73a1.519 1.519 0 01-.825-.378 1.452 1.452 0 01-.306-.378 1.655 1.655 0 01-.168-.485c-.015-.09-.015-.166-.015-.257v-.106-.03c0-.046.015-.091.015-.136.061-.364.26-.727.55-1 .077-.075.153-.136.23-.181.076-.06.167-.106.259-.151.092-.046.183-.076.29-.106a.993.993 0 01.306-.046h.321c.107.015.229.03.336.046.214.045.427.12.626.242.397.212.733.56.947.969.107.211.183.423.214.65.015.06.015.121.015.167v.363c0 .06-.015.121-.015.182 0 .06-.015.12-.03.181l-.046.182c-.03.121-.077.242-.123.363a3.183 3.183 0 01-.366.666 3.002 3.002 0 01-1.91 1.18c-.122.016-.26.03-.382.046h-.198c-.061 0-.138 0-.199-.015a3.637 3.637 0 01-.81-.151 4.068 4.068 0 01-.748-.303 4.098 4.098 0 01-1.696-1.695 4.398 4.398 0 01-.29-.742c-.076-.257-.107-.514-.137-.772v-.302-.091c0-.136.015-.258.03-.394s.046-.272.061-.393c.03-.137.061-.258.092-.394a5.33 5.33 0 01.275-.741c.214-.47.504-.893.855-1.226.092-.091.184-.167.275-.243.092-.075.184-.136.29-.211a5.39 5.39 0 01.306-.182c.046-.03.107-.045.153-.076a.26.26 0 01.076-.03.26.26 0 01.077-.03c.107-.046.229-.091.336-.121.03-.015.06-.015.091-.03.03-.016.061-.016.092-.03.061-.016.122-.031.168-.046.03-.015.061-.015.092-.015.03 0 .06-.016.091-.016.03 0 .061-.015.092-.015l.046-.015h.046c.03 0 .06-.015.091-.015.03 0 .061-.015.107-.015.03 0 .077-.015.107-.015h.764c.23.015.443.03.657.075.428.076.84.212 1.207.394.366.182.702.393.977.636l.046.045.046.045c.03.03.061.061.107.091l.092.091.091.09c.123.122.23.258.336.394.199.258.367.515.49.772.014.015.014.03.03.046.015.015.015.03.015.045l.046.09.046.092.045.09c.046.122.092.228.123.333.06.167.107.318.137.455.015.045.061.09.122.075a.104.104 0 00.107-.106c.092-.227.092-.393.077-.575z"/></symbol><symbol id="flight-helm-24" viewBox="0 0 24 24"><g><path d="M7.44 6.825l.021.02c-.07.072-.14.142-.21.211-.153.154-.304.306-.448.462-.282.305-.531.646-.556.742h.39c.304 0 .607 0 .91.002a.19.19 0 00.155-.07c.209-.23.436-.442.68-.634a5.856 5.856 0 013.3-1.273 5.915 5.915 0 014.738 1.909.16.16 0 00.128.068c.284-.002.567-.002.85-.002h.422a.44.44 0 00.067-.012 7.112 7.112 0 00-1.064-1.235l.006-.005.013-.013A4.294 4.294 0 0017.87 5.82c.192-.305.337-.639.428-.988.035-.135.045-.275.031-.414-.018-.188-.123-.346-.374-.317a.69.69 0 00-.147.034 1.512 1.512 0 00-.473.275 4.346 4.346 0 00-1.316 1.87c-.005.016-.013.03-.02.044l-.003.007-.005.01a20.111 20.111 0 01-.23-.134c-.173-.1-.343-.2-.519-.288a7.542 7.542 0 00-.79-.343 7.46 7.46 0 00-.818-.24c-.193-.046-.389-.08-.585-.113l-.261-.046a4.506 4.506 0 00.055-2.117 2.123 2.123 0 00-.21-.587.692.692 0 00-.235-.269.281.281 0 00-.32.002.628.628 0 00-.127.113c-.098.121-.172.259-.22.407a3.363 3.363 0 00-.177.87 4.5 4.5 0 00.106 1.479l.011.055.007.033a7.054 7.054 0 00-3.241.994l-.012-.01c-.006-.005-.009-.007-.01-.01a4.501 4.501 0 00-.884-1.372c-.207-.224-.432-.429-.708-.567a1.092 1.092 0 00-.229-.088c-.252-.06-.424.07-.442.327a.784.784 0 00-.002.035v.022c-.01.2.04.39.107.575.236.662.626 1.223 1.13 1.708l.051.048zM16.822 17.003c.356-.328.678-.692.96-1.087l-.008-.023H17.355c-.286 0-.572.001-.858-.002a.306.306 0 00-.24.098c-1.358 1.326-2.98 1.897-4.864 1.714a5.598 5.598 0 01-1.988-.591 5.878 5.878 0 01-1.576-1.156.189.189 0 00-.149-.065c-.293.002-.586.002-.88.002H6.42a.557.557 0 00-.092.007c.328.461.71.882 1.138 1.253a.15.15 0 01-.014.026 1.463 1.463 0 01-.035.033l-.02.02a4.5 4.5 0 00-1.06 1.51c-.084.181-.142.373-.173.57-.02.141-.03.283.027.42a.285.285 0 00.216.18.483.483 0 00.261-.028c.176-.063.34-.157.482-.278a4.42 4.42 0 001.236-1.657l.013-.03.015-.032.016-.036a7.044 7.044 0 003.239 1l.002.01.002.005c.002.007.003.01.002.014a3.778 3.778 0 00-.13.832c-.022.354-.004.709.055 1.059.045.256.108.507.231.738.043.081.095.157.157.225.155.168.345.167.504.003a.535.535 0 00.094-.12c.062-.112.118-.229.166-.349.101-.29.161-.592.177-.899a4.37 4.37 0 00-.119-1.458l-.011-.055-.006-.031a7.51 7.51 0 001.132-.216 7.265 7.265 0 001.067-.389c.347-.162.682-.349 1-.56l.013.032.017.043c.262.73.718 1.376 1.317 1.869.114.09.237.168.367.232.086.041.177.068.271.08a.288.288 0 00.326-.2.592.592 0 00.03-.148 1.384 1.384 0 00-.088-.577 4.333 4.333 0 00-1.347-1.926l-.075-.062zM16.03 9.91l.102.002c.075.002.15.003.222-.004.12-.01.206.032.293.113.38.35.763.697 1.146 1.044l.002.001.374.34.054.047.03.028.03-.025.057-.05c.524-.476 1.047-.954 1.57-1.431a.218.218 0 01.168-.066c.091.004.182.003.275.002h.12v4.214c-.07.02-.996.024-1.106.003v-2.135l-.022-.01-1.09.994-1.098-.99-.02.008-.001.363V14.135h-1.097c-.02-.07-.03-3.986-.01-4.225zM6.996 9.915h-1.09v1.131l-.001.253v.11c-.119.021-1.277.017-1.355-.006V9.916H3.448v4.21c.093.023 1.024.02 1.106-.004v-1.59h1.351v1.062c0 .18 0 .361.003.542H7c.022-.102.018-4.15-.004-4.22zM8.303 14.135V9.928c.065-.021 2.462-.03 2.618-.008v.896l-.033.003c-.024.002-.05.004-.074.004h-1.4v.698h1.334v.928H9.426c-.022.08-.028.633-.01.786l.032.002a.895.895 0 00.074.005h1.4v.893H8.303zM12.175 9.916c-.02.076-.024 4.107-.004 4.22h2.618v-1.103h-1.407c-.024 0-.049-.002-.076-.004l-.044-.003v-3.11h-1.087z"/></g></symbol><symbol id="flight-helm-16" viewBox="0 0 16 16"><g><path d="M4.807 4.377l.016.015-.147.147a11.93 11.93 0 00-.314.324c-.197.213-.372.452-.389.52h.91a.132.132 0 00.109-.049A4.1 4.1 0 017.778 4a4.14 4.14 0 013.317 1.336.112.112 0 00.089.047l.595-.001h.295a.31.31 0 00.047-.009 4.982 4.982 0 00-.745-.864l.013-.013a3.006 3.006 0 00.72-.823c.135-.213.237-.446.3-.69a.838.838 0 00.022-.29c-.013-.132-.086-.243-.262-.222a.484.484 0 00-.103.023 1.058 1.058 0 00-.33.193 3.043 3.043 0 00-.922 1.31l-.014.03-.006.011c-.054-.03-.108-.062-.16-.093-.122-.07-.24-.14-.364-.202-.18-.09-.364-.17-.553-.24a5.217 5.217 0 00-.982-.247c-.061-.01-.122-.02-.183-.032a3.15 3.15 0 00.038-1.482 1.486 1.486 0 00-.147-.41.484.484 0 00-.163-.19.197.197 0 00-.225.002.44.44 0 00-.089.08.877.877 0 00-.153.284c-.068.197-.11.402-.125.61a3.15 3.15 0 00.083 1.073l.004.023a4.938 4.938 0 00-2.268.696l-.009-.007a.029.029 0 01-.007-.007 3.15 3.15 0 00-.62-.96 1.752 1.752 0 00-.494-.397.765.765 0 00-.16-.062c-.177-.043-.298.049-.31.23l-.001.023v.016c-.007.14.028.272.074.402.166.464.439.856.792 1.196l.035.033zM11.376 11.502c.249-.23.474-.485.67-.76l-.004-.017h-.294c-.2 0-.4.001-.6-.002a.216.216 0 00-.168.069c-.95.928-2.086 1.328-3.405 1.2a3.918 3.918 0 01-1.392-.414 4.113 4.113 0 01-1.103-.809.13.13 0 00-.104-.045l-.616.001h-.267a.383.383 0 00-.064.005c.23.323.497.617.797.877a.105.105 0 01-.01.018l-.025.023-.014.014a3.15 3.15 0 00-.742 1.057 1.552 1.552 0 00-.121.4.555.555 0 00.02.294.199.199 0 00.15.125c.062.01.125.004.183-.02a1.07 1.07 0 00.337-.194c.376-.313.673-.71.865-1.16l.02-.044.011-.024a4.93 4.93 0 002.267.7l.003.01c.002.005.003.008.002.01a2.645 2.645 0 00-.091.582c-.016.248-.003.497.038.741.032.18.076.356.162.517.03.057.067.11.11.158.108.118.241.117.353.002a.375.375 0 00.065-.084c.044-.079.083-.16.117-.244.07-.203.112-.415.124-.63a3.057 3.057 0 00-.092-1.059l-.004-.022c.268-.03.533-.08.793-.15.255-.072.505-.163.747-.273a5.44 5.44 0 00.7-.392l.009.022.011.03c.184.512.503.964.923 1.308.08.064.165.118.257.163.06.029.123.048.19.056a.202.202 0 00.228-.14.418.418 0 00.02-.104.969.969 0 00-.061-.403 3.032 3.032 0 00-.943-1.348l-.052-.044zM10.82 6.537l.072.001c.053.001.105.003.156-.002.084-.008.144.022.205.079.266.245.534.488.802.73l.264.24c.011.01.024.02.037.033l.022.019.02-.018.04-.035 1.1-1.002a.152.152 0 01.117-.046 3.946 3.946 0 00.276.001v2.95a6.801 6.801 0 01-.774.002V7.995l-.015-.007-.763.696-.769-.693-.015.005v1.499h-.768c-.014-.05-.02-2.79-.006-2.958zM4.497 6.54h-.763v1.046a9.595 9.595 0 01-.95-.004v-1.04h-.77v2.947c.064.015.716.014.774-.004V8.373h.946V9.116c0 .126-.001.253.002.38H4.5c.016-.072.013-2.906-.003-2.955zM5.412 9.494V6.55c.045-.014 1.723-.02 1.833-.005v.627l-.015.002h-.008a.578.578 0 01-.052.003h-.98v.489h.934v.65h-.926a3.5 3.5 0 00-.007.55l.023.001c.017.002.034.003.052.003h.979v.625H5.412zM8.123 6.54c-.014.055-.017 2.876-.003 2.955h1.832v-.772h-.985l-.053-.003-.03-.002V6.541h-.761z"/></g></symbol><symbol id="flight-helm-color-24" viewBox="0 0 24 24"><g fill="#0F1689"><path d="M7.44 6.825l.021.02c-.07.072-.14.142-.21.211-.153.154-.304.306-.448.462-.282.305-.531.646-.556.742h.39c.304 0 .607 0 .91.002a.19.19 0 00.155-.07c.209-.23.436-.442.68-.634a5.856 5.856 0 013.3-1.273 5.915 5.915 0 014.738 1.909.16.16 0 00.128.068c.284-.002.567-.002.85-.002h.422a.44.44 0 00.067-.012 7.112 7.112 0 00-1.064-1.235l.006-.005.013-.013A4.294 4.294 0 0017.87 5.82c.192-.305.337-.639.428-.988.035-.135.045-.275.031-.414-.018-.188-.123-.346-.374-.317a.69.69 0 00-.147.034 1.512 1.512 0 00-.473.275 4.346 4.346 0 00-1.316 1.87c-.005.016-.013.03-.02.044l-.003.007-.005.01a20.111 20.111 0 01-.23-.134c-.173-.1-.343-.2-.519-.288a7.542 7.542 0 00-.79-.343 7.46 7.46 0 00-.818-.24c-.193-.046-.389-.08-.585-.113l-.261-.046a4.506 4.506 0 00.055-2.117 2.123 2.123 0 00-.21-.587.692.692 0 00-.235-.269.281.281 0 00-.32.002.628.628 0 00-.127.113c-.098.121-.172.259-.22.407a3.363 3.363 0 00-.177.87 4.5 4.5 0 00.106 1.479l.011.055.007.033a7.054 7.054 0 00-3.241.994l-.012-.01c-.006-.005-.009-.007-.01-.01a4.501 4.501 0 00-.884-1.372c-.207-.224-.432-.429-.708-.567a1.092 1.092 0 00-.229-.088c-.252-.06-.424.07-.442.327a.784.784 0 00-.002.035v.022c-.01.2.04.39.107.575.236.662.626 1.223 1.13 1.708l.051.048zM16.822 17.003c.356-.328.678-.692.96-1.087l-.008-.023H17.355c-.286 0-.572.001-.858-.002a.306.306 0 00-.24.098c-1.358 1.326-2.98 1.897-4.864 1.714a5.598 5.598 0 01-1.988-.591 5.878 5.878 0 01-1.576-1.156.189.189 0 00-.149-.065c-.293.002-.586.002-.88.002H6.42a.557.557 0 00-.092.007c.328.461.71.882 1.138 1.253a.15.15 0 01-.014.026 1.463 1.463 0 01-.035.033l-.02.02a4.5 4.5 0 00-1.06 1.51c-.084.181-.142.373-.173.57-.02.141-.03.283.027.42a.285.285 0 00.216.18.483.483 0 00.261-.028c.176-.063.34-.157.482-.278a4.42 4.42 0 001.236-1.657l.013-.03.015-.032.016-.036a7.044 7.044 0 003.239 1l.002.01.002.005c.002.007.003.01.002.014a3.778 3.778 0 00-.13.832c-.022.354-.004.709.055 1.059.045.256.108.507.231.738.043.081.095.157.157.225.155.168.345.167.504.003a.535.535 0 00.094-.12c.062-.112.118-.229.166-.349.101-.29.161-.592.177-.899a4.37 4.37 0 00-.119-1.458l-.011-.055-.006-.031a7.51 7.51 0 001.132-.216 7.265 7.265 0 001.067-.389c.347-.162.682-.349 1-.56l.013.032.017.043c.262.73.718 1.376 1.317 1.869.114.09.237.168.367.232.086.041.177.068.271.08a.288.288 0 00.326-.2.592.592 0 00.03-.148 1.384 1.384 0 00-.088-.577 4.333 4.333 0 00-1.347-1.926l-.075-.062zM16.03 9.91l.102.002c.075.002.15.003.222-.004.12-.01.206.032.293.113.38.35.763.697 1.146 1.044l.002.001.374.34.054.047.03.028.03-.025.057-.05c.524-.476 1.047-.954 1.57-1.431a.218.218 0 01.168-.066c.091.004.182.003.275.002h.12v4.214c-.07.02-.996.024-1.106.003v-2.135l-.022-.01-1.09.994-1.098-.99-.02.008-.001.363V14.135h-1.097c-.02-.07-.03-3.986-.01-4.225zM6.996 9.915h-1.09v1.131l-.001.253v.11c-.119.021-1.277.017-1.355-.006V9.916H3.448v4.21c.093.023 1.024.02 1.106-.004v-1.59h1.351v1.062c0 .18 0 .361.003.542H7c.022-.102.018-4.15-.004-4.22zM8.303 14.135V9.928c.065-.021 2.462-.03 2.618-.008v.896l-.033.003c-.024.002-.05.004-.074.004h-1.4v.698h1.334v.928H9.426c-.022.08-.028.633-.01.786l.032.002a.895.895 0 00.074.005h1.4v.893H8.303zM12.175 9.916c-.02.076-.024 4.107-.004 4.22h2.618v-1.103h-1.407c-.024 0-.049-.002-.076-.004l-.044-.003v-3.11h-1.087z"/></g></symbol><symbol id="flight-helm-color-16" viewBox="0 0 16 16"><g fill="#0F1689"><path d="M4.807 4.377l.016.015-.147.147a11.93 11.93 0 00-.314.324c-.197.213-.372.452-.389.52h.91a.132.132 0 00.109-.049A4.1 4.1 0 017.778 4a4.14 4.14 0 013.317 1.336.112.112 0 00.089.047l.595-.001h.295a.31.31 0 00.047-.009 4.982 4.982 0 00-.745-.864l.013-.013a3.006 3.006 0 00.72-.823c.135-.213.237-.446.3-.69a.838.838 0 00.022-.29c-.013-.132-.086-.243-.262-.222a.484.484 0 00-.103.023 1.058 1.058 0 00-.33.193 3.043 3.043 0 00-.922 1.31l-.014.03-.006.011c-.054-.03-.108-.062-.16-.093-.122-.07-.24-.14-.364-.202-.18-.09-.364-.17-.553-.24a5.217 5.217 0 00-.982-.247c-.061-.01-.122-.02-.183-.032a3.15 3.15 0 00.038-1.482 1.486 1.486 0 00-.147-.41.484.484 0 00-.163-.19.197.197 0 00-.225.002.44.44 0 00-.089.08.877.877 0 00-.153.284c-.068.197-.11.402-.125.61a3.15 3.15 0 00.083 1.073l.004.023a4.938 4.938 0 00-2.268.696l-.009-.007a.029.029 0 01-.007-.007 3.15 3.15 0 00-.62-.96 1.752 1.752 0 00-.494-.397.765.765 0 00-.16-.062c-.177-.043-.298.049-.31.23l-.001.023v.016c-.007.14.028.272.074.402.166.464.439.856.792 1.196l.035.033zM11.376 11.502c.249-.23.474-.485.67-.76l-.004-.017h-.294c-.2 0-.4.001-.6-.002a.216.216 0 00-.168.069c-.95.928-2.086 1.328-3.405 1.2a3.918 3.918 0 01-1.392-.414 4.113 4.113 0 01-1.103-.809.13.13 0 00-.104-.045l-.616.001h-.267a.383.383 0 00-.064.005c.23.323.497.617.797.877a.105.105 0 01-.01.018l-.025.023-.014.014a3.15 3.15 0 00-.742 1.057 1.552 1.552 0 00-.121.4.555.555 0 00.02.294.199.199 0 00.15.125c.062.01.125.004.183-.02a1.07 1.07 0 00.337-.194c.376-.313.673-.71.865-1.16l.02-.044.011-.024a4.93 4.93 0 002.267.7l.003.01c.002.005.003.008.002.01a2.645 2.645 0 00-.091.582c-.016.248-.003.497.038.741.032.18.076.356.162.517.03.057.067.11.11.158.108.118.241.117.353.002a.375.375 0 00.065-.084c.044-.079.083-.16.117-.244.07-.203.112-.415.124-.63a3.057 3.057 0 00-.092-1.059l-.004-.022c.268-.03.533-.08.793-.15.255-.072.505-.163.747-.273a5.44 5.44 0 00.7-.392l.009.022.011.03c.184.512.503.964.923 1.308.08.064.165.118.257.163.06.029.123.048.19.056a.202.202 0 00.228-.14.418.418 0 00.02-.104.969.969 0 00-.061-.403 3.032 3.032 0 00-.943-1.348l-.052-.044zM10.82 6.537l.072.001c.053.001.105.003.156-.002.084-.008.144.022.205.079.266.245.534.488.802.73l.264.24c.011.01.024.02.037.033l.022.019.02-.018.04-.035 1.1-1.002a.152.152 0 01.117-.046 3.946 3.946 0 00.276.001v2.95a6.801 6.801 0 01-.774.002V7.995l-.015-.007-.763.696-.769-.693-.015.005v1.499h-.768c-.014-.05-.02-2.79-.006-2.958zM4.497 6.54h-.763v1.046a9.595 9.595 0 01-.95-.004v-1.04h-.77v2.947c.064.015.716.014.774-.004V8.373h.946V9.116c0 .126-.001.253.002.38H4.5c.016-.072.013-2.906-.003-2.955zM5.412 9.494V6.55c.045-.014 1.723-.02 1.833-.005v.627l-.015.002h-.008a.578.578 0 01-.052.003h-.98v.489h.934v.65h-.926a3.5 3.5 0 00-.007.55l.023.001c.017.002.034.003.052.003h.979v.625H5.412zM8.123 6.54c-.014.055-.017 2.876-.003 2.955h1.832v-.772h-.985l-.053-.003-.03-.002V6.541h-.761z"/></g></symbol><symbol id="flight-infracost-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M6 2h12a4 4 0 014 4v12a4 4 0 01-4 4H6a4 4 0 01-4-4V6a4 4 0 014-4zm1.5 5.74a.24.24 0 01.24-.24h.3a.24.24 0 01.24.24v2.52a.24.24 0 01-.24.24h-.3a.24.24 0 01-.24-.24V7.74zm1.35-.24a.24.24 0 00-.24.24v2.52c0 .133.107.24.24.24h.3a.24.24 0 00.24-.24V7.74a.24.24 0 00-.24-.24h-.3zm.87.24a.24.24 0 01.24-.24h.3a.24.24 0 01.24.24v2.76h-.54a.24.24 0 01-.24-.24V7.74zm.78 2.76l3-3c1.44 0 3 1.155 3 3 0 1.232-.005 2.678-.01 3.892a729.4 729.4 0 00-.005 2.108H13.5V12c0-.54-.465-1.5-1.485-1.5H10.5zm0 0v5.76a.24.24 0 01-.24.24h-.3a.24.24 0 01-.24-.24v-4.781c0-.127.05-.25.14-.34l.64-.639zm-3 3.199c0-.127.05-.25.14-.34l.538-.537a.06.06 0 01.102.043v3.395a.24.24 0 01-.24.24h-.3a.24.24 0 01-.24-.24v-2.561zm1.11-1.11c0-.128.05-.25.14-.34l.537-.537a.06.06 0 01.103.043v4.505a.24.24 0 01-.24.24h-.3a.24.24 0 01-.24-.24v-3.671z" clip-rule="evenodd"/></symbol><symbol id="flight-infracost-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3.8 1h8.4A2.8 2.8 0 0115 3.8v8.4a2.8 2.8 0 01-2.8 2.8H3.8A2.8 2.8 0 011 12.2V3.8A2.8 2.8 0 013.8 1zm1.05 4.018c0-.093.075-.168.168-.168h.21c.093 0 .168.075.168.168v1.764a.168.168 0 01-.168.168h-.21a.168.168 0 01-.168-.168V5.018zm.945-.168a.168.168 0 00-.168.168v1.764c0 .093.075.168.168.168h.21a.168.168 0 00.168-.168V5.018a.168.168 0 00-.168-.168h-.21zm.61.168c0-.093.074-.168.167-.168h.21c.093 0 .168.075.168.168V6.95h-.378a.168.168 0 01-.168-.168V5.018zM6.95 6.95l2.1-2.1c1.008 0 2.1.808 2.1 2.1 0 .862-.004 1.873-.007 2.724a500.5 500.5 0 00-.004 1.476H9.05V8c0-.378-.326-1.05-1.04-1.05H6.95zm0 0v4.032a.168.168 0 01-.168.168h-.21a.168.168 0 01-.168-.168V7.635c0-.089.036-.174.099-.237l.447-.448zm-2.1 2.24c0-.09.036-.175.099-.238l.375-.376a.042.042 0 01.072.03v2.376a.168.168 0 01-.168.168h-.21a.168.168 0 01-.168-.168V9.189zm.777-.778c0-.089.035-.174.098-.237l.376-.376a.042.042 0 01.072.03v3.153a.168.168 0 01-.168.168h-.21a.168.168 0 01-.168-.168v-2.57z" clip-rule="evenodd"/></symbol><symbol id="flight-infracost-color-24" viewBox="0 0 24 24"><path fill="url(#infracost-color-24__paint0_linear_2372_391)" d="M18 2H6a4 4 0 00-4 4v12a4 4 0 004 4h12a4 4 0 004-4V6a4 4 0 00-4-4z"/><path fill="#fff" d="M13.5 7.5l-3 3h1.515c1.02 0 1.485.96 1.485 1.5v4.5h2.985c0-1.115.015-3.876.015-6 0-1.845-1.56-3-3-3z"/><path fill="#fff" fill-rule="evenodd" d="M7.5 7.74a.24.24 0 01.24-.24h.3a.24.24 0 01.24.24v2.52a.24.24 0 01-.24.24h-.3a.24.24 0 01-.24-.24V7.74zm1.35-.24a.24.24 0 00-.24.24v2.52c0 .133.107.24.24.24h.3a.24.24 0 00.24-.24V7.74a.24.24 0 00-.24-.24h-.3zm1.11 0a.24.24 0 00-.24.24v2.52c0 .133.107.24.24.24h.54V7.74a.24.24 0 00-.24-.24h-.3zm-2.32 5.86a.48.48 0 00-.14.339v2.561c0 .132.107.24.24.24h.3a.24.24 0 00.24-.24v-3.395a.06.06 0 00-.102-.043l-.537.537zm.97-.771c0-.128.05-.25.14-.34l.537-.537a.06.06 0 01.103.043v4.505a.24.24 0 01-.24.24h-.3a.24.24 0 01-.24-.24v-3.671zm1.25-1.45a.48.48 0 00-.14.34v4.781c0 .132.107.24.24.24h.3a.24.24 0 00.24-.24V10.5l-.64.64z" clip-rule="evenodd"/></symbol><symbol id="flight-infracost-color-16" viewBox="0 0 16 16"><path fill="url(#infracost-color-16__paint0_linear_2372_396)" d="M12.2 1H3.8A2.8 2.8 0 001 3.8v8.4A2.8 2.8 0 003.8 15h8.4a2.8 2.8 0 002.8-2.8V3.8A2.8 2.8 0 0012.2 1z"/><path fill="#fff" d="M9.05 4.85l-2.1 2.1h1.06c.714 0 1.04.672 1.04 1.05v3.15h2.09c0-.78.01-2.713.01-4.2 0-1.292-1.092-2.1-2.1-2.1z"/><path fill="#fff" fill-rule="evenodd" d="M4.85 5.018c0-.093.075-.168.168-.168h.21c.093 0 .168.075.168.168v1.764a.168.168 0 01-.168.168h-.21a.168.168 0 01-.168-.168V5.018zm.945-.168a.168.168 0 00-.168.168v1.764c0 .093.075.168.168.168h.21a.168.168 0 00.168-.168V5.018a.168.168 0 00-.168-.168h-.21zm.777 0a.168.168 0 00-.168.168v1.764c0 .093.075.168.168.168h.378V5.018a.168.168 0 00-.168-.168h-.21zM4.95 8.952a.336.336 0 00-.099.237v1.793c0 .093.075.168.168.168h.21a.168.168 0 00.168-.168V8.605a.042.042 0 00-.072-.03l-.375.377zm.678-.54c0-.089.035-.174.098-.237l.376-.376a.042.042 0 01.072.03v3.153a.168.168 0 01-.168.168h-.21a.168.168 0 01-.168-.168v-2.57zm.876-1.014a.336.336 0 00-.099.237v3.347c0 .093.075.168.168.168h.21a.168.168 0 00.168-.168V6.95l-.447.448z" clip-rule="evenodd"/></symbol><symbol id="flight-kubernetes-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M8.249 22c-.48 0-.943-.22-1.249-.616l-4.648-5.96a1.644 1.644 0 01-.306-1.397L3.71 6.59c.106-.493.426-.89.865-1.11l6.736-3.315c.213-.11.452-.164.692-.164.24 0 .479.055.692.164l6.736 3.302c.439.219.758.616.865 1.11l1.664 7.438c.106.493 0 1-.306 1.397L17 21.38c-.306.384-.77.62-1.25.62H8.249zm11.025-8.335l.045.01a.439.439 0 01.294.695.437.437 0 01-.488.155l-.007-.001-.004-.002a6.82 6.82 0 00-1.703-.342 5.673 5.673 0 01-2.52 3.16c.021.06.046.12.074.176a.342.342 0 00-.034.257c.106.243.236.474.388.692.084.111.162.227.234.347l.04.082.017.036a.438.438 0 01-.695.526.439.439 0 01-.095-.154l-.015-.03-.04-.082a3.632 3.632 0 01-.126-.399 4.058 4.058 0 00-.3-.733.345.345 0 00-.223-.135l-.043-.076-.05-.092a5.67 5.67 0 01-4.034-.01l-.099.179a.356.356 0 00-.188.091 3.044 3.044 0 00-.339.783 3.594 3.594 0 01-.126.4 1.764 1.764 0 01-.054.11v.002a.436.436 0 01-.425.29.442.442 0 01-.409-.311.436.436 0 01.044-.352l.02-.043a1.69 1.69 0 01.036-.074c.072-.121.15-.237.235-.349.154-.223.286-.46.395-.709a.431.431 0 00-.039-.246l.08-.19a5.674 5.674 0 01-2.52-3.138l-.191.033a.486.486 0 00-.251-.088 4.1 4.1 0 00-.762.223 3.704 3.704 0 01-.392.15l-.071.016a3.181 3.181 0 00-.042.01h-.005l-.004.002h-.006a.44.44 0 01-.568-.498.437.437 0 01.374-.35l.006-.002.004-.001.008-.002c.035-.009.077-.02.108-.025.14-.02.28-.03.42-.034a4.09 4.09 0 00.783-.128.603.603 0 00.188-.19l.183-.052a5.626 5.626 0 01.892-3.931l-.14-.125a.483.483 0 00-.088-.251 4.077 4.077 0 00-.65-.456 3.653 3.653 0 01-.363-.211 1.616 1.616 0 01-.09-.073L5.936 8.2a.462.462 0 01-.107-.642.42.42 0 01.348-.154.522.522 0 01.336.139l.066.053c.102.096.198.198.288.305.178.195.376.373.589.53.08.042.173.051.26.026.051.037.104.075.157.111A5.626 5.626 0 0111.52 6.82l.01-.184a.475.475 0 00.142-.225c.01-.265-.007-.53-.049-.79a3.644 3.644 0 01-.06-.415l.001-.076v-.036-.005-.007a.437.437 0 01.615-.444.44.44 0 01.259.444v.046c.001.027.002.056 0 .078-.011.139-.031.277-.059.414a4.063 4.063 0 00-.05.79.345.345 0 00.143.218v.011l.01.184a5.734 5.734 0 013.629 1.748l.166-.119c.09.016.181.006.265-.028.213-.158.41-.336.59-.532.09-.107.186-.209.288-.305l.073-.058.024-.019a.44.44 0 11.544.682l-.035.028-.061.05a3.638 3.638 0 01-.363.21c-.231.13-.449.283-.65.456a.344.344 0 00-.082.247 7.827 7.827 0 01-.155.138 5.65 5.65 0 01.91 3.922l.177.051a.49.49 0 00.188.19c.257.068.52.11.784.128.14.003.28.014.419.034.023.004.054.011.082.018zm-4.108-4.428l-1.867 1.32-.007-.003a.386.386 0 01-.612-.293l-.002-.001-.13-2.282a4.546 4.546 0 012.618 1.259zm-3.518 2.501h.703l.437.545-.157.68-.631.303-.633-.304-.157-.68.438-.544zm-.661-3.68a4.64 4.64 0 01.466-.08l-.13 2.285-.01.005a.383.383 0 01-.419.366.387.387 0 01-.192-.072l-.004.003-1.88-1.33a4.505 4.505 0 012.169-1.177zm-2.85 2.032l1.716 1.53-.002.01a.384.384 0 01-.151.66l-.002.007-2.2.633c-.11-.991.115-1.99.639-2.84zm2.298 4.066l-.874 2.106a4.514 4.514 0 01-1.816-2.266L10 13.614l.003.005a.376.376 0 01.257.04.385.385 0 01.167.488l.007.009zm2.58 2.708a4.531 4.531 0 01-2.466-.126l1.11-2h.001a.385.385 0 01.679 0h.008l1.113 2.003c-.145.048-.293.089-.445.123zm1.433-.594l-.883-2.127.003-.004a.384.384 0 01.423-.53l.004-.004 2.275.383a4.497 4.497 0 01-1.822 2.282zm2.061-3.347l-2.21-.635-.003-.01a.386.386 0 01-.264-.489.386.386 0 01.113-.17v-.005l1.706-1.523a4.56 4.56 0 01.658 2.832z" clip-rule="evenodd"/></symbol><symbol id="flight-kubernetes-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M5.374 15c-.335 0-.66-.153-.874-.431l-3.254-4.172a1.15 1.15 0 01-.214-.978l1.165-5.207c.074-.345.298-.623.605-.776l4.715-2.32c.15-.078.317-.116.485-.116.168 0 .335.038.485.115L13.2 3.426c.308.153.532.432.606.777l1.165 5.207c.074.345 0 .7-.214.978L11.5 14.566c-.214.268-.54.434-.875.434h-5.25zm7.718-5.835l.031.008a.308.308 0 01.26.371.306.306 0 01-.396.223h-.004l-.003-.001-.003-.001-.03-.007-.05-.01a2.548 2.548 0 01-.274-.106 2.87 2.87 0 00-.533-.156.242.242 0 00-.171.063 4.76 4.76 0 00-.131-.023 3.972 3.972 0 01-1.764 2.212c.015.042.032.083.051.123a.239.239 0 00-.023.18c.074.17.165.332.271.484.06.078.114.16.164.244l.028.057.012.025a.306.306 0 01-.381.44.307.307 0 01-.172-.18 2.608 2.608 0 00-.01-.02l-.028-.058a2.545 2.545 0 01-.089-.28 2.835 2.835 0 00-.21-.512.242.242 0 00-.156-.095 5.926 5.926 0 01-.03-.053l-.035-.064a3.97 3.97 0 01-2.824-.007l-.069.125a.249.249 0 00-.132.064c-.104.17-.184.355-.237.548a2.525 2.525 0 01-.088.28l-.025.05-.013.027v.001a.307.307 0 11-.553-.261l.014-.03.026-.052c.05-.085.104-.166.164-.244.108-.156.2-.322.277-.496a.302.302 0 00-.028-.173l.056-.133A3.972 3.972 0 014.22 9.532l-.134.023a.34.34 0 00-.176-.062 2.872 2.872 0 00-.533.156c-.09.04-.181.075-.274.105l-.05.011-.03.007H3.02l-.002.002h-.005a.308.308 0 01-.397-.349.306.306 0 01.261-.245l.004-.001h.003l.006-.002c.024-.006.054-.014.076-.018.097-.013.195-.021.293-.023.186-.013.37-.043.549-.09a.422.422 0 00.131-.133l.128-.037a3.938 3.938 0 01.624-2.752l-.097-.087a.338.338 0 00-.062-.176 2.854 2.854 0 00-.455-.319 2.557 2.557 0 01-.254-.148 1.129 1.129 0 01-.063-.05l-.004-.004a.323.323 0 01-.076-.45.295.295 0 01.244-.107.365.365 0 01.213.08l.022.017c.016.013.034.026.046.037.071.067.139.139.202.213.125.137.263.262.412.372.056.03.121.036.182.018l.11.078a3.938 3.938 0 012.552-1.224l.007-.129a.332.332 0 00.1-.157 2.844 2.844 0 00-.034-.554 2.555 2.555 0 01-.042-.29v-.053-.025-.004-.004A.306.306 0 018 2.82a.308.308 0 01.306.337v.087a2.53 2.53 0 01-.041.29 2.85 2.85 0 00-.035.553.242.242 0 00.1.153v.007l.007.13c.967.087 1.87.522 2.54 1.223l.116-.083a.34.34 0 00.186-.02c.149-.11.287-.235.412-.373a2.53 2.53 0 01.202-.213l.051-.04.017-.014a.308.308 0 01.472.388.307.307 0 01-.09.09c-.008.005-.017.012-.025.02l-.043.033a2.549 2.549 0 01-.254.148 2.865 2.865 0 00-.455.32.24.24 0 00-.058.172 4.458 4.458 0 01-.05.044l-.058.053c.542.806.769 1.783.637 2.745l.123.036c.031.056.077.101.132.132.18.048.364.078.55.09.097.003.195.01.292.024l.058.013zm-2.875-3.1l-1.308.925-.004-.002a.27.27 0 01-.43-.205v-.001l-.091-1.598a3.183 3.183 0 011.833.882zM7.754 7.818h.492l.306.381-.11.476L8 8.886l-.443-.213-.11-.475.307-.381zM7.29 5.24c.107-.024.216-.043.326-.056l-.09 1.6-.008.004a.268.268 0 01-.293.256.27.27 0 01-.135-.05l-.002.001-1.316-.93c.419-.41.945-.696 1.518-.825zM5.296 6.663l1.201 1.071-.001.007a.269.269 0 01-.106.462l-.001.005-1.54.443a3.134 3.134 0 01.447-1.988zm1.608 2.846l-.612 1.474a3.16 3.16 0 01-1.27-1.586L6.6 9.13l.003.003a.265.265 0 01.18.029.27.27 0 01.117.341l.004.006zm1.806 1.896c-.572.13-1.17.1-1.726-.088l.777-1.4h.001a.27.27 0 01.475-.001h.006l.779 1.402a3.286 3.286 0 01-.312.087zm1.004-.416L9.096 9.5l.001-.003a.269.269 0 01.296-.37l.003-.004 1.593.269a3.147 3.147 0 01-1.275 1.597zm1.442-2.343L9.61 8.201l-.002-.006a.27.27 0 01-.185-.343.27.27 0 01.08-.12L9.5 7.73l1.195-1.067c.366.594.527 1.29.46 1.983z" clip-rule="evenodd"/></symbol><symbol id="flight-kubernetes-color-24" viewBox="0 0 24 24"><path fill="#326DE6" d="M7 21.384c.306.397.77.616 1.249.616h7.501c.48 0 .944-.236 1.25-.62l4.654-5.969a1.69 1.69 0 00.306-1.397l-1.664-7.439a1.612 1.612 0 00-.865-1.11l-6.736-3.3A1.517 1.517 0 0012.003 2c-.24 0-.48.055-.692.164L4.575 5.48c-.44.22-.759.617-.865 1.11l-1.664 7.438c-.12.494 0 1 .306 1.398L7 21.384z"/><path fill="#fff" fill-rule="evenodd" d="M18.773 13.612c.14.003.28.014.419.033a1.424 1.424 0 01.127.03.439.439 0 01.294.695.437.437 0 01-.488.155l-.007-.001-.004-.002-.004-.001-.043-.01-.07-.014a3.664 3.664 0 01-.392-.151 4.094 4.094 0 00-.762-.224.346.346 0 00-.245.09 6.82 6.82 0 00-.187-.032 5.674 5.674 0 01-2.52 3.16c.021.06.046.119.074.176a.342.342 0 00-.034.257c.106.243.236.474.388.692.084.111.162.227.234.347l.04.082.017.036a.437.437 0 01-.545.629.44.44 0 01-.245-.257l-.015-.03-.04-.082a3.625 3.625 0 01-.126-.4 4.058 4.058 0 00-.3-.732.346.346 0 00-.223-.135l-.043-.076-.05-.092c-1.3.491-2.736.488-4.034-.01l-.099.179a.356.356 0 00-.188.091 3.044 3.044 0 00-.339.783 3.6 3.6 0 01-.126.4l-.035.073-.019.037v.002a.437.437 0 01-.602.248.439.439 0 01-.188-.621l.02-.043.036-.075c.072-.12.15-.236.235-.348.154-.223.286-.46.395-.709a.432.432 0 00-.039-.246l.08-.19a5.674 5.674 0 01-2.52-3.138l-.191.033a.485.485 0 00-.251-.088c-.261.05-.516.124-.762.223a3.683 3.683 0 01-.392.15l-.071.016c-.015.003-.03.006-.042.01h-.005l-.004.002h-.006a.44.44 0 01-.568-.498.437.437 0 01.374-.35l.006-.002.004-.001.008-.002c.035-.009.077-.02.108-.025.14-.02.28-.03.42-.034.264-.017.527-.06.783-.129a.603.603 0 00.188-.188l.183-.053a5.626 5.626 0 01.892-3.931l-.14-.125a.483.483 0 00-.088-.251 4.077 4.077 0 00-.65-.456 3.655 3.655 0 01-.363-.212 1.61 1.61 0 01-.069-.055l-.02-.017-.008-.005a.462.462 0 01-.107-.642.42.42 0 01.348-.154.522.522 0 01.305.115l.03.024.067.053c.102.096.198.198.288.305.178.195.376.373.589.53.08.042.173.051.26.026.051.037.104.075.157.111A5.626 5.626 0 0111.52 6.82l.01-.184a.474.474 0 00.142-.225c.01-.265-.007-.53-.049-.79a3.644 3.644 0 01-.06-.415l.001-.076V5.089v-.007a.437.437 0 01.615-.444.44.44 0 01.259.444v.046c.001.027.002.056 0 .078-.011.139-.031.277-.059.414a4.063 4.063 0 00-.05.79.345.345 0 00.143.218v.011l.01.184A5.734 5.734 0 0116.11 8.57l.166-.119c.09.016.181.006.265-.028.213-.158.41-.336.59-.532.09-.107.186-.209.288-.305l.073-.058.024-.019a.44.44 0 11.544.682l-.035.028-.061.05a3.634 3.634 0 01-.363.21c-.231.13-.449.283-.65.456a.344.344 0 00-.082.247 8.03 8.03 0 01-.155.138 5.65 5.65 0 01.91 3.922l.177.051a.49.49 0 00.188.19c.257.068.52.11.784.128zm-7.786-5.554a4.64 4.64 0 01.466-.08l-.13 2.285-.01.005a.383.383 0 01-.419.366.386.386 0 01-.192-.072l-.004.003-1.88-1.33a4.505 4.505 0 012.169-1.177zm2.312 2.5l1.867-1.321a4.546 4.546 0 00-2.618-1.26l.13 2.283h.002a.383.383 0 00.42.366.386.386 0 00.192-.072l.007.003zm3.21 2.365l-2.21-.635-.003-.01a.386.386 0 01-.264-.489.385.385 0 01.113-.17v-.005l1.706-1.523a4.56 4.56 0 01.658 2.832zm-2.944 1.22l.883 2.127a4.497 4.497 0 001.822-2.282l-2.275-.383-.004.004a.37.37 0 00-.236.032.385.385 0 00-.187.498l-.003.004zm-.55 2.721a4.531 4.531 0 01-2.466-.126l1.11-2h.001a.386.386 0 01.679-.001h.008l1.113 2.004c-.145.048-.293.089-.445.123zm-3.454-.602l.874-2.106-.007-.009a.383.383 0 00-.424-.528l-.003-.005-2.256.382c.338.934.977 1.73 1.816 2.266zM8.137 10.09l1.716 1.53-.002.01a.384.384 0 01-.151.66l-.002.007-2.2.633c-.11-.991.115-1.99.639-2.84zm4.214 1.648h-.703l-.438.544.157.68.633.303.631-.302.157-.68-.437-.545z" clip-rule="evenodd"/></symbol><symbol id="flight-kubernetes-color-16" viewBox="0 0 16 16"><path fill="#326DE6" d="M4.5 14.569c.214.278.539.431.874.431h5.251c.335 0 .66-.165.875-.434l3.258-4.178c.214-.278.288-.633.214-.978l-1.165-5.207a1.128 1.128 0 00-.606-.777l-4.714-2.31A1.062 1.062 0 008.002 1c-.168 0-.335.038-.485.115l-4.715 2.32a1.129 1.129 0 00-.605.777L1.032 9.42c-.084.345 0 .7.214.978L4.5 14.568z"/><path fill="#fff" fill-rule="evenodd" d="M12.741 9.128c.098.002.196.01.293.024l.058.013.031.008a.308.308 0 01.26.371.306.306 0 01-.396.223h-.004l-.003-.001-.003-.002a1.58 1.58 0 00-.03-.006l-.05-.01a2.55 2.55 0 01-.274-.106 2.867 2.867 0 00-.533-.157.242.242 0 00-.171.064 4.656 4.656 0 00-.131-.023 3.971 3.971 0 01-1.764 2.212c.015.042.032.083.051.123a.239.239 0 00-.023.18c.074.17.165.332.271.484.06.078.114.16.164.244l.028.057.012.025a.306.306 0 01-.381.44.308.308 0 01-.172-.18l-.01-.02a1.57 1.57 0 01-.028-.058 2.546 2.546 0 01-.089-.28 2.837 2.837 0 00-.21-.512.242.242 0 00-.156-.095l-.03-.053-.035-.064a3.97 3.97 0 01-2.823-.007l-.07.125a.25.25 0 00-.132.064 2.13 2.13 0 00-.237.548 2.518 2.518 0 01-.088.28 1.196 1.196 0 01-.025.05l-.013.027v.001a.306.306 0 01-.421.173.308.308 0 01-.173-.314.306.306 0 01.041-.12l.014-.03.026-.052c.05-.085.104-.166.164-.244.108-.156.2-.322.277-.496a.302.302 0 00-.028-.173l.056-.133A3.972 3.972 0 014.22 9.532l-.134.023a.34.34 0 00-.176-.062 2.871 2.871 0 00-.533.156c-.09.04-.181.075-.274.105a1.017 1.017 0 01-.05.011l-.03.007H3.02l-.002.002h-.005a.308.308 0 01-.397-.349.306.306 0 01.261-.245l.005-.001h.002l.006-.002c.024-.006.054-.014.076-.018.097-.013.195-.021.293-.023.186-.013.37-.043.549-.09a.422.422 0 00.131-.133l.128-.037a3.938 3.938 0 01.625-2.752l-.098-.087a.338.338 0 00-.062-.176 2.854 2.854 0 00-.455-.319 2.557 2.557 0 01-.254-.148l-.048-.038-.015-.013-.004-.003a.323.323 0 01-.076-.45.295.295 0 01.244-.107.365.365 0 01.213.08l.022.017c.016.013.034.026.046.037.072.067.139.139.202.213.125.137.263.262.412.372.056.03.121.036.182.018l.11.078a3.938 3.938 0 012.552-1.224l.008-.129a.332.332 0 00.099-.158 2.844 2.844 0 00-.034-.553 2.56 2.56 0 01-.042-.29v-.082-.005A.306.306 0 018 2.82a.308.308 0 01.306.337v.087a2.529 2.529 0 01-.041.29 2.85 2.85 0 00-.035.553.242.242 0 00.1.153v.007l.007.129c.967.088 1.87.522 2.54 1.223l.116-.082a.34.34 0 00.186-.02c.149-.11.287-.236.412-.373.063-.075.13-.146.202-.213l.051-.04.017-.014a.307.307 0 11.381.477l-.024.02c-.015.012-.03.025-.043.034a2.537 2.537 0 01-.254.148 2.87 2.87 0 00-.455.32.241.241 0 00-.058.172l-.05.044-.058.053c.542.806.77 1.783.637 2.745l.123.036c.031.055.077.101.133.132.179.048.363.078.548.09zM7.291 5.24c.107-.024.216-.043.326-.056l-.09 1.6-.008.004a.268.268 0 01-.293.256.27.27 0 01-.135-.05l-.002.001-1.316-.93c.419-.41.945-.696 1.518-.825zm1.618 1.75l1.308-.924a3.182 3.182 0 00-1.833-.882l.09 1.598h.002a.268.268 0 00.294.256.27.27 0 00.135-.05l.004.002zm2.248 1.656L9.609 8.2l-.002-.006a.27.27 0 01-.185-.343.27.27 0 01.08-.12L9.5 7.73l1.195-1.067c.366.594.527 1.29.46 1.983zM9.096 9.5l.618 1.49a3.148 3.148 0 001.275-1.598l-1.593-.269-.002.003a.26.26 0 00-.166.023.27.27 0 00-.13.348l-.002.003zm-.385 1.905c-.573.13-1.17.1-1.727-.088l.777-1.4h.001a.27.27 0 01.475-.001h.006l.779 1.402a3.286 3.286 0 01-.311.087zm-2.418-.422l.611-1.474-.004-.006a.268.268 0 00-.297-.37L6.6 9.13l-1.579.267a3.16 3.16 0 001.272 1.586zm-.997-4.32l1.201 1.071-.001.007a.269.269 0 01-.106.462l-.001.005-1.54.443a3.134 3.134 0 01.447-1.988zm2.95 1.154h-.492l-.307.38.11.476.443.213.442-.212.11-.476-.306-.381z" clip-rule="evenodd"/></symbol><symbol id="flight-lightlytics-24" viewBox="0 0 24 24"><path d="M12 2h8.082l-5.686 8.237H22L13.915 22H5.832l3.263-4.515.509-.72H2L12 2z"/></symbol><symbol id="flight-lightlytics-16" viewBox="0 0 16 16"><path d="M8 1h5.658l-3.98 5.766H15L9.34 15H3.683l2.284-3.16.357-.504H1L8 1z"/></symbol><symbol id="flight-lightlytics-color-24" viewBox="0 0 24 24"><path fill="#7B00F4" d="M5.832 22h8.083L22 10.237h-7.666L5.832 22z"/><path fill="#B627FF" d="M12 2h8.082l-5.686 8.237H22l-4.49 6.528H2L12 2z"/><path fill="#000" d="M8.107 18.883l9.07-2.118H9.604l-1.497 2.118z" opacity=".4"/></symbol><symbol id="flight-lightlytics-color-16" viewBox="0 0 16 16"><path fill="#7B00F4" d="M3.682 15h5.659L15 6.766H9.634L3.682 15z"/><path fill="#B627FF" d="M8 1h5.658l-3.98 5.766H15l-3.143 4.57H1L8 1z"/><path fill="#000" d="M5.275 12.818l6.35-1.482H6.322l-1.048 1.482z"/></symbol><symbol id="flight-linkedin-24" viewBox="0 0 24 24"><path d="M19.041 19.041h-2.963v-4.64c0-1.107-.02-2.532-1.541-2.532-1.544 0-1.78 1.206-1.78 2.45v4.722H9.794V9.497h2.844v1.305h.04a3.121 3.121 0 012.807-1.542c3.004 0 3.558 1.976 3.558 4.546l-.002 5.235zM6.45 8.193c-.944 0-1.72-.776-1.72-1.72 0-.943.776-1.72 1.72-1.72.943 0 1.719.777 1.72 1.72 0 .943-.777 1.72-1.72 1.72zM7.93 19.04H4.965V9.497h2.966v9.544zM20.52 2.001H3.476A1.466 1.466 0 002 3.444v17.114c.01.8.675 1.451 1.476 1.443h17.043A1.47 1.47 0 0022 20.557V3.442A1.469 1.469 0 0020.519 2v.002z"/></symbol><symbol id="flight-linkedin-16" viewBox="0 0 16 16"><path d="M12.225 12.225h-1.778V9.44c0-.664-.012-1.519-.925-1.519-.926 0-1.068.724-1.068 1.47v2.834H6.676V6.498h1.707v.783h.024c.348-.594.996-.95 1.684-.925 1.802 0 2.135 1.185 2.135 2.728l-.001 3.14zM4.67 5.715a1.037 1.037 0 01-1.032-1.031c0-.566.466-1.032 1.032-1.032.566 0 1.031.466 1.032 1.032 0 .566-.466 1.032-1.032 1.032zm.889 6.51h-1.78V6.498h1.78v5.727zM13.11 2H2.885A.88.88 0 002 2.866v10.268a.88.88 0 00.885.866h10.226a.882.882 0 00.889-.866V2.865a.88.88 0 00-.889-.864z"/></symbol><symbol id="flight-linkedin-color-24" viewBox="0 0 24 24"><path fill="#0A66C2" d="M19.041 19.041h-2.963v-4.64c0-1.107-.02-2.532-1.541-2.532-1.544 0-1.78 1.206-1.78 2.45v4.722H9.794V9.497h2.844v1.305h.04a3.121 3.121 0 012.807-1.542c3.004 0 3.558 1.976 3.558 4.546l-.002 5.235zM6.45 8.193c-.944 0-1.72-.776-1.72-1.72 0-.943.776-1.72 1.72-1.72.943 0 1.719.777 1.72 1.72 0 .943-.777 1.72-1.72 1.72zM7.93 19.04H4.965V9.497h2.966v9.544zM20.52 2.001H3.476A1.466 1.466 0 002 3.444v17.114c.01.8.675 1.451 1.476 1.443h17.043A1.47 1.47 0 0022 20.557V3.442A1.469 1.469 0 0020.519 2v.002z"/></symbol><symbol id="flight-linkedin-color-16" viewBox="0 0 16 16"><path fill="#0A66C2" d="M12.225 12.225h-1.778V9.44c0-.664-.012-1.519-.925-1.519-.926 0-1.068.724-1.068 1.47v2.834H6.676V6.498h1.707v.783h.024c.348-.594.996-.95 1.684-.925 1.802 0 2.135 1.185 2.135 2.728l-.001 3.14zM4.67 5.715a1.037 1.037 0 01-1.032-1.031c0-.566.466-1.032 1.032-1.032.566 0 1.031.466 1.032 1.032 0 .566-.466 1.032-1.032 1.032zm.889 6.51h-1.78V6.498h1.78v5.727zM13.11 2H2.885A.88.88 0 002 2.866v10.268a.88.88 0 00.885.866h10.226a.882.882 0 00.889-.866V2.865a.88.88 0 00-.889-.864z"/></symbol><symbol id="flight-linode-24" viewBox="0 0 24 24"><path d="M20 10.853l-2.657-1.531-2.242 1.426-.028 1.459-1.092-.749-1.482.942-.065-1.594-1.527-1.065 1.458-.787c-.01 0 0 .154-.215-5.222L8.699 2 4 3.522l1.049 5.266 1.577 1.278-1.2.588.785 3.97 1.1 1.077-.787.5.612 3.069L9.608 22c.012-.015.26-.215 3.175-2.635l-.085-2.085 1.252 1.108c.018-.019.269-.212 2.563-2.113l.088-1.542.945.684c.017-.018.232-.19 2.084-1.723l.37-2.84z"/></symbol><symbol id="flight-linode-16" viewBox="0 0 16 16"><path d="M14 7.197l-1.993-1.072-1.682.998-.02 1.022-.819-.524-1.112.66-.049-1.117-1.145-.745 1.094-.55c-.008 0 0 .106-.162-3.656L5.524 1 2 2.066l.787 3.686 1.183.894-.9.412.588 2.778.826.755-.59.35.458 2.148L6.206 15c.009-.01.195-.15 2.381-1.845l-.064-1.459.94.776c.013-.014.2-.149 1.921-1.48l.067-1.079.709.479c.012-.013.173-.133 1.562-1.206L14 7.197z"/></symbol><symbol id="flight-linode-color-24" viewBox="0 0 24 24"><path fill="#231F20" d="M20 10.853l-2.657-1.531-2.242 1.426-.028 1.459-1.092-.749-1.482.942-.065-1.594-1.527-1.065 1.458-.787c-.01 0 0 .154-.215-5.222L8.699 2 4 3.522l1.049 5.266 1.577 1.278-1.2.588.785 3.97 1.1 1.077-.787.5.612 3.069L9.608 22c.012-.015.26-.215 3.175-2.635l-.085-2.085 1.252 1.108c.018-.019.269-.212 2.563-2.113l.088-1.542.945.684c.017-.018.232-.19 2.084-1.723l.37-2.84z"/><path fill="#000" d="M17.795 12.494L20 10.854l-2.657-1.532-2.242 1.426 2.694 1.746z"/><path fill="#004B16" d="M17.551 15.415l.244-2.92-2.695-1.747-.055 2.852 2.506 1.815zM13.954 18.385V15.36l-2.722-2.152.214 2.97 2.508 2.207z"/><path fill="#000" d="M13.954 15.36l2.735-2.043-2.707-1.859-2.75 1.75 2.723 2.152z"/><path fill="#004B16" d="M9.608 21.997l-.435-3.091L6.524 16.2l.612 3.068 2.472 2.729z"/><path fill="#000" d="M9.173 18.906l3.489-2.595-2.704-2.294L6.524 16.2l2.65 2.706z"/><path fill="#004B16" d="M8.947 17.3l-.575-4.088-2.951-2.556.79 3.964 2.736 2.68z"/><path fill="#000" d="M8.372 13.212l4.064-2.406L9.4 8.686l-3.98 1.97 2.95 2.556z"/><path fill="#004B16" d="M8.096 11.26l-.788-5.6L4 3.523l1.049 5.266 3.047 2.471z"/><path fill="#000" d="M7.308 5.66l4.836-1.93L8.699 2 4 3.522l3.308 2.139z"/><path fill="#1CB35C" d="M19.633 13.69c-2.046 1.694-2.091 1.725-2.084 1.725.254-3.058.233-2.92.245-2.92 2.334-1.742 2.188-1.642 2.204-1.642l-.365 2.838zM16.518 16.27c-2.533 2.1-2.573 2.114-2.563 2.114-.025-3.167-.01-3.025 0-3.025 2.918-2.172 2.724-2.044 2.734-2.044l-.171 2.956zM12.788 19.362c-3.161 2.62-3.19 2.635-3.175 2.635-.449-3.185-.438-3.091-.438-3.091 3.717-2.762 3.482-2.595 3.492-2.595l.12 3.051zM12.144 3.729c.222 5.377.204 5.223.216 5.223-4.182 2.264-4.274 2.307-4.266 2.307-.806-5.723-.794-5.598-.788-5.598l4.838-1.932zM12.434 10.806c.167 4.077.146 3.936.161 3.936-3.617 2.535-3.659 2.563-3.645 2.563-.584-4.2-.584-4.093-.575-4.093l4.059-2.406z"/></symbol><symbol id="flight-linode-color-16" viewBox="0 0 16 16"><path fill="#231F20" d="M14 7.197l-1.993-1.072-1.682.998-.02 1.022-.819-.524-1.112.66-.049-1.117-1.145-.745 1.094-.55c-.008 0 0 .106-.162-3.656L5.524 1 2 2.066l.787 3.686 1.183.894-.9.412.588 2.778.826.755-.59.35.458 2.148L6.206 15c.009-.01.195-.15 2.381-1.845l-.064-1.459.94.776c.013-.014.2-.149 1.921-1.48l.067-1.079.709.479c.012-.013.173-.133 1.562-1.206L14 7.197z"/><path fill="#000" d="M12.347 8.346L14 7.197l-1.993-1.072-1.682.998 2.022 1.223z"/><path fill="#004B16" d="M12.163 10.39l.183-2.044-2.02-1.223-.042 1.997 1.88 1.27zM9.466 12.47v-2.118L7.424 8.845l.16 2.08 1.882 1.544z"/><path fill="#000" d="M9.466 10.352l2.05-1.43-2.03-1.301-2.062 1.224 2.042 1.507z"/><path fill="#004B16" d="M6.206 14.998l-.326-2.164-1.987-1.894.46 2.148 1.853 1.91z"/><path fill="#000" d="M5.88 12.834l2.616-1.816L6.47 9.412 3.893 10.94l1.987 1.894z"/><path fill="#004B16" d="M5.71 11.71L5.28 8.848 3.066 7.06l.592 2.775L5.71 11.71z"/><path fill="#000" d="M5.279 8.848l3.048-1.684L6.05 5.68 3.066 7.059l2.213 1.79z"/><path fill="#004B16" d="M5.072 7.482l-.591-3.92L2 2.067l.787 3.686 2.285 1.73z"/><path fill="#000" d="M4.481 3.563L8.108 2.21 5.524 1 2 2.066l2.481 1.497z"/><path fill="#1CB35C" d="M13.725 9.184c-1.535 1.185-1.57 1.206-1.563 1.206.19-2.14.174-2.044.183-2.044 1.75-1.219 1.641-1.149 1.653-1.149l-.273 1.987zM11.388 10.99c-1.9 1.47-1.93 1.479-1.922 1.479-.019-2.217-.008-2.118 0-2.118 2.188-1.52 2.043-1.43 2.05-1.43l-.128 2.069zM8.59 13.153c-2.37 1.834-2.392 1.845-2.38 1.845-.337-2.23-.329-2.164-.329-2.164 2.788-1.933 2.612-1.816 2.619-1.816l.09 2.135zM8.108 2.21c.166 3.765.153 3.657.162 3.657-3.137 1.584-3.206 1.615-3.2 1.615-.604-4.007-.595-3.92-.59-3.92L8.107 2.21zM8.325 7.164c.126 2.854.11 2.755.122 2.755-2.714 1.775-2.745 1.794-2.734 1.794-.439-2.94-.439-2.865-.432-2.865l3.044-1.684z"/></symbol><symbol id="flight-linux-24" viewBox="0 0 24 24"><path d="M12.42 2c-.13 0-.263.007-.4.018-3.522.277-2.588 4.005-2.642 5.248-.063.91-.25 1.627-.875 2.517-.737.875-1.772 2.291-2.263 3.767-.232.693-.342 1.403-.24 2.074a.352.352 0 00-.091.113c-.217.223-.375.5-.552.699-.166.166-.405.222-.665.333-.26.114-.548.224-.72.567a1.116 1.116 0 00-.11.502c0 .165.023.333.046.446.049.333.097.607.034.809-.208.566-.234.954-.089 1.236.145.279.446.392.784.501.675.167 1.591.113 2.311.5.772.388 1.555.558 2.18.392a1.477 1.477 0 001.007-.789c.489-.002 1.025-.224 1.883-.278.583-.048 1.312.223 2.148.167.02.111.052.165.095.277l.002.003c.326.648.928.943 1.57.892.643-.05 1.327-.447 1.881-1.088.526-.638 1.402-.903 1.982-1.253.29-.165.524-.39.54-.71.02-.334-.166-.676-.595-1.147v-.081l-.002-.003c-.142-.166-.208-.445-.282-.771-.07-.334-.151-.655-.41-.872h-.002c-.05-.045-.103-.056-.157-.112a.297.297 0 00-.158-.054c.359-1.065.22-2.125-.144-3.078-.445-1.175-1.221-2.198-1.813-2.902-.663-.838-1.313-1.631-1.3-2.807.022-1.793.197-5.111-2.953-5.116zm.44 2.838h.011c.178 0 .33.051.487.165.159.112.275.276.365.444.088.215.132.382.138.603 0-.017.005-.033.005-.05v.088a.074.074 0 01-.003-.018l-.003-.02a1.506 1.506 0 01-.125.588c-.039.105-.1.2-.178.28a.586.586 0 00-.073-.035c-.087-.038-.165-.054-.237-.111a1.094 1.094 0 00-.183-.055c.042-.05.122-.111.152-.165a.986.986 0 00.074-.335V6.2a1.006 1.006 0 00-.051-.333c-.038-.112-.084-.167-.153-.278-.07-.055-.139-.11-.222-.11h-.013c-.078 0-.147.025-.219.11a.666.666 0 00-.17.278.986.986 0 00-.075.334v.016c.001.074.006.149.016.222-.16-.056-.365-.112-.506-.168a1.368 1.368 0 01-.015-.167v-.016c-.006-.22.037-.44.125-.64a.9.9 0 01.359-.445.821.821 0 01.495-.166zm-2.468.049h.03c.119 0 .225.04.333.112.121.108.22.24.286.388.075.166.117.333.128.556v.003c.006.112.005.167-.002.222v.066c-.025.006-.046.015-.069.02-.127.046-.228.113-.327.167.01-.075.01-.15.002-.223v-.012c-.01-.111-.033-.167-.068-.278a.51.51 0 00-.139-.222.206.206 0 00-.152-.053h-.018c-.059.005-.108.033-.155.11a.46.46 0 00-.1.224.786.786 0 00-.019.276v.012c.01.112.031.167.067.278a.52.52 0 00.138.224.1.1 0 00.029.02c-.059.047-.098.058-.147.113a.253.253 0 01-.11.057 2.185 2.185 0 01-.228-.335 1.477 1.477 0 01-.13-.556 1.466 1.466 0 01.067-.557c.046-.164.127-.316.236-.446.107-.11.217-.166.348-.166zm1.142 1.421c.277 0 .61.054 1.013.333.244.167.436.224.877.39h.003c.212.113.337.222.398.332v-.109a.476.476 0 01.013.392c-.102.258-.43.536-.886.702v.001c-.223.113-.417.278-.646.388-.23.112-.49.243-.843.222a.949.949 0 01-.373-.056 2.975 2.975 0 01-.268-.165c-.163-.112-.303-.276-.51-.387v-.004h-.005c-.333-.205-.513-.427-.571-.592-.059-.223-.004-.392.16-.5.187-.112.317-.226.403-.28.087-.062.12-.085.147-.11h.001v-.002c.141-.168.364-.391.7-.5.115-.03.245-.055.388-.055h-.001zm2.333 1.785c.299 1.181.997 2.896 1.446 3.728.239.445.713 1.382.918 2.52.13-.004.275.015.428.053.538-1.392-.455-2.889-.907-3.305-.184-.167-.194-.279-.103-.279.492.445 1.138 1.31 1.372 2.297.108.446.133.92.017 1.392.056.024.113.05.171.056.86.445 1.178.782 1.025 1.28V15.8c-.05-.003-.1 0-.15 0h-.013c.125-.39-.152-.688-.888-1.02-.762-.333-1.371-.28-1.475.388-.007.035-.01.055-.015.112-.056.02-.116.044-.174.053-.358.224-.552.558-.66.99-.11.444-.143.963-.172 1.557v.003c-.016.278-.141.698-.265 1.125-1.25.893-2.984 1.281-4.457.278a2.204 2.204 0 00-.335-.444 1.206 1.206 0 00-.23-.278c.152 0 .282-.025.388-.056a.513.513 0 00.262-.278c.09-.223 0-.58-.288-.97-.287-.388-.775-.828-1.49-1.267-.525-.333-.821-.725-.958-1.163-.137-.445-.12-.904-.012-1.37.204-.893.727-1.76 1.061-2.303.09-.055.031.112-.34.811-.33.626-.95 2.081-.101 3.212a6.77 6.77 0 01.539-2.397c.47-1.065 1.452-2.92 1.53-4.39.04.03.18.113.24.169.182.11.317.277.492.387a.99.99 0 00.73.28c.033.002.063.004.092.004.343 0 .608-.111.83-.223.242-.112.434-.278.617-.333h.004c.39-.113.696-.335.87-.584h.001zm1.821 7.465c.031.5.286 1.038.735 1.148.49.111 1.195-.278 1.493-.638l.175-.008c.263-.006.481.008.706.223l.003.003c.173.166.254.441.326.73.07.333.128.65.34.888.405.44.538.755.53.95l.003-.006v.015l-.002-.01c-.013.219-.155.33-.416.496-.524.334-1.454.593-2.047 1.308-.515.615-1.142.95-1.697.993-.553.044-1.03-.167-1.311-.748l-.005-.003c-.175-.333-.1-.854.047-1.408.147-.557.357-1.12.386-1.581.03-.595.063-1.113.162-1.512.1-.387.257-.664.535-.82l.037-.018v-.002zm-9.011.041h.008c.044 0 .087.004.13.012.314.046.589.277.853.627l.759 1.386.002.003c.203.444.628.886.99 1.364.363.498.643.942.608 1.308v.005c-.047.62-.4.957-.937 1.079-.538.112-1.267.001-1.996-.387-.807-.447-1.765-.391-2.38-.502-.308-.055-.51-.166-.603-.333-.092-.167-.094-.502.102-1.025v-.003l.002-.003c.097-.278.025-.627-.023-.932-.045-.334-.069-.591.036-.783.134-.278.33-.333.575-.444.245-.113.534-.169.763-.392h.001v-.002c.214-.223.371-.5.557-.698.158-.167.317-.28.553-.28zm5.965-7.562c-.362.168-.787.446-1.24.446-.451 0-.808-.222-1.066-.388-.129-.112-.234-.223-.311-.28-.137-.11-.12-.277-.062-.277.091.014.108.112.166.167.08.055.18.167.3.277.243.167.567.39.973.39.404 0 .877-.223 1.165-.389.162-.112.37-.278.54-.389.13-.113.124-.222.232-.222.107.013.028.111-.123.276a6.73 6.73 0 01-.574.39zm-.901-1.319V6.7c-.005-.017.01-.035.024-.042.061-.036.15-.022.216.004.053 0 .134.056.126.112-.005.041-.071.055-.113.055-.046 0-.077-.036-.117-.056-.044-.015-.122-.007-.136-.055zm-.46 0c-.016.049-.094.041-.138.055-.039.021-.072.057-.117.057-.041 0-.108-.017-.113-.057-.008-.055.073-.11.125-.11.067-.026.153-.04.216-.005.016.008.03.025.025.042v.017h.002v.001z"/></symbol><symbol id="flight-linux-16" viewBox="0 0 16 16"><path d="M8.294 1c-.09 0-.184.005-.28.012-2.465.194-1.811 2.804-1.85 3.674-.043.637-.174 1.14-.612 1.762-.516.613-1.24 1.604-1.584 2.637-.162.485-.24.982-.167 1.452a.247.247 0 00-.064.079c-.152.156-.263.35-.387.49-.116.115-.283.155-.465.232-.183.08-.384.157-.504.397a.78.78 0 00-.077.351c0 .116.016.234.032.313.034.233.068.425.023.566-.145.396-.163.668-.062.865.102.195.313.275.549.351.472.117 1.114.079 1.618.35.54.272 1.088.39 1.526.274.307-.067.566-.27.705-.552.342-.001.717-.157 1.318-.194.408-.034.918.155 1.503.116.015.078.037.116.067.194l.001.002c.229.454.65.66 1.1.625.45-.035.928-.313 1.316-.762.368-.446.982-.632 1.387-.877.203-.116.367-.273.379-.497.013-.234-.117-.473-.417-.803v-.056l-.002-.002c-.099-.117-.145-.312-.197-.54-.05-.234-.106-.459-.287-.61h-.001c-.035-.032-.072-.04-.11-.08a.208.208 0 00-.11-.037c.25-.745.153-1.487-.102-2.154-.31-.823-.854-1.54-1.269-2.032-.464-.587-.919-1.142-.91-1.965.016-1.255.138-3.578-2.067-3.581zm.309 1.986h.007c.125 0 .231.036.34.116a.89.89 0 01.256.31c.062.152.093.268.097.423 0-.012.004-.023.004-.035v.061a.05.05 0 01-.003-.012l-.002-.014c-.001.142-.03.282-.087.412a.556.556 0 01-.125.195.415.415 0 00-.051-.024c-.06-.027-.115-.038-.166-.078a.765.765 0 00-.128-.038c.03-.035.085-.078.107-.116a.69.69 0 00.051-.234V3.94a.706.706 0 00-.035-.233c-.027-.079-.06-.117-.107-.195-.05-.038-.098-.077-.156-.077h-.01c-.054 0-.102.018-.152.077a.467.467 0 00-.12.195.688.688 0 00-.052.234v.01c0 .053.004.105.011.156-.112-.039-.255-.078-.354-.117a.954.954 0 01-.01-.117V3.86a1.034 1.034 0 01.087-.448.63.63 0 01.251-.31.575.575 0 01.347-.117zm-1.728.035h.02c.084 0 .158.028.234.078a.806.806 0 01.2.272c.053.116.082.233.09.389v.002a.856.856 0 01-.002.155v.047l-.048.014c-.089.032-.16.079-.23.117a.633.633 0 00.002-.156V3.93c-.007-.078-.023-.117-.047-.194a.358.358 0 00-.097-.156.145.145 0 00-.107-.037h-.012c-.042.003-.076.023-.109.077a.322.322 0 00-.07.157.55.55 0 00-.013.193v.008c.007.08.021.117.047.195a.363.363 0 00.096.157c.006.005.012.01.02.014-.04.033-.068.04-.102.079a.177.177 0 01-.077.04 1.53 1.53 0 01-.16-.235 1.034 1.034 0 01-.09-.389c-.01-.132.005-.264.046-.39a.834.834 0 01.165-.312c.075-.077.152-.116.244-.116zm.799.995c.194 0 .428.038.71.233.17.116.304.157.613.273h.002c.149.079.236.155.279.232v-.076a.333.333 0 01.009.274c-.072.18-.301.375-.62.491v.001c-.156.08-.292.195-.452.272-.161.078-.343.17-.59.155a.664.664 0 01-.262-.039 2.077 2.077 0 01-.188-.115c-.113-.079-.211-.194-.357-.271v-.003h-.003c-.233-.144-.359-.299-.4-.414-.04-.157-.003-.275.113-.35.13-.08.221-.159.282-.197.06-.043.083-.059.102-.076h.001v-.002c.099-.117.255-.274.49-.35.08-.021.171-.038.272-.038h-.001zm1.633 1.25c.21.826.698 2.026 1.012 2.609.167.311.5.967.643 1.764.091-.003.193.01.3.037.376-.975-.319-2.022-.636-2.314-.128-.116-.135-.195-.071-.195.344.312.796.917.96 1.608.075.312.093.644.012.974.039.017.079.035.12.04.601.311.824.547.717.896v-.025c-.035-.002-.07 0-.105 0h-.01c.089-.272-.106-.481-.62-.714-.534-.233-.96-.196-1.033.271-.005.025-.008.039-.01.079-.04.013-.082.03-.123.037-.25.157-.386.39-.462.693-.076.31-.1.674-.12 1.09v.002c-.011.195-.099.489-.186.787-.875.626-2.088.897-3.12.195a1.543 1.543 0 00-.234-.31.846.846 0 00-.16-.195.963.963 0 00.27-.04.359.359 0 00.184-.194c.063-.156 0-.407-.201-.678-.201-.273-.543-.58-1.043-.888-.368-.233-.575-.507-.671-.814-.096-.312-.083-.633-.009-.96.143-.624.51-1.23.743-1.611.063-.038.022.078-.238.568-.23.438-.665 1.456-.07 2.248.022-.578.15-1.146.377-1.678.329-.745 1.016-2.044 1.07-3.073.029.021.127.08.17.118.126.078.22.194.343.271a.694.694 0 00.511.196l.065.003c.24 0 .425-.078.581-.156.17-.078.304-.195.432-.233h.003c.272-.08.487-.235.609-.409zm1.275 5.225c.021.35.2.726.514.803.343.078.837-.194 1.045-.446l.123-.006c.184-.004.337.006.494.156l.002.002c.121.116.178.31.228.511.05.233.09.455.239.622.283.307.376.528.37.665l.003-.004v.01l-.002-.007c-.009.153-.108.231-.29.347-.368.234-1.02.416-1.434.916-.36.43-.8.665-1.188.695-.387.03-.721-.117-.918-.524l-.003-.002c-.122-.233-.07-.597.033-.985.103-.39.25-.784.27-1.107.022-.417.044-.779.114-1.058.07-.271.18-.465.374-.574l.026-.013v-.001zm-6.308.028h.006a.53.53 0 01.091.009c.22.032.412.194.597.438l.53.97.003.003c.141.31.44.62.693.955.253.348.45.66.425.915v.004c-.033.434-.28.67-.656.755-.376.079-.887 0-1.397-.27-.565-.314-1.235-.274-1.667-.352-.215-.039-.355-.117-.421-.233-.064-.117-.066-.352.071-.718v-.002l.002-.002c.068-.195.017-.439-.016-.652-.032-.234-.049-.414.025-.549.093-.194.23-.233.402-.31.172-.08.374-.118.534-.275h.001c.15-.157.26-.351.39-.49.11-.117.222-.196.387-.196zM8.45 5.226c-.254.117-.551.312-.868.312-.316 0-.566-.155-.747-.272-.09-.078-.163-.156-.217-.195-.096-.078-.084-.194-.044-.194.064.01.076.078.117.117.056.038.125.116.21.194.17.116.396.272.68.272.283 0 .615-.156.816-.272.114-.078.26-.194.378-.272.09-.08.087-.156.163-.156.074.01.02.078-.086.194-.13.098-.264.189-.403.273zm-.631-.923V4.29c-.004-.012.007-.024.017-.03.043-.024.105-.015.151.003.037 0 .094.04.088.079-.004.029-.05.038-.079.038-.032 0-.054-.025-.082-.04-.03-.01-.085-.004-.095-.037zm-.322 0c-.011.034-.066.028-.097.038-.027.015-.05.04-.081.04-.03 0-.076-.012-.08-.04-.005-.038.052-.077.088-.077.047-.018.107-.028.151-.003.011.005.021.017.018.029v.012h.001z"/></symbol><symbol id="flight-linux-color-24" viewBox="0 0 24 24"><path fill="#202020" d="M19.626 17.761c-.142-.16-.21-.455-.282-.77-.072-.314-.152-.653-.41-.873l-.002-.001a1.063 1.063 0 00-.317-.191c.359-1.064.218-2.124-.144-3.082-.445-1.175-1.22-2.199-1.814-2.9-.663-.836-1.312-1.63-1.3-2.804.02-1.791.198-5.112-2.954-5.117-.128 0-.262.005-.4.016-3.523.284-2.589 4.005-2.64 5.25-.065.912-.25 1.63-.877 2.52-.736.876-1.773 2.293-2.263 3.768-.232.696-.342 1.406-.24 2.077a1.578 1.578 0 00-.092.09c-.216.23-.376.51-.554.698-.166.166-.403.23-.663.323s-.546.23-.72.564l-.001.002a1.003 1.003 0 00-.108.483c0 .154.023.31.046.461.048.313.096.61.032.81-.206.563-.233.953-.088 1.235.146.284.445.409.783.48.675.14 1.59.105 2.312.488l.062-.117-.062.117c.773.404 1.555.547 2.18.404.453-.103.82-.373 1.01-.788.487-.002 1.024-.209 1.882-.256.583-.047 1.31.207 2.147.16.022.091.054.178.097.262l.001.002c.325.649.928.945 1.57.895.643-.051 1.327-.43 1.88-1.088l-.1-.085.101.084c.527-.64 1.402-.904 1.982-1.254.29-.175.525-.394.544-.712.018-.318-.17-.674-.598-1.15z"/><path fill="#F8BF11" d="M19.959 18.897c-.011.196-.153.342-.416.5-.524.317-1.454.592-2.048 1.311-.516.614-1.145.951-1.699.995-.553.044-1.03-.186-1.313-.752v-.002c-.176-.333-.103-.857.044-1.41.147-.554.359-1.122.387-1.584v-.001c.03-.592.063-1.109.163-1.508.1-.398.256-.668.533-.82a1.19 1.19 0 01.039-.02c.03.512.285 1.035.733 1.148.49.13 1.198-.292 1.496-.635l.175-.007c.262-.006.482.01.706.205v.001h.002c.172.147.254.423.325.732.072.31.128.647.342.887.41.456.542.764.531.96zM9.988 20.348v.003c-.047.622-.398.96-.937 1.083-.538.123-1.268 0-1.997-.38-.807-.428-1.766-.385-2.382-.514-.308-.064-.508-.16-.6-.34-.093-.18-.095-.493.101-1.028l.001-.002v-.002c.098-.3.026-.626-.021-.933-.047-.307-.07-.586.035-.78v-.002c.135-.259.332-.351.576-.439.244-.088.534-.156.762-.386l.002-.001v-.001c.212-.223.371-.503.557-.701.157-.168.314-.279.55-.28h.008c.042 0 .086.003.132.01.314.048.588.268.852.625l.761 1.388v.001c.203.423.631.889.994 1.363.362.475.643.951.606 1.316z"/><path fill="#D6A312" d="M13.785 7.411c-.06-.12-.186-.233-.398-.32l-.001-.001c-.442-.19-.634-.203-.881-.363-.402-.258-.734-.349-1.01-.348-.144 0-.273.026-.388.066-.336.116-.56.357-.7.49-.027.026-.063.05-.148.113-.086.063-.216.158-.402.297-.165.124-.219.285-.162.475.057.189.24.407.573.595l.001.001c.207.122.349.286.511.416.081.065.167.123.27.167.102.044.222.074.372.083.353.02.612-.086.842-.217.23-.13.424-.29.647-.363.458-.143.784-.431.886-.704a.463.463 0 00-.012-.387z"/><path fill="#202020" d="M12.626 8.086c-.364.19-.789.42-1.241.42-.452 0-.809-.209-1.066-.412-.128-.102-.232-.203-.31-.277-.137-.107-.12-.258-.065-.254.094.012.108.135.167.19.08.076.18.173.302.269.243.192.566.38.972.38.405 0 .877-.238 1.165-.4.164-.091.371-.256.541-.38.13-.095.125-.21.232-.198.107.013.028.127-.122.258s-.385.305-.575.404z"/><path fill="#fff" d="M18.195 15.848c-.05-.002-.1-.001-.148 0h-.014c.125-.395-.151-.685-.888-1.018-.763-.336-1.371-.303-1.474.379a1.41 1.41 0 00-.016.108c-.057.02-.114.045-.172.077-.359.196-.554.552-.663.989-.109.436-.14.963-.17 1.556-.018.298-.141.701-.265 1.128-1.25.893-2.987 1.28-4.46.273a6.57 6.57 0 00-.333-.468 20.821 20.821 0 00-.23-.294c.152 0 .28-.024.384-.071a.486.486 0 00.265-.274c.09-.242 0-.583-.288-.972-.288-.39-.775-.829-1.49-1.268-.527-.327-.82-.728-.958-1.164-.138-.435-.119-.906-.013-1.371.204-.892.727-1.76 1.061-2.305.09-.066.032.123-.338.81-.331.629-.952 2.079-.103 3.211a6.733 6.733 0 01.539-2.396c.47-1.066 1.454-2.916 1.532-4.39a4.082 4.082 0 00.241.159c.18.106.316.261.492.402a1.215 1.215 0 00.821.286c.342 0 .61-.112.832-.239.241-.138.434-.291.617-.35h.001c.387-.122.694-.336.869-.585.3 1.184.999 2.895 1.448 3.73.239.442.714 1.383.919 2.517.13-.004.273.015.426.054.537-1.391-.454-2.889-.908-3.306-.183-.178-.192-.257-.1-.254.49.436 1.137 1.31 1.371 2.298.108.45.13.923.016 1.39.056.024.113.05.17.077.862.419 1.18.784 1.027 1.281z"/><path fill="#E6E6E6" d="M12.058 12.088c-.795.003-1.57.36-2.227 1.023-.656.663-1.163 1.603-1.453 2.698l.087.055v.004c.671.427 1.15.854 1.445 1.254.313.424.451.835.32 1.192a.733.733 0 01-.388.404c-.019.009-.039.015-.058.022.106.139.21.282.305.429 1.349.897 2.917.565 4.095-.247.115-.396.22-.765.234-.996.03-.594.06-1.131.176-1.6.118-.471.346-.9.777-1.136.025-.014.05-.021.073-.033a1.08 1.08 0 01.032-.135c-.347-.888-.845-1.627-1.444-2.142-.6-.515-1.28-.788-1.974-.792zm3.384 3.078l-.001.008v-.003-.005z"/><path fill="#fff" d="M13.826 6.047a1.5 1.5 0 01-.128.638c-.05.117-.109.214-.179.3a5.95 5.95 0 00-.311-.128c-.07-.028-.125-.046-.182-.065.041-.05.122-.108.152-.182a.957.957 0 00.072-.347l.002-.015a.961.961 0 00-.05-.337.62.62 0 00-.155-.262.318.318 0 00-.222-.101h-.012a.326.326 0 00-.216.085.62.62 0 00-.174.25.966.966 0 00-.072.349v.014c-.002.071.002.136.013.2a2.533 2.533 0 00-.506-.172 1.699 1.699 0 01-.014-.19v-.018a1.479 1.479 0 01.126-.638c.09-.204.201-.35.358-.47a.79.79 0 01.494-.176h.008c.179 0 .332.053.489.167.159.115.274.26.366.462.09.198.135.39.14.619v.017zM11.126 6.281a1.477 1.477 0 00-.396.18.89.89 0 00.003-.214v-.012a.929.929 0 00-.068-.274.528.528 0 00-.138-.203.225.225 0 00-.17-.063c-.06.005-.11.034-.157.092a.532.532 0 00-.1.223.895.895 0 00-.019.293l.001.011a.91.91 0 00.068.276.524.524 0 00.166.223c-.059.045-.098.078-.147.113l-.11.081a1.009 1.009 0 01-.23-.342 1.532 1.532 0 01-.128-.545v-.002a1.53 1.53 0 01.065-.556c.055-.18.13-.31.238-.417a.513.513 0 01.378-.169c.119 0 .225.04.335.128.119.095.209.217.284.388.076.171.116.343.127.545v.002c.006.085.005.165-.002.242z"/><path fill="#202020" d="M11.723 6.765c.015.048.093.04.138.063.04.02.071.065.115.067.043 0 .109-.015.114-.057.007-.056-.074-.09-.126-.111-.067-.026-.153-.04-.216-.005-.014.008-.03.027-.025.043zM11.263 6.765c-.015.048-.093.04-.137.063-.04.02-.072.065-.116.067-.042 0-.108-.015-.114-.057-.007-.056.074-.09.126-.111.067-.026.153-.04.216-.005.014.008.03.027.025.043z"/></symbol><symbol id="flight-linux-color-16" viewBox="0 0 16 16"><path fill="#202020" d="M13.338 12.033c-.1-.112-.146-.319-.197-.54-.05-.22-.107-.457-.288-.61v-.001a.756.756 0 00-.223-.134c.252-.745.153-1.487-.1-2.157-.312-.823-.855-1.54-1.27-2.03-.464-.586-.918-1.142-.91-1.963.014-1.254.138-3.579-2.068-3.582-.09 0-.183.004-.28.012-2.466.198-1.812 2.803-1.849 3.675-.045.638-.174 1.14-.613 1.764-.515.613-1.24 1.604-1.584 2.637-.162.487-.24.984-.168 1.454-.023.02-.044.041-.064.063-.151.161-.263.357-.388.489-.116.116-.282.16-.464.225-.183.066-.383.162-.504.395v.001a.702.702 0 00-.077.339c0 .108.016.217.032.322.034.22.068.427.023.567-.144.395-.163.667-.061.865.102.199.31.286.547.335.473.1 1.114.075 1.619.342l.043-.082-.043.082c.54.283 1.089.383 1.526.284a.99.99 0 00.706-.552c.342-.002.717-.146 1.318-.18.408-.032.918.145 1.503.113a.806.806 0 00.068.183l.001.001c.227.455.65.662 1.1.627.45-.036.928-.301 1.315-.762l-.07-.06.07.06c.37-.448.982-.633 1.388-.878.203-.123.368-.276.38-.499.013-.222-.118-.471-.418-.805z"/><path fill="#F8BF11" d="M13.571 12.828c-.007.137-.107.24-.29.35-.368.222-1.019.414-1.434.918-.362.43-.802.665-1.19.696-.387.03-.721-.13-.919-.526v-.002c-.123-.233-.072-.6.031-.987s.251-.785.271-1.108v-.001c.02-.415.044-.776.114-1.055.07-.28.179-.468.373-.575a.876.876 0 01.027-.014c.022.359.2.725.514.804.343.09.838-.204 1.047-.445l.122-.004c.184-.005.337.006.495.143v.001c.121.102.179.296.229.512.05.217.09.453.239.621.287.32.38.534.371.672zM6.592 13.843v.003c-.034.435-.28.672-.656.758-.377.086-.888 0-1.398-.266-.565-.3-1.237-.27-1.667-.36-.216-.045-.357-.113-.421-.238-.064-.126-.066-.345.071-.72v-.001l.001-.002c.068-.209.018-.438-.015-.653-.033-.214-.049-.41.024-.546l.001-.001c.094-.181.232-.246.403-.307.17-.062.373-.11.533-.27l.001-.001h.001c.148-.157.26-.353.39-.492.11-.117.22-.195.385-.196h.005a.61.61 0 01.093.008c.22.033.411.187.596.437l.533.971v.001c.142.296.441.622.695.954.254.333.45.666.425.921z"/><path fill="#D6A312" d="M9.25 4.788c-.043-.084-.13-.164-.28-.225-.31-.133-.444-.142-.617-.254-.28-.181-.513-.244-.706-.244a.834.834 0 00-.272.047c-.236.08-.392.25-.49.342-.02.019-.044.035-.104.08-.06.043-.15.11-.28.208-.117.086-.154.2-.114.332.04.132.167.285.4.417h.001c.145.085.244.2.358.291a.801.801 0 00.189.117c.072.031.156.052.26.058.248.015.43-.06.59-.151.16-.092.296-.204.452-.255h.001c.32-.1.548-.301.62-.493a.324.324 0 00-.008-.27z"/><path fill="#202020" d="M8.438 5.26c-.255.133-.552.294-.869.294-.316 0-.566-.146-.745-.289-.09-.07-.163-.142-.218-.193-.096-.075-.084-.181-.045-.178.066.008.076.095.117.134.056.052.126.12.211.187.17.135.397.266.68.266.284 0 .614-.166.816-.28.115-.064.26-.179.379-.266.09-.067.087-.147.162-.138.075.009.02.089-.085.18-.105.092-.27.214-.403.283z"/><path fill="#fff" d="M12.337 10.694a1.724 1.724 0 00-.104 0h-.01c.088-.277-.106-.48-.621-.713-.534-.235-.96-.212-1.032.265-.005.025-.009.05-.011.076a.801.801 0 00-.12.054c-.252.137-.389.386-.465.692-.076.305-.098.674-.119 1.09-.013.208-.099.49-.186.79-.875.624-2.09.894-3.122.19-.07-.11-.15-.22-.233-.328a13.85 13.85 0 00-.16-.205.65.65 0 00.268-.05.34.34 0 00.186-.192c.063-.17 0-.408-.202-.68-.201-.273-.542-.58-1.043-.888-.368-.23-.574-.51-.67-.814-.097-.305-.084-.635-.01-.96.143-.625.51-1.233.743-1.614.063-.046.023.086-.236.567-.232.44-.667 1.455-.072 2.248.016-.564.15-1.14.377-1.677.329-.747 1.018-2.041 1.072-3.073.029.02.125.086.169.11.126.075.221.184.344.283a.85.85 0 00.575.2c.24 0 .427-.079.582-.168.17-.096.304-.204.433-.245.27-.085.486-.235.608-.41.21.83.7 2.027 1.014 2.611.167.31.5.969.643 1.762.091-.002.191.01.299.038.375-.973-.319-2.022-.636-2.314-.128-.124-.135-.18-.07-.177.343.304.795.917.96 1.608.075.315.09.646.01.973.04.017.08.034.12.054.603.293.826.548.719.897z"/><path fill="#E6E6E6" d="M8.04 8.062c-.556.002-1.099.251-1.558.716-.46.464-.814 1.122-1.018 1.888l.061.038v.004c.47.298.805.598 1.012.878.219.296.316.584.223.834a.513.513 0 01-.27.283l-.041.015c.074.097.146.197.213.3.944.628 2.042.396 2.867-.172.08-.278.153-.536.163-.698.021-.415.042-.792.124-1.12.082-.33.242-.63.544-.795.017-.01.034-.015.051-.023a.756.756 0 01.022-.094c-.242-.622-.591-1.14-1.01-1.5-.42-.36-.897-.551-1.382-.554zm2.37 2.155l-.002.005v-.002l.001-.004z"/><path fill="#fff" d="M9.278 3.833a1.05 1.05 0 01-.215.656 4.119 4.119 0 00-.218-.09l-.127-.045c.029-.035.085-.075.107-.127a.669.669 0 00.05-.243l.001-.01a.673.673 0 00-.035-.236.434.434 0 00-.108-.184.223.223 0 00-.156-.07H8.57a.228.228 0 00-.151.06.434.434 0 00-.122.175.676.676 0 00-.05.243v.01a.718.718 0 00.009.14 1.773 1.773 0 00-.354-.12 1.196 1.196 0 01-.01-.133v-.013a1.035 1.035 0 01.088-.447.793.793 0 01.25-.328.554.554 0 01.346-.123h.006c.125 0 .232.036.342.116a.78.78 0 01.257.324c.063.138.094.273.097.433l.001.012zM7.388 3.997a1.05 1.05 0 00-.277.125.623.623 0 00.002-.15v-.008a.651.651 0 00-.048-.192.37.37 0 00-.096-.141.158.158 0 00-.119-.045c-.042.004-.077.024-.11.065a.372.372 0 00-.07.156.626.626 0 00-.013.205v.008a.634.634 0 00.048.193.367.367 0 00.116.156l-.102.08-.078.056a.706.706 0 01-.16-.24c-.053-.12-.082-.24-.09-.381v-.001a1.071 1.071 0 01.045-.39.668.668 0 01.167-.292.359.359 0 01.264-.118c.084 0 .158.028.235.09a.68.68 0 01.199.271c.053.12.08.24.089.382v.001c.003.06.003.115-.002.17z"/><path fill="#202020" d="M7.806 4.335c.01.034.065.029.097.045.027.014.05.045.08.046.03.001.076-.01.08-.04.005-.038-.052-.063-.088-.077-.047-.019-.107-.028-.151-.003-.01.005-.021.018-.018.03zM7.484 4.335c-.01.034-.065.029-.096.045-.028.014-.05.045-.081.046-.03.001-.076-.01-.08-.04-.005-.038.052-.063.088-.077.047-.019.108-.028.152-.003.01.005.02.018.017.03z"/></symbol><symbol id="flight-loom-24" viewBox="0 0 24 24"><path d="M22 10.888h-5.848l5.065-2.924-1.113-1.927L15.04 8.96l2.924-5.065-1.927-1.113-2.924 5.065V2h-2.224v5.848L7.963 2.783 6.036 3.896 8.961 8.96 3.896 6.037 2.783 7.963l5.065 2.924H2v2.225h5.848l-5.065 2.924 1.113 1.927L8.96 15.04l-2.924 5.064 1.927 1.113 2.924-5.065V22h2.225v-5.848l2.923 5.065 1.927-1.113-2.924-5.065 5.065 2.924 1.113-1.927-5.065-2.923H22v-2.225H22zm-10 4.138a3.037 3.037 0 110-6.074 3.037 3.037 0 010 6.074z"/></symbol><symbol id="flight-loom-16" viewBox="0 0 16 16"><path d="M15 7.222h-4.094l3.546-2.047-.779-1.35-3.545 2.048 2.046-3.546-1.349-.779L8.78 5.093V1H7.22v4.094L5.174 1.548l-1.348.779 2.046 3.545-3.545-2.046-.779 1.348 3.546 2.047H1v1.557h4.093l-3.545 2.047.779 1.35 3.545-2.047-2.047 3.545 1.35.779 2.046-3.546V15h1.557v-4.094l2.047 3.546 1.349-.779-2.047-3.546 3.545 2.047.779-1.349-3.545-2.046h4.093L15 7.222zm-7 2.896a2.126 2.126 0 110-4.252 2.126 2.126 0 010 4.252z"/></symbol><symbol id="flight-loom-color-24" viewBox="0 0 24 24"><path fill="#625DF5" d="M22 10.888h-5.848l5.065-2.924-1.113-1.927L15.04 8.96l2.924-5.065-1.927-1.113-2.924 5.065V2h-2.224v5.848L7.963 2.783 6.036 3.896 8.961 8.96 3.896 6.037 2.783 7.963l5.065 2.924H2v2.225h5.848l-5.065 2.924 1.113 1.927L8.96 15.04l-2.924 5.064 1.927 1.113 2.924-5.065V22h2.225v-5.848l2.923 5.065 1.927-1.113-2.924-5.065 5.065 2.924 1.113-1.927-5.065-2.923H22v-2.225H22zm-10 4.138a3.037 3.037 0 110-6.074 3.037 3.037 0 010 6.074z"/></symbol><symbol id="flight-loom-color-16" viewBox="0 0 16 16"><path fill="#625DF5" d="M15 7.222h-4.094l3.546-2.047-.779-1.35-3.545 2.048 2.046-3.546-1.349-.779L8.78 5.093V1H7.22v4.094L5.174 1.548l-1.348.779 2.046 3.545-3.545-2.046-.779 1.348 3.546 2.047H1v1.557h4.093l-3.545 2.047.779 1.35 3.545-2.047-2.047 3.545 1.35.779 2.046-3.546V15h1.557v-4.094l2.047 3.546 1.349-.779-2.047-3.546 3.545 2.047.779-1.349-3.545-2.046h4.093L15 7.222zm-7 2.896a2.126 2.126 0 110-4.252 2.126 2.126 0 010 4.252z"/></symbol><symbol id="flight-microsoft-24" viewBox="0 0 24 24"><g><path d="M3 3h8.5v8.5H3V3zM12.5 3H21v8.5h-8.5V3zM3 12.5h8.5V21H3v-8.5zM12.5 12.5H21V21h-8.5v-8.5z"/></g></symbol><symbol id="flight-microsoft-16" viewBox="0 0 16 16"><g><path d="M1 1h6.5v6.5H1V1zM8.5 1H15v6.5H8.5V1zM1 8.5h6.5V15H1V8.5zM8.5 8.5H15V15H8.5V8.5z"/></g></symbol><symbol id="flight-microsoft-color-24" viewBox="0 0 24 24"><path fill="#F35325" d="M3 3h8.5v8.5H3V3z"/><path fill="#81BC06" d="M12.5 3H21v8.5h-8.5V3z"/><path fill="#05A6F0" d="M3 12.5h8.5V21H3v-8.5z"/><path fill="#FFBA08" d="M12.5 12.5H21V21h-8.5v-8.5z"/></symbol><symbol id="flight-microsoft-color-16" viewBox="0 0 16 16"><path fill="#F35325" d="M1 1h6.5v6.5H1V1z"/><path fill="#81BC06" d="M8.5 1H15v6.5H8.5V1z"/><path fill="#05A6F0" d="M1 8.5h6.5V15H1V8.5z"/><path fill="#FFBA08" d="M8.5 8.5H15V15H8.5V8.5z"/></symbol><symbol id="flight-microsoft-teams-24" viewBox="0 0 24 24"><g><path d="M15.954 5.925c0 1.615-1.354 2.925-3.024 2.925S9.907 7.54 9.907 5.925C9.907 4.31 11.261 3 12.93 3c1.67 0 3.024 1.31 3.024 2.925zM19.442 8.85c1.156 0 2.093-.907 2.093-2.025 0-1.118-.937-2.025-2.093-2.025s-2.093.907-2.093 2.025c0 1.118.937 2.025 2.093 2.025zM21.116 9.75c.488 0 .884.383.884.855v4.553c0 1.735-1.454 3.142-3.248 3.142h-.015c-.494 0-.961-.106-1.38-.297-.802 1.727-2.574 2.948-4.66 2.997-2.893-.069-5.183-2.392-5.116-5.192h2.107V9.75h11.428z"/><path fill-rule="evenodd" d="M11.38 7.05H2.853c-.471 0-.853.37-.853.825v8.25c0 .456.382.825.853.825h8.527c.47 0 .852-.37.852-.825v-8.25a.839.839 0 00-.852-.825zm-3.725 3.14H9.36v-.871H4.873v.871h1.696v4.491h1.086V10.19z" clip-rule="evenodd"/></g></symbol><symbol id="flight-microsoft-teams-16" viewBox="0 0 16 16"><g><path d="M10.768 4.112A2.114 2.114 0 018.65 6.226a2.114 2.114 0 01-2.116-2.112C6.535 2.946 7.482 2 8.65 2s2.117.946 2.117 2.112zM13.21 6.225c.808 0 1.464-.655 1.464-1.462 0-.808-.655-1.463-1.465-1.463a1.464 1.464 0 100 2.925zM14.381 6.875c.342 0 .619.276.619.617v3.288a2.272 2.272 0 01-2.274 2.27h-.01c-.346 0-.673-.077-.966-.214A3.673 3.673 0 018.488 15a3.669 3.669 0 01-3.581-3.75h1.475V6.875h8z"/><path fill-rule="evenodd" d="M7.566 4.925h-5.97A.596.596 0 001 5.521v5.958c0 .33.267.596.597.596h5.969c.33 0 .597-.267.597-.596V5.521a.596.596 0 00-.597-.596zM4.959 7.193h1.193v-.63H3.011v.63h1.188v3.243h.76V7.193z" clip-rule="evenodd"/></g></symbol><symbol id="flight-microsoft-teams-color-24" viewBox="0 0 24 24"><path fill="#5059C9" d="M15.95 9.75h5.166c.488 0 .884.383.884.855v4.553c0 1.735-1.454 3.142-3.248 3.142h-.015c-1.794 0-3.248-1.406-3.249-3.142v-4.961c0-.247.207-.447.462-.447zM19.442 8.85c1.156 0 2.093-.907 2.093-2.025 0-1.118-.937-2.025-2.093-2.025s-2.093.907-2.093 2.025c0 1.118.937 2.025 2.093 2.025z"/><path fill="#7B83EB" d="M12.93 8.85c1.67 0 3.024-1.31 3.024-2.925C15.954 4.31 14.6 3 12.93 3S9.907 4.31 9.907 5.925c0 1.615 1.354 2.925 3.023 2.925zM16.961 9.75H8.434c-.482.012-.864.399-.853.865v5.193c-.067 2.8 2.223 5.123 5.117 5.192 2.893-.069 5.183-2.392 5.116-5.192v-5.193c.011-.466-.37-.853-.853-.865z"/><path fill="#000" d="M13.163 9.75v7.276a.829.829 0 01-.53.761.847.847 0 01-.321.063H7.99a5.316 5.316 0 01-.41-2.043v-5.193c-.01-.466.37-.852.851-.864h4.73z" opacity=".1"/><path fill="#000" d="M12.698 9.75v7.727a.775.775 0 01-.066.31.857.857 0 01-.786.513H8.21a5.75 5.75 0 01-.218-.45 5.316 5.316 0 01-.41-2.043v-5.193c-.01-.466.37-.852.851-.864h4.266z" opacity=".2"/><path fill="#000" d="M12.698 9.75v6.826a.844.844 0 01-.852.824H7.828a5.316 5.316 0 01-.247-1.593v-5.193c-.01-.466.37-.852.851-.864h4.266z" opacity=".2"/><path fill="#000" d="M12.232 9.75v6.826a.844.844 0 01-.85.824H7.827a5.316 5.316 0 01-.247-1.593v-5.193c-.01-.466.37-.852.851-.864h3.8z" opacity=".2"/><path fill="#000" d="M13.163 7.424V8.84c-.08.005-.154.01-.233.01-.079 0-.153-.005-.232-.01a2.631 2.631 0 01-.465-.072A2.998 2.998 0 0110.14 7.05a2.438 2.438 0 01-.15-.45h2.322c.469.002.849.37.85.824z" opacity=".1"/><path fill="#000" d="M12.698 7.874v.967a2.632 2.632 0 01-.465-.072A2.998 2.998 0 0110.14 7.05h1.707c.469.002.849.37.85.824z" opacity=".2"/><path fill="#000" d="M12.698 7.874v.967a2.632 2.632 0 01-.465-.072A2.998 2.998 0 0110.14 7.05h1.707c.469.002.849.37.85.824z" opacity=".2"/><path fill="#000" d="M12.233 7.874v.895A2.998 2.998 0 0110.14 7.05h1.242c.469.002.849.37.85.824z" opacity=".2"/><path fill="url(#microsoft-teams-color-24__paint0_linear_2372_478)" d="M2.853 7.05h8.527c.47 0 .852.37.852.825v8.25c0 .456-.381.825-.852.825H2.853c-.471 0-.853-.37-.853-.825v-8.25c0-.456.382-.825.853-.825z"/><path fill="#fff" d="M9.36 10.19H7.655v4.491H6.57V10.19H4.873v-.871H9.36v.871z"/></symbol><symbol id="flight-microsoft-teams-color-16" viewBox="0 0 16 16"><path fill="#5059C9" d="M10.765 6.875h3.616c.342 0 .619.276.619.617v3.288a2.272 2.272 0 01-2.274 2.27h-.01a2.272 2.272 0 01-2.274-2.27V7.199c0-.179.145-.323.323-.323zM13.21 6.225c.808 0 1.464-.655 1.464-1.462 0-.808-.656-1.463-1.465-1.463s-1.465.655-1.465 1.463c0 .807.656 1.462 1.465 1.462z"/><path fill="#7B83EB" d="M8.651 6.225a2.114 2.114 0 002.117-2.112A2.114 2.114 0 008.65 2a2.114 2.114 0 00-2.116 2.112c0 1.167.947 2.113 2.116 2.113zM11.473 6.875h-5.97a.611.611 0 00-.596.625v3.75A3.669 3.669 0 008.488 15a3.669 3.669 0 003.582-3.75V7.5a.611.611 0 00-.597-.625z"/><path fill="#000" d="M8.814 6.875v5.255a.598.598 0 01-.596.595H5.193a3.951 3.951 0 01-.287-1.476V7.5a.61.61 0 01.597-.624h3.31z" opacity=".1"/><path fill="#000" d="M8.488 6.875v5.58a.6.6 0 01-.596.595H5.347a3.22 3.22 0 01-.267-.65 3.951 3.951 0 01-.172-1.15V7.498a.61.61 0 01.596-.624h2.985z" opacity=".2"/><path fill="#000" d="M8.488 6.875v4.93a.6.6 0 01-.596.595H5.08a3.951 3.951 0 01-.172-1.15V7.498a.61.61 0 01.596-.624h2.985z" opacity=".2"/><path fill="#000" d="M8.163 6.875v4.93a.6.6 0 01-.596.595H5.079a3.951 3.951 0 01-.172-1.15V7.498a.61.61 0 01.596-.624h2.66z" opacity=".2"/><path fill="#000" d="M8.814 5.195v1.024c-.055.003-.107.006-.163.006-.055 0-.107-.003-.163-.006A2.115 2.115 0 016.593 4.6h1.625a.598.598 0 01.596.594z" opacity=".1"/><path fill="#000" d="M8.488 5.52v.699a2.115 2.115 0 01-1.79-1.293h1.195a.598.598 0 01.595.594z" opacity=".2"/><path fill="#000" d="M8.488 5.52v.699a2.115 2.115 0 01-1.79-1.293h1.195a.598.598 0 01.595.594z" opacity=".2"/><path fill="#000" d="M8.163 5.52v.647a2.115 2.115 0 01-1.465-1.242h.87a.598.598 0 01.595.595z" opacity=".2"/><path fill="url(#microsoft-teams-color-16__paint0_linear_2372_494)" d="M1.597 4.925h5.969c.33 0 .597.267.597.596v5.958a.596.596 0 01-.597.596h-5.97A.596.596 0 011 11.479V5.521c0-.33.267-.596.597-.596z"/><path fill="#fff" d="M6.152 7.193H4.959v3.243h-.76V7.193H3.01v-.63h3.141v.63z"/></symbol><symbol id="flight-okta-24" viewBox="0 0 24 24"><path d="M12 2C6.49 2 2 6.458 2 12s4.459 10 10 10 10-4.459 10-10S17.51 2 12 2zm0 15c-2.77 0-5-2.23-5-5s2.23-5 5-5 5 2.23 5 5-2.23 5-5 5z"/></symbol><symbol id="flight-okta-16" viewBox="0 0 16 16"><path d="M8 1C4.143 1 1 4.12 1 8s3.121 7 7 7 7-3.121 7-7-3.143-7-7-7zm0 10.5c-1.94 0-3.5-1.56-3.5-3.5S6.06 4.5 8 4.5s3.5 1.56 3.5 3.5-1.56 3.5-3.5 3.5z"/></symbol><symbol id="flight-okta-color-24" viewBox="0 0 24 24"><path fill="#007DC1" d="M12 2C6.49 2 2 6.458 2 12s4.459 10 10 10 10-4.459 10-10S17.51 2 12 2zm0 15c-2.77 0-5-2.23-5-5s2.23-5 5-5 5 2.23 5 5-2.23 5-5 5z"/></symbol><symbol id="flight-okta-color-16" viewBox="0 0 16 16"><path fill="#007DC1" d="M8 1C4.143 1 1 4.12 1 8s3.121 7 7 7 7-3.121 7-7-3.143-7-7-7zm0 10.5c-1.94 0-3.5-1.56-3.5-3.5S6.06 4.5 8 4.5s3.5 1.56 3.5 3.5-1.56 3.5-3.5 3.5z"/></symbol><symbol id="flight-oracle-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M2 12c0 3.48 2.832 6.3 6.326 6.3h7.348C19.168 18.3 22 15.48 22 12s-2.832-6.3-6.326-6.3H8.326C4.832 5.7 2 8.52 2 12zm17.61 0a4.086 4.086 0 01-4.095 4.078H8.489a4.086 4.086 0 01-4.095-4.077A4.086 4.086 0 018.49 7.923h7.026a4.086 4.086 0 014.094 4.078z" clip-rule="evenodd"/></symbol><symbol id="flight-oracle-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M.1 8c0 2.761 2.237 5 4.997 5h5.806A4.999 4.999 0 0015.9 8c0-2.761-2.237-5-4.997-5H5.097A4.999 4.999 0 00.1 8zm13.911 0a3.235 3.235 0 01-3.234 3.237h-5.55A3.235 3.235 0 011.991 8a3.235 3.235 0 013.234-3.236h5.551A3.235 3.235 0 0114.011 8z" clip-rule="evenodd"/></symbol><symbol id="flight-oracle-color-24" viewBox="0 0 24 24"><path fill="#EA1B22" fill-rule="evenodd" d="M2 12c0 3.48 2.832 6.3 6.326 6.3h7.348C19.168 18.3 22 15.48 22 12s-2.832-6.3-6.326-6.3H8.326C4.832 5.7 2 8.52 2 12zm17.61 0a4.086 4.086 0 01-4.095 4.078H8.489a4.086 4.086 0 01-4.095-4.077A4.086 4.086 0 018.49 7.923h7.026a4.086 4.086 0 014.094 4.078z" clip-rule="evenodd"/></symbol><symbol id="flight-oracle-color-16" viewBox="0 0 16 16"><path fill="#EA1B22" fill-rule="evenodd" d="M.1 8c0 2.761 2.237 5 4.997 5h5.806A4.999 4.999 0 0015.9 8c0-2.761-2.237-5-4.997-5H5.097A4.999 4.999 0 00.1 8zm13.911 0a3.235 3.235 0 01-3.234 3.237h-5.55A3.235 3.235 0 011.991 8a3.235 3.235 0 013.234-3.236h5.551A3.235 3.235 0 0114.011 8z" clip-rule="evenodd"/></symbol><symbol id="flight-opa-24" viewBox="0 0 24 24"><g><path d="M5.57 11.916a8.076 8.076 0 011.724-3.283c-.265-.21-1.315-1.078-1.364-1.76C5.854 5.755 6.904 2 6.904 2S3.73 6.109 3.51 7.77c-.175 1.302 1.83 3.889 2.042 4.151v-.005h.018zm12.913-.066v.01c0 .004.005.009.005.014.35-.45 2.167-2.859 2.001-4.105C20.27 6.11 17.096 2 17.096 2s1.05 3.756.974 4.872c-.045.654-1 1.47-1.32 1.728a7.979 7.979 0 011.733 3.25z"/><path d="M18.483 11.854v-.01a8.041 8.041 0 00-1.732-3.249c-1.234-1.384-2.913-2.214-4.722-2.214v4.438h.005c.444.005.803.391.803.864 0 .057-.004.11-.013.162-.072.396-.395.696-.79.701h-.014v1.647l-.008 7.797h.157s1.705-2.624 2.625-3.374c1.077-.878 3.69-1.966 3.69-1.966v-4.743l.013-.005c-.005-.01-.005-.024-.01-.033 0-.005 0-.01-.004-.015z"/><path d="M12.02 14.197v-1.646a.825.825 0 01-.776-.635.935.935 0 01-.032-.229c0-.477.364-.863.813-.863h.004V6.4c-1.818 0-3.5.835-4.735 2.233-.785.888-1.387 2.01-1.723 3.284h-.014v4.805s2.612 1.088 3.69 1.966c.893.73 2.616 3.312 2.616 3.312h.162v-.005h-.01l.005-7.798z"/></g></symbol><symbol id="flight-opa-16" viewBox="0 0 16 16"><g><path d="M3.462 7.942a5.638 5.638 0 011.216-2.299c-.187-.147-.928-.755-.963-1.232C3.661 3.629 4.403 1 4.403 1s-2.24 2.876-2.395 4.039C1.884 5.95 3.3 7.76 3.449 7.945v-.003h.013zm9.114-.047V7.9c0 .004.003.007.003.01.248-.314 1.53-2 1.413-2.872C13.838 3.876 11.598 1 11.598 1s.742 2.629.688 3.41c-.032.458-.707 1.03-.932 1.21a5.57 5.57 0 011.223 2.275z"/><path d="M12.576 7.898v-.006a5.615 5.615 0 00-1.223-2.275c-.87-.97-2.056-1.55-3.333-1.55v3.106h.004c.313.004.567.274.567.605 0 .04-.003.077-.01.114a.583.583 0 01-.557.49h-.01v1.153l-.006 5.458h.11s1.205-1.837 1.854-2.361c.76-.615 2.604-1.377 2.604-1.377v-3.32l.01-.003c-.004-.007-.004-.017-.007-.024 0-.003 0-.006-.003-.01z"/><path d="M8.014 9.538V8.386a.58.58 0 01-.548-.444.65.65 0 01-.022-.16c0-.335.257-.605.573-.605h.004V4.08c-1.284 0-2.472.585-3.343 1.563a5.616 5.616 0 00-1.216 2.299h-.01v3.364s1.844.761 2.604 1.376c.63.51 1.847 2.318 1.847 2.318h.114v-.003h-.006l.003-5.459z"/></g></symbol><symbol id="flight-opa-color-24" viewBox="0 0 24 24"><path fill="#BFBFBF" d="M5.57 11.916a8.076 8.076 0 011.724-3.283c-.265-.21-1.315-1.078-1.364-1.76C5.854 5.755 6.904 2 6.904 2S3.73 6.109 3.51 7.77c-.175 1.302 1.83 3.889 2.042 4.151v-.005h.018zm12.913-.066v.01c0 .004.005.009.005.014.35-.45 2.167-2.859 2.001-4.105C20.27 6.11 17.096 2 17.096 2s1.05 3.756.974 4.872c-.045.654-1 1.47-1.32 1.728a7.979 7.979 0 011.733 3.25z"/><path fill="#566366" d="M18.483 11.854v-.01a8.041 8.041 0 00-1.732-3.249c-1.234-1.384-2.913-2.214-4.722-2.214v4.438h.005c.444.005.803.391.803.864 0 .057-.004.11-.013.162-.072.396-.395.696-.79.701h-.014v1.647l-.008 7.797h.157s1.705-2.624 2.625-3.374c1.077-.878 3.69-1.966 3.69-1.966v-4.743l.013-.005c-.005-.01-.005-.024-.01-.033 0-.005 0-.01-.004-.015z"/><path fill="#7D9199" d="M12.02 14.197v-1.646a.825.825 0 01-.776-.635.935.935 0 01-.032-.229c0-.477.364-.863.813-.863h.004V6.4c-1.818 0-3.5.835-4.735 2.233-.785.888-1.387 2.01-1.723 3.284h-.014v4.805s2.612 1.088 3.69 1.966c.893.73 2.616 3.312 2.616 3.312h.162v-.005h-.01l.005-7.798z"/></symbol><symbol id="flight-opa-color-16" viewBox="0 0 16 16"><path fill="#BFBFBF" d="M3.462 7.942a5.638 5.638 0 011.216-2.299c-.187-.147-.928-.755-.963-1.232C3.661 3.629 4.403 1 4.403 1s-2.24 2.876-2.395 4.039C1.884 5.95 3.3 7.76 3.449 7.945v-.003h.013zm9.114-.047V7.9c0 .004.003.007.003.01.248-.314 1.53-2 1.413-2.872C13.838 3.876 11.598 1 11.598 1s.742 2.629.688 3.41c-.032.458-.707 1.03-.932 1.21a5.57 5.57 0 011.223 2.275z"/><path fill="#566366" d="M12.576 7.898v-.006a5.615 5.615 0 00-1.223-2.275c-.87-.97-2.056-1.55-3.333-1.55v3.106h.004c.313.004.567.274.567.605 0 .04-.003.077-.01.114a.583.583 0 01-.557.49h-.01v1.153l-.006 5.458h.11s1.205-1.837 1.854-2.361c.76-.615 2.604-1.377 2.604-1.377v-3.32l.01-.003c-.004-.007-.004-.017-.007-.024 0-.003 0-.006-.003-.01z"/><path fill="#7D9199" d="M8.014 9.538V8.386a.58.58 0 01-.548-.444.65.65 0 01-.022-.16c0-.335.257-.605.573-.605h.004V4.08c-1.284 0-2.472.585-3.343 1.563a5.616 5.616 0 00-1.216 2.299h-.01v3.364s1.844.761 2.604 1.376c.63.51 1.847 2.318 1.847 2.318h.114v-.003h-.006l.003-5.459z"/></symbol><symbol id="flight-pack-24" viewBox="0 0 24 24"><g><path d="M12.317 5.685L15.8 3.59a.697.697 0 01.317-.083c.348 0 .633.297.633.66v4.191a.671.671 0 01-.317.577l-4.116 2.475a.622.622 0 01-.634 0L7.567 8.935a.715.715 0 01-.317-.577v-4.19c0-.116.016-.232.08-.33a.617.617 0 01.87-.248l3.483 2.095c.19.116.444.116.634 0zM6.433 14.685L2.95 12.59a.617.617 0 00-.87.247.599.599 0 00-.08.33v4.191c0 .231.127.445.317.578l4.116 2.474c.19.116.444.116.634 0l4.116-2.474a.671.671 0 00.317-.578v-4.19c0-.364-.285-.66-.633-.66a.697.697 0 00-.317.082l-3.483 2.095a.622.622 0 01-.634 0zM16.933 14.685L13.45 12.59a.617.617 0 00-.87.247.598.598 0 00-.08.33v4.191c0 .231.127.445.317.578l4.116 2.474c.19.116.444.116.634 0l4.116-2.474a.671.671 0 00.317-.578v-4.19c0-.364-.285-.66-.633-.66a.697.697 0 00-.317.082l-3.483 2.095a.622.622 0 01-.634 0z"/></g></symbol><symbol id="flight-pack-16" viewBox="0 0 16 16"><g><path d="M8.2 4.366l2.2-1.31c.06-.03.13-.051.2-.051.22 0 .4.185.4.412v2.62c0 .154-.08.288-.2.36L8.2 7.944a.396.396 0 01-.4 0L5.2 6.397a.446.446 0 01-.2-.36v-2.62c0-.072.01-.144.05-.206a.392.392 0 01.55-.155l2.2 1.31c.12.072.28.072.4 0zM4.3 9.866l-2.2-1.31a.392.392 0 00-.55.155.371.371 0 00-.05.206v2.62c0 .144.08.278.2.36l2.6 1.547c.12.072.28.072.4 0l2.6-1.547c.12-.072.2-.206.2-.36v-2.62a.408.408 0 00-.4-.412c-.07 0-.14.02-.2.051l-2.2 1.31a.396.396 0 01-.4 0zM11.3 9.866l-2.2-1.31a.392.392 0 00-.55.155.371.371 0 00-.05.206v2.62c0 .144.08.278.2.36l2.6 1.547c.12.072.28.072.4 0l2.6-1.547c.12-.072.2-.206.2-.36v-2.62a.408.408 0 00-.4-.412c-.07 0-.14.02-.2.051l-2.2 1.31a.396.396 0 01-.4 0z"/></g></symbol><symbol id="flight-pack-color-24" viewBox="0 0 24 24"><path fill="#DE156C" d="M16.933 14.686L13.45 12.59a.617.617 0 00-.87.247.599.599 0 00-.08.33v4.193c0 .231.127.445.317.578l4.116 2.475c.19.116.444.116.634 0l4.116-2.475A.672.672 0 0022 17.36v-4.192c0-.364-.285-.66-.633-.66a.696.696 0 00-.317.082l-3.483 2.096a.622.622 0 01-.634 0z"/><path fill="url(#pack-color-24__paint0_linear_1133_275)" d="M17.25 15.264v4.192c0 .364.285.66.633.66.111 0 .222-.032.317-.082l3.483-2.096A.671.671 0 0022 17.36v-4.192c0-.363-.285-.66-.633-.66a.697.697 0 00-.317.082l-3.483 2.097a.693.693 0 00-.317.577z"/><path fill="#47529D" d="M15.8 3.59l-3.483 2.096a.622.622 0 01-.634 0L8.2 3.59a.617.617 0 00-.87.247.6.6 0 00-.08.33V8.36c0 .23.127.446.317.578l4.116 2.475c.19.116.444.116.634 0l4.116-2.475a.672.672 0 00.317-.578V4.168c0-.364-.285-.66-.633-.66a.697.697 0 00-.317.082z"/><path fill="url(#pack-color-24__paint1_linear_1133_275)" d="M15.8 3.59l-3.483 2.096a.671.671 0 00-.317.578v4.192c0 .363.285.66.633.66.111 0 .222-.033.317-.082l3.483-2.096a.672.672 0 00.317-.578V4.168c0-.364-.285-.66-.633-.66a.697.697 0 00-.317.082z"/><g><path fill="#252960" d="M6.433 14.686L2.95 12.59a.617.617 0 00-.87.247.6.6 0 00-.08.33v4.193c0 .231.127.445.317.578l4.116 2.475c.19.116.444.116.634 0l4.116-2.475a.672.672 0 00.317-.578v-4.192c0-.364-.285-.66-.633-.66a.696.696 0 00-.317.082l-3.483 2.096a.621.621 0 01-.634 0z"/><path fill="url(#pack-color-24__paint2_linear_1133_275)" d="M6.75 15.264v4.192c0 .364.285.66.633.66.111 0 .222-.032.317-.082l3.483-2.096a.671.671 0 00.317-.578v-4.192c0-.363-.285-.66-.633-.66a.697.697 0 00-.317.082l-3.483 2.097a.693.693 0 00-.317.577z"/></g></symbol><symbol id="flight-pack-color-16" viewBox="0 0 16 16"><path fill="#252960" d="M4.3 9.866l-2.2-1.31a.392.392 0 00-.55.155.371.371 0 00-.05.206v2.62c0 .145.08.279.2.361l2.6 1.548c.12.072.28.072.4 0l2.6-1.547c.12-.073.2-.207.2-.362v-2.62a.408.408 0 00-.4-.412c-.07 0-.14.02-.2.051l-2.2 1.31a.396.396 0 01-.4 0z"/><path fill="url(#pack-color-16__paint0_linear_1133_286)" d="M4.5 10.228v2.62c0 .227.18.412.4.412.07 0 .14-.02.2-.051l2.2-1.31c.12-.072.2-.206.2-.361v-2.62a.408.408 0 00-.4-.413c-.07 0-.14.02-.2.051l-2.2 1.31a.432.432 0 00-.2.362z"/><path fill="#DE156C" d="M11.3 9.866l-2.2-1.31a.392.392 0 00-.55.155.371.371 0 00-.05.206v2.62c0 .145.08.279.2.361l2.6 1.548c.12.072.28.072.4 0l2.6-1.547c.12-.073.2-.207.2-.362v-2.62a.408.408 0 00-.4-.412c-.07 0-.14.02-.2.051l-2.2 1.31a.396.396 0 01-.4 0z"/><path fill="url(#pack-color-16__paint1_linear_1133_286)" d="M11.5 10.228v2.62c0 .227.18.412.4.412.07 0 .14-.02.2-.051l2.2-1.31c.12-.072.2-.206.2-.361v-2.62a.408.408 0 00-.4-.413c-.07 0-.14.02-.2.051l-2.2 1.31a.432.432 0 00-.2.362z"/><g><path fill="#47529D" d="M10.4 3.056l-2.2 1.31a.396.396 0 01-.4 0l-2.2-1.31a.392.392 0 00-.55.155.371.371 0 00-.05.206v2.62c0 .145.08.279.2.361l2.6 1.548c.12.072.28.072.4 0l2.6-1.548c.12-.072.2-.206.2-.36v-2.62a.408.408 0 00-.4-.413c-.07 0-.14.02-.2.051z"/><path fill="url(#pack-color-16__paint2_linear_1133_286)" d="M10.4 3.056l-2.2 1.31a.419.419 0 00-.2.361v2.62c0 .228.18.413.4.413.07 0 .14-.02.2-.051l2.2-1.31c.12-.073.2-.207.2-.362v-2.62a.408.408 0 00-.4-.412c-.07 0-.14.02-.2.051z"/></g></symbol><symbol id="flight-saml-24" viewBox="0 0 24 24"><g><path d="M11.649 3l.66.6c.492.443.982.887 1.466 1.336 3.14 2.916 5.797 6.198 7.797 9.973.102.194.195.392.288.59.046.1.092.198.14.297l-.154.084-.116-.169c-.1-.145-.201-.29-.3-.437l-.21-.312c-1.456-2.162-2.914-4.328-4.917-6.059a9.358 9.358 0 00-1.99-1.322c-1.449-.708-2.738-.425-3.844.74-1.05 1.105-1.596 2.479-2.09 3.876-.063.18-.13.359-.198.537l-.117.314-.246-.08c.142-.508.274-1.02.406-1.533.3-1.162.6-2.324 1.017-3.444.444-1.192 1.003-2.343 1.561-3.494.242-.498.483-.996.716-1.497h.13z"/><path d="M12.64 17.356c-2.322 1.124-7.943 2.285-10.609 1.987-.435-2.347 3.84-13.348 5.94-15.015l-.135.32a6.858 6.858 0 01-.197.442l-.095.188c-1.084 2.137-2.17 4.277-2.725 6.621-.191.806-.32 1.644-.326 2.468-.014 1.96 1.176 3.292 3.167 3.375.959.04 1.924-.063 2.89-.166.42-.045.84-.09 1.258-.123.153-.012.304-.031.502-.057l.33-.042v.002z"/><path d="M6.036 21.68c-.635.05-1.27.099-1.904.158H4.13c5.853.57 11.472-.406 17.015-2.404-1.807-3.258-4.241-5.832-7.073-8.07a.93.93 0 00.201.35c.024.029.047.058.069.088.242.33.497.654.752.978.584.744 1.17 1.488 1.609 2.307 1.112 2.075.509 3.87-1.669 4.818-1.432.624-2.995 1.05-4.544 1.302-1.47.24-2.962.356-4.454.473z"/></g></symbol><symbol id="flight-saml-16" viewBox="0 0 16 16"><g><path d="M7.754 2l.463.41c.343.304.687.607 1.026.915C11.44 5.32 13.3 7.565 14.7 10.149c.072.132.137.268.202.403l.098.203-.108.057-.081-.115-.21-.299-.147-.214c-1.019-1.479-2.04-2.96-3.442-4.145a6.563 6.563 0 00-1.393-.904c-1.014-.485-1.916-.291-2.69.505-.736.757-1.118 1.697-1.463 2.653-.045.123-.092.245-.139.367l-.082.215-.172-.055c.1-.348.192-.698.284-1.049.21-.795.42-1.59.712-2.356.31-.816.702-1.603 1.093-2.39.169-.341.338-.682.5-1.025h.092z"/><path d="M8.448 11.822c-1.626.77-5.56 1.564-7.426 1.36C.717 11.576 3.71 4.05 5.18 2.91l-.095.218a4.638 4.638 0 01-.138.303l-.066.129c-.76 1.462-1.519 2.926-1.908 4.53a7.482 7.482 0 00-.228 1.689c-.01 1.34.824 2.252 2.217 2.309.67.027 1.347-.043 2.023-.114.294-.03.587-.061.88-.084.108-.008.214-.021.352-.039l.231-.028z"/><path d="M3.825 14.781c-.445.034-.89.068-1.333.108 4.097.39 8.03-.277 11.91-1.644-1.265-2.23-2.97-3.991-4.952-5.522.026.098.084.169.141.239l.048.06c.17.226.348.448.527.67.409.509.818 1.018 1.126 1.578.778 1.42.356 2.648-1.168 3.296-1.002.427-2.097.718-3.18.892-1.03.164-2.075.243-3.119.323z"/></g></symbol><symbol id="flight-saml-color-24" viewBox="0 0 24 24"><g fill="#C22E33"><path d="M11.649 3l.66.6c.492.443.982.887 1.466 1.336 3.14 2.916 5.797 6.198 7.797 9.973.102.194.195.392.288.59.046.1.092.198.14.297l-.154.084-.116-.169c-.1-.145-.201-.29-.3-.437l-.21-.312c-1.456-2.162-2.914-4.328-4.917-6.059a9.358 9.358 0 00-1.99-1.322c-1.449-.708-2.738-.425-3.844.74-1.05 1.105-1.596 2.479-2.09 3.876-.063.18-.13.359-.198.537l-.117.314-.246-.08c.142-.508.274-1.02.406-1.533.3-1.162.6-2.324 1.017-3.444.444-1.192 1.003-2.343 1.561-3.494.242-.498.483-.996.716-1.497h.13z"/><path d="M12.64 17.356c-2.322 1.124-7.943 2.285-10.609 1.987-.435-2.347 3.84-13.348 5.94-15.015l-.135.32a6.858 6.858 0 01-.197.442l-.095.188c-1.084 2.137-2.17 4.277-2.725 6.621-.191.806-.32 1.644-.326 2.468-.014 1.96 1.176 3.292 3.167 3.375.959.04 1.924-.063 2.89-.166.42-.045.84-.09 1.258-.123.153-.012.304-.031.502-.057l.33-.042v.002z"/><path d="M6.036 21.68c-.635.05-1.27.099-1.904.158H4.13c5.853.57 11.472-.406 17.015-2.404-1.807-3.258-4.241-5.832-7.073-8.07a.93.93 0 00.201.35c.024.029.047.058.069.088.242.33.497.654.752.978.584.744 1.17 1.488 1.609 2.307 1.112 2.075.509 3.87-1.669 4.818-1.432.624-2.995 1.05-4.544 1.302-1.47.24-2.962.356-4.454.473z"/></g></symbol><symbol id="flight-saml-color-16" viewBox="0 0 16 16"><g fill="#C22E33"><path d="M7.754 2l.463.41c.343.304.687.607 1.026.915C11.44 5.32 13.3 7.565 14.7 10.149c.072.132.137.268.202.403l.098.203-.108.057-.081-.115-.21-.299-.147-.214c-1.019-1.479-2.04-2.96-3.442-4.145a6.563 6.563 0 00-1.393-.904c-1.014-.485-1.916-.291-2.69.505-.736.757-1.118 1.697-1.463 2.653-.045.123-.092.245-.139.367l-.082.215-.172-.055c.1-.348.192-.698.284-1.049.21-.795.42-1.59.712-2.356.31-.816.702-1.603 1.093-2.39.169-.341.338-.682.5-1.025h.092z"/><path d="M8.448 11.822c-1.626.77-5.56 1.564-7.426 1.36C.717 11.576 3.71 4.05 5.18 2.91l-.095.218a4.638 4.638 0 01-.138.303l-.066.129c-.76 1.462-1.519 2.926-1.908 4.53a7.482 7.482 0 00-.228 1.689c-.01 1.34.824 2.252 2.217 2.309.67.027 1.347-.043 2.023-.114.294-.03.587-.061.88-.084.108-.008.214-.021.352-.039l.231-.028z"/><path d="M3.825 14.781c-.445.034-.89.068-1.333.108 4.097.39 8.03-.277 11.91-1.644-1.265-2.23-2.97-3.991-4.952-5.522.026.098.084.169.141.239l.048.06c.17.226.348.448.527.67.409.509.818 1.018 1.126 1.578.778 1.42.356 2.648-1.168 3.296-1.002.427-2.097.718-3.18.892-1.03.164-2.075.243-3.119.323z"/></g></symbol><symbol id="flight-slack-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M4.101 16.74a2.106 2.106 0 002.101-2.101v-2.101H4.101a2.106 2.106 0 00-2.1 2.1 2.106 2.106 0 002.1 2.102zm5.26-4.202a2.106 2.106 0 00-2.1 2.1V19.9A2.106 2.106 0 009.362 22a2.106 2.106 0 002.1-2.1v-5.262a2.106 2.106 0 00-2.1-2.1zM7.26 4.101a2.106 2.106 0 002.102 2.101h2.1V4.101a2.106 2.106 0 00-2.1-2.1A2.106 2.106 0 007.26 4.1zm4.203 5.26a2.106 2.106 0 00-2.101-2.1H4.1A2.106 2.106 0 002 9.362a2.106 2.106 0 002.1 2.1h5.262a2.106 2.106 0 002.1-2.1zM14.639 11.463a2.106 2.106 0 002.1-2.101V4.1a2.106 2.106 0 00-2.1-2.1 2.106 2.106 0 00-2.101 2.1v5.262a2.106 2.106 0 002.1 2.1zm5.26-4.202a2.106 2.106 0 00-2.1 2.1v2.102h2.1A2.106 2.106 0 0022 9.362a2.106 2.106 0 00-2.1-2.101zM12.538 14.639a2.106 2.106 0 002.1 2.1H19.9a2.106 2.106 0 002.1-2.1 2.106 2.106 0 00-2.1-2.101h-5.262a2.106 2.106 0 00-2.1 2.1zm4.202 5.26a2.106 2.106 0 00-2.101-2.1h-2.101v2.1a2.106 2.106 0 002.1 2.101 2.106 2.106 0 002.102-2.1z"/></g></symbol><symbol id="flight-slack-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M2.471 11.318a1.474 1.474 0 001.47-1.471v-1.47h-1.47A1.474 1.474 0 001 9.846c.001.811.659 1.469 1.47 1.47zm3.682-2.942a1.474 1.474 0 00-1.47 1.471v3.683c.002.811.659 1.468 1.47 1.47a1.474 1.474 0 001.47-1.47V9.846a1.474 1.474 0 00-1.47-1.47zM4.683 2.471c.001.811.659 1.469 1.47 1.47h1.47v-1.47A1.474 1.474 0 006.154 1a1.474 1.474 0 00-1.47 1.47zm2.94 3.682a1.474 1.474 0 00-1.47-1.47H2.47A1.474 1.474 0 001 6.153c.002.812.66 1.469 1.47 1.47h3.684a1.474 1.474 0 001.47-1.47zM9.847 7.624a1.474 1.474 0 001.47-1.47V2.47A1.474 1.474 0 009.848 1a1.474 1.474 0 00-1.47 1.47v3.684c.002.81.659 1.468 1.47 1.47zm3.682-2.941a1.474 1.474 0 00-1.47 1.47v1.47h1.47A1.474 1.474 0 0015 6.154a1.474 1.474 0 00-1.47-1.47zM8.377 9.847c.002.811.659 1.469 1.47 1.47h3.683A1.474 1.474 0 0015 9.848a1.474 1.474 0 00-1.47-1.47H9.847a1.474 1.474 0 00-1.47 1.47zm2.94 3.682a1.474 1.474 0 00-1.47-1.47h-1.47v1.47c.002.812.659 1.469 1.47 1.47a1.474 1.474 0 001.47-1.47z"/></g></symbol><symbol id="flight-slack-color-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path fill="#E01E5A" d="M4.101 16.74a2.106 2.106 0 002.101-2.101v-2.101H4.101a2.106 2.106 0 00-2.1 2.1 2.106 2.106 0 002.1 2.101zm5.26-4.202a2.106 2.106 0 00-2.1 2.1V19.9A2.106 2.106 0 009.362 22a2.106 2.106 0 002.1-2.1v-5.262a2.106 2.106 0 00-2.1-2.1z"/><path fill="#36C5F0" d="M7.26 4.101a2.106 2.106 0 002.102 2.101h2.1V4.101a2.106 2.106 0 00-2.1-2.1A2.106 2.106 0 007.26 4.1zm4.203 5.26a2.106 2.106 0 00-2.101-2.1H4.1A2.106 2.106 0 002 9.362a2.106 2.106 0 002.1 2.1h5.262a2.106 2.106 0 002.1-2.1z"/><path fill="#2EB67D" d="M14.639 11.463a2.106 2.106 0 002.1-2.101V4.1a2.106 2.106 0 00-2.1-2.1 2.106 2.106 0 00-2.1 2.1v5.262a2.106 2.106 0 002.1 2.1zm5.26-4.202a2.106 2.106 0 00-2.1 2.1v2.101h2.1A2.106 2.106 0 0022 9.363a2.106 2.106 0 00-2.1-2.101z"/><path fill="#ECB22E" d="M12.538 14.639a2.106 2.106 0 002.1 2.1H19.9a2.106 2.106 0 002.1-2.1 2.106 2.106 0 00-2.1-2.101h-5.262a2.106 2.106 0 00-2.1 2.1zm4.202 5.26a2.106 2.106 0 00-2.101-2.1h-2.1v2.1a2.106 2.106 0 002.1 2.1 2.106 2.106 0 002.1-2.1z"/></g></symbol><symbol id="flight-slack-color-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path fill="#E01E5A" d="M2.471 11.318a1.474 1.474 0 001.47-1.471v-1.47h-1.47A1.474 1.474 0 001 9.846c.001.811.659 1.469 1.47 1.47zm3.682-2.942a1.474 1.474 0 00-1.47 1.471v3.683c.002.811.66 1.468 1.47 1.47a1.474 1.474 0 001.47-1.47V9.846a1.474 1.474 0 00-1.47-1.47z"/><path fill="#36C5F0" d="M4.683 2.471c.001.811.659 1.469 1.47 1.47h1.47v-1.47A1.474 1.474 0 006.154 1a1.474 1.474 0 00-1.47 1.47zm2.94 3.682a1.474 1.474 0 00-1.47-1.47H2.47A1.474 1.474 0 001 6.153c.002.812.66 1.469 1.47 1.47h3.684a1.474 1.474 0 001.47-1.47z"/><path fill="#2EB67D" d="M9.847 7.624a1.474 1.474 0 001.47-1.47V2.47A1.474 1.474 0 009.848 1a1.474 1.474 0 00-1.47 1.47v3.684c.002.81.659 1.468 1.47 1.47zm3.682-2.941a1.474 1.474 0 00-1.47 1.47v1.47h1.47A1.474 1.474 0 0015 6.154a1.474 1.474 0 00-1.47-1.47z"/><path fill="#ECB22E" d="M8.377 9.847c.002.811.659 1.469 1.47 1.47h3.683A1.474 1.474 0 0015 9.848a1.474 1.474 0 00-1.47-1.47H9.847a1.474 1.474 0 00-1.47 1.47zm2.94 3.682a1.474 1.474 0 00-1.47-1.47h-1.47v1.47c.002.812.659 1.469 1.47 1.47a1.474 1.474 0 001.47-1.47z"/></g></symbol><symbol id="flight-snyk-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M16.11 9.49c.239 2.176.309 3.663.187 3.977-.108.28-.535.877-.896 1.355l.523 4.875L12 22.535 8.992 20.36l.328-3.057c-.178-.673-.222-1.407-.232-1.76l-.486 4.535-.52-.376.522-4.87c-.362-.48-.795-1.084-.904-1.366-.121-.315-.051-1.801.187-3.978l.003-.033-.762-2.07v-.041c0-.903 1.159-3.32 1.844-4.604l.334-.628.708 4.982.426.704.105-.036c.36-.122.902-.267 1.45-.267.579 0 1.161.168 1.457.268l.106.035.425-.704.708-4.982.334.628c.686 1.285 1.845 3.7 1.845 4.604v.042l-.763 2.07.004.032zm.158-2.206c-.042-.594-.655-2.017-1.24-3.215l-.144 1.01c.021.166.269 1.979 1.056 3.095l.328-.89zm-2.072 4.096c.062-.069.592-.674-.116-.674-.64 0-1.101.52-1.223.674h1.34zm-.645.705a.15.15 0 00.147-.13.153.153 0 00-.043-.129.025.025 0 00.003-.003.038.038 0 01.003-.002h-.43v.02c0 .312.25.564.558.564a.561.561 0 00.56-.563v-.021h-.426c.08.05.127.144.113.244a.247.247 0 01-.279.213.247.247 0 01-.206-.193zm-.964 6.575a1.312 1.312 0 01-.258-.133.478.478 0 01-.33.096.48.48 0 01-.33-.097 1.306 1.306 0 01-.258.133c.141.163.336.245.588.245.252 0 .446-.082.588-.244zM9.97 12.085a.151.151 0 00.103-.259c.002 0 .003-.002.004-.003l.003-.002h-.43v.02c0 .312.25.564.558.564.309 0 .56-.252.56-.563v-.021h-.426a.25.25 0 01-.166.457.247.247 0 01-.206-.193zm-.052-1.379c-.708 0-.179.605-.116.674h1.339c-.123-.154-.583-.674-1.223-.674zm-.94-6.637c-.584 1.198-1.198 2.62-1.24 3.215l.336.911c.73-1.013 1.001-2.62 1.06-3.03L8.98 4.069zm.572 11.304c0 .051.003 1.265.317 2.133.254.7.82.775 1.053.775.6 0 .844-.55.855-.573v-.28l-.004-.002s.01-.235-.023-.313c-.06-.14-.191-.107-.293.075l-.006.013a.115.115 0 01-.005.012c-.287-.21-.578-.47-.578-.67 0-.183.228-.505.237-.518l-.155-2.942-.987 1.135-.63.186c-.404-.532-.771-1.053-.845-1.223-.052-.245.038-1.852.241-3.687l.016-.143-.109-.296c.3-.345.566-.784.793-1.312l.672 1.112.482-.208c.007-.004.73-.31 1.414-.31H12v-.374h-.003c-.77 0-1.548.335-1.562.34l-.185.08-.68-1.127-.1-.699-.189.54c-.272.777-.613 1.386-1.014 1.809l-.06.064.158.427-.006.056c-.143 1.29-.33 3.474-.226 3.84l.004.012c.117.304.898 1.34 1.362 1.92l.052.065v.083zm1.297 3.373c.065.591.715.81 1.16.81.438 0 1.08-.219 1.143-.81l-.072.003c-.051 0-.102-.004-.151-.009-.199.386-.56.51-.928.51-.369 0-.732-.123-.93-.51a1.434 1.434 0 01-.149.009l-.057-.002-.016-.001zm3.6-3.456l.052-.064c.16-.2.355-.451.55-.71l-1.012-.298-.987-1.135-.155 2.942c.01.014.237.335.237.519 0 .2-.292.46-.58.669a.177.177 0 01-.003-.011l-.007-.015c-.101-.18-.232-.214-.292-.075-.034.08-.023.314-.023.314l-.005.003v.269c.017.036.264.583.856.583.232 0 .799-.075 1.052-.775.314-.867.318-2.082.318-2.133v-.083z" clip-rule="evenodd"/><path d="M11.995 7.121c-.513 0-1.015.115-1.391.23l-.233-.385-.155-1.094c.554-.038 1.152-.06 1.792-.06.688 0 1.774.058 1.774.058l-.155 1.096-.234.386a4.922 4.922 0 00-1.398-.23zM17.241 7.345c0-.266-.08-.626-.208-1.03.992.216 1.525.42 1.525.42v11.057l-2.244 1.622-.487-4.54c.45-.606.725-1.034.816-1.271.186-.48.019-2.482-.157-4.1l.755-2.05v-.108zM7.354 13.602c-.185-.48-.018-2.48.158-4.099l-.755-2.049v-.109c0-.266.08-.625.207-1.028-.992.216-1.525.418-1.525.418v11.058l2.253 1.628.486-4.536c-.453-.611-.732-1.043-.824-1.283z"/></g></symbol><symbol id="flight-snyk-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M10.936 6.174c.17 1.583.22 2.664.134 2.893-.078.204-.383.637-.64.985l.373 3.546-2.804 2.064L5.85 14.08l.235-2.223a6.168 6.168 0 01-.166-1.28l-.347 3.298-.372-.274.373-3.542c-.259-.349-.568-.788-.645-.993-.087-.229-.037-1.31.133-2.893l.003-.024-.545-1.505v-.03c0-.657.828-2.415 1.317-3.35L6.076.81l.506 3.623.303.512.076-.027a3.3 3.3 0 011.036-.194c.413 0 .829.122 1.04.195l.076.026.304-.512L9.922.81l.24.456c.488.934 1.316 2.692 1.316 3.348v.03l-.544 1.506.002.024zm.113-1.604c-.03-.432-.469-1.467-.886-2.338l-.103.735c.015.12.192 1.439.755 2.25l.234-.647zm-1.48 2.979c.044-.05.422-.49-.083-.49-.458 0-.787.378-.874.49h.957zm-.461.513c.052-.001.097-.04.105-.095a.112.112 0 00-.031-.094c.002 0 .003-.002.005-.004h-.308v.016c0 .226.178.41.399.41.22 0 .4-.184.4-.41v-.016h-.304a.182.182 0 01.08.178.177.177 0 01-.199.155.178.178 0 01-.147-.14zm-.689 4.781a.934.934 0 01-.184-.096.337.337 0 01-.236.07.338.338 0 01-.235-.07.93.93 0 01-.185.096c.101.118.24.178.42.178s.319-.06.42-.178zM6.55 8.062c.052-.001.098-.04.105-.095a.111.111 0 00-.031-.094l.002-.001.003-.003H6.32v.016c0 .226.179.41.4.41.22 0 .399-.184.399-.41v-.016h-.304c.057.037.09.106.08.178a.177.177 0 01-.199.155.178.178 0 01-.147-.14zm-.037-1.003c-.506 0-.128.44-.083.49h.956c-.087-.112-.416-.49-.873-.49zm-.671-4.827c-.418.871-.856 1.906-.886 2.338l.24.663c.52-.737.715-1.906.757-2.204l-.111-.797zm.408 8.221c0 .037.002.92.227 1.551.18.509.586.564.752.564.428 0 .603-.4.61-.417v-.203l-.003-.002s.008-.17-.016-.228c-.043-.101-.136-.077-.21.055l-.003.01a.074.074 0 01-.004.008c-.205-.152-.413-.341-.413-.487 0-.133.163-.367.17-.377l-.111-2.14-.706.826-.45.135c-.288-.387-.55-.766-.603-.89-.037-.177.027-1.346.172-2.68l.012-.105-.078-.215c.214-.25.404-.57.566-.954l.48.809.344-.152c.005-.002.521-.225 1.01-.225H8v-.272h-.002c-.55 0-1.106.243-1.115.247l-.133.059-.486-.82-.071-.508-.135.392c-.194.565-.438 1.008-.724 1.316l-.043.046.113.311-.004.04c-.102.94-.237 2.527-.162 2.793l.003.009c.084.221.641.974.973 1.397l.037.047v.06zm.927 2.453c.046.43.51.589.828.589.313 0 .77-.159.817-.59l-.011.001-.041.002a1.01 1.01 0 01-.108-.006c-.142.28-.4.37-.663.37s-.522-.089-.664-.37a1.01 1.01 0 01-.106.006c-.014 0-.028 0-.041-.002h-.011zm2.571-2.513l.037-.047c.114-.145.254-.328.392-.516l-.722-.217-.705-.825-.11 2.14c.006.01.168.243.168.376 0 .146-.208.335-.413.487l-.003-.008a.08.08 0 00-.005-.01c-.072-.132-.166-.156-.209-.055-.024.057-.016.228-.016.228l-.003.003v.194c.011.026.188.425.61.425.166 0 .572-.055.753-.564.224-.63.226-1.514.226-1.55v-.061z" clip-rule="evenodd"/><path d="M7.997 4.452c-.367 0-.726.083-.994.167l-.166-.28-.112-.796c.397-.027.824-.043 1.28-.043.492 0 1.268.042 1.268.042l-.111.797-.167.28a3.46 3.46 0 00-.998-.167zM11.744 4.614c0-.193-.058-.455-.149-.748a8.22 8.22 0 011.09.305v8.041l-1.603 1.18-.348-3.302c.32-.44.517-.752.583-.925.132-.349.013-1.804-.113-2.98l.54-1.491v-.08zM4.682 9.165c-.133-.349-.013-1.804.112-2.98l-.54-1.491v-.08c0-.193.058-.454.149-.747-.709.157-1.089.304-1.089.304v8.042l1.609 1.184.347-3.3c-.324-.443-.523-.758-.588-.932z"/></g></symbol><symbol id="flight-snyk-color-24" viewBox="0 0 24 24"><path fill="#fff" d="M17.164 6.805H6.868c0-.64.931-2.575 2.792-5.805l.773 5.11h3.146L14.35 1c1.875 3.273 2.813 5.208 2.813 5.805z"/><path fill="#fff" d="M12 23l-7-4.873V6.754s2.588-.95 7.01-.95c4.42 0 6.99.95 6.99.95v11.373L12 23z"/><path fill="#DBDBDB" d="M12 22.315l-6.553-4.542V7.21s2.45-.88 6.554-.88v15.985z"/><path fill="#C6C6C6" d="M12.01 6.33H12v15.972l6.496-4.53V7.21s-2.384-.88-6.487-.88z"/><path fill="#3B3B63" d="M15.546 19.83l-.552-4.77h-3.037v7.266l.043.041a91.578 91.578 0 003.546-2.537z"/><path fill="#53537A" d="M8.457 19.868l3.543 2.5.002-7.454H8.933l-.476 4.954z"/><path fill="#BC9375" d="M13.517 18.455c0 .82-.783 1.226-1.5 1.226-.72 0-1.518-.406-1.518-1.226"/><path fill="#fff" d="M12.008 18.88c-.576 0-.857-.414-.857-1.265h.275c0 .996.393.996.582.996.189 0 .582 0 .582-.996h.275c0 .85-.28 1.264-.857 1.264z"/><path fill="#C49A7E" d="M12 17.823c.178.456.52.684 1.03.684.497 0 1.016-.256 1.253-.89.33-.885.327-2.117.327-2.117s1.468-1.797 1.468-2.404H12v4.727z"/><path fill="#D8B7A0" d="M7.864 13.096c0 .703 1.455 2.404 1.455 2.404s-.003 1.232.328 2.118c.236.632.755.889 1.253.889.509 0 .875-.228 1.1-.684v-4.727H7.865z"/><path fill="#3B3B63" d="M15.903 9.05c-1.132-1.134-1.415-3.5-1.415-3.5-.211.746-.67 2.943-.67 2.943s-.893-.282-1.854-.283c-.031 0-.031 2.96 0 8.883l.915-.647.17-3.137.974 1.087 1.255.358.47-.326c.199-.273.265-.505.313-.626.174-.439-.217-3.795-.217-3.795-.139-.284.059-.957.059-.957z"/><path fill="#53537A" d="M10.208 8.493s-.46-2.197-.67-2.943c0 0-.284 2.366-1.416 3.5 0 0 .198.673.059.957 0 0-.391 3.357-.217 3.795.048.12.115.353.314.626l.47.326 1.254-.359.974-1.086.17 3.137.855.63V8.192c-.964.002-1.793.3-1.793.3z"/><path fill="#333152" d="M15.11 3.358c.188.342 1.803 3.505 1.803 4.6l-.716 1.906c.12 1.076.362 3.413.18 3.87-.112.282-.54.863-.906 1.334l.5 4.465-.677.476-.376-3.262a5.22 5.22 0 01-.248 1.002c-.156.42-.433.739-.788.927-.02 1.008-.97 1.551-1.866 1.551-.903 0-1.861-.543-1.882-1.55a1.699 1.699 0 01-.79-.928 5.184 5.184 0 01-.242-.963l-.36 3.284-.68-.485.491-4.503c-.369-.473-.805-1.063-.918-1.348-.182-.457.05-2.794.17-3.87l-.758-1.973v-.064c0-1.095 1.657-4.127 1.845-4.469l.536-.96.49 3.34.264 1.804.348.558c.334-.11.9-.263 1.475-.263.574 0 1.145.154 1.48.264l.348-.56.752-5.143.526.96zm-3.094 16.153c.396 0 .96-.175 1.101-.64l-.044.002c-.077 0-.15-.007-.22-.016-.204.278-.522.362-.845.362-.322 0-.64-.085-.844-.363-.07.01-.143.017-.22.017l-.045-.002c.143.465.715.64 1.117.64zm-.464-.763c.123.09.275.14.456.14s.332-.05.455-.14a1.474 1.474 0 01-.264-.149c-.071.02-.139.02-.191.02-.052 0-.12 0-.192-.02a1.443 1.443 0 01-.264.149zm2.816-3.464c.487-.591 1.22-1.543 1.326-1.81.08-.274-.057-2.091-.23-3.615l-.01-.085.144-.378c-.474-.494-.805-1.17-1.03-1.808l-.03.2-.748 1.201-.291-.121c-.008-.003-.77-.315-1.494-.315-.729 0-1.479.311-1.486.314l-.293.123-.748-1.201-.022-.154c-.229.632-.56 1.296-1.03 1.779l.136.36-.01.085c-.173 1.524-.31 3.341-.227 3.623.103.26.837 1.211 1.323 1.802l.081.098v.127c0 .012.001 1.18.305 1.994.22.59.71.653.91.653.503 0 .716-.451.725-.47.118-.227.177-.6.177-1.118h.304c0 .416.064.79.19 1.12.008.016.227.47.733.47a.94.94 0 00.909-.655c.305-.816.305-1.982.305-1.994v-.126l.08-.1z"/><path fill="#333152" d="M14.285 12.106H12.819v.016c0 .5.443.905.962.905.52 0 .962-.405.962-.905v-.016h-.458z"/><path fill="#fff" d="M13.185 12.106v.016c0 .297.245.538.55.538.305 0 .55-.241.55-.538v-.016h-1.1z"/><path fill="#333152" d="M13.647 12.106l-.007.002c.032.007.05.077.043.124a.146.146 0 01-.145.124c.021.094.1.17.204.184a.242.242 0 00.275-.201c.014-.096-.033-.233-.112-.233h-.258zM10.746 12.106H9.281v.016c0 .5.442.905.961.905.52 0 .962-.405.962-.905v-.016h-.458z"/><path fill="#fff" d="M9.647 12.106v.016c0 .297.245.538.55.538.304 0 .55-.241.55-.538v-.016h-1.1z"/><path fill="#333152" d="M10.367 12.106h-.258l-.007.002c.032.007.05.077.043.124a.146.146 0 01-.145.124c.02.094.1.17.203.184a.242.242 0 00.276-.201c.013-.096-.034-.233-.112-.233z"/><path fill="#C49A7E" d="M14.174 11.68c.062-.066.584-.645-.114-.645-.632 0-1.086.497-1.207.645h1.321z"/><path fill="#D8B7A0" d="M11.16 11.68c-.12-.148-.575-.645-1.206-.645-.699 0-.176.579-.115.645h1.321zM7.8 7.769c.042-.568.647-1.93 1.224-3.077l.154 1.05c-.059.391-.327 1.93-1.046 2.899L7.8 7.769z"/><path fill="#C49A7E" d="M14.85 5.66l.142-.968c.577 1.147 1.183 2.509 1.224 3.077l-.324.851c-.777-1.067-1.02-2.802-1.042-2.96z"/><path fill="#fff" d="M11.47 17.205c-.272-.201-.55-.454-.55-.649 0-.128.231-.521.231-.521h1.72s.225.349.225.521c0 .181-.28.428-.56.628-.096-.16-.217-.188-.273-.061a.495.495 0 00-.02.258c-.153.096-.265.158-.265.158s-.086-.049-.209-.128a.523.523 0 00-.016-.288c-.056-.128-.18-.098-.276.068a.307.307 0 00-.008.014z"/><path fill="#333152" d="M11.47 17.205c-.272-.201-.55-.454-.55-.649 0-.128.231-.521.231-.521h1.72s.225.349.225.521c0 .181-.28.428-.56.628-.096-.16-.217-.188-.273-.061a.495.495 0 00-.02.258c-.153.096-.265.158-.265.158s-.086-.049-.209-.128a.523.523 0 00-.016-.288c-.056-.128-.18-.098-.276.068a.307.307 0 00-.008.014z"/></symbol><symbol id="flight-snyk-color-16" viewBox="0 0 16 16"><path fill="#fff" d="M11.689 4.222H4.335c0-.466.664-1.873 1.994-4.222l.552 3.717h2.247L9.679 0c1.34 2.38 2.01 3.787 2.01 4.222z"/><path fill="#fff" d="M8 16l-5-3.544V4.185s1.849-.69 5.007-.69c3.158 0 4.993.69 4.993.69v8.271L8 16z"/><path fill="#DBDBDB" d="M8 15.502l-4.68-3.304V4.516s1.75-.64 4.68-.64v11.626z"/><path fill="#C6C6C6" d="M8.007 3.875H8v11.617l4.64-3.294V4.516s-1.703-.64-4.633-.64z"/><path fill="#3B3B63" d="M10.533 13.694l-.395-3.47H7.97v5.286l.031.03c.844-.584 1.688-1.2 2.533-1.846z"/><path fill="#53537A" d="M5.469 13.722L8 15.54l.002-5.42H5.809l-.34 3.602z"/><path fill="#BC9375" d="M9.084 12.695c0 .596-.56.891-1.073.891-.513 0-1.083-.295-1.083-.891"/><path fill="#fff" d="M8.006 13.003c-.412 0-.612-.3-.612-.92h.196c0 .725.28.725.416.725.135 0 .416 0 .416-.724h.196c0 .618-.2.919-.612.919z"/><path fill="#C49A7E" d="M8 12.235c.127.332.372.497.735.497.356 0 .726-.186.895-.646.236-.644.234-1.54.234-1.54s1.049-1.307 1.049-1.75H8v3.439z"/><path fill="#D8B7A0" d="M5.046 8.797c0 .512 1.04 1.748 1.04 1.748s-.003.896.233 1.54c.168.46.54.647.895.647.364 0 .625-.165.786-.497V8.797H5.046z"/><path fill="#3B3B63" d="M10.788 5.855c-.809-.825-1.01-2.546-1.01-2.546-.152.542-.48 2.14-.48 2.14s-.637-.204-1.323-.206c-.023 0-.023 2.154 0 6.46l.653-.47.122-2.28.695.79.896.26.336-.237c.142-.198.19-.367.224-.455.124-.32-.155-2.76-.155-2.76-.1-.207.042-.696.042-.696z"/><path fill="#53537A" d="M6.72 5.45S6.39 3.85 6.24 3.31c0 0-.201 1.72-1.01 2.544 0 0 .141.49.042.696 0 0-.28 2.441-.155 2.76.034.088.082.257.224.455l.336.238.896-.261.695-.79.122 2.281.61.458V5.23c-.688.001-1.28.218-1.28.218z"/><path fill="#333152" d="M10.222 1.715c.134.249 1.287 2.549 1.287 3.346l-.511 1.386c.086.782.258 2.482.128 2.814-.08.206-.386.628-.647.97l.357 3.248-.483.346-.268-2.373c-.037.241-.093.498-.178.73-.112.305-.31.536-.562.673-.015.733-.694 1.128-1.334 1.128-.644 0-1.329-.395-1.344-1.127a1.23 1.23 0 01-.564-.675 3.828 3.828 0 01-.173-.7l-.257 2.388-.486-.352.351-3.276c-.263-.343-.575-.772-.656-.98-.13-.332.036-2.032.122-2.814l-.542-1.435v-.047c0-.796 1.184-3.001 1.318-3.25l.383-.698.35 2.43.189 1.31.248.407a3.47 3.47 0 011.053-.191c.41 0 .818.111 1.058.191l.248-.406.538-3.741.375.698zm-2.21 11.748c.282 0 .686-.128.786-.465h-.032c-.055 0-.106-.004-.156-.011-.146.202-.374.263-.604.263-.23 0-.457-.062-.603-.263-.05.007-.102.012-.158.012l-.031-.001c.101.337.51.465.797.465zm-.332-.555a.532.532 0 00.326.101.53.53 0 00.325-.101 1.055 1.055 0 01-.19-.108c-.05.014-.098.014-.135.014-.038 0-.087 0-.137-.015-.056.04-.12.078-.19.109zm2.011-2.52c.348-.43.872-1.122.947-1.315.058-.2-.04-1.522-.164-2.63l-.007-.062.103-.275c-.339-.359-.575-.85-.736-1.315l-.02.146-.535.874-.209-.089c-.005-.002-.55-.229-1.066-.229-.52 0-1.057.227-1.062.229l-.209.09-.535-.875-.015-.112c-.163.46-.4.943-.737 1.294l.099.263-.007.061c-.125 1.108-.222 2.43-.163 2.635.074.189.598.88.945 1.31l.058.072v.092c0 .009 0 .859.218 1.45a.67.67 0 00.65.475c.36 0 .511-.328.518-.342.084-.165.126-.436.126-.813h.217c0 .303.046.575.136.815.006.012.162.341.523.341a.671.671 0 00.65-.475c.217-.594.218-1.442.218-1.45v-.093l.057-.072z"/><path fill="#333152" d="M9.632 8.077H8.585v.011c0 .364.316.659.687.659.371 0 .687-.295.687-.659v-.01h-.327z"/><path fill="#fff" d="M8.847 8.077v.011a.392.392 0 10.785 0v-.01h-.785z"/><path fill="#333152" d="M9.177 8.077l-.005.002c.022.004.035.056.03.09a.105.105 0 01-.103.09.173.173 0 00.145.134.173.173 0 00.197-.147c.01-.07-.024-.169-.08-.169h-.184zM7.105 8.077H6.058v.011c0 .364.316.659.687.659.37 0 .687-.295.687-.659v-.01h-.327z"/><path fill="#fff" d="M6.32 8.077v.011a.392.392 0 00.785 0v-.01h-.786z"/><path fill="#333152" d="M6.833 8.077H6.65l-.005.002c.023.004.036.056.03.09a.105.105 0 01-.103.09.173.173 0 00.146.134.173.173 0 00.196-.147c.01-.07-.023-.169-.08-.169z"/><path fill="#C49A7E" d="M9.553 7.767c.044-.048.417-.469-.082-.469-.451 0-.776.362-.862.47h.944z"/><path fill="#D8B7A0" d="M7.4 7.767c-.086-.107-.41-.469-.862-.469-.499 0-.125.421-.082.47H7.4zM5 4.923c.03-.413.462-1.403.874-2.238l.11.763c-.042.285-.233 1.404-.747 2.109L5 4.923z"/><path fill="#C49A7E" d="M10.036 3.389l.101-.704c.412.835.845 1.825.875 2.238l-.232.619c-.555-.776-.729-2.038-.744-2.153z"/><path fill="#fff" d="M7.62 11.785c-.193-.146-.391-.33-.391-.472 0-.092.165-.379.165-.379h1.228s.161.254.161.38c0 .131-.2.31-.4.457-.069-.117-.155-.137-.195-.045a.367.367 0 00-.015.188 4.4 4.4 0 01-.189.115s-.061-.036-.149-.094a.387.387 0 00-.011-.21c-.04-.093-.129-.07-.198.05a.397.397 0 00-.005.01z"/><path fill="#333152" d="M7.62 11.785c-.193-.146-.391-.33-.391-.472 0-.092.165-.379.165-.379h1.228s.161.254.161.38c0 .131-.2.31-.4.457-.069-.117-.155-.137-.195-.045a.367.367 0 00-.015.188 4.4 4.4 0 01-.189.115s-.061-.036-.149-.094a.387.387 0 00-.011-.21c-.04-.093-.129-.07-.198.05a.397.397 0 00-.005.01z"/></symbol><symbol id="flight-splunk-24" viewBox="0 0 24 24"><g><path d="M6.763 12.298c.025-.136.037-.264.037-.382 0-.334-.067-.597-.201-.792a.63.63 0 00-.546-.29.665.665 0 00-.577.309c-.142.205-.213.483-.213.833 0 .342.07.61.21.806.14.195.331.293.574.293a.563.563 0 00.361-.112.84.84 0 00.23-.287c.06-.115.101-.242.125-.378zM19.807 9.825a.206.206 0 00-.035.003v.103h.035c.039 0 .073-.015.073-.052 0-.027-.02-.054-.073-.054z"/><path fill-rule="evenodd" d="M20.04 9.943c0-.13-.097-.233-.217-.233h-.001c-.12 0-.217.103-.217.231 0 .13.098.233.218.233.121.001.217-.103.217-.231zm-.235.026h-.034v.13h-.048v-.305a.49.49 0 01.085-.007c.046 0 .076.01.094.023.018.013.028.034.028.063 0 .04-.026.065-.059.074v.003c.027.005.045.029.051.074a.264.264 0 00.02.076h-.051a.215.215 0 01-.021-.078c-.007-.038-.026-.053-.065-.053z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M23 1H1v22h22V1zM4.05 13.006a.917.917 0 00.05-.63.69.69 0 00-.121-.228 1.689 1.689 0 00-.24-.241 7.575 7.575 0 00-.381-.3 3.048 3.048 0 01-.321-.274.308.308 0 01-.094-.22c0-.086.035-.156.106-.214a.41.41 0 01.268-.085c.177 0 .346.056.506.17l.236-.383a1.514 1.514 0 00-.407-.184 1.624 1.624 0 00-.455-.064c-.148 0-.286.021-.412.062a.977.977 0 00-.324.17.76.76 0 00-.291.61c0 .11.019.207.057.293a.905.905 0 00.15.232c.063.07.132.134.208.195.076.061.155.12.235.177.105.078.19.143.256.196.067.052.119.101.157.146a.406.406 0 01.078.131.44.44 0 01.021.138.339.339 0 01-.117.272.46.46 0 01-.311.1.696.696 0 01-.307-.073 1.646 1.646 0 01-.338-.231L2 13.197c.157.126.313.217.47.27.156.055.333.082.53.082.165 0 .317-.022.455-.067.139-.044.258-.106.359-.186.1-.08.18-.176.235-.29zm3.496-1.743c.065.187.097.394.097.622 0 .24-.036.46-.11.662a1.67 1.67 0 01-.302.527 1.342 1.342 0 01-1.035.475c-.093 0-.18-.007-.26-.024a.847.847 0 01-.23-.082 1.144 1.144 0 01-.215-.15 2.077 2.077 0 01-.22-.225V15h-.775v-4.573h.775l.004.445c.141-.178.294-.31.459-.393.165-.083.357-.124.574-.124.197 0 .377.037.54.112.163.076.305.18.423.314.119.134.21.295.275.482zm1.237 2.212h-.796V9h.796v4.475zm3.396-3.052v3.055h-.795l-.002-.409c-.153.171-.31.294-.471.37a1.324 1.324 0 01-.562.112c-.238 0-.438-.047-.601-.143a.817.817 0 01-.353-.425.674.674 0 01-.046-.14 2.2 2.2 0 01-.042-.385 12.303 12.303 0 01-.004-.3v-1.734h.796v1.746c0 .155.007.273.021.355.014.082.04.155.076.22.093.17.257.257.49.257.3 0 .506-.127.619-.38a.885.885 0 00.06-.216c.012-.08.018-.193.018-.34v-1.643h.796zm3.429 1.321v1.73h-.795v-1.742a2.22 2.22 0 00-.021-.353.69.69 0 00-.075-.22c-.093-.17-.257-.255-.491-.255a.75.75 0 00-.385.094.57.57 0 00-.239.277.865.865 0 00-.058.223c-.01.079-.015.19-.015.332v1.645h-.802v-3.046h.801l.001.408c.154-.17.31-.294.472-.37.161-.075.348-.113.562-.113.238 0 .438.05.601.15a.849.849 0 01.395.561 1.89 1.89 0 01.045.377c.003.084.004.184.004.302zm2.08.006l1.213 1.524-.742.262-1.2-1.682v1.622h-.802V9h.802v2.627h.085l1.067-1.25.602.262-1.024 1.11zM22 11.681v.5l-2.411 1.212v-.536l1.868-.931-1.868-.92v-.548L22 11.68zm-2.446-1.74a.27.27 0 01.268-.274h.001c.148 0 .266.122.266.274a.269.269 0 01-.267.275.27.27 0 01-.268-.275z" clip-rule="evenodd"/></g></symbol><symbol id="flight-splunk-16" viewBox="0 0 16 16"><g><path d="M4.334 8.198c.018-.09.026-.175.026-.254 0-.222-.047-.398-.14-.528a.448.448 0 00-.383-.193.472.472 0 00-.404.205c-.1.138-.149.323-.149.556 0 .228.05.407.147.537.098.13.232.196.402.196a.407.407 0 00.253-.075.566.566 0 00.161-.191.868.868 0 00.087-.253zM13.465 6.55a.15.15 0 00-.025.002v.069h.025c.027 0 .051-.01.051-.035 0-.018-.014-.036-.051-.036z"/><path fill-rule="evenodd" d="M13.628 6.628a.153.153 0 00-.152-.155.154.154 0 00-.152.154c0 .087.068.156.152.156a.151.151 0 00.152-.155zm-.164.018h-.024v.087h-.034V6.53a.359.359 0 01.06-.004c.032 0 .053.006.065.015.013.009.02.023.02.042 0 .027-.018.043-.041.05v.001c.019.003.031.02.035.05a.17.17 0 00.014.05h-.035a.137.137 0 01-.015-.052c-.005-.025-.018-.035-.045-.035z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M16 0H0v16h16V0zM2.435 8.67a.584.584 0 00.035-.42.453.453 0 00-.085-.151 1.155 1.155 0 00-.167-.161 5.278 5.278 0 00-.267-.2 2.11 2.11 0 01-.225-.183.2.2 0 01-.066-.146c0-.057.025-.105.074-.143a.297.297 0 01.188-.057c.124 0 .242.038.354.114l.165-.255a1.087 1.087 0 00-.285-.124 1.19 1.19 0 00-.318-.042c-.104 0-.2.014-.288.041a.695.695 0 00-.228.114.536.536 0 00-.149.176.487.487 0 00-.054.23c0 .073.013.139.04.196a.6.6 0 00.105.154c.044.047.092.09.146.13.053.041.108.08.164.118l.18.13a.766.766 0 01.109.098c.026.03.045.06.054.088a.28.28 0 01.015.092.221.221 0 01-.082.18.333.333 0 01-.217.068.508.508 0 01-.215-.049 1.157 1.157 0 01-.236-.154L1 8.798c.11.084.22.144.329.18.11.037.233.055.371.055.115 0 .222-.015.319-.045a.803.803 0 00.25-.124.563.563 0 00.166-.193zM4.882 7.51c.045.124.068.262.068.414 0 .16-.025.307-.077.442-.05.134-.121.251-.212.351a.957.957 0 01-.724.317.97.97 0 01-.182-.016.612.612 0 01-.16-.055.805.805 0 01-.151-.1c-.05-.04-.1-.09-.155-.15V10h-.542V6.952h.543l.003.296a.963.963 0 01.32-.262.922.922 0 01.403-.083.89.89 0 01.867.606zm.866 1.474H5.19V6h.557v2.983zM8.125 6.95v2.035l-.556.001-.002-.272a1.043 1.043 0 01-.33.246.966.966 0 01-.393.075.851.851 0 01-.42-.095.552.552 0 01-.248-.283.435.435 0 01-.031-.094 1.407 1.407 0 01-.03-.257 7.818 7.818 0 01-.003-.2V6.95h.557v1.165c0 .103.005.182.015.236.01.054.028.103.053.146.065.115.18.172.344.172.21 0 .353-.085.432-.253a.568.568 0 00.043-.145c.008-.053.012-.128.012-.226V6.95h.557zm2.4.88v1.154H9.97V7.82a1.41 1.41 0 00-.015-.235.446.446 0 00-.052-.146c-.065-.114-.18-.17-.344-.17a.545.545 0 00-.27.062.386.386 0 00-.167.185.555.555 0 00-.04.148c-.007.053-.01.127-.01.221v1.097h-.562v-2.03h.56l.002.272a1.05 1.05 0 01.33-.246.958.958 0 01.393-.076c.166 0 .306.033.42.1a.573.573 0 01.277.374 1.199 1.199 0 01.032.252c.002.055.003.122.003.2zm1.457.004l.849 1.016-.52.175-.84-1.121v1.08h-.56V6h.56v1.752h.06l.746-.833.422.175-.717.74zM15 7.788v.332l-1.688.809v-.357l1.308-.622-1.308-.613v-.365L15 7.788zm-1.712-1.16c0-.102.084-.183.187-.183.104 0 .188.08.188.182a.183.183 0 01-.188.184.184.184 0 01-.187-.184z" clip-rule="evenodd"/></g></symbol><symbol id="flight-splunk-color-24" viewBox="0 0 24 24"><g fill="#000"><path d="M6.763 12.298c.025-.136.037-.264.037-.382 0-.334-.067-.597-.201-.792a.63.63 0 00-.546-.29.665.665 0 00-.577.309c-.142.205-.213.483-.213.833 0 .342.07.61.21.806.14.195.331.293.574.293a.563.563 0 00.361-.112.84.84 0 00.23-.287c.06-.115.101-.242.125-.378zM19.807 9.825a.206.206 0 00-.035.003v.103h.035c.039 0 .073-.015.073-.052 0-.027-.02-.054-.073-.054z"/><path fill-rule="evenodd" d="M20.04 9.943c0-.13-.097-.233-.217-.233h-.001c-.12 0-.217.103-.217.231 0 .13.098.233.218.233.121.001.217-.103.217-.231zm-.235.026h-.034v.13h-.048v-.305a.49.49 0 01.085-.007c.046 0 .076.01.094.023.018.013.028.034.028.063 0 .04-.026.065-.059.074v.003c.027.005.045.029.051.074a.264.264 0 00.02.076h-.051a.215.215 0 01-.021-.078c-.007-.038-.026-.053-.065-.053z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M23 1H1v22h22V1zM4.05 13.006a.917.917 0 00.05-.63.69.69 0 00-.121-.228 1.689 1.689 0 00-.24-.241 7.575 7.575 0 00-.381-.3 3.048 3.048 0 01-.321-.274.308.308 0 01-.094-.22c0-.086.035-.156.106-.214a.41.41 0 01.268-.085c.177 0 .346.056.506.17l.236-.383a1.514 1.514 0 00-.407-.184 1.624 1.624 0 00-.455-.064c-.148 0-.286.021-.412.062a.977.977 0 00-.324.17.76.76 0 00-.291.61c0 .11.019.207.057.293a.905.905 0 00.15.232c.063.07.132.134.208.195.076.061.155.12.235.177.105.078.19.143.256.196.067.052.119.101.157.146a.406.406 0 01.078.131.44.44 0 01.021.138.339.339 0 01-.117.272.46.46 0 01-.311.1.696.696 0 01-.307-.073 1.646 1.646 0 01-.338-.231L2 13.197c.157.126.313.217.47.27.156.055.333.082.53.082.165 0 .317-.022.455-.067.139-.044.258-.106.359-.186.1-.08.18-.176.235-.29zm3.496-1.743c.065.187.097.394.097.622 0 .24-.036.46-.11.662a1.67 1.67 0 01-.302.527 1.342 1.342 0 01-1.035.475c-.093 0-.18-.007-.26-.024a.847.847 0 01-.23-.082 1.144 1.144 0 01-.215-.15 2.077 2.077 0 01-.22-.225V15h-.775v-4.573h.775l.004.445c.141-.178.294-.31.459-.393.165-.083.357-.124.574-.124.197 0 .377.037.54.112.163.076.305.18.423.314.119.134.21.295.275.482zm1.237 2.212h-.796V9h.796v4.475zm3.396-3.052v3.055h-.795l-.002-.409c-.153.171-.31.294-.471.37a1.324 1.324 0 01-.562.112c-.238 0-.438-.047-.601-.143a.817.817 0 01-.353-.425.674.674 0 01-.046-.14 2.2 2.2 0 01-.042-.385 12.303 12.303 0 01-.004-.3v-1.734h.796v1.746c0 .155.007.273.021.355.014.082.04.155.076.22.093.17.257.257.49.257.3 0 .506-.127.619-.38a.885.885 0 00.06-.216c.012-.08.018-.193.018-.34v-1.643h.796zm3.429 1.321v1.73h-.795v-1.742a2.22 2.22 0 00-.021-.353.69.69 0 00-.075-.22c-.093-.17-.257-.255-.491-.255a.75.75 0 00-.385.094.57.57 0 00-.239.277.865.865 0 00-.058.223c-.01.079-.015.19-.015.332v1.645h-.802v-3.046h.801l.001.408c.154-.17.31-.294.472-.37.161-.075.348-.113.562-.113.238 0 .438.05.601.15a.849.849 0 01.395.561 1.89 1.89 0 01.045.377c.003.084.004.184.004.302zm2.08.006l1.213 1.524-.742.262-1.2-1.682v1.622h-.802V9h.802v2.627h.085l1.067-1.25.602.262-1.024 1.11zM22 11.681v.5l-2.411 1.212v-.536l1.868-.931-1.868-.92v-.548L22 11.68zm-2.446-1.74a.27.27 0 01.268-.274h.001c.148 0 .266.122.266.274a.269.269 0 01-.267.275.27.27 0 01-.268-.275z" clip-rule="evenodd"/></g></symbol><symbol id="flight-splunk-color-16" viewBox="0 0 16 16"><g fill="#000"><path d="M4.334 8.198c.018-.09.026-.175.026-.254 0-.222-.047-.398-.14-.528a.448.448 0 00-.383-.193.472.472 0 00-.404.205c-.1.138-.149.323-.149.556 0 .228.05.407.147.537.098.13.232.196.402.196a.407.407 0 00.253-.075.566.566 0 00.161-.191.868.868 0 00.087-.253zM13.465 6.55a.15.15 0 00-.025.002v.069h.025c.027 0 .051-.01.051-.035 0-.018-.014-.036-.051-.036z"/><path fill-rule="evenodd" d="M13.628 6.628a.153.153 0 00-.152-.155.154.154 0 00-.152.154c0 .087.068.156.152.156a.151.151 0 00.152-.155zm-.164.018h-.024v.087h-.034V6.53a.359.359 0 01.06-.004c.032 0 .053.006.065.015.013.009.02.023.02.042 0 .027-.018.043-.041.05v.001c.019.003.031.02.035.05a.17.17 0 00.014.05h-.035a.137.137 0 01-.015-.052c-.005-.025-.018-.035-.045-.035z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M16 0H0v16h16V0zM2.435 8.67a.584.584 0 00.035-.42.453.453 0 00-.085-.151 1.155 1.155 0 00-.167-.161 5.278 5.278 0 00-.267-.2 2.11 2.11 0 01-.225-.183.2.2 0 01-.066-.146c0-.057.025-.105.074-.143a.297.297 0 01.188-.057c.124 0 .242.038.354.114l.165-.255a1.087 1.087 0 00-.285-.124 1.19 1.19 0 00-.318-.042c-.104 0-.2.014-.288.041a.695.695 0 00-.228.114.536.536 0 00-.149.176.487.487 0 00-.054.23c0 .073.013.139.04.196a.6.6 0 00.105.154c.044.047.092.09.146.13.053.041.108.08.164.118l.18.13a.766.766 0 01.109.098c.026.03.045.06.054.088a.28.28 0 01.015.092.221.221 0 01-.082.18.333.333 0 01-.217.068.508.508 0 01-.215-.049 1.157 1.157 0 01-.236-.154L1 8.798c.11.084.22.144.329.18.11.037.233.055.371.055.115 0 .222-.015.319-.045a.803.803 0 00.25-.124.563.563 0 00.166-.193zM4.882 7.51c.045.124.068.262.068.414 0 .16-.025.307-.077.442-.05.134-.121.251-.212.351a.957.957 0 01-.724.317.97.97 0 01-.182-.016.612.612 0 01-.16-.055.805.805 0 01-.151-.1c-.05-.04-.1-.09-.155-.15V10h-.542V6.952h.543l.003.296a.963.963 0 01.32-.262.922.922 0 01.403-.083.89.89 0 01.867.606zm.866 1.474H5.19V6h.557v2.983zM8.125 6.95v2.035l-.556.001-.002-.272a1.043 1.043 0 01-.33.246.966.966 0 01-.393.075.851.851 0 01-.42-.095.552.552 0 01-.248-.283.435.435 0 01-.031-.094 1.407 1.407 0 01-.03-.257 7.818 7.818 0 01-.003-.2V6.95h.557v1.165c0 .103.005.182.015.236.01.054.028.103.053.146.065.115.18.172.344.172.21 0 .353-.085.432-.253a.568.568 0 00.043-.145c.008-.053.012-.128.012-.226V6.95h.557zm2.4.88v1.154H9.97V7.82a1.41 1.41 0 00-.015-.235.446.446 0 00-.052-.146c-.065-.114-.18-.17-.344-.17a.545.545 0 00-.27.062.386.386 0 00-.167.185.555.555 0 00-.04.148c-.007.053-.01.127-.01.221v1.097h-.562v-2.03h.56l.002.272a1.05 1.05 0 01.33-.246.958.958 0 01.393-.076c.166 0 .306.033.42.1a.573.573 0 01.277.374 1.199 1.199 0 01.032.252c.002.055.003.122.003.2zm1.457.004l.849 1.016-.52.175-.84-1.121v1.08h-.56V6h.56v1.752h.06l.746-.833.422.175-.717.74zM15 7.788v.332l-1.688.809v-.357l1.308-.622-1.308-.613v-.365L15 7.788zm-1.712-1.16c0-.102.084-.183.187-.183.104 0 .188.08.188.182a.183.183 0 01-.188.184.184.184 0 01-.187-.184z" clip-rule="evenodd"/></g></symbol><symbol id="flight-twitch-24" viewBox="0 0 24 24"><g><path d="M6.5 1L2.57 4.929V19.07h4.715V23l3.928-3.929h3.143L21.428 12V1H6.5zm13.357 10.214l-3.143 3.143h-3.143l-2.75 2.75v-2.75H7.286V2.571h12.571v8.643z"/><path d="M17.5 5.321h-1.572v4.715H17.5V5.32zM13.178 5.321h-1.571v4.715h1.571V5.32z"/></g></symbol><symbol id="flight-twitch-16" viewBox="0 0 16 16"><g><path d="M4.5 1L2 3.5v9h3V15l2.5-2.5h2L14 8V1H4.5zM13 7.5l-2 2H9l-1.75 1.75V9.5H5V2h8v5.5z"/><path d="M11.5 3.75h-1v3h1v-3zM8.75 3.75h-1v3h1v-3z"/></g></symbol><symbol id="flight-twitch-color-24" viewBox="0 0 24 24"><path fill="#fff" d="M19.857 11.214l-3.143 3.143h-3.143l-2.75 2.75v-2.75H7.286V2.571h12.571v8.643z"/><g fill="#9146FF"><path d="M6.5 1L2.57 4.929V19.07h4.715V23l3.928-3.929h3.143L21.428 12V1H6.5zm13.357 10.214l-3.143 3.143h-3.143l-2.75 2.75v-2.75H7.286V2.571h12.571v8.643z"/><path d="M17.5 5.321h-1.572v4.715H17.5V5.32zM13.178 5.321h-1.571v4.715h1.571V5.32z"/></g></symbol><symbol id="flight-twitch-color-16" viewBox="0 0 16 16"><path fill="#fff" d="M13 7.5l-2 2H9l-1.75 1.75V9.5H5V2h8v5.5z"/><g fill="#9146FF"><path d="M4.5 1L2 3.5v9h3V15l2.5-2.5h2L14 8V1H4.5zM13 7.5l-2 2H9l-1.75 1.75V9.5H5V2h8v5.5z"/><path d="M11.5 3.75h-1v3h1v-3zM8.75 3.75h-1v3h1v-3z"/></g></symbol><symbol id="flight-twitter-24" viewBox="0 0 24 24"><path d="M20.748 7.512c.013.194.013.388.013.584 0 5.964-4.54 12.842-12.842 12.842v-.003A12.777 12.777 0 011 18.91a9.063 9.063 0 006.68-1.87 4.52 4.52 0 01-4.217-3.135 4.5 4.5 0 002.038-.078 4.514 4.514 0 01-3.62-4.424v-.057c.627.35 1.33.543 2.048.565a4.52 4.52 0 01-1.397-6.027 12.81 12.81 0 009.302 4.716 4.518 4.518 0 017.692-4.117c1.01-.2 1.98-.57 2.866-1.096a4.53 4.53 0 01-1.984 2.497A8.977 8.977 0 0023 5.174a9.169 9.169 0 01-2.252 2.338z"/></symbol><symbol id="flight-twitter-16" viewBox="0 0 16 16"><path d="M13.567 5.144c.008.123.008.247.008.371 0 3.796-2.889 8.173-8.172 8.173v-.002A8.131 8.131 0 011 12.398a5.768 5.768 0 004.25-1.19 2.876 2.876 0 01-2.683-1.995c.431.083.875.066 1.297-.05A2.873 2.873 0 011.56 6.348v-.036c.4.222.847.345 1.304.36a2.876 2.876 0 01-.89-3.836 8.152 8.152 0 005.92 3 2.874 2.874 0 014.895-2.619 5.763 5.763 0 001.824-.697 2.883 2.883 0 01-1.262 1.588A5.712 5.712 0 0015 3.656a5.834 5.834 0 01-1.433 1.488z"/></symbol><symbol id="flight-twitter-color-24" viewBox="0 0 24 24"><path fill="#1D9BF0" d="M20.748 7.512c.013.194.013.388.013.584 0 5.964-4.54 12.842-12.842 12.842v-.003A12.777 12.777 0 011 18.91a9.063 9.063 0 006.68-1.87 4.52 4.52 0 01-4.217-3.135 4.5 4.5 0 002.038-.078 4.514 4.514 0 01-3.62-4.424v-.057c.627.35 1.33.543 2.048.565a4.52 4.52 0 01-1.397-6.027 12.81 12.81 0 009.302 4.716 4.518 4.518 0 017.692-4.117c1.01-.2 1.98-.57 2.866-1.096a4.53 4.53 0 01-1.984 2.497A8.977 8.977 0 0023 5.174a9.169 9.169 0 01-2.252 2.338z"/></symbol><symbol id="flight-twitter-color-16" viewBox="0 0 16 16"><path fill="#1D9BF0" d="M13.567 5.144c.008.123.008.247.008.371 0 3.796-2.889 8.173-8.172 8.173v-.002A8.131 8.131 0 011 12.398a5.768 5.768 0 004.25-1.19 2.876 2.876 0 01-2.683-1.995c.431.083.875.066 1.297-.05A2.873 2.873 0 011.56 6.348v-.036c.4.222.847.345 1.304.36a2.876 2.876 0 01-.89-3.836 8.152 8.152 0 005.92 3 2.874 2.874 0 014.895-2.619 5.763 5.763 0 001.824-.697 2.883 2.883 0 01-1.262 1.588A5.712 5.712 0 0015 3.656a5.834 5.834 0 01-1.433 1.488z"/></symbol><symbol id="flight-vantage-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm15.152 2.268a.44.44 0 00.623 0l3.103-3.102a.44.44 0 000-.623L16.775 7.44a.44.44 0 00-.623 0l-3.102 3.103a.44.44 0 000 .623l3.102 3.102zm-3.847 4.47l3.103-3.102a.44.44 0 000-.623l-3.103-3.103a.44.44 0 00-.623 0L8.58 15.012a.44.44 0 000 .624l3.102 3.102a.44.44 0 00.623 0zM4.11 11.166l3.102 3.102a.44.44 0 00.623 0l3.103-3.102a.44.44 0 000-.623L7.835 7.44a.44.44 0 00-.623 0L4.11 10.543a.44.44 0 000 .623z" clip-rule="evenodd"/></symbol><symbol id="flight-vantage-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M1 8a7 7 0 1114 0A7 7 0 011 8zm9.642 1.443c.11.11.287.11.397 0l1.974-1.974a.28.28 0 000-.397L11.04 5.098a.28.28 0 00-.397 0L8.668 7.072a.28.28 0 000 .397l1.974 1.974zm-2.448 2.845l1.975-1.975a.28.28 0 000-.396L8.194 7.943a.28.28 0 00-.396 0L5.823 9.917a.28.28 0 000 .396l1.975 1.975c.11.11.287.11.396 0zM2.98 7.469l1.974 1.974c.11.11.287.11.397 0L7.324 7.47a.28.28 0 000-.397L5.35 5.098a.28.28 0 00-.397 0L2.98 7.072a.28.28 0 000 .397z" clip-rule="evenodd"/></symbol><symbol id="flight-vantage-color-24" viewBox="0 0 24 24"><path fill="#9C24C7" fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm15.152 2.268a.44.44 0 00.623 0l3.103-3.102a.44.44 0 000-.623L16.775 7.44a.44.44 0 00-.623 0l-3.102 3.103a.44.44 0 000 .623l3.102 3.102zm-3.847 4.47l3.103-3.102a.44.44 0 000-.623l-3.103-3.103a.44.44 0 00-.623 0L8.58 15.012a.44.44 0 000 .624l3.102 3.102a.44.44 0 00.623 0zM4.11 11.166l3.102 3.102a.44.44 0 00.623 0l3.103-3.102a.44.44 0 000-.623L7.835 7.44a.44.44 0 00-.623 0L4.11 10.543a.44.44 0 000 .623z" clip-rule="evenodd"/></symbol><symbol id="flight-vantage-color-16" viewBox="0 0 16 16"><path fill="#9C24C7" fill-rule="evenodd" d="M1 8a7 7 0 1114 0A7 7 0 011 8zm9.642 1.443c.11.11.287.11.397 0l1.974-1.974a.28.28 0 000-.397L11.04 5.098a.28.28 0 00-.397 0L8.668 7.072a.28.28 0 000 .397l1.974 1.974zm-2.448 2.845l1.975-1.975a.28.28 0 000-.396L8.194 7.943a.28.28 0 00-.396 0L5.823 9.917a.28.28 0 000 .396l1.975 1.975c.11.11.287.11.396 0zM2.98 7.469l1.974 1.974c.11.11.287.11.397 0L7.324 7.47a.28.28 0 000-.397L5.35 5.098a.28.28 0 00-.397 0L2.98 7.072a.28.28 0 000 .397z" clip-rule="evenodd"/></symbol><symbol id="flight-vmware-24" viewBox="0 0 24 24"><path d="M4.096 8.468c-.251-.57-.873-.829-1.453-.562-.58.267-.795.934-.532 1.505l2.436 5.48c.383.859.787 1.309 1.545 1.309.81 0 1.163-.49 1.545-1.309l2.147-4.838a.309.309 0 01.306-.204.345.345 0 01.336.355v4.682c0 .722.387 1.314 1.131 1.314s1.146-.592 1.146-1.314v-3.832c0-.739.512-1.218 1.21-1.218.697 0 1.16.497 1.16 1.218v3.832c0 .722.389 1.314 1.132 1.314.743 0 1.147-.592 1.147-1.314v-3.832c0-.739.51-1.218 1.208-1.218.696 0 1.162.497 1.162 1.218v3.832c0 .722.388 1.314 1.131 1.314.744 0 1.147-.592 1.147-1.314v-4.36C22 8.922 20.755 7.8 19.256 7.8c-1.497 0-2.434 1.072-2.434 1.072-.498-.669-1.185-1.07-2.347-1.07-1.227 0-2.3 1.07-2.3 1.07-.499-.669-1.348-1.07-2.05-1.07-1.087 0-1.95.494-2.477 1.74l-1.556 3.795-1.996-4.869z"/></symbol><symbol id="flight-vmware-16" viewBox="0 0 16 16"><path d="M1.677 5.14c-.201-.46-.698-.67-1.162-.454-.465.216-.636.756-.426 1.218l1.949 4.436c.306.696.63 1.06 1.236 1.06.647 0 .93-.397 1.236-1.06l1.717-3.916a.247.247 0 01.245-.165c.146 0 .27.123.27.287v3.79c0 .585.308 1.064.904 1.064.595 0 .916-.48.916-1.063V7.235c0-.599.41-.987.968-.987s.929.402.929.987v3.102c0 .584.31 1.063.905 1.063s.918-.48.918-1.063V7.235c0-.599.408-.987.966-.987.557 0 .93.402.93.987v3.102c0 .584.31 1.063.905 1.063.594 0 .917-.48.917-1.063v-3.53c0-1.298-.996-2.207-2.195-2.207-1.197 0-1.947.868-1.947.868-.4-.542-.949-.867-1.878-.867-.982 0-1.84.867-1.84.867-.4-.542-1.078-.867-1.64-.867-.87 0-1.56.4-1.982 1.41L3.274 9.082 1.677 5.14z"/></symbol><symbol id="flight-vmware-color-24" viewBox="0 0 24 24"><path fill="#696566" d="M4.096 8.468c-.251-.57-.873-.829-1.453-.562-.58.267-.795.934-.532 1.505l2.436 5.48c.383.859.787 1.309 1.545 1.309.81 0 1.163-.49 1.545-1.309l2.147-4.838a.309.309 0 01.306-.204.345.345 0 01.336.355v4.682c0 .722.387 1.314 1.131 1.314s1.146-.592 1.146-1.314v-3.832c0-.739.512-1.218 1.21-1.218.697 0 1.16.497 1.16 1.218v3.832c0 .722.389 1.314 1.132 1.314.743 0 1.147-.592 1.147-1.314v-3.832c0-.739.51-1.218 1.208-1.218.696 0 1.162.497 1.162 1.218v3.832c0 .722.388 1.314 1.131 1.314.744 0 1.147-.592 1.147-1.314v-4.36C22 8.922 20.755 7.8 19.256 7.8c-1.497 0-2.434 1.072-2.434 1.072-.498-.669-1.185-1.07-2.347-1.07-1.227 0-2.3 1.07-2.3 1.07-.499-.669-1.348-1.07-2.05-1.07-1.087 0-1.95.494-2.477 1.74l-1.556 3.795-1.996-4.869z"/></symbol><symbol id="flight-vmware-color-16" viewBox="0 0 16 16"><path fill="#696566" d="M1.677 5.141c-.201-.462-.698-.67-1.162-.455-.465.216-.636.756-.426 1.218l1.949 4.437c.306.695.63 1.06 1.236 1.06.647 0 .93-.398 1.236-1.06l1.717-3.917a.247.247 0 01.245-.165c.146 0 .27.123.27.287v3.79c0 .585.308 1.064.904 1.064.595 0 .916-.48.916-1.063V7.235c0-.599.41-.987.968-.987s.929.402.929.987v3.102c0 .584.31 1.063.905 1.063s.918-.48.918-1.063V7.235c0-.599.408-.987.966-.987.557 0 .93.402.93.987v3.102c0 .584.31 1.063.905 1.063.594 0 .917-.48.917-1.063v-3.53c0-1.298-.996-2.207-2.195-2.207-1.197 0-1.947.868-1.947.868-.4-.542-.949-.867-1.878-.867-.982 0-1.84.867-1.84.867-.4-.542-1.078-.867-1.64-.867-.87 0-1.56.4-1.982 1.41L3.274 9.083 1.677 5.14z"/></symbol><symbol id="flight-youtube-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M20.608 4.77a2.757 2.757 0 011.939 1.939C23 8.43 23 12 23 12s0 3.57-.453 5.292a2.757 2.757 0 01-1.94 1.939c-1.72.453-8.607.453-8.607.453s-6.886 0-8.608-.453a2.756 2.756 0 01-1.939-1.94C1 15.589 1 12.002 1 12.002s0-3.57.453-5.292a2.756 2.756 0 011.94-1.94C5.112 4.316 12 4.316 12 4.316s6.886 0 8.608.453zm-5.092 7.248l-5.727 3.298V8.702l5.727 3.316z" clip-rule="evenodd"/></symbol><symbol id="flight-youtube-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M13.478 3.399c.6.161 1.072.634 1.234 1.234C15 5.728 15 8 15 8s0 2.272-.288 3.367a1.754 1.754 0 01-1.234 1.234C12.382 12.89 8 12.89 8 12.89s-4.382 0-5.478-.289a1.754 1.754 0 01-1.234-1.234C1 10.283 1 8 1 8s0-2.272.288-3.367c.162-.6.635-1.073 1.234-1.234C3.618 3.11 8 3.11 8 3.11s4.382 0 5.478.289zm-3.24 4.612l-3.645 2.1V5.9l3.644 2.11z" clip-rule="evenodd"/></symbol><symbol id="flight-youtube-color-24" viewBox="0 0 24 24"><path fill="red" d="M22.547 6.708a2.757 2.757 0 00-1.94-1.939C18.888 4.316 12 4.316 12 4.316s-6.886 0-8.608.453a2.756 2.756 0 00-1.939 1.94C1 8.43 1 12 1 12s0 3.588.453 5.292a2.756 2.756 0 001.94 1.939c1.72.453 8.607.453 8.607.453s6.886 0 8.608-.453a2.757 2.757 0 001.939-1.94c.453-1.72.453-5.29.453-5.29s0-3.57-.453-5.292z"/><path fill="#fff" d="M9.79 15.316l5.726-3.298-5.727-3.316v6.614z"/></symbol><symbol id="flight-youtube-color-16" viewBox="0 0 16 16"><path fill="red" d="M14.712 4.633a1.754 1.754 0 00-1.234-1.234C12.382 3.11 8 3.11 8 3.11s-4.382 0-5.478.289c-.6.161-1.072.634-1.234 1.234C1 5.728 1 8 1 8s0 2.283.288 3.367c.162.6.635 1.073 1.234 1.234C3.618 12.89 8 12.89 8 12.89s4.382 0 5.478-.289a1.754 1.754 0 001.234-1.234C15 10.272 15 8 15 8s0-2.272-.288-3.367z"/><path fill="#fff" d="M6.593 10.11l3.644-2.098-3.644-2.11v4.208z"/></symbol><symbol id="flight-boundary-24" viewBox="0 0 24 24"><g><path d="M6.586 22v-1.55H9.8v-.958H8.241v-1.56h7.356L12.18 12l3.417-5.934H8.058v8.229H4V2h13.964l2.33 4.046L16.866 12l3.498 6.074L18.103 22H6.586z"/><path d="M7.21 17.932H5.656v1.56H7.21v-1.56zM4 20.438h1.556v1.56H4v-1.56z"/></g></symbol><symbol id="flight-boundary-16" viewBox="0 0 16 16"><g><path d="M4.81 15v-1.085h2.25v-.67H5.968v-1.093h5.149L8.726 8l2.392-4.154H5.84v5.76H3V1h9.775l1.631 2.832L12.006 8l2.448 4.252L12.872 15H4.81z"/><path d="M5.248 12.152h-1.09v1.092h1.09v-1.092zM3 13.907h1.09v1.092H3v-1.092z"/></g></symbol><symbol id="flight-boundary-color-24" viewBox="0 0 24 24"><g fill="#F24C53"><path d="M6.586 22v-1.55H9.8v-.958H8.241v-1.56h7.356L12.18 12l3.417-5.934H8.058v8.229H4V2h13.964l2.33 4.046L16.866 12l3.498 6.074L18.103 22H6.586z"/><path d="M7.21 17.932H5.656v1.56H7.21v-1.56zM5.556 20.438H4v1.56h1.556v-1.56z"/></g></symbol><symbol id="flight-boundary-color-16" viewBox="0 0 16 16"><g fill="#F24C53"><path d="M4.81 15v-1.085h2.25v-.67H5.968v-1.093h5.149L8.726 8l2.392-4.154H5.84v5.76H3V1h9.775l1.631 2.832L12.006 8l2.448 4.252L12.872 15H4.81z"/><path d="M5.248 12.152h-1.09v1.092h1.09v-1.092zM4.09 13.907H3v1.092h1.09v-1.092z"/></g></symbol><symbol id="flight-consul-24" viewBox="0 0 24 24"><g><path d="M6.872 21.731A11 11 0 0012.009 23a10.97 10.97 0 007.442-2.902l-2.61-2.73a7.229 7.229 0 110-10.73l2.61-2.73A11 11 0 106.87 21.73zM20.36 17.346a.901.901 0 101.001-1.498.901.901 0 00-1.001 1.498z"/><path d="M11.939 14.383a2.383 2.383 0 11-.02-4.766 2.383 2.383 0 01.02 4.766zM21.394 14.274a.902.902 0 101.002-1.5.902.902 0 00-1.002 1.5zM19.214 14.313a.902.902 0 110-1.804.902.902 0 010 1.804zM21.394 11.236a.901.901 0 101.001-1.5.901.901 0 00-1.001 1.5zM19.214 11.49a.901.901 0 110-1.803.901.901 0 010 1.803zM20.411 8.204a.901.901 0 10.999-1.5.901.901 0 00-.999 1.5z"/></g></symbol><symbol id="flight-consul-16" viewBox="0 0 16 16"><g><path d="M4.737 14.193A7 7 0 008.006 15a6.98 6.98 0 004.735-1.847l-1.66-1.737a4.6 4.6 0 110-6.828l1.66-1.738a7 7 0 10-8.004 11.343zM13.32 11.402a.573.573 0 10.637-.953.573.573 0 00-.637.953z"/><path d="M7.96 9.517a1.517 1.517 0 11-.012-3.034 1.517 1.517 0 01.013 3.034zM13.978 9.447a.574.574 0 10.637-.954.574.574 0 00-.637.954zM12.59 9.472a.574.574 0 110-1.148.574.574 0 010 1.148zM13.978 7.514a.574.574 0 10.637-.954.574.574 0 00-.637.954zM12.59 7.675a.574.574 0 110-1.148.574.574 0 010 1.148zM13.353 5.585a.574.574 0 10.635-.956.574.574 0 00-.635.956z"/></g></symbol><symbol id="flight-consul-color-24" viewBox="0 0 24 24"><g fill="#E03875"><path d="M12.009 23a11 11 0 117.442-19.092l-2.61 2.73a7.229 7.229 0 100 10.73l2.61 2.73A10.97 10.97 0 0112.009 23zM20.86 17.498a.901.901 0 110-1.802.901.901 0 010 1.802z"/><path d="M11.939 14.383a2.383 2.383 0 11-.02-4.766 2.383 2.383 0 01.02 4.766zM21.895 14.426a.902.902 0 110-1.805.902.902 0 010 1.805zM19.214 14.313a.902.902 0 110-1.804.902.902 0 010 1.804zM21.895 11.387a.901.901 0 110-1.802.901.901 0 010 1.802zM19.214 11.49a.901.901 0 110-1.803.901.901 0 010 1.803zM20.913 8.355a.901.901 0 11-.004-1.803.901.901 0 01.004 1.803z"/></g></symbol><symbol id="flight-consul-color-16" viewBox="0 0 16 16"><g fill="#E03875"><path d="M8.006 15A7 7 0 1112.74 2.85l-1.66 1.738a4.6 4.6 0 100 6.828l1.66 1.737A6.98 6.98 0 018.006 15zM13.638 11.499a.573.573 0 110-1.147.573.573 0 010 1.147z"/><path d="M7.96 9.517a1.517 1.517 0 11-.012-3.034 1.517 1.517 0 01.013 3.034zM14.296 9.544a.574.574 0 110-1.148.574.574 0 010 1.148zM12.59 9.472a.574.574 0 110-1.148.574.574 0 010 1.148zM14.296 7.61a.574.574 0 110-1.147.574.574 0 010 1.147zM12.59 7.675a.574.574 0 110-1.148.574.574 0 010 1.148zM13.672 5.68a.574.574 0 11-.003-1.147.574.574 0 01.003 1.148z"/></g></symbol><symbol id="flight-nomad-24" viewBox="0 0 24 24"><path d="M12 .5L2 6.25v11.5l10 5.75 10-5.75V6.25L12 .5zm4.456 12.646l-2.664 1.533-3.22-1.745v3.664l-3.026 1.911v-7.661l2.401-1.463 3.331 1.748v-3.74l3.185-1.902-.008 7.655z"/></symbol><symbol id="flight-nomad-16" viewBox="0 0 16 16"><path d="M8 0L1 4v8l7 4 7-4V4L8 0zm3.119 8.797L9.254 9.863 7.001 8.65v2.549l-2.118 1.33v-5.33l1.68-1.018 2.332 1.216V4.794l2.23-1.322-.006 5.325z"/></symbol><symbol id="flight-nomad-color-24" viewBox="0 0 24 24"><path fill="#06D092" d="M12 .5L2 6.25v11.5l10 5.75 10-5.75V6.25L12 .5zm4.456 12.646l-2.664 1.533-3.22-1.745v3.664l-3.026 1.911v-7.661l2.401-1.463 3.331 1.748v-3.74l3.185-1.902-.008 7.655z"/></symbol><symbol id="flight-nomad-color-16" viewBox="0 0 16 16"><path fill="#06D092" d="M8 0L1 4v8l7 4 7-4V4L8 0zm3.119 8.797L9.254 9.863 7.001 8.65v2.549l-2.118 1.33v-5.33l1.68-1.018 2.332 1.216V4.794l2.23-1.322-.006 5.325z"/></symbol><symbol id="flight-packer-24" viewBox="0 0 24 24"><g><path d="M8.028.5l8.067 4.668c1.593.928 2.903 2.996 2.905 4.6v7.134c0 1.614-1.306 2.158-2.903 1.233l-2.58-1.49V6.922L8.027 3.738V.5z"/><path d="M12.42 7.62L5 3.31v15.88l7.42 4.309V7.62z"/></g></symbol><symbol id="flight-packer-16" viewBox="0 0 16 16"><g><path d="M5.163 0l5.762 3.247c1.138.646 2.074 2.085 2.075 3.2v4.963c0 1.123-.933 1.502-2.074.858L9.083 11.23V4.469l-3.92-2.216V0z"/><path d="M8.3 4.953L3 1.956v11.047L8.3 16V4.953z"/></g></symbol><symbol id="flight-packer-color-24" viewBox="0 0 24 24"><g fill="#02A8EF"><path fill-rule="evenodd" d="M5 3.311l7.42 4.308V23.5L5 19.192V3.312z" clip-rule="evenodd"/><path d="M16.095 5.168L8.028.5v3.238l5.488 3.184v9.723l2.58 1.49c1.598.925 2.904.38 2.904-1.233V9.768c-.002-1.604-1.312-3.672-2.905-4.6z"/></g></symbol><symbol id="flight-packer-color-16" viewBox="0 0 16 16"><g fill="#02A8EF"><path fill-rule="evenodd" d="M3 1.956l5.3 2.997V16L3 13.003V1.956z" clip-rule="evenodd"/><path d="M10.925 3.247L5.163 0v2.252l3.92 2.216v6.764l1.843 1.036c1.14.644 2.074.265 2.074-.858V6.447c-.001-1.115-.937-2.554-2.075-3.2z"/></g></symbol><symbol id="flight-terraform-24" viewBox="0 0 24 24"><g><path d="M2 .6v7.197l6.212 3.6V4.2L2 .6zM15.107 8.215L8.893 4.618v7.197l6.214 3.6v-7.2zM15.788 15.414V8.215L22 4.618v7.197l-6.212 3.6zM15.105 23.4l-6.212-3.6v-7.197l6.212 3.6V23.4z"/></g></symbol><symbol id="flight-terraform-16" viewBox="0 0 16 16"><g><path d="M1 0v5.05l4.349 2.527V2.526L1 0zM10.175 5.344l-4.35-2.525v5.05l4.35 2.527V5.344zM10.651 10.396V5.344L15 2.819v5.05l-4.349 2.527zM10.174 16l-4.349-2.526v-5.05l4.349 2.525V16z"/></g></symbol><symbol id="flight-terraform-color-24" viewBox="0 0 24 24"><g fill="#7B42BC" fill-rule="evenodd" clip-rule="evenodd"><path d="M8.893 4.618l6.214 3.597v7.2l-6.214-3.6V4.618zM15.788 8.215v7.2l6.212-3.6V4.618l-6.212 3.597zM2 .6v7.197l6.212 3.6V4.2L2 .6zM8.893 19.8l6.212 3.6v-7.197l-6.212-3.6V19.8z"/></g></symbol><symbol id="flight-terraform-color-16" viewBox="0 0 16 16"><g fill="#7B42BC" fill-rule="evenodd" clip-rule="evenodd"><path d="M5.825 2.82l4.35 2.524v5.052L5.825 7.87V2.82zM10.651 5.344v5.052L15 7.87V2.82l-4.349 2.524zM1 0v5.05l4.349 2.527V2.526L1 0zM5.825 13.474L10.174 16v-5.051L5.825 8.423v5.051z"/></g></symbol><symbol id="flight-vagrant-24" viewBox="0 0 24 24"><path d="M19.983.6l-4.96 2.877v1.767L12 12.384l-3.023-7.14V3.477L4.017.6 1 2.352v2.034l6.719 16.532L12 23.4l4.281-2.482L23 4.386V2.352L19.983.6z"/></symbol><symbol id="flight-vagrant-16" viewBox="0 0 16 16"><path d="M13.08.75L9.924 2.58v1.123L8 8.245 6.076 3.703V2.58L2.92.75 1 1.864v1.293l4.276 10.514L8 15.25l2.724-1.579L15 3.157V1.864L13.08.75z"/></symbol><symbol id="flight-vagrant-color-24" viewBox="0 0 24 24"><path fill="#1868F2" d="M19.983.6l-4.96 2.877v1.767L12 12.384l-3.023-7.14V3.477L4.017.6 1 2.352v2.034l6.719 16.532L12 23.4l4.281-2.482L23 4.386V2.352L19.983.6z"/><path fill="#0850C5" d="M23 2.352l-4.96 2.875v1.77l-4.028 9.043L12 17.207V23.4l4.28-2.482L23 4.386V2.352zM8.977 5.244V3.477l-3.019 1.75v1.77l4.03 9.043L12 14.873v-2.488L8.977 5.244z"/></symbol><symbol id="flight-vagrant-color-16" viewBox="0 0 16 16"><path fill="#1868F2" d="M13.08.75L9.924 2.58v1.123L8 8.245 6.076 3.703V2.58L2.92.75 1 1.864v1.293l4.276 10.514L8 15.25l2.724-1.579L15 3.157V1.864L13.08.75z"/><path fill="#0850C5" d="M15 1.865l-3.157 1.829v1.124L9.28 10.57 8 11.312v3.939l2.724-1.579L15 3.158V1.865zM6.076 3.703V2.58l-1.92 1.113v1.125l2.564 5.751L8 9.827V8.245L6.076 3.703z"/></symbol><symbol id="flight-vault-24" viewBox="0 0 24 24"><path d="M1 1l10.96 21.334L23 1H1zm9.256 8.469H8.51V7.723h1.746v1.746zm0-2.62H8.51V5.105h1.746v1.744zm2.618 5.238h-1.746v-1.746h1.746v1.746zm0-2.618h-1.746V7.723h1.746v1.746zm0-2.62h-1.746V5.105h1.746v1.744zm2.604 2.62h-1.746V7.723h1.746v1.746zm-1.746-2.62V5.105h1.746v1.744h-1.746z"/></symbol><symbol id="flight-vault-16" viewBox="0 0 16 16"><path d="M0 0l7.971 15.516L16 0H0zm6.732 6.16h-1.27V4.89h1.27v1.27zm0-1.906h-1.27V2.985h1.27v1.269zm1.904 3.81h-1.27v-1.27h1.27v1.27zm0-1.905h-1.27V4.89h1.27v1.27zm0-1.905h-1.27V2.985h1.27v1.269zm1.894 1.905H9.26V4.89h1.27v1.27zM9.26 4.254V2.985h1.27v1.269H9.26z"/></symbol><symbol id="flight-vault-color-24" viewBox="0 0 24 24"><path fill="#FFD814" d="M1 1l10.96 21.334L23 1H1zm9.256 8.469H8.51V7.723h1.746v1.746zm0-2.62H8.51V5.105h1.746v1.744zm2.618 5.238h-1.746v-1.746h1.746v1.746zm0-2.618h-1.746V7.723h1.746v1.746zm0-2.62h-1.746V5.105h1.746v1.744zm2.604 2.62h-1.746V7.723h1.746v1.746zm-1.746-2.62V5.105h1.746v1.744h-1.746z"/></symbol><symbol id="flight-vault-color-16" viewBox="0 0 16 16"><path fill="#FFD814" d="M0 0l7.971 15.516L16 0H0zm6.732 6.16h-1.27V4.89h1.27v1.27zm0-1.906h-1.27V2.985h1.27v1.269zm1.904 3.81h-1.27v-1.27h1.27v1.27zm0-1.905h-1.27V4.89h1.27v1.27zm0-1.905h-1.27V2.985h1.27v1.269zm1.894 1.905H9.26V4.89h1.27v1.27zM9.26 4.254V2.985h1.27v1.269H9.26z"/></symbol><symbol id="flight-waypoint-24" viewBox="0 0 24 24"><g><path d="M6 8.468h2L15 20.6l5-8.666L16 5h-4l4 6.934-1 1.733L10 5H0l9 15.6 2-3.466-5-8.666zM21.003 10.194L24 5h-5.994l2.997 5.194z"/></g></symbol><symbol id="flight-waypoint-16" viewBox="0 0 16 16"><g><path d="M4 5.312h1.334L10 13.4l3.334-5.777L10.666 3H8l2.666 4.623L10 8.778 6.667 3H0l6 10.4 1.333-2.31L4 5.311zM14.002 6.463L16 3h-3.996l1.998 3.463z"/></g></symbol><symbol id="flight-waypoint-color-24" viewBox="0 0 24 24"><g fill="#14C6CB"><path d="M24 5l-2.997 5.194L18.006 5H24zM8 8.468H6l5 8.666L9 20.6 0 5h10l5 8.667 1-1.733L12 5h4l2 3.468 2 3.466-5 8.666L8 8.468z"/></g></symbol><symbol id="flight-waypoint-color-16" viewBox="0 0 16 16"><g fill="#14C6CB"><path d="M16 3l-1.998 3.463L12.004 3H16zM5.334 5.312H4l3.332 5.777L6 13.4 0 3h6.667L10 8.778l.666-1.155L8 3h2.666L12 5.312l1.334 2.31L10 13.4 5.334 5.312z"/></g></symbol><symbol id="flight-hashicorp-24" viewBox="0 0 24 24"><g><path d="M10.336 1.5L2 6.268v11.456l3.131 1.793V8.061l5.205-2.979V1.5z"/><path d="M13.664 1.5v9.123h-3.328V7.219L7.203 9.012V20.7l3.133 1.796V13.4h3.328v3.381l3.131-1.793V3.293L13.664 1.5z"/><path d="M22 17.732L13.664 22.5v-3.582l5.203-2.98V4.484L22 6.276v11.456z"/></g></symbol><symbol id="flight-hashicorp-16" viewBox="0 0 16 16"><g><path d="M6.835.6L1 3.96v8.074l2.192 1.264V5.224l3.643-2.1V.6z"/><path d="M9.165.6v6.43h-2.33v-2.4L4.642 5.894v8.237l2.193 1.266v-6.41h2.33v2.383l2.192-1.264V1.864L9.165.6z"/><path d="M15 12.04L9.165 15.4v-2.525l3.642-2.1V2.703L15 3.966v8.073z"/></g></symbol><symbol id="flight-hashicorp-color-24" viewBox="0 0 24 24"><g fill="#000"><path d="M10.336 1.5L2 6.268v11.456l3.131 1.793V8.061l5.205-2.979V1.5z"/><path d="M13.664 1.5v9.123h-3.328V7.219L7.203 9.012V20.7l3.133 1.796V13.4h3.328v3.381l3.131-1.793V3.293L13.664 1.5z"/><path d="M13.664 22.5L22 17.732V6.276l-3.133-1.793v11.456l-5.203 2.979V22.5z"/></g></symbol><symbol id="flight-hashicorp-color-16" viewBox="0 0 16 16"><g fill="#000"><path d="M6.835.6L1 3.96v8.074l2.192 1.264V5.224l3.643-2.1V.6z"/><path d="M9.165.6v6.43h-2.33v-2.4L4.642 5.894v8.237l2.193 1.266v-6.41h2.33v2.383l2.192-1.264V1.864L9.165.6z"/><path d="M9.165 15.4L15 12.04V3.966l-2.193-1.264v8.074l-3.642 2.1V15.4z"/></g></symbol><symbol id="flight-hcp-24" viewBox="0 0 24 24"><g><path d="M10.336 1.5L2 6.268v11.456l3.131 1.793V8.061l5.205-2.979V1.5z"/><path d="M13.664 1.5v9.123h-3.328V7.219L7.203 9.012V20.7l3.133 1.796V13.4h3.328v3.381l3.131-1.793V3.293L13.664 1.5z"/><path d="M22 17.732L13.664 22.5v-3.582l5.203-2.98V4.484L22 6.276v11.456z"/></g></symbol><symbol id="flight-hcp-16" viewBox="0 0 16 16"><g><path d="M6.835.6L1 3.96v8.074l2.192 1.264V5.224l3.643-2.1V.6z"/><path d="M9.165.6v6.43h-2.33v-2.4L4.642 5.894v8.237l2.193 1.266v-6.41h2.33v2.383l2.192-1.264V1.864L9.165.6z"/><path d="M15 12.04L9.165 15.4v-2.525l3.642-2.1V2.703L15 3.966v8.073z"/></g></symbol><symbol id="flight-hcp-color-24" viewBox="0 0 24 24"><g fill="#000"><path d="M10.336 1.5L2 6.268v11.456l3.131 1.793V8.061l5.205-2.979V1.5z"/><path d="M13.664 1.5v9.123h-3.328V7.219L7.203 9.012V20.7l3.133 1.796V13.4h3.328v3.381l3.131-1.793V3.293L13.664 1.5z"/><path d="M13.664 22.5L22 17.732V6.276l-3.133-1.793v11.456l-5.203 2.979V22.5z"/></g></symbol><symbol id="flight-hcp-color-16" viewBox="0 0 16 16"><g fill="#000"><path d="M6.835.6L1 3.96v8.074l2.192 1.264V5.224l3.643-2.1V.6z"/><path d="M9.165.6v6.43h-2.33v-2.4L4.642 5.894v8.237l2.193 1.266v-6.41h2.33v2.383l2.192-1.264V1.864L9.165.6z"/><path d="M9.165 15.4L15 12.04V3.966l-2.193-1.264v8.074l-3.642 2.1V15.4z"/></g></symbol><symbol id="flight-activity-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M9.003 2a.75.75 0 01.71.519l5.278 16.27 2.294-7.265A.75.75 0 0118 11h4a.75.75 0 010 1.5h-3.45l-2.835 8.976a.75.75 0 01-1.428.005L8.99 5.151l-2.278 6.836A.75.75 0 016 12.5H2A.75.75 0 012 11h3.46l2.828-8.487A.75.75 0 019.003 2z" clip-rule="evenodd"/></symbol><symbol id="flight-activity-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M6.016 1a.75.75 0 01.698.521l3.306 10.33 1.47-4.341A.75.75 0 0112.2 7H15a.75.75 0 010 1.5h-2.262l-2.028 5.99a.75.75 0 01-1.424-.011L5.952 4.06 4.504 8.008A.75.75 0 013.8 8.5H1A.75.75 0 111 7h2.276l2.02-5.508c.11-.301.4-.499.72-.492z" clip-rule="evenodd"/></symbol><symbol id="flight-alert-circle-24" viewBox="0 0 24 24"><g><path d="M12 7a.75.75 0 01.75.75v4.5a.75.75 0 01-1.5 0v-4.5A.75.75 0 0112 7zM12 15a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></symbol><symbol id="flight-alert-circle-16" viewBox="0 0 16 16"><g><path d="M8 4a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 018 4zM8 10a1 1 0 100 2h.007a1 1 0 100-2H8z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></symbol><symbol id="flight-alert-circle-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm-.75 6.75a.75.75 0 011.5 0v4.5a.75.75 0 01-1.5 0v-4.5zM11 16a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1z" clip-rule="evenodd"/></symbol><symbol id="flight-alert-circle-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-4a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 018 4zm0 6a1 1 0 100 2h.007a1 1 0 100-2H8z" clip-rule="evenodd"/></symbol><symbol id="flight-alert-diamond-24" viewBox="0 0 24 24"><g><path d="M12 7a.75.75 0 01.75.75v4.5a.75.75 0 01-1.5 0v-4.5A.75.75 0 0112 7zM12 15a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M1.884 10.056l8.172-8.172a2.75 2.75 0 013.889 0l8.171 8.172a2.75 2.75 0 010 3.889l-8.171 8.171a2.75 2.75 0 01-3.89 0l-8.171-8.171a2.75 2.75 0 010-3.89zm9.232-7.111l-8.172 8.171a1.25 1.25 0 000 1.768l8.172 8.172a1.25 1.25 0 001.768 0l8.171-8.172a1.25 1.25 0 000-1.768l-8.171-8.171a1.25 1.25 0 00-1.768 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-alert-diamond-16" viewBox="0 0 16 16"><g><path d="M7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zM8.75 5.75a.75.75 0 10-1.5 0v2.5a.75.75 0 101.5 0v-2.5z"/><path fill-rule="evenodd" d="M.75 6.41L6.407.752a2.25 2.25 0 013.182 0l5.657 5.656a2.25 2.25 0 010 3.182l-5.657 5.657a2.25 2.25 0 01-3.182 0L.75 9.591a2.25 2.25 0 010-3.182zm6.718-4.597L1.81 7.47a.75.75 0 000 1.06l5.657 5.657a.75.75 0 001.06 0l5.657-5.656a.75.75 0 000-1.061L8.528 1.813a.75.75 0 00-1.06 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-alert-diamond-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M13.945 1.924a2.75 2.75 0 00-3.89 0l-8.131 8.132a2.75 2.75 0 000 3.889l8.132 8.131a2.75 2.75 0 003.889 0l8.131-8.131a2.75 2.75 0 000-3.89l-8.131-8.13zM11.25 7.75a.75.75 0 011.5 0v4.5a.75.75 0 01-1.5 0v-4.5zM11 16a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1z" clip-rule="evenodd"/></symbol><symbol id="flight-alert-diamond-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M6.407.753L.75 6.409a2.25 2.25 0 000 3.182l5.657 5.657a2.25 2.25 0 003.182 0l5.657-5.657a2.25 2.25 0 000-3.182L9.589.753a2.25 2.25 0 00-3.182 0zM7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zm1.75-5.25a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z" clip-rule="evenodd"/></symbol><symbol id="flight-alert-triangle-24" viewBox="0 0 24 24"><g><path d="M11 17a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1zM12.75 8.75a.75.75 0 00-1.5 0v4.5a.75.75 0 001.5 0v-4.5z"/><path fill-rule="evenodd" d="M10.658 2.366a2.651 2.651 0 012.684 0c.407.239.745.581.984.99l.002.004 8.315 14.46a2.86 2.86 0 01.008 2.758 2.757 2.757 0 01-.976 1.03c-.41.25-.877.386-1.357.392H3.682a2.653 2.653 0 01-1.357-.393 2.757 2.757 0 01-.975-1.029 2.86 2.86 0 01.007-2.758l.006-.01 8.31-14.45.001-.004a2.75 2.75 0 01.984-.99zm.313 1.744v.001L2.665 18.552a1.36 1.36 0 000 1.306c.108.198.262.36.443.47.18.11.382.169.586.172h16.61c.204-.003.406-.061.586-.172.181-.11.335-.272.444-.47a1.361 1.361 0 00-.001-1.306L13.03 4.112l-.001-.002a1.25 1.25 0 00-.446-.45 1.151 1.151 0 00-1.166 0 1.25 1.25 0 00-.446.45z" clip-rule="evenodd"/></g></symbol><symbol id="flight-alert-triangle-16" viewBox="0 0 16 16"><g><path d="M7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zM8.75 5.75a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z"/><path fill-rule="evenodd" d="M6.953 1.273a2.143 2.143 0 012.874.751l.002.004 5.884 9.774a2.126 2.126 0 01-.768 2.905c-.322.188-.687.289-1.06.293H2.115a2.143 2.143 0 01-1.833-1.074 2.125 2.125 0 01.006-2.124l.006-.01 5.878-9.764.002-.004c.191-.313.46-.571.78-.75zm.502 1.53l-.001.002-5.872 9.754a.626.626 0 00.231.853.644.644 0 00.314.088h11.746a.643.643 0 00.544-.32.626.626 0 000-.62l-5.87-9.755-.002-.001A.635.635 0 008 2.5a.643.643 0 00-.545.304z" clip-rule="evenodd"/></g></symbol><symbol id="flight-alert-triangle-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 2c-.472 0-.934.127-1.342.366a2.75 2.75 0 00-.984.99L1.363 17.81l-.006.01a2.86 2.86 0 00-.007 2.758c.23.423.566.778.975 1.03.41.25.877.386 1.357.392h16.637c.479-.006.947-.142 1.356-.393.41-.25.744-.606.976-1.029a2.86 2.86 0 00-.008-2.758L14.328 3.36l-.002-.004a2.75 2.75 0 00-.984-.99A2.651 2.651 0 0012 2zm-.75 6.75a.75.75 0 011.5 0v4.5a.75.75 0 01-1.5 0v-4.5zM11 17a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1z" clip-rule="evenodd"/></symbol><symbol id="flight-alert-triangle-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 1a2.143 2.143 0 00-1.827 1.024l-5.88 9.768a2.125 2.125 0 00.762 2.915c.322.188.687.289 1.06.293h11.77a2.143 2.143 0 001.834-1.074 2.126 2.126 0 00-.006-2.124L9.829 2.028A2.149 2.149 0 008 1zM7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zm1.75-5.25a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z" clip-rule="evenodd"/></symbol><symbol id="flight-alert-octagon-24" viewBox="0 0 24 24"><g><path d="M11 16a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1zM12.75 7.75a.75.75 0 00-1.5 0v4.5a.75.75 0 001.5 0v-4.5z"/><path fill-rule="evenodd" d="M6.64 1.805A2.75 2.75 0 018.585 1h6.83c.73 0 1.429.29 1.945.805l4.835 4.835A2.75 2.75 0 0123 8.585v6.83c0 .73-.29 1.429-.805 1.945l-4.835 4.835a2.75 2.75 0 01-1.945.805h-6.83a2.75 2.75 0 01-1.945-.805L1.805 17.36A2.75 2.75 0 011 15.415v-6.83c0-.73.29-1.429.805-1.945L6.64 1.805zm1.945.695c-.332 0-.65.132-.884.366L2.866 7.701a1.25 1.25 0 00-.366.884v6.83c0 .332.132.65.366.884l4.835 4.835c.234.234.552.366.884.366h6.83c.332 0 .65-.132.884-.366l4.835-4.835a1.25 1.25 0 00.366-.884v-6.83c0-.332-.132-.65-.366-.884l-4.835-4.835a1.25 1.25 0 00-.884-.366h-6.83z" clip-rule="evenodd"/></g></symbol><symbol id="flight-alert-octagon-16" viewBox="0 0 16 16"><g><path d="M7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zM8.75 4.75a.75.75 0 00-1.5 0v3.5a.75.75 0 001.5 0v-3.5z"/><path fill-rule="evenodd" d="M3.882.805A2.75 2.75 0 015.827 0h4.346c.73 0 1.429.29 1.945.805l3.076 3.077A2.75 2.75 0 0116 5.827v4.346c0 .73-.29 1.429-.806 1.945l-3.076 3.076a2.75 2.75 0 01-1.945.806H5.827a2.75 2.75 0 01-1.945-.806L.805 12.118A2.75 2.75 0 010 10.173V5.827c0-.73.29-1.429.805-1.945L3.882.805zm1.945.695c-.332 0-.65.132-.884.366L1.866 4.943a1.25 1.25 0 00-.366.884v4.346c0 .332.132.65.366.884l3.077 3.077c.234.234.552.366.884.366h4.346c.332 0 .65-.132.884-.366l3.077-3.077a1.25 1.25 0 00.366-.884V5.827c0-.332-.132-.65-.366-.884l-3.077-3.077a1.25 1.25 0 00-.884-.366H5.827z" clip-rule="evenodd"/></g></symbol><symbol id="flight-alert-octagon-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M8.585 1c-.73 0-1.429.29-1.945.805L1.805 6.64A2.75 2.75 0 001 8.585v6.83c0 .73.29 1.429.805 1.945l4.835 4.835A2.75 2.75 0 008.585 23h6.83c.73 0 1.429-.29 1.945-.805l4.835-4.835A2.75 2.75 0 0023 15.415v-6.83c0-.73-.29-1.429-.805-1.945L17.36 1.805A2.75 2.75 0 0015.415 1h-6.83zm2.665 6.75a.75.75 0 011.5 0v4.5a.75.75 0 01-1.5 0v-4.5zM11 16a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1z" clip-rule="evenodd"/></symbol><symbol id="flight-alert-octagon-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3.882.805A2.75 2.75 0 015.827 0h4.346c.73 0 1.429.29 1.945.805l3.076 3.077A2.75 2.75 0 0116 5.827v4.346c0 .73-.29 1.429-.806 1.945l-3.076 3.076a2.75 2.75 0 01-1.945.806H5.827a2.75 2.75 0 01-1.945-.806L.805 12.118A2.75 2.75 0 010 10.173V5.827c0-.73.29-1.429.805-1.945L3.882.805zM7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zm1.75-6.25a.75.75 0 00-1.5 0v3.5a.75.75 0 001.5 0v-3.5z" clip-rule="evenodd"/></symbol><symbol id="flight-align-center-24" viewBox="0 0 24 24"><g><path d="M2.75 5a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75zM5.75 9a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H5.75zM2 13.75a.75.75 0 01.75-.75h18.5a.75.75 0 010 1.5H2.75a.75.75 0 01-.75-.75zM5.75 17a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H5.75z"/></g></symbol><symbol id="flight-align-center-16" viewBox="0 0 16 16"><g><path d="M1.75 3a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75zM3.75 6a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5zM1 9.75A.75.75 0 011.75 9h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 9.75zM3.75 12a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5z"/></g></symbol><symbol id="flight-align-justify-24" viewBox="0 0 24 24"><g><path d="M2.75 5a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75zM2.75 9a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75zM2 13.75a.75.75 0 01.75-.75h18.5a.75.75 0 010 1.5H2.75a.75.75 0 01-.75-.75zM2.75 17a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75z"/></g></symbol><symbol id="flight-align-justify-16" viewBox="0 0 16 16"><g><path d="M1.75 3a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75zM1.75 6a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75zM1 9.75A.75.75 0 011.75 9h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 9.75zM1.75 12a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75z"/></g></symbol><symbol id="flight-align-left-24" viewBox="0 0 24 24"><g><path d="M2.75 5a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75zM2.75 9a.75.75 0 000 1.5h14.5a.75.75 0 000-1.5H2.75zM2 13.75a.75.75 0 01.75-.75h18.5a.75.75 0 010 1.5H2.75a.75.75 0 01-.75-.75zM2.75 17a.75.75 0 000 1.5h14.5a.75.75 0 000-1.5H2.75z"/></g></symbol><symbol id="flight-align-left-16" viewBox="0 0 16 16"><g><path d="M1.75 3a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75zM1.75 6a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5zM1 9.75A.75.75 0 011.75 9h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 9.75zM1.75 12a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5z"/></g></symbol><symbol id="flight-align-right-24" viewBox="0 0 24 24"><g><path d="M2.75 5a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75zM6.75 9a.75.75 0 000 1.5h14.5a.75.75 0 000-1.5H6.75zM2 13.75a.75.75 0 01.75-.75h18.5a.75.75 0 010 1.5H2.75a.75.75 0 01-.75-.75zM6.75 17a.75.75 0 000 1.5h14.5a.75.75 0 000-1.5H6.75z"/></g></symbol><symbol id="flight-align-right-16" viewBox="0 0 16 16"><g><path d="M1.75 3a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75zM4.75 6a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5zM1 9.75A.75.75 0 011.75 9h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 9.75zM4.75 12a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5z"/></g></symbol><symbol id="flight-api-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M2 5a3 3 0 115.585 1.524l1.79 1.79.68-.68a2.75 2.75 0 013.89 0l.68.68 1.79-1.79a3 3 0 111.06 1.06l-1.79 1.791.681.68a2.75 2.75 0 010 3.89l-.68.68 1.79 1.79a3 3 0 11-1.06 1.06l-1.791-1.79-.68.681a2.75 2.75 0 01-3.89 0l-.68-.68-1.79 1.79a3 3 0 11-1.06-1.06l1.79-1.791-.681-.68a2.75 2.75 0 010-3.89l.68-.68-1.79-1.79A3 3 0 012 5zm3-1.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zm0 14a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM17.5 19a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0zM19 3.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zm-7.884 5.195a1.25 1.25 0 011.768 0l2.421 2.421a1.25 1.25 0 010 1.768l-2.421 2.421a1.25 1.25 0 01-1.768 0l-2.421-2.421a1.25 1.25 0 010-1.768l2.421-2.421z" clip-rule="evenodd"/></symbol><symbol id="flight-api-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M.5 2.75a2.25 2.25 0 114.28.97l1.345 1.344.284-.284a2.25 2.25 0 013.182 0l.284.284 1.344-1.344a2.25 2.25 0 111.06 1.06l-1.343 1.345.284.284a2.25 2.25 0 010 3.182l-.284.284 1.344 1.344a2.25 2.25 0 11-1.06 1.06l-1.345-1.343-.284.284a2.25 2.25 0 01-3.182 0l-.284-.284-1.344 1.344a2.25 2.25 0 11-1.06-1.06l1.343-1.345-.284-.284a2.25 2.25 0 010-3.182l.284-.284L3.72 4.781A2.25 2.25 0 01.5 2.75zM2.75 2a.75.75 0 100 1.5.75.75 0 000-1.5zm0 10.5a.75.75 0 100 1.5.75.75 0 000-1.5zm9.75.75a.75.75 0 111.5 0 .75.75 0 01-1.5 0zM13.25 2a.75.75 0 100 1.5.75.75 0 000-1.5zM7.47 5.841a.75.75 0 011.06 0L10.16 7.47a.75.75 0 010 1.06L8.53 10.16a.75.75 0 01-1.06 0L5.84 8.53a.75.75 0 010-1.06L7.47 5.84z" clip-rule="evenodd"/></symbol><symbol id="flight-archive-24" viewBox="0 0 24 24"><g><path d="M9.75 11a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5z"/><path fill-rule="evenodd" d="M1 4.25A2.25 2.25 0 013.25 2h17.5A2.25 2.25 0 0123 4.25v1.5c0 .78-.397 1.467-1 1.871V19.25A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V7.621A2.248 2.248 0 011 5.75v-1.5zM3.5 8h17v11.25c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25V8zm-.25-4.5a.75.75 0 00-.75.75v1.5c0 .414.336.75.75.75h17.5a.75.75 0 00.75-.75v-1.5a.75.75 0 00-.75-.75H3.25z" clip-rule="evenodd"/></g></symbol><symbol id="flight-archive-16" viewBox="0 0 16 16"><g><path d="M6.75 8a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5z"/><path fill-rule="evenodd" d="M0 2.75C0 1.784.784 1 1.75 1h12.5c.966 0 1.75.784 1.75 1.75v1.5c0 .698-.409 1.3-1 1.582v6.918A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75V5.832A1.75 1.75 0 010 4.25v-1.5zm13.5 10V6h-11v6.75c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75zm1-8.5a.25.25 0 01-.25.25H1.75a.25.25 0 01-.25-.25v-1.5a.25.25 0 01.25-.25h12.5a.25.25 0 01.25.25v1.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-arrow-down-24" viewBox="0 0 24 24"><path d="M12.5 3.75a.75.75 0 00-1.5 0v14.645l-5.96-6.166a.75.75 0 00-1.08 1.042l7.25 7.5a.75.75 0 001.08 0l7.25-7.5a.75.75 0 10-1.08-1.042l-5.96 6.166V3.75z"/></symbol><symbol id="flight-arrow-down-16" viewBox="0 0 16 16"><path d="M8.5 2.75a.75.75 0 00-1.5 0v8.614L4.045 8.235a.75.75 0 00-1.09 1.03l4.248 4.498a.862.862 0 00.025.026.747.747 0 00.51.21L7.75 14h.012a.747.747 0 00.533-.235l4.25-4.5a.75.75 0 00-1.09-1.03L8.5 11.364V2.75z"/></symbol><symbol id="flight-arrow-down-circle-24" viewBox="0 0 24 24"><g><path d="M12 6a.75.75 0 01.75.75v8.614l2.955-3.129a.75.75 0 011.09 1.03l-4.25 4.5a.541.541 0 01-.068.064.747.747 0 01-.465.17L12 18h-.012a.748.748 0 01-.535-.237l-4.248-4.498a.75.75 0 011.09-1.03l2.955 3.129V6.75A.75.75 0 0112 6z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></symbol><symbol id="flight-arrow-down-circle-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/><path d="M5.755 8.195a.75.75 0 00-1.01 1.11l2.75 2.5a.748.748 0 001.01 0l2.75-2.5a.75.75 0 10-1.01-1.11L8.75 9.555V4.75a.75.75 0 00-1.5 0v4.805l-1.495-1.36z"/></g></symbol><symbol id="flight-arrow-down-left-24" viewBox="0 0 24 24"><path d="M18.78 6.28a.75.75 0 00-1.06-1.06L6.5 16.44V8.75a.75.75 0 00-1.5 0v9.5a.748.748 0 00.218.529l.002.001.001.002A.748.748 0 005.75 19h9.5a.75.75 0 000-1.5H7.56L18.78 6.28z"/></symbol><symbol id="flight-arrow-down-left-16" viewBox="0 0 16 16"><path d="M12.78 4.28a.75.75 0 00-1.06-1.06L4.5 10.44V6.75a.75.75 0 00-1.5 0v5.5a.748.748 0 00.75.75h5.5a.75.75 0 000-1.5H5.56l7.22-7.22z"/></symbol><symbol id="flight-arrow-down-right-24" viewBox="0 0 24 24"><path d="M5.22 7.28a.75.75 0 011.06-1.06L17.5 17.44V9.75a.75.75 0 011.5 0v9.5a.747.747 0 01-.75.75h-9.5a.75.75 0 010-1.5h7.69L5.22 7.28z"/></symbol><symbol id="flight-arrow-down-right-16" viewBox="0 0 16 16"><path d="M3.22 4.28a.75.75 0 011.06-1.06l7.22 7.22V6.75a.75.75 0 011.5 0v5.5a.747.747 0 01-.75.75h-5.5a.75.75 0 010-1.5h3.69L3.22 4.28z"/></symbol><symbol id="flight-arrow-left-24" viewBox="0 0 24 24"><path d="M11.771 5.04a.75.75 0 00-1.042-1.08l-7.5 7.25a.75.75 0 000 1.08l7.5 7.25a.75.75 0 101.042-1.08L5.605 12.5H20.25a.75.75 0 000-1.5H5.605l6.166-5.96z"/></symbol><symbol id="flight-arrow-left-16" viewBox="0 0 16 16"><path d="M7.765 4.045a.75.75 0 10-1.03-1.09L2.237 7.203a.748.748 0 00-.001 1.093l4.499 4.25a.75.75 0 001.03-1.091L4.636 8.5h8.614a.75.75 0 000-1.5H4.636l3.129-2.955z"/></symbol><symbol id="flight-arrow-left-circle-24" viewBox="0 0 24 24"><g><path d="M8.636 11.25l3.129-2.955a.75.75 0 00-1.03-1.09l-4.498 4.248a.748.748 0 00-.007 1.088M6.236 12.546l4.499 4.25a.75.75 0 001.03-1.091L8.636 12.75h8.614a.75.75 0 000-1.5H8.636"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></symbol><symbol id="flight-arrow-left-circle-16" viewBox="0 0 16 16"><g><path d="M7.755 4.695a.75.75 0 01.05 1.06L6.445 7.25h4.805a.75.75 0 010 1.5H6.445l1.36 1.495a.75.75 0 01-1.11 1.01l-2.499-2.75A.747.747 0 014 8.003v-.004c0-.195.075-.372.197-.505l2.498-2.748a.75.75 0 011.06-.05z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></symbol><symbol id="flight-arrow-right-24" viewBox="0 0 24 24"><path d="M12.229 5.04a.75.75 0 011.042-1.08l7.5 7.25a.75.75 0 010 1.08l-7.5 7.25a.75.75 0 11-1.042-1.08l6.166-5.96H3.75a.75.75 0 010-1.5h14.645l-6.166-5.96z"/></symbol><symbol id="flight-arrow-right-16" viewBox="0 0 16 16"><path d="M8.235 4.045a.75.75 0 111.03-1.09l4.5 4.25a.75.75 0 010 1.09l-4.5 4.25a.75.75 0 01-1.03-1.09L11.364 8.5H2.75a.75.75 0 010-1.5h8.614L8.235 4.045z"/></symbol><symbol id="flight-arrow-right-circle-24" viewBox="0 0 24 24"><g><path d="M6 12a.75.75 0 01.75-.75h8.614l-3.129-2.955a.75.75 0 011.03-1.09l4.5 4.25a.75.75 0 010 1.09l-4.5 4.25a.75.75 0 01-1.03-1.09l3.129-2.955H6.75A.75.75 0 016 12z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></symbol><symbol id="flight-arrow-right-circle-16" viewBox="0 0 16 16"><g><path d="M8.245 4.695a.75.75 0 00-.05 1.06l1.36 1.495H4.75a.75.75 0 000 1.5h4.805l-1.36 1.495a.75.75 0 001.11 1.01l2.5-2.75a.75.75 0 000-1.01l-2.5-2.75a.75.75 0 00-1.06-.05z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></symbol><symbol id="flight-arrow-up-24" viewBox="0 0 24 24"><path d="M5.04 10.771A.75.75 0 013.96 9.73l7.25-7.5a.75.75 0 011.08 0l7.25 7.5a.75.75 0 11-1.08 1.042L12.5 4.605V20.25a.75.75 0 01-1.5 0V4.605l-5.96 6.166z"/></symbol><symbol id="flight-arrow-up-16" viewBox="0 0 16 16"><path d="M4.045 7.765a.75.75 0 11-1.09-1.03l4.25-4.5a.75.75 0 011.09 0l4.25 4.5a.75.75 0 01-1.09 1.03L8.5 4.636v8.614a.75.75 0 01-1.5 0V4.636L4.045 7.765z"/></symbol><symbol id="flight-arrow-up-circle-24" viewBox="0 0 24 24"><g><path d="M12.75 8.636l2.955 3.129a.75.75 0 001.09-1.03l-4.25-4.5a.75.75 0 00-1.09 0l-4.25 4.5a.75.75 0 001.09 1.03l2.955-3.129v8.614a.75.75 0 001.5 0V8.636z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></symbol><symbol id="flight-arrow-up-circle-16" viewBox="0 0 16 16"><g><path d="M4.695 7.755a.75.75 0 001.06.05l1.495-1.36v4.805a.75.75 0 001.5 0V6.445l1.495 1.36a.75.75 0 001.01-1.11l-2.75-2.5a.75.75 0 00-1.01 0l-2.75 2.5a.75.75 0 00-.05 1.06z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></symbol><symbol id="flight-arrow-up-left-24" viewBox="0 0 24 24"><path d="M6.5 15.25a.75.75 0 01-1.5 0v-9.5c0-.206.083-.393.218-.529l.002-.001.001-.002A.748.748 0 015.75 5h9.5a.75.75 0 010 1.5H7.56l11.22 11.22a.75.75 0 11-1.06 1.06L6.5 7.56v7.69z"/></symbol><symbol id="flight-arrow-up-left-16" viewBox="0 0 16 16"><path d="M3.057 3.463A.748.748 0 013.75 3h5.5a.75.75 0 010 1.5H5.56l7.22 7.22a.75.75 0 11-1.06 1.06L4.5 5.56v3.69a.75.75 0 01-1.5 0v-5.5c0-.102.02-.199.057-.287z"/></symbol><symbol id="flight-arrow-up-right-24" viewBox="0 0 24 24"><path d="M18.943 5.463a.748.748 0 00-.161-.242l-.002-.001-.001-.002A.748.748 0 0018.25 5h-9.5a.75.75 0 000 1.5h7.69L5.22 17.72a.75.75 0 101.06 1.06L17.5 7.56v7.69a.75.75 0 001.5 0v-9.5a.747.747 0 00-.057-.287z"/></symbol><symbol id="flight-arrow-up-right-16" viewBox="0 0 16 16"><path d="M12.943 3.463A.748.748 0 0012.25 3h-5.5a.75.75 0 000 1.5h3.69l-7.22 7.22a.75.75 0 101.06 1.06l7.22-7.22v3.69a.75.75 0 001.5 0v-5.5a.747.747 0 00-.057-.287z"/></symbol><symbol id="flight-at-sign-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M14.5 1.288a11 11 0 104.188 19.445.75.75 0 10-.912-1.19 9.5 9.5 0 113.724-7.544v1.025c0 1.258-.995 2.476-2.325 2.476-1.288 0-2.175-1.142-2.175-2.476V7.75a.75.75 0 00-1.5 0v.68a5 5 0 10.488 6.587c.58 1.12 1.666 1.983 3.187 1.983C21.495 17 23 14.94 23 13.024V12a11 11 0 00-8.5-10.711zM15.5 12a3.5 3.5 0 10-7 0 3.5 3.5 0 007 0z" clip-rule="evenodd"/></symbol><symbol id="flight-at-sign-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9.818.21a8 8 0 103.046 14.141.75.75 0 10-.912-1.19A6.5 6.5 0 1114.5 8v1c0 .908-.54 1.5-1.25 1.5-.4 0-.691-.157-.894-.399C12.142 9.847 12 9.463 12 9V4.75a.75.75 0 00-1.5 0v.127a4 4 0 10.449 5.825c.076.128.162.25.258.364.484.577 1.194.934 2.043.934C15.04 12 16 10.461 16 9V8A8 8 0 009.818.21zM10.5 8a2.5 2.5 0 10-5 0 2.5 2.5 0 005 0z" clip-rule="evenodd"/></symbol><symbol id="flight-award-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 1a8 8 0 00-4.751 14.437l-1.236 6.676a.75.75 0 001.004.838L12 21.053l4.983 1.898a.75.75 0 001.005-.838l-1.237-6.676A8 8 0 0012 1zM5.5 9a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0zm9.877 7.254A7.97 7.97 0 0112 17a7.97 7.97 0 01-3.377-.746l-.892 4.82 4.002-1.525a.75.75 0 01.534 0l4.003 1.525-.893-4.82z" clip-rule="evenodd"/></symbol><symbol id="flight-award-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 0a6 6 0 00-4.214 10.27.756.756 0 00-.027.113l-.75 4.75a.75.75 0 00.99.824L8 14.545l4 1.412a.75.75 0 00.99-.824l-.75-4.75a.764.764 0 00-.026-.112A6 6 0 008 0zM3.5 6a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zm7.363 5.274A5.974 5.974 0 018 12a5.973 5.973 0 01-2.863-.726l-.45 2.85 3.063-1.081a.75.75 0 01.5 0l3.063 1.08-.45-2.849z" clip-rule="evenodd"/></symbol><symbol id="flight-auto-apply-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M11.23 6.684c-1.162-.786-2.73.047-2.73 1.45v7.732c0 1.403 1.568 2.236 2.73 1.45l5.716-3.866a1.75 1.75 0 000-2.9L11.23 6.684zM10 8.134c0-.2.224-.32.39-.207l5.715 3.866a.25.25 0 010 .414l-5.715 3.866a.25.25 0 01-.39-.207V8.134z"/><path d="M11.305 0a2.25 2.25 0 00-2.25 2.25v.395a9.747 9.747 0 00-1.587.658l-.28-.28a2.25 2.25 0 00-3.182 0l-.983.983a2.25 2.25 0 000 3.182l.28.28a9.748 9.748 0 00-.658 1.587H2.25A2.25 2.25 0 000 11.305v1.39a2.25 2.25 0 002.25 2.25h.395c.174.552.395 1.082.658 1.587l-.28.28a2.25 2.25 0 000 3.182l.983.983a2.25 2.25 0 003.182 0l.28-.28a9.744 9.744 0 001.587.658v.395a2.25 2.25 0 002.25 2.25h1.39a2.25 2.25 0 002.25-2.25v-.395a9.743 9.743 0 001.587-.658l.28.28a2.25 2.25 0 003.182 0l.983-.983a2.25 2.25 0 000-3.182l-.28-.28a9.742 9.742 0 00.658-1.587h.395a2.25 2.25 0 002.25-2.25v-1.39a2.25 2.25 0 00-2.25-2.25h-.395a9.744 9.744 0 00-.658-1.587l.28-.28a2.25 2.25 0 000-3.182l-.983-.983a2.25 2.25 0 00-3.182 0l-.28.28a9.748 9.748 0 00-1.587-.658V2.25A2.25 2.25 0 0012.695 0h-1.39zm-.75 2.25a.75.75 0 01.75-.75h1.39a.75.75 0 01.75.75v.963a.75.75 0 00.569.728c.806.2 1.566.52 2.26.937a.75.75 0 00.917-.113l.681-.681a.75.75 0 011.061 0l.983.983a.75.75 0 010 1.06l-.681.682a.75.75 0 00-.113.917c.418.694.736 1.454.937 2.26a.75.75 0 00.728.569h.963a.75.75 0 01.75.75v1.39a.75.75 0 01-.75.75h-.963a.75.75 0 00-.728.569 8.25 8.25 0 01-.937 2.26.75.75 0 00.113.917l.681.681a.75.75 0 010 1.061l-.983.983a.75.75 0 01-1.06 0l-.682-.681a.75.75 0 00-.917-.113 8.253 8.253 0 01-2.26.937.75.75 0 00-.569.728v.963a.75.75 0 01-.75.75h-1.39a.75.75 0 01-.75-.75v-.963a.75.75 0 00-.569-.728 8.253 8.253 0 01-2.26-.937.75.75 0 00-.917.113l-.681.681a.75.75 0 01-1.061 0l-.983-.983a.75.75 0 010-1.06l.681-.682a.75.75 0 00.113-.917 8.251 8.251 0 01-.937-2.26.75.75 0 00-.728-.569H2.25a.75.75 0 01-.75-.75v-1.39a.75.75 0 01.75-.75h.963a.75.75 0 00.728-.569c.2-.806.52-1.566.937-2.26a.75.75 0 00-.113-.917l-.681-.681a.75.75 0 010-1.061l.983-.983a.75.75 0 011.06 0l.682.681a.75.75 0 00.917.113 8.251 8.251 0 012.26-.937.75.75 0 00.569-.728V2.25z"/></g></symbol><symbol id="flight-auto-apply-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M7.734 4.192C6.572 3.402 5 4.234 5 5.64v4.722c0 1.405 1.572 2.237 2.734 1.447l3.472-2.36a1.75 1.75 0 000-2.895l-3.472-2.36zM6.5 5.64c0-.2.225-.32.39-.206l3.472 2.36a.25.25 0 010 .414l-3.471 2.36a.25.25 0 01-.391-.206V5.639z"/><path d="M7.25 0A1.75 1.75 0 005.5 1.728a6.715 6.715 0 00-.167.07 1.75 1.75 0 00-2.46.015l-1.06 1.06a1.75 1.75 0 00-.015 2.46 6.712 6.712 0 00-.07.167A1.75 1.75 0 000 7.25v1.5c0 .96.772 1.738 1.728 1.75l.07.167a1.75 1.75 0 00.015 2.46l1.06 1.06a1.75 1.75 0 002.46.015l.167.07A1.75 1.75 0 007.25 16h1.5a1.75 1.75 0 001.75-1.728l.167-.07a1.75 1.75 0 002.46-.015l1.06-1.06a1.75 1.75 0 00.015-2.46l.07-.167A1.75 1.75 0 0016 8.75v-1.5a1.75 1.75 0 00-1.728-1.75 6.185 6.185 0 00-.07-.167 1.75 1.75 0 00-.015-2.46l-1.06-1.06a1.75 1.75 0 00-2.46-.015 6.794 6.794 0 00-.167-.07A1.75 1.75 0 008.75 0h-1.5zM7 1.75a.25.25 0 01.25-.25h1.5a.25.25 0 01.25.25v.51c0 .33.216.62.532.717.326.1.64.23.936.388a.75.75 0 00.884-.131l.36-.36a.25.25 0 01.354 0l1.06 1.06a.25.25 0 010 .354l-.36.36a.75.75 0 00-.131.884c.158.296.289.61.388.936a.75.75 0 00.718.532h.509a.25.25 0 01.25.25v1.5a.25.25 0 01-.25.25h-.51a.75.75 0 00-.717.532c-.1.326-.23.64-.388.936a.75.75 0 00.131.884l.36.36a.25.25 0 010 .354l-1.06 1.06a.25.25 0 01-.354 0l-.36-.36a.75.75 0 00-.884-.131c-.296.158-.61.289-.936.388a.75.75 0 00-.532.718v.509a.25.25 0 01-.25.25h-1.5a.25.25 0 01-.25-.25v-.51a.75.75 0 00-.532-.717c-.326-.1-.64-.23-.936-.388a.75.75 0 00-.884.131l-.36.36a.25.25 0 01-.354 0l-1.06-1.06a.25.25 0 010-.354l.36-.36a.75.75 0 00.131-.884 5.213 5.213 0 01-.388-.936A.75.75 0 002.259 9H1.75a.25.25 0 01-.25-.25v-1.5A.25.25 0 011.75 7h.51a.75.75 0 00.717-.532c.1-.326.23-.64.388-.936a.75.75 0 00-.131-.884l-.36-.36a.25.25 0 010-.354l1.06-1.06a.25.25 0 01.354 0l.36.36a.75.75 0 00.884.131c.296-.158.61-.289.936-.388A.75.75 0 007 2.259V1.75z"/></g></symbol><symbol id="flight-bank-vault-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M8 12a6 6 0 1112 0 6 6 0 01-12 0zm2.332-2.607A4.48 4.48 0 009.5 12c0 .972.308 1.872.832 2.607l1.45-1.45A2.49 2.49 0 0111.5 12c0-.417.102-.81.283-1.156l-1.451-1.451zm1.06-1.061l1.452 1.45A2.49 2.49 0 0114 9.5c.417 0 .81.102 1.156.283l1.451-1.451A4.48 4.48 0 0014 7.5a4.48 4.48 0 00-2.607.832zm1.452 5.885l-1.451 1.451A4.48 4.48 0 0014 16.5a4.48 4.48 0 002.607-.832l-1.45-1.45A2.49 2.49 0 0114 14.5a2.49 2.49 0 01-1.156-.283zM18.5 12a4.48 4.48 0 01-.832 2.607l-1.45-1.45c.18-.346.282-.74.282-1.157 0-.417-.102-.81-.283-1.156l1.451-1.451A4.48 4.48 0 0118.5 12zM13 12a1 1 0 112 0 1 1 0 01-2 0z" clip-rule="evenodd"/><path d="M4.75 5a.75.75 0 01.75.75v2.5a.75.75 0 01-1.5 0v-2.5A.75.75 0 014.75 5zM5.5 15.75a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z"/><path fill-rule="evenodd" d="M1 4.75A2.75 2.75 0 013.75 2h16.5A2.75 2.75 0 0123 4.75v14.5A2.75 2.75 0 0120.25 22h-.125v1a.875.875 0 01-1.75 0v-1H5.625v1a.875.875 0 01-1.75 0v-1H3.75A2.75 2.75 0 011 19.25V4.75zM3.75 3.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h16.5c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H3.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-bank-vault-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M6.035 3.974A4.978 4.978 0 019 3c1.11 0 2.136.362 2.965.974l.005-.004a.75.75 0 111.06 1.06l-.004.005C13.638 5.865 14 6.89 14 8c0 1.11-.362 2.136-.974 2.965l.004.005a.75.75 0 11-1.06 1.06l-.005-.004A4.978 4.978 0 019 13a4.978 4.978 0 01-2.965-.974l-.005.004a.75.75 0 01-1.06-1.06l.004-.005A4.977 4.977 0 014 8c0-1.11.362-2.136.974-2.965L4.97 5.03a.75.75 0 011.06-1.06l.005.004zm1.078 1.078A3.484 3.484 0 019 4.5c.695 0 1.343.203 1.887.552l-.917.918a.75.75 0 001.06 1.06l.918-.917c.35.544.552 1.192.552 1.887 0 .695-.203 1.343-.552 1.887l-.918-.917a.75.75 0 10-1.06 1.06l.917.918A3.484 3.484 0 019 11.5a3.483 3.483 0 01-1.887-.552l.917-.918a.75.75 0 10-1.06-1.06l-.918.917A3.484 3.484 0 015.5 8c0-.695.203-1.343.552-1.887l.918.917a.75.75 0 001.06-1.06l-.917-.918z" clip-rule="evenodd"/><path d="M2.75 3.25A.75.75 0 013.5 4v1.5a.75.75 0 01-1.5 0V4a.75.75 0 01.75-.75zM3.5 10.5a.75.75 0 00-1.5 0V12a.75.75 0 001.5 0v-1.5z"/><path fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15H3v.25a.75.75 0 001.5 0V15h7v.25a.75.75 0 001.5 0V15h.75A2.25 2.25 0 0016 12.75v-9.5A2.25 2.25 0 0013.75 1H2.25zm11.5 12.5a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75H2.25a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h11.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-bar-chart-24" viewBox="0 0 24 24"><g><path d="M18 3a1 1 0 011 1v16a1 1 0 11-2 0V4a1 1 0 011-1zM12 9a1 1 0 011 1v10a1 1 0 11-2 0V10a1 1 0 011-1zM7 16a1 1 0 10-2 0v4a1 1 0 102 0v-4z"/></g></symbol><symbol id="flight-bar-chart-16" viewBox="0 0 16 16"><g><path d="M12 2a1 1 0 011 1v10a1 1 0 11-2 0V3a1 1 0 011-1zM8 6a1 1 0 011 1v6a1 1 0 11-2 0V7a1 1 0 011-1zM5 10a1 1 0 00-2 0v3a1 1 0 102 0v-3z"/></g></symbol><symbol id="flight-bar-chart-alt-24" viewBox="0 0 24 24"><g><path d="M12 3a1 1 0 011 1v16a1 1 0 11-2 0V4a1 1 0 011-1zM18 9a1 1 0 011 1v10a1 1 0 11-2 0V10a1 1 0 011-1zM7 14a1 1 0 10-2 0v6a1 1 0 102 0v-6z"/></g></symbol><symbol id="flight-bar-chart-alt-16" viewBox="0 0 16 16"><g><path d="M8 2a1 1 0 011 1v10a1 1 0 11-2 0V3a1 1 0 011-1zM12 6a1 1 0 011 1v6a1 1 0 11-2 0V7a1 1 0 011-1zM5 9a1 1 0 00-2 0v4a1 1 0 102 0V9z"/></g></symbol><symbol id="flight-battery-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M3.75 5A2.75 2.75 0 001 7.75v8.5A2.75 2.75 0 003.75 19h14.5A2.75 2.75 0 0021 16.25v-8.5A2.75 2.75 0 0018.25 5H3.75zM2.5 7.75c0-.69.56-1.25 1.25-1.25h14.5c.69 0 1.25.56 1.25 1.25v8.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25v-8.5z" clip-rule="evenodd"/><path d="M23.5 10.75a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z"/></g></symbol><symbol id="flight-battery-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M2.25 3A2.25 2.25 0 000 5.25v5.5A2.25 2.25 0 002.25 13h8.5A2.25 2.25 0 0013 10.75v-5.5A2.25 2.25 0 0010.75 3h-8.5zM1.5 5.25a.75.75 0 01.75-.75h8.5a.75.75 0 01.75.75v5.5a.75.75 0 01-.75.75h-8.5a.75.75 0 01-.75-.75v-5.5z" clip-rule="evenodd"/><path d="M15.5 6.75a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z"/></g></symbol><symbol id="flight-battery-charging-24" viewBox="0 0 24 24"><g><path d="M13.056 6.003a.75.75 0 10-1.112-1.006l-4.75 5.25a.75.75 0 00.335 1.22l5.428 1.67-4.035 4.885a.75.75 0 001.156.956l4.75-5.75a.75.75 0 00-.357-1.195L9.097 10.38l3.96-4.377z"/><path d="M3.75 6.5c-.69 0-1.25.56-1.25 1.25v8.5c0 .69.56 1.25 1.25 1.25h2.5a.75.75 0 010 1.5h-2.5A2.75 2.75 0 011 16.25v-8.5A2.75 2.75 0 013.75 5h4.5a.75.75 0 010 1.5h-4.5zM15 5.75a.75.75 0 01.75-.75h2.5A2.75 2.75 0 0121 7.75v8.5A2.75 2.75 0 0118.25 19h-4.5a.75.75 0 010-1.5h4.5c.69 0 1.25-.56 1.25-1.25v-8.5c0-.69-.56-1.25-1.25-1.25h-2.5a.75.75 0 01-.75-.75zM22.75 10a.75.75 0 01.75.75v2.5a.75.75 0 01-1.5 0v-2.5a.75.75 0 01.75-.75z"/></g></symbol><symbol id="flight-battery-charging-16" viewBox="0 0 16 16"><g><path d="M7.605 3.944a.75.75 0 10-1.21-.888l-2.75 3.75a.75.75 0 00.368 1.155l3.524 1.175-2.142 2.92a.75.75 0 101.21.888l2.75-3.75a.75.75 0 00-.368-1.156L5.463 6.864l2.142-2.92z"/><path d="M2.25 4.5a.75.75 0 00-.75.75v5.5c0 .414.336.75.75.75h.5a.75.75 0 010 1.5h-.5A2.25 2.25 0 010 10.75v-5.5A2.25 2.25 0 012.25 3h.5a.75.75 0 010 1.5h-.5zM9.5 3.75a.75.75 0 01.75-.75h.5A2.25 2.25 0 0113 5.25v5.5A2.25 2.25 0 0110.75 13h-.5a.75.75 0 010-1.5h.5a.75.75 0 00.75-.75v-5.5a.75.75 0 00-.75-.75h-.5a.75.75 0 01-.75-.75zM14.75 6a.75.75 0 01.75.75v2.5a.75.75 0 01-1.5 0v-2.5a.75.75 0 01.75-.75z"/></g></symbol><symbol id="flight-beaker-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M6.75 4a.75.75 0 000 1.5h.662l1.441 2.883a.25.25 0 010 .226l-4.657 9.118C3.432 19.224 4.52 21 6.2 21h11.6c1.68 0 2.768-1.776 2.004-3.273l-4.656-9.118a.25.25 0 01-.001-.226L16.588 5.5h.662a.75.75 0 000-1.5H6.75zm8.162 1.5H9.088l1.106 2.213a1.75 1.75 0 01-.007 1.578L8.805 12h6.39l-1.383-2.709a1.75 1.75 0 01-.007-1.578L14.912 5.5zm-9.38 12.909L8.04 13.5h7.922l2.507 4.909A.75.75 0 0117.8 19.5H6.2a.75.75 0 01-.668-1.091z" clip-rule="evenodd"/></symbol><symbol id="flight-beaker-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4.608 2H3.75a.75.75 0 000 1.5h.394l.987 2.154c.03.065.03.14.001.205l-2.949 6.685A1.75 1.75 0 003.784 15h8.432a1.75 1.75 0 001.6-2.456l-2.948-6.685a.25.25 0 01.001-.205l.987-2.154h.394a.75.75 0 000-1.5h-.858a.76.76 0 00-.033 0H4.64a.76.76 0 00-.033 0zm5.598 1.5H5.794l.7 1.529c.209.455.213.977.01 1.435L5.828 8h4.346l-.678-1.536a1.75 1.75 0 01.01-1.435l.701-1.529zm-6.65 9.65l1.61-3.65h5.669l1.61 3.65a.25.25 0 01-.23.35h-8.43a.25.25 0 01-.23-.35z" clip-rule="evenodd"/></symbol><symbol id="flight-bell-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M20 14.15c0 1.304 1.019 2.35 2.25 2.35a.75.75 0 010 1.5H1.75a.75.75 0 010-1.5C2.981 16.5 4 15.454 4 14.15V8.983C4 4.665 7.702 1 12 1s8 3.665 8 7.983v5.167zM5.5 8.983C5.5 5.5 8.524 2.5 12 2.5s6.5 3 6.5 6.483v5.167c0 .873.29 1.693.782 2.35H4.718a3.917 3.917 0 00.782-2.35V8.983z" clip-rule="evenodd"/><path d="M10.42 20.414a.75.75 0 00-1.34.672C9.63 22.188 10.703 23 12 23c1.296 0 2.369-.812 2.92-1.914a.75.75 0 10-1.34-.672c-.347.691-.953 1.086-1.58 1.086-.627 0-1.233-.395-1.58-1.086z"/></g></symbol><symbol id="flight-bell-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M13 8.78c0 1.334.788 1.72 1.25 1.72a.75.75 0 010 1.5H1.75a.75.75 0 010-1.5c.462 0 1.25-.386 1.25-1.72V6.405C3 3.665 4.907 1 8 1s5 2.665 5 5.405V8.78zM4.5 6.405C4.5 4.275 5.938 2.5 8 2.5c2.062 0 3.5 1.776 3.5 3.905V8.78c0 .677.145 1.252.387 1.72H4.113c.242-.468.387-1.043.387-1.72V6.405z" clip-rule="evenodd"/><path d="M6.898 12.872a.75.75 0 00-1.296.756A2.773 2.773 0 008 15c1.023 0 1.918-.55 2.398-1.372a.75.75 0 00-1.296-.756c-.219.374-.63.628-1.102.628-.473 0-.883-.254-1.102-.628z"/></g></symbol><symbol id="flight-bell-active-fill-24" viewBox="0 0 24 24"><g><path d="M22.25 16.5c-1.231 0-2.25-1.046-2.25-2.35V8.983a7.54 7.54 0 00-.05-.872.75.75 0 00-.856-.655 4 4 0 01-4.402-5.185.75.75 0 00-.499-.948A7.643 7.643 0 0012 1C7.702 1 4 4.665 4 8.983v5.167c0 1.304-1.019 2.35-2.25 2.35a.75.75 0 000 1.5h20.5a.75.75 0 000-1.5z"/><path d="M18.5 6a2.5 2.5 0 100-5 2.5 2.5 0 000 5zM10.42 20.414a.75.75 0 00-1.34.672C9.63 22.188 10.703 23 12 23c1.296 0 2.369-.812 2.92-1.914a.75.75 0 10-1.34-.672c-.347.691-.953 1.086-1.58 1.086-.627 0-1.233-.395-1.58-1.086z"/></g></symbol><symbol id="flight-bell-active-fill-16" viewBox="0 0 16 16"><g><path d="M14.25 10.5c-.462 0-1.25-.386-1.25-1.72V6.742a.75.75 0 00-.8-.749 3 3 0 01-3.037-3.975.75.75 0 00-.63-.99A5.092 5.092 0 008 1C4.907 1 3 3.665 3 6.405V8.78c0 1.334-.788 1.72-1.25 1.72a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5z"/><path d="M12 5a2 2 0 100-4 2 2 0 000 4zM6.898 12.872a.75.75 0 00-1.296.756A2.773 2.773 0 008 15c1.023 0 1.918-.55 2.398-1.372a.75.75 0 00-1.296-.756c-.219.374-.63.628-1.102.628-.473 0-.883-.254-1.102-.628z"/></g></symbol><symbol id="flight-bell-active-24" viewBox="0 0 24 24"><g><path d="M12 2.5c-3.476 0-6.5 3-6.5 6.483v5.167c0 .873-.29 1.693-.782 2.35h14.564a3.917 3.917 0 01-.782-2.35V8.983c0-.295-.022-.587-.064-.875a.75.75 0 011.485-.216c.052.357.079.722.079 1.091v5.167c0 1.304 1.019 2.35 2.25 2.35a.75.75 0 010 1.5H1.75a.75.75 0 010-1.5C2.981 16.5 4 15.454 4 14.15V8.983C4 4.665 7.702 1 12 1a7.631 7.631 0 012.389.385.75.75 0 11-.468 1.425A6.131 6.131 0 0012 2.5z"/><path d="M21 3.5a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0zM10.42 20.414a.75.75 0 00-1.34.672C9.63 22.188 10.703 23 12 23c1.296 0 2.369-.812 2.92-1.914a.75.75 0 10-1.34-.672c-.347.691-.953 1.086-1.58 1.086-.627 0-1.233-.395-1.58-1.086z"/></g></symbol><symbol id="flight-bell-active-16" viewBox="0 0 16 16"><g><path d="M8 2.5c-2.062 0-3.5 1.776-3.5 3.905V8.78c0 .677-.145 1.252-.387 1.72h7.774c-.242-.468-.387-1.043-.387-1.72V6.781a.75.75 0 011.5 0V8.78c0 1.334.788 1.72 1.25 1.72a.75.75 0 010 1.5H1.75a.75.75 0 010-1.5c.462 0 1.25-.386 1.25-1.72V6.405C3 3.665 4.907 1 8 1c.2 0 .395.011.587.034a.75.75 0 01-.174 1.49A3.578 3.578 0 008 2.5z"/><path d="M14 3a2 2 0 11-4 0 2 2 0 014 0zM6.898 12.872a.75.75 0 00-1.296.756A2.773 2.773 0 008 15c1.023 0 1.918-.55 2.398-1.372a.75.75 0 00-1.296-.756c-.219.374-.63.628-1.102.628-.473 0-.883-.254-1.102-.628z"/></g></symbol><symbol id="flight-bell-off-24" viewBox="0 0 24 24"><g><path d="M12 2.5c-1.4 0-2.734.487-3.83 1.31a.75.75 0 01-.9-1.2C8.602 1.609 10.247 1 12 1c4.298 0 8 3.665 8 7.983v5.167c0 .173.018.341.052.504a.75.75 0 11-1.467.31 3.939 3.939 0 01-.085-.814V8.983C18.5 5.5 15.476 2.5 12 2.5z"/><path fill-rule="evenodd" d="M4.71 5.77L1.22 2.28a.75.75 0 011.06-1.06l20.5 20.5a.75.75 0 11-1.06 1.06L16.94 18H1.75a.75.75 0 010-1.5C2.981 16.5 4 15.454 4 14.15V8.983c0-1.136.257-2.225.71-3.212zM15.44 16.5H4.717a3.917 3.917 0 00.782-2.35V8.983c0-.714.127-1.408.36-2.062l9.58 9.579z" clip-rule="evenodd"/><path d="M9.414 20.08a.75.75 0 011.007.334c.346.691.952 1.086 1.579 1.086s1.233-.395 1.58-1.086a.75.75 0 111.34.672C14.37 22.188 13.297 23 12 23c-1.296 0-2.369-.812-2.92-1.914a.75.75 0 01.334-1.007z"/></g></symbol><symbol id="flight-bell-off-16" viewBox="0 0 16 16"><g><path d="M8 2.5c-.546 0-1.033.12-1.457.326a.75.75 0 01-.655-1.35A4.802 4.802 0 018 1c3.093 0 5 2.665 5 5.405v1.78a.75.75 0 01-1.5 0v-1.78C11.5 4.275 10.062 2.5 8 2.5z"/><path fill-rule="evenodd" d="M3.343 4.404L1.22 2.28a.75.75 0 011.06-1.06l12.5 12.5a.75.75 0 11-1.06 1.06L10.94 12H1.75a.75.75 0 010-1.5c.462 0 1.25-.386 1.25-1.72V6.405c0-.691.118-1.37.343-2.001zM9.44 10.5H4.113c.242-.468.387-1.043.387-1.72V6.405c0-.264.023-.524.067-.777L9.439 10.5z" clip-rule="evenodd"/><path d="M5.872 12.602a.75.75 0 011.026.27c.219.374.63.628 1.102.628.473 0 .883-.254 1.102-.628a.75.75 0 011.296.756A2.773 2.773 0 018 15a2.773 2.773 0 01-2.398-1.372.75.75 0 01.27-1.026z"/></g></symbol><symbol id="flight-bookmark-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M4 4.75A2.75 2.75 0 016.75 2h10.5A2.75 2.75 0 0120 4.75v16.376a1 1 0 01-1.382.924l-6.522-2.699a.25.25 0 00-.192 0L5.382 22.05A1 1 0 014 21.126V4.75zM6.75 3.5c-.69 0-1.25.56-1.25 1.25v15.628l5.83-2.413a1.75 1.75 0 011.34 0l5.83 2.413V4.75c0-.69-.56-1.25-1.25-1.25H6.75z" clip-rule="evenodd"/></symbol><symbol id="flight-bookmark-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M2 3.25A2.25 2.25 0 014.25 1h7.5A2.25 2.25 0 0114 3.25v10.83a1 1 0 01-1.478.878L8.12 12.564a.25.25 0 00-.238 0l-4.403 2.394A1 1 0 012 14.08V3.25zm2.25-.75a.75.75 0 00-.75.75v9.989l3.664-1.992a1.75 1.75 0 011.672 0l3.664 1.992V3.25a.75.75 0 00-.75-.75h-7.5z" clip-rule="evenodd"/></symbol><symbol id="flight-bookmark-fill-24" viewBox="0 0 24 24"><path d="M6.75 2A2.75 2.75 0 004 4.75v16.376a1 1 0 001.382.924l6.522-2.699a.25.25 0 01.192 0l6.522 2.699A1 1 0 0020 21.126V4.75A2.75 2.75 0 0017.25 2H6.75z"/></symbol><symbol id="flight-bookmark-fill-16" viewBox="0 0 16 16"><path d="M4.25 1A2.25 2.25 0 002 3.25v10.83a1 1 0 001.478.878l4.403-2.394a.25.25 0 01.238 0l4.403 2.394A1 1 0 0014 14.08V3.25A2.25 2.25 0 0011.75 1h-7.5z"/></symbol><symbol id="flight-bookmark-add-24" viewBox="0 0 24 24"><g><path d="M11.75 7a.75.75 0 01.75.75V10h2.25a.75.75 0 010 1.5H12.5v2.25a.75.75 0 01-1.5 0V11.5H8.75a.75.75 0 010-1.5H11V7.75a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M4 4.75A2.75 2.75 0 016.75 2h10.5A2.75 2.75 0 0120 4.75v16.376a1 1 0 01-1.382.924l-6.522-2.699a.25.25 0 00-.192 0L5.382 22.05A1 1 0 014 21.126V4.75zM6.75 3.5c-.69 0-1.25.56-1.25 1.25v15.628l5.83-2.413a1.75 1.75 0 011.34 0l5.83 2.413V4.75c0-.69-.56-1.25-1.25-1.25H6.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-bookmark-add-16" viewBox="0 0 16 16"><g><path d="M7.75 4a.75.75 0 01.75.75V6h1.25a.75.75 0 010 1.5H8.5v1.25a.75.75 0 01-1.5 0V7.5H5.75a.75.75 0 010-1.5H7V4.75A.75.75 0 017.75 4z"/><path fill-rule="evenodd" d="M2 3.25A2.25 2.25 0 014.25 1h7.5A2.25 2.25 0 0114 3.25v10.83a1 1 0 01-1.478.878L8.12 12.564a.25.25 0 00-.238 0l-4.403 2.394A1 1 0 012 14.08V3.25zm2.25-.75a.75.75 0 00-.75.75v9.989l3.664-1.992a1.75 1.75 0 011.672 0l3.664 1.992V3.25a.75.75 0 00-.75-.75h-7.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-bookmark-add-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M4 4.75A2.75 2.75 0 016.75 2h10.5A2.75 2.75 0 0120 4.75v16.376a1 1 0 01-1.382.924l-6.522-2.699a.25.25 0 00-.192 0L5.382 22.05A1 1 0 014 21.126V4.75zM11.75 7a.75.75 0 00-.75.75V10H8.75a.75.75 0 000 1.5H11v2.25a.75.75 0 001.5 0V11.5h2.25a.75.75 0 000-1.5H12.5V7.75a.75.75 0 00-.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-bookmark-add-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4.25 1A2.25 2.25 0 002 3.25v10.83a1 1 0 001.478.878l4.403-2.394a.25.25 0 01.238 0l4.403 2.394A1 1 0 0014 14.08V3.25A2.25 2.25 0 0011.75 1h-7.5zM7 4.75a.75.75 0 011.5 0V6h1.25a.75.75 0 010 1.5H8.5v1.25a.75.75 0 01-1.5 0V7.5H5.75a.75.75 0 010-1.5H7V4.75z" clip-rule="evenodd"/></symbol><symbol id="flight-bookmark-remove-24" viewBox="0 0 24 24"><g><path d="M8.75 10a.75.75 0 000 1.5h6a.75.75 0 000-1.5h-6z"/><path fill-rule="evenodd" d="M6.75 2A2.75 2.75 0 004 4.75v16.376a1 1 0 001.382.924l6.522-2.699a.25.25 0 01.192 0l6.522 2.699A1 1 0 0020 21.126V4.75A2.75 2.75 0 0017.25 2H6.75zM5.5 4.75c0-.69.56-1.25 1.25-1.25h10.5c.69 0 1.25.56 1.25 1.25v15.628l-5.83-2.413a1.75 1.75 0 00-1.34 0L5.5 20.378V4.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-bookmark-remove-16" viewBox="0 0 16 16"><g><path d="M5.75 6a.75.75 0 000 1.5h4a.75.75 0 000-1.5h-4z"/><path fill-rule="evenodd" d="M4.25 1A2.25 2.25 0 002 3.25v10.83a1 1 0 001.478.878l4.403-2.394a.25.25 0 01.238 0l4.403 2.394A1 1 0 0014 14.08V3.25A2.25 2.25 0 0011.75 1h-7.5zM3.5 3.25a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75v9.989l-3.664-1.992a1.75 1.75 0 00-1.672 0L3.5 13.239V3.25z" clip-rule="evenodd"/></g></symbol><symbol id="flight-bookmark-remove-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M4 4.75A2.75 2.75 0 016.75 2h10.5A2.75 2.75 0 0120 4.75v16.376a1 1 0 01-1.382.924l-6.522-2.699a.25.25 0 00-.192 0L5.382 22.05A1 1 0 014 21.126V4.75zM8.75 10a.75.75 0 000 1.5h6a.75.75 0 000-1.5h-6z" clip-rule="evenodd"/></symbol><symbol id="flight-bookmark-remove-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M2 3.25A2.25 2.25 0 014.25 1h7.5A2.25 2.25 0 0114 3.25v10.83a1 1 0 01-1.478.878L8.12 12.564a.25.25 0 00-.238 0l-4.403 2.394A1 1 0 012 14.08V3.25zM5.75 6a.75.75 0 000 1.5h4a.75.75 0 000-1.5h-4z" clip-rule="evenodd"/></symbol><symbol id="flight-bottom-24" viewBox="0 0 24 24"><g><path d="M11.75 2a.75.75 0 01.75.75v12.638l4.96-5.158a.75.75 0 111.08 1.04l-6.25 6.5a.75.75 0 01-1.08 0l-6.25-6.5a.75.75 0 111.08-1.04L11 15.388V2.75a.75.75 0 01.75-.75zM3.5 20.5a.75.75 0 000 1.5H20a.75.75 0 000-1.5H3.5z"/></g></symbol><symbol id="flight-bottom-16" viewBox="0 0 16 16"><g><path d="M7.75 1a.75.75 0 01.75.75v7.614l2.955-3.129a.75.75 0 011.09 1.03l-4.25 4.5a.747.747 0 01-.533.235h-.024a.747.747 0 01-.51-.211l-.004-.005a.862.862 0 01-.02-.02l-4.25-4.499a.75.75 0 011.091-1.03L7 9.364V1.75A.75.75 0 017.75 1zM2.5 13.5a.75.75 0 000 1.5H13a.75.75 0 000-1.5H2.5z"/></g></symbol><symbol id="flight-box-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M13.206.754a2.75 2.75 0 00-2.412 0L1.983 5.052A1.75 1.75 0 001 6.625v9.902a2.75 2.75 0 001.496 2.448l8.25 4.226a2.75 2.75 0 002.508 0l8.25-4.226A2.75 2.75 0 0023 16.527V6.625a1.75 1.75 0 00-.983-1.573L13.206.754zm-1.754 1.348a1.25 1.25 0 011.096 0l8.11 3.956L12 10.17 3.343 6.058l8.109-3.956zM2.5 7.318v9.21c0 .468.263.898.68 1.112l8.07 4.133V11.474L2.5 7.318zm10.25 14.455l8.07-4.133a1.25 1.25 0 00.68-1.113v-9.21l-8.75 4.157v10.3z" clip-rule="evenodd"/></symbol><symbol id="flight-box-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M6.98.678a2.25 2.25 0 012.04 0l5.297 2.696c.42.214.683.644.683 1.114v6.717c0 .658-.37 1.261-.956 1.56L9.02 15.322a2.25 2.25 0 01-2.042 0l-5.023-2.557A1.75 1.75 0 011 11.205V4.488c0-.47.264-.9.683-1.114L6.979.678zm1.36 1.337a.75.75 0 00-.68 0L3.224 4.273 8 6.661l4.776-2.388L8.34 2.015zm-5.84 9.19V5.588l4.75 2.375v5.814l-4.613-2.35a.25.25 0 01-.137-.222zm6.25 2.572l4.613-2.35a.25.25 0 00.137-.222V5.588L8.75 7.963v5.814z" clip-rule="evenodd"/></symbol><symbol id="flight-briefcase-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M9.75 2A2.75 2.75 0 007 4.75V6H3.75A2.75 2.75 0 001 8.75v10.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V8.75A2.75 2.75 0 0020.25 6H17V4.75A2.75 2.75 0 0014.25 2h-4.5zm6.75 5.5h-9v13h9v-13zm1.5 13v-13h2.25c.69 0 1.25.56 1.25 1.25v10.5c0 .69-.56 1.25-1.25 1.25H18zM3.75 7.5H6v13H3.75c-.69 0-1.25-.56-1.25-1.25V8.75c0-.69.56-1.25 1.25-1.25zM15.5 6V4.75c0-.69-.56-1.25-1.25-1.25h-4.5c-.69 0-1.25.56-1.25 1.25V6h7z" clip-rule="evenodd"/></symbol><symbol id="flight-briefcase-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M5.75 1A1.75 1.75 0 004 2.75V4H2.25A2.25 2.25 0 000 6.25v6.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-6.5A2.25 2.25 0 0013.75 4H12V2.75A1.75 1.75 0 0010.25 1h-4.5zm6.75 12.5h1.25a.75.75 0 00.75-.75v-6.5a.75.75 0 00-.75-.75H12.5v8zm-1.5-8v8H5v-8h6zm-7.5 8v-8H2.25a.75.75 0 00-.75.75v6.5c0 .414.336.75.75.75H3.5zm7-9.5V2.75a.25.25 0 00-.25-.25h-4.5a.25.25 0 00-.25.25V4h5z" clip-rule="evenodd"/></symbol><symbol id="flight-bug-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M15.72 1.22a.75.75 0 111.06 1.06l-1.176 1.177a4.597 4.597 0 011.293 4.256c.612.071 1.008.147 1.258.208.54.133.845.61.845 1.089v1.408l2.987-1.12a.75.75 0 01.526 1.404L19 12.02v2.318l3.343.418a.75.75 0 11-.186 1.488L19 15.85v.4c0 .931-.195 1.816-.545 2.62l3.808 1.428a.75.75 0 01-.526 1.404l-4-1.5a.754.754 0 01-.046-.019C16.415 21.894 14.332 23 12 23s-4.415-1.106-5.69-2.817a.775.775 0 01-.047.02l-4 1.5a.75.75 0 11-.526-1.405l3.808-1.429A6.523 6.523 0 015 16.25v-.4l-3.157.394a.75.75 0 01-.186-1.488L5 14.338V12.02l-3.513-1.318a.75.75 0 01.526-1.404L5 10.418V9.01c0-.479.305-.956.845-1.089.25-.06.646-.137 1.258-.208a4.597 4.597 0 011.293-4.256L7.22 2.28a.75.75 0 011.06-1.06L9.63 2.568A5.196 5.196 0 0112 2c.852 0 1.661.205 2.371.568L15.72 1.22zM8.617 7.586A58.06 58.06 0 0112 7.5c1.4 0 2.508.035 3.383.086.076-.266.117-.547.117-.836 0-1.753-1.524-3.25-3.5-3.25S8.5 4.997 8.5 6.75c0 .29.04.57.117.836zM6.5 11.485v-2.17C7.198 9.188 8.772 9 12 9s4.802.187 5.5.316v6.934c0 2.87-2.433 5.25-5.5 5.25s-5.5-2.38-5.5-5.25v-1.234-3.5-.031z" clip-rule="evenodd"/></symbol><symbol id="flight-bug-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M10.136.803a.75.75 0 011.061 1.06l-.415.416C11.525 2.932 12 3.853 12 4.909c0 .103-.005.205-.014.306.094.016.173.03.238.045a.973.973 0 01.776.951V6.6l1.571-.629a.75.75 0 01.557 1.393L13 8.214v1.13l1.849.246a.75.75 0 11-.198 1.487l-1.659-.221a3.935 3.935 0 01-.426 1.555l2.364.887a.75.75 0 01-.527 1.404l-2.667-1a.752.752 0 01-.12-.058C10.687 14.491 9.384 15 8 15s-2.687-.509-3.616-1.356a.752.752 0 01-.12.058l-2.667 1a.75.75 0 11-.527-1.404l2.364-.887a3.935 3.935 0 01-.426-1.555l-1.659.22a.75.75 0 01-.198-1.486L3 9.343V8.174L.971 7.363a.75.75 0 01.557-1.393L3 6.56V6.21c0-.474.334-.854.776-.95.065-.015.144-.03.238-.046C4.004 5.114 4 5.012 4 4.909c0-1.056.475-1.977 1.218-2.63l-.415-.415A.75.75 0 015.863.803l.695.694a4.318 4.318 0 012.884 0l.694-.694zm-4.63 4.26C6.133 5.026 6.946 5 8 5c1.054 0 1.867.026 2.494.063.004-.051.006-.102.006-.154C10.5 3.793 9.461 2.75 8 2.75S5.5 3.793 5.5 4.91c0 .05.002.102.006.153zM4.5 7.652v-.994C5.043 6.586 6.093 6.5 8 6.5s2.957.086 3.5.158v3.949c0 1.494-1.454 2.893-3.5 2.893-2.046 0-3.5-1.4-3.5-2.893v-.59-2.335-.03z" clip-rule="evenodd"/></symbol><symbol id="flight-build-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M14.05 2.5a7.45 7.45 0 00-6.625 10.86 1.284 1.284 0 01-.29 1.556l-4.92 3.894a.75.75 0 01-.93-1.176l4.727-3.743a8.95 8.95 0 019.013-12.839c1.1.12 1.369 1.403.704 2.068L12.75 6.1v3.016l2.135 2.134H17.9l2.979-2.978c.665-.666 1.948-.396 2.067.703a8.95 8.95 0 01-12.704 9.078l-3.677 4.663a.75.75 0 01-1.178-.93l3.827-4.851a.763.763 0 01.059-.066 1.284 1.284 0 011.478-.236 7.45 7.45 0 0010.746-6.859l-2.606 2.607c-.237.236-.558.37-.893.37h-3.212c-.335 0-.656-.133-.893-.37l-2.274-2.274a1.262 1.262 0 01-.37-.893V6c0-.335.133-.656.37-.892l2.605-2.606a7.635 7.635 0 00-.175-.002z" clip-rule="evenodd"/></symbol><symbol id="flight-build-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8.603 2.549A4.251 4.251 0 005.47 8.696a1.076 1.076 0 01-.255 1.312l-3 2.374a.75.75 0 01-.93-1.176l2.701-2.139A5.75 5.75 0 019.47 1.004c.53.02.924.363 1.066.797.137.42.035.902-.306 1.243L8.75 4.523v1.596l1.13 1.13h1.597l1.48-1.479a1.22 1.22 0 011.241-.306c.435.142.778.537.798 1.066a5.75 5.75 0 01-7.978 5.52l-2.102 2.664a.75.75 0 01-1.177-.928l2.333-2.959a1.076 1.076 0 011.297-.265 4.251 4.251 0 006.082-3.165L12.41 8.438c-.199.2-.47.312-.75.312h-1.96c-.282 0-.552-.112-.751-.312L7.56 7.052c-.199-.2-.311-.47-.311-.751V4.34c0-.281.112-.551.311-.75l1.042-1.042z" clip-rule="evenodd"/></symbol><symbol id="flight-bulb-24" viewBox="0 0 24 24"><g><path d="M12 1a.75.75 0 01.75.75v1.5a.75.75 0 01-1.5 0v-1.5A.75.75 0 0112 1zM22.5 11.75a.75.75 0 01-.75.75h-1.5a.75.75 0 010-1.5h1.5a.75.75 0 01.75.75zM3.75 12.5a.75.75 0 000-1.5h-1.5a.75.75 0 000 1.5h1.5zM19.53 4.22a.75.75 0 010 1.06l-1.06 1.061a.75.75 0 01-1.061-1.06l1.06-1.061a.75.75 0 011.061 0zM4.47 5.28a.75.75 0 011.06-1.06l1.061 1.06a.75.75 0 01-1.06 1.061L4.47 5.281zM9.5 22.25a.75.75 0 01.75-.75h3.5a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M12 5.5a6 6 0 00-6 6c0 1.993 1.186 3.18 2.287 4.281l.316.318a.702.702 0 01.196.494v.658a2.25 2.25 0 002.25 2.249h1.901a2.25 2.25 0 002.25-2.25v-.629c0-.199.08-.386.216-.52l.122-.118C16.704 14.851 18 13.593 18 11.5a6 6 0 00-6-6zm-4.5 6a4.5 4.5 0 019 0c0 1.436-.85 2.28-2.13 3.527-.433.421-.67.998-.67 1.594v.629a.75.75 0 01-.75.75h-1.9a.75.75 0 01-.75-.75l-.001-.658c0-.569-.216-1.127-.626-1.544l-.264-.268C8.239 13.596 7.5 12.848 7.5 11.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-bulb-16" viewBox="0 0 16 16"><g><path d="M8 0a.75.75 0 01.75.75v1a.75.75 0 01-1.5 0v-1A.75.75 0 018 0zM13.28 2.22a.75.75 0 010 1.06l-.707.707a.75.75 0 11-1.06-1.06l.707-.707a.75.75 0 011.06 0zM2.72 3.28a.75.75 0 011.06-1.06l.707.707a.75.75 0 01-1.06 1.06L2.72 3.28zM15.5 7.5a.75.75 0 01-.75.75h-1a.75.75 0 010-1.5h1a.75.75 0 01.75.75zM2.25 8.25a.75.75 0 000-1.5h-1a.75.75 0 000 1.5h1zM6.25 15.25A.75.75 0 017 14.5h2A.75.75 0 019 16H7a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M8 3.5A4.5 4.5 0 003.5 8c0 1.53.926 2.465 1.718 3.264l.2.203c.05.05.081.124.081.208.001 1.008.818 1.825 1.826 1.825H8.69c1 0 1.811-.81 1.811-1.81 0-.083.033-.159.088-.213l.067-.066C11.492 10.592 12.5 9.605 12.5 8A4.5 4.5 0 008 3.5zM5 8a3 3 0 016 0c0 .928-.54 1.502-1.462 2.406-.347.34-.538.803-.538 1.283a.31.31 0 01-.31.311H7.324A.326.326 0 017 11.674c0-.461-.175-.914-.507-1.255l-.115-.117C5.49 9.397 5 8.894 5 8z" clip-rule="evenodd"/></g></symbol><symbol id="flight-calendar-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M17 1a.75.75 0 00-1.5 0v1h-7V1A.75.75 0 007 1v1H4.75A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H17V1zm3.5 7V4.75c0-.69-.56-1.25-1.25-1.25H17V5a.75.75 0 01-1.5 0V3.5h-7V5A.75.75 0 017 5V3.5H4.75c-.69 0-1.25.56-1.25 1.25V8h17zm-17 1.5h17v9.75c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25V9.5z" clip-rule="evenodd"/></symbol><symbol id="flight-calendar-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M11.5.75a.75.75 0 00-1.5 0V1H6V.75a.75.75 0 00-1.5 0V1H3.25A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1H11.5V.75zm-7 2.5V2.5H3.25a.75.75 0 00-.75.75V5h11V3.25a.75.75 0 00-.75-.75H11.5v.75a.75.75 0 01-1.5 0V2.5H6v.75a.75.75 0 01-1.5 0zm9 3.25h-11v6.25c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V6.5z" clip-rule="evenodd"/></symbol><symbol id="flight-camera-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M7 13a5 5 0 1110 0 5 5 0 01-10 0zm5-3.5a3.5 3.5 0 100 7 3.5 3.5 0 000-7z" clip-rule="evenodd"/><path d="M5 8a1 1 0 000 2h.01a1 1 0 000-2H5z"/><path fill-rule="evenodd" d="M7.557 2.912A1.75 1.75 0 019.094 2h5.812c.64 0 1.23.35 1.537.912l1.014 1.859 2.924.14A2.75 2.75 0 0123 7.656V19.25A2.75 2.75 0 0120.25 22H3.75A2.75 2.75 0 011 19.25V7.657A2.75 2.75 0 013.62 4.91l2.923-.14 1.014-1.858zm1.537.588a.25.25 0 00-.22.13L7.658 5.86a.75.75 0 01-.622.39l-3.345.158A1.25 1.25 0 002.5 7.657V19.25c0 .69.56 1.25 1.25 1.25h16.5c.69 0 1.25-.56 1.25-1.25V7.657a1.25 1.25 0 00-1.19-1.249l-3.346-.159a.75.75 0 01-.622-.39L15.126 3.63a.25.25 0 00-.22-.13H9.094z" clip-rule="evenodd"/></g></symbol><symbol id="flight-camera-16" viewBox="0 0 16 16"><g><path d="M3 6a1 1 0 011-1h.01a1 1 0 010 2H4a1 1 0 01-1-1z"/><path fill-rule="evenodd" d="M8 5a3 3 0 100 6 3 3 0 000-6zM6.5 8a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M5.056 1.696A1.25 1.25 0 016.176 1h3.648c.475 0 .91.27 1.12.696l.54 1.093 1.457.124A2.25 2.25 0 0115 5.155v6.595A2.25 2.25 0 0112.75 14h-9.5A2.25 2.25 0 011 11.75V5.155a2.25 2.25 0 012.059-2.242l1.456-.124.541-1.093zm1.276.804l-.66 1.333a.75.75 0 01-.608.414l-1.878.16a.75.75 0 00-.686.748v6.595c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V5.155a.75.75 0 00-.686-.748l-1.878-.16a.75.75 0 01-.608-.414L9.668 2.5H6.332z" clip-rule="evenodd"/></g></symbol><symbol id="flight-camera-off-24" viewBox="0 0 24 24"><g><path d="M5 8a1 1 0 000 2h.01a1 1 0 100-2H5z"/><path fill-rule="evenodd" d="M2.28 1.22a.75.75 0 00-1.06 1.06l2.615 2.616-.221.01A2.75 2.75 0 001 7.654V19.25A2.75 2.75 0 003.75 22h17.19l.78.78a.75.75 0 101.06-1.06L2.28 1.22zM19.44 20.5l-3.935-3.934a5 5 0 01-7.07-7.07l-3.17-3.17-1.577.079A1.25 1.25 0 002.5 7.653V19.25c0 .69.56 1.25 1.25 1.25h15.69zm-9.945-9.944l4.95 4.949a3.5 3.5 0 01-4.95-4.95z" clip-rule="evenodd"/><path d="M9.094 2c-.64 0-1.23.35-1.537.912l-.421.773a.75.75 0 101.317.718l.421-.773a.25.25 0 01.22-.13h5.812a.25.25 0 01.22.13l1.216 2.23a.75.75 0 00.622.39l3.346.158a1.25 1.25 0 011.19 1.249V18.5a.75.75 0 001.5 0V7.657a2.75 2.75 0 00-2.62-2.747l-2.923-.14-1.014-1.858A1.75 1.75 0 0014.906 2H9.094z"/><path d="M12.345 8.698a.75.75 0 01.915-.538 5.007 5.007 0 013.58 3.58.75.75 0 01-1.452.377 3.507 3.507 0 00-2.505-2.505.75.75 0 01-.538-.914z"/></g></symbol><symbol id="flight-camera-off-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M1.22 1.22a.75.75 0 011.06 0l12.5 12.5a.75.75 0 11-1.06 1.06l-.78-.78H3.25A2.25 2.25 0 011 11.75V5.155a2.25 2.25 0 011.138-1.957L1.22 2.28a.75.75 0 010-1.06zm8.304 9.364l1.915 1.916H3.25a.75.75 0 01-.75-.75V5.155a.75.75 0 01.686-.748l.148-.012 2.081 2.081a3 3 0 004.108 4.108zM8.389 9.45L6.55 7.611A1.5 1.5 0 008.389 9.45z" clip-rule="evenodd"/><path d="M5.866 1h3.958c.475 0 .91.27 1.12.696l.54 1.093 1.457.124A2.25 2.25 0 0115 5.155v5.595a.75.75 0 01-1.5 0V5.155a.75.75 0 00-.686-.748l-1.878-.16a.75.75 0 01-.608-.414L9.668 2.5H5.866a.75.75 0 010-1.5z"/></g></symbol><symbol id="flight-caret-24" viewBox="0 0 24 24"><g><path d="M12.543 3.232a.75.75 0 00-1.085 0l-5.25 5.5a.75.75 0 101.085 1.036L12 4.836l4.707 4.932a.75.75 0 001.085-1.036l-5.25-5.5zM11.457 20.768a.75.75 0 001.085 0l5.25-5.5a.75.75 0 00-1.085-1.036L12 19.164l-4.707-4.932a.75.75 0 00-1.086 1.036l5.25 5.5z"/></g></symbol><symbol id="flight-caret-16" viewBox="0 0 16 16"><g><path d="M8.55 2.24a.75.75 0 00-1.1 0L4.2 5.74a.75.75 0 101.1 1.02L8 3.852l2.7 2.908a.75.75 0 101.1-1.02l-3.25-3.5zM7.45 13.76a.75.75 0 001.1 0l3.25-3.5a.75.75 0 10-1.1-1.02L8 12.148 5.3 9.24a.75.75 0 00-1.1 1.02l3.25 3.5z"/></g></symbol><symbol id="flight-cast-24" viewBox="0 0 24 24"><g><path d="M3.75 3A2.75 2.75 0 001 5.75V8a.75.75 0 001.5 0V5.75c0-.69.56-1.25 1.25-1.25h16.5c.69 0 1.25.56 1.25 1.25v12.5c0 .69-.56 1.25-1.25 1.25H14a.75.75 0 000 1.5h6.25A2.75 2.75 0 0023 18.25V5.75A2.75 2.75 0 0020.25 3H3.75z"/><path d="M1.833 11.005a.75.75 0 10-.166 1.49 8.873 8.873 0 017.838 7.838.75.75 0 101.49-.166 10.373 10.373 0 00-9.162-9.162zM1.9 15.345a.75.75 0 00-.3 1.47A4.596 4.596 0 015.185 20.4a.75.75 0 001.47-.3A6.096 6.096 0 001.9 15.345z"/></g></symbol><symbol id="flight-cast-16" viewBox="0 0 16 16"><g><path d="M3.25 2A2.25 2.25 0 001 4.25v1.23a.75.75 0 001.5 0V4.25a.75.75 0 01.75-.75h9.5a.75.75 0 01.75.75v7.5a.75.75 0 01-.75.75H9.724a.75.75 0 000 1.5h3.026A2.25 2.25 0 0015 11.75v-7.5A2.25 2.25 0 0012.75 2h-9.5z"/><path d="M1.833 7.505a.75.75 0 10-.166 1.49 4.91 4.91 0 014.338 4.338.75.75 0 101.49-.166 6.41 6.41 0 00-5.662-5.662z"/><path d="M1.9 10.062a.75.75 0 00-.3 1.47A2.394 2.394 0 013.468 13.4a.75.75 0 101.47-.3A3.894 3.894 0 001.9 10.062z"/></g></symbol><symbol id="flight-certificate-24" viewBox="0 0 24 24"><g><path d="M10 5a.75.75 0 000 1.5h4A.75.75 0 0014 5h-4z"/><path fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v14.5A2.75 2.75 0 005.75 21h1.485l-.22 1.103a.75.75 0 001.054.826L12 21.079l3.93 1.85a.75.75 0 001.055-.826L16.765 21h1.485A2.75 2.75 0 0021 18.25V3.75A2.75 2.75 0 0018.25 1H5.75zm2.438 15.236L7.535 19.5H5.75c-.69 0-1.25-.56-1.25-1.25V3.75c0-.69.56-1.25 1.25-1.25h12.5c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25h-1.785l-.653-3.264a5 5 0 10-7.624 0zm6.219-.695a.75.75 0 01.135-.135 3.5 3.5 0 10-5.084 0c.051.04.096.085.135.135A3.488 3.488 0 0012 16.5c.932 0 1.78-.364 2.407-.959zM12 18a4.977 4.977 0 01-2.501-.67l-.722 3.608 2.904-1.367a.75.75 0 01.638 0l2.904 1.367-.722-3.608c-.736.426-1.59.67-2.501.67z" clip-rule="evenodd"/></g></symbol><symbol id="flight-certificate-16" viewBox="0 0 16 16"><g><path d="M6.25 3.25A.75.75 0 017 2.5h2A.75.75 0 019 4H7a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M3.25 0A2.25 2.25 0 001 2.25v9.5A2.25 2.25 0 003.25 14h1.67l-.115.913a.7.7 0 00.955.737L8 14.754l2.24.896a.7.7 0 00.955-.737L11.08 14h1.669A2.25 2.25 0 0015 11.75v-9.5A2.25 2.25 0 0012.75 0h-9.5zm7.643 12.5h1.857a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75h-9.5a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h1.857l.172-1.378a3.45 3.45 0 115.441 0l.173 1.378zm-1.456-.362c-.438.2-.924.312-1.437.312s-1-.112-1.437-.312l-.221 1.771 1.398-.559a.7.7 0 01.52 0l1.398.56-.221-1.772zM5.95 9a2.05 2.05 0 114.1 0 2.05 2.05 0 01-4.1 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-change-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M5.534 12.224a7.725 7.725 0 01-.219.269.75.75 0 11-1.13-.986 3.1 3.1 0 00.097-.123c.308-.404 1.183-1.548 2.442-2.08a3.783 3.783 0 012.699-.106c1.003.324 2.05 1.056 3.142 2.31.98 1.122 1.81 1.652 2.473 1.866a2.284 2.284 0 001.654-.06c.837-.354 1.402-1.068 1.774-1.538.082-.104.155-.195.219-.269a.75.75 0 011.13.986c-.02.023-.053.066-.097.123-.308.404-1.183 1.548-2.442 2.08a3.783 3.783 0 01-2.699.106c-1.003-.324-2.05-1.056-3.142-2.31-.98-1.122-1.81-1.652-2.473-1.866a2.284 2.284 0 00-1.654.06c-.837.354-1.402 1.068-1.774 1.538z" clip-rule="evenodd"/></symbol><symbol id="flight-change-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9.721 8.453c-.27-.087-.658-.324-1.135-.921-.595-.745-1.211-1.21-1.852-1.414a2.434 2.434 0 00-1.743.094c-.472.206-.842.522-1.095.778a5.881 5.881 0 00-.382.427l-.025.029-.024.029a.75.75 0 001.064 1.057 3.3 3.3 0 00.2-.229c.065-.078.143-.166.233-.257.185-.188.399-.359.627-.458a.936.936 0 01.69-.04c.27.086.658.323 1.135.92.595.745 1.211 1.21 1.852 1.414a2.434 2.434 0 001.743-.094c.472-.206.841-.522 1.095-.778.129-.13.235-.252.313-.344l.069-.082a4.562 4.562 0 01.05-.059.75.75 0 00-1.065-1.057 3.292 3.292 0 00-.2.229 4.393 4.393 0 01-.233.257 2.102 2.102 0 01-.627.458.936.936 0 01-.69.04z" clip-rule="evenodd"/></symbol><symbol id="flight-change-circle-24" viewBox="0 0 24 24"><g><path d="M7.071 12.486c.056-.065.116-.143.182-.229.284-.366.677-.874 1.264-1.128a1.5 1.5 0 011.117-.041c.46.152 1.064.539 1.795 1.398.84.988 1.66 1.583 2.465 1.85a2.998 2.998 0 002.185-.089c1.012-.438 1.715-1.388 1.933-1.682.028-.038.048-.066.06-.08a.75.75 0 00-1.143-.97 6.64 6.64 0 00-.182.227c-.284.367-.677.875-1.264 1.129a1.5 1.5 0 01-1.117.041c-.46-.152-1.064-.539-1.795-1.398-.84-.988-1.66-1.584-2.465-1.85a2.998 2.998 0 00-2.185.089c-1.012.438-1.715 1.388-1.933 1.682-.028.038-.048.066-.06.08a.75.75 0 101.143.97z"/><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-change-circle-16" viewBox="0 0 16 16"><g><path d="M8.586 7.532c.477.597.864.834 1.135.92a.936.936 0 00.69-.04c.228-.1.442-.27.627-.458.09-.09.168-.18.234-.257l.03-.036c.048-.058.12-.143.17-.193a.75.75 0 011.062 1.06l-.023.026-.025.03-.07.082a5.846 5.846 0 01-.312.344c-.253.256-.623.572-1.095.778a2.434 2.434 0 01-1.743.094c-.64-.204-1.257-.67-1.852-1.414-.477-.597-.864-.834-1.135-.92a.936.936 0 00-.69.04c-.228.1-.442.27-.627.458-.09.09-.168.18-.234.257l-.03.036a3.3 3.3 0 01-.17.193.75.75 0 01-1.063-1.057l.024-.03.025-.028.07-.083c.077-.092.183-.214.312-.344.253-.256.623-.572 1.095-.777a2.434 2.434 0 011.743-.095c.64.204 1.257.67 1.852 1.414z"/><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-change-square-24" viewBox="0 0 24 24"><g><path d="M7.071 12.486c.056-.065.116-.143.182-.229.284-.366.677-.874 1.264-1.128a1.5 1.5 0 011.117-.041c.46.152 1.064.539 1.795 1.398.84.988 1.66 1.583 2.465 1.85a2.998 2.998 0 002.185-.089c1.012-.438 1.715-1.388 1.933-1.682.028-.038.048-.066.06-.08a.75.75 0 00-1.143-.97 6.64 6.64 0 00-.182.227c-.284.367-.677.875-1.264 1.129a1.5 1.5 0 01-1.117.041c-.46-.152-1.064-.539-1.795-1.398-.84-.988-1.66-1.584-2.465-1.85a2.998 2.998 0 00-2.185.089c-1.012.438-1.715 1.388-1.933 1.682a2.056 2.056 0 01-.06.08.75.75 0 101.143.97z"/><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25h14.5c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25V4.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-change-square-16" viewBox="0 0 16 16"><g><path d="M8.586 7.532c.477.597.864.834 1.135.92a.936.936 0 00.69-.04c.228-.1.442-.27.627-.458.09-.09.168-.18.234-.257l.03-.036c.048-.058.12-.143.17-.193a.75.75 0 011.062 1.06l-.023.026-.025.03-.07.082a5.846 5.846 0 01-.312.344c-.253.256-.623.572-1.095.778a2.434 2.434 0 01-1.743.094c-.64-.204-1.257-.67-1.852-1.414-.477-.597-.864-.834-1.135-.92a.936.936 0 00-.69.04c-.228.1-.442.27-.627.458-.09.09-.168.18-.234.257l-.03.036a3.3 3.3 0 01-.17.193.75.75 0 01-1.063-1.057l.001-.002.023-.027.025-.03.07-.082c.077-.092.183-.214.312-.344.253-.256.623-.572 1.095-.777a2.434 2.434 0 011.743-.095c.64.204 1.257.67 1.852 1.414z"/><path fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zM2.5 3.25a.75.75 0 01.75-.75h9.5a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75v-9.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-check-24" viewBox="0 0 24 24"><path d="M21.78 6.28a.75.75 0 00-1.06-1.06L8.75 17.19l-5.47-5.47a.75.75 0 00-1.06 1.06l6 6a.75.75 0 001.06 0l12.5-12.5z"/></symbol><symbol id="flight-check-16" viewBox="0 0 16 16"><path d="M14.78 4.28a.75.75 0 00-1.06-1.06l-7.97 7.97-3.47-3.47a.75.75 0 00-1.06 1.06l4 4a.75.75 0 001.06 0l8.5-8.5z"/></symbol><symbol id="flight-check-circle-24" viewBox="0 0 24 24"><g><path d="M17.78 8.22a.75.75 0 010 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></symbol><symbol id="flight-check-circle-16" viewBox="0 0 16 16"><g><path d="M11.78 5.22a.75.75 0 010 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></symbol><symbol id="flight-check-circle-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm4.72 7.22a.75.75 0 111.06 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97z" clip-rule="evenodd"/></symbol><symbol id="flight-check-circle-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zm2.72 5.22a.75.75 0 111.06 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97z" clip-rule="evenodd"/></symbol><symbol id="flight-check-diamond-24" viewBox="0 0 24 24"><g><path d="M16.28 8.72a.75.75 0 010 1.06l-5.5 5.5a.75.75 0 01-1.06 0l-2.5-2.5a.75.75 0 011.06-1.06l1.97 1.97 4.97-4.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M1.884 10.056l8.171-8.172a2.75 2.75 0 013.89 0l8.171 8.172a2.75 2.75 0 010 3.889l-8.171 8.171a2.75 2.75 0 01-3.89 0l-8.171-8.171a2.75 2.75 0 010-3.89zm9.232-7.111l-8.172 8.171a1.25 1.25 0 000 1.768l8.172 8.172a1.25 1.25 0 001.768 0l8.171-8.172a1.25 1.25 0 000-1.768l-8.171-8.171a1.25 1.25 0 00-1.768 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-check-diamond-16" viewBox="0 0 16 16"><g><path d="M11.28 5.72a.75.75 0 010 1.06l-4 4a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.47-3.47a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M.75 6.41L6.407.752a2.25 2.25 0 013.182 0l5.657 5.656a2.25 2.25 0 010 3.182l-5.657 5.657a2.25 2.25 0 01-3.182 0L.75 9.591a2.25 2.25 0 010-3.182zm6.718-4.597L1.81 7.47a.75.75 0 000 1.06l5.657 5.657a.75.75 0 001.06 0l5.657-5.656a.75.75 0 000-1.061L8.528 1.813a.75.75 0 00-1.06 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-check-diamond-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M13.945 1.884a2.75 2.75 0 00-3.89 0l-8.171 8.172a2.75 2.75 0 000 3.889l8.171 8.171a2.75 2.75 0 003.89 0l8.171-8.171a2.75 2.75 0 000-3.89l-8.171-8.17zM16.28 9.78l-5.5 5.5a.75.75 0 01-1.06 0l-2.5-2.5a.75.75 0 111.06-1.06l1.97 1.97 4.97-4.97a.75.75 0 011.06 1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-check-diamond-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9.57.752a2.25 2.25 0 00-3.183 0L.73 6.41a2.25 2.25 0 000 3.182l5.657 5.657a2.25 2.25 0 003.182 0l5.657-5.657a2.25 2.25 0 000-3.182L9.569.752zm1.71 6.028l-4 4a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.47-3.47a.75.75 0 011.06 1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-check-hexagon-24" viewBox="0 0 24 24"><g><path d="M16.28 8.72a.75.75 0 010 1.06l-5.5 5.5a.75.75 0 01-1.06 0l-2.5-2.5a.75.75 0 111.06-1.06l1.97 1.97 4.97-4.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M10.559 1.006a2.75 2.75 0 012.882 0l7.75 4.77A2.75 2.75 0 0122.5 8.118v7.764a2.75 2.75 0 01-1.309 2.342l-7.75 4.77a2.75 2.75 0 01-2.882 0l-7.75-4.77A2.75 2.75 0 011.5 15.882V8.118a2.75 2.75 0 011.309-2.342l7.75-4.77zm2.096 1.278a1.25 1.25 0 00-1.31 0l-7.75 4.77A1.25 1.25 0 003 8.117v7.764c0 .435.225.838.595 1.065l7.75 4.77a1.25 1.25 0 001.31 0l7.75-4.77c.37-.227.595-.63.595-1.065V8.118a1.25 1.25 0 00-.595-1.065l-7.75-4.77z" clip-rule="evenodd"/></g></symbol><symbol id="flight-check-hexagon-16" viewBox="0 0 16 16"><g><path d="M11.28 5.72a.75.75 0 010 1.06l-4 4a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.47-3.47a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M6.834.33a2.25 2.25 0 012.332 0l5.25 3.182A2.25 2.25 0 0115.5 5.436v5.128a2.25 2.25 0 01-1.084 1.924l-5.25 3.182a2.25 2.25 0 01-2.332 0l-5.25-3.182A2.25 2.25 0 01.5 10.564V5.436a2.25 2.25 0 011.084-1.924L6.834.33zm1.555 1.283a.75.75 0 00-.778 0l-5.25 3.181A.75.75 0 002 5.436v5.128a.75.75 0 00.361.642l5.25 3.181a.75.75 0 00.778 0l5.25-3.181a.75.75 0 00.361-.642V5.436a.75.75 0 00-.361-.642l-5.25-3.181z" clip-rule="evenodd"/></g></symbol><symbol id="flight-check-hexagon-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M13.441 1.006a2.75 2.75 0 00-2.882 0l-7.75 4.77a2.75 2.75 0 00-1.31 2.342v7.764a2.75 2.75 0 001.31 2.342l7.75 4.77a2.75 2.75 0 002.882 0l7.75-4.77a2.75 2.75 0 001.309-2.342V8.118a2.75 2.75 0 00-1.309-2.342l-7.75-4.77zm2.84 8.774l-5.5 5.5a.75.75 0 01-1.061 0l-2.5-2.5a.75.75 0 111.06-1.06l1.97 1.97 4.97-4.97a.75.75 0 111.06 1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-check-hexagon-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9.166.33a2.25 2.25 0 00-2.332 0l-5.25 3.182A2.25 2.25 0 00.5 5.436v5.128a2.25 2.25 0 001.084 1.924l5.25 3.182a2.25 2.25 0 002.332 0l5.25-3.182a2.25 2.25 0 001.084-1.924V5.436a2.25 2.25 0 00-1.084-1.924L9.166.33zm1.054 5.39a.75.75 0 111.06 1.06l-4 4a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.47-3.47z" clip-rule="evenodd"/></symbol><symbol id="flight-check-square-24" viewBox="0 0 24 24"><g><path d="M17.78 8.22a.75.75 0 010 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h14.5A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V4.75zM4.75 3.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h14.5c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H4.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-check-square-16" viewBox="0 0 16 16"><g><path d="M11.78 5.22a.75.75 0 010 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h9.5A2.25 2.25 0 0115 3.25v9.5A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75h-9.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-check-square-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75zm11.97 6.22a.75.75 0 111.06 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97z" clip-rule="evenodd"/></symbol><symbol id="flight-check-square-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zm7.47 4.22a.75.75 0 111.06 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97z" clip-rule="evenodd"/></symbol><symbol id="flight-chevron-down-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M5.23 8.21a.75.75 0 011.06.02L12 14.168l5.71-5.938a.75.75 0 111.08 1.04l-6.25 6.5a.75.75 0 01-1.08 0l-6.25-6.5a.75.75 0 01.02-1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-chevron-down-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3.235 5.205a.75.75 0 011.06.03L8 9.158l3.705-3.923a.75.75 0 011.09 1.03l-4.25 4.5a.75.75 0 01-1.09 0l-4.25-4.5a.75.75 0 01.03-1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-chevron-left-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M15.79 18.77a.75.75 0 00-.02-1.06L9.832 12l5.938-5.71a.75.75 0 10-1.04-1.08l-6.5 6.25a.75.75 0 000 1.08l6.5 6.25a.75.75 0 001.06-.02z" clip-rule="evenodd"/></symbol><symbol id="flight-chevron-left-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M10.795 3.235a.75.75 0 01-.03 1.06L6.842 8l3.923 3.705a.75.75 0 01-1.03 1.09l-4.5-4.25a.75.75 0 010-1.09l4.5-4.25a.75.75 0 011.06.03z" clip-rule="evenodd"/></symbol><symbol id="flight-chevron-right-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M8.21 18.77a.75.75 0 01.02-1.06L14.168 12 8.23 6.29a.75.75 0 111.04-1.08l6.5 6.25a.75.75 0 010 1.08l-6.5 6.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd"/></symbol><symbol id="flight-chevron-right-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M5.205 3.235a.75.75 0 00.03 1.06L9.158 8l-3.923 3.705a.75.75 0 001.03 1.09l4.5-4.25a.75.75 0 000-1.09l-4.5-4.25a.75.75 0 00-1.06.03z" clip-rule="evenodd"/></symbol><symbol id="flight-chevron-up-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M5.23 15.79a.75.75 0 001.06-.02L12 9.832l5.71 5.938a.75.75 0 101.08-1.04l-6.25-6.5a.75.75 0 00-1.08 0l-6.25 6.5a.75.75 0 00.02 1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-chevron-up-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3.235 10.795a.75.75 0 001.06-.03L8 6.842l3.705 3.923a.75.75 0 001.09-1.03l-4.25-4.5a.75.75 0 00-1.09 0l-4.25 4.5a.75.75 0 00.03 1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-chevrons-down-24" viewBox="0 0 24 24"><g><path d="M7.293 5.232a.75.75 0 00-1.086 1.036l5.25 5.5a.75.75 0 001.085 0l5.25-5.5a.75.75 0 10-1.085-1.036L12 10.164 7.293 5.232z"/><path d="M7.293 12.232a.75.75 0 00-1.086 1.036l5.25 5.5a.75.75 0 001.085 0l5.25-5.5a.75.75 0 00-1.085-1.036L12 17.164l-4.707-4.932z"/></g></symbol><symbol id="flight-chevrons-down-16" viewBox="0 0 16 16"><g><path d="M5.3 3.24a.75.75 0 00-1.1 1.02l3.25 3.5a.75.75 0 001.1 0l3.25-3.5a.75.75 0 10-1.1-1.02L8 6.148 5.3 3.24z"/><path d="M5.3 8.24a.75.75 0 10-1.1 1.02l3.25 3.5a.75.75 0 001.1 0l3.25-3.5a.75.75 0 10-1.1-1.02L8 11.148 5.3 8.24z"/></g></symbol><symbol id="flight-chevrons-left-24" viewBox="0 0 24 24"><g><path d="M11.768 16.707a.75.75 0 01-1.036 1.085l-5.5-5.25a.75.75 0 010-1.085l5.5-5.25a.75.75 0 011.036 1.086L6.836 12l4.932 4.707z"/><path d="M18.768 16.707a.75.75 0 01-1.036 1.085l-5.5-5.25a.75.75 0 010-1.085l5.5-5.25a.75.75 0 011.036 1.086L13.836 12l4.932 4.707z"/></g></symbol><symbol id="flight-chevrons-left-16" viewBox="0 0 16 16"><g><path d="M7.76 5.3a.75.75 0 00-1.02-1.1l-3.5 3.25a.75.75 0 000 1.1l3.5 3.25a.75.75 0 101.02-1.1L4.852 8 7.76 5.3z"/><path d="M12.76 5.3a.75.75 0 10-1.02-1.1l-3.5 3.25a.75.75 0 000 1.1l3.5 3.25a.75.75 0 101.02-1.1L9.852 8l2.908-2.7z"/></g></symbol><symbol id="flight-chevrons-right-24" viewBox="0 0 24 24"><g><path d="M5.232 16.707a.75.75 0 001.036 1.085l5.5-5.25a.75.75 0 000-1.085l-5.5-5.25a.75.75 0 00-1.036 1.086L10.164 12l-4.932 4.707z"/><path d="M12.232 16.707a.75.75 0 001.036 1.085l5.5-5.25a.75.75 0 000-1.085l-5.5-5.25a.75.75 0 00-1.036 1.086L17.164 12l-4.932 4.707z"/></g></symbol><symbol id="flight-chevrons-right-16" viewBox="0 0 16 16"><g><path d="M3.24 5.3a.75.75 0 011.02-1.1l3.5 3.25a.75.75 0 010 1.1l-3.5 3.25a.75.75 0 11-1.02-1.1L6.148 8 3.24 5.3z"/><path d="M8.24 5.3a.75.75 0 111.02-1.1l3.5 3.25a.75.75 0 010 1.1l-3.5 3.25a.75.75 0 11-1.02-1.1L11.148 8 8.24 5.3z"/></g></symbol><symbol id="flight-chevrons-up-24" viewBox="0 0 24 24"><g><path d="M7.293 11.768a.75.75 0 01-1.086-1.036l5.25-5.5a.75.75 0 011.085 0l5.25 5.5a.75.75 0 01-1.085 1.036L12 6.836l-4.707 4.932z"/><path d="M7.293 18.768a.75.75 0 01-1.086-1.036l5.25-5.5a.75.75 0 011.085 0l5.25 5.5a.75.75 0 01-1.085 1.036L12 13.836l-4.707 4.932z"/></g></symbol><symbol id="flight-chevrons-up-16" viewBox="0 0 16 16"><g><path d="M5.3 7.76a.75.75 0 01-1.1-1.02l3.25-3.5a.75.75 0 011.1 0l3.25 3.5a.75.75 0 11-1.1 1.02L8 4.852 5.3 7.76z"/><path d="M5.3 12.76a.75.75 0 11-1.1-1.02l3.25-3.5a.75.75 0 011.1 0l3.25 3.5a.75.75 0 11-1.1 1.02L8 9.852 5.3 12.76z"/></g></symbol><symbol id="flight-circle-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 2.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19zM1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12z" clip-rule="evenodd"/></symbol><symbol id="flight-circle-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8z" clip-rule="evenodd"/></symbol><symbol id="flight-circle-dot-24" viewBox="0 0 24 24"><g><path d="M12 5a7 7 0 100 14 7 7 0 000-14z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></symbol><symbol id="flight-circle-dot-16" viewBox="0 0 16 16"><g><path d="M8 3a5 5 0 100 10A5 5 0 008 3z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></symbol><symbol id="flight-circle-fill-24" viewBox="0 0 24 24"><path d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1z"/></symbol><symbol id="flight-circle-fill-16" viewBox="0 0 16 16"><path d="M8 0a8 8 0 100 16A8 8 0 008 0z"/></symbol><symbol id="flight-circle-half-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm0 1.5v19a9.5 9.5 0 000-19z" clip-rule="evenodd"/></symbol><symbol id="flight-circle-half-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zm0 1.5v13a6.5 6.5 0 100-13z" clip-rule="evenodd"/></symbol><symbol id="flight-clipboard-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M8.75 1A1.75 1.75 0 007 2.75V3H5.75A2.75 2.75 0 003 5.75v14.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V5.75A2.75 2.75 0 0018.25 3H17v-.25A1.75 1.75 0 0015.25 1h-6.5zm8.232 3.5A1.75 1.75 0 0115.25 6h-6.5a1.75 1.75 0 01-1.732-1.5H5.75c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25h-1.268zM8.5 2.75a.25.25 0 01.25-.25h6.5a.25.25 0 01.25.25v1.5a.25.25 0 01-.25.25h-6.5a.25.25 0 01-.25-.25v-1.5z" clip-rule="evenodd"/></symbol><symbol id="flight-clipboard-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M11.975 1h.775A2.25 2.25 0 0115 3.25v10.5A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V3.25A2.25 2.25 0 013.25 1h.775c.116-.57.62-1 1.225-1h5.5c.605 0 1.11.43 1.225 1zM4 2.5h-.75a.75.75 0 00-.75.75v10.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V3.25a.75.75 0 00-.75-.75H12v.25C12 3.44 11.44 4 10.75 4h-5.5C4.56 4 4 3.44 4 2.75V2.5zm1.5 0v-1h5v1h-5z" clip-rule="evenodd"/></symbol><symbol id="flight-clipboard-checked-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M8.75 1A1.75 1.75 0 007 2.75V3H5.75A2.75 2.75 0 003 5.75v14.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V5.75A2.75 2.75 0 0018.25 3H17v-.25A1.75 1.75 0 0015.25 1h-6.5zM8.5 2.75a.25.25 0 01.25-.25h6.5a.25.25 0 01.25.25v1.5a.25.25 0 01-.25.25h-6.5a.25.25 0 01-.25-.25v-1.5zm8.28 7.47a.75.75 0 00-1.06 0l-5.47 5.47-1.97-1.97a.75.75 0 00-1.06 1.06l2.5 2.5a.75.75 0 001.06 0l6-6a.75.75 0 000-1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-clipboard-checked-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M11.975 1h.775A2.25 2.25 0 0115 3.25v10.5A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V3.25A2.25 2.25 0 013.25 1h.775c.116-.57.62-1 1.225-1h5.5c.605 0 1.11.43 1.225 1zM5.5 2.5v-1h5v1h-5zm6.28 3.72a.75.75 0 010 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97a.75.75 0 011.06 0z" clip-rule="evenodd"/></symbol><symbol id="flight-clipboard-copy-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M8.75 1A1.75 1.75 0 007 2.75V3H5.75A2.75 2.75 0 003 5.75v14.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25v-2.5a.75.75 0 00-1.5 0v2.5c0 .69-.56 1.25-1.25 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V5.75c0-.69.56-1.25 1.25-1.25h1.268c.121.848.85 1.5 1.732 1.5h6.5a1.75 1.75 0 001.732-1.5h1.268c.69 0 1.25.56 1.25 1.25v4.5a.75.75 0 001.5 0v-4.5A2.75 2.75 0 0018.25 3H17v-.25A1.75 1.75 0 0015.25 1h-6.5zM8.5 2.75a.25.25 0 01.25-.25h6.5a.25.25 0 01.25.25v1.5a.25.25 0 01-.25.25h-6.5a.25.25 0 01-.25-.25v-1.5z" clip-rule="evenodd"/><path d="M7 9.75A.75.75 0 017.75 9h4.5a.75.75 0 010 1.5h-4.5A.75.75 0 017 9.75zM7 17.75a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5h-4.5a.75.75 0 01-.75-.75zM7.75 13a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5zM22.75 14a.75.75 0 01-.75.75h-6.34l2.1 1.95a.75.75 0 11-1.02 1.1l-3.5-3.25a.747.747 0 01-.24-.533v-.034a.748.748 0 01.227-.521l.014-.013L16.74 10.2a.75.75 0 111.02 1.1l-2.1 1.95H22a.75.75 0 01.75.75z"/></g></symbol><symbol id="flight-clipboard-copy-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M3.25 2.5H4v.25C4 3.44 4.56 4 5.25 4h5.5C11.44 4 12 3.44 12 2.75V2.5h.75a.75.75 0 01.75.75v3a.75.75 0 001.5 0v-3A2.25 2.25 0 0012.75 1h-.775c-.116-.57-.62-1-1.225-1h-5.5c-.605 0-1.11.43-1.225 1H3.25A2.25 2.25 0 001 3.25v10.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75v-1a.75.75 0 00-1.5 0v1a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V3.25a.75.75 0 01.75-.75zm2.25-1v1h5v-1h-5z" clip-rule="evenodd"/><path d="M4.75 5.5a.75.75 0 000 1.5h3a.75.75 0 000-1.5h-3zM4 12.25a.75.75 0 01.75-.75h3a.75.75 0 010 1.5h-3a.75.75 0 01-.75-.75zM4.75 8.5a.75.75 0 000 1.5h2a.75.75 0 000-1.5h-2zM16 9.25a.75.75 0 01-.75.75h-4.19l1.22 1.22a.75.75 0 11-1.06 1.06l-2.5-2.5a.752.752 0 010-1.06l2.5-2.5a.75.75 0 111.06 1.06L11.06 8.5h4.19a.75.75 0 01.75.75z"/></g></symbol><symbol id="flight-clock-24" viewBox="0 0 24 24"><g><path d="M12.5 5.75a.75.75 0 00-1.5 0V12c0 .284.16.544.415.67l4.5 2.25a.75.75 0 10.67-1.34L12.5 11.536V5.75z"/><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-clock-16" viewBox="0 0 16 16"><g><path d="M8.5 3.75a.75.75 0 00-1.5 0V8c0 .284.16.544.415.67l2.5 1.25a.75.75 0 10.67-1.34L8.5 7.535V3.75z"/><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-clock-filled-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11.5-6.25a.75.75 0 00-1.5 0V12c0 .284.16.544.415.67l4.5 2.25a.75.75 0 10.67-1.34L12.5 11.536V5.75z" clip-rule="evenodd"/></symbol><symbol id="flight-clock-filled-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8.5-4.25a.75.75 0 00-1.5 0V8c0 .284.16.544.415.67l2.5 1.25a.75.75 0 10.67-1.34L8.5 7.535V3.75z" clip-rule="evenodd"/></symbol><symbol id="flight-cloud-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M5.836 3.558a8.864 8.864 0 014.895-.373 8.906 8.906 0 014.356 2.297 9.009 9.009 0 012.325 3.705h.726a5.84 5.84 0 014.147 1.733A5.929 5.929 0 0124 15.094a5.929 5.929 0 01-1.715 4.174A5.84 5.84 0 0118.138 21H8.929a8.878 8.878 0 01-4.721-1.361 8.976 8.976 0 01-3.295-3.675 9.062 9.062 0 01.953-9.47 8.934 8.934 0 013.97-2.936zm.509 1.41a7.434 7.434 0 00-3.289 2.439 7.562 7.562 0 00-.795 7.9 7.475 7.475 0 002.745 3.062 7.378 7.378 0 003.93 1.131h9.202a4.34 4.34 0 003.082-1.288 4.429 4.429 0 001.28-3.118c0-1.17-.461-2.292-1.28-3.118a4.34 4.34 0 00-3.082-1.289h-1.289a.75.75 0 01-.726-.563 7.515 7.515 0 00-2.074-3.56 7.407 7.407 0 00-3.623-1.91 7.364 7.364 0 00-4.081.314z" clip-rule="evenodd"/></symbol><symbol id="flight-cloud-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3.932 2.373a6.041 6.041 0 016.239 1.28 5.998 5.998 0 011.505 2.284h.28c1.071 0 2.1.424 2.858 1.18a4.025 4.025 0 010 5.703A4.051 4.051 0 0111.955 14H6.026a6.037 6.037 0 01-3.186-.906 6.008 6.008 0 01-2.223-2.448 5.982 5.982 0 01.644-6.32 6.02 6.02 0 012.67-1.953zm.526 1.405a4.52 4.52 0 00-2.013 1.47 4.488 4.488 0 001.186 6.572c.716.444 1.542.68 2.386.68h5.938c.676 0 1.324-.268 1.8-.742a2.524 2.524 0 000-3.578 2.551 2.551 0 00-1.8-.743h-.83a.75.75 0 01-.726-.561A4.496 4.496 0 009.14 4.74a4.541 4.541 0 00-4.681-.963z" clip-rule="evenodd"/></symbol><symbol id="flight-closed-caption-24" viewBox="0 0 24 24"><g><path d="M8.75 9.75a2.25 2.25 0 101.488 3.938.75.75 0 11.993 1.124 3.75 3.75 0 110-5.625.75.75 0 01-.993 1.125A2.239 2.239 0 008.75 9.75zM14 12a2.25 2.25 0 013.738-1.688.75.75 0 10.993-1.124 3.75 3.75 0 100 5.625.75.75 0 00-.993-1.125A2.25 2.25 0 0114 12z"/><path fill-rule="evenodd" d="M.5 5.75A2.75 2.75 0 013.25 3h17.5a2.75 2.75 0 012.75 2.75v12.5A2.75 2.75 0 0120.75 21H3.25A2.75 2.75 0 01.5 18.25V5.75zM3.25 4.5C2.56 4.5 2 5.06 2 5.75v12.5c0 .69.56 1.25 1.25 1.25h17.5c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25H3.25z" clip-rule="evenodd"/></g></symbol><symbol id="flight-closed-caption-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h11.5A2.25 2.25 0 0116 3.25v9a2.25 2.25 0 01-2.25 2.25H2.25A2.25 2.25 0 010 12.25v-9zm2.25-.75a.75.75 0 00-.75.75v9c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75v-9a.75.75 0 00-.75-.75H2.25zm3.5 4a1.25 1.25 0 10.836 2.179.75.75 0 011.005 1.114 2.75 2.75 0 110-4.086.75.75 0 01-1.005 1.114A1.243 1.243 0 005.75 6.5zM10 7.75a1.25 1.25 0 012.086-.929.75.75 0 101.005-1.114 2.75 2.75 0 100 4.086.75.75 0 00-1.005-1.114A1.25 1.25 0 0110 7.75z" clip-rule="evenodd"/></symbol><symbol id="flight-cloud-check-24" viewBox="0 0 24 24"><g><path d="M8.026 1.046a8.87 8.87 0 014.152.57 8.932 8.932 0 013.436 2.412 9.017 9.017 0 011.802 3.16h.726a5.84 5.84 0 013.698 1.326 5.914 5.914 0 012.037 3.374 5.945 5.945 0 01-.528 3.91 5.882 5.882 0 01-2.858 2.705.75.75 0 01-.606-1.372 4.381 4.381 0 002.129-2.016c.46-.9.599-1.932.394-2.923a4.413 4.413 0 00-1.52-2.518 4.338 4.338 0 00-2.746-.987h-1.288a.75.75 0 01-.727-.564 7.521 7.521 0 00-1.639-3.104 7.431 7.431 0 00-2.859-2.008 7.37 7.37 0 00-6.734.692 7.472 7.472 0 00-2.4 2.549 7.55 7.55 0 00-.338 6.832 7.49 7.49 0 002.138 2.777.75.75 0 01-.941 1.168 8.99 8.99 0 01-2.566-3.333 9.06 9.06 0 01.404-8.189 8.971 8.971 0 012.883-3.06 8.888 8.888 0 013.951-1.4z"/><path d="M17.78 14.22a.75.75 0 010 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97a.75.75 0 011.06 0z"/></g></symbol><symbol id="flight-cloud-check-16" viewBox="0 0 16 16"><g><path d="M3.932 1.373a6.041 6.041 0 016.239 1.28 5.998 5.998 0 011.505 2.284h.28c1.071 0 2.1.424 2.858 1.18a4.025 4.025 0 01-.665 6.239.75.75 0 01-.812-1.262 2.524 2.524 0 00.418-3.914 2.551 2.551 0 00-1.8-.742h-.83a.75.75 0 01-.726-.562A4.496 4.496 0 009.14 3.74a4.541 4.541 0 00-4.688-.96 4.52 4.52 0 00-2.006 1.466 4.488 4.488 0 00.386 5.942.75.75 0 01-1.055 1.066 5.982 5.982 0 01-.515-7.928 6.02 6.02 0 012.67-1.954z"/><path d="M11.78 9.22a.75.75 0 010 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 111.06-1.06l1.47 1.47 3.97-3.97a.75.75 0 011.06 0z"/></g></symbol><symbol id="flight-cloud-download-24" viewBox="0 0 24 24"><g><path d="M12.178 1.615a8.87 8.87 0 00-8.103.832 8.971 8.971 0 00-2.883 3.06 9.05 9.05 0 00-.404 8.189 8.99 8.99 0 002.566 3.333.75.75 0 10.94-1.168 7.49 7.49 0 01-2.137-2.777 7.56 7.56 0 01.338-6.832 7.472 7.472 0 012.4-2.549 7.37 7.37 0 016.734-.692 7.431 7.431 0 012.859 2.008 7.521 7.521 0 011.64 3.104.75.75 0 00.726.564h1.288c1 .001 1.97.35 2.746.987a4.413 4.413 0 011.52 2.518 4.444 4.444 0 01-.394 2.923c-.46.9-1.212 1.61-2.13 2.016a.75.75 0 00.607 1.372 5.882 5.882 0 002.858-2.705 5.945 5.945 0 00.527-3.91 5.914 5.914 0 00-2.036-3.374 5.84 5.84 0 00-3.698-1.327h-.726a9.017 9.017 0 00-1.802-3.159 8.932 8.932 0 00-3.436-2.413z"/><path d="M12 22h.012a.747.747 0 00.533-.235l4.25-4.5a.75.75 0 00-1.09-1.03l-2.955 3.129V12.75a.75.75 0 00-1.5 0v6.614l-2.955-3.129a.75.75 0 00-1.09 1.03l4.248 4.498a.748.748 0 00.535.237H12z"/></g></symbol><symbol id="flight-cloud-download-16" viewBox="0 0 16 16"><g><path d="M7.235 1.123a6.041 6.041 0 00-3.303.25A6.02 6.02 0 001.26 3.326a5.988 5.988 0 00.515 7.929.75.75 0 001.055-1.066 4.482 4.482 0 01-.386-5.942A4.52 4.52 0 014.451 2.78a4.541 4.541 0 014.688.961 4.496 4.496 0 011.26 2.135.75.75 0 00.726.561h.83c.676 0 1.324.268 1.8.743a2.524 2.524 0 01-.418 3.914.75.75 0 00.812 1.262 4.024 4.024 0 00.665-6.239 4.051 4.051 0 00-2.859-1.18h-.28a5.998 5.998 0 00-1.504-2.285 6.028 6.028 0 00-2.936-1.529z"/><path d="M8 7.25a.75.75 0 01.75.75v4.44l1.47-1.47a.75.75 0 111.06 1.06l-2.75 2.75a.75.75 0 01-1.06 0l-2.75-2.75a.75.75 0 111.06-1.06l1.47 1.47V8A.75.75 0 018 7.25z"/></g></symbol><symbol id="flight-cloud-lightning-24" viewBox="0 0 24 24"><g><path d="M11.819 1.485a8.86 8.86 0 00-4.357-.363 8.892 8.892 0 00-4.004 1.765A8.99 8.99 0 00.766 6.353a9.065 9.065 0 00.649 8.509 8.958 8.958 0 003.187 3.01.75.75 0 00.731-1.309 7.457 7.457 0 01-2.653-2.507 7.565 7.565 0 01-.54-7.1A7.49 7.49 0 014.381 4.07 7.392 7.392 0 017.711 2.6a7.36 7.36 0 013.618.302 7.421 7.421 0 013.046 1.999 7.522 7.522 0 011.744 3.22.75.75 0 00.727.565c1.732 0 3.082.103 4.213 1.134a4.44 4.44 0 01.589 5.888 4.356 4.356 0 01-2.643 1.702.75.75 0 00.302 1.47 5.857 5.857 0 003.553-2.288 5.94 5.94 0 00-.79-7.88c-1.427-1.3-3.094-1.495-4.66-1.522a9.017 9.017 0 00-1.93-3.304 8.92 8.92 0 00-3.662-2.402z"/><path d="M14.031 11.03a.75.75 0 10-1.062-1.06l-4.75 4.77a.75.75 0 00.31 1.246l5.372 1.653-3.956 4.357a.75.75 0 001.11 1.008l4.75-5.23a.75.75 0 00-.334-1.222l-5.313-1.634 3.873-3.889z"/></g></symbol><symbol id="flight-cloud-lightning-16" viewBox="0 0 16 16"><g><path d="M7.235 1.123a6.041 6.041 0 00-3.303.25A6.02 6.02 0 001.26 3.326a5.988 5.988 0 00.515 7.929.75.75 0 001.055-1.066 4.482 4.482 0 01-.386-5.942A4.52 4.52 0 014.451 2.78a4.541 4.541 0 014.688.961 4.496 4.496 0 011.26 2.135.75.75 0 00.726.561h.83c.676 0 1.324.268 1.8.743a2.524 2.524 0 01-.418 3.914.75.75 0 00.812 1.262 4.024 4.024 0 00.665-6.239 4.051 4.051 0 00-2.859-1.18h-.28a5.998 5.998 0 00-1.504-2.285 6.028 6.028 0 00-2.936-1.529z"/><path d="M9.053 7.257a.75.75 0 00-1.106-1.014l-2.75 3a.75.75 0 00.316 1.218l3.403 1.135-1.969 2.147a.75.75 0 001.106 1.014l2.75-3a.75.75 0 00-.316-1.218L7.084 9.404l1.969-2.147z"/></g></symbol><symbol id="flight-cloud-lock-24" viewBox="0 0 24 24"><g><path d="M12.178 1.615a8.87 8.87 0 00-8.103.832 8.971 8.971 0 00-2.883 3.06 9.05 9.05 0 00-.404 8.189c.386.863 1.302 2.042 1.848 2.665a.75.75 0 101.129-.987c-.533-.609-1.32-1.645-1.608-2.29a7.56 7.56 0 01.338-6.832 7.472 7.472 0 012.4-2.549 7.37 7.37 0 016.734-.692 7.431 7.431 0 012.859 2.008 7.521 7.521 0 011.64 3.104.75.75 0 00.726.564h1.288c1 .001 1.97.35 2.746.987a4.413 4.413 0 011.52 2.518 4.444 4.444 0 01-.394 2.923 4.394 4.394 0 01-1.37 1.585.75.75 0 00.867 1.224 5.895 5.895 0 001.838-2.126 5.945 5.945 0 00.527-3.91 5.914 5.914 0 00-2.036-3.374 5.84 5.84 0 00-3.698-1.327h-.726a9.017 9.017 0 00-1.802-3.159 8.932 8.932 0 00-3.436-2.413zM12.75 18.75a.75.75 0 00-1.5 0v.5a.75.75 0 001.5 0v-.5z"/><path fill-rule="evenodd" d="M8 14.014v-.93c0-1.078.417-2.114 1.165-2.881A3.96 3.96 0 0112 9a3.96 3.96 0 012.835 1.203A4.127 4.127 0 0116 13.083v.93a2.25 2.25 0 012 2.237v4.5A2.25 2.25 0 0115.75 23h-7.5A2.25 2.25 0 016 20.75v-4.5a2.25 2.25 0 012-2.236zM9.5 14v-.917c0-.69.268-1.35.739-1.833A2.46 2.46 0 0112 10.5c.657 0 1.29.267 1.761.75.471.483.739 1.142.739 1.833V14h-5zm6.25 1.5a.75.75 0 01.75.75v4.5a.75.75 0 01-.75.75h-7.5a.75.75 0 01-.75-.75v-4.5a.75.75 0 01.75-.75h7.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-cloud-lock-16" viewBox="0 0 16 16"><g><path d="M7.235 1.123a6.041 6.041 0 00-3.303.25A6.02 6.02 0 001.26 3.326a5.988 5.988 0 00-.404 6.76.75.75 0 101.286-.774 4.49 4.49 0 01-.62-2.766 4.488 4.488 0 01.922-2.3A4.52 4.52 0 014.451 2.78a4.541 4.541 0 014.688.961 4.496 4.496 0 011.26 2.135.75.75 0 00.726.561h.83c.676 0 1.324.268 1.8.743a2.524 2.524 0 01.451 2.969.75.75 0 101.326.702 4.02 4.02 0 00-.718-4.734 4.051 4.051 0 00-2.859-1.18h-.28a5.998 5.998 0 00-1.504-2.285 6.028 6.028 0 00-2.936-1.529zM8.75 12.25a.75.75 0 00-1.5 0v.5a.75.75 0 001.5 0v-.5z"/><path fill-rule="evenodd" d="M5.518 9.012c.035-.627.13-1.235.366-1.738.174-.37.435-.704.816-.94C7.08 6.101 7.52 6 8 6c.48 0 .921.1 1.3.334.381.236.642.57.816.94.236.503.331 1.111.366 1.738A2.25 2.25 0 0112.5 11.25v2.5A2.25 2.25 0 0110.25 16h-4.5a2.25 2.25 0 01-2.25-2.25v-2.5a2.25 2.25 0 012.018-2.238zM7.022 9c.032-.481.102-.838.22-1.087a.662.662 0 01.245-.302c.09-.055.243-.111.513-.111s.423.056.513.111c.087.054.17.141.246.302.117.249.187.606.219 1.087H7.022zm3.228 1.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75h-4.5a.75.75 0 01-.75-.75v-2.5a.75.75 0 01.75-.75h4.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-cloud-off-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M2.28 1.22a.75.75 0 00-1.06 1.06l2.447 2.448a8.96 8.96 0 00-1.801 1.766 9.041 9.041 0 00-1.82 4.598v.003a9.064 9.064 0 00.867 4.87 8.975 8.975 0 003.294 3.674A8.873 8.873 0 008.934 21h9.2c.54 0 1.073-.075 1.585-.22l2 2a.75.75 0 101.061-1.06L2.28 1.22zm16.15 18.27L4.742 5.804c-.639.44-1.209.98-1.687 1.603a7.541 7.541 0 00-1.518 3.832v.003a7.564 7.564 0 00.723 4.066 7.475 7.475 0 002.744 3.06A7.374 7.374 0 008.923 19.5H18.133c.1 0 .198-.003.296-.01z" clip-rule="evenodd"/><path d="M9.702 3.003a.75.75 0 10-.133 1.494 7.394 7.394 0 014.16 1.757 7.51 7.51 0 012.387 3.867.75.75 0 00.727.566h.061c1.304 0 2.327 0 3.292.522.635.343 1.176.84 1.575 1.447a4.436 4.436 0 01.383 4.158.75.75 0 101.383.581 5.946 5.946 0 00-.512-5.563 5.879 5.879 0 00-2.116-1.943c-1.17-.632-2.393-.696-3.5-.701a9.005 9.005 0 00-2.704-4.072 8.894 8.894 0 00-5.003-2.113z"/></g></symbol><symbol id="flight-cloud-off-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M1.22 1.22a.75.75 0 011.06 0l12.5 12.5a.75.75 0 11-1.06 1.06l-1.11-1.11c-.258.053-.523.08-.791.08H6.094a5.907 5.907 0 01-3.085-.865A5.783 5.783 0 01.85 10.539a5.674 5.674 0 01-.57-3.117v-.004a5.701 5.701 0 011.196-2.943c.284-.361.61-.686.97-.968L1.22 2.28a.75.75 0 010-1.06zm2.297 3.357a4.299 4.299 0 00-.863.827 4.201 4.201 0 00-.882 2.165v.003a4.174 4.174 0 00.42 2.296c.356.713.91 1.315 1.6 1.737a4.407 4.407 0 002.298.645h5.099L3.517 4.577z" clip-rule="evenodd"/><path d="M6.38 2.954a.75.75 0 01.884-.586A5.87 5.87 0 0110.11 3.83 5.743 5.743 0 0111.564 6h.255a3.96 3.96 0 012.775 1.13 3.848 3.848 0 011.156 2.745c0 .409-.066.81-.19 1.193a.75.75 0 11-1.426-.468c.076-.232.116-.477.116-.725 0-.626-.253-1.228-.707-1.675a2.46 2.46 0 00-1.724-.7h-.802a.75.75 0 01-.725-.56 4.233 4.233 0 00-1.206-2.014 4.37 4.37 0 00-2.119-1.088.75.75 0 01-.587-.884z"/></g></symbol><symbol id="flight-cloud-upload-24" viewBox="0 0 24 24"><g><path d="M12.178 1.615a8.87 8.87 0 00-8.103.832 8.971 8.971 0 00-2.883 3.06 9.05 9.05 0 00-.404 8.189 8.99 8.99 0 002.566 3.333.75.75 0 10.94-1.168 7.49 7.49 0 01-2.137-2.777 7.56 7.56 0 01.338-6.832 7.472 7.472 0 012.4-2.549 7.37 7.37 0 016.734-.692 7.431 7.431 0 012.859 2.008 7.521 7.521 0 011.64 3.104.75.75 0 00.726.564h1.288c1 .001 1.97.35 2.746.987a4.413 4.413 0 011.52 2.518 4.444 4.444 0 01-.394 2.923c-.46.9-1.212 1.61-2.13 2.016a.75.75 0 00.607 1.372 5.882 5.882 0 002.858-2.705 5.945 5.945 0 00.527-3.91 5.914 5.914 0 00-2.036-3.374 5.84 5.84 0 00-3.698-1.327h-.726a9.017 9.017 0 00-1.802-3.159 8.932 8.932 0 00-3.436-2.413z"/><path d="M7.235 17.795a.75.75 0 001.06-.03l2.955-3.129v6.614a.75.75 0 001.5 0v-6.614l2.955 3.129a.75.75 0 001.09-1.03l-4.25-4.5a.75.75 0 00-.533-.235h-.024a.748.748 0 00-.535.237l-4.248 4.498a.75.75 0 00.03 1.06z"/></g></symbol><symbol id="flight-cloud-upload-16" viewBox="0 0 16 16"><g><path d="M7.235 1.123a6.041 6.041 0 00-3.303.25A6.02 6.02 0 001.26 3.326a5.988 5.988 0 00.515 7.929.75.75 0 001.055-1.066 4.482 4.482 0 01-.386-5.942A4.52 4.52 0 014.451 2.78a4.541 4.541 0 014.688.961 4.496 4.496 0 011.26 2.135.75.75 0 00.726.561h.83c.676 0 1.324.268 1.8.743a2.524 2.524 0 01-.418 3.914.75.75 0 00.812 1.262 4.024 4.024 0 00.665-6.239 4.051 4.051 0 00-2.859-1.18h-.28a5.998 5.998 0 00-1.504-2.285 6.028 6.028 0 00-2.936-1.529z"/><path d="M4.72 11.28a.75.75 0 001.06 0l1.47-1.47v4.44a.75.75 0 001.5 0V9.81l1.47 1.47a.75.75 0 101.06-1.06L8.53 7.47l-.01-.01a.747.747 0 00-1.05.01l-2.75 2.75a.75.75 0 000 1.06z"/></g></symbol><symbol id="flight-cloud-x-24" viewBox="0 0 24 24"><g><path d="M8.026 1.046a8.87 8.87 0 014.152.57 8.932 8.932 0 013.436 2.412 9.017 9.017 0 011.802 3.16h.726a5.84 5.84 0 013.698 1.326 5.914 5.914 0 012.037 3.374 5.945 5.945 0 01-.528 3.91 5.882 5.882 0 01-2.858 2.705.75.75 0 01-.606-1.372 4.381 4.381 0 002.129-2.016c.46-.9.599-1.932.394-2.923a4.413 4.413 0 00-1.52-2.518 4.338 4.338 0 00-2.746-.987h-1.288a.75.75 0 01-.727-.564 7.521 7.521 0 00-1.639-3.104 7.431 7.431 0 00-2.859-2.008 7.37 7.37 0 00-6.734.692 7.472 7.472 0 00-2.4 2.549 7.55 7.55 0 00-.338 6.832 7.49 7.49 0 002.138 2.777.75.75 0 01-.941 1.168 8.99 8.99 0 01-2.566-3.333 9.06 9.06 0 01.404-8.189 8.971 8.971 0 012.883-3.06 8.888 8.888 0 013.951-1.4z"/><path d="M8.22 14.22a.75.75 0 011.06 0L12 16.94l2.72-2.72a.75.75 0 111.06 1.06L13.06 18l2.72 2.72a.75.75 0 11-1.06 1.06L12 19.06l-2.72 2.72a.75.75 0 01-1.06-1.06L10.94 18l-2.72-2.72a.75.75 0 010-1.06z"/></g></symbol><symbol id="flight-cloud-x-16" viewBox="0 0 16 16"><g><path d="M3.932 1.373a6.041 6.041 0 016.239 1.28 5.998 5.998 0 011.505 2.284h.28c1.071 0 2.1.424 2.858 1.18a4.025 4.025 0 01-.665 6.239.75.75 0 01-.812-1.262 2.524 2.524 0 00.418-3.914 2.551 2.551 0 00-1.8-.742h-.83a.75.75 0 01-.726-.562A4.496 4.496 0 009.14 3.74a4.541 4.541 0 00-4.688-.96 4.52 4.52 0 00-2.006 1.466 4.488 4.488 0 00.386 5.942.75.75 0 01-1.055 1.066 5.982 5.982 0 01-.515-7.928 6.02 6.02 0 012.67-1.954z"/><path d="M10.78 9.22a.75.75 0 010 1.06L9.06 12l1.72 1.72a.75.75 0 11-1.06 1.06L8 13.06l-1.72 1.72a.75.75 0 01-1.06-1.06L6.94 12l-1.72-1.72a.75.75 0 111.06-1.06L8 10.94l1.72-1.72a.75.75 0 011.06 0z"/></g></symbol><symbol id="flight-code-24" viewBox="0 0 24 24"><g><path d="M14.447 3.026a.75.75 0 00-.92.527l-4.5 16.5a.75.75 0 001.447.394l4.5-16.5a.75.75 0 00-.527-.92zM16.207 6.232a.75.75 0 011.06-.025l5.5 5.25a.75.75 0 010 1.085l-5.5 5.25a.75.75 0 01-1.035-1.085L21.164 12l-4.932-4.707a.75.75 0 01-.024-1.06zM7.768 7.293a.75.75 0 00-1.036-1.086l-5.5 5.25a.75.75 0 000 1.085l5.5 5.25a.75.75 0 101.036-1.085L2.836 12l4.932-4.707z"/></g></symbol><symbol id="flight-code-16" viewBox="0 0 16 16"><g><path d="M9.424 2.02a.75.75 0 00-.904.556l-2.5 10.5a.75.75 0 001.46.348l2.5-10.5a.75.75 0 00-.556-.904zM11.2 4.24a.75.75 0 011.06-.04l3.5 3.25a.75.75 0 010 1.1l-3.5 3.25a.75.75 0 11-1.02-1.1L14.148 8 11.24 5.3a.75.75 0 01-.04-1.06zM4.76 5.3a.75.75 0 00-1.02-1.1L.24 7.45a.75.75 0 000 1.1l3.5 3.25a.75.75 0 101.02-1.1L1.852 8 4.76 5.3z"/></g></symbol><symbol id="flight-collections-24" viewBox="0 0 24 24"><g><path d="M5 6.75A.75.75 0 015.75 6h6.5a.75.75 0 010 1.5h-6.5A.75.75 0 015 6.75zM5.75 9a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5z"/><path fill-rule="evenodd" d="M1 4.75A2.75 2.75 0 013.75 2h10.5c.854 0 1.617.39 2.121 1h.879c.854 0 1.617.39 2.121 1h.879A2.75 2.75 0 0123 6.75v10.5A2.75 2.75 0 0120.25 20h-.879c-.504.61-1.267 1-2.121 1h-.879c-.504.61-1.267 1-2.121 1H3.75A2.75 2.75 0 011 19.25V4.75zM19.989 18.5h.261c.69 0 1.25-.56 1.25-1.25V6.75c0-.69-.56-1.25-1.25-1.25h-.261c.007.082.011.166.011.25v12.5c0 .084-.004.168-.011.25zM17 4.75c0-.084-.004-.168-.011-.25h.261c.69 0 1.25.56 1.25 1.25v12.5c0 .69-.56 1.25-1.25 1.25h-.261c.007-.082.011-.166.011-.25V4.75zM3.75 3.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H3.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-collections-16" viewBox="0 0 16 16"><g><path d="M3.05 4.75a.7.7 0 01.7-.7h3.5a.7.7 0 110 1.4h-3.5a.7.7 0 01-.7-.7zM3.75 7.05a.7.7 0 100 1.4h2.5a.7.7 0 100-1.4h-2.5z"/><path fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h6.5c.883 0 1.648.51 2.016 1.25h.984c.698 0 1.3.409 1.582 1h.918c.966 0 1.75.784 1.75 1.75v6a1.75 1.75 0 01-1.75 1.75h-.918c-.281.591-.884 1-1.582 1h-.984A2.25 2.25 0 018.75 15h-6.5A2.25 2.25 0 010 12.75v-9.5zm13.5 8h.75a.25.25 0 00.25-.25V5a.25.25 0 00-.25-.25h-.75v6.5zm-2.5 1v-8.5h.75A.25.25 0 0112 4v8a.25.25 0 01-.25.25H11zM2.25 2.5a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h6.5a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75h-6.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-command-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M9.5 5.75V8h5V5.75a3.75 3.75 0 113.75 3.75H16v5h2.25a3.75 3.75 0 11-3.75 3.75V16h-5v2.25a3.75 3.75 0 11-3.75-3.75H8v-5H5.75A3.75 3.75 0 119.5 5.75zM5.75 3.5a2.25 2.25 0 000 4.5H8V5.75A2.25 2.25 0 005.75 3.5zM16 16v2.25A2.25 2.25 0 1018.25 16H16zm-1.5-1.5v-5h-5v5h5zM5.75 16H8v2.25A2.25 2.25 0 115.75 16zM16 8h2.25A2.25 2.25 0 1016 5.75V8z" clip-rule="evenodd"/></symbol><symbol id="flight-command-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M6.5 3.75V5h3V3.75a2.75 2.75 0 112.75 2.75H11v3h1.25a2.75 2.75 0 11-2.75 2.75V11h-3v1.25A2.75 2.75 0 113.75 9.5H5v-3H3.75A2.75 2.75 0 116.5 3.75zM3.75 2.5a1.25 1.25 0 100 2.5H5V3.75c0-.69-.56-1.25-1.25-1.25zM11 11v1.25A1.25 1.25 0 1012.25 11H11zM9.5 9.5v-3h-3v3h3zM3.75 11H5v1.25A1.25 1.25 0 113.75 11zM11 5h1.25A1.25 1.25 0 1011 3.75V5z" clip-rule="evenodd"/></symbol><symbol id="flight-compass-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M16.951 7.997a.75.75 0 00-.948-.948l-6.36 2.12a.75.75 0 00-.474.474l-2.12 6.36a.75.75 0 00.948.948l6.36-2.12a.75.75 0 00.475-.474l2.12-6.36zm-8.005 7.057l1.527-4.581 4.581-1.527-1.527 4.581-4.581 1.527z"/><path d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z"/></g></symbol><symbol id="flight-compass-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M11.914 4.971a.7.7 0 00-.885-.885L6.154 5.71a.7.7 0 00-.443.443l-1.625 4.875a.7.7 0 00.885.885l4.875-1.625a.7.7 0 00.443-.443l1.625-4.875zm-6.057 5.172l1.071-3.215 3.215-1.071-1.071 3.215-3.215 1.071z"/><path d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z"/></g></symbol><symbol id="flight-connection-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M1 11.75A3.5 3.5 0 017.92 11h8.16a3.501 3.501 0 016.92.75 3.5 3.5 0 01-6.92.75H7.92A3.501 3.501 0 011 11.75zm3.5-2a2 2 0 100 4 2 2 0 000-4zm15 0a2 2 0 100 4 2 2 0 000-4z" clip-rule="evenodd"/></symbol><symbol id="flight-connection-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M0 7.75A3 3 0 015.905 7h4.19a3.001 3.001 0 110 1.5h-4.19A3.001 3.001 0 010 7.75zm3-1.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zm10 0a1.5 1.5 0 100 3 1.5 1.5 0 000-3z" clip-rule="evenodd"/></symbol><symbol id="flight-connection-gateway-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M20.5 1.75a3 3 0 00-2.665 4.378l-2.441 2.184A2.24 2.24 0 0014.25 8h-3A2.25 2.25 0 009 10.25V11H6.405a3.001 3.001 0 00-5.905.75 3 3 0 005.905.75H9v.75a2.25 2.25 0 002.25 2.25h3a2.24 2.24 0 001.144-.312l2.44 2.184a3 3 0 101-1.118l-2.476-2.216c.092-.245.142-.51.142-.788v-3c0-.277-.05-.543-.142-.788l2.477-2.216A3 3 0 1020.5 1.75zm-1.5 3a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0zM11.25 9.5a.75.75 0 00-.75.75v3c0 .414.336.75.75.75h3a.75.75 0 00.75-.75v-3a.75.75 0 00-.75-.75h-3zm9.25 7.75a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM2 11.75a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/></symbol><symbol id="flight-connection-gateway-16" viewBox="0 0 16 16"><path fill="#000" fill-rule="evenodd" d="M13.75.5a2.25 2.25 0 00-1.847 3.536l-.933.934a.752.752 0 00-.11.14c-.19-.071-.396-.11-.61-.11h-2.5A1.75 1.75 0 006 6.75v.5H4.372a2.25 2.25 0 100 1.5H6v.5c0 .966.784 1.75 1.75 1.75h2.5c.214 0 .42-.039.61-.11.03.05.067.097.11.14l.933.934a2.25 2.25 0 101.24-.881L12.03 9.97a.75.75 0 00-.14-.11c.071-.19.11-.396.11-.61v-2.5c0-.214-.039-.42-.11-.61a.75.75 0 00.14-.11l1.113-1.113A2.252 2.252 0 0016 2.75 2.25 2.25 0 0013.75.5zM13 2.75a.75.75 0 111.5 0 .75.75 0 01-1.5 0zM7.75 6.5a.25.25 0 00-.25.25v2.5c0 .138.112.25.25.25h2.5a.25.25 0 00.25-.25v-2.5a.25.25 0 00-.25-.25h-2.5zm6 6a.75.75 0 100 1.5.75.75 0 000-1.5zM1.5 8A.75.75 0 113 8a.75.75 0 01-1.5 0z" clip-rule="evenodd"/></symbol><symbol id="flight-corner-down-left-24" viewBox="0 0 24 24"><path d="M21.5 3.75a.75.75 0 00-1.5 0v7c0 .847-.357 1.669-1.009 2.282A3.639 3.639 0 0116.5 14H5.622l4.146-3.957a.75.75 0 10-1.036-1.086l-5.498 5.25a.748.748 0 00-.002 1.085l5.5 5.25a.75.75 0 101.036-1.085L5.622 15.5H16.5c1.312 0 2.578-.49 3.52-1.375a4.634 4.634 0 001.48-3.375v-7z"/></symbol><symbol id="flight-corner-down-left-16" viewBox="0 0 16 16"><path d="M13.5 2.75a.75.75 0 00-1.5 0v4.5A1.75 1.75 0 0110.25 9H4.56l2.22-2.22a.75.75 0 00-1.06-1.06l-3.5 3.5a.748.748 0 000 1.06l3.5 3.5a.75.75 0 001.06-1.06L4.56 10.5h5.69a3.25 3.25 0 003.25-3.25v-4.5z"/></symbol><symbol id="flight-corner-down-right-24" viewBox="0 0 24 24"><path d="M2.5 3.75a.75.75 0 011.5 0v7c0 .847.357 1.669 1.009 2.282A3.639 3.639 0 007.5 14h10.878l-4.146-3.957a.75.75 0 011.036-1.086l5.498 5.25a.748.748 0 01.002 1.085l-5.5 5.25a.75.75 0 01-1.036-1.085l4.146-3.957H7.5a5.139 5.139 0 01-3.52-1.375A4.634 4.634 0 012.5 10.75v-7z"/></symbol><symbol id="flight-corner-down-right-16" viewBox="0 0 16 16"><path d="M2.5 2.75a.75.75 0 011.5 0v4.5A1.75 1.75 0 005.75 9h5.69L9.22 6.78a.75.75 0 011.06-1.06l3.5 3.5a.75.75 0 010 1.06l-3.5 3.5a.75.75 0 11-1.06-1.06l2.22-2.22H5.75A3.25 3.25 0 012.5 7.25v-4.5z"/></symbol><symbol id="flight-corner-left-down-24" viewBox="0 0 24 24"><path d="M20.25 2.5a.75.75 0 010 1.5h-7c-.847 0-1.669.357-2.282 1.009A3.639 3.639 0 0010 7.5v10.878l3.957-4.146a.75.75 0 011.085 1.036l-5.25 5.5a.75.75 0 01-1.085 0l-5.25-5.5a.75.75 0 011.086-1.036L8.5 18.378V7.5c0-1.312.49-2.579 1.375-3.52A4.634 4.634 0 0113.25 2.5h7z"/></symbol><symbol id="flight-corner-left-down-16" viewBox="0 0 16 16"><path d="M13.25 2.5a.75.75 0 010 1.5h-4.5A1.75 1.75 0 007 5.75v5.69l2.22-2.22a.75.75 0 111.06 1.06l-3.5 3.5a.75.75 0 01-1.06 0l-3.5-3.5a.75.75 0 111.06-1.06l2.22 2.22V5.75A3.25 3.25 0 018.75 2.5h4.5z"/></symbol><symbol id="flight-corner-left-up-24" viewBox="0 0 24 24"><path d="M13.957 9.768a.75.75 0 001.085-1.036l-5.25-5.5a.75.75 0 00-1.085 0l-5.25 5.5a.75.75 0 001.086 1.036L8.5 5.622V16.5c0 1.312.49 2.578 1.375 3.52.887.942 2.1 1.48 3.375 1.48h7a.75.75 0 000-1.5h-7a3.135 3.135 0 01-2.282-1.009A3.639 3.639 0 0110 16.5V5.622l3.957 4.146z"/></symbol><symbol id="flight-corner-left-up-16" viewBox="0 0 16 16"><path d="M9.22 6.78a.75.75 0 101.06-1.06l-3.5-3.5a.75.75 0 00-1.06 0l-3.5 3.5a.75.75 0 001.06 1.06L5.5 4.56v5.69a3.25 3.25 0 003.25 3.25h4.5a.75.75 0 000-1.5h-4.5A1.75 1.75 0 017 10.25V4.56l2.22 2.22z"/></symbol><symbol id="flight-corner-right-down-24" viewBox="0 0 24 24"><path d="M3.75 2.5a.75.75 0 000 1.5h7c.847 0 1.669.357 2.282 1.009.615.653.968 1.549.968 2.491v10.878l-3.957-4.146a.75.75 0 00-1.086 1.036l5.25 5.5a.75.75 0 001.085 0l5.25-5.5a.75.75 0 00-1.085-1.036L15.5 18.378V7.5c0-1.312-.49-2.579-1.375-3.52A4.634 4.634 0 0010.75 2.5h-7z"/></symbol><symbol id="flight-corner-right-down-16" viewBox="0 0 16 16"><path d="M2.75 2.5a.75.75 0 000 1.5h4.5A1.75 1.75 0 019 5.75v5.69L6.78 9.22a.75.75 0 00-1.06 1.06l3.5 3.5a.75.75 0 001.06 0l3.5-3.5a.75.75 0 10-1.06-1.06l-2.22 2.22V5.75A3.25 3.25 0 007.25 2.5h-4.5z"/></symbol><symbol id="flight-corner-right-up-24" viewBox="0 0 24 24"><path d="M10.043 9.768a.75.75 0 11-1.086-1.036l5.25-5.5a.75.75 0 011.085 0l5.25 5.5a.75.75 0 11-1.085 1.036L15.5 5.622V16.5c0 1.312-.49 2.578-1.375 3.52a4.634 4.634 0 01-3.375 1.48h-7a.75.75 0 010-1.5h7c.847 0 1.669-.357 2.282-1.009A3.639 3.639 0 0014 16.5V5.622l-3.957 4.146z"/></symbol><symbol id="flight-corner-right-up-16" viewBox="0 0 16 16"><path d="M6.78 6.78a.75.75 0 01-1.06-1.06l3.5-3.5a.75.75 0 011.06 0l3.5 3.5a.75.75 0 01-1.06 1.06L10.5 4.56v5.69a3.25 3.25 0 01-3.25 3.25h-4.5a.75.75 0 010-1.5h4.5A1.75 1.75 0 009 10.25V4.56L6.78 6.78z"/></symbol><symbol id="flight-corner-up-left-24" viewBox="0 0 24 24"><path d="M9.768 13.957a.75.75 0 01-1.036 1.085l-5.5-5.25a.75.75 0 010-1.085l5.5-5.25a.75.75 0 011.036 1.086L5.622 8.5H16.5c1.312 0 2.578.49 3.52 1.375.942.887 1.48 2.1 1.48 3.375v7a.75.75 0 01-1.5 0v-7c0-.847-.357-1.669-1.009-2.282A3.639 3.639 0 0016.5 10H5.622l4.146 3.957z"/></symbol><symbol id="flight-corner-up-left-16" viewBox="0 0 16 16"><path d="M6.78 9.22a.75.75 0 11-1.06 1.06l-3.5-3.5a.75.75 0 010-1.06l3.5-3.5a.75.75 0 011.06 1.06L4.56 5.5h5.69a3.25 3.25 0 013.25 3.25v4.5a.75.75 0 01-1.5 0v-4.5A1.75 1.75 0 0010.25 7H4.56l2.22 2.22z"/></symbol><symbol id="flight-corner-up-right-24" viewBox="0 0 24 24"><path d="M14.232 13.957a.75.75 0 001.036 1.085l5.5-5.25a.75.75 0 000-1.085l-5.5-5.25a.75.75 0 00-1.036 1.086L18.378 8.5H7.5c-1.312 0-2.579.49-3.52 1.375A4.634 4.634 0 002.5 13.25v7a.75.75 0 001.5 0v-7c0-.847.357-1.669 1.009-2.282A3.639 3.639 0 017.5 10h10.878l-4.146 3.957z"/></symbol><symbol id="flight-corner-up-right-16" viewBox="0 0 16 16"><path d="M9.22 9.22a.75.75 0 101.06 1.06l3.5-3.5a.75.75 0 000-1.06l-3.5-3.5a.75.75 0 10-1.06 1.06l2.22 2.22H5.75A3.25 3.25 0 002.5 8.75v4.5a.75.75 0 001.5 0v-4.5A1.75 1.75 0 015.75 7h5.69L9.22 9.22z"/></symbol><symbol id="flight-cpu-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M9.75 8A1.75 1.75 0 008 9.75v4.5c0 .966.784 1.75 1.75 1.75h4.5A1.75 1.75 0 0016 14.25v-4.5A1.75 1.75 0 0014.25 8h-4.5zM9.5 9.75a.25.25 0 01.25-.25h4.5a.25.25 0 01.25.25v4.5a.25.25 0 01-.25.25h-4.5a.25.25 0 01-.25-.25v-4.5z"/><path d="M9.25 0a.75.75 0 01.75.75V3h4V.75a.75.75 0 011.5 0V3h2.75A2.75 2.75 0 0121 5.75V8.5h2.25a.75.75 0 010 1.5H21v3h2.25a.75.75 0 010 1.5H21v3.75A2.75 2.75 0 0118.25 21H15.5v2.25a.75.75 0 01-1.5 0V21h-4v2.25a.75.75 0 01-1.5 0V21H5.75A2.75 2.75 0 013 18.25V14.5H.75a.75.75 0 010-1.5H3v-3H.75a.75.75 0 010-1.5H3V5.75A2.75 2.75 0 015.75 3H8.5V.75A.75.75 0 019.25 0zM4.5 18.25c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25H5.75c-.69 0-1.25.56-1.25 1.25v12.5z"/></g></symbol><symbol id="flight-cpu-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M6.25 5C5.56 5 5 5.56 5 6.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5C11 5.56 10.44 5 9.75 5h-3.5zm.25 4.5v-3h3v3h-3z"/><path d="M6.25.05a.7.7 0 01.7.7V2h2.1V.75a.7.7 0 111.4 0V2h1.3A2.25 2.25 0 0114 4.25v1.3h1.25a.7.7 0 110 1.4H14v2.1h1.25a.7.7 0 110 1.4H14v1.3A2.25 2.25 0 0111.75 14h-1.3v1.25a.7.7 0 11-1.4 0V14h-2.1v1.25a.7.7 0 11-1.4 0V14h-1.3A2.25 2.25 0 012 11.75v-1.3H.75a.7.7 0 110-1.4H2v-2.1H.75a.7.7 0 110-1.4H2v-1.3A2.25 2.25 0 014.25 2h1.3V.75a.7.7 0 01.7-.7zM3.5 4.25a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75v7.5a.75.75 0 01-.75.75h-7.5a.75.75 0 01-.75-.75v-7.5z"/></g></symbol><symbol id="flight-credit-card-24" viewBox="0 0 24 24"><g><path d="M4.75 15a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5z"/><path fill-rule="evenodd" d="M0 5.75A2.75 2.75 0 012.75 3h18.5A2.75 2.75 0 0124 5.75v12.5A2.75 2.75 0 0121.25 21H2.75A2.75 2.75 0 010 18.25V5.75zm22.5 0V8h-21V5.75c0-.69.56-1.25 1.25-1.25h18.5c.69 0 1.25.56 1.25 1.25zm0 5.25h-21v7.25c0 .69.56 1.25 1.25 1.25h18.5c.69 0 1.25-.56 1.25-1.25V11z" clip-rule="evenodd"/></g></symbol><symbol id="flight-credit-card-16" viewBox="0 0 16 16"><g><path d="M3.75 9a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5z"/><path fill-rule="evenodd" d="M0 4.25A2.25 2.25 0 012.25 2h11.5A2.25 2.25 0 0116 4.25v7.5A2.25 2.25 0 0113.75 14H2.25A2.25 2.25 0 010 11.75v-7.5zm14.5 0V5h-13v-.75a.75.75 0 01.75-.75h11.5a.75.75 0 01.75.75zm0 2.75h-13v4.75c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75V7z" clip-rule="evenodd"/></g></symbol><symbol id="flight-crop-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M6.5 1.25a.75.75 0 00-1.5 0V5H1.25a.75.75 0 000 1.5H5v9.75A2.75 2.75 0 007.75 19h9.75v3.75a.75.75 0 001.5 0V19h3.75a.75.75 0 000-1.5H19V7.75A2.75 2.75 0 0016.25 5H6.5V1.25zm0 5.25v9.75a1.25 1.25 0 001.25 1.25h9.75V7.75a1.25 1.25 0 00-1.25-1.25H6.5z" clip-rule="evenodd"/></symbol><symbol id="flight-crop-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4.5 1.25a.75.75 0 00-1.5 0V3H1.25a.75.75 0 000 1.5H3v6.456A2.044 2.044 0 005.044 13H11.5v1.75a.75.75 0 001.5 0V13h1.75a.75.75 0 000-1.5H13V5.044A2.044 2.044 0 0010.956 3H4.5V1.25zm0 3.25v6.456a.544.544 0 00.544.544H11.5V5.044a.544.544 0 00-.544-.544H4.5z" clip-rule="evenodd"/></symbol><symbol id="flight-crosshair-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11.75 9.47v-2.72a.75.75 0 00-1.5 0v2.72a9.502 9.502 0 01-8.72-8.72h2.72a.75.75 0 000-1.5H2.53a9.502 9.502 0 018.72-8.72v2.72a.75.75 0 001.5 0V2.53a9.502 9.502 0 018.72 8.72h-2.72a.75.75 0 000 1.5h2.72a9.502 9.502 0 01-8.72 8.72z" clip-rule="evenodd"/></symbol><symbol id="flight-crosshair-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8.75 6.457V12.75a.75.75 0 00-1.5 0v1.707A6.503 6.503 0 011.543 8.75H3.25a.75.75 0 000-1.5H1.543A6.503 6.503 0 017.25 1.543V3.25a.75.75 0 001.5 0V1.543a6.503 6.503 0 015.707 5.707H12.75a.75.75 0 000 1.5h1.707a6.503 6.503 0 01-5.707 5.707z" clip-rule="evenodd"/></symbol><symbol id="flight-dashboard-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M2 3.75C2 2.784 2.784 2 3.75 2h5.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 019.25 22h-5.5A1.75 1.75 0 012 20.25V3.75zm1.75-.25a.25.25 0 00-.25.25v16.5c0 .138.112.25.25.25h5.5a.25.25 0 00.25-.25V3.75a.25.25 0 00-.25-.25h-5.5zM13 3.75c0-.966.784-1.75 1.75-1.75h5.5c.966 0 1.75.784 1.75 1.75v5.5A1.75 1.75 0 0120.25 11h-5.5A1.75 1.75 0 0113 9.25v-5.5zm1.75-.25a.25.25 0 00-.25.25v5.5c0 .138.112.25.25.25h5.5a.25.25 0 00.25-.25v-5.5a.25.25 0 00-.25-.25h-5.5zM14.75 13A1.75 1.75 0 0013 14.75v5.5c0 .966.784 1.75 1.75 1.75h5.5A1.75 1.75 0 0022 20.25v-5.5A1.75 1.75 0 0020.25 13h-5.5zm-.25 1.75a.25.25 0 01.25-.25h5.5a.25.25 0 01.25.25v5.5a.25.25 0 01-.25.25h-5.5a.25.25 0 01-.25-.25v-5.5z"/></g></symbol><symbol id="flight-dashboard-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M1 2.25C1 1.56 1.56 1 2.25 1h3.5C6.44 1 7 1.56 7 2.25v11.5C7 14.44 6.44 15 5.75 15h-3.5C1.56 15 1 14.44 1 13.75V2.25zm1.5.25v11h3v-11h-3zM9 2.25C9 1.56 9.56 1 10.25 1h3.5c.69 0 1.25.56 1.25 1.25v3.5C15 6.44 14.44 7 13.75 7h-3.5C9.56 7 9 6.44 9 5.75v-3.5zm1.5.25v3h3v-3h-3zM10.25 9C9.56 9 9 9.56 9 10.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5C15 9.56 14.44 9 13.75 9h-3.5zm.25 4.5v-3h3v3h-3z"/></g></symbol><symbol id="flight-database-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M22 5.75c0-.751-.47-1.34-1.02-1.763-.563-.43-1.329-.787-2.208-1.072C17.005 2.342 14.611 2 12 2c-2.61 0-5.005.342-6.772.915-.88.285-1.646.641-2.207 1.072C2.469 4.41 2 5 2 5.75v12.412c0 .752.454 1.352 1.006 1.79.56.445 1.325.812 2.204 1.106 1.766.59 4.163.942 6.79.942s5.024-.352 6.79-.942c.88-.294 1.644-.66 2.204-1.105.552-.439 1.006-1.039 1.006-1.791V5.75zM3.933 5.177c-.385.296-.433.496-.433.573 0 .077.048.277.433.573.374.286.963.577 1.758.835C7.27 7.67 9.502 8 12 8s4.729-.33 6.31-.842c.794-.258 1.383-.549 1.757-.835.385-.296.433-.496.433-.573 0-.077-.048-.277-.433-.573-.375-.286-.963-.577-1.758-.835C16.73 3.83 14.498 3.5 12 3.5s-4.729.33-6.31.842c-.794.258-1.383.549-1.757.835zM20.5 7.835c-.49.29-1.078.539-1.728.75-1.767.573-4.161.915-6.772.915-2.61 0-5.005-.342-6.772-.915-.65-.211-1.238-.46-1.728-.75v3.915c0 .08.05.281.43.575.372.287.957.577 1.75.834C7.256 13.671 9.486 14 12 14c2.514 0 4.744-.329 6.32-.84.793-.258 1.378-.549 1.75-.835.38-.294.43-.495.43-.575V7.835zm0 6.005c-.486.288-1.07.536-1.716.746-1.764.573-4.159.914-6.784.914s-5.02-.341-6.784-.914c-.646-.21-1.23-.458-1.716-.746v4.322c0 .102.06.315.439.616.371.295.956.593 1.747.857 1.574.527 3.802.865 6.314.865s4.74-.338 6.314-.865c.791-.264 1.376-.563 1.747-.857.379-.3.439-.514.439-.616V13.84z" clip-rule="evenodd"/></symbol><symbol id="flight-database-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3.352 1.621C4.575 1.23 6.218 1 8 1c1.782 0 3.425.23 4.648.621.607.195 1.153.442 1.563.752.398.301.789.76.789 1.377v8.5c0 .616-.386 1.074-.784 1.376-.41.311-.954.559-1.56.753C11.435 14.771 9.791 15 8 15c-1.791 0-3.435-.23-4.656-.62-.606-.195-1.15-.443-1.56-.754-.398-.302-.784-.76-.784-1.376v-8.5c0-.618.39-1.076.789-1.377.41-.31.956-.557 1.563-.752zM2.509 3.75a.738.738 0 01.185-.18c.222-.169.591-.352 1.115-.52C4.848 2.718 6.33 2.5 8 2.5c1.67 0 3.152.218 4.19.55.524.168.894.351 1.116.52a.74.74 0 01.185.18.74.74 0 01-.185.18c-.222.169-.591.352-1.115.52C11.152 4.782 9.67 5 8 5c-1.67 0-3.152-.218-4.19-.55-.525-.168-.894-.351-1.116-.52a.738.738 0 01-.185-.18zM2.5 9.723v2.511c.01.021.049.09.192.198.22.168.588.351 1.11.519 1.035.332 2.517.549 4.198.549 1.681 0 3.162-.217 4.198-.55.522-.166.89-.35 1.11-.518.143-.109.183-.177.192-.198V9.723c-.272.113-.57.21-.88.292-1.215.322-2.848.485-4.62.485-1.772 0-3.405-.163-4.62-.485a6.903 6.903 0 01-.88-.292zm11-1.746a.591.591 0 01-.163.145c-.213.146-.575.303-1.102.443C11.192 8.841 9.7 9 8 9c-1.7 0-3.192-.159-4.235-.435-.527-.14-.889-.297-1.102-.443a.59.59 0 01-.163-.145v-2.43c.263.125.55.235.852.332C4.575 6.27 6.218 6.5 8 6.5c1.782 0 3.425-.23 4.648-.621.302-.097.59-.207.852-.331v2.429z" clip-rule="evenodd"/></symbol><symbol id="flight-delay-24" viewBox="0 0 24 24"><g><path d="M12 2.5a9.5 9.5 0 100 19 9.5 9.5 0 008.747-5.788.75.75 0 111.382.583c-.072.17-.148.338-.23.506v.002A11 11 0 0112 23C5.925 23 1 18.075 1 12S5.925 1 12 1c.186 0 .371.005.555.014a.75.75 0 01-.079 1.498A9.14 9.14 0 0012 2.5zM14.822 2.136a.75.75 0 01.971-.427c.346.135.683.287 1.01.455a.75.75 0 01-.687 1.334 9.08 9.08 0 00-.866-.39.75.75 0 01-.428-.972zM18.414 4.112a.75.75 0 011.06-.011c.263.257.513.527.749.807a.75.75 0 11-1.147.966 10.025 10.025 0 00-.651-.702.75.75 0 01-.01-1.06zM20.977 7.315a.75.75 0 01.99.381c.149.335.282.677.398 1.026a.75.75 0 11-1.422.476c-.102-.303-.218-.601-.347-.893a.75.75 0 01.38-.99zM22.174 11.239a.75.75 0 01.768.73c.01.368 0 .737-.029 1.107a.75.75 0 01-1.495-.118c.025-.317.033-.634.025-.95a.75.75 0 01.73-.77z"/><path d="M12.5 5.75a.75.75 0 00-1.5 0V12c0 .284.16.544.415.67l4.5 2.25a.75.75 0 10.67-1.34L12.5 11.536V5.75z"/></g></symbol><symbol id="flight-delay-16" viewBox="0 0 16 16"><g><path d="M1.5 8a6.5 6.5 0 016.744-6.496.75.75 0 10.055-1.499 8 8 0 107.036 11.193.75.75 0 00-1.375-.6 6.722 6.722 0 01-.22.453A6.5 6.5 0 011.5 8zM10.726 1.238a.75.75 0 011.013-.312c.177.094.35.194.518.3a.75.75 0 01-.799 1.27 6.512 6.512 0 00-.42-.244.75.75 0 01-.312-1.014zM13.74 3.508a.75.75 0 011.034.235c.106.168.206.34.3.518a.75.75 0 11-1.326.702 6.452 6.452 0 00-.243-.421.75.75 0 01.235-1.034zM15.217 6.979a.75.75 0 01.777.722 8.034 8.034 0 01.002.552.75.75 0 01-1.5-.047 6.713 6.713 0 000-.45.75.75 0 01.721-.777z"/><path d="M7.75 3a.75.75 0 01.75.75v3.786l2.085 1.043a.75.75 0 11-.67 1.342l-2.5-1.25A.75.75 0 017 8V3.75A.75.75 0 017.75 3z"/></g></symbol><symbol id="flight-delete-24" viewBox="0 0 24 24"><g><path d="M11.22 8.22a.75.75 0 011.06 0L15 10.94l2.72-2.72a.75.75 0 111.06 1.06L16.06 12l2.72 2.72a.75.75 0 11-1.06 1.06L15 13.06l-2.72 2.72a.75.75 0 11-1.06-1.06L13.94 12l-2.72-2.72a.75.75 0 010-1.06z"/><path fill-rule="evenodd" d="M6.579 3.97A2.75 2.75 0 018.676 3H21.25A2.75 2.75 0 0124 5.75v12.5A2.75 2.75 0 0121.25 21H8.676a2.75 2.75 0 01-2.097-.97l-6.4-7.545a.75.75 0 010-.97l6.4-7.544zm2.097.53a1.25 1.25 0 00-.953.441L1.733 12l5.99 7.059c.237.28.586.441.953.441H21.25c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25H8.676z" clip-rule="evenodd"/></g></symbol><symbol id="flight-delete-16" viewBox="0 0 16 16"><g><path d="M11.78 5.22a.75.75 0 010 1.06L10.06 8l1.72 1.72a.75.75 0 11-1.06 1.06L9 9.06l-1.72 1.72a.75.75 0 11-1.06-1.06L7.94 8 6.22 6.28a.75.75 0 011.06-1.06L9 6.94l1.72-1.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M4.393 2.61A1.75 1.75 0 015.72 2h8.03A2.25 2.25 0 0116 4.25v7.5A2.25 2.25 0 0113.75 14H5.72a1.75 1.75 0 01-1.327-.61L.181 8.49a.75.75 0 010-.978L4.393 2.61zm1.327.89a.25.25 0 00-.19.087L1.74 8l3.792 4.413a.25.25 0 00.19.087h8.029a.75.75 0 00.75-.75v-7.5a.75.75 0 00-.75-.75H5.72z" clip-rule="evenodd"/></g></symbol><symbol id="flight-diamond-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M11.116 2.985l-8.131 8.132a1.25 1.25 0 000 1.767l8.131 8.132a1.25 1.25 0 001.768 0l8.132-8.132a1.25 1.25 0 000-1.768l-8.132-8.131a1.25 1.25 0 00-1.768 0zm-9.192 7.07l8.132-8.13a2.75 2.75 0 013.889 0l8.131 8.13a2.75 2.75 0 010 3.89l-8.131 8.131a2.75 2.75 0 01-3.89 0l-8.131-8.131a2.75 2.75 0 010-3.89z" clip-rule="evenodd"/></symbol><symbol id="flight-diamond-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M7.468 1.813L1.81 7.47a.75.75 0 000 1.06l5.657 5.657a.75.75 0 001.06 0l5.657-5.656a.75.75 0 000-1.061L8.528 1.813a.75.75 0 00-1.06 0zM.75 6.41L6.407.753a2.25 2.25 0 013.182 0l5.657 5.656a2.25 2.25 0 010 3.182l-5.657 5.657a2.25 2.25 0 01-3.182 0L.75 9.591a2.25 2.25 0 010-3.182z" clip-rule="evenodd"/></symbol><symbol id="flight-diamond-fill-24" viewBox="0 0 24 24"><path d="M10.056 1.924l-8.132 8.132a2.75 2.75 0 000 3.889l8.132 8.131a2.75 2.75 0 003.889 0l8.131-8.131a2.75 2.75 0 000-3.89l-8.131-8.13a2.75 2.75 0 00-3.89 0z"/></symbol><symbol id="flight-diamond-fill-16" viewBox="0 0 16 16"><path d="M6.407.753L.75 6.409a2.25 2.25 0 000 3.182l5.657 5.657a2.25 2.25 0 003.182 0l5.657-5.657a2.25 2.25 0 000-3.182L9.589.753a2.25 2.25 0 00-3.182 0z"/></symbol><symbol id="flight-disc-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M12 8a4 4 0 100 8 4 4 0 000-8zm-2.5 4a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z"/><path d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z"/></g></symbol><symbol id="flight-disc-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8 5.05a2.95 2.95 0 100 5.9 2.95 2.95 0 000-5.9zM6.45 8a1.55 1.55 0 113.1 0 1.55 1.55 0 01-3.1 0z"/><path d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z"/></g></symbol><symbol id="flight-discussion-circle-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M13.02 4.827a5.75 5.75 0 00-8.777 7.077c.144.275.134.58.12.751a4.183 4.183 0 01-.118.655 13.903 13.903 0 01-.512 1.557c.563-.214 1.188-.429 1.694-.545a.75.75 0 11.335 1.463c-.535.122-1.3.401-1.961.666a34.515 34.515 0 00-1.062.445l-.064.029-.016.007-.004.002h-.001a.75.75 0 01-.99-.994v-.002l.003-.006.012-.027a21.137 21.137 0 00.214-.49c.137-.322.316-.755.484-1.204.17-.453.323-.903.413-1.265.046-.183.07-.32.078-.413l.001-.022a7.25 7.25 0 0111.11-8.837.75.75 0 11-.959 1.153z"/><path d="M21.781 20.78a.75.75 0 00.152-.84l-.004-.008-.012-.027a18.62 18.62 0 01-.214-.49 30.259 30.259 0 01-.484-1.204 12.45 12.45 0 01-.413-1.265 2.734 2.734 0 01-.077-.414l-.002-.021a7.25 7.25 0 10-3.22 3.219h.018c.092.009.23.033.413.08.363.09.814.243 1.268.413a31.27 31.27 0 011.701.695l.027.012.008.004a.75.75 0 00.84-.155zM8.5 13.25a5.75 5.75 0 1110.853 2.653c-.144.276-.134.58-.12.752.018.208.063.434.118.655a13.92 13.92 0 00.512 1.557 14.298 14.298 0 00-1.56-.512c-.218-.056-.443-.101-.649-.119-.167-.014-.474-.028-.75.117A5.75 5.75 0 018.5 13.25z"/></g></symbol><symbol id="flight-discussion-circle-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8.302 3.288A3.633 3.633 0 002.756 7.76c.124.237.112.49.102.61a2.984 2.984 0 01-.084.468 7.853 7.853 0 01-.2.655c.26-.09.52-.17.75-.223a.7.7 0 11.312 1.365c-.34.078-.837.258-1.278.434a23.211 23.211 0 00-.701.295l-.042.018-.01.005-.003.001a.7.7 0 01-.925-.927v-.001l.002-.004.008-.018.03-.07a21.252 21.252 0 00.43-1.047c.113-.3.211-.592.27-.822.021-.09.034-.157.041-.205a5.033 5.033 0 017.74-6.082.7.7 0 01-.896 1.076zM1.463 8.226v0z"/><path d="M4.75 9.333a5.083 5.083 0 119.657 2.221c.006.033.015.077.029.133.05.197.14.453.248.734.087.223.178.443.262.646l.06.146c.049.118.094.23.131.326.03.082.074.2.097.306a.75.75 0 01-.734.905c-.169 0-.332-.04-.447-.072a4.867 4.867 0 01-.394-.134c-.188-.072-.402-.162-.606-.248l-.216-.09a7.634 7.634 0 00-.705-.265 1.739 1.739 0 00-.095-.026A5.083 5.083 0 014.75 9.333zm1.5 0a3.583 3.583 0 116.763 1.654c-.124.239-.12.485-.11.614.01.155.043.313.08.456.054.214.132.448.216.676a7.37 7.37 0 00-.643-.231 2.456 2.456 0 00-.443-.093 1.113 1.113 0 00-.626.104 3.583 3.583 0 01-5.237-3.18zm8.15 2.16l-.001-.012v.013z"/></g></symbol><symbol id="flight-discussion-square-24" viewBox="0 0 24 24"><g><path d="M14.25 2A2.75 2.75 0 0117 4.75v.5a.75.75 0 01-1.5 0v-.5c0-.69-.56-1.25-1.25-1.25H3.75c-.69 0-1.25.56-1.25 1.25v10.94l2.531-2.026a.75.75 0 01.938 1.172l-3.75 3A.75.75 0 011 17.25V4.75A2.75 2.75 0 013.75 2h10.5z"/><path fill-rule="evenodd" d="M9.75 7A2.75 2.75 0 007 9.75v7.5A2.75 2.75 0 009.75 20h8.048c.284 0 .56.097.781.274l3.203 2.562A.75.75 0 0023 22.25V9.75A2.75 2.75 0 0020.25 7H9.75zM8.5 9.75c0-.69.56-1.25 1.25-1.25h10.5c.69 0 1.25.56 1.25 1.25v10.94l-1.984-1.587a2.75 2.75 0 00-1.718-.603H9.75c-.69 0-1.25-.56-1.25-1.25v-7.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-discussion-square-16" viewBox="0 0 16 16"><g><path d="M11.25 1a.75.75 0 010 1.5h-9a.75.75 0 00-.75.75v6.531l.706-.51a.75.75 0 01.88 1.214L1.19 11.858A.75.75 0 010 11.25v-8A2.25 2.25 0 012.25 1h9z"/><path fill-rule="evenodd" d="M6.25 4A2.25 2.25 0 004 6.25v4.534a2.25 2.25 0 002.25 2.25h6.041l2.52 1.824A.75.75 0 0016 14.25v-8A2.25 2.25 0 0013.75 4h-7.5zM5.5 6.25a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75v6.531l-1.526-1.104a.75.75 0 00-.44-.143H6.25a.75.75 0 01-.75-.75V6.25z" clip-rule="evenodd"/></g></symbol><symbol id="flight-docs-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h13.5A1.75 1.75 0 0021 21.25V2.75A1.75 1.75 0 0019.25 1H5.75zM19.5 17.5V2.75a.25.25 0 00-.25-.25H5.75c-.69 0-1.25.56-1.25 1.25V17.8c.375-.192.8-.3 1.25-.3H19.5zm-15 2.75c0 .69.56 1.25 1.25 1.25h13.5a.25.25 0 00.25-.25V19H5.75c-.69 0-1.25.56-1.25 1.25z" clip-rule="evenodd"/></symbol><symbol id="flight-docs-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4.25 1A2.25 2.25 0 002 3.25v9.5A2.25 2.25 0 004.25 15h8.5c.69 0 1.25-.56 1.25-1.25V2.25C14 1.56 13.44 1 12.75 1h-8.5zM3.5 12.75c0 .414.336.75.75.75h8.25v-2H4.25a.75.75 0 00-.75.75v.5zm0-2.622c.235-.083.487-.128.75-.128h8.25V2.5H4.25a.75.75 0 00-.75.75v6.878z" clip-rule="evenodd"/></symbol><symbol id="flight-docs-download-24" viewBox="0 0 24 24"><g><path d="M3 3.75A2.75 2.75 0 015.75 1h13.5c.966 0 1.75.784 1.75 1.75v6.5a.75.75 0 01-1.5 0v-6.5a.25.25 0 00-.25-.25H5.75c-.69 0-1.25.56-1.25 1.25V17.8c.375-.192.8-.3 1.25-.3h1.5a.75.75 0 010 1.5h-1.5a1.25 1.25 0 100 2.5h3a.75.75 0 010 1.5h-3A2.75 2.75 0 013 20.25V3.75z"/><path d="M12.97 17.22a.75.75 0 011.06 0l1.22 1.22v-4.69a.75.75 0 011.5 0v4.69l1.22-1.22a.75.75 0 111.06 1.06l-2.5 2.5a.747.747 0 01-1.06 0l-2.5-2.5a.75.75 0 010-1.06z"/><path fill-rule="evenodd" d="M16 10a7 7 0 100 14 7 7 0 000-14zm-5.5 7a5.5 5.5 0 1111 0 5.5 5.5 0 01-11 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-docs-download-16" viewBox="0 0 16 16"><g><path d="M2 3.25A2.25 2.25 0 014.25 1h8.5c.69 0 1.25.56 1.25 1.25V4.5a.75.75 0 01-1.5 0v-2H4.25a.75.75 0 00-.75.75v6.878c.235-.083.487-.128.75-.128h.25a.75.75 0 010 1.5h-.25a.75.75 0 00-.75.75v.5c0 .414.336.75.75.75h1a.75.75 0 010 1.5h-1A2.25 2.25 0 012 12.75v-9.5z"/><path d="M8.826 10.826a.6.6 0 01.848 0l.726.725V9a.6.6 0 011.2 0v2.551l.726-.725a.6.6 0 11.848.848l-1.75 1.75a.6.6 0 01-.848 0l-1.75-1.75a.6.6 0 010-.848z"/><path fill-rule="evenodd" d="M11 6.05a4.95 4.95 0 100 9.9 4.95 4.95 0 000-9.9zM7.45 11a3.55 3.55 0 117.1 0 3.55 3.55 0 01-7.1 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-docs-link-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M4.5 3.75c0-.69.56-1.25 1.25-1.25h7.5a.75.75 0 000-1.5h-7.5A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h13.5A1.75 1.75 0 0021 21.25V8.75a.75.75 0 00-1.5 0v8.75H5.75c-.45 0-.875.108-1.25.3V3.75zm0 16.5c0 .69.56 1.25 1.25 1.25h13.5a.25.25 0 00.25-.25V19H5.75c-.69 0-1.25.56-1.25 1.25z" clip-rule="evenodd"/><path d="M19.5 3.56v1.69a.75.75 0 001.5 0v-3.5a.75.75 0 00-.75-.75h-3.5a.75.75 0 000 1.5h1.69l-2.97 2.97a.75.75 0 001.06 1.06l2.97-2.97z"/></g></symbol><symbol id="flight-docs-link-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M3.5 3.25a.75.75 0 01.75-.75H8A.75.75 0 008 1H4.25A2.25 2.25 0 002 3.25v9.5A2.25 2.25 0 004.25 15h8.5c.69 0 1.25-.56 1.25-1.25V7a.75.75 0 00-1.5 0v3H4.25c-.263 0-.515.045-.75.128V3.25zm0 9v.5c0 .414.336.75.75.75h8.25v-2H4.25a.75.75 0 00-.75.75z" clip-rule="evenodd"/><path d="M12.5 3.56v.69a.75.75 0 001.5 0v-2.5a.75.75 0 00-.75-.75h-2.5a.75.75 0 000 1.5h.69L9.47 4.47a.75.75 0 001.06 1.06l1.97-1.97z"/></g></symbol><symbol id="flight-dollar-sign-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12.5 1.75a.75.75 0 00-1.5 0V4H9.396c-1.165 0-2.282.46-3.107 1.28a4.365 4.365 0 000 6.19 4.406 4.406 0 003.107 1.28H11v5.75H5.75a.75.75 0 000 1.5H11v2.25a.75.75 0 001.5 0V20h2.104c1.165 0 2.282-.46 3.107-1.28a4.365 4.365 0 000-6.19 4.407 4.407 0 00-3.107-1.28H12.5V5.5h4.708a.75.75 0 000-1.5H12.5V1.75zM11 5.5H9.396c-.77 0-1.507.304-2.05.844a2.865 2.865 0 000 4.062c.543.54 1.28.844 2.05.844H11V5.5zm1.5 7.25v5.75h2.104c.77 0 1.507-.304 2.05-.844a2.864 2.864 0 000-4.062 2.906 2.906 0 00-2.05-.844H12.5z" clip-rule="evenodd"/></symbol><symbol id="flight-dollar-sign-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8.5.75a.75.75 0 00-1.5 0V2h-.594c-.9 0-1.766.353-2.405.985A3.36 3.36 0 003 5.375a3.36 3.36 0 001 2.39c.64.632 1.506.985 2.406.985H7v3.75H4.25a.75.75 0 000 1.5H7v1.25a.75.75 0 001.5 0V14h1.094c.9 0 1.766-.353 2.405-.985A3.36 3.36 0 0013 10.625a3.36 3.36 0 00-1-2.39 3.422 3.422 0 00-2.406-.985H8.5V3.5h3.25a.75.75 0 000-1.5H8.5V.75zM7 3.5h-.594c-.508 0-.994.2-1.35.552A1.86 1.86 0 004.5 5.375c0 .494.199.97.555 1.323.357.352.843.552 1.351.552H7V3.5zm1.5 5.25v3.75h1.094c.508 0 .994-.2 1.35-.552a1.86 1.86 0 00.556-1.323c0-.494-.199-.97-.555-1.323a1.922 1.922 0 00-1.351-.552H8.5z" clip-rule="evenodd"/></symbol><symbol id="flight-dot-24" viewBox="0 0 24 24"><path d="M12 5a7 7 0 100 14 7 7 0 000-14z"/></symbol><symbol id="flight-dot-16" viewBox="0 0 16 16"><path d="M8 3a5 5 0 100 10A5 5 0 008 3z"/></symbol><symbol id="flight-dot-half-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 5a7 7 0 100 14 7 7 0 000-14zm0 1.5v11a5.5 5.5 0 100-11z" clip-rule="evenodd"/></symbol><symbol id="flight-dot-half-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 3a5 5 0 100 10A5 5 0 008 3zm0 1.5v7a3.5 3.5 0 100-7z" clip-rule="evenodd"/></symbol><symbol id="flight-download-24" viewBox="0 0 24 24"><g><path d="M12.75 2.75a.75.75 0 00-1.5 0v10.628L7.293 9.232a.75.75 0 10-1.086 1.036l5.25 5.499A.748.748 0 0012 16h.012a.747.747 0 00.53-.232l5.25-5.5a.75.75 0 00-1.085-1.036l-3.957 4.146V2.75z"/><path d="M2.75 14a.75.75 0 01.75.75v4.5c0 .69.56 1.25 1.25 1.25h14.5c.69 0 1.25-.56 1.25-1.25v-4.5a.75.75 0 011.5 0v4.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25v-4.5a.75.75 0 01.75-.75z"/></g></symbol><symbol id="flight-download-16" viewBox="0 0 16 16"><g><path d="M8.75 1.75a.75.75 0 00-1.5 0v6.59L5.3 6.24a.75.75 0 10-1.1 1.02L7.45 10.76a.78.78 0 00.038.038.748.748 0 001.063-.037l3.25-3.5a.75.75 0 10-1.1-1.02l-1.95 2.1V1.75z"/><path d="M1.75 9a.75.75 0 01.75.75v3c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75v-3a.75.75 0 011.5 0v3A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-3A.75.75 0 011.75 9z"/></g></symbol><symbol id="flight-droplet-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 1a.75.75 0 01.544.233l5.997 6.314A9.22 9.22 0 0121 13.84c0 5.045-4.016 9.16-9 9.16s-9-4.115-9-9.16c0-2.435.934-4.651 2.46-6.293l.005-.006 5.991-6.308A.75.75 0 0112 1zM6.556 8.571A7.719 7.719 0 004.5 13.84c0 4.244 3.371 7.66 7.5 7.66s7.5-3.416 7.5-7.66a7.719 7.719 0 00-2.056-5.269L12 2.84 6.556 8.571z" clip-rule="evenodd"/></symbol><symbol id="flight-droplet-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M7.477 1.212a.75.75 0 011.046 0l3.813 3.71A5.92 5.92 0 0114 9.04C13.999 12.337 11.307 15 7.999 15c-3.308 0-6-2.663-6-5.96a5.92 5.92 0 011.665-4.118l3.812-3.71zM4.721 5.987A4.42 4.42 0 003.5 9.04C3.5 11.498 5.51 13.5 8 13.5s4.5-2.002 4.5-4.46a4.42 4.42 0 00-1.22-3.053L8 2.797l-3.28 3.19z" clip-rule="evenodd"/></symbol><symbol id="flight-duplicate-24" viewBox="0 0 24 24"><g><path d="M3.75 1A2.75 2.75 0 001 3.75v10.5A2.75 2.75 0 003.75 17h1a.75.75 0 000-1.5h-1c-.69 0-1.25-.56-1.25-1.25V3.75c0-.69.56-1.25 1.25-1.25h10.5c.69 0 1.25.56 1.25 1.25v1a.75.75 0 001.5 0v-1A2.75 2.75 0 0014.25 1H3.75z"/><path fill-rule="evenodd" d="M9.75 7A2.75 2.75 0 007 9.75v10.5A2.75 2.75 0 009.75 23h10.5A2.75 2.75 0 0023 20.25V9.75A2.75 2.75 0 0020.25 7H9.75zM8.5 9.75c0-.69.56-1.25 1.25-1.25h10.5c.69 0 1.25.56 1.25 1.25v10.5c0 .69-.56 1.25-1.25 1.25H9.75c-.69 0-1.25-.56-1.25-1.25V9.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-duplicate-16" viewBox="0 0 16 16"><g><path d="M2.25 0A2.25 2.25 0 000 2.25v7.5A2.25 2.25 0 002.25 12h.25a.75.75 0 000-1.5h-.25a.75.75 0 01-.75-.75v-7.5a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75v.25a.75.75 0 001.5 0v-.25A2.25 2.25 0 009.75 0h-7.5z"/><path fill-rule="evenodd" d="M6.25 4A2.25 2.25 0 004 6.25v7.5A2.25 2.25 0 006.25 16h7.5A2.25 2.25 0 0016 13.75v-7.5A2.25 2.25 0 0013.75 4h-7.5zM5.5 6.25a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75v7.5a.75.75 0 01-.75.75h-7.5a.75.75 0 01-.75-.75v-7.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-edit-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M17.055 2.884a2.75 2.75 0 013.89 0l.171.171a2.75 2.75 0 010 3.89l-9.005 9.005A4.75 4.75 0 0110.516 17L6.28 18.696a.75.75 0 01-.975-.975l1.695-4.237a4.749 4.749 0 011.051-1.595l9.005-9.005zm2.829 1.06a1.25 1.25 0 00-1.768 0l-.555.556L19.5 6.44l.555-.556a1.25 1.25 0 000-1.768l-.171-.172zM18.439 7.5L16.5 5.56l-7.39 7.39a3.25 3.25 0 00-.719 1.09l-1.045 2.614 2.613-1.046a3.25 3.25 0 001.091-.719L18.44 7.5z" clip-rule="evenodd"/><path d="M3.75 4.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h14.5c.69 0 1.25-.56 1.25-1.25V13a.75.75 0 011.5 0v7.25A2.75 2.75 0 0118.25 23H3.75A2.75 2.75 0 011 20.25V5.75A2.75 2.75 0 013.75 3H11a.75.75 0 010 1.5H3.75z"/></g></symbol><symbol id="flight-edit-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M11.436 1.005A1.75 1.75 0 0113.902.79l.702.589a1.75 1.75 0 01.216 2.465l-5.704 6.798a4.75 4.75 0 01-1.497 1.187l-2.572 1.299a.75.75 0 01-1.056-.886l.833-2.759a4.75 4.75 0 01.908-1.68l5.704-6.798zm1.502.934a.25.25 0 00-.353.03l-.53.633 1.082.914.534-.636a.25.25 0 00-.031-.352l-.703-.59zm-.765 2.726l-1.082-.914-4.21 5.016a3.25 3.25 0 00-.621 1.15L5.933 11l1.01-.51a3.249 3.249 0 001.024-.812l4.206-5.013z" clip-rule="evenodd"/><path d="M3.25 3.5a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V9A.75.75 0 0115 9v4.75A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75v-9.5A2.25 2.25 0 013.25 2H6a.75.75 0 010 1.5H3.25z"/></g></symbol><symbol id="flight-enterprise-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M13.673 2.647a9.462 9.462 0 014.545 2.17.75.75 0 00.983-1.133A10.96 10.96 0 0012 1C5.925 1 1 5.925 1 12c0 5.056 3.41 9.313 8.054 10.601a.75.75 0 10.401-1.445c-3.857-1.07-6.727-4.513-6.942-8.656h4.754c.097 1.97.539 3.892 1.292 5.68a.75.75 0 001.382-.582A15.256 15.256 0 018.769 12.5h.481a.75.75 0 000-1.5h-.446A15.149 15.149 0 0112 2.916c.432.546.824 1.12 1.174 1.718a.75.75 0 101.294-.758 16.46 16.46 0 00-.795-1.23zm-3.346 0A9.506 9.506 0 002.552 11h4.747a16.673 16.673 0 013.028-8.353z" clip-rule="evenodd"/><path d="M11 8.75A2.75 2.75 0 0113.75 6h6.5A2.75 2.75 0 0123 8.75v13.5a.75.75 0 01-1.5 0V8.75c0-.69-.56-1.25-1.25-1.25h-6.5c-.69 0-1.25.56-1.25 1.25v13.5a.75.75 0 01-1.5 0V8.75z"/><path d="M15.75 18c-.69 0-1.25.56-1.25 1.25v3a.75.75 0 001.5 0V19.5h2v2.75a.75.75 0 001.5 0v-3c0-.69-.56-1.25-1.25-1.25h-2.5zM14.5 12.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75zM18.25 12a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM14.5 9.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75zM18.25 9a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM14.5 15.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75zM18.25 15a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/></g></symbol><symbol id="flight-enterprise-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M9.872 1.774a6.516 6.516 0 013.693 2.864.75.75 0 101.283-.777 8 8 0 10-9.054 11.83.75.75 0 10.412-1.441A6.505 6.505 0 011.52 8.5h2.503a10.929 10.929 0 001.396 4.619.75.75 0 001.307-.736A9.437 9.437 0 015.527 8.5h.723a.75.75 0 000-1.5h-.67C5.835 5.124 6.667 3.335 8 1.836a10.102 10.102 0 011.736 2.71.75.75 0 101.377-.593 11.442 11.442 0 00-1.241-2.18zm-3.744 0A6.508 6.508 0 001.576 7H4.07a11.095 11.095 0 012.06-5.226z" clip-rule="evenodd"/><path d="M7.5 7.75A2.25 2.25 0 019.75 5.5h4A2.25 2.25 0 0116 7.75v7.5a.75.75 0 01-1.5 0v-7.5a.75.75 0 00-.75-.75h-4a.75.75 0 00-.75.75v7.5a.75.75 0 01-1.5 0v-7.5z"/><path d="M10.25 12a.75.75 0 00-.75.75v2.5a.75.75 0 001.5 0V13.5h1.5v1.75a.75.75 0 001.5 0v-2.5a.75.75 0 00-.75-.75h-3zM9.75 8.5a.75.75 0 01.75-.75h.25a.75.75 0 010 1.5h-.25a.75.75 0 01-.75-.75zM12.75 7.75a.75.75 0 000 1.5H13a.75.75 0 000-1.5h-.25zM9.75 10.5a.75.75 0 01.75-.75h.25a.75.75 0 010 1.5h-.25a.75.75 0 01-.75-.75zM12.75 9.75a.75.75 0 000 1.5H13a.75.75 0 000-1.5h-.25z"/></g></symbol><symbol id="flight-entry-point-24" viewBox="0 0 24 24"><g><path d="M12 4.5a7.498 7.498 0 00-6.561 3.864.75.75 0 01-1.312-.728 9 9 0 110 8.728.75.75 0 011.312-.728A7.5 7.5 0 1012 4.5z"/><path d="M3 12a.75.75 0 01.75-.75h9.614l-3.129-2.955a.75.75 0 011.03-1.09l4.5 4.25a.75.75 0 010 1.09l-4.5 4.25a.75.75 0 01-1.03-1.09l3.129-2.955H3.75A.75.75 0 013 12z"/></g></symbol><symbol id="flight-entry-point-16" viewBox="0 0 16 16"><g><path d="M8 2.5a5.494 5.494 0 00-4.558 2.42.75.75 0 01-1.242-.84 7 7 0 110 7.841.75.75 0 111.242-.841A5.5 5.5 0 108 2.5z"/><path d="M7.245 4.695a.75.75 0 00-.05 1.06l1.36 1.495H1.75a.75.75 0 000 1.5h6.805l-1.36 1.495a.75.75 0 001.11 1.01l2.5-2.75a.75.75 0 000-1.01l-2.5-2.75a.75.75 0 00-1.06-.05z"/></g></symbol><symbol id="flight-exit-point-24" viewBox="0 0 24 24"><g><path d="M3 12a7 7 0 0110.707-5.939.75.75 0 01-.795 1.272 5.5 5.5 0 100 9.334.75.75 0 01.795 1.272A7 7 0 013 12z"/><path d="M9 12a.75.75 0 01.75-.75h9.614l-3.129-2.955a.75.75 0 011.03-1.09l4.498 4.248a.748.748 0 010 1.093l-4.498 4.25a.75.75 0 01-1.03-1.091l3.129-2.955H9.75A.75.75 0 019 12z"/></g></symbol><symbol id="flight-exit-point-16" viewBox="0 0 16 16"><g><path d="M1 8a6 6 0 018.514-5.45.75.75 0 01-.629 1.363 4.5 4.5 0 100 8.175.75.75 0 11.63 1.361A6 6 0 011 8z"/><path d="M11.245 4.695a.75.75 0 00-.05 1.06l1.36 1.495H6.75a.75.75 0 000 1.5h5.805l-1.36 1.495a.75.75 0 001.11 1.01l2.5-2.75a.748.748 0 00-.002-1.012l-2.498-2.748a.75.75 0 00-1.06-.05z"/></g></symbol><symbol id="flight-external-link-24" viewBox="0 0 24 24"><g><path d="M15 1.75a.75.75 0 01.75-.75h5.5a.748.748 0 01.75.75v5.5a.75.75 0 01-1.5 0V3.56L10.28 13.78a.75.75 0 11-1.06-1.06L19.44 2.5h-3.69a.75.75 0 01-.75-.75z"/><path d="M4.75 5.5c-.69 0-1.25.56-1.25 1.25v11.5c0 .69.56 1.25 1.25 1.25h11.5c.69 0 1.25-.56 1.25-1.25v-6.5a.75.75 0 011.5 0v6.5A2.75 2.75 0 0116.25 21H4.75A2.75 2.75 0 012 18.25V6.75A2.75 2.75 0 014.75 4h6.5a.75.75 0 010 1.5h-6.5z"/></g></symbol><symbol id="flight-external-link-16" viewBox="0 0 16 16"><g><path d="M9 .75A.75.75 0 019.75 0h4.5c.206 0 .393.083.529.218l.001.002.002.001A.748.748 0 0115 .75v4.5a.75.75 0 01-1.5 0V2.56L7.28 8.78a.75.75 0 01-1.06-1.06l6.22-6.22H9.75A.75.75 0 019 .75z"/><path d="M3.25 3.5a.75.75 0 00-.75.75v7.5c0 .414.336.75.75.75h7.5a.75.75 0 00.75-.75v-4a.75.75 0 011.5 0v4A2.25 2.25 0 0110.75 14h-7.5A2.25 2.25 0 011 11.75v-7.5A2.25 2.25 0 013.25 2h4a.75.75 0 010 1.5h-4z"/></g></symbol><symbol id="flight-event-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M12.673 7.668a.75.75 0 00-1.345 0l-1.526 3.09-3.41.498a.75.75 0 00-.415 1.28l2.467 2.403-.582 3.395a.75.75 0 001.088.79L12 17.522l3.05 1.604a.75.75 0 001.088-.79l-.582-3.396 2.467-2.403a.75.75 0 00-.415-1.28l-3.41-.498-1.525-3.09zm-1.7 4.107L12 9.695l1.027 2.08a.75.75 0 00.564.41l2.298.336-1.662 1.619a.75.75 0 00-.216.664l.392 2.286-2.054-1.08a.75.75 0 00-.698 0l-2.054 1.08.392-2.286a.75.75 0 00-.216-.664L8.111 12.52l2.298-.336a.75.75 0 00.564-.41z"/><path d="M17 2a.75.75 0 00-1.5 0v1h-7V2A.75.75 0 007 2v1H4.75A2.75 2.75 0 002 5.75v14.5A2.75 2.75 0 004.75 23h14.5A2.75 2.75 0 0022 20.25V5.75A2.75 2.75 0 0019.25 3H17V2zM7 6V4.5H4.75c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h14.5c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25H17V6a.75.75 0 01-1.5 0V4.5h-7V6A.75.75 0 017 6z"/></g></symbol><symbol id="flight-event-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8.675 4.173a.75.75 0 00-1.35 0l-1.14 2.359-2.546.38a.75.75 0 00-.418 1.273l1.85 1.84-.437 2.6a.75.75 0 001.094.786L8 12.19l2.272 1.22a.75.75 0 001.094-.785l-.437-2.602 1.85-1.839a.75.75 0 00-.418-1.273l-2.545-.38-1.14-2.359zM7.362 7.542L8 6.222l.638 1.32a.75.75 0 00.565.415l1.459.218-1.066 1.059a.75.75 0 00-.21.656l.247 1.476-1.278-.686a.75.75 0 00-.71 0l-1.278.686.248-1.476a.75.75 0 00-.211-.656l-1.066-1.06 1.46-.217a.75.75 0 00.564-.415z"/><path d="M12 .75a.75.75 0 00-1.5 0V1h-5V.75a.75.75 0 00-1.5 0V1H2.25A2.25 2.25 0 000 3.25v10.5A2.25 2.25 0 002.25 16h11.5A2.25 2.25 0 0016 13.75V3.25A2.25 2.25 0 0013.75 1H12V.75zm-8 2.5V2.5H2.25a.75.75 0 00-.75.75v10.5c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75V3.25a.75.75 0 00-.75-.75H12v.75a.75.75 0 01-1.5 0V2.5h-5v.75a.75.75 0 01-1.5 0z"/></g></symbol><symbol id="flight-eye-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M12 8a4 4 0 100 8 4 4 0 000-8zm-2.5 4a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z"/><path d="M12 3C8.135 3 5.14 5.088 3.15 7.162c-1.001 1.043-1.767 2.1-2.286 2.936-.26.417-.46.785-.6 1.074-.069.143-.127.275-.169.388a1.952 1.952 0 00-.058.177A1.024 1.024 0 000 12c0 .116.025.216.037.263.017.06.037.12.058.177.042.113.1.245.17.388.138.289.34.657.599 1.074a18.14 18.14 0 002.285 2.936C5.14 18.912 8.135 21 12 21c3.864 0 6.86-2.088 8.85-4.162 1.001-1.043 1.767-2.1 2.286-2.936.26-.417.46-.785.6-1.074.069-.143.127-.275.169-.388a1.98 1.98 0 00.058-.177c.012-.047.037-.147.037-.263 0-.116-.025-.216-.037-.263a1.98 1.98 0 00-.058-.177 4.709 4.709 0 00-.17-.388c-.139-.289-.34-.657-.599-1.074a18.146 18.146 0 00-2.285-2.936C18.86 5.088 15.865 3 12 3zM1.615 12.177a4.225 4.225 0 01-.08-.177c.02-.048.047-.107.08-.177.113-.233.287-.554.523-.934a16.641 16.641 0 012.093-2.688C6.076 6.28 8.705 4.5 12 4.5c3.294 0 5.924 1.78 7.768 3.701a16.639 16.639 0 012.094 2.688c.236.38.41.701.523.934.033.07.06.129.08.177a4.03 4.03 0 01-.08.177c-.113.233-.287.554-.523.934a16.639 16.639 0 01-2.093 2.688C17.924 17.72 15.294 19.5 12 19.5s-5.925-1.78-7.769-3.701a16.641 16.641 0 01-2.093-2.688c-.236-.38-.41-.701-.523-.934z"/></g></symbol><symbol id="flight-eye-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8 5a3 3 0 100 6 3 3 0 000-6zM6.5 8a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z"/><path d="M8 2C5.422 2 3.43 3.32 2.112 4.65A10.948 10.948 0 00.596 6.564c-.173.28-.31.536-.407.75a3 3 0 00-.122.31C.04 7.705 0 7.846 0 8s.041.296.067.375a3 3 0 00.122.31c.097.215.234.471.407.751.346.56.854 1.246 1.516 1.914C3.43 12.68 5.422 14 8 14s4.57-1.32 5.888-2.65a10.952 10.952 0 001.516-1.914c.173-.28.31-.536.407-.75.048-.107.09-.212.122-.31.026-.08.067-.221.067-.376s-.041-.296-.067-.375a2.978 2.978 0 00-.122-.31 6.777 6.777 0 00-.407-.751 10.952 10.952 0 00-1.516-1.914C12.57 3.32 10.578 2 8 2zM1.556 7.933a2.314 2.314 0 00-.03.067l.03.067c.065.145.17.344.316.58a9.45 9.45 0 001.306 1.647C4.332 11.458 5.964 12.5 8 12.5s3.668-1.042 4.822-2.206a9.45 9.45 0 001.306-1.646A5.336 5.336 0 0014.473 8a5.335 5.335 0 00-.346-.648 9.452 9.452 0 00-1.305-1.646C11.668 4.542 10.036 3.5 8 3.5S4.332 4.542 3.178 5.706a9.45 9.45 0 00-1.306 1.646 5.316 5.316 0 00-.316.58z"/></g></symbol><symbol id="flight-eye-off-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M2.28 1.22a.75.75 0 00-1.06 1.06l3.468 3.468C3.294 6.87 2.204 8.154 1.437 9.236a15.323 15.323 0 00-1.02 1.635c-.117.22-.21.415-.277.574-.033.08-.063.16-.086.234A1.102 1.102 0 000 12c0 .116.025.216.037.263.017.06.037.12.058.177.042.113.1.245.17.388.138.289.34.657.599 1.074a18.14 18.14 0 002.285 2.936C5.14 18.912 8.135 21 12 21c2.361 0 4.4-.78 6.08-1.86l3.64 3.64a.75.75 0 101.06-1.06L2.28 1.22zm10.88 13l-3.38-3.38c-.18.345-.28.738-.28 1.16a2.5 2.5 0 002.5 2.5c.422 0 .815-.1 1.16-.28zM8.688 9.75A3.976 3.976 0 008 12a4 4 0 004 4c.835 0 1.609-.25 2.251-.688l2.74 2.74c-1.43.863-3.1 1.448-4.991 1.448-3.295 0-5.925-1.78-7.769-3.701a16.641 16.641 0 01-2.093-2.688c-.236-.38-.41-.701-.523-.934a4.225 4.225 0 01-.08-.177 5.8 5.8 0 01.207-.426c.202-.38.51-.893.919-1.47.733-1.036 1.776-2.253 3.094-3.288l2.933 2.933zM12 4.5c-.813 0-1.583.108-2.31.299a.75.75 0 11-.38-1.451A10.568 10.568 0 0112 3c3.864 0 6.86 2.088 8.85 4.162 1.001 1.043 1.767 2.1 2.286 2.936.26.417.46.785.6 1.074.069.143.127.275.169.388.021.056.041.117.058.177.012.047.037.147.037.263 0 .171-.057.332-.08.396-.034.098-.08.208-.134.326-.109.236-.265.535-.465.874-.4.68-.99 1.551-1.759 2.455a.75.75 0 01-1.142-.973 16.232 16.232 0 001.608-2.242 8.709 8.709 0 00.438-.836 4.03 4.03 0 00-.081-.177 10.392 10.392 0 00-.523-.934 16.639 16.639 0 00-2.093-2.688C17.924 6.28 15.294 4.5 12 4.5zm10.516 7.365z"/></g></symbol><symbol id="flight-eye-off-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M2.28 1.22a.75.75 0 00-1.06 1.06l1.664 1.665A10.99 10.99 0 00.977 5.994c-.295.41-.524.791-.683 1.103a4.16 4.16 0 00-.194.431A1.4 1.4 0 000 8c0 .155.041.296.067.375a3 3 0 00.122.31c.097.215.234.471.407.751.346.56.854 1.246 1.516 1.914C3.43 12.68 5.422 14 8 14c1.49 0 2.786-.442 3.868-1.071l1.852 1.851a.75.75 0 101.06-1.06l-4.645-4.646a.383.383 0 00-.008-.007v-.001l-3.19-3.19a.555.555 0 00-.014-.014L2.28 1.22zm3.127 5.248L3.95 5.01a9.444 9.444 0 00-1.754 1.857 7.362 7.362 0 00-.566.911c-.046.09-.08.164-.104.221l.03.067c.065.145.17.344.316.58a9.45 9.45 0 001.306 1.647C4.332 11.458 5.964 12.5 8 12.5c1.028 0 1.95-.264 2.763-.677l-1.23-1.23C9.078 10.858 8.552 11 8 11a3 3 0 01-3-3c0-.553.142-1.079.407-1.532zm2.985 2.985L6.547 7.608A1.62 1.62 0 006.5 8 1.5 1.5 0 008 9.5c.137 0 .269-.016.392-.047zM8 3.5c-.306 0-.602.023-.887.067a.75.75 0 11-.226-1.483C7.247 2.029 7.617 2 8 2c2.578 0 4.57 1.32 5.888 2.65.662.668 1.17 1.354 1.516 1.914.173.28.31.536.407.75.048.107.09.212.122.31.026.08.067.221.067.376 0 .21-.079.42-.126.537a4.99 4.99 0 01-.251.524c-.21.384-.515.857-.909 1.355a.75.75 0 11-1.176-.93c.343-.434.6-.836.768-1.144.078-.143.133-.258.168-.342a5.336 5.336 0 00-.346-.648 9.452 9.452 0 00-1.306-1.646C11.668 4.542 10.036 3.5 8 3.5zm6.511 4.604l-.002-.008.001.005.001.003z"/></g></symbol><symbol id="flight-fast-forward-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M13.812 5.38C12.66 4.5 11 5.322 11 6.77v3.331L4.812 5.38C3.66 4.5 2 5.322 2 6.77v10.458c0 1.449 1.66 2.27 2.812 1.391L11 13.897v3.332c0 1.449 1.66 2.27 2.812 1.391l6.851-5.229a1.75 1.75 0 000-2.782l-6.851-5.23zM12.5 6.77a.25.25 0 01.402-.199l6.851 5.23a.25.25 0 010 .397l-6.851 5.229a.25.25 0 01-.402-.2V6.772zm-9 0a.25.25 0 01.402-.199l7.061 5.39v.077l-7.061 5.389a.25.25 0 01-.402-.2V6.772z" clip-rule="evenodd"/></symbol><symbol id="flight-fast-forward-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8.926 3.364A1.25 1.25 0 007 4.416v1.806L2.962 3.427A1.25 1.25 0 001 4.454v7.092a1.25 1.25 0 001.962 1.027L7 9.778v1.806a1.25 1.25 0 001.926 1.052L14.5 9.052a1.25 1.25 0 000-2.103L8.926 3.364zM13.363 8L8.5 11.126V4.874L13.363 8zM2.5 11.069V4.93L6.932 8 2.5 11.069z" clip-rule="evenodd"/></symbol><symbol id="flight-file-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V8.664c0-.464-.184-.909-.513-1.237l-5.914-5.914A1.75 1.75 0 0013.336 1H5.75zM4.5 3.75c0-.69.56-1.25 1.25-1.25H13v5.75c0 .414.336.75.75.75h5.75v11.25c0 .69-.56 1.25-1.25 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V3.75zM18.44 7.5L14.5 3.56V7.5h3.94z" clip-rule="evenodd"/></symbol><symbol id="flight-file-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3.25 0A2.25 2.25 0 001 2.25v11.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75V5.457c0-.331-.132-.65-.366-.884L10.427.366A1.25 1.25 0 009.543 0H3.25zM2.5 2.25a.75.75 0 01.75-.75H9v3.75c0 .414.336.75.75.75h3.75v7.75a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V2.25zm9.94 2.25L10.5 2.56V4.5h1.94z" clip-rule="evenodd"/></symbol><symbol id="flight-file-check-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25H11a.75.75 0 010 1.5H5.75A2.75 2.75 0 013 20.25V3.75A2.75 2.75 0 015.75 1h7.586c.464 0 .909.184 1.237.513l5.914 5.914c.329.328.513.773.513 1.237V13a.75.75 0 01-1.5 0V9h-5.75a.75.75 0 01-.75-.75V2.5H5.75zm8.75 1.06l3.94 3.94H14.5V3.56z"/><path d="M22 19a5 5 0 11-10 0 5 5 0 0110 0zm-1.879-2.03a.75.75 0 010 1.06l-3.5 3.5a.75.75 0 01-1.06 0l-1.591-1.59a.75.75 0 111.06-1.061l1.06 1.06 2.97-2.97a.75.75 0 011.061 0z"/></g></symbol><symbol id="flight-file-check-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M3.25 1.5a.75.75 0 00-.75.75v11.5c0 .414.336.75.75.75h4a.75.75 0 010 1.5h-4A2.25 2.25 0 011 13.75V2.25A2.25 2.25 0 013.25 0h6.293c.331 0 .65.132.884.366l4.207 4.207c.234.235.366.553.366.884V6.75a.75.75 0 01-1.5 0V6H9.75A.75.75 0 019 5.25V1.5H3.25zm7.25 1.06l1.94 1.94H10.5V2.56z"/><path d="M16 12a4 4 0 11-8 0 4 4 0 018 0zm-1.712-1.272a.75.75 0 01-.016 1.06l-2.406 2.334a.75.75 0 01-1.044 0l-1.094-1.06a.75.75 0 011.044-1.078l.572.555 1.884-1.827a.75.75 0 011.06.016z"/></g></symbol><symbol id="flight-file-change-24" viewBox="0 0 24 24"><g><path d="M8.458 15.328c.218-.26.487-.58.899-.745a1.12 1.12 0 01.778-.026c.324.1.766.356 1.313.95.667.726 1.325 1.17 1.979 1.37.667.204 1.27.135 1.774-.067a3.433 3.433 0 001.127-.768 5.357 5.357 0 00.41-.459l.02-.022.032-.04.012-.013a.75.75 0 10-1.104-1.016c-.05.054-.101.115-.156.18-.218.26-.487.58-.899.745a1.12 1.12 0 01-.778.026c-.324-.1-.766-.356-1.313-.95-.667-.726-1.325-1.17-1.979-1.37a2.619 2.619 0 00-1.774.067 3.433 3.433 0 00-1.127.768 5.4 5.4 0 00-.326.356l-.085.103-.018.022a4.557 4.557 0 01-.045.053.75.75 0 101.104 1.016c.05-.054.101-.115.156-.18z"/><path fill-rule="evenodd" d="M3 3.75A2.75 2.75 0 015.75 1h7.586c.464 0 .909.184 1.237.513l5.914 5.914c.329.328.513.773.513 1.237V20.25A2.75 2.75 0 0118.25 23H5.75A2.75 2.75 0 013 20.25V3.75zM5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V9h-5.75a.75.75 0 01-.75-.75V2.5H5.75zm8.75 1.06l3.94 3.94H14.5V3.56z" clip-rule="evenodd"/></g></symbol><symbol id="flight-file-change-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M3.25 0A2.25 2.25 0 001 2.25v11.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75V5.457c0-.331-.132-.65-.366-.884L10.427.366A1.25 1.25 0 009.543 0H3.25zM2.5 2.25a.75.75 0 01.75-.75H9v3.75c0 .414.336.75.75.75h3.75v7.75a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V2.25zm9.94 2.25L10.5 2.56V4.5h1.94zM9.583 9.156z" clip-rule="evenodd"/><path d="M5.5 8.595C5.77 8.325 6.23 8 6.876 8c.904 0 1.44.71 1.7 1.017.37.443.464.483.55.483.194 0 .375-.18.458-.344a.75.75 0 011.338.68 2.222 2.222 0 01-.422.57c-.27.269-.73.594-1.374.594-.904 0-1.44-.71-1.7-1.017-.37-.443-.465-.483-.55-.483-.2 0-.367.181-.458.344a.75.75 0 01-1.338-.68c.107-.212.254-.402.422-.57z"/></g></symbol><symbol id="flight-file-diff-24" viewBox="0 0 24 24"><g><path d="M12.5 10.25a.75.75 0 00-1.5 0v2.25H8.75a.75.75 0 000 1.5H11v2.25a.75.75 0 001.5 0V14h2.25a.75.75 0 000-1.5H12.5v-2.25zM8.75 18a.75.75 0 000 1.5h6a.75.75 0 000-1.5h-6z"/><path fill-rule="evenodd" d="M3 3.75A2.75 2.75 0 015.75 1h7.586c.464 0 .909.184 1.237.513l5.914 5.914c.329.328.513.773.513 1.237V20.25A2.75 2.75 0 0118.25 23H5.75A2.75 2.75 0 013 20.25V3.75zM5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V9h-5.75a.75.75 0 01-.75-.75V2.5H5.75zm8.75 1.06l3.94 3.94H14.5V3.56z" clip-rule="evenodd"/></g></symbol><symbol id="flight-file-diff-16" viewBox="0 0 16 16"><g><path d="M8.5 6.25a.75.75 0 00-1.5 0V7.5H5.75a.75.75 0 000 1.5H7v1.25a.75.75 0 001.5 0V9h1.25a.75.75 0 000-1.5H8.5V6.25zM5.75 11.5a.75.75 0 000 1.5h4a.75.75 0 000-1.5h-4z"/><path fill-rule="evenodd" d="M1 2.25A2.25 2.25 0 013.25 0h6.293c.331 0 .65.132.884.366l4.207 4.207c.234.235.366.553.366.884v8.293A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V2.25zm2.25-.75a.75.75 0 00-.75.75v11.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V6H9.75A.75.75 0 019 5.25V1.5H3.25zm7.25 1.06l1.94 1.94H10.5V2.56z" clip-rule="evenodd"/></g></symbol><symbol id="flight-file-minus-24" viewBox="0 0 24 24"><g><path d="M8.75 14a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5z"/><path fill-rule="evenodd" d="M3 3.75A2.75 2.75 0 015.75 1h7.586c.464 0 .909.184 1.237.513l5.914 5.914c.329.328.513.773.513 1.237V20.25A2.75 2.75 0 0118.25 23H5.75A2.75 2.75 0 013 20.25V3.75zM5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V9h-5.75a.75.75 0 01-.75-.75V2.5H5.75zm8.75 1.06l3.94 3.94H14.5V3.56z" clip-rule="evenodd"/></g></symbol><symbol id="flight-file-minus-16" viewBox="0 0 16 16"><g><path d="M5.75 9a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5z"/><path fill-rule="evenodd" d="M1 2.25A2.25 2.25 0 013.25 0h6.293c.331 0 .65.132.884.366l4.207 4.207c.234.235.366.553.366.884v8.293A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V2.25zm2.25-.75a.75.75 0 00-.75.75v11.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V6H9.75A.75.75 0 019 5.25V1.5H3.25zm7.25 1.06l1.94 1.94H10.5V2.56z" clip-rule="evenodd"/></g></symbol><symbol id="flight-file-plus-24" viewBox="0 0 24 24"><g><path d="M11.75 10.75a.75.75 0 01.75.75V14H15a.75.75 0 010 1.5h-2.5V18a.75.75 0 01-1.5 0v-2.5H8.5a.75.75 0 010-1.5H11v-2.5a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V8.664c0-.464-.184-.909-.513-1.237l-5.914-5.914A1.75 1.75 0 0013.336 1H5.75zM4.5 3.75c0-.69.56-1.25 1.25-1.25H13v5.75c0 .414.336.75.75.75h5.75v11.25c0 .69-.56 1.25-1.25 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V3.75zM18.44 7.5L14.5 3.56V7.5h3.94z" clip-rule="evenodd"/></g></symbol><symbol id="flight-file-plus-16" viewBox="0 0 16 16"><g><path d="M7.75 7a.75.75 0 01.75.75V9h1.25a.75.75 0 010 1.5H8.5v1.25a.75.75 0 01-1.5 0V10.5H5.75a.75.75 0 010-1.5H7V7.75A.75.75 0 017.75 7z"/><path fill-rule="evenodd" d="M3.25 0A2.25 2.25 0 001 2.25v11.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75V5.457c0-.331-.132-.65-.366-.884L10.427.366A1.25 1.25 0 009.543 0H3.25zM2.5 2.25a.75.75 0 01.75-.75H9v3.75c0 .414.336.75.75.75h3.75v7.75a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V2.25zm9.94 2.25L10.5 2.56V4.5h1.94z" clip-rule="evenodd"/></g></symbol><symbol id="flight-file-source-24" viewBox="0 0 24 24"><g><path d="M13.15 12.3a.75.75 0 011.05-.15l3 2.25a.75.75 0 010 1.2l-3 2.25a.75.75 0 11-.9-1.2L15.5 15l-2.2-1.65a.75.75 0 01-.15-1.05zM10.7 13.35a.75.75 0 10-.9-1.2l-3 2.25a.75.75 0 000 1.2l3 2.25a.75.75 0 10.9-1.2L8.5 15l2.2-1.65z"/><path fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V8.664c0-.464-.184-.909-.513-1.237l-5.914-5.914A1.75 1.75 0 0013.336 1H5.75zM4.5 3.75c0-.69.56-1.25 1.25-1.25H13v5.75c0 .414.336.75.75.75h5.75v11.25c0 .69-.56 1.25-1.25 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V3.75zM18.44 7.5L14.5 3.56V7.5h3.94z" clip-rule="evenodd"/></g></symbol><symbol id="flight-file-source-16" viewBox="0 0 16 16"><g><path d="M7.22 7.838a.625.625 0 01-.058.882L5.699 10l1.463 1.28a.625.625 0 01-.824.94l-2-1.75a.625.625 0 010-.94l2-1.75a.625.625 0 01.882.058zM8.838 8.72a.625.625 0 01.824-.94l2 1.75a.625.625 0 010 .94l-2 1.75a.625.625 0 01-.824-.94L10.301 10 8.838 8.72z"/><path fill-rule="evenodd" d="M3.25 0A2.25 2.25 0 001 2.25v11.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75V5.457c0-.331-.132-.65-.366-.884L10.427.366A1.25 1.25 0 009.543 0H3.25zM2.5 2.25a.75.75 0 01.75-.75H9v3.75c0 .414.336.75.75.75h3.75v7.75a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V2.25zm9.94 2.25L10.5 2.56V4.5h1.94z" clip-rule="evenodd"/></g></symbol><symbol id="flight-file-text-24" viewBox="0 0 24 24"><g><path d="M7.75 12a.75.75 0 000 1.5h8a.75.75 0 000-1.5h-8zM7 16.75a.75.75 0 01.75-.75h6a.75.75 0 010 1.5h-6a.75.75 0 01-.75-.75zM7.75 8a.75.75 0 000 1.5h2a.75.75 0 000-1.5h-2z"/><path fill-rule="evenodd" d="M3 3.75A2.75 2.75 0 015.75 1h7.586c.464 0 .909.184 1.237.513l5.914 5.914c.329.328.513.773.513 1.237V20.25A2.75 2.75 0 0118.25 23H5.75A2.75 2.75 0 013 20.25V3.75zM5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V9h-5.75a.75.75 0 01-.75-.75V2.5H5.75zm8.75 1.06l3.94 3.94H14.5V3.56z" clip-rule="evenodd"/></g></symbol><symbol id="flight-file-text-16" viewBox="0 0 16 16"><g><path d="M4.75 8a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5zM4 11.75a.75.75 0 01.75-.75h3.5a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75zM4.75 5a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5z"/><path fill-rule="evenodd" d="M1 2.25A2.25 2.25 0 013.25 0h6.293c.331 0 .65.132.884.366l4.207 4.207c.234.235.366.553.366.884v8.293A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V2.25zm2.25-.75a.75.75 0 00-.75.75v11.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V6H9.75A.75.75 0 019 5.25V1.5H3.25zm7.25 1.06l1.94 1.94H10.5V2.56z" clip-rule="evenodd"/></g></symbol><symbol id="flight-file-x-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h4.5a.75.75 0 010 1.5h-4.5A2.75 2.75 0 013 20.25V3.75A2.75 2.75 0 015.75 1h7.586c.464 0 .909.184 1.237.513l5.914 5.914c.329.328.513.773.513 1.237v3.586a.75.75 0 01-1.5 0V9h-5.75a.75.75 0 01-.75-.75V2.5H5.75zm8.75 1.06l3.94 3.94H14.5V3.56z"/><path d="M14 14a2 2 0 00-2 2v6a2 2 0 002 2h6a2 2 0 002-2v-6a2 2 0 00-2-2h-6zm5.78 3.28a.75.75 0 10-1.06-1.06L17 17.94l-1.72-1.72a.75.75 0 10-1.06 1.06L15.94 19l-1.72 1.72a.75.75 0 101.06 1.06L17 20.06l1.72 1.72a.75.75 0 101.06-1.06L18.06 19l1.72-1.72z"/></g></symbol><symbol id="flight-file-x-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M3.25 1.5a.75.75 0 00-.75.75v11.5c0 .414.336.75.75.75h4.5a.75.75 0 010 1.5h-4.5A2.25 2.25 0 011 13.75V2.25A2.25 2.25 0 013.25 0h6.293c.331 0 .65.132.884.366l4.207 4.207c.234.235.366.553.366.884V7.5a.75.75 0 01-1.5 0V6H9.75A.75.75 0 019 5.25V1.5H3.25zm7.25 1.06l1.94 1.94H10.5V2.56z"/><path d="M11 9a2 2 0 00-2 2v3a2 2 0 002 2h3a2 2 0 002-2v-3a2 2 0 00-2-2h-3zm.53 5.53l.97-.97.97.97a.75.75 0 101.06-1.06l-.97-.97.97-.97a.75.75 0 10-1.06-1.06l-.97.97-.97-.97a.75.75 0 10-1.06 1.06l.97.97-.97.97a.75.75 0 101.06 1.06z"/></g></symbol><symbol id="flight-files-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M5.25 1A2.25 2.25 0 003 3.25v11.5A2.25 2.25 0 005.25 17H6v.75A2.25 2.25 0 008.25 20H9v.75A2.25 2.25 0 0011.25 23h8.5A2.25 2.25 0 0022 20.75v-7.879a2.25 2.25 0 00-.659-1.59l-2.31-2.311a.746.746 0 00-.312-.187 2.25 2.25 0 00-.378-.503l-2.31-2.31a.746.746 0 00-.312-.187 2.25 2.25 0 00-.378-.503L11.72 1.66A2.25 2.25 0 0010.129 1H5.25zM4.5 3.25a.75.75 0 01.75-.75H10v3.75c0 .414.336.75.75.75h3.75v7.75a.75.75 0 01-.75.75h-8.5a.75.75 0 01-.75-.75V3.25zm8.94 2.25L11.5 3.56V5.5h1.94zM19 11.06v6.69A2.25 2.25 0 0116.75 20H10.5v.75c0 .414.336.75.75.75h8.5a.75.75 0 00.75-.75v-7.879a.75.75 0 00-.22-.53L19 11.061zM7.5 17.75V17h6.25A2.25 2.25 0 0016 14.75V8.06l1.28 1.281c.141.14.22.331.22.53v7.879a.75.75 0 01-.75.75h-8.5a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-files-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M1 2.25A2.25 2.25 0 013.25 0h4.793c.331 0 .65.132.884.366l3.207 3.207c.076.076.141.161.195.253a.75.75 0 01.201.144l2.104 2.103c.234.235.366.553.366.884v6.793A2.25 2.25 0 0112.75 16h-7a2.25 2.25 0 01-2.25-2.25v-.25h-.25A2.25 2.25 0 011 11.25v-9zm2.25-.75a.75.75 0 00-.75.75v9c0 .414.336.75.75.75h7a.75.75 0 00.75-.75V6H7.75A.75.75 0 017 5.25V1.5H3.25zm5.25.56V4.5h2.44L8.5 2.06zm4 9.19V6.06l1 1v6.69a.75.75 0 01-.75.75h-7a.75.75 0 01-.75-.75v-.25h5.25a2.25 2.25 0 002.25-2.25z" clip-rule="evenodd"/></symbol><symbol id="flight-film-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M3.75 1A2.75 2.75 0 001 3.75v16.5A2.75 2.75 0 003.75 23h16.5A2.75 2.75 0 0023 20.25V3.75A2.75 2.75 0 0020.25 1H3.75zM21.5 6V3.75c0-.69-.56-1.25-1.25-1.25H18V6h3.5zM18 7.5h3.5V11H18V7.5zm-1.5-5h-9V11h9V2.5zm5 10V16H18v-3.5h3.5zm0 5H18v4h2.25c.69 0 1.25-.56 1.25-1.25V17.5zm-5-5v9h-9v-9h9zm-14 5v2.75c0 .69.56 1.25 1.25 1.25H6v-4H2.5zM6 16H2.5v-3.5H6V16zm-3.5-5V7.5H6V11H2.5zm0-5H6V2.5H3.75c-.69 0-1.25.56-1.25 1.25V6z" clip-rule="evenodd"/></symbol><symbol id="flight-film-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M2.25 0A2.25 2.25 0 000 2.25v11.5A2.25 2.25 0 002.25 16h11.5A2.25 2.25 0 0016 13.75V2.25A2.25 2.25 0 0013.75 0H2.25zM14.5 3.5V2.25a.75.75 0 00-.75-.75H12.5v2h2zm-2 1.5h2v2h-2V5zM11 1.5H5V7h6V1.5zm3.5 7v2h-2v-2h2zm0 3.5h-2v2.5h1.25a.75.75 0 00.75-.75V12zM11 8.5v6H5v-6h6zM1.5 12v1.75c0 .414.336.75.75.75H3.5V12h-2zm2-1.5h-2v-2h2v2zM1.5 7V5h2v2h-2zm0-3.5h2v-2H2.25a.75.75 0 00-.75.75V3.5z" clip-rule="evenodd"/></symbol><symbol id="flight-filter-24" viewBox="0 0 24 24"><g><path d="M3 6.75A.75.75 0 013.75 6h16.5a.75.75 0 010 1.5H3.75A.75.75 0 013 6.75zM6 11.75a.75.75 0 01.75-.75h10.5a.75.75 0 010 1.5H6.75a.75.75 0 01-.75-.75zM9.75 16a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5z"/></g></symbol><symbol id="flight-filter-16" viewBox="0 0 16 16"><g><path d="M1 3.75A.75.75 0 011.75 3h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 3.75zM3.5 7.75A.75.75 0 014.25 7h7.5a.75.75 0 010 1.5h-7.5a.75.75 0 01-.75-.75zM6.75 11a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5z"/></g></symbol><symbol id="flight-filter-circle-24" viewBox="0 0 24 24"><g><path d="M8.25 12a.75.75 0 000 1.5h7.5a.75.75 0 000-1.5h-7.5zM5 8.75A.75.75 0 015.75 8h12.5a.75.75 0 010 1.5H5.75A.75.75 0 015 8.75zM10.75 16a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5z"/><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-filter-circle-16" viewBox="0 0 16 16"><g><path d="M5.75 7.5a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5zM3.5 5.75A.75.75 0 014.25 5h7.5a.75.75 0 010 1.5h-7.5a.75.75 0 01-.75-.75zM7 10a.75.75 0 000 1.5h2A.75.75 0 009 10H7z"/><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-filter-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM5 8.75A.75.75 0 015.75 8h12.5a.75.75 0 010 1.5H5.75A.75.75 0 015 8.75zm2.5 4a.75.75 0 01.75-.75h7.5a.75.75 0 010 1.5h-7.5a.75.75 0 01-.75-.75zm2.5 4a.75.75 0 01.75-.75h2.5a.75.75 0 010 1.5h-2.5a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-filter-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM4.25 5a.75.75 0 000 1.5h7.5a.75.75 0 000-1.5h-7.5zm1.5 2.5a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5zm.5 3.25A.75.75 0 017 10h2a.75.75 0 010 1.5H7a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-fingerprint-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M14.802 1.26c-3.792-.863-7.57.48-9.995 3.177A.75.75 0 105.923 5.44a8.841 8.841 0 018.546-2.718A8.8 8.8 0 0119.09 5.44a.75.75 0 001.118-1 10.3 10.3 0 00-5.407-3.18zM4.737 7.118a.75.75 0 00-1.318-.716 10.352 10.352 0 00-.998 2.65c-.466 2.05-.897 3.074-1.327 3.848a.75.75 0 101.312.728c.516-.929.99-2.095 1.478-4.244.185-.812.475-1.57.853-2.266zm16.857-.717a.75.75 0 00-1.317.718 8.807 8.807 0 01.855 6.187c-.385 1.694-.828 3.262-1.374 4.76a.75.75 0 001.409.514c.572-1.57 1.032-3.2 1.428-4.941.58-2.555.16-5.105-1-7.238zm-7.99.185a4.85 4.85 0 00-5.805 3.654 27.905 27.905 0 01-.82 2.94.75.75 0 101.418.49 29.39 29.39 0 00.865-3.097 3.35 3.35 0 016.426-.373.75.75 0 001.414-.502 4.847 4.847 0 00-3.498-3.112zm3.654 5.805a.75.75 0 10-1.463-.333c-.698 3.071-1.55 5.48-2.815 7.756-.383.69-.798 1.356-1.245 2.012a.75.75 0 001.239.845c.47-.69.91-1.394 1.318-2.13 1.35-2.43 2.245-4.98 2.966-8.15zm-10.135 4.17a.75.75 0 00-1.311-.73c-.488.88-1.082 1.754-1.874 2.767a.75.75 0 001.182.924c.826-1.057 1.468-1.997 2.003-2.962zm5.238-12.12a.75.75 0 01-.644.844 6.086 6.086 0 00-5.12 4.682c-.558 2.451-1.143 3.968-1.863 5.266a17.572 17.572 0 01-1.165 1.808.75.75 0 01-1.214-.882c.437-.601.778-1.134 1.067-1.655.635-1.142 1.177-2.517 1.712-4.87A7.586 7.586 0 0111.517 3.8a.75.75 0 01.844.643zm.951.045a.75.75 0 01.898-.565 7.583 7.583 0 015.713 9.076 44.944 44.944 0 01-.677 2.629.75.75 0 11-1.44-.42c.236-.81.453-1.654.654-2.542a6.083 6.083 0 00-4.583-7.28.75.75 0 01-.565-.898zm4.562 12.964a.75.75 0 01.426.972 28.137 28.137 0 01-1.619 3.447.75.75 0 01-1.311-.728 26.645 26.645 0 001.533-3.265.75.75 0 01.971-.426zm-4.876-8.198a2.115 2.115 0 00-1.88.485.75.75 0 10.999 1.12.615.615 0 011.013.595c-.446 1.962-.946 3.58-1.564 5.037a.75.75 0 001.38.586c.663-1.56 1.187-3.267 1.647-5.29a2.117 2.117 0 00-1.595-2.533zm-1.496 3.63a.75.75 0 00-1.447-.4c-.517 1.876-1.107 3.333-1.853 4.677-.563 1.013-1.231 1.993-2.066 3.066a.75.75 0 001.184.921c.868-1.117 1.584-2.162 2.193-3.259.813-1.463 1.444-3.033 1.989-5.005zm.4 6.333a.75.75 0 00-1.311-.729 25.143 25.143 0 01-1.871 2.858.75.75 0 001.201.898 26.641 26.641 0 001.981-3.027z" clip-rule="evenodd"/></symbol><symbol id="flight-fingerprint-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4.925.827A7.583 7.583 0 0115.66 9.316a.75.75 0 11-1.463-.333 6.083 6.083 0 00-8.61-6.81.75.75 0 01-.662-1.346zM3.278 2.903a.75.75 0 01.143 1.05 6.058 6.058 0 00-1.087 2.332 26.684 26.684 0 01-.811 2.9.75.75 0 11-1.416-.495c.262-.747.514-1.634.765-2.737a7.558 7.558 0 011.355-2.907.75.75 0 011.05-.143zm.259 3.656a4.85 4.85 0 019.176-.859.75.75 0 01-1.375.6A3.35 3.35 0 005 6.891c-.174.766-.354 1.46-.543 2.098a.75.75 0 01-1.438-.426c.179-.603.35-1.265.519-2.005zm3.548-.682a2.117 2.117 0 013.244 2.226 38.526 38.526 0 01-.684 2.614.75.75 0 11-1.436-.434c.235-.777.452-1.608.658-2.512a.617.617 0 00-.945-.649.75.75 0 01-.837-1.245zm5.345 1.935a.75.75 0 01.565.897c-.57 2.505-1.25 4.627-2.178 6.609a.75.75 0 01-1.358-.636c.871-1.86 1.52-3.874 2.073-6.305a.75.75 0 01.898-.565zm-5.768.673a.75.75 0 01.518.926c-.531 1.874-1.146 3.384-1.93 4.794-.057.103-.115.205-.174.307a.75.75 0 01-1.298-.75c.054-.095.108-.19.16-.285.72-1.296 1.295-2.696 1.798-4.475a.75.75 0 01.926-.517zm-3.487 1.998a.75.75 0 01.384.988c-.218.497-.45.96-.698 1.407a.75.75 0 01-1.311-.728c.226-.407.437-.83.637-1.283a.75.75 0 01.988-.385zm11.361.295a.75.75 0 01.516.927 34.364 34.364 0 01-.833 2.556.75.75 0 11-1.406-.522c.291-.785.554-1.596.796-2.445a.75.75 0 01.927-.516zm-6.21 1.53c.381.16.561.6.401.982a22.529 22.529 0 01-1.088 2.243.75.75 0 11-1.31-.729 21.03 21.03 0 001.015-2.094.75.75 0 01.981-.402z" clip-rule="evenodd"/></symbol><symbol id="flight-flag-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M7.875 1c-1.632 0-2.76.273-3.502.572-.371.149-.643.303-.83.429a2.719 2.719 0 00-.22.162l-.104.094A.75.75 0 003 2.786V22.25a.75.75 0 001.5 0V15.6c.104-.06.246-.133.432-.208.546-.219 1.481-.463 2.943-.463 1.382 0 2.543.458 3.845.981l.044.018c1.264.508 2.669 1.072 4.361 1.072 1.632 0 2.76-.273 3.502-.572.371-.149.643-.303.83-.429 0 0 .184-.115.325-.256a.75.75 0 00.218-.529V2.786a.75.75 0 00-1.27-.541l-.008.007a1.23 1.23 0 01-.099.072 3.038 3.038 0 01-.555.284c-.546.219-1.481.463-2.943.463-1.382 0-2.543-.458-3.845-.981l-.044-.018C10.972 1.564 9.567 1 7.875 1zM4.5 13.951V3.171c.104-.06.246-.133.432-.207.546-.22 1.481-.464 2.943-.464 1.382 0 2.543.458 3.845.982l.044.017c1.264.508 2.669 1.072 4.361 1.072 1.541 0 2.633-.244 3.375-.522v10.78c-.104.06-.246.133-.432.207-.546.22-1.481.464-2.943.464-1.382 0-2.543-.458-3.845-.982l-.044-.017c-1.264-.508-2.669-1.072-4.361-1.072-1.541 0-2.633.243-3.375.522z" clip-rule="evenodd"/></symbol><symbol id="flight-flag-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M5.375 1c-1.072 0-1.827.185-2.337.396a3.125 3.125 0 00-.58.309 2.006 2.006 0 00-.233.188l-.007.007-.004.004-.002.002s.898.871-.001.001A.75.75 0 002 2.43V14.25a.75.75 0 001.5 0v-3.275c.033-.016.07-.033.11-.05.31-.128.868-.282 1.765-.282.815 0 1.503.276 2.338.621l.043.018c.796.33 1.735.718 2.869.718 1.072 0 1.827-.185 2.337-.396a3.13 3.13 0 00.58-.309 2.03 2.03 0 00.214-.17l.01-.009.009-.009.008-.007.003-.004.002-.002s-.899-.872.001-.001A.75.75 0 0014 10.57V2.43a.75.75 0 00-1.27-.54 1.642 1.642 0 01-.34.186c-.31.128-.868.282-1.765.282-.815 0-1.503-.276-2.338-.621l-.043-.018C7.448 1.388 6.51 1 5.375 1zM3.5 9.379V2.832c.033-.016.07-.033.11-.05.31-.128.868-.282 1.765-.282.815 0 1.503.276 2.338.622l.043.017c.796.33 1.735.718 2.869.718.786 0 1.401-.1 1.875-.236v6.547a2.27 2.27 0 01-.11.05c-.31.128-.868.282-1.765.282-.815 0-1.503-.276-2.338-.622l-.043-.017c-.796-.33-1.735-.718-2.869-.718-.786 0-1.401.1-1.875.236z" clip-rule="evenodd"/></symbol><symbol id="flight-folder-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M3.75 2A2.75 2.75 0 001 4.75v14.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V6.75A2.75 2.75 0 0020.25 4h-7.172a1.25 1.25 0 01-.883-.366l-.829-.829A2.75 2.75 0 009.422 2H3.75zM2.5 4.75c0-.69.56-1.25 1.25-1.25h5.672c.331 0 .649.132.883.366l.829.829a2.75 2.75 0 001.944.805h7.172c.69 0 1.25.56 1.25 1.25v12.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V8.5h16.75a.75.75 0 000-1.5H2.5V4.75z" clip-rule="evenodd"/></symbol><symbol id="flight-folder-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-7.5A2.25 2.25 0 0013.75 3H9.871a.75.75 0 01-.53-.22L8.22 1.66A2.25 2.25 0 006.629 1H2.25zM1.5 3.25a.75.75 0 01.75-.75h4.379a.75.75 0 01.53.22L8.28 3.84a2.25 2.25 0 001.591.659h3.879a.75.75 0 01.75.75v7.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75V7h10.75a.75.75 0 000-1.5H1.5V3.25z" clip-rule="evenodd"/></symbol><symbol id="flight-folder-fill-24" viewBox="0 0 24 24"><path d="M3.75 2A2.75 2.75 0 001 4.75v1c0 .414.336.75.75.75h18.5a.75.75 0 010 1.5H1.75a.75.75 0 00-.75.75v10.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V6.75A2.75 2.75 0 0020.25 4h-7.172a1.25 1.25 0 01-.883-.366l-.829-.829A2.75 2.75 0 009.422 2H3.75z"/></symbol><symbol id="flight-folder-fill-16" viewBox="0 0 16 16"><path d="M2.25 1A2.25 2.25 0 000 3.25v1c0 .414.336.75.75.75h12.5a.75.75 0 010 1.5H.75a.75.75 0 00-.75.75v5.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-7.5A2.25 2.25 0 0013.75 3H9.871a.75.75 0 01-.53-.22L8.22 1.66A2.25 2.25 0 006.629 1H2.25z"/></symbol><symbol id="flight-folder-minus-24" viewBox="0 0 24 24"><g><path d="M8.75 13a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5z"/><path fill-rule="evenodd" d="M1 4.75A2.75 2.75 0 013.75 2h5.672c.729 0 1.428.29 1.944.805l.829.829c.234.234.552.366.883.366h7.172A2.75 2.75 0 0123 6.75v12.5A2.75 2.75 0 0120.25 22H3.75A2.75 2.75 0 011 19.25V4.75zM3.75 3.5c-.69 0-1.25.56-1.25 1.25V7h16.75a.75.75 0 010 1.5H2.5v10.75c0 .69.56 1.25 1.25 1.25h16.5c.69 0 1.25-.56 1.25-1.25V6.75c0-.69-.56-1.25-1.25-1.25h-7.172a2.75 2.75 0 01-1.944-.805l-.829-.829a1.25 1.25 0 00-.883-.366H3.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-folder-minus-16" viewBox="0 0 16 16"><g><path d="M5.75 7.5a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5z"/><path fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-7.5A2.25 2.25 0 0013.75 3H9.871a.75.75 0 01-.53-.22L8.22 1.66A2.25 2.25 0 006.629 1H2.25zM1.5 3.25a.75.75 0 01.75-.75h4.379a.75.75 0 01.53.22L8.28 3.84a2.25 2.25 0 001.591.659h3.879a.75.75 0 01.75.75v7.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75v-9.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-folder-minus-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M3.75 2A2.75 2.75 0 001 4.75v1c0 .414.336.75.75.75h18.5a.75.75 0 010 1.5H1.75a.75.75 0 00-.75.75v10.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V6.75A2.75 2.75 0 0020.25 4h-7.172a1.25 1.25 0 01-.883-.366l-.829-.829A2.75 2.75 0 009.422 2H3.75zM8 13.75a.75.75 0 01.75-.75h6.5a.75.75 0 010 1.5h-6.5a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-folder-minus-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-7.5A2.25 2.25 0 0013.75 3H9.871a.75.75 0 01-.53-.22L8.22 1.66A2.25 2.25 0 006.629 1H2.25zM5 8.253a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5h-4.5a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-folder-plus-24" viewBox="0 0 24 24"><g><path d="M11.75 10.5a.75.75 0 01.75.75v2.25h2.25a.75.75 0 010 1.5H12.5v2.25a.75.75 0 01-1.5 0V15H8.75a.75.75 0 010-1.5H11v-2.25a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M3.75 2A2.75 2.75 0 001 4.75v14.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V6.75A2.75 2.75 0 0020.25 4h-7.172a1.25 1.25 0 01-.883-.366l-.829-.829A2.75 2.75 0 009.422 2H3.75zM2.5 4.75c0-.69.56-1.25 1.25-1.25h5.672c.331 0 .649.132.883.366l.829.829a2.75 2.75 0 001.944.805h7.172c.69 0 1.25.56 1.25 1.25v12.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V8.5h16.75a.75.75 0 000-1.5H2.5V4.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-folder-plus-16" viewBox="0 0 16 16"><g><path d="M7.75 6a.75.75 0 01.75.75V8h1.25a.75.75 0 010 1.5H8.5v1.25a.75.75 0 01-1.5 0V9.5H5.75a.75.75 0 010-1.5H7V6.75A.75.75 0 017.75 6z"/><path fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h4.379a2.25 2.25 0 011.59.659L9.342 2.78c.14.141.331.22.53.22h3.879A2.25 2.25 0 0116 5.25v7.5A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75v-7.5a.75.75 0 00-.75-.75H9.871a2.25 2.25 0 01-1.59-.659L7.158 2.72a.75.75 0 00-.53-.22H2.25z" clip-rule="evenodd"/></g></symbol><symbol id="flight-folder-plus-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M1 4.75A2.75 2.75 0 013.75 2h5.672c.729 0 1.428.29 1.944.805l.829.829c.234.234.552.366.883.366h7.172A2.75 2.75 0 0123 6.75v12.5A2.75 2.75 0 0120.25 22H3.75A2.75 2.75 0 011 19.25V8.75A.75.75 0 011.75 8h18.5a.75.75 0 000-1.5H1.75A.75.75 0 011 5.75v-1zm10.75 5.75a.75.75 0 01.75.75v2.25h2.25a.75.75 0 010 1.5H12.5v2.25a.75.75 0 01-1.5 0V15H8.75a.75.75 0 010-1.5H11v-2.25a.75.75 0 01.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-folder-plus-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h4.379a2.25 2.25 0 011.59.659L9.342 2.78c.14.141.331.22.53.22h3.879A2.25 2.25 0 0116 5.25v7.5A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75v-9.5zM7.75 6a.75.75 0 01.75.75V8h1.25a.75.75 0 010 1.5H8.5v1.25a.75.75 0 01-1.5 0V9.5H5.75a.75.75 0 010-1.5H7V6.75A.75.75 0 017.75 6z" clip-rule="evenodd"/></symbol><symbol id="flight-folder-star-24" viewBox="0 0 24 24"><g><path d="M3.75 3.5c-.69 0-1.25.56-1.25 1.25V7h16.75a.75.75 0 010 1.5H2.5v10.75c0 .69.56 1.25 1.25 1.25h6.75a.75.75 0 010 1.5H3.75A2.75 2.75 0 011 19.25V4.75A2.75 2.75 0 013.75 2h5.672c.729 0 1.428.29 1.944.805l.829.829c.234.234.552.366.883.366h7.172A2.75 2.75 0 0123 6.75v5.5a.75.75 0 01-1.5 0v-5.5c0-.69-.56-1.25-1.25-1.25h-7.172a2.75 2.75 0 01-1.944-.805l-.829-.829a1.25 1.25 0 00-.883-.366H3.75z"/><path fill-rule="evenodd" d="M17.674 10.42a.75.75 0 00-1.348 0l-1.68 3.43-3.755.554a.75.75 0 00-.416 1.277l2.72 2.67-.642 3.773a.75.75 0 001.09.789L17 21.133l3.357 1.78a.75.75 0 001.09-.789l-.642-3.773 2.72-2.67a.75.75 0 00-.416-1.277l-3.755-.553-1.68-3.43zm-1.854 4.445l1.18-2.41 1.18 2.41a.75.75 0 00.565.412l2.652.39-1.922 1.888a.75.75 0 00-.214.661l.452 2.658-2.362-1.252a.75.75 0 00-.702 0l-2.362 1.252.452-2.658a.75.75 0 00-.214-.661l-1.922-1.887 2.652-.391a.75.75 0 00.565-.412z" clip-rule="evenodd"/></g></symbol><symbol id="flight-folder-star-16" viewBox="0 0 16 16"><g><path d="M1.5 3.25a.75.75 0 01.75-.75h4.379a.75.75 0 01.53.22L8.28 3.84a2.25 2.25 0 001.591.659h3.879a.75.75 0 01.75.75V6.5a.75.75 0 101.5 0V5.25A2.25 2.25 0 0013.75 3H9.871a.75.75 0 01-.53-.22L8.22 1.66A2.25 2.25 0 006.629 1H2.25A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h2.5a.75.75 0 000-1.5h-2.5a.75.75 0 01-.75-.75v-9.5z"/><path fill-rule="evenodd" d="M11.179 5.431a.75.75 0 00-1.358 0L8.523 8.196l-2.887.444a.75.75 0 00-.409 1.279l2.201 2.142-.66 3.029a.75.75 0 001.089.82l2.643-1.43 2.643 1.43a.75.75 0 001.09-.82l-.661-3.03 2.201-2.141a.75.75 0 00-.41-1.28l-2.886-.443-1.298-2.765zM9.71 9.195l.789-1.68.789 1.68a.75.75 0 00.565.423l1.794.276-1.421 1.382a.75.75 0 00-.21.697l.402 1.839-1.562-.845a.75.75 0 00-.714 0l-1.562.845.402-1.838a.75.75 0 00-.21-.698l-1.42-1.382 1.793-.276a.75.75 0 00.565-.423z" clip-rule="evenodd"/></g></symbol><symbol id="flight-folder-users-24" viewBox="0 0 24 24"><g><path d="M2.5 4.75c0-.69.56-1.25 1.25-1.25h5.672c.331 0 .649.132.883.366l.829.829a2.75 2.75 0 001.944.805h7.172c.69 0 1.25.56 1.25 1.25v9a.75.75 0 001.5 0v-9A2.75 2.75 0 0020.25 4h-7.172a1.25 1.25 0 01-.883-.366l-.829-.829A2.75 2.75 0 009.422 2H3.75A2.75 2.75 0 001 4.75v14.5A2.75 2.75 0 003.75 22h1.5a.75.75 0 000-1.5h-1.5c-.69 0-1.25-.56-1.25-1.25V8.5h16.75a.75.75 0 000-1.5H2.5V4.75z"/><path d="M8.318 17.928A2.783 2.783 0 0110.375 17h4.25c.786 0 1.524.344 2.057.928.53.583.818 1.359.818 2.155v1.167a.75.75 0 11-1.5 0v-1.167c0-.441-.16-.852-.427-1.145a1.284 1.284 0 00-.948-.438h-4.25c-.34 0-.684.148-.948.438A1.705 1.705 0 009 20.083v1.167a.75.75 0 11-1.5 0v-1.167c0-.796.287-1.572.818-2.155z"/><path fill-rule="evenodd" d="M12.5 10a3 3 0 100 6 3 3 0 000-6zM11 13a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/><path d="M18.275 17.559a.75.75 0 01.916-.534 3.08 3.08 0 011.667 1.12c.417.549.642 1.221.642 1.912v1.193a.75.75 0 11-1.5 0v-1.192c0-.367-.12-.72-.337-1.007a1.58 1.58 0 00-.854-.576.75.75 0 01-.534-.916zM17.186 10.023a.75.75 0 00-.372 1.454A1.578 1.578 0 0118 13a1.57 1.57 0 01-1.186 1.523.75.75 0 10.372 1.454A3.078 3.078 0 0019.5 13a3.07 3.07 0 00-2.314-2.977z"/></g></symbol><symbol id="flight-folder-users-16" viewBox="0 0 16 16"><g><path d="M2.25 2.5a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h.25a.75.75 0 010 1.5h-.25A2.25 2.25 0 010 12.75v-9.5A2.25 2.25 0 012.25 1h4.379a2.25 2.25 0 011.59.659L9.342 2.78c.14.141.331.22.53.22h3.879A2.25 2.25 0 0116 5.25v5.25a.75.75 0 01-1.5 0V5.25a.75.75 0 00-.75-.75H9.871a2.25 2.25 0 01-1.59-.659L7.158 2.72a.75.75 0 00-.53-.22H2.25z"/><path d="M4.574 11.76c.383-.463.936-.76 1.551-.76h2.75c.615 0 1.168.297 1.55.76A2.61 2.61 0 0111 13.418v.833a.75.75 0 01-1.5 0v-.833c0-.285-.095-.536-.231-.702-.134-.161-.28-.215-.394-.215h-2.75c-.114 0-.26.054-.394.215a1.113 1.113 0 00-.231.702v.833a.75.75 0 01-1.5 0v-.833c0-.6.195-1.197.574-1.656z"/><path fill-rule="evenodd" d="M7.5 5.5a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM6.5 8a1 1 0 112 0 1 1 0 01-2 0z" clip-rule="evenodd"/><path d="M11.518 11.589a.75.75 0 01.893-.572c.567.125 1.089.41 1.474.834.388.426.614.969.615 1.546v.853a.75.75 0 01-1.5 0v-.851a.8.8 0 00-.224-.538 1.306 1.306 0 00-.687-.379.75.75 0 01-.572-.893zM11.42 5.52a.75.75 0 10-.34 1.46c.283.066.52.212.682.4A.95.95 0 0112 8a.95.95 0 01-.238.62 1.272 1.272 0 01-.681.4.75.75 0 10.338 1.46 2.77 2.77 0 001.481-.884A2.45 2.45 0 0013.5 8a2.45 2.45 0 00-.6-1.596 2.77 2.77 0 00-1.48-.885z"/></g></symbol><symbol id="flight-frown-24" viewBox="0 0 24 24"><g><path d="M8.457 14.424C9.27 13.746 10.5 13 12 13s2.73.746 3.543 1.424c.413.344.738.687.961.944.126.145.25.294.36.451a.75.75 0 01-1.227.862h-.001v-.002a4.882 4.882 0 00-.265-.328 6.91 6.91 0 00-.789-.775C13.895 15.004 13 14.5 12 14.5c-1 0-1.895.504-2.582 1.076a6.21 6.21 0 00-1.054 1.104.75.75 0 01-1.228-.86 5.67 5.67 0 01.36-.452c.223-.257.548-.6.961-.944zM8 9a1 1 0 011-1h.01a1 1 0 110 2H9a1 1 0 01-1-1zM15 8a1 1 0 100 2h.01a1 1 0 100-2H15z"/><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-frown-16" viewBox="0 0 16 16"><g><path d="M5 6a1 1 0 011-1h.007a1 1 0 010 2H6a1 1 0 01-1-1zM10 5a1 1 0 100 2h.007a1 1 0 100-2H10z"/><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/><path d="M5.785 9.777C6.279 9.403 7.035 9 8 9c.965 0 1.721.403 2.215.777.25.189.441.377.573.52.078.085.153.171.22.265a.75.75 0 01-.17 1.047.759.759 0 01-1.046-.17 2.736 2.736 0 00-.482-.466c-.331-.25-.776-.473-1.31-.473-.535 0-.979.222-1.31.473-.177.134-.35.29-.484.469a.75.75 0 01-1.215-.88l.001-.001c.217-.3.5-.562.793-.784z"/></g></symbol><symbol id="flight-gateway-24" viewBox="0 0 24 24"><g><path d="M5.052 8.165c.624-1.654 1.469-3.072 2.593-4.071C8.753 3.108 10.164 2.5 12 2.5c2.06 0 3.592.765 4.763 1.987 1.19 1.242 2.03 2.984 2.608 4.946 1.155 3.929 1.19 8.503 1.096 10.985-.023.6-.523 1.082-1.173 1.082H4.706c-.648 0-1.15-.484-1.173-1.086a46.334 46.334 0 01.016-3.879.75.75 0 10-1.498-.07 47.832 47.832 0 00-.017 4.006C2.09 21.924 3.297 23 4.706 23h14.588c1.406 0 2.616-1.07 2.672-2.525.096-2.523.07-7.297-1.156-11.465-.614-2.086-1.545-4.08-2.964-5.561C16.405 1.946 14.488 1 12 1c-2.207 0-3.971.745-5.352 1.973-1.365 1.214-2.324 2.871-3 4.662a.75.75 0 001.404.53z"/><path d="M9.207 6.482a.75.75 0 011.06-.025l5.5 5.25c.14.133.23.322.233.531v.024a.75.75 0 01-.232.53l-5.5 5.25a.75.75 0 01-1.036-1.085L13.378 13H1.75a.75.75 0 010-1.5h11.628L9.232 7.543a.75.75 0 01-.025-1.06z"/></g></symbol><symbol id="flight-gateway-16" viewBox="0 0 16 16"><g><path d="M3.537 5.354c.415-1.153.971-2.12 1.695-2.794C5.938 1.903 6.83 1.5 8 1.5c1.251 0 2.188.46 2.921 1.21.752.768 1.31 1.865 1.71 3.146.802 2.566.901 5.638.862 7.563-.013.594-.508 1.081-1.16 1.081H3.668c-.653 0-1.148-.487-1.16-1.083-.012-.545-.012-1.189.012-1.89a.75.75 0 10-1.499-.053 35.678 35.678 0 00-.013 1.974C1.038 14.916 2.256 16 3.668 16h8.665c1.41 0 2.63-1.082 2.66-2.55.04-1.968-.054-5.238-.93-8.041-.438-1.404-1.09-2.747-2.07-3.749C10.994.64 9.677 0 8 0 6.439 0 5.185.554 4.21 1.462c-.96.893-1.622 2.1-2.084 3.384a.75.75 0 101.411.508z"/><path d="M6.22 4.47a.75.75 0 011.06 0l3.25 3.25.008.008a.75.75 0 01-.008 1.052l-3.25 3.25a.75.75 0 01-1.06-1.06L8.19 9H1a.75.75 0 010-1.5h7.19L6.22 5.53a.75.75 0 010-1.06z"/></g></symbol><symbol id="flight-gift-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M3.5 4.25c0 .63.192 1.235.54 1.75H2.75A1.75 1.75 0 001 7.75v3.5c0 .966.784 1.75 1.75 1.75H3v7.25A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V13h.25A1.75 1.75 0 0023 11.25v-3.5A1.75 1.75 0 0021.25 6h-.79c.348-.515.54-1.12.54-1.75 0-.88-.375-1.711-1.023-2.316A3.529 3.529 0 0017.571 1c-2.266 0-3.67 1.524-4.463 2.87a10.098 10.098 0 00-.842 1.858l-.016.047-.016-.047c-.17-.501-.44-1.177-.842-1.859C10.599 2.524 9.195 1 6.929 1c-.894 0-1.76.33-2.406.934A3.168 3.168 0 003.5 4.25zM6.929 2.5c-.528 0-1.024.196-1.383.53A1.669 1.669 0 005 4.25c0 .447.19.887.546 1.22.359.334.855.53 1.383.53h3.81a8.46 8.46 0 00-.64-1.37C9.42 3.477 8.413 2.5 6.93 2.5zM13.76 6h3.811c.528 0 1.024-.196 1.383-.53.356-.333.546-.773.546-1.22 0-.447-.19-.887-.546-1.22a2.029 2.029 0 00-1.383-.53c-1.484 0-2.49.976-3.17 2.13A8.46 8.46 0 0013.76 6zM13 7.5v4h8.25a.25.25 0 00.25-.25v-3.5a.25.25 0 00-.25-.25H13zm-1.5 0v4H2.75a.25.25 0 01-.25-.25v-3.5a.25.25 0 01.25-.25h8.75zm8 12.75V13H13v8.5h5.25c.69 0 1.25-.56 1.25-1.25zm-8 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V13h7v8.5z" clip-rule="evenodd"/></symbol><symbol id="flight-gift-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M1.5 2.75c0 .438.103.866.297 1.25H.75a.75.75 0 00-.75.75v3.5c0 .414.336.75.75.75H2v6.25c0 .414.336.75.75.75h10.5a.75.75 0 00.75-.75V9h1.25a.75.75 0 00.75-.75v-3.5a.75.75 0 00-.75-.75h-.547A2.78 2.78 0 0014.21.81 2.697 2.697 0 0012.286 0c-1.8 0-2.878 1.318-3.46 2.394-.262.486-.449.967-.576 1.351a8.466 8.466 0 00-.577-1.351C7.093 1.318 6.013 0 4.214 0 3.49 0 2.798.293 2.29.81a2.769 2.769 0 00-.79 1.94zM4.214 1.5c-.317 0-.625.128-.854.361-.229.234-.36.553-.36.889 0 .336.131.655.36.889.23.233.537.361.854.361h2.537a6.754 6.754 0 00-.397-.894c-.5-.924-1.189-1.606-2.14-1.606zM9.75 4h2.537c.317 0 .625-.128.854-.361.229-.234.36-.553.36-.889 0-.336-.131-.655-.36-.889a1.197 1.197 0 00-.854-.361c-.951 0-1.64.682-2.14 1.606A6.753 6.753 0 009.75 4zM9 5.5v2h5.5v-2H9zm-1.5 0v2h-6v-2h6zm1.5 9h3.5V9H9v5.5zM7.5 9v5.5h-4V9h4z" clip-rule="evenodd"/></symbol><symbol id="flight-git-branch-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M7 3.25a.75.75 0 00-1.5 0v10.83a3.501 3.501 0 104.171 4.162c2.447-.091 4.553-.979 6.073-2.498 1.467-1.468 2.345-3.481 2.486-5.82A3.501 3.501 0 0017.5 3a3.5 3.5 0 00-.773 6.914c-.136 1.976-.88 3.604-2.044 4.769-1.213 1.213-2.929 1.97-5.015 2.058A3.505 3.505 0 007 14.081V3.25zM17.5 8.5a2 2 0 100-4 2 2 0 000 4zm-13.25 9a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/></symbol><symbol id="flight-git-branch-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M12.719 6.913A3.001 3.001 0 0012 1a3 3 0 00-.787 5.896c-.282 2.395-2.124 4.164-4.561 4.34A3.005 3.005 0 004.5 9.095V2A.75.75 0 003 2v7.095a3.001 3.001 0 103.658 3.643c3.26-.187 5.758-2.606 6.061-5.825zM10.5 4a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0zm-8.25 8a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/></symbol><symbol id="flight-git-commit-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M15.93 11a4.001 4.001 0 00-7.86 0H3.75a.75.75 0 000 1.5h4.32a4.001 4.001 0 007.86 0h4.32a.75.75 0 000-1.5h-4.32zM12 9.25a2.5 2.5 0 100 5 2.5 2.5 0 000-5z" clip-rule="evenodd"/></symbol><symbol id="flight-git-commit-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M10.905 7a3.001 3.001 0 00-5.81 0H2.75a.75.75 0 000 1.5h2.345a3.001 3.001 0 005.81 0h2.345a.75.75 0 000-1.5h-2.345zM8 6.25a1.5 1.5 0 100 3 1.5 1.5 0 000-3z" clip-rule="evenodd"/></symbol><symbol id="flight-git-merge-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M3.5 6.5a3.5 3.5 0 114.096 3.45c.102.41.284.886.551 1.406a11.743 11.743 0 001.81 2.54c1.35 1.456 3.014 2.56 4.635 2.804a3.502 3.502 0 016.908.8 3.5 3.5 0 01-6.928.71c-2.178-.252-4.217-1.677-5.716-3.294A13.885 13.885 0 017.5 13.202v7.548a.75.75 0 01-1.5 0V9.855A3.502 3.502 0 013.5 6.5zm3.5-2a2 2 0 100 4 2 2 0 000-4zm9 13a2 2 0 104 0 2 2 0 00-4 0z" clip-rule="evenodd"/></symbol><symbol id="flight-git-merge-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4.644 6.865A3.001 3.001 0 003.75 1 3 3 0 003 6.905V14a.75.75 0 001.5 0V9.518c.21.266.436.527.675.78C6.21 11.39 7.619 12.432 9.08 12.69a3.001 3.001 0 10.038-1.526c-.92-.237-1.951-.946-2.855-1.899A9.018 9.018 0 014.955 7.52a4.969 4.969 0 01-.311-.655zM3.75 2.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM10.5 12a1.5 1.5 0 103 0 1.5 1.5 0 00-3 0z" clip-rule="evenodd"/></symbol><symbol id="flight-git-pull-request-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M7.5 9.92A3.501 3.501 0 006.75 3 3.5 3.5 0 006 9.92v10.83a.75.75 0 001.5 0V9.92zM4.75 6.5a2 2 0 114 0 2 2 0 01-4 0zM18 8.75v5.58a3.501 3.501 0 01-.75 6.92 3.5 3.5 0 01-.75-6.92V8.75c0-.69-.56-1.25-1.25-1.25H13A.75.75 0 0113 6h2.25A2.75 2.75 0 0118 8.75zm-2.75 9a2 2 0 114 0 2 2 0 01-4 0z"/></g></symbol><symbol id="flight-git-pull-request-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M5 6.905A3.001 3.001 0 004.25 1a3 3 0 00-.75 5.905V14A.75.75 0 005 14V6.905zM2.75 4a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0zM12.5 5.25v3.595a3.001 3.001 0 01-.75 5.905A3 3 0 0111 8.845V5.25a.75.75 0 00-.75-.75H9A.75.75 0 019 3h1.25a2.25 2.25 0 012.25 2.25zm-2.25 6.5a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z"/></g></symbol><symbol id="flight-git-repo-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v14.5A2.75 2.75 0 005.75 21H6a.75.75 0 000-1.5h-.25c-.69 0-1.25-.56-1.25-1.25v-1c0-.69.56-1.25 1.25-1.25H19.5v3.25a.25.25 0 01-.25.25H16a.75.75 0 000 1.5h3.25A1.75 1.75 0 0021 19.25V2.75A1.75 1.75 0 0019.25 1H5.75zM19.5 14.5V2.75a.25.25 0 00-.25-.25H5.75c-.69 0-1.25.56-1.25 1.25V14.8c.375-.192.8-.3 1.25-.3H19.5z" clip-rule="evenodd"/><path d="M8.75 18a.75.75 0 00-.75.75v3.5a.75.75 0 001.128.648L11 21.806l1.872 1.092A.75.75 0 0014 22.25v-3.5a.75.75 0 00-.75-.75h-4.5z"/></g></symbol><symbol id="flight-git-repo-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M3.25 0A2.25 2.25 0 001 2.25v10.5A2.25 2.25 0 003.25 15h.25a.75.75 0 000-1.5h-.25a.75.75 0 01-.75-.75v-1.5a.75.75 0 01.75-.75H13.5v3h-3a.75.75 0 000 1.5h3.25c.69 0 1.25-.56 1.25-1.25V1.25C15 .56 14.44 0 13.75 0H3.25zM13.5 9V1.5H3.25a.75.75 0 00-.75.75v6.878c.235-.083.487-.128.75-.128H13.5z" clip-rule="evenodd"/><path d="M5.5 12a.5.5 0 00-.5.5v3a.5.5 0 00.777.416L7 15.101l1.223.815A.5.5 0 009 15.5v-3a.5.5 0 00-.5-.5h-3z"/></g></symbol><symbol id="flight-globe-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm-1.673 1.647A9.506 9.506 0 002.552 11h4.747a16.673 16.673 0 013.028-8.353zm3.346 0A16.673 16.673 0 0116.701 11h4.747a9.506 9.506 0 00-7.775-8.353zM15.196 11A15.149 15.149 0 0012 2.916 15.149 15.149 0 008.804 11h6.392zm-6.427 1.5h6.462A15.16 15.16 0 0112 21.084 15.16 15.16 0 018.769 12.5zm-1.502 0H2.513c.23 4.45 3.525 8.091 7.814 8.853a16.683 16.683 0 01-3.06-8.853zm6.406 8.853a16.683 16.683 0 003.06-8.853h4.754c-.23 4.45-3.525 8.091-7.814 8.853z" clip-rule="evenodd"/></symbol><symbol id="flight-globe-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM6.128 1.774A6.508 6.508 0 001.576 7H4.07a11.095 11.095 0 012.06-5.226zm3.744 0A11.096 11.096 0 0111.932 7h2.492a6.508 6.508 0 00-4.552-5.226zM10.42 7C10.165 5.124 9.333 3.335 8 1.836 6.667 3.335 5.835 5.124 5.58 7h4.84zM5.527 8.5h4.946C10.31 10.557 9.451 12.533 8 14.164 6.55 12.533 5.691 10.557 5.527 8.5zm-1.505 0H1.52a6.505 6.505 0 004.61 5.726C4.896 12.525 4.163 10.555 4.021 8.5zm5.85 5.726c1.231-1.701 1.964-3.671 2.106-5.726h2.503a6.505 6.505 0 01-4.61 5.726z" clip-rule="evenodd"/></symbol><symbol id="flight-globe-private-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M8.804 11A15.149 15.149 0 0112 2.916a15.087 15.087 0 012.813 5.763.75.75 0 001.456-.358 16.614 16.614 0 00-2.596-5.674 9.512 9.512 0 017.542 7.035.75.75 0 101.456-.364C21.473 4.539 17.15 1 12 1 5.925 1 1 5.925 1 12c0 5.243 3.667 9.627 8.575 10.732a.75.75 0 00.33-1.464c-4.082-.918-7.169-4.465-7.392-8.768h4.754c.128 2.606.86 5.13 2.117 7.367a.75.75 0 101.308-.734A15.221 15.221 0 018.77 12.5H12.5a.75.75 0 000-1.5H8.804zM7.3 11H2.552a9.506 9.506 0 017.775-8.353A16.673 16.673 0 007.299 11z" clip-rule="evenodd"/><path d="M18 19a.75.75 0 01.75.75v.5a.75.75 0 01-1.5 0v-.5A.75.75 0 0118 19z"/><path fill-rule="evenodd" d="M14 15.014a2.25 2.25 0 00-2 2.236v4.5A2.25 2.25 0 0014.25 24h7.5A2.25 2.25 0 0024 21.75v-4.5a2.25 2.25 0 00-2-2.236v-.93a4.127 4.127 0 00-1.165-2.881A3.96 3.96 0 0018 10a3.96 3.96 0 00-2.835 1.203A4.127 4.127 0 0014 14.083v.93zM15.5 15v-.917c0-.69.268-1.35.739-1.833A2.46 2.46 0 0118 11.5c.657 0 1.29.267 1.761.75.471.483.739 1.142.739 1.833V15h-5zm-1.25 1.5a.75.75 0 00-.75.75v4.5c0 .414.336.75.75.75h7.5a.75.75 0 00.75-.75v-4.5a.75.75 0 00-.75-.75h-7.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-globe-private-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M5.58 7C5.835 5.124 6.667 3.335 8 1.836a10.074 10.074 0 011.806 2.878.75.75 0 101.388-.568 11.412 11.412 0 00-1.322-2.372A6.503 6.503 0 0114.5 8 .75.75 0 0016 8a8 8 0 10-11.31 7.285.75.75 0 10.622-1.365A6.504 6.504 0 011.519 8.5h2.503c.04.563.122 1.12.248 1.668a.75.75 0 101.462-.336c-.1-.438-.17-.883-.205-1.332H7A.75.75 0 007 7H5.58zM4.07 7H1.576a6.508 6.508 0 014.552-5.226A11.095 11.095 0 004.068 7z" clip-rule="evenodd"/><path d="M11.75 12.25a.75.75 0 00-1.5 0v.5a.75.75 0 001.5 0v-.5z"/><path fill-rule="evenodd" d="M8.518 9.012c.035-.627.13-1.235.366-1.738.174-.37.435-.704.816-.94C10.08 6.101 10.52 6 11 6c.48 0 .921.1 1.3.334.381.236.642.57.816.94.236.503.331 1.111.366 1.738A2.25 2.25 0 0115.5 11.25v2.5A2.25 2.25 0 0113.25 16h-4.5a2.25 2.25 0 01-2.25-2.25v-2.5a2.25 2.25 0 012.018-2.238zM10.022 9c.032-.481.102-.838.22-1.087a.662.662 0 01.245-.302c.09-.055.243-.111.513-.111s.423.056.513.111c.087.054.17.141.246.302.117.249.187.606.219 1.087h-1.956zm3.228 1.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75h-4.5a.75.75 0 01-.75-.75v-2.5a.75.75 0 01.75-.75h4.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-government-24" viewBox="0 0 24 24"><g><path d="M11.25 2.75c0-.966.784-1.75 1.75-1.75h2.25a.75.75 0 010 1.5H13a.25.25 0 00-.25.25V4.5l-.001.038a7.252 7.252 0 016.48 6.655.75.75 0 01-1.496.114 5.75 5.75 0 00-11.466 0 .75.75 0 11-1.496-.114 7.252 7.252 0 016.48-6.655.692.692 0 01-.001-.038V2.75z"/><path fill-rule="evenodd" d="M2 13.75a.75.75 0 01.75-.75h18.5a.75.75 0 010 1.5H19.5v7h2.75a.75.75 0 010 1.5H1.75a.75.75 0 010-1.5H4.5v-7H2.75a.75.75 0 01-.75-.75zm4 7.75h3v-7H6v7zm7.5 0v-7h-3v7h3zm1.5 0h3v-7h-3v7z" clip-rule="evenodd"/></g></symbol><symbol id="flight-government-16" viewBox="0 0 16 16"><g><path d="M7.25 1.25C7.25.56 7.81 0 8.5 0h1.75a.75.75 0 010 1.5h-1.5v1.056a5.002 5.002 0 014.242 4.653.75.75 0 11-1.498.086 3.5 3.5 0 00-6.988 0 .75.75 0 11-1.498-.086A5.002 5.002 0 017.25 2.556V1.25z"/><path fill-rule="evenodd" d="M1 9.75A.75.75 0 011.75 9h12.5a.75.75 0 010 1.5H13v4h2.25a.75.75 0 010 1.5H.75a.75.75 0 010-1.5H3v-4H1.75A.75.75 0 011 9.75zm3.5 4.75h2.75v-4H4.5v4zm4.25 0h2.75v-4H8.75v4z" clip-rule="evenodd"/></g></symbol><symbol id="flight-grid-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M3.75 2A1.75 1.75 0 002 3.75v5.5c0 .966.784 1.75 1.75 1.75h5.5A1.75 1.75 0 0011 9.25v-5.5A1.75 1.75 0 009.25 2h-5.5zM3.5 3.75a.25.25 0 01.25-.25h5.5a.25.25 0 01.25.25v5.5a.25.25 0 01-.25.25h-5.5a.25.25 0 01-.25-.25v-5.5zM14.75 2A1.75 1.75 0 0013 3.75v5.5c0 .966.784 1.75 1.75 1.75h5.5A1.75 1.75 0 0022 9.25v-5.5A1.75 1.75 0 0020.25 2h-5.5zm-.25 1.75a.25.25 0 01.25-.25h5.5a.25.25 0 01.25.25v5.5a.25.25 0 01-.25.25h-5.5a.25.25 0 01-.25-.25v-5.5zM13 14.75c0-.966.784-1.75 1.75-1.75h5.5c.966 0 1.75.784 1.75 1.75v5.5A1.75 1.75 0 0120.25 22h-5.5A1.75 1.75 0 0113 20.25v-5.5zm1.75-.25a.25.25 0 00-.25.25v5.5c0 .138.112.25.25.25h5.5a.25.25 0 00.25-.25v-5.5a.25.25 0 00-.25-.25h-5.5zM3.75 13A1.75 1.75 0 002 14.75v5.5c0 .966.784 1.75 1.75 1.75h5.5A1.75 1.75 0 0011 20.25v-5.5A1.75 1.75 0 009.25 13h-5.5zm-.25 1.75a.25.25 0 01.25-.25h5.5a.25.25 0 01.25.25v5.5a.25.25 0 01-.25.25h-5.5a.25.25 0 01-.25-.25v-5.5z"/></g></symbol><symbol id="flight-grid-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M2.25 1C1.56 1 1 1.56 1 2.25v3.5C1 6.44 1.56 7 2.25 7h3.5C6.44 7 7 6.44 7 5.75v-3.5C7 1.56 6.44 1 5.75 1h-3.5zm.25 4.5v-3h3v3h-3zM10.25 1C9.56 1 9 1.56 9 2.25v3.5C9 6.44 9.56 7 10.25 7h3.5C14.44 7 15 6.44 15 5.75v-3.5C15 1.56 14.44 1 13.75 1h-3.5zm.25 4.5v-3h3v3h-3zM9 10.25C9 9.56 9.56 9 10.25 9h3.5c.69 0 1.25.56 1.25 1.25v3.5c0 .69-.56 1.25-1.25 1.25h-3.5C9.56 15 9 14.44 9 13.75v-3.5zm1.5.25v3h3v-3h-3zM2.25 9C1.56 9 1 9.56 1 10.25v3.5c0 .69.56 1.25 1.25 1.25h3.5C6.44 15 7 14.44 7 13.75v-3.5C7 9.56 6.44 9 5.75 9h-3.5zm.25 4.5v-3h3v3h-3z"/></g></symbol><symbol id="flight-grid-alt-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M1 2.25C1 1.56 1.56 1 2.25 1h3.5C6.44 1 7 1.56 7 2.25v3.5C7 6.44 6.44 7 5.75 7h-3.5C1.56 7 1 6.44 1 5.75v-3.5zm1.5.25v3h3v-3h-3zM9 2.25C9 1.56 9.56 1 10.25 1h3.5c.69 0 1.25.56 1.25 1.25v3.5C15 6.44 14.44 7 13.75 7h-3.5C9.56 7 9 6.44 9 5.75v-3.5zm1.5.25v3h3v-3h-3zM18.25 1C17.56 1 17 1.56 17 2.25v3.5c0 .69.56 1.25 1.25 1.25h3.5C22.44 7 23 6.44 23 5.75v-3.5C23 1.56 22.44 1 21.75 1h-3.5zm.25 4.5v-3h3v3h-3zM1 10.25C1 9.56 1.56 9 2.25 9h3.5C6.44 9 7 9.56 7 10.25v3.5C7 14.44 6.44 15 5.75 15h-3.5C1.56 15 1 14.44 1 13.75v-3.5zm1.5.25v3h3v-3h-3zM10.25 9C9.56 9 9 9.56 9 10.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5C15 9.56 14.44 9 13.75 9h-3.5zm.25 4.5v-3h3v3h-3zM17 10.25c0-.69.56-1.25 1.25-1.25h3.5c.69 0 1.25.56 1.25 1.25v3.5c0 .69-.56 1.25-1.25 1.25h-3.5c-.69 0-1.25-.56-1.25-1.25v-3.5zm1.5.25v3h3v-3h-3zM2.25 17C1.56 17 1 17.56 1 18.25v3.5c0 .69.56 1.25 1.25 1.25h3.5C6.44 23 7 22.44 7 21.75v-3.5C7 17.56 6.44 17 5.75 17h-3.5zm.25 4.5v-3h3v3h-3zM9 18.25c0-.69.56-1.25 1.25-1.25h3.5c.69 0 1.25.56 1.25 1.25v3.5c0 .69-.56 1.25-1.25 1.25h-3.5C9.56 23 9 22.44 9 21.75v-3.5zm1.5.25v3h3v-3h-3zM18.25 17c-.69 0-1.25.56-1.25 1.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5c0-.69-.56-1.25-1.25-1.25h-3.5zm.25 4.5v-3h3v3h-3z"/></g></symbol><symbol id="flight-grid-alt-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M0 .75A.75.75 0 01.75 0h2.5A.75.75 0 014 .75v2.5a.75.75 0 01-.75.75H.75A.75.75 0 010 3.25V.75zm1.5.75v1h1v-1h-1zM6 .75A.75.75 0 016.75 0h2.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75h-2.5A.75.75 0 016 3.25V.75zm1.5.75v1h1v-1h-1zM12.75 0a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75V.75a.75.75 0 00-.75-.75h-2.5zm.75 2.5v-1h1v1h-1zM0 6.75A.75.75 0 01.75 6h2.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75H.75A.75.75 0 010 9.25v-2.5zm1.5.75v1h1v-1h-1zM6.75 6a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5A.75.75 0 009.25 6h-2.5zm.75 2.5v-1h1v1h-1zM12 6.75a.75.75 0 01.75-.75h2.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75h-2.5a.75.75 0 01-.75-.75v-2.5zm1.5.75v1h1v-1h-1zM.75 12a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5a.75.75 0 00-.75-.75H.75zm.75 2.5v-1h1v1h-1zM6 12.75a.75.75 0 01.75-.75h2.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75h-2.5a.75.75 0 01-.75-.75v-2.5zm1.5.75v1h1v-1h-1zM12.75 12a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5a.75.75 0 00-.75-.75h-2.5zm.75 2.5v-1h1v1h-1z"/></g></symbol><symbol id="flight-guide-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M2.75 3A1.75 1.75 0 001 4.75v12.5c0 .966.784 1.75 1.75 1.75h5.175c2.342 0 3.325 1.19 3.325 2.25a.75.75 0 001.5 0c0-1.06.983-2.25 3.325-2.25h5.175A1.75 1.75 0 0023 17.25V4.75A1.75 1.75 0 0021.25 3H16.1c-1.7 0-2.958.505-3.777 1.439-.119.136-.226.278-.323.426a3.789 3.789 0 00-.323-.426C10.858 3.505 9.6 3 7.9 3H2.75zm10 15.443c.845-.598 1.996-.943 3.325-.943h5.175a.25.25 0 00.25-.25V4.75a.25.25 0 00-.25-.25H16.1c-1.4 0-2.192.406-2.648.927-.473.54-.702 1.334-.702 2.323v10.693zm-1.5 0V7.75c0-.99-.229-1.783-.702-2.323C10.092 4.906 9.3 4.5 7.9 4.5H2.75a.25.25 0 00-.25.25v12.5c0 .138.112.25.25.25h5.175c1.329 0 2.48.345 3.325.943z" clip-rule="evenodd"/></symbol><symbol id="flight-guide-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M1.25 2C.56 2 0 2.56 0 3.25v8.5C0 12.44.56 13 1.25 13H5c.896 0 1.475.205 1.809.448.317.23.441.51.441.802a.75.75 0 001.5 0c0-.292.124-.572.441-.802.334-.243.913-.448 1.809-.448h3.75c.69 0 1.25-.56 1.25-1.25v-8.5C16 2.56 15.44 2 14.75 2H11c-1.154 0-2.106.354-2.772 1-.081.08-.157.161-.228.246A3.131 3.131 0 007.772 3C7.106 2.354 6.154 2 5 2H1.25zm7.5 9.967c.61-.309 1.372-.467 2.25-.467h3.5v-8H11c-.846 0-1.394.253-1.728.577-.335.325-.522.787-.522 1.34v6.55zm-1.5 0v-6.55c0-.553-.187-1.015-.522-1.34C6.394 3.753 5.846 3.5 5 3.5H1.5v8H5c.878 0 1.64.158 2.25.467z" clip-rule="evenodd"/></symbol><symbol id="flight-guide-link-24" viewBox="0 0 24 24"><g><path d="M19.75 2a.75.75 0 000 1.5h1.69l-2.97 2.97a.75.75 0 001.06 1.06l2.97-2.97v1.69a.75.75 0 001.5 0v-3.5a.75.75 0 00-.75-.75h-3.5z"/><path fill-rule="evenodd" d="M2.75 3A1.75 1.75 0 001 4.75v12.5c0 .966.784 1.75 1.75 1.75h5.175c2.342 0 3.325 1.19 3.325 2.25A.749.749 0 0012 22a.75.75 0 00.75-.75c0-1.06.983-2.25 3.325-2.25h5.175A1.75 1.75 0 0023 17.25v-7a.75.75 0 10-1.5 0v7a.25.25 0 01-.25.25h-5.175c-1.329 0-2.48.345-3.325.943V7.75c0-.921.199-1.675.609-2.21.393-.512 1.055-.92 2.204-1.018a.75.75 0 10-.126-1.495c-1.481.126-2.57.689-3.269 1.6-.059.078-.115.158-.168.238a3.789 3.789 0 00-.323-.426C10.858 3.505 9.6 3 7.9 3H2.75zm8.5 4.75c0-.99-.229-1.783-.702-2.323C10.092 4.906 9.3 4.5 7.9 4.5H2.75a.25.25 0 00-.25.25v12.5c0 .138.112.25.25.25h5.175c1.329 0 2.48.345 3.325.943V7.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-guide-link-16" viewBox="0 0 16 16"><g><path d="M12.75 1a.75.75 0 000 1.5h.69l-1.97 1.97a.75.75 0 001.06 1.06l1.97-1.97v.69a.75.75 0 001.5 0v-2.5a.75.75 0 00-.75-.75h-2.5z"/><path fill-rule="evenodd" d="M1.25 2C.56 2 0 2.56 0 3.25v8.5C0 12.44.56 13 1.25 13H5c.896 0 1.475.205 1.809.448.317.23.441.51.441.802a.751.751 0 101.5 0c0-.292.124-.572.441-.802.334-.243.913-.448 1.809-.448h3.75c.69 0 1.25-.56 1.25-1.25v-4.5a.75.75 0 00-1.5 0v4.25H11c-.878 0-1.64.158-2.25.467v-6.55c0-.788.376-1.42 1.12-1.722a.75.75 0 00-.561-1.39 3.27 3.27 0 00-1.31.941A3.13 3.13 0 007.773 3C7.106 2.354 6.154 2 5 2H1.25zm6 3.417c0-.553-.187-1.015-.522-1.34C6.394 3.753 5.846 3.5 5 3.5H1.5v8H5c.878 0 1.64.158 2.25.467v-6.55z" clip-rule="evenodd"/></g></symbol><symbol id="flight-hammer-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M19.502 5.858C15.71 2.773 10.384.225 5.334 3.59a.75.75 0 00.269 1.36c1.292.258 2.317.466 3.309.888.814.346 1.625.846 2.52 1.67L1.03 17.909a2.25 2.25 0 000 3.182l.879.879a2.25 2.25 0 003.182 0l10.864-10.864c.212.322.24.532.247.66.004.065.002.13-.001.21l-.002.041c-.004.068-.009.16-.008.245.002.243.047.586.328.898.513.571 1.078 1.123 1.607 1.64.124.121.247.24.366.358a.75.75 0 001.06-.008l4.148-4.208a.75.75 0 00-.008-1.061c-.763-.752-1.224-1.196-1.866-1.814l-.21-.203c-.283-.273-.643-.316-.838-.327a4.072 4.072 0 00-.589.026l-.013.001-.209.019a6.363 6.363 0 01-.005-.263v-.031c-.002-.161-.003-.383-.034-.588-.03-.206-.108-.548-.388-.81a.74.74 0 00-.038-.033zM9.499 4.456a11.55 11.55 0 00-1.546-.523c3.597-1.278 7.34.464 10.493 3 .012.092.014.21.016.398v.013c.001.167.003.4.038.62.035.217.12.55.393.81.288.273.654.307.837.314.195.007.407-.013.56-.028l.029-.003c.162-.015.27-.024.35-.023l.117.113c.475.458.848.818 1.318 1.277l-3.095 3.14a32.343 32.343 0 01-1.318-1.343c0-.027.002-.056.004-.099l.004-.077a3.49 3.49 0 000-.363c-.034-.633-.299-1.343-1.169-2.212a.75.75 0 00-1.06 0L14 10.94 12.06 9l.97-.97a.75.75 0 00.007-1.053c-1.233-1.266-2.362-2.02-3.538-2.52zM11 10.061L2.091 18.97a.75.75 0 000 1.06l.879.879a.75.75 0 001.06 0L12.94 12 11 10.06zm9.74-1.021l-.01-.002a.04.04 0 01.01.002zm-.996-1.455l.013.002a.05.05 0 01-.013-.002z" clip-rule="evenodd"/></symbol><symbol id="flight-hammer-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M5.484 2.917c.817.22 1.612.62 2.509 1.403a.75.75 0 01.085 1.044l-.422.51 1.13.855.62-.802a.75.75 0 011.08-.113c.678.576.906 1.133.959 1.642.011.111.013.21.014.283v.044c.204.187.417.369.635.552l1.784-2.098-.712-.584-.1.018-.021.003a3.018 3.018 0 01-.395.051c-.132.006-.456.009-.736-.217a1.173 1.173 0 01-.388-.646c-.039-.16-.054-.33-.063-.436l-.002-.012a8.261 8.261 0 00-.012-.128c-1.814-1.199-3.99-1.864-5.965-1.37zm7.789 2.723h-.002.002zM7.868 7.915l-1.17-.884-3.972 4.804a.25.25 0 00.036.354l.913.73a.25.25 0 00.354-.042l3.84-4.962zM6.433 5a4.169 4.169 0 00-1.352-.638c-.463-.123-.908-.167-1.47-.224a42.642 42.642 0 01-.68-.073.75.75 0 01-.378-1.333c3.21-2.54 7.208-1.427 9.914.432a1.142 1.142 0 01.428.681c.026.112.04.23.05.325a2.32 2.32 0 01.285-.028c.143-.004.46.003.734.227l.148.12c.45.368.773.633 1.31 1.082a.75.75 0 01.09 1.062l-2.757 3.24a.75.75 0 01-1.052.089l-.253-.21a23.8 23.8 0 01-1.146-.994 1.128 1.128 0 01-.34-.779c-.004-.066-.004-.141-.005-.192v-.03a2.37 2.37 0 00-.002-.089l-4.742 6.128a1.75 1.75 0 01-2.477.296l-.913-.73a1.75 1.75 0 01-.255-2.482l4.863-5.88zm6.153-.772a.127.127 0 01.002 0h-.002z" clip-rule="evenodd"/></symbol><symbol id="flight-handshake-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M7.833 4.5a.75.75 0 00-.55.24L6.117 6H1.75a.75.75 0 000 1.5H4v7.458c0 .69-.56 1.25-1.25 1.25h-1a.75.75 0 000 1.5h1A2.75 2.75 0 005.296 16h.999l4.125 2.438a2.75 2.75 0 003.133-.234L16.266 16h2.438a2.751 2.751 0 002.546 1.708h1a.75.75 0 000-1.5h-1c-.69 0-1.25-.56-1.25-1.25V7.5h2.25a.75.75 0 000-1.5h-4.367l-1.166-1.26a.75.75 0 00-.55-.24h-3.473a.75.75 0 00-.533.223l-.524.53-.476-.513a.75.75 0 00-.55-.24H7.833zm-1.389 3H5.5v7h1a.75.75 0 01.382.104l4.301 2.542a1.25 1.25 0 001.424-.106l2.312-1.878-1.48-1.664a.75.75 0 011.122-.996l1.776 1.998H18.5v-7h-.944a.75.75 0 01-.55-.24L15.838 6h-2.831L10.37 8.673a1.25 1.25 0 00-.032 1.723l.119.129a1.25 1.25 0 001.762.08l1.277-1.16a.75.75 0 011.008 1.11l-1.276 1.16a2.75 2.75 0 01-3.877-.176l-.118-.13a2.75 2.75 0 01.07-3.79l1.28-1.296-.3-.323H8.161L6.995 7.26a.75.75 0 01-.55.24z" clip-rule="evenodd"/><path d="M23 13.875a.875.875 0 11-1.75 0 .875.875 0 011.75 0zM2.75 14.014a.875.875 0 11-1.75 0 .875.875 0 011.75 0z"/></g></symbol><symbol id="flight-handshake-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M5 2.75a.75.75 0 00-.53.22l-.78.78H.75a.75.75 0 000 1.5H2v5a.75.75 0 01-.75.75h-.5a.75.75 0 000 1.5h.5a2.25 2.25 0 002.016-1.25h.557l3.063 1.531a2.25 2.25 0 002.254-.14l2.087-1.391h1.507a2.25 2.25 0 002.016 1.25h.5a.75.75 0 000-1.5h-.5a.75.75 0 01-.75-.75v-5h1.25a.75.75 0 000-1.5h-2.94l-.78-.78a.75.75 0 00-.53-.22H5zm-1 2.5h-.5v4.5H4a.75.75 0 01.335.08l3.222 1.61a.75.75 0 00.751-.047l1.652-1.101-.584-.876a.75.75 0 011.248-.832l.777 1.166H12.5v-4.5H12a.75.75 0 01-.53-.22l-.78-.78H8.81L7.065 5.997a.711.711 0 00.971 1.038l.971-.85a.75.75 0 11.988 1.13l-.971.85a2.211 2.211 0 01-3.02-3.229l.686-.686H5.311l-.78.78A.75.75 0 014 5.25z" clip-rule="evenodd"/><path d="M1.25 9.625a.625.625 0 11-1.25 0 .625.625 0 011.25 0zM16 9.625a.625.625 0 11-1.25 0 .625.625 0 011.25 0z"/></g></symbol><symbol id="flight-hard-drive-24" viewBox="0 0 24 24"><g><path d="M4 15.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M7.202 3a2.75 2.75 0 00-2.428 1.46L1.32 10.958A2.75 2.75 0 001 12.248v6.002A2.75 2.75 0 003.75 21h16.5A2.75 2.75 0 0023 18.25v-6.002c0-.45-.11-.893-.321-1.29L19.226 4.46A2.75 2.75 0 0016.798 3H7.202zM6.098 5.164A1.25 1.25 0 017.202 4.5h9.596c.462 0 .887.255 1.104.664l3.366 6.336H2.732l3.366-6.336zM2.5 13v5.25c0 .69.56 1.25 1.25 1.25h16.5c.69 0 1.25-.56 1.25-1.25V13h-19z" clip-rule="evenodd"/></g></symbol><symbol id="flight-hard-drive-16" viewBox="0 0 16 16"><g><path d="M3 11.25a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M4.748 1a2.25 2.25 0 00-2.07 1.369L.18 8.235a2.25 2.25 0 00-.18.882v3.633A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75V9.117c0-.303-.061-.603-.18-.882L13.322 2.37A2.25 2.25 0 0011.252 1H4.748zm-.69 1.956a.75.75 0 01.69-.456h6.504c.3 0 .572.18.69.456L14.09 8H1.91l2.148-5.044zM1.5 9.5v3.25c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75V9.5h-13z" clip-rule="evenodd"/></g></symbol><symbol id="flight-hash-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M10.363 3.009a.75.75 0 01.629.853L10.365 8h4.483l.66-4.362a.75.75 0 111.484.224L16.365 8h2.885a.75.75 0 010 1.5h-3.113l-.681 4.5h3.794a.75.75 0 010 1.5h-4.022l-.736 4.863a.75.75 0 11-1.483-.225l.702-4.638H9.228l-.736 4.863a.75.75 0 11-1.483-.225L7.71 15.5H4.75a.75.75 0 010-1.5h3.189l.681-4.5H4.75a.75.75 0 010-1.5h4.098l.66-4.362a.75.75 0 01.855-.63zM13.938 14l.682-4.5h-4.482L9.455 14h4.482z" clip-rule="evenodd"/></symbol><symbol id="flight-hash-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M6.884 1.762a.75.75 0 01.604.872L7.058 5h2.975l.479-2.634a.75.75 0 111.476.268L11.558 5h1.192a.75.75 0 010 1.5h-1.465l-.546 3h2.011a.75.75 0 010 1.5h-2.283l-.48 2.634a.75.75 0 11-1.475-.268L8.942 11H5.967l-.48 2.634a.75.75 0 11-1.475-.268L4.442 11H3.25a.75.75 0 010-1.5h1.465l.545-3H3.25a.75.75 0 010-1.5h2.283l.479-2.634a.75.75 0 01.872-.604zM9.214 9.5l.546-3H6.785l-.546 3h2.976z" clip-rule="evenodd"/></symbol><symbol id="flight-headphones-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 3.5c-2.26 0-4.425.874-6.018 2.424A8.128 8.128 0 003.5 11.75V13h2.75A2.75 2.75 0 019 15.75v3.5A2.75 2.75 0 016.25 22h-1.5A2.75 2.75 0 012 19.25v-7.5a9.628 9.628 0 012.936-6.902A10.132 10.132 0 0112 2c2.646 0 5.187 1.022 7.064 2.848A9.629 9.629 0 0122 11.75v7.5A2.75 2.75 0 0119.25 22h-1.5A2.75 2.75 0 0115 19.25v-3.5A2.75 2.75 0 0117.75 13h2.75v-1.25c0-2.181-.89-4.278-2.482-5.826A8.632 8.632 0 0012 3.5zm8.5 11h-2.75c-.69 0-1.25.56-1.25 1.25v3.5c0 .69.56 1.25 1.25 1.25h1.5c.69 0 1.25-.56 1.25-1.25V14.5zm-17 0h2.75c.69 0 1.25.56 1.25 1.25v3.5c0 .69-.56 1.25-1.25 1.25h-1.5c-.69 0-1.25-.56-1.25-1.25V14.5z" clip-rule="evenodd"/></symbol><symbol id="flight-headphones-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 2.5c-1.468 0-2.87.56-3.9 1.548A5.13 5.13 0 002.5 7.75V8h1.25A2.25 2.25 0 016 10.25v2.5A2.25 2.25 0 013.75 15h-.5A2.25 2.25 0 011 12.75v-5c0-1.8.745-3.52 2.061-4.784A7.135 7.135 0 018 1c1.847 0 3.624.704 4.939 1.966A6.63 6.63 0 0115 7.75v5A2.25 2.25 0 0112.75 15h-.5A2.25 2.25 0 0110 12.75v-2.5A2.25 2.25 0 0112.25 8h1.25v-.25a5.13 5.13 0 00-1.6-3.702A5.635 5.635 0 008 2.5zm5.5 7h-1.25a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h.5a.75.75 0 00.75-.75V9.5zm-11 0h1.25a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75h-.5a.75.75 0 01-.75-.75V9.5z" clip-rule="evenodd"/></symbol><symbol id="flight-heart-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M14.508 3.457a6.246 6.246 0 014.693 0 6.154 6.154 0 011.993 1.304 6.024 6.024 0 011.336 1.957 5.931 5.931 0 010 4.626 6.022 6.022 0 01-1.336 1.957l-8.67 8.485a.75.75 0 01-1.049 0l-8.67-8.485A5.974 5.974 0 011 9.03c0-1.605.651-3.14 1.806-4.27a6.205 6.205 0 014.34-1.76c1.624 0 3.185.631 4.339 1.76l.515.504.515-.504a6.154 6.154 0 011.993-1.304zm5.637 2.376a4.653 4.653 0 00-1.508-.986 4.746 4.746 0 00-3.566 0 4.653 4.653 0 00-1.507.986l-1.04 1.018a.75.75 0 01-1.049 0l-1.04-1.018a4.705 4.705 0 00-3.29-1.332c-1.237 0-2.42.48-3.29 1.332A4.474 4.474 0 002.5 9.031c0 1.196.485 2.347 1.355 3.198L12 20.2l8.145-7.972c.43-.421.771-.921 1.003-1.47a4.431 4.431 0 000-3.456 4.524 4.524 0 00-1.003-1.47z" clip-rule="evenodd"/></symbol><symbol id="flight-heart-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9.689 1.343a4.604 4.604 0 014.97.979 4.482 4.482 0 010 6.4l-6.132 6.061a.75.75 0 01-1.054 0L1.34 8.723A4.5 4.5 0 010 5.523a4.5 4.5 0 011.34-3.201A4.589 4.589 0 014.566 1c1.208 0 2.369.475 3.226 1.322L8 2.527l.208-.205a4.57 4.57 0 011.48-.979zm3.916 2.045a3.104 3.104 0 00-4.342 0l-.736.727a.75.75 0 01-1.054 0l-.736-.726a3.089 3.089 0 00-2.17-.889c-.817 0-1.598.32-2.172.889A3 3 0 001.5 5.522a3 3 0 00.895 2.134L8 13.196l5.605-5.54c.284-.281.51-.614.663-.98a2.981 2.981 0 00-.663-3.288z" clip-rule="evenodd"/></symbol><symbol id="flight-heart-fill-24" viewBox="0 0 24 24"><path d="M16.854 3c-.805 0-1.602.155-2.346.457a6.154 6.154 0 00-1.993 1.304L12 5.265l-.515-.504a6.205 6.205 0 00-4.34-1.76 6.205 6.205 0 00-4.34 1.76A5.974 5.974 0 001 9.031c0 1.605.651 3.14 1.806 4.27l8.67 8.485a.75.75 0 001.048 0l8.67-8.485a6.022 6.022 0 001.336-1.957 5.93 5.93 0 000-4.626 6.024 6.024 0 00-1.336-1.957 6.154 6.154 0 00-1.993-1.304A6.246 6.246 0 0016.854 3z"/></symbol><symbol id="flight-heart-fill-16" viewBox="0 0 16 16"><path d="M11.434 1a4.604 4.604 0 00-3.226 1.322L8 2.527l-.208-.205A4.589 4.589 0 004.566 1 4.589 4.589 0 001.34 2.322 4.5 4.5 0 000 5.522a4.5 4.5 0 001.34 3.2l6.133 6.061a.75.75 0 001.054 0l6.132-6.06a4.52 4.52 0 00.992-1.467 4.482 4.482 0 00-.992-4.934A4.604 4.604 0 0011.433 1z"/></symbol><symbol id="flight-heart-off-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M2.28 1.22a.75.75 0 00-1.06 1.06L3.28 4.342c-.165.13-.324.27-.475.42A5.974 5.974 0 001 9.03c0 1.605.651 3.14 1.806 4.27l8.67 8.485a.75.75 0 001.048 0l4.145-4.056 5.05 5.05a.75.75 0 101.061-1.06L2.28 1.22zm13.328 15.449L4.351 5.412c-.174.128-.34.269-.496.421A4.474 4.474 0 002.5 9.031c0 1.196.485 2.347 1.355 3.198L12 20.2l3.608-3.532z" clip-rule="evenodd"/><path d="M14.508 3.457a6.246 6.246 0 014.693 0 6.153 6.153 0 011.993 1.304 6.024 6.024 0 011.336 1.957 5.931 5.931 0 010 4.626 6.022 6.022 0 01-1.336 1.957l-1.04 1.017a.75.75 0 01-1.049-1.072l1.04-1.017c.43-.421.771-.921 1.003-1.47a4.431 4.431 0 000-3.456 4.524 4.524 0 00-1.003-1.47 4.653 4.653 0 00-1.508-.986 4.746 4.746 0 00-3.566 0 4.653 4.653 0 00-1.507.986l-1.04 1.018a.75.75 0 01-1.049 0l-1.04-1.018a4.644 4.644 0 00-1.257-.875.75.75 0 11.644-1.356c.61.29 1.173.68 1.663 1.16l.515.503.515-.504a6.154 6.154 0 011.993-1.304z"/></g></symbol><symbol id="flight-heart-off-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M1.78.72A.75.75 0 00.72 1.78l.58.581A4.5 4.5 0 000 5.522a4.5 4.5 0 001.34 3.2l6.133 6.061a.75.75 0 001.054 0l2.613-2.582 3.08 3.08a.75.75 0 101.06-1.061L1.78.72zm8.3 10.42L2.36 3.422a2.999 2.999 0 00-.861 2.1 3 3 0 00.895 2.134L8 13.196l2.08-2.056z" clip-rule="evenodd"/><path d="M11.434 1a4.604 4.604 0 00-3.226 1.322l-.735.726a.75.75 0 001.054 1.067l.735-.727a3.104 3.104 0 014.342 0 2.981 2.981 0 010 4.267l-.735.727a.75.75 0 101.055 1.067l.735-.726a4.52 4.52 0 00.992-1.467 4.482 4.482 0 00-.992-4.934A4.604 4.604 0 0011.433 1z"/></g></symbol><symbol id="flight-help-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M12.349 7.536c-.612-.1-1.24.01-1.77.31s-.926.765-1.125 1.308a.75.75 0 11-1.408-.516A3.995 3.995 0 019.842 6.54a4.212 4.212 0 012.75-.484c.946.156 1.81.63 2.436 1.343.627.715.973 1.624.972 2.569 0 .636-.127 1.168-.369 1.62-.24.449-.569.77-.9 1.021a8.43 8.43 0 01-.804.519l-.144.085c-.294.177-.526.329-.712.507-.185.178-.264.341-.298.441a.62.62 0 00-.028.107l-.001.007a.75.75 0 01-1.5-.025c0-.198.047-.394.111-.58a2.63 2.63 0 01.677-1.032c.318-.304.675-.529.98-.712l.177-.104a6.68 6.68 0 00.636-.409 1.64 1.64 0 00.484-.533c.107-.2.191-.482.191-.913v-.001c0-.573-.21-1.132-.6-1.578a2.628 2.628 0 00-1.551-.852z" clip-rule="evenodd"/><path d="M12 16a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></symbol><symbol id="flight-help-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M8.197 4.523a1.532 1.532 0 00-1.051.196c-.318.19-.563.49-.687.85a.75.75 0 01-1.418-.49c.239-.69.71-1.274 1.335-1.648a3.032 3.032 0 012.079-.386 3.057 3.057 0 011.829 1.065 3.13 3.13 0 01.716 2c0 .487-.092.905-.275 1.266-.182.36-.431.62-.679.817-.194.156-.41.291-.581.398l-.096.06a2.507 2.507 0 00-.452.34.643.643 0 00-.172.292.75.75 0 01-1.499-.033c0-.163.035-.324.086-.479.08-.243.232-.543.515-.832.239-.243.505-.419.72-.554.044-.029.086-.056.126-.08.169-.106.296-.186.415-.282a.976.976 0 00.279-.323c.059-.117.113-.296.113-.59v-.002a1.63 1.63 0 00-.372-1.041c-.24-.29-.57-.481-.931-.544z" clip-rule="evenodd"/><path d="M8 11a1 1 0 100 2h.007a1 1 0 100-2H8z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></symbol><symbol id="flight-hexagon-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M10.559 1.006a2.75 2.75 0 012.882 0l7.75 4.77A2.75 2.75 0 0122.5 8.118v7.764a2.75 2.75 0 01-1.309 2.342l-7.75 4.77a2.75 2.75 0 01-2.882 0l-7.75-4.77A2.75 2.75 0 011.5 15.882V8.118a2.75 2.75 0 011.309-2.342l7.75-4.77zm2.096 1.278a1.25 1.25 0 00-1.31 0l-7.75 4.77A1.25 1.25 0 003 8.117v7.764c0 .435.225.838.595 1.065l7.75 4.77a1.25 1.25 0 001.31 0l7.75-4.77c.37-.227.595-.63.595-1.065V8.118a1.25 1.25 0 00-.595-1.065l-7.75-4.77z" clip-rule="evenodd"/></symbol><symbol id="flight-hexagon-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M6.834.33a2.25 2.25 0 012.332 0l5.25 3.182A2.25 2.25 0 0115.5 5.436v5.128a2.25 2.25 0 01-1.084 1.924l-5.25 3.182a2.25 2.25 0 01-2.332 0l-5.25-3.182A2.25 2.25 0 01.5 10.564V5.436a2.25 2.25 0 011.084-1.924L6.834.33zm1.555 1.283a.75.75 0 00-.778 0l-5.25 3.181A.75.75 0 002 5.436v5.128a.75.75 0 00.361.642l5.25 3.181a.75.75 0 00.778 0l5.25-3.181a.75.75 0 00.361-.642V5.436a.75.75 0 00-.361-.642l-5.25-3.181z" clip-rule="evenodd"/></symbol><symbol id="flight-hexagon-fill-24" viewBox="0 0 24 24"><path d="M13.441 1.006a2.75 2.75 0 00-2.882 0l-7.75 4.77A2.75 2.75 0 001.5 8.118v7.764a2.75 2.75 0 001.309 2.342l7.75 4.77a2.75 2.75 0 002.882 0l7.75-4.77a2.75 2.75 0 001.309-2.342V8.118a2.75 2.75 0 00-1.309-2.342l-7.75-4.77z"/></symbol><symbol id="flight-hexagon-fill-16" viewBox="0 0 16 16"><path d="M9.166.33a2.25 2.25 0 00-2.332 0l-5.25 3.182A2.25 2.25 0 00.5 5.436v5.128a2.25 2.25 0 001.084 1.924l5.25 3.182a2.25 2.25 0 002.332 0l5.25-3.182a2.25 2.25 0 001.084-1.924V5.436a2.25 2.25 0 00-1.084-1.924L9.166.33z"/></symbol><symbol id="flight-history-24" viewBox="0 0 24 24"><g><path d="M12 3.5c-2.347 0-4.471.95-6.01 2.49A8.55 8.55 0 005.125 7H8.25a.75.75 0 010 1.5h-4.5A.75.75 0 013 7.75v-4.5a.75.75 0 011.5 0v2.135A9.971 9.971 0 0112 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12a.75.75 0 011.5 0A8.5 8.5 0 1012 3.5z"/><path d="M11.75 6a.75.75 0 01.75.75v5.787l4.085 2.042a.75.75 0 11-.67 1.342l-4.5-2.25A.75.75 0 0111 13V6.75a.75.75 0 01.75-.75z"/></g></symbol><symbol id="flight-history-16" viewBox="0 0 16 16"><g><path d="M1.5 1.25a.75.75 0 011.5 0v1.851A7 7 0 111 8a.75.75 0 011.5 0 5.5 5.5 0 101.725-4H5.75a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75v-3.5z"/><path d="M8.25 4a.75.75 0 01.75.75v3.763l1.805.802a.75.75 0 01-.61 1.37l-2.25-1A.75.75 0 017.5 9V4.75A.75.75 0 018.25 4z"/></g></symbol><symbol id="flight-home-24" viewBox="0 0 24 24"><g><path d="M11.847 2.819a.25.25 0 01.306 0l8.25 6.407a.25.25 0 01.097.198V21.25a.75.75 0 001.5 0V9.424c0-.54-.25-1.05-.677-1.382l-8.25-6.408a1.75 1.75 0 00-2.146 0l-8.25 6.408A1.75 1.75 0 002 9.424V21.25a.75.75 0 001.5 0V9.424a.25.25 0 01.097-.198l8.25-6.407z"/><path d="M9.5 15.75a.25.25 0 01.25-.25h4.5a.25.25 0 01.25.25v5.5a.75.75 0 001.5 0v-5.5A1.75 1.75 0 0014.25 14h-4.5A1.75 1.75 0 008 15.75v5.5a.75.75 0 001.5 0v-5.5z"/></g></symbol><symbol id="flight-home-16" viewBox="0 0 16 16"><g><path d="M7.846 2.574a.25.25 0 01.308 0l5.25 4.12a.25.25 0 01.096.196v7.36a.75.75 0 001.5 0V6.89a1.75 1.75 0 00-.67-1.377L9.08 1.394a1.75 1.75 0 00-2.16 0l-5.25 4.12A1.75 1.75 0 001 6.89v7.36a.75.75 0 001.5 0V6.89a.25.25 0 01.096-.196l5.25-4.12z"/><path d="M6.5 14.25V10.5h3v3.75a.75.75 0 001.5 0v-4C11 9.56 10.44 9 9.75 9h-3.5C5.56 9 5 9.56 5 10.25v4a.75.75 0 001.5 0z"/></g></symbol><symbol id="flight-hourglass-24" viewBox="0 0 24 24"><g><path d="M8 19.75a.75.75 0 01.75-.75h6.5a.75.75 0 010 1.5h-6.5a.75.75 0 01-.75-.75zM11.75 8a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/><path fill-rule="evenodd" d="M4.694 4.503C3.69 3.01 4.762 1 6.562 1h10.876c1.8 0 2.871 2.009 1.868 3.503l-4.748 7.08a.75.75 0 000 .835l4.748 7.079C20.31 20.99 19.238 23 17.438 23H6.562c-1.8 0-2.871-2.009-1.868-3.503l4.748-7.08a.75.75 0 000-.835L4.694 4.503zM6.562 2.5a.75.75 0 00-.623 1.168l4.748 7.079a2.25 2.25 0 010 2.506l-4.748 7.08a.75.75 0 00.623 1.167h10.876c.6 0 .957-.67.623-1.168l-4.748-7.079a2.25 2.25 0 010-2.506l4.748-7.08a.75.75 0 00-.623-1.167H6.562z" clip-rule="evenodd"/></g></symbol><symbol id="flight-hourglass-16" viewBox="0 0 16 16"><g><path d="M5.75 12.75A.75.75 0 016.5 12h3a.75.75 0 010 1.5h-3a.75.75 0 01-.75-.75zM7.75 4.5a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/><path fill-rule="evenodd" d="M2.695 2.717A1.5 1.5 0 014.012.5h7.976a1.5 1.5 0 011.317 2.217L10.494 7.88a.25.25 0 000 .24l2.811 5.163a1.5 1.5 0 01-1.317 2.217H4.012a1.5 1.5 0 01-1.317-2.217l2.81-5.163a.25.25 0 000-.24l-2.81-5.163zM11.988 2H4.012l2.811 5.163a1.75 1.75 0 010 1.674L4.013 14h7.975L9.177 8.837a1.75 1.75 0 010-1.674L11.987 2z" clip-rule="evenodd"/></g></symbol><symbol id="flight-identity-user-24" viewBox="0 0 24 24"><g><path d="M7.858 14.79A2.944 2.944 0 019.875 14h4.25c.748 0 1.475.28 2.017.79.543.511.858 1.216.858 1.96v.5a.75.75 0 01-1.5 0v-.5c0-.316-.133-.63-.386-.868a1.445 1.445 0 00-.989-.382h-4.25c-.379 0-.734.142-.989.382a1.193 1.193 0 00-.386.868v.5a.75.75 0 01-1.5 0v-.5c0-.744.315-1.449.858-1.96z"/><path fill-rule="evenodd" d="M12 7.5a3 3 0 100 6 3 3 0 000-6zm-1.5 3a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M8.75 1A1.75 1.75 0 007 2.75V3H3.75A2.75 2.75 0 001 5.75v12.5A2.75 2.75 0 003.75 21h16.5A2.75 2.75 0 0023 18.25V5.75A2.75 2.75 0 0020.25 3H17v-.25A1.75 1.75 0 0015.25 1h-6.5zM17 4.5h3.25c.69 0 1.25.56 1.25 1.25v12.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V5.75c0-.69.56-1.25 1.25-1.25H7v.25c0 .966.784 1.75 1.75 1.75h6.5A1.75 1.75 0 0017 4.75V4.5zm-8.5.25c0 .138.112.25.25.25h6.5a.25.25 0 00.25-.25v-2a.25.25 0 00-.25-.25h-6.5a.25.25 0 00-.25.25v2z" clip-rule="evenodd"/></g></symbol><symbol id="flight-identity-user-16" viewBox="0 0 16 16"><g><path d="M5.187 10.482A2.324 2.324 0 016.625 10h2.75c.515 0 1.034.16 1.438.482.41.325.687.807.687 1.359v.409a.75.75 0 01-1.5 0v-.41c0-.026-.012-.098-.119-.183a.828.828 0 00-.506-.157h-2.75a.828.828 0 00-.506.157c-.107.085-.119.157-.119.184v.409a.75.75 0 01-1.5 0v-.41c0-.55.277-1.033.687-1.358z"/><path fill-rule="evenodd" d="M8 4.5a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM7 7a1 1 0 112 0 1 1 0 01-2 0z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M5.25 0C4.56 0 4 .56 4 1.25V2H2.25A2.25 2.25 0 000 4.25v8.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-8.5A2.25 2.25 0 0013.75 2H12v-.75C12 .56 11.44 0 10.75 0h-5.5zm6.5 3.5c-.228.304-.591.5-1 .5h-5.5c-.409 0-.772-.196-1-.5h-2a.75.75 0 00-.75.75v8.5c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75v-8.5a.75.75 0 00-.75-.75h-2zm-1.25-1h-5v-1h5v1z" clip-rule="evenodd"/></g></symbol><symbol id="flight-identity-service-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M12 7.25a5.75 5.75 0 100 11.5 5.75 5.75 0 000-11.5zM9.329 12h-1.46a4.26 4.26 0 012.42-2.892A8.401 8.401 0 009.33 12zm-.055 1.5H7.78a4.254 4.254 0 002.51 3.392A8.4 8.4 0 019.275 13.5zm4.436 3.392a4.254 4.254 0 002.51-3.392h-1.494a8.4 8.4 0 01-1.016 3.392zm-.49-3.392A6.9 6.9 0 0112 16.804a6.9 6.9 0 01-1.22-3.304h2.44zm-.066-1.5h-2.308A6.9 6.9 0 0112 9.196 6.9 6.9 0 0113.154 12zm1.517 0h1.46a4.26 4.26 0 00-2.42-2.892c.492.895.819 1.875.96 2.892z"/><path d="M7 2.75C7 1.784 7.784 1 8.75 1h6.5c.966 0 1.75.784 1.75 1.75V3h3.25A2.75 2.75 0 0123 5.75v12.5A2.75 2.75 0 0120.25 21H3.75A2.75 2.75 0 011 18.25V5.75A2.75 2.75 0 013.75 3H7v-.25zM20.25 4.5H17v.25a1.75 1.75 0 01-1.75 1.75h-6.5A1.75 1.75 0 017 4.75V4.5H3.75c-.69 0-1.25.56-1.25 1.25v12.5c0 .69.56 1.25 1.25 1.25h16.5c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25zM8.5 4.75v-2a.25.25 0 01.25-.25h6.5a.25.25 0 01.25.25v2a.25.25 0 01-.25.25h-6.5a.25.25 0 01-.25-.25z"/></g></symbol><symbol id="flight-identity-service-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8 5a4 4 0 100 8 4 4 0 000-8zm-.904 3H5.708a2.504 2.504 0 011.847-1.46A5.94 5.94 0 007.096 8zm-.068 1.5H5.55c.203.998 1 1.78 2.005 1.96a6.01 6.01 0 01-.527-1.96zm2.103 1.73a4.376 4.376 0 01-.594-1.73h1.913a2.504 2.504 0 01-1.319 1.73zM8.628 8c.107-.445.278-.862.503-1.23A2.51 2.51 0 0110.292 8H8.628z"/><path d="M4 1.25C4 .56 4.56 0 5.25 0h5.5C11.44 0 12 .56 12 1.25V2h1.75A2.25 2.25 0 0116 4.25v8.5A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75v-8.5A2.25 2.25 0 012.25 2H4v-.75zM10.75 4c.409 0 .772-.196 1-.5h2a.75.75 0 01.75.75v8.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75v-8.5a.75.75 0 01.75-.75h2c.228.304.591.5 1 .5h5.5zM5.5 2.5h5v-1h-5v1z"/></g></symbol><symbol id="flight-image-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M6 8.5a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0zm2.5-1a1 1 0 100 2 1 1 0 000-2z"/><path d="M2 4.75A2.75 2.75 0 014.75 2h14.5A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V4.75zm18.5 8.5v-8.5c0-.69-.56-1.25-1.25-1.25H4.75c-.69 0-1.25.56-1.25 1.25v14.5c0 .024 0 .047.002.07l10.654-8.773a2.75 2.75 0 013.644.132l2.7 2.571zM4.468 20.468l10.641-8.763a1.25 1.25 0 011.657.06l3.734 3.556v3.929c0 .69-.56 1.25-1.25 1.25H4.75c-.097 0-.191-.011-.282-.032z"/></g></symbol><symbol id="flight-image-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M5.5 3a2.5 2.5 0 100 5 2.5 2.5 0 000-5zm-1 2.5a1 1 0 112 0 1 1 0 01-2 0z"/><path d="M0 2.25A2.25 2.25 0 012.25 0h11.5A2.25 2.25 0 0116 2.25v11.5A2.25 2.25 0 0113.75 16H2.25A2.25 2.25 0 010 13.75V2.25zm14.5 0v5.94l-1.835-1.836a1.75 1.75 0 00-2.335-.125L1.5 13.336V2.25a.75.75 0 01.75-.75h11.5a.75.75 0 01.75.75zm-.75 12.25H2.446l8.825-7.103a.25.25 0 01.333.018l2.896 2.896v3.439a.75.75 0 01-.75.75z"/></g></symbol><symbol id="flight-inbox-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M7.202 3a2.75 2.75 0 00-2.428 1.46L1.32 10.958A2.75 2.75 0 001 12.248v6.002A2.75 2.75 0 003.75 21h16.5A2.75 2.75 0 0023 18.25v-6.002c0-.45-.11-.893-.321-1.29L19.226 4.46A2.75 2.75 0 0016.798 3H7.202zM6.098 5.164A1.25 1.25 0 017.202 4.5h9.596c.462 0 .887.255 1.104.664l3.366 6.336H16a.75.75 0 00-.624.334L13.599 14.5H10.4l-1.777-2.666A.75.75 0 008 11.5H2.732l3.366-6.336zM2.5 13v5.25c0 .69.56 1.25 1.25 1.25h16.5c.69 0 1.25-.56 1.25-1.25V13h-5.099l-1.777 2.666A.75.75 0 0114 16h-4a.75.75 0 01-.624-.334L7.599 13H2.5z" clip-rule="evenodd"/></symbol><symbol id="flight-inbox-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4.748 1a2.25 2.25 0 00-2.07 1.369L.18 8.235a2.25 2.25 0 00-.18.882v3.633A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75V9.117c0-.303-.061-.603-.18-.882L13.322 2.37A2.25 2.25 0 0011.252 1H4.748zm-.69 1.956a.75.75 0 01.69-.456h6.504c.3 0 .572.18.69.456L14.09 8H10.5a.75.75 0 00-.53.22L8.69 9.5H7.31L6.03 8.22A.75.75 0 005.5 8H1.91l2.148-5.044zM1.5 9.5v3.25c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75V9.5h-3.69l-1.28 1.28A.75.75 0 019 11H7a.75.75 0 01-.53-.22L5.19 9.5H1.5z" clip-rule="evenodd"/></symbol><symbol id="flight-info-24" viewBox="0 0 24 24"><g><path d="M12 10.5a.75.75 0 01.75.75v5.5a.75.75 0 01-1.5 0v-5.5a.75.75 0 01.75-.75zM12 7a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></symbol><symbol id="flight-info-16" viewBox="0 0 16 16"><g><path d="M8 7a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 018 7zM8 4a1 1 0 000 2h.007a1 1 0 000-2H8z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></symbol><symbol id="flight-info-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm-1 7a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1zm.25 3.25a.75.75 0 011.5 0v5.5a.75.75 0 01-1.5 0v-5.5z" clip-rule="evenodd"/></symbol><symbol id="flight-info-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 16A8 8 0 108 0a8 8 0 000 16zm0-9a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 018 7zm0-3a1 1 0 000 2h.007a1 1 0 000-2H8z" clip-rule="evenodd"/></symbol><symbol id="flight-jump-link-24" viewBox="0 0 24 24"><g><path d="M3.75 4a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5zM3 9.75A.75.75 0 013.75 9h6.5a.75.75 0 010 1.5h-6.5A.75.75 0 013 9.75zM3.75 14a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5zM3.75 19a.75.75 0 000 1.5H20a.75.75 0 000-1.5H3.75zM12.952 12.238a.75.75 0 011.06-.036l2.488 2.322V8.75a3.25 3.25 0 00-3.25-3.25h-2a.75.75 0 010-1.5h2A4.75 4.75 0 0118 8.75v5.774l2.488-2.322a.75.75 0 011.024 1.096l-3.75 3.5a.75.75 0 01-1.024 0l-3.75-3.5a.75.75 0 01-.036-1.06z"/></g></symbol><symbol id="flight-jump-link-16" viewBox="0 0 16 16"><g><path d="M1.75 2a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM1 6.25a.75.75 0 01.75-.75h3.5a.75.75 0 010 1.5h-3.5A.75.75 0 011 6.25zM1.75 9a.75.75 0 000 1.5h3.5a.75.75 0 000-1.5h-3.5zM1.75 12.5a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75zM7.49 6.2a.75.75 0 011.06.04l1.95 2.1V5.55c0-.545-.215-1.067-.597-1.451A2.024 2.024 0 008.467 3.5H7.25a.75.75 0 010-1.5h1.217c.939 0 1.838.375 2.5 1.041A3.56 3.56 0 0112 5.55v2.79l1.95-2.1a.75.75 0 111.1 1.02l-3.25 3.5a.75.75 0 01-1.1 0l-3.25-3.5a.75.75 0 01.04-1.06z"/></g></symbol><symbol id="flight-key-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M13.88 5.877A2.978 2.978 0 0116.001 5a2.999 2.999 0 11-2.772 4.148v-.002a2.992 2.992 0 01.651-3.27zm1.06 1.06a1.479 1.479 0 011.062-.437 1.499 1.499 0 11-1.387 2.072 1.492 1.492 0 01.324-1.633l.002-.001z"/><path d="M14.307 1.068c.34-.047.684-.068 1.021-.068 2.049 0 3.98.799 5.429 2.247a7.72 7.72 0 012.176 6.444v.001a7.725 7.725 0 01-3.8 5.642 7.697 7.697 0 01-3.811 1.012 7.653 7.653 0 01-2.553-.437l-1.04 1.04c-.225.236-.54.37-.863.37H9.6v1.089c-.008.35-.146.675-.383.926l-.007.007a1.356 1.356 0 01-.97.408H7.155v1.22c.011.323-.11.63-.331.867l-.011.012-.007.006-.926.926a.75.75 0 01-.53.22H1.75a.75.75 0 01-.75-.75v-3.616a.75.75 0 01.22-.53l6.869-6.868a7.719 7.719 0 01.572-6.369 7.72 7.72 0 015.646-3.799zm.203 1.486c.267-.037.543-.054.818-.054 1.651 0 3.2.641 4.368 1.807a6.22 6.22 0 011.75 5.185 6.225 6.225 0 01-3.057 4.54 6.173 6.173 0 01-5.464.33.833.833 0 00-.904.175l-1.282 1.281H9.135c-.578 0-1.034.47-1.034 1.034v1.397H6.69c-.578 0-1.035.47-1.035 1.034v1.6l-.616.617H2.5v-2.555l6.955-6.954a.831.831 0 00.18-.915 6.217 6.217 0 01.328-5.464 6.22 6.22 0 014.544-3.057h.003z"/></g></symbol><symbol id="flight-key-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M9.16 3.657A2.236 2.236 0 0110.752 3a2.248 2.248 0 11-2.078 3.11l-.001-.002a2.243 2.243 0 01.489-2.451zm1.06 1.061a.737.737 0 01.815-.16.748.748 0 01-.284 1.44.748.748 0 01-.532-1.278l.001-.002z"/><path d="M10.354 0a5.68 5.68 0 00-4.906 2.846 5.68 5.68 0 00-.466 4.555L.22 12.162a.75.75 0 00-.22.53v2.558c0 .414.336.75.75.75h2.547a.75.75 0 00.53-.22l.655-.655a1.072 1.072 0 00.311-.784v-.64h.548c.31 0 .618-.123.843-.355l.008-.008c.204-.216.324-.498.33-.801v-.556h.676c.288 0 .566-.117.767-.327l.638-.637a5.664 5.664 0 004.55-.468 5.683 5.683 0 002.798-4.152v-.001a5.68 5.68 0 00-1.602-4.742A5.619 5.619 0 0010.354 0zm-.548 1.536a4.12 4.12 0 013.482 1.178 4.18 4.18 0 011.176 3.483 4.183 4.183 0 01-2.054 3.05 4.163 4.163 0 01-3.671.221.75.75 0 00-.143-.043l-.023-.005a.806.806 0 00-.714.219l-.842.842H5.973a.951.951 0 00-.95.951v.768h-.779a.951.951 0 00-.95.952v1.04l-.308.308H1.5v-1.497L6.355 8.15c.22-.22.311-.567.174-.888a4.178 4.178 0 01.221-3.67 4.18 4.18 0 013.053-2.054h.003z"/></g></symbol><symbol id="flight-keychain-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M20.483 2.485a1.295 1.295 0 00-1.595.188l-.582.581c.787.228 1.514.6 2.147 1.086l.24-.255a1.04 1.04 0 00-.21-1.6zm-1.067 2.953A5 5 0 0011.5 9.5c0 .448.089.865.226 1.312.068.221.145.442.229.682l.005.016c.085.241.175.5.258.772a.75.75 0 01-.188.748l-5.78 5.78v1.69h1.94l.56-.56V18.5a.75.75 0 01.75-.75h1.25V16.5a.75.75 0 01.75-.75h1.69l1.28-1.28a.75.75 0 01.711-.198c.465.116.946.228 1.319.228a5 5 0 005-5 .75.75 0 011.5 0 6.5 6.5 0 01-6.5 6.5c-.422 0-.883-.085-1.267-.172L14.03 17.03a.75.75 0 01-.53.22h-1.25v1.25a.75.75 0 01-.75.75h-1.25v1a.75.75 0 01-.22.53l-1 1a.75.75 0 01-.53.22H1.75a.75.75 0 01-.75-.75v-2.79a.75.75 0 01.218-.529l5.168-5.193a6.887 6.887 0 01-.636-2.901C5.75 6.07 8.762 3 12.5 3h3.941l.029-.03 1.357-1.358a2.795 2.795 0 013.442-.404 2.54 2.54 0 01.515 3.907l-2.727 2.888a2.75 2.75 0 11-1.129-.988.7.7 0 01.027-.03l1.461-1.547zm-7.072-.936c-2.818.084-5.094 2.43-5.094 5.335 0 .975.257 1.887.704 2.672a.75.75 0 01-.12.9L2.5 18.77V20.5h2.25v-2a.75.75 0 01.22-.53l5.675-5.675a45.553 45.553 0 00-.1-.29l-.01-.027c-.08-.232-.166-.477-.243-.726-.16-.523-.292-1.098-.292-1.752 0-2.01.912-3.805 2.344-4.998zM16.75 8.25a1.25 1.25 0 100 2.5 1.25 1.25 0 000-2.5z" clip-rule="evenodd"/></symbol><symbol id="flight-keychain-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M10.027 1.14a2.708 2.708 0 114.139 3.49l-1.864 2.097a2.125 2.125 0 11-1.074-1.05l.614-.69a3.112 3.112 0 00-4.368 4.18.75.75 0 01-.11.897L4 13.553v.947h1.25v-1a.75.75 0 01.75-.75h.894l1.569-1.918a.75.75 0 01.799-.242 3.112 3.112 0 004.02-2.978.75.75 0 011.5 0 4.612 4.612 0 01-5.457 4.535l-1.494 1.828a.75.75 0 01-.581.275h-.5v1A.75.75 0 016 16H3.25a.75.75 0 01-.75-.75V14H.75a.75.75 0 01-.75-.75v-2a.75.75 0 01.21-.52l3.208-3.328a4.612 4.612 0 016.327-5.91l.282-.352zm-.56 1.913a.755.755 0 01-.118-.062 3.112 3.112 0 00-4.515 3.906c.202.445.165 1.026-.231 1.438L1.5 11.553v.947h1.431l2.987-3.098a4.613 4.613 0 013.549-6.35zm.987-.044c.889.054 1.71.36 2.393.847l.197-.222A1.208 1.208 0 1011.2 2.077l-.745.932zm-.079 3.99a.625.625 0 100 1.25.625.625 0 000-1.25z" clip-rule="evenodd"/></symbol><symbol id="flight-key-values-24" viewBox="0 0 24 24"><g><path d="M3.75 5a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5zM10.75 9a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5zM3 9.75A.75.75 0 013.75 9h3.5a.75.75 0 010 1.5h-3.5A.75.75 0 013 9.75zM3.75 13a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM3 17.75a.75.75 0 01.75-.75h3.5a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75zM10.75 5a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5zM10 13.75a.75.75 0 01.75-.75h7.5a.75.75 0 010 1.5h-7.5a.75.75 0 01-.75-.75zM10.75 17a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5z"/></g></symbol><symbol id="flight-key-values-16" viewBox="0 0 16 16"><g><path d="M1.75 2a.75.75 0 000 1.5h1a.75.75 0 000-1.5h-1zM6.75 5.5a.75.75 0 000 1.5h3.5a.75.75 0 000-1.5h-3.5zM1 6.25a.75.75 0 01.75-.75h1.5a.75.75 0 010 1.5h-1.5A.75.75 0 011 6.25zM1.75 9a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM1 13.25a.75.75 0 01.75-.75h1.5a.75.75 0 010 1.5h-1.5a.75.75 0 01-.75-.75zM6.75 2a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5zM6 9.75A.75.75 0 016.75 9h5.5a.75.75 0 010 1.5h-5.5A.75.75 0 016 9.75zM6.75 12.5a.75.75 0 000 1.5h7.5a.75.75 0 000-1.5h-7.5z"/></g></symbol><symbol id="flight-labyrinth-24" viewBox="0 0 24 24"><path d="M1.694 10.094C2.59 5.216 6.864 1.52 12 1.52c5.45 0 9.929 4.16 10.432 9.479h-2.525a7.977 7.977 0 00-5.63-6.639.75.75 0 10-.428 1.438A6.469 6.469 0 115.55 12.5h2.543c.122.964.593 1.82 1.28 2.435a.75.75 0 101.001-1.118 2.437 2.437 0 113.25 0 .75.75 0 001 1.118A3.938 3.938 0 108.19 11H5.609a6.477 6.477 0 014.543-5.201.75.75 0 10-.427-1.438 7.969 7.969 0 1010.23 8.139h2.513c-.26 5.555-4.847 9.98-10.467 9.98-5.136 0-9.41-3.697-10.306-8.574a.75.75 0 00-1.476.271C1.243 19.754 6.127 23.98 12 23.98c6.616 0 11.98-5.363 11.98-11.98C23.98 5.385 18.615.022 12 .022 6.127.02 1.243 4.246.218 9.823a.75.75 0 101.476.27z"/></symbol><symbol id="flight-labyrinth-16" viewBox="0 0 16 16"><path d="M8 1.5a6.502 6.502 0 00-6.392 5.317.75.75 0 11-1.476-.27 8 8 0 110 2.907.75.75 0 011.476-.272A6.502 6.502 0 0014.48 8.5h-1.555a4.95 4.95 0 11-6.34-5.231.7.7 0 11.4 1.342A3.558 3.558 0 004.595 7h1.167a2.45 2.45 0 113.87 2.826.7.7 0 01-.933-1.043 1.05 1.05 0 10-1.4 0 .7.7 0 01-.934 1.043A2.45 2.45 0 015.601 8.5H4.483a3.55 3.55 0 104.531-3.89.7.7 0 01.4-1.341 4.958 4.958 0 013.432 3.73h1.578A6.501 6.501 0 008 1.5z"/></symbol><symbol id="flight-layers-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M11.658 1.082a.75.75 0 01.684 0l10.25 5.25a.75.75 0 010 1.336l-10.25 5.25a.75.75 0 01-.684 0l-10.25-5.25a.75.75 0 010-1.336l10.25-5.25zM3.395 7L12 11.407 20.605 7 12 2.593 3.395 7z" clip-rule="evenodd"/><path d="M1.089 16.395a.75.75 0 011.016-.306L12 21.399l9.895-5.31a.75.75 0 01.71 1.322l-10.25 5.5a.75.75 0 01-.71 0l-10.25-5.5a.75.75 0 01-.306-1.016z"/><path d="M2.105 11.089a.75.75 0 00-.71 1.322l10.25 5.5a.75.75 0 00.71 0l10.25-5.5a.75.75 0 00-.71-1.322L12 16.399l-9.895-5.31z"/></g></symbol><symbol id="flight-layers-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M7.656.084a.75.75 0 01.689 0l7.25 3.75a.75.75 0 010 1.332l-7.25 3.75a.75.75 0 01-.69 0l-7.25-3.75a.75.75 0 010-1.332l7.25-3.75zM2.383 4.5L8 7.405 13.617 4.5 8 1.594 2.383 4.5z" clip-rule="evenodd"/><path d="M.093 10.887a.75.75 0 011.02-.294L8 14.393l6.887-3.8a.75.75 0 11.725 1.313l-7.25 4a.75.75 0 01-.724 0l-7.25-4a.75.75 0 01-.295-1.019z"/><path d="M1.112 7.093a.75.75 0 10-.724 1.313l7.25 4a.75.75 0 00.724 0l7.25-4a.75.75 0 10-.725-1.313L8 10.893l-6.888-3.8z"/></g></symbol><symbol id="flight-layout-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h14.5A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V4.75zM9 20.5h10.25c.69 0 1.25-.56 1.25-1.25V9.5H9v11zm-1.5-11v11H4.75c-.69 0-1.25-.56-1.25-1.25V9.5h4zm13-1.5V4.75c0-.69-.56-1.25-1.25-1.25H4.75c-.69 0-1.25.56-1.25 1.25V8h17z" clip-rule="evenodd"/></symbol><symbol id="flight-layout-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h9.5A2.25 2.25 0 0115 3.25v9.5A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-9.5zM6.5 13.5h6.25a.75.75 0 00.75-.75V6.5h-7v7zM5 6.5v7H3.25a.75.75 0 01-.75-.75V6.5H5zM13.5 5V3.25a.75.75 0 00-.75-.75h-9.5a.75.75 0 00-.75.75V5h11z" clip-rule="evenodd"/></symbol><symbol id="flight-learn-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12.367 3.096a.75.75 0 00-.734 0l-10.25 5.75a.75.75 0 000 1.308l2.82 1.582A.747.747 0 004 12.25v5a.75.75 0 00.12.407l.63-.407-.63.408.001.001.002.002.003.005.009.013a2.202 2.202 0 00.118.162c.08.1.194.237.348.397.308.321.774.736 1.427 1.147C7.34 20.21 9.378 21 12.345 21c2.968 0 4.854-.79 6.018-1.646a5.597 5.597 0 001.209-1.193 3.945 3.945 0 00.339-.553 1.8 1.8 0 00.02-.043l.007-.016.002-.006.001-.002v-.001s.001-.002-.691-.29l.692.288A.75.75 0 0020 17.25v-5a.747.747 0 00-.203-.514l2.82-1.582a.75.75 0 000-1.308l-10.25-5.75zm6.133 9.368l-6.133 3.44a.75.75 0 01-.734 0L5.5 12.464v4.533c.047.055.107.124.182.202.233.242.605.577 1.144.916 1.072.675 2.833 1.385 5.52 1.385 2.686 0 4.252-.71 5.128-1.354.442-.325.722-.644.887-.87.061-.084.107-.155.139-.21v-4.602zM12 14.39L3.283 9.5 12 4.61l8.717 4.89L12 14.39z" clip-rule="evenodd"/></symbol><symbol id="flight-learn-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8.316 2.07a.75.75 0 00-.632 0l-7 3.25a.75.75 0 000 1.36l1.434.666A.746.746 0 002 7.75V11a.75.75 0 00.158.46L2.75 11l-.592.46.001.002.001.001.003.004.008.01a1.882 1.882 0 00.103.12c.068.076.165.178.292.299.254.24.63.555 1.132.866C4.706 13.388 6.217 14 8.25 14c2.037 0 3.44-.615 4.345-1.266a5.32 5.32 0 00.977-.902 3.916 3.916 0 00.322-.448l.007-.012.003-.004v-.002h.001c0-.001 0-.002-.655-.366l.655.365A.754.754 0 0014 11V7.75a.747.747 0 00-.118-.404l1.434-.666a.75.75 0 000-1.36l-7-3.25zM12.5 7.988L8.316 9.93a.75.75 0 01-.632 0L3.5 7.988v2.723a5.585 5.585 0 00.99.776c.804.5 2.043 1.013 3.76 1.013 1.713 0 2.81-.51 3.468-.984a3.812 3.812 0 00.782-.745V7.988zM8 8.423L2.781 6 8 3.577 13.219 6 8 8.423z" clip-rule="evenodd"/></symbol><symbol id="flight-learn-link-24" viewBox="0 0 24 24"><g><path d="M18.75 1a.75.75 0 000 1.5h1.69l-2.97 2.97a.75.75 0 001.06 1.06l2.97-2.97v1.69a.75.75 0 001.5 0v-3.5a.75.75 0 00-.75-.75h-3.5z"/><path fill-rule="evenodd" d="M11.856 5.09a.75.75 0 00-.712 0l-9.75 5.25a.75.75 0 000 1.32l2.627 1.415A.752.752 0 004 13.25v5.333a.75.75 0 00.067.31l.683-.31-.683.31v.002l.002.003.003.006.007.016a1.657 1.657 0 00.094.168c.061.101.151.234.277.387.251.308.643.694 1.23 1.072C6.857 21.306 8.772 22 11.82 22c3.043 0 4.827-.692 5.87-1.487.52-.397.838-.806 1.029-1.138a2.714 2.714 0 00.244-.557c.005-.018.01-.034.012-.048l.005-.018.001-.007.001-.004v-.001s0-.002-.733-.157l.734.155a.752.752 0 00.016-.155V13.25c0-.06-.007-.12-.02-.175l2.626-1.415a.75.75 0 000-1.32l-9.75-5.25zM17.5 13.87l-5.644 3.04a.75.75 0 01-.712 0L5.5 13.87v4.508c.028.04.064.09.11.146.158.192.434.472.882.761.892.575 2.513 1.214 5.33 1.214 2.823 0 4.253-.641 4.959-1.18a2.41 2.41 0 00.64-.695c.039-.067.064-.121.079-.159v-4.595zm-6 1.527L3.332 11 11.5 6.602 19.668 11 11.5 15.398z" clip-rule="evenodd"/></g></symbol><symbol id="flight-learn-link-16" viewBox="0 0 16 16"><g><path d="M12.75 0a.75.75 0 000 1.5h.69l-1.97 1.97a.75.75 0 001.06 1.06l1.97-1.97v.69a.75.75 0 001.5 0V.75a.75.75 0 00-.75-.75h-2.5z"/><path fill-rule="evenodd" d="M8.075 4.074a.75.75 0 00-.65 0l-6.75 3.25a.75.75 0 000 1.352L2 9.314v3.511a.75.75 0 00.064.302l.686-.302c-.686.302-.686.304-.686.304l.002.004.003.006.006.013a1.268 1.268 0 00.075.139c.047.08.116.184.21.303.19.238.483.533.917.82.871.575 2.265 1.086 4.45 1.086 2.177 0 3.487-.508 4.271-1.122.39-.305.632-.623.78-.884a2.194 2.194 0 00.19-.447l.01-.041.004-.017.001-.007.001-.003v-.001s0-.002-.734-.153l.735.151c.01-.05.015-.1.015-.151v-3.27l1.825-.88a.75.75 0 000-1.35l-6.75-3.25zm3.425 6.203l-3.425 1.649a.75.75 0 01-.65 0L3.5 10.036v2.579l.033.043c.098.123.276.309.57.504.585.386 1.679.838 3.623.838 1.95 0 2.902-.454 3.348-.803.225-.176.34-.34.396-.44a.878.878 0 00.03-.057v-2.423zm-3.75.14L2.729 8 7.75 5.582 12.771 8 7.75 10.418z" clip-rule="evenodd"/></g></symbol><symbol id="flight-line-chart-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M3.75 2A2.75 2.75 0 001 4.75v14.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V4.75A2.75 2.75 0 0020.25 2H3.75zM2.5 16.353v2.897c0 .69.56 1.25 1.25 1.25H8v-.75a.75.75 0 011.5 0v.75h5v-.75a.75.75 0 011.5 0v.75h4.25c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H3.75c-.69 0-1.25.56-1.25 1.25v9.656l6.007-4.971a.748.748 0 01.842-.1l5.572 2.787L18.55 9.4a.75.75 0 11.9 1.2l-3.987 2.99a.754.754 0 01-.812.074l-5.55-2.775L2.5 16.353z" clip-rule="evenodd"/></symbol><symbol id="flight-line-chart-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-9.5A2.25 2.25 0 0013.75 1H2.25zM1.5 3.25a.75.75 0 01.75-.75h11.5a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75H11V13a.75.75 0 00-1.5 0v.5h-3V13A.75.75 0 005 13v.5H2.25a.75.75 0 01-.75-.75v-1.19l4.636-3.708 3.586 1.345a.752.752 0 00.76-.122l2.487-1.99a.75.75 0 10-.938-1.17L9.864 7.647 6.28 6.303a.754.754 0 00-.754.116L1.5 9.64V3.25z" clip-rule="evenodd"/></symbol><symbol id="flight-line-chart-up-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M1 4.75A2.75 2.75 0 013.75 2h16.5A2.75 2.75 0 0123 4.75v14.5A2.75 2.75 0 0120.25 22H3.75A2.75 2.75 0 011 19.25v-2.236V4.75zm1.5 12.644v1.856c0 .69.56 1.25 1.25 1.25H8v-.75a.75.75 0 011.5 0v.75h5v-.75a.75.75 0 011.5 0v.75h4.25c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H3.75c-.69 0-1.25.56-1.25 1.25v10.822l6.074-4.19a.746.746 0 01.721-.072l4.304 1.722 2.163-5.047-1.554.699a.75.75 0 01-.616-1.368l3.192-1.436a.75.75 0 01.992.376l1.436 3.192a.75.75 0 11-1.368.615l-.687-1.526-2.463 5.747a.75.75 0 01-.973.413l-4.626-1.851L2.5 17.394z" clip-rule="evenodd"/></symbol><symbol id="flight-line-chart-up-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h11.5A2.25 2.25 0 0116 3.25v9.5A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v7.075L5.61 7.86a.73.73 0 01.278-.101.747.747 0 01.318.02L9.08 8.6l1.328-2.988-.9.405a.75.75 0 01-.615-1.368l2.58-1.16a.75.75 0 01.991.376l1.16 2.58a.75.75 0 01-1.367.615l-.428-.951-1.638 3.686a.75.75 0 01-.908.423L6.107 9.31 1.5 12.075v.675c0 .414.336.75.75.75H5V13a.75.75 0 011.5 0v.5h3V13a.75.75 0 011.5 0v.5h2.75a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75H2.25z" clip-rule="evenodd"/></symbol><symbol id="flight-link-24" viewBox="0 0 24 24"><g><path d="M16.575 2a5.48 5.48 0 00-3.848 1.531L11.094 5.15a.75.75 0 001.056 1.065l1.62-1.606a3.98 3.98 0 015.567.052 3.951 3.951 0 01.053 5.542l-2.829 2.82a3.974 3.974 0 01-3.094 1.15 3.984 3.984 0 01-2.898-1.577.75.75 0 10-1.2.9 5.47 5.47 0 003.991 2.174 5.486 5.486 0 004.26-1.585l2.834-2.824.009-.01a5.45 5.45 0 00-.067-7.652A5.48 5.48 0 0016.576 2z"/><path d="M10.64 8.33a5.486 5.486 0 00-4.26 1.585L3.545 12.74l-.009.01a5.45 5.45 0 00.067 7.652 5.48 5.48 0 007.67.067l1.624-1.62a.75.75 0 10-1.06-1.062l-1.61 1.605a3.98 3.98 0 01-5.565-.052 3.951 3.951 0 01-.053-5.543l2.829-2.82a3.973 3.973 0 013.094-1.15 3.984 3.984 0 012.898 1.578.75.75 0 001.2-.9A5.468 5.468 0 0010.64 8.33z"/></g></symbol><symbol id="flight-link-16" viewBox="0 0 16 16"><g><path d="M11.141 1a3.893 3.893 0 00-2.738 1.093L7.314 3.175A.75.75 0 008.372 4.24l1.077-1.07a2.393 2.393 0 013.384 3.382l-1.881 1.88a2.393 2.393 0 01-3.608-.258.75.75 0 00-1.202.899 3.893 3.893 0 005.87.42l1.886-1.886.01-.009A3.893 3.893 0 0011.14 1z"/><path d="M7.019 5.365a3.893 3.893 0 00-3.032 1.13L2.102 8.382l-.01.01a3.893 3.893 0 005.505 5.504l1.084-1.084a.75.75 0 00-1.06-1.06l-1.07 1.07a2.393 2.393 0 01-3.384-3.384l1.881-1.88a2.393 2.393 0 013.609.258.75.75 0 101.2-.899A3.893 3.893 0 007.02 5.365z"/></g></symbol><symbol id="flight-list-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M2.5 5.75A.75.75 0 013.25 5h1a.75.75 0 010 1.5h-1a.75.75 0 01-.75-.75zm4.5 0A.75.75 0 017.75 5h13a.75.75 0 010 1.5h-13A.75.75 0 017 5.75zm-4.5 6a.75.75 0 01.75-.75h1a.75.75 0 010 1.5h-1a.75.75 0 01-.75-.75zm4.5 0a.75.75 0 01.75-.75h13a.75.75 0 010 1.5h-13a.75.75 0 01-.75-.75zm-4.5 6a.75.75 0 01.75-.75h1a.75.75 0 010 1.5h-1a.75.75 0 01-.75-.75zm4.5 0a.75.75 0 01.75-.75h13a.75.75 0 010 1.5h-13a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-list-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M2 3.75A.75.75 0 012.75 3h.5a.75.75 0 010 1.5h-.5A.75.75 0 012 3.75zm4 0A.75.75 0 016.75 3h6.5a.75.75 0 010 1.5h-6.5A.75.75 0 016 3.75zm-4 4A.75.75 0 012.75 7h.5a.75.75 0 010 1.5h-.5A.75.75 0 012 7.75zm4 0A.75.75 0 016.75 7h6.5a.75.75 0 010 1.5h-6.5A.75.75 0 016 7.75zm-4 4a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75zm4 0a.75.75 0 01.75-.75h6.5a.75.75 0 010 1.5h-6.5a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-load-balancer-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 2a.75.75 0 01.75.75V11h6.69l-1.72-1.72a.75.75 0 011.06-1.06l3 3a.75.75 0 010 1.06l-3 3a.75.75 0 11-1.06-1.06l1.72-1.72h-6.69v6.94l1.72-1.72a.75.75 0 111.06 1.06l-3 3a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l1.72 1.72V12.5H4.56l1.72 1.72a.75.75 0 11-1.06 1.06l-3-3a.75.75 0 010-1.06l3-3a.75.75 0 011.06 1.06L4.56 11h6.69V2.75A.75.75 0 0112 2z" clip-rule="evenodd"/></symbol><symbol id="flight-load-balancer-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 1a.75.75 0 01.75.75V7h3.69l-.97-.97a.75.75 0 011.06-1.06l2.25 2.25a.75.75 0 010 1.06l-2.25 2.25a.75.75 0 11-1.06-1.06l.97-.97H8.75v4.08l1.002-.89a.75.75 0 01.996 1.12l-2.25 2a.75.75 0 01-.996 0l-2.25-2a.75.75 0 01.996-1.12l1.002.89V8.5H3.56l.97.97a.75.75 0 11-1.06 1.06L1.22 8.28a.75.75 0 010-1.06l2.25-2.25a.75.75 0 011.06 1.06L3.56 7h3.69V1.75A.75.75 0 018 1z" clip-rule="evenodd"/></symbol><symbol id="flight-lock-24" viewBox="0 0 24 24"><g><path d="M12 16.25a.75.75 0 01.75.75v2a.75.75 0 01-1.5 0v-2a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M6 10.104V6.75c0-1.537.641-3.003 1.77-4.079A6.136 6.136 0 0112 1c1.58 0 3.102.597 4.23 1.671A5.632 5.632 0 0118 6.75v3.354c1.154.326 2 1.387 2 2.646v7.5A2.75 2.75 0 0117.25 23H6.75A2.75 2.75 0 014 20.25v-7.5c0-1.259.846-2.32 2-2.646zm2.805-6.346A4.636 4.636 0 0112 2.5c1.205 0 2.354.456 3.195 1.258.84.8 1.305 1.877 1.305 2.992V10h-9V6.75c0-1.115.465-2.192 1.305-2.992zM17.25 11.5H6.75c-.69 0-1.25.56-1.25 1.25v7.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25v-7.5c0-.69-.56-1.25-1.25-1.25z" clip-rule="evenodd"/></g></symbol><symbol id="flight-lock-16" viewBox="0 0 16 16"><g><path d="M8 9.25a.75.75 0 01.75.75v1a.75.75 0 01-1.5 0v-1A.75.75 0 018 9.25z"/><path fill-rule="evenodd" d="M4 5.014v-.93c0-1.078.417-2.114 1.165-2.881A3.96 3.96 0 018 0a3.96 3.96 0 012.835 1.203A4.127 4.127 0 0112 4.083v.93a2.25 2.25 0 012 2.237v5.5A2.25 2.25 0 0111.75 15h-7.5A2.25 2.25 0 012 12.75v-5.5a2.25 2.25 0 012-2.236zM6.239 2.25A2.46 2.46 0 018 1.5c.657 0 1.29.267 1.761.75.471.483.739 1.142.739 1.833V5h-5v-.917c0-.69.268-1.35.739-1.833zM11.75 6.5a.75.75 0 01.75.75v5.5a.75.75 0 01-.75.75h-7.5a.75.75 0 01-.75-.75v-5.5a.75.75 0 01.75-.75h7.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-lock-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M6 10.104V6.75c0-1.537.641-3.003 1.77-4.079A6.136 6.136 0 0112 1c1.58 0 3.102.597 4.23 1.671A5.632 5.632 0 0118 6.75v3.354c1.154.326 2 1.387 2 2.646v7.5A2.75 2.75 0 0117.25 23H6.75A2.75 2.75 0 014 20.25v-7.5c0-1.259.846-2.32 2-2.646zm2.805-6.346A4.636 4.636 0 0112 2.5c1.205 0 2.354.456 3.195 1.258.84.8 1.305 1.877 1.305 2.992V10h-9V6.75c0-1.115.465-2.192 1.305-2.992zM12 16.25a.75.75 0 00-.75.75v2a.75.75 0 001.5 0v-2a.75.75 0 00-.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-lock-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4 5.014v-.93c0-1.078.417-2.114 1.165-2.881A3.96 3.96 0 018 0a3.96 3.96 0 012.835 1.203A4.127 4.127 0 0112 4.083v.93a2.25 2.25 0 012 2.237v5.5A2.25 2.25 0 0111.75 15h-7.5A2.25 2.25 0 012 12.75v-5.5a2.25 2.25 0 012-2.236zM6.239 2.25A2.46 2.46 0 018 1.5c.657 0 1.29.267 1.761.75.471.483.739 1.142.739 1.833V5h-5v-.917c0-.69.268-1.35.739-1.833zM8 9.25a.75.75 0 00-.75.75v1a.75.75 0 001.5 0v-1A.75.75 0 008 9.25z" clip-rule="evenodd"/></symbol><symbol id="flight-lock-off-24" viewBox="0 0 24 24"><g><path d="M12.75 17a.75.75 0 00-1.5 0v2a.75.75 0 001.5 0v-2z"/><path fill-rule="evenodd" d="M1.53.47A.75.75 0 00.47 1.53L6 7.06v3.044a2.751 2.751 0 00-2 2.646v7.5A2.75 2.75 0 006.75 23h10.5c1.271 0 2.34-.862 2.656-2.034l2.564 2.564a.75.75 0 101.06-1.06l-22-22zM18.5 19.56l-8.06-8.06H6.75c-.69 0-1.25.56-1.25 1.25v7.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25v-.69zM8.94 10L7.5 8.56V10h1.44z" clip-rule="evenodd"/><path d="M12 2.5a4.636 4.636 0 00-3.195 1.258c-.123.117-.238.24-.345.368a.75.75 0 01-1.153-.959c.144-.173.298-.338.463-.496A6.136 6.136 0 0112 1c1.58 0 3.102.597 4.23 1.671A5.632 5.632 0 0118 6.75v3.354c1.154.326 2 1.387 2 2.646v2.75a.75.75 0 01-1.5 0v-2.75c0-.69-.56-1.25-1.25-1.25H14.5a.75.75 0 010-1.5h2V6.75a4.133 4.133 0 00-1.305-2.992A4.636 4.636 0 0012 2.5z"/></g></symbol><symbol id="flight-lock-off-16" viewBox="0 0 16 16"><g><path d="M8 1.5a2.46 2.46 0 00-1.761.75.75.75 0 01-1.074-1.047A3.96 3.96 0 018 0a3.96 3.96 0 012.835 1.203A4.127 4.127 0 0112 4.083v.93a2.25 2.25 0 012 2.237V9.5a.75.75 0 01-1.5 0V7.25a.75.75 0 00-.75-.75H9.5a.75.75 0 010-1.5h1v-.917c0-.69-.268-1.35-.739-1.833A2.46 2.46 0 008 1.5z"/><path fill-rule="evenodd" d="M3.958 5.019A2.25 2.25 0 002 7.25v5.5A2.25 2.25 0 004.25 15h7.5c.606 0 1.156-.24 1.56-.629l1.16 1.16a.75.75 0 101.06-1.061l-14-14A.75.75 0 00.47 1.53L3.958 5.02zM4.25 6.5a.75.75 0 00-.75.75v5.5c0 .414.336.75.75.75h7.5a.749.749 0 00.5-.19L5.44 6.5H4.25z" clip-rule="evenodd"/></g></symbol><symbol id="flight-logs-24" viewBox="0 0 24 24"><g><path d="M7.84 2.287a.75.75 0 01-.127 1.053L4.963 5.5l2.75 2.16a.75.75 0 01-.926 1.18l-3.5-2.75a.75.75 0 010-1.18l3.5-2.75a.75.75 0 011.053.127zM11.16 2.287a.75.75 0 00.127 1.053l2.75 2.16-2.75 2.16a.75.75 0 00.926 1.18l3.5-2.75a.75.75 0 000-1.18l-3.5-2.75a.75.75 0 00-1.053.127zM3.75 11.5a.75.75 0 000 1.5h16.5a.75.75 0 000-1.5H3.75zM3 16.75a.75.75 0 01.75-.75h16.5a.75.75 0 010 1.5H3.75a.75.75 0 01-.75-.75zM3.75 20.5a.75.75 0 000 1.5h10.5a.75.75 0 000-1.5H3.75z"/></g></symbol><symbol id="flight-logs-16" viewBox="0 0 16 16"><g><path d="M5.314 1.256a.75.75 0 01-.07 1.058L3.889 3.5l1.355 1.186a.75.75 0 11-.988 1.128l-2-1.75a.75.75 0 010-1.128l2-1.75a.75.75 0 011.058.07zM7.186 1.256a.75.75 0 00.07 1.058L8.611 3.5 7.256 4.686a.75.75 0 10.988 1.128l2-1.75a.75.75 0 000-1.128l-2-1.75a.75.75 0 00-1.058.07zM2.75 7.5a.75.75 0 000 1.5h10.5a.75.75 0 000-1.5H2.75zM2 11.25a.75.75 0 01.75-.75h10.5a.75.75 0 010 1.5H2.75a.75.75 0 01-.75-.75zM2.75 13.5a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5z"/></g></symbol><symbol id="flight-mail-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M1 5.75A2.75 2.75 0 013.75 3h16.5A2.75 2.75 0 0123 5.75v12.5A2.75 2.75 0 0120.25 21H3.75A2.75 2.75 0 011 18.25V5.75zM3.75 4.5a1.25 1.25 0 00-1.057.582L12 12.062l9.307-6.98A1.25 1.25 0 0020.25 4.5H3.75zM2.5 16.44V6.812l5.501 4.125L2.5 16.44zm.031 2.09c.127.555.625.97 1.219.97h16.5a1.25 1.25 0 001.219-.97l-6.682-6.683L12.45 13.6a.75.75 0 01-.9 0l-2.337-1.752-6.682 6.681zM16 10.937L21.5 16.44V6.813l-5.501 4.125z" clip-rule="evenodd"/></symbol><symbol id="flight-mail-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h11.5A2.25 2.25 0 0116 3.25v9.5A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75v-9.5zm2.25-.75a.75.75 0 00-.748.69L8 8.297l6.498-5.105a.75.75 0 00-.748-.691H2.25zm-.75 9.885V5.097l3.865 3.037L1.5 12.385zM2.514 13.5h10.972L9.452 9.063l-.989.777a.75.75 0 01-.926 0l-.99-.777L2.515 13.5zm8.12-5.366l3.866 4.251V5.097l-3.865 3.037z" clip-rule="evenodd"/></symbol><symbol id="flight-mail-open-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M13 .335a2.75 2.75 0 00-2 0l-8.25 3.22A2.75 2.75 0 001 6.116V18.25A2.75 2.75 0 003.75 21h16.5A2.75 2.75 0 0023 18.25V6.116a2.75 2.75 0 00-1.75-2.561L13 .335zm-1.454 1.397a1.25 1.25 0 01.908 0l8.25 3.22c.48.187.796.65.796 1.164v.134a.746.746 0 00-.4.116l-9.11 5.753L2.5 6.425v-.309c0-.514.316-.977.796-1.164l8.25-3.22zM2.5 8.175v8.264l5.165-5.165-5.165-3.1zm.031 10.354c.127.556.625.971 1.219.971h16.5a1.25 1.25 0 001.219-.97l-6.51-6.511-2.559 1.615a.75.75 0 01-.786.01l-2.623-1.575-6.46 6.46zM21.5 16.44V7.887l-5.242 3.31L21.5 16.44z" clip-rule="evenodd"/></symbol><symbol id="flight-mail-open-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8.803.254a2.25 2.25 0 00-1.606 0L1.447 2.45A2.25 2.25 0 000 4.552v8.198A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75V4.552a2.25 2.25 0 00-1.447-2.102L8.803.254zm-1.07 1.401a.75.75 0 01.535 0l5.75 2.196a.75.75 0 01.302.213L8 8.578 1.68 4.064a.749.749 0 01.302-.213l5.75-2.196zM1.5 5.78v6.6L5.116 8.36 1.5 5.78zM2.509 13.5h10.982L9.656 9.239l-1.22.871a.75.75 0 01-.872 0l-1.22-.871L2.509 13.5zM14.5 12.379v-6.6l-3.616 2.583 3.616 4.017z" clip-rule="evenodd"/></symbol><symbol id="flight-mainframe-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M4 3.75A2.75 2.75 0 016.75 1h10.5A2.75 2.75 0 0120 3.75v16.5A2.75 2.75 0 0117.25 23H6.75A2.75 2.75 0 014 20.25V3.75zM6.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25V3.75c0-.69-.56-1.25-1.25-1.25H6.75zm1.5 3.75A.75.75 0 019 5.5h6A.75.75 0 0115 7H9a.75.75 0 01-.75-.75zm0 4A.75.75 0 019 9.5h6a.75.75 0 010 1.5H9a.75.75 0 01-.75-.75zm0 4A.75.75 0 019 13.5h6a.75.75 0 010 1.5H9a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-mainframe-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3 3.25A2.25 2.25 0 015.25 1h5.5A2.25 2.25 0 0113 3.25v9.5A2.25 2.25 0 0110.75 15h-5.5A2.25 2.25 0 013 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h5.5a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75h-5.5zm.5 2.25A.75.75 0 016.5 4h3a.75.75 0 010 1.5h-3a.75.75 0 01-.75-.75zm0 2.5a.75.75 0 01.75-.75h3a.75.75 0 010 1.5h-3a.75.75 0 01-.75-.75zm0 2.5A.75.75 0 016.5 9h3a.75.75 0 010 1.5h-3a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-map-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M6.926 1.607a1.75 1.75 0 011.614-.064L16.099 5.1a.25.25 0 00.23-.01l5.053-2.886C22.548 1.537 24 2.379 24 3.724V17.42a1.75 1.75 0 01-.882 1.52l-6.044 3.453a1.75 1.75 0 01-1.614.064L7.901 18.9a.25.25 0 00-.23.01l-5.053 2.886C1.452 22.463 0 21.621 0 20.276V6.58c0-.628.337-1.208.882-1.52l6.044-3.453zm-5.3 4.756L7 3.293v14.274l-.074.04-5.052 2.887a.25.25 0 01-.374-.217V6.58a.25.25 0 01.126-.217zm6.914 11.18a1.557 1.557 0 00-.04-.018V3.182l6.96 3.275.04.018v14.343l-6.96-3.275zM17 20.708l5.374-3.071a.25.25 0 00.126-.217V3.723a.25.25 0 00-.374-.217l-5.052 2.887a1.755 1.755 0 01-.074.04v14.275z" clip-rule="evenodd"/></symbol><symbol id="flight-map-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M5.2 1.187c.34-.17.738-.176 1.083-.016l3.983 1.843 4.003-1.668A1.25 1.25 0 0116 2.5v8.941c0 .473-.268.906-.691 1.118l-4.508 2.254c-.34.17-.74.176-1.085.017l-3.982-1.844-4.003 1.668A1.25 1.25 0 010 13.5V4.56c0-.474.268-.907.691-1.119l4.508-2.254zM1.5 4.714L5 2.964v8.703l-3.5 1.458V4.714zm8 8.362l-3-1.389V2.925l3 1.389v8.763zm1.5-.04l3.5-1.75v-8.41L11 4.332v8.704z" clip-rule="evenodd"/></symbol><symbol id="flight-map-pin-24" viewBox="0 0 24 24"><g><path d="M11.585 23.875L12 23.25l.415.625a.75.75 0 01-.83 0z"/><path fill-rule="evenodd" d="M12 6a4 4 0 100 8 4 4 0 000-8zm-2.5 4a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M11.585 23.875L12 23.25c.415.625.416.624.416.624l.002-.001.006-.004.023-.015.083-.057c.071-.05.175-.122.305-.216a31.98 31.98 0 004.333-3.777C19.51 17.344 22 13.837 22 9.954a9.932 9.932 0 00-2.93-7.04A10.023 10.023 0 0012 0a10.023 10.023 0 00-7.07 2.914A9.932 9.932 0 002 9.954c0 3.883 2.49 7.39 4.832 9.85a31.978 31.978 0 004.333 3.777c.13.094.234.166.306.216l.082.057.023.015.006.004.003.002zM5.988 3.978A8.523 8.523 0 0112 1.5c2.255 0 4.418.892 6.012 2.478A8.432 8.432 0 0120.5 9.955c0 3.276-2.135 6.417-4.418 8.815A30.46 30.46 0 0112 22.334a30.463 30.463 0 01-4.082-3.564C5.635 16.372 3.5 13.23 3.5 9.955c0-2.242.895-4.392 2.488-5.977z" clip-rule="evenodd"/></g></symbol><symbol id="flight-map-pin-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8 4.5a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM7 7a1 1 0 112 0 1 1 0 01-2 0z"/><path d="M8 0C4.138 0 1 3.114 1 6.964a6.927 6.927 0 002.085 4.957l4.42 3.892a.75.75 0 00.99 0l4.42-3.892A6.927 6.927 0 0015 6.964C15 3.114 11.862 0 8 0zM2.5 6.964C2.5 3.95 4.958 1.5 8 1.5s5.5 2.45 5.5 5.464c0 1.5-.607 2.858-1.594 3.847L8 14.251l-3.906-3.44A5.427 5.427 0 012.5 6.964z"/></g></symbol><symbol id="flight-maximize-24" viewBox="0 0 24 24"><g><path d="M15.75 2a.75.75 0 000 1.5h3.69l-5.22 5.22a.75.75 0 001.06 1.06l5.22-5.22v3.69a.75.75 0 001.5 0v-5.5l-.001-.039a.745.745 0 00-.462-.654A.748.748 0 0021.25 2h-5.5zM3.5 15.75a.75.75 0 00-1.5 0v5.5a.748.748 0 00.75.75h5.5a.75.75 0 000-1.5H4.56l5.22-5.22a.75.75 0 10-1.06-1.06L3.5 19.44v-3.69z"/></g></symbol><symbol id="flight-maximize-16" viewBox="0 0 16 16"><g><path d="M10.25 1a.75.75 0 000 1.5h2.19L9.47 5.47a.75.75 0 001.06 1.06l2.97-2.97v2.19a.75.75 0 001.5 0v-4a.75.75 0 00-.75-.75h-4zM2.5 10.25a.75.75 0 00-1.5 0v4c0 .414.336.75.75.75h4a.75.75 0 000-1.5H3.56l2.97-2.97a.75.75 0 10-1.06-1.06L2.5 12.44v-2.19z"/></g></symbol><symbol id="flight-maximize-alt-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2H8a.75.75 0 010 1.5H4.75c-.69 0-1.25.56-1.25 1.25V8A.75.75 0 012 8V4.75zm13.25-2A.75.75 0 0116 2h3.25A2.75 2.75 0 0122 4.75V8a.75.75 0 01-1.5 0V4.75c0-.69-.56-1.25-1.25-1.25H16a.75.75 0 01-.75-.75zm-12.5 12.5a.75.75 0 01.75.75v3.25c0 .69.56 1.25 1.25 1.25H8A.75.75 0 018 22H4.75A2.75 2.75 0 012 19.25V16a.75.75 0 01.75-.75zm18.5 0A.75.75 0 0122 16v3.25A2.75 2.75 0 0119.25 22H16a.75.75 0 010-1.5h3.25c.69 0 1.25-.56 1.25-1.25V16a.75.75 0 01.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-maximize-alt-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h2.047a.75.75 0 010 1.5H3.25a.75.75 0 00-.75.75v2.047a.75.75 0 01-1.5 0V3.25zm8.953-1.5a.75.75 0 01.75-.75h2.047A2.25 2.25 0 0115 3.25v2.047a.75.75 0 01-1.5 0V3.25a.75.75 0 00-.75-.75h-2.047a.75.75 0 01-.75-.75zM1.75 9.953a.75.75 0 01.75.75v2.047c0 .414.336.75.75.75h2.047a.75.75 0 010 1.5H3.25A2.25 2.25 0 011 12.75v-2.047a.75.75 0 01.75-.75zm12.5 0a.75.75 0 01.75.75v2.047A2.25 2.25 0 0112.75 15h-2.047a.75.75 0 010-1.5h2.047a.75.75 0 00.75-.75v-2.047a.75.75 0 01.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-meh-24" viewBox="0 0 24 24"><g><path d="M8 14.5A.75.75 0 008 16h8a.75.75 0 000-1.5H8zM8 9a1 1 0 011-1h.01a1 1 0 110 2H9a1 1 0 01-1-1zM15 8a1 1 0 100 2h.01a1 1 0 100-2H15z"/><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-meh-16" viewBox="0 0 16 16"><g><path d="M5.5 9.5a.75.75 0 000 1.5h5a.75.75 0 000-1.5h-5zM5 6a1 1 0 011-1h.007a1 1 0 010 2H6a1 1 0 01-1-1zM10 5a1 1 0 100 2h.007a1 1 0 100-2H10z"/><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-menu-24" viewBox="0 0 24 24"><g><path d="M2 5.75A.75.75 0 012.75 5h18.5a.75.75 0 010 1.5H2.75A.75.75 0 012 5.75zM2 11.75a.75.75 0 01.75-.75h18.5a.75.75 0 010 1.5H2.75a.75.75 0 01-.75-.75zM2.75 17a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75z"/></g></symbol><symbol id="flight-menu-16" viewBox="0 0 16 16"><g><path d="M1 3.75A.75.75 0 011.75 3h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 3.75zM1 7.75A.75.75 0 011.75 7h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 7.75zM1.75 11a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75z"/></g></symbol><symbol id="flight-mesh-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M22.56 15.09c.286-.98.44-2.017.44-3.09 0-3.075-1.262-5.855-3.296-7.851A1.75 1.75 0 0018 2h-.01c-.328 0-.635.09-.897.247A10.953 10.953 0 0012 1c-2.448 0-4.709.8-6.536 2.152A1.744 1.744 0 004.75 3h-.01a1.75 1.75 0 00-1.595 2.472A10.95 10.95 0 001 12a10.99 10.99 0 004.99 9.215v.035c0 .966.784 1.75 1.75 1.75h.01c.445 0 .851-.166 1.16-.44.98.286 2.017.44 3.09.44a10.99 10.99 0 009.221-5H21.25a1.75 1.75 0 001.31-2.91zM4.603 6.495a1.745 1.745 0 01-.309-.052A9.457 9.457 0 002.5 12a9.49 9.49 0 004.17 7.865c.106-.082.222-.152.345-.208-.012-4.964-.626-8.255-2.412-13.162zm4.74 14.03c.09.198.144.414.155.642A9.513 9.513 0 0012 21.5a9.49 9.49 0 007.864-4.169 1.743 1.743 0 01-.262-1.697c-1.477-1.49-2.83-2.747-4.193-3.859-1.514 2.857-3.359 5.497-6.065 8.75zm11.824-6.023c-.17.006-.333.037-.487.09-1.61-1.626-3.083-2.986-4.578-4.186.729-1.509 1.393-3.11 2.064-4.914.212-.02.412-.077.595-.166A9.47 9.47 0 0121.5 12a9.51 9.51 0 01-.333 2.502zM12 2.5a9.46 9.46 0 014.257 1.005 1.745 1.745 0 00.496 1.483 55.99 55.99 0 01-1.866 4.483c-2.418-1.785-5-3.234-8.388-4.768a1.75 1.75 0 00-.059-.407A9.457 9.457 0 0112 2.5zM6.077 6.159c1.737 4.813 2.384 8.186 2.435 13.02 2.538-3.084 4.267-5.6 5.697-8.343-2.352-1.763-4.843-3.177-8.132-4.677z" clip-rule="evenodd"/></symbol><symbol id="flight-mesh-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M15.681 10.243A8.001 8.001 0 0016 8a7.97 7.97 0 00-2.047-5.345A1.752 1.752 0 0012.25.5h-.007c-.321 0-.623.087-.882.238A7.97 7.97 0 008 0a7.963 7.963 0 00-4.321 1.266A1.742 1.742 0 002.75 1h-.007a1.75 1.75 0 00-1.48 2.684A7.963 7.963 0 000 8a7.985 7.985 0 002.994 6.24 1.75 1.75 0 001.75 1.71h.006c.353 0 .681-.104.956-.284A8.004 8.004 0 008 16a7.985 7.985 0 006.245-3h.005a1.75 1.75 0 001.431-2.757zM2.573 4.492a1.758 1.758 0 01-.043-.005A6.47 6.47 0 001.5 8c0 1.918.83 3.642 2.152 4.832.112-.09.234-.165.366-.225-.029-3.003-.435-5.146-1.445-8.115zM6.5 14.2c0 .042-.001.084-.004.125.482.114.986.175 1.504.175a6.484 6.484 0 004.858-2.181 1.742 1.742 0 01-.242-1.713 32.908 32.908 0 00-2.306-2.179c-.067.116-.136.232-.205.347-.942 1.56-2.101 3.078-3.71 4.829.068.186.105.387.105.597zm7.826-4.698a1.776 1.776 0 00-.076-.002h-.007a1.75 1.75 0 00-.53.082 33.906 33.906 0 00-2.675-2.503c.484-.967.918-1.976 1.352-3.085a1.74 1.74 0 00.601-.158 6.518 6.518 0 011.335 5.666zM8 1.5c.89 0 1.738.179 2.51.503a1.755 1.755 0 00.476 1.464c-.379.964-.75 1.836-1.152 2.662C8.338 5.013 6.66 3.984 4.499 2.823a1.784 1.784 0 00-.013-.292A6.47 6.47 0 018 1.5zM4.094 4.309c.957 2.878 1.371 5.082 1.42 8.034 1.44-1.591 2.471-2.96 3.306-4.344.105-.174.208-.348.307-.524-1.41-1.072-2.989-2.056-5.033-3.166z" clip-rule="evenodd"/></symbol><symbol id="flight-message-circle-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12.343 3.5a8.157 8.157 0 11-3.765 15.396 1.439 1.439 0 00-.689-.139c-.2.003-.415.033-.627.074-.426.082-.922.227-1.417.391a32 32 0 00-1.684.621c.204-.51.421-1.081.606-1.63.169-.505.318-1.012.403-1.448.042-.217.072-.438.075-.643a1.466 1.466 0 00-.141-.7A8.157 8.157 0 0112.343 3.5zM3.7 21.655a37.13 37.13 0 012.618-1.01c.47-.156.896-.277 1.228-.341a2.28 2.28 0 01.398-.047 9.619 9.619 0 004.399 1.058c5.333 0 9.657-4.324 9.657-9.658A9.657 9.657 0 103.745 16.06v.038a2.32 2.32 0 01-.048.382c-.066.34-.191.776-.352 1.255a36.658 36.658 0 01-1.21 3.052l-.05.114-.014.03-.004.009a.75.75 0 00.982.998l.648-.282.003-.001zm.043-5.621v.002-.002z" clip-rule="evenodd"/></symbol><symbol id="flight-message-circle-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8.231 2.5a5.269 5.269 0 11-2.43 9.944 1.18 1.18 0 00-.535-.122 2.432 2.432 0 00-.424.038c-.27.046-.577.13-.879.225-.272.085-.557.186-.834.29.103-.275.203-.557.288-.828.096-.302.18-.612.225-.885.023-.136.04-.283.037-.428a1.193 1.193 0 00-.123-.534 5.269 5.269 0 014.675-7.7zM2.058 14.934l.002-.001.01-.004.037-.017a28.983 28.983 0 01.658-.281 21.485 21.485 0 011.649-.616c.274-.086.506-.147.678-.176.049-.008.086-.012.113-.015a6.768 6.768 0 10-3.028-3.026 1.384 1.384 0 01-.014.119 5.296 5.296 0 01-.176.679c-.172.545-.42 1.17-.618 1.646a31.45 31.45 0 01-.28.65l-.017.036-.004.01v.002a.75.75 0 00.99.994z" clip-rule="evenodd"/></symbol><symbol id="flight-message-circle-fill-24" viewBox="0 0 24 24"><g><path d="M8 8.75A.75.75 0 018.75 8h7a.75.75 0 010 1.5h-7A.75.75 0 018 8.75zM8 11.75a.75.75 0 01.75-.75h3a.75.75 0 010 1.5h-3a.75.75 0 01-.75-.75zM8 14.75a.75.75 0 01.75-.75h5a.75.75 0 010 1.5h-5a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M7.546 20.304c-.332.064-.757.185-1.228.342-1.113.37-2.194.825-3.27 1.292a.75.75 0 01-.98-.998c.086-.192.17-.384.253-.577.273-.635.704-1.675 1.024-2.628.16-.48.286-.915.352-1.255a2.32 2.32 0 00.048-.42 9.62 9.62 0 01-1.06-4.403C2.685 6.324 7.01 2 12.343 2 17.676 2 22 6.324 22 11.657c0 5.334-4.324 9.658-9.657 9.658a9.619 9.619 0 01-4.4-1.058 2.159 2.159 0 00-.397.047zM20.5 11.657a8.157 8.157 0 10-15.396 3.765c.128.246.144.513.141.7a3.764 3.764 0 01-.075.643 11.85 11.85 0 01-.403 1.447c-.185.55-.402 1.12-.606 1.631a32 32 0 011.684-.62c.495-.165.991-.31 1.417-.392.212-.041.427-.07.627-.074.18-.003.445.012.69.14A8.157 8.157 0 0020.5 11.657z" clip-rule="evenodd"/></g></symbol><symbol id="flight-message-circle-fill-16" viewBox="0 0 16 16"><g><path d="M5 8.75A.75.75 0 015.75 8h2.5a.75.75 0 010 1.5h-2.5A.75.75 0 015 8.75zM5.75 5.5a.75.75 0 100 1.5h4.5a.75.75 0 000-1.5h-4.5z"/><path fill-rule="evenodd" d="M2.058 14.934l.002-.001.01-.004.037-.017a28.983 28.983 0 01.658-.281 21.485 21.485 0 011.649-.616c.274-.086.506-.147.678-.176.049-.008.086-.012.113-.015a6.768 6.768 0 10-3.028-3.026 1.384 1.384 0 01-.014.119 5.296 5.296 0 01-.176.679c-.172.545-.42 1.17-.618 1.646a31.45 31.45 0 01-.28.65l-.017.036-.004.01v.002a.75.75 0 00.99.994zM8.231 2.5a5.269 5.269 0 11-2.43 9.944 1.18 1.18 0 00-.535-.122 2.432 2.432 0 00-.424.038c-.27.046-.577.13-.879.225-.272.085-.557.186-.834.29.103-.275.203-.557.288-.828.096-.302.18-.612.225-.885.023-.136.04-.283.037-.428a1.193 1.193 0 00-.123-.534 5.269 5.269 0 014.675-7.7z" clip-rule="evenodd"/></g></symbol><symbol id="flight-message-square-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M22 4.75A2.75 2.75 0 0019.25 2H4.75A2.75 2.75 0 002 4.75v16.5a.75.75 0 001.231.575l4.228-3.534A1.25 1.25 0 018.26 18h10.99A2.75 2.75 0 0022 15.25V4.75zM19.25 3.5c.69 0 1.25.56 1.25 1.25v10.5c0 .69-.56 1.25-1.25 1.25H8.26a2.75 2.75 0 00-1.763.64L3.5 19.645V4.75c0-.69.56-1.25 1.25-1.25h14.5z" clip-rule="evenodd"/></symbol><symbol id="flight-message-square-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M15 3.25A2.25 2.25 0 0012.75 1h-9.5A2.25 2.25 0 001 3.25v11a.75.75 0 001.26.55l2.801-2.6a.75.75 0 01.51-.2h7.179A2.25 2.25 0 0015 9.75v-6.5zm-2.25-.75a.75.75 0 01.75.75v6.5a.75.75 0 01-.75.75H5.572a2.25 2.25 0 00-1.531.6L2.5 12.53V3.25a.75.75 0 01.75-.75h9.5z" clip-rule="evenodd"/></symbol><symbol id="flight-message-square-fill-24" viewBox="0 0 24 24"><g><path d="M6 6.75A.75.75 0 016.75 6h10a.75.75 0 010 1.5h-10A.75.75 0 016 6.75zM6 9.75A.75.75 0 016.75 9h5a.75.75 0 010 1.5h-5A.75.75 0 016 9.75zM6 12.75a.75.75 0 01.75-.75h7a.75.75 0 010 1.5h-7a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M19.25 2A2.75 2.75 0 0122 4.75v10.5A2.75 2.75 0 0119.25 18H8.26a1.25 1.25 0 00-.801.291L3.23 21.825A.75.75 0 012 21.25V4.75A2.75 2.75 0 014.75 2h14.5zm1.25 2.75c0-.69-.56-1.25-1.25-1.25H4.75c-.69 0-1.25.56-1.25 1.25v14.895l2.997-2.505a2.75 2.75 0 011.763-.64h10.99c.69 0 1.25-.56 1.25-1.25V4.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-message-square-fill-16" viewBox="0 0 16 16"><g><path d="M4 7.75A.75.75 0 014.75 7h3.5a.75.75 0 010 1.5h-3.5A.75.75 0 014 7.75zM4.75 4.5a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5z"/><path fill-rule="evenodd" d="M15 3.25A2.25 2.25 0 0012.75 1h-9.5A2.25 2.25 0 001 3.25v11a.75.75 0 001.26.55l2.801-2.6a.75.75 0 01.51-.2h7.179A2.25 2.25 0 0015 9.75v-6.5zm-2.25-.75a.75.75 0 01.75.75v6.5a.75.75 0 01-.75.75H5.572a2.25 2.25 0 00-1.531.6L2.5 12.53V3.25a.75.75 0 01.75-.75h9.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-mic-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M12 0c-1.05 0-2.064.399-2.816 1.118A3.79 3.79 0 008 3.858v8.285a3.79 3.79 0 001.184 2.739A4.077 4.077 0 0012 16c1.05 0 2.064-.399 2.816-1.118A3.79 3.79 0 0016 12.142V3.858a3.79 3.79 0 00-1.184-2.739A4.077 4.077 0 0012 0zm-1.78 2.202A2.578 2.578 0 0112 1.5c.674 0 1.313.256 1.78.702a2.29 2.29 0 01.72 1.655v8.286a2.29 2.29 0 01-.72 1.655A2.578 2.578 0 0112 14.5a2.578 2.578 0 01-1.78-.702 2.29 2.29 0 01-.72-1.655V3.857c0-.614.255-1.21.72-1.655z" clip-rule="evenodd"/><path d="M5.5 10A.75.75 0 004 10v2a7.63 7.63 0 002.353 5.49 8.112 8.112 0 004.897 2.226V22H8a.75.75 0 000 1.5h8a.75.75 0 000-1.5h-3.25v-2.284a8.112 8.112 0 004.898-2.227A7.63 7.63 0 0020 12v-2a.75.75 0 00-1.5 0v2a6.13 6.13 0 01-1.894 4.41A6.634 6.634 0 0112 18.25a6.633 6.633 0 01-4.606-1.84A6.13 6.13 0 015.5 12v-2z"/></g></symbol><symbol id="flight-mic-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M8 0c-.78 0-1.538.29-2.104.821A2.797 2.797 0 005 2.861V8.14c0 .775.328 1.507.896 2.04.566.53 1.323.821 2.104.821.78 0 1.538-.29 2.104-.821A2.797 2.797 0 0011 8.139V2.86c0-.775-.329-1.507-.896-2.04A3.077 3.077 0 008 0zM6.922 1.915A1.578 1.578 0 018 1.5c.413 0 .8.154 1.078.415.276.26.422.601.422.946V8.14c0 .345-.146.686-.422.946A1.578 1.578 0 018 9.5c-.413 0-.8-.154-1.078-.415-.276-.26-.422-.601-.422-.946V2.86c0-.345.146-.686.422-.946z" clip-rule="evenodd"/><path d="M4 6.75a.75.75 0 00-1.5 0v1.385a5.3 5.3 0 001.619 3.801A5.553 5.553 0 007.25 13.45v1.05H5.5a.75.75 0 000 1.5h5a.75.75 0 000-1.5H8.75v-1.05a5.553 5.553 0 003.131-1.514A5.3 5.3 0 0013.5 8.135V6.75a.75.75 0 00-1.5 0v1.385a3.8 3.8 0 01-1.164 2.725A4.071 4.071 0 018 12a4.071 4.071 0 01-2.836-1.14A3.8 3.8 0 014 8.135V6.75z"/></g></symbol><symbol id="flight-mic-off-24" viewBox="0 0 24 24"><g><path d="M9.184 1.118A4.077 4.077 0 0112 0c1.05 0 2.064.399 2.816 1.118A3.79 3.79 0 0116 3.858v6.5a.75.75 0 11-1.5 0v-6.5a2.29 2.29 0 00-.72-1.656A2.578 2.578 0 0012 1.5c-.674 0-1.313.256-1.78.702a2.29 2.29 0 00-.72 1.655.75.75 0 11-1.5 0 3.79 3.79 0 011.184-2.739z"/><path fill-rule="evenodd" d="M12 16c.81 0 1.6-.237 2.263-.676l1.66 1.66A6.671 6.671 0 0112 18.25a6.633 6.633 0 01-4.606-1.84A6.13 6.13 0 015.5 12v-2A.75.75 0 004 10v2a7.63 7.63 0 002.353 5.49 8.112 8.112 0 004.897 2.226V22H8a.75.75 0 000 1.5h8a.75.75 0 000-1.5h-3.25v-2.284a8.145 8.145 0 004.244-1.661l4.726 4.725a.75.75 0 101.06-1.06L2.28 1.22a.75.75 0 00-1.06 1.06L8 9.06v3.083a3.79 3.79 0 001.184 2.739A4.077 4.077 0 0012 16zm-2.5-3.857V10.56l3.667 3.666A2.62 2.62 0 0112 14.5a2.578 2.578 0 01-1.78-.702 2.29 2.29 0 01-.72-1.655z" clip-rule="evenodd"/><path d="M20 10a.75.75 0 00-1.5 0v2c0 .552-.076 1.097-.222 1.62a.75.75 0 001.444.404A7.522 7.522 0 0020 12v-2z"/></g></symbol><symbol id="flight-mic-off-16" viewBox="0 0 16 16"><g><path d="M8 0c-.78 0-1.538.29-2.104.821a2.862 2.862 0 00-.627.857.75.75 0 001.354.644c.07-.147.17-.286.3-.407A1.578 1.578 0 018 1.5c.413 0 .8.154 1.078.415.276.26.422.601.422.946v3.443a.75.75 0 001.5 0V2.861c0-.775-.329-1.507-.896-2.04A3.077 3.077 0 008 0z"/><path fill-rule="evenodd" d="M5 6.06L1.22 2.28a.75.75 0 011.06-1.06l12.5 12.5a.75.75 0 11-1.06 1.06L11.338 12.4a5.575 5.575 0 01-2.588 1.05V14.5h1.75a.75.75 0 010 1.5h-5a.75.75 0 010-1.5h1.75v-1.05a5.553 5.553 0 01-3.131-1.514A5.3 5.3 0 012.5 8.135V6.75a.75.75 0 011.5 0v1.385a3.8 3.8 0 001.164 2.725A4.071 4.071 0 008 12c.815 0 1.602-.24 2.262-.677l-.726-.726A3.113 3.113 0 018 11c-.78 0-1.538-.29-2.104-.821A2.797 2.797 0 015 8.139V6.06zm1.5 1.5v.579c0 .345.146.686.422.946.278.26.665.415 1.078.415.134 0 .266-.016.392-.047L6.5 7.56z" clip-rule="evenodd"/><path d="M12.03 6.75a.75.75 0 011.5 0v1.385c0 .266-.02.53-.06.79a.75.75 0 11-1.483-.227c.029-.185.043-.374.043-.563V6.75z"/></g></symbol><symbol id="flight-migrate-24" viewBox="0 0 24 24"><g><path d="M8.207 5.982a.75.75 0 011.06-.025l5.5 5.25a.75.75 0 010 1.085l-5.5 5.25a.75.75 0 11-1.035-1.085l4.146-3.957H4A.75.75 0 014 11h8.378L8.232 7.043a.75.75 0 01-.025-1.06z"/><path d="M14.207 5.982a.75.75 0 011.06-.025l5.5 5.25a.75.75 0 010 1.085l-5.5 5.25a.75.75 0 01-1.035-1.085l4.932-4.707-4.932-4.707a.75.75 0 01-.024-1.06z"/></g></symbol><symbol id="flight-migrate-16" viewBox="0 0 16 16"><g><path d="M9.22 3.72a.75.75 0 011.06 0l3.5 3.5a.75.75 0 010 1.06l-3.5 3.5a.75.75 0 11-1.06-1.06l2.97-2.97-2.97-2.97a.75.75 0 010-1.06z"/><path d="M5.22 3.72a.75.75 0 011.06 0l3.5 3.5a.75.75 0 010 1.06l-3.5 3.5a.75.75 0 01-1.06-1.06L7.44 8.5H2A.75.75 0 012 7h5.44L5.22 4.78a.75.75 0 010-1.06z"/></g></symbol><symbol id="flight-minimize-24" viewBox="0 0 24 24"><g><path d="M20.78 4.28a.75.75 0 00-1.06-1.06L14.5 8.44V4.75a.75.75 0 00-1.5 0v5.5a.747.747 0 00.75.75h5.5a.75.75 0 000-1.5h-3.69l5.22-5.22zM4 13.75c0 .414.336.75.75.75h3.69l-5.22 5.22a.75.75 0 101.06 1.06l5.22-5.22v3.69a.75.75 0 001.5 0v-5.5a.747.747 0 00-.215-.525l-.01-.01A.747.747 0 0010.25 13h-5.5a.75.75 0 00-.75.75z"/></g></symbol><symbol id="flight-minimize-16" viewBox="0 0 16 16"><g><path d="M10 4.94V2.75a.75.75 0 00-1.5 0v4c0 .414.336.75.75.75h4a.75.75 0 000-1.5h-2.19l2.72-2.72a.75.75 0 00-1.06-1.06L10 4.94zM2.75 8.5a.75.75 0 000 1.5h2.19l-2.72 2.72a.75.75 0 101.06 1.06L6 11.06v2.19a.75.75 0 001.5 0v-4a.75.75 0 00-.75-.75h-4z"/></g></symbol><symbol id="flight-minimize-alt-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M8.25 2.25A.75.75 0 019 3v3.25A2.75 2.75 0 016.25 9H3a.75.75 0 010-1.5h3.25c.69 0 1.25-.56 1.25-1.25V3a.75.75 0 01.75-.75zm7.5 0a.75.75 0 01.75.75v3.25c0 .69.56 1.25 1.25 1.25H21A.75.75 0 0121 9h-3.25A2.75 2.75 0 0115 6.25V3a.75.75 0 01.75-.75zm-13.5 13.5A.75.75 0 013 15h3.25A2.75 2.75 0 019 17.75V21a.75.75 0 01-1.5 0v-3.25c0-.69-.56-1.25-1.25-1.25H3a.75.75 0 01-.75-.75zm12.75 2A2.75 2.75 0 0117.75 15H21a.75.75 0 010 1.5h-3.25c-.69 0-1.25.56-1.25 1.25V21a.75.75 0 01-1.5 0v-3.25z" clip-rule="evenodd"/></symbol><symbol id="flight-minimize-alt-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M5.25.953a.75.75 0 01.75.75V3.75A2.25 2.25 0 013.75 6H1.703a.75.75 0 110-1.5H3.75a.75.75 0 00.75-.75V1.703a.75.75 0 01.75-.75zm5.5 0a.75.75 0 01.75.75V3.75c0 .414.336.75.75.75h2.047a.75.75 0 010 1.5H12.25A2.25 2.25 0 0110 3.75V1.703a.75.75 0 01.75-.75zM.953 10.75a.75.75 0 01.75-.75H3.75A2.25 2.25 0 016 12.25v2.047a.75.75 0 01-1.5 0V12.25a.75.75 0 00-.75-.75H1.703a.75.75 0 01-.75-.75zM10 12.25A2.25 2.25 0 0112.25 10h2.047a.75.75 0 110 1.5H12.25a.75.75 0 00-.75.75v2.047a.75.75 0 01-1.5 0V12.25z" clip-rule="evenodd"/></symbol><symbol id="flight-minus-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M4.5 11.75a.75.75 0 01.75-.75h13.5a.75.75 0 010 1.5H5.25a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-minus-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3.5 7.75A.75.75 0 014.25 7h7.5a.75.75 0 010 1.5h-7.5a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></symbol><symbol id="flight-minus-circle-24" viewBox="0 0 24 24"><g><path d="M8.25 11a.75.75 0 000 1.5h7.5a.75.75 0 000-1.5h-7.5z"/><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-minus-circle-16" viewBox="0 0 16 16"><g><path d="M4.75 7a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5z"/><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-minus-square-24" viewBox="0 0 24 24"><g><path d="M8.25 11a.75.75 0 000 1.5h7.5a.75.75 0 000-1.5h-7.5z"/><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25h14.5c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25V4.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-minus-square-16" viewBox="0 0 16 16"><g><path d="M5.25 7a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5z"/><path fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zM2.5 3.25a.75.75 0 01.75-.75h9.5a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75v-9.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-minus-square-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h14.5A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V4.75zM8.25 11a.75.75 0 000 1.5h7.5a.75.75 0 000-1.5h-7.5z" clip-rule="evenodd"/></symbol><symbol id="flight-minus-square-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zm2 6a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5z" clip-rule="evenodd"/></symbol><symbol id="flight-minus-plus-24" viewBox="0 0 24 24"><g><path d="M17.72 5.22a.75.75 0 111.06 1.06l-12.5 12.5a.75.75 0 01-1.06-1.06l12.5-12.5zM3.5 6.75A.75.75 0 014.25 6h5.5a.75.75 0 010 1.5h-5.5a.75.75 0 01-.75-.75zM16.5 13.5a.75.75 0 011.5 0V16h2.5a.75.75 0 010 1.5H18V20a.75.75 0 01-1.5 0v-2.5H14a.75.75 0 010-1.5h2.5v-2.5z"/></g></symbol><symbol id="flight-minus-plus-16" viewBox="0 0 16 16"><g><path d="M11.72 3.22a.75.75 0 111.06 1.06l-8.5 8.5a.75.75 0 01-1.06-1.06l8.5-8.5zM2.25 4a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5zM10 10a.75.75 0 000 1.5h1.5V13a.75.75 0 001.5 0v-1.5h1.5a.75.75 0 000-1.5H13V8.5a.75.75 0 00-1.5 0V10H10z"/></g></symbol><symbol id="flight-minus-plus-circle-24" viewBox="0 0 24 24"><g><path d="M6 7a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5H6zM15.75 12.25A.75.75 0 0015 13v2h-2a.75.75 0 000 1.5h2v2a.75.75 0 001.5 0v-2h2a.75.75 0 000-1.5h-2v-2a.75.75 0 00-.75-.75z"/><path fill-rule="evenodd" d="M8.25 15.5c.085 0 .17-.002.254-.004a7.25 7.25 0 106.991-6.991A7.25 7.25 0 108.25 15.5zm0-13a5.75 5.75 0 10.467 11.481 7.262 7.262 0 015.264-5.264A5.75 5.75 0 008.25 2.5zM10 15.75a5.75 5.75 0 1111.5 0 5.75 5.75 0 01-11.5 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-minus-plus-circle-16" viewBox="0 0 16 16"><g><path d="M3.75 4.5a.75.75 0 000 1.5h3a.75.75 0 000-1.5h-3zM10.25 7.5a.75.75 0 01.75.75V9.5h1.25a.75.75 0 010 1.5H11v1.25a.75.75 0 01-1.5 0V11H8.25a.75.75 0 010-1.5H9.5V8.25a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M5.25 0a5.25 5.25 0 015.244 5.006 5.25 5.25 0 11-5.488 5.488A5.25 5.25 0 015.25 0zM1.5 5.25a3.75 3.75 0 017.499-.1A5.258 5.258 0 005.15 8.999 3.75 3.75 0 011.5 5.25zm8.75 1.25a3.75 3.75 0 100 7.5 3.75 3.75 0 000-7.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-minus-plus-square-24" viewBox="0 0 24 24"><g><path d="M5.25 7.75A.75.75 0 016 7h4.5a.75.75 0 010 1.5H6a.75.75 0 01-.75-.75zM15.75 12.25A.75.75 0 0015 13v2h-2a.75.75 0 000 1.5h2v2a.75.75 0 001.5 0v-2h2a.75.75 0 000-1.5h-2v-2a.75.75 0 00-.75-.75z"/><path fill-rule="evenodd" d="M4.25 1.5A2.75 2.75 0 001.5 4.25v8A2.75 2.75 0 004.25 15H9v4.75a2.75 2.75 0 002.75 2.75h8a2.75 2.75 0 002.75-2.75v-8A2.75 2.75 0 0019.75 9H15V4.25a2.75 2.75 0 00-2.75-2.75h-8zM13.5 9V4.25c0-.69-.56-1.25-1.25-1.25h-8C3.56 3 3 3.56 3 4.25v8c0 .69.56 1.25 1.25 1.25H9v-1.75A2.75 2.75 0 0111.75 9h1.75zm-3 10.75c0 .69.56 1.25 1.25 1.25h8c.69 0 1.25-.56 1.25-1.25v-8c0-.69-.56-1.25-1.25-1.25h-8c-.69 0-1.25.56-1.25 1.25v8z" clip-rule="evenodd"/></g></symbol><symbol id="flight-minus-plus-square-16" viewBox="0 0 16 16"><g><path d="M10.75 8a.75.75 0 01.75.75V10h1.25a.75.75 0 010 1.5H11.5v1.25a.75.75 0 01-1.5 0V11.5H8.75a.75.75 0 010-1.5H10V8.75a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M0 2.25A2.25 2.25 0 012.25 0h6a2.25 2.25 0 012.25 2.25V5.5h3.25A2.25 2.25 0 0116 7.75v6A2.25 2.25 0 0113.75 16h-6a2.25 2.25 0 01-2.25-2.25V10.5H2.25A2.25 2.25 0 010 8.25v-6zm9 0V5.5H7.707A.749.749 0 007 4.5H3.5a.75.75 0 000 1.5h2.836A2.246 2.246 0 005.5 7.75V9H2.25a.75.75 0 01-.75-.75v-6a.75.75 0 01.75-.75h6a.75.75 0 01.75.75zm-2 11.5v-6A.75.75 0 017.75 7h6a.75.75 0 01.75.75v6a.75.75 0 01-.75.75h-6a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-module-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M17 7.866a1.25 1.25 0 00-1.507-1.223l-7.5 1.578A1.25 1.25 0 007 9.444v7.69c0 .794.73 1.387 1.507 1.223l7.5-1.578A1.25 1.25 0 0017 15.556v-7.69zM8.5 9.647l7-1.473v7.179l-7 1.473V9.647z"/><path d="M21 4.719a2.75 2.75 0 00-3.32-2.69L5.18 4.68A2.75 2.75 0 003 7.37v12.911a2.75 2.75 0 003.32 2.69l12.5-2.651A2.75 2.75 0 0021 17.63V4.719zm-3.01-1.223a1.25 1.25 0 011.51 1.223v12.91c0 .591-.413 1.101-.99 1.224l-12.5 2.651a1.25 1.25 0 01-1.51-1.223V7.371c0-.591.413-1.101.99-1.223l12.5-2.652z"/></g></symbol><symbol id="flight-module-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M11.5 4.75a.75.75 0 00-.897-.735l-5.5 1.1a.75.75 0 00-.603.735v5.4a.75.75 0 00.897.735l5.5-1.1a.75.75 0 00.603-.735v-5.4zM6 10.335v-3.87l4-.8v3.87l-4 .8z"/><path d="M15 2.33A2.25 2.25 0 0012.309.123l-9.5 1.9A2.25 2.25 0 001 4.23v9.44a2.25 2.25 0 002.691 2.207l9.5-1.9A2.25 2.25 0 0015 11.77V2.33zm-2.397-.736a.75.75 0 01.897.736v9.44a.75.75 0 01-.603.736l-9.5 1.9a.75.75 0 01-.897-.736V4.23a.75.75 0 01.603-.736l9.5-1.9z"/></g></symbol><symbol id="flight-monitor-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M1 4.75A2.75 2.75 0 013.75 2h16.5A2.75 2.75 0 0123 4.75v10.5A2.75 2.75 0 0120.25 18H12.5v2.5H16a.75.75 0 010 1.5H8a.75.75 0 010-1.5h3V18H3.75A2.75 2.75 0 011 15.25V4.75zM20.25 16.5c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H3.75c-.69 0-1.25.56-1.25 1.25v10.5c0 .69.56 1.25 1.25 1.25h16.5z" clip-rule="evenodd"/></symbol><symbol id="flight-monitor-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h11.5A2.25 2.25 0 0116 3.25v6.5A2.25 2.25 0 0113.75 12H8.5v1.5H11a.75.75 0 010 1.5H5a.75.75 0 010-1.5h2V12H2.25A2.25 2.25 0 010 9.75v-6.5zm13.75 7.25a.75.75 0 00.75-.75v-6.5a.75.75 0 00-.75-.75H2.25a.75.75 0 00-.75.75v6.5c0 .414.336.75.75.75h11.5z" clip-rule="evenodd"/></symbol><symbol id="flight-moon-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M11.82 2.382a.75.75 0 01-.05.814 6.46 6.46 0 009.034 9.034.75.75 0 011.193.672 10.02 10.02 0 11-10.9-10.899.75.75 0 01.723.379zm-2.12 1.4A8.52 8.52 0 1020.217 14.3 7.96 7.96 0 019.7 3.783z" clip-rule="evenodd"/></symbol><symbol id="flight-moon-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8.09 1.382a.75.75 0 01-.05.814 4.121 4.121 0 005.764 5.764.75.75 0 011.193.672 7.014 7.014 0 11-7.63-7.629.75.75 0 01.723.379zm-2.06 1.46a5.513 5.513 0 107.128 7.128A5.621 5.621 0 016.03 2.843z" clip-rule="evenodd"/></symbol><symbol id="flight-more-horizontal-24" viewBox="0 0 24 24"><g><path d="M5 10a2 2 0 100 4 2 2 0 000-4zM12 10a2 2 0 100 4 2 2 0 000-4zM19 10a2 2 0 100 4 2 2 0 000-4z"/></g></symbol><symbol id="flight-more-horizontal-16" viewBox="0 0 16 16"><g><path d="M3.5 6.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM8 6.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM12.5 6.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3z"/></g></symbol><symbol id="flight-more-vertical-24" viewBox="0 0 24 24"><g><path d="M12 3.5a2 2 0 100 4 2 2 0 000-4zM12 10a2 2 0 100 4 2 2 0 000-4zM12 16.5a2 2 0 100 4 2 2 0 000-4z"/></g></symbol><symbol id="flight-more-vertical-16" viewBox="0 0 16 16"><g><path d="M8 2a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM8 6.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM8 11a1.5 1.5 0 100 3 1.5 1.5 0 000-3z"/></g></symbol><symbol id="flight-mouse-pointer-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M3.038 2.058a.75.75 0 00-.98.98l7.29 17.5a.75.75 0 001.403-.047l2.2-6.479 5.769 5.768a.75.75 0 101.06-1.06l-5.768-5.768 6.48-2.201a.75.75 0 00.046-1.402l-17.5-7.291zm6.931 16.07L4.143 4.143l13.985 5.826-5.74 1.95a.75.75 0 00-.469.469l-1.95 5.74z" clip-rule="evenodd"/></symbol><symbol id="flight-mouse-pointer-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M2.538 1.558a.75.75 0 00-.98.98l4.79 11.5a.75.75 0 001.403-.047l1.313-3.866 3.656 3.655a.75.75 0 101.06-1.06l-3.655-3.656 3.866-1.313a.75.75 0 00.048-1.402l-11.5-4.791zm4.432 10.07L3.643 3.643l7.985 3.327-3.127 1.062a.75.75 0 00-.47.469L6.97 11.628z" clip-rule="evenodd"/></symbol><symbol id="flight-move-24" viewBox="0 0 24 24"><path d="M11.463 1.057a.748.748 0 00-.243.163l-3 3a.75.75 0 001.06 1.06L11 3.56V11H3.56l1.72-1.72a.75.75 0 00-1.06-1.06l-3 3a.748.748 0 000 1.06l3 3a.75.75 0 001.06-1.06L3.56 12.5H11v7.44l-1.72-1.72a.75.75 0 00-1.06 1.06l3 3a.748.748 0 001.06 0l3-3a.75.75 0 10-1.06-1.06l-1.72 1.72V12.5h7.44l-1.72 1.72a.75.75 0 101.06 1.06l3-3a.748.748 0 000-1.06l-3-3a.75.75 0 10-1.06 1.06L19.94 11H12.5V3.56l1.72 1.72a.75.75 0 101.06-1.06l-3-3a.748.748 0 00-.817-.163z"/></symbol><symbol id="flight-move-16" viewBox="0 0 16 16"><path d="M7.463.057A.748.748 0 007.22.22l-2 2a.75.75 0 001.06 1.06L7 2.56V7H2.56l.72-.72a.75.75 0 00-1.06-1.06l-2 2a.748.748 0 000 1.06l2 2a.75.75 0 101.06-1.06l-.72-.72H7v4.44l-.72-.72a.75.75 0 00-1.06 1.06l2 2a.748.748 0 001.06 0l2-2a.75.75 0 10-1.06-1.06l-.72.72V8.5h4.44l-.72.72a.75.75 0 101.06 1.06l2-2a.748.748 0 000-1.06l-2-2a.75.75 0 10-1.06 1.06l.72.72H8.5V2.56l.72.72a.75.75 0 101.06-1.06l-2-2a.748.748 0 00-.817-.163z"/></symbol><symbol id="flight-music-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M20.5 4.27a.75.75 0 00-.873-.74l-9 1.5a.75.75 0 00-.627.74v13.286a2.75 2.75 0 01-2.298 2.712l-2 .334A2.75 2.75 0 012.5 19.389v-.445a2.75 2.75 0 012.298-2.712l3.702-.617V5.77c0-1.1.795-2.039 1.88-2.22l9-1.5A2.25 2.25 0 0122 4.271v12.785a2.75 2.75 0 01-2.298 2.712l-2 .334a2.75 2.75 0 01-3.202-2.713v-.445a2.75 2.75 0 012.298-2.712l3.702-.617V4.27zm0 10.865l-3.456.576A1.25 1.25 0 0016 16.944v.445c0 .773.694 1.36 1.456 1.233l2-.333a1.25 1.25 0 001.044-1.233v-1.92zM5.044 17.711l3.456-.576v1.92a1.25 1.25 0 01-1.045 1.234l-2 .333A1.25 1.25 0 014 19.39v-.445a1.25 1.25 0 011.045-1.233z" clip-rule="evenodd"/></symbol><symbol id="flight-music-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M13.5 3.687a.25.25 0 00-.293-.246l-6.5 1.121a.25.25 0 00-.207.247v7.348a2.75 2.75 0 01-2.318 2.716l-.678.107a2.164 2.164 0 01-.68-4.274L5 10.36V4.809c0-.852.613-1.58 1.452-1.725l6.5-1.121A1.75 1.75 0 0115 3.687v7.47a2.75 2.75 0 01-2.318 2.716l-.678.107a2.164 2.164 0 01-.68-4.274L13.5 9.36V3.687zM5 11.88l-1.94.309a.664.664 0 10.208 1.311l.678-.108A1.25 1.25 0 005 12.157v-.278zm6.56-.691l1.94-.31v.279a1.25 1.25 0 01-1.054 1.234l-.678.108a.664.664 0 11-.208-1.312z" clip-rule="evenodd"/></symbol><symbol id="flight-navigation-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M21.78 2.22a.75.75 0 01.148.851l-8.763 18.5a.75.75 0 01-1.406-.14L9.921 14.08l-7.353-1.838a.75.75 0 01-.14-1.406l18.5-8.763a.75.75 0 01.852.148zM4.965 11.294l5.756 1.439a.75.75 0 01.546.546l1.44 5.756 6.966-14.708-14.708 6.967z" clip-rule="evenodd"/></symbol><symbol id="flight-navigation-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M14.78 1.22a.75.75 0 01.148.851l-5.921 12.5a.75.75 0 01-1.406-.14L6.395 9.606 1.568 8.4a.75.75 0 01-.14-1.406l12.5-5.92a.75.75 0 01.852.147zM3.965 7.452l3.23.807a.75.75 0 01.546.546l.807 3.23 4.125-8.708-8.708 4.125z" clip-rule="evenodd"/></symbol><symbol id="flight-navigation-alt-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 2a.75.75 0 01.698.476l7.25 18.5a.75.75 0 01-1.053.935L12 18.207 5.105 21.91a.75.75 0 01-1.053-.935l7.25-18.5A.75.75 0 0112 2zM6.193 19.623l5.452-2.928a.75.75 0 01.71 0l5.452 2.928L12 4.806 6.193 19.623z" clip-rule="evenodd"/></symbol><symbol id="flight-navigation-alt-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 1a.75.75 0 01.691.46l5.25 12.5a.75.75 0 01-1.027.96L8 12.457 3.086 14.92a.75.75 0 01-1.027-.96l5.25-12.5A.75.75 0 018 1zM4.227 12.67l3.437-1.722a.75.75 0 01.672 0l3.437 1.723L8 3.687 4.227 12.67z" clip-rule="evenodd"/></symbol><symbol id="flight-network-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M10.25 2.5A1.75 1.75 0 008.5 4.25v3.5c0 .966.784 1.75 1.75 1.75H11V11H3a.75.75 0 000 1.5h3.5v2H5.25a1.75 1.75 0 00-1.75 1.75v3.5c0 .966.784 1.75 1.75 1.75h3.5a1.75 1.75 0 001.75-1.75v-3.5a1.75 1.75 0 00-1.75-1.75H8v-2h8v2h-.75a1.75 1.75 0 00-1.75 1.75v3.5c0 .966.784 1.75 1.75 1.75h3.5a1.75 1.75 0 001.75-1.75v-3.5a1.75 1.75 0 00-1.75-1.75H17.5v-2H21a.75.75 0 000-1.5h-8.5V9.5h1.25a1.75 1.75 0 001.75-1.75v-3.5a1.75 1.75 0 00-1.75-1.75h-3.5zM10 4.25a.25.25 0 01.25-.25h3.5a.25.25 0 01.25.25v3.5a.25.25 0 01-.25.25h-3.5a.25.25 0 01-.25-.25v-3.5zm-5 12a.25.25 0 01.25-.25h3.5a.25.25 0 01.25.25v3.5a.25.25 0 01-.25.25h-3.5a.25.25 0 01-.25-.25v-3.5zM15.25 16a.25.25 0 00-.25.25v3.5c0 .138.112.25.25.25h3.5a.25.25 0 00.25-.25v-3.5a.25.25 0 00-.25-.25h-3.5z" clip-rule="evenodd"/></symbol><symbol id="flight-network-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M6.25 0C5.56 0 5 .56 5 1.25v3.5C5 5.44 5.56 6 6.25 6H7v1H1a.75.75 0 000 1.5h2.5V10H2.25C1.56 10 1 10.56 1 11.25v3.5c0 .69.56 1.25 1.25 1.25h3.5C6.44 16 7 15.44 7 14.75v-3.5C7 10.56 6.44 10 5.75 10H5V8.5h6V10h-.75C9.56 10 9 10.56 9 11.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5c0-.69-.56-1.25-1.25-1.25H12.5V8.5H15A.75.75 0 0015 7H8.5V6h1.25C10.44 6 11 5.44 11 4.75v-3.5C11 .56 10.44 0 9.75 0h-3.5zm4.25 11.5v3h3v-3h-3zm-8 0v3h3v-3h-3zm7-7v-3h-3v3h3z" clip-rule="evenodd"/></symbol><symbol id="flight-network-alt-24" viewBox="0 0 24 24"><g><path d="M23 12a.75.75 0 00-.232-.543l-5.5-5.25a.75.75 0 00-1.036 1.086L21.164 12l-4.932 4.707a.75.75 0 001.036 1.085l5.5-5.25A.75.75 0 0023 12zM1 12a.75.75 0 01.232-.543l5.5-5.25a.75.75 0 111.036 1.086L2.836 12l4.932 4.707a.75.75 0 01-1.036 1.085l-5.5-5.25A.75.75 0 011 12z"/><path d="M8 11a1 1 0 100 2h.01a1 1 0 100-2H8zM11 12a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1zM16 11a1 1 0 100 2h.01a1 1 0 100-2H16z"/></g></symbol><symbol id="flight-network-alt-16" viewBox="0 0 16 16"><g><path d="M16 8a.75.75 0 00-.22-.53l-3.5-3.5a.75.75 0 10-1.06 1.06L14.19 8l-2.97 2.97a.75.75 0 101.06 1.06l3.5-3.5A.75.75 0 0016 8zM.22 8.53a.75.75 0 010-1.06l3.5-3.5a.75.75 0 011.06 1.06L1.81 8l2.97 2.97a.75.75 0 11-1.06 1.06l-3.5-3.5z"/><path d="M5 7a1 1 0 000 2h.01a1 1 0 100-2H5zM7 8a1 1 0 011-1h.01a1 1 0 010 2H8a1 1 0 01-1-1zM11 7a1 1 0 100 2h.01a1 1 0 100-2H11z"/></g></symbol><symbol id="flight-newspaper-24" viewBox="0 0 24 24"><g><path d="M9.75 13a.75.75 0 000 1.5h7a.75.75 0 000-1.5h-7zM9 16.75a.75.75 0 01.75-.75h4a.75.75 0 010 1.5h-4a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M10.75 4.5A1.75 1.75 0 009 6.25v3.5c0 .966.784 1.75 1.75 1.75h6.5A1.75 1.75 0 0019 9.75v-3.5a1.75 1.75 0 00-1.75-1.75h-6.5zm-.25 1.75a.25.25 0 01.25-.25h6.5a.25.25 0 01.25.25v3.5a.25.25 0 01-.25.25h-6.5a.25.25 0 01-.25-.25v-3.5z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M19.75 23H4.25a2.75 2.75 0 01-2.75-2.75v-12A2.75 2.75 0 014.25 5.5H5.5V3.75A2.75 2.75 0 018.25 1h11.5a2.75 2.75 0 012.75 2.75v16.5A2.75 2.75 0 0119.75 23zM21 3.75v16.5c0 .69-.56 1.25-1.25 1.25H6.7c.192-.375.3-.8.3-1.25V3.75c0-.69.56-1.25 1.25-1.25h11.5c.69 0 1.25.56 1.25 1.25zM3 20.25a1.25 1.25 0 102.5 0V7H4.25C3.56 7 3 7.56 3 8.25v12z" clip-rule="evenodd"/></g></symbol><symbol id="flight-newspaper-16" viewBox="0 0 16 16"><g><path d="M6.75 9.5a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5zM6 12.75a.75.75 0 01.75-.75h2.5a.75.75 0 010 1.5h-2.5a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M7.25 2.5C6.56 2.5 6 3.06 6 3.75v3.5c0 .69.56 1.25 1.25 1.25h4.5c.69 0 1.25-.56 1.25-1.25v-3.5c0-.69-.56-1.25-1.25-1.25h-4.5zM7.5 7V4h4v3h-4z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M2.75 16h10.5a2.25 2.25 0 002.25-2.25V2.25A2.25 2.25 0 0013.25 0h-7.5A2.25 2.25 0 003.5 2.25V3.5h-.75A2.25 2.25 0 00.5 5.75v8A2.25 2.25 0 002.75 16zM14 2.25v11.5a.75.75 0 01-.75.75H4.872c.083-.235.128-.487.128-.75V2.25a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75zM2.75 14.5a.75.75 0 00.75-.75V5h-.75a.75.75 0 00-.75.75v8c0 .414.336.75.75.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-node-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M7 9.25A2.75 2.75 0 019.75 6.5h5a2.75 2.75 0 012.75 2.75V11h4.75a.75.75 0 010 1.5H17.5v1.75A2.75 2.75 0 0114.75 17h-5A2.75 2.75 0 017 14.25V12.5H2.25a.75.75 0 010-1.5H7V9.25zm9 0C16 8.56 15.44 8 14.75 8h-5c-.69 0-1.25.56-1.25 1.25v5c0 .69.56 1.25 1.25 1.25h5c.69 0 1.25-.56 1.25-1.25v-5z" clip-rule="evenodd"/></symbol><symbol id="flight-node-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4 6.25A2.25 2.25 0 016.25 4h3a2.25 2.25 0 012.25 2.25V7h3.25a.75.75 0 010 1.5H11.5v.75a2.25 2.25 0 01-2.25 2.25h-3A2.25 2.25 0 014 9.25V8.5H.75a.75.75 0 010-1.5H4v-.75zm6 0a.75.75 0 00-.75-.75h-3a.75.75 0 00-.75.75v3c0 .414.336.75.75.75h3a.75.75 0 00.75-.75v-3z" clip-rule="evenodd"/></symbol><symbol id="flight-octagon-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M6.64 1.805A2.75 2.75 0 018.585 1h6.83c.73 0 1.429.29 1.945.805l4.835 4.835A2.75 2.75 0 0123 8.585v6.83c0 .73-.29 1.429-.805 1.945l-4.835 4.835a2.75 2.75 0 01-1.945.805h-6.83a2.75 2.75 0 01-1.945-.805L1.805 17.36A2.75 2.75 0 011 15.415v-6.83c0-.73.29-1.429.805-1.945L6.64 1.805zm1.945.695c-.332 0-.65.132-.884.366L2.866 7.701a1.25 1.25 0 00-.366.884v6.83c0 .332.132.65.366.884l4.835 4.835c.234.234.552.366.884.366h6.83c.332 0 .65-.132.884-.366l4.835-4.835a1.25 1.25 0 00.366-.884v-6.83c0-.332-.132-.65-.366-.884l-4.835-4.835a1.25 1.25 0 00-.884-.366h-6.83z" clip-rule="evenodd"/></symbol><symbol id="flight-octagon-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3.923.659A2.25 2.25 0 015.514 0h4.972c.597 0 1.169.237 1.59.659l3.265 3.264c.422.422.659.994.659 1.591v4.972a2.25 2.25 0 01-.659 1.59l-3.264 3.265a2.25 2.25 0 01-1.591.659H5.514a2.25 2.25 0 01-1.59-.659L.658 12.077A2.25 2.25 0 010 10.486V5.514c0-.597.237-1.169.659-1.59L3.923.658zm1.591.841a.75.75 0 00-.53.22L1.72 4.984a.75.75 0 00-.22.53v4.972c0 .199.079.39.22.53l3.264 3.264c.14.141.331.22.53.22h4.972a.75.75 0 00.53-.22l3.264-3.264a.75.75 0 00.22-.53V5.514a.75.75 0 00-.22-.53L11.016 1.72a.75.75 0 00-.53-.22H5.514z" clip-rule="evenodd"/></symbol><symbol id="flight-org-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h10.5A2.75 2.75 0 0118 4.75v5.504l2.326.988A2.75 2.75 0 0122 13.773v6.477A1.75 1.75 0 0120.25 22h-3a.746.746 0 01-.622-.33.746.746 0 01-.128-.42V10.769a.81.81 0 010-.039V4.75c0-.69-.56-1.25-1.25-1.25H4.75c-.69 0-1.25.56-1.25 1.25v16.5a.75.75 0 01-1.5 0V4.75zM18 20.5v-8.616l1.739.739c.461.196.76.649.76 1.15v6.477a.25.25 0 01-.25.25H18z" clip-rule="evenodd"/><path d="M8.25 16C7.56 16 7 16.56 7 17.25v4a.75.75 0 001.5 0V17.5h3v3.75a.75.75 0 001.5 0v-4c0-.69-.56-1.25-1.25-1.25h-3.5zM7 6.75A.75.75 0 017.75 6h.5a.75.75 0 010 1.5h-.5A.75.75 0 017 6.75zM11.75 6a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM7 9.75A.75.75 0 017.75 9h.5a.75.75 0 010 1.5h-.5A.75.75 0 017 9.75zM11.75 9a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM7 12.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75zM11.75 12a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/></g></symbol><symbol id="flight-org-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h6.5A2.25 2.25 0 0112 3.25v2.112l2.05 1.453A2.25 2.25 0 0115 8.65v5.1c0 .69-.56 1.25-1.25 1.25h-2.5a.748.748 0 01-.75-.751v-11a.75.75 0 00-.75-.75h-6.5a.75.75 0 00-.75.75v11a.75.75 0 01-1.5 0v-11zM12 13.5V7.2l1.184.839a.75.75 0 01.316.612v4.85H12z" clip-rule="evenodd"/><path d="M4.75 10.55a.7.7 0 00-.7.7v3a.7.7 0 101.4 0v-2.3h2.1v2.3a.7.7 0 101.4 0v-3a.7.7 0 00-.7-.7h-3.5zM4.25 4.75A.75.75 0 015 4h.25a.75.75 0 010 1.5H5a.75.75 0 01-.75-.75zM7.75 4a.75.75 0 000 1.5H8A.75.75 0 008 4h-.25zM4.25 6.75A.75.75 0 015 6h.25a.75.75 0 010 1.5H5a.75.75 0 01-.75-.75zM7.75 6a.75.75 0 000 1.5H8A.75.75 0 008 6h-.25zM4.25 8.75A.75.75 0 015 8h.25a.75.75 0 010 1.5H5a.75.75 0 01-.75-.75zM7.75 8a.75.75 0 000 1.5H8A.75.75 0 008 8h-.25z"/></g></symbol><symbol id="flight-outline-24" viewBox="0 0 24 24"><g><path d="M6.5 5.75A.75.75 0 017.25 5h.01a.75.75 0 010 1.5h-.01a.75.75 0 01-.75-.75zM7.25 9a.75.75 0 000 1.5h.01a.75.75 0 000-1.5h-.01zM6.5 13.75a.75.75 0 01.75-.75h.01a.75.75 0 010 1.5h-.01a.75.75 0 01-.75-.75zM7.25 17a.75.75 0 000 1.5h.01a.75.75 0 000-1.5h-.01zM9.5 9.75a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5h-4.5a.75.75 0 01-.75-.75zM10.25 5a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5zM9.5 13.75a.75.75 0 01.75-.75h6.5a.75.75 0 010 1.5h-6.5a.75.75 0 01-.75-.75zM10.25 17a.75.75 0 000 1.5h3.5a.75.75 0 000-1.5h-3.5z"/><path fill-rule="evenodd" d="M3 3.75A2.75 2.75 0 015.75 1h12.5A2.75 2.75 0 0121 3.75v16.5A2.75 2.75 0 0118.25 23H5.75A2.75 2.75 0 013 20.25V3.75zM5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V3.75c0-.69-.56-1.25-1.25-1.25H5.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-outline-16" viewBox="0 0 16 16"><g><path d="M6.5 7.25a.75.75 0 01.75-.75h4a.75.75 0 010 1.5h-4a.75.75 0 01-.75-.75zM4.75 3.5a.75.75 0 000 1.5h.01a.75.75 0 000-1.5h-.01zM4 7.25a.75.75 0 01.75-.75h.01a.75.75 0 010 1.5h-.01A.75.75 0 014 7.25zM4.75 9.5a.75.75 0 000 1.5h.01a.75.75 0 000-1.5h-.01zM6.5 4.25a.75.75 0 01.75-.75h2.5a.75.75 0 010 1.5h-2.5a.75.75 0 01-.75-.75zM7.25 9.5a.75.75 0 000 1.5h3a.75.75 0 000-1.5h-3z"/><path fill-rule="evenodd" d="M1 2.25A2.25 2.25 0 013.25 0h9.5A2.25 2.25 0 0115 2.25v11.5A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V2.25zm2.25-.75a.75.75 0 00-.75.75v11.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V2.25a.75.75 0 00-.75-.75h-9.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-package-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M10.794.754a2.75 2.75 0 012.412 0l8.811 4.298c.602.293.983.904.983 1.573v9.902a2.75 2.75 0 01-1.496 2.448l-8.25 4.226a2.75 2.75 0 01-2.508 0l-8.25-4.226A2.75 2.75 0 011 16.527V6.625c0-.67.381-1.28.983-1.573L10.794.754zm1.754 1.348a1.25 1.25 0 00-1.096 0l-2.82 1.375 8.505 4.253 3.52-1.672-8.109-3.956zm2.869 6.445L6.934 4.306 3.343 6.058 12 10.17l3.417-1.623zM2.5 16.527v-9.21l8.75 4.157v10.3L3.18 17.64a1.25 1.25 0 01-.68-1.113zm18.32 1.113l-8.07 4.133V11.474l8.75-4.156v9.21c0 .469-.263.898-.68 1.112z" clip-rule="evenodd"/></symbol><symbol id="flight-package-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9.02.678a2.25 2.25 0 00-2.04 0L1.682 3.374A1.25 1.25 0 001 4.488v6.717c0 .658.37 1.26.956 1.56l5.023 2.557a2.25 2.25 0 002.042 0l5.023-2.557a1.75 1.75 0 00.956-1.56V4.488c0-.47-.264-.9-.683-1.114L9.021.678zM7.66 2.015a.75.75 0 01.68 0l4.436 2.258-1.468.734-4.805-2.403 1.157-.59zM4.84 3.45l-1.617.823L8 6.661l1.631-.815-4.79-2.396zM2.5 5.588v5.617c0 .094.053.18.137.223l4.613 2.348V7.964L2.5 5.588zm10.863 5.84L8.75 13.776V7.964l4.75-2.375v5.617a.25.25 0 01-.137.223z" clip-rule="evenodd"/></symbol><symbol id="flight-paperclip-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M16.072 2.5c-.868 0-1.7.342-2.31.949l-9.22 9.14A5.196 5.196 0 003 16.28c0 1.383.554 2.71 1.542 3.69a5.299 5.299 0 003.73 1.531c1.4 0 2.742-.552 3.73-1.532l9.22-9.14a.75.75 0 011.056 1.065l-9.22 9.14A6.799 6.799 0 018.273 23a6.799 6.799 0 01-4.786-1.966A6.696 6.696 0 011.5 16.279c0-1.785.715-3.495 1.986-4.755l9.219-9.14A4.783 4.783 0 0116.072 1c1.262 0 2.473.497 3.367 1.383a4.714 4.714 0 011.398 3.348c0 1.257-.504 2.46-1.398 3.347l-9.23 9.14a2.766 2.766 0 01-3.894 0 2.732 2.732 0 010-3.88l8.517-8.434a.75.75 0 011.055 1.066l-8.516 8.434a1.232 1.232 0 000 1.75 1.266 1.266 0 001.783 0l9.229-9.141a3.214 3.214 0 00.954-2.282c0-.855-.342-1.676-.954-2.282a3.283 3.283 0 00-2.311-.949z" clip-rule="evenodd"/></symbol><symbol id="flight-paperclip-16" viewBox="0 0 16 16"><path d="M9.387 2.102a2.034 2.034 0 012.864 0c.776.785.749 2.178 0 2.928-.75.749-6.39 6.465-6.39 6.465a.642.642 0 01-.898 0 .685.685 0 010-.937l5.896-5.966a.75.75 0 10-1.066-1.054L3.896 9.504a2.184 2.184 0 000 3.045 2.142 2.142 0 003.033 0l6.39-6.466c1.36-1.377 1.36-3.658 0-5.035-1.364-1.381-3.636-1.381-5 0L1.938 7.513A5.001 5.001 0 00.5 11.026c0 1.316.516 2.58 1.437 3.514A4.892 4.892 0 005.42 16c1.308 0 2.56-.526 3.482-1.46l6.383-6.466a.75.75 0 10-1.068-1.053l-6.382 6.465A3.392 3.392 0 015.419 14.5a3.392 3.392 0 01-2.414-1.014A3.501 3.501 0 012 11.026c0-.924.363-1.808 1.005-2.46l6.382-6.464z"/></symbol><symbol id="flight-path-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M19.5 1a3.5 3.5 0 00-1.668 6.578c-.665 1.8-1.174 2.997-2.267 4.503a2.001 2.001 0 00-1.605.21c-1.859-1.251-3.599-1.917-5.978-2.56A2 2 0 104.48 11.3c-.616 1.268-1.071 2.439-1.406 3.674-.344 1.267-.556 2.585-.694 4.125a2 2 0 101.497.103c.132-1.465.332-2.682.644-3.835.303-1.115.715-2.186 1.29-3.375a1.997 1.997 0 001.8-.806c2.236.605 3.801 1.208 5.454 2.311A2.002 2.002 0 0015 16a2 2 0 001.74-2.986c1.25-1.71 1.815-3.057 2.537-5.021A3.5 3.5 0 1019.5 1zm-2 3.5a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/></symbol><symbol id="flight-path-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M13 0a3 3 0 00-1.65 5.506 7.338 7.338 0 01-.78 1.493c-.22.32-.472.635-.8 1.025a1.509 1.509 0 00-.832.085 12.722 12.722 0 00-1.773-1.124c-.66-.34-1.366-.616-2.215-.871a1.5 1.5 0 10-2.708 1.204c-.9 1.935-1.236 3.607-1.409 5.838a1.5 1.5 0 101.497.095c.162-2.07.464-3.55 1.25-5.253.381-.02.725-.183.979-.435.763.23 1.367.471 1.919.756a11.13 11.13 0 011.536.973 1.5 1.5 0 102.899-.296c.348-.415.64-.779.894-1.148.375-.548.665-1.103.964-1.857A3 3 0 1013 0zm-1.5 3a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/></symbol><symbol id="flight-pause-24" viewBox="0 0 24 24"><g><path d="M9 5.25a.75.75 0 00-1.5 0v13.5a.75.75 0 001.5 0V5.25zM16.5 5.25a.75.75 0 00-1.5 0v13.5a.75.75 0 001.5 0V5.25z"/></g></symbol><symbol id="flight-pause-16" viewBox="0 0 16 16"><g><path d="M6 3.75a.75.75 0 00-1.5 0v8.5a.75.75 0 001.5 0v-8.5zM11.5 3.75a.75.75 0 00-1.5 0v8.5a.75.75 0 001.5 0v-8.5z"/></g></symbol><symbol id="flight-pause-circle-24" viewBox="0 0 24 24"><g><path d="M9.25 7a.75.75 0 01.75.75v8.5a.75.75 0 01-1.5 0v-8.5A.75.75 0 019.25 7zM15.5 7.75a.75.75 0 00-1.5 0v8.5a.75.75 0 001.5 0v-8.5z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></symbol><symbol id="flight-pause-circle-16" viewBox="0 0 16 16"><g><path d="M6.25 5a.75.75 0 01.75.75v4.5a.75.75 0 01-1.5 0v-4.5A.75.75 0 016.25 5zM10.5 5.75a.75.75 0 00-1.5 0v4.5a.75.75 0 001.5 0v-4.5z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></symbol><symbol id="flight-pen-tool-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M1.923 1.02a.75.75 0 00-.903.903l3.5 14.75a.75.75 0 00.588.563l6.51 1.26-.148.149a.75.75 0 000 1.06l3.075 3.075a.75.75 0 001.06 0l7.175-7.175a.75.75 0 000-1.06l-3.075-3.075a.75.75 0 00-1.06 0l-.149.148-1.26-6.51a.75.75 0 00-.563-.588l-14.75-3.5zm15.293 11.878l-1.36-7.03L4.15 3.091l5.325 5.324a3 3 0 11-1.06 1.06L3.09 4.152l2.777 11.705 7.03 1.36 4.318-4.318zm-4.155 6.277l6.114-6.114 2.014 2.014-6.114 6.114-2.014-2.014zM9.5 11a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/></symbol><symbol id="flight-pen-tool-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M.923.02A.75.75 0 00.02.923l2.476 10.433a.75.75 0 00.587.563l4.245.822a.75.75 0 00.142.864l2.175 2.175a.75.75 0 001.06 0l5.075-5.075a.75.75 0 000-1.06L13.605 7.47a.75.75 0 00-.864-.142l-.822-4.245a.75.75 0 00-.563-.587L.923.02zm10.529 8.542l-.913-4.718L3.15 2.09l3.08 3.08a2.25 2.25 0 11-1.06 1.06l-3.08-3.08 1.753 7.388 4.718.913 2.89-2.89zM9.06 13.075l4.014-4.014 1.114 1.114-4.014 4.014-1.114-1.114zM6.45 7.201a.75.75 0 111.5 0 .75.75 0 01-1.5 0z" clip-rule="evenodd"/></symbol><symbol id="flight-pencil-tool-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M18.945 4.884a2.75 2.75 0 00-3.89 0L6.05 13.89A4.75 4.75 0 005 15.484l-1.695 4.238a.75.75 0 00.975.974l4.237-1.695a4.75 4.75 0 001.595-1.051l9.005-9.005a2.75 2.75 0 000-3.89l-.171-.17zm-2.829 1.06a1.25 1.25 0 011.768 0l.171.172a1.25 1.25 0 010 1.768l-.555.555L15.56 6.5l.556-.555zM14.5 7.562L7.11 14.95a3.25 3.25 0 00-.719 1.091l-1.045 2.613 2.613-1.045c.409-.164.78-.409 1.091-.72L16.44 9.5 14.5 7.56z" clip-rule="evenodd"/></symbol><symbol id="flight-pencil-tool-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M12.988 2.177a1.75 1.75 0 00-2.475 0L3.26 9.429a2.75 2.75 0 00-.609.923l-1.347 3.37a.75.75 0 00.975.974l3.368-1.347a2.75 2.75 0 00.924-.61l7.252-7.252a1.75 1.75 0 000-2.475l-.835-.835zm-1.415 1.06a.25.25 0 01.354 0l.836.836a.25.25 0 010 .354l-.638.637-1.19-1.19.638-.637zM9.875 4.936L4.32 10.49a1.25 1.25 0 00-.277.42l-.698 1.744 1.744-.698c.157-.063.3-.157.42-.277l5.554-5.554-1.19-1.19z" clip-rule="evenodd"/></symbol><symbol id="flight-phone-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M7.778 2.817a1.314 1.314 0 00-.869-.317H3.81a1.316 1.316 0 00-1.241.89c-.058.17-.08.351-.064.53.326 3.06 1.37 6 3.047 8.583 1.684 2.595 3.374 4.276 5.963 5.951a19.676 19.676 0 008.56 3.041 1.316 1.316 0 001.315-.78c.073-.166.11-.346.11-.528l-.001-.1c-.002-.528-.011-2.53 0-3.008a1.304 1.304 0 00-1.124-1.326 14.006 14.006 0 01-3.057-.76h-.001a1.315 1.315 0 00-1.383.292l-.002.002-1.306 1.303a.75.75 0 01-.9.122 17.225 17.225 0 01-6.466-6.454.75.75 0 01.122-.902l1.307-1.305a1.306 1.306 0 00.294-1.377v-.001a13.937 13.937 0 01-.763-3.051 1.306 1.306 0 00-.442-.805zM6.898 1a2.814 2.814 0 012.808 2.414v.007c.124.932.352 1.846.681 2.726l-.702.263.702-.264a2.803 2.803 0 01-.633 2.962l-.003.003-.896.895a15.726 15.726 0 005.123 5.112l.9-.899a2.813 2.813 0 012.965-.632c.882.329 1.798.557 2.731.68h.007A2.813 2.813 0 0123 17.117c-.011.451-.002 2.42 0 2.96v.104a2.803 2.803 0 01-1.91 2.671c-.371.125-.764.172-1.154.137l-.013-.002a21.173 21.173 0 01-9.222-3.274c-2.765-1.79-4.607-3.62-6.406-6.393a21.081 21.081 0 01-3.281-9.248L1.01 4.06a2.803 2.803 0 011.665-2.82A2.815 2.815 0 013.81 1h3.09z" clip-rule="evenodd"/></symbol><symbol id="flight-phone-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4.87 1.671a.71.71 0 00-.469-.171H2.208a.712.712 0 00-.671.48.702.702 0 00-.034.284c.227 2.129.954 4.175 2.12 5.972 1.175 1.81 2.348 2.976 4.153 4.145a13.696 13.696 0 005.957 2.117.713.713 0 00.708-.421c.039-.09.059-.187.059-.285v-.071c-.002-.371-.009-1.792 0-2.134a.703.703 0 00-.606-.715c-.755-.1-1.496-.284-2.209-.55h-.002a.71.71 0 00-.746.158h-.002l-.923.922a.75.75 0 01-.9.121 12.403 12.403 0 01-4.655-4.646.75.75 0 01.122-.902l.924-.923a.704.704 0 00.158-.742L5.66 4.31a10.077 10.077 0 01-.55-2.205.704.704 0 00-.24-.433zM4.39.001a2.21 2.21 0 012.205 1.895v.007c.086.643.243 1.273.47 1.88l-.703.263.702-.264a2.203 2.203 0 01-.497 2.327l-.003.003-.51.509a10.904 10.904 0 003.314 3.306l.514-.514a2.21 2.21 0 012.327-.496c.609.227 1.24.384 1.885.468l.006.001a2.209 2.209 0 011.9 2.239c-.008.315-.002 1.703 0 2.086v.075a2.202 2.202 0 01-1.502 2.098c-.29.098-.6.135-.905.107l-.014-.001a15.196 15.196 0 01-6.618-2.35c-1.981-1.282-3.306-2.6-4.596-4.587A15.131 15.131 0 01.01 2.416L.01 2.404A2.202 2.202 0 011.317.188 2.21 2.21 0 012.207 0H4.39z" clip-rule="evenodd"/></symbol><symbol id="flight-phone-call-24" viewBox="0 0 24 24"><g><path d="M14.833.005a.75.75 0 00-.166 1.49 8.873 8.873 0 017.838 7.828.75.75 0 101.49-.167A10.373 10.373 0 0014.833.005zM14.894 4.29a.75.75 0 10-.288 1.473 4.596 4.596 0 013.631 3.63.75.75 0 101.472-.287 6.096 6.096 0 00-4.815-4.815z"/><path fill-rule="evenodd" d="M8.755 1.678A2.814 2.814 0 006.898 1h-3.09a2.815 2.815 0 00-2.66 1.911c-.125.37-.172.76-.137 1.15l.002.01a21.082 21.082 0 003.28 9.249c1.8 2.773 3.642 4.604 6.407 6.393a21.173 21.173 0 009.221 3.274l.014.002a2.815 2.815 0 002.829-1.671c.157-.359.237-.746.235-1.137v-.105c-.003-.539-.011-2.508 0-2.96a2.805 2.805 0 00-2.418-2.849h-.007c-.933-.123-1.85-.351-2.732-.68a2.815 2.815 0 00-2.964.632l-.9.899a15.724 15.724 0 01-5.124-5.112l.897-.895.003-.003a2.806 2.806 0 00.633-2.961 12.436 12.436 0 01-.68-2.726l-.001-.007a2.806 2.806 0 00-.951-1.736zM6.909 2.5A1.314 1.314 0 018.22 3.622c.138 1.042.394 2.066.762 3.05v.002a1.304 1.304 0 01-.293 1.377L7.382 9.356a.75.75 0 00-.122.902 17.226 17.226 0 006.466 6.454.75.75 0 00.9-.122l1.306-1.303.001-.002a1.311 1.311 0 011.384-.293h.001c.987.368 2.012.623 3.057.761a1.313 1.313 0 011.124 1.326c-.011.479-.002 2.48 0 3.007v.101a1.305 1.305 0 01-.89 1.244c-.172.058-.353.08-.533.064a19.676 19.676 0 01-8.562-3.041c-2.588-1.676-4.278-3.357-5.962-5.951A19.582 19.582 0 012.505 3.92a1.303 1.303 0 01.776-1.308c.167-.074.347-.112.53-.112h3.098zm3.478 3.647v-.001l-.702.264.702-.263z" clip-rule="evenodd"/></g></symbol><symbol id="flight-phone-call-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M5.847.533A2.21 2.21 0 004.391 0H2.206a2.21 2.21 0 00-2.09 1.501c-.098.29-.135.598-.107.903l.001.012a15.13 15.13 0 002.355 6.637c1.29 1.987 2.615 3.304 4.596 4.587a15.197 15.197 0 006.618 2.35h.014a2.21 2.21 0 002.406-2.204v-.075c-.002-.383-.008-1.771 0-2.087A2.204 2.204 0 0014.1 9.386h-.007a8.626 8.626 0 01-1.884-.47 2.21 2.21 0 00-2.327.497l-.515.513a10.903 10.903 0 01-3.313-3.305l.51-.509.003-.003a2.204 2.204 0 00.498-2.326 8.577 8.577 0 01-.47-1.88v-.007A2.204 2.204 0 005.847.533zM4.401 1.5a.71.71 0 01.708.604c.1.753.285 1.493.55 2.205l.001.001a.703.703 0 01-.157.742l-.924.923a.75.75 0 00-.122.902 12.403 12.403 0 004.655 4.646.75.75 0 00.9-.121l.923-.921.002-.002a.71.71 0 01.746-.157h.002c.713.266 1.454.45 2.209.55a.709.709 0 01.606.715 148.67 148.67 0 000 2.134v.07a.702.702 0 01-.481.671.71.71 0 01-.286.035 13.696 13.696 0 01-5.957-2.117c-1.805-1.168-2.979-2.335-4.153-4.144a13.63 13.63 0 01-2.12-5.972.702.702 0 01.419-.704c.09-.04.187-.06.286-.06H4.4zm2.664 2.283v-.001l-.703.264.703-.263z" clip-rule="evenodd"/><path d="M10.333.005a.75.75 0 10-.166 1.49 4.91 4.91 0 014.338 4.332.75.75 0 001.49-.167A6.41 6.41 0 0010.333.005z"/><path d="M10.394 2.53a.75.75 0 10-.288 1.472 2.395 2.395 0 011.892 1.892.75.75 0 101.472-.288 3.894 3.894 0 00-3.076-3.076z"/></g></symbol><symbol id="flight-phone-off-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M6.91 2.5a1.314 1.314 0 011.31 1.122c.138 1.042.394 2.066.762 3.05v.002a1.304 1.304 0 01-.293 1.377L7.382 9.356a.75.75 0 101.06 1.062L9.75 9.11l.003-.003a2.807 2.807 0 00.633-2.962 12.438 12.438 0 01-.68-2.725l-.001-.007A2.806 2.806 0 006.898 1h-3.09a2.815 2.815 0 00-2.66 1.911c-.125.37-.172.76-.137 1.15l.002.011a21.081 21.081 0 003.28 9.248.75.75 0 101.259-.817A19.582 19.582 0 012.505 3.92a1.303 1.303 0 01.776-1.308c.167-.074.347-.112.53-.112h3.098zm3.477 3.646l-.702.264.702-.263zM7.666 17.395L2.28 22.78a.75.75 0 01-1.06-1.06l20.5-20.5a.75.75 0 111.06 1.06L11.673 13.388a15.738 15.738 0 002.305 1.73l.9-.899a2.813 2.813 0 012.965-.631c.882.328 1.798.556 2.731.678l.007.001a2.812 2.812 0 012.418 2.85c-.011.451-.002 2.42 0 2.96v.104a2.803 2.803 0 01-1.91 2.671c-.371.125-.764.172-1.154.137l-.013-.002a21.175 21.175 0 01-9.222-3.274c-1.144-.74-2.135-1.49-3.034-2.319zm2.945-2.945l-1.883 1.883c.814.745 1.722 1.432 2.787 2.12a19.673 19.673 0 008.56 3.042 1.315 1.315 0 001.315-.78c.073-.166.11-.346.11-.528l-.001-.1c-.002-.528-.011-2.53 0-3.008a1.305 1.305 0 00-1.124-1.326 14.007 14.007 0 01-3.057-.76h-.001a1.316 1.316 0 00-1.384.292l-.001.002-1.306 1.303a.75.75 0 01-.9.122 17.233 17.233 0 01-3.115-2.262z"/></g></symbol><symbol id="flight-phone-off-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M4.401 1.5a.71.71 0 01.708.604c.1.753.285 1.493.55 2.205l.002.001a.703.703 0 01-.158.742l-.924.923a.75.75 0 001.06 1.061l.925-.924.003-.003a2.204 2.204 0 00.498-2.326 8.577 8.577 0 01-.47-1.88v-.007A2.204 2.204 0 004.39 0H2.206a2.21 2.21 0 00-2.09 1.501c-.098.29-.135.598-.107.903l.001.012a15.131 15.131 0 002.355 6.637.75.75 0 101.258-.817 13.631 13.631 0 01-2.12-5.972.702.702 0 01.419-.704c.09-.04.187-.06.286-.06H4.4zM4.91 12.15l-2.63 2.63a.75.75 0 01-1.06-1.06l12.5-12.5a.75.75 0 111.06 1.06L8.05 9.012c.403.334.84.632 1.312.92l.52-.519a2.209 2.209 0 012.327-.496l-.262.703.263-.703c.608.227 1.24.384 1.883.468l.007.001a2.209 2.209 0 011.9 2.239c-.009.315-.002 1.703 0 2.086v.075a2.204 2.204 0 01-2.407 2.205l-.014-.001a15.196 15.196 0 01-6.618-2.35c-.752-.487-1.426-.947-2.05-1.49zm2.075-2.074l-1.01 1.01c.517.44 1.098.84 1.801 1.295a13.696 13.696 0 005.957 2.117l-.005-.001-.068.747.081-.746h-.008a.71.71 0 00.767-.706v-.071c-.002-.372-.009-1.792 0-2.134a.704.704 0 00-.606-.715h.004l.098-.743-.105.743h.003a10.13 10.13 0 01-2.209-.55h-.002a.712.712 0 00-.746.158l.001-.002-.53-.531.527.534-.923.921a.75.75 0 01-.9.121c-.743-.421-1.461-.878-2.127-1.447z"/></g></symbol><symbol id="flight-pie-chart-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M11.75 1a.75.75 0 00-.75.75v10.5c0 .414.336.75.75.75h10.5a.75.75 0 00.75-.75A11.25 11.25 0 0011.75 1zm.75 10.5V2.529a9.751 9.751 0 018.971 8.971H12.5z" clip-rule="evenodd"/><path d="M8.08 3.344a.75.75 0 10-.62-1.366A11.002 11.002 0 001 12c0 6.075 4.925 11 11 11 4.457 0 8.294-2.65 10.022-6.46a.75.75 0 00-1.366-.619A9.502 9.502 0 0112 21.501 9.5 9.5 0 012.5 12a9.502 9.502 0 015.58-8.657z"/></g></symbol><symbol id="flight-pie-chart-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M7.75.05a.7.7 0 00-.7.7v7.5a.7.7 0 00.7.7h7.5a.7.7 0 00.7-.7 8.2 8.2 0 00-8.2-8.2zm.7 7.5V1.486a6.8 6.8 0 016.064 6.064H8.45z" clip-rule="evenodd"/><path d="M5.118 2.172A.75.75 0 004.452.828a8 8 0 1010.72 10.72.75.75 0 10-1.344-.666 6.5 6.5 0 11-8.71-8.71z"/></g></symbol><symbol id="flight-pin-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M13.614 3.482a1.75 1.75 0 012.464.012l4.425 4.425a1.75 1.75 0 010 2.475l-2.612 2.612a.75.75 0 01-.53.22h-1.634l-2.025 2.025-.275 2.48c-.144 1.295-1.622 2.005-2.713 1.218-.773-.559-1.768-1.309-2.573-2.026l-3.86 3.86a.75.75 0 11-1.061-1.06l3.86-3.861c-.717-.805-1.467-1.8-2.025-2.573-.788-1.09-.077-2.568 1.217-2.712l2.48-.276 1.964-1.963V6.643a.75.75 0 01.225-.535l2.673-2.626zm1.403 1.072a.25.25 0 00-.352-.001l-2.449 2.404V8.65a.75.75 0 01-.22.53l-2.369 2.369a.75.75 0 01-.447.215l-2.742.305c-.195.021-.257.218-.167.343.692.959 1.621 2.174 2.384 2.937.763.763 1.979 1.692 2.937 2.385.125.09.322.027.344-.168l.304-2.741a.75.75 0 01.216-.448l2.43-2.43a.75.75 0 01.53-.22h1.634l2.393-2.393a.25.25 0 000-.353l-4.426-4.426z" clip-rule="evenodd"/></symbol><symbol id="flight-pin-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9.121 1.4a1.25 1.25 0 011.76.008l3.707 3.708a1.25 1.25 0 010 1.768l-2.014 2.014a.75.75 0 01-.53.22h-1.16L9.452 10.55l-.248 2.231c-.103.924-1.16 1.435-1.945.88-.578-.409-1.458-1.052-2.18-1.68l-2.799 2.8a.75.75 0 01-1.06-1.061l2.799-2.8c-.628-.721-1.271-1.6-1.68-2.18-.555-.784-.044-1.841.88-1.944l2.23-.248 1.387-1.386V3.956a.75.75 0 01.225-.535L9.12 1.4zm.874 1.244L8.335 4.27v1.202a.75.75 0 01-.219.53L6.324 7.795a.75.75 0 01-.447.215l-2.053.228c.516.713 1.202 1.61 1.765 2.173s1.46 1.25 2.173 1.765l.228-2.053a.75.75 0 01.215-.447l1.838-1.839a.75.75 0 01.53-.22h1.16L13.351 6 9.995 2.644z" clip-rule="evenodd"/></symbol><symbol id="flight-pipeline-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M4.75 4.5A2.25 2.25 0 002.5 6.75v1A2.25 2.25 0 004.75 10h1a2.25 2.25 0 002.236-2H9.82c.967 0 1.75.784 1.75 1.75v4.5a3.25 3.25 0 003.25 3.25h1.195a2.25 2.25 0 002.236 2h1a2.25 2.25 0 002.25-2.25v-1A2.25 2.25 0 0019.25 14h-1a2.25 2.25 0 00-2.236 2h-1.195a1.75 1.75 0 01-1.75-1.75v-4.5A3.25 3.25 0 009.82 6.5H7.986a2.25 2.25 0 00-2.236-2h-1zM4 6.75A.75.75 0 014.75 6h1a.75.75 0 01.75.75v1a.75.75 0 01-.75.75h-1A.75.75 0 014 7.75v-1zm14.25 8.75a.75.75 0 00-.75.75v1c0 .414.336.75.75.75h1a.75.75 0 00.75-.75v-1a.75.75 0 00-.75-.75h-1z" clip-rule="evenodd"/></symbol><symbol id="flight-pipeline-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M2.75 2.5A1.75 1.75 0 001 4.25v1C1 6.216 1.784 7 2.75 7h1a1.75 1.75 0 001.732-1.5H6.5a.75.75 0 01.75.75v3.5A2.25 2.25 0 009.5 12h1.018c.121.848.85 1.5 1.732 1.5h1A1.75 1.75 0 0015 11.75v-1A1.75 1.75 0 0013.25 9h-1a1.75 1.75 0 00-1.732 1.5H9.5a.75.75 0 01-.75-.75v-3.5A2.25 2.25 0 006.5 4H5.482A1.75 1.75 0 003.75 2.5h-1zM2.5 4.25A.25.25 0 012.75 4h1a.25.25 0 01.25.25v1a.25.25 0 01-.25.25h-1a.25.25 0 01-.25-.25v-1zm9.75 6.25a.25.25 0 00-.25.25v1c0 .138.112.25.25.25h1a.25.25 0 00.25-.25v-1a.25.25 0 00-.25-.25h-1z" clip-rule="evenodd"/></symbol><symbol id="flight-play-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M4 4.814C4 3.436 5.52 2.6 6.684 3.334l11.378 7.186a1.75 1.75 0 010 2.96L6.684 20.665C5.52 21.401 4 20.564 4 19.185V4.816zm1.883-.211a.25.25 0 00-.383.211v14.372a.25.25 0 00.383.211l11.378-7.186a.25.25 0 000-.422L5.884 4.603z" clip-rule="evenodd"/></symbol><symbol id="flight-play-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3 3.814C3 2.436 4.52 1.6 5.684 2.334l6.628 4.186a1.75 1.75 0 010 2.96l-6.628 4.185C4.52 14.401 3 13.564 3 12.185v-8.37zm1.883-.211a.25.25 0 00-.383.211v8.372a.25.25 0 00.383.211l6.628-4.186a.25.25 0 000-.422L4.884 3.603z" clip-rule="evenodd"/></symbol><symbol id="flight-play-circle-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M10.712 6.143C9.548 5.377 8 6.213 8 7.605v8.79c0 1.393 1.548 2.228 2.712 1.462l6.68-4.395a1.75 1.75 0 000-2.924l-6.68-4.395zM9.5 7.605a.25.25 0 01.387-.209l6.681 4.395a.25.25 0 010 .418l-6.68 4.395a.25.25 0 01-.388-.209v-8.79z"/><path d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z"/></g></symbol><symbol id="flight-play-circle-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M7.421 4.356A1.25 1.25 0 005.5 5.411v5.178a1.25 1.25 0 001.921 1.055l4.069-2.59a1.25 1.25 0 000-2.109L7.42 4.356zM10.353 8L7 10.134V5.866L10.353 8z"/><path d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z"/></g></symbol><symbol id="flight-plug-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M16.28 3.94a.75.75 0 00-1.06-1.061L12.418 5.68 10.4 3.662a2.333 2.333 0 00-3.3 0 8.667 8.667 0 00-.04 12.217l-3.73 3.73a.75.75 0 101.061 1.06l3.733-3.732a8.667 8.667 0 0012.057-.193 2.333 2.333 0 000-3.3l-1.736-1.737L21.37 8.78a.75.75 0 10-1.06-1.06l-2.927 2.926-3.905-3.905 2.801-2.802zm-8.12.783a.833.833 0 011.18 0l9.78 9.782a.833.833 0 010 1.178 7.167 7.167 0 01-10.134 0l-.825-.825a7.167 7.167 0 010-10.135z" clip-rule="evenodd"/></symbol><symbol id="flight-plug-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M6.88 1.82a1.598 1.598 0 00-2.26 0 6.403 6.403 0 00-.269 8.768l-2.106 2.106a.75.75 0 001.06 1.061l2.108-2.107a6.402 6.402 0 008.753-.283 1.598 1.598 0 000-2.26L12.561 7.5l1.72-1.72a.75.75 0 00-1.061-1.06L11.5 6.44 9.56 4.5l1.72-1.72a.75.75 0 00-1.06-1.06L8.5 3.44 6.88 1.82zm-1.2 1.06a.098.098 0 01.14 0l7.285 7.286c.039.038.039.1 0 .138a4.902 4.902 0 01-6.932 0l-.492-.492a4.902 4.902 0 010-6.932z" clip-rule="evenodd"/></symbol><symbol id="flight-plus-24" viewBox="0 0 24 24"><path d="M13 5a.75.75 0 00-1.5 0v6.5H5A.75.75 0 005 13h6.5v6.5a.75.75 0 001.5 0V13h6.5a.75.75 0 000-1.5H13V5z"/></symbol><symbol id="flight-plus-16" viewBox="0 0 16 16"><path d="M9 3.5a.75.75 0 00-1.5 0V7H4a.75.75 0 000 1.5h3.5V12A.75.75 0 009 12V8.5h3.5a.75.75 0 000-1.5H9V3.5z"/></symbol><symbol id="flight-plus-circle-24" viewBox="0 0 24 24"><g><path d="M11.75 6.75a.75.75 0 01.75.75V11H16a.75.75 0 010 1.5h-3.5V16a.75.75 0 01-1.5 0v-3.5H7.5a.75.75 0 010-1.5H11V7.5a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M1 11.75C1 5.813 5.813 1 11.75 1S22.5 5.813 22.5 11.75 17.687 22.5 11.75 22.5 1 17.687 1 11.75zM11.75 2.5a9.25 9.25 0 100 18.5 9.25 9.25 0 000-18.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-plus-circle-16" viewBox="0 0 16 16"><g><path d="M7.75 4a.75.75 0 01.75.75V7h2.25a.75.75 0 010 1.5H8.5v2.25a.75.75 0 01-1.5 0V8.5H4.75a.75.75 0 010-1.5H7V4.75A.75.75 0 017.75 4z"/><path fill-rule="evenodd" d="M0 7.75a7.75 7.75 0 1115.5 0 7.75 7.75 0 01-15.5 0zM7.75 1.5a6.25 6.25 0 100 12.5 6.25 6.25 0 000-12.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-plus-square-24" viewBox="0 0 24 24"><g><path d="M11.75 6.75a.75.75 0 01.75.75V11H16a.75.75 0 010 1.5h-3.5V16a.75.75 0 01-1.5 0v-3.5H7.5a.75.75 0 010-1.5H11V7.5a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h14a2.75 2.75 0 012.75 2.75v14a2.75 2.75 0 01-2.75 2.75h-14A2.75 2.75 0 012 18.75v-14zM4.75 3.5c-.69 0-1.25.56-1.25 1.25v14c0 .69.56 1.25 1.25 1.25h14c.69 0 1.25-.56 1.25-1.25v-14c0-.69-.56-1.25-1.25-1.25h-14z" clip-rule="evenodd"/></g></symbol><symbol id="flight-plus-square-16" viewBox="0 0 16 16"><g><path d="M7.75 4a.75.75 0 01.75.75V7h2.25a.75.75 0 010 1.5H8.5v2.25a.75.75 0 01-1.5 0V8.5H4.75a.75.75 0 010-1.5H7V4.75A.75.75 0 017.75 4z"/><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h9a2.25 2.25 0 012.25 2.25v9a2.25 2.25 0 01-2.25 2.25h-9A2.25 2.25 0 011 12.25v-9zm2.25-.75a.75.75 0 00-.75.75v9c0 .414.336.75.75.75h9a.75.75 0 00.75-.75v-9a.75.75 0 00-.75-.75h-9z" clip-rule="evenodd"/></g></symbol><symbol id="flight-power-24" viewBox="0 0 24 24"><g><path d="M12.5 2A.75.75 0 0011 2v10a.75.75 0 001.5 0V2z"/><path d="M5.562 7.293a.75.75 0 10-1.124-.992A9.716 9.716 0 002 12.75c0 5.385 4.365 9.75 9.75 9.75s9.75-4.365 9.75-9.75a9.716 9.716 0 00-2.438-6.45.75.75 0 10-1.124.993 8.25 8.25 0 11-12.375 0z"/></g></symbol><symbol id="flight-power-16" viewBox="0 0 16 16"><g><path d="M8.5 1.25a.75.75 0 00-1.5 0v5.5a.75.75 0 001.5 0v-5.5z"/><path d="M3.548 3.825a.75.75 0 00-1.096-1.024 7.25 7.25 0 1010.596 0 .75.75 0 00-1.096 1.024 5.75 5.75 0 11-8.404 0z"/></g></symbol><symbol id="flight-printer-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M5 3.75V8H3.75A2.75 2.75 0 001 10.75v5.5A2.75 2.75 0 003.75 19H5v2.25c0 .966.784 1.75 1.75 1.75h10.5A1.75 1.75 0 0019 21.25V19h1.25A2.75 2.75 0 0023 16.25v-5.5A2.75 2.75 0 0020.25 8H19V3.75A2.75 2.75 0 0016.25 1h-8.5A2.75 2.75 0 005 3.75zM7.75 2.5c-.69 0-1.25.56-1.25 1.25V8h11V3.75c0-.69-.56-1.25-1.25-1.25h-8.5zM19 17.5h1.25c.69 0 1.25-.56 1.25-1.25v-5.5c0-.69-.56-1.25-1.25-1.25H3.75c-.69 0-1.25.56-1.25 1.25v5.5c0 .69.56 1.25 1.25 1.25H5v-2.75c0-.966.784-1.75 1.75-1.75h10.5c.966 0 1.75.784 1.75 1.75v2.75zM6.5 14.75a.25.25 0 01.25-.25h10.5a.25.25 0 01.25.25v6.5a.25.25 0 01-.25.25H6.75a.25.25 0 01-.25-.25v-6.5z" clip-rule="evenodd"/></symbol><symbol id="flight-printer-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M2.25 5H3V3.25A2.25 2.25 0 015.25 1h5.5A2.25 2.25 0 0113 3.25V5h.75A2.25 2.25 0 0116 7.25v3.5A2.25 2.25 0 0113.75 13H12.5v.25c0 .69-.56 1.25-1.25 1.25h-6.5c-.69 0-1.25-.56-1.25-1.25V13H2.25A2.25 2.25 0 010 10.75v-3.5A2.25 2.25 0 012.25 5zm3-2.5a.75.75 0 00-.75.75V5h7V3.25a.75.75 0 00-.75-.75h-5.5zm-1.75 9V9.75c0-.69.56-1.25 1.25-1.25h6.5c.69 0 1.25.56 1.25 1.25v1.75h1.25a.75.75 0 00.75-.75v-3.5a.75.75 0 00-.75-.75H2.25a.75.75 0 00-.75.75v3.5c0 .414.336.75.75.75H3.5zM11 13H5v-3h6v3z" clip-rule="evenodd"/></symbol><symbol id="flight-provider-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm-1 1.552a9.438 9.438 0 00-3.5 1.08v4.085L11 5.85V2.552zm-8.349 7.75A9.493 9.493 0 016 4.635v3.883l-3.349 1.786zm-.15 1.781L6 10.217v9.149a9.481 9.481 0 01-3.5-7.283zM11 17.02l-3.5 2.032V9.417L11 7.55v9.47zm1.5-.871V6.75L16 4.883v9.234l-3.5 2.032zm3.5-.298l-3.5 2.033v3.603a9.449 9.449 0 003.5-.868v-4.768zm1.5 3.896V14.98l3.977-2.309a9.491 9.491 0 01-3.977 7.076zm0-6.501V4.253a9.494 9.494 0 013.943 6.703l-3.943 2.29zM11 18.754l-3.117 1.81c.96.463 2.01.768 3.117.884v-2.694zM12.5 5.05V2.513c1.168.06 2.28.332 3.3.777l-3.3 1.76z" clip-rule="evenodd"/></symbol><symbol id="flight-provider-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zm-.5 1.519a6.464 6.464 0 00-2 .48V5.19l2-1.09V1.518zM1.532 7.356A6.491 6.491 0 014 2.876V6.01L1.532 7.356zm.05 1.68L4 7.719v5.406a6.495 6.495 0 01-2.418-4.087zM7.5 11.423l-2 1.143V6.9l2-1.091v5.613zm1.5-.857V4.991L11 3.9v5.522l-2 1.143zm2 .585l-2 1.143v2.13a6.456 6.456 0 002-.655V11.15zm1.5 1.54v-2.397l1.887-1.079A6.488 6.488 0 0112.5 12.69zm0-4.125V3.31a6.482 6.482 0 011.976 4.126L12.5 8.565zm-5 4.585l-1.697.97a6.47 6.47 0 001.697.361V13.15zM9 3.282V1.576a6.455 6.455 0 011.961.636L9 3.282z" clip-rule="evenodd"/></symbol><symbol id="flight-queue-24" viewBox="0 0 24 24"><g><path d="M3.19 3.892a.75.75 0 10-.88 1.216L5.97 7.75l-3.66 2.642a.75.75 0 00.88 1.216l4.5-3.25a.75.75 0 000-1.216l-4.5-3.25zM11.75 7a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5zM8 12.75a.75.75 0 01.75-.75h12.5a.75.75 0 010 1.5H8.75a.75.75 0 01-.75-.75zM8.75 17a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H8.75z"/></g></symbol><symbol id="flight-queue-16" viewBox="0 0 16 16"><g><path d="M2.23 2.674a.75.75 0 00-.96 1.152L3.578 5.75 1.27 7.674a.75.75 0 00.96 1.152l3-2.5a.75.75 0 000-1.152l-3-2.5zM8.25 5a.75.75 0 000 1.5h6a.75.75 0 000-1.5h-6zM5.5 9.25a.75.75 0 01.75-.75h8a.75.75 0 010 1.5h-8a.75.75 0 01-.75-.75zM6.25 12a.75.75 0 000 1.5h8a.75.75 0 000-1.5h-8z"/></g></symbol><symbol id="flight-radio-24" viewBox="0 0 24 24"><g><path d="M5.282 4.22a.75.75 0 010 1.06 9.502 9.502 0 000 13.436.75.75 0 01-1.06 1.06 11.002 11.002 0 010-15.556.75.75 0 011.06 0zM18.718 4.22a.75.75 0 011.06 0 11.002 11.002 0 010 15.557.75.75 0 11-1.06-1.06 9.502 9.502 0 000-13.437.75.75 0 010-1.06z"/><path fill-rule="evenodd" d="M9 12a3 3 0 116 0 3 3 0 01-6 0zm3-1.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3z" clip-rule="evenodd"/><path d="M8.117 8.026A.75.75 0 107.05 6.974a7.11 7.11 0 00-1.517 2.305 7.194 7.194 0 000 5.432 7.11 7.11 0 001.517 2.305.75.75 0 001.068-1.053 5.611 5.611 0 01-1.196-1.819 5.694 5.694 0 010-4.299 5.61 5.61 0 011.196-1.819zM16.951 6.984a.75.75 0 10-1.069 1.053c.513.52.92 1.138 1.197 1.819a5.693 5.693 0 010 4.299 5.612 5.612 0 01-1.197 1.819.75.75 0 001.07 1.052 7.11 7.11 0 001.516-2.305 7.194 7.194 0 000-5.432 7.11 7.11 0 00-1.517-2.305z"/></g></symbol><symbol id="flight-radio-16" viewBox="0 0 16 16"><g><path d="M3.41 2.476a.75.75 0 01-.013 1.06A6.235 6.235 0 001.5 8c0 1.67.68 3.276 1.897 4.463a.75.75 0 01-1.048 1.074A7.735 7.735 0 010 8c0-2.08.847-4.072 2.35-5.537a.75.75 0 011.06.013zM12.59 2.476a.75.75 0 011.06-.013A7.735 7.735 0 0116 8c0 2.08-.847 4.072-2.35 5.537a.75.75 0 01-1.047-1.074A6.234 6.234 0 0014.5 8c0-1.67-.68-3.276-1.897-4.463a.75.75 0 01-.013-1.06zM7 8a1 1 0 011-1h.01a1 1 0 010 2H8a1 1 0 01-1-1z"/><path d="M5.864 6.046a.75.75 0 10-1.028-1.092c-.42.395-.756.867-.987 1.39a4.1 4.1 0 000 3.307c.23.523.567.994.987 1.39a.75.75 0 001.028-1.093 2.774 2.774 0 01-.642-.902 2.6 2.6 0 010-2.098c.147-.334.365-.641.642-.902zM11.164 4.96a.75.75 0 10-1.028 1.092c.277.26.495.567.642.902a2.601 2.601 0 010 2.098 2.775 2.775 0 01-.642.902.75.75 0 101.028 1.092c.42-.395.756-.866.986-1.39a4.1 4.1 0 000-3.307 4.273 4.273 0 00-.986-1.39z"/></g></symbol><symbol id="flight-random-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M12 9.5a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM11 12a1 1 0 112 0 1 1 0 01-2 0zM5 7.5a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0zm2.5-1a1 1 0 100 2 1 1 0 000-2zM16.5 14a2.5 2.5 0 100 5 2.5 2.5 0 000-5zm-1 2.5a1 1 0 112 0 1 1 0 01-2 0z"/><path d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25h14.5c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25V4.75z"/></g></symbol><symbol id="flight-random-16" viewBox="0 0 16 16"><g><path d="M5 4a1 1 0 000 2h.01a1 1 0 000-2H5zM7 8a1 1 0 011-1h.01a1 1 0 010 2H8a1 1 0 01-1-1zM11.01 10a1 1 0 100 2h.01a1 1 0 100-2h-.01z"/><path fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zM2.5 3.25a.75.75 0 01.75-.75h9.5a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75v-9.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-redirect-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 5.786c0-1.046 1.209-1.63 2.028-.978l7.45 5.922c.627.498.63 1.45.005 1.952l-7.45 5.997c-.817.659-2.033.076-2.033-.974v-2.753a7.316 7.316 0 00-2.824.427c-1.306.456-2.918 1.342-5.295 2.98-.436.301-.973.288-1.37.03a1.168 1.168 0 01-.479-1.327c.59-1.999 1.91-4.124 3.743-5.754C7.444 9.823 9.571 8.72 12 8.529V5.786zm1.5.518V9.25a.75.75 0 01-.75.75c-2.296 0-4.35.98-5.978 2.428-1.36 1.21-2.393 2.723-2.994 4.188 2.03-1.356 3.565-2.186 4.903-2.653 1.53-.535 2.769-.584 4.137-.46a.75.75 0 01.682.747v2.933l6.8-5.474-6.8-5.405z" clip-rule="evenodd"/></symbol><symbol id="flight-redirect-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 3.517a1 1 0 011.62-.784l5.348 4.233a1 1 0 010 1.568l-5.347 4.233A1 1 0 018 11.983v-1.545c-.76-.043-1.484.003-2.254.218-.994.279-2.118.857-3.506 1.99a.993.993 0 01-1.129.096.962.962 0 01-.445-1.099c.415-1.5 1.425-3.141 2.808-4.412C4.69 6.114 6.244 5.241 8 5.042V3.517zm1.5 1.034v1.2a.75.75 0 01-.75.75c-1.586 0-3.066.738-4.261 1.835a8.996 8.996 0 00-1.635 2.014c.878-.552 1.695-.916 2.488-1.138 1.247-.35 2.377-.33 3.49-.207a.75.75 0 01.668.745v1.2l4.042-3.2L9.5 4.55z" clip-rule="evenodd"/></symbol><symbol id="flight-reload-24" viewBox="0 0 24 24"><path d="M11.24 1.3A.75.75 0 1112.26.2l3.5 3.25a.75.75 0 010 1.1l-3.5 3.25a.75.75 0 11-1.02-1.1l2.217-2.059a7.5 7.5 0 105.532 4.632.75.75 0 111.397-.546 9 9 0 11-7.237-5.654L11.24 1.3z"/></symbol><symbol id="flight-reload-16" viewBox="0 0 16 16"><path d="M7.248 1.307A.75.75 0 118.252.193l2.5 2.25a.75.75 0 010 1.114l-2.5 2.25a.75.75 0 01-1.004-1.114l1.29-1.161a4.5 4.5 0 103.655 2.832.75.75 0 111.398-.546A6 6 0 118.018 2l-.77-.693z"/></symbol><symbol id="flight-repeat-24" viewBox="0 0 24 24"><g><path d="M17.515.455a.75.75 0 00-1.03 1.09L19.614 4.5H6.75A4.75 4.75 0 002 9.25v2a.75.75 0 001.5 0v-2A3.25 3.25 0 016.75 6h12.864l-3.129 2.955a.75.75 0 001.03 1.09l4.5-4.25a.75.75 0 000-1.09l-4.5-4.25zM8.045 13.985a.75.75 0 01-.03 1.06L4.886 18H17.25a3.25 3.25 0 003.25-3.25v-2a.75.75 0 011.5 0v2a4.75 4.75 0 01-4.75 4.75H4.886l3.129 2.955a.75.75 0 01-1.03 1.09l-4.5-4.25a.75.75 0 010-1.09l4.5-4.25a.75.75 0 011.06.03z"/></g></symbol><symbol id="flight-repeat-16" viewBox="0 0 16 16"><g><path d="M11.238.68a.75.75 0 10-.976 1.14l1.96 1.68H4.418A3.417 3.417 0 001 6.917v.833a.75.75 0 001.5 0v-.833A1.917 1.917 0 014.417 5h7.806l-1.961 1.68a.75.75 0 00.976 1.14l3.5-3a.75.75 0 000-1.14l-3.5-3z"/><path d="M5.82 8.262a.75.75 0 01-.082 1.057L3.778 11h7.805A1.916 1.916 0 0013.5 9.083V8.25a.75.75 0 011.5 0v.833a3.417 3.417 0 01-3.417 3.417H3.777l1.961 1.68a.75.75 0 11-.976 1.14l-3.5-3a.75.75 0 010-1.14l3.5-3a.75.75 0 011.057.082z"/></g></symbol><symbol id="flight-replication-direct-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M1 3.75A2.75 2.75 0 013.75 1h10.5A2.75 2.75 0 0117 3.75v12.5a.75.75 0 01-.75.75H3.75A2.75 2.75 0 011 14.25V3.75zM3.75 2.5c-.69 0-1.25.56-1.25 1.25v10.5c0 .69.56 1.25 1.25 1.25H15.5V3.75c0-.69-.56-1.25-1.25-1.25H3.75z" clip-rule="evenodd"/><path d="M19.25 6a.75.75 0 01.75.75v11.5c0 .964-.778 1.75-1.747 1.75H6.75a.75.75 0 010-1.5h11.503c.135 0 .247-.11.247-.25V6.75a.75.75 0 01.75-.75z"/><path d="M23 9.75a.75.75 0 00-1.5 0v9.5a2.248 2.248 0 01-2.248 2.25H9.75a.75.75 0 000 1.5h9.502A3.748 3.748 0 0023 19.25v-9.5z"/></g></symbol><symbol id="flight-replication-direct-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M0 2.25A2.25 2.25 0 012.25 0h6.5A2.25 2.25 0 0111 2.25v8a.75.75 0 01-.75.75h-8A2.25 2.25 0 010 8.75v-6.5zm2.25-.75a.75.75 0 00-.75.75v6.5c0 .414.336.75.75.75H9.5V2.25a.75.75 0 00-.75-.75h-6.5z" clip-rule="evenodd"/><path d="M12.75 3.55a.7.7 0 01.7.7v8c0 .657-.53 1.2-1.197 1.2H4.25a.7.7 0 110-1.4h7.8v-7.8a.7.7 0 01.7-.7z"/><path d="M15.95 6.75a.7.7 0 00-1.4 0v6.5c0 .718-.581 1.3-1.299 1.3h-6.5a.7.7 0 10-.001 1.4h6.501a2.699 2.699 0 002.699-2.7v-6.5z"/></g></symbol><symbol id="flight-replication-perf-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h10.5A2.75 2.75 0 0118 4.75v2.19l.78.78A.75.75 0 0118 8.957v2.982l2.78 2.78a.75.75 0 11-1.06 1.061L18 14.06v1.19c0 .495-.13.959-.36 1.36.05.03.097.067.14.11l4 4a.75.75 0 11-1.06 1.06l-4-4a.751.751 0 01-.11-.14c-.401.23-.865.36-1.36.36h-1.19l.72.72a.75.75 0 11-1.06 1.06L11.94 18H9.06l2.72 2.72a.75.75 0 11-1.06 1.06L6.94 18H4.75A2.75 2.75 0 012 15.25V4.75zM4.75 3.5c-.69 0-1.25.56-1.25 1.25v10.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H4.75z" clip-rule="evenodd"/><path d="M16.78 20.72a.75.75 0 10-1.06 1.06l1 1a.75.75 0 101.06-1.06l-1-1zM22.68 16.62a.75.75 0 00-1.06 1.06l.1.1a.75.75 0 001.06-1.06l-.1-.1zM19.72 9.72a.75.75 0 011.06 0l1 1a.75.75 0 11-1.06 1.06l-1-1a.75.75 0 010-1.06z"/></g></symbol><symbol id="flight-replication-perf-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h6.5A2.25 2.25 0 0112 3.25v1.104a.71.71 0 01.078.067l.667.667A.7.7 0 0112 6.237v1.45a.71.71 0 01.078.068l1.75 1.75a.7.7 0 01-.99.99L12 9.656v.094c0 .417-.113.807-.31 1.141.142.022.279.088.388.197l2.667 2.667a.7.7 0 11-.99.99l-2.667-2.667a.697.697 0 01-.197-.389c-.334.198-.724.311-1.141.311h-.093l.338.338a.7.7 0 01-.99.99l-1.25-1.25A.71.71 0 017.687 12H6.323l1.755 1.755a.7.7 0 11-.99.99l-2.666-2.667A.71.71 0 014.354 12H3.25A2.25 2.25 0 011 9.75v-6.5zm2.25-.75a.75.75 0 00-.75.75v6.5c0 .414.336.75.75.75h6.5a.75.75 0 00.75-.75v-6.5a.75.75 0 00-.75-.75h-6.5z" clip-rule="evenodd"/><path d="M11.495 13.838a.7.7 0 00-.99.99l.583.584a.7.7 0 00.99-.99l-.583-.584zM15.345 11.021a.7.7 0 00-.99.99l.067.067a.7.7 0 00.99-.99l-.067-.067zM13.375 6.705a.7.7 0 01.99 0l.833.833a.7.7 0 01-.99.99l-.833-.833a.7.7 0 010-.99z"/></g></symbol><symbol id="flight-rewind-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M10.188 5.38C11.34 4.501 13 5.322 13 6.771v3.332l6.188-4.723C20.34 4.501 22 5.322 22 6.771V17.23c0 1.449-1.66 2.27-2.812 1.391L13 13.898v3.331c0 1.449-1.66 2.27-2.812 1.391l-6.851-5.229a1.75 1.75 0 010-2.782l6.851-5.229zM11.5 6.771a.25.25 0 00-.402-.198L4.247 11.8a.25.25 0 000 .398l6.851 5.229a.25.25 0 00.402-.199V6.771zm9 0a.25.25 0 00-.402-.198l-7.061 5.389v.077l7.061 5.389a.25.25 0 00.402-.199V6.771z" clip-rule="evenodd"/></symbol><symbol id="flight-rewind-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M7.074 3.364A1.25 1.25 0 019 4.416v1.806l4.039-2.795A1.25 1.25 0 0115 4.454v7.092a1.25 1.25 0 01-1.961 1.027L9 9.778v1.806a1.25 1.25 0 01-1.926 1.051L1.499 9.051a1.25 1.25 0 010-2.103l5.575-3.584zM2.637 8L7.5 11.126V4.874L2.637 8zm6.43 0l4.433 3.069V4.93L9.068 8z" clip-rule="evenodd"/></symbol><symbol id="flight-rocket-24" viewBox="0 0 24 24"><g><path d="M14.78 10.28a.75.75 0 10-1.06-1.06l-.5.5a.75.75 0 101.06 1.06l.5-.5z"/><path fill-rule="evenodd" d="M19.63 2.317a1.733 1.733 0 012.053 2.053c-.38 1.827-1.07 5.047-1.76 7.812-.182.723-.542 1.377-1.012 1.964l-.002.015-.457 3.198a1.75 1.75 0 01-.658 1.133l-3.516 2.736a1.75 1.75 0 01-2.456-.307l-1.783-2.293a1.932 1.932 0 01-1.129-.982c-.24-.486-.59-1.07-1.037-1.518-.448-.448-1.033-.799-1.52-1.038a1.932 1.932 0 01-.98-1.129l-2.294-1.783a1.75 1.75 0 01-.307-2.456l2.735-3.517a1.75 1.75 0 011.134-.658l3.197-.456.016-.002c.587-.47 1.24-.83 1.964-1.011 2.765-.691 5.986-1.381 7.812-1.761zM8.234 6.835l-1.38.197a.25.25 0 00-.163.094l-2.735 3.517a.25.25 0 00.044.35l1.6 1.245c.38-1.121.982-2.674 1.813-4.124.247-.43.52-.863.821-1.279zm7.652 9.752c.43-.247.863-.52 1.279-.821l-.197 1.38a.25.25 0 01-.095.162l-3.516 2.736a.25.25 0 01-.351-.044l-1.245-1.6c1.122-.38 2.675-.982 4.125-1.813zm4.329-12.523a.234.234 0 00-.28-.279c-1.821.38-5.018 1.064-7.753 1.748-1.32.33-2.498 1.636-3.467 3.327-.946 1.65-1.586 3.476-1.911 4.53a.22.22 0 00.02.17c.034.069.1.14.192.184.556.274 1.305.71 1.917 1.323.613.612 1.049 1.36 1.323 1.917a.425.425 0 00.185.192.22.22 0 00.169.02c1.054-.325 2.88-.965 4.53-1.91 1.691-.97 2.997-2.148 3.327-3.468.684-2.735 1.369-5.932 1.748-7.754z" clip-rule="evenodd"/><path d="M4.03 15.97a.75.75 0 010 1.06l-1 1a.75.75 0 01-1.06-1.06l1-1a.75.75 0 011.06 0zM6.53 17.47a.75.75 0 010 1.06l-3 3a.75.75 0 01-1.06-1.06l3-3a.75.75 0 011.06 0zM8.03 21.03a.75.75 0 10-1.06-1.06l-1 1a.75.75 0 101.06 1.06l1-1z"/></g></symbol><symbol id="flight-rocket-16" viewBox="0 0 16 16"><g><path d="M9.78 7.28a.75.75 0 00-1.06-1.06l-.5.5a.75.75 0 001.06 1.06l.5-.5z"/><path fill-rule="evenodd" d="M12.627 1.32a1.731 1.731 0 012.054 2.053c-.27 1.28-.686 3.19-1.103 4.859a3.625 3.625 0 01-.58 1.224c.002.015.002.03.002.044v2.441a1.75 1.75 0 01-.833 1.49l-2.021 1.244a1.75 1.75 0 01-2.284-.397l-1.27-1.587a2.028 2.028 0 01-1.08-.917 3.426 3.426 0 00-.542-.744 3.428 3.428 0 00-.744-.542c-.4-.223-.755-.61-.917-1.08l-1.587-1.27a1.75 1.75 0 01-.398-2.284l1.244-2.021A1.75 1.75 0 014.058 3H6.5l.044.001c.37-.263.777-.467 1.224-.579 1.669-.417 3.58-.833 4.859-1.103zm-5.43 9.956a.754.754 0 00-.167-.025.517.517 0 01-.209-.208 4.913 4.913 0 00-.79-1.073 4.913 4.913 0 00-1.074-.791.516.516 0 01-.208-.21.754.754 0 00-.025-.166l.002-.008c.255-.78.694-1.941 1.307-2.958.634-1.05 1.353-1.773 2.099-1.96 1.641-.41 3.53-.821 4.804-1.09a.231.231 0 01.277.277c-.269 1.274-.68 3.163-1.09 4.804-.187.746-.91 1.465-1.96 2.099-1.017.613-2.177 1.052-2.958 1.307a.173.173 0 01-.008.002zm1.139 1.193l.697.872a.25.25 0 00.327.057l2.021-1.244a.25.25 0 00.119-.213v-1.056c-.186.13-.375.252-.562.366-.88.53-1.832.936-2.602 1.218zM2.659 6.967l.872.697c.282-.77.687-1.722 1.218-2.602.113-.187.235-.376.366-.562H4.059a.25.25 0 00-.213.119L2.602 6.64a.25.25 0 00.057.327z" clip-rule="evenodd"/><path d="M4.442 11.558a.625.625 0 010 .884l-2 2a.625.625 0 11-.884-.884l2-2a.625.625 0 01.884 0zM2.692 10.308a.625.625 0 010 .884l-.75.75a.625.625 0 11-.884-.884l.75-.75a.625.625 0 01.884 0zM5.692 14.192a.625.625 0 10-.884-.884l-.75.75a.625.625 0 10.884.884l.75-.75z"/></g></symbol><symbol id="flight-rotate-cw-24" viewBox="0 0 24 24"><path d="M21 1.75a.75.75 0 00-1.5 0v3.636A9.977 9.977 0 0012 2C6.477 2 2 6.477 2 12s4.477 10 10 10 10-4.477 10-10a.75.75 0 00-1.5 0 8.5 8.5 0 11-2.019-5.5H14.75a.75.75 0 000 1.5h5.5a.75.75 0 00.75-.75v-5.5z"/></symbol><symbol id="flight-rotate-cw-16" viewBox="0 0 16 16"><path d="M14 .75a.75.75 0 00-1.5 0v1.888A7 7 0 1015 8a.75.75 0 00-1.5 0 5.5 5.5 0 11-1.725-4H9.25a.75.75 0 000 1.5h4a.75.75 0 00.75-.75v-4z"/></symbol><symbol id="flight-rotate-ccw-24" viewBox="0 0 24 24"><path d="M3 1.75a.75.75 0 011.5 0v3.636A9.977 9.977 0 0112 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12a.75.75 0 011.5 0 8.5 8.5 0 102.019-5.5H9.25a.75.75 0 010 1.5h-5.5A.75.75 0 013 7.25v-5.5z"/></symbol><symbol id="flight-rotate-ccw-16" viewBox="0 0 16 16"><path d="M2 .75a.75.75 0 011.5 0v1.888A7 7 0 111 8a.75.75 0 011.5 0 5.5 5.5 0 101.725-4H6.75a.75.75 0 010 1.5h-4A.75.75 0 012 4.75v-4z"/></symbol><symbol id="flight-rss-24" viewBox="0 0 24 24"><g><path d="M3.75 3a.75.75 0 000 1.5A15.75 15.75 0 0119.5 20.25a.75.75 0 001.5 0A17.25 17.25 0 003.75 3z"/><path d="M3.75 10a.75.75 0 000 1.5 8.75 8.75 0 018.75 8.75.75.75 0 001.5 0A10.25 10.25 0 003.75 10zM5 17a2 2 0 100 4 2 2 0 000-4z"/></g></symbol><symbol id="flight-rss-16" viewBox="0 0 16 16"><g><path d="M2.75 1a.75.75 0 000 1.5A10.75 10.75 0 0113.5 13.25a.75.75 0 001.5 0A12.25 12.25 0 002.75 1z"/><path d="M2.75 6a.75.75 0 000 1.5 5.75 5.75 0 015.75 5.75.75.75 0 001.5 0A7.25 7.25 0 002.75 6zM3.5 11a1.5 1.5 0 100 3 1.5 1.5 0 000-3z"/></g></symbol><symbol id="flight-save-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V9.078c0-.729-.29-1.428-.805-1.944l-4.329-4.329A2.75 2.75 0 0014.922 2H4.75zm0 1.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25H6v-6.75c0-.966.784-1.75 1.75-1.75h8.5c.966 0 1.75.784 1.75 1.75v6.75h1.25c.69 0 1.25-.56 1.25-1.25V9.078c0-.331-.132-.649-.366-.883l-4.329-4.329a1.25 1.25 0 00-.883-.366H7.5v3.75c0 .138.112.25.25.25h7.5a.75.75 0 010 1.5h-7.5A1.75 1.75 0 016 7.25V3.5H4.75zM7.5 13.75v6.75h9v-6.75a.25.25 0 00-.25-.25h-8.5a.25.25 0 00-.25.25z" clip-rule="evenodd"/></symbol><symbol id="flight-save-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h6.879a2.25 2.25 0 011.59.659l2.622 2.621c.422.422.659.995.659 1.591v6.879A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h.8V9.25a1.2 1.2 0 011.2-1.2h5.5a1.2 1.2 0 011.2 1.2v4.25h.8a.75.75 0 00.75-.75V5.871a.75.75 0 00-.22-.53L10.66 2.72a.75.75 0 00-.53-.22H5.45v2.05h3.8a.7.7 0 010 1.4h-4a1.2 1.2 0 01-1.2-1.2V2.5h-.8zm7.3 11h-5.1V9.45h5.1v4.05z" clip-rule="evenodd"/></symbol><symbol id="flight-scissors-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M5.5 2a3.5 3.5 0 101.99 6.38l3.346 3.12-3.346 3.12a3.5 3.5 0 101.023 1.097l3.93-3.664.009-.008 8.31-7.746A.75.75 0 0019.739 3.2l-7.803 7.274-3.424-3.192A3.5 3.5 0 005.5 2zm-2 3.5a2 2 0 114 0 2 2 0 01-4 0zm0 12a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/><path d="M20.763 18.703a.75.75 0 01-1.026 1.095l-5.5-5.15a.75.75 0 011.026-1.095l5.5 5.15z"/></g></symbol><symbol id="flight-scissors-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M1 4a3 3 0 115.585 1.524L8 6.94l4.803-4.803a.75.75 0 011.06 1.06L8.539 8.523a.678.678 0 01-.016.016l-1.937 1.938a3 3 0 11-1.06-1.06L6.938 8 5.524 6.585A3 3 0 011 4zm3-1.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zm0 8a1.5 1.5 0 100 3 1.5 1.5 0 000-3z" clip-rule="evenodd"/><path d="M9.116 9.123a.75.75 0 011.06 0l3.687 3.68a.75.75 0 11-1.06 1.061l-3.686-3.68a.75.75 0 01-.001-1.06z"/></g></symbol><symbol id="flight-search-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M10.5 2a8.5 8.5 0 105.457 15.017l4.763 4.763a.75.75 0 101.06-1.06l-4.763-4.763A8.5 8.5 0 0010.5 2zm-7 8.5a7 7 0 1114 0 7 7 0 01-14 0z" clip-rule="evenodd"/></symbol><symbol id="flight-search-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M7.25 2a5.25 5.25 0 103.144 9.455l2.326 2.325a.75.75 0 101.06-1.06l-2.325-2.326A5.25 5.25 0 007.25 2zM3.5 7.25a3.75 3.75 0 117.5 0 3.75 3.75 0 01-7.5 0z" clip-rule="evenodd"/></symbol><symbol id="flight-send-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M21.205 5.042c.516-1.4-.846-2.763-2.247-2.247L3.264 8.577c-1.318.486-1.555 2.25-.412 3.066l5.51 3.936a.252.252 0 01.059.058l3.936 5.51c.817 1.144 2.58.907 3.066-.411l5.782-15.694zm-1.729-.84a.25.25 0 01.321.322l-5.782 15.693a.25.25 0 01-.438.059l-3.663-5.13L15.53 9.53a.75.75 0 00-1.06-1.06l-5.617 5.616-5.129-3.663a.25.25 0 01.059-.438l15.693-5.782z" clip-rule="evenodd"/></symbol><symbol id="flight-send-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M15.08 2.526c.368-1.001-.605-1.974-1.606-1.605L1.878 5.193a1.25 1.25 0 00-.295 2.19l4.07 2.907a.25.25 0 01.057.058l2.907 4.069a1.25 1.25 0 002.19-.295l4.272-11.596zM2.84 6.437l10.645-3.922L9.563 13.16l-2.39-3.344 3.072-3.071a.7.7 0 10-.99-.99L6.184 8.826 2.84 6.437z" clip-rule="evenodd"/></symbol><symbol id="flight-server-24" viewBox="0 0 24 24"><g><path d="M5 5.75A.75.75 0 015.75 5h.5a.75.75 0 010 1.5h-.5A.75.75 0 015 5.75z"/><path fill-rule="evenodd" d="M3.75 1A2.75 2.75 0 001 3.75v4.5A2.75 2.75 0 003.75 11h16.5A2.75 2.75 0 0023 8.25v-4.5A2.75 2.75 0 0020.25 1H3.75zM2.5 3.75c0-.69.56-1.25 1.25-1.25h16.5c.69 0 1.25.56 1.25 1.25v4.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25v-4.5z" clip-rule="evenodd"/><path d="M5.75 17a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/><path fill-rule="evenodd" d="M3.75 13A2.75 2.75 0 001 15.75v4.5A2.75 2.75 0 003.75 23h16.5A2.75 2.75 0 0023 20.25v-4.5A2.75 2.75 0 0020.25 13H3.75zM2.5 15.75c0-.69.56-1.25 1.25-1.25h16.5c.69 0 1.25.56 1.25 1.25v4.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25v-4.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-server-16" viewBox="0 0 16 16"><g><path d="M3 3.25a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5A.75.75 0 013 3.25z"/><path fill-rule="evenodd" d="M2.25 0A2.25 2.25 0 000 2.25v2.5A2.25 2.25 0 002.25 7h11.5A2.25 2.25 0 0016 4.75v-2.5A2.25 2.25 0 0013.75 0H2.25zM1.5 2.25a.75.75 0 01.75-.75h11.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75v-2.5z" clip-rule="evenodd"/><path d="M3.75 11.5a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/><path fill-rule="evenodd" d="M2.25 9A2.25 2.25 0 000 11.25v2.5A2.25 2.25 0 002.25 16h11.5A2.25 2.25 0 0016 13.75v-2.5A2.25 2.25 0 0013.75 9H2.25zm-.75 2.25a.75.75 0 01.75-.75h11.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75v-2.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-serverless-24" viewBox="0 0 24 24"><g><path d="M5 17.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M1.78.72A.75.75 0 00.72 1.78l.629.63A2.74 2.74 0 001 3.75v4.5A2.75 2.75 0 003.75 11h6.19l2 2H3.75A2.75 2.75 0 001 15.75v4.5A2.75 2.75 0 003.75 23h16.5a2.74 2.74 0 001.34-.349l.63.63a.75.75 0 101.06-1.061L2.866 1.806 1.78.72zm.732 2.853a1.265 1.265 0 00-.012.177v4.5c0 .69.56 1.25 1.25 1.25h4.69L2.511 3.573zm17.915 17.915L13.439 14.5H3.75c-.69 0-1.25.56-1.25 1.25v4.5c0 .69.56 1.25 1.25 1.25h16.5c.06 0 .12-.004.177-.012z" clip-rule="evenodd"/><path d="M6 1a.75.75 0 000 1.5h14.25c.69 0 1.25.56 1.25 1.25v4.5c0 .69-.56 1.25-1.25 1.25H14.5a.75.75 0 000 1.5h5.75A2.75 2.75 0 0023 8.25v-4.5A2.75 2.75 0 0020.25 1H6zM18 13a.75.75 0 000 1.5h2.25c.69 0 1.25.56 1.25 1.25V18a.75.75 0 001.5 0v-2.25A2.75 2.75 0 0020.25 13H18z"/></g></symbol><symbol id="flight-serverless-16" viewBox="0 0 16 16"><g><path d="M3.75 11.5a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/><path fill-rule="evenodd" d="M1.28.22A.75.75 0 00.22 1.28c-.141.294-.22.623-.22.97v2.5A2.25 2.25 0 002.25 7h3.69l2 2H2.25A2.25 2.25 0 000 11.25v2.5A2.25 2.25 0 002.25 16h11.5c.347 0 .676-.079.97-.22a.75.75 0 001.06-1.06L1.28.22zm.97 10.28h7.19l4 4H2.25a.75.75 0 01-.75-.75v-2.5a.75.75 0 01.75-.75zm2.19-5L1.5 2.56v2.19c0 .414.336.75.75.75h2.19z" clip-rule="evenodd"/><path d="M13.75 0H5a.75.75 0 000 1.5h8.75a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75H10.5a.75.75 0 000 1.5h3.25A2.25 2.25 0 0016 4.75v-2.5A2.25 2.25 0 0013.75 0zM13 9.75a.75.75 0 01.75-.75A2.25 2.25 0 0116 11.25a.75.75 0 01-1.5 0 .75.75 0 00-.75-.75.75.75 0 01-.75-.75z"/></g></symbol><symbol id="flight-server-cluster-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 .5a2.5 2.5 0 00-.75 4.886v1.67a4.998 4.998 0 00-3.255 1.95l-1.731-.944a2.5 2.5 0 10-1.061 1.13l2.083 1.137A4.993 4.993 0 007 12c0 .615.111 1.206.316 1.752l-1.768 1.285a2.5 2.5 0 10.845 1.24l1.66-1.207a4.996 4.996 0 003.197 1.874v1.67a2.501 2.501 0 101.5 0v-1.67a4.996 4.996 0 003.197-1.874l1.66 1.207a2.5 2.5 0 10.845-1.24l-1.768-1.285A4.991 4.991 0 0017 12c0-.585-.1-1.148-.286-1.671l2.083-1.137a2.5 2.5 0 10-1.06-1.13l-1.732.945a4.998 4.998 0 00-3.255-1.951v-1.67A2.501 2.501 0 0012 .5zM11 3a1 1 0 112 0 1 1 0 01-2 0zM4 6a1 1 0 100 2 1 1 0 000-2zm0 10a1 1 0 100 2 1 1 0 000-2zm7 5a1 1 0 112 0 1 1 0 01-2 0zm9-5a1 1 0 100 2 1 1 0 000-2zm0-10a1 1 0 100 2 1 1 0 000-2zM8.91 10.353a3.5 3.5 0 016.18 0c.261.49.41 1.05.41 1.647s-.149 1.157-.41 1.647a3.5 3.5 0 01-6.18 0A3.482 3.482 0 018.5 12c0-.597.149-1.157.41-1.647z" clip-rule="evenodd"/></symbol><symbol id="flight-server-cluster-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 0a2.25 2.25 0 00-.75 4.372v.465a3.25 3.25 0 00-1.797 1.144l-.625-.366a2.25 2.25 0 10-1.038 1.13l1.026.602a3.261 3.261 0 000 1.306l-1.026.601a2.25 2.25 0 101.038 1.13l.625-.366a3.25 3.25 0 001.797 1.145v.465a2.25 2.25 0 101.5 0v-.465a3.25 3.25 0 001.797-1.145l.625.366a2.25 2.25 0 101.038-1.13l-1.026-.6a3.26 3.26 0 000-1.307l1.026-.601a2.25 2.25 0 10-1.038-1.13l-.625.365A3.251 3.251 0 008.75 4.837v-.465A2.25 2.25 0 008 0zm-.75 2.25a.75.75 0 111.5 0 .75.75 0 01-1.5 0zM2.75 4a.75.75 0 100 1.5.75.75 0 000-1.5zm0 6.5a.75.75 0 100 1.5.75.75 0 000-1.5zm4.5 3.25a.75.75 0 111.5 0 .75.75 0 01-1.5 0zm6-3.25a.75.75 0 100 1.5.75.75 0 000-1.5zm0-6.5a.75.75 0 100 1.5.75.75 0 000-1.5zM6.395 7.3a1.75 1.75 0 113.21 1.4 1.75 1.75 0 01-3.21-1.4z" clip-rule="evenodd"/></symbol><symbol id="flight-settings-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M12 8a4 4 0 100 8 4 4 0 000-8zm-2.5 4a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z"/><path d="M11.5 1a2.25 2.25 0 00-2.25 2.25v.178c-.474.152-.93.342-1.366.567l-.127-.127a2.25 2.25 0 00-3.182 0l-.707.707a2.25 2.25 0 000 3.182l.127.127a8.95 8.95 0 00-.567 1.366H3.25A2.25 2.25 0 001 11.5v1a2.25 2.25 0 002.25 2.25h.178c.152.474.342.93.567 1.366l-.127.127a2.25 2.25 0 000 3.182l.707.707a2.25 2.25 0 003.182 0l.127-.127c.435.225.892.415 1.366.567v.178A2.25 2.25 0 0011.5 23h1a2.25 2.25 0 002.25-2.25v-.178c.474-.152.93-.342 1.366-.567l.127.127a2.25 2.25 0 003.182 0l.707-.707a2.25 2.25 0 000-3.182l-.127-.127a8.94 8.94 0 00.567-1.366h.178A2.25 2.25 0 0023 12.5v-1a2.25 2.25 0 00-2.25-2.25h-.178a8.952 8.952 0 00-.567-1.366l.127-.127a2.25 2.25 0 000-3.182l-.707-.707a2.25 2.25 0 00-3.182 0l-.127.127a8.95 8.95 0 00-1.366-.567V3.25A2.25 2.25 0 0012.5 1h-1zm-.75 2.25a.75.75 0 01.75-.75h1a.75.75 0 01.75.75v.744a.75.75 0 00.569.728 7.45 7.45 0 012.04.846.75.75 0 00.918-.112l.526-.527a.75.75 0 011.06 0l.708.707a.75.75 0 010 1.06l-.527.527a.75.75 0 00-.112.917c.377.627.665 1.313.846 2.041a.75.75 0 00.728.569h.744a.75.75 0 01.75.75v1a.75.75 0 01-.75.75h-.744a.75.75 0 00-.728.569 7.449 7.449 0 01-.846 2.04.75.75 0 00.112.918l.527.526a.75.75 0 010 1.06l-.707.708a.75.75 0 01-1.06 0l-.527-.527a.75.75 0 00-.917-.112 7.446 7.446 0 01-2.041.846.75.75 0 00-.569.728v.744a.75.75 0 01-.75.75h-1a.75.75 0 01-.75-.75v-.744a.75.75 0 00-.569-.728 7.447 7.447 0 01-2.04-.846.75.75 0 00-.918.112l-.526.527a.75.75 0 01-1.061 0l-.707-.707a.75.75 0 010-1.06l.527-.527a.75.75 0 00.112-.917 7.45 7.45 0 01-.846-2.041.75.75 0 00-.728-.569H3.25a.75.75 0 01-.75-.75v-1a.75.75 0 01.75-.75h.744a.75.75 0 00.728-.569c.181-.728.469-1.414.846-2.04a.75.75 0 00-.112-.918l-.527-.526a.75.75 0 010-1.061l.707-.707a.75.75 0 011.06 0l.527.527a.75.75 0 00.917.112 7.451 7.451 0 012.041-.846.75.75 0 00.569-.728V3.25z"/></g></symbol><symbol id="flight-settings-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8 5a3 3 0 100 6 3 3 0 000-6zM6.5 8a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z"/><path d="M7.5 0a1.75 1.75 0 00-1.75 1.75v.15c-.16.06-.318.125-.472.196l-.106-.106a1.75 1.75 0 00-2.475 0l-.707.707a1.75 1.75 0 000 2.475l.106.106a6.46 6.46 0 00-.196.472h-.15A1.75 1.75 0 000 7.5v1c0 .966.784 1.75 1.75 1.75h.15c.06.16.125.318.196.472l-.106.107a1.75 1.75 0 000 2.474l.707.708a1.75 1.75 0 002.475 0l.106-.107c.154.071.312.137.472.196v.15c0 .966.784 1.75 1.75 1.75h1a1.75 1.75 0 001.75-1.75v-.15c.16-.06.318-.125.472-.196l.106.107a1.75 1.75 0 002.475 0l.707-.707a1.75 1.75 0 000-2.475l-.106-.107c.071-.154.137-.311.196-.472h.15A1.75 1.75 0 0016 8.5v-1a1.75 1.75 0 00-1.75-1.75h-.15a6.455 6.455 0 00-.196-.472l.106-.106a1.75 1.75 0 000-2.475l-.707-.707a1.75 1.75 0 00-2.475 0l-.106.106a6.46 6.46 0 00-.472-.196v-.15A1.75 1.75 0 008.5 0h-1zm-.25 1.75a.25.25 0 01.25-.25h1a.25.25 0 01.25.25v.698c0 .339.227.636.555.724.42.113.817.28 1.186.492a.75.75 0 00.905-.12l.493-.494a.25.25 0 01.354 0l.707.708a.25.25 0 010 .353l-.494.494a.75.75 0 00-.12.904c.213.369.38.767.492 1.186a.75.75 0 00.724.555h.698a.25.25 0 01.25.25v1a.25.25 0 01-.25.25h-.698a.75.75 0 00-.724.555c-.113.42-.28.817-.492 1.186a.75.75 0 00.12.905l.494.493a.25.25 0 010 .354l-.707.707a.25.25 0 01-.354 0l-.494-.494a.75.75 0 00-.904-.12 4.966 4.966 0 01-1.186.492.75.75 0 00-.555.724v.698a.25.25 0 01-.25.25h-1a.25.25 0 01-.25-.25v-.698a.75.75 0 00-.555-.724 4.966 4.966 0 01-1.186-.491.75.75 0 00-.904.12l-.494.493a.25.25 0 01-.354 0l-.707-.707a.25.25 0 010-.354l.494-.493a.75.75 0 00.12-.905 4.966 4.966 0 01-.492-1.186.75.75 0 00-.724-.555H1.75a.25.25 0 01-.25-.25v-1a.25.25 0 01.25-.25h.698a.75.75 0 00.724-.555c.113-.42.28-.817.491-1.186a.75.75 0 00-.12-.904L3.05 4.11a.25.25 0 010-.353l.707-.708a.25.25 0 01.354 0l.493.494c.24.24.611.289.905.12a4.965 4.965 0 011.186-.492.75.75 0 00.555-.724V1.75z"/></g></symbol><symbol id="flight-service-24" viewBox="0 0 24 24"><g><path d="M10.559 1.006a2.75 2.75 0 012.882 0l7.75 4.77A2.75 2.75 0 0122.5 8.116V9.5a.75.75 0 01-1.5 0V8.117a1.25 1.25 0 00-.595-1.064l-7.75-4.77a1.25 1.25 0 00-1.31 0l-7.75 4.77A1.25 1.25 0 003 8.117v7.765c0 .434.225.837.595 1.065l5.548 3.414a.75.75 0 01-.786 1.277l-5.548-3.414A2.75 2.75 0 011.5 15.882V8.117a2.75 2.75 0 011.309-2.342l7.75-4.769z"/><path fill-rule="evenodd" d="M17.5 11.15v-.372a1.25 1.25 0 00-2.5 0v.372a5.22 5.22 0 00-1.49.62l-.265-.265a1.25 1.25 0 10-1.768 1.768l.272.273a5.23 5.23 0 00-.606 1.482h-.393a1.25 1.25 0 000 2.5H11.157c.13.523.34 1.015.614 1.462a.807.807 0 00-.016.016l-.278.278a1.25 1.25 0 001.768 1.767l.278-.277.022-.024c.446.269.936.473 1.456.6l-.001.035v.393a1.25 1.25 0 102.5 0v-.392-.036a5.221 5.221 0 001.455-.6l.022.023.278.278a1.25 1.25 0 101.768-1.767l-.278-.278-.016-.016c.274-.447.483-.94.614-1.462H21.75a1.25 1.25 0 100-2.5h-.393a5.227 5.227 0 00-.606-1.482l.272-.273a1.25 1.25 0 00-1.768-1.768l-.265.266a5.22 5.22 0 00-1.49-.621zM16.25 13A3.246 3.246 0 0013 16.25a3.246 3.246 0 003.25 3.25 3.246 3.246 0 003.25-3.25A3.246 3.246 0 0016.25 13z" clip-rule="evenodd"/></g></symbol><symbol id="flight-service-16" viewBox="0 0 16 16"><g><path d="M6.834.33a2.25 2.25 0 012.332 0l5.25 3.182A2.25 2.25 0 0115.5 5.436V6A.75.75 0 0114 6v-.564a.75.75 0 00-.361-.642l-5.25-3.181a.75.75 0 00-.778 0l-5.25 3.181A.75.75 0 002 5.436v5.128a.75.75 0 00.361.642l4.028 2.44a.75.75 0 11-.778 1.283l-4.027-2.44A2.25 2.25 0 01.5 10.563V5.436a2.25 2.25 0 011.084-1.924L6.834.33z"/><path fill-rule="evenodd" d="M11.749 7.325l.001-.042v-.286a.75.75 0 00-1.5 0v.286l.001.042a3.73 3.73 0 00-1.318.546.76.76 0 00-.03-.03l-.201-.203a.75.75 0 00-1.06 1.06l.201.203.03.028c-.26.394-.45.84-.547 1.319a.878.878 0 00-.04-.001H7a.75.75 0 000 1.5h.286l.038-.001c.097.48.286.926.547 1.32a.71.71 0 00-.028.027l-.202.202a.75.75 0 001.06 1.06l.203-.202a.695.695 0 00.025-.026c.395.261.842.45 1.322.548l-.001.036v.286a.75.75 0 001.5 0v-.286-.036c.48-.097.926-.287 1.32-.548l.026.026.202.203a.75.75 0 001.06-1.061l-.201-.202a.667.667 0 00-.028-.026c.261-.395.45-.842.547-1.321H15a.75.75 0 000-1.5h-.286l-.04.002a3.734 3.734 0 00-.547-1.319l.03-.028.202-.202a.75.75 0 00-1.06-1.061l-.203.202-.029.03a3.73 3.73 0 00-1.318-.545zM11 8.75A2.247 2.247 0 008.75 11 2.247 2.247 0 0011 13.25 2.247 2.247 0 0013.25 11 2.247 2.247 0 0011 8.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-share-24" viewBox="0 0 24 24"><g><path d="M8.295 6.765a.75.75 0 11-1.09-1.03l4.25-4.5a.75.75 0 011.09 0l4.25 4.5a.75.75 0 01-1.09 1.03L12.75 3.636V14.25a.75.75 0 01-1.5 0V3.636L8.295 6.765z"/><path d="M5.75 10.5c-.69 0-1.25.56-1.25 1.25v8.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25v-8.5c0-.69-.56-1.25-1.25-1.25H15.5a.75.75 0 010-1.5h2.75A2.75 2.75 0 0121 11.75v8.5A2.75 2.75 0 0118.25 23H5.75A2.75 2.75 0 013 20.25v-8.5A2.75 2.75 0 015.75 9H8.5a.75.75 0 010 1.5H5.75z"/></g></symbol><symbol id="flight-share-16" viewBox="0 0 16 16"><g><path d="M5.3 5.76a.75.75 0 01-1.1-1.02l3.25-3.5a.75.75 0 011.1 0l3.25 3.5a.75.75 0 11-1.1 1.02l-1.95-2.1v6.59a.75.75 0 01-1.5 0V3.66L5.3 5.76z"/><path d="M2 9.25A2.25 2.25 0 014.25 7H5a.75.75 0 010 1.5h-.75a.75.75 0 00-.75.75v3.5c0 .414.336.75.75.75h7.5a.75.75 0 00.75-.75v-3.5a.75.75 0 00-.75-.75H11A.75.75 0 0111 7h.75A2.25 2.25 0 0114 9.25v3.5A2.25 2.25 0 0111.75 15h-7.5A2.25 2.25 0 012 12.75v-3.5z"/></g></symbol><symbol id="flight-shield-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M11.04 1.307a2.75 2.75 0 011.92 0l6.25 2.33A2.75 2.75 0 0121 6.214V12c0 2.732-1.462 5.038-3.104 6.774-1.65 1.744-3.562 3-4.65 3.642a2.437 2.437 0 01-2.493 0c-1.087-.643-3-1.898-4.65-3.642C4.463 17.038 3 14.732 3 12V6.214a2.75 2.75 0 011.79-2.577l6.25-2.33zm1.397 1.406a1.25 1.25 0 00-.874 0l-6.25 2.33a1.25 1.25 0 00-.813 1.17V12c0 2.182 1.172 4.136 2.693 5.744 1.514 1.6 3.294 2.772 4.323 3.38.304.18.664.18.968 0 1.03-.608 2.809-1.78 4.323-3.38C18.327 16.136 19.5 14.182 19.5 12V6.214a1.25 1.25 0 00-.813-1.171l-6.25-2.33z" clip-rule="evenodd"/></symbol><symbol id="flight-shield-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M7.26.213a2.25 2.25 0 011.48 0l4.75 1.653A2.25 2.25 0 0115 3.991v4.01c0 2.048-1.181 3.747-2.45 4.991-1.282 1.255-2.757 2.15-3.573 2.598a2.024 2.024 0 01-1.954 0c-.816-.447-2.291-1.342-3.572-2.598C2.18 11.748 1 10.05 1 8V3.991c0-.957.606-1.81 1.51-2.125L7.26.213zm.986 1.417a.75.75 0 00-.493 0l-4.75 1.653a.75.75 0 00-.503.708v4.01c0 1.455.847 2.79 2 3.92 1.142 1.118 2.483 1.937 3.244 2.353.163.09.35.09.512 0 .761-.416 2.102-1.235 3.244-2.353 1.153-1.13 2-2.465 2-3.92V3.99a.75.75 0 00-.504-.708L8.246 1.63z" clip-rule="evenodd"/></symbol><symbol id="flight-shield-alert-24" viewBox="0 0 24 24"><g><path d="M12 7a.75.75 0 01.75.75v4.5a.75.75 0 01-1.5 0v-4.5A.75.75 0 0112 7zM12 15a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M11.04 1.307a2.75 2.75 0 011.92 0l6.25 2.33A2.75 2.75 0 0121 6.214V12c0 2.732-1.462 5.038-3.104 6.774-1.65 1.744-3.562 3-4.65 3.642a2.437 2.437 0 01-2.493 0c-1.087-.643-3-1.898-4.65-3.642C4.463 17.038 3 14.732 3 12V6.214a2.75 2.75 0 011.79-2.577l6.25-2.33zm1.397 1.406a1.25 1.25 0 00-.874 0l-6.25 2.33a1.25 1.25 0 00-.813 1.17V12c0 2.182 1.172 4.136 2.693 5.744 1.514 1.6 3.294 2.772 4.323 3.38.304.18.664.18.968 0 1.03-.608 2.809-1.78 4.323-3.38C18.327 16.136 19.5 14.182 19.5 12V6.214a1.25 1.25 0 00-.813-1.171l-6.25-2.33z" clip-rule="evenodd"/></g></symbol><symbol id="flight-shield-alert-16" viewBox="0 0 16 16"><g><path d="M7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zM8.75 4.75a.75.75 0 00-1.5 0v3.5a.75.75 0 001.5 0v-3.5z"/><path fill-rule="evenodd" d="M7.26.213a2.25 2.25 0 011.48 0l4.75 1.653A2.25 2.25 0 0115 3.991v4.01c0 2.048-1.181 3.747-2.45 4.991-1.282 1.255-2.757 2.15-3.573 2.598a2.024 2.024 0 01-1.954 0c-.816-.447-2.291-1.342-3.572-2.598C2.18 11.748 1 10.05 1 8V3.991c0-.957.606-1.81 1.51-2.125L7.26.213zm.986 1.417a.75.75 0 00-.493 0l-4.75 1.653a.75.75 0 00-.503.708v4.01c0 1.455.847 2.79 2 3.92 1.142 1.118 2.483 1.937 3.244 2.353.163.09.35.09.512 0 .761-.416 2.102-1.235 3.244-2.353 1.153-1.13 2-2.465 2-3.92V3.99a.75.75 0 00-.504-.708L8.246 1.63z" clip-rule="evenodd"/></g></symbol><symbol id="flight-shield-check-24" viewBox="0 0 24 24"><g><path d="M16.78 8.22a.75.75 0 010 1.06l-5.499 5.5a.75.75 0 01-1.061 0l-2.5-2.5a.75.75 0 111.06-1.06l1.97 1.97 4.97-4.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M11.04 1.307a2.75 2.75 0 011.92 0l6.25 2.33A2.75 2.75 0 0121 6.214V12c0 2.732-1.462 5.038-3.104 6.774-1.65 1.744-3.562 3-4.65 3.642a2.437 2.437 0 01-2.493 0c-1.087-.643-3-1.898-4.65-3.642C4.463 17.038 3 14.732 3 12V6.214a2.75 2.75 0 011.79-2.577l6.25-2.33zm1.397 1.406a1.25 1.25 0 00-.874 0l-6.25 2.33a1.25 1.25 0 00-.813 1.17V12c0 2.182 1.172 4.136 2.693 5.744 1.514 1.6 3.294 2.772 4.323 3.38.304.18.664.18.968 0 1.03-.608 2.809-1.78 4.323-3.38C18.327 16.136 19.5 14.182 19.5 12V6.214a1.25 1.25 0 00-.813-1.171l-6.25-2.33z" clip-rule="evenodd"/></g></symbol><symbol id="flight-shield-check-16" viewBox="0 0 16 16"><g><path d="M11.28 5.47a.75.75 0 010 1.06l-4 4a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.47-3.47a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M7.26.213a2.25 2.25 0 011.48 0l4.75 1.653A2.25 2.25 0 0115 3.991v4.01c0 2.048-1.181 3.747-2.45 4.991-1.282 1.255-2.757 2.15-3.573 2.598a2.024 2.024 0 01-1.954 0c-.816-.447-2.291-1.342-3.572-2.598C2.18 11.748 1 10.05 1 8V3.991c0-.957.606-1.81 1.51-2.125L7.26.213zm.986 1.417a.75.75 0 00-.493 0l-4.75 1.653a.75.75 0 00-.503.708v4.01c0 1.455.847 2.79 2 3.92 1.142 1.118 2.483 1.937 3.244 2.353.163.09.35.09.512 0 .761-.416 2.102-1.235 3.244-2.353 1.153-1.13 2-2.465 2-3.92V3.99a.75.75 0 00-.504-.708L8.246 1.63z" clip-rule="evenodd"/></g></symbol><symbol id="flight-shield-off-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M2.28 1.22a.75.75 0 00-1.06 1.06l2.185 2.185A1.937 1.937 0 003 5.651V12c0 2.732 1.462 5.038 3.104 6.774 1.65 1.744 3.562 3 4.65 3.642a2.442 2.442 0 002.496-.002c1.066-.63 2.928-1.85 4.557-3.546l3.913 3.912a.75.75 0 101.06-1.06L2.28 1.22zm14.466 16.587L4.508 5.568a.44.44 0 00-.008.083V12c0 2.182 1.172 4.136 2.693 5.744 1.514 1.6 3.294 2.772 4.323 3.38a.942.942 0 00.97-.002c1.02-.602 2.763-1.75 4.26-3.315z" clip-rule="evenodd"/><path d="M12.96 1.307a2.75 2.75 0 00-1.92 0l-2.302.858a.75.75 0 10.524 1.406l2.301-.858a1.25 1.25 0 01.874 0l6.25 2.33c.489.182.813.649.813 1.17V12c0 .574-.08 1.13-.227 1.668a.75.75 0 101.448.394c.178-.657.279-1.346.279-2.062V6.214a2.75 2.75 0 00-1.79-2.577l-6.25-2.33z"/></g></symbol><symbol id="flight-shield-off-16" viewBox="0 0 16 16"><g><path d="M8.74.213a2.25 2.25 0 00-1.48 0L6.035.64a.75.75 0 00.493 1.417l1.226-.427a.75.75 0 01.493 0l4.75 1.653a.75.75 0 01.504.708v4.01c0 .334-.044.661-.127.98a.75.75 0 101.453.374C14.938 8.922 15 8.47 15 8V3.991a2.25 2.25 0 00-1.51-2.125L8.74.213z"/><path fill-rule="evenodd" d="M1.447 2.507L.72 1.78A.75.75 0 011.78.72l13.5 13.5a.75.75 0 11-1.06 1.06l-1.988-1.987c-1.2 1.098-2.505 1.886-3.254 2.296a2.026 2.026 0 01-1.955 0c-.816-.446-2.291-1.341-3.572-2.597C2.18 11.748 1 10.05 1 8V3.72c0-.456.165-.882.447-1.213zm1.078 1.079a.366.366 0 00-.025.133V8c0 1.456.847 2.79 2 3.92 1.142 1.12 2.483 1.938 3.244 2.354.162.09.35.09.513 0 .69-.378 1.854-1.084 2.913-2.043L2.525 3.586z" clip-rule="evenodd"/></g></symbol><symbol id="flight-shield-x-24" viewBox="0 0 24 24"><g><path d="M15.78 7.22a.75.75 0 010 1.06L13.06 11l2.72 2.72a.75.75 0 11-1.06 1.06L12 12.06l-2.72 2.72a.75.75 0 01-1.06-1.06L10.94 11 8.22 8.28a.75.75 0 011.06-1.06L12 9.94l2.72-2.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M11.04 1.307a2.75 2.75 0 011.92 0l6.25 2.33A2.75 2.75 0 0121 6.214V12c0 2.732-1.462 5.038-3.104 6.774-1.65 1.744-3.562 3-4.65 3.642a2.437 2.437 0 01-2.493 0c-1.087-.643-3-1.898-4.65-3.642C4.463 17.038 3 14.732 3 12V6.214a2.75 2.75 0 011.79-2.577l6.25-2.33zm1.397 1.406a1.25 1.25 0 00-.874 0l-6.25 2.33a1.25 1.25 0 00-.813 1.17V12c0 2.182 1.172 4.136 2.693 5.744 1.514 1.6 3.294 2.772 4.323 3.38.304.18.664.18.968 0 1.03-.608 2.809-1.78 4.323-3.38C18.327 16.136 19.5 14.182 19.5 12V6.214a1.25 1.25 0 00-.813-1.171l-6.25-2.33z" clip-rule="evenodd"/></g></symbol><symbol id="flight-shield-x-16" viewBox="0 0 16 16"><g><path d="M10.78 4.72a.75.75 0 010 1.06L9.06 7.5l1.72 1.72a.75.75 0 11-1.06 1.06L8 8.56l-1.72 1.72a.75.75 0 11-1.06-1.06L6.94 7.5 5.22 5.78a.75.75 0 011.06-1.06L8 6.44l1.72-1.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M7.26.213a2.25 2.25 0 011.48 0l4.75 1.653A2.25 2.25 0 0115 3.991v4.01c0 2.048-1.181 3.747-2.45 4.991-1.282 1.255-2.757 2.15-3.573 2.598a2.024 2.024 0 01-1.954 0c-.816-.447-2.291-1.342-3.572-2.598C2.18 11.748 1 10.05 1 8V3.991c0-.957.606-1.81 1.51-2.125L7.26.213zm.986 1.417a.75.75 0 00-.493 0l-4.75 1.653a.75.75 0 00-.503.708v4.01c0 1.455.847 2.79 2 3.92 1.142 1.118 2.483 1.937 3.244 2.353.163.09.35.09.512 0 .761-.416 2.102-1.235 3.244-2.353 1.153-1.13 2-2.465 2-3.92V3.99a.75.75 0 00-.504-.708L8.246 1.63z" clip-rule="evenodd"/></g></symbol><symbol id="flight-shopping-bag-24" viewBox="0 0 24 24"><g><path d="M9 10.5a.75.75 0 00-1.5 0 4.5 4.5 0 109 0 .75.75 0 00-1.5 0 3 3 0 01-6 0z"/><path fill-rule="evenodd" d="M5.612 1.865A2.75 2.75 0 017.614 1h8.772a2.75 2.75 0 012.002.865l2.865 3.043c.48.51.747 1.185.747 1.885V20.25A2.75 2.75 0 0119.25 23H4.75A2.75 2.75 0 012 20.25V6.793c0-.7.267-1.374.747-1.885l2.865-3.043zm2.002.635a1.25 1.25 0 00-.91.393L4.25 5.5h15.498l-2.453-2.607a1.25 1.25 0 00-.91-.393H7.614zM3.5 20.25V7h17v13.25c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25z" clip-rule="evenodd"/></g></symbol><symbol id="flight-shopping-bag-16" viewBox="0 0 16 16"><g><path d="M6.5 7.25a.75.75 0 00-1.5 0c0 .76.34 1.468.91 1.975A3.15 3.15 0 008 10a3.15 3.15 0 002.09-.775c.57-.507.91-1.215.91-1.975a.75.75 0 00-1.5 0c0 .301-.134.61-.407.854A1.651 1.651 0 018 8.5c-.424 0-.816-.15-1.093-.396A1.145 1.145 0 016.5 7.25z"/><path fill-rule="evenodd" d="M3.448.746A2.25 2.25 0 015.121 0h5.758a2.25 2.25 0 011.673.746l1.871 2.081c.371.413.577.949.577 1.504v9.419A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V4.331c0-.555.205-1.091.577-1.504L3.448.746zm1.673.754a.75.75 0 00-.558.249L2.99 3.5H13.01l-1.574-1.751a.75.75 0 00-.558-.249H5.12zM2.5 13.75V5h11v8.75a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-shopping-cart-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M1.25 1.5a.75.75 0 000 1.5h2.089a1.25 1.25 0 011.229 1.02l1.444 7.74.706 3.971A2.75 2.75 0 009.426 18h10.142a2.75 2.75 0 002.71-2.279l1.303-7.5A2.75 2.75 0 0020.872 5H6.276l-.234-1.255A2.75 2.75 0 003.34 1.5H1.25zm6.238 9.994L6.556 6.5h14.316c.776 0 1.365.7 1.232 1.464l-1.305 7.5a1.25 1.25 0 01-1.231 1.036H9.426a1.25 1.25 0 01-1.23-1.031l-.708-3.975z" clip-rule="evenodd"/><path d="M11.5 20.75a1.75 1.75 0 01-1.75 1.75h-.01a1.75 1.75 0 110-3.5h.01c.966 0 1.75.784 1.75 1.75zM21.5 20.75a1.75 1.75 0 01-1.75 1.75h-.01a1.75 1.75 0 110-3.5h.01c.966 0 1.75.784 1.75 1.75z"/></g></symbol><symbol id="flight-shopping-cart-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M1.25 1.5a.75.75 0 000 1.5h1.154a.75.75 0 01.736.604l.874 4.413.405 2.15A2.25 2.25 0 006.63 12h6.095a2.25 2.25 0 002.214-1.848l.727-4A2.25 2.25 0 0013.453 3.5H4.648l-.037-.187A2.25 2.25 0 002.404 1.5H1.25zm4.237 6.236L4.945 5h8.508a.75.75 0 01.738.884l-.728 4a.75.75 0 01-.738.616H6.63a.75.75 0 01-.737-.611l-.406-2.153z" clip-rule="evenodd"/><path d="M7.5 13.75c0 .69-.56 1.25-1.25 1.25h-.01a1.25 1.25 0 110-2.5h.01c.69 0 1.25.56 1.25 1.25zM14 13.75c0 .69-.56 1.25-1.25 1.25h-.01a1.25 1.25 0 110-2.5h.01c.69 0 1.25.56 1.25 1.25z"/></g></symbol><symbol id="flight-shuffle-24" viewBox="0 0 24 24"><g><path d="M21.943 2.463A.748.748 0 0021.25 2h-5.5a.75.75 0 000 1.5h3.69L2.22 20.72a.75.75 0 101.06 1.06L20.5 4.56v3.69a.75.75 0 001.5 0v-5.5a.747.747 0 00-.057-.287zM20.5 19.44v-3.69a.75.75 0 011.5 0v5.5a.747.747 0 01-.75.75h-5.5a.75.75 0 010-1.5h3.69l-4.97-4.97a.75.75 0 111.06-1.06l4.97 4.97zM9.53 9.53a.75.75 0 000-1.06L3.28 2.22a.75.75 0 00-1.06 1.06l6.25 6.25a.75.75 0 001.06 0z"/></g></symbol><symbol id="flight-shuffle-16" viewBox="0 0 16 16"><g><path d="M14.943 1.463a.748.748 0 00-.161-.242l-.002-.001-.001-.002A.748.748 0 0014.25 1h-4a.75.75 0 000 1.5h2.19L1.22 13.72a.75.75 0 101.06 1.06L13.5 3.56v2.19a.75.75 0 001.5 0v-4a.747.747 0 00-.057-.287zM9.5 14.25c0 .414.336.75.75.75h4a.747.747 0 00.75-.75v-4a.75.75 0 00-1.5 0v2.19l-2.47-2.47a.75.75 0 10-1.06 1.06l2.47 2.47h-2.19a.75.75 0 00-.75.75zM6.03 4.97a.75.75 0 01-1.06 1.06L1.22 2.28a.75.75 0 011.06-1.06l3.75 3.75z"/></g></symbol><symbol id="flight-sidebar-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25H8v17H4.75c-.69 0-1.25-.56-1.25-1.25V4.75zm6 15.75h9.75c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H9.5v17z" clip-rule="evenodd"/></symbol><symbol id="flight-sidebar-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zM2.5 3.25a.75.75 0 01.75-.75h1.8v11h-1.8a.75.75 0 01-.75-.75v-9.5zM6.45 13.5h6.3a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75h-6.3v11z" clip-rule="evenodd"/></symbol><symbol id="flight-sidebar-hide-24" viewBox="0 0 24 24"><g><path d="M16.765 8.295a.75.75 0 00-1.03-1.09l-4.5 4.25a.75.75 0 000 1.09l4.5 4.25a.75.75 0 001.03-1.09L12.842 12l3.923-3.705z"/><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h14.5A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V4.75zM4.75 3.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25H7v-17H4.75zm14.5 17H8.5v-17h10.75c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25z" clip-rule="evenodd"/></g></symbol><symbol id="flight-sidebar-hide-16" viewBox="0 0 16 16"><g><path d="M11.726 5.263a.7.7 0 10-.952-1.026l-3.5 3.25a.7.7 0 000 1.026l3.5 3.25a.7.7 0 00.952-1.026L8.78 8l2.947-2.737z"/><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h9.5A2.25 2.25 0 0115 3.25v9.5A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h1.3v-11h-1.3zm9.5 11h-6.8v-11h6.8a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-sidebar-show-24" viewBox="0 0 24 24"><g><path d="M11.735 8.295a.75.75 0 011.03-1.09l4.5 4.25a.75.75 0 010 1.09l-4.5 4.25a.75.75 0 01-1.03-1.09L15.658 12l-3.923-3.705z"/><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h14.5A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V4.75zM4.75 3.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25H7v-17H4.75zm14.5 17H8.5v-17h10.75c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25z" clip-rule="evenodd"/></g></symbol><symbol id="flight-sidebar-show-16" viewBox="0 0 16 16"><g><path d="M7.774 5.263a.7.7 0 11.952-1.026l3.5 3.25a.7.7 0 010 1.026l-3.5 3.25a.7.7 0 01-.952-1.026L10.72 8 7.774 5.263z"/><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h9.5A2.25 2.25 0 0115 3.25v9.5A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h1.3v-11h-1.3zm9.5 11h-6.8v-11h6.8a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-sign-in-24" viewBox="0 0 24 24"><g><path d="M14.5 2.75a.75.75 0 01.75-.75h4A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22h-4a.75.75 0 010-1.5h4c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25h-4a.75.75 0 01-.75-.75z"/><path d="M9.47 6.22a.75.75 0 011.06 0l5 5a.747.747 0 010 1.06l-5 5a.75.75 0 11-1.06-1.06l3.72-3.72H3A.75.75 0 013 11h10.19L9.47 7.28a.75.75 0 010-1.06z"/></g></symbol><symbol id="flight-sign-in-16" viewBox="0 0 16 16"><g><path d="M9.5 1.75a.75.75 0 01.75-.75h2.5A2.25 2.25 0 0115 3.25v9.5A2.25 2.25 0 0112.75 15h-2.5a.75.75 0 010-1.5h2.5a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75h-2.5a.75.75 0 01-.75-.75z"/><path d="M5.97 3.72a.75.75 0 011.06 0l3.5 3.5a.75.75 0 010 1.06l-3.5 3.5a.75.75 0 01-1.06-1.06L8.19 8.5H2A.75.75 0 012 7h6.19L5.97 4.78a.75.75 0 010-1.06z"/></g></symbol><symbol id="flight-sign-out-24" viewBox="0 0 24 24"><g><path d="M9.5 2.75A.75.75 0 008.75 2h-4A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h4a.75.75 0 000-1.5h-4c-.69 0-1.25-.56-1.25-1.25V4.75c0-.69.56-1.25 1.25-1.25h4a.75.75 0 00.75-.75z"/><path d="M15.47 6.22a.75.75 0 011.06 0l5 5a.75.75 0 010 1.06l-5 5a.75.75 0 11-1.06-1.06l3.72-3.72H9A.75.75 0 019 11h10.19l-3.72-3.72a.75.75 0 010-1.06z"/></g></symbol><symbol id="flight-sign-out-16" viewBox="0 0 16 16"><g><path d="M6.5 1.75A.75.75 0 005.75 1h-2.5A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h2.5a.75.75 0 000-1.5h-2.5a.75.75 0 01-.75-.75v-9.5a.75.75 0 01.75-.75h2.5a.75.75 0 00.75-.75z"/><path d="M9.97 3.72a.75.75 0 011.06 0l3.5 3.5a.75.75 0 010 1.06l-3.5 3.5a.75.75 0 11-1.06-1.06l2.22-2.22H6A.75.75 0 016 7h6.19L9.97 4.78a.75.75 0 010-1.06z"/></g></symbol><symbol id="flight-skip-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M4.172 19.728a.744.744 0 00.1.1A10.965 10.965 0 0012 23c6.075 0 11-4.925 11-11 0-3.012-1.21-5.742-3.172-7.728a.769.769 0 00-.1-.1A10.965 10.965 0 0012 1C5.925 1 1 5.925 1 12c0 3.012 1.21 5.742 3.172 7.728zM2.5 12A9.5 9.5 0 0112 2.5c2.353 0 4.507.856 6.166 2.273L4.773 18.166A9.462 9.462 0 012.5 12zm16.727-6.166A9.462 9.462 0 0121.5 12a9.5 9.5 0 01-9.5 9.5 9.462 9.462 0 01-6.166-2.273L19.227 5.834z" clip-rule="evenodd"/></symbol><symbol id="flight-skip-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 0110.535-5.096l-9.131 9.131A6.472 6.472 0 011.5 8zm2.465 5.096a6.5 6.5 0 009.131-9.131l-9.131 9.131z" clip-rule="evenodd"/></symbol><symbol id="flight-skip-forward-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M6.764 4.512C5.606 3.688 4 4.516 4 5.938v12.124c0 1.421 1.606 2.25 2.764 1.426l8.525-6.062a1.75 1.75 0 000-2.852L6.764 4.512zM5.5 5.938a.25.25 0 01.395-.204l8.524 6.062c.14.1.14.308 0 .408l-8.524 6.061a.25.25 0 01-.395-.203V5.938z" clip-rule="evenodd"/><path d="M19.5 5A.75.75 0 0018 5v14a.75.75 0 001.5 0V5z"/></g></symbol><symbol id="flight-skip-forward-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M4.76 2.5C3.6 1.682 2 2.51 2 3.93v8.14c0 1.419 1.6 2.248 2.76 1.43l5.765-4.07a1.75 1.75 0 000-2.86L4.76 2.5zM3.5 3.93a.25.25 0 01.394-.204l5.766 4.07a.25.25 0 010 .408l-5.766 4.07a.25.25 0 01-.394-.204V3.93z" clip-rule="evenodd"/><path d="M14 3a.75.75 0 00-1.5 0v10a.75.75 0 001.5 0V3z"/></g></symbol><symbol id="flight-skip-back-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M17.236 4.512C18.395 3.688 20 4.516 20 5.938v12.124c0 1.421-1.605 2.25-2.764 1.426L8.71 13.426a1.75 1.75 0 010-2.852l8.525-6.062zM18.5 5.938a.25.25 0 00-.395-.204l-8.524 6.062a.25.25 0 000 .408l8.524 6.061a.25.25 0 00.395-.203V5.938z" clip-rule="evenodd"/><path d="M6 5a.75.75 0 00-1.5 0v14A.75.75 0 006 19V5z"/></g></symbol><symbol id="flight-skip-back-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M11.24 2.5C12.4 1.682 14 2.51 14 3.93v8.14c0 1.419-1.6 2.248-2.76 1.43L5.476 9.43a1.75 1.75 0 010-2.86L11.24 2.5zm1.26 1.43a.25.25 0 00-.394-.204L6.34 7.796a.25.25 0 000 .408l5.766 4.07a.25.25 0 00.394-.204V3.93z" clip-rule="evenodd"/><path d="M3.5 3A.75.75 0 002 3v10a.75.75 0 001.5 0V3z"/></g></symbol><symbol id="flight-slash-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M16.63 4.103a.75.75 0 00-1.027.268l-8.5 14.5a.75.75 0 101.294.758l8.5-14.5a.75.75 0 00-.268-1.026z" clip-rule="evenodd"/></symbol><symbol id="flight-slash-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M11.126 2.601a.75.75 0 00-1.025.273l-5.5 9.5a.75.75 0 001.298.752l5.5-9.5a.75.75 0 00-.273-1.025z" clip-rule="evenodd"/></symbol><symbol id="flight-slash-square-24" viewBox="0 0 24 24"><g><path d="M14.1 6.874a.75.75 0 011.3.752l-5.5 9.5a.75.75 0 11-1.3-.752l5.5-9.5z"/><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25h14.5c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25V4.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-slash-square-16" viewBox="0 0 16 16"><g><path d="M9.633 4.323a.75.75 0 011.234.854l-4.5 6.5a.75.75 0 01-1.234-.854l4.5-6.5z"/><path fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zM2.5 3.25a.75.75 0 01.75-.75h9.5a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75v-9.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-sliders-24" viewBox="0 0 24 24"><g><path d="M3.75 2.5a.75.75 0 01.75.75v7a.75.75 0 01-1.5 0v-7a.75.75 0 01.75-.75zM3 14.5v6.25a.75.75 0 001.5 0V14.5h2a.75.75 0 000-1.5H1a.75.75 0 000 1.5h2zM12.5 11.75a.75.75 0 00-1.5 0v9a.75.75 0 001.5 0v-9zM11.75 2.5a.75.75 0 01.75.75V7.5h2a.75.75 0 010 1.5H9a.75.75 0 010-1.5h2V3.25a.75.75 0 01.75-.75zM22.5 15a.75.75 0 010 1.5h-2v4.25a.75.75 0 01-1.5 0V16.5h-2a.75.75 0 010-1.5h5.5zM19.75 2.5a.75.75 0 01.75.75v9a.75.75 0 01-1.5 0v-9a.75.75 0 01.75-.75z"/></g></symbol><symbol id="flight-sliders-16" viewBox="0 0 16 16"><g><path d="M2.75 1a.75.75 0 01.75.75v5.5a.75.75 0 01-1.5 0v-5.5A.75.75 0 012.75 1zM2 10.5v3.75a.75.75 0 001.5 0V10.5h1a.75.75 0 000-1.5H1a.75.75 0 000 1.5h1zM8.5 7.75a.75.75 0 00-1.5 0v6.5a.75.75 0 001.5 0v-6.5zM7.75 1a.75.75 0 01.75.75V4.5h1a.75.75 0 010 1.5H6a.75.75 0 010-1.5h1V1.75A.75.75 0 017.75 1zM14.5 10a.75.75 0 010 1.5h-1v2.75a.75.75 0 01-1.5 0V11.5h-1a.75.75 0 010-1.5h3.5zM12.75 1a.75.75 0 01.75.75v6.5a.75.75 0 01-1.5 0v-6.5a.75.75 0 01.75-.75z"/></g></symbol><symbol id="flight-smartphone-24" viewBox="0 0 24 24"><g><path d="M12 19a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M6.75 1A2.75 2.75 0 004 3.75v16.5A2.75 2.75 0 006.75 23h10.5A2.75 2.75 0 0020 20.25V3.75A2.75 2.75 0 0017.25 1H6.75zM5.5 3.75c0-.69.56-1.25 1.25-1.25h10.5c.69 0 1.25.56 1.25 1.25v16.5c0 .69-.56 1.25-1.25 1.25H6.75c-.69 0-1.25-.56-1.25-1.25V3.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-smartphone-16" viewBox="0 0 16 16"><g><path d="M8 12a1 1 0 100 2h.007a1 1 0 100-2H8z"/><path fill-rule="evenodd" d="M4.25 0A2.25 2.25 0 002 2.25v11.5A2.25 2.25 0 004.25 16h7.5A2.25 2.25 0 0014 13.75V2.25A2.25 2.25 0 0011.75 0h-7.5zM3.5 2.25a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75v11.5a.75.75 0 01-.75.75h-7.5a.75.75 0 01-.75-.75V2.25z" clip-rule="evenodd"/></g></symbol><symbol id="flight-smile-24" viewBox="0 0 24 24"><g><path d="M7.362 14.693c.216.265.534.618.948.972.82.7 2.077 1.46 3.69 1.46s2.87-.76 3.69-1.46a7.647 7.647 0 001.199-1.3l.099-.145a.875.875 0 00-1.475-.942c-.071.107-.15.21-.232.31a5.898 5.898 0 01-.729.747c-.641.549-1.509 1.04-2.552 1.04-1.043 0-1.91-.491-2.552-1.04a5.894 5.894 0 01-.73-.747 4.012 4.012 0 01-.232-.31.875.875 0 00-1.474.942c.106.165.227.322.35.473zM8 9a1 1 0 011-1h.01a1 1 0 110 2H9a1 1 0 01-1-1zM15 8a1 1 0 100 2h.01a1 1 0 100-2H15z"/><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-smile-16" viewBox="0 0 16 16"><g><path d="M8 12c-1.01 0-1.782-.504-2.267-.945a4.72 4.72 0 01-.564-.614 3.31 3.31 0 01-.212-.305.75.75 0 011.284-.775 3.214 3.214 0 00.5.584c.341.31.769.555 1.259.555.49 0 .918-.246 1.258-.555a3.214 3.214 0 00.5-.584.75.75 0 011.285.775l-.212.305c-.128.167-.317.39-.564.614C9.782 11.495 9.01 12 8 12zM5 6a1 1 0 011-1h.007a1 1 0 010 2H6a1 1 0 01-1-1zM10 5a1 1 0 100 2h.007a1 1 0 100-2H10z"/><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-socket-24" viewBox="0 0 24 24"><g><path d="M9 12a1 1 0 011-1h.01a1 1 0 110 2H10a1 1 0 01-1-1zM14.01 11a1 1 0 100 2h.01a1 1 0 100-2h-.01z"/><path fill-rule="evenodd" d="M12 4a8 8 0 100 16 8 8 0 000-16zm-6.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M3.75 1A2.75 2.75 0 001 3.75v16.5A2.75 2.75 0 003.75 23h16.5A2.75 2.75 0 0023 20.25V3.75A2.75 2.75 0 0020.25 1H3.75zM2.5 3.75c0-.69.56-1.25 1.25-1.25h16.5c.69 0 1.25.56 1.25 1.25v16.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V3.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-socket-16" viewBox="0 0 16 16"><g><path d="M5 8a1 1 0 011-1h.01a1 1 0 010 2H6a1 1 0 01-1-1zM10.01 7a1 1 0 000 2h.01a1 1 0 100-2h-.01z"/><path fill-rule="evenodd" d="M8 2.5a5.5 5.5 0 100 11 5.5 5.5 0 000-11zM4 8a4 4 0 118 0 4 4 0 01-8 0z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M2.25 0A2.25 2.25 0 000 2.25v11.5A2.25 2.25 0 002.25 16h11.5A2.25 2.25 0 0016 13.75V2.25A2.25 2.25 0 0013.75 0H2.25zM1.5 2.25a.75.75 0 01.75-.75h11.5a.75.75 0 01.75.75v11.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75V2.25z" clip-rule="evenodd"/></g></symbol><symbol id="flight-sort-asc-24" viewBox="0 0 24 24"><g><path d="M16.963 3.057a.748.748 0 01.817.163l4 4a.75.75 0 01-1.06 1.06L18 5.56v8.19a.75.75 0 01-1.5 0V5.56l-2.72 2.72a.75.75 0 11-1.06-1.06l4-4a.748.748 0 01.243-.163zM3.75 14.5a.75.75 0 010-1.5h9.5a.75.75 0 010 1.5h-9.5zM3 17.75c0 .414.336.75.75.75h16.5a.75.75 0 000-1.5H3.75a.75.75 0 00-.75.75zM3.75 10.5a.75.75 0 010-1.5h5.5a.75.75 0 010 1.5h-5.5zM3 5.75c0 .414.336.75.75.75h3.5a.75.75 0 000-1.5h-3.5a.75.75 0 00-.75.75z"/></g></symbol><symbol id="flight-sort-asc-16" viewBox="0 0 16 16"><g><path d="M15.78 5.72a.75.75 0 01-1.06 1.06L13 5.06v4.69a.75.75 0 01-1.5 0V5.06L9.78 6.78a.75.75 0 01-1.06-1.06l3-3a.748.748 0 01.528-.22h.004a.748.748 0 01.528.22l3 3zM3 10.5A.75.75 0 013 9h6a.75.75 0 010 1.5H3zM2.25 12.75c0 .414.336.75.75.75h10a.75.75 0 000-1.5H3a.75.75 0 00-.75.75zM3 7.5A.75.75 0 013 6h3a.75.75 0 010 1.5H3zM2.25 3.75c0 .414.336.75.75.75h3A.75.75 0 006 3H3a.75.75 0 00-.75.75z"/></g></symbol><symbol id="flight-sort-desc-24" viewBox="0 0 24 24"><g><path d="M3 5.75A.75.75 0 013.75 5h16.5a.75.75 0 010 1.5H3.75A.75.75 0 013 5.75zM3.75 9a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5zM16.963 20.443a.747.747 0 00.817-.163l4-4a.75.75 0 10-1.06-1.06L18 17.94V9.75a.75.75 0 00-1.5 0v8.19l-2.72-2.72a.75.75 0 10-1.06 1.06l4 4a.748.748 0 00.243.163zM3.75 13a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5zM3 17.75a.75.75 0 01.75-.75h3.5a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75z"/></g></symbol><symbol id="flight-sort-desc-16" viewBox="0 0 16 16"><g><path d="M2.25 3.75A.75.75 0 013 3h10a.75.75 0 010 1.5H3a.75.75 0 01-.75-.75zM3 6a.75.75 0 000 1.5h6A.75.75 0 009 6H3zM11.963 13.943a.747.747 0 00.817-.163l3-3a.75.75 0 10-1.06-1.06L13 11.44V6.75a.75.75 0 00-1.5 0v4.69L9.78 9.72a.75.75 0 00-1.06 1.06l3 3a.748.748 0 00.243.163zM3 9a.75.75 0 000 1.5h3A.75.75 0 006 9H3zM2.25 12.75A.75.75 0 013 12h3a.75.75 0 010 1.5H3a.75.75 0 01-.75-.75z"/></g></symbol><symbol id="flight-speaker-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M12 9a5 5 0 100 10 5 5 0 000-10zm-3.5 5a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z"/><path d="M5.75 1A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V3.75A2.75 2.75 0 0018.25 1H5.75zM4.5 3.75c0-.69.56-1.25 1.25-1.25h12.5c.69 0 1.25.56 1.25 1.25v16.5c0 .69-.56 1.25-1.25 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V3.75z"/></g></symbol><symbol id="flight-speaker-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8 5.55a3.95 3.95 0 100 7.9 3.95 3.95 0 000-7.9zM5.45 9.5a2.55 2.55 0 115.1 0 2.55 2.55 0 01-5.1 0z"/><path d="M3.25 0A2.25 2.25 0 001 2.25v11.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75V2.25A2.25 2.25 0 0012.75 0h-9.5zM2.5 2.25a.75.75 0 01.75-.75h9.5a.75.75 0 01.75.75v11.5a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V2.25z"/></g></symbol><symbol id="flight-square-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h14.5A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V4.75zM4.75 3.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h14.5c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H4.75z" clip-rule="evenodd"/></symbol><symbol id="flight-square-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h9.5A2.25 2.25 0 0115 3.25v9.5A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75h-9.5z" clip-rule="evenodd"/></symbol><symbol id="flight-square-fill-24" viewBox="0 0 24 24"><path d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75z"/></symbol><symbol id="flight-square-fill-16" viewBox="0 0 16 16"><path d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5z"/></symbol><symbol id="flight-star-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 1a.75.75 0 01.673.418l2.992 6.065 6.694.978a.75.75 0 01.414 1.28l-4.842 4.717 1.143 6.665a.75.75 0 01-1.089.79L12 18.766l-5.985 3.149a.75.75 0 01-1.089-.79l1.143-6.666-4.842-4.717a.75.75 0 01.414-1.28l6.694-.978 2.992-6.065A.75.75 0 0112 1zm0 2.445L9.505 8.5a.75.75 0 01-.564.41l-5.58.816 4.037 3.933a.75.75 0 01.216.664l-.952 5.556 4.989-2.625a.75.75 0 01.698 0l4.99 2.625-.953-5.556a.75.75 0 01.216-.664l4.037-3.933-5.58-.816a.75.75 0 01-.564-.41L12 3.445z" clip-rule="evenodd"/></symbol><symbol id="flight-star-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 .5a.75.75 0 01.67.412l2.064 4.094 4.622.662a.75.75 0 01.412 1.285l-3.335 3.18.786 4.488a.75.75 0 01-1.082.796L8 13.287l-4.137 2.13a.75.75 0 01-1.082-.796l.786-4.489-3.335-3.18a.75.75 0 01.412-1.284l4.622-.662L7.33.912A.75.75 0 018 .5zm0 2.416L6.43 6.03a.75.75 0 01-.564.405l-3.48.498 2.507 2.39a.75.75 0 01.22.672l-.594 3.396 3.138-1.616a.75.75 0 01.686 0l3.138 1.616-.595-3.396a.75.75 0 01.221-.672l2.507-2.39-3.48-.498a.75.75 0 01-.563-.405L8 2.916z" clip-rule="evenodd"/></symbol><symbol id="flight-star-circle-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M12.669 4.91a.75.75 0 00-1.338 0l-1.91 3.767-4.277.608a.75.75 0 00-.41 1.287l3.082 2.923-.726 4.125a.75.75 0 001.08.798L12 16.457l3.83 1.96a.75.75 0 001.08-.797l-.726-4.125 3.082-2.923a.75.75 0 00-.41-1.287l-4.278-.608L12.67 4.91zm-2.086 4.793L12 6.91l1.417 2.794a.75.75 0 00.563.404l3.128.445-2.25 2.132a.75.75 0 00-.222.675l.535 3.036-2.83-1.448a.75.75 0 00-.683 0l-2.83 1.448.536-3.036a.75.75 0 00-.223-.675l-2.249-2.132 3.128-.445a.75.75 0 00.563-.404z"/><path d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z"/></g></symbol><symbol id="flight-star-circle-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8.679 2.431a.75.75 0 00-1.358 0L6.023 5.196l-2.887.444a.75.75 0 00-.423 1.265l2.11 2.162-.499 3.062a.75.75 0 001.103.777L8 11.484l2.573 1.422a.75.75 0 001.103-.777l-.5-3.062 2.11-2.162a.75.75 0 00-.422-1.265l-2.887-.444-1.298-2.765zM7.21 6.195L8 4.515l.789 1.68a.75.75 0 00.565.423l1.84.283L9.838 8.29a.75.75 0 00-.203.644l.312 1.912-1.584-.876a.75.75 0 00-.726 0l-1.584.876.312-1.912a.75.75 0 00-.203-.644L4.806 6.9l1.84-.282a.75.75 0 00.565-.423z"/><path d="M8 .05a7.95 7.95 0 100 15.9A7.95 7.95 0 008 .05zM1.45 8a6.55 6.55 0 1113.1 0 6.55 6.55 0 01-13.1 0z"/></g></symbol><symbol id="flight-star-fill-24" viewBox="0 0 24 24"><path d="M12.673 1.418a.75.75 0 00-1.345 0L8.335 7.483l-6.693.978a.75.75 0 00-.415 1.28l4.842 4.717-1.143 6.665a.75.75 0 001.089.79L12 18.766l5.985 3.149a.75.75 0 001.089-.79l-1.143-6.666 4.842-4.717a.75.75 0 00-.415-1.28l-6.693-.978-2.992-6.065z"/></symbol><symbol id="flight-star-fill-16" viewBox="0 0 16 16"><path d="M8.67.912a.75.75 0 00-1.34 0L5.266 5.006l-4.622.662a.75.75 0 00-.412 1.285l3.335 3.18-.786 4.488a.75.75 0 001.082.796L8 13.287l4.137 2.13a.75.75 0 001.082-.796l-.786-4.489 3.335-3.18a.75.75 0 00-.412-1.284l-4.622-.662L8.67.912z"/></symbol><symbol id="flight-star-off-24" viewBox="0 0 24 24"><g><path d="M12.673 1.418a.75.75 0 00-1.345 0l-1.584 3.21a.75.75 0 101.345.663L12 3.445 14.495 8.5a.75.75 0 00.564.41l5.58.816-2.756 2.685a.75.75 0 001.046 1.075l3.844-3.745a.75.75 0 00-.415-1.28l-6.693-.978-2.992-6.065z"/><path fill-rule="evenodd" d="M18.87 19.93l.204 1.193a.75.75 0 01-1.089.79L12 18.766l-5.985 3.149a.75.75 0 01-1.089-.79l1.143-6.666-4.842-4.717a.75.75 0 01.415-1.28l5.024-.734L1.22 2.28a.75.75 0 011.06-1.06l20.5 20.5a.75.75 0 11-1.06 1.06l-2.85-2.85zM7.988 9.05l-4.628.676 4.037 3.933a.75.75 0 01.216.664l-.952 5.556 4.989-2.625a.75.75 0 01.698 0l4.99 2.625-.307-1.786L7.99 9.049z" clip-rule="evenodd"/></g></symbol><symbol id="flight-star-off-16" viewBox="0 0 16 16"><g><path d="M8.67.912a.75.75 0 00-1.34 0l-.882 1.75a.75.75 0 001.34.676L8 2.916 9.57 6.03c.11.219.321.37.564.405l3.48.498-1.299 1.238a.75.75 0 001.035 1.086l2.418-2.305a.75.75 0 00-.412-1.285l-4.622-.662L8.67.912z"/><path fill-rule="evenodd" d="M13.147 14.207l.072.413a.75.75 0 01-1.082.797L8 13.287l-4.137 2.13a.75.75 0 01-1.082-.796l.786-4.489-3.335-3.18a.75.75 0 01.412-1.284l3.467-.496L1.22 2.28a.75.75 0 111.06-1.06l12.5 12.5a.75.75 0 01-1.06 1.06l-.573-.572zm-7.71-7.71l-3.051.437 2.507 2.39a.75.75 0 01.22.672l-.594 3.396 3.138-1.616a.75.75 0 01.686 0l3.138 1.616-.18-1.03-5.865-5.865z" clip-rule="evenodd"/></g></symbol><symbol id="flight-step-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M18.75 20.75a.75.75 0 000-1.5h-5.071c-.839 0-1.646-.34-2.243-.947A3.287 3.287 0 0110.5 16v-.25h.25A2.25 2.25 0 0013 13.5v-2a2.25 2.25 0 00-2.25-2.25h-.25V4A.75.75 0 009 4v5.25h-.25A2.25 2.25 0 006.5 11.5v2a2.25 2.25 0 002.25 2.25H9V16c0 1.256.49 2.462 1.366 3.354a4.643 4.643 0 003.313 1.396h5.071zm-8-6.5a.75.75 0 00.75-.75v-2a.75.75 0 00-.75-.75h-2a.75.75 0 00-.75.75v2c0 .414.336.75.75.75h2z" clip-rule="evenodd"/></symbol><symbol id="flight-step-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M12.25 14a.75.75 0 000-1.5h-3a1.75 1.75 0 01-1.75-1.75v-.25a1.75 1.75 0 001.75-1.75v-1.5A1.75 1.75 0 007.5 5.5V2.75a.75.75 0 00-1.5 0V5.5a1.75 1.75 0 00-1.75 1.75v1.5c0 .966.784 1.75 1.75 1.75v.25A3.25 3.25 0 009.25 14h3zm-6.5-6.75A.25.25 0 016 7h1.5a.25.25 0 01.25.25v1.5A.25.25 0 017.5 9H6a.25.25 0 01-.25-.25v-1.5z" clip-rule="evenodd"/></symbol><symbol id="flight-stop-circle-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8.75 7A1.75 1.75 0 007 8.75v6.5c0 .966.784 1.75 1.75 1.75h6.5A1.75 1.75 0 0017 15.25v-6.5A1.75 1.75 0 0015.25 7h-6.5zM8.5 8.75a.25.25 0 01.25-.25h6.5a.25.25 0 01.25.25v6.5a.25.25 0 01-.25.25h-6.5a.25.25 0 01-.25-.25v-6.5z"/><path d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z"/></g></symbol><symbol id="flight-stop-circle-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M6.25 5C5.56 5 5 5.56 5 6.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5C11 5.56 10.44 5 9.75 5h-3.5zm.25 4.5v-3h3v3h-3z"/><path d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z"/></g></symbol><symbol id="flight-sun-24" viewBox="0 0 24 24"><g><path d="M12 .25a.75.75 0 01.75.75v2a.75.75 0 01-1.5 0V1A.75.75 0 0112 .25z"/><path fill-rule="evenodd" d="M6 12a6 6 0 1112 0 6 6 0 01-12 0zm6-4.5a4.5 4.5 0 100 9 4.5 4.5 0 000-9z" clip-rule="evenodd"/><path d="M12.75 21a.75.75 0 00-1.5 0v2a.75.75 0 001.5 0v-2zM3.69 3.69a.75.75 0 011.06 0l1.42 1.42a.75.75 0 01-1.06 1.06L3.69 4.75a.75.75 0 010-1.06zM18.89 17.83a.75.75 0 10-1.06 1.06l1.42 1.42a.75.75 0 101.06-1.06l-1.42-1.42zM.25 12a.75.75 0 01.75-.75h2a.75.75 0 010 1.5H1A.75.75 0 01.25 12zM21 11.25a.75.75 0 000 1.5h2a.75.75 0 000-1.5h-2zM6.17 17.83a.75.75 0 010 1.06l-1.42 1.42a.75.75 0 11-1.06-1.06l1.42-1.42a.75.75 0 011.06 0zM20.31 4.75a.75.75 0 00-1.06-1.06l-1.42 1.42a.75.75 0 001.06 1.06l1.42-1.42z"/></g></symbol><symbol id="flight-sun-16" viewBox="0 0 16 16"><g><path d="M8 .25a.75.75 0 01.75.75v1.273a.75.75 0 01-1.5 0V1A.75.75 0 018 .25z"/><path fill-rule="evenodd" d="M4 8a4 4 0 118 0 4 4 0 01-8 0zm4-2.5a2.5 2.5 0 100 5 2.5 2.5 0 000-5z" clip-rule="evenodd"/><path d="M8.75 13.727a.75.75 0 00-1.5 0V15a.75.75 0 001.5 0v-1.273zM2.519 2.518a.75.75 0 011.06 0l.904.904a.75.75 0 01-1.06 1.06l-.904-.903a.75.75 0 010-1.06zM12.578 11.517a.75.75 0 00-1.061 1.06l.904.904a.75.75 0 101.06-1.06l-.903-.904zM.25 8A.75.75 0 011 7.25h1.273a.75.75 0 010 1.5H1A.75.75 0 01.25 8zM13.727 7.25a.75.75 0 000 1.5H15a.75.75 0 000-1.5h-1.273zM4.483 11.517a.75.75 0 010 1.06l-.904.904a.75.75 0 01-1.06-1.06l.903-.904a.75.75 0 011.061 0zM13.481 3.58a.75.75 0 00-1.06-1.062l-.904.904a.75.75 0 101.06 1.06l.904-.903z"/></g></symbol><symbol id="flight-support-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M19.828 19.728A10.965 10.965 0 0023 12c0-3.012-1.21-5.742-3.172-7.728a.77.77 0 00-.1-.1A10.965 10.965 0 0012 1C8.988 1 6.258 2.21 4.272 4.172a.767.767 0 00-.1.1A10.965 10.965 0 001 12c0 3.012 1.21 5.742 3.172 7.728a.77.77 0 00.1.1A10.965 10.965 0 0012 23c3.012 0 5.742-1.21 7.728-3.172a.771.771 0 00.1-.1zM2.5 12c0-2.353.856-4.507 2.273-6.166l3.2 3.2A4.978 4.978 0 007 12c0 1.11.362 2.136.974 2.965l-3.201 3.201A9.462 9.462 0 012.5 12zm7.094 2.542A3.488 3.488 0 0012 15.5c.932 0 1.779-.364 2.406-.958a.769.769 0 01.136-.136A3.488 3.488 0 0015.5 12c0-.932-.364-1.779-.958-2.406a.768.768 0 01-.136-.136A3.488 3.488 0 0012 8.5c-.932 0-1.779.364-2.406.958a.768.768 0 01-.136.136A3.488 3.488 0 008.5 12c0 .932.364 1.779.958 2.406.05.039.097.086.136.136zm5.371 1.484A4.978 4.978 0 0112 17a4.978 4.978 0 01-2.965-.974l-3.201 3.201A9.462 9.462 0 0012 21.5a9.462 9.462 0 006.166-2.273l-3.2-3.2zm4.262 2.14l-3.2-3.2c.611-.83.973-1.856.973-2.966s-.362-2.136-.974-2.965l3.201-3.201A9.462 9.462 0 0121.5 12a9.462 9.462 0 01-2.273 6.166zm-1.06-13.393l-3.202 3.2A4.977 4.977 0 0012 7c-1.11 0-2.136.362-2.965.974L5.834 4.773A9.463 9.463 0 0112 2.5c2.353 0 4.507.856 6.166 2.273z" clip-rule="evenodd"/></symbol><symbol id="flight-support-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8c0-1.525.525-2.927 1.404-4.035l1.787 1.787A3.982 3.982 0 004 8c0 .834.255 1.608.691 2.248l-1.787 1.787A6.472 6.472 0 011.5 8zm2.465 5.096l1.787-1.787C6.392 11.745 7.166 12 8 12c.834 0 1.608-.255 2.248-.691l1.787 1.787A6.472 6.472 0 018 14.5a6.473 6.473 0 01-4.035-1.404zm9.131-1.06A6.472 6.472 0 0014.5 8a6.473 6.473 0 00-1.404-4.035l-1.787 1.787C11.745 6.392 12 7.166 12 8c0 .834-.255 1.608-.691 2.248l1.787 1.787zm-1.06-9.132A6.472 6.472 0 008 1.5a6.472 6.472 0 00-4.035 1.404l1.787 1.787A3.982 3.982 0 018 4c.834 0 1.608.255 2.248.691l1.787-1.787zM5.5 8a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z" clip-rule="evenodd"/></symbol><symbol id="flight-swap-horizontal-24" viewBox="0 0 24 24"><g><path d="M18.265 5.455a.75.75 0 00-1.03 1.09L20.364 9.5H11.75a.75.75 0 000 1.5h8.614l-3.129 2.955a.75.75 0 001.03 1.09l4.5-4.25a.75.75 0 000-1.09l-4.5-4.25zM3.636 13l3.129-2.955a.75.75 0 00-1.03-1.09l-4.5 4.25a.75.75 0 000 1.09l4.5 4.25a.75.75 0 001.03-1.09L3.636 14.5h8.614a.75.75 0 000-1.5H3.636z"/></g></symbol><symbol id="flight-swap-horizontal-16" viewBox="0 0 16 16"><g><path d="M12.26 1.45a.75.75 0 10-1.02 1.1l2.1 1.95H7.75a.75.75 0 000 1.5h5.59l-2.1 1.95a.75.75 0 101.02 1.1l3.5-3.25a.75.75 0 000-1.1l-3.5-3.25zM2.66 10l2.1-1.95a.75.75 0 10-1.02-1.1L.24 10.2a.75.75 0 000 1.1l3.5 3.25a.75.75 0 001.02-1.1l-2.1-1.95h5.59a.75.75 0 000-1.5H2.66z"/></g></symbol><symbol id="flight-swap-vertical-24" viewBox="0 0 24 24"><g><path d="M4.455 5.735a.75.75 0 001.09 1.03L8.5 3.636v8.614a.75.75 0 001.5 0V3.636l2.955 3.129a.75.75 0 001.09-1.03l-4.25-4.5a.75.75 0 00-1.09 0l-4.25 4.5zM15.5 20.364V11.75a.75.75 0 00-1.5 0v8.614l-2.955-3.129a.75.75 0 00-1.09 1.03l4.25 4.5a.75.75 0 001.09 0l4.25-4.5a.75.75 0 00-1.09-1.03L15.5 20.364z"/></g></symbol><symbol id="flight-swap-vertical-16" viewBox="0 0 16 16"><g><path d="M1.45 3.74a.75.75 0 001.1 1.02l1.95-2.1v5.59a.75.75 0 101.5 0V2.66l1.95 2.1a.75.75 0 101.1-1.02L5.8.24a.75.75 0 00-1.1 0l-3.25 3.5zM10.75 7a.75.75 0 00-.75.75v5.59l-1.95-2.1a.75.75 0 10-1.1 1.02l3.25 3.5a.75.75 0 001.1 0l3.25-3.5a.75.75 0 10-1.1-1.02l-1.95 2.1V7.75a.75.75 0 00-.75-.75z"/></g></symbol><symbol id="flight-switcher-24" viewBox="0 0 24 24"><g><path d="M2.25 1C1.56 1 1 1.56 1 2.25v3.5C1 6.44 1.56 7 2.25 7h3.5C6.44 7 7 6.44 7 5.75v-3.5C7 1.56 6.44 1 5.75 1h-3.5zM10.25 1C9.56 1 9 1.56 9 2.25v3.5C9 6.44 9.56 7 10.25 7h3.5C14.44 7 15 6.44 15 5.75v-3.5C15 1.56 14.44 1 13.75 1h-3.5zM18.25 1C17.56 1 17 1.56 17 2.25v3.5c0 .69.56 1.25 1.25 1.25h3.5C22.44 7 23 6.44 23 5.75v-3.5C23 1.56 22.44 1 21.75 1h-3.5zM2.25 9C1.56 9 1 9.56 1 10.25v3.5c0 .69.56 1.25 1.25 1.25h3.5C6.44 15 7 14.44 7 13.75v-3.5C7 9.56 6.44 9 5.75 9h-3.5zM10.25 9C9.56 9 9 9.56 9 10.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5C15 9.56 14.44 9 13.75 9h-3.5zM18.25 9c-.69 0-1.25.56-1.25 1.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5C23 9.56 22.44 9 21.75 9h-3.5zM2.25 17C1.56 17 1 17.56 1 18.25v3.5c0 .69.56 1.25 1.25 1.25h3.5C6.44 23 7 22.44 7 21.75v-3.5C7 17.56 6.44 17 5.75 17h-3.5zM10.25 17C9.56 17 9 17.56 9 18.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5c0-.69-.56-1.25-1.25-1.25h-3.5zM18.25 17c-.69 0-1.25.56-1.25 1.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5c0-.69-.56-1.25-1.25-1.25h-3.5z"/></g></symbol><symbol id="flight-switcher-16" viewBox="0 0 16 16"><g><path d="M.75 0A.75.75 0 000 .75v2.5c0 .414.336.75.75.75h2.5A.75.75 0 004 3.25V.75A.75.75 0 003.25 0H.75zM6.75 0A.75.75 0 006 .75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75V.75A.75.75 0 009.25 0h-2.5zM12.75 0a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75V.75a.75.75 0 00-.75-.75h-2.5zM.75 6a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5A.75.75 0 004 9.25v-2.5A.75.75 0 003.25 6H.75zM6.75 6a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5A.75.75 0 009.25 6h-2.5zM12.75 6a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5a.75.75 0 00-.75-.75h-2.5zM.75 12a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5a.75.75 0 00-.75-.75H.75zM6.75 12a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5a.75.75 0 00-.75-.75h-2.5zM12.75 12a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5a.75.75 0 00-.75-.75h-2.5z"/></g></symbol><symbol id="flight-sync-24" viewBox="0 0 24 24"><g><path d="M12 3.5A8.5 8.5 0 003.5 12 .75.75 0 012 12C2 6.477 6.477 2 12 2a9.977 9.977 0 017.5 3.386V2.75a.75.75 0 011.5 0v4.5a.75.75 0 01-.75.75h-4.5a.75.75 0 010-1.5h2.731A8.48 8.48 0 0012 3.5zM21.25 11.25A.75.75 0 0122 12c0 5.523-4.477 10-10 10a9.977 9.977 0 01-7.5-3.386v2.636a.75.75 0 01-1.5 0v-4.5a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5H5.519A8.5 8.5 0 0020.5 12a.75.75 0 01.75-.75z"/></g></symbol><symbol id="flight-sync-16" viewBox="0 0 16 16"><g><path d="M8 1.5A6.5 6.5 0 001.5 8 .75.75 0 010 8a8 8 0 0113.5-5.81v-.94a.75.75 0 011.5 0v3a.75.75 0 01-.75.75h-3a.75.75 0 010-1.5h1.44A6.479 6.479 0 008 1.5zM15.25 7.25A.75.75 0 0116 8a8 8 0 01-13.5 5.81v.94a.75.75 0 01-1.5 0v-3a.75.75 0 01.75-.75h3a.75.75 0 010 1.5H3.31A6.5 6.5 0 0014.5 8a.75.75 0 01.75-.75z"/></g></symbol><symbol id="flight-sync-alert-24" viewBox="0 0 24 24"><g><path d="M12 3.5A8.5 8.5 0 003.5 12 .75.75 0 012 12C2 6.477 6.477 2 12 2a9.977 9.977 0 017.5 3.386V2.75a.75.75 0 011.5 0v4.5a.75.75 0 01-.75.75h-4.5a.75.75 0 010-1.5h2.731A8.48 8.48 0 0012 3.5zM21.25 11.25A.75.75 0 0122 12c0 5.523-4.477 10-10 10a9.977 9.977 0 01-7.5-3.386v2.636a.75.75 0 01-1.5 0v-4.5a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5H5.519A8.5 8.5 0 0020.5 12a.75.75 0 01.75-.75z"/><path d="M12 7a.75.75 0 01.75.75v4.5a.75.75 0 01-1.5 0v-4.5A.75.75 0 0112 7zM12 15a1 1 0 100 2h.01a1 1 0 100-2H12z"/></g></symbol><symbol id="flight-sync-alert-16" viewBox="0 0 16 16"><g><path d="M8 1.5A6.5 6.5 0 001.5 8 .75.75 0 010 8a8 8 0 0113.5-5.81v-.94a.75.75 0 011.5 0v3a.75.75 0 01-.75.75h-3a.75.75 0 010-1.5h1.44A6.479 6.479 0 008 1.5zM15.25 7.25A.75.75 0 0116 8a8 8 0 01-13.5 5.81v.94a.75.75 0 01-1.5 0v-3a.75.75 0 01.75-.75h3a.75.75 0 010 1.5H3.31A6.5 6.5 0 0014.5 8a.75.75 0 01.75-.75z"/><path d="M7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zM8.75 4.75a.75.75 0 00-1.5 0v3.5a.75.75 0 001.5 0v-3.5z"/></g></symbol><symbol id="flight-sync-reverse-24" viewBox="0 0 24 24"><g><path d="M12 3.5a8.5 8.5 0 018.5 8.5.75.75 0 001.5 0c0-5.523-4.477-10-10-10a9.977 9.977 0 00-7.5 3.386V2.75a.75.75 0 00-1.5 0v4.5c0 .414.336.75.75.75h4.5a.75.75 0 000-1.5H5.519A8.48 8.48 0 0112 3.5zM2.75 11.25A.75.75 0 002 12c0 5.523 4.477 10 10 10a9.977 9.977 0 007.5-3.386v2.636a.75.75 0 001.5 0v-4.5a.75.75 0 00-.75-.75h-4.5a.75.75 0 000 1.5h2.731A8.5 8.5 0 013.5 12a.75.75 0 00-.75-.75z"/></g></symbol><symbol id="flight-sync-reverse-16" viewBox="0 0 16 16"><g><path d="M8 1.5A6.5 6.5 0 0114.5 8 .75.75 0 0016 8 8 8 0 002.5 2.19v-.94a.75.75 0 00-1.5 0v3c0 .414.336.75.75.75h3a.75.75 0 000-1.5H3.31A6.479 6.479 0 018 1.5zM.75 7.25A.75.75 0 000 8a8 8 0 0013.5 5.81v.94a.75.75 0 001.5 0v-3a.75.75 0 00-.75-.75h-3a.75.75 0 000 1.5h1.44A6.5 6.5 0 011.5 8a.75.75 0 00-.75-.75z"/></g></symbol><symbol id="flight-tablet-24" viewBox="0 0 24 24"><g><path d="M12 17a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M3.75 3A2.75 2.75 0 001 5.75v12.5A2.75 2.75 0 003.75 21h16.5A2.75 2.75 0 0023 18.25V5.75A2.75 2.75 0 0020.25 3H3.75zM2.5 5.75c0-.69.56-1.25 1.25-1.25h16.5c.69 0 1.25.56 1.25 1.25v12.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V5.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-tablet-16" viewBox="0 0 16 16"><g><path d="M8 11a1 1 0 100 2h.01a1 1 0 100-2H8z"/><path fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-9.5A2.25 2.25 0 0013.75 1H2.25zM1.5 3.25a.75.75 0 01.75-.75h11.5a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75v-9.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-tag-24" viewBox="0 0 24 24"><g><path d="M6 5a1 1 0 000 2h.01a1 1 0 000-2H6z"/><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v6.422c0 .729.29 1.428.805 1.944l8 8a2.75 2.75 0 003.89 0l6.421-6.421a2.75 2.75 0 000-3.89l-8-8A2.75 2.75 0 0011.172 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25h6.422c.331 0 .649.132.883.366l8 8a1.25 1.25 0 010 1.768l-6.421 6.421a1.25 1.25 0 01-1.768 0l-8-8a1.25 1.25 0 01-.366-.883V4.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-tag-16" viewBox="0 0 16 16"><g><path d="M5 4a1 1 0 000 2h.006a1 1 0 000-2H5z"/><path fill-rule="evenodd" d="M2.25 1C1.56 1 1 1.56 1 2.25v5.246c0 .596.237 1.169.659 1.59l5.383 5.384a2.25 2.25 0 003.182 0l4.246-4.246a2.25 2.25 0 000-3.182L9.087 1.66A2.25 2.25 0 007.496 1H2.25zm.25 6.496V2.5h4.996a.75.75 0 01.53.22l5.383 5.383a.75.75 0 010 1.06L9.163 13.41a.75.75 0 01-1.06 0L2.72 8.026a.75.75 0 01-.22-.53z" clip-rule="evenodd"/></g></symbol><symbol id="flight-target-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M12 9a3 3 0 100 6 3 3 0 000-6zm-1.5 3a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z"/><path d="M5 12a7 7 0 1114 0 7 7 0 01-14 0zm7-5.5a5.5 5.5 0 100 11 5.5 5.5 0 000-11z"/><path d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z"/></g></symbol><symbol id="flight-target-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8 6a2 2 0 100 4 2 2 0 000-4zm-.5 2a.5.5 0 111 0 .5.5 0 01-1 0z"/><path d="M3 8a5 5 0 1110 0A5 5 0 013 8zm5-3.5a3.5 3.5 0 100 7 3.5 3.5 0 000-7z"/><path d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z"/></g></symbol><symbol id="flight-terminal-24" viewBox="0 0 24 24"><g><path d="M4.23 4.174a.75.75 0 00-.96 1.152L10.078 11 3.27 16.674a.75.75 0 10.96 1.152l7.5-6.25a.75.75 0 000-1.152l-7.5-6.25zM11.75 18a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5z"/></g></symbol><symbol id="flight-terminal-16" viewBox="0 0 16 16"><g><path d="M3.23 3.174a.75.75 0 00-.96 1.152L6.078 7.5 2.27 10.674a.75.75 0 10.96 1.152l4.5-3.75a.75.75 0 000-1.152l-4.5-3.75zM7.75 12a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5z"/></g></symbol><symbol id="flight-terminal-screen-24" viewBox="0 0 24 24"><g><path d="M6.174 7.27a.75.75 0 011.056-.096l4.5 3.75a.75.75 0 010 1.152l-4.5 3.75a.75.75 0 11-.96-1.152l3.809-3.174-3.81-3.174a.75.75 0 01-.095-1.056zM11.75 16a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5z"/><path fill-rule="evenodd" d="M1 4.75A2.75 2.75 0 013.75 2h16.5A2.75 2.75 0 0123 4.75v14.5A2.75 2.75 0 0120.25 22H3.75A2.75 2.75 0 011 19.25V4.75zM3.75 3.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h16.5c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H3.75z" clip-rule="evenodd"/></g></symbol><symbol id="flight-terminal-screen-16" viewBox="0 0 16 16"><g><path d="M3.924 5.02a.75.75 0 011.056-.096l3 2.5a.75.75 0 010 1.152l-3 2.5a.75.75 0 11-.96-1.152L6.328 8 4.02 6.076a.75.75 0 01-.096-1.056zM8.25 10.5a.75.75 0 000 1.5h3a.75.75 0 000-1.5h-3z"/><path fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h11.5A2.25 2.25 0 0116 3.25v9.5A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75H2.25z" clip-rule="evenodd"/></g></symbol><symbol id="flight-test-24" viewBox="0 0 24 24"><g><path d="M2.5 12a9.5 9.5 0 019.976-9.488.75.75 0 10.079-1.498A10.64 10.64 0 0012 1C5.925 1 1 5.925 1 12s4.925 11 11 11a11 11 0 009.899-6.197V16.8c.082-.168.158-.336.23-.506a.75.75 0 00-1.382-.583A9.5 9.5 0 0112 21.5 9.5 9.5 0 012.5 12zM15.793 1.71a.75.75 0 10-.543 1.397c.296.116.585.246.866.39a.75.75 0 00.686-1.333 10.58 10.58 0 00-1.009-.455zM19.475 4.101a.75.75 0 10-1.05 1.071c.228.224.445.458.65.702a.75.75 0 001.148-.966c-.236-.28-.486-.55-.748-.807zM21.967 7.696a.75.75 0 10-1.371.609c.13.292.245.59.347.893a.75.75 0 001.422-.476c-.116-.349-.25-.69-.398-1.026zM22.942 11.97a.75.75 0 00-1.5.037c.009.317 0 .634-.024.95a.75.75 0 001.495.119c.03-.37.039-.739.03-1.107z"/><path d="M17.78 8.22a.75.75 0 010 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97a.75.75 0 011.06 0z"/></g></symbol><symbol id="flight-test-16" viewBox="0 0 16 16"><g><path d="M1.5 8a6.5 6.5 0 016.744-6.496.75.75 0 10.055-1.499 8 8 0 107.036 11.193.75.75 0 00-1.375-.6 6.722 6.722 0 01-.22.453A6.5 6.5 0 011.5 8zM11.74.926a.75.75 0 10-.703 1.326c.144.076.284.157.421.243a.75.75 0 00.8-1.27 7.995 7.995 0 00-.519-.299zM14.774 3.743a.75.75 0 00-1.27.799c.087.137.168.277.244.42a.75.75 0 001.326-.701 8.04 8.04 0 00-.3-.518zM15.995 7.7a.75.75 0 00-1.5.056 6.583 6.583 0 01.002.45.75.75 0 101.5.047 8.158 8.158 0 00-.002-.552z"/><path d="M11.78 5.22a.75.75 0 010 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97a.75.75 0 011.06 0z"/></g></symbol><symbol id="flight-thumbs-up-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M11.23 2.516L7.5 10.909V21.5h10.98a1.25 1.25 0 001.237-1.062l1.442-9.5A1.25 1.25 0 0019.923 9.5H14.75A1.75 1.75 0 0113 7.75V4.525a2.025 2.025 0 00-1.77-2.01zM6 21.5v-10H3.75c-.69 0-1.25.56-1.25 1.25v7.5c0 .69.56 1.25 1.25 1.25H6zM6.263 10l3.71-8.349A1.097 1.097 0 0110.975 1 3.525 3.525 0 0114.5 4.525V7.75c0 .138.112.25.25.25h5.173a2.75 2.75 0 012.72 3.163l-1.443 9.5A2.75 2.75 0 0118.48 23H3.75A2.75 2.75 0 011 20.25v-7.5A2.75 2.75 0 013.75 10h2.513z" clip-rule="evenodd"/></symbol><symbol id="flight-thumbs-up-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M7.596 1.516l-2.56 5.759V14.5h7.475a.75.75 0 00.741-.637l.994-6.55a.75.75 0 00-.741-.862H9.738c-.69 0-1.25-.56-1.25-1.25V2.575c0-.53-.385-.972-.892-1.06zM3.536 14.5V7.866H2.25a.75.75 0 00-.75.75v5.134c0 .414.336.75.75.75h1.287zM3.8 6.366L6.31.716A1.206 1.206 0 017.412 0a2.575 2.575 0 012.576 2.575v2.376h3.517a2.25 2.25 0 012.224 2.588l-.994 6.549A2.25 2.25 0 0112.511 16H2.25A2.25 2.25 0 010 13.75V8.616a2.25 2.25 0 012.25-2.25H3.8z" clip-rule="evenodd"/></symbol><symbol id="flight-thumbs-down-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12.77 21.484l3.73-8.393V2.5H5.52a1.25 1.25 0 00-1.237 1.062l-1.442 9.5A1.25 1.25 0 004.077 14.5H9.25c.966 0 1.75.784 1.75 1.75v3.225c0 1.032.772 1.884 1.77 2.01zM18 2.5v10h2.25c.69 0 1.25-.56 1.25-1.25v-7.5c0-.69-.56-1.25-1.25-1.25H18zM17.737 14l-3.71 8.349a1.097 1.097 0 01-1.002.651A3.525 3.525 0 019.5 19.475V16.25a.25.25 0 00-.25-.25H4.077a2.75 2.75 0 01-2.72-3.163l1.443-9.5A2.75 2.75 0 015.52 1h14.73A2.75 2.75 0 0123 3.75v7.5A2.75 2.75 0 0120.25 14h-2.513z" clip-rule="evenodd"/></symbol><symbol id="flight-thumbs-down-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8.404 14.484l2.56-5.759V1.5H3.488a.75.75 0 00-.741.637l-.995 6.55a.75.75 0 00.742.862h3.767c.69 0 1.25.56 1.25 1.25v2.626c0 .53.385.972.892 1.06zM12.464 1.5v6.634h1.286a.75.75 0 00.75-.75V2.25a.75.75 0 00-.75-.75h-1.287zM12.2 9.634l-2.511 5.65A1.206 1.206 0 018.588 16a2.575 2.575 0 01-2.576-2.575v-2.376H2.495A2.25 2.25 0 01.27 8.46l.995-6.549A2.25 2.25 0 013.489 0H13.75A2.25 2.25 0 0116 2.25v5.134a2.25 2.25 0 01-2.25 2.25H12.2z" clip-rule="evenodd"/></symbol><symbol id="flight-toggle-left-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8 8a4 4 0 100 8 4 4 0 000-8zm-2.5 4a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z"/><path d="M8 5a7 7 0 000 14h8a7 7 0 100-14H8zm-5.5 7A5.5 5.5 0 018 6.5h8a5.5 5.5 0 110 11H8A5.5 5.5 0 012.5 12z"/></g></symbol><symbol id="flight-toggle-left-16" viewBox="0 0 16 16"><g><path d="M3 8a2 2 0 114 0 2 2 0 01-4 0z"/><path fill-rule="evenodd" d="M5 3a5 5 0 000 10h6a5 5 0 000-10H5zM1.5 8A3.5 3.5 0 015 4.5h6a3.5 3.5 0 110 7H5A3.5 3.5 0 011.5 8z" clip-rule="evenodd"/></g></symbol><symbol id="flight-toggle-right-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M16 8a4 4 0 110 8 4 4 0 010-8zm2.5 4a2.5 2.5 0 10-5 0 2.5 2.5 0 005 0z"/><path d="M16 5a7 7 0 110 14H8A7 7 0 118 5h8zm5.5 7A5.5 5.5 0 0016 6.5H8a5.5 5.5 0 100 11h8a5.5 5.5 0 005.5-5.5z"/></g></symbol><symbol id="flight-toggle-right-16" viewBox="0 0 16 16"><g><path d="M13 8a2 2 0 10-4 0 2 2 0 004 0z"/><path fill-rule="evenodd" d="M11 3a5 5 0 010 10H5A5 5 0 015 3h6zm3.5 5A3.5 3.5 0 0011 4.5H5a3.5 3.5 0 100 7h6A3.5 3.5 0 0014.5 8z" clip-rule="evenodd"/></g></symbol><symbol id="flight-token-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8.762 5.228L5.227 8.763a1.75 1.75 0 000 2.475l3.535 3.535a1.75 1.75 0 002.475 0l3.536-3.535a1.75 1.75 0 000-2.475l-3.536-3.535a1.75 1.75 0 00-2.475 0zM6.287 9.824l3.536-3.536a.25.25 0 01.354 0l3.535 3.536a.25.25 0 010 .353l-3.535 3.536a.25.25 0 01-.354 0l-3.536-3.536a.25.25 0 010-.353z"/><path d="M1 10a9 9 0 0117.043-4.043A9 9 0 115.957 18.043 9 9 0 011 10zm9-7.5a7.5 7.5 0 100 15 7.5 7.5 0 000-15zm9 7.5c0-.594-.058-1.174-.167-1.736A7.5 7.5 0 118.264 18.833 9 9 0 0019 10z"/></g></symbol><symbol id="flight-token-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M5.791 3.318L3.316 5.793a1 1 0 000 1.414l2.475 2.475a1 1 0 001.415 0L9.68 7.207a1 1 0 000-1.414L7.206 3.318a1 1 0 00-1.415 0zm.707 4.95L4.731 6.5l1.767-1.768L8.266 6.5 6.498 8.268z"/><path d="M0 6.5a6.5 6.5 0 0112.346-2.845 6.5 6.5 0 11-8.691 8.691A6.5 6.5 0 010 6.5zm6.5-5a5 5 0 100 10 5 5 0 000-10zm6.5 5c0-.201-.01-.4-.027-.597a5 5 0 11-7.07 7.07A6.5 6.5 0 0013 6.5z"/></g></symbol><symbol id="flight-tools-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M7 6V4.75A2.75 2.75 0 019.75 2h4.5A2.75 2.75 0 0117 4.75V6h.422c.729 0 1.428.29 1.944.805l2.829 2.829A2.75 2.75 0 0123 11.578v7.672A2.75 2.75 0 0120.25 22H3.75A2.75 2.75 0 011 19.25v-7.672c0-.729.29-1.428.805-1.944l2.829-2.829A2.75 2.75 0 016.578 6H7zm1.5-1.25c0-.69.56-1.25 1.25-1.25h4.5c.69 0 1.25.56 1.25 1.25V6h-7V4.75zM6.578 7.5c-.331 0-.649.132-.883.366l-2.829 2.829a1.25 1.25 0 00-.366.883V13H9v-.75c0-.69.56-1.25 1.25-1.25h3.5c.69 0 1.25.56 1.25 1.25V13h6.5v-1.422c0-.331-.132-.649-.366-.883l-2.829-2.829a1.25 1.25 0 00-.883-.366H6.578zM15 15.75V14.5h6.5v4.75c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V14.5H9v1.25c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25zm-4.5-3.25v3h3v-3h-3z" clip-rule="evenodd"/></symbol><symbol id="flight-tools-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M5 3v-.75A2.25 2.25 0 017.25 0h1.5A2.25 2.25 0 0111 2.25V3h.79a2.25 2.25 0 011.609.678l1.96 2.007c.411.42.641.985.641 1.573v5.492A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75V7.258c0-.588.23-1.152.64-1.573l1.961-2.007A2.25 2.25 0 014.211 3H5zm1.5-.75a.75.75 0 01.75-.75h1.5a.75.75 0 01.75.75V3h-3v-.75zM3.674 4.726a.75.75 0 01.537-.226h7.578a.75.75 0 01.537.226l1.96 2.008a.75.75 0 01.214.524V8h-4v-.25c0-.69-.56-1.25-1.25-1.25h-2.5c-.69 0-1.25.56-1.25 1.25V8h-4v-.742a.75.75 0 01.213-.524l1.961-2.008zM5.5 9.5h-4v3.25c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75V9.5h-4v.25c0 .69-.56 1.25-1.25 1.25h-2.5c-.69 0-1.25-.56-1.25-1.25V9.5zm1.5 0V8h2v1.5H7z" clip-rule="evenodd"/></symbol><symbol id="flight-top-24" viewBox="0 0 24 24"><g><path d="M3.5 3.5a.75.75 0 010-1.5H20a.75.75 0 010 1.5H3.5zM4.98 13.79a.75.75 0 001.06-.02L11 8.612V21.25a.75.75 0 001.5 0V8.612l4.96 5.158a.75.75 0 101.08-1.04l-6.25-6.5a.75.75 0 00-1.08 0l-6.25 6.5a.75.75 0 00.02 1.06z"/></g></symbol><symbol id="flight-top-16" viewBox="0 0 16 16"><g><path d="M2.5 2.5a.75.75 0 010-1.5H13a.75.75 0 010 1.5H2.5zM2.985 9.795a.75.75 0 001.06-.03L7 6.636v7.614a.75.75 0 001.5 0V6.636l2.955 3.129a.75.75 0 001.09-1.03l-4.25-4.5a.75.75 0 00-1.09 0l-4.25 4.5a.75.75 0 00.03 1.06z"/></g></symbol><symbol id="flight-trash-24" viewBox="0 0 24 24"><g><path d="M9.75 9a.75.75 0 01.75.75v8.5a.75.75 0 01-1.5 0v-8.5A.75.75 0 019.75 9zM15 9.75a.75.75 0 00-1.5 0v8.5a.75.75 0 001.5 0v-8.5z"/><path fill-rule="evenodd" d="M7 5V3.75A2.75 2.75 0 019.75 1h4.5A2.75 2.75 0 0117 3.75V5h4.25a.75.75 0 010 1.5H20v13.75A2.75 2.75 0 0117.25 23H6.75A2.75 2.75 0 014 20.25V6.5H2.75a.75.75 0 010-1.5H7zm1.5-1.25c0-.69.56-1.25 1.25-1.25h4.5c.69 0 1.25.56 1.25 1.25V5h-7V3.75zm-3 2.75v13.75c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25V6.5h-13z" clip-rule="evenodd"/></g></symbol><symbol id="flight-trash-16" viewBox="0 0 16 16"><g><path d="M6.25 6a.75.75 0 01.75.75v5.5a.75.75 0 01-1.5 0v-5.5A.75.75 0 016.25 6zM10.5 6.75a.75.75 0 00-1.5 0v5.5a.75.75 0 001.5 0v-5.5z"/><path fill-rule="evenodd" d="M4 3v-.75A2.25 2.25 0 016.25 0h3.5A2.25 2.25 0 0112 2.25V3h2.25a.75.75 0 010 1.5H14v9.25A2.25 2.25 0 0111.75 16h-7.5A2.25 2.25 0 012 13.75V4.5h-.25a.75.75 0 010-1.5H4zm1.5-.75a.75.75 0 01.75-.75h3.5a.75.75 0 01.75.75V3h-5v-.75zm-2 2.25v9.25c0 .414.336.75.75.75h7.5a.75.75 0 00.75-.75V4.5h-9z" clip-rule="evenodd"/></g></symbol><symbol id="flight-trend-down-24" viewBox="0 0 24 24"><path d="M1.28 5.22A.75.75 0 00.22 6.28l7.5 7.5a.75.75 0 001.005.05L13.7 9.76l7.74 7.74h-4.69a.75.75 0 000 1.5h6.5a.75.75 0 00.75-.75v-6.5a.75.75 0 00-1.5 0v4.69l-8.22-8.22a.75.75 0 00-1.005-.05L8.3 12.24 1.28 5.22z"/></symbol><symbol id="flight-trend-down-16" viewBox="0 0 16 16"><path d="M1.28 3.22A.75.75 0 00.22 4.28l4.5 4.5a.75.75 0 00.894.126l3.96-2.2L13.6 11.5H10.75a.75.75 0 000 1.5h4.5a.75.75 0 00.75-.75v-4.5a.75.75 0 00-1.5 0v2.489l-4.176-4.971a.75.75 0 00-.938-.174L5.38 7.32l-4.1-4.1z"/></symbol><symbol id="flight-trend-up-24" viewBox="0 0 24 24"><path d="M24 12.25a.75.75 0 01-1.5 0V7.56l-8.22 8.22a.75.75 0 01-1.005.05L8.3 11.76l-7.02 7.02a.75.75 0 01-1.06-1.06l7.5-7.5a.75.75 0 011.005-.05l4.975 4.07 7.74-7.74h-4.69a.75.75 0 010-1.5h6.5a.75.75 0 01.75.75v6.5z"/></symbol><symbol id="flight-trend-up-16" viewBox="0 0 16 16"><path d="M16 8.25a.75.75 0 01-1.5 0V5.761l-4.176 4.971a.75.75 0 01-.938.174L5.38 8.68l-4.1 4.1a.75.75 0 01-1.06-1.06l4.5-4.5a.75.75 0 01.894-.126l3.96 2.2L13.6 4.5H10.75a.75.75 0 010-1.5h4.5a.75.75 0 01.75.75v4.5z"/></symbol><symbol id="flight-triangle-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M10.658 2.366a2.651 2.651 0 012.684 0c.407.239.745.581.984.99l.002.004 8.315 14.46a2.86 2.86 0 01.008 2.758 2.757 2.757 0 01-.976 1.03c-.41.25-.877.386-1.357.392H3.682a2.653 2.653 0 01-1.357-.393 2.757 2.757 0 01-.975-1.029 2.86 2.86 0 01.007-2.758l.006-.01 8.31-14.45.001-.004a2.75 2.75 0 01.984-.99zm.313 1.744v.001L2.665 18.552a1.36 1.36 0 000 1.306c.108.198.262.36.443.47.18.11.382.169.586.172h16.61c.204-.003.406-.061.586-.172.181-.11.335-.272.444-.47a1.361 1.361 0 00-.001-1.306L13.03 4.112l-.001-.002a1.25 1.25 0 00-.446-.45 1.151 1.151 0 00-1.166 0 1.25 1.25 0 00-.446.45z" clip-rule="evenodd"/></symbol><symbol id="flight-triangle-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M6.978 1.515a2.101 2.101 0 012.807.731l.002.004 5.681 9.383a2.065 2.065 0 01-.751 2.832c-.314.183-.67.281-1.034.285H2.317a2.101 2.101 0 01-1.791-1.045 2.065 2.065 0 01.006-2.072l.006-.01L6.213 2.25l.002-.004c.187-.305.45-.557.763-.73zm.517 1.514l-.001.001-5.67 9.363a.565.565 0 00.214.776c.088.051.189.08.292.081h11.34a.601.601 0 00.504-.294.564.564 0 00.001-.563L8.506 3.03V3.03A.584.584 0 008 2.75a.601.601 0 00-.505.279z" clip-rule="evenodd"/></symbol><symbol id="flight-triangle-fill-24" viewBox="0 0 24 24"><path d="M12 2c-.472 0-.934.127-1.342.366a2.75 2.75 0 00-.984.99l.648.378-.65-.374-8.31 14.45-.005.01a2.86 2.86 0 00-.007 2.758c.23.423.566.778.975 1.03.41.25.877.386 1.357.392h16.637c.479-.006.947-.142 1.356-.393.41-.25.744-.606.976-1.029a2.86 2.86 0 00-.008-2.758L14.328 3.36l-.002-.004a2.75 2.75 0 00-.984-.99A2.651 2.651 0 0012 2z"/></symbol><symbol id="flight-triangle-fill-16" viewBox="0 0 16 16"><path d="M8 1.25a2.101 2.101 0 00-1.785.996l.64.392-.642-.388-5.675 9.373-.006.01a2.065 2.065 0 00.751 2.832c.314.183.67.281 1.034.285h11.366a2.101 2.101 0 001.791-1.045 2.064 2.064 0 00-.006-2.072L9.788 2.25l-.003-.004A2.084 2.084 0 008 1.25z"/></symbol><symbol id="flight-truck-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M0 4.75A2.75 2.75 0 012.75 2h11.5A2.75 2.75 0 0117 4.75V6h1.245c.74 0 1.447.297 1.965.825l3.004 3.067A2.75 2.75 0 0124 11.817v3.433A1.75 1.75 0 0122.25 17h-1.014a3 3 0 11-4.472 0H7.236a3 3 0 11-4.472 0H1.75A1.75 1.75 0 010 15.25V4.75zm15.5 0c0-.69-.56-1.25-1.25-1.25H2.75c-.69 0-1.25.56-1.25 1.25v10.5c0 .138.112.25.25.25H15.5V4.75zM17 15.5v-8h1.245c.336 0 .658.135.893.375l3.005 3.067c.229.233.357.547.357.874v3.434a.25.25 0 01-.25.25H17zm-12 2a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM17.5 19a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/></symbol><symbol id="flight-truck-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h7a2.25 2.25 0 012.25 2.25v.328h.643a2.25 2.25 0 011.565.634l1.608 1.557A2.25 2.25 0 0116 7.385v2.865A1.75 1.75 0 0114.292 12a2.5 2.5 0 11-4.584 0H6.292a2.5 2.5 0 11-4.584 0A1.75 1.75 0 010 10.25v-7zM12 12a1 1 0 100 2 1 1 0 000-2zm2.25-1.5a.25.25 0 00.25-.25V7.385a.75.75 0 00-.228-.538l-1.608-1.558a.75.75 0 00-.521-.211H11.5V10.5h2.75zm-4.25 0H1.75a.25.25 0 01-.25-.25v-7a.75.75 0 01.75-.75h7a.75.75 0 01.75.75v7.25zM3 13a1 1 0 112 0 1 1 0 01-2 0z" clip-rule="evenodd"/></symbol><symbol id="flight-tv-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M9.379 1.341a.75.75 0 10-1.258.818L10.618 6H3.75A2.75 2.75 0 001 8.75v11.5A2.75 2.75 0 003.75 23h16.5A2.75 2.75 0 0023 20.25V8.75A2.75 2.75 0 0020.25 6h-6.868l2.497-3.841a.75.75 0 00-1.258-.818L12 5.374 9.379 1.34zm2.61 6.159a.725.725 0 00.022 0h8.239c.69 0 1.25.56 1.25 1.25v11.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V8.75c0-.69.56-1.25 1.25-1.25h8.239z" clip-rule="evenodd"/></symbol><symbol id="flight-tv-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M6.624.334a.75.75 0 00-1.248.832L6.599 3H2.25A2.25 2.25 0 000 5.25v7.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-7.5A2.25 2.25 0 0013.75 3H9.401l1.223-1.834A.75.75 0 109.376.334L8 2.398 6.624.334zM7.989 4.5a.798.798 0 00.022 0h5.739a.75.75 0 01.75.75v7.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75v-7.5a.75.75 0 01.75-.75h5.739z" clip-rule="evenodd"/></symbol><symbol id="flight-type-24" viewBox="0 0 24 24"><path d="M3 3.75A.75.75 0 013.75 3h16a.75.75 0 01.75.75v2.5a.75.75 0 01-1.5 0V4.5h-6.5v15h2a.75.75 0 010 1.5H9a.75.75 0 010-1.5h2v-15H4.5v1.75a.75.75 0 01-1.5 0v-2.5z"/></symbol><symbol id="flight-type-16" viewBox="0 0 16 16"><path d="M2 2.75A.75.75 0 012.75 2h10a.75.75 0 01.75.75v1.5a.75.75 0 01-1.5 0V3.5H8.5v9H10a.75.75 0 010 1.5H5.5a.75.75 0 010-1.5H7v-9H3.5v.75a.75.75 0 01-1.5 0v-1.5z"/></symbol><symbol id="flight-unfold-open-24" viewBox="0 0 24 24"><g><path d="M12 2a.75.75 0 01.543.232l5.25 5.5a.75.75 0 11-1.085 1.036L12 3.836 7.293 8.768a.75.75 0 01-1.086-1.036l5.25-5.5A.75.75 0 0112 2zM12 22a.75.75 0 00.543-.232l5.25-5.5a.75.75 0 00-1.085-1.036L12 20.164l-4.707-4.932a.75.75 0 00-1.086 1.036l5.25 5.5A.75.75 0 0012 22zM1.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM6.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM11.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM16.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM21.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5z"/></g></symbol><symbol id="flight-unfold-open-16" viewBox="0 0 16 16"><g><path d="M8 1a.75.75 0 01.55.24l3.25 3.5a.75.75 0 11-1.1 1.02L8 2.852 5.3 5.76a.75.75 0 01-1.1-1.02l3.25-3.5A.75.75 0 018 1zM8 15a.75.75 0 00.55-.24l3.25-3.5a.75.75 0 10-1.1-1.02L8 13.148 5.3 10.24a.75.75 0 10-1.1 1.02l3.25 3.5A.75.75 0 008 15zM1.75 7.124a.626.626 0 100 1.253h.5a.627.627 0 000-1.253h-.5zM4.75 7.124a.626.626 0 100 1.253h.5a.627.627 0 000-1.253h-.5zM7.75 7.124a.626.626 0 100 1.253h.5a.627.627 0 000-1.253h-.5zM10.75 7.124a.627.627 0 000 1.253h.5a.627.627 0 000-1.253h-.5zM13.75 7.124a.627.627 0 000 1.253h.5a.627.627 0 000-1.253h-.5z"/></g></symbol><symbol id="flight-unfold-close-24" viewBox="0 0 24 24"><g><path d="M12 9a.75.75 0 00.543-.232l5.25-5.5a.75.75 0 10-1.085-1.036L12 7.164 7.293 2.232a.75.75 0 00-1.086 1.036l5.25 5.5A.75.75 0 0012 9zM12 15a.75.75 0 01.543.232l5.25 5.5a.75.75 0 01-1.085 1.036L12 16.836l-4.707 4.932a.75.75 0 01-1.086-1.036l5.25-5.5A.75.75 0 0112 15zM1.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM6.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM11.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM16.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM21.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5z"/></g></symbol><symbol id="flight-unfold-close-16" viewBox="0 0 16 16"><g><path d="M8 6a.75.75 0 00.55-.24l3.25-3.5a.75.75 0 10-1.1-1.02L8 4.148 5.3 1.24a.75.75 0 00-1.1 1.02l3.25 3.5A.75.75 0 008 6zM8 10a.75.75 0 01.55.24l3.25 3.5a.75.75 0 11-1.1 1.02L8 11.852 5.3 14.76a.75.75 0 11-1.1-1.02l3.25-3.5A.75.75 0 018 10zM1.75 7.124a.626.626 0 100 1.253h.5a.627.627 0 000-1.253h-.5zM4.75 7.124a.626.626 0 100 1.253h.5a.627.627 0 000-1.253h-.5zM7.75 7.124a.626.626 0 100 1.253h.5a.627.627 0 000-1.253h-.5zM10.75 7.124a.627.627 0 000 1.253h.5a.627.627 0 000-1.253h-.5zM13.75 7.124a.627.627 0 000 1.253h.5a.627.627 0 000-1.253h-.5z"/></g></symbol><symbol id="flight-unlock-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M14.805 3.758A4.636 4.636 0 0118 2.5c1.205 0 2.354.456 3.195 1.258.84.8 1.305 1.877 1.305 2.992a.75.75 0 001.5 0 5.632 5.632 0 00-1.77-4.079A6.136 6.136 0 0018 1c-1.58 0-3.102.597-4.23 1.671A5.632 5.632 0 0012 6.75V10H3.75A2.75 2.75 0 001 12.75v7.5A2.75 2.75 0 003.75 23h10.5A2.75 2.75 0 0017 20.25v-7.5A2.75 2.75 0 0014.25 10h-.75V6.75c0-1.115.465-2.192 1.305-2.992zM3.75 11.5c-.69 0-1.25.56-1.25 1.25v7.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25v-7.5c0-.69-.56-1.25-1.25-1.25H3.75z" clip-rule="evenodd"/></symbol><symbol id="flight-unlock-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M10.239 2.25A2.46 2.46 0 0112 1.5c.657 0 1.29.267 1.761.75.471.483.739 1.142.739 1.833a.75.75 0 001.5 0 4.127 4.127 0 00-1.165-2.88A3.96 3.96 0 0012 0a3.96 3.96 0 00-2.835 1.203A4.127 4.127 0 008 4.083V5H2.25A2.25 2.25 0 000 7.25v5.5A2.25 2.25 0 002.25 15h7.5A2.25 2.25 0 0012 12.75v-5.5A2.25 2.25 0 009.75 5H9.5v-.917c0-.69.268-1.35.739-1.833zm-8.739 5a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75v5.5a.75.75 0 01-.75.75h-7.5a.75.75 0 01-.75-.75v-5.5z" clip-rule="evenodd"/></symbol><symbol id="flight-upload-24" viewBox="0 0 24 24"><g><path d="M6.232 8.793a.75.75 0 001.06-.025l3.958-4.146V15.25a.75.75 0 001.5 0V4.622l3.957 4.146a.75.75 0 001.085-1.036l-5.25-5.5a.747.747 0 00-1.086.001l-5.249 5.5a.75.75 0 00.025 1.06z"/><path d="M2.75 14a.75.75 0 01.75.75v4.5c0 .69.56 1.25 1.25 1.25h14.5c.69 0 1.25-.56 1.25-1.25v-4.5a.75.75 0 011.5 0v4.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25v-4.5a.75.75 0 01.75-.75z"/></g></symbol><symbol id="flight-upload-16" viewBox="0 0 16 16"><g><path d="M4.24 5.8a.75.75 0 001.06-.04l1.95-2.1v6.59a.75.75 0 001.5 0V3.66l1.95 2.1a.75.75 0 101.1-1.02l-3.25-3.5a.75.75 0 00-1.101.001L4.2 4.74a.75.75 0 00.04 1.06z"/><path d="M1.75 9a.75.75 0 01.75.75v3c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75v-3a.75.75 0 011.5 0v3A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-3A.75.75 0 011.75 9z"/></g></symbol><symbol id="flight-user-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M12 3a5 5 0 100 10 5 5 0 000-10zM8.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z" clip-rule="evenodd"/><path d="M7.75 14.5A4.75 4.75 0 003 19.25v1a.75.75 0 001.5 0v-1A3.25 3.25 0 017.75 16h8.5a3.25 3.25 0 013.25 3.25v1a.75.75 0 001.5 0v-1a4.75 4.75 0 00-4.75-4.75h-8.5z"/></g></symbol><symbol id="flight-user-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M8 1a4 4 0 100 8 4 4 0 000-8zM5.5 5a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z" clip-rule="evenodd"/><path d="M5.25 10a3.75 3.75 0 00-3.75 3.75v.5a.75.75 0 001.5 0v-.5a2.25 2.25 0 012.25-2.25h5.5A2.25 2.25 0 0113 13.75v.5a.75.75 0 001.5 0v-.5A3.75 3.75 0 0010.75 10h-5.5z"/></g></symbol><symbol id="flight-user-check-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M9 3a5 5 0 100 10A5 5 0 009 3zM5.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z" clip-rule="evenodd"/><path d="M4.75 14.5A4.75 4.75 0 000 19.25v1a.75.75 0 001.5 0v-1A3.25 3.25 0 014.75 16h8.5a3.25 3.25 0 013.25 3.25v1a.75.75 0 001.5 0v-1a4.75 4.75 0 00-4.75-4.75h-8.5zM23.28 8.72a.75.75 0 010 1.06l-4 4a.75.75 0 01-1.06 0l-2-2a.75.75 0 111.06-1.06l1.47 1.47 3.47-3.47a.75.75 0 011.06 0z"/></g></symbol><symbol id="flight-user-check-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M6 2a3.5 3.5 0 100 7 3.5 3.5 0 000-7zM4 5.5a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/><path d="M4.25 10A3.75 3.75 0 00.5 13.75v.5a.75.75 0 001.5 0v-.5a2.25 2.25 0 012.25-2.25h3.5A2.25 2.25 0 0110 13.75v.5a.75.75 0 001.5 0v-.5A3.75 3.75 0 007.75 10h-3.5zM14.78 6.22a.75.75 0 010 1.06l-2.5 2.5a.75.75 0 01-1.06 0l-1-1a.75.75 0 111.06-1.06l.47.47 1.97-1.97a.75.75 0 011.06 0z"/></g></symbol><symbol id="flight-user-circle-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M12 4.5a4.5 4.5 0 100 9 4.5 4.5 0 000-9zM9 9a3 3 0 116 0 3 3 0 01-6 0z"/><path d="M.25 12C.25 5.51 5.51.25 12 .25S23.75 5.51 23.75 12 18.49 23.75 12 23.75.25 18.49.25 12zM12 1.75C6.34 1.75 1.75 6.34 1.75 12c0 2.298.756 4.42 2.034 6.13A4.752 4.752 0 018.25 15h7.5a4.752 4.752 0 014.466 3.13A10.204 10.204 0 0022.25 12c0-5.66-4.59-10.25-10.25-10.25zm0 20.5c-2.702 0-5.16-1.045-6.99-2.753A3.25 3.25 0 018.25 16.5h7.5a3.25 3.25 0 013.24 2.997A10.214 10.214 0 0112 22.25z"/></g></symbol><symbol id="flight-user-circle-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path d="M8 3a3 3 0 100 6 3 3 0 000-6zM6.5 6a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z"/><path d="M.25 8a7.75 7.75 0 1115.5 0A7.75 7.75 0 01.25 8zM8 1.75a6.25 6.25 0 00-5.274 9.604c.15-.194.325-.369.514-.533C3.855 10.286 4.67 10 5.5 10h5c.83 0 1.645.286 2.26.82.189.165.365.34.514.534A6.25 6.25 0 008 1.75zm0 12.5a6.228 6.228 0 01-4.238-1.656c.035-.196.153-.372.462-.641.323-.281.78-.453 1.276-.453h5c.495 0 .953.172 1.276.453.31.269.427.445.462.641A6.228 6.228 0 018 14.25z"/></g></symbol><symbol id="flight-user-circle-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M.25 12C.25 5.51 5.51.25 12 .25S23.75 5.51 23.75 12 18.49 23.75 12 23.75.25 18.49.25 12zM4 18a4 4 0 014-4h8a4 4 0 014 4v.25a.75.75 0 01-1.5 0V18a2.5 2.5 0 00-2.5-2.5H8A2.5 2.5 0 005.5 18v.25a.75.75 0 01-1.5 0V18zM9 8a3 3 0 116 0 3 3 0 01-6 0zm3-4.5a4.5 4.5 0 100 9 4.5 4.5 0 000-9z" clip-rule="evenodd"/></symbol><symbol id="flight-user-circle-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M.25 8a7.75 7.75 0 1115.5 0A7.75 7.75 0 01.25 8zm3.19 1.833A3.24 3.24 0 015.624 9h4.75a3.24 3.24 0 012.186.833c.528.484.939 1.048.939 1.917a.75.75 0 01-1.5 0c0-.284-.09-.478-.452-.81-.3-.275-.722-.44-1.173-.44h-4.75c-.451 0-.872.165-1.173.44-.363.332-.452.526-.452.81a.75.75 0 01-1.5 0c0-.869.411-1.433.94-1.917zM6.5 5a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0zM8 2a3 3 0 100 6 3 3 0 000-6z" clip-rule="evenodd"/></symbol><symbol id="flight-user-minus-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M4 8a5 5 0 1110 0A5 5 0 014 8zm5-3.5a3.5 3.5 0 100 7 3.5 3.5 0 000-7z" clip-rule="evenodd"/><path d="M0 19.25a4.75 4.75 0 014.75-4.75h8.5A4.75 4.75 0 0118 19.25v1a.75.75 0 01-1.5 0v-1A3.25 3.25 0 0013.25 16h-8.5a3.25 3.25 0 00-3.25 3.25v1a.75.75 0 01-1.5 0v-1zM16.75 10.5a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5z"/></g></symbol><symbol id="flight-user-minus-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M2.5 5.5a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0zm3.5-2a2 2 0 100 4 2 2 0 000-4z" clip-rule="evenodd"/><path d="M.5 13.75A3.75 3.75 0 014.25 10h3.5a3.75 3.75 0 013.75 3.75v.5a.75.75 0 01-1.5 0v-.5a2.25 2.25 0 00-2.25-2.25h-3.5A2.25 2.25 0 002 13.75v.5a.75.75 0 01-1.5 0v-.5zM11.25 7.5a.75.75 0 000 1.5h3.5a.75.75 0 000-1.5h-3.5z"/></g></symbol><symbol id="flight-user-plus-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M9 3a5 5 0 100 10A5 5 0 009 3zM5.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z" clip-rule="evenodd"/><path d="M4.75 14.5A4.75 4.75 0 000 19.25v1a.75.75 0 001.5 0v-1A3.25 3.25 0 014.75 16h8.5a3.25 3.25 0 013.25 3.25v1a.75.75 0 001.5 0v-1a4.75 4.75 0 00-4.75-4.75h-8.5zM15.75 11.25a.75.75 0 01.75-.75h2v-2a.75.75 0 011.5 0v2h2a.75.75 0 010 1.5h-2v2a.75.75 0 01-1.5 0v-2h-2a.75.75 0 01-.75-.75z"/></g></symbol><symbol id="flight-user-plus-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M6 2a3.5 3.5 0 100 7 3.5 3.5 0 000-7zM4 5.5a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/><path d="M4.25 10A3.75 3.75 0 00.5 13.75v.5a.75.75 0 001.5 0v-.5a2.25 2.25 0 012.25-2.25h3.5A2.25 2.25 0 0110 13.75v.5a.75.75 0 001.5 0v-.5A3.75 3.75 0 007.75 10h-3.5zM10.25 8.25A.75.75 0 0111 7.5h1v-1a.75.75 0 011.5 0v1h1a.75.75 0 010 1.5h-1v1a.75.75 0 01-1.5 0V9h-1a.75.75 0 01-.75-.75z"/></g></symbol><symbol id="flight-user-x-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M9 3a5 5 0 100 10A5 5 0 009 3zM5.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z" clip-rule="evenodd"/><path d="M4.75 14.5A4.75 4.75 0 000 19.25v1a.75.75 0 001.5 0v-1A3.25 3.25 0 014.75 16h8.5a3.25 3.25 0 013.25 3.25v1a.75.75 0 001.5 0v-1a4.75 4.75 0 00-4.75-4.75h-8.5zM16.22 8.22a.75.75 0 011.06 0L19 9.94l1.72-1.72a.75.75 0 111.06 1.06L20.06 11l1.72 1.72a.75.75 0 11-1.06 1.06L19 12.06l-1.72 1.72a.75.75 0 11-1.06-1.06L17.94 11l-1.72-1.72a.75.75 0 010-1.06z"/></g></symbol><symbol id="flight-user-x-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M6 2a3.5 3.5 0 100 7 3.5 3.5 0 000-7zM4 5.5a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/><path d="M4.25 10A3.75 3.75 0 00.5 13.75v.5a.75.75 0 001.5 0v-.5a2.25 2.25 0 012.25-2.25h3.5A2.25 2.25 0 0110 13.75v.5a.75.75 0 001.5 0v-.5A3.75 3.75 0 007.75 10h-3.5zM11.22 5.22a.75.75 0 011.06 0l1.22 1.22 1.22-1.22a.75.75 0 111.06 1.06L14.56 7.5l1.22 1.22a.75.75 0 01-1.06 1.06L13.5 8.56l-1.22 1.22a.75.75 0 11-1.06-1.06l1.22-1.22-1.22-1.22a.75.75 0 010-1.06z"/></g></symbol><symbol id="flight-users-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M9 3a5 5 0 100 10A5 5 0 009 3zM5.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z" clip-rule="evenodd"/><path d="M4.75 14.5A4.75 4.75 0 000 19.25v1a.75.75 0 001.5 0v-1A3.25 3.25 0 014.75 16h8.5a3.25 3.25 0 013.25 3.25v1a.75.75 0 001.5 0v-1a4.75 4.75 0 00-4.75-4.75h-8.5zM18.25 15.25a.75.75 0 01.75-.75h.25A4.75 4.75 0 0124 19.25v1a.75.75 0 01-1.5 0v-1A3.25 3.25 0 0019.25 16H19a.75.75 0 01-.75-.75zM15 3a.75.75 0 000 1.5 3.5 3.5 0 110 7 .75.75 0 000 1.5 5 5 0 000-10z"/></g></symbol><symbol id="flight-users-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M6 2a3.5 3.5 0 100 7 3.5 3.5 0 000-7zM4 5.5a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/><path d="M4.25 10A3.75 3.75 0 00.5 13.75v.5a.75.75 0 001.5 0v-.5a2.25 2.25 0 012.25-2.25h3.5A2.25 2.25 0 0110 13.75v.5a.75.75 0 001.5 0v-.5A3.75 3.75 0 007.75 10h-3.5zM11.25 10.75A.75.75 0 0112 10h.25a3.25 3.25 0 013.25 3.25v1a.75.75 0 01-1.5 0v-1a1.75 1.75 0 00-1.75-1.75H12a.75.75 0 01-.75-.75zM11.273 2.24a.75.75 0 00-.546 1.396 2.001 2.001 0 010 3.728.75.75 0 00.546 1.397 3.501 3.501 0 000-6.522z"/></g></symbol><symbol id="flight-verified-24" viewBox="0 0 24 24"><g><path d="M16.78 8.22a.75.75 0 010 1.06l-6.5 6.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 5.97-5.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M9.82 1.635a3.75 3.75 0 014.36 0l1.193.853c.278.198.597.33.934.387l1.492.252a3.75 3.75 0 013.074 3.074l.252 1.492c.056.337.189.656.387.934l.853 1.193a3.75 3.75 0 010 4.36l-.853 1.193a2.248 2.248 0 00-.387.934l-.252 1.492a3.75 3.75 0 01-3.074 3.073l-1.492.252a2.25 2.25 0 00-.934.388l-1.193.853a3.75 3.75 0 01-4.36 0l-1.193-.853a2.25 2.25 0 00-.934-.388l-1.492-.252A3.75 3.75 0 013.127 17.8l-.251-1.492a2.25 2.25 0 00-.388-.934l-.853-1.193a3.75 3.75 0 010-4.36l.853-1.193a2.25 2.25 0 00.388-.934l.251-1.492a3.75 3.75 0 013.074-3.074l1.492-.252a2.25 2.25 0 00.934-.387l1.193-.853zm3.488 1.22a2.25 2.25 0 00-2.616 0L9.5 3.709a3.75 3.75 0 01-1.556.646l-1.492.252A2.25 2.25 0 004.606 6.45l-.251 1.493a3.75 3.75 0 01-.647 1.555l-.852 1.194a2.25 2.25 0 000 2.616l.852 1.193c.331.463.552.995.647 1.556l.251 1.492c.16.945.9 1.685 1.845 1.844l1.492.252c.56.095 1.093.316 1.556.646l1.193.853a2.25 2.25 0 002.616 0l1.193-.852c.463-.331.995-.552 1.556-.647l1.492-.252a2.25 2.25 0 001.845-1.844l.252-1.492a3.75 3.75 0 01.646-1.556l.852-1.193a2.25 2.25 0 000-2.616l-.852-1.194a3.75 3.75 0 01-.647-1.555l-.251-1.493a2.25 2.25 0 00-1.845-1.844l-1.492-.252a3.75 3.75 0 01-1.556-.646l-1.193-.852z" clip-rule="evenodd"/></g></symbol><symbol id="flight-verified-16" viewBox="0 0 16 16"><g><path d="M11.28 5.72a.75.75 0 010 1.06l-4 4a.75.75 0 01-1.06 0l-1.5-1.5a.75.75 0 011.06-1.06l.97.97 3.47-3.47a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M6.402 1.22a2.75 2.75 0 013.196 0l.69.493c.154.11.332.184.519.215l.865.146a2.75 2.75 0 012.254 2.254l.146.866c.031.187.105.364.215.518l.493.69a2.75 2.75 0 010 3.197l-.493.69c-.11.154-.184.33-.215.518l-.146.865a2.75 2.75 0 01-2.254 2.254l-.865.146a1.25 1.25 0 00-.519.216l-.69.492a2.75 2.75 0 01-3.196 0l-.69-.492a1.25 1.25 0 00-.519-.216l-.865-.146a2.75 2.75 0 01-2.254-2.254l-.146-.865a1.25 1.25 0 00-.215-.519l-.493-.69a2.75 2.75 0 010-3.196l.493-.69a1.25 1.25 0 00.215-.518l.146-.866a2.75 2.75 0 012.254-2.254l.865-.146a1.25 1.25 0 00.519-.215l.69-.493zm2.324 1.22a1.25 1.25 0 00-1.453 0l-.69.493a2.75 2.75 0 01-1.14.474l-.865.146a1.25 1.25 0 00-1.025 1.025l-.146.865a2.75 2.75 0 01-.474 1.141l-.492.69a1.25 1.25 0 000 1.453l.492.69c.243.339.405.729.474 1.14l.146.865c.089.525.5.936 1.025 1.025l.865.146c.411.07.801.232 1.14.474l.69.493a1.25 1.25 0 001.454 0l.69-.493a2.75 2.75 0 011.14-.474l.865-.146a1.25 1.25 0 001.025-1.024l.146-.866a2.75 2.75 0 01.474-1.14l.492-.69a1.25 1.25 0 000-1.453l-.492-.69a2.75 2.75 0 01-.474-1.14l-.146-.866a1.25 1.25 0 00-1.025-1.025l-.865-.146a2.75 2.75 0 01-1.14-.474l-.69-.492z" clip-rule="evenodd"/></g></symbol><symbol id="flight-video-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M0 6.75A2.75 2.75 0 012.75 4h11.5A2.75 2.75 0 0117 6.75v3.138l4.127-3.322C22.264 5.613 24 6.42 24 7.908v8.184c0 1.488-1.738 2.296-2.875 1.34L17 14.078v3.173A2.75 2.75 0 0114.25 20H2.75A2.75 2.75 0 010 17.25V6.75zm17 5.23c0 .103.047.201.127.267l4.95 4.026.011.01a.25.25 0 00.412-.19V7.907a.25.25 0 00-.412-.19l-.014.011-4.945 3.981a.345.345 0 00-.129.27zm-1.5-5.23c0-.69-.56-1.25-1.25-1.25H2.75c-.69 0-1.25.56-1.25 1.25v10.5c0 .69.56 1.25 1.25 1.25h11.5c.69 0 1.25-.56 1.25-1.25V6.75z" clip-rule="evenodd"/></symbol><symbol id="flight-video-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M0 5.25A2.25 2.25 0 012.25 3h6.5A2.25 2.25 0 0111 5.25v.818l3.018-2.09C14.843 3.382 16 3.97 16 4.991v6.018c0 1.021-1.157 1.61-1.982 1.013L11 9.932v.818A2.25 2.25 0 018.75 13h-6.5A2.25 2.25 0 010 10.75v-5.5zM11 8c0 .067.033.13.088.168l3.412 2.363V5.47l-3.412 2.363A.204.204 0 0011 8zM9.5 5.25a.75.75 0 00-.75-.75h-6.5a.75.75 0 00-.75.75v5.5c0 .414.336.75.75.75h6.5a.75.75 0 00.75-.75v-5.5z" clip-rule="evenodd"/></symbol><symbol id="flight-video-off-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M2.28 1.22a.75.75 0 00-1.06 1.06L2.94 4h-.19A2.75 2.75 0 000 6.75v10.5A2.75 2.75 0 002.75 20h11.5c1.271 0 2.34-.862 2.656-2.034l4.814 4.814a.75.75 0 101.06-1.06L2.28 1.22zM15.5 16.56L4.44 5.5H2.75c-.69 0-1.25.56-1.25 1.25v10.5c0 .69.56 1.25 1.25 1.25h11.5c.69 0 1.25-.56 1.25-1.25v-.69z" clip-rule="evenodd"/><path d="M10.5 4a.75.75 0 000 1.5h3.75c.69 0 1.25.56 1.25 1.25v3.514a1.32 1.32 0 002.148 1.028l4.426-3.563.014-.012a.25.25 0 01.412.19v8.185c0 .06-.015.101-.035.133a.253.253 0 01-.096.087.75.75 0 00.708 1.322c.527-.281.923-.84.923-1.542V7.908c0-1.487-1.736-2.295-2.873-1.342L17 9.888V6.75A2.75 2.75 0 0014.25 4H10.5z"/></g></symbol><symbol id="flight-video-off-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M2.28 1.22a.75.75 0 00-1.06 1.06l.738.739A2.25 2.25 0 000 5.25v5.5A2.25 2.25 0 002.25 13h6.5a2.25 2.25 0 001.99-1.2l2.98 2.98a.75.75 0 101.06-1.06L2.28 1.22zm7.22 9.34L3.44 4.5H2.25a.75.75 0 00-.75.75v5.5c0 .414.336.75.75.75h6.5a.75.75 0 00.75-.75v-.19z" clip-rule="evenodd"/><path d="M7.688 3a.75.75 0 000 1.5H8.75a.75.75 0 01.75.75v.733a1.544 1.544 0 002.424 1.27L14.5 5.47v5.54a.75.75 0 001.5 0V4.99c0-1.021-1.157-1.61-1.982-1.013L11.07 6.02a.045.045 0 01-.07-.037V5.25A2.25 2.25 0 008.75 3H7.687z"/></g></symbol><symbol id="flight-volume-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M10.5 6.075a.25.25 0 00-.422-.182l-3.3 3.127a1.75 1.75 0 01-1.204.48H2.75a.25.25 0 00-.25.25v4.5c0 .138.112.25.25.25h2.824c.448 0 .878.171 1.203.48l3.301 3.127a.25.25 0 00.422-.182V6.075zm-1.454-1.27C10.162 3.747 12 4.537 12 6.074v11.85c0 1.536-1.838 2.327-2.954 1.27l-3.3-3.127A.25.25 0 005.574 16H2.75A1.75 1.75 0 011 14.25v-4.5C1 8.783 1.784 8 2.75 8h2.824a.25.25 0 00.172-.069l3.3-3.127z" clip-rule="evenodd"/></symbol><symbol id="flight-volume-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M7.5 4.19L4.524 6.274a1.25 1.25 0 01-.717.226H1.5v3h2.307c.256 0 .506.079.717.226L7.5 11.809V4.19zm-.467-1.504A1.25 1.25 0 019 3.71v8.58a1.25 1.25 0 01-1.967 1.024L3.728 11H1.25C.56 11 0 10.44 0 9.75v-3.5C0 5.56.56 5 1.25 5h2.478l3.305-2.314z" clip-rule="evenodd"/></symbol><symbol id="flight-volume-down-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M12 6.075c0-1.537-1.838-2.327-2.954-1.27l-3.3 3.126A.25.25 0 015.574 8H2.75A1.75 1.75 0 001 9.75v4.5c0 .966.784 1.75 1.75 1.75h2.824a.25.25 0 01.172.068l3.3 3.127c1.116 1.057 2.954.266 2.954-1.27V6.075zm-1.922-.182a.25.25 0 01.422.182v11.85a.25.25 0 01-.422.181l-3.3-3.127a1.75 1.75 0 00-1.204-.48H2.75a.25.25 0 01-.25-.25v-4.5a.25.25 0 01.25-.25h2.824a1.75 1.75 0 001.203-.479l3.301-3.127z" clip-rule="evenodd"/><path d="M16.271 7.96a.75.75 0 10-1.042 1.08A4.118 4.118 0 0116.5 12c0 1.105-.454 2.17-1.271 2.96a.75.75 0 101.042 1.08A5.617 5.617 0 0018 12c0-1.52-.625-2.972-1.729-4.04z"/></g></symbol><symbol id="flight-volume-down-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M9 3.71a1.25 1.25 0 00-1.967-1.024L3.728 5H1.25C.56 5 0 5.56 0 6.25v3.5C0 10.44.56 11 1.25 11h2.478l3.305 2.314A1.25 1.25 0 009 12.29V3.71zM4.524 6.274L7.5 4.19v7.62L4.524 9.725a1.25 1.25 0 00-.717-.226H1.5v-3h2.307c.256 0 .506-.079.717-.226z" clip-rule="evenodd"/><path d="M11.761 5.201A.75.75 0 0010.74 6.3c.494.46.761 1.074.761 1.701s-.267 1.24-.761 1.701A.75.75 0 1011.76 10.8 3.826 3.826 0 0013 8c0-1.06-.453-2.066-1.239-2.799z"/></g></symbol><symbol id="flight-volume-2-24" viewBox="0 0 24 24"><g><path d="M18.72 4.22a.75.75 0 011.06 0 11.009 11.009 0 010 15.56.75.75 0 11-1.06-1.06 9.51 9.51 0 000-13.44.75.75 0 010-1.06z"/><path fill-rule="evenodd" d="M9.046 4.804C10.162 3.748 12 4.538 12 6.074v11.851c0 1.536-1.838 2.327-2.954 1.27l-3.3-3.127A.25.25 0 005.574 16H2.75A1.75 1.75 0 011 14.25v-4.5C1 8.783 1.784 8 2.75 8h2.824a.25.25 0 00.172-.069l3.3-3.127zm1.454 1.27a.25.25 0 00-.422-.18l-3.3 3.126a1.75 1.75 0 01-1.204.48H2.75a.25.25 0 00-.25.25v4.5c0 .138.112.25.25.25h2.824c.448 0 .878.171 1.203.48l3.301 3.127a.25.25 0 00.422-.182V6.075z" clip-rule="evenodd"/><path d="M16.271 7.96a.75.75 0 10-1.042 1.08A4.118 4.118 0 0116.5 12c0 1.105-.454 2.17-1.271 2.96a.75.75 0 101.042 1.08A5.617 5.617 0 0018 12c0-1.52-.625-2.972-1.729-4.04z"/></g></symbol><symbol id="flight-volume-2-16" viewBox="0 0 16 16"><g><path d="M13.242 2.184a.75.75 0 10-.984 1.132C13.709 4.578 14.5 6.266 14.5 8s-.79 3.422-2.242 4.684a.75.75 0 10.984 1.132C14.992 12.293 16 10.204 16 8c0-2.204-1.008-4.293-2.758-5.816z"/><path fill-rule="evenodd" d="M7.033 2.686A1.25 1.25 0 019 3.71v8.58a1.25 1.25 0 01-1.967 1.024L3.728 11H1.25C.56 11 0 10.44 0 9.75v-3.5C0 5.56.56 5 1.25 5h2.478l3.305-2.314zM7.5 4.19L4.524 6.274a1.25 1.25 0 01-.717.226H1.5v3h2.307c.256 0 .506.079.717.226L7.5 11.809V4.19z" clip-rule="evenodd"/><path d="M10.701 5.239a.75.75 0 011.06-.038A3.826 3.826 0 0113 8c0 1.06-.453 2.066-1.239 2.799A.75.75 0 1110.74 9.7c.494-.46.761-1.074.761-1.701s-.267-1.24-.761-1.701a.75.75 0 01-.038-1.06z"/></g></symbol><symbol id="flight-volume-x-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M9.046 4.804C10.162 3.748 12 4.538 12 6.074v11.851c0 1.536-1.838 2.327-2.954 1.27l-3.3-3.127A.25.25 0 005.574 16H2.75A1.75 1.75 0 011 14.25v-4.5C1 8.783 1.784 8 2.75 8h2.824a.25.25 0 00.172-.069l3.3-3.127zm1.454 1.27a.25.25 0 00-.422-.18l-3.3 3.126a1.75 1.75 0 01-1.204.48H2.75a.25.25 0 00-.25.25v4.5c0 .138.112.25.25.25h2.824c.448 0 .878.171 1.203.48l3.301 3.127a.25.25 0 00.422-.182V6.075z" clip-rule="evenodd"/><path d="M22.78 8.22a.75.75 0 010 1.06L20.06 12l2.72 2.72a.75.75 0 11-1.06 1.06L19 13.06l-2.72 2.72a.75.75 0 11-1.06-1.06L17.94 12l-2.72-2.72a.75.75 0 011.06-1.06L19 10.94l2.72-2.72a.75.75 0 011.06 0z"/></g></symbol><symbol id="flight-volume-x-16" viewBox="0 0 16 16"><g><path fill-rule="evenodd" d="M7.033 2.686A1.25 1.25 0 019 3.71v8.58a1.25 1.25 0 01-1.967 1.024L3.728 11H1.25C.56 11 0 10.44 0 9.75v-3.5C0 5.56.56 5 1.25 5h2.478l3.305-2.314zM7.5 4.19L4.524 6.274a1.25 1.25 0 01-.717.226H1.5v3h2.307c.256 0 .506.079.717.226L7.5 11.809V4.19z" clip-rule="evenodd"/><path d="M15.28 5.72a.75.75 0 010 1.06L14.06 8l1.22 1.22a.75.75 0 11-1.06 1.06L13 9.06l-1.22 1.22a.75.75 0 11-1.06-1.06L11.94 8l-1.22-1.22a.75.75 0 011.06-1.06L13 6.94l1.22-1.22a.75.75 0 011.06 0z"/></g></symbol><symbol id="flight-wall-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M3.75 2A2.75 2.75 0 001 4.75v14.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V4.75A2.75 2.75 0 0020.25 2H3.75zM6.5 3.5H3.75c-.69 0-1.25.56-1.25 1.25V8h4V3.5zm-4 6v5H11v-5H2.5zm0 6.5v3.25c0 .69.56 1.25 1.25 1.25H6.5V16h-4zM8 20.5h8V16H8v4.5zm9.5 0h2.75c.69 0 1.25-.56 1.25-1.25V16h-4v4.5zm4-6v-5h-9v5h9zm0-6.5V4.75c0-.69-.56-1.25-1.25-1.25H17.5V8h4zM16 3.5V8H8V3.5h8z" clip-rule="evenodd"/></symbol><symbol id="flight-wall-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-9.5A2.25 2.25 0 0013.75 1H2.25zM4.5 2.5H2.25a.75.75 0 00-.75.75V5h3V2.5zm-3 4v3H7v-3H1.5zm0 4.5v1.75c0 .414.336.75.75.75H4.5V11h-3zM6 13.5h4V11H6v2.5zm5.5 0h2.25a.75.75 0 00.75-.75V11h-3v2.5zm3-4v-3h-6v3h6zm0-4.5V3.25a.75.75 0 00-.75-.75H11.5V5h3zM10 2.5V5H6V2.5h4z" clip-rule="evenodd"/></symbol><symbol id="flight-wand-24" viewBox="0 0 24 24"><g><path d="M18.875 1.15a.75.75 0 00-.975.975l.289.721a.75.75 0 010 .557l-.289.722a.75.75 0 00.975.975l.721-.289a.75.75 0 01.558 0l.721.289a.75.75 0 00.975-.975l-.289-.722a.75.75 0 010-.557l.29-.721a.75.75 0 00-.976-.975l-.721.288a.75.75 0 01-.558 0l-.721-.288zM7.125 1.15a.75.75 0 00-.975.975l.439 1.096a.75.75 0 010 .557L6.15 4.875a.75.75 0 00.975.975l1.096-.439a.75.75 0 01.558 0l1.096.439a.75.75 0 00.975-.975l-.439-1.097a.75.75 0 010-.557l.44-1.096a.75.75 0 00-.976-.975l-1.096.438a.75.75 0 01-.558 0L7.125 1.15z"/><path fill-rule="evenodd" d="M17.017 6.707a2.5 2.5 0 00-3.535 0L2.168 18.021a2.5 2.5 0 003.536 3.535l11.313-11.313a2.5 2.5 0 000-3.536zm-2.474 1.06a1 1 0 111.414 1.415l-1.591 1.591-1.414-1.414 1.59-1.591zM11.89 10.42l1.414 1.415-8.662 8.662a1 1 0 01-1.414-1.414l8.662-8.663z" clip-rule="evenodd"/><path d="M16.108 16.69a.75.75 0 010-1.38l1.334-.57a.75.75 0 00.393-.395l.572-1.333a.75.75 0 011.378 0l.572 1.333a.75.75 0 00.394.394l1.333.572a.75.75 0 010 1.378l-1.333.572a.75.75 0 00-.394.394l-.572 1.333a.75.75 0 01-1.378 0l-.572-1.333a.75.75 0 00-.393-.394l-1.334-.572z"/></g></symbol><symbol id="flight-wand-16" viewBox="0 0 16 16"><g><path d="M4.083.183a.5.5 0 00-.65.65l.393.981a.5.5 0 010 .371l-.393.982a.5.5 0 00.65.65l.981-.393a.5.5 0 01.372 0l.98.392a.5.5 0 00.65-.65l-.392-.98a.5.5 0 010-.372l.393-.981a.5.5 0 00-.65-.65l-.981.392a.5.5 0 01-.372 0l-.98-.392z"/><path fill-rule="evenodd" d="M11.414 4.104a2 2 0 00-2.828 0L.808 11.882a2 2 0 002.828 2.828l7.778-7.778a2 2 0 000-2.828zm-1.768 1.06a.5.5 0 01.708.707l-.884.884-.707-.707.883-.884zM7.702 7.11l.707.707-5.834 5.834a.5.5 0 11-.707-.707l5.834-5.834z" clip-rule="evenodd"/><path d="M10.572 11.21a.5.5 0 010-.92l1.22-.522a.5.5 0 00.262-.262l.522-1.22a.5.5 0 01.92 0l.521 1.22a.5.5 0 00.263.262l1.219.522a.5.5 0 010 .92l-1.219.522a.5.5 0 00-.263.263l-.522 1.218a.5.5 0 01-.919 0l-.522-1.218a.5.5 0 00-.263-.263l-1.219-.522zM12.833.183a.5.5 0 00-.65.65l.293.731a.5.5 0 010 .371l-.293.732a.5.5 0 00.65.65l.731-.293a.5.5 0 01.372 0l.73.292a.5.5 0 00.65-.65l-.292-.73a.5.5 0 010-.372l.293-.731a.5.5 0 00-.65-.65l-.731.292a.5.5 0 01-.372 0l-.73-.292z"/></g></symbol><symbol id="flight-watch-24" viewBox="0 0 24 24"><g><path d="M12.5 8.25a.75.75 0 00-1.5 0v4.25c0 .284.16.544.415.67l2.5 1.25a.75.75 0 10.67-1.34L12.5 12.036V8.25z"/><path fill-rule="evenodd" d="M7.464 2.258A2.75 2.75 0 0110.169 0h3.662a2.75 2.75 0 012.706 2.258l.666 3.665A7.982 7.982 0 0120 12a7.982 7.982 0 01-2.797 6.077l-.666 3.665A2.75 2.75 0 0113.83 24h-3.662a2.75 2.75 0 01-2.705-2.258l-.667-3.665A7.982 7.982 0 014 12a7.982 7.982 0 012.797-6.077l.667-3.665zM8.528 19.21l.411 2.265a1.25 1.25 0 001.23 1.026h3.662a1.25 1.25 0 001.23-1.026l.411-2.265A7.968 7.968 0 0112 20a7.97 7.97 0 01-3.472-.79zM15.06 2.526l.411 2.265A7.968 7.968 0 0012 4a7.968 7.968 0 00-3.472.79l.411-2.264A1.25 1.25 0 0110.17 1.5h3.662a1.25 1.25 0 011.23 1.026zM5.5 12a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-watch-16" viewBox="0 0 16 16"><g><path d="M9 6.25a.75.75 0 00-1.5 0V8.5c0 .323.207.61.513.712l1.5.5a.75.75 0 10.474-1.424L9 7.96V6.25z"/><path fill-rule="evenodd" d="M4.574 1.932A2.25 2.25 0 016.8 0h2.398c1.12 0 2.07.823 2.227 1.932l.288 2.011A5.485 5.485 0 0113.5 8a5.485 5.485 0 01-1.786 4.057l-.288 2.011A2.25 2.25 0 019.2 16H6.801a2.25 2.25 0 01-2.227-1.932l-.288-2.011A5.485 5.485 0 012.5 8c0-1.606.688-3.051 1.786-4.057l.288-2.011zM5.95 13.106l.107.75a.75.75 0 00.743.644h2.398a.75.75 0 00.742-.644l.108-.75A5.485 5.485 0 018 13.5c-.724 0-1.416-.14-2.049-.394zm3.99-10.962l.108.75A5.485 5.485 0 008 2.5c-.724 0-1.416.14-2.049.394l.107-.75a.75.75 0 01.743-.644h2.398a.75.75 0 01.742.644zM4 8a4 4 0 118 0 4 4 0 01-8 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-webhook-24" viewBox="0 0 24 24"><g><path d="M8.75 6a3.25 3.25 0 016.094-1.574.75.75 0 101.312-.728 4.75 4.75 0 10-7.307 5.856l-3.485 5.477A2.013 2.013 0 005.01 15H5a2 2 0 100 4h.01a2 2 0 001.623-3.17l3.852-6.052a.75.75 0 00-.23-1.035A3.247 3.247 0 018.75 6z"/><path d="M12.364 7.969c-.115.02-.233.031-.354.031H12a2 2 0 110-4h.01a2 2 0 011.623 3.17l3.481 5.47a4.75 4.75 0 11.7 8.96.75.75 0 11.373-1.452 3.25 3.25 0 10-.931-5.89.75.75 0 01-1.037-.23l-3.855-6.06z"/><path d="M2.184 15.376a.75.75 0 10-1.298-.752A4.75 4.75 0 109.69 17.75h7.454A2 2 0 0019 19h.01a2 2 0 100-4H19a2 2 0 00-1.855 1.25H9a.75.75 0 00-.75.75 3.25 3.25 0 11-6.066-1.624z"/></g></symbol><symbol id="flight-webhook-16" viewBox="0 0 16 16"><g><path d="M6.032 4.132c0-1.039.843-1.882 1.886-1.882.709 0 1.328.39 1.65.97a.75.75 0 101.311-.728A3.385 3.385 0 007.918.75a3.383 3.383 0 00-3.386 3.382c0 .94.385 1.79 1.003 2.402l-2.054 3.594a1.25 1.25 0 00.151 2.49h.007a1.25 1.25 0 001.146-1.75l2.369-4.144a.75.75 0 00-.249-1.005 1.879 1.879 0 01-.873-1.587z"/><path d="M7.793 5.375a1.25 1.25 0 01.125-2.494h.006a1.25 1.25 0 011.157 1.725l2.159 3.572a3.383 3.383 0 014.51 3.19 3.383 3.383 0 01-4.23 3.275.75.75 0 11.373-1.452 1.883 1.883 0 002.357-1.822 1.883 1.883 0 00-2.897-1.588.75.75 0 01-1.045-.245l-2.515-4.16z"/><path d="M2.002 10.429a.75.75 0 00-1.298-.752 3.383 3.383 0 002.932 5.073c1.61 0 2.96-1.124 3.301-2.632h4.42c.229.304.592.5 1.001.5h.007a1.25 1.25 0 000-2.5h-.007c-.409 0-.772.197-1 .5H6.271a.75.75 0 00-.75.75 1.883 1.883 0 01-1.886 1.882 1.883 1.883 0 01-1.633-2.821z"/></g></symbol><symbol id="flight-wifi-24" viewBox="0 0 24 24"><g><path d="M1.916 9.31a15.25 15.25 0 0120.168 0 .75.75 0 00.992-1.125 16.75 16.75 0 00-22.152 0 .75.75 0 10.992 1.125z"/><path d="M5.48 12.874a10.25 10.25 0 0113.12 0 .75.75 0 00.96-1.152 11.75 11.75 0 00-15.04 0 .75.75 0 00.96 1.152zM12.005 15.5a5.25 5.25 0 00-3.04.97.75.75 0 01-.87-1.223 6.75 6.75 0 017.82 0 .75.75 0 11-.87 1.223 5.25 5.25 0 00-3.04-.97zM12 19a1 1 0 100 2h.01a1 1 0 100-2H12z"/></g></symbol><symbol id="flight-wifi-16" viewBox="0 0 16 16"><g><path d="M1.443 5.978a9.917 9.917 0 0113.114 0 .75.75 0 00.992-1.126 11.417 11.417 0 00-15.098 0 .75.75 0 10.992 1.126z"/><path d="M3.813 8.525a6.583 6.583 0 018.427 0 .75.75 0 00.96-1.153 8.083 8.083 0 00-10.347 0 .75.75 0 00.96 1.153z"/><path d="M8.003 10.5a3.25 3.25 0 00-1.882.6.75.75 0 01-.869-1.222 4.75 4.75 0 015.502 0 .75.75 0 11-.868 1.223 3.25 3.25 0 00-1.883-.601zM8 12a1 1 0 100 2h.007a1 1 0 100-2H8z"/></g></symbol><symbol id="flight-wifi-off-24" viewBox="0 0 24 24"><g><path d="M1.22 1.22a.75.75 0 011.06 0l20.5 20.5a.75.75 0 11-1.06 1.06l-6.175-6.174a.747.747 0 01-.5-.136 5.25 5.25 0 00-6.08 0 .75.75 0 01-.87-1.223 6.75 6.75 0 014.92-1.171l-3.307-3.307a10.249 10.249 0 00-4.228 2.105.75.75 0 01-.96-1.152A11.749 11.749 0 018.49 9.55L5.77 6.83a15.247 15.247 0 00-3.854 2.48.75.75 0 11-.992-1.125 16.746 16.746 0 013.718-2.482L1.22 2.28a.75.75 0 010-1.06zM12 5.5c-.72 0-1.436.051-2.142.151a.75.75 0 01-.21-1.485 16.75 16.75 0 0113.428 4.019.75.75 0 01-.992 1.125A15.25 15.25 0 0012 5.5zM14.278 9.954a.75.75 0 01.924-.52 11.75 11.75 0 014.358 2.288.75.75 0 01-.96 1.152 10.248 10.248 0 00-3.802-1.996.75.75 0 01-.52-.924zM12 19a1 1 0 100 2h.01a1 1 0 100-2H12z"/></g></symbol><symbol id="flight-wifi-off-16" viewBox="0 0 16 16"><g><path d="M1.22 1.22a.75.75 0 011.06 0l12.5 12.5a.75.75 0 11-1.06 1.06l-3.558-3.557a.749.749 0 01-.276-.122 3.25 3.25 0 00-3.765 0 .75.75 0 01-.869-1.223A4.75 4.75 0 017.94 9L6.198 7.26c-.867.25-1.68.68-2.385 1.266a.75.75 0 01-.96-1.153A8.083 8.083 0 015.02 6.08L3.513 4.573a9.914 9.914 0 00-2.07 1.405.75.75 0 11-.992-1.126c.605-.533 1.26-.997 1.954-1.387L1.22 2.28a.75.75 0 010-1.06zM8 3.5c-.42 0-.837.027-1.25.08a.75.75 0 11-.19-1.489 11.418 11.418 0 018.99 2.761.75.75 0 01-.993 1.126A9.917 9.917 0 008 3.5zM9.794 6.427a.75.75 0 01.959-.453A8.083 8.083 0 0113.2 7.372a.75.75 0 11-.96 1.153 6.583 6.583 0 00-1.993-1.14.75.75 0 01-.453-.958z"/><path d="M8 12a1 1 0 100 2h.007a1 1 0 100-2H8z"/></g></symbol><symbol id="flight-wrench-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M15.5 2.5a6 6 0 00-6 6c0 .65.143 1.296.294 1.794a7.667 7.667 0 00.285.78l.003.007a.75.75 0 01-.15.85L2.95 18.873A1.54 1.54 0 004.038 21.5c.408 0 .799-.162 1.087-.45l6.948-6.98a.75.75 0 01.848-.15l.008.003.037.016.156.065c.139.054.34.129.586.203.497.15 1.143.293 1.792.293a6 6 0 006-6c0-.635-.018-1.122-.047-1.492l-.207.248-.034.04c-.362.435-.778.934-1.213 1.404-.446.483-.935.96-1.436 1.323-.483.35-1.075.664-1.71.664-.479 0-.939-.188-1.28-.523l-.006-.005-1.73-1.732a1.829 1.829 0 01-.524-1.28c0-.637.317-1.229.669-1.711.364-.5.844-.989 1.33-1.434.473-.434.975-.85 1.412-1.212l.04-.032.251-.209c-.373-.03-.867-.049-1.515-.049zm3.348.432a.982.982 0 00.266-.363c.07-.165.11-.4.015-.653a.991.991 0 00-.405-.485c-.27-.172-.648-.265-1.108-.327C17.129 1.04 16.449 1 15.5 1A7.5 7.5 0 008 8.5c0 .85.183 1.653.358 2.23.056.184.112.348.163.487L1.89 17.814a3.038 3.038 0 004.297 4.296l6.6-6.63c.138.05.301.107.485.162.576.175 1.377.358 2.228.358A7.5 7.5 0 0023 8.5c0-.948-.039-1.627-.103-2.111-.06-.456-.152-.835-.324-1.104a.978.978 0 00-.5-.406.879.879 0 00-.658.035.989.989 0 00-.34.262c-.287.287-.63.7-.98 1.119l-.026.03c-.368.442-.763.915-1.171 1.357-.42.454-.832.849-1.214 1.125-.399.29-.672.38-.831.38a.329.329 0 01-.228-.092l-1.72-1.72a.328.328 0 01-.091-.228c0-.157.09-.43.38-.828.278-.382.675-.792 1.132-1.212.444-.408.92-.802 1.365-1.17l.029-.023c.423-.35.84-.695 1.128-.982z" clip-rule="evenodd"/></symbol><symbol id="flight-wrench-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M10.973 1.506a18.525 18.525 0 00-.497-.006A4.024 4.024 0 006.45 5.524c0 .43.095.865.199 1.205.054.18.116.356.192.527v.002a.75.75 0 01-.15.848l-4.937 4.911a.871.871 0 000 1.229.869.869 0 001.227 0L7.896 9.31a.75.75 0 01.847-.151c.17.079.35.139.529.193.34.103.774.198 1.204.198A4.024 4.024 0 0014.5 5.524c0-.177-.002-.338-.006-.483-.208.25-.438.517-.675.774-.32.345-.677.696-1.048.964-.354.257-.82.512-1.339.512-.396 0-.776-.156-1.059-.433L9.142 5.627a1.513 1.513 0 01-.432-1.06c0-.52.256-.985.514-1.34.27-.37.623-.727.97-1.046.258-.237.529-.466.78-.675zm-2.36 9.209l-4.57 4.59a2.37 2.37 0 01-3.35-3.348l.002-.001 4.591-4.568a6.887 6.887 0 01-.072-.223 5.77 5.77 0 01-.263-1.64A5.524 5.524 0 0110.476 0 12 12 0 0112 .076c.331.044.64.115.873.264a.92.92 0 01.374.45.843.843 0 01-.013.625.922.922 0 01-.241.332c-.26.257-.547.487-.829.72-.315.26-.647.535-.957.82a5.947 5.947 0 00-.771.824c-.197.27-.227.415-.227.457 0 .003 0 .006.003.008l1.211 1.211a.013.013 0 00.008.004c.043 0 .19-.032.46-.227.253-.183.532-.45.826-.767.284-.308.56-.638.82-.95.233-.28.463-.565.72-.823a.925.925 0 01.31-.235.841.841 0 01.628-.033.911.911 0 01.467.376c.15.233.22.543.262.87.047.356.075.847.075 1.522a5.524 5.524 0 01-5.524 5.525c-.631 0-1.221-.136-1.64-.263a6.969 6.969 0 01-.222-.071z" clip-rule="evenodd"/></symbol><symbol id="flight-x-24" viewBox="0 0 24 24"><path d="M18.78 6.28a.75.75 0 00-1.06-1.06L12 10.94 6.28 5.22a.75.75 0 00-1.06 1.06L10.94 12l-5.72 5.72a.75.75 0 101.06 1.06L12 13.06l5.72 5.72a.75.75 0 101.06-1.06L13.06 12l5.72-5.72z"/></symbol><symbol id="flight-x-16" viewBox="0 0 16 16"><path d="M12.78 4.28a.75.75 0 00-1.06-1.06L8 6.94 4.28 3.22a.75.75 0 00-1.06 1.06L6.94 8l-3.72 3.72a.75.75 0 101.06 1.06L8 9.06l3.72 3.72a.75.75 0 101.06-1.06L9.06 8l3.72-3.72z"/></symbol><symbol id="flight-x-circle-24" viewBox="0 0 24 24"><g><path d="M16.78 7.22a.75.75 0 010 1.06L13.06 12l3.72 3.72a.75.75 0 11-1.06 1.06L12 13.06l-3.72 3.72a.75.75 0 01-1.06-1.06L10.94 12 7.22 8.28a.75.75 0 011.06-1.06L12 10.94l3.72-3.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M1.25 12C1.25 6.063 6.063 1.25 12 1.25S22.75 6.063 22.75 12 17.937 22.75 12 22.75 1.25 17.937 1.25 12zM12 2.75a9.25 9.25 0 100 18.5 9.25 9.25 0 000-18.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-x-circle-16" viewBox="0 0 16 16"><g><path d="M11.28 4.72a.75.75 0 010 1.06L9.06 8l2.22 2.22a.75.75 0 11-1.06 1.06L8 9.06l-2.22 2.22a.75.75 0 01-1.06-1.06L6.94 8 4.72 5.78a.75.75 0 011.06-1.06L8 6.94l2.22-2.22a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M.25 8a7.75 7.75 0 1115.5 0A7.75 7.75 0 01.25 8zM8 1.75a6.25 6.25 0 100 12.5 6.25 6.25 0 000-12.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-x-circle-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 1.25C6.063 1.25 1.25 6.063 1.25 12S6.063 22.75 12 22.75 22.75 17.937 22.75 12 17.937 1.25 12 1.25zM7.22 7.22a.75.75 0 011.06 0L12 10.94l3.72-3.72a.75.75 0 111.06 1.06L13.06 12l3.72 3.72a.75.75 0 11-1.06 1.06L12 13.06l-3.72 3.72a.75.75 0 01-1.06-1.06L10.94 12 7.22 8.28a.75.75 0 010-1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-x-circle-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 .25a7.75 7.75 0 100 15.5A7.75 7.75 0 008 .25zm2.72 3.97a.75.75 0 111.06 1.06L9.06 8l2.72 2.72a.75.75 0 11-1.06 1.06L8 9.06l-2.72 2.72a.75.75 0 01-1.06-1.06L6.94 8 4.22 5.28a.75.75 0 011.06-1.06L8 6.94l2.72-2.72z" clip-rule="evenodd"/></symbol><symbol id="flight-x-diamond-24" viewBox="0 0 24 24"><g><path d="M15.78 8.22a.75.75 0 010 1.06L13.06 12l2.72 2.72a.75.75 0 11-1.06 1.06L12 13.06l-2.72 2.72a.75.75 0 01-1.06-1.06L10.94 12 8.22 9.28a.75.75 0 011.06-1.06L12 10.94l2.72-2.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M1.884 10.056l8.171-8.172a2.75 2.75 0 013.89 0l8.171 8.172a2.75 2.75 0 010 3.889l-8.171 8.171a2.75 2.75 0 01-3.89 0l-8.171-8.171a2.75 2.75 0 010-3.89zm9.232-7.111l-8.172 8.171a1.25 1.25 0 000 1.768l8.172 8.172a1.25 1.25 0 001.768 0l8.171-8.172a1.25 1.25 0 000-1.768l-8.171-8.171a1.25 1.25 0 00-1.768 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-x-diamond-16" viewBox="0 0 16 16"><g><path d="M10.78 5.22a.75.75 0 010 1.06L9.06 8l1.72 1.72a.75.75 0 11-1.06 1.06L8 9.06l-1.72 1.72a.75.75 0 11-1.06-1.06L6.94 8 5.22 6.28a.75.75 0 011.06-1.06L8 6.94l1.72-1.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M.75 6.41L6.407.753a2.25 2.25 0 013.182 0l5.657 5.657a2.25 2.25 0 010 3.182l-5.657 5.656a2.25 2.25 0 01-3.182 0L.75 9.592a2.25 2.25 0 010-3.182zm6.718-4.597L1.81 7.47a.75.75 0 000 1.06l5.657 5.658a.75.75 0 001.06 0l5.657-5.657a.75.75 0 000-1.06L8.528 1.812a.75.75 0 00-1.06 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-x-diamond-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M13.944 1.884a2.75 2.75 0 00-3.889 0l-8.171 8.172a2.75 2.75 0 000 3.889l8.171 8.171a2.75 2.75 0 003.89 0l8.171-8.171a2.75 2.75 0 000-3.89l-8.171-8.17zM8.22 8.22a.75.75 0 011.06 0L12 10.94l2.72-2.72a.75.75 0 011.06 1.06L13.06 12l2.72 2.72a.75.75 0 01-1.06 1.06L12 13.06l-2.72 2.72a.75.75 0 11-1.06-1.06L10.94 12 8.22 9.28a.75.75 0 010-1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-x-diamond-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9.57.752a2.25 2.25 0 00-3.183 0L.73 6.41a2.25 2.25 0 000 3.182l5.657 5.657a2.25 2.25 0 003.182 0l5.657-5.657a2.25 2.25 0 000-3.182L9.569.752zM5.22 5.22a.75.75 0 011.06 0L8 6.94l1.72-1.72a.75.75 0 111.06 1.06L9.06 8l1.72 1.72a.75.75 0 11-1.06 1.06L8 9.06l-1.72 1.72a.75.75 0 11-1.06-1.06L6.94 8 5.22 6.28a.75.75 0 010-1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-x-hexagon-24" viewBox="0 0 24 24"><g><path d="M15.78 8.22a.75.75 0 010 1.06L13.06 12l2.72 2.72a.75.75 0 11-1.06 1.06L12 13.06l-2.72 2.72a.75.75 0 01-1.06-1.06L10.94 12 8.22 9.28a.75.75 0 011.06-1.06L12 10.94l2.72-2.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M10.559 1.006a2.75 2.75 0 012.882 0l7.75 4.77A2.75 2.75 0 0122.5 8.116v7.765a2.75 2.75 0 01-1.309 2.342l-7.75 4.77a2.75 2.75 0 01-2.882 0l-7.75-4.77A2.75 2.75 0 011.5 15.882V8.117a2.75 2.75 0 011.309-2.342l7.75-4.769zm2.096 1.278a1.25 1.25 0 00-1.31 0l-7.75 4.769A1.25 1.25 0 003 8.117v7.765c0 .434.225.837.595 1.065l7.75 4.769a1.25 1.25 0 001.31 0l7.75-4.77c.37-.227.595-.63.595-1.064V8.117a1.25 1.25 0 00-.595-1.064l-7.75-4.77z" clip-rule="evenodd"/></g></symbol><symbol id="flight-x-hexagon-16" viewBox="0 0 16 16"><g><path d="M10.78 5.22a.75.75 0 010 1.06L9.06 8l1.72 1.72a.75.75 0 11-1.06 1.06L8 9.06l-1.72 1.72a.75.75 0 11-1.06-1.06L6.94 8 5.22 6.28a.75.75 0 011.06-1.06L8 6.94l1.72-1.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M6.834.33a2.25 2.25 0 012.332 0l5.25 3.182A2.25 2.25 0 0115.5 5.436v5.128a2.25 2.25 0 01-1.084 1.924l-5.25 3.182a2.25 2.25 0 01-2.332 0l-5.25-3.182A2.25 2.25 0 01.5 10.564V5.436a2.25 2.25 0 011.084-1.924L6.834.33zm1.555 1.283a.75.75 0 00-.778 0l-5.25 3.181A.75.75 0 002 5.436v5.128a.75.75 0 00.361.642l5.25 3.181a.75.75 0 00.778 0l5.25-3.181a.75.75 0 00.361-.642V5.436a.75.75 0 00-.361-.642l-5.25-3.181z" clip-rule="evenodd"/></g></symbol><symbol id="flight-x-hexagon-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M13.441 1.006a2.75 2.75 0 00-2.882 0l-7.75 4.77a2.75 2.75 0 00-1.31 2.341v7.765a2.75 2.75 0 001.31 2.342l7.75 4.77a2.75 2.75 0 002.882 0l7.75-4.77a2.75 2.75 0 001.309-2.342V8.117a2.75 2.75 0 00-1.309-2.342l-7.75-4.769zM14.72 8.22a.75.75 0 011.06 1.061L13.06 12l2.72 2.72a.75.75 0 01-1.06 1.06L12 13.06l-2.72 2.72a.75.75 0 11-1.06-1.06L10.94 12 8.22 9.28a.75.75 0 011.06-1.06L12 10.94l2.72-2.72z" clip-rule="evenodd"/></symbol><symbol id="flight-x-hexagon-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9.166.33a2.25 2.25 0 00-2.332 0l-5.25 3.182A2.25 2.25 0 00.5 5.436v5.128a2.25 2.25 0 001.084 1.924l5.25 3.182a2.25 2.25 0 002.332 0l5.25-3.182a2.25 2.25 0 001.084-1.924V5.436a2.25 2.25 0 00-1.084-1.924L9.166.33zM5.22 5.22a.75.75 0 011.06 0L8 6.94l1.72-1.72a.75.75 0 111.06 1.06L9.06 8l1.72 1.72a.75.75 0 11-1.06 1.06L8 9.06l-1.72 1.72a.75.75 0 11-1.06-1.06L6.94 8 5.22 6.28a.75.75 0 010-1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-x-square-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M4.806 3.5c-.721 0-1.306.585-1.306 1.306v14.388c0 .722.585 1.306 1.306 1.306h14.388c.722 0 1.306-.584 1.306-1.306V4.806c0-.721-.584-1.306-1.306-1.306H4.806zM2 4.806A2.806 2.806 0 014.806 2h14.388A2.806 2.806 0 0122 4.806v14.388A2.806 2.806 0 0119.194 22H4.806A2.806 2.806 0 012 19.194V4.806zM7.22 7.22a.75.75 0 011.06 0L12 10.94l3.72-3.72a.75.75 0 111.06 1.06L13.06 12l3.72 3.72a.75.75 0 11-1.06 1.06L12 13.06l-3.72 3.72a.75.75 0 01-1.06-1.06L10.94 12 7.22 8.28a.75.75 0 010-1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-x-square-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3.139 2.5a.639.639 0 00-.639.639v9.722c0 .353.286.639.639.639h9.722a.639.639 0 00.639-.639V3.14a.639.639 0 00-.639-.639H3.14zM1 3.139C1 1.958 1.958 1 3.139 1h9.722C14.042 1 15 1.958 15 3.139v9.722A2.139 2.139 0 0112.861 15H3.14A2.139 2.139 0 011 12.861V3.14zm3.72 1.58a.75.75 0 011.06 0L8 6.94l2.22-2.22a.75.75 0 111.06 1.061L9.06 8l2.22 2.22a.75.75 0 11-1.06 1.06L8 9.06l-2.22 2.22a.75.75 0 01-1.06-1.06L6.94 8 4.72 5.78a.75.75 0 010-1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-x-square-fill-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M2 4.806A2.806 2.806 0 014.806 2h14.388A2.806 2.806 0 0122 4.806v14.388A2.806 2.806 0 0119.194 22H4.806A2.806 2.806 0 012 19.194V4.806zM8.28 7.22a.75.75 0 00-1.06 1.06L10.94 12l-3.72 3.72a.75.75 0 101.06 1.06L12 13.06l3.72 3.72a.75.75 0 101.06-1.06L13.06 12l3.72-3.72a.75.75 0 00-1.06-1.06L12 10.94 8.28 7.22z" clip-rule="evenodd"/></symbol><symbol id="flight-x-square-fill-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M1 3.139C1 1.958 1.958 1 3.139 1h9.722C14.042 1 15 1.958 15 3.139v9.722A2.139 2.139 0 0112.861 15H3.14A2.139 2.139 0 011 12.861V3.14zm4.28 1.08A.75.75 0 004.22 5.28L6.94 8l-2.72 2.72a.75.75 0 101.06 1.06L8 9.06l2.72 2.72a.75.75 0 101.06-1.06L9.06 8l2.72-2.72a.75.75 0 00-1.06-1.06L8 6.94 5.28 4.22z" clip-rule="evenodd"/></symbol><symbol id="flight-zap-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M13.333 1.065a.75.75 0 01.437.791l-.918 6.409 8.48.94a.75.75 0 01.494 1.226l-10.278 12.3a.75.75 0 01-1.318-.587l.918-6.409-8.48-.94a.75.75 0 01-.494-1.226l10.278-12.3a.75.75 0 01.881-.204zM4.222 13.458l7.86.872a.75.75 0 01.66.851l-.653 4.563 7.69-9.202-7.862-.872a.75.75 0 01-.66-.851l.654-4.563-7.69 9.203z" clip-rule="evenodd"/></symbol><symbol id="flight-zap-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9.375.078a.75.75 0 01.402.82l-.889 4.418 5.485.908a.75.75 0 01.44 1.236l-7.292 8.285a.75.75 0 01-1.298-.643l.889-4.418-5.485-.908a.75.75 0 01-.44-1.236L8.479.255a.75.75 0 01.896-.177zm-6.17 8.439l4.918.815a.75.75 0 01.612.887l-.489 2.433 4.548-5.169-4.917-.814a.75.75 0 01-.612-.888l.489-2.432-4.548 5.168z" clip-rule="evenodd"/></symbol><symbol id="flight-zap-off-24" viewBox="0 0 24 24"><g><path fill-rule="evenodd" d="M2.28 1.22a.75.75 0 00-1.06 1.06l5.659 5.66-4.705 5.63a.75.75 0 00.493 1.226l8.48.94-.917 6.408a.75.75 0 001.318.587l4.608-5.515 5.564 5.564a.75.75 0 101.06-1.06l-6.067-6.067a.753.753 0 00-.154-.154L2.28 1.219zM15.09 16.15L7.945 9.004 4.222 13.46l7.86.87a.75.75 0 01.66.852l-.653 4.563 3.002-3.593z" clip-rule="evenodd"/><path d="M13.77 1.856a.75.75 0 00-1.318-.587l-2.57 3.075a.75.75 0 101.152.962l.877-1.05-.332 2.32a.75.75 0 101.485.213l.706-4.933zM14.973 8.5a.75.75 0 10-.165 1.49l4.97.552-1.673 2.002a.75.75 0 001.151.962l2.57-3.075a.75.75 0 00-.493-1.226l-6.36-.705z"/></g></symbol><symbol id="flight-zap-off-16" viewBox="0 0 16 16"><g><path d="M9.777.898A.75.75 0 008.479.255L6.473 2.533a.75.75 0 001.126.991l.155-.175-.164.814a.75.75 0 101.47.296L9.778.898z"/><path fill-rule="evenodd" d="M10.874 11.935l-3.353 3.81a.75.75 0 01-1.309-.57l.452-4.489-5.047-.912a.75.75 0 01-.43-1.234l2.946-3.347L1.22 2.28a.75.75 0 011.06-1.06l12.5 12.5a.75.75 0 11-1.06 1.06l-2.846-2.845zM5.195 6.256L3.191 8.534l4.422.8a.75.75 0 01.612.813L7.938 13l1.874-2.129-4.617-4.616z" clip-rule="evenodd"/><path d="M11.248 5.707a.75.75 0 00-.246 1.48l1.792.296-.322.367a.75.75 0 001.126.99l1.215-1.38a.75.75 0 00-.44-1.236l-3.125-.517z"/></g></symbol><symbol id="flight-zoom-in-24" viewBox="0 0 24 24"><g><path d="M10.75 6.5a.75.75 0 01.75.75V10h2.75a.75.75 0 010 1.5H11.5v2.75a.75.75 0 01-1.5 0V11.5H7.25a.75.75 0 010-1.5H10V7.25a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M10.75 2a8.75 8.75 0 105.634 15.445l4.336 4.335a.75.75 0 101.06-1.06l-4.335-4.336A8.75 8.75 0 0010.75 2zM3.5 10.75a7.25 7.25 0 1114.5 0 7.25 7.25 0 01-14.5 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-zoom-in-16" viewBox="0 0 16 16"><g><path d="M7.25 4a.75.75 0 01.75.75V6.5h1.75a.75.75 0 010 1.5H8v1.75a.75.75 0 01-1.5 0V8H4.75a.75.75 0 010-1.5H6.5V4.75A.75.75 0 017.25 4z"/><path fill-rule="evenodd" d="M7.25 1a6.25 6.25 0 103.857 11.168l2.613 2.612a.75.75 0 101.06-1.06l-2.612-2.613A6.25 6.25 0 007.25 1zM2.5 7.25a4.75 4.75 0 119.5 0 4.75 4.75 0 01-9.5 0z" clip-rule="evenodd"/></g></symbol><symbol id="flight-zoom-out-24" viewBox="0 0 24 24"><g><path d="M7.25 10a.75.75 0 000 1.5h7a.75.75 0 000-1.5h-7z"/><path fill-rule="evenodd" d="M2 10.75a8.75 8.75 0 1115.445 5.634l4.335 4.336a.75.75 0 11-1.06 1.06l-4.336-4.335A8.75 8.75 0 012 10.75zm8.75-7.25a7.25 7.25 0 100 14.5 7.25 7.25 0 000-14.5z" clip-rule="evenodd"/></g></symbol><symbol id="flight-zoom-out-16" viewBox="0 0 16 16"><g><path d="M4.75 6.5a.75.75 0 000 1.5h5a.75.75 0 000-1.5h-5z"/><path fill-rule="evenodd" d="M1 7.25a6.25 6.25 0 1111.168 3.857l2.612 2.613a.75.75 0 11-1.06 1.06l-2.613-2.612A6.25 6.25 0 011 7.25zM7.25 2.5a4.75 4.75 0 100 9.5 4.75 4.75 0 000-9.5z" clip-rule="evenodd"/></g></symbol></svg>
-<div id="ember-basic-dropdown-wormhole"></div>
+    <div id="ember-basic-dropdown-wormhole"></div>
   </body>
 </html>
diff --git a/agent/uiserver/redirect_fs.go b/agent/uiserver/redirect_fs.go
index 4a61ba7b2c14d..3f6a8956dc9db 100644
--- a/agent/uiserver/redirect_fs.go
+++ b/agent/uiserver/redirect_fs.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package uiserver
 
 import (
diff --git a/agent/uiserver/ui_template_data.go b/agent/uiserver/ui_template_data.go
index 726207b148f0c..e28fc97fe0bf4 100644
--- a/agent/uiserver/ui_template_data.go
+++ b/agent/uiserver/ui_template_data.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package uiserver
 
 import (
diff --git a/agent/uiserver/uiserver.go b/agent/uiserver/uiserver.go
index 0cd20c5fda0b4..7393a6ead9dad 100644
--- a/agent/uiserver/uiserver.go
+++ b/agent/uiserver/uiserver.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package uiserver
 
 import (
diff --git a/agent/uiserver/uiserver_test.go b/agent/uiserver/uiserver_test.go
index ce649276546be..1c310a63ce0b6 100644
--- a/agent/uiserver/uiserver_test.go
+++ b/agent/uiserver/uiserver_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package uiserver
 
 import (
diff --git a/agent/user_event.go b/agent/user_event.go
index 23cbc90c336d8..ab7aa83ca390a 100644
--- a/agent/user_event.go
+++ b/agent/user_event.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/user_event_test.go b/agent/user_event_test.go
index 62ea5f4adca31..9f5bcee0a0d40 100644
--- a/agent/user_event_test.go
+++ b/agent/user_event_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/util.go b/agent/util.go
index 1bcdbca01f1aa..55688fe3087c2 100644
--- a/agent/util.go
+++ b/agent/util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/util_test.go b/agent/util_test.go
index 42aa745e70fae..c2c49648a0043 100644
--- a/agent/util_test.go
+++ b/agent/util_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/watch_handler.go b/agent/watch_handler.go
index b926b7167505d..643d4afb134b7 100644
--- a/agent/watch_handler.go
+++ b/agent/watch_handler.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/watch_handler_test.go b/agent/watch_handler_test.go
index 151e05e9c0778..a5ff8f7c723c4 100644
--- a/agent/watch_handler_test.go
+++ b/agent/watch_handler_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/agent/xds/accesslogs/accesslogs.go b/agent/xds/accesslogs/accesslogs.go
index a5aac415832fa..7efa1f76c214a 100644
--- a/agent/xds/accesslogs/accesslogs.go
+++ b/agent/xds/accesslogs/accesslogs.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package accesslogs
 
 import (
@@ -10,7 +7,6 @@ import (
 	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	envoy_fileaccesslog_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/file/v3"
 	envoy_streamaccesslog_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/stream/v3"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
 	"google.golang.org/protobuf/types/known/anypb"
 	"google.golang.org/protobuf/types/known/structpb"
 
@@ -53,12 +49,12 @@ const (
 // on the proxy-defaults settings. Currently only one access logger is supported.
 // Listeners (as opposed to listener filters) can trigger an access log filter with the boolean.
 // Tests are located in agent/xds/listeners_test.go.
-func MakeAccessLogs(logs structs.AccessLogs, isListener bool) ([]*envoy_accesslog_v3.AccessLog, error) {
-	if logs == nil || !logs.GetEnabled() {
+func MakeAccessLogs(logs *structs.AccessLogsConfig, isListener bool) ([]*envoy_accesslog_v3.AccessLog, error) {
+	if logs == nil || !logs.Enabled {
 		return nil, nil
 	}
 
-	if isListener && logs.GetDisableListenerLogs() {
+	if isListener && logs.DisableListenerLogs {
 		return nil, nil
 	}
 
@@ -86,37 +82,37 @@ func MakeAccessLogs(logs structs.AccessLogs, isListener bool) ([]*envoy_accesslo
 }
 
 // getLogger returns an individual instance of an Envoy logger based on proxy-defaults
-func getLogger(logs structs.AccessLogs) (*anypb.Any, error) {
+func getLogger(logs *structs.AccessLogsConfig) (*anypb.Any, error) {
 	logFormat, err := getLogFormat(logs)
 	if err != nil {
 		return nil, fmt.Errorf("could not get envoy log format: %w", err)
 	}
 
-	switch logs.GetType() {
-	case pbmesh.LogSinkType_LOG_SINK_TYPE_DEFAULT, pbmesh.LogSinkType_LOG_SINK_TYPE_STDOUT:
+	switch logs.Type {
+	case structs.DefaultLogSinkType, structs.StdOutLogSinkType:
 		return getStdoutLogger(logFormat)
-	case pbmesh.LogSinkType_LOG_SINK_TYPE_STDERR:
+	case structs.StdErrLogSinkType:
 		return getStderrLogger(logFormat)
-	case pbmesh.LogSinkType_LOG_SINK_TYPE_FILE:
-		return getFileLogger(logFormat, logs.GetPath())
+	case structs.FileLogSinkType:
+		return getFileLogger(logFormat, logs.Path)
 	default:
-		return nil, fmt.Errorf("unsupported log format: %s", logs.GetType())
+		return nil, fmt.Errorf("unsupported log format: %s", logs.Type)
 	}
 }
 
 // getLogFormat returns an Envoy log format object that is compatible with all log sinks.
 // If a format is not provided in the proxy-defaults, the default JSON format is used.
-func getLogFormat(logs structs.AccessLogs) (*envoy_core_v3.SubstitutionFormatString, error) {
+func getLogFormat(logs *structs.AccessLogsConfig) (*envoy_core_v3.SubstitutionFormatString, error) {
 
 	var format, formatType string
-	if logs.GetTextFormat() == "" && logs.GetJsonFormat() == "" {
+	if logs.TextFormat == "" && logs.JSONFormat == "" {
 		format = defaultJSONFormat
 		formatType = "json"
-	} else if logs.GetJsonFormat() != "" {
-		format = logs.GetJsonFormat()
+	} else if logs.JSONFormat != "" {
+		format = logs.JSONFormat
 		formatType = "json"
 	} else {
-		format = logs.GetTextFormat()
+		format = logs.TextFormat
 		formatType = "text"
 	}
 
diff --git a/agent/xds/clusters.go b/agent/xds/clusters.go
index 3f0ba0d7f31b3..2ca1d248a4fc1 100644
--- a/agent/xds/clusters.go
+++ b/agent/xds/clusters.go
@@ -1,13 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
 	"errors"
 	"fmt"
-	"net/url"
-	"strconv"
 	"strings"
 	"time"
 
@@ -19,8 +14,6 @@ import (
 	envoy_upstreams_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v3"
 	envoy_matcher_v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3"
 	envoy_type_v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
-	"github.com/hashicorp/consul/agent/xds/config"
-	"github.com/hashicorp/consul/agent/xds/naming"
 
 	"github.com/hashicorp/go-hclog"
 	"google.golang.org/protobuf/encoding/protojson"
@@ -32,13 +25,13 @@ import (
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xds/response"
 	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 const (
 	meshGatewayExportedClusterNamePrefix = "exported~"
+	failoverClusterNamePrefix            = "failover-target~"
 )
 
 // clustersFromSnapshot returns the xDS API representation of the "clusters" in the snapshot.
@@ -69,7 +62,13 @@ func (s *ResourceGenerator) clustersFromSnapshot(cfgSnap *proxycfg.ConfigSnapsho
 		}
 		return res, nil
 	case structs.ServiceKindAPIGateway:
-		res, err := s.clustersFromSnapshotAPIGateway(cfgSnap)
+		// TODO Find a cleaner solution, can't currently pass unexported property types
+		var err error
+		cfgSnap.IngressGateway, err = cfgSnap.APIGateway.ToIngress(cfgSnap.Datacenter)
+		if err != nil {
+			return nil, err
+		}
+		res, err := s.clustersFromSnapshotIngressGateway(cfgSnap)
 		if err != nil {
 			return nil, err
 		}
@@ -146,22 +145,6 @@ func (s *ResourceGenerator) clustersFromSnapshotConnectProxy(cfgSnap *proxycfg.C
 		clusters = append(clusters, upstreamCluster)
 	}
 
-	// add clusters for jwt-providers
-	for _, prov := range cfgSnap.JWTProviders {
-		//skip cluster creation for local providers
-		if prov.JSONWebKeySet == nil || prov.JSONWebKeySet.Remote == nil {
-			continue
-		}
-
-		cluster, err := makeJWTProviderCluster(prov)
-		if err != nil {
-			s.Logger.Warn("failed to make jwt-provider cluster", "provider name", prov.Name, "error", err)
-			continue
-		}
-
-		clusters = append(clusters, cluster)
-	}
-
 	for _, u := range cfgSnap.Proxy.Upstreams {
 		if u.DestinationType != structs.UpstreamDestTypePreparedQuery {
 			continue
@@ -205,153 +188,6 @@ func (s *ResourceGenerator) clustersFromSnapshotConnectProxy(cfgSnap *proxycfg.C
 	return clusters, nil
 }
 
-func makeJWTProviderCluster(p *structs.JWTProviderConfigEntry) (*envoy_cluster_v3.Cluster, error) {
-	if p.JSONWebKeySet == nil || p.JSONWebKeySet.Remote == nil {
-		return nil, fmt.Errorf("cannot create JWKS cluster for non-remote JWKS. Provider Name: %s", p.Name)
-	}
-	hostname, scheme, port, err := parseJWTRemoteURL(p.JSONWebKeySet.Remote.URI)
-	if err != nil {
-		return nil, err
-	}
-
-	cluster := &envoy_cluster_v3.Cluster{
-		Name:                 makeJWKSClusterName(p.Name),
-		ClusterDiscoveryType: makeJWKSDiscoveryClusterType(p.JSONWebKeySet.Remote),
-		LoadAssignment: &envoy_endpoint_v3.ClusterLoadAssignment{
-			ClusterName: makeJWKSClusterName(p.Name),
-			Endpoints: []*envoy_endpoint_v3.LocalityLbEndpoints{
-				{
-					LbEndpoints: []*envoy_endpoint_v3.LbEndpoint{
-						makeEndpoint(hostname, port),
-					},
-				},
-			},
-		},
-	}
-
-	if c := p.JSONWebKeySet.Remote.JWKSCluster; c != nil {
-		connectTimeout := int64(c.ConnectTimeout / time.Second)
-		if connectTimeout > 0 {
-			cluster.ConnectTimeout = &durationpb.Duration{Seconds: connectTimeout}
-		}
-	}
-
-	if scheme == "https" {
-		jwksTLSContext, err := makeUpstreamTLSTransportSocket(
-			&envoy_tls_v3.UpstreamTlsContext{
-				CommonTlsContext: &envoy_tls_v3.CommonTlsContext{
-					ValidationContextType: &envoy_tls_v3.CommonTlsContext_ValidationContext{
-						ValidationContext: makeJWTCertValidationContext(p.JSONWebKeySet.Remote.JWKSCluster),
-					},
-				},
-			},
-		)
-		if err != nil {
-			return nil, err
-		}
-
-		cluster.TransportSocket = jwksTLSContext
-	}
-	return cluster, nil
-}
-
-func makeJWKSDiscoveryClusterType(r *structs.RemoteJWKS) *envoy_cluster_v3.Cluster_Type {
-	ct := &envoy_cluster_v3.Cluster_Type{}
-	if r == nil || r.JWKSCluster == nil {
-		return ct
-	}
-
-	switch r.JWKSCluster.DiscoveryType {
-	case structs.DiscoveryTypeStatic:
-		ct.Type = envoy_cluster_v3.Cluster_STATIC
-	case structs.DiscoveryTypeLogicalDNS:
-		ct.Type = envoy_cluster_v3.Cluster_LOGICAL_DNS
-	case structs.DiscoveryTypeEDS:
-		ct.Type = envoy_cluster_v3.Cluster_EDS
-	case structs.DiscoveryTypeOriginalDST:
-		ct.Type = envoy_cluster_v3.Cluster_ORIGINAL_DST
-	case structs.DiscoveryTypeStrictDNS:
-		fallthrough // default case so uses the default option
-	default:
-		ct.Type = envoy_cluster_v3.Cluster_STRICT_DNS
-	}
-	return ct
-}
-
-func makeJWTCertValidationContext(p *structs.JWKSCluster) *envoy_tls_v3.CertificateValidationContext {
-	vc := &envoy_tls_v3.CertificateValidationContext{}
-	if p == nil || p.TLSCertificates == nil {
-		return vc
-	}
-
-	if tc := p.TLSCertificates.TrustedCA; tc != nil {
-		vc.TrustedCa = &envoy_core_v3.DataSource{}
-		if tc.Filename != "" {
-			vc.TrustedCa.Specifier = &envoy_core_v3.DataSource_Filename{
-				Filename: tc.Filename,
-			}
-		}
-
-		if tc.EnvironmentVariable != "" {
-			vc.TrustedCa.Specifier = &envoy_core_v3.DataSource_EnvironmentVariable{
-				EnvironmentVariable: tc.EnvironmentVariable,
-			}
-		}
-
-		if tc.InlineString != "" {
-			vc.TrustedCa.Specifier = &envoy_core_v3.DataSource_InlineString{
-				InlineString: tc.InlineString,
-			}
-		}
-
-		if len(tc.InlineBytes) > 0 {
-			vc.TrustedCa.Specifier = &envoy_core_v3.DataSource_InlineBytes{
-				InlineBytes: tc.InlineBytes,
-			}
-		}
-	}
-
-	if pi := p.TLSCertificates.CaCertificateProviderInstance; pi != nil {
-		vc.CaCertificateProviderInstance = &envoy_tls_v3.CertificateProviderPluginInstance{}
-		if pi.InstanceName != "" {
-			vc.CaCertificateProviderInstance.InstanceName = pi.InstanceName
-		}
-
-		if pi.CertificateName != "" {
-			vc.CaCertificateProviderInstance.CertificateName = pi.CertificateName
-		}
-	}
-
-	return vc
-}
-
-// parseJWTRemoteURL splits the URI into domain, scheme and port.
-// It will default to port 80 for http and 443 for https for any
-// URI that does not specify a port.
-func parseJWTRemoteURL(uri string) (string, string, int, error) {
-	u, err := url.ParseRequestURI(uri)
-	if err != nil {
-		return "", "", 0, err
-	}
-
-	var port int
-	if u.Port() != "" {
-		port, err = strconv.Atoi(u.Port())
-		if err != nil {
-			return "", "", port, err
-		}
-	}
-
-	if port == 0 {
-		port = 80
-		if u.Scheme == "https" {
-			port = 443
-		}
-	}
-
-	return u.Hostname(), u.Scheme, port, nil
-}
-
 func makeExposeClusterName(destinationPort int) string {
 	return fmt.Sprintf("exposed_cluster_%d", destinationPort)
 }
@@ -369,7 +205,7 @@ func makePassthroughClusters(cfgSnap *proxycfg.ConfigSnapshot) ([]proto.Message,
 		!meshConf.TransparentProxy.MeshDestinationsOnly {
 
 		clusters = append(clusters, &envoy_cluster_v3.Cluster{
-			Name: naming.OriginalDestinationClusterName,
+			Name: OriginalDestinationClusterName,
 			ClusterDiscoveryType: &envoy_cluster_v3.Cluster_Type{
 				Type: envoy_cluster_v3.Cluster_ORIGINAL_DST,
 			},
@@ -811,6 +647,27 @@ func (s *ResourceGenerator) makeGatewayOutgoingClusterPeeringServiceClusters(cfg
 			}
 			cluster := s.makeGatewayCluster(cfgSnap, opts)
 
+			if serviceGroup.UseCDS {
+				configureClusterWithHostnames(
+					s.Logger,
+					cluster,
+					"", /*TODO:make configurable?*/
+					serviceGroup.Nodes,
+					true,  /*isRemote*/
+					false, /*onlyPassing*/
+				)
+			} else {
+				cluster.ClusterDiscoveryType = &envoy_cluster_v3.Cluster_Type{Type: envoy_cluster_v3.Cluster_EDS}
+				cluster.EdsClusterConfig = &envoy_cluster_v3.Cluster_EdsClusterConfig{
+					EdsConfig: &envoy_core_v3.ConfigSource{
+						ResourceApiVersion: envoy_core_v3.ApiVersion_V3,
+						ConfigSourceSpecifier: &envoy_core_v3.ConfigSource_Ads{
+							Ads: &envoy_core_v3.AggregatedConfigSource{},
+						},
+					},
+				}
+			}
+
 			clusters = append(clusters, cluster)
 		}
 	}
@@ -956,46 +813,6 @@ func (s *ResourceGenerator) clustersFromSnapshotIngressGateway(cfgSnap *proxycfg
 	return clusters, nil
 }
 
-func (s *ResourceGenerator) clustersFromSnapshotAPIGateway(cfgSnap *proxycfg.ConfigSnapshot) ([]proto.Message, error) {
-	var clusters []proto.Message
-	createdClusters := make(map[proxycfg.UpstreamID]bool)
-	readyListeners := getReadyListeners(cfgSnap)
-
-	for _, readyListener := range readyListeners {
-		for _, upstream := range readyListener.upstreams {
-			uid := proxycfg.NewUpstreamID(&upstream)
-
-			// If we've already created a cluster for this upstream, skip it. Multiple listeners may
-			// reference the same upstream, so we don't need to create duplicate clusters in that case.
-			if createdClusters[uid] {
-				continue
-			}
-
-			// Grab the discovery chain compiled in handlerAPIGateway.recompileDiscoveryChains
-			chain, ok := cfgSnap.APIGateway.DiscoveryChain[uid]
-			if !ok {
-				// this should not happen, but it can't error out because the equivalent
-				// listener generation will continue
-				s.Logger.Warn("could not find discovery chain for gateway upstream", "upstream", uid)
-				continue
-			}
-
-			// Generate the list of upstream clusters for the discovery chain
-			upstreamClusters, err := s.makeUpstreamClustersForDiscoveryChain(uid, &upstream, chain, cfgSnap, false)
-			if err != nil {
-				return nil, err
-			}
-
-			for _, cluster := range upstreamClusters {
-				clusters = append(clusters, cluster)
-			}
-
-			createdClusters[uid] = true
-		}
-	}
-	return clusters, nil
-}
-
 func (s *ResourceGenerator) configIngressUpstreamCluster(c *envoy_cluster_v3.Cluster, cfgSnap *proxycfg.ConfigSnapshot, listenerKey proxycfg.IngressListenerKey, u *structs.Upstream) {
 	var threshold *envoy_cluster_v3.CircuitBreakers_Thresholds
 	setThresholdLimit := func(limitType string, limit int) {
@@ -1009,11 +826,11 @@ func (s *ResourceGenerator) configIngressUpstreamCluster(c *envoy_cluster_v3.Clu
 
 		switch limitType {
 		case "max_connections":
-			threshold.MaxConnections = response.MakeUint32Value(limit)
+			threshold.MaxConnections = makeUint32Value(limit)
 		case "max_pending_requests":
-			threshold.MaxPendingRequests = response.MakeUint32Value(limit)
+			threshold.MaxPendingRequests = makeUint32Value(limit)
 		case "max_requests":
-			threshold.MaxRequests = response.MakeUint32Value(limit)
+			threshold.MaxRequests = makeUint32Value(limit)
 		}
 	}
 
@@ -1044,7 +861,12 @@ func (s *ResourceGenerator) configIngressUpstreamCluster(c *envoy_cluster_v3.Clu
 	if svc != nil {
 		override = svc.PassiveHealthCheck
 	}
-	outlierDetection := config.ToOutlierDetection(cfgSnap.IngressGateway.Defaults.PassiveHealthCheck, override, false)
+	outlierDetection := ToOutlierDetection(cfgSnap.IngressGateway.Defaults.PassiveHealthCheck, override, false)
+
+	// Specail handling for failover peering service, which has set MaxEjectionPercent
+	if c.OutlierDetection != nil && c.OutlierDetection.MaxEjectionPercent != nil {
+		outlierDetection.MaxEjectionPercent = &wrapperspb.UInt32Value{Value: c.OutlierDetection.MaxEjectionPercent.Value}
+	}
 
 	c.OutlierDetection = outlierDetection
 }
@@ -1053,7 +875,7 @@ func (s *ResourceGenerator) makeAppCluster(cfgSnap *proxycfg.ConfigSnapshot, nam
 	var c *envoy_cluster_v3.Cluster
 	var err error
 
-	cfg, err := config.ParseProxyConfig(cfgSnap.Proxy.Config)
+	cfg, err := ParseProxyConfig(cfgSnap.Proxy.Config)
 	if err != nil {
 		// Don't hard fail on a config typo, just warn. The parse func returns
 		// default config if there is an error so it's safe to continue.
@@ -1096,21 +918,15 @@ func (s *ResourceGenerator) makeAppCluster(cfgSnap *proxycfg.ConfigSnapshot, nam
 		protocol = cfg.Protocol
 	}
 	if protocol == "http2" || protocol == "grpc" {
-		if name == xdscommon.LocalAppClusterName {
-			if err := s.setLocalAppHttpProtocolOptions(c); err != nil {
-				return c, err
-			}
-		} else {
-			if err := s.setHttp2ProtocolOptions(c); err != nil {
-				return c, err
-			}
+		if err := s.setHttp2ProtocolOptions(c); err != nil {
+			return c, err
 		}
 	}
 	if cfg.MaxInboundConnections > 0 {
 		c.CircuitBreakers = &envoy_cluster_v3.CircuitBreakers{
 			Thresholds: []*envoy_cluster_v3.CircuitBreakers_Thresholds{
 				{
-					MaxConnections: response.MakeUint32Value(cfg.MaxInboundConnections),
+					MaxConnections: makeUint32Value(cfg.MaxInboundConnections),
 				},
 			},
 		}
@@ -1153,14 +969,14 @@ func (s *ResourceGenerator) makeUpstreamClusterForPeerService(
 
 	clusterName := generatePeeredClusterName(uid, tbs)
 
-	outlierDetection := config.ToOutlierDetection(upstreamConfig.PassiveHealthCheck, nil, true)
+	outlierDetection := ToOutlierDetection(upstreamConfig.PassiveHealthCheck, nil, true)
 	// We can't rely on health checks for services on cluster peers because they
 	// don't take into account service resolvers, splitters and routers. Setting
 	// MaxEjectionPercent too 100% gives outlier detection the power to eject the
 	// entire cluster.
 	outlierDetection.MaxEjectionPercent = &wrapperspb.UInt32Value{Value: 100}
 
-	s.Logger.Trace("generating cluster for", "cluster", clusterName)
+	s.Logger.Trace("generating cluster for", "cluster", clusterName, "uid", uid)
 	if c == nil {
 		c = &envoy_cluster_v3.Cluster{
 			Name:           clusterName,
@@ -1228,10 +1044,13 @@ func (s *ResourceGenerator) makeUpstreamClusterForPeerService(
 		makeTLSParametersFromProxyTLSConfig(cfgSnap.MeshConfigTLSOutgoing()),
 	)
 	err = injectSANMatcher(commonTLSContext, peerMeta.SpiffeID...)
+	s.Logger.Trace("injecting SAN matcher rules for cluster %q with SPIFFE IDs: %+v", clusterName, peerMeta.SpiffeID)
+
 	if err != nil {
 		return nil, fmt.Errorf("failed to inject SAN matcher rules for cluster %q: %v", clusterName, err)
 	}
 
+	s.Logger.Trace("injecting TLS context for cluster %q with SNI: %+v", clusterName, peerMeta.PrimarySNI())
 	tlsContext := &envoy_tls_v3.UpstreamTlsContext{
 		CommonTlsContext: commonTLSContext,
 		Sni:              peerMeta.PrimarySNI(),
@@ -1288,7 +1107,7 @@ func (s *ResourceGenerator) makeUpstreamClusterForPreparedQuery(upstream structs
 			CircuitBreakers: &envoy_cluster_v3.CircuitBreakers{
 				Thresholds: makeThresholdsIfNeeded(cfg.Limits),
 			},
-			OutlierDetection: config.ToOutlierDetection(cfg.PassiveHealthCheck, nil, true),
+			OutlierDetection: ToOutlierDetection(cfg.PassiveHealthCheck, nil, true),
 		}
 		if cfg.Protocol == "http2" || cfg.Protocol == "grpc" {
 			if err := s.setHttp2ProtocolOptions(c); err != nil {
@@ -1348,21 +1167,6 @@ func (s *ResourceGenerator) makeUpstreamClusterForPreparedQuery(upstream structs
 	return c, nil
 }
 
-func finalizeUpstreamConfig(cfg structs.UpstreamConfig, chain *structs.CompiledDiscoveryChain, connectTimeout time.Duration) structs.UpstreamConfig {
-	if cfg.Protocol == "" {
-		cfg.Protocol = chain.Protocol
-	}
-
-	if cfg.Protocol == "" {
-		cfg.Protocol = "tcp"
-	}
-
-	if cfg.ConnectTimeoutMs == 0 {
-		cfg.ConnectTimeoutMs = int(connectTimeout / time.Millisecond)
-	}
-	return cfg
-}
-
 func (s *ResourceGenerator) makeUpstreamClustersForDiscoveryChain(
 	uid proxycfg.UpstreamID,
 	upstream *structs.Upstream,
@@ -1399,6 +1203,21 @@ func (s *ResourceGenerator) makeUpstreamClustersForDiscoveryChain(
 			"error", err)
 	}
 
+	finalizeUpstreamConfig := func(cfg structs.UpstreamConfig, connectTimeout time.Duration) structs.UpstreamConfig {
+		if cfg.Protocol == "" {
+			cfg.Protocol = chain.Protocol
+		}
+
+		if cfg.Protocol == "" {
+			cfg.Protocol = "tcp"
+		}
+
+		if cfg.ConnectTimeoutMs == 0 {
+			cfg.ConnectTimeoutMs = int(connectTimeout / time.Millisecond)
+		}
+		return cfg
+	}
+
 	var escapeHatchCluster *envoy_cluster_v3.Cluster
 	if !forMeshGateway {
 		if rawUpstreamConfig.EnvoyClusterJSON != "" {
@@ -1427,14 +1246,15 @@ func (s *ResourceGenerator) makeUpstreamClustersForDiscoveryChain(
 		case node.Resolver == nil:
 			return nil, fmt.Errorf("impossible to process a non-resolver node")
 		}
+		failover := node.Resolver.Failover
 		// These variables are prefixed with primary to avoid shaddowing bugs.
 		primaryTargetID := node.Resolver.Target
 		primaryTarget := chain.Targets[primaryTargetID]
-		primaryTargetClusterName := s.getTargetClusterName(upstreamsSnapshot, chain, primaryTargetID, forMeshGateway)
-		if primaryTargetClusterName == "" {
+		primaryTargetClusterData, ok := s.getTargetClusterData(upstreamsSnapshot, chain, primaryTargetID, forMeshGateway, false)
+		if !ok {
 			continue
 		}
-		upstreamConfig := finalizeUpstreamConfig(rawUpstreamConfig, chain, node.Resolver.ConnectTimeout)
+		upstreamConfig := finalizeUpstreamConfig(rawUpstreamConfig, node.Resolver.ConnectTimeout)
 
 		if forMeshGateway && !cfgSnap.Locality.Matches(primaryTarget.Datacenter, primaryTarget.Partition) {
 			s.Logger.Warn("ignoring discovery chain target that crosses a datacenter or partition boundary in a mesh gateway",
@@ -1444,32 +1264,28 @@ func (s *ResourceGenerator) makeUpstreamClustersForDiscoveryChain(
 			continue
 		}
 
-		mappedTargets, err := s.mapDiscoChainTargets(cfgSnap, chain, node, upstreamConfig, forMeshGateway)
-		if err != nil {
-			return nil, err
-		}
-
-		targetGroups, err := mappedTargets.groupedTargets()
-		if err != nil {
-			return nil, err
-		}
-
-		var failoverClusterNames []string
-		if mappedTargets.failover {
-			for _, targetGroup := range targetGroups {
-				failoverClusterNames = append(failoverClusterNames, targetGroup.ClusterName)
+		// Construct the information required to make  target clusters. When
+		// failover is configured, create the aggregate cluster.
+		var targetClustersData []targetClusterData
+		if failover != nil && !forMeshGateway {
+			var failoverClusterNames []string
+			for _, tid := range append([]string{primaryTargetID}, failover.Targets...) {
+				if td, ok := s.getTargetClusterData(upstreamsSnapshot, chain, tid, forMeshGateway, true); ok {
+					targetClustersData = append(targetClustersData, td)
+					failoverClusterNames = append(failoverClusterNames, td.clusterName)
+				}
 			}
 
 			aggregateClusterConfig, err := anypb.New(&envoy_aggregate_cluster_v3.ClusterConfig{
 				Clusters: failoverClusterNames,
 			})
 			if err != nil {
-				return nil, fmt.Errorf("failed to construct the aggregate cluster %q: %v", mappedTargets.baseClusterName, err)
+				return nil, fmt.Errorf("failed to construct the aggregate cluster %q: %v", primaryTargetClusterData.clusterName, err)
 			}
 
 			c := &envoy_cluster_v3.Cluster{
-				Name:           mappedTargets.baseClusterName,
-				AltStatName:    mappedTargets.baseClusterName,
+				Name:           primaryTargetClusterData.clusterName,
+				AltStatName:    primaryTargetClusterData.clusterName,
 				ConnectTimeout: durationpb.New(node.Resolver.ConnectTimeout),
 				LbPolicy:       envoy_cluster_v3.Cluster_CLUSTER_PROVIDED,
 				ClusterDiscoveryType: &envoy_cluster_v3.Cluster_ClusterType{
@@ -1481,14 +1297,43 @@ func (s *ResourceGenerator) makeUpstreamClustersForDiscoveryChain(
 			}
 
 			out = append(out, c)
+		} else {
+			targetClustersData = append(targetClustersData, primaryTargetClusterData)
 		}
 
 		// Construct the target clusters.
-		for _, groupedTarget := range targetGroups {
-			s.Logger.Debug("generating cluster for", "cluster", groupedTarget.ClusterName)
+		for _, targetData := range targetClustersData {
+			target := chain.Targets[targetData.targetID]
+			sni := target.SNI
+
+			targetUID := proxycfg.NewUpstreamIDFromTargetID(targetData.targetID)
+			if targetUID.Peer != "" {
+				peerMeta, found := upstreamsSnapshot.UpstreamPeerMeta(targetUID)
+				if !found {
+					s.Logger.Warn("failed to fetch upstream peering metadata for cluster", "target", targetUID)
+				}
+				upstreamCluster, err := s.makeUpstreamClusterForPeerService(targetUID, upstreamConfig, peerMeta, cfgSnap)
+				if err != nil {
+					continue
+				}
+				// Override the cluster name to include the failover-target~ prefix.
+				upstreamCluster.Name = targetData.clusterName
+				out = append(out, upstreamCluster)
+				continue
+			}
+
+			targetSpiffeID := connect.SpiffeIDService{
+				Host:       cfgSnap.Roots.TrustDomain,
+				Namespace:  target.Namespace,
+				Partition:  target.Partition,
+				Datacenter: target.Datacenter,
+				Service:    target.Service,
+			}.URI().String()
+
+			s.Logger.Debug("generating cluster for", "cluster", targetData.clusterName)
 			c := &envoy_cluster_v3.Cluster{
-				Name:                 groupedTarget.ClusterName,
-				AltStatName:          groupedTarget.ClusterName,
+				Name:                 targetData.clusterName,
+				AltStatName:          targetData.clusterName,
 				ConnectTimeout:       durationpb.New(node.Resolver.ConnectTimeout),
 				ClusterDiscoveryType: &envoy_cluster_v3.Cluster_Type{Type: envoy_cluster_v3.Cluster_EDS},
 				CommonLbConfig: &envoy_cluster_v3.Cluster_CommonLbConfig{
@@ -1508,7 +1353,7 @@ func (s *ResourceGenerator) makeUpstreamClustersForDiscoveryChain(
 				CircuitBreakers: &envoy_cluster_v3.CircuitBreakers{
 					Thresholds: makeThresholdsIfNeeded(upstreamConfig.Limits),
 				},
-				OutlierDetection: config.ToOutlierDetection(upstreamConfig.PassiveHealthCheck, nil, true),
+				OutlierDetection: ToOutlierDetection(upstreamConfig.PassiveHealthCheck, nil, true),
 			}
 
 			var lb *structs.LoadBalancer
@@ -1516,7 +1361,7 @@ func (s *ResourceGenerator) makeUpstreamClustersForDiscoveryChain(
 				lb = node.LoadBalancer
 			}
 			if err := injectLBToCluster(lb, c); err != nil {
-				return nil, fmt.Errorf("failed to apply load balancer configuration to cluster %q: %v", groupedTarget.ClusterName, err)
+				return nil, fmt.Errorf("failed to apply load balancer configuration to cluster %q: %v", targetData.clusterName, err)
 			}
 
 			if upstreamConfig.Protocol == "http2" || upstreamConfig.Protocol == "grpc" {
@@ -1525,17 +1370,29 @@ func (s *ResourceGenerator) makeUpstreamClustersForDiscoveryChain(
 				}
 			}
 
-			switch len(groupedTarget.Targets) {
-			case 0:
-				continue
-			case 1:
-				// We expect one target so this passes through to continue setting the cluster up.
-			default:
-				return nil, fmt.Errorf("cannot have more than one target")
+			configureTLS := true
+			if forMeshGateway {
+				// We only initiate TLS if we're doing an L7 proxy.
+				configureTLS = structs.IsProtocolHTTPLike(upstreamConfig.Protocol)
 			}
 
-			if targetInfo := groupedTarget.Targets[0]; targetInfo.TLSContext != nil {
-				transportSocket, err := makeUpstreamTLSTransportSocket(targetInfo.TLSContext)
+			if configureTLS {
+				commonTLSContext := makeCommonTLSContext(
+					cfgSnap.Leaf(),
+					cfgSnap.RootPEMs(),
+					makeTLSParametersFromProxyTLSConfig(cfgSnap.MeshConfigTLSOutgoing()),
+				)
+
+				err = injectSANMatcher(commonTLSContext, targetSpiffeID)
+				if err != nil {
+					return nil, fmt.Errorf("failed to inject SAN matcher rules for cluster %q: %v", sni, err)
+				}
+
+				tlsContext := &envoy_tls_v3.UpstreamTlsContext{
+					CommonTlsContext: commonTLSContext,
+					Sni:              sni,
+				}
+				transportSocket, err := makeUpstreamTLSTransportSocket(tlsContext)
 				if err != nil {
 					return nil, err
 				}
@@ -1662,6 +1519,11 @@ func makeClusterFromUserConfig(configJSON string) (*envoy_cluster_v3.Cluster, er
 	return &c, err
 }
 
+type addressPair struct {
+	host string
+	port int
+}
+
 type clusterOpts struct {
 	// name for the cluster
 	name string
@@ -1685,7 +1547,7 @@ type clusterOpts struct {
 
 // makeGatewayCluster creates an Envoy cluster for a mesh or terminating gateway
 func (s *ResourceGenerator) makeGatewayCluster(snap *proxycfg.ConfigSnapshot, opts clusterOpts) *envoy_cluster_v3.Cluster {
-	cfg, err := config.ParseGatewayConfig(snap.Proxy.Config)
+	cfg, err := ParseGatewayConfig(snap.Proxy.Config)
 	if err != nil {
 		// Don't hard fail on a config typo, just warn. The parse func returns
 		// default config if there is an error so it's safe to continue.
@@ -1715,13 +1577,13 @@ func (s *ResourceGenerator) makeGatewayCluster(snap *proxycfg.ConfigSnapshot, op
 			TcpKeepalive: &envoy_core_v3.TcpKeepalive{},
 		}
 		if cfg.TcpKeepaliveTime != 0 {
-			cluster.UpstreamConnectionOptions.TcpKeepalive.KeepaliveTime = response.MakeUint32Value(cfg.TcpKeepaliveTime)
+			cluster.UpstreamConnectionOptions.TcpKeepalive.KeepaliveTime = makeUint32Value(cfg.TcpKeepaliveTime)
 		}
 		if cfg.TcpKeepaliveInterval != 0 {
-			cluster.UpstreamConnectionOptions.TcpKeepalive.KeepaliveInterval = response.MakeUint32Value(cfg.TcpKeepaliveInterval)
+			cluster.UpstreamConnectionOptions.TcpKeepalive.KeepaliveInterval = makeUint32Value(cfg.TcpKeepaliveInterval)
 		}
 		if cfg.TcpKeepaliveProbes != 0 {
-			cluster.UpstreamConnectionOptions.TcpKeepalive.KeepaliveProbes = response.MakeUint32Value(cfg.TcpKeepaliveProbes)
+			cluster.UpstreamConnectionOptions.TcpKeepalive.KeepaliveProbes = makeUint32Value(cfg.TcpKeepaliveProbes)
 		}
 	}
 
@@ -1828,7 +1690,7 @@ func configureClusterWithHostnames(
 // makeExternalIPCluster creates an Envoy cluster for routing to IP addresses outside of Consul
 // This is used by terminating gateways for Destinations
 func (s *ResourceGenerator) makeExternalIPCluster(snap *proxycfg.ConfigSnapshot, opts clusterOpts) *envoy_cluster_v3.Cluster {
-	cfg, err := config.ParseGatewayConfig(snap.Proxy.Config)
+	cfg, err := ParseGatewayConfig(snap.Proxy.Config)
 	if err != nil {
 		// Don't hard fail on a config typo, just warn. The parse func returns
 		// default config if there is an error so it's safe to continue.
@@ -1867,7 +1729,7 @@ func (s *ResourceGenerator) makeExternalIPCluster(snap *proxycfg.ConfigSnapshot,
 // makeExternalHostnameCluster creates an Envoy cluster for hostname endpoints that will be resolved with DNS
 // This is used by both terminating gateways for Destinations, and Mesh Gateways for peering control plane traffice
 func (s *ResourceGenerator) makeExternalHostnameCluster(snap *proxycfg.ConfigSnapshot, opts clusterOpts) *envoy_cluster_v3.Cluster {
-	cfg, err := config.ParseGatewayConfig(snap.Proxy.Config)
+	cfg, err := ParseGatewayConfig(snap.Proxy.Config)
 	if err != nil {
 		// Don't hard fail on a config typo, just warn. The parse func returns
 		// default config if there is an error so it's safe to continue.
@@ -1891,7 +1753,7 @@ func (s *ResourceGenerator) makeExternalHostnameCluster(snap *proxycfg.ConfigSna
 	endpoints := make([]*envoy_endpoint_v3.LbEndpoint, 0, len(opts.addresses))
 
 	for _, pair := range opts.addresses {
-		address := response.MakeAddress(pair.Address, pair.Port)
+		address := makeAddress(pair.Address, pair.Port)
 
 		endpoint := &envoy_endpoint_v3.LbEndpoint{
 			HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
@@ -1924,13 +1786,13 @@ func makeThresholdsIfNeeded(limits *structs.UpstreamLimits) []*envoy_cluster_v3.
 	// Likewise, make sure to not set any threshold values on the zero-value in
 	// order to rely on Envoy defaults
 	if limits.MaxConnections != nil {
-		threshold.MaxConnections = response.MakeUint32Value(*limits.MaxConnections)
+		threshold.MaxConnections = makeUint32Value(*limits.MaxConnections)
 	}
 	if limits.MaxPendingRequests != nil {
-		threshold.MaxPendingRequests = response.MakeUint32Value(*limits.MaxPendingRequests)
+		threshold.MaxPendingRequests = makeUint32Value(*limits.MaxPendingRequests)
 	}
 	if limits.MaxConcurrentRequests != nil {
-		threshold.MaxRequests = response.MakeUint32Value(*limits.MaxConcurrentRequests)
+		threshold.MaxRequests = makeUint32Value(*limits.MaxConcurrentRequests)
 	}
 
 	return []*envoy_cluster_v3.CircuitBreakers_Thresholds{threshold}
@@ -1953,7 +1815,7 @@ func makeLbEndpoint(addr string, port int, health envoy_core_v3.HealthStatus, we
 			},
 		},
 		HealthStatus:        health,
-		LoadBalancingWeight: response.MakeUint32Value(weight),
+		LoadBalancingWeight: makeUint32Value(weight),
 	}
 }
 
@@ -2022,29 +1884,6 @@ func (s *ResourceGenerator) setHttp2ProtocolOptions(c *envoy_cluster_v3.Cluster)
 	return nil
 }
 
-// Allows forwarding either HTTP/1.1 or HTTP/2 traffic to the local application.
-// The protocol used depends on the protocol received from the downstream service
-// on the public listener.
-func (s *ResourceGenerator) setLocalAppHttpProtocolOptions(c *envoy_cluster_v3.Cluster) error {
-	cfg := &envoy_upstreams_v3.HttpProtocolOptions{
-		UpstreamProtocolOptions: &envoy_upstreams_v3.HttpProtocolOptions_UseDownstreamProtocolConfig{
-			UseDownstreamProtocolConfig: &envoy_upstreams_v3.HttpProtocolOptions_UseDownstreamHttpConfig{
-				HttpProtocolOptions:  &envoy_core_v3.Http1ProtocolOptions{},
-				Http2ProtocolOptions: &envoy_core_v3.Http2ProtocolOptions{},
-			},
-		},
-	}
-	any, err := anypb.New(cfg)
-	if err != nil {
-		return err
-	}
-	c.TypedExtensionProtocolOptions = map[string]*anypb.Any{
-		"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": any,
-	}
-
-	return nil
-}
-
 // generatePeeredClusterName returns an SNI-like cluster name which mimics PeeredServiceSNI
 // but excludes partition information which could be ambiguous (local vs remote partition).
 func generatePeeredClusterName(uid proxycfg.UpstreamID, tb *pbpeering.PeeringTrustBundle) string {
@@ -2057,11 +1896,15 @@ func generatePeeredClusterName(uid proxycfg.UpstreamID, tb *pbpeering.PeeringTru
 	}, ".")
 }
 
-func (s *ResourceGenerator) getTargetClusterName(upstreamsSnapshot *proxycfg.ConfigSnapshotUpstreams, chain *structs.CompiledDiscoveryChain, tid string, forMeshGateway bool) string {
+type targetClusterData struct {
+	targetID    string
+	clusterName string
+}
+
+func (s *ResourceGenerator) getTargetClusterData(upstreamsSnapshot *proxycfg.ConfigSnapshotUpstreams, chain *structs.CompiledDiscoveryChain, tid string, forMeshGateway bool, failover bool) (targetClusterData, bool) {
 	target := chain.Targets[tid]
 	clusterName := target.Name
 	targetUID := proxycfg.NewUpstreamIDFromTargetID(tid)
-
 	if targetUID.Peer != "" {
 		tbs, ok := upstreamsSnapshot.UpstreamPeerTrustBundles.Get(targetUID.Peer)
 		// We can't generate cluster on peers without the trust bundle. The
@@ -2071,14 +1914,20 @@ func (s *ResourceGenerator) getTargetClusterName(upstreamsSnapshot *proxycfg.Con
 				"peer", targetUID.Peer,
 				"target", tid,
 			)
-			return ""
+			return targetClusterData{}, false
 		}
 
 		clusterName = generatePeeredClusterName(targetUID, tbs)
 	}
-	clusterName = naming.CustomizeClusterName(clusterName, chain)
+	clusterName = CustomizeClusterName(clusterName, chain)
+	if failover {
+		clusterName = failoverClusterNamePrefix + clusterName
+	}
 	if forMeshGateway {
 		clusterName = meshGatewayExportedClusterNamePrefix + clusterName
 	}
-	return clusterName
+	return targetClusterData{
+		targetID:    tid,
+		clusterName: clusterName,
+	}, true
 }
diff --git a/agent/xds/clusters_test.go b/agent/xds/clusters_test.go
index fb92ea5804b6f..6014e98d22072 100644
--- a/agent/xds/clusters_test.go
+++ b/agent/xds/clusters_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
@@ -11,46 +8,24 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/hashicorp/consul/types"
-
 	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
+	"github.com/hashicorp/consul/agent/xds/testcommon"
+
 	testinf "github.com/mitchellh/go-testing-interface"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/wrapperspb"
 
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xds/proxystateconverter"
-	"github.com/hashicorp/consul/agent/xds/response"
-	"github.com/hashicorp/consul/agent/xds/testcommon"
-	"github.com/hashicorp/consul/agent/xdsv2"
 	"github.com/hashicorp/consul/envoyextensions/xdscommon"
 	"github.com/hashicorp/consul/sdk/testutil"
+	"github.com/hashicorp/consul/types"
 )
 
-type mockCfgFetcher struct {
-	addressLan string
-}
-
-func (s *mockCfgFetcher) AdvertiseAddrLAN() string {
-	return s.addressLan
-}
-
 type clusterTestCase struct {
 	name               string
 	create             func(t testinf.T) *proxycfg.ConfigSnapshot
 	overrideGoldenName string
-	alsoRunTestForV2   bool
-}
-
-func uint32ptr(i uint32) *uint32 {
-	return &i
-}
-
-func durationPtr(d time.Duration) *time.Duration {
-	return &d
 }
 
 func makeClusterDiscoChainTests(enterprise bool) []clusterTestCase {
@@ -65,125 +40,90 @@ func makeClusterDiscoChainTests(enterprise bool) []clusterTestCase {
 						})
 				}, nil)
 			},
-			// TODO(proxystate): requires custom cluster work
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "connect-proxy-with-chain",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-chain-http2",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, func(ns *structs.NodeService) {
-					ns.Proxy.Upstreams[0].Config["protocol"] = "http2"
-				}, nil)
-			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-chain-external-sni",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "external-sni", enterprise, nil, nil)
 			},
-			//TODO(proxystate): this requires terminating gateway work
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-chain-and-overrides",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple-with-overrides", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-chain-and-failover",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover", enterprise, nil, nil)
 			},
-			// TODO(proxystate): requires routes work
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-failover-through-remote-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-remote-gateway", enterprise, nil, nil)
 			},
-			// TODO(proxystate): requires routes work
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-remote-gateway-triggered", enterprise, nil, nil)
 			},
-			// TODO(proxystate): requires routes work
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-double-failover-through-remote-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-double-remote-gateway", enterprise, nil, nil)
 			},
-			// TODO(proxystate): requires routes work
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-double-remote-gateway-triggered", enterprise, nil, nil)
 			},
-			// TODO(proxystate): requires routes work
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-failover-through-local-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-local-gateway", enterprise, nil, nil)
 			},
-			// TODO(proxystate): requires routes work
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-local-gateway-triggered", enterprise, nil, nil)
 			},
-			// TODO(proxystate): requires routes work
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-double-failover-through-local-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-double-local-gateway", enterprise, nil, nil)
 			},
-			// TODO(proxystate): requires routes work
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-double-local-gateway-triggered", enterprise, nil, nil)
 			},
-			// TODO(proxystate): requires routes work
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "splitter-with-resolver-redirect",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "splitter-with-resolver-redirect-multidc", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-lb-in-resolver",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "lb-resolver", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 	}
 }
@@ -215,7 +155,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 					},
 				})
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tls-outgoing-min-version",
@@ -235,7 +174,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 					},
 				})
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tls-outgoing-max-version",
@@ -255,7 +193,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 					},
 				})
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tls-outgoing-cipher-suites",
@@ -278,68 +215,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 					},
 				})
 			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-jwt-config-entry-with-local",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "jwt-provider",
-						Result: &structs.IndexedConfigEntries{
-							Kind: "jwt-provider",
-							Entries: []structs.ConfigEntry{
-								&structs.JWTProviderConfigEntry{
-									Name: "okta",
-									JSONWebKeySet: &structs.JSONWebKeySet{
-										Local: &structs.LocalJWKS{
-											JWKS: "xxx",
-										},
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			// TODO(proxystate): jwt work will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "connect-proxy-with-jwt-config-entry-with-remote-jwks",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "jwt-provider",
-						Result: &structs.IndexedConfigEntries{
-							Kind: "jwt-provider",
-							Entries: []structs.ConfigEntry{
-								&structs.JWTProviderConfigEntry{
-									Name: "okta",
-									JSONWebKeySet: &structs.JSONWebKeySet{
-										Remote: &structs.RemoteJWKS{
-											RequestTimeoutMs:    1000,
-											FetchAsynchronously: true,
-											URI:                 "https://test.test.com",
-											JWKSCluster: &structs.JWKSCluster{
-												DiscoveryType:  structs.DiscoveryTypeStatic,
-												ConnectTimeout: time.Duration(5) * time.Second,
-												TLSCertificates: &structs.JWKSTLSCertificate{
-													TrustedCA: &structs.JWKSTLSCertTrustedCA{
-														Filename: "mycert.crt",
-													},
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			// TODO(proxystate): jwt work will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "custom-local-app",
@@ -351,8 +226,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 						})
 				}, nil)
 			},
-			// TODO(proxystate): requires custom cluster work
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "custom-upstream",
@@ -364,8 +237,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 						})
 				}, nil)
 			},
-			// TODO(proxystate): requires custom cluster work
-			alsoRunTestForV2: false,
 		},
 		{
 			name:               "custom-upstream-ignores-tls",
@@ -380,46 +251,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 						})
 				}, nil)
 			},
-			// TODO(proxystate): requires custom cluster work
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "custom-upstream-with-prepared-query",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					for i := range ns.Proxy.Upstreams {
-
-						switch ns.Proxy.Upstreams[i].DestinationName {
-						case "db":
-							if ns.Proxy.Upstreams[i].Config == nil {
-								ns.Proxy.Upstreams[i].Config = map[string]interface{}{}
-							}
-
-							uid := proxycfg.NewUpstreamID(&ns.Proxy.Upstreams[i])
-
-							// Triggers an override with the presence of the escape hatch listener
-							ns.Proxy.Upstreams[i].DestinationType = structs.UpstreamDestTypePreparedQuery
-
-							ns.Proxy.Upstreams[i].Config["envoy_cluster_json"] =
-								customClusterJSON(t, customClusterJSONOptions{
-									Name: uid.EnvoyID() + ":custom-upstream",
-								})
-
-						// Also test that http2 options are triggered.
-						// A separate upstream without an override is required to test
-						case "geo-cache":
-							if ns.Proxy.Upstreams[i].Config == nil {
-								ns.Proxy.Upstreams[i].Config = map[string]interface{}{}
-							}
-							ns.Proxy.Upstreams[i].Config["protocol"] = "http2"
-						default:
-							continue
-						}
-					}
-				}, nil)
-			},
-			// TODO(proxystate): requires custom cluster work
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "custom-timeouts",
@@ -429,7 +260,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 					ns.Proxy.Upstreams[0].Config["connect_timeout_ms"] = 2345
 				}, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "custom-passive-healthcheck",
@@ -444,22 +274,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 					}
 				}, nil)
 			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "custom-passive-healthcheck-zero-consecutive_5xx",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Upstreams[0].Config["passive_health_check"] = map[string]interface{}{
-						"enforcing_consecutive_5xx": float64(0),
-						"max_failures":              float64(5),
-						"interval":                  float64(10 * time.Second),
-						"max_ejection_percent":      float64(100),
-						"base_ejection_time":        float64(10 * time.Second),
-					}
-				}, nil)
-			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "custom-max-inbound-connections",
@@ -468,7 +282,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 					ns.Proxy.Config["max_inbound_connections"] = 3456
 				}, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "custom-limits-max-connections-only",
@@ -489,7 +302,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 					}
 				}, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "custom-limits-set-to-zero",
@@ -508,7 +320,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 					}
 				}, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "custom-limits",
@@ -527,14 +338,12 @@ func TestClustersFromSnapshot(t *testing.T) {
 					}
 				}, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "expose-paths-local-app-paths",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotExposeConfig(t, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "downstream-service-with-unix-sockets",
@@ -547,7 +356,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 					ns.Proxy.LocalServiceSocketPath = "/tmp/downstream_proxy.sock"
 				}, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "expose-paths-new-cluster-http2",
@@ -561,89 +369,58 @@ func TestClustersFromSnapshot(t *testing.T) {
 					}
 				})
 			},
-			alsoRunTestForV2: true,
 		},
 		{
-			name:             "expose-checks",
-			create:           proxycfg.TestConfigSnapshotExposeChecks,
-			alsoRunTestForV2: true,
-		},
-		{
-			name:             "expose-paths-grpc-new-cluster-http1",
-			create:           proxycfg.TestConfigSnapshotGRPCExposeHTTP1,
-			alsoRunTestForV2: true,
+			name:   "expose-paths-grpc-new-cluster-http1",
+			create: proxycfg.TestConfigSnapshotGRPCExposeHTTP1,
 		},
 		{
 			name: "mesh-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "default", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "mesh-gateway-using-federation-states",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "federation-states", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "mesh-gateway-using-federation-control-plane",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotMeshGateway(t, "mesh-gateway-federation", nil, nil)
-			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "mesh-gateway-no-services",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "no-services", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "mesh-gateway-service-subsets",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "service-subsets", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "mesh-gateway-ignore-extra-resolvers",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "ignore-extra-resolvers", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "mesh-gateway-service-timeouts",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "service-timeouts", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "mesh-gateway-non-hash-lb-injected",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "non-hash-lb-injected", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "mesh-gateway-hash-lb-ignored",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "hash-lb-ignored", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "mesh-gateway-tcp-keepalives",
@@ -655,8 +432,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 					ns.Proxy.Config["envoy_gateway_remote_tcp_keepalive_probes"] = 7
 				}, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-gateway",
@@ -664,16 +439,12 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"default", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-gateway-nil-config-entry",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotIngressGateway_NilConfigEntry(t)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-gateway-with-tls-outgoing-min-version",
@@ -693,8 +464,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 					},
 				})
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-gateway-with-tls-outgoing-max-version",
@@ -714,8 +483,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 					},
 				})
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-gateway-with-tls-outgoing-cipher-suites",
@@ -738,8 +505,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 					},
 				})
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-gateway-no-services",
@@ -747,8 +512,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, false, "tcp",
 					"default", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-chain",
@@ -756,8 +519,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"simple", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-service-max-connections",
@@ -768,8 +529,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 						entry.Listeners[0].Services[0].MaxConnections = 4096
 					}, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-defaults-service-max-connections",
@@ -784,8 +543,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 						}
 					}, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-overwrite-defaults-service-max-connections",
@@ -801,8 +558,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 						entry.Listeners[0].Services[0].MaxPendingRequests = 2048
 					}, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-service-passive-health-check",
@@ -812,14 +567,11 @@ func TestClustersFromSnapshot(t *testing.T) {
 					func(entry *structs.IngressGatewayConfigEntry) {
 						entry.Listeners[0].Services[0].MaxConnections = 4096
 						entry.Listeners[0].Services[0].PassiveHealthCheck = &structs.PassiveHealthCheck{
-							Interval:           5000000000,
-							MaxFailures:        10,
-							MaxEjectionPercent: uint32ptr(90),
+							Interval:    5000000000,
+							MaxFailures: 10,
 						}
 					}, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-defaults-passive-health-check",
@@ -836,13 +588,10 @@ func TestClustersFromSnapshot(t *testing.T) {
 								Interval:                5000000000,
 								MaxFailures:             10,
 								EnforcingConsecutive5xx: &enforcingConsecutive5xx,
-								MaxEjectionPercent:      uint32ptr(90),
 							},
 						}
 					}, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-overwrite-defaults-passive-health-check",
@@ -857,7 +606,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 							PassiveHealthCheck: &structs.PassiveHealthCheck{
 								Interval:                5000000000,
 								EnforcingConsecutive5xx: &defaultEnforcingConsecutive5xx,
-								MaxEjectionPercent:      uint32ptr(80),
 							},
 						}
 						enforcingConsecutive5xx := uint32(50)
@@ -866,13 +614,9 @@ func TestClustersFromSnapshot(t *testing.T) {
 						entry.Listeners[0].Services[0].PassiveHealthCheck = &structs.PassiveHealthCheck{
 							Interval:                8000000000,
 							EnforcingConsecutive5xx: &enforcingConsecutive5xx,
-							MaxEjectionPercent:      uint32ptr(90),
-							BaseEjectionTime:        durationPtr(12 * time.Second),
 						}
 					}, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-chain-external-sni",
@@ -880,8 +624,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"external-sni", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-chain-and-failover",
@@ -889,8 +631,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-chain-and-failover-to-cluster-peer",
@@ -898,8 +638,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-to-cluster-peer", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-failover-through-remote-gateway",
@@ -907,8 +645,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-remote-gateway", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-failover-through-remote-gateway-triggered",
@@ -916,8 +652,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-remote-gateway-triggered", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-double-failover-through-remote-gateway",
@@ -925,8 +659,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-double-remote-gateway", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered",
@@ -934,8 +666,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-double-remote-gateway-triggered", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-failover-through-local-gateway",
@@ -943,8 +673,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-local-gateway", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-failover-through-local-gateway-triggered",
@@ -952,8 +680,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-local-gateway-triggered", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-double-failover-through-local-gateway",
@@ -961,8 +687,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-double-local-gateway", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-double-failover-through-local-gateway-triggered",
@@ -970,8 +694,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-double-local-gateway-triggered", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-splitter-with-resolver-redirect",
@@ -979,8 +701,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "http",
 					"splitter-with-resolver-redirect-multidc", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-lb-in-resolver",
@@ -988,66 +708,46 @@ func TestClustersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "http",
 					"lb-resolver", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "terminating-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, nil, nil)
 			},
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "terminating-gateway-no-services",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotTerminatingGateway(t, false, nil, nil)
 			},
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name:   "terminating-gateway-service-subsets",
 			create: proxycfg.TestConfigSnapshotTerminatingGatewayServiceSubsetsWebAndCache,
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name:   "terminating-gateway-hostname-service-subsets",
 			create: proxycfg.TestConfigSnapshotTerminatingGatewayHostnameSubsets,
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name:   "terminating-gateway-sni",
 			create: proxycfg.TestConfigSnapshotTerminatingGatewaySNI,
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name:   "terminating-gateway-http2-upstream",
 			create: proxycfg.TestConfigSnapshotTerminatingGatewayHTTP2,
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name:   "terminating-gateway-http2-upstream-subsets",
 			create: proxycfg.TestConfigSnapshotTerminatingGatewaySubsetsHTTP2,
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name:   "terminating-gateway-ignore-extra-resolvers",
 			create: proxycfg.TestConfigSnapshotTerminatingGatewayIgnoreExtraResolvers,
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name:   "terminating-gateway-lb-config",
 			create: proxycfg.TestConfigSnapshotTerminatingGatewayLBConfigNoHashPolicies,
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "terminating-gateway-tcp-keepalives",
@@ -1062,24 +762,18 @@ func TestClustersFromSnapshot(t *testing.T) {
 					ns.Proxy.Config["envoy_gateway_remote_tcp_keepalive_probes"] = 5
 				}, nil)
 			},
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name:   "ingress-multiple-listeners-duplicate-service",
 			create: proxycfg.TestConfigSnapshotIngress_MultipleListenersDuplicateService,
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
-			name:             "transparent-proxy-catalog-destinations-only",
-			create:           proxycfg.TestConfigSnapshotTransparentProxyCatalogDestinationsOnly,
-			alsoRunTestForV2: true,
+			name:   "transparent-proxy-catalog-destinations-only",
+			create: proxycfg.TestConfigSnapshotTransparentProxyCatalogDestinationsOnly,
 		},
 		{
-			name:             "transparent-proxy-dial-instances-directly",
-			create:           proxycfg.TestConfigSnapshotTransparentProxyDialDirectly,
-			alsoRunTestForV2: true,
+			name:   "transparent-proxy-dial-instances-directly",
+			create: proxycfg.TestConfigSnapshotTransparentProxyDialDirectly,
 		},
 	}
 
@@ -1111,10 +805,10 @@ func TestClustersFromSnapshot(t *testing.T) {
 						return clusters[i].(*envoy_cluster_v3.Cluster).Name < clusters[j].(*envoy_cluster_v3.Cluster).Name
 					})
 
-					r, err := response.CreateResponse(xdscommon.ClusterType, "00000001", "00000001", clusters)
+					r, err := createResponse(xdscommon.ClusterType, "00000001", "00000001", clusters)
 					require.NoError(t, err)
 
-					t.Run("current-xdsv1", func(t *testing.T) {
+					t.Run("current", func(t *testing.T) {
 						gotJSON := protoToJSON(t, r)
 
 						gName := tt.name
@@ -1124,40 +818,6 @@ func TestClustersFromSnapshot(t *testing.T) {
 
 						require.JSONEq(t, goldenEnvoy(t, filepath.Join("clusters", gName), envoyVersion, latestEnvoyVersion, gotJSON), gotJSON)
 					})
-
-					if tt.alsoRunTestForV2 {
-						generator := xdsv2.NewResourceGenerator(testutil.Logger(t))
-
-						converter := proxystateconverter.NewConverter(testutil.Logger(t), &mockCfgFetcher{addressLan: "10.10.10.10"})
-						proxyState, err := converter.ProxyStateFromSnapshot(snap)
-						require.NoError(t, err)
-
-						res, err := generator.AllResourcesFromIR(proxyState)
-						require.NoError(t, err)
-
-						clusters = res[xdscommon.ClusterType]
-
-						// The order of clusters returned via CDS isn't relevant, so it's safe
-						// to sort these for the purposes of test comparisons.
-						sort.Slice(clusters, func(i, j int) bool {
-							return clusters[i].(*envoy_cluster_v3.Cluster).Name < clusters[j].(*envoy_cluster_v3.Cluster).Name
-						})
-
-						r, err := response.CreateResponse(xdscommon.ClusterType, "00000001", "00000001", clusters)
-						require.NoError(t, err)
-
-						t.Run("current-xdsv2", func(t *testing.T) {
-							gotJSON := protoToJSON(t, r)
-
-							gName := tt.name
-							if tt.overrideGoldenName != "" {
-								gName = tt.overrideGoldenName
-							}
-
-							expectedJSON := goldenEnvoy(t, filepath.Join("clusters", gName), envoyVersion, latestEnvoyVersion, gotJSON)
-							require.JSONEq(t, expectedJSON, gotJSON)
-						})
-					}
 				})
 			}
 		})
@@ -1213,41 +873,6 @@ func customAppClusterJSON(t testinf.T, opts customClusterJSONOptions) string {
 	return buf.String()
 }
 
-var customClusterJSONTpl = `{
-	"@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-	"name": "{{ .Name }}",
-	"connectTimeout": "15s",
-	"loadAssignment": {
-		"clusterName": "{{ .Name }}",
-		"endpoints": [
-			{
-				"lbEndpoints": [
-					{
-						"endpoint": {
-							"address": {
-								"socketAddress": {
-									"address": "1.2.3.4",
-									"portValue": 8443
-								}
-							}
-						}
-					}
-				]
-			}
-		]
-	}
-}`
-
-var customClusterJSONTemplate = template.Must(template.New("").Parse(customClusterJSONTpl))
-
-func customClusterJSON(t testinf.T, opts customClusterJSONOptions) string {
-	t.Helper()
-	var buf bytes.Buffer
-	err := customClusterJSONTemplate.Execute(&buf, opts)
-	require.NoError(t, err)
-	return buf.String()
-}
-
 func TestEnvoyLBConfig_InjectToCluster(t *testing.T) {
 	var tests = []struct {
 		name     string
@@ -1331,379 +956,7 @@ func TestEnvoyLBConfig_InjectToCluster(t *testing.T) {
 	}
 }
 
-func TestMakeJWTProviderCluster(t *testing.T) {
-	// All tests here depend on golden files located under: agent/xds/testdata/jwt_authn_cluster/*
-	tests := map[string]struct {
-		provider      *structs.JWTProviderConfigEntry
-		expectedError string
-	}{
-		"remote-jwks-not-configured": {
-			provider: &structs.JWTProviderConfigEntry{
-				Kind:          "jwt-provider",
-				Name:          "okta",
-				JSONWebKeySet: &structs.JSONWebKeySet{},
-			},
-			expectedError: "cannot create JWKS cluster for non remote JWKS. Provider Name: okta",
-		},
-		"local-jwks-configured": {
-			provider: &structs.JWTProviderConfigEntry{
-				Kind: "jwt-provider",
-				Name: "okta",
-				JSONWebKeySet: &structs.JSONWebKeySet{
-					Local: &structs.LocalJWKS{
-						Filename: "filename",
-					},
-				},
-			},
-			expectedError: "cannot create JWKS cluster for non remote JWKS. Provider Name: okta",
-		},
-		"https-provider-with-hostname-no-port": {
-			provider: makeTestProviderWithJWKS("https://example-okta.com/.well-known/jwks.json"),
-		},
-		"http-provider-with-hostname-no-port": {
-			provider: makeTestProviderWithJWKS("http://example-okta.com/.well-known/jwks.json"),
-		},
-		"https-provider-with-hostname-and-port": {
-			provider: makeTestProviderWithJWKS("https://example-okta.com:90/.well-known/jwks.json"),
-		},
-		"http-provider-with-hostname-and-port": {
-			provider: makeTestProviderWithJWKS("http://example-okta.com:90/.well-known/jwks.json"),
-		},
-		"https-provider-with-ip-no-port": {
-			provider: makeTestProviderWithJWKS("https://127.0.0.1"),
-		},
-		"http-provider-with-ip-no-port": {
-			provider: makeTestProviderWithJWKS("http://127.0.0.1"),
-		},
-		"https-provider-with-ip-and-port": {
-			provider: makeTestProviderWithJWKS("https://127.0.0.1:9091"),
-		},
-		"http-provider-with-ip-and-port": {
-			provider: makeTestProviderWithJWKS("http://127.0.0.1:9091"),
-		},
-	}
-
-	for name, tt := range tests {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			cluster, err := makeJWTProviderCluster(tt.provider)
-			if tt.expectedError != "" {
-				require.Error(t, err, tt.expectedError)
-			} else {
-				require.NoError(t, err)
-				gotJSON := protoToJSON(t, cluster)
-				require.JSONEq(t, goldenSimple(t, filepath.Join("jwt_authn_clusters", name), gotJSON), gotJSON)
-			}
-
-		})
-	}
-}
-
-func makeTestProviderWithJWKS(uri string) *structs.JWTProviderConfigEntry {
-	return &structs.JWTProviderConfigEntry{
-		Kind:   "jwt-provider",
-		Name:   "okta",
-		Issuer: "test-issuer",
-		JSONWebKeySet: &structs.JSONWebKeySet{
-			Remote: &structs.RemoteJWKS{
-				RequestTimeoutMs:    1000,
-				FetchAsynchronously: true,
-				URI:                 uri,
-				JWKSCluster: &structs.JWKSCluster{
-					DiscoveryType:  structs.DiscoveryTypeStatic,
-					ConnectTimeout: time.Duration(5) * time.Second,
-					TLSCertificates: &structs.JWKSTLSCertificate{
-						TrustedCA: &structs.JWKSTLSCertTrustedCA{
-							Filename: "mycert.crt",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func TestMakeJWKSDiscoveryClusterType(t *testing.T) {
-	tests := map[string]struct {
-		remoteJWKS          *structs.RemoteJWKS
-		expectedClusterType *envoy_cluster_v3.Cluster_Type
-	}{
-		"nil remote jwks": {
-			remoteJWKS:          nil,
-			expectedClusterType: &envoy_cluster_v3.Cluster_Type{},
-		},
-		"nil jwks cluster": {
-			remoteJWKS:          &structs.RemoteJWKS{},
-			expectedClusterType: &envoy_cluster_v3.Cluster_Type{},
-		},
-		"jwks cluster defaults to Strict DNS": {
-			remoteJWKS: &structs.RemoteJWKS{
-				JWKSCluster: &structs.JWKSCluster{},
-			},
-			expectedClusterType: &envoy_cluster_v3.Cluster_Type{
-				Type: envoy_cluster_v3.Cluster_STRICT_DNS,
-			},
-		},
-		"jwks with cluster EDS": {
-			remoteJWKS: &structs.RemoteJWKS{
-				JWKSCluster: &structs.JWKSCluster{
-					DiscoveryType: "EDS",
-				},
-			},
-			expectedClusterType: &envoy_cluster_v3.Cluster_Type{
-				Type: envoy_cluster_v3.Cluster_EDS,
-			},
-		},
-		"jwks with static dns": {
-			remoteJWKS: &structs.RemoteJWKS{
-				JWKSCluster: &structs.JWKSCluster{
-					DiscoveryType: "STATIC",
-				},
-			},
-			expectedClusterType: &envoy_cluster_v3.Cluster_Type{
-				Type: envoy_cluster_v3.Cluster_STATIC,
-			},
-		},
-
-		"jwks with original dst": {
-			remoteJWKS: &structs.RemoteJWKS{
-				JWKSCluster: &structs.JWKSCluster{
-					DiscoveryType: "ORIGINAL_DST",
-				},
-			},
-			expectedClusterType: &envoy_cluster_v3.Cluster_Type{
-				Type: envoy_cluster_v3.Cluster_ORIGINAL_DST,
-			},
-		},
-		"jwks with strict dns": {
-			remoteJWKS: &structs.RemoteJWKS{
-				JWKSCluster: &structs.JWKSCluster{
-					DiscoveryType: "STRICT_DNS",
-				},
-			},
-			expectedClusterType: &envoy_cluster_v3.Cluster_Type{
-				Type: envoy_cluster_v3.Cluster_STRICT_DNS,
-			},
-		},
-		"jwks with logical dns": {
-			remoteJWKS: &structs.RemoteJWKS{
-				JWKSCluster: &structs.JWKSCluster{
-					DiscoveryType: "LOGICAL_DNS",
-				},
-			},
-			expectedClusterType: &envoy_cluster_v3.Cluster_Type{
-				Type: envoy_cluster_v3.Cluster_LOGICAL_DNS,
-			},
-		},
-	}
-
-	for name, tt := range tests {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			clusterType := makeJWKSDiscoveryClusterType(tt.remoteJWKS)
-
-			require.Equal(t, tt.expectedClusterType, clusterType)
-		})
-	}
-}
-
-func TestParseJWTRemoteURL(t *testing.T) {
-	tests := map[string]struct {
-		uri            string
-		expectedHost   string
-		expectedPort   int
-		expectedScheme string
-		expectError    bool
-	}{
-		"invalid-url": {
-			uri:         ".com",
-			expectError: true,
-		},
-		"https-hostname-no-port": {
-			uri:            "https://test.test.com",
-			expectedHost:   "test.test.com",
-			expectedPort:   443,
-			expectedScheme: "https",
-		},
-		"https-hostname-with-port": {
-			uri:            "https://test.test.com:4545",
-			expectedHost:   "test.test.com",
-			expectedPort:   4545,
-			expectedScheme: "https",
-		},
-		"https-hostname-with-port-and-path": {
-			uri:            "https://test.test.com:4545/test",
-			expectedHost:   "test.test.com",
-			expectedPort:   4545,
-			expectedScheme: "https",
-		},
-		"http-hostname-no-port": {
-			uri:            "http://test.test.com",
-			expectedHost:   "test.test.com",
-			expectedPort:   80,
-			expectedScheme: "http",
-		},
-		"http-hostname-with-port": {
-			uri:            "http://test.test.com:4636",
-			expectedHost:   "test.test.com",
-			expectedPort:   4636,
-			expectedScheme: "http",
-		},
-		"https-ip-no-port": {
-			uri:            "https://127.0.0.1",
-			expectedHost:   "127.0.0.1",
-			expectedPort:   443,
-			expectedScheme: "https",
-		},
-		"https-ip-with-port": {
-			uri:            "https://127.0.0.1:3434",
-			expectedHost:   "127.0.0.1",
-			expectedPort:   3434,
-			expectedScheme: "https",
-		},
-		"http-ip-no-port": {
-			uri:            "http://127.0.0.1",
-			expectedHost:   "127.0.0.1",
-			expectedPort:   80,
-			expectedScheme: "http",
-		},
-		"http-ip-with-port": {
-			uri:            "http://127.0.0.1:9190",
-			expectedHost:   "127.0.0.1",
-			expectedPort:   9190,
-			expectedScheme: "http",
-		},
-		"http-ip-with-port-and-path": {
-			uri:            "http://127.0.0.1:9190/some/where",
-			expectedHost:   "127.0.0.1",
-			expectedPort:   9190,
-			expectedScheme: "http",
-		},
-		"http-ip-no-port-with-path": {
-			uri:            "http://127.0.0.1/test/path",
-			expectedHost:   "127.0.0.1",
-			expectedPort:   80,
-			expectedScheme: "http",
-		},
-	}
-
-	for name, tt := range tests {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			host, scheme, port, err := parseJWTRemoteURL(tt.uri)
-			if tt.expectError {
-				require.Error(t, err)
-			} else {
-				require.NoError(t, err)
-				require.Equal(t, host, tt.expectedHost)
-				require.Equal(t, scheme, tt.expectedScheme)
-				require.Equal(t, port, tt.expectedPort)
-			}
-		})
-	}
-}
-
 // UID is just a convenience function to aid in writing tests less verbosely.
 func UID(input string) proxycfg.UpstreamID {
 	return proxycfg.UpstreamIDFromString(input)
 }
-
-func TestMakeJWTCertValidationContext(t *testing.T) {
-	tests := map[string]struct {
-		jwksCluster *structs.JWKSCluster
-		expected    *envoy_tls_v3.CertificateValidationContext
-	}{
-		"when nil": {
-			jwksCluster: nil,
-			expected:    &envoy_tls_v3.CertificateValidationContext{},
-		},
-		"when trustedCA with filename": {
-			jwksCluster: &structs.JWKSCluster{
-				TLSCertificates: &structs.JWKSTLSCertificate{
-					TrustedCA: &structs.JWKSTLSCertTrustedCA{
-						Filename: "file.crt",
-					},
-				},
-			},
-			expected: &envoy_tls_v3.CertificateValidationContext{
-				TrustedCa: &envoy_core_v3.DataSource{
-					Specifier: &envoy_core_v3.DataSource_Filename{
-						Filename: "file.crt",
-					},
-				},
-			},
-		},
-		"when trustedCA with environment variable": {
-			jwksCluster: &structs.JWKSCluster{
-				TLSCertificates: &structs.JWKSTLSCertificate{
-					TrustedCA: &structs.JWKSTLSCertTrustedCA{
-						EnvironmentVariable: "MY_ENV",
-					},
-				},
-			},
-			expected: &envoy_tls_v3.CertificateValidationContext{
-				TrustedCa: &envoy_core_v3.DataSource{
-					Specifier: &envoy_core_v3.DataSource_EnvironmentVariable{
-						EnvironmentVariable: "MY_ENV",
-					},
-				},
-			},
-		},
-		"when trustedCA with inline string": {
-			jwksCluster: &structs.JWKSCluster{
-				TLSCertificates: &structs.JWKSTLSCertificate{
-					TrustedCA: &structs.JWKSTLSCertTrustedCA{
-						InlineString: "<my ca cert>",
-					},
-				},
-			},
-			expected: &envoy_tls_v3.CertificateValidationContext{
-				TrustedCa: &envoy_core_v3.DataSource{
-					Specifier: &envoy_core_v3.DataSource_InlineString{
-						InlineString: "<my ca cert>",
-					},
-				},
-			},
-		},
-		"when trustedCA with inline bytes": {
-			jwksCluster: &structs.JWKSCluster{
-				TLSCertificates: &structs.JWKSTLSCertificate{
-					TrustedCA: &structs.JWKSTLSCertTrustedCA{
-						InlineBytes: []byte{1, 2, 3},
-					},
-				},
-			},
-			expected: &envoy_tls_v3.CertificateValidationContext{
-				TrustedCa: &envoy_core_v3.DataSource{
-					Specifier: &envoy_core_v3.DataSource_InlineBytes{
-						InlineBytes: []byte{1, 2, 3},
-					},
-				},
-			},
-		},
-		"when caCertificateProviderInstance": {
-			jwksCluster: &structs.JWKSCluster{
-				TLSCertificates: &structs.JWKSTLSCertificate{
-					CaCertificateProviderInstance: &structs.JWKSTLSCertProviderInstance{
-						InstanceName:    "<my-instance-name>",
-						CertificateName: "<my-cert>.crt",
-					},
-				},
-			},
-			expected: &envoy_tls_v3.CertificateValidationContext{
-				CaCertificateProviderInstance: &envoy_tls_v3.CertificateProviderPluginInstance{
-					InstanceName:    "<my-instance-name>",
-					CertificateName: "<my-cert>.crt",
-				},
-			},
-		},
-	}
-	for name, tt := range tests {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			vc := makeJWTCertValidationContext(tt.jwksCluster)
-
-			require.Equal(t, tt.expected, vc)
-		})
-	}
-}
diff --git a/agent/xds/config/config.go b/agent/xds/config.go
similarity index 95%
rename from agent/xds/config/config.go
rename to agent/xds/config.go
index 32c46d07d3ef6..2416425548808 100644
--- a/agent/xds/config/config.go
+++ b/agent/xds/config.go
@@ -1,7 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package config
+package xds
 
 import (
 	"strings"
@@ -203,13 +200,12 @@ func ToOutlierDetection(p *structs.PassiveHealthCheck, override *structs.Passive
 			} else if allowZero {
 				od.EnforcingConsecutive_5Xx = &wrapperspb.UInt32Value{Value: *p.EnforcingConsecutive5xx}
 			}
-		}
-
-		if p.MaxEjectionPercent != nil {
-			od.MaxEjectionPercent = &wrapperspb.UInt32Value{Value: *p.MaxEjectionPercent}
-		}
-		if p.BaseEjectionTime != nil {
-			od.BaseEjectionTime = durationpb.New(*p.BaseEjectionTime)
+			if p.MaxEjectionPercent != nil {
+				od.MaxEjectionPercent = &wrapperspb.UInt32Value{Value: *p.MaxEjectionPercent}
+			}
+			if p.BaseEjectionTime != nil {
+				od.BaseEjectionTime = durationpb.New(*p.BaseEjectionTime)
+			}
 		}
 	}
 
@@ -229,9 +225,9 @@ func ToOutlierDetection(p *structs.PassiveHealthCheck, override *structs.Passive
 		// NOTE: EnforcingConsecutive5xx must be great than 0 for ingress-gateway
 		if *override.EnforcingConsecutive5xx != 0 {
 			od.EnforcingConsecutive_5Xx = &wrapperspb.UInt32Value{Value: *override.EnforcingConsecutive5xx}
+		} else if allowZero {
+			od.EnforcingConsecutive_5Xx = &wrapperspb.UInt32Value{Value: *override.EnforcingConsecutive5xx}
 		}
-		// Because only ingress gateways have overrides and they cannot have a value of 0, there is no allowZero
-		// override case to handle
 	}
 
 	if override.MaxEjectionPercent != nil {
diff --git a/agent/xds/config/config_test.go b/agent/xds/config_test.go
similarity index 98%
rename from agent/xds/config/config_test.go
rename to agent/xds/config_test.go
index 72e9a0e614614..89bd7a6c0a854 100644
--- a/agent/xds/config/config_test.go
+++ b/agent/xds/config_test.go
@@ -1,7 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package config
+package xds
 
 import (
 	"testing"
diff --git a/agent/xds/configfetcher/config_fetcher.go b/agent/xds/configfetcher/config_fetcher.go
deleted file mode 100644
index db7d4f2035d23..0000000000000
--- a/agent/xds/configfetcher/config_fetcher.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package configfetcher
-
-// ConfigFetcher is the interface the agent needs to expose
-// for the xDS server to fetch agent config, currently only one field is fetched
-type ConfigFetcher interface {
-	AdvertiseAddrLAN() string
-}
diff --git a/agent/xds/delta.go b/agent/xds/delta.go
index f5d07e2763ae8..62a725b8f1b12 100644
--- a/agent/xds/delta.go
+++ b/agent/xds/delta.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
@@ -17,8 +14,7 @@ import (
 	envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
 	envoy_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
-	"github.com/hashicorp/go-hclog"
-	goversion "github.com/hashicorp/go-version"
+
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/proto"
@@ -28,16 +24,10 @@ import (
 	external "github.com/hashicorp/consul/agent/grpc-external"
 	"github.com/hashicorp/consul/agent/grpc-external/limiter"
 	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/xds/configfetcher"
+	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/xds/extensionruntime"
-	"github.com/hashicorp/consul/agent/xdsv2"
-	"github.com/hashicorp/consul/envoyextensions/extensioncommon"
 	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
-	proxytracker "github.com/hashicorp/consul/internal/mesh/proxy-tracker"
 	"github.com/hashicorp/consul/logging"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"github.com/hashicorp/consul/version"
 )
 
@@ -88,39 +78,6 @@ func (s *Server) DeltaAggregatedResources(stream ADSDeltaStream) error {
 	return err
 }
 
-// getEnvoyConfiguration is a utility function that instantiates the proper
-// Envoy resource generator based on whether it was passed a ConfigSource or
-// ProxyState implementation of the ProxySnapshot interface and returns the
-// generated Envoy configuration.
-func getEnvoyConfiguration(proxySnapshot proxysnapshot.ProxySnapshot, logger hclog.Logger, cfgFetcher configfetcher.ConfigFetcher) (map[string][]proto.Message, error) {
-	switch proxySnapshot.(type) {
-	case *proxycfg.ConfigSnapshot:
-		logger.Trace("ProxySnapshot update channel received a ProxySnapshot of type ConfigSnapshot")
-		generator := NewResourceGenerator(
-			logger,
-			cfgFetcher,
-			true,
-		)
-
-		c := proxySnapshot.(*proxycfg.ConfigSnapshot)
-		return generator.AllResourcesFromSnapshot(c)
-	case *proxytracker.ProxyState:
-		logger.Trace("ProxySnapshot update channel received a ProxySnapshot of type ProxyState")
-		generator := xdsv2.NewResourceGenerator(
-			logger,
-		)
-		c := proxySnapshot.(*proxytracker.ProxyState)
-		resources, err := generator.AllResourcesFromIR(c)
-		if err != nil {
-			logger.Error("error generating resources from proxy state template", "err", err)
-			return nil, err
-		}
-		return resources, nil
-	default:
-		return nil, errors.New("proxysnapshot must be of type ProxyState or ConfigSnapshot")
-	}
-}
-
 const (
 	stateDeltaInit int = iota
 	stateDeltaPendingInitialConfig
@@ -135,13 +92,14 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove
 
 	// Loop state
 	var (
-		proxySnapshot proxysnapshot.ProxySnapshot
-		node          *envoy_config_core_v3.Node
-		stateCh       <-chan proxysnapshot.ProxySnapshot
-		drainCh       limiter.SessionTerminatedChan
-		watchCancel   func()
-		nonce         uint64 // xDS requires a unique nonce to correlate response/request pairs
-		ready         bool   // set to true after the first snapshot arrives
+		cfgSnap     *proxycfg.ConfigSnapshot
+		node        *envoy_config_core_v3.Node
+		stateCh     <-chan *proxycfg.ConfigSnapshot
+		drainCh     limiter.SessionTerminatedChan
+		watchCancel func()
+		proxyID     structs.ServiceID
+		nonce       uint64 // xDS requires a unique nonce to correlate response/request pairs
+		ready       bool   // set to true after the first snapshot arrives
 
 		streamStartTime = time.Now()
 		streamStartOnce sync.Once
@@ -153,30 +111,42 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove
 		// type => name => proto
 		resourceMap = xdscommon.EmptyIndexedResources()
 
-		// currentVersions is the xDS versioning represented by Resources.
+		// currentVersions is the the xDS versioning represented by Resources.
 		//
 		// type => name => version (as consul knows right now)
 		currentVersions = make(map[string]map[string]string)
 	)
 
-	logger := s.Logger.Named(logging.XDS).With("xdsVersion", "v3")
+	generator := NewResourceGenerator(
+		s.Logger.Named(logging.XDS).With("xdsVersion", "v3"),
+		s.CfgFetcher,
+		true,
+	)
 
 	// need to run a small state machine to get through initial authentication.
 	var state = stateDeltaInit
 
 	// Configure handlers for each type of request we currently care about.
 	handlers := map[string]*xDSDeltaType{
-		xdscommon.ListenerType: newDeltaType(logger, stream, xdscommon.ListenerType, func() bool {
-			return proxySnapshot.AllowEmptyListeners()
+		xdscommon.ListenerType: newDeltaType(generator, stream, xdscommon.ListenerType, func(kind structs.ServiceKind) bool {
+			// Ingress and API gateways are allowed to inform LDS of no listeners.
+			return cfgSnap.Kind == structs.ServiceKindIngressGateway ||
+				cfgSnap.Kind == structs.ServiceKindAPIGateway
 		}),
-		xdscommon.RouteType: newDeltaType(logger, stream, xdscommon.RouteType, func() bool {
-			return proxySnapshot.AllowEmptyRoutes()
+		xdscommon.RouteType: newDeltaType(generator, stream, xdscommon.RouteType, func(kind structs.ServiceKind) bool {
+			// Ingress and API gateways are allowed to inform RDS of no routes.
+			return cfgSnap.Kind == structs.ServiceKindIngressGateway ||
+				cfgSnap.Kind == structs.ServiceKindAPIGateway
 		}),
-		xdscommon.ClusterType: newDeltaType(logger, stream, xdscommon.ClusterType, func() bool {
-			return proxySnapshot.AllowEmptyClusters()
+		xdscommon.ClusterType: newDeltaType(generator, stream, xdscommon.ClusterType, func(kind structs.ServiceKind) bool {
+			// Mesh, Ingress, API and Terminating gateways are allowed to inform CDS of no clusters.
+			return cfgSnap.Kind == structs.ServiceKindMeshGateway ||
+				cfgSnap.Kind == structs.ServiceKindTerminatingGateway ||
+				cfgSnap.Kind == structs.ServiceKindIngressGateway ||
+				cfgSnap.Kind == structs.ServiceKindAPIGateway
 		}),
-		xdscommon.EndpointType: newDeltaType(logger, stream, xdscommon.EndpointType, nil),
-		xdscommon.SecretType:   newDeltaType(logger, stream, xdscommon.SecretType, nil), // TODO allowEmptyFn
+		xdscommon.EndpointType: newDeltaType(generator, stream, xdscommon.EndpointType, nil),
+		xdscommon.SecretType:   newDeltaType(generator, stream, xdscommon.SecretType, nil), // TODO allowEmptyFn
 	}
 
 	// Endpoints are stored within a Cluster (and Routes
@@ -202,19 +172,19 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove
 		authTimer = time.After(s.AuthCheckFrequency)
 	}
 
-	checkStreamACLs := func(proxySnap proxysnapshot.ProxySnapshot) error {
-		return s.authorize(stream.Context(), proxySnap)
+	checkStreamACLs := func(cfgSnap *proxycfg.ConfigSnapshot) error {
+		return s.authorize(stream.Context(), cfgSnap)
 	}
 
 	for {
 		select {
 		case <-drainCh:
-			logger.Debug("draining stream to rebalance load")
+			generator.Logger.Debug("draining stream to rebalance load")
 			metrics.IncrCounter([]string{"xds", "server", "streamDrained"}, 1)
 			return errOverwhelmed
 		case <-authTimer:
 			// It's been too long since a Discovery{Request,Response} so recheck ACLs.
-			if err := checkStreamACLs(proxySnapshot); err != nil {
+			if err := checkStreamACLs(cfgSnap); err != nil {
 				return err
 			}
 			extendAuthTimer()
@@ -228,29 +198,28 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove
 				return nil
 			}
 
-			logTraceRequest(logger, "Incremental xDS v3", req)
+			generator.logTraceRequest("Incremental xDS v3", req)
 
 			if req.TypeUrl == "" {
 				return status.Errorf(codes.InvalidArgument, "type URL is required for ADS")
 			}
 
-			var proxyFeatures xdscommon.SupportedProxyFeatures
 			if node == nil && req.Node != nil {
 				node = req.Node
 				var err error
-				proxyFeatures, err = xdscommon.DetermineSupportedProxyFeatures(req.Node)
+				generator.ProxyFeatures, err = xdscommon.DetermineSupportedProxyFeatures(req.Node)
 				if err != nil {
 					return status.Errorf(codes.InvalidArgument, err.Error())
 				}
 			}
 
 			if handler, ok := handlers[req.TypeUrl]; ok {
-				switch handler.Recv(req, proxyFeatures) {
+				switch handler.Recv(req, generator.ProxyFeatures) {
 				case deltaRecvNewSubscription:
-					logger.Trace("subscribing to type", "typeUrl", req.TypeUrl)
+					generator.Logger.Trace("subscribing to type", "typeUrl", req.TypeUrl)
 
 				case deltaRecvResponseNack:
-					logger.Trace("got nack response for type", "typeUrl", req.TypeUrl)
+					generator.Logger.Trace("got nack response for type", "typeUrl", req.TypeUrl)
 
 					// There is no reason to believe that generating new xDS resources from the same snapshot
 					// would lead to an ACK from Envoy. Instead we continue to the top of this for loop and wait
@@ -269,21 +238,21 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove
 				// would've already exited this loop.
 				return status.Error(codes.Aborted, "xDS stream terminated due to an irrecoverable error, please try again")
 			}
-			proxySnapshot = cs
+			cfgSnap = cs
 
-			newRes, err := getEnvoyConfiguration(proxySnapshot, logger, s.CfgFetcher)
+			newRes, err := generator.AllResourcesFromSnapshot(cfgSnap)
 			if err != nil {
 				return status.Errorf(codes.Unavailable, "failed to generate all xDS resources from the snapshot: %v", err)
 			}
 
 			// index and hash the xDS structures
-			newResourceMap := xdscommon.IndexResources(logger, newRes)
+			newResourceMap := xdscommon.IndexResources(generator.Logger, newRes)
 
 			if s.ResourceMapMutateFn != nil {
 				s.ResourceMapMutateFn(newResourceMap)
 			}
 
-			if newResourceMap, err = s.applyEnvoyExtensions(newResourceMap, proxySnapshot, node); err != nil {
+			if err = s.applyEnvoyExtensions(newResourceMap, cfgSnap); err != nil {
 				// err is already the result of calling status.Errorf
 				return err
 			}
@@ -317,7 +286,7 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove
 			}
 
 			// Start authentication process, we need the proxyID
-			proxyID := newResourceIDFromEnvoyNode(node)
+			proxyID = structs.NewServiceID(node.Id, parseEnterpriseMeta(node))
 
 			// Start watching config for that proxy
 			var err error
@@ -326,12 +295,12 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove
 				return status.Errorf(codes.Internal, "failed to watch proxy service: %s", err)
 			}
 
-			stateCh, drainCh, watchCancel, err = s.ProxyWatcher.Watch(proxyID, nodeName, options.Token)
+			stateCh, drainCh, watchCancel, err = s.CfgSrc.Watch(proxyID, nodeName, options.Token)
 			switch {
 			case errors.Is(err, limiter.ErrCapacityReached):
 				return errOverwhelmed
 			case err != nil:
-				return status.Errorf(codes.Internal, "failed to watch proxy: %s", err)
+				return status.Errorf(codes.Internal, "failed to watch proxy service: %s", err)
 			}
 			// Note that in this case we _intend_ the defer to only be triggered when
 			// this whole process method ends (i.e. when streaming RPC aborts) not at
@@ -340,14 +309,14 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove
 			// state machine.
 			defer watchCancel()
 
-			logger = logger.With("service_id", proxyID.Name) // enhance future logs
+			generator.Logger = generator.Logger.With("service_id", proxyID.String()) // enhance future logs
 
-			logger.Trace("watching proxy, pending initial proxycfg snapshot for xDS")
+			generator.Logger.Trace("watching proxy, pending initial proxycfg snapshot for xDS")
 
 			// Now wait for the config so we can check ACL
 			state = stateDeltaPendingInitialConfig
 		case stateDeltaPendingInitialConfig:
-			if proxySnapshot == nil {
+			if cfgSnap == nil {
 				// Nothing we can do until we get the initial config
 				continue
 			}
@@ -356,18 +325,23 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove
 			state = stateDeltaRunning
 
 			// Upgrade the logger
-			loggerName := proxySnapshot.LoggerName()
-			if loggerName != "" {
-				logger = logger.Named(loggerName)
+			switch cfgSnap.Kind {
+			case structs.ServiceKindConnectProxy:
+			case structs.ServiceKindTerminatingGateway:
+				generator.Logger = generator.Logger.Named(logging.TerminatingGateway)
+			case structs.ServiceKindMeshGateway:
+				generator.Logger = generator.Logger.Named(logging.MeshGateway)
+			case structs.ServiceKindIngressGateway:
+				generator.Logger = generator.Logger.Named(logging.IngressGateway)
 			}
 
-			logger.Trace("Got initial config snapshot")
+			generator.Logger.Trace("Got initial config snapshot")
 
 			// Let's actually process the config we just got, or we'll miss responding
 			fallthrough
 		case stateDeltaRunning:
 			// Check ACLs on every Discovery{Request,Response}.
-			if err := checkStreamACLs(proxySnapshot); err != nil {
+			if err := checkStreamACLs(cfgSnap); err != nil {
 				return err
 			}
 			// For the first time through the state machine, this is when the
@@ -375,11 +349,11 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove
 			extendAuthTimer()
 
 			if !ready {
-				logger.Trace("Skipping delta computation because we haven't gotten a snapshot yet")
+				generator.Logger.Trace("Skipping delta computation because we haven't gotten a snapshot yet")
 				continue
 			}
 
-			logger.Trace("Invoking all xDS resource handlers and sending changed data if there are any")
+			generator.Logger.Trace("Invoking all xDS resource handlers and sending changed data if there are any")
 
 			streamStartOnce.Do(func() {
 				metrics.MeasureSince([]string{"xds", "server", "streamStart"}, streamStartTime)
@@ -388,7 +362,7 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove
 			for _, op := range xDSUpdateOrder {
 				if op.TypeUrl == xdscommon.ListenerType || op.TypeUrl == xdscommon.RouteType {
 					if clusterHandler := handlers[xdscommon.ClusterType]; clusterHandler.registered && len(clusterHandler.pendingUpdates) > 0 {
-						logger.Trace("Skipping delta computation for resource because there are dependent updates pending",
+						generator.Logger.Trace("Skipping delta computation for resource because there are dependent updates pending",
 							"typeUrl", op.TypeUrl, "dependent", xdscommon.ClusterType)
 
 						// Receiving an ACK from Envoy will unblock the select statement above,
@@ -396,7 +370,7 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove
 						break
 					}
 					if endpointHandler := handlers[xdscommon.EndpointType]; endpointHandler.registered && len(endpointHandler.pendingUpdates) > 0 {
-						logger.Trace("Skipping delta computation for resource because there are dependent updates pending",
+						generator.Logger.Trace("Skipping delta computation for resource because there are dependent updates pending",
 							"typeUrl", op.TypeUrl, "dependent", xdscommon.EndpointType)
 
 						// Receiving an ACK from Envoy will unblock the select statement above,
@@ -404,7 +378,14 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove
 						break
 					}
 				}
-				err, _ := handlers[op.TypeUrl].SendIfNew(currentVersions[op.TypeUrl], resourceMap, &nonce, op.Upsert, op.Remove)
+				err, _ := handlers[op.TypeUrl].SendIfNew(
+					cfgSnap.Kind,
+					currentVersions[op.TypeUrl],
+					resourceMap,
+					&nonce,
+					op.Upsert,
+					op.Remove,
+				)
 				if err != nil {
 					return status.Errorf(codes.Unavailable,
 						"failed to send %sreply for type %q: %v",
@@ -416,196 +397,73 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove
 	}
 }
 
-// newResourceIDFromEnvoyNode is a utility function that allows creating a
-// Resource ID from an Envoy proxy node so that existing delta calls can easily
-// use ProxyWatcher interface arguments for Watch().
-func newResourceIDFromEnvoyNode(node *envoy_config_core_v3.Node) *pbresource.ID {
-	entMeta := parseEnterpriseMeta(node)
-
-	return &pbresource.ID{
-		Name: node.Id,
-		Tenancy: &pbresource.Tenancy{
-			Namespace: entMeta.NamespaceOrDefault(),
-			Partition: entMeta.PartitionOrDefault(),
-		},
-		Type: pbmesh.ProxyStateTemplateType,
-	}
-}
-
-func (s *Server) applyEnvoyExtensions(resources *xdscommon.IndexedResources, proxySnapshot proxysnapshot.ProxySnapshot, node *envoy_config_core_v3.Node) (*xdscommon.IndexedResources, error) {
-	// TODO(proxystate)
-	// This is a workaround for now as envoy extensions are not yet supported with ProxyState.
-	// For now, we cast to proxycfg.ConfigSnapshot and no-op if it's the pbmesh.ProxyState type.
-	var snapshot *proxycfg.ConfigSnapshot
-	switch proxySnapshot.(type) {
-	//TODO(proxystate): implement envoy extensions for ProxyState
-	case *proxytracker.ProxyState:
-		return resources, nil
-	case *proxycfg.ConfigSnapshot:
-		snapshot = proxySnapshot.(*proxycfg.ConfigSnapshot)
-	default:
-		return nil, status.Errorf(codes.InvalidArgument,
-			"unsupported config snapshot type to apply envoy extensions to %T", proxySnapshot)
-	}
-	var err error
-	envoyVersion := xdscommon.DetermineEnvoyVersionFromNode(node)
-	consulVersion, err := goversion.NewVersion(version.Version)
-
-	if err != nil {
-		return nil, status.Errorf(codes.InvalidArgument, "failed to parse Consul version")
-	}
-
-	serviceConfigs := extensionruntime.GetRuntimeConfigurations(snapshot)
+func (s *Server) applyEnvoyExtensions(resources *xdscommon.IndexedResources, cfgSnap *proxycfg.ConfigSnapshot) error {
+	serviceConfigs := extensionruntime.GetRuntimeConfigurations(cfgSnap)
 	for _, cfgs := range serviceConfigs {
 		for _, cfg := range cfgs {
-			resources, err = validateAndApplyEnvoyExtension(s.Logger, snapshot, resources, cfg, envoyVersion, consulVersion)
-
-			if err != nil {
-				return nil, err
+			logFn := s.Logger.Warn
+			if cfg.EnvoyExtension.Required {
+				logFn = s.Logger.Error
+			}
+			errorParams := []interface{}{
+				"extension", cfg.EnvoyExtension.Name,
+				"service", cfg.ServiceName.Name,
+				"namespace", cfg.ServiceName.Namespace,
+				"partition", cfg.ServiceName.Partition,
+			}
+
+			getMetricLabels := func(err error) []metrics.Label {
+				return []metrics.Label{
+					{Name: "extension", Value: cfg.EnvoyExtension.Name},
+					{Name: "version", Value: "builtin/" + version.Version},
+					{Name: "service", Value: cfgSnap.Service},
+					{Name: "partition", Value: cfgSnap.ProxyID.PartitionOrDefault()},
+					{Name: "namespace", Value: cfgSnap.ProxyID.NamespaceOrDefault()},
+					{Name: "error", Value: strconv.FormatBool(err != nil)},
+				}
 			}
-		}
-	}
-
-	return resources, nil
-}
-
-func validateAndApplyEnvoyExtension(logger hclog.Logger, cfgSnap *proxycfg.ConfigSnapshot, resources *xdscommon.IndexedResources, runtimeConfig extensioncommon.RuntimeConfig, envoyVersion, consulVersion *goversion.Version) (*xdscommon.IndexedResources, error) {
-	logFn := logger.Warn
-	if runtimeConfig.EnvoyExtension.Required {
-		logFn = logger.Error
-	}
-
-	svc := runtimeConfig.ServiceName
-
-	errorParams := []interface{}{
-		"extension", runtimeConfig.EnvoyExtension.Name,
-		"service", svc.Name,
-		"namespace", svc.Namespace,
-		"partition", svc.Partition,
-	}
 
-	getMetricLabels := func(err error) []metrics.Label {
-		return []metrics.Label{
-			{Name: "extension", Value: runtimeConfig.EnvoyExtension.Name},
-			{Name: "version", Value: "builtin/" + version.Version},
-			{Name: "service", Value: cfgSnap.Service},
-			{Name: "partition", Value: cfgSnap.ProxyID.PartitionOrDefault()},
-			{Name: "namespace", Value: cfgSnap.ProxyID.NamespaceOrDefault()},
-			{Name: "error", Value: strconv.FormatBool(err != nil)},
-		}
-	}
-
-	ext := runtimeConfig.EnvoyExtension
+			now := time.Now()
+			extender, err := envoyextensions.ConstructExtension(cfg.EnvoyExtension)
+			metrics.MeasureSinceWithLabels([]string{"envoy_extension", "validate_arguments"}, now, getMetricLabels(err))
+			if err != nil {
+				logFn("failed to construct extension", errorParams...)
 
-	if v := ext.EnvoyVersion; v != "" {
-		c, err := goversion.NewConstraint(v)
-		if err != nil {
-			logFn("failed to parse Envoy extension version constraint", errorParams...)
+				if cfg.EnvoyExtension.Required {
+					return status.Errorf(codes.Unavailable, "failed to construct extension %q for service %q", cfg.EnvoyExtension.Name, cfg.ServiceName.Name)
+				}
 
-			if ext.Required {
-				return nil, status.Errorf(codes.InvalidArgument, "failed to parse Envoy version constraint for extension %q for service %q", ext.Name, svc.Name)
+				continue
 			}
-			return resources, nil
-		}
 
-		if !c.Check(envoyVersion) {
-			logger.Info("skipping envoy extension due to Envoy version constraint violation", errorParams...)
-			return resources, nil
-		}
-	}
-
-	if v := ext.ConsulVersion; v != "" {
-		c, err := goversion.NewConstraint(v)
-		if err != nil {
-			logFn("failed to parse Consul extension version constraint", errorParams...)
+			now = time.Now()
+			err = extender.Validate(&cfg)
+			metrics.MeasureSinceWithLabels([]string{"envoy_extension", "validate"}, now, getMetricLabels(err))
+			if err != nil {
+				errorParams = append(errorParams, "error", err)
+				logFn("failed to validate extension arguments", errorParams...)
+				if cfg.EnvoyExtension.Required {
+					return status.Errorf(codes.Unavailable, "failed to validate arguments for extension %q for service %q", cfg.EnvoyExtension.Name, cfg.ServiceName.Name)
+				}
 
-			if ext.Required {
-				return nil, status.Errorf(codes.InvalidArgument, "failed to parse Consul version constraint for extension %q for service %q", ext.Name, svc.Name)
+				continue
 			}
-			return resources, nil
-		}
-
-		if !c.Check(consulVersion) {
-			logger.Info("skipping envoy extension due to Consul version constraint violation", errorParams...)
-			return resources, nil
-		}
-	}
-
-	now := time.Now()
-	extender, err := envoyextensions.ConstructExtension(ext)
-	metrics.MeasureSinceWithLabels([]string{"envoy_extension", "validate_arguments"}, now, getMetricLabels(err))
-	if err != nil {
-		errorParams = append(errorParams, "error", err)
-		logFn("failed to construct extension", errorParams...)
-
-		if ext.Required {
-			return nil, status.Errorf(codes.InvalidArgument, "failed to construct extension %q for service %q", ext.Name, svc.Name)
-		}
-
-		return resources, nil
-	}
-
-	now = time.Now()
-	err = extender.Validate(&runtimeConfig)
-	metrics.MeasureSinceWithLabels([]string{"envoy_extension", "validate"}, now, getMetricLabels(err))
-	if err != nil {
-		errorParams = append(errorParams, "error", err)
-		logFn("failed to validate extension arguments", errorParams...)
-
-		if ext.Required {
-			return nil, status.Errorf(codes.InvalidArgument, "failed to validate arguments for extension %q for service %q", ext.Name, svc.Name)
-		}
 
-		return resources, nil
-	}
-
-	now = time.Now()
-	resources, err = applyEnvoyExtension(extender, resources, &runtimeConfig)
-	metrics.MeasureSinceWithLabels([]string{"envoy_extension", "extend"}, now, getMetricLabels(err))
-	if err != nil {
-		errorParams = append(errorParams, "error", err)
-		logFn("failed to apply envoy extension", errorParams...)
-
-		if ext.Required {
-			return nil, status.Errorf(codes.InvalidArgument, "failed to patch xDS resources in the %q extension: %v", ext.Name, err)
-		}
-	}
-
-	return resources, nil
-}
+			now = time.Now()
+			resources, err = extender.Extend(resources, &cfg)
+			metrics.MeasureSinceWithLabels([]string{"envoy_extension", "extend"}, now, getMetricLabels(err))
+			if err == nil {
+				continue
+			}
 
-// applyEnvoyExtension safely checks whether an extension can be applied, and if so attempts to apply it.
-//
-// applyEnvoyExtension makes a copy of the provided IndexedResources, then applies the given extension to them.
-// The copy ensures against partial application if a non-required extension modifies a resource then fails at a later
-// stage; this is necessary because IndexedResources and its proto messages are all passed by reference, and
-// non-required extensions do not lead to a terminal failure in xDS updates.
-//
-// If the application is successful, the modified copy is returned. If not, the original and an error is returned.
-// Returning resources in either case allows for applying extensions in a loop and reporting on non-required extension
-// failures simultaneously.
-func applyEnvoyExtension(extender extensioncommon.EnvoyExtender, resources *xdscommon.IndexedResources, runtimeConfig *extensioncommon.RuntimeConfig) (r *xdscommon.IndexedResources, e error) {
-	// Don't panic due to an extension misbehaving.
-	defer func() {
-		if err := recover(); err != nil {
-			r = resources
-			e = fmt.Errorf("attempt to apply Envoy extension %q caused an unexpected panic: %v",
-				runtimeConfig.EnvoyExtension.Name, err)
+			logFn("failed to apply envoy extension", errorParams...)
+			if cfg.EnvoyExtension.Required {
+				return status.Errorf(codes.Unavailable, "failed to patch xDS resources in the %q extension: %v", cfg.EnvoyExtension.Name, err)
+			}
 		}
-	}()
-
-	// First check whether the extension is eligible for application in the current environment.
-	// Do this before copying indexed resources for the sake of efficiency.
-	if !extender.CanApply(runtimeConfig) {
-		return resources, nil
 	}
 
-	newResources, err := extender.Extend(xdscommon.Clone(resources), runtimeConfig)
-	if err != nil {
-		return resources, err
-	}
-
-	return newResources, nil
+	return nil
 }
 
 // https://www.envoyproxy.io/docs/envoy/latest/api-docs/xds_protocol#eventual-consistency-considerations
@@ -668,10 +526,10 @@ type xDSDeltaChild struct {
 }
 
 type xDSDeltaType struct {
-	logger       hclog.Logger
+	generator    *ResourceGenerator
 	stream       ADSDeltaStream
 	typeURL      string
-	allowEmptyFn func() bool
+	allowEmptyFn func(kind structs.ServiceKind) bool
 
 	// deltaChild contains data for an xDS child type if there is one.
 	// For example, endpoints are a child type of clusters.
@@ -720,13 +578,13 @@ type PendingUpdate struct {
 }
 
 func newDeltaType(
-	logger hclog.Logger,
+	generator *ResourceGenerator,
 	stream ADSDeltaStream,
 	typeUrl string,
-	allowEmptyFn func() bool,
+	allowEmptyFn func(kind structs.ServiceKind) bool,
 ) *xDSDeltaType {
 	return &xDSDeltaType{
-		logger:           logger,
+		generator:        generator,
 		stream:           stream,
 		typeURL:          typeUrl,
 		allowEmptyFn:     allowEmptyFn,
@@ -743,6 +601,7 @@ func (t *xDSDeltaType) Recv(req *envoy_discovery_v3.DeltaDiscoveryRequest, sf xd
 	if t == nil {
 		return deltaRecvUnknownType // not something we care about
 	}
+	logger := t.generator.Logger.With("typeUrl", t.typeURL)
 
 	registeredThisTime := false
 	if !t.registered {
@@ -779,10 +638,10 @@ func (t *xDSDeltaType) Recv(req *envoy_discovery_v3.DeltaDiscoveryRequest, sf xd
 			response_nonce, with presence of error_detail making it a NACK).
 		*/
 		if req.ErrorDetail == nil {
-			t.logger.Trace("got ok response from envoy proxy", "nonce", req.ResponseNonce)
+			logger.Trace("got ok response from envoy proxy", "nonce", req.ResponseNonce)
 			t.ack(req.ResponseNonce)
 		} else {
-			t.logger.Error("got error response from envoy proxy", "nonce", req.ResponseNonce,
+			logger.Error("got error response from envoy proxy", "nonce", req.ResponseNonce,
 				"error", status.ErrorProto(req.ErrorDetail))
 			t.nack(req.ResponseNonce)
 			return deltaRecvResponseNack
@@ -798,7 +657,7 @@ func (t *xDSDeltaType) Recv(req *envoy_discovery_v3.DeltaDiscoveryRequest, sf xd
 			the client already possesses, using the initial_resource_versions
 			field.
 		*/
-		t.logger.Trace("setting initial resource versions for stream",
+		logger.Trace("setting initial resource versions for stream",
 			"resources", req.InitialResourceVersions)
 		t.resourceVersions = req.InitialResourceVersions
 		if !t.wildcard {
@@ -849,9 +708,9 @@ func (t *xDSDeltaType) Recv(req *envoy_discovery_v3.DeltaDiscoveryRequest, sf xd
 			}
 
 			if alreadySubscribed {
-				t.logger.Trace("re-subscribing resource for stream", "resource", name)
+				logger.Trace("re-subscribing resource for stream", "resource", name)
 			} else {
-				t.logger.Trace("subscribing resource for stream", "resource", name)
+				logger.Trace("subscribing resource for stream", "resource", name)
 			}
 		}
 
@@ -860,7 +719,7 @@ func (t *xDSDeltaType) Recv(req *envoy_discovery_v3.DeltaDiscoveryRequest, sf xd
 				continue
 			}
 			delete(t.subscriptions, name)
-			t.logger.Trace("unsubscribing resource for stream", "resource", name)
+			logger.Trace("unsubscribing resource for stream", "resource", name)
 			// NOTE: we'll let the normal differential comparison handle cleaning up resourceVersions
 		}
 	}
@@ -894,6 +753,7 @@ func (t *xDSDeltaType) nack(nonce string) {
 }
 
 func (t *xDSDeltaType) SendIfNew(
+	kind structs.ServiceKind,
 	currentVersions map[string]string, // type => name => version (as consul knows right now)
 	resourceMap *xdscommon.IndexedResources,
 	nonce *uint64,
@@ -908,9 +768,9 @@ func (t *xDSDeltaType) SendIfNew(
 		return nil, false
 	}
 
-	logger := t.logger.With("typeUrl", t.typeURL)
+	logger := t.generator.Logger.With("typeUrl", t.typeURL)
 
-	allowEmpty := t.allowEmptyFn != nil && t.allowEmptyFn()
+	allowEmpty := t.allowEmptyFn != nil && t.allowEmptyFn(kind)
 
 	// Zero length resource responses should be ignored and are the result of no
 	// data yet. Notice that this caused a bug originally where we had zero
@@ -935,7 +795,7 @@ func (t *xDSDeltaType) SendIfNew(
 	*nonce++
 	resp.Nonce = fmt.Sprintf("%08x", *nonce)
 
-	logTraceResponse(t.logger, "Incremental xDS v3", resp)
+	t.generator.logTraceResponse("Incremental xDS v3", resp)
 
 	logger.Trace("sending response", "nonce", resp.Nonce)
 	if err := t.stream.Send(resp); err != nil {
@@ -1087,7 +947,7 @@ func (t *xDSDeltaType) ensureChildResend(parentName, childName string) {
 		return
 	}
 
-	t.logger.Trace(
+	t.generator.Logger.Trace(
 		"triggering implicit update of resource",
 		"typeUrl", t.typeURL,
 		"resource", parentName,
diff --git a/agent/xds/delta_envoy_extender_ce_test.go b/agent/xds/delta_envoy_extender_ce_test.go
index 30ebd9184b37c..2d2582e57d0d7 100644
--- a/agent/xds/delta_envoy_extender_ce_test.go
+++ b/agent/xds/delta_envoy_extender_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package xds
 
@@ -9,34 +7,26 @@ import (
 	"path/filepath"
 	"sort"
 	"testing"
-	"time"
 
 	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
 	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
 	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
 	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
-	"github.com/hashicorp/go-hclog"
-	goversion "github.com/hashicorp/go-version"
+	"github.com/hashicorp/consul/agent/xds/testcommon"
 	testinf "github.com/mitchellh/go-testing-interface"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 
-	propertyoverride "github.com/hashicorp/consul/agent/envoyextensions/builtin/property-override"
+	"github.com/hashicorp/consul/agent/envoyextensions"
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/xds/extensionruntime"
-	"github.com/hashicorp/consul/agent/xds/response"
-	"github.com/hashicorp/consul/agent/xds/testcommon"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/envoyextensions/extensioncommon"
 	"github.com/hashicorp/consul/envoyextensions/xdscommon"
 	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/version"
 )
 
 func TestEnvoyExtenderWithSnapshot(t *testing.T) {
-	consulVersion, _ := goversion.NewVersion(version.Version)
-
 	// If opposite is true, the returned service defaults config entry will have
 	// payload-passthrough=true and invocation-mode=asynchronous.
 	// Otherwise payload-passthrough=false and invocation-mode=synchronous.
@@ -70,7 +60,7 @@ func TestEnvoyExtenderWithSnapshot(t *testing.T) {
 	}
 
 	// Apply Lua extension to the local service and ensure http is used so the extension can be applied.
-	makeLuaNsFunc := func(inbound bool, envoyVersion, consulVersion string) func(ns *structs.NodeService) {
+	makeLuaNsFunc := func(inbound bool) func(ns *structs.NodeService) {
 		listener := "inbound"
 		if !inbound {
 			listener = "outbound"
@@ -80,9 +70,7 @@ func TestEnvoyExtenderWithSnapshot(t *testing.T) {
 			ns.Proxy.Config["protocol"] = "http"
 			ns.Proxy.EnvoyExtensions = []structs.EnvoyExtension{
 				{
-					Name:          api.BuiltinLuaExtension,
-					EnvoyVersion:  envoyVersion,
-					ConsulVersion: consulVersion,
+					Name: api.BuiltinLuaExtension,
 					Arguments: map[string]interface{}{
 						"ProxyType": "connect-proxy",
 						"Listener":  listener,
@@ -96,344 +84,10 @@ end`,
 		}
 	}
 
-	// Apply Prop Override extension to the local service and ensure http is used so the extension can be applied.
-	makePropOverrideNsFunc := func(args map[string]interface{}) func(ns *structs.NodeService) {
-		return func(ns *structs.NodeService) {
-			ns.Proxy.Config["protocol"] = "http"
-			if _, ok := args["ProxyType"]; !ok {
-				args["ProxyType"] = api.ServiceKindConnectProxy
-			}
-			ns.Proxy.EnvoyExtensions = []structs.EnvoyExtension{
-				{
-					Name:      api.BuiltinPropertyOverrideExtension,
-					Arguments: args,
-				},
-			}
-		}
-	}
-
-	propertyOverrideServiceDefaultsAddOutlierDetectionSingle := makePropOverrideNsFunc(
-		map[string]interface{}{
-			"Patches": []map[string]interface{}{
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeCluster,
-						"TrafficDirection": extensioncommon.TrafficDirectionOutbound,
-					},
-					"Op":    "add",
-					"Path":  "/outlier_detection/success_rate_minimum_hosts",
-					"Value": 1234,
-				},
-			},
-		})
-
-	propertyOverrideServiceDefaultsAddOutlierDetectionMultiple := makePropOverrideNsFunc(
-		map[string]interface{}{
-			"Patches": []map[string]interface{}{
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeCluster,
-						"TrafficDirection": extensioncommon.TrafficDirectionOutbound,
-					},
-					"Op":   "add",
-					"Path": "/outlier_detection",
-					"Value": map[string]interface{}{
-						"success_rate_minimum_hosts":        1234,
-						"failure_percentage_request_volume": 2345,
-					},
-				},
-			},
-		})
-
-	propertyOverrideServiceDefaultsRemoveOutlierDetection := makePropOverrideNsFunc(
-		map[string]interface{}{
-			"Patches": []map[string]interface{}{
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeCluster,
-						"TrafficDirection": extensioncommon.TrafficDirectionOutbound,
-					},
-					"Op":   "remove",
-					"Path": "/outlier_detection",
-				},
-			},
-		})
-
-	propertyOverrideServiceDefaultsAddKeepalive := makePropOverrideNsFunc(
-		map[string]interface{}{
-			"Patches": []map[string]interface{}{
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeCluster,
-						"TrafficDirection": extensioncommon.TrafficDirectionOutbound,
-					},
-					"Op":    "add",
-					"Path":  "/upstream_connection_options/tcp_keepalive/keepalive_probes",
-					"Value": 5,
-				},
-			},
-		})
-
-	propertyOverrideServiceDefaultsAddRoundRobinLbConfig := makePropOverrideNsFunc(
-		map[string]interface{}{
-			"Patches": []map[string]interface{}{
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeCluster,
-						"TrafficDirection": extensioncommon.TrafficDirectionOutbound,
-					},
-					"Op":    "add",
-					"Path":  "/round_robin_lb_config",
-					"Value": map[string]interface{}{},
-				},
-			},
-		})
-
-	propertyOverrideServiceDefaultsClusterLoadAssignmentOutboundAdd := makePropOverrideNsFunc(
-		map[string]interface{}{
-			"Patches": []map[string]interface{}{
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeClusterLoadAssignment,
-						"TrafficDirection": extensioncommon.TrafficDirectionOutbound,
-					},
-					"Op":    "add",
-					"Path":  "/policy/overprovisioning_factor",
-					"Value": 123,
-				},
-			},
-		})
-
-	propertyOverrideServiceDefaultsClusterLoadAssignmentInboundAdd := makePropOverrideNsFunc(
-		map[string]interface{}{
-			"Patches": []map[string]interface{}{
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeClusterLoadAssignment,
-						"TrafficDirection": extensioncommon.TrafficDirectionInbound,
-					},
-					"Op":    "add",
-					"Path":  "/policy/overprovisioning_factor",
-					"Value": 123,
-				},
-			},
-		})
-
-	propertyOverrideServiceDefaultsListenerInboundAdd := makePropOverrideNsFunc(
-		map[string]interface{}{
-			"Patches": []map[string]interface{}{
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeListener,
-						"TrafficDirection": extensioncommon.TrafficDirectionInbound,
-					},
-					"Op":    "add",
-					"Path":  "/stat_prefix",
-					"Value": "custom.stats",
-				},
-			},
-		})
-
-	propertyOverrideServiceDefaultsListenerOutboundAdd := makePropOverrideNsFunc(
-		map[string]interface{}{
-			"Patches": []map[string]interface{}{
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeListener,
-						"TrafficDirection": extensioncommon.TrafficDirectionOutbound,
-					},
-					"Op":    "add",
-					"Path":  "/stat_prefix",
-					"Value": "custom.stats",
-				},
-			},
-		})
-
-	propertyOverrideServiceDefaultsListenerOutboundDoesntApplyToInbound := makePropOverrideNsFunc(
-		map[string]interface{}{
-			"Patches": []map[string]interface{}{
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeListener,
-						"TrafficDirection": extensioncommon.TrafficDirectionInbound,
-					},
-					"Op":    "add",
-					"Path":  "/stat_prefix",
-					"Value": "custom.stats.inbound.only",
-				},
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeListener,
-						"TrafficDirection": extensioncommon.TrafficDirectionOutbound,
-					},
-					"Op":    "add",
-					"Path":  "/stat_prefix",
-					"Value": "custom.stats.outbound.only",
-				},
-			},
-		})
-
-	// Reverse order of above patches, to prove order is inconsequential
-	propertyOverrideServiceDefaultsListenerInboundDoesntApplyToOutbound := makePropOverrideNsFunc(
-		map[string]interface{}{
-			"Patches": []map[string]interface{}{
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeListener,
-						"TrafficDirection": extensioncommon.TrafficDirectionOutbound,
-					},
-					"Op":    "add",
-					"Path":  "/stat_prefix",
-					"Value": "custom.stats.outbound.only",
-				},
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeListener,
-						"TrafficDirection": extensioncommon.TrafficDirectionInbound,
-					},
-					"Op":    "add",
-					"Path":  "/stat_prefix",
-					"Value": "custom.stats.inbound.only",
-				},
-			},
-		})
-
-	propertyOverridePatchSpecificUpstreamService := makePropOverrideNsFunc(
-		map[string]interface{}{
-			"Patches": []map[string]interface{}{
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeListener,
-						"TrafficDirection": extensioncommon.TrafficDirectionOutbound,
-						"Services": []propertyoverride.ServiceName{
-							{CompoundServiceName: api.CompoundServiceName{Name: "db"}},
-						},
-					},
-					"Op":    "add",
-					"Path":  "/stat_prefix",
-					"Value": "custom.stats.outbound.only",
-				},
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeRoute,
-						"TrafficDirection": extensioncommon.TrafficDirectionOutbound,
-						"Services": []propertyoverride.ServiceName{
-							{CompoundServiceName: api.CompoundServiceName{Name: "db"}},
-						},
-					},
-					"Op":    "add",
-					"Path":  "/most_specific_header_mutations_wins",
-					"Value": true,
-				},
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeCluster,
-						"TrafficDirection": extensioncommon.TrafficDirectionOutbound,
-						"Services": []propertyoverride.ServiceName{
-							{CompoundServiceName: api.CompoundServiceName{Name: "db"}},
-						},
-					},
-					"Op":    "add",
-					"Path":  "/outlier_detection/success_rate_minimum_hosts",
-					"Value": 1234,
-				},
-				{
-					"ResourceFilter": map[string]interface{}{
-						"ResourceType":     propertyoverride.ResourceTypeClusterLoadAssignment,
-						"TrafficDirection": extensioncommon.TrafficDirectionOutbound,
-						"Services": []propertyoverride.ServiceName{
-							{CompoundServiceName: api.CompoundServiceName{Name: "db"}},
-						},
-					},
-					"Op":    "add",
-					"Path":  "/policy/overprovisioning_factor",
-					"Value": 1234,
-				},
-			},
-		})
-
 	tests := []struct {
 		name   string
 		create func(t testinf.T) *proxycfg.ConfigSnapshot
 	}{
-		{
-			name: "propertyoverride-add-outlier-detection",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, propertyOverrideServiceDefaultsAddOutlierDetectionSingle, nil)
-			},
-		},
-		{
-			name: "propertyoverride-add-outlier-detection-multiple",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, propertyOverrideServiceDefaultsAddOutlierDetectionMultiple, nil)
-			},
-		},
-		{
-			name: "propertyoverride-add-keepalive",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, propertyOverrideServiceDefaultsAddKeepalive, nil)
-			},
-		},
-		{
-			name: "propertyoverride-add-round-robin-lb-config",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, propertyOverrideServiceDefaultsAddRoundRobinLbConfig, nil)
-			},
-		},
-		{
-			name: "propertyoverride-remove-outlier-detection",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, propertyOverrideServiceDefaultsRemoveOutlierDetection, nil)
-			},
-		},
-		{
-			name: "propertyoverride-cluster-load-assignment-outbound-add",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, propertyOverrideServiceDefaultsClusterLoadAssignmentOutboundAdd, nil)
-			},
-		},
-		{
-			name: "propertyoverride-cluster-load-assignment-inbound-add",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, propertyOverrideServiceDefaultsClusterLoadAssignmentInboundAdd, nil)
-			},
-		},
-		{
-			name: "propertyoverride-listener-outbound-add",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, propertyOverrideServiceDefaultsListenerOutboundAdd, nil)
-			},
-		},
-		{
-			name: "propertyoverride-listener-inbound-add",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, propertyOverrideServiceDefaultsListenerInboundAdd, nil)
-			},
-		},
-		{
-			name: "propertyoverride-outbound-doesnt-apply-to-inbound",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, propertyOverrideServiceDefaultsListenerOutboundDoesntApplyToInbound, nil)
-			},
-		},
-		{
-			name: "propertyoverride-inbound-doesnt-apply-to-outbound",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, propertyOverrideServiceDefaultsListenerInboundDoesntApplyToOutbound, nil)
-			},
-		},
-		{
-			name: "propertyoverride-patch-specific-upstream-service-splitter",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "splitter-with-resolver-redirect-multidc", false, propertyOverridePatchSpecificUpstreamService, nil)
-			},
-		},
-		{
-			name: "propertyoverride-patch-specific-upstream-service-failover",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover", false, propertyOverridePatchSpecificUpstreamService, nil)
-			},
-		},
 		{
 			name: "lambda-connect-proxy",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
@@ -471,41 +125,11 @@ end`,
 			name:   "lambda-terminating-gateway-with-service-resolvers",
 			create: proxycfg.TestConfigSnapshotTerminatingGatewayWithLambdaServiceAndServiceResolvers,
 		},
-		{
-			name: "lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				// upstreams need to be http in order for lua to be applied to listeners.
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, makeLuaNsFunc(false, "< 1.0.0", ">= 1.0.0"), nil, &structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "db",
-					Protocol: "http",
-				}, &structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "geo-cache",
-					Protocol: "http",
-				})
-			},
-		},
-		{
-			name: "lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				// upstreams need to be http in order for lua to be applied to listeners.
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, makeLuaNsFunc(false, ">= 1.0.0", "< 1.0.0"), nil, &structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "db",
-					Protocol: "http",
-				}, &structs.ServiceConfigEntry{
-					Kind:     structs.ServiceDefaults,
-					Name:     "geo-cache",
-					Protocol: "http",
-				})
-			},
-		},
 		{
 			name: "lua-outbound-applies-to-local-upstreams",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				// upstreams need to be http in order for lua to be applied to listeners.
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, makeLuaNsFunc(false, ">= 1.0.0", ">= 1.0.0"), nil, &structs.ServiceConfigEntry{
+				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, makeLuaNsFunc(false), nil, &structs.ServiceConfigEntry{
 					Kind:     structs.ServiceDefaults,
 					Name:     "db",
 					Protocol: "http",
@@ -524,7 +148,7 @@ end`,
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				// db is made an HTTP upstream so that the extension _could_ apply, but does not because
 				// the direction for the extension is inbound.
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, makeLuaNsFunc(true, "", ""), nil, &structs.ServiceConfigEntry{
+				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, makeLuaNsFunc(true), nil, &structs.ServiceConfigEntry{
 					Kind:     structs.ServiceDefaults,
 					Name:     "db",
 					Protocol: "http",
@@ -534,7 +158,7 @@ end`,
 		{
 			name: "lua-inbound-applies-to-inbound",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, makeLuaNsFunc(true, "", ""), nil)
+				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, makeLuaNsFunc(true), nil)
 			},
 		},
 		{
@@ -542,14 +166,14 @@ end`,
 			// no upstream HTTP services. We also should not see public listener, which is HTTP, patched.
 			name: "lua-outbound-doesnt-apply-to-inbound",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, makeLuaNsFunc(false, "", ""), nil)
+				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, makeLuaNsFunc(false), nil)
 			},
 		},
 		{
 			name: "lua-outbound-applies-to-local-upstreams-tproxy",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				// upstreams need to be http in order for lua to be applied to listeners.
-				return proxycfg.TestConfigSnapshotTransparentProxyDestinationHTTP(t, makeLuaNsFunc(false, "", ""))
+				return proxycfg.TestConfigSnapshotTransparentProxyDestinationHTTP(t, makeLuaNsFunc(false))
 			},
 		},
 		{
@@ -580,197 +204,10 @@ end`,
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, nsFunc, nil, makeLambdaServiceDefaults(true))
 			},
 		},
-		{
-			name: "wasm-http-local-file",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "http"
-					ns.Proxy.EnvoyExtensions = makeWasmEnvoyExtension("http", "inbound", "local")
-				}, nil)
-			},
-		},
-		{
-			name: "wasm-http-remote-file",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "http"
-					ns.Proxy.EnvoyExtensions = makeWasmEnvoyExtension("http", "inbound", "remote")
-				}, nil)
-			},
-		},
-		{
-			name: "wasm-tcp-local-file",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "tcp"
-					ns.Proxy.EnvoyExtensions = makeWasmEnvoyExtension("tcp", "inbound", "local")
-				}, nil)
-			},
-		},
-		{
-			name: "wasm-tcp-remote-file",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "tcp"
-					ns.Proxy.EnvoyExtensions = makeWasmEnvoyExtension("tcp", "inbound", "remote")
-				}, nil)
-			},
-		},
-		{
-			name: "wasm-tcp-local-file-outbound",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "tcp"
-					ns.Proxy.EnvoyExtensions = makeWasmEnvoyExtension("tcp", "outbound", "local")
-				}, nil)
-			},
-		},
-		{
-			name: "wasm-tcp-remote-file-outbound",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "tcp"
-					ns.Proxy.EnvoyExtensions = makeWasmEnvoyExtension("tcp", "outbound", "remote")
-				}, nil)
-			},
-		},
-		{
-			// Insert an HTTP ext_authz filter at the start of the filter chain with the default gRPC config options.
-			name: "ext-authz-http-local-grpc-service",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config = map[string]any{"protocol": "http"}
-					ns.Proxy.EnvoyExtensions = makeExtAuthzEnvoyExtension(
-						"grpc",
-						"dest=local",
-					)
-				}, nil)
-			},
-		},
-		{
-			// Insert an ext_authz HTTP filter after all the header_to_metadata filters, with the default HTTP config options.
-			name: "ext-authz-http-local-http-service",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config = map[string]any{"protocol": "http"}
-					ns.Proxy.EnvoyExtensions = makeExtAuthzEnvoyExtension(
-						"http",
-						"dest=local",
-						"target-uri=localhost:9191",
-						"insert=AfterLastMatch:envoy.filters.http.header_to_metadata",
-					)
-				}, nil)
-			},
-		},
-		{
-			// Insert an ext_authz HTTP filter before the router filter, specifying all gRPC config options.
-			name: "ext-authz-http-upstream-grpc-service",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config = map[string]any{"protocol": "http"}
-					ns.Proxy.EnvoyExtensions = makeExtAuthzEnvoyExtension(
-						"grpc",
-						"required=true",
-						"dest=upstream",
-						"insert=BeforeFirstMatch:envoy.filters.http.router",
-						"config-type=full",
-					)
-				}, nil)
-			},
-		},
-		{
-			// Insert an ext_authz HTTP filter after intentions, specifying all HTTP config options.
-			name: "ext-authz-http-upstream-http-service",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config = map[string]any{"protocol": "http"}
-					ns.Proxy.EnvoyExtensions = makeExtAuthzEnvoyExtension(
-						"http",
-						"required=true",
-						"dest=upstream",
-						"insert=AfterLastMatch:envoy.filters.http.rbac",
-						"config-type=full",
-					)
-				}, nil)
-			},
-		},
-		{
-			// Insert an ext_authz TCP filter at the start of the filter chain, with the default gRPC config options.
-			name: "ext-authz-tcp-local-grpc-service",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config = map[string]any{"protocol": "tcp"}
-					ns.Proxy.EnvoyExtensions = makeExtAuthzEnvoyExtension("grpc")
-				}, nil)
-			},
-		},
-		{
-			// Insert an ext_authz TCP filter after intentions, specifying all gRPC config options.
-			name: "ext-authz-tcp-upstream-grpc-service",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config = map[string]any{"protocol": "tcp"}
-					ns.Proxy.EnvoyExtensions = makeExtAuthzEnvoyExtension(
-						"grpc",
-						"required=true",
-						"dest=upstream",
-						"insert=AfterLastMatch:envoy.filters.network.rbac",
-						"config-type=full",
-					)
-				}, nil)
-			},
-		},
-		{
-			// Insert an OpenTelemetry access logging extension
-			name: "otel-access-logging-http",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config = map[string]any{"protocol": "http"}
-					ns.Proxy.EnvoyExtensions = []structs.EnvoyExtension{
-						{
-							Name: "builtin/otel-access-logging",
-							Arguments: map[string]any{
-								"Config": map[string]any{
-									"LogName": "otel-logger",
-									"GrpcService": map[string]any{
-										"Target": map[string]any{
-											"Service": map[string]any{
-												"Name": "db",
-											},
-										},
-									},
-									"BufferFlushInterval":     time.Millisecond,
-									"BufferSizeBytes":         4096,
-									"FilterStateObjectsToLog": []string{"obj-1", "obj-2"},
-									"RetryPolicy": map[string]any{
-										"RetryBackOff": map[string]any{
-											"BaseInterval": time.Second,
-											"MaxInterval":  10 * time.Second,
-										},
-										"NumRetries": 5,
-									},
-									// Note: only test with one entry in Attributes and ResourceAttributes because
-									// they are maps and multiple entries results in the output order being
-									// non-deterministic.
-									"Attributes": map[string]any{
-										"name": "Bugs Bunny",
-									},
-									"ResourceAttributes": map[string]any{
-										"type": "compute",
-									},
-								},
-							},
-							Required: true,
-						},
-					}
-				}, nil)
-			},
-		},
 	}
 
 	latestEnvoyVersion := xdscommon.EnvoyVersions[0]
 	for _, envoyVersion := range xdscommon.EnvoyVersions {
-		parsedEnvoyVersion, _ := goversion.NewVersion(envoyVersion)
 		sf, err := xdscommon.DetermineSupportedProxyFeaturesFromString(envoyVersion)
 		require.NoError(t, err)
 		t.Run("envoy-"+envoyVersion, func(t *testing.T) {
@@ -794,7 +231,11 @@ end`,
 					cfgs := extensionruntime.GetRuntimeConfigurations(snap)
 					for _, extensions := range cfgs {
 						for _, ext := range extensions {
-							indexedResources, err = validateAndApplyEnvoyExtension(hclog.NewNullLogger(), snap, indexedResources, ext, parsedEnvoyVersion, consulVersion)
+							extender, err := envoyextensions.ConstructExtension(ext.EnvoyExtension)
+							require.NoError(t, err)
+							err = extender.Validate(&ext)
+							require.NoError(t, err)
+							indexedResources, err = extender.Extend(indexedResources, &ext)
 							require.NoError(t, err)
 						}
 					}
@@ -849,7 +290,7 @@ end`,
 						}
 
 						sort.Slice(msgs, entity.sorter(msgs))
-						r, err := response.CreateResponse(entity.key, "00000001", "00000001", msgs)
+						r, err := createResponse(entity.key, "00000001", "00000001", msgs)
 						require.NoError(t, err)
 
 						t.Run(entity.name, func(t *testing.T) {
diff --git a/agent/xds/delta_envoy_extender_test.go b/agent/xds/delta_envoy_extender_test.go
deleted file mode 100644
index cfa762cb049ed..0000000000000
--- a/agent/xds/delta_envoy_extender_test.go
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/api"
-)
-
-func makeExtAuthzEnvoyExtension(svc string, opts ...string) []structs.EnvoyExtension {
-	target := map[string]any{"URI": "127.0.0.1:9191"}
-	insertOptions := map[string]any{}
-	required := false
-	ent := false
-	serviceKey := "GrpcService"
-	if svc == "http" {
-		serviceKey = "HttpService"
-	}
-
-	configMap := map[string]any{
-		serviceKey: map[string]any{
-			"Target": target,
-		},
-	}
-
-	for _, opt := range opts {
-		if k, v, valid := strings.Cut(opt, "="); valid {
-			switch k {
-			case "required":
-				required = true
-			case "enterprise":
-				ent = true
-			case "dest":
-				if v == "upstream" {
-					svcMap := map[string]any{"Name": "db"}
-					if ent {
-						svcMap["Namespace"] = "bar"
-						svcMap["Partition"] = "zip"
-					}
-					target = map[string]any{"Service": svcMap}
-				}
-			case "insert":
-				if location, filterName, found := strings.Cut(v, ":"); found {
-					insertOptions = map[string]any{
-						"Location":   location,
-						"FilterName": filterName,
-					}
-				}
-			case "target-uri":
-				target = map[string]any{"URI": v}
-				configMap = map[string]any{
-					serviceKey: map[string]any{
-						"Target": target,
-					},
-				}
-			case "config-type":
-				if v == "full" {
-					target["Timeout"] = "2s"
-					configMap = map[string]any{
-						serviceKey: map[string]any{
-							"Target":     target,
-							"PathPrefix": "/ext_authz",
-							"Authority":  "test-authority",
-							"AuthorizationRequest": map[string]any{
-								"AllowedHeaders": makeStringMatcherSlice("Exact", "allow-header", 2),
-								"HeadersToAdd": []map[string]any{
-									{"Key": "add-header-1", "Value": "foo"},
-									{"Key": "add-header-2", "Value": "bar"},
-								},
-							},
-							"AuthorizationResponse": map[string]any{
-								"AllowedUpstreamHeaders":         makeStringMatcherSlice("Contains", "upstream-header", 2),
-								"AllowedUpstreamHeadersToAppend": makeStringMatcherSlice("Exact", "add-upstream", 2),
-								"AllowedClientHeaders":           makeStringMatcherSlice("Prefix", "client-header", 2),
-								"AllowedClientHeadersOnSuccess":  makeStringMatcherSlice("SafeRegex", "client-ok-header", 2),
-								"DynamicMetadataFromHeaders":     makeStringMatcherSlice("Suffix", "dynamic-header", 2),
-							},
-							"InitialMetadata": []map[string]any{
-								{"Key": "init-metadata-1", "Value": "value 1"},
-								{"Key": "init-metadata-2", "Value": "value 2"},
-							},
-						},
-						"BootstrapMetadataLabelsKey": "test-labels-key",
-						"ClearRouteCache":            true,
-						"IncludePeerCertificate":     true,
-						"MetadataContextNamespaces":  []string{"test-ns-1", "test-ns-2"},
-						"StatusOnError":              417,
-						"StatPrefix":                 "ext_authz_stats",
-						"WithRequestBody": map[string]any{
-							"MaxRequestBytes":     10000,
-							"AllowPartialMessage": true,
-							"PackAsBytes":         true,
-						},
-					}
-				}
-			}
-		}
-	}
-	return []structs.EnvoyExtension{
-		{
-			Name:     api.BuiltinExtAuthzExtension,
-			Required: required,
-			Arguments: map[string]any{
-				"InsertOptions": insertOptions,
-				"Config":        configMap,
-			},
-		},
-	}
-}
-
-func makeStringMatcherSlice(match, name string, count int) []map[string]any {
-	var s []map[string]any
-	for i := 0; i < count; i++ {
-		s = append(s, map[string]any{
-			match:        fmt.Sprintf("%s-%d", name, i+1),
-			"IgnoreCase": match != "SafeRegex" && i == 1,
-		})
-	}
-	return s
-}
-
-func makeWasmEnvoyExtension(proto, listener, locale string) []structs.EnvoyExtension {
-	var code map[string]interface{}
-	if locale == "local" {
-		code = map[string]interface{}{
-			"Local": map[string]interface{}{
-				"Filename": "/path/to/extension.wasm",
-			},
-		}
-	} else {
-		code = map[string]interface{}{
-			"Remote": map[string]interface{}{
-				"HttpURI": map[string]interface{}{
-					"Service": map[string]interface{}{
-						"Name":      "db",
-						"Namespace": "bar",
-						"Partition": "zip",
-					},
-					"URI": "https://db/plugin.wasm",
-				},
-				"SHA256": "d05d88b0ce8a8f1d5176481e0af3ae5c65ed82cbfb8c61506c5354b076078545",
-			},
-		}
-	}
-	return []structs.EnvoyExtension{
-		{
-			Name: api.BuiltinWasmExtension,
-			Arguments: map[string]interface{}{
-				"Protocol":     proto,
-				"ListenerType": listener,
-				"PluginConfig": map[string]interface{}{
-					"VmConfig": map[string]interface{}{
-						"Code": code,
-					},
-					"Configuration": `{"foo": "bar"}`,
-				},
-			},
-		},
-	}
-}
diff --git a/agent/xds/delta_test.go b/agent/xds/delta_test.go
index d93d06271bac2..33cb44d034e65 100644
--- a/agent/xds/delta_test.go
+++ b/agent/xds/delta_test.go
@@ -1,39 +1,30 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
 	"errors"
-	"fmt"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
 	"strconv"
 	"strings"
-	"sync"
 	"sync/atomic"
 	"testing"
 	"time"
 
 	"github.com/armon/go-metrics"
-	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
 	envoy_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
+	"github.com/stretchr/testify/require"
+	rpcstatus "google.golang.org/genproto/googleapis/rpc/status"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
+
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/grpc-external/limiter"
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/envoyextensions/extensioncommon"
+	"github.com/hashicorp/consul/envoyextensions/xdscommon"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/consul/version"
-	"github.com/hashicorp/go-hclog"
-	goversion "github.com/hashicorp/go-version"
-	"github.com/stretchr/testify/require"
-	rpcstatus "google.golang.org/genproto/googleapis/rpc/status"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
 )
 
 // NOTE: For these tests, prefer not using xDS protobuf "factory" methods if
@@ -1067,15 +1058,6 @@ func TestServer_DeltaAggregatedResources_v3_ACLEnforcement(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			var stopped bool
-			lock := &sync.RWMutex{}
-
-			defer func() {
-				lock.Lock()
-				stopped = true
-				lock.Unlock()
-			}()
-
 			// aclResolve may be called in a goroutine even after a
 			// testcase tt returns. Capture the variable as tc so the
 			// values don't swap in the next iteration.
@@ -1089,14 +1071,6 @@ func TestServer_DeltaAggregatedResources_v3_ACLEnforcement(t *testing.T) {
 					// No token and defaultDeny is denied
 					return acl.RootAuthorizer("deny"), nil
 				}
-
-				lock.RLock()
-				defer lock.RUnlock()
-
-				if stopped {
-					return acl.DenyAll().ToAllowAuthorizer(), nil
-				}
-
 				// Ensure the correct token was passed
 				require.Equal(t, tc.token, id)
 				// Parse the ACL and enforce it
@@ -1614,416 +1588,3 @@ func requireExtensionMetrics(
 		require.True(t, foundLabel)
 	}
 }
-
-func Test_validateAndApplyEnvoyExtension_Validations(t *testing.T) {
-	type testCase struct {
-		name          string
-		runtimeConfig extensioncommon.RuntimeConfig
-		err           bool
-		errString     string
-	}
-
-	envoyVersion, _ := goversion.NewVersion("1.25.0")
-	consulVersion, _ := goversion.NewVersion("1.16.0")
-
-	svc := api.CompoundServiceName{
-		Name:      "s1",
-		Partition: "ap1",
-		Namespace: "ns1",
-	}
-
-	makeRuntimeConfig := func(required bool, consulVersion string, envoyVersion string, args map[string]interface{}) extensioncommon.RuntimeConfig {
-		if args == nil {
-			args = map[string]interface{}{
-				"ARN": "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
-			}
-
-		}
-		return extensioncommon.RuntimeConfig{
-			EnvoyExtension: api.EnvoyExtension{
-				Name:          api.BuiltinAWSLambdaExtension,
-				Required:      required,
-				ConsulVersion: consulVersion,
-				EnvoyVersion:  envoyVersion,
-				Arguments:     args,
-			},
-			ServiceName: svc,
-		}
-	}
-
-	cases := []testCase{
-		{
-			name:          "invalid consul version constraint - required",
-			runtimeConfig: makeRuntimeConfig(true, "bad", ">= 1.0", nil),
-			err:           true,
-			errString:     "failed to parse Consul version constraint for extension",
-		},
-		{
-			name:          "invalid consul version constraint - not required",
-			runtimeConfig: makeRuntimeConfig(false, "bad", ">= 1.0", nil),
-			err:           false,
-		},
-		{
-			name:          "invalid envoy version constraint - required",
-			runtimeConfig: makeRuntimeConfig(true, ">= 1.0", "bad", nil),
-			err:           true,
-			errString:     "failed to parse Envoy version constraint for extension",
-		},
-		{
-			name:          "invalid envoy version constraint - not required",
-			runtimeConfig: makeRuntimeConfig(false, ">= 1.0", "bad", nil),
-			err:           false,
-		},
-		{
-			name:          "no envoy version constraint match",
-			runtimeConfig: makeRuntimeConfig(false, "", ">= 2.0.0", nil),
-			err:           false,
-		},
-		{
-			name:          "no consul version constraint match",
-			runtimeConfig: makeRuntimeConfig(false, ">= 2.0.0", "", nil),
-			err:           false,
-		},
-		{
-			name:          "invalid extension arguments - required",
-			runtimeConfig: makeRuntimeConfig(true, ">= 1.15.0", ">= 1.25.0", map[string]interface{}{"bad": "args"}),
-			err:           true,
-			errString:     "failed to construct extension",
-		},
-		{
-			name:          "invalid extension arguments - not required",
-			runtimeConfig: makeRuntimeConfig(false, ">= 1.15.0", ">= 1.25.0", map[string]interface{}{"bad": "args"}),
-			err:           false,
-		},
-		{
-			name:          "valid everything - no resources and required",
-			runtimeConfig: makeRuntimeConfig(true, ">= 1.15.0", ">= 1.25.0", nil),
-			err:           true,
-			errString:     "failed to patch xDS resources in",
-		},
-		{
-			name:          "valid everything",
-			runtimeConfig: makeRuntimeConfig(false, ">= 1.15.0", ">= 1.25.0", nil),
-			err:           false,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			snap := proxycfg.ConfigSnapshot{
-				ProxyID: proxycfg.ProxyID{
-					ServiceID: structs.NewServiceID("s1", nil),
-				},
-			}
-			resources, err := validateAndApplyEnvoyExtension(hclog.NewNullLogger(), &snap, nil, tc.runtimeConfig, envoyVersion, consulVersion)
-			if tc.err {
-				require.Error(t, err)
-				require.Contains(t, err.Error(), tc.errString)
-			} else {
-				require.NoError(t, err)
-				require.Nil(t, resources)
-			}
-		})
-	}
-}
-
-func Test_applyEnvoyExtension_CanApply(t *testing.T) {
-	type testCase struct {
-		name     string
-		canApply bool
-	}
-
-	cases := []testCase{
-		{
-			name:     "cannot apply: is not applied",
-			canApply: false,
-		},
-		{
-			name:     "can apply: is applied",
-			canApply: true,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			extender := extensioncommon.BasicEnvoyExtender{
-				Extension: &maybeCanApplyExtension{
-					canApply: tc.canApply,
-				},
-			}
-			config := &extensioncommon.RuntimeConfig{
-				Kind:                  api.ServiceKindConnectProxy,
-				ServiceName:           api.CompoundServiceName{Name: "api"},
-				Upstreams:             map[api.CompoundServiceName]*extensioncommon.UpstreamData{},
-				IsSourcedFromUpstream: false,
-				EnvoyExtension: api.EnvoyExtension{
-					Name:     "maybeCanApplyExtension",
-					Required: false,
-				},
-			}
-			listener := &envoy_listener_v3.Listener{
-				Name:                  xdscommon.OutboundListenerName,
-				IgnoreGlobalConnLimit: false,
-			}
-			indexedResources := xdscommon.IndexResources(testutil.Logger(t), map[string][]proto.Message{
-				xdscommon.ListenerType: {
-					listener,
-				},
-			})
-
-			result, err := applyEnvoyExtension(&extender, indexedResources, config)
-			require.NoError(t, err)
-			resultListener := result.Index[xdscommon.ListenerType][xdscommon.OutboundListenerName].(*envoy_listener_v3.Listener)
-			require.Equal(t, tc.canApply, resultListener.IgnoreGlobalConnLimit)
-		})
-	}
-}
-
-func Test_applyEnvoyExtension_PartialApplicationDisallowed(t *testing.T) {
-	type testCase struct {
-		name            string
-		fail            bool
-		returnOnFailure bool
-	}
-
-	cases := []testCase{
-		{
-			name:            "failure: returns nothing",
-			fail:            true,
-			returnOnFailure: false,
-		},
-		// Not expected, but cover to be sure.
-		{
-			name:            "failure: returns values",
-			fail:            true,
-			returnOnFailure: true,
-		},
-		// Ensure that under normal circumstances, the extension would succeed in
-		// modifying resources.
-		{
-			name: "success: resources modified",
-			fail: false,
-		},
-	}
-
-	for _, tc := range cases {
-		for _, indexType := range []string{
-			xdscommon.ListenerType,
-			xdscommon.ClusterType,
-		} {
-			typeShortName := indexType[strings.LastIndex(indexType, ".")+1:]
-			t.Run(fmt.Sprintf("%s: %s", tc.name, typeShortName), func(t *testing.T) {
-				extender := extensioncommon.BasicEnvoyExtender{
-					Extension: &partialFailureExtension{
-						returnOnFailure: tc.returnOnFailure,
-						// Alternate which resource fails so that we can test for
-						// partial modification independent of patch order.
-						failListener: tc.fail && indexType == xdscommon.ListenerType,
-						failCluster:  tc.fail && indexType == xdscommon.ClusterType,
-					},
-				}
-				config := &extensioncommon.RuntimeConfig{
-					Kind:                  api.ServiceKindConnectProxy,
-					ServiceName:           api.CompoundServiceName{Name: "api"},
-					Upstreams:             map[api.CompoundServiceName]*extensioncommon.UpstreamData{},
-					IsSourcedFromUpstream: false,
-					EnvoyExtension: api.EnvoyExtension{
-						Name:     "partialFailureExtension",
-						Required: false,
-					},
-				}
-				cluster := &envoy_cluster_v3.Cluster{
-					Name:          xdscommon.LocalAppClusterName,
-					RespectDnsTtl: false,
-				}
-				listener := &envoy_listener_v3.Listener{
-					Name:                  xdscommon.OutboundListenerName,
-					IgnoreGlobalConnLimit: false,
-				}
-				indexedResources := xdscommon.IndexResources(testutil.Logger(t), map[string][]proto.Message{
-					xdscommon.ClusterType: {
-						cluster,
-					},
-					xdscommon.ListenerType: {
-						listener,
-					},
-				})
-
-				result, err := applyEnvoyExtension(&extender, indexedResources, config)
-				if tc.fail {
-					require.Error(t, err)
-				} else {
-					require.NoError(t, err)
-				}
-
-				resultListener := result.Index[xdscommon.ListenerType][xdscommon.OutboundListenerName].(*envoy_listener_v3.Listener)
-				resultCluster := result.Index[xdscommon.ClusterType][xdscommon.LocalAppClusterName].(*envoy_cluster_v3.Cluster)
-				require.Equal(t, !tc.fail, resultListener.IgnoreGlobalConnLimit)
-				require.Equal(t, !tc.fail, resultCluster.RespectDnsTtl)
-
-				// Regardless of success, original values should not be modified.
-				originalListener := indexedResources.Index[xdscommon.ListenerType][xdscommon.OutboundListenerName].(*envoy_listener_v3.Listener)
-				originalCluster := indexedResources.Index[xdscommon.ClusterType][xdscommon.LocalAppClusterName].(*envoy_cluster_v3.Cluster)
-				require.False(t, originalListener.IgnoreGlobalConnLimit)
-				require.False(t, originalCluster.RespectDnsTtl)
-			})
-		}
-	}
-}
-
-func Test_applyEnvoyExtension_HandlesPanics(t *testing.T) {
-	type testCase struct {
-		name            string
-		panicOnCanApply bool
-		panicOnPatch    bool
-	}
-
-	cases := []testCase{
-		{
-			name:            "panic: CanApply",
-			panicOnCanApply: true,
-		},
-		{
-			name:         "panic: Extend",
-			panicOnPatch: true,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			extension := &maybePanicExtension{
-				panicOnCanApply: tc.panicOnCanApply,
-				panicOnPatch:    tc.panicOnPatch,
-			}
-			extender := extensioncommon.BasicEnvoyExtender{
-				Extension: extension,
-			}
-			config := &extensioncommon.RuntimeConfig{
-				Kind:                  api.ServiceKindConnectProxy,
-				ServiceName:           api.CompoundServiceName{Name: "api"},
-				Upstreams:             map[api.CompoundServiceName]*extensioncommon.UpstreamData{},
-				IsSourcedFromUpstream: false,
-				EnvoyExtension: api.EnvoyExtension{
-					Name:     "maybePanicExtension",
-					Required: false,
-				},
-			}
-			listener := &envoy_listener_v3.Listener{
-				Name:                  xdscommon.OutboundListenerName,
-				IgnoreGlobalConnLimit: false,
-			}
-			indexedResources := xdscommon.IndexResources(testutil.Logger(t), map[string][]proto.Message{
-				xdscommon.ListenerType: {
-					listener,
-				},
-			})
-
-			_, err := applyEnvoyExtension(&extender, indexedResources, config)
-
-			// We did not panic, good.
-			// First assert our test is valid by forcing a panic, then check the error message that was returned.
-			if tc.panicOnCanApply {
-				require.PanicsWithError(t, "this is an expected failure in CanApply", func() {
-					extension.CanApply(config)
-				})
-				require.ErrorContains(t, err, "attempt to apply Envoy extension \"maybePanicExtension\" caused an unexpected panic: this is an expected failure in CanApply")
-			}
-			if tc.panicOnPatch {
-				require.PanicsWithError(t, "this is an expected failure in PatchListener", func() {
-					_, _, _ = extension.PatchListener(config.GetListenerPayload(listener))
-				})
-				require.ErrorContains(t, err, "attempt to apply Envoy extension \"maybePanicExtension\" caused an unexpected panic: this is an expected failure in PatchListener")
-			}
-		})
-	}
-}
-
-type maybeCanApplyExtension struct {
-	extensioncommon.BasicExtensionAdapter
-	canApply bool
-}
-
-var _ extensioncommon.BasicExtension = (*maybeCanApplyExtension)(nil)
-
-func (m *maybeCanApplyExtension) CanApply(_ *extensioncommon.RuntimeConfig) bool {
-	return m.canApply
-}
-
-func (m *maybeCanApplyExtension) PatchListener(payload extensioncommon.ListenerPayload) (*envoy_listener_v3.Listener, bool, error) {
-	payload.Message.IgnoreGlobalConnLimit = true
-	return payload.Message, true, nil
-}
-
-type partialFailureExtension struct {
-	extensioncommon.BasicExtensionAdapter
-	returnOnFailure bool
-	failCluster     bool
-	failListener    bool
-}
-
-var _ extensioncommon.BasicExtension = (*partialFailureExtension)(nil)
-
-func (p *partialFailureExtension) CanApply(_ *extensioncommon.RuntimeConfig) bool {
-	return true
-}
-
-func (p *partialFailureExtension) PatchListener(payload extensioncommon.ListenerPayload) (*envoy_listener_v3.Listener, bool, error) {
-	// Modify original input message
-	payload.Message.IgnoreGlobalConnLimit = true
-
-	err := fmt.Errorf("oops - listener patch failed")
-	if !p.failListener {
-		err = nil
-	}
-
-	returnMsg := payload.Message
-	if err != nil && !p.returnOnFailure {
-		returnMsg = nil
-	}
-
-	patched := err == nil || p.returnOnFailure
-
-	return returnMsg, patched, err
-}
-
-func (p *partialFailureExtension) PatchCluster(payload extensioncommon.ClusterPayload) (*envoy_cluster_v3.Cluster, bool, error) {
-	// Modify original input message
-	payload.Message.RespectDnsTtl = true
-
-	err := fmt.Errorf("oops - cluster patch failed")
-	if !p.failCluster {
-		err = nil
-	}
-
-	returnMsg := payload.Message
-	if err != nil && !p.returnOnFailure {
-		returnMsg = nil
-	}
-
-	patched := err == nil || p.returnOnFailure
-
-	return returnMsg, patched, err
-}
-
-type maybePanicExtension struct {
-	extensioncommon.BasicExtensionAdapter
-	panicOnCanApply bool
-	panicOnPatch    bool
-}
-
-var _ extensioncommon.BasicExtension = (*maybePanicExtension)(nil)
-
-func (m *maybePanicExtension) CanApply(_ *extensioncommon.RuntimeConfig) bool {
-	if m.panicOnCanApply {
-		panic(fmt.Errorf("this is an expected failure in CanApply"))
-	}
-	return true
-}
-
-func (m *maybePanicExtension) PatchListener(payload extensioncommon.ListenerPayload) (*envoy_listener_v3.Listener, bool, error) {
-	if m.panicOnPatch {
-		panic(fmt.Errorf("this is an expected failure in PatchListener"))
-	}
-	payload.Message.IgnoreGlobalConnLimit = true
-	return payload.Message, true, nil
-}
diff --git a/agent/xds/endpoints.go b/agent/xds/endpoints.go
index ff486f3228a8a..d117f8dd82985 100644
--- a/agent/xds/endpoints.go
+++ b/agent/xds/endpoints.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
@@ -8,20 +5,17 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/hashicorp/go-hclog"
-
 	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
 	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
+	"github.com/hashicorp/consul/envoyextensions/xdscommon"
 	"github.com/hashicorp/go-bexpr"
 	"google.golang.org/protobuf/proto"
 
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xds/response"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
 )
 
 const (
@@ -44,7 +38,13 @@ func (s *ResourceGenerator) endpointsFromSnapshot(cfgSnap *proxycfg.ConfigSnapsh
 	case structs.ServiceKindIngressGateway:
 		return s.endpointsFromSnapshotIngressGateway(cfgSnap)
 	case structs.ServiceKindAPIGateway:
-		return s.endpointsFromSnapshotAPIGateway(cfgSnap)
+		// TODO Find a cleaner solution, can't currently pass unexported property types
+		var err error
+		cfgSnap.IngressGateway, err = cfgSnap.APIGateway.ToIngress(cfgSnap.Datacenter)
+		if err != nil {
+			return nil, err
+		}
+		return s.endpointsFromSnapshotIngressGateway(cfgSnap)
 	default:
 		return nil, fmt.Errorf("Invalid service kind: %v", cfgSnap.Kind)
 	}
@@ -138,10 +138,7 @@ func (s *ResourceGenerator) endpointsFromSnapshotConnectProxy(cfgSnap *proxycfg.
 		endpoints, ok := cfgSnap.ConnectProxy.PreparedQueryEndpoints[uid]
 		if ok {
 			la := makeLoadAssignment(
-				s.Logger,
-				cfgSnap,
 				clusterName,
-				nil,
 				[]loadAssignmentEndpointGroup{
 					{Endpoints: endpoints},
 				},
@@ -164,10 +161,7 @@ func (s *ResourceGenerator) endpointsFromSnapshotConnectProxy(cfgSnap *proxycfg.
 			endpoints, ok := cfgSnap.ConnectProxy.DestinationGateways.Get(uid)
 			if ok {
 				la := makeLoadAssignment(
-					s.Logger,
-					cfgSnap,
 					name,
-					nil,
 					[]loadAssignmentEndpointGroup{
 						{Endpoints: endpoints},
 					},
@@ -233,10 +227,7 @@ func (s *ResourceGenerator) endpointsFromSnapshotMeshGateway(cfgSnap *proxycfg.C
 			clusterName := connect.GatewaySNI(key.Datacenter, key.Partition, cfgSnap.Roots.TrustDomain)
 
 			la := makeLoadAssignment(
-				s.Logger,
-				cfgSnap,
 				clusterName,
-				nil,
 				[]loadAssignmentEndpointGroup{
 					{Endpoints: endpoints},
 				},
@@ -251,10 +242,7 @@ func (s *ResourceGenerator) endpointsFromSnapshotMeshGateway(cfgSnap *proxycfg.C
 
 			clusterName := cfgSnap.ServerSNIFn(key.Datacenter, "")
 			la := makeLoadAssignment(
-				s.Logger,
-				cfgSnap,
 				clusterName,
-				nil,
 				[]loadAssignmentEndpointGroup{
 					{Endpoints: endpoints},
 				},
@@ -279,7 +267,7 @@ func (s *ResourceGenerator) endpointsFromSnapshotMeshGateway(cfgSnap *proxycfg.C
 			lbEndpoint := &envoy_endpoint_v3.LbEndpoint{
 				HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
 					Endpoint: &envoy_endpoint_v3.Endpoint{
-						Address: response.MakeAddress(addr, port),
+						Address: makeAddress(addr, port),
 					},
 				},
 				HealthStatus: envoy_core_v3.HealthStatus_UNKNOWN,
@@ -336,7 +324,7 @@ func (s *ResourceGenerator) endpointsFromSnapshotMeshGateway(cfgSnap *proxycfg.C
 			serverEndpoints = append(serverEndpoints, &envoy_endpoint_v3.LbEndpoint{
 				HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
 					Endpoint: &envoy_endpoint_v3.Endpoint{
-						Address: response.MakeAddress(addr, port),
+						Address: makeAddress(addr, port),
 					},
 				},
 			})
@@ -424,10 +412,7 @@ func (s *ResourceGenerator) endpointsFromServicesAndResolvers(
 		for subsetName, groups := range clusterEndpoints {
 			clusterName := connect.ServiceSNI(svc.Name, subsetName, svc.NamespaceOrDefault(), svc.PartitionOrDefault(), cfgSnap.Datacenter, cfgSnap.Roots.TrustDomain)
 			la := makeLoadAssignment(
-				s.Logger,
-				cfgSnap,
 				clusterName,
-				nil,
 				groups,
 				cfgSnap.Locality,
 			)
@@ -462,10 +447,7 @@ func (s *ResourceGenerator) makeEndpointsForOutgoingPeeredServices(
 			groups := []loadAssignmentEndpointGroup{{Endpoints: serviceGroup.Nodes, OnlyPassing: false}}
 
 			la := makeLoadAssignment(
-				s.Logger,
-				cfgSnap,
 				clusterName,
-				nil,
 				groups,
 				// Use an empty key here so that it never matches. This will force the mesh gateway to always
 				// reference the remote mesh gateway's wan addr.
@@ -542,50 +524,12 @@ func (s *ResourceGenerator) endpointsFromSnapshotIngressGateway(cfgSnap *proxycf
 	return resources, nil
 }
 
-func (s *ResourceGenerator) endpointsFromSnapshotAPIGateway(cfgSnap *proxycfg.ConfigSnapshot) ([]proto.Message, error) {
-	var resources []proto.Message
-	createdClusters := make(map[proxycfg.UpstreamID]struct{})
-
-	readyListeners := getReadyListeners(cfgSnap)
-
-	for _, readyListener := range readyListeners {
-		for _, u := range readyListener.upstreams {
-			uid := proxycfg.NewUpstreamID(&u)
-
-			// If we've already created endpoints for this upstream, skip it. Multiple listeners may
-			// reference the same upstream, so we don't need to create duplicate endpoints in that case.
-			_, ok := createdClusters[uid]
-			if ok {
-				continue
-			}
-
-			endpoints, err := s.endpointsFromDiscoveryChain(
-				uid,
-				cfgSnap.APIGateway.DiscoveryChain[uid],
-				cfgSnap,
-				proxycfg.GatewayKey{Datacenter: cfgSnap.Datacenter, Partition: u.DestinationPartition},
-				u.Config,
-				cfgSnap.APIGateway.WatchedUpstreamEndpoints[uid],
-				cfgSnap.APIGateway.WatchedGatewayEndpoints[uid],
-				false,
-			)
-			if err != nil {
-				return nil, err
-			}
-
-			resources = append(resources, endpoints...)
-			createdClusters[uid] = struct{}{}
-		}
-	}
-	return resources, nil
-}
-
 // used in clusters.go
 func makeEndpoint(host string, port int) *envoy_endpoint_v3.LbEndpoint {
 	return &envoy_endpoint_v3.LbEndpoint{
 		HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
 			Endpoint: &envoy_endpoint_v3.Endpoint{
-				Address: response.MakeAddress(host, port),
+				Address: makeAddress(host, port),
 			},
 		},
 	}
@@ -595,7 +539,7 @@ func makePipeEndpoint(path string) *envoy_endpoint_v3.LbEndpoint {
 	return &envoy_endpoint_v3.LbEndpoint{
 		HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
 			Endpoint: &envoy_endpoint_v3.Endpoint{
-				Address: response.MakePipeAddress(path, 0),
+				Address: makePipeAddress(path, 0),
 			},
 		},
 	}
@@ -627,10 +571,7 @@ func (s *ResourceGenerator) makeUpstreamLoadAssignmentForPeerService(
 			return la, nil
 		}
 		la = makeLoadAssignment(
-			s.Logger,
-			cfgSnap,
 			clusterName,
-			nil,
 			[]loadAssignmentEndpointGroup{
 				{Endpoints: localGw},
 			},
@@ -650,10 +591,7 @@ func (s *ResourceGenerator) makeUpstreamLoadAssignmentForPeerService(
 		return nil, nil
 	}
 	la = makeLoadAssignment(
-		s.Logger,
-		cfgSnap,
 		clusterName,
-		nil,
 		[]loadAssignmentEndpointGroup{
 			{Endpoints: endpoints},
 		},
@@ -683,11 +621,18 @@ func (s *ResourceGenerator) endpointsFromDiscoveryChain(
 		upstreamConfigMap = make(map[string]interface{}) // TODO:needed?
 	}
 
+	upstreamsSnapshot, err := cfgSnap.ToConfigSnapshotUpstreams()
+
+	// Mesh gateways are exempt because upstreamsSnapshot is only used for
+	// cluster peering targets and transative failover/redirects are unsupported.
+	if err != nil && !forMeshGateway {
+		return nil, err
+	}
+
 	var resources []proto.Message
 
 	var escapeHatchCluster *envoy_cluster_v3.Cluster
 	if !forMeshGateway {
-
 		cfg, err := structs.ParseUpstreamConfigNoDefaults(upstreamConfigMap)
 		if err != nil {
 			// Don't hard fail on a config typo, just warn. The parse func returns
@@ -719,49 +664,44 @@ func (s *ResourceGenerator) endpointsFromDiscoveryChain(
 
 	// Find all resolver nodes.
 	for _, node := range chain.Nodes {
-		switch {
-		case node == nil:
-			return nil, fmt.Errorf("impossible to process a nil node")
-		case node.Type != structs.DiscoveryGraphNodeTypeResolver:
+		if node.Type != structs.DiscoveryGraphNodeTypeResolver {
 			continue
-		case node.Resolver == nil:
-			return nil, fmt.Errorf("impossible to process a non-resolver node")
-		}
-		rawUpstreamConfig, err := structs.ParseUpstreamConfigNoDefaults(upstreamConfigMap)
-		if err != nil {
-			return nil, err
 		}
-		upstreamConfig := finalizeUpstreamConfig(rawUpstreamConfig, chain, node.Resolver.ConnectTimeout)
+		primaryTargetID := node.Resolver.Target
+		failover := node.Resolver.Failover
 
-		mappedTargets, err := s.mapDiscoChainTargets(cfgSnap, chain, node, upstreamConfig, forMeshGateway)
-		if err != nil {
-			return nil, err
-		}
+		var targetsClustersData []targetClusterData
 
-		targetGroups, err := mappedTargets.groupedTargets()
-		if err != nil {
-			return nil, err
+		var numFailoverTargets int
+		if failover != nil {
+			numFailoverTargets = len(failover.Targets)
 		}
+		if numFailoverTargets > 0 && !forMeshGateway {
+			for _, targetID := range append([]string{primaryTargetID}, failover.Targets...) {
+				targetData, ok := s.getTargetClusterData(upstreamsSnapshot, chain, targetID, forMeshGateway, true)
+				if !ok {
+					continue
+				}
+				if escapeHatchCluster != nil {
+					targetData.clusterName = escapeHatchCluster.Name
+				}
 
-		for _, groupedTarget := range targetGroups {
-			clusterName := groupedTarget.ClusterName
-			if escapeHatchCluster != nil {
-				clusterName = escapeHatchCluster.Name
+				targetsClustersData = append(targetsClustersData, targetData)
 			}
-			switch len(groupedTarget.Targets) {
-			case 0:
-				s.Logger.Trace("skipping endpoint generation for zero-length target group", "cluster", clusterName)
-				continue
-			case 1:
-				// We expect one target so this passes through to continue setting the load assignment up.
-			default:
-				return nil, fmt.Errorf("cannot have more than one target")
+		} else {
+			if td, ok := s.getTargetClusterData(upstreamsSnapshot, chain, primaryTargetID, forMeshGateway, false); ok {
+				if escapeHatchCluster != nil {
+					td.clusterName = escapeHatchCluster.Name
+				}
+				targetsClustersData = append(targetsClustersData, td)
 			}
-			ti := groupedTarget.Targets[0]
-			s.Logger.Trace("generating endpoints for", "cluster", clusterName, "targetID", ti.TargetID, "gatewayKey", gatewayKey)
-			targetUID := proxycfg.NewUpstreamIDFromTargetID(ti.TargetID)
+		}
+
+		for _, targetOpt := range targetsClustersData {
+			s.Logger.Debug("generating endpoints for", "cluster", targetOpt.clusterName)
+			targetUID := proxycfg.NewUpstreamIDFromTargetID(targetOpt.targetID)
 			if targetUID.Peer != "" {
-				loadAssignment, err := s.makeUpstreamLoadAssignmentForPeerService(cfgSnap, clusterName, targetUID, mgwMode)
+				loadAssignment, err := s.makeUpstreamLoadAssignmentForPeerService(cfgSnap, targetOpt.clusterName, targetUID, mgwMode)
 				if err != nil {
 					return nil, err
 				}
@@ -775,20 +715,16 @@ func (s *ResourceGenerator) endpointsFromDiscoveryChain(
 				chain.Targets,
 				upstreamEndpoints,
 				gatewayEndpoints,
-				ti.TargetID,
+				targetOpt.targetID,
 				gatewayKey,
 				forMeshGateway,
 			)
 			if !valid {
-				s.Logger.Trace("skipping endpoint generation for invalid target group", "cluster", clusterName)
 				continue // skip the cluster if we're still populating the snapshot
 			}
 
 			la := makeLoadAssignment(
-				s.Logger,
-				cfgSnap,
-				clusterName,
-				ti.PrioritizeByLocality,
+				targetOpt.clusterName,
 				[]loadAssignmentEndpointGroup{endpointGroup},
 				gatewayKey,
 			)
@@ -808,8 +744,8 @@ func (s *ResourceGenerator) makeExportedUpstreamEndpointsForMeshGateway(cfgSnap
 
 		chainEndpoints := make(map[string]structs.CheckServiceNodes)
 		for _, target := range chain.Targets {
-			if !cfgSnap.Locality.Matches(target.Datacenter, target.Partition) || target.Peer != "" {
-				s.Logger.Warn("ignoring discovery chain target that crosses a datacenter, peer, or partition boundary in a mesh gateway",
+			if !cfgSnap.Locality.Matches(target.Datacenter, target.Partition) {
+				s.Logger.Warn("ignoring discovery chain target that crosses a datacenter or partition boundary in a mesh gateway",
 					"target", target,
 					"gatewayLocality", cfgSnap.Locality,
 				)
@@ -874,7 +810,7 @@ type loadAssignmentEndpointGroup struct {
 	OverrideHealth envoy_core_v3.HealthStatus
 }
 
-func makeLoadAssignment(logger hclog.Logger, cfgSnap *proxycfg.ConfigSnapshot, clusterName string, policy *structs.DiscoveryPrioritizeByLocality, endpointGroups []loadAssignmentEndpointGroup, localKey proxycfg.GatewayKey) *envoy_endpoint_v3.ClusterLoadAssignment {
+func makeLoadAssignment(clusterName string, endpointGroups []loadAssignmentEndpointGroup, localKey proxycfg.GatewayKey) *envoy_endpoint_v3.ClusterLoadAssignment {
 	cla := &envoy_endpoint_v3.ClusterLoadAssignment{
 		ClusterName: clusterName,
 		Endpoints:   make([]*envoy_endpoint_v3.LocalityLbEndpoints, 0, len(endpointGroups)),
@@ -884,50 +820,39 @@ func makeLoadAssignment(logger hclog.Logger, cfgSnap *proxycfg.ConfigSnapshot, c
 		cla.Policy = &envoy_endpoint_v3.ClusterLoadAssignment_Policy{
 			// We choose such a large value here that the failover math should
 			// in effect not happen until zero instances are healthy.
-			OverprovisioningFactor: response.MakeUint32Value(100000),
+			OverprovisioningFactor: makeUint32Value(100000),
 		}
 	}
 
-	var priority uint32
-
-	for _, endpointGroup := range endpointGroups {
-		endpointsByLocality, err := groupedEndpoints(logger, cfgSnap.ServiceLocality, policy, endpointGroup.Endpoints)
-
-		if err != nil {
-			continue
-		}
-
-		for _, endpoints := range endpointsByLocality {
-			es := make([]*envoy_endpoint_v3.LbEndpoint, 0, len(endpointGroup.Endpoints))
+	for priority, endpointGroup := range endpointGroups {
+		endpoints := endpointGroup.Endpoints
+		es := make([]*envoy_endpoint_v3.LbEndpoint, 0, len(endpoints))
 
-			for _, ep := range endpoints {
-				// TODO (mesh-gateway) - should we respect the translate_wan_addrs configuration here or just always use the wan for cross-dc?
-				_, addr, port := ep.BestAddress(!localKey.Matches(ep.Node.Datacenter, ep.Node.PartitionOrDefault()))
-				healthStatus, weight := calculateEndpointHealthAndWeight(ep, endpointGroup.OnlyPassing)
+		for _, ep := range endpoints {
+			// TODO (mesh-gateway) - should we respect the translate_wan_addrs configuration here or just always use the wan for cross-dc?
+			_, addr, port := ep.BestAddress(!localKey.Matches(ep.Node.Datacenter, ep.Node.PartitionOrDefault()))
+			healthStatus, weight := calculateEndpointHealthAndWeight(ep, endpointGroup.OnlyPassing)
 
-				if endpointGroup.OverrideHealth != envoy_core_v3.HealthStatus_UNKNOWN {
-					healthStatus = endpointGroup.OverrideHealth
-				}
-
-				endpoint := &envoy_endpoint_v3.Endpoint{
-					Address: response.MakeAddress(addr, port),
-				}
-				es = append(es, &envoy_endpoint_v3.LbEndpoint{
-					HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
-						Endpoint: endpoint,
-					},
-					HealthStatus:        healthStatus,
-					LoadBalancingWeight: response.MakeUint32Value(weight),
-				})
+			if endpointGroup.OverrideHealth != envoy_core_v3.HealthStatus_UNKNOWN {
+				healthStatus = endpointGroup.OverrideHealth
 			}
 
-			cla.Endpoints = append(cla.Endpoints, &envoy_endpoint_v3.LocalityLbEndpoints{
-				Priority:    priority,
-				LbEndpoints: es,
+			endpoint := &envoy_endpoint_v3.Endpoint{
+				Address: makeAddress(addr, port),
+			}
+			es = append(es, &envoy_endpoint_v3.LbEndpoint{
+				HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
+					Endpoint: endpoint,
+				},
+				HealthStatus:        healthStatus,
+				LoadBalancingWeight: makeUint32Value(weight),
 			})
-
-			priority++
 		}
+
+		cla.Endpoints = append(cla.Endpoints, &envoy_endpoint_v3.LocalityLbEndpoints{
+			Priority:    uint32(priority),
+			LbEndpoints: es,
+		})
 	}
 
 	return cla
diff --git a/agent/xds/endpoints_test.go b/agent/xds/endpoints_test.go
index 9daf5b31f55b3..31215adba93d5 100644
--- a/agent/xds/endpoints_test.go
+++ b/agent/xds/endpoints_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
@@ -10,18 +7,16 @@ import (
 
 	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
-	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xds/proxystateconverter"
-	"github.com/hashicorp/consul/agent/xds/response"
 	"github.com/hashicorp/consul/agent/xds/testcommon"
-	"github.com/hashicorp/consul/agent/xdsv2"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/go-hclog"
+
 	"github.com/mitchellh/copystructure"
 	testinf "github.com/mitchellh/go-testing-interface"
 	"github.com/stretchr/testify/require"
+
+	"github.com/hashicorp/consul/agent/proxycfg"
+	"github.com/hashicorp/consul/agent/structs"
+	"github.com/hashicorp/consul/envoyextensions/xdscommon"
+	"github.com/hashicorp/consul/sdk/testutil"
 )
 
 func Test_makeLoadAssignment(t *testing.T) {
@@ -103,7 +98,6 @@ func Test_makeLoadAssignment(t *testing.T) {
 	tests := []struct {
 		name        string
 		clusterName string
-		locality    *structs.Locality
 		endpoints   []loadAssignmentEndpointGroup
 		want        *envoy_endpoint_v3.ClusterLoadAssignment
 	}{
@@ -133,18 +127,18 @@ func Test_makeLoadAssignment(t *testing.T) {
 						{
 							HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
 								Endpoint: &envoy_endpoint_v3.Endpoint{
-									Address: response.MakeAddress("10.10.10.10", 1234),
+									Address: makeAddress("10.10.10.10", 1234),
 								}},
 							HealthStatus:        envoy_core_v3.HealthStatus_HEALTHY,
-							LoadBalancingWeight: response.MakeUint32Value(1),
+							LoadBalancingWeight: makeUint32Value(1),
 						},
 						{
 							HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
 								Endpoint: &envoy_endpoint_v3.Endpoint{
-									Address: response.MakeAddress("10.10.10.20", 1234),
+									Address: makeAddress("10.10.10.20", 1234),
 								}},
 							HealthStatus:        envoy_core_v3.HealthStatus_HEALTHY,
-							LoadBalancingWeight: response.MakeUint32Value(1),
+							LoadBalancingWeight: makeUint32Value(1),
 						},
 					},
 				}},
@@ -163,18 +157,18 @@ func Test_makeLoadAssignment(t *testing.T) {
 						{
 							HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
 								Endpoint: &envoy_endpoint_v3.Endpoint{
-									Address: response.MakeAddress("10.10.10.10", 1234),
+									Address: makeAddress("10.10.10.10", 1234),
 								}},
 							HealthStatus:        envoy_core_v3.HealthStatus_HEALTHY,
-							LoadBalancingWeight: response.MakeUint32Value(10),
+							LoadBalancingWeight: makeUint32Value(10),
 						},
 						{
 							HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
 								Endpoint: &envoy_endpoint_v3.Endpoint{
-									Address: response.MakeAddress("10.10.10.20", 1234),
+									Address: makeAddress("10.10.10.20", 1234),
 								}},
 							HealthStatus:        envoy_core_v3.HealthStatus_HEALTHY,
-							LoadBalancingWeight: response.MakeUint32Value(5),
+							LoadBalancingWeight: makeUint32Value(5),
 						},
 					},
 				}},
@@ -193,18 +187,18 @@ func Test_makeLoadAssignment(t *testing.T) {
 						{
 							HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
 								Endpoint: &envoy_endpoint_v3.Endpoint{
-									Address: response.MakeAddress("10.10.10.10", 1234),
+									Address: makeAddress("10.10.10.10", 1234),
 								}},
 							HealthStatus:        envoy_core_v3.HealthStatus_HEALTHY,
-							LoadBalancingWeight: response.MakeUint32Value(1),
+							LoadBalancingWeight: makeUint32Value(1),
 						},
 						{
 							HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
 								Endpoint: &envoy_endpoint_v3.Endpoint{
-									Address: response.MakeAddress("10.10.10.20", 1234),
+									Address: makeAddress("10.10.10.20", 1234),
 								}},
 							HealthStatus:        envoy_core_v3.HealthStatus_UNHEALTHY,
-							LoadBalancingWeight: response.MakeUint32Value(1),
+							LoadBalancingWeight: makeUint32Value(1),
 						},
 					},
 				}},
@@ -214,26 +208,11 @@ func Test_makeLoadAssignment(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got := makeLoadAssignment(
-				hclog.NewNullLogger(),
-				&proxycfg.ConfigSnapshot{ServiceLocality: tt.locality},
 				tt.clusterName,
-				nil,
 				tt.endpoints,
 				proxycfg.GatewayKey{Datacenter: "dc1"},
 			)
 			require.Equal(t, tt.want, got)
-
-			if tt.locality == nil {
-				got := makeLoadAssignment(
-					hclog.NewNullLogger(),
-					&proxycfg.ConfigSnapshot{ServiceLocality: &structs.Locality{Region: "us-west-1", Zone: "us-west-1a"}},
-					tt.clusterName,
-					nil,
-					tt.endpoints,
-					proxycfg.GatewayKey{Datacenter: "dc1"},
-				)
-				require.Equal(t, tt.want, got)
-			}
 		})
 	}
 }
@@ -242,7 +221,6 @@ type endpointTestCase struct {
 	name               string
 	create             func(t testinf.T) *proxycfg.ConfigSnapshot
 	overrideGoldenName string
-	alsoRunTestForV2   bool
 }
 
 func makeEndpointDiscoChainTests(enterprise bool) []endpointTestCase {
@@ -252,84 +230,72 @@ func makeEndpointDiscoChainTests(enterprise bool) []endpointTestCase {
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-chain-external-sni",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "external-sni", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-chain-and-overrides",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple-with-overrides", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-chain-and-failover",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-failover-through-remote-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-remote-gateway", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-remote-gateway-triggered", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-double-failover-through-remote-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-double-remote-gateway", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-double-remote-gateway-triggered", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-failover-through-local-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-local-gateway", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-local-gateway-triggered", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-double-failover-through-local-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-double-local-gateway", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-double-local-gateway-triggered", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-default-chain-and-custom-cluster",
@@ -341,15 +307,12 @@ func makeEndpointDiscoChainTests(enterprise bool) []endpointTestCase {
 						})
 				}, nil)
 			},
-			// TODO(proxystate): requires custom cluster work
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "splitter-with-resolver-redirect",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "splitter-with-resolver-redirect-multidc", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 	}
 }
@@ -368,64 +331,42 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "default", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "mesh-gateway-using-federation-states",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "federation-states", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "mesh-gateway-newer-information-in-federation-states",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "newer-info-in-federation-states", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "mesh-gateway-using-federation-control-plane",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotMeshGateway(t, "mesh-gateway-federation", nil, nil)
-			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "mesh-gateway-older-information-in-federation-states",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "older-info-in-federation-states", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "mesh-gateway-no-services",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "no-services", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "mesh-gateway-service-subsets",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "service-subsets2", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "mesh-gateway-default-service-subset",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "default-service-subsets2", nil, nil)
 			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-gateway",
@@ -433,16 +374,12 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"default", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-gateway-nil-config-entry",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotIngressGateway_NilConfigEntry(t)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-gateway-no-services",
@@ -450,8 +387,6 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, false, "tcp",
 					"default", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-chain",
@@ -459,8 +394,6 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"simple", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-chain-external-sni",
@@ -468,8 +401,6 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"external-sni", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-chain-and-failover",
@@ -477,8 +408,6 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-chain-and-failover-to-cluster-peer",
@@ -486,8 +415,6 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-to-cluster-peer", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-failover-through-remote-gateway",
@@ -495,8 +422,6 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-remote-gateway", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-failover-through-remote-gateway-triggered",
@@ -504,8 +429,6 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-remote-gateway-triggered", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-double-failover-through-remote-gateway",
@@ -513,8 +436,6 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-double-remote-gateway", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered",
@@ -522,8 +443,6 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-double-remote-gateway-triggered", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-failover-through-local-gateway",
@@ -531,8 +450,6 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-local-gateway", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-failover-through-local-gateway-triggered",
@@ -540,8 +457,6 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-local-gateway-triggered", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-double-failover-through-local-gateway",
@@ -549,8 +464,6 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-double-local-gateway", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-tcp-chain-double-failover-through-local-gateway-triggered",
@@ -558,8 +471,6 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"failover-through-double-local-gateway-triggered", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-splitter-with-resolver-redirect",
@@ -567,42 +478,30 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "http",
 					"splitter-with-resolver-redirect-multidc", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "terminating-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, nil, nil)
 			},
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "terminating-gateway-no-services",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotTerminatingGateway(t, false, nil, nil)
 			},
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name:   "terminating-gateway-service-subsets",
 			create: proxycfg.TestConfigSnapshotTerminatingGatewayServiceSubsets,
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name:   "terminating-gateway-default-service-subset",
 			create: proxycfg.TestConfigSnapshotTerminatingGatewayDefaultServiceSubset,
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name:   "ingress-multiple-listeners-duplicate-service",
 			create: proxycfg.TestConfigSnapshotIngress_MultipleListenersDuplicateService,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 	}
 
@@ -633,10 +532,10 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 					sort.Slice(endpoints, func(i, j int) bool {
 						return endpoints[i].(*envoy_endpoint_v3.ClusterLoadAssignment).ClusterName < endpoints[j].(*envoy_endpoint_v3.ClusterLoadAssignment).ClusterName
 					})
-					r, err := response.CreateResponse(xdscommon.EndpointType, "00000001", "00000001", endpoints)
+					r, err := createResponse(xdscommon.EndpointType, "00000001", "00000001", endpoints)
 					require.NoError(t, err)
 
-					t.Run("current-xdsv1", func(t *testing.T) {
+					t.Run("current", func(t *testing.T) {
 						gotJSON := protoToJSON(t, r)
 
 						gName := tt.name
@@ -646,39 +545,6 @@ func TestEndpointsFromSnapshot(t *testing.T) {
 
 						require.JSONEq(t, goldenEnvoy(t, filepath.Join("endpoints", gName), envoyVersion, latestEnvoyVersion, gotJSON), gotJSON)
 					})
-
-					if tt.alsoRunTestForV2 {
-						generator := xdsv2.NewResourceGenerator(testutil.Logger(t))
-
-						converter := proxystateconverter.NewConverter(testutil.Logger(t), &mockCfgFetcher{addressLan: "10.10.10.10"})
-						proxyState, err := converter.ProxyStateFromSnapshot(snap)
-						require.NoError(t, err)
-
-						res, err := generator.AllResourcesFromIR(proxyState)
-						require.NoError(t, err)
-
-						endpoints = res[xdscommon.EndpointType]
-						// The order of listeners returned via LDS isn't relevant, so it's safe
-						// to sort these for the purposes of test comparisons.
-						sort.Slice(endpoints, func(i, j int) bool {
-							return endpoints[i].(*envoy_endpoint_v3.ClusterLoadAssignment).ClusterName < endpoints[j].(*envoy_endpoint_v3.ClusterLoadAssignment).ClusterName
-						})
-
-						r, err := response.CreateResponse(xdscommon.EndpointType, "00000001", "00000001", endpoints)
-						require.NoError(t, err)
-
-						t.Run("current-xdsv2", func(t *testing.T) {
-							gotJSON := protoToJSON(t, r)
-
-							gName := tt.name
-							if tt.overrideGoldenName != "" {
-								gName = tt.overrideGoldenName
-							}
-
-							expectedJSON := goldenEnvoy(t, filepath.Join("endpoints", gName), envoyVersion, latestEnvoyVersion, gotJSON)
-							require.JSONEq(t, expectedJSON, gotJSON)
-						})
-					}
 				})
 			}
 		})
diff --git a/agent/xds/extensionruntime/runtime_config.go b/agent/xds/extensionruntime/runtime_config.go
index 924368ebdf2a6..7d7fb85776ca3 100644
--- a/agent/xds/extensionruntime/runtime_config.go
+++ b/agent/xds/extensionruntime/runtime_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package extensionruntime
 
 import (
@@ -56,27 +53,19 @@ func GetRuntimeConfigurations(cfgSnap *proxycfg.ConfigSnapshot) map[api.Compound
 
 		// TODO(peering): consider PeerUpstreamEndpoints in addition to DiscoveryChain
 		// These are the discovery chains for upstreams which have the Envoy Extensions applied to the local service.
-		for uid, chain := range cfgSnap.ConnectProxy.DiscoveryChain {
+		for uid, dc := range cfgSnap.ConnectProxy.DiscoveryChain {
 			compoundServiceName := upstreamIDToCompoundServiceName(uid)
-			extensionsMap[compoundServiceName] = convertEnvoyExtensions(chain.EnvoyExtensions)
-
-			primarySNI := connect.ServiceSNI(uid.Name, "", chain.Namespace, chain.Partition, cfgSnap.Datacenter, trustDomain)
-			snis := make(map[string]struct{})
-			for _, t := range chain.Targets {
-				// SNI isn't set for peered services. We don't support peered services yet.
-				if t.SNI != "" {
-					snis[t.SNI] = struct{}{}
-				}
-			}
+			extensionsMap[compoundServiceName] = convertEnvoyExtensions(dc.EnvoyExtensions)
 
+			meta := uid.EnterpriseMeta
+			sni := connect.ServiceSNI(uid.Name, "", meta.NamespaceOrDefault(), meta.PartitionOrDefault(), cfgSnap.Datacenter, trustDomain)
 			outgoingKind, ok := outgoingKindByService[compoundServiceName]
 			if !ok {
 				outgoingKind = api.ServiceKindConnectProxy
 			}
 
 			upstreamMap[compoundServiceName] = &extensioncommon.UpstreamData{
-				PrimarySNI:        primarySNI,
-				SNIs:              snis,
+				SNI:               map[string]struct{}{sni: {}},
 				VIP:               vipForService[compoundServiceName],
 				EnvoyID:           uid.EnvoyID(),
 				OutgoingProxyKind: outgoingKind,
@@ -99,7 +88,6 @@ func GetRuntimeConfigurations(cfgSnap *proxycfg.ConfigSnapshot) map[api.Compound
 				IsSourcedFromUpstream: false,
 				Upstreams:             upstreamMap,
 				Kind:                  kind,
-				Protocol:              proxyConfigProtocol(cfgSnap.Proxy.Config),
 			}
 			extensionConfigurationsMap[localSvc] = append(extensionConfigurationsMap[localSvc], extCfg)
 		}
@@ -109,10 +97,10 @@ func GetRuntimeConfigurations(cfgSnap *proxycfg.ConfigSnapshot) map[api.Compound
 			compoundServiceName := serviceNameToCompoundServiceName(svc)
 			extensionsMap[compoundServiceName] = convertEnvoyExtensions(c.EnvoyExtensions)
 
-			primarySNI := connect.ServiceSNI(svc.Name, "", svc.NamespaceOrDefault(), svc.PartitionOrDefault(), cfgSnap.Datacenter, trustDomain)
+			sni := connect.ServiceSNI(svc.Name, "", svc.NamespaceOrDefault(), svc.PartitionOrDefault(), cfgSnap.Datacenter, trustDomain)
 			envoyID := proxycfg.NewUpstreamIDFromServiceName(svc)
 
-			snis := map[string]struct{}{primarySNI: {}}
+			snis := map[string]struct{}{sni: {}}
 
 			resolver, hasResolver := cfgSnap.TerminatingGateway.ServiceResolvers[svc]
 			if hasResolver {
@@ -123,8 +111,7 @@ func GetRuntimeConfigurations(cfgSnap *proxycfg.ConfigSnapshot) map[api.Compound
 			}
 
 			upstreamMap[compoundServiceName] = &extensioncommon.UpstreamData{
-				PrimarySNI:        primarySNI,
-				SNIs:              snis,
+				SNI:               snis,
 				EnvoyID:           envoyID.EnvoyID(),
 				OutgoingProxyKind: api.ServiceKindTerminatingGateway,
 			}
@@ -144,7 +131,6 @@ func GetRuntimeConfigurations(cfgSnap *proxycfg.ConfigSnapshot) map[api.Compound
 					ServiceName:           svc,
 					IsSourcedFromUpstream: true,
 					Upstreams:             upstreamMap,
-					Protocol:              proxyConfigProtocol(cfgSnap.Proxy.Config),
 				}
 				extensionConfigurationsMap[svc] = append(extensionConfigurationsMap[svc], extCfg)
 			}
@@ -174,15 +160,6 @@ func convertEnvoyExtensions(structExtensions structs.EnvoyExtensions) []api.Envo
 	return structExtensions.ToAPI()
 }
 
-func proxyConfigProtocol(cfg map[string]any) string {
-	if p, exists := cfg["protocol"]; exists {
-		if protocol, ok := p.(string); ok {
-			return protocol
-		}
-	}
-	return ""
-}
-
 // appliesToRemoteDownstreams returns true if the given extension should be applied to remote downstream proxies of the
 // service targeted by the extension, rather than just the local proxy. In the context of GetRuntimeConfigurations, this
 // determines whether the extension should apply to the local proxy (a downstream of the configured service).
diff --git a/agent/xds/extensionruntime/runtime_config_ce_test.go b/agent/xds/extensionruntime/runtime_config_ce_test.go
index 102940b0db651..d7214867fbc54 100644
--- a/agent/xds/extensionruntime/runtime_config_ce_test.go
+++ b/agent/xds/extensionruntime/runtime_config_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package extensionruntime
 
@@ -57,32 +55,28 @@ func TestGetRuntimeConfigurations_TerminatingGateway(t *testing.T) {
 				IsSourcedFromUpstream: true,
 				Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{
 					apiService: {
-						PrimarySNI: "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-						SNIs: map[string]struct{}{
+						SNI: map[string]struct{}{
 							"api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {},
 						},
 						EnvoyID:           "api",
 						OutgoingProxyKind: "terminating-gateway",
 					},
 					cacheService: {
-						PrimarySNI: "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-						SNIs: map[string]struct{}{
+						SNI: map[string]struct{}{
 							"cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {},
 						},
 						EnvoyID:           "cache",
 						OutgoingProxyKind: "terminating-gateway",
 					},
 					dbService: {
-						PrimarySNI: "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-						SNIs: map[string]struct{}{
+						SNI: map[string]struct{}{
 							"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {},
 						},
 						EnvoyID:           "db",
 						OutgoingProxyKind: "terminating-gateway",
 					},
 					webService: {
-						PrimarySNI: "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-						SNIs: map[string]struct{}{
+						SNI: map[string]struct{}{
 							"canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {},
 							"canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {},
 							"web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul":         {},
@@ -137,25 +131,10 @@ func TestGetRuntimeConfigurations_ConnectProxy(t *testing.T) {
 		EnvoyExtensions: envoyExtensions,
 	}
 
-	serviceDefaultsV2 := &structs.ServiceConfigEntry{
-		Kind:     structs.ServiceDefaults,
-		Name:     "db-v2",
-		Protocol: "http",
-	}
-
-	serviceSplitter := &structs.ServiceSplitterConfigEntry{
-		Kind: structs.ServiceSplitter,
-		Name: "db",
-		Splits: []structs.ServiceSplit{
-			{Weight: 50},
-			{Weight: 50, Service: "db-v2"},
-		},
-	}
-
 	// Setup a snapshot where the db upstream is on a connect proxy.
-	snapConnect := proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, nil, nil, serviceDefaults, serviceDefaultsV2, serviceSplitter)
+	snapConnect := proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, nil, nil, serviceDefaults)
 	// Setup a snapshot where the db upstream is on a terminating gateway.
-	snapTermGw := proxycfg.TestConfigSnapshotDiscoveryChain(t, "register-to-terminating-gateway", false, nil, nil, serviceDefaults, serviceDefaultsV2, serviceSplitter)
+	snapTermGw := proxycfg.TestConfigSnapshotDiscoveryChain(t, "register-to-terminating-gateway", false, nil, nil, serviceDefaults)
 	// Setup a snapshot with the local service web has extensions.
 	snapWebConnect := proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", false, func(ns *structs.NodeService) {
 		ns.Proxy.EnvoyExtensions = envoyExtensions
@@ -182,10 +161,8 @@ func TestGetRuntimeConfigurations_ConnectProxy(t *testing.T) {
 						IsSourcedFromUpstream: true,
 						Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{
 							dbService: {
-								PrimarySNI: "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-								SNIs: map[string]struct{}{
-									"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul":    {},
-									"db-v2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {},
+								SNI: map[string]struct{}{
+									"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {},
 								},
 								EnvoyID:           "db",
 								OutgoingProxyKind: "connect-proxy",
@@ -213,10 +190,8 @@ func TestGetRuntimeConfigurations_ConnectProxy(t *testing.T) {
 						IsSourcedFromUpstream: true,
 						Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{
 							dbService: {
-								PrimarySNI: "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-								SNIs: map[string]struct{}{
-									"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul":    {},
-									"db-v2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {},
+								SNI: map[string]struct{}{
+									"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {},
 								},
 								EnvoyID:           "db",
 								OutgoingProxyKind: "terminating-gateway",
@@ -246,8 +221,7 @@ func TestGetRuntimeConfigurations_ConnectProxy(t *testing.T) {
 						IsSourcedFromUpstream: false,
 						Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{
 							dbService: {
-								PrimarySNI: "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-								SNIs: map[string]struct{}{
+								SNI: map[string]struct{}{
 									"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {},
 								},
 								EnvoyID:           "db",
@@ -268,8 +242,7 @@ func TestGetRuntimeConfigurations_ConnectProxy(t *testing.T) {
 						IsSourcedFromUpstream: false,
 						Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{
 							dbService: {
-								PrimarySNI: "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-								SNIs: map[string]struct{}{
+								SNI: map[string]struct{}{
 									"db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul": {},
 								},
 								EnvoyID:           "db",
diff --git a/agent/xds/failover_math.go b/agent/xds/failover_math.go
new file mode 100644
index 0000000000000..4ebae89329e23
--- /dev/null
+++ b/agent/xds/failover_math.go
@@ -0,0 +1,38 @@
+package xds
+
+import (
+	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
+
+	"github.com/hashicorp/consul/agent/structs"
+)
+
+func firstHealthyTarget(
+	targets map[string]*structs.DiscoveryTarget,
+	targetHealth map[string]structs.CheckServiceNodes,
+	primaryTarget string,
+	secondaryTargets []string,
+) string {
+	series := make([]string, 0, len(secondaryTargets)+1)
+	series = append(series, primaryTarget)
+	series = append(series, secondaryTargets...)
+
+	for _, targetID := range series {
+		target, ok := targets[targetID]
+		if !ok {
+			continue
+		}
+
+		endpoints, ok := targetHealth[targetID]
+		if !ok {
+			continue
+		}
+		for _, ep := range endpoints {
+			healthStatus, _ := calculateEndpointHealthAndWeight(ep, target.Subset.OnlyPassing)
+			if healthStatus == envoy_core_v3.HealthStatus_HEALTHY {
+				return targetID
+			}
+		}
+	}
+
+	return primaryTarget // if everything is broken just use the primary for now
+}
diff --git a/agent/xds/failover_math_test.go b/agent/xds/failover_math_test.go
new file mode 100644
index 0000000000000..296d1cc77f0cd
--- /dev/null
+++ b/agent/xds/failover_math_test.go
@@ -0,0 +1,142 @@
+package xds
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/hashicorp/consul/agent/proxycfg"
+	"github.com/hashicorp/consul/agent/structs"
+)
+
+func TestFirstHealthyTarget(t *testing.T) {
+	passing := proxycfg.TestUpstreamNodesInStatus(t, "passing")
+	warning := proxycfg.TestUpstreamNodesInStatus(t, "warning")
+	critical := proxycfg.TestUpstreamNodesInStatus(t, "critical")
+
+	warnOnlyPassingTarget := structs.NewDiscoveryTarget(structs.DiscoveryTargetOpts{
+		Service:    "all-warn",
+		Namespace:  "default",
+		Partition:  "default",
+		Datacenter: "dc1",
+	})
+	warnOnlyPassingTarget.Subset.OnlyPassing = true
+	failOnlyPassingTarget := structs.NewDiscoveryTarget(structs.DiscoveryTargetOpts{
+		Service:    "all-fail",
+		Namespace:  "default",
+		Partition:  "default",
+		Datacenter: "dc1",
+	})
+	failOnlyPassingTarget.Subset.OnlyPassing = true
+
+	targets := map[string]*structs.DiscoveryTarget{
+		"all-ok.default.dc1": structs.NewDiscoveryTarget(structs.DiscoveryTargetOpts{
+			Service:    "all-ok",
+			Namespace:  "default",
+			Partition:  "default",
+			Datacenter: "dc1",
+		}),
+		"all-warn.default.dc1": structs.NewDiscoveryTarget(structs.DiscoveryTargetOpts{
+			Service:    "all-warn",
+			Namespace:  "default",
+			Partition:  "default",
+			Datacenter: "dc1",
+		}),
+		"all-fail.default.default.dc1": structs.NewDiscoveryTarget(structs.DiscoveryTargetOpts{
+			Service:    "all-fail",
+			Namespace:  "default",
+			Partition:  "default",
+			Datacenter: "dc1",
+		}),
+		"all-warn-onlypassing.default.dc1": warnOnlyPassingTarget,
+		"all-fail-onlypassing.default.dc1": failOnlyPassingTarget,
+	}
+	targetHealth := map[string]structs.CheckServiceNodes{
+		"all-ok.default.dc1":               passing,
+		"all-warn.default.dc1":             warning,
+		"all-fail.default.default.dc1":     critical,
+		"all-warn-onlypassing.default.dc1": warning,
+		"all-fail-onlypassing.default.dc1": critical,
+	}
+
+	cases := []struct {
+		primary   string
+		secondary []string
+		expect    string
+	}{
+		{
+			primary: "all-ok.default.dc1",
+			expect:  "all-ok.default.dc1",
+		},
+		{
+			primary: "all-warn.default.dc1",
+			expect:  "all-warn.default.dc1",
+		},
+		{
+			primary: "all-fail.default.default.dc1",
+			expect:  "all-fail.default.default.dc1",
+		},
+		{
+			primary: "all-warn-onlypassing.default.dc1",
+			expect:  "all-warn-onlypassing.default.dc1",
+		},
+		{
+			primary: "all-fail-onlypassing.default.dc1",
+			expect:  "all-fail-onlypassing.default.dc1",
+		},
+		{
+			primary: "all-ok.default.dc1",
+			secondary: []string{
+				"all-warn.default.dc1",
+			},
+			expect: "all-ok.default.dc1",
+		},
+		{
+			primary: "all-warn.default.dc1",
+			secondary: []string{
+				"all-ok.default.dc1",
+			},
+			expect: "all-warn.default.dc1",
+		},
+		{
+			primary: "all-warn-onlypassing.default.dc1",
+			secondary: []string{
+				"all-ok.default.dc1",
+			},
+			expect: "all-ok.default.dc1",
+		},
+		{
+			primary: "all-fail.default.default.dc1",
+			secondary: []string{
+				"all-ok.default.dc1",
+			},
+			expect: "all-ok.default.dc1",
+		},
+		{
+			primary: "all-fail-onlypassing.default.dc1",
+			secondary: []string{
+				"all-ok.default.dc1",
+			},
+			expect: "all-ok.default.dc1",
+		},
+		{
+			primary: "all-fail.default.default.dc1",
+			secondary: []string{
+				"all-warn-onlypassing.default.dc1",
+				"all-warn.default.dc1",
+				"all-ok.default.dc1",
+			},
+			expect: "all-warn.default.dc1",
+		},
+	}
+
+	for _, tc := range cases {
+		tc := tc
+		name := fmt.Sprintf("%s and %v", tc.primary, tc.secondary)
+		t.Run(name, func(t *testing.T) {
+			targetID := firstHealthyTarget(targets, targetHealth, tc.primary, tc.secondary)
+			require.Equal(t, tc.expect, targetID)
+		})
+	}
+}
diff --git a/agent/xds/failover_policy.go b/agent/xds/failover_policy.go
deleted file mode 100644
index ab3e86f25d1db..0000000000000
--- a/agent/xds/failover_policy.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"fmt"
-
-	envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
-
-	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-)
-
-type discoChainTargets struct {
-	baseClusterName string
-	targets         []targetInfo
-	failover        bool
-	failoverPolicy  structs.ServiceResolverFailoverPolicy
-}
-
-type targetInfo struct {
-	TargetID   string
-	TLSContext *envoy_tls_v3.UpstreamTlsContext
-	// Region is the region from the failover target's Locality. nil means the
-	// target is in the local Consul cluster.
-	Region *string
-
-	PrioritizeByLocality *structs.DiscoveryPrioritizeByLocality
-}
-
-type discoChainTargetGroup struct {
-	Targets     []targetInfo
-	ClusterName string
-}
-
-func (ft discoChainTargets) groupedTargets() ([]discoChainTargetGroup, error) {
-	var targetGroups []discoChainTargetGroup
-
-	if !ft.failover {
-		targetGroups = append(targetGroups, discoChainTargetGroup{
-			ClusterName: ft.baseClusterName,
-			Targets:     ft.targets,
-		})
-		return targetGroups, nil
-	}
-
-	switch ft.failoverPolicy.Mode {
-	case "sequential", "":
-		return ft.sequential()
-	case "order-by-locality":
-		return ft.orderByLocality()
-	default:
-		return targetGroups, fmt.Errorf("unexpected failover policy")
-	}
-}
-
-func (s *ResourceGenerator) mapDiscoChainTargets(cfgSnap *proxycfg.ConfigSnapshot, chain *structs.CompiledDiscoveryChain, node *structs.DiscoveryGraphNode, upstreamConfig structs.UpstreamConfig, forMeshGateway bool) (discoChainTargets, error) {
-	failoverTargets := discoChainTargets{}
-
-	if node.Resolver == nil {
-		return discoChainTargets{}, fmt.Errorf("impossible to process a non-resolver node")
-	}
-
-	primaryTargetID := node.Resolver.Target
-	upstreamsSnapshot, err := cfgSnap.ToConfigSnapshotUpstreams()
-	if err != nil && !forMeshGateway {
-		return discoChainTargets{}, err
-	}
-
-	failoverTargets.baseClusterName = s.getTargetClusterName(upstreamsSnapshot, chain, primaryTargetID, forMeshGateway)
-
-	tids := []string{primaryTargetID}
-	failover := node.Resolver.Failover
-	if failover != nil && !forMeshGateway {
-		tids = append(tids, failover.Targets...)
-		failoverTargets.failover = true
-		if failover.Policy == nil {
-			failoverTargets.failoverPolicy = structs.ServiceResolverFailoverPolicy{}
-		} else {
-			failoverTargets.failoverPolicy = *failover.Policy
-		}
-	}
-
-	for _, tid := range tids {
-		target := chain.Targets[tid]
-		var sni, rootPEMs string
-		var spiffeIDs []string
-		targetUID := proxycfg.NewUpstreamIDFromTargetID(tid)
-		ti := targetInfo{TargetID: tid, PrioritizeByLocality: target.PrioritizeByLocality}
-
-		configureTLS := true
-		if forMeshGateway {
-			// We only initiate TLS if we're doing an L7 proxy.
-			configureTLS = structs.IsProtocolHTTPLike(upstreamConfig.Protocol)
-		}
-
-		if !configureTLS {
-			failoverTargets.targets = append(failoverTargets.targets, ti)
-			continue
-		}
-
-		if targetUID.Peer != "" {
-			tbs, _ := upstreamsSnapshot.UpstreamPeerTrustBundles.Get(targetUID.Peer)
-			rootPEMs = tbs.ConcatenatedRootPEMs()
-
-			peerMeta, found := upstreamsSnapshot.UpstreamPeerMeta(targetUID)
-			if !found {
-				s.Logger.Warn("failed to fetch upstream peering metadata", "target", targetUID)
-				continue
-			}
-			sni = peerMeta.PrimarySNI()
-			spiffeIDs = peerMeta.SpiffeID
-			region := target.Locality.GetRegion()
-			ti.Region = &region
-		} else {
-			sni = target.SNI
-			rootPEMs = cfgSnap.RootPEMs()
-			spiffeIDs = []string{connect.SpiffeIDService{
-				Host:       cfgSnap.Roots.TrustDomain,
-				Namespace:  target.Namespace,
-				Partition:  target.Partition,
-				Datacenter: target.Datacenter,
-				Service:    target.Service,
-			}.URI().String()}
-		}
-		commonTLSContext := makeCommonTLSContext(
-			cfgSnap.Leaf(),
-			rootPEMs,
-			makeTLSParametersFromProxyTLSConfig(cfgSnap.MeshConfigTLSOutgoing()),
-		)
-
-		err := injectSANMatcher(commonTLSContext, spiffeIDs...)
-		if err != nil {
-			return failoverTargets, fmt.Errorf("failed to inject SAN matcher rules for cluster %q: %v", sni, err)
-		}
-
-		tlsContext := &envoy_tls_v3.UpstreamTlsContext{
-			CommonTlsContext: commonTLSContext,
-			Sni:              sni,
-		}
-		ti.TLSContext = tlsContext
-		failoverTargets.targets = append(failoverTargets.targets, ti)
-	}
-
-	return failoverTargets, nil
-}
-
-func (ft discoChainTargets) sequential() ([]discoChainTargetGroup, error) {
-	var targetGroups []discoChainTargetGroup
-	for i, t := range ft.targets {
-		targetGroups = append(targetGroups, discoChainTargetGroup{
-			ClusterName: fmt.Sprintf("%s%d~%s", xdscommon.FailoverClusterNamePrefix, i, ft.baseClusterName),
-			Targets:     []targetInfo{t},
-		})
-	}
-	return targetGroups, nil
-}
diff --git a/agent/xds/failover_policy_ce.go b/agent/xds/failover_policy_ce.go
deleted file mode 100644
index 30cd41deef0e8..0000000000000
--- a/agent/xds/failover_policy_ce.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package xds
-
-import (
-	"fmt"
-)
-
-func (ft discoChainTargets) orderByLocality() ([]discoChainTargetGroup, error) {
-	return nil, fmt.Errorf("order-by-locality is a Consul Enterprise feature")
-}
diff --git a/agent/xds/golden_test.go b/agent/xds/golden_test.go
index d36eff255bd25..c056aa7b3a042 100644
--- a/agent/xds/golden_test.go
+++ b/agent/xds/golden_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
@@ -14,9 +11,8 @@ import (
 	"github.com/hashicorp/go-version"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/proto/private/prototest"
 )
 
 // update allows golden files to be updated based on the current output.
@@ -125,8 +121,12 @@ func golden(t *testing.T, name, subname, latestSubname, got string) string {
 			return got
 		}
 
-		require.NoError(t, os.WriteFile(golden, []byte(got), 0644))
-
+		// We use require.JSONEq to compare values and ObjectsAreEqualValues is used
+		// internally by that function to compare the string JSON values. This only
+		// writes updates the golden file when they actually change.
+		if !assert.ObjectsAreEqualValues(gotInterface, latestExpectedInterface) {
+			require.NoError(t, os.WriteFile(golden, []byte(got), 0644))
+		}
 		return got
 	}
 
@@ -141,5 +141,11 @@ func golden(t *testing.T, name, subname, latestSubname, got string) string {
 }
 
 func protoToJSON(t *testing.T, pb proto.Message) string {
-	return prototest.ProtoToJSON(t, pb)
+	t.Helper()
+	m := protojson.MarshalOptions{
+		Indent: "  ",
+	}
+	gotJSON, err := m.Marshal(pb)
+	require.NoError(t, err)
+	return string(gotJSON)
 }
diff --git a/agent/xds/gw_per_route_filters_ce.go b/agent/xds/gw_per_route_filters_ce.go
deleted file mode 100644
index 489db77befc64..0000000000000
--- a/agent/xds/gw_per_route_filters_ce.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package xds
-
-import (
-	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-type perRouteFilterBuilder struct {
-	providerMap map[string]*structs.JWTProviderConfigEntry
-	listener    *structs.APIGatewayListener
-	route       *structs.HTTPRouteConfigEntry
-}
-
-func (p perRouteFilterBuilder) buildTypedPerFilterConfig(match *envoy_route_v3.RouteMatch, routeAction *envoy_route_v3.Route_Route) (map[string]*anypb.Any, error) {
-	return nil, nil
-}
diff --git a/agent/xds/jwt_authn.go b/agent/xds/jwt_authn.go
deleted file mode 100644
index 36b8e05cb30c1..0000000000000
--- a/agent/xds/jwt_authn.go
+++ /dev/null
@@ -1,293 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"encoding/base64"
-	"fmt"
-
-	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
-	envoy_http_jwt_authn_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/jwt_authn/v3"
-	envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
-	"github.com/hashicorp/consul/agent/structs"
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/emptypb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-)
-
-const (
-	jwtEnvoyFilter       = "envoy.filters.http.jwt_authn"
-	jwtMetadataKeyPrefix = "jwt_payload"
-	jwksClusterPrefix    = "jwks_cluster"
-)
-
-// makeJWTAuthFilter builds jwt filter for envoy. It limits its use to referenced provider rather than every provider.
-//
-// Eg. If you have three providers: okta, auth0 and fusionAuth and only okta is referenced in your intentions, then this
-// will create a jwt-auth filter containing just okta in the list of providers.
-func makeJWTAuthFilter(providerMap map[string]*structs.JWTProviderConfigEntry, intentions structs.SimplifiedIntentions) (*envoy_http_v3.HttpFilter, error) {
-	providers := map[string]*envoy_http_jwt_authn_v3.JwtProvider{}
-	var jwtRequirements []*envoy_http_jwt_authn_v3.JwtRequirement
-
-	for _, intention := range intentions {
-		if intention.JWT == nil && !hasJWTconfig(intention.Permissions) {
-			continue
-		}
-		for _, p := range collectJWTProviders(intention) {
-			providerName := p.Name
-			if _, ok := providers[providerName]; ok {
-				continue
-			}
-
-			providerCE, ok := providerMap[providerName]
-			if !ok {
-				return nil, fmt.Errorf("provider specified in intention does not exist. Provider name: %s", providerName)
-			}
-
-			envoyCfg, err := buildJWTProviderConfig(providerCE)
-			if err != nil {
-				return nil, err
-			}
-			providers[providerName] = envoyCfg
-			reqs := providerToJWTRequirement(providerCE)
-			jwtRequirements = append(jwtRequirements, reqs)
-		}
-	}
-
-	if len(jwtRequirements) == 0 {
-		//do not add jwt_authn filter when intentions don't have JWTs
-		return nil, nil
-	}
-
-	cfg := &envoy_http_jwt_authn_v3.JwtAuthentication{
-		Providers: providers,
-		Rules: []*envoy_http_jwt_authn_v3.RequirementRule{
-			{
-				Match: &envoy_route_v3.RouteMatch{
-					PathSpecifier: &envoy_route_v3.RouteMatch_Prefix{Prefix: "/"},
-				},
-				RequirementType: makeJWTRequirementRule(andJWTRequirements(jwtRequirements)),
-			},
-		},
-	}
-	return makeEnvoyHTTPFilter(jwtEnvoyFilter, cfg)
-}
-
-func makeJWTRequirementRule(r *envoy_http_jwt_authn_v3.JwtRequirement) *envoy_http_jwt_authn_v3.RequirementRule_Requires {
-	return &envoy_http_jwt_authn_v3.RequirementRule_Requires{
-		Requires: r,
-	}
-}
-
-// andJWTRequirements combines list of jwt requirements into a single jwt requirement.
-func andJWTRequirements(reqs []*envoy_http_jwt_authn_v3.JwtRequirement) *envoy_http_jwt_authn_v3.JwtRequirement {
-	switch len(reqs) {
-	case 0:
-		return nil
-	case 1:
-		return reqs[0]
-	default:
-		return &envoy_http_jwt_authn_v3.JwtRequirement{
-			RequiresType: &envoy_http_jwt_authn_v3.JwtRequirement_RequiresAll{
-				RequiresAll: &envoy_http_jwt_authn_v3.JwtRequirementAndList{
-					Requirements: reqs,
-				},
-			},
-		}
-	}
-}
-
-// providerToJWTRequirement builds the envoy jwtRequirement.
-//
-// Note: since the rbac filter is in charge of making decisions of allow/denied, this
-// requirement uses `allow_missing_or_failed` to ensure it is always satisfied.
-func providerToJWTRequirement(provider *structs.JWTProviderConfigEntry) *envoy_http_jwt_authn_v3.JwtRequirement {
-	return &envoy_http_jwt_authn_v3.JwtRequirement{
-		RequiresType: &envoy_http_jwt_authn_v3.JwtRequirement_RequiresAny{
-			RequiresAny: &envoy_http_jwt_authn_v3.JwtRequirementOrList{
-				Requirements: []*envoy_http_jwt_authn_v3.JwtRequirement{
-					{
-						RequiresType: &envoy_http_jwt_authn_v3.JwtRequirement_ProviderName{
-							ProviderName: provider.Name,
-						},
-					},
-					// We use allowMissingOrFailed to allow rbac filter to do the validation
-					{
-						RequiresType: &envoy_http_jwt_authn_v3.JwtRequirement_AllowMissingOrFailed{
-							AllowMissingOrFailed: &emptypb.Empty{},
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-// collectJWTProviders returns a list of all top level and permission level referenced providers.
-func collectJWTProviders(i *structs.Intention) []*structs.IntentionJWTProvider {
-	// get permission level providers
-	reqs := getPermissionsProviders(i.Permissions)
-
-	if i.JWT != nil {
-		// get top level providers
-		reqs = append(reqs, i.JWT.Providers...)
-	}
-
-	return reqs
-}
-
-func getPermissionsProviders(perms []*structs.IntentionPermission) []*structs.IntentionJWTProvider {
-	var reqs []*structs.IntentionJWTProvider
-	for _, p := range perms {
-		if p.JWT == nil {
-			continue
-		}
-
-		reqs = append(reqs, p.JWT.Providers...)
-	}
-
-	return reqs
-}
-
-// buildPayloadInMetadataKey is used to create a unique payload key per provider.
-// This is to ensure claims are validated/forwarded specifically under the right provider.
-// The forwarded payload is used with other data (eg. service identity) by the RBAC filter
-// to validate access to resource.
-//
-// eg. With a provider named okta will have a payload key of: jwt_payload_okta
-func buildPayloadInMetadataKey(providerName string) string {
-	return jwtMetadataKeyPrefix + "_" + providerName
-}
-
-func buildJWTProviderConfig(p *structs.JWTProviderConfigEntry) (*envoy_http_jwt_authn_v3.JwtProvider, error) {
-	envoyCfg := envoy_http_jwt_authn_v3.JwtProvider{
-		Issuer:            p.Issuer,
-		Audiences:         p.Audiences,
-		PayloadInMetadata: buildPayloadInMetadataKey(p.Name),
-	}
-
-	if p.Forwarding != nil {
-		envoyCfg.ForwardPayloadHeader = p.Forwarding.HeaderName
-		envoyCfg.PadForwardPayloadHeader = p.Forwarding.PadForwardPayloadHeader
-	}
-
-	if local := p.JSONWebKeySet.Local; local != nil {
-		specifier, err := makeLocalJWKS(local, p.Name)
-		if err != nil {
-			return nil, err
-		}
-		envoyCfg.JwksSourceSpecifier = specifier
-	} else if remote := p.JSONWebKeySet.Remote; remote != nil && remote.URI != "" {
-		envoyCfg.JwksSourceSpecifier = makeRemoteJWKS(remote, p.Name)
-	} else {
-		return nil, fmt.Errorf("invalid jwt provider config; missing JSONWebKeySet for provider: %s", p.Name)
-	}
-
-	for _, location := range p.Locations {
-		if location.Header != nil {
-			//only setting forward here because it is only useful for headers not the other options
-			envoyCfg.Forward = location.Header.Forward
-			envoyCfg.FromHeaders = append(envoyCfg.FromHeaders, &envoy_http_jwt_authn_v3.JwtHeader{
-				Name:        location.Header.Name,
-				ValuePrefix: location.Header.ValuePrefix,
-			})
-		} else if location.QueryParam != nil {
-			envoyCfg.FromParams = append(envoyCfg.FromParams, location.QueryParam.Name)
-		} else if location.Cookie != nil {
-			envoyCfg.FromCookies = append(envoyCfg.FromCookies, location.Cookie.Name)
-		}
-	}
-
-	return &envoyCfg, nil
-}
-
-func makeLocalJWKS(l *structs.LocalJWKS, pName string) (*envoy_http_jwt_authn_v3.JwtProvider_LocalJwks, error) {
-	var specifier *envoy_http_jwt_authn_v3.JwtProvider_LocalJwks
-	if l.JWKS != "" {
-		decodedJWKS, err := base64.StdEncoding.DecodeString(l.JWKS)
-		if err != nil {
-			return nil, err
-		}
-		specifier = &envoy_http_jwt_authn_v3.JwtProvider_LocalJwks{
-			LocalJwks: &envoy_core_v3.DataSource{
-				Specifier: &envoy_core_v3.DataSource_InlineString{
-					InlineString: string(decodedJWKS),
-				},
-			},
-		}
-	} else if l.Filename != "" {
-		specifier = &envoy_http_jwt_authn_v3.JwtProvider_LocalJwks{
-			LocalJwks: &envoy_core_v3.DataSource{
-				Specifier: &envoy_core_v3.DataSource_Filename{
-					Filename: l.Filename,
-				},
-			},
-		}
-	} else {
-		return nil, fmt.Errorf("invalid jwt provider config; missing JWKS/Filename for local provider: %s", pName)
-	}
-
-	return specifier, nil
-}
-
-func makeRemoteJWKS(r *structs.RemoteJWKS, providerName string) *envoy_http_jwt_authn_v3.JwtProvider_RemoteJwks {
-	remote_specifier := envoy_http_jwt_authn_v3.JwtProvider_RemoteJwks{
-		RemoteJwks: &envoy_http_jwt_authn_v3.RemoteJwks{
-			HttpUri: &envoy_core_v3.HttpUri{
-				Uri:              r.URI,
-				HttpUpstreamType: &envoy_core_v3.HttpUri_Cluster{Cluster: makeJWKSClusterName(providerName)},
-			},
-			AsyncFetch: &envoy_http_jwt_authn_v3.JwksAsyncFetch{
-				FastListener: r.FetchAsynchronously,
-			},
-		},
-	}
-	timeOutSecond := int64(r.RequestTimeoutMs) / 1000
-	remote_specifier.RemoteJwks.HttpUri.Timeout = &durationpb.Duration{Seconds: timeOutSecond}
-	cacheDuration := int64(r.CacheDuration)
-	if cacheDuration > 0 {
-		remote_specifier.RemoteJwks.CacheDuration = &durationpb.Duration{Seconds: cacheDuration}
-	}
-
-	p := buildJWTRetryPolicy(r.RetryPolicy)
-	if p != nil {
-		remote_specifier.RemoteJwks.RetryPolicy = p
-	}
-
-	return &remote_specifier
-}
-
-func makeJWKSClusterName(providerName string) string {
-	return fmt.Sprintf("%s_%s", jwksClusterPrefix, providerName)
-}
-
-func buildJWTRetryPolicy(r *structs.JWKSRetryPolicy) *envoy_core_v3.RetryPolicy {
-	var pol envoy_core_v3.RetryPolicy
-	if r == nil {
-		return nil
-	}
-
-	if r.RetryPolicyBackOff != nil {
-		pol.RetryBackOff = &envoy_core_v3.BackoffStrategy{
-			BaseInterval: structs.DurationToProto(r.RetryPolicyBackOff.BaseInterval),
-			MaxInterval:  structs.DurationToProto(r.RetryPolicyBackOff.MaxInterval),
-		}
-	}
-
-	pol.NumRetries = &wrapperspb.UInt32Value{
-		Value: uint32(r.NumRetries),
-	}
-
-	return &pol
-}
-
-func hasJWTconfig(p []*structs.IntentionPermission) bool {
-	for _, perm := range p {
-		if perm.JWT != nil {
-			return true
-		}
-	}
-	return false
-}
diff --git a/agent/xds/jwt_authn_ce.go b/agent/xds/jwt_authn_ce.go
deleted file mode 100644
index f8cf52957dc43..0000000000000
--- a/agent/xds/jwt_authn_ce.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package xds
-
-import (
-	envoy_http_jwt_authn_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/jwt_authn/v3"
-	envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
-
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-type GatewayAuthFilterBuilder struct {
-	listener       structs.APIGatewayListener
-	routes         []*structs.HTTPRouteConfigEntry
-	providers      map[string]*structs.JWTProviderConfigEntry
-	envoyProviders map[string]*envoy_http_jwt_authn_v3.JwtProvider
-}
-
-func (g *GatewayAuthFilterBuilder) makeGatewayAuthFilters() ([]*envoy_http_v3.HttpFilter, error) {
-	return nil, nil
-}
diff --git a/agent/xds/jwt_authn_test.go b/agent/xds/jwt_authn_test.go
deleted file mode 100644
index 834f62ad4c1a0..0000000000000
--- a/agent/xds/jwt_authn_test.go
+++ /dev/null
@@ -1,574 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"encoding/base64"
-	"path/filepath"
-	"testing"
-
-	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	envoy_http_jwt_authn_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/jwt_authn/v3"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-)
-
-type ixnOpts struct {
-	src    string
-	action structs.IntentionAction
-	jwt    *structs.IntentionJWTRequirement
-	perms  *structs.IntentionPermission
-}
-
-func makeProvider(name string) structs.IntentionJWTProvider {
-	return structs.IntentionJWTProvider{
-		Name: name,
-	}
-}
-
-func decodeJWKS(t *testing.T, jw string) string {
-	s, err := base64.StdEncoding.DecodeString(jw)
-	require.NoError(t, err)
-	return string(s)
-}
-
-var (
-	token         = "eyJrZXlzIjogW3sKICAiY3J2IjogIlAtMjU2IiwKICAia2V5X29wcyI6IFsKICAgICJ2ZXJpZnkiCiAgXSwKICAia3R5IjogIkVDIiwKICAieCI6ICJXYzl1WnVQYUI3S2gyRk1jOXd0SmpSZThYRDR5VDJBWU5BQWtyWWJWanV3IiwKICAieSI6ICI2OGhSVEppSk5Pd3RyaDRFb1BYZVZuUnVIN2hpU0RKX2xtYmJqZkRmV3EwIiwKICAiYWxnIjogIkVTMjU2IiwKICAidXNlIjogInNpZyIsCiAgImtpZCI6ICJhYzFlOGY5MGVkZGY2MWM0MjljNjFjYTA1YjRmMmUwNyIKfV19"
-	oktaProvider  = makeProvider("okta")
-	auth0Provider = makeProvider("auth0")
-	fakeProvider  = makeProvider("fake-provider")
-	oktaIntention = &structs.IntentionJWTRequirement{
-		Providers: []*structs.IntentionJWTProvider{
-			&oktaProvider,
-		},
-	}
-	auth0Intention = &structs.IntentionJWTRequirement{
-		Providers: []*structs.IntentionJWTProvider{
-			&auth0Provider,
-		},
-	}
-	fakeIntention = &structs.IntentionJWTRequirement{
-		Providers: []*structs.IntentionJWTProvider{
-			&fakeProvider,
-		},
-	}
-	multiProviderIntentions = &structs.IntentionJWTRequirement{
-		Providers: []*structs.IntentionJWTProvider{
-			&oktaProvider,
-			&auth0Provider,
-		},
-	}
-	pWithOktaProvider = &structs.IntentionPermission{
-		Action: structs.IntentionActionAllow,
-		HTTP: &structs.IntentionHTTPPermission{
-			PathPrefix: "some-special-path",
-		},
-		JWT: oktaIntention,
-	}
-	pWithMultiProviders = &structs.IntentionPermission{
-		Action: structs.IntentionActionAllow,
-		HTTP: &structs.IntentionHTTPPermission{
-			PathPrefix: "some-special-path",
-		},
-		JWT: multiProviderIntentions,
-	}
-	pWithNoJWT = &structs.IntentionPermission{
-		Action: structs.IntentionActionAllow,
-		HTTP: &structs.IntentionHTTPPermission{
-			PathPrefix: "some-special-path",
-		},
-	}
-	fullRetryPolicy = &structs.JWKSRetryPolicy{
-		RetryPolicyBackOff: &structs.RetryPolicyBackOff{
-			BaseInterval: 0,
-			MaxInterval:  10,
-		},
-		NumRetries: 1,
-	}
-	oktaRemoteJWKS = &structs.RemoteJWKS{
-		RequestTimeoutMs:    1000,
-		FetchAsynchronously: true,
-		URI:                 "https://example-okta.com/.well-known/jwks.json",
-	}
-	auth0RemoteJWKS = &structs.RemoteJWKS{
-		RequestTimeoutMs:    1000,
-		FetchAsynchronously: true,
-		URI:                 "https://example-auth0.com/.well-known/jwks.json",
-	}
-	extendedRemoteJWKS = &structs.RemoteJWKS{
-		RequestTimeoutMs:    1000,
-		FetchAsynchronously: true,
-		URI:                 "https://example-okta.com/.well-known/jwks.json",
-		RetryPolicy:         fullRetryPolicy,
-		CacheDuration:       20,
-	}
-	localJWKS = &structs.LocalJWKS{
-		JWKS: token,
-	}
-	localJWKSFilename = &structs.LocalJWKS{
-		Filename: "file.txt",
-	}
-)
-
-func makeTestIntention(t *testing.T, opts ixnOpts) *structs.Intention {
-	t.Helper()
-	ixn := structs.TestIntention(t)
-	ixn.SourceName = opts.src
-
-	if opts.jwt != nil {
-		ixn.JWT = opts.jwt
-	}
-	if opts.perms != nil {
-		ixn.Permissions = append(ixn.Permissions, opts.perms)
-	}
-
-	if opts.action != "" {
-		ixn.Action = opts.action
-	}
-	return ixn
-}
-
-func TestMakeJWTAUTHFilters(t *testing.T) {
-	simplified := func(ixns ...*structs.Intention) structs.SimplifiedIntentions {
-		return structs.SimplifiedIntentions(ixns)
-	}
-
-	var (
-		remoteCE = map[string]*structs.JWTProviderConfigEntry{
-			"okta": {
-				Kind:   "jwt-provider",
-				Name:   "okta",
-				Issuer: "test-issuer",
-				JSONWebKeySet: &structs.JSONWebKeySet{
-					Remote: oktaRemoteJWKS,
-				},
-			},
-			"auth0": {
-				Kind:   "jwt-provider",
-				Name:   "auth0",
-				Issuer: "another-issuer",
-				JSONWebKeySet: &structs.JSONWebKeySet{
-					Remote: auth0RemoteJWKS,
-				},
-			},
-		}
-		localCE = map[string]*structs.JWTProviderConfigEntry{
-			"okta": {
-				Kind:   "jwt-provider",
-				Name:   "okta",
-				Issuer: "test-issuer",
-				JSONWebKeySet: &structs.JSONWebKeySet{
-					Local: localJWKS,
-				},
-			},
-		}
-	)
-
-	// All tests here depend on golden files located under: agent/xds/testdata/jwt_authn/*
-	tests := map[string]struct {
-		intentions structs.SimplifiedIntentions
-		provider   map[string]*structs.JWTProviderConfigEntry
-	}{
-		"no-provider": {
-			intentions: simplified(makeTestIntention(t, ixnOpts{src: "web", action: structs.IntentionActionAllow})),
-			provider:   nil,
-		},
-		"remote-provider": {
-			intentions: simplified(makeTestIntention(t, ixnOpts{src: "web", action: structs.IntentionActionAllow, jwt: oktaIntention})),
-			provider:   remoteCE,
-		},
-		"local-provider": {
-			intentions: simplified(makeTestIntention(t, ixnOpts{src: "web", action: structs.IntentionActionAllow, jwt: oktaIntention})),
-			provider:   localCE,
-		},
-		"intention-with-path": {
-			intentions: simplified(makeTestIntention(t, ixnOpts{src: "web", action: structs.IntentionActionAllow, perms: pWithOktaProvider})),
-			provider:   remoteCE,
-		},
-		"top-level-provider-with-permission": {
-			intentions: simplified(makeTestIntention(t, ixnOpts{src: "web", action: structs.IntentionActionAllow, jwt: oktaIntention, perms: pWithOktaProvider})),
-			provider:   remoteCE,
-		},
-		"multiple-providers-and-one-permission": {
-			intentions: simplified(makeTestIntention(t, ixnOpts{src: "web", action: structs.IntentionActionAllow, jwt: multiProviderIntentions, perms: pWithOktaProvider})),
-			provider:   remoteCE,
-		},
-	}
-
-	for name, tt := range tests {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			filter, err := makeJWTAuthFilter(tt.provider, tt.intentions)
-			require.NoError(t, err)
-			gotJSON := protoToJSON(t, filter)
-			require.JSONEq(t, goldenSimple(t, filepath.Join("jwt_authn", name), gotJSON), gotJSON)
-		})
-	}
-}
-
-func TestCollectJWTProviders(t *testing.T) {
-	tests := map[string]struct {
-		intention *structs.Intention
-		expected  []*structs.IntentionJWTProvider
-	}{
-		"empty-top-level-jwt-and-empty-permissions": {
-			intention: makeTestIntention(t, ixnOpts{src: "web"}),
-			expected:  []*structs.IntentionJWTProvider{},
-		},
-		"top-level-jwt-and-empty-permissions": {
-			intention: makeTestIntention(t, ixnOpts{src: "web", jwt: oktaIntention}),
-			expected:  []*structs.IntentionJWTProvider{&oktaProvider},
-		},
-		"multi-top-level-jwt-and-empty-permissions": {
-			intention: makeTestIntention(t, ixnOpts{src: "web", jwt: multiProviderIntentions}),
-			expected:  []*structs.IntentionJWTProvider{&oktaProvider, &auth0Provider},
-		},
-		"top-level-jwt-and-one-jwt-permission": {
-			intention: makeTestIntention(t, ixnOpts{src: "web", jwt: auth0Intention, perms: pWithOktaProvider}),
-			expected:  []*structs.IntentionJWTProvider{&auth0Provider, &oktaProvider},
-		},
-		"top-level-jwt-and-multi-jwt-permissions": {
-			intention: makeTestIntention(t, ixnOpts{src: "web", jwt: fakeIntention, perms: pWithMultiProviders}),
-			expected:  []*structs.IntentionJWTProvider{&fakeProvider, &oktaProvider, &auth0Provider},
-		},
-		"empty-top-level-jwt-and-one-jwt-permission": {
-			intention: makeTestIntention(t, ixnOpts{src: "web", perms: pWithOktaProvider}),
-			expected:  []*structs.IntentionJWTProvider{&oktaProvider},
-		},
-		"empty-top-level-jwt-and-multi-jwt-permission": {
-			intention: makeTestIntention(t, ixnOpts{src: "web", perms: pWithMultiProviders}),
-			expected:  []*structs.IntentionJWTProvider{&oktaProvider, &auth0Provider},
-		},
-	}
-
-	for name, tt := range tests {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			reqs := collectJWTProviders(tt.intention)
-			require.ElementsMatch(t, reqs, tt.expected)
-		})
-	}
-}
-
-func TestGetPermissionsProviders(t *testing.T) {
-	tests := map[string]struct {
-		perms    []*structs.IntentionPermission
-		expected []*structs.IntentionJWTProvider
-	}{
-		"empty-permissions": {
-			perms:    []*structs.IntentionPermission{},
-			expected: []*structs.IntentionJWTProvider{},
-		},
-		"nil-permissions": {
-			perms:    nil,
-			expected: []*structs.IntentionJWTProvider{},
-		},
-		"permissions-with-no-jwt": {
-			perms:    []*structs.IntentionPermission{pWithNoJWT},
-			expected: []*structs.IntentionJWTProvider{},
-		},
-		"permissions-with-one-jwt": {
-			perms:    []*structs.IntentionPermission{pWithOktaProvider, pWithNoJWT},
-			expected: []*structs.IntentionJWTProvider{&oktaProvider},
-		},
-		"permissions-with-multiple-jwt": {
-			perms:    []*structs.IntentionPermission{pWithMultiProviders, pWithNoJWT},
-			expected: []*structs.IntentionJWTProvider{&auth0Provider, &oktaProvider},
-		},
-	}
-
-	for name, tt := range tests {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			p := getPermissionsProviders(tt.perms)
-			require.ElementsMatch(t, p, tt.expected)
-		})
-	}
-}
-
-func TestBuildJWTProviderConfig(t *testing.T) {
-	var (
-		fullCE = structs.JWTProviderConfigEntry{
-			Kind:      "jwt-provider",
-			Issuer:    "auth0",
-			Audiences: []string{"aud"},
-			JSONWebKeySet: &structs.JSONWebKeySet{
-				Local: &structs.LocalJWKS{
-					JWKS: token,
-				},
-			},
-			Forwarding: &structs.JWTForwardingConfig{HeaderName: "user-token"},
-			Locations: []*structs.JWTLocation{
-				{Header: &structs.JWTLocationHeader{Forward: true, Name: "Authorization", ValuePrefix: "Bearer"}},
-			},
-		}
-		ceRemoteJWKS = structs.JWTProviderConfigEntry{
-			Kind:      "jwt-provider",
-			Issuer:    "auth0",
-			Audiences: []string{"aud"},
-			JSONWebKeySet: &structs.JSONWebKeySet{
-				Remote: oktaRemoteJWKS,
-			},
-		}
-		ceInvalidJWKS = structs.JWTProviderConfigEntry{JSONWebKeySet: &structs.JSONWebKeySet{}}
-	)
-
-	tests := map[string]struct {
-		ce            *structs.JWTProviderConfigEntry
-		expected      *envoy_http_jwt_authn_v3.JwtProvider
-		expectedError string
-		providerName  string
-	}{
-		"config-entry-with-invalid-localJWKS": {
-			ce:            &ceInvalidJWKS,
-			expectedError: "invalid jwt provider config; missing JSONWebKeySet for provider",
-		},
-		"valid-config-entry": {
-			ce: &fullCE,
-			expected: &envoy_http_jwt_authn_v3.JwtProvider{
-				Issuer:                  fullCE.Issuer,
-				Audiences:               fullCE.Audiences,
-				ForwardPayloadHeader:    "user-token",
-				PayloadInMetadata:       buildPayloadInMetadataKey(ceRemoteJWKS.Name),
-				PadForwardPayloadHeader: false,
-				Forward:                 true,
-				JwksSourceSpecifier: &envoy_http_jwt_authn_v3.JwtProvider_LocalJwks{
-					LocalJwks: &envoy_core_v3.DataSource{
-						Specifier: &envoy_core_v3.DataSource_InlineString{
-							InlineString: decodeJWKS(t, localJWKS.JWKS),
-						},
-					},
-				},
-				FromHeaders: []*envoy_http_jwt_authn_v3.JwtHeader{{Name: "Authorization", ValuePrefix: "Bearer"}},
-			},
-		},
-		"entry-with-remote-jwks": {
-			ce: &ceRemoteJWKS,
-			expected: &envoy_http_jwt_authn_v3.JwtProvider{
-				Issuer:            fullCE.Issuer,
-				Audiences:         fullCE.Audiences,
-				PayloadInMetadata: buildPayloadInMetadataKey(ceRemoteJWKS.Name),
-				JwksSourceSpecifier: &envoy_http_jwt_authn_v3.JwtProvider_RemoteJwks{
-					RemoteJwks: &envoy_http_jwt_authn_v3.RemoteJwks{
-						HttpUri: &envoy_core_v3.HttpUri{
-							Uri:              oktaRemoteJWKS.URI,
-							HttpUpstreamType: &envoy_core_v3.HttpUri_Cluster{Cluster: makeJWKSClusterName(ceRemoteJWKS.Name)},
-							Timeout:          &durationpb.Duration{Seconds: 1},
-						},
-						AsyncFetch: &envoy_http_jwt_authn_v3.JwksAsyncFetch{
-							FastListener: oktaRemoteJWKS.FetchAsynchronously,
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for name, tt := range tests {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			res, err := buildJWTProviderConfig(tt.ce)
-
-			if tt.expectedError != "" {
-				require.Error(t, err)
-				require.Contains(t, err.Error(), tt.expectedError)
-			} else {
-				require.Equal(t, res, tt.expected)
-			}
-		})
-	}
-
-}
-
-func TestMakeLocalJWKS(t *testing.T) {
-	tests := map[string]struct {
-		jwks          *structs.LocalJWKS
-		providerName  string
-		expected      *envoy_http_jwt_authn_v3.JwtProvider_LocalJwks
-		expectedError string
-	}{
-		"invalid-base64-jwks": {
-			jwks:          &structs.LocalJWKS{JWKS: "decoded-jwks"},
-			expectedError: "illegal base64 data",
-		},
-		"no-jwks-and-no-filename": {
-			jwks:          &structs.LocalJWKS{},
-			expectedError: "invalid jwt provider config; missing JWKS/Filename for local provider",
-		},
-		"localjwks-with-filename": {
-			jwks: localJWKSFilename,
-			expected: &envoy_http_jwt_authn_v3.JwtProvider_LocalJwks{
-				LocalJwks: &envoy_core_v3.DataSource{
-					Specifier: &envoy_core_v3.DataSource_Filename{
-						Filename: localJWKSFilename.Filename,
-					},
-				},
-			},
-		},
-		"localjwks-with-jwks": {
-			jwks: localJWKS,
-			expected: &envoy_http_jwt_authn_v3.JwtProvider_LocalJwks{
-				LocalJwks: &envoy_core_v3.DataSource{
-					Specifier: &envoy_core_v3.DataSource_InlineString{
-						InlineString: decodeJWKS(t, localJWKS.JWKS),
-					},
-				},
-			},
-		},
-	}
-
-	for name, tt := range tests {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			res, err := makeLocalJWKS(tt.jwks, tt.providerName)
-
-			if tt.expectedError != "" {
-				require.Error(t, err)
-				require.Contains(t, err.Error(), tt.expectedError)
-			} else {
-				require.Equal(t, res, tt.expected)
-			}
-		})
-	}
-}
-
-func TestMakeRemoteJWKS(t *testing.T) {
-	tests := map[string]struct {
-		jwks         *structs.RemoteJWKS
-		providerName string
-		expected     *envoy_http_jwt_authn_v3.JwtProvider_RemoteJwks
-	}{
-		"with-no-cache-duration": {
-			jwks:         oktaRemoteJWKS,
-			providerName: "auth0",
-			expected: &envoy_http_jwt_authn_v3.JwtProvider_RemoteJwks{
-				RemoteJwks: &envoy_http_jwt_authn_v3.RemoteJwks{
-					HttpUri: &envoy_core_v3.HttpUri{
-						Uri:              oktaRemoteJWKS.URI,
-						HttpUpstreamType: &envoy_core_v3.HttpUri_Cluster{Cluster: makeJWKSClusterName("auth0")},
-						Timeout:          &durationpb.Duration{Seconds: 1},
-					},
-					AsyncFetch: &envoy_http_jwt_authn_v3.JwksAsyncFetch{
-						FastListener: oktaRemoteJWKS.FetchAsynchronously,
-					},
-				},
-			},
-		},
-		"with-retry-policy": {
-			jwks:         extendedRemoteJWKS,
-			providerName: "okta",
-			expected: &envoy_http_jwt_authn_v3.JwtProvider_RemoteJwks{
-				RemoteJwks: &envoy_http_jwt_authn_v3.RemoteJwks{
-					HttpUri: &envoy_core_v3.HttpUri{
-						Uri:              oktaRemoteJWKS.URI,
-						HttpUpstreamType: &envoy_core_v3.HttpUri_Cluster{Cluster: makeJWKSClusterName("okta")},
-						Timeout:          &durationpb.Duration{Seconds: 1},
-					},
-					AsyncFetch: &envoy_http_jwt_authn_v3.JwksAsyncFetch{
-						FastListener: oktaRemoteJWKS.FetchAsynchronously,
-					},
-					RetryPolicy:   buildJWTRetryPolicy(extendedRemoteJWKS.RetryPolicy),
-					CacheDuration: &durationpb.Duration{Seconds: int64(extendedRemoteJWKS.CacheDuration)},
-				},
-			},
-		},
-	}
-
-	for name, tt := range tests {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			res := makeRemoteJWKS(tt.jwks, tt.providerName)
-			require.Equal(t, res, tt.expected)
-		})
-	}
-}
-
-func TestBuildJWTRetryPolicy(t *testing.T) {
-	var (
-		noBackofRetryPolicy = &structs.JWKSRetryPolicy{NumRetries: 1}
-		noNumRetriesPolicy  = &structs.JWKSRetryPolicy{
-			RetryPolicyBackOff: &structs.RetryPolicyBackOff{BaseInterval: 0, MaxInterval: 10},
-		}
-	)
-	tests := map[string]struct {
-		retryPolicy *structs.JWKSRetryPolicy
-		expected    *envoy_core_v3.RetryPolicy
-	}{
-		"nil-retry-policy": {
-			retryPolicy: nil,
-			expected:    nil,
-		},
-		"retry-policy-with-no-backoff": {
-			retryPolicy: noBackofRetryPolicy,
-			expected:    &envoy_core_v3.RetryPolicy{NumRetries: wrapperspb.UInt32(uint32(1))},
-		},
-		"retry-policy-with-backoff": {
-			retryPolicy: fullRetryPolicy,
-			expected: &envoy_core_v3.RetryPolicy{
-				NumRetries: wrapperspb.UInt32(uint32(1)),
-				RetryBackOff: &envoy_core_v3.BackoffStrategy{
-					BaseInterval: structs.DurationToProto(0),
-					MaxInterval:  structs.DurationToProto(10),
-				},
-			},
-		},
-		"retry-policy-with-no-retries": {
-			retryPolicy: noNumRetriesPolicy,
-			expected: &envoy_core_v3.RetryPolicy{
-				RetryBackOff: &envoy_core_v3.BackoffStrategy{
-					BaseInterval: structs.DurationToProto(0),
-					MaxInterval:  structs.DurationToProto(10),
-				},
-				NumRetries: wrapperspb.UInt32(uint32(0)),
-			},
-		},
-	}
-
-	for name, tt := range tests {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			res := buildJWTRetryPolicy(tt.retryPolicy)
-
-			require.Equal(t, res, tt.expected)
-		})
-	}
-}
-
-func TestHasJWTconfig(t *testing.T) {
-	tests := map[string]struct {
-		perms    []*structs.IntentionPermission
-		expected bool
-	}{
-		"empty-permissions": {
-			perms:    []*structs.IntentionPermission{},
-			expected: false,
-		},
-		"nil-permissions": {
-			perms:    nil,
-			expected: false,
-		},
-		"permissions-with-no-jwt": {
-			perms:    []*structs.IntentionPermission{pWithNoJWT},
-			expected: false,
-		},
-		"permissions-with-one-jwt": {
-			perms:    []*structs.IntentionPermission{pWithOktaProvider, pWithNoJWT},
-			expected: true,
-		},
-		"permissions-with-multiple-jwt": {
-			perms:    []*structs.IntentionPermission{pWithMultiProviders, pWithNoJWT},
-			expected: true,
-		},
-	}
-
-	for name, tt := range tests {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			res := hasJWTconfig(tt.perms)
-			require.Equal(t, res, tt.expected)
-		})
-	}
-}
diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go
index 7e679bb811be2..13a62027fdb45 100644
--- a/agent/xds/listeners.go
+++ b/agent/xds/listeners.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
@@ -29,9 +26,6 @@ import (
 	envoy_tcp_proxy_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3"
 	envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
 	envoy_type_v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
-	"github.com/hashicorp/consul/agent/xds/config"
-	"github.com/hashicorp/consul/agent/xds/naming"
-	"github.com/hashicorp/consul/agent/xds/platform"
 
 	"github.com/hashicorp/go-hclog"
 	"google.golang.org/protobuf/encoding/protojson"
@@ -45,15 +39,16 @@ import (
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/xds/accesslogs"
-	"github.com/hashicorp/consul/agent/xds/response"
 	"github.com/hashicorp/consul/envoyextensions/xdscommon"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/lib/stringslice"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/sdk/iptables"
 	"github.com/hashicorp/consul/types"
 )
 
+const virtualIPTag = "virtual"
+
 // listenersFromSnapshot returns the xDS API representation of the "listeners" in the snapshot.
 func (s *ResourceGenerator) listenersFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) ([]proto.Message, error) {
 	if cfgSnap == nil {
@@ -120,7 +115,7 @@ func (s *ResourceGenerator) listenersFromSnapshotConnectProxy(cfgSnap *proxycfg.
 		}
 	}
 
-	proxyCfg, err := config.ParseProxyConfig(cfgSnap.Proxy.Config)
+	proxyCfg, err := ParseProxyConfig(cfgSnap.Proxy.Config)
 	if err != nil {
 		// Don't hard fail on a config typo, just warn. The parse func returns
 		// default config if there is an error so it's safe to continue.
@@ -160,7 +155,7 @@ func (s *ResourceGenerator) listenersFromSnapshotConnectProxy(cfgSnap *proxycfg.
 		// RDS, Envoy's Route Discovery Service, is only used for HTTP services with a customized discovery chain.
 		useRDS := chain.Protocol != "tcp" && !chain.Default
 
-		var clusterName string
+		var targetClusterData targetClusterData
 		if !useRDS {
 			// When not using RDS we must generate a cluster name to attach to the filter chain.
 			// With RDS, cluster names get attached to the dynamic routes instead.
@@ -169,10 +164,11 @@ func (s *ResourceGenerator) listenersFromSnapshotConnectProxy(cfgSnap *proxycfg.
 				return nil, err
 			}
 
-			clusterName = s.getTargetClusterName(upstreamsSnapshot, chain, target.ID, false)
-			if clusterName == "" {
+			td, ok := s.getTargetClusterData(upstreamsSnapshot, chain, target.ID, false, false)
+			if !ok {
 				continue
 			}
+			targetClusterData = td
 		}
 
 		filterName := fmt.Sprintf("%s.%s.%s.%s", chain.ServiceName, chain.Namespace, chain.Partition, chain.Datacenter)
@@ -182,7 +178,7 @@ func (s *ResourceGenerator) listenersFromSnapshotConnectProxy(cfgSnap *proxycfg.
 			filterChain, err := s.makeUpstreamFilterChain(filterChainOpts{
 				accessLogs:  &cfgSnap.Proxy.AccessLogs,
 				routeName:   uid.EnvoyID(),
-				clusterName: clusterName,
+				clusterName: targetClusterData.clusterName,
 				filterName:  filterName,
 				protocol:    cfg.Protocol,
 				useRDS:      useRDS,
@@ -217,7 +213,7 @@ func (s *ResourceGenerator) listenersFromSnapshotConnectProxy(cfgSnap *proxycfg.
 		filterChain, err := s.makeUpstreamFilterChain(filterChainOpts{
 			accessLogs:  &cfgSnap.Proxy.AccessLogs,
 			routeName:   uid.EnvoyID(),
-			clusterName: clusterName,
+			clusterName: targetClusterData.clusterName,
 			filterName:  filterName,
 			protocol:    cfg.Protocol,
 			useRDS:      useRDS,
@@ -230,15 +226,6 @@ func (s *ResourceGenerator) listenersFromSnapshotConnectProxy(cfgSnap *proxycfg.
 		endpoints := cfgSnap.ConnectProxy.WatchedUpstreamEndpoints[uid][chain.ID()]
 		uniqueAddrs := make(map[string]struct{})
 
-		if chain.Partition == cfgSnap.ProxyID.PartitionOrDefault() {
-			for _, ip := range chain.AutoVirtualIPs {
-				uniqueAddrs[ip] = struct{}{}
-			}
-			for _, ip := range chain.ManualVirtualIPs {
-				uniqueAddrs[ip] = struct{}{}
-			}
-		}
-
 		// Match on the virtual IP for the upstream service (identified by the chain's ID).
 		// We do not match on all endpoints here since it would lead to load balancing across
 		// all instances when any instance address is dialed.
@@ -260,7 +247,7 @@ func (s *ResourceGenerator) listenersFromSnapshotConnectProxy(cfgSnap *proxycfg.
 			// We only match on this virtual IP if the upstream is in the proxy's partition.
 			// This is because the IP is not guaranteed to be unique across k8s clusters.
 			if acl.EqualPartitions(e.Node.PartitionOrDefault(), cfgSnap.ProxyID.PartitionOrDefault()) {
-				if vip := e.Service.TaggedAddresses[naming.VirtualIPTag]; vip.Address != "" {
+				if vip := e.Service.TaggedAddresses[virtualIPTag]; vip.Address != "" {
 					uniqueAddrs[vip.Address] = struct{}{}
 				}
 			}
@@ -464,7 +451,7 @@ func (s *ResourceGenerator) listenersFromSnapshotConnectProxy(cfgSnap *proxycfg.
 			// The virtualIPTag is used by consul-k8s to store the ClusterIP for a service.
 			// For services imported from a peer,the partition will be equal in all cases.
 			if acl.EqualPartitions(e.Node.PartitionOrDefault(), cfgSnap.ProxyID.PartitionOrDefault()) {
-				if vip := e.Service.TaggedAddresses[naming.VirtualIPTag]; vip.Address != "" {
+				if vip := e.Service.TaggedAddresses[virtualIPTag]; vip.Address != "" {
 					uniqueAddrs[vip.Address] = struct{}{}
 				}
 			}
@@ -554,8 +541,8 @@ func (s *ResourceGenerator) listenersFromSnapshotConnectProxy(cfgSnap *proxycfg.
 
 			filterChain, err := s.makeUpstreamFilterChain(filterChainOpts{
 				accessLogs:  &cfgSnap.Proxy.AccessLogs,
-				clusterName: naming.OriginalDestinationClusterName,
-				filterName:  naming.OriginalDestinationClusterName,
+				clusterName: OriginalDestinationClusterName,
+				filterName:  OriginalDestinationClusterName,
 				protocol:    "tcp",
 			})
 			if err != nil {
@@ -789,7 +776,7 @@ func parseCheckPath(check structs.CheckType) (structs.ExposePath, error) {
 
 // listenersFromSnapshotGateway returns the "listener" for a terminating-gateway or mesh-gateway service
 func (s *ResourceGenerator) listenersFromSnapshotGateway(cfgSnap *proxycfg.ConfigSnapshot) ([]proto.Message, error) {
-	cfg, err := config.ParseGatewayConfig(cfgSnap.Proxy.Config)
+	cfg, err := ParseGatewayConfig(cfgSnap.Proxy.Config)
 	if err != nil {
 		// Don't hard fail on a config typo, just warn. The parse func returns
 		// default config if there is an error so it's safe to continue.
@@ -862,11 +849,16 @@ func (s *ResourceGenerator) listenersFromSnapshotGateway(cfgSnap *proxycfg.Confi
 				return nil, err
 			}
 		case structs.ServiceKindAPIGateway:
-			listeners, err := s.makeAPIGatewayListeners(a.Address, cfgSnap)
+			// TODO Find a cleaner solution, can't currently pass unexported property types
+			var err error
+			cfgSnap.IngressGateway, err = cfgSnap.APIGateway.ToIngress(cfgSnap.Datacenter)
+			if err != nil {
+				return nil, err
+			}
+			listeners, err := s.makeIngressGatewayListeners(a.Address, cfgSnap)
 			if err != nil {
 				return nil, err
 			}
-
 			resources = append(resources, listeners...)
 		case structs.ServiceKindIngressGateway:
 			listeners, err := s.makeIngressGatewayListeners(a.Address, cfgSnap)
@@ -937,7 +929,7 @@ func makeListenerWithDefault(opts makeListenerOpts) *envoy_listener_v3.Listener
 	return &envoy_listener_v3.Listener{
 		Name:             fmt.Sprintf("%s:%s:%d", opts.name, opts.addr, opts.port),
 		AccessLog:        accessLog,
-		Address:          response.MakeAddress(opts.addr, opts.port),
+		Address:          makeAddress(opts.addr, opts.port),
 		TrafficDirection: opts.direction,
 	}
 }
@@ -956,7 +948,7 @@ func makePipeListener(opts makeListenerOpts) *envoy_listener_v3.Listener {
 	return &envoy_listener_v3.Listener{
 		Name:             fmt.Sprintf("%s:%s", opts.name, opts.path),
 		AccessLog:        accessLog,
-		Address:          response.MakePipeAddress(opts.path, uint32(modeInt)),
+		Address:          makePipeAddress(opts.path, uint32(modeInt)),
 		TrafficDirection: opts.direction,
 	}
 }
@@ -1173,7 +1165,7 @@ func createDownstreamTransportSocketForConnectTLS(cfgSnap *proxycfg.ConfigSnapsh
 
 	// Determine listener protocol type from configured service protocol. Don't hard fail on a config typo,
 	//The parse func returns default config if there is an error, so it's safe to continue.
-	cfg, _ := config.ParseProxyConfig(cfgSnap.Proxy.Config)
+	cfg, _ := ParseProxyConfig(cfgSnap.Proxy.Config)
 
 	// Create TLS validation context for mTLS with leaf certificate and root certs.
 	tlsContext := makeCommonTLSContext(
@@ -1265,7 +1257,7 @@ func (s *ResourceGenerator) makeInboundListener(cfgSnap *proxycfg.ConfigSnapshot
 	var l *envoy_listener_v3.Listener
 	var err error
 
-	cfg, err := config.ParseProxyConfig(cfgSnap.Proxy.Config)
+	cfg, err := ParseProxyConfig(cfgSnap.Proxy.Config)
 	if err != nil {
 		// Don't hard fail on a config typo, just warn. The parse func returns
 		// default config if there is an error so it's safe to continue.
@@ -1293,7 +1285,6 @@ func (s *ResourceGenerator) makeInboundListener(cfgSnap *proxycfg.ConfigSnapshot
 					partition:   cfgSnap.ProxyID.PartitionOrDefault(),
 				},
 				cfgSnap.ConnectProxy.InboundPeerTrustBundles,
-				cfgSnap.JWTProviders,
 			)
 			if err != nil {
 				return nil, err
@@ -1367,10 +1358,6 @@ func (s *ResourceGenerator) makeInboundListener(cfgSnap *proxycfg.ConfigSnapshot
 		logger:           s.Logger,
 	}
 	if useHTTPFilter {
-		jwtFilter, err := makeJWTAuthFilter(cfgSnap.JWTProviders, cfgSnap.ConnectProxy.Intentions)
-		if err != nil {
-			return nil, err
-		}
 		rbacFilter, err := makeRBACHTTPFilter(
 			cfgSnap.ConnectProxy.Intentions,
 			cfgSnap.IntentionDefaultAllow,
@@ -1380,16 +1367,12 @@ func (s *ResourceGenerator) makeInboundListener(cfgSnap *proxycfg.ConfigSnapshot
 				partition:   cfgSnap.ProxyID.PartitionOrDefault(),
 			},
 			cfgSnap.ConnectProxy.InboundPeerTrustBundles,
-			cfgSnap.JWTProviders,
 		)
 		if err != nil {
 			return nil, err
 		}
-		filterOpts.httpAuthzFilters = []*envoy_http_v3.HttpFilter{}
-		if jwtFilter != nil {
-			filterOpts.httpAuthzFilters = append(filterOpts.httpAuthzFilters, jwtFilter)
-		}
-		filterOpts.httpAuthzFilters = append(filterOpts.httpAuthzFilters, rbacFilter)
+
+		filterOpts.httpAuthzFilters = []*envoy_http_v3.HttpFilter{rbacFilter}
 
 		meshConfig := cfgSnap.MeshConfig()
 		includeXFCC := meshConfig == nil || meshConfig.HTTP == nil || !meshConfig.HTTP.SanitizeXForwardedClientCert
@@ -1445,57 +1428,9 @@ func (s *ResourceGenerator) makeInboundListener(cfgSnap *proxycfg.ConfigSnapshot
 		return nil, fmt.Errorf("failed to attach Consul filters and TLS context to custom public listener: %v", err)
 	}
 
-	// When permissive mTLS mode is enabled, include an additional filter chain
-	// that matches on the `destination_port == <service port>`. Traffic sent
-	// directly to the service port is passed through to the application
-	// unmodified.
-	if cfgSnap.Proxy.Mode == structs.ProxyModeTransparent &&
-		cfgSnap.Proxy.MutualTLSMode == structs.MutualTLSModePermissive {
-		chain, err := makePermissiveFilterChain(cfgSnap, filterOpts)
-		if err != nil {
-			return nil, fmt.Errorf("unable to add permissive mtls filter chain: %w", err)
-		}
-		if chain == nil {
-			s.Logger.Debug("no service port defined for service in permissive mTLS mode; not adding filter chain for non-mTLS traffic")
-		} else {
-			l.FilterChains = append(l.FilterChains, chain)
-
-			// With tproxy, the REDIRECT iptables target rewrites the destination ip/port
-			// to the proxy ip/port (e.g. 127.0.0.1:20000) for incoming packets.
-			// We need the original_dst filter to recover the original destination address.
-			originalDstFilter, err := makeEnvoyListenerFilter("envoy.filters.listener.original_dst", &envoy_original_dst_v3.OriginalDst{})
-			if err != nil {
-				return nil, err
-			}
-			l.ListenerFilters = append(l.ListenerFilters, originalDstFilter)
-		}
-	}
 	return l, err
 }
 
-func makePermissiveFilterChain(cfgSnap *proxycfg.ConfigSnapshot, opts listenerFilterOpts) (*envoy_listener_v3.FilterChain, error) {
-	servicePort := cfgSnap.Proxy.LocalServicePort
-	if servicePort <= 0 {
-		// No service port means the service does not accept incoming traffic, so
-		// the connect proxy does not need to listen for incoming non-mTLS traffic.
-		return nil, nil
-	}
-
-	opts.statPrefix += "permissive_"
-	filter, err := makeTCPProxyFilter(opts)
-	if err != nil {
-		return nil, err
-	}
-
-	chain := &envoy_listener_v3.FilterChain{
-		FilterChainMatch: &envoy_listener_v3.FilterChainMatch{
-			DestinationPort: &wrapperspb.UInt32Value{Value: uint32(servicePort)},
-		},
-		Filters: []*envoy_listener_v3.Filter{filter},
-	}
-	return chain, nil
-}
-
 // finalizePublicListenerFromConfig is used for best-effort injection of Consul filter-chains onto listeners.
 // This include L4 authorization filters and TLS context.
 func (s *ResourceGenerator) finalizePublicListenerFromConfig(l *envoy_listener_v3.Listener, cfgSnap *proxycfg.ConfigSnapshot, useHTTPFilter bool) error {
@@ -1515,7 +1450,7 @@ func (s *ResourceGenerator) finalizePublicListenerFromConfig(l *envoy_listener_v
 }
 
 func (s *ResourceGenerator) makeExposedCheckListener(cfgSnap *proxycfg.ConfigSnapshot, cluster string, path structs.ExposePath) (proto.Message, error) {
-	cfg, err := config.ParseProxyConfig(cfgSnap.Proxy.Config)
+	cfg, err := ParseProxyConfig(cfgSnap.Proxy.Config)
 	if err != nil {
 		// Don't hard fail on a config typo, just warn. The parse func returns
 		// default config if there is an error so it's safe to continue.
@@ -1590,7 +1525,7 @@ func (s *ResourceGenerator) makeExposedCheckListener(cfgSnap *proxycfg.ConfigSna
 			&envoy_core_v3.CidrRange{AddressPrefix: advertise, PrefixLen: &wrapperspb.UInt32Value{Value: uint32(advertiseLen)}},
 		)
 
-		if ok, err := platform.SupportsIPv6(); err != nil {
+		if ok, err := kernelSupportsIPv6(); err != nil {
 			return nil, err
 		} else if ok {
 			ranges = append(ranges,
@@ -1642,7 +1577,7 @@ func (s *ResourceGenerator) makeTerminatingGatewayListener(
 		svcConfig := cfgSnap.TerminatingGateway.ServiceConfigs[svc]
 		peerTrustBundles := cfgSnap.TerminatingGateway.InboundPeerTrustBundles[svc]
 
-		cfg, err := config.ParseProxyConfig(svcConfig.ProxyConfig)
+		cfg, err := ParseProxyConfig(svcConfig.ProxyConfig)
 		if err != nil {
 			// Don't hard fail on a config typo, just warn. The parse func returns
 			// default config if there is an error so it's safe to continue.
@@ -1688,7 +1623,7 @@ func (s *ResourceGenerator) makeTerminatingGatewayListener(
 		svcConfig := cfgSnap.TerminatingGateway.ServiceConfigs[svc]
 		peerTrustBundles := cfgSnap.TerminatingGateway.InboundPeerTrustBundles[svc]
 
-		cfg, err := config.ParseProxyConfig(svcConfig.ProxyConfig)
+		cfg, err := ParseProxyConfig(svcConfig.ProxyConfig)
 		if err != nil {
 			// Don't hard fail on a config typo, just warn. The parse func returns
 			// default config if there is an error so it's safe to continue.
@@ -1766,7 +1701,7 @@ func (s *ResourceGenerator) makeTerminatingGatewayListener(
 type terminatingGatewayFilterChainOpts struct {
 	cluster          string
 	service          structs.ServiceName
-	intentions       structs.SimplifiedIntentions
+	intentions       structs.Intentions
 	protocol         string
 	address          string // only valid for destination listeners
 	port             int    // only valid for destination listeners
@@ -1814,7 +1749,7 @@ func (s *ResourceGenerator) makeFilterChainTerminatingGateway(cfgSnap *proxycfg.
 		filterChain.Filters = append(filterChain.Filters, authFilter)
 	}
 
-	proxyCfg, err := config.ParseProxyConfig(cfgSnap.Proxy.Config)
+	proxyCfg, err := ParseProxyConfig(cfgSnap.Proxy.Config)
 	if err != nil {
 		// Don't hard fail on a config typo, just warn. The parse func returns
 		// default config if there is an error so it's safe to continue.
@@ -1853,7 +1788,6 @@ func (s *ResourceGenerator) makeFilterChainTerminatingGateway(cfgSnap *proxycfg.
 				partition:   cfgSnap.ProxyID.PartitionOrDefault(),
 			},
 			tgtwyOpts.peerTrustBundles,
-			cfgSnap.JWTProviders,
 		)
 		if err != nil {
 			return nil, err
@@ -2134,7 +2068,7 @@ func (s *ResourceGenerator) makeMeshGatewayPeerFilterChain(
 		if err != nil {
 			return nil, err
 		}
-		clusterName = meshGatewayExportedClusterNamePrefix + naming.CustomizeClusterName(target.Name, chain)
+		clusterName = meshGatewayExportedClusterNamePrefix + CustomizeClusterName(target.Name, chain)
 	}
 
 	uid := proxycfg.NewUpstreamIDFromServiceName(svc)
@@ -2597,7 +2531,7 @@ func makeHTTPFilter(opts listenerFilterOpts) (*envoy_listener_v3.Filter, error)
 			"envoy.filters.http.grpc_stats",
 			&envoy_grpc_stats_v3.FilterConfig{
 				PerMethodStatSpecifier: &envoy_grpc_stats_v3.FilterConfig_StatsForAllMethods{
-					StatsForAllMethods: response.MakeBoolValue(true),
+					StatsForAllMethods: makeBoolValue(true),
 				},
 			},
 		)
diff --git a/agent/xds/listeners_apigateway.go b/agent/xds/listeners_apigateway.go
deleted file mode 100644
index a4611895e2906..0000000000000
--- a/agent/xds/listeners_apigateway.go
+++ /dev/null
@@ -1,487 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"fmt"
-
-	"golang.org/x/exp/maps"
-
-	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	envoy_http_jwt_authn_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/jwt_authn/v3"
-	envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
-	envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
-
-	"github.com/hashicorp/consul/agent/consul/discoverychain"
-	"github.com/hashicorp/consul/agent/xds/naming"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-
-	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/types"
-)
-
-func (s *ResourceGenerator) makeAPIGatewayListeners(address string, cfgSnap *proxycfg.ConfigSnapshot) ([]proto.Message, error) {
-	var resources []proto.Message
-
-	readyListeners := getReadyListeners(cfgSnap)
-
-	for _, readyListener := range readyListeners {
-		listenerCfg := readyListener.listenerCfg
-		listenerKey := readyListener.listenerKey
-		boundListener := readyListener.boundListenerCfg
-
-		var certs []structs.InlineCertificateConfigEntry
-		for _, certRef := range boundListener.Certificates {
-			cert, ok := cfgSnap.APIGateway.Certificates.Get(certRef)
-			if !ok {
-				continue
-			}
-			certs = append(certs, *cert)
-		}
-
-		isAPIGatewayWithTLS := len(boundListener.Certificates) > 0
-
-		tlsContext, err := makeDownstreamTLSContextFromSnapshotAPIListenerConfig(cfgSnap, listenerCfg)
-		if err != nil {
-			return nil, err
-		}
-
-		if listenerCfg.Protocol == structs.ListenerProtocolTCP {
-			// Find the upstream matching this listener
-
-			// We rely on the invariant of upstreams slice always having at least 1
-			// member, because this key/value pair is created only when a
-			// GatewayService is returned in the RPC
-			u := readyListener.upstreams[0]
-			uid := proxycfg.NewUpstreamID(&u)
-
-			chain := cfgSnap.APIGateway.DiscoveryChain[uid]
-			if chain == nil {
-				// Wait until a chain is present in the snapshot.
-				continue
-			}
-
-			cfg := s.getAndModifyUpstreamConfigForListener(uid, &u, chain)
-			useRDS := cfg.Protocol != "tcp" && !chain.Default
-
-			var clusterName string
-			if !useRDS {
-				// When not using RDS we must generate a cluster name to attach to the filter chain.
-				// With RDS, cluster names get attached to the dynamic routes instead.
-				target, err := simpleChainTarget(chain)
-				if err != nil {
-					return nil, err
-				}
-				clusterName = naming.CustomizeClusterName(target.Name, chain)
-			}
-
-			filterName := fmt.Sprintf("%s.%s.%s.%s", chain.ServiceName, chain.Namespace, chain.Partition, chain.Datacenter)
-
-			opts := makeListenerOpts{
-				name:       uid.EnvoyID(),
-				accessLogs: cfgSnap.Proxy.AccessLogs,
-				addr:       address,
-				port:       u.LocalBindPort,
-				direction:  envoy_core_v3.TrafficDirection_OUTBOUND,
-				logger:     s.Logger,
-			}
-			l := makeListener(opts)
-
-			filterChain, err := s.makeUpstreamFilterChain(filterChainOpts{
-				accessLogs:  &cfgSnap.Proxy.AccessLogs,
-				routeName:   uid.EnvoyID(),
-				useRDS:      useRDS,
-				clusterName: clusterName,
-				filterName:  filterName,
-				protocol:    cfg.Protocol,
-				tlsContext:  tlsContext,
-			})
-			if err != nil {
-				return nil, err
-			}
-			l.FilterChains = []*envoy_listener_v3.FilterChain{
-				filterChain,
-			}
-
-			if isAPIGatewayWithTLS {
-				// construct SNI filter chains
-				l.FilterChains, err = makeInlineOverrideFilterChains(
-					cfgSnap,
-					cfgSnap.APIGateway.TLSConfig,
-					listenerKey.Protocol,
-					listenerFilterOpts{
-						useRDS:     useRDS,
-						protocol:   listenerKey.Protocol,
-						routeName:  listenerKey.RouteName(),
-						cluster:    clusterName,
-						statPrefix: "ingress_upstream_",
-						accessLogs: &cfgSnap.Proxy.AccessLogs,
-						logger:     s.Logger,
-					},
-					certs,
-				)
-				if err != nil {
-					return nil, err
-				}
-
-				// add the tls inspector to do SNI introspection
-				tlsInspector, err := makeTLSInspectorListenerFilter()
-				if err != nil {
-					return nil, err
-				}
-				l.ListenerFilters = []*envoy_listener_v3.ListenerFilter{tlsInspector}
-			}
-			resources = append(resources, l)
-
-		} else {
-			// If multiple upstreams share this port, make a special listener for the protocol.
-			listenerOpts := makeListenerOpts{
-				name:       listenerKey.Protocol,
-				accessLogs: cfgSnap.Proxy.AccessLogs,
-				addr:       address,
-				port:       listenerKey.Port,
-				direction:  envoy_core_v3.TrafficDirection_OUTBOUND,
-				logger:     s.Logger,
-			}
-			listener := makeListener(listenerOpts)
-
-			routes := make([]*structs.HTTPRouteConfigEntry, 0, len(readyListener.routeReferences))
-			for _, routeRef := range maps.Keys(readyListener.routeReferences) {
-				route, _ := cfgSnap.APIGateway.HTTPRoutes.Get(routeRef)
-				routes = append(routes, route)
-			}
-			consolidatedRoutes := discoverychain.ConsolidateHTTPRoutes(cfgSnap.APIGateway.GatewayConfig, &readyListener.listenerCfg, routes...)
-			routesWithJWT := []*structs.HTTPRouteConfigEntry{}
-			for _, routeCfgEntry := range consolidatedRoutes {
-				routeCfgEntry := routeCfgEntry
-				route := &routeCfgEntry
-
-				if listenerCfg.Override != nil && listenerCfg.Override.JWT != nil {
-					routesWithJWT = append(routesWithJWT, route)
-					continue
-				}
-
-				if listenerCfg.Default != nil && listenerCfg.Default.JWT != nil {
-					routesWithJWT = append(routesWithJWT, route)
-					continue
-				}
-
-				for _, rule := range route.Rules {
-					if rule.Filters.JWT != nil {
-						routesWithJWT = append(routesWithJWT, route)
-						continue
-					}
-					for _, svc := range rule.Services {
-						if svc.Filters.JWT != nil {
-							routesWithJWT = append(routesWithJWT, route)
-							continue
-						}
-					}
-				}
-
-			}
-
-			var authFilters []*envoy_http_v3.HttpFilter
-			if len(routesWithJWT) > 0 {
-				builder := &GatewayAuthFilterBuilder{
-					listener:       listenerCfg,
-					routes:         routesWithJWT,
-					providers:      cfgSnap.JWTProviders,
-					envoyProviders: make(map[string]*envoy_http_jwt_authn_v3.JwtProvider, len(cfgSnap.JWTProviders)),
-				}
-				authFilters, err = builder.makeGatewayAuthFilters()
-				if err != nil {
-					return nil, err
-				}
-			}
-
-			filterOpts := listenerFilterOpts{
-				useRDS:           true,
-				protocol:         listenerKey.Protocol,
-				filterName:       listenerKey.RouteName(),
-				routeName:        listenerKey.RouteName(),
-				cluster:          "",
-				statPrefix:       "ingress_upstream_",
-				routePath:        "",
-				httpAuthzFilters: authFilters,
-				accessLogs:       &cfgSnap.Proxy.AccessLogs,
-				logger:           s.Logger,
-			}
-
-			// Generate any filter chains needed for services with custom TLS certs
-			// via SDS.
-			sniFilterChains := []*envoy_listener_v3.FilterChain{}
-
-			if isAPIGatewayWithTLS {
-				sniFilterChains, err = makeInlineOverrideFilterChains(cfgSnap, cfgSnap.IngressGateway.TLSConfig, listenerKey.Protocol, filterOpts, certs)
-				if err != nil {
-					return nil, err
-				}
-			}
-
-			// If there are any sni filter chains, we need a TLS inspector filter!
-			if len(sniFilterChains) > 0 {
-				tlsInspector, err := makeTLSInspectorListenerFilter()
-				if err != nil {
-					return nil, err
-				}
-				listener.ListenerFilters = []*envoy_listener_v3.ListenerFilter{tlsInspector}
-			}
-
-			listener.FilterChains = sniFilterChains
-
-			// See if there are other services that didn't have specific SNI-matching
-			// filter chains. If so add a default filterchain to serve them.
-			if len(sniFilterChains) < len(readyListener.upstreams) && !isAPIGatewayWithTLS {
-				defaultFilter, err := makeListenerFilter(filterOpts)
-				if err != nil {
-					return nil, err
-				}
-
-				transportSocket, err := makeDownstreamTLSTransportSocket(tlsContext)
-				if err != nil {
-					return nil, err
-				}
-				listener.FilterChains = append(listener.FilterChains,
-					&envoy_listener_v3.FilterChain{
-						Filters: []*envoy_listener_v3.Filter{
-							defaultFilter,
-						},
-						TransportSocket: transportSocket,
-					})
-			}
-			resources = append(resources, listener)
-		}
-	}
-
-	return resources, nil
-}
-
-// helper struct to persist upstream parent information when ready upstream list is built out
-type readyListener struct {
-	listenerKey      proxycfg.APIGatewayListenerKey
-	listenerCfg      structs.APIGatewayListener
-	boundListenerCfg structs.BoundAPIGatewayListener
-	routeReferences  map[structs.ResourceReference]struct{}
-	upstreams        []structs.Upstream
-}
-
-// getReadyListeners returns a map containing the list of upstreams for each listener that is ready
-func getReadyListeners(cfgSnap *proxycfg.ConfigSnapshot) map[string]readyListener {
-	ready := map[string]readyListener{}
-	for _, l := range cfgSnap.APIGateway.Listeners {
-		// Only include upstreams for listeners that are ready
-		if !cfgSnap.APIGateway.GatewayConfig.ListenerIsReady(l.Name) {
-			continue
-		}
-
-		// For each route bound to the listener
-		boundListener := cfgSnap.APIGateway.BoundListeners[l.Name]
-		for _, routeRef := range boundListener.Routes {
-			// Get all upstreams for the route
-			routeUpstreams, ok := cfgSnap.APIGateway.Upstreams[routeRef]
-			if !ok {
-				continue
-			}
-
-			// Filter to upstreams that attach to this specific listener since
-			// a route can bind to + have upstreams for multiple listeners
-			listenerKey := proxycfg.APIGatewayListenerKeyFromListener(l)
-			routeUpstreamsForListener, ok := routeUpstreams[listenerKey]
-			if !ok {
-				continue
-			}
-
-			routeKey := l.Name + routeRef.String()
-
-			for _, upstream := range routeUpstreamsForListener {
-				// Insert or update readyListener for the listener to include this upstream
-				r, ok := ready[routeKey]
-				if !ok {
-					r = readyListener{
-						listenerKey:      listenerKey,
-						listenerCfg:      l,
-						routeReferences:  map[structs.ResourceReference]struct{}{},
-						boundListenerCfg: boundListener,
-					}
-				}
-				r.routeReferences[routeRef] = struct{}{}
-				r.upstreams = append(r.upstreams, upstream)
-				ready[routeKey] = r
-			}
-		}
-	}
-	return ready
-}
-
-func makeDownstreamTLSContextFromSnapshotAPIListenerConfig(
-	cfgSnap *proxycfg.ConfigSnapshot,
-	listenerCfg structs.APIGatewayListener,
-) (*envoy_tls_v3.DownstreamTlsContext, error) {
-	var downstreamContext *envoy_tls_v3.DownstreamTlsContext
-
-	tlsContext, err := makeCommonTLSContextFromSnapshotAPIGatewayListenerConfig(cfgSnap, listenerCfg)
-	if err != nil {
-		return nil, err
-	}
-
-	if tlsContext != nil {
-		// Configure alpn protocols on TLSContext
-		tlsContext.AlpnProtocols = getAlpnProtocols(string(listenerCfg.Protocol))
-
-		downstreamContext = &envoy_tls_v3.DownstreamTlsContext{
-			CommonTlsContext:         tlsContext,
-			RequireClientCertificate: &wrapperspb.BoolValue{Value: false},
-		}
-	}
-
-	return downstreamContext, nil
-}
-
-func makeCommonTLSContextFromSnapshotAPIGatewayListenerConfig(
-	cfgSnap *proxycfg.ConfigSnapshot,
-	listenerCfg structs.APIGatewayListener,
-) (*envoy_tls_v3.CommonTlsContext, error) {
-	var tlsContext *envoy_tls_v3.CommonTlsContext
-
-	// API Gateway TLS config is per listener
-	tlsCfg, err := resolveAPIListenerTLSConfig(listenerCfg.TLS)
-	if err != nil {
-		return nil, err
-	}
-
-	connectTLSEnabled := (!listenerCfg.TLS.IsEmpty())
-
-	if connectTLSEnabled {
-		tlsContext = makeCommonTLSContext(cfgSnap.Leaf(), cfgSnap.RootPEMs(), makeTLSParametersFromGatewayTLSConfig(*tlsCfg))
-	}
-
-	return tlsContext, nil
-}
-
-func resolveAPIListenerTLSConfig(listenerTLSCfg structs.APIGatewayTLSConfiguration) (*structs.GatewayTLSConfig, error) {
-	var mergedCfg structs.GatewayTLSConfig
-
-	if !listenerTLSCfg.IsEmpty() {
-		if listenerTLSCfg.MinVersion != types.TLSVersionUnspecified {
-			mergedCfg.TLSMinVersion = listenerTLSCfg.MinVersion
-		}
-		if listenerTLSCfg.MaxVersion != types.TLSVersionUnspecified {
-			mergedCfg.TLSMaxVersion = listenerTLSCfg.MaxVersion
-		}
-		if len(listenerTLSCfg.CipherSuites) != 0 {
-			mergedCfg.CipherSuites = listenerTLSCfg.CipherSuites
-		}
-	}
-
-	if err := validateListenerTLSConfig(mergedCfg.TLSMinVersion, mergedCfg.CipherSuites); err != nil {
-		return nil, err
-	}
-
-	return &mergedCfg, nil
-}
-
-// when we have multiple certificates on a single listener, we need
-// to duplicate the filter chains with multiple TLS contexts
-func makeInlineOverrideFilterChains(cfgSnap *proxycfg.ConfigSnapshot,
-	tlsCfg structs.GatewayTLSConfig,
-	protocol string,
-	filterOpts listenerFilterOpts,
-	certs []structs.InlineCertificateConfigEntry,
-) ([]*envoy_listener_v3.FilterChain, error) {
-	var chains []*envoy_listener_v3.FilterChain
-
-	constructChain := func(name string, hosts []string, tlsContext *envoy_tls_v3.CommonTlsContext) error {
-		filterOpts.filterName = name
-		filter, err := makeListenerFilter(filterOpts)
-		if err != nil {
-			return err
-		}
-
-		// Configure alpn protocols on TLSContext
-		tlsContext.AlpnProtocols = getAlpnProtocols(protocol)
-		transportSocket, err := makeDownstreamTLSTransportSocket(&envoy_tls_v3.DownstreamTlsContext{
-			CommonTlsContext:         tlsContext,
-			RequireClientCertificate: &wrapperspb.BoolValue{Value: false},
-		})
-		if err != nil {
-			return err
-		}
-
-		chains = append(chains, &envoy_listener_v3.FilterChain{
-			FilterChainMatch: makeSNIFilterChainMatch(hosts...),
-			Filters: []*envoy_listener_v3.Filter{
-				filter,
-			},
-			TransportSocket: transportSocket,
-		})
-
-		return nil
-	}
-
-	multipleCerts := len(certs) > 1
-
-	allCertHosts := map[string]struct{}{}
-	overlappingHosts := map[string]struct{}{}
-
-	if multipleCerts {
-		// we only need to prune out overlapping hosts if we have more than
-		// one certificate
-		for _, cert := range certs {
-			hosts, err := cert.Hosts()
-			if err != nil {
-				return nil, fmt.Errorf("unable to parse hosts from x509 certificate: %v", hosts)
-			}
-			for _, host := range hosts {
-				if _, ok := allCertHosts[host]; ok {
-					overlappingHosts[host] = struct{}{}
-				}
-				allCertHosts[host] = struct{}{}
-			}
-		}
-	}
-
-	for _, cert := range certs {
-		var hosts []string
-
-		// if we only have one cert, we just use it for all ingress
-		if multipleCerts {
-			// otherwise, we need an SNI per cert and to fallback to our ingress
-			// gateway certificate signed by our Consul CA
-			certHosts, err := cert.Hosts()
-			if err != nil {
-				return nil, fmt.Errorf("unable to parse hosts from x509 certificate: %v", hosts)
-			}
-			// filter out any overlapping hosts so we don't have collisions in our filter chains
-			for _, host := range certHosts {
-				if _, ok := overlappingHosts[host]; !ok {
-					hosts = append(hosts, host)
-				}
-			}
-
-			if len(hosts) == 0 {
-				// all of our hosts are overlapping, so we just skip this filter and it'll be
-				// handled by the default filter chain
-				continue
-			}
-		}
-
-		if err := constructChain(cert.Name, hosts, makeInlineTLSContextFromGatewayTLSConfig(tlsCfg, cert)); err != nil {
-			return nil, err
-		}
-	}
-
-	if multipleCerts {
-		// if we have more than one cert, add a default handler that uses the leaf cert from connect
-		if err := constructChain("default", nil, makeCommonTLSContext(cfgSnap.Leaf(), cfgSnap.RootPEMs(), makeTLSParametersFromGatewayTLSConfig(tlsCfg))); err != nil {
-			return nil, err
-		}
-	}
-
-	return chains, nil
-}
diff --git a/agent/xds/listeners_ingress.go b/agent/xds/listeners_ingress.go
index e5e5a4980c411..9592690a20f25 100644
--- a/agent/xds/listeners_ingress.go
+++ b/agent/xds/listeners_ingress.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
@@ -9,7 +6,6 @@ import (
 	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
 	envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
-	"github.com/hashicorp/consul/agent/xds/naming"
 
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/durationpb"
@@ -30,6 +26,15 @@ func (s *ResourceGenerator) makeIngressGatewayListeners(address string, cfgSnap
 			return nil, fmt.Errorf("no listener config found for listener on proto/port %s/%d", listenerKey.Protocol, listenerKey.Port)
 		}
 
+		var isAPIGatewayWithTLS bool
+		var certs []structs.InlineCertificateConfigEntry
+		if cfgSnap.APIGateway.ListenerCertificates != nil {
+			certs = cfgSnap.APIGateway.ListenerCertificates[listenerKey]
+		}
+		if certs != nil {
+			isAPIGatewayWithTLS = true
+		}
+
 		tlsContext, err := makeDownstreamTLSContextFromSnapshotListenerConfig(cfgSnap, listenerCfg)
 		if err != nil {
 			return nil, err
@@ -63,7 +68,7 @@ func (s *ResourceGenerator) makeIngressGatewayListeners(address string, cfgSnap
 				if err != nil {
 					return nil, err
 				}
-				clusterName = naming.CustomizeClusterName(target.Name, chain)
+				clusterName = CustomizeClusterName(target.Name, chain)
 			}
 
 			filterName := fmt.Sprintf("%s.%s.%s.%s", chain.ServiceName, chain.Namespace, chain.Partition, chain.Datacenter)
@@ -94,6 +99,28 @@ func (s *ResourceGenerator) makeIngressGatewayListeners(address string, cfgSnap
 				filterChain,
 			}
 
+			if isAPIGatewayWithTLS {
+				// construct SNI filter chains
+				l.FilterChains, err = makeInlineOverrideFilterChains(cfgSnap, cfgSnap.IngressGateway.TLSConfig, listenerKey, listenerFilterOpts{
+					useRDS:     useRDS,
+					protocol:   listenerKey.Protocol,
+					routeName:  listenerKey.RouteName(),
+					cluster:    clusterName,
+					statPrefix: "ingress_upstream_",
+					accessLogs: &cfgSnap.Proxy.AccessLogs,
+					logger:     s.Logger,
+				}, certs)
+				if err != nil {
+					return nil, err
+				}
+				// add the tls inspector to do SNI introspection
+				tlsInspector, err := makeTLSInspectorListenerFilter()
+				if err != nil {
+					return nil, err
+				}
+				l.ListenerFilters = []*envoy_listener_v3.ListenerFilter{tlsInspector}
+			}
+
 			resources = append(resources, l)
 		} else {
 			// If multiple upstreams share this port, make a special listener for the protocol.
@@ -105,7 +132,6 @@ func (s *ResourceGenerator) makeIngressGatewayListeners(address string, cfgSnap
 				direction:  envoy_core_v3.TrafficDirection_OUTBOUND,
 				logger:     s.Logger,
 			}
-
 			listener := makeListener(listenerOpts)
 
 			filterOpts := listenerFilterOpts{
@@ -128,6 +154,13 @@ func (s *ResourceGenerator) makeIngressGatewayListeners(address string, cfgSnap
 				return nil, err
 			}
 
+			if isAPIGatewayWithTLS {
+				sniFilterChains, err = makeInlineOverrideFilterChains(cfgSnap, cfgSnap.IngressGateway.TLSConfig, listenerKey, filterOpts, certs)
+				if err != nil {
+					return nil, err
+				}
+			}
+
 			// If there are any sni filter chains, we need a TLS inspector filter!
 			if len(sniFilterChains) > 0 {
 				tlsInspector, err := makeTLSInspectorListenerFilter()
@@ -141,7 +174,7 @@ func (s *ResourceGenerator) makeIngressGatewayListeners(address string, cfgSnap
 
 			// See if there are other services that didn't have specific SNI-matching
 			// filter chains. If so add a default filterchain to serve them.
-			if len(sniFilterChains) < len(upstreams) {
+			if len(sniFilterChains) < len(upstreams) && !isAPIGatewayWithTLS {
 				defaultFilter, err := makeListenerFilter(filterOpts)
 				if err != nil {
 					return nil, err
@@ -386,6 +419,111 @@ func makeSDSOverrideFilterChains(cfgSnap *proxycfg.ConfigSnapshot,
 	return chains, nil
 }
 
+// when we have multiple certificates on a single listener, we need
+// to duplicate the filter chains with multiple TLS contexts
+func makeInlineOverrideFilterChains(cfgSnap *proxycfg.ConfigSnapshot,
+	tlsCfg structs.GatewayTLSConfig,
+	listenerKey proxycfg.IngressListenerKey,
+	filterOpts listenerFilterOpts,
+	certs []structs.InlineCertificateConfigEntry) ([]*envoy_listener_v3.FilterChain, error) {
+
+	listenerCfg, ok := cfgSnap.IngressGateway.Listeners[listenerKey]
+	if !ok {
+		return nil, fmt.Errorf("no listener config found for listener on port %d", listenerKey.Port)
+	}
+
+	var chains []*envoy_listener_v3.FilterChain
+
+	constructChain := func(name string, hosts []string, tlsContext *envoy_tls_v3.CommonTlsContext) error {
+		filterOpts.filterName = name
+		filter, err := makeListenerFilter(filterOpts)
+		if err != nil {
+			return err
+		}
+
+		// Configure alpn protocols on TLSContext
+		tlsContext.AlpnProtocols = getAlpnProtocols(listenerCfg.Protocol)
+		transportSocket, err := makeDownstreamTLSTransportSocket(&envoy_tls_v3.DownstreamTlsContext{
+			CommonTlsContext:         tlsContext,
+			RequireClientCertificate: &wrapperspb.BoolValue{Value: false},
+		})
+		if err != nil {
+			return err
+		}
+
+		chains = append(chains, &envoy_listener_v3.FilterChain{
+			FilterChainMatch: makeSNIFilterChainMatch(hosts...),
+			Filters: []*envoy_listener_v3.Filter{
+				filter,
+			},
+			TransportSocket: transportSocket,
+		})
+
+		return nil
+	}
+
+	multipleCerts := len(certs) > 1
+
+	allCertHosts := map[string]struct{}{}
+	overlappingHosts := map[string]struct{}{}
+
+	if multipleCerts {
+		// we only need to prune out overlapping hosts if we have more than
+		// one certificate
+		for _, cert := range certs {
+			hosts, err := cert.Hosts()
+			if err != nil {
+				return nil, fmt.Errorf("unable to parse hosts from x509 certificate: %v", hosts)
+			}
+			for _, host := range hosts {
+				if _, ok := allCertHosts[host]; ok {
+					overlappingHosts[host] = struct{}{}
+				}
+				allCertHosts[host] = struct{}{}
+			}
+		}
+	}
+
+	for _, cert := range certs {
+		var hosts []string
+
+		// if we only have one cert, we just use it for all ingress
+		if multipleCerts {
+			// otherwise, we need an SNI per cert and to fallback to our ingress
+			// gateway certificate signed by our Consul CA
+			certHosts, err := cert.Hosts()
+			if err != nil {
+				return nil, fmt.Errorf("unable to parse hosts from x509 certificate: %v", hosts)
+			}
+			// filter out any overlapping hosts so we don't have collisions in our filter chains
+			for _, host := range certHosts {
+				if _, ok := overlappingHosts[host]; !ok {
+					hosts = append(hosts, host)
+				}
+			}
+
+			if len(hosts) == 0 {
+				// all of our hosts are overlapping, so we just skip this filter and it'll be
+				// handled by the default filter chain
+				continue
+			}
+		}
+
+		if err := constructChain(cert.Name, hosts, makeInlineTLSContextFromGatewayTLSConfig(tlsCfg, cert)); err != nil {
+			return nil, err
+		}
+	}
+
+	if multipleCerts {
+		// if we have more than one cert, add a default handler that uses the leaf cert from connect
+		if err := constructChain("default", nil, makeCommonTLSContext(cfgSnap.Leaf(), cfgSnap.RootPEMs(), makeTLSParametersFromGatewayTLSConfig(tlsCfg))); err != nil {
+			return nil, err
+		}
+	}
+
+	return chains, nil
+}
+
 func makeTLSParametersFromGatewayTLSConfig(tlsCfg structs.GatewayTLSConfig) *envoy_tls_v3.TlsParameters {
 	return makeTLSParametersFromTLSConfig(tlsCfg.TLSMinVersion, tlsCfg.TLSMaxVersion, tlsCfg.CipherSuites)
 }
diff --git a/agent/xds/listeners_test.go b/agent/xds/listeners_test.go
index 052bfcf801925..7d74645a8a108 100644
--- a/agent/xds/listeners_test.go
+++ b/agent/xds/listeners_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
@@ -11,7 +8,8 @@ import (
 	"text/template"
 
 	"github.com/stretchr/testify/assert"
-	"google.golang.org/protobuf/proto"
+
+	"github.com/hashicorp/consul/agent/xds/testcommon"
 
 	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
 	testinf "github.com/mitchellh/go-testing-interface"
@@ -19,13 +17,8 @@ import (
 
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xds/configfetcher"
-	"github.com/hashicorp/consul/agent/xds/proxystateconverter"
-	"github.com/hashicorp/consul/agent/xds/response"
-	"github.com/hashicorp/consul/agent/xds/testcommon"
-	"github.com/hashicorp/consul/agent/xdsv2"
 	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/types"
 )
@@ -38,7 +31,6 @@ type listenerTestCase struct {
 	// test input.
 	overrideGoldenName string
 	generatorSetup     func(*ResourceGenerator)
-	alsoRunTestForV2   bool
 }
 
 func makeListenerDiscoChainTests(enterprise bool) []listenerTestCase {
@@ -76,7 +68,6 @@ func makeListenerDiscoChainTests(enterprise bool) []listenerTestCase {
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-http-chain",
@@ -125,7 +116,6 @@ func makeListenerDiscoChainTests(enterprise bool) []listenerTestCase {
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "external-sni", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-chain-and-overrides",
@@ -138,73 +128,12 @@ func makeListenerDiscoChainTests(enterprise bool) []listenerTestCase {
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-remote-gateway", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-failover-through-local-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-local-gateway", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-jwt-config-entry-with-local",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "http"
-				},
-					[]proxycfg.UpdateEvent{
-						{
-							CorrelationID: "jwt-provider",
-							Result: &structs.IndexedConfigEntries{
-								Kind: "jwt-provider",
-								Entries: []structs.ConfigEntry{
-									&structs.JWTProviderConfigEntry{
-										Name: "okta",
-										JSONWebKeySet: &structs.JSONWebKeySet{
-											Local: &structs.LocalJWKS{
-												JWKS: "aGVsbG8gd29ybGQK",
-											},
-										},
-										Locations: []*structs.JWTLocation{
-											{
-												QueryParam: &structs.JWTLocationQueryParam{
-													Name: "token",
-												},
-											},
-											{
-												Cookie: &structs.JWTLocationCookie{
-													Name: "token",
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-						{
-							CorrelationID: "intentions",
-							Result: structs.SimplifiedIntentions{
-								{
-									SourceName:      "*",
-									DestinationName: "db",
-									Permissions: []*structs.IntentionPermission{
-										{
-											JWT: &structs.IntentionJWTRequirement{
-												Providers: []*structs.IntentionJWTProvider{
-													{
-														Name: "okta",
-													},
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				)
-			},
 		},
 	}
 }
@@ -236,7 +165,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 					},
 				})
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tls-incoming-min-version",
@@ -256,7 +184,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 					},
 				})
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tls-incoming-max-version",
@@ -276,7 +203,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 					},
 				})
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tls-incoming-cipher-suites",
@@ -299,7 +225,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 					},
 				})
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "grpc-public-listener",
@@ -316,7 +241,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 					ns.Proxy.Config["bind_address"] = "127.0.0.2"
 				}, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "listener-bind-port",
@@ -325,7 +249,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 					ns.Proxy.Config["bind_port"] = 8888
 				}, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "listener-bind-address-port",
@@ -335,7 +258,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 					ns.Proxy.Config["bind_port"] = 8888
 				}, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "listener-unix-domain-socket",
@@ -347,7 +269,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 					ns.Proxy.Upstreams[0].LocalBindSocketMode = "0640"
 				}, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "listener-max-inbound-connections",
@@ -356,7 +277,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 					ns.Proxy.Config["max_inbound_connections"] = 222
 				}, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "http2-public-listener",
@@ -373,7 +293,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 					ns.Proxy.Config["balance_inbound_connections"] = "exact_balance"
 				}, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "listener-balance-outbound-connections-bind-port",
@@ -382,7 +301,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 					ns.Proxy.Upstreams[0].Config["balance_outbound_connections"] = "exact_balance"
 				}, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "http-public-listener",
@@ -516,31 +434,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 				}, nil)
 			},
 		},
-		{
-			name: "custom-upstream-with-prepared-query",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					for i := range ns.Proxy.Upstreams {
-						if ns.Proxy.Upstreams[i].DestinationName != "db" {
-							continue // only tweak the db upstream
-						}
-						if ns.Proxy.Upstreams[i].Config == nil {
-							ns.Proxy.Upstreams[i].Config = map[string]interface{}{}
-						}
-
-						uid := proxycfg.NewUpstreamID(&ns.Proxy.Upstreams[i])
-
-						// Triggers an override with the presence of the escape hatch listener
-						ns.Proxy.Upstreams[i].DestinationType = structs.UpstreamDestTypePreparedQuery
-
-						ns.Proxy.Upstreams[i].Config["envoy_listener_json"] =
-							customListenerJSON(t, customListenerJSONOptions{
-								Name: uid.EnvoyID() + ":custom-upstream",
-							})
-					}
-				}, nil)
-			},
-		},
 		{
 			name: "connect-proxy-upstream-defaults",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
@@ -580,9 +473,9 @@ func TestListenersFromSnapshot(t *testing.T) {
 		},
 		{
 			// NOTE: if IPv6 is not supported in the kernel per
-			// platform.SupportsIPv6() then this test will fail because the golden
+			// kernelSupportsIPv6() then this test will fail because the golden
 			// files were generated assuming ipv6 support was present
-			name:   "expose-checks-http",
+			name:   "expose-checks",
 			create: proxycfg.TestConfigSnapshotExposeChecks,
 			generatorSetup: func(s *ResourceGenerator) {
 				s.CfgFetcher = configFetcherFunc(func() string {
@@ -590,30 +483,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 				})
 			},
 		},
-		{
-			// NOTE: if IPv6 is not supported in the kernel per
-			// platform.SupportsIPv6() then this test will fail because the golden
-			// files were generated assuming ipv6 support was present
-			name:   "expose-checks-http-with-bind-override",
-			create: proxycfg.TestConfigSnapshotExposeChecksWithBindOverride,
-			generatorSetup: func(s *ResourceGenerator) {
-				s.CfgFetcher = configFetcherFunc(func() string {
-					return "192.0.2.1"
-				})
-			},
-		},
-		{
-			// NOTE: if IPv6 is not supported in the kernel per
-			// platform.SupportsIPv6() then this test will fail because the golden
-			// files were generated assuming ipv6 support was present
-			name:   "expose-checks-grpc",
-			create: proxycfg.TestConfigSnapshotExposeChecksGRPC,
-			generatorSetup: func(s *ResourceGenerator) {
-				s.CfgFetcher = configFetcherFunc(func() string {
-					return "192.0.2.1"
-				})
-			},
-		},
 		{
 			name: "mesh-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
@@ -626,12 +495,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotMeshGateway(t, "federation-states", nil, nil)
 			},
 		},
-		{
-			name: "mesh-gateway-using-federation-control-plane",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotMeshGateway(t, "mesh-gateway-federation", nil, nil)
-			},
-		},
 		{
 			name: "mesh-gateway-no-services",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
@@ -948,16 +811,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, nil, nil)
 			},
 		},
-		{
-			name: "terminating-gateway-custom-trace-listener",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, func(ns *structs.NodeService) {
-					ns.Proxy.Config = map[string]interface{}{}
-					ns.Proxy.Config["protocol"] = "http"
-					ns.Proxy.Config["envoy_listener_tracing_json"] = customTraceJSON(t)
-				}, nil)
-			},
-		},
 		{
 			name: "terminating-gateway-with-tls-incoming-min-version",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
@@ -1095,7 +948,7 @@ func TestListenersFromSnapshot(t *testing.T) {
 					},
 					{
 						CorrelationID: "service-intentions:web",
-						Result: structs.SimplifiedIntentions{
+						Result: structs.Intentions{
 							{
 								SourceName:      "*",
 								DestinationName: "web",
@@ -1163,14 +1016,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 			name:   "ingress-with-tls-mixed-min-version-listeners",
 			create: proxycfg.TestConfigSnapshotIngressGateway_TLSMixedMinVersionListeners,
 		},
-		{
-			name:   "ingress-with-tls-mixed-max-version-listeners",
-			create: proxycfg.TestConfigSnapshotIngressGateway_TLSMixedMaxVersionListeners,
-		},
-		{
-			name:   "ingress-with-tls-mixed-cipher-suites-listeners",
-			create: proxycfg.TestConfigSnapshotIngressGateway_TLSMixedCipherVersionListeners,
-		},
 		{
 			name:   "ingress-with-sds-listener-gw-level",
 			create: proxycfg.TestConfigSnapshotIngressGatewaySDS_GatewayLevel,
@@ -1226,19 +1071,16 @@ func TestListenersFromSnapshot(t *testing.T) {
 			create: proxycfg.TestConfigSnapshotTransparentProxyResolverRedirectUpstream,
 		},
 		{
-			name:             "transparent-proxy-catalog-destinations-only",
-			create:           proxycfg.TestConfigSnapshotTransparentProxyCatalogDestinationsOnly,
-			alsoRunTestForV2: true,
+			name:   "transparent-proxy-catalog-destinations-only",
+			create: proxycfg.TestConfigSnapshotTransparentProxyCatalogDestinationsOnly,
 		},
 		{
-			name:             "transparent-proxy-dial-instances-directly",
-			create:           proxycfg.TestConfigSnapshotTransparentProxyDialDirectly,
-			alsoRunTestForV2: true,
+			name:   "transparent-proxy-dial-instances-directly",
+			create: proxycfg.TestConfigSnapshotTransparentProxyDialDirectly,
 		},
 		{
-			name:             "transparent-proxy-terminating-gateway",
-			create:           proxycfg.TestConfigSnapshotTransparentProxyTerminatingGatewayCatalogDestinationsOnly,
-			alsoRunTestForV2: true,
+			name:   "transparent-proxy-terminating-gateway",
+			create: proxycfg.TestConfigSnapshotTransparentProxyTerminatingGatewayCatalogDestinationsOnly,
 		},
 		{
 			name: "custom-trace-listener",
@@ -1291,28 +1133,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 					nil)
 			},
 		},
-		{
-			name: "connect-proxy-with-tproxy-and-permissive-mtls",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.MutualTLSMode = structs.MutualTLSModePermissive
-					ns.Proxy.Mode = structs.ProxyModeTransparent
-					ns.Proxy.TransparentProxy.OutboundListenerPort = 1234
-				},
-					nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-without-tproxy-and-permissive-mtls",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.MutualTLSMode = structs.MutualTLSModePermissive
-				},
-					nil)
-			},
-			alsoRunTestForV2: true,
-		},
 	}
 
 	tests = append(tests, makeListenerDiscoChainTests(false)...)
@@ -1324,7 +1144,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 		t.Run("envoy-"+envoyVersion, func(t *testing.T) {
 			for _, tt := range tests {
 				t.Run(tt.name, func(t *testing.T) {
-
 					// Sanity check default with no overrides first
 					snap := tt.create(t)
 
@@ -1336,26 +1155,26 @@ func TestListenersFromSnapshot(t *testing.T) {
 					// golder files for every test case and so not be any use!
 					testcommon.SetupTLSRootsAndLeaf(t, snap)
 
-					var listeners []proto.Message
-
 					// Need server just for logger dependency
 					g := NewResourceGenerator(testutil.Logger(t), nil, false)
 					g.ProxyFeatures = sf
 					if tt.generatorSetup != nil {
 						tt.generatorSetup(g)
 					}
-					listeners, err = g.listenersFromSnapshot(snap)
+
+					listeners, err := g.listenersFromSnapshot(snap)
 					require.NoError(t, err)
+
 					// The order of listeners returned via LDS isn't relevant, so it's safe
 					// to sort these for the purposes of test comparisons.
 					sort.Slice(listeners, func(i, j int) bool {
 						return listeners[i].(*envoy_listener_v3.Listener).Name < listeners[j].(*envoy_listener_v3.Listener).Name
 					})
 
-					r, err := response.CreateResponse(xdscommon.ListenerType, "00000001", "00000001", listeners)
+					r, err := createResponse(xdscommon.ListenerType, "00000001", "00000001", listeners)
 					require.NoError(t, err)
 
-					t.Run("current-xdsv1", func(t *testing.T) {
+					t.Run("current", func(t *testing.T) {
 						gotJSON := protoToJSON(t, r)
 
 						gName := tt.name
@@ -1366,39 +1185,6 @@ func TestListenersFromSnapshot(t *testing.T) {
 						expectedJSON := goldenEnvoy(t, filepath.Join("listeners", gName), envoyVersion, latestEnvoyVersion, gotJSON)
 						require.JSONEq(t, expectedJSON, gotJSON)
 					})
-
-					if tt.alsoRunTestForV2 {
-						generator := xdsv2.NewResourceGenerator(testutil.Logger(t))
-						converter := proxystateconverter.NewConverter(testutil.Logger(t), nil)
-						proxyState, err := converter.ProxyStateFromSnapshot(snap)
-						require.NoError(t, err)
-
-						res, err := generator.AllResourcesFromIR(proxyState)
-						require.NoError(t, err)
-
-						listeners = res[xdscommon.ListenerType]
-						// The order of listeners returned via LDS isn't relevant, so it's safe
-						// to sort these for the purposes of test comparisons.
-						sort.Slice(listeners, func(i, j int) bool {
-							return listeners[i].(*envoy_listener_v3.Listener).Name < listeners[j].(*envoy_listener_v3.Listener).Name
-						})
-
-						r, err := response.CreateResponse(xdscommon.ListenerType, "00000001", "00000001", listeners)
-						require.NoError(t, err)
-
-						t.Run("current-xdsv2", func(t *testing.T) {
-							gotJSON := protoToJSON(t, r)
-
-							gName := tt.name
-							if tt.overrideGoldenName != "" {
-								gName = tt.overrideGoldenName
-							}
-
-							expectedJSON := goldenEnvoy(t, filepath.Join("listeners", gName), envoyVersion, latestEnvoyVersion, gotJSON)
-							require.JSONEq(t, expectedJSON, gotJSON)
-						})
-					}
-
 				})
 			}
 		})
@@ -1556,7 +1342,7 @@ func customTraceJSON(t testinf.T) string {
 
 type configFetcherFunc func() string
 
-var _ configfetcher.ConfigFetcher = (configFetcherFunc)(nil)
+var _ ConfigFetcher = (configFetcherFunc)(nil)
 
 func (f configFetcherFunc) AdvertiseAddrLAN() string {
 	return f()
diff --git a/agent/xds/locality_policy.go b/agent/xds/locality_policy.go
deleted file mode 100644
index c94ba95ea2865..0000000000000
--- a/agent/xds/locality_policy.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"fmt"
-	"github.com/hashicorp/go-hclog"
-
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-func groupedEndpoints(logger hclog.Logger, locality *structs.Locality, policy *structs.DiscoveryPrioritizeByLocality, csns structs.CheckServiceNodes) ([]structs.CheckServiceNodes, error) {
-	switch {
-	case policy == nil || policy.Mode == "" || policy.Mode == "none":
-		return []structs.CheckServiceNodes{csns}, nil
-	case policy.Mode == "failover":
-		log := logger.Named("locality")
-		return prioritizeByLocalityFailover(log, locality, csns), nil
-	default:
-		return nil, fmt.Errorf("unexpected priortize-by-locality mode %q", policy.Mode)
-	}
-}
diff --git a/agent/xds/locality_policy_ce.go b/agent/xds/locality_policy_ce.go
deleted file mode 100644
index 7d9f41be5dee2..0000000000000
--- a/agent/xds/locality_policy_ce.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package xds
-
-import (
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/go-hclog"
-)
-
-func prioritizeByLocalityFailover(_ hclog.Logger, _ *structs.Locality, _ structs.CheckServiceNodes) []structs.CheckServiceNodes {
-	return nil
-}
diff --git a/agent/xds/naming.go b/agent/xds/naming.go
new file mode 100644
index 0000000000000..620032a422b54
--- /dev/null
+++ b/agent/xds/naming.go
@@ -0,0 +1,16 @@
+package xds
+
+import (
+	"fmt"
+
+	"github.com/hashicorp/consul/agent/structs"
+)
+
+func CustomizeClusterName(clusterName string, chain *structs.CompiledDiscoveryChain) string {
+	if chain == nil || chain.CustomizationHash == "" {
+		return clusterName
+	}
+	// Use a colon to delimit this prefix instead of a dot to avoid a
+	// theoretical collision problem with subsets.
+	return fmt.Sprintf("%s~%s", chain.CustomizationHash, clusterName)
+}
diff --git a/agent/xds/naming/naming.go b/agent/xds/naming/naming.go
deleted file mode 100644
index 3e19d93270038..0000000000000
--- a/agent/xds/naming/naming.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package naming
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-const (
-	// OriginalDestinationClusterName is the name we give to the passthrough
-	// cluster which redirects transparently-proxied requests to their original
-	// destination outside the mesh. This cluster prevents Consul from blocking
-	// connections to destinations outside of the catalog when in transparent
-	// proxy mode.
-	OriginalDestinationClusterName = "original-destination"
-	VirtualIPTag                   = "virtual"
-)
-
-func CustomizeClusterName(clusterName string, chain *structs.CompiledDiscoveryChain) string {
-	if chain == nil || chain.CustomizationHash == "" {
-		return clusterName
-	}
-	// Use a colon to delimit this prefix instead of a dot to avoid a
-	// theoretical collision problem with subsets.
-	return fmt.Sprintf("%s~%s", chain.CustomizationHash, clusterName)
-}
diff --git a/agent/xds/net_fallback.go b/agent/xds/net_fallback.go
new file mode 100644
index 0000000000000..a09fc14983af4
--- /dev/null
+++ b/agent/xds/net_fallback.go
@@ -0,0 +1,8 @@
+//go:build !linux
+// +build !linux
+
+package xds
+
+func kernelSupportsIPv6() (bool, error) {
+	return true, nil
+}
diff --git a/agent/xds/platform/net_linux.go b/agent/xds/net_linux.go
similarity index 83%
rename from agent/xds/platform/net_linux.go
rename to agent/xds/net_linux.go
index 13596f8a555af..1be5d80c30b17 100644
--- a/agent/xds/platform/net_linux.go
+++ b/agent/xds/net_linux.go
@@ -1,9 +1,7 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build linux
+// +build linux
 
-package platform
+package xds
 
 import (
 	"fmt"
@@ -19,7 +17,7 @@ var (
 	ipv6SupportedErr error
 )
 
-func SupportsIPv6() (bool, error) {
+func kernelSupportsIPv6() (bool, error) {
 	ipv6SupportOnce.Do(func() {
 		ipv6Supported, ipv6SupportedErr = checkIfKernelSupportsIPv6()
 	})
diff --git a/agent/xds/platform/net_fallback.go b/agent/xds/platform/net_fallback.go
deleted file mode 100644
index 391d4cf4ba80a..0000000000000
--- a/agent/xds/platform/net_fallback.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !linux
-
-package platform
-
-func SupportsIPv6() (bool, error) {
-	return true, nil
-}
diff --git a/agent/xds/protocol_trace.go b/agent/xds/protocol_trace.go
index cfe905d70bf99..1a9687f712ca3 100644
--- a/agent/xds/protocol_trace.go
+++ b/agent/xds/protocol_trace.go
@@ -1,27 +1,23 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
 	envoy_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
-	"github.com/hashicorp/go-hclog"
 
 	"github.com/mitchellh/copystructure"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
 )
 
-func logTraceRequest(logger hclog.Logger, msg string, pb proto.Message) {
-	logTraceProto(logger, msg, pb, false)
+func (s *ResourceGenerator) logTraceRequest(msg string, pb proto.Message) {
+	s.logTraceProto(msg, pb, false)
 }
 
-func logTraceResponse(logger hclog.Logger, msg string, pb proto.Message) {
-	logTraceProto(logger, msg, pb, true)
+func (s *ResourceGenerator) logTraceResponse(msg string, pb proto.Message) {
+	s.logTraceProto(msg, pb, true)
 }
 
-func logTraceProto(logger hclog.Logger, msg string, pb proto.Message, response bool) {
-	if !logger.IsTrace() {
+func (s *ResourceGenerator) logTraceProto(msg string, pb proto.Message, response bool) {
+	if !s.Logger.IsTrace() {
 		return
 	}
 
@@ -56,5 +52,5 @@ func logTraceProto(logger hclog.Logger, msg string, pb proto.Message, response b
 		out = string(outBytes)
 	}
 
-	logger.Trace(msg, "direction", dir, "protobuf", out)
+	s.Logger.Trace(msg, "direction", dir, "protobuf", out)
 }
diff --git a/agent/xds/proxystateconverter/clusters.go b/agent/xds/proxystateconverter/clusters.go
deleted file mode 100644
index cb084a4283ca4..0000000000000
--- a/agent/xds/proxystateconverter/clusters.go
+++ /dev/null
@@ -1,1253 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxystateconverter
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-uuid"
-
-	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-
-	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xds/config"
-	"github.com/hashicorp/consul/agent/xds/naming"
-	"github.com/hashicorp/consul/agent/xds/response"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-)
-
-const (
-	meshGatewayExportedClusterNamePrefix = "exported~"
-)
-
-type namedCluster struct {
-	name    string
-	cluster *pbproxystate.Cluster
-}
-
-// clustersFromSnapshot returns the xDS API representation of the "clusters" in the snapshot.
-func (s *Converter) clustersFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) error {
-	if cfgSnap == nil {
-		return errors.New("nil config given")
-	}
-
-	switch cfgSnap.Kind {
-	case structs.ServiceKindConnectProxy:
-		return s.clustersFromSnapshotConnectProxy(cfgSnap)
-	// TODO(proxystate): Terminating Gateways will be added in the future.
-	//case structs.ServiceKindTerminatingGateway:
-	//	err := s.clustersFromSnapshotTerminatingGateway(cfgSnap)
-	//	if err != nil {
-	//		return err
-	//	}
-	//	return nil
-	// TODO(proxystate): Mesh Gateways will be added in the future.
-	//case structs.ServiceKindMeshGateway:
-	//	err := s.clustersFromSnapshotMeshGateway(cfgSnap)
-	//	if err != nil {
-	//		return err
-	//	}
-	//	return nil
-	// TODO(proxystate): Ingress Gateways will be added in the future.
-	//case structs.ServiceKindIngressGateway:
-	//	err := s.clustersFromSnapshotIngressGateway(cfgSnap)
-	//	if err != nil {
-	//		return err
-	//	}
-	//	return nil
-	// TODO(proxystate): API Gateways will be added in the future.
-	//case structs.ServiceKindAPIGateway:
-	//	res, err := s.clustersFromSnapshotAPIGateway(cfgSnap)
-	//	if err != nil {
-	//		return err
-	//	}
-	//	return nil
-	default:
-		return fmt.Errorf("Invalid service kind: %v", cfgSnap.Kind)
-	}
-}
-
-// clustersFromSnapshot returns the xDS API representation of the "clusters"
-// (upstreams) in the snapshot.
-func (s *Converter) clustersFromSnapshotConnectProxy(cfgSnap *proxycfg.ConfigSnapshot) error {
-	// This is the list of listeners we add to. It will be empty to start.
-	clusters := s.proxyState.Clusters
-	var err error
-
-	// Include the "app" cluster for the public listener
-	appCluster, err := s.makeAppCluster(cfgSnap, xdscommon.LocalAppClusterName, "", cfgSnap.Proxy.LocalServicePort)
-	if err != nil {
-		return err
-	}
-	clusters[appCluster.name] = appCluster.cluster
-
-	if cfgSnap.Proxy.Mode == structs.ProxyModeTransparent {
-		passthroughs, err := s.makePassthroughClusters(cfgSnap)
-		if err != nil {
-			return fmt.Errorf("failed to make passthrough clusters for transparent proxy: %v", err)
-		}
-		for clusterName, cluster := range passthroughs {
-			clusters[clusterName] = cluster
-		}
-	}
-
-	// NOTE: Any time we skip a chain below we MUST also skip that discovery chain in endpoints.go
-	// so that the sets of endpoints generated matches the sets of clusters.
-	for uid, chain := range cfgSnap.ConnectProxy.DiscoveryChain {
-		upstream, skip := cfgSnap.ConnectProxy.GetUpstream(uid, &cfgSnap.ProxyID.EnterpriseMeta)
-		if skip {
-			continue
-		}
-
-		upstreamClusters, err := s.makeUpstreamClustersForDiscoveryChain(
-			uid,
-			upstream,
-			chain,
-			cfgSnap,
-			false,
-		)
-		if err != nil {
-			return err
-		}
-
-		for name, cluster := range upstreamClusters {
-			clusters[name] = cluster
-		}
-	}
-
-	// TODO(proxystate): peering will be added in the future.
-	//// NOTE: Any time we skip an upstream below we MUST also skip that same
-	//// upstream in endpoints.go so that the sets of endpoints generated matches
-	//// the sets of clusters.
-	//for _, uid := range cfgSnap.ConnectProxy.PeeredUpstreamIDs() {
-	//	upstream, skip := cfgSnap.ConnectProxy.GetUpstream(uid, &cfgSnap.ProxyID.EnterpriseMeta)
-	//	if skip {
-	//		continue
-	//	}
-	//
-	//	peerMeta, found := cfgSnap.ConnectProxy.UpstreamPeerMeta(uid)
-	//	if !found {
-	//		s.Logger.Warn("failed to fetch upstream peering metadata for cluster", "uid", uid)
-	//	}
-	//	cfg := s.getAndModifyUpstreamConfigForPeeredListener(uid, upstream, peerMeta)
-	//
-	//	upstreamCluster, err := s.makeUpstreamClusterForPeerService(uid, cfg, peerMeta, cfgSnap)
-	//	if err != nil {
-	//		return nil, err
-	//	}
-	//	clusters = append(clusters, upstreamCluster)
-	//}
-
-	// TODO(proxystate): L7 Intentions and JWT Auth will be added in the future.
-	//// add clusters for jwt-providers
-	//for _, prov := range cfgSnap.JWTProviders {
-	//	//skip cluster creation for local providers
-	//	if prov.JSONWebKeySet == nil || prov.JSONWebKeySet.Remote == nil {
-	//		continue
-	//	}
-	//
-	//	cluster, err := makeJWTProviderCluster(prov)
-	//	if err != nil {
-	//		s.Logger.Warn("failed to make jwt-provider cluster", "provider name", prov.Name, "error", err)
-	//		continue
-	//	}
-	//
-	//	clusters[cluster.GetName()] = cluster
-	//}
-
-	for _, u := range cfgSnap.Proxy.Upstreams {
-		if u.DestinationType != structs.UpstreamDestTypePreparedQuery {
-			continue
-		}
-
-		upstreamCluster, err := s.makeUpstreamClusterForPreparedQuery(u, cfgSnap)
-		if err != nil {
-			return err
-		}
-		clusters[upstreamCluster.name] = upstreamCluster.cluster
-	}
-
-	cfgSnap.Proxy.Expose.Finalize()
-	paths := cfgSnap.Proxy.Expose.Paths
-
-	// Add service health checks to the list of paths to create clusters for if needed
-	if cfgSnap.Proxy.Expose.Checks {
-		psid := structs.NewServiceID(cfgSnap.Proxy.DestinationServiceID, &cfgSnap.ProxyID.EnterpriseMeta)
-		for _, check := range cfgSnap.ConnectProxy.WatchedServiceChecks[psid] {
-			p, err := parseCheckPath(check)
-			if err != nil {
-				s.Logger.Warn("failed to create cluster for", "check", check.CheckID, "error", err)
-				continue
-			}
-			paths = append(paths, p)
-		}
-	}
-
-	// Create a new cluster if we need to expose a port that is different from the service port
-	for _, path := range paths {
-		if path.LocalPathPort == cfgSnap.Proxy.LocalServicePort {
-			continue
-		}
-		c, err := s.makeAppCluster(cfgSnap, makeExposeClusterName(path.LocalPathPort), path.Protocol, path.LocalPathPort)
-		if err != nil {
-			s.Logger.Warn("failed to make local cluster", "path", path.Path, "error", err)
-			continue
-		}
-		clusters[c.name] = c.cluster
-	}
-
-	return nil
-}
-
-// TODO(proxystate): L7 Intentions and JWT Auth will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func makeJWTProviderCluster
-// func makeJWKSDiscoveryClusterType
-// func makeJWTCertValidationContext
-// func parseJWTRemoteURL
-
-func makeExposeClusterName(destinationPort int) string {
-	return fmt.Sprintf("exposed_cluster_%d", destinationPort)
-}
-
-// In transparent proxy mode there are potentially multiple passthrough clusters added.
-// The first is for destinations outside of Consul's catalog. This is for a plain TCP proxy.
-// All of these use Envoy's ORIGINAL_DST listener filter, which forwards to the original
-// destination address (before the iptables redirection).
-// The rest are for destinations inside the mesh, which require certificates for mTLS.
-func (s *Converter) makePassthroughClusters(cfgSnap *proxycfg.ConfigSnapshot) (map[string]*pbproxystate.Cluster, error) {
-	// This size is an upper bound.
-	clusters := make(map[string]*pbproxystate.Cluster, 0)
-	if meshConf := cfgSnap.MeshConfig(); meshConf == nil ||
-		!meshConf.TransparentProxy.MeshDestinationsOnly {
-
-		clusters[naming.OriginalDestinationClusterName] = &pbproxystate.Cluster{
-			Group: &pbproxystate.Cluster_EndpointGroup{
-				EndpointGroup: &pbproxystate.EndpointGroup{
-					Group: &pbproxystate.EndpointGroup_Passthrough{
-						Passthrough: &pbproxystate.PassthroughEndpointGroup{
-							Config: &pbproxystate.PassthroughEndpointGroupConfig{
-								ConnectTimeout: durationpb.New(5 * time.Second),
-							},
-						},
-					},
-				},
-			},
-		}
-	}
-
-	for uid, chain := range cfgSnap.ConnectProxy.DiscoveryChain {
-		targetMap, ok := cfgSnap.ConnectProxy.PassthroughUpstreams[uid]
-		if !ok {
-			continue
-		}
-
-		for targetID := range targetMap {
-			uid := proxycfg.NewUpstreamIDFromTargetID(targetID)
-
-			sni := connect.ServiceSNI(
-				uid.Name, "", uid.NamespaceOrDefault(),
-				uid.PartitionOrDefault(), cfgSnap.Datacenter,
-				cfgSnap.Roots.TrustDomain)
-
-			// Prefixed with passthrough to distinguish from non-passthrough clusters for the same upstream.
-			name := "passthrough~" + sni
-
-			c := pbproxystate.Cluster{
-				Group: &pbproxystate.Cluster_EndpointGroup{
-					EndpointGroup: &pbproxystate.EndpointGroup{
-						Group: &pbproxystate.EndpointGroup_Passthrough{
-							Passthrough: &pbproxystate.PassthroughEndpointGroup{
-								Config: &pbproxystate.PassthroughEndpointGroupConfig{
-									ConnectTimeout: durationpb.New(5 * time.Second),
-								},
-							},
-						},
-					},
-				},
-			}
-
-			if discoTarget, ok := chain.Targets[targetID]; ok && discoTarget.ConnectTimeout > 0 {
-				c.GetEndpointGroup().GetPassthrough().GetConfig().
-					ConnectTimeout = durationpb.New(discoTarget.ConnectTimeout)
-			}
-
-			transportSocket, err := s.createOutboundMeshMTLS(cfgSnap, []string{getSpiffeID(cfgSnap, uid)}, sni)
-			if err != nil {
-				return nil, err
-			}
-			c.GetEndpointGroup().GetPassthrough().OutboundTls = transportSocket
-
-			clusters[name] = &c
-		}
-	}
-
-	err := cfgSnap.ConnectProxy.DestinationsUpstream.ForEachKeyE(func(uid proxycfg.UpstreamID) error {
-		svcConfig, ok := cfgSnap.ConnectProxy.DestinationsUpstream.Get(uid)
-		if !ok || svcConfig.Destination == nil {
-			return nil
-		}
-
-		// One Cluster per Destination Address
-		for _, address := range svcConfig.Destination.Addresses {
-			name := clusterNameForDestination(cfgSnap, uid.Name, address, uid.NamespaceOrDefault(), uid.PartitionOrDefault())
-
-			c := &pbproxystate.Cluster{
-				AltStatName: name,
-				Group: &pbproxystate.Cluster_EndpointGroup{
-					EndpointGroup: &pbproxystate.EndpointGroup{
-						Group: &pbproxystate.EndpointGroup_Dynamic{
-							Dynamic: &pbproxystate.DynamicEndpointGroup{
-								Config: &pbproxystate.DynamicEndpointGroupConfig{
-									ConnectTimeout: durationpb.New(5 * time.Second),
-									// Endpoints are managed separately by EDS
-									// Having an empty config enables outlier detection with default config.
-									OutlierDetection:      &pbproxystate.OutlierDetection{},
-									DisablePanicThreshold: true,
-								},
-							},
-						},
-					},
-				},
-			}
-			sni := connect.ServiceSNI(
-				uid.Name, "", uid.NamespaceOrDefault(),
-				uid.PartitionOrDefault(), cfgSnap.Datacenter,
-				cfgSnap.Roots.TrustDomain)
-			transportSocket, err := s.createOutboundMeshMTLS(cfgSnap, []string{getSpiffeID(cfgSnap, uid)}, sni)
-			if err != nil {
-				return err
-			}
-			c.GetEndpointGroup().GetDynamic().OutboundTls = transportSocket
-			clusters[name] = c
-		}
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return clusters, nil
-}
-
-func getSpiffeID(cfgSnap *proxycfg.ConfigSnapshot, uid proxycfg.UpstreamID) string {
-	spiffeIDService := &connect.SpiffeIDService{
-		Host:       cfgSnap.Roots.TrustDomain,
-		Partition:  uid.PartitionOrDefault(),
-		Namespace:  uid.NamespaceOrDefault(),
-		Datacenter: cfgSnap.Datacenter,
-		Service:    uid.Name,
-	}
-	return spiffeIDService.URI().String()
-}
-func clusterNameForDestination(cfgSnap *proxycfg.ConfigSnapshot, name string,
-	address string, namespace string, partition string) string {
-	name = destinationSpecificServiceName(name, address)
-	sni := connect.ServiceSNI(name, "", namespace, partition,
-		cfgSnap.Datacenter, cfgSnap.Roots.TrustDomain)
-
-	// Prefixed with destination to distinguish from non-passthrough clusters
-	// for the same upstream.
-	return "destination." + sni
-}
-
-func destinationSpecificServiceName(name string, address string) string {
-	address = strings.ReplaceAll(address, ":", "-")
-	address = strings.ReplaceAll(address, ".", "-")
-	return fmt.Sprintf("%s.%s", address, name)
-}
-
-// TODO(proxystate): Mesh Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func clustersFromSnapshotMeshGateway
-// func haveVoters
-
-// TODO(proxystate): Peering will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func makePeerServerClusters
-
-// TODO(proxystate): Terminating Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func clustersFromSnapshotTerminatingGateway
-
-// TODO(proxystate): Mesh Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func makeGatewayServiceClusters
-
-// TODO(proxystate): Cluster Peering will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func makeGatewayOutgoingClusterPeeringServiceClusters
-
-// TODO(proxystate): Terminating Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func makeDestinationClusters
-
-// TODO(proxystate): Mesh Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func injectGatewayServiceAddons
-
-// TODO(proxystate): Terminating Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func injectGatewayDestinationAddons
-
-// TODO(proxystate): Ingress Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func clustersFromSnapshotIngressGateway
-
-// TODO(proxystate): API Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func clustersFromSnapshotAPIGateway
-
-// TODO(proxystate): Ingress Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func configIngressUpstreamCluster
-
-func (s *Converter) makeAppCluster(cfgSnap *proxycfg.ConfigSnapshot, name, pathProtocol string, port int) (*namedCluster, error) {
-	var err error
-	namedCluster := &namedCluster{}
-
-	cfg, err := config.ParseProxyConfig(cfgSnap.Proxy.Config)
-	if err != nil {
-		// Don't hard fail on a config typo, just warn. The parse func returns
-		// default config if there is an error so it's safe to continue.
-		s.Logger.Warn("failed to parse Connect.Proxy.Config", "error", err)
-	}
-
-	//// If we have overridden local cluster config try to parse it into an Envoy cluster
-	//if cfg.LocalClusterJSON != "" {
-	//	return makeClusterFromUserConfig(cfg.LocalClusterJSON)
-	//}
-
-	var endpoint *pbproxystate.Endpoint
-	if cfgSnap.Proxy.LocalServiceSocketPath != "" {
-		endpoint = makeUnixSocketEndpoint(cfgSnap.Proxy.LocalServiceSocketPath)
-	} else {
-		addr := cfgSnap.Proxy.LocalServiceAddress
-		if addr == "" {
-			addr = "127.0.0.1"
-		}
-		endpoint = makeHostPortEndpoint(addr, port)
-	}
-	s.proxyState.Endpoints[name] = &pbproxystate.Endpoints{
-		Endpoints: []*pbproxystate.Endpoint{endpoint},
-	}
-
-	namedCluster.name = name
-	namedCluster.cluster = &pbproxystate.Cluster{
-		Group: &pbproxystate.Cluster_EndpointGroup{
-			EndpointGroup: &pbproxystate.EndpointGroup{
-				Group: &pbproxystate.EndpointGroup_Static{
-					Static: &pbproxystate.StaticEndpointGroup{
-						Config: &pbproxystate.StaticEndpointGroupConfig{
-							ConnectTimeout: durationpb.New(time.Duration(cfg.LocalConnectTimeoutMs) * time.Millisecond),
-						},
-					},
-				},
-			},
-		},
-	}
-
-	protocol := pathProtocol
-	if protocol == "" {
-		protocol = cfg.Protocol
-	}
-	namedCluster.cluster.Protocol = protocol
-	if cfg.MaxInboundConnections > 0 {
-		namedCluster.cluster.GetEndpointGroup().GetStatic().GetConfig().
-			CircuitBreakers = &pbproxystate.CircuitBreakers{
-			UpstreamLimits: &pbproxystate.UpstreamLimits{
-				MaxConnections: response.MakeUint32Value(cfg.MaxInboundConnections),
-			},
-		}
-	}
-
-	return namedCluster, err
-}
-
-func (s *Converter) makeUpstreamClusterForPeerService(
-	uid proxycfg.UpstreamID,
-	upstreamConfig structs.UpstreamConfig,
-	peerMeta structs.PeeringServiceMeta,
-	cfgSnap *proxycfg.ConfigSnapshot,
-) (string, *pbproxystate.Cluster, *pbproxystate.Endpoints, error) {
-	var (
-		c   *pbproxystate.Cluster
-		e   *pbproxystate.Endpoints
-		err error
-	)
-
-	// TODO(proxystate): escapeHatches will be implemented in the future
-	//if upstreamConfig.EnvoyClusterJSON != "" {
-	//	c, err = makeClusterFromUserConfig(upstreamConfig.EnvoyClusterJSON)
-	//	if err != nil {
-	//		return "", c, e, err
-	//	}
-	//	// In the happy path don't return yet as we need to inject TLS config still.
-	//}
-
-	upstreamsSnapshot, err := cfgSnap.ToConfigSnapshotUpstreams()
-
-	if err != nil {
-		return "", c, e, err
-	}
-
-	tbs, ok := upstreamsSnapshot.UpstreamPeerTrustBundles.Get(uid.Peer)
-	if !ok {
-		// this should never happen since we loop through upstreams with
-		// set trust bundles
-		return "", c, e, fmt.Errorf("trust bundle not ready for peer %s", uid.Peer)
-	}
-
-	clusterName := generatePeeredClusterName(uid, tbs)
-
-	outlierDetection := makeOutlierDetection(upstreamConfig.PassiveHealthCheck, nil, true)
-	// We can't rely on health checks for services on cluster peers because they
-	// don't take into account service resolvers, splitters and routers. Setting
-	// MaxEjectionPercent too 100% gives outlier detection the power to eject the
-	// entire cluster.
-	outlierDetection.MaxEjectionPercent = &wrapperspb.UInt32Value{Value: 100}
-
-	s.Logger.Trace("generating cluster for", "cluster", clusterName)
-	if c == nil {
-		c = &pbproxystate.Cluster{}
-
-		useEDS := true
-		if _, ok := cfgSnap.ConnectProxy.PeerUpstreamEndpointsUseHostnames[uid]; ok {
-			// If we're using local mesh gw, the fact that upstreams use hostnames don't matter.
-			// If we're not using local mesh gw, then resort to CDS.
-			if upstreamConfig.MeshGateway.Mode != structs.MeshGatewayModeLocal {
-				useEDS = false
-			}
-		}
-
-		// If none of the service instances are addressed by a hostname we
-		// provide the endpoint IP addresses via EDS
-		if useEDS {
-			d := &pbproxystate.DynamicEndpointGroup{
-				Config: &pbproxystate.DynamicEndpointGroupConfig{
-					UseAltStatName:        false,
-					ConnectTimeout:        durationpb.New(time.Duration(upstreamConfig.ConnectTimeoutMs) * time.Millisecond),
-					DisablePanicThreshold: true,
-					CircuitBreakers: &pbproxystate.CircuitBreakers{
-						UpstreamLimits: makeUpstreamLimitsIfNeeded(upstreamConfig.Limits),
-					},
-					OutlierDetection: outlierDetection,
-				},
-			}
-			c.Group = &pbproxystate.Cluster_EndpointGroup{
-				EndpointGroup: &pbproxystate.EndpointGroup{
-					Group: &pbproxystate.EndpointGroup_Dynamic{
-						Dynamic: d,
-					},
-				},
-			}
-			transportSocket := &pbproxystate.TransportSocket{
-				ConnectionTls: &pbproxystate.TransportSocket_OutboundMesh{
-					OutboundMesh: &pbproxystate.OutboundMeshMTLS{
-						ValidationContext: &pbproxystate.MeshOutboundValidationContext{
-							SpiffeIds:              peerMeta.SpiffeID,
-							TrustBundlePeerNameKey: uid.Peer,
-						},
-						Sni: peerMeta.PrimarySNI(),
-					},
-				},
-			}
-			d.OutboundTls = transportSocket
-		} else {
-			d := &pbproxystate.DNSEndpointGroup{
-				Config: &pbproxystate.DNSEndpointGroupConfig{
-					UseAltStatName:        false,
-					ConnectTimeout:        durationpb.New(time.Duration(upstreamConfig.ConnectTimeoutMs) * time.Millisecond),
-					DisablePanicThreshold: true,
-					CircuitBreakers: &pbproxystate.CircuitBreakers{
-						UpstreamLimits: makeUpstreamLimitsIfNeeded(upstreamConfig.Limits),
-					},
-					OutlierDetection: outlierDetection,
-				},
-			}
-			c.Group = &pbproxystate.Cluster_EndpointGroup{
-				EndpointGroup: &pbproxystate.EndpointGroup{
-					Group: &pbproxystate.EndpointGroup_Dns{
-						Dns: d,
-					},
-				},
-			}
-			e = &pbproxystate.Endpoints{
-				Endpoints: make([]*pbproxystate.Endpoint, 0),
-			}
-
-			ep, _ := cfgSnap.ConnectProxy.PeerUpstreamEndpoints.Get(uid)
-			configureClusterWithHostnames(
-				s.Logger,
-				d,
-				e,
-				"", /*TODO:make configurable?*/
-				ep,
-				true,  /*isRemote*/
-				false, /*onlyPassing*/
-			)
-			transportSocket := &pbproxystate.TransportSocket{
-				ConnectionTls: &pbproxystate.TransportSocket_OutboundMesh{
-					OutboundMesh: &pbproxystate.OutboundMeshMTLS{
-						ValidationContext: &pbproxystate.MeshOutboundValidationContext{
-							SpiffeIds:              peerMeta.SpiffeID,
-							TrustBundlePeerNameKey: uid.Peer,
-						},
-						Sni: peerMeta.PrimarySNI(),
-					},
-				},
-			}
-			d.OutboundTls = transportSocket
-		}
-	}
-
-	return clusterName, c, e, nil
-}
-
-func (s *Converter) makeUpstreamClusterForPreparedQuery(upstream structs.Upstream, cfgSnap *proxycfg.ConfigSnapshot) (*namedCluster, error) {
-	var c *pbproxystate.Cluster
-	var err error
-
-	uid := proxycfg.NewUpstreamID(&upstream)
-
-	dc := upstream.Datacenter
-	if dc == "" {
-		dc = cfgSnap.Datacenter
-	}
-	sni := connect.UpstreamSNI(&upstream, "", dc, cfgSnap.Roots.TrustDomain)
-
-	cfg, _ := structs.ParseUpstreamConfig(upstream.Config)
-	// TODO(proxystate): add logger and enable this
-	//if err != nil {
-	// Don't hard fail on a config typo, just warn. The parse func returns
-	// default config if there is an error so it's safe to continue.
-	//s.Logger.Warn("failed to parse", "upstream", uid, "error", err)
-	//}
-
-	// TODO(proxystate): escapeHatches will be implemented in the future
-	//if cfg.EnvoyClusterJSON != "" {
-	//	c, err = makeClusterFromUserConfig(cfg.EnvoyClusterJSON)
-	//	if err != nil {
-	//		return c, err
-	//	}
-	//	// In the happy path don't return yet as we need to inject TLS config still.
-	//}
-
-	if c == nil {
-		c = &pbproxystate.Cluster{
-			Protocol: cfg.Protocol,
-			Group: &pbproxystate.Cluster_EndpointGroup{
-				EndpointGroup: &pbproxystate.EndpointGroup{
-					Group: &pbproxystate.EndpointGroup_Dynamic{
-						Dynamic: &pbproxystate.DynamicEndpointGroup{
-							Config: &pbproxystate.DynamicEndpointGroupConfig{
-								ConnectTimeout: durationpb.New(time.Duration(cfg.ConnectTimeoutMs) * time.Millisecond),
-								// Endpoints are managed separately by EDS
-								// Having an empty config enables outlier detection with default config.
-								OutlierDetection: makeOutlierDetection(cfg.PassiveHealthCheck, nil, true),
-								CircuitBreakers: &pbproxystate.CircuitBreakers{
-									UpstreamLimits: makeUpstreamLimitsIfNeeded(cfg.Limits),
-								},
-							},
-						},
-					},
-				},
-			},
-		}
-	}
-
-	endpoints := cfgSnap.ConnectProxy.PreparedQueryEndpoints[uid]
-	var (
-		spiffeIDs = make([]string, 0)
-		seen      = make(map[string]struct{})
-	)
-	for _, e := range endpoints {
-		id := fmt.Sprintf("%s/%s", e.Node.Datacenter, e.Service.CompoundServiceName())
-		if _, ok := seen[id]; ok {
-			continue
-		}
-		seen[id] = struct{}{}
-
-		name := e.Service.Proxy.DestinationServiceName
-		if e.Service.Connect.Native {
-			name = e.Service.Service
-		}
-
-		spiffeIDs = append(spiffeIDs, connect.SpiffeIDService{
-			Host:       cfgSnap.Roots.TrustDomain,
-			Namespace:  e.Service.NamespaceOrDefault(),
-			Partition:  e.Service.PartitionOrDefault(),
-			Datacenter: e.Node.Datacenter,
-			Service:    name,
-		}.URI().String())
-	}
-
-	transportSocket, err := s.createOutboundMeshMTLS(cfgSnap, spiffeIDs, sni)
-	if err != nil {
-		return nil, err
-	}
-	c.GetEndpointGroup().GetDynamic().OutboundTls = transportSocket
-
-	return &namedCluster{name: sni, cluster: c}, nil
-}
-
-func finalizeUpstreamConfig(cfg structs.UpstreamConfig, chain *structs.CompiledDiscoveryChain, connectTimeout time.Duration) structs.UpstreamConfig {
-	if cfg.Protocol == "" {
-		cfg.Protocol = chain.Protocol
-	}
-
-	if cfg.Protocol == "" {
-		cfg.Protocol = "tcp"
-	}
-
-	if cfg.ConnectTimeoutMs == 0 {
-		cfg.ConnectTimeoutMs = int(connectTimeout / time.Millisecond)
-	}
-	return cfg
-}
-
-func (s *Converter) createOutboundMeshMTLS(cfgSnap *proxycfg.ConfigSnapshot, spiffeIDs []string, sni string) (*pbproxystate.TransportSocket, error) {
-	switch cfgSnap.Kind {
-	case structs.ServiceKindConnectProxy:
-	case structs.ServiceKindMeshGateway:
-	default:
-		return nil, fmt.Errorf("cannot inject peering trust bundles for kind %q", cfgSnap.Kind)
-	}
-
-	cfg, err := config.ParseProxyConfig(cfgSnap.Proxy.Config)
-	if err != nil {
-		// Don't hard fail on a config typo, just warn. The parse func returns
-		// default config if there is an error so it's safe to continue.
-		s.Logger.Warn("failed to parse Connect.Proxy.Config", "error", err)
-	}
-
-	// Add all trust bundle peer names, including local.
-	trustBundlePeerNames := []string{"local"}
-	for _, tb := range cfgSnap.PeeringTrustBundles() {
-		trustBundlePeerNames = append(trustBundlePeerNames, tb.PeerName)
-	}
-	// Arbitrary UUID to reference the identity by.
-	uuid, err := uuid.GenerateUUID()
-	if err != nil {
-		return nil, err
-	}
-
-	// Create the transport socket
-	ts := &pbproxystate.TransportSocket{}
-
-	ts.ConnectionTls = &pbproxystate.TransportSocket_OutboundMesh{
-		OutboundMesh: &pbproxystate.OutboundMeshMTLS{
-			IdentityKey: uuid,
-			ValidationContext: &pbproxystate.MeshOutboundValidationContext{
-				TrustBundlePeerNameKey: trustBundlePeerNames[0],
-				SpiffeIds:              spiffeIDs,
-			},
-			Sni: sni,
-		},
-	}
-	s.proxyState.LeafCertificates[uuid] = &pbproxystate.LeafCertificate{
-		Cert: cfgSnap.Leaf().CertPEM,
-		Key:  cfgSnap.Leaf().PrivateKeyPEM,
-	}
-	ts.TlsParameters = makeTLSParametersFromProxyTLSConfig(cfgSnap.MeshConfigTLSOutgoing())
-	ts.AlpnProtocols = getAlpnProtocols(cfg.Protocol)
-
-	return ts, nil
-}
-func (s *Converter) makeUpstreamClustersForDiscoveryChain(
-	uid proxycfg.UpstreamID,
-	upstream *structs.Upstream,
-	chain *structs.CompiledDiscoveryChain,
-	cfgSnap *proxycfg.ConfigSnapshot,
-	forMeshGateway bool,
-) (map[string]*pbproxystate.Cluster, error) {
-	if chain == nil {
-		return nil, fmt.Errorf("cannot create upstream cluster without discovery chain for %s", uid)
-	}
-
-	if uid.Peer != "" && forMeshGateway {
-		return nil, fmt.Errorf("impossible to get a peer discovery chain in a mesh gateway")
-	}
-
-	upstreamConfigMap := make(map[string]interface{})
-	if upstream != nil {
-		upstreamConfigMap = upstream.Config
-	}
-
-	upstreamsSnapshot, err := cfgSnap.ToConfigSnapshotUpstreams()
-
-	// Mesh gateways are exempt because upstreamsSnapshot is only used for
-	// cluster peering targets and transative failover/redirects are unsupported.
-	if err != nil && !forMeshGateway {
-		return nil, err
-	}
-
-	rawUpstreamConfig, err := structs.ParseUpstreamConfigNoDefaults(upstreamConfigMap)
-	if err != nil {
-		// Don't hard fail on a config typo, just warn. The parse func returns
-		// default config if there is an error so it's safe to continue.
-		s.Logger.Warn("failed to parse", "upstream", uid,
-			"error", err)
-	}
-
-	// TODO(proxystate): escapeHatches will be implemented in the future
-	//var escapeHatchCluster *pbproxystate.Cluster
-	//if !forMeshGateway {
-	//	if rawUpstreamConfig.EnvoyClusterJSON != "" {
-	//		if chain.Default {
-	//			// If you haven't done anything to setup the discovery chain, then
-	//			// you can use the envoy_cluster_json escape hatch.
-	//			escapeHatchCluster = &pbproxystate.Cluster{
-	//				EscapeHatchClusterJson: rawUpstreamConfig.EnvoyClusterJSON,
-	//			}
-	//		} else {
-	//			s.Logger.Warn("ignoring escape hatch setting, because a discovery chain is configured for",
-	//				"discovery chain", chain.ServiceName, "upstream", uid,
-	//				"envoy_cluster_json", chain.ServiceName)
-	//		}
-	//	}
-	//}
-
-	out := make(map[string]*pbproxystate.Cluster)
-	for _, node := range chain.Nodes {
-		switch {
-		case node == nil:
-			return nil, fmt.Errorf("impossible to process a nil node")
-		case node.Type != structs.DiscoveryGraphNodeTypeResolver:
-			continue
-		case node.Resolver == nil:
-			return nil, fmt.Errorf("impossible to process a non-resolver node")
-		}
-		// These variables are prefixed with primary to avoid shaddowing bugs.
-		primaryTargetID := node.Resolver.Target
-		primaryTarget := chain.Targets[primaryTargetID]
-		primaryTargetClusterName := s.getTargetClusterName(upstreamsSnapshot, chain, primaryTargetID, forMeshGateway)
-		if primaryTargetClusterName == "" {
-			continue
-		}
-		if forMeshGateway && !cfgSnap.Locality.Matches(primaryTarget.Datacenter, primaryTarget.Partition) {
-			s.Logger.Warn("ignoring discovery chain target that crosses a datacenter or partition boundary in a mesh gateway",
-				"target", primaryTarget,
-				"gatewayLocality", cfgSnap.Locality,
-			)
-			continue
-		}
-
-		upstreamConfig := finalizeUpstreamConfig(rawUpstreamConfig, chain, node.Resolver.ConnectTimeout)
-
-		mappedTargets, err := s.mapDiscoChainTargets(cfgSnap, chain, node, upstreamConfig, forMeshGateway)
-		if err != nil {
-			return nil, err
-		}
-
-		targetGroups, err := mappedTargets.groupedTargets()
-		if err != nil {
-			return nil, err
-		}
-
-		var failoverGroup *pbproxystate.FailoverGroup
-		endpointGroups := make([]*pbproxystate.EndpointGroup, 0)
-		if mappedTargets.failover {
-			// Create a failover group. The endpoint groups that are part of this failover group are created by the loop
-			// below.
-			failoverGroup = &pbproxystate.FailoverGroup{
-				Config: &pbproxystate.FailoverGroupConfig{
-					ConnectTimeout: durationpb.New(node.Resolver.ConnectTimeout),
-				},
-			}
-		}
-
-		// Construct the target dynamic endpoint groups. If these are not part of a failover group, they will get added
-		// directly to the map of pbproxystate.Cluster, if they are a part of a failover group, they will be added to
-		// the failover group.
-		for _, groupedTarget := range targetGroups {
-			s.Logger.Debug("generating cluster for", "cluster", groupedTarget.ClusterName)
-			dynamic := &pbproxystate.DynamicEndpointGroup{
-				Config: &pbproxystate.DynamicEndpointGroupConfig{
-					UseAltStatName: true,
-					ConnectTimeout: durationpb.New(node.Resolver.ConnectTimeout),
-					// TODO(peering): make circuit breakers or outlier detection work?
-					CircuitBreakers: &pbproxystate.CircuitBreakers{
-						UpstreamLimits: makeUpstreamLimitsIfNeeded(upstreamConfig.Limits),
-					},
-					DisablePanicThreshold: true,
-					OutlierDetection:      makeOutlierDetection(upstreamConfig.PassiveHealthCheck, nil, true),
-				},
-			}
-			ti := groupedTarget.Targets[0]
-			transportSocket, err := s.createOutboundMeshMTLS(cfgSnap, ti.SpiffeIDs, ti.SNI)
-			if err != nil {
-				return nil, err
-			}
-			dynamic.OutboundTls = transportSocket
-
-			var lb *structs.LoadBalancer
-			if node.LoadBalancer != nil {
-				lb = node.LoadBalancer
-			}
-			if err := injectLBToCluster(lb, dynamic.Config); err != nil {
-				return nil, fmt.Errorf("failed to apply load balancer configuration to cluster %q: %v", groupedTarget.ClusterName, err)
-			}
-
-			// TODO: IR: http2 options not currently supported
-			//if upstreamConfig.Protocol == "http2" || upstreamConfig.Protocol == "grpc" {
-			//	if err := s.setHttp2ProtocolOptions(c); err != nil {
-			//		return nil, err
-			//	}
-			//}
-
-			switch len(groupedTarget.Targets) {
-			case 0:
-				continue
-			case 1:
-				// We expect one target so this passes through to continue setting the cluster up.
-			default:
-				return nil, fmt.Errorf("cannot have more than one target")
-			}
-
-			if targetInfo := groupedTarget.Targets[0]; targetInfo.TransportSocket != nil {
-				dynamic.OutboundTls = targetInfo.TransportSocket
-			}
-
-			// If the endpoint group is part of a failover group, add it to the failover group. Otherwise add it
-			// directly to the clusters.
-			if failoverGroup != nil {
-				eg := &pbproxystate.EndpointGroup{
-					Group: &pbproxystate.EndpointGroup_Dynamic{
-						Dynamic: dynamic,
-					},
-				}
-				endpointGroups = append(endpointGroups, eg)
-			} else {
-				cluster := &pbproxystate.Cluster{
-					AltStatName: mappedTargets.baseClusterName,
-					Protocol:    upstreamConfig.Protocol,
-					Group: &pbproxystate.Cluster_EndpointGroup{
-						EndpointGroup: &pbproxystate.EndpointGroup{
-							Group: &pbproxystate.EndpointGroup_Dynamic{
-								Dynamic: dynamic,
-							},
-						},
-					},
-				}
-
-				out[mappedTargets.baseClusterName] = cluster
-			}
-		}
-
-		// If there's a failover group, we only add the failover group to the top level list of clusters. Its endpoint
-		// groups are inlined.
-		if failoverGroup != nil {
-			failoverGroup.EndpointGroups = endpointGroups
-			cluster := &pbproxystate.Cluster{
-				AltStatName: mappedTargets.baseClusterName,
-				Protocol:    upstreamConfig.Protocol,
-				Group: &pbproxystate.Cluster_FailoverGroup{
-					FailoverGroup: failoverGroup,
-				},
-			}
-			out[mappedTargets.baseClusterName] = cluster
-		}
-	}
-
-	//if escapeHatchCluster != nil {
-	//	if len(out) != 1 {
-	//		return nil, fmt.Errorf("cannot inject escape hatch cluster when discovery chain had no nodes")
-	//	}
-	//	var defaultCluster *pbproxystate.Cluster
-	//	for _, k := range out {
-	//		defaultCluster = k
-	//		break
-	//	}
-	//
-	//	// Overlay what the user provided.
-	//	escapeHatchCluster.GetEndpointGroup().GetDynamic().OutboundTls.ConnectionTls =
-	//		defaultCluster.GetEndpointGroup().GetDynamic().OutboundTls.ConnectionTls
-	//
-	//	out = append(out, escapeHatchCluster)
-	//}
-
-	return out, nil
-}
-
-// TODO(proxystate): Mesh Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func makeExportedUpstreamClustersForMeshGateway
-
-// makeClusterFromUserConfig returns the listener config decoded from an
-// arbitrary proto3 json format string or an error if it's invalid.
-//
-// For now we only support embedding in JSON strings because of the hcl parsing
-// pain (see Background section in the comment for decode.HookWeakDecodeFromSlice).
-// This may be fixed in decode.HookWeakDecodeFromSlice in the future.
-//
-// When we do that we can support just nesting the config directly into the
-// JSON/hcl naturally but this is a stop-gap that gets us an escape hatch
-// immediately. It's also probably not a bad thing to support long-term since
-// any config generated by other systems will likely be in canonical protobuf
-// from rather than our slight variant in JSON/hcl.
-
-// TODO(proxystate): Mesh and Terminating Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func makeGatewayCluster
-
-func configureClusterWithHostnames(
-	logger hclog.Logger,
-	dnsEndpointGroup *pbproxystate.DNSEndpointGroup,
-	endpointList *pbproxystate.Endpoints,
-	dnsDiscoveryType string,
-	// hostnameEndpoints is a list of endpoints with a hostname as their address
-	hostnameEndpoints structs.CheckServiceNodes,
-	// isRemote determines whether the cluster is in a remote DC or partition and we should prefer a WAN address
-	isRemote bool,
-	// onlyPassing determines whether endpoints that do not have a passing status should be considered unhealthy
-	onlyPassing bool,
-) {
-	// When a service instance is addressed by a hostname we have Envoy do the DNS resolution
-	// by setting a DNS cluster type and passing the hostname endpoints via CDS.
-	if dnsEndpointGroup.Config == nil {
-		dnsEndpointGroup.Config = &pbproxystate.DNSEndpointGroupConfig{}
-	}
-	dnsEndpointGroup.Config.DiscoveryType = pbproxystate.DiscoveryType_DISCOVERY_TYPE_LOGICAL
-	if dnsDiscoveryType == "strict_dns" {
-		dnsEndpointGroup.Config.DiscoveryType = pbproxystate.DiscoveryType_DISCOVERY_TYPE_STRICT
-	}
-
-	endpoints := make([]*envoy_endpoint_v3.LbEndpoint, 0, 1)
-	uniqueHostnames := make(map[string]bool)
-
-	var (
-		hostname string
-		idx      int
-		fallback *pbproxystate.Endpoint
-	)
-	for i, e := range hostnameEndpoints {
-		_, addr, port := e.BestAddress(isRemote)
-		uniqueHostnames[addr] = true
-
-		health, weight := calculateEndpointHealthAndWeight(e, onlyPassing)
-		if health == pbproxystate.HealthStatus_HEALTH_STATUS_UNHEALTHY {
-			fallback = makeLbEndpoint(addr, port, health, weight)
-			continue
-		}
-
-		if len(endpoints) == 0 {
-			endpointList.Endpoints = append(endpointList.Endpoints, makeLbEndpoint(addr, port, health, weight))
-
-			hostname = addr
-			idx = i
-			break
-		}
-	}
-
-	dc := hostnameEndpoints[idx].Node.Datacenter
-	service := hostnameEndpoints[idx].Service.CompoundServiceName()
-
-	// Fall back to last unhealthy endpoint if none were healthy
-	if len(endpoints) == 0 {
-		logger.Warn("upstream service does not contain any healthy instances",
-			"dc", dc, "service", service.String())
-
-		//endpoints = append(endpoints, fallback)
-		endpointList.Endpoints = append(endpointList.Endpoints, fallback)
-	}
-	if len(uniqueHostnames) > 1 {
-		logger.Warn(fmt.Sprintf("service contains instances with more than one unique hostname; only %q be resolved by Envoy", hostname),
-			"dc", dc, "service", service.String())
-	}
-
-}
-
-// TODO(proxystate): Terminating Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func makeExternalIPCluster
-
-// TODO(proxystate): Terminating Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func makeExternalHostnameCluster
-
-func makeUpstreamLimitsIfNeeded(limits *structs.UpstreamLimits) *pbproxystate.UpstreamLimits {
-	if limits == nil {
-		return nil
-	}
-
-	upstreamLimits := &pbproxystate.UpstreamLimits{}
-
-	// Likewise, make sure to not set any threshold values on the zero-value in
-	// order to rely on Envoy defaults
-	if limits.MaxConnections != nil {
-		upstreamLimits.MaxConnections = response.MakeUint32Value(*limits.MaxConnections)
-	}
-	if limits.MaxPendingRequests != nil {
-		upstreamLimits.MaxPendingRequests = response.MakeUint32Value(*limits.MaxPendingRequests)
-	}
-	if limits.MaxConcurrentRequests != nil {
-		upstreamLimits.MaxConcurrentRequests = response.MakeUint32Value(*limits.MaxConcurrentRequests)
-	}
-
-	return upstreamLimits
-}
-
-func injectLBToCluster(ec *structs.LoadBalancer, dc *pbproxystate.DynamicEndpointGroupConfig) error {
-	if ec == nil {
-		return nil
-	}
-
-	switch ec.Policy {
-	case "":
-		return nil
-	case structs.LBPolicyLeastRequest:
-		lr := &pbproxystate.DynamicEndpointGroupConfig_LeastRequest{
-			LeastRequest: &pbproxystate.LBPolicyLeastRequest{},
-		}
-
-		dc.LbPolicy = lr
-
-		if ec.LeastRequestConfig != nil {
-			lr.LeastRequest.ChoiceCount = &wrapperspb.UInt32Value{Value: ec.LeastRequestConfig.ChoiceCount}
-		}
-	case structs.LBPolicyRoundRobin:
-		dc.LbPolicy = &pbproxystate.DynamicEndpointGroupConfig_RoundRobin{
-			RoundRobin: &pbproxystate.LBPolicyRoundRobin{},
-		}
-
-	case structs.LBPolicyRandom:
-		dc.LbPolicy = &pbproxystate.DynamicEndpointGroupConfig_Random{
-			Random: &pbproxystate.LBPolicyRandom{},
-		}
-
-	case structs.LBPolicyRingHash:
-		rh := &pbproxystate.DynamicEndpointGroupConfig_RingHash{
-			RingHash: &pbproxystate.LBPolicyRingHash{},
-		}
-
-		dc.LbPolicy = rh
-
-		if ec.RingHashConfig != nil {
-			rh.RingHash.MinimumRingSize = &wrapperspb.UInt64Value{Value: ec.RingHashConfig.MinimumRingSize}
-			rh.RingHash.MaximumRingSize = &wrapperspb.UInt64Value{Value: ec.RingHashConfig.MaximumRingSize}
-		}
-	case structs.LBPolicyMaglev:
-		dc.LbPolicy = &pbproxystate.DynamicEndpointGroupConfig_Maglev{
-			Maglev: &pbproxystate.LBPolicyMaglev{},
-		}
-
-	default:
-		return fmt.Errorf("unsupported load balancer policy %q", ec.Policy)
-	}
-	return nil
-}
-
-// generatePeeredClusterName returns an SNI-like cluster name which mimics PeeredServiceSNI
-// but excludes partition information which could be ambiguous (local vs remote partition).
-func generatePeeredClusterName(uid proxycfg.UpstreamID, tb *pbpeering.PeeringTrustBundle) string {
-	return strings.Join([]string{
-		uid.Name,
-		uid.NamespaceOrDefault(),
-		uid.Peer,
-		"external",
-		tb.TrustDomain,
-	}, ".")
-}
-
-func (s *Converter) getTargetClusterName(upstreamsSnapshot *proxycfg.ConfigSnapshotUpstreams, chain *structs.CompiledDiscoveryChain, tid string, forMeshGateway bool) string {
-	target := chain.Targets[tid]
-	clusterName := target.Name
-	targetUID := proxycfg.NewUpstreamIDFromTargetID(tid)
-	if targetUID.Peer != "" {
-		tbs, ok := upstreamsSnapshot.UpstreamPeerTrustBundles.Get(targetUID.Peer)
-		// We can't generate cluster on peers without the trust bundle. The
-		// trust bundle should be ready soon.
-		if !ok {
-			s.Logger.Debug("peer trust bundle not ready for discovery chain target",
-				"peer", targetUID.Peer,
-				"target", tid,
-			)
-			return ""
-		}
-
-		clusterName = generatePeeredClusterName(targetUID, tbs)
-	}
-	clusterName = naming.CustomizeClusterName(clusterName, chain)
-	if forMeshGateway {
-		clusterName = meshGatewayExportedClusterNamePrefix + clusterName
-	}
-	return clusterName
-}
-
-// Return an pbproxystate.OutlierDetection populated by the values from structs.PassiveHealthCheck.
-// If all values are zero a default empty OutlierDetection will be returned to
-// enable outlier detection with default values.
-//   - If override is not nil, it will overwrite the values from p, e.g., ingress gateway defaults
-//   - allowZero is added to handle the legacy case where connect-proxy and mesh gateway can set 0
-//     for EnforcingConsecutive5xx. Due to the definition of proto of PassiveHealthCheck, ingress
-//     gateway's EnforcingConsecutive5xx must be > 0.
-func makeOutlierDetection(p *structs.PassiveHealthCheck, override *structs.PassiveHealthCheck, allowZero bool) *pbproxystate.OutlierDetection {
-	od := &pbproxystate.OutlierDetection{}
-	if p != nil {
-
-		if p.Interval != 0 {
-			od.Interval = durationpb.New(p.Interval)
-		}
-		if p.MaxFailures != 0 {
-			od.Consecutive_5Xx = &wrapperspb.UInt32Value{Value: p.MaxFailures}
-		}
-
-		if p.EnforcingConsecutive5xx != nil {
-			// NOTE: EnforcingConsecutive5xx must be greater than 0 for ingress-gateway
-			if *p.EnforcingConsecutive5xx != 0 {
-				od.EnforcingConsecutive_5Xx = &wrapperspb.UInt32Value{Value: *p.EnforcingConsecutive5xx}
-			} else if allowZero {
-				od.EnforcingConsecutive_5Xx = &wrapperspb.UInt32Value{Value: *p.EnforcingConsecutive5xx}
-			}
-		}
-
-		if p.MaxEjectionPercent != nil {
-			od.MaxEjectionPercent = &wrapperspb.UInt32Value{Value: *p.MaxEjectionPercent}
-		}
-		if p.BaseEjectionTime != nil {
-			od.BaseEjectionTime = durationpb.New(*p.BaseEjectionTime)
-		}
-	}
-
-	if override == nil {
-		return od
-	}
-
-	// override the default outlier detection value
-	if override.Interval != 0 {
-		od.Interval = durationpb.New(override.Interval)
-	}
-	if override.MaxFailures != 0 {
-		od.Consecutive_5Xx = &wrapperspb.UInt32Value{Value: override.MaxFailures}
-	}
-
-	if override.EnforcingConsecutive5xx != nil {
-		// NOTE: EnforcingConsecutive5xx must be great than 0 for ingress-gateway
-		if *override.EnforcingConsecutive5xx != 0 {
-			od.EnforcingConsecutive_5Xx = &wrapperspb.UInt32Value{Value: *override.EnforcingConsecutive5xx}
-		}
-		// Because only ingress gateways have overrides and they cannot have a value of 0, there is no allowZero
-		// override case to handle
-	}
-
-	if override.MaxEjectionPercent != nil {
-		od.MaxEjectionPercent = &wrapperspb.UInt32Value{Value: *override.MaxEjectionPercent}
-	}
-	if override.BaseEjectionTime != nil {
-		od.BaseEjectionTime = durationpb.New(*override.BaseEjectionTime)
-	}
-
-	return od
-}
diff --git a/agent/xds/proxystateconverter/converter.go b/agent/xds/proxystateconverter/converter.go
deleted file mode 100644
index 4c31127400d2a..0000000000000
--- a/agent/xds/proxystateconverter/converter.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxystateconverter
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/go-hclog"
-
-	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xds/configfetcher"
-	proxytracker "github.com/hashicorp/consul/internal/mesh/proxy-tracker"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-)
-
-// Converter converts a single snapshot into a ProxyState.
-type Converter struct {
-	Logger     hclog.Logger
-	CfgFetcher configfetcher.ConfigFetcher
-	proxyState *proxytracker.ProxyState
-}
-
-func NewConverter(
-	logger hclog.Logger,
-	cfgFetcher configfetcher.ConfigFetcher,
-) *Converter {
-	return &Converter{
-		Logger:     logger,
-		CfgFetcher: cfgFetcher,
-		proxyState: &proxytracker.ProxyState{
-			ProxyState: &pbmesh.ProxyState{
-				Listeners: make([]*pbproxystate.Listener, 0),
-				Clusters:  make(map[string]*pbproxystate.Cluster),
-				Routes:    make(map[string]*pbproxystate.Route),
-				Endpoints: make(map[string]*pbproxystate.Endpoints),
-			},
-		},
-	}
-}
-
-func (g *Converter) ProxyStateFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) (*proxytracker.ProxyState, error) {
-	err := g.resourcesFromSnapshot(cfgSnap)
-	if err != nil {
-		return nil, fmt.Errorf("failed to generate FullProxyState: %v", err)
-	}
-
-	return g.proxyState, nil
-}
-
-func (g *Converter) resourcesFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) error {
-	err := g.tlsConfigFromSnapshot(cfgSnap)
-	if err != nil {
-		return err
-	}
-
-	err = g.listenersFromSnapshot(cfgSnap)
-	if err != nil {
-		return err
-	}
-
-	err = g.endpointsFromSnapshot(cfgSnap)
-	if err != nil {
-		return err
-	}
-	err = g.clustersFromSnapshot(cfgSnap)
-	if err != nil {
-		return err
-	}
-	err = g.routesFromSnapshot(cfgSnap)
-	if err != nil {
-		return err
-	}
-
-	//g.secretsFromSnapshot(cfgSnap)
-	return nil
-}
-
-const localPeerKey = "local"
-
-func (g *Converter) tlsConfigFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) error {
-	proxyStateTLS := &pbproxystate.TLS{}
-	g.proxyState.TrustBundles = make(map[string]*pbproxystate.TrustBundle)
-	g.proxyState.LeafCertificates = make(map[string]*pbproxystate.LeafCertificate)
-
-	// Set the TLS in the top level proxyState
-	g.proxyState.Tls = proxyStateTLS
-
-	// Add local trust bundle
-	g.proxyState.TrustBundles[localPeerKey] = &pbproxystate.TrustBundle{
-		TrustDomain: cfgSnap.Roots.TrustDomain,
-		Roots:       []string{cfgSnap.RootPEMs()},
-	}
-
-	// Add peered trust bundles for remote peers that will dial this proxy.
-	for _, peeringTrustBundle := range cfgSnap.PeeringTrustBundles() {
-		g.proxyState.TrustBundles[peeringTrustBundle.PeerName] = &pbproxystate.TrustBundle{
-			TrustDomain: peeringTrustBundle.GetTrustDomain(),
-			Roots:       peeringTrustBundle.RootPEMs,
-		}
-	}
-
-	// Add upstream peer trust bundles for dialing upstreams in remote peers.
-	upstreamsSnapshot, err := cfgSnap.ToConfigSnapshotUpstreams()
-	if err != nil {
-		if !(cfgSnap.Kind == structs.ServiceKindMeshGateway || cfgSnap.Kind == structs.ServiceKindTerminatingGateway) {
-			return err
-		}
-	}
-	if upstreamsSnapshot != nil {
-		upstreamsSnapshot.UpstreamPeerTrustBundles.ForEachKeyE(func(k proxycfg.PeerName) error {
-			tbs, ok := upstreamsSnapshot.UpstreamPeerTrustBundles.Get(k)
-			if ok {
-				g.proxyState.TrustBundles[k] = &pbproxystate.TrustBundle{
-					TrustDomain: tbs.TrustDomain,
-					Roots:       tbs.RootPEMs,
-				}
-			}
-			return nil
-		})
-	}
-
-	if cfgSnap.MeshConfigTLSOutgoing() != nil {
-		proxyStateTLS.OutboundTlsParameters = makeTLSParametersFromTLSConfig(cfgSnap.MeshConfigTLSOutgoing().TLSMinVersion,
-			cfgSnap.MeshConfigTLSOutgoing().TLSMaxVersion, cfgSnap.MeshConfigTLSOutgoing().CipherSuites)
-	}
-
-	if cfgSnap.MeshConfigTLSIncoming() != nil {
-		proxyStateTLS.InboundTlsParameters = makeTLSParametersFromTLSConfig(cfgSnap.MeshConfigTLSIncoming().TLSMinVersion,
-			cfgSnap.MeshConfigTLSIncoming().TLSMaxVersion, cfgSnap.MeshConfigTLSIncoming().CipherSuites)
-	}
-
-	return nil
-}
diff --git a/agent/xds/proxystateconverter/endpoints.go b/agent/xds/proxystateconverter/endpoints.go
deleted file mode 100644
index 2ed7164316c18..0000000000000
--- a/agent/xds/proxystateconverter/endpoints.go
+++ /dev/null
@@ -1,671 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxystateconverter
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xds/response"
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/go-bexpr"
-
-	"google.golang.org/protobuf/types/known/wrapperspb"
-)
-
-func makeLbEndpoint(addr string, port int, health pbproxystate.HealthStatus, weight int) *pbproxystate.Endpoint {
-	ep := &pbproxystate.Endpoint{
-		Address: &pbproxystate.Endpoint_HostPort{
-			HostPort: &pbproxystate.HostPortAddress{
-				Host: addr,
-				Port: uint32(port),
-			},
-		},
-	}
-	ep.HealthStatus = health
-	ep.LoadBalancingWeight = &wrapperspb.UInt32Value{Value: uint32(weight)}
-	return ep
-}
-
-// endpointsFromSnapshot returns the mesh API representation of the "routes" in the snapshot.
-func (s *Converter) endpointsFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) error {
-
-	if cfgSnap == nil {
-		return errors.New("nil config given")
-	}
-
-	switch cfgSnap.Kind {
-	case structs.ServiceKindConnectProxy:
-		return s.endpointsFromSnapshotConnectProxy(cfgSnap)
-	//case structs.ServiceKindTerminatingGateway:
-	//	return s.endpointsFromSnapshotTerminatingGateway(cfgSnap)
-	//case structs.ServiceKindMeshGateway:
-	//	return s.endpointsFromSnapshotMeshGateway(cfgSnap)
-	//case structs.ServiceKindIngressGateway:
-	//	return s.endpointsFromSnapshotIngressGateway(cfgSnap)
-	//case structs.ServiceKindAPIGateway:
-	//	return s.endpointsFromSnapshotAPIGateway(cfgSnap)
-	default:
-		return fmt.Errorf("Invalid service kind: %v", cfgSnap.Kind)
-	}
-}
-
-// endpointsFromSnapshotConnectProxy returns the xDS API representation of the "endpoints"
-// (upstream instances) in the snapshot.
-func (s *Converter) endpointsFromSnapshotConnectProxy(cfgSnap *proxycfg.ConfigSnapshot) error {
-	eps := make(map[string]*pbproxystate.Endpoints)
-
-	// NOTE: Any time we skip a chain below we MUST also skip that discovery chain in clusters.go
-	// so that the sets of endpoints generated matches the sets of clusters.
-	for uid, chain := range cfgSnap.ConnectProxy.DiscoveryChain {
-		upstream, skip := cfgSnap.ConnectProxy.GetUpstream(uid, &cfgSnap.ProxyID.EnterpriseMeta)
-		if skip {
-			// Discovery chain is not associated with a known explicit or implicit upstream so it is skipped.
-			continue
-		}
-
-		var upstreamConfigMap map[string]interface{}
-		if upstream != nil {
-			upstreamConfigMap = upstream.Config
-		}
-
-		es, err := s.endpointsFromDiscoveryChain(
-			uid,
-			chain,
-			cfgSnap,
-			cfgSnap.Locality,
-			upstreamConfigMap,
-			cfgSnap.ConnectProxy.WatchedUpstreamEndpoints[uid],
-			cfgSnap.ConnectProxy.WatchedGatewayEndpoints[uid],
-			false,
-		)
-		if err != nil {
-			return err
-		}
-
-		for clusterName, endpoints := range es {
-			eps[clusterName] = &pbproxystate.Endpoints{
-				Endpoints: endpoints,
-			}
-
-		}
-	}
-
-	// NOTE: Any time we skip an upstream below we MUST also skip that same
-	// upstream in clusters.go so that the sets of endpoints generated matches
-	// the sets of clusters.
-	for _, uid := range cfgSnap.ConnectProxy.PeeredUpstreamIDs() {
-		upstream, skip := cfgSnap.ConnectProxy.GetUpstream(uid, &cfgSnap.ProxyID.EnterpriseMeta)
-		if skip {
-			// Discovery chain is not associated with a known explicit or implicit upstream so it is skipped.
-			continue
-		}
-
-		tbs, ok := cfgSnap.ConnectProxy.UpstreamPeerTrustBundles.Get(uid.Peer)
-		if !ok {
-			// this should never happen since we loop through upstreams with
-			// set trust bundles
-			return fmt.Errorf("trust bundle not ready for peer %s", uid.Peer)
-		}
-
-		clusterName := generatePeeredClusterName(uid, tbs)
-
-		mgwMode := structs.MeshGatewayModeDefault
-		if upstream != nil {
-			mgwMode = upstream.MeshGateway.Mode
-		}
-		peerServiceEndpoints, err := s.makeEndpointsForPeerService(cfgSnap, uid, mgwMode)
-		if err != nil {
-			return err
-		}
-
-		if peerServiceEndpoints != nil {
-			pbEndpoints := &pbproxystate.Endpoints{
-				Endpoints: peerServiceEndpoints,
-			}
-
-			eps[clusterName] = pbEndpoints
-		}
-	}
-
-	// Looping over explicit upstreams is only needed for prepared queries because they do not have discovery chains
-	for _, u := range cfgSnap.Proxy.Upstreams {
-		if u.DestinationType != structs.UpstreamDestTypePreparedQuery {
-			continue
-		}
-		uid := proxycfg.NewUpstreamID(&u)
-
-		dc := u.Datacenter
-		if dc == "" {
-			dc = cfgSnap.Datacenter
-		}
-		clusterName := connect.UpstreamSNI(&u, "", dc, cfgSnap.Roots.TrustDomain)
-
-		endpoints, ok := cfgSnap.ConnectProxy.PreparedQueryEndpoints[uid]
-		if ok {
-			epts := makeEndpointsForLoadAssignment(
-				cfgSnap,
-				nil,
-				[]loadAssignmentEndpointGroup{
-					{Endpoints: endpoints},
-				},
-				cfgSnap.Locality,
-			)
-			pbEndpoints := &pbproxystate.Endpoints{
-				Endpoints: epts,
-			}
-
-			eps[clusterName] = pbEndpoints
-		}
-	}
-
-	// Loop over potential destinations in the mesh, then grab the gateway nodes associated with each
-	cfgSnap.ConnectProxy.DestinationsUpstream.ForEachKey(func(uid proxycfg.UpstreamID) bool {
-		svcConfig, ok := cfgSnap.ConnectProxy.DestinationsUpstream.Get(uid)
-		if !ok || svcConfig.Destination == nil {
-			return true
-		}
-
-		for _, address := range svcConfig.Destination.Addresses {
-			clusterName := clusterNameForDestination(cfgSnap, uid.Name, address, uid.NamespaceOrDefault(), uid.PartitionOrDefault())
-
-			endpoints, ok := cfgSnap.ConnectProxy.DestinationGateways.Get(uid)
-			if ok {
-				epts := makeEndpointsForLoadAssignment(
-					cfgSnap,
-					nil,
-					[]loadAssignmentEndpointGroup{
-						{Endpoints: endpoints},
-					},
-					proxycfg.GatewayKey{ /*empty so it never matches*/ },
-				)
-				pbEndpoints := &pbproxystate.Endpoints{
-					Endpoints: epts,
-				}
-				eps[clusterName] = pbEndpoints
-			}
-		}
-
-		return true
-	})
-
-	s.proxyState.Endpoints = eps
-	return nil
-}
-
-func (s *Converter) makeEndpointsForPeerService(
-	cfgSnap *proxycfg.ConfigSnapshot,
-	uid proxycfg.UpstreamID,
-	upstreamGatewayMode structs.MeshGatewayMode,
-) ([]*pbproxystate.Endpoint, error) {
-	var eps []*pbproxystate.Endpoint
-
-	upstreamsSnapshot, err := cfgSnap.ToConfigSnapshotUpstreams()
-	if err != nil {
-		return eps, err
-	}
-
-	if upstreamGatewayMode == structs.MeshGatewayModeNone {
-		s.Logger.Warn(fmt.Sprintf("invalid mesh gateway mode 'none', defaulting to 'remote' for %q", uid))
-	}
-
-	// If an upstream is configured with local mesh gw mode, we make a load assignment
-	// from the gateway endpoints instead of those of the upstreams.
-	if upstreamGatewayMode == structs.MeshGatewayModeLocal {
-		localGw, ok := cfgSnap.ConnectProxy.WatchedLocalGWEndpoints.Get(cfgSnap.Locality.String())
-		if !ok {
-			// local GW is not ready; return early
-			return eps, nil
-		}
-		eps = makeEndpointsForLoadAssignment(
-			cfgSnap,
-			nil,
-			[]loadAssignmentEndpointGroup{
-				{Endpoints: localGw},
-			},
-			cfgSnap.Locality,
-		)
-		return eps, nil
-	}
-
-	// Also skip peer instances with a hostname as their address. EDS
-	// cannot resolve hostnames, so we provide them through CDS instead.
-	if _, ok := upstreamsSnapshot.PeerUpstreamEndpointsUseHostnames[uid]; ok {
-		return eps, nil
-	}
-
-	endpoints, ok := upstreamsSnapshot.PeerUpstreamEndpoints.Get(uid)
-	if !ok {
-		return nil, nil
-	}
-	eps = makeEndpointsForLoadAssignment(
-		cfgSnap,
-		nil,
-		[]loadAssignmentEndpointGroup{
-			{Endpoints: endpoints},
-		},
-		proxycfg.GatewayKey{ /*empty so it never matches*/ },
-	)
-	return eps, nil
-}
-
-func (s *Converter) filterSubsetEndpoints(subset *structs.ServiceResolverSubset, endpoints structs.CheckServiceNodes) (structs.CheckServiceNodes, error) {
-	// locally execute the subsets filter
-	if subset.Filter != "" {
-		filter, err := bexpr.CreateFilter(subset.Filter, nil, endpoints)
-		if err != nil {
-			return nil, err
-		}
-
-		raw, err := filter.Execute(endpoints)
-		if err != nil {
-			return nil, err
-		}
-		return raw.(structs.CheckServiceNodes), nil
-	}
-	return endpoints, nil
-}
-
-// TODO(proxystate): Terminating Gateway will be added in the future.
-// Functions to add from agent/xds/endpoints.go:
-// func endpointsFromSnapshotTerminatingGateway
-
-// TODO(proxystate): Mesh Gateway will be added in the future.
-// Functions to add from agent/xds/endpoints.go:
-// func endpointsFromSnapshotMeshGateway
-
-// TODO(proxystate): Cluster Peering will be added in the future.
-// Functions to add from agent/xds/endpoints.go:
-// func makeEndpointsForOutgoingPeeredServices
-
-// TODO(proxystate): Mesh Gateway will be added in the future.
-// Functions to add from agent/xds/endpoints.go:
-// func endpointsFromServicesAndResolvers
-
-// TODO(proxystate): Mesh Gateway will be added in the future.
-// Functions to add from agent/xds/endpoints.go:
-// func makePeerServerEndpointsForMeshGateway
-
-// TODO(proxystate): Ingress Gateway will be added in the future.
-// Functions to add from agent/xds/endpoints.go:
-// func endpointsFromSnapshotIngressGateway
-
-// TODO(proxystate): API Gateway will be added in the future.
-// Functions to add from agent/xds/endpoints.go:
-// func endpointsFromSnapshotAPIGateway
-
-// used in clusters.go
-func makeHostPortEndpoint(host string, port int) *pbproxystate.Endpoint {
-	return &pbproxystate.Endpoint{
-		Address: &pbproxystate.Endpoint_HostPort{
-			HostPort: &pbproxystate.HostPortAddress{
-				Host: host,
-				Port: uint32(port),
-			},
-		},
-	}
-}
-
-func makeUnixSocketEndpoint(path string) *pbproxystate.Endpoint {
-	return &pbproxystate.Endpoint{
-		Address: &pbproxystate.Endpoint_UnixSocket{
-			UnixSocket: &pbproxystate.UnixSocketAddress{
-				Path: path,
-				// envoy's mode is particular to a pipe address and is uint32.
-				// it also says "The mode for the Pipe. Not applicable for abstract sockets."
-				// https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/address.proto#config-core-v3-pipe
-				Mode: "0",
-			},
-		},
-	}
-}
-
-func (s *Converter) makeUpstreamLoadAssignmentEndpointForPeerService(
-	cfgSnap *proxycfg.ConfigSnapshot,
-	uid proxycfg.UpstreamID,
-	upstreamGatewayMode structs.MeshGatewayMode,
-) ([]*pbproxystate.Endpoint, error) {
-	var eps []*pbproxystate.Endpoint
-
-	upstreamsSnapshot, err := cfgSnap.ToConfigSnapshotUpstreams()
-	if err != nil {
-		return eps, err
-	}
-
-	if upstreamGatewayMode == structs.MeshGatewayModeNone {
-		s.Logger.Warn(fmt.Sprintf("invalid mesh gateway mode 'none', defaulting to 'remote' for %q", uid))
-	}
-
-	// If an upstream is configured with local mesh gw mode, we make a load assignment
-	// from the gateway endpoints instead of those of the upstreams.
-	if upstreamGatewayMode == structs.MeshGatewayModeLocal {
-		localGw, ok := cfgSnap.ConnectProxy.WatchedLocalGWEndpoints.Get(cfgSnap.Locality.String())
-		if !ok {
-			// local GW is not ready; return early
-			return eps, nil
-		}
-		eps = makeEndpointsForLoadAssignment(
-			cfgSnap,
-			nil,
-			[]loadAssignmentEndpointGroup{
-				{Endpoints: localGw},
-			},
-			cfgSnap.Locality,
-		)
-		return eps, nil
-	}
-
-	// Also skip peer instances with a hostname as their address. EDS
-	// cannot resolve hostnames, so we provide them through CDS instead.
-	if _, ok := upstreamsSnapshot.PeerUpstreamEndpointsUseHostnames[uid]; ok {
-		return eps, nil
-	}
-
-	endpoints, ok := upstreamsSnapshot.PeerUpstreamEndpoints.Get(uid)
-	if !ok {
-		return nil, nil
-	}
-	eps = makeEndpointsForLoadAssignment(
-		cfgSnap,
-		nil,
-		[]loadAssignmentEndpointGroup{
-			{Endpoints: endpoints},
-		},
-		proxycfg.GatewayKey{ /*empty so it never matches*/ },
-	)
-	return eps, nil
-}
-
-func (s *Converter) endpointsFromDiscoveryChain(
-	uid proxycfg.UpstreamID,
-	chain *structs.CompiledDiscoveryChain,
-	cfgSnap *proxycfg.ConfigSnapshot,
-	gatewayKey proxycfg.GatewayKey,
-	upstreamConfigMap map[string]interface{},
-	upstreamEndpoints map[string]structs.CheckServiceNodes,
-	gatewayEndpoints map[string]structs.CheckServiceNodes,
-	forMeshGateway bool,
-) (map[string][]*pbproxystate.Endpoint, error) {
-	if chain == nil {
-		if forMeshGateway {
-			return nil, fmt.Errorf("missing discovery chain for %s", uid)
-		}
-		return nil, nil
-	}
-
-	if upstreamConfigMap == nil {
-		upstreamConfigMap = make(map[string]interface{}) // TODO:needed?
-	}
-
-	clusterEndpoints := make(map[string][]*pbproxystate.Endpoint)
-
-	// TODO(proxystate): escape hatches will be implemented in the future
-	//var escapeHatchCluster *pbproxystate.Cluster
-	//if !forMeshGateway {
-
-	//cfg, err := structs.ParseUpstreamConfigNoDefaults(upstreamConfigMap)
-	//if err != nil {
-	//	// Don't hard fail on a config typo, just warn. The parse func returns
-	//	// default config if there is an error so it's safe to continue.
-	//	s.Logger.Warn("failed to parse", "upstream", uid,
-	//		"error", err)
-	//}
-
-	//if cfg.EnvoyClusterJSON != "" {
-	//	if chain.Default {
-	//		// If you haven't done anything to setup the discovery chain, then
-	//		// you can use the envoy_cluster_json escape hatch.
-	//		escapeHatchCluster, err = makeClusterFromUserConfig(cfg.EnvoyClusterJSON)
-	//		if err != nil {
-	//			return ce, nil
-	//		}
-	//	} else {
-	//		s.Logger.Warn("ignoring escape hatch setting, because a discovery chain is configued for",
-	//			"discovery chain", chain.ServiceName, "upstream", uid,
-	//			"envoy_cluster_json", chain.ServiceName)
-	//	}
-	//}
-	//}
-
-	mgwMode := structs.MeshGatewayModeDefault
-	if upstream, _ := cfgSnap.ConnectProxy.GetUpstream(uid, &cfgSnap.ProxyID.EnterpriseMeta); upstream != nil {
-		mgwMode = upstream.MeshGateway.Mode
-	}
-
-	// Find all resolver nodes.
-	for _, node := range chain.Nodes {
-		switch {
-		case node == nil:
-			return nil, fmt.Errorf("impossible to process a nil node")
-		case node.Type != structs.DiscoveryGraphNodeTypeResolver:
-			continue
-		case node.Resolver == nil:
-			return nil, fmt.Errorf("impossible to process a non-resolver node")
-		}
-		rawUpstreamConfig, err := structs.ParseUpstreamConfigNoDefaults(upstreamConfigMap)
-		if err != nil {
-			return nil, err
-		}
-		upstreamConfig := finalizeUpstreamConfig(rawUpstreamConfig, chain, node.Resolver.ConnectTimeout)
-
-		mappedTargets, err := s.mapDiscoChainTargets(cfgSnap, chain, node, upstreamConfig, forMeshGateway)
-		if err != nil {
-			return nil, err
-		}
-
-		targetGroups, err := mappedTargets.groupedTargets()
-		if err != nil {
-			return nil, err
-		}
-
-		for _, groupedTarget := range targetGroups {
-			clusterName := groupedTarget.ClusterName
-			// TODO(proxystate): escape hatches will be implemented in the future
-			//if escapeHatchCluster != nil {
-			//	clusterName = escapeHatchCluster.Name
-			//}
-			switch len(groupedTarget.Targets) {
-			case 0:
-				continue
-			case 1:
-				// We expect one target so this passes through to continue setting the load assignment up.
-			default:
-				return nil, fmt.Errorf("cannot have more than one target")
-			}
-			ti := groupedTarget.Targets[0]
-			s.Logger.Debug("generating endpoints for", "cluster", clusterName, "targetID", ti.TargetID)
-			targetUID := proxycfg.NewUpstreamIDFromTargetID(ti.TargetID)
-			if targetUID.Peer != "" {
-				peerServiceEndpoints, err := s.makeEndpointsForPeerService(cfgSnap, targetUID, mgwMode)
-				if err != nil {
-					return nil, err
-				}
-				if peerServiceEndpoints != nil {
-					clusterEndpoints[clusterName] = peerServiceEndpoints
-				}
-				continue
-			}
-
-			endpointGroup, valid := makeLoadAssignmentEndpointGroup(
-				chain.Targets,
-				upstreamEndpoints,
-				gatewayEndpoints,
-				ti.TargetID,
-				gatewayKey,
-				forMeshGateway,
-			)
-			if !valid {
-				continue // skip the cluster if we're still populating the snapshot
-			}
-
-			epts := makeEndpointsForLoadAssignment(
-				cfgSnap,
-				ti.PrioritizeByLocality,
-				[]loadAssignmentEndpointGroup{endpointGroup},
-				gatewayKey,
-			)
-			clusterEndpoints[clusterName] = epts
-		}
-	}
-
-	return clusterEndpoints, nil
-}
-
-// TODO(proxystate): Mesh Gateway will be added in the future.
-// Functions to add from agent/xds/endpoints.go:
-// func makeExportedUpstreamEndpointsForMeshGateway
-
-type loadAssignmentEndpointGroup struct {
-	Endpoints      structs.CheckServiceNodes
-	OnlyPassing    bool
-	OverrideHealth pbproxystate.HealthStatus
-}
-
-func makeEndpointsForLoadAssignment(cfgSnap *proxycfg.ConfigSnapshot,
-	policy *structs.DiscoveryPrioritizeByLocality,
-	endpointGroups []loadAssignmentEndpointGroup,
-	localKey proxycfg.GatewayKey) []*pbproxystate.Endpoint {
-	pbEndpoints := make([]*pbproxystate.Endpoint, 0, len(endpointGroups))
-
-	// TODO(proxystate): this will be added with property overrides having golden files with this
-	//if len(endpointGroups) > 1 {
-	//	cla.Policy = &envoy_endpoint_v3.ClusterLoadAssignment_Policy{
-	//		// We choose such a large value here that the failover math should
-	//		// in effect not happen until zero instances are healthy.
-	//		OverprovisioningFactor: response.MakeUint32Value(100000),
-	//	}
-	//}
-
-	var priority uint32
-
-	for _, endpointGroup := range endpointGroups {
-		endpointsByLocality, err := groupedEndpoints(cfgSnap.ServiceLocality, policy, endpointGroup.Endpoints)
-
-		if err != nil {
-			continue
-		}
-
-		for _, endpoints := range endpointsByLocality {
-			for _, ep := range endpoints {
-				// TODO (mesh-gateway) - should we respect the translate_wan_addrs configuration here or just always use the wan for cross-dc?
-				_, addr, port := ep.BestAddress(!localKey.Matches(ep.Node.Datacenter, ep.Node.PartitionOrDefault()))
-				healthStatus, weight := calculateEndpointHealthAndWeight(ep, endpointGroup.OnlyPassing)
-
-				if endpointGroup.OverrideHealth != pbproxystate.HealthStatus_HEALTH_STATUS_UNKNOWN {
-					healthStatus = endpointGroup.OverrideHealth
-				}
-
-				endpoint := makeHostPortEndpoint(addr, port)
-				endpoint.HealthStatus = healthStatus
-				endpoint.LoadBalancingWeight = response.MakeUint32Value(weight)
-
-				pbEndpoints = append(pbEndpoints, endpoint)
-			}
-
-			// TODO(proxystate): what do we do about priority downstream?
-			//cla.Endpoints = append(cla.Endpoints, &envoy_endpoint_v3.LocalityLbEndpoints{
-			//	Priority:    priority,
-			//	LbEndpoints: es,
-			//})
-
-			priority++
-		}
-	}
-
-	return pbEndpoints
-}
-
-func makeLoadAssignmentEndpointGroup(
-	targets map[string]*structs.DiscoveryTarget,
-	targetHealth map[string]structs.CheckServiceNodes,
-	gatewayHealth map[string]structs.CheckServiceNodes,
-	targetID string,
-	localKey proxycfg.GatewayKey,
-	forMeshGateway bool,
-) (loadAssignmentEndpointGroup, bool) {
-	realEndpoints, ok := targetHealth[targetID]
-	if !ok {
-		// skip the cluster if we're still populating the snapshot
-		return loadAssignmentEndpointGroup{}, false
-	}
-	target := targets[targetID]
-
-	var gatewayKey proxycfg.GatewayKey
-
-	switch target.MeshGateway.Mode {
-	case structs.MeshGatewayModeRemote:
-		gatewayKey.Datacenter = target.Datacenter
-		gatewayKey.Partition = target.Partition
-	case structs.MeshGatewayModeLocal:
-		gatewayKey = localKey
-	}
-
-	if forMeshGateway || gatewayKey.IsEmpty() || localKey.Matches(target.Datacenter, target.Partition) {
-		// Gateways are not needed if the request isn't for a remote DC or partition.
-		return loadAssignmentEndpointGroup{
-			Endpoints:   realEndpoints,
-			OnlyPassing: target.Subset.OnlyPassing,
-		}, true
-	}
-
-	// If using a mesh gateway we need to pull those endpoints instead.
-	gatewayEndpoints, ok := gatewayHealth[gatewayKey.String()]
-	if !ok {
-		// skip the cluster if we're still populating the snapshot
-		return loadAssignmentEndpointGroup{}, false
-	}
-
-	// But we will use the health from the actual backend service.
-	overallHealth := pbproxystate.HealthStatus_HEALTH_STATUS_UNHEALTHY
-	for _, ep := range realEndpoints {
-		health, _ := calculateEndpointHealthAndWeight(ep, target.Subset.OnlyPassing)
-		if health == pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY {
-			overallHealth = pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY
-			break
-		}
-	}
-
-	return loadAssignmentEndpointGroup{
-		Endpoints:      gatewayEndpoints,
-		OverrideHealth: overallHealth,
-	}, true
-}
-
-func calculateEndpointHealthAndWeight(
-	ep structs.CheckServiceNode,
-	onlyPassing bool,
-) (pbproxystate.HealthStatus, int) {
-	healthStatus := pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY
-	weight := 1
-	if ep.Service.Weights != nil {
-		weight = ep.Service.Weights.Passing
-	}
-
-	for _, chk := range ep.Checks {
-		if chk.Status == api.HealthCritical {
-			healthStatus = pbproxystate.HealthStatus_HEALTH_STATUS_UNHEALTHY
-		}
-		if onlyPassing && chk.Status != api.HealthPassing {
-			healthStatus = pbproxystate.HealthStatus_HEALTH_STATUS_UNHEALTHY
-		}
-		if chk.Status == api.HealthWarning && ep.Service.Weights != nil {
-			weight = ep.Service.Weights.Warning
-		}
-	}
-	// Make weights fit Envoy's limits. A zero weight means that either Warning
-	// (likely) or Passing (weirdly) weight has been set to 0 effectively making
-	// this instance unhealthy and should not be sent traffic.
-	if weight < 1 {
-		healthStatus = pbproxystate.HealthStatus_HEALTH_STATUS_UNHEALTHY
-		weight = 1
-	}
-	if weight > 128 {
-		weight = 128
-	}
-	return healthStatus, weight
-}
diff --git a/agent/xds/proxystateconverter/failover_policy.go b/agent/xds/proxystateconverter/failover_policy.go
deleted file mode 100644
index ae1565458fa82..0000000000000
--- a/agent/xds/proxystateconverter/failover_policy.go
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxystateconverter
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-)
-
-type discoChainTargets struct {
-	baseClusterName string
-	targets         []targetInfo
-	failover        bool
-	failoverPolicy  structs.ServiceResolverFailoverPolicy
-}
-
-type targetInfo struct {
-	TargetID        string
-	TransportSocket *pbproxystate.TransportSocket
-	SNI             string
-	RootPEMs        string
-	SpiffeIDs       []string
-	Region          *string
-
-	PrioritizeByLocality *structs.DiscoveryPrioritizeByLocality
-}
-
-type discoChainTargetGroup struct {
-	Targets     []targetInfo
-	ClusterName string
-}
-
-func (ft discoChainTargets) groupedTargets() ([]discoChainTargetGroup, error) {
-	var targetGroups []discoChainTargetGroup
-
-	if !ft.failover {
-		targetGroups = append(targetGroups, discoChainTargetGroup{
-			ClusterName: ft.baseClusterName,
-			Targets:     ft.targets,
-		})
-		return targetGroups, nil
-	}
-
-	switch ft.failoverPolicy.Mode {
-	case "sequential", "":
-		return ft.sequential()
-	case "order-by-locality":
-		return ft.orderByLocality()
-	default:
-		return targetGroups, fmt.Errorf("unexpected failover policy")
-	}
-}
-
-func (s *Converter) mapDiscoChainTargets(cfgSnap *proxycfg.ConfigSnapshot, chain *structs.CompiledDiscoveryChain, node *structs.DiscoveryGraphNode, upstreamConfig structs.UpstreamConfig, forMeshGateway bool) (discoChainTargets, error) {
-	failoverTargets := discoChainTargets{}
-
-	if node.Resolver == nil {
-		return discoChainTargets{}, fmt.Errorf("impossible to process a non-resolver node")
-	}
-
-	primaryTargetID := node.Resolver.Target
-	upstreamsSnapshot, err := cfgSnap.ToConfigSnapshotUpstreams()
-	if err != nil && !forMeshGateway {
-		return discoChainTargets{}, err
-	}
-
-	failoverTargets.baseClusterName = s.getTargetClusterName(upstreamsSnapshot, chain, primaryTargetID, forMeshGateway)
-
-	tids := []string{primaryTargetID}
-	failover := node.Resolver.Failover
-	if failover != nil && !forMeshGateway {
-		tids = append(tids, failover.Targets...)
-		failoverTargets.failover = true
-		if failover.Policy == nil {
-			failoverTargets.failoverPolicy = structs.ServiceResolverFailoverPolicy{}
-		} else {
-			failoverTargets.failoverPolicy = *failover.Policy
-		}
-	}
-
-	for _, tid := range tids {
-		target := chain.Targets[tid]
-		targetUID := proxycfg.NewUpstreamIDFromTargetID(tid)
-		ti := targetInfo{TargetID: tid, PrioritizeByLocality: target.PrioritizeByLocality}
-
-		configureTLS := true
-		if forMeshGateway {
-			// We only initiate TLS if we're doing an L7 proxy.
-			configureTLS = structs.IsProtocolHTTPLike(upstreamConfig.Protocol)
-		}
-
-		if !configureTLS {
-			failoverTargets.targets = append(failoverTargets.targets, ti)
-			continue
-		}
-
-		if targetUID.Peer != "" {
-			tbs, _ := upstreamsSnapshot.UpstreamPeerTrustBundles.Get(targetUID.Peer)
-
-			peerMeta, found := upstreamsSnapshot.UpstreamPeerMeta(targetUID)
-			if !found {
-				s.Logger.Warn("failed to fetch upstream peering metadata", "target", targetUID)
-				continue
-			}
-			ti.SNI = peerMeta.PrimarySNI()
-			ti.SpiffeIDs = peerMeta.SpiffeID
-			region := target.Locality.GetRegion()
-			ti.Region = &region
-			ti.RootPEMs = tbs.ConcatenatedRootPEMs()
-		} else {
-			ti.SNI = target.SNI
-			ti.RootPEMs = cfgSnap.RootPEMs()
-			ti.SpiffeIDs = []string{connect.SpiffeIDService{
-				Host:       cfgSnap.Roots.TrustDomain,
-				Namespace:  target.Namespace,
-				Partition:  target.Partition,
-				Datacenter: target.Datacenter,
-				Service:    target.Service,
-			}.URI().String()}
-		}
-		//commonTLSContext := makeCommonTLSContext(
-		//	cfgSnap.Leaf(),
-		//	rootPEMs,
-		//	makeTLSParametersFromProxyTLSConfig(cfgSnap.MeshConfigTLSOutgoing()),
-		//)
-		//
-		//err := injectSANMatcher(commonTLSContext, spiffeIDs...)
-		//if err != nil {
-		//	return failoverTargets, fmt.Errorf("failed to inject SAN matcher rules for cluster %q: %v", sni, err)
-		//}
-
-		//tlsContext := &envoy_tls_v3.UpstreamTlsContext{
-		//	CommonTlsContext: commonTLSContext,
-		//	Sni:              sni,
-		//}
-		//ti.TLSContext = tlsContext
-		failoverTargets.targets = append(failoverTargets.targets, ti)
-	}
-
-	return failoverTargets, nil
-}
-
-func (ft discoChainTargets) sequential() ([]discoChainTargetGroup, error) {
-	var targetGroups []discoChainTargetGroup
-	for i, t := range ft.targets {
-		targetGroups = append(targetGroups, discoChainTargetGroup{
-			ClusterName: fmt.Sprintf("%s%d~%s", xdscommon.FailoverClusterNamePrefix, i, ft.baseClusterName),
-			Targets:     []targetInfo{t},
-		})
-	}
-	return targetGroups, nil
-}
diff --git a/agent/xds/proxystateconverter/failover_policy_ce.go b/agent/xds/proxystateconverter/failover_policy_ce.go
deleted file mode 100644
index b68d9b2e738bc..0000000000000
--- a/agent/xds/proxystateconverter/failover_policy_ce.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package proxystateconverter
-
-import (
-	"fmt"
-)
-
-func (ft discoChainTargets) orderByLocality() ([]discoChainTargetGroup, error) {
-	return nil, fmt.Errorf("order-by-locality is a Consul Enterprise feature")
-}
diff --git a/agent/xds/proxystateconverter/listeners.go b/agent/xds/proxystateconverter/listeners.go
deleted file mode 100644
index d120f07b4567d..0000000000000
--- a/agent/xds/proxystateconverter/listeners.go
+++ /dev/null
@@ -1,1694 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxystateconverter
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"net/url"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-
-	envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-uuid"
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xds/config"
-	"github.com/hashicorp/consul/agent/xds/naming"
-	"github.com/hashicorp/consul/agent/xds/platform"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/consul/sdk/iptables"
-	"github.com/hashicorp/consul/types"
-)
-
-// listenersFromSnapshot adds listeners to pbmesh.ProxyState using the config snapshot.
-func (s *Converter) listenersFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) error {
-	if cfgSnap == nil {
-		return errors.New("nil config given")
-	}
-
-	switch cfgSnap.Kind {
-	case structs.ServiceKindConnectProxy:
-		return s.listenersFromSnapshotConnectProxy(cfgSnap)
-	case structs.ServiceKindTerminatingGateway,
-		structs.ServiceKindMeshGateway,
-		structs.ServiceKindIngressGateway,
-		structs.ServiceKindAPIGateway:
-		// TODO(proxystate): gateway support will be added in the future
-		//return s.listenersFromSnapshotGateway(cfgSnap)
-	default:
-		return fmt.Errorf("Invalid service kind: %v", cfgSnap.Kind)
-	}
-	return nil
-}
-
-// listenersFromSnapshotConnectProxy returns the "listeners" for a connect proxy service
-func (s *Converter) listenersFromSnapshotConnectProxy(cfgSnap *proxycfg.ConfigSnapshot) error {
-	// This is the list of listeners we add to. It will be empty to start.
-	listeners := s.proxyState.Listeners
-	var err error
-
-	// Configure inbound listener.
-	inboundListener, err := s.makeInboundListener(cfgSnap, xdscommon.PublicListenerName)
-	if err != nil {
-		return err
-	}
-	listeners = append(listeners, inboundListener)
-
-	// This outboundListener is exclusively used when transparent proxy mode is active.
-	// In that situation there is a single listener where we are redirecting outbound traffic,
-	// and each upstream gets a filter chain attached to that listener.
-	var outboundListener *pbproxystate.Listener
-
-	if cfgSnap.Proxy.Mode == structs.ProxyModeTransparent {
-		port := iptables.DefaultTProxyOutboundPort
-		if cfgSnap.Proxy.TransparentProxy.OutboundListenerPort != 0 {
-			port = cfgSnap.Proxy.TransparentProxy.OutboundListenerPort
-		}
-
-		opts := makeListenerOpts{
-			name: xdscommon.OutboundListenerName,
-			//accessLogs: cfgSnap.Proxy.AccessLogs,
-			addr:      "127.0.0.1",
-			port:      port,
-			direction: pbproxystate.Direction_DIRECTION_OUTBOUND,
-			logger:    s.Logger,
-		}
-		outboundListener = makeListener(opts)
-		if outboundListener.Capabilities == nil {
-			outboundListener.Capabilities = []pbproxystate.Capability{}
-		}
-		outboundListener.Capabilities = append(outboundListener.Capabilities, pbproxystate.Capability_CAPABILITY_TRANSPARENT)
-	}
-
-	// TODO(proxystate): tracing escape hatch will be added in the future. It will be added to the top level in proxystate, and used in xds generation.
-	//proxyCfg, err := config.ParseProxyConfig(cfgSnap.Proxy.Config)
-	//if err != nil {
-	//	// Don't hard fail on a config typo, just warn. The parse func returns
-	//	// default config if there is an error so it's safe to continue.
-	//	s.Logger.Warn("failed to parse Connect.Proxy.Config", "error", err)
-	//}
-	//var tracing *envoy_http_v3.HttpConnectionManager_Tracing
-	//if proxyCfg.ListenerTracingJSON != "" {
-	//	if tracing, err = makeTracingFromUserConfig(proxyCfg.ListenerTracingJSON); err != nil {
-	//		s.Logger.Warn("failed to parse ListenerTracingJSON config", "error", err)
-	//	}
-	//}
-
-	upstreamsSnapshot, err := cfgSnap.ToConfigSnapshotUpstreams()
-	if err != nil {
-		return err
-	}
-
-	for uid, chain := range cfgSnap.ConnectProxy.DiscoveryChain {
-		upstreamCfg, skip := cfgSnap.ConnectProxy.GetUpstream(uid, &cfgSnap.ProxyID.EnterpriseMeta)
-		if skip {
-			// Discovery chain is not associated with a known explicit or implicit upstream so it is skipped.
-			continue
-		}
-
-		cfg := s.getAndModifyUpstreamConfigForListener(uid, upstreamCfg, chain)
-
-		// If escape hatch is present, create a listener from it and move on to the next
-		if cfg.EnvoyListenerJSON != "" {
-			upstreamListener := &pbproxystate.Listener{
-				EscapeHatchListener: cfg.EnvoyListenerJSON,
-			}
-			listeners = append(listeners, upstreamListener)
-			continue
-		}
-
-		// RDS, Envoy's Route Discovery Service, is only used for HTTP services with a customized discovery chain.
-		useRDS := chain.Protocol != "tcp" && !chain.Default
-
-		var clusterName string
-		if !useRDS {
-			// When not using RDS we must generate a cluster name to attach to the filter chain.
-			// With RDS, cluster names get attached to the dynamic routes instead.
-			target, err := simpleChainTarget(chain)
-			if err != nil {
-				return err
-			}
-
-			clusterName = s.getTargetClusterName(upstreamsSnapshot, chain, target.ID, false)
-			if clusterName == "" {
-				continue
-			}
-		}
-
-		filterName := fmt.Sprintf("%s.%s.%s.%s", chain.ServiceName, chain.Namespace, chain.Partition, chain.Datacenter)
-
-		// Generate the upstream listeners for when they are explicitly set with a local bind port or socket path
-		if upstreamCfg != nil && upstreamCfg.HasLocalPortOrSocket() {
-			router, err := s.makeUpstreamRouter(routerOpts{
-				// TODO(proxystate): access logs and tracing will be added in the future.
-				//accessLogs:  &cfgSnap.Proxy.AccessLogs,
-				routeName:   uid.EnvoyID(),
-				clusterName: clusterName,
-				filterName:  filterName,
-				protocol:    cfg.Protocol,
-				useRDS:      useRDS,
-				//tracing:     tracing,
-			})
-			if err != nil {
-				return err
-			}
-
-			opts := makeListenerOpts{
-				name: uid.EnvoyID(),
-				//accessLogs: cfgSnap.Proxy.AccessLogs,
-				direction: pbproxystate.Direction_DIRECTION_OUTBOUND,
-				logger:    s.Logger,
-				upstream:  upstreamCfg,
-			}
-			upstreamListener := makeListener(opts)
-			upstreamListener.BalanceConnections = balanceConnections[cfg.BalanceOutboundConnections]
-
-			upstreamListener.Routers = append(upstreamListener.Routers, router)
-			listeners = append(listeners, upstreamListener)
-
-			// Avoid creating filter chains below for upstreams that have dedicated listeners
-			continue
-		}
-
-		// The rest of this loop is used exclusively for transparent proxies.
-		// Below we create a filter chain per upstream, rather than a listener per upstream
-		// as we do for explicit upstreams above.
-
-		upstreamRouter, err := s.makeUpstreamRouter(routerOpts{
-			//accessLogs:  &cfgSnap.Proxy.AccessLogs,
-			routeName:   uid.EnvoyID(),
-			clusterName: clusterName,
-			filterName:  filterName,
-			protocol:    cfg.Protocol,
-			useRDS:      useRDS,
-			//tracing:     tracing,
-		})
-		if err != nil {
-			return err
-		}
-
-		endpoints := cfgSnap.ConnectProxy.WatchedUpstreamEndpoints[uid][chain.ID()]
-		uniqueAddrs := make(map[string]struct{})
-
-		if chain.Partition == cfgSnap.ProxyID.PartitionOrDefault() {
-			for _, ip := range chain.AutoVirtualIPs {
-				uniqueAddrs[ip] = struct{}{}
-			}
-			for _, ip := range chain.ManualVirtualIPs {
-				uniqueAddrs[ip] = struct{}{}
-			}
-		}
-
-		// Match on the virtual IP for the upstream service (identified by the chain's ID).
-		// We do not match on all endpoints here since it would lead to load balancing across
-		// all instances when any instance address is dialed.
-		for _, e := range endpoints {
-			if e.Service.Kind == structs.ServiceKind(structs.TerminatingGateway) {
-				key := structs.ServiceGatewayVirtualIPTag(chain.CompoundServiceName())
-
-				if vip := e.Service.TaggedAddresses[key]; vip.Address != "" {
-					uniqueAddrs[vip.Address] = struct{}{}
-				}
-
-				continue
-			}
-			if vip := e.Service.TaggedAddresses[structs.TaggedAddressVirtualIP]; vip.Address != "" {
-				uniqueAddrs[vip.Address] = struct{}{}
-			}
-
-			// The virtualIPTag is used by consul-k8s to store the ClusterIP for a service.
-			// We only match on this virtual IP if the upstream is in the proxy's partition.
-			// This is because the IP is not guaranteed to be unique across k8s clusters.
-			if acl.EqualPartitions(e.Node.PartitionOrDefault(), cfgSnap.ProxyID.PartitionOrDefault()) {
-				if vip := e.Service.TaggedAddresses[naming.VirtualIPTag]; vip.Address != "" {
-					uniqueAddrs[vip.Address] = struct{}{}
-				}
-			}
-		}
-		if len(uniqueAddrs) > 2 {
-			s.Logger.Debug("detected multiple virtual IPs for an upstream, all will be used to match traffic",
-				"upstream", uid, "ip_count", len(uniqueAddrs))
-		}
-
-		// For every potential address we collected, create the appropriate address prefix to match on.
-		// In this case we are matching on exact addresses, so the prefix is the address itself,
-		// and the prefix length is based on whether it's IPv4 or IPv6.
-		upstreamRouter.Match = makeRouterMatchFromAddrs(uniqueAddrs)
-
-		// Only attach the filter chain if there are addresses to match on
-		if upstreamRouter.Match != nil && len(upstreamRouter.Match.PrefixRanges) > 0 {
-			outboundListener.Routers = append(outboundListener.Routers, upstreamRouter)
-		}
-	}
-	requiresTLSInspector := false
-	requiresHTTPInspector := false
-
-	configuredPorts := make(map[int]interface{})
-	err = cfgSnap.ConnectProxy.DestinationsUpstream.ForEachKeyE(func(uid proxycfg.UpstreamID) error {
-		svcConfig, ok := cfgSnap.ConnectProxy.DestinationsUpstream.Get(uid)
-		if !ok || svcConfig == nil {
-			return nil
-		}
-
-		if structs.IsProtocolHTTPLike(svcConfig.Protocol) {
-			if _, ok := configuredPorts[svcConfig.Destination.Port]; ok {
-				return nil
-			}
-			configuredPorts[svcConfig.Destination.Port] = struct{}{}
-			const name = "~http" // name used for the shared route name
-			routeName := clusterNameForDestination(cfgSnap, name, fmt.Sprintf("%d", svcConfig.Destination.Port), svcConfig.NamespaceOrDefault(), svcConfig.PartitionOrDefault())
-			upstreamRouter, err := s.makeUpstreamRouter(routerOpts{
-				//accessLogs: &cfgSnap.Proxy.AccessLogs,
-				routeName:  routeName,
-				filterName: routeName,
-				protocol:   svcConfig.Protocol,
-				useRDS:     true,
-				//tracing:    tracing,
-			})
-			if err != nil {
-				return err
-			}
-			upstreamRouter.Match = makeRouterMatchFromAddressWithPort("", svcConfig.Destination.Port)
-			outboundListener.Routers = append(outboundListener.Routers, upstreamRouter)
-			requiresHTTPInspector = true
-		} else {
-			for _, address := range svcConfig.Destination.Addresses {
-				clusterName := clusterNameForDestination(cfgSnap, uid.Name, address, uid.NamespaceOrDefault(), uid.PartitionOrDefault())
-
-				upstreamRouter, err := s.makeUpstreamRouter(routerOpts{
-					//accessLogs:  &cfgSnap.Proxy.AccessLogs,
-					routeName:   uid.EnvoyID(),
-					clusterName: clusterName,
-					filterName:  clusterName,
-					protocol:    svcConfig.Protocol,
-					//tracing:     tracing,
-				})
-				if err != nil {
-					return err
-				}
-
-				upstreamRouter.Match = makeRouterMatchFromAddressWithPort(address, svcConfig.Destination.Port)
-				outboundListener.Routers = append(outboundListener.Routers, upstreamRouter)
-
-				requiresTLSInspector = len(upstreamRouter.Match.ServerNames) != 0 || requiresTLSInspector
-			}
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-
-	if requiresTLSInspector {
-		outboundListener.Capabilities = append(outboundListener.Capabilities, pbproxystate.Capability_CAPABILITY_L4_TLS_INSPECTION)
-	}
-
-	if requiresHTTPInspector {
-		outboundListener.Capabilities = append(outboundListener.Capabilities, pbproxystate.Capability_CAPABILITY_L7_PROTOCOL_INSPECTION)
-	}
-
-	// Looping over explicit and implicit upstreams is only needed for cross-peer
-	// because they do not have discovery chains.
-	for _, uid := range cfgSnap.ConnectProxy.PeeredUpstreamIDs() {
-		upstreamCfg, skip := cfgSnap.ConnectProxy.GetUpstream(uid, &cfgSnap.ProxyID.EnterpriseMeta)
-		if skip {
-			// Not associated with a known explicit or implicit upstream so it is skipped.
-			continue
-		}
-
-		peerMeta, found := cfgSnap.ConnectProxy.UpstreamPeerMeta(uid)
-		if !found {
-			s.Logger.Warn("failed to fetch upstream peering metadata for listener", "uid", uid)
-		}
-		cfg := s.getAndModifyUpstreamConfigForPeeredListener(uid, upstreamCfg, peerMeta)
-
-		// If escape hatch is present, create a listener from it and move on to the next
-		if cfg.EnvoyListenerJSON != "" {
-			upstreamListener := &pbproxystate.Listener{
-				EscapeHatchListener: cfg.EnvoyListenerJSON,
-			}
-			listeners = append(listeners, upstreamListener)
-			continue
-		}
-
-		tbs, ok := cfgSnap.ConnectProxy.UpstreamPeerTrustBundles.Get(uid.Peer)
-		if !ok {
-			// this should never happen since we loop through upstreams with
-			// set trust bundles
-			return fmt.Errorf("trust bundle not ready for peer %s", uid.Peer)
-		}
-
-		clusterName := generatePeeredClusterName(uid, tbs)
-
-		// Generate the upstream listeners for when they are explicitly set with a local bind port or socket path
-		if upstreamCfg != nil && upstreamCfg.HasLocalPortOrSocket() {
-			upstreamRouter, err := s.makeUpstreamRouter(routerOpts{
-				//accessLogs:  &cfgSnap.Proxy.AccessLogs,
-				clusterName: clusterName,
-				filterName: fmt.Sprintf("%s.%s.%s",
-					upstreamCfg.DestinationName,
-					upstreamCfg.DestinationNamespace,
-					upstreamCfg.DestinationPeer),
-				routeName:  uid.EnvoyID(),
-				protocol:   cfg.Protocol,
-				useRDS:     false,
-				statPrefix: "upstream_peered.",
-			})
-			if err != nil {
-				return err
-			}
-
-			opts := makeListenerOpts{
-				name: uid.EnvoyID(),
-				//accessLogs: cfgSnap.Proxy.AccessLogs,
-				direction: pbproxystate.Direction_DIRECTION_OUTBOUND,
-				logger:    s.Logger,
-				upstream:  upstreamCfg,
-			}
-			upstreamListener := makeListener(opts)
-			upstreamListener.BalanceConnections = balanceConnections[cfg.BalanceOutboundConnections]
-
-			upstreamListener.Routers = []*pbproxystate.Router{
-				upstreamRouter,
-			}
-			listeners = append(listeners, upstreamListener)
-
-			// Avoid creating filter chains below for upstreams that have dedicated listeners
-			continue
-		}
-
-		// The rest of this loop is used exclusively for transparent proxies.
-		// Below we create a filter chain per upstream, rather than a listener per upstream
-		// as we do for explicit upstreams above.
-
-		upstreamRouter, err := s.makeUpstreamRouter(routerOpts{
-			//accessLogs:  &cfgSnap.Proxy.AccessLogs,
-			routeName:   uid.EnvoyID(),
-			clusterName: clusterName,
-			filterName: fmt.Sprintf("%s.%s.%s",
-				uid.Name,
-				uid.NamespaceOrDefault(),
-				uid.Peer),
-			protocol:   cfg.Protocol,
-			useRDS:     false,
-			statPrefix: "upstream_peered.",
-			//tracing:    tracing,
-		})
-		if err != nil {
-			return err
-		}
-
-		endpoints, _ := cfgSnap.ConnectProxy.PeerUpstreamEndpoints.Get(uid)
-		uniqueAddrs := make(map[string]struct{})
-
-		// Match on the virtual IP for the upstream service (identified by the chain's ID).
-		// We do not match on all endpoints here since it would lead to load balancing across
-		// all instances when any instance address is dialed.
-		for _, e := range endpoints {
-			if vip := e.Service.TaggedAddresses[structs.TaggedAddressVirtualIP]; vip.Address != "" {
-				uniqueAddrs[vip.Address] = struct{}{}
-			}
-
-			// The virtualIPTag is used by consul-k8s to store the ClusterIP for a service.
-			// For services imported from a peer,the partition will be equal in all cases.
-			if acl.EqualPartitions(e.Node.PartitionOrDefault(), cfgSnap.ProxyID.PartitionOrDefault()) {
-				if vip := e.Service.TaggedAddresses[naming.VirtualIPTag]; vip.Address != "" {
-					uniqueAddrs[vip.Address] = struct{}{}
-				}
-			}
-		}
-		if len(uniqueAddrs) > 2 {
-			s.Logger.Debug("detected multiple virtual IPs for an upstream, all will be used to match traffic",
-				"upstream", uid, "ip_count", len(uniqueAddrs))
-		}
-
-		// For every potential address we collected, create the appropriate address prefix to match on.
-		// In this case we are matching on exact addresses, so the prefix is the address itself,
-		// and the prefix length is based on whether it's IPv4 or IPv6.
-		upstreamRouter.Match = makeRouterMatchFromAddrs(uniqueAddrs)
-
-		// Only attach the filter chain if there are addresses to match on
-		if upstreamRouter.Match != nil && len(upstreamRouter.Match.PrefixRanges) > 0 {
-			outboundListener.Routers = append(outboundListener.Routers, upstreamRouter)
-		}
-
-	}
-
-	if outboundListener != nil {
-		// Add a passthrough for every mesh endpoint that can be dialed directly,
-		// as opposed to via a virtual IP.
-		var passthroughRouters []*pbproxystate.Router
-
-		for _, targets := range cfgSnap.ConnectProxy.PassthroughUpstreams {
-			for tid, addrs := range targets {
-				uid := proxycfg.NewUpstreamIDFromTargetID(tid)
-
-				sni := connect.ServiceSNI(
-					uid.Name, "", uid.NamespaceOrDefault(), uid.PartitionOrDefault(), cfgSnap.Datacenter, cfgSnap.Roots.TrustDomain)
-
-				routerName := fmt.Sprintf("%s.%s.%s.%s", uid.Name, uid.NamespaceOrDefault(), uid.PartitionOrDefault(), cfgSnap.Datacenter)
-
-				upstreamRouter, err := s.makeUpstreamRouter(routerOpts{
-					//accessLogs:  &cfgSnap.Proxy.AccessLogs,
-					clusterName: "passthrough~" + sni,
-					filterName:  routerName,
-					protocol:    "tcp",
-				})
-				if err != nil {
-					return err
-				}
-				upstreamRouter.Match = makeRouterMatchFromAddrs(addrs)
-
-				passthroughRouters = append(passthroughRouters, upstreamRouter)
-			}
-		}
-
-		outboundListener.Routers = append(outboundListener.Routers, passthroughRouters...)
-
-		// Add a catch-all filter chain that acts as a TCP proxy to destinations outside the mesh
-		if meshConf := cfgSnap.MeshConfig(); meshConf == nil ||
-			!meshConf.TransparentProxy.MeshDestinationsOnly {
-
-			upstreamRouter, err := s.makeUpstreamRouter(routerOpts{
-				//accessLogs:  &cfgSnap.Proxy.AccessLogs,
-				clusterName: naming.OriginalDestinationClusterName,
-				filterName:  naming.OriginalDestinationClusterName,
-				protocol:    "tcp",
-			})
-			if err != nil {
-				return err
-			}
-			outboundListener.DefaultRouter = upstreamRouter
-		}
-
-		// Only add the outbound listener if configured.
-		if len(outboundListener.Routers) > 0 || outboundListener.DefaultRouter != nil {
-			listeners = append(listeners, outboundListener)
-
-		}
-	}
-
-	// Looping over explicit upstreams is only needed for prepared queries because they do not have discovery chains
-	for uid, u := range cfgSnap.ConnectProxy.UpstreamConfig {
-		if u.DestinationType != structs.UpstreamDestTypePreparedQuery {
-			continue
-		}
-
-		cfg, err := structs.ParseUpstreamConfig(u.Config)
-		if err != nil {
-			// Don't hard fail on a config typo, just warn. The parse func returns
-			// default config if there is an error so it's safe to continue.
-			s.Logger.Warn("failed to parse", "upstream", uid, "error", err)
-		}
-
-		// If escape hatch is present, create a listener from it and move on to the next
-		if cfg.EnvoyListenerJSON != "" {
-			upstreamListener := &pbproxystate.Listener{
-				EscapeHatchListener: cfg.EnvoyListenerJSON,
-			}
-			listeners = append(listeners, upstreamListener)
-			continue
-		}
-
-		opts := makeListenerOpts{
-			name: uid.EnvoyID(),
-			//accessLogs: cfgSnap.Proxy.AccessLogs,
-			direction: pbproxystate.Direction_DIRECTION_OUTBOUND,
-			logger:    s.Logger,
-			upstream:  u,
-		}
-		upstreamListener := makeListener(opts)
-		upstreamListener.BalanceConnections = balanceConnections[cfg.BalanceOutboundConnections]
-
-		upstreamRouter, err := s.makeUpstreamRouter(routerOpts{
-			// TODO (SNI partition) add partition for upstream SNI
-			//accessLogs:  &cfgSnap.Proxy.AccessLogs,
-			clusterName: connect.UpstreamSNI(u, "", cfgSnap.Datacenter, cfgSnap.Roots.TrustDomain),
-			filterName:  uid.EnvoyID(),
-			routeName:   uid.EnvoyID(),
-			protocol:    cfg.Protocol,
-			//tracing:     tracing,
-		})
-		if err != nil {
-			return err
-		}
-		upstreamListener.Routers = []*pbproxystate.Router{
-			upstreamRouter,
-		}
-		listeners = append(listeners, upstreamListener)
-	}
-
-	cfgSnap.Proxy.Expose.Finalize()
-	paths := cfgSnap.Proxy.Expose.Paths
-
-	// Add service health checks to the list of paths to create listeners for if needed
-	if cfgSnap.Proxy.Expose.Checks {
-		psid := structs.NewServiceID(cfgSnap.Proxy.DestinationServiceID, &cfgSnap.ProxyID.EnterpriseMeta)
-		for _, check := range cfgSnap.ConnectProxy.WatchedServiceChecks[psid] {
-			p, err := parseCheckPath(check)
-			if err != nil {
-				s.Logger.Warn("failed to create listener for", "check", check.CheckID, "error", err)
-				continue
-			}
-			paths = append(paths, p)
-		}
-	}
-
-	// Configure additional listener for exposed check paths
-	for _, path := range paths {
-		clusterName := xdscommon.LocalAppClusterName
-		if path.LocalPathPort != cfgSnap.Proxy.LocalServicePort {
-			clusterName = makeExposeClusterName(path.LocalPathPort)
-		}
-
-		l, err := s.makeExposedCheckListener(cfgSnap, clusterName, path)
-		if err != nil {
-			return err
-		}
-		listeners = append(listeners, l)
-	}
-
-	// Set listeners on the proxy state.
-	s.proxyState.Listeners = listeners
-
-	return nil
-}
-
-func makeRouterMatchFromAddrs(addrs map[string]struct{}) *pbproxystate.Match {
-	ranges := make([]*pbproxystate.CidrRange, 0)
-
-	for addr := range addrs {
-		ip := net.ParseIP(addr)
-		if ip == nil {
-			continue
-		}
-
-		pfxLen := uint32(32)
-		if ip.To4() == nil {
-			pfxLen = 128
-		}
-		ranges = append(ranges, &pbproxystate.CidrRange{
-			AddressPrefix: addr,
-			PrefixLen:     &wrapperspb.UInt32Value{Value: pfxLen},
-		})
-	}
-
-	return &pbproxystate.Match{
-		PrefixRanges: ranges,
-	}
-}
-
-func makeRouterMatchFromAddressWithPort(address string, port int) *pbproxystate.Match {
-	ranges := make([]*pbproxystate.CidrRange, 0)
-
-	ip := net.ParseIP(address)
-	if ip == nil {
-		if address != "" {
-			return &pbproxystate.Match{
-				ServerNames:     []string{address},
-				DestinationPort: &wrapperspb.UInt32Value{Value: uint32(port)},
-			}
-		}
-		return &pbproxystate.Match{
-			DestinationPort: &wrapperspb.UInt32Value{Value: uint32(port)},
-		}
-	}
-
-	pfxLen := uint32(32)
-	if ip.To4() == nil {
-		pfxLen = 128
-	}
-	ranges = append(ranges, &pbproxystate.CidrRange{
-		AddressPrefix: address,
-		PrefixLen:     &wrapperspb.UInt32Value{Value: pfxLen},
-	})
-
-	return &pbproxystate.Match{
-		PrefixRanges:    ranges,
-		DestinationPort: &wrapperspb.UInt32Value{Value: uint32(port)},
-	}
-}
-
-func parseCheckPath(check structs.CheckType) (structs.ExposePath, error) {
-	var path structs.ExposePath
-
-	if check.HTTP != "" {
-		path.Protocol = "http"
-
-		// Get path and local port from original HTTP target
-		u, err := url.Parse(check.HTTP)
-		if err != nil {
-			return path, fmt.Errorf("failed to parse url '%s': %v", check.HTTP, err)
-		}
-		path.Path = u.Path
-
-		_, portStr, err := net.SplitHostPort(u.Host)
-		if err != nil {
-			return path, fmt.Errorf("failed to parse port from '%s': %v", check.HTTP, err)
-		}
-		path.LocalPathPort, err = strconv.Atoi(portStr)
-		if err != nil {
-			return path, fmt.Errorf("failed to parse port from '%s': %v", check.HTTP, err)
-		}
-
-		// Get listener port from proxied HTTP target
-		u, err = url.Parse(check.ProxyHTTP)
-		if err != nil {
-			return path, fmt.Errorf("failed to parse url '%s': %v", check.ProxyHTTP, err)
-		}
-
-		_, portStr, err = net.SplitHostPort(u.Host)
-		if err != nil {
-			return path, fmt.Errorf("failed to parse port from '%s': %v", check.ProxyHTTP, err)
-		}
-		path.ListenerPort, err = strconv.Atoi(portStr)
-		if err != nil {
-			return path, fmt.Errorf("failed to parse port from '%s': %v", check.ProxyHTTP, err)
-		}
-	}
-
-	if check.GRPC != "" {
-		path.Path = "/grpc.health.v1.Health/Check"
-		path.Protocol = "http2"
-
-		// Get local port from original GRPC target of the form: host/service
-		proxyServerAndService := strings.SplitN(check.GRPC, "/", 2)
-		_, portStr, err := net.SplitHostPort(proxyServerAndService[0])
-		if err != nil {
-			return path, fmt.Errorf("failed to split host/port from '%s': %v", check.GRPC, err)
-		}
-		path.LocalPathPort, err = strconv.Atoi(portStr)
-		if err != nil {
-			return path, fmt.Errorf("failed to parse port from '%s': %v", check.GRPC, err)
-		}
-
-		// Get listener port from proxied GRPC target of the form: host/service
-		proxyServerAndService = strings.SplitN(check.ProxyGRPC, "/", 2)
-		_, portStr, err = net.SplitHostPort(proxyServerAndService[0])
-		if err != nil {
-			return path, fmt.Errorf("failed to split host/port from '%s': %v", check.ProxyGRPC, err)
-		}
-		path.ListenerPort, err = strconv.Atoi(portStr)
-		if err != nil {
-			return path, fmt.Errorf("failed to parse port from '%s': %v", check.ProxyGRPC, err)
-		}
-	}
-
-	path.ParsedFromCheck = true
-
-	return path, nil
-}
-
-// TODO(proxystate): Gateway support will be added in the future.
-// Functions to add from agent/xds/listeners.go:
-// func listenersFromSnapshotGateway
-
-// makeListener returns a listener with name and bind details set. Routers and destinations
-// must be added before it's useful.
-//
-// Note on names: Envoy listeners attempt graceful transitions of connections
-// when their config changes but that means they can't have their bind address
-// or port changed in a running instance. Since our users might choose to change
-// a bind address or port for the public or upstream listeners, we need to
-// encode those into the unique name for the listener such that if the user
-// changes them, we actually create a whole new listener on the new address and
-// port. Envoy should take care of closing the old one once it sees it's no
-// longer in the config.
-type makeListenerOpts struct {
-	addr string
-	//accessLogs structs.AccessLogsConfig
-	logger    hclog.Logger
-	mode      string
-	name      string
-	path      string
-	port      int
-	direction pbproxystate.Direction
-	upstream  *structs.Upstream
-}
-
-func makeListener(opts makeListenerOpts) *pbproxystate.Listener {
-	if opts.upstream != nil && opts.upstream.LocalBindPort == 0 && opts.upstream.LocalBindSocketPath != "" {
-		opts.path = opts.upstream.LocalBindSocketPath
-		opts.mode = opts.upstream.LocalBindSocketMode
-		return makePipeListener(opts)
-	}
-	if opts.upstream != nil {
-		opts.port = opts.upstream.LocalBindPort
-		opts.addr = opts.upstream.LocalBindAddress
-		return makeListenerWithDefault(opts)
-	}
-
-	return makeListenerWithDefault(opts)
-}
-
-func makeListenerWithDefault(opts makeListenerOpts) *pbproxystate.Listener {
-	if opts.addr == "" {
-		opts.addr = "127.0.0.1"
-	}
-	// TODO(proxystate): Access logs will be added in the future. It will be added to top level IR, and used by xds code generation.
-	//accessLog, err := accesslogs.MakeAccessLogs(&opts.accessLogs, true)
-	//if err != nil && opts.logger != nil {
-	//	// Since access logging is non-essential for routing, warn and move on
-	//	opts.logger.Warn("error generating access log xds", err)
-	//}
-	return &pbproxystate.Listener{
-		Name: fmt.Sprintf("%s:%s:%d", opts.name, opts.addr, opts.port),
-		//AccessLog:        accessLog,
-		BindAddress: &pbproxystate.Listener_HostPort{
-			HostPort: &pbproxystate.HostPortAddress{
-				Host: opts.addr,
-				Port: uint32(opts.port),
-			},
-		},
-		Direction: opts.direction,
-	}
-}
-
-func makePipeListener(opts makeListenerOpts) *pbproxystate.Listener {
-	// TODO(proxystate): Access logs will be added in the future. It will be added to top level IR, and used by xds code generation.
-	//accessLog, err := accesslogs.MakeAccessLogs(&opts.accessLogs, true)
-	//if err != nil && opts.logger != nil {
-	//	// Since access logging is non-essential for routing, warn and move on
-	//	opts.logger.Warn("error generating access log xds", err)
-	//}
-	return &pbproxystate.Listener{
-		Name: fmt.Sprintf("%s:%s", opts.name, opts.path),
-		//AccessLog:        accessLog,
-		BindAddress: &pbproxystate.Listener_UnixSocket{
-			UnixSocket: &pbproxystate.UnixSocketAddress{Path: opts.path, Mode: opts.mode},
-		},
-		Direction: opts.direction,
-	}
-}
-
-// TODO(proxystate): Escape hatches will be added in the future.
-// Functions to add from agent/xds/listeners.go:
-// func makeListenerFromUserConfig
-
-// TODO(proxystate): Intentions will be added in the future
-// Functions to add from agent/xds/listeners.go:
-// func injectConnectFilters
-
-// TODO(proxystate): httpConnectionManager constants will need to be added when used for listeners L7 in the future.
-// Constants to add from agent/xds/listeners.go:
-// const httpConnectionManagerOldName
-// const httpConnectionManagerNewName
-
-// TODO(proxystate): Extracting RDS resource names will be used when wiring up xds v2 server in the future.
-// Functions to add from agent/xds/listeners.go:
-// func extractRdsResourceNames
-
-// TODO(proxystate): Intentions will be added in the future.
-// Functions to add from agent/xds/listeners.go:
-// func injectHTTPFilterOnFilterChains
-
-// NOTE: This method MUST only be used for connect proxy public listeners,
-// since TLS validation will be done against root certs for all peers
-// that might dial this proxy.
-func (s *Converter) injectConnectTLSForPublicListener(cfgSnap *proxycfg.ConfigSnapshot, listener *pbproxystate.Listener) error {
-	transportSocket, err := s.createInboundMeshMTLS(cfgSnap)
-	if err != nil {
-		return err
-	}
-
-	for idx := range listener.Routers {
-		listener.Routers[idx].InboundTls = transportSocket
-	}
-	return nil
-}
-
-func getAlpnProtocols(protocol string) []string {
-	var alpnProtocols []string
-
-	switch protocol {
-	case "grpc", "http2":
-		alpnProtocols = append(alpnProtocols, "h2", "http/1.1")
-	case "http":
-		alpnProtocols = append(alpnProtocols, "http/1.1")
-	}
-
-	return alpnProtocols
-}
-
-func (s *Converter) createInboundMeshMTLS(cfgSnap *proxycfg.ConfigSnapshot) (*pbproxystate.TransportSocket, error) {
-	switch cfgSnap.Kind {
-	case structs.ServiceKindConnectProxy:
-	case structs.ServiceKindMeshGateway:
-	default:
-		return nil, fmt.Errorf("cannot inject peering trust bundles for kind %q", cfgSnap.Kind)
-	}
-
-	cfg, err := config.ParseProxyConfig(cfgSnap.Proxy.Config)
-	if err != nil {
-		// Don't hard fail on a config typo, just warn. The parse func returns
-		// default config if there is an error so it's safe to continue.
-		s.Logger.Warn("failed to parse Connect.Proxy.Config", "error", err)
-	}
-
-	// Add all trust bundle peer names, including local.
-	trustBundlePeerNames := []string{"local"}
-	for _, tb := range cfgSnap.PeeringTrustBundles() {
-		trustBundlePeerNames = append(trustBundlePeerNames, tb.PeerName)
-	}
-	// Arbitrary UUID to reference the identity by.
-	uuid, err := uuid.GenerateUUID()
-	if err != nil {
-		return nil, err
-	}
-	// Create the transport socket
-	ts := &pbproxystate.TransportSocket{}
-	ts.ConnectionTls = &pbproxystate.TransportSocket_InboundMesh{
-		InboundMesh: &pbproxystate.InboundMeshMTLS{
-			IdentityKey: uuid,
-			ValidationContext: &pbproxystate.MeshInboundValidationContext{
-				TrustBundlePeerNameKeys: trustBundlePeerNames,
-			},
-		},
-	}
-	s.proxyState.LeafCertificates[uuid] = &pbproxystate.LeafCertificate{
-		Cert: cfgSnap.Leaf().CertPEM,
-		Key:  cfgSnap.Leaf().PrivateKeyPEM,
-	}
-	ts.TlsParameters = makeTLSParametersFromProxyTLSConfig(cfgSnap.MeshConfigTLSIncoming())
-	ts.AlpnProtocols = getAlpnProtocols(cfg.Protocol)
-
-	return ts, nil
-}
-
-func (s *Converter) makeInboundListener(cfgSnap *proxycfg.ConfigSnapshot, name string) (*pbproxystate.Listener, error) {
-	l := &pbproxystate.Listener{}
-	l.Routers = make([]*pbproxystate.Router, 0)
-	var err error
-
-	cfg, err := config.ParseProxyConfig(cfgSnap.Proxy.Config)
-	if err != nil {
-		// Don't hard fail on a config typo, just warn. The parse func returns
-		// default config if there is an error so it's safe to continue.
-		s.Logger.Warn("failed to parse Connect.Proxy.Config", "error", err)
-	}
-
-	// This controls if we do L4 or L7 intention checks.
-	useHTTPFilter := structs.IsProtocolHTTPLike(cfg.Protocol)
-
-	// TODO(proxystate): Escape hatches will be added in the future. This one is a top level escape hatch.
-	// Generate and return custom public listener from config if one was provided.
-	//if cfg.PublicListenerJSON != "" {
-	//	l, err = makeListenerFromUserConfig(cfg.PublicListenerJSON)
-	//	if err != nil {
-	//		return nil, err
-	//	}
-	//
-	//	// For HTTP-like services attach an RBAC http filter and do a best-effort insert
-	//	if useHTTPFilter {
-	//		httpAuthzFilter, err := makeRBACHTTPFilter(
-	//			cfgSnap.ConnectProxy.Intentions,
-	//			cfgSnap.IntentionDefaultAllow,
-	//			rbacLocalInfo{
-	//				trustDomain: cfgSnap.Roots.TrustDomain,
-	//				datacenter:  cfgSnap.Datacenter,
-	//				partition:   cfgSnap.ProxyID.PartitionOrDefault(),
-	//			},
-	//			cfgSnap.ConnectProxy.InboundPeerTrustBundles,
-	//		)
-	//		if err != nil {
-	//			return nil, err
-	//		}
-	//
-	//		// Try our best to inject the HTTP RBAC filter.
-	//		if err := injectHTTPFilterOnFilterChains(l, httpAuthzFilter); err != nil {
-	//			s.Logger.Warn(
-	//				"could not inject the HTTP RBAC filter to enforce intentions on user-provided "+
-	//					"'envoy_public_listener_json' config; falling back on the RBAC network filter instead",
-	//				"proxy", cfgSnap.ProxyID,
-	//				"error", err,
-	//			)
-	//
-	//			// If we get an error inject the RBAC network filter instead.
-	//			useHTTPFilter = false
-	//		}
-	//	}
-	//
-	//	err := s.finalizePublicListenerFromConfig(l, cfgSnap, useHTTPFilter)
-	//	if err != nil {
-	//		return nil, fmt.Errorf("failed to attach Consul filters and TLS context to custom public listener: %v", err)
-	//	}
-	//	return l, nil
-	//}
-
-	// No JSON user config, use default listener address
-	// Default to listening on all addresses, but override with bind address if one is set.
-	addr := cfgSnap.Address
-	if addr == "" {
-		addr = "0.0.0.0"
-	}
-	if cfg.BindAddress != "" {
-		addr = cfg.BindAddress
-	}
-
-	// Override with bind port if one is set, otherwise default to
-	// proxy service's address
-	port := cfgSnap.Port
-	if cfg.BindPort != 0 {
-		port = cfg.BindPort
-	}
-
-	opts := makeListenerOpts{
-		name: name,
-		//accessLogs: cfgSnap.Proxy.AccessLogs,
-		addr:      addr,
-		port:      port,
-		direction: pbproxystate.Direction_DIRECTION_INBOUND,
-		logger:    s.Logger,
-	}
-	l = makeListener(opts)
-	l.BalanceConnections = balanceConnections[cfg.BalanceInboundConnections]
-
-	// TODO(proxystate): Escape hatches will be added in the future. This one is a top level escape hatch.
-	//var tracing *envoy_http_v3.HttpConnectionManager_Tracing
-	//if cfg.ListenerTracingJSON != "" {
-	//	if tracing, err = makeTracingFromUserConfig(cfg.ListenerTracingJSON); err != nil {
-	//		s.Logger.Warn("failed to parse ListenerTracingJSON config", "error", err)
-	//	}
-	//}
-
-	// make local app cluster router
-	localAppRouter := &pbproxystate.Router{}
-
-	destOpts := destinationOpts{
-		protocol:         cfg.Protocol,
-		filterName:       name,
-		routeName:        name,
-		cluster:          xdscommon.LocalAppClusterName,
-		requestTimeoutMs: cfg.LocalRequestTimeoutMs,
-		idleTimeoutMs:    cfg.LocalIdleTimeoutMs,
-		//tracing:          tracing,
-		//accessLogs:       &cfgSnap.Proxy.AccessLogs,
-		logger: s.Logger,
-	}
-
-	err = s.addRouterDestination(destOpts, localAppRouter)
-	if err != nil {
-		return nil, err
-	}
-
-	if useHTTPFilter {
-		l7Dest := localAppRouter.GetL7()
-		if l7Dest == nil {
-			return nil, fmt.Errorf("l7 destination on inbound listener should not be empty")
-		}
-
-		// TODO(proxystate): L7 Intentions and JWT Auth will be added in the future.
-		//jwtFilter, jwtFilterErr := makeJWTAuthFilter(cfgSnap.JWTProviders, cfgSnap.ConnectProxy.Intentions)
-		//if jwtFilterErr != nil {
-		//	return nil, jwtFilterErr
-		//}
-		//rbacFilter, err := makeRBACHTTPFilter(
-		//	cfgSnap.ConnectProxy.Intentions,
-		//	cfgSnap.IntentionDefaultAllow,
-		//	rbacLocalInfo{
-		//		trustDomain: cfgSnap.Roots.TrustDomain,
-		//		datacenter:  cfgSnap.Datacenter,
-		//		partition:   cfgSnap.ProxyID.PartitionOrDefault(),
-		//	},
-		//	cfgSnap.ConnectProxy.InboundPeerTrustBundles,
-		//)
-		//if err != nil {
-		//	return nil, err
-		//}
-		//
-		//filterOpts.httpAuthzFilters = []*envoy_http_v3.HttpFilter{rbacFilter}
-		//
-		//if jwtFilter != nil {
-		//	filterOpts.httpAuthzFilters = append(filterOpts.httpAuthzFilters, jwtFilter)
-		//}
-
-		meshConfig := cfgSnap.MeshConfig()
-		includeXFCC := meshConfig == nil || meshConfig.HTTP == nil || !meshConfig.HTTP.SanitizeXForwardedClientCert
-		l7Dest.IncludeXfcc = includeXFCC
-		l7Dest.Protocol = l7Protocols[cfg.Protocol]
-		if cfg.MaxInboundConnections > 0 {
-			l7Dest.MaxInboundConnections = uint64(cfg.MaxInboundConnections)
-		}
-	} else {
-		l4Dest := localAppRouter.GetL4()
-		if l4Dest == nil {
-			return nil, fmt.Errorf("l4 destination on inbound listener should not be empty")
-		}
-
-		if cfg.MaxInboundConnections > 0 {
-			l4Dest.MaxInboundConnections = uint64(cfg.MaxInboundConnections)
-		}
-
-		l4Dest.TrafficPermissions = &pbproxystate.TrafficPermissions{}
-	}
-	l.Routers = append(l.Routers, localAppRouter)
-
-	err = s.finalizePublicListenerFromConfig(l, cfgSnap)
-	if err != nil {
-		return nil, fmt.Errorf("failed to attach Consul filters and TLS context to custom public listener: %v", err)
-	}
-
-	// When permissive mTLS mode is enabled, include an additional router
-	// that matches on the `destination_port == <service port>`. Traffic sent
-	// directly to the service port is passed through to the application
-	// unmodified.
-	if cfgSnap.Proxy.Mode == structs.ProxyModeTransparent &&
-		cfgSnap.Proxy.MutualTLSMode == structs.MutualTLSModePermissive {
-		router, err := makePermissiveRouter(cfgSnap, destOpts)
-		if err != nil {
-			return nil, fmt.Errorf("unable to add permissive mtls router: %w", err)
-		}
-		if router == nil {
-			s.Logger.Debug("no service port defined for service in permissive mTLS mode; not adding filter chain for non-mTLS traffic")
-		} else {
-			l.Routers = append(l.Routers, router)
-
-			// With tproxy, the REDIRECT iptables target rewrites the destination ip/port
-			// to the proxy ip/port (e.g. 127.0.0.1:20000) for incoming packets.
-			// We need the original_dst filter to recover the original destination address.
-			l.Capabilities = append(l.Capabilities, pbproxystate.Capability_CAPABILITY_TRANSPARENT)
-		}
-	}
-	return l, err
-}
-
-func makePermissiveRouter(cfgSnap *proxycfg.ConfigSnapshot, opts destinationOpts) (*pbproxystate.Router, error) {
-	servicePort := cfgSnap.Proxy.LocalServicePort
-	if servicePort <= 0 {
-		// No service port means the service does not accept incoming traffic, so
-		// the connect proxy does not need to listen for incoming non-mTLS traffic.
-		return nil, nil
-	}
-
-	opts.statPrefix += "permissive_"
-	dest, err := makeL4Destination(opts)
-	if err != nil {
-		return nil, err
-	}
-
-	router := &pbproxystate.Router{
-		Match: &pbproxystate.Match{
-			DestinationPort: &wrapperspb.UInt32Value{Value: uint32(servicePort)},
-		},
-		Destination: &pbproxystate.Router_L4{L4: dest},
-	}
-	return router, nil
-}
-
-// finalizePublicListenerFromConfig is used for best-effort injection of L4 intentions and TLS onto listeners.
-func (s *Converter) finalizePublicListenerFromConfig(l *pbproxystate.Listener, cfgSnap *proxycfg.ConfigSnapshot) error {
-	// TODO(proxystate): L4 intentions will be added in the future.
-	//if !useHTTPFilter {
-	//	// Best-effort injection of L4 intentions
-	//	if err := s.injectConnectFilters(cfgSnap, l); err != nil {
-	//		return nil
-	//	}
-	//}
-
-	// Always apply TLS certificates
-	if err := s.injectConnectTLSForPublicListener(cfgSnap, l); err != nil {
-		return nil
-	}
-
-	return nil
-}
-
-func (s *Converter) makeExposedCheckListener(cfgSnap *proxycfg.ConfigSnapshot, cluster string, path structs.ExposePath) (*pbproxystate.Listener, error) {
-	cfg, err := config.ParseProxyConfig(cfgSnap.Proxy.Config)
-	if err != nil {
-		// Don't hard fail on a config typo, just warn. The parse func returns
-		// default config if there is an error so it's safe to continue.
-		s.Logger.Warn("failed to parse Connect.Proxy.Config", "error", err)
-	}
-
-	// No user config, use default listener
-	addr := cfgSnap.Address
-
-	// Override with bind address if one is set, otherwise default to 0.0.0.0
-	if cfg.BindAddress != "" {
-		addr = cfg.BindAddress
-	} else if addr == "" {
-		addr = "0.0.0.0"
-	}
-
-	// Strip any special characters from path to make a valid and hopefully unique name
-	r := regexp.MustCompile(`[^a-zA-Z0-9]+`)
-	strippedPath := r.ReplaceAllString(path.Path, "")
-	listenerName := fmt.Sprintf("exposed_path_%s", strippedPath)
-
-	listenerOpts := makeListenerOpts{
-		name: listenerName,
-		//accessLogs: cfgSnap.Proxy.AccessLogs,
-		addr:      addr,
-		port:      path.ListenerPort,
-		direction: pbproxystate.Direction_DIRECTION_INBOUND,
-		logger:    s.Logger,
-	}
-	l := makeListener(listenerOpts)
-
-	filterName := fmt.Sprintf("exposed_path_filter_%s_%d", strippedPath, path.ListenerPort)
-
-	destOpts := destinationOpts{
-		useRDS:           false,
-		protocol:         path.Protocol,
-		filterName:       filterName,
-		routeName:        filterName,
-		cluster:          cluster,
-		statPrefix:       "",
-		routePath:        path.Path,
-		httpAuthzFilters: nil,
-		//accessLogs:       &cfgSnap.Proxy.AccessLogs,
-		logger: s.Logger,
-		// in the exposed check listener we don't set the tracing configuration
-	}
-
-	router := &pbproxystate.Router{}
-	err = s.addRouterDestination(destOpts, router)
-	if err != nil {
-		return nil, err
-	}
-
-	// For registered checks restrict traffic sources to localhost and Consul's advertise addr
-	if path.ParsedFromCheck {
-
-		// For the advertise addr we use a CidrRange that only matches one address
-		advertise := s.CfgFetcher.AdvertiseAddrLAN()
-
-		// Get prefix length based on whether address is ipv4 (32 bits) or ipv6 (128 bits)
-		advertiseLen := 32
-		ip := net.ParseIP(advertise)
-		if ip != nil && strings.Contains(advertise, ":") {
-			advertiseLen = 128
-		}
-
-		ranges := make([]*pbproxystate.CidrRange, 0, 3)
-		ranges = append(ranges,
-			&pbproxystate.CidrRange{AddressPrefix: "127.0.0.1", PrefixLen: &wrapperspb.UInt32Value{Value: 8}},
-			&pbproxystate.CidrRange{AddressPrefix: advertise, PrefixLen: &wrapperspb.UInt32Value{Value: uint32(advertiseLen)}},
-		)
-
-		if ok, err := platform.SupportsIPv6(); err != nil {
-			return nil, err
-		} else if ok {
-			ranges = append(ranges,
-				&pbproxystate.CidrRange{AddressPrefix: "::1", PrefixLen: &wrapperspb.UInt32Value{Value: 128}},
-			)
-		}
-
-		router.Match = &pbproxystate.Match{
-			SourcePrefixRanges: ranges,
-		}
-	}
-
-	l.Routers = []*pbproxystate.Router{router}
-
-	return l, err
-}
-
-// TODO(proxystate): Gateway support will be added in the future.
-// Functions and types to convert from agent/xds/listeners.go:
-// func makeTerminatingGatewayListener
-// type terminatingGatewayFilterChainOpts
-// func makeFilterChainTerminatingGateway
-// func makeMeshGatewayListener
-// func makeMeshGatewayPeerFilterChain
-
-type routerOpts struct {
-	//accessLogs           *structs.AccessLogsConfig
-	routeName   string
-	clusterName string
-	filterName  string
-	protocol    string
-	useRDS      bool
-	statPrefix  string
-	//forwardClientDetails bool
-	//forwardClientPolicy  envoy_http_v3.HttpConnectionManager_ForwardClientCertDetails
-	//tracing              *envoy_http_v3.HttpConnectionManager_Tracing
-}
-
-func (g *Converter) makeUpstreamRouter(opts routerOpts) (*pbproxystate.Router, error) {
-	if opts.statPrefix == "" {
-		opts.statPrefix = "upstream."
-	}
-
-	router := &pbproxystate.Router{}
-
-	err := g.addRouterDestination(destinationOpts{
-		useRDS:     opts.useRDS,
-		protocol:   opts.protocol,
-		filterName: opts.filterName,
-		routeName:  opts.routeName,
-		cluster:    opts.clusterName,
-		statPrefix: opts.statPrefix,
-		//forwardClientDetails: opts.forwardClientDetails,
-		//forwardClientPolicy:  opts.forwardClientPolicy,
-		//tracing:              opts.tracing,
-		//accessLogs:           opts.accessLogs,
-		logger: g.Logger,
-	}, router)
-	if err != nil {
-		return nil, err
-	}
-
-	return router, nil
-}
-
-// simpleChainTarget returns the discovery target for a chain with a single node.
-// A chain can have a single target if it is for a TCP service or an HTTP service without
-// multiple splits/routes/failovers.
-func simpleChainTarget(chain *structs.CompiledDiscoveryChain) (*structs.DiscoveryTarget, error) {
-	startNode := chain.Nodes[chain.StartNode]
-	if startNode == nil {
-		return nil, fmt.Errorf("missing first node in compiled discovery chain for: %s", chain.ServiceName)
-	}
-	if startNode.Type != structs.DiscoveryGraphNodeTypeResolver {
-		return nil, fmt.Errorf("expected discovery chain with single node, found unexpected start node: %s", startNode.Type)
-	}
-	targetID := startNode.Resolver.Target
-	return chain.Targets[targetID], nil
-}
-
-func (s *Converter) getAndModifyUpstreamConfigForListener(
-	uid proxycfg.UpstreamID,
-	u *structs.Upstream,
-	chain *structs.CompiledDiscoveryChain,
-) structs.UpstreamConfig {
-	var (
-		cfg structs.UpstreamConfig
-		err error
-	)
-
-	configMap := make(map[string]interface{})
-	if u != nil {
-		configMap = u.Config
-	}
-	if chain == nil || chain.Default {
-		cfg, err = structs.ParseUpstreamConfigNoDefaults(configMap)
-		if err != nil {
-			// Don't hard fail on a config typo, just warn. The parse func returns
-			// default config if there is an error so it's safe to continue.
-			s.Logger.Warn("failed to parse", "upstream", uid, "error", err)
-		}
-	} else {
-		// Use NoDefaults here so that we can set the protocol to the chain
-		// protocol if necessary
-		cfg, err = structs.ParseUpstreamConfigNoDefaults(configMap)
-		if err != nil {
-			// Don't hard fail on a config typo, just warn. The parse func returns
-			// default config if there is an error so it's safe to continue.
-			s.Logger.Warn("failed to parse", "upstream", uid, "error", err)
-		}
-
-		if cfg.EnvoyListenerJSON != "" {
-			s.Logger.Warn("ignoring escape hatch setting because already configured for",
-				"discovery chain", chain.ServiceName, "upstream", uid, "config", "envoy_listener_json")
-
-			// Remove from config struct so we don't use it later on
-			cfg.EnvoyListenerJSON = ""
-		}
-	}
-	protocol := cfg.Protocol
-	if chain != nil {
-		if protocol == "" {
-			protocol = chain.Protocol
-		}
-		if protocol == "" {
-			protocol = "tcp"
-		}
-	} else {
-		protocol = "tcp"
-	}
-
-	// set back on the config so that we can use it from return value
-	cfg.Protocol = protocol
-
-	return cfg
-}
-
-func (s *Converter) getAndModifyUpstreamConfigForPeeredListener(
-	uid proxycfg.UpstreamID,
-	u *structs.Upstream,
-	peerMeta structs.PeeringServiceMeta,
-) structs.UpstreamConfig {
-	var (
-		cfg structs.UpstreamConfig
-		err error
-	)
-
-	configMap := make(map[string]interface{})
-	if u != nil {
-		configMap = u.Config
-	}
-
-	cfg, err = structs.ParseUpstreamConfigNoDefaults(configMap)
-	if err != nil {
-		// Don't hard fail on a config typo, just warn. The parse func returns
-		// default config if there is an error so it's safe to continue.
-		s.Logger.Warn("failed to parse", "upstream", uid, "error", err)
-	}
-
-	// Ignore the configured protocol for peer upstreams, since it is defined by the remote
-	// cluster, which we cannot control.
-	protocol := peerMeta.Protocol
-	if protocol == "" {
-		protocol = "tcp"
-	}
-
-	// set back on the config so that we can use it from return value
-	cfg.Protocol = protocol
-
-	if cfg.ConnectTimeoutMs == 0 {
-		cfg.ConnectTimeoutMs = 5000
-	}
-
-	if cfg.MeshGateway.Mode == "" && u != nil {
-		cfg.MeshGateway = u.MeshGateway
-	}
-
-	return cfg
-}
-
-type destinationOpts struct {
-	// All listener filters
-	// TODO(proxystate): access logs support will be added later
-	//accessLogs *structs.AccessLogsConfig
-	cluster    string
-	filterName string
-	logger     hclog.Logger
-	protocol   string
-	statPrefix string
-
-	// HTTP listener filter options
-	forwardClientDetails bool
-	forwardClientPolicy  envoy_http_v3.HttpConnectionManager_ForwardClientCertDetails
-	httpAuthzFilters     []*envoy_http_v3.HttpFilter
-	idleTimeoutMs        *int
-	requestTimeoutMs     *int
-	routeName            string
-	routePath            string
-	// TODO(proxystate): tracing support will be added later
-	//tracing              *envoy_http_v3.HttpConnectionManager_Tracing
-	useRDS bool
-}
-
-func (g *Converter) addRouterDestination(opts destinationOpts, router *pbproxystate.Router) error {
-	switch opts.protocol {
-	case "grpc", "http2", "http":
-		dest, err := g.makeL7Destination(opts)
-		if err != nil {
-			return err
-		}
-		router.Destination = &pbproxystate.Router_L7{
-			L7: dest,
-		}
-		return nil
-	case "tcp":
-		fallthrough
-	default:
-		if opts.useRDS {
-			return fmt.Errorf("RDS is not compatible with the tcp proxy filter")
-		} else if opts.cluster == "" {
-			return fmt.Errorf("cluster name is required for a tcp proxy filter")
-		}
-		dest, err := makeL4Destination(opts)
-		if err != nil {
-			return err
-		}
-		router.Destination = &pbproxystate.Router_L4{
-			L4: dest,
-		}
-		return nil
-	}
-}
-
-func makeL4Destination(opts destinationOpts) (*pbproxystate.L4Destination, error) {
-	// TODO(proxystate): implement access logs at top level
-	//accessLogs, err := accesslogs.MakeAccessLogs(opts.accessLogs, false)
-	//if err != nil && opts.logger != nil {
-	//	opts.logger.Warn("could not make access log xds for tcp proxy", err)
-	//}
-
-	l4Dest := &pbproxystate.L4Destination{
-		//AccessLog:        accessLogs,
-		Destination: &pbproxystate.L4Destination_Cluster{
-			Cluster: &pbproxystate.DestinationCluster{
-				Name: opts.cluster,
-			},
-		},
-		StatPrefix: makeStatPrefix(opts.statPrefix, opts.filterName),
-	}
-	return l4Dest, nil
-}
-
-func makeStatPrefix(prefix, filterName string) string {
-	// Replace colons here because Envoy does that in the metrics for the actual
-	// clusters but doesn't in the stat prefix here while dashboards assume they
-	// will match.
-	return fmt.Sprintf("%s%s", prefix, strings.Replace(filterName, ":", "_", -1))
-}
-
-func (g *Converter) makeL7Destination(opts destinationOpts) (*pbproxystate.L7Destination, error) {
-	dest := &pbproxystate.L7Destination{}
-
-	// TODO(proxystate) access logs will be added to proxystate top level and in xds generation
-	//accessLogs, err := accesslogs.MakeAccessLogs(opts.accessLogs, false)
-	//if err != nil && opts.logger != nil {
-	//	opts.logger.Warn("could not make access log xds for http connection manager", err)
-	//}
-
-	// An L7 Destination's name will be the route name, so during xds generation the route can be looked up.
-	dest.Name = opts.routeName
-	dest.StatPrefix = makeStatPrefix(opts.statPrefix, opts.filterName)
-
-	// TODO(proxystate) tracing will be added at the top level proxystate and xds generation
-	//if opts.tracing != nil {
-	//	cfg.Tracing = opts.tracing
-	//}
-
-	if opts.useRDS {
-		if opts.cluster != "" {
-			return nil, fmt.Errorf("cannot specify cluster name when using RDS")
-		}
-	} else {
-		dest.StaticRoute = true
-
-		if opts.cluster == "" {
-			return nil, fmt.Errorf("must specify cluster name when not using RDS")
-		}
-
-		routeRule := &pbproxystate.RouteRule{
-			Match: &pbproxystate.RouteMatch{
-				PathMatch: &pbproxystate.PathMatch{
-					PathMatch: &pbproxystate.PathMatch_Prefix{
-						Prefix: "/",
-					},
-				},
-				// TODO(banks) Envoy supports matching only valid GRPC
-				// requests which might be nice to add here for gRPC services
-				// but it's not supported in our current envoy SDK version
-				// although docs say it was supported by 1.8.0. Going to defer
-				// that until we've updated the deps.
-			},
-			Destination: &pbproxystate.RouteDestination{
-				Destination: &pbproxystate.RouteDestination_Cluster{
-					Cluster: &pbproxystate.DestinationCluster{
-						Name: opts.cluster,
-					},
-				},
-			},
-		}
-
-		var timeoutCfg *pbproxystate.TimeoutConfig
-		r := routeRule.GetDestination()
-
-		if opts.requestTimeoutMs != nil {
-			if timeoutCfg == nil {
-				timeoutCfg = &pbproxystate.TimeoutConfig{}
-			}
-			timeoutCfg.Timeout = durationpb.New(time.Duration(*opts.requestTimeoutMs) * time.Millisecond)
-		}
-
-		if opts.idleTimeoutMs != nil {
-			if timeoutCfg == nil {
-				timeoutCfg = &pbproxystate.TimeoutConfig{}
-			}
-			timeoutCfg.IdleTimeout = durationpb.New(time.Duration(*opts.idleTimeoutMs) * time.Millisecond)
-		}
-		r.DestinationConfiguration = &pbproxystate.DestinationConfiguration{
-			TimeoutConfig: timeoutCfg,
-		}
-
-		// If a path is provided, do not match on a catch-all prefix
-		if opts.routePath != "" {
-			routeRule.Match.PathMatch = &pbproxystate.PathMatch{
-				PathMatch: &pbproxystate.PathMatch_Exact{
-					Exact: opts.routePath,
-				},
-			}
-		}
-
-		// Create static route object
-		route := &pbproxystate.Route{
-			VirtualHosts: []*pbproxystate.VirtualHost{
-				{
-					Name:    opts.filterName,
-					Domains: []string{"*"},
-					RouteRules: []*pbproxystate.RouteRule{
-						routeRule,
-					},
-				},
-			},
-		}
-		// Save the route to proxy state.
-		g.proxyState.Routes[opts.routeName] = route
-	}
-
-	dest.Protocol = l7Protocols[opts.protocol]
-
-	// TODO(proxystate) need to include xfcc policy in future L7 task
-	//// Note the default leads to setting HttpConnectionManager_SANITIZE
-	//if opts.forwardClientDetails {
-	//	cfg.ForwardClientCertDetails = opts.forwardClientPolicy
-	//	cfg.SetCurrentClientCertDetails = &envoy_http_v3.HttpConnectionManager_SetCurrentClientCertDetails{
-	//		Subject: &wrapperspb.BoolValue{Value: true},
-	//		Cert:    true,
-	//		Chain:   true,
-	//		Dns:     true,
-	//		Uri:     true,
-	//	}
-	//}
-
-	// Like injectConnectFilters for L4, here we ensure that the first filter
-	// (other than the "envoy.grpc_http1_bridge" filter) in the http filter
-	// chain of a public listener is the authz filter to prevent unauthorized
-	// access and that every filter chain uses our TLS certs.
-	if len(opts.httpAuthzFilters) > 0 {
-		// TODO(proxystate) support intentions in the future
-		dest.TrafficPermissions = &pbproxystate.TrafficPermissions{}
-		//cfg.HttpFilters = append(opts.httpAuthzFilters, cfg.HttpFilters...)
-	}
-
-	// TODO(proxystate) add grpc http filters in xds in future L7 task
-	//if opts.protocol == "grpc" {
-	//	grpcHttp1Bridge, err := makeEnvoyHTTPFilter(
-	//		"envoy.filters.http.grpc_http1_bridge",
-	//		&envoy_grpc_http1_bridge_v3.Config{},
-	//	)
-	//	if err != nil {
-	//		return nil, err
-	//	}
-	//
-	//	// In envoy 1.14.x the default value "stats_for_all_methods=true" was
-	//	// deprecated, and was changed to "false" in 1.18.x. Avoid using the
-	//	// default. TODO: we may want to expose this to users somehow easily.
-	//	grpcStatsFilter, err := makeEnvoyHTTPFilter(
-	//		"envoy.filters.http.grpc_stats",
-	//		&envoy_grpc_stats_v3.FilterConfig{
-	//			PerMethodStatSpecifier: &envoy_grpc_stats_v3.FilterConfig_StatsForAllMethods{
-	//				StatsForAllMethods: makeBoolValue(true),
-	//			},
-	//		},
-	//	)
-	//	if err != nil {
-	//		return nil, err
-	//	}
-	//
-	//	// Add grpc bridge before router and authz, and the stats in front of that.
-	//	cfg.HttpFilters = append([]*envoy_http_v3.HttpFilter{
-	//		grpcStatsFilter,
-	//		grpcHttp1Bridge,
-	//	}, cfg.HttpFilters...)
-	//}
-
-	return dest, nil
-}
-
-var tlsVersionsWithConfigurableCipherSuites = map[types.TLSVersion]struct{}{
-	// Remove these two if Envoy ever sets TLS 1.3 as default minimum
-	types.TLSVersionUnspecified: {},
-	types.TLSVersionAuto:        {},
-
-	types.TLSv1_0: {},
-	types.TLSv1_1: {},
-	types.TLSv1_2: {},
-}
-
-func makeTLSParametersFromProxyTLSConfig(tlsConf *structs.MeshDirectionalTLSConfig) *pbproxystate.TLSParameters {
-	if tlsConf == nil {
-		return &pbproxystate.TLSParameters{}
-	}
-
-	return makeTLSParametersFromTLSConfig(tlsConf.TLSMinVersion, tlsConf.TLSMaxVersion, tlsConf.CipherSuites)
-}
-
-func makeTLSParametersFromTLSConfig(
-	tlsMinVersion types.TLSVersion,
-	tlsMaxVersion types.TLSVersion,
-	cipherSuites []types.TLSCipherSuite,
-) *pbproxystate.TLSParameters {
-	tlsParams := pbproxystate.TLSParameters{}
-
-	if tlsMinVersion != types.TLSVersionUnspecified {
-		tlsParams.MinVersion = tlsVersions[tlsMinVersion]
-	}
-	if tlsMaxVersion != types.TLSVersionUnspecified {
-		tlsParams.MaxVersion = tlsVersions[tlsMaxVersion]
-	}
-	if len(cipherSuites) != 0 {
-		var suites []pbproxystate.TLSCipherSuite
-		for _, cs := range cipherSuites {
-			suites = append(suites, tlsCipherSuites[cs])
-		}
-		tlsParams.CipherSuites = suites
-	}
-
-	return &tlsParams
-}
-
-var tlsVersions = map[types.TLSVersion]pbproxystate.TLSVersion{
-	types.TLSVersionAuto: pbproxystate.TLSVersion_TLS_VERSION_AUTO,
-	types.TLSv1_0:        pbproxystate.TLSVersion_TLS_VERSION_1_0,
-	types.TLSv1_1:        pbproxystate.TLSVersion_TLS_VERSION_1_1,
-	types.TLSv1_2:        pbproxystate.TLSVersion_TLS_VERSION_1_2,
-	types.TLSv1_3:        pbproxystate.TLSVersion_TLS_VERSION_1_3,
-}
-
-var tlsCipherSuites = map[types.TLSCipherSuite]pbproxystate.TLSCipherSuite{
-	types.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:       pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_AES128_GCM_SHA256,
-	types.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256: pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_CHACHA20_POLY1305,
-	types.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:         pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_AES128_GCM_SHA256,
-	types.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256:   pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_CHACHA20_POLY1305,
-	types.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:          pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_AES128_SHA,
-	types.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:            pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_AES128_SHA,
-	types.TLS_RSA_WITH_AES_128_GCM_SHA256:               pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_AES128_GCM_SHA256,
-	types.TLS_RSA_WITH_AES_128_CBC_SHA:                  pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_AES128_SHA,
-	types.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:       pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_AES256_GCM_SHA384,
-	types.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:         pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_AES256_GCM_SHA384,
-	types.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:          pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_AES256_SHA,
-	types.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:            pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_AES256_SHA,
-	types.TLS_RSA_WITH_AES_256_GCM_SHA384:               pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_AES256_GCM_SHA384,
-	types.TLS_RSA_WITH_AES_256_CBC_SHA:                  pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_AES256_SHA,
-}
-
-var l7Protocols = map[string]pbproxystate.L7Protocol{
-	"http":  pbproxystate.L7Protocol_L7_PROTOCOL_HTTP,
-	"http2": pbproxystate.L7Protocol_L7_PROTOCOL_HTTP2,
-	"grpc":  pbproxystate.L7Protocol_L7_PROTOCOL_GRPC,
-}
-
-var balanceConnections = map[string]pbproxystate.BalanceConnections{
-	"":                             pbproxystate.BalanceConnections_BALANCE_CONNECTIONS_DEFAULT,
-	structs.ConnectionExactBalance: pbproxystate.BalanceConnections_BALANCE_CONNECTIONS_EXACT,
-}
diff --git a/agent/xds/proxystateconverter/locality_policy.go b/agent/xds/proxystateconverter/locality_policy.go
deleted file mode 100644
index c33f428fc2e27..0000000000000
--- a/agent/xds/proxystateconverter/locality_policy.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxystateconverter
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-func groupedEndpoints(locality *structs.Locality, policy *structs.DiscoveryPrioritizeByLocality, csns structs.CheckServiceNodes) ([]structs.CheckServiceNodes, error) {
-	switch {
-	case policy == nil || policy.Mode == "" || policy.Mode == "none":
-		return []structs.CheckServiceNodes{csns}, nil
-	case policy.Mode == "failover":
-		return prioritizeByLocalityFailover(locality, csns), nil
-	default:
-		return nil, fmt.Errorf("unexpected priortize-by-locality mode %q", policy.Mode)
-	}
-}
diff --git a/agent/xds/proxystateconverter/locality_policy_ce.go b/agent/xds/proxystateconverter/locality_policy_ce.go
deleted file mode 100644
index cd7a3e7912e1f..0000000000000
--- a/agent/xds/proxystateconverter/locality_policy_ce.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package proxystateconverter
-
-import (
-	"github.com/hashicorp/consul/agent/structs"
-)
-
-func prioritizeByLocalityFailover(locality *structs.Locality, csns structs.CheckServiceNodes) []structs.CheckServiceNodes {
-	return nil
-}
diff --git a/agent/xds/proxystateconverter/routes.go b/agent/xds/proxystateconverter/routes.go
deleted file mode 100644
index 9cdd24fe12b05..0000000000000
--- a/agent/xds/proxystateconverter/routes.go
+++ /dev/null
@@ -1,777 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxystateconverter
-
-import (
-	"errors"
-	"fmt"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/consul/agent/xds/response"
-
-	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/structs"
-	"google.golang.org/protobuf/types/known/durationpb"
-)
-
-// routesFromSnapshot returns the xDS API representation of the "routes" in the
-// snapshot.
-func (s *Converter) routesFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) error {
-	if cfgSnap == nil {
-		return errors.New("nil config given")
-	}
-
-	switch cfgSnap.Kind {
-	case structs.ServiceKindConnectProxy:
-		return s.routesForConnectProxy(cfgSnap)
-	// TODO(proxystate): Ingress Gateways will be added in the future.
-	//case structs.ServiceKindIngressGateway:
-	//	return s.routesForIngressGateway(cfgSnap)
-	// TODO(proxystate): API Gateways will be added in the future.
-	//case structs.ServiceKindAPIGateway:
-	//	return s.routesForAPIGateway(cfgSnap)
-	// TODO(proxystate): Terminating Gateways will be added in the future.
-	//case structs.ServiceKindTerminatingGateway:
-	//	return s.routesForTerminatingGateway(cfgSnap)
-	// TODO(proxystate): Mesh Gateways will be added in the future.
-	//case structs.ServiceKindMeshGateway:
-	//	return s.routesForMeshGateway(cfgSnap)
-	default:
-		return fmt.Errorf("Invalid service kind: %v", cfgSnap.Kind)
-	}
-}
-
-// routesFromSnapshotConnectProxy returns the xDS API representation of the
-// "routes" in the snapshot.
-func (s *Converter) routesForConnectProxy(cfgSnap *proxycfg.ConfigSnapshot) error {
-	for uid, chain := range cfgSnap.ConnectProxy.DiscoveryChain {
-		if chain.Default {
-			continue
-		}
-
-		virtualHost, err := s.makeUpstreamHostForDiscoveryChain(cfgSnap, uid, chain, []string{"*"}, false)
-		if err != nil {
-			return err
-		}
-		if virtualHost == nil {
-			continue
-		}
-
-		route := &pbproxystate.Route{
-			VirtualHosts: []*pbproxystate.VirtualHost{virtualHost},
-		}
-		s.proxyState.Routes[uid.EnvoyID()] = route
-	}
-	addressesMap := make(map[string]map[string]string)
-	err := cfgSnap.ConnectProxy.DestinationsUpstream.ForEachKeyE(func(uid proxycfg.UpstreamID) error {
-		svcConfig, ok := cfgSnap.ConnectProxy.DestinationsUpstream.Get(uid)
-		if !ok || svcConfig == nil {
-			return nil
-		}
-		if !structs.IsProtocolHTTPLike(svcConfig.Protocol) {
-			// Routes can only be defined for HTTP services
-			return nil
-		}
-
-		for _, address := range svcConfig.Destination.Addresses {
-
-			routeName := clusterNameForDestination(cfgSnap, "~http", fmt.Sprintf("%d", svcConfig.Destination.Port), svcConfig.NamespaceOrDefault(), svcConfig.PartitionOrDefault())
-			if _, ok := addressesMap[routeName]; !ok {
-				addressesMap[routeName] = make(map[string]string)
-			}
-			// cluster name is unique per address/port so we should not be doing any override here
-			clusterName := clusterNameForDestination(cfgSnap, svcConfig.Name, address, svcConfig.NamespaceOrDefault(), svcConfig.PartitionOrDefault())
-			addressesMap[routeName][clusterName] = address
-		}
-		return nil
-	})
-
-	if err != nil {
-		return err
-	}
-
-	for routeName, clusters := range addressesMap {
-		route, err := s.makeRouteForAddresses(clusters)
-		if err != nil {
-			return err
-		}
-		if route != nil {
-			s.proxyState.Routes[routeName] = route
-		}
-	}
-
-	// TODO(rb): make sure we don't generate an empty result
-	return nil
-}
-
-func (s *Converter) makeRouteForAddresses(addresses map[string]string) (*pbproxystate.Route, error) {
-	route, err := makeAddressesRoute(addresses)
-	if err != nil {
-		s.Logger.Error("failed to make route", "cluster", "error", err)
-		return nil, err
-	}
-
-	return route, nil
-}
-
-// TODO(proxystate): Terminating Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func routesForTerminatingGateway
-
-// TODO(proxystate): Mesh Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func routesForMeshGateway
-
-func makeAddressesRoute(addresses map[string]string) (*pbproxystate.Route, error) {
-	route := &pbproxystate.Route{}
-	for clusterName, address := range addresses {
-		destination := makeRouteDestinationFromName(clusterName)
-		virtualHost := &pbproxystate.VirtualHost{
-			Name:    clusterName,
-			Domains: []string{address},
-			RouteRules: []*pbproxystate.RouteRule{
-				{
-					Match:       makeDefaultRouteMatch(),
-					Destination: destination,
-				},
-			},
-		}
-		route.VirtualHosts = append(route.VirtualHosts, virtualHost)
-	}
-
-	// sort virtual hosts to have a stable order
-	sort.SliceStable(route.VirtualHosts, func(i, j int) bool {
-		return route.VirtualHosts[i].Name > route.VirtualHosts[j].Name
-	})
-	return route, nil
-}
-
-// makeRouteDestinationFromName (fka makeRouteActionFromName)
-func makeRouteDestinationFromName(clusterName string) *pbproxystate.RouteDestination {
-	return &pbproxystate.RouteDestination{
-		Destination: &pbproxystate.RouteDestination_Cluster{
-			Cluster: &pbproxystate.DestinationCluster{
-				Name: clusterName,
-			},
-		},
-	}
-}
-
-// TODO(proxystate): Ingress Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func routesForIngressGateway
-
-// TODO(proxystate): API Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func routesForAPIGateway
-// func buildHTTPRouteUpstream
-
-// TODO(proxystate): Ingress Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func findIngressServiceMatchingUpstream
-
-// TODO(proxystate): Ingress Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func generateUpstreamIngressDomains
-
-// TODO(proxystate): Ingress Gateways will be added in the future.
-// Functions to add from agent/xds/clusters.go:
-// func generateUpstreamAPIsDomains
-
-func (s *Converter) makeUpstreamHostForDiscoveryChain(
-	cfgSnap *proxycfg.ConfigSnapshot,
-	uid proxycfg.UpstreamID,
-	chain *structs.CompiledDiscoveryChain,
-	serviceDomains []string,
-	forMeshGateway bool,
-) (*pbproxystate.VirtualHost, error) {
-	var routeRules []*pbproxystate.RouteRule
-
-	startNode := chain.Nodes[chain.StartNode]
-	if startNode == nil {
-		return nil, fmt.Errorf("missing first node in compiled discovery chain for: %s", chain.ServiceName)
-	}
-
-	upstreamsSnapshot, err := cfgSnap.ToConfigSnapshotUpstreams()
-	if err != nil && !forMeshGateway {
-		return nil, err
-	}
-
-	switch startNode.Type {
-	case structs.DiscoveryGraphNodeTypeRouter:
-		routeRules = make([]*pbproxystate.RouteRule, 0, len(startNode.Routes))
-
-		for _, discoveryRoute := range startNode.Routes {
-			routeMatch := makeRouteMatchForDiscoveryRoute(discoveryRoute)
-
-			var (
-				routeDestination *pbproxystate.RouteDestination
-				err              error
-			)
-
-			nextNode := chain.Nodes[discoveryRoute.NextNode]
-
-			var lb *structs.LoadBalancer
-			if nextNode.LoadBalancer != nil {
-				lb = nextNode.LoadBalancer
-			}
-
-			switch nextNode.Type {
-			case structs.DiscoveryGraphNodeTypeSplitter:
-				routeDestination, err = s.makeRouteDestinationForSplitter(upstreamsSnapshot, nextNode.Splits, chain, forMeshGateway)
-				if err != nil {
-					return nil, err
-				}
-
-			case structs.DiscoveryGraphNodeTypeResolver:
-				rd, ok := s.makeRouteDestinationForChainCluster(upstreamsSnapshot, nextNode.Resolver.Target, chain, forMeshGateway)
-				if !ok {
-					continue
-				}
-				routeDestination = rd
-
-			default:
-				return nil, fmt.Errorf("unexpected graph node after route %q", nextNode.Type)
-			}
-
-			routeDestination.DestinationConfiguration = &pbproxystate.DestinationConfiguration{}
-			if err := injectLBToDestinationConfiguration(lb, routeDestination.DestinationConfiguration); err != nil {
-				return nil, fmt.Errorf("failed to apply load balancer configuration to route action: %v", err)
-			}
-
-			// TODO(rb): Better help handle the envoy case where you need (prefix=/foo/,rewrite=/) and (exact=/foo,rewrite=/) to do a full rewrite
-
-			destination := discoveryRoute.Definition.Destination
-
-			routeRule := &pbproxystate.RouteRule{}
-
-			if destination != nil {
-				configHandle := routeDestination.DestinationConfiguration
-				if destination.PrefixRewrite != "" {
-					configHandle.PrefixRewrite = destination.PrefixRewrite
-				}
-
-				if destination.RequestTimeout > 0 || destination.IdleTimeout > 0 {
-					configHandle.TimeoutConfig = &pbproxystate.TimeoutConfig{}
-				}
-				if destination.RequestTimeout > 0 {
-					configHandle.TimeoutConfig.Timeout = durationpb.New(destination.RequestTimeout)
-				}
-				if destination.IdleTimeout > 0 {
-					configHandle.TimeoutConfig.IdleTimeout = durationpb.New(destination.IdleTimeout)
-				}
-
-				if destination.HasRetryFeatures() {
-					configHandle.RetryPolicy = getRetryPolicyForDestination(destination)
-				}
-
-				if err := injectHeaderManipToRoute(destination, routeRule); err != nil {
-					return nil, fmt.Errorf("failed to apply header manipulation configuration to route: %v", err)
-				}
-			}
-
-			routeRule.Match = routeMatch
-			routeRule.Destination = routeDestination
-
-			routeRules = append(routeRules, routeRule)
-		}
-
-	case structs.DiscoveryGraphNodeTypeSplitter:
-		routeDestination, err := s.makeRouteDestinationForSplitter(upstreamsSnapshot, startNode.Splits, chain, forMeshGateway)
-		if err != nil {
-			return nil, err
-		}
-		var lb *structs.LoadBalancer
-		if startNode.LoadBalancer != nil {
-			lb = startNode.LoadBalancer
-		}
-		routeDestination.DestinationConfiguration = &pbproxystate.DestinationConfiguration{}
-		if err := injectLBToDestinationConfiguration(lb, routeDestination.DestinationConfiguration); err != nil {
-			return nil, fmt.Errorf("failed to apply load balancer configuration to route action: %v", err)
-		}
-
-		defaultRoute := &pbproxystate.RouteRule{
-			Match:       makeDefaultRouteMatch(),
-			Destination: routeDestination,
-		}
-
-		routeRules = []*pbproxystate.RouteRule{defaultRoute}
-
-	case structs.DiscoveryGraphNodeTypeResolver:
-		routeDestination, ok := s.makeRouteDestinationForChainCluster(upstreamsSnapshot, startNode.Resolver.Target, chain, forMeshGateway)
-		if !ok {
-			break
-		}
-		var lb *structs.LoadBalancer
-		if startNode.LoadBalancer != nil {
-			lb = startNode.LoadBalancer
-		}
-		routeDestination.DestinationConfiguration = &pbproxystate.DestinationConfiguration{}
-		if err := injectLBToDestinationConfiguration(lb, routeDestination.DestinationConfiguration); err != nil {
-			return nil, fmt.Errorf("failed to apply load balancer configuration to route action: %v", err)
-		}
-
-		if startNode.Resolver.RequestTimeout > 0 {
-			to := &pbproxystate.TimeoutConfig{
-				Timeout: durationpb.New(startNode.Resolver.RequestTimeout),
-			}
-			routeDestination.DestinationConfiguration.TimeoutConfig = to
-		}
-		defaultRoute := &pbproxystate.RouteRule{
-			Match:       makeDefaultRouteMatch(),
-			Destination: routeDestination,
-		}
-
-		routeRules = []*pbproxystate.RouteRule{defaultRoute}
-
-	default:
-		return nil, fmt.Errorf("unknown first node in discovery chain of type: %s", startNode.Type)
-	}
-
-	host := &pbproxystate.VirtualHost{
-		Name:       uid.EnvoyID(),
-		Domains:    serviceDomains,
-		RouteRules: routeRules,
-	}
-
-	return host, nil
-}
-
-func getRetryPolicyForDestination(destination *structs.ServiceRouteDestination) *pbproxystate.RetryPolicy {
-	retryPolicy := &pbproxystate.RetryPolicy{}
-	if destination.NumRetries > 0 {
-		retryPolicy.NumRetries = response.MakeUint32Value(int(destination.NumRetries))
-	}
-
-	// The RetryOn magic values come from: https://www.envoyproxy.io/docs/envoy/v1.10.0/configuration/http_filters/router_filter#config-http-filters-router-x-envoy-retry-on
-	var retryStrings []string
-
-	if len(destination.RetryOn) > 0 {
-		retryStrings = append(retryStrings, destination.RetryOn...)
-	}
-
-	if destination.RetryOnConnectFailure {
-		// connect-failure can be enabled by either adding connect-failure to the RetryOn list or by using the legacy RetryOnConnectFailure option
-		// Check that it's not already in the RetryOn list, so we don't set it twice
-		connectFailureExists := false
-		for _, r := range retryStrings {
-			if r == "connect-failure" {
-				connectFailureExists = true
-			}
-		}
-		if !connectFailureExists {
-			retryStrings = append(retryStrings, "connect-failure")
-		}
-	}
-
-	if len(destination.RetryOnStatusCodes) > 0 {
-		retryStrings = append(retryStrings, "retriable-status-codes")
-		retryPolicy.RetriableStatusCodes = destination.RetryOnStatusCodes
-	}
-
-	retryPolicy.RetryOn = strings.Join(retryStrings, ",")
-
-	return retryPolicy
-}
-
-func makeRouteMatchForDiscoveryRoute(discoveryRoute *structs.DiscoveryRoute) *pbproxystate.RouteMatch {
-	match := discoveryRoute.Definition.Match
-	if match == nil || match.IsEmpty() {
-		return makeDefaultRouteMatch()
-	}
-
-	routeMatch := &pbproxystate.RouteMatch{}
-
-	switch {
-	case match.HTTP.PathExact != "":
-		routeMatch.PathMatch = &pbproxystate.PathMatch{
-			PathMatch: &pbproxystate.PathMatch_Exact{
-				Exact: match.HTTP.PathExact,
-			},
-		}
-	case match.HTTP.PathPrefix != "":
-		routeMatch.PathMatch = &pbproxystate.PathMatch{
-			PathMatch: &pbproxystate.PathMatch_Prefix{
-				Prefix: match.HTTP.PathPrefix,
-			},
-		}
-	case match.HTTP.PathRegex != "":
-		routeMatch.PathMatch = &pbproxystate.PathMatch{
-			PathMatch: &pbproxystate.PathMatch_Regex{
-				Regex: match.HTTP.PathRegex,
-			},
-		}
-	default:
-		routeMatch.PathMatch = &pbproxystate.PathMatch{
-			PathMatch: &pbproxystate.PathMatch_Prefix{
-				Prefix: "/",
-			},
-		}
-	}
-
-	if len(match.HTTP.Header) > 0 {
-		routeMatch.HeaderMatches = make([]*pbproxystate.HeaderMatch, 0, len(match.HTTP.Header))
-		for _, hdr := range match.HTTP.Header {
-			headerMatch := &pbproxystate.HeaderMatch{
-				Name: hdr.Name,
-			}
-
-			switch {
-			case hdr.Exact != "":
-				headerMatch.Match = &pbproxystate.HeaderMatch_Exact{
-					Exact: hdr.Exact,
-				}
-			case hdr.Regex != "":
-				headerMatch.Match = &pbproxystate.HeaderMatch_Regex{
-					Regex: hdr.Regex,
-				}
-			case hdr.Prefix != "":
-				headerMatch.Match = &pbproxystate.HeaderMatch_Prefix{
-					Prefix: hdr.Prefix,
-				}
-			case hdr.Suffix != "":
-				headerMatch.Match = &pbproxystate.HeaderMatch_Suffix{
-					Suffix: hdr.Suffix,
-				}
-			case hdr.Present:
-				headerMatch.Match = &pbproxystate.HeaderMatch_Present{
-					Present: true,
-				}
-			default:
-				continue // skip this impossible situation
-			}
-
-			if hdr.Invert {
-				headerMatch.InvertMatch = true
-			}
-
-			routeMatch.HeaderMatches = append(routeMatch.HeaderMatches, headerMatch)
-		}
-	}
-
-	if len(match.HTTP.Methods) > 0 {
-		routeMatch.MethodMatches = append(routeMatch.MethodMatches, match.HTTP.Methods...)
-	}
-
-	if len(match.HTTP.QueryParam) > 0 {
-		routeMatch.QueryParameterMatches = make([]*pbproxystate.QueryParameterMatch, 0, len(match.HTTP.QueryParam))
-		for _, qm := range match.HTTP.QueryParam {
-
-			queryMatcher := &pbproxystate.QueryParameterMatch{
-				Name: qm.Name,
-			}
-
-			switch {
-			case qm.Exact != "":
-				queryMatcher.Match = &pbproxystate.QueryParameterMatch_Exact{
-					Exact: qm.Exact,
-				}
-			case qm.Regex != "":
-				queryMatcher.Match = &pbproxystate.QueryParameterMatch_Regex{
-					Regex: qm.Regex,
-				}
-			case qm.Present:
-				queryMatcher.Match = &pbproxystate.QueryParameterMatch_Present{
-					Present: true,
-				}
-			default:
-				continue // skip this impossible situation
-			}
-
-			routeMatch.QueryParameterMatches = append(routeMatch.QueryParameterMatches, queryMatcher)
-		}
-	}
-
-	return routeMatch
-}
-
-func makeDefaultRouteMatch() *pbproxystate.RouteMatch {
-	return &pbproxystate.RouteMatch{
-		PathMatch: &pbproxystate.PathMatch{
-			PathMatch: &pbproxystate.PathMatch_Prefix{
-				Prefix: "/",
-			},
-		},
-		// TODO(banks) Envoy supports matching only valid GRPC
-		// requests which might be nice to add here for gRPC services
-		// but it's not supported in our current envoy SDK version
-		// although docs say it was supported by 1.8.0. Going to defer
-		// that until we've updated the deps.
-	}
-}
-
-func (s *Converter) makeRouteDestinationForChainCluster(
-	upstreamsSnapshot *proxycfg.ConfigSnapshotUpstreams,
-	targetID string,
-	chain *structs.CompiledDiscoveryChain,
-	forMeshGateway bool,
-) (*pbproxystate.RouteDestination, bool) {
-	clusterName := s.getTargetClusterName(upstreamsSnapshot, chain, targetID, forMeshGateway)
-	if clusterName == "" {
-		return nil, false
-	}
-	return makeRouteDestinationFromName(clusterName), true
-}
-
-func (s *Converter) makeRouteDestinationForSplitter(
-	upstreamsSnapshot *proxycfg.ConfigSnapshotUpstreams,
-	splits []*structs.DiscoverySplit,
-	chain *structs.CompiledDiscoveryChain,
-	forMeshGateway bool,
-) (*pbproxystate.RouteDestination, error) {
-	clusters := make([]*pbproxystate.L7WeightedDestinationCluster, 0, len(splits))
-	for _, split := range splits {
-		nextNode := chain.Nodes[split.NextNode]
-
-		if nextNode.Type != structs.DiscoveryGraphNodeTypeResolver {
-			return nil, fmt.Errorf("unexpected splitter destination node type: %s", nextNode.Type)
-		}
-		targetID := nextNode.Resolver.Target
-
-		clusterName := s.getTargetClusterName(upstreamsSnapshot, chain, targetID, forMeshGateway)
-		if clusterName == "" {
-			continue
-		}
-
-		// The smallest representable weight is 1/10000 or .01% but envoy
-		// deals with integers so scale everything up by 100x.
-		weight := int(split.Weight * 100)
-
-		clusterWeight := &pbproxystate.L7WeightedDestinationCluster{
-			Name:   clusterName,
-			Weight: response.MakeUint32Value(weight),
-		}
-		if err := injectHeaderManipToWeightedCluster(split.Definition, clusterWeight); err != nil {
-			return nil, err
-		}
-
-		clusters = append(clusters, clusterWeight)
-	}
-
-	if len(clusters) <= 0 {
-		return nil, fmt.Errorf("number of clusters in splitter must be > 0; got %d", len(clusters))
-	}
-
-	return &pbproxystate.RouteDestination{
-		Destination: &pbproxystate.RouteDestination_WeightedClusters{
-			WeightedClusters: &pbproxystate.L7WeightedClusterGroup{
-				Clusters: clusters,
-			},
-		},
-	}, nil
-}
-
-func injectLBToDestinationConfiguration(lb *structs.LoadBalancer, destinationConfig *pbproxystate.DestinationConfiguration) error {
-	if lb == nil || !lb.IsHashBased() {
-		return nil
-	}
-
-	result := make([]*pbproxystate.LoadBalancerHashPolicy, 0, len(lb.HashPolicies))
-	for _, policy := range lb.HashPolicies {
-		if policy.SourceIP {
-			p := &pbproxystate.LoadBalancerHashPolicy{
-				Policy: &pbproxystate.LoadBalancerHashPolicy_ConnectionProperties{
-					ConnectionProperties: &pbproxystate.ConnectionPropertiesPolicy{
-						SourceIp: true,
-						Terminal: policy.Terminal,
-					},
-				},
-			}
-			result = append(result, p)
-			continue
-		}
-
-		switch policy.Field {
-		case structs.HashPolicyHeader:
-			p := &pbproxystate.LoadBalancerHashPolicy{
-				Policy: &pbproxystate.LoadBalancerHashPolicy_Header{
-					Header: &pbproxystate.HeaderPolicy{
-						Name:     policy.FieldValue,
-						Terminal: policy.Terminal,
-					},
-				},
-			}
-			result = append(result, p)
-
-		case structs.HashPolicyCookie:
-
-			cookie := &pbproxystate.CookiePolicy{
-				Name:     policy.FieldValue,
-				Terminal: policy.Terminal,
-			}
-			if policy.CookieConfig != nil {
-				cookie.Path = policy.CookieConfig.Path
-
-				if policy.CookieConfig.TTL != 0*time.Second {
-					cookie.Ttl = durationpb.New(policy.CookieConfig.TTL)
-				}
-
-				// Envoy will generate a session cookie if the ttl is present and zero.
-				if policy.CookieConfig.Session {
-					cookie.Ttl = durationpb.New(0 * time.Second)
-				}
-			}
-			p := &pbproxystate.LoadBalancerHashPolicy{
-				Policy: &pbproxystate.LoadBalancerHashPolicy_Cookie{
-					Cookie: cookie,
-				},
-			}
-			result = append(result, p)
-
-		case structs.HashPolicyQueryParam:
-			p := &pbproxystate.LoadBalancerHashPolicy{
-				Policy: &pbproxystate.LoadBalancerHashPolicy_QueryParameter{
-					QueryParameter: &pbproxystate.QueryParameterPolicy{
-						Name:     policy.FieldValue,
-						Terminal: policy.Terminal,
-					},
-				},
-			}
-			result = append(result, p)
-
-		default:
-			return fmt.Errorf("unsupported load balancer hash policy field: %v", policy.Field)
-		}
-	}
-
-	destinationConfig.HashPolicies = result
-	return nil
-}
-
-func injectHeaderManipToRoute(dest *structs.ServiceRouteDestination, r *pbproxystate.RouteRule) error {
-	if !dest.RequestHeaders.IsZero() {
-		r.HeaderMutations = append(
-			r.HeaderMutations,
-			makeRequestHeaderAdd(dest.RequestHeaders.Add, true)...,
-		)
-		r.HeaderMutations = append(
-			r.HeaderMutations,
-			makeRequestHeaderAdd(dest.RequestHeaders.Set, false)...,
-		)
-		r.HeaderMutations = append(
-			r.HeaderMutations,
-			makeRequestHeaderRemove(dest.RequestHeaders.Remove),
-		)
-	}
-	if !dest.ResponseHeaders.IsZero() {
-		r.HeaderMutations = append(
-			r.HeaderMutations,
-			makeResponseHeaderAdd(dest.ResponseHeaders.Add, true)...,
-		)
-		r.HeaderMutations = append(
-			r.HeaderMutations,
-			makeResponseHeaderAdd(dest.ResponseHeaders.Set, false)...,
-		)
-		r.HeaderMutations = append(
-			r.HeaderMutations,
-			makeResponseHeaderRemove(dest.ResponseHeaders.Remove),
-		)
-	}
-	return nil
-}
-
-func injectHeaderManipToWeightedCluster(split *structs.ServiceSplit, c *pbproxystate.L7WeightedDestinationCluster) error {
-	if !split.RequestHeaders.IsZero() {
-		c.HeaderMutations = append(
-			c.HeaderMutations,
-			makeRequestHeaderAdd(split.RequestHeaders.Add, true)...,
-		)
-		c.HeaderMutations = append(
-			c.HeaderMutations,
-			makeRequestHeaderAdd(split.RequestHeaders.Set, false)...,
-		)
-		c.HeaderMutations = append(
-			c.HeaderMutations,
-			makeRequestHeaderRemove(split.RequestHeaders.Remove),
-		)
-	}
-	if !split.ResponseHeaders.IsZero() {
-		c.HeaderMutations = append(
-			c.HeaderMutations,
-			makeResponseHeaderAdd(split.ResponseHeaders.Add, true)...,
-		)
-		c.HeaderMutations = append(
-			c.HeaderMutations,
-			makeResponseHeaderAdd(split.ResponseHeaders.Set, false)...,
-		)
-		c.HeaderMutations = append(
-			c.HeaderMutations,
-			makeResponseHeaderRemove(split.ResponseHeaders.Remove),
-		)
-	}
-	return nil
-}
-
-func makeRequestHeaderAdd(vals map[string]string, add bool) []*pbproxystate.HeaderMutation {
-	mutations := make([]*pbproxystate.HeaderMutation, 0, len(vals))
-
-	appendAction := pbproxystate.AppendAction_APPEND_ACTION_OVERWRITE_IF_EXISTS_OR_ADD
-	if add {
-		appendAction = pbproxystate.AppendAction_APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD
-	}
-
-	for k, v := range vals {
-		m := &pbproxystate.HeaderMutation{
-			Action: &pbproxystate.HeaderMutation_RequestHeaderAdd{
-				RequestHeaderAdd: &pbproxystate.RequestHeaderAdd{
-					Header: &pbproxystate.Header{
-						Key:   k,
-						Value: v,
-					},
-					AppendAction: appendAction,
-				},
-			},
-		}
-		mutations = append(mutations, m)
-	}
-	return mutations
-}
-
-func makeRequestHeaderRemove(values []string) *pbproxystate.HeaderMutation {
-	return &pbproxystate.HeaderMutation{
-		Action: &pbproxystate.HeaderMutation_RequestHeaderRemove{
-			RequestHeaderRemove: &pbproxystate.RequestHeaderRemove{
-				HeaderKeys: values,
-			},
-		},
-	}
-}
-
-func makeResponseHeaderAdd(vals map[string]string, add bool) []*pbproxystate.HeaderMutation {
-	mutations := make([]*pbproxystate.HeaderMutation, 0, len(vals))
-
-	appendAction := pbproxystate.AppendAction_APPEND_ACTION_OVERWRITE_IF_EXISTS_OR_ADD
-	if add {
-		appendAction = pbproxystate.AppendAction_APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD
-	}
-
-	for k, v := range vals {
-		m := &pbproxystate.HeaderMutation{
-			Action: &pbproxystate.HeaderMutation_ResponseHeaderAdd{
-				ResponseHeaderAdd: &pbproxystate.ResponseHeaderAdd{
-					Header: &pbproxystate.Header{
-						Key:   k,
-						Value: v,
-					},
-					AppendAction: appendAction,
-				},
-			},
-		}
-		mutations = append(mutations, m)
-	}
-	return mutations
-}
-
-func makeResponseHeaderRemove(values []string) *pbproxystate.HeaderMutation {
-	return &pbproxystate.HeaderMutation{
-		Action: &pbproxystate.HeaderMutation_ResponseHeaderRemove{
-			ResponseHeaderRemove: &pbproxystate.ResponseHeaderRemove{
-				HeaderKeys: values,
-			},
-		},
-	}
-}
diff --git a/agent/xds/rbac.go b/agent/xds/rbac.go
index d8252d7cabc90..d237b3e7b40f5 100644
--- a/agent/xds/rbac.go
+++ b/agent/xds/rbac.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
@@ -19,58 +16,44 @@ import (
 
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xds/response"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-)
-
-const (
-	envoyHTTPRBACFilterKey    = "envoy.filters.http.rbac"
-	envoyNetworkRBACFilterKey = "envoy.filters.network.rbac"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 func makeRBACNetworkFilter(
-	intentions structs.SimplifiedIntentions,
+	intentions structs.Intentions,
 	intentionDefaultAllow bool,
 	localInfo rbacLocalInfo,
 	peerTrustBundles []*pbpeering.PeeringTrustBundle,
 ) (*envoy_listener_v3.Filter, error) {
-	rules, err := makeRBACRules(intentions, intentionDefaultAllow, localInfo, false, peerTrustBundles, nil)
-	if err != nil {
-		return nil, err
-	}
+	rules := makeRBACRules(intentions, intentionDefaultAllow, localInfo, false, peerTrustBundles)
 
 	cfg := &envoy_network_rbac_v3.RBAC{
 		StatPrefix: "connect_authz",
 		Rules:      rules,
 	}
-	return makeFilter(envoyNetworkRBACFilterKey, cfg)
+	return makeFilter("envoy.filters.network.rbac", cfg)
 }
 
 func makeRBACHTTPFilter(
-	intentions structs.SimplifiedIntentions,
+	intentions structs.Intentions,
 	intentionDefaultAllow bool,
 	localInfo rbacLocalInfo,
 	peerTrustBundles []*pbpeering.PeeringTrustBundle,
-	providerMap map[string]*structs.JWTProviderConfigEntry,
 ) (*envoy_http_v3.HttpFilter, error) {
-	rules, err := makeRBACRules(intentions, intentionDefaultAllow, localInfo, true, peerTrustBundles, providerMap)
-	if err != nil {
-		return nil, err
-	}
+	rules := makeRBACRules(intentions, intentionDefaultAllow, localInfo, true, peerTrustBundles)
 
 	cfg := &envoy_http_rbac_v3.RBAC{
 		Rules: rules,
 	}
-	return makeEnvoyHTTPFilter(envoyHTTPRBACFilterKey, cfg)
+	return makeEnvoyHTTPFilter("envoy.filters.http.rbac", cfg)
 }
 
 func intentionListToIntermediateRBACForm(
-	intentions structs.SimplifiedIntentions,
+	intentions structs.Intentions,
 	localInfo rbacLocalInfo,
 	isHTTP bool,
 	trustBundlesByPeer map[string]*pbpeering.PeeringTrustBundle,
-	providerMap map[string]*structs.JWTProviderConfigEntry,
-) ([]*rbacIntention, error) {
+) []*rbacIntention {
 	sort.Sort(structs.IntentionPrecedenceSorter(intentions))
 
 	// Omit any lower-precedence intentions that share the same source.
@@ -87,13 +70,10 @@ func intentionListToIntermediateRBACForm(
 			continue
 		}
 
-		rixn, err := intentionToIntermediateRBACForm(ixn, localInfo, isHTTP, trustBundle, providerMap)
-		if err != nil {
-			return nil, err
-		}
+		rixn := intentionToIntermediateRBACForm(ixn, localInfo, isHTTP, trustBundle)
 		rbacIxns = append(rbacIxns, rixn)
 	}
-	return rbacIxns, nil
+	return rbacIxns
 }
 
 func removeSourcePrecedence(rbacIxns []*rbacIntention, intentionDefaultAction intentionAction, localInfo rbacLocalInfo) []*rbacIntention {
@@ -233,8 +213,7 @@ func intentionToIntermediateRBACForm(
 	localInfo rbacLocalInfo,
 	isHTTP bool,
 	bundle *pbpeering.PeeringTrustBundle,
-	providerMap map[string]*structs.JWTProviderConfigEntry,
-) (*rbacIntention, error) {
+) *rbacIntention {
 	rixn := &rbacIntention{
 		Source: rbacService{
 			ServiceName: ixn.SourceServiceName(),
@@ -250,45 +229,16 @@ func intentionToIntermediateRBACForm(
 		rixn.Source.TrustDomain = bundle.TrustDomain
 	}
 
-	if isHTTP && ixn.JWT != nil {
-		var jwts []*JWTInfo
-		for _, prov := range ixn.JWT.Providers {
-			jwtProvider, ok := providerMap[prov.Name]
-
-			if !ok {
-				return nil, fmt.Errorf("provider specified in intention does not exist. Provider name: %s", prov.Name)
-			}
-			jwts = append(jwts, newJWTInfo(prov, jwtProvider))
-		}
-
-		rixn.jwtInfos = jwts
-	}
-
 	if len(ixn.Permissions) > 0 {
 		if isHTTP {
 			rixn.Action = intentionActionLayer7
 			rixn.Permissions = make([]*rbacPermission, 0, len(ixn.Permissions))
 			for _, perm := range ixn.Permissions {
-				rbacPerm := rbacPermission{
+				rixn.Permissions = append(rixn.Permissions, &rbacPermission{
 					Definition: perm,
 					Action:     intentionActionFromString(perm.Action),
 					Perm:       convertPermission(perm),
-				}
-
-				if perm.JWT != nil {
-					var jwts []*JWTInfo
-					for _, prov := range perm.JWT.Providers {
-						jwtProvider, ok := providerMap[prov.Name]
-						if !ok {
-							return nil, fmt.Errorf("provider specified in intention does not exist. Provider name: %s", prov.Name)
-						}
-						jwts = append(jwts, newJWTInfo(prov, jwtProvider))
-					}
-					if len(jwts) > 0 {
-						rbacPerm.jwtInfos = jwts
-					}
-				}
-				rixn.Permissions = append(rixn.Permissions, &rbacPerm)
+				})
 			}
 		} else {
 			// In case L7 intentions slip through to here, treat them as deny intentions.
@@ -298,26 +248,11 @@ func intentionToIntermediateRBACForm(
 		rixn.Action = intentionActionFromString(ixn.Action)
 	}
 
-	return rixn, nil
-}
-
-func newJWTInfo(p *structs.IntentionJWTProvider, ce *structs.JWTProviderConfigEntry) *JWTInfo {
-	return &JWTInfo{
-		Provider: p,
-		Issuer:   ce.Issuer,
-	}
+	return rixn
 }
 
 type intentionAction int
 
-type JWTInfo struct {
-	// Provider issuer
-	// this information is coming from the config entry
-	Issuer string
-	// Provider is the intention provider
-	Provider *structs.IntentionJWTProvider
-}
-
 const (
 	intentionActionDeny intentionAction = iota
 	intentionActionAllow
@@ -331,7 +266,6 @@ func intentionActionFromBool(v bool) intentionAction {
 		return intentionActionDeny
 	}
 }
-
 func intentionActionFromString(s structs.IntentionAction) intentionAction {
 	if s == structs.IntentionActionAllow {
 		return intentionActionAllow
@@ -357,11 +291,6 @@ type rbacIntention struct {
 	Permissions []*rbacPermission
 	Precedence  int
 
-	// JWTInfo is used to track intentions' JWT information
-	// This information is used to update HTTP filters for
-	// JWT Payload & claims validation
-	jwtInfos []*JWTInfo
-
 	// Skip is field used to indicate that this intention can be deleted in the
 	// final pass. Items marked as true should generally not escape the method
 	// that marked them.
@@ -371,32 +300,26 @@ type rbacIntention struct {
 }
 
 func (r *rbacIntention) FlattenPrincipal(localInfo rbacLocalInfo) *envoy_rbac_v3.Principal {
-	var principal *envoy_rbac_v3.Principal
 	if !localInfo.expectXFCC {
-		principal = r.flattenPrincipalFromCert()
+		return r.flattenPrincipalFromCert()
+
 	} else if r.Source.Peer == "" {
 		// NOTE: ixnSourceMatches should enforce that all of Source and NotSources
 		// are peered or not-peered, so we only need to look at the Source element.
-		principal = r.flattenPrincipalFromCert() // intention is not relevant to peering
-	} else {
-		// If this intention is an L7 peered one, then it is exclusively resolvable
-		// using XFCC, rather than the TLS SAN field.
-		fromXFCC := r.flattenPrincipalFromXFCC()
-
-		// Use of the XFCC one is gated on coming directly from our own gateways.
-		gwIDPattern := makeSpiffeMeshGatewayPattern(localInfo.trustDomain, localInfo.partition)
-
-		principal = andPrincipals([]*envoy_rbac_v3.Principal{
-			authenticatedPatternPrincipal(gwIDPattern),
-			fromXFCC,
-		})
+		return r.flattenPrincipalFromCert() // intention is not relevant to peering
 	}
 
-	if len(r.jwtInfos) == 0 {
-		return principal
-	}
+	// If this intention is an L7 peered one, then it is exclusively resolvable
+	// using XFCC, rather than the TLS SAN field.
+	fromXFCC := r.flattenPrincipalFromXFCC()
+
+	// Use of the XFCC one is gated on coming directly from our own gateways.
+	gwIDPattern := makeSpiffeMeshGatewayPattern(localInfo.trustDomain, localInfo.partition)
 
-	return addJWTPrincipal(principal, r.jwtInfos)
+	return andPrincipals([]*envoy_rbac_v3.Principal{
+		authenticatedPatternPrincipal(gwIDPattern),
+		fromXFCC,
+	})
 }
 
 func (r *rbacIntention) flattenPrincipalFromCert() *envoy_rbac_v3.Principal {
@@ -440,11 +363,6 @@ type rbacPermission struct {
 	Perm     *envoy_rbac_v3.Permission
 	NotPerms []*envoy_rbac_v3.Permission
 
-	// JWTInfo is used to track intentions' JWT information
-	// This information is used to update HTTP filters for
-	// JWT Payload & claims validation
-	jwtInfos []*JWTInfo
-
 	// Skip is field used to indicate that this permission can be deleted in
 	// the final pass. Items marked as true should generally not escape the
 	// method that marked them.
@@ -453,47 +371,17 @@ type rbacPermission struct {
 	ComputedPermission *envoy_rbac_v3.Permission
 }
 
-// Flatten ensure the permission rules, not-rules, and jwt validation rules are merged into a single computed permission.
-//
-// Details on JWTInfo section:
-// For each JWTInfo (AKA provider required), this builds 1 single permission that validates that the jwt has
-// the right issuer (`iss`) field and validates the claims (if any).
-//
-// After generating a single permission per info, it combines all the info permissions into a single OrPermission.
-// This orPermission is then attached to initial computed permission for jwt payload and claims validation.
 func (p *rbacPermission) Flatten() *envoy_rbac_v3.Permission {
-	computedPermission := p.Perm
-	if len(p.NotPerms) == 0 && len(p.jwtInfos) == 0 {
-		return computedPermission
+	if len(p.NotPerms) == 0 {
+		return p.Perm
 	}
 
-	if len(p.NotPerms) != 0 {
-		parts := make([]*envoy_rbac_v3.Permission, 0, len(p.NotPerms)+1)
-		parts = append(parts, p.Perm)
-		for _, notPerm := range p.NotPerms {
-			parts = append(parts, notPermission(notPerm))
-		}
-		computedPermission = andPermissions(parts)
-	}
-
-	if len(p.jwtInfos) == 0 {
-		return computedPermission
+	parts := make([]*envoy_rbac_v3.Permission, 0, len(p.NotPerms)+1)
+	parts = append(parts, p.Perm)
+	for _, notPerm := range p.NotPerms {
+		parts = append(parts, notPermission(notPerm))
 	}
-
-	var jwtPerms []*envoy_rbac_v3.Permission
-	for _, info := range p.jwtInfos {
-		payloadKey := buildPayloadInMetadataKey(info.Provider.Name)
-		claimsPermission := jwtInfosToPermission(info.Provider.VerifyClaims, payloadKey)
-		issuerPermission := segmentToPermission(pathToSegments([]string{"iss"}, payloadKey), info.Issuer)
-
-		perm := andPermissions([]*envoy_rbac_v3.Permission{
-			issuerPermission, claimsPermission,
-		})
-		jwtPerms = append(jwtPerms, perm)
-	}
-
-	jwtPerm := orPermissions(jwtPerms)
-	return andPermissions([]*envoy_rbac_v3.Permission{computedPermission, jwtPerm})
+	return andPermissions(parts)
 }
 
 // simplifyNotSourceSlice will collapse NotSources elements together if any element is
@@ -587,13 +475,12 @@ type rbacLocalInfo struct {
 //
 // Which really is just an allow-list of [A, C AND NOT(B)]
 func makeRBACRules(
-	intentions structs.SimplifiedIntentions,
+	intentions structs.Intentions,
 	intentionDefaultAllow bool,
 	localInfo rbacLocalInfo,
 	isHTTP bool,
 	peerTrustBundles []*pbpeering.PeeringTrustBundle,
-	providerMap map[string]*structs.JWTProviderConfigEntry,
-) (*envoy_rbac_v3.RBAC, error) {
+) *envoy_rbac_v3.RBAC {
 	// TODO(banks,rb): Implement revocation list checking?
 
 	// TODO(peering): mkeeler asked that these maps come from proxycfg instead of
@@ -613,10 +500,7 @@ func makeRBACRules(
 	}
 
 	// First build up just the basic principal matches.
-	rbacIxns, err := intentionListToIntermediateRBACForm(intentions, localInfo, isHTTP, trustBundlesByPeer, providerMap)
-	if err != nil {
-		return nil, err
-	}
+	rbacIxns := intentionListToIntermediateRBACForm(intentions, localInfo, isHTTP, trustBundlesByPeer)
 
 	// Normalize: if we are in default-deny then all intentions must be allows and vice versa
 	intentionDefaultAction := intentionActionFromBool(intentionDefaultAllow)
@@ -652,10 +536,9 @@ func makeRBACRules(
 				panic("invalid state: L7 permissions present for TCP service")
 			}
 
-			rbacPrincipals := optimizePrincipals([]*envoy_rbac_v3.Principal{rbacIxn.ComputedPrincipal})
 			// For L7: we should generate one Policy per Principal and list all of the Permissions
 			policy := &envoy_rbac_v3.Policy{
-				Principals:  rbacPrincipals,
+				Principals:  optimizePrincipals([]*envoy_rbac_v3.Principal{rbacIxn.ComputedPrincipal}),
 				Permissions: make([]*envoy_rbac_v3.Permission, 0, len(rbacIxn.Permissions)),
 			}
 			for _, perm := range rbacIxn.Permissions {
@@ -677,158 +560,7 @@ func makeRBACRules(
 	if len(rbac.Policies) == 0 {
 		rbac.Policies = nil
 	}
-	return rbac, nil
-}
-
-// addJWTPrincipal ensure the passed RBAC/Network principal is associated with
-// a JWT principal when JWTs validation is required.
-//
-// For each jwtInfo, this builds a first principal that validates that the jwt has the right issuer (`iss`).
-// It collects all the claims principal and combines them into a single principal using jwtClaimsToPrincipals.
-// It then combines the issuer principal and the claims principal into a single principal.
-//
-// After generating a single principal per info, it combines all the info principals into a single jwt OrPrincipal.
-// This orPrincipal is then attached to the RBAC/NETWORK principal for jwt payload validation.
-func addJWTPrincipal(principal *envoy_rbac_v3.Principal, infos []*JWTInfo) *envoy_rbac_v3.Principal {
-	if len(infos) == 0 {
-		return principal
-	}
-	jwtPrincipals := make([]*envoy_rbac_v3.Principal, 0, len(infos))
-	for _, info := range infos {
-		payloadKey := buildPayloadInMetadataKey(info.Provider.Name)
-
-		// build jwt provider issuer principal
-		segments := pathToSegments([]string{"iss"}, payloadKey)
-		p := segmentToPrincipal(segments, info.Issuer)
-
-		// add jwt provider claims principal if any
-		if cp := jwtClaimsToPrincipals(info.Provider.VerifyClaims, payloadKey); cp != nil {
-			p = andPrincipals([]*envoy_rbac_v3.Principal{p, cp})
-		}
-		jwtPrincipals = append(jwtPrincipals, p)
-	}
-
-	// make jwt principals into 1 single principal
-	jwtFinalPrincipal := orPrincipals(jwtPrincipals)
-
-	if principal == nil {
-		return jwtFinalPrincipal
-	}
-
-	return andPrincipals([]*envoy_rbac_v3.Principal{principal, jwtFinalPrincipal})
-}
-
-func jwtClaimsToPrincipals(claims []*structs.IntentionJWTClaimVerification, payloadkey string) *envoy_rbac_v3.Principal {
-	ps := make([]*envoy_rbac_v3.Principal, 0)
-
-	for _, claim := range claims {
-		ps = append(ps, jwtClaimToPrincipal(claim, payloadkey))
-	}
-	switch len(ps) {
-	case 0:
-		return nil
-	case 1:
-		return ps[0]
-	default:
-		return andPrincipals(ps)
-	}
-}
-
-// jwtClaimToPrincipal takes in a payloadkey which is the metadata key. This key is generated by using provider name
-// and a jwt_payload prefix. See buildPayloadInMetadataKey in agent/xds/jwt_authn.go
-//
-// This uniquely generated payloadKey is the first segment in the path to validate the JWT claims. The subsequent segments
-// come from the Path included in the IntentionJWTClaimVerification param.
-func jwtClaimToPrincipal(c *structs.IntentionJWTClaimVerification, payloadKey string) *envoy_rbac_v3.Principal {
-	segments := pathToSegments(c.Path, payloadKey)
-	return segmentToPrincipal(segments, c.Value)
-}
-
-func segmentToPrincipal(segments []*envoy_matcher_v3.MetadataMatcher_PathSegment, v string) *envoy_rbac_v3.Principal {
-	return &envoy_rbac_v3.Principal{
-		Identifier: &envoy_rbac_v3.Principal_Metadata{
-			Metadata: &envoy_matcher_v3.MetadataMatcher{
-				Filter: jwtEnvoyFilter,
-				Path:   segments,
-				Value: &envoy_matcher_v3.ValueMatcher{
-					MatchPattern: &envoy_matcher_v3.ValueMatcher_StringMatch{
-						StringMatch: &envoy_matcher_v3.StringMatcher{
-							MatchPattern: &envoy_matcher_v3.StringMatcher_Exact{
-								Exact: v,
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func jwtInfosToPermission(claims []*structs.IntentionJWTClaimVerification, payloadkey string) *envoy_rbac_v3.Permission {
-	ps := make([]*envoy_rbac_v3.Permission, 0, len(claims))
-
-	for _, claim := range claims {
-		ps = append(ps, jwtClaimToPermission(claim, payloadkey))
-	}
-	return andPermissions(ps)
-}
-
-func jwtClaimToPermission(c *structs.IntentionJWTClaimVerification, payloadKey string) *envoy_rbac_v3.Permission {
-	segments := pathToSegments(c.Path, payloadKey)
-	return segmentToPermission(segments, c.Value)
-}
-
-func segmentToPermission(segments []*envoy_matcher_v3.MetadataMatcher_PathSegment, v string) *envoy_rbac_v3.Permission {
-	return &envoy_rbac_v3.Permission{
-		Rule: &envoy_rbac_v3.Permission_Metadata{
-			Metadata: &envoy_matcher_v3.MetadataMatcher{
-				Filter: jwtEnvoyFilter,
-				Path:   segments,
-				Value: &envoy_matcher_v3.ValueMatcher{
-					MatchPattern: &envoy_matcher_v3.ValueMatcher_StringMatch{
-						StringMatch: &envoy_matcher_v3.StringMatcher{
-							MatchPattern: &envoy_matcher_v3.StringMatcher_Exact{
-								Exact: v,
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-// pathToSegments generates an array of MetadataMatcher_PathSegment that starts with the payloadkey
-// and is followed by all existing strings in the path.
-//
-// eg. calling: pathToSegments([]string{"perms", "roles"}, "jwt_payload_okta") should return the following:
-//
-//	[]*envoy_matcher_v3.MetadataMatcher_PathSegment{
-//		{
-//			Segment: &envoy_matcher_v3.MetadataMatcher_PathSegment_Key{Key: "jwt_payload_okta"},
-//		},
-//		{
-//			Segment: &envoy_matcher_v3.MetadataMatcher_PathSegment_Key{Key: "perms"},
-//		},
-//		{
-//			Segment: &envoy_matcher_v3.MetadataMatcher_PathSegment_Key{Key: "roles"},
-//		},
-//	},
-func pathToSegments(paths []string, payloadKey string) []*envoy_matcher_v3.MetadataMatcher_PathSegment {
-	segments := make([]*envoy_matcher_v3.MetadataMatcher_PathSegment, 0, len(paths))
-	segments = append(segments, makeSegment(payloadKey))
-
-	for _, p := range paths {
-		segments = append(segments, makeSegment(p))
-	}
-
-	return segments
-}
-
-func makeSegment(key string) *envoy_matcher_v3.MetadataMatcher_PathSegment {
-	return &envoy_matcher_v3.MetadataMatcher_PathSegment{
-		Segment: &envoy_matcher_v3.MetadataMatcher_PathSegment_Key{Key: key},
-	}
+	return rbac
 }
 
 func optimizePrincipals(orig []*envoy_rbac_v3.Principal) []*envoy_rbac_v3.Principal {
@@ -839,9 +571,6 @@ func optimizePrincipals(orig []*envoy_rbac_v3.Principal) []*envoy_rbac_v3.Princi
 		if !ok {
 			return orig
 		}
-		// In practice, you can't hit this
-		// Only JWTs (HTTP-only) generate orPrinciples, but optimizePrinciples is only called
-		// against the combined list of principles for L4 intentions.
 		orIds = append(orIds, or.OrIds.Ids...)
 	}
 
@@ -858,13 +587,13 @@ func optimizePrincipals(orig []*envoy_rbac_v3.Principal) []*envoy_rbac_v3.Princi
 //
 // (backend/* -> default/*) was dropped because it is already known that any service
 // in the backend namespace can target default/web.
-func removeSameSourceIntentions(intentions structs.SimplifiedIntentions) structs.SimplifiedIntentions {
+func removeSameSourceIntentions(intentions structs.Intentions) structs.Intentions {
 	if len(intentions) < 2 {
 		return intentions
 	}
 
 	var (
-		out        = make(structs.SimplifiedIntentions, 0, len(intentions))
+		out        = make(structs.Intentions, 0, len(intentions))
 		changed    = false
 		seenSource = make(map[structs.PeeredServiceName]struct{})
 	)
@@ -945,32 +674,22 @@ func countWild(src rbacService) int {
 }
 
 func andPrincipals(ids []*envoy_rbac_v3.Principal) *envoy_rbac_v3.Principal {
-	switch len(ids) {
-	case 1:
-		return ids[0]
-	default:
-		return &envoy_rbac_v3.Principal{
-			Identifier: &envoy_rbac_v3.Principal_AndIds{
-				AndIds: &envoy_rbac_v3.Principal_Set{
-					Ids: ids,
-				},
+	return &envoy_rbac_v3.Principal{
+		Identifier: &envoy_rbac_v3.Principal_AndIds{
+			AndIds: &envoy_rbac_v3.Principal_Set{
+				Ids: ids,
 			},
-		}
+		},
 	}
 }
 
 func orPrincipals(ids []*envoy_rbac_v3.Principal) *envoy_rbac_v3.Principal {
-	switch len(ids) {
-	case 1:
-		return ids[0]
-	default:
-		return &envoy_rbac_v3.Principal{
-			Identifier: &envoy_rbac_v3.Principal_OrIds{
-				OrIds: &envoy_rbac_v3.Principal_Set{
-					Ids: ids,
-				},
+	return &envoy_rbac_v3.Principal{
+		Identifier: &envoy_rbac_v3.Principal_OrIds{
+			OrIds: &envoy_rbac_v3.Principal_Set{
+				Ids: ids,
 			},
-		}
+		},
 	}
 }
 
@@ -993,7 +712,7 @@ func authenticatedPatternPrincipal(pattern string) *envoy_rbac_v3.Principal {
 			Authenticated: &envoy_rbac_v3.Principal_Authenticated{
 				PrincipalName: &envoy_matcher_v3.StringMatcher{
 					MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{
-						SafeRegex: response.MakeEnvoyRegexMatch(pattern),
+						SafeRegex: makeEnvoyRegexMatch(pattern),
 					},
 				},
 			},
@@ -1025,7 +744,7 @@ func xfccPrincipal(src rbacService) *envoy_rbac_v3.Principal {
 				HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_StringMatch{
 					StringMatch: &envoy_matcher_v3.StringMatcher{
 						MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{
-							SafeRegex: response.MakeEnvoyRegexMatch(pattern),
+							SafeRegex: makeEnvoyRegexMatch(pattern),
 						},
 					},
 				},
@@ -1034,10 +753,8 @@ func xfccPrincipal(src rbacService) *envoy_rbac_v3.Principal {
 	}
 }
 
-const (
-	anyPath     = `[^/]+`
-	trustDomain = anyPath + "." + anyPath
-)
+const anyPath = `[^/]+`
+const trustDomain = anyPath + "." + anyPath
 
 // downstreamServiceIdentityMatcher needs to match XFCC headers in two cases:
 // 1. Requests to cluster peered services through a mesh gateway. In this case, the XFCC header looks like the following (I added a new line after each ; for readability)
@@ -1232,7 +949,7 @@ func convertPermission(perm *structs.IntentionPermission) *envoy_rbac_v3.Permiss
 					Rule: &envoy_matcher_v3.PathMatcher_Path{
 						Path: &envoy_matcher_v3.StringMatcher{
 							MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{
-								SafeRegex: response.MakeEnvoyRegexMatch(perm.HTTP.PathRegex),
+								SafeRegex: makeEnvoyRegexMatch(perm.HTTP.PathRegex),
 							},
 						},
 					},
@@ -1248,44 +965,21 @@ func convertPermission(perm *structs.IntentionPermission) *envoy_rbac_v3.Permiss
 
 		switch {
 		case hdr.Exact != "":
-			eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_StringMatch{
-				StringMatch: &envoy_matcher_v3.StringMatcher{
-					MatchPattern: &envoy_matcher_v3.StringMatcher_Exact{
-						Exact: hdr.Exact,
-					},
-					IgnoreCase: false,
-				},
+			eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_ExactMatch{
+				ExactMatch: hdr.Exact,
 			}
 		case hdr.Regex != "":
-			eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_StringMatch{
-				StringMatch: &envoy_matcher_v3.StringMatcher{
-					MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{
-						SafeRegex: response.MakeEnvoyRegexMatch(hdr.Regex),
-					},
-					IgnoreCase: false,
-				},
+			eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_SafeRegexMatch{
+				SafeRegexMatch: makeEnvoyRegexMatch(hdr.Regex),
 			}
-
 		case hdr.Prefix != "":
-			eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_StringMatch{
-				StringMatch: &envoy_matcher_v3.StringMatcher{
-					MatchPattern: &envoy_matcher_v3.StringMatcher_Prefix{
-						Prefix: hdr.Prefix,
-					},
-					IgnoreCase: false,
-				},
+			eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_PrefixMatch{
+				PrefixMatch: hdr.Prefix,
 			}
-
 		case hdr.Suffix != "":
-			eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_StringMatch{
-				StringMatch: &envoy_matcher_v3.StringMatcher{
-					MatchPattern: &envoy_matcher_v3.StringMatcher_Suffix{
-						Suffix: hdr.Suffix,
-					},
-					IgnoreCase: false,
-				},
+			eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_SuffixMatch{
+				SuffixMatch: hdr.Suffix,
 			}
-
 		case hdr.Present:
 			eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_PresentMatch{
 				PresentMatch: true,
@@ -1311,7 +1005,7 @@ func convertPermission(perm *structs.IntentionPermission) *envoy_rbac_v3.Permiss
 		eh := &envoy_route_v3.HeaderMatcher{
 			Name: ":method",
 			HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_SafeRegexMatch{
-				SafeRegexMatch: response.MakeEnvoyRegexMatch(methodHeaderRegex),
+				SafeRegexMatch: makeEnvoyRegexMatch(methodHeaderRegex),
 			},
 		}
 
@@ -1349,20 +1043,3 @@ func andPermissions(perms []*envoy_rbac_v3.Permission) *envoy_rbac_v3.Permission
 		}
 	}
 }
-
-func orPermissions(perms []*envoy_rbac_v3.Permission) *envoy_rbac_v3.Permission {
-	switch len(perms) {
-	case 0:
-		return anyPermission()
-	case 1:
-		return perms[0]
-	default:
-		return &envoy_rbac_v3.Permission{
-			Rule: &envoy_rbac_v3.Permission_OrRules{
-				OrRules: &envoy_rbac_v3.Permission_Set{
-					Rules: perms,
-				},
-			},
-		}
-	}
-}
diff --git a/agent/xds/rbac_test.go b/agent/xds/rbac_test.go
index f519049544875..e0ab500541ea3 100644
--- a/agent/xds/rbac_test.go
+++ b/agent/xds/rbac_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
@@ -10,18 +7,14 @@ import (
 	"sort"
 	"testing"
 
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
 	envoy_rbac_v3 "github.com/envoyproxy/go-control-plane/envoy/config/rbac/v3"
 	envoy_matcher_v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xdsv2"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
+	"github.com/hashicorp/consul/proto/pbpeering"
 )
 
 func TestRemoveIntentionPrecedence(t *testing.T) {
@@ -53,11 +46,11 @@ func TestRemoveIntentionPrecedence(t *testing.T) {
 		ixn.Permissions = perms
 		return ixn
 	}
-	sorted := func(ixns ...*structs.Intention) structs.SimplifiedIntentions {
+	sorted := func(ixns ...*structs.Intention) structs.Intentions {
 		sort.SliceStable(ixns, func(i, j int) bool {
 			return ixns[j].Precedence < ixns[i].Precedence
 		})
-		return structs.SimplifiedIntentions(ixns)
+		return structs.Intentions(ixns)
 	}
 	testPeerTrustBundle := map[string]*pbpeering.PeeringTrustBundle{
 		"peer1": {
@@ -110,7 +103,7 @@ func TestRemoveIntentionPrecedence(t *testing.T) {
 	tests := map[string]struct {
 		intentionDefaultAllow bool
 		http                  bool
-		intentions            structs.SimplifiedIntentions
+		intentions            structs.Intentions
 		expect                []*rbacIntention
 	}{
 		"default-allow-path-allow": {
@@ -455,11 +448,10 @@ func TestRemoveIntentionPrecedence(t *testing.T) {
 
 	for name, tt := range tests {
 		t.Run(name, func(t *testing.T) {
-			rbacIxns, err := intentionListToIntermediateRBACForm(tt.intentions, testLocalInfo, tt.http, testPeerTrustBundle, nil)
+			rbacIxns := intentionListToIntermediateRBACForm(tt.intentions, testLocalInfo, tt.http, testPeerTrustBundle)
 			intentionDefaultAction := intentionActionFromBool(tt.intentionDefaultAllow)
 			rbacIxns = removeIntentionPrecedence(rbacIxns, intentionDefaultAction, testLocalInfo)
 
-			require.NoError(t, err)
 			require.Equal(t, tt.expect, rbacIxns)
 		})
 	}
@@ -489,17 +481,6 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 		ixn.Permissions = perms
 		return ixn
 	}
-	testIntentionWithJWT := func(src string, action structs.IntentionAction, jwt *structs.IntentionJWTRequirement, perms ...*structs.IntentionPermission) *structs.Intention {
-		ixn := testIntention(t, src, "api", action)
-		ixn.JWT = jwt
-		ixn.Action = action
-		if perms != nil {
-			ixn.Permissions = perms
-			ixn.Action = ""
-		}
-
-		return ixn
-	}
 	testPeerTrustBundle := []*pbpeering.PeeringTrustBundle{
 		{
 			PeerName:          "peer1",
@@ -508,11 +489,11 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 		},
 	}
 	testTrustDomain := "test.consul"
-	sorted := func(ixns ...*structs.Intention) structs.SimplifiedIntentions {
+	sorted := func(ixns ...*structs.Intention) structs.Intentions {
 		sort.SliceStable(ixns, func(i, j int) bool {
 			return ixns[j].Precedence < ixns[i].Precedence
 		})
-		return structs.SimplifiedIntentions(ixns)
+		return structs.Intentions(ixns)
 	}
 
 	var (
@@ -522,32 +503,6 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 				PathPrefix: "/",
 			},
 		}
-		oktaWithClaims = structs.IntentionJWTProvider{
-			Name: "okta",
-			VerifyClaims: []*structs.IntentionJWTClaimVerification{
-				{Path: []string{"roles"}, Value: "testing"},
-			},
-		}
-		auth0WithClaims = structs.IntentionJWTProvider{
-			Name: "auth0",
-			VerifyClaims: []*structs.IntentionJWTClaimVerification{
-				{Path: []string{"perms", "role"}, Value: "admin"},
-			},
-		}
-		testJWTProviderConfigEntry = map[string]*structs.JWTProviderConfigEntry{
-			"okta":  {Name: "okta", Issuer: "mytest.okta-issuer"},
-			"auth0": {Name: "auth0", Issuer: "mytest.auth0-issuer"},
-		}
-		jwtRequirement = &structs.IntentionJWTRequirement{
-			Providers: []*structs.IntentionJWTProvider{
-				&oktaWithClaims,
-			},
-		}
-		auth0Requirement = &structs.IntentionJWTRequirement{
-			Providers: []*structs.IntentionJWTProvider{
-				&auth0WithClaims,
-			},
-		}
 		permDenySlashPrefix = &structs.IntentionPermission{
 			Action: structs.IntentionActionDeny,
 			HTTP: &structs.IntentionHTTPPermission{
@@ -556,206 +511,62 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 		}
 	)
 
-	makeSpiffe := func(name string, entMeta *acl.EnterpriseMeta) *pbproxystate.Spiffe {
-		em := *acl.DefaultEnterpriseMeta()
-		if entMeta != nil {
-			em = *entMeta
-		}
-		regex := makeSpiffePattern(rbacService{
-			ServiceName: structs.ServiceName{
-				Name:           name,
-				EnterpriseMeta: em,
-			},
-			TrustDomain: testTrustDomain,
-		})
-		return &pbproxystate.Spiffe{Regex: regex}
-	}
-
 	tests := map[string]struct {
-		intentionDefaultAllow  bool
-		v1Intentions           structs.SimplifiedIntentions
-		v2L4TrafficPermissions *pbproxystate.TrafficPermissions
+		intentionDefaultAllow bool
+		intentions            structs.Intentions
 	}{
 		"default-deny-mixed-precedence": {
 			intentionDefaultAllow: false,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testIntention(t, "web", "api", structs.IntentionActionAllow),
 				testIntention(t, "*", "api", structs.IntentionActionDeny),
 				testIntention(t, "web", "*", structs.IntentionActionDeny),
 			),
-			v2L4TrafficPermissions: &pbproxystate.TrafficPermissions{
-				AllowPermissions: []*pbproxystate.Permission{
-					{
-						Principals: []*pbproxystate.Principal{
-							{
-								Spiffe: makeSpiffe("web", nil),
-							},
-						},
-					},
-				},
-			},
 		},
 		"default-deny-service-wildcard-allow": {
 			intentionDefaultAllow: false,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourceIntention("*", structs.IntentionActionAllow),
 			),
-			v2L4TrafficPermissions: &pbproxystate.TrafficPermissions{
-				AllowPermissions: []*pbproxystate.Permission{
-					{
-						Principals: []*pbproxystate.Principal{
-							{
-								Spiffe: makeSpiffe("*", nil),
-							},
-						},
-					},
-				},
-			},
 		},
 		"default-allow-service-wildcard-deny": {
 			intentionDefaultAllow: true,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourceIntention("*", structs.IntentionActionDeny),
 			),
 		},
 		"default-deny-one-allow": {
 			intentionDefaultAllow: false,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourceIntention("web", structs.IntentionActionAllow),
 			),
-			v2L4TrafficPermissions: &pbproxystate.TrafficPermissions{
-				AllowPermissions: []*pbproxystate.Permission{
-					{
-						Principals: []*pbproxystate.Principal{
-							{
-								Spiffe: makeSpiffe("web", nil),
-							},
-						},
-					},
-				},
-			},
 		},
 		"default-allow-one-deny": {
 			intentionDefaultAllow: true,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourceIntention("web", structs.IntentionActionDeny),
 			),
 		},
 		"default-deny-allow-deny": {
 			intentionDefaultAllow: false,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourceIntention("web", structs.IntentionActionDeny),
 				testSourceIntention("*", structs.IntentionActionAllow),
 			),
-			v2L4TrafficPermissions: &pbproxystate.TrafficPermissions{
-				AllowPermissions: []*pbproxystate.Permission{
-					{
-						Principals: []*pbproxystate.Principal{
-							{
-								Spiffe:         makeSpiffe("*", nil),
-								ExcludeSpiffes: []*pbproxystate.Spiffe{makeSpiffe("web", nil)},
-							},
-						},
-					},
-				},
-			},
 		},
 		"default-deny-kitchen-sink": {
 			intentionDefaultAllow: false,
-			v1Intentions: sorted(
+			intentions: sorted(
 				// (double exact)
 				testSourceIntention("web", structs.IntentionActionAllow),
 				testSourceIntention("unsafe", structs.IntentionActionDeny),
 				testSourceIntention("cron", structs.IntentionActionAllow),
 				testSourceIntention("*", structs.IntentionActionAllow),
 			),
-			v2L4TrafficPermissions: &pbproxystate.TrafficPermissions{
-				AllowPermissions: []*pbproxystate.Permission{
-					{
-						Principals: []*pbproxystate.Principal{
-							{
-								Spiffe: makeSpiffe("cron", nil),
-							},
-							{
-								Spiffe: makeSpiffe("web", nil),
-							},
-							{
-								Spiffe: makeSpiffe("*", nil),
-								ExcludeSpiffes: []*pbproxystate.Spiffe{
-									makeSpiffe("web", nil),
-									makeSpiffe("unsafe", nil),
-									makeSpiffe("cron", nil),
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		"v2-kitchen-sink": {
-			intentionDefaultAllow: false,
-			v2L4TrafficPermissions: &pbproxystate.TrafficPermissions{
-				AllowPermissions: []*pbproxystate.Permission{
-					{
-						Principals: []*pbproxystate.Principal{
-							{
-								Spiffe: makeSpiffe("api", nil),
-							},
-							{
-								Spiffe: makeSpiffe("*", nil),
-								ExcludeSpiffes: []*pbproxystate.Spiffe{
-									makeSpiffe("unsafe", nil),
-								},
-							},
-						},
-					},
-					{
-						Principals: []*pbproxystate.Principal{
-							{
-								Spiffe: makeSpiffe("web", nil),
-							},
-						},
-					},
-				},
-				DenyPermissions: []*pbproxystate.Permission{
-					{
-						Principals: []*pbproxystate.Principal{
-							{
-								Spiffe: makeSpiffe("db", nil),
-							},
-							{
-								Spiffe: makeSpiffe("cron", nil),
-							},
-						},
-					},
-				},
-			},
-		},
-		"v2-default-deny": {
-			intentionDefaultAllow:  false,
-			v2L4TrafficPermissions: &pbproxystate.TrafficPermissions{},
-		},
-		"v2-default-allow": {
-			intentionDefaultAllow:  true,
-			v2L4TrafficPermissions: &pbproxystate.TrafficPermissions{},
-		},
-		// This validates that we don't send xDS messages to Envoy that will fail validation.
-		// Traffic permissions validations prevent this from being written to the IR, so the thing
-		// that matters is that the snapshot is valid to Envoy.
-		"v2-ignore-empty-permissions": {
-			intentionDefaultAllow: false,
-			v2L4TrafficPermissions: &pbproxystate.TrafficPermissions{
-				DenyPermissions: []*pbproxystate.Permission{
-					{},
-				},
-				AllowPermissions: []*pbproxystate.Permission{
-					{},
-				},
-			},
 		},
 		"default-allow-kitchen-sink": {
 			intentionDefaultAllow: true,
-			v1Intentions: sorted(
+			intentions: sorted(
 				// (double exact)
 				testSourceIntention("web", structs.IntentionActionDeny),
 				testSourceIntention("unsafe", structs.IntentionActionAllow),
@@ -765,7 +576,7 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 		},
 		"default-deny-peered-kitchen-sink": {
 			intentionDefaultAllow: false,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourceIntention("web", structs.IntentionActionAllow),
 				testIntentionPeered("*", "peer1", structs.IntentionActionAllow),
 				testIntentionPeered("web", "peer1", structs.IntentionActionDeny),
@@ -774,32 +585,32 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 		// ========================
 		"default-allow-path-allow": {
 			intentionDefaultAllow: true,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourcePermIntention("web", permSlashPrefix),
 			),
 		},
 		"default-deny-path-allow": {
 			intentionDefaultAllow: false,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourcePermIntention("web", permSlashPrefix),
 			),
 		},
 		"default-allow-path-deny": {
 			intentionDefaultAllow: true,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourcePermIntention("web", permDenySlashPrefix),
 			),
 		},
 		"default-deny-path-deny": {
 			intentionDefaultAllow: false,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourcePermIntention("web", permDenySlashPrefix),
 			),
 		},
 		// ========================
 		"default-allow-deny-all-and-path-allow": {
 			intentionDefaultAllow: true,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourcePermIntention("web",
 					&structs.IntentionPermission{
 						Action: structs.IntentionActionAllow,
@@ -813,7 +624,7 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 		},
 		"default-deny-deny-all-and-path-allow": {
 			intentionDefaultAllow: false,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourcePermIntention("web",
 					&structs.IntentionPermission{
 						Action: structs.IntentionActionAllow,
@@ -827,7 +638,7 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 		},
 		"default-allow-deny-all-and-path-deny": {
 			intentionDefaultAllow: true,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourcePermIntention("web",
 					&structs.IntentionPermission{
 						Action: structs.IntentionActionDeny,
@@ -841,7 +652,7 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 		},
 		"default-deny-deny-all-and-path-deny": {
 			intentionDefaultAllow: false,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourcePermIntention("web",
 					&structs.IntentionPermission{
 						Action: structs.IntentionActionDeny,
@@ -856,7 +667,7 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 		// ========================
 		"default-deny-two-path-deny-and-path-allow": {
 			intentionDefaultAllow: false,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourcePermIntention("web",
 					&structs.IntentionPermission{
 						Action: structs.IntentionActionDeny,
@@ -881,7 +692,7 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 		},
 		"default-allow-two-path-deny-and-path-allow": {
 			intentionDefaultAllow: true,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourcePermIntention("web",
 					&structs.IntentionPermission{
 						Action: structs.IntentionActionDeny,
@@ -906,7 +717,7 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 		},
 		"default-deny-single-intention-with-kitchen-sink-perms": {
 			intentionDefaultAllow: false,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourcePermIntention("web",
 					&structs.IntentionPermission{
 						Action: structs.IntentionActionDeny,
@@ -949,7 +760,7 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 		},
 		"default-allow-single-intention-with-kitchen-sink-perms": {
 			intentionDefaultAllow: true,
-			v1Intentions: sorted(
+			intentions: sorted(
 				testSourcePermIntention("web",
 					&structs.IntentionPermission{
 						Action: structs.IntentionActionAllow,
@@ -990,70 +801,6 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 				),
 			),
 		},
-		// ========= JWTAuthn Filter checks
-		"top-level-jwt-no-permissions": {
-			intentionDefaultAllow: false,
-			v1Intentions: sorted(
-				testIntentionWithJWT("web", structs.IntentionActionAllow, jwtRequirement),
-			),
-		},
-		"empty-top-level-jwt-with-one-permission": {
-			intentionDefaultAllow: false,
-			v1Intentions: sorted(
-				testIntentionWithJWT("web", structs.IntentionActionAllow, nil, &structs.IntentionPermission{
-					Action: structs.IntentionActionAllow,
-					HTTP: &structs.IntentionHTTPPermission{
-						PathPrefix: "some-path",
-					},
-					JWT: jwtRequirement,
-				}),
-			),
-		},
-		"top-level-jwt-with-one-permission": {
-			intentionDefaultAllow: false,
-			v1Intentions: sorted(
-				testIntentionWithJWT("web",
-					structs.IntentionActionAllow,
-					jwtRequirement,
-					&structs.IntentionPermission{
-						Action: structs.IntentionActionAllow,
-						HTTP: &structs.IntentionHTTPPermission{
-							PathExact: "/v1/secret",
-						},
-						JWT: auth0Requirement,
-					},
-					&structs.IntentionPermission{
-						Action: structs.IntentionActionAllow,
-						HTTP: &structs.IntentionHTTPPermission{
-							PathExact: "/v1/admin",
-						},
-					},
-				),
-			),
-		},
-		"top-level-jwt-with-multiple-permissions": {
-			intentionDefaultAllow: false,
-			v1Intentions: sorted(
-				testIntentionWithJWT("web",
-					structs.IntentionActionAllow,
-					jwtRequirement,
-					&structs.IntentionPermission{
-						Action: structs.IntentionActionAllow,
-						HTTP: &structs.IntentionHTTPPermission{
-							PathExact: "/v1/secret",
-						},
-						JWT: auth0Requirement,
-					},
-					&structs.IntentionPermission{
-						Action: structs.IntentionActionAllow,
-						HTTP: &structs.IntentionHTTPPermission{
-							PathExact: "/v1/admin",
-						},
-						JWT: auth0Requirement,
-					},
-				),
-			),
-		},
 	}
 
 	testLocalInfo := rbacLocalInfo{
@@ -1065,49 +812,17 @@ func TestMakeRBACNetworkAndHTTPFilters(t *testing.T) {
 		tt := tt
 		t.Run(name, func(t *testing.T) {
 			t.Run("network filter", func(t *testing.T) {
+				filter, err := makeRBACNetworkFilter(tt.intentions, tt.intentionDefaultAllow, testLocalInfo, testPeerTrustBundle)
+				require.NoError(t, err)
 
 				t.Run("current", func(t *testing.T) {
-					if len(tt.v1Intentions) == 0 {
-						return
-					}
-
-					filter, err := makeRBACNetworkFilter(tt.v1Intentions, tt.intentionDefaultAllow, testLocalInfo, testPeerTrustBundle)
-					require.NoError(t, err)
 					gotJSON := protoToJSON(t, filter)
 
 					require.JSONEq(t, goldenSimple(t, filepath.Join("rbac", name), gotJSON), gotJSON)
 				})
-
-				t.Run("v1 vs v2", func(t *testing.T) {
-					if tt.v2L4TrafficPermissions == nil {
-						return
-					}
-
-					tt.v2L4TrafficPermissions.DefaultAllow = tt.intentionDefaultAllow
-
-					filters, err := xdsv2.MakeL4RBAC(tt.v2L4TrafficPermissions)
-					require.NoError(t, err)
-
-					var gotJSON string
-					if len(filters) == 1 {
-						gotJSON = protoToJSON(t, filters[0])
-					} else {
-						// This is wrapped because protoToJSON won't encode an array of protobufs.
-						chain := &envoy_listener_v3.FilterChain{}
-						chain.Filters = filters
-						gotJSON = protoToJSON(t, chain)
-					}
-
-					require.JSONEq(t, goldenSimple(t, filepath.Join("rbac", name), gotJSON), gotJSON)
-				})
 			})
-
 			t.Run("http filter", func(t *testing.T) {
-				if len(tt.v1Intentions) == 0 {
-					return
-				}
-
-				filter, err := makeRBACHTTPFilter(tt.v1Intentions, tt.intentionDefaultAllow, testLocalInfo, testPeerTrustBundle, testJWTProviderConfigEntry)
+				filter, err := makeRBACHTTPFilter(tt.intentions, tt.intentionDefaultAllow, testLocalInfo, testPeerTrustBundle)
 				require.NoError(t, err)
 
 				t.Run("current", func(t *testing.T) {
@@ -1140,15 +855,15 @@ func TestRemoveSameSourceIntentions(t *testing.T) {
 		ixn.UpdatePrecedence()
 		return ixn
 	}
-	sorted := func(ixns ...*structs.Intention) structs.SimplifiedIntentions {
+	sorted := func(ixns ...*structs.Intention) structs.Intentions {
 		sort.SliceStable(ixns, func(i, j int) bool {
 			return ixns[j].Precedence < ixns[i].Precedence
 		})
-		return structs.SimplifiedIntentions(ixns)
+		return structs.Intentions(ixns)
 	}
 	tests := map[string]struct {
-		in     structs.SimplifiedIntentions
-		expect structs.SimplifiedIntentions
+		in     structs.Intentions
+		expect structs.Intentions
 	}{
 		"empty": {},
 		"one": {
@@ -1342,125 +1057,3 @@ func TestSpiffeMatcher(t *testing.T) {
 		})
 	}
 }
-
-func TestPathToSegments(t *testing.T) {
-	tests := map[string]struct {
-		key      string
-		paths    []string
-		expected []*envoy_matcher_v3.MetadataMatcher_PathSegment
-	}{
-		"single-path": {
-			key:   "jwt_payload_okta",
-			paths: []string{"perms"},
-			expected: []*envoy_matcher_v3.MetadataMatcher_PathSegment{
-				{
-					Segment: &envoy_matcher_v3.MetadataMatcher_PathSegment_Key{Key: "jwt_payload_okta"},
-				},
-				{
-					Segment: &envoy_matcher_v3.MetadataMatcher_PathSegment_Key{Key: "perms"},
-				},
-			},
-		},
-		"multi-paths": {
-			key:   "jwt_payload_okta",
-			paths: []string{"perms", "roles"},
-			expected: []*envoy_matcher_v3.MetadataMatcher_PathSegment{
-				{
-					Segment: &envoy_matcher_v3.MetadataMatcher_PathSegment_Key{Key: "jwt_payload_okta"},
-				},
-				{
-					Segment: &envoy_matcher_v3.MetadataMatcher_PathSegment_Key{Key: "perms"},
-				},
-				{
-					Segment: &envoy_matcher_v3.MetadataMatcher_PathSegment_Key{Key: "roles"},
-				},
-			},
-		},
-	}
-
-	for name, tt := range tests {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			segments := pathToSegments(tt.paths, tt.key)
-			require.ElementsMatch(t, segments, tt.expected)
-		})
-	}
-}
-
-func TestJWTClaimsToPrincipals(t *testing.T) {
-	var (
-		firstClaim = structs.IntentionJWTClaimVerification{
-			Path:  []string{"perms"},
-			Value: "admin",
-		}
-		secondClaim = structs.IntentionJWTClaimVerification{
-			Path:  []string{"passage"},
-			Value: "secret",
-		}
-		payloadKey     = "dummy-key"
-		firstPrincipal = envoy_rbac_v3.Principal{
-			Identifier: &envoy_rbac_v3.Principal_Metadata{
-				Metadata: &envoy_matcher_v3.MetadataMatcher{
-					Filter: jwtEnvoyFilter,
-					Path:   pathToSegments(firstClaim.Path, payloadKey),
-					Value: &envoy_matcher_v3.ValueMatcher{
-						MatchPattern: &envoy_matcher_v3.ValueMatcher_StringMatch{
-							StringMatch: &envoy_matcher_v3.StringMatcher{
-								MatchPattern: &envoy_matcher_v3.StringMatcher_Exact{
-									Exact: firstClaim.Value,
-								},
-							},
-						},
-					},
-				},
-			},
-		}
-		secondPrincipal = envoy_rbac_v3.Principal{
-			Identifier: &envoy_rbac_v3.Principal_Metadata{
-				Metadata: &envoy_matcher_v3.MetadataMatcher{
-					Filter: jwtEnvoyFilter,
-					Path:   pathToSegments(secondClaim.Path, payloadKey),
-					Value: &envoy_matcher_v3.ValueMatcher{
-						MatchPattern: &envoy_matcher_v3.ValueMatcher_StringMatch{
-							StringMatch: &envoy_matcher_v3.StringMatcher{
-								MatchPattern: &envoy_matcher_v3.StringMatcher_Exact{
-									Exact: secondClaim.Value,
-								},
-							},
-						},
-					},
-				},
-			},
-		}
-	)
-	tests := map[string]struct {
-		claims             []*structs.IntentionJWTClaimVerification
-		metadataPayloadKey string
-		expected           *envoy_rbac_v3.Principal
-	}{
-		"single-claim": {
-			claims:             []*structs.IntentionJWTClaimVerification{&firstClaim},
-			metadataPayloadKey: payloadKey,
-			expected:           &firstPrincipal,
-		},
-		"multiple-claims": {
-			claims:             []*structs.IntentionJWTClaimVerification{&firstClaim, &secondClaim},
-			metadataPayloadKey: payloadKey,
-			expected: &envoy_rbac_v3.Principal{
-				Identifier: &envoy_rbac_v3.Principal_AndIds{
-					AndIds: &envoy_rbac_v3.Principal_Set{
-						Ids: []*envoy_rbac_v3.Principal{&firstPrincipal, &secondPrincipal},
-					},
-				},
-			},
-		},
-	}
-
-	for name, tt := range tests {
-		tt := tt
-		t.Run(name, func(t *testing.T) {
-			principal := jwtClaimsToPrincipals(tt.claims, tt.metadataPayloadKey)
-			require.Equal(t, principal, tt.expected)
-		})
-	}
-}
diff --git a/agent/xds/resources.go b/agent/xds/resources.go
index fc761040029c2..cab494da4cad4 100644
--- a/agent/xds/resources.go
+++ b/agent/xds/resources.go
@@ -1,12 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
 	"fmt"
 
-	"github.com/hashicorp/consul/agent/xds/configfetcher"
 	"github.com/hashicorp/go-hclog"
 	"google.golang.org/protobuf/proto"
 
@@ -19,7 +15,7 @@ import (
 // resources for a single client.
 type ResourceGenerator struct {
 	Logger         hclog.Logger
-	CfgFetcher     configfetcher.ConfigFetcher
+	CfgFetcher     ConfigFetcher
 	IncrementalXDS bool
 
 	ProxyFeatures xdscommon.SupportedProxyFeatures
@@ -27,7 +23,7 @@ type ResourceGenerator struct {
 
 func NewResourceGenerator(
 	logger hclog.Logger,
-	cfgFetcher configfetcher.ConfigFetcher,
+	cfgFetcher ConfigFetcher,
 	incrementalXDS bool,
 ) *ResourceGenerator {
 	return &ResourceGenerator{
diff --git a/agent/xds/resources_ce_test.go b/agent/xds/resources_ce_test.go
index 08b922809fc74..a22e18f643592 100644
--- a/agent/xds/resources_ce_test.go
+++ b/agent/xds/resources_ce_test.go
@@ -1,12 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package xds
 
-import "testing"
-
-func getEnterpriseGoldenTestCases(t *testing.T) []goldenTestCase {
+func getEnterpriseGoldenTestCases() []goldenTestCase {
 	return nil
 }
diff --git a/agent/xds/resources_test.go b/agent/xds/resources_test.go
index 69a704386b5d5..28b57e10f931b 100644
--- a/agent/xds/resources_test.go
+++ b/agent/xds/resources_test.go
@@ -1,33 +1,26 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
 	"path/filepath"
 	"sort"
 	"testing"
-	"time"
 
 	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
 	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
 	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
 	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
 	envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
-	"k8s.io/utils/pointer"
 
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/consul/discoverychain"
 	"github.com/hashicorp/consul/agent/xds/testcommon"
 	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/types"
 
 	testinf "github.com/mitchellh/go-testing-interface"
 	"github.com/stretchr/testify/require"
 
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xds/response"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
@@ -121,7 +114,7 @@ func TestAllResourcesFromSnapshot(t *testing.T) {
 					}
 				})
 
-				r, err := response.CreateResponse(typeUrl, "00000001", "00000001", items)
+				r, err := createResponse(typeUrl, "00000001", "00000001", items)
 				require.NoError(t, err)
 
 				gotJSON := protoToJSON(t, r)
@@ -160,23 +153,13 @@ func TestAllResourcesFromSnapshot(t *testing.T) {
 			},
 		},
 		{
-			name: "transparent-proxy",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotTransparentProxy(t)
-			},
+			name:   "transparent-proxy",
+			create: proxycfg.TestConfigSnapshotTransparentProxy,
 		},
 		{
 			name:   "connect-proxy-with-peered-upstreams",
 			create: proxycfg.TestConfigSnapshotPeering,
 		},
-		{
-			name:   "connect-proxy-with-peered-upstreams-escape-overrides",
-			create: proxycfg.TestConfigSnapshotPeeringWithEscapeOverrides,
-		},
-		{
-			name:   "connect-proxy-with-peered-upstreams-http2",
-			create: proxycfg.TestConfigSnapshotPeeringWithHTTP2,
-		},
 		{
 			name:   "transparent-proxy-with-peered-upstreams",
 			create: proxycfg.TestConfigSnapshotPeeringTProxy,
@@ -193,7 +176,7 @@ func TestAllResourcesFromSnapshot(t *testing.T) {
 	tests = append(tests, getConnectProxyTransparentProxyGoldenTestCases()...)
 	tests = append(tests, getMeshGatewayPeeringGoldenTestCases()...)
 	tests = append(tests, getTrafficControlPeeringGoldenTestCases(false)...)
-	tests = append(tests, getEnterpriseGoldenTestCases(t)...)
+	tests = append(tests, getEnterpriseGoldenTestCases()...)
 	tests = append(tests, getAPIGatewayGoldenTestCases(t)...)
 
 	latestEnvoyVersion := xdscommon.EnvoyVersions[0]
@@ -260,11 +243,7 @@ func getMeshGatewayPeeringGoldenTestCases() []goldenTestCase {
 		{
 			name: "mesh-gateway-with-imported-peered-services",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotPeeredMeshGateway(t, "imported-services", func(ns *structs.NodeService) {
-					ns.Proxy.Config = map[string]interface{}{
-						"envoy_dns_discovery_type": "STRICT_DNS",
-					}
-				}, nil)
+				return proxycfg.TestConfigSnapshotPeeredMeshGateway(t, "imported-services", nil, nil)
 			},
 		},
 		{
@@ -344,54 +323,6 @@ RahYIzNLRBTLrwadLAZkApUpZvB8qDK4knsTWFYujNsylCww2A6ajzIMFNU4GkUK
 NtyHRuD+KYRmjXtyX1yHNqfGN3vOQmwavHq2R8wHYuBSc6LAHHV9vG+j0VsgMELO
 qwxn8SmLkSKbf2+MsQVzLCXXN5u+D8Yv+4py+oKP4EQ5aFZuDEx+r/G/31rTthww
 AAJAMaoXmoYVdgXV+CPuBb2M4XCpuzLu3bcA2PXm5ipSyIgntMKwXV7r
------END CERTIFICATE-----`
-	// openssl req -x509 -newkey rsa:2048 -keyout key.pem -out cert.pem -sha256 -days 3650 \
-	// -nodes -subj "/C=XX/CN=secondcert.com" -addext "subjectAltName = DNS:secondcert.com"
-	gatewayTestPrivateKeyTwo = `-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCiPr2HCbVzbZ1M
-IW89rfLLrciPTWWl48DF9CmYHS0C2gSD1W6bxzO7zdA+ced0ajI+YsQ9aBAXRhKl
-EHgnhBJ6sGsz1XBQ9+lNDHrg9AjugIiHoscYOeCcxMeXhp97ti+vpVsc2/AvEf2K
-GIUuOjcufXuRXkWQ2aB4RGyodkgRF6n8YrLJb7pWIjoCNwDAWtZX4wIVFgGq1ew0
-E/E9EyStMYTb5h1lvCpXYRN9AeSFKUQI/y0xsT3+nZ/gyzx3CrgzuSYRgptbuVwm
-5F2Q16sLR/EtCBIhA8npKagx/4U7KOilF31I2locH4Aq5l9VJd/6pTA5F4KCAW/E
-ybXz6DojAgMBAAECggEAPcOuuRqsFf4ztIjB5XQ0Cu/kexFW0flLKNDTiNIKkZxX
-vaxhyDHkculeDnekSkAnUnKdDFdyULnfXTFQ3JI9yrEgjoIBmQFXsno+ySZ9w/Xw
-g9om+wUFigirhva7/geUTcSgU/Myk2jA4XKGONv2p98jTGrcBtGickZyKwukUcTa
-M18phLdjejg09d45QV5pEtU5m0HuydvtMNCxL2UeWMxyIVezAH2S48m7IAn7Xs4p
-J9bwjboDWQYs+zLPfEZyosiJiKugpEKvApIKsJXf4JqRXHN+vvKKDeXkKrrGR+pg
-3e5foPjFrLcDltZMkrfnlm8fa0yLnoxdiyd1pDcJaQKBgQDSnJbM6CDb0b3bUyiz
-LpfJSBzEPqABM8mNeVHfEjHcBJ7YBOceBxDNasmAPvFbhoDrlHiEYW2QnDLRXKeF
-XVdXjSsUV30SPMeg6yeSd8L+LKXLjrGMNGDcJfnjLavv7Glu1xDnYyFSmeVIhWoo
-cOhfaFQ69vnHiU1idrOlz6zhPwKBgQDFNcY0S59f3tht7kgnItg8PSfJqJQrIdLt
-x6MC2Nc7Eui7/LTuO2rMG6HRA/8zQa/TfnfG7CsUwLB1NiC2R1TtM9YBYPxhMl1o
-JeGTfM+tD0lBwPhYpgnOCppuayRCfAsPYA6NcvXcGZbxOigxliOuvgVBH47EAApA
-zJ+8b6nKHQKBgQCZ0GDV/4XX5KNq5Z3o1tNl3jOcIzyKBD9kAkGHz+r4C6vSiioc
-pP5hd2b4MX/l3yKSapll3R2+qkT24Fs8LEJYn7Hhpk+inR8SaAs7jhmrtgHT2z/R
-7IL85QNOJhHXJGqP16PxyVUR1XE9eKpiJKug2joB4lPjpWQN0DE9nKFe0wKBgEo3
-qpgTva7+1sTIYC8aVfaVrVufLePtnswNzbNMl/OLcjsNJ6pgghi+bW+T6X8IwXr+
-pWUfjDcLLV1vOXBf9/4s++UY8uJBahW/69zto9qlXhR44v25vwbjxqq3d7XtqNvo
-cpGZKh3jI4M1N9sxfcxNhvyzO69XtIQefh8UhvmhAoGBAKzSA51l50ocOnWSNAXs
-QQoU+dYQjLDMtzc5N68EUf1GSjtgkpa3PYjVo09OMeb7+W9LhwHQDNMqgeeEDCsm
-B6NDnI4VyjVae7Hqz48WBERJBFMFWiLxEa1m2UwaV2jAubN8FKgH4KzDzOKtJEUy
-Rz9IUct6HXsDSs+Q3/zdFmPo
------END PRIVATE KEY-----`
-	gatewayTestCertificateTwo = `-----BEGIN CERTIFICATE-----
-MIIC7DCCAdSgAwIBAgIJAMHpuSA3ioNPMA0GCSqGSIb3DQEBCwUAMCYxCzAJBgNV
-BAYTAlhYMRcwFQYDVQQDDA5zZWNvbmRjZXJ0LmNvbTAeFw0yMzA3MTExNTE1MjBa
-Fw0zMzA3MDgxNTE1MjBaMCYxCzAJBgNVBAYTAlhYMRcwFQYDVQQDDA5zZWNvbmRj
-ZXJ0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKI+vYcJtXNt
-nUwhbz2t8sutyI9NZaXjwMX0KZgdLQLaBIPVbpvHM7vN0D5x53RqMj5ixD1oEBdG
-EqUQeCeEEnqwazPVcFD36U0MeuD0CO6AiIeixxg54JzEx5eGn3u2L6+lWxzb8C8R
-/YoYhS46Ny59e5FeRZDZoHhEbKh2SBEXqfxisslvulYiOgI3AMBa1lfjAhUWAarV
-7DQT8T0TJK0xhNvmHWW8KldhE30B5IUpRAj/LTGxPf6dn+DLPHcKuDO5JhGCm1u5
-XCbkXZDXqwtH8S0IEiEDyekpqDH/hTso6KUXfUjaWhwfgCrmX1Ul3/qlMDkXgoIB
-b8TJtfPoOiMCAwEAAaMdMBswGQYDVR0RBBIwEIIOc2Vjb25kY2VydC5jb20wDQYJ
-KoZIhvcNAQELBQADggEBAJvP3deuEpJZktAny6/az09GLSUYddiNCE4sG/2ASj7C
-mwRTh2HM4BDnkhW9PNjfHoaWa2TDIhOyHQ5hLYz2tnaeU1sOrADCuFSxGiQqgr8J
-prahKh6AzNsXba4rumoO08QTTtJzoa8L6TV4PTQ6gi+OMdbyBe3CQ7DSRzLseHNH
-KG5tqRRu+Jm7dUuOXDV4MDHoloyZlksOvIYSC+gaS+ke3XlR+GzOW7hpgn5SIDlv
-aR/zlIKXUCvVux3/pNFgW6rduFE0f5Hbc1+J4ghTl8EQu1dwDTax7blXQwE+VDgJ
-u4fZGRmoUvvO/bjVCbehBxfJn0rHsxpuD5b4Jg2OZNc=
 -----END CERTIFICATE-----`
 )
 
@@ -400,7 +331,7 @@ func getAPIGatewayGoldenTestCases(t *testing.T) []goldenTestCase {
 
 	service := structs.NewServiceName("service", nil)
 	serviceUID := proxycfg.NewUpstreamIDFromServiceName(service)
-	serviceChain := discoverychain.TestCompileConfigEntries(t, "service", "default", "default", "dc1", connect.TestClusterID+".consul", nil, nil)
+	serviceChain := discoverychain.TestCompileConfigEntries(t, "service", "default", "default", "dc1", connect.TestClusterID+".consul", nil)
 
 	return []goldenTestCase{
 		{
@@ -433,185 +364,24 @@ func getAPIGatewayGoldenTestCases(t *testing.T) []goldenTestCase {
 							}},
 						},
 					}
-				},
-					[]structs.BoundRoute{
-						&structs.TCPRouteConfigEntry{
-							Kind: structs.TCPRoute,
-							Name: "route",
-							Services: []structs.TCPService{{
-								Name: "service",
-							}},
-							Parents: []structs.ResourceReference{
-								{
-									Kind: structs.APIGateway,
-									Name: "api-gateway",
-								},
-							},
-						},
-					}, []structs.InlineCertificateConfigEntry{{
-						Kind:        structs.InlineCertificate,
-						Name:        "certificate",
-						PrivateKey:  gatewayTestPrivateKey,
-						Certificate: gatewayTestCertificate,
-					}}, nil)
-			},
-		},
-		{
-			name: "api-gateway-with-multiple-inline-certificates",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotAPIGateway(t, "default", nil, func(entry *structs.APIGatewayConfigEntry, bound *structs.BoundAPIGatewayConfigEntry) {
-					entry.Listeners = []structs.APIGatewayListener{
-						{
-							Name:     "listener",
-							Protocol: structs.ListenerProtocolTCP,
-							Port:     8080,
-							TLS: structs.APIGatewayTLSConfiguration{
-								Certificates: []structs.ResourceReference{{
-									Kind: structs.InlineCertificate,
-									Name: "certificate",
-								}},
-								MinVersion: types.TLSv1_2,
-								MaxVersion: types.TLSv1_3,
-								CipherSuites: []types.TLSCipherSuite{
-									types.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
-									types.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
-								},
-							},
-						},
-					}
-					bound.Listeners = []structs.BoundAPIGatewayListener{
-						{
-							Name: "listener",
-							Certificates: []structs.ResourceReference{
-								{
-									Kind: structs.InlineCertificate,
-									Name: "certificate",
-								},
-								{
-									Kind: structs.InlineCertificate,
-									Name: "certificate-too",
-								},
-							},
-							Routes: []structs.ResourceReference{{
-								Kind: structs.TCPRoute,
-								Name: "route",
-							}},
-						},
-					}
-				},
-					[]structs.BoundRoute{
-						&structs.TCPRouteConfigEntry{
-							Kind: structs.TCPRoute,
-							Name: "route",
-							Services: []structs.TCPService{{
-								Name: "service",
-							}},
-							Parents: []structs.ResourceReference{
-								{
-									Kind: structs.APIGateway,
-									Name: "api-gateway",
-								},
-							},
-						},
-					}, []structs.InlineCertificateConfigEntry{
-						{
-							Kind:        structs.InlineCertificate,
-							Name:        "certificate",
-							PrivateKey:  gatewayTestPrivateKey,
-							Certificate: gatewayTestCertificate,
-						},
-						{
-							Kind:        structs.InlineCertificate,
-							Name:        "certificate-too",
-							PrivateKey:  gatewayTestPrivateKeyTwo,
-							Certificate: gatewayTestCertificateTwo,
-						},
-					}, nil)
-			},
-		},
-		{
-			name: "api-gateway-with-http-route",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotAPIGateway(t, "default", nil, func(entry *structs.APIGatewayConfigEntry, bound *structs.BoundAPIGatewayConfigEntry) {
-					entry.Listeners = []structs.APIGatewayListener{
-						{
-							Name:     "listener",
-							Protocol: structs.ListenerProtocolHTTP,
-							Port:     8080,
-						},
-					}
-					bound.Listeners = []structs.BoundAPIGatewayListener{
-						{
-							Name: "listener",
-							Certificates: []structs.ResourceReference{{
-								Kind: structs.InlineCertificate,
-								Name: "certificate",
-							}},
-							Routes: []structs.ResourceReference{{
-								Kind: structs.HTTPRoute,
-								Name: "route",
-							}},
-						},
-					}
 				}, []structs.BoundRoute{
-					&structs.HTTPRouteConfigEntry{
-						Kind: structs.HTTPRoute,
+					&structs.TCPRouteConfigEntry{
+						Kind: structs.TCPRoute,
 						Name: "route",
-						Rules: []structs.HTTPRouteRule{{
-							Filters: structs.HTTPFilters{
-								Headers: []structs.HTTPHeaderFilter{
-									{
-										Add: map[string]string{
-											"X-Header-Add": "added",
-										},
-										Set: map[string]string{
-											"X-Header-Set": "set",
-										},
-										Remove: []string{"X-Header-Remove"},
-									},
-								},
-								RetryFilter: &structs.RetryFilter{
-									NumRetries:            pointer.Uint32(3),
-									RetryOn:               []string{"cancelled"},
-									RetryOnStatusCodes:    []uint32{500},
-									RetryOnConnectFailure: pointer.Bool(true),
-								},
-								TimeoutFilter: &structs.TimeoutFilter{
-									IdleTimeout:    time.Second * 30,
-									RequestTimeout: time.Second * 30,
-								},
-							},
-							Services: []structs.HTTPService{{
-								Name: "service",
-							}},
+						Services: []structs.TCPService{{
+							Name: "service",
 						}},
-						Parents: []structs.ResourceReference{
-							{
-								Kind: structs.APIGateway,
-								Name: "api-gateway",
-							},
-						},
 					},
 				}, []structs.InlineCertificateConfigEntry{{
 					Kind:        structs.InlineCertificate,
 					Name:        "certificate",
 					PrivateKey:  gatewayTestPrivateKey,
 					Certificate: gatewayTestCertificate,
-				}}, []proxycfg.UpdateEvent{{
-					CorrelationID: "discovery-chain:" + serviceUID.String(),
-					Result: &structs.DiscoveryChainResponse{
-						Chain: serviceChain,
-					},
-				}, {
-					CorrelationID: "upstream-target:" + serviceChain.ID() + ":" + serviceUID.String(),
-					Result: &structs.IndexedCheckServiceNodes{
-						Nodes: proxycfg.TestUpstreamNodes(t, "service"),
-					},
-				}})
+				}}, nil)
 			},
 		},
 		{
-			name: "api-gateway-with-http-route-timeoutfilter-one-set",
+			name: "api-gateway-with-http-route-and-inline-certificate",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotAPIGateway(t, "default", nil, func(entry *structs.APIGatewayConfigEntry, bound *structs.BoundAPIGatewayConfigEntry) {
 					entry.Listeners = []structs.APIGatewayListener{
@@ -624,10 +394,6 @@ func getAPIGatewayGoldenTestCases(t *testing.T) []goldenTestCase {
 					bound.Listeners = []structs.BoundAPIGatewayListener{
 						{
 							Name: "listener",
-							Certificates: []structs.ResourceReference{{
-								Kind: structs.InlineCertificate,
-								Name: "certificate",
-							}},
 							Routes: []structs.ResourceReference{{
 								Kind: structs.HTTPRoute,
 								Name: "route",
@@ -639,39 +405,12 @@ func getAPIGatewayGoldenTestCases(t *testing.T) []goldenTestCase {
 						Kind: structs.HTTPRoute,
 						Name: "route",
 						Rules: []structs.HTTPRouteRule{{
-							Filters: structs.HTTPFilters{
-								Headers: []structs.HTTPHeaderFilter{
-									{
-										Add: map[string]string{
-											"X-Header-Add": "added",
-										},
-										Set: map[string]string{
-											"X-Header-Set": "set",
-										},
-										Remove: []string{"X-Header-Remove"},
-									},
-								},
-								TimeoutFilter: &structs.TimeoutFilter{
-									IdleTimeout: time.Second * 30,
-								},
-							},
 							Services: []structs.HTTPService{{
 								Name: "service",
 							}},
 						}},
-						Parents: []structs.ResourceReference{
-							{
-								Kind: structs.APIGateway,
-								Name: "api-gateway",
-							},
-						},
 					},
-				}, []structs.InlineCertificateConfigEntry{{
-					Kind:        structs.InlineCertificate,
-					Name:        "certificate",
-					PrivateKey:  gatewayTestPrivateKey,
-					Certificate: gatewayTestCertificate,
-				}}, []proxycfg.UpdateEvent{{
+				}, nil, []proxycfg.UpdateEvent{{
 					CorrelationID: "discovery-chain:" + serviceUID.String(),
 					Result: &structs.DiscoveryChainResponse{
 						Chain: serviceChain,
diff --git a/agent/xds/response/response.go b/agent/xds/response.go
similarity index 78%
rename from agent/xds/response/response.go
rename to agent/xds/response.go
index 91ce6d7397386..06948d7fe3df2 100644
--- a/agent/xds/response/response.go
+++ b/agent/xds/response.go
@@ -1,7 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package response
+package xds
 
 import (
 	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
@@ -13,7 +10,7 @@ import (
 	"google.golang.org/protobuf/types/known/wrapperspb"
 )
 
-func CreateResponse(typeURL string, version, nonce string, resources []proto.Message) (*envoy_discovery_v3.DiscoveryResponse, error) {
+func createResponse(typeURL string, version, nonce string, resources []proto.Message) (*envoy_discovery_v3.DiscoveryResponse, error) {
 	anys := make([]*anypb.Any, 0, len(resources))
 	for _, r := range resources {
 		if r == nil {
@@ -41,7 +38,7 @@ func CreateResponse(typeURL string, version, nonce string, resources []proto.Mes
 	return resp, nil
 }
 
-func MakePipeAddress(path string, mode uint32) *envoy_core_v3.Address {
+func makePipeAddress(path string, mode uint32) *envoy_core_v3.Address {
 	return &envoy_core_v3.Address{
 		Address: &envoy_core_v3.Address_Pipe{
 			Pipe: &envoy_core_v3.Pipe{
@@ -52,7 +49,7 @@ func MakePipeAddress(path string, mode uint32) *envoy_core_v3.Address {
 	}
 }
 
-func MakeAddress(ip string, port int) *envoy_core_v3.Address {
+func makeAddress(ip string, port int) *envoy_core_v3.Address {
 	return &envoy_core_v3.Address{
 		Address: &envoy_core_v3.Address_SocketAddress{
 			SocketAddress: &envoy_core_v3.SocketAddress{
@@ -65,15 +62,15 @@ func MakeAddress(ip string, port int) *envoy_core_v3.Address {
 	}
 }
 
-func MakeUint32Value(n int) *wrapperspb.UInt32Value {
+func makeUint32Value(n int) *wrapperspb.UInt32Value {
 	return &wrapperspb.UInt32Value{Value: uint32(n)}
 }
 
-func MakeBoolValue(n bool) *wrapperspb.BoolValue {
+func makeBoolValue(n bool) *wrapperspb.BoolValue {
 	return &wrapperspb.BoolValue{Value: n}
 }
 
-func MakeEnvoyRegexMatch(patt string) *envoy_matcher_v3.RegexMatcher {
+func makeEnvoyRegexMatch(patt string) *envoy_matcher_v3.RegexMatcher {
 	return &envoy_matcher_v3.RegexMatcher{
 		EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{
 			GoogleRe2: &envoy_matcher_v3.RegexMatcher_GoogleRE2{},
diff --git a/agent/xds/routes.go b/agent/xds/routes.go
index 99d72735b35d6..9a02d96ea5c8e 100644
--- a/agent/xds/routes.go
+++ b/agent/xds/routes.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
@@ -14,19 +11,13 @@ import (
 	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
 	envoy_matcher_v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3"
-	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
 
 	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/consul/discoverychain"
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xds/config"
-	"github.com/hashicorp/consul/agent/xds/response"
 )
 
 // routesFromSnapshot returns the xDS API representation of the "routes" in the
@@ -42,7 +33,13 @@ func (s *ResourceGenerator) routesFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot)
 	case structs.ServiceKindIngressGateway:
 		return s.routesForIngressGateway(cfgSnap)
 	case structs.ServiceKindAPIGateway:
-		return s.routesForAPIGateway(cfgSnap)
+		// TODO Find a cleaner solution, can't currently pass unexported property types
+		var err error
+		cfgSnap.IngressGateway, err = cfgSnap.APIGateway.ToIngress(cfgSnap.Datacenter)
+		if err != nil {
+			return nil, err
+		}
+		return s.routesForIngressGateway(cfgSnap)
 	case structs.ServiceKindTerminatingGateway:
 		return s.routesForTerminatingGateway(cfgSnap)
 	case structs.ServiceKindMeshGateway:
@@ -61,13 +58,17 @@ func (s *ResourceGenerator) routesForConnectProxy(cfgSnap *proxycfg.ConfigSnapsh
 			continue
 		}
 
-		virtualHost, err := s.makeUpstreamRouteForDiscoveryChain(cfgSnap, uid, chain, []string{"*"}, false, perRouteFilterBuilder{})
+		explicit := cfgSnap.ConnectProxy.UpstreamConfig[uid].HasLocalPortOrSocket()
+		implicit := cfgSnap.ConnectProxy.IsImplicitUpstream(uid)
+		if !implicit && !explicit {
+			// Discovery chain is not associated with a known explicit or implicit upstream so it is skipped.
+			continue
+		}
+
+		virtualHost, err := s.makeUpstreamRouteForDiscoveryChain(cfgSnap, uid, chain, []string{"*"}, false)
 		if err != nil {
 			return nil, err
 		}
-		if virtualHost == nil {
-			continue
-		}
 
 		route := &envoy_route_v3.RouteConfiguration{
 			Name:         uid.EnvoyID(),
@@ -75,7 +76,7 @@ func (s *ResourceGenerator) routesForConnectProxy(cfgSnap *proxycfg.ConfigSnapsh
 			// ValidateClusters defaults to true when defined statically and false
 			// when done via RDS. Re-set the reasonable value of true to prevent
 			// null-routing traffic.
-			ValidateClusters: response.MakeBoolValue(true),
+			ValidateClusters: makeBoolValue(true),
 		}
 		resources = append(resources, route)
 	}
@@ -97,12 +98,12 @@ func (s *ResourceGenerator) routesForConnectProxy(cfgSnap *proxycfg.ConfigSnapsh
 				addressesMap[routeName] = make(map[string]string)
 			}
 			// cluster name is unique per address/port so we should not be doing any override here
-
 			clusterName := clusterNameForDestination(cfgSnap, svcConfig.Name, address, svcConfig.NamespaceOrDefault(), svcConfig.PartitionOrDefault())
 			addressesMap[routeName][clusterName] = address
 		}
 		return nil
 	})
+
 	if err != nil {
 		return nil, err
 	}
@@ -122,6 +123,7 @@ func (s *ResourceGenerator) routesForConnectProxy(cfgSnap *proxycfg.ConfigSnapsh
 }
 
 func (s *ResourceGenerator) makeRoutesForAddresses(routeName string, addresses map[string]string) ([]proto.Message, error) {
+
 	var resources []proto.Message
 
 	route, err := makeNamedAddressesRoute(routeName, addresses)
@@ -144,7 +146,7 @@ func (s *ResourceGenerator) routesForTerminatingGateway(cfgSnap *proxycfg.Config
 	var resources []proto.Message
 	for _, svc := range cfgSnap.TerminatingGateway.ValidServices() {
 		clusterName := connect.ServiceSNI(svc.Name, "", svc.NamespaceOrDefault(), svc.PartitionOrDefault(), cfgSnap.Datacenter, cfgSnap.Roots.TrustDomain)
-		cfg, err := config.ParseProxyConfig(cfgSnap.TerminatingGateway.ServiceConfigs[svc].ProxyConfig)
+		cfg, err := ParseProxyConfig(cfgSnap.TerminatingGateway.ServiceConfigs[svc].ProxyConfig)
 		if err != nil {
 			// Don't hard fail on a config typo, just warn. The parse func returns
 			// default config if there is an error so it's safe to continue.
@@ -172,7 +174,7 @@ func (s *ResourceGenerator) routesForTerminatingGateway(cfgSnap *proxycfg.Config
 
 		for _, address := range svcConfig.Destination.Addresses {
 			clusterName := clusterNameForDestination(cfgSnap, svc.Name, address, svc.NamespaceOrDefault(), svc.PartitionOrDefault())
-			cfg, err := config.ParseProxyConfig(cfgSnap.TerminatingGateway.ServiceConfigs[svc].ProxyConfig)
+			cfg, err := ParseProxyConfig(cfgSnap.TerminatingGateway.ServiceConfigs[svc].ProxyConfig)
 			if err != nil {
 				// Don't hard fail on a config typo, just warn. The parse func returns
 				// default config if there is an error so it's safe to continue.
@@ -203,8 +205,7 @@ func (s *ResourceGenerator) makeRoutes(
 	cfgSnap *proxycfg.ConfigSnapshot,
 	svc structs.ServiceName,
 	clusterName string,
-	autoHostRewrite bool,
-) ([]proto.Message, error) {
+	autoHostRewrite bool) ([]proto.Message, error) {
 	resolver, hasResolver := cfgSnap.TerminatingGateway.ServiceResolvers[svc]
 
 	if !hasResolver {
@@ -250,6 +251,10 @@ func (s *ResourceGenerator) routesForMeshGateway(cfgSnap *proxycfg.ConfigSnapsho
 			continue // ignore; not relevant
 		}
 
+		if cfgSnap.MeshGateway.Leaf == nil {
+			continue // ignore; not ready
+		}
+
 		uid := proxycfg.NewUpstreamIDFromServiceName(svc)
 
 		virtualHost, err := s.makeUpstreamRouteForDiscoveryChain(
@@ -258,14 +263,10 @@ func (s *ResourceGenerator) routesForMeshGateway(cfgSnap *proxycfg.ConfigSnapsho
 			chain,
 			[]string{"*"},
 			true,
-			perRouteFilterBuilder{},
 		)
 		if err != nil {
 			return nil, err
 		}
-		if virtualHost == nil {
-			continue
-		}
 
 		route := &envoy_route_v3.RouteConfiguration{
 			Name:         uid.EnvoyID(),
@@ -273,7 +274,7 @@ func (s *ResourceGenerator) routesForMeshGateway(cfgSnap *proxycfg.ConfigSnapsho
 			// ValidateClusters defaults to true when defined statically and false
 			// when done via RDS. Re-set the reasonable value of true to prevent
 			// null-routing traffic.
-			ValidateClusters: response.MakeBoolValue(true),
+			ValidateClusters: makeBoolValue(true),
 		}
 		resources = append(resources, route)
 	}
@@ -291,7 +292,7 @@ func makeNamedDefaultRouteWithLB(clusterName string, lb *structs.LoadBalancer, t
 	// Configure Envoy to rewrite Host header
 	if autoHostRewrite {
 		action.Route.HostRewriteSpecifier = &envoy_route_v3.RouteAction_AutoHostRewrite{
-			AutoHostRewrite: response.MakeBoolValue(true),
+			AutoHostRewrite: makeBoolValue(true),
 		}
 	}
 
@@ -316,7 +317,7 @@ func makeNamedDefaultRouteWithLB(clusterName string, lb *structs.LoadBalancer, t
 		// ValidateClusters defaults to true when defined statically and false
 		// when done via RDS. Re-set the reasonable value of true to prevent
 		// null-routing traffic.
-		ValidateClusters: response.MakeBoolValue(true),
+		ValidateClusters: makeBoolValue(true),
 	}, nil
 }
 
@@ -326,7 +327,7 @@ func makeNamedAddressesRoute(routeName string, addresses map[string]string) (*en
 		// ValidateClusters defaults to true when defined statically and false
 		// when done via RDS. Re-set the reasonable value of true to prevent
 		// null-routing traffic.
-		ValidateClusters: response.MakeBoolValue(true),
+		ValidateClusters: makeBoolValue(true),
 	}
 	for clusterName, address := range addresses {
 		action := makeRouteActionFromName(clusterName)
@@ -368,27 +369,21 @@ func (s *ResourceGenerator) routesForIngressGateway(cfgSnap *proxycfg.ConfigSnap
 			// ValidateClusters defaults to true when defined statically and false
 			// when done via RDS. Re-set the reasonable value of true to prevent
 			// null-routing traffic.
-			ValidateClusters: response.MakeBoolValue(true),
+			ValidateClusters: makeBoolValue(true),
 		}
 
 		for _, u := range upstreams {
 			uid := proxycfg.NewUpstreamID(&u)
 			chain := cfgSnap.IngressGateway.DiscoveryChain[uid]
 			if chain == nil {
-				// Note that if we continue here we must also do this in the cluster generation
-				s.Logger.Warn("could not find discovery chain for ingress upstream",
-					"listener", listenerKey, "upstream", uid)
 				continue
 			}
 
 			domains := generateUpstreamIngressDomains(listenerKey, u)
-			virtualHost, err := s.makeUpstreamRouteForDiscoveryChain(cfgSnap, uid, chain, domains, false, perRouteFilterBuilder{})
+			virtualHost, err := s.makeUpstreamRouteForDiscoveryChain(cfgSnap, uid, chain, domains, false)
 			if err != nil {
 				return nil, err
 			}
-			if virtualHost == nil {
-				continue
-			}
 
 			// Lookup listener and service config details from ingress gateway
 			// definition.
@@ -417,7 +412,7 @@ func (s *ResourceGenerator) routesForIngressGateway(cfgSnap *proxycfg.ConfigSnap
 			} else {
 				svcRoute := &envoy_route_v3.RouteConfiguration{
 					Name:             svcRouteName,
-					ValidateClusters: response.MakeBoolValue(true),
+					ValidateClusters: makeBoolValue(true),
 					VirtualHosts:     []*envoy_route_v3.VirtualHost{virtualHost},
 				}
 				result = append(result, svcRoute)
@@ -432,94 +427,6 @@ func (s *ResourceGenerator) routesForIngressGateway(cfgSnap *proxycfg.ConfigSnap
 	return result, nil
 }
 
-// routesForAPIGateway returns the xDS API representation of the "routes" in the snapshot.
-func (s *ResourceGenerator) routesForAPIGateway(cfgSnap *proxycfg.ConfigSnapshot) ([]proto.Message, error) {
-	var result []proto.Message
-
-	// Build up the routes in a deterministic way
-	readyListeners := getReadyListeners(cfgSnap)
-	listenerNames := maps.Keys(readyListeners)
-	sort.Strings(listenerNames)
-	for _, listenerName := range listenerNames {
-		readyListener, ok := readyListeners[listenerName]
-		if !ok {
-			continue
-		}
-		// Do not create any route configuration for TCP listeners
-		if readyListener.listenerCfg.Protocol != structs.ListenerProtocolHTTP {
-			continue
-		}
-
-		listenerRoute := &envoy_route_v3.RouteConfiguration{
-			Name: readyListener.listenerKey.RouteName(),
-			// ValidateClusters defaults to true when defined statically and false
-			// when done via RDS. Re-set the reasonable value of true to prevent
-			// null-routing traffic.
-			ValidateClusters: response.MakeBoolValue(true),
-		}
-
-		// Consolidate all routes for this listener into the minimum possible set based on hostname matching.
-		allRoutesForListener := []*structs.HTTPRouteConfigEntry{}
-		for _, routeRef := range maps.Keys(readyListener.routeReferences) {
-			route, ok := cfgSnap.APIGateway.HTTPRoutes.Get(routeRef)
-			if !ok {
-				return nil, fmt.Errorf("missing route for route routeRef %s:%s", routeRef.Name, routeRef.Kind)
-			}
-			allRoutesForListener = append(allRoutesForListener, route)
-		}
-		consolidatedRoutes := discoverychain.ConsolidateHTTPRoutes(cfgSnap.APIGateway.GatewayConfig, &readyListener.listenerCfg, allRoutesForListener...)
-
-		// Produce one virtual host per hostname. If no hostname is specified for a set of
-		// Gateway + HTTPRoutes, then the virtual host will be "*".
-		for _, consolidatedRoute := range consolidatedRoutes {
-			upstream := buildHTTPRouteUpstream(consolidatedRoute, readyListener.listenerCfg)
-			// Consolidate all routes for this listener into the minimum possible set based on hostname matching.
-			uid := proxycfg.NewUpstreamID(&upstream)
-			chain := cfgSnap.APIGateway.DiscoveryChain[uid]
-			if chain == nil {
-				s.Logger.Debug("Discovery chain not found for flattened route", "discovery chain ID", uid)
-				continue
-			}
-
-			domains := generateUpstreamAPIsDomains(readyListener.listenerKey, upstream, consolidatedRoute.Hostnames)
-
-			filterBuilder := perRouteFilterBuilder{providerMap: cfgSnap.JWTProviders, listener: &readyListener.listenerCfg, route: &consolidatedRoute}
-			virtualHost, err := s.makeUpstreamRouteForDiscoveryChain(cfgSnap, uid, chain, domains, false, filterBuilder)
-			if err != nil {
-				return nil, err
-			}
-
-			listenerRoute.VirtualHosts = append(listenerRoute.VirtualHosts, virtualHost)
-		}
-
-		if len(listenerRoute.VirtualHosts) > 0 {
-			// Build up the virtual hosts in a deterministic way
-			slices.SortStableFunc(listenerRoute.VirtualHosts, func(a, b *envoy_route_v3.VirtualHost) int {
-				if a.Name < b.Name {
-					return -1
-				}
-				return 1
-			})
-			result = append(result, listenerRoute)
-		}
-	}
-
-	return result, nil
-}
-
-func buildHTTPRouteUpstream(route structs.HTTPRouteConfigEntry, listener structs.APIGatewayListener) structs.Upstream {
-	return structs.Upstream{
-		DestinationName:      route.GetName(),
-		DestinationNamespace: route.NamespaceOrDefault(),
-		DestinationPartition: route.PartitionOrDefault(),
-		IngressHosts:         route.Hostnames,
-		LocalBindPort:        listener.Port,
-		Config: map[string]interface{}{
-			"protocol": string(listener.Protocol),
-		},
-	}
-}
-
 func makeHeadersValueOptions(vals map[string]string, add bool) []*envoy_core_v3.HeaderValueOption {
 	opts := make([]*envoy_core_v3.HeaderValueOption, 0, len(vals))
 	for k, v := range vals {
@@ -528,7 +435,7 @@ func makeHeadersValueOptions(vals map[string]string, add bool) []*envoy_core_v3.
 				Key:   k,
 				Value: v,
 			},
-			Append: response.MakeBoolValue(add),
+			Append: makeBoolValue(add),
 		}
 		opts = append(opts, o)
 	}
@@ -606,18 +513,12 @@ func generateUpstreamIngressDomains(listenerKey proxycfg.IngressListenerKey, u s
 	return domains
 }
 
-func generateUpstreamAPIsDomains(listenerKey proxycfg.APIGatewayListenerKey, u structs.Upstream, hosts []string) []string {
-	u.IngressHosts = hosts
-	return generateUpstreamIngressDomains(listenerKey, u)
-}
-
 func (s *ResourceGenerator) makeUpstreamRouteForDiscoveryChain(
 	cfgSnap *proxycfg.ConfigSnapshot,
 	uid proxycfg.UpstreamID,
 	chain *structs.CompiledDiscoveryChain,
 	serviceDomains []string,
 	forMeshGateway bool,
-	filterBuilder perRouteFilterBuilder,
 ) (*envoy_route_v3.VirtualHost, error) {
 	routeName := uid.EnvoyID()
 	var routes []*envoy_route_v3.Route
@@ -637,7 +538,6 @@ func (s *ResourceGenerator) makeUpstreamRouteForDiscoveryChain(
 		routes = make([]*envoy_route_v3.Route, 0, len(startNode.Routes))
 
 		for _, discoveryRoute := range startNode.Routes {
-			discoveryRoute := discoveryRoute
 			routeMatch := makeRouteMatchForDiscoveryRoute(discoveryRoute)
 
 			var (
@@ -702,13 +602,8 @@ func (s *ResourceGenerator) makeUpstreamRouteForDiscoveryChain(
 				}
 			}
 
-			filter, err := filterBuilder.buildTypedPerFilterConfig(routeMatch, routeAction)
-			if err != nil {
-				return nil, err
-			}
 			route.Match = routeMatch
 			route.Action = routeAction
-			route.TypedPerFilterConfig = filter
 
 			routes = append(routes, route)
 		}
@@ -772,7 +667,7 @@ func (s *ResourceGenerator) makeUpstreamRouteForDiscoveryChain(
 func getRetryPolicyForDestination(destination *structs.ServiceRouteDestination) *envoy_route_v3.RetryPolicy {
 	retryPolicy := &envoy_route_v3.RetryPolicy{}
 	if destination.NumRetries > 0 {
-		retryPolicy.NumRetries = response.MakeUint32Value(int(destination.NumRetries))
+		retryPolicy.NumRetries = makeUint32Value(int(destination.NumRetries))
 	}
 
 	// The RetryOn magic values come from: https://www.envoyproxy.io/docs/envoy/v1.10.0/configuration/http_filters/router_filter#config-http-filters-router-x-envoy-retry-on
@@ -825,7 +720,7 @@ func makeRouteMatchForDiscoveryRoute(discoveryRoute *structs.DiscoveryRoute) *en
 		}
 	case match.HTTP.PathRegex != "":
 		em.PathSpecifier = &envoy_route_v3.RouteMatch_SafeRegex{
-			SafeRegex: response.MakeEnvoyRegexMatch(match.HTTP.PathRegex),
+			SafeRegex: makeEnvoyRegexMatch(match.HTTP.PathRegex),
 		}
 	default:
 		em.PathSpecifier = &envoy_route_v3.RouteMatch_Prefix{
@@ -842,44 +737,21 @@ func makeRouteMatchForDiscoveryRoute(discoveryRoute *structs.DiscoveryRoute) *en
 
 			switch {
 			case hdr.Exact != "":
-				eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_StringMatch{
-					StringMatch: &envoy_matcher_v3.StringMatcher{
-						MatchPattern: &envoy_matcher_v3.StringMatcher_Exact{
-							Exact: hdr.Exact,
-						},
-						IgnoreCase: false,
-					},
+				eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_ExactMatch{
+					ExactMatch: hdr.Exact,
 				}
 			case hdr.Regex != "":
-				eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_StringMatch{
-					StringMatch: &envoy_matcher_v3.StringMatcher{
-						MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{
-							SafeRegex: response.MakeEnvoyRegexMatch(hdr.Regex),
-						},
-						IgnoreCase: false,
-					},
+				eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_SafeRegexMatch{
+					SafeRegexMatch: makeEnvoyRegexMatch(hdr.Regex),
 				}
-
 			case hdr.Prefix != "":
-				eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_StringMatch{
-					StringMatch: &envoy_matcher_v3.StringMatcher{
-						MatchPattern: &envoy_matcher_v3.StringMatcher_Prefix{
-							Prefix: hdr.Prefix,
-						},
-						IgnoreCase: false,
-					},
+				eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_PrefixMatch{
+					PrefixMatch: hdr.Prefix,
 				}
-
 			case hdr.Suffix != "":
-				eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_StringMatch{
-					StringMatch: &envoy_matcher_v3.StringMatcher{
-						MatchPattern: &envoy_matcher_v3.StringMatcher_Suffix{
-							Suffix: hdr.Suffix,
-						},
-						IgnoreCase: false,
-					},
+				eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_SuffixMatch{
+					SuffixMatch: hdr.Suffix,
 				}
-
 			case hdr.Present:
 				eh.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_PresentMatch{
 					PresentMatch: true,
@@ -902,7 +774,7 @@ func makeRouteMatchForDiscoveryRoute(discoveryRoute *structs.DiscoveryRoute) *en
 		eh := &envoy_route_v3.HeaderMatcher{
 			Name: ":method",
 			HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_SafeRegexMatch{
-				SafeRegexMatch: response.MakeEnvoyRegexMatch(methodHeaderRegex),
+				SafeRegexMatch: makeEnvoyRegexMatch(methodHeaderRegex),
 			},
 		}
 
@@ -929,7 +801,7 @@ func makeRouteMatchForDiscoveryRoute(discoveryRoute *structs.DiscoveryRoute) *en
 				eq.QueryParameterMatchSpecifier = &envoy_route_v3.QueryParameterMatcher_StringMatch{
 					StringMatch: &envoy_matcher_v3.StringMatcher{
 						MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{
-							SafeRegex: response.MakeEnvoyRegexMatch(qm.Regex),
+							SafeRegex: makeEnvoyRegexMatch(qm.Regex),
 						},
 					},
 				}
@@ -967,11 +839,11 @@ func (s *ResourceGenerator) makeRouteActionForChainCluster(
 	chain *structs.CompiledDiscoveryChain,
 	forMeshGateway bool,
 ) (*envoy_route_v3.Route_Route, bool) {
-	clusterName := s.getTargetClusterName(upstreamsSnapshot, chain, targetID, forMeshGateway)
-	if clusterName == "" {
+	td, ok := s.getTargetClusterData(upstreamsSnapshot, chain, targetID, forMeshGateway, false)
+	if !ok {
 		return nil, false
 	}
-	return makeRouteActionFromName(clusterName), true
+	return makeRouteActionFromName(td.clusterName), true
 }
 
 func makeRouteActionFromName(clusterName string) *envoy_route_v3.Route_Route {
@@ -1000,8 +872,8 @@ func (s *ResourceGenerator) makeRouteActionForSplitter(
 		}
 		targetID := nextNode.Resolver.Target
 
-		clusterName := s.getTargetClusterName(upstreamsSnapshot, chain, targetID, forMeshGateway)
-		if clusterName == "" {
+		targetOptions, ok := s.getTargetClusterData(upstreamsSnapshot, chain, targetID, forMeshGateway, false)
+		if !ok {
 			continue
 		}
 
@@ -1010,8 +882,8 @@ func (s *ResourceGenerator) makeRouteActionForSplitter(
 		weight := int(split.Weight * 100)
 		totalWeight += weight
 		cw := &envoy_route_v3.WeightedCluster_ClusterWeight{
-			Weight: response.MakeUint32Value(weight),
-			Name:   clusterName,
+			Weight: makeUint32Value(weight),
+			Name:   targetOptions.clusterName,
 		}
 		if err := injectHeaderManipToWeightedCluster(split.Definition, cw); err != nil {
 			return nil, err
@@ -1024,18 +896,19 @@ func (s *ResourceGenerator) makeRouteActionForSplitter(
 		return nil, fmt.Errorf("number of clusters in splitter must be > 0; got %d", len(clusters))
 	}
 
-	var envoyWeightScale *wrapperspb.UInt32Value
-	if totalWeight == 10000 {
-		envoyWeightScale = response.MakeUint32Value(10000)
+	envoyWeightScale := 10000
+	if envoyWeightScale < totalWeight {
+		clusters[0].Weight.Value += uint32(totalWeight - envoyWeightScale)
+	} else {
+		clusters[0].Weight.Value += uint32(envoyWeightScale - totalWeight)
 	}
 
 	return &envoy_route_v3.Route_Route{
 		Route: &envoy_route_v3.RouteAction{
 			ClusterSpecifier: &envoy_route_v3.RouteAction_WeightedClusters{
 				WeightedClusters: &envoy_route_v3.WeightedCluster{
-					Clusters: clusters,
-					// this field is deprecated, and we should get the desired behavior with the front-end validation
-					TotalWeight: envoyWeightScale, // scaled up 100%
+					Clusters:    clusters,
+					TotalWeight: makeUint32Value(envoyWeightScale), // scaled up 100%
 				},
 			},
 		},
diff --git a/agent/xds/routes_test.go b/agent/xds/routes_test.go
index eda10f2234667..c68e54c6d0a72 100644
--- a/agent/xds/routes_test.go
+++ b/agent/xds/routes_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
@@ -10,16 +7,14 @@ import (
 	"time"
 
 	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
+	"github.com/hashicorp/consul/agent/xds/testcommon"
+
 	testinf "github.com/mitchellh/go-testing-interface"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/durationpb"
 
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xds/proxystateconverter"
-	"github.com/hashicorp/consul/agent/xds/response"
-	"github.com/hashicorp/consul/agent/xds/testcommon"
-	"github.com/hashicorp/consul/agent/xdsv2"
 	"github.com/hashicorp/consul/envoyextensions/xdscommon"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
@@ -28,7 +23,6 @@ type routeTestCase struct {
 	name               string
 	create             func(t testinf.T) *proxycfg.ConfigSnapshot
 	overrideGoldenName string
-	alsoRunTestForV2   bool
 }
 
 func makeRouteDiscoChainTests(enterprise bool) []routeTestCase {
@@ -38,77 +32,48 @@ func makeRouteDiscoChainTests(enterprise bool) []routeTestCase {
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-chain-external-sni",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "external-sni", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-splitter-overweight",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "splitter-overweight", enterprise, nil, nil)
-			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-chain-and-overrides",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple-with-overrides", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "splitter-with-resolver-redirect",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "splitter-with-resolver-redirect-multidc", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-chain-and-splitter",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "chain-and-splitter", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-grpc-router",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "grpc-router", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-chain-and-router",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "chain-and-router", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-lb-in-resolver",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "lb-resolver", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-route-to-lb-resolver",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "redirect-to-lb-node", enterprise, nil, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-resolver-with-lb",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "resolver-with-lb", enterprise, nil, nil)
-			},
-			alsoRunTestForV2: true,
 		},
 	}
 }
@@ -129,8 +94,6 @@ func TestRoutesFromSnapshot(t *testing.T) {
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotIngressGateway_NilConfigEntry(t)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-defaults-no-chain",
@@ -138,8 +101,6 @@ func TestRoutesFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, false, "tcp",
 					"default", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-chain",
@@ -147,8 +108,6 @@ func TestRoutesFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"simple", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-chain-external-sni",
@@ -156,8 +115,6 @@ func TestRoutesFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
 					"external-sni", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-splitter-with-resolver-redirect",
@@ -165,8 +122,6 @@ func TestRoutesFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "http",
 					"splitter-with-resolver-redirect-multidc", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-chain-and-splitter",
@@ -174,8 +129,6 @@ func TestRoutesFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "http",
 					"chain-and-splitter", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-grpc-router",
@@ -183,8 +136,6 @@ func TestRoutesFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "http",
 					"grpc-router", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-chain-and-router",
@@ -192,8 +143,6 @@ func TestRoutesFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "http",
 					"chain-and-router", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-lb-in-resolver",
@@ -201,125 +150,48 @@ func TestRoutesFromSnapshot(t *testing.T) {
 				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "http",
 					"lb-resolver", nil, nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name:   "ingress-http-multiple-services",
 			create: proxycfg.TestConfigSnapshotIngress_HTTPMultipleServices,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name:   "ingress-grpc-multiple-services",
 			create: proxycfg.TestConfigSnapshotIngress_GRPCMultipleServices,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-chain-and-router-header-manip",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotIngressGatewayWithChain(t, "router-header-manip", nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-sds-listener-level",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotIngressGatewayWithChain(t, "sds-listener-level", nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-sds-listener-level-wildcard",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotIngressGatewayWithChain(t, "sds-listener-level-wildcard", nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-sds-service-level",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotIngressGatewayWithChain(t, "sds-service-level", nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "ingress-with-sds-service-level-mixed-tls",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotIngressGatewayWithChain(t, "sds-service-level-mixed-tls", nil, nil)
 			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
 		},
 		{
 			name:   "terminating-gateway-lb-config",
 			create: proxycfg.TestConfigSnapshotTerminatingGatewayLBConfig,
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "api-gateway-with-multiple-hostnames",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotAPIGateway(t, "default", nil, func(entry *structs.APIGatewayConfigEntry, bound *structs.BoundAPIGatewayConfigEntry) {
-					entry.Listeners = []structs.APIGatewayListener{
-						{
-							Name:     "http",
-							Protocol: structs.ListenerProtocolHTTP,
-							Port:     8080,
-							Hostname: "*.example.com",
-						},
-					}
-					bound.Listeners = []structs.BoundAPIGatewayListener{
-						{
-							Name: "http",
-							Routes: []structs.ResourceReference{
-								{Kind: structs.HTTPRoute, Name: "backend-route"},
-								{Kind: structs.HTTPRoute, Name: "frontend-route"},
-								{Kind: structs.HTTPRoute, Name: "generic-route"},
-							}},
-					}
-				},
-					[]structs.BoundRoute{
-						&structs.HTTPRouteConfigEntry{
-							Kind:      structs.HTTPRoute,
-							Name:      "backend-route",
-							Hostnames: []string{"backend.example.com"},
-							Parents:   []structs.ResourceReference{{Kind: structs.APIGateway, Name: "api-gateway"}},
-							Rules: []structs.HTTPRouteRule{
-								{Services: []structs.HTTPService{{Name: "backend"}}},
-							},
-						},
-						&structs.HTTPRouteConfigEntry{
-							Kind:      structs.HTTPRoute,
-							Name:      "frontend-route",
-							Hostnames: []string{"frontend.example.com"},
-							Parents:   []structs.ResourceReference{{Kind: structs.APIGateway, Name: "api-gateway"}},
-							Rules: []structs.HTTPRouteRule{
-								{Services: []structs.HTTPService{{Name: "frontend"}}},
-							},
-						},
-						&structs.HTTPRouteConfigEntry{
-							Kind:    structs.HTTPRoute,
-							Name:    "generic-route",
-							Parents: []structs.ResourceReference{{Kind: structs.APIGateway, Name: "api-gateway"}},
-							Rules: []structs.HTTPRouteRule{
-								{
-									Matches:  []structs.HTTPMatch{{Path: structs.HTTPPathMatch{Match: structs.HTTPPathMatchPrefix, Value: "/frontend"}}},
-									Services: []structs.HTTPService{{Name: "frontend"}},
-								},
-								{
-									Matches:  []structs.HTTPMatch{{Path: structs.HTTPPathMatch{Match: structs.HTTPPathMatchPrefix, Value: "/backend"}}},
-									Services: []structs.HTTPService{{Name: "backend"}},
-								},
-							},
-						},
-					}, nil, nil)
-			},
 		},
 	}
 
@@ -349,10 +221,10 @@ func TestRoutesFromSnapshot(t *testing.T) {
 					sort.Slice(routes, func(i, j int) bool {
 						return routes[i].(*envoy_route_v3.RouteConfiguration).Name < routes[j].(*envoy_route_v3.RouteConfiguration).Name
 					})
-					r, err := response.CreateResponse(xdscommon.RouteType, "00000001", "00000001", routes)
+					r, err := createResponse(xdscommon.RouteType, "00000001", "00000001", routes)
 					require.NoError(t, err)
 
-					t.Run("current-xdsv1", func(t *testing.T) {
+					t.Run("current", func(t *testing.T) {
 						gotJSON := protoToJSON(t, r)
 
 						gName := tt.name
@@ -362,39 +234,6 @@ func TestRoutesFromSnapshot(t *testing.T) {
 
 						require.JSONEq(t, goldenEnvoy(t, filepath.Join("routes", gName), envoyVersion, latestEnvoyVersion, gotJSON), gotJSON)
 					})
-
-					if tt.alsoRunTestForV2 {
-						generator := xdsv2.NewResourceGenerator(testutil.Logger(t))
-
-						converter := proxystateconverter.NewConverter(testutil.Logger(t), &mockCfgFetcher{addressLan: "10.10.10.10"})
-						proxyState, err := converter.ProxyStateFromSnapshot(snap)
-						require.NoError(t, err)
-
-						res, err := generator.AllResourcesFromIR(proxyState)
-						require.NoError(t, err)
-
-						routes = res[xdscommon.RouteType]
-						// The order of routes returned via RDS isn't relevant, so it's safe
-						// to sort these for the purposes of test comparisons.
-						sort.Slice(routes, func(i, j int) bool {
-							return routes[i].(*envoy_route_v3.Route).Name < routes[j].(*envoy_route_v3.Route).Name
-						})
-
-						r, err := response.CreateResponse(xdscommon.RouteType, "00000001", "00000001", routes)
-						require.NoError(t, err)
-
-						t.Run("current-xdsv2", func(t *testing.T) {
-							gotJSON := protoToJSON(t, r)
-
-							gName := tt.name
-							if tt.overrideGoldenName != "" {
-								gName = tt.overrideGoldenName
-							}
-
-							expectedJSON := goldenEnvoy(t, filepath.Join("routes", gName), envoyVersion, latestEnvoyVersion, gotJSON)
-							require.JSONEq(t, expectedJSON, gotJSON)
-						})
-					}
 				})
 			}
 		})
@@ -601,11 +440,6 @@ func TestEnvoyLBConfig_InjectToRouteAction(t *testing.T) {
 						FieldValue: "special-header",
 						Terminal:   true,
 					},
-					{
-						Field:      structs.HashPolicyQueryParam,
-						FieldValue: "my-pretty-param",
-						Terminal:   true,
-					},
 				},
 			},
 			expected: &envoy_route_v3.RouteAction{
@@ -644,14 +478,6 @@ func TestEnvoyLBConfig_InjectToRouteAction(t *testing.T) {
 						},
 						Terminal: true,
 					},
-					{
-						PolicySpecifier: &envoy_route_v3.RouteAction_HashPolicy_QueryParameter_{
-							QueryParameter: &envoy_route_v3.RouteAction_HashPolicy_QueryParameter{
-								Name: "my-pretty-param",
-							},
-						},
-						Terminal: true,
-					},
 				},
 			},
 		},
diff --git a/agent/xds/secrets.go b/agent/xds/secrets.go
index 628cec7905ba1..a1ef50e44caa4 100644
--- a/agent/xds/secrets.go
+++ b/agent/xds/secrets.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
diff --git a/agent/xds/server.go b/agent/xds/server.go
index 45c11fa0b3a17..57d7224f821a0 100644
--- a/agent/xds/server.go
+++ b/agent/xds/server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
@@ -9,9 +6,12 @@ import (
 	"sync/atomic"
 	"time"
 
+	envoy_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
+
+	"github.com/hashicorp/consul/envoyextensions/xdscommon"
+
 	"github.com/armon/go-metrics"
 	"github.com/armon/go-metrics/prometheus"
-	envoy_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
 	"github.com/hashicorp/go-hclog"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -20,10 +20,8 @@ import (
 	"github.com/hashicorp/consul/acl"
 	external "github.com/hashicorp/consul/agent/grpc-external"
 	"github.com/hashicorp/consul/agent/grpc-external/limiter"
-	"github.com/hashicorp/consul/agent/xds/configfetcher"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
-	"github.com/hashicorp/consul/proto-public/pbresource"
+	"github.com/hashicorp/consul/agent/proxycfg"
+	"github.com/hashicorp/consul/agent/structs"
 )
 
 var (
@@ -69,6 +67,13 @@ const (
 	// services named "local_agent" in the future.
 	LocalAgentClusterName = "local_agent"
 
+	// OriginalDestinationClusterName is the name we give to the passthrough
+	// cluster which redirects transparently-proxied requests to their original
+	// destination outside the mesh. This cluster prevents Consul from blocking
+	// connections to destinations outside of the catalog when in transparent
+	// proxy mode.
+	OriginalDestinationClusterName = "original-destination"
+
 	// DefaultAuthCheckFrequency is the default value for
 	// Server.AuthCheckFrequency to use when the zero value is provided.
 	DefaultAuthCheckFrequency = 5 * time.Minute
@@ -80,10 +85,16 @@ const (
 // coupling this to the agent.
 type ACLResolverFunc func(id string) (acl.Authorizer, error)
 
+// ConfigFetcher is the interface the agent needs to expose
+// for the xDS server to fetch agent config, currently only one field is fetched
+type ConfigFetcher interface {
+	AdvertiseAddrLAN() string
+}
+
 // ProxyConfigSource is the interface xds.Server requires to consume proxy
 // config updates.
-type ProxyWatcher interface {
-	Watch(proxyID *pbresource.ID, nodeName string, token string) (<-chan proxysnapshot.ProxySnapshot, limiter.SessionTerminatedChan, proxysnapshot.CancelFunc, error)
+type ProxyConfigSource interface {
+	Watch(id structs.ServiceID, nodeName string, token string) (<-chan *proxycfg.ConfigSnapshot, limiter.SessionTerminatedChan, proxycfg.CancelFunc, error)
 }
 
 // Server represents a gRPC server that can handle xDS requests from Envoy. All
@@ -94,9 +105,9 @@ type ProxyWatcher interface {
 type Server struct {
 	NodeName     string
 	Logger       hclog.Logger
-	ProxyWatcher ProxyWatcher
+	CfgSrc       ProxyConfigSource
 	ResolveToken ACLResolverFunc
-	CfgFetcher   configfetcher.ConfigFetcher
+	CfgFetcher   ConfigFetcher
 
 	// AuthCheckFrequency is how often we should re-check the credentials used
 	// during a long-lived gRPC Stream after it has been initially established.
@@ -145,14 +156,14 @@ func (c *activeStreamCounters) Increment(ctx context.Context) func() {
 func NewServer(
 	nodeName string,
 	logger hclog.Logger,
-	proxyWatcher ProxyWatcher,
+	cfgMgr ProxyConfigSource,
 	resolveTokenSecret ACLResolverFunc,
-	cfgFetcher configfetcher.ConfigFetcher,
+	cfgFetcher ConfigFetcher,
 ) *Server {
 	return &Server{
 		NodeName:           nodeName,
 		Logger:             logger,
-		ProxyWatcher:       proxyWatcher,
+		CfgSrc:             cfgMgr,
 		ResolveToken:       resolveTokenSecret,
 		CfgFetcher:         cfgFetcher,
 		AuthCheckFrequency: DefaultAuthCheckFrequency,
@@ -200,9 +211,9 @@ func (s *Server) authenticate(ctx context.Context) (acl.Authorizer, error) {
 // using a token with the same permissions, and that it stores the data by
 // proxy ID. We assume that any data in the snapshot was already filtered,
 // which allows this authorization to be a shallow authorization check
-// for all the data in a ProxySnapshot.
-func (s *Server) authorize(ctx context.Context, proxySnapshot proxysnapshot.ProxySnapshot) error {
-	if proxySnapshot == nil {
+// for all the data in a ConfigSnapshot.
+func (s *Server) authorize(ctx context.Context, cfgSnap *proxycfg.ConfigSnapshot) error {
+	if cfgSnap == nil {
 		return status.Errorf(codes.Unauthenticated, "unauthenticated: no config snapshot")
 	}
 
@@ -211,5 +222,22 @@ func (s *Server) authorize(ctx context.Context, proxySnapshot proxysnapshot.Prox
 		return err
 	}
 
-	return proxySnapshot.Authorize(authz)
+	var authzContext acl.AuthorizerContext
+	switch cfgSnap.Kind {
+	case structs.ServiceKindConnectProxy:
+		cfgSnap.ProxyID.EnterpriseMeta.FillAuthzContext(&authzContext)
+		if err := authz.ToAllowAuthorizer().ServiceWriteAllowed(cfgSnap.Proxy.DestinationServiceName, &authzContext); err != nil {
+			return status.Errorf(codes.PermissionDenied, err.Error())
+		}
+	case structs.ServiceKindMeshGateway, structs.ServiceKindTerminatingGateway, structs.ServiceKindIngressGateway, structs.ServiceKindAPIGateway:
+		cfgSnap.ProxyID.EnterpriseMeta.FillAuthzContext(&authzContext)
+		if err := authz.ToAllowAuthorizer().ServiceWriteAllowed(cfgSnap.Service, &authzContext); err != nil {
+			return status.Errorf(codes.PermissionDenied, err.Error())
+		}
+	default:
+		return status.Errorf(codes.Internal, "Invalid service kind")
+	}
+
+	// Authed OK!
+	return nil
 }
diff --git a/agent/xds/server_ce.go b/agent/xds/server_ce.go
index cce9b75d6ebc6..dc5ab309ce5f1 100644
--- a/agent/xds/server_ce.go
+++ b/agent/xds/server_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package xds
 
diff --git a/agent/xds/testcommon/testcommon.go b/agent/xds/testcommon/testcommon.go
index 44d2cc3bbe6da..ba75cf9ae9785 100644
--- a/agent/xds/testcommon/testcommon.go
+++ b/agent/xds/testcommon/testcommon.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package testcommon
 
 import (
diff --git a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-grpc-service.latest.golden
deleted file mode 100644
index f790cfd0dfd40..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-grpc-service.latest.golden
+++ /dev/null
@@ -1,159 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "loadAssignment": {
-        "clusterName": "local_ext_authz",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 9191
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_ext_authz",
-      "type": "STATIC",
-      "typedExtensionProtocolOptions": {
-        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "explicitHttpConfig": {
-            "http2ProtocolOptions": {}
-          }
-        }
-      }
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-http-service.latest.golden b/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-http-service.latest.golden
deleted file mode 100644
index 75698e93949ec..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-local-http-service.latest.golden
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "loadAssignment": {
-        "clusterName": "local_ext_authz",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "localhost",
-                      "portValue": 9191
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_ext_authz",
-      "type": "STRICT_DNS"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-grpc-service.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-grpc-service.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-http-service.latest.golden b/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-http-service.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/ext-authz-http-upstream-http-service.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-local-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-local-grpc-service.latest.golden
deleted file mode 100644
index f790cfd0dfd40..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-local-grpc-service.latest.golden
+++ /dev/null
@@ -1,159 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "loadAssignment": {
-        "clusterName": "local_ext_authz",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 9191
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_ext_authz",
-      "type": "STATIC",
-      "typedExtensionProtocolOptions": {
-        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "explicitHttpConfig": {
-            "http2ProtocolOptions": {}
-          }
-        }
-      }
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-upstream-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-upstream-grpc-service.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/ext-authz-tcp-upstream-grpc-service.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lambda-and-lua-connect-proxy.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lambda-and-lua-connect-proxy.latest.golden
index 81032f1d2d3da..fe0b5358e7b73 100644
--- a/agent/xds/testdata/builtin_extension/clusters/lambda-and-lua-connect-proxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/clusters/lambda-and-lua-connect-proxy.latest.golden
@@ -1,21 +1,22 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "loadAssignment": {
-        "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "lambda.us-east-1.amazonaws.com",
-                      "portValue": 443
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "lambda.us-east-1.amazonaws.com",
+                      "portValue":  443
                     }
                   }
                 }
@@ -24,84 +25,85 @@
           }
         ]
       },
-      "metadata": {
-        "filterMetadata": {
-          "com.amazonaws.lambda": {
-            "egress_gateway": true
-          }
+      "dnsLookupFamily":  "V4_ONLY",
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "sni":  "*.amazonaws.com"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "sni": "*.amazonaws.com"
+      "metadata":  {
+        "filterMetadata":  {
+          "com.amazonaws.lambda":  {
+            "egress_gateway":  true
+          }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
                 },
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app",
+      "type":  "STATIC",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "local_app",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "127.0.0.1",
+                      "portValue":  8080
                     }
                   }
                 }
@@ -109,11 +111,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-opposite-meta.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-opposite-meta.latest.golden
index 81032f1d2d3da..fe0b5358e7b73 100644
--- a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-opposite-meta.latest.golden
+++ b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-opposite-meta.latest.golden
@@ -1,21 +1,22 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "loadAssignment": {
-        "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "lambda.us-east-1.amazonaws.com",
-                      "portValue": 443
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "lambda.us-east-1.amazonaws.com",
+                      "portValue":  443
                     }
                   }
                 }
@@ -24,84 +25,85 @@
           }
         ]
       },
-      "metadata": {
-        "filterMetadata": {
-          "com.amazonaws.lambda": {
-            "egress_gateway": true
-          }
+      "dnsLookupFamily":  "V4_ONLY",
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "sni":  "*.amazonaws.com"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "sni": "*.amazonaws.com"
+      "metadata":  {
+        "filterMetadata":  {
+          "com.amazonaws.lambda":  {
+            "egress_gateway":  true
+          }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
                 },
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app",
+      "type":  "STATIC",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "local_app",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "127.0.0.1",
+                      "portValue":  8080
                     }
                   }
                 }
@@ -109,11 +111,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-tproxy.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-tproxy.latest.golden
index bc6a584cb234f..994358b0137e1 100644
--- a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-tproxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-tproxy.latest.golden
@@ -1,116 +1,117 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "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/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
                 },
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "loadAssignment": {
-        "clusterName": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "lambda.us-east-1.amazonaws.com",
-                      "portValue": 443
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "lambda.us-east-1.amazonaws.com",
+                      "portValue":  443
                     }
                   }
                 }
@@ -119,37 +120,38 @@
           }
         ]
       },
-      "metadata": {
-        "filterMetadata": {
-          "com.amazonaws.lambda": {
-            "egress_gateway": true
-          }
+      "dnsLookupFamily":  "V4_ONLY",
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "sni":  "*.amazonaws.com"
         }
       },
-      "name": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "sni": "*.amazonaws.com"
+      "metadata":  {
+        "filterMetadata":  {
+          "com.amazonaws.lambda":  {
+            "egress_gateway":  true
+          }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app",
+      "type":  "STATIC",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "local_app",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "127.0.0.1",
+                      "portValue":  8080
                     }
                   }
                 }
@@ -157,66 +159,64 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/no-endpoints"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/no-endpoints"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "original-destination",
-      "type": "ORIGINAL_DST"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "original-destination",
+      "type":  "ORIGINAL_DST",
+      "connectTimeout":  "5s",
+      "lbPolicy":  "CLUSTER_PROVIDED"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden
index 5a25e882ab312..c010ac87b0f43 100644
--- a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden
+++ b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden
@@ -1,115 +1,117 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "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/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
                 },
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app",
+      "type":  "STATIC",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "local_app",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "127.0.0.1",
+                      "portValue":  8080
                     }
                   }
                 }
@@ -117,11 +119,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy.latest.golden
index 81032f1d2d3da..fe0b5358e7b73 100644
--- a/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/clusters/lambda-connect-proxy.latest.golden
@@ -1,21 +1,22 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "loadAssignment": {
-        "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "lambda.us-east-1.amazonaws.com",
-                      "portValue": 443
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "lambda.us-east-1.amazonaws.com",
+                      "portValue":  443
                     }
                   }
                 }
@@ -24,84 +25,85 @@
           }
         ]
       },
-      "metadata": {
-        "filterMetadata": {
-          "com.amazonaws.lambda": {
-            "egress_gateway": true
-          }
+      "dnsLookupFamily":  "V4_ONLY",
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "sni":  "*.amazonaws.com"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "sni": "*.amazonaws.com"
+      "metadata":  {
+        "filterMetadata":  {
+          "com.amazonaws.lambda":  {
+            "egress_gateway":  true
+          }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
                 },
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app",
+      "type":  "STATIC",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "local_app",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "127.0.0.1",
+                      "portValue":  8080
                     }
                   }
                 }
@@ -109,11 +111,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lambda-terminating-gateway-with-service-resolvers.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lambda-terminating-gateway-with-service-resolvers.latest.golden
index a3d97479df4a6..d942a95a0daf8 100644
--- a/agent/xds/testdata/builtin_extension/clusters/lambda-terminating-gateway-with-service-resolvers.latest.golden
+++ b/agent/xds/testdata/builtin_extension/clusters/lambda-terminating-gateway-with-service-resolvers.latest.golden
@@ -1,105 +1,106 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
-      "loadAssignment": {
-        "clusterName": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "api.altdomain",
-                      "portValue": 8081
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "api.altdomain",
+                      "portValue":  8081
                     }
                   }
                 },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
+                "healthStatus":  "HEALTHY",
+                "loadBalancingWeight":  1
               }
             ]
           }
         ]
       },
-      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "dnsRefreshRate":  "10s",
+      "dnsLookupFamily":  "V4_ONLY",
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "filename": "api.cert.pem"
+                "certificateChain":  {
+                  "filename":  "api.cert.pem"
                 },
-                "privateKey": {
-                  "filename": "api.key.pem"
+                "privateKey":  {
+                  "filename":  "api.key.pem"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
+            "validationContext":  {
+              "trustedCa":  {
+                "filename":  "ca.cert.pem"
               }
             }
           }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
-      "loadAssignment": {
-        "clusterName": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "cache.mydomain",
-                      "portValue": 8081
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "cache.mydomain",
+                      "portValue":  8081
                     }
                   }
                 },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
+                "healthStatus":  "HEALTHY",
+                "loadBalancingWeight":  1
               }
             ]
           }
         ]
       },
-      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate":  "10s",
+      "dnsLookupFamily":  "V4_ONLY",
+      "outlierDetection":  {}
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "loadAssignment": {
-        "clusterName": "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "lambda.us-east-1.amazonaws.com",
-                      "portValue": 443
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "lambda.us-east-1.amazonaws.com",
+                      "portValue":  443
                     }
                   }
                 }
@@ -108,38 +109,38 @@
           }
         ]
       },
-      "metadata": {
-        "filterMetadata": {
-          "com.amazonaws.lambda": {
-            "egress_gateway": true
-          }
+      "dnsLookupFamily":  "V4_ONLY",
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "sni":  "*.amazonaws.com"
         }
       },
-      "name": "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "sni": "*.amazonaws.com"
+      "metadata":  {
+        "filterMetadata":  {
+          "com.amazonaws.lambda":  {
+            "egress_gateway":  true
+          }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "loadAssignment": {
-        "clusterName": "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "lambda.us-east-1.amazonaws.com",
-                      "portValue": 443
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "lambda.us-east-1.amazonaws.com",
+                      "portValue":  443
                     }
                   }
                 }
@@ -148,68 +149,68 @@
           }
         ]
       },
-      "metadata": {
-        "filterMetadata": {
-          "com.amazonaws.lambda": {
-            "egress_gateway": true
-          }
+      "dnsLookupFamily":  "V4_ONLY",
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "sni":  "*.amazonaws.com"
         }
       },
-      "name": "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "sni": "*.amazonaws.com"
+      "metadata":  {
+        "filterMetadata":  {
+          "com.amazonaws.lambda":  {
+            "egress_gateway":  true
+          }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
-      "loadAssignment": {
-        "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "db.mydomain",
-                      "portValue": 8081
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "db.mydomain",
+                      "portValue":  8081
                     }
                   }
                 },
-                "healthStatus": "UNHEALTHY",
-                "loadBalancingWeight": 1
+                "healthStatus":  "UNHEALTHY",
+                "loadBalancingWeight":  1
               }
             ]
           }
         ]
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate":  "10s",
+      "dnsLookupFamily":  "V4_ONLY",
+      "outlierDetection":  {}
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "loadAssignment": {
-        "clusterName": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "lambda.us-east-1.amazonaws.com",
-                      "portValue": 443
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "lambda.us-east-1.amazonaws.com",
+                      "portValue":  443
                     }
                   }
                 }
@@ -218,24 +219,23 @@
           }
         ]
       },
-      "metadata": {
-        "filterMetadata": {
-          "com.amazonaws.lambda": {
-            "egress_gateway": true
-          }
+      "dnsLookupFamily":  "V4_ONLY",
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "sni":  "*.amazonaws.com"
         }
       },
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "sni": "*.amazonaws.com"
+      "metadata":  {
+        "filterMetadata":  {
+          "com.amazonaws.lambda":  {
+            "egress_gateway":  true
+          }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lambda-terminating-gateway.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lambda-terminating-gateway.latest.golden
index 71c4629b6db64..cef591c242a08 100644
--- a/agent/xds/testdata/builtin_extension/clusters/lambda-terminating-gateway.latest.golden
+++ b/agent/xds/testdata/builtin_extension/clusters/lambda-terminating-gateway.latest.golden
@@ -1,135 +1,136 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
-      "loadAssignment": {
-        "clusterName": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "api.altdomain",
-                      "portValue": 8081
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "api.altdomain",
+                      "portValue":  8081
                     }
                   }
                 },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
+                "healthStatus":  "HEALTHY",
+                "loadBalancingWeight":  1
               }
             ]
           }
         ]
       },
-      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "dnsRefreshRate":  "10s",
+      "dnsLookupFamily":  "V4_ONLY",
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "filename": "api.cert.pem"
+                "certificateChain":  {
+                  "filename":  "api.cert.pem"
                 },
-                "privateKey": {
-                  "filename": "api.key.pem"
+                "privateKey":  {
+                  "filename":  "api.key.pem"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
+            "validationContext":  {
+              "trustedCa":  {
+                "filename":  "ca.cert.pem"
               }
             }
           }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
-      "loadAssignment": {
-        "clusterName": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "cache.mydomain",
-                      "portValue": 8081
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "cache.mydomain",
+                      "portValue":  8081
                     }
                   }
                 },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
+                "healthStatus":  "HEALTHY",
+                "loadBalancingWeight":  1
               }
             ]
           }
         ]
       },
-      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate":  "10s",
+      "dnsLookupFamily":  "V4_ONLY",
+      "outlierDetection":  {}
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
-      "loadAssignment": {
-        "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "db.mydomain",
-                      "portValue": 8081
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "db.mydomain",
+                      "portValue":  8081
                     }
                   }
                 },
-                "healthStatus": "UNHEALTHY",
-                "loadBalancingWeight": 1
+                "healthStatus":  "UNHEALTHY",
+                "loadBalancingWeight":  1
               }
             ]
           }
         ]
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate":  "10s",
+      "dnsLookupFamily":  "V4_ONLY",
+      "outlierDetection":  {}
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "loadAssignment": {
-        "clusterName": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "lambda.us-east-1.amazonaws.com",
-                      "portValue": 443
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "lambda.us-east-1.amazonaws.com",
+                      "portValue":  443
                     }
                   }
                 }
@@ -138,24 +139,23 @@
           }
         ]
       },
-      "metadata": {
-        "filterMetadata": {
-          "com.amazonaws.lambda": {
-            "egress_gateway": true
-          }
+      "dnsLookupFamily":  "V4_ONLY",
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "sni":  "*.amazonaws.com"
         }
       },
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "sni": "*.amazonaws.com"
+      "metadata":  {
+        "filterMetadata":  {
+          "com.amazonaws.lambda":  {
+            "egress_gateway":  true
+          }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden
index 5a25e882ab312..c010ac87b0f43 100644
--- a/agent/xds/testdata/builtin_extension/clusters/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden
+++ b/agent/xds/testdata/builtin_extension/clusters/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden
@@ -1,115 +1,117 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "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/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
                 },
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app",
+      "type":  "STATIC",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "local_app",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "127.0.0.1",
+                      "portValue":  8080
                     }
                   }
                 }
@@ -117,11 +119,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-inbound-applies-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-inbound-applies-to-inbound.latest.golden
index 5a25e882ab312..c010ac87b0f43 100644
--- a/agent/xds/testdata/builtin_extension/clusters/lua-inbound-applies-to-inbound.latest.golden
+++ b/agent/xds/testdata/builtin_extension/clusters/lua-inbound-applies-to-inbound.latest.golden
@@ -1,115 +1,117 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "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/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
                 },
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app",
+      "type":  "STATIC",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "local_app",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "127.0.0.1",
+                      "portValue":  8080
                     }
                   }
                 }
@@ -117,11 +119,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden
index 5a25e882ab312..c010ac87b0f43 100644
--- a/agent/xds/testdata/builtin_extension/clusters/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden
+++ b/agent/xds/testdata/builtin_extension/clusters/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden
@@ -1,115 +1,117 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "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/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
                 },
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app",
+      "type":  "STATIC",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "local_app",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "127.0.0.1",
+                      "portValue":  8080
                     }
                   }
                 }
@@ -117,11 +119,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden
index 43ffe1773a932..3938673d585fd 100644
--- a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden
@@ -1,27 +1,29 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
           "ads": {},
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "connectTimeout": "5s",
+      "circuitBreakers": {},
       "outlierDetection": {},
+      "commonLbConfig": {
+        "healthyPanicThreshold": {}
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {},
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,43 +34,43 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
           "ads": {},
           "resourceApiVersion": "V3"
         }
       },
-      "name": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "connectTimeout": "5s",
       "outlierDetection": {},
+      "commonLbConfig": {
+        "healthyPanicThreshold": {}
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {},
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -79,43 +81,43 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.192-168-2-2.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "destination.192-168-2-2.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
           "ads": {},
           "resourceApiVersion": "V3"
         }
       },
-      "name": "destination.192-168-2-2.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "connectTimeout": "5s",
       "outlierDetection": {},
+      "commonLbConfig": {
+        "healthyPanicThreshold": {}
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {},
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -126,43 +128,43 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka2"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "destination.192-168-2-2.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.192-168-2-3.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "destination.192-168-2-3.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
           "ads": {},
           "resourceApiVersion": "V3"
         }
       },
-      "name": "destination.192-168-2-3.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "connectTimeout": "5s",
       "outlierDetection": {},
+      "commonLbConfig": {
+        "healthyPanicThreshold": {}
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {},
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -173,43 +175,43 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka2"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "destination.192-168-2-3.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
           "ads": {},
           "resourceApiVersion": "V3"
         }
       },
-      "name": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "connectTimeout": "5s",
       "outlierDetection": {},
+      "commonLbConfig": {
+        "healthyPanicThreshold": {}
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {},
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -220,40 +222,40 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
           "ads": {},
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "connectTimeout": "5s",
+      "circuitBreakers": {},
       "outlierDetection": {},
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {},
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -264,8 +266,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -273,19 +277,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -305,11 +307,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams.latest.golden
index 5a25e882ab312..c010ac87b0f43 100644
--- a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams.latest.golden
+++ b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-applies-to-local-upstreams.latest.golden
@@ -1,115 +1,117 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "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/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
                 },
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app",
+      "type":  "STATIC",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "local_app",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "127.0.0.1",
+                      "portValue":  8080
                     }
                   }
                 }
@@ -117,11 +119,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-inbound.latest.golden
index 5a25e882ab312..c010ac87b0f43 100644
--- a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-inbound.latest.golden
+++ b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-inbound.latest.golden
@@ -1,115 +1,117 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "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/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
                 },
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app",
+      "type":  "STATIC",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "local_app",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "127.0.0.1",
+                      "portValue":  8080
                     }
                   }
                 }
@@ -117,11 +119,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden b/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/otel-access-logging-http.latest.golden b/agent/xds/testdata/builtin_extension/clusters/otel-access-logging-http.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/otel-access-logging-http.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-keepalive.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-keepalive.latest.golden
deleted file mode 100644
index cb4e0cec1ef8e..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-keepalive.latest.golden
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS",
-      "upstreamConnectionOptions": {
-        "tcpKeepalive": {
-          "keepaliveProbes": 5
-        }
-      }
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS",
-      "upstreamConnectionOptions": {
-        "tcpKeepalive": {
-          "keepaliveProbes": 5
-        }
-      }
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection-multiple.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection-multiple.latest.golden
deleted file mode 100644
index eb17f11f4849b..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection-multiple.latest.golden
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {
-        "failurePercentageRequestVolume": 2345,
-        "successRateMinimumHosts": 1234
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {
-        "failurePercentageRequestVolume": 2345,
-        "successRateMinimumHosts": 1234
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection.latest.golden
deleted file mode 100644
index 9432eb1b72e9b..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-outlier-detection.latest.golden
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {
-        "successRateMinimumHosts": 1234
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {
-        "successRateMinimumHosts": 1234
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-round-robin-lb-config.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-round-robin-lb-config.latest.golden
deleted file mode 100644
index 680271c7235e5..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-add-round-robin-lb-config.latest.golden
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "roundRobinLbConfig": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "roundRobinLbConfig": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-inbound-add.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-inbound-add.latest.golden
deleted file mode 100644
index 7362f44a57753..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-inbound-add.latest.golden
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ],
-        "policy": {
-          "overprovisioningFactor": 123
-        }
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-outbound-add.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-outbound-add.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-cluster-load-assignment-outbound-add.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-inbound-add.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-inbound-add.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-inbound-add.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-outbound-add.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-outbound-add.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-listener-outbound-add.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-failover.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-failover.latest.golden
deleted file mode 100644
index 4b9c16277584c..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-failover.latest.golden
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "clusterType": {
-        "name": "envoy.clusters.aggregate",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
-          "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-          ]
-        }
-      },
-      "connectTimeout": "33s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {
-        "successRateMinimumHosts": 1234
-      }
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {
-        "successRateMinimumHosts": 1234
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {
-        "successRateMinimumHosts": 1234
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/fail"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "fail.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-splitter.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-splitter.latest.golden
deleted file mode 100644
index 0dcc1ca7521e5..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service-splitter.latest.golden
+++ /dev/null
@@ -1,179 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "v1.db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "v1.db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {
-        "successRateMinimumHosts": 1234
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "v1.db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "v2.db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "v2.db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {
-        "successRateMinimumHosts": 1234
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "v2.db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service.latest.golden
deleted file mode 100644
index 2f37bfe304d4e..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-patch-specific-upstream-service.latest.golden
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "resources":  [
-    {
-      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "altStatName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "clusterType":  {
-        "name":  "envoy.clusters.aggregate",
-        "typedConfig":  {
-          "@type":  "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
-          "clusters":  [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-          ]
-        }
-      },
-      "connectTimeout":  "33s",
-      "lbPolicy":  "CLUSTER_PROVIDED"
-    },
-    {
-      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name":  "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "altStatName":  "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "type":  "EDS",
-      "edsClusterConfig":  {
-        "edsConfig":  {
-          "ads":  {},
-          "resourceApiVersion":  "V3"
-        }
-      },
-      "connectTimeout":  "33s",
-      "circuitBreakers":  {},
-      "outlierDetection":  {},
-      "commonLbConfig":  {
-        "healthyPanicThreshold":  {}
-      },
-      "transportSocket":  {
-        "name":  "tls",
-        "typedConfig":  {
-          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext":  {
-            "tlsParams":  {},
-            "tlsCertificates":  [
-              {
-                "certificateChain":  {
-                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey":  {
-                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "validationContext":  {
-              "trustedCa":  {
-                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              },
-              "matchSubjectAltNames":  [
-                {
-                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ]
-            }
-          },
-          "sni":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      }
-    },
-    {
-      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name":  "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "altStatName":  "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "type":  "EDS",
-      "edsClusterConfig":  {
-        "edsConfig":  {
-          "ads":  {},
-          "resourceApiVersion":  "V3"
-        }
-      },
-      "connectTimeout":  "33s",
-      "circuitBreakers":  {},
-      "outlierDetection":  {},
-      "commonLbConfig":  {
-        "healthyPanicThreshold":  {}
-      },
-      "transportSocket":  {
-        "name":  "tls",
-        "typedConfig":  {
-          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext":  {
-            "tlsParams":  {},
-            "tlsCertificates":  [
-              {
-                "certificateChain":  {
-                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey":  {
-                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "validationContext":  {
-              "trustedCa":  {
-                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              },
-              "matchSubjectAltNames":  [
-                {
-                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/fail"
-                }
-              ]
-            }
-          },
-          "sni":  "fail.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      }
-    },
-    {
-      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "type":  "EDS",
-      "edsClusterConfig":  {
-        "edsConfig":  {
-          "ads":  {},
-          "resourceApiVersion":  "V3"
-        }
-      },
-      "connectTimeout":  "5s",
-      "circuitBreakers":  {},
-      "outlierDetection":  {},
-      "transportSocket":  {
-        "name":  "tls",
-        "typedConfig":  {
-          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext":  {
-            "tlsParams":  {},
-            "tlsCertificates":  [
-              {
-                "certificateChain":  {
-                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey":  {
-                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "validationContext":  {
-              "trustedCa":  {
-                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              },
-              "matchSubjectAltNames":  [
-                {
-                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ]
-            }
-          },
-          "sni":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      }
-    },
-    {
-      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name":  "local_app",
-      "type":  "STATIC",
-      "connectTimeout":  "5s",
-      "loadAssignment":  {
-        "clusterName":  "local_app",
-        "endpoints":  [
-          {
-            "lbEndpoints":  [
-              {
-                "endpoint":  {
-                  "address":  {
-                    "socketAddress":  {
-                      "address":  "127.0.0.1",
-                      "portValue":  8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  ],
-  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "nonce":  "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-remove-outlier-detection.latest.golden b/agent/xds/testdata/builtin_extension/clusters/propertyoverride-remove-outlier-detection.latest.golden
deleted file mode 100644
index fe41565d6e507..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/propertyoverride-remove-outlier-detection.latest.golden
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/wasm-http-local-file.latest.golden b/agent/xds/testdata/builtin_extension/clusters/wasm-http-local-file.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/wasm-http-local-file.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/wasm-http-remote-file.latest.golden b/agent/xds/testdata/builtin_extension/clusters/wasm-http-remote-file.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/wasm-http-remote-file.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file-outbound.latest.golden b/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file-outbound.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file-outbound.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file.latest.golden b/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-local-file.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file-outbound.latest.golden b/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file-outbound.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file-outbound.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file.latest.golden b/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/builtin_extension/clusters/wasm-tcp-remote-file.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/ext-authz-http-local-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/ext-authz-http-local-grpc-service.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/ext-authz-http-local-grpc-service.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/ext-authz-http-local-http-service.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/ext-authz-http-local-http-service.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/ext-authz-http-local-http-service.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/ext-authz-http-upstream-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/ext-authz-http-upstream-grpc-service.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/ext-authz-http-upstream-grpc-service.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/ext-authz-http-upstream-http-service.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/ext-authz-http-upstream-http-service.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/ext-authz-http-upstream-http-service.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/ext-authz-tcp-local-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/ext-authz-tcp-local-grpc-service.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/ext-authz-tcp-local-grpc-service.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/ext-authz-tcp-upstream-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/ext-authz-tcp-upstream-grpc-service.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/ext-authz-tcp-upstream-grpc-service.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lambda-and-lua-connect-proxy.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lambda-and-lua-connect-proxy.latest.golden
index b4372a3439e81..5cb4171b97300 100644
--- a/agent/xds/testdata/builtin_extension/endpoints/lambda-and-lua-connect-proxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/endpoints/lambda-and-lua-connect-proxy.latest.golden
@@ -1,75 +1,75 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.20.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy-opposite-meta.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy-opposite-meta.latest.golden
index b4372a3439e81..5cb4171b97300 100644
--- a/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy-opposite-meta.latest.golden
+++ b/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy-opposite-meta.latest.golden
@@ -1,75 +1,75 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.20.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy-tproxy.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy-tproxy.latest.golden
index ebf0eb91d97e9..bbd1f5f720353 100644
--- a/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy-tproxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy-tproxy.latest.golden
@@ -1,104 +1,104 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.20.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "9.9.9.9",
-                    "portValue": 9090
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "9.9.9.9",
+                    "portValue":  9090
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {}
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden
index b4372a3439e81..5cb4171b97300 100644
--- a/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden
+++ b/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden
@@ -1,75 +1,75 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.20.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy.latest.golden
index b4372a3439e81..5cb4171b97300 100644
--- a/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy.latest.golden
@@ -1,75 +1,75 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.20.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lambda-terminating-gateway-with-service-resolvers.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lambda-terminating-gateway-with-service-resolvers.latest.golden
index afe73871daa9d..d3c3e7ddb7477 100644
--- a/agent/xds/testdata/builtin_extension/endpoints/lambda-terminating-gateway-with-service-resolvers.latest.golden
+++ b/agent/xds/testdata/builtin_extension/endpoints/lambda-terminating-gateway-with-service-resolvers.latest.golden
@@ -1,109 +1,109 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lambda-terminating-gateway.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lambda-terminating-gateway.latest.golden
index 0b67b10323e3f..54ff27d6529ce 100644
--- a/agent/xds/testdata/builtin_extension/endpoints/lambda-terminating-gateway.latest.golden
+++ b/agent/xds/testdata/builtin_extension/endpoints/lambda-terminating-gateway.latest.golden
@@ -1,41 +1,41 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden
index b4372a3439e81..5cb4171b97300 100644
--- a/agent/xds/testdata/builtin_extension/endpoints/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden
+++ b/agent/xds/testdata/builtin_extension/endpoints/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden
@@ -1,75 +1,75 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.20.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lua-inbound-applies-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lua-inbound-applies-to-inbound.latest.golden
index b4372a3439e81..5cb4171b97300 100644
--- a/agent/xds/testdata/builtin_extension/endpoints/lua-inbound-applies-to-inbound.latest.golden
+++ b/agent/xds/testdata/builtin_extension/endpoints/lua-inbound-applies-to-inbound.latest.golden
@@ -1,75 +1,75 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.20.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden
index b4372a3439e81..5cb4171b97300 100644
--- a/agent/xds/testdata/builtin_extension/endpoints/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden
+++ b/agent/xds/testdata/builtin_extension/endpoints/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden
@@ -1,75 +1,75 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.20.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden
index a0896e11577bb..284d7722a6d0e 100644
--- a/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -159,5 +159,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-applies-to-local-upstreams.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-applies-to-local-upstreams.latest.golden
index b4372a3439e81..5cb4171b97300 100644
--- a/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-applies-to-local-upstreams.latest.golden
+++ b/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-applies-to-local-upstreams.latest.golden
@@ -1,75 +1,75 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.20.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-doesnt-apply-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-doesnt-apply-to-inbound.latest.golden
index b4372a3439e81..5cb4171b97300 100644
--- a/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-doesnt-apply-to-inbound.latest.golden
+++ b/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-doesnt-apply-to-inbound.latest.golden
@@ -1,75 +1,75 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.20.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/otel-access-logging-http.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/otel-access-logging-http.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/otel-access-logging-http.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-add-keepalive.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-add-keepalive.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-add-keepalive.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-add-outlier-detection-multiple.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-add-outlier-detection-multiple.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-add-outlier-detection-multiple.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-add-outlier-detection.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-add-outlier-detection.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-add-outlier-detection.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-add-round-robin-lb-config.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-add-round-robin-lb-config.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-add-round-robin-lb-config.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-cluster-load-assignment-inbound-add.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-cluster-load-assignment-inbound-add.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-cluster-load-assignment-inbound-add.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-cluster-load-assignment-outbound-add.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-cluster-load-assignment-outbound-add.latest.golden
deleted file mode 100644
index 27105269cdd37..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-cluster-load-assignment-outbound-add.latest.golden
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ],
-      "policy": {
-        "overprovisioningFactor": 123
-      }
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ],
-      "policy": {
-        "overprovisioningFactor": 123
-      }
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-listener-inbound-add.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-listener-inbound-add.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-listener-inbound-add.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-listener-outbound-add.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-listener-outbound-add.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-listener-outbound-add.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-patch-specific-upstream-service-failover.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-patch-specific-upstream-service-failover.latest.golden
deleted file mode 100644
index 5300fb0c6d188..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-patch-specific-upstream-service-failover.latest.golden
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ],
-      "policy": {
-        "overprovisioningFactor": 1234
-      }
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ],
-      "policy": {
-        "overprovisioningFactor": 1234
-      }
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-patch-specific-upstream-service-splitter.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-patch-specific-upstream-service-splitter.latest.golden
deleted file mode 100644
index eb778f318856d..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-patch-specific-upstream-service-splitter.latest.golden
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v1.db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ],
-      "policy": {
-        "overprovisioningFactor": 1234
-      }
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v2.db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ],
-      "policy": {
-        "overprovisioningFactor": 1234
-      }
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-patch-specific-upstream-service.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-patch-specific-upstream-service.latest.golden
deleted file mode 100644
index 49a84f09b247f..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-patch-specific-upstream-service.latest.golden
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "resources":  [
-    {
-      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName":  "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints":  [
-        {
-          "lbEndpoints":  [
-            {
-              "endpoint":  {
-                "address":  {
-                  "socketAddress":  {
-                    "address":  "10.10.1.1",
-                    "portValue":  8080
-                  }
-                }
-              },
-              "healthStatus":  "HEALTHY",
-              "loadBalancingWeight":  1
-            },
-            {
-              "endpoint":  {
-                "address":  {
-                  "socketAddress":  {
-                    "address":  "10.10.1.2",
-                    "portValue":  8080
-                  }
-                }
-              },
-              "healthStatus":  "HEALTHY",
-              "loadBalancingWeight":  1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName":  "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints":  [
-        {
-          "lbEndpoints":  [
-            {
-              "endpoint":  {
-                "address":  {
-                  "socketAddress":  {
-                    "address":  "10.20.1.1",
-                    "portValue":  8080
-                  }
-                }
-              },
-              "healthStatus":  "HEALTHY",
-              "loadBalancingWeight":  1
-            },
-            {
-              "endpoint":  {
-                "address":  {
-                  "socketAddress":  {
-                    "address":  "10.20.1.2",
-                    "portValue":  8080
-                  }
-                }
-              },
-              "healthStatus":  "HEALTHY",
-              "loadBalancingWeight":  1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints":  [
-        {
-          "lbEndpoints":  [
-            {
-              "endpoint":  {
-                "address":  {
-                  "socketAddress":  {
-                    "address":  "10.10.1.1",
-                    "portValue":  8080
-                  }
-                }
-              },
-              "healthStatus":  "HEALTHY",
-              "loadBalancingWeight":  1
-            },
-            {
-              "endpoint":  {
-                "address":  {
-                  "socketAddress":  {
-                    "address":  "10.20.1.2",
-                    "portValue":  8080
-                  }
-                }
-              },
-              "healthStatus":  "HEALTHY",
-              "loadBalancingWeight":  1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "nonce":  "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-remove-outlier-detection.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-remove-outlier-detection.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/propertyoverride-remove-outlier-detection.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/wasm-http-local-file.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/wasm-http-local-file.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/wasm-http-local-file.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/wasm-http-remote-file.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/wasm-http-remote-file.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/wasm-http-remote-file.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/wasm-tcp-local-file-outbound.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/wasm-tcp-local-file-outbound.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/wasm-tcp-local-file-outbound.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/wasm-tcp-local-file.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/wasm-tcp-local-file.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/wasm-tcp-local-file.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/wasm-tcp-remote-file-outbound.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/wasm-tcp-remote-file-outbound.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/wasm-tcp-remote-file-outbound.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/endpoints/wasm-tcp-remote-file.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/wasm-tcp-remote-file.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/builtin_extension/endpoints/wasm-tcp-remote-file.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-grpc-service.latest.golden
deleted file mode 100644
index 2492e2ffaf4d7..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-grpc-service.latest.golden
+++ /dev/null
@@ -1,256 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.ext_authz",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz",
-                      "failureModeAllow": true,
-                      "grpcService": {
-                        "envoyGrpc": {
-                          "clusterName": "local_ext_authz"
-                        }
-                      },
-                      "metadataContextNamespaces": [
-                        "consul"
-                      ],
-                      "statPrefix": "response",
-                      "transportApiVersion": "V3"
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-http-service.latest.golden b/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-http-service.latest.golden
deleted file mode 100644
index 120bb1ee6fda6..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-local-http-service.latest.golden
+++ /dev/null
@@ -1,257 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.ext_authz",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz",
-                      "failureModeAllow": true,
-                      "httpService": {
-                        "serverUri": {
-                          "cluster": "local_ext_authz",
-                          "uri": "local_ext_authz"
-                        }
-                      },
-                      "metadataContextNamespaces": [
-                        "consul"
-                      ],
-                      "statPrefix": "response",
-                      "transportApiVersion": "V3"
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-grpc-service.latest.golden
deleted file mode 100644
index 69dd07bf63403..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-grpc-service.latest.golden
+++ /dev/null
@@ -1,280 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.ext_authz",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz",
-                      "bootstrapMetadataLabelsKey": "test-labels-key",
-                      "clearRouteCache": true,
-                      "grpcService": {
-                        "envoyGrpc": {
-                          "authority": "test-authority",
-                          "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                        },
-                        "initialMetadata": [
-                          {
-                            "key": "init-metadata-1",
-                            "value": "value 1"
-                          },
-                          {
-                            "key": "init-metadata-2",
-                            "value": "value 2"
-                          }
-                        ],
-                        "timeout": "2s"
-                      },
-                      "includePeerCertificate": true,
-                      "metadataContextNamespaces": [
-                        "test-ns-1",
-                        "test-ns-2",
-                        "consul"
-                      ],
-                      "statPrefix": "ext_authz_stats",
-                      "statusOnError": {
-                        "code": "ExpectationFailed"
-                      },
-                      "transportApiVersion": "V3",
-                      "withRequestBody": {
-                        "allowPartialMessage": true,
-                        "maxRequestBytes": 10000,
-                        "packAsBytes": true
-                      }
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-http-service.latest.golden b/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-http-service.latest.golden
deleted file mode 100644
index 52ff163ef6073..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/ext-authz-http-upstream-http-service.latest.golden
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.ext_authz",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz",
-                      "bootstrapMetadataLabelsKey": "test-labels-key",
-                      "clearRouteCache": true,
-                      "httpService": {
-                        "authorizationRequest": {
-                          "allowedHeaders": {
-                            "patterns": [
-                              {
-                                "exact": "allow-header-1"
-                              },
-                              {
-                                "exact": "allow-header-2",
-                                "ignoreCase": true
-                              }
-                            ]
-                          },
-                          "headersToAdd": [
-                            {
-                              "key": "add-header-1",
-                              "value": "foo"
-                            },
-                            {
-                              "key": "add-header-2",
-                              "value": "bar"
-                            }
-                          ]
-                        },
-                        "authorizationResponse": {
-                          "allowedClientHeaders": {
-                            "patterns": [
-                              {
-                                "prefix": "client-header-1"
-                              },
-                              {
-                                "ignoreCase": true,
-                                "prefix": "client-header-2"
-                              }
-                            ]
-                          },
-                          "allowedClientHeadersOnSuccess": {
-                            "patterns": [
-                              {
-                                "safeRegex": {
-                                  "googleRe2": {},
-                                  "regex": "client-ok-header-1"
-                                }
-                              },
-                              {
-                                "safeRegex": {
-                                  "googleRe2": {},
-                                  "regex": "client-ok-header-2"
-                                }
-                              }
-                            ]
-                          },
-                          "allowedUpstreamHeaders": {
-                            "patterns": [
-                              {
-                                "contains": "upstream-header-1"
-                              },
-                              {
-                                "contains": "upstream-header-2",
-                                "ignoreCase": true
-                              }
-                            ]
-                          },
-                          "allowedUpstreamHeadersToAppend": {
-                            "patterns": [
-                              {
-                                "exact": "add-upstream-1"
-                              },
-                              {
-                                "exact": "add-upstream-2",
-                                "ignoreCase": true
-                              }
-                            ]
-                          },
-                          "dynamicMetadataFromHeaders": {
-                            "patterns": [
-                              {
-                                "suffix": "dynamic-header-1"
-                              },
-                              {
-                                "ignoreCase": true,
-                                "suffix": "dynamic-header-2"
-                              }
-                            ]
-                          }
-                        },
-                        "pathPrefix": "/ext_authz",
-                        "serverUri": {
-                          "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                          "timeout": "2s",
-                          "uri": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                        }
-                      },
-                      "includePeerCertificate": true,
-                      "metadataContextNamespaces": [
-                        "test-ns-1",
-                        "test-ns-2",
-                        "consul"
-                      ],
-                      "statPrefix": "ext_authz_stats",
-                      "statusOnError": {
-                        "code": "ExpectationFailed"
-                      },
-                      "transportApiVersion": "V3",
-                      "withRequestBody": {
-                        "allowPartialMessage": true,
-                        "maxRequestBytes": 10000,
-                        "packAsBytes": true
-                      }
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/ext-authz-tcp-local-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/listeners/ext-authz-tcp-local-grpc-service.latest.golden
deleted file mode 100644
index 2ff95a6b1d00c..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/ext-authz-tcp-local-grpc-service.latest.golden
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.ext_authz",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.ext_authz.v3.ExtAuthz",
-                "failureModeAllow": true,
-                "grpcService": {
-                  "envoyGrpc": {
-                    "clusterName": "local_ext_authz"
-                  }
-                },
-                "statPrefix": "response",
-                "transportApiVersion": "V3"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/ext-authz-tcp-upstream-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/listeners/ext-authz-tcp-upstream-grpc-service.latest.golden
deleted file mode 100644
index e69b6d10ed23c..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/ext-authz-tcp-upstream-grpc-service.latest.golden
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.ext_authz",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.ext_authz.v3.ExtAuthz",
-                "grpcService": {
-                  "envoyGrpc": {
-                    "authority": "test-authority",
-                    "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                  },
-                  "initialMetadata": [
-                    {
-                      "key": "init-metadata-1",
-                      "value": "value 1"
-                    },
-                    {
-                      "key": "init-metadata-2",
-                      "value": "value 2"
-                    }
-                  ],
-                  "timeout": "2s"
-                },
-                "includePeerCertificate": true,
-                "statPrefix": "ext_authz_stats",
-                "transportApiVersion": "V3"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lambda-and-lua-connect-proxy.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lambda-and-lua-connect-proxy.latest.golden
index bf09509b375db..6ca32f56116c2 100644
--- a/agent/xds/testdata/builtin_extension/listeners/lambda-and-lua-connect-proxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/listeners/lambda-and-lua-connect-proxy.latest.golden
@@ -1,197 +1,219 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.aws_lambda",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
-                      "arn": "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
-                      "invocationMode": "ASYNCHRONOUS"
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "db",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "routeConfig":  {
+                  "name":  "db",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "db.default.default.dc1",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "db.default.default.dc1",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "prefix": "/"
+                          "match":  {
+                            "prefix":  "/"
                           },
-                          "route": {
-                            "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                          "route":  {
+                            "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "stripAnyHostPort": true,
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.aws_lambda",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
+                      "arn":  "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
+                      "invocationMode":  "ASYNCHRONOUS"
+                    }
+                  },
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
-                ]
+                ],
+                "stripAnyHostPort":  true
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "public_listener",
+                "routeConfig":  {
+                  "name":  "public_listener",
+                  "virtualHosts":  [
+                    {
+                      "name":  "public_listener",
+                      "domains":  [
+                        "*"
+                      ],
+                      "routes":  [
+                        {
+                          "match":  {
+                            "prefix":  "/"
+                          },
+                          "route":  {
+                            "cluster":  "local_app"
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
+                    "name":  "envoy.filters.http.header_to_metadata",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
+                      "requestRules":  [
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "trust-domain",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\1"
+                              "substitution":  "\\1"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "partition",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\2"
+                              "substitution":  "\\2"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "namespace",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\3"
+                              "substitution":  "\\3"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "datacenter",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\4"
+                              "substitution":  "\\4"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "service",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\5"
+                              "substitution":  "\\5"
                             }
                           }
                         }
@@ -199,93 +221,71 @@
                     }
                   },
                   {
-                    "name": "envoy.filters.http.lua",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua",
-                      "inlineCode": "\nfunction envoy_on_request(request_handle)\n  request_handle:headers():add(\"test\", \"test\")\nend"
+                    "name":  "envoy.filters.http.lua",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua",
+                      "inlineCode":  "\nfunction envoy_on_request(request_handle)\n  request_handle:headers():add(\"test\", \"test\")\nend"
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy-opposite-meta.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy-opposite-meta.latest.golden
index 0a9f960337082..b32a4695a66c7 100644
--- a/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy-opposite-meta.latest.golden
+++ b/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy-opposite-meta.latest.golden
@@ -1,160 +1,160 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.aws_lambda",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
-                      "arn": "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
-                      "invocationMode": "ASYNCHRONOUS"
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "db",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "routeConfig":  {
+                  "name":  "db",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "db.default.default.dc1",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "db.default.default.dc1",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "prefix": "/"
+                          "match":  {
+                            "prefix":  "/"
                           },
-                          "route": {
-                            "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                          "route":  {
+                            "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "stripAnyHostPort": true,
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.aws_lambda",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
+                      "arn":  "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
+                      "invocationMode":  "ASYNCHRONOUS"
+                    }
+                  },
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
-                ]
+                ],
+                "stripAnyHostPort":  true
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy-tproxy.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy-tproxy.latest.golden
index d81c622fcfb7b..d47f5fc144257 100644
--- a/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy-tproxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy-tproxy.latest.golden
@@ -1,217 +1,217 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 15001
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "outbound_listener:127.0.0.1:15001",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  15001
         }
       },
-      "defaultFilterChain": {
-        "filters": [
-          {
-            "name": "envoy.filters.network.tcp_proxy",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-              "cluster": "original-destination",
-              "statPrefix": "upstream.original-destination"
-            }
-          }
-        ]
-      },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filterChainMatch": {
-            "prefixRanges": [
+          "filterChainMatch":  {
+            "prefixRanges":  [
               {
-                "addressPrefix": "10.0.0.1",
-                "prefixLen": 32
+                "addressPrefix":  "10.0.0.1",
+                "prefixLen":  32
               },
               {
-                "addressPrefix": "240.0.0.1",
-                "prefixLen": 32
+                "addressPrefix":  "240.0.0.1",
+                "prefixLen":  32
               }
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.aws_lambda",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
-                      "arn": "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
-                      "payloadPassthrough": true
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "google",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.google.default.default.dc1",
+                "routeConfig":  {
+                  "name":  "google",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "google.default.default.dc1",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "google.default.default.dc1",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "prefix": "/"
+                          "match":  {
+                            "prefix":  "/"
                           },
-                          "route": {
-                            "cluster": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                          "route":  {
+                            "cluster":  "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "upstream.google.default.default.dc1",
-                "stripAnyHostPort": true,
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.aws_lambda",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
+                      "arn":  "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
+                      "payloadPassthrough":  true
+                    }
+                  },
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
-                ]
+                ],
+                "stripAnyHostPort":  true
               }
             }
           ]
         }
       ],
-      "listenerFilters": [
+      "defaultFilterChain":  {
+        "filters":  [
+          {
+            "name":  "envoy.filters.network.tcp_proxy",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+              "statPrefix":  "upstream.original-destination",
+              "cluster":  "original-destination"
+            }
+          }
+        ]
+      },
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.original_dst",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst"
+          "name":  "envoy.filters.listener.original_dst",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst"
           }
         }
       ],
-      "name": "outbound_listener:127.0.0.1:15001",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden
index 1d8fd316ec2fc..71f4ce9ac5aab 100644
--- a/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden
+++ b/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden
@@ -1,57 +1,58 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "db",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "routeConfig":  {
+                  "name":  "db",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "db.default.default.dc1",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "db.default.default.dc1",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "prefix": "/"
+                          "match":  {
+                            "prefix":  "/"
                           },
-                          "route": {
-                            "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                          "route":  {
+                            "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -59,93 +60,92 @@
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy.latest.golden
index e51680301e623..9e789e12f1c25 100644
--- a/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/listeners/lambda-connect-proxy.latest.golden
@@ -1,160 +1,160 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.aws_lambda",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
-                      "arn": "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
-                      "payloadPassthrough": true
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "db",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "routeConfig":  {
+                  "name":  "db",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "db.default.default.dc1",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "db.default.default.dc1",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "prefix": "/"
+                          "match":  {
+                            "prefix":  "/"
                           },
-                          "route": {
-                            "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                          "route":  {
+                            "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "stripAnyHostPort": true,
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.aws_lambda",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
+                      "arn":  "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
+                      "payloadPassthrough":  true
+                    }
+                  },
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
-                ]
+                ],
+                "stripAnyHostPort":  true
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lambda-terminating-gateway-with-service-resolvers.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lambda-terminating-gateway-with-service-resolvers.latest.golden
index 44e207f0f8081..9c7f5e9661486 100644
--- a/agent/xds/testdata/builtin_extension/listeners/lambda-terminating-gateway-with-service-resolvers.latest.golden
+++ b/agent/xds/testdata/builtin_extension/listeners/lambda-terminating-gateway-with-service-resolvers.latest.golden
@@ -1,460 +1,460 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8443
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "default:1.2.3.4:8443",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8443
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.api.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.api.default.default.dc1",
+                "cluster":  "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICnTCCAkKgAwIBAgIRAJrvEdaRAkSltrotd/l/j2cwCgYIKoZIzj0EAwIwgbgx\nCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj\nbzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw\nFQYDVQQKEw5IYXNoaUNvcnAgSW5jLjE/MD0GA1UEAxM2Q29uc3VsIEFnZW50IENB\nIDk2NjM4NzM1MDkzNTU5NTIwNDk3MTQwOTU3MDY1MTc0OTg3NDMxMB4XDTIwMDQx\nNDIyMzE1MloXDTIxMDQxNDIyMzE1MlowHDEaMBgGA1UEAxMRc2VydmVyLmRjMS5j\nb25zdWwwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ4v0FoIYI0OWmxE2MR6w5l\n0pWGhc02RpsOPj/6RS1fmXMMu7JzPzwCmkGcR16RlwwhNFKCZsWpvAjVRHf/pTp+\no4HHMIHEMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB\nBQUHAwIwDAYDVR0TAQH/BAIwADApBgNVHQ4EIgQgk7kABFitAy3PluyNtmzYiC7H\njSN8W/K/OXNJQAQAscMwKwYDVR0jBCQwIoAgNKbPPepvRHXSAPTc+a/BXBzFX1qJ\ny+Zi7qtjlFX7qtUwLQYDVR0RBCYwJIIRc2VydmVyLmRjMS5jb25zdWyCCWxvY2Fs\naG9zdIcEfwAAATAKBggqhkjOPQQDAgNJADBGAiEAhP4HmN5BWysWTbQWClXaWUah\nLpBGFrvc/2cCQuyEZKsCIQD6JyYCYMArtWwZ4G499zktxrFlqfX14bqyONrxtA5I\nDw==\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICnTCCAkKgAwIBAgIRAJrvEdaRAkSltrotd/l/j2cwCgYIKoZIzj0EAwIwgbgx\nCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj\nbzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw\nFQYDVQQKEw5IYXNoaUNvcnAgSW5jLjE/MD0GA1UEAxM2Q29uc3VsIEFnZW50IENB\nIDk2NjM4NzM1MDkzNTU5NTIwNDk3MTQwOTU3MDY1MTc0OTg3NDMxMB4XDTIwMDQx\nNDIyMzE1MloXDTIxMDQxNDIyMzE1MlowHDEaMBgGA1UEAxMRc2VydmVyLmRjMS5j\nb25zdWwwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ4v0FoIYI0OWmxE2MR6w5l\n0pWGhc02RpsOPj/6RS1fmXMMu7JzPzwCmkGcR16RlwwhNFKCZsWpvAjVRHf/pTp+\no4HHMIHEMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB\nBQUHAwIwDAYDVR0TAQH/BAIwADApBgNVHQ4EIgQgk7kABFitAy3PluyNtmzYiC7H\njSN8W/K/OXNJQAQAscMwKwYDVR0jBCQwIoAgNKbPPepvRHXSAPTc+a/BXBzFX1qJ\ny+Zi7qtjlFX7qtUwLQYDVR0RBCYwJIIRc2VydmVyLmRjMS5jb25zdWyCCWxvY2Fs\naG9zdIcEfwAAATAKBggqhkjOPQQDAgNJADBGAiEAhP4HmN5BWysWTbQWClXaWUah\nLpBGFrvc/2cCQuyEZKsCIQD6JyYCYMArtWwZ4G499zktxrFlqfX14bqyONrxtA5I\nDw==\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIE3KbKXHdsa0vvC1fysQaGdoJRgjRALIolI4XJanie+coAoGCCqGSM49\nAwEHoUQDQgAEOL9BaCGCNDlpsRNjEesOZdKVhoXNNkabDj4/+kUtX5lzDLuycz88\nAppBnEdekZcMITRSgmbFqbwI1UR3/6U6fg==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIE3KbKXHdsa0vvC1fysQaGdoJRgjRALIolI4XJanie+coAoGCCqGSM49\nAwEHoUQDQgAEOL9BaCGCNDlpsRNjEesOZdKVhoXNNkabDj4/+kUtX5lzDLuycz88\nAppBnEdekZcMITRSgmbFqbwI1UR3/6U6fg==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.cache.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.cache.default.default.dc1",
+                "cluster":  "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICmjCCAkGgAwIBAgIQe1ZmC0rzRwer6jaH1YIUIjAKBggqhkjOPQQDAjCBuDEL\nMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv\nMRowGAYDVQQJExExMDEgU2Vjb25kIFN0cmVldDEOMAwGA1UEERMFOTQxMDUxFzAV\nBgNVBAoTDkhhc2hpQ29ycCBJbmMuMT8wPQYDVQQDEzZDb25zdWwgQWdlbnQgQ0Eg\nODE5ODAwNjg0MDM0MTM3ODkyNDYxNTA1MDk0NDU3OTU1MTQxNjEwHhcNMjAwNjE5\nMTU1MjAzWhcNMjEwNjE5MTU1MjAzWjAcMRowGAYDVQQDExFzZXJ2ZXIuZGMxLmNv\nbnN1bDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH2aWaaa3fpQLBayheHiKlrH\n+z53m0frfGknKjOhOPVYDVHV8x0OE01negswVQbKHAtxPf1M8Zy+WbI9rK7Ua1mj\ngccwgcQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF\nBQcDAjAMBgNVHRMBAf8EAjAAMCkGA1UdDgQiBCDf9CPBSUwwZvpeW73oJLTmgQE2\ntW1NKpL5t1uq9WFcqDArBgNVHSMEJDAigCCPPd/NxgZB0tq2M8pdVpPj3Cr79iTv\ni4/T1ysodfMb7zAtBgNVHREEJjAkghFzZXJ2ZXIuZGMxLmNvbnN1bIIJbG9jYWxo\nb3N0hwR/AAABMAoGCCqGSM49BAMCA0cAMEQCIFCjFZAoXq0s2ied2eIBv0i1KoW5\nIhCylnKFt6iHkyDeAiBBCByTcjHRgEQmqyPojQKoO584EFiczTub9aWdnf9tEw==\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICmjCCAkGgAwIBAgIQe1ZmC0rzRwer6jaH1YIUIjAKBggqhkjOPQQDAjCBuDEL\nMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv\nMRowGAYDVQQJExExMDEgU2Vjb25kIFN0cmVldDEOMAwGA1UEERMFOTQxMDUxFzAV\nBgNVBAoTDkhhc2hpQ29ycCBJbmMuMT8wPQYDVQQDEzZDb25zdWwgQWdlbnQgQ0Eg\nODE5ODAwNjg0MDM0MTM3ODkyNDYxNTA1MDk0NDU3OTU1MTQxNjEwHhcNMjAwNjE5\nMTU1MjAzWhcNMjEwNjE5MTU1MjAzWjAcMRowGAYDVQQDExFzZXJ2ZXIuZGMxLmNv\nbnN1bDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH2aWaaa3fpQLBayheHiKlrH\n+z53m0frfGknKjOhOPVYDVHV8x0OE01negswVQbKHAtxPf1M8Zy+WbI9rK7Ua1mj\ngccwgcQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF\nBQcDAjAMBgNVHRMBAf8EAjAAMCkGA1UdDgQiBCDf9CPBSUwwZvpeW73oJLTmgQE2\ntW1NKpL5t1uq9WFcqDArBgNVHSMEJDAigCCPPd/NxgZB0tq2M8pdVpPj3Cr79iTv\ni4/T1ysodfMb7zAtBgNVHREEJjAkghFzZXJ2ZXIuZGMxLmNvbnN1bIIJbG9jYWxo\nb3N0hwR/AAABMAoGCCqGSM49BAMCA0cAMEQCIFCjFZAoXq0s2ied2eIBv0i1KoW5\nIhCylnKFt6iHkyDeAiBBCByTcjHRgEQmqyPojQKoO584EFiczTub9aWdnf9tEw==\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEINsen3S8xzxMrKcRZIvxXzhKDn43Tw9ttqWEFU9TqS5hoAoGCCqGSM49\nAwEHoUQDQgAEfZpZpprd+lAsFrKF4eIqWsf7PnebR+t8aScqM6E49VgNUdXzHQ4T\nTWd6CzBVBsocC3E9/UzxnL5Zsj2srtRrWQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEINsen3S8xzxMrKcRZIvxXzhKDn43Tw9ttqWEFU9TqS5hoAoGCCqGSM49\nAwEHoUQDQgAEfZpZpprd+lAsFrKF4eIqWsf7PnebR+t8aScqM6E49VgNUdXzHQ4T\nTWd6CzBVBsocC3E9/UzxnL5Zsj2srtRrWQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.web.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.aws_lambda",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
-                      "arn": "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
-                      "payloadPassthrough": true
+                    "name":  "envoy.filters.http.aws_lambda",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
+                      "arn":  "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
+                      "payloadPassthrough":  true
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "stripAnyHostPort": true,
-                "tracing": {
-                  "randomSampling": {}
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
-                ]
+                ],
+                "stripAnyHostPort":  true
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.web.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.aws_lambda",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
-                      "arn": "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
-                      "payloadPassthrough": true
+                    "name":  "envoy.filters.http.aws_lambda",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
+                      "arn":  "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
+                      "payloadPassthrough":  true
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "stripAnyHostPort": true,
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
-                ]
+                ],
+                "stripAnyHostPort":  true
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICnTCCAkOgAwIBAgIRAKF+qDJbaOULNL1TIatrsBowCgYIKoZIzj0EAwIwgbkx\nCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj\nbzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw\nFQYDVQQKEw5IYXNoaUNvcnAgSW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENB\nIDE4Nzg3MDAwNjUzMDcxOTYzNTk1ODkwNTE1ODY1NjEzMDA2MTU0NDAeFw0yMDA2\nMTkxNTMxMzRaFw0yMTA2MTkxNTMxMzRaMBwxGjAYBgNVBAMTEXNlcnZlci5kYzEu\nY29uc3VsMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdQ8Igci5f7ZvvCVsxXt9\ntLfvczD+60XHg0OC0+Aka7ZjQfbEjQwZbz/82EwPoS7Dqo3LTK4IuelOimoNNxuk\nkaOBxzCBxDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG\nAQUFBwMCMAwGA1UdEwEB/wQCMAAwKQYDVR0OBCIEILzTLkfJcdWQnTMKUcai/YJq\n0RqH1pjCqtY7SOU4gGOTMCsGA1UdIwQkMCKAIMa2vNcTEC5AGfHIYARJ/4sodX0o\nLzCj3lpw7BcEzPTcMC0GA1UdEQQmMCSCEXNlcnZlci5kYzEuY29uc3Vsgglsb2Nh\nbGhvc3SHBH8AAAEwCgYIKoZIzj0EAwIDSAAwRQIgBZ/Z4GSLEc98WvT/qjTVCNTG\n1WNaAaesVbkRx+J0yl8CIQDAVoqY9ByA5vKHjnQrxWlc/JUtJz8wudg7e/OCRriP\nSg==\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICnTCCAkOgAwIBAgIRAKF+qDJbaOULNL1TIatrsBowCgYIKoZIzj0EAwIwgbkx\nCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj\nbzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw\nFQYDVQQKEw5IYXNoaUNvcnAgSW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENB\nIDE4Nzg3MDAwNjUzMDcxOTYzNTk1ODkwNTE1ODY1NjEzMDA2MTU0NDAeFw0yMDA2\nMTkxNTMxMzRaFw0yMTA2MTkxNTMxMzRaMBwxGjAYBgNVBAMTEXNlcnZlci5kYzEu\nY29uc3VsMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdQ8Igci5f7ZvvCVsxXt9\ntLfvczD+60XHg0OC0+Aka7ZjQfbEjQwZbz/82EwPoS7Dqo3LTK4IuelOimoNNxuk\nkaOBxzCBxDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG\nAQUFBwMCMAwGA1UdEwEB/wQCMAAwKQYDVR0OBCIEILzTLkfJcdWQnTMKUcai/YJq\n0RqH1pjCqtY7SOU4gGOTMCsGA1UdIwQkMCKAIMa2vNcTEC5AGfHIYARJ/4sodX0o\nLzCj3lpw7BcEzPTcMC0GA1UdEQQmMCSCEXNlcnZlci5kYzEuY29uc3Vsgglsb2Nh\nbGhvc3SHBH8AAAEwCgYIKoZIzj0EAwIDSAAwRQIgBZ/Z4GSLEc98WvT/qjTVCNTG\n1WNaAaesVbkRx+J0yl8CIQDAVoqY9ByA5vKHjnQrxWlc/JUtJz8wudg7e/OCRriP\nSg==\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIN1v14FaNxgY4MgjDOOWthen8dgwB0lNMs9/j2TfrnxzoAoGCCqGSM49\nAwEHoUQDQgAEdQ8Igci5f7ZvvCVsxXt9tLfvczD+60XHg0OC0+Aka7ZjQfbEjQwZ\nbz/82EwPoS7Dqo3LTK4IuelOimoNNxukkQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIN1v14FaNxgY4MgjDOOWthen8dgwB0lNMs9/j2TfrnxzoAoGCCqGSM49\nAwEHoUQDQgAEdQ8Igci5f7ZvvCVsxXt9tLfvczD+60XHg0OC0+Aka7ZjQfbEjQwZ\nbz/82EwPoS7Dqo3LTK4IuelOimoNNxukkQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.web.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.aws_lambda",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
-                      "arn": "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
-                      "payloadPassthrough": true
+                    "name":  "envoy.filters.http.aws_lambda",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
+                      "arn":  "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
+                      "payloadPassthrough":  true
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "stripAnyHostPort": true,
-                "tracing": {
-                  "randomSampling": {}
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
-                ]
+                ],
+                "stripAnyHostPort":  true
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.sni_cluster",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
+              "name":  "envoy.filters.network.sni_cluster",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "terminating_gateway.default"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "terminating_gateway.default",
+                "cluster":  ""
               }
             }
           ]
         }
       ],
-      "listenerFilters": [
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
+          "name":  "envoy.filters.listener.tls_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
       ],
-      "name": "default:1.2.3.4:8443",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lambda-terminating-gateway.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lambda-terminating-gateway.latest.golden
index 9bd00c3f0c88d..e83d3a4c9389a 100644
--- a/agent/xds/testdata/builtin_extension/listeners/lambda-terminating-gateway.latest.golden
+++ b/agent/xds/testdata/builtin_extension/listeners/lambda-terminating-gateway.latest.golden
@@ -1,284 +1,284 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8443
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "default:1.2.3.4:8443",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8443
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.api.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.api.default.default.dc1",
+                "cluster":  "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICnTCCAkKgAwIBAgIRAJrvEdaRAkSltrotd/l/j2cwCgYIKoZIzj0EAwIwgbgx\nCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj\nbzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw\nFQYDVQQKEw5IYXNoaUNvcnAgSW5jLjE/MD0GA1UEAxM2Q29uc3VsIEFnZW50IENB\nIDk2NjM4NzM1MDkzNTU5NTIwNDk3MTQwOTU3MDY1MTc0OTg3NDMxMB4XDTIwMDQx\nNDIyMzE1MloXDTIxMDQxNDIyMzE1MlowHDEaMBgGA1UEAxMRc2VydmVyLmRjMS5j\nb25zdWwwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ4v0FoIYI0OWmxE2MR6w5l\n0pWGhc02RpsOPj/6RS1fmXMMu7JzPzwCmkGcR16RlwwhNFKCZsWpvAjVRHf/pTp+\no4HHMIHEMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB\nBQUHAwIwDAYDVR0TAQH/BAIwADApBgNVHQ4EIgQgk7kABFitAy3PluyNtmzYiC7H\njSN8W/K/OXNJQAQAscMwKwYDVR0jBCQwIoAgNKbPPepvRHXSAPTc+a/BXBzFX1qJ\ny+Zi7qtjlFX7qtUwLQYDVR0RBCYwJIIRc2VydmVyLmRjMS5jb25zdWyCCWxvY2Fs\naG9zdIcEfwAAATAKBggqhkjOPQQDAgNJADBGAiEAhP4HmN5BWysWTbQWClXaWUah\nLpBGFrvc/2cCQuyEZKsCIQD6JyYCYMArtWwZ4G499zktxrFlqfX14bqyONrxtA5I\nDw==\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICnTCCAkKgAwIBAgIRAJrvEdaRAkSltrotd/l/j2cwCgYIKoZIzj0EAwIwgbgx\nCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj\nbzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw\nFQYDVQQKEw5IYXNoaUNvcnAgSW5jLjE/MD0GA1UEAxM2Q29uc3VsIEFnZW50IENB\nIDk2NjM4NzM1MDkzNTU5NTIwNDk3MTQwOTU3MDY1MTc0OTg3NDMxMB4XDTIwMDQx\nNDIyMzE1MloXDTIxMDQxNDIyMzE1MlowHDEaMBgGA1UEAxMRc2VydmVyLmRjMS5j\nb25zdWwwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ4v0FoIYI0OWmxE2MR6w5l\n0pWGhc02RpsOPj/6RS1fmXMMu7JzPzwCmkGcR16RlwwhNFKCZsWpvAjVRHf/pTp+\no4HHMIHEMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB\nBQUHAwIwDAYDVR0TAQH/BAIwADApBgNVHQ4EIgQgk7kABFitAy3PluyNtmzYiC7H\njSN8W/K/OXNJQAQAscMwKwYDVR0jBCQwIoAgNKbPPepvRHXSAPTc+a/BXBzFX1qJ\ny+Zi7qtjlFX7qtUwLQYDVR0RBCYwJIIRc2VydmVyLmRjMS5jb25zdWyCCWxvY2Fs\naG9zdIcEfwAAATAKBggqhkjOPQQDAgNJADBGAiEAhP4HmN5BWysWTbQWClXaWUah\nLpBGFrvc/2cCQuyEZKsCIQD6JyYCYMArtWwZ4G499zktxrFlqfX14bqyONrxtA5I\nDw==\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIE3KbKXHdsa0vvC1fysQaGdoJRgjRALIolI4XJanie+coAoGCCqGSM49\nAwEHoUQDQgAEOL9BaCGCNDlpsRNjEesOZdKVhoXNNkabDj4/+kUtX5lzDLuycz88\nAppBnEdekZcMITRSgmbFqbwI1UR3/6U6fg==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIE3KbKXHdsa0vvC1fysQaGdoJRgjRALIolI4XJanie+coAoGCCqGSM49\nAwEHoUQDQgAEOL9BaCGCNDlpsRNjEesOZdKVhoXNNkabDj4/+kUtX5lzDLuycz88\nAppBnEdekZcMITRSgmbFqbwI1UR3/6U6fg==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.cache.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.cache.default.default.dc1",
+                "cluster":  "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICmjCCAkGgAwIBAgIQe1ZmC0rzRwer6jaH1YIUIjAKBggqhkjOPQQDAjCBuDEL\nMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv\nMRowGAYDVQQJExExMDEgU2Vjb25kIFN0cmVldDEOMAwGA1UEERMFOTQxMDUxFzAV\nBgNVBAoTDkhhc2hpQ29ycCBJbmMuMT8wPQYDVQQDEzZDb25zdWwgQWdlbnQgQ0Eg\nODE5ODAwNjg0MDM0MTM3ODkyNDYxNTA1MDk0NDU3OTU1MTQxNjEwHhcNMjAwNjE5\nMTU1MjAzWhcNMjEwNjE5MTU1MjAzWjAcMRowGAYDVQQDExFzZXJ2ZXIuZGMxLmNv\nbnN1bDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH2aWaaa3fpQLBayheHiKlrH\n+z53m0frfGknKjOhOPVYDVHV8x0OE01negswVQbKHAtxPf1M8Zy+WbI9rK7Ua1mj\ngccwgcQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF\nBQcDAjAMBgNVHRMBAf8EAjAAMCkGA1UdDgQiBCDf9CPBSUwwZvpeW73oJLTmgQE2\ntW1NKpL5t1uq9WFcqDArBgNVHSMEJDAigCCPPd/NxgZB0tq2M8pdVpPj3Cr79iTv\ni4/T1ysodfMb7zAtBgNVHREEJjAkghFzZXJ2ZXIuZGMxLmNvbnN1bIIJbG9jYWxo\nb3N0hwR/AAABMAoGCCqGSM49BAMCA0cAMEQCIFCjFZAoXq0s2ied2eIBv0i1KoW5\nIhCylnKFt6iHkyDeAiBBCByTcjHRgEQmqyPojQKoO584EFiczTub9aWdnf9tEw==\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICmjCCAkGgAwIBAgIQe1ZmC0rzRwer6jaH1YIUIjAKBggqhkjOPQQDAjCBuDEL\nMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv\nMRowGAYDVQQJExExMDEgU2Vjb25kIFN0cmVldDEOMAwGA1UEERMFOTQxMDUxFzAV\nBgNVBAoTDkhhc2hpQ29ycCBJbmMuMT8wPQYDVQQDEzZDb25zdWwgQWdlbnQgQ0Eg\nODE5ODAwNjg0MDM0MTM3ODkyNDYxNTA1MDk0NDU3OTU1MTQxNjEwHhcNMjAwNjE5\nMTU1MjAzWhcNMjEwNjE5MTU1MjAzWjAcMRowGAYDVQQDExFzZXJ2ZXIuZGMxLmNv\nbnN1bDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH2aWaaa3fpQLBayheHiKlrH\n+z53m0frfGknKjOhOPVYDVHV8x0OE01negswVQbKHAtxPf1M8Zy+WbI9rK7Ua1mj\ngccwgcQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF\nBQcDAjAMBgNVHRMBAf8EAjAAMCkGA1UdDgQiBCDf9CPBSUwwZvpeW73oJLTmgQE2\ntW1NKpL5t1uq9WFcqDArBgNVHSMEJDAigCCPPd/NxgZB0tq2M8pdVpPj3Cr79iTv\ni4/T1ysodfMb7zAtBgNVHREEJjAkghFzZXJ2ZXIuZGMxLmNvbnN1bIIJbG9jYWxo\nb3N0hwR/AAABMAoGCCqGSM49BAMCA0cAMEQCIFCjFZAoXq0s2ied2eIBv0i1KoW5\nIhCylnKFt6iHkyDeAiBBCByTcjHRgEQmqyPojQKoO584EFiczTub9aWdnf9tEw==\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEINsen3S8xzxMrKcRZIvxXzhKDn43Tw9ttqWEFU9TqS5hoAoGCCqGSM49\nAwEHoUQDQgAEfZpZpprd+lAsFrKF4eIqWsf7PnebR+t8aScqM6E49VgNUdXzHQ4T\nTWd6CzBVBsocC3E9/UzxnL5Zsj2srtRrWQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEINsen3S8xzxMrKcRZIvxXzhKDn43Tw9ttqWEFU9TqS5hoAoGCCqGSM49\nAwEHoUQDQgAEfZpZpprd+lAsFrKF4eIqWsf7PnebR+t8aScqM6E49VgNUdXzHQ4T\nTWd6CzBVBsocC3E9/UzxnL5Zsj2srtRrWQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICnTCCAkOgAwIBAgIRAKF+qDJbaOULNL1TIatrsBowCgYIKoZIzj0EAwIwgbkx\nCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj\nbzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw\nFQYDVQQKEw5IYXNoaUNvcnAgSW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENB\nIDE4Nzg3MDAwNjUzMDcxOTYzNTk1ODkwNTE1ODY1NjEzMDA2MTU0NDAeFw0yMDA2\nMTkxNTMxMzRaFw0yMTA2MTkxNTMxMzRaMBwxGjAYBgNVBAMTEXNlcnZlci5kYzEu\nY29uc3VsMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdQ8Igci5f7ZvvCVsxXt9\ntLfvczD+60XHg0OC0+Aka7ZjQfbEjQwZbz/82EwPoS7Dqo3LTK4IuelOimoNNxuk\nkaOBxzCBxDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG\nAQUFBwMCMAwGA1UdEwEB/wQCMAAwKQYDVR0OBCIEILzTLkfJcdWQnTMKUcai/YJq\n0RqH1pjCqtY7SOU4gGOTMCsGA1UdIwQkMCKAIMa2vNcTEC5AGfHIYARJ/4sodX0o\nLzCj3lpw7BcEzPTcMC0GA1UdEQQmMCSCEXNlcnZlci5kYzEuY29uc3Vsgglsb2Nh\nbGhvc3SHBH8AAAEwCgYIKoZIzj0EAwIDSAAwRQIgBZ/Z4GSLEc98WvT/qjTVCNTG\n1WNaAaesVbkRx+J0yl8CIQDAVoqY9ByA5vKHjnQrxWlc/JUtJz8wudg7e/OCRriP\nSg==\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICnTCCAkOgAwIBAgIRAKF+qDJbaOULNL1TIatrsBowCgYIKoZIzj0EAwIwgbkx\nCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj\nbzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw\nFQYDVQQKEw5IYXNoaUNvcnAgSW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENB\nIDE4Nzg3MDAwNjUzMDcxOTYzNTk1ODkwNTE1ODY1NjEzMDA2MTU0NDAeFw0yMDA2\nMTkxNTMxMzRaFw0yMTA2MTkxNTMxMzRaMBwxGjAYBgNVBAMTEXNlcnZlci5kYzEu\nY29uc3VsMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdQ8Igci5f7ZvvCVsxXt9\ntLfvczD+60XHg0OC0+Aka7ZjQfbEjQwZbz/82EwPoS7Dqo3LTK4IuelOimoNNxuk\nkaOBxzCBxDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG\nAQUFBwMCMAwGA1UdEwEB/wQCMAAwKQYDVR0OBCIEILzTLkfJcdWQnTMKUcai/YJq\n0RqH1pjCqtY7SOU4gGOTMCsGA1UdIwQkMCKAIMa2vNcTEC5AGfHIYARJ/4sodX0o\nLzCj3lpw7BcEzPTcMC0GA1UdEQQmMCSCEXNlcnZlci5kYzEuY29uc3Vsgglsb2Nh\nbGhvc3SHBH8AAAEwCgYIKoZIzj0EAwIDSAAwRQIgBZ/Z4GSLEc98WvT/qjTVCNTG\n1WNaAaesVbkRx+J0yl8CIQDAVoqY9ByA5vKHjnQrxWlc/JUtJz8wudg7e/OCRriP\nSg==\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIN1v14FaNxgY4MgjDOOWthen8dgwB0lNMs9/j2TfrnxzoAoGCCqGSM49\nAwEHoUQDQgAEdQ8Igci5f7ZvvCVsxXt9tLfvczD+60XHg0OC0+Aka7ZjQfbEjQwZ\nbz/82EwPoS7Dqo3LTK4IuelOimoNNxukkQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIN1v14FaNxgY4MgjDOOWthen8dgwB0lNMs9/j2TfrnxzoAoGCCqGSM49\nAwEHoUQDQgAEdQ8Igci5f7ZvvCVsxXt9tLfvczD+60XHg0OC0+Aka7ZjQfbEjQwZ\nbz/82EwPoS7Dqo3LTK4IuelOimoNNxukkQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.web.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.aws_lambda",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
-                      "arn": "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
-                      "payloadPassthrough": true
+                    "name":  "envoy.filters.http.aws_lambda",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.aws_lambda.v3.Config",
+                      "arn":  "arn:aws:lambda:us-east-1:111111111111:function:lambda-1234",
+                      "payloadPassthrough":  true
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "stripAnyHostPort": true,
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
-                ]
+                ],
+                "stripAnyHostPort":  true
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.sni_cluster",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
+              "name":  "envoy.filters.network.sni_cluster",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "terminating_gateway.default"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "terminating_gateway.default",
+                "cluster":  ""
               }
             }
           ]
         }
       ],
-      "listenerFilters": [
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
+          "name":  "envoy.filters.listener.tls_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
       ],
-      "name": "default:1.2.3.4:8443",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden
index 1d8fd316ec2fc..71f4ce9ac5aab 100644
--- a/agent/xds/testdata/builtin_extension/listeners/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden
+++ b/agent/xds/testdata/builtin_extension/listeners/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden
@@ -1,57 +1,58 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "db",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "routeConfig":  {
+                  "name":  "db",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "db.default.default.dc1",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "db.default.default.dc1",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "prefix": "/"
+                          "match":  {
+                            "prefix":  "/"
                           },
-                          "route": {
-                            "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                          "route":  {
+                            "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -59,93 +60,92 @@
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-inbound-applies-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-inbound-applies-to-inbound.latest.golden
index f0b2d4684088a..e68fceb914cf4 100644
--- a/agent/xds/testdata/builtin_extension/listeners/lua-inbound-applies-to-inbound.latest.golden
+++ b/agent/xds/testdata/builtin_extension/listeners/lua-inbound-applies-to-inbound.latest.golden
@@ -1,152 +1,174 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "public_listener",
+                "routeConfig":  {
+                  "name":  "public_listener",
+                  "virtualHosts":  [
+                    {
+                      "name":  "public_listener",
+                      "domains":  [
+                        "*"
+                      ],
+                      "routes":  [
+                        {
+                          "match":  {
+                            "prefix":  "/"
+                          },
+                          "route":  {
+                            "cluster":  "local_app"
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
+                    "name":  "envoy.filters.http.header_to_metadata",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
+                      "requestRules":  [
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "trust-domain",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\1"
+                              "substitution":  "\\1"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "partition",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\2"
+                              "substitution":  "\\2"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "namespace",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\3"
+                              "substitution":  "\\3"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "datacenter",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\4"
+                              "substitution":  "\\4"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "service",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\5"
+                              "substitution":  "\\5"
                             }
                           }
                         }
@@ -154,93 +176,71 @@
                     }
                   },
                   {
-                    "name": "envoy.filters.http.lua",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua",
-                      "inlineCode": "\nfunction envoy_on_request(request_handle)\n  request_handle:headers():add(\"test\", \"test\")\nend"
+                    "name":  "envoy.filters.http.lua",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua",
+                      "inlineCode":  "\nfunction envoy_on_request(request_handle)\n  request_handle:headers():add(\"test\", \"test\")\nend"
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden
index 3b2dab64b526a..80aad1ab4bbf9 100644
--- a/agent/xds/testdata/builtin_extension/listeners/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden
+++ b/agent/xds/testdata/builtin_extension/listeners/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden
@@ -1,57 +1,58 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "db",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "routeConfig":  {
+                  "name":  "db",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "db.default.default.dc1",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "db.default.default.dc1",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "prefix": "/"
+                          "match":  {
+                            "prefix":  "/"
                           },
-                          "route": {
-                            "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                          "route":  {
+                            "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -59,130 +60,151 @@
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "public_listener",
+                "routeConfig":  {
+                  "name":  "public_listener",
+                  "virtualHosts":  [
+                    {
+                      "name":  "public_listener",
+                      "domains":  [
+                        "*"
+                      ],
+                      "routes":  [
+                        {
+                          "match":  {
+                            "prefix":  "/"
+                          },
+                          "route":  {
+                            "cluster":  "local_app"
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
+                    "name":  "envoy.filters.http.header_to_metadata",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
+                      "requestRules":  [
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "trust-domain",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\1"
+                              "substitution":  "\\1"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "partition",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\2"
+                              "substitution":  "\\2"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "namespace",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\3"
+                              "substitution":  "\\3"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "datacenter",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\4"
+                              "substitution":  "\\4"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "service",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\5"
+                              "substitution":  "\\5"
                             }
                           }
                         }
@@ -190,93 +212,71 @@
                     }
                   },
                   {
-                    "name": "envoy.filters.http.lua",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua",
-                      "inlineCode": "\nfunction envoy_on_request(request_handle)\n  request_handle:headers():add(\"test\", \"test\")\nend"
+                    "name":  "envoy.filters.http.lua",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua",
+                      "inlineCode":  "\nfunction envoy_on_request(request_handle)\n  request_handle:headers():add(\"test\", \"test\")\nend"
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden
index 0b349be9433bd..46d45e157339f 100644
--- a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden
@@ -1,78 +1,79 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 15001
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "outbound_listener:127.0.0.1:15001",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  15001
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filterChainMatch": {
-            "destinationPort": 443
+          "filterChainMatch":  {
+            "destinationPort":  443
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.destination.443.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "destination.443.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.lua",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua",
-                      "inlineCode": "\nfunction envoy_on_request(request_handle)\n  request_handle:headers():add(\"test\", \"test\")\nend"
+                    "name":  "envoy.filters.http.lua",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua",
+                      "inlineCode":  "\nfunction envoy_on_request(request_handle)\n  request_handle:headers():add(\"test\", \"test\")\nend"
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "destination.443.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "upstream.destination.443.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -80,43 +81,43 @@
           ]
         },
         {
-          "filterChainMatch": {
-            "destinationPort": 9093
+          "filterChainMatch":  {
+            "destinationPort":  9093
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.destination.9093.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "destination.9093.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.lua",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua",
-                      "inlineCode": "\nfunction envoy_on_request(request_handle)\n  request_handle:headers():add(\"test\", \"test\")\nend"
+                    "name":  "envoy.filters.http.lua",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua",
+                      "inlineCode":  "\nfunction envoy_on_request(request_handle)\n  request_handle:headers():add(\"test\", \"test\")\nend"
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "destination.9093.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "upstream.destination.9093.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -124,144 +125,165 @@
           ]
         }
       ],
-      "listenerFilters": [
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.original_dst",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst"
+          "name":  "envoy.filters.listener.original_dst",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst"
           }
         },
         {
-          "name": "envoy.filters.listener.http_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.http_inspector.v3.HttpInspector"
+          "name":  "envoy.filters.listener.http_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.http_inspector.v3.HttpInspector"
           }
         }
       ],
-      "name": "outbound_listener:127.0.0.1:15001",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "public_listener",
+                "routeConfig":  {
+                  "name":  "public_listener",
+                  "virtualHosts":  [
+                    {
+                      "name":  "public_listener",
+                      "domains":  [
+                        "*"
+                      ],
+                      "routes":  [
+                        {
+                          "match":  {
+                            "prefix":  "/"
+                          },
+                          "route":  {
+                            "cluster":  "local_app"
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
+                    "name":  "envoy.filters.http.header_to_metadata",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
+                      "requestRules":  [
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "trust-domain",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\1"
+                              "substitution":  "\\1"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "partition",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\2"
+                              "substitution":  "\\2"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "namespace",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\3"
+                              "substitution":  "\\3"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "datacenter",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\4"
+                              "substitution":  "\\4"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "service",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\5"
+                              "substitution":  "\\5"
                             }
                           }
                         }
@@ -269,86 +291,64 @@
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams.latest.golden
index ade1593e2eabd..6741a23ae2501 100644
--- a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams.latest.golden
+++ b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-applies-to-local-upstreams.latest.golden
@@ -1,64 +1,65 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.lua",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua",
-                      "inlineCode": "\nfunction envoy_on_request(request_handle)\n  request_handle:headers():add(\"test\", \"test\")\nend"
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "db",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "routeConfig":  {
+                  "name":  "db",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "db.default.default.dc1",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "db.default.default.dc1",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "prefix": "/"
+                          "match":  {
+                            "prefix":  "/"
                           },
-                          "route": {
-                            "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                          "route":  {
+                            "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.lua",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua",
+                      "inlineCode":  "\nfunction envoy_on_request(request_handle)\n  request_handle:headers():add(\"test\", \"test\")\nend"
+                    }
+                  },
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -66,130 +67,151 @@
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "public_listener",
+                "routeConfig":  {
+                  "name":  "public_listener",
+                  "virtualHosts":  [
+                    {
+                      "name":  "public_listener",
+                      "domains":  [
+                        "*"
+                      ],
+                      "routes":  [
+                        {
+                          "match":  {
+                            "prefix":  "/"
+                          },
+                          "route":  {
+                            "cluster":  "local_app"
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
+                    "name":  "envoy.filters.http.header_to_metadata",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
+                      "requestRules":  [
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "trust-domain",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\1"
+                              "substitution":  "\\1"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "partition",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\2"
+                              "substitution":  "\\2"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "namespace",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\3"
+                              "substitution":  "\\3"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "datacenter",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\4"
+                              "substitution":  "\\4"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "service",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\5"
+                              "substitution":  "\\5"
                             }
                           }
                         }
@@ -197,86 +219,64 @@
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-inbound.latest.golden
index cec77f10e445b..c3353e6fb6bb4 100644
--- a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-inbound.latest.golden
+++ b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-inbound.latest.golden
@@ -1,152 +1,174 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "public_listener",
+                "routeConfig":  {
+                  "name":  "public_listener",
+                  "virtualHosts":  [
+                    {
+                      "name":  "public_listener",
+                      "domains":  [
+                        "*"
+                      ],
+                      "routes":  [
+                        {
+                          "match":  {
+                            "prefix":  "/"
+                          },
+                          "route":  {
+                            "cluster":  "local_app"
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
+                    "name":  "envoy.filters.http.header_to_metadata",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
+                      "requestRules":  [
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "trust-domain",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\1"
+                              "substitution":  "\\1"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "partition",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\2"
+                              "substitution":  "\\2"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "namespace",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\3"
+                              "substitution":  "\\3"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "datacenter",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\4"
+                              "substitution":  "\\4"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "service",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\5"
+                              "substitution":  "\\5"
                             }
                           }
                         }
@@ -154,86 +176,64 @@
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden
deleted file mode 100644
index e8a4a1432082b..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden
+++ /dev/null
@@ -1,275 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "db",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "db.default.default.dc1",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden b/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden
deleted file mode 100644
index e8a4a1432082b..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden
+++ /dev/null
@@ -1,275 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "db",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "db.default.default.dc1",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/otel-access-logging-http.latest.golden b/agent/xds/testdata/builtin_extension/listeners/otel-access-logging-http.latest.golden
deleted file mode 100644
index ad4cde37e91f0..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/otel-access-logging-http.latest.golden
+++ /dev/null
@@ -1,289 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "accessLog": [
-                  {
-                    "name": "envoy.access_loggers.open_telemetry",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.access_loggers.open_telemetry.v3.OpenTelemetryAccessLogConfig",
-                      "attributes": {
-                        "values": [
-                          {
-                            "key": "name",
-                            "value": {
-                              "stringValue": "Bugs Bunny"
-                            }
-                          }
-                        ]
-                      },
-                      "commonConfig": {
-                        "bufferFlushInterval": "0.001s",
-                        "bufferSizeBytes": 4096,
-                        "filterStateObjectsToLog": [
-                          "obj-1",
-                          "obj-2"
-                        ],
-                        "grpcService": {
-                          "envoyGrpc": {
-                            "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                          }
-                        },
-                        "grpcStreamRetryPolicy": {
-                          "numRetries": 5,
-                          "retryBackOff": {
-                            "baseInterval": "1s",
-                            "maxInterval": "10s"
-                          }
-                        },
-                        "logName": "otel-logger",
-                        "transportApiVersion": "V3"
-                      },
-                      "resourceAttributes": {
-                        "values": [
-                          {
-                            "key": "type",
-                            "value": {
-                              "stringValue": "compute"
-                            }
-                          }
-                        ]
-                      }
-                    }
-                  }
-                ],
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-keepalive.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-keepalive.latest.golden
deleted file mode 100644
index cec77f10e445b..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-keepalive.latest.golden
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection-multiple.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection-multiple.latest.golden
deleted file mode 100644
index cec77f10e445b..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection-multiple.latest.golden
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection.latest.golden
deleted file mode 100644
index cec77f10e445b..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-outlier-detection.latest.golden
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-round-robin-lb-config.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-round-robin-lb-config.latest.golden
deleted file mode 100644
index cec77f10e445b..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-add-round-robin-lb-config.latest.golden
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-inbound-add.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-inbound-add.latest.golden
deleted file mode 100644
index cec77f10e445b..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-inbound-add.latest.golden
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-outbound-add.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-outbound-add.latest.golden
deleted file mode 100644
index cec77f10e445b..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-cluster-load-assignment-outbound-add.latest.golden
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden
deleted file mode 100644
index 63986a898dfc8..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden
+++ /dev/null
@@ -1,242 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "statPrefix": "custom.stats.outbound.only",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "statPrefix": "custom.stats.outbound.only",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "statPrefix": "custom.stats.inbound.only",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-inbound-add.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-inbound-add.latest.golden
deleted file mode 100644
index 9b756b88ea5f4..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-inbound-add.latest.golden
+++ /dev/null
@@ -1,240 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "statPrefix": "custom.stats",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-outbound-add.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-outbound-add.latest.golden
deleted file mode 100644
index 91b69ea92489e..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-listener-outbound-add.latest.golden
+++ /dev/null
@@ -1,241 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "statPrefix": "custom.stats",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "statPrefix": "custom.stats",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden
deleted file mode 100644
index 63986a898dfc8..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden
+++ /dev/null
@@ -1,242 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "statPrefix": "custom.stats.outbound.only",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "statPrefix": "custom.stats.outbound.only",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "statPrefix": "custom.stats.inbound.only",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-failover.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-failover.latest.golden
deleted file mode 100644
index 81fdba1d66413..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-failover.latest.golden
+++ /dev/null
@@ -1,240 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "statPrefix": "custom.stats.outbound.only",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-splitter.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-splitter.latest.golden
deleted file mode 100644
index 680526bfbcf3c..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service-splitter.latest.golden
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "db"
-                },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "statPrefix": "custom.stats.outbound.only",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service.latest.golden
deleted file mode 100644
index 7a4514f1d7830..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-patch-specific-upstream-service.latest.golden
+++ /dev/null
@@ -1,234 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "resources":  [
-    {
-      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "name":  "db:127.0.0.1:9191",
-      "address":  {
-        "socketAddress":  {
-          "address":  "127.0.0.1",
-          "portValue":  9191
-        }
-      },
-      "filterChains":  [
-        {
-          "filters":  [
-            {
-              "name":  "envoy.filters.network.tcp_proxy",
-              "typedConfig":  {
-                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "statPrefix":  "upstream.db.default.default.dc1",
-                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ],
-      "trafficDirection":  "OUTBOUND"
-    },
-    {
-      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
-      "address":  {
-        "socketAddress":  {
-          "address":  "127.10.10.10",
-          "portValue":  8181
-        }
-      },
-      "filterChains":  [
-        {
-          "filters":  [
-            {
-              "name":  "envoy.filters.network.tcp_proxy",
-              "typedConfig":  {
-                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "statPrefix":  "upstream.prepared_query_geo-cache",
-                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ],
-      "trafficDirection":  "OUTBOUND"
-    },
-    {
-      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "name":  "public_listener:0.0.0.0:9999",
-      "address":  {
-        "socketAddress":  {
-          "address":  "0.0.0.0",
-          "portValue":  9999
-        }
-      },
-      "filterChains":  [
-        {
-          "filters":  [
-            {
-              "name":  "envoy.filters.network.http_connection_manager",
-              "typedConfig":  {
-                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "statPrefix":  "public_listener",
-                "routeConfig":  {
-                  "name":  "public_listener",
-                  "virtualHosts":  [
-                    {
-                      "name":  "public_listener",
-                      "domains":  [
-                        "*"
-                      ],
-                      "routes":  [
-                        {
-                          "match":  {
-                            "prefix":  "/"
-                          },
-                          "route":  {
-                            "cluster":  "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "httpFilters":  [
-                  {
-                    "name":  "envoy.filters.http.rbac",
-                    "typedConfig":  {
-                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules":  {}
-                    }
-                  },
-                  {
-                    "name":  "envoy.filters.http.header_to_metadata",
-                    "typedConfig":  {
-                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules":  [
-                        {
-                          "header":  "x-forwarded-client-cert",
-                          "onHeaderPresent":  {
-                            "metadataNamespace":  "consul",
-                            "key":  "trust-domain",
-                            "regexValueRewrite":  {
-                              "pattern":  {
-                                "googleRe2":  {},
-                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution":  "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header":  "x-forwarded-client-cert",
-                          "onHeaderPresent":  {
-                            "metadataNamespace":  "consul",
-                            "key":  "partition",
-                            "regexValueRewrite":  {
-                              "pattern":  {
-                                "googleRe2":  {},
-                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution":  "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header":  "x-forwarded-client-cert",
-                          "onHeaderPresent":  {
-                            "metadataNamespace":  "consul",
-                            "key":  "namespace",
-                            "regexValueRewrite":  {
-                              "pattern":  {
-                                "googleRe2":  {},
-                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution":  "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header":  "x-forwarded-client-cert",
-                          "onHeaderPresent":  {
-                            "metadataNamespace":  "consul",
-                            "key":  "datacenter",
-                            "regexValueRewrite":  {
-                              "pattern":  {
-                                "googleRe2":  {},
-                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution":  "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header":  "x-forwarded-client-cert",
-                          "onHeaderPresent":  {
-                            "metadataNamespace":  "consul",
-                            "key":  "service",
-                            "regexValueRewrite":  {
-                              "pattern":  {
-                                "googleRe2":  {},
-                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution":  "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name":  "envoy.filters.http.router",
-                    "typedConfig":  {
-                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "tracing":  {
-                  "randomSampling":  {}
-                },
-                "forwardClientCertDetails":  "APPEND_FORWARD",
-                "setCurrentClientCertDetails":  {
-                  "subject":  true,
-                  "cert":  true,
-                  "chain":  true,
-                  "dns":  true,
-                  "uri":  true
-                }
-              }
-            }
-          ],
-          "transportSocket":  {
-            "name":  "tls",
-            "typedConfig":  {
-              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext":  {
-                "tlsParams":  {},
-                "tlsCertificates":  [
-                  {
-                    "certificateChain":  {
-                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey":  {
-                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "validationContext":  {
-                  "trustedCa":  {
-                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                },
-                "alpnProtocols":  [
-                  "http/1.1"
-                ]
-              },
-              "requireClientCertificate":  true
-            }
-          }
-        }
-      ],
-      "trafficDirection":  "INBOUND"
-    }
-  ],
-  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "nonce":  "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-remove-outlier-detection.latest.golden b/agent/xds/testdata/builtin_extension/listeners/propertyoverride-remove-outlier-detection.latest.golden
deleted file mode 100644
index cec77f10e445b..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/propertyoverride-remove-outlier-detection.latest.golden
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/wasm-http-local-file.latest.golden b/agent/xds/testdata/builtin_extension/listeners/wasm-http-local-file.latest.golden
deleted file mode 100644
index f7420d09994d1..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/wasm-http-local-file.latest.golden
+++ /dev/null
@@ -1,260 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.wasm",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm",
-                      "config": {
-                        "configuration": {
-                          "@type": "type.googleapis.com/google.protobuf.StringValue",
-                          "value": "{\"foo\": \"bar\"}"
-                        },
-                        "failOpen": true,
-                        "vmConfig": {
-                          "code": {
-                            "local": {
-                              "filename": "/path/to/extension.wasm"
-                            }
-                          },
-                          "runtime": "envoy.wasm.runtime.v8"
-                        }
-                      }
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/wasm-http-remote-file.latest.golden b/agent/xds/testdata/builtin_extension/listeners/wasm-http-remote-file.latest.golden
deleted file mode 100644
index 6dfde3d213e3d..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/wasm-http-remote-file.latest.golden
+++ /dev/null
@@ -1,265 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.wasm",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm",
-                      "config": {
-                        "configuration": {
-                          "@type": "type.googleapis.com/google.protobuf.StringValue",
-                          "value": "{\"foo\": \"bar\"}"
-                        },
-                        "failOpen": true,
-                        "vmConfig": {
-                          "code": {
-                            "remote": {
-                              "httpUri": {
-                                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                                "timeout": "1s",
-                                "uri": "https://db/plugin.wasm"
-                              },
-                              "sha256": "d05d88b0ce8a8f1d5176481e0af3ae5c65ed82cbfb8c61506c5354b076078545"
-                            }
-                          },
-                          "runtime": "envoy.wasm.runtime.v8"
-                        }
-                      }
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/wasm-tcp-local-file-outbound.latest.golden b/agent/xds/testdata/builtin_extension/listeners/wasm-tcp-local-file-outbound.latest.golden
deleted file mode 100644
index cc35634ac9fa0..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/wasm-tcp-local-file-outbound.latest.golden
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.wasm",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm",
-                "config": {
-                  "configuration": {
-                    "@type": "type.googleapis.com/google.protobuf.StringValue",
-                    "value": "{\"foo\": \"bar\"}"
-                  },
-                  "failOpen": true,
-                  "vmConfig": {
-                    "code": {
-                      "local": {
-                        "filename": "/path/to/extension.wasm"
-                      }
-                    },
-                    "runtime": "envoy.wasm.runtime.v8"
-                  }
-                }
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.wasm",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm",
-                "config": {
-                  "configuration": {
-                    "@type": "type.googleapis.com/google.protobuf.StringValue",
-                    "value": "{\"foo\": \"bar\"}"
-                  },
-                  "failOpen": true,
-                  "vmConfig": {
-                    "code": {
-                      "local": {
-                        "filename": "/path/to/extension.wasm"
-                      }
-                    },
-                    "runtime": "envoy.wasm.runtime.v8"
-                  }
-                }
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/wasm-tcp-local-file.latest.golden b/agent/xds/testdata/builtin_extension/listeners/wasm-tcp-local-file.latest.golden
deleted file mode 100644
index 93bda48c296cd..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/wasm-tcp-local-file.latest.golden
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.wasm",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm",
-                "config": {
-                  "configuration": {
-                    "@type": "type.googleapis.com/google.protobuf.StringValue",
-                    "value": "{\"foo\": \"bar\"}"
-                  },
-                  "failOpen": true,
-                  "vmConfig": {
-                    "code": {
-                      "local": {
-                        "filename": "/path/to/extension.wasm"
-                      }
-                    },
-                    "runtime": "envoy.wasm.runtime.v8"
-                  }
-                }
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/wasm-tcp-remote-file-outbound.latest.golden b/agent/xds/testdata/builtin_extension/listeners/wasm-tcp-remote-file-outbound.latest.golden
deleted file mode 100644
index ade444364aaa6..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/wasm-tcp-remote-file-outbound.latest.golden
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.wasm",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm",
-                "config": {
-                  "configuration": {
-                    "@type": "type.googleapis.com/google.protobuf.StringValue",
-                    "value": "{\"foo\": \"bar\"}"
-                  },
-                  "failOpen": true,
-                  "vmConfig": {
-                    "code": {
-                      "remote": {
-                        "httpUri": {
-                          "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                          "timeout": "1s",
-                          "uri": "https://db/plugin.wasm"
-                        },
-                        "sha256": "d05d88b0ce8a8f1d5176481e0af3ae5c65ed82cbfb8c61506c5354b076078545"
-                      }
-                    },
-                    "runtime": "envoy.wasm.runtime.v8"
-                  }
-                }
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.wasm",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm",
-                "config": {
-                  "configuration": {
-                    "@type": "type.googleapis.com/google.protobuf.StringValue",
-                    "value": "{\"foo\": \"bar\"}"
-                  },
-                  "failOpen": true,
-                  "vmConfig": {
-                    "code": {
-                      "remote": {
-                        "httpUri": {
-                          "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                          "timeout": "1s",
-                          "uri": "https://db/plugin.wasm"
-                        },
-                        "sha256": "d05d88b0ce8a8f1d5176481e0af3ae5c65ed82cbfb8c61506c5354b076078545"
-                      }
-                    },
-                    "runtime": "envoy.wasm.runtime.v8"
-                  }
-                }
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/listeners/wasm-tcp-remote-file.latest.golden b/agent/xds/testdata/builtin_extension/listeners/wasm-tcp-remote-file.latest.golden
deleted file mode 100644
index 27a18061e60c8..0000000000000
--- a/agent/xds/testdata/builtin_extension/listeners/wasm-tcp-remote-file.latest.golden
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.wasm",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm",
-                "config": {
-                  "configuration": {
-                    "@type": "type.googleapis.com/google.protobuf.StringValue",
-                    "value": "{\"foo\": \"bar\"}"
-                  },
-                  "failOpen": true,
-                  "vmConfig": {
-                    "code": {
-                      "remote": {
-                        "httpUri": {
-                          "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                          "timeout": "1s",
-                          "uri": "https://db/plugin.wasm"
-                        },
-                        "sha256": "d05d88b0ce8a8f1d5176481e0af3ae5c65ed82cbfb8c61506c5354b076078545"
-                      }
-                    },
-                    "runtime": "envoy.wasm.runtime.v8"
-                  }
-                }
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/ext-authz-http-local-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/routes/ext-authz-http-local-grpc-service.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/ext-authz-http-local-grpc-service.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/ext-authz-http-local-http-service.latest.golden b/agent/xds/testdata/builtin_extension/routes/ext-authz-http-local-http-service.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/ext-authz-http-local-http-service.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/ext-authz-http-upstream-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/routes/ext-authz-http-upstream-grpc-service.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/ext-authz-http-upstream-grpc-service.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/ext-authz-http-upstream-http-service.latest.golden b/agent/xds/testdata/builtin_extension/routes/ext-authz-http-upstream-http-service.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/ext-authz-http-upstream-http-service.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/ext-authz-tcp-local-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/routes/ext-authz-tcp-local-grpc-service.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/ext-authz-tcp-local-grpc-service.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/ext-authz-tcp-upstream-grpc-service.latest.golden b/agent/xds/testdata/builtin_extension/routes/ext-authz-tcp-upstream-grpc-service.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/ext-authz-tcp-upstream-grpc-service.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lambda-and-lua-connect-proxy.latest.golden b/agent/xds/testdata/builtin_extension/routes/lambda-and-lua-connect-proxy.latest.golden
index 8b919343d21a9..306f5220e7b9c 100644
--- a/agent/xds/testdata/builtin_extension/routes/lambda-and-lua-connect-proxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/routes/lambda-and-lua-connect-proxy.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy-opposite-meta.latest.golden b/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy-opposite-meta.latest.golden
index 8b919343d21a9..306f5220e7b9c 100644
--- a/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy-opposite-meta.latest.golden
+++ b/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy-opposite-meta.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy-tproxy.latest.golden b/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy-tproxy.latest.golden
index 8b919343d21a9..306f5220e7b9c 100644
--- a/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy-tproxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy-tproxy.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden b/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden
index 8b919343d21a9..306f5220e7b9c 100644
--- a/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden
+++ b/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy-with-terminating-gateway-upstream.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy.latest.golden b/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy.latest.golden
index 8b919343d21a9..306f5220e7b9c 100644
--- a/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/routes/lambda-connect-proxy.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway-with-service-resolvers.latest.golden b/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway-with-service-resolvers.latest.golden
index 192eed0b6cbe0..eddaf9ef92fc2 100644
--- a/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway-with-service-resolvers.latest.golden
+++ b/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway-with-service-resolvers.latest.golden
@@ -1,76 +1,76 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+          "domains":  [
             "*"
           ],
-          "name": "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+              "route":  {
+                "cluster":  "canary1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     },
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+          "domains":  [
             "*"
           ],
-          "name": "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+              "route":  {
+                "cluster":  "canary2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     },
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+          "domains":  [
             "*"
           ],
-          "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+              "route":  {
+                "cluster":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway.latest.golden b/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway.latest.golden
index 5e25d5fdfafc3..51185834173b7 100644
--- a/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway.latest.golden
+++ b/agent/xds/testdata/builtin_extension/routes/lambda-terminating-gateway.latest.golden
@@ -1,30 +1,30 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+          "domains":  [
             "*"
           ],
-          "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+              "route":  {
+                "cluster":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden b/agent/xds/testdata/builtin_extension/routes/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden
index 8b919343d21a9..306f5220e7b9c 100644
--- a/agent/xds/testdata/builtin_extension/routes/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden
+++ b/agent/xds/testdata/builtin_extension/routes/lua-connect-proxy-with-terminating-gateway-upstream.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lua-inbound-applies-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/routes/lua-inbound-applies-to-inbound.latest.golden
index 8b919343d21a9..306f5220e7b9c 100644
--- a/agent/xds/testdata/builtin_extension/routes/lua-inbound-applies-to-inbound.latest.golden
+++ b/agent/xds/testdata/builtin_extension/routes/lua-inbound-applies-to-inbound.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden b/agent/xds/testdata/builtin_extension/routes/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden
index 8b919343d21a9..306f5220e7b9c 100644
--- a/agent/xds/testdata/builtin_extension/routes/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden
+++ b/agent/xds/testdata/builtin_extension/routes/lua-inbound-doesnt-apply-to-local-upstreams.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden b/agent/xds/testdata/builtin_extension/routes/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden
index 0f3440e32e347..173aa56476f6d 100644
--- a/agent/xds/testdata/builtin_extension/routes/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden
+++ b/agent/xds/testdata/builtin_extension/routes/lua-outbound-applies-to-local-upstreams-tproxy.latest.golden
@@ -1,16 +1,15 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "destination.443.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "domains": [
             "www.google.com"
           ],
-          "name": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "routes": [
             {
               "match": {
@@ -22,18 +21,18 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     },
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "destination.9093.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "destination.192-168-2-3.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "domains": [
             "192.168.2.3"
           ],
-          "name": "destination.192-168-2-3.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "routes": [
             {
               "match": {
@@ -46,10 +45,10 @@
           ]
         },
         {
+          "name": "destination.192-168-2-2.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "domains": [
             "192.168.2.2"
           ],
-          "name": "destination.192-168-2-2.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "routes": [
             {
               "match": {
@@ -62,10 +61,10 @@
           ]
         },
         {
+          "name": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "domains": [
             "192.168.2.1"
           ],
-          "name": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "routes": [
             {
               "match": {
@@ -77,9 +76,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lua-outbound-applies-to-local-upstreams.latest.golden b/agent/xds/testdata/builtin_extension/routes/lua-outbound-applies-to-local-upstreams.latest.golden
index 8b919343d21a9..306f5220e7b9c 100644
--- a/agent/xds/testdata/builtin_extension/routes/lua-outbound-applies-to-local-upstreams.latest.golden
+++ b/agent/xds/testdata/builtin_extension/routes/lua-outbound-applies-to-local-upstreams.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lua-outbound-doesnt-apply-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/routes/lua-outbound-doesnt-apply-to-inbound.latest.golden
index 8b919343d21a9..306f5220e7b9c 100644
--- a/agent/xds/testdata/builtin_extension/routes/lua-outbound-doesnt-apply-to-inbound.latest.golden
+++ b/agent/xds/testdata/builtin_extension/routes/lua-outbound-doesnt-apply-to-inbound.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden b/agent/xds/testdata/builtin_extension/routes/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/lua-outbound-doesnt-apply-to-local-upstreams-with-consul-constraint-violation.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden b/agent/xds/testdata/builtin_extension/routes/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/lua-outbound-doesnt-apply-to-local-upstreams-with-envoy-constraint-violation.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/otel-access-logging-http.latest.golden b/agent/xds/testdata/builtin_extension/routes/otel-access-logging-http.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/otel-access-logging-http.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-add-keepalive.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-add-keepalive.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-add-keepalive.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-add-outlier-detection-multiple.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-add-outlier-detection-multiple.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-add-outlier-detection-multiple.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-add-outlier-detection.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-add-outlier-detection.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-add-outlier-detection.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-add-round-robin-lb-config.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-add-round-robin-lb-config.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-add-round-robin-lb-config.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-cluster-load-assignment-inbound-add.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-cluster-load-assignment-inbound-add.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-cluster-load-assignment-inbound-add.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-cluster-load-assignment-outbound-add.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-cluster-load-assignment-outbound-add.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-cluster-load-assignment-outbound-add.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-inbound-doesnt-apply-to-outbound.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-listener-inbound-add.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-listener-inbound-add.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-listener-inbound-add.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-listener-outbound-add.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-listener-outbound-add.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-listener-outbound-add.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-outbound-doesnt-apply-to-inbound.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service-failover.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service-failover.latest.golden
deleted file mode 100644
index 63ede4b9ebe1e..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service-failover.latest.golden
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "mostSpecificHeaderMutationsWins": true,
-      "name": "db",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "db",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "33s"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service-splitter.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service-splitter.latest.golden
deleted file mode 100644
index dc51ff588d730..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service-splitter.latest.golden
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "mostSpecificHeaderMutationsWins": true,
-      "name": "db",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "db",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "weightedClusters": {
-                  "clusters": [
-                    {
-                      "name": "v1.db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                      "weight": 5000
-                    },
-                    {
-                      "name": "v2.db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-                      "weight": 5000
-                    }
-                  ],
-                  "totalWeight": 10000
-                }
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service.latest.golden
deleted file mode 100644
index 095330c68404e..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-patch-specific-upstream-service.latest.golden
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "resources":  [
-    {
-      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name":  "db",
-      "virtualHosts":  [
-        {
-          "name":  "db",
-          "domains":  [
-            "*"
-          ],
-          "routes":  [
-            {
-              "match":  {
-                "prefix":  "/"
-              },
-              "route":  {
-                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout":  "33s"
-              }
-            }
-          ]
-        }
-      ],
-      "validateClusters":  true
-    }
-  ],
-  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "nonce":  "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/propertyoverride-remove-outlier-detection.latest.golden b/agent/xds/testdata/builtin_extension/routes/propertyoverride-remove-outlier-detection.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/propertyoverride-remove-outlier-detection.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/wasm-http-local-file.latest.golden b/agent/xds/testdata/builtin_extension/routes/wasm-http-local-file.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/wasm-http-local-file.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/wasm-http-remote-file.latest.golden b/agent/xds/testdata/builtin_extension/routes/wasm-http-remote-file.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/wasm-http-remote-file.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/wasm-tcp-local-file-outbound.latest.golden b/agent/xds/testdata/builtin_extension/routes/wasm-tcp-local-file-outbound.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/wasm-tcp-local-file-outbound.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/wasm-tcp-local-file.latest.golden b/agent/xds/testdata/builtin_extension/routes/wasm-tcp-local-file.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/wasm-tcp-local-file.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/wasm-tcp-remote-file-outbound.latest.golden b/agent/xds/testdata/builtin_extension/routes/wasm-tcp-remote-file-outbound.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/wasm-tcp-remote-file-outbound.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/builtin_extension/routes/wasm-tcp-remote-file.latest.golden b/agent/xds/testdata/builtin_extension/routes/wasm-tcp-remote-file.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/builtin_extension/routes/wasm-tcp-remote-file.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/api-gateway-with-http-route-and-inline-certificate.latest.golden b/agent/xds/testdata/clusters/api-gateway-with-http-route-and-inline-certificate.latest.golden
new file mode 100644
index 0000000000000..e20479dfd1cfc
--- /dev/null
+++ b/agent/xds/testdata/clusters/api-gateway-with-http-route-and-inline-certificate.latest.golden
@@ -0,0 +1,55 @@
+{
+  "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
+        }
+      },
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
+              {
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                },
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                }
+              }
+            ],
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
+                {
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/service"
+                }
+              ]
+            }
+          },
+          "sni":  "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+        }
+      }
+    }
+  ],
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
+}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden b/agent/xds/testdata/clusters/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden
deleted file mode 100644
index 6ffbd421e0686..0000000000000
--- a/agent/xds/testdata/clusters/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/service"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/api-gateway-with-http-route.latest.golden b/agent/xds/testdata/clusters/api-gateway-with-http-route.latest.golden
deleted file mode 100644
index 6ffbd421e0686..0000000000000
--- a/agent/xds/testdata/clusters/api-gateway-with-http-route.latest.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/service"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/api-gateway-with-multiple-inline-certificates.latest.golden b/agent/xds/testdata/clusters/api-gateway-with-multiple-inline-certificates.latest.golden
deleted file mode 100644
index 6ffbd421e0686..0000000000000
--- a/agent/xds/testdata/clusters/api-gateway-with-multiple-inline-certificates.latest.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/service"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/api-gateway-with-tcp-route-and-inline-certificate.latest.golden b/agent/xds/testdata/clusters/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
index 6ffbd421e0686..e20479dfd1cfc 100644
--- a/agent/xds/testdata/clusters/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
+++ b/agent/xds/testdata/clusters/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
@@ -1,55 +1,55 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/service"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/service"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-exported-to-peers.latest.golden b/agent/xds/testdata/clusters/connect-proxy-exported-to-peers.latest.golden
index 7d992a068e265..0d8375ae075ee 100644
--- a/agent/xds/testdata/clusters/connect-proxy-exported-to-peers.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-exported-to-peers.latest.golden
@@ -1,8 +1,10 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -22,11 +24,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.latest.golden b/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.latest.golden
index dc004b4e22040..15a17807e4342 100644
--- a/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.latest.golden
@@ -1,32 +1,44 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
+      "connectTimeout": "5s",
       "lbPolicy": "RING_HASH",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "ringHashLbConfig": {
-        "maximumRingSize": "30",
-        "minimumRingSize": "20"
+        "minimumRingSize": "20",
+        "maximumRingSize": "30"
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
       },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -37,40 +49,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -81,8 +101,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -90,19 +112,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -122,31 +142,41 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "something-else.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "something-else.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "something-else.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -157,24 +187,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/something-else"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "something-else.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
index 9a7a84c48bf98..aed47665204b3 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
@@ -1,180 +1,183 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "clusterType": {
-        "name": "envoy.clusters.aggregate",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
-          "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterType":  {
+        "name":  "envoy.clusters.aggregate",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
+          "clusters":  [
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.cluster-01.external.peer1.domain"
           ]
         }
       },
-      "connectTimeout": "33s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+      "connectTimeout":  "33s",
+      "lbPolicy":  "CLUSTER_PROVIDED"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "failover-target~db.default.cluster-01.external.peer1.domain",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "1s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {
+        "maxEjectionPercent":  100
+      },
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "peer1-root-1\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                  "exact":  "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "db.default.default.cluster-01.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "33s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/dc2/svc/db"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "peer1-root-1\n"
-              }
+              ]
             }
           },
-          "sni": "db.default.default.cluster-01.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
+          "sni":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
                 },
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app",
+      "type":  "STATIC",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "local_app",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "127.0.0.1",
+                      "portValue":  8080
                     }
                   }
                 }
@@ -182,11 +185,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.latest.golden
index a6c7b69749e67..8a6f88a866bb0 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.latest.golden
@@ -1,44 +1,56 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~fail.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+      "lbPolicy": "CLUSTER_PROVIDED"
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -49,44 +61,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~fail.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~fail.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -97,40 +119,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/fail"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "fail.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -141,8 +171,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -150,19 +182,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -182,11 +212,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.latest.golden
index d438330c606b1..fd63324de86c4 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.latest.golden
@@ -1,27 +1,49 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "78ebd528~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "78ebd528~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "66s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "78ebd528~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "66s",
+      "circuitBreakers": {
+
+      },
+      "typedExtensionProtocolOptions": {
+        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+          "explicitHttpConfig": {
+            "http2ProtocolOptions": {
+
+            }
+          }
+        }
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,48 +54,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS",
-      "typedExtensionProtocolOptions": {
-        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "explicitHttpConfig": {
-            "http2ProtocolOptions": {}
-          }
-        }
       }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -84,8 +106,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -93,19 +117,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -125,11 +147,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
index 820039ff1385e..70b94debf2087 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
@@ -1,115 +1,118 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.cluster-01.external.peer1.domain",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.cluster-01.external.peer1.domain",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "db.default.cluster-01.external.peer1.domain",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "1s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {
+        "maxEjectionPercent":  100
+      },
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "peer1-root-1\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/dc2/svc/db"
+                  "exact":  "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "peer1-root-1\n"
-              }
+              ]
             }
           },
-          "sni": "db.default.default.cluster-01.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
+          "sni":  "db.default.default.cluster-01.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
                 },
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app",
+      "type":  "STATIC",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "local_app",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "127.0.0.1",
+                      "portValue":  8080
                     }
                   }
                 }
@@ -117,11 +120,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.latest.golden
index 26f0e477774d5..e030aed25abc7 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,40 +44,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.some.other.service.mesh"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -76,8 +96,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -85,19 +107,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -117,11 +137,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-http2.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-http2.latest.golden
deleted file mode 100644
index f03d8c0ffcc9a..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-chain-http2.latest.golden
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS",
-      "typedExtensionProtocolOptions": {
-        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "explicitHttpConfig": {
-            "http2ProtocolOptions": {}
-          }
-        }
-      }
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain.latest.golden
index 69904e61ca163..69b7fbb652845 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-chain.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-chain.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,40 +44,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -76,8 +96,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -85,19 +107,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -117,11 +137,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-jwt-config-entry-with-local.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-jwt-config-entry-with-local.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-jwt-config-entry-with-local.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-jwt-config-entry-with-remote-jwks.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-jwt-config-entry-with-remote-jwks.latest.golden
deleted file mode 100644
index b3aeed5b63808..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-jwt-config-entry-with-remote-jwks.latest.golden
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "jwks_cluster_okta",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "test.test.com",
-                      "portValue": 443
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "jwks_cluster_okta",
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "validationContext": {
-              "trustedCa": {
-                "filename": "mycert.crt"
-              }
-            }
-          }
-        }
-      },
-      "type": "STATIC"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden
deleted file mode 100644
index d7aa33d71a7cf..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "15s",
-      "loadAssignment": {
-        "clusterName": "payments?peer=cloud:custom-upstream",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "1.2.3.4",
-                      "portValue": 8443
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "payments?peer=cloud:custom-upstream",
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/payments"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "payments.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
-        }
-      }
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-      "outlierDetection": {
-        "maxEjectionPercent": 100
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/refunds"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "refunds.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
-        }
-      },
-      "type": "EDS"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams-http2.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams-http2.latest.golden
deleted file mode 100644
index 091cbbb5aa1cb..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams-http2.latest.golden
+++ /dev/null
@@ -1,163 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
-      "loadAssignment": {
-        "clusterName": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "123.us-east-1.elb.notaws.com",
-                      "portValue": 8443
-                    }
-                  }
-                },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-      "outlierDetection": {
-        "maxEjectionPercent": 100
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/payments"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "payments.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
-        }
-      },
-      "type": "LOGICAL_DNS",
-      "typedExtensionProtocolOptions": {
-        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "explicitHttpConfig": {
-            "http2ProtocolOptions": {}
-          }
-        }
-      }
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-      "outlierDetection": {
-        "maxEjectionPercent": 100
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/refunds"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "refunds.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
-        }
-      },
-      "type": "EDS",
-      "typedExtensionProtocolOptions": {
-        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "explicitHttpConfig": {
-            "http2ProtocolOptions": {}
-          }
-        }
-      }
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams.latest.golden
index 018997d5d0b8b..29059b1435492 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-peered-upstreams.latest.golden
@@ -1,8 +1,10 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -22,19 +24,13 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
+      "name": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
         "endpoints": [
@@ -56,15 +52,27 @@
           }
         ]
       },
-      "name": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "circuitBreakers": {
+
+      },
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
       "outlierDetection": {
         "maxEjectionPercent": 100
       },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -75,45 +83,53 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/payments"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "payments.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "name": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
       "outlierDetection": {
         "maxEjectionPercent": 100
       },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -124,24 +140,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/refunds"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "refunds.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
index eeff916358296..e434b71c10fea 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
@@ -1,45 +1,57 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+      "lbPolicy": "CLUSTER_PROVIDED"
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -50,44 +62,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -98,44 +120,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -146,40 +178,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -190,8 +230,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -199,19 +241,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -231,11 +271,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden
index eeff916358296..e434b71c10fea 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden
@@ -1,45 +1,57 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+      "lbPolicy": "CLUSTER_PROVIDED"
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -50,44 +62,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -98,44 +120,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -146,40 +178,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -190,8 +230,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -199,19 +241,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -231,11 +271,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
index eeff916358296..e434b71c10fea 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
@@ -1,45 +1,57 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+      "lbPolicy": "CLUSTER_PROVIDED"
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -50,44 +62,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -98,44 +120,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -146,40 +178,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -190,8 +230,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -199,19 +241,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -231,11 +271,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
index eeff916358296..e434b71c10fea 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
@@ -1,45 +1,57 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+      "lbPolicy": "CLUSTER_PROVIDED"
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -50,44 +62,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -98,44 +120,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -146,40 +178,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -190,8 +230,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -199,19 +241,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -231,11 +271,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
index e5c67ced9193c..8a032b321122f 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
@@ -1,44 +1,56 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+      "lbPolicy": "CLUSTER_PROVIDED"
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -49,44 +61,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -97,40 +119,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -141,8 +171,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -150,19 +182,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -182,11 +212,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden
index e5c67ced9193c..8a032b321122f 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden
@@ -1,44 +1,56 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+      "lbPolicy": "CLUSTER_PROVIDED"
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -49,44 +61,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -97,40 +119,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -141,8 +171,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -150,19 +182,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -182,11 +212,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
index e5c67ced9193c..8a032b321122f 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
@@ -1,44 +1,56 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+      "lbPolicy": "CLUSTER_PROVIDED"
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -49,44 +61,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -97,40 +119,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -141,8 +171,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -150,19 +182,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -182,11 +212,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden
index e5c67ced9193c..8a032b321122f 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden
@@ -1,44 +1,56 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+      "lbPolicy": "CLUSTER_PROVIDED"
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -49,44 +61,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -97,40 +119,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -141,8 +171,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -150,19 +182,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -182,11 +212,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden
index 8f405e7dd3337..3efce306b73de 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden
@@ -1,27 +1,42 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+              "cipherSuites": [
+                "ECDHE-ECDSA-AES128-GCM-SHA256",
+                "ECDHE-ECDSA-CHACHA20-POLY1305"
+              ]
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,45 +47,51 @@
                 }
               }
             ],
-            "tlsParams": {
-              "cipherSuites": [
-                "ECDHE-ECDSA-AES128-GCM-SHA256",
-                "ECDHE-ECDSA-CHACHA20-POLY1305"
-              ]
-            },
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+              "cipherSuites": [
+                "ECDHE-ECDSA-AES128-GCM-SHA256",
+                "ECDHE-ECDSA-CHACHA20-POLY1305"
+              ]
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -81,13 +102,10 @@
                 }
               }
             ],
-            "tlsParams": {
-              "cipherSuites": [
-                "ECDHE-ECDSA-AES128-GCM-SHA256",
-                "ECDHE-ECDSA-CHACHA20-POLY1305"
-              ]
-            },
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -95,19 +113,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -127,11 +143,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-max-version.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-max-version.latest.golden
index 24554d780d29d..afef227a25ae1 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-max-version.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-max-version.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+              "tlsMaximumProtocolVersion": "TLSv1_2"
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,42 +44,48 @@
                 }
               }
             ],
-            "tlsParams": {
-              "tlsMaximumProtocolVersion": "TLSv1_2"
-            },
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+              "tlsMaximumProtocolVersion": "TLSv1_2"
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -78,10 +96,10 @@
                 }
               }
             ],
-            "tlsParams": {
-              "tlsMaximumProtocolVersion": "TLSv1_2"
-            },
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -89,19 +107,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -121,11 +137,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden
index 5a25e882ab312..2e3c9ea20e8ff 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,40 +44,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -76,8 +96,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -85,19 +107,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -117,11 +137,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version.latest.golden
index 29763283b9616..9d8c283a4ee0d 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version.latest.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+              "tlsMinimumProtocolVersion": "TLSv1_3"
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,42 +44,48 @@
                 }
               }
             ],
-            "tlsParams": {
-              "tlsMinimumProtocolVersion": "TLSv1_3"
-            },
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+              "tlsMinimumProtocolVersion": "TLSv1_3"
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -78,10 +96,10 @@
                 }
               }
             ],
-            "tlsParams": {
-              "tlsMinimumProtocolVersion": "TLSv1_3"
-            },
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -89,19 +107,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -121,11 +137,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/custom-limits-max-connections-only.latest.golden b/agent/xds/testdata/clusters/custom-limits-max-connections-only.latest.golden
index f2f27cd06f27f..e4b870241b316 100644
--- a/agent/xds/testdata/clusters/custom-limits-max-connections-only.latest.golden
+++ b/agent/xds/testdata/clusters/custom-limits-max-connections-only.latest.golden
@@ -1,9 +1,20 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
+      "edsClusterConfig": {
+        "edsConfig": {
+          "ads": {
+
+          },
+          "resourceApiVersion": "V3"
+        }
+      },
+      "connectTimeout": "5s",
       "circuitBreakers": {
         "thresholds": [
           {
@@ -11,23 +22,22 @@
           }
         ]
       },
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
+      "outlierDetection": {
+
       },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -38,25 +48,34 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
+      "edsClusterConfig": {
+        "edsConfig": {
+          "ads": {
+
+          },
+          "resourceApiVersion": "V3"
+        }
+      },
+      "connectTimeout": "5s",
       "circuitBreakers": {
         "thresholds": [
           {
@@ -64,20 +83,17 @@
           }
         ]
       },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
+      "outlierDetection": {
+
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -88,8 +104,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -97,19 +115,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -129,11 +145,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/custom-limits-set-to-zero.latest.golden b/agent/xds/testdata/clusters/custom-limits-set-to-zero.latest.golden
index d3e8277df935d..43b09aeae6aec 100644
--- a/agent/xds/testdata/clusters/custom-limits-set-to-zero.latest.golden
+++ b/agent/xds/testdata/clusters/custom-limits-set-to-zero.latest.golden
@@ -1,9 +1,20 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
+      "edsClusterConfig": {
+        "edsConfig": {
+          "ads": {
+
+          },
+          "resourceApiVersion": "V3"
+        }
+      },
+      "connectTimeout": "5s",
       "circuitBreakers": {
         "thresholds": [
           {
@@ -13,23 +24,22 @@
           }
         ]
       },
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
+      "outlierDetection": {
+
       },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -40,25 +50,34 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
+      "edsClusterConfig": {
+        "edsConfig": {
+          "ads": {
+
+          },
+          "resourceApiVersion": "V3"
+        }
+      },
+      "connectTimeout": "5s",
       "circuitBreakers": {
         "thresholds": [
           {
@@ -68,20 +87,17 @@
           }
         ]
       },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
+      "outlierDetection": {
+
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -92,8 +108,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -101,19 +119,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -133,11 +149,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/custom-limits.latest.golden b/agent/xds/testdata/clusters/custom-limits.latest.golden
index ac187b5ab0030..bbb8a3bac9346 100644
--- a/agent/xds/testdata/clusters/custom-limits.latest.golden
+++ b/agent/xds/testdata/clusters/custom-limits.latest.golden
@@ -1,9 +1,20 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
+      "edsClusterConfig": {
+        "edsConfig": {
+          "ads": {
+
+          },
+          "resourceApiVersion": "V3"
+        }
+      },
+      "connectTimeout": "5s",
       "circuitBreakers": {
         "thresholds": [
           {
@@ -13,23 +24,22 @@
           }
         ]
       },
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
+      "outlierDetection": {
+
       },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -40,25 +50,34 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
+      "edsClusterConfig": {
+        "edsConfig": {
+          "ads": {
+
+          },
+          "resourceApiVersion": "V3"
+        }
+      },
+      "connectTimeout": "5s",
       "circuitBreakers": {
         "thresholds": [
           {
@@ -68,20 +87,17 @@
           }
         ]
       },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
+      "outlierDetection": {
+
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -92,8 +108,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -101,19 +119,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -133,11 +149,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/custom-local-app.latest.golden b/agent/xds/testdata/clusters/custom-local-app.latest.golden
index 9e5f75c55b3e4..9b2bfb4f979f4 100644
--- a/agent/xds/testdata/clusters/custom-local-app.latest.golden
+++ b/agent/xds/testdata/clusters/custom-local-app.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,40 +44,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -76,8 +96,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -85,19 +107,16 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "mylocal",
       "connectTimeout": "15s",
       "loadAssignment": {
         "clusterName": "mylocal",
@@ -117,10 +136,9 @@
             ]
           }
         ]
-      },
-      "name": "mylocal"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/custom-max-inbound-connections.latest.golden b/agent/xds/testdata/clusters/custom-max-inbound-connections.latest.golden
index 8763544644cb2..2306689c775e3 100644
--- a/agent/xds/testdata/clusters/custom-max-inbound-connections.latest.golden
+++ b/agent/xds/testdata/clusters/custom-max-inbound-connections.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,40 +44,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -76,8 +96,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -85,26 +107,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {
-        "thresholds": [
-          {
-            "maxConnections": 3456
-          }
-        ]
-      },
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -125,10 +138,15 @@
           }
         ]
       },
-      "name": "local_app",
-      "type": "STATIC"
+      "circuitBreakers": {
+        "thresholds": [
+          {
+            "maxConnections": 3456
+          }
+        ]
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/custom-passive-healthcheck-zero-consecutive_5xx.latest.golden b/agent/xds/testdata/clusters/custom-passive-healthcheck-zero-consecutive_5xx.latest.golden
deleted file mode 100644
index 7ccbda45902db..0000000000000
--- a/agent/xds/testdata/clusters/custom-passive-healthcheck-zero-consecutive_5xx.latest.golden
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {
-        "baseEjectionTime": "10s",
-        "consecutive5xx": 5,
-        "enforcingConsecutive5xx": 0,
-        "interval": "10s",
-        "maxEjectionPercent": 100
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/custom-passive-healthcheck.latest.golden b/agent/xds/testdata/clusters/custom-passive-healthcheck.latest.golden
index 2f501e3ee8570..e00633358e579 100644
--- a/agent/xds/testdata/clusters/custom-passive-healthcheck.latest.golden
+++ b/agent/xds/testdata/clusters/custom-passive-healthcheck.latest.golden
@@ -1,33 +1,43 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
       "outlierDetection": {
-        "baseEjectionTime": "10s",
         "consecutive5xx": 5,
-        "enforcingConsecutive5xx": 80,
         "interval": "10s",
-        "maxEjectionPercent": 100
+        "enforcingConsecutive5xx": 80,
+        "maxEjectionPercent": 100,
+        "baseEjectionTime": "10s"
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
       },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -38,40 +48,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -82,8 +100,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -91,19 +111,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -123,11 +141,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/custom-timeouts.latest.golden b/agent/xds/testdata/clusters/custom-timeouts.latest.golden
index 688adfb4c5698..80b6f3cb9a407 100644
--- a/agent/xds/testdata/clusters/custom-timeouts.latest.golden
+++ b/agent/xds/testdata/clusters/custom-timeouts.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,40 +44,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -76,8 +96,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -85,19 +107,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "1.234s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -117,11 +137,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/custom-upstream-default-chain.latest.golden b/agent/xds/testdata/clusters/custom-upstream-default-chain.latest.golden
index 8ec7314419f19..20c2760e21bd4 100644
--- a/agent/xds/testdata/clusters/custom-upstream-default-chain.latest.golden
+++ b/agent/xds/testdata/clusters/custom-upstream-default-chain.latest.golden
@@ -1,23 +1,33 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -28,8 +38,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -37,19 +49,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -69,12 +79,11 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "myservice",
       "connectTimeout": "15s",
       "loadAssignment": {
         "clusterName": "myservice",
@@ -95,12 +104,14 @@
           }
         ]
       },
-      "name": "myservice",
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -111,16 +122,15 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -129,5 +139,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/custom-upstream-with-prepared-query.latest.golden b/agent/xds/testdata/clusters/custom-upstream-with-prepared-query.latest.golden
deleted file mode 100644
index b82511b15e2f9..0000000000000
--- a/agent/xds/testdata/clusters/custom-upstream-with-prepared-query.latest.golden
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "15s",
-      "loadAssignment": {
-        "clusterName": "db:custom-upstream",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "1.2.3.4",
-                      "portValue": 8443
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "db:custom-upstream",
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "db.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      }
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
-                },
-                {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
-            }
-          },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS",
-      "typedExtensionProtocolOptions": {
-        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "explicitHttpConfig": {
-            "http2ProtocolOptions": {}
-          }
-        }
-      }
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/custom-upstream.latest.golden b/agent/xds/testdata/clusters/custom-upstream.latest.golden
index 8ec7314419f19..20c2760e21bd4 100644
--- a/agent/xds/testdata/clusters/custom-upstream.latest.golden
+++ b/agent/xds/testdata/clusters/custom-upstream.latest.golden
@@ -1,23 +1,33 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -28,8 +38,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -37,19 +49,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -69,12 +79,11 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "myservice",
       "connectTimeout": "15s",
       "loadAssignment": {
         "clusterName": "myservice",
@@ -95,12 +104,14 @@
           }
         ]
       },
-      "name": "myservice",
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -111,16 +122,15 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -129,5 +139,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/defaults.latest.golden b/agent/xds/testdata/clusters/defaults.latest.golden
index 5a25e882ab312..2e3c9ea20e8ff 100644
--- a/agent/xds/testdata/clusters/defaults.latest.golden
+++ b/agent/xds/testdata/clusters/defaults.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,40 +44,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -76,8 +96,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -85,19 +107,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -117,11 +137,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.latest.golden b/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.latest.golden
index a6d0025aeca35..0fbc15b716f79 100644
--- a/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.latest.golden
+++ b/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,40 +44,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -76,8 +96,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -85,19 +107,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -116,11 +136,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/expose-checks.latest.golden b/agent/xds/testdata/clusters/expose-checks.latest.golden
deleted file mode 100644
index 59d8b46b80e29..0000000000000
--- a/agent/xds/testdata/clusters/expose-checks.latest.golden
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "exposed_cluster_8181",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8181
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "exposed_cluster_8181",
-      "type": "STATIC"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.latest.golden b/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.latest.golden
index 9bc45fc802957..b86715755a91a 100644
--- a/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.latest.golden
+++ b/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.latest.golden
@@ -1,8 +1,10 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "exposed_cluster_8090",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "exposed_cluster_8090",
@@ -22,12 +24,12 @@
             ]
           }
         ]
-      },
-      "name": "exposed_cluster_8090",
-      "type": "STATIC"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -48,19 +50,18 @@
           }
         ]
       },
-      "name": "local_app",
-      "type": "STATIC",
       "typedExtensionProtocolOptions": {
         "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
           "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "useDownstreamProtocolConfig": {
-            "http2ProtocolOptions": {},
-            "httpProtocolOptions": {}
+          "explicitHttpConfig": {
+            "http2ProtocolOptions": {
+
+            }
           }
         }
       }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/expose-paths-local-app-paths.latest.golden b/agent/xds/testdata/clusters/expose-paths-local-app-paths.latest.golden
index 7d992a068e265..0d8375ae075ee 100644
--- a/agent/xds/testdata/clusters/expose-paths-local-app-paths.latest.golden
+++ b/agent/xds/testdata/clusters/expose-paths-local-app-paths.latest.golden
@@ -1,8 +1,10 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -22,11 +24,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.latest.golden b/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.latest.golden
index 0c94321dbb68b..b42be025bb855 100644
--- a/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.latest.golden
+++ b/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.latest.golden
@@ -1,8 +1,10 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "exposed_cluster_9090",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "exposed_cluster_9090",
@@ -23,19 +25,21 @@
           }
         ]
       },
-      "name": "exposed_cluster_9090",
-      "type": "STATIC",
       "typedExtensionProtocolOptions": {
         "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
           "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
           "explicitHttpConfig": {
-            "http2ProtocolOptions": {}
+            "http2ProtocolOptions": {
+
+            }
           }
         }
       }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -55,11 +59,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-gateway-nil-config-entry.latest.golden b/agent/xds/testdata/clusters/ingress-gateway-nil-config-entry.latest.golden
index 04106b67f20ad..cd8f56517eb6f 100644
--- a/agent/xds/testdata/clusters/ingress-gateway-nil-config-entry.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-gateway-nil-config-entry.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-gateway-no-services.latest.golden b/agent/xds/testdata/clusters/ingress-gateway-no-services.latest.golden
index 04106b67f20ad..cd8f56517eb6f 100644
--- a/agent/xds/testdata/clusters/ingress-gateway-no-services.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-gateway-no-services.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden
index 5451b36da4879..6a64ad79bbf78 100644
--- a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden
@@ -1,27 +1,42 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+              "cipherSuites": [
+                "ECDHE-ECDSA-AES128-GCM-SHA256",
+                "ECDHE-ECDSA-CHACHA20-POLY1305"
+              ]
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,29 +47,22 @@
                 }
               }
             ],
-            "tlsParams": {
-              "cipherSuites": [
-                "ECDHE-ECDSA-AES128-GCM-SHA256",
-                "ECDHE-ECDSA-CHACHA20-POLY1305"
-              ]
-            },
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-max-version.latest.golden b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-max-version.latest.golden
index 6e1bd3beafd13..eb24656ebb3de 100644
--- a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-max-version.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-max-version.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+              "tlsMaximumProtocolVersion": "TLSv1_2"
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,26 +44,22 @@
                 }
               }
             ],
-            "tlsParams": {
-              "tlsMaximumProtocolVersion": "TLSv1_2"
-            },
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-min-version.latest.golden b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-min-version.latest.golden
index 17b04f2d27d06..1c29f4d251a76 100644
--- a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-min-version.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-min-version.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+              "tlsMinimumProtocolVersion": "TLSv1_3"
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,26 +44,22 @@
                 }
               }
             ],
-            "tlsParams": {
-              "tlsMinimumProtocolVersion": "TLSv1_3"
-            },
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-gateway.latest.golden b/agent/xds/testdata/clusters/ingress-gateway.latest.golden
index 699ed14e9cc25..332d1b2ea970e 100644
--- a/agent/xds/testdata/clusters/ingress-gateway.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-gateway.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,24 +44,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-lb-in-resolver.latest.golden b/agent/xds/testdata/clusters/ingress-lb-in-resolver.latest.golden
index ff94a34cac863..d99713992c478 100644
--- a/agent/xds/testdata/clusters/ingress-lb-in-resolver.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-lb-in-resolver.latest.golden
@@ -1,32 +1,44 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
+      "connectTimeout": "5s",
       "lbPolicy": "RING_HASH",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "ringHashLbConfig": {
-        "maximumRingSize": "30",
-        "minimumRingSize": "20"
+        "minimumRingSize": "20",
+        "maximumRingSize": "30"
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
       },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -37,44 +49,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "something-else.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "something-else.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "something-else.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -85,24 +107,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/something-else"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "something-else.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.latest.golden b/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.latest.golden
index 3d83307a008da..8927d8065ec83 100644
--- a/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,44 +44,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/bar"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -80,24 +102,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/foo"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
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
index 5280ee7a98b88..1de8a759d0643 100644
--- a/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "v1.db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "v1.db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v1.db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,44 +44,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "v1.db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "v2.db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "v2.db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v2.db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -80,24 +102,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "v2.db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-failover-to-cluster-peer.latest.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-failover-to-cluster-peer.latest.golden
index 17649071505c9..fbdfa6eede933 100644
--- a/agent/xds/testdata/clusters/ingress-with-chain-and-failover-to-cluster-peer.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-chain-and-failover-to-cluster-peer.latest.golden
@@ -1,121 +1,122 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "clusterType": {
-        "name": "envoy.clusters.aggregate",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
-          "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterType":  {
+        "name":  "envoy.clusters.aggregate",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
+          "clusters":  [
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.cluster-01.external.peer1.domain"
           ]
         }
       },
-      "connectTimeout": "33s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {}
+      "connectTimeout":  "33s",
+      "lbPolicy":  "CLUSTER_PROVIDED",
+      "outlierDetection":  {}
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "failover-target~db.default.cluster-01.external.peer1.domain",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "33s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {
+        "maxEjectionPercent":  100
+      },
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "peer1-root-1\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                  "exact":  "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "db.default.default.cluster-01.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "33s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/dc2/svc/db"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "peer1-root-1\n"
-              }
+              ]
             }
           },
-          "sni": "db.default.default.cluster-01.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
+          "sni":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-failover.latest.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-failover.latest.golden
index 8a2f77a98f719..b677b081cd61c 100644
--- a/agent/xds/testdata/clusters/ingress-with-chain-and-failover.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-chain-and-failover.latest.golden
@@ -1,45 +1,59 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~fail.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
       "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {}
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -50,44 +64,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~fail.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~fail.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -98,24 +122,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/fail"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "fail.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-chain-external-sni.latest.golden b/agent/xds/testdata/clusters/ingress-with-chain-external-sni.latest.golden
index e1dedd23fc2b2..345d7d2d8b8d8 100644
--- a/agent/xds/testdata/clusters/ingress-with-chain-external-sni.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-chain-external-sni.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,24 +44,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.some.other.service.mesh"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-chain.latest.golden b/agent/xds/testdata/clusters/ingress-with-chain.latest.golden
index 3c3dec4ccf0ea..88f1f67978078 100644
--- a/agent/xds/testdata/clusters/ingress-with-chain.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-chain.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,24 +44,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-defaults-passive-health-check.latest.golden b/agent/xds/testdata/clusters/ingress-with-defaults-passive-health-check.latest.golden
index 854e52edbd2e8..fbbcc9856c65f 100644
--- a/agent/xds/testdata/clusters/ingress-with-defaults-passive-health-check.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-defaults-passive-health-check.latest.golden
@@ -1,9 +1,20 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
+      "edsClusterConfig": {
+        "edsConfig": {
+          "ads": {
+
+          },
+          "resourceApiVersion": "V3"
+        }
+      },
+      "connectTimeout": "33s",
       "circuitBreakers": {
         "thresholds": [
           {
@@ -13,28 +24,24 @@
           }
         ]
       },
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "outlierDetection": {
         "consecutive5xx": 10,
-        "enforcingConsecutive5xx": 80,
         "interval": "5s",
-        "maxEjectionPercent": 90
+        "enforcingConsecutive5xx": 80
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
       },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -45,24 +52,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-defaults-service-max-connections.latest.golden b/agent/xds/testdata/clusters/ingress-with-defaults-service-max-connections.latest.golden
index bd9ac9dcb6615..24bb5835d7d64 100644
--- a/agent/xds/testdata/clusters/ingress-with-defaults-service-max-connections.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-defaults-service-max-connections.latest.golden
@@ -1,9 +1,20 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
+      "edsClusterConfig": {
+        "edsConfig": {
+          "ads": {
+
+          },
+          "resourceApiVersion": "V3"
+        }
+      },
+      "connectTimeout": "33s",
       "circuitBreakers": {
         "thresholds": [
           {
@@ -13,23 +24,22 @@
           }
         ]
       },
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
+      "outlierDetection": {
+
       },
-      "connectTimeout": "33s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -40,24 +50,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-passive-health-check.latest.golden b/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-passive-health-check.latest.golden
index 63621f39f60af..6c9e0802a3dcc 100644
--- a/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-passive-health-check.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-passive-health-check.latest.golden
@@ -1,9 +1,20 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
+      "edsClusterConfig": {
+        "edsConfig": {
+          "ads": {
+
+          },
+          "resourceApiVersion": "V3"
+        }
+      },
+      "connectTimeout": "33s",
       "circuitBreakers": {
         "thresholds": [
           {
@@ -12,28 +23,23 @@
           }
         ]
       },
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "outlierDetection": {
-        "baseEjectionTime": "12s",
-        "enforcingConsecutive5xx": 50,
         "interval": "8s",
-        "maxEjectionPercent": 90
+        "enforcingConsecutive5xx": 50
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
       },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -44,24 +50,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-service-max-connections.latest.golden b/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-service-max-connections.latest.golden
index f38254450d940..2ea775950303c 100644
--- a/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-service-max-connections.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-service-max-connections.latest.golden
@@ -1,9 +1,20 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
+      "edsClusterConfig": {
+        "edsConfig": {
+          "ads": {
+
+          },
+          "resourceApiVersion": "V3"
+        }
+      },
+      "connectTimeout": "33s",
       "circuitBreakers": {
         "thresholds": [
           {
@@ -12,23 +23,22 @@
           }
         ]
       },
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
+      "outlierDetection": {
+
       },
-      "connectTimeout": "33s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -39,24 +49,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-service-passive-health-check.latest.golden b/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-service-passive-health-check.latest.golden
new file mode 100644
index 0000000000000..8fb725c90185a
--- /dev/null
+++ b/agent/xds/testdata/clusters/ingress-with-overwrite-defaults-service-passive-health-check.latest.golden
@@ -0,0 +1,71 @@
+{
+  "versionInfo": "00000001",
+  "resources": [
+    {
+      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
+      "edsClusterConfig": {
+        "edsConfig": {
+          "ads": {
+
+          },
+          "resourceApiVersion": "V3"
+        }
+      },
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+        "thresholds": [
+          {
+            "maxConnections": 4096,
+            "maxPendingRequests": 2048
+          }
+        ]
+      },
+      "outlierDetection": {
+          "interval": "8s",
+          "enforcingConsecutive5xx": 50
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
+      "transportSocket": {
+        "name": "tls",
+        "typedConfig": {
+          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext": {
+            "tlsParams": {
+
+            },
+            "tlsCertificates": [
+              {
+                "certificateChain": {
+                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                },
+                "privateKey": {
+                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                }
+              }
+            ],
+            "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames": [
+                {
+                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
+                }
+              ]
+            }
+          },
+          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+        }
+      }
+    }
+  ],
+  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce": "00000001"
+}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-service-max-connections.latest.golden b/agent/xds/testdata/clusters/ingress-with-service-max-connections.latest.golden
index e8c73c3b771c6..3ac392d40117a 100644
--- a/agent/xds/testdata/clusters/ingress-with-service-max-connections.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-service-max-connections.latest.golden
@@ -1,9 +1,20 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
+      "edsClusterConfig": {
+        "edsConfig": {
+          "ads": {
+
+          },
+          "resourceApiVersion": "V3"
+        }
+      },
+      "connectTimeout": "33s",
       "circuitBreakers": {
         "thresholds": [
           {
@@ -11,23 +22,22 @@
           }
         ]
       },
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
+      "outlierDetection": {
+
       },
-      "connectTimeout": "33s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -38,24 +48,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-service-passive-health-check.latest.golden b/agent/xds/testdata/clusters/ingress-with-service-passive-health-check.latest.golden
index 5bea45a5757c4..892846151b9a3 100644
--- a/agent/xds/testdata/clusters/ingress-with-service-passive-health-check.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-service-passive-health-check.latest.golden
@@ -1,9 +1,20 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
+      "edsClusterConfig": {
+        "edsConfig": {
+          "ads": {
+
+          },
+          "resourceApiVersion": "V3"
+        }
+      },
+      "connectTimeout": "33s",
       "circuitBreakers": {
         "thresholds": [
           {
@@ -11,27 +22,23 @@
           }
         ]
       },
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "outlierDetection": {
         "consecutive5xx": 10,
-        "interval": "5s",
-        "maxEjectionPercent": 90
+        "interval": "5s"
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
       },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -42,24 +49,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
index 36da92cce8f24..5c4efef3d7289 100644
--- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
@@ -1,46 +1,60 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
       "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {}
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -51,44 +65,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -99,44 +123,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -147,24 +181,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden
index 36da92cce8f24..5c4efef3d7289 100644
--- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden
@@ -1,46 +1,60 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
       "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {}
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -51,44 +65,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -99,44 +123,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -147,24 +181,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
index 36da92cce8f24..5c4efef3d7289 100644
--- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
@@ -1,46 +1,60 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
       "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {}
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -51,44 +65,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -99,44 +123,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -147,24 +181,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
index 36da92cce8f24..5c4efef3d7289 100644
--- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
@@ -1,46 +1,60 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
       "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {}
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -51,44 +65,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -99,44 +123,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -147,24 +181,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc3/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
index 37a8bbfcdc170..7bec8f6fe7dd6 100644
--- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
@@ -1,45 +1,59 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
       "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {}
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -50,44 +64,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -98,24 +122,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden
index 37a8bbfcdc170..7bec8f6fe7dd6 100644
--- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden
@@ -1,45 +1,59 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
       "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {}
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -50,44 +64,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -98,24 +122,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
index 37a8bbfcdc170..7bec8f6fe7dd6 100644
--- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
@@ -1,45 +1,59 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
       "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {}
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -50,44 +64,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -98,24 +122,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden
index 37a8bbfcdc170..7bec8f6fe7dd6 100644
--- a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden
+++ b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden
@@ -1,45 +1,59 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "clusterType": {
         "name": "envoy.clusters.aggregate",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
           "clusters": [
-            "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-            "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+            "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+            "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
           ]
         }
       },
       "connectTimeout": "33s",
       "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {}
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -50,44 +64,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "name": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -98,24 +122,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/local-mesh-gateway-with-peered-upstreams.latest.golden b/agent/xds/testdata/clusters/local-mesh-gateway-with-peered-upstreams.latest.golden
index 018997d5d0b8b..29059b1435492 100644
--- a/agent/xds/testdata/clusters/local-mesh-gateway-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/clusters/local-mesh-gateway-with-peered-upstreams.latest.golden
@@ -1,8 +1,10 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -22,19 +24,13 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
+      "name": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
         "endpoints": [
@@ -56,15 +52,27 @@
           }
         ]
       },
-      "name": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "circuitBreakers": {
+
+      },
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
       "outlierDetection": {
         "maxEjectionPercent": 100
       },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -75,45 +83,53 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/payments"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "payments.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "name": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
       "outlierDetection": {
         "maxEjectionPercent": 100
       },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -124,24 +140,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/refunds"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "refunds.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.latest.golden
index 2374ba211b365..0d001e0b78180 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.latest.golden
@@ -1,37 +1,45 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -53,15 +61,17 @@
           }
         ]
       },
-      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -83,50 +93,64 @@
           }
         ]
       },
-      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.latest.golden
index 2374ba211b365..0d001e0b78180 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.latest.golden
@@ -1,37 +1,45 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -53,15 +61,17 @@
           }
         ]
       },
-      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -83,50 +93,64 @@
           }
         ]
       },
-      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-no-services.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-no-services.latest.golden
index 04106b67f20ad..cd8f56517eb6f 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-no-services.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-no-services.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.latest.golden
index b43674c945090..1d6b63996be7f 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.latest.golden
@@ -1,41 +1,49 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
+      "connectTimeout": "5s",
       "lbPolicy": "LEAST_REQUEST",
+      "outlierDetection": {
+
+      },
       "leastRequestLbConfig": {
         "choiceCount": 5
-      },
-      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -57,15 +65,17 @@
           }
         ]
       },
-      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -87,58 +97,72 @@
           }
         ]
       },
-      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
+      "connectTimeout": "5s",
       "lbPolicy": "LEAST_REQUEST",
+      "outlierDetection": {
+
+      },
       "leastRequestLbConfig": {
         "choiceCount": 5
-      },
-      "name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
+      "connectTimeout": "5s",
       "lbPolicy": "LEAST_REQUEST",
+      "outlierDetection": {
+
+      },
       "leastRequestLbConfig": {
         "choiceCount": 5
-      },
-      "name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-peering-control-plane.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-peering-control-plane.latest.golden
index 5aa517fb5d7ca..a16659b28a550 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-peering-control-plane.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-peering-control-plane.latest.golden
@@ -1,20 +1,24 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "server.dc1.peering.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "server.dc1.peering.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-subsets.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-service-subsets.latest.golden
index 2374ba211b365..0d001e0b78180 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-service-subsets.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-service-subsets.latest.golden
@@ -1,37 +1,45 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -53,15 +61,17 @@
           }
         ]
       },
-      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -83,50 +93,64 @@
           }
         ]
       },
-      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.latest.golden
index c6b34b0f3fb8e..e6ff978acb4e7 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.latest.golden
@@ -1,37 +1,45 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "10s",
+      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "10s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -53,15 +61,17 @@
           }
         ]
       },
-      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -83,50 +93,64 @@
           }
         ]
       },
-      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "10s",
+      "name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "10s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "10s",
+      "name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "10s",
+      "outlierDetection": {
+
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-tcp-keepalives.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-tcp-keepalives.latest.golden
index a47ca5c369bb1..b2204c59acfb7 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-tcp-keepalives.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-tcp-keepalives.latest.golden
@@ -1,44 +1,52 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS",
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
       "upstreamConnectionOptions": {
         "tcpKeepalive": {
-          "keepaliveInterval": 60,
           "keepaliveProbes": 7,
-          "keepaliveTime": 120
+          "keepaliveTime": 120,
+          "keepaliveInterval": 60
         }
       }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -60,22 +68,24 @@
           }
         ]
       },
-      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS",
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "upstreamConnectionOptions": {
         "tcpKeepalive": {
-          "keepaliveInterval": 60,
           "keepaliveProbes": 7,
-          "keepaliveTime": 120
+          "keepaliveTime": 120,
+          "keepaliveInterval": 60
         }
       }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -97,31 +107,37 @@
           }
         ]
       },
-      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS",
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "upstreamConnectionOptions": {
         "tcpKeepalive": {
-          "keepaliveInterval": 60,
           "keepaliveProbes": 7,
-          "keepaliveTime": 120
+          "keepaliveTime": 120,
+          "keepaliveInterval": 60
         }
       }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-using-federation-control-plane.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-using-federation-control-plane.latest.golden
deleted file mode 100644
index 5568bf15ed9dc..0000000000000
--- a/agent/xds/testdata/clusters/mesh-gateway-using-federation-control-plane.latest.golden
+++ /dev/null
@@ -1,205 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
-      "loadAssignment": {
-        "clusterName": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "123.us-west-2.elb.notaws.com",
-                      "portValue": 443
-                    }
-                  }
-                },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
-      "loadAssignment": {
-        "clusterName": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "123.us-east-1.elb.notaws.com",
-                      "portValue": 443
-                    }
-                  }
-                },
-                "healthStatus": "UNHEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "node1.server.dc1.consul",
-      "outlierDetection": {},
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "node2.server.dc1.consul",
-      "outlierDetection": {},
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "server.dc2.consul",
-      "outlierDetection": {},
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
-      "loadAssignment": {
-        "clusterName": "server.dc4.consul",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "123.us-west-2.elb.notaws.com",
-                      "portValue": 443
-                    }
-                  }
-                },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "server.dc4.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
-      "loadAssignment": {
-        "clusterName": "server.dc6.consul",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "123.us-east-1.elb.notaws.com",
-                      "portValue": 443
-                    }
-                  }
-                },
-                "healthStatus": "UNHEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "server.dc6.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.latest.golden
index caa140aac2d50..bc9669beff36b 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.latest.golden
@@ -1,37 +1,45 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -53,15 +61,17 @@
           }
         ]
       },
-      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -83,24 +93,30 @@
           }
         ]
       },
-      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
index f420e3236f1cd..8c85bbc827ad1 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
@@ -1,66 +1,73 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "alt.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "alt.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "exported~alt.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName": "exported~alt.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "exported~alt.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
       "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
         }
       },
-      "name": "exported~alt.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -71,44 +78,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/alt"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "alt.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "exported~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "exported~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "exported~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -119,44 +136,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "exported~v2.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "exported~v2.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "exported~v2.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -167,50 +194,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/api"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "v2.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "v1.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "v2.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http.latest.golden
index 3c41ffedbce95..a41025e9fd8d4 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services-http.latest.golden
@@ -1,40 +1,56 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "exported~bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "exported~bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "exported~bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -45,44 +61,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/bar"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "exported~foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "exported~foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "exported~foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -93,44 +119,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/foo"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "exported~gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "exported~gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "exported~gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -141,50 +177,56 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/gir"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services.latest.golden
index deba3d5c3e7a1..eea8fc86ac970 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-with-exported-peered-services.latest.golden
@@ -1,100 +1,136 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "exported~bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "exported~bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "exported~bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "exported~foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "exported~foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "exported~foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "exported~gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "exported~gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "exported~gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-with-imported-peered-services.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-with-imported-peered-services.latest.golden
index f9a606aed12b7..88f75c8868909 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-with-imported-peered-services.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-with-imported-peered-services.latest.golden
@@ -1,11 +1,11 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "alt.default.default.peer-b.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "alt.default.default.peer-b.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
         "endpoints": [
@@ -27,24 +27,30 @@
           }
         ]
       },
-      "name": "alt.default.default.peer-b.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-      "outlierDetection": {},
-      "type": "STRICT_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "db.default.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
index 462e9f406b62d..8ab3fe5761a20 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
@@ -1,48 +1,48 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "server.dc2.peering.6d942ff2-6a78-46f4-a52f-915e26c48797",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "server.dc2.peering.6d942ff2-6a78-46f4-a52f-915e26c48797",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout":  "5s",
+      "outlierDetection":  {}
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "server.dc2.peering.f3f41279-001d-42bb-912e-f6103fb036b8",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "server.dc2.peering.f3f41279-001d-42bb-912e-f6103fb036b8",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout":  "5s",
+      "outlierDetection":  {}
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
-      "loadAssignment": {
-        "clusterName": "server.dc3.peering.f622dc37-7238-4485-ab58-0f53864a9ae5",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "server.dc3.peering.f622dc37-7238-4485-ab58-0f53864a9ae5",
+      "type":  "LOGICAL_DNS",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "server.dc3.peering.f622dc37-7238-4485-ab58-0f53864a9ae5",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "my-load-balancer-1234567890abcdef.elb.us-east-2.amazonaws.com",
-                      "portValue": 8080
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "my-load-balancer-1234567890abcdef.elb.us-east-2.amazonaws.com",
+                      "portValue":  8080
                     }
                   }
                 }
@@ -51,11 +51,11 @@
           }
         ]
       },
-      "name": "server.dc3.peering.f622dc37-7238-4485-ab58-0f53864a9ae5",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate":  "10s",
+      "dnsLookupFamily":  "V4_ONLY",
+      "outlierDetection":  {}
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway.latest.golden b/agent/xds/testdata/clusters/mesh-gateway.latest.golden
index caa140aac2d50..bc9669beff36b 100644
--- a/agent/xds/testdata/clusters/mesh-gateway.latest.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway.latest.golden
@@ -1,37 +1,45 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -53,15 +61,17 @@
           }
         ]
       },
-      "name": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -83,24 +93,30 @@
           }
         ]
       },
-      "name": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "EDS"
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/clusters/splitter-with-resolver-redirect.latest.golden
index 72e8c720e9b28..9296b8bd751da 100644
--- a/agent/xds/testdata/clusters/splitter-with-resolver-redirect.latest.golden
+++ b/agent/xds/testdata/clusters/splitter-with-resolver-redirect.latest.golden
@@ -1,23 +1,33 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -28,8 +38,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -37,19 +49,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -69,31 +79,41 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "v1.db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "v1.db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v1.db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -104,44 +124,54 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "v1.db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "v2.db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "v2.db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v2.db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -152,24 +182,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "v2.db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/telemetry-collector.latest.golden b/agent/xds/testdata/clusters/telemetry-collector.latest.golden
index d9c8f4f8b8ccc..0f936dbf4e93d 100644
--- a/agent/xds/testdata/clusters/telemetry-collector.latest.golden
+++ b/agent/xds/testdata/clusters/telemetry-collector.latest.golden
@@ -1,171 +1,173 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "consul-telemetry-collector.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "consul-telemetry-collector.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "consul-telemetry-collector.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
+        }
       },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "typedExtensionProtocolOptions":  {
+        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions":  {
+          "@type":  "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+          "explicitHttpConfig":  {
+            "http2ProtocolOptions":  {}
+          }
         }
       },
-      "name": "consul-telemetry-collector.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "outlierDetection":  {},
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/consul-telemetry-collector"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/consul-telemetry-collector"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "consul-telemetry-collector.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS",
-      "typedExtensionProtocolOptions": {
-        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "explicitHttpConfig": {
-            "http2ProtocolOptions": {}
-          }
+          "sni":  "consul-telemetry-collector.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
       }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "altStatName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
+      },
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "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/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsCertificates": [
+      "connectTimeout":  "5s",
+      "circuitBreakers":  {},
+      "outlierDetection":  {},
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
                 },
                 {
-                  "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
+                  "exact":  "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
-          "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
+          "sni":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "local_app",
-        "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app",
+      "type":  "STATIC",
+      "connectTimeout":  "5s",
+      "loadAssignment":  {
+        "clusterName":  "local_app",
+        "endpoints":  [
           {
-            "lbEndpoints": [
+            "lbEndpoints":  [
               {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
+                "endpoint":  {
+                  "address":  {
+                    "socketAddress":  {
+                      "address":  "127.0.0.1",
+                      "portValue":  8080
                     }
                   }
                 }
@@ -173,11 +175,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.latest.golden
index 6f77e8d92b854..3bf0c6eb4cba1 100644
--- a/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.latest.golden
+++ b/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.latest.golden
@@ -1,11 +1,11 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -27,13 +27,19 @@
           }
         ]
       },
-      "name": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -44,7 +50,6 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -52,14 +57,13 @@
             }
           }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -81,13 +85,19 @@
           }
         ]
       },
-      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -98,7 +108,6 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -106,14 +115,13 @@
             }
           }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -135,15 +143,17 @@
           }
         ]
       },
-      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -165,15 +175,17 @@
           }
         ]
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -195,27 +207,36 @@
           }
         ]
       },
-      "name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -223,10 +244,9 @@
             }
           }
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/terminating-gateway-http2-upstream-subsets.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-http2-upstream-subsets.latest.golden
index 75150c9fd3659..953a207e68b66 100644
--- a/agent/xds/testdata/clusters/terminating-gateway-http2-upstream-subsets.latest.golden
+++ b/agent/xds/testdata/clusters/terminating-gateway-http2-upstream-subsets.latest.golden
@@ -1,11 +1,11 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -27,14 +27,29 @@
           }
         ]
       },
-      "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "typedExtensionProtocolOptions": {
+        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+          "explicitHttpConfig": {
+            "http2ProtocolOptions": {
+
+            }
+          }
+        }
+      },
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -42,22 +57,13 @@
             }
           }
         }
-      },
-      "type": "LOGICAL_DNS",
-      "typedExtensionProtocolOptions": {
-        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "explicitHttpConfig": {
-            "http2ProtocolOptions": {}
-          }
-        }
       }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -79,14 +85,29 @@
           }
         ]
       },
-      "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "typedExtensionProtocolOptions": {
+        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+          "explicitHttpConfig": {
+            "http2ProtocolOptions": {
+
+            }
+          }
+        }
+      },
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -94,22 +115,13 @@
             }
           }
         }
-      },
-      "type": "LOGICAL_DNS",
-      "typedExtensionProtocolOptions": {
-        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "explicitHttpConfig": {
-            "http2ProtocolOptions": {}
-          }
-        }
       }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -131,14 +143,29 @@
           }
         ]
       },
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "typedExtensionProtocolOptions": {
+        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+          "explicitHttpConfig": {
+            "http2ProtocolOptions": {
+
+            }
+          }
+        }
+      },
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -146,18 +173,9 @@
             }
           }
         }
-      },
-      "type": "LOGICAL_DNS",
-      "typedExtensionProtocolOptions": {
-        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "explicitHttpConfig": {
-            "http2ProtocolOptions": {}
-          }
-        }
       }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/terminating-gateway-http2-upstream.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-http2-upstream.latest.golden
index 70be44beb0128..9a8e2bdf43969 100644
--- a/agent/xds/testdata/clusters/terminating-gateway-http2-upstream.latest.golden
+++ b/agent/xds/testdata/clusters/terminating-gateway-http2-upstream.latest.golden
@@ -1,11 +1,11 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -27,14 +27,29 @@
           }
         ]
       },
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "typedExtensionProtocolOptions": {
+        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+          "explicitHttpConfig": {
+            "http2ProtocolOptions": {
+
+            }
+          }
+        }
+      },
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -42,18 +57,9 @@
             }
           }
         }
-      },
-      "type": "LOGICAL_DNS",
-      "typedExtensionProtocolOptions": {
-        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "explicitHttpConfig": {
-            "http2ProtocolOptions": {}
-          }
-        }
       }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.latest.golden
index 067195261be88..d2efb57f5db44 100644
--- a/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.latest.golden
+++ b/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.latest.golden
@@ -1,11 +1,11 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -27,13 +27,19 @@
           }
         ]
       },
-      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -44,7 +50,6 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -52,14 +57,13 @@
             }
           }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -81,15 +85,17 @@
           }
         ]
       },
-      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -111,27 +117,36 @@
           }
         ]
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -139,26 +154,32 @@
             }
           }
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -166,26 +187,32 @@
             }
           }
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -193,10 +220,9 @@
             }
           }
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/terminating-gateway-lb-config.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-lb-config.latest.golden
index 2820af6f1e977..a505f4f785f14 100644
--- a/agent/xds/testdata/clusters/terminating-gateway-lb-config.latest.golden
+++ b/agent/xds/testdata/clusters/terminating-gateway-lb-config.latest.golden
@@ -1,11 +1,11 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -27,13 +27,19 @@
           }
         ]
       },
-      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -44,7 +50,6 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -52,14 +57,13 @@
             }
           }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -81,15 +85,17 @@
           }
         ]
       },
-      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -111,32 +117,41 @@
           }
         ]
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
+      "connectTimeout": "5s",
       "lbPolicy": "RING_HASH",
-      "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "outlierDetection": {
+
+      },
       "ringHashLbConfig": {
-        "maximumRingSize": "50",
-        "minimumRingSize": "20"
+        "minimumRingSize": "20",
+        "maximumRingSize": "50"
       },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -144,31 +159,37 @@
             }
           }
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
+      "connectTimeout": "5s",
       "lbPolicy": "RING_HASH",
-      "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "outlierDetection": {
+
+      },
       "ringHashLbConfig": {
-        "maximumRingSize": "50",
-        "minimumRingSize": "20"
+        "minimumRingSize": "20",
+        "maximumRingSize": "50"
       },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -176,31 +197,37 @@
             }
           }
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
+      "connectTimeout": "5s",
       "lbPolicy": "RING_HASH",
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "outlierDetection": {
+
+      },
       "ringHashLbConfig": {
-        "maximumRingSize": "50",
-        "minimumRingSize": "20"
+        "minimumRingSize": "20",
+        "maximumRingSize": "50"
       },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -208,10 +235,9 @@
             }
           }
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/terminating-gateway-no-services.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-no-services.latest.golden
index 04106b67f20ad..cd8f56517eb6f 100644
--- a/agent/xds/testdata/clusters/terminating-gateway-no-services.latest.golden
+++ b/agent/xds/testdata/clusters/terminating-gateway-no-services.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/terminating-gateway-service-subsets.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-service-subsets.latest.golden
index eebba5aef3586..87cf1d771822e 100644
--- a/agent/xds/testdata/clusters/terminating-gateway-service-subsets.latest.golden
+++ b/agent/xds/testdata/clusters/terminating-gateway-service-subsets.latest.golden
@@ -1,11 +1,11 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -27,13 +27,19 @@
           }
         ]
       },
-      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -44,7 +50,6 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -52,14 +57,13 @@
             }
           }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -81,15 +85,17 @@
           }
         ]
       },
-      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -111,15 +117,17 @@
           }
         ]
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -141,27 +149,36 @@
           }
         ]
       },
-      "name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -169,26 +186,32 @@
             }
           }
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -196,26 +219,32 @@
             }
           }
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -223,10 +252,9 @@
             }
           }
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/terminating-gateway-sni.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-sni.latest.golden
index 160e9bfdffcd2..5b784eabc7738 100644
--- a/agent/xds/testdata/clusters/terminating-gateway-sni.latest.golden
+++ b/agent/xds/testdata/clusters/terminating-gateway-sni.latest.golden
@@ -1,11 +1,11 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -27,13 +27,19 @@
           }
         ]
       },
-      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -44,28 +50,26 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "filename": "ca.cert.pem"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "bar.com"
                 }
-              ],
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
+              ]
             }
           },
           "sni": "bar.com"
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -87,15 +91,17 @@
           }
         ]
       },
-      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -117,44 +123,52 @@
           }
         ]
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
+              "trustedCa": {
+                "filename": "ca.cert.pem"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "foo.com"
                 }
-              ],
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
+              ]
             }
           },
           "sni": "foo.com"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/terminating-gateway-tcp-keepalives.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-tcp-keepalives.latest.golden
index b3533ea3196b1..1ab63951c741d 100644
--- a/agent/xds/testdata/clusters/terminating-gateway-tcp-keepalives.latest.golden
+++ b/agent/xds/testdata/clusters/terminating-gateway-tcp-keepalives.latest.golden
@@ -1,11 +1,11 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -27,13 +27,19 @@
           }
         ]
       },
-      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -44,7 +50,6 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -53,20 +58,19 @@
           }
         }
       },
-      "type": "LOGICAL_DNS",
       "upstreamConnectionOptions": {
         "tcpKeepalive": {
-          "keepaliveInterval": 27,
           "keepaliveProbes": 5,
-          "keepaliveTime": 133
+          "keepaliveTime": 133,
+          "keepaliveInterval": 27
         }
       }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -88,22 +92,24 @@
           }
         ]
       },
-      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS",
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "upstreamConnectionOptions": {
         "tcpKeepalive": {
-          "keepaliveInterval": 27,
           "keepaliveProbes": 5,
-          "keepaliveTime": 133
+          "keepaliveTime": 133,
+          "keepaliveInterval": 27
         }
       }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -125,34 +131,43 @@
           }
         ]
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS",
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "upstreamConnectionOptions": {
         "tcpKeepalive": {
-          "keepaliveInterval": 27,
           "keepaliveProbes": 5,
-          "keepaliveTime": 133
+          "keepaliveTime": 133,
+          "keepaliveInterval": 27
         }
       }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -161,16 +176,15 @@
           }
         }
       },
-      "type": "EDS",
       "upstreamConnectionOptions": {
         "tcpKeepalive": {
-          "keepaliveInterval": 27,
           "keepaliveProbes": 5,
-          "keepaliveTime": 133
+          "keepaliveTime": 133,
+          "keepaliveInterval": 27
         }
       }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/terminating-gateway.latest.golden b/agent/xds/testdata/clusters/terminating-gateway.latest.golden
index 07cf25087bd1c..343730b5c0d3d 100644
--- a/agent/xds/testdata/clusters/terminating-gateway.latest.golden
+++ b/agent/xds/testdata/clusters/terminating-gateway.latest.golden
@@ -1,11 +1,11 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -27,13 +27,19 @@
           }
         ]
       },
-      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -44,7 +50,6 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -52,14 +57,13 @@
             }
           }
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -81,15 +85,17 @@
           }
         ]
       },
-      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -111,27 +117,36 @@
           }
         ]
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
+      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
               "trustedCa": {
                 "filename": "ca.cert.pem"
@@ -139,10 +154,9 @@
             }
           }
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.latest.golden
index 3a3556a8617d8..6b2c84d60c59e 100644
--- a/agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.latest.golden
+++ b/agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,40 +44,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -76,8 +96,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -85,38 +107,46 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -127,25 +157,25 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -165,31 +195,41 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -200,24 +240,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/no-endpoints"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/transparent-proxy-destination-http.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-destination-http.latest.golden
index 43ffe1773a932..e3c9f59ff06e5 100644
--- a/agent/xds/testdata/clusters/transparent-proxy-destination-http.latest.golden
+++ b/agent/xds/testdata/clusters/transparent-proxy-destination-http.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,43 +44,51 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -79,43 +99,51 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.192-168-2-2.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "destination.192-168-2-2.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "destination.192-168-2-2.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -126,43 +154,51 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka2"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "destination.192-168-2-2.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.192-168-2-3.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "destination.192-168-2-3.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "destination.192-168-2-3.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -173,43 +209,51 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka2"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "destination.192-168-2-3.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -220,40 +264,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -264,8 +316,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -273,19 +327,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -305,11 +357,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/transparent-proxy-destination.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-destination.latest.golden
index 3fdcc1c264867..dd5d736e5d305 100644
--- a/agent/xds/testdata/clusters/transparent-proxy-destination.latest.golden
+++ b/agent/xds/testdata/clusters/transparent-proxy-destination.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,43 +44,51 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -79,43 +99,51 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.192-168-2-2.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "destination.192-168-2-2.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "destination.192-168-2-2.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -126,43 +154,51 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "destination.192-168-2-2.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.api-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "destination.api-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "destination.api-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -173,43 +209,51 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "destination.api-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -220,40 +264,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -264,8 +316,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -273,19 +327,17 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -305,11 +357,9 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.latest.golden
index 490ef2d07c19f..ff729a66d2ccc 100644
--- a/agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.latest.golden
+++ b/agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,40 +44,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -76,8 +96,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -85,38 +107,46 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -127,25 +157,25 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -165,31 +195,41 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "mongo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "mongo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "33s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "mongo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "33s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -200,40 +240,42 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/mongo"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "mongo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "lbPolicy": "CLUSTER_PROVIDED",
       "name": "original-destination",
-      "type": "ORIGINAL_DST"
+      "type": "ORIGINAL_DST",
+      "connectTimeout": "5s",
+      "lbPolicy": "CLUSTER_PROVIDED"
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "passthrough~kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "ORIGINAL_DST",
       "connectTimeout": "5s",
       "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "passthrough~kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -244,33 +286,35 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/kafka"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "ORIGINAL_DST"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "passthrough~mongo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "ORIGINAL_DST",
       "connectTimeout": "33s",
       "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "passthrough~mongo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -281,24 +325,22 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/mongo"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "mongo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "ORIGINAL_DST"
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway-destinations-only.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway-destinations-only.latest.golden
index 980d7f4ec7ddc..58fa4e7e8f3ab 100644
--- a/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway-destinations-only.latest.golden
+++ b/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway-destinations-only.latest.golden
@@ -1,8 +1,10 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.192-168-0-1.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "destination.192-168-0-1.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
@@ -23,12 +25,14 @@
           }
         ]
       },
-      "name": "destination.192-168-0-1.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "STATIC"
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.192-168-0-2.external-IP-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "destination.192-168-0-2.external-IP-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
@@ -49,12 +53,14 @@
           }
         ]
       },
-      "name": "destination.192-168-0-2.external-IP-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "STATIC"
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.192-168-0-2.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "destination.192-168-0-2.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
@@ -75,12 +81,14 @@
           }
         ]
       },
-      "name": "destination.192-168-0-2.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "STATIC"
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.192-168-0-3.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "destination.192-168-0-3.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
@@ -101,15 +109,15 @@
           }
         ]
       },
-      "name": "destination.192-168-0-3.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "STATIC"
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.api-hashicorp-com.external-hostname-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "destination.api-hashicorp-com.external-hostname-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -129,15 +137,17 @@
           }
         ]
       },
-      "name": "destination.api-hashicorp-com.external-hostname-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.api-test-com.external-hostname-with-SNI.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "destination.api-test-com.external-hostname-with-SNI.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -157,35 +167,39 @@
           }
         ]
       },
-      "name": "destination.api-test-com.external-hostname-with-SNI.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
-            "tlsParams": {},
+            "tlsParams": {
+
+            },
             "validationContext": {
+              "trustedCa": {
+                "filename": "cert.pem"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "api.test.com"
                 }
-              ],
-              "trustedCa": {
-                "filename": "cert.pem"
-              }
+              ]
             }
           },
           "sni": "api.test.com"
         }
-      },
-      "type": "LOGICAL_DNS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.httpbin-org.external-hostname-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "destination.httpbin-org.external-hostname-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -205,15 +219,17 @@
           }
         ]
       },
-      "name": "destination.httpbin-org.external-hostname-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "destination.web-hashicorp-com.external-hostname-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "type": "LOGICAL_DNS",
       "connectTimeout": "5s",
-      "dnsLookupFamily": "V4_ONLY",
-      "dnsRefreshRate": "10s",
       "loadAssignment": {
         "clusterName": "destination.web-hashicorp-com.external-hostname-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
         "endpoints": [
@@ -233,11 +249,13 @@
           }
         ]
       },
-      "name": "destination.web-hashicorp-com.external-hostname-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "type": "LOGICAL_DNS"
+      "dnsRefreshRate": "10s",
+      "dnsLookupFamily": "V4_ONLY",
+      "outlierDetection": {
+
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/transparent-proxy-with-peered-upstreams.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-with-peered-upstreams.latest.golden
index 4e9ce5333bb6d..d1f6d0bb0e1c8 100644
--- a/agent/xds/testdata/clusters/transparent-proxy-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/clusters/transparent-proxy-with-peered-upstreams.latest.golden
@@ -1,28 +1,38 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "name": "api-a.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "api-a.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
       "outlierDetection": {
         "maxEjectionPercent": 100
       },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -33,45 +43,53 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/api-a"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "api-a.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "name": "db.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
       "outlierDetection": {
         "maxEjectionPercent": 100
       },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -82,25 +100,25 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://1c053652-8512-4373-90cf-5a7f6263a994.consul/ns/default/dc/cloud-dc/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -120,32 +138,40 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "name": "no-endpoints.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "no-endpoints.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
       "outlierDetection": {
         "maxEjectionPercent": 100
       },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -156,7 +182,6 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
               "trustedCa": {
                 "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
@@ -164,17 +189,16 @@
             }
           }
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "lbPolicy": "CLUSTER_PROVIDED",
       "name": "original-destination",
-      "type": "ORIGINAL_DST"
+      "type": "ORIGINAL_DST",
+      "connectTimeout": "5s",
+      "lbPolicy": "CLUSTER_PROVIDED"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/transparent-proxy.latest.golden b/agent/xds/testdata/clusters/transparent-proxy.latest.golden
index fdc8e773170d0..d3a37c2cebdbf 100644
--- a/agent/xds/testdata/clusters/transparent-proxy.latest.golden
+++ b/agent/xds/testdata/clusters/transparent-proxy.latest.golden
@@ -1,27 +1,39 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -32,40 +44,48 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/db"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "circuitBreakers": {},
-      "connectTimeout": "5s",
+      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -76,8 +96,10 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/geo-cache-target"
@@ -85,38 +107,46 @@
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc2/svc/geo-cache-target"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -127,25 +157,25 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/google"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "local_app",
+      "type": "STATIC",
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "local_app",
@@ -165,31 +195,41 @@
             ]
           }
         ]
-      },
-      "name": "local_app",
-      "type": "STATIC"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "altStatName": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
+      "type": "EDS",
       "edsClusterConfig": {
         "edsConfig": {
-          "ads": {},
+          "ads": {
+
+          },
           "resourceApiVersion": "V3"
         }
       },
-      "name": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
+      "connectTimeout": "5s",
+      "circuitBreakers": {
+
+      },
+      "outlierDetection": {
+
+      },
+      "commonLbConfig": {
+        "healthyPanicThreshold": {
+
+        }
+      },
       "transportSocket": {
         "name": "tls",
         "typedConfig": {
           "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
           "commonTlsContext": {
+            "tlsParams": {
+
+            },
             "tlsCertificates": [
               {
                 "certificateChain": {
@@ -200,31 +240,29 @@
                 }
               }
             ],
-            "tlsParams": {},
             "validationContext": {
+              "trustedCa": {
+                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+              },
               "matchSubjectAltNames": [
                 {
                   "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/no-endpoints"
                 }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-              }
+              ]
             }
           },
           "sni": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
         }
-      },
-      "type": "EDS"
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "lbPolicy": "CLUSTER_PROVIDED",
       "name": "original-destination",
-      "type": "ORIGINAL_DST"
+      "type": "ORIGINAL_DST",
+      "connectTimeout": "5s",
+      "lbPolicy": "CLUSTER_PROVIDED"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/api-gateway-with-http-route-and-inline-certificate.latest.golden b/agent/xds/testdata/endpoints/api-gateway-with-http-route-and-inline-certificate.latest.golden
new file mode 100644
index 0000000000000..18adccd10c833
--- /dev/null
+++ b/agent/xds/testdata/endpoints/api-gateway-with-http-route-and-inline-certificate.latest.golden
@@ -0,0 +1,41 @@
+{
+  "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
+                  }
+                }
+              },
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
+            },
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
+                  }
+                }
+              },
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
+}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden b/agent/xds/testdata/endpoints/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden
deleted file mode 100644
index b748098952a54..0000000000000
--- a/agent/xds/testdata/endpoints/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/api-gateway-with-http-route.latest.golden b/agent/xds/testdata/endpoints/api-gateway-with-http-route.latest.golden
deleted file mode 100644
index b748098952a54..0000000000000
--- a/agent/xds/testdata/endpoints/api-gateway-with-http-route.latest.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/api-gateway-with-multiple-inline-certificates.latest.golden b/agent/xds/testdata/endpoints/api-gateway-with-multiple-inline-certificates.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/api-gateway-with-multiple-inline-certificates.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/api-gateway-with-tcp-route-and-inline-certificate.latest.golden b/agent/xds/testdata/endpoints/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
index 96ee5c7094687..47b46bca225bf 100644
--- a/agent/xds/testdata/endpoints/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
+++ b/agent/xds/testdata/endpoints/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-exported-to-peers.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-exported-to-peers.latest.golden
index 96ee5c7094687..8504dae2b8400 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-exported-to-peers.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-exported-to-peers.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
index 2b5c371b065db..5b767ac861568 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.cluster-01.external.peer1.domain",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -11,19 +11,7 @@
               "endpoint": {
                 "address": {
                   "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
+                    "address": "10.40.1.1",
                     "portValue": 8080
                   }
                 }
@@ -37,7 +25,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -45,7 +33,19 @@
               "endpoint": {
                 "address": {
                   "socketAddress": {
-                    "address": "10.40.1.1",
+                    "address": "10.10.1.1",
+                    "portValue": 8080
+                  }
+                }
+              },
+              "healthStatus": "HEALTHY",
+              "loadBalancingWeight": 1
+            },
+            {
+              "endpoint": {
+                "address": {
+                  "socketAddress": {
+                    "address": "10.10.1.2",
                     "portValue": 8080
                   }
                 }
@@ -93,5 +93,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.latest.golden
index ffaf0a6bae06e..c3e5de80750a7 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~fail.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -105,5 +105,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.latest.golden
index 90aed27580770..f7efacb5fc223 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -71,5 +71,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
index 974546d846d5f..e55cdc39f7a18 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
@@ -1,63 +1,63 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.cluster-01.external.peer1.domain",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "db.default.cluster-01.external.peer1.domain",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.40.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.40.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.20.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.latest.golden
index b4372a3439e81..6e4d37bc327ce 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -71,5 +71,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain.latest.golden
index b4372a3439e81..6e4d37bc327ce 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-chain.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-chain.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -71,5 +71,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.latest.golden
index c0d604ae53a7b..8e6f1f243fa76 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -71,5 +71,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden
deleted file mode 100644
index 060259960f01a..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "106.96.90.233",
-                    "portValue": 443
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-peered-upstreams-http2.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-peered-upstreams-http2.latest.golden
deleted file mode 100644
index 060259960f01a..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-peered-upstreams-http2.latest.golden
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "106.96.90.233",
-                    "portValue": 443
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-peered-upstreams.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-peered-upstreams.latest.golden
index 060259960f01a..9dc909faf7c06 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-peered-upstreams.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -25,5 +25,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
index bc6e5db758e17..d8c936d61b6e7 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -71,7 +71,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -139,5 +139,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden
index ce68d858a192f..40ae7a08973d4 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -105,5 +105,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
index cd18ed8443d2a..356b5b8476544 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -71,7 +71,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -139,5 +139,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
index 3942a2ac583b7..1f88cfbb3f80b 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -105,5 +105,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
index 5ed86bce531b9..dd6083fa24489 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -105,5 +105,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden
index a32c5b39ab5cc..5e45cbd43eea7 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -105,5 +105,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
index fdbb0e7ac0d85..6a840c993dd6e 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -105,5 +105,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden
index dad058f837029..29f1a8c59c390 100644
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden
+++ b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -105,5 +105,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/defaults.latest.golden b/agent/xds/testdata/endpoints/defaults.latest.golden
index b4372a3439e81..6e4d37bc327ce 100644
--- a/agent/xds/testdata/endpoints/defaults.latest.golden
+++ b/agent/xds/testdata/endpoints/defaults.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -71,5 +71,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-gateway-nil-config-entry.latest.golden b/agent/xds/testdata/endpoints/ingress-gateway-nil-config-entry.latest.golden
index 96ee5c7094687..8504dae2b8400 100644
--- a/agent/xds/testdata/endpoints/ingress-gateway-nil-config-entry.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-gateway-nil-config-entry.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-gateway-no-services.latest.golden b/agent/xds/testdata/endpoints/ingress-gateway-no-services.latest.golden
index 96ee5c7094687..8504dae2b8400 100644
--- a/agent/xds/testdata/endpoints/ingress-gateway-no-services.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-gateway-no-services.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-gateway.latest.golden b/agent/xds/testdata/endpoints/ingress-gateway.latest.golden
index 2a1b29370b637..ff38886424cfd 100644
--- a/agent/xds/testdata/endpoints/ingress-gateway.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-gateway.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -37,5 +37,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.latest.golden b/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.latest.golden
index 5e54266e9e11c..260ef92c2abcc 100644
--- a/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -71,5 +71,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.latest.golden
index c57f0a91a7e41..9cdc78d73ea00 100644
--- a/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -71,5 +71,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-failover-to-cluster-peer.latest.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-failover-to-cluster-peer.latest.golden
index bc0585ce3b47f..d919f819528fe 100644
--- a/agent/xds/testdata/endpoints/ingress-with-chain-and-failover-to-cluster-peer.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-with-chain-and-failover-to-cluster-peer.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.cluster-01.external.peer1.domain",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -11,19 +11,7 @@
               "endpoint": {
                 "address": {
                   "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
+                    "address": "10.40.1.1",
                     "portValue": 8080
                   }
                 }
@@ -37,7 +25,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -45,7 +33,19 @@
               "endpoint": {
                 "address": {
                   "socketAddress": {
-                    "address": "10.40.1.1",
+                    "address": "10.10.1.1",
+                    "portValue": 8080
+                  }
+                }
+              },
+              "healthStatus": "HEALTHY",
+              "loadBalancingWeight": 1
+            },
+            {
+              "endpoint": {
+                "address": {
+                  "socketAddress": {
+                    "address": "10.10.1.2",
                     "portValue": 8080
                   }
                 }
@@ -59,5 +59,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.latest.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.latest.golden
index 0c21bcde23702..1ef4d0329b03a 100644
--- a/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~fail.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -71,5 +71,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.latest.golden b/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.latest.golden
index 2a1b29370b637..ff38886424cfd 100644
--- a/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -37,5 +37,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain.latest.golden b/agent/xds/testdata/endpoints/ingress-with-chain.latest.golden
index 2a1b29370b637..ff38886424cfd 100644
--- a/agent/xds/testdata/endpoints/ingress-with-chain.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-with-chain.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -37,5 +37,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
index c638ef0e4df09..f38f82acfb97c 100644
--- a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -71,7 +71,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -105,5 +105,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden
index 5da7c8c067383..b55f5458689a3 100644
--- a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -71,5 +71,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
index a46187cb0a848..9d5d1c1faffc6 100644
--- a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -71,7 +71,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -105,5 +105,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
index a85f35e138c50..ebbf0281e17c2 100644
--- a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~2~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc3.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -71,5 +71,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
index c104c6763019e..0aad49182a570 100644
--- a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -71,5 +71,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden
index efe338808f879..c5ee31d458f11 100644
--- a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -71,5 +71,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
index 12bc8260e52d7..324a48430d948 100644
--- a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -71,5 +71,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden
index d2f4ff74ca45a..2021f8fab5a79 100644
--- a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden
+++ b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden
@@ -1,9 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~0~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -37,7 +37,7 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "failover-target~1~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "clusterName": "failover-target~db.default.dc2.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
         {
           "lbEndpoints": [
@@ -71,5 +71,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/local-mesh-gateway-with-peered-upstreams.latest.golden b/agent/xds/testdata/endpoints/local-mesh-gateway-with-peered-upstreams.latest.golden
index f89565bd3391f..e488115ae3afa 100644
--- a/agent/xds/testdata/endpoints/local-mesh-gateway-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/endpoints/local-mesh-gateway-with-peered-upstreams.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -25,5 +25,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.latest.golden
index 3822ab931b383..938d0b792eebc 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.latest.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -217,5 +217,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-newer-information-in-federation-states.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-newer-information-in-federation-states.latest.golden
index 02af43dfe7442..8c3d619cafcb8 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway-newer-information-in-federation-states.latest.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway-newer-information-in-federation-states.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -129,5 +129,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-no-services.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-no-services.latest.golden
index 96ee5c7094687..8504dae2b8400 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway-no-services.latest.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway-no-services.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-older-information-in-federation-states.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-older-information-in-federation-states.latest.golden
index 4853c9dc932a1..81f2a3eecae55 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway-older-information-in-federation-states.latest.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway-older-information-in-federation-states.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -141,5 +141,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-peering-control-plane.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-peering-control-plane.latest.golden
index 2445f74d51221..58ce9101bcae6 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway-peering-control-plane.latest.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway-peering-control-plane.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -33,5 +33,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.latest.golden
index f4e0c1e258b04..a68fb5b7a4c09 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.latest.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -265,5 +265,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-using-federation-control-plane.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-using-federation-control-plane.latest.golden
deleted file mode 100644
index 0cc0209281f9e..0000000000000
--- a/agent/xds/testdata/endpoints/mesh-gateway-using-federation-control-plane.latest.golden
+++ /dev/null
@@ -1,249 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "172.16.1.6",
-                    "portValue": 2222
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "172.16.1.7",
-                    "portValue": 2222
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "172.16.1.8",
-                    "portValue": 2222
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "198.18.1.1",
-                    "portValue": 443
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "198.18.1.2",
-                    "portValue": 443
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "172.16.1.3",
-                    "portValue": 2222
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "172.16.1.4",
-                    "portValue": 2222
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "172.16.1.5",
-                    "portValue": 2222
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "172.16.1.9",
-                    "portValue": 2222
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "node1.server.dc1.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "127.0.0.1",
-                    "portValue": 0
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "node2.server.dc1.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "127.0.0.2",
-                    "portValue": 0
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "server.dc1.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "127.0.0.1",
-                    "portValue": 0
-                  }
-                }
-              }
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "127.0.0.2",
-                    "portValue": 0
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "server.dc2.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "198.18.1.1",
-                    "portValue": 443
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "198.18.1.2",
-                    "portValue": 443
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.latest.golden
index 4853c9dc932a1..81f2a3eecae55 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.latest.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -141,5 +141,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
index 56781f49cf9b7..b993f6a71e49f 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -35,40 +35,6 @@
         }
       ]
     },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.3",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 128
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.4",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
       "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
@@ -170,74 +136,8 @@
           ]
         }
       ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "exported~v2.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.4",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v1.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.3",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 128
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v2.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.4",
-                    "portValue": 8080
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-with-exported-peered-services-http.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-with-exported-peered-services-http.latest.golden
index ce19eaa7ffcb4..2d3e39d305e22 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway-with-exported-peered-services-http.latest.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway-with-exported-peered-services-http.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -207,5 +207,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-with-exported-peered-services.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-with-exported-peered-services.latest.golden
index ce19eaa7ffcb4..2d3e39d305e22 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway-with-exported-peered-services.latest.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway-with-exported-peered-services.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -207,5 +207,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-with-imported-peered-services.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-with-imported-peered-services.latest.golden
index 54aad58279a1f..efb3c588be98f 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway-with-imported-peered-services.latest.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway-with-imported-peered-services.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -37,5 +37,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
index 740be0d4c78e2..7977e1d345359 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
@@ -1,28 +1,28 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "server.dc2.peering.6d942ff2-6a78-46f4-a52f-915e26c48797",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "server.dc2.peering.6d942ff2-6a78-46f4-a52f-915e26c48797",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "13.14.15.16",
-                    "portValue": 5200
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "13.14.15.16",
+                    "portValue":  5200
                   }
                 }
               }
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "9.10.11.12",
-                    "portValue": 5200
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "9.10.11.12",
+                    "portValue":  5200
                   }
                 }
               }
@@ -32,17 +32,17 @@
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "server.dc2.peering.f3f41279-001d-42bb-912e-f6103fb036b8",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "server.dc2.peering.f3f41279-001d-42bb-912e-f6103fb036b8",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "1.2.3.4",
-                    "portValue": 5200
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "1.2.3.4",
+                    "portValue":  5200
                   }
                 }
               }
@@ -52,6 +52,6 @@
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway.latest.golden
index 4853c9dc932a1..81f2a3eecae55 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway.latest.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -141,5 +141,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.latest.golden
index e47c38cb8a6a1..8eece2e37d099 100644
--- a/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.latest.golden
+++ b/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -105,5 +105,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/telemetry-collector.latest.golden b/agent/xds/testdata/endpoints/telemetry-collector.latest.golden
index f8cc5efc2db05..fb14b9d3a86b3 100644
--- a/agent/xds/testdata/endpoints/telemetry-collector.latest.golden
+++ b/agent/xds/testdata/endpoints/telemetry-collector.latest.golden
@@ -1,97 +1,97 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "consul-telemetry-collector.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "consul-telemetry-collector.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "9.9.9.9",
-                    "portValue": 9090
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "9.9.9.9",
+                    "portValue":  9090
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     },
     {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints":  [
         {
-          "lbEndpoints": [
+          "lbEndpoints":  [
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.1.1",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.10.1.1",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             },
             {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.20.1.2",
-                    "portValue": 8080
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "10.20.1.2",
+                    "portValue":  8080
                   }
                 }
               },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
+              "healthStatus":  "HEALTHY",
+              "loadBalancingWeight":  1
             }
           ]
         }
       ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.latest.golden
index 4c043024998e9..30607da56da89 100644
--- a/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.latest.golden
+++ b/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -69,5 +69,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/terminating-gateway-no-services.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-no-services.latest.golden
index 96ee5c7094687..8504dae2b8400 100644
--- a/agent/xds/testdata/endpoints/terminating-gateway-no-services.latest.golden
+++ b/agent/xds/testdata/endpoints/terminating-gateway-no-services.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.latest.golden
index 038021dd86772..13470d4879944 100644
--- a/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.latest.golden
+++ b/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -81,5 +81,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/terminating-gateway.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway.latest.golden
index 0b67b10323e3f..f33244f4e7b2c 100644
--- a/agent/xds/testdata/endpoints/terminating-gateway.latest.golden
+++ b/agent/xds/testdata/endpoints/terminating-gateway.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -37,5 +37,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/transparent-proxy-destination-http.latest.golden b/agent/xds/testdata/endpoints/transparent-proxy-destination-http.latest.golden
index a0896e11577bb..284d7722a6d0e 100644
--- a/agent/xds/testdata/endpoints/transparent-proxy-destination-http.latest.golden
+++ b/agent/xds/testdata/endpoints/transparent-proxy-destination-http.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -159,5 +159,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/transparent-proxy-destination.latest.golden b/agent/xds/testdata/endpoints/transparent-proxy-destination.latest.golden
index 3c027c838dca8..33fa4f7081d84 100644
--- a/agent/xds/testdata/endpoints/transparent-proxy-destination.latest.golden
+++ b/agent/xds/testdata/endpoints/transparent-proxy-destination.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -159,5 +159,5 @@
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/transparent-proxy-terminating-gateway-destinations-only.latest.golden b/agent/xds/testdata/endpoints/transparent-proxy-terminating-gateway-destinations-only.latest.golden
index 96ee5c7094687..8504dae2b8400 100644
--- a/agent/xds/testdata/endpoints/transparent-proxy-terminating-gateway-destinations-only.latest.golden
+++ b/agent/xds/testdata/endpoints/transparent-proxy-terminating-gateway-destinations-only.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/transparent-proxy-with-peered-upstreams.latest.golden b/agent/xds/testdata/endpoints/transparent-proxy-with-peered-upstreams.latest.golden
index 8896b21315a6e..2a4371492ea8f 100644
--- a/agent/xds/testdata/endpoints/transparent-proxy-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/endpoints/transparent-proxy-with-peered-upstreams.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -49,10 +49,12 @@
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
       "clusterName": "no-endpoints.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
       "endpoints": [
-        {}
+        {
+
+        }
       ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/transparent-proxy.latest.golden b/agent/xds/testdata/endpoints/transparent-proxy.latest.golden
index ebf0eb91d97e9..fb13b6259b9fd 100644
--- a/agent/xds/testdata/endpoints/transparent-proxy.latest.golden
+++ b/agent/xds/testdata/endpoints/transparent-proxy.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
@@ -95,10 +95,12 @@
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
       "clusterName": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
-        {}
+        {
+
+        }
       ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/jwt_authn/intention-with-path.golden b/agent/xds/testdata/jwt_authn/intention-with-path.golden
deleted file mode 100644
index 3de3f31ec3995..0000000000000
--- a/agent/xds/testdata/jwt_authn/intention-with-path.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "name": "envoy.filters.http.jwt_authn",
-  "typedConfig": {
-    "@type": "type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication",
-    "providers": {
-      "okta": {
-        "issuer": "test-issuer",
-        "payloadInMetadata": "jwt_payload_okta",
-        "remoteJwks": {
-          "asyncFetch": {
-            "fastListener": true
-          },
-          "httpUri": {
-            "cluster": "jwks_cluster_okta",
-            "timeout": "1s",
-            "uri": "https://example-okta.com/.well-known/jwks.json"
-          }
-        }
-      }
-    },
-    "rules": [
-      {
-        "match": {
-          "prefix": "/"
-        },
-        "requires": {
-          "requiresAny": {
-            "requirements": [
-              {
-                "providerName": "okta"
-              },
-              {
-                "allowMissingOrFailed": {}
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/jwt_authn/local-provider.golden b/agent/xds/testdata/jwt_authn/local-provider.golden
deleted file mode 100644
index 5fe99469a53f3..0000000000000
--- a/agent/xds/testdata/jwt_authn/local-provider.golden
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "name": "envoy.filters.http.jwt_authn",
-  "typedConfig": {
-    "@type": "type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication",
-    "providers": {
-      "okta": {
-        "issuer": "test-issuer",
-        "localJwks": {
-          "inlineString": "{\"keys\": [{\n  \"crv\": \"P-256\",\n  \"key_ops\": [\n    \"verify\"\n  ],\n  \"kty\": \"EC\",\n  \"x\": \"Wc9uZuPaB7Kh2FMc9wtJjRe8XD4yT2AYNAAkrYbVjuw\",\n  \"y\": \"68hRTJiJNOwtrh4EoPXeVnRuH7hiSDJ_lmbbjfDfWq0\",\n  \"alg\": \"ES256\",\n  \"use\": \"sig\",\n  \"kid\": \"ac1e8f90eddf61c429c61ca05b4f2e07\"\n}]}"
-        },
-        "payloadInMetadata": "jwt_payload_okta"
-      }
-    },
-    "rules": [
-      {
-        "match": {
-          "prefix": "/"
-        },
-        "requires": {
-          "requiresAny": {
-            "requirements": [
-              {
-                "providerName": "okta"
-              },
-              {
-                "allowMissingOrFailed": {}
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/jwt_authn/multiple-providers-and-one-permission.golden b/agent/xds/testdata/jwt_authn/multiple-providers-and-one-permission.golden
deleted file mode 100644
index ea3f738ae4f33..0000000000000
--- a/agent/xds/testdata/jwt_authn/multiple-providers-and-one-permission.golden
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "name": "envoy.filters.http.jwt_authn",
-  "typedConfig": {
-    "@type": "type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication",
-    "providers": {
-      "auth0": {
-        "issuer": "another-issuer",
-        "payloadInMetadata": "jwt_payload_auth0",
-        "remoteJwks": {
-          "asyncFetch": {
-            "fastListener": true
-          },
-          "httpUri": {
-            "cluster": "jwks_cluster_auth0",
-            "timeout": "1s",
-            "uri": "https://example-auth0.com/.well-known/jwks.json"
-          }
-        }
-      },
-      "okta": {
-        "issuer": "test-issuer",
-        "payloadInMetadata": "jwt_payload_okta",
-        "remoteJwks": {
-          "asyncFetch": {
-            "fastListener": true
-          },
-          "httpUri": {
-            "cluster": "jwks_cluster_okta",
-            "timeout": "1s",
-            "uri": "https://example-okta.com/.well-known/jwks.json"
-          }
-        }
-      }
-    },
-    "rules": [
-      {
-        "match": {
-          "prefix": "/"
-        },
-        "requires": {
-          "requiresAll": {
-            "requirements": [
-              {
-                "requiresAny": {
-                  "requirements": [
-                    {
-                      "providerName": "okta"
-                    },
-                    {
-                      "allowMissingOrFailed": {}
-                    }
-                  ]
-                }
-              },
-              {
-                "requiresAny": {
-                  "requirements": [
-                    {
-                      "providerName": "auth0"
-                    },
-                    {
-                      "allowMissingOrFailed": {}
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/jwt_authn/no-provider.golden b/agent/xds/testdata/jwt_authn/no-provider.golden
deleted file mode 100644
index 9e26dfeeb6e64..0000000000000
--- a/agent/xds/testdata/jwt_authn/no-provider.golden
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/agent/xds/testdata/jwt_authn/remote-provider.golden b/agent/xds/testdata/jwt_authn/remote-provider.golden
deleted file mode 100644
index 3de3f31ec3995..0000000000000
--- a/agent/xds/testdata/jwt_authn/remote-provider.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "name": "envoy.filters.http.jwt_authn",
-  "typedConfig": {
-    "@type": "type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication",
-    "providers": {
-      "okta": {
-        "issuer": "test-issuer",
-        "payloadInMetadata": "jwt_payload_okta",
-        "remoteJwks": {
-          "asyncFetch": {
-            "fastListener": true
-          },
-          "httpUri": {
-            "cluster": "jwks_cluster_okta",
-            "timeout": "1s",
-            "uri": "https://example-okta.com/.well-known/jwks.json"
-          }
-        }
-      }
-    },
-    "rules": [
-      {
-        "match": {
-          "prefix": "/"
-        },
-        "requires": {
-          "requiresAny": {
-            "requirements": [
-              {
-                "providerName": "okta"
-              },
-              {
-                "allowMissingOrFailed": {}
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/jwt_authn/top-level-provider-with-permission.golden b/agent/xds/testdata/jwt_authn/top-level-provider-with-permission.golden
deleted file mode 100644
index 3de3f31ec3995..0000000000000
--- a/agent/xds/testdata/jwt_authn/top-level-provider-with-permission.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "name": "envoy.filters.http.jwt_authn",
-  "typedConfig": {
-    "@type": "type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication",
-    "providers": {
-      "okta": {
-        "issuer": "test-issuer",
-        "payloadInMetadata": "jwt_payload_okta",
-        "remoteJwks": {
-          "asyncFetch": {
-            "fastListener": true
-          },
-          "httpUri": {
-            "cluster": "jwks_cluster_okta",
-            "timeout": "1s",
-            "uri": "https://example-okta.com/.well-known/jwks.json"
-          }
-        }
-      }
-    },
-    "rules": [
-      {
-        "match": {
-          "prefix": "/"
-        },
-        "requires": {
-          "requiresAny": {
-            "requirements": [
-              {
-                "providerName": "okta"
-              },
-              {
-                "allowMissingOrFailed": {}
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/jwt_authn_clusters/http-provider-with-hostname-and-port.golden b/agent/xds/testdata/jwt_authn_clusters/http-provider-with-hostname-and-port.golden
deleted file mode 100644
index 03124b0b2f683..0000000000000
--- a/agent/xds/testdata/jwt_authn_clusters/http-provider-with-hostname-and-port.golden
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "connectTimeout": "5s",
-  "loadAssignment": {
-    "clusterName": "jwks_cluster_okta",
-    "endpoints": [
-      {
-        "lbEndpoints": [
-          {
-            "endpoint": {
-              "address": {
-                "socketAddress": {
-                  "address": "example-okta.com",
-                  "portValue": 90
-                }
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "name": "jwks_cluster_okta",
-  "type": "STATIC"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/jwt_authn_clusters/http-provider-with-hostname-no-port.golden b/agent/xds/testdata/jwt_authn_clusters/http-provider-with-hostname-no-port.golden
deleted file mode 100644
index b6d28c80658ad..0000000000000
--- a/agent/xds/testdata/jwt_authn_clusters/http-provider-with-hostname-no-port.golden
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "connectTimeout": "5s",
-  "loadAssignment": {
-    "clusterName": "jwks_cluster_okta",
-    "endpoints": [
-      {
-        "lbEndpoints": [
-          {
-            "endpoint": {
-              "address": {
-                "socketAddress": {
-                  "address": "example-okta.com",
-                  "portValue": 80
-                }
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "name": "jwks_cluster_okta",
-  "type": "STATIC"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/jwt_authn_clusters/http-provider-with-ip-and-port.golden b/agent/xds/testdata/jwt_authn_clusters/http-provider-with-ip-and-port.golden
deleted file mode 100644
index 4203107ef0adf..0000000000000
--- a/agent/xds/testdata/jwt_authn_clusters/http-provider-with-ip-and-port.golden
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "connectTimeout": "5s",
-  "loadAssignment": {
-    "clusterName": "jwks_cluster_okta",
-    "endpoints": [
-      {
-        "lbEndpoints": [
-          {
-            "endpoint": {
-              "address": {
-                "socketAddress": {
-                  "address": "127.0.0.1",
-                  "portValue": 9091
-                }
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "name": "jwks_cluster_okta",
-  "type": "STATIC"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/jwt_authn_clusters/http-provider-with-ip-no-port.golden b/agent/xds/testdata/jwt_authn_clusters/http-provider-with-ip-no-port.golden
deleted file mode 100644
index eb83b9ebc8b11..0000000000000
--- a/agent/xds/testdata/jwt_authn_clusters/http-provider-with-ip-no-port.golden
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "connectTimeout": "5s",
-  "loadAssignment": {
-    "clusterName": "jwks_cluster_okta",
-    "endpoints": [
-      {
-        "lbEndpoints": [
-          {
-            "endpoint": {
-              "address": {
-                "socketAddress": {
-                  "address": "127.0.0.1",
-                  "portValue": 80
-                }
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "name": "jwks_cluster_okta",
-  "type": "STATIC"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/jwt_authn_clusters/https-provider-with-hostname-and-port.golden b/agent/xds/testdata/jwt_authn_clusters/https-provider-with-hostname-and-port.golden
deleted file mode 100644
index ef4a341f6bfbe..0000000000000
--- a/agent/xds/testdata/jwt_authn_clusters/https-provider-with-hostname-and-port.golden
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "connectTimeout": "5s",
-  "loadAssignment": {
-    "clusterName": "jwks_cluster_okta",
-    "endpoints": [
-      {
-        "lbEndpoints": [
-          {
-            "endpoint": {
-              "address": {
-                "socketAddress": {
-                  "address": "example-okta.com",
-                  "portValue": 90
-                }
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "name": "jwks_cluster_okta",
-  "transportSocket": {
-    "name": "tls",
-    "typedConfig": {
-      "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-      "commonTlsContext": {
-        "validationContext": {
-          "trustedCa": {
-            "filename": "mycert.crt"
-          }
-        }
-      }
-    }
-  },
-  "type": "STATIC"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/jwt_authn_clusters/https-provider-with-hostname-no-port.golden b/agent/xds/testdata/jwt_authn_clusters/https-provider-with-hostname-no-port.golden
deleted file mode 100644
index f75b2c4f1ef2d..0000000000000
--- a/agent/xds/testdata/jwt_authn_clusters/https-provider-with-hostname-no-port.golden
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "connectTimeout": "5s",
-  "loadAssignment": {
-    "clusterName": "jwks_cluster_okta",
-    "endpoints": [
-      {
-        "lbEndpoints": [
-          {
-            "endpoint": {
-              "address": {
-                "socketAddress": {
-                  "address": "example-okta.com",
-                  "portValue": 443
-                }
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "name": "jwks_cluster_okta",
-  "transportSocket": {
-    "name": "tls",
-    "typedConfig": {
-      "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-      "commonTlsContext": {
-        "validationContext": {
-          "trustedCa": {
-            "filename": "mycert.crt"
-          }
-        }
-      }
-    }
-  },
-  "type": "STATIC"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/jwt_authn_clusters/https-provider-with-ip-and-port.golden b/agent/xds/testdata/jwt_authn_clusters/https-provider-with-ip-and-port.golden
deleted file mode 100644
index c396e70deb183..0000000000000
--- a/agent/xds/testdata/jwt_authn_clusters/https-provider-with-ip-and-port.golden
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "connectTimeout": "5s",
-  "loadAssignment": {
-    "clusterName": "jwks_cluster_okta",
-    "endpoints": [
-      {
-        "lbEndpoints": [
-          {
-            "endpoint": {
-              "address": {
-                "socketAddress": {
-                  "address": "127.0.0.1",
-                  "portValue": 9091
-                }
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "name": "jwks_cluster_okta",
-  "transportSocket": {
-    "name": "tls",
-    "typedConfig": {
-      "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-      "commonTlsContext": {
-        "validationContext": {
-          "trustedCa": {
-            "filename": "mycert.crt"
-          }
-        }
-      }
-    }
-  },
-  "type": "STATIC"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/jwt_authn_clusters/https-provider-with-ip-no-port.golden b/agent/xds/testdata/jwt_authn_clusters/https-provider-with-ip-no-port.golden
deleted file mode 100644
index cf1a77039b18b..0000000000000
--- a/agent/xds/testdata/jwt_authn_clusters/https-provider-with-ip-no-port.golden
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "connectTimeout": "5s",
-  "loadAssignment": {
-    "clusterName": "jwks_cluster_okta",
-    "endpoints": [
-      {
-        "lbEndpoints": [
-          {
-            "endpoint": {
-              "address": {
-                "socketAddress": {
-                  "address": "127.0.0.1",
-                  "portValue": 443
-                }
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "name": "jwks_cluster_okta",
-  "transportSocket": {
-    "name": "tls",
-    "typedConfig": {
-      "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-      "commonTlsContext": {
-        "validationContext": {
-          "trustedCa": {
-            "filename": "mycert.crt"
-          }
-        }
-      }
-    }
-  },
-  "type": "STATIC"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/access-logs-defaults.latest.golden b/agent/xds/testdata/listeners/access-logs-defaults.latest.golden
index 179cffe4e57f5..6a6bb2b7ed1c9 100644
--- a/agent/xds/testdata/listeners/access-logs-defaults.latest.golden
+++ b/agent/xds/testdata/listeners/access-logs-defaults.latest.golden
@@ -1,51 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "accessLog": [
-        {
-          "filter": {
-            "responseFlagFilter": {
-              "flags": [
-                "NR"
-              ]
-            }
-          },
-          "name": "Consul Listener Log",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog",
-            "logFormat": {
-              "jsonFormat": {
-                "authority": "%REQ(:AUTHORITY)%",
-                "bytes_received": "%BYTES_RECEIVED%",
-                "bytes_sent": "%BYTES_SENT%",
-                "connection_termination_details": "%CONNECTION_TERMINATION_DETAILS%",
-                "downstream_local_address": "%DOWNSTREAM_LOCAL_ADDRESS%",
-                "downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
-                "duration": "%DURATION%",
-                "method": "%REQ(:METHOD)%",
-                "path": "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
-                "protocol": "%PROTOCOL%",
-                "request_id": "%REQ(X-REQUEST-ID)%",
-                "requested_server_name": "%REQUESTED_SERVER_NAME%",
-                "response_code": "%RESPONSE_CODE%",
-                "response_code_details": "%RESPONSE_CODE_DETAILS%",
-                "response_flags": "%RESPONSE_FLAGS%",
-                "route_name": "%ROUTE_NAME%",
-                "start_time": "%START_TIME%",
-                "upstream_cluster": "%UPSTREAM_CLUSTER%",
-                "upstream_host": "%UPSTREAM_HOST%",
-                "upstream_local_address": "%UPSTREAM_LOCAL_ADDRESS%",
-                "upstream_service_time": "%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%",
-                "upstream_transport_failure_reason": "%UPSTREAM_TRANSPORT_FAILURE_REASON%",
-                "user_agent": "%REQ(USER-AGENT)%",
-                "x_forwarded_for": "%REQ(X-FORWARDED-FOR)%"
-              }
-            }
-          }
-        }
-      ],
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -59,6 +17,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "accessLog": [
                   {
                     "name": "Consul Listener Filter Log",
@@ -66,49 +26,44 @@
                       "@type": "type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog",
                       "logFormat": {
                         "jsonFormat": {
-                          "authority": "%REQ(:AUTHORITY)%",
-                          "bytes_received": "%BYTES_RECEIVED%",
-                          "bytes_sent": "%BYTES_SENT%",
-                          "connection_termination_details": "%CONNECTION_TERMINATION_DETAILS%",
-                          "downstream_local_address": "%DOWNSTREAM_LOCAL_ADDRESS%",
-                          "downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
-                          "duration": "%DURATION%",
-                          "method": "%REQ(:METHOD)%",
-                          "path": "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
-                          "protocol": "%PROTOCOL%",
-                          "request_id": "%REQ(X-REQUEST-ID)%",
-                          "requested_server_name": "%REQUESTED_SERVER_NAME%",
-                          "response_code": "%RESPONSE_CODE%",
-                          "response_code_details": "%RESPONSE_CODE_DETAILS%",
-                          "response_flags": "%RESPONSE_FLAGS%",
-                          "route_name": "%ROUTE_NAME%",
-                          "start_time": "%START_TIME%",
-                          "upstream_cluster": "%UPSTREAM_CLUSTER%",
-                          "upstream_host": "%UPSTREAM_HOST%",
-                          "upstream_local_address": "%UPSTREAM_LOCAL_ADDRESS%",
-                          "upstream_service_time": "%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%",
-                          "upstream_transport_failure_reason": "%UPSTREAM_TRANSPORT_FAILURE_REASON%",
-                          "user_agent": "%REQ(USER-AGENT)%",
-                          "x_forwarded_for": "%REQ(X-FORWARDED-FOR)%"
-                        }
+                            "authority": "%REQ(:AUTHORITY)%",
+                            "bytes_received": "%BYTES_RECEIVED%",
+                            "bytes_sent": "%BYTES_SENT%",
+                            "connection_termination_details": "%CONNECTION_TERMINATION_DETAILS%",
+                            "downstream_local_address": "%DOWNSTREAM_LOCAL_ADDRESS%",
+                            "downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
+                            "duration": "%DURATION%",
+                            "method": "%REQ(:METHOD)%",
+                            "path": "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
+                            "protocol": "%PROTOCOL%",
+                            "request_id": "%REQ(X-REQUEST-ID)%",
+                            "requested_server_name": "%REQUESTED_SERVER_NAME%",
+                            "response_code": "%RESPONSE_CODE%",
+                            "response_code_details": "%RESPONSE_CODE_DETAILS%",
+                            "response_flags": "%RESPONSE_FLAGS%",
+                            "route_name": "%ROUTE_NAME%",
+                            "start_time": "%START_TIME%",
+                            "upstream_cluster": "%UPSTREAM_CLUSTER%",
+                            "upstream_host": "%UPSTREAM_HOST%",
+                            "upstream_local_address": "%UPSTREAM_LOCAL_ADDRESS%",
+                            "upstream_service_time": "%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%",
+                            "upstream_transport_failure_reason": "%UPSTREAM_TRANSPORT_FAILURE_REASON%",
+                            "user_agent": "%REQ(USER-AGENT)%",
+                            "x_forwarded_for": "%REQ(X-FORWARDED-FOR)%"
+                          }
                       }
                     }
                   }
-                ],
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                ]
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "trafficDirection": "OUTBOUND",
       "accessLog": [
         {
+          "name": "Consul Listener Log",
           "filter": {
             "responseFlagFilter": {
               "flags": [
@@ -116,40 +71,43 @@
               ]
             }
           },
-          "name": "Consul Listener Log",
           "typedConfig": {
             "@type": "type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog",
             "logFormat": {
               "jsonFormat": {
-                "authority": "%REQ(:AUTHORITY)%",
-                "bytes_received": "%BYTES_RECEIVED%",
-                "bytes_sent": "%BYTES_SENT%",
-                "connection_termination_details": "%CONNECTION_TERMINATION_DETAILS%",
-                "downstream_local_address": "%DOWNSTREAM_LOCAL_ADDRESS%",
-                "downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
-                "duration": "%DURATION%",
-                "method": "%REQ(:METHOD)%",
-                "path": "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
-                "protocol": "%PROTOCOL%",
-                "request_id": "%REQ(X-REQUEST-ID)%",
-                "requested_server_name": "%REQUESTED_SERVER_NAME%",
-                "response_code": "%RESPONSE_CODE%",
-                "response_code_details": "%RESPONSE_CODE_DETAILS%",
-                "response_flags": "%RESPONSE_FLAGS%",
-                "route_name": "%ROUTE_NAME%",
-                "start_time": "%START_TIME%",
-                "upstream_cluster": "%UPSTREAM_CLUSTER%",
-                "upstream_host": "%UPSTREAM_HOST%",
-                "upstream_local_address": "%UPSTREAM_LOCAL_ADDRESS%",
-                "upstream_service_time": "%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%",
-                "upstream_transport_failure_reason": "%UPSTREAM_TRANSPORT_FAILURE_REASON%",
-                "user_agent": "%REQ(USER-AGENT)%",
-                "x_forwarded_for": "%REQ(X-FORWARDED-FOR)%"
-              }
+                  "authority": "%REQ(:AUTHORITY)%",
+                  "bytes_received": "%BYTES_RECEIVED%",
+                  "bytes_sent": "%BYTES_SENT%",
+                  "connection_termination_details": "%CONNECTION_TERMINATION_DETAILS%",
+                  "downstream_local_address": "%DOWNSTREAM_LOCAL_ADDRESS%",
+                  "downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
+                  "duration": "%DURATION%",
+                  "method": "%REQ(:METHOD)%",
+                  "path": "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
+                  "protocol": "%PROTOCOL%",
+                  "request_id": "%REQ(X-REQUEST-ID)%",
+                  "requested_server_name": "%REQUESTED_SERVER_NAME%",
+                  "response_code": "%RESPONSE_CODE%",
+                  "response_code_details": "%RESPONSE_CODE_DETAILS%",
+                  "response_flags": "%RESPONSE_FLAGS%",
+                  "route_name": "%ROUTE_NAME%",
+                  "start_time": "%START_TIME%",
+                  "upstream_cluster": "%UPSTREAM_CLUSTER%",
+                  "upstream_host": "%UPSTREAM_HOST%",
+                  "upstream_local_address": "%UPSTREAM_LOCAL_ADDRESS%",
+                  "upstream_service_time": "%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%",
+                  "upstream_transport_failure_reason": "%UPSTREAM_TRANSPORT_FAILURE_REASON%",
+                  "user_agent": "%REQ(USER-AGENT)%",
+                  "x_forwarded_for": "%REQ(X-FORWARDED-FOR)%"
+                }
             }
           }
         }
-      ],
+      ]
+    },
+    {
+      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -163,6 +121,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
                 "accessLog": [
                   {
                     "name": "Consul Listener Filter Log",
@@ -170,49 +130,44 @@
                       "@type": "type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog",
                       "logFormat": {
                         "jsonFormat": {
-                          "authority": "%REQ(:AUTHORITY)%",
-                          "bytes_received": "%BYTES_RECEIVED%",
-                          "bytes_sent": "%BYTES_SENT%",
-                          "connection_termination_details": "%CONNECTION_TERMINATION_DETAILS%",
-                          "downstream_local_address": "%DOWNSTREAM_LOCAL_ADDRESS%",
-                          "downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
-                          "duration": "%DURATION%",
-                          "method": "%REQ(:METHOD)%",
-                          "path": "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
-                          "protocol": "%PROTOCOL%",
-                          "request_id": "%REQ(X-REQUEST-ID)%",
-                          "requested_server_name": "%REQUESTED_SERVER_NAME%",
-                          "response_code": "%RESPONSE_CODE%",
-                          "response_code_details": "%RESPONSE_CODE_DETAILS%",
-                          "response_flags": "%RESPONSE_FLAGS%",
-                          "route_name": "%ROUTE_NAME%",
-                          "start_time": "%START_TIME%",
-                          "upstream_cluster": "%UPSTREAM_CLUSTER%",
-                          "upstream_host": "%UPSTREAM_HOST%",
-                          "upstream_local_address": "%UPSTREAM_LOCAL_ADDRESS%",
-                          "upstream_service_time": "%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%",
-                          "upstream_transport_failure_reason": "%UPSTREAM_TRANSPORT_FAILURE_REASON%",
-                          "user_agent": "%REQ(USER-AGENT)%",
-                          "x_forwarded_for": "%REQ(X-FORWARDED-FOR)%"
-                        }
+                            "authority": "%REQ(:AUTHORITY)%",
+                            "bytes_received": "%BYTES_RECEIVED%",
+                            "bytes_sent": "%BYTES_SENT%",
+                            "connection_termination_details": "%CONNECTION_TERMINATION_DETAILS%",
+                            "downstream_local_address": "%DOWNSTREAM_LOCAL_ADDRESS%",
+                            "downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
+                            "duration": "%DURATION%",
+                            "method": "%REQ(:METHOD)%",
+                            "path": "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
+                            "protocol": "%PROTOCOL%",
+                            "request_id": "%REQ(X-REQUEST-ID)%",
+                            "requested_server_name": "%REQUESTED_SERVER_NAME%",
+                            "response_code": "%RESPONSE_CODE%",
+                            "response_code_details": "%RESPONSE_CODE_DETAILS%",
+                            "response_flags": "%RESPONSE_FLAGS%",
+                            "route_name": "%ROUTE_NAME%",
+                            "start_time": "%START_TIME%",
+                            "upstream_cluster": "%UPSTREAM_CLUSTER%",
+                            "upstream_host": "%UPSTREAM_HOST%",
+                            "upstream_local_address": "%UPSTREAM_LOCAL_ADDRESS%",
+                            "upstream_service_time": "%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%",
+                            "upstream_transport_failure_reason": "%UPSTREAM_TRANSPORT_FAILURE_REASON%",
+                            "user_agent": "%REQ(USER-AGENT)%",
+                            "x_forwarded_for": "%REQ(X-FORWARDED-FOR)%"
+                          }
                       }
                     }
                   }
-                ],
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                ]
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "trafficDirection": "OUTBOUND",
       "accessLog": [
         {
+          "name": "Consul Listener Log",
           "filter": {
             "responseFlagFilter": {
               "flags": [
@@ -220,40 +175,43 @@
               ]
             }
           },
-          "name": "Consul Listener Log",
           "typedConfig": {
             "@type": "type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog",
             "logFormat": {
               "jsonFormat": {
-                "authority": "%REQ(:AUTHORITY)%",
-                "bytes_received": "%BYTES_RECEIVED%",
-                "bytes_sent": "%BYTES_SENT%",
-                "connection_termination_details": "%CONNECTION_TERMINATION_DETAILS%",
-                "downstream_local_address": "%DOWNSTREAM_LOCAL_ADDRESS%",
-                "downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
-                "duration": "%DURATION%",
-                "method": "%REQ(:METHOD)%",
-                "path": "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
-                "protocol": "%PROTOCOL%",
-                "request_id": "%REQ(X-REQUEST-ID)%",
-                "requested_server_name": "%REQUESTED_SERVER_NAME%",
-                "response_code": "%RESPONSE_CODE%",
-                "response_code_details": "%RESPONSE_CODE_DETAILS%",
-                "response_flags": "%RESPONSE_FLAGS%",
-                "route_name": "%ROUTE_NAME%",
-                "start_time": "%START_TIME%",
-                "upstream_cluster": "%UPSTREAM_CLUSTER%",
-                "upstream_host": "%UPSTREAM_HOST%",
-                "upstream_local_address": "%UPSTREAM_LOCAL_ADDRESS%",
-                "upstream_service_time": "%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%",
-                "upstream_transport_failure_reason": "%UPSTREAM_TRANSPORT_FAILURE_REASON%",
-                "user_agent": "%REQ(USER-AGENT)%",
-                "x_forwarded_for": "%REQ(X-FORWARDED-FOR)%"
-              }
+                  "authority": "%REQ(:AUTHORITY)%",
+                  "bytes_received": "%BYTES_RECEIVED%",
+                  "bytes_sent": "%BYTES_SENT%",
+                  "connection_termination_details": "%CONNECTION_TERMINATION_DETAILS%",
+                  "downstream_local_address": "%DOWNSTREAM_LOCAL_ADDRESS%",
+                  "downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
+                  "duration": "%DURATION%",
+                  "method": "%REQ(:METHOD)%",
+                  "path": "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
+                  "protocol": "%PROTOCOL%",
+                  "request_id": "%REQ(X-REQUEST-ID)%",
+                  "requested_server_name": "%REQUESTED_SERVER_NAME%",
+                  "response_code": "%RESPONSE_CODE%",
+                  "response_code_details": "%RESPONSE_CODE_DETAILS%",
+                  "response_flags": "%RESPONSE_FLAGS%",
+                  "route_name": "%ROUTE_NAME%",
+                  "start_time": "%START_TIME%",
+                  "upstream_cluster": "%UPSTREAM_CLUSTER%",
+                  "upstream_host": "%UPSTREAM_HOST%",
+                  "upstream_local_address": "%UPSTREAM_LOCAL_ADDRESS%",
+                  "upstream_service_time": "%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%",
+                  "upstream_transport_failure_reason": "%UPSTREAM_TRANSPORT_FAILURE_REASON%",
+                  "user_agent": "%REQ(USER-AGENT)%",
+                  "x_forwarded_for": "%REQ(X-FORWARDED-FOR)%"
+                }
             }
           }
         }
-      ],
+      ]
+    },
+    {
+      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -267,7 +225,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -275,6 +235,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix": "public_listener",
+                "cluster": "local_app",
                 "accessLog": [
                   {
                     "name": "Consul Listener Filter Log",
@@ -282,37 +244,35 @@
                       "@type": "type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog",
                       "logFormat": {
                         "jsonFormat": {
-                          "authority": "%REQ(:AUTHORITY)%",
-                          "bytes_received": "%BYTES_RECEIVED%",
-                          "bytes_sent": "%BYTES_SENT%",
-                          "connection_termination_details": "%CONNECTION_TERMINATION_DETAILS%",
-                          "downstream_local_address": "%DOWNSTREAM_LOCAL_ADDRESS%",
-                          "downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
-                          "duration": "%DURATION%",
-                          "method": "%REQ(:METHOD)%",
-                          "path": "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
-                          "protocol": "%PROTOCOL%",
-                          "request_id": "%REQ(X-REQUEST-ID)%",
-                          "requested_server_name": "%REQUESTED_SERVER_NAME%",
-                          "response_code": "%RESPONSE_CODE%",
-                          "response_code_details": "%RESPONSE_CODE_DETAILS%",
-                          "response_flags": "%RESPONSE_FLAGS%",
-                          "route_name": "%ROUTE_NAME%",
-                          "start_time": "%START_TIME%",
-                          "upstream_cluster": "%UPSTREAM_CLUSTER%",
-                          "upstream_host": "%UPSTREAM_HOST%",
-                          "upstream_local_address": "%UPSTREAM_LOCAL_ADDRESS%",
-                          "upstream_service_time": "%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%",
-                          "upstream_transport_failure_reason": "%UPSTREAM_TRANSPORT_FAILURE_REASON%",
-                          "user_agent": "%REQ(USER-AGENT)%",
-                          "x_forwarded_for": "%REQ(X-FORWARDED-FOR)%"
-                        }
+                            "authority": "%REQ(:AUTHORITY)%",
+                            "bytes_received": "%BYTES_RECEIVED%",
+                            "bytes_sent": "%BYTES_SENT%",
+                            "connection_termination_details": "%CONNECTION_TERMINATION_DETAILS%",
+                            "downstream_local_address": "%DOWNSTREAM_LOCAL_ADDRESS%",
+                            "downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
+                            "duration": "%DURATION%",
+                            "method": "%REQ(:METHOD)%",
+                            "path": "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
+                            "protocol": "%PROTOCOL%",
+                            "request_id": "%REQ(X-REQUEST-ID)%",
+                            "requested_server_name": "%REQUESTED_SERVER_NAME%",
+                            "response_code": "%RESPONSE_CODE%",
+                            "response_code_details": "%RESPONSE_CODE_DETAILS%",
+                            "response_flags": "%RESPONSE_FLAGS%",
+                            "route_name": "%ROUTE_NAME%",
+                            "start_time": "%START_TIME%",
+                            "upstream_cluster": "%UPSTREAM_CLUSTER%",
+                            "upstream_host": "%UPSTREAM_HOST%",
+                            "upstream_local_address": "%UPSTREAM_LOCAL_ADDRESS%",
+                            "upstream_service_time": "%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%",
+                            "upstream_transport_failure_reason": "%UPSTREAM_TRANSPORT_FAILURE_REASON%",
+                            "user_agent": "%REQ(USER-AGENT)%",
+                            "x_forwarded_for": "%REQ(X-FORWARDED-FOR)%"
+                          }
                       }
                     }
                   }
-                ],
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                ]
               }
             }
           ],
@@ -321,6 +281,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -331,7 +294,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -343,10 +305,52 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection": "INBOUND",
+      "accessLog": [
+        {
+          "name": "Consul Listener Log",
+          "filter": {
+            "responseFlagFilter": {
+              "flags": [
+                "NR"
+              ]
+            }
+          },
+          "typedConfig": {
+            "@type": "type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog",
+            "logFormat": {
+              "jsonFormat": {
+                  "authority": "%REQ(:AUTHORITY)%",
+                  "bytes_received": "%BYTES_RECEIVED%",
+                  "bytes_sent": "%BYTES_SENT%",
+                  "connection_termination_details": "%CONNECTION_TERMINATION_DETAILS%",
+                  "downstream_local_address": "%DOWNSTREAM_LOCAL_ADDRESS%",
+                  "downstream_remote_address": "%DOWNSTREAM_REMOTE_ADDRESS%",
+                  "duration": "%DURATION%",
+                  "method": "%REQ(:METHOD)%",
+                  "path": "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%",
+                  "protocol": "%PROTOCOL%",
+                  "request_id": "%REQ(X-REQUEST-ID)%",
+                  "requested_server_name": "%REQUESTED_SERVER_NAME%",
+                  "response_code": "%RESPONSE_CODE%",
+                  "response_code_details": "%RESPONSE_CODE_DETAILS%",
+                  "response_flags": "%RESPONSE_FLAGS%",
+                  "route_name": "%ROUTE_NAME%",
+                  "start_time": "%START_TIME%",
+                  "upstream_cluster": "%UPSTREAM_CLUSTER%",
+                  "upstream_host": "%UPSTREAM_HOST%",
+                  "upstream_local_address": "%UPSTREAM_LOCAL_ADDRESS%",
+                  "upstream_service_time": "%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%",
+                  "upstream_transport_failure_reason": "%UPSTREAM_TRANSPORT_FAILURE_REASON%",
+                  "user_agent": "%REQ(USER-AGENT)%",
+                  "x_forwarded_for": "%REQ(X-FORWARDED-FOR)%"
+                }
+            }
+          }
+        }
+      ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/access-logs-json-file.latest.golden b/agent/xds/testdata/listeners/access-logs-json-file.latest.golden
index f4979a942cc49..c4cfdd467fff1 100644
--- a/agent/xds/testdata/listeners/access-logs-json-file.latest.golden
+++ b/agent/xds/testdata/listeners/access-logs-json-file.latest.golden
@@ -1,29 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "accessLog": [
-        {
-          "filter": {
-            "responseFlagFilter": {
-              "flags": [
-                "NR"
-              ]
-            }
-          },
-          "name": "Consul Listener Log",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog",
-            "logFormat": {
-              "jsonFormat": {
-                "custom_start_time": "%START_TIME%"
-              }
-            },
-            "path": "/tmp/accesslog.txt"
-          }
-        }
-      ],
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -37,34 +17,31 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "accessLog": [
                   {
                     "name": "Consul Listener Filter Log",
                     "typedConfig": {
                       "@type": "type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog",
+                      "path": "/tmp/accesslog.txt",
                       "logFormat": {
                         "jsonFormat": {
-                          "custom_start_time": "%START_TIME%"
-                        }
-                      },
-                      "path": "/tmp/accesslog.txt"
+                            "custom_start_time": "%START_TIME%"
+                          }
+                      }
                     }
                   }
-                ],
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                ]
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "trafficDirection": "OUTBOUND",
       "accessLog": [
         {
+          "name": "Consul Listener Log",
           "filter": {
             "responseFlagFilter": {
               "flags": [
@@ -72,18 +49,21 @@
               ]
             }
           },
-          "name": "Consul Listener Log",
           "typedConfig": {
             "@type": "type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog",
+            "path": "/tmp/accesslog.txt",
             "logFormat": {
               "jsonFormat": {
-                "custom_start_time": "%START_TIME%"
-              }
-            },
-            "path": "/tmp/accesslog.txt"
+                  "custom_start_time": "%START_TIME%"
+                }
+            }
           }
         }
-      ],
+      ]
+    },
+    {
+      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -97,34 +77,31 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
                 "accessLog": [
                   {
                     "name": "Consul Listener Filter Log",
                     "typedConfig": {
                       "@type": "type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog",
+                      "path": "/tmp/accesslog.txt",
                       "logFormat": {
                         "jsonFormat": {
-                          "custom_start_time": "%START_TIME%"
-                        }
-                      },
-                      "path": "/tmp/accesslog.txt"
+                            "custom_start_time": "%START_TIME%"
+                          }
+                      }
                     }
                   }
-                ],
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                ]
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "trafficDirection": "OUTBOUND",
       "accessLog": [
         {
+          "name": "Consul Listener Log",
           "filter": {
             "responseFlagFilter": {
               "flags": [
@@ -132,18 +109,21 @@
               ]
             }
           },
-          "name": "Consul Listener Log",
           "typedConfig": {
             "@type": "type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog",
+            "path": "/tmp/accesslog.txt",
             "logFormat": {
               "jsonFormat": {
-                "custom_start_time": "%START_TIME%"
-              }
-            },
-            "path": "/tmp/accesslog.txt"
+                  "custom_start_time": "%START_TIME%"
+                }
+            }
           }
         }
-      ],
+      ]
+    },
+    {
+      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -157,7 +137,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -165,22 +147,22 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix": "public_listener",
+                "cluster": "local_app",
                 "accessLog": [
                   {
                     "name": "Consul Listener Filter Log",
                     "typedConfig": {
                       "@type": "type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog",
+                      "path": "/tmp/accesslog.txt",
                       "logFormat": {
                         "jsonFormat": {
-                          "custom_start_time": "%START_TIME%"
-                        }
-                      },
-                      "path": "/tmp/accesslog.txt"
+                            "custom_start_time": "%START_TIME%"
+                          }
+                      }
                     }
                   }
-                ],
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                ]
               }
             }
           ],
@@ -189,6 +171,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -199,7 +184,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -211,10 +195,30 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection": "INBOUND",
+      "accessLog": [
+        {
+          "name": "Consul Listener Log",
+          "filter": {
+            "responseFlagFilter": {
+              "flags": [
+                "NR"
+              ]
+            }
+          },
+          "typedConfig": {
+            "@type": "type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog",
+            "path": "/tmp/accesslog.txt",
+            "logFormat": {
+              "jsonFormat": {
+                  "custom_start_time": "%START_TIME%"
+                }
+            }
+          }
+        }
+      ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/access-logs-text-stderr-disablelistenerlogs.latest.golden b/agent/xds/testdata/listeners/access-logs-text-stderr-disablelistenerlogs.latest.golden
index 24e3dac32f743..2a83b761df50d 100644
--- a/agent/xds/testdata/listeners/access-logs-text-stderr-disablelistenerlogs.latest.golden
+++ b/agent/xds/testdata/listeners/access-logs-text-stderr-disablelistenerlogs.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,6 +17,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "accessLog": [
                   {
                     "name": "Consul Listener Filter Log",
@@ -28,19 +31,17 @@
                       }
                     }
                   }
-                ],
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                ]
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -54,6 +55,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
                 "accessLog": [
                   {
                     "name": "Consul Listener Filter Log",
@@ -66,19 +69,17 @@
                       }
                     }
                   }
-                ],
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                ]
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -92,7 +93,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -100,6 +103,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix": "public_listener",
+                "cluster": "local_app",
                 "accessLog": [
                   {
                     "name": "Consul Listener Filter Log",
@@ -112,9 +117,7 @@
                       }
                     }
                   }
-                ],
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                ]
               }
             }
           ],
@@ -123,6 +126,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -133,7 +139,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -145,10 +150,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/api-gateway-http-listener-with-http-route.latest.golden b/agent/xds/testdata/listeners/api-gateway-http-listener-with-http-route.latest.golden
index 6469727f97989..6d9fbd9d35714 100644
--- a/agent/xds/testdata/listeners/api-gateway-http-listener-with-http-route.latest.golden
+++ b/agent/xds/testdata/listeners/api-gateway-http-listener-with-http-route.latest.golden
@@ -1,43 +1,44 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -45,10 +46,9 @@
           ]
         }
       ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/api-gateway-http-listener.latest.golden b/agent/xds/testdata/listeners/api-gateway-http-listener.latest.golden
index 97cdec41ef13e..d2d839adf9567 100644
--- a/agent/xds/testdata/listeners/api-gateway-http-listener.latest.golden
+++ b/agent/xds/testdata/listeners/api-gateway-http-listener.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/api-gateway-nil-config-entry.latest.golden b/agent/xds/testdata/listeners/api-gateway-nil-config-entry.latest.golden
index 97cdec41ef13e..d2d839adf9567 100644
--- a/agent/xds/testdata/listeners/api-gateway-nil-config-entry.latest.golden
+++ b/agent/xds/testdata/listeners/api-gateway-nil-config-entry.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden b/agent/xds/testdata/listeners/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden
index e901812ae0026..d0d593c5adf96 100644
--- a/agent/xds/testdata/listeners/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden
+++ b/agent/xds/testdata/listeners/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden
@@ -1,43 +1,44 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8081
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8081",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8081
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8081",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8081"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8081"
-                },
-                "statPrefix": "ingress_upstream_8081",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -45,35 +46,34 @@
           ]
         }
       ],
-      "name": "http:1.2.3.4:8081",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "tcp-service:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "tcp-service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.tcp-service.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.tcp-service.default.default.dc1",
+                "cluster":  "tcp-service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "tcp-service:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/api-gateway-tcp-listener-with-tcp-route.latest.golden b/agent/xds/testdata/listeners/api-gateway-tcp-listener-with-tcp-route.latest.golden
index 4fe269a90dcb5..ffcb5830b9a4d 100644
--- a/agent/xds/testdata/listeners/api-gateway-tcp-listener-with-tcp-route.latest.golden
+++ b/agent/xds/testdata/listeners/api-gateway-tcp-listener-with-tcp-route.latest.golden
@@ -1,32 +1,32 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "tcp-service:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "tcp-service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.tcp-service.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.tcp-service.default.default.dc1",
+                "cluster":  "tcp-service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "tcp-service:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/api-gateway-tcp-listener.latest.golden b/agent/xds/testdata/listeners/api-gateway-tcp-listener.latest.golden
index 97cdec41ef13e..d2d839adf9567 100644
--- a/agent/xds/testdata/listeners/api-gateway-tcp-listener.latest.golden
+++ b/agent/xds/testdata/listeners/api-gateway-tcp-listener.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/api-gateway-with-http-route-and-inline-certificate.latest.golden b/agent/xds/testdata/listeners/api-gateway-with-http-route-and-inline-certificate.latest.golden
new file mode 100644
index 0000000000000..6d9fbd9d35714
--- /dev/null
+++ b/agent/xds/testdata/listeners/api-gateway-with-http-route-and-inline-certificate.latest.golden
@@ -0,0 +1,54 @@
+{
+  "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
+        }
+      },
+      "filterChains":  [
+        {
+          "filters":  [
+            {
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
+                },
+                "upgradeConfigs":  [
+                  {
+                    "upgradeType":  "websocket"
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ],
+      "trafficDirection":  "OUTBOUND"
+    }
+  ],
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
+}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden b/agent/xds/testdata/listeners/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden
deleted file mode 100644
index dbb15d8751eaf..0000000000000
--- a/agent/xds/testdata/listeners/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_certificate",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICljCCAX4CCQCQMDsYO8FrPjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV\nUzAeFw0yMjEyMjAxNzUwMjVaFw0yNzEyMTkxNzUwMjVaMA0xCzAJBgNVBAYTAlVT\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx95Opa6t4lGEpiTUogEB\nptqOdam2ch4BHQGhNhX/MrDwwuZQhttBwMfngQ/wd9NmYEPAwj0dumUoAITIq6i2\njQlhqTodElkbsd5vWY8R/bxJWQSoNvVE12TlzECxGpJEiHt4W0r8pGffk+rvplji\nUyCfnT1kGF3znOSjK1hRMTn6RKWCyYaBvXQiB4SGilfLgJcEpOJKtISIxmZ+S409\ng9X5VU88/Bmmrz4cMyxce86Kc2ug5/MOv0CjWDJwlrv8njneV2zvraQ61DDwQftr\nXOvuCbO5IBRHMOBHiHTZ4rtGuhMaIr21V4vb6n8c4YzXiFvhUYcyX7rltGZzVd+W\nmQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBfCqoUIdPf/HGSbOorPyZWbyizNtHJ\nGL7x9cAeIYxpI5Y/WcO1o5v94lvrgm3FNfJoGKbV66+JxOge731FrfMpHplhar1Z\nRahYIzNLRBTLrwadLAZkApUpZvB8qDK4knsTWFYujNsylCww2A6ajzIMFNU4GkUK\nNtyHRuD+KYRmjXtyX1yHNqfGN3vOQmwavHq2R8wHYuBSc6LAHHV9vG+j0VsgMELO\nqwxn8SmLkSKbf2+MsQVzLCXXN5u+D8Yv+4py+oKP4EQ5aFZuDEx+r/G/31rTthww\nAAJAMaoXmoYVdgXV+CPuBb2M4XCpuzLu3bcA2PXm5ipSyIgntMKwXV7r\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAx95Opa6t4lGEpiTUogEBptqOdam2ch4BHQGhNhX/MrDwwuZQ\nhttBwMfngQ/wd9NmYEPAwj0dumUoAITIq6i2jQlhqTodElkbsd5vWY8R/bxJWQSo\nNvVE12TlzECxGpJEiHt4W0r8pGffk+rvpljiUyCfnT1kGF3znOSjK1hRMTn6RKWC\nyYaBvXQiB4SGilfLgJcEpOJKtISIxmZ+S409g9X5VU88/Bmmrz4cMyxce86Kc2ug\n5/MOv0CjWDJwlrv8njneV2zvraQ61DDwQftrXOvuCbO5IBRHMOBHiHTZ4rtGuhMa\nIr21V4vb6n8c4YzXiFvhUYcyX7rltGZzVd+WmQIDAQABAoIBACYvceUzp2MK4gYA\nGWPOP2uKbBdM0l+hHeNV0WAM+dHMfmMuL4pkT36ucqt0ySOLjw6rQyOZG5nmA6t9\nsv0g4ae2eCMlyDIeNi1Yavu4Wt6YX4cTXbQKThm83C6W2X9THKbauBbxD621bsDK\n7PhiGPN60yPue7YwFQAPqqD4YaK+s22HFIzk9gwM/rkvAUNwRv7SyHMiFe4Igc1C\nEev7iHWzvj5Heoz6XfF+XNF9DU+TieSUAdjd56VyUb8XL4+uBTOhHwLiXvAmfaMR\nHvpcxeKnYZusS6NaOxcUHiJnsLNWrxmJj9WEGgQzuLxcLjTe4vVmELVZD8t3QUKj\nPAxu8tUCgYEA7KIWVn9dfVpokReorFym+J8FzLwSktP9RZYEMonJo00i8aii3K9s\nu/aSwRWQSCzmON1ZcxZzWhwQF9usz6kGCk//9+4hlVW90GtNK0RD+j7sp4aT2JI8\n9eLEjTG+xSXa7XWe98QncjjL9lu/yrRncSTxHs13q/XP198nn2aYuQ8CgYEA2Dnt\nsRBzv0fFEvzzFv7G/5f85mouN38TUYvxNRTjBLCXl9DeKjDkOVZ2b6qlfQnYXIru\nH+W+v+AZEb6fySXc8FRab7lkgTMrwE+aeI4rkW7asVwtclv01QJ5wMnyT84AgDD/\nDgt/RThFaHgtU9TW5GOZveL+l9fVPn7vKFdTJdcCgYEArJ99zjHxwJ1whNAOk1av\n09UmRPm6TvRo4heTDk8oEoIWCNatoHI0z1YMLuENNSnT9Q280FFDayvnrY/qnD7A\nkktT/sjwJOG8q8trKzIMqQS4XWm2dxoPcIyyOBJfCbEY6XuRsUuePxwh5qF942EB\nyS9a2s6nC4Ix0lgPrqAIr48CgYBgS/Q6riwOXSU8nqCYdiEkBYlhCJrKpnJxF9T1\nofa0yPzKZP/8ZEfP7VzTwHjxJehQ1qLUW9pG08P2biH1UEKEWdzo8vT6wVJT1F/k\nHtTycR8+a+Hlk2SHVRHqNUYQGpuIe8mrdJ1as4Pd0d/F/P0zO9Rlh+mAsGPM8HUM\nT0+9gwKBgHDoerX7NTskg0H0t8O+iSMevdxpEWp34ZYa9gHiftTQGyrRgERCa7Gj\nnZPAxKb2JoWyfnu3v7G5gZ8fhDFsiOxLbZv6UZJBbUIh1MjJISpXrForDrC2QNLX\nkHrHfwBFDB3KMudhQknsJzEJKCL/KmFH6o0MvsoaT9yzEl3K+ah/\n-----END RSA PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {}
-              },
-              "requireClientCertificate": false
-            }
-          }
-        }
-      ],
-      "listenerFilters": [
-        {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
-          }
-        }
-      ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/api-gateway-with-http-route.latest.golden b/agent/xds/testdata/listeners/api-gateway-with-http-route.latest.golden
deleted file mode 100644
index dbb15d8751eaf..0000000000000
--- a/agent/xds/testdata/listeners/api-gateway-with-http-route.latest.golden
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_certificate",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICljCCAX4CCQCQMDsYO8FrPjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV\nUzAeFw0yMjEyMjAxNzUwMjVaFw0yNzEyMTkxNzUwMjVaMA0xCzAJBgNVBAYTAlVT\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx95Opa6t4lGEpiTUogEB\nptqOdam2ch4BHQGhNhX/MrDwwuZQhttBwMfngQ/wd9NmYEPAwj0dumUoAITIq6i2\njQlhqTodElkbsd5vWY8R/bxJWQSoNvVE12TlzECxGpJEiHt4W0r8pGffk+rvplji\nUyCfnT1kGF3znOSjK1hRMTn6RKWCyYaBvXQiB4SGilfLgJcEpOJKtISIxmZ+S409\ng9X5VU88/Bmmrz4cMyxce86Kc2ug5/MOv0CjWDJwlrv8njneV2zvraQ61DDwQftr\nXOvuCbO5IBRHMOBHiHTZ4rtGuhMaIr21V4vb6n8c4YzXiFvhUYcyX7rltGZzVd+W\nmQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBfCqoUIdPf/HGSbOorPyZWbyizNtHJ\nGL7x9cAeIYxpI5Y/WcO1o5v94lvrgm3FNfJoGKbV66+JxOge731FrfMpHplhar1Z\nRahYIzNLRBTLrwadLAZkApUpZvB8qDK4knsTWFYujNsylCww2A6ajzIMFNU4GkUK\nNtyHRuD+KYRmjXtyX1yHNqfGN3vOQmwavHq2R8wHYuBSc6LAHHV9vG+j0VsgMELO\nqwxn8SmLkSKbf2+MsQVzLCXXN5u+D8Yv+4py+oKP4EQ5aFZuDEx+r/G/31rTthww\nAAJAMaoXmoYVdgXV+CPuBb2M4XCpuzLu3bcA2PXm5ipSyIgntMKwXV7r\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAx95Opa6t4lGEpiTUogEBptqOdam2ch4BHQGhNhX/MrDwwuZQ\nhttBwMfngQ/wd9NmYEPAwj0dumUoAITIq6i2jQlhqTodElkbsd5vWY8R/bxJWQSo\nNvVE12TlzECxGpJEiHt4W0r8pGffk+rvpljiUyCfnT1kGF3znOSjK1hRMTn6RKWC\nyYaBvXQiB4SGilfLgJcEpOJKtISIxmZ+S409g9X5VU88/Bmmrz4cMyxce86Kc2ug\n5/MOv0CjWDJwlrv8njneV2zvraQ61DDwQftrXOvuCbO5IBRHMOBHiHTZ4rtGuhMa\nIr21V4vb6n8c4YzXiFvhUYcyX7rltGZzVd+WmQIDAQABAoIBACYvceUzp2MK4gYA\nGWPOP2uKbBdM0l+hHeNV0WAM+dHMfmMuL4pkT36ucqt0ySOLjw6rQyOZG5nmA6t9\nsv0g4ae2eCMlyDIeNi1Yavu4Wt6YX4cTXbQKThm83C6W2X9THKbauBbxD621bsDK\n7PhiGPN60yPue7YwFQAPqqD4YaK+s22HFIzk9gwM/rkvAUNwRv7SyHMiFe4Igc1C\nEev7iHWzvj5Heoz6XfF+XNF9DU+TieSUAdjd56VyUb8XL4+uBTOhHwLiXvAmfaMR\nHvpcxeKnYZusS6NaOxcUHiJnsLNWrxmJj9WEGgQzuLxcLjTe4vVmELVZD8t3QUKj\nPAxu8tUCgYEA7KIWVn9dfVpokReorFym+J8FzLwSktP9RZYEMonJo00i8aii3K9s\nu/aSwRWQSCzmON1ZcxZzWhwQF9usz6kGCk//9+4hlVW90GtNK0RD+j7sp4aT2JI8\n9eLEjTG+xSXa7XWe98QncjjL9lu/yrRncSTxHs13q/XP198nn2aYuQ8CgYEA2Dnt\nsRBzv0fFEvzzFv7G/5f85mouN38TUYvxNRTjBLCXl9DeKjDkOVZ2b6qlfQnYXIru\nH+W+v+AZEb6fySXc8FRab7lkgTMrwE+aeI4rkW7asVwtclv01QJ5wMnyT84AgDD/\nDgt/RThFaHgtU9TW5GOZveL+l9fVPn7vKFdTJdcCgYEArJ99zjHxwJ1whNAOk1av\n09UmRPm6TvRo4heTDk8oEoIWCNatoHI0z1YMLuENNSnT9Q280FFDayvnrY/qnD7A\nkktT/sjwJOG8q8trKzIMqQS4XWm2dxoPcIyyOBJfCbEY6XuRsUuePxwh5qF942EB\nyS9a2s6nC4Ix0lgPrqAIr48CgYBgS/Q6riwOXSU8nqCYdiEkBYlhCJrKpnJxF9T1\nofa0yPzKZP/8ZEfP7VzTwHjxJehQ1qLUW9pG08P2biH1UEKEWdzo8vT6wVJT1F/k\nHtTycR8+a+Hlk2SHVRHqNUYQGpuIe8mrdJ1as4Pd0d/F/P0zO9Rlh+mAsGPM8HUM\nT0+9gwKBgHDoerX7NTskg0H0t8O+iSMevdxpEWp34ZYa9gHiftTQGyrRgERCa7Gj\nnZPAxKb2JoWyfnu3v7G5gZ8fhDFsiOxLbZv6UZJBbUIh1MjJISpXrForDrC2QNLX\nkHrHfwBFDB3KMudhQknsJzEJKCL/KmFH6o0MvsoaT9yzEl3K+ah/\n-----END RSA PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {}
-              },
-              "requireClientCertificate": false
-            }
-          }
-        }
-      ],
-      "listenerFilters": [
-        {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
-          }
-        }
-      ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/api-gateway-with-multiple-inline-certificates.latest.golden b/agent/xds/testdata/listeners/api-gateway-with-multiple-inline-certificates.latest.golden
deleted file mode 100644
index 4cd71ba606b0e..0000000000000
--- a/agent/xds/testdata/listeners/api-gateway-with-multiple-inline-certificates.latest.golden
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
-        }
-      },
-      "filterChains": [
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              ""
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "ingress_upstream_certificate"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICljCCAX4CCQCQMDsYO8FrPjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV\nUzAeFw0yMjEyMjAxNzUwMjVaFw0yNzEyMTkxNzUwMjVaMA0xCzAJBgNVBAYTAlVT\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx95Opa6t4lGEpiTUogEB\nptqOdam2ch4BHQGhNhX/MrDwwuZQhttBwMfngQ/wd9NmYEPAwj0dumUoAITIq6i2\njQlhqTodElkbsd5vWY8R/bxJWQSoNvVE12TlzECxGpJEiHt4W0r8pGffk+rvplji\nUyCfnT1kGF3znOSjK1hRMTn6RKWCyYaBvXQiB4SGilfLgJcEpOJKtISIxmZ+S409\ng9X5VU88/Bmmrz4cMyxce86Kc2ug5/MOv0CjWDJwlrv8njneV2zvraQ61DDwQftr\nXOvuCbO5IBRHMOBHiHTZ4rtGuhMaIr21V4vb6n8c4YzXiFvhUYcyX7rltGZzVd+W\nmQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBfCqoUIdPf/HGSbOorPyZWbyizNtHJ\nGL7x9cAeIYxpI5Y/WcO1o5v94lvrgm3FNfJoGKbV66+JxOge731FrfMpHplhar1Z\nRahYIzNLRBTLrwadLAZkApUpZvB8qDK4knsTWFYujNsylCww2A6ajzIMFNU4GkUK\nNtyHRuD+KYRmjXtyX1yHNqfGN3vOQmwavHq2R8wHYuBSc6LAHHV9vG+j0VsgMELO\nqwxn8SmLkSKbf2+MsQVzLCXXN5u+D8Yv+4py+oKP4EQ5aFZuDEx+r/G/31rTthww\nAAJAMaoXmoYVdgXV+CPuBb2M4XCpuzLu3bcA2PXm5ipSyIgntMKwXV7r\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAx95Opa6t4lGEpiTUogEBptqOdam2ch4BHQGhNhX/MrDwwuZQ\nhttBwMfngQ/wd9NmYEPAwj0dumUoAITIq6i2jQlhqTodElkbsd5vWY8R/bxJWQSo\nNvVE12TlzECxGpJEiHt4W0r8pGffk+rvpljiUyCfnT1kGF3znOSjK1hRMTn6RKWC\nyYaBvXQiB4SGilfLgJcEpOJKtISIxmZ+S409g9X5VU88/Bmmrz4cMyxce86Kc2ug\n5/MOv0CjWDJwlrv8njneV2zvraQ61DDwQftrXOvuCbO5IBRHMOBHiHTZ4rtGuhMa\nIr21V4vb6n8c4YzXiFvhUYcyX7rltGZzVd+WmQIDAQABAoIBACYvceUzp2MK4gYA\nGWPOP2uKbBdM0l+hHeNV0WAM+dHMfmMuL4pkT36ucqt0ySOLjw6rQyOZG5nmA6t9\nsv0g4ae2eCMlyDIeNi1Yavu4Wt6YX4cTXbQKThm83C6W2X9THKbauBbxD621bsDK\n7PhiGPN60yPue7YwFQAPqqD4YaK+s22HFIzk9gwM/rkvAUNwRv7SyHMiFe4Igc1C\nEev7iHWzvj5Heoz6XfF+XNF9DU+TieSUAdjd56VyUb8XL4+uBTOhHwLiXvAmfaMR\nHvpcxeKnYZusS6NaOxcUHiJnsLNWrxmJj9WEGgQzuLxcLjTe4vVmELVZD8t3QUKj\nPAxu8tUCgYEA7KIWVn9dfVpokReorFym+J8FzLwSktP9RZYEMonJo00i8aii3K9s\nu/aSwRWQSCzmON1ZcxZzWhwQF9usz6kGCk//9+4hlVW90GtNK0RD+j7sp4aT2JI8\n9eLEjTG+xSXa7XWe98QncjjL9lu/yrRncSTxHs13q/XP198nn2aYuQ8CgYEA2Dnt\nsRBzv0fFEvzzFv7G/5f85mouN38TUYvxNRTjBLCXl9DeKjDkOVZ2b6qlfQnYXIru\nH+W+v+AZEb6fySXc8FRab7lkgTMrwE+aeI4rkW7asVwtclv01QJ5wMnyT84AgDD/\nDgt/RThFaHgtU9TW5GOZveL+l9fVPn7vKFdTJdcCgYEArJ99zjHxwJ1whNAOk1av\n09UmRPm6TvRo4heTDk8oEoIWCNatoHI0z1YMLuENNSnT9Q280FFDayvnrY/qnD7A\nkktT/sjwJOG8q8trKzIMqQS4XWm2dxoPcIyyOBJfCbEY6XuRsUuePxwh5qF942EB\nyS9a2s6nC4Ix0lgPrqAIr48CgYBgS/Q6riwOXSU8nqCYdiEkBYlhCJrKpnJxF9T1\nofa0yPzKZP/8ZEfP7VzTwHjxJehQ1qLUW9pG08P2biH1UEKEWdzo8vT6wVJT1F/k\nHtTycR8+a+Hlk2SHVRHqNUYQGpuIe8mrdJ1as4Pd0d/F/P0zO9Rlh+mAsGPM8HUM\nT0+9gwKBgHDoerX7NTskg0H0t8O+iSMevdxpEWp34ZYa9gHiftTQGyrRgERCa7Gj\nnZPAxKb2JoWyfnu3v7G5gZ8fhDFsiOxLbZv6UZJBbUIh1MjJISpXrForDrC2QNLX\nkHrHfwBFDB3KMudhQknsJzEJKCL/KmFH6o0MvsoaT9yzEl3K+ah/\n-----END RSA PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {}
-              },
-              "requireClientCertificate": false
-            }
-          }
-        },
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "ingress_upstream_default"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": false
-            }
-          }
-        }
-      ],
-      "listenerFilters": [
-        {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
-          }
-        }
-      ],
-      "name": "service:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/api-gateway-with-tcp-route-and-inline-certificate.latest.golden b/agent/xds/testdata/listeners/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
index a13881b7e525d..3bfbb71f0672f 100644
--- a/agent/xds/testdata/listeners/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
+++ b/agent/xds/testdata/listeners/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
@@ -1,60 +1,60 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "service:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "ingress_upstream_certificate"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "ingress_upstream_certificate",
+                "cluster":  "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICljCCAX4CCQCQMDsYO8FrPjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV\nUzAeFw0yMjEyMjAxNzUwMjVaFw0yNzEyMTkxNzUwMjVaMA0xCzAJBgNVBAYTAlVT\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx95Opa6t4lGEpiTUogEB\nptqOdam2ch4BHQGhNhX/MrDwwuZQhttBwMfngQ/wd9NmYEPAwj0dumUoAITIq6i2\njQlhqTodElkbsd5vWY8R/bxJWQSoNvVE12TlzECxGpJEiHt4W0r8pGffk+rvplji\nUyCfnT1kGF3znOSjK1hRMTn6RKWCyYaBvXQiB4SGilfLgJcEpOJKtISIxmZ+S409\ng9X5VU88/Bmmrz4cMyxce86Kc2ug5/MOv0CjWDJwlrv8njneV2zvraQ61DDwQftr\nXOvuCbO5IBRHMOBHiHTZ4rtGuhMaIr21V4vb6n8c4YzXiFvhUYcyX7rltGZzVd+W\nmQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBfCqoUIdPf/HGSbOorPyZWbyizNtHJ\nGL7x9cAeIYxpI5Y/WcO1o5v94lvrgm3FNfJoGKbV66+JxOge731FrfMpHplhar1Z\nRahYIzNLRBTLrwadLAZkApUpZvB8qDK4knsTWFYujNsylCww2A6ajzIMFNU4GkUK\nNtyHRuD+KYRmjXtyX1yHNqfGN3vOQmwavHq2R8wHYuBSc6LAHHV9vG+j0VsgMELO\nqwxn8SmLkSKbf2+MsQVzLCXXN5u+D8Yv+4py+oKP4EQ5aFZuDEx+r/G/31rTthww\nAAJAMaoXmoYVdgXV+CPuBb2M4XCpuzLu3bcA2PXm5ipSyIgntMKwXV7r\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICljCCAX4CCQCQMDsYO8FrPjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV\nUzAeFw0yMjEyMjAxNzUwMjVaFw0yNzEyMTkxNzUwMjVaMA0xCzAJBgNVBAYTAlVT\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx95Opa6t4lGEpiTUogEB\nptqOdam2ch4BHQGhNhX/MrDwwuZQhttBwMfngQ/wd9NmYEPAwj0dumUoAITIq6i2\njQlhqTodElkbsd5vWY8R/bxJWQSoNvVE12TlzECxGpJEiHt4W0r8pGffk+rvplji\nUyCfnT1kGF3znOSjK1hRMTn6RKWCyYaBvXQiB4SGilfLgJcEpOJKtISIxmZ+S409\ng9X5VU88/Bmmrz4cMyxce86Kc2ug5/MOv0CjWDJwlrv8njneV2zvraQ61DDwQftr\nXOvuCbO5IBRHMOBHiHTZ4rtGuhMaIr21V4vb6n8c4YzXiFvhUYcyX7rltGZzVd+W\nmQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBfCqoUIdPf/HGSbOorPyZWbyizNtHJ\nGL7x9cAeIYxpI5Y/WcO1o5v94lvrgm3FNfJoGKbV66+JxOge731FrfMpHplhar1Z\nRahYIzNLRBTLrwadLAZkApUpZvB8qDK4knsTWFYujNsylCww2A6ajzIMFNU4GkUK\nNtyHRuD+KYRmjXtyX1yHNqfGN3vOQmwavHq2R8wHYuBSc6LAHHV9vG+j0VsgMELO\nqwxn8SmLkSKbf2+MsQVzLCXXN5u+D8Yv+4py+oKP4EQ5aFZuDEx+r/G/31rTthww\nAAJAMaoXmoYVdgXV+CPuBb2M4XCpuzLu3bcA2PXm5ipSyIgntMKwXV7r\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAx95Opa6t4lGEpiTUogEBptqOdam2ch4BHQGhNhX/MrDwwuZQ\nhttBwMfngQ/wd9NmYEPAwj0dumUoAITIq6i2jQlhqTodElkbsd5vWY8R/bxJWQSo\nNvVE12TlzECxGpJEiHt4W0r8pGffk+rvpljiUyCfnT1kGF3znOSjK1hRMTn6RKWC\nyYaBvXQiB4SGilfLgJcEpOJKtISIxmZ+S409g9X5VU88/Bmmrz4cMyxce86Kc2ug\n5/MOv0CjWDJwlrv8njneV2zvraQ61DDwQftrXOvuCbO5IBRHMOBHiHTZ4rtGuhMa\nIr21V4vb6n8c4YzXiFvhUYcyX7rltGZzVd+WmQIDAQABAoIBACYvceUzp2MK4gYA\nGWPOP2uKbBdM0l+hHeNV0WAM+dHMfmMuL4pkT36ucqt0ySOLjw6rQyOZG5nmA6t9\nsv0g4ae2eCMlyDIeNi1Yavu4Wt6YX4cTXbQKThm83C6W2X9THKbauBbxD621bsDK\n7PhiGPN60yPue7YwFQAPqqD4YaK+s22HFIzk9gwM/rkvAUNwRv7SyHMiFe4Igc1C\nEev7iHWzvj5Heoz6XfF+XNF9DU+TieSUAdjd56VyUb8XL4+uBTOhHwLiXvAmfaMR\nHvpcxeKnYZusS6NaOxcUHiJnsLNWrxmJj9WEGgQzuLxcLjTe4vVmELVZD8t3QUKj\nPAxu8tUCgYEA7KIWVn9dfVpokReorFym+J8FzLwSktP9RZYEMonJo00i8aii3K9s\nu/aSwRWQSCzmON1ZcxZzWhwQF9usz6kGCk//9+4hlVW90GtNK0RD+j7sp4aT2JI8\n9eLEjTG+xSXa7XWe98QncjjL9lu/yrRncSTxHs13q/XP198nn2aYuQ8CgYEA2Dnt\nsRBzv0fFEvzzFv7G/5f85mouN38TUYvxNRTjBLCXl9DeKjDkOVZ2b6qlfQnYXIru\nH+W+v+AZEb6fySXc8FRab7lkgTMrwE+aeI4rkW7asVwtclv01QJ5wMnyT84AgDD/\nDgt/RThFaHgtU9TW5GOZveL+l9fVPn7vKFdTJdcCgYEArJ99zjHxwJ1whNAOk1av\n09UmRPm6TvRo4heTDk8oEoIWCNatoHI0z1YMLuENNSnT9Q280FFDayvnrY/qnD7A\nkktT/sjwJOG8q8trKzIMqQS4XWm2dxoPcIyyOBJfCbEY6XuRsUuePxwh5qF942EB\nyS9a2s6nC4Ix0lgPrqAIr48CgYBgS/Q6riwOXSU8nqCYdiEkBYlhCJrKpnJxF9T1\nofa0yPzKZP/8ZEfP7VzTwHjxJehQ1qLUW9pG08P2biH1UEKEWdzo8vT6wVJT1F/k\nHtTycR8+a+Hlk2SHVRHqNUYQGpuIe8mrdJ1as4Pd0d/F/P0zO9Rlh+mAsGPM8HUM\nT0+9gwKBgHDoerX7NTskg0H0t8O+iSMevdxpEWp34ZYa9gHiftTQGyrRgERCa7Gj\nnZPAxKb2JoWyfnu3v7G5gZ8fhDFsiOxLbZv6UZJBbUIh1MjJISpXrForDrC2QNLX\nkHrHfwBFDB3KMudhQknsJzEJKCL/KmFH6o0MvsoaT9yzEl3K+ah/\n-----END RSA PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAx95Opa6t4lGEpiTUogEBptqOdam2ch4BHQGhNhX/MrDwwuZQ\nhttBwMfngQ/wd9NmYEPAwj0dumUoAITIq6i2jQlhqTodElkbsd5vWY8R/bxJWQSo\nNvVE12TlzECxGpJEiHt4W0r8pGffk+rvpljiUyCfnT1kGF3znOSjK1hRMTn6RKWC\nyYaBvXQiB4SGilfLgJcEpOJKtISIxmZ+S409g9X5VU88/Bmmrz4cMyxce86Kc2ug\n5/MOv0CjWDJwlrv8njneV2zvraQ61DDwQftrXOvuCbO5IBRHMOBHiHTZ4rtGuhMa\nIr21V4vb6n8c4YzXiFvhUYcyX7rltGZzVd+WmQIDAQABAoIBACYvceUzp2MK4gYA\nGWPOP2uKbBdM0l+hHeNV0WAM+dHMfmMuL4pkT36ucqt0ySOLjw6rQyOZG5nmA6t9\nsv0g4ae2eCMlyDIeNi1Yavu4Wt6YX4cTXbQKThm83C6W2X9THKbauBbxD621bsDK\n7PhiGPN60yPue7YwFQAPqqD4YaK+s22HFIzk9gwM/rkvAUNwRv7SyHMiFe4Igc1C\nEev7iHWzvj5Heoz6XfF+XNF9DU+TieSUAdjd56VyUb8XL4+uBTOhHwLiXvAmfaMR\nHvpcxeKnYZusS6NaOxcUHiJnsLNWrxmJj9WEGgQzuLxcLjTe4vVmELVZD8t3QUKj\nPAxu8tUCgYEA7KIWVn9dfVpokReorFym+J8FzLwSktP9RZYEMonJo00i8aii3K9s\nu/aSwRWQSCzmON1ZcxZzWhwQF9usz6kGCk//9+4hlVW90GtNK0RD+j7sp4aT2JI8\n9eLEjTG+xSXa7XWe98QncjjL9lu/yrRncSTxHs13q/XP198nn2aYuQ8CgYEA2Dnt\nsRBzv0fFEvzzFv7G/5f85mouN38TUYvxNRTjBLCXl9DeKjDkOVZ2b6qlfQnYXIru\nH+W+v+AZEb6fySXc8FRab7lkgTMrwE+aeI4rkW7asVwtclv01QJ5wMnyT84AgDD/\nDgt/RThFaHgtU9TW5GOZveL+l9fVPn7vKFdTJdcCgYEArJ99zjHxwJ1whNAOk1av\n09UmRPm6TvRo4heTDk8oEoIWCNatoHI0z1YMLuENNSnT9Q280FFDayvnrY/qnD7A\nkktT/sjwJOG8q8trKzIMqQS4XWm2dxoPcIyyOBJfCbEY6XuRsUuePxwh5qF942EB\nyS9a2s6nC4Ix0lgPrqAIr48CgYBgS/Q6riwOXSU8nqCYdiEkBYlhCJrKpnJxF9T1\nofa0yPzKZP/8ZEfP7VzTwHjxJehQ1qLUW9pG08P2biH1UEKEWdzo8vT6wVJT1F/k\nHtTycR8+a+Hlk2SHVRHqNUYQGpuIe8mrdJ1as4Pd0d/F/P0zO9Rlh+mAsGPM8HUM\nT0+9gwKBgHDoerX7NTskg0H0t8O+iSMevdxpEWp34ZYa9gHiftTQGyrRgERCa7Gj\nnZPAxKb2JoWyfnu3v7G5gZ8fhDFsiOxLbZv6UZJBbUIh1MjJISpXrForDrC2QNLX\nkHrHfwBFDB3KMudhQknsJzEJKCL/KmFH6o0MvsoaT9yzEl3K+ah/\n-----END RSA PRIVATE KEY-----\n"
                     }
                   }
-                ],
-                "tlsParams": {}
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "listenerFilters": [
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
+          "name":  "envoy.filters.listener.tls_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
       ],
-      "name": "service:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/api-gateway.latest.golden b/agent/xds/testdata/listeners/api-gateway.latest.golden
index 97cdec41ef13e..d2d839adf9567 100644
--- a/agent/xds/testdata/listeners/api-gateway.latest.golden
+++ b/agent/xds/testdata/listeners/api-gateway.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-exported-to-peers.latest.golden b/agent/xds/testdata/listeners/connect-proxy-exported-to-peers.latest.golden
index 87c86078e7a4f..c61cb12d7139f 100644
--- a/agent/xds/testdata/listeners/connect-proxy-exported-to-peers.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-exported-to-peers.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -16,7 +17,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -24,8 +27,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -34,6 +37,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -44,7 +50,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "customValidatorConfig": {
                     "name": "envoy.tls.cert_validator.spiffe",
@@ -79,10 +84,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-upstream-defaults.latest.golden b/agent/xds/testdata/listeners/connect-proxy-upstream-defaults.latest.golden
index 0254a224d513b..57d50f71c367f 100644
--- a/agent/xds/testdata/listeners/connect-proxy-upstream-defaults.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-upstream-defaults.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,7 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -106,10 +111,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
index 0254a224d513b..5fdd2e351c0e1 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
@@ -1,115 +1,115 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.latest.golden
index bdfe7aa7bd6fa..681779e54e5fa 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.latest.golden
@@ -1,57 +1,58 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "db"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.grpc_stats",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
-                      "statsForAllMethods": true
+                    "name":  "envoy.filters.http.grpc_stats",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
+                      "statsForAllMethods":  true
                     }
                   },
                   {
-                    "name": "envoy.filters.http.grpc_http1_bridge",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
+                    "name":  "envoy.filters.http.grpc_http1_bridge",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "db"
-                },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "http2ProtocolOptions":  {},
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -59,93 +60,92 @@
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
index 7763739e9b6fc..02d749a2c5c25 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
@@ -1,115 +1,115 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.cluster-01.external.peer1.domain",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.cluster-01.external.peer1.domain"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.latest.golden
index 0254a224d513b..57d50f71c367f 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,7 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -106,10 +111,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.latest.golden
index bdfe7aa7bd6fa..681779e54e5fa 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.latest.golden
@@ -1,57 +1,58 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "db"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.grpc_stats",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
-                      "statsForAllMethods": true
+                    "name":  "envoy.filters.http.grpc_stats",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
+                      "statsForAllMethods":  true
                     }
                   },
                   {
-                    "name": "envoy.filters.http.grpc_http1_bridge",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
+                    "name":  "envoy.filters.http.grpc_http1_bridge",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "db"
-                },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "http2ProtocolOptions":  {},
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -59,93 +60,92 @@
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.latest.golden
index 96c6814291eb7..3beeb54d93616 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.latest.golden
@@ -1,43 +1,44 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "db"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "db"
-                },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -45,93 +46,92 @@
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.latest.golden
index e4e738f7751f3..c79f167285c87 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.latest.golden
@@ -1,44 +1,45 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "db"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "db"
-                },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "http2ProtocolOptions":  {},
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -46,93 +47,92 @@
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-jwt-config-entry-with-local.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-jwt-config-entry-with-local.latest.golden
deleted file mode 100644
index e543143959774..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-jwt-config-entry-with-local.latest.golden
+++ /dev/null
@@ -1,278 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.jwt_authn",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication",
-                      "providers": {
-                        "okta": {
-                          "fromCookies": [
-                            "token"
-                          ],
-                          "fromParams": [
-                            "token"
-                          ],
-                          "localJwks": {
-                            "inlineString": "hello world\n"
-                          },
-                          "payloadInMetadata": "jwt_payload_okta"
-                        }
-                      },
-                      "rules": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "requires": {
-                            "requiresAny": {
-                              "requirements": [
-                                {
-                                  "providerName": "okta"
-                                },
-                                {
-                                  "allowMissingOrFailed": {}
-                                }
-                              ]
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\1"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\2"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\3"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\4"
-                            }
-                          }
-                        },
-                        {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
-                              },
-                              "substitution": "\\5"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden
deleted file mode 100644
index 84090d6834380..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "11.11.11.11",
-          "portValue": 11111
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "random-cluster",
-                "statPrefix": "foo-stats"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "payments?peer=cloud:custom-upstream"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9090
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-                "statPrefix": "upstream_peered.refunds.default.cloud"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "refunds?peer=cloud:127.0.0.1:9090",
-      "trafficDirection": "OUTBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-peered-upstreams-http2.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-peered-upstreams-http2.latest.golden
deleted file mode 100644
index 1454379bec488..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-peered-upstreams-http2.latest.golden
+++ /dev/null
@@ -1,189 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9090
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "payments?peer=cloud",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "payments.default.cloud",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "statPrefix": "upstream_peered.payments.default.cloud",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "name": "payments?peer=cloud:127.0.0.1:9090",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9090
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "refunds?peer=cloud",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "refunds.default.cloud",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "statPrefix": "upstream_peered.refunds.default.cloud",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "name": "refunds?peer=cloud:127.0.0.1:9090",
-      "trafficDirection": "OUTBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-peered-upstreams.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-peered-upstreams.latest.golden
index bb4e12a9a6058..d062f6dd5199f 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-peered-upstreams.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "payments?peer=cloud:127.0.0.1:9090",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-                "statPrefix": "upstream_peered.payments.default.cloud"
+                "statPrefix": "upstream_peered.payments.default.cloud",
+                "cluster": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
               }
             }
           ]
         }
       ],
-      "name": "payments?peer=cloud:127.0.0.1:9090",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -41,7 +42,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -49,8 +52,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -59,6 +62,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -69,7 +75,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -81,11 +86,11 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "refunds?peer=cloud:127.0.0.1:9090",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -99,17 +104,16 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-                "statPrefix": "upstream_peered.refunds.default.cloud"
+                "statPrefix": "upstream_peered.refunds.default.cloud",
+                "cluster": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
               }
             }
           ]
         }
       ],
-      "name": "refunds?peer=cloud:127.0.0.1:9090",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden
index 0254a224d513b..57d50f71c367f 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,7 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -106,10 +111,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden
index 0254a224d513b..57d50f71c367f 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,7 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -106,10 +111,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.latest.golden
index 0254a224d513b..57d50f71c367f 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,7 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -106,10 +111,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-cipher-suites.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-cipher-suites.latest.golden
index 356a860c79202..05ed17d4e2df4 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-cipher-suites.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-cipher-suites.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,12 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "cipherSuites": [
+                    "ECDHE-ECDSA-AES128-GCM-SHA256",
+                    "ECDHE-ECDSA-CHACHA20-POLY1305"
+                  ]
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,12 +103,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "cipherSuites": [
-                    "ECDHE-ECDSA-AES128-GCM-SHA256",
-                    "ECDHE-ECDSA-CHACHA20-POLY1305"
-                  ]
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -111,10 +114,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-max-version.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-max-version.latest.golden
index 14f03de9b90f3..8f157291cddbe 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-max-version.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-max-version.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "tlsMaximumProtocolVersion": "TLSv1_2"
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,9 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMaximumProtocolVersion": "TLSv1_2"
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -108,10 +111,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-min-version.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-min-version.latest.golden
index 781d64acee504..1081c4431cb2f 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-min-version.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-min-version.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "tlsMinimumProtocolVersion": "TLSv1_3"
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,9 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_3"
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -108,10 +111,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden
index 0254a224d513b..57d50f71c367f 100644
--- a/agent/xds/testdata/listeners/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden
+++ b/agent/xds/testdata/listeners/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,7 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -106,10 +111,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tproxy-and-permissive-mtls.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tproxy-and-permissive-mtls.latest.golden
deleted file mode 100644
index 93df4d5ac7ecd..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-tproxy-and-permissive-mtls.latest.golden
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 1234
-        }
-      },
-      "defaultFilterChain": {
-        "filters": [
-          {
-            "name": "envoy.filters.network.tcp_proxy",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-              "cluster": "original-destination",
-              "statPrefix": "upstream.original-destination"
-            }
-          }
-        ]
-      },
-      "listenerFilters": [
-        {
-          "name": "envoy.filters.listener.original_dst",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst"
-          }
-        }
-      ],
-      "name": "outbound_listener:127.0.0.1:1234",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        },
-        {
-          "filterChainMatch": {
-            "destinationPort": 8080
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "permissive_public_listener"
-              }
-            }
-          ]
-        }
-      ],
-      "listenerFilters": [
-        {
-          "name": "envoy.filters.listener.original_dst",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst"
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/connect-proxy-without-tproxy-and-permissive-mtls.latest.golden b/agent/xds/testdata/listeners/connect-proxy-without-tproxy-and-permissive-mtls.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-without-tproxy-and-permissive-mtls.latest.golden
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2.latest.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2.latest.golden
index 6ac91607b8af2..4a44d3f6f1f42 100644
--- a/agent/xds/testdata/listeners/custom-public-listener-http-2.latest.golden
+++ b/agent/xds/testdata/listeners/custom-public-listener-http-2.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "custom-public-listen",
       "address": {
         "socketAddress": {
           "address": "11.11.11.11",
@@ -16,26 +17,14 @@
               "name": "envoy.filters.network.http_connection_manager",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router"
-                  }
-                ],
                 "routeConfig": {
                   "name": "public_listener",
                   "virtualHosts": [
                     {
+                      "name": "public_listener",
                       "domains": [
                         "*"
                       ],
-                      "name": "public_listener",
                       "routes": [
                         {
                           "match": {
@@ -48,7 +37,21 @@
                       ]
                     }
                   ]
-                }
+                },
+                "httpFilters": [
+                  {
+                    "name": "envoy.filters.http.rbac",
+                    "typedConfig": {
+                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules": {
+
+                      }
+                    }
+                  },
+                  {
+                    "name": "envoy.filters.http.router"
+                  }
+                ]
               }
             }
           ],
@@ -57,9 +60,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -70,22 +73,24 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols": [
+                  "http/1.1"
+                ]
               },
               "requireClientCertificate": true
             }
           }
         }
-      ],
-      "name": "custom-public-listen"
+      ]
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -99,18 +104,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -124,17 +129,16 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-missing.latest.golden b/agent/xds/testdata/listeners/custom-public-listener-http-missing.latest.golden
index 3a4a224f3c678..bca30941327e4 100644
--- a/agent/xds/testdata/listeners/custom-public-listener-http-missing.latest.golden
+++ b/agent/xds/testdata/listeners/custom-public-listener-http-missing.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "custom-public-listen",
       "address": {
         "socketAddress": {
           "address": "11.11.11.11",
@@ -16,7 +17,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -24,8 +27,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "random-cluster",
-                "statPrefix": "foo-stats"
+                "statPrefix": "foo-stats",
+                "cluster": "random-cluster"
               }
             }
           ],
@@ -34,9 +37,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -47,22 +50,24 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols": [
+                  "http/1.1"
+                ]
               },
               "requireClientCertificate": true
             }
           }
         }
-      ],
-      "name": "custom-public-listen"
+      ]
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -76,18 +81,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -101,17 +106,16 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/custom-public-listener-http.latest.golden b/agent/xds/testdata/listeners/custom-public-listener-http.latest.golden
index 6ac91607b8af2..4a44d3f6f1f42 100644
--- a/agent/xds/testdata/listeners/custom-public-listener-http.latest.golden
+++ b/agent/xds/testdata/listeners/custom-public-listener-http.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "custom-public-listen",
       "address": {
         "socketAddress": {
           "address": "11.11.11.11",
@@ -16,26 +17,14 @@
               "name": "envoy.filters.network.http_connection_manager",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router"
-                  }
-                ],
                 "routeConfig": {
                   "name": "public_listener",
                   "virtualHosts": [
                     {
+                      "name": "public_listener",
                       "domains": [
                         "*"
                       ],
-                      "name": "public_listener",
                       "routes": [
                         {
                           "match": {
@@ -48,7 +37,21 @@
                       ]
                     }
                   ]
-                }
+                },
+                "httpFilters": [
+                  {
+                    "name": "envoy.filters.http.rbac",
+                    "typedConfig": {
+                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules": {
+
+                      }
+                    }
+                  },
+                  {
+                    "name": "envoy.filters.http.router"
+                  }
+                ]
               }
             }
           ],
@@ -57,9 +60,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -70,22 +73,24 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols": [
+                  "http/1.1"
+                ]
               },
               "requireClientCertificate": true
             }
           }
         }
-      ],
-      "name": "custom-public-listen"
+      ]
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -99,18 +104,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -124,17 +129,16 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/custom-public-listener.latest.golden b/agent/xds/testdata/listeners/custom-public-listener.latest.golden
index 03c834c4d7506..99c8f31391b07 100644
--- a/agent/xds/testdata/listeners/custom-public-listener.latest.golden
+++ b/agent/xds/testdata/listeners/custom-public-listener.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "custom-public-listen",
       "address": {
         "socketAddress": {
           "address": "11.11.11.11",
@@ -16,7 +17,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -24,8 +27,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "random-cluster",
-                "statPrefix": "foo-stats"
+                "statPrefix": "foo-stats",
+                "cluster": "random-cluster"
               }
             }
           ],
@@ -34,6 +37,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -44,7 +50,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -55,11 +60,11 @@
             }
           }
         }
-      ],
-      "name": "custom-public-listen"
+      ]
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -73,18 +78,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -98,17 +103,16 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/custom-trace-listener.latest.golden b/agent/xds/testdata/listeners/custom-trace-listener.latest.golden
index b72487ffba023..0788454275de4 100644
--- a/agent/xds/testdata/listeners/custom-trace-listener.latest.golden
+++ b/agent/xds/testdata/listeners/custom-trace-listener.latest.golden
@@ -1,152 +1,174 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "public_listener",
+                "routeConfig":  {
+                  "name":  "public_listener",
+                  "virtualHosts":  [
+                    {
+                      "name":  "public_listener",
+                      "domains":  [
+                        "*"
+                      ],
+                      "routes":  [
+                        {
+                          "match":  {
+                            "prefix":  "/"
+                          },
+                          "route":  {
+                            "cluster":  "local_app"
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
+                    "name":  "envoy.filters.http.header_to_metadata",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
+                      "requestRules":  [
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "trust-domain",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\1"
+                              "substitution":  "\\1"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "partition",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\2"
+                              "substitution":  "\\2"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "namespace",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\3"
+                              "substitution":  "\\3"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "datacenter",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\4"
+                              "substitution":  "\\4"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "service",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\5"
+                              "substitution":  "\\5"
                             }
                           }
                         }
@@ -154,109 +176,87 @@
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
+                "tracing":  {
+                  "customTags":  [
                     {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "customTags": [
-                    {
-                      "requestHeader": {
-                        "name": "x-custom-traceid"
-                      },
-                      "tag": "custom_header"
+                      "tag":  "custom_header",
+                      "requestHeader":  {
+                        "name":  "x-custom-traceid"
+                      }
                     },
                     {
-                      "environment": {
-                        "name": "NOMAD_ALLOC_ID"
-                      },
-                      "tag": "alloc_id"
+                      "tag":  "alloc_id",
+                      "environment":  {
+                        "name":  "NOMAD_ALLOC_ID"
+                      }
                     }
                   ],
-                  "provider": {
-                    "name": "envoy.tracers.zipkin",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.config.trace.v3.ZipkinConfig",
-                      "collectorCluster": "otelcolector",
-                      "collectorEndpoint": "/api/v2/spans",
-                      "collectorEndpointVersion": "HTTP_JSON",
-                      "sharedSpanContext": false
+                  "provider":  {
+                    "name":  "envoy.tracers.zipkin",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.config.trace.v3.ZipkinConfig",
+                      "collectorCluster":  "otelcolector",
+                      "collectorEndpoint":  "/api/v2/spans",
+                      "sharedSpanContext":  false,
+                      "collectorEndpointVersion":  "HTTP_JSON"
                     }
                   }
                 },
-                "upgradeConfigs": [
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
+                },
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.latest.golden b/agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.latest.golden
index 0254a224d513b..57d50f71c367f 100644
--- a/agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.latest.golden
+++ b/agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,7 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -106,10 +111,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/custom-upstream-with-prepared-query.latest.golden b/agent/xds/testdata/listeners/custom-upstream-with-prepared-query.latest.golden
deleted file mode 100644
index ca92cf2177a55..0000000000000
--- a/agent/xds/testdata/listeners/custom-upstream-with-prepared-query.latest.golden
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "11.11.11.11",
-          "portValue": 11111
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "random-cluster",
-                "statPrefix": "foo-stats"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "db:custom-upstream"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
-              }
-            }
-          ]
-        }
-      ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/custom-upstream.latest.golden b/agent/xds/testdata/listeners/custom-upstream.latest.golden
index ca92cf2177a55..d12bdaf998bdc 100644
--- a/agent/xds/testdata/listeners/custom-upstream.latest.golden
+++ b/agent/xds/testdata/listeners/custom-upstream.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:custom-upstream",
       "address": {
         "socketAddress": {
           "address": "11.11.11.11",
@@ -16,17 +17,17 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "random-cluster",
-                "statPrefix": "foo-stats"
+                "statPrefix": "foo-stats",
+                "cluster": "random-cluster"
               }
             }
           ]
         }
-      ],
-      "name": "db:custom-upstream"
+      ]
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -40,18 +41,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -65,7 +66,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -73,8 +76,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -83,6 +86,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -93,7 +99,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -105,10 +110,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/defaults.latest.golden b/agent/xds/testdata/listeners/defaults.latest.golden
index 0254a224d513b..57d50f71c367f 100644
--- a/agent/xds/testdata/listeners/defaults.latest.golden
+++ b/agent/xds/testdata/listeners/defaults.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,7 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -106,10 +111,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/expose-checks-grpc.latest.golden b/agent/xds/testdata/listeners/expose-checks-grpc.latest.golden
deleted file mode 100644
index 38e62d80485f0..0000000000000
--- a/agent/xds/testdata/listeners/expose-checks-grpc.latest.golden
+++ /dev/null
@@ -1,143 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 21501
-        }
-      },
-      "filterChains": [
-        {
-          "filterChainMatch": {
-            "sourcePrefixRanges": [
-              {
-                "addressPrefix": "127.0.0.1",
-                "prefixLen": 8
-              },
-              {
-                "addressPrefix": "192.0.2.1",
-                "prefixLen": 32
-              },
-              {
-                "addressPrefix": "::1",
-                "prefixLen": 128
-              }
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "exposed_path_filter_grpchealthv1HealthCheck_21501",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "exposed_path_filter_grpchealthv1HealthCheck_21501",
-                      "routes": [
-                        {
-                          "match": {
-                            "path": "/grpc.health.v1.Health/Check"
-                          },
-                          "route": {
-                            "cluster": "exposed_cluster_9090"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "statPrefix": "exposed_path_filter_grpchealthv1HealthCheck_21501",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "name": "exposed_path_grpchealthv1HealthCheck:1.2.3.4:21501",
-      "trafficDirection": "INBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 9090
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:1.2.3.4:9090",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/expose-checks-http-with-bind-override.latest.golden b/agent/xds/testdata/listeners/expose-checks-http-with-bind-override.latest.golden
deleted file mode 100644
index 4a112483bfb4c..0000000000000
--- a/agent/xds/testdata/listeners/expose-checks-http-with-bind-override.latest.golden
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "6.7.8.9",
-          "portValue": 21500
-        }
-      },
-      "filterChains": [
-        {
-          "filterChainMatch": {
-            "sourcePrefixRanges": [
-              {
-                "addressPrefix": "127.0.0.1",
-                "prefixLen": 8
-              },
-              {
-                "addressPrefix": "192.0.2.1",
-                "prefixLen": 32
-              },
-              {
-                "addressPrefix": "::1",
-                "prefixLen": 128
-              }
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "exposed_path_filter_debug_21500",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "exposed_path_filter_debug_21500",
-                      "routes": [
-                        {
-                          "match": {
-                            "path": "/debug"
-                          },
-                          "route": {
-                            "cluster": "exposed_cluster_8181"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "statPrefix": "exposed_path_filter_debug_21500",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "name": "exposed_path_debug:6.7.8.9:21500",
-      "trafficDirection": "INBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "6.7.8.9",
-          "portValue": 8080
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:6.7.8.9:8080",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/expose-checks-http.latest.golden b/agent/xds/testdata/listeners/expose-checks-http.latest.golden
deleted file mode 100644
index 2299f061ddec7..0000000000000
--- a/agent/xds/testdata/listeners/expose-checks-http.latest.golden
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 21500
-        }
-      },
-      "filterChains": [
-        {
-          "filterChainMatch": {
-            "sourcePrefixRanges": [
-              {
-                "addressPrefix": "127.0.0.1",
-                "prefixLen": 8
-              },
-              {
-                "addressPrefix": "192.0.2.1",
-                "prefixLen": 32
-              },
-              {
-                "addressPrefix": "::1",
-                "prefixLen": 128
-              }
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "exposed_path_filter_debug_21500",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "exposed_path_filter_debug_21500",
-                      "routes": [
-                        {
-                          "match": {
-                            "path": "/debug"
-                          },
-                          "route": {
-                            "cluster": "exposed_cluster_8181"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "statPrefix": "exposed_path_filter_debug_21500",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "name": "exposed_path_debug:1.2.3.4:21500",
-      "trafficDirection": "INBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        }
-      ],
-      "name": "public_listener:1.2.3.4:8080",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/expose-checks.latest.golden b/agent/xds/testdata/listeners/expose-checks.latest.golden
new file mode 100644
index 0000000000000..bf2fc388963a4
--- /dev/null
+++ b/agent/xds/testdata/listeners/expose-checks.latest.golden
@@ -0,0 +1,142 @@
+{
+  "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "exposed_path_debug:1.2.3.4:21500",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  21500
+        }
+      },
+      "filterChains":  [
+        {
+          "filterChainMatch":  {
+            "sourcePrefixRanges":  [
+              {
+                "addressPrefix":  "127.0.0.1",
+                "prefixLen":  8
+              },
+              {
+                "addressPrefix":  "192.0.2.1",
+                "prefixLen":  32
+              },
+              {
+                "addressPrefix":  "::1",
+                "prefixLen":  128
+              }
+            ]
+          },
+          "filters":  [
+            {
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "exposed_path_filter_debug_21500",
+                "routeConfig":  {
+                  "name":  "exposed_path_filter_debug_21500",
+                  "virtualHosts":  [
+                    {
+                      "name":  "exposed_path_filter_debug_21500",
+                      "domains":  [
+                        "*"
+                      ],
+                      "routes":  [
+                        {
+                          "match":  {
+                            "path":  "/debug"
+                          },
+                          "route":  {
+                            "cluster":  "exposed_cluster_8181"
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
+                },
+                "upgradeConfigs":  [
+                  {
+                    "upgradeType":  "websocket"
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ],
+      "trafficDirection":  "INBOUND"
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
+        }
+      },
+      "filterChains":  [
+        {
+          "filters":  [
+            {
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
+              }
+            },
+            {
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
+              }
+            }
+          ],
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
+                  {
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    },
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    }
+                  }
+                ],
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                  }
+                }
+              },
+              "requireClientCertificate":  true
+            }
+          }
+        }
+      ],
+      "trafficDirection":  "INBOUND"
+    }
+  ],
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
+}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/expose-paths-local-app-paths.latest.golden b/agent/xds/testdata/listeners/expose-paths-local-app-paths.latest.golden
index 819a0c0bbf261..b2adf930ca645 100644
--- a/agent/xds/testdata/listeners/expose-paths-local-app-paths.latest.golden
+++ b/agent/xds/testdata/listeners/expose-paths-local-app-paths.latest.golden
@@ -1,57 +1,58 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 21500
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "exposed_path_health1:1.2.3.4:21500",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  21500
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "exposed_path_filter_health1_21500",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "exposed_path_filter_health1_21500",
+                "routeConfig":  {
+                  "name":  "exposed_path_filter_health1_21500",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "exposed_path_filter_health1_21500",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "exposed_path_filter_health1_21500",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "path": "/health1"
+                          "match":  {
+                            "path":  "/health1"
                           },
-                          "route": {
-                            "cluster": "local_app"
+                          "route":  {
+                            "cluster":  "local_app"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "exposed_path_filter_health1_21500",
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -59,60 +60,60 @@
           ]
         }
       ],
-      "name": "exposed_path_health1:1.2.3.4:21500",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 21501
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "exposed_path_health2:1.2.3.4:21501",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  21501
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "exposed_path_filter_health2_21501",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "exposed_path_filter_health2_21501",
+                "routeConfig":  {
+                  "name":  "exposed_path_filter_health2_21501",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "exposed_path_filter_health2_21501",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "exposed_path_filter_health2_21501",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "path": "/health2"
+                          "match":  {
+                            "path":  "/health2"
                           },
-                          "route": {
-                            "cluster": "local_app"
+                          "route":  {
+                            "cluster":  "local_app"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "exposed_path_filter_health2_21501",
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -120,68 +121,67 @@
           ]
         }
       ],
-      "name": "exposed_path_health2:1.2.3.4:21501",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:1.2.3.4:8080",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.latest.golden b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.latest.golden
index 5b19b4e74dbbb..1a54244e3b5cb 100644
--- a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.latest.golden
+++ b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.latest.golden
@@ -1,58 +1,59 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 21501
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "exposed_path_grpchealthv1HealthCheck:1.2.3.4:21501",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  21501
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "exposed_path_filter_grpchealthv1HealthCheck_21501",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "exposed_path_filter_grpchealthv1HealthCheck_21501",
+                "routeConfig":  {
+                  "name":  "exposed_path_filter_grpchealthv1HealthCheck_21501",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "exposed_path_filter_grpchealthv1HealthCheck_21501",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "exposed_path_filter_grpchealthv1HealthCheck_21501",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "path": "/grpc.health.v1.Health/Check"
+                          "match":  {
+                            "path":  "/grpc.health.v1.Health/Check"
                           },
-                          "route": {
-                            "cluster": "exposed_cluster_9090"
+                          "route":  {
+                            "cluster":  "exposed_cluster_9090"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "exposed_path_filter_grpchealthv1HealthCheck_21501",
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "http2ProtocolOptions":  {},
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -60,60 +61,60 @@
           ]
         }
       ],
-      "name": "exposed_path_grpchealthv1HealthCheck:1.2.3.4:21501",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 21500
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "exposed_path_health1:1.2.3.4:21500",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  21500
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "exposed_path_filter_health1_21500",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "exposed_path_filter_health1_21500",
+                "routeConfig":  {
+                  "name":  "exposed_path_filter_health1_21500",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "exposed_path_filter_health1_21500",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "exposed_path_filter_health1_21500",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "path": "/health1"
+                          "match":  {
+                            "path":  "/health1"
                           },
-                          "route": {
-                            "cluster": "local_app"
+                          "route":  {
+                            "cluster":  "local_app"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "exposed_path_filter_health1_21500",
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -121,68 +122,67 @@
           ]
         }
       ],
-      "name": "exposed_path_health1:1.2.3.4:21500",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:1.2.3.4:8080",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/grpc-public-listener.latest.golden b/agent/xds/testdata/listeners/grpc-public-listener.latest.golden
index ac7d70ab1f27f..ba44b1c438dbb 100644
--- a/agent/xds/testdata/listeners/grpc-public-listener.latest.golden
+++ b/agent/xds/testdata/listeners/grpc-public-listener.latest.golden
@@ -1,168 +1,168 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "public_listener",
+                "routeConfig":  {
+                  "name":  "public_listener",
+                  "virtualHosts":  [
+                    {
+                      "name":  "public_listener",
+                      "domains":  [
+                        "*"
+                      ],
+                      "routes":  [
+                        {
+                          "match":  {
+                            "prefix":  "/"
+                          },
+                          "route":  {
+                            "cluster":  "local_app"
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.grpc_stats",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
-                      "statsForAllMethods": true
+                    "name":  "envoy.filters.http.grpc_stats",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
+                      "statsForAllMethods":  true
                     }
                   },
                   {
-                    "name": "envoy.filters.http.grpc_http1_bridge",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
+                    "name":  "envoy.filters.http.grpc_http1_bridge",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
                     }
                   },
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "http2ProtocolOptions":  {},
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "h2",
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "h2",
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/http-listener-with-timeouts.latest.golden b/agent/xds/testdata/listeners/http-listener-with-timeouts.latest.golden
index a5e8bc06745f7..5a7e86fa15151 100644
--- a/agent/xds/testdata/listeners/http-listener-with-timeouts.latest.golden
+++ b/agent/xds/testdata/listeners/http-listener-with-timeouts.latest.golden
@@ -1,152 +1,176 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "public_listener",
+                "routeConfig":  {
+                  "name":  "public_listener",
+                  "virtualHosts":  [
+                    {
+                      "name":  "public_listener",
+                      "domains":  [
+                        "*"
+                      ],
+                      "routes":  [
+                        {
+                          "match":  {
+                            "prefix":  "/"
+                          },
+                          "route":  {
+                            "cluster":  "local_app",
+                            "timeout":  "2.345s",
+                            "idleTimeout":  "3.456s"
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
+                    "name":  "envoy.filters.http.header_to_metadata",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
+                      "requestRules":  [
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "trust-domain",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\1"
+                              "substitution":  "\\1"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "partition",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\2"
+                              "substitution":  "\\2"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "namespace",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\3"
+                              "substitution":  "\\3"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "datacenter",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\4"
+                              "substitution":  "\\4"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "service",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\5"
+                              "substitution":  "\\5"
                             }
                           }
                         }
@@ -154,88 +178,64 @@
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app",
-                            "idleTimeout": "3.456s",
-                            "timeout": "2.345s"
-                          }
-                        }
-                      ]
-                    }
-                  ]
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/http-public-listener-no-xfcc.latest.golden b/agent/xds/testdata/listeners/http-public-listener-no-xfcc.latest.golden
index 66401ec1169d7..c5a0f0a846de6 100644
--- a/agent/xds/testdata/listeners/http-public-listener-no-xfcc.latest.golden
+++ b/agent/xds/testdata/listeners/http-public-listener-no-xfcc.latest.golden
@@ -1,153 +1,153 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "public_listener",
+                "routeConfig":  {
+                  "name":  "public_listener",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "public_listener",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "public_listener",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "prefix": "/"
+                          "match":  {
+                            "prefix":  "/"
                           },
-                          "route": {
-                            "cluster": "local_app"
+                          "route":  {
+                            "cluster":  "local_app"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
+                    }
+                  },
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/http-public-listener.latest.golden b/agent/xds/testdata/listeners/http-public-listener.latest.golden
index cec77f10e445b..c3353e6fb6bb4 100644
--- a/agent/xds/testdata/listeners/http-public-listener.latest.golden
+++ b/agent/xds/testdata/listeners/http-public-listener.latest.golden
@@ -1,152 +1,174 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "public_listener",
+                "routeConfig":  {
+                  "name":  "public_listener",
+                  "virtualHosts":  [
+                    {
+                      "name":  "public_listener",
+                      "domains":  [
+                        "*"
+                      ],
+                      "routes":  [
+                        {
+                          "match":  {
+                            "prefix":  "/"
+                          },
+                          "route":  {
+                            "cluster":  "local_app"
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
+                    "name":  "envoy.filters.http.header_to_metadata",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
+                      "requestRules":  [
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "trust-domain",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\1"
+                              "substitution":  "\\1"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "partition",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\2"
+                              "substitution":  "\\2"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "namespace",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\3"
+                              "substitution":  "\\3"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "datacenter",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\4"
+                              "substitution":  "\\4"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "service",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\5"
+                              "substitution":  "\\5"
                             }
                           }
                         }
@@ -154,86 +176,64 @@
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/http-upstream.latest.golden b/agent/xds/testdata/listeners/http-upstream.latest.golden
index 1d8fd316ec2fc..71f4ce9ac5aab 100644
--- a/agent/xds/testdata/listeners/http-upstream.latest.golden
+++ b/agent/xds/testdata/listeners/http-upstream.latest.golden
@@ -1,57 +1,58 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "db",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "routeConfig":  {
+                  "name":  "db",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "db.default.default.dc1",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "db.default.default.dc1",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "prefix": "/"
+                          "match":  {
+                            "prefix":  "/"
                           },
-                          "route": {
-                            "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                          "route":  {
+                            "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -59,93 +60,92 @@
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/http2-public-listener.latest.golden b/agent/xds/testdata/listeners/http2-public-listener.latest.golden
index f78e46d253489..ea4cf1e6d3c20 100644
--- a/agent/xds/testdata/listeners/http2-public-listener.latest.golden
+++ b/agent/xds/testdata/listeners/http2-public-listener.latest.golden
@@ -1,153 +1,174 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "public_listener",
+                "routeConfig":  {
+                  "name":  "public_listener",
+                  "virtualHosts":  [
+                    {
+                      "name":  "public_listener",
+                      "domains":  [
+                        "*"
+                      ],
+                      "routes":  [
+                        {
+                          "match":  {
+                            "prefix":  "/"
+                          },
+                          "route":  {
+                            "cluster":  "local_app"
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.header_to_metadata",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
-                      "requestRules": [
+                    "name":  "envoy.filters.http.header_to_metadata",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.header_to_metadata.v3.Config",
+                      "requestRules":  [
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "trust-domain",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "trust-domain",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\1"
+                              "substitution":  "\\1"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "partition",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "partition",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\2"
+                              "substitution":  "\\2"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "namespace",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "namespace",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\3"
+                              "substitution":  "\\3"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "datacenter",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "datacenter",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\4"
+                              "substitution":  "\\4"
                             }
                           }
                         },
                         {
-                          "header": "x-forwarded-client-cert",
-                          "onHeaderPresent": {
-                            "key": "service",
-                            "metadataNamespace": "consul",
-                            "regexValueRewrite": {
-                              "pattern": {
-                                "googleRe2": {},
-                                "regex": ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
+                          "header":  "x-forwarded-client-cert",
+                          "onHeaderPresent":  {
+                            "metadataNamespace":  "consul",
+                            "key":  "service",
+                            "regexValueRewrite":  {
+                              "pattern":  {
+                                "googleRe2":  {},
+                                "regex":  ".*URI=spiffe://([^/]+.[^/]+)(?:/ap/([^/]+))?/ns/([^/]+)/dc/([^/]+)/svc/([^/;,]+).*"
                               },
-                              "substitution": "\\5"
+                              "substitution":  "\\5"
                             }
                           }
                         }
@@ -155,87 +176,66 @@
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "routeConfig": {
-                  "name": "public_listener",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "public_listener",
-                "tracing": {
-                  "randomSampling": {}
+                "http2ProtocolOptions":  {},
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "h2",
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "h2",
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.latest.golden b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.latest.golden
index bc0850f80a6ec..dc299d550663c 100644
--- a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:10.0.0.1:8080",
       "address": {
         "socketAddress": {
           "address": "10.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:10.0.0.1:8080",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:172.16.0.1:8080",
       "address": {
         "socketAddress": {
           "address": "172.16.0.1",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:172.16.0.1:8080",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:8.8.8.8:8080",
       "address": {
         "socketAddress": {
           "address": "8.8.8.8",
@@ -66,17 +67,16 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:8.8.8.8:8080",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-gateway-nil-config-entry.latest.golden b/agent/xds/testdata/listeners/ingress-gateway-nil-config-entry.latest.golden
index 97cdec41ef13e..53b67bb37300e 100644
--- a/agent/xds/testdata/listeners/ingress-gateway-nil-config-entry.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-gateway-nil-config-entry.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-gateway-no-services.latest.golden b/agent/xds/testdata/listeners/ingress-gateway-no-services.latest.golden
index 97cdec41ef13e..53b67bb37300e 100644
--- a/agent/xds/testdata/listeners/ingress-gateway-no-services.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-gateway-no-services.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-gateway.latest.golden b/agent/xds/testdata/listeners/ingress-gateway.latest.golden
index 068e01983c926..30994abe6e1d8 100644
--- a/agent/xds/testdata/listeners/ingress-gateway.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-gateway.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:1.2.3.4:8080",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -16,17 +17,16 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:1.2.3.4:8080",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-grpc-multiple-services.latest.golden b/agent/xds/testdata/listeners/ingress-grpc-multiple-services.latest.golden
index 803d57e307850..1651958dfe50a 100644
--- a/agent/xds/testdata/listeners/ingress-grpc-multiple-services.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-grpc-multiple-services.latest.golden
@@ -1,57 +1,58 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "grpc:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.grpc_stats",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
-                      "statsForAllMethods": true
+                    "name":  "envoy.filters.http.grpc_stats",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
+                      "statsForAllMethods":  true
                     }
                   },
                   {
-                    "name": "envoy.filters.http.grpc_http1_bridge",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
+                    "name":  "envoy.filters.http.grpc_http1_bridge",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "http2ProtocolOptions":  {},
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -59,10 +60,9 @@
           ]
         }
       ],
-      "name": "grpc:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.latest.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.latest.golden
index 63affa4498850..b2cfb99b75ba2 100644
--- a/agent/xds/testdata/listeners/ingress-http-multiple-services.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-http-multiple-services.latest.golden
@@ -1,43 +1,44 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 443
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:443",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  443
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_443",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "443"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "443"
-                },
-                "statPrefix": "ingress_upstream_443",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -45,46 +46,46 @@
           ]
         }
       ],
-      "name": "http:1.2.3.4:443",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -92,10 +93,9 @@
           ]
         }
       ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.latest.golden
index 6469727f97989..6d9fbd9d35714 100644
--- a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.latest.golden
@@ -1,43 +1,44 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -45,10 +46,9 @@
           ]
         }
       ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.latest.golden b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.latest.golden
index 068e01983c926..30994abe6e1d8 100644
--- a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:1.2.3.4:8080",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -16,17 +17,16 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:1.2.3.4:8080",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-grpc-single-tls-listener.latest.golden b/agent/xds/testdata/listeners/ingress-with-grpc-single-tls-listener.latest.golden
index 77dc9a203001b..8fa2191d86e7b 100644
--- a/agent/xds/testdata/listeners/ingress-with-grpc-single-tls-listener.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-grpc-single-tls-listener.latest.golden
@@ -1,57 +1,58 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "grpc:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.grpc_stats",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
-                      "statsForAllMethods": true
+                    "name":  "envoy.filters.http.grpc_stats",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
+                      "statsForAllMethods":  true
                     }
                   },
                   {
-                    "name": "envoy.filters.http.grpc_http1_bridge",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
+                    "name":  "envoy.filters.http.grpc_http1_bridge",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "http2ProtocolOptions":  {},
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -59,102 +60,101 @@
           ]
         }
       ],
-      "name": "grpc:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8081
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "grpc:1.2.3.4:8081",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8081
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8081",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8081"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.grpc_stats",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
-                      "statsForAllMethods": true
+                    "name":  "envoy.filters.http.grpc_stats",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
+                      "statsForAllMethods":  true
                     }
                   },
                   {
-                    "name": "envoy.filters.http.grpc_http1_bridge",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
+                    "name":  "envoy.filters.http.grpc_http1_bridge",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8081"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "ingress_upstream_8081",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "http2ProtocolOptions":  {},
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "h2",
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {
+                  "tlsMinimumProtocolVersion":  "TLSv1_2"
+                },
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_2"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "h2",
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "grpc:1.2.3.4:8081",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden b/agent/xds/testdata/listeners/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden
index ce525f52e415c..af928c59a3db9 100644
--- a/agent/xds/testdata/listeners/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden
@@ -1,178 +1,178 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "grpc:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.grpc_stats",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
-                      "statsForAllMethods": true
+                    "name":  "envoy.filters.http.grpc_stats",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
+                      "statsForAllMethods":  true
                     }
                   },
                   {
-                    "name": "envoy.filters.http.grpc_http1_bridge",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
+                    "name":  "envoy.filters.http.grpc_http1_bridge",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "http2ProtocolOptions":  {},
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "h2",
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {
+                  "tlsMinimumProtocolVersion":  "TLSv1_2"
+                },
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_2"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "h2",
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "grpc:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8081
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http2:1.2.3.4:8081",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8081
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8081",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8081"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8081"
-                },
-                "statPrefix": "ingress_upstream_8081",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "http2ProtocolOptions":  {},
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "h2",
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {
+                  "tlsMinimumProtocolVersion":  "TLSv1_2"
+                },
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_2"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "h2",
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "http2:1.2.3.4:8081",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-http2-single-tls-listener.latest.golden b/agent/xds/testdata/listeners/ingress-with-http2-single-tls-listener.latest.golden
index 0294349114cba..c839133a9c221 100644
--- a/agent/xds/testdata/listeners/ingress-with-http2-single-tls-listener.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-http2-single-tls-listener.latest.golden
@@ -1,44 +1,45 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http2:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "http2ProtocolOptions":  {},
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -46,89 +47,88 @@
           ]
         }
       ],
-      "name": "http2:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8081
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http2:1.2.3.4:8081",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8081
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8081",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8081"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8081"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "ingress_upstream_8081",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "http2ProtocolOptions":  {},
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "h2",
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {
+                  "tlsMinimumProtocolVersion":  "TLSv1_2"
+                },
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_2"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "h2",
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "http2:1.2.3.4:8081",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.latest.golden
index e43f5f67b4e56..0c7fd69d5c853 100644
--- a/agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.latest.golden
@@ -1,167 +1,167 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "s1.example.com"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080_s1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080_s1"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080_s1"
-                },
-                "statPrefix": "ingress_upstream_8080_s1",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificateSdsSecretConfigs": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificateSdsSecretConfigs":  [
                   {
-                    "name": "s1.example.com-cert",
-                    "sdsConfig": {
-                      "apiConfigSource": {
-                        "apiType": "GRPC",
-                        "grpcServices": [
+                    "name":  "s1.example.com-cert",
+                    "sdsConfig":  {
+                      "apiConfigSource":  {
+                        "apiType":  "GRPC",
+                        "transportApiVersion":  "V3",
+                        "grpcServices":  [
                           {
-                            "envoyGrpc": {
-                              "clusterName": "sds-cluster-1"
+                            "envoyGrpc":  {
+                              "clusterName":  "sds-cluster-1"
                             },
-                            "timeout": "5s"
+                            "timeout":  "5s"
                           }
-                        ],
-                        "transportApiVersion": "V3"
+                        ]
                       },
-                      "resourceApiVersion": "V3"
+                      "resourceApiVersion":  "V3"
                     }
                   }
                 ],
-                "tlsParams": {}
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         },
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificateSdsSecretConfigs": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificateSdsSecretConfigs":  [
                   {
-                    "name": "*.example.com-cert",
-                    "sdsConfig": {
-                      "apiConfigSource": {
-                        "apiType": "GRPC",
-                        "grpcServices": [
+                    "name":  "*.example.com-cert",
+                    "sdsConfig":  {
+                      "apiConfigSource":  {
+                        "apiType":  "GRPC",
+                        "transportApiVersion":  "V3",
+                        "grpcServices":  [
                           {
-                            "envoyGrpc": {
-                              "clusterName": "sds-cluster-2"
+                            "envoyGrpc":  {
+                              "clusterName":  "sds-cluster-2"
                             },
-                            "timeout": "5s"
+                            "timeout":  "5s"
                           }
-                        ],
-                        "transportApiVersion": "V3"
+                        ]
                       },
-                      "resourceApiVersion": "V3"
+                      "resourceApiVersion":  "V3"
                     }
                   }
                 ],
-                "tlsParams": {}
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "listenerFilters": [
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
+          "name":  "envoy.filters.listener.tls_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
       ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.latest.golden
index b17f8d029099a..9ecf3d995f914 100644
--- a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.latest.golden
@@ -1,87 +1,87 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificateSdsSecretConfigs": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificateSdsSecretConfigs":  [
                   {
-                    "name": "listener-cert",
-                    "sdsConfig": {
-                      "apiConfigSource": {
-                        "apiType": "GRPC",
-                        "grpcServices": [
+                    "name":  "listener-cert",
+                    "sdsConfig":  {
+                      "apiConfigSource":  {
+                        "apiType":  "GRPC",
+                        "transportApiVersion":  "V3",
+                        "grpcServices":  [
                           {
-                            "envoyGrpc": {
-                              "clusterName": "sds-cluster"
+                            "envoyGrpc":  {
+                              "clusterName":  "sds-cluster"
                             },
-                            "timeout": "5s"
+                            "timeout":  "5s"
                           }
-                        ],
-                        "transportApiVersion": "V3"
+                        ]
                       },
-                      "resourceApiVersion": "V3"
+                      "resourceApiVersion":  "V3"
                     }
                   }
                 ],
-                "tlsParams": {}
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden
index 0ce1816024d1d..8500d36f4dbb1 100644
--- a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "insecure:1.2.3.4:9090",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "insecure.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.insecure.default.default.dc1"
+                "statPrefix": "upstream.insecure.default.default.dc1",
+                "cluster": "insecure.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "insecure:1.2.3.4:9090",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "secure:1.2.3.4:8080",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -41,8 +42,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "secure.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.secure.default.default.dc1"
+                "statPrefix": "upstream.secure.default.default.dc1",
+                "cluster": "secure.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -51,12 +52,16 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificateSdsSecretConfigs": [
                   {
                     "name": "listener-cert",
                     "sdsConfig": {
                       "apiConfigSource": {
                         "apiType": "GRPC",
+                        "transportApiVersion": "V3",
                         "grpcServices": [
                           {
                             "envoyGrpc": {
@@ -64,24 +69,21 @@
                             },
                             "timeout": "5s"
                           }
-                        ],
-                        "transportApiVersion": "V3"
+                        ]
                       },
                       "resourceApiVersion": "V3"
                     }
                   }
-                ],
-                "tlsParams": {}
+                ]
               },
               "requireClientCertificate": false
             }
           }
         }
       ],
-      "name": "secure:1.2.3.4:8080",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.latest.golden
index ae51e3b211b8a..171b26a5a98c1 100644
--- a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:1.2.3.4:8080",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -16,8 +17,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -26,12 +27,16 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificateSdsSecretConfigs": [
                   {
                     "name": "cert-resource",
                     "sdsConfig": {
                       "apiConfigSource": {
                         "apiType": "GRPC",
+                        "transportApiVersion": "V3",
                         "grpcServices": [
                           {
                             "envoyGrpc": {
@@ -39,24 +44,21 @@
                             },
                             "timeout": "5s"
                           }
-                        ],
-                        "transportApiVersion": "V3"
+                        ]
                       },
                       "resourceApiVersion": "V3"
                     }
                   }
-                ],
-                "tlsParams": {}
+                ]
               },
               "requireClientCertificate": false
             }
           }
         }
       ],
-      "name": "db:1.2.3.4:8080",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.latest.golden
index eefa56951233f..aabf3d6f9884f 100644
--- a/agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:1.2.3.4:8080",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -16,8 +17,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -26,12 +27,16 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificateSdsSecretConfigs": [
                   {
                     "name": "listener-cert",
                     "sdsConfig": {
                       "apiConfigSource": {
                         "apiType": "GRPC",
+                        "transportApiVersion": "V3",
                         "grpcServices": [
                           {
                             "envoyGrpc": {
@@ -39,24 +44,21 @@
                             },
                             "timeout": "5s"
                           }
-                        ],
-                        "transportApiVersion": "V3"
+                        ]
                       },
                       "resourceApiVersion": "V3"
                     }
                   }
-                ],
-                "tlsParams": {}
+                ]
               },
               "requireClientCertificate": false
             }
           }
         }
       ],
-      "name": "db:1.2.3.4:8080",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.latest.golden
index a91219b50697b..243845bd4aaa7 100644
--- a/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.latest.golden
@@ -1,115 +1,116 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "s1.example.com"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080_s1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080_s1"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080_s1"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "ingress_upstream_8080_s1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificateSdsSecretConfigs": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificateSdsSecretConfigs":  [
                   {
-                    "name": "s1.example.com-cert",
-                    "sdsConfig": {
-                      "apiConfigSource": {
-                        "apiType": "GRPC",
-                        "grpcServices": [
+                    "name":  "s1.example.com-cert",
+                    "sdsConfig":  {
+                      "apiConfigSource":  {
+                        "apiType":  "GRPC",
+                        "transportApiVersion":  "V3",
+                        "grpcServices":  [
                           {
-                            "envoyGrpc": {
-                              "clusterName": "sds-cluster-1"
+                            "envoyGrpc":  {
+                              "clusterName":  "sds-cluster-1"
                             },
-                            "timeout": "5s"
+                            "timeout":  "5s"
                           }
-                        ],
-                        "transportApiVersion": "V3"
+                        ]
                       },
-                      "resourceApiVersion": "V3"
+                      "resourceApiVersion":  "V3"
                     }
                   }
                 ],
-                "tlsParams": {}
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         },
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -117,18 +118,17 @@
           ]
         }
       ],
-      "listenerFilters": [
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
+          "name":  "envoy.filters.listener.tls_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
       ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-sds-service-level.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-service-level.latest.golden
index 7f7308a4f982a..2c34a6b7b685b 100644
--- a/agent/xds/testdata/listeners/ingress-with-sds-service-level.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-sds-service-level.latest.golden
@@ -1,172 +1,172 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "s1.example.com"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080_s1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080_s1"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080_s1"
-                },
-                "statPrefix": "ingress_upstream_8080_s1",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificateSdsSecretConfigs": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificateSdsSecretConfigs":  [
                   {
-                    "name": "s1.example.com-cert",
-                    "sdsConfig": {
-                      "apiConfigSource": {
-                        "apiType": "GRPC",
-                        "grpcServices": [
+                    "name":  "s1.example.com-cert",
+                    "sdsConfig":  {
+                      "apiConfigSource":  {
+                        "apiType":  "GRPC",
+                        "transportApiVersion":  "V3",
+                        "grpcServices":  [
                           {
-                            "envoyGrpc": {
-                              "clusterName": "sds-cluster-1"
+                            "envoyGrpc":  {
+                              "clusterName":  "sds-cluster-1"
                             },
-                            "timeout": "5s"
+                            "timeout":  "5s"
                           }
-                        ],
-                        "transportApiVersion": "V3"
+                        ]
                       },
-                      "resourceApiVersion": "V3"
+                      "resourceApiVersion":  "V3"
                     }
                   }
                 ],
-                "tlsParams": {}
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "s2.example.com"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080_s2",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080_s2"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080_s2"
-                },
-                "statPrefix": "ingress_upstream_8080_s2",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificateSdsSecretConfigs": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificateSdsSecretConfigs":  [
                   {
-                    "name": "s2.example.com-cert",
-                    "sdsConfig": {
-                      "apiConfigSource": {
-                        "apiType": "GRPC",
-                        "grpcServices": [
+                    "name":  "s2.example.com-cert",
+                    "sdsConfig":  {
+                      "apiConfigSource":  {
+                        "apiType":  "GRPC",
+                        "transportApiVersion":  "V3",
+                        "grpcServices":  [
                           {
-                            "envoyGrpc": {
-                              "clusterName": "sds-cluster-2"
+                            "envoyGrpc":  {
+                              "clusterName":  "sds-cluster-2"
                             },
-                            "timeout": "5s"
+                            "timeout":  "5s"
                           }
-                        ],
-                        "transportApiVersion": "V3"
+                        ]
                       },
-                      "resourceApiVersion": "V3"
+                      "resourceApiVersion":  "V3"
                     }
                   }
                 ],
-                "tlsParams": {}
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "listenerFilters": [
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
+          "name":  "envoy.filters.listener.tls_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
       ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-single-tls-listener.latest.golden b/agent/xds/testdata/listeners/ingress-with-single-tls-listener.latest.golden
index 0eeae2d616952..6bdf074f483cc 100644
--- a/agent/xds/testdata/listeners/ingress-with-single-tls-listener.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-single-tls-listener.latest.golden
@@ -1,43 +1,44 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -45,87 +46,86 @@
           ]
         }
       ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8081
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8081",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8081
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8081",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8081"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8081"
-                },
-                "statPrefix": "ingress_upstream_8081",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {
+                  "tlsMinimumProtocolVersion":  "TLSv1_2"
+                },
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_2"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "http:1.2.3.4:8081",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden
index 068e01983c926..30994abe6e1d8 100644
--- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:1.2.3.4:8080",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -16,17 +17,16 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:1.2.3.4:8080",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden
index 068e01983c926..30994abe6e1d8 100644
--- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:1.2.3.4:8080",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -16,17 +17,16 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:1.2.3.4:8080",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener-cipher-suites.latest.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener-cipher-suites.latest.golden
index f988e1a6ebb0e..516f4b8a25653 100644
--- a/agent/xds/testdata/listeners/ingress-with-tls-listener-cipher-suites.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-tls-listener-cipher-suites.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:1.2.3.4:8080",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -16,8 +17,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -26,6 +27,12 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "cipherSuites": [
+                    "ECDHE-ECDSA-AES128-GCM-SHA256",
+                    "ECDHE-ECDSA-CHACHA20-POLY1305"
+                  ]
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -36,12 +43,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "cipherSuites": [
-                    "ECDHE-ECDSA-AES128-GCM-SHA256",
-                    "ECDHE-ECDSA-CHACHA20-POLY1305"
-                  ]
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -53,10 +54,9 @@
           }
         }
       ],
-      "name": "db:1.2.3.4:8080",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener-max-version.latest.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener-max-version.latest.golden
index 15dd947391ddc..69c8fa3bbb251 100644
--- a/agent/xds/testdata/listeners/ingress-with-tls-listener-max-version.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-tls-listener-max-version.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:1.2.3.4:8080",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -16,8 +17,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -26,6 +27,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "tlsMaximumProtocolVersion": "TLSv1_2"
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -36,9 +40,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMaximumProtocolVersion": "TLSv1_2"
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -50,10 +51,9 @@
           }
         }
       ],
-      "name": "db:1.2.3.4:8080",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener-min-version.latest.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener-min-version.latest.golden
index 77528a40d923e..7bec506fad2c0 100644
--- a/agent/xds/testdata/listeners/ingress-with-tls-listener-min-version.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-tls-listener-min-version.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:1.2.3.4:8080",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -16,8 +17,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -26,6 +27,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "tlsMinimumProtocolVersion": "TLSv1_3"
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -36,9 +40,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_3"
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -50,10 +51,9 @@
           }
         }
       ],
-      "name": "db:1.2.3.4:8080",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener.latest.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener.latest.golden
index 91df315726f8f..b635a227e8db3 100644
--- a/agent/xds/testdata/listeners/ingress-with-tls-listener.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-tls-listener.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:1.2.3.4:8080",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -16,8 +17,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -26,6 +27,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -36,7 +40,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -48,10 +51,9 @@
           }
         }
       ],
-      "name": "db:1.2.3.4:8080",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden b/agent/xds/testdata/listeners/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden
index fcc9e1ac5e2e8..d6f01f7bc69c8 100644
--- a/agent/xds/testdata/listeners/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden
@@ -1,390 +1,390 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {
+                  "tlsMinimumProtocolVersion":  "TLSv1_2"
+                },
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_2"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8081
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8081",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8081
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8081",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8081"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8081"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "ingress_upstream_8081",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {
+                  "tlsMinimumProtocolVersion":  "TLSv1_2"
+                },
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_2"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "http:1.2.3.4:8081",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8082
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8082",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8082
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8082",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8082"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8082"
-                },
-                "statPrefix": "ingress_upstream_8082",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {
+                  "tlsMinimumProtocolVersion":  "TLSv1_2"
+                },
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_2"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "http:1.2.3.4:8082",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8083
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8083",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8083
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8083",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8083"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8083"
-                },
-                "statPrefix": "ingress_upstream_8083",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "http:1.2.3.4:8083",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8084
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8084",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8084
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8084",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8084"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8084"
-                },
-                "statPrefix": "ingress_upstream_8084",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {
+                  "tlsMinimumProtocolVersion":  "TLSv1_2"
+                },
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_2"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "http:1.2.3.4:8084",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden b/agent/xds/testdata/listeners/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden
deleted file mode 100644
index 106d66ad62cce..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden
+++ /dev/null
@@ -1,166 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {
-                  "cipherSuites": [
-                    "ECDHE-RSA-AES256-SHA"
-                  ]
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": false
-            }
-          }
-        }
-      ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8081
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8081"
-                },
-                "statPrefix": "ingress_upstream_8081",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {
-                  "cipherSuites": [
-                    "ECDHE-RSA-CHACHA20-POLY1305",
-                    "ECDHE-ECDSA-CHACHA20-POLY1305"
-                  ]
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": false
-            }
-          }
-        }
-      ],
-      "name": "http:1.2.3.4:8081",
-      "trafficDirection": "OUTBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.latest.golden b/agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.latest.golden
index c4947a132d673..cac6075fecb57 100644
--- a/agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.latest.golden
@@ -1,118 +1,119 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 9090
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:9090",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  9090
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_9090",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "9090"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "9090"
-                },
-                "statPrefix": "ingress_upstream_9090",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -120,10 +121,9 @@
           ]
         }
       ],
-      "name": "http:1.2.3.4:9090",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-tls-mixed-max-version-listeners.latest.golden b/agent/xds/testdata/listeners/ingress-with-tls-mixed-max-version-listeners.latest.golden
deleted file mode 100644
index b3b06eec07749..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-tls-mixed-max-version-listeners.latest.golden
+++ /dev/null
@@ -1,238 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
-                },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {
-                  "tlsMaximumProtocolVersion": "TLSv1_2"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": false
-            }
-          }
-        }
-      ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8081
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8081"
-                },
-                "statPrefix": "ingress_upstream_8081",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {
-                  "tlsMaximumProtocolVersion": "TLSv1_0"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": false
-            }
-          }
-        }
-      ],
-      "name": "http:1.2.3.4:8081",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8082
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8082"
-                },
-                "statPrefix": "ingress_upstream_8082",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {
-                  "tlsMaximumProtocolVersion": "TLSv1_3"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": false
-            }
-          }
-        }
-      ],
-      "name": "http:1.2.3.4:8082",
-      "trafficDirection": "OUTBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-with-tls-mixed-min-version-listeners.latest.golden b/agent/xds/testdata/listeners/ingress-with-tls-mixed-min-version-listeners.latest.golden
index 34fe2d4c53d04..04a582e6391fe 100644
--- a/agent/xds/testdata/listeners/ingress-with-tls-mixed-min-version-listeners.latest.golden
+++ b/agent/xds/testdata/listeners/ingress-with-tls-mixed-min-version-listeners.latest.golden
@@ -1,238 +1,238 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8080
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8080",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8080
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8080",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8080"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8080"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "ingress_upstream_8080",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {
+                  "tlsMinimumProtocolVersion":  "TLSv1_2"
+                },
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_2"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "http:1.2.3.4:8080",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8081
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8081",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8081
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8081",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8081"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8081"
-                },
-                "statPrefix": "ingress_upstream_8081",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {
+                  "tlsMinimumProtocolVersion":  "TLSv1_0"
+                },
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_0"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "http:1.2.3.4:8081",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8082
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "http:1.2.3.4:8082",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8082
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "ingress_upstream_8082",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "8082"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "8082"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "ingress_upstream_8082",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "alpnProtocols": [
-                  "http/1.1"
-                ],
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {
+                  "tlsMinimumProtocolVersion":  "TLSv1_3"
+                },
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_3"
-                },
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
-                }
+                },
+                "alpnProtocols":  [
+                  "http/1.1"
+                ]
               },
-              "requireClientCertificate": false
+              "requireClientCertificate":  false
             }
           }
         }
       ],
-      "name": "http:1.2.3.4:8082",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/listener-balance-inbound-connections.latest.golden b/agent/xds/testdata/listeners/listener-balance-inbound-connections.latest.golden
index 89689148b08e4..c04122640491b 100644
--- a/agent/xds/testdata/listeners/listener-balance-inbound-connections.latest.golden
+++ b/agent/xds/testdata/listeners/listener-balance-inbound-connections.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,27 +42,24 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
           "portValue": 9999
         }
       },
-      "connectionBalanceConfig": {
-        "exactBalance": {}
-      },
       "filterChains": [
         {
           "filters": [
@@ -69,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -77,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -87,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -97,7 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -109,10 +111,14 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection": "INBOUND",
+      "connectionBalanceConfig": {
+        "exactBalance": {
+
+        }
+      }
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/listener-balance-outbound-connections-bind-port.latest.golden b/agent/xds/testdata/listeners/listener-balance-outbound-connections-bind-port.latest.golden
index b588e8ac533e6..889873f55434d 100644
--- a/agent/xds/testdata/listeners/listener-balance-outbound-connections-bind-port.latest.golden
+++ b/agent/xds/testdata/listeners/listener-balance-outbound-connections-bind-port.latest.golden
@@ -1,17 +1,15 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
           "portValue": 9191
         }
       },
-      "connectionBalanceConfig": {
-        "exactBalance": {}
-      },
       "filterChains": [
         {
           "filters": [
@@ -19,18 +17,23 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection": "OUTBOUND",
+      "connectionBalanceConfig": {
+        "exactBalance": {
+
+        }
+      }
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -44,18 +47,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -69,7 +72,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -77,8 +82,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -87,6 +92,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -97,7 +105,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -109,10 +116,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/listener-bind-address-port.latest.golden b/agent/xds/testdata/listeners/listener-bind-address-port.latest.golden
index a6d0ff6730d69..1c9146861a194 100644
--- a/agent/xds/testdata/listeners/listener-bind-address-port.latest.golden
+++ b/agent/xds/testdata/listeners/listener-bind-address-port.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:127.0.0.2:8888",
       "address": {
         "socketAddress": {
           "address": "127.0.0.2",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,7 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -106,10 +111,9 @@
           }
         }
       ],
-      "name": "public_listener:127.0.0.2:8888",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/listener-bind-address.latest.golden b/agent/xds/testdata/listeners/listener-bind-address.latest.golden
index f69ad7a5450a0..9f7bc6b28b266 100644
--- a/agent/xds/testdata/listeners/listener-bind-address.latest.golden
+++ b/agent/xds/testdata/listeners/listener-bind-address.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:127.0.0.2:9999",
       "address": {
         "socketAddress": {
           "address": "127.0.0.2",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,7 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -106,10 +111,9 @@
           }
         }
       ],
-      "name": "public_listener:127.0.0.2:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/listener-bind-port.latest.golden b/agent/xds/testdata/listeners/listener-bind-port.latest.golden
index 3be52d7f8e9ac..a286e5232b862 100644
--- a/agent/xds/testdata/listeners/listener-bind-port.latest.golden
+++ b/agent/xds/testdata/listeners/listener-bind-port.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:8888",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,7 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -106,10 +111,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:8888",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/listener-max-inbound-connections.latest.golden b/agent/xds/testdata/listeners/listener-max-inbound-connections.latest.golden
index 0ba53902e6e97..cbfda69f564ef 100644
--- a/agent/xds/testdata/listeners/listener-max-inbound-connections.latest.golden
+++ b/agent/xds/testdata/listeners/listener-max-inbound-connections.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,16 +77,16 @@
               "name": "envoy.filters.network.connection_limit",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.connection_limit.v3.ConnectionLimit",
-                "maxConnections": "222",
-                "statPrefix": "inbound_connection_limit"
+                "statPrefix": "inbound_connection_limit",
+                "maxConnections": "222"
               }
             },
             {
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -92,6 +95,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -102,7 +108,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -114,10 +119,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/listener-unix-domain-socket.latest.golden b/agent/xds/testdata/listeners/listener-unix-domain-socket.latest.golden
index a13bb3681f3c3..6d4ee8880ebac 100644
--- a/agent/xds/testdata/listeners/listener-unix-domain-socket.latest.golden
+++ b/agent/xds/testdata/listeners/listener-unix-domain-socket.latest.golden
@@ -1,12 +1,13 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:/tmp/service-mesh/client-1/grpc-employee-server",
       "address": {
         "pipe": {
-          "mode": 416,
-          "path": "/tmp/service-mesh/client-1/grpc-employee-server"
+          "path": "/tmp/service-mesh/client-1/grpc-employee-server",
+          "mode": 416
         }
       },
       "filterChains": [
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:/tmp/service-mesh/client-1/grpc-employee-server",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -41,18 +42,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -66,7 +67,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -74,8 +77,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -84,6 +87,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -94,7 +100,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -106,10 +111,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/local-mesh-gateway-with-peered-upstreams.latest.golden b/agent/xds/testdata/listeners/local-mesh-gateway-with-peered-upstreams.latest.golden
index bb4e12a9a6058..d062f6dd5199f 100644
--- a/agent/xds/testdata/listeners/local-mesh-gateway-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/listeners/local-mesh-gateway-with-peered-upstreams.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "payments?peer=cloud:127.0.0.1:9090",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-                "statPrefix": "upstream_peered.payments.default.cloud"
+                "statPrefix": "upstream_peered.payments.default.cloud",
+                "cluster": "payments.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
               }
             }
           ]
         }
       ],
-      "name": "payments?peer=cloud:127.0.0.1:9090",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -41,7 +42,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -49,8 +52,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -59,6 +62,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -69,7 +75,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -81,11 +86,11 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "refunds?peer=cloud:127.0.0.1:9090",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -99,17 +104,16 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-                "statPrefix": "upstream_peered.refunds.default.cloud"
+                "statPrefix": "upstream_peered.refunds.default.cloud",
+                "cluster": "refunds.default.cloud.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
               }
             }
           ]
         }
       ],
-      "name": "refunds?peer=cloud:127.0.0.1:9090",
       "trafficDirection": "OUTBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.latest.golden
index 2662d64f9f365..7c293d43d8ce0 100644
--- a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.latest.golden
+++ b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "bar:2001:db8::ff:9999",
       "address": {
         "socketAddress": {
           "address": "2001:db8::ff",
@@ -21,8 +22,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.bar.dc2"
+                "statPrefix": "mesh_gateway_remote.bar.dc2",
+                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -38,8 +39,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.bar.dc4"
+                "statPrefix": "mesh_gateway_remote.bar.dc4",
+                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -55,8 +56,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.bar.dc6"
+                "statPrefix": "mesh_gateway_remote.bar.dc6",
+                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -73,8 +74,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.bar"
+                "statPrefix": "mesh_gateway_local.bar",
+                "cluster": ""
               }
             }
           ]
@@ -87,11 +88,11 @@
             "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "bar:2001:db8::ff:9999"
+      ]
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "baz:127.0.0.1:8765",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -110,8 +111,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.baz.dc2"
+                "statPrefix": "mesh_gateway_remote.baz.dc2",
+                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -127,8 +128,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.baz.dc4"
+                "statPrefix": "mesh_gateway_remote.baz.dc4",
+                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -144,8 +145,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.baz.dc6"
+                "statPrefix": "mesh_gateway_remote.baz.dc6",
+                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -162,8 +163,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.baz"
+                "statPrefix": "mesh_gateway_local.baz",
+                "cluster": ""
               }
             }
           ]
@@ -176,11 +177,11 @@
             "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "baz:127.0.0.1:8765"
+      ]
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "default:1.2.3.4:8443",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -199,8 +200,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc2"
+                "statPrefix": "mesh_gateway_remote.default.dc2",
+                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -216,8 +217,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc4"
+                "statPrefix": "mesh_gateway_remote.default.dc4",
+                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -233,8 +234,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc6"
+                "statPrefix": "mesh_gateway_remote.default.dc6",
+                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -251,8 +252,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.default"
+                "statPrefix": "mesh_gateway_local.default",
+                "cluster": ""
               }
             }
           ]
@@ -265,11 +266,11 @@
             "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "default:1.2.3.4:8443"
+      ]
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "foo:198.17.2.3:8080",
       "address": {
         "socketAddress": {
           "address": "198.17.2.3",
@@ -288,8 +289,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.foo.dc2"
+                "statPrefix": "mesh_gateway_remote.foo.dc2",
+                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -305,8 +306,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.foo.dc4"
+                "statPrefix": "mesh_gateway_remote.foo.dc4",
+                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -322,8 +323,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.foo.dc6"
+                "statPrefix": "mesh_gateway_remote.foo.dc6",
+                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -340,8 +341,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.foo"
+                "statPrefix": "mesh_gateway_local.foo",
+                "cluster": ""
               }
             }
           ]
@@ -354,10 +355,9 @@
             "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "foo:198.17.2.3:8080"
+      ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/mesh-gateway-no-services.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-no-services.latest.golden
index 7cecb373468e3..40d5b919bd1e5 100644
--- a/agent/xds/testdata/listeners/mesh-gateway-no-services.latest.golden
+++ b/agent/xds/testdata/listeners/mesh-gateway-no-services.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "default:1.2.3.4:8443",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -22,8 +23,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.default"
+                "statPrefix": "mesh_gateway_local.default",
+                "cluster": ""
               }
             }
           ]
@@ -36,10 +37,9 @@
             "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "default:1.2.3.4:8443"
+      ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/mesh-gateway-peering-control-plane.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-peering-control-plane.latest.golden
index 6dd438c532457..5989bcb930af9 100644
--- a/agent/xds/testdata/listeners/mesh-gateway-peering-control-plane.latest.golden
+++ b/agent/xds/testdata/listeners/mesh-gateway-peering-control-plane.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "default:1.2.3.4:8443",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -21,8 +22,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "server.dc1.peering.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_local_peering_server.default.dc1"
+                "statPrefix": "mesh_gateway_local_peering_server.default.dc1",
+                "cluster": "server.dc1.peering.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -39,8 +40,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.default"
+                "statPrefix": "mesh_gateway_local.default",
+                "cluster": ""
               }
             }
           ]
@@ -53,10 +54,9 @@
             "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "default:1.2.3.4:8443"
+      ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.latest.golden
index 8d1e08cdf94ba..4c76beebb726a 100644
--- a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.latest.golden
+++ b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "lan:1.2.3.4:8443",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -21,8 +22,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.lan.dc2"
+                "statPrefix": "mesh_gateway_remote.lan.dc2",
+                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -38,8 +39,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.lan.dc4"
+                "statPrefix": "mesh_gateway_remote.lan.dc4",
+                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -55,8 +56,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.lan.dc6"
+                "statPrefix": "mesh_gateway_remote.lan.dc6",
+                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -73,8 +74,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.lan"
+                "statPrefix": "mesh_gateway_local.lan",
+                "cluster": ""
               }
             }
           ]
@@ -87,11 +88,11 @@
             "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "lan:1.2.3.4:8443"
+      ]
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "wan:198.18.0.1:443",
       "address": {
         "socketAddress": {
           "address": "198.18.0.1",
@@ -110,8 +111,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.wan.dc2"
+                "statPrefix": "mesh_gateway_remote.wan.dc2",
+                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -127,8 +128,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.wan.dc4"
+                "statPrefix": "mesh_gateway_remote.wan.dc4",
+                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -144,8 +145,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.wan.dc6"
+                "statPrefix": "mesh_gateway_remote.wan.dc6",
+                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -162,8 +163,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.wan"
+                "statPrefix": "mesh_gateway_local.wan",
+                "cluster": ""
               }
             }
           ]
@@ -176,10 +177,9 @@
             "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "wan:198.18.0.1:443"
+      ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/mesh-gateway-using-federation-control-plane.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-using-federation-control-plane.latest.golden
deleted file mode 100644
index 5fbce54c1df85..0000000000000
--- a/agent/xds/testdata/listeners/mesh-gateway-using-federation-control-plane.latest.golden
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8443
-        }
-      },
-      "filterChains": [
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "*.dc2.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc2"
-              }
-            }
-          ]
-        },
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "*.dc4.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc4"
-              }
-            }
-          ]
-        },
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "*.dc6.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc6"
-              }
-            }
-          ]
-        },
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "*.server.dc2.consul"
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "server.dc2.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc2"
-              }
-            }
-          ]
-        },
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "*.server.dc4.consul"
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "server.dc4.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc4"
-              }
-            }
-          ]
-        },
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "*.server.dc6.consul"
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "server.dc6.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc6"
-              }
-            }
-          ]
-        },
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "node1.server.dc1.consul"
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "node1.server.dc1.consul",
-                "statPrefix": "mesh_gateway_local_server.default.dc1"
-              }
-            }
-          ]
-        },
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "node2.server.dc1.consul"
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "node2.server.dc1.consul",
-                "statPrefix": "mesh_gateway_local_server.default.dc1"
-              }
-            }
-          ]
-        },
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.sni_cluster",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.default"
-              }
-            }
-          ]
-        }
-      ],
-      "listenerFilters": [
-        {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
-          }
-        }
-      ],
-      "name": "default:1.2.3.4:8443"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.latest.golden
index 3b77ccca9b996..7505e7c201cd2 100644
--- a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.latest.golden
+++ b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "default:1.2.3.4:8443",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -21,8 +22,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc2"
+                "statPrefix": "mesh_gateway_remote.default.dc2",
+                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -38,8 +39,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc4"
+                "statPrefix": "mesh_gateway_remote.default.dc4",
+                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -55,8 +56,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc6"
+                "statPrefix": "mesh_gateway_remote.default.dc6",
+                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -73,8 +74,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.default"
+                "statPrefix": "mesh_gateway_local.default",
+                "cluster": ""
               }
             }
           ]
@@ -87,10 +88,9 @@
             "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "default:1.2.3.4:8443"
+      ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
index fa164e94645b8..4956608dcd4b6 100644
--- a/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
+++ b/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
@@ -1,93 +1,94 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8443
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "default:1.2.3.4:8443",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8443
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "db.default.default.peer-a.external.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "SANITIZE_SET",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "mesh_gateway_local_peered.db.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "db"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "db"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "forwardClientCertDetails":  "SANITIZE_SET",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "statPrefix": "mesh_gateway_local_peered.db.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "customValidatorConfig": {
-                    "name": "envoy.tls.cert_validator.spiffe",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig",
-                      "trustDomains": [
+                "validationContext":  {
+                  "customValidatorConfig":  {
+                    "name":  "envoy.tls.cert_validator.spiffe",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig",
+                      "trustDomains":  [
                         {
-                          "name": "11111111-2222-3333-4444-555555555555.consul",
-                          "trustBundle": {
-                            "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                          "name":  "11111111-2222-3333-4444-555555555555.consul",
+                          "trustBundle":  {
+                            "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                           }
                         },
                         {
-                          "name": "1c053652-8512-4373-90cf-5a7f6263a994.consul",
-                          "trustBundle": {
-                            "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
+                          "name":  "1c053652-8512-4373-90cf-5a7f6263a994.consul",
+                          "trustBundle":  {
+                            "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
                           }
                         }
                       ]
@@ -95,40 +96,39 @@
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.sni_cluster",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
+              "name":  "envoy.filters.network.sni_cluster",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.default"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "mesh_gateway_local.default",
+                "cluster":  ""
               }
             }
           ]
         }
       ],
-      "listenerFilters": [
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
+          "name":  "envoy.filters.listener.tls_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "default:1.2.3.4:8443"
+      ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http.latest.golden
index 0a9642cfe658e..2cb3ab1148e02 100644
--- a/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http.latest.golden
+++ b/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services-http.latest.golden
@@ -1,93 +1,94 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8443
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "default:1.2.3.4:8443",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8443
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "bar.default.default.peer-a.external.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "SANITIZE_SET",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "mesh_gateway_local_peered.bar.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "bar"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "bar"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "mesh_gateway_local_peered.bar.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "forwardClientCertDetails":  "SANITIZE_SET",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "customValidatorConfig": {
-                    "name": "envoy.tls.cert_validator.spiffe",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig",
-                      "trustDomains": [
+                "validationContext":  {
+                  "customValidatorConfig":  {
+                    "name":  "envoy.tls.cert_validator.spiffe",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig",
+                      "trustDomains":  [
                         {
-                          "name": "11111111-2222-3333-4444-555555555555.consul",
-                          "trustBundle": {
-                            "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                          "name":  "11111111-2222-3333-4444-555555555555.consul",
+                          "trustBundle":  {
+                            "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                           }
                         },
                         {
-                          "name": "1c053652-8512-4373-90cf-5a7f6263a994.consul",
-                          "trustBundle": {
-                            "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
+                          "name":  "1c053652-8512-4373-90cf-5a7f6263a994.consul",
+                          "trustBundle":  {
+                            "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
                           }
                         }
                       ]
@@ -95,88 +96,88 @@
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "foo.default.default.peer-a.external.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "SANITIZE_SET",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "mesh_gateway_local_peered.foo.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "foo"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "foo"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "forwardClientCertDetails":  "SANITIZE_SET",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "statPrefix": "mesh_gateway_local_peered.foo.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "customValidatorConfig": {
-                    "name": "envoy.tls.cert_validator.spiffe",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig",
-                      "trustDomains": [
+                "validationContext":  {
+                  "customValidatorConfig":  {
+                    "name":  "envoy.tls.cert_validator.spiffe",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig",
+                      "trustDomains":  [
                         {
-                          "name": "11111111-2222-3333-4444-555555555555.consul",
-                          "trustBundle": {
-                            "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                          "name":  "11111111-2222-3333-4444-555555555555.consul",
+                          "trustBundle":  {
+                            "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                           }
                         },
                         {
-                          "name": "1c053652-8512-4373-90cf-5a7f6263a994.consul",
-                          "trustBundle": {
-                            "inlineString": "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
+                          "name":  "1c053652-8512-4373-90cf-5a7f6263a994.consul",
+                          "trustBundle":  {
+                            "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICczCCAdwCCQC3BLnEmLCrSjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQVoxEjAQBgNVBAcMCUZsYWdzdGFmZjEMMAoGA1UECgwDRm9v\nMRAwDgYDVQQLDAdleGFtcGxlMQ8wDQYDVQQDDAZwZWVyLWExHTAbBgkqhkiG9w0B\nCQEWDmZvb0BwZWVyLWEuY29tMB4XDTIyMDUyNjAxMDQ0NFoXDTIzMDUyNjAxMDQ0\nNFowfjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMRIwEAYDVQQHDAlGbGFnc3Rh\nZmYxDDAKBgNVBAoMA0ZvbzEQMA4GA1UECwwHZXhhbXBsZTEPMA0GA1UEAwwGcGVl\nci1hMR0wGwYJKoZIhvcNAQkBFg5mb29AcGVlci1hLmNvbTCBnzANBgkqhkiG9w0B\nAQEFAAOBjQAwgYkCgYEA2zFYGTbXDAntT5pLTpZ2+VTiqx4J63VRJH1kdu11f0FV\nc2jl1pqCuYDbQXknDU0Pv1Q5y0+nSAihD2KqGS571r+vHQiPtKYPYRqPEe9FzAhR\n2KhWH6v/tk5DG1HqOjV9/zWRKB12gdFNZZqnw/e7NjLNq3wZ2UAwxXip5uJ8uwMC\nAwEAATANBgkqhkiG9w0BAQsFAAOBgQC/CJ9Syf4aL91wZizKTejwouRYoWv4gRAk\nyto45ZcNMHfJ0G2z+XAMl9ZbQsLgXmzAx4IM6y5Jckq8pKC4PEijCjlKTktLHlEy\n0ggmFxtNB1tid2NC8dOzcQ3l45+gDjDqdILhAvLDjlAIebdkqVqb2CfFNW/I2CQH\nZAuKN1aoKA==\n-----END CERTIFICATE-----\n"
                           }
                         }
                       ]
@@ -184,88 +185,88 @@
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "gir.default.default.peer-b.external.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "SANITIZE_SET",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "mesh_gateway_local_peered.gir.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "gir"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "gir"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "mesh_gateway_local_peered.gir.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "forwardClientCertDetails":  "SANITIZE_SET",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "customValidatorConfig": {
-                    "name": "envoy.tls.cert_validator.spiffe",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig",
-                      "trustDomains": [
+                "validationContext":  {
+                  "customValidatorConfig":  {
+                    "name":  "envoy.tls.cert_validator.spiffe",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig",
+                      "trustDomains":  [
                         {
-                          "name": "11111111-2222-3333-4444-555555555555.consul",
-                          "trustBundle": {
-                            "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                          "name":  "11111111-2222-3333-4444-555555555555.consul",
+                          "trustBundle":  {
+                            "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                           }
                         },
                         {
-                          "name": "d89ac423-e95a-475d-94f2-1c557c57bf31.consul",
-                          "trustBundle": {
-                            "inlineString": "-----BEGIN CERTIFICATE-----\nMIICcTCCAdoCCQDyGxC08cD0BDANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQ0ExETAPBgNVBAcMCENhcmxzYmFkMQwwCgYDVQQKDANGb28x\nEDAOBgNVBAsMB2V4YW1wbGUxDzANBgNVBAMMBnBlZXItYjEdMBsGCSqGSIb3DQEJ\nARYOZm9vQHBlZXItYi5jb20wHhcNMjIwNTI2MDExNjE2WhcNMjMwNTI2MDExNjE2\nWjB9MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExETAPBgNVBAcMCENhcmxzYmFk\nMQwwCgYDVQQKDANGb28xEDAOBgNVBAsMB2V4YW1wbGUxDzANBgNVBAMMBnBlZXIt\nYjEdMBsGCSqGSIb3DQEJARYOZm9vQHBlZXItYi5jb20wgZ8wDQYJKoZIhvcNAQEB\nBQADgY0AMIGJAoGBAL4i5erdZ5vKk3mzW9Qt6Wvw/WN/IpMDlL0a28wz9oDCtMLN\ncD/XQB9yT5jUwb2s4mD1lCDZtee8MHeD8zygICozufWVB+u2KvMaoA50T9GMQD0E\nz/0nz/Z703I4q13VHeTpltmEpYcfxw/7nJ3leKA34+Nj3zteJ70iqvD/TNBBAgMB\nAAEwDQYJKoZIhvcNAQELBQADgYEAbL04gicH+EIznDNhZJEb1guMBtBBJ8kujPyU\nao8xhlUuorDTLwhLpkKsOhD8619oSS8KynjEBichidQRkwxIaze0a2mrGT+tGBMf\npVz6UeCkqpde6bSJ/ozEe/2seQzKqYvRT1oUjLwYvY7OIh2DzYibOAxh6fewYAmU\n5j5qNLc=\n-----END CERTIFICATE-----\n"
+                          "name":  "d89ac423-e95a-475d-94f2-1c557c57bf31.consul",
+                          "trustBundle":  {
+                            "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICcTCCAdoCCQDyGxC08cD0BDANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJV\nUzELMAkGA1UECAwCQ0ExETAPBgNVBAcMCENhcmxzYmFkMQwwCgYDVQQKDANGb28x\nEDAOBgNVBAsMB2V4YW1wbGUxDzANBgNVBAMMBnBlZXItYjEdMBsGCSqGSIb3DQEJ\nARYOZm9vQHBlZXItYi5jb20wHhcNMjIwNTI2MDExNjE2WhcNMjMwNTI2MDExNjE2\nWjB9MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExETAPBgNVBAcMCENhcmxzYmFk\nMQwwCgYDVQQKDANGb28xEDAOBgNVBAsMB2V4YW1wbGUxDzANBgNVBAMMBnBlZXIt\nYjEdMBsGCSqGSIb3DQEJARYOZm9vQHBlZXItYi5jb20wgZ8wDQYJKoZIhvcNAQEB\nBQADgY0AMIGJAoGBAL4i5erdZ5vKk3mzW9Qt6Wvw/WN/IpMDlL0a28wz9oDCtMLN\ncD/XQB9yT5jUwb2s4mD1lCDZtee8MHeD8zygICozufWVB+u2KvMaoA50T9GMQD0E\nz/0nz/Z703I4q13VHeTpltmEpYcfxw/7nJ3leKA34+Nj3zteJ70iqvD/TNBBAgMB\nAAEwDQYJKoZIhvcNAQELBQADgYEAbL04gicH+EIznDNhZJEb1guMBtBBJ8kujPyU\nao8xhlUuorDTLwhLpkKsOhD8619oSS8KynjEBichidQRkwxIaze0a2mrGT+tGBMf\npVz6UeCkqpde6bSJ/ozEe/2seQzKqYvRT1oUjLwYvY7OIh2DzYibOAxh6fewYAmU\n5j5qNLc=\n-----END CERTIFICATE-----\n"
                           }
                         }
                       ]
@@ -273,40 +274,39 @@
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.sni_cluster",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
+              "name":  "envoy.filters.network.sni_cluster",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.default"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "mesh_gateway_local.default",
+                "cluster":  ""
               }
             }
           ]
         }
       ],
-      "listenerFilters": [
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
+          "name":  "envoy.filters.listener.tls_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "default:1.2.3.4:8443"
+      ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services.latest.golden
index e5bf3b25a2f3b..5d5ecb30f8cb5 100644
--- a/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services.latest.golden
+++ b/agent/xds/testdata/listeners/mesh-gateway-with-exported-peered-services.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "default:1.2.3.4:8443",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -21,8 +22,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "exported~bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_local_peered.bar.default.default.dc1"
+                "statPrefix": "mesh_gateway_local_peered.bar.default.default.dc1",
+                "cluster": "exported~bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -38,8 +39,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "exported~foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_local_peered.foo.default.default.dc1"
+                "statPrefix": "mesh_gateway_local_peered.foo.default.default.dc1",
+                "cluster": "exported~foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -55,8 +56,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "exported~gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_local_peered.gir.default.default.dc1"
+                "statPrefix": "mesh_gateway_local_peered.gir.default.default.dc1",
+                "cluster": "exported~gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -73,8 +74,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.default"
+                "statPrefix": "mesh_gateway_local.default",
+                "cluster": ""
               }
             }
           ]
@@ -87,10 +88,9 @@
             "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "default:1.2.3.4:8443"
+      ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/mesh-gateway-with-imported-peered-services.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-with-imported-peered-services.latest.golden
index 7cecb373468e3..40d5b919bd1e5 100644
--- a/agent/xds/testdata/listeners/mesh-gateway-with-imported-peered-services.latest.golden
+++ b/agent/xds/testdata/listeners/mesh-gateway-with-imported-peered-services.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "default:1.2.3.4:8443",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -22,8 +23,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.default"
+                "statPrefix": "mesh_gateway_local.default",
+                "cluster": ""
               }
             }
           ]
@@ -36,10 +37,9 @@
             "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "default:1.2.3.4:8443"
+      ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
index 74d349bf4ded1..a327b98822969 100644
--- a/agent/xds/testdata/listeners/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
+++ b/agent/xds/testdata/listeners/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
@@ -1,96 +1,96 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8443
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "default:1.2.3.4:8443",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8443
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "server.dc2.peering.6d942ff2-6a78-46f4-a52f-915e26c48797"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "server.dc2.peering.6d942ff2-6a78-46f4-a52f-915e26c48797",
-                "statPrefix": "mesh_gateway_remote_peering_servers.server.dc2.peering.6d942ff2-6a78-46f4-a52f-915e26c48797"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "mesh_gateway_remote_peering_servers.server.dc2.peering.6d942ff2-6a78-46f4-a52f-915e26c48797",
+                "cluster":  "server.dc2.peering.6d942ff2-6a78-46f4-a52f-915e26c48797"
               }
             }
           ]
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "server.dc2.peering.f3f41279-001d-42bb-912e-f6103fb036b8"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "server.dc2.peering.f3f41279-001d-42bb-912e-f6103fb036b8",
-                "statPrefix": "mesh_gateway_remote_peering_servers.server.dc2.peering.f3f41279-001d-42bb-912e-f6103fb036b8"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "mesh_gateway_remote_peering_servers.server.dc2.peering.f3f41279-001d-42bb-912e-f6103fb036b8",
+                "cluster":  "server.dc2.peering.f3f41279-001d-42bb-912e-f6103fb036b8"
               }
             }
           ]
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "server.dc3.peering.f622dc37-7238-4485-ab58-0f53864a9ae5"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "server.dc3.peering.f622dc37-7238-4485-ab58-0f53864a9ae5",
-                "statPrefix": "mesh_gateway_remote_peering_servers.server.dc3.peering.f622dc37-7238-4485-ab58-0f53864a9ae5"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "mesh_gateway_remote_peering_servers.server.dc3.peering.f622dc37-7238-4485-ab58-0f53864a9ae5",
+                "cluster":  "server.dc3.peering.f622dc37-7238-4485-ab58-0f53864a9ae5"
               }
             }
           ]
         },
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.sni_cluster",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
+              "name":  "envoy.filters.network.sni_cluster",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.default"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "mesh_gateway_local.default",
+                "cluster":  ""
               }
             }
           ]
         }
       ],
-      "listenerFilters": [
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
+          "name":  "envoy.filters.listener.tls_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "default:1.2.3.4:8443"
+      ]
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/mesh-gateway.latest.golden b/agent/xds/testdata/listeners/mesh-gateway.latest.golden
index 3b77ccca9b996..7505e7c201cd2 100644
--- a/agent/xds/testdata/listeners/mesh-gateway.latest.golden
+++ b/agent/xds/testdata/listeners/mesh-gateway.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "default:1.2.3.4:8443",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -21,8 +22,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc2"
+                "statPrefix": "mesh_gateway_remote.default.dc2",
+                "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -38,8 +39,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc4"
+                "statPrefix": "mesh_gateway_remote.default.dc4",
+                "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -55,8 +56,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "mesh_gateway_remote.default.dc6"
+                "statPrefix": "mesh_gateway_remote.default.dc6",
+                "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -73,8 +74,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "mesh_gateway_local.default"
+                "statPrefix": "mesh_gateway_local.default",
+                "cluster": ""
               }
             }
           ]
@@ -87,10 +88,9 @@
             "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
-      ],
-      "name": "default:1.2.3.4:8443"
+      ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.latest.golden
index 96c6814291eb7..3beeb54d93616 100644
--- a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.latest.golden
+++ b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.latest.golden
@@ -1,43 +1,44 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "db"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "db"
-                },
-                "statPrefix": "upstream.db.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -45,93 +46,92 @@
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/telemetry-collector.latest.golden b/agent/xds/testdata/listeners/telemetry-collector.latest.golden
index 81208f9375f80..1831ca28b3169 100644
--- a/agent/xds/testdata/listeners/telemetry-collector.latest.golden
+++ b/agent/xds/testdata/listeners/telemetry-collector.latest.golden
@@ -1,70 +1,71 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "pipe": {
-          "path": "/tmp/consul/telemetry-collector/gqmuzdHCUPAEY5mbF8vgkZCNI14.sock"
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "consul-telemetry-collector:/tmp/consul/telemetry-collector/gqmuzdHCUPAEY5mbF8vgkZCNI14.sock",
+      "address":  {
+        "pipe":  {
+          "path":  "/tmp/consul/telemetry-collector/gqmuzdHCUPAEY5mbF8vgkZCNI14.sock"
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "http2ProtocolOptions": {},
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.grpc_stats",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
-                      "statsForAllMethods": true
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.grpc_http1_bridge",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
-                    }
-                  },
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "consul-telemetry-collector",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.consul-telemetry-collector.default.default.dc1",
+                "routeConfig":  {
+                  "name":  "consul-telemetry-collector",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "consul-telemetry-collector.default.default.dc1",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "consul-telemetry-collector.default.default.dc1",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "prefix": "/"
+                          "match":  {
+                            "prefix":  "/"
                           },
-                          "route": {
-                            "cluster": "consul-telemetry-collector.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                          "route":  {
+                            "cluster":  "consul-telemetry-collector.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "upstream.consul-telemetry-collector.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.grpc_stats",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig",
+                      "statsForAllMethods":  true
+                    }
+                  },
+                  {
+                    "name":  "envoy.filters.http.grpc_http1_bridge",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.grpc_http1_bridge.v3.Config"
+                    }
+                  },
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "http2ProtocolOptions":  {},
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -72,118 +73,117 @@
           ]
         }
       ],
-      "name": "consul-telemetry-collector:/tmp/consul/telemetry-collector/gqmuzdHCUPAEY5mbF8vgkZCNI14.sock",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.latest.golden
index d526bbab4a379..26f56d3dd372d 100644
--- a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.latest.golden
+++ b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "foo:198.17.2.3:8080",
       "address": {
         "socketAddress": {
           "address": "198.17.2.3",
@@ -21,7 +22,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -29,8 +32,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.api.default.default.dc1"
+                "statPrefix": "upstream.api.default.default.dc1",
+                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -39,6 +42,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -49,7 +55,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -71,7 +76,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -79,8 +86,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.cache.default.default.dc1"
+                "statPrefix": "upstream.cache.default.default.dc1",
+                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -89,6 +96,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -99,7 +109,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -121,7 +130,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -129,8 +140,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -139,6 +150,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -149,7 +163,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -171,7 +184,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -179,8 +194,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.web.default.default.dc1"
+                "statPrefix": "upstream.web.default.default.dc1",
+                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -189,6 +204,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -199,7 +217,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -222,8 +239,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "terminating_gateway.foo"
+                "statPrefix": "terminating_gateway.foo",
+                "cluster": ""
               }
             }
           ]
@@ -237,11 +254,11 @@
           }
         }
       ],
-      "name": "foo:198.17.2.3:8080",
       "trafficDirection": "INBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "wan:198.18.0.1:443",
       "address": {
         "socketAddress": {
           "address": "198.18.0.1",
@@ -260,7 +277,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -268,8 +287,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.api.default.default.dc1"
+                "statPrefix": "upstream.api.default.default.dc1",
+                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -278,6 +297,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -288,7 +310,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -310,7 +331,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -318,8 +341,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.cache.default.default.dc1"
+                "statPrefix": "upstream.cache.default.default.dc1",
+                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -328,6 +351,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -338,7 +364,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -360,7 +385,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -368,8 +395,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -378,6 +405,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -388,7 +418,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -410,7 +439,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -418,8 +449,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.web.default.default.dc1"
+                "statPrefix": "upstream.web.default.default.dc1",
+                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -428,6 +459,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -438,7 +472,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -461,8 +494,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "terminating_gateway.wan"
+                "statPrefix": "terminating_gateway.wan",
+                "cluster": ""
               }
             }
           ]
@@ -476,10 +509,9 @@
           }
         }
       ],
-      "name": "wan:198.18.0.1:443",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-trace-listener.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-trace-listener.latest.golden
deleted file mode 100644
index 45ad9d29a0958..0000000000000
--- a/agent/xds/testdata/listeners/terminating-gateway-custom-trace-listener.latest.golden
+++ /dev/null
@@ -1,246 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8443
-        }
-      },
-      "filterChains": [
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.api.default.default.dc1"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICnTCCAkKgAwIBAgIRAJrvEdaRAkSltrotd/l/j2cwCgYIKoZIzj0EAwIwgbgx\nCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj\nbzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw\nFQYDVQQKEw5IYXNoaUNvcnAgSW5jLjE/MD0GA1UEAxM2Q29uc3VsIEFnZW50IENB\nIDk2NjM4NzM1MDkzNTU5NTIwNDk3MTQwOTU3MDY1MTc0OTg3NDMxMB4XDTIwMDQx\nNDIyMzE1MloXDTIxMDQxNDIyMzE1MlowHDEaMBgGA1UEAxMRc2VydmVyLmRjMS5j\nb25zdWwwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ4v0FoIYI0OWmxE2MR6w5l\n0pWGhc02RpsOPj/6RS1fmXMMu7JzPzwCmkGcR16RlwwhNFKCZsWpvAjVRHf/pTp+\no4HHMIHEMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB\nBQUHAwIwDAYDVR0TAQH/BAIwADApBgNVHQ4EIgQgk7kABFitAy3PluyNtmzYiC7H\njSN8W/K/OXNJQAQAscMwKwYDVR0jBCQwIoAgNKbPPepvRHXSAPTc+a/BXBzFX1qJ\ny+Zi7qtjlFX7qtUwLQYDVR0RBCYwJIIRc2VydmVyLmRjMS5jb25zdWyCCWxvY2Fs\naG9zdIcEfwAAATAKBggqhkjOPQQDAgNJADBGAiEAhP4HmN5BWysWTbQWClXaWUah\nLpBGFrvc/2cCQuyEZKsCIQD6JyYCYMArtWwZ4G499zktxrFlqfX14bqyONrxtA5I\nDw==\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIE3KbKXHdsa0vvC1fysQaGdoJRgjRALIolI4XJanie+coAoGCCqGSM49\nAwEHoUQDQgAEOL9BaCGCNDlpsRNjEesOZdKVhoXNNkabDj4/+kUtX5lzDLuycz88\nAppBnEdekZcMITRSgmbFqbwI1UR3/6U6fg==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        },
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.cache.default.default.dc1"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICmjCCAkGgAwIBAgIQe1ZmC0rzRwer6jaH1YIUIjAKBggqhkjOPQQDAjCBuDEL\nMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv\nMRowGAYDVQQJExExMDEgU2Vjb25kIFN0cmVldDEOMAwGA1UEERMFOTQxMDUxFzAV\nBgNVBAoTDkhhc2hpQ29ycCBJbmMuMT8wPQYDVQQDEzZDb25zdWwgQWdlbnQgQ0Eg\nODE5ODAwNjg0MDM0MTM3ODkyNDYxNTA1MDk0NDU3OTU1MTQxNjEwHhcNMjAwNjE5\nMTU1MjAzWhcNMjEwNjE5MTU1MjAzWjAcMRowGAYDVQQDExFzZXJ2ZXIuZGMxLmNv\nbnN1bDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH2aWaaa3fpQLBayheHiKlrH\n+z53m0frfGknKjOhOPVYDVHV8x0OE01negswVQbKHAtxPf1M8Zy+WbI9rK7Ua1mj\ngccwgcQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF\nBQcDAjAMBgNVHRMBAf8EAjAAMCkGA1UdDgQiBCDf9CPBSUwwZvpeW73oJLTmgQE2\ntW1NKpL5t1uq9WFcqDArBgNVHSMEJDAigCCPPd/NxgZB0tq2M8pdVpPj3Cr79iTv\ni4/T1ysodfMb7zAtBgNVHREEJjAkghFzZXJ2ZXIuZGMxLmNvbnN1bIIJbG9jYWxo\nb3N0hwR/AAABMAoGCCqGSM49BAMCA0cAMEQCIFCjFZAoXq0s2ied2eIBv0i1KoW5\nIhCylnKFt6iHkyDeAiBBCByTcjHRgEQmqyPojQKoO584EFiczTub9aWdnf9tEw==\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEINsen3S8xzxMrKcRZIvxXzhKDn43Tw9ttqWEFU9TqS5hoAoGCCqGSM49\nAwEHoUQDQgAEfZpZpprd+lAsFrKF4eIqWsf7PnebR+t8aScqM6E49VgNUdXzHQ4T\nTWd6CzBVBsocC3E9/UzxnL5Zsj2srtRrWQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        },
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICnTCCAkOgAwIBAgIRAKF+qDJbaOULNL1TIatrsBowCgYIKoZIzj0EAwIwgbkx\nCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj\nbzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw\nFQYDVQQKEw5IYXNoaUNvcnAgSW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENB\nIDE4Nzg3MDAwNjUzMDcxOTYzNTk1ODkwNTE1ODY1NjEzMDA2MTU0NDAeFw0yMDA2\nMTkxNTMxMzRaFw0yMTA2MTkxNTMxMzRaMBwxGjAYBgNVBAMTEXNlcnZlci5kYzEu\nY29uc3VsMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdQ8Igci5f7ZvvCVsxXt9\ntLfvczD+60XHg0OC0+Aka7ZjQfbEjQwZbz/82EwPoS7Dqo3LTK4IuelOimoNNxuk\nkaOBxzCBxDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG\nAQUFBwMCMAwGA1UdEwEB/wQCMAAwKQYDVR0OBCIEILzTLkfJcdWQnTMKUcai/YJq\n0RqH1pjCqtY7SOU4gGOTMCsGA1UdIwQkMCKAIMa2vNcTEC5AGfHIYARJ/4sodX0o\nLzCj3lpw7BcEzPTcMC0GA1UdEQQmMCSCEXNlcnZlci5kYzEuY29uc3Vsgglsb2Nh\nbGhvc3SHBH8AAAEwCgYIKoZIzj0EAwIDSAAwRQIgBZ/Z4GSLEc98WvT/qjTVCNTG\n1WNaAaesVbkRx+J0yl8CIQDAVoqY9ByA5vKHjnQrxWlc/JUtJz8wudg7e/OCRriP\nSg==\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIN1v14FaNxgY4MgjDOOWthen8dgwB0lNMs9/j2TfrnxzoAoGCCqGSM49\nAwEHoUQDQgAEdQ8Igci5f7ZvvCVsxXt9tLfvczD+60XHg0OC0+Aka7ZjQfbEjQwZ\nbz/82EwPoS7Dqo3LTK4IuelOimoNNxukkQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        },
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "filters": [
-            {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.web.default.default.dc1"
-              }
-            }
-          ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
-                  {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
-                  }
-                }
-              },
-              "requireClientCertificate": true
-            }
-          }
-        },
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.sni_cluster",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
-              }
-            },
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "terminating_gateway.default"
-              }
-            }
-          ]
-        }
-      ],
-      "listenerFilters": [
-        {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
-          }
-        }
-      ],
-      "name": "default:1.2.3.4:8443",
-      "trafficDirection": "INBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.latest.golden
index 4c744e07a7891..acbcc16b42acb 100644
--- a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.latest.golden
+++ b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "default:1.2.3.4:8443",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -21,7 +22,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -29,8 +32,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.cache.default.default.dc1"
+                "statPrefix": "upstream.cache.default.default.dc1",
+                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -39,6 +42,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -49,7 +55,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -71,7 +76,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -79,8 +86,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -89,6 +96,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -99,7 +109,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -121,7 +130,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -129,8 +140,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.web.default.default.dc1"
+                "statPrefix": "upstream.web.default.default.dc1",
+                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -139,6 +150,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -149,7 +163,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -172,8 +185,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "terminating_gateway.default"
+                "statPrefix": "terminating_gateway.default",
+                "cluster": ""
               }
             }
           ]
@@ -187,10 +200,9 @@
           }
         }
       ],
-      "name": "default:1.2.3.4:8443",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-services.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-no-services.latest.golden
index 1e4dd317a7698..329a0cb6c3d81 100644
--- a/agent/xds/testdata/listeners/terminating-gateway-no-services.latest.golden
+++ b/agent/xds/testdata/listeners/terminating-gateway-no-services.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "default:1.2.3.4:8443",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -22,8 +23,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "terminating_gateway.default"
+                "statPrefix": "terminating_gateway.default",
+                "cluster": ""
               }
             }
           ]
@@ -37,10 +38,9 @@
           }
         }
       ],
-      "name": "default:1.2.3.4:8443",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.latest.golden
index a508e82d51595..ef928c996fdb6 100644
--- a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.latest.golden
+++ b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.latest.golden
@@ -1,433 +1,433 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8443
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "default:1.2.3.4:8443",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8443
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.api.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.api.default.default.dc1",
+                "cluster":  "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICnTCCAkKgAwIBAgIRAJrvEdaRAkSltrotd/l/j2cwCgYIKoZIzj0EAwIwgbgx\nCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj\nbzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw\nFQYDVQQKEw5IYXNoaUNvcnAgSW5jLjE/MD0GA1UEAxM2Q29uc3VsIEFnZW50IENB\nIDk2NjM4NzM1MDkzNTU5NTIwNDk3MTQwOTU3MDY1MTc0OTg3NDMxMB4XDTIwMDQx\nNDIyMzE1MloXDTIxMDQxNDIyMzE1MlowHDEaMBgGA1UEAxMRc2VydmVyLmRjMS5j\nb25zdWwwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ4v0FoIYI0OWmxE2MR6w5l\n0pWGhc02RpsOPj/6RS1fmXMMu7JzPzwCmkGcR16RlwwhNFKCZsWpvAjVRHf/pTp+\no4HHMIHEMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB\nBQUHAwIwDAYDVR0TAQH/BAIwADApBgNVHQ4EIgQgk7kABFitAy3PluyNtmzYiC7H\njSN8W/K/OXNJQAQAscMwKwYDVR0jBCQwIoAgNKbPPepvRHXSAPTc+a/BXBzFX1qJ\ny+Zi7qtjlFX7qtUwLQYDVR0RBCYwJIIRc2VydmVyLmRjMS5jb25zdWyCCWxvY2Fs\naG9zdIcEfwAAATAKBggqhkjOPQQDAgNJADBGAiEAhP4HmN5BWysWTbQWClXaWUah\nLpBGFrvc/2cCQuyEZKsCIQD6JyYCYMArtWwZ4G499zktxrFlqfX14bqyONrxtA5I\nDw==\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICnTCCAkKgAwIBAgIRAJrvEdaRAkSltrotd/l/j2cwCgYIKoZIzj0EAwIwgbgx\nCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj\nbzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw\nFQYDVQQKEw5IYXNoaUNvcnAgSW5jLjE/MD0GA1UEAxM2Q29uc3VsIEFnZW50IENB\nIDk2NjM4NzM1MDkzNTU5NTIwNDk3MTQwOTU3MDY1MTc0OTg3NDMxMB4XDTIwMDQx\nNDIyMzE1MloXDTIxMDQxNDIyMzE1MlowHDEaMBgGA1UEAxMRc2VydmVyLmRjMS5j\nb25zdWwwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQ4v0FoIYI0OWmxE2MR6w5l\n0pWGhc02RpsOPj/6RS1fmXMMu7JzPzwCmkGcR16RlwwhNFKCZsWpvAjVRHf/pTp+\no4HHMIHEMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB\nBQUHAwIwDAYDVR0TAQH/BAIwADApBgNVHQ4EIgQgk7kABFitAy3PluyNtmzYiC7H\njSN8W/K/OXNJQAQAscMwKwYDVR0jBCQwIoAgNKbPPepvRHXSAPTc+a/BXBzFX1qJ\ny+Zi7qtjlFX7qtUwLQYDVR0RBCYwJIIRc2VydmVyLmRjMS5jb25zdWyCCWxvY2Fs\naG9zdIcEfwAAATAKBggqhkjOPQQDAgNJADBGAiEAhP4HmN5BWysWTbQWClXaWUah\nLpBGFrvc/2cCQuyEZKsCIQD6JyYCYMArtWwZ4G499zktxrFlqfX14bqyONrxtA5I\nDw==\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIE3KbKXHdsa0vvC1fysQaGdoJRgjRALIolI4XJanie+coAoGCCqGSM49\nAwEHoUQDQgAEOL9BaCGCNDlpsRNjEesOZdKVhoXNNkabDj4/+kUtX5lzDLuycz88\nAppBnEdekZcMITRSgmbFqbwI1UR3/6U6fg==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIE3KbKXHdsa0vvC1fysQaGdoJRgjRALIolI4XJanie+coAoGCCqGSM49\nAwEHoUQDQgAEOL9BaCGCNDlpsRNjEesOZdKVhoXNNkabDj4/+kUtX5lzDLuycz88\nAppBnEdekZcMITRSgmbFqbwI1UR3/6U6fg==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.cache.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.cache.default.default.dc1",
+                "cluster":  "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICmjCCAkGgAwIBAgIQe1ZmC0rzRwer6jaH1YIUIjAKBggqhkjOPQQDAjCBuDEL\nMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv\nMRowGAYDVQQJExExMDEgU2Vjb25kIFN0cmVldDEOMAwGA1UEERMFOTQxMDUxFzAV\nBgNVBAoTDkhhc2hpQ29ycCBJbmMuMT8wPQYDVQQDEzZDb25zdWwgQWdlbnQgQ0Eg\nODE5ODAwNjg0MDM0MTM3ODkyNDYxNTA1MDk0NDU3OTU1MTQxNjEwHhcNMjAwNjE5\nMTU1MjAzWhcNMjEwNjE5MTU1MjAzWjAcMRowGAYDVQQDExFzZXJ2ZXIuZGMxLmNv\nbnN1bDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH2aWaaa3fpQLBayheHiKlrH\n+z53m0frfGknKjOhOPVYDVHV8x0OE01negswVQbKHAtxPf1M8Zy+WbI9rK7Ua1mj\ngccwgcQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF\nBQcDAjAMBgNVHRMBAf8EAjAAMCkGA1UdDgQiBCDf9CPBSUwwZvpeW73oJLTmgQE2\ntW1NKpL5t1uq9WFcqDArBgNVHSMEJDAigCCPPd/NxgZB0tq2M8pdVpPj3Cr79iTv\ni4/T1ysodfMb7zAtBgNVHREEJjAkghFzZXJ2ZXIuZGMxLmNvbnN1bIIJbG9jYWxo\nb3N0hwR/AAABMAoGCCqGSM49BAMCA0cAMEQCIFCjFZAoXq0s2ied2eIBv0i1KoW5\nIhCylnKFt6iHkyDeAiBBCByTcjHRgEQmqyPojQKoO584EFiczTub9aWdnf9tEw==\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICmjCCAkGgAwIBAgIQe1ZmC0rzRwer6jaH1YIUIjAKBggqhkjOPQQDAjCBuDEL\nMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv\nMRowGAYDVQQJExExMDEgU2Vjb25kIFN0cmVldDEOMAwGA1UEERMFOTQxMDUxFzAV\nBgNVBAoTDkhhc2hpQ29ycCBJbmMuMT8wPQYDVQQDEzZDb25zdWwgQWdlbnQgQ0Eg\nODE5ODAwNjg0MDM0MTM3ODkyNDYxNTA1MDk0NDU3OTU1MTQxNjEwHhcNMjAwNjE5\nMTU1MjAzWhcNMjEwNjE5MTU1MjAzWjAcMRowGAYDVQQDExFzZXJ2ZXIuZGMxLmNv\nbnN1bDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH2aWaaa3fpQLBayheHiKlrH\n+z53m0frfGknKjOhOPVYDVHV8x0OE01negswVQbKHAtxPf1M8Zy+WbI9rK7Ua1mj\ngccwgcQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF\nBQcDAjAMBgNVHRMBAf8EAjAAMCkGA1UdDgQiBCDf9CPBSUwwZvpeW73oJLTmgQE2\ntW1NKpL5t1uq9WFcqDArBgNVHSMEJDAigCCPPd/NxgZB0tq2M8pdVpPj3Cr79iTv\ni4/T1ysodfMb7zAtBgNVHREEJjAkghFzZXJ2ZXIuZGMxLmNvbnN1bIIJbG9jYWxo\nb3N0hwR/AAABMAoGCCqGSM49BAMCA0cAMEQCIFCjFZAoXq0s2ied2eIBv0i1KoW5\nIhCylnKFt6iHkyDeAiBBCByTcjHRgEQmqyPojQKoO584EFiczTub9aWdnf9tEw==\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEINsen3S8xzxMrKcRZIvxXzhKDn43Tw9ttqWEFU9TqS5hoAoGCCqGSM49\nAwEHoUQDQgAEfZpZpprd+lAsFrKF4eIqWsf7PnebR+t8aScqM6E49VgNUdXzHQ4T\nTWd6CzBVBsocC3E9/UzxnL5Zsj2srtRrWQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEINsen3S8xzxMrKcRZIvxXzhKDn43Tw9ttqWEFU9TqS5hoAoGCCqGSM49\nAwEHoUQDQgAEfZpZpprd+lAsFrKF4eIqWsf7PnebR+t8aScqM6E49VgNUdXzHQ4T\nTWd6CzBVBsocC3E9/UzxnL5Zsj2srtRrWQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICnTCCAkOgAwIBAgIRAKF+qDJbaOULNL1TIatrsBowCgYIKoZIzj0EAwIwgbkx\nCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj\nbzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw\nFQYDVQQKEw5IYXNoaUNvcnAgSW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENB\nIDE4Nzg3MDAwNjUzMDcxOTYzNTk1ODkwNTE1ODY1NjEzMDA2MTU0NDAeFw0yMDA2\nMTkxNTMxMzRaFw0yMTA2MTkxNTMxMzRaMBwxGjAYBgNVBAMTEXNlcnZlci5kYzEu\nY29uc3VsMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdQ8Igci5f7ZvvCVsxXt9\ntLfvczD+60XHg0OC0+Aka7ZjQfbEjQwZbz/82EwPoS7Dqo3LTK4IuelOimoNNxuk\nkaOBxzCBxDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG\nAQUFBwMCMAwGA1UdEwEB/wQCMAAwKQYDVR0OBCIEILzTLkfJcdWQnTMKUcai/YJq\n0RqH1pjCqtY7SOU4gGOTMCsGA1UdIwQkMCKAIMa2vNcTEC5AGfHIYARJ/4sodX0o\nLzCj3lpw7BcEzPTcMC0GA1UdEQQmMCSCEXNlcnZlci5kYzEuY29uc3Vsgglsb2Nh\nbGhvc3SHBH8AAAEwCgYIKoZIzj0EAwIDSAAwRQIgBZ/Z4GSLEc98WvT/qjTVCNTG\n1WNaAaesVbkRx+J0yl8CIQDAVoqY9ByA5vKHjnQrxWlc/JUtJz8wudg7e/OCRriP\nSg==\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICnTCCAkOgAwIBAgIRAKF+qDJbaOULNL1TIatrsBowCgYIKoZIzj0EAwIwgbkx\nCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj\nbzEaMBgGA1UECRMRMTAxIFNlY29uZCBTdHJlZXQxDjAMBgNVBBETBTk0MTA1MRcw\nFQYDVQQKEw5IYXNoaUNvcnAgSW5jLjFAMD4GA1UEAxM3Q29uc3VsIEFnZW50IENB\nIDE4Nzg3MDAwNjUzMDcxOTYzNTk1ODkwNTE1ODY1NjEzMDA2MTU0NDAeFw0yMDA2\nMTkxNTMxMzRaFw0yMTA2MTkxNTMxMzRaMBwxGjAYBgNVBAMTEXNlcnZlci5kYzEu\nY29uc3VsMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdQ8Igci5f7ZvvCVsxXt9\ntLfvczD+60XHg0OC0+Aka7ZjQfbEjQwZbz/82EwPoS7Dqo3LTK4IuelOimoNNxuk\nkaOBxzCBxDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG\nAQUFBwMCMAwGA1UdEwEB/wQCMAAwKQYDVR0OBCIEILzTLkfJcdWQnTMKUcai/YJq\n0RqH1pjCqtY7SOU4gGOTMCsGA1UdIwQkMCKAIMa2vNcTEC5AGfHIYARJ/4sodX0o\nLzCj3lpw7BcEzPTcMC0GA1UdEQQmMCSCEXNlcnZlci5kYzEuY29uc3Vsgglsb2Nh\nbGhvc3SHBH8AAAEwCgYIKoZIzj0EAwIDSAAwRQIgBZ/Z4GSLEc98WvT/qjTVCNTG\n1WNaAaesVbkRx+J0yl8CIQDAVoqY9ByA5vKHjnQrxWlc/JUtJz8wudg7e/OCRriP\nSg==\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIN1v14FaNxgY4MgjDOOWthen8dgwB0lNMs9/j2TfrnxzoAoGCCqGSM49\nAwEHoUQDQgAEdQ8Igci5f7ZvvCVsxXt9tLfvczD+60XHg0OC0+Aka7ZjQfbEjQwZ\nbz/82EwPoS7Dqo3LTK4IuelOimoNNxukkQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIN1v14FaNxgY4MgjDOOWthen8dgwB0lNMs9/j2TfrnxzoAoGCCqGSM49\nAwEHoUQDQgAEdQ8Igci5f7ZvvCVsxXt9tLfvczD+60XHg0OC0+Aka7ZjQfbEjQwZ\nbz/82EwPoS7Dqo3LTK4IuelOimoNNxukkQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.web.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.web.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.web.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.sni_cluster",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
+              "name":  "envoy.filters.network.sni_cluster",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "terminating_gateway.default"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "terminating_gateway.default",
+                "cluster":  ""
               }
             }
           ]
         }
       ],
-      "listenerFilters": [
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
+          "name":  "envoy.filters.listener.tls_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
       ],
-      "name": "default:1.2.3.4:8443",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden
index 617d1f53306a1..b3a94c9478865 100644
--- a/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden
+++ b/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "default:1.2.3.4:8443",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -21,7 +22,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -29,8 +32,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.api.default.default.dc1"
+                "statPrefix": "upstream.api.default.default.dc1",
+                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -39,6 +42,12 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "cipherSuites": [
+                    "ECDHE-ECDSA-AES128-GCM-SHA256",
+                    "ECDHE-ECDSA-CHACHA20-POLY1305"
+                  ]
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -49,12 +58,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "cipherSuites": [
-                    "ECDHE-ECDSA-AES128-GCM-SHA256",
-                    "ECDHE-ECDSA-CHACHA20-POLY1305"
-                  ]
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -76,7 +79,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -84,8 +89,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.cache.default.default.dc1"
+                "statPrefix": "upstream.cache.default.default.dc1",
+                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -94,6 +99,12 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "cipherSuites": [
+                    "ECDHE-ECDSA-AES128-GCM-SHA256",
+                    "ECDHE-ECDSA-CHACHA20-POLY1305"
+                  ]
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -104,12 +115,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "cipherSuites": [
-                    "ECDHE-ECDSA-AES128-GCM-SHA256",
-                    "ECDHE-ECDSA-CHACHA20-POLY1305"
-                  ]
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -131,7 +136,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -139,8 +146,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -149,6 +156,12 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "cipherSuites": [
+                    "ECDHE-ECDSA-AES128-GCM-SHA256",
+                    "ECDHE-ECDSA-CHACHA20-POLY1305"
+                  ]
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -159,12 +172,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "cipherSuites": [
-                    "ECDHE-ECDSA-AES128-GCM-SHA256",
-                    "ECDHE-ECDSA-CHACHA20-POLY1305"
-                  ]
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -186,7 +193,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -194,8 +203,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.web.default.default.dc1"
+                "statPrefix": "upstream.web.default.default.dc1",
+                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -204,6 +213,12 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "cipherSuites": [
+                    "ECDHE-ECDSA-AES128-GCM-SHA256",
+                    "ECDHE-ECDSA-CHACHA20-POLY1305"
+                  ]
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -214,12 +229,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "cipherSuites": [
-                    "ECDHE-ECDSA-AES128-GCM-SHA256",
-                    "ECDHE-ECDSA-CHACHA20-POLY1305"
-                  ]
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -242,8 +251,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "terminating_gateway.default"
+                "statPrefix": "terminating_gateway.default",
+                "cluster": ""
               }
             }
           ]
@@ -257,10 +266,9 @@
           }
         }
       ],
-      "name": "default:1.2.3.4:8443",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-max-version.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-max-version.latest.golden
index 1d3be93f33dfa..e2554002e0cda 100644
--- a/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-max-version.latest.golden
+++ b/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-max-version.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "default:1.2.3.4:8443",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -21,7 +22,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -29,8 +32,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.api.default.default.dc1"
+                "statPrefix": "upstream.api.default.default.dc1",
+                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -39,6 +42,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "tlsMaximumProtocolVersion": "TLSv1_2"
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -49,9 +55,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMaximumProtocolVersion": "TLSv1_2"
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -73,7 +76,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -81,8 +86,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.cache.default.default.dc1"
+                "statPrefix": "upstream.cache.default.default.dc1",
+                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -91,6 +96,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "tlsMaximumProtocolVersion": "TLSv1_2"
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -101,9 +109,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMaximumProtocolVersion": "TLSv1_2"
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -125,7 +130,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -133,8 +140,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -143,6 +150,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "tlsMaximumProtocolVersion": "TLSv1_2"
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -153,9 +163,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMaximumProtocolVersion": "TLSv1_2"
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -177,7 +184,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -185,8 +194,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.web.default.default.dc1"
+                "statPrefix": "upstream.web.default.default.dc1",
+                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -195,6 +204,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "tlsMaximumProtocolVersion": "TLSv1_2"
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -205,9 +217,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMaximumProtocolVersion": "TLSv1_2"
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -230,8 +239,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "terminating_gateway.default"
+                "statPrefix": "terminating_gateway.default",
+                "cluster": ""
               }
             }
           ]
@@ -245,10 +254,9 @@
           }
         }
       ],
-      "name": "default:1.2.3.4:8443",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-min-version.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-min-version.latest.golden
index cb2deaf63e441..daf9ca01fcee1 100644
--- a/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-min-version.latest.golden
+++ b/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-min-version.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "default:1.2.3.4:8443",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -21,7 +22,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -29,8 +32,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.api.default.default.dc1"
+                "statPrefix": "upstream.api.default.default.dc1",
+                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -39,6 +42,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "tlsMinimumProtocolVersion": "TLSv1_3"
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -49,9 +55,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_3"
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -73,7 +76,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -81,8 +86,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.cache.default.default.dc1"
+                "statPrefix": "upstream.cache.default.default.dc1",
+                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -91,6 +96,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "tlsMinimumProtocolVersion": "TLSv1_3"
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -101,9 +109,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_3"
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -125,7 +130,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -133,8 +140,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -143,6 +150,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "tlsMinimumProtocolVersion": "TLSv1_3"
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -153,9 +163,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_3"
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -177,7 +184,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -185,8 +194,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.web.default.default.dc1"
+                "statPrefix": "upstream.web.default.default.dc1",
+                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -195,6 +204,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+                  "tlsMinimumProtocolVersion": "TLSv1_3"
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -205,9 +217,6 @@
                     }
                   }
                 ],
-                "tlsParams": {
-                  "tlsMinimumProtocolVersion": "TLSv1_3"
-                },
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -230,8 +239,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "terminating_gateway.default"
+                "statPrefix": "terminating_gateway.default",
+                "cluster": ""
               }
             }
           ]
@@ -245,10 +254,9 @@
           }
         }
       ],
-      "name": "default:1.2.3.4:8443",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/terminating-gateway.latest.golden b/agent/xds/testdata/listeners/terminating-gateway.latest.golden
index 45ad9d29a0958..4af97913f84dd 100644
--- a/agent/xds/testdata/listeners/terminating-gateway.latest.golden
+++ b/agent/xds/testdata/listeners/terminating-gateway.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "default:1.2.3.4:8443",
       "address": {
         "socketAddress": {
           "address": "1.2.3.4",
@@ -21,7 +22,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -29,8 +32,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.api.default.default.dc1"
+                "statPrefix": "upstream.api.default.default.dc1",
+                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -39,6 +42,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -49,7 +55,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -71,7 +76,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -79,8 +86,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.cache.default.default.dc1"
+                "statPrefix": "upstream.cache.default.default.dc1",
+                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -89,6 +96,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -99,7 +109,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -121,7 +130,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -129,8 +140,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -139,6 +150,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -149,7 +163,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -171,7 +184,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -179,8 +194,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.web.default.default.dc1"
+                "statPrefix": "upstream.web.default.default.dc1",
+                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
@@ -189,6 +204,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -199,7 +217,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -222,8 +239,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "terminating_gateway.default"
+                "statPrefix": "terminating_gateway.default",
+                "cluster": ""
               }
             }
           ]
@@ -237,10 +254,9 @@
           }
         }
       ],
-      "name": "default:1.2.3.4:8443",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.latest.golden b/agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.latest.golden
index 96d66a6fd90b8..9d6d5003781ff 100644
--- a/agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.latest.golden
+++ b/agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "outbound_listener:127.0.0.1:15001",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -49,8 +50,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.google.default.default.dc1"
+                "statPrefix": "upstream.google.default.default.dc1",
+                "cluster": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -64,11 +65,11 @@
           }
         }
       ],
-      "name": "outbound_listener:127.0.0.1:15001",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -82,18 +83,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -107,7 +108,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -115,8 +118,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -125,6 +128,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -135,7 +141,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -147,10 +152,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/transparent-proxy-destination-http.latest.golden b/agent/xds/testdata/listeners/transparent-proxy-destination-http.latest.golden
index c6cd171ee4c2d..f713868b6d1d4 100644
--- a/agent/xds/testdata/listeners/transparent-proxy-destination-http.latest.golden
+++ b/agent/xds/testdata/listeners/transparent-proxy-destination-http.latest.golden
@@ -1,71 +1,72 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 15001
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "outbound_listener:127.0.0.1:15001",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  15001
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filterChainMatch": {
-            "destinationPort": 443
+          "filterChainMatch":  {
+            "destinationPort":  443
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.destination.443.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "destination.443.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "destination.443.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                },
-                "statPrefix": "upstream.destination.443.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -73,36 +74,36 @@
           ]
         },
         {
-          "filterChainMatch": {
-            "destinationPort": 9093
+          "filterChainMatch":  {
+            "destinationPort":  9093
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.destination.9093.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "destination.9093.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "destination.9093.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                },
-                "statPrefix": "upstream.destination.9093.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "tracing": {
-                  "randomSampling": {}
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -110,107 +111,106 @@
           ]
         }
       ],
-      "listenerFilters": [
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.original_dst",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst"
+          "name":  "envoy.filters.listener.original_dst",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst"
           }
         },
         {
-          "name": "envoy.filters.listener.http_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.http_inspector.v3.HttpInspector"
+          "name":  "envoy.filters.listener.http_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.http_inspector.v3.HttpInspector"
           }
         }
       ],
-      "name": "outbound_listener:127.0.0.1:15001",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/transparent-proxy-destination.latest.golden b/agent/xds/testdata/listeners/transparent-proxy-destination.latest.golden
index 1f532d8ab0b36..9ebe596961610 100644
--- a/agent/xds/testdata/listeners/transparent-proxy-destination.latest.golden
+++ b/agent/xds/testdata/listeners/transparent-proxy-destination.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "outbound_listener:127.0.0.1:15001",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -50,8 +51,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                "statPrefix": "upstream.destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "cluster": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -71,8 +72,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "destination.192-168-2-2.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.destination.192-168-2-2.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                "statPrefix": "upstream.destination.192-168-2-2.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "cluster": "destination.192-168-2-2.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -89,8 +90,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "destination.api-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.destination.api-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                "statPrefix": "upstream.destination.api-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "cluster": "destination.api-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -107,8 +108,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                "statPrefix": "upstream.destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "cluster": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -128,11 +129,11 @@
           }
         }
       ],
-      "name": "outbound_listener:127.0.0.1:15001",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -146,18 +147,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -171,7 +172,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -179,8 +182,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -189,6 +192,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -199,7 +205,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -211,10 +216,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.latest.golden b/agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.latest.golden
index 8ab799ecc9f97..ddfaa45d5f64e 100644
--- a/agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.latest.golden
+++ b/agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,36 +17,24 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "outbound_listener:127.0.0.1:15001",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
           "portValue": 15001
         }
       },
-      "defaultFilterChain": {
-        "filters": [
-          {
-            "name": "envoy.filters.network.tcp_proxy",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-              "cluster": "original-destination",
-              "statPrefix": "upstream.original-destination"
-            }
-          }
-        ]
-      },
       "filterChains": [
         {
           "filterChainMatch": {
@@ -65,8 +54,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "passthrough~mongo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.mongo.default.default.dc1"
+                "statPrefix": "upstream.mongo.default.default.dc1",
+                "cluster": "passthrough~mongo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -85,8 +74,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "mongo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.mongo.default.default.dc1"
+                "statPrefix": "upstream.mongo.default.default.dc1",
+                "cluster": "mongo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -105,13 +94,25 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "passthrough~kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.kafka.default.default.dc1"
+                "statPrefix": "upstream.kafka.default.default.dc1",
+                "cluster": "passthrough~kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
+      "defaultFilterChain": {
+        "filters": [
+          {
+            "name": "envoy.filters.network.tcp_proxy",
+            "typedConfig": {
+              "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+              "statPrefix": "upstream.original-destination",
+              "cluster": "original-destination"
+            }
+          }
+        ]
+      },
       "listenerFilters": [
         {
           "name": "envoy.filters.listener.original_dst",
@@ -120,11 +121,11 @@
           }
         }
       ],
-      "name": "outbound_listener:127.0.0.1:15001",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -138,18 +139,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -163,7 +164,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -171,8 +174,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -181,6 +184,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -191,7 +197,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -203,10 +208,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/transparent-proxy-http-upstream.latest.golden b/agent/xds/testdata/listeners/transparent-proxy-http-upstream.latest.golden
index ca7f40840fa3e..f2a597e6e85e1 100644
--- a/agent/xds/testdata/listeners/transparent-proxy-http-upstream.latest.golden
+++ b/agent/xds/testdata/listeners/transparent-proxy-http-upstream.latest.golden
@@ -1,106 +1,95 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "db:127.0.0.1:9191",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  9191
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.db.default.default.dc1",
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 15001
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "outbound_listener:127.0.0.1:15001",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.0.0.1",
+          "portValue":  15001
         }
       },
-      "defaultFilterChain": {
-        "filters": [
-          {
-            "name": "envoy.filters.network.tcp_proxy",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-              "cluster": "original-destination",
-              "statPrefix": "upstream.original-destination"
-            }
-          }
-        ]
-      },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filterChainMatch": {
-            "prefixRanges": [
+          "filterChainMatch":  {
+            "prefixRanges":  [
               {
-                "addressPrefix": "10.0.0.1",
-                "prefixLen": 32
+                "addressPrefix":  "10.0.0.1",
+                "prefixLen":  32
               },
               {
-                "addressPrefix": "240.0.0.1",
-                "prefixLen": 32
+                "addressPrefix":  "240.0.0.1",
+                "prefixLen":  32
               }
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "httpFilters": [
-                  {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "routeConfig": {
-                  "name": "google",
-                  "virtualHosts": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.google.default.default.dc1",
+                "routeConfig":  {
+                  "name":  "google",
+                  "virtualHosts":  [
                     {
-                      "domains": [
+                      "name":  "google.default.default.dc1",
+                      "domains":  [
                         "*"
                       ],
-                      "name": "google.default.default.dc1",
-                      "routes": [
+                      "routes":  [
                         {
-                          "match": {
-                            "prefix": "/"
+                          "match":  {
+                            "prefix":  "/"
                           },
-                          "route": {
-                            "cluster": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                          "route":  {
+                            "cluster":  "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
                           }
                         }
                       ]
                     }
                   ]
                 },
-                "statPrefix": "upstream.google.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "httpFilters":  [
+                  {
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    }
+                  }
+                ],
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
@@ -108,101 +97,112 @@
           ]
         }
       ],
-      "listenerFilters": [
+      "defaultFilterChain":  {
+        "filters":  [
+          {
+            "name":  "envoy.filters.network.tcp_proxy",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+              "statPrefix":  "upstream.original-destination",
+              "cluster":  "original-destination"
+            }
+          }
+        ]
+      },
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.original_dst",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst"
+          "name":  "envoy.filters.listener.original_dst",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst"
           }
         }
       ],
-      "name": "outbound_listener:127.0.0.1:15001",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "127.10.10.10",
-          "portValue": 8181
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "prepared_query:geo-cache:127.10.10.10:8181",
+      "address":  {
+        "socketAddress":  {
+          "address":  "127.10.10.10",
+          "portValue":  8181
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.prepared_query_geo-cache",
+                "cluster":  "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
-      "trafficDirection": "OUTBOUND"
+      "trafficDirection":  "OUTBOUND"
     },
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "0.0.0.0",
-          "portValue": 9999
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener:0.0.0.0:9999",
+      "address":  {
+        "socketAddress":  {
+          "address":  "0.0.0.0",
+          "portValue":  9999
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "public_listener",
+                "cluster":  "local_app"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n"
                     },
-                    "privateKey": {
-                      "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/transparent-proxy-terminating-gateway-destinations-only.latest.golden b/agent/xds/testdata/listeners/transparent-proxy-terminating-gateway-destinations-only.latest.golden
index da8448a2065ff..d9968fadbd5fb 100644
--- a/agent/xds/testdata/listeners/transparent-proxy-terminating-gateway-destinations-only.latest.golden
+++ b/agent/xds/testdata/listeners/transparent-proxy-terminating-gateway-destinations-only.latest.golden
@@ -1,504 +1,504 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8443
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "default:1.2.3.4:8443",
+      "address":  {
+        "socketAddress":  {
+          "address":  "1.2.3.4",
+          "portValue":  8443
         }
       },
-      "filterChains": [
+      "filterChains":  [
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "destination.192-168-0-1.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "destination.192-168-0-1.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.external-IP-TCP.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.external-IP-TCP.default.default.dc1",
+                "cluster":  "destination.192-168-0-1.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "placeholder.crt\n"
+                    "certificateChain":  {
+                      "inlineString":  "placeholder.crt\n"
                     },
-                    "privateKey": {
-                      "inlineString": "placeholder.key\n"
+                    "privateKey":  {
+                      "inlineString":  "placeholder.key\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "destination.192-168-0-2.external-IP-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.external-IP-HTTP.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "destination.192-168-0-2.external-IP-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "destination.192-168-0-2.external-IP-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "upstream.external-IP-HTTP.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "placeholder.crt\n"
+                    "certificateChain":  {
+                      "inlineString":  "placeholder.crt\n"
                     },
-                    "privateKey": {
-                      "inlineString": "placeholder.key\n"
+                    "privateKey":  {
+                      "inlineString":  "placeholder.key\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "destination.192-168-0-2.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "destination.192-168-0-2.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.external-IP-TCP.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.external-IP-TCP.default.default.dc1",
+                "cluster":  "destination.192-168-0-2.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "placeholder.crt\n"
+                    "certificateChain":  {
+                      "inlineString":  "placeholder.crt\n"
                     },
-                    "privateKey": {
-                      "inlineString": "placeholder.key\n"
+                    "privateKey":  {
+                      "inlineString":  "placeholder.key\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "destination.192-168-0-3.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "destination.192-168-0-3.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.external-IP-TCP.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.external-IP-TCP.default.default.dc1",
+                "cluster":  "destination.192-168-0-3.external-IP-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "placeholder.crt\n"
+                    "certificateChain":  {
+                      "inlineString":  "placeholder.crt\n"
                     },
-                    "privateKey": {
-                      "inlineString": "placeholder.key\n"
+                    "privateKey":  {
+                      "inlineString":  "placeholder.key\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "destination.api-hashicorp-com.external-hostname-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "destination.api-hashicorp-com.external-hostname-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.external-hostname-TCP.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.external-hostname-TCP.default.default.dc1",
+                "cluster":  "destination.api-hashicorp-com.external-hostname-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "placeholder.crt\n"
+                    "certificateChain":  {
+                      "inlineString":  "placeholder.crt\n"
                     },
-                    "privateKey": {
-                      "inlineString": "placeholder.key\n"
+                    "privateKey":  {
+                      "inlineString":  "placeholder.key\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "destination.api-test-com.external-hostname-with-SNI.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "destination.api-test-com.external-hostname-with-SNI.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.external-hostname-with-SNI.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.external-hostname-with-SNI.default.default.dc1",
+                "cluster":  "destination.api-test-com.external-hostname-with-SNI.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "placeholder.crt\n"
+                    "certificateChain":  {
+                      "inlineString":  "placeholder.crt\n"
                     },
-                    "privateKey": {
-                      "inlineString": "placeholder.key\n"
+                    "privateKey":  {
+                      "inlineString":  "placeholder.key\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "destination.httpbin-org.external-hostname-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.http_connection_manager",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "forwardClientCertDetails": "APPEND_FORWARD",
-                "httpFilters": [
+              "name":  "envoy.filters.network.http_connection_manager",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
+                "statPrefix":  "upstream.external-hostname-HTTP.default.default.dc1",
+                "rds":  {
+                  "configSource":  {
+                    "ads":  {},
+                    "resourceApiVersion":  "V3"
+                  },
+                  "routeConfigName":  "destination.httpbin-org.external-hostname-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                },
+                "httpFilters":  [
                   {
-                    "name": "envoy.filters.http.rbac",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-                      "rules": {}
+                    "name":  "envoy.filters.http.rbac",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
+                      "rules":  {}
                     }
                   },
                   {
-                    "name": "envoy.filters.http.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
+                    "name":  "envoy.filters.http.router",
+                    "typedConfig":  {
+                      "@type":  "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
                     }
                   }
                 ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "destination.httpbin-org.external-hostname-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
+                "tracing":  {
+                  "randomSampling":  {}
                 },
-                "statPrefix": "upstream.external-hostname-HTTP.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
+                "forwardClientCertDetails":  "APPEND_FORWARD",
+                "setCurrentClientCertDetails":  {
+                  "subject":  true,
+                  "cert":  true,
+                  "chain":  true,
+                  "dns":  true,
+                  "uri":  true
                 },
-                "upgradeConfigs": [
+                "upgradeConfigs":  [
                   {
-                    "upgradeType": "websocket"
+                    "upgradeType":  "websocket"
                   }
                 ]
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "placeholder.crt\n"
+                    "certificateChain":  {
+                      "inlineString":  "placeholder.crt\n"
                     },
-                    "privateKey": {
-                      "inlineString": "placeholder.key\n"
+                    "privateKey":  {
+                      "inlineString":  "placeholder.key\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filterChainMatch": {
-            "serverNames": [
+          "filterChainMatch":  {
+            "serverNames":  [
               "destination.web-hashicorp-com.external-hostname-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
             ]
           },
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.rbac",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
-                "statPrefix": "connect_authz"
+              "name":  "envoy.filters.network.rbac",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
+                "rules":  {},
+                "statPrefix":  "connect_authz"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "destination.web-hashicorp-com.external-hostname-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.external-hostname-TCP.default.default.dc1"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "upstream.external-hostname-TCP.default.default.dc1",
+                "cluster":  "destination.web-hashicorp-com.external-hostname-TCP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ],
-          "transportSocket": {
-            "name": "tls",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext": {
-                "tlsCertificates": [
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
                   {
-                    "certificateChain": {
-                      "inlineString": "placeholder.crt\n"
+                    "certificateChain":  {
+                      "inlineString":  "placeholder.crt\n"
                     },
-                    "privateKey": {
-                      "inlineString": "placeholder.key\n"
+                    "privateKey":  {
+                      "inlineString":  "placeholder.key\n"
                     }
                   }
                 ],
-                "tlsParams": {},
-                "validationContext": {
-                  "trustedCa": {
-                    "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
                   }
                 }
               },
-              "requireClientCertificate": true
+              "requireClientCertificate":  true
             }
           }
         },
         {
-          "filters": [
+          "filters":  [
             {
-              "name": "envoy.filters.network.sni_cluster",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
+              "name":  "envoy.filters.network.sni_cluster",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.sni_cluster.v3.SniCluster"
               }
             },
             {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "",
-                "statPrefix": "terminating_gateway.default"
+              "name":  "envoy.filters.network.tcp_proxy",
+              "typedConfig":  {
+                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+                "statPrefix":  "terminating_gateway.default",
+                "cluster":  ""
               }
             }
           ]
         }
       ],
-      "listenerFilters": [
+      "listenerFilters":  [
         {
-          "name": "envoy.filters.listener.tls_inspector",
-          "typedConfig": {
-            "@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
+          "name":  "envoy.filters.listener.tls_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
           }
         }
       ],
-      "name": "default:1.2.3.4:8443",
-      "trafficDirection": "INBOUND"
+      "trafficDirection":  "INBOUND"
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/transparent-proxy-terminating-gateway.latest.golden b/agent/xds/testdata/listeners/transparent-proxy-terminating-gateway.latest.golden
index fb8f3835e040e..949e2f8b0ca48 100644
--- a/agent/xds/testdata/listeners/transparent-proxy-terminating-gateway.latest.golden
+++ b/agent/xds/testdata/listeners/transparent-proxy-terminating-gateway.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "outbound_listener:127.0.0.1:15001",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -49,8 +50,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.google.default.default.dc1"
+                "statPrefix": "upstream.google.default.default.dc1",
+                "cluster": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -69,8 +70,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.kafka.default.default.dc1"
+                "statPrefix": "upstream.kafka.default.default.dc1",
+                "cluster": "kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
@@ -84,11 +85,11 @@
           }
         }
       ],
-      "name": "outbound_listener:127.0.0.1:15001",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -102,18 +103,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -127,7 +128,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -135,8 +138,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -145,6 +148,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -155,7 +161,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -167,10 +172,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/transparent-proxy-with-peered-upstreams.latest.golden b/agent/xds/testdata/listeners/transparent-proxy-with-peered-upstreams.latest.golden
index d2deb2f56b69e..cc7f73ae96a00 100644
--- a/agent/xds/testdata/listeners/transparent-proxy-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/listeners/transparent-proxy-with-peered-upstreams.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "api-a?peer=peer-a:127.0.0.1:9090",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,18 +17,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "api-a.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-                "statPrefix": "upstream_peered.api-a.default.peer-a"
+                "statPrefix": "upstream_peered.api-a.default.peer-a",
+                "cluster": "api-a.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
               }
             }
           ]
         }
       ],
-      "name": "api-a?peer=peer-a:127.0.0.1:9090",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "no-endpoints?peer=peer-a:127.0.0.1:1234",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -41,36 +42,24 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "no-endpoints.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-                "statPrefix": "upstream_peered.no-endpoints.default.peer-a"
+                "statPrefix": "upstream_peered.no-endpoints.default.peer-a",
+                "cluster": "no-endpoints.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
               }
             }
           ]
         }
       ],
-      "name": "no-endpoints?peer=peer-a:127.0.0.1:1234",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "outbound_listener:127.0.0.1:15001",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
           "portValue": 15001
         }
       },
-      "defaultFilterChain": {
-        "filters": [
-          {
-            "name": "envoy.filters.network.tcp_proxy",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-              "cluster": "original-destination",
-              "statPrefix": "upstream.original-destination"
-            }
-          }
-        ]
-      },
       "filterChains": [
         {
           "filterChainMatch": {
@@ -90,13 +79,25 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
-                "statPrefix": "upstream_peered.db.default.peer-a"
+                "statPrefix": "upstream_peered.db.default.peer-a",
+                "cluster": "db.default.peer-a.external.1c053652-8512-4373-90cf-5a7f6263a994.consul"
               }
             }
           ]
         }
       ],
+      "defaultFilterChain": {
+        "filters": [
+          {
+            "name": "envoy.filters.network.tcp_proxy",
+            "typedConfig": {
+              "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+              "statPrefix": "upstream.original-destination",
+              "cluster": "original-destination"
+            }
+          }
+        ]
+      },
       "listenerFilters": [
         {
           "name": "envoy.filters.listener.original_dst",
@@ -105,11 +106,11 @@
           }
         }
       ],
-      "name": "outbound_listener:127.0.0.1:15001",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -123,7 +124,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -131,8 +134,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -141,6 +144,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -151,7 +157,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -163,10 +168,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/transparent-proxy-with-resolver-redirect-upstream.latest.golden b/agent/xds/testdata/listeners/transparent-proxy-with-resolver-redirect-upstream.latest.golden
index d93388e64e22b..cbde9b76e5881 100644
--- a/agent/xds/testdata/listeners/transparent-proxy-with-resolver-redirect-upstream.latest.golden
+++ b/agent/xds/testdata/listeners/transparent-proxy-with-resolver-redirect-upstream.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db-redir:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,36 +17,24 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db-redir.default.default.dc1"
+                "statPrefix": "upstream.db-redir.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db-redir:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "outbound_listener:127.0.0.1:15001",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
           "portValue": 15001
         }
       },
-      "defaultFilterChain": {
-        "filters": [
-          {
-            "name": "envoy.filters.network.tcp_proxy",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-              "cluster": "original-destination",
-              "statPrefix": "upstream.original-destination"
-            }
-          }
-        ]
-      },
       "filterChains": [
         {
           "filterChainMatch": {
@@ -65,13 +54,25 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.google.default.default.dc1"
+                "statPrefix": "upstream.google.default.default.dc1",
+                "cluster": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
+      "defaultFilterChain": {
+        "filters": [
+          {
+            "name": "envoy.filters.network.tcp_proxy",
+            "typedConfig": {
+              "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+              "statPrefix": "upstream.original-destination",
+              "cluster": "original-destination"
+            }
+          }
+        ]
+      },
       "listenerFilters": [
         {
           "name": "envoy.filters.listener.original_dst",
@@ -80,11 +81,11 @@
           }
         }
       ],
-      "name": "outbound_listener:127.0.0.1:15001",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -98,18 +99,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -123,7 +124,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -131,8 +134,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -141,6 +144,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -151,7 +157,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -163,10 +168,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/transparent-proxy.latest.golden b/agent/xds/testdata/listeners/transparent-proxy.latest.golden
index f1a3f22fad9df..ee4c90857d057 100644
--- a/agent/xds/testdata/listeners/transparent-proxy.latest.golden
+++ b/agent/xds/testdata/listeners/transparent-proxy.latest.golden
@@ -1,8 +1,9 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "db:127.0.0.1:9191",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
@@ -16,36 +17,24 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.db.default.default.dc1"
+                "statPrefix": "upstream.db.default.default.dc1",
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "outbound_listener:127.0.0.1:15001",
       "address": {
         "socketAddress": {
           "address": "127.0.0.1",
           "portValue": 15001
         }
       },
-      "defaultFilterChain": {
-        "filters": [
-          {
-            "name": "envoy.filters.network.tcp_proxy",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-              "cluster": "original-destination",
-              "statPrefix": "upstream.original-destination"
-            }
-          }
-        ]
-      },
       "filterChains": [
         {
           "filterChainMatch": {
@@ -65,13 +54,25 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.google.default.default.dc1"
+                "statPrefix": "upstream.google.default.default.dc1",
+                "cluster": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
+      "defaultFilterChain": {
+        "filters": [
+          {
+            "name": "envoy.filters.network.tcp_proxy",
+            "typedConfig": {
+              "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
+              "statPrefix": "upstream.original-destination",
+              "cluster": "original-destination"
+            }
+          }
+        ]
+      },
       "listenerFilters": [
         {
           "name": "envoy.filters.listener.original_dst",
@@ -80,11 +81,11 @@
           }
         }
       ],
-      "name": "outbound_listener:127.0.0.1:15001",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "address": {
         "socketAddress": {
           "address": "127.10.10.10",
@@ -98,18 +99,18 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_geo-cache"
+                "statPrefix": "upstream.prepared_query_geo-cache",
+                "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:geo-cache:127.10.10.10:8181",
       "trafficDirection": "OUTBOUND"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name": "public_listener:0.0.0.0:9999",
       "address": {
         "socketAddress": {
           "address": "0.0.0.0",
@@ -123,7 +124,9 @@
               "name": "envoy.filters.network.rbac",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-                "rules": {},
+                "rules": {
+
+                },
                 "statPrefix": "connect_authz"
               }
             },
@@ -131,8 +134,8 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "local_app",
-                "statPrefix": "public_listener"
+                "statPrefix": "public_listener",
+                "cluster": "local_app"
               }
             }
           ],
@@ -141,6 +144,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "tlsParams": {
+
+                },
                 "tlsCertificates": [
                   {
                     "certificateChain": {
@@ -151,7 +157,6 @@
                     }
                   }
                 ],
-                "tlsParams": {},
                 "validationContext": {
                   "trustedCa": {
                     "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n"
@@ -163,10 +168,9 @@
           }
         }
       ],
-      "name": "public_listener:0.0.0.0:9999",
       "trafficDirection": "INBOUND"
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow--httpfilter.golden
index 0659f2c4afc92..b590b7135d872 100644
--- a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow--httpfilter.golden
@@ -19,7 +19,9 @@
                     "authenticated": {
                       "principalName": {
                         "safeRegex": {
-                          "googleRe2": {},
+                          "googleRe2": {
+
+                          },
                           "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
                         }
                       }
@@ -30,7 +32,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                           }
                         }
diff --git a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow.golden b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow.golden
index 956dd00006ccf..51346b03fa51f 100644
--- a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow.golden
+++ b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-allow.golden
@@ -16,7 +16,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
@@ -29,7 +31,9 @@
                     "authenticated": {
                       "principalName": {
                         "safeRegex": {
-                          "googleRe2": {},
+                          "googleRe2": {
+
+                          },
                           "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
                         }
                       }
@@ -40,7 +44,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                           }
                         }
diff --git a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny--httpfilter.golden
index d57d60bc770b4..62f4ba97eac4d 100644
--- a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny--httpfilter.golden
@@ -19,7 +19,9 @@
                     "authenticated": {
                       "principalName": {
                         "safeRegex": {
-                          "googleRe2": {},
+                          "googleRe2": {
+
+                          },
                           "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
                         }
                       }
@@ -30,7 +32,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                           }
                         }
@@ -57,7 +61,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny.golden b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny.golden
index 956dd00006ccf..51346b03fa51f 100644
--- a/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny.golden
+++ b/agent/xds/testdata/rbac/default-allow-deny-all-and-path-deny.golden
@@ -16,7 +16,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
@@ -29,7 +31,9 @@
                     "authenticated": {
                       "principalName": {
                         "safeRegex": {
-                          "googleRe2": {},
+                          "googleRe2": {
+
+                          },
                           "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
                         }
                       }
@@ -40,7 +44,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                           }
                         }
diff --git a/agent/xds/testdata/rbac/default-allow-kitchen-sink--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-kitchen-sink--httpfilter.golden
index b220a6d38ed6b..65da4d27fc376 100644
--- a/agent/xds/testdata/rbac/default-allow-kitchen-sink--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-allow-kitchen-sink--httpfilter.golden
@@ -16,7 +16,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$"
                   }
                 }
@@ -26,7 +28,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
@@ -39,7 +43,9 @@
                     "authenticated": {
                       "principalName": {
                         "safeRegex": {
-                          "googleRe2": {},
+                          "googleRe2": {
+
+                          },
                           "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
                         }
                       }
@@ -50,7 +56,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                           }
                         }
@@ -62,7 +70,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$"
                           }
                         }
@@ -74,7 +84,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$"
                           }
                         }
diff --git a/agent/xds/testdata/rbac/default-allow-kitchen-sink.golden b/agent/xds/testdata/rbac/default-allow-kitchen-sink.golden
index 6bb4e9e2ff2ec..21e94ee14eb3a 100644
--- a/agent/xds/testdata/rbac/default-allow-kitchen-sink.golden
+++ b/agent/xds/testdata/rbac/default-allow-kitchen-sink.golden
@@ -16,7 +16,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$"
                   }
                 }
@@ -26,7 +28,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
@@ -39,7 +43,9 @@
                     "authenticated": {
                       "principalName": {
                         "safeRegex": {
-                          "googleRe2": {},
+                          "googleRe2": {
+
+                          },
                           "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
                         }
                       }
@@ -50,7 +56,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                           }
                         }
@@ -62,7 +70,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$"
                           }
                         }
@@ -74,7 +84,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$"
                           }
                         }
diff --git a/agent/xds/testdata/rbac/default-allow-one-deny--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-one-deny--httpfilter.golden
index 851499ce9796a..f315c45e009b2 100644
--- a/agent/xds/testdata/rbac/default-allow-one-deny--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-allow-one-deny--httpfilter.golden
@@ -16,7 +16,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-allow-one-deny.golden b/agent/xds/testdata/rbac/default-allow-one-deny.golden
index 19f25b92ff5f0..45b6965e08b12 100644
--- a/agent/xds/testdata/rbac/default-allow-one-deny.golden
+++ b/agent/xds/testdata/rbac/default-allow-one-deny.golden
@@ -16,7 +16,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-allow-path-allow.golden b/agent/xds/testdata/rbac/default-allow-path-allow.golden
index 19f25b92ff5f0..45b6965e08b12 100644
--- a/agent/xds/testdata/rbac/default-allow-path-allow.golden
+++ b/agent/xds/testdata/rbac/default-allow-path-allow.golden
@@ -16,7 +16,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-allow-path-deny--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-path-deny--httpfilter.golden
index fc818d19ec378..aa06ebe3d2ee2 100644
--- a/agent/xds/testdata/rbac/default-allow-path-deny--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-allow-path-deny--httpfilter.golden
@@ -20,7 +20,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-allow-path-deny.golden b/agent/xds/testdata/rbac/default-allow-path-deny.golden
index 19f25b92ff5f0..45b6965e08b12 100644
--- a/agent/xds/testdata/rbac/default-allow-path-deny.golden
+++ b/agent/xds/testdata/rbac/default-allow-path-deny.golden
@@ -16,7 +16,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-allow-service-wildcard-deny--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-service-wildcard-deny--httpfilter.golden
index c16e12089d061..0c69fa84585bb 100644
--- a/agent/xds/testdata/rbac/default-allow-service-wildcard-deny--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-allow-service-wildcard-deny--httpfilter.golden
@@ -16,7 +16,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-allow-service-wildcard-deny.golden b/agent/xds/testdata/rbac/default-allow-service-wildcard-deny.golden
index 907c9e06b1f45..d685342e93994 100644
--- a/agent/xds/testdata/rbac/default-allow-service-wildcard-deny.golden
+++ b/agent/xds/testdata/rbac/default-allow-service-wildcard-deny.golden
@@ -16,7 +16,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms--httpfilter.golden
index c2e9504c390c0..ba1787d12fe97 100644
--- a/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms--httpfilter.golden
@@ -39,7 +39,9 @@
                           "urlPath": {
                             "path": {
                               "safeRegex": {
-                                "googleRe2": {},
+                                "googleRe2": {
+
+                                },
                                 "regex": "/v[123]"
                               }
                             }
@@ -49,7 +51,9 @@
                           "header": {
                             "name": ":method",
                             "safeRegexMatch": {
-                              "googleRe2": {},
+                              "googleRe2": {
+
+                              },
                               "regex": "GET|HEAD|OPTIONS"
                             }
                           }
@@ -93,82 +97,70 @@
                         {
                           "header": {
                             "name": "x-bar",
-                            "stringMatch": {
-                              "exact": "xyz"
-                            }
+                            "exactMatch": "xyz"
                           }
                         },
                         {
                           "header": {
                             "name": "x-dib",
-                            "stringMatch": {
-                              "prefix": "gaz"
-                            }
+                            "prefixMatch": "gaz"
                           }
                         },
                         {
                           "header": {
                             "name": "x-gir",
-                            "stringMatch": {
-                              "suffix": "zim"
-                            }
+                            "suffixMatch": "zim"
                           }
                         },
                         {
                           "header": {
                             "name": "x-zim",
-                            "stringMatch": {
-                              "safeRegex": {
-                                "googleRe2": {},
-                                "regex": "gi[rR]"
-                              }
+                            "safeRegexMatch": {
+                              "googleRe2": {
+
+                              },
+                              "regex": "gi[rR]"
                             }
                           }
                         },
                         {
                           "header": {
-                            "invertMatch": true,
                             "name": "z-foo",
-                            "presentMatch": true
+                            "presentMatch": true,
+                            "invertMatch": true
                           }
                         },
                         {
                           "header": {
-                            "invertMatch": true,
                             "name": "z-bar",
-                            "stringMatch": {
-                              "exact": "xyz"
-                            }
+                            "exactMatch": "xyz",
+                            "invertMatch": true
                           }
                         },
                         {
                           "header": {
-                            "invertMatch": true,
                             "name": "z-dib",
-                            "stringMatch": {
-                              "prefix": "gaz"
-                            }
+                            "prefixMatch": "gaz",
+                            "invertMatch": true
                           }
                         },
                         {
                           "header": {
-                            "invertMatch": true,
                             "name": "z-gir",
-                            "stringMatch": {
-                              "suffix": "zim"
-                            }
+                            "suffixMatch": "zim",
+                            "invertMatch": true
                           }
                         },
                         {
                           "header": {
-                            "invertMatch": true,
                             "name": "z-zim",
-                            "stringMatch": {
-                              "safeRegex": {
-                                "googleRe2": {},
-                                "regex": "gi[rR]"
-                              }
-                            }
+                            "safeRegexMatch": {
+                              "googleRe2": {
+
+                              },
+                              "regex": "gi[rR]"
+                            },
+                            "invertMatch": true
                           }
                         }
                       ]
@@ -182,7 +174,9 @@
                             "urlPath": {
                               "path": {
                                 "safeRegex": {
-                                  "googleRe2": {},
+                                  "googleRe2": {
+
+                                  },
                                   "regex": "/v[123]"
                                 }
                               }
@@ -192,7 +186,9 @@
                             "header": {
                               "name": ":method",
                               "safeRegexMatch": {
-                                "googleRe2": {},
+                                "googleRe2": {
+
+                                },
                                 "regex": "GET|HEAD|OPTIONS"
                               }
                             }
@@ -228,7 +224,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms.golden b/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms.golden
index 19f25b92ff5f0..45b6965e08b12 100644
--- a/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms.golden
+++ b/agent/xds/testdata/rbac/default-allow-single-intention-with-kitchen-sink-perms.golden
@@ -16,7 +16,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow--httpfilter.golden b/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow--httpfilter.golden
index ec4f26e958c17..98f4142098861 100644
--- a/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow--httpfilter.golden
@@ -42,7 +42,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow.golden b/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow.golden
index 19f25b92ff5f0..45b6965e08b12 100644
--- a/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow.golden
+++ b/agent/xds/testdata/rbac/default-allow-two-path-deny-and-path-allow.golden
@@ -16,7 +16,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-deny-allow-deny--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-allow-deny--httpfilter.golden
index cba46edc59cc6..3e48b7c566d56 100644
--- a/agent/xds/testdata/rbac/default-deny-allow-deny--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-deny-allow-deny--httpfilter.golden
@@ -18,7 +18,9 @@
                     "authenticated": {
                       "principalName": {
                         "safeRegex": {
-                          "googleRe2": {},
+                          "googleRe2": {
+
+                          },
                           "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
                         }
                       }
@@ -29,7 +31,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                           }
                         }
diff --git a/agent/xds/testdata/rbac/default-deny-allow-deny.golden b/agent/xds/testdata/rbac/default-deny-allow-deny.golden
index 185bbc27343c7..d901cf42cf56d 100644
--- a/agent/xds/testdata/rbac/default-deny-allow-deny.golden
+++ b/agent/xds/testdata/rbac/default-deny-allow-deny.golden
@@ -18,7 +18,9 @@
                     "authenticated": {
                       "principalName": {
                         "safeRegex": {
-                          "googleRe2": {},
+                          "googleRe2": {
+
+                          },
                           "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
                         }
                       }
@@ -29,7 +31,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                           }
                         }
diff --git a/agent/xds/testdata/rbac/default-deny-deny-all-and-path-allow--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-deny-all-and-path-allow--httpfilter.golden
index 880d5e18673fc..003fdb24bede8 100644
--- a/agent/xds/testdata/rbac/default-deny-deny-all-and-path-allow--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-deny-deny-all-and-path-allow--httpfilter.golden
@@ -19,7 +19,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-deny-deny-all-and-path-allow.golden b/agent/xds/testdata/rbac/default-deny-deny-all-and-path-allow.golden
index b1fa47ea4c35b..92c7f921adc10 100644
--- a/agent/xds/testdata/rbac/default-deny-deny-all-and-path-allow.golden
+++ b/agent/xds/testdata/rbac/default-deny-deny-all-and-path-allow.golden
@@ -2,7 +2,9 @@
   "name": "envoy.filters.network.rbac",
   "typedConfig": {
     "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-    "rules": {},
+    "rules": {
+
+    },
     "statPrefix": "connect_authz"
   }
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/default-deny-deny-all-and-path-deny--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-deny-all-and-path-deny--httpfilter.golden
index a435b1f2b8702..4ccd189bc0682 100644
--- a/agent/xds/testdata/rbac/default-deny-deny-all-and-path-deny--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-deny-deny-all-and-path-deny--httpfilter.golden
@@ -2,6 +2,8 @@
   "name": "envoy.filters.http.rbac",
   "typedConfig": {
     "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-    "rules": {}
+    "rules": {
+
+    }
   }
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/default-deny-deny-all-and-path-deny.golden b/agent/xds/testdata/rbac/default-deny-deny-all-and-path-deny.golden
index b1fa47ea4c35b..92c7f921adc10 100644
--- a/agent/xds/testdata/rbac/default-deny-deny-all-and-path-deny.golden
+++ b/agent/xds/testdata/rbac/default-deny-deny-all-and-path-deny.golden
@@ -2,7 +2,9 @@
   "name": "envoy.filters.network.rbac",
   "typedConfig": {
     "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-    "rules": {},
+    "rules": {
+
+    },
     "statPrefix": "connect_authz"
   }
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/default-deny-kitchen-sink--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-kitchen-sink--httpfilter.golden
index c551798d6bc20..426404d748b19 100644
--- a/agent/xds/testdata/rbac/default-deny-kitchen-sink--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-deny-kitchen-sink--httpfilter.golden
@@ -15,7 +15,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$"
                   }
                 }
@@ -25,7 +27,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
@@ -38,7 +42,9 @@
                     "authenticated": {
                       "principalName": {
                         "safeRegex": {
-                          "googleRe2": {},
+                          "googleRe2": {
+
+                          },
                           "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
                         }
                       }
@@ -49,7 +55,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                           }
                         }
@@ -61,7 +69,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$"
                           }
                         }
@@ -73,7 +83,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$"
                           }
                         }
diff --git a/agent/xds/testdata/rbac/default-deny-kitchen-sink.golden b/agent/xds/testdata/rbac/default-deny-kitchen-sink.golden
index 173f54b3db167..912b64d95c00a 100644
--- a/agent/xds/testdata/rbac/default-deny-kitchen-sink.golden
+++ b/agent/xds/testdata/rbac/default-deny-kitchen-sink.golden
@@ -15,7 +15,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$"
                   }
                 }
@@ -25,7 +27,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
@@ -38,7 +42,9 @@
                     "authenticated": {
                       "principalName": {
                         "safeRegex": {
-                          "googleRe2": {},
+                          "googleRe2": {
+
+                          },
                           "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
                         }
                       }
@@ -49,7 +55,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                           }
                         }
@@ -61,7 +69,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$"
                           }
                         }
@@ -73,7 +83,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$"
                           }
                         }
diff --git a/agent/xds/testdata/rbac/default-deny-mixed-precedence--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-mixed-precedence--httpfilter.golden
index fb2154c82e27f..c4795f46ef551 100644
--- a/agent/xds/testdata/rbac/default-deny-mixed-precedence--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-deny-mixed-precedence--httpfilter.golden
@@ -15,7 +15,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-deny-mixed-precedence.golden b/agent/xds/testdata/rbac/default-deny-mixed-precedence.golden
index a02fd3518c1ec..3fc78b29552dd 100644
--- a/agent/xds/testdata/rbac/default-deny-mixed-precedence.golden
+++ b/agent/xds/testdata/rbac/default-deny-mixed-precedence.golden
@@ -15,7 +15,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-deny-one-allow--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-one-allow--httpfilter.golden
index fb2154c82e27f..c4795f46ef551 100644
--- a/agent/xds/testdata/rbac/default-deny-one-allow--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-deny-one-allow--httpfilter.golden
@@ -15,7 +15,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-deny-one-allow.golden b/agent/xds/testdata/rbac/default-deny-one-allow.golden
index a02fd3518c1ec..3fc78b29552dd 100644
--- a/agent/xds/testdata/rbac/default-deny-one-allow.golden
+++ b/agent/xds/testdata/rbac/default-deny-one-allow.golden
@@ -15,7 +15,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-deny-path-allow--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-path-allow--httpfilter.golden
index 880d5e18673fc..003fdb24bede8 100644
--- a/agent/xds/testdata/rbac/default-deny-path-allow--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-deny-path-allow--httpfilter.golden
@@ -19,7 +19,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-deny-path-allow.golden b/agent/xds/testdata/rbac/default-deny-path-allow.golden
index b1fa47ea4c35b..92c7f921adc10 100644
--- a/agent/xds/testdata/rbac/default-deny-path-allow.golden
+++ b/agent/xds/testdata/rbac/default-deny-path-allow.golden
@@ -2,7 +2,9 @@
   "name": "envoy.filters.network.rbac",
   "typedConfig": {
     "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-    "rules": {},
+    "rules": {
+
+    },
     "statPrefix": "connect_authz"
   }
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/default-deny-path-deny--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-path-deny--httpfilter.golden
index a435b1f2b8702..4ccd189bc0682 100644
--- a/agent/xds/testdata/rbac/default-deny-path-deny--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-deny-path-deny--httpfilter.golden
@@ -2,6 +2,8 @@
   "name": "envoy.filters.http.rbac",
   "typedConfig": {
     "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-    "rules": {}
+    "rules": {
+
+    }
   }
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/default-deny-path-deny.golden b/agent/xds/testdata/rbac/default-deny-path-deny.golden
index b1fa47ea4c35b..92c7f921adc10 100644
--- a/agent/xds/testdata/rbac/default-deny-path-deny.golden
+++ b/agent/xds/testdata/rbac/default-deny-path-deny.golden
@@ -2,7 +2,9 @@
   "name": "envoy.filters.network.rbac",
   "typedConfig": {
     "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-    "rules": {},
+    "rules": {
+
+    },
     "statPrefix": "connect_authz"
   }
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink--httpfilter.golden
index 8b81593142cd7..2ffed83910341 100644
--- a/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink--httpfilter.golden
@@ -15,7 +15,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
@@ -28,7 +30,9 @@
                     "authenticated": {
                       "principalName": {
                         "safeRegex": {
-                          "googleRe2": {},
+                          "googleRe2": {
+
+                          },
                           "regex": "^spiffe://test.consul/gateway/mesh/dc/[^/]+$"
                         }
                       }
@@ -42,7 +46,9 @@
                             "name": "x-forwarded-client-cert",
                             "stringMatch": {
                               "safeRegex": {
-                                "googleRe2": {},
+                                "googleRe2": {
+
+                                },
                                 "regex": "^[^,]+;URI=spiffe://peer1.domain/ap/part1/ns/default/dc/[^/]+/svc/[^/]+(?:,.*)?$"
                               }
                             }
@@ -54,7 +60,9 @@
                               "name": "x-forwarded-client-cert",
                               "stringMatch": {
                                 "safeRegex": {
-                                  "googleRe2": {},
+                                  "googleRe2": {
+
+                                  },
                                   "regex": "^[^,]+;URI=spiffe://peer1.domain/ap/part1/ns/default/dc/[^/]+/svc/web(?:,.*)?$"
                                 }
                               }
diff --git a/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink.golden b/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink.golden
index ba7fc6b4d0d0f..eb480159407c9 100644
--- a/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink.golden
+++ b/agent/xds/testdata/rbac/default-deny-peered-kitchen-sink.golden
@@ -15,7 +15,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
@@ -28,7 +30,9 @@
                     "authenticated": {
                       "principalName": {
                         "safeRegex": {
-                          "googleRe2": {},
+                          "googleRe2": {
+
+                          },
                           "regex": "^spiffe://peer1.domain/ap/part1/ns/default/dc/[^/]+/svc/[^/]+$"
                         }
                       }
@@ -39,7 +43,9 @@
                       "authenticated": {
                         "principalName": {
                           "safeRegex": {
-                            "googleRe2": {},
+                            "googleRe2": {
+
+                            },
                             "regex": "^spiffe://peer1.domain/ap/part1/ns/default/dc/[^/]+/svc/web$"
                           }
                         }
diff --git a/agent/xds/testdata/rbac/default-deny-service-wildcard-allow--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-service-wildcard-allow--httpfilter.golden
index ce7174d5d0137..a65162f24fb96 100644
--- a/agent/xds/testdata/rbac/default-deny-service-wildcard-allow--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-deny-service-wildcard-allow--httpfilter.golden
@@ -15,7 +15,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-deny-service-wildcard-allow.golden b/agent/xds/testdata/rbac/default-deny-service-wildcard-allow.golden
index caad3988db147..3780a9079ebc7 100644
--- a/agent/xds/testdata/rbac/default-deny-service-wildcard-allow.golden
+++ b/agent/xds/testdata/rbac/default-deny-service-wildcard-allow.golden
@@ -15,7 +15,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-deny-single-intention-with-kitchen-sink-perms--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-single-intention-with-kitchen-sink-perms--httpfilter.golden
index e745e5278f366..f23112071b978 100644
--- a/agent/xds/testdata/rbac/default-deny-single-intention-with-kitchen-sink-perms--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-deny-single-intention-with-kitchen-sink-perms--httpfilter.golden
@@ -38,7 +38,9 @@
                           "urlPath": {
                             "path": {
                               "safeRegex": {
-                                "googleRe2": {},
+                                "googleRe2": {
+
+                                },
                                 "regex": "/v[123]"
                               }
                             }
@@ -48,7 +50,9 @@
                           "header": {
                             "name": ":method",
                             "safeRegexMatch": {
-                              "googleRe2": {},
+                              "googleRe2": {
+
+                              },
                               "regex": "GET|HEAD|OPTIONS"
                             }
                           }
@@ -92,82 +96,70 @@
                         {
                           "header": {
                             "name": "x-bar",
-                            "stringMatch": {
-                              "exact": "xyz"
-                            }
+                            "exactMatch": "xyz"
                           }
                         },
                         {
                           "header": {
                             "name": "x-dib",
-                            "stringMatch": {
-                              "prefix": "gaz"
-                            }
+                            "prefixMatch": "gaz"
                           }
                         },
                         {
                           "header": {
                             "name": "x-gir",
-                            "stringMatch": {
-                              "suffix": "zim"
-                            }
+                            "suffixMatch": "zim"
                           }
                         },
                         {
                           "header": {
                             "name": "x-zim",
-                            "stringMatch": {
-                              "safeRegex": {
-                                "googleRe2": {},
-                                "regex": "gi[rR]"
-                              }
+                            "safeRegexMatch": {
+                              "googleRe2": {
+
+                              },
+                              "regex": "gi[rR]"
                             }
                           }
                         },
                         {
                           "header": {
-                            "invertMatch": true,
                             "name": "z-foo",
-                            "presentMatch": true
+                            "presentMatch": true,
+                            "invertMatch": true
                           }
                         },
                         {
                           "header": {
-                            "invertMatch": true,
                             "name": "z-bar",
-                            "stringMatch": {
-                              "exact": "xyz"
-                            }
+                            "exactMatch": "xyz",
+                            "invertMatch": true
                           }
                         },
                         {
                           "header": {
-                            "invertMatch": true,
                             "name": "z-dib",
-                            "stringMatch": {
-                              "prefix": "gaz"
-                            }
+                            "prefixMatch": "gaz",
+                            "invertMatch": true
                           }
                         },
                         {
                           "header": {
-                            "invertMatch": true,
                             "name": "z-gir",
-                            "stringMatch": {
-                              "suffix": "zim"
-                            }
+                            "suffixMatch": "zim",
+                            "invertMatch": true
                           }
                         },
                         {
                           "header": {
-                            "invertMatch": true,
                             "name": "z-zim",
-                            "stringMatch": {
-                              "safeRegex": {
-                                "googleRe2": {},
-                                "regex": "gi[rR]"
-                              }
-                            }
+                            "safeRegexMatch": {
+                              "googleRe2": {
+
+                              },
+                              "regex": "gi[rR]"
+                            },
+                            "invertMatch": true
                           }
                         }
                       ]
@@ -181,7 +173,9 @@
                             "urlPath": {
                               "path": {
                                 "safeRegex": {
-                                  "googleRe2": {},
+                                  "googleRe2": {
+
+                                  },
                                   "regex": "/v[123]"
                                 }
                               }
@@ -191,7 +185,9 @@
                             "header": {
                               "name": ":method",
                               "safeRegexMatch": {
-                                "googleRe2": {},
+                                "googleRe2": {
+
+                                },
                                 "regex": "GET|HEAD|OPTIONS"
                               }
                             }
@@ -227,7 +223,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-deny-single-intention-with-kitchen-sink-perms.golden b/agent/xds/testdata/rbac/default-deny-single-intention-with-kitchen-sink-perms.golden
index b1fa47ea4c35b..92c7f921adc10 100644
--- a/agent/xds/testdata/rbac/default-deny-single-intention-with-kitchen-sink-perms.golden
+++ b/agent/xds/testdata/rbac/default-deny-single-intention-with-kitchen-sink-perms.golden
@@ -2,7 +2,9 @@
   "name": "envoy.filters.network.rbac",
   "typedConfig": {
     "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-    "rules": {},
+    "rules": {
+
+    },
     "statPrefix": "connect_authz"
   }
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/default-deny-two-path-deny-and-path-allow--httpfilter.golden b/agent/xds/testdata/rbac/default-deny-two-path-deny-and-path-allow--httpfilter.golden
index bfaa5c46c387d..75534cb10a9fa 100644
--- a/agent/xds/testdata/rbac/default-deny-two-path-deny-and-path-allow--httpfilter.golden
+++ b/agent/xds/testdata/rbac/default-deny-two-path-deny-and-path-allow--httpfilter.golden
@@ -43,7 +43,9 @@
               "authenticated": {
                 "principalName": {
                   "safeRegex": {
-                    "googleRe2": {},
+                    "googleRe2": {
+
+                    },
                     "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
                   }
                 }
diff --git a/agent/xds/testdata/rbac/default-deny-two-path-deny-and-path-allow.golden b/agent/xds/testdata/rbac/default-deny-two-path-deny-and-path-allow.golden
index b1fa47ea4c35b..92c7f921adc10 100644
--- a/agent/xds/testdata/rbac/default-deny-two-path-deny-and-path-allow.golden
+++ b/agent/xds/testdata/rbac/default-deny-two-path-deny-and-path-allow.golden
@@ -2,7 +2,9 @@
   "name": "envoy.filters.network.rbac",
   "typedConfig": {
     "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-    "rules": {},
+    "rules": {
+
+    },
     "statPrefix": "connect_authz"
   }
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/empty-top-level-jwt-with-one-permission--httpfilter.golden b/agent/xds/testdata/rbac/empty-top-level-jwt-with-one-permission--httpfilter.golden
deleted file mode 100644
index 28cb4df8f41d2..0000000000000
--- a/agent/xds/testdata/rbac/empty-top-level-jwt-with-one-permission--httpfilter.golden
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "name": "envoy.filters.http.rbac",
-  "typedConfig": {
-    "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-    "rules": {
-      "policies": {
-        "consul-intentions-layer7-0": {
-          "permissions": [
-            {
-              "andRules": {
-                "rules": [
-                  {
-                    "urlPath": {
-                      "path": {
-                        "prefix": "some-path"
-                      }
-                    }
-                  },
-                  {
-                    "andRules": {
-                      "rules": [
-                        {
-                          "metadata": {
-                            "filter": "envoy.filters.http.jwt_authn",
-                            "path": [
-                              {
-                                "key": "jwt_payload_okta"
-                              },
-                              {
-                                "key": "iss"
-                              }
-                            ],
-                            "value": {
-                              "stringMatch": {
-                                "exact": "mytest.okta-issuer"
-                              }
-                            }
-                          }
-                        },
-                        {
-                          "metadata": {
-                            "filter": "envoy.filters.http.jwt_authn",
-                            "path": [
-                              {
-                                "key": "jwt_payload_okta"
-                              },
-                              {
-                                "key": "roles"
-                              }
-                            ],
-                            "value": {
-                              "stringMatch": {
-                                "exact": "testing"
-                              }
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            }
-          ],
-          "principals": [
-            {
-              "authenticated": {
-                "principalName": {
-                  "safeRegex": {
-                    "googleRe2": {},
-                    "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/empty-top-level-jwt-with-one-permission.golden b/agent/xds/testdata/rbac/empty-top-level-jwt-with-one-permission.golden
deleted file mode 100644
index b1fa47ea4c35b..0000000000000
--- a/agent/xds/testdata/rbac/empty-top-level-jwt-with-one-permission.golden
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "envoy.filters.network.rbac",
-  "typedConfig": {
-    "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-    "rules": {},
-    "statPrefix": "connect_authz"
-  }
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/top-level-jwt-no-permissions--httpfilter.golden b/agent/xds/testdata/rbac/top-level-jwt-no-permissions--httpfilter.golden
deleted file mode 100644
index 522e134591fc3..0000000000000
--- a/agent/xds/testdata/rbac/top-level-jwt-no-permissions--httpfilter.golden
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "name": "envoy.filters.http.rbac",
-  "typedConfig": {
-    "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-    "rules": {
-      "policies": {
-        "consul-intentions-layer4": {
-          "permissions": [
-            {
-              "any": true
-            }
-          ],
-          "principals": [
-            {
-              "andIds": {
-                "ids": [
-                  {
-                    "authenticated": {
-                      "principalName": {
-                        "safeRegex": {
-                          "googleRe2": {},
-                          "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
-                        }
-                      }
-                    }
-                  },
-                  {
-                    "andIds": {
-                      "ids": [
-                        {
-                          "metadata": {
-                            "filter": "envoy.filters.http.jwt_authn",
-                            "path": [
-                              {
-                                "key": "jwt_payload_okta"
-                              },
-                              {
-                                "key": "iss"
-                              }
-                            ],
-                            "value": {
-                              "stringMatch": {
-                                "exact": "mytest.okta-issuer"
-                              }
-                            }
-                          }
-                        },
-                        {
-                          "metadata": {
-                            "filter": "envoy.filters.http.jwt_authn",
-                            "path": [
-                              {
-                                "key": "jwt_payload_okta"
-                              },
-                              {
-                                "key": "roles"
-                              }
-                            ],
-                            "value": {
-                              "stringMatch": {
-                                "exact": "testing"
-                              }
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/top-level-jwt-no-permissions.golden b/agent/xds/testdata/rbac/top-level-jwt-no-permissions.golden
deleted file mode 100644
index a02fd3518c1ec..0000000000000
--- a/agent/xds/testdata/rbac/top-level-jwt-no-permissions.golden
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "name": "envoy.filters.network.rbac",
-  "typedConfig": {
-    "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-    "rules": {
-      "policies": {
-        "consul-intentions-layer4": {
-          "permissions": [
-            {
-              "any": true
-            }
-          ],
-          "principals": [
-            {
-              "authenticated": {
-                "principalName": {
-                  "safeRegex": {
-                    "googleRe2": {},
-                    "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      }
-    },
-    "statPrefix": "connect_authz"
-  }
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/top-level-jwt-with-multiple-permissions--httpfilter.golden b/agent/xds/testdata/rbac/top-level-jwt-with-multiple-permissions--httpfilter.golden
deleted file mode 100644
index 461429f6c4992..0000000000000
--- a/agent/xds/testdata/rbac/top-level-jwt-with-multiple-permissions--httpfilter.golden
+++ /dev/null
@@ -1,205 +0,0 @@
-{
-  "name": "envoy.filters.http.rbac",
-  "typedConfig": {
-    "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-    "rules": {
-      "policies": {
-        "consul-intentions-layer7-0": {
-          "permissions": [
-            {
-              "andRules": {
-                "rules": [
-                  {
-                    "urlPath": {
-                      "path": {
-                        "exact": "/v1/secret"
-                      }
-                    }
-                  },
-                  {
-                    "andRules": {
-                      "rules": [
-                        {
-                          "metadata": {
-                            "filter": "envoy.filters.http.jwt_authn",
-                            "path": [
-                              {
-                                "key": "jwt_payload_auth0"
-                              },
-                              {
-                                "key": "iss"
-                              }
-                            ],
-                            "value": {
-                              "stringMatch": {
-                                "exact": "mytest.auth0-issuer"
-                              }
-                            }
-                          }
-                        },
-                        {
-                          "metadata": {
-                            "filter": "envoy.filters.http.jwt_authn",
-                            "path": [
-                              {
-                                "key": "jwt_payload_auth0"
-                              },
-                              {
-                                "key": "perms"
-                              },
-                              {
-                                "key": "role"
-                              }
-                            ],
-                            "value": {
-                              "stringMatch": {
-                                "exact": "admin"
-                              }
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            },
-            {
-              "andRules": {
-                "rules": [
-                  {
-                    "andRules": {
-                      "rules": [
-                        {
-                          "urlPath": {
-                            "path": {
-                              "exact": "/v1/admin"
-                            }
-                          }
-                        },
-                        {
-                          "notRule": {
-                            "urlPath": {
-                              "path": {
-                                "exact": "/v1/secret"
-                              }
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "andRules": {
-                      "rules": [
-                        {
-                          "metadata": {
-                            "filter": "envoy.filters.http.jwt_authn",
-                            "path": [
-                              {
-                                "key": "jwt_payload_auth0"
-                              },
-                              {
-                                "key": "iss"
-                              }
-                            ],
-                            "value": {
-                              "stringMatch": {
-                                "exact": "mytest.auth0-issuer"
-                              }
-                            }
-                          }
-                        },
-                        {
-                          "metadata": {
-                            "filter": "envoy.filters.http.jwt_authn",
-                            "path": [
-                              {
-                                "key": "jwt_payload_auth0"
-                              },
-                              {
-                                "key": "perms"
-                              },
-                              {
-                                "key": "role"
-                              }
-                            ],
-                            "value": {
-                              "stringMatch": {
-                                "exact": "admin"
-                              }
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            }
-          ],
-          "principals": [
-            {
-              "andIds": {
-                "ids": [
-                  {
-                    "authenticated": {
-                      "principalName": {
-                        "safeRegex": {
-                          "googleRe2": {},
-                          "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
-                        }
-                      }
-                    }
-                  },
-                  {
-                    "andIds": {
-                      "ids": [
-                        {
-                          "metadata": {
-                            "filter": "envoy.filters.http.jwt_authn",
-                            "path": [
-                              {
-                                "key": "jwt_payload_okta"
-                              },
-                              {
-                                "key": "iss"
-                              }
-                            ],
-                            "value": {
-                              "stringMatch": {
-                                "exact": "mytest.okta-issuer"
-                              }
-                            }
-                          }
-                        },
-                        {
-                          "metadata": {
-                            "filter": "envoy.filters.http.jwt_authn",
-                            "path": [
-                              {
-                                "key": "jwt_payload_okta"
-                              },
-                              {
-                                "key": "roles"
-                              }
-                            ],
-                            "value": {
-                              "stringMatch": {
-                                "exact": "testing"
-                              }
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/top-level-jwt-with-multiple-permissions.golden b/agent/xds/testdata/rbac/top-level-jwt-with-multiple-permissions.golden
deleted file mode 100644
index b1fa47ea4c35b..0000000000000
--- a/agent/xds/testdata/rbac/top-level-jwt-with-multiple-permissions.golden
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "envoy.filters.network.rbac",
-  "typedConfig": {
-    "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-    "rules": {},
-    "statPrefix": "connect_authz"
-  }
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/top-level-jwt-with-one-permission--httpfilter.golden b/agent/xds/testdata/rbac/top-level-jwt-with-one-permission--httpfilter.golden
deleted file mode 100644
index f384cbdd654b8..0000000000000
--- a/agent/xds/testdata/rbac/top-level-jwt-with-one-permission--httpfilter.golden
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-  "name": "envoy.filters.http.rbac",
-  "typedConfig": {
-    "@type": "type.googleapis.com/envoy.extensions.filters.http.rbac.v3.RBAC",
-    "rules": {
-      "policies": {
-        "consul-intentions-layer7-0": {
-          "permissions": [
-            {
-              "andRules": {
-                "rules": [
-                  {
-                    "urlPath": {
-                      "path": {
-                        "exact": "/v1/secret"
-                      }
-                    }
-                  },
-                  {
-                    "andRules": {
-                      "rules": [
-                        {
-                          "metadata": {
-                            "filter": "envoy.filters.http.jwt_authn",
-                            "path": [
-                              {
-                                "key": "jwt_payload_auth0"
-                              },
-                              {
-                                "key": "iss"
-                              }
-                            ],
-                            "value": {
-                              "stringMatch": {
-                                "exact": "mytest.auth0-issuer"
-                              }
-                            }
-                          }
-                        },
-                        {
-                          "metadata": {
-                            "filter": "envoy.filters.http.jwt_authn",
-                            "path": [
-                              {
-                                "key": "jwt_payload_auth0"
-                              },
-                              {
-                                "key": "perms"
-                              },
-                              {
-                                "key": "role"
-                              }
-                            ],
-                            "value": {
-                              "stringMatch": {
-                                "exact": "admin"
-                              }
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            },
-            {
-              "andRules": {
-                "rules": [
-                  {
-                    "urlPath": {
-                      "path": {
-                        "exact": "/v1/admin"
-                      }
-                    }
-                  },
-                  {
-                    "notRule": {
-                      "urlPath": {
-                        "path": {
-                          "exact": "/v1/secret"
-                        }
-                      }
-                    }
-                  }
-                ]
-              }
-            }
-          ],
-          "principals": [
-            {
-              "andIds": {
-                "ids": [
-                  {
-                    "authenticated": {
-                      "principalName": {
-                        "safeRegex": {
-                          "googleRe2": {},
-                          "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
-                        }
-                      }
-                    }
-                  },
-                  {
-                    "andIds": {
-                      "ids": [
-                        {
-                          "metadata": {
-                            "filter": "envoy.filters.http.jwt_authn",
-                            "path": [
-                              {
-                                "key": "jwt_payload_okta"
-                              },
-                              {
-                                "key": "iss"
-                              }
-                            ],
-                            "value": {
-                              "stringMatch": {
-                                "exact": "mytest.okta-issuer"
-                              }
-                            }
-                          }
-                        },
-                        {
-                          "metadata": {
-                            "filter": "envoy.filters.http.jwt_authn",
-                            "path": [
-                              {
-                                "key": "jwt_payload_okta"
-                              },
-                              {
-                                "key": "roles"
-                              }
-                            ],
-                            "value": {
-                              "stringMatch": {
-                                "exact": "testing"
-                              }
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/top-level-jwt-with-one-permission.golden b/agent/xds/testdata/rbac/top-level-jwt-with-one-permission.golden
deleted file mode 100644
index b1fa47ea4c35b..0000000000000
--- a/agent/xds/testdata/rbac/top-level-jwt-with-one-permission.golden
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "envoy.filters.network.rbac",
-  "typedConfig": {
-    "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-    "rules": {},
-    "statPrefix": "connect_authz"
-  }
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/v2-default-allow.golden b/agent/xds/testdata/rbac/v2-default-allow.golden
deleted file mode 100644
index 9e26dfeeb6e64..0000000000000
--- a/agent/xds/testdata/rbac/v2-default-allow.golden
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/v2-default-deny.golden b/agent/xds/testdata/rbac/v2-default-deny.golden
deleted file mode 100644
index b1fa47ea4c35b..0000000000000
--- a/agent/xds/testdata/rbac/v2-default-deny.golden
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "envoy.filters.network.rbac",
-  "typedConfig": {
-    "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-    "rules": {},
-    "statPrefix": "connect_authz"
-  }
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/v2-ignore-empty-permissions.golden b/agent/xds/testdata/rbac/v2-ignore-empty-permissions.golden
deleted file mode 100644
index 4e71fce1916c3..0000000000000
--- a/agent/xds/testdata/rbac/v2-ignore-empty-permissions.golden
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "filters": [
-    {
-      "name": "envoy.filters.network.rbac",
-      "typedConfig": {
-        "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-        "rules": {
-          "action": "DENY"
-        },
-        "statPrefix": "connect_authz"
-      }
-    },
-    {
-      "name": "envoy.filters.network.rbac",
-      "typedConfig": {
-        "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-        "rules": {},
-        "statPrefix": "connect_authz"
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/rbac/v2-kitchen-sink.golden b/agent/xds/testdata/rbac/v2-kitchen-sink.golden
deleted file mode 100644
index d298830ee9351..0000000000000
--- a/agent/xds/testdata/rbac/v2-kitchen-sink.golden
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-  "filters": [
-    {
-      "name": "envoy.filters.network.rbac",
-      "typedConfig": {
-        "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-        "rules": {
-          "action": "DENY",
-          "policies": {
-            "consul-intentions-layer4": {
-              "permissions": [
-                {
-                  "any": true
-                }
-              ],
-              "principals": [
-                {
-                  "authenticated": {
-                    "principalName": {
-                      "safeRegex": {
-                        "googleRe2": {},
-                        "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/db$"
-                      }
-                    }
-                  }
-                },
-                {
-                  "authenticated": {
-                    "principalName": {
-                      "safeRegex": {
-                        "googleRe2": {},
-                        "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/cron$"
-                      }
-                    }
-                  }
-                }
-              ]
-            }
-          }
-        },
-        "statPrefix": "connect_authz"
-      }
-    },
-    {
-      "name": "envoy.filters.network.rbac",
-      "typedConfig": {
-        "@type": "type.googleapis.com/envoy.extensions.filters.network.rbac.v3.RBAC",
-        "rules": {
-          "policies": {
-            "consul-intentions-layer4-0": {
-              "permissions": [
-                {
-                  "any": true
-                }
-              ],
-              "principals": [
-                {
-                  "authenticated": {
-                    "principalName": {
-                      "safeRegex": {
-                        "googleRe2": {},
-                        "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/api$"
-                      }
-                    }
-                  }
-                },
-                {
-                  "andIds": {
-                    "ids": [
-                      {
-                        "authenticated": {
-                          "principalName": {
-                            "safeRegex": {
-                              "googleRe2": {},
-                              "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/[^/]+$"
-                            }
-                          }
-                        }
-                      },
-                      {
-                        "notId": {
-                          "authenticated": {
-                            "principalName": {
-                              "safeRegex": {
-                                "googleRe2": {},
-                                "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/unsafe$"
-                              }
-                            }
-                          }
-                        }
-                      }
-                    ]
-                  }
-                }
-              ]
-            },
-            "consul-intentions-layer4-1": {
-              "permissions": [
-                {
-                  "any": true
-                }
-              ],
-              "principals": [
-                {
-                  "authenticated": {
-                    "principalName": {
-                      "safeRegex": {
-                        "googleRe2": {},
-                        "regex": "^spiffe://test.consul/ns/default/dc/[^/]+/svc/web$"
-                      }
-                    }
-                  }
-                }
-              ]
-            }
-          }
-        },
-        "statPrefix": "connect_authz"
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/api-gateway-with-http-route-and-inline-certificate.latest.golden b/agent/xds/testdata/routes/api-gateway-with-http-route-and-inline-certificate.latest.golden
new file mode 100644
index 0000000000000..6abc6f2946b48
--- /dev/null
+++ b/agent/xds/testdata/routes/api-gateway-with-http-route-and-inline-certificate.latest.golden
@@ -0,0 +1,31 @@
+{
+  "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "8080",
+      "virtualHosts":  [
+        {
+          "name":  "api-gateway-listener-9b9265b",
+          "domains":  [
+            "*",
+            "*:8080"
+          ],
+          "routes":  [
+            {
+              "match":  {
+                "prefix":  "/"
+              },
+              "route":  {
+                "cluster":  "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+              }
+            }
+          ]
+        }
+      ],
+      "validateClusters":  true
+    }
+  ],
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
+}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden b/agent/xds/testdata/routes/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden
deleted file mode 100644
index 2c220ee70ef54..0000000000000
--- a/agent/xds/testdata/routes/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "*",
-            "*:8080"
-          ],
-          "name": "api-gateway-listener-9b9265b",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "requestHeadersToAdd": [
-                {
-                  "append": true,
-                  "header": {
-                    "key": "X-Header-Add",
-                    "value": "added"
-                  }
-                },
-                {
-                  "append": false,
-                  "header": {
-                    "key": "X-Header-Set",
-                    "value": "set"
-                  }
-                }
-              ],
-              "requestHeadersToRemove": [
-                "X-Header-Remove"
-              ],
-              "route": {
-                "cluster": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "idleTimeout": "30s"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/api-gateway-with-http-route.latest.golden b/agent/xds/testdata/routes/api-gateway-with-http-route.latest.golden
deleted file mode 100644
index 3137421e51881..0000000000000
--- a/agent/xds/testdata/routes/api-gateway-with-http-route.latest.golden
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "*",
-            "*:8080"
-          ],
-          "name": "api-gateway-listener-9b9265b",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "requestHeadersToAdd": [
-                {
-                  "append": true,
-                  "header": {
-                    "key": "X-Header-Add",
-                    "value": "added"
-                  }
-                },
-                {
-                  "append": false,
-                  "header": {
-                    "key": "X-Header-Set",
-                    "value": "set"
-                  }
-                }
-              ],
-              "requestHeadersToRemove": [
-                "X-Header-Remove"
-              ],
-              "route": {
-                "cluster": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "idleTimeout": "30s",
-                "retryPolicy": {
-                  "numRetries": 3,
-                  "retriableStatusCodes": [
-                    500
-                  ],
-                  "retryOn": "cancelled,connect-failure,retriable-status-codes"
-                },
-                "timeout": "30s"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/api-gateway-with-multiple-hostnames.latest.golden b/agent/xds/testdata/routes/api-gateway-with-multiple-hostnames.latest.golden
deleted file mode 100644
index 9e96457f3c3b9..0000000000000
--- a/agent/xds/testdata/routes/api-gateway-with-multiple-hostnames.latest.golden
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "backend.example.com",
-            "backend.example.com:8080"
-          ],
-          "name": "api-gateway-http-5a84e719",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "backend.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "frontend.example.com",
-            "frontend.example.com:8080"
-          ],
-          "name": "api-gateway-http-54620b06",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "frontend.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "*.example.com",
-            "*.example.com:8080"
-          ],
-          "name": "api-gateway-http-aa289ce2",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/frontend"
-              },
-              "route": {
-                "cluster": "frontend.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            },
-            {
-              "match": {
-                "prefix": "/backend"
-              },
-              "route": {
-                "cluster": "backend.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/api-gateway-with-multiple-inline-certificates.latest.golden b/agent/xds/testdata/routes/api-gateway-with-multiple-inline-certificates.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/api-gateway-with-multiple-inline-certificates.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/api-gateway-with-tcp-route-and-inline-certificate.latest.golden b/agent/xds/testdata/routes/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
index 8b919343d21a9..306f5220e7b9c 100644
--- a/agent/xds/testdata/routes/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
+++ b/agent/xds/testdata/routes/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-exported-to-peers.latest.golden b/agent/xds/testdata/routes/connect-proxy-exported-to-peers.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/connect-proxy-exported-to-peers.latest.golden
+++ b/agent/xds/testdata/routes/connect-proxy-exported-to-peers.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.latest.golden b/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.latest.golden
index f748c3e8208ed..9cac480402557 100644
--- a/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.latest.golden
+++ b/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.latest.golden
@@ -1,22 +1,34 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "db",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "db",
           "domains": [
             "*"
           ],
-          "name": "db",
           "routes": [
             {
               "match": {
                 "prefix": "/"
               },
               "route": {
+                "weightedClusters": {
+                  "clusters": [
+                    {
+                      "name": "something-else.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                      "weight": 9550
+                    },
+                    {
+                      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                      "weight": 450
+                    }
+                  ],
+                  "totalWeight": 10000
+                },
                 "hashPolicy": [
                   {
                     "cookie": {
@@ -35,38 +47,21 @@
                       "headerName": "x-user-id"
                     }
                   },
-                  {
-                    "queryParameter": {
-                      "name": "my-pretty-param"
-                    }
-                  },
                   {
                     "connectionProperties": {
                       "sourceIp": true
                     },
                     "terminal": true
                   }
-                ],
-                "weightedClusters": {
-                  "clusters": [
-                    {
-                      "name": "something-else.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                      "weight": 9550
-                    },
-                    {
-                      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                      "weight": 450
-                    }
-                  ],
-                  "totalWeight": 10000
-                }
+                ]
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-resolver-with-lb.latest.golden b/agent/xds/testdata/routes/connect-proxy-resolver-with-lb.latest.golden
deleted file mode 100644
index 6d9d5242037ef..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-resolver-with-lb.latest.golden
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "db",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "db",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-route-to-lb-resolver.latest.golden b/agent/xds/testdata/routes/connect-proxy-route-to-lb-resolver.latest.golden
deleted file mode 100644
index 3ab67ba8f2219..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-route-to-lb-resolver.latest.golden
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "db",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "db",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/web"
-              },
-              "route": {
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            },
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-splitter-overweight.latest.golden b/agent/xds/testdata/routes/connect-proxy-splitter-overweight.latest.golden
deleted file mode 100644
index b52cd3205ea8a..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-splitter-overweight.latest.golden
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "db",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "db",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "weightedClusters": {
-                  "clusters": [
-                    {
-                      "name": "big-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                      "requestHeadersToAdd": [
-                        {
-                          "append": false,
-                          "header": {
-                            "key": "x-split-leg",
-                            "value": "big"
-                          }
-                        }
-                      ],
-                      "responseHeadersToAdd": [
-                        {
-                          "append": false,
-                          "header": {
-                            "key": "x-split-leg",
-                            "value": "big"
-                          }
-                        }
-                      ],
-                      "weight": 10000
-                    },
-                    {
-                      "name": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                      "requestHeadersToAdd": [
-                        {
-                          "append": false,
-                          "header": {
-                            "key": "x-split-leg",
-                            "value": "goldilocks"
-                          }
-                        }
-                      ],
-                      "responseHeadersToAdd": [
-                        {
-                          "append": false,
-                          "header": {
-                            "key": "x-split-leg",
-                            "value": "goldilocks"
-                          }
-                        }
-                      ],
-                      "weight": 10000
-                    },
-                    {
-                      "name": "lil-bit-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                      "requestHeadersToAdd": [
-                        {
-                          "append": false,
-                          "header": {
-                            "key": "x-split-leg",
-                            "value": "small"
-                          }
-                        }
-                      ],
-                      "responseHeadersToAdd": [
-                        {
-                          "append": false,
-                          "header": {
-                            "key": "x-split-leg",
-                            "value": "small"
-                          }
-                        }
-                      ],
-                      "weight": 10000
-                    }
-                  ]
-                }
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
index 9a73db46e0d6e..095330c68404e 100644
--- a/agent/xds/testdata/routes/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
+++ b/agent/xds/testdata/routes/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
@@ -1,31 +1,31 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "db",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "db",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "db",
+          "domains":  [
             "*"
           ],
-          "name": "db",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "33s"
+              "route":  {
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout":  "33s"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.latest.golden
index 5d8b1dd41e834..c40cfe9e90ef2 100644
--- a/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.latest.golden
+++ b/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.latest.golden
@@ -1,16 +1,15 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "db",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "db",
           "domains": [
             "*"
           ],
-          "name": "db",
           "routes": [
             {
               "match": {
@@ -23,9 +22,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
index b5da244e3e67f..cf29d6729a0a7 100644
--- a/agent/xds/testdata/routes/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
+++ b/agent/xds/testdata/routes/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
@@ -1,31 +1,31 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "db",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "db",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "db",
+          "domains":  [
             "*"
           ],
-          "name": "db",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "db.default.cluster-01.external.peer1.domain",
-                "timeout": "33s"
+              "route":  {
+                "cluster":  "db.default.cluster-01.external.peer1.domain",
+                "timeout":  "33s"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.latest.golden
index 958709e3477e8..d34194b932328 100644
--- a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.latest.golden
+++ b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.latest.golden
@@ -1,16 +1,15 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "db",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "db",
           "domains": [
             "*"
           ],
-          "name": "db",
           "routes": [
             {
               "match": {
@@ -31,7 +30,9 @@
             {
               "match": {
                 "safeRegex": {
-                  "googleRe2": {},
+                  "googleRe2": {
+
+                  },
                   "regex": "/regex"
                 }
               },
@@ -41,13 +42,13 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
                     "presentMatch": true
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -55,14 +56,14 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
-                    "invertMatch": true,
                     "name": "x-debug",
-                    "presentMatch": true
+                    "presentMatch": true,
+                    "invertMatch": true
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-not-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -70,15 +71,13 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "exact": "exact"
-                    }
+                    "exactMatch": "exact"
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -86,15 +85,13 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "prefix": "prefix"
-                    }
+                    "prefixMatch": "prefix"
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -102,15 +99,13 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "suffix": "suffix"
-                    }
+                    "suffixMatch": "suffix"
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-suffix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -118,18 +113,18 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "safeRegex": {
-                        "googleRe2": {},
-                        "regex": "regex"
-                      }
+                    "safeRegexMatch": {
+                      "googleRe2": {
+
+                      },
+                      "regex": "regex"
                     }
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -137,16 +132,18 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": ":method",
                     "safeRegexMatch": {
-                      "googleRe2": {},
+                      "googleRe2": {
+
+                      },
                       "regex": "GET|PUT"
                     }
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "just-methods.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -154,22 +151,22 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "exact": "exact"
-                    }
+                    "exactMatch": "exact"
                   },
                   {
                     "name": ":method",
                     "safeRegexMatch": {
-                      "googleRe2": {},
+                      "googleRe2": {
+
+                      },
                       "regex": "GET|PUT"
                     }
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-exact-with-method.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -199,7 +196,9 @@
                     "name": "secretparam2",
                     "stringMatch": {
                       "safeRegex": {
-                        "googleRe2": {},
+                        "googleRe2": {
+
+                        },
                         "regex": "regex"
                       }
                     }
@@ -291,8 +290,8 @@
               "route": {
                 "cluster": "retry-connect.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "retryPolicy": {
-                  "numRetries": 15,
-                  "retryOn": "connect-failure"
+                  "retryOn": "connect-failure",
+                  "numRetries": 15
                 }
               }
             },
@@ -303,8 +302,8 @@
               "route": {
                 "cluster": "retry-reset.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "retryPolicy": {
-                  "numRetries": 15,
-                  "retryOn": "reset"
+                  "retryOn": "reset",
+                  "numRetries": 15
                 }
               }
             },
@@ -315,13 +314,13 @@
               "route": {
                 "cluster": "retry-codes.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "retryPolicy": {
+                  "retryOn": "retriable-status-codes",
                   "numRetries": 15,
                   "retriableStatusCodes": [
                     401,
                     409,
                     451
-                  ],
-                  "retryOn": "retriable-status-codes"
+                  ]
                 }
               }
             },
@@ -332,12 +331,12 @@
               "route": {
                 "cluster": "retry-all.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "retryPolicy": {
+                  "retryOn": "5xx,gateway-error,reset,connect-failure,envoy-ratelimited,retriable-4xx,refused-stream,cancelled,deadline-exceeded,internal,resource-exhausted,unavailable,retriable-status-codes",
                   "retriableStatusCodes": [
                     401,
                     409,
                     451
-                  ],
-                  "retryOn": "5xx,gateway-error,reset,connect-failure,envoy-ratelimited,retriable-4xx,refused-stream,cancelled,deadline-exceeded,internal,resource-exhausted,unavailable,retriable-status-codes"
+                  ]
                 }
               }
             },
@@ -369,20 +368,23 @@
               "match": {
                 "path": "/header-manip"
               },
+              "route": {
+                "cluster": "header-manip.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+              },
               "requestHeadersToAdd": [
                 {
-                  "append": true,
                   "header": {
                     "key": "request",
                     "value": "bar"
-                  }
+                  },
+                  "append": true
                 },
                 {
-                  "append": false,
                   "header": {
                     "key": "bar",
                     "value": "baz"
-                  }
+                  },
+                  "append": false
                 }
               ],
               "requestHeadersToRemove": [
@@ -390,26 +392,23 @@
               ],
               "responseHeadersToAdd": [
                 {
-                  "append": true,
                   "header": {
                     "key": "response",
                     "value": "bar"
-                  }
+                  },
+                  "append": true
                 },
                 {
-                  "append": false,
                   "header": {
                     "key": "bar",
                     "value": "baz"
-                  }
+                  },
+                  "append": false
                 }
               ],
               "responseHeadersToRemove": [
                 "qux"
-              ],
-              "route": {
-                "cluster": "header-manip.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
+              ]
             },
             {
               "match": {
@@ -421,9 +420,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.latest.golden
index 564167abe06ea..9dde104442a9e 100644
--- a/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.latest.golden
+++ b/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.latest.golden
@@ -1,16 +1,15 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "db",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "db",
           "domains": [
             "*"
           ],
-          "name": "db",
           "routes": [
             {
               "match": {
@@ -21,69 +20,69 @@
                   "clusters": [
                     {
                       "name": "big-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                      "weight": 9550,
                       "requestHeadersToAdd": [
                         {
-                          "append": false,
                           "header": {
                             "key": "x-split-leg",
                             "value": "big"
-                          }
+                          },
+                          "append": false
                         }
                       ],
                       "responseHeadersToAdd": [
                         {
-                          "append": false,
                           "header": {
                             "key": "x-split-leg",
                             "value": "big"
-                          }
+                          },
+                          "append": false
                         }
-                      ],
-                      "weight": 9550
+                      ]
                     },
                     {
                       "name": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                      "weight": 400,
                       "requestHeadersToAdd": [
                         {
-                          "append": false,
                           "header": {
                             "key": "x-split-leg",
                             "value": "goldilocks"
-                          }
+                          },
+                          "append": false
                         }
                       ],
                       "responseHeadersToAdd": [
                         {
-                          "append": false,
                           "header": {
                             "key": "x-split-leg",
                             "value": "goldilocks"
-                          }
+                          },
+                          "append": false
                         }
-                      ],
-                      "weight": 400
+                      ]
                     },
                     {
                       "name": "lil-bit-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                      "weight": 50,
                       "requestHeadersToAdd": [
                         {
-                          "append": false,
                           "header": {
                             "key": "x-split-leg",
                             "value": "small"
-                          }
+                          },
+                          "append": false
                         }
                       ],
                       "responseHeadersToAdd": [
                         {
-                          "append": false,
                           "header": {
                             "key": "x-split-leg",
                             "value": "small"
-                          }
+                          },
+                          "append": false
                         }
-                      ],
-                      "weight": 50
+                      ]
                     }
                   ],
                   "totalWeight": 10000
@@ -92,9 +91,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.latest.golden
index 9a73db46e0d6e..095330c68404e 100644
--- a/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.latest.golden
+++ b/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.latest.golden
@@ -1,31 +1,31 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "db",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "db",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "db",
+          "domains":  [
             "*"
           ],
-          "name": "db",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "33s"
+              "route":  {
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout":  "33s"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain.latest.golden
index 9a73db46e0d6e..095330c68404e 100644
--- a/agent/xds/testdata/routes/connect-proxy-with-chain.latest.golden
+++ b/agent/xds/testdata/routes/connect-proxy-with-chain.latest.golden
@@ -1,31 +1,31 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "db",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "db",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "db",
+          "domains":  [
             "*"
           ],
-          "name": "db",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "33s"
+              "route":  {
+                "cluster":  "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout":  "33s"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-with-grpc-router.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-grpc-router.latest.golden
index 474ac19cd71b6..c042006a5f33c 100644
--- a/agent/xds/testdata/routes/connect-proxy-with-grpc-router.latest.golden
+++ b/agent/xds/testdata/routes/connect-proxy-with-grpc-router.latest.golden
@@ -1,16 +1,15 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "db",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "db",
           "domains": [
             "*"
           ],
-          "name": "db",
           "routes": [
             {
               "match": {
@@ -30,9 +29,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-with-peered-upstreams-http2.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-peered-upstreams-http2.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-peered-upstreams-http2.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/connect-proxy-with-peered-upstreams.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-peered-upstreams.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/connect-proxy-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/routes/connect-proxy-with-peered-upstreams.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/defaults.latest.golden b/agent/xds/testdata/routes/defaults.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/defaults.latest.golden
+++ b/agent/xds/testdata/routes/defaults.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-config-entry-nil.latest.golden b/agent/xds/testdata/routes/ingress-config-entry-nil.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/ingress-config-entry-nil.latest.golden
+++ b/agent/xds/testdata/routes/ingress-config-entry-nil.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-defaults-no-chain.latest.golden b/agent/xds/testdata/routes/ingress-defaults-no-chain.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/ingress-defaults-no-chain.latest.golden
+++ b/agent/xds/testdata/routes/ingress-defaults-no-chain.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-grpc-multiple-services.latest.golden b/agent/xds/testdata/routes/ingress-grpc-multiple-services.latest.golden
index 41c70e3de169b..006bf5157b081 100644
--- a/agent/xds/testdata/routes/ingress-grpc-multiple-services.latest.golden
+++ b/agent/xds/testdata/routes/ingress-grpc-multiple-services.latest.golden
@@ -1,52 +1,52 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "8080",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "foo",
+          "domains":  [
             "test1.example.com",
             "test2.example.com",
             "test2.example.com:8080",
             "test1.example.com:8080"
           ],
-          "name": "foo",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "22s"
+              "route":  {
+                "cluster":  "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout":  "22s"
               }
             }
           ]
         },
         {
-          "domains": [
+          "name":  "bar",
+          "domains":  [
             "bar.ingress.*",
             "bar.ingress.*:8080"
           ],
-          "name": "bar",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "22s"
+              "route":  {
+                "cluster":  "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout":  "22s"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-http-multiple-services.latest.golden b/agent/xds/testdata/routes/ingress-http-multiple-services.latest.golden
index a15b997a8fd98..507c66a46d5b1 100644
--- a/agent/xds/testdata/routes/ingress-http-multiple-services.latest.golden
+++ b/agent/xds/testdata/routes/ingress-http-multiple-services.latest.golden
@@ -1,17 +1,16 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "443",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "baz",
           "domains": [
             "baz.ingress.*",
             "baz.ingress.*:443"
           ],
-          "name": "baz",
           "routes": [
             {
               "match": {
@@ -24,11 +23,11 @@
           ]
         },
         {
+          "name": "qux",
           "domains": [
             "qux.ingress.*",
             "qux.ingress.*:443"
           ],
-          "name": "qux",
           "routes": [
             {
               "match": {
@@ -40,21 +39,21 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     },
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "8080",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "foo",
           "domains": [
             "test1.example.com",
             "test2.example.com",
             "test2.example.com:8080",
             "test1.example.com:8080"
           ],
-          "name": "foo",
           "routes": [
             {
               "match": {
@@ -68,11 +67,11 @@
           ]
         },
         {
+          "name": "bar",
           "domains": [
             "bar.ingress.*",
             "bar.ingress.*:8080"
           ],
-          "name": "bar",
           "routes": [
             {
               "match": {
@@ -85,9 +84,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-lb-in-resolver.latest.golden b/agent/xds/testdata/routes/ingress-lb-in-resolver.latest.golden
index 9660fb81a608a..f2bc276d8e99b 100644
--- a/agent/xds/testdata/routes/ingress-lb-in-resolver.latest.golden
+++ b/agent/xds/testdata/routes/ingress-lb-in-resolver.latest.golden
@@ -1,23 +1,35 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "8080",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "db",
           "domains": [
             "db.ingress.*",
             "db.ingress.*:8080"
           ],
-          "name": "db",
           "routes": [
             {
               "match": {
                 "prefix": "/"
               },
               "route": {
+                "weightedClusters": {
+                  "clusters": [
+                    {
+                      "name": "something-else.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                      "weight": 9550
+                    },
+                    {
+                      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                      "weight": 450
+                    }
+                  ],
+                  "totalWeight": 10000
+                },
                 "hashPolicy": [
                   {
                     "cookie": {
@@ -36,38 +48,21 @@
                       "headerName": "x-user-id"
                     }
                   },
-                  {
-                    "queryParameter": {
-                      "name": "my-pretty-param"
-                    }
-                  },
                   {
                     "connectionProperties": {
                       "sourceIp": true
                     },
                     "terminal": true
                   }
-                ],
-                "weightedClusters": {
-                  "clusters": [
-                    {
-                      "name": "something-else.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                      "weight": 9550
-                    },
-                    {
-                      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                      "weight": 450
-                    }
-                  ],
-                  "totalWeight": 10000
-                }
+                ]
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.latest.golden
index bf15c92982e7e..4c3fee303cb62 100644
--- a/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.latest.golden
+++ b/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.latest.golden
@@ -1,17 +1,16 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "8080",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "db",
           "domains": [
             "db.ingress.*",
             "db.ingress.*:8080"
           ],
-          "name": "db",
           "routes": [
             {
               "match": {
@@ -35,9 +34,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.latest.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.latest.golden
index 2a55ed3395002..1fa06838f8d83 100644
--- a/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.latest.golden
+++ b/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.latest.golden
@@ -1,55 +1,16 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "8080",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "db",
           "domains": [
             "db.ingress.*",
             "db.ingress.*:8080"
           ],
-          "name": "db",
-          "requestHeadersToAdd": [
-            {
-              "append": true,
-              "header": {
-                "key": "foo",
-                "value": "bar"
-              }
-            },
-            {
-              "append": false,
-              "header": {
-                "key": "bar",
-                "value": "baz"
-              }
-            }
-          ],
-          "requestHeadersToRemove": [
-            "qux"
-          ],
-          "responseHeadersToAdd": [
-            {
-              "append": true,
-              "header": {
-                "key": "foo",
-                "value": "bar"
-              }
-            },
-            {
-              "append": false,
-              "header": {
-                "key": "bar",
-                "value": "baz"
-              }
-            }
-          ],
-          "responseHeadersToRemove": [
-            "qux"
-          ],
           "routes": [
             {
               "match": {
@@ -70,7 +31,9 @@
             {
               "match": {
                 "safeRegex": {
-                  "googleRe2": {},
+                  "googleRe2": {
+
+                  },
                   "regex": "/regex"
                 }
               },
@@ -80,13 +43,13 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
                     "presentMatch": true
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -94,14 +57,14 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
-                    "invertMatch": true,
                     "name": "x-debug",
-                    "presentMatch": true
+                    "presentMatch": true,
+                    "invertMatch": true
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-not-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -109,15 +72,13 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "exact": "exact"
-                    }
+                    "exactMatch": "exact"
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -125,15 +86,13 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "prefix": "prefix"
-                    }
+                    "prefixMatch": "prefix"
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -141,15 +100,13 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "suffix": "suffix"
-                    }
+                    "suffixMatch": "suffix"
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-suffix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -157,18 +114,18 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "safeRegex": {
-                        "googleRe2": {},
-                        "regex": "regex"
-                      }
+                    "safeRegexMatch": {
+                      "googleRe2": {
+
+                      },
+                      "regex": "regex"
                     }
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -176,16 +133,18 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": ":method",
                     "safeRegexMatch": {
-                      "googleRe2": {},
+                      "googleRe2": {
+
+                      },
                       "regex": "GET|PUT"
                     }
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "just-methods.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -193,22 +152,22 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "exact": "exact"
-                    }
+                    "exactMatch": "exact"
                   },
                   {
                     "name": ":method",
                     "safeRegexMatch": {
-                      "googleRe2": {},
+                      "googleRe2": {
+
+                      },
                       "regex": "GET|PUT"
                     }
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-exact-with-method.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -238,7 +197,9 @@
                     "name": "secretparam2",
                     "stringMatch": {
                       "safeRegex": {
-                        "googleRe2": {},
+                        "googleRe2": {
+
+                        },
                         "regex": "regex"
                       }
                     }
@@ -330,8 +291,8 @@
               "route": {
                 "cluster": "retry-connect.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "retryPolicy": {
-                  "numRetries": 15,
-                  "retryOn": "connect-failure"
+                  "retryOn": "connect-failure",
+                  "numRetries": 15
                 }
               }
             },
@@ -342,8 +303,8 @@
               "route": {
                 "cluster": "retry-reset.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "retryPolicy": {
-                  "numRetries": 15,
-                  "retryOn": "reset"
+                  "retryOn": "reset",
+                  "numRetries": 15
                 }
               }
             },
@@ -354,13 +315,13 @@
               "route": {
                 "cluster": "retry-codes.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "retryPolicy": {
+                  "retryOn": "retriable-status-codes",
                   "numRetries": 15,
                   "retriableStatusCodes": [
                     401,
                     409,
                     451
-                  ],
-                  "retryOn": "retriable-status-codes"
+                  ]
                 }
               }
             },
@@ -371,12 +332,12 @@
               "route": {
                 "cluster": "retry-all.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "retryPolicy": {
+                  "retryOn": "5xx,gateway-error,reset,connect-failure,envoy-ratelimited,retriable-4xx,refused-stream,cancelled,deadline-exceeded,internal,resource-exhausted,unavailable,retriable-status-codes",
                   "retriableStatusCodes": [
                     401,
                     409,
                     451
-                  ],
-                  "retryOn": "5xx,gateway-error,reset,connect-failure,envoy-ratelimited,retriable-4xx,refused-stream,cancelled,deadline-exceeded,internal,resource-exhausted,unavailable,retriable-status-codes"
+                  ]
                 }
               }
             },
@@ -408,20 +369,23 @@
               "match": {
                 "path": "/header-manip"
               },
+              "route": {
+                "cluster": "header-manip.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+              },
               "requestHeadersToAdd": [
                 {
-                  "append": true,
                   "header": {
                     "key": "request",
                     "value": "bar"
-                  }
+                  },
+                  "append": true
                 },
                 {
-                  "append": false,
                   "header": {
                     "key": "bar",
                     "value": "baz"
-                  }
+                  },
+                  "append": false
                 }
               ],
               "requestHeadersToRemove": [
@@ -429,26 +393,23 @@
               ],
               "responseHeadersToAdd": [
                 {
-                  "append": true,
                   "header": {
                     "key": "response",
                     "value": "bar"
-                  }
+                  },
+                  "append": true
                 },
                 {
-                  "append": false,
                   "header": {
                     "key": "bar",
                     "value": "baz"
-                  }
+                  },
+                  "append": false
                 }
               ],
               "responseHeadersToRemove": [
                 "qux"
-              ],
-              "route": {
-                "cluster": "header-manip.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
+              ]
             },
             {
               "match": {
@@ -458,11 +419,50 @@
                 "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
               }
             }
+          ],
+          "requestHeadersToAdd": [
+            {
+              "header": {
+                "key": "foo",
+                "value": "bar"
+              },
+              "append": true
+            },
+            {
+              "header": {
+                "key": "bar",
+                "value": "baz"
+              },
+              "append": false
+            }
+          ],
+          "requestHeadersToRemove": [
+            "qux"
+          ],
+          "responseHeadersToAdd": [
+            {
+              "header": {
+                "key": "foo",
+                "value": "bar"
+              },
+              "append": true
+            },
+            {
+              "header": {
+                "key": "bar",
+                "value": "baz"
+              },
+              "append": false
+            }
+          ],
+          "responseHeadersToRemove": [
+            "qux"
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router.latest.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router.latest.golden
index dac7fbcf0f281..ffe7313996f15 100644
--- a/agent/xds/testdata/routes/ingress-with-chain-and-router.latest.golden
+++ b/agent/xds/testdata/routes/ingress-with-chain-and-router.latest.golden
@@ -1,17 +1,16 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "8080",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "db",
           "domains": [
             "db.ingress.*",
             "db.ingress.*:8080"
           ],
-          "name": "db",
           "routes": [
             {
               "match": {
@@ -32,7 +31,9 @@
             {
               "match": {
                 "safeRegex": {
-                  "googleRe2": {},
+                  "googleRe2": {
+
+                  },
                   "regex": "/regex"
                 }
               },
@@ -42,13 +43,13 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
                     "presentMatch": true
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -56,14 +57,14 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
-                    "invertMatch": true,
                     "name": "x-debug",
-                    "presentMatch": true
+                    "presentMatch": true,
+                    "invertMatch": true
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-not-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -71,15 +72,13 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "exact": "exact"
-                    }
+                    "exactMatch": "exact"
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -87,15 +86,13 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "prefix": "prefix"
-                    }
+                    "prefixMatch": "prefix"
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -103,15 +100,13 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "suffix": "suffix"
-                    }
+                    "suffixMatch": "suffix"
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-suffix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -119,18 +114,18 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "safeRegex": {
-                        "googleRe2": {},
-                        "regex": "regex"
-                      }
+                    "safeRegexMatch": {
+                      "googleRe2": {
+
+                      },
+                      "regex": "regex"
                     }
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -138,16 +133,18 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": ":method",
                     "safeRegexMatch": {
-                      "googleRe2": {},
+                      "googleRe2": {
+
+                      },
                       "regex": "GET|PUT"
                     }
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "just-methods.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -155,22 +152,22 @@
             },
             {
               "match": {
+                "prefix": "/",
                 "headers": [
                   {
                     "name": "x-debug",
-                    "stringMatch": {
-                      "exact": "exact"
-                    }
+                    "exactMatch": "exact"
                   },
                   {
                     "name": ":method",
                     "safeRegexMatch": {
-                      "googleRe2": {},
+                      "googleRe2": {
+
+                      },
                       "regex": "GET|PUT"
                     }
                   }
-                ],
-                "prefix": "/"
+                ]
               },
               "route": {
                 "cluster": "hdr-exact-with-method.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
@@ -200,7 +197,9 @@
                     "name": "secretparam2",
                     "stringMatch": {
                       "safeRegex": {
-                        "googleRe2": {},
+                        "googleRe2": {
+
+                        },
                         "regex": "regex"
                       }
                     }
@@ -292,8 +291,8 @@
               "route": {
                 "cluster": "retry-connect.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "retryPolicy": {
-                  "numRetries": 15,
-                  "retryOn": "connect-failure"
+                  "retryOn": "connect-failure",
+                  "numRetries": 15
                 }
               }
             },
@@ -304,8 +303,8 @@
               "route": {
                 "cluster": "retry-reset.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "retryPolicy": {
-                  "numRetries": 15,
-                  "retryOn": "reset"
+                  "retryOn": "reset",
+                  "numRetries": 15
                 }
               }
             },
@@ -316,13 +315,13 @@
               "route": {
                 "cluster": "retry-codes.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "retryPolicy": {
+                  "retryOn": "retriable-status-codes",
                   "numRetries": 15,
                   "retriableStatusCodes": [
                     401,
                     409,
                     451
-                  ],
-                  "retryOn": "retriable-status-codes"
+                  ]
                 }
               }
             },
@@ -333,12 +332,12 @@
               "route": {
                 "cluster": "retry-all.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
                 "retryPolicy": {
+                  "retryOn": "5xx,gateway-error,reset,connect-failure,envoy-ratelimited,retriable-4xx,refused-stream,cancelled,deadline-exceeded,internal,resource-exhausted,unavailable,retriable-status-codes",
                   "retriableStatusCodes": [
                     401,
                     409,
                     451
-                  ],
-                  "retryOn": "5xx,gateway-error,reset,connect-failure,envoy-ratelimited,retriable-4xx,refused-stream,cancelled,deadline-exceeded,internal,resource-exhausted,unavailable,retriable-status-codes"
+                  ]
                 }
               }
             },
@@ -370,20 +369,23 @@
               "match": {
                 "path": "/header-manip"
               },
+              "route": {
+                "cluster": "header-manip.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+              },
               "requestHeadersToAdd": [
                 {
-                  "append": true,
                   "header": {
                     "key": "request",
                     "value": "bar"
-                  }
+                  },
+                  "append": true
                 },
                 {
-                  "append": false,
                   "header": {
                     "key": "bar",
                     "value": "baz"
-                  }
+                  },
+                  "append": false
                 }
               ],
               "requestHeadersToRemove": [
@@ -391,26 +393,23 @@
               ],
               "responseHeadersToAdd": [
                 {
-                  "append": true,
                   "header": {
                     "key": "response",
                     "value": "bar"
-                  }
+                  },
+                  "append": true
                 },
                 {
-                  "append": false,
                   "header": {
                     "key": "bar",
                     "value": "baz"
-                  }
+                  },
+                  "append": false
                 }
               ],
               "responseHeadersToRemove": [
                 "qux"
-              ],
-              "route": {
-                "cluster": "header-manip.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
+              ]
             },
             {
               "match": {
@@ -422,9 +421,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-splitter.latest.golden b/agent/xds/testdata/routes/ingress-with-chain-and-splitter.latest.golden
index f5961883bcada..820de54764f3e 100644
--- a/agent/xds/testdata/routes/ingress-with-chain-and-splitter.latest.golden
+++ b/agent/xds/testdata/routes/ingress-with-chain-and-splitter.latest.golden
@@ -1,17 +1,16 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "8080",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "db",
           "domains": [
             "db.ingress.*",
             "db.ingress.*:8080"
           ],
-          "name": "db",
           "routes": [
             {
               "match": {
@@ -22,69 +21,69 @@
                   "clusters": [
                     {
                       "name": "big-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                      "weight": 9550,
                       "requestHeadersToAdd": [
                         {
-                          "append": false,
                           "header": {
                             "key": "x-split-leg",
                             "value": "big"
-                          }
+                          },
+                          "append": false
                         }
                       ],
                       "responseHeadersToAdd": [
                         {
-                          "append": false,
                           "header": {
                             "key": "x-split-leg",
                             "value": "big"
-                          }
+                          },
+                          "append": false
                         }
-                      ],
-                      "weight": 9550
+                      ]
                     },
                     {
                       "name": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                      "weight": 400,
                       "requestHeadersToAdd": [
                         {
-                          "append": false,
                           "header": {
                             "key": "x-split-leg",
                             "value": "goldilocks"
-                          }
+                          },
+                          "append": false
                         }
                       ],
                       "responseHeadersToAdd": [
                         {
-                          "append": false,
                           "header": {
                             "key": "x-split-leg",
                             "value": "goldilocks"
-                          }
+                          },
+                          "append": false
                         }
-                      ],
-                      "weight": 400
+                      ]
                     },
                     {
                       "name": "lil-bit-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                      "weight": 50,
                       "requestHeadersToAdd": [
                         {
-                          "append": false,
                           "header": {
                             "key": "x-split-leg",
                             "value": "small"
-                          }
+                          },
+                          "append": false
                         }
                       ],
                       "responseHeadersToAdd": [
                         {
-                          "append": false,
                           "header": {
                             "key": "x-split-leg",
                             "value": "small"
-                          }
+                          },
+                          "append": false
                         }
-                      ],
-                      "weight": 50
+                      ]
                     }
                   ],
                   "totalWeight": 10000
@@ -93,9 +92,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-with-chain-external-sni.latest.golden b/agent/xds/testdata/routes/ingress-with-chain-external-sni.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/ingress-with-chain-external-sni.latest.golden
+++ b/agent/xds/testdata/routes/ingress-with-chain-external-sni.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-with-chain.latest.golden b/agent/xds/testdata/routes/ingress-with-chain.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/ingress-with-chain.latest.golden
+++ b/agent/xds/testdata/routes/ingress-with-chain.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-with-grpc-router.latest.golden b/agent/xds/testdata/routes/ingress-with-grpc-router.latest.golden
index 25afe4ee6dac6..bc6d021fbba30 100644
--- a/agent/xds/testdata/routes/ingress-with-grpc-router.latest.golden
+++ b/agent/xds/testdata/routes/ingress-with-grpc-router.latest.golden
@@ -1,17 +1,16 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "8080",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "db",
           "domains": [
             "db.ingress.*",
             "db.ingress.*:8080"
           ],
-          "name": "db",
           "routes": [
             {
               "match": {
@@ -31,9 +30,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.latest.golden
index cf218b1c95749..cedfc99f6550c 100644
--- a/agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.latest.golden
+++ b/agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.latest.golden
@@ -1,50 +1,50 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "9191",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "9191",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "web",
+          "domains":  [
             "web.ingress.*",
             "web.ingress.*:9191"
           ],
-          "name": "web",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "22s"
+              "route":  {
+                "cluster":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout":  "22s"
               }
             }
           ]
         },
         {
-          "domains": [
+          "name":  "foo",
+          "domains":  [
             "foo.ingress.*",
             "foo.ingress.*:9191"
           ],
-          "name": "foo",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "22s"
+              "route":  {
+                "cluster":  "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout":  "22s"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-with-sds-listener-level.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-level.latest.golden
index 350f1605f6451..3f2631217daf4 100644
--- a/agent/xds/testdata/routes/ingress-with-sds-listener-level.latest.golden
+++ b/agent/xds/testdata/routes/ingress-with-sds-listener-level.latest.golden
@@ -1,50 +1,50 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "9191",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "9191",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "web",
+          "domains":  [
             "www.example.com",
             "www.example.com:9191"
           ],
-          "name": "web",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "22s"
+              "route":  {
+                "cluster":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout":  "22s"
               }
             }
           ]
         },
         {
-          "domains": [
+          "name":  "foo",
+          "domains":  [
             "foo.example.com",
             "foo.example.com:9191"
           ],
-          "name": "foo",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "22s"
+              "route":  {
+                "cluster":  "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout":  "22s"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.latest.golden
index 8cd0610d70ea3..7539ad4feb1ab 100644
--- a/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.latest.golden
+++ b/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.latest.golden
@@ -1,57 +1,57 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "9191",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "9191",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "foo",
+          "domains":  [
             "foo.example.com",
             "foo.example.com:9191"
           ],
-          "name": "foo",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "22s"
+              "route":  {
+                "cluster":  "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout":  "22s"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     },
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "9191_web",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "9191_web",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "web",
+          "domains":  [
             "www.example.com",
             "www.example.com:9191"
           ],
-          "name": "web",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "22s"
+              "route":  {
+                "cluster":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout":  "22s"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-with-sds-service-level.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level.latest.golden
index 48d9d7b774439..6009fac723147 100644
--- a/agent/xds/testdata/routes/ingress-with-sds-service-level.latest.golden
+++ b/agent/xds/testdata/routes/ingress-with-sds-service-level.latest.golden
@@ -1,57 +1,57 @@
 {
-  "nonce": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "9191_foo",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "9191_foo",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "foo",
+          "domains":  [
             "foo.example.com",
             "foo.example.com:9191"
           ],
-          "name": "foo",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "22s"
+              "route":  {
+                "cluster":  "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout":  "22s"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     },
     {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "9191_web",
-      "validateClusters": true,
-      "virtualHosts": [
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "9191_web",
+      "virtualHosts":  [
         {
-          "domains": [
+          "name":  "web",
+          "domains":  [
             "www.example.com",
             "www.example.com:9191"
           ],
-          "name": "web",
-          "routes": [
+          "routes":  [
             {
-              "match": {
-                "prefix": "/"
+              "match":  {
+                "prefix":  "/"
               },
-              "route": {
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "22s"
+              "route":  {
+                "cluster":  "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout":  "22s"
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters":  true
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/local-mesh-gateway-with-peered-upstreams.latest.golden b/agent/xds/testdata/routes/local-mesh-gateway-with-peered-upstreams.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/local-mesh-gateway-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/routes/local-mesh-gateway-with-peered-upstreams.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/mesh-gateway-peering-control-plane.latest.golden b/agent/xds/testdata/routes/mesh-gateway-peering-control-plane.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/mesh-gateway-peering-control-plane.latest.golden
+++ b/agent/xds/testdata/routes/mesh-gateway-peering-control-plane.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden b/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
index 825473467d5ec..ce1c0ad2d5cbf 100644
--- a/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
+++ b/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
@@ -1,16 +1,15 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "db",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "db",
           "domains": [
             "*"
           ],
-          "name": "db",
           "routes": [
             {
               "match": {
@@ -50,9 +49,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http.latest.golden b/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http.latest.golden
index 4737a59e31562..5b64a2c7ed5c5 100644
--- a/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http.latest.golden
+++ b/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http.latest.golden
@@ -1,16 +1,15 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "bar",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "bar",
           "domains": [
             "*"
           ],
-          "name": "bar",
           "routes": [
             {
               "match": {
@@ -22,18 +21,18 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     },
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "foo",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "foo",
           "domains": [
             "*"
           ],
-          "name": "foo",
           "routes": [
             {
               "match": {
@@ -45,18 +44,18 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     },
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "gir",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "gir",
           "domains": [
             "*"
           ],
-          "name": "gir",
           "routes": [
             {
               "match": {
@@ -68,9 +67,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services.latest.golden b/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services.latest.golden
+++ b/agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/mesh-gateway-with-imported-peered-services.latest.golden b/agent/xds/testdata/routes/mesh-gateway-with-imported-peered-services.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/mesh-gateway-with-imported-peered-services.latest.golden
+++ b/agent/xds/testdata/routes/mesh-gateway-with-imported-peered-services.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden b/agent/xds/testdata/routes/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
+++ b/agent/xds/testdata/routes/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/routes/splitter-with-resolver-redirect.latest.golden
index 8c192286007cf..dec26fd159944 100644
--- a/agent/xds/testdata/routes/splitter-with-resolver-redirect.latest.golden
+++ b/agent/xds/testdata/routes/splitter-with-resolver-redirect.latest.golden
@@ -1,16 +1,15 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "db",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "db",
           "domains": [
             "*"
           ],
-          "name": "db",
           "routes": [
             {
               "match": {
@@ -34,9 +33,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/telemetry-collector.latest.golden b/agent/xds/testdata/routes/telemetry-collector.latest.golden
index 8b919343d21a9..306f5220e7b9c 100644
--- a/agent/xds/testdata/routes/telemetry-collector.latest.golden
+++ b/agent/xds/testdata/routes/telemetry-collector.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/terminating-gateway-lb-config.latest.golden b/agent/xds/testdata/routes/terminating-gateway-lb-config.latest.golden
index 1e7cdde138faa..cc49c907cce5c 100644
--- a/agent/xds/testdata/routes/terminating-gateway-lb-config.latest.golden
+++ b/agent/xds/testdata/routes/terminating-gateway-lb-config.latest.golden
@@ -1,24 +1,23 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "domains": [
             "*"
           ],
-          "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "routes": [
             {
               "match": {
                 "prefix": "/"
               },
               "route": {
-                "autoHostRewrite": true,
                 "cluster": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "autoHostRewrite": true,
                 "hashPolicy": [
                   {
                     "cookie": {
@@ -37,32 +36,31 @@
                     },
                     "terminal": true
                   }
-                ],
-                "timeout": "0.200s"
+                ]
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     },
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "domains": [
             "*"
           ],
-          "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "routes": [
             {
               "match": {
                 "prefix": "/"
               },
               "route": {
-                "autoHostRewrite": true,
                 "cluster": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "autoHostRewrite": true,
                 "hashPolicy": [
                   {
                     "cookie": {
@@ -81,32 +79,31 @@
                     },
                     "terminal": true
                   }
-                ],
-                "timeout": "0.200s"
+                ]
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     },
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "domains": [
             "*"
           ],
-          "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "routes": [
             {
               "match": {
                 "prefix": "/"
               },
               "route": {
-                "autoHostRewrite": true,
                 "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "autoHostRewrite": true,
                 "hashPolicy": [
                   {
                     "cookie": {
@@ -125,15 +122,15 @@
                     },
                     "terminal": true
                   }
-                ],
-                "timeout": "0.200s"
+                ]
               }
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/transparent-proxy-destination-http.latest.golden b/agent/xds/testdata/routes/transparent-proxy-destination-http.latest.golden
index 0f3440e32e347..173aa56476f6d 100644
--- a/agent/xds/testdata/routes/transparent-proxy-destination-http.latest.golden
+++ b/agent/xds/testdata/routes/transparent-proxy-destination-http.latest.golden
@@ -1,16 +1,15 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "destination.443.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "domains": [
             "www.google.com"
           ],
-          "name": "destination.www-google-com.google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "routes": [
             {
               "match": {
@@ -22,18 +21,18 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     },
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "destination.9093.~http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "destination.192-168-2-3.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "domains": [
             "192.168.2.3"
           ],
-          "name": "destination.192-168-2-3.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "routes": [
             {
               "match": {
@@ -46,10 +45,10 @@
           ]
         },
         {
+          "name": "destination.192-168-2-2.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "domains": [
             "192.168.2.2"
           ],
-          "name": "destination.192-168-2-2.kafka2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "routes": [
             {
               "match": {
@@ -62,10 +61,10 @@
           ]
         },
         {
+          "name": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "domains": [
             "192.168.2.1"
           ],
-          "name": "destination.192-168-2-1.kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "routes": [
             {
               "match": {
@@ -77,9 +76,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/transparent-proxy-destination.latest.golden b/agent/xds/testdata/routes/transparent-proxy-destination.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/transparent-proxy-destination.latest.golden
+++ b/agent/xds/testdata/routes/transparent-proxy-destination.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/transparent-proxy-terminating-gateway-destinations-only.latest.golden b/agent/xds/testdata/routes/transparent-proxy-terminating-gateway-destinations-only.latest.golden
index 14ac8198ffbd7..37cf2c0b00a8d 100644
--- a/agent/xds/testdata/routes/transparent-proxy-terminating-gateway-destinations-only.latest.golden
+++ b/agent/xds/testdata/routes/transparent-proxy-terminating-gateway-destinations-only.latest.golden
@@ -1,16 +1,15 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "destination.192-168-0-2.external-IP-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "destination.192-168-0-2.external-IP-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "domains": [
             "*"
           ],
-          "name": "destination.192-168-0-2.external-IP-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "routes": [
             {
               "match": {
@@ -22,18 +21,18 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     },
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
       "name": "destination.httpbin-org.external-hostname-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
       "virtualHosts": [
         {
+          "name": "destination.httpbin-org.external-hostname-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "domains": [
             "*"
           ],
-          "name": "destination.httpbin-org.external-hostname-HTTP.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
           "routes": [
             {
               "match": {
@@ -45,9 +44,10 @@
             }
           ]
         }
-      ]
+      ],
+      "validateClusters": true
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/transparent-proxy-with-peered-upstreams.latest.golden b/agent/xds/testdata/routes/transparent-proxy-with-peered-upstreams.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/transparent-proxy-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/routes/transparent-proxy-with-peered-upstreams.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/transparent-proxy.latest.golden b/agent/xds/testdata/routes/transparent-proxy.latest.golden
index 8b919343d21a9..9c050cbe6b4d4 100644
--- a/agent/xds/testdata/routes/transparent-proxy.latest.golden
+++ b/agent/xds/testdata/routes/transparent-proxy.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
+  "versionInfo": "00000001",
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
+  "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden b/agent/xds/testdata/secrets/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/api-gateway-with-http-route-timeoutfilter-one-set.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/api-gateway-with-http-route.latest.golden b/agent/xds/testdata/secrets/api-gateway-with-http-route.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/api-gateway-with-http-route.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/api-gateway-with-multiple-inline-certificates.latest.golden b/agent/xds/testdata/secrets/api-gateway-with-multiple-inline-certificates.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/api-gateway-with-multiple-inline-certificates.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/api-gateway-with-tcp-route-and-inline-certificate.latest.golden b/agent/xds/testdata/secrets/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
+++ b/agent/xds/testdata/secrets/api-gateway-with-tcp-route-and-inline-certificate.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/connect-proxy-exported-to-peers.latest.golden b/agent/xds/testdata/secrets/connect-proxy-exported-to-peers.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/connect-proxy-exported-to-peers.latest.golden
+++ b/agent/xds/testdata/secrets/connect-proxy-exported-to-peers.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
+++ b/agent/xds/testdata/secrets/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
+++ b/agent/xds/testdata/secrets/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-peered-upstreams-escape-overrides.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/connect-proxy-with-peered-upstreams-http2.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-peered-upstreams-http2.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-peered-upstreams-http2.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/connect-proxy-with-peered-upstreams-listener-override.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-peered-upstreams-listener-override.latest.golden
deleted file mode 100644
index 95612291de707..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-peered-upstreams-listener-override.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "versionInfo": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "nonce": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/connect-proxy-with-peered-upstreams.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-peered-upstreams.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/connect-proxy-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/secrets/connect-proxy-with-peered-upstreams.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/defaults.latest.golden b/agent/xds/testdata/secrets/defaults.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/defaults.latest.golden
+++ b/agent/xds/testdata/secrets/defaults.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/local-mesh-gateway-with-peered-upstreams.latest.golden b/agent/xds/testdata/secrets/local-mesh-gateway-with-peered-upstreams.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/local-mesh-gateway-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/secrets/local-mesh-gateway-with-peered-upstreams.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/mesh-gateway-peering-control-plane.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-peering-control-plane.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/mesh-gateway-peering-control-plane.latest.golden
+++ b/agent/xds/testdata/secrets/mesh-gateway-peering-control-plane.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
+++ b/agent/xds/testdata/secrets/mesh-gateway-with-exported-peered-services-http-with-router.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/mesh-gateway-with-exported-peered-services-http.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-with-exported-peered-services-http.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/mesh-gateway-with-exported-peered-services-http.latest.golden
+++ b/agent/xds/testdata/secrets/mesh-gateway-with-exported-peered-services-http.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/mesh-gateway-with-exported-peered-services.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-with-exported-peered-services.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/mesh-gateway-with-exported-peered-services.latest.golden
+++ b/agent/xds/testdata/secrets/mesh-gateway-with-exported-peered-services.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/mesh-gateway-with-imported-peered-services.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-with-imported-peered-services.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/mesh-gateway-with-imported-peered-services.latest.golden
+++ b/agent/xds/testdata/secrets/mesh-gateway-with-imported-peered-services.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
+++ b/agent/xds/testdata/secrets/mesh-gateway-with-peer-through-mesh-gateway-enabled.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/telemetry-collector.latest.golden b/agent/xds/testdata/secrets/telemetry-collector.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/telemetry-collector.latest.golden
+++ b/agent/xds/testdata/secrets/telemetry-collector.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/transparent-proxy-destination-http.latest.golden b/agent/xds/testdata/secrets/transparent-proxy-destination-http.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/transparent-proxy-destination-http.latest.golden
+++ b/agent/xds/testdata/secrets/transparent-proxy-destination-http.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/transparent-proxy-destination.latest.golden b/agent/xds/testdata/secrets/transparent-proxy-destination.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/transparent-proxy-destination.latest.golden
+++ b/agent/xds/testdata/secrets/transparent-proxy-destination.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/transparent-proxy-terminating-gateway-destinations-only.latest.golden b/agent/xds/testdata/secrets/transparent-proxy-terminating-gateway-destinations-only.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/transparent-proxy-terminating-gateway-destinations-only.latest.golden
+++ b/agent/xds/testdata/secrets/transparent-proxy-terminating-gateway-destinations-only.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/transparent-proxy-with-peered-upstreams.latest.golden b/agent/xds/testdata/secrets/transparent-proxy-with-peered-upstreams.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/transparent-proxy-with-peered-upstreams.latest.golden
+++ b/agent/xds/testdata/secrets/transparent-proxy-with-peered-upstreams.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/secrets/transparent-proxy.latest.golden b/agent/xds/testdata/secrets/transparent-proxy.latest.golden
index 82e45650658b4..e6c25e165c65d 100644
--- a/agent/xds/testdata/secrets/transparent-proxy.latest.golden
+++ b/agent/xds/testdata/secrets/transparent-proxy.latest.golden
@@ -1,5 +1,5 @@
 {
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-  "versionInfo": "00000001"
+  "versionInfo":  "00000001",
+  "typeUrl":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testing.go b/agent/xds/testing.go
index 916bbd9b50777..76cc53f49fd27 100644
--- a/agent/xds/testing.go
+++ b/agent/xds/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
diff --git a/agent/xds/validateupstream-test/validateupstream_test.go b/agent/xds/validateupstream-test/validateupstream_test.go
index 9c57bdf81aaf2..c85fe49b0f002 100644
--- a/agent/xds/validateupstream-test/validateupstream_test.go
+++ b/agent/xds/validateupstream-test/validateupstream_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package validateupstream_test
 
 import (
@@ -12,7 +9,7 @@ import (
 	"github.com/hashicorp/consul/agent/xds/testcommon"
 	"github.com/hashicorp/consul/envoyextensions/xdscommon"
 	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/troubleshoot/proxy"
+	troubleshoot "github.com/hashicorp/consul/troubleshoot/proxy"
 	testinf "github.com/mitchellh/go-testing-interface"
 	"github.com/stretchr/testify/require"
 )
diff --git a/agent/xds/xds.go b/agent/xds/xds.go
index aab5bc7aaf14c..84c72663ca219 100644
--- a/agent/xds/xds.go
+++ b/agent/xds/xds.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // Package xds provides an implementation of a gRPC service that exports Envoy's
 // xDS API for config discovery. Specifically we support the Aggregated
 // Discovery Service (ADS) only as we control all config.
diff --git a/agent/xds/xds_protocol_helpers_test.go b/agent/xds/xds_protocol_helpers_test.go
index 655e0458f49e0..978fbb360cbb6 100644
--- a/agent/xds/xds_protocol_helpers_test.go
+++ b/agent/xds/xds_protocol_helpers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
@@ -9,7 +6,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/armon/go-metrics"
+	"github.com/hashicorp/consul/agent/connect"
+	"github.com/hashicorp/consul/agent/grpc-external/limiter"
+	"github.com/hashicorp/consul/envoyextensions/xdscommon"
+
 	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
 	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
@@ -24,6 +24,8 @@ import (
 	envoy_upstreams_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v3"
 	envoy_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
 	envoy_type_v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
+
+	"github.com/armon/go-metrics"
 	"github.com/mitchellh/copystructure"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
@@ -31,15 +33,8 @@ import (
 	"google.golang.org/protobuf/types/known/durationpb"
 	"google.golang.org/protobuf/types/known/wrapperspb"
 
-	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/agent/grpc-external/limiter"
 	"github.com/hashicorp/consul/agent/proxycfg"
-	"github.com/hashicorp/consul/agent/proxycfg-sources/catalog"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/xds/response"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
@@ -73,14 +68,14 @@ func newTestSnapshot(
 // testing. It also implements ConnectAuthz to allow control over authorization.
 type testManager struct {
 	sync.Mutex
-	stateChans map[structs.ServiceID]chan proxysnapshot.ProxySnapshot
+	stateChans map[structs.ServiceID]chan *proxycfg.ConfigSnapshot
 	drainChans map[structs.ServiceID]chan struct{}
 	cancels    chan structs.ServiceID
 }
 
 func newTestManager(t *testing.T) *testManager {
 	return &testManager{
-		stateChans: map[structs.ServiceID]chan proxysnapshot.ProxySnapshot{},
+		stateChans: map[structs.ServiceID]chan *proxycfg.ConfigSnapshot{},
 		drainChans: map[structs.ServiceID]chan struct{}{},
 		cancels:    make(chan structs.ServiceID, 10),
 	}
@@ -90,12 +85,12 @@ func newTestManager(t *testing.T) *testManager {
 func (m *testManager) RegisterProxy(t *testing.T, proxyID structs.ServiceID) {
 	m.Lock()
 	defer m.Unlock()
-	m.stateChans[proxyID] = make(chan proxysnapshot.ProxySnapshot, 1)
+	m.stateChans[proxyID] = make(chan *proxycfg.ConfigSnapshot, 1)
 	m.drainChans[proxyID] = make(chan struct{})
 }
 
 // Deliver simulates a proxy registration
-func (m *testManager) DeliverConfig(t *testing.T, proxyID structs.ServiceID, cfg proxysnapshot.ProxySnapshot) {
+func (m *testManager) DeliverConfig(t *testing.T, proxyID structs.ServiceID, cfg *proxycfg.ConfigSnapshot) {
 	t.Helper()
 	m.Lock()
 	defer m.Unlock()
@@ -122,10 +117,7 @@ func (m *testManager) DrainStreams(proxyID structs.ServiceID) {
 }
 
 // Watch implements ConfigManager
-func (m *testManager) Watch(id *pbresource.ID, _ string, _ string) (<-chan proxysnapshot.ProxySnapshot,
-	limiter.SessionTerminatedChan, proxysnapshot.CancelFunc, error) {
-	// Create service ID
-	proxyID := structs.NewServiceID(id.Name, catalog.GetEnterpriseMetaFromResourceID(id))
+func (m *testManager) Watch(proxyID structs.ServiceID, _ string, _ string) (<-chan *proxycfg.ConfigSnapshot, limiter.SessionTerminatedChan, proxycfg.CancelFunc, error) {
 	m.Lock()
 	defer m.Unlock()
 
@@ -233,7 +225,7 @@ func xdsNewEndpoint(ip string, port int) *envoy_endpoint_v3.LbEndpoint {
 	return &envoy_endpoint_v3.LbEndpoint{
 		HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
 			Endpoint: &envoy_endpoint_v3.Endpoint{
-				Address: response.MakeAddress(ip, port),
+				Address: makeAddress(ip, port),
 			},
 		},
 	}
@@ -242,7 +234,7 @@ func xdsNewEndpoint(ip string, port int) *envoy_endpoint_v3.LbEndpoint {
 func xdsNewEndpointWithHealth(ip string, port int, health envoy_core_v3.HealthStatus, weight int) *envoy_endpoint_v3.LbEndpoint {
 	ep := xdsNewEndpoint(ip, port)
 	ep.HealthStatus = health
-	ep.LoadBalancingWeight = response.MakeUint32Value(weight)
+	ep.LoadBalancingWeight = makeUint32Value(weight)
 	return ep
 }
 
@@ -302,7 +294,7 @@ func xdsNewTransportSocket(
 	if downstream {
 		var requireClientCertPB *wrapperspb.BoolValue
 		if requireClientCert {
-			requireClientCertPB = response.MakeBoolValue(true)
+			requireClientCertPB = makeBoolValue(true)
 		}
 
 		tlsContext = &envoy_tls_v3.DownstreamTlsContext{
@@ -602,7 +594,7 @@ func makeTestListener(t *testing.T, snap *proxycfg.ConfigSnapshot, fixtureName s
 		return &envoy_listener_v3.Listener{
 			// Envoy can't bind to port 1
 			Name:             "public_listener:0.0.0.0:1",
-			Address:          response.MakeAddress("0.0.0.0", 1),
+			Address:          makeAddress("0.0.0.0", 1),
 			TrafficDirection: envoy_core_v3.TrafficDirection_INBOUND,
 			FilterChains: []*envoy_listener_v3.FilterChain{
 				{
@@ -625,7 +617,7 @@ func makeTestListener(t *testing.T, snap *proxycfg.ConfigSnapshot, fixtureName s
 	case "tcp:public_listener":
 		return &envoy_listener_v3.Listener{
 			Name:             "public_listener:0.0.0.0:9999",
-			Address:          response.MakeAddress("0.0.0.0", 9999),
+			Address:          makeAddress("0.0.0.0", 9999),
 			TrafficDirection: envoy_core_v3.TrafficDirection_INBOUND,
 			FilterChains: []*envoy_listener_v3.FilterChain{
 				{
@@ -648,7 +640,7 @@ func makeTestListener(t *testing.T, snap *proxycfg.ConfigSnapshot, fixtureName s
 	case "tcp:db":
 		return &envoy_listener_v3.Listener{
 			Name:             "db:127.0.0.1:9191",
-			Address:          response.MakeAddress("127.0.0.1", 9191),
+			Address:          makeAddress("127.0.0.1", 9191),
 			TrafficDirection: envoy_core_v3.TrafficDirection_OUTBOUND,
 			FilterChains: []*envoy_listener_v3.FilterChain{
 				{
@@ -666,7 +658,7 @@ func makeTestListener(t *testing.T, snap *proxycfg.ConfigSnapshot, fixtureName s
 	case "http2:db":
 		return &envoy_listener_v3.Listener{
 			Name:             "db:127.0.0.1:9191",
-			Address:          response.MakeAddress("127.0.0.1", 9191),
+			Address:          makeAddress("127.0.0.1", 9191),
 			TrafficDirection: envoy_core_v3.TrafficDirection_OUTBOUND,
 			FilterChains: []*envoy_listener_v3.FilterChain{
 				{
@@ -694,7 +686,7 @@ func makeTestListener(t *testing.T, snap *proxycfg.ConfigSnapshot, fixtureName s
 	case "http2:db:rds":
 		return &envoy_listener_v3.Listener{
 			Name:             "db:127.0.0.1:9191",
-			Address:          response.MakeAddress("127.0.0.1", 9191),
+			Address:          makeAddress("127.0.0.1", 9191),
 			TrafficDirection: envoy_core_v3.TrafficDirection_OUTBOUND,
 			FilterChains: []*envoy_listener_v3.FilterChain{
 				{
@@ -725,7 +717,7 @@ func makeTestListener(t *testing.T, snap *proxycfg.ConfigSnapshot, fixtureName s
 	case "http:db:rds":
 		return &envoy_listener_v3.Listener{
 			Name:             "db:127.0.0.1:9191",
-			Address:          response.MakeAddress("127.0.0.1", 9191),
+			Address:          makeAddress("127.0.0.1", 9191),
 			TrafficDirection: envoy_core_v3.TrafficDirection_OUTBOUND,
 			FilterChains: []*envoy_listener_v3.FilterChain{
 				{
@@ -756,7 +748,7 @@ func makeTestListener(t *testing.T, snap *proxycfg.ConfigSnapshot, fixtureName s
 	case "tcp:geo-cache":
 		return &envoy_listener_v3.Listener{
 			Name:             "prepared_query:geo-cache:127.10.10.10:8181",
-			Address:          response.MakeAddress("127.10.10.10", 8181),
+			Address:          makeAddress("127.10.10.10", 8181),
 			TrafficDirection: envoy_core_v3.TrafficDirection_OUTBOUND,
 			FilterChains: []*envoy_listener_v3.FilterChain{
 				{
@@ -782,7 +774,7 @@ func makeTestRoute(t *testing.T, fixtureName string) *envoy_route_v3.RouteConfig
 	case "http2:db", "http:db":
 		return &envoy_route_v3.RouteConfiguration{
 			Name:             "db",
-			ValidateClusters: response.MakeBoolValue(true),
+			ValidateClusters: makeBoolValue(true),
 			VirtualHosts: []*envoy_route_v3.VirtualHost{
 				{
 					Name:    "db",
diff --git a/agent/xds/z_xds_packages.go b/agent/xds/z_xds_packages.go
index 7af650a25a31c..f2ca8ed13a62b 100644
--- a/agent/xds/z_xds_packages.go
+++ b/agent/xds/z_xds_packages.go
@@ -3,31 +3,16 @@
 package xds
 
 import (
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/config/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/http/dynamo/v3"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/http/golang/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/http/language/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/http/squash/v3"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/http/sxg/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/client_ssl_auth/v3"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/action/v3"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/router/v3"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/kafka_broker/v3"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/mysql_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/matching/input_matchers/hyperscan/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/private_key_providers/qat/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/regex_engines/hyperscan/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/vcl/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/admin/v3"
@@ -51,7 +36,6 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/common/dynamic_forward_proxy/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/common/key_value/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/common/matcher/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/config/common/mutation_rules/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/common/tap/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
@@ -151,16 +135,14 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/data/tap/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/file/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/filters/cel/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/grpc/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/open_telemetry/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/stream/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/wasm/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/bootstrap/internal_listener/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/cache/simple_http_cache/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/aggregate/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/dynamic_forward_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/redis/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/async_files/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/dynamic_forward_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/matching/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/ratelimit/v3"
@@ -169,10 +151,6 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/brotli/decompressor/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/gzip/compressor/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/gzip/decompressor/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/zstd/compressor/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/zstd/decompressor/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/config/validators/minimum_clusters/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/early_data/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/dependency/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/fault/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/matcher/action/v3"
@@ -189,14 +167,12 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/compressor/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/cors/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/csrf/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/custom_response/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/decompressor/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/dynamic_forward_proxy/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/dynamo/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ext_authz/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ext_proc/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/fault/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/file_system_buffer/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/gcp_authn/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_http1_bridge/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_json_transcoder/v3"
@@ -213,20 +189,18 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/oauth2/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/on_demand/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/original_src/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rate_limit_quota/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ratelimit/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rbac/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/set_metadata/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/stateful_session/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/tap/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/upstream_codec/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/wasm/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/http_inspector/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/original_dst/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/original_src/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/proxy_protocol/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/tls_inspector/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/client_ssl_auth/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/connection_limit/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/direct_response/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/dubbo_proxy/router/v3"
@@ -243,7 +217,6 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/filters/header_to_metadata/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/router/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/v3"
@@ -254,49 +227,24 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/formatter/metadata/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/formatter/req_without_query/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/health_checkers/redis/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/health_checkers/thrift/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/cache/file_system_http_cache/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/cache/simple_http_cache/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/custom_response/local_response_policy/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/custom_response/redirect_policy/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/early_header_mutation/header_mutation/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/header_formatters/preserve_case/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/header_validators/envoy_default/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/original_ip_detection/custom_header/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/original_ip_detection/xff/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/stateful_session/cookie/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/stateful_session/header/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/internal_redirect/allow_listed_routes/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/internal_redirect/previous_routes/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/internal_redirect/safe_cross_scheme/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/key_value/file_based/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/common/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/least_request/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/maglev/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/random/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/ring_hash/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/round_robin/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/wrr_locality/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/common_inputs/environment_variable/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/common_inputs/network/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/common_inputs/ssl/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/input_matchers/consistent_hashing/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/input_matchers/ip/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/network/dns_resolver/apple/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/network/dns_resolver/cares/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/network/dns_resolver/getaddrinfo/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/network/socket_interface/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/path/match/uri_template/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/path/rewrite/uri_template/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/connection_id_generator/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/crypto_stream/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/proof_source/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/rate_limit_descriptors/expr/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/matchers/upstream_ip_port/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/regex_engines/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/request_id/uuid/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/downstream_connections/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/fixed_heap/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/injected_resource/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/retry/host/omit_canary_hosts/v3"
@@ -306,8 +254,6 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/stat_sinks/graphite_statsd/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/stat_sinks/wasm/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/alts/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/http_11_proxy/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/internal_upstream/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/proxy_protocol/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/quic/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/raw_buffer/v3"
@@ -316,13 +262,11 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tap/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tcp_stats/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/udp_packet_writer/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/generic/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/http/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/tcp/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/tcp/generic/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/tcp/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/wasm/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/watchdog/profile_action/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/accesslog/v2"
@@ -344,7 +288,6 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/metrics/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/metrics/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/service/rate_limit_quota/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/route/v3"
@@ -366,7 +309,4 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/type/tracing/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/type/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/watchdog/v3"
-	_ "github.com/envoyproxy/go-control-plane/ratelimit/config/ratelimit/v3"
-	_ "github.com/envoyproxy/go-control-plane/ratelimit/service/ratelimit/v3"
-	_ "github.com/envoyproxy/go-control-plane/xdsmatcher/test/proto"
 )
diff --git a/agent/xds/z_xds_packages_test.go b/agent/xds/z_xds_packages_test.go
index f5f0435189338..5644508e6cb7e 100644
--- a/agent/xds/z_xds_packages_test.go
+++ b/agent/xds/z_xds_packages_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xds
 
 import (
diff --git a/agent/xdsv2/cluster_resources.go b/agent/xdsv2/cluster_resources.go
deleted file mode 100644
index 06ff21f51908b..0000000000000
--- a/agent/xdsv2/cluster_resources.go
+++ /dev/null
@@ -1,384 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xdsv2
-
-import (
-	"errors"
-	"fmt"
-
-	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	envoy_aggregate_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/aggregate/v3"
-	envoy_upstreams_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v3"
-	envoy_type_v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-)
-
-func (pr *ProxyResources) doesEnvoyClusterAlreadyExist(name string) bool {
-	// TODO(proxystate): consider using a map instead of [] for this kind of lookup
-	for _, envoyCluster := range pr.envoyResources[xdscommon.ClusterType] {
-		if envoyCluster.(*envoy_cluster_v3.Cluster).Name == name {
-			return true
-		}
-	}
-	return false
-}
-
-func (pr *ProxyResources) makeXDSClusters() ([]proto.Message, error) {
-	clusters := make([]proto.Message, 0)
-
-	for clusterName := range pr.proxyState.Clusters {
-		protoCluster, err := pr.makeClusters(clusterName)
-		// TODO: aggregate errors for clusters and still return any properly formed clusters.
-		if err != nil {
-			return nil, err
-		}
-		clusters = append(clusters, protoCluster...)
-	}
-
-	return clusters, nil
-}
-
-func (pr *ProxyResources) makeClusters(name string) ([]proto.Message, error) {
-	clusters := make([]proto.Message, 0)
-	proxyStateCluster, ok := pr.proxyState.Clusters[name]
-	if !ok {
-		return nil, fmt.Errorf("cluster %q not found", name)
-	}
-
-	if pr.doesEnvoyClusterAlreadyExist(name) {
-		// don't error
-		return []proto.Message{}, nil
-	}
-
-	switch proxyStateCluster.Group.(type) {
-	case *pbproxystate.Cluster_FailoverGroup:
-		fg := proxyStateCluster.GetFailoverGroup()
-		clusters, err := pr.makeEnvoyAggregateCluster(name, proxyStateCluster.Protocol, fg)
-		if err != nil {
-			return nil, err
-		}
-		for _, c := range clusters {
-			clusters = append(clusters, c)
-		}
-
-	case *pbproxystate.Cluster_EndpointGroup:
-		eg := proxyStateCluster.GetEndpointGroup()
-		cluster, err := pr.makeEnvoyCluster(name, proxyStateCluster.Protocol, eg)
-		if err != nil {
-			return nil, err
-		}
-		clusters = append(clusters, cluster)
-
-	default:
-		return nil, errors.New("cluster group type should be Endpoint Group or Failover Group")
-	}
-	return clusters, nil
-}
-
-func (pr *ProxyResources) makeEnvoyCluster(name string, protocol string, eg *pbproxystate.EndpointGroup) (*envoy_cluster_v3.Cluster, error) {
-	if eg != nil {
-		switch t := eg.Group.(type) {
-		case *pbproxystate.EndpointGroup_Dynamic:
-			dynamic := eg.GetDynamic()
-			return pr.makeEnvoyDynamicCluster(name, protocol, dynamic)
-		case *pbproxystate.EndpointGroup_Static:
-			static := eg.GetStatic()
-			return pr.makeEnvoyStaticCluster(name, protocol, static)
-		case *pbproxystate.EndpointGroup_Dns:
-			dns := eg.GetDns()
-			return pr.makeEnvoyDnsCluster(name, protocol, dns)
-		case *pbproxystate.EndpointGroup_Passthrough:
-			passthrough := eg.GetPassthrough()
-			return pr.makeEnvoyPassthroughCluster(name, protocol, passthrough)
-		default:
-			return nil, fmt.Errorf("unsupported endpoint group type: %s", t)
-		}
-	}
-	return nil, fmt.Errorf("no endpoint group")
-}
-
-func (pr *ProxyResources) makeEnvoyDynamicCluster(name string, protocol string, dynamic *pbproxystate.DynamicEndpointGroup) (*envoy_cluster_v3.Cluster, error) {
-	cluster := &envoy_cluster_v3.Cluster{
-		Name:                 name,
-		ClusterDiscoveryType: &envoy_cluster_v3.Cluster_Type{Type: envoy_cluster_v3.Cluster_EDS},
-		EdsClusterConfig: &envoy_cluster_v3.Cluster_EdsClusterConfig{
-			EdsConfig: &envoy_core_v3.ConfigSource{
-				ResourceApiVersion: envoy_core_v3.ApiVersion_V3,
-				ConfigSourceSpecifier: &envoy_core_v3.ConfigSource_Ads{
-					Ads: &envoy_core_v3.AggregatedConfigSource{},
-				},
-			},
-		},
-	}
-	err := addHttpProtocolOptions(protocol, cluster)
-	if err != nil {
-		return nil, err
-	}
-	if dynamic.Config != nil {
-		if dynamic.Config.UseAltStatName {
-			cluster.AltStatName = name
-		}
-		cluster.ConnectTimeout = dynamic.Config.ConnectTimeout
-		if dynamic.Config.DisablePanicThreshold {
-			cluster.CommonLbConfig = &envoy_cluster_v3.Cluster_CommonLbConfig{
-				HealthyPanicThreshold: &envoy_type_v3.Percent{
-					Value: 0, // disable panic threshold
-				},
-			}
-		}
-		addEnvoyCircuitBreakers(dynamic.Config.CircuitBreakers, cluster)
-		addEnvoyOutlierDetection(dynamic.Config.OutlierDetection, cluster)
-
-		err := addEnvoyLBToCluster(dynamic.Config, cluster)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if dynamic.OutboundTls != nil {
-		envoyTransportSocket, err := pr.makeEnvoyTransportSocket(dynamic.OutboundTls)
-		if err != nil {
-			return nil, err
-		}
-		cluster.TransportSocket = envoyTransportSocket
-	}
-
-	return cluster, nil
-
-}
-
-func (pr *ProxyResources) makeEnvoyStaticCluster(name string, protocol string, static *pbproxystate.StaticEndpointGroup) (*envoy_cluster_v3.Cluster, error) {
-	cluster := &envoy_cluster_v3.Cluster{
-		Name:                 name,
-		ClusterDiscoveryType: &envoy_cluster_v3.Cluster_Type{Type: envoy_cluster_v3.Cluster_STATIC},
-	}
-
-	// todo (ishustava/v2): we need to be able to handle the case when empty endpoints are allowed on a cluster.
-	endpointList, ok := pr.proxyState.Endpoints[name]
-	if ok {
-		cluster.LoadAssignment = makeEnvoyClusterLoadAssignment(name, endpointList.Endpoints)
-	}
-
-	var err error
-	if name == xdscommon.LocalAppClusterName {
-		err = addLocalAppHttpProtocolOptions(protocol, cluster)
-	} else {
-		err = addHttpProtocolOptions(protocol, cluster)
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	if static.Config != nil {
-		cluster.ConnectTimeout = static.Config.ConnectTimeout
-		addEnvoyCircuitBreakers(static.GetConfig().CircuitBreakers, cluster)
-	}
-	return cluster, nil
-}
-
-func (pr *ProxyResources) makeEnvoyDnsCluster(name string, protocol string, dns *pbproxystate.DNSEndpointGroup) (*envoy_cluster_v3.Cluster, error) {
-	return nil, nil
-}
-
-func (pr *ProxyResources) makeEnvoyPassthroughCluster(name string, protocol string, passthrough *pbproxystate.PassthroughEndpointGroup) (*envoy_cluster_v3.Cluster, error) {
-	cluster := &envoy_cluster_v3.Cluster{
-		Name:                 name,
-		ConnectTimeout:       passthrough.Config.ConnectTimeout,
-		LbPolicy:             envoy_cluster_v3.Cluster_CLUSTER_PROVIDED,
-		ClusterDiscoveryType: &envoy_cluster_v3.Cluster_Type{Type: envoy_cluster_v3.Cluster_ORIGINAL_DST},
-	}
-	if passthrough.OutboundTls != nil {
-		envoyTransportSocket, err := pr.makeEnvoyTransportSocket(passthrough.OutboundTls)
-		if err != nil {
-			return nil, err
-		}
-		cluster.TransportSocket = envoyTransportSocket
-	}
-	err := addHttpProtocolOptions(protocol, cluster)
-	if err != nil {
-		return nil, err
-	}
-	return cluster, nil
-}
-
-func (pr *ProxyResources) makeEnvoyAggregateCluster(name string, protocol string, fg *pbproxystate.FailoverGroup) ([]*envoy_cluster_v3.Cluster, error) {
-	var clusters []*envoy_cluster_v3.Cluster
-	if fg != nil {
-		var egNames []string
-		for _, eg := range fg.EndpointGroups {
-			cluster, err := pr.makeEnvoyCluster(eg.Name, protocol, eg)
-			if err != nil {
-				return nil, err
-			}
-			egNames = append(egNames, cluster.Name)
-			clusters = append(clusters, cluster)
-		}
-		aggregateClusterConfig, err := anypb.New(&envoy_aggregate_cluster_v3.ClusterConfig{
-			Clusters: egNames,
-		})
-
-		if err != nil {
-			return nil, err
-		}
-
-		c := &envoy_cluster_v3.Cluster{
-			Name:           name,
-			ConnectTimeout: fg.Config.ConnectTimeout,
-			LbPolicy:       envoy_cluster_v3.Cluster_CLUSTER_PROVIDED,
-			ClusterDiscoveryType: &envoy_cluster_v3.Cluster_ClusterType{
-				ClusterType: &envoy_cluster_v3.Cluster_CustomClusterType{
-					Name:        "envoy.clusters.aggregate",
-					TypedConfig: aggregateClusterConfig,
-				},
-			},
-		}
-		if fg.Config.UseAltStatName {
-			c.AltStatName = name
-		}
-		err = addHttpProtocolOptions(protocol, c)
-		if err != nil {
-			return nil, err
-		}
-		clusters = append(clusters, c)
-	}
-	return clusters, nil
-}
-
-func addLocalAppHttpProtocolOptions(protocol string, c *envoy_cluster_v3.Cluster) error {
-	if !(protocol == "http2" || protocol == "grpc") {
-		// do not error.  returning nil means it won't get set.
-		return nil
-	}
-	cfg := &envoy_upstreams_v3.HttpProtocolOptions{
-		UpstreamProtocolOptions: &envoy_upstreams_v3.HttpProtocolOptions_UseDownstreamProtocolConfig{
-			UseDownstreamProtocolConfig: &envoy_upstreams_v3.HttpProtocolOptions_UseDownstreamHttpConfig{
-				HttpProtocolOptions:  &envoy_core_v3.Http1ProtocolOptions{},
-				Http2ProtocolOptions: &envoy_core_v3.Http2ProtocolOptions{},
-			},
-		},
-	}
-	any, err := anypb.New(cfg)
-	if err != nil {
-		return err
-	}
-	c.TypedExtensionProtocolOptions = map[string]*anypb.Any{
-		"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": any,
-	}
-
-	return nil
-}
-
-func addHttpProtocolOptions(protocol string, c *envoy_cluster_v3.Cluster) error {
-	if !(protocol == "http2" || protocol == "grpc") {
-		// do not error.  returning nil means it won't get set.
-		return nil
-	}
-	cfg := &envoy_upstreams_v3.HttpProtocolOptions{
-		UpstreamProtocolOptions: &envoy_upstreams_v3.HttpProtocolOptions_ExplicitHttpConfig_{
-			ExplicitHttpConfig: &envoy_upstreams_v3.HttpProtocolOptions_ExplicitHttpConfig{
-				ProtocolConfig: &envoy_upstreams_v3.HttpProtocolOptions_ExplicitHttpConfig_Http2ProtocolOptions{
-					Http2ProtocolOptions: &envoy_core_v3.Http2ProtocolOptions{},
-				},
-			},
-		},
-	}
-	any, err := anypb.New(cfg)
-	if err != nil {
-		return err
-	}
-	c.TypedExtensionProtocolOptions = map[string]*anypb.Any{
-		"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": any,
-	}
-	return nil
-}
-
-// addEnvoyOutlierDetection will add outlier detection config to the cluster, and if nil, add empty OutlierDetection to
-// enable it with default values
-func addEnvoyOutlierDetection(outlierDetection *pbproxystate.OutlierDetection, c *envoy_cluster_v3.Cluster) {
-	if outlierDetection == nil {
-		return
-	}
-	od := &envoy_cluster_v3.OutlierDetection{
-		BaseEjectionTime:         outlierDetection.GetBaseEjectionTime(),
-		Consecutive_5Xx:          outlierDetection.GetConsecutive_5Xx(),
-		EnforcingConsecutive_5Xx: outlierDetection.GetEnforcingConsecutive_5Xx(),
-		Interval:                 outlierDetection.GetInterval(),
-		MaxEjectionPercent:       outlierDetection.GetMaxEjectionPercent(),
-	}
-	c.OutlierDetection = od
-
-}
-
-func addEnvoyCircuitBreakers(circuitBreakers *pbproxystate.CircuitBreakers, c *envoy_cluster_v3.Cluster) {
-	if circuitBreakers != nil {
-		if circuitBreakers.UpstreamLimits == nil {
-			c.CircuitBreakers = &envoy_cluster_v3.CircuitBreakers{}
-			return
-		}
-		threshold := &envoy_cluster_v3.CircuitBreakers_Thresholds{}
-		threshold.MaxConnections = circuitBreakers.UpstreamLimits.MaxConnections
-		threshold.MaxPendingRequests = circuitBreakers.UpstreamLimits.MaxPendingRequests
-		threshold.MaxRequests = circuitBreakers.UpstreamLimits.MaxConcurrentRequests
-
-		c.CircuitBreakers = &envoy_cluster_v3.CircuitBreakers{
-			Thresholds: []*envoy_cluster_v3.CircuitBreakers_Thresholds{threshold},
-		}
-	}
-}
-
-func addEnvoyLBToCluster(dynamicConfig *pbproxystate.DynamicEndpointGroupConfig, c *envoy_cluster_v3.Cluster) error {
-	if dynamicConfig == nil || dynamicConfig.LbPolicy == nil {
-		return nil
-	}
-
-	switch d := dynamicConfig.LbPolicy.(type) {
-	case *pbproxystate.DynamicEndpointGroupConfig_LeastRequest:
-		c.LbPolicy = envoy_cluster_v3.Cluster_LEAST_REQUEST
-
-		lb := dynamicConfig.LbPolicy.(*pbproxystate.DynamicEndpointGroupConfig_LeastRequest)
-		if lb.LeastRequest != nil {
-			c.LbConfig = &envoy_cluster_v3.Cluster_LeastRequestLbConfig_{
-				LeastRequestLbConfig: &envoy_cluster_v3.Cluster_LeastRequestLbConfig{
-					ChoiceCount: lb.LeastRequest.ChoiceCount,
-				},
-			}
-		}
-	case *pbproxystate.DynamicEndpointGroupConfig_RoundRobin:
-		c.LbPolicy = envoy_cluster_v3.Cluster_ROUND_ROBIN
-
-	case *pbproxystate.DynamicEndpointGroupConfig_Random:
-		c.LbPolicy = envoy_cluster_v3.Cluster_RANDOM
-
-	case *pbproxystate.DynamicEndpointGroupConfig_RingHash:
-		c.LbPolicy = envoy_cluster_v3.Cluster_RING_HASH
-
-		lb := dynamicConfig.LbPolicy.(*pbproxystate.DynamicEndpointGroupConfig_RingHash)
-		if lb.RingHash != nil {
-			c.LbConfig = &envoy_cluster_v3.Cluster_RingHashLbConfig_{
-				RingHashLbConfig: &envoy_cluster_v3.Cluster_RingHashLbConfig{
-					MinimumRingSize: lb.RingHash.MinimumRingSize,
-					MaximumRingSize: lb.RingHash.MaximumRingSize,
-				},
-			}
-		}
-	case *pbproxystate.DynamicEndpointGroupConfig_Maglev:
-		c.LbPolicy = envoy_cluster_v3.Cluster_MAGLEV
-
-	default:
-		return fmt.Errorf("unsupported load balancer policy %q for cluster %q", d, c.Name)
-	}
-	return nil
-}
-
-// TODO(proxystate): In a future PR this will create clusters and add it to ProxyResources.proxyState
-// Currently, we do not traverse the listener -> endpoint paths and instead just generate each resource by iterating
-// through its top level map. In the future we want to traverse these paths to ensure each listener has a cluster, etc.
-func (pr *ProxyResources) makeEnvoyClusterFromL4Destination(l4 *pbproxystate.L4Destination) error {
-	return nil
-}
diff --git a/agent/xdsv2/endpoint_resources.go b/agent/xdsv2/endpoint_resources.go
deleted file mode 100644
index fa3d39d8779fe..0000000000000
--- a/agent/xdsv2/endpoint_resources.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xdsv2
-
-import (
-	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
-	"github.com/hashicorp/consul/agent/xds/response"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"google.golang.org/protobuf/proto"
-)
-
-func makeEnvoyLbEndpoint(endpoint *pbproxystate.Endpoint) *envoy_endpoint_v3.LbEndpoint {
-	hs := int32(endpoint.GetHealthStatus().Number())
-	return &envoy_endpoint_v3.LbEndpoint{
-		HostIdentifier: &envoy_endpoint_v3.LbEndpoint_Endpoint{
-			Endpoint: makeEnvoyEndpoint(endpoint),
-		},
-		HealthStatus:        envoy_core_v3.HealthStatus(hs),
-		LoadBalancingWeight: endpoint.GetLoadBalancingWeight(),
-	}
-}
-
-func makeEnvoyEndpoint(endpoint *pbproxystate.Endpoint) *envoy_endpoint_v3.Endpoint {
-	var address *envoy_core_v3.Address
-	if endpoint.GetUnixSocket() != nil {
-		address = response.MakePipeAddress(endpoint.GetUnixSocket().GetPath(), 0)
-	} else {
-		address = response.MakeAddress(endpoint.GetHostPort().GetHost(), int(endpoint.GetHostPort().Port))
-	}
-
-	return &envoy_endpoint_v3.Endpoint{
-		Address: address,
-	}
-}
-
-func makeEnvoyClusterLoadAssignment(clusterName string, endpoints []*pbproxystate.Endpoint) *envoy_endpoint_v3.ClusterLoadAssignment {
-	localityLbEndpoints := &envoy_endpoint_v3.LocalityLbEndpoints{}
-	for _, endpoint := range endpoints {
-		localityLbEndpoints.LbEndpoints = append(localityLbEndpoints.LbEndpoints, makeEnvoyLbEndpoint(endpoint))
-	}
-	return &envoy_endpoint_v3.ClusterLoadAssignment{
-		ClusterName: clusterName,
-		Endpoints:   []*envoy_endpoint_v3.LocalityLbEndpoints{localityLbEndpoints},
-	}
-}
-
-func (pr *ProxyResources) makeXDSEndpoints() ([]proto.Message, error) {
-	endpoints := make([]proto.Message, 0)
-
-	for clusterName, eps := range pr.proxyState.GetEndpoints() {
-		if clusterName != xdscommon.LocalAppClusterName {
-			protoEndpoint := makeEnvoyClusterLoadAssignment(clusterName, eps.Endpoints)
-			endpoints = append(endpoints, protoEndpoint)
-		}
-	}
-
-	return endpoints, nil
-}
diff --git a/agent/xdsv2/listener_resources.go b/agent/xdsv2/listener_resources.go
deleted file mode 100644
index a112d75bf5cd9..0000000000000
--- a/agent/xdsv2/listener_resources.go
+++ /dev/null
@@ -1,1004 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xdsv2
-
-import (
-	"fmt"
-	"sort"
-	"strconv"
-
-	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	envoy_grpc_http1_bridge_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_http1_bridge/v3"
-	envoy_grpc_stats_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_stats/v3"
-	envoy_http_router_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3"
-	envoy_extensions_filters_listener_http_inspector_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/http_inspector/v3"
-	envoy_original_dst_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/original_dst/v3"
-	envoy_tls_inspector_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/tls_inspector/v3"
-	envoy_connection_limit_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/connection_limit/v3"
-	envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
-	envoy_sni_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/sni_cluster/v3"
-	envoy_tcp_proxy_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3"
-	envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
-	envoy_matcher_v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3"
-	envoy_type_v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/anypb"
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-)
-
-const (
-	envoyNetworkFilterName                     = "envoy.filters.network.tcp_proxy"
-	envoyOriginalDestinationListenerFilterName = "envoy.filters.listener.original_dst"
-	envoyTLSInspectorListenerFilterName        = "envoy.filters.listener.tls_inspector"
-	envoyHttpInspectorListenerFilterName       = "envoy.filters.listener.http_inspector"
-	envoyHttpConnectionManagerFilterName       = "envoy.filters.network.http_connection_manager"
-)
-
-func (pr *ProxyResources) makeXDSListeners() ([]proto.Message, error) {
-	listeners := make([]proto.Message, 0)
-
-	for _, l := range pr.proxyState.Listeners {
-		protoListener, err := pr.makeListener(l)
-		// TODO: aggregate errors for listeners and still return any properly formed listeners.
-		if err != nil {
-			return nil, err
-		}
-		listeners = append(listeners, protoListener)
-	}
-	return listeners, nil
-}
-
-func (pr *ProxyResources) makeListener(listener *pbproxystate.Listener) (*envoy_listener_v3.Listener, error) {
-	envoyListener := &envoy_listener_v3.Listener{}
-
-	// Listener Address
-	var address *envoy_core_v3.Address
-	switch listener.BindAddress.(type) {
-	case *pbproxystate.Listener_HostPort:
-		address = makeIpPortEnvoyAddress(listener.BindAddress.(*pbproxystate.Listener_HostPort))
-	case *pbproxystate.Listener_UnixSocket:
-		address = makeUnixSocketEnvoyAddress(listener.BindAddress.(*pbproxystate.Listener_UnixSocket))
-	default:
-		// This should be impossible to reach because we're using protobufs.
-		return nil, fmt.Errorf("invalid listener bind address type: %t", listener.BindAddress)
-	}
-	envoyListener.Address = address
-
-	// Listener Direction
-	var direction envoy_core_v3.TrafficDirection
-	switch listener.Direction {
-	case pbproxystate.Direction_DIRECTION_OUTBOUND:
-		direction = envoy_core_v3.TrafficDirection_OUTBOUND
-	case pbproxystate.Direction_DIRECTION_INBOUND:
-		direction = envoy_core_v3.TrafficDirection_INBOUND
-	case pbproxystate.Direction_DIRECTION_UNSPECIFIED:
-		direction = envoy_core_v3.TrafficDirection_UNSPECIFIED
-	default:
-		return nil, fmt.Errorf("no direction for listener %+v", listener.Name)
-	}
-	envoyListener.TrafficDirection = direction
-
-	// Before creating the filter chains, sort routers by match to avoid draining if the list is provided out of order.
-	sortRouters(listener.Routers)
-
-	// Listener filter chains
-	for _, r := range listener.Routers {
-		filterChain, err := pr.makeEnvoyListenerFilterChain(r)
-		if err != nil {
-			return nil, fmt.Errorf("could not make filter chain: %w", err)
-		}
-		envoyListener.FilterChains = append(envoyListener.FilterChains, filterChain)
-	}
-
-	if listener.DefaultRouter != nil {
-		defaultFilterChain, err := pr.makeEnvoyListenerFilterChain(listener.DefaultRouter)
-		if err != nil {
-			return nil, fmt.Errorf("could not make filter chain: %w", err)
-		}
-		envoyListener.DefaultFilterChain = defaultFilterChain
-	}
-
-	// Envoy builtin listener filters
-	for _, c := range listener.Capabilities {
-		listenerFilter, err := makeEnvoyListenerFilter(c)
-		if err != nil {
-			return nil, fmt.Errorf("could not make listener filter: %w", err)
-		}
-		envoyListener.ListenerFilters = append(envoyListener.ListenerFilters, listenerFilter)
-	}
-
-	err := addEnvoyListenerConnectionBalanceConfig(listener.BalanceConnections, envoyListener)
-	if err != nil {
-		return nil, err
-	}
-
-	envoyListener.Name = listener.Name
-	envoyListener.Address = address
-	envoyListener.TrafficDirection = direction
-
-	return envoyListener, nil
-}
-
-func makeEnvoyConnectionLimitFilter(maxInboundConns uint64) (*envoy_listener_v3.Filter, error) {
-	cfg := &envoy_connection_limit_v3.ConnectionLimit{
-		StatPrefix:     "inbound_connection_limit",
-		MaxConnections: wrapperspb.UInt64(maxInboundConns),
-	}
-
-	return makeEnvoyFilter("envoy.filters.network.connection_limit", cfg)
-}
-
-func addEnvoyListenerConnectionBalanceConfig(balanceType pbproxystate.BalanceConnections, listener *envoy_listener_v3.Listener) error {
-	switch balanceType {
-	case pbproxystate.BalanceConnections_BALANCE_CONNECTIONS_DEFAULT:
-		// Default with no balancing.
-		return nil
-	case pbproxystate.BalanceConnections_BALANCE_CONNECTIONS_EXACT:
-		listener.ConnectionBalanceConfig = &envoy_listener_v3.Listener_ConnectionBalanceConfig{
-			BalanceType: &envoy_listener_v3.Listener_ConnectionBalanceConfig_ExactBalance_{},
-		}
-		return nil
-	default:
-		// This should be impossible using protobufs.
-		return fmt.Errorf("unsupported connection balance option: %+v", balanceType)
-	}
-}
-
-func makeIpPortEnvoyAddress(address *pbproxystate.Listener_HostPort) *envoy_core_v3.Address {
-	return &envoy_core_v3.Address{
-		Address: &envoy_core_v3.Address_SocketAddress{
-			SocketAddress: &envoy_core_v3.SocketAddress{
-				Address: address.HostPort.Host,
-				PortSpecifier: &envoy_core_v3.SocketAddress_PortValue{
-					PortValue: address.HostPort.Port,
-				},
-			},
-		},
-	}
-}
-
-func makeUnixSocketEnvoyAddress(address *pbproxystate.Listener_UnixSocket) *envoy_core_v3.Address {
-	modeInt, err := strconv.ParseUint(address.UnixSocket.Mode, 0, 32)
-	if err != nil {
-		modeInt = 0
-	}
-	return &envoy_core_v3.Address{
-		Address: &envoy_core_v3.Address_Pipe{
-			Pipe: &envoy_core_v3.Pipe{
-				Path: address.UnixSocket.Path,
-				Mode: uint32(modeInt),
-			},
-		},
-	}
-}
-
-func (pr *ProxyResources) makeEnvoyListenerFilterChain(router *pbproxystate.Router) (*envoy_listener_v3.FilterChain, error) {
-	envoyFilterChain := &envoy_listener_v3.FilterChain{}
-
-	if router == nil {
-		return nil, fmt.Errorf("no router to create filter chain")
-	}
-
-	// Router Match
-	match := makeEnvoyFilterChainMatch(router.Match)
-	if match != nil {
-		envoyFilterChain.FilterChainMatch = match
-	}
-
-	// Router Destination
-	var envoyFilters []*envoy_listener_v3.Filter
-	switch router.Destination.(type) {
-	case *pbproxystate.Router_L4:
-		l4Filters, err := pr.makeEnvoyResourcesForL4Destination(router.Destination.(*pbproxystate.Router_L4))
-		if err != nil {
-			return nil, err
-		}
-		envoyFilters = append(envoyFilters, l4Filters...)
-	case *pbproxystate.Router_L7:
-		l7 := router.Destination.(*pbproxystate.Router_L7)
-		l7Filters, err := pr.makeEnvoyResourcesForL7Destination(l7)
-		if err != nil {
-			return nil, err
-		}
-
-		// Inject ALPN protocols to router's TLS if destination is L7
-		if router.InboundTls != nil {
-			router.InboundTls.AlpnProtocols = getAlpnProtocols(l7.L7.Protocol)
-		}
-		envoyFilters = append(envoyFilters, l7Filters...)
-	case *pbproxystate.Router_Sni:
-		sniFilters, err := pr.makeEnvoyResourcesForSNIDestination(router.Destination.(*pbproxystate.Router_Sni))
-		if err != nil {
-			return nil, err
-		}
-		envoyFilters = append(envoyFilters, sniFilters...)
-	default:
-		// This should be impossible using protobufs.
-		return nil, fmt.Errorf("unsupported destination type: %t", router.Destination)
-
-	}
-
-	// Router TLS
-	ts, err := pr.makeEnvoyTransportSocket(router.InboundTls)
-	if err != nil {
-		return nil, err
-	}
-	envoyFilterChain.TransportSocket = ts
-
-	envoyFilterChain.Filters = envoyFilters
-	return envoyFilterChain, err
-}
-
-func makeEnvoyFilterChainMatch(routerMatch *pbproxystate.Match) *envoy_listener_v3.FilterChainMatch {
-	var envoyFilterChainMatch *envoy_listener_v3.FilterChainMatch
-	if routerMatch != nil {
-		envoyFilterChainMatch = &envoy_listener_v3.FilterChainMatch{}
-
-		envoyFilterChainMatch.DestinationPort = routerMatch.DestinationPort
-
-		if len(routerMatch.ServerNames) > 0 {
-			var serverNames []string
-			for _, n := range routerMatch.ServerNames {
-				serverNames = append(serverNames, n)
-			}
-			envoyFilterChainMatch.ServerNames = serverNames
-		}
-		if len(routerMatch.PrefixRanges) > 0 {
-			sortPrefixRanges(routerMatch.PrefixRanges)
-			var ranges []*envoy_core_v3.CidrRange
-			for _, r := range routerMatch.PrefixRanges {
-				cidrRange := &envoy_core_v3.CidrRange{
-					PrefixLen:     r.PrefixLen,
-					AddressPrefix: r.AddressPrefix,
-				}
-				ranges = append(ranges, cidrRange)
-			}
-			envoyFilterChainMatch.PrefixRanges = ranges
-		}
-		if len(routerMatch.SourcePrefixRanges) > 0 {
-			var ranges []*envoy_core_v3.CidrRange
-			for _, r := range routerMatch.SourcePrefixRanges {
-				cidrRange := &envoy_core_v3.CidrRange{
-					PrefixLen:     r.PrefixLen,
-					AddressPrefix: r.AddressPrefix,
-				}
-				ranges = append(ranges, cidrRange)
-			}
-			envoyFilterChainMatch.SourcePrefixRanges = ranges
-		}
-		if len(routerMatch.AlpnProtocols) > 0 {
-			sort.Strings(routerMatch.AlpnProtocols)
-			var alpnProtocols []string
-			for _, protocol := range routerMatch.AlpnProtocols {
-				alpnProtocols = append(alpnProtocols, protocol)
-			}
-			envoyFilterChainMatch.ApplicationProtocols = alpnProtocols
-		}
-	}
-	return envoyFilterChainMatch
-}
-
-func (pr *ProxyResources) makeEnvoyResourcesForSNIDestination(sni *pbproxystate.Router_Sni) ([]*envoy_listener_v3.Filter, error) {
-	var envoyFilters []*envoy_listener_v3.Filter
-	sniFilter, err := makeEnvoyFilter("envoy.filters.network.sni_cluster", &envoy_sni_cluster_v3.SniCluster{})
-	if err != nil {
-		return nil, err
-	}
-	tcp := &envoy_tcp_proxy_v3.TcpProxy{
-		StatPrefix:       sni.Sni.StatPrefix,
-		ClusterSpecifier: &envoy_tcp_proxy_v3.TcpProxy_Cluster{Cluster: ""},
-	}
-	tcpFilter, err := makeEnvoyFilter(envoyNetworkFilterName, tcp)
-	if err != nil {
-		return nil, err
-	}
-	envoyFilters = append(envoyFilters, sniFilter, tcpFilter)
-	return envoyFilters, err
-}
-
-func (pr *ProxyResources) makeEnvoyResourcesForL4Destination(l4 *pbproxystate.Router_L4) ([]*envoy_listener_v3.Filter, error) {
-	err := pr.makeEnvoyClusterFromL4Destination(l4.L4)
-	if err != nil {
-		return nil, err
-	}
-	envoyFilters, err := makeL4Filters(l4.L4)
-	return envoyFilters, err
-}
-
-func (pr *ProxyResources) makeEnvoyResourcesForL7Destination(l7 *pbproxystate.Router_L7) ([]*envoy_listener_v3.Filter, error) {
-	envoyFilters, err := pr.makeL7Filters(l7.L7)
-	if err != nil {
-		return nil, err
-	}
-	return envoyFilters, err
-}
-
-func getAlpnProtocols(protocol pbproxystate.L7Protocol) []string {
-	var alpnProtocols []string
-
-	switch protocol {
-	case pbproxystate.L7Protocol_L7_PROTOCOL_GRPC, pbproxystate.L7Protocol_L7_PROTOCOL_HTTP2:
-		alpnProtocols = append(alpnProtocols, "h2", "http/1.1")
-	case pbproxystate.L7Protocol_L7_PROTOCOL_HTTP:
-		alpnProtocols = append(alpnProtocols, "http/1.1")
-	}
-
-	return alpnProtocols
-}
-
-func makeL4Filters(l4 *pbproxystate.L4Destination) ([]*envoy_listener_v3.Filter, error) {
-	var envoyFilters []*envoy_listener_v3.Filter
-	if l4 != nil {
-		rbacFilters, err := MakeL4RBAC(l4.TrafficPermissions)
-		if err != nil {
-			return nil, err
-		}
-
-		if len(rbacFilters) > 0 {
-			envoyFilters = append(envoyFilters, rbacFilters...)
-		}
-
-		if l4.MaxInboundConnections > 0 {
-			connectionLimitFilter, err := makeEnvoyConnectionLimitFilter(l4.MaxInboundConnections)
-			if err != nil {
-				return nil, err
-			}
-			envoyFilters = append(envoyFilters, connectionLimitFilter)
-		}
-
-		// Add tcp proxy filter
-		tcp := &envoy_tcp_proxy_v3.TcpProxy{
-			StatPrefix: l4.StatPrefix,
-		}
-
-		switch dest := l4.Destination.(type) {
-		case *pbproxystate.L4Destination_Cluster:
-			tcp.ClusterSpecifier = &envoy_tcp_proxy_v3.TcpProxy_Cluster{Cluster: dest.Cluster.Name}
-		case *pbproxystate.L4Destination_WeightedClusters:
-			clusters := make([]*envoy_tcp_proxy_v3.TcpProxy_WeightedCluster_ClusterWeight, 0, len(dest.WeightedClusters.Clusters))
-			for _, cluster := range dest.WeightedClusters.Clusters {
-				clusters = append(clusters, &envoy_tcp_proxy_v3.TcpProxy_WeightedCluster_ClusterWeight{
-					Name:   cluster.Name,
-					Weight: cluster.Weight.GetValue(),
-				})
-			}
-
-			tcp.ClusterSpecifier = &envoy_tcp_proxy_v3.TcpProxy_WeightedClusters{
-				WeightedClusters: &envoy_tcp_proxy_v3.TcpProxy_WeightedCluster{
-					Clusters: clusters,
-				},
-			}
-		default:
-			return nil, fmt.Errorf("unexpected l4 destination type: %T", l4.Destination)
-		}
-
-		tcpFilter, err := makeEnvoyFilter(envoyNetworkFilterName, tcp)
-		if err != nil {
-			return nil, err
-		}
-		envoyFilters = append(envoyFilters, tcpFilter)
-	}
-	return envoyFilters, nil
-
-}
-
-// TODO: Forward client cert details will be added as part of L7 listeners task.
-func (pr *ProxyResources) makeL7Filters(l7 *pbproxystate.L7Destination) ([]*envoy_listener_v3.Filter, error) {
-	var envoyFilters []*envoy_listener_v3.Filter
-	var httpConnMgr *envoy_http_v3.HttpConnectionManager
-
-	if l7 != nil {
-		// TODO: Intentions will be added in the future.
-		if l7.MaxInboundConnections > 0 {
-			connLimitFilter, err := makeEnvoyConnectionLimitFilter(l7.MaxInboundConnections)
-			if err != nil {
-				return nil, err
-			}
-			envoyFilters = append(envoyFilters, connLimitFilter)
-		}
-		envoyHttpRouter, err := makeEnvoyHTTPFilter("envoy.filters.http.router", &envoy_http_router_v3.Router{})
-		if err != nil {
-			return nil, err
-		}
-
-		httpConnMgr = &envoy_http_v3.HttpConnectionManager{
-			StatPrefix: l7.StatPrefix,
-			CodecType:  envoy_http_v3.HttpConnectionManager_AUTO,
-			HttpFilters: []*envoy_http_v3.HttpFilter{
-				envoyHttpRouter,
-			},
-			Tracing: &envoy_http_v3.HttpConnectionManager_Tracing{
-				// Don't trace any requests by default unless the client application
-				// explicitly propagates trace headers that indicate this should be
-				// sampled.
-				RandomSampling: &envoy_type_v3.Percent{Value: 0.0},
-			},
-			// Explicitly enable WebSocket upgrades for all HTTP listeners
-			UpgradeConfigs: []*envoy_http_v3.HttpConnectionManager_UpgradeConfig{
-				{UpgradeType: "websocket"},
-			},
-		}
-
-		routeConfig, err := pr.makeEnvoyRoute(l7.Name)
-		if err != nil {
-			return nil, err
-		}
-
-		if l7.StaticRoute {
-			httpConnMgr.RouteSpecifier = &envoy_http_v3.HttpConnectionManager_RouteConfig{
-				RouteConfig: routeConfig,
-			}
-		} else {
-			// Add Envoy route under the route resource since it's not inlined.
-			pr.envoyResources[xdscommon.RouteType] = append(pr.envoyResources[xdscommon.RouteType], routeConfig)
-
-			httpConnMgr.RouteSpecifier = &envoy_http_v3.HttpConnectionManager_Rds{
-				Rds: &envoy_http_v3.Rds{
-					RouteConfigName: l7.Name,
-					ConfigSource: &envoy_core_v3.ConfigSource{
-						ResourceApiVersion: envoy_core_v3.ApiVersion_V3,
-						ConfigSourceSpecifier: &envoy_core_v3.ConfigSource_Ads{
-							Ads: &envoy_core_v3.AggregatedConfigSource{},
-						},
-					},
-				},
-			}
-		}
-
-		// Add http2 protocol options
-		if l7.Protocol == pbproxystate.L7Protocol_L7_PROTOCOL_HTTP2 || l7.Protocol == pbproxystate.L7Protocol_L7_PROTOCOL_GRPC {
-			httpConnMgr.Http2ProtocolOptions = &envoy_core_v3.Http2ProtocolOptions{}
-		}
-
-		// Add grpc envoy http filters.
-		if l7.Protocol == pbproxystate.L7Protocol_L7_PROTOCOL_GRPC {
-			grpcHttp1Bridge, err := makeEnvoyHTTPFilter(
-				"envoy.filters.http.grpc_http1_bridge",
-				&envoy_grpc_http1_bridge_v3.Config{},
-			)
-			if err != nil {
-				return nil, err
-			}
-
-			// In envoy 1.14.x the default value "stats_for_all_methods=true" was
-			// deprecated, and was changed to "false" in 1.18.x. Avoid using the
-			// default. TODO: we may want to expose this to users somehow easily.
-			grpcStatsFilter, err := makeEnvoyHTTPFilter(
-				"envoy.filters.http.grpc_stats",
-				&envoy_grpc_stats_v3.FilterConfig{
-					PerMethodStatSpecifier: &envoy_grpc_stats_v3.FilterConfig_StatsForAllMethods{
-						StatsForAllMethods: &wrapperspb.BoolValue{Value: true},
-					},
-				},
-			)
-			if err != nil {
-				return nil, err
-			}
-
-			// Add grpc bridge before envoyRouter and authz, and the stats in front of that.
-			httpConnMgr.HttpFilters = append([]*envoy_http_v3.HttpFilter{
-				grpcStatsFilter,
-				grpcHttp1Bridge,
-			}, httpConnMgr.HttpFilters...)
-		}
-
-		httpFilter, err := makeEnvoyFilter(envoyHttpConnectionManagerFilterName, httpConnMgr)
-		if err != nil {
-			return nil, err
-		}
-		envoyFilters = append(envoyFilters, httpFilter)
-	}
-	return envoyFilters, nil
-}
-
-func (pr *ProxyResources) makeEnvoyTLSParameters(defaultParams *pbproxystate.TLSParameters, overrideParams *pbproxystate.TLSParameters) *envoy_tls_v3.TlsParameters {
-	tlsParams := &envoy_tls_v3.TlsParameters{}
-
-	if overrideParams != nil {
-		if overrideParams.MinVersion != pbproxystate.TLSVersion_TLS_VERSION_UNSPECIFIED {
-			if minVersion, ok := envoyTLSVersions[overrideParams.MinVersion]; ok {
-				tlsParams.TlsMinimumProtocolVersion = minVersion
-			}
-		}
-		if overrideParams.MaxVersion != pbproxystate.TLSVersion_TLS_VERSION_UNSPECIFIED {
-			if maxVersion, ok := envoyTLSVersions[overrideParams.MaxVersion]; ok {
-				tlsParams.TlsMaximumProtocolVersion = maxVersion
-			}
-		}
-		if len(overrideParams.CipherSuites) != 0 {
-			tlsParams.CipherSuites = marshalEnvoyTLSCipherSuiteStrings(overrideParams.CipherSuites)
-		}
-		return tlsParams
-	}
-
-	if defaultParams != nil {
-		if defaultParams.MinVersion != pbproxystate.TLSVersion_TLS_VERSION_UNSPECIFIED {
-			if minVersion, ok := envoyTLSVersions[defaultParams.MinVersion]; ok {
-				tlsParams.TlsMinimumProtocolVersion = minVersion
-			}
-		}
-		if defaultParams.MaxVersion != pbproxystate.TLSVersion_TLS_VERSION_UNSPECIFIED {
-			if maxVersion, ok := envoyTLSVersions[defaultParams.MaxVersion]; ok {
-				tlsParams.TlsMaximumProtocolVersion = maxVersion
-			}
-		}
-		if len(defaultParams.CipherSuites) != 0 {
-			tlsParams.CipherSuites = marshalEnvoyTLSCipherSuiteStrings(defaultParams.CipherSuites)
-		}
-		return tlsParams
-	}
-
-	return tlsParams
-
-}
-
-func (pr *ProxyResources) makeEnvoyTransportSocket(ts *pbproxystate.TransportSocket) (*envoy_core_v3.TransportSocket, error) {
-	if ts == nil {
-		return nil, nil
-	}
-	commonTLSContext := &envoy_tls_v3.CommonTlsContext{}
-	if ts.AlpnProtocols != nil {
-		commonTLSContext.AlpnProtocols = ts.AlpnProtocols
-	}
-
-	// Create connection TLS. Listeners should only look at inbound TLS.
-	switch ts.ConnectionTls.(type) {
-	case *pbproxystate.TransportSocket_InboundMesh:
-		downstreamContext := &envoy_tls_v3.DownstreamTlsContext{}
-		downstreamContext.CommonTlsContext = commonTLSContext
-		// Set TLS Parameters.
-		if pr.proxyState.Tls != nil {
-			tlsParams := pr.makeEnvoyTLSParameters(pr.proxyState.Tls.InboundTlsParameters, ts.TlsParameters)
-			commonTLSContext.TlsParams = tlsParams
-		} else {
-			commonTLSContext.TlsParams = &envoy_tls_v3.TlsParameters{}
-		}
-
-		// Set the certificate config on the tls context.
-		// For inbound mesh, we need to add the identity certificate
-		// and the validation context for the mesh depending on the provided trust bundle names.
-		im := ts.ConnectionTls.(*pbproxystate.TransportSocket_InboundMesh).InboundMesh
-		leaf, ok := pr.proxyState.LeafCertificates[im.IdentityKey]
-		if !ok {
-			return nil, fmt.Errorf("failed to create transport socket: leaf certificate %q not found", im.IdentityKey)
-		}
-		err := pr.makeEnvoyCertConfig(commonTLSContext, leaf)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create transport socket: %w", err)
-		}
-
-		// Create validation context.
-		// When there's only one trust bundle name, we create a simple validation context
-		if len(im.ValidationContext.TrustBundlePeerNameKeys) == 1 {
-			peerName := im.ValidationContext.TrustBundlePeerNameKeys[0]
-			tb, ok := pr.proxyState.TrustBundles[peerName]
-			if !ok {
-				return nil, fmt.Errorf("failed to create transport socket: provided trust bundle name does not exist in proxystate trust bundle map: %s", peerName)
-			}
-			commonTLSContext.ValidationContextType = &envoy_tls_v3.CommonTlsContext_ValidationContext{
-				ValidationContext: &envoy_tls_v3.CertificateValidationContext{
-					// TODO(banks): later for L7 support we may need to configure ALPN here.
-					TrustedCa: &envoy_core_v3.DataSource{
-						Specifier: &envoy_core_v3.DataSource_InlineString{
-							InlineString: RootPEMsAsString(tb.Roots),
-						},
-					},
-				},
-			}
-		} else if len(im.ValidationContext.TrustBundlePeerNameKeys) > 1 {
-			cfg := &envoy_tls_v3.SPIFFECertValidatorConfig{
-				TrustDomains: make([]*envoy_tls_v3.SPIFFECertValidatorConfig_TrustDomain, 0, len(im.ValidationContext.TrustBundlePeerNameKeys)),
-			}
-
-			for _, peerName := range im.ValidationContext.TrustBundlePeerNameKeys {
-				// Look up the trust bundle ca in the map.
-				tb, ok := pr.proxyState.TrustBundles[peerName]
-				if !ok {
-					return nil, fmt.Errorf("failed to create transport socket: provided bundle name does not exist in trust bundle map: %s", peerName)
-				}
-				cfg.TrustDomains = append(cfg.TrustDomains, &envoy_tls_v3.SPIFFECertValidatorConfig_TrustDomain{
-					Name: tb.TrustDomain,
-					TrustBundle: &envoy_core_v3.DataSource{
-						Specifier: &envoy_core_v3.DataSource_InlineString{
-							InlineString: RootPEMsAsString(tb.Roots),
-						},
-					},
-				})
-			}
-			// Sort the trust domains so the output is stable.
-			sortTrustDomains(cfg.TrustDomains)
-
-			spiffeConfig, err := anypb.New(cfg)
-			if err != nil {
-				return nil, err
-			}
-			commonTLSContext.ValidationContextType = &envoy_tls_v3.CommonTlsContext_ValidationContext{
-				ValidationContext: &envoy_tls_v3.CertificateValidationContext{
-					CustomValidatorConfig: &envoy_core_v3.TypedExtensionConfig{
-						// The typed config name is hard-coded because it is not available as a wellknown var in the control plane lib.
-						Name:        "envoy.tls.cert_validator.spiffe",
-						TypedConfig: spiffeConfig,
-					},
-				},
-			}
-		}
-		// Always require client certificate
-		downstreamContext.RequireClientCertificate = &wrapperspb.BoolValue{Value: true}
-		transportSocket, err := makeTransportSocket("tls", downstreamContext)
-		if err != nil {
-			return nil, err
-		}
-		return transportSocket, nil
-	case *pbproxystate.TransportSocket_InboundNonMesh:
-		downstreamContext := &envoy_tls_v3.DownstreamTlsContext{}
-		downstreamContext.CommonTlsContext = commonTLSContext
-		// Set TLS Parameters.
-		if pr.proxyState.Tls != nil {
-			tlsParams := pr.makeEnvoyTLSParameters(pr.proxyState.Tls.InboundTlsParameters, ts.TlsParameters)
-			commonTLSContext.TlsParams = tlsParams
-		} else {
-			commonTLSContext.TlsParams = &envoy_tls_v3.TlsParameters{}
-		}
-		// For non-mesh, we don't care about validation context as currently we don't support mTLS for non-mesh connections.
-		nonMeshTLS := ts.ConnectionTls.(*pbproxystate.TransportSocket_InboundNonMesh).InboundNonMesh
-		err := pr.addNonMeshCertConfig(commonTLSContext, nonMeshTLS)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create transport socket: %w", err)
-		}
-		transportSocket, err := makeTransportSocket("tls", downstreamContext)
-		if err != nil {
-			return nil, err
-		}
-		return transportSocket, nil
-	case *pbproxystate.TransportSocket_OutboundMesh:
-		upstreamContext := &envoy_tls_v3.UpstreamTlsContext{}
-		upstreamContext.CommonTlsContext = commonTLSContext
-		// Set TLS Parameters.
-		if pr.proxyState.Tls != nil {
-			tlsParams := pr.makeEnvoyTLSParameters(pr.proxyState.Tls.OutboundTlsParameters, ts.TlsParameters)
-			commonTLSContext.TlsParams = tlsParams
-		} else {
-			commonTLSContext.TlsParams = &envoy_tls_v3.TlsParameters{}
-		}
-		// For outbound mesh, we need to insert the mesh identity certificate
-		// and the validation context for the mesh depending on the provided trust bundle names.
-		om := ts.GetOutboundMesh()
-		leaf, ok := pr.proxyState.LeafCertificates[om.IdentityKey]
-		if !ok {
-			return nil, fmt.Errorf("leaf %s not found in proxyState", om.IdentityKey)
-		}
-		err := pr.makeEnvoyCertConfig(commonTLSContext, leaf)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create transport socket: %w", err)
-		}
-
-		// Create validation context
-		peerName := om.ValidationContext.TrustBundlePeerNameKey
-		tb, ok := pr.proxyState.TrustBundles[peerName]
-		if !ok {
-			return nil, fmt.Errorf("failed to create transport socket: provided peer name does not exist in trust bundle map: %s", peerName)
-		}
-
-		var matchers []*envoy_matcher_v3.StringMatcher
-		if len(om.ValidationContext.SpiffeIds) > 0 {
-			matchers = make([]*envoy_matcher_v3.StringMatcher, 0)
-			for _, m := range om.ValidationContext.SpiffeIds {
-				matchers = append(matchers, &envoy_matcher_v3.StringMatcher{
-					MatchPattern: &envoy_matcher_v3.StringMatcher_Exact{
-						Exact: m,
-					},
-				})
-			}
-		}
-		commonTLSContext.ValidationContextType = &envoy_tls_v3.CommonTlsContext_ValidationContext{
-			ValidationContext: &envoy_tls_v3.CertificateValidationContext{
-				// TODO(banks): later for L7 support we may need to configure ALPN here.
-				TrustedCa: &envoy_core_v3.DataSource{
-					Specifier: &envoy_core_v3.DataSource_InlineString{
-						InlineString: RootPEMsAsString(tb.Roots),
-					},
-				},
-				MatchSubjectAltNames: matchers,
-			},
-		}
-
-		upstreamContext.Sni = om.Sni
-		transportSocket, err := makeTransportSocket("tls", upstreamContext)
-		if err != nil {
-			return nil, err
-		}
-		return transportSocket, nil
-	default:
-		return nil, nil
-	}
-
-}
-
-func (pr *ProxyResources) makeEnvoyCertConfig(common *envoy_tls_v3.CommonTlsContext, certificate *pbproxystate.LeafCertificate) error {
-	if certificate == nil {
-		return fmt.Errorf("no leaf certificate provided")
-	}
-	common.TlsCertificates = []*envoy_tls_v3.TlsCertificate{
-		{
-			CertificateChain: &envoy_core_v3.DataSource{
-				Specifier: &envoy_core_v3.DataSource_InlineString{
-					InlineString: lib.EnsureTrailingNewline(certificate.Cert),
-				},
-			},
-			PrivateKey: &envoy_core_v3.DataSource{
-				Specifier: &envoy_core_v3.DataSource_InlineString{
-					InlineString: lib.EnsureTrailingNewline(certificate.Key),
-				},
-			},
-		},
-	}
-	return nil
-}
-
-func (pr *ProxyResources) makeEnvoySDSCertConfig(common *envoy_tls_v3.CommonTlsContext, certificate *pbproxystate.SDSCertificate) error {
-	if certificate == nil {
-		return fmt.Errorf("no SDS certificate provided")
-	}
-	common.TlsCertificateSdsSecretConfigs = []*envoy_tls_v3.SdsSecretConfig{
-		{
-			Name: certificate.CertResource,
-			SdsConfig: &envoy_core_v3.ConfigSource{
-				ConfigSourceSpecifier: &envoy_core_v3.ConfigSource_ApiConfigSource{
-					ApiConfigSource: &envoy_core_v3.ApiConfigSource{
-						ApiType:             envoy_core_v3.ApiConfigSource_GRPC,
-						TransportApiVersion: envoy_core_v3.ApiVersion_V3,
-						// Note ClusterNames can't be set here - that's only for REST type
-						// we need a full GRPC config instead.
-						GrpcServices: []*envoy_core_v3.GrpcService{
-							{
-								TargetSpecifier: &envoy_core_v3.GrpcService_EnvoyGrpc_{
-									EnvoyGrpc: &envoy_core_v3.GrpcService_EnvoyGrpc{
-										ClusterName: certificate.ClusterName,
-									},
-								},
-								Timeout: &durationpb.Duration{Seconds: 5},
-							},
-						},
-					},
-				},
-				ResourceApiVersion: envoy_core_v3.ApiVersion_V3,
-			},
-		},
-	}
-	return nil
-}
-
-func (pr *ProxyResources) addNonMeshCertConfig(common *envoy_tls_v3.CommonTlsContext, tls *pbproxystate.InboundNonMeshTLS) error {
-	if tls == nil {
-		return fmt.Errorf("no inbound non-mesh TLS provided")
-	}
-
-	switch tls.Identity.(type) {
-	case *pbproxystate.InboundNonMeshTLS_LeafKey:
-		leafKey := tls.Identity.(*pbproxystate.InboundNonMeshTLS_LeafKey).LeafKey
-		leaf, ok := pr.proxyState.LeafCertificates[leafKey]
-		if !ok {
-			return fmt.Errorf("leaf key %s not found in leaf certificate map", leafKey)
-		}
-		common.TlsCertificates = []*envoy_tls_v3.TlsCertificate{
-			{
-				CertificateChain: &envoy_core_v3.DataSource{
-					Specifier: &envoy_core_v3.DataSource_InlineString{
-						InlineString: lib.EnsureTrailingNewline(leaf.Cert),
-					},
-				},
-				PrivateKey: &envoy_core_v3.DataSource{
-					Specifier: &envoy_core_v3.DataSource_InlineString{
-						InlineString: lib.EnsureTrailingNewline(leaf.Key),
-					},
-				},
-			},
-		}
-	case *pbproxystate.InboundNonMeshTLS_Sds:
-		c := tls.Identity.(*pbproxystate.InboundNonMeshTLS_Sds).Sds
-		common.TlsCertificateSdsSecretConfigs = []*envoy_tls_v3.SdsSecretConfig{
-			{
-				Name: c.CertResource,
-				SdsConfig: &envoy_core_v3.ConfigSource{
-					ConfigSourceSpecifier: &envoy_core_v3.ConfigSource_ApiConfigSource{
-						ApiConfigSource: &envoy_core_v3.ApiConfigSource{
-							ApiType:             envoy_core_v3.ApiConfigSource_GRPC,
-							TransportApiVersion: envoy_core_v3.ApiVersion_V3,
-							// Note ClusterNames can't be set here - that's only for REST type
-							// we need a full GRPC config instead.
-							GrpcServices: []*envoy_core_v3.GrpcService{
-								{
-									TargetSpecifier: &envoy_core_v3.GrpcService_EnvoyGrpc_{
-										EnvoyGrpc: &envoy_core_v3.GrpcService_EnvoyGrpc{
-											ClusterName: c.ClusterName,
-										},
-									},
-									Timeout: &durationpb.Duration{Seconds: 5},
-								},
-							},
-						},
-					},
-					ResourceApiVersion: envoy_core_v3.ApiVersion_V3,
-				},
-			},
-		}
-	}
-
-	return nil
-}
-
-func makeTransportSocket(name string, config proto.Message) (*envoy_core_v3.TransportSocket, error) {
-	any, err := anypb.New(config)
-	if err != nil {
-		return nil, err
-	}
-	return &envoy_core_v3.TransportSocket{
-		Name: name,
-		ConfigType: &envoy_core_v3.TransportSocket_TypedConfig{
-			TypedConfig: any,
-		},
-	}, nil
-}
-
-func makeEnvoyListenerFilter(c pbproxystate.Capability) (*envoy_listener_v3.ListenerFilter, error) {
-	var lf proto.Message
-	var name string
-
-	switch c {
-	case pbproxystate.Capability_CAPABILITY_TRANSPARENT:
-		lf = &envoy_original_dst_v3.OriginalDst{}
-		name = envoyOriginalDestinationListenerFilterName
-	case pbproxystate.Capability_CAPABILITY_L4_TLS_INSPECTION:
-		name = envoyTLSInspectorListenerFilterName
-		lf = &envoy_tls_inspector_v3.TlsInspector{}
-	case pbproxystate.Capability_CAPABILITY_L7_PROTOCOL_INSPECTION:
-		name = envoyHttpInspectorListenerFilterName
-		lf = &envoy_extensions_filters_listener_http_inspector_v3.HttpInspector{}
-	default:
-		return nil, fmt.Errorf("unsupported listener captability: %s", c)
-	}
-	lfAsAny, err := anypb.New(lf)
-	if err != nil {
-		return nil, err
-	}
-
-	return &envoy_listener_v3.ListenerFilter{
-		Name:       name,
-		ConfigType: &envoy_listener_v3.ListenerFilter_TypedConfig{TypedConfig: lfAsAny},
-	}, nil
-}
-
-func makeEnvoyFilter(name string, cfg proto.Message) (*envoy_listener_v3.Filter, error) {
-	any, err := anypb.New(cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	return &envoy_listener_v3.Filter{
-		Name:       name,
-		ConfigType: &envoy_listener_v3.Filter_TypedConfig{TypedConfig: any},
-	}, nil
-}
-
-func makeEnvoyHTTPFilter(name string, cfg proto.Message) (*envoy_http_v3.HttpFilter, error) {
-	any, err := anypb.New(cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	return &envoy_http_v3.HttpFilter{
-		Name:       name,
-		ConfigType: &envoy_http_v3.HttpFilter_TypedConfig{TypedConfig: any},
-	}, nil
-}
-
-func RootPEMsAsString(rootPEMs []string) string {
-	var rootPEMsString string
-	for _, root := range rootPEMs {
-		rootPEMsString += lib.EnsureTrailingNewline(root)
-	}
-	return rootPEMsString
-}
-
-func marshalEnvoyTLSCipherSuiteStrings(cipherSuites []pbproxystate.TLSCipherSuite) []string {
-	envoyTLSCipherSuiteStrings := map[pbproxystate.TLSCipherSuite]string{
-		pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_AES128_GCM_SHA256: "ECDHE-ECDSA-AES128-GCM-SHA256",
-		pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_CHACHA20_POLY1305: "ECDHE-ECDSA-CHACHA20-POLY1305",
-		pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_AES128_GCM_SHA256:   "ECDHE-RSA-AES128-GCM-SHA256",
-		pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_CHACHA20_POLY1305:   "ECDHE-RSA-CHACHA20-POLY1305",
-		pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_AES128_SHA:        "ECDHE-ECDSA-AES128-SHA",
-		pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_AES128_SHA:          "ECDHE-RSA-AES128-SHA",
-		pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_AES128_GCM_SHA256:             "AES128-GCM-SHA256",
-		pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_AES128_SHA:                    "AES128-SHA",
-		pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_AES256_GCM_SHA384: "ECDHE-ECDSA-AES256-GCM-SHA384",
-		pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_AES256_GCM_SHA384:   "ECDHE-RSA-AES256-GCM-SHA384",
-		pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_AES256_SHA:        "ECDHE-ECDSA-AES256-SHA",
-		pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_AES256_SHA:          "ECDHE-RSA-AES256-SHA",
-		pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_AES256_GCM_SHA384:             "AES256-GCM-SHA384",
-		pbproxystate.TLSCipherSuite_TLS_CIPHER_SUITE_AES256_SHA:                    "AES256-SHA",
-	}
-
-	var cipherSuiteStrings []string
-
-	for _, c := range cipherSuites {
-		if s, ok := envoyTLSCipherSuiteStrings[c]; ok {
-			cipherSuiteStrings = append(cipherSuiteStrings, s)
-		}
-	}
-
-	return cipherSuiteStrings
-}
-
-var envoyTLSVersions = map[pbproxystate.TLSVersion]envoy_tls_v3.TlsParameters_TlsProtocol{
-	pbproxystate.TLSVersion_TLS_VERSION_AUTO: envoy_tls_v3.TlsParameters_TLS_AUTO,
-	pbproxystate.TLSVersion_TLS_VERSION_1_0:  envoy_tls_v3.TlsParameters_TLSv1_0,
-	pbproxystate.TLSVersion_TLS_VERSION_1_1:  envoy_tls_v3.TlsParameters_TLSv1_1,
-	pbproxystate.TLSVersion_TLS_VERSION_1_2:  envoy_tls_v3.TlsParameters_TLSv1_2,
-	pbproxystate.TLSVersion_TLS_VERSION_1_3:  envoy_tls_v3.TlsParameters_TLSv1_3,
-}
-
-// Sort the trust domains so that the output is stable.
-// This benefits tests but also prevents Envoy from mistakenly thinking the listener
-// changed and needs to be drained only because this ordering is different.
-func sortTrustDomains(trustDomains []*envoy_tls_v3.SPIFFECertValidatorConfig_TrustDomain) {
-	sort.Slice(trustDomains, func(i int, j int) bool {
-		return trustDomains[i].Name < trustDomains[j].Name
-	})
-}
-
-// sortRouters stable sorts routers with a Match to avoid draining if the list is provided out of order.
-// xdsv1 used to sort the filter chains on outbound listeners, so this adds that functionality by sorting routers with matches.
-func sortRouters(routers []*pbproxystate.Router) {
-	if routers == nil {
-		return
-	}
-	sort.SliceStable(routers, func(i, j int) bool {
-		si := ""
-		sj := ""
-		if routers[i].Match != nil {
-			if len(routers[i].Match.PrefixRanges) > 0 {
-				si += routers[i].Match.PrefixRanges[0].AddressPrefix +
-					"/" + routers[i].Match.PrefixRanges[0].PrefixLen.String() +
-					":" + routers[i].Match.DestinationPort.String()
-			}
-			if len(routers[i].Match.ServerNames) > 0 {
-				si += routers[i].Match.ServerNames[0] +
-					":" + routers[i].Match.DestinationPort.String()
-			} else {
-				si += routers[i].Match.DestinationPort.String()
-			}
-		}
-
-		if routers[j].Match != nil {
-			if len(routers[j].Match.PrefixRanges) > 0 {
-				sj += routers[j].Match.PrefixRanges[0].AddressPrefix +
-					"/" + routers[j].Match.PrefixRanges[0].PrefixLen.String() +
-					":" + routers[j].Match.DestinationPort.String()
-			}
-			if len(routers[j].Match.ServerNames) > 0 {
-				sj += routers[j].Match.ServerNames[0] +
-					":" + routers[j].Match.DestinationPort.String()
-			} else {
-				sj += routers[j].Match.DestinationPort.String()
-			}
-		}
-
-		return si < sj
-	})
-}
-
-func sortPrefixRanges(prefixRanges []*pbproxystate.CidrRange) {
-	if prefixRanges == nil {
-		return
-	}
-	sort.SliceStable(prefixRanges, func(i, j int) bool {
-		return prefixRanges[i].AddressPrefix < prefixRanges[j].AddressPrefix
-	})
-}
diff --git a/agent/xdsv2/rbac_resources.go b/agent/xdsv2/rbac_resources.go
deleted file mode 100644
index 76d19a6f900dc..0000000000000
--- a/agent/xdsv2/rbac_resources.go
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xdsv2
-
-import (
-	"fmt"
-
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	envoy_rbac_v3 "github.com/envoyproxy/go-control-plane/envoy/config/rbac/v3"
-	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
-	envoy_network_rbac_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/rbac/v3"
-	envoy_matcher_v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3"
-
-	"github.com/hashicorp/consul/agent/xds/response"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-)
-
-const (
-	baseL4PermissionKey = "consul-intentions-layer4"
-)
-
-func MakeL4RBAC(trafficPermissions *pbproxystate.TrafficPermissions) ([]*envoy_listener_v3.Filter, error) {
-	var filters []*envoy_listener_v3.Filter
-
-	if trafficPermissions == nil {
-		return nil, nil
-	}
-
-	if len(trafficPermissions.DenyPermissions) > 0 {
-		denyRBAC := &envoy_rbac_v3.RBAC{
-			Action:   envoy_rbac_v3.RBAC_DENY,
-			Policies: make(map[string]*envoy_rbac_v3.Policy),
-		}
-		denyRBAC.Policies = makeRBACPolicies(trafficPermissions.DenyPermissions)
-		filter, err := makeRBACFilter(denyRBAC)
-		if err != nil {
-			return nil, err
-		}
-		filters = append(filters, filter)
-	}
-
-	// Only include the allow RBAC when Consul is in default deny.
-	if !trafficPermissions.DefaultAllow {
-		allowRBAC := &envoy_rbac_v3.RBAC{
-			Action:   envoy_rbac_v3.RBAC_ALLOW,
-			Policies: make(map[string]*envoy_rbac_v3.Policy),
-		}
-
-		allowRBAC.Policies = makeRBACPolicies(trafficPermissions.AllowPermissions)
-		filter, err := makeRBACFilter(allowRBAC)
-		if err != nil {
-			return nil, err
-		}
-		filters = append(filters, filter)
-	}
-
-	return filters, nil
-}
-
-func makeRBACFilter(rbac *envoy_rbac_v3.RBAC) (*envoy_listener_v3.Filter, error) {
-	cfg := &envoy_network_rbac_v3.RBAC{
-		StatPrefix: "connect_authz",
-		Rules:      rbac,
-	}
-	return makeEnvoyFilter("envoy.filters.network.rbac", cfg)
-}
-
-func makeRBACPolicies(l4Permissions []*pbproxystate.Permission) map[string]*envoy_rbac_v3.Policy {
-	policyLabel := func(i int) string {
-		if len(l4Permissions) == 1 {
-			return baseL4PermissionKey
-		}
-		return fmt.Sprintf("%s-%d", baseL4PermissionKey, i)
-	}
-
-	policies := make(map[string]*envoy_rbac_v3.Policy, len(l4Permissions))
-
-	for i, permission := range l4Permissions {
-		policy := makeRBACPolicy(permission)
-		if policy != nil {
-			policies[policyLabel(i)] = policy
-		}
-	}
-
-	return policies
-}
-
-func makeRBACPolicy(p *pbproxystate.Permission) *envoy_rbac_v3.Policy {
-	if len(p.Principals) == 0 {
-		return nil
-	}
-
-	var principals []*envoy_rbac_v3.Principal
-
-	for _, p := range p.Principals {
-		principals = append(principals, toEnvoyPrincipal(p))
-	}
-
-	return &envoy_rbac_v3.Policy{
-		Principals:  principals,
-		Permissions: []*envoy_rbac_v3.Permission{anyPermission()},
-	}
-}
-
-func toEnvoyPrincipal(p *pbproxystate.Principal) *envoy_rbac_v3.Principal {
-	includePrincipal := principal(p.Spiffe)
-
-	if len(p.ExcludeSpiffes) == 0 {
-		return includePrincipal
-	}
-
-	principals := make([]*envoy_rbac_v3.Principal, 0, len(p.ExcludeSpiffes)+1)
-	principals = append(principals, includePrincipal)
-	for _, s := range p.ExcludeSpiffes {
-		principals = append(principals, negatePrincipal(principal(s)))
-	}
-	return andPrincipals(principals)
-}
-
-func principal(spiffe *pbproxystate.Spiffe) *envoy_rbac_v3.Principal {
-	var andIDs []*envoy_rbac_v3.Principal
-	andIDs = append(andIDs, idPrincipal(spiffe.Regex))
-
-	if len(spiffe.XfccRegex) > 0 {
-		andIDs = append(andIDs, xfccPrincipal(spiffe.XfccRegex))
-	}
-
-	return andPrincipals(andIDs)
-}
-
-func negatePrincipal(p *envoy_rbac_v3.Principal) *envoy_rbac_v3.Principal {
-	return &envoy_rbac_v3.Principal{
-		Identifier: &envoy_rbac_v3.Principal_NotId{
-			NotId: p,
-		},
-	}
-}
-
-func idPrincipal(spiffeID string) *envoy_rbac_v3.Principal {
-	return &envoy_rbac_v3.Principal{
-		Identifier: &envoy_rbac_v3.Principal_Authenticated_{
-			Authenticated: &envoy_rbac_v3.Principal_Authenticated{
-				PrincipalName: &envoy_matcher_v3.StringMatcher{
-					MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{
-						SafeRegex: response.MakeEnvoyRegexMatch(spiffeID),
-					},
-				},
-			},
-		},
-	}
-}
-
-func andPrincipals(ids []*envoy_rbac_v3.Principal) *envoy_rbac_v3.Principal {
-	switch len(ids) {
-	case 1:
-		return ids[0]
-	default:
-		return &envoy_rbac_v3.Principal{
-			Identifier: &envoy_rbac_v3.Principal_AndIds{
-				AndIds: &envoy_rbac_v3.Principal_Set{
-					Ids: ids,
-				},
-			},
-		}
-	}
-}
-
-func xfccPrincipal(spiffeID string) *envoy_rbac_v3.Principal {
-	return &envoy_rbac_v3.Principal{
-		Identifier: &envoy_rbac_v3.Principal_Header{
-			Header: &envoy_route_v3.HeaderMatcher{
-				Name: "x-forwarded-client-cert",
-				HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_StringMatch{
-					StringMatch: &envoy_matcher_v3.StringMatcher{
-						MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{
-							SafeRegex: response.MakeEnvoyRegexMatch(spiffeID),
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-func anyPermission() *envoy_rbac_v3.Permission {
-	return &envoy_rbac_v3.Permission{
-		Rule: &envoy_rbac_v3.Permission_Any{Any: true},
-	}
-}
diff --git a/agent/xdsv2/resources.go b/agent/xdsv2/resources.go
deleted file mode 100644
index fa5f7179e6a5d..0000000000000
--- a/agent/xdsv2/resources.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xdsv2
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/go-hclog"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	proxytracker "github.com/hashicorp/consul/internal/mesh/proxy-tracker"
-)
-
-// ResourceGenerator is associated with a single gRPC stream and creates xDS
-// resources for a single client.
-type ResourceGenerator struct {
-	Logger        hclog.Logger
-	ProxyFeatures xdscommon.SupportedProxyFeatures
-}
-
-func NewResourceGenerator(
-	logger hclog.Logger,
-) *ResourceGenerator {
-	return &ResourceGenerator{
-		Logger: logger,
-	}
-}
-
-type ProxyResources struct {
-	proxyState     *proxytracker.ProxyState
-	envoyResources map[string][]proto.Message
-}
-
-func (g *ResourceGenerator) AllResourcesFromIR(proxyState *proxytracker.ProxyState) (map[string][]proto.Message, error) {
-	pr := &ProxyResources{
-		proxyState:     proxyState,
-		envoyResources: make(map[string][]proto.Message),
-	}
-	err := pr.generateXDSResources()
-	if err != nil {
-		return nil, fmt.Errorf("failed to generate xDS resources for ProxyState: %v", err)
-	}
-	return pr.envoyResources, nil
-}
-
-func (pr *ProxyResources) generateXDSResources() error {
-	listeners, err := pr.makeXDSListeners()
-	if err != nil {
-		return err
-	}
-
-	pr.envoyResources[xdscommon.ListenerType] = listeners
-
-	clusters, err := pr.makeXDSClusters()
-	if err != nil {
-		return err
-	}
-	pr.envoyResources[xdscommon.ClusterType] = clusters
-
-	endpoints, err := pr.makeXDSEndpoints()
-	if err != nil {
-		return err
-	}
-	pr.envoyResources[xdscommon.EndpointType] = endpoints
-
-	routes, err := pr.makeXDSRoutes()
-	if err != nil {
-		return err
-	}
-	pr.envoyResources[xdscommon.RouteType] = routes
-
-	return nil
-}
diff --git a/agent/xdsv2/resources_test.go b/agent/xdsv2/resources_test.go
deleted file mode 100644
index e84e9bdb513ce..0000000000000
--- a/agent/xdsv2/resources_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xdsv2
-
-import (
-	"os"
-	"path/filepath"
-	"sort"
-	"testing"
-
-	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-
-	"github.com/hashicorp/consul/agent/xds/response"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	proxytracker "github.com/hashicorp/consul/internal/mesh/proxy-tracker"
-	meshv2beta1 "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/sdk/testutil"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/proto"
-)
-
-func TestResources_ImplicitDestinations(t *testing.T) {
-
-	cases := map[string]struct {
-	}{
-		"l4-single-implicit-destination-tproxy": {},
-	}
-
-	for name := range cases {
-		goldenValueInput := goldenValueJSON(t, name, "input")
-
-		proxyTemplate := jsonToProxyTemplate(t, goldenValueInput)
-		generator := NewResourceGenerator(testutil.Logger(t))
-
-		resources, err := generator.AllResourcesFromIR(&proxytracker.ProxyState{ProxyState: proxyTemplate.ProxyState})
-		require.NoError(t, err)
-
-		verifyClusterResourcesToGolden(t, resources, name)
-		verifyListenerResourcesToGolden(t, resources, name)
-
-	}
-}
-
-func verifyClusterResourcesToGolden(t *testing.T, resources map[string][]proto.Message, testName string) {
-	clusters := resources[xdscommon.ClusterType]
-
-	// The order of clusters returned via CDS isn't relevant, so it's safe
-	// to sort these for the purposes of test comparisons.
-	sort.Slice(clusters, func(i, j int) bool {
-		return clusters[i].(*envoy_cluster_v3.Cluster).Name < clusters[j].(*envoy_cluster_v3.Cluster).Name
-	})
-
-	resp, err := response.CreateResponse(xdscommon.ClusterType, "00000001", "00000001", clusters)
-	require.NoError(t, err)
-	gotJSON := protoToJSON(t, resp)
-
-	expectedJSON := goldenValue(t, filepath.Join("clusters", testName), "output")
-	require.JSONEq(t, expectedJSON, gotJSON)
-}
-
-func verifyListenerResourcesToGolden(t *testing.T, resources map[string][]proto.Message, testName string) {
-	listeners := resources[xdscommon.ListenerType]
-
-	// The order of clusters returned via CDS isn't relevant, so it's safe
-	// to sort these for the purposes of test comparisons.
-	sort.Slice(listeners, func(i, j int) bool {
-		return listeners[i].(*envoy_listener_v3.Listener).Name < listeners[j].(*envoy_listener_v3.Listener).Name
-	})
-
-	resp, err := response.CreateResponse(xdscommon.ListenerType, "00000001", "00000001", listeners)
-	require.NoError(t, err)
-	gotJSON := protoToJSON(t, resp)
-
-	expectedJSON := goldenValue(t, filepath.Join("listeners", testName), "output")
-	require.JSONEq(t, expectedJSON, gotJSON)
-}
-
-func protoToJSON(t *testing.T, pb proto.Message) string {
-	t.Helper()
-	m := protojson.MarshalOptions{
-		Indent: "  ",
-	}
-	gotJSON, err := m.Marshal(pb)
-	require.NoError(t, err)
-	return string(gotJSON)
-}
-
-func jsonToProxyTemplate(t *testing.T, json []byte) *meshv2beta1.ProxyStateTemplate {
-	t.Helper()
-	um := protojson.UnmarshalOptions{}
-	proxyTemplate := &meshv2beta1.ProxyStateTemplate{}
-	err := um.Unmarshal(json, proxyTemplate)
-	require.NoError(t, err)
-	return proxyTemplate
-}
-
-func goldenValueJSON(t *testing.T, goldenFile, inputOutput string) []byte {
-	t.Helper()
-	goldenPath := filepath.Join("testdata", inputOutput, goldenFile) + ".golden"
-
-	content, err := os.ReadFile(goldenPath)
-	require.NoError(t, err)
-	return content
-}
-
-func goldenValue(t *testing.T, goldenFile, inputOutput string) string {
-	t.Helper()
-	return string(goldenValueJSON(t, goldenFile, inputOutput))
-}
diff --git a/agent/xdsv2/route_resources.go b/agent/xdsv2/route_resources.go
deleted file mode 100644
index af06c174484f8..0000000000000
--- a/agent/xdsv2/route_resources.go
+++ /dev/null
@@ -1,544 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xdsv2
-
-import (
-	"fmt"
-	"strings"
-
-	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	envoy_matcher_v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-
-	"github.com/hashicorp/consul/agent/xds/response"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-
-	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
-	"google.golang.org/protobuf/proto"
-)
-
-func (pr *ProxyResources) makeXDSRoutes() ([]proto.Message, error) {
-	routes := make([]proto.Message, 0)
-
-	for name, r := range pr.proxyState.Routes {
-		protoRoute := pr.makeEnvoyRouteConfigFromProxystateRoute(name, r)
-		// TODO: aggregate errors for routes and still return any properly formed routes.
-		routes = append(routes, protoRoute)
-	}
-
-	return routes, nil
-}
-
-func (pr *ProxyResources) makeEnvoyRoute(name string) (*envoy_route_v3.RouteConfiguration, error) {
-	var route *envoy_route_v3.RouteConfiguration
-	// TODO(proxystate): This will make routes in the future. This function should distinguish between static routes
-	// inlined into listeners and non-static routes that should be added as top level Envoy resources.
-	_, ok := pr.proxyState.Routes[name]
-	if !ok {
-		// This should not happen with a valid proxy state.
-		return nil, fmt.Errorf("could not find route in ProxyState: %s", name)
-	}
-	return route, nil
-}
-
-// makeEnvoyRouteConfigFromProxystateRoute converts the proxystate representation of a Route into Envoy proto message
-// form. We don't throw any errors here, since the proxystate has already been validated.
-func (pr *ProxyResources) makeEnvoyRouteConfigFromProxystateRoute(name string, psRoute *pbproxystate.Route) *envoy_route_v3.RouteConfiguration {
-	envoyRouteConfig := &envoy_route_v3.RouteConfiguration{
-		Name: name,
-		// ValidateClusters defaults to true when defined statically and false
-		// when done via RDS. Re-set the reasonable value of true to prevent
-		// null-routing traffic.
-		ValidateClusters: response.MakeBoolValue(true),
-	}
-
-	for _, vh := range psRoute.GetVirtualHosts() {
-		envoyRouteConfig.VirtualHosts = append(envoyRouteConfig.VirtualHosts, pr.makeEnvoyVHFromProxystateVH(vh))
-	}
-
-	return envoyRouteConfig
-}
-
-func (pr *ProxyResources) makeEnvoyVHFromProxystateVH(psVirtualHost *pbproxystate.VirtualHost) *envoy_route_v3.VirtualHost {
-	envoyVirtualHost := &envoy_route_v3.VirtualHost{
-		Name:    psVirtualHost.Name,
-		Domains: psVirtualHost.GetDomains(),
-	}
-
-	for _, rr := range psVirtualHost.GetRouteRules() {
-		envoyVirtualHost.Routes = append(envoyVirtualHost.Routes, pr.makeEnvoyRouteFromProxystateRouteRule(rr))
-	}
-
-	for _, hm := range psVirtualHost.GetHeaderMutations() {
-		injectEnvoyVirtualHostWithProxystateHeaderMutation(envoyVirtualHost, hm)
-	}
-
-	return envoyVirtualHost
-}
-
-func (pr *ProxyResources) makeEnvoyRouteFromProxystateRouteRule(psRouteRule *pbproxystate.RouteRule) *envoy_route_v3.Route {
-	envoyRouteRule := &envoy_route_v3.Route{
-		Match:  makeEnvoyRouteMatchFromProxystateRouteMatch(psRouteRule.GetMatch()),
-		Action: pr.makeEnvoyRouteActionFromProxystateRouteDestination(psRouteRule.GetDestination()),
-	}
-
-	for _, hm := range psRouteRule.GetHeaderMutations() {
-		injectEnvoyRouteRuleWithProxystateHeaderMutation(envoyRouteRule, hm)
-	}
-
-	return envoyRouteRule
-}
-
-func makeEnvoyRouteMatchFromProxystateRouteMatch(psRouteMatch *pbproxystate.RouteMatch) *envoy_route_v3.RouteMatch {
-	envoyRouteMatch := &envoy_route_v3.RouteMatch{}
-
-	switch psRouteMatch.PathMatch.GetPathMatch().(type) {
-	case *pbproxystate.PathMatch_Exact:
-		envoyRouteMatch.PathSpecifier = &envoy_route_v3.RouteMatch_Path{
-			Path: psRouteMatch.PathMatch.GetExact(),
-		}
-	case *pbproxystate.PathMatch_Prefix:
-		envoyRouteMatch.PathSpecifier = &envoy_route_v3.RouteMatch_Prefix{
-			Prefix: psRouteMatch.PathMatch.GetPrefix(),
-		}
-	case *pbproxystate.PathMatch_Regex:
-		envoyRouteMatch.PathSpecifier = &envoy_route_v3.RouteMatch_SafeRegex{
-			SafeRegex: makeEnvoyRegexMatch(psRouteMatch.PathMatch.GetRegex()),
-		}
-	default:
-		// This shouldn't be possible considering the types of PathMatch
-		return nil
-	}
-
-	if len(psRouteMatch.GetHeaderMatches()) > 0 {
-		envoyRouteMatch.Headers = make([]*envoy_route_v3.HeaderMatcher, 0, len(psRouteMatch.GetHeaderMatches()))
-	}
-	for _, psHM := range psRouteMatch.GetHeaderMatches() {
-		envoyRouteMatch.Headers = append(envoyRouteMatch.Headers, makeEnvoyHeaderMatcherFromProxystateHeaderMatch(psHM))
-	}
-
-	if len(psRouteMatch.MethodMatches) > 0 {
-		methodHeaderRegex := strings.Join(psRouteMatch.MethodMatches, "|")
-
-		eh := &envoy_route_v3.HeaderMatcher{
-			Name: ":method",
-			HeaderMatchSpecifier: &envoy_route_v3.HeaderMatcher_SafeRegexMatch{
-				SafeRegexMatch: makeEnvoyRegexMatch(methodHeaderRegex),
-			},
-		}
-
-		envoyRouteMatch.Headers = append(envoyRouteMatch.Headers, eh)
-	}
-
-	if len(psRouteMatch.GetQueryParameterMatches()) > 0 {
-		envoyRouteMatch.QueryParameters = make([]*envoy_route_v3.QueryParameterMatcher, 0, len(psRouteMatch.GetQueryParameterMatches()))
-	}
-	for _, psQM := range psRouteMatch.GetQueryParameterMatches() {
-		envoyRouteMatch.QueryParameters = append(envoyRouteMatch.QueryParameters, makeEnvoyQueryParamFromProxystateQueryMatch(psQM))
-	}
-
-	return envoyRouteMatch
-}
-
-func makeEnvoyRegexMatch(pattern string) *envoy_matcher_v3.RegexMatcher {
-	return &envoy_matcher_v3.RegexMatcher{
-		EngineType: &envoy_matcher_v3.RegexMatcher_GoogleRe2{
-			GoogleRe2: &envoy_matcher_v3.RegexMatcher_GoogleRE2{},
-		},
-		Regex: pattern,
-	}
-}
-
-func makeEnvoyHeaderMatcherFromProxystateHeaderMatch(psMatch *pbproxystate.HeaderMatch) *envoy_route_v3.HeaderMatcher {
-	envoyHeaderMatcher := &envoy_route_v3.HeaderMatcher{
-		Name: psMatch.Name,
-	}
-
-	switch psMatch.Match.(type) {
-	case *pbproxystate.HeaderMatch_Exact:
-		envoyHeaderMatcher.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_StringMatch{
-			StringMatch: &envoy_matcher_v3.StringMatcher{
-				MatchPattern: &envoy_matcher_v3.StringMatcher_Exact{
-					Exact: psMatch.GetExact(),
-				},
-				IgnoreCase: false,
-			},
-		}
-
-	case *pbproxystate.HeaderMatch_Regex:
-		envoyHeaderMatcher.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_StringMatch{
-			StringMatch: &envoy_matcher_v3.StringMatcher{
-				MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{
-					SafeRegex: response.MakeEnvoyRegexMatch(psMatch.GetRegex()),
-				},
-				IgnoreCase: false,
-			},
-		}
-
-	case *pbproxystate.HeaderMatch_Prefix:
-		envoyHeaderMatcher.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_StringMatch{
-			StringMatch: &envoy_matcher_v3.StringMatcher{
-				MatchPattern: &envoy_matcher_v3.StringMatcher_Prefix{
-					Prefix: psMatch.GetPrefix(),
-				},
-				IgnoreCase: false,
-			},
-		}
-	case *pbproxystate.HeaderMatch_Suffix:
-		envoyHeaderMatcher.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_StringMatch{
-			StringMatch: &envoy_matcher_v3.StringMatcher{
-				MatchPattern: &envoy_matcher_v3.StringMatcher_Suffix{
-					Suffix: psMatch.GetSuffix(),
-				},
-				IgnoreCase: false,
-			},
-		}
-
-	case *pbproxystate.HeaderMatch_Present:
-		envoyHeaderMatcher.HeaderMatchSpecifier = &envoy_route_v3.HeaderMatcher_PresentMatch{
-			PresentMatch: true,
-		}
-	default:
-		// This shouldn't be possible considering the types of HeaderMatch
-		return nil
-	}
-
-	if psMatch.GetInvertMatch() {
-		envoyHeaderMatcher.InvertMatch = true
-	}
-
-	return envoyHeaderMatcher
-}
-
-func makeEnvoyQueryParamFromProxystateQueryMatch(psMatch *pbproxystate.QueryParameterMatch) *envoy_route_v3.QueryParameterMatcher {
-	envoyQueryParamMatcher := &envoy_route_v3.QueryParameterMatcher{
-		Name: psMatch.Name,
-	}
-
-	switch psMatch.Match.(type) {
-	case *pbproxystate.QueryParameterMatch_Exact:
-		envoyQueryParamMatcher.QueryParameterMatchSpecifier = &envoy_route_v3.QueryParameterMatcher_StringMatch{
-			StringMatch: &envoy_matcher_v3.StringMatcher{
-				MatchPattern: &envoy_matcher_v3.StringMatcher_Exact{
-					Exact: psMatch.GetExact(),
-				},
-			},
-		}
-
-	case *pbproxystate.QueryParameterMatch_Regex:
-		envoyQueryParamMatcher.QueryParameterMatchSpecifier = &envoy_route_v3.QueryParameterMatcher_StringMatch{
-			StringMatch: &envoy_matcher_v3.StringMatcher{
-				MatchPattern: &envoy_matcher_v3.StringMatcher_SafeRegex{
-					SafeRegex: makeEnvoyRegexMatch(psMatch.GetRegex()),
-				},
-			},
-		}
-	case *pbproxystate.QueryParameterMatch_Present:
-		envoyQueryParamMatcher.QueryParameterMatchSpecifier = &envoy_route_v3.QueryParameterMatcher_PresentMatch{
-			PresentMatch: true,
-		}
-	default:
-		// This shouldn't be possible considering the types of QueryMatch
-		return nil
-	}
-
-	return envoyQueryParamMatcher
-}
-
-// TODO (dans): Will this always be envoy_route_v3.Route_Route?
-// Definitely for connect proxies this is the only option.
-func (pr *ProxyResources) makeEnvoyRouteActionFromProxystateRouteDestination(psRouteDestination *pbproxystate.RouteDestination) *envoy_route_v3.Route_Route {
-	envoyRouteRoute := &envoy_route_v3.Route_Route{
-		Route: &envoy_route_v3.RouteAction{},
-	}
-
-	switch psRouteDestination.Destination.(type) {
-	case *pbproxystate.RouteDestination_Cluster:
-		psCluster := psRouteDestination.GetCluster()
-		envoyRouteRoute.Route.ClusterSpecifier = &envoy_route_v3.RouteAction_Cluster{
-			Cluster: psCluster.GetName(),
-		}
-		clusters, _ := pr.makeClusters(psCluster.Name)
-		pr.envoyResources[xdscommon.ClusterType] = append(pr.envoyResources[xdscommon.ClusterType], clusters...)
-
-	case *pbproxystate.RouteDestination_WeightedClusters:
-		psWeightedClusters := psRouteDestination.GetWeightedClusters()
-		envoyClusters := make([]*envoy_route_v3.WeightedCluster_ClusterWeight, 0, len(psWeightedClusters.GetClusters()))
-		totalWeight := 0
-		for _, psCluster := range psWeightedClusters.GetClusters() {
-			clusters, _ := pr.makeClusters(psCluster.Name)
-			pr.envoyResources[xdscommon.ClusterType] = append(pr.envoyResources[xdscommon.ClusterType], clusters...)
-			totalWeight += int(psCluster.Weight.GetValue())
-			envoyClusters = append(envoyClusters, makeEnvoyClusterWeightFromProxystateWeightedCluster(psCluster))
-		}
-		var envoyWeightScale *wrapperspb.UInt32Value
-		if totalWeight == 10000 {
-			envoyWeightScale = response.MakeUint32Value(10000)
-		}
-
-		envoyRouteRoute.Route.ClusterSpecifier = &envoy_route_v3.RouteAction_WeightedClusters{
-			WeightedClusters: &envoy_route_v3.WeightedCluster{
-				Clusters:    envoyClusters,
-				TotalWeight: envoyWeightScale,
-			},
-		}
-	default:
-		// This shouldn't be possible considering the types of Destination
-		return nil
-	}
-
-	injectEnvoyRouteActionWithProxystateDestinationConfig(envoyRouteRoute.Route, psRouteDestination.GetDestinationConfiguration())
-
-	if psRouteDestination.GetDestinationConfiguration() != nil {
-		config := psRouteDestination.GetDestinationConfiguration()
-		action := envoyRouteRoute.Route
-
-		action.PrefixRewrite = config.GetPrefixRewrite()
-
-		if config.GetTimeoutConfig().GetTimeout() != nil {
-			action.Timeout = config.GetTimeoutConfig().GetTimeout()
-		}
-
-		if config.GetTimeoutConfig().GetTimeout() != nil {
-			action.Timeout = config.GetTimeoutConfig().GetTimeout()
-		}
-
-		if config.GetTimeoutConfig().GetIdleTimeout() != nil {
-			action.IdleTimeout = config.GetTimeoutConfig().GetIdleTimeout()
-		}
-
-		if config.GetRetryPolicy() != nil {
-			action.RetryPolicy = makeEnvoyRetryPolicyFromProxystateRetryPolicy(config.GetRetryPolicy())
-		}
-	}
-
-	return envoyRouteRoute
-}
-
-func makeEnvoyClusterWeightFromProxystateWeightedCluster(cluster *pbproxystate.L7WeightedDestinationCluster) *envoy_route_v3.WeightedCluster_ClusterWeight {
-	envoyClusterWeight := &envoy_route_v3.WeightedCluster_ClusterWeight{
-		Name:   cluster.GetName(),
-		Weight: cluster.GetWeight(),
-	}
-
-	for _, hm := range cluster.GetHeaderMutations() {
-		injectEnvoyClusterWeightWithProxystateHeaderMutation(envoyClusterWeight, hm)
-	}
-
-	return envoyClusterWeight
-}
-
-func injectEnvoyClusterWeightWithProxystateHeaderMutation(envoyClusterWeight *envoy_route_v3.WeightedCluster_ClusterWeight, mutation *pbproxystate.HeaderMutation) {
-	mutation.GetAction()
-	switch mutation.GetAction().(type) {
-	case *pbproxystate.HeaderMutation_RequestHeaderAdd:
-		action := mutation.GetRequestHeaderAdd()
-		header := action.GetHeader()
-		app := action.GetAppendAction() == pbproxystate.AppendAction_APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD
-
-		hvo := &envoy_core_v3.HeaderValueOption{
-			Header: &envoy_core_v3.HeaderValue{
-				Key:   header.GetKey(),
-				Value: header.GetValue(),
-			},
-			Append: response.MakeBoolValue(app),
-		}
-		envoyClusterWeight.RequestHeadersToAdd = append(envoyClusterWeight.RequestHeadersToAdd, hvo)
-
-	case *pbproxystate.HeaderMutation_RequestHeaderRemove:
-		action := mutation.GetRequestHeaderRemove()
-		envoyClusterWeight.RequestHeadersToRemove = append(envoyClusterWeight.RequestHeadersToRemove, action.GetHeaderKeys()...)
-
-	case *pbproxystate.HeaderMutation_ResponseHeaderAdd:
-		action := mutation.GetResponseHeaderAdd()
-		header := action.GetHeader()
-		app := action.GetAppendAction() == pbproxystate.AppendAction_APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD
-
-		hvo := &envoy_core_v3.HeaderValueOption{
-			Header: &envoy_core_v3.HeaderValue{
-				Key:   header.GetKey(),
-				Value: header.GetValue(),
-			},
-			Append: response.MakeBoolValue(app),
-		}
-		envoyClusterWeight.ResponseHeadersToAdd = append(envoyClusterWeight.ResponseHeadersToAdd, hvo)
-
-	case *pbproxystate.HeaderMutation_ResponseHeaderRemove:
-		action := mutation.GetResponseHeaderRemove()
-		envoyClusterWeight.ResponseHeadersToRemove = append(envoyClusterWeight.ResponseHeadersToRemove, action.GetHeaderKeys()...)
-
-	default:
-		// This shouldn't be possible considering the types of Destination
-		return
-	}
-}
-
-func injectEnvoyRouteActionWithProxystateDestinationConfig(envoyAction *envoy_route_v3.RouteAction, config *pbproxystate.DestinationConfiguration) {
-	if config == nil {
-		return
-	}
-
-	if len(config.GetHashPolicies()) > 0 {
-		envoyAction.HashPolicy = make([]*envoy_route_v3.RouteAction_HashPolicy, 0, len(config.GetHashPolicies()))
-	}
-	for _, policy := range config.GetHashPolicies() {
-		envoyPolicy := makeEnvoyHashPolicyFromProxystateLBHashPolicy(policy)
-		envoyAction.HashPolicy = append(envoyAction.HashPolicy, envoyPolicy)
-	}
-
-	if config.AutoHostRewrite != nil {
-		envoyAction.HostRewriteSpecifier = &envoy_route_v3.RouteAction_AutoHostRewrite{
-			AutoHostRewrite: config.AutoHostRewrite,
-		}
-	}
-}
-
-func makeEnvoyHashPolicyFromProxystateLBHashPolicy(psPolicy *pbproxystate.LoadBalancerHashPolicy) *envoy_route_v3.RouteAction_HashPolicy {
-	switch psPolicy.GetPolicy().(type) {
-	case *pbproxystate.LoadBalancerHashPolicy_ConnectionProperties:
-		return &envoy_route_v3.RouteAction_HashPolicy{
-			PolicySpecifier: &envoy_route_v3.RouteAction_HashPolicy_ConnectionProperties_{
-				ConnectionProperties: &envoy_route_v3.RouteAction_HashPolicy_ConnectionProperties{
-					SourceIp: true, // always true
-				},
-			},
-			Terminal: psPolicy.GetConnectionProperties().GetTerminal(),
-		}
-
-	case *pbproxystate.LoadBalancerHashPolicy_Header:
-		return &envoy_route_v3.RouteAction_HashPolicy{
-			PolicySpecifier: &envoy_route_v3.RouteAction_HashPolicy_Header_{
-				Header: &envoy_route_v3.RouteAction_HashPolicy_Header{
-					HeaderName: psPolicy.GetHeader().GetName(),
-				},
-			},
-			Terminal: psPolicy.GetHeader().GetTerminal(),
-		}
-
-	case *pbproxystate.LoadBalancerHashPolicy_Cookie:
-		cookie := &envoy_route_v3.RouteAction_HashPolicy_Cookie{
-			Name: psPolicy.GetCookie().GetName(),
-			Path: psPolicy.GetCookie().GetPath(),
-			Ttl:  psPolicy.GetCookie().GetTtl(),
-		}
-
-		return &envoy_route_v3.RouteAction_HashPolicy{
-			PolicySpecifier: &envoy_route_v3.RouteAction_HashPolicy_Cookie_{
-				Cookie: cookie,
-			},
-			Terminal: psPolicy.GetCookie().GetTerminal(),
-		}
-
-	case *pbproxystate.LoadBalancerHashPolicy_QueryParameter:
-		return &envoy_route_v3.RouteAction_HashPolicy{
-			PolicySpecifier: &envoy_route_v3.RouteAction_HashPolicy_QueryParameter_{
-				QueryParameter: &envoy_route_v3.RouteAction_HashPolicy_QueryParameter{
-					Name: psPolicy.GetQueryParameter().GetName(),
-				},
-			},
-			Terminal: psPolicy.GetQueryParameter().GetTerminal(),
-		}
-	}
-	// This shouldn't be possible considering the types of LoadBalancerPolicy
-	return nil
-}
-
-func makeEnvoyRetryPolicyFromProxystateRetryPolicy(psRetryPolicy *pbproxystate.RetryPolicy) *envoy_route_v3.RetryPolicy {
-	return &envoy_route_v3.RetryPolicy{
-		NumRetries:           psRetryPolicy.GetNumRetries(),
-		RetriableStatusCodes: psRetryPolicy.GetRetriableStatusCodes(),
-		RetryOn:              psRetryPolicy.GetRetryOn(),
-	}
-}
-
-func injectEnvoyRouteRuleWithProxystateHeaderMutation(envoyRouteRule *envoy_route_v3.Route, mutation *pbproxystate.HeaderMutation) {
-	mutation.GetAction()
-	switch mutation.GetAction().(type) {
-	case *pbproxystate.HeaderMutation_RequestHeaderAdd:
-		action := mutation.GetRequestHeaderAdd()
-		header := action.GetHeader()
-		app := action.GetAppendAction() == pbproxystate.AppendAction_APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD
-
-		hvo := &envoy_core_v3.HeaderValueOption{
-			Header: &envoy_core_v3.HeaderValue{
-				Key:   header.GetKey(),
-				Value: header.GetValue(),
-			},
-			Append: response.MakeBoolValue(app),
-		}
-		envoyRouteRule.RequestHeadersToAdd = append(envoyRouteRule.RequestHeadersToAdd, hvo)
-
-	case *pbproxystate.HeaderMutation_RequestHeaderRemove:
-		action := mutation.GetRequestHeaderRemove()
-		envoyRouteRule.RequestHeadersToRemove = append(envoyRouteRule.RequestHeadersToRemove, action.GetHeaderKeys()...)
-
-	case *pbproxystate.HeaderMutation_ResponseHeaderAdd:
-		action := mutation.GetResponseHeaderAdd()
-		header := action.GetHeader()
-		app := action.GetAppendAction() == pbproxystate.AppendAction_APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD
-
-		hvo := &envoy_core_v3.HeaderValueOption{
-			Header: &envoy_core_v3.HeaderValue{
-				Key:   header.GetKey(),
-				Value: header.GetValue(),
-			},
-			Append: response.MakeBoolValue(app),
-		}
-		envoyRouteRule.ResponseHeadersToAdd = append(envoyRouteRule.ResponseHeadersToAdd, hvo)
-
-	case *pbproxystate.HeaderMutation_ResponseHeaderRemove:
-		action := mutation.GetResponseHeaderRemove()
-		envoyRouteRule.ResponseHeadersToRemove = append(envoyRouteRule.ResponseHeadersToRemove, action.GetHeaderKeys()...)
-
-	default:
-		// This shouldn't be possible considering the types of Destination
-		return
-	}
-}
-
-func injectEnvoyVirtualHostWithProxystateHeaderMutation(envoyVirtualHost *envoy_route_v3.VirtualHost, mutation *pbproxystate.HeaderMutation) {
-	mutation.GetAction()
-	switch mutation.GetAction().(type) {
-	case *pbproxystate.HeaderMutation_RequestHeaderAdd:
-		action := mutation.GetRequestHeaderAdd()
-		header := action.GetHeader()
-		app := action.GetAppendAction() == pbproxystate.AppendAction_APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD
-
-		hvo := &envoy_core_v3.HeaderValueOption{
-			Header: &envoy_core_v3.HeaderValue{
-				Key:   header.GetKey(),
-				Value: header.GetValue(),
-			},
-			Append: response.MakeBoolValue(app),
-		}
-		envoyVirtualHost.RequestHeadersToAdd = append(envoyVirtualHost.RequestHeadersToAdd, hvo)
-
-	case *pbproxystate.HeaderMutation_RequestHeaderRemove:
-		action := mutation.GetRequestHeaderRemove()
-		envoyVirtualHost.RequestHeadersToRemove = append(envoyVirtualHost.RequestHeadersToRemove, action.GetHeaderKeys()...)
-
-	case *pbproxystate.HeaderMutation_ResponseHeaderAdd:
-		action := mutation.GetResponseHeaderAdd()
-		header := action.GetHeader()
-		app := action.GetAppendAction() == pbproxystate.AppendAction_APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD
-
-		hvo := &envoy_core_v3.HeaderValueOption{
-			Header: &envoy_core_v3.HeaderValue{
-				Key:   header.GetKey(),
-				Value: header.GetValue(),
-			},
-			Append: response.MakeBoolValue(app),
-		}
-		envoyVirtualHost.ResponseHeadersToAdd = append(envoyVirtualHost.ResponseHeadersToAdd, hvo)
-
-	case *pbproxystate.HeaderMutation_ResponseHeaderRemove:
-		action := mutation.GetResponseHeaderRemove()
-		envoyVirtualHost.ResponseHeadersToRemove = append(envoyVirtualHost.ResponseHeadersToRemove, action.GetHeaderKeys()...)
-
-	default:
-		// This shouldn't be possible considering the types of Destination
-		return
-	}
-}
diff --git a/agent/xdsv2/testdata/input/l4-single-implicit-destination-tproxy.golden b/agent/xdsv2/testdata/input/l4-single-implicit-destination-tproxy.golden
deleted file mode 100644
index feaa68bd3c238..0000000000000
--- a/agent/xdsv2/testdata/input/l4-single-implicit-destination-tproxy.golden
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-  "proxyState": {
-    "identity": {
-      "tenancy": {
-        "partition": "default",
-        "namespace": "default",
-        "peerName": "local"
-      },
-      "name": "test-identity"
-    },
-    "listeners": [
-      {
-        "name": "outbound_listener",
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "127.0.0.1",
-          "port": 15001
-        },
-        "routers": [
-          {
-            "match": {
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ],
-              "destinationPort": 8080
-            },
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-1.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-1.default.default.dc1"
-            }
-          }
-        ],
-        "capabilities": [
-          "CAPABILITY_TRANSPARENT"
-        ],
-        "defaultRouter": {
-          "l4": {
-            "cluster": {
-              "name": "original-destination"
-            },
-            "statPrefix": "upstream.original-destination"
-          }
-        }
-      }
-    ],
-    "clusters": {
-      "tcp.api-1.default.dc1.internal.foo.consul": {
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                },
-                "sni": "api-1.default.dc1.internal.foo.consul"
-              },
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        }
-      }
-    },
-    "leafCertificates": {
-      "test-identity": {
-        "cert": "cert1",
-        "key": "key1"
-      }
-    },
-    "trustBundles": {
-      "local": {
-        "trustDomain": "foo.consul",
-        "roots": [
-          "root1"
-        ]
-      }
-    }
-  },
-  "requiredEndpoints": {
-    "api-1.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v1alpha1",
-          "kind": "ServiceEndpoints"
-        },
-        "tenancy": {
-          "partition": "default",
-          "namespace": "default",
-          "peerName": "local"
-        }
-      },
-      "port": "mesh"
-    }
-  }
-}
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/output/clusters/l4-single-implicit-destination-tproxy.golden b/agent/xdsv2/testdata/output/clusters/l4-single-implicit-destination-tproxy.golden
deleted file mode 100644
index 611c863c3af9b..0000000000000
--- a/agent/xdsv2/testdata/output/clusters/l4-single-implicit-destination-tproxy.golden
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "resources":  [
-    {
-      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name":  "tcp.api-1.default.dc1.internal.foo.consul",
-      "type":  "EDS",
-      "edsClusterConfig":  {
-        "edsConfig":  {
-          "ads":  {},
-          "resourceApiVersion":  "V3"
-        }
-      },
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "name": "tcp.api-1.default.dc1.internal.foo.consul",
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "alpnProtocols": [
-              "consul~tcp"
-            ],
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "cert1\n"
-                },
-                "privateKey": {
-                  "inlineString": "key1\n"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "validationContext": {
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "root1\n"
-              }
-            }
-          },
-          "sni": "api-1.default.dc1.internal.foo.consul"
-        }
-      },
-      "type": "EDS"
-    }
-  ],
-  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "nonce":  "00000001"
-}
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/output/listeners/l4-single-implicit-destination-tproxy.golden b/agent/xdsv2/testdata/output/listeners/l4-single-implicit-destination-tproxy.golden
deleted file mode 100644
index d34b4e610793b..0000000000000
--- a/agent/xdsv2/testdata/output/listeners/l4-single-implicit-destination-tproxy.golden
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "resources":  [
-    {
-      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "name":  "outbound_listener",
-      "address":  {
-        "socketAddress":  {
-          "address":  "127.0.0.1",
-          "portValue":  15001
-        }
-      },
-      "defaultFilterChain": {
-        "filters": [
-          {
-            "name": "envoy.filters.network.tcp_proxy",
-            "typedConfig": {
-              "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-              "cluster": "original-destination",
-              "statPrefix": "upstream.original-destination"
-            }
-          }
-        ]
-      },
-      "filterChains":  [
-        {
-          "filterChainMatch":  {
-            "destinationPort":  8080,
-            "prefixRanges":  [
-              {
-                "addressPrefix":  "1.1.1.1",
-                "prefixLen":  32
-              }
-            ]
-          },
-          "filters":  [
-            {
-              "name":  "envoy.filters.network.tcp_proxy",
-              "typedConfig":  {
-                "@type":  "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "statPrefix":  "upstream.tcp.api-1.default.default.dc1",
-                "cluster":  "tcp.api-1.default.dc1.internal.foo.consul"
-              }
-            }
-          ]
-        }
-      ],
-      "listenerFilters":  [
-        {
-          "name":  "envoy.filters.listener.original_dst",
-          "typedConfig":  {
-            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.original_dst.v3.OriginalDst"
-          }
-        }
-      ],
-      "trafficDirection":  "OUTBOUND"
-    }
-  ],
-  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "nonce":  "00000001"
-}
\ No newline at end of file
diff --git a/api/LICENSE b/api/LICENSE
deleted file mode 100644
index 7c5baa45e1c29..0000000000000
--- a/api/LICENSE
+++ /dev/null
@@ -1,365 +0,0 @@
-Copyright (c) 2020 HashiCorp, Inc.
-
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. "Contributor"
-
-     means each individual or legal entity that creates, contributes to the
-     creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-
-     means the combination of the Contributions of others (if any) used by a
-     Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-
-     means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-
-     means Source Code Form to which the initial Contributor has attached the
-     notice in Exhibit A, the Executable Form of such Source Code Form, and
-     Modifications of such Source Code Form, in each case including portions
-     thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-     means
-
-     a. that the initial Contributor has attached the notice described in
-        Exhibit B to the Covered Software; or
-
-     b. that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the terms of
-        a Secondary License.
-
-1.6. "Executable Form"
-
-     means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-
-     means a work that combines Covered Software with other material, in a
-     separate file or files, that is not Covered Software.
-
-1.8. "License"
-
-     means this document.
-
-1.9. "Licensable"
-
-     means having the right to grant, to the maximum extent possible, whether
-     at the time of the initial grant or subsequently, any and all of the
-     rights conveyed by this License.
-
-1.10. "Modifications"
-
-     means any of the following:
-
-     a. any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered Software; or
-
-     b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. "Patent Claims" of a Contributor
-
-      means any patent claim(s), including without limitation, method,
-      process, and apparatus claims, in any patent Licensable by such
-      Contributor that would be infringed, but for the grant of the License,
-      by the making, using, selling, offering for sale, having made, import,
-      or transfer of either its Contributions or its Contributor Version.
-
-1.12. "Secondary License"
-
-      means either the GNU General Public License, Version 2.0, the GNU Lesser
-      General Public License, Version 2.1, the GNU Affero General Public
-      License, Version 3.0, or any later versions of those licenses.
-
-1.13. "Source Code Form"
-
-      means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-
-      means an individual or a legal entity exercising rights under this
-      License. For legal entities, "You" includes any entity that controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, "control" means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-     Each Contributor hereby grants You a world-wide, royalty-free,
-     non-exclusive license:
-
-     a. under intellectual property rights (other than patent or trademark)
-        Licensable by such Contributor to use, reproduce, make available,
-        modify, display, perform, distribute, and otherwise exploit its
-        Contributions, either on an unmodified basis, with Modifications, or
-        as part of a Larger Work; and
-
-     b. under Patent Claims of such Contributor to make, use, sell, offer for
-        sale, have made, import, and otherwise transfer either its
-        Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-     The licenses granted in Section 2.1 with respect to any Contribution
-     become effective for each Contribution on the date the Contributor first
-     distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-     The licenses granted in this Section 2 are the only rights granted under
-     this License. No additional rights or licenses will be implied from the
-     distribution or licensing of Covered Software under this License.
-     Notwithstanding Section 2.1(b) above, no patent license is granted by a
-     Contributor:
-
-     a. for any code that a Contributor has removed from Covered Software; or
-
-     b. for infringements caused by: (i) Your and any other third party's
-        modifications of Covered Software, or (ii) the combination of its
-        Contributions with other software (except as part of its Contributor
-        Version); or
-
-     c. under Patent Claims infringed by Covered Software in the absence of
-        its Contributions.
-
-     This License does not grant any rights in the trademarks, service marks,
-     or logos of any Contributor (except as may be necessary to comply with
-     the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-     No Contributor makes additional grants as a result of Your choice to
-     distribute the Covered Software under a subsequent version of this
-     License (see Section 10.2) or under the terms of a Secondary License (if
-     permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-     Each Contributor represents that the Contributor believes its
-     Contributions are its original creation(s) or it has sufficient rights to
-     grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-     This License is not intended to limit any rights You have under
-     applicable copyright doctrines of fair use, fair dealing, or other
-     equivalents.
-
-2.7. Conditions
-
-     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
-     Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-     All distribution of Covered Software in Source Code Form, including any
-     Modifications that You create or to which You contribute, must be under
-     the terms of this License. You must inform recipients that the Source
-     Code Form of the Covered Software is governed by the terms of this
-     License, and how they can obtain a copy of this License. You may not
-     attempt to alter or restrict the recipients' rights in the Source Code
-     Form.
-
-3.2. Distribution of Executable Form
-
-     If You distribute Covered Software in Executable Form then:
-
-     a. such Covered Software must also be made available in Source Code Form,
-        as described in Section 3.1, and You must inform recipients of the
-        Executable Form how they can obtain a copy of such Source Code Form by
-        reasonable means in a timely manner, at a charge no more than the cost
-        of distribution to the recipient; and
-
-     b. You may distribute such Executable Form under the terms of this
-        License, or sublicense it under different terms, provided that the
-        license for the Executable Form does not attempt to limit or alter the
-        recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-     You may create and distribute a Larger Work under terms of Your choice,
-     provided that You also comply with the requirements of this License for
-     the Covered Software. If the Larger Work is a combination of Covered
-     Software with a work governed by one or more Secondary Licenses, and the
-     Covered Software is not Incompatible With Secondary Licenses, this
-     License permits You to additionally distribute such Covered Software
-     under the terms of such Secondary License(s), so that the recipient of
-     the Larger Work may, at their option, further distribute the Covered
-     Software under the terms of either this License or such Secondary
-     License(s).
-
-3.4. Notices
-
-     You may not remove or alter the substance of any license notices
-     (including copyright notices, patent notices, disclaimers of warranty, or
-     limitations of liability) contained within the Source Code Form of the
-     Covered Software, except that You may alter any license notices to the
-     extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-     You may choose to offer, and to charge a fee for, warranty, support,
-     indemnity or liability obligations to one or more recipients of Covered
-     Software. However, You may do so only on Your own behalf, and not on
-     behalf of any Contributor. You must make it absolutely clear that any
-     such warranty, support, indemnity, or liability obligation is offered by
-     You alone, and You hereby agree to indemnify every Contributor for any
-     liability incurred by such Contributor as a result of warranty, support,
-     indemnity or liability terms You offer. You may include additional
-     disclaimers of warranty and limitations of liability specific to any
-     jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-   If it is impossible for You to comply with any of the terms of this License
-   with respect to some or all of the Covered Software due to statute,
-   judicial order, or regulation then You must: (a) comply with the terms of
-   this License to the maximum extent possible; and (b) describe the
-   limitations and the code they affect. Such description must be placed in a
-   text file included with all distributions of the Covered Software under
-   this License. Except to the extent prohibited by statute or regulation,
-   such description must be sufficiently detailed for a recipient of ordinary
-   skill to be able to understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
-     fail to comply with any of its terms. However, if You become compliant,
-     then the rights granted under this License from a particular Contributor
-     are reinstated (a) provisionally, unless and until such Contributor
-     explicitly and finally terminates Your grants, and (b) on an ongoing
-     basis, if such Contributor fails to notify You of the non-compliance by
-     some reasonable means prior to 60 days after You have come back into
-     compliance. Moreover, Your grants from a particular Contributor are
-     reinstated on an ongoing basis if such Contributor notifies You of the
-     non-compliance by some reasonable means, this is the first time You have
-     received notice of non-compliance with this License from such
-     Contributor, and You become compliant prior to 30 days after Your receipt
-     of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-     infringement claim (excluding declaratory judgment actions,
-     counter-claims, and cross-claims) alleging that a Contributor Version
-     directly or indirectly infringes any patent, then the rights granted to
-     You by any and all Contributors for the Covered Software under Section
-     2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
-     license agreements (excluding distributors and resellers) which have been
-     validly granted by You or Your distributors under this License prior to
-     termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-   Covered Software is provided under this License on an "as is" basis,
-   without warranty of any kind, either expressed, implied, or statutory,
-   including, without limitation, warranties that the Covered Software is free
-   of defects, merchantable, fit for a particular purpose or non-infringing.
-   The entire risk as to the quality and performance of the Covered Software
-   is with You. Should any Covered Software prove defective in any respect,
-   You (not any Contributor) assume the cost of any necessary servicing,
-   repair, or correction. This disclaimer of warranty constitutes an essential
-   part of this License. No use of  any Covered Software is authorized under
-   this License except under this disclaimer.
-
-7. Limitation of Liability
-
-   Under no circumstances and under no legal theory, whether tort (including
-   negligence), contract, or otherwise, shall any Contributor, or anyone who
-   distributes Covered Software as permitted above, be liable to You for any
-   direct, indirect, special, incidental, or consequential damages of any
-   character including, without limitation, damages for lost profits, loss of
-   goodwill, work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses, even if such party shall have been
-   informed of the possibility of such damages. This limitation of liability
-   shall not apply to liability for death or personal injury resulting from
-   such party's negligence to the extent applicable law prohibits such
-   limitation. Some jurisdictions do not allow the exclusion or limitation of
-   incidental or consequential damages, so this exclusion and limitation may
-   not apply to You.
-
-8. Litigation
-
-   Any litigation relating to this License may be brought only in the courts
-   of a jurisdiction where the defendant maintains its principal place of
-   business and such litigation shall be governed by laws of that
-   jurisdiction, without reference to its conflict-of-law provisions. Nothing
-   in this Section shall prevent a party's ability to bring cross-claims or
-   counter-claims.
-
-9. Miscellaneous
-
-   This License represents the complete agreement concerning the subject
-   matter hereof. If any provision of this License is held to be
-   unenforceable, such provision shall be reformed only to the extent
-   necessary to make it enforceable. Any law or regulation which provides that
-   the language of a contract shall be construed against the drafter shall not
-   be used to construe this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
-      Mozilla Foundation is the license steward. Except as provided in Section
-      10.3, no one other than the license steward has the right to modify or
-      publish new versions of this License. Each version will be given a
-      distinguishing version number.
-
-10.2. Effect of New Versions
-
-      You may distribute the Covered Software under the terms of the version
-      of the License under which You originally received the Covered Software,
-      or under the terms of any subsequent version published by the license
-      steward.
-
-10.3. Modified Versions
-
-      If you create software not governed by this License, and you want to
-      create a new license for such software, you may create and use a
-      modified version of this License if you rename the license and remove
-      any references to the name of the license steward (except to note that
-      such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-      Licenses If You choose to distribute Source Code Form that is
-      Incompatible With Secondary Licenses under the terms of this version of
-      the License, the notice described in Exhibit B of this License must be
-      attached.
-
-Exhibit A - Source Code Form License Notice
-
-      This Source Code Form is subject to the
-      terms of the Mozilla Public License, v.
-      2.0. If a copy of the MPL was not
-      distributed with this file, You can
-      obtain one at
-      http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file,
-then You may include the notice in a location (such as a LICENSE file in a
-relevant directory) where a recipient would be likely to look for such a
-notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
-
-      This Source Code Form is "Incompatible
-      With Secondary Licenses", as defined by
-      the Mozilla Public License, v. 2.0.
-
diff --git a/api/acl.go b/api/acl.go
index 47b38eb6ca625..44533b999c416 100644
--- a/api/acl.go
+++ b/api/acl.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -19,13 +16,6 @@ const (
 
 	// ACLManagementType is the management type token
 	ACLManagementType = "management"
-
-	// ACLTemplatedPolicy names
-	ACLTemplatedPolicyServiceName          = "builtin/service"
-	ACLTemplatedPolicyNodeName             = "builtin/node"
-	ACLTemplatedPolicyDNSName              = "builtin/dns"
-	ACLTemplatedPolicyNomadServerName      = "builtin/nomad-server"
-	ACLTemplatedPolicyWorkloadIdentityName = "builtin/workload-identity"
 )
 
 type ACLLink struct {
@@ -47,7 +37,6 @@ type ACLToken struct {
 	Roles             []*ACLTokenRoleLink   `json:",omitempty"`
 	ServiceIdentities []*ACLServiceIdentity `json:",omitempty"`
 	NodeIdentities    []*ACLNodeIdentity    `json:",omitempty"`
-	TemplatedPolicies []*ACLTemplatedPolicy `json:",omitempty"`
 	Local             bool
 	AuthMethod        string        `json:",omitempty"`
 	ExpirationTTL     time.Duration `json:",omitempty"`
@@ -96,7 +85,6 @@ type ACLTokenListEntry struct {
 	Roles             []*ACLTokenRoleLink   `json:",omitempty"`
 	ServiceIdentities []*ACLServiceIdentity `json:",omitempty"`
 	NodeIdentities    []*ACLNodeIdentity    `json:",omitempty"`
-	TemplatedPolicies []*ACLTemplatedPolicy `json:",omitempty"`
 	Local             bool
 	AuthMethod        string     `json:",omitempty"`
 	ExpirationTime    *time.Time `json:",omitempty"`
@@ -157,27 +145,6 @@ type ACLNodeIdentity struct {
 	Datacenter string
 }
 
-// ACLTemplatedPolicy represents a template used to generate a `synthetic` policy
-// given some input variables.
-type ACLTemplatedPolicy struct {
-	TemplateName      string
-	TemplateVariables *ACLTemplatedPolicyVariables `json:",omitempty"`
-
-	// Datacenters are an artifact of Nodeidentity & ServiceIdentity.
-	// It is used to facilitate the future migration away from both
-	Datacenters []string `json:",omitempty"`
-}
-
-type ACLTemplatedPolicyResponse struct {
-	TemplateName string
-	Schema       string
-	Template     string
-}
-
-type ACLTemplatedPolicyVariables struct {
-	Name string
-}
-
 // ACLPolicy represents an ACL Policy.
 type ACLPolicy struct {
 	ID          string
@@ -226,7 +193,6 @@ type ACLRole struct {
 	Policies          []*ACLRolePolicyLink  `json:",omitempty"`
 	ServiceIdentities []*ACLServiceIdentity `json:",omitempty"`
 	NodeIdentities    []*ACLNodeIdentity    `json:",omitempty"`
-	TemplatedPolicies []*ACLTemplatedPolicy `json:",omitempty"`
 	Hash              []byte
 	CreateIndex       uint64
 	ModifyIndex       uint64
@@ -249,12 +215,6 @@ const (
 
 	// BindingRuleBindTypeRole binds to pre-existing roles with the given name.
 	BindingRuleBindTypeRole BindingRuleBindType = "role"
-
-	// BindingRuleBindTypeNode binds to a node identity with given name.
-	BindingRuleBindTypeNode BindingRuleBindType = "node"
-
-	// BindingRuleBindTypeTemplatedPolicy binds to a templated policy with given template name and variables.
-	BindingRuleBindTypeTemplatedPolicy BindingRuleBindType = "templated-policy"
 )
 
 type ACLBindingRule struct {
@@ -264,7 +224,6 @@ type ACLBindingRule struct {
 	Selector    string
 	BindType    BindingRuleBindType
 	BindName    string
-	BindVars    *ACLTemplatedPolicyVariables `json:",omitempty"`
 
 	CreateIndex uint64
 	ModifyIndex uint64
@@ -1661,78 +1620,3 @@ func (a *ACL) OIDCCallback(auth *ACLOIDCCallbackParams, q *WriteOptions) (*ACLTo
 	}
 	return &out, wm, nil
 }
-
-// TemplatedPolicyReadByName retrieves the templated policy details (by name). Returns nil if not found.
-func (a *ACL) TemplatedPolicyReadByName(templateName string, q *QueryOptions) (*ACLTemplatedPolicyResponse, *QueryMeta, error) {
-	r := a.c.newRequest("GET", "/v1/acl/templated-policy/name/"+templateName)
-	r.setQueryOptions(q)
-	rtt, resp, err := a.c.doRequest(r)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer closeResponseBody(resp)
-	found, resp, err := requireNotFoundOrOK(resp)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	qm := &QueryMeta{}
-	parseQueryMeta(resp, qm)
-	qm.RequestTime = rtt
-
-	if !found {
-		return nil, qm, nil
-	}
-
-	var out ACLTemplatedPolicyResponse
-	if err := decodeBody(resp, &out); err != nil {
-		return nil, nil, err
-	}
-
-	return &out, qm, nil
-}
-
-// TemplatedPolicyList retrieves a listing of all templated policies.
-func (a *ACL) TemplatedPolicyList(q *QueryOptions) (map[string]ACLTemplatedPolicyResponse, *QueryMeta, error) {
-	r := a.c.newRequest("GET", "/v1/acl/templated-policies")
-	r.setQueryOptions(q)
-	rtt, resp, err := a.c.doRequest(r)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer closeResponseBody(resp)
-	if err := requireOK(resp); err != nil {
-		return nil, nil, err
-	}
-	qm := &QueryMeta{}
-	parseQueryMeta(resp, qm)
-	qm.RequestTime = rtt
-
-	var entries map[string]ACLTemplatedPolicyResponse
-	if err := decodeBody(resp, &entries); err != nil {
-		return nil, nil, err
-	}
-	return entries, qm, nil
-}
-
-// TemplatedPolicyPreview is used to preview the policy rendered by the templated policy.
-func (a *ACL) TemplatedPolicyPreview(tp *ACLTemplatedPolicy, q *WriteOptions) (*ACLPolicy, *WriteMeta, error) {
-	r := a.c.newRequest("POST", "/v1/acl/templated-policy/preview/"+tp.TemplateName)
-	r.setWriteOptions(q)
-	r.obj = tp.TemplateVariables
-
-	rtt, resp, err := a.c.doRequest(r)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer closeResponseBody(resp)
-	if err := requireOK(resp); err != nil {
-		return nil, nil, err
-	}
-	wm := &WriteMeta{RequestTime: rtt}
-	var out ACLPolicy
-	if err := decodeBody(resp, &out); err != nil {
-		return nil, nil, err
-	}
-	return &out, wm, nil
-}
diff --git a/api/acl_test.go b/api/acl_test.go
index d5ff37c1f75bb..b4af8184451bf 100644
--- a/api/acl_test.go
+++ b/api/acl_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -633,7 +630,8 @@ func TestAPI_ACLToken_ListFiltered(t *testing.T) {
 		ServiceName: "s",
 		AuthMethod:  "a",
 	}, nil)
-	require.ErrorContains(t, err, "can only filter by one of")
+	require.NotNil(t, err)
+	require.Contains(t, err.Error(), "can only filter by one of")
 }
 
 func TestAPI_ACLToken_Clone(t *testing.T) {
diff --git a/api/agent.go b/api/agent.go
index 24e2c50d6499c..df0f43717d918 100644
--- a/api/agent.go
+++ b/api/agent.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -107,8 +104,7 @@ type AgentService struct {
 	Namespace string `json:",omitempty" bexpr:"-" hash:"ignore"`
 	Partition string `json:",omitempty" bexpr:"-" hash:"ignore"`
 	// Datacenter is only ever returned and is ignored if presented.
-	Datacenter string    `json:",omitempty" bexpr:"-" hash:"ignore"`
-	Locality   *Locality `json:",omitempty" bexpr:"-" hash:"ignore"`
+	Datacenter string `json:",omitempty" bexpr:"-" hash:"ignore"`
 }
 
 // AgentServiceChecksInfo returns information about a Service and its checks
@@ -297,7 +293,6 @@ type AgentServiceRegistration struct {
 	Connect           *AgentServiceConnect            `json:",omitempty"`
 	Namespace         string                          `json:",omitempty" bexpr:"-" hash:"ignore"`
 	Partition         string                          `json:",omitempty" bexpr:"-" hash:"ignore"`
-	Locality          *Locality                       `json:",omitempty" bexpr:"-" hash:"ignore"`
 }
 
 // ServiceRegisterOpts is used to pass extra options to the service register.
@@ -307,10 +302,6 @@ type ServiceRegisterOpts struct {
 	// having to manually deregister checks.
 	ReplaceExistingChecks bool
 
-	// Token is used to provide a per-request ACL token
-	// which overrides the agent's default token.
-	Token string
-
 	// ctx is an optional context pass through to the underlying HTTP
 	// request layer. Use WithContext() to set the context.
 	ctx context.Context
@@ -349,7 +340,6 @@ type AgentServiceCheck struct {
 	Method                 string              `json:",omitempty"`
 	Body                   string              `json:",omitempty"`
 	TCP                    string              `json:",omitempty"`
-	TCPUseTLS              bool                `json:",omitempty"`
 	UDP                    string              `json:",omitempty"`
 	Status                 string              `json:",omitempty"`
 	Notes                  string              `json:",omitempty"`
@@ -510,24 +500,6 @@ func (a *Agent) Host() (map[string]interface{}, error) {
 	return out, nil
 }
 
-// Version is used to retrieve information about the running Consul version and build.
-func (a *Agent) Version() (map[string]interface{}, error) {
-	r := a.c.newRequest("GET", "/v1/agent/version")
-	_, resp, err := a.c.doRequest(r)
-	if err != nil {
-		return nil, err
-	}
-	defer closeResponseBody(resp)
-	if err := requireOK(resp); err != nil {
-		return nil, err
-	}
-	var out map[string]interface{}
-	if err := decodeBody(resp, &out); err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 // Metrics is used to query the agent we are speaking to for
 // its current internal metric data
 func (a *Agent) Metrics() (*MetricsInfo, error) {
@@ -839,9 +811,6 @@ func (a *Agent) serviceRegister(service *AgentServiceRegistration, opts ServiceR
 	if opts.ReplaceExistingChecks {
 		r.params.Set("replace-existing-checks", "true")
 	}
-	if opts.Token != "" {
-		r.header.Set("X-Consul-Token", opts.Token)
-	}
 	_, resp, err := a.c.doRequest(r)
 	if err != nil {
 		return err
@@ -998,14 +967,7 @@ func (a *Agent) UpdateTTLOpts(checkID, output, status string, q *QueryOptions) e
 // CheckRegister is used to register a new check with
 // the local agent
 func (a *Agent) CheckRegister(check *AgentCheckRegistration) error {
-	return a.CheckRegisterOpts(check, nil)
-}
-
-// CheckRegisterOpts is used to register a new check with
-// the local agent using query options
-func (a *Agent) CheckRegisterOpts(check *AgentCheckRegistration, q *QueryOptions) error {
 	r := a.c.newRequest("PUT", "/v1/agent/check/register")
-	r.setQueryOptions(q)
 	r.obj = check
 	_, resp, err := a.c.doRequest(r)
 	if err != nil {
@@ -1094,17 +1056,8 @@ func (a *Agent) ForceLeavePrune(node string) error {
 
 // ForceLeaveOpts is used to have the agent eject a failed node or remove it
 // completely from the list of members.
-//
-// DEPRECATED - Use ForceLeaveOptions instead.
 func (a *Agent) ForceLeaveOpts(node string, opts ForceLeaveOpts) error {
-	return a.ForceLeaveOptions(node, opts, nil)
-}
-
-// ForceLeaveOptions is used to have the agent eject a failed node or remove it
-// completely from the list of members. Allows usage of QueryOptions on-top of ForceLeaveOpts
-func (a *Agent) ForceLeaveOptions(node string, opts ForceLeaveOpts, q *QueryOptions) error {
 	r := a.c.newRequest("PUT", "/v1/agent/force-leave/"+node)
-	r.setQueryOptions(q)
 	if opts.Prune {
 		r.params.Set("prune", "1")
 	}
@@ -1393,10 +1346,6 @@ func (a *Agent) UpdateConfigFileRegistrationToken(token string, q *WriteOptions)
 	return a.updateToken("config_file_service_registration", token, q)
 }
 
-func (a *Agent) UpdateDNSToken(token string, q *WriteOptions) (*WriteMeta, error) {
-	return a.updateToken("dns", token, q)
-}
-
 // updateToken can be used to update one of an agent's ACL tokens after the agent has
 // started. The tokens are may not be persisted, so will need to be updated again if
 // the agent is restarted unless the agent is configured to persist them.
diff --git a/api/agent_test.go b/api/agent_test.go
index 511d51607deca..105cc7cc3f74e 100644
--- a/api/agent_test.go
+++ b/api/agent_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -165,21 +162,6 @@ func TestAPI_AgentMembersOpts(t *testing.T) {
 	}
 
 	require.Equal(t, 1, len(members))
-
-	members, err = agent.MembersOpts(MembersOpts{
-		WAN:    true,
-		Filter: `Tags["dc"] == "not-Exist"`,
-	})
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	require.Equal(t, 0, len(members))
-
-	_, err = agent.MembersOpts(MembersOpts{
-		WAN:    true,
-		Filter: `Tags["dc"] == invalid-bexpr-value`,
-	})
-	require.ErrorContains(t, err, "Failed to create boolean expression evaluator")
 }
 
 func TestAPI_AgentMembers(t *testing.T) {
@@ -206,7 +188,7 @@ func TestAPI_AgentServiceAndReplaceChecks(t *testing.T) {
 
 	agent := c.Agent()
 	s.WaitForSerfCheck(t)
-	locality := &Locality{Region: "us-west-1", Zone: "us-west-1a"}
+
 	reg := &AgentServiceRegistration{
 		Name: "foo",
 		ID:   "foo",
@@ -221,7 +203,6 @@ func TestAPI_AgentServiceAndReplaceChecks(t *testing.T) {
 		Check: &AgentServiceCheck{
 			TTL: "15s",
 		},
-		Locality: locality,
 	}
 
 	regupdate := &AgentServiceRegistration{
@@ -234,8 +215,7 @@ func TestAPI_AgentServiceAndReplaceChecks(t *testing.T) {
 				Port:    80,
 			},
 		},
-		Port:     9000,
-		Locality: locality,
+		Port: 9000,
 	}
 
 	if err := agent.ServiceRegister(reg); err != nil {
@@ -271,14 +251,12 @@ func TestAPI_AgentServiceAndReplaceChecks(t *testing.T) {
 	require.NotNil(t, out)
 	require.Equal(t, HealthPassing, state)
 	require.Equal(t, 9000, out.Service.Port)
-	require.Equal(t, locality, out.Service.Locality)
 
 	state, outs, err := agent.AgentHealthServiceByName("foo")
 	require.Nil(t, err)
 	require.NotNil(t, outs)
 	require.Equal(t, HealthPassing, state)
 	require.Equal(t, 9000, outs[0].Service.Port)
-	require.Equal(t, locality, outs[0].Service.Locality)
 
 	if err := agent.ServiceDeregister("foo"); err != nil {
 		t.Fatalf("err: %v", err)
@@ -297,21 +275,6 @@ func TestAgent_ServiceRegisterOpts_WithContextTimeout(t *testing.T) {
 	require.True(t, errors.Is(err, context.DeadlineExceeded), "expected timeout")
 }
 
-func TestAgent_ServiceRegisterOpts_Token(t *testing.T) {
-	c, s := makeACLClient(t)
-	defer s.Stop()
-
-	reg := &AgentServiceRegistration{Name: "example"}
-	opts := &ServiceRegisterOpts{}
-	opts.Token = "invalid"
-	err := c.Agent().ServiceRegisterOpts(reg, *opts)
-	require.EqualError(t, err, "Unexpected response code: 403 (ACL not found)")
-
-	opts.Token = "root"
-	err = c.Agent().ServiceRegisterOpts(reg, *opts)
-	require.NoError(t, err)
-}
-
 func TestAPI_NewClient_TokenFileCLIFirstPriority(t *testing.T) {
 	os.Setenv("CONSUL_HTTP_TOKEN_FILE", "httpTokenFile.txt")
 	os.Setenv("CONSUL_HTTP_TOKEN", "httpToken")
@@ -377,7 +340,6 @@ func TestAPI_AgentServices(t *testing.T) {
 	agent := c.Agent()
 	s.WaitForSerfCheck(t)
 
-	locality := &Locality{Region: "us-west-1", Zone: "us-west-1a"}
 	reg := &AgentServiceRegistration{
 		Name: "foo",
 		ID:   "foo",
@@ -392,7 +354,6 @@ func TestAPI_AgentServices(t *testing.T) {
 		Check: &AgentServiceCheck{
 			TTL: "15s",
 		},
-		Locality: locality,
 	}
 	if err := agent.ServiceRegister(reg); err != nil {
 		t.Fatalf("err: %v", err)
@@ -429,7 +390,6 @@ func TestAPI_AgentServices(t *testing.T) {
 	require.NotNil(t, out)
 	require.Equal(t, HealthCritical, state)
 	require.Equal(t, 8000, out.Service.Port)
-	require.Equal(t, locality, out.Service.Locality)
 
 	state, outs, err := agent.AgentHealthServiceByName("foo")
 	require.Nil(t, err)
@@ -1073,7 +1033,7 @@ func TestAPI_AgentChecks(t *testing.T) {
 		Name: "foo",
 	}
 	reg.TTL = "15s"
-	if err := agent.CheckRegisterOpts(reg, nil); err != nil {
+	if err := agent.CheckRegister(reg); err != nil {
 		t.Fatalf("err: %v", err)
 	}
 
@@ -1097,19 +1057,6 @@ func TestAPI_AgentChecks(t *testing.T) {
 	}
 }
 
-func TestAgent_AgentChecksRegisterOpts_WithContextTimeout(t *testing.T) {
-	c, err := NewClient(DefaultConfig())
-	require.NoError(t, err)
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Nanosecond)
-	t.Cleanup(cancel)
-
-	opts := &QueryOptions{}
-	opts = opts.WithContext(ctx)
-	err = c.Agent().CheckRegisterOpts(&AgentCheckRegistration{}, opts)
-	require.True(t, errors.Is(err, context.DeadlineExceeded), "expected timeout")
-}
-
 func TestAPI_AgentChecksWithFilterOpts(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
@@ -1418,20 +1365,6 @@ func TestAPI_AgentForceLeavePrune(t *testing.T) {
 	}
 }
 
-func TestAPI_AgentForceLeaveOptions(t *testing.T) {
-	t.Parallel()
-	c, s := makeClient(t)
-	defer s.Stop()
-
-	agent := c.Agent()
-
-	// Eject somebody with token
-	err := agent.ForceLeaveOptions(s.Config.NodeName, ForceLeaveOpts{Prune: true}, &QueryOptions{Token: "testToken"})
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-}
-
 func TestAPI_AgentMonitor(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
@@ -1663,10 +1596,6 @@ func TestAPI_AgentUpdateToken(t *testing.T) {
 			t.Fatalf("err: %v", err)
 		}
 
-		if _, err := agent.UpdateDNSToken("root", nil); err != nil {
-			t.Fatalf("err: %v", err)
-		}
-
 	})
 
 	t.Run("new with fallback", func(t *testing.T) {
@@ -1755,9 +1684,6 @@ func TestAPI_AgentUpdateToken(t *testing.T) {
 
 		_, err = agent.UpdateConfigFileRegistrationToken("root", nil)
 		require.Error(t, err)
-
-		_, err = agent.UpdateDNSToken("root", nil)
-		require.Error(t, err)
 	})
 }
 
diff --git a/api/api.go b/api/api.go
index f62c0c5a1bf0a..50410f471fdfe 100644
--- a/api/api.go
+++ b/api/api.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -836,21 +833,12 @@ func (r *request) setQueryOptions(q *QueryOptions) {
 		return
 	}
 	if q.Namespace != "" {
-		// For backwards-compatibility with existing tests,
-		// use the short-hand query param name "ns"
-		// rather than the alternative long-hand "namespace"
 		r.params.Set("ns", q.Namespace)
 	}
 	if q.Partition != "" {
-		// For backwards-compatibility with existing tests,
-		// use the long-hand query param name "partition"
-		// rather than the alternative short-hand "ap"
 		r.params.Set("partition", q.Partition)
 	}
 	if q.Datacenter != "" {
-		// For backwards-compatibility with existing tests,
-		// use the short-hand query param name "dc"
-		// rather than the alternative long-hand "datacenter"
 		r.params.Set("dc", q.Datacenter)
 	}
 	if q.Peer != "" {
@@ -958,16 +946,12 @@ func (r *request) setWriteOptions(q *WriteOptions) {
 	if q == nil {
 		return
 	}
-	// For backwards-compatibility, continue to use the shorthand "ns"
-	// rather than "namespace"
 	if q.Namespace != "" {
 		r.params.Set("ns", q.Namespace)
 	}
 	if q.Partition != "" {
 		r.params.Set("partition", q.Partition)
 	}
-	// For backwards-compatibility, continue to use the shorthand "dc"
-	// rather than "datacenter"
 	if q.Datacenter != "" {
 		r.params.Set("dc", q.Datacenter)
 	}
diff --git a/api/api_test.go b/api/api_test.go
index 4d5dd1fda8305..7c8048cb4bb25 100644
--- a/api/api_test.go
+++ b/api/api_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -53,22 +50,6 @@ func makeACLClient(t *testing.T) (*Client, *testutil.TestServer) {
 	})
 }
 
-// Makes a client with Audit enabled, it requires ACLs
-func makeAuditClient(t *testing.T) (*Client, *testutil.TestServer) {
-	return makeClientWithConfig(t, func(clientConfig *Config) {
-		clientConfig.Token = "root"
-	}, func(serverConfig *testutil.TestServerConfig) {
-		serverConfig.PrimaryDatacenter = "dc1"
-		serverConfig.ACL.Tokens.InitialManagement = "root"
-		serverConfig.ACL.Tokens.Agent = "root"
-		serverConfig.ACL.Enabled = true
-		serverConfig.ACL.DefaultPolicy = "deny"
-		serverConfig.Audit = &testutil.TestAuditConfig{
-			Enabled: true,
-		}
-	})
-}
-
 func makeNonBootstrappedACLClient(t *testing.T, defaultPolicy string) (*Client, *testutil.TestServer) {
 	return makeClientWithConfig(t,
 		func(clientConfig *Config) {
@@ -191,21 +172,19 @@ func testNodeServiceCheckRegistrations(t *testing.T, client *Client, datacenter
 					Notes:   "foo has ssh access",
 				},
 			},
-			Locality: &Locality{Region: "us-west-1", Zone: "us-west-1a"},
 		},
 		"Service redis v1 on foo": {
 			Datacenter:     datacenter,
 			Node:           "foo",
 			SkipNodeUpdate: true,
 			Service: &AgentService{
-				Kind:     ServiceKindTypical,
-				ID:       "redisV1",
-				Service:  "redis",
-				Tags:     []string{"v1"},
-				Meta:     map[string]string{"version": "1"},
-				Port:     1234,
-				Address:  "198.18.1.2",
-				Locality: &Locality{Region: "us-west-1", Zone: "us-west-1a"},
+				Kind:    ServiceKindTypical,
+				ID:      "redisV1",
+				Service: "redis",
+				Tags:    []string{"v1"},
+				Meta:    map[string]string{"version": "1"},
+				Port:    1234,
+				Address: "198.18.1.2",
 			},
 			Checks: HealthChecks{
 				&HealthCheck{
diff --git a/api/catalog.go b/api/catalog.go
index 0040ca6e7a855..84a2bdbc6531e 100644
--- a/api/catalog.go
+++ b/api/catalog.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -22,9 +19,8 @@ type Node struct {
 	Meta            map[string]string
 	CreateIndex     uint64
 	ModifyIndex     uint64
-	Partition       string    `json:",omitempty"`
-	PeerName        string    `json:",omitempty"`
-	Locality        *Locality `json:",omitempty"`
+	Partition       string `json:",omitempty"`
+	PeerName        string `json:",omitempty"`
 }
 
 type ServiceAddress struct {
@@ -49,7 +45,6 @@ type CatalogService struct {
 	ServiceWeights           Weights
 	ServiceEnableTagOverride bool
 	ServiceProxy             *AgentServiceConnectProxyConfig
-	ServiceLocality          *Locality `json:",omitempty"`
 	CreateIndex              uint64
 	Checks                   HealthChecks
 	ModifyIndex              uint64
@@ -78,8 +73,7 @@ type CatalogRegistration struct {
 	Check           *AgentCheck
 	Checks          HealthChecks
 	SkipNodeUpdate  bool
-	Partition       string    `json:",omitempty"`
-	Locality        *Locality `json:",omitempty"`
+	Partition       string `json:",omitempty"`
 }
 
 type CatalogDeregistration struct {
diff --git a/api/catalog_test.go b/api/catalog_test.go
index 708392c42b578..b24296feb224d 100644
--- a/api/catalog_test.go
+++ b/api/catalog_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -65,7 +62,6 @@ func TestAPI_CatalogNodes(t *testing.T) {
 			},
 			Meta: map[string]string{
 				"consul-network-segment": "",
-				"consul-version":         s.Config.Version,
 			},
 		}
 		require.Equal(r, want, got)
@@ -397,12 +393,11 @@ func TestAPI_CatalogService_SingleTag(t *testing.T) {
 
 	agent := c.Agent()
 	catalog := c.Catalog()
-	locality := &Locality{Region: "us-west-1", Zone: "us-west-1a"}
+
 	reg := &AgentServiceRegistration{
-		Name:     "foo",
-		ID:       "foo1",
-		Tags:     []string{"bar"},
-		Locality: locality,
+		Name: "foo",
+		ID:   "foo1",
+		Tags: []string{"bar"},
 	}
 	require.NoError(t, agent.ServiceRegister(reg))
 	defer agent.ServiceDeregister("foo1")
@@ -413,7 +408,6 @@ func TestAPI_CatalogService_SingleTag(t *testing.T) {
 		require.NotEqual(r, meta.LastIndex, 0)
 		require.Len(r, services, 1)
 		require.Equal(r, services[0].ServiceID, "foo1")
-		require.Equal(r, locality, services[0].ServiceLocality)
 	})
 }
 
diff --git a/api/ce_test.go b/api/ce_test.go
index 91dd973b683ca..03ff93c994774 100644
--- a/api/ce_test.go
+++ b/api/ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !consulent
+// +build !consulent
 
 package api
 
diff --git a/api/config_entry.go b/api/config_entry.go
index b59c20fd3007d..7160d7d228b54 100644
--- a/api/config_entry.go
+++ b/api/config_entry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -26,8 +23,6 @@ const (
 	ServiceIntentions  string = "service-intentions"
 	MeshConfig         string = "mesh"
 	ExportedServices   string = "exported-services"
-	SamenessGroup      string = "sameness-group"
-	RateLimitIPConfig  string = "control-plane-request-limit"
 
 	ProxyConfigGlobal string = "global"
 	MeshConfigMesh    string = "mesh"
@@ -35,16 +30,11 @@ const (
 	TCPRoute          string = "tcp-route"
 	InlineCertificate string = "inline-certificate"
 	HTTPRoute         string = "http-route"
-	JWTProvider       string = "jwt-provider"
 )
 
 const (
-	BuiltinAWSLambdaExtension         string = "builtin/aws/lambda"
-	BuiltinExtAuthzExtension          string = "builtin/ext-authz"
-	BuiltinLuaExtension               string = "builtin/lua"
-	BuiltinOTELAccessLoggingExtension string = "builtin/otel-access-logging"
-	BuiltinPropertyOverrideExtension  string = "builtin/property-override"
-	BuiltinWasmExtension              string = "builtin/wasm"
+	BuiltinAWSLambdaExtension string = "builtin/aws/lambda"
+	BuiltinLuaExtension       string = "builtin/lua"
 	// BuiltinValidateExtension should not be exposed directly or accepted as a valid configured
 	// extension type, as it is only used indirectly via troubleshooting tools. It is included here
 	// for common reference alongside other builtin extensions.
@@ -116,21 +106,6 @@ type TransparentProxyConfig struct {
 	DialedDirectly bool `json:",omitempty" alias:"dialed_directly"`
 }
 
-type MutualTLSMode string
-
-const (
-	// MutualTLSModeDefault represents no specific mode and should
-	// be used to indicate that a different layer of the configuration
-	// chain should take precedence.
-	MutualTLSModeDefault MutualTLSMode = ""
-
-	// MutualTLSModeStrict requires mTLS for incoming traffic.
-	MutualTLSModeStrict MutualTLSMode = "strict"
-
-	// MutualTLSModePermissive allows incoming non-mTLS traffic.
-	MutualTLSModePermissive MutualTLSMode = "permissive"
-)
-
 // ExposeConfig describes HTTP paths to expose through Envoy outside of Connect.
 // Users can expose individual paths and/or all HTTP/GRPC paths for checks.
 type ExposeConfig struct {
@@ -144,11 +119,9 @@ type ExposeConfig struct {
 
 // EnvoyExtension has configuration for an extension that patches Envoy resources.
 type EnvoyExtension struct {
-	Name          string
-	Required      bool
-	Arguments     map[string]interface{} `bexpr:"-"`
-	ConsulVersion string
-	EnvoyVersion  string
+	Name      string
+	Required  bool
+	Arguments map[string]interface{} `bexpr:"-"`
 }
 
 type ExposePath struct {
@@ -315,47 +288,6 @@ type UpstreamLimits struct {
 	MaxConcurrentRequests *int `alias:"max_concurrent_requests"`
 }
 
-// RateLimits is rate limiting configuration that is applied to
-// inbound traffic for a service.
-// Rate limiting is a Consul enterprise feature.
-type RateLimits struct {
-	InstanceLevel InstanceLevelRateLimits `alias:"instance_level"`
-}
-
-// InstanceLevelRateLimits represents rate limit configuration
-// that are applied per service instance.
-type InstanceLevelRateLimits struct {
-	// RequestsPerSecond is the average number of requests per second that can be
-	// made without being throttled. This field is required if RequestsMaxBurst
-	// is set. The allowed number of requests may exceed RequestsPerSecond up to
-	// the value specified in RequestsMaxBurst.
-	//
-	// Internally, this is the refill rate of the token bucket used for rate limiting.
-	RequestsPerSecond int `alias:"requests_per_second"`
-
-	// RequestsMaxBurst is the maximum number of requests that can be sent
-	// in a burst. Should be equal to or greater than RequestsPerSecond.
-	// If unset, defaults to RequestsPerSecond.
-	//
-	// Internally, this is the maximum size of the token bucket used for rate limiting.
-	RequestsMaxBurst int `alias:"requests_max_burst"`
-
-	// Routes is a list of rate limits applied to specific routes.
-	// Overrides any top-level configuration.
-	Routes []InstanceLevelRouteRateLimits
-}
-
-// InstanceLevelRouteRateLimits represents rate limit configuration
-// applied to a route matching one of PathExact/PathPrefix/PathRegex.
-type InstanceLevelRouteRateLimits struct {
-	PathExact  string `alias:"path_exact"`
-	PathPrefix string `alias:"path_prefix"`
-	PathRegex  string `alias:"path_regex"`
-
-	RequestsPerSecond int `alias:"requests_per_second"`
-	RequestsMaxBurst  int `alias:"requests_max_burst"`
-}
-
 type ServiceConfigEntry struct {
 	Kind                      string
 	Name                      string
@@ -364,7 +296,6 @@ type ServiceConfigEntry struct {
 	Protocol                  string                  `json:",omitempty"`
 	Mode                      ProxyMode               `json:",omitempty"`
 	TransparentProxy          *TransparentProxyConfig `json:",omitempty" alias:"transparent_proxy"`
-	MutualTLSMode             MutualTLSMode           `json:",omitempty" alias:"mutual_tls_mode"`
 	MeshGateway               MeshGatewayConfig       `json:",omitempty" alias:"mesh_gateway"`
 	Expose                    ExposeConfig            `json:",omitempty"`
 	ExternalSNI               string                  `json:",omitempty" alias:"external_sni"`
@@ -374,7 +305,6 @@ type ServiceConfigEntry struct {
 	LocalConnectTimeoutMs     int                     `json:",omitempty" alias:"local_connect_timeout_ms"`
 	LocalRequestTimeoutMs     int                     `json:",omitempty" alias:"local_request_timeout_ms"`
 	BalanceInboundConnections string                  `json:",omitempty" alias:"balance_inbound_connections"`
-	RateLimits                *RateLimits             `json:",omitempty" alias:"rate_limits"`
 	EnvoyExtensions           []EnvoyExtension        `json:",omitempty" alias:"envoy_extensions"`
 	Meta                      map[string]string       `json:",omitempty"`
 	CreateIndex               uint64
@@ -390,20 +320,17 @@ func (s *ServiceConfigEntry) GetCreateIndex() uint64     { return s.CreateIndex
 func (s *ServiceConfigEntry) GetModifyIndex() uint64     { return s.ModifyIndex }
 
 type ProxyConfigEntry struct {
-	Kind                 string
-	Name                 string
-	Partition            string                               `json:",omitempty"`
-	Namespace            string                               `json:",omitempty"`
-	Mode                 ProxyMode                            `json:",omitempty"`
-	TransparentProxy     *TransparentProxyConfig              `json:",omitempty" alias:"transparent_proxy"`
-	MutualTLSMode        MutualTLSMode                        `json:",omitempty" alias:"mutual_tls_mode"`
-	Config               map[string]interface{}               `json:",omitempty"`
-	MeshGateway          MeshGatewayConfig                    `json:",omitempty" alias:"mesh_gateway"`
-	Expose               ExposeConfig                         `json:",omitempty"`
-	AccessLogs           *AccessLogsConfig                    `json:",omitempty" alias:"access_logs"`
-	EnvoyExtensions      []EnvoyExtension                     `json:",omitempty" alias:"envoy_extensions"`
-	FailoverPolicy       *ServiceResolverFailoverPolicy       `json:",omitempty" alias:"failover_policy"`
-	PrioritizeByLocality *ServiceResolverPrioritizeByLocality `json:",omitempty" alias:"prioritize_by_locality"`
+	Kind             string
+	Name             string
+	Partition        string                  `json:",omitempty"`
+	Namespace        string                  `json:",omitempty"`
+	Mode             ProxyMode               `json:",omitempty"`
+	TransparentProxy *TransparentProxyConfig `json:",omitempty" alias:"transparent_proxy"`
+	Config           map[string]interface{}  `json:",omitempty"`
+	MeshGateway      MeshGatewayConfig       `json:",omitempty" alias:"mesh_gateway"`
+	Expose           ExposeConfig            `json:",omitempty"`
+	AccessLogs       *AccessLogsConfig       `json:",omitempty" alias:"access_logs"`
+	EnvoyExtensions  []EnvoyExtension        `json:",omitempty" alias:"envoy_extensions"`
 
 	Meta        map[string]string `json:",omitempty"`
 	CreateIndex uint64
@@ -440,8 +367,6 @@ func makeConfigEntry(kind, name string) (ConfigEntry, error) {
 		return &MeshConfigEntry{}, nil
 	case ExportedServices:
 		return &ExportedServicesConfigEntry{Name: name}, nil
-	case SamenessGroup:
-		return &SamenessGroupConfigEntry{Kind: kind, Name: name}, nil
 	case APIGateway:
 		return &APIGatewayConfigEntry{Kind: kind, Name: name}, nil
 	case TCPRoute:
@@ -450,10 +375,6 @@ func makeConfigEntry(kind, name string) (ConfigEntry, error) {
 		return &InlineCertificateConfigEntry{Kind: kind, Name: name}, nil
 	case HTTPRoute:
 		return &HTTPRouteConfigEntry{Kind: kind, Name: name}, nil
-	case RateLimitIPConfig:
-		return &RateLimitIPConfigEntry{Kind: kind, Name: name}, nil
-	case JWTProvider:
-		return &JWTProviderConfigEntry{Kind: kind, Name: name}, nil
 	default:
 		return nil, fmt.Errorf("invalid config entry kind: %s", kind)
 	}
diff --git a/api/config_entry_discoverychain.go b/api/config_entry_discoverychain.go
index eeb3a1074c0c0..e4c8e266f80a4 100644
--- a/api/config_entry_discoverychain.go
+++ b/api/config_entry_discoverychain.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -174,10 +171,6 @@ type ServiceResolverConfigEntry struct {
 	ConnectTimeout time.Duration                      `json:",omitempty" alias:"connect_timeout"`
 	RequestTimeout time.Duration                      `json:",omitempty" alias:"request_timeout"`
 
-	// PrioritizeByLocality controls whether the locality of services within the
-	// local partition will be used to prioritize connectivity.
-	PrioritizeByLocality *ServiceResolverPrioritizeByLocality `json:",omitempty" alias:"prioritize_by_locality"`
-
 	// LoadBalancer determines the load balancing policy and configuration for services
 	// issuing requests to this upstream service.
 	LoadBalancer *LoadBalancer `json:",omitempty" alias:"load_balancer"`
@@ -255,18 +248,15 @@ type ServiceResolverRedirect struct {
 	Partition     string `json:",omitempty"`
 	Datacenter    string `json:",omitempty"`
 	Peer          string `json:",omitempty"`
-	SamenessGroup string `json:",omitempty" alias:"sameness_group"`
 }
 
 type ServiceResolverFailover struct {
 	Service       string `json:",omitempty"`
 	ServiceSubset string `json:",omitempty" alias:"service_subset"`
 	// Referencing other partitions is not supported.
-	Namespace     string                          `json:",omitempty"`
-	Datacenters   []string                        `json:",omitempty"`
-	Targets       []ServiceResolverFailoverTarget `json:",omitempty"`
-	Policy        *ServiceResolverFailoverPolicy  `json:",omitempty"`
-	SamenessGroup string                          `json:",omitempty" alias:"sameness_group"`
+	Namespace   string                          `json:",omitempty"`
+	Datacenters []string                        `json:",omitempty"`
+	Targets     []ServiceResolverFailoverTarget `json:",omitempty"`
 }
 
 type ServiceResolverFailoverTarget struct {
@@ -278,20 +268,6 @@ type ServiceResolverFailoverTarget struct {
 	Peer          string `json:",omitempty"`
 }
 
-type ServiceResolverFailoverPolicy struct {
-	// Mode specifies the type of failover that will be performed. Valid values are
-	// "sequential", "" (equivalent to "sequential") and "order-by-locality".
-	Mode    string   `json:",omitempty"`
-	Regions []string `json:",omitempty"`
-}
-
-type ServiceResolverPrioritizeByLocality struct {
-	// Mode specifies the type of prioritization that will be performed
-	// when selecting nodes in the local partition.
-	// Valid values are: "" (default "none"), "none", and "failover".
-	Mode string `json:",omitempty"`
-}
-
 // LoadBalancer determines the load balancing policy and configuration for services
 // issuing requests to this upstream service.
 type LoadBalancer struct {
diff --git a/api/config_entry_discoverychain_test.go b/api/config_entry_discoverychain_test.go
index 6b4a63e97e879..42f7a287a9b24 100644
--- a/api/config_entry_discoverychain_test.go
+++ b/api/config_entry_discoverychain_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/config_entry_exports.go b/api/config_entry_exports.go
index 97920e40ddcd5..52b0491f7cbcc 100644
--- a/api/config_entry_exports.go
+++ b/api/config_entry_exports.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import "encoding/json"
@@ -54,9 +51,6 @@ type ServiceConsumer struct {
 
 	// Peer is the name of the peer to export the service to.
 	Peer string `json:",omitempty" alias:"peer_name"`
-
-	// SamenessGroup is the name of the sameness group to export the service to.
-	SamenessGroup string `json:",omitempty" alias:"sameness_group"`
 }
 
 func (e *ExportedServicesConfigEntry) GetKind() string            { return ExportedServices }
diff --git a/api/config_entry_exports_test.go b/api/config_entry_exports_test.go
index 1616dc9c58954..fb0c620a0271d 100644
--- a/api/config_entry_exports_test.go
+++ b/api/config_entry_exports_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/config_entry_gateways.go b/api/config_entry_gateways.go
index baf274e2da027..05e43832c1fdb 100644
--- a/api/config_entry_gateways.go
+++ b/api/config_entry_gateways.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 // IngressGatewayConfigEntry manages the configuration for an ingress service
@@ -284,10 +281,6 @@ type APIGatewayListener struct {
 	Protocol string
 	// TLS is the TLS settings for the listener.
 	TLS APIGatewayTLSConfiguration
-	// Override is the policy that overrides all other policy and route specific configuration
-	Override *APIGatewayPolicy `json:",omitempty"`
-	// Default is the policy that is the default for the listener and route, routes can override this behavior
-	Default *APIGatewayPolicy `json:",omitempty"`
 }
 
 // APIGatewayTLSConfiguration specifies the configuration of a listener’s
@@ -306,39 +299,3 @@ type APIGatewayTLSConfiguration struct {
 	// Only applicable to connections negotiated via TLS 1.2 or earlier
 	CipherSuites []string `json:",omitempty" alias:"cipher_suites"`
 }
-
-// APIGatewayPolicy holds the policy that configures the gateway listener, this is used in the `Override` and `Default` fields of a listener
-type APIGatewayPolicy struct {
-	// JWT holds the JWT configuration for the Listener
-	JWT *APIGatewayJWTRequirement `json:",omitempty"`
-}
-
-// APIGatewayJWTRequirement holds the list of JWT providers to be verified against
-type APIGatewayJWTRequirement struct {
-	// Providers is a list of providers to consider when verifying a JWT.
-	Providers []*APIGatewayJWTProvider `json:",omitempty"`
-}
-
-// APIGatewayJWTProvider holds the provider and claim verification information
-type APIGatewayJWTProvider struct {
-	// Name is the name of the JWT provider. There MUST be a corresponding
-	// "jwt-provider" config entry with this name.
-	Name string `json:",omitempty"`
-
-	// VerifyClaims is a list of additional claims to verify in a JWT's payload.
-	VerifyClaims []*APIGatewayJWTClaimVerification `json:",omitempty" alias:"verify_claims"`
-}
-
-// APIGatewayJWTClaimVerification holds the actual claim information to be verified
-type APIGatewayJWTClaimVerification struct {
-	// Path is the path to the claim in the token JSON.
-	Path []string `json:",omitempty"`
-
-	// Value is the expected value at the given path:
-	// - If the type at the path is a list then we verify
-	//   that this value is contained in the list.
-	//
-	// - If the type at the path is a string then we verify
-	//   that this value matches.
-	Value string `json:",omitempty"`
-}
diff --git a/api/config_entry_gateways_test.go b/api/config_entry_gateways_test.go
index 7383b0ae68038..5aaac9c4658e0 100644
--- a/api/config_entry_gateways_test.go
+++ b/api/config_entry_gateways_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -348,150 +345,3 @@ func TestAPI_ConfigEntries_TerminatingGateway(t *testing.T) {
 	_, _, err = configEntries.Get(TerminatingGateway, "foo", nil)
 	require.Error(t, err)
 }
-
-func TestAPI_ConfigEntries_APIGateway(t *testing.T) {
-	t.Parallel()
-	c, s := makeClient(t)
-	defer s.Stop()
-
-	configEntries := c.ConfigEntries()
-	listener1 := APIGatewayListener{
-		Name:     "listener1",
-		Hostname: "host.com",
-		Port:     3360,
-		Protocol: "http",
-	}
-
-	listener2 := APIGatewayListener{
-		Name:     "listener2",
-		Hostname: "host2.com",
-		Port:     3362,
-		Protocol: "http",
-	}
-
-	apigw1 := &APIGatewayConfigEntry{
-		Kind: APIGateway,
-		Name: "foo",
-		Meta: map[string]string{
-			"foo": "bar",
-			"gir": "zim",
-		},
-		Listeners: []APIGatewayListener{listener1},
-	}
-
-	apigw2 := &APIGatewayConfigEntry{
-		Kind:      APIGateway,
-		Name:      "bar",
-		Listeners: []APIGatewayListener{listener2},
-	}
-
-	// set it
-	_, wm, err := configEntries.Set(apigw1, nil)
-	require.NoError(t, err)
-	require.NotNil(t, wm)
-	require.NotEqual(t, 0, wm.RequestTime)
-
-	// also set the second one
-	_, wm, err = configEntries.Set(apigw2, nil)
-	require.NoError(t, err)
-	require.NotNil(t, wm)
-	require.NotEqual(t, 0, wm.RequestTime)
-
-	// get it
-	entry, qm, err := configEntries.Get(APIGateway, "foo", nil)
-	require.NoError(t, err)
-	require.NotNil(t, qm)
-	require.NotEqual(t, 0, qm.RequestTime)
-
-	// verify it
-	readGW, ok := entry.(*APIGatewayConfigEntry)
-	require.True(t, ok)
-	require.Equal(t, apigw1.Kind, readGW.Kind)
-	require.Equal(t, apigw1.Name, readGW.Name)
-	require.Equal(t, apigw1.Meta, readGW.Meta)
-	require.Equal(t, apigw1.Meta, readGW.GetMeta())
-
-	// update it
-	apigw1.Listeners = []APIGatewayListener{
-		listener1,
-		{
-			Name:     "listener3",
-			Hostname: "host3.com",
-			Port:     3363,
-			Protocol: "http",
-		},
-	}
-
-	// CAS fail
-	written, _, err := configEntries.CAS(apigw1, 0, nil)
-	require.NoError(t, err)
-	require.False(t, written)
-
-	// CAS success
-	written, wm, err = configEntries.CAS(apigw1, readGW.ModifyIndex, nil)
-	require.NoError(t, err)
-	require.NotNil(t, wm)
-	require.NotEqual(t, 0, wm.RequestTime)
-	require.True(t, written)
-
-	// re-setting should not yield an error
-	_, wm, err = configEntries.Set(apigw1, nil)
-	require.NoError(t, err)
-	require.NotNil(t, wm)
-	require.NotEqual(t, 0, wm.RequestTime)
-
-	apigw2.Listeners = []APIGatewayListener{
-		listener2,
-		{
-			Name:     "listener4",
-			Hostname: "host4.com",
-			Port:     3364,
-			Protocol: "http",
-		},
-	}
-
-	_, wm, err = configEntries.Set(apigw2, nil)
-	require.NoError(t, err)
-	require.NotNil(t, wm)
-	require.NotEqual(t, 0, wm.RequestTime)
-
-	// list them
-	entries, qm, err := configEntries.List(APIGateway, nil)
-	require.NoError(t, err)
-	require.NotNil(t, qm)
-	require.NotEqual(t, 0, qm.RequestTime)
-	require.Len(t, entries, 2)
-
-	for _, entry = range entries {
-		switch entry.GetName() {
-		case "foo":
-			// this also verifies that the update value was persisted and
-			// the updated values are seen
-			readGW, ok = entry.(*APIGatewayConfigEntry)
-			require.True(t, ok)
-			require.Equal(t, apigw1.Kind, readGW.Kind)
-			require.Equal(t, apigw1.Name, readGW.Name)
-			require.Len(t, readGW.Listeners, 2)
-
-			require.Equal(t, apigw1.Listeners, readGW.Listeners)
-		case "bar":
-			readGW, ok = entry.(*APIGatewayConfigEntry)
-			require.True(t, ok)
-			require.Equal(t, apigw2.Kind, readGW.Kind)
-			require.Equal(t, apigw2.Name, readGW.Name)
-			require.Len(t, readGW.Listeners, 2)
-
-			require.Equal(t, apigw2.Listeners, readGW.Listeners)
-		}
-	}
-
-	// delete it
-	wm, err = configEntries.Delete(APIGateway, "foo", nil)
-	require.NoError(t, err)
-	require.NotNil(t, wm)
-	require.NotEqual(t, 0, wm.RequestTime)
-
-	// verify deletion
-	_, _, err = configEntries.Get(APIGateway, "foo", nil)
-	require.Error(t, err)
-}
diff --git a/api/config_entry_inline_certificate.go b/api/config_entry_inline_certificate.go
index 47a1ead05666a..bbf12ccaaf69f 100644
--- a/api/config_entry_inline_certificate.go
+++ b/api/config_entry_inline_certificate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 // InlineCertificateConfigEntry -- TODO stub
diff --git a/api/config_entry_inline_certificate_test.go b/api/config_entry_inline_certificate_test.go
index a8e5fa63b1ec7..78771fcc78cff 100644
--- a/api/config_entry_inline_certificate_test.go
+++ b/api/config_entry_inline_certificate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/config_entry_intentions.go b/api/config_entry_intentions.go
index 3f03b0875b9c2..0bff5e8e39769 100644
--- a/api/config_entry_intentions.go
+++ b/api/config_entry_intentions.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import "time"
@@ -12,7 +9,6 @@ type ServiceIntentionsConfigEntry struct {
 	Namespace string `json:",omitempty"`
 
 	Sources []*SourceIntention
-	JWT     *IntentionJWTRequirement `json:",omitempty"`
 
 	Meta map[string]string `json:",omitempty"`
 
@@ -21,16 +17,15 @@ type ServiceIntentionsConfigEntry struct {
 }
 
 type SourceIntention struct {
-	Name          string
-	Peer          string                 `json:",omitempty"`
-	Partition     string                 `json:",omitempty"`
-	Namespace     string                 `json:",omitempty"`
-	SamenessGroup string                 `json:",omitempty" alias:"sameness_group"`
-	Action        IntentionAction        `json:",omitempty"`
-	Permissions   []*IntentionPermission `json:",omitempty"`
-	Precedence    int
-	Type          IntentionSourceType
-	Description   string `json:",omitempty"`
+	Name        string
+	Peer        string                 `json:",omitempty"`
+	Partition   string                 `json:",omitempty"`
+	Namespace   string                 `json:",omitempty"`
+	Action      IntentionAction        `json:",omitempty"`
+	Permissions []*IntentionPermission `json:",omitempty"`
+	Precedence  int
+	Type        IntentionSourceType
+	Description string `json:",omitempty"`
 
 	LegacyID         string            `json:",omitempty" alias:"legacy_id"`
 	LegacyMeta       map[string]string `json:",omitempty" alias:"legacy_meta"`
@@ -49,7 +44,6 @@ func (e *ServiceIntentionsConfigEntry) GetModifyIndex() uint64     { return e.Mo
 type IntentionPermission struct {
 	Action IntentionAction
 	HTTP   *IntentionHTTPPermission `json:",omitempty"`
-	JWT    *IntentionJWTRequirement `json:",omitempty"`
 }
 
 type IntentionHTTPPermission struct {
@@ -71,30 +65,3 @@ type IntentionHTTPHeaderPermission struct {
 	Regex   string `json:",omitempty"`
 	Invert  bool   `json:",omitempty"`
 }
-
-type IntentionJWTRequirement struct {
-	// Providers is a list of providers to consider when verifying a JWT.
-	Providers []*IntentionJWTProvider `json:",omitempty"`
-}
-
-type IntentionJWTProvider struct {
-	// Name is the name of the JWT provider. There MUST be a corresponding
-	// "jwt-provider" config entry with this name.
-	Name string `json:",omitempty"`
-
-	// VerifyClaims is a list of additional claims to verify in a JWT's payload.
-	VerifyClaims []*IntentionJWTClaimVerification `json:",omitempty" alias:"verify_claims"`
-}
-
-type IntentionJWTClaimVerification struct {
-	// Path is the path to the claim in the token JSON.
-	Path []string `json:",omitempty"`
-
-	// Value is the expected value at the given path:
-	// - If the type at the path is a list then we verify
-	//   that this value is contained in the list.
-	//
-	// - If the type at the path is a string then we verify
-	//   that this value matches.
-	Value string `json:",omitempty"`
-}
diff --git a/api/config_entry_intentions_test.go b/api/config_entry_intentions_test.go
index 36bd5a2b6b8dc..349bdc895be2c 100644
--- a/api/config_entry_intentions_test.go
+++ b/api/config_entry_intentions_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/config_entry_jwt_provider.go b/api/config_entry_jwt_provider.go
deleted file mode 100644
index 270f0d5641563..0000000000000
--- a/api/config_entry_jwt_provider.go
+++ /dev/null
@@ -1,310 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package api
-
-import (
-	"time"
-)
-
-const (
-	DiscoveryTypeStrictDNS   ClusterDiscoveryType = "STRICT_DNS"
-	DiscoveryTypeStatic      ClusterDiscoveryType = "STATIC"
-	DiscoveryTypeLogicalDNS  ClusterDiscoveryType = "LOGICAL_DNS"
-	DiscoveryTypeEDS         ClusterDiscoveryType = "EDS"
-	DiscoveryTypeOriginalDST ClusterDiscoveryType = "ORIGINAL_DST"
-)
-
-type JWTProviderConfigEntry struct {
-	// Kind is the kind of configuration entry and must be "jwt-provider".
-	Kind string `json:",omitempty"`
-
-	// Name is the name of the provider being configured.
-	Name string `json:",omitempty"`
-
-	// JSONWebKeySet defines a JSON Web Key Set, its location on disk, or the
-	// means with which to fetch a key set from a remote server.
-	JSONWebKeySet *JSONWebKeySet `json:",omitempty" alias:"json_web_key_set"`
-
-	// Issuer is the entity that must have issued the JWT.
-	// This value must match the "iss" claim of the token.
-	Issuer string `json:",omitempty"`
-
-	// Audiences is the set of audiences the JWT is allowed to access.
-	// If specified, all JWTs verified with this provider must address
-	// at least one of these to be considered valid.
-	Audiences []string `json:",omitempty"`
-
-	// Locations where the JWT will be present in requests.
-	// Envoy will check all of these locations to extract a JWT.
-	// If no locations are specified Envoy will default to:
-	// 1. Authorization header with Bearer schema:
-	//    "Authorization: Bearer <token>"
-	// 2. access_token query parameter.
-	Locations []*JWTLocation `json:",omitempty"`
-
-	// Forwarding defines rules for forwarding verified JWTs to the backend.
-	Forwarding *JWTForwardingConfig `json:",omitempty"`
-
-	// ClockSkewSeconds specifies the maximum allowable time difference
-	// from clock skew when validating the "exp" (Expiration) and "nbf"
-	// (Not Before) claims.
-	//
-	// Default value is 30 seconds.
-	ClockSkewSeconds int `json:",omitempty" alias:"clock_skew_seconds"`
-
-	// CacheConfig defines configuration for caching the validation
-	// result for previously seen JWTs. Caching results can speed up
-	// verification when individual tokens are expected to be handled
-	// multiple times.
-	CacheConfig *JWTCacheConfig `json:",omitempty" alias:"cache_config"`
-
-	Meta map[string]string `json:",omitempty"`
-
-	// CreateIndex is the Raft index this entry was created at. This is a
-	// read-only field.
-	CreateIndex uint64 `json:",omitempty"`
-
-	// ModifyIndex is used for the Check-And-Set operations and can also be fed
-	// back into the WaitIndex of the QueryOptions in order to perform blocking
-	// queries.
-	ModifyIndex uint64 `json:",omitempty"`
-
-	// Partition is the partition the JWTProviderConfigEntry applies to.
-	// Partitioning is a Consul Enterprise feature.
-	Partition string `json:",omitempty"`
-
-	// Namespace is the namespace the JWTProviderConfigEntry applies to.
-	// Namespacing is a Consul Enterprise feature.
-	Namespace string `json:",omitempty"`
-}
-
-// JWTLocation is a location where the JWT could be present in requests.
-//
-// Only one of Header, QueryParam, or Cookie can be specified.
-type JWTLocation struct {
-	// Header defines how to extract a JWT from an HTTP request header.
-	Header *JWTLocationHeader `json:",omitempty"`
-
-	// QueryParam defines how to extract a JWT from an HTTP request
-	// query parameter.
-	QueryParam *JWTLocationQueryParam `json:",omitempty" alias:"query_param"`
-
-	// Cookie defines how to extract a JWT from an HTTP request cookie.
-	Cookie *JWTLocationCookie `json:",omitempty"`
-}
-
-// JWTLocationHeader defines how to extract a JWT from an HTTP
-// request header.
-type JWTLocationHeader struct {
-	// Name is the name of the header containing the token.
-	Name string `json:",omitempty"`
-
-	// ValuePrefix is an optional prefix that precedes the token in the
-	// header value.
-	// For example, "Bearer " is a standard value prefix for a header named
-	// "Authorization", but the prefix is not part of the token itself:
-	// "Authorization: Bearer <token>"
-	ValuePrefix string `json:",omitempty" alias:"value_prefix"`
-
-	// Forward defines whether the header with the JWT should be
-	// forwarded after the token has been verified. If false, the
-	// header will not be forwarded to the backend.
-	//
-	// Default value is false.
-	Forward bool `json:",omitempty"`
-}
-
-// JWTLocationQueryParam defines how to extract a JWT from an HTTP request query parameter.
-type JWTLocationQueryParam struct {
-	// Name is the name of the query param containing the token.
-	Name string `json:",omitempty"`
-}
-
-// JWTLocationCookie defines how to extract a JWT from an HTTP request cookie.
-type JWTLocationCookie struct {
-	// Name is the name of the cookie containing the token.
-	Name string `json:",omitempty"`
-}
-
-type JWTForwardingConfig struct {
-	// HeaderName is a header name to use when forwarding a verified
-	// JWT to the backend. The verified JWT could have been extracted
-	// from any location (query param, header, or cookie).
-	//
-	// The header value will be base64-URL-encoded, and will not be
-	// padded unless PadForwardPayloadHeader is true.
-	HeaderName string `json:",omitempty" alias:"header_name"`
-
-	// PadForwardPayloadHeader determines whether padding should be added
-	// to the base64 encoded token forwarded with ForwardPayloadHeader.
-	//
-	// Default value is false.
-	PadForwardPayloadHeader bool `json:",omitempty" alias:"pad_forward_payload_header"`
-}
-
-// JSONWebKeySet defines a key set, its location on disk, or the
-// means with which to fetch a key set from a remote server.
-//
-// Exactly one of Local or Remote must be specified.
-type JSONWebKeySet struct {
-	// Local specifies a local source for the key set.
-	Local *LocalJWKS `json:",omitempty"`
-
-	// Remote specifies how to fetch a key set from a remote server.
-	Remote *RemoteJWKS `json:",omitempty"`
-}
-
-// LocalJWKS specifies a location for a local JWKS.
-//
-// Only one of String and Filename can be specified.
-type LocalJWKS struct {
-	// JWKS contains a base64 encoded JWKS.
-	JWKS string `json:",omitempty"`
-
-	// Filename configures a location on disk where the JWKS can be
-	// found. If specified, the file must be present on the disk of ALL
-	// proxies with intentions referencing this provider.
-	Filename string `json:",omitempty"`
-}
-
-// RemoteJWKS specifies how to fetch a JWKS from a remote server.
-type RemoteJWKS struct {
-	// URI is the URI of the server to query for the JWKS.
-	URI string `json:",omitempty"`
-
-	// RequestTimeoutMs is the number of milliseconds to
-	// time out when making a request for the JWKS.
-	RequestTimeoutMs int `json:",omitempty" alias:"request_timeout_ms"`
-
-	// CacheDuration is the duration after which cached keys
-	// should be expired.
-	//
-	// Default value is 5 minutes.
-	CacheDuration time.Duration `json:",omitempty" alias:"cache_duration"`
-
-	// FetchAsynchronously indicates that the JWKS should be fetched
-	// when a client request arrives. Client requests will be paused
-	// until the JWKS is fetched.
-	// If false, the proxy listener will wait for the JWKS to be
-	// fetched before being activated.
-	//
-	// Default value is false.
-	FetchAsynchronously bool `json:",omitempty" alias:"fetch_asynchronously"`
-
-	// RetryPolicy defines a retry policy for fetching JWKS.
-	//
-	// There is no retry by default.
-	RetryPolicy *JWKSRetryPolicy `json:",omitempty" alias:"retry_policy"`
-
-	// JWKSCluster defines how the specified Remote JWKS URI is to be fetched.
-	JWKSCluster *JWKSCluster `json:",omitempty" alias:"jwks_cluster"`
-}
-
-type JWKSCluster struct {
-	// DiscoveryType refers to the service discovery type to use for resolving the cluster.
-	//
-	// This defaults to STRICT_DNS.
-	// Other options include STATIC, LOGICAL_DNS, EDS or ORIGINAL_DST.
-	DiscoveryType ClusterDiscoveryType `json:",omitempty" alias:"discovery_type"`
-
-	// TLSCertificates refers to the data containing certificate authority certificates to use
-	// in verifying a presented peer certificate.
-	// If not specified and a peer certificate is presented it will not be verified.
-	//
-	// Must be either CaCertificateProviderInstance or TrustedCA.
-	TLSCertificates *JWKSTLSCertificate `json:",omitempty" alias:"tls_certificates"`
-
-	// The timeout for new network connections to hosts in the cluster.
-	// If not set, a default value of 5s will be used.
-	ConnectTimeout time.Duration `json:",omitempty" alias:"connect_timeout"`
-}
-
-type ClusterDiscoveryType string
-
-// JWKSTLSCertificate refers to the data containing certificate authority certificates to use
-// in verifying a presented peer certificate.
-// If not specified and a peer certificate is presented it will not be verified.
-//
-// Must be either CaCertificateProviderInstance or TrustedCA.
-type JWKSTLSCertificate struct {
-	// CaCertificateProviderInstance Certificate provider instance for fetching TLS certificates.
-	CaCertificateProviderInstance *JWKSTLSCertProviderInstance `json:",omitempty" alias:"ca_certificate_provider_instance"`
-
-	// TrustedCA defines TLS certificate data containing certificate authority certificates
-	// to use in verifying a presented peer certificate.
-	//
-	// Exactly one of Filename, EnvironmentVariable, InlineString or InlineBytes must be specified.
-	TrustedCA *JWKSTLSCertTrustedCA `json:",omitempty" alias:"trusted_ca"`
-}
-
-// JWKSTLSCertTrustedCA defines TLS certificate data containing certificate authority certificates
-// to use in verifying a presented peer certificate.
-//
-// Exactly one of Filename, EnvironmentVariable, InlineString or InlineBytes must be specified.
-type JWKSTLSCertTrustedCA struct {
-	Filename            string `json:",omitempty" alias:"filename"`
-	EnvironmentVariable string `json:",omitempty" alias:"environment_variable"`
-	InlineString        string `json:",omitempty" alias:"inline_string"`
-	InlineBytes         []byte `json:",omitempty" alias:"inline_bytes"`
-}
-
-type JWKSTLSCertProviderInstance struct {
-	// InstanceName refers to the certificate provider instance name
-	//
-	// The default value is "default".
-	InstanceName string `json:",omitempty" alias:"instance_name"`
-
-	// CertificateName is used to specify certificate instances or types. For example, "ROOTCA" to specify
-	// a root-certificate (validation context) or "example.com" to specify a certificate for a
-	// particular domain.
-	//
-	// The default value is the empty string.
-	CertificateName string `json:",omitempty" alias:"certificate_name"`
-}
-
-type JWKSRetryPolicy struct {
-	// NumRetries is the number of times to retry fetching the JWKS.
-	// The retry strategy uses jittered exponential backoff with
-	// a base interval of 1s and max of 10s.
-	//
-	// Default value is 0.
-	NumRetries int `json:",omitempty" alias:"num_retries"`
-
-	// Backoff policy
-	//
-	// Defaults to Envoy's backoff policy
-	RetryPolicyBackOff *RetryPolicyBackOff `json:",omitempty" alias:"retry_policy_back_off"`
-}
-
-type RetryPolicyBackOff struct {
-	// BaseInterval to be used for the next back off computation
-	//
-	// The default value from envoy is 1s
-	BaseInterval time.Duration `json:",omitempty" alias:"base_interval"`
-
-	// MaxInternal to be used to specify the maximum interval between retries.
-	// Optional but should be greater or equal to BaseInterval.
-	//
-	// Defaults to 10 times BaseInterval
-	MaxInterval time.Duration `json:",omitempty" alias:"max_interval"`
-}
-
-type JWTCacheConfig struct {
-	// Size specifies the maximum number of JWT verification
-	// results to cache.
-	//
-	// Defaults to 0, meaning that JWT caching is disabled.
-	Size int `json:",omitempty"`
-}
-
-func (e *JWTProviderConfigEntry) GetKind() string {
-	return JWTProvider
-}
-
-func (e *JWTProviderConfigEntry) GetName() string            { return e.Name }
-func (e *JWTProviderConfigEntry) GetMeta() map[string]string { return e.Meta }
-func (e *JWTProviderConfigEntry) GetCreateIndex() uint64     { return e.CreateIndex }
-func (e *JWTProviderConfigEntry) GetModifyIndex() uint64     { return e.ModifyIndex }
-func (e *JWTProviderConfigEntry) GetPartition() string       { return e.Partition }
-func (e *JWTProviderConfigEntry) GetNamespace() string       { return e.Namespace }
diff --git a/api/config_entry_jwt_provider_test.go b/api/config_entry_jwt_provider_test.go
deleted file mode 100644
index c24ca03825b5a..0000000000000
--- a/api/config_entry_jwt_provider_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-
-package api
-
-import (
-	"testing"
-	"time"
-
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/stretchr/testify/require"
-)
-
-func TestAPI_ConfigEntries_JWTProvider(t *testing.T) {
-	t.Parallel()
-	c, s := makeClient(t)
-	defer s.Stop()
-
-	entries := c.ConfigEntries()
-
-	testutil.RunStep(t, "set and get", func(t *testing.T) {
-		connectTimeout := time.Duration(5) * time.Second
-		jwtProvider := &JWTProviderConfigEntry{
-			Name: "okta",
-			Kind: JWTProvider,
-			JSONWebKeySet: &JSONWebKeySet{
-				Remote: &RemoteJWKS{
-					FetchAsynchronously: true,
-					URI:                 "https://example.com/.well-known/jwks.json",
-					JWKSCluster: &JWKSCluster{
-						DiscoveryType:  "STATIC",
-						ConnectTimeout: connectTimeout,
-						TLSCertificates: &JWKSTLSCertificate{
-							TrustedCA: &JWKSTLSCertTrustedCA{
-								Filename: "myfile.cert",
-							},
-						},
-					},
-				},
-			},
-			Meta: map[string]string{
-				"gir": "zim",
-			},
-		}
-
-		_, wm, err := entries.Set(jwtProvider, nil)
-		require.NoError(t, err)
-		require.NotNil(t, wm)
-		require.NotEqual(t, 0, wm.RequestTime)
-
-		entry, qm, err := entries.Get(JWTProvider, "okta", nil)
-		require.NoError(t, err)
-		require.NotNil(t, qm)
-		require.NotEqual(t, 0, qm.RequestTime)
-
-		result, ok := entry.(*JWTProviderConfigEntry)
-		require.True(t, ok)
-
-		require.Equal(t, jwtProvider.Name, result.Name)
-		require.Equal(t, jwtProvider.JSONWebKeySet, result.JSONWebKeySet)
-	})
-}
diff --git a/api/config_entry_mesh.go b/api/config_entry_mesh.go
index 1a1ebb8b536bc..98b882247d6ac 100644
--- a/api/config_entry_mesh.go
+++ b/api/config_entry_mesh.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -22,10 +19,6 @@ type MeshConfigEntry struct {
 	// in transparent mode.
 	TransparentProxy TransparentProxyMeshConfig `alias:"transparent_proxy"`
 
-	// AllowEnablingPermissiveMutualTLS must be true in order to allow setting
-	// MutualTLSMode=permissive in either service-defaults or proxy-defaults.
-	AllowEnablingPermissiveMutualTLS bool `json:",omitempty" alias:"allow_enabling_permissive_mutual_tls"`
-
 	TLS *MeshTLSConfig `json:",omitempty"`
 
 	HTTP *MeshHTTPConfig `json:",omitempty"`
diff --git a/api/config_entry_rate_limit_ip.go b/api/config_entry_rate_limit_ip.go
deleted file mode 100644
index 8df7d4c98e772..0000000000000
--- a/api/config_entry_rate_limit_ip.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package api
-
-type ReadWriteRatesConfig struct {
-	ReadRate  float64
-	WriteRate float64
-}
-
-type RateLimitIPConfigEntry struct {
-	// Kind of the config entry. This will be set to structs.RateLimitIPConfig
-	Kind string
-	Name string
-	Mode string // {permissive, enforcing, disabled}
-
-	Meta map[string]string `json:",omitempty"`
-	// overall limits
-	ReadRate  float64
-	WriteRate float64
-
-	//limits specific to a type of call
-	ACL             *ReadWriteRatesConfig `json:",omitempty"` //	OperationCategoryACL             OperationCategory = "ACL"
-	Catalog         *ReadWriteRatesConfig `json:",omitempty"` //   OperationCategoryCatalog         OperationCategory = "Catalog"
-	ConfigEntry     *ReadWriteRatesConfig `json:",omitempty"` //   OperationCategoryConfigEntry     OperationCategory = "ConfigEntry"
-	ConnectCA       *ReadWriteRatesConfig `json:",omitempty"` //   OperationCategoryConnectCA       OperationCategory = "ConnectCA"
-	Coordinate      *ReadWriteRatesConfig `json:",omitempty"` //   OperationCategoryCoordinate      OperationCategory = "Coordinate"
-	DiscoveryChain  *ReadWriteRatesConfig `json:",omitempty"` //   OperationCategoryDiscoveryChain  OperationCategory = "DiscoveryChain"
-	ServerDiscovery *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryServerDiscovery OperationCategory = "ServerDiscovery"
-	Health          *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryHealth          OperationCategory = "Health"
-	Intention       *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryIntention       OperationCategory = "Intention"
-	KV              *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryKV              OperationCategory = "KV"
-	Tenancy         *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryPartition        OperationCategory = "Tenancy"
-	PreparedQuery   *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryPreparedQuery   OperationCategory = "PreparedQuery"
-	Session         *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategorySession         OperationCategory = "Session"
-	Txn             *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryTxn             OperationCategory = "Txn"
-	AutoConfig      *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryAutoConfig      OperationCategory = "AutoConfig"
-	FederationState *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryFederationState OperationCategory = "FederationState"
-	Internal        *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryInternal        OperationCategory = "Internal"
-	PeerStream      *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryPeerStream      OperationCategory = "PeerStream"
-	Peering         *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryPeering         OperationCategory = "Peering"
-	DataPlane       *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryDataPlane       OperationCategory = "DataPlane"
-	DNS             *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryDNS             OperationCategory = "DNS"
-	Subscribe       *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategorySubscribe       OperationCategory = "Subscribe"
-	Resource        *ReadWriteRatesConfig `json:",omitempty"` //  OperationCategoryResource        OperationCategory = "Resource"
-
-	// Partition is the partition the config entry is associated with.
-	// Partitioning is a Consul Enterprise feature.
-	Partition string `json:",omitempty"`
-
-	// Namespace is the namespace the config entry is associated with.
-	// Namespacing is a Consul Enterprise feature.
-	Namespace string `json:",omitempty"`
-
-	// CreateIndex is the Raft index this entry was created at. This is a
-	// read-only field.
-	CreateIndex uint64
-
-	// ModifyIndex is used for the Check-And-Set operations and can also be fed
-	// back into the WaitIndex of the QueryOptions in order to perform blocking
-	// queries.
-	ModifyIndex uint64
-}
-
-func (r *RateLimitIPConfigEntry) GetKind() string {
-	return RateLimitIPConfig
-}
-func (r *RateLimitIPConfigEntry) GetName() string {
-	if r == nil {
-		return ""
-	}
-	return r.Name
-}
-func (r *RateLimitIPConfigEntry) GetPartition() string {
-	return r.Partition
-}
-func (r *RateLimitIPConfigEntry) GetNamespace() string {
-	return r.Namespace
-}
-func (r *RateLimitIPConfigEntry) GetMeta() map[string]string {
-	if r == nil {
-		return nil
-	}
-	return r.Meta
-}
-func (r *RateLimitIPConfigEntry) GetCreateIndex() uint64 {
-	return r.CreateIndex
-}
-func (r *RateLimitIPConfigEntry) GetModifyIndex() uint64 {
-	return r.ModifyIndex
-}
diff --git a/api/config_entry_routes.go b/api/config_entry_routes.go
index 1918386576cde..2edf9b23a4c02 100644
--- a/api/config_entry_routes.go
+++ b/api/config_entry_routes.go
@@ -1,10 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
-import "time"
-
 // TCPRouteConfigEntry -- TODO stub
 type TCPRouteConfigEntry struct {
 	// Kind of the config entry. This should be set to api.TCPRoute.
@@ -197,17 +192,8 @@ type HTTPQueryMatch struct {
 // HTTPFilters specifies a list of filters used to modify a request
 // before it is routed to an upstream.
 type HTTPFilters struct {
-	Headers       []HTTPHeaderFilter
-	URLRewrite    *URLRewrite
-	RetryFilter   *RetryFilter
-	TimeoutFilter *TimeoutFilter
-	JWT           *JWTFilter
-}
-
-// HTTPResponseFilters specifies a list of filters used to modify a
-// response returned by an upstream
-type HTTPResponseFilters struct {
-	Headers []HTTPHeaderFilter
+	Headers    []HTTPHeaderFilter
+	URLRewrite *URLRewrite
 }
 
 // HTTPHeaderFilter specifies how HTTP headers should be modified.
@@ -221,32 +207,12 @@ type URLRewrite struct {
 	Path string
 }
 
-type RetryFilter struct {
-	NumRetries            *uint32
-	RetryOn               []string
-	RetryOnStatusCodes    []uint32
-	RetryOnConnectFailure *bool
-}
-
-type TimeoutFilter struct {
-	RequestTimeout time.Duration
-	IdleTimeout    time.Duration
-}
-
-// JWTFilter specifies the JWT configuration for a route
-type JWTFilter struct {
-	Providers []*APIGatewayJWTProvider `json:",omitempty"`
-}
-
 // HTTPRouteRule specifies the routing rules used to determine what upstream
 // service an HTTP request is routed to.
 type HTTPRouteRule struct {
 	// Filters is a list of HTTP-based filters used to modify a request prior
 	// to routing it to the upstream service
 	Filters HTTPFilters
-	// ResponseFilters is a list of HTTP-based filters used to modify a response
-	// returned by the upstream service
-	ResponseFilters HTTPResponseFilters
 	// Matches specified the matching criteria used in the routing table. If a
 	// request matches the given HTTPMatch configuration, then traffic is routed
 	// to services specified in the Services field.
@@ -262,15 +228,10 @@ type HTTPService struct {
 	// Weight is an arbitrary integer used in calculating how much
 	// traffic should be sent to the given service.
 	Weight int
-
 	// Filters is a list of HTTP-based filters used to modify a request prior
 	// to routing it to the upstream service
 	Filters HTTPFilters
 
-	// ResponseFilters is a list of HTTP-based filters used to modify the
-	// response returned from the upstream service
-	ResponseFilters HTTPResponseFilters
-
 	// Partition is the partition the config entry is associated with.
 	// Partitioning is a Consul Enterprise feature.
 	Partition string `json:",omitempty"`
diff --git a/api/config_entry_routes_test.go b/api/config_entry_routes_test.go
deleted file mode 100644
index b878612e907e4..0000000000000
--- a/api/config_entry_routes_test.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package api
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestAPI_ConfigEntries_HTTPRoute(t *testing.T) {
-	t.Parallel()
-	c, s := makeClient(t)
-	defer s.Stop()
-
-	configEntries := c.ConfigEntries()
-	route1 := &HTTPRouteConfigEntry{
-		Kind: HTTPRoute,
-		Name: "route1",
-	}
-
-	route2 := &HTTPRouteConfigEntry{
-		Kind: HTTPRoute,
-		Name: "route2",
-	}
-
-	// set it
-	_, wm, err := configEntries.Set(route1, nil)
-	require.NoError(t, err)
-	require.NotNil(t, wm)
-	require.NotEqual(t, 0, wm.RequestTime)
-
-	// also set the second one
-	_, wm, err = configEntries.Set(route2, nil)
-	require.NoError(t, err)
-	require.NotNil(t, wm)
-	require.NotEqual(t, 0, wm.RequestTime)
-
-	// get it
-	entry, qm, err := configEntries.Get(HTTPRoute, "route1", nil)
-	require.NoError(t, err)
-	require.NotNil(t, qm)
-	require.NotEqual(t, 0, qm.RequestTime)
-
-	// verify it
-	readRoute, ok := entry.(*HTTPRouteConfigEntry)
-	require.True(t, ok)
-	require.Equal(t, route1.Kind, readRoute.Kind)
-	require.Equal(t, route1.Name, readRoute.Name)
-	require.Equal(t, route1.Meta, readRoute.Meta)
-	require.Equal(t, route1.Meta, readRoute.GetMeta())
-
-	// update it
-	route1.Rules = []HTTPRouteRule{
-		{
-			Filters: HTTPFilters{
-				URLRewrite: &URLRewrite{
-					Path: "abc",
-				},
-			},
-		},
-	}
-
-	// CAS fail
-	written, _, err := configEntries.CAS(route1, 0, nil)
-	require.NoError(t, err)
-	require.False(t, written)
-
-	// CAS success
-	written, wm, err = configEntries.CAS(route1, readRoute.ModifyIndex, nil)
-	require.NoError(t, err)
-	require.NotNil(t, wm)
-	require.NotEqual(t, 0, wm.RequestTime)
-	require.True(t, written)
-
-	// re-setting should not yield an error
-	_, wm, err = configEntries.Set(route1, nil)
-	require.NoError(t, err)
-	require.NotNil(t, wm)
-	require.NotEqual(t, 0, wm.RequestTime)
-
-	route2.Rules = []HTTPRouteRule{
-		{
-			Filters: HTTPFilters{
-				URLRewrite: &URLRewrite{
-					Path: "def",
-				},
-			},
-		},
-	}
-
-	_, wm, err = configEntries.Set(route2, nil)
-	require.NoError(t, err)
-	require.NotNil(t, wm)
-	require.NotEqual(t, 0, wm.RequestTime)
-
-	// list them
-	entries, qm, err := configEntries.List(HTTPRoute, nil)
-	require.NoError(t, err)
-	require.NotNil(t, qm)
-	require.NotEqual(t, 0, qm.RequestTime)
-	require.Len(t, entries, 2)
-
-	for _, entry = range entries {
-		switch entry.GetName() {
-		case "route1":
-			// this also verifies that the update value was persisted and
-			// the updated values are seen
-			readRoute, ok = entry.(*HTTPRouteConfigEntry)
-			require.True(t, ok)
-			require.Equal(t, route1.Kind, readRoute.Kind)
-			require.Equal(t, route1.Name, readRoute.Name)
-			require.Len(t, readRoute.Rules, 1)
-
-			require.Equal(t, route1.Rules, readRoute.Rules)
-		case "route2":
-			readRoute, ok = entry.(*HTTPRouteConfigEntry)
-			require.True(t, ok)
-			require.Equal(t, route2.Kind, readRoute.Kind)
-			require.Equal(t, route2.Name, readRoute.Name)
-			require.Len(t, readRoute.Rules, 1)
-
-			require.Equal(t, route2.Rules, readRoute.Rules)
-		}
-	}
-
-	// delete it
-	wm, err = configEntries.Delete(HTTPRoute, "route1", nil)
-	require.NoError(t, err)
-	require.NotNil(t, wm)
-	require.NotEqual(t, 0, wm.RequestTime)
-
-	// verify deletion
-	_, _, err = configEntries.Get(HTTPRoute, "route1", nil)
-	require.Error(t, err)
-}
diff --git a/api/config_entry_sameness_group.go b/api/config_entry_sameness_group.go
deleted file mode 100644
index 1217efe7d2ccd..0000000000000
--- a/api/config_entry_sameness_group.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package api
-
-type SamenessGroupConfigEntry struct {
-	Kind               string
-	Name               string
-	Partition          string `json:",omitempty"`
-	DefaultForFailover bool   `json:",omitempty" alias:"default_for_failover"`
-	IncludeLocal       bool   `json:",omitempty" alias:"include_local"`
-	Members            []SamenessGroupMember
-	Meta               map[string]string `json:",omitempty"`
-	CreateIndex        uint64
-	ModifyIndex        uint64
-}
-
-type SamenessGroupMember struct {
-	Partition string `json:",omitempty"`
-	Peer      string `json:",omitempty"`
-}
-
-func (s *SamenessGroupConfigEntry) GetKind() string            { return s.Kind }
-func (s *SamenessGroupConfigEntry) GetName() string            { return s.Name }
-func (s *SamenessGroupConfigEntry) GetPartition() string       { return s.Partition }
-func (s *SamenessGroupConfigEntry) GetNamespace() string       { return "" }
-func (s *SamenessGroupConfigEntry) GetCreateIndex() uint64     { return s.CreateIndex }
-func (s *SamenessGroupConfigEntry) GetModifyIndex() uint64     { return s.ModifyIndex }
-func (s *SamenessGroupConfigEntry) GetMeta() map[string]string { return s.Meta }
diff --git a/api/config_entry_status.go b/api/config_entry_status.go
index 997066f24fe9d..598169a3f2e43 100644
--- a/api/config_entry_status.go
+++ b/api/config_entry_status.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -106,10 +103,6 @@ const (
 	// certificates and cannot bind to any routes
 	GatewayReasonInvalidCertificates GatewayConditionReason = "InvalidCertificates"
 
-	// This reason is used with the "Accepted" condition when the gateway has multiple invalid
-	// JWT providers and cannot bind to any routes
-	GatewayReasonInvalidJWTProviders GatewayConditionReason = "InvalidJWTProviders"
-
 	// This condition indicates that the gateway was unable to resolve
 	// conflicting specification requirements for this Listener. If a
 	// Listener is conflicted, its network port should not be configured
@@ -167,14 +160,6 @@ const (
 	// If the reference is not allowed, the reason RefNotPermitted must be used
 	// instead.
 	GatewayListenerReasonInvalidCertificateRef GatewayConditionReason = "InvalidCertificateRef"
-
-	// This reason is used with the "ResolvedRefs" condition when a
-	// Listener has a JWT configuration with at least one JWTProvider
-	// that is invalid or does not exist.
-	// A JWTProvider is considered invalid when it refers to a nonexistent
-	// or unsupported resource or kind, or when the data within that resource
-	// is malformed.
-	GatewayListenerReasonInvalidJWTProviderRef GatewayConditionReason = "InvalidJWTProviderRef"
 )
 
 var validGatewayConditionReasonsMapping = map[GatewayConditionType]map[ConditionStatus][]GatewayConditionReason{
@@ -183,8 +168,8 @@ var validGatewayConditionReasonsMapping = map[GatewayConditionType]map[Condition
 			GatewayReasonAccepted,
 		},
 		ConditionStatusFalse: {
+			GatewayListenerReasonInvalidCertificateRef, // TODO: remove this in follow up PR
 			GatewayReasonInvalidCertificates,
-			GatewayReasonInvalidJWTProviders,
 		},
 		ConditionStatusUnknown: {},
 	},
@@ -203,7 +188,6 @@ var validGatewayConditionReasonsMapping = map[GatewayConditionType]map[Condition
 		},
 		ConditionStatusFalse: {
 			GatewayListenerReasonInvalidCertificateRef,
-			GatewayListenerReasonInvalidJWTProviderRef,
 		},
 		ConditionStatusUnknown: {},
 	},
@@ -296,10 +280,6 @@ const (
 	// This reason is used with the "Bound" condition when the route fails
 	// to find the gateway
 	RouteReasonGatewayNotFound RouteConditionReason = "GatewayNotFound"
-
-	// This reason is used with the "Accepted" condition when the route references non-existent
-	// JWTProviders
-	RouteReasonJWTProvidersNotFound RouteConditionReason = "JWTProvidersNotFound"
 )
 
 var validRouteConditionReasonsMapping = map[RouteConditionType]map[ConditionStatus][]RouteConditionReason{
@@ -320,7 +300,6 @@ var validRouteConditionReasonsMapping = map[RouteConditionType]map[ConditionStat
 		ConditionStatusFalse: {
 			RouteReasonGatewayNotFound,
 			RouteReasonFailedToBind,
-			RouteReasonJWTProvidersNotFound,
 		},
 		ConditionStatusUnknown: {},
 	},
diff --git a/api/config_entry_test.go b/api/config_entry_test.go
index 2461c387b35f3..af003aa2012f5 100644
--- a/api/config_entry_test.go
+++ b/api/config_entry_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -28,7 +25,6 @@ func TestAPI_ConfigEntries(t *testing.T) {
 				"foo": "bar",
 				"bar": 1.0,
 			},
-			MutualTLSMode: MutualTLSModeStrict,
 			Meta: map[string]string{
 				"foo": "bar",
 				"gir": "zim",
@@ -53,8 +49,7 @@ func TestAPI_ConfigEntries(t *testing.T) {
 		require.Equal(t, global_proxy.Kind, readProxy.Kind)
 		require.Equal(t, global_proxy.Name, readProxy.Name)
 		require.Equal(t, global_proxy.Config, readProxy.Config)
-		require.Equal(t, global_proxy.MutualTLSMode, readProxy.MutualTLSMode)
-		require.Equal(t, global_proxy.Meta, readProxy.GetMeta())
+		require.Equal(t, global_proxy.Meta, readProxy.Meta)
 		require.Equal(t, global_proxy.Meta, readProxy.GetMeta())
 
 		global_proxy.Config["baz"] = true
@@ -102,10 +97,9 @@ func TestAPI_ConfigEntries(t *testing.T) {
 
 	t.Run("Service Defaults", func(t *testing.T) {
 		service := &ServiceConfigEntry{
-			Kind:          ServiceDefaults,
-			Name:          "foo",
-			Protocol:      "udp",
-			MutualTLSMode: MutualTLSModeStrict,
+			Kind:     ServiceDefaults,
+			Name:     "foo",
+			Protocol: "udp",
 			Meta: map[string]string{
 				"foo": "bar",
 				"gir": "zim",
@@ -152,7 +146,6 @@ func TestAPI_ConfigEntries(t *testing.T) {
 		require.Equal(t, service.Kind, readService.Kind)
 		require.Equal(t, service.Name, readService.Name)
 		require.Equal(t, service.Protocol, readService.Protocol)
-		require.Equal(t, service.MutualTLSMode, readService.MutualTLSMode)
 		require.Equal(t, service.Meta, readService.Meta)
 		require.Equal(t, service.Meta, readService.GetMeta())
 		require.Equal(t, service.MaxInboundConnections, readService.MaxInboundConnections)
@@ -223,8 +216,7 @@ func TestAPI_ConfigEntries(t *testing.T) {
 
 	t.Run("Mesh", func(t *testing.T) {
 		mesh := &MeshConfigEntry{
-			TransparentProxy:                 TransparentProxyMeshConfig{MeshDestinationsOnly: true},
-			AllowEnablingPermissiveMutualTLS: true,
+			TransparentProxy: TransparentProxyMeshConfig{MeshDestinationsOnly: true},
 			Meta: map[string]string{
 				"foo": "bar",
 				"gir": "zim",
@@ -416,9 +408,6 @@ func TestDecodeConfigEntry(t *testing.T) {
 					"Type": "file",
 					"Path": "/tmp/logs.txt",
 					"TextFormat": "[%START_TIME%]"
-				},
-				"FailoverPolicy": {
-					"Mode": "default"
 				}
 			}
 			`,
@@ -451,9 +440,6 @@ func TestDecodeConfigEntry(t *testing.T) {
 					Path:                "/tmp/logs.txt",
 					TextFormat:          "[%START_TIME%]",
 				},
-				FailoverPolicy: &ServiceResolverFailoverPolicy{
-					Mode: "default",
-				},
 			},
 		},
 		{
@@ -513,7 +499,6 @@ func TestDecodeConfigEntry(t *testing.T) {
 								"EnforcingConsecutive5xx": 61,
 								"MaxEjectionPercent": 5,
 								"BaseEjectionTime": "6s"
-
 						}
 					}
 				}
diff --git a/api/connect.go b/api/connect.go
index 77be00034d034..1c1da9a37980b 100644
--- a/api/connect.go
+++ b/api/connect.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 // TelemetryCollectorName is the service name for the Consul Telemetry Collector
diff --git a/api/connect_ca.go b/api/connect_ca.go
index 8a5c9f870e954..69c652dacbfd6 100644
--- a/api/connect_ca.go
+++ b/api/connect_ca.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/connect_ca_test.go b/api/connect_ca_test.go
index e0d134e654e5d..8195a7456499e 100644
--- a/api/connect_ca_test.go
+++ b/api/connect_ca_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/connect_intention.go b/api/connect_intention.go
index e91c03e8b71ad..0c2500fd0618e 100644
--- a/api/connect_intention.go
+++ b/api/connect_intention.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -43,10 +40,6 @@ type Intention struct {
 	// same level of tenancy (partition is local to cluster, peer is remote).
 	SourcePeer string `json:",omitempty"`
 
-	// SourceSamenessGroup cannot be wildcards "*" and
-	// is not compatible with legacy intentions.
-	SourceSamenessGroup string `json:",omitempty"`
-
 	// SourceType is the type of the value for the source.
 	SourceType IntentionSourceType
 
diff --git a/api/connect_intention_test.go b/api/connect_intention_test.go
index 66a79e2fe0174..232ce344c186c 100644
--- a/api/connect_intention_test.go
+++ b/api/connect_intention_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/coordinate.go b/api/coordinate.go
index b0269adaef684..7ef6ce2744b7f 100644
--- a/api/coordinate.go
+++ b/api/coordinate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/coordinate_test.go b/api/coordinate_test.go
index 0eb05268e05a0..071b1f99e4c51 100644
--- a/api/coordinate_test.go
+++ b/api/coordinate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/debug.go b/api/debug.go
index e6b5dc52dac2c..b7e80b88d01fb 100644
--- a/api/debug.go
+++ b/api/debug.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/debug_test.go b/api/debug_test.go
index 93f5f41f11e9c..86a10e71bbbb8 100644
--- a/api/debug_test.go
+++ b/api/debug_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/discovery_chain.go b/api/discovery_chain.go
index 4b6260cf34aaa..4217603cf9f3f 100644
--- a/api/discovery_chain.go
+++ b/api/discovery_chain.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -224,7 +221,6 @@ func (r *DiscoveryResolver) UnmarshalJSON(data []byte) error {
 // compiled form of ServiceResolverFailover
 type DiscoveryFailover struct {
 	Targets []string
-	Policy  ServiceResolverFailoverPolicy `json:",omitempty"`
 }
 
 // DiscoveryTarget represents all of the inputs necessary to use a resolver
diff --git a/api/discovery_chain_test.go b/api/discovery_chain_test.go
index 2bd6308f02b76..dd4fc0181c8de 100644
--- a/api/discovery_chain_test.go
+++ b/api/discovery_chain_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/event.go b/api/event.go
index efba89d3b5673..ceded65981ee1 100644
--- a/api/event.go
+++ b/api/event.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/event_test.go b/api/event_test.go
index 912f71e64e88d..84e40a04a781e 100644
--- a/api/event_test.go
+++ b/api/event_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/go.mod b/api/go.mod
index a9e1b8e353a8b..2d95378323e59 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -5,42 +5,42 @@ go 1.19
 replace github.com/hashicorp/consul/sdk => ../sdk
 
 require (
-	github.com/google/go-cmp v0.5.9
-	github.com/hashicorp/consul/sdk v0.14.1
-	github.com/hashicorp/go-cleanhttp v0.5.2
-	github.com/hashicorp/go-hclog v1.5.0
-	github.com/hashicorp/go-multierror v1.1.1
+	github.com/google/go-cmp v0.5.8
+	github.com/hashicorp/consul/sdk v0.13.1
+	github.com/hashicorp/go-cleanhttp v0.5.1
+	github.com/hashicorp/go-hclog v0.12.0
 	github.com/hashicorp/go-rootcerts v1.0.2
-	github.com/hashicorp/go-uuid v1.0.3
+	github.com/hashicorp/go-uuid v1.0.2
 	github.com/hashicorp/serf v0.10.1
-	github.com/mitchellh/mapstructure v1.5.0
-	github.com/stretchr/testify v1.8.3
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
+	github.com/mitchellh/mapstructure v1.4.1
+	github.com/stretchr/testify v1.7.0
+	golang.org/x/exp v0.0.0-20230321023759-10a507213a29
 )
 
 require (
-	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/fatih/color v1.14.1 // indirect
-	github.com/google/btree v1.0.1 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/go-msgpack v0.5.5 // indirect
+	github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fatih/color v1.9.0 // indirect
+	github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect
+	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
+	github.com/hashicorp/go-msgpack v0.5.3 // indirect
+	github.com/hashicorp/go-multierror v1.1.0 // indirect
 	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
 	github.com/hashicorp/go-version v1.2.1 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/memberlist v0.5.0 // indirect
+	github.com/kr/pretty v0.2.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-colorable v0.1.6 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/miekg/dns v1.1.41 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/objx v0.1.0 // indirect
 	golang.org/x/net v0.13.0 // indirect
-	golang.org/x/sync v0.2.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	golang.org/x/sys v0.10.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )
diff --git a/api/go.sum b/api/go.sum
index 6411c8af54469..931ea4e17fc52 100644
--- a/api/go.sum
+++ b/api/go.sum
@@ -1,67 +1,33 @@
-github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
+github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
-github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
-github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
-github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
-github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
-github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
+github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-hclog v0.12.0 h1:d4QkX8FRTYaKaCZBoXYY8zJX2BXjWxurN/GA2tkrmZM=
+github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-immutable-radix v1.0.0 h1:AKDB1HM5PWEA7i4nhcpwOrO2byshxBjXVn/J/3+z5/0=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
-github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-msgpack v0.5.3 h1:zKjpN5BK/P5lMYrLmBHdBULWbJ0XpYR+7NGzqkZzoD4=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI=
-github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI=
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
@@ -70,8 +36,8 @@ github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjG
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
-github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
 github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -83,33 +49,22 @@ github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR
 github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
 github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
 github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
@@ -119,100 +74,55 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
+github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
-github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
 golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -221,15 +131,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/api/health.go b/api/health.go
index a0230020460de..a89b4b7273f56 100644
--- a/api/health.go
+++ b/api/health.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -67,7 +64,6 @@ type HealthCheckDefinition struct {
 	TLSServerName                          string
 	TLSSkipVerify                          bool
 	TCP                                    string
-	TCPUseTLS                              bool
 	UDP                                    string
 	GRPC                                   string
 	OSService                              string
diff --git a/api/health_test.go b/api/health_test.go
index 3f21ab018991c..b69e9275fda2e 100644
--- a/api/health_test.go
+++ b/api/health_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -195,9 +192,8 @@ func TestAPI_HealthChecks_AggregatedStatus(t *testing.T) {
 
 func TestAPI_HealthChecks(t *testing.T) {
 	t.Parallel()
-	const nodename = "node123"
 	c, s := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
-		conf.NodeName = nodename
+		conf.NodeName = "node123"
 	})
 	defer s.Stop()
 
@@ -219,7 +215,7 @@ func TestAPI_HealthChecks(t *testing.T) {
 	retry.Run(t, func(r *retry.R) {
 		checks := HealthChecks{
 			&HealthCheck{
-				Node:        nodename,
+				Node:        "node123",
 				CheckID:     "service:foo",
 				Name:        "Service 'foo' check",
 				Status:      "critical",
diff --git a/api/internal.go b/api/internal.go
deleted file mode 100644
index dee161a65eb24..0000000000000
--- a/api/internal.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package api
-
-import "context"
-
-// Internal can be used to query endpoints that are intended for
-// Hashicorp internal-use only.
-type Internal struct {
-	c *Client
-}
-
-// Internal returns a handle to endpoints that are for internal
-// Hashicorp usage only. There is not guarantee that these will
-// be backwards-compatible or supported, so usage of these is
-// not encouraged.
-func (c *Client) Internal() *Internal {
-	return &Internal{c}
-}
-
-type AssignServiceManualVIPsRequest struct {
-	Service    string
-	ManualVIPs []string
-}
-
-type AssignServiceManualVIPsResponse struct {
-	ServiceFound   bool `json:"Found"`
-	UnassignedFrom []PeeredServiceName
-}
-
-type PeeredServiceName struct {
-	ServiceName CompoundServiceName
-	Peer        string
-}
-
-func (i *Internal) AssignServiceVirtualIP(
-	ctx context.Context,
-	service string,
-	manualVIPs []string,
-	wo *WriteOptions,
-) (*AssignServiceManualVIPsResponse, *QueryMeta, error) {
-	req := i.c.newRequest("PUT", "/v1/internal/service-virtual-ip")
-	req.setWriteOptions(wo)
-	req.ctx = ctx
-	req.obj = AssignServiceManualVIPsRequest{
-		Service:    service,
-		ManualVIPs: manualVIPs,
-	}
-	rtt, resp, err := i.c.doRequest(req)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer closeResponseBody(resp)
-	if err := requireOK(resp); err != nil {
-		return nil, nil, err
-	}
-
-	qm := &QueryMeta{RequestTime: rtt}
-	parseQueryMeta(resp, qm)
-
-	var out AssignServiceManualVIPsResponse
-	if err := decodeBody(resp, &out); err != nil {
-		return nil, nil, err
-	}
-	return &out, qm, nil
-}
diff --git a/api/internal_test.go b/api/internal_test.go
deleted file mode 100644
index ce088f1787d1c..0000000000000
--- a/api/internal_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package api
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestAPI_Internal_AssignServiceVirtualIP(t *testing.T) {
-	t.Parallel()
-	doTest_Internal_AssignServiceVirtualIP(t, &WriteOptions{
-		Namespace: defaultNamespace,
-		Partition: defaultPartition,
-	})
-}
-
-func doTest_Internal_AssignServiceVirtualIP(t *testing.T, writeOpts *WriteOptions) {
-	c, s := makeClient(t)
-	defer s.Stop()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
-	defer cancel()
-
-	if writeOpts.Partition != "" {
-		_, _, err := c.Partitions().Create(ctx, &Partition{Name: writeOpts.Partition}, nil)
-		require.NoError(t, err)
-	}
-	if writeOpts.Namespace != "" {
-		_, _, err := c.Namespaces().Create(&Namespace{Name: writeOpts.Namespace, Partition: writeOpts.Partition}, nil)
-		require.NoError(t, err)
-	}
-
-	// Create resolvers that we can attach VIPs to.
-	for _, name := range []string{"one", "two", "three"} {
-		ok, _, err := c.ConfigEntries().Set(&ServiceResolverConfigEntry{
-			Kind:      ServiceResolver,
-			Name:      name,
-			Namespace: writeOpts.Namespace,
-			Partition: writeOpts.Partition,
-		}, writeOpts)
-		require.NoError(t, err)
-		require.True(t, ok)
-	}
-
-	tests := []struct {
-		tName                string
-		svcName              string
-		vips                 []string
-		expectFound          bool
-		expectUnassignedFrom []PeeredServiceName
-	}{
-		{
-			tName:                "missing service is no-op",
-			svcName:              "missing",
-			vips:                 []string{"1.1.1.1", "2.2.2.2"},
-			expectFound:          false,
-			expectUnassignedFrom: nil,
-		},
-		{
-			tName:                "set vips for one",
-			svcName:              "one",
-			vips:                 []string{"1.1.1.1", "2.2.2.2", "3.3.3.3"},
-			expectFound:          true,
-			expectUnassignedFrom: nil,
-		},
-		{
-			tName:       "move vip to two",
-			svcName:     "two",
-			vips:        []string{"2.2.2.2"},
-			expectFound: true,
-			expectUnassignedFrom: []PeeredServiceName{
-				{ServiceName: CompoundServiceName{Name: "one", Namespace: writeOpts.Namespace, Partition: writeOpts.Partition}},
-			},
-		},
-		{
-			tName:       "move vip to three",
-			svcName:     "three",
-			vips:        []string{"3.3.3.3"},
-			expectFound: true,
-			expectUnassignedFrom: []PeeredServiceName{
-				{ServiceName: CompoundServiceName{Name: "one", Namespace: writeOpts.Namespace, Partition: writeOpts.Partition}},
-			},
-		},
-		{
-			tName:                "no-op try move vips to missing",
-			svcName:              "missing",
-			vips:                 []string{"1.1.1.1", "2.2.2.2", "3.3.3.3"},
-			expectFound:          false,
-			expectUnassignedFrom: nil,
-		},
-		{
-			tName:       "move all vips back to one",
-			svcName:     "one",
-			vips:        []string{"1.1.1.1", "2.2.2.2", "3.3.3.3", "4.4.4.4"},
-			expectFound: true,
-			expectUnassignedFrom: []PeeredServiceName{
-				{ServiceName: CompoundServiceName{Name: "two", Namespace: writeOpts.Namespace, Partition: writeOpts.Partition}},
-				{ServiceName: CompoundServiceName{Name: "three", Namespace: writeOpts.Namespace, Partition: writeOpts.Partition}},
-			},
-		},
-	}
-
-	internal := c.Internal()
-	for _, tc := range tests {
-		t.Run(tc.tName, func(t *testing.T) {
-			resp, _, err := internal.AssignServiceVirtualIP(ctx, tc.svcName, tc.vips, writeOpts)
-			require.NoError(t, err)
-			require.Equal(t, tc.expectFound, resp.ServiceFound)
-			require.ElementsMatch(t, tc.expectUnassignedFrom, resp.UnassignedFrom)
-		})
-	}
-}
diff --git a/api/kv.go b/api/kv.go
index b9d330a6fd3b5..85a9d7750c9b8 100644
--- a/api/kv.go
+++ b/api/kv.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/kv_test.go b/api/kv_test.go
index 1395446a3e413..cc0a507ba0954 100644
--- a/api/kv_test.go
+++ b/api/kv_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/lock.go b/api/lock.go
index e9529f7bde64f..221a7add3ca46 100644
--- a/api/lock.go
+++ b/api/lock.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/lock_test.go b/api/lock_test.go
index 4003a94632f8d..761a97dc3d021 100644
--- a/api/lock_test.go
+++ b/api/lock_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/mock_api_test.go b/api/mock_api_test.go
index 127011f4e9334..fa18faa7aef2c 100644
--- a/api/mock_api_test.go
+++ b/api/mock_api_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/namespace.go b/api/namespace.go
index 98afd229989d9..65cc6f3f3ba96 100644
--- a/api/namespace.go
+++ b/api/namespace.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/namespace_test.go b/api/namespace_test.go
index 8eb52c0dcfc9e..68bbde5a8c484 100644
--- a/api/namespace_test.go
+++ b/api/namespace_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build consulent
+// +build consulent
 
 package api
 
diff --git a/api/operator.go b/api/operator.go
index 667dcd872337d..079e224866395 100644
--- a/api/operator.go
+++ b/api/operator.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 // Operator can be used to perform low-level operator tasks for Consul.
diff --git a/api/operator_area.go b/api/operator_area.go
index 9228d89b47c08..f9fa1339e2f5e 100644
--- a/api/operator_area.go
+++ b/api/operator_area.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 // The /v1/operator/area endpoints are available only in Consul Enterprise and
diff --git a/api/operator_audit.go b/api/operator_audit.go
deleted file mode 100644
index b255d67f4e31c..0000000000000
--- a/api/operator_audit.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// The /v1/operator/audit-hash endpoint is available only in Consul Enterprise and
-// interact with its audit logging subsystem.
-
-package api
-
-type AuditHashRequest struct {
-	Input string
-}
-
-type AuditHashResponse struct {
-	Hash string
-}
-
-func (op *Operator) AuditHash(a *AuditHashRequest, q *QueryOptions) (*AuditHashResponse, error) {
-	r := op.c.newRequest("POST", "/v1/operator/audit-hash")
-	r.setQueryOptions(q)
-	r.obj = a
-
-	rtt, resp, err := op.c.doRequest(r)
-	if err != nil {
-		return nil, err
-	}
-	defer closeResponseBody(resp)
-	if err := requireOK(resp); err != nil {
-		return nil, err
-	}
-
-	wm := &WriteMeta{}
-	wm.RequestTime = rtt
-
-	var out AuditHashResponse
-	if err := decodeBody(resp, &out); err != nil {
-		return nil, err
-	}
-
-	return &out, nil
-}
diff --git a/api/operator_autopilot.go b/api/operator_autopilot.go
index 7628bf6f2fff7..6ab576970924a 100644
--- a/api/operator_autopilot.go
+++ b/api/operator_autopilot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/operator_autopilot_test.go b/api/operator_autopilot_test.go
index 0000863b66756..a0850110ffaae 100644
--- a/api/operator_autopilot_test.go
+++ b/api/operator_autopilot_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/operator_keyring.go b/api/operator_keyring.go
index aefec9e2704e4..6db31a252be96 100644
--- a/api/operator_keyring.go
+++ b/api/operator_keyring.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 // keyringRequest is used for performing Keyring operations
diff --git a/api/operator_keyring_test.go b/api/operator_keyring_test.go
index 10df235c397e6..85f0d19aa3be2 100644
--- a/api/operator_keyring_test.go
+++ b/api/operator_keyring_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/operator_license.go b/api/operator_license.go
index 1e3496da0e1ae..74eed3baa4d67 100644
--- a/api/operator_license.go
+++ b/api/operator_license.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/operator_raft.go b/api/operator_raft.go
index f0f5794aa5af0..f0ffa15228722 100644
--- a/api/operator_raft.go
+++ b/api/operator_raft.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 // RaftServer has information about a server in the Raft configuration.
@@ -68,14 +65,9 @@ func (op *Operator) RaftGetConfiguration(q *QueryOptions) (*RaftConfiguration, e
 }
 
 // RaftLeaderTransfer is used to transfer the current raft leader to another node
-// Optionally accepts a non-empty id of another node to transfer leadership to.
-func (op *Operator) RaftLeaderTransfer(id string, q *QueryOptions) (*TransferLeaderResponse, error) {
+func (op *Operator) RaftLeaderTransfer(q *QueryOptions) (*TransferLeaderResponse, error) {
 	r := op.c.newRequest("POST", "/v1/operator/raft/transfer-leader")
 	r.setQueryOptions(q)
-
-	if id != "" {
-		r.params.Set("id", id)
-	}
 	_, resp, err := op.c.doRequest(r)
 	if err != nil {
 		return nil, err
diff --git a/api/operator_raft_test.go b/api/operator_raft_test.go
index eefffec0775d5..ecefaa9719204 100644
--- a/api/operator_raft_test.go
+++ b/api/operator_raft_test.go
@@ -1,12 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
+	"strings"
 	"testing"
-
-	"github.com/hashicorp/consul/sdk/testutil"
 )
 
 func TestAPI_OperatorRaftGetConfiguration(t *testing.T) {
@@ -28,181 +24,33 @@ func TestAPI_OperatorRaftGetConfiguration(t *testing.T) {
 
 func TestAPI_OperatorRaftRemovePeerByAddress(t *testing.T) {
 	t.Parallel()
-	c1, s1 := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
-		if conf.Autopilot == nil {
-			conf.Autopilot = &testutil.TestAutopilotConfig{}
-		}
-		conf.Autopilot.ServerStabilizationTime = "1ms"
-	})
-	defer s1.Stop()
-
-	_, s2 := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
-		conf.Server = true
-		conf.Bootstrap = false
-		conf.RetryJoin = []string{s1.LANAddr}
-		if conf.Autopilot == nil {
-			conf.Autopilot = &testutil.TestAutopilotConfig{}
-		}
-		conf.Autopilot.ServerStabilizationTime = "1ms"
-	})
-	defer s2.Stop()
-	s2.WaitForVoting(t)
-
-	operator := c1.Operator()
-	err := operator.RaftRemovePeerByAddress(s2.ServerAddr, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	cfg, err := c1.Operator().RaftGetConfiguration(nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if len(cfg.Servers) != 1 {
-		t.Fatalf("more than 1 server left: %+v", cfg.Servers)
-	}
-}
-
-func TestAPI_OperatorRaftRemovePeerByID(t *testing.T) {
-	t.Parallel()
-	c1, s1 := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
-		if conf.Autopilot == nil {
-			conf.Autopilot = &testutil.TestAutopilotConfig{}
-		}
-		conf.Autopilot.ServerStabilizationTime = "1ms"
-	})
-	defer s1.Stop()
-
-	_, s2 := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
-		conf.Server = true
-		conf.Bootstrap = false
-		conf.RetryJoin = []string{s1.LANAddr}
-		if conf.Autopilot == nil {
-			conf.Autopilot = &testutil.TestAutopilotConfig{}
-		}
-		conf.Autopilot.ServerStabilizationTime = "1ms"
-	})
-	defer s2.Stop()
-	s2.WaitForVoting(t)
-
-	operator := c1.Operator()
-	err := operator.RaftRemovePeerByID(s2.Config.NodeID, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
+	c, s := makeClient(t)
+	defer s.Stop()
 
-	cfg, err := c1.Operator().RaftGetConfiguration(nil)
-	if err != nil {
+	// If we get this error, it proves we sent the address all the way
+	// through.
+	operator := c.Operator()
+	err := operator.RaftRemovePeerByAddress("nope", nil)
+	if err == nil || !strings.Contains(err.Error(),
+		"address \"nope\" was not found in the Raft configuration") {
 		t.Fatalf("err: %v", err)
 	}
-	if len(cfg.Servers) != 1 {
-		t.Fatalf("more than 1 server left: %+v", cfg.Servers)
-	}
 }
 
 func TestAPI_OperatorRaftLeaderTransfer(t *testing.T) {
 	t.Parallel()
-	c1, s1 := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
-		if conf.Autopilot == nil {
-			conf.Autopilot = &testutil.TestAutopilotConfig{}
-		}
-		conf.Autopilot.ServerStabilizationTime = "1ms"
-	})
-	defer s1.Stop()
-
-	_, s2 := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
-		conf.Server = true
-		conf.Bootstrap = false
-		conf.RetryJoin = []string{s1.LANAddr}
-		if conf.Autopilot == nil {
-			conf.Autopilot = &testutil.TestAutopilotConfig{}
-		}
-		conf.Autopilot.ServerStabilizationTime = "1ms"
-	})
-	defer s2.Stop()
-	s2.WaitForVoting(t)
-
-	cfg, err := c1.Operator().RaftGetConfiguration(nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if len(cfg.Servers) != 2 {
-		t.Fatalf("not 2 servers: %#v", cfg.Servers)
-	}
-	var leaderID string
-	for _, srv := range cfg.Servers {
-		if srv.Leader {
-			leaderID = srv.ID
-		}
-	}
-	if leaderID == "" {
-		t.Fatalf("no leader: %+v", cfg.Servers)
-	}
-
-	transfer, err := c1.Operator().RaftLeaderTransfer("", nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if !transfer.Success {
-		t.Fatal("unsuccessful transfer")
-	}
-
-	s2.WaitForLeader(t)
-
-	cfg, err = c1.Operator().RaftGetConfiguration(nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	var newLeaderID string
-	for _, srv := range cfg.Servers {
-		if srv.Leader {
-			newLeaderID = srv.ID
-		}
-	}
-	if newLeaderID == "" {
-		t.Fatalf("no leader: %#v", cfg.Servers)
-	}
-	if newLeaderID == leaderID {
-		t.Fatalf("leader did not change: %v == %v", newLeaderID, leaderID)
-	}
-
-	_, s3 := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
-		conf.Server = true
-		conf.Bootstrap = false
-		conf.RetryJoin = []string{s1.LANAddr, s2.LANAddr}
-		if conf.Autopilot == nil {
-			conf.Autopilot = &testutil.TestAutopilotConfig{}
-		}
-		conf.Autopilot.ServerStabilizationTime = "1ms"
-	})
-	defer s3.Stop()
-	s3.WaitForVoting(t)
-
-	// Transfer it to another member
-	transfer, err = c1.Operator().RaftLeaderTransfer(s3.Config.NodeID, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	if !transfer.Success {
-		t.Fatal("unsuccessful transfer")
-	}
-
-	s3.WaitForLeader(t)
+	c, s := makeClient(t)
+	defer s.Stop()
 
-	cfg, err = c1.Operator().RaftGetConfiguration(nil)
-	if err != nil {
+	// If we get this error, it proves we sent the address all the way
+	// through.
+	operator := c.Operator()
+	transfer, err := operator.RaftLeaderTransfer(nil)
+	if err == nil || !strings.Contains(err.Error(),
+		"cannot find peer") {
 		t.Fatalf("err: %v", err)
 	}
-	newLeaderID = ""
-	for _, srv := range cfg.Servers {
-		if srv.Leader {
-			newLeaderID = srv.ID
-		}
-	}
-	if newLeaderID == "" {
-		t.Fatalf("no leader: %#v", cfg.Servers)
-	}
-	if newLeaderID != s3.Config.NodeID {
-		t.Fatalf("leader is not s3: %v != %v", newLeaderID, s3.Config.NodeID)
+	if transfer != nil {
+		t.Fatalf("err:%v", transfer)
 	}
 }
diff --git a/api/operator_segment.go b/api/operator_segment.go
index 6115a7ab4b58e..92b05d3c03bdb 100644
--- a/api/operator_segment.go
+++ b/api/operator_segment.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 // SegmentList returns all the available LAN segments.
diff --git a/api/operator_usage.go b/api/operator_usage.go
index 8977449ddd361..d07e774d8100d 100644
--- a/api/operator_usage.go
+++ b/api/operator_usage.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 type Usage struct {
@@ -10,7 +7,6 @@ type Usage struct {
 
 // ServiceUsage contains information about the number of services and service instances for a datacenter.
 type ServiceUsage struct {
-	Nodes                   int
 	Services                int
 	ServiceInstances        int
 	ConnectServiceInstances map[string]int
diff --git a/api/operator_usage_test.go b/api/operator_usage_test.go
index 77b15fcdb586e..a4a85a92992bc 100644
--- a/api/operator_usage_test.go
+++ b/api/operator_usage_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/partition.go b/api/partition.go
index 8467c31189666..88edfb7b0bca2 100644
--- a/api/partition.go
+++ b/api/partition.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/peering.go b/api/peering.go
index dd7780f630a63..34602c878da1c 100644
--- a/api/peering.go
+++ b/api/peering.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -47,16 +44,6 @@ type PeeringRemoteInfo struct {
 	Partition string
 	// Datacenter is the remote peer's datacenter.
 	Datacenter string
-	Locality   *Locality `json:",omitempty"`
-}
-
-// Locality identifies where a given entity is running.
-type Locality struct {
-	// Region is region the zone belongs to.
-	Region string
-
-	// Zone is the zone the entity is running in.
-	Zone string
 }
 
 type Peering struct {
diff --git a/api/peering_test.go b/api/peering_test.go
index 3ad8818ff0034..9636367a3910f 100644
--- a/api/peering_test.go
+++ b/api/peering_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/prepared_query.go b/api/prepared_query.go
index 8ebc852f3ac5a..f47a583735e3d 100644
--- a/api/prepared_query.go
+++ b/api/prepared_query.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 // QueryFailoverOptions sets options about how we fail over if there are no
@@ -29,14 +26,6 @@ type QueryFailoverTarget struct {
 
 	// Datacenter specifies a datacenter to try during failover.
 	Datacenter string
-
-	// Partition specifies a partition to try during failover
-	// Note: Partition are available only in Consul Enterprise
-	Partition string `json:",omitempty"`
-
-	// Namespace specifies a namespace to try during failover
-	// Note: Namespaces are available only in Consul Enterprise
-	Namespace string `json:",omitempty"`
 }
 
 // QueryDNSOptions controls settings when query results are served over DNS.
@@ -51,17 +40,9 @@ type ServiceQuery struct {
 	// Service is the service to query.
 	Service string
 
-	// SamenessGroup specifies a sameness group to query. The first member of the Sameness Group will
-	// be targeted first on PQ execution and subsequent members will be targeted during failover scenarios.
-	// This field is mutually exclusive with Failover.
-	SamenessGroup string `json:",omitempty"`
-
 	// Namespace of the service to query
 	Namespace string `json:",omitempty"`
 
-	// Partition of the service to query
-	Partition string `json:",omitempty"`
-
 	// Near allows baking in the name of a node to automatically distance-
 	// sort from. The magic "_agent" value is supported, which sorts near
 	// the agent which initiated the request by default.
@@ -69,7 +50,7 @@ type ServiceQuery struct {
 
 	// Failover controls what we do if there are no healthy nodes in the
 	// local datacenter.
-	Failover QueryFailoverOptions `json:",omitempty"`
+	Failover QueryFailoverOptions
 
 	// IgnoreCheckIDs is an optional list of health check IDs to ignore when
 	// considering which nodes are healthy. It is useful as an emergency measure
diff --git a/api/prepared_query_test.go b/api/prepared_query_test.go
index d53ea2751da1e..f684b26d3f053 100644
--- a/api/prepared_query_test.go
+++ b/api/prepared_query_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/raw.go b/api/raw.go
index 639513d29fa80..745a208c99d54 100644
--- a/api/raw.go
+++ b/api/raw.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 // Raw can be used to do raw queries against custom endpoints
diff --git a/api/semaphore.go b/api/semaphore.go
index 9d98ff5c29b72..066ce33a9d623 100644
--- a/api/semaphore.go
+++ b/api/semaphore.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/semaphore_test.go b/api/semaphore_test.go
index bb0057ca5ed85..37294c411bebf 100644
--- a/api/semaphore_test.go
+++ b/api/semaphore_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/session.go b/api/session.go
index 69fd77d2790c9..3f61acfbb4749 100644
--- a/api/session.go
+++ b/api/session.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/session_test.go b/api/session_test.go
index 9b968cd621adb..687feb58cfe51 100644
--- a/api/session_test.go
+++ b/api/session_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/snapshot.go b/api/snapshot.go
index bcc80e5b3dea1..b526b79c3be71 100644
--- a/api/snapshot.go
+++ b/api/snapshot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/snapshot_test.go b/api/snapshot_test.go
index c87b01c1e5395..938360d49432c 100644
--- a/api/snapshot_test.go
+++ b/api/snapshot_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/status.go b/api/status.go
index 8c52eb222bf75..86f943bc76218 100644
--- a/api/status.go
+++ b/api/status.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 // Status can be used to query the Status endpoints
diff --git a/api/status_test.go b/api/status_test.go
index c5c3393622d98..91bcfaafdb56a 100644
--- a/api/status_test.go
+++ b/api/status_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/txn.go b/api/txn.go
index 59adafdac3de6..4aa06d9f5488b 100644
--- a/api/txn.go
+++ b/api/txn.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
diff --git a/api/txn_test.go b/api/txn_test.go
index ea454976daea3..81348a8c27d09 100644
--- a/api/txn_test.go
+++ b/api/txn_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package api
 
 import (
@@ -361,10 +358,7 @@ func TestAPI_ClientTxn(t *testing.T) {
 						"wan":      s.Config.Bind,
 						"wan_ipv4": s.Config.Bind,
 					},
-					Meta: map[string]string{
-						"consul-network-segment": "",
-						"consul-version":         s.Config.Version,
-					},
+					Meta:        map[string]string{"consul-network-segment": ""},
 					CreateIndex: ret.Results[1].Node.CreateIndex,
 					ModifyIndex: ret.Results[1].Node.ModifyIndex,
 				},
diff --git a/api/watch/funcs.go b/api/watch/funcs.go
index 0d0f6e100c2b4..5fcfbffa1fe02 100644
--- a/api/watch/funcs.go
+++ b/api/watch/funcs.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package watch
 
 import (
diff --git a/api/watch/funcs_test.go b/api/watch/funcs_test.go
index 4bd79a59c14f9..db2d4a70e7205 100644
--- a/api/watch/funcs_test.go
+++ b/api/watch/funcs_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package watch_test
 
 import (
@@ -1196,110 +1193,6 @@ func TestChecksWatch_Filter(t *testing.T) {
 	}
 }
 
-func TestChecksWatch_Filter_by_ServiceNameStatus(t *testing.T) {
-	t.Parallel()
-	c, s := makeClient(t)
-	defer s.Stop()
-
-	s.WaitForSerfCheck(t)
-
-	var (
-		wakeups  [][]*api.HealthCheck
-		notifyCh = make(chan struct{})
-	)
-
-	plan := mustParse(t, `{"type":"checks", "filter":"ServiceName == bar and Status == critical"}`)
-	plan.Handler = func(idx uint64, raw interface{}) {
-		if raw == nil {
-			return // ignore
-		}
-		v, ok := raw.([]*api.HealthCheck)
-		if !ok {
-			return // ignore
-		}
-		wakeups = append(wakeups, v)
-		notifyCh <- struct{}{}
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		if err := plan.Run(s.HTTPAddr); err != nil {
-			t.Errorf("err: %v", err)
-		}
-	}()
-	defer plan.Stop()
-
-	// Wait for first wakeup.
-	<-notifyCh
-	{
-		catalog := c.Catalog()
-
-		// we don't want to find this one
-		reg := &api.CatalogRegistration{
-			Node:       "foo",
-			Address:    "1.1.1.1",
-			Datacenter: "dc1",
-			Service: &api.AgentService{
-				ID:      "foo",
-				Service: "foo",
-				Tags:    []string{"a"},
-			},
-			Check: &api.AgentCheck{
-				Node:      "foo",
-				CheckID:   "foo",
-				Name:      "foo",
-				Status:    api.HealthPassing,
-				ServiceID: "foo",
-			},
-		}
-		if _, err := catalog.Register(reg, nil); err != nil {
-			t.Fatalf("err: %v", err)
-		}
-
-		// we want to find this one
-		reg = &api.CatalogRegistration{
-			Node:       "bar",
-			Address:    "2.2.2.2",
-			Datacenter: "dc1",
-			Service: &api.AgentService{
-				ID:      "bar",
-				Service: "bar",
-				Tags:    []string{"a", "b"},
-			},
-			Check: &api.AgentCheck{
-				Node:      "bar",
-				CheckID:   "bar",
-				Name:      "bar",
-				Status:    api.HealthCritical,
-				ServiceID: "bar",
-			},
-		}
-		if _, err := catalog.Register(reg, nil); err != nil {
-			t.Fatalf("err: %v", err)
-		}
-	}
-
-	// Wait for second wakeup.
-	<-notifyCh
-
-	plan.Stop()
-	wg.Wait()
-
-	require.Len(t, wakeups, 2)
-
-	{
-		v := wakeups[0]
-		require.Len(t, v, 0)
-	}
-	{
-		v := wakeups[1]
-		require.Len(t, v, 1)
-		require.Equal(t, "bar", v[0].CheckID)
-	}
-}
-
 func TestEventWatch(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)
diff --git a/api/watch/plan.go b/api/watch/plan.go
index a3588ff184a78..33557808ee208 100644
--- a/api/watch/plan.go
+++ b/api/watch/plan.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package watch
 
 import (
diff --git a/api/watch/plan_test.go b/api/watch/plan_test.go
index 5a772604736f9..d0209fc5502ec 100644
--- a/api/watch/plan_test.go
+++ b/api/watch/plan_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package watch
 
 import (
diff --git a/api/watch/watch.go b/api/watch/watch.go
index ea00f8ef0cba8..1dce252911d5d 100644
--- a/api/watch/watch.go
+++ b/api/watch/watch.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package watch
 
 import (
diff --git a/api/watch/watch_test.go b/api/watch/watch_test.go
index f8af19a35ec8a..e3dc32ef1db59 100644
--- a/api/watch/watch_test.go
+++ b/api/watch/watch_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package watch
 
 import (
diff --git a/buf.work.yaml b/buf.work.yaml
deleted file mode 100644
index 5fab419b164bf..0000000000000
--- a/buf.work.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-version: v1
-directories:
-  - proto
-  - proto-public
-
diff --git a/build-support/docker/Build-Go.dockerfile b/build-support/docker/Build-Go.dockerfile
index c0186842fb765..f8704065d4933 100644
--- a/build-support/docker/Build-Go.dockerfile
+++ b/build-support/docker/Build-Go.dockerfile
@@ -1,5 +1,5 @@
 # Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
+# SPDX-License-Identifier: MPL-2.0
 
 ARG GOLANG_VERSION=1.20.8
 FROM golang:${GOLANG_VERSION}
diff --git a/build-support/docker/Build-UI.dockerfile b/build-support/docker/Build-UI.dockerfile
index 9d646fb6ea69c..c89c3c1ec9303 100644
--- a/build-support/docker/Build-UI.dockerfile
+++ b/build-support/docker/Build-UI.dockerfile
@@ -1,7 +1,4 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-FROM docker.mirror.hashicorp.services/circleci/node:16-browsers
+FROM docker.mirror.hashicorp.services/circleci/node:14-browsers
 
 USER root
 
diff --git a/build-support/docker/Consul-Dev-Dbg.dockerfile b/build-support/docker/Consul-Dev-Dbg.dockerfile
deleted file mode 100644
index 488fb053264ed..0000000000000
--- a/build-support/docker/Consul-Dev-Dbg.dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-FROM consul:local
-EXPOSE 4000
-
-COPY --from=golang:1.20-alpine /usr/local/go/ /usr/local/go/
-
-ENV PATH="/usr/local/go/bin:${PATH}"
-
-RUN CGO_ENABLED=0 go install -ldflags "-s -w -extldflags '-static'" github.com/go-delve/delve/cmd/dlv@latest
-
-CMD [ "/root/go/bin/dlv", "exec", "/bin/consul", "--listen=:4000", "--headless=true", "", "--accept-multiclient", "--continue", "--api-version=2", "--", "agent", "--advertise=0.0.0.0"]
\ No newline at end of file
diff --git a/build-support/docker/Consul-Dev-Multiarch.dockerfile b/build-support/docker/Consul-Dev-Multiarch.dockerfile
index e35a98d5f8902..bb8e50018b252 100644
--- a/build-support/docker/Consul-Dev-Multiarch.dockerfile
+++ b/build-support/docker/Consul-Dev-Multiarch.dockerfile
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 ARG CONSUL_IMAGE_VERSION=latest
 FROM hashicorp/consul:${CONSUL_IMAGE_VERSION}
 RUN apk update && apk add iptables
diff --git a/build-support/docker/Consul-Dev.dockerfile b/build-support/docker/Consul-Dev.dockerfile
index 12f014969ab51..0b1743cd19ac6 100644
--- a/build-support/docker/Consul-Dev.dockerfile
+++ b/build-support/docker/Consul-Dev.dockerfile
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 ARG CONSUL_IMAGE_VERSION=latest
 FROM hashicorp/consul:${CONSUL_IMAGE_VERSION}
 RUN apk update && apk add iptables
diff --git a/build-support/functions/00-vars.sh b/build-support/functions/00-vars.sh
index ef8433c34ebb5..9007057994f76 100644
--- a/build-support/functions/00-vars.sh
+++ b/build-support/functions/00-vars.sh
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # GPG Key ID to use for publically released builds
 HASHICORP_GPG_KEY="348FFC4C"
 
diff --git a/build-support/functions/10-util.sh b/build-support/functions/10-util.sh
index 4bb9f35a9f381..678c5d18ba67f 100644
--- a/build-support/functions/10-util.sh
+++ b/build-support/functions/10-util.sh
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 function err {
    if test "${COLORIZE}" -eq 1
    then
diff --git a/build-support/functions/20-build.sh b/build-support/functions/20-build.sh
index c49ff0c592986..fd0e46ffd6092 100644
--- a/build-support/functions/20-build.sh
+++ b/build-support/functions/20-build.sh
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 function supported_osarch {
    # Arguments:
    #   $1 - osarch - example, linux/amd64
diff --git a/build-support/functions/30-release.sh b/build-support/functions/30-release.sh
index 26f7c1048995e..f5c7c5e23b694 100644
--- a/build-support/functions/30-release.sh
+++ b/build-support/functions/30-release.sh
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 function tag_release {
    # Arguments:
    #   $1 - Path to top level consul source
diff --git a/build-support/scripts/build-date.sh b/build-support/scripts/build-date.sh
index 49f3851bef47c..e3db3c6626ab0 100755
--- a/build-support/scripts/build-date.sh
+++ b/build-support/scripts/build-date.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 readonly SCRIPT_NAME="$(basename ${BASH_SOURCE[0]})"
 readonly SCRIPT_DIR="$(dirname ${BASH_SOURCE[0]})"
 readonly SOURCE_DIR="$(dirname "$(dirname "${SCRIPT_DIR}")")"
diff --git a/build-support/scripts/build-docker.sh b/build-support/scripts/build-docker.sh
index d36196e66bfd0..5600a78bfb930 100755
--- a/build-support/scripts/build-docker.sh
+++ b/build-support/scripts/build-docker.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 readonly SCRIPT_NAME="$(basename ${BASH_SOURCE[0]})"
 readonly SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
diff --git a/build-support/scripts/check-allowed-imports.sh b/build-support/scripts/check-allowed-imports.sh
deleted file mode 100755
index 02cd8ffdee8ba..0000000000000
--- a/build-support/scripts/check-allowed-imports.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-
-readonly SCRIPT_NAME="$(basename ${BASH_SOURCE[0]})"
-readonly SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
-readonly SOURCE_DIR="$(dirname "$(dirname "${SCRIPT_DIR}")")"
-readonly FN_DIR="$(dirname "${SCRIPT_DIR}")/functions"
-
-source "${SCRIPT_DIR}/functions.sh"
-
-
-set -uo pipefail
-
-usage() {
-cat <<-EOF
-Usage: ${SCRIPT_NAME} <module root> [<allowed relative package path>...]
-
-Description:
-    Verifies that only the specified packages may be imported from the given module 
-
-Options:
-    -h | --help              Print this help text.
-EOF
-}
-
-function err_usage {
-    err "$1"
-    err ""
-    err "$(usage)"
-}
-
-function main {
-   local module_root=""
-   declare -a allowed_packages=()
-   while test $# -gt 0
-   do
-      case "$1" in
-         -h | --help )
-         usage
-         return 0
-         ;;
-      * )
-         if test -z "$module_root"
-         then
-            module_root="$1"
-         else
-            allowed_packages+=("$1")
-         fi
-         shift     
-      esac
-   done
-   
-   # If we could guarantee this ran with bash 4.2+ then the final argument could
-   # be just ${allowed_packages[@]}. However that with older versions of bash
-   # in combination with set -u causes bash to emit errors about using unbound
-   # variables when no allowed packages have been specified (i.e. the module should
-   # generally be disallowed with no exceptions). This syntax is very strange
-   # but seems to be the prescribed workaround I found.
-   check_imports "$module_root" ${allowed_packages[@]+"${allowed_packages[@]}"}
-   return $?
-}
-
-function check_imports {
-   local module_root="$1"
-   shift
-   local allowed_packages="$@"
-   
-   module_imports=$( go list -test -f '{{join .TestImports "\n"}}' ./... | grep "$module_root" | sort | uniq)
-   module_test_imports=$( go list -test -f '{{join .TestImports "\n"}}' ./... | grep "$module_root" | sort | uniq)
-
-   any_error=0
-   
-   for imp in $module_imports
-   do
-      is_import_allowed "$imp" "$module_root" $allowed_packages
-      allowed=$?
-      
-      if test $any_error -ne 1
-      then
-         any_error=$allowed
-      fi
-   done
-  
-   if test $any_error -eq 1
-   then
-      echo "Only the following direct imports are allowed from module $module_root:"
-      for pkg in $allowed_packages
-      do
-         echo "   * $pkg"
-      done
-   fi
-
-   return $any_error   
-}
-
-function is_import_allowed {
-   local pkg_import=$1
-   shift
-   local module_root=$1
-   shift
-   local allowed_packages="$@"
-   
-   # check if the import path is a part of the module we are restricting imports for
-   if test "$( go list -f '{{.Module.Path}}' $pkg_import)" != "$module_root"
-   then
-      return 0
-   fi
-   
-   for pkg in $allowed_packages
-   do
-      if test "${module_root}/$pkg" == "$pkg_import"
-      then
-         return 0
-      fi
-   done
-   
-   err "Import of package $pkg_import is not allowed"
-   return 1
-}
-
-main "$@"
-exit $?
\ No newline at end of file
diff --git a/build-support/scripts/devtools.sh b/build-support/scripts/devtools.sh
index a52e238767a88..14002497daaec 100755
--- a/build-support/scripts/devtools.sh
+++ b/build-support/scripts/devtools.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 readonly SCRIPT_NAME="$(basename ${BASH_SOURCE[0]})"
 readonly SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
@@ -124,9 +121,7 @@ function proto_tools_install {
         "${mog_version}" \
         'github.com/hashicorp/mog'
 
-    install_local_protoc_generator "${SOURCE_DIR}/internal/tools/protoc-gen-consul-rate-limit"
-    
-    install_local_protoc_generator "${SOURCE_DIR}/internal/resource/protoc-gen-resource-types"
+    install_protoc_gen_consul_rate_limit
 
     return 0
 }
@@ -151,30 +146,14 @@ function lint_install {
 }
 
 function codegen_install {
-  deepcopy_install
-  copywrite_install
-}
-
-function deepcopy_install {
-  local deep_copy_version
-      deep_copy_version="$(make --no-print-directory print-DEEP_COPY_VERSION)"
-
-      install_versioned_tool \
-          'deep-copy' \
-          'github.com/globusdigital/deep-copy' \
-          "${deep_copy_version}" \
-          'github.com/globusdigital/deep-copy'
-}
-
-function copywrite_install {
-    local copywrite_version
-    copywrite_version="$(make --no-print-directory print-COPYWRITE_TOOL_VERSION)"
+    local deep_copy_version
+    deep_copy_version="$(make --no-print-directory print-DEEP_COPY_VERSION)"
 
     install_versioned_tool \
-        'copywrite' \
-        'github.com/hashicorp/copywrite' \
-        "${copywrite_version}" \
-        'github.com/hashicorp/copywrite'
+        'deep-copy' \
+        'github.com/globusdigital/deep-copy' \
+        "${deep_copy_version}" \
+        'github.com/globusdigital/deep-copy'
 }
 
 function tools_install {
@@ -182,7 +161,6 @@ function tools_install {
     lint_install
     proto_tools_install
     codegen_install
-    copywrite_install
 
     return 0
 }
@@ -267,10 +245,9 @@ function install_versioned_tool {
     return 0
 }
 
-function install_local_protoc_generator {
-    local src=$1
-    echo "installing tool $(basename $src) from local source"
-    pushd -- "$src" > /dev/null
+function install_protoc_gen_consul_rate_limit {
+    echo "installing tool protoc-gen-consul-rate-limit from local source"
+    pushd -- "${SOURCE_DIR}/internal/tools/protoc-gen-consul-rate-limit" > /dev/null
     go install
     popd > /dev/null
 }
diff --git a/build-support/scripts/envoy-library-references.sh b/build-support/scripts/envoy-library-references.sh
index bca15806c7e47..ac8f8a23e0095 100644
--- a/build-support/scripts/envoy-library-references.sh
+++ b/build-support/scripts/envoy-library-references.sh
@@ -23,12 +23,12 @@ unset CDPATH
 cd "$(dirname "$0")" # build-support/scripts
 cd ../..             # <ROOT>
 
-if [[ ! -f Makefile ]] || [[ ! -f go.mod ]]; then
+if [[ ! -f GNUmakefile ]] || [[ ! -f go.mod ]]; then
     echo "not in root consul checkout: ${PWD}" >&2
     exit 1
 fi
 
-readonly LIBRARY_VERSION="$(grep -e "github.com/envoyproxy/go-control-plane[[:space:]]" go.mod | awk '{print $2}')"
+readonly LIBRARY_VERSION="$(grep github.com/envoyproxy/go-control-plane go.mod | awk '{print $2}')"
 readonly OUTFILE=z_xds_packages.go
 
 echo "Fetching envoyproxy/go-control-plane @ ${LIBRARY_VERSION}..."
@@ -39,7 +39,7 @@ trap "rm -rf _envoy_tmp" EXIT
 (
 cd _envoy_tmp
 
-git clone https://github.com/envoyproxy/go-control-plane
+git clone git@github.com:envoyproxy/go-control-plane
 cd go-control-plane
 git checkout -b consul-temp "${LIBRARY_VERSION}"
 
@@ -64,6 +64,7 @@ echo ")" >> "${OUTFILE}"
 goimports -w "${OUTFILE}"
 
 mv -f "${OUTFILE}" ../../agent/xds
+)
 
 echo "Generating a fresh troubleshoot ${OUTFILE} file..."
 cat <<-EOF > "${OUTFILE}"
@@ -83,7 +84,7 @@ echo ")" >> "${OUTFILE}"
 
 goimports -w "${OUTFILE}"
 
-mv -f "${OUTFILE}" ../../troubleshoot/proxy
+mv -f "${OUTFILE}" ../../troubleshoot/connect
 )
 
 
diff --git a/build-support/scripts/functions.sh b/build-support/scripts/functions.sh
index 4db767f13c559..75beeb141c03f 100755
--- a/build-support/scripts/functions.sh
+++ b/build-support/scripts/functions.sh
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 #
 # NOTE: This file is meant to be sourced from other bash scripts/shells
 #
diff --git a/build-support/scripts/protobuf.sh b/build-support/scripts/protobuf.sh
index 20d06c807763b..f9c193767432c 100755
--- a/build-support/scripts/protobuf.sh
+++ b/build-support/scripts/protobuf.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 readonly SCRIPT_NAME="$(basename ${BASH_SOURCE[0]})"
 readonly SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
@@ -51,10 +48,24 @@ function main {
     local mods=$(find . -name 'buf.gen.yaml' -exec dirname {} \; | sort)
     for mod in $mods
     do
-        status_stage "Generating protobuf module: $mod"
         (
+            # This looks special and it is. First of all this is not just `buf generate`
+            # from within the $mod directory because doing that would have caused global
+            # file registration conflicts when Consul starts. TLDR there is that Go's
+            # protobuf code tracks protobufs by their file paths so those filepaths all
+            # must be unique.
+            #
+            # To work around those constraints we are trying to get the file descriptors
+            # passed off to protoc-gen-go to include the top level path. The file paths
+            # in the file descriptors will be relative to where `buf` is run. Therefore
+            # we must run `buf` from the root of the repo but still tell it to only
+            # generate the singular directory. The --template argument allows us to
+            # point buf a particular configuration for what code to generate. The 
+            # --path argument allows us to tell `buf` which files/directories to 
+            # operate on. Hopefully in the future `buf` will be able to add prefixes
+            # to file descriptor paths and we can modify this to work in a more natural way.
+            buf generate --template ${mod}/buf.gen.yaml --path ${mod}
             cd $mod
-            buf generate
             for proto_file in $(buf ls-files)
             do
                 postprocess_protobuf_code $proto_file
@@ -72,10 +83,6 @@ function main {
 
     status "Generated gRPC rate limit mapping file"
 
-    generate_protoset_file
-
-    status "Generated protoset file"
-
     return 0
 }
 
@@ -103,7 +110,7 @@ function postprocess_protobuf_code {
     if test -n "${build_tags}"; then
        for file in "${proto_go_path}" "${proto_go_bin_path}" "${proto_go_grpc_path}"
        do
-            if test -f "${file}" -a "$(head -n 2 ${file})" != "${build_tags}"
+            if test -f "${file}"
             then
                 echo "Adding build tags to ${file}"
                 echo -e "${build_tags}\n" >> "${file}.new"
@@ -126,7 +133,7 @@ function postprocess_protobuf_code {
 function generate_mog_code {
     local mog_order
 
-    mog_order="$(go list -tags "${GOTAGS}" -deps ./proto/private/pb... | grep "consul/proto/private")"
+    mog_order="$(go list -tags "${GOTAGS}" -deps ./proto/pb... | grep "consul/proto/")"
 
     for FULL_PKG in ${mog_order}; do
         PKG="${FULL_PKG/#github.com\/hashicorp\/consul\/}"
@@ -156,11 +163,5 @@ function generate_rate_limit_mappings {
     }
 }
 
-function generate_protoset_file {
-  local pkg_dir="${SOURCE_DIR}/pkg"
-  mkdir -p "$pkg_dir"
-  print_run buf build -o "${pkg_dir}/consul.protoset"
-}
-
 main "$@"
 exit $?
diff --git a/build-support/scripts/release.sh b/build-support/scripts/release.sh
index fa7e7c066d458..cd0a7c1ce068a 100755
--- a/build-support/scripts/release.sh
+++ b/build-support/scripts/release.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 readonly SCRIPT_NAME="$(basename ${BASH_SOURCE[0]})"
 readonly SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
diff --git a/build-support/scripts/version.sh b/build-support/scripts/version.sh
index 2bc9998813ed1..3812cd3f1b7b8 100755
--- a/build-support/scripts/version.sh
+++ b/build-support/scripts/version.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 readonly SCRIPT_NAME="$(basename ${BASH_SOURCE[0]})"
 readonly SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
diff --git a/build-support/windows/Dockerfile-consul-dev-windows b/build-support/windows/Dockerfile-consul-dev-windows
deleted file mode 100644
index 4e35ccb6e5eba..0000000000000
--- a/build-support/windows/Dockerfile-consul-dev-windows
+++ /dev/null
@@ -1,4 +0,0 @@
-ARG VERSION=1.16.0
-
-FROM windows/consul:${VERSION}-local
-COPY dist/ C:\\consul
diff --git a/build-support/windows/Dockerfile-consul-local-windows b/build-support/windows/Dockerfile-consul-local-windows
deleted file mode 100644
index 992c48c286a27..0000000000000
--- a/build-support/windows/Dockerfile-consul-local-windows
+++ /dev/null
@@ -1,52 +0,0 @@
-ARG VERSION=1.13.3
-
-FROM windows/test-sds-server as test-sds-server
-FROM docker.mirror.hashicorp.services/windows/openzipkin as openzipkin
-FROM windows/consul:${VERSION}
-
-# Fortio binary downloaded
-RUN mkdir fortio
-ENV FORTIO_URL=https://github.com/fortio/fortio/releases/download/v1.33.0/fortio_win_1.33.0.zip
-RUN curl %FORTIO_URL% -L -o fortio.zip
-RUN tar -xf fortio.zip -C fortio
-
-RUN choco install openssl -yf
-RUN choco install jq -yf
-RUN choco install netcat -yf
-RUN choco install openjdk -yf
-
-# Install Bats
-ENV BATS_URL=https://github.com/bats-core/bats-core/archive/refs/tags/v1.7.0.zip
-RUN curl %BATS_URL% -L -o bats.zip
-RUN mkdir bats-core
-RUN tar -xf bats.zip -C bats-core --strip-components=1
-RUN cd "C:\\Program Files\\Git\\bin" && bash.exe -c "/c/bats-core/install.sh /c/bats"
-
-# Install Jaeger
-ENV JAEGER_URL=https://github.com/jaegertracing/jaeger/releases/download/v1.11.0/jaeger-1.11.0-windows-amd64.tar.gz
-RUN curl %JAEGER_URL% -L -o jaeger.tar.gz
-RUN mkdir jaeger
-RUN tar -xf jaeger.tar.gz -C jaeger --strip-components=1
-
-# Install Socat
-ENV SOCAT_URL=https://github.com/tech128/socat-1.7.3.0-windows/archive/refs/heads/master.zip
-RUN curl %SOCAT_URL% -L -o socat.zip
-RUN mkdir socat
-RUN tar -xf socat.zip -C socat --strip-components=1
-
-# Copy test-sds-server binary and certs
-COPY --from=test-sds-server ["C:/go/src/", "C:/test-sds-server/"]
-
-# Copy openzipkin .jar file
-COPY --from=openzipkin ["C:/zipkin", "C:/zipkin"]
-
-EXPOSE 8300
-EXPOSE 8301 8301/udp 8302 8302/udp
-EXPOSE 8500 8600 8600/udp
-EXPOSE 8502 
-
-EXPOSE 19000 19001 19002 19003 19004
-EXPOSE 21000 21001 21002 21003 21004
-EXPOSE 5000 1234 2345
-
-RUN SETX /M path "%PATH%;C:\consul;C:\fortio;C:\jaeger;C:\Program Files\Git\bin;C:\Program Files\Git\usr\bin;C:\Program Files\OpenSSL-Win64\bin;C:\bats\bin\;C:\ProgramData\chocolatey\lib\jq\tools;C:\socat"
diff --git a/build-support/windows/Dockerfile-openzipkin-windows b/build-support/windows/Dockerfile-openzipkin-windows
deleted file mode 100644
index b23867f0b22cf..0000000000000
--- a/build-support/windows/Dockerfile-openzipkin-windows
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM docker.mirror.hashicorp.services/windows/openjdk:1809
-
-RUN mkdir zipkin
-RUN curl.exe -sSL 'https://search.maven.org/remote_content?g=io.zipkin&a=zipkin-server&v=LATEST&c=exec' -o zipkin/zipkin.jar
-
-EXPOSE 9410/tcp
-
-EXPOSE 9411/tcp
-
-WORKDIR /zipkin
-
-ENTRYPOINT ["java", "-jar", "zipkin.jar"]
\ No newline at end of file
diff --git a/build-support/windows/build-consul-dev-image.sh b/build-support/windows/build-consul-dev-image.sh
deleted file mode 100644
index 198a5c52fceaa..0000000000000
--- a/build-support/windows/build-consul-dev-image.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-
-cd ../../
-VERSION=1.16.0
-docker build -t windows/consul:${VERSION}-dev -f build-support/windows/Dockerfile-consul-dev-windows . --build-arg VERSION=${VERSION}
diff --git a/build-support/windows/build-consul-local-images.sh b/build-support/windows/build-consul-local-images.sh
deleted file mode 100644
index 4a22b35706c40..0000000000000
--- a/build-support/windows/build-consul-local-images.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-
-readonly HASHICORP_DOCKER_PROXY="docker.mirror.hashicorp.services"
-
-# Build Consul Version 1.13.3 / 1.12.6 / 1.11.11
-VERSION=${VERSION:-"1.16.0"}
-export VERSION
-
-# Build Windows Envoy Version 1.23.1 / 1.21.5 / 1.20.7
-ENVOY_VERSION=${ENVOY_VERSION:-"1.27.0"}
-export ENVOY_VERSION
-
-echo "Building Images"
-
-
-# Pull Windows Servercore image
-echo " "
-echo "Pull Windows Servercore image"
-docker pull mcr.microsoft.com/windows/servercore:1809
-# Tag Windows Servercore image
-echo " "
-echo "Tag Windows Servercore image"
-docker tag mcr.microsoft.com/windows/servercore:1809 "${HASHICORP_DOCKER_PROXY}/windows/servercore:1809"
-
-
-# Pull Windows Nanoserver image
-echo " "
-echo "Pull Windows Nanoserver image"
-docker pull mcr.microsoft.com/windows/nanoserver:1809
-# Tag Windows Nanoserver image
-echo " "
-echo "Tag Windows Nanoserver image"
-docker tag mcr.microsoft.com/windows/nanoserver:1809 "${HASHICORP_DOCKER_PROXY}/windows/nanoserver:1809"
-
-
-# Pull Windows OpenJDK image
-echo " "
-echo "Pull Windows OpenJDK image"
-docker pull openjdk:windowsservercore-1809
-# Tag Windows OpenJDK image
-echo " "
-echo "Tag Windows OpenJDK image"
-docker tag openjdk:windowsservercore-1809 "${HASHICORP_DOCKER_PROXY}/windows/openjdk:1809"
-
-# Pull Windows Golang image
-echo " "
-echo "Pull Windows Golang image"
-docker pull golang:1.18.1-nanoserver-1809
-# Tag Windows Golang image
-echo " "
-echo "Tag Windows Golang image"
-docker tag golang:1.18.1-nanoserver-1809 "${HASHICORP_DOCKER_PROXY}/windows/golang:1809"
-
-
-# Pull Kubernetes/pause image
-echo " "
-echo "Pull Kubernetes/pause image"
-docker pull mcr.microsoft.com/oss/kubernetes/pause:3.6
-# Tag Kubernetes/pause image
-echo " "
-echo "Tag Kubernetes/pause image"
-docker tag mcr.microsoft.com/oss/kubernetes/pause:3.6 "${HASHICORP_DOCKER_PROXY}/windows/kubernetes/pause"
-
-# Pull envoy-windows image
-echo " "
-echo "Pull envoyproxy/envoy-windows image"
-docker pull envoyproxy/envoy-windows:v${ENVOY_VERSION}
-# Tag envoy-windows image
-echo " "
-echo "Tag envoyproxy/envoy-windows image"
-docker tag envoyproxy/envoy-windows:v${ENVOY_VERSION} "${HASHICORP_DOCKER_PROXY}/windows/envoy-windows:v${ENVOY_VERSION}"
-
-# Build Windows Openzipkin Image
-docker build -t "${HASHICORP_DOCKER_PROXY}/windows/openzipkin" -f Dockerfile-openzipkin-windows .
-
-
-# Build Windows Test sds server Image
-./build-test-sds-server-image.sh
-
-
-# Build windows/consul:${VERSION} Image
-echo " "
-echo "Build windows/consul:${VERSION} Image"
-docker build -t "windows/consul:${VERSION}" -f ../../Dockerfile-windows ../../ --build-arg VERSION=${VERSION}
-
-
-# Build windows/consul:${VERSION}-local Image
-echo " "
-echo "Build windows/consul:${VERSION}-local Image"
-docker build -t windows/consul:${VERSION}-local -f ./Dockerfile-consul-local-windows . --build-arg VERSION=${VERSION}
-
-echo "Building Complete!"
diff --git a/build-support/windows/build-test-sds-server-image.sh b/build-support/windows/build-test-sds-server-image.sh
deleted file mode 100644
index 6856c2f4394d6..0000000000000
--- a/build-support/windows/build-test-sds-server-image.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-
-cd ../../test/integration/connect/envoy
-
-docker build -t windows/test-sds-server -f ./Dockerfile-test-sds-server-windows test-sds-server
diff --git a/build-support/windows/windows-test.md b/build-support/windows/windows-test.md
deleted file mode 100644
index 5295e40757ef6..0000000000000
--- a/build-support/windows/windows-test.md
+++ /dev/null
@@ -1,119 +0,0 @@
-# Dockerfiles for Windows Integration Tests
-
-## Index
-
-- [About](#about-this-file)
-- [Consul Windows](#consul-windows)
-- [Consul Windows Local](#consul-windows-local)
-- [Consul Windows Dev](#consul-windows-dev)
-- [Dockerfile-openzipkin-windows](#dockerfile-openzipkin-windows)
-
-## About this File
-
-In this file you will find which Docker images that need to be pre-built to run the Envoy integration tests on Windows, as well as information on how to run each of these files individually for testing purposes.
-
-## Consul Windows
-
-The Windows/Consul:_{VERSION}_ image is built from the "Dockerfile-windows" file located at the root of the project.
-To do this, the official [windows/servercore image](https://hub.docker.com/_/microsoft-windows-servercore) is used as base image.
-To build the image, use the following command:
-
-```shell
-docker build -t windows/consul -f Dockerfile-windows . --build-arg VERSION=${VERSION}
-```
-
-You can test the built file by running the following command:
-
-```shell
-docker run --rm -p 8300:8300 -p 8301:8301 -p 8302:8302 -p 8500:8500 -p 8600:8600 --name consul --hostname "consul-primary-server" --network-alias "consul-primary-server" windows/consul agent -dev -datacenter "primary" -grpc-port -1 -client "0.0.0.0" -bind "0.0.0.0"
-```
-
-If everything works properly you should openning the browser and check the Consul UI running on: `http://localhost:8500`
-
-## Consul Windows Local
-
-The Windows/Consul:_{VERSION}_-local custom image deployed in the "Dockerfile-consul-local-windows" DockerFile is built from the selected by the shell script _build-consul-local-images.sh_.
-When executing it, all the tools required to run the Windows Connect Envoy Integration Tests will be added to the image.
-It is necessary that the _"windows/consul"_ image has been built first. This script also takes care of that.  
-
-To build this image you need to run the following command on your terminal:
-
-```shell
-./build-consul-local-images.sh
-```
-
-> [!NOTE]
-> Shell script execution may vary depending on your terminal, we recommend using **Git Bash** for Windows.  
-
-```shell
-docker run --rm -p 8300:8300 -p 8301:8301 -p 8302:8302 -p 8500:8500 -p 8600:8600 --name consul-local --hostname "consul-primary-server" --network-alias "consul-primary-server" windows/consul:_{VERSION}_-local agent -dev -datacenter "primary" -grpc-port -1 -client "0.0.0.0" -bind "0.0.0.0"
-```
-
-If everything works properly you can use your browser and check the Consul UI running on: `http://localhost:8500`
-
-## Consul Windows Dev
-
-The Windows/Consul:_{VERSION}_-dev custom image deployed in the "Dockerfile-consul-dev-windows" DockerFile is generated by the shell script named _build-consul-dev-image.sh_.
-When executing it, the compilation of Consul is carried out and it is saved in the _"dist"_ directory, this file is then copied to the _"windows/consul:_{VERSION}_-dev"_ image.
-It is necessary that the _"windows/consul_{VERSION}_-local"_ image has been built first.
-
-To build this image you need to run the following command on your terminal:
-
-```shell
-./build-consul-dev-image.sh
-```
-
-> [!NOTE]
-> Shell script execution may vary depending on your terminal, we recommend using **Git Bash** for Windows.  
-
-You can test the built file by running the following command:
-
-```shell
-docker run --rm -p 8300:8300 -p 8301:8301 -p 8302:8302 -p 8500:8500 -p 8600:8600 --name consul-local --hostname "consul-primary-server" --network-alias "consul-primary-server" windows/consul:_{VERSION}_-dev agent -dev -datacenter "primary" -grpc-port -1 -client "0.0.0.0" -bind "0.0.0.0"
-```
-
-If everything works properly you can use your browser and check the Consul UI running on: `http://localhost:8500`
-
-## Dockerfile-openzipkin-windows
-
-Due to the unavailability of an official Openzipkin Docker image for Windows, the [openjdk Windows image](https://hub.docker.com/layers/openjdk/library/openjdk/jdk-windowsservercore-1809/images/sha256-b0cc238d2ec5fb58109a0006ff9e1bcaf66a5301f49bcb8dece9599ac5be6331) was used, where the latest self-contained executable Openzipkin .jar file is downloaded.
-
-To build this image you need to run the following command on your terminal:
-
-```shell
-docker build -t openzipkin -f Dockerfile-openzipkin-windows .
-```
-
-You can test the built file by running the following command:
-
-```shell
-docker run --rm --name openzipkin
-```
-
-If everything works as it should, you will see the zipkin logo being displayed, along with the current version and port configuration:
-
-```shell
-:: version 2.23.18 :: commit 4b71677 ::
-
-20XX-XX-XX XX:XX:XX.XXX  INFO [/] 1252 --- [oss-http-*:9411] c.l.a.s.Server                           : Serving HTTP at /[0:0:0:0:0:0:0:0]:9411 - http://127.0.0.1:9411/
-```
-
-# Testing
-
-During development, it may be more convenient to check your work-in-progress by running only the tests which you expect to be affected by your changes, as the full test suite can take several minutes to execute. [Go's built-in test tool](https://golang.org/pkg/cmd/go/internal/test/) allows specifying a list of packages to test and the `-run` option to only include test names matching a regular expression.
-The `go test -short` flag can also be used to skip slower tests.
-
-Examples (run from the repository root):
-
-- `go test -v ./connect` will run all tests in the connect package (see `./connect` folder)
-- `go test -v -run TestRetryJoin ./command/agent` will run all tests in the agent package (see `./command/agent` folder) with name substring `TestRetryJoin`
-
-When a pull request is opened CI will run all tests and lint to verify the change.
-
-If you want to run the tests on Windows images you must attach the win=true flag.
-
-Example:
-
-```shell
-go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-badauthz" -win=true
-```
diff --git a/command/acl/acl.go b/command/acl/acl.go
index 745fa78175d5e..250b0d25be379 100644
--- a/command/acl/acl.go
+++ b/command/acl/acl.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
diff --git a/command/acl/acl_helpers.go b/command/acl/acl_helpers.go
index 9dd40e9e0ee62..ac1f1c0e99a7d 100644
--- a/command/acl/acl_helpers.go
+++ b/command/acl/acl_helpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package acl
 
 import (
@@ -10,9 +7,6 @@ import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/command/helpers"
-	"github.com/hashicorp/hcl"
-	"github.com/mitchellh/mapstructure"
 )
 
 func GetTokenAccessorIDFromPartial(client *api.Client, partialAccessorID string) (string, error) {
@@ -221,79 +215,6 @@ func ExtractNodeIdentities(nodeIdents []string) ([]*api.ACLNodeIdentity, error)
 	return out, nil
 }
 
-func ExtractTemplatedPolicies(templatedPolicy string, templatedPolicyFile string, templatedPolicyVariables []string) ([]*api.ACLTemplatedPolicy, error) {
-	var out []*api.ACLTemplatedPolicy
-	if templatedPolicy == "" && templatedPolicyFile == "" {
-		return out, nil
-	}
-
-	if templatedPolicy != "" {
-		parsedVariables, err := getTemplatedPolicyVariables(templatedPolicyVariables)
-		if err != nil {
-			return nil, err
-		}
-
-		out = append(out, &api.ACLTemplatedPolicy{
-			TemplateName:      templatedPolicy,
-			TemplateVariables: parsedVariables,
-		})
-	}
-
-	if templatedPolicyFile != "" {
-		fileData, err := helpers.LoadFromFile(templatedPolicyFile)
-		if err != nil {
-			return nil, err
-		}
-
-		var config map[string]map[string][]api.ACLTemplatedPolicyVariables
-		err = hcl.Decode(&config, fileData)
-		if err != nil {
-			return nil, err
-		}
-
-		for templateName, templateVariables := range config["TemplatedPolicy"] {
-			for _, tp := range templateVariables {
-				out = append(out, &api.ACLTemplatedPolicy{
-					TemplateName: templateName,
-					TemplateVariables: &api.ACLTemplatedPolicyVariables{
-						Name: tp.Name,
-					},
-				})
-			}
-		}
-	}
-	return out, nil
-}
-
-func ExtractBindVars(bindVars map[string]string) (*api.ACLTemplatedPolicyVariables, error) {
-	if len(bindVars) == 0 {
-		return nil, nil
-	}
-	out := &api.ACLTemplatedPolicyVariables{}
-	err := mapstructure.Decode(bindVars, out)
-	return out, err
-}
-
-func getTemplatedPolicyVariables(variables []string) (*api.ACLTemplatedPolicyVariables, error) {
-	if len(variables) == 0 {
-		return nil, nil
-	}
-
-	out := &api.ACLTemplatedPolicyVariables{}
-	jsonVariables := make(map[string]string)
-
-	for _, variable := range variables {
-		parts := strings.Split(variable, ":")
-		if len(parts) != 2 {
-			return nil, fmt.Errorf("malformed -var argument: %q, expecting VariableName:Value", variable)
-		}
-		jsonVariables[parts[0]] = parts[1]
-	}
-
-	err := mapstructure.Decode(jsonVariables, out)
-	return out, err
-}
-
 // TestKubernetesJWT_A is a valid service account jwt extracted from a minikube setup.
 //
 //	{
diff --git a/command/acl/acl_test.go b/command/acl/acl_test.go
index c2a46f18b0423..2095795ff00be 100644
--- a/command/acl/acl_test.go
+++ b/command/acl/acl_test.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MPL-2.0
 
 package acl
 
diff --git a/command/acl/agenttokens/agent_tokens.go b/command/acl/agenttokens/agent_tokens.go
index 8aca79e5d0064..c29750714759f 100644
--- a/command/acl/agenttokens/agent_tokens.go
+++ b/command/acl/agenttokens/agent_tokens.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agenttokens
 
 import (
@@ -8,10 +5,9 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/mitchellh/cli"
-
 	"github.com/hashicorp/consul/command/flags"
 	"github.com/hashicorp/consul/command/helpers"
+	"github.com/mitchellh/cli"
 )
 
 func New(ui cli.Ui) *cmd {
@@ -64,8 +60,6 @@ func (c *cmd) Run(args []string) int {
 		_, err = client.Agent().UpdateReplicationACLToken(token, nil)
 	case "config_file_service_registration":
 		_, err = client.Agent().UpdateConfigFileRegistrationToken(token, nil)
-	case "dns":
-		_, err = client.Agent().UpdateDNSToken(token, nil)
 	default:
 		c.UI.Error(fmt.Sprintf("Unknown token type"))
 		return 1
@@ -143,11 +137,6 @@ Usage: consul acl set-agent-token [options] TYPE TOKEN
                                       If a service or check definition contains a 'token'
                                       field, then that token is used instead.
 
-    dns                               This is the token that the will be used in place of the default
-                                      token when specified for DNS requests and for DNS-specific RPCs.
-                                      If not provided the agent will attempt to use the default token
-                                      if one is present, then fallback to the anonymous token.
-
   Example:
 
     $ consul acl set-agent-token default c4d0f8df-3aba-4ab6-a7a0-35b760dc29a1
diff --git a/command/acl/agenttokens/agent_tokens_test.go b/command/acl/agenttokens/agent_tokens_test.go
index 84f7fa3358011..08a154df54691 100644
--- a/command/acl/agenttokens/agent_tokens_test.go
+++ b/command/acl/agenttokens/agent_tokens_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agenttokens
 
 import (
diff --git a/command/acl/authmethod/authmethod.go b/command/acl/authmethod/authmethod.go
index 18b9e58c2633a..0b3213be14695 100644
--- a/command/acl/authmethod/authmethod.go
+++ b/command/acl/authmethod/authmethod.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package authmethod
 
 import (
diff --git a/command/acl/authmethod/create/authmethod_create.go b/command/acl/authmethod/create/authmethod_create.go
index 17f328d2b8be5..99e6826353f24 100644
--- a/command/acl/authmethod/create/authmethod_create.go
+++ b/command/acl/authmethod/create/authmethod_create.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package authmethodcreate
 
 import (
diff --git a/command/acl/authmethod/create/authmethod_create_ce.go b/command/acl/authmethod/create/authmethod_create_ce.go
index a655cf0b3532d..0df5e8efdc4fb 100644
--- a/command/acl/authmethod/create/authmethod_create_ce.go
+++ b/command/acl/authmethod/create/authmethod_create_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package authmethodcreate
 
diff --git a/command/acl/authmethod/create/authmethod_create_test.go b/command/acl/authmethod/create/authmethod_create_test.go
index b9392544929af..e5a442c61631a 100644
--- a/command/acl/authmethod/create/authmethod_create_test.go
+++ b/command/acl/authmethod/create/authmethod_create_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package authmethodcreate
 
 import (
diff --git a/command/acl/authmethod/delete/authmethod_delete.go b/command/acl/authmethod/delete/authmethod_delete.go
index e3ccd0efdd01e..afc9b249d176c 100644
--- a/command/acl/authmethod/delete/authmethod_delete.go
+++ b/command/acl/authmethod/delete/authmethod_delete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package authmethoddelete
 
 import (
diff --git a/command/acl/authmethod/delete/authmethod_delete_test.go b/command/acl/authmethod/delete/authmethod_delete_test.go
index fc513fde7ebd4..f64f4d01f1068 100644
--- a/command/acl/authmethod/delete/authmethod_delete_test.go
+++ b/command/acl/authmethod/delete/authmethod_delete_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package authmethoddelete
 
 import (
diff --git a/command/acl/authmethod/formatter.go b/command/acl/authmethod/formatter.go
index 6a22443d58dd4..69bc4860c6428 100644
--- a/command/acl/authmethod/formatter.go
+++ b/command/acl/authmethod/formatter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package authmethod
 
 import (
diff --git a/command/acl/authmethod/list/authmethod_list.go b/command/acl/authmethod/list/authmethod_list.go
index cae9916c12b29..3c32db04fe86b 100644
--- a/command/acl/authmethod/list/authmethod_list.go
+++ b/command/acl/authmethod/list/authmethod_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package authmethodlist
 
 import (
diff --git a/command/acl/authmethod/list/authmethod_list_test.go b/command/acl/authmethod/list/authmethod_list_test.go
index cd1aa2ac767b8..edf963183d0df 100644
--- a/command/acl/authmethod/list/authmethod_list_test.go
+++ b/command/acl/authmethod/list/authmethod_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package authmethodlist
 
 import (
diff --git a/command/acl/authmethod/read/authmethod_read.go b/command/acl/authmethod/read/authmethod_read.go
index 72d3a6f181634..0e1fbc11ce392 100644
--- a/command/acl/authmethod/read/authmethod_read.go
+++ b/command/acl/authmethod/read/authmethod_read.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package authmethodread
 
 import (
diff --git a/command/acl/authmethod/read/authmethod_read_test.go b/command/acl/authmethod/read/authmethod_read_test.go
index 20a18c76dfdae..0b4f04c0e81eb 100644
--- a/command/acl/authmethod/read/authmethod_read_test.go
+++ b/command/acl/authmethod/read/authmethod_read_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package authmethodread
 
 import (
diff --git a/command/acl/authmethod/update/authmethod_update.go b/command/acl/authmethod/update/authmethod_update.go
index 1c5422e88dea2..e452f84fa1105 100644
--- a/command/acl/authmethod/update/authmethod_update.go
+++ b/command/acl/authmethod/update/authmethod_update.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package authmethodupdate
 
 import (
diff --git a/command/acl/authmethod/update/authmethod_update_ce.go b/command/acl/authmethod/update/authmethod_update_ce.go
index e0345eb6a78d4..e72289ab33747 100644
--- a/command/acl/authmethod/update/authmethod_update_ce.go
+++ b/command/acl/authmethod/update/authmethod_update_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package authmethodupdate
 
diff --git a/command/acl/authmethod/update/authmethod_update_test.go b/command/acl/authmethod/update/authmethod_update_test.go
index 87ddf2f2c0bc4..4afe1dfb47704 100644
--- a/command/acl/authmethod/update/authmethod_update_test.go
+++ b/command/acl/authmethod/update/authmethod_update_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package authmethodupdate
 
 import (
diff --git a/command/acl/bindingrule/bindingrule.go b/command/acl/bindingrule/bindingrule.go
index 8d23e3ee37fab..4bf5d0328f6c9 100644
--- a/command/acl/bindingrule/bindingrule.go
+++ b/command/acl/bindingrule/bindingrule.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bindingrule
 
 import (
diff --git a/command/acl/bindingrule/create/bindingrule_create.go b/command/acl/bindingrule/create/bindingrule_create.go
index ab6a16f3ed5c3..df94d6d5bb169 100644
--- a/command/acl/bindingrule/create/bindingrule_create.go
+++ b/command/acl/bindingrule/create/bindingrule_create.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bindingrulecreate
 
 import (
@@ -9,7 +6,6 @@ import (
 	"strings"
 
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/command/acl"
 	"github.com/hashicorp/consul/command/acl/bindingrule"
 	"github.com/hashicorp/consul/command/flags"
 	"github.com/mitchellh/cli"
@@ -32,7 +28,6 @@ type cmd struct {
 	selector       string
 	bindType       string
 	bindName       string
-	bindVars       map[string]string
 
 	showMeta bool
 	format   string
@@ -73,14 +68,7 @@ func (c *cmd) init() {
 		&c.bindType,
 		"bind-type",
 		string(api.BindingRuleBindTypeService),
-		"Type of binding to perform (\"service\", \"role\", \"node\"  or \"templated-policy\").",
-	)
-	c.flags.Var(
-		(*flags.FlagMapValue)(&c.bindVars),
-		"bind-vars",
-		"Templated policy variables. Can only be used when -bind-type is templated-policy."+
-			" May be specified multiple times with different variables. Can use ${var} interpolation."+
-			" Format is VariableName=Value",
+		"Type of binding to perform (\"service\" or \"role\").",
 	)
 	c.flags.StringVar(
 		&c.bindName,
@@ -109,28 +97,15 @@ func (c *cmd) Run(args []string) int {
 	}
 
 	if c.authMethodName == "" {
-		c.UI.Error("Missing required '-method' flag")
+		c.UI.Error(fmt.Sprintf("Missing required '-method' flag"))
 		c.UI.Error(c.Help())
 		return 1
 	} else if c.bindType == "" {
-		c.UI.Error("Missing required '-bind-type' flag")
+		c.UI.Error(fmt.Sprintf("Missing required '-bind-type' flag"))
 		c.UI.Error(c.Help())
 		return 1
 	} else if c.bindName == "" {
-		c.UI.Error("Missing required '-bind-name' flag")
-		c.UI.Error(c.Help())
-		return 1
-	}
-
-	if api.BindingRuleBindType(c.bindType) != api.BindingRuleBindTypeTemplatedPolicy && len(c.bindVars) > 0 {
-		c.UI.Error("Cannot specify -bind-vars when -bind-type is not templated-policy")
-		c.UI.Error(c.Help())
-		return 1
-	}
-
-	processBindVars, err := acl.ExtractBindVars(c.bindVars)
-	if err != nil {
-		c.UI.Error("Failed to decode '-bind-vars'")
+		c.UI.Error(fmt.Sprintf("Missing required '-bind-name' flag"))
 		c.UI.Error(c.Help())
 		return 1
 	}
@@ -140,7 +115,6 @@ func (c *cmd) Run(args []string) int {
 		AuthMethod:  c.authMethodName,
 		BindType:    api.BindingRuleBindType(c.bindType),
 		BindName:    c.bindName,
-		BindVars:    processBindVars,
 		Selector:    c.selector,
 	}
 
diff --git a/command/acl/bindingrule/create/bindingrule_create_test.go b/command/acl/bindingrule/create/bindingrule_create_test.go
index 07a92851a2e5f..60744954b9e86 100644
--- a/command/acl/bindingrule/create/bindingrule_create_test.go
+++ b/command/acl/bindingrule/create/bindingrule_create_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bindingrulecreate
 
 import (
@@ -106,24 +103,6 @@ func TestBindingRuleCreateCommand(t *testing.T) {
 		require.Contains(t, ui.ErrorWriter.String(), "Missing required '-bind-name' flag")
 	})
 
-	t.Run("bind vars specified when by bindtype is not templated-policy", func(t *testing.T) {
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-method=test",
-			"-bind-name=web",
-			"-bind-type=service",
-			"-bind-vars", "name=test",
-		}
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-
-		code := cmd.Run(args)
-		require.Equal(t, code, 1)
-		require.Contains(t, ui.ErrorWriter.String(), "Cannot specify -bind-vars when -bind-type is not templated-policy")
-	})
-
 	t.Run("must use roughly valid selector", func(t *testing.T) {
 		args := []string{
 			"-http-addr=" + a.HTTPAddr(),
@@ -194,41 +173,6 @@ func TestBindingRuleCreateCommand(t *testing.T) {
 		require.Equal(t, code, 0)
 		require.Empty(t, ui.ErrorWriter.String())
 	})
-
-	t.Run("create it with type templated policy", func(t *testing.T) {
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-method=test",
-			"-bind-type=templated-policy",
-			"-bind-name=builtin/service",
-			"-bind-vars", "name=api",
-		}
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-
-		code := cmd.Run(args)
-		require.Equal(t, code, 0)
-		require.Empty(t, ui.ErrorWriter.String())
-	})
-
-	t.Run("cannot create when missing bind-vars", func(t *testing.T) {
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-method=test",
-			"-bind-type=templated-policy",
-			"-bind-name=builtin/service",
-		}
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-
-		code := cmd.Run(args)
-		require.Equal(t, code, 1)
-		require.Contains(t, ui.ErrorWriter.String(), "templated policy failed validation")
-	})
 }
 
 func TestBindingRuleCreateCommand_JSON(t *testing.T) {
diff --git a/command/acl/bindingrule/delete/bindingrule_delete.go b/command/acl/bindingrule/delete/bindingrule_delete.go
index 3fc02d788b4b6..9386992516e6c 100644
--- a/command/acl/bindingrule/delete/bindingrule_delete.go
+++ b/command/acl/bindingrule/delete/bindingrule_delete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bindingruledelete
 
 import (
diff --git a/command/acl/bindingrule/delete/bindingrule_delete_test.go b/command/acl/bindingrule/delete/bindingrule_delete_test.go
index 9655fbb101a4c..c84ba38c4a6e5 100644
--- a/command/acl/bindingrule/delete/bindingrule_delete_test.go
+++ b/command/acl/bindingrule/delete/bindingrule_delete_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bindingruledelete
 
 import (
diff --git a/command/acl/bindingrule/formatter.go b/command/acl/bindingrule/formatter.go
index 7bf01d9a3db6b..65a3455e59732 100644
--- a/command/acl/bindingrule/formatter.go
+++ b/command/acl/bindingrule/formatter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bindingrule
 
 import (
@@ -63,10 +60,6 @@ func (f *prettyFormatter) FormatBindingRule(rule *api.ACLBindingRule) (string, e
 	buffer.WriteString(fmt.Sprintf("Description:  %s\n", rule.Description))
 	buffer.WriteString(fmt.Sprintf("BindType:     %s\n", rule.BindType))
 	buffer.WriteString(fmt.Sprintf("BindName:     %s\n", rule.BindName))
-	if rule.BindVars != nil && rule.BindVars.Name != "" {
-		buffer.WriteString(fmt.Sprintf("BindVars:     \n     - Name: %s\n", rule.BindVars.Name))
-	}
-
 	buffer.WriteString(fmt.Sprintf("Selector:     %s\n", rule.Selector))
 	if f.showMeta {
 		buffer.WriteString(fmt.Sprintf("Create Index: %d\n", rule.CreateIndex))
@@ -100,9 +93,6 @@ func (f *prettyFormatter) formatBindingRuleListEntry(rule *api.ACLBindingRule) s
 	buffer.WriteString(fmt.Sprintf("   Description:  %s\n", rule.Description))
 	buffer.WriteString(fmt.Sprintf("   BindType:     %s\n", rule.BindType))
 	buffer.WriteString(fmt.Sprintf("   BindName:     %s\n", rule.BindName))
-	if rule.BindVars != nil && rule.BindVars.Name != "" {
-		buffer.WriteString(fmt.Sprintf("   BindVars:     \n      - Name: %s\n", rule.BindVars.Name))
-	}
 	buffer.WriteString(fmt.Sprintf("   Selector:     %s\n", rule.Selector))
 	if f.showMeta {
 		buffer.WriteString(fmt.Sprintf("   Create Index: %d\n", rule.CreateIndex))
diff --git a/command/acl/bindingrule/list/bindingrule_list.go b/command/acl/bindingrule/list/bindingrule_list.go
index 15f395afdf2f6..997c14d27d39b 100644
--- a/command/acl/bindingrule/list/bindingrule_list.go
+++ b/command/acl/bindingrule/list/bindingrule_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bindingrulelist
 
 import (
diff --git a/command/acl/bindingrule/list/bindingrule_list_test.go b/command/acl/bindingrule/list/bindingrule_list_test.go
index 22035341e4248..55d75cfa3b103 100644
--- a/command/acl/bindingrule/list/bindingrule_list_test.go
+++ b/command/acl/bindingrule/list/bindingrule_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bindingrulelist
 
 import (
diff --git a/command/acl/bindingrule/read/bindingrule_read.go b/command/acl/bindingrule/read/bindingrule_read.go
index 0ff55bd4ac2b8..9957e5fdb9d25 100644
--- a/command/acl/bindingrule/read/bindingrule_read.go
+++ b/command/acl/bindingrule/read/bindingrule_read.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bindingruleread
 
 import (
diff --git a/command/acl/bindingrule/read/bindingrule_read_test.go b/command/acl/bindingrule/read/bindingrule_read_test.go
index 4a324edf23174..fcb55785de54d 100644
--- a/command/acl/bindingrule/read/bindingrule_read_test.go
+++ b/command/acl/bindingrule/read/bindingrule_read_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bindingruleread
 
 import (
diff --git a/command/acl/bindingrule/update/bindingrule_update.go b/command/acl/bindingrule/update/bindingrule_update.go
index ce7006748728d..aa667f01e4edb 100644
--- a/command/acl/bindingrule/update/bindingrule_update.go
+++ b/command/acl/bindingrule/update/bindingrule_update.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bindingruleupdate
 
 import (
@@ -34,7 +31,6 @@ type cmd struct {
 	selector    string
 	bindType    string
 	bindName    string
-	bindVars    map[string]string
 
 	noMerge  bool
 	showMeta bool
@@ -103,14 +99,6 @@ func (c *cmd) init() {
 		fmt.Sprintf("Output format {%s}", strings.Join(bindingrule.GetSupportedFormats(), "|")),
 	)
 
-	c.flags.Var(
-		(*flags.FlagMapValue)(&c.bindVars),
-		"bind-vars",
-		"Templated policy variables. Can only be used when -bind-type is templated-policy."+
-			" May be specified multiple times with different variables. Can use ${var} interpolation."+
-			" Format is VariableName=Value",
-	)
-
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
@@ -124,7 +112,7 @@ func (c *cmd) Run(args []string) int {
 	}
 
 	if c.ruleID == "" {
-		c.UI.Error("Cannot update a binding rule without specifying the -id parameter")
+		c.UI.Error(fmt.Sprintf("Cannot update a binding rule without specifying the -id parameter"))
 		return 1
 	}
 
@@ -150,25 +138,14 @@ func (c *cmd) Run(args []string) int {
 		return 1
 	}
 
-	processBindVars, err := acl.ExtractBindVars(c.bindVars)
-	if err != nil {
-		c.UI.Error("Failed to decode '-bind-vars'")
-		c.UI.Error(c.Help())
-		return 1
-	}
-
 	var rule *api.ACLBindingRule
 	if c.noMerge {
 		if c.bindType == "" {
-			c.UI.Error("Missing required '-bind-type' flag")
+			c.UI.Error(fmt.Sprintf("Missing required '-bind-type' flag"))
 			c.UI.Error(c.Help())
 			return 1
 		} else if c.bindName == "" {
-			c.UI.Error("Missing required '-bind-name' flag")
-			c.UI.Error(c.Help())
-			return 1
-		} else if len(c.bindVars) > 0 && api.BindingRuleBindType(c.bindType) != api.BindingRuleBindTypeTemplatedPolicy {
-			c.UI.Error("-bind-vars cannot be specified when -bind-type is not templated-policy")
+			c.UI.Error(fmt.Sprintf("Missing required '-bind-name' flag"))
 			c.UI.Error(c.Help())
 			return 1
 		}
@@ -178,7 +155,6 @@ func (c *cmd) Run(args []string) int {
 			AuthMethod:  currentRule.AuthMethod, // immutable
 			Description: c.description,
 			BindType:    api.BindingRuleBindType(c.bindType),
-			BindVars:    processBindVars,
 			BindName:    c.bindName,
 			Selector:    c.selector,
 		}
@@ -195,14 +171,6 @@ func (c *cmd) Run(args []string) int {
 		if c.bindName != "" {
 			rule.BindName = c.bindName
 		}
-		if len(c.bindVars) > 0 {
-			rule.BindVars = processBindVars
-		}
-		// remove bind vars for non templated-policy binding rules types
-		if api.BindingRuleBindType(c.bindType) != api.BindingRuleBindTypeTemplatedPolicy {
-			rule.BindVars = nil
-		}
-
 		if isFlagSet(c.flags, "selector") {
 			rule.Selector = c.selector // empty is valid
 		}
diff --git a/command/acl/bindingrule/update/bindingrule_update_test.go b/command/acl/bindingrule/update/bindingrule_update_test.go
index 1bbcd35cc25d9..1ec8736306c35 100644
--- a/command/acl/bindingrule/update/bindingrule_update_test.go
+++ b/command/acl/bindingrule/update/bindingrule_update_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bindingruleupdate
 
 import (
@@ -127,24 +124,15 @@ func TestBindingRuleUpdateCommand(t *testing.T) {
 		require.Contains(t, ui.ErrorWriter.String(), "Binding rule not found with ID")
 	})
 
-	createRule := func(t *testing.T, isTemplatedPolicy bool) string {
-		bindingRule := &api.ACLBindingRule{
-			AuthMethod:  "test",
-			Description: "test rule",
-			BindType:    api.BindingRuleBindTypeService,
-			BindName:    "test-${serviceaccount.name}",
-			Selector:    "serviceaccount.namespace==default",
-		}
-		if isTemplatedPolicy {
-			bindingRule.BindType = api.BindingRuleBindTypeTemplatedPolicy
-			bindingRule.BindName = api.ACLTemplatedPolicyServiceName
-			bindingRule.BindVars = &api.ACLTemplatedPolicyVariables{
-				Name: "test-${serviceaccount.name}",
-			}
-		}
-
+	createRule := func(t *testing.T) string {
 		rule, _, err := client.ACL().BindingRuleCreate(
-			bindingRule,
+			&api.ACLBindingRule{
+				AuthMethod:  "test",
+				Description: "test rule",
+				BindType:    api.BindingRuleBindTypeService,
+				BindName:    "test-${serviceaccount.name}",
+				Selector:    "serviceaccount.namespace==default",
+			},
 			&api.WriteOptions{Token: "root"},
 		)
 		require.NoError(t, err)
@@ -170,7 +158,7 @@ func TestBindingRuleUpdateCommand(t *testing.T) {
 				m[c] = struct{}{}
 			}
 
-			_ = createRule(t, false)
+			_ = createRule(t)
 		}
 	}
 
@@ -192,7 +180,7 @@ func TestBindingRuleUpdateCommand(t *testing.T) {
 	})
 
 	t.Run("must use roughly valid selector", func(t *testing.T) {
-		id := createRule(t, false)
+		id := createRule(t)
 
 		args := []string{
 			"-http-addr=" + a.HTTPAddr(),
@@ -210,7 +198,7 @@ func TestBindingRuleUpdateCommand(t *testing.T) {
 	})
 
 	t.Run("update all fields", func(t *testing.T) {
-		id := createRule(t, false)
+		id := createRule(t)
 
 		ui := cli.NewMockUi()
 		cmd := New(ui)
@@ -242,79 +230,10 @@ func TestBindingRuleUpdateCommand(t *testing.T) {
 		require.Equal(t, "serviceaccount.namespace==alt and serviceaccount.name==demo", rule.Selector)
 	})
 
-	t.Run("update all fields with templated policy", func(t *testing.T) {
-		id := createRule(t, false)
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-id", id,
-			"-description=test rule edited",
-			"-bind-type", "templated-policy",
-			"-bind-name=builtin/service",
-			"-bind-vars", "name=api",
-			"-selector=serviceaccount.namespace==alt and serviceaccount.name==demo",
-		}
-
-		code := cmd.Run(args)
-		require.Equal(t, code, 0, "err: %s", ui.ErrorWriter.String())
-		require.Empty(t, ui.ErrorWriter.String())
-
-		rule, _, err := client.ACL().BindingRuleRead(
-			id,
-			&api.QueryOptions{Token: "root"},
-		)
-		require.NoError(t, err)
-		require.NotNil(t, rule)
-
-		require.Equal(t, "test rule edited", rule.Description)
-		require.Equal(t, api.ACLTemplatedPolicyServiceName, rule.BindName)
-		require.Equal(t, api.BindingRuleBindTypeTemplatedPolicy, rule.BindType)
-		require.Equal(t, &api.ACLTemplatedPolicyVariables{Name: "api"}, rule.BindVars)
-		require.Equal(t, "serviceaccount.namespace==alt and serviceaccount.name==demo", rule.Selector)
-	})
-
-	t.Run("update bind type to something other than templated-policy unsets bindvars", func(t *testing.T) {
-		id := createRule(t, true)
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-id", id,
-			"-description=test rule edited",
-			"-bind-type", "role",
-			"-bind-name=role-updated",
-			"-selector=serviceaccount.namespace==alt and serviceaccount.name==demo",
-		}
-
-		code := cmd.Run(args)
-		require.Equal(t, code, 0, "err: %s", ui.ErrorWriter.String())
-		require.Empty(t, ui.ErrorWriter.String())
-
-		rule, _, err := client.ACL().BindingRuleRead(
-			id,
-			&api.QueryOptions{Token: "root"},
-		)
-		require.NoError(t, err)
-		require.NotNil(t, rule)
-
-		require.Equal(t, "test rule edited", rule.Description)
-		require.Equal(t, "role-updated", rule.BindName)
-		require.Equal(t, api.BindingRuleBindTypeRole, rule.BindType)
-		require.Empty(t, rule.BindVars)
-		require.Equal(t, "serviceaccount.namespace==alt and serviceaccount.name==demo", rule.Selector)
-	})
-
 	t.Run("update all fields - partial", func(t *testing.T) {
 		deleteRules(t) // reset since we created a bunch that might be dupes
 
-		id := createRule(t, false)
+		id := createRule(t)
 
 		ui := cli.NewMockUi()
 		cmd := New(ui)
@@ -347,7 +266,7 @@ func TestBindingRuleUpdateCommand(t *testing.T) {
 	})
 
 	t.Run("update all fields but description", func(t *testing.T) {
-		id := createRule(t, false)
+		id := createRule(t)
 
 		ui := cli.NewMockUi()
 		cmd := New(ui)
@@ -379,7 +298,7 @@ func TestBindingRuleUpdateCommand(t *testing.T) {
 	})
 
 	t.Run("update all fields but bind name", func(t *testing.T) {
-		id := createRule(t, false)
+		id := createRule(t)
 
 		ui := cli.NewMockUi()
 		cmd := New(ui)
@@ -411,7 +330,7 @@ func TestBindingRuleUpdateCommand(t *testing.T) {
 	})
 
 	t.Run("update all fields but must exist", func(t *testing.T) {
-		id := createRule(t, false)
+		id := createRule(t)
 
 		ui := cli.NewMockUi()
 		cmd := New(ui)
@@ -443,7 +362,7 @@ func TestBindingRuleUpdateCommand(t *testing.T) {
 	})
 
 	t.Run("update all fields but selector", func(t *testing.T) {
-		id := createRule(t, false)
+		id := createRule(t)
 
 		ui := cli.NewMockUi()
 		cmd := New(ui)
@@ -475,7 +394,7 @@ func TestBindingRuleUpdateCommand(t *testing.T) {
 	})
 
 	t.Run("update all fields clear selector", func(t *testing.T) {
-		id := createRule(t, false)
+		id := createRule(t)
 
 		ui := cli.NewMockUi()
 		cmd := New(ui)
@@ -508,7 +427,7 @@ func TestBindingRuleUpdateCommand(t *testing.T) {
 	})
 
 	t.Run("update all fields json formatted", func(t *testing.T) {
-		id := createRule(t, false)
+		id := createRule(t)
 
 		ui := cli.NewMockUi()
 		cmd := New(ui)
@@ -649,25 +568,15 @@ func TestBindingRuleUpdateCommand_noMerge(t *testing.T) {
 		require.Contains(t, ui.ErrorWriter.String(), "Binding rule not found with ID")
 	})
 
-	createRule := func(t *testing.T, isTemplatedPolicy bool) string {
-		bindingRule := &api.ACLBindingRule{
-			AuthMethod:  "test",
-			Description: "test rule",
-			BindType:    api.BindingRuleBindTypeRole,
-			BindName:    "test-${serviceaccount.name}",
-			Selector:    "serviceaccount.namespace==default",
-		}
-
-		if isTemplatedPolicy {
-			bindingRule.BindType = api.BindingRuleBindTypeTemplatedPolicy
-			bindingRule.BindName = "builtin/service"
-			bindingRule.BindVars = &api.ACLTemplatedPolicyVariables{
-				Name: "test-${serviceaccount.name}",
-			}
-		}
-
+	createRule := func(t *testing.T) string {
 		rule, _, err := client.ACL().BindingRuleCreate(
-			bindingRule,
+			&api.ACLBindingRule{
+				AuthMethod:  "test",
+				Description: "test rule",
+				BindType:    api.BindingRuleBindTypeRole,
+				BindName:    "test-${serviceaccount.name}",
+				Selector:    "serviceaccount.namespace==default",
+			},
 			&api.WriteOptions{Token: "root"},
 		)
 		require.NoError(t, err)
@@ -693,7 +602,7 @@ func TestBindingRuleUpdateCommand_noMerge(t *testing.T) {
 				m[c] = struct{}{}
 			}
 
-			_ = createRule(t, false)
+			_ = createRule(t)
 		}
 	}
 
@@ -716,7 +625,7 @@ func TestBindingRuleUpdateCommand_noMerge(t *testing.T) {
 	})
 
 	t.Run("must use roughly valid selector", func(t *testing.T) {
-		id := createRule(t, false)
+		id := createRule(t)
 
 		ui := cli.NewMockUi()
 		cmd := New(ui)
@@ -738,7 +647,7 @@ func TestBindingRuleUpdateCommand_noMerge(t *testing.T) {
 	})
 
 	t.Run("update all fields", func(t *testing.T) {
-		id := createRule(t, false)
+		id := createRule(t)
 
 		ui := cli.NewMockUi()
 		cmd := New(ui)
@@ -771,81 +680,10 @@ func TestBindingRuleUpdateCommand_noMerge(t *testing.T) {
 		require.Equal(t, "serviceaccount.namespace==alt and serviceaccount.name==demo", rule.Selector)
 	})
 
-	t.Run("update all fields after initial binding rule is templated-policy", func(t *testing.T) {
-		id := createRule(t, true)
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-no-merge",
-			"-id", id,
-			"-description=test rule edited",
-			"-bind-type", "service",
-			"-bind-name=role-updated",
-			"-selector=serviceaccount.namespace==alt and serviceaccount.name==demo",
-		}
-
-		code := cmd.Run(args)
-		require.Equal(t, code, 0, "err: %s", ui.ErrorWriter.String())
-		require.Empty(t, ui.ErrorWriter.String())
-
-		rule, _, err := client.ACL().BindingRuleRead(
-			id,
-			&api.QueryOptions{Token: "root"},
-		)
-		require.NoError(t, err)
-		require.NotNil(t, rule)
-
-		require.Equal(t, "test rule edited", rule.Description)
-		require.Equal(t, api.BindingRuleBindTypeService, rule.BindType)
-		require.Empty(t, rule.BindVars)
-		require.Equal(t, "role-updated", rule.BindName)
-		require.Equal(t, "serviceaccount.namespace==alt and serviceaccount.name==demo", rule.Selector)
-	})
-
-	t.Run("update all fields with templated-policy bind type", func(t *testing.T) {
-		id := createRule(t, false)
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-no-merge",
-			"-id", id,
-			"-description=test rule edited",
-			"-bind-type=templated-policy",
-			"-bind-name=builtin/service",
-			"-bind-vars", "name=api",
-			"-selector=serviceaccount.namespace==alt and serviceaccount.name==demo",
-		}
-
-		code := cmd.Run(args)
-		require.Equal(t, code, 0, "err: %s", ui.ErrorWriter.String())
-		require.Empty(t, ui.ErrorWriter.String())
-
-		rule, _, err := client.ACL().BindingRuleRead(
-			id,
-			&api.QueryOptions{Token: "root"},
-		)
-		require.NoError(t, err)
-		require.NotNil(t, rule)
-
-		require.Equal(t, "test rule edited", rule.Description)
-		require.Equal(t, api.BindingRuleBindTypeTemplatedPolicy, rule.BindType)
-		require.Equal(t, api.ACLTemplatedPolicyServiceName, rule.BindName)
-		require.Equal(t, &api.ACLTemplatedPolicyVariables{Name: "api"}, rule.BindVars)
-		require.Equal(t, "serviceaccount.namespace==alt and serviceaccount.name==demo", rule.Selector)
-	})
-
 	t.Run("update all fields - partial", func(t *testing.T) {
 		deleteRules(t) // reset since we created a bunch that might be dupes
 
-		id := createRule(t, false)
+		id := createRule(t)
 
 		ui := cli.NewMockUi()
 		cmd := New(ui)
@@ -879,7 +717,7 @@ func TestBindingRuleUpdateCommand_noMerge(t *testing.T) {
 	})
 
 	t.Run("update all fields but description", func(t *testing.T) {
-		id := createRule(t, false)
+		id := createRule(t)
 
 		ui := cli.NewMockUi()
 		cmd := New(ui)
@@ -912,7 +750,7 @@ func TestBindingRuleUpdateCommand_noMerge(t *testing.T) {
 	})
 
 	t.Run("missing bind name", func(t *testing.T) {
-		id := createRule(t, false)
+		id := createRule(t)
 
 		ui := cli.NewMockUi()
 		cmd := New(ui)
@@ -932,7 +770,7 @@ func TestBindingRuleUpdateCommand_noMerge(t *testing.T) {
 	})
 
 	t.Run("update all fields but selector", func(t *testing.T) {
-		id := createRule(t, false)
+		id := createRule(t)
 
 		ui := cli.NewMockUi()
 		cmd := New(ui)
diff --git a/command/acl/bootstrap/bootstrap.go b/command/acl/bootstrap/bootstrap.go
index 2a2bfd3716d32..254ade15dc2b6 100644
--- a/command/acl/bootstrap/bootstrap.go
+++ b/command/acl/bootstrap/bootstrap.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bootstrap
 
 import (
diff --git a/command/acl/bootstrap/bootstrap_test.go b/command/acl/bootstrap/bootstrap_test.go
index e9a0e8cebee2a..8d60289e860e5 100644
--- a/command/acl/bootstrap/bootstrap_test.go
+++ b/command/acl/bootstrap/bootstrap_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package bootstrap
 
 import (
diff --git a/command/acl/policy/create/policy_create.go b/command/acl/policy/create/policy_create.go
index a172b17fbb1ac..a2e3690d4fb98 100644
--- a/command/acl/policy/create/policy_create.go
+++ b/command/acl/policy/create/policy_create.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package policycreate
 
 import (
@@ -71,7 +68,7 @@ func (c *cmd) Run(args []string) int {
 	}
 
 	if c.name == "" {
-		c.UI.Error(fmt.Sprintf("Missing required '-name' flag"))
+		c.UI.Error(fmt.Sprintf("Missing require '-name' flag"))
 		c.UI.Error(c.Help())
 		return 1
 	}
diff --git a/command/acl/policy/create/policy_create_test.go b/command/acl/policy/create/policy_create_test.go
index 953dd978ed964..39c837ab89d6e 100644
--- a/command/acl/policy/create/policy_create_test.go
+++ b/command/acl/policy/create/policy_create_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package policycreate
 
 import (
diff --git a/command/acl/policy/delete/policy_delete.go b/command/acl/policy/delete/policy_delete.go
index 63c02a47ddd2b..69d23d2a8b7ea 100644
--- a/command/acl/policy/delete/policy_delete.go
+++ b/command/acl/policy/delete/policy_delete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package policydelete
 
 import (
diff --git a/command/acl/policy/delete/policy_delete_test.go b/command/acl/policy/delete/policy_delete_test.go
index 33f121db981fa..3df6c20535f84 100644
--- a/command/acl/policy/delete/policy_delete_test.go
+++ b/command/acl/policy/delete/policy_delete_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package policydelete
 
 import (
diff --git a/command/acl/policy/formatter.go b/command/acl/policy/formatter.go
index dce79c3907160..6bcee99f2c574 100644
--- a/command/acl/policy/formatter.go
+++ b/command/acl/policy/formatter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package policy
 
 import (
diff --git a/command/acl/policy/list/policy_list.go b/command/acl/policy/list/policy_list.go
index 44be10d6843d9..8b788f30bb9a5 100644
--- a/command/acl/policy/list/policy_list.go
+++ b/command/acl/policy/list/policy_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package policylist
 
 import (
diff --git a/command/acl/policy/list/policy_list_test.go b/command/acl/policy/list/policy_list_test.go
index b0cc05b2a5cf7..6a40f2c8285d5 100644
--- a/command/acl/policy/list/policy_list_test.go
+++ b/command/acl/policy/list/policy_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package policylist
 
 import (
diff --git a/command/acl/policy/policy.go b/command/acl/policy/policy.go
index 565c672706468..d96bd2700aca9 100644
--- a/command/acl/policy/policy.go
+++ b/command/acl/policy/policy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package policy
 
 import (
diff --git a/command/acl/policy/read/policy_read.go b/command/acl/policy/read/policy_read.go
index 36f1e65340794..57e9397b2a472 100644
--- a/command/acl/policy/read/policy_read.go
+++ b/command/acl/policy/read/policy_read.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package policyread
 
 import (
diff --git a/command/acl/policy/read/policy_read_test.go b/command/acl/policy/read/policy_read_test.go
index 70036457cebb9..bd8d99dd83749 100644
--- a/command/acl/policy/read/policy_read_test.go
+++ b/command/acl/policy/read/policy_read_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package policyread
 
 import (
diff --git a/command/acl/policy/update/policy_update.go b/command/acl/policy/update/policy_update.go
index 60b6340736137..5d0768a803f6e 100644
--- a/command/acl/policy/update/policy_update.go
+++ b/command/acl/policy/update/policy_update.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package policyupdate
 
 import (
diff --git a/command/acl/policy/update/policy_update_test.go b/command/acl/policy/update/policy_update_test.go
index 4d77191d64332..485425be07ee3 100644
--- a/command/acl/policy/update/policy_update_test.go
+++ b/command/acl/policy/update/policy_update_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package policyupdate
 
 import (
diff --git a/command/acl/role/create/role_create.go b/command/acl/role/create/role_create.go
index b93d25548d282..9afbfe8416765 100644
--- a/command/acl/role/create/role_create.go
+++ b/command/acl/role/create/role_create.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package rolecreate
 
 import (
@@ -28,15 +25,12 @@ type cmd struct {
 	http  *flags.HTTPFlags
 	help  string
 
-	name                     string
-	description              string
-	policyIDs                []string
-	policyNames              []string
-	serviceIdents            []string
-	nodeIdents               []string
-	templatedPolicy          string
-	templatedPolicyFile      string
-	templatedPolicyVariables []string
+	name          string
+	description   string
+	policyIDs     []string
+	policyNames   []string
+	serviceIdents []string
+	nodeIdents    []string
 
 	showMeta bool
 	format   string
@@ -58,12 +52,6 @@ func (c *cmd) init() {
 	c.flags.Var((*flags.AppendSliceValue)(&c.nodeIdents), "node-identity", "Name of a "+
 		"node identity to use for this role. May be specified multiple times. Format is "+
 		"NODENAME:DATACENTER")
-	c.flags.Var((*flags.AppendSliceValue)(&c.templatedPolicyVariables), "var", "Templated policy variables."+
-		" Must be used in combination with -templated-policy flag to specify required variables."+
-		" May be specified multiple times with different variables."+
-		" Format is VariableName:Value")
-	c.flags.StringVar(&c.templatedPolicy, "templated-policy", "", "The templated policy name. Use -var flag to specify variables when required.")
-	c.flags.StringVar(&c.templatedPolicyFile, "templated-policy-file", "", "Path to a file containing templated policy names and variables.")
 	c.flags.StringVar(
 		&c.format,
 		"format",
@@ -83,14 +71,13 @@ func (c *cmd) Run(args []string) int {
 	}
 
 	if c.name == "" {
-		c.UI.Error("Missing required '-name' flag")
+		c.UI.Error(fmt.Sprintf("Missing require '-name' flag"))
 		c.UI.Error(c.Help())
 		return 1
 	}
 
-	if len(c.policyNames) == 0 && len(c.policyIDs) == 0 && len(c.serviceIdents) == 0 && len(c.nodeIdents) == 0 &&
-		len(c.templatedPolicy) == 0 && len(c.templatedPolicyFile) == 0 {
-		c.UI.Error("Cannot create a role without specifying -policy-name, -policy-id, -service-identity, -node-identity, -templated-policy-file or -templated-policy at least once")
+	if len(c.policyNames) == 0 && len(c.policyIDs) == 0 && len(c.serviceIdents) == 0 && len(c.nodeIdents) == 0 {
+		c.UI.Error(fmt.Sprintf("Cannot create a role without specifying -policy-name, -policy-id, -service-identity, or -node-identity at least once"))
 		return 1
 	}
 
@@ -134,13 +121,6 @@ func (c *cmd) Run(args []string) int {
 	}
 	newRole.NodeIdentities = parsedNodeIdents
 
-	parsedTemplatedPolicies, err := acl.ExtractTemplatedPolicies(c.templatedPolicy, c.templatedPolicyFile, c.templatedPolicyVariables)
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-	newRole.TemplatedPolicies = parsedTemplatedPolicies
-
 	r, _, err := client.ACL().RoleCreate(newRole, nil)
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Failed to create new role: %v", err))
@@ -184,7 +164,5 @@ Usage: consul acl role create -name NAME [options]
                                  -policy-id b52fc3de-5 \
                                  -policy-name "acl-replication" \
                                  -service-identity "web" \
-                                 -service-identity "db:east,west" \
-                                 -templated-policy "builtin/service" \
-                                 -var "name:api"
+                                 -service-identity "db:east,west"
 `
diff --git a/command/acl/role/create/role_create_test.go b/command/acl/role/create/role_create_test.go
index 7094a76e6cc7c..b7a31add48c36 100644
--- a/command/acl/role/create/role_create_test.go
+++ b/command/acl/role/create/role_create_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package rolecreate
 
 import (
diff --git a/command/acl/role/delete/role_delete.go b/command/acl/role/delete/role_delete.go
index aaac306f01b2b..41fbb26a3ce9d 100644
--- a/command/acl/role/delete/role_delete.go
+++ b/command/acl/role/delete/role_delete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package roledelete
 
 import (
diff --git a/command/acl/role/delete/role_delete_test.go b/command/acl/role/delete/role_delete_test.go
index 61897ca245575..a1b941cf68fa2 100644
--- a/command/acl/role/delete/role_delete_test.go
+++ b/command/acl/role/delete/role_delete_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package roledelete
 
 import (
diff --git a/command/acl/role/formatter.go b/command/acl/role/formatter.go
index 9ead147582c9f..8f9b57cfe2c20 100644
--- a/command/acl/role/formatter.go
+++ b/command/acl/role/formatter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package role
 
 import (
@@ -89,20 +86,6 @@ func (f *prettyFormatter) FormatRole(role *api.ACLRole) (string, error) {
 			buffer.WriteString(fmt.Sprintf("   %s (Datacenter: %s)\n", nodeid.NodeName, nodeid.Datacenter))
 		}
 	}
-	if len(role.TemplatedPolicies) > 0 {
-		buffer.WriteString(fmt.Sprintln("Templated Policies:"))
-		for _, templatedPolicy := range role.TemplatedPolicies {
-			buffer.WriteString(fmt.Sprintf("   %s\n", templatedPolicy.TemplateName))
-			if templatedPolicy.TemplateVariables != nil && templatedPolicy.TemplateVariables.Name != "" {
-				buffer.WriteString(fmt.Sprintf("      Name: %s\n", templatedPolicy.TemplateVariables.Name))
-			}
-			if len(templatedPolicy.Datacenters) > 0 {
-				buffer.WriteString(fmt.Sprintf("      Datacenters: %s\n", strings.Join(templatedPolicy.Datacenters, ", ")))
-			} else {
-				buffer.WriteString("      Datacenters: all\n")
-			}
-		}
-	}
 
 	return buffer.String(), nil
 }
@@ -158,21 +141,6 @@ func (f *prettyFormatter) formatRoleListEntry(role *api.ACLRole) string {
 		}
 	}
 
-	if len(role.TemplatedPolicies) > 0 {
-		buffer.WriteString(fmt.Sprintln("   Templated Policies:"))
-		for _, templatedPolicy := range role.TemplatedPolicies {
-			buffer.WriteString(fmt.Sprintf("      %s\n", templatedPolicy.TemplateName))
-			if templatedPolicy.TemplateVariables != nil && templatedPolicy.TemplateVariables.Name != "" {
-				buffer.WriteString(fmt.Sprintf("         Name: %s\n", templatedPolicy.TemplateVariables.Name))
-			}
-			if len(templatedPolicy.Datacenters) > 0 {
-				buffer.WriteString(fmt.Sprintf("         Datacenters: %s\n", strings.Join(templatedPolicy.Datacenters, ", ")))
-			} else {
-				buffer.WriteString("         Datacenters: all\n")
-			}
-		}
-	}
-
 	return buffer.String()
 }
 
diff --git a/command/acl/role/formatter_test.go b/command/acl/role/formatter_test.go
index 3c1ecaeddc704..0e0721dc4dd1d 100644
--- a/command/acl/role/formatter_test.go
+++ b/command/acl/role/formatter_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package role
 
 import (
@@ -83,14 +80,6 @@ func TestFormatRole(t *testing.T) {
 						Datacenter: "middleearth-northwest",
 					},
 				},
-				TemplatedPolicies: []*api.ACLTemplatedPolicy{
-					{
-						TemplateName:      api.ACLTemplatedPolicyServiceName,
-						TemplateVariables: &api.ACLTemplatedPolicyVariables{Name: "gardener"},
-						Datacenters:       []string{"middleearth-northwest", "somewhere-east"},
-					},
-					{TemplateName: api.ACLTemplatedPolicyNodeName, TemplateVariables: &api.ACLTemplatedPolicyVariables{Name: "bagend"}},
-				},
 			},
 		},
 	}
@@ -122,7 +111,7 @@ func TestFormatRole(t *testing.T) {
 	}
 }
 
-func TestFormatRoleList(t *testing.T) {
+func TestFormatTokenList(t *testing.T) {
 	type testCase struct {
 		roles              []*api.ACLRole
 		overrideGoldenName string
@@ -173,10 +162,6 @@ func TestFormatRoleList(t *testing.T) {
 							Datacenter: "middleearth-northwest",
 						},
 					},
-					TemplatedPolicies: []*api.ACLTemplatedPolicy{
-						{TemplateName: api.ACLTemplatedPolicyServiceName, TemplateVariables: &api.ACLTemplatedPolicyVariables{Name: "gardener"}},
-						{TemplateName: api.ACLTemplatedPolicyNodeName, TemplateVariables: &api.ACLTemplatedPolicyVariables{Name: "bagend"}},
-					},
 				},
 			},
 		},
diff --git a/command/acl/role/list/role_list.go b/command/acl/role/list/role_list.go
index 558419e07067a..8d69fc96af40b 100644
--- a/command/acl/role/list/role_list.go
+++ b/command/acl/role/list/role_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package rolelist
 
 import (
diff --git a/command/acl/role/list/role_list_test.go b/command/acl/role/list/role_list_test.go
index 0a94d11a109da..d331fefb6c0bd 100644
--- a/command/acl/role/list/role_list_test.go
+++ b/command/acl/role/list/role_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package rolelist
 
 import (
diff --git a/command/acl/role/read/role_read.go b/command/acl/role/read/role_read.go
index 027aaa80019f9..c22c48477aeaf 100644
--- a/command/acl/role/read/role_read.go
+++ b/command/acl/role/read/role_read.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package roleread
 
 import (
diff --git a/command/acl/role/read/role_read_test.go b/command/acl/role/read/role_read_test.go
index bef1fab260164..8751d4b44338d 100644
--- a/command/acl/role/read/role_read_test.go
+++ b/command/acl/role/read/role_read_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package roleread
 
 import (
diff --git a/command/acl/role/role.go b/command/acl/role/role.go
index c1da51d86401e..b8acc8a76bfb1 100644
--- a/command/acl/role/role.go
+++ b/command/acl/role/role.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package role
 
 import (
diff --git a/command/acl/role/testdata/FormatRole/complex.json.golden b/command/acl/role/testdata/FormatRole/complex.json.golden
index 8b22fcb3b7c39..b8d9b64950c0e 100644
--- a/command/acl/role/testdata/FormatRole/complex.json.golden
+++ b/command/acl/role/testdata/FormatRole/complex.json.golden
@@ -26,24 +26,6 @@
             "Datacenter": "middleearth-northwest"
         }
     ],
-    "TemplatedPolicies": [
-        {
-            "TemplateName": "builtin/service",
-            "TemplateVariables": {
-                "Name": "gardener"
-            },
-            "Datacenters": [
-                "middleearth-northwest",
-                "somewhere-east"
-            ]
-        },
-        {
-            "TemplateName": "builtin/node",
-            "TemplateVariables": {
-                "Name": "bagend"
-            }
-        }
-    ],
     "Hash": "YWJjZGVmZ2g=",
     "CreateIndex": 5,
     "ModifyIndex": 10,
diff --git a/command/acl/role/testdata/FormatRole/complex.pretty-meta.golden b/command/acl/role/testdata/FormatRole/complex.pretty-meta.golden
index 174d3eb2b8aaa..56e61f7780fe5 100644
--- a/command/acl/role/testdata/FormatRole/complex.pretty-meta.golden
+++ b/command/acl/role/testdata/FormatRole/complex.pretty-meta.golden
@@ -12,10 +12,3 @@ Service Identities:
    gardener (Datacenters: middleearth-northwest)
 Node Identities:
    bagend (Datacenter: middleearth-northwest)
-Templated Policies:
-   builtin/service
-      Name: gardener
-      Datacenters: middleearth-northwest, somewhere-east
-   builtin/node
-      Name: bagend
-      Datacenters: all
diff --git a/command/acl/role/testdata/FormatRole/complex.pretty.golden b/command/acl/role/testdata/FormatRole/complex.pretty.golden
index 54402c34e453f..b3d347ed00ccb 100644
--- a/command/acl/role/testdata/FormatRole/complex.pretty.golden
+++ b/command/acl/role/testdata/FormatRole/complex.pretty.golden
@@ -9,10 +9,3 @@ Service Identities:
    gardener (Datacenters: middleearth-northwest)
 Node Identities:
    bagend (Datacenter: middleearth-northwest)
-Templated Policies:
-   builtin/service
-      Name: gardener
-      Datacenters: middleearth-northwest, somewhere-east
-   builtin/node
-      Name: bagend
-      Datacenters: all
diff --git a/command/acl/role/testdata/FormatRoleList/complex.json.golden b/command/acl/role/testdata/FormatRoleList/complex.json.golden
index 2d448667a59b5..58c6d850b85d0 100644
--- a/command/acl/role/testdata/FormatRoleList/complex.json.golden
+++ b/command/acl/role/testdata/FormatRoleList/complex.json.golden
@@ -27,20 +27,6 @@
                 "Datacenter": "middleearth-northwest"
             }
         ],
-        "TemplatedPolicies": [
-            {
-                "TemplateName": "builtin/service",
-                "TemplateVariables": {
-                    "Name": "gardener"
-                }
-            },
-            {
-                "TemplateName": "builtin/node",
-                "TemplateVariables": {
-                    "Name": "bagend"
-                }
-            }
-        ],
         "Hash": "YWJjZGVmZ2g=",
         "CreateIndex": 5,
         "ModifyIndex": 10,
diff --git a/command/acl/role/testdata/FormatRoleList/complex.pretty-meta.golden b/command/acl/role/testdata/FormatRoleList/complex.pretty-meta.golden
index 842482b4e2f93..76355e91dddca 100644
--- a/command/acl/role/testdata/FormatRoleList/complex.pretty-meta.golden
+++ b/command/acl/role/testdata/FormatRoleList/complex.pretty-meta.golden
@@ -12,10 +12,3 @@ complex:
       gardener (Datacenters: middleearth-northwest)
    Node Identities:
       bagend (Datacenter: middleearth-northwest)
-   Templated Policies:
-      builtin/service
-         Name: gardener
-         Datacenters: all
-      builtin/node
-         Name: bagend
-         Datacenters: all
diff --git a/command/acl/role/testdata/FormatRoleList/complex.pretty.golden b/command/acl/role/testdata/FormatRoleList/complex.pretty.golden
index a3907e4d97759..ab2b0c87f8fee 100644
--- a/command/acl/role/testdata/FormatRoleList/complex.pretty.golden
+++ b/command/acl/role/testdata/FormatRoleList/complex.pretty.golden
@@ -9,10 +9,3 @@ complex:
       gardener (Datacenters: middleearth-northwest)
    Node Identities:
       bagend (Datacenter: middleearth-northwest)
-   Templated Policies:
-      builtin/service
-         Name: gardener
-         Datacenters: all
-      builtin/node
-         Name: bagend
-         Datacenters: all
diff --git a/command/acl/role/update/role_update.go b/command/acl/role/update/role_update.go
index fa1ac4176fa36..d229fd47bea2a 100644
--- a/command/acl/role/update/role_update.go
+++ b/command/acl/role/update/role_update.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package roleupdate
 
 import (
@@ -28,18 +25,13 @@ type cmd struct {
 	http  *flags.HTTPFlags
 	help  string
 
-	roleID                     string
-	name                       string
-	description                string
-	policyIDs                  []string
-	policyNames                []string
-	serviceIdents              []string
-	nodeIdents                 []string
-	appendTemplatedPolicy      string
-	replaceTemplatedPolicy     string
-	appendTemplatedPolicyFile  string
-	replaceTemplatedPolicyFile string
-	templatedPolicyVariables   []string
+	roleID        string
+	name          string
+	description   string
+	policyIDs     []string
+	policyNames   []string
+	serviceIdents []string
+	nodeIdents    []string
 
 	noMerge  bool
 	showMeta bool
@@ -74,16 +66,6 @@ func (c *cmd) init() {
 		role.PrettyFormat,
 		fmt.Sprintf("Output format {%s}", strings.Join(role.GetSupportedFormats(), "|")),
 	)
-	c.flags.Var((*flags.AppendSliceValue)(&c.templatedPolicyVariables), "var", "Templated policy variables."+
-		" Must be used in combination with -append-templated-policy or -replace-templated-policy flags to specify required variables."+
-		" May be specified multiple times with different variables."+
-		" Format is VariableName:Value")
-	c.flags.StringVar(&c.appendTemplatedPolicy, "append-templated-policy", "", "The templated policy name to attach to the role's existing templated policies list. Use -var flag to specify variables when required."+
-		" The role retains existing templated policies.")
-	c.flags.StringVar(&c.replaceTemplatedPolicy, "replace-templated-policy", "", "The templated policy name to replace the existing templated policies list with. Use -var flag to specify variables when required."+
-		" Overwrites the role's existing templated policies.")
-	c.flags.StringVar(&c.appendTemplatedPolicyFile, "append-templated-policy-file", "", "Path to a file containing templated policies and variables. Works like `-append-templated-policy`. The role retains existing templated policies.")
-	c.flags.StringVar(&c.replaceTemplatedPolicyFile, "replace-templated-policy-file", "", "Path to a file containing templated policies and variables. Works like `-replace-templated-policy`. Overwrites the role's existing templated policies.")
 
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
@@ -126,24 +108,6 @@ func (c *cmd) Run(args []string) int {
 		return 1
 	}
 
-	hasAppendTemplatedPolicies := len(c.appendTemplatedPolicy) > 0 || len(c.appendTemplatedPolicyFile) > 0
-	hasReplaceTemplatedPolicies := len(c.replaceTemplatedPolicy) > 0 || len(c.replaceTemplatedPolicyFile) > 0
-
-	if hasReplaceTemplatedPolicies && hasAppendTemplatedPolicies {
-		c.UI.Error("Cannot combine the use of append-templated-policy flags with replace-templated-policy. " +
-			"To set or overwrite existing templated policies, use -replace-templated-policy or -replace-templated-policy-file. " +
-			"To append to existing templated policies, use -append-templated-policy or -append-templated-policy-file.")
-		return 1
-	}
-	parsedTemplatedPolicies, err := acl.ExtractTemplatedPolicies(c.replaceTemplatedPolicy, c.replaceTemplatedPolicyFile, c.templatedPolicyVariables)
-	if hasAppendTemplatedPolicies {
-		parsedTemplatedPolicies, err = acl.ExtractTemplatedPolicies(c.appendTemplatedPolicy, c.appendTemplatedPolicyFile, c.templatedPolicyVariables)
-	}
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
 	// Read the current role in both cases so we can fail better if not found.
 	currentRole, _, err := client.ACL().RoleRead(roleID, nil)
 	if err != nil {
@@ -162,7 +126,6 @@ func (c *cmd) Run(args []string) int {
 			Description:       c.description,
 			ServiceIdentities: parsedServiceIdents,
 			NodeIdentities:    parsedNodeIdents,
-			TemplatedPolicies: parsedTemplatedPolicies,
 		}
 
 		for _, policyName := range c.policyNames {
@@ -255,12 +218,6 @@ func (c *cmd) Run(args []string) int {
 				r.NodeIdentities = append(r.NodeIdentities, nodeid)
 			}
 		}
-
-		if hasReplaceTemplatedPolicies {
-			r.TemplatedPolicies = parsedTemplatedPolicies
-		} else {
-			r.TemplatedPolicies = append(r.TemplatedPolicies, parsedTemplatedPolicies...)
-		}
 	}
 
 	r, _, err = client.ACL().RoleUpdate(r, nil)
@@ -313,8 +270,6 @@ Usage: consul acl role update [options]
                                    -name "better-name" \
                                    -description "replication" \
                                    -policy-name "token-replication" \
-                                   -service-identity "web" \
-                                   -templated-policy "builtin/service" \
-                                   -var "name:api"
+                                   -service-identity "web"
 `
 )
diff --git a/command/acl/role/update/role_update_test.go b/command/acl/role/update/role_update_test.go
index e9868f8c20ed2..ebc49945b9d8b 100644
--- a/command/acl/role/update/role_update_test.go
+++ b/command/acl/role/update/role_update_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package roleupdate
 
 import (
@@ -68,9 +65,6 @@ func TestRoleUpdateCommand(t *testing.T) {
 					ServiceName: "fake",
 				},
 			},
-			TemplatedPolicies: []*api.ACLTemplatedPolicy{
-				{TemplateName: api.ACLTemplatedPolicyServiceName, TemplateVariables: &api.ACLTemplatedPolicyVariables{Name: "fake"}},
-			},
 		},
 		&api.WriteOptions{Token: "root"},
 	)
@@ -125,7 +119,6 @@ func TestRoleUpdateCommand(t *testing.T) {
 		require.Equal(t, "test role edited", role.Description)
 		require.Len(t, role.Policies, 1)
 		require.Len(t, role.ServiceIdentities, 1)
-		require.Len(t, role.TemplatedPolicies, 1)
 	})
 
 	t.Run("update with policy by id", func(t *testing.T) {
@@ -202,47 +195,6 @@ func TestRoleUpdateCommand(t *testing.T) {
 		require.Len(t, role.ServiceIdentities, 3)
 		require.Len(t, role.NodeIdentities, 1)
 	})
-	t.Run("update with append templated policies", func(t *testing.T) {
-		_ = run(t, []string{
-			"-id=" + role.ID,
-			"-token=root",
-			"-append-templated-policy=builtin/service",
-			"-var=name:api",
-		})
-
-		role, _, err := client.ACL().RoleRead(
-			role.ID,
-			&api.QueryOptions{Token: "root"},
-		)
-		require.NoError(t, err)
-		require.NotNil(t, role)
-		require.Equal(t, "test role edited", role.Description)
-		require.Len(t, role.Policies, 2)
-		require.Len(t, role.ServiceIdentities, 3)
-		require.Len(t, role.NodeIdentities, 1)
-		require.Len(t, role.TemplatedPolicies, 2)
-	})
-
-	t.Run("update with replace templated policies", func(t *testing.T) {
-		_ = run(t, []string{
-			"-id=" + role.ID,
-			"-token=root",
-			"-replace-templated-policy=builtin/service",
-			"-var=name:api",
-		})
-
-		role, _, err := client.ACL().RoleRead(
-			role.ID,
-			&api.QueryOptions{Token: "root"},
-		)
-		require.NoError(t, err)
-		require.NotNil(t, role)
-		require.Equal(t, "test role edited", role.Description)
-		require.Len(t, role.Policies, 2)
-		require.Len(t, role.ServiceIdentities, 3)
-		require.Len(t, role.NodeIdentities, 1)
-		require.Len(t, role.TemplatedPolicies, 1)
-	})
 }
 
 func TestRoleUpdateCommand_JSON(t *testing.T) {
@@ -380,9 +332,6 @@ func TestRoleUpdateCommand_noMerge(t *testing.T) {
 						ServiceName: "fake",
 					},
 				},
-				TemplatedPolicies: []*api.ACLTemplatedPolicy{
-					{TemplateName: api.ACLTemplatedPolicyServiceName, TemplateVariables: &api.ACLTemplatedPolicyVariables{Name: "fake"}},
-				},
 				Policies: []*api.ACLRolePolicyLink{
 					{
 						ID: policy3.ID,
@@ -530,64 +479,4 @@ func TestRoleUpdateCommand_noMerge(t *testing.T) {
 		require.Len(t, role.Policies, 0)
 		require.Len(t, role.ServiceIdentities, 1)
 	})
-
-	t.Run("update with templated policy append", func(t *testing.T) {
-		role := createRole(t)
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-id=" + role.ID,
-			"-name=" + role.Name,
-			"-token=root",
-			"-no-merge",
-			"-append-templated-policy=builtin/service",
-			"-var=name:api",
-		}
-
-		code := cmd.Run(args)
-		require.Equal(t, code, 0, "err: %s", ui.ErrorWriter.String())
-		require.Empty(t, ui.ErrorWriter.String())
-
-		role, _, err := client.ACL().RoleRead(
-			role.ID,
-			&api.QueryOptions{Token: "root"},
-		)
-		require.NoError(t, err)
-		require.NotNil(t, role)
-		require.Equal(t, "", role.Description)
-		require.Len(t, role.Policies, 0)
-		require.Len(t, role.TemplatedPolicies, 1)
-	})
-
-	t.Run("update with replace templated policy", func(t *testing.T) {
-		role := createRole(t)
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-id=" + role.ID,
-			"-name=" + role.Name,
-			"-token=root",
-			"-no-merge",
-			"-replace-templated-policy=builtin/service",
-			"-var=name:api",
-		}
-
-		code := cmd.Run(args)
-		require.Equal(t, code, 0, "err: %s", ui.ErrorWriter.String())
-		require.Empty(t, ui.ErrorWriter.String())
-
-		role, _, err := client.ACL().RoleRead(
-			role.ID,
-			&api.QueryOptions{Token: "root"},
-		)
-		require.NoError(t, err)
-		require.NotNil(t, role)
-		require.Equal(t, "", role.Description)
-		require.Len(t, role.Policies, 0)
-		require.Len(t, role.TemplatedPolicies, 1)
-	})
 }
diff --git a/command/acl/templatedpolicy/formatter.go b/command/acl/templatedpolicy/formatter.go
deleted file mode 100644
index dec8378bcc5fd..0000000000000
--- a/command/acl/templatedpolicy/formatter.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package templatedpolicy
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"sort"
-
-	"github.com/hashicorp/consul/api"
-)
-
-const (
-	PrettyFormat     string = "pretty"
-	JSONFormat       string = "json"
-	WhitespaceIndent        = "\t"
-)
-
-// Formatter defines methods provided by templated-policy command output formatter
-type Formatter interface {
-	FormatTemplatedPolicy(policy api.ACLTemplatedPolicyResponse) (string, error)
-	FormatTemplatedPolicyList(policies map[string]api.ACLTemplatedPolicyResponse) (string, error)
-}
-
-// GetSupportedFormats returns supported formats
-func GetSupportedFormats() []string {
-	return []string{PrettyFormat, JSONFormat}
-}
-
-// NewFormatter returns Formatter implementation
-func NewFormatter(format string, showMeta bool) (formatter Formatter, err error) {
-	switch format {
-	case PrettyFormat:
-		formatter = newPrettyFormatter(showMeta)
-	case JSONFormat:
-		formatter = newJSONFormatter(showMeta)
-	default:
-		err = fmt.Errorf("unknown format: %q", format)
-	}
-
-	return formatter, err
-}
-
-func newPrettyFormatter(showMeta bool) Formatter {
-	return &prettyFormatter{showMeta}
-}
-
-func newJSONFormatter(showMeta bool) Formatter {
-	return &jsonFormatter{showMeta}
-}
-
-type prettyFormatter struct {
-	showMeta bool
-}
-
-// FormatTemplatedPolicy displays template name, input variables and example usages. When
-// showMeta is true, we display raw template code and schema.
-// This implementation is a conscious choice as  we know builtin variables we know every required/optional input variables
-// so we can just hardcode this.
-// In the future, when we implement user defined templated policies, we will move this to some sort of schema parsing.
-// This implementation allows us to move forward without limiting ourselves when implementing user defined templated policies.
-func (f *prettyFormatter) FormatTemplatedPolicy(templatedPolicy api.ACLTemplatedPolicyResponse) (string, error) {
-	var buffer bytes.Buffer
-
-	buffer.WriteString(fmt.Sprintf("Name:            %s\n", templatedPolicy.TemplateName))
-
-	buffer.WriteString("Input variables:")
-	switch templatedPolicy.TemplateName {
-	case api.ACLTemplatedPolicyServiceName:
-		buffer.WriteString(fmt.Sprintf("\n%sName: String - Required - The name of the service.\n", WhitespaceIndent))
-		buffer.WriteString("Example usage:\n")
-		buffer.WriteString(WhitespaceIndent + "consul acl token create -templated-policy builtin/service -var name:api\n")
-	case api.ACLTemplatedPolicyNodeName:
-		buffer.WriteString(fmt.Sprintf("\n%sName: String - Required - The node name.\n", WhitespaceIndent))
-		buffer.WriteString("Example usage:\n")
-		buffer.WriteString(fmt.Sprintf("%sconsul acl token create -templated-policy builtin/node -var name:node-1\n", WhitespaceIndent))
-	case api.ACLTemplatedPolicyDNSName, api.ACLTemplatedPolicyNomadServerName:
-		noRequiredVariablesOutput(&buffer, templatedPolicy.TemplateName)
-	default:
-		buffer.WriteString("   None\n")
-	}
-
-	if f.showMeta {
-		if templatedPolicy.Schema != "" {
-			buffer.WriteString(fmt.Sprintf("Schema:\n%s\n\n", templatedPolicy.Schema))
-		}
-		buffer.WriteString(fmt.Sprintf("Raw Template:\n%s\n", templatedPolicy.Template))
-	}
-
-	return buffer.String(), nil
-}
-
-func noRequiredVariablesOutput(buffer *bytes.Buffer, templateName string) {
-	buffer.WriteString(" None\n")
-	buffer.WriteString("Example usage:\n")
-	buffer.WriteString(fmt.Sprintf("%sconsul acl token create -templated-policy %s\n", WhitespaceIndent, templateName))
-}
-
-func (f *prettyFormatter) FormatTemplatedPolicyList(policies map[string]api.ACLTemplatedPolicyResponse) (string, error) {
-	var buffer bytes.Buffer
-
-	templateNames := make([]string, 0, len(policies))
-	for _, templatedPolicy := range policies {
-		templateNames = append(templateNames, templatedPolicy.TemplateName)
-	}
-
-	//ensure the list is consistently sorted by strings
-	sort.Strings(templateNames)
-	for _, name := range templateNames {
-		buffer.WriteString(fmt.Sprintf("%s\n", name))
-	}
-
-	return buffer.String(), nil
-}
-
-type jsonFormatter struct {
-	showMeta bool
-}
-
-func (f *jsonFormatter) FormatTemplatedPolicy(templatedPolicy api.ACLTemplatedPolicyResponse) (string, error) {
-	b, err := json.MarshalIndent(templatedPolicy, "", "    ")
-	if err != nil {
-		return "", fmt.Errorf("failed to marshal templated policy: %v", err)
-	}
-	return string(b), nil
-}
-
-func (f *jsonFormatter) FormatTemplatedPolicyList(templatedPolicies map[string]api.ACLTemplatedPolicyResponse) (string, error) {
-	b, err := json.MarshalIndent(templatedPolicies, "", "    ")
-	if err != nil {
-		return "", fmt.Errorf("failed to marshal templated policies: %v", err)
-	}
-	return string(b), nil
-}
diff --git a/command/acl/templatedpolicy/formatter_ce_test.go b/command/acl/templatedpolicy/formatter_ce_test.go
deleted file mode 100644
index 1333b9557256c..0000000000000
--- a/command/acl/templatedpolicy/formatter_ce_test.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package templatedpolicy
-
-import "testing"
-
-func TestFormatTemplatedPolicy(t *testing.T) {
-	testFormatTemplatedPolicy(t, "FormatTemplatedPolicy/ce")
-}
-
-func TestFormatTemplatedPolicyList(t *testing.T) {
-	testFormatTemplatedPolicyList(t, "FormatTemplatedPolicyList/ce")
-}
diff --git a/command/acl/templatedpolicy/formatter_test.go b/command/acl/templatedpolicy/formatter_test.go
deleted file mode 100644
index aa00854980b45..0000000000000
--- a/command/acl/templatedpolicy/formatter_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package templatedpolicy
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"path/filepath"
-	"testing"
-
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/api"
-	"github.com/stretchr/testify/require"
-)
-
-// golden reads from the golden file returning the contents as a string.
-func golden(t *testing.T, name string) string {
-	t.Helper()
-
-	golden := filepath.Join("testdata", name+".golden")
-	expected, err := os.ReadFile(golden)
-	require.NoError(t, err)
-
-	return string(expected)
-}
-
-func testFormatTemplatedPolicy(t *testing.T, dirPath string) {
-	type testCase struct {
-		templatedPolicy api.ACLTemplatedPolicyResponse
-	}
-
-	cases := map[string]testCase{
-		"node-templated-policy": {
-			templatedPolicy: api.ACLTemplatedPolicyResponse{
-				TemplateName: api.ACLTemplatedPolicyNodeName,
-				Schema:       structs.ACLTemplatedPolicyNodeSchema,
-				Template:     structs.ACLTemplatedPolicyNode,
-			},
-		},
-		"dns-templated-policy": {
-			templatedPolicy: api.ACLTemplatedPolicyResponse{
-				TemplateName: api.ACLTemplatedPolicyDNSName,
-				Schema:       structs.ACLTemplatedPolicyNoRequiredVariablesSchema,
-				Template:     structs.ACLTemplatedPolicyDNS,
-			},
-		},
-		"service-templated-policy": {
-			templatedPolicy: api.ACLTemplatedPolicyResponse{
-				TemplateName: api.ACLTemplatedPolicyServiceName,
-				Schema:       structs.ACLTemplatedPolicyServiceSchema,
-				Template:     structs.ACLTemplatedPolicyService,
-			},
-		},
-		"nomad-server-templated-policy": {
-			templatedPolicy: api.ACLTemplatedPolicyResponse{
-				TemplateName: api.ACLTemplatedPolicyNomadServerName,
-				Schema:       structs.ACLTemplatedPolicyNoRequiredVariablesSchema,
-				Template:     structs.ACLTemplatedPolicyNomadServer,
-			},
-		},
-	}
-
-	formatters := map[string]Formatter{
-		"pretty":      newPrettyFormatter(false),
-		"pretty-meta": newPrettyFormatter(true),
-		// the JSON formatter ignores the showMeta
-		"json": newJSONFormatter(false),
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			for fmtName, formatter := range formatters {
-				t.Run(fmtName, func(t *testing.T) {
-					actual, err := formatter.FormatTemplatedPolicy(tcase.templatedPolicy)
-					require.NoError(t, err)
-
-					gName := fmt.Sprintf("%s.%s", name, fmtName)
-
-					expected := golden(t, path.Join(dirPath, gName))
-					require.Equal(t, expected, actual)
-				})
-			}
-		})
-	}
-}
-
-func testFormatTemplatedPolicyList(t *testing.T, dirPath string) {
-	// we don't consider the showMeta field for policy list
-	formatters := map[string]Formatter{
-		"pretty": newPrettyFormatter(false),
-		"json":   newJSONFormatter(false),
-	}
-
-	policies := map[string]api.ACLTemplatedPolicyResponse{
-		"builtin/node": {
-			TemplateName: api.ACLTemplatedPolicyNodeName,
-			Schema:       structs.ACLTemplatedPolicyNodeSchema,
-			Template:     structs.ACLTemplatedPolicyNode,
-		},
-		"builtin/dns": {
-			TemplateName: api.ACLTemplatedPolicyDNSName,
-			Schema:       structs.ACLTemplatedPolicyNoRequiredVariablesSchema,
-			Template:     structs.ACLTemplatedPolicyDNS,
-		},
-		"builtin/service": {
-			TemplateName: api.ACLTemplatedPolicyServiceName,
-			Schema:       structs.ACLTemplatedPolicyServiceSchema,
-			Template:     structs.ACLTemplatedPolicyService,
-		},
-	}
-
-	for fmtName, formatter := range formatters {
-		t.Run(fmtName, func(t *testing.T) {
-			actual, err := formatter.FormatTemplatedPolicyList(policies)
-			require.NoError(t, err)
-
-			gName := fmt.Sprintf("list.%s", fmtName)
-
-			expected := golden(t, path.Join(dirPath, gName))
-			require.Equal(t, expected, actual)
-		})
-	}
-}
diff --git a/command/acl/templatedpolicy/list/templated_policy_list.go b/command/acl/templatedpolicy/list/templated_policy_list.go
deleted file mode 100644
index 3e5e30570f122..0000000000000
--- a/command/acl/templatedpolicy/list/templated_policy_list.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package templatedpolicylist
-
-import (
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/mitchellh/cli"
-
-	"github.com/hashicorp/consul/command/acl/templatedpolicy"
-	"github.com/hashicorp/consul/command/flags"
-)
-
-func New(ui cli.Ui) *cmd {
-	c := &cmd{UI: ui}
-	c.init()
-	return c
-}
-
-type cmd struct {
-	UI    cli.Ui
-	flags *flag.FlagSet
-	http  *flags.HTTPFlags
-	help  string
-
-	format string
-}
-
-func (c *cmd) init() {
-	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
-	c.flags.StringVar(
-		&c.format,
-		"format",
-		templatedpolicy.PrettyFormat,
-		fmt.Sprintf("Output format {%s}", strings.Join(templatedpolicy.GetSupportedFormats(), "|")),
-	)
-
-	c.http = &flags.HTTPFlags{}
-	flags.Merge(c.flags, c.http.ClientFlags())
-	flags.Merge(c.flags, c.http.ServerFlags())
-	flags.Merge(c.flags, c.http.MultiTenancyFlags())
-	c.help = flags.Usage(help, c.flags)
-}
-
-func (c *cmd) Run(args []string) int {
-	if err := c.flags.Parse(args); err != nil {
-		return 1
-	}
-
-	client, err := c.http.APIClient()
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error connecting to Consul agent: %s", err))
-		return 1
-	}
-
-	tps, _, err := client.ACL().TemplatedPolicyList(nil)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to retrieve the templated policies list: %v", err))
-		return 1
-	}
-
-	formatter, err := templatedpolicy.NewFormatter(c.format, false)
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-	out, err := formatter.FormatTemplatedPolicyList(tps)
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-	if out != "" {
-		c.UI.Info(out)
-	}
-
-	return 0
-}
-
-func (c *cmd) Synopsis() string {
-	return synopsis
-}
-
-func (c *cmd) Help() string {
-	return flags.Usage(c.help, nil)
-}
-
-const (
-	synopsis = "Lists ACL templated policies"
-	help     = `
-Usage: consul acl templated-policy list [options]
-
-    Lists all the ACL templated policies.
-
-    Example:
-
-        $ consul acl templated-policy list
-`
-)
diff --git a/command/acl/templatedpolicy/list/templated_policy_list_test.go b/command/acl/templatedpolicy/list/templated_policy_list_test.go
deleted file mode 100644
index 5f548918e7af3..0000000000000
--- a/command/acl/templatedpolicy/list/templated_policy_list_test.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package templatedpolicylist
-
-import (
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/consul/agent"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/testrpc"
-	"github.com/mitchellh/cli"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestTemplatedPolicyListCommand_noTabs(t *testing.T) {
-	t.Parallel()
-
-	if strings.ContainsRune(New(cli.NewMockUi()).Help(), '\t') {
-		t.Fatal("help has tabs")
-	}
-}
-
-func TestTemplatedPolicyListCommand(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	a := agent.NewTestAgent(t, `
-	primary_datacenter = "dc1"
-	acl {
-		enabled = true
-		tokens {
-			initial_management = "root"
-		}
-	}`)
-
-	defer a.Shutdown()
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1", testrpc.WithToken("root"))
-
-	ui := cli.NewMockUi()
-	args := []string{
-		"-http-addr=" + a.HTTPAddr(),
-		"-token=root",
-	}
-
-	cmd := New(ui)
-	code := cmd.Run(args)
-	assert.Equal(t, code, 0)
-	assert.Empty(t, ui.ErrorWriter.String())
-
-	output := ui.OutputWriter.String()
-	require.Contains(t, output, api.ACLTemplatedPolicyServiceName)
-	require.Contains(t, output, api.ACLTemplatedPolicyDNSName)
-}
-
-func TestTemplatedPolicyListCommand_JSON(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	a := agent.NewTestAgent(t, `
-	primary_datacenter = "dc1"
-	acl {
-		enabled = true
-		tokens {
-			initial_management = "root"
-		}
-	}`)
-
-	defer a.Shutdown()
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1", testrpc.WithToken("root"))
-
-	ui := cli.NewMockUi()
-	args := []string{
-		"-http-addr=" + a.HTTPAddr(),
-		"-token=root",
-		"-format=json",
-	}
-
-	cmd := New(ui)
-	code := cmd.Run(args)
-	assert.Equal(t, code, 0)
-	assert.Empty(t, ui.ErrorWriter.String())
-	output := ui.OutputWriter.String()
-	require.Contains(t, output, api.ACLTemplatedPolicyServiceName)
-	require.Contains(t, output, api.ACLTemplatedPolicyDNSName)
-
-	var jsonOutput map[string]api.ACLTemplatedPolicyResponse
-	err := json.Unmarshal([]byte(output), &jsonOutput)
-	assert.NoError(t, err)
-	outputTemplate := jsonOutput[api.ACLTemplatedPolicyDNSName]
-	assert.Equal(t, structs.ACLTemplatedPolicyNoRequiredVariablesSchema, outputTemplate.Schema)
-}
diff --git a/command/acl/templatedpolicy/preview/templated_policy_preview.go b/command/acl/templatedpolicy/preview/templated_policy_preview.go
deleted file mode 100644
index c2dc706f90074..0000000000000
--- a/command/acl/templatedpolicy/preview/templated_policy_preview.go
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package templatedpolicylist
-
-import (
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/mitchellh/cli"
-
-	"github.com/hashicorp/consul/command/acl"
-	"github.com/hashicorp/consul/command/acl/policy"
-	"github.com/hashicorp/consul/command/acl/templatedpolicy"
-	"github.com/hashicorp/consul/command/flags"
-)
-
-func New(ui cli.Ui) *cmd {
-	c := &cmd{UI: ui}
-	c.init()
-	return c
-}
-
-type cmd struct {
-	UI    cli.Ui
-	flags *flag.FlagSet
-	http  *flags.HTTPFlags
-	help  string
-
-	templatedPolicyName      string
-	templatedPolicyFile      string
-	templatedPolicyVariables []string
-	format                   string
-}
-
-func (c *cmd) init() {
-	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
-	c.flags.StringVar(
-		&c.format,
-		"format",
-		templatedpolicy.PrettyFormat,
-		fmt.Sprintf("Output format {%s}", strings.Join(templatedpolicy.GetSupportedFormats(), "|")),
-	)
-	c.flags.Var((*flags.AppendSliceValue)(&c.templatedPolicyVariables), "var", "Templated policy variables."+
-		" Must be used in combination with -name flag to specify required variables."+
-		" May be specified multiple times with different variables."+
-		" Format is VariableName:Value")
-	c.flags.StringVar(&c.templatedPolicyName, "name", "", "The templated policy name.  Use -var flag to specify variables when required.")
-	c.flags.StringVar(&c.templatedPolicyFile, "file", "", "Path to a file containing templated policies and variables.")
-
-	c.http = &flags.HTTPFlags{}
-	flags.Merge(c.flags, c.http.ClientFlags())
-	flags.Merge(c.flags, c.http.ServerFlags())
-	flags.Merge(c.flags, c.http.MultiTenancyFlags())
-	c.help = flags.Usage(help, c.flags)
-}
-
-func (c *cmd) Run(args []string) int {
-	if err := c.flags.Parse(args); err != nil {
-		return 1
-	}
-
-	if len(c.templatedPolicyName) == 0 && len(c.templatedPolicyFile) == 0 {
-		c.UI.Error("Cannot preview a templated policy without specifying -name or -file")
-		return 1
-	}
-
-	client, err := c.http.APIClient()
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error connecting to Consul agent: %s", err))
-		return 1
-	}
-
-	parsedTemplatedPolicies, err := acl.ExtractTemplatedPolicies(c.templatedPolicyName, c.templatedPolicyFile, c.templatedPolicyVariables)
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
-	if !(len(parsedTemplatedPolicies) == 1) {
-		c.UI.Error("Can only preview a single templated policy at a time.")
-		return 1
-	}
-
-	syntheticPolicy, _, err := client.ACL().TemplatedPolicyPreview(parsedTemplatedPolicies[0], nil)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to generate the templated policy preview: %v", err))
-		return 1
-	}
-
-	formatter, err := policy.NewFormatter(c.format, false)
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-	out, err := formatter.FormatPolicy(syntheticPolicy)
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-	if out != "" {
-		c.UI.Info(out)
-	}
-
-	return 0
-}
-
-func (c *cmd) Synopsis() string {
-	return synopsis
-}
-
-func (c *cmd) Help() string {
-	return flags.Usage(c.help, nil)
-}
-
-const (
-	synopsis = "Preview the policy rendered by the ACL templated policy"
-	help     = `
-Usage: consul acl templated-policy preview [options]
-
-    Preview the policy rendered by the ACL templated policy.
-
-    Example:
-
-        $ consul acl templated-policy preview -name "builtin/service" -var "name:api"
-
-    Preview a templated policy using a file.
-
-    Example:
-
-        $ consul acl templated-policy preview -file templated-policy-file.hcl
-`
-)
diff --git a/command/acl/templatedpolicy/preview/templated_policy_preview_test.go b/command/acl/templatedpolicy/preview/templated_policy_preview_test.go
deleted file mode 100644
index 706e1d270f164..0000000000000
--- a/command/acl/templatedpolicy/preview/templated_policy_preview_test.go
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package templatedpolicylist
-
-import (
-	"encoding/json"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/consul/agent"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/testrpc"
-	"github.com/mitchellh/cli"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestTemplatedPolicyPreviewCommand_noTabs(t *testing.T) {
-	t.Parallel()
-
-	if strings.ContainsRune(New(cli.NewMockUi()).Help(), '\t') {
-		t.Fatal("help has tabs")
-	}
-}
-
-func TestTemplatedPolicyPreviewCommand(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-	testDir := testutil.TempDir(t, "acl")
-
-	a := agent.NewTestAgent(t, `
-	primary_datacenter = "dc1"
-	acl {
-		enabled = true
-		tokens {
-			initial_management = "root"
-		}
-	}`)
-
-	defer a.Shutdown()
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1", testrpc.WithToken("root"))
-
-	t.Run("missing name and file flags", func(t *testing.T) {
-		ui := cli.NewMockUi()
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-		}
-
-		cmd := New(ui)
-		code := cmd.Run(args)
-		assert.Equal(t, code, 1)
-		assert.Contains(t, ui.ErrorWriter.String(), "Cannot preview a templated policy without specifying -name or -file")
-	})
-
-	t.Run("missing required template variables", func(t *testing.T) {
-		ui := cli.NewMockUi()
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-name=builtin/node",
-		}
-
-		cmd := New(ui)
-		code := cmd.Run(args)
-		assert.Equal(t, code, 1)
-		assert.Contains(t, ui.ErrorWriter.String(), "Failed to generate the templated policy preview")
-	})
-
-	t.Run("correct input", func(t *testing.T) {
-		ui := cli.NewMockUi()
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-name=builtin/node",
-			"-var=name:api",
-		}
-
-		cmd := New(ui)
-		code := cmd.Run(args)
-		assert.Equal(t, code, 0)
-		assert.Empty(t, ui.ErrorWriter.String())
-		output := ui.OutputWriter.String()
-		require.Contains(t, output, "synthetic policy generated from templated policy: builtin/node")
-	})
-
-	t.Run("correct input with file", func(t *testing.T) {
-		ui := cli.NewMockUi()
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-file=" + testDir + "/templated-policy.hcl",
-		}
-
-		templatedPolicy := []byte("TemplatedPolicy \"builtin/service\" { Name = \"web\"}")
-		err := os.WriteFile(testDir+"/templated-policy.hcl", templatedPolicy, 0644)
-		require.NoError(t, err)
-
-		cmd := New(ui)
-		code := cmd.Run(args)
-		assert.Equal(t, code, 0)
-		assert.Empty(t, ui.ErrorWriter.String())
-		output := ui.OutputWriter.String()
-		require.Contains(t, output, "synthetic policy generated from templated policy: builtin/service")
-	})
-
-	t.Run("multiple templated policies input in file", func(t *testing.T) {
-		ui := cli.NewMockUi()
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-file=" + testDir + "/templated-policy.hcl",
-		}
-
-		templatedPolicy := []byte(`
-			TemplatedPolicy "builtin/service" { Name = "web"}
-			TemplatedPolicy "builtin/node" { Name = "api"}
-		`)
-		err := os.WriteFile(testDir+"/templated-policy.hcl", templatedPolicy, 0644)
-		require.NoError(t, err)
-
-		cmd := New(ui)
-		code := cmd.Run(args)
-		assert.Equal(t, code, 1)
-		assert.Contains(t, ui.ErrorWriter.String(), "Can only preview a single templated policy at a time.")
-	})
-}
-
-func TestTemplatedPolicyPreviewCommand_JSON(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	a := agent.NewTestAgent(t, `
-	primary_datacenter = "dc1"
-	acl {
-		enabled = true
-		tokens {
-			initial_management = "root"
-		}
-	}`)
-
-	defer a.Shutdown()
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1", testrpc.WithToken("root"))
-
-	t.Run("missing templated-policy flags", func(t *testing.T) {
-		ui := cli.NewMockUi()
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-format=json",
-		}
-
-		cmd := New(ui)
-		code := cmd.Run(args)
-		assert.Equal(t, code, 1)
-		assert.Contains(t, ui.ErrorWriter.String(), "Cannot preview a templated policy without specifying -name or -file")
-	})
-
-	t.Run("missing required template variables", func(t *testing.T) {
-		ui := cli.NewMockUi()
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-name=builtin/node",
-			"-format=json",
-		}
-
-		cmd := New(ui)
-		code := cmd.Run(args)
-		assert.Equal(t, code, 1)
-		assert.Contains(t, ui.ErrorWriter.String(), "Failed to generate the templated policy preview")
-	})
-
-	t.Run("correct input", func(t *testing.T) {
-		ui := cli.NewMockUi()
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-name=builtin/node",
-			"-var=name:api",
-			"-format=json",
-		}
-
-		cmd := New(ui)
-		code := cmd.Run(args)
-		assert.Equal(t, code, 0)
-		assert.Empty(t, ui.ErrorWriter.String())
-		output := ui.OutputWriter.String()
-		require.Contains(t, output, "synthetic policy generated from templated policy: builtin/node")
-
-		// ensure valid json
-		var jsonOutput json.RawMessage
-		err := json.Unmarshal([]byte(output), &jsonOutput)
-		assert.NoError(t, err)
-	})
-}
diff --git a/command/acl/templatedpolicy/read/templated_policy_read.go b/command/acl/templatedpolicy/read/templated_policy_read.go
deleted file mode 100644
index 0d3955fb004a0..0000000000000
--- a/command/acl/templatedpolicy/read/templated_policy_read.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package templatedpolicyread
-
-import (
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/mitchellh/cli"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/command/acl/templatedpolicy"
-	"github.com/hashicorp/consul/command/flags"
-)
-
-const (
-	PrettyFormat string = "pretty"
-	JSONFormat   string = "json"
-	synopsis            = "Read an ACL Templated Policy"
-	help                = `
-Usage: consul acl templated-policy read [options] TEMPLATED_POLICY
-
-  This command will retrieve and print out the details of a single templated policy.
-
-  Example:
-
-      $ consul acl templated-policy read -name templated-policy-name
-`
-)
-
-func New(ui cli.Ui) *cmd {
-	c := &cmd{UI: ui}
-	c.init()
-	return c
-}
-
-type cmd struct {
-	UI    cli.Ui
-	flags *flag.FlagSet
-	http  *flags.HTTPFlags
-	help  string
-
-	templateName string
-	format       string
-	showMeta     bool
-}
-
-func (c *cmd) init() {
-	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
-	c.flags.StringVar(&c.templateName, "name", "", "The name of the templated policy to read.")
-	c.flags.StringVar(
-		&c.format,
-		"format",
-		templatedpolicy.PrettyFormat,
-		fmt.Sprintf("Output format {%s}", strings.Join(templatedpolicy.GetSupportedFormats(), "|")),
-	)
-	c.flags.BoolVar(&c.showMeta, "meta", false, "Indicates that templated policy metadata such "+
-		"as the schema and template code should be shown for each entry.")
-	c.http = &flags.HTTPFlags{}
-	flags.Merge(c.flags, c.http.ClientFlags())
-	flags.Merge(c.flags, c.http.ServerFlags())
-	flags.Merge(c.flags, c.http.MultiTenancyFlags())
-	c.help = flags.Usage(help, c.flags)
-}
-
-func (c *cmd) Run(args []string) int {
-	if err := c.flags.Parse(args); err != nil {
-		return 1
-	}
-
-	if c.templateName == "" {
-		c.UI.Error("Must specify the -name parameter")
-		return 1
-	}
-
-	client, err := c.http.APIClient()
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error connecting to Consul agent: %s", err))
-		return 1
-	}
-
-	var tp *api.ACLTemplatedPolicyResponse
-
-	tp, _, err = client.ACL().TemplatedPolicyReadByName(c.templateName, nil)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error reading templated policy %q: %v", c.templateName, err))
-		return 1
-	} else if tp == nil {
-		c.UI.Error(fmt.Sprintf("Templated policy not found with name %q", c.templateName))
-		return 1
-	}
-
-	formatter, err := templatedpolicy.NewFormatter(c.format, c.showMeta)
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-	out, err := formatter.FormatTemplatedPolicy(*tp)
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
-	if out != "" {
-		c.UI.Info(out)
-	}
-
-	return 0
-}
-
-func (c *cmd) Synopsis() string {
-	return synopsis
-}
-
-func (c *cmd) Help() string {
-	return flags.Usage(c.help, nil)
-}
diff --git a/command/acl/templatedpolicy/read/templated_policy_read_test.go b/command/acl/templatedpolicy/read/templated_policy_read_test.go
deleted file mode 100644
index 99ee66efc9281..0000000000000
--- a/command/acl/templatedpolicy/read/templated_policy_read_test.go
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package templatedpolicyread
-
-import (
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/consul/agent"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/testrpc"
-	"github.com/mitchellh/cli"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestTemplatedPolicyReadCommand_noTabs(t *testing.T) {
-	t.Parallel()
-
-	if strings.ContainsRune(New(cli.NewMockUi()).Help(), '\t') {
-		t.Fatal("help has tabs")
-	}
-}
-
-func TestTemplatedPolicyReadCommand(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	a := agent.NewTestAgent(t, `
-	primary_datacenter = "dc1"
-	acl {
-		enabled = true
-		tokens {
-			initial_management = "root"
-		}
-	}`)
-
-	defer a.Shutdown()
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1", testrpc.WithToken("root"))
-
-	t.Run("missing name flag", func(t *testing.T) {
-		ui := cli.NewMockUi()
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-		}
-
-		cmd := New(ui)
-		code := cmd.Run(args)
-		assert.Equal(t, code, 1)
-		assert.Contains(t, ui.ErrorWriter.String(), "Must specify the -name parameter")
-	})
-
-	t.Run("correct input", func(t *testing.T) {
-		ui := cli.NewMockUi()
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-name=" + api.ACLTemplatedPolicyNodeName,
-		}
-
-		cmd := New(ui)
-		code := cmd.Run(args)
-		assert.Equal(t, code, 0)
-		assert.Empty(t, ui.ErrorWriter.String())
-
-		output := ui.OutputWriter.String()
-		require.Contains(t, output, "Name: String - Required - The node name.")
-		require.Contains(t, output, "consul acl token create -templated-policy builtin/node -var name:node-1")
-	})
-}
-
-func TestTemplatedPolicyReadCommand_JSON(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	a := agent.NewTestAgent(t, `
-	primary_datacenter = "dc1"
-	acl {
-		enabled = true
-		tokens {
-			initial_management = "root"
-		}
-	}`)
-
-	defer a.Shutdown()
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1", testrpc.WithToken("root"))
-
-	t.Run("missing name flag", func(t *testing.T) {
-		ui := cli.NewMockUi()
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-format=json",
-		}
-
-		cmd := New(ui)
-		code := cmd.Run(args)
-		assert.Equal(t, code, 1)
-		assert.Contains(t, ui.ErrorWriter.String(), "Must specify the -name parameter")
-	})
-
-	t.Run("correct input", func(t *testing.T) {
-		ui := cli.NewMockUi()
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-name=" + api.ACLTemplatedPolicyNodeName,
-			"-format=json",
-		}
-
-		cmd := New(ui)
-		code := cmd.Run(args)
-		assert.Equal(t, code, 0)
-		assert.Empty(t, ui.ErrorWriter.String())
-
-		output := ui.OutputWriter.String()
-		var templatedPolicy api.ACLTemplatedPolicyResponse
-		err := json.Unmarshal([]byte(output), &templatedPolicy)
-
-		assert.NoError(t, err)
-		assert.Equal(t, structs.ACLTemplatedPolicyNodeSchema, templatedPolicy.Schema)
-		assert.Equal(t, api.ACLTemplatedPolicyNodeName, templatedPolicy.TemplateName)
-	})
-}
diff --git a/command/acl/templatedpolicy/templated_policy.go b/command/acl/templatedpolicy/templated_policy.go
deleted file mode 100644
index b6951a075c9ba..0000000000000
--- a/command/acl/templatedpolicy/templated_policy.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package templatedpolicy
-
-import (
-	"github.com/hashicorp/consul/command/flags"
-	"github.com/mitchellh/cli"
-)
-
-func New() *cmd {
-	return &cmd{}
-}
-
-type cmd struct{}
-
-func (c *cmd) Run(args []string) int {
-	return cli.RunResultHelp
-}
-
-func (c *cmd) Synopsis() string {
-	return synopsis
-}
-
-func (c *cmd) Help() string {
-	return flags.Usage(help, nil)
-}
-
-const synopsis = "Manage Consul's ACL templated policies"
-const help = `
-Usage: consul acl templated-policy <subcommand> [options] [args]
-
-  This command has subcommands for managing Consul ACL templated policies.
-  Here are some simple examples, and more detailed examples are available
-  in the subcommands or the documentation.
-
-  List all templated policies:
-
-      $ consul acl templated-policy list
-
-  Preview the policy rendered by the ACL templated policy:
-
-      $ consul acl templated-policy preview -name "builtin/service" -var "name:api"
-
-  Read a templated policy with name:
-
-      $ consul acl templated-policy read -name "builtin/service"
-
-  For more examples, ask for subcommand help or view the documentation.
-`
diff --git a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/dns-templated-policy.json.golden b/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/dns-templated-policy.json.golden
deleted file mode 100644
index 36682729f1cb5..0000000000000
--- a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/dns-templated-policy.json.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "TemplateName": "builtin/dns",
-    "Schema": "",
-    "Template": "\nnode_prefix \"\" {\n\tpolicy = \"read\"\n}\nservice_prefix \"\" {\n\tpolicy = \"read\"\n}\nquery_prefix \"\" {\n\tpolicy = \"read\"\n}"
-}
\ No newline at end of file
diff --git a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/dns-templated-policy.pretty-meta.golden b/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/dns-templated-policy.pretty-meta.golden
deleted file mode 100644
index a30a0c5355470..0000000000000
--- a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/dns-templated-policy.pretty-meta.golden
+++ /dev/null
@@ -1,15 +0,0 @@
-Name:            builtin/dns
-Input variables: None
-Example usage:
-	consul acl token create -templated-policy builtin/dns
-Raw Template:
-
-node_prefix "" {
-	policy = "read"
-}
-service_prefix "" {
-	policy = "read"
-}
-query_prefix "" {
-	policy = "read"
-}
diff --git a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/dns-templated-policy.pretty.golden b/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/dns-templated-policy.pretty.golden
deleted file mode 100644
index f52cfdfe1dfcf..0000000000000
--- a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/dns-templated-policy.pretty.golden
+++ /dev/null
@@ -1,4 +0,0 @@
-Name:            builtin/dns
-Input variables: None
-Example usage:
-	consul acl token create -templated-policy builtin/dns
diff --git a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/node-templated-policy.json.golden b/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/node-templated-policy.json.golden
deleted file mode 100644
index 22981af04666d..0000000000000
--- a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/node-templated-policy.json.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "TemplateName": "builtin/node",
-    "Schema": "{\n\t\"type\": \"object\",\n\t\"properties\": {\n\t\t\"name\": { \"type\": \"string\", \"$ref\": \"#/definitions/min-length-one\" }\n\t},\n\t\"required\": [\"name\"],\n\t\"definitions\": {\n\t\t\"min-length-one\": {\n\t\t\t\t\"type\": \"string\",\n\t\t\t\t\"minLength\": 1\n\t\t}\n\t}\n}",
-    "Template": "\nnode \"{{.Name}}\" {\n\tpolicy = \"write\"\n}\nservice_prefix \"\" {\n\tpolicy = \"read\"\n}"
-}
\ No newline at end of file
diff --git a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/node-templated-policy.pretty-meta.golden b/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/node-templated-policy.pretty-meta.golden
deleted file mode 100644
index fda0d9559e37d..0000000000000
--- a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/node-templated-policy.pretty-meta.golden
+++ /dev/null
@@ -1,28 +0,0 @@
-Name:            builtin/node
-Input variables:
-	Name: String - Required - The node name.
-Example usage:
-	consul acl token create -templated-policy builtin/node -var name:node-1
-Schema:
-{
-	"type": "object",
-	"properties": {
-		"name": { "type": "string", "$ref": "#/definitions/min-length-one" }
-	},
-	"required": ["name"],
-	"definitions": {
-		"min-length-one": {
-				"type": "string",
-				"minLength": 1
-		}
-	}
-}
-
-Raw Template:
-
-node "{{.Name}}" {
-	policy = "write"
-}
-service_prefix "" {
-	policy = "read"
-}
diff --git a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/node-templated-policy.pretty.golden b/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/node-templated-policy.pretty.golden
deleted file mode 100644
index a923087028c01..0000000000000
--- a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/node-templated-policy.pretty.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-Name:            builtin/node
-Input variables:
-	Name: String - Required - The node name.
-Example usage:
-	consul acl token create -templated-policy builtin/node -var name:node-1
diff --git a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/nomad-server-templated-policy.json.golden b/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/nomad-server-templated-policy.json.golden
deleted file mode 100644
index 7c9981e7f8c95..0000000000000
--- a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/nomad-server-templated-policy.json.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "TemplateName": "builtin/nomad-server",
-    "Schema": "",
-    "Template": "\nacl = \"write\"\nagent_prefix \"\" {\n  policy = \"read\"\n}\nnode_prefix \"\" {\n  policy = \"read\"\n}\nservice_prefix \"\" {\n  policy = \"write\"\n}"
-}
\ No newline at end of file
diff --git a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/nomad-server-templated-policy.pretty-meta.golden b/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/nomad-server-templated-policy.pretty-meta.golden
deleted file mode 100644
index be000cce1d5c4..0000000000000
--- a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/nomad-server-templated-policy.pretty-meta.golden
+++ /dev/null
@@ -1,16 +0,0 @@
-Name:            builtin/nomad-server
-Input variables: None
-Example usage:
-	consul acl token create -templated-policy builtin/nomad-server
-Raw Template:
-
-acl = "write"
-agent_prefix "" {
-  policy = "read"
-}
-node_prefix "" {
-  policy = "read"
-}
-service_prefix "" {
-  policy = "write"
-}
diff --git a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/nomad-server-templated-policy.pretty.golden b/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/nomad-server-templated-policy.pretty.golden
deleted file mode 100644
index d4943665e78b2..0000000000000
--- a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/nomad-server-templated-policy.pretty.golden
+++ /dev/null
@@ -1,4 +0,0 @@
-Name:            builtin/nomad-server
-Input variables: None
-Example usage:
-	consul acl token create -templated-policy builtin/nomad-server
diff --git a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/service-templated-policy.json.golden b/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/service-templated-policy.json.golden
deleted file mode 100644
index e4b71de9b8407..0000000000000
--- a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/service-templated-policy.json.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "TemplateName": "builtin/service",
-    "Schema": "{\n\t\"type\": \"object\",\n\t\"properties\": {\n\t\t\"name\": { \"type\": \"string\", \"$ref\": \"#/definitions/min-length-one\" }\n\t},\n\t\"required\": [\"name\"],\n\t\"definitions\": {\n\t\t\"min-length-one\": {\n\t\t\t\t\"type\": \"string\",\n\t\t\t\t\"minLength\": 1\n\t\t}\n\t}\n}",
-    "Template": "\nservice \"{{.Name}}\" {\n\tpolicy = \"write\"\n}\nservice \"{{.Name}}-sidecar-proxy\" {\n\tpolicy = \"write\"\n}\nservice_prefix \"\" {\n\tpolicy = \"read\"\n}\nnode_prefix \"\" {\n\tpolicy = \"read\"\n}"
-}
\ No newline at end of file
diff --git a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/service-templated-policy.pretty-meta.golden b/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/service-templated-policy.pretty-meta.golden
deleted file mode 100644
index f3ae5c6d7be2c..0000000000000
--- a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/service-templated-policy.pretty-meta.golden
+++ /dev/null
@@ -1,34 +0,0 @@
-Name:            builtin/service
-Input variables:
-	Name: String - Required - The name of the service.
-Example usage:
-	consul acl token create -templated-policy builtin/service -var name:api
-Schema:
-{
-	"type": "object",
-	"properties": {
-		"name": { "type": "string", "$ref": "#/definitions/min-length-one" }
-	},
-	"required": ["name"],
-	"definitions": {
-		"min-length-one": {
-				"type": "string",
-				"minLength": 1
-		}
-	}
-}
-
-Raw Template:
-
-service "{{.Name}}" {
-	policy = "write"
-}
-service "{{.Name}}-sidecar-proxy" {
-	policy = "write"
-}
-service_prefix "" {
-	policy = "read"
-}
-node_prefix "" {
-	policy = "read"
-}
diff --git a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/service-templated-policy.pretty.golden b/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/service-templated-policy.pretty.golden
deleted file mode 100644
index bc3ffcfd25e0f..0000000000000
--- a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicy/ce/service-templated-policy.pretty.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-Name:            builtin/service
-Input variables:
-	Name: String - Required - The name of the service.
-Example usage:
-	consul acl token create -templated-policy builtin/service -var name:api
diff --git a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicyList/ce/list.json.golden b/command/acl/templatedpolicy/testdata/FormatTemplatedPolicyList/ce/list.json.golden
deleted file mode 100644
index b634ddc9d8f46..0000000000000
--- a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicyList/ce/list.json.golden
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "builtin/dns": {
-        "TemplateName": "builtin/dns",
-        "Schema": "",
-        "Template": "\nnode_prefix \"\" {\n\tpolicy = \"read\"\n}\nservice_prefix \"\" {\n\tpolicy = \"read\"\n}\nquery_prefix \"\" {\n\tpolicy = \"read\"\n}"
-    },
-    "builtin/node": {
-        "TemplateName": "builtin/node",
-        "Schema": "{\n\t\"type\": \"object\",\n\t\"properties\": {\n\t\t\"name\": { \"type\": \"string\", \"$ref\": \"#/definitions/min-length-one\" }\n\t},\n\t\"required\": [\"name\"],\n\t\"definitions\": {\n\t\t\"min-length-one\": {\n\t\t\t\t\"type\": \"string\",\n\t\t\t\t\"minLength\": 1\n\t\t}\n\t}\n}",
-        "Template": "\nnode \"{{.Name}}\" {\n\tpolicy = \"write\"\n}\nservice_prefix \"\" {\n\tpolicy = \"read\"\n}"
-    },
-    "builtin/service": {
-        "TemplateName": "builtin/service",
-        "Schema": "{\n\t\"type\": \"object\",\n\t\"properties\": {\n\t\t\"name\": { \"type\": \"string\", \"$ref\": \"#/definitions/min-length-one\" }\n\t},\n\t\"required\": [\"name\"],\n\t\"definitions\": {\n\t\t\"min-length-one\": {\n\t\t\t\t\"type\": \"string\",\n\t\t\t\t\"minLength\": 1\n\t\t}\n\t}\n}",
-        "Template": "\nservice \"{{.Name}}\" {\n\tpolicy = \"write\"\n}\nservice \"{{.Name}}-sidecar-proxy\" {\n\tpolicy = \"write\"\n}\nservice_prefix \"\" {\n\tpolicy = \"read\"\n}\nnode_prefix \"\" {\n\tpolicy = \"read\"\n}"
-    }
-}
\ No newline at end of file
diff --git a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicyList/ce/list.pretty.golden b/command/acl/templatedpolicy/testdata/FormatTemplatedPolicyList/ce/list.pretty.golden
deleted file mode 100644
index e6080847d424f..0000000000000
--- a/command/acl/templatedpolicy/testdata/FormatTemplatedPolicyList/ce/list.pretty.golden
+++ /dev/null
@@ -1,3 +0,0 @@
-builtin/dns
-builtin/node
-builtin/service
diff --git a/command/acl/token/clone/token_clone.go b/command/acl/token/clone/token_clone.go
index 127fca78762cd..aae26ff37beb0 100644
--- a/command/acl/token/clone/token_clone.go
+++ b/command/acl/token/clone/token_clone.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tokenclone
 
 import (
diff --git a/command/acl/token/clone/token_clone_test.go b/command/acl/token/clone/token_clone_test.go
index 8fb729e40c62a..8f02942222604 100644
--- a/command/acl/token/clone/token_clone_test.go
+++ b/command/acl/token/clone/token_clone_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tokenclone
 
 import (
@@ -165,7 +162,6 @@ func TestTokenCloneCommand_Pretty(t *testing.T) {
 		require.Equal(t, cloned.Description, apiToken.Description)
 		require.Equal(t, cloned.Local, apiToken.Local)
 		require.Equal(t, cloned.Policies, apiToken.Policies)
-		require.Equal(t, cloned.TemplatedPolicies, apiToken.TemplatedPolicies)
 	})
 }
 
@@ -199,13 +195,7 @@ func TestTokenCloneCommand_JSON(t *testing.T) {
 
 	// create a token
 	token, _, err := client.ACL().TokenCreate(
-		&api.ACLToken{
-			Description: "test",
-			Policies:    []*api.ACLTokenPolicyLink{{Name: "test-policy"}},
-			TemplatedPolicies: []*api.ACLTemplatedPolicy{
-				{TemplateName: api.ACLTemplatedPolicyServiceName, TemplateVariables: &api.ACLTemplatedPolicyVariables{Name: "web"}},
-			},
-		},
+		&api.ACLToken{Description: "test", Policies: []*api.ACLTokenPolicyLink{{Name: "test-policy"}}},
 		&api.WriteOptions{Token: "root"},
 	)
 	require.NoError(t, err)
diff --git a/command/acl/token/create/token_create.go b/command/acl/token/create/token_create.go
index bb6e52416780a..8be4724752b7e 100644
--- a/command/acl/token/create/token_create.go
+++ b/command/acl/token/create/token_create.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tokencreate
 
 import (
@@ -29,22 +26,19 @@ type cmd struct {
 	http  *flags.HTTPFlags
 	help  string
 
-	accessor                 string
-	secret                   string
-	policyIDs                []string
-	policyNames              []string
-	description              string
-	roleIDs                  []string
-	roleNames                []string
-	serviceIdents            []string
-	nodeIdents               []string
-	templatedPolicy          string
-	templatedPolicyFile      string
-	templatedPolicyVariables []string
-	expirationTTL            time.Duration
-	local                    bool
-	showMeta                 bool
-	format                   string
+	accessor      string
+	secret        string
+	policyIDs     []string
+	policyNames   []string
+	description   string
+	roleIDs       []string
+	roleNames     []string
+	serviceIdents []string
+	nodeIdents    []string
+	expirationTTL time.Duration
+	local         bool
+	showMeta      bool
+	format        string
 }
 
 func (c *cmd) init() {
@@ -79,12 +73,6 @@ func (c *cmd) init() {
 		token.PrettyFormat,
 		fmt.Sprintf("Output format {%s}", strings.Join(token.GetSupportedFormats(), "|")),
 	)
-	c.flags.Var((*flags.AppendSliceValue)(&c.templatedPolicyVariables), "var", "Templated policy variables."+
-		" Must be used in combination with -templated-policy flag to specify required variables."+
-		" May be specified multiple times with different variables."+
-		" Format is VariableName:Value")
-	c.flags.StringVar(&c.templatedPolicy, "templated-policy", "", "The templated policy name.  Use -var flag to specify variables when required.")
-	c.flags.StringVar(&c.templatedPolicyFile, "templated-policy-file", "", "Path to a file containing templated policies and variables.")
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
@@ -99,9 +87,8 @@ func (c *cmd) Run(args []string) int {
 
 	if len(c.policyNames) == 0 && len(c.policyIDs) == 0 &&
 		len(c.roleNames) == 0 && len(c.roleIDs) == 0 &&
-		len(c.serviceIdents) == 0 && len(c.nodeIdents) == 0 &&
-		len(c.templatedPolicy) == 0 && len(c.templatedPolicyFile) == 0 {
-		c.UI.Error("Cannot create a token without specifying -policy-name, -policy-id, -role-name, -role-id, -service-identity, -node-identity, -templated-policy, or -templated-policy-file at least once")
+		len(c.serviceIdents) == 0 && len(c.nodeIdents) == 0 {
+		c.UI.Error(fmt.Sprintf("Cannot create a token without specifying -policy-name, -policy-id, -role-name, -role-id, -service-identity, or -node-identity at least once"))
 		return 1
 	}
 
@@ -135,13 +122,6 @@ func (c *cmd) Run(args []string) int {
 	}
 	newToken.NodeIdentities = parsedNodeIdents
 
-	parsedTemplatedPolicies, err := acl.ExtractTemplatedPolicies(c.templatedPolicy, c.templatedPolicyFile, c.templatedPolicyVariables)
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-	newToken.TemplatedPolicies = parsedTemplatedPolicies
-
 	for _, policyName := range c.policyNames {
 		// We could resolve names to IDs here but there isn't any reason why its would be better
 		// than allowing the agent to do it.
@@ -220,8 +200,6 @@ Usage: consul acl token create [options]
                                     -role-id c630d4ef-6 \
                                     -role-name "db-updater" \
                                     -service-identity "web" \
-                                    -service-identity "db:east,west" \
-                                    -templated-policy "builtin/service" \
-                                    -var "name:web"
+                                    -service-identity "db:east,west"
 `
 )
diff --git a/command/acl/token/create/token_create_test.go b/command/acl/token/create/token_create_test.go
index 90471b5a5b2a6..3a4864ec849e1 100644
--- a/command/acl/token/create/token_create_test.go
+++ b/command/acl/token/create/token_create_test.go
@@ -1,20 +1,15 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tokencreate
 
 import (
 	"encoding/json"
 	"strings"
 	"testing"
-	"time"
-
-	"github.com/mitchellh/cli"
-	"github.com/stretchr/testify/require"
 
 	"github.com/hashicorp/consul/agent"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/testrpc"
+	"github.com/mitchellh/cli"
+	"github.com/stretchr/testify/require"
 )
 
 func TestTokenCreateCommand_noTabs(t *testing.T) {
@@ -107,27 +102,6 @@ func TestTokenCreateCommand_Pretty(t *testing.T) {
 		require.Equal(t, a.Config.NodeName, nodes[0].Node)
 	})
 
-	// templated policy
-	t.Run("templated-policy", func(t *testing.T) {
-		token := run(t, []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-templated-policy=builtin/node",
-			"-var=name:" + a.Config.NodeName,
-		})
-
-		conf := api.DefaultConfig()
-		conf.Address = a.HTTPAddr()
-		conf.Token = token.SecretID
-		client, err := api.NewClient(conf)
-		require.NoError(t, err)
-
-		nodes, _, err := client.Catalog().Nodes(nil)
-		require.NoError(t, err)
-		require.Len(t, nodes, 1)
-		require.Equal(t, a.Config.NodeName, nodes[0].Node)
-	})
-
 	// create with accessor and secret
 	t.Run("predefined-ids", func(t *testing.T) {
 		token := run(t, []string{
@@ -142,34 +116,6 @@ func TestTokenCreateCommand_Pretty(t *testing.T) {
 		require.Equal(t, "3d852bb8-5153-4388-a3ca-8ca78661889f", token.AccessorID)
 		require.Equal(t, "3a69a8d8-c4d4-485d-9b19-b5b61648ea0c", token.SecretID)
 	})
-
-	// create with an expires-ttl (<24h)
-	t.Run("expires-ttl_short", func(t *testing.T) {
-		token := run(t, []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-policy-name=" + policy.Name,
-			"-description=test token",
-			"-expires-ttl=1h",
-		})
-
-		// check diff between creation and expires time since we
-		// always set the token.ExpirationTTL value to 0 at the moment
-		require.Equal(t, time.Hour, token.ExpirationTime.Sub(token.CreateTime))
-	})
-
-	// create with an expires-ttl long (>24h)
-	t.Run("expires-ttl_long", func(t *testing.T) {
-		token := run(t, []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-token=root",
-			"-policy-name=" + policy.Name,
-			"-description=test token",
-			"-expires-ttl=8760h",
-		})
-
-		require.Equal(t, 8760*time.Hour, token.ExpirationTime.Sub(token.CreateTime))
-	})
 }
 
 func TestTokenCreateCommand_JSON(t *testing.T) {
diff --git a/command/acl/token/delete/token_delete.go b/command/acl/token/delete/token_delete.go
index aa9f79903bb72..80ad4b6c22031 100644
--- a/command/acl/token/delete/token_delete.go
+++ b/command/acl/token/delete/token_delete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tokendelete
 
 import (
diff --git a/command/acl/token/delete/token_delete_test.go b/command/acl/token/delete/token_delete_test.go
index 29c1fe292d605..4cf74c0f3bd94 100644
--- a/command/acl/token/delete/token_delete_test.go
+++ b/command/acl/token/delete/token_delete_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tokendelete
 
 import (
diff --git a/command/acl/token/formatter.go b/command/acl/token/formatter.go
index 5325d285dbbba..65790881ac710 100644
--- a/command/acl/token/formatter.go
+++ b/command/acl/token/formatter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package token
 
 import (
@@ -109,20 +106,6 @@ func (f *prettyFormatter) FormatToken(token *api.ACLToken) (string, error) {
 			buffer.WriteString(fmt.Sprintf("   %s (Datacenter: %s)\n", nodeid.NodeName, nodeid.Datacenter))
 		}
 	}
-	if len(token.TemplatedPolicies) > 0 {
-		buffer.WriteString(fmt.Sprintln("Templated Policies:"))
-		for _, templatedPolicy := range token.TemplatedPolicies {
-			buffer.WriteString(fmt.Sprintf("   %s\n", templatedPolicy.TemplateName))
-			if templatedPolicy.TemplateVariables != nil && templatedPolicy.TemplateVariables.Name != "" {
-				buffer.WriteString(fmt.Sprintf("      Name: %s\n", templatedPolicy.TemplateVariables.Name))
-			}
-			if len(templatedPolicy.Datacenters) > 0 {
-				buffer.WriteString(fmt.Sprintf("      Datacenters: %s\n", strings.Join(templatedPolicy.Datacenters, ", ")))
-			} else {
-				buffer.WriteString("      Datacenters: all\n")
-			}
-		}
-	}
 
 	return buffer.String(), nil
 }
@@ -188,7 +171,10 @@ func (f *prettyFormatter) FormatTokenExpanded(token *api.ACLTokenExpanded) (stri
 		}
 		identity := structs.ACLServiceIdentity{ServiceName: svcIdentity.ServiceName, Datacenters: svcIdentity.Datacenters}
 		policy := identity.SyntheticPolicy(&entMeta)
-		displaySyntheticPolicy(policy, &buffer, indent)
+		buffer.WriteString(fmt.Sprintf(indent+WHITESPACE_2+"Description: %s\n", policy.Description))
+		buffer.WriteString(indent + WHITESPACE_2 + "Rules:")
+		buffer.WriteString(strings.ReplaceAll(policy.Rules, "\n", "\n"+indent+WHITESPACE_4))
+		buffer.WriteString("\n\n")
 	}
 	if len(token.ACLToken.ServiceIdentities) > 0 {
 		buffer.WriteString("Service Identities:\n")
@@ -201,7 +187,10 @@ func (f *prettyFormatter) FormatTokenExpanded(token *api.ACLTokenExpanded) (stri
 		buffer.WriteString(fmt.Sprintf(indent+"Name: %s (Datacenter: %s)\n", nodeIdentity.NodeName, nodeIdentity.Datacenter))
 		identity := structs.ACLNodeIdentity{NodeName: nodeIdentity.NodeName, Datacenter: nodeIdentity.Datacenter}
 		policy := identity.SyntheticPolicy(&entMeta)
-		displaySyntheticPolicy(policy, &buffer, indent)
+		buffer.WriteString(fmt.Sprintf(indent+WHITESPACE_2+"Description: %s\n", policy.Description))
+		buffer.WriteString(indent + WHITESPACE_2 + "Rules:")
+		buffer.WriteString(strings.ReplaceAll(policy.Rules, "\n", "\n"+indent+WHITESPACE_4))
+		buffer.WriteString("\n\n")
 	}
 	if len(token.ACLToken.NodeIdentities) > 0 {
 		buffer.WriteString("Node Identities:\n")
@@ -210,34 +199,6 @@ func (f *prettyFormatter) FormatTokenExpanded(token *api.ACLTokenExpanded) (stri
 		}
 	}
 
-	formatTemplatedPolicy := func(templatedPolicy *api.ACLTemplatedPolicy, indent string) {
-		buffer.WriteString(fmt.Sprintf(indent+"%s\n", templatedPolicy.TemplateName))
-		tp := structs.ACLTemplatedPolicy{
-			TemplateName: templatedPolicy.TemplateName,
-			Datacenters:  templatedPolicy.Datacenters,
-		}
-		if templatedPolicy.TemplateVariables != nil && templatedPolicy.TemplateVariables.Name != "" {
-			tp.TemplateVariables = &structs.ACLTemplatedPolicyVariables{
-				Name: templatedPolicy.TemplateVariables.Name,
-			}
-			buffer.WriteString(fmt.Sprintf(indent+WHITESPACE_2+"Name: %s\n", templatedPolicy.TemplateVariables.Name))
-		}
-		if len(templatedPolicy.Datacenters) > 0 {
-			buffer.WriteString(fmt.Sprintf(indent+WHITESPACE_2+"Datacenters: %s\n", strings.Join(templatedPolicy.Datacenters, ", ")))
-		} else {
-			buffer.WriteString(fmt.Sprintf(indent + WHITESPACE_2 + "Datacenters: all\n"))
-		}
-		policy, _ := tp.SyntheticPolicy(&entMeta)
-		displaySyntheticPolicy(policy, &buffer, indent)
-	}
-	if len(token.ACLToken.TemplatedPolicies) > 0 {
-		buffer.WriteString("Templated Policies:\n")
-
-		for _, templatedPolicy := range token.ACLToken.TemplatedPolicies {
-			formatTemplatedPolicy(templatedPolicy, WHITESPACE_2)
-		}
-	}
-
 	formatRole := func(role api.ACLRole, indent string) {
 		buffer.WriteString(fmt.Sprintf(indent+"Role Name: %s\n", role.Name))
 		buffer.WriteString(fmt.Sprintf(indent+WHITESPACE_2+"ID: %s\n", role.ID))
@@ -302,13 +263,6 @@ func (f *prettyFormatter) FormatTokenExpanded(token *api.ACLTokenExpanded) (stri
 	return buffer.String(), nil
 }
 
-func displaySyntheticPolicy(policy *structs.ACLPolicy, buffer *bytes.Buffer, indent string) {
-	buffer.WriteString(fmt.Sprintf(indent+WHITESPACE_2+"Description: %s\n", policy.Description))
-	buffer.WriteString(indent + WHITESPACE_2 + "Rules:")
-	buffer.WriteString(strings.ReplaceAll(policy.Rules, "\n", "\n"+indent+WHITESPACE_4))
-	buffer.WriteString("\n\n")
-}
-
 func (f *prettyFormatter) FormatTokenList(tokens []*api.ACLTokenListEntry) (string, error) {
 	var buffer bytes.Buffer
 
@@ -378,21 +332,6 @@ func (f *prettyFormatter) formatTokenListEntry(token *api.ACLTokenListEntry) str
 			buffer.WriteString(fmt.Sprintf("   %s (Datacenter: %s)\n", nodeid.NodeName, nodeid.Datacenter))
 		}
 	}
-
-	if len(token.TemplatedPolicies) > 0 {
-		buffer.WriteString(fmt.Sprintln("Templated Policies:"))
-		for _, templatedPolicy := range token.TemplatedPolicies {
-			buffer.WriteString(fmt.Sprintf("   %s\n", templatedPolicy.TemplateName))
-			if templatedPolicy.TemplateVariables != nil && templatedPolicy.TemplateVariables.Name != "" {
-				buffer.WriteString(fmt.Sprintf("      Name: %s\n", templatedPolicy.TemplateVariables.Name))
-			}
-			if len(templatedPolicy.Datacenters) > 0 {
-				buffer.WriteString(fmt.Sprintf("      Datacenters: %s\n", strings.Join(templatedPolicy.Datacenters, ", ")))
-			} else {
-				buffer.WriteString("      Datacenters: all\n")
-			}
-		}
-	}
 	return buffer.String()
 }
 
diff --git a/command/acl/token/formatter_ce_test.go b/command/acl/token/formatter_ce_test.go
index 9ea382fafcfcc..6e82c1bc20246 100644
--- a/command/acl/token/formatter_ce_test.go
+++ b/command/acl/token/formatter_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package token
 
diff --git a/command/acl/token/formatter_test.go b/command/acl/token/formatter_test.go
index 65be4dfae98fc..a97fb346bc0bb 100644
--- a/command/acl/token/formatter_test.go
+++ b/command/acl/token/formatter_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package token
 
 import (
@@ -106,21 +103,6 @@ func TestFormatToken(t *testing.T) {
 						Datacenter: "middleearth-northwest",
 					},
 				},
-				TemplatedPolicies: []*api.ACLTemplatedPolicy{
-					{
-						TemplateName: api.ACLTemplatedPolicyServiceName,
-						TemplateVariables: &api.ACLTemplatedPolicyVariables{
-							Name: "web",
-						},
-						Datacenters: []string{"middleearth-northwest", "somewhere-east"},
-					},
-					{
-						TemplateName: api.ACLTemplatedPolicyNodeName,
-						TemplateVariables: &api.ACLTemplatedPolicyVariables{
-							Name: "api",
-						},
-					},
-				},
 			},
 		},
 	}
@@ -224,21 +206,6 @@ func TestFormatTokenList(t *testing.T) {
 							Datacenter: "middleearth-northwest",
 						},
 					},
-					TemplatedPolicies: []*api.ACLTemplatedPolicy{
-						{
-							TemplateName: api.ACLTemplatedPolicyServiceName,
-							TemplateVariables: &api.ACLTemplatedPolicyVariables{
-								Name: "web",
-							},
-							Datacenters: []string{"middleearth-northwest"},
-						},
-						{
-							TemplateName: api.ACLTemplatedPolicyNodeName,
-							TemplateVariables: &api.ACLTemplatedPolicyVariables{
-								Name: "api",
-							},
-						},
-					},
 				},
 			},
 		},
@@ -474,21 +441,6 @@ var expandedTokenTestCases = map[string]testCase{
 						Datacenter: "middleearth-northwest",
 					},
 				},
-				TemplatedPolicies: []*api.ACLTemplatedPolicy{
-					{
-						TemplateName: api.ACLTemplatedPolicyServiceName,
-						TemplateVariables: &api.ACLTemplatedPolicyVariables{
-							Name: "web",
-						},
-						Datacenters: []string{"middleearth-northwest"},
-					},
-					{
-						TemplateName: api.ACLTemplatedPolicyNodeName,
-						TemplateVariables: &api.ACLTemplatedPolicyVariables{
-							Name: "api",
-						},
-					},
-				},
 			},
 		},
 	},
diff --git a/command/acl/token/list/token_list.go b/command/acl/token/list/token_list.go
index 7f500426f3369..28c96122a1c35 100644
--- a/command/acl/token/list/token_list.go
+++ b/command/acl/token/list/token_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tokenlist
 
 import (
diff --git a/command/acl/token/list/token_list_test.go b/command/acl/token/list/token_list_test.go
index c8586bde6b80b..4e1a518bf6d7c 100644
--- a/command/acl/token/list/token_list_test.go
+++ b/command/acl/token/list/token_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tokenlist
 
 import (
diff --git a/command/acl/token/read/token_read.go b/command/acl/token/read/token_read.go
index 23496135bf725..0554ccaccb521 100644
--- a/command/acl/token/read/token_read.go
+++ b/command/acl/token/read/token_read.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tokenread
 
 import (
diff --git a/command/acl/token/read/token_read_test.go b/command/acl/token/read/token_read_test.go
index 69df72e72917b..7988f9772ac93 100644
--- a/command/acl/token/read/token_read_test.go
+++ b/command/acl/token/read/token_read_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tokenread
 
 import (
diff --git a/command/acl/token/testdata/FormatToken/complex.json.golden b/command/acl/token/testdata/FormatToken/complex.json.golden
index f3e3baef557d2..26e2b0144c767 100644
--- a/command/acl/token/testdata/FormatToken/complex.json.golden
+++ b/command/acl/token/testdata/FormatToken/complex.json.golden
@@ -38,24 +38,6 @@
             "Datacenter": "middleearth-northwest"
         }
     ],
-    "TemplatedPolicies": [
-        {
-            "TemplateName": "builtin/service",
-            "TemplateVariables": {
-                "Name": "web"
-            },
-            "Datacenters": [
-                "middleearth-northwest",
-                "somewhere-east"
-            ]
-        },
-        {
-            "TemplateName": "builtin/node",
-            "TemplateVariables": {
-                "Name": "api"
-            }
-        }
-    ],
     "Local": false,
     "AuthMethod": "bar",
     "ExpirationTime": "2020-05-22T19:52:31Z",
diff --git a/command/acl/token/testdata/FormatToken/complex.pretty-meta.golden b/command/acl/token/testdata/FormatToken/complex.pretty-meta.golden
index 1644a72a66ef7..b5b33dadc5f20 100644
--- a/command/acl/token/testdata/FormatToken/complex.pretty-meta.golden
+++ b/command/acl/token/testdata/FormatToken/complex.pretty-meta.golden
@@ -19,10 +19,3 @@ Service Identities:
    gardener (Datacenters: middleearth-northwest)
 Node Identities:
    bagend (Datacenter: middleearth-northwest)
-Templated Policies:
-   builtin/service
-      Name: web
-      Datacenters: middleearth-northwest, somewhere-east
-   builtin/node
-      Name: api
-      Datacenters: all
diff --git a/command/acl/token/testdata/FormatToken/complex.pretty.golden b/command/acl/token/testdata/FormatToken/complex.pretty.golden
index 6d25b40ea097d..5d649f35a83bc 100644
--- a/command/acl/token/testdata/FormatToken/complex.pretty.golden
+++ b/command/acl/token/testdata/FormatToken/complex.pretty.golden
@@ -16,10 +16,3 @@ Service Identities:
    gardener (Datacenters: middleearth-northwest)
 Node Identities:
    bagend (Datacenter: middleearth-northwest)
-Templated Policies:
-   builtin/service
-      Name: web
-      Datacenters: middleearth-northwest, somewhere-east
-   builtin/node
-      Name: api
-      Datacenters: all
diff --git a/command/acl/token/testdata/FormatTokenExpanded/ce/complex.json.golden b/command/acl/token/testdata/FormatTokenExpanded/ce/complex.json.golden
index 3eddfdc5dfbc4..b0ed45c0d3007 100644
--- a/command/acl/token/testdata/FormatTokenExpanded/ce/complex.json.golden
+++ b/command/acl/token/testdata/FormatTokenExpanded/ce/complex.json.golden
@@ -181,23 +181,6 @@
             "Datacenter": "middleearth-northwest"
         }
     ],
-    "TemplatedPolicies": [
-        {
-            "TemplateName": "builtin/service",
-            "TemplateVariables": {
-                "Name": "web"
-            },
-            "Datacenters": [
-                "middleearth-northwest"
-            ]
-        },
-        {
-            "TemplateName": "builtin/node",
-            "TemplateVariables": {
-                "Name": "api"
-            }
-        }
-    ],
     "Local": false,
     "AuthMethod": "bar",
     "ExpirationTime": "2020-05-22T19:52:31Z",
diff --git a/command/acl/token/testdata/FormatTokenExpanded/ce/complex.pretty-meta.golden b/command/acl/token/testdata/FormatTokenExpanded/ce/complex.pretty-meta.golden
index d8e668cf4a749..bc8033edf9de4 100644
--- a/command/acl/token/testdata/FormatTokenExpanded/ce/complex.pretty-meta.golden
+++ b/command/acl/token/testdata/FormatTokenExpanded/ce/complex.pretty-meta.golden
@@ -26,7 +26,7 @@ Policies:
 
 Service Identities:
 	Name: gardener (Datacenters: middleearth-northwest)
-		Description: synthetic policy generated from templated policy: builtin/service
+		Description: synthetic policy for service identity "gardener"
 		Rules:
 			service "gardener" {
 				policy = "write"
@@ -43,7 +43,7 @@ Service Identities:
 
 Node Identities:
 	Name: bagend (Datacenter: middleearth-northwest)
-		Description: synthetic policy generated from templated policy: builtin/node
+		Description: synthetic policy for node identity "bagend"
 		Rules:
 			node "bagend" {
 				policy = "write"
@@ -52,37 +52,6 @@ Node Identities:
 				policy = "read"
 			}
 
-Templated Policies:
-	builtin/service
-		Name: web
-		Datacenters: middleearth-northwest
-		Description: synthetic policy generated from templated policy: builtin/service
-		Rules:
-			service "web" {
-				policy = "write"
-			}
-			service "web-sidecar-proxy" {
-				policy = "write"
-			}
-			service_prefix "" {
-				policy = "read"
-			}
-			node_prefix "" {
-				policy = "read"
-			}
-
-	builtin/node
-		Name: api
-		Datacenters: all
-		Description: synthetic policy generated from templated policy: builtin/node
-		Rules:
-			node "api" {
-				policy = "write"
-			}
-			service_prefix "" {
-				policy = "read"
-			}
-
 Roles:
 	Role Name: shire
 		ID: 3b0a78fe-b9c3-40de-b8ea-7d4d6674b366
@@ -96,7 +65,7 @@ Roles:
 
 		Service Identities:
 			Name: foo (Datacenters: middleearth-southwest)
-				Description: synthetic policy generated from templated policy: builtin/service
+				Description: synthetic policy for service identity "foo"
 				Rules:
 					service "foo" {
 						policy = "write"
@@ -125,7 +94,7 @@ Roles:
 
 		Node Identities:
 			Name: bar (Datacenter: middleearth-southwest)
-				Description: synthetic policy generated from templated policy: builtin/node
+				Description: synthetic policy for node identity "bar"
 				Rules:
 					node "bar" {
 						policy = "write"
@@ -158,7 +127,7 @@ Namespace Role Defaults:
 
 		Service Identities:
 			Name: web (Datacenters: middleearth-northeast)
-				Description: synthetic policy generated from templated policy: builtin/service
+				Description: synthetic policy for service identity "web"
 				Rules:
 					service "web" {
 						policy = "write"
@@ -175,7 +144,7 @@ Namespace Role Defaults:
 
 		Node Identities:
 			Name: db (Datacenter: middleearth-northwest)
-				Description: synthetic policy generated from templated policy: builtin/node
+				Description: synthetic policy for node identity "db"
 				Rules:
 					node "db" {
 						policy = "write"
diff --git a/command/acl/token/testdata/FormatTokenExpanded/ce/complex.pretty.golden b/command/acl/token/testdata/FormatTokenExpanded/ce/complex.pretty.golden
index f1b31d45193de..215cf8b7a037f 100644
--- a/command/acl/token/testdata/FormatTokenExpanded/ce/complex.pretty.golden
+++ b/command/acl/token/testdata/FormatTokenExpanded/ce/complex.pretty.golden
@@ -23,7 +23,7 @@ Policies:
 
 Service Identities:
 	Name: gardener (Datacenters: middleearth-northwest)
-		Description: synthetic policy generated from templated policy: builtin/service
+		Description: synthetic policy for service identity "gardener"
 		Rules:
 			service "gardener" {
 				policy = "write"
@@ -40,7 +40,7 @@ Service Identities:
 
 Node Identities:
 	Name: bagend (Datacenter: middleearth-northwest)
-		Description: synthetic policy generated from templated policy: builtin/node
+		Description: synthetic policy for node identity "bagend"
 		Rules:
 			node "bagend" {
 				policy = "write"
@@ -49,37 +49,6 @@ Node Identities:
 				policy = "read"
 			}
 
-Templated Policies:
-	builtin/service
-		Name: web
-		Datacenters: middleearth-northwest
-		Description: synthetic policy generated from templated policy: builtin/service
-		Rules:
-			service "web" {
-				policy = "write"
-			}
-			service "web-sidecar-proxy" {
-				policy = "write"
-			}
-			service_prefix "" {
-				policy = "read"
-			}
-			node_prefix "" {
-				policy = "read"
-			}
-
-	builtin/node
-		Name: api
-		Datacenters: all
-		Description: synthetic policy generated from templated policy: builtin/node
-		Rules:
-			node "api" {
-				policy = "write"
-			}
-			service_prefix "" {
-				policy = "read"
-			}
-
 Roles:
 	Role Name: shire
 		ID: 3b0a78fe-b9c3-40de-b8ea-7d4d6674b366
@@ -93,7 +62,7 @@ Roles:
 
 		Service Identities:
 			Name: foo (Datacenters: middleearth-southwest)
-				Description: synthetic policy generated from templated policy: builtin/service
+				Description: synthetic policy for service identity "foo"
 				Rules:
 					service "foo" {
 						policy = "write"
@@ -122,7 +91,7 @@ Roles:
 
 		Node Identities:
 			Name: bar (Datacenter: middleearth-southwest)
-				Description: synthetic policy generated from templated policy: builtin/node
+				Description: synthetic policy for node identity "bar"
 				Rules:
 					node "bar" {
 						policy = "write"
@@ -155,7 +124,7 @@ Namespace Role Defaults:
 
 		Service Identities:
 			Name: web (Datacenters: middleearth-northeast)
-				Description: synthetic policy generated from templated policy: builtin/service
+				Description: synthetic policy for service identity "web"
 				Rules:
 					service "web" {
 						policy = "write"
@@ -172,7 +141,7 @@ Namespace Role Defaults:
 
 		Node Identities:
 			Name: db (Datacenter: middleearth-northwest)
-				Description: synthetic policy generated from templated policy: builtin/node
+				Description: synthetic policy for node identity "db"
 				Rules:
 					node "db" {
 						policy = "write"
diff --git a/command/acl/token/testdata/FormatTokenList/complex.json.golden b/command/acl/token/testdata/FormatTokenList/complex.json.golden
index 9e06b6c8ff3a4..8bddb0f133897 100644
--- a/command/acl/token/testdata/FormatTokenList/complex.json.golden
+++ b/command/acl/token/testdata/FormatTokenList/complex.json.golden
@@ -39,23 +39,6 @@
                 "Datacenter": "middleearth-northwest"
             }
         ],
-        "TemplatedPolicies": [
-            {
-                "TemplateName": "builtin/service",
-                "TemplateVariables": {
-                    "Name": "web"
-                },
-                "Datacenters": [
-                    "middleearth-northwest"
-                ]
-            },
-            {
-                "TemplateName": "builtin/node",
-                "TemplateVariables": {
-                    "Name": "api"
-                }
-            }
-        ],
         "Local": false,
         "AuthMethod": "bar",
         "ExpirationTime": "2020-05-22T19:52:31Z",
diff --git a/command/acl/token/testdata/FormatTokenList/complex.pretty-meta.golden b/command/acl/token/testdata/FormatTokenList/complex.pretty-meta.golden
index db4f2a8ce72df..c14bd7058037c 100644
--- a/command/acl/token/testdata/FormatTokenList/complex.pretty-meta.golden
+++ b/command/acl/token/testdata/FormatTokenList/complex.pretty-meta.golden
@@ -19,10 +19,3 @@ Service Identities:
    gardener (Datacenters: middleearth-northwest)
 Node Identities:
    bagend (Datacenter: middleearth-northwest)
-Templated Policies:
-   builtin/service
-      Name: web
-      Datacenters: middleearth-northwest
-   builtin/node
-      Name: api
-      Datacenters: all
diff --git a/command/acl/token/testdata/FormatTokenList/complex.pretty.golden b/command/acl/token/testdata/FormatTokenList/complex.pretty.golden
index dd6fcf3ac293a..4a3c011743f75 100644
--- a/command/acl/token/testdata/FormatTokenList/complex.pretty.golden
+++ b/command/acl/token/testdata/FormatTokenList/complex.pretty.golden
@@ -16,10 +16,3 @@ Service Identities:
    gardener (Datacenters: middleearth-northwest)
 Node Identities:
    bagend (Datacenter: middleearth-northwest)
-Templated Policies:
-   builtin/service
-      Name: web
-      Datacenters: middleearth-northwest
-   builtin/node
-      Name: api
-      Datacenters: all
diff --git a/command/acl/token/token.go b/command/acl/token/token.go
index db3771926ccc0..87ca60fd532d2 100644
--- a/command/acl/token/token.go
+++ b/command/acl/token/token.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package token
 
 import (
diff --git a/command/acl/token/update/token_update.go b/command/acl/token/update/token_update.go
index dec85c59b9717..519a3da8d4e47 100644
--- a/command/acl/token/update/token_update.go
+++ b/command/acl/token/update/token_update.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tokenupdate
 
 import (
@@ -28,27 +25,22 @@ type cmd struct {
 	http  *flags.HTTPFlags
 	help  string
 
-	tokenAccessorID            string
-	policyIDs                  []string
-	appendPolicyIDs            []string
-	policyNames                []string
-	appendPolicyNames          []string
-	roleIDs                    []string
-	appendRoleIDs              []string
-	roleNames                  []string
-	appendRoleNames            []string
-	serviceIdents              []string
-	nodeIdents                 []string
-	appendNodeIdents           []string
-	appendServiceIdents        []string
-	appendTemplatedPolicy      string
-	replaceTemplatedPolicy     string
-	appendTemplatedPolicyFile  string
-	replaceTemplatedPolicyFile string
-	templatedPolicyVariables   []string
-	description                string
-	showMeta                   bool
-	format                     string
+	tokenAccessorID     string
+	policyIDs           []string
+	appendPolicyIDs     []string
+	policyNames         []string
+	appendPolicyNames   []string
+	roleIDs             []string
+	appendRoleIDs       []string
+	roleNames           []string
+	appendRoleNames     []string
+	serviceIdents       []string
+	nodeIdents          []string
+	appendNodeIdents    []string
+	appendServiceIdents []string
+	description         string
+	showMeta            bool
+	format              string
 
 	// DEPRECATED
 	mergeServiceIdents bool
@@ -94,19 +86,6 @@ func (c *cmd) init() {
 	c.flags.Var((*flags.AppendSliceValue)(&c.appendNodeIdents), "append-node-identity", "Name of a "+
 		"node identity to use for this token. This token retains existing node identities. May be "+
 		"specified multiple times. Format is NODENAME:DATACENTER")
-	c.flags.Var((*flags.AppendSliceValue)(&c.templatedPolicyVariables), "var", "Templated policy variables."+
-		" Must be used in combination with -replace-templated-policy or -append-templated-policy flags to specify required variables."+
-		" May be specified multiple times with different variables."+
-		" Format is VariableName:Value")
-	c.flags.StringVar(&c.appendTemplatedPolicy, "append-templated-policy", "", "The templated policy name to attach to the token's existing templated policies."+
-		"Use -var flag to specify variables when required. Token retains existing templated policies.")
-	c.flags.StringVar(&c.replaceTemplatedPolicy, "replace-templated-policy", "", "The templated policy name to use replace token's existing templated policies."+
-		" Use -var flag to specify variables when required. Overwrites token's existing templated policies.")
-	c.flags.StringVar(&c.appendTemplatedPolicyFile, "append-templated-policy-file", "", "Path to a file containing templated policy names and variables."+
-		" Works similarly to `-append-templated-policy`. The token retains existing templated policies.")
-	c.flags.StringVar(&c.replaceTemplatedPolicyFile, "replace-templated-policy-file", "", "Path to a file containing templated policy names and variables."+
-		" Works similarly to `-replace-templated-policy`. Overwrites the token's existing templated policies.")
-
 	c.flags.StringVar(
 		&c.format,
 		"format",
@@ -213,24 +192,6 @@ func (c *cmd) Run(args []string) int {
 		return 1
 	}
 
-	hasAppendTemplatedPolicies := len(c.appendTemplatedPolicy) > 0 || len(c.appendTemplatedPolicyFile) > 0
-	hasReplaceTemplatedPolicies := len(c.replaceTemplatedPolicy) > 0 || len(c.replaceTemplatedPolicyFile) > 0
-
-	if hasReplaceTemplatedPolicies && hasAppendTemplatedPolicies {
-		c.UI.Error("Cannot combine the use of -append-templated-policy flags with replace-templated-policy. " +
-			"To set or overwrite existing templated policies, use -replace-templated-policy or -replace-templated-policy-file. " +
-			"To append to existing templated policies, use -append-templated-policy or -append-templated-policy-file.")
-		return 1
-	}
-	parsedTemplatedPolicies, err := acl.ExtractTemplatedPolicies(c.replaceTemplatedPolicy, c.replaceTemplatedPolicyFile, c.templatedPolicyVariables)
-	if hasAppendTemplatedPolicies {
-		parsedTemplatedPolicies, err = acl.ExtractTemplatedPolicies(c.appendTemplatedPolicy, c.appendTemplatedPolicyFile, c.templatedPolicyVariables)
-	}
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
 	if c.mergePolicies {
 		c.UI.Warn("merge-policies is deprecated and will be removed in a future Consul version. " +
 			"Use `append-policy-name` or `append-policy-id` instead.")
@@ -420,12 +381,6 @@ func (c *cmd) Run(args []string) int {
 		t.NodeIdentities = parsedNodeIdents
 	}
 
-	if hasReplaceTemplatedPolicies {
-		t.TemplatedPolicies = parsedTemplatedPolicies
-	} else {
-		t.TemplatedPolicies = append(t.TemplatedPolicies, parsedTemplatedPolicies...)
-	}
-
 	t, _, err = client.ACL().TokenUpdate(t, nil)
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Failed to update token %s: %v", tok, err))
@@ -474,8 +429,6 @@ Usage: consul acl token update [options]
         $ consul acl token update -accessor-id abcd \
                                   -description "replication" \
                                   -policy-name "token-replication" \
-                                  -role-name "db-updater" \
-                                  -templated-policy "builtin/service" \
-                                  -var "name:web"
+                                  -role-name "db-updater"
 `
 )
diff --git a/command/acl/token/update/token_update_test.go b/command/acl/token/update/token_update_test.go
index 91f630e8d2f23..011e916f4fbf0 100644
--- a/command/acl/token/update/token_update_test.go
+++ b/command/acl/token/update/token_update_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tokenupdate
 
 import (
@@ -120,51 +117,6 @@ func TestTokenUpdateCommand(t *testing.T) {
 		require.ElementsMatch(t, expected, responseToken.NodeIdentities)
 	})
 
-	t.Run("replace-templated-policy", func(t *testing.T) {
-		token := create_token(
-			t,
-			client, &api.ACLToken{Description: "test", TemplatedPolicies: []*api.ACLTemplatedPolicy{
-				{TemplateName: api.ACLTemplatedPolicyServiceName, TemplateVariables: &api.ACLTemplatedPolicyVariables{Name: "api"}},
-			}},
-			&api.WriteOptions{Token: "root"},
-		)
-
-		responseToken := run(t, []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-accessor-id=" + token.AccessorID,
-			"-token=root",
-			"-replace-templated-policy=builtin/node",
-			"-description=test token",
-			"-var=name:web",
-		})
-
-		require.Len(t, responseToken.TemplatedPolicies, 1)
-		require.Equal(t, api.ACLTemplatedPolicyNodeName, responseToken.TemplatedPolicies[0].TemplateName)
-		require.Equal(t, "web", responseToken.TemplatedPolicies[0].TemplateVariables.Name)
-	})
-	t.Run("append-templated-policy", func(t *testing.T) {
-		templatedPolicy := &api.ACLTemplatedPolicy{TemplateName: api.ACLTemplatedPolicyServiceName, TemplateVariables: &api.ACLTemplatedPolicyVariables{Name: "api"}}
-		token := create_token(
-			t,
-			client, &api.ACLToken{Description: "test", TemplatedPolicies: []*api.ACLTemplatedPolicy{
-				templatedPolicy,
-			}},
-			&api.WriteOptions{Token: "root"},
-		)
-
-		responseToken := run(t, []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-accessor-id=" + token.AccessorID,
-			"-token=root",
-			"-append-templated-policy=builtin/node",
-			"-description=test token",
-			"-var=name:web",
-		})
-
-		require.Len(t, responseToken.TemplatedPolicies, 2)
-		require.ElementsMatch(t, responseToken.TemplatedPolicies,
-			[]*api.ACLTemplatedPolicy{templatedPolicy, {TemplateName: api.ACLTemplatedPolicyNodeName, TemplateVariables: &api.ACLTemplatedPolicyVariables{Name: "web"}}})
-	})
 	// update with policy by name
 	t.Run("policy-name", func(t *testing.T) {
 		token := create_token(t, client, &api.ACLToken{Description: "test"}, &api.WriteOptions{Token: "root"})
@@ -254,7 +206,7 @@ func TestTokenUpdateCommandWithAppend(t *testing.T) {
 	)
 	require.NoError(t, err)
 
-	// secondary policy
+	//secondary policy
 	secondPolicy, _, policyErr := client.ACL().PolicyCreate(
 		&api.ACLPolicy{Name: "secondary-policy"},
 		&api.WriteOptions{Token: "root"},
@@ -330,6 +282,8 @@ func TestTokenUpdateCommandWithAppend(t *testing.T) {
 		})
 
 		require.Len(t, responseToken.NodeIdentities, 2)
+		require.Equal(t, "third", responseToken.NodeIdentities[1].NodeName)
+		require.Equal(t, "node", responseToken.NodeIdentities[1].Datacenter)
 	})
 
 	// update with append-service-identity
@@ -352,6 +306,7 @@ func TestTokenUpdateCommandWithAppend(t *testing.T) {
 		})
 
 		require.Len(t, responseToken.ServiceIdentities, 2)
+		require.Equal(t, "web", responseToken.ServiceIdentities[1].ServiceName)
 	})
 }
 
diff --git a/command/agent/agent.go b/command/agent/agent.go
index 84515f2c94bd5..5981d05acd9c1 100644
--- a/command/agent/agent.go
+++ b/command/agent/agent.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
@@ -212,33 +209,31 @@ func (c *cmd) run(args []string) int {
 	if config.ServerMode {
 		segment = "<all>"
 	}
-	ui.Info(fmt.Sprintf("           Version: '%s'", c.versionHuman))
+	ui.Info(fmt.Sprintf("          Version: '%s'", c.versionHuman))
 	if strings.Contains(c.versionHuman, "dev") {
-		ui.Info(fmt.Sprintf("          Revision: '%s'", c.revision))
+		ui.Info(fmt.Sprintf("         Revision: '%s'", c.revision))
 	}
-	ui.Info(fmt.Sprintf("        Build Date: '%s'", c.buildDate))
-	ui.Info(fmt.Sprintf("           Node ID: '%s'", config.NodeID))
-	ui.Info(fmt.Sprintf("         Node name: '%s'", config.NodeName))
+	ui.Info(fmt.Sprintf("       Build Date: '%s'", c.buildDate))
+	ui.Info(fmt.Sprintf("          Node ID: '%s'", config.NodeID))
+	ui.Info(fmt.Sprintf("        Node name: '%s'", config.NodeName))
 	if ap := config.PartitionOrEmpty(); ap != "" {
-		ui.Info(fmt.Sprintf("         Partition: '%s'", ap))
+		ui.Info(fmt.Sprintf("        Partition: '%s'", ap))
 	}
-	ui.Info(fmt.Sprintf("        Datacenter: '%s' (Segment: '%s')", config.Datacenter, segment))
-	ui.Info(fmt.Sprintf("            Server: %v (Bootstrap: %v)", config.ServerMode, config.Bootstrap))
-	ui.Info(fmt.Sprintf("       Client Addr: %v (HTTP: %d, HTTPS: %d, gRPC: %d, gRPC-TLS: %d, DNS: %d)", config.ClientAddrs,
+	ui.Info(fmt.Sprintf("       Datacenter: '%s' (Segment: '%s')", config.Datacenter, segment))
+	ui.Info(fmt.Sprintf("           Server: %v (Bootstrap: %v)", config.ServerMode, config.Bootstrap))
+	ui.Info(fmt.Sprintf("      Client Addr: %v (HTTP: %d, HTTPS: %d, gRPC: %d, gRPC-TLS: %d, DNS: %d)", config.ClientAddrs,
 		config.HTTPPort, config.HTTPSPort, config.GRPCPort, config.GRPCTLSPort, config.DNSPort))
-	ui.Info(fmt.Sprintf("      Cluster Addr: %v (LAN: %d, WAN: %d)", config.AdvertiseAddrLAN,
+	ui.Info(fmt.Sprintf("     Cluster Addr: %v (LAN: %d, WAN: %d)", config.AdvertiseAddrLAN,
 		config.SerfPortLAN, config.SerfPortWAN))
-	ui.Info(fmt.Sprintf(" Gossip Encryption: %t", config.EncryptKey != ""))
-	ui.Info(fmt.Sprintf("  Auto-Encrypt-TLS: %t", config.AutoEncryptTLS || config.AutoEncryptAllowTLS))
-	ui.Info(fmt.Sprintf("       ACL Enabled: %t", config.ACLsEnabled))
+	ui.Info(fmt.Sprintf("Gossip Encryption: %t", config.EncryptKey != ""))
+	ui.Info(fmt.Sprintf(" Auto-Encrypt-TLS: %t", config.AutoEncryptTLS || config.AutoEncryptAllowTLS))
 	if config.ServerMode {
 		ui.Info(fmt.Sprintf(" Reporting Enabled: %t", config.Reporting.License.Enabled))
 	}
-	ui.Info(fmt.Sprintf("ACL Default Policy: %s", config.ACLResolverSettings.ACLDefaultPolicy))
-	ui.Info(fmt.Sprintf("         HTTPS TLS: Verify Incoming: %t, Verify Outgoing: %t, Min Version: %s",
+	ui.Info(fmt.Sprintf("        HTTPS TLS: Verify Incoming: %t, Verify Outgoing: %t, Min Version: %s",
 		config.TLS.HTTPS.VerifyIncoming, config.TLS.HTTPS.VerifyOutgoing, config.TLS.HTTPS.TLSMinVersion))
-	ui.Info(fmt.Sprintf("          gRPC TLS: Verify Incoming: %t, Min Version: %s", config.TLS.GRPC.VerifyIncoming, config.TLS.GRPC.TLSMinVersion))
-	ui.Info(fmt.Sprintf("  Internal RPC TLS: Verify Incoming: %t, Verify Outgoing: %t (Verify Hostname: %t), Min Version: %s",
+	ui.Info(fmt.Sprintf("         gRPC TLS: Verify Incoming: %t, Min Version: %s", config.TLS.GRPC.VerifyIncoming, config.TLS.GRPC.TLSMinVersion))
+	ui.Info(fmt.Sprintf(" Internal RPC TLS: Verify Incoming: %t, Verify Outgoing: %t (Verify Hostname: %t), Min Version: %s",
 		config.TLS.InternalRPC.VerifyIncoming, config.TLS.InternalRPC.VerifyOutgoing, config.TLS.InternalRPC.VerifyServerHostname, config.TLS.InternalRPC.TLSMinVersion))
 	// Enable log streaming
 	ui.Output("")
diff --git a/command/agent/agent_test.go b/command/agent/agent_test.go
index 3fa5d1e1a31a5..bb6d8837cf2d6 100644
--- a/command/agent/agent_test.go
+++ b/command/agent/agent_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/command/agent/startup_logger.go b/command/agent/startup_logger.go
index f324ac6c55c85..f632b307f0482 100644
--- a/command/agent/startup_logger.go
+++ b/command/agent/startup_logger.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package agent
 
 import (
diff --git a/command/catalog/catalog.go b/command/catalog/catalog.go
index f685512060076..04e2e4fbecff1 100644
--- a/command/catalog/catalog.go
+++ b/command/catalog/catalog.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package catalog
 
 import (
diff --git a/command/catalog/catalog_test.go b/command/catalog/catalog_test.go
index 308da9452edfe..9c5ffbdbafa83 100644
--- a/command/catalog/catalog_test.go
+++ b/command/catalog/catalog_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package catalog
 
 import (
diff --git a/command/catalog/helpers.go b/command/catalog/helpers.go
index f457d8f792ab5..f0c4cc85074e9 100644
--- a/command/catalog/helpers.go
+++ b/command/catalog/helpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package catalog
 
 import (
diff --git a/command/catalog/helpers_ce.go b/command/catalog/helpers_ce.go
index 9898d5a5a2174..bc70b3358bf10 100644
--- a/command/catalog/helpers_ce.go
+++ b/command/catalog/helpers_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package catalog
 
diff --git a/command/catalog/list/dc/catalog_list_datacenters.go b/command/catalog/list/dc/catalog_list_datacenters.go
index c7531c9164342..3ab15253872e6 100644
--- a/command/catalog/list/dc/catalog_list_datacenters.go
+++ b/command/catalog/list/dc/catalog_list_datacenters.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package dc
 
 import (
diff --git a/command/catalog/list/dc/catalog_list_datacenters_test.go b/command/catalog/list/dc/catalog_list_datacenters_test.go
index 68a8a8bc50552..1fb4305d8590a 100644
--- a/command/catalog/list/dc/catalog_list_datacenters_test.go
+++ b/command/catalog/list/dc/catalog_list_datacenters_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package dc
 
 import (
diff --git a/command/catalog/list/nodes/catalog_list_nodes.go b/command/catalog/list/nodes/catalog_list_nodes.go
index 1d1f3912f2255..e1dcb9596475a 100644
--- a/command/catalog/list/nodes/catalog_list_nodes.go
+++ b/command/catalog/list/nodes/catalog_list_nodes.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package nodes
 
 import (
diff --git a/command/catalog/list/nodes/catalog_list_nodes_test.go b/command/catalog/list/nodes/catalog_list_nodes_test.go
index 59db1c666bb67..56b7bc6e1289d 100644
--- a/command/catalog/list/nodes/catalog_list_nodes_test.go
+++ b/command/catalog/list/nodes/catalog_list_nodes_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package nodes
 
 import (
diff --git a/command/catalog/list/services/catalog_list_services.go b/command/catalog/list/services/catalog_list_services.go
index 4bbcce6532957..95359286b34e9 100644
--- a/command/catalog/list/services/catalog_list_services.go
+++ b/command/catalog/list/services/catalog_list_services.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package services
 
 import (
diff --git a/command/catalog/list/services/catalog_list_services_test.go b/command/catalog/list/services/catalog_list_services_test.go
index 905729410d95e..6e3d8dd15d56b 100644
--- a/command/catalog/list/services/catalog_list_services_test.go
+++ b/command/catalog/list/services/catalog_list_services_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package services
 
 import (
diff --git a/command/cli/cli.go b/command/cli/cli.go
index a0bb5d78ddf7b..44cbf17b21e36 100644
--- a/command/cli/cli.go
+++ b/command/cli/cli.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cli
 
 import (
diff --git a/command/cli/formatting.go b/command/cli/formatting.go
index fec86797b057c..8df31bb90d264 100644
--- a/command/cli/formatting.go
+++ b/command/cli/formatting.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cli
 
 import (
diff --git a/command/config/config.go b/command/config/config.go
index ed54954cbeb96..be0566438118e 100644
--- a/command/config/config.go
+++ b/command/config/config.go
@@ -1,10 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package config
 
 import (
-	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/command/flags"
 	"github.com/mitchellh/cli"
 )
@@ -53,51 +49,3 @@ Usage: consul config <subcommand> [options] [args]
 
   For more examples, ask for subcommand help or view the documentation.
 `
-
-const (
-	// TODO(pglass): These warnings can go away when the UI provides visibility into
-	// permissive mTLS settings (expected 1.17).
-	WarningServiceDefaultsPermissiveMTLS = "MutualTLSMode=permissive is insecure. " +
-		"Set to `strict` when your service no longer needs to accept non-mTLS " +
-		"traffic. Check `tcp.permissive_public_listener` metrics in Envoy for " +
-		"non-mTLS traffic. Refer to Consul documentation for more information."
-
-	WarningProxyDefaultsPermissiveMTLS = "MutualTLSMode=permissive is insecure. " +
-		"To keep your services secure, set MutualTLSMode to `strict` whenever possible " +
-		"and override with service-defaults only if necessary. To check which " +
-		"service-defaults are currently in permissive mode, run `consul config list " +
-		"-kind service-defaults -filter 'MutualTLSMode = \"permissive\"'`."
-
-	WarningMeshAllowEnablingPermissiveMutualTLS = "AllowEnablingPermissiveMutualTLS=true " +
-		"allows insecure MutualTLSMode=permissive configurations in the proxy-defaults " +
-		"and service-defaults config entries. You can set " +
-		"AllowEnablingPermissiveMutualTLS=false at any time to disallow additional " +
-		"permissive configurations. To list services in permissive mode, run `consul " +
-		"config list -kind service-defaults -filter 'MutualTLSMode = \"permissive\"'`."
-)
-
-// KindSpecificWriteWarning returns a warning message for the given config
-// entry write. Use this to inform the user of (un)recommended settings when
-// they read or write config entries with the CLI.
-//
-// Do not return a warning on default/zero values. Because the config
-// entry is parsed, we cannot distinguish between an absent field in the
-// user-provided content and a zero value, so we'd end up warning on
-// every invocation.
-func KindSpecificWriteWarning(reqEntry api.ConfigEntry) string {
-	switch req := reqEntry.(type) {
-	case *api.ServiceConfigEntry:
-		if req.MutualTLSMode == api.MutualTLSModePermissive {
-			return WarningServiceDefaultsPermissiveMTLS
-		}
-	case *api.ProxyConfigEntry:
-		if req.MutualTLSMode == api.MutualTLSModePermissive {
-			return WarningProxyDefaultsPermissiveMTLS
-		}
-	case *api.MeshConfigEntry:
-		if req.AllowEnablingPermissiveMutualTLS == true {
-			return WarningMeshAllowEnablingPermissiveMutualTLS
-		}
-	}
-	return ""
-}
diff --git a/command/config/delete/config_delete.go b/command/config/delete/config_delete.go
index baec168b172aa..caa21c0947c68 100644
--- a/command/config/delete/config_delete.go
+++ b/command/config/delete/config_delete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package delete
 
 import (
diff --git a/command/config/delete/config_delete_test.go b/command/config/delete/config_delete_test.go
index d7d6d9226054c..d4f9b704ed40b 100644
--- a/command/config/delete/config_delete_test.go
+++ b/command/config/delete/config_delete_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package delete
 
 import (
diff --git a/command/config/list/config_list.go b/command/config/list/config_list.go
index 4dd469590cffd..3df95e3ceae8a 100644
--- a/command/config/list/config_list.go
+++ b/command/config/list/config_list.go
@@ -1,13 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package list
 
 import (
 	"flag"
 	"fmt"
 
-	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/command/flags"
 	"github.com/mitchellh/cli"
 )
@@ -24,14 +20,12 @@ type cmd struct {
 	http  *flags.HTTPFlags
 	help  string
 
-	kind   string
-	filter string
+	kind string
 }
 
 func (c *cmd) init() {
 	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
 	c.flags.StringVar(&c.kind, "kind", "", "The kind of configurations to list.")
-	c.flags.StringVar(&c.filter, "filter", "", "Filter to use with the request.")
 	c.http = &flags.HTTPFlags{}
 	flags.Merge(c.flags, c.http.ClientFlags())
 	flags.Merge(c.flags, c.http.ServerFlags())
@@ -55,9 +49,7 @@ func (c *cmd) Run(args []string) int {
 		return 1
 	}
 
-	entries, _, err := client.ConfigEntries().List(c.kind, &api.QueryOptions{
-		Filter: c.filter,
-	})
+	entries, _, err := client.ConfigEntries().List(c.kind, nil)
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error listing config entries for kind %q: %v", c.kind, err))
 		return 1
diff --git a/command/config/list/config_list_test.go b/command/config/list/config_list_test.go
index 3e528a062fbb3..fe24184f0b0fa 100644
--- a/command/config/list/config_list_test.go
+++ b/command/config/list/config_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package list
 
 import (
@@ -28,6 +25,9 @@ func TestConfigList(t *testing.T) {
 	defer a.Shutdown()
 	client := a.Client()
 
+	ui := cli.NewMockUi()
+	c := New(ui)
+
 	_, _, err := client.ConfigEntries().Set(&api.ServiceConfigEntry{
 		Kind:     api.ServiceDefaults,
 		Name:     "web",
@@ -45,58 +45,21 @@ func TestConfigList(t *testing.T) {
 	_, _, err = client.ConfigEntries().Set(&api.ServiceConfigEntry{
 		Kind:     api.ServiceDefaults,
 		Name:     "api",
-		Protocol: "http",
+		Protocol: "tcp",
 	}, nil)
 	require.NoError(t, err)
 
-	cases := map[string]struct {
-		args     []string
-		expected []string
-		errMsg   string
-	}{
-		"list service-defaults": {
-			args: []string{
-				"-http-addr=" + a.HTTPAddr(),
-				"-kind=" + api.ServiceDefaults,
-			},
-			expected: []string{"web", "foo", "api"},
-		},
-		"filter service-defaults": {
-			args: []string{
-				"-http-addr=" + a.HTTPAddr(),
-				"-kind=" + api.ServiceDefaults,
-				"-filter=" + `Protocol == "http"`,
-			},
-			expected: []string{"api"},
-		},
-		"filter unsupported kind": {
-			args: []string{
-				"-http-addr=" + a.HTTPAddr(),
-				"-kind=" + api.ProxyDefaults,
-				"-filter", `Mode == "transparent"`,
-			},
-			errMsg: "filtering not supported for config entry kind=proxy-defaults",
-		},
+	args := []string{
+		"-http-addr=" + a.HTTPAddr(),
+		"-kind=" + api.ServiceDefaults,
 	}
-	for name, c := range cases {
-		c := c
-		t.Run(name, func(t *testing.T) {
-			ui := cli.NewMockUi()
-			cmd := New(ui)
 
-			code := cmd.Run(c.args)
+	code := c.Run(args)
+	require.Equal(t, 0, code)
 
-			if c.errMsg == "" {
-				require.Equal(t, 0, code)
-				services := strings.Split(strings.Trim(ui.OutputWriter.String(), "\n"), "\n")
-				require.ElementsMatch(t, c.expected, services)
-			} else {
-				require.NotEqual(t, 0, code)
-				require.Contains(t, ui.ErrorWriter.String(), c.errMsg)
-			}
+	services := strings.Split(strings.Trim(ui.OutputWriter.String(), "\n"), "\n")
 
-		})
-	}
+	require.ElementsMatch(t, []string{"web", "foo", "api"}, services)
 }
 
 func TestConfigList_InvalidArgs(t *testing.T) {
diff --git a/command/config/read/config_read.go b/command/config/read/config_read.go
index d3e3828817b52..afd30843ac4e4 100644
--- a/command/config/read/config_read.go
+++ b/command/config/read/config_read.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package read
 
 import (
diff --git a/command/config/read/config_read_test.go b/command/config/read/config_read_test.go
index 5fbf37885d0b6..0b86621eff8f0 100644
--- a/command/config/read/config_read_test.go
+++ b/command/config/read/config_read_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package read
 
 import (
diff --git a/command/config/write/config_write.go b/command/config/write/config_write.go
index 4edfbed3bf0ce..0c377e6c45679 100644
--- a/command/config/write/config_write.go
+++ b/command/config/write/config_write.go
@@ -1,18 +1,19 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package write
 
 import (
 	"flag"
 	"fmt"
 	"io"
+	"time"
 
+	"github.com/hashicorp/go-multierror"
 	"github.com/mitchellh/cli"
+	"github.com/mitchellh/mapstructure"
 
-	"github.com/hashicorp/consul/command/config"
+	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/command/flags"
 	"github.com/hashicorp/consul/command/helpers"
+	"github.com/hashicorp/consul/lib/decode"
 )
 
 func New(ui cli.Ui) *cmd {
@@ -96,12 +97,68 @@ func (c *cmd) Run(args []string) int {
 	}
 
 	c.UI.Info(fmt.Sprintf("Config entry written: %s/%s", entry.GetKind(), entry.GetName()))
+	return 0
+}
+
+// There is a 'structs' variation of this in
+// agent/structs/config_entry.go:DecodeConfigEntry
+func newDecodeConfigEntry(raw map[string]interface{}) (api.ConfigEntry, error) {
+	var entry api.ConfigEntry
+
+	kindVal, ok := raw["Kind"]
+	if !ok {
+		kindVal, ok = raw["kind"]
+	}
+	if !ok {
+		return nil, fmt.Errorf("Payload does not contain a kind/Kind key at the top level")
+	}
 
-	if msg := config.KindSpecificWriteWarning(entry); msg != "" {
-		c.UI.Warn("WARNING: " + msg)
+	if kindStr, ok := kindVal.(string); ok {
+		newEntry, err := api.MakeConfigEntry(kindStr, "")
+		if err != nil {
+			return nil, err
+		}
+		entry = newEntry
+	} else {
+		return nil, fmt.Errorf("Kind value in payload is not a string")
 	}
 
-	return 0
+	var md mapstructure.Metadata
+	decodeConf := &mapstructure.DecoderConfig{
+		DecodeHook: mapstructure.ComposeDecodeHookFunc(
+			decode.HookWeakDecodeFromSlice,
+			decode.HookTranslateKeys,
+			mapstructure.StringToTimeDurationHookFunc(),
+			mapstructure.StringToTimeHookFunc(time.RFC3339),
+		),
+		Metadata:         &md,
+		Result:           &entry,
+		WeaklyTypedInput: true,
+	}
+
+	decoder, err := mapstructure.NewDecoder(decodeConf)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := decoder.Decode(raw); err != nil {
+		return nil, err
+	}
+
+	for _, k := range md.Unused {
+		switch k {
+		case "kind", "Kind":
+			// The kind field is used to determine the target, but doesn't need
+			// to exist on the target.
+			continue
+		}
+		err = multierror.Append(err, fmt.Errorf("invalid config key %q", k))
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	return entry, nil
 }
 
 func (c *cmd) Synopsis() string {
diff --git a/command/config/write/config_write_test.go b/command/config/write/config_write_test.go
index 15e7a47465323..7671ffdea342c 100644
--- a/command/config/write/config_write_test.go
+++ b/command/config/write/config_write_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package write
 
 import (
@@ -14,7 +11,6 @@ import (
 
 	"github.com/hashicorp/consul/agent"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/command/config"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
@@ -172,97 +168,6 @@ kind = "proxy-defaults"
 	})
 }
 
-func TestConfigWrite_Warning(t *testing.T) {
-	t.Parallel()
-
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	a := agent.NewTestAgent(t, ``)
-	defer a.Shutdown()
-	client := a.Client()
-
-	cases := map[string]struct {
-		entry   string
-		warning string
-	}{
-		"service-defaults no warning": {
-			entry: `
-				Kind = "service-defaults"
-				Name = "web"
-				MutualTLSMode = "strict"
-			`,
-		},
-		"proxy-defaults no warning": {
-			entry: `
-				Kind = "proxy-defaults"
-				Name = "global"
-				MutualTLSMode = "strict"
-			`,
-		},
-		"mesh config entry no warning": {
-			entry: `
-				Kind = "mesh"
-				AllowEnablingPermissiveMutualTLS = false
-			`,
-		},
-		"service-defaults warning on MutualTLSMode=permissive": {
-			entry: `
-				Kind = "service-defaults"
-				Name = "web"
-				MutualTLSMode = "permissive"
-			`,
-			warning: config.WarningServiceDefaultsPermissiveMTLS,
-		},
-		"proxy-defaults warning on MutualTLSMode=permissive": {
-			entry: `
-				Kind = "proxy-defaults"
-				Name = "global"
-				MutualTLSMode = "permissive"
-			`,
-			warning: config.WarningProxyDefaultsPermissiveMTLS,
-		},
-		"mesh config entry warning on AllowEnablingPermissiveMutualTLS=true": {
-			entry: `
-				Kind = "mesh"
-				AllowEnablingPermissiveMutualTLS = true
-			`,
-			warning: config.WarningMeshAllowEnablingPermissiveMutualTLS,
-		},
-	}
-	for name, c := range cases {
-		c := c
-		t.Run(name, func(t *testing.T) {
-			// Always reset this setting to avoid causing validation errors.
-			_, _, err := client.ConfigEntries().Set(&api.MeshConfigEntry{
-				AllowEnablingPermissiveMutualTLS: true,
-			}, nil)
-			require.NoError(t, err)
-
-			f := testutil.TempFile(t, "config-write-warning-*.hcl")
-			_, err = f.WriteString(c.entry)
-			require.NoError(t, err)
-
-			ui := cli.NewMockUi()
-			code := New(ui).Run([]string{
-				"-http-addr=" + a.HTTPAddr(),
-				f.Name(),
-			})
-
-			require.Equal(t, 0, code)
-			require.Contains(t, ui.OutputWriter.String(), `Config entry written`)
-
-			errMsg := ui.ErrorWriter.String()
-			if c.warning != "" {
-				require.Contains(t, errMsg, c.warning)
-			} else {
-				require.Empty(t, errMsg)
-			}
-		})
-	}
-}
-
 func requireContainsLower(t *testing.T, haystack, needle string) {
 	t.Helper()
 	require.Contains(t, strings.ToLower(haystack), strings.ToLower(needle))
diff --git a/command/connect/ca/ca.go b/command/connect/ca/ca.go
index a5edd43dbc2e9..9e9df7ad6b6c5 100644
--- a/command/connect/ca/ca.go
+++ b/command/connect/ca/ca.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
diff --git a/command/connect/ca/ca_test.go b/command/connect/ca/ca_test.go
index 84ebe2873dd37..31febd342c737 100644
--- a/command/connect/ca/ca_test.go
+++ b/command/connect/ca/ca_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
diff --git a/command/connect/ca/get/connect_ca_get.go b/command/connect/ca/get/connect_ca_get.go
index 40b9b556a4bbf..26bcb58240b5c 100644
--- a/command/connect/ca/get/connect_ca_get.go
+++ b/command/connect/ca/get/connect_ca_get.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package get
 
 import (
diff --git a/command/connect/ca/get/connect_ca_get_test.go b/command/connect/ca/get/connect_ca_get_test.go
index 0e5545152c34b..4793c1e07532e 100644
--- a/command/connect/ca/get/connect_ca_get_test.go
+++ b/command/connect/ca/get/connect_ca_get_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package get
 
 import (
diff --git a/command/connect/ca/set/connect_ca_set.go b/command/connect/ca/set/connect_ca_set.go
index 2c9af4ec6ea9c..54f8854d5cc9c 100644
--- a/command/connect/ca/set/connect_ca_set.go
+++ b/command/connect/ca/set/connect_ca_set.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package set
 
 import (
diff --git a/command/connect/ca/set/connect_ca_set_test.go b/command/connect/ca/set/connect_ca_set_test.go
index 4193d718f0dd9..76bb90e698922 100644
--- a/command/connect/ca/set/connect_ca_set_test.go
+++ b/command/connect/ca/set/connect_ca_set_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package set
 
 import (
diff --git a/command/connect/connect.go b/command/connect/connect.go
index c92481a723ab0..60c2388766987 100644
--- a/command/connect/connect.go
+++ b/command/connect/connect.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/command/connect/connect_test.go b/command/connect/connect_test.go
index 3098962dc4ef8..3f78c2b7a6d20 100644
--- a/command/connect/connect_test.go
+++ b/command/connect/connect_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/command/connect/envoy/bootstrap_config.go b/command/connect/envoy/bootstrap_config.go
index 452d3679d6f2f..4f0132208f2b0 100644
--- a/command/connect/envoy/bootstrap_config.go
+++ b/command/connect/envoy/bootstrap_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package envoy
 
 import (
diff --git a/command/connect/envoy/bootstrap_config_test.go b/command/connect/envoy/bootstrap_config_test.go
index ef05786347142..066b9e67a154f 100644
--- a/command/connect/envoy/bootstrap_config_test.go
+++ b/command/connect/envoy/bootstrap_config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package envoy
 
 import (
diff --git a/command/connect/envoy/bootstrap_tpl.go b/command/connect/envoy/bootstrap_tpl.go
index 4b4bbc8db77f4..2a2d918d916a8 100644
--- a/command/connect/envoy/bootstrap_tpl.go
+++ b/command/connect/envoy/bootstrap_tpl.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package envoy
 
 // BootstrapTplArgs is the set of arguments that may be interpolated into the
@@ -8,7 +5,7 @@ package envoy
 type BootstrapTplArgs struct {
 	GRPC
 
-	// ProxyCluster is the cluster name for the Envoy `node` specification and
+	// ProxyCluster is the cluster name for the the Envoy `node` specification and
 	// is typically the same as the ProxyID.
 	ProxyCluster string
 
diff --git a/command/connect/envoy/envoy.go b/command/connect/envoy/envoy.go
index 3489f1017a658..a45e55d99a38c 100644
--- a/command/connect/envoy/envoy.go
+++ b/command/connect/envoy/envoy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package envoy
 
 import (
@@ -38,7 +35,7 @@ func New(ui cli.Ui) *cmd {
 	return c
 }
 
-const DefaultAdminAccessLogPath = os.DevNull
+const DefaultAdminAccessLogPath = "/dev/null"
 
 type cmd struct {
 	UI     cli.Ui
@@ -344,16 +341,15 @@ func (c *cmd) run(args []string) int {
 		}
 	}
 
-	var svcForSidecar api.AgentService
 	if c.proxyID == "" {
 		switch {
 		case c.sidecarFor != "":
-			svcForSidecar, err := proxyCmd.LookupServiceForSidecar(c.client, c.sidecarFor)
+			proxyID, err := proxyCmd.LookupProxyIDForSidecar(c.client, c.sidecarFor)
 			if err != nil {
 				c.UI.Error(err.Error())
 				return 1
 			}
-			c.proxyID = svcForSidecar.ID
+			c.proxyID = proxyID
 
 		case c.gateway != "" && !c.register:
 			gatewaySvc, err := proxyCmd.LookupGatewayProxy(c.client, c.gatewayKind)
@@ -395,13 +391,77 @@ func (c *cmd) run(args []string) int {
 			return 1
 		}
 
-		svc, err := c.proxyRegistration(&svcForSidecar)
-		if err != nil {
-			c.UI.Error(err.Error())
+		taggedAddrs := make(map[string]api.ServiceAddress)
+		lanAddr := c.lanAddress.Value()
+		if lanAddr.Address != "" {
+			taggedAddrs[structs.TaggedAddressLAN] = lanAddr
+		}
+
+		wanAddr := c.wanAddress.Value()
+		if wanAddr.Address != "" {
+			taggedAddrs[structs.TaggedAddressWAN] = wanAddr
+		}
+
+		tcpCheckAddr := lanAddr.Address
+		if tcpCheckAddr == "" {
+			// fallback to localhost as the gateway has to reside in the same network namespace
+			// as the agent
+			tcpCheckAddr = "127.0.0.1"
+		}
+
+		var proxyConf *api.AgentServiceConnectProxyConfig
+		if len(c.bindAddresses.value) > 0 {
+			// override all default binding rules and just bind to the user-supplied addresses
+			proxyConf = &api.AgentServiceConnectProxyConfig{
+				Config: map[string]interface{}{
+					"envoy_gateway_no_default_bind": true,
+					"envoy_gateway_bind_addresses":  c.bindAddresses.value,
+				},
+			}
+		} else if canBind(lanAddr) && canBind(wanAddr) {
+			// when both addresses are bindable then we bind to the tagged addresses
+			// for creating the envoy listeners
+			proxyConf = &api.AgentServiceConnectProxyConfig{
+				Config: map[string]interface{}{
+					"envoy_gateway_no_default_bind":       true,
+					"envoy_gateway_bind_tagged_addresses": true,
+				},
+			}
+		} else if !canBind(lanAddr) && lanAddr.Address != "" {
+			c.UI.Error(fmt.Sprintf("The LAN address %q will not be bindable. Either set a bindable address or override the bind addresses with -bind-address", lanAddr.Address))
 			return 1
 		}
 
-		if err := c.client.Agent().ServiceRegister(svc); err != nil {
+		var meta map[string]string
+		if c.exposeServers {
+			meta = map[string]string{structs.MetaWANFederationKey: "1"}
+		}
+
+		// API gateways do not have a default listener or ready endpoint,
+		// so adding any check to the registration will fail
+		var check *api.AgentServiceCheck
+		if c.gatewayKind != api.ServiceKindAPIGateway {
+			check = &api.AgentServiceCheck{
+				Name:                           fmt.Sprintf("%s listening", c.gatewayKind),
+				TCP:                            ipaddr.FormatAddressPort(tcpCheckAddr, lanAddr.Port),
+				Interval:                       "10s",
+				DeregisterCriticalServiceAfter: c.deregAfterCritical,
+			}
+		}
+
+		svc := api.AgentServiceRegistration{
+			Kind:            c.gatewayKind,
+			Name:            c.gatewaySvcName,
+			ID:              c.proxyID,
+			Address:         lanAddr.Address,
+			Port:            lanAddr.Port,
+			Meta:            meta,
+			TaggedAddresses: taggedAddrs,
+			Proxy:           proxyConf,
+			Check:           check,
+		}
+
+		if err := c.client.Agent().ServiceRegister(&svc); err != nil {
 			c.UI.Error(fmt.Sprintf("Error registering service %q: %s", svc.Name, err))
 			return 1
 		}
@@ -479,85 +539,6 @@ func (c *cmd) run(args []string) int {
 	return 0
 }
 
-func (c *cmd) proxyRegistration(svcForSidecar *api.AgentService) (*api.AgentServiceRegistration, error) {
-	taggedAddrs := make(map[string]api.ServiceAddress)
-	lanAddr := c.lanAddress.Value()
-	if lanAddr.Address != "" {
-		taggedAddrs[structs.TaggedAddressLAN] = lanAddr
-	}
-
-	wanAddr := c.wanAddress.Value()
-	if wanAddr.Address != "" {
-		taggedAddrs[structs.TaggedAddressWAN] = wanAddr
-	}
-
-	tcpCheckAddr := lanAddr.Address
-	if tcpCheckAddr == "" {
-		// fallback to localhost as the gateway has to reside in the same network namespace
-		// as the agent
-		tcpCheckAddr = "127.0.0.1"
-	}
-
-	var proxyConf *api.AgentServiceConnectProxyConfig
-	if len(c.bindAddresses.value) > 0 {
-		// override all default binding rules and just bind to the user-supplied addresses
-		proxyConf = &api.AgentServiceConnectProxyConfig{
-			Config: map[string]interface{}{
-				"envoy_gateway_no_default_bind": true,
-				"envoy_gateway_bind_addresses":  c.bindAddresses.value,
-			},
-		}
-	} else if canBind(lanAddr) && canBind(wanAddr) {
-		// when both addresses are bindable then we bind to the tagged addresses
-		// for creating the envoy listeners
-		proxyConf = &api.AgentServiceConnectProxyConfig{
-			Config: map[string]interface{}{
-				"envoy_gateway_no_default_bind":       true,
-				"envoy_gateway_bind_tagged_addresses": true,
-			},
-		}
-	} else if !canBind(lanAddr) && lanAddr.Address != "" {
-		return nil, fmt.Errorf("The LAN address %q will not be bindable. Either set a bindable address or override the bind addresses with -bind-address", lanAddr.Address)
-	}
-
-	var meta map[string]string
-	if c.exposeServers {
-		meta = map[string]string{structs.MetaWANFederationKey: "1"}
-	}
-
-	// API gateways do not have a default listener or ready endpoint,
-	// so adding any check to the registration will fail
-	var check *api.AgentServiceCheck
-	if c.gatewayKind != api.ServiceKindAPIGateway {
-		check = &api.AgentServiceCheck{
-			Name:                           fmt.Sprintf("%s listening", c.gatewayKind),
-			TCP:                            ipaddr.FormatAddressPort(tcpCheckAddr, lanAddr.Port),
-			Interval:                       "10s",
-			DeregisterCriticalServiceAfter: c.deregAfterCritical,
-		}
-	}
-
-	// If registering a sidecar for an existing service, inherit the
-	// locality of that service if it was explicitly configured.
-	var locality *api.Locality
-	if c.sidecarFor != "" {
-		locality = svcForSidecar.Locality
-	}
-
-	return &api.AgentServiceRegistration{
-		Kind:            c.gatewayKind,
-		Name:            c.gatewaySvcName,
-		ID:              c.proxyID,
-		Address:         lanAddr.Address,
-		Port:            lanAddr.Port,
-		Meta:            meta,
-		TaggedAddresses: taggedAddrs,
-		Proxy:           proxyConf,
-		Check:           check,
-		Locality:        locality,
-	}, nil
-}
-
 var errUnsupportedOS = errors.New("envoy: not implemented on this operating system")
 
 func (c *cmd) findBinary() (string, error) {
diff --git a/command/connect/envoy/envoy_ce_test.go b/command/connect/envoy/envoy_ce_test.go
index 84bfb969f7497..6bcd5581dcca2 100644
--- a/command/connect/envoy/envoy_ce_test.go
+++ b/command/connect/envoy/envoy_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package envoy
 
diff --git a/command/connect/envoy/envoy_test.go b/command/connect/envoy/envoy_test.go
index 0e61eea1865ab..e24c0199cf435 100644
--- a/command/connect/envoy/envoy_test.go
+++ b/command/connect/envoy/envoy_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package envoy
 
 import (
@@ -1399,83 +1396,6 @@ func TestEnvoy_GatewayRegistration(t *testing.T) {
 	}
 }
 
-func TestEnvoy_proxyRegistration(t *testing.T) {
-	t.Parallel()
-
-	type args struct {
-		svcForProxy api.AgentService
-		cmdFn       func(*cmd)
-	}
-
-	cases := []struct {
-		name   string
-		args   args
-		testFn func(*testing.T, args, *api.AgentServiceRegistration)
-	}{
-		{
-			"locality is inherited from proxied service if configured and using sidecarFor",
-			args{
-				svcForProxy: api.AgentService{
-					ID: "my-svc",
-					Locality: &api.Locality{
-						Region: "us-east-1",
-						Zone:   "us-east-1a",
-					},
-				},
-				cmdFn: func(c *cmd) {
-					c.sidecarFor = "my-svc"
-				},
-			},
-			func(t *testing.T, args args, r *api.AgentServiceRegistration) {
-				assert.NotNil(t, r.Locality)
-				assert.Equal(t, args.svcForProxy.Locality, r.Locality)
-			},
-		},
-		{
-			"locality is not inherited if not using sidecarFor",
-			args{
-				svcForProxy: api.AgentService{
-					ID: "my-svc",
-					Locality: &api.Locality{
-						Region: "us-east-1",
-						Zone:   "us-east-1a",
-					},
-				},
-			},
-			func(t *testing.T, args args, r *api.AgentServiceRegistration) {
-				assert.Nil(t, r.Locality)
-			},
-		},
-		{
-			"locality is not set if not configured for proxied service",
-			args{
-				svcForProxy: api.AgentService{},
-				cmdFn: func(c *cmd) {
-					c.sidecarFor = "my-svc"
-				},
-			},
-			func(t *testing.T, args args, r *api.AgentServiceRegistration) {
-				assert.Nil(t, r.Locality)
-			},
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			ui := cli.NewMockUi()
-			c := New(ui)
-
-			if tc.args.cmdFn != nil {
-				tc.args.cmdFn(c)
-			}
-
-			result, err := c.proxyRegistration(&tc.args.svcForProxy)
-			assert.NoError(t, err)
-			tc.testFn(t, tc.args, result)
-		})
-	}
-}
-
 // testMockAgent combines testMockAgentProxyConfig and testMockAgentSelf,
 // routing /agent/service/... requests to testMockAgentProxyConfig,
 // routing /catalog/node-services/... requests to testMockCatalogNodeServiceList
@@ -1543,9 +1463,6 @@ func testMockAgentGatewayConfig(namespacesEnabled bool) http.HandlerFunc {
 func namespaceFromQuery(r *http.Request) string {
 	// Use the namespace in the request if there is one, otherwise
 	// use-default.
-	if queryNamespace := r.URL.Query().Get("namespace"); queryNamespace != "" {
-		return queryNamespace
-	}
 	if queryNs := r.URL.Query().Get("ns"); queryNs != "" {
 		return queryNs
 	}
@@ -1555,11 +1472,8 @@ func namespaceFromQuery(r *http.Request) string {
 func partitionFromQuery(r *http.Request) string {
 	// Use the partition in the request if there is one, otherwise
 	// use-default.
-	if queryPartition := r.URL.Query().Get("partition"); queryPartition != "" {
-		return queryPartition
-	}
-	if queryAp := r.URL.Query().Get("ap"); queryAp != "" {
-		return queryAp
+	if queryAP := r.URL.Query().Get("partition"); queryAP != "" {
+		return queryAP
 	}
 	return "default"
 }
diff --git a/command/connect/envoy/exec.go b/command/connect/envoy/exec.go
index 71f903c106437..53100e244cafb 100644
--- a/command/connect/envoy/exec.go
+++ b/command/connect/envoy/exec.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package envoy
 
 import (
diff --git a/command/connect/envoy/exec_supported.go b/command/connect/envoy/exec_supported.go
deleted file mode 100644
index 6eba0672eba6a..0000000000000
--- a/command/connect/envoy/exec_supported.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build linux || darwin || windows
-
-package envoy
-
-import (
-	"fmt"
-	"os"
-	"strings"
-)
-
-func isHotRestartOption(s string) bool {
-	restartOpts := []string{
-		"--restart-epoch",
-		"--hot-restart-version",
-		"--drain-time-s",
-		"--parent-shutdown-time-s",
-	}
-	for _, opt := range restartOpts {
-		if s == opt {
-			return true
-		}
-		if strings.HasPrefix(s, opt+"=") {
-			return true
-		}
-	}
-	return false
-}
-
-func hasHotRestartOption(argSets ...[]string) bool {
-	for _, args := range argSets {
-		for _, opt := range args {
-			if isHotRestartOption(opt) {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-// execArgs returns the command and args used to execute a binary. By default it
-// will return a command of os.Executable with the args unmodified. This is a shim
-// for testing, and can be overridden to execute using 'go run' instead.
-var execArgs = func(args ...string) (string, []string, error) {
-	execPath, err := os.Executable()
-	if err != nil {
-		return "", nil, err
-	}
-
-	if strings.HasSuffix(execPath, "/envoy.test") {
-		return "", nil, fmt.Errorf("set execArgs to use 'go run' instead of doing a self-exec")
-	}
-
-	return execPath, args, nil
-}
diff --git a/command/connect/envoy/exec_test.go b/command/connect/envoy/exec_test.go
index e949019e8235e..a6978ce5828d0 100644
--- a/command/connect/envoy/exec_test.go
+++ b/command/connect/envoy/exec_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build linux || darwin
+// +build linux darwin
 
 package envoy
 
diff --git a/command/connect/envoy/exec_unix.go b/command/connect/envoy/exec_unix.go
index 4c20acdf957eb..9ab83eecfe1d1 100644
--- a/command/connect/envoy/exec_unix.go
+++ b/command/connect/envoy/exec_unix.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build linux || darwin
+// +build linux darwin
 
 package envoy
 
@@ -11,12 +9,63 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"syscall"
 	"time"
 
 	"golang.org/x/sys/unix"
 )
 
+// testSelfExecOverride is a way for the tests to no fork-bomb themselves by
+// self-executing the whole test suite for each case recursively. It's gross but
+// the least gross option I could think of.
+var testSelfExecOverride string
+
+func isHotRestartOption(s string) bool {
+	restartOpts := []string{
+		"--restart-epoch",
+		"--hot-restart-version",
+		"--drain-time-s",
+		"--parent-shutdown-time-s",
+	}
+	for _, opt := range restartOpts {
+		if s == opt {
+			return true
+		}
+		if strings.HasPrefix(s, opt+"=") {
+			return true
+		}
+	}
+	return false
+}
+
+func hasHotRestartOption(argSets ...[]string) bool {
+	for _, args := range argSets {
+		for _, opt := range args {
+			if isHotRestartOption(opt) {
+				return true
+			}
+		}
+	}
+	return false
+}
+
+// execArgs returns the command and args used to execute a binary. By default it
+// will return a command of os.Executable with the args unmodified. This is a shim
+// for testing, and can be overridden to execute using 'go run' instead.
+var execArgs = func(args ...string) (string, []string, error) {
+	execPath, err := os.Executable()
+	if err != nil {
+		return "", nil, err
+	}
+
+	if strings.HasSuffix(execPath, "/envoy.test") {
+		return "", nil, fmt.Errorf("set execArgs to use 'go run' instead of doing a self-exec")
+	}
+
+	return execPath, args, nil
+}
+
 func makeBootstrapPipe(bootstrapJSON []byte) (string, error) {
 	pipeFile := filepath.Join(os.TempDir(),
 		fmt.Sprintf("envoy-%x-bootstrap.json", time.Now().UnixNano()+int64(os.Getpid())))
diff --git a/command/connect/envoy/exec_unsupported.go b/command/connect/envoy/exec_unsupported.go
index c5c95ce4c5382..d22b4c8cdf230 100644
--- a/command/connect/envoy/exec_unsupported.go
+++ b/command/connect/envoy/exec_unsupported.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !linux && !darwin && !windows
+//go:build !linux && !darwin
+// +build !linux,!darwin
 
 package envoy
 
diff --git a/command/connect/envoy/exec_windows.go b/command/connect/envoy/exec_windows.go
deleted file mode 100644
index fe5f2ae9a3b90..0000000000000
--- a/command/connect/envoy/exec_windows.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-//go:build windows && !fips
-
-package envoy
-
-import (
-	"errors"
-	"fmt"
-	"github.com/natefinch/npipe"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"time"
-)
-
-func makeBootstrapPipe(bootstrapJSON []byte) (string, error) {
-	pipeFile := filepath.Join(os.TempDir(),
-		fmt.Sprintf("envoy-%x-bootstrap.json", time.Now().UnixNano()+int64(os.Getpid())))
-
-	binary, args, err := execArgs("connect", "envoy", "pipe-bootstrap", pipeFile)
-	if err != nil {
-		return pipeFile, err
-	}
-
-	// Dial the named pipe
-	pipeConn, err := npipe.Dial(pipeFile)
-	if err != nil {
-		return pipeFile, err
-	}
-	defer pipeConn.Close()
-
-	// Start the command to connect to the named pipe
-	cmd := exec.Command(binary, args...)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	cmd.Stdin = pipeConn
-
-	// Start the command
-	err = cmd.Start()
-	if err != nil {
-		return pipeFile, err
-	}
-
-	// Write the config
-	n, err := pipeConn.Write(bootstrapJSON)
-	if err != nil {
-		return pipeFile, err
-	}
-
-	if n < len(bootstrapJSON) {
-		return pipeFile, fmt.Errorf("failed writing boostrap to child STDIN: %s", err)
-	}
-
-	// We can't wait for the process since we need to exec into Envoy before it
-	// will be able to complete so it will be remain as a zombie until Envoy is
-	// killed then will be reaped by the init process (pid 0). This is all a bit
-	// gross but the cleanest workaround I can think of for Envoy 1.10 not
-	// supporting /dev/fd/<fd> config paths any more. So we are done and leaving
-	// the child to run it's course without reaping it.
-	return pipeFile, nil
-}
-
-func startProc(binary string, args []string) (p *os.Process, err error) {
-	if binary, err = exec.LookPath(binary); err == nil {
-		var procAttr os.ProcAttr
-		procAttr.Files = []*os.File{os.Stdin,
-			os.Stdout, os.Stderr}
-		p, err := os.StartProcess(binary, args, &procAttr)
-		if err == nil {
-			return p, nil
-		}
-	}
-	return nil, err
-}
-
-func execEnvoy(binary string, prefixArgs, suffixArgs []string, bootstrapJSON []byte) error {
-	tempFile, err := makeBootstrapPipe(bootstrapJSON)
-	if err != nil {
-		os.RemoveAll(tempFile)
-		return err
-	}
-	// We don't defer a cleanup since we are about to Exec into Envoy which means
-	// defer will never fire. The child process cleans up for us in the happy
-	// path.
-
-	// We default to disabling hot restart because it makes it easier to run
-	// multiple envoys locally for testing without them trying to share memory and
-	// unix sockets and complain about being different IDs. But if user is
-	// actually configuring hot-restart explicitly with the --restart-epoch option
-	// then don't disable it!
-	disableHotRestart := !hasHotRestartOption(prefixArgs, suffixArgs)
-
-	// First argument needs to be the executable name.
-	envoyArgs := []string{}
-	envoyArgs = append(envoyArgs, prefixArgs...)
-	if disableHotRestart {
-		envoyArgs = append(envoyArgs, "--disable-hot-restart")
-	}
-	envoyArgs = append(envoyArgs, suffixArgs...)
-	envoyArgs = append(envoyArgs, "--config-path", tempFile)
-
-	// Exec
-	if proc, err := startProc(binary, envoyArgs); err == nil {
-		proc.Wait()
-	} else if err != nil {
-		return errors.New("Failed to exec envoy: " + err.Error())
-	}
-
-	return nil
-}
diff --git a/command/connect/envoy/flags.go b/command/connect/envoy/flags.go
index 4d7994ccd45da..78573f385d0a4 100644
--- a/command/connect/envoy/flags.go
+++ b/command/connect/envoy/flags.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package envoy
 
 import (
diff --git a/command/connect/envoy/flags_test.go b/command/connect/envoy/flags_test.go
index 596c0fa1a22fb..ac5de0d9be864 100644
--- a/command/connect/envoy/flags_test.go
+++ b/command/connect/envoy/flags_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package envoy
 
 import (
diff --git a/command/connect/envoy/pipe-bootstrap/connect_envoy_pipe-bootstrap.go b/command/connect/envoy/pipe-bootstrap/connect_envoy_pipe-bootstrap.go
index e6dbc33db1eb7..2685a6bb6a795 100644
--- a/command/connect/envoy/pipe-bootstrap/connect_envoy_pipe-bootstrap.go
+++ b/command/connect/envoy/pipe-bootstrap/connect_envoy_pipe-bootstrap.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pipebootstrap
 
 import (
diff --git a/command/connect/envoy/pipe-bootstrap/connect_envoy_pipe-bootstrap_test.go b/command/connect/envoy/pipe-bootstrap/connect_envoy_pipe-bootstrap_test.go
index 4f271b6e74039..76ed3157c9699 100644
--- a/command/connect/envoy/pipe-bootstrap/connect_envoy_pipe-bootstrap_test.go
+++ b/command/connect/envoy/pipe-bootstrap/connect_envoy_pipe-bootstrap_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pipebootstrap
 
 import (
diff --git a/command/connect/expose/expose.go b/command/connect/expose/expose.go
index 569ab46bab4a7..062a01afb7b16 100644
--- a/command/connect/expose/expose.go
+++ b/command/connect/expose/expose.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package expose
 
 import (
diff --git a/command/connect/expose/expose_test.go b/command/connect/expose/expose_test.go
index 511a495640fb8..61434d6d1d132 100644
--- a/command/connect/expose/expose_test.go
+++ b/command/connect/expose/expose_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package expose
 
 import (
diff --git a/command/connect/proxy/flag_upstreams.go b/command/connect/proxy/flag_upstreams.go
index 47bbb730ae86a..1cc51bda691e7 100644
--- a/command/connect/proxy/flag_upstreams.go
+++ b/command/connect/proxy/flag_upstreams.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/command/connect/proxy/flag_upstreams_test.go b/command/connect/proxy/flag_upstreams_test.go
index 7e47a9ad7950a..7a4eff276887a 100644
--- a/command/connect/proxy/flag_upstreams_test.go
+++ b/command/connect/proxy/flag_upstreams_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/command/connect/proxy/proxy.go b/command/connect/proxy/proxy.go
index 9b352dab5d0ce..a0477a6a1097e 100644
--- a/command/connect/proxy/proxy.go
+++ b/command/connect/proxy/proxy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
@@ -215,42 +212,40 @@ func (c *cmd) Run(args []string) int {
 	return 0
 }
 
-func (c *cmd) lookupServiceForSidecar(client *api.Client) (*api.AgentService, error) {
-	return LookupServiceForSidecar(client, c.sidecarFor)
+func (c *cmd) lookupProxyIDForSidecar(client *api.Client) (string, error) {
+	return LookupProxyIDForSidecar(client, c.sidecarFor)
 }
 
-// LookupServiceForSidecar finds candidate local proxy registrations that are a
-// sidecar for the given service. It will return that service if and only if there
-// is exactly one registered connect proxy with `Proxy.DestinationServiceID` set to
+// LookupProxyIDForSidecar finds candidate local proxy registrations that are a
+// sidecar for the given service. It will return an ID if and only if there is
+// exactly one registered connect proxy with `Proxy.DestinationServiceID` set to
 // the specified service ID.
 //
 // This is exported to share it with the connect envoy command.
-func LookupServiceForSidecar(client *api.Client, sidecarFor string) (*api.AgentService, error) {
+func LookupProxyIDForSidecar(client *api.Client, sidecarFor string) (string, error) {
 	svcs, err := client.Agent().Services()
 	if err != nil {
-		return nil, fmt.Errorf("Failed looking up sidecar proxy info for %s: %s",
+		return "", fmt.Errorf("Failed looking up sidecar proxy info for %s: %s",
 			sidecarFor, err)
 	}
 
-	var matched []*api.AgentService
-	var matchedProxyIDs []string
+	var proxyIDs []string
 	for _, svc := range svcs {
 		if svc.Kind == api.ServiceKindConnectProxy && svc.Proxy != nil &&
 			strings.EqualFold(svc.Proxy.DestinationServiceID, sidecarFor) {
-			matched = append(matched, svc)
-			matchedProxyIDs = append(matchedProxyIDs, svc.ID)
+			proxyIDs = append(proxyIDs, svc.ID)
 		}
 	}
 
-	if len(matched) == 0 {
-		return nil, fmt.Errorf("No sidecar proxy registered for %s", sidecarFor)
+	if len(proxyIDs) == 0 {
+		return "", fmt.Errorf("No sidecar proxy registered for %s", sidecarFor)
 	}
-	if len(matched) > 1 {
-		return nil, fmt.Errorf("More than one sidecar proxy registered for %s.\n"+
+	if len(proxyIDs) > 1 {
+		return "", fmt.Errorf("More than one sidecar proxy registered for %s.\n"+
 			"    Start proxy with -proxy-id and one of the following IDs: %s",
-			sidecarFor, strings.Join(matchedProxyIDs, ", "))
+			sidecarFor, strings.Join(proxyIDs, ", "))
 	}
-	return matched[0], nil
+	return proxyIDs[0], nil
 }
 
 // LookupGatewayProxy finds the gateway service registered with the local
@@ -287,11 +282,10 @@ func (c *cmd) configWatcher(client *api.Client) (proxyImpl.ConfigWatcher, error)
 		// Running as a sidecar, we need to find the proxy-id for the requested
 		// service
 		var err error
-		svc, err := c.lookupServiceForSidecar(client)
+		c.proxyID, err = c.lookupProxyIDForSidecar(client)
 		if err != nil {
 			return nil, err
 		}
-		c.proxyID = svc.ID
 
 		c.UI.Info("Configuration mode: Agent API")
 		c.UI.Info(fmt.Sprintf("    Sidecar for ID: %s", c.sidecarFor))
diff --git a/command/connect/proxy/proxy_test.go b/command/connect/proxy/proxy_test.go
index f17b04f5f8e88..28d5a9da212b1 100644
--- a/command/connect/proxy/proxy_test.go
+++ b/command/connect/proxy/proxy_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/command/connect/proxy/register.go b/command/connect/proxy/register.go
index 87d6dbb9a2d32..62110d9e3ae08 100644
--- a/command/connect/proxy/register.go
+++ b/command/connect/proxy/register.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/command/connect/proxy/register_test.go b/command/connect/proxy/register_test.go
index 823b11d23c1b2..159bafc9b5ac8 100644
--- a/command/connect/proxy/register_test.go
+++ b/command/connect/proxy/register_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/command/connect/redirecttraffic/redirect_traffic.go b/command/connect/redirecttraffic/redirect_traffic.go
index 8a597696b7f08..8b979251fe786 100644
--- a/command/connect/redirecttraffic/redirect_traffic.go
+++ b/command/connect/redirecttraffic/redirect_traffic.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package redirecttraffic
 
 import (
diff --git a/command/connect/redirecttraffic/redirect_traffic_test.go b/command/connect/redirecttraffic/redirect_traffic_test.go
index de9b362416c2d..f592d4c739dea 100644
--- a/command/connect/redirecttraffic/redirect_traffic_test.go
+++ b/command/connect/redirecttraffic/redirect_traffic_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package redirecttraffic
 
 import (
diff --git a/command/debug/debug.go b/command/debug/debug.go
index 9fe18280b8206..4aa2eaaaf0519 100644
--- a/command/debug/debug.go
+++ b/command/debug/debug.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package debug
 
 import (
diff --git a/command/debug/debug_test.go b/command/debug/debug_test.go
index c05d115873f06..629236c823511 100644
--- a/command/debug/debug_test.go
+++ b/command/debug/debug_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package debug
 
 import (
diff --git a/command/event/event.go b/command/event/event.go
index 73c19b6c5f776..0b12f72fcb12a 100644
--- a/command/event/event.go
+++ b/command/event/event.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package event
 
 import (
diff --git a/command/event/event_test.go b/command/event/event_test.go
index 349cb0daa8167..ba645396af32e 100644
--- a/command/event/event_test.go
+++ b/command/event/event_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package event
 
 import (
diff --git a/command/exec/exec.go b/command/exec/exec.go
index 53026a6f8c877..cac2effb65a77 100644
--- a/command/exec/exec.go
+++ b/command/exec/exec.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package exec
 
 import (
diff --git a/command/exec/exec_test.go b/command/exec/exec_test.go
index d8335160f28a4..4c97a029aaa39 100644
--- a/command/exec/exec_test.go
+++ b/command/exec/exec_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package exec
 
 import (
diff --git a/command/flags/config.go b/command/flags/config.go
index 39c615554d676..be8f914364ab3 100644
--- a/command/flags/config.go
+++ b/command/flags/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package flags
 
 import (
diff --git a/command/flags/config_test.go b/command/flags/config_test.go
index 1a6d69ca4b574..209b416e4a40f 100644
--- a/command/flags/config_test.go
+++ b/command/flags/config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package flags
 
 import (
diff --git a/command/flags/flag_map_value.go b/command/flags/flag_map_value.go
index af5fec436dd57..8a8c3b6bd9c42 100644
--- a/command/flags/flag_map_value.go
+++ b/command/flags/flag_map_value.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package flags
 
 import (
diff --git a/command/flags/flag_map_value_test.go b/command/flags/flag_map_value_test.go
index d04342a01b34d..4348d17961f2c 100644
--- a/command/flags/flag_map_value_test.go
+++ b/command/flags/flag_map_value_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package flags
 
 import (
diff --git a/command/flags/flag_slice_value.go b/command/flags/flag_slice_value.go
index 58428e58ce9cc..a40fd1838ec39 100644
--- a/command/flags/flag_slice_value.go
+++ b/command/flags/flag_slice_value.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package flags
 
 import "strings"
diff --git a/command/flags/flag_slice_value_test.go b/command/flags/flag_slice_value_test.go
index 24187f3f41835..82dff4c377dc3 100644
--- a/command/flags/flag_slice_value_test.go
+++ b/command/flags/flag_slice_value_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package flags
 
 import (
diff --git a/command/flags/http.go b/command/flags/http.go
index 009c26629c1d9..b4a2a9038c163 100644
--- a/command/flags/http.go
+++ b/command/flags/http.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package flags
 
 import (
@@ -29,7 +26,6 @@ type HTTPFlags struct {
 	// multi-tenancy flags
 	namespace StringValue
 	partition StringValue
-	peer      StringValue
 }
 
 func (f *HTTPFlags) ClientFlags() *flag.FlagSet {
@@ -102,18 +98,10 @@ func (f *HTTPFlags) Datacenter() string {
 	return f.datacenter.String()
 }
 
-func (f *HTTPFlags) Namespace() string {
-	return f.namespace.String()
-}
-
 func (f *HTTPFlags) Partition() string {
 	return f.partition.String()
 }
 
-func (f *HTTPFlags) PeerName() string {
-	return f.peer.String()
-}
-
 func (f *HTTPFlags) Stale() bool {
 	if f.stale.v == nil {
 		return false
@@ -179,9 +167,3 @@ func (f *HTTPFlags) AddPartitionFlag(fs *flag.FlagSet) {
 			"from the request's ACL token, or will default to the `default` admin partition. "+
 			"Admin Partitions are a Consul Enterprise feature.")
 }
-
-func (f *HTTPFlags) AddPeerName() *flag.FlagSet {
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	fs.Var(&f.peer, "peer", "Specifies the name of peer to query. By default, it is `local`.")
-	return fs
-}
diff --git a/command/flags/http_test.go b/command/flags/http_test.go
index f8b48f80cbabc..a144ebabd6b67 100644
--- a/command/flags/http_test.go
+++ b/command/flags/http_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package flags
 
 import (
diff --git a/command/flags/merge.go b/command/flags/merge.go
index 251698e320fcf..86b6c774c9296 100644
--- a/command/flags/merge.go
+++ b/command/flags/merge.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package flags
 
 import "flag"
diff --git a/command/flags/usage.go b/command/flags/usage.go
index 3583620bd9f65..646665947b9cd 100644
--- a/command/flags/usage.go
+++ b/command/flags/usage.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package flags
 
 import (
diff --git a/command/forceleave/forceleave.go b/command/forceleave/forceleave.go
index 2c9e2ceb1def8..513c175567027 100644
--- a/command/forceleave/forceleave.go
+++ b/command/forceleave/forceleave.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package forceleave
 
 import (
diff --git a/command/forceleave/forceleave_test.go b/command/forceleave/forceleave_test.go
index 05d490777575c..f69059ca05f47 100644
--- a/command/forceleave/forceleave_test.go
+++ b/command/forceleave/forceleave_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package forceleave
 
 import (
diff --git a/command/helpers/decode_shim.go b/command/helpers/decode_shim.go
index d2a73895a57fb..b9153dc180063 100644
--- a/command/helpers/decode_shim.go
+++ b/command/helpers/decode_shim.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package helpers
 
 import (
diff --git a/command/helpers/helpers.go b/command/helpers/helpers.go
index e4b95fff37e82..493c9ff4ab048 100644
--- a/command/helpers/helpers.go
+++ b/command/helpers/helpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package helpers
 
 import (
@@ -8,17 +5,15 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"strings"
 	"time"
 
-	"github.com/mitchellh/mapstructure"
-
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/lib/decode"
 	"github.com/hashicorp/go-multierror"
+	"github.com/mitchellh/mapstructure"
 )
 
-func LoadFromFile(path string) (string, error) {
+func loadFromFile(path string) (string, error) {
 	data, err := os.ReadFile(path)
 	if err != nil {
 		return "", fmt.Errorf("Failed to read file: %v", err)
@@ -47,7 +42,7 @@ func LoadDataSource(data string, testStdin io.Reader) (string, error) {
 
 	switch data[0] {
 	case '@':
-		return LoadFromFile(data[1:])
+		return loadFromFile(data[1:])
 	case '-':
 		if len(data) > 1 {
 			return data, nil
@@ -67,7 +62,7 @@ func LoadDataSourceNoRaw(data string, testStdin io.Reader) (string, error) {
 		return loadFromStdin(testStdin)
 	}
 
-	return LoadFromFile(data)
+	return loadFromFile(data)
 }
 
 func ParseConfigEntry(data string) (api.ConfigEntry, error) {
@@ -126,19 +121,13 @@ func newDecodeConfigEntry(raw map[string]interface{}) (api.ConfigEntry, error) {
 	}
 
 	for _, k := range md.Unused {
-		switch {
-		case strings.ToLower(k) == "kind":
+		switch k {
+		case "kind", "Kind":
 			// The kind field is used to determine the target, but doesn't need
 			// to exist on the target.
 			continue
-
-		case strings.HasSuffix(strings.ToLower(k), "namespace"):
-			err = multierror.Append(err, fmt.Errorf("invalid config key %q, namespaces are a consul enterprise feature", k))
-		case strings.Contains(strings.ToLower(k), "jwt"):
-			err = multierror.Append(err, fmt.Errorf("invalid config key %q, api-gateway jwt validation is a consul enterprise feature", k))
-		default:
-			err = multierror.Append(err, fmt.Errorf("invalid config key %q", k))
 		}
+		err = multierror.Append(err, fmt.Errorf("invalid config key %q", k))
 	}
 	if err != nil {
 		return nil, err
diff --git a/command/helpers/helpers_test.go b/command/helpers/helpers_test.go
index 6479386747bac..e9fbeb071a19b 100644
--- a/command/helpers/helpers_test.go
+++ b/command/helpers/helpers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package helpers
 
 import (
diff --git a/command/info/info.go b/command/info/info.go
index 5bbad23eabbed..b8b3900c839fd 100644
--- a/command/info/info.go
+++ b/command/info/info.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package info
 
 import (
diff --git a/command/info/info_test.go b/command/info/info_test.go
index 0faac3acc660e..f1ba8cd418c6c 100644
--- a/command/info/info_test.go
+++ b/command/info/info_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package info
 
 import (
diff --git a/command/intention/check/check.go b/command/intention/check/check.go
index dce63c75bc068..18e4df76f7f66 100644
--- a/command/intention/check/check.go
+++ b/command/intention/check/check.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package check
 
 import (
diff --git a/command/intention/check/check_test.go b/command/intention/check/check_test.go
index 666d44d80c552..729e913548415 100644
--- a/command/intention/check/check_test.go
+++ b/command/intention/check/check_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package check
 
 import (
diff --git a/command/intention/create/create.go b/command/intention/create/create.go
index df92dfe302a2e..a890a09746444 100644
--- a/command/intention/create/create.go
+++ b/command/intention/create/create.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package create
 
 import (
diff --git a/command/intention/create/create_test.go b/command/intention/create/create_test.go
index 90250368ef2b8..932dcbd88f54a 100644
--- a/command/intention/create/create_test.go
+++ b/command/intention/create/create_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package create
 
 import (
diff --git a/command/intention/delete/delete.go b/command/intention/delete/delete.go
index a58ee163e6875..3f5a3d394ee00 100644
--- a/command/intention/delete/delete.go
+++ b/command/intention/delete/delete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package delete
 
 import (
diff --git a/command/intention/delete/delete_test.go b/command/intention/delete/delete_test.go
index 51e59c8b52db1..64758d9890588 100644
--- a/command/intention/delete/delete_test.go
+++ b/command/intention/delete/delete_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package delete
 
 import (
diff --git a/command/intention/format.go b/command/intention/format.go
index bd202cfa5081c..6e2146a9d7c4b 100644
--- a/command/intention/format.go
+++ b/command/intention/format.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package intention
 
 import (
diff --git a/command/intention/get/get.go b/command/intention/get/get.go
index 64dd2c8441c4d..5672684824080 100644
--- a/command/intention/get/get.go
+++ b/command/intention/get/get.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package get
 
 import (
diff --git a/command/intention/get/get_test.go b/command/intention/get/get_test.go
index 7559a3611849d..2b06855f783e5 100644
--- a/command/intention/get/get_test.go
+++ b/command/intention/get/get_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package get
 
 import (
diff --git a/command/intention/helpers.go b/command/intention/helpers.go
index abc7c21e73a14..c1d3a15b0b6d2 100644
--- a/command/intention/helpers.go
+++ b/command/intention/helpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package intention
 
 import (
diff --git a/command/intention/helpers_test.go b/command/intention/helpers_test.go
index cd2db64c69113..50dc88b9bc51a 100644
--- a/command/intention/helpers_test.go
+++ b/command/intention/helpers_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package intention
 
 import (
diff --git a/command/intention/intention.go b/command/intention/intention.go
index 77ba5e2f5eae8..44cc7db42deb1 100644
--- a/command/intention/intention.go
+++ b/command/intention/intention.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package intention
 
 import (
diff --git a/command/intention/intention_test.go b/command/intention/intention_test.go
index 3a728fc028f9d..e697f537fd424 100644
--- a/command/intention/intention_test.go
+++ b/command/intention/intention_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package intention
 
 import (
diff --git a/command/intention/list/intention_list.go b/command/intention/list/intention_list.go
index 408f9d8dcd09d..fc0e0f98dcd4d 100644
--- a/command/intention/list/intention_list.go
+++ b/command/intention/list/intention_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package list
 
 import (
diff --git a/command/intention/list/intention_list_test.go b/command/intention/list/intention_list_test.go
index ccd6faefe3c10..e96c78c9e6227 100644
--- a/command/intention/list/intention_list_test.go
+++ b/command/intention/list/intention_list_test.go
@@ -1,18 +1,14 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package list
 
 import (
 	"strings"
 	"testing"
 
-	"github.com/mitchellh/cli"
-	"github.com/stretchr/testify/require"
-
 	"github.com/hashicorp/consul/agent"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
+	"github.com/mitchellh/cli"
+	"github.com/stretchr/testify/require"
 )
 
 func TestIntentionListCommand_noTabs(t *testing.T) {
diff --git a/command/intention/match/match.go b/command/intention/match/match.go
index ee115a7b1ad86..8678d708ade4e 100644
--- a/command/intention/match/match.go
+++ b/command/intention/match/match.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package match
 
 import (
diff --git a/command/intention/match/match_test.go b/command/intention/match/match_test.go
index 6715c7eba8d3a..1c91bfd33d061 100644
--- a/command/intention/match/match_test.go
+++ b/command/intention/match/match_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package match
 
 import (
diff --git a/command/join/join.go b/command/join/join.go
index f5d041ed4b4d9..5e94adcd1d78c 100644
--- a/command/join/join.go
+++ b/command/join/join.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package join
 
 import (
diff --git a/command/join/join_test.go b/command/join/join_test.go
index 828cb46b6e318..48b89b32ea094 100644
--- a/command/join/join_test.go
+++ b/command/join/join_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package join
 
 import (
diff --git a/command/keygen/keygen.go b/command/keygen/keygen.go
index e2907bda0c0d2..b232dd62bdd66 100644
--- a/command/keygen/keygen.go
+++ b/command/keygen/keygen.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package keygen
 
 import (
diff --git a/command/keygen/keygen_test.go b/command/keygen/keygen_test.go
index 59edb12896bd6..288334496e2c8 100644
--- a/command/keygen/keygen_test.go
+++ b/command/keygen/keygen_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package keygen
 
 import (
diff --git a/command/keyring/keyring.go b/command/keyring/keyring.go
index 0e4756f6191f7..b2f418c82b0fe 100644
--- a/command/keyring/keyring.go
+++ b/command/keyring/keyring.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package keyring
 
 import (
diff --git a/command/keyring/keyring_test.go b/command/keyring/keyring_test.go
index 68c5e7f982196..166129fe00fd0 100644
--- a/command/keyring/keyring_test.go
+++ b/command/keyring/keyring_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package keyring
 
 import (
diff --git a/command/kv/del/kv_delete.go b/command/kv/del/kv_delete.go
index e58e4a229661f..f46691045b58b 100644
--- a/command/kv/del/kv_delete.go
+++ b/command/kv/del/kv_delete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package del
 
 import (
diff --git a/command/kv/del/kv_delete_test.go b/command/kv/del/kv_delete_test.go
index 254fb4aa5097e..c85c651a1860d 100644
--- a/command/kv/del/kv_delete_test.go
+++ b/command/kv/del/kv_delete_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package del
 
 import (
diff --git a/command/kv/exp/kv_export.go b/command/kv/exp/kv_export.go
index 2f2e835bd42d7..84f87f637db9f 100644
--- a/command/kv/exp/kv_export.go
+++ b/command/kv/exp/kv_export.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package exp
 
 import (
diff --git a/command/kv/exp/kv_export_test.go b/command/kv/exp/kv_export_test.go
index 76da13dcd4e6d..8944be83633c1 100644
--- a/command/kv/exp/kv_export_test.go
+++ b/command/kv/exp/kv_export_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package exp
 
 import (
diff --git a/command/kv/get/kv_get.go b/command/kv/get/kv_get.go
index 4abf0251751e4..aa93ef963b26b 100644
--- a/command/kv/get/kv_get.go
+++ b/command/kv/get/kv_get.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package get
 
 import (
diff --git a/command/kv/get/kv_get_test.go b/command/kv/get/kv_get_test.go
index 56318586de439..5143391ef0355 100644
--- a/command/kv/get/kv_get_test.go
+++ b/command/kv/get/kv_get_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package get
 
 import (
diff --git a/command/kv/imp/kv_import.go b/command/kv/imp/kv_import.go
index 1d91d281df846..0d8570dd60c54 100644
--- a/command/kv/imp/kv_import.go
+++ b/command/kv/imp/kv_import.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package imp
 
 import (
diff --git a/command/kv/imp/kv_import_test.go b/command/kv/imp/kv_import_test.go
index 6bed5684cebdf..3be9d541822bd 100644
--- a/command/kv/imp/kv_import_test.go
+++ b/command/kv/imp/kv_import_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package imp
 
 import (
diff --git a/command/kv/impexp/kvimpexp.go b/command/kv/impexp/kvimpexp.go
index 0dc4b394e0687..4f4c7e87e10bb 100644
--- a/command/kv/impexp/kvimpexp.go
+++ b/command/kv/impexp/kvimpexp.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package impexp
 
 import (
diff --git a/command/kv/kv.go b/command/kv/kv.go
index 86d8c258e058a..1a5d6a3452b2f 100644
--- a/command/kv/kv.go
+++ b/command/kv/kv.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package kv
 
 import (
diff --git a/command/kv/kv_test.go b/command/kv/kv_test.go
index 85195ee9acbac..8a9bc25dfb8a2 100644
--- a/command/kv/kv_test.go
+++ b/command/kv/kv_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package kv
 
 import (
diff --git a/command/kv/put/kv_put.go b/command/kv/put/kv_put.go
index 5f0580ce1431c..57df7c1c9b884 100644
--- a/command/kv/put/kv_put.go
+++ b/command/kv/put/kv_put.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package put
 
 import (
diff --git a/command/kv/put/kv_put_test.go b/command/kv/put/kv_put_test.go
index 1f0245c8e0f21..f0bee0cda155a 100644
--- a/command/kv/put/kv_put_test.go
+++ b/command/kv/put/kv_put_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package put
 
 import (
diff --git a/command/leave/leave.go b/command/leave/leave.go
index 8d997fb83c8dd..7653d717b7a36 100644
--- a/command/leave/leave.go
+++ b/command/leave/leave.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package leave
 
 import (
diff --git a/command/leave/leave_test.go b/command/leave/leave_test.go
index 317a6862b91ec..4cc82b57db96e 100644
--- a/command/leave/leave_test.go
+++ b/command/leave/leave_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package leave
 
 import (
diff --git a/command/lock/lock.go b/command/lock/lock.go
index a662babe041ff..dbf06d1d8b5c7 100644
--- a/command/lock/lock.go
+++ b/command/lock/lock.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lock
 
 import (
diff --git a/command/lock/lock_test.go b/command/lock/lock_test.go
index f32de5bc5e463..e9a03fc8809bd 100644
--- a/command/lock/lock_test.go
+++ b/command/lock/lock_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lock
 
 import (
diff --git a/command/lock/util_unix.go b/command/lock/util_unix.go
index de864f0b358aa..cc6902ff5ca71 100644
--- a/command/lock/util_unix.go
+++ b/command/lock/util_unix.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !windows
+// +build !windows
 
 package lock
 
diff --git a/command/lock/util_windows.go b/command/lock/util_windows.go
index 33a531c3618d4..14547e345b2c6 100644
--- a/command/lock/util_windows.go
+++ b/command/lock/util_windows.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build windows
+// +build windows
 
 package lock
 
diff --git a/command/login/aws.go b/command/login/aws.go
index e7fb6af58eeff..c0d2212dc7d1d 100644
--- a/command/login/aws.go
+++ b/command/login/aws.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package login
 
 import (
diff --git a/command/login/login.go b/command/login/login.go
index 0ab5237852929..e4209eeda4afd 100644
--- a/command/login/login.go
+++ b/command/login/login.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package login
 
 import (
diff --git a/command/login/login_ce.go b/command/login/login_ce.go
index 1ae2455a488a3..22466d56f2d9b 100644
--- a/command/login/login_ce.go
+++ b/command/login/login_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package login
 
diff --git a/command/login/login_test.go b/command/login/login_test.go
index c3bf117676178..e7297ffe5102e 100644
--- a/command/login/login_test.go
+++ b/command/login/login_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package login
 
 import (
diff --git a/command/logout/logout.go b/command/logout/logout.go
index 35365f4469547..8edd8fd5fcfb8 100644
--- a/command/logout/logout.go
+++ b/command/logout/logout.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logout
 
 import (
diff --git a/command/logout/logout_test.go b/command/logout/logout_test.go
index 7228def746b88..4ec8bf1d20858 100644
--- a/command/logout/logout_test.go
+++ b/command/logout/logout_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logout
 
 import (
diff --git a/command/maint/maint.go b/command/maint/maint.go
index 252aa1de46a73..fa11ca63de890 100644
--- a/command/maint/maint.go
+++ b/command/maint/maint.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package maint
 
 import (
diff --git a/command/maint/maint_test.go b/command/maint/maint_test.go
index eabd173a623f9..9e538eba9399d 100644
--- a/command/maint/maint_test.go
+++ b/command/maint/maint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package maint
 
 import (
diff --git a/command/members/members.go b/command/members/members.go
index 7b10612643b08..76af710b9088e 100644
--- a/command/members/members.go
+++ b/command/members/members.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package members
 
 import (
diff --git a/command/members/members_test.go b/command/members/members_test.go
index 76e3bbe1260d2..c9a2d42b77d6d 100644
--- a/command/members/members_test.go
+++ b/command/members/members_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package members
 
 import (
diff --git a/command/monitor/monitor.go b/command/monitor/monitor.go
index e1d0e8597d502..bd98012969b50 100644
--- a/command/monitor/monitor.go
+++ b/command/monitor/monitor.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package monitor
 
 import (
diff --git a/command/monitor/monitor_test.go b/command/monitor/monitor_test.go
index e9eacdda4caf6..167d50c44ec17 100644
--- a/command/monitor/monitor_test.go
+++ b/command/monitor/monitor_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package monitor
 
 import (
diff --git a/command/operator/autopilot/get/operator_autopilot_get.go b/command/operator/autopilot/get/operator_autopilot_get.go
index 5cc2dc351e34a..d8943d84edbc1 100644
--- a/command/operator/autopilot/get/operator_autopilot_get.go
+++ b/command/operator/autopilot/get/operator_autopilot_get.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package get
 
 import (
diff --git a/command/operator/autopilot/get/operator_autopilot_get_test.go b/command/operator/autopilot/get/operator_autopilot_get_test.go
index 264706ea24452..6bde185d7bd03 100644
--- a/command/operator/autopilot/get/operator_autopilot_get_test.go
+++ b/command/operator/autopilot/get/operator_autopilot_get_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package get
 
 import (
diff --git a/command/operator/autopilot/operator_autopilot.go b/command/operator/autopilot/operator_autopilot.go
index d1de582fbecf9..53a239a954c9b 100644
--- a/command/operator/autopilot/operator_autopilot.go
+++ b/command/operator/autopilot/operator_autopilot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autopilot
 
 import (
diff --git a/command/operator/autopilot/operator_autopilot_test.go b/command/operator/autopilot/operator_autopilot_test.go
index 9861749b172a4..e82008dcd6086 100644
--- a/command/operator/autopilot/operator_autopilot_test.go
+++ b/command/operator/autopilot/operator_autopilot_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package autopilot
 
 import (
diff --git a/command/operator/autopilot/set/operator_autopilot_set.go b/command/operator/autopilot/set/operator_autopilot_set.go
index 6a8dd5fec9ae7..b6f0041ab3eb4 100644
--- a/command/operator/autopilot/set/operator_autopilot_set.go
+++ b/command/operator/autopilot/set/operator_autopilot_set.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package set
 
 import (
diff --git a/command/operator/autopilot/set/operator_autopilot_set_test.go b/command/operator/autopilot/set/operator_autopilot_set_test.go
index b92e7ef4b4fd8..21963216fe174 100644
--- a/command/operator/autopilot/set/operator_autopilot_set_test.go
+++ b/command/operator/autopilot/set/operator_autopilot_set_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package set
 
 import (
diff --git a/command/operator/autopilot/state/formatter.go b/command/operator/autopilot/state/formatter.go
index 11cec09c6a160..cebc9e30d80eb 100644
--- a/command/operator/autopilot/state/formatter.go
+++ b/command/operator/autopilot/state/formatter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/command/operator/autopilot/state/operator_autopilot_state.go b/command/operator/autopilot/state/operator_autopilot_state.go
index be85fdb3ccf18..cf4aebd747b7a 100644
--- a/command/operator/autopilot/state/operator_autopilot_state.go
+++ b/command/operator/autopilot/state/operator_autopilot_state.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/command/operator/autopilot/state/operator_autopilot_state_test.go b/command/operator/autopilot/state/operator_autopilot_state_test.go
index adc4b65933b1f..6462bccbb3930 100644
--- a/command/operator/autopilot/state/operator_autopilot_state_test.go
+++ b/command/operator/autopilot/state/operator_autopilot_state_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package state
 
 import (
diff --git a/command/operator/operator.go b/command/operator/operator.go
index 06c8c7622e487..d56881eee5cb0 100644
--- a/command/operator/operator.go
+++ b/command/operator/operator.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package operator
 
 import (
diff --git a/command/operator/operator_test.go b/command/operator/operator_test.go
index d25f4fc4f8d38..f980e86096d84 100644
--- a/command/operator/operator_test.go
+++ b/command/operator/operator_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package operator
 
 import (
diff --git a/command/operator/raft/listpeers/operator_raft_list.go b/command/operator/raft/listpeers/operator_raft_list.go
index abe682c103715..a54ccb9d3ea27 100644
--- a/command/operator/raft/listpeers/operator_raft_list.go
+++ b/command/operator/raft/listpeers/operator_raft_list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package listpeers
 
 import (
diff --git a/command/operator/raft/listpeers/operator_raft_list_test.go b/command/operator/raft/listpeers/operator_raft_list_test.go
index c29ed9d418e9c..c40ae8c48d7b8 100644
--- a/command/operator/raft/listpeers/operator_raft_list_test.go
+++ b/command/operator/raft/listpeers/operator_raft_list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package listpeers
 
 import (
diff --git a/command/operator/raft/operator_raft.go b/command/operator/raft/operator_raft.go
index 52bcb446f9b10..f3cedbc567ecd 100644
--- a/command/operator/raft/operator_raft.go
+++ b/command/operator/raft/operator_raft.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package raft
 
 import (
diff --git a/command/operator/raft/operator_raft_test.go b/command/operator/raft/operator_raft_test.go
index cac0545fa511e..2ede9936efe4d 100644
--- a/command/operator/raft/operator_raft_test.go
+++ b/command/operator/raft/operator_raft_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package raft
 
 import (
diff --git a/command/operator/raft/removepeer/operator_raft_remove.go b/command/operator/raft/removepeer/operator_raft_remove.go
index 12692d4d5225f..7fcbc44a81387 100644
--- a/command/operator/raft/removepeer/operator_raft_remove.go
+++ b/command/operator/raft/removepeer/operator_raft_remove.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package removepeer
 
 import (
diff --git a/command/operator/raft/removepeer/operator_raft_remove_test.go b/command/operator/raft/removepeer/operator_raft_remove_test.go
index e7647712647d8..b3390777140c1 100644
--- a/command/operator/raft/removepeer/operator_raft_remove_test.go
+++ b/command/operator/raft/removepeer/operator_raft_remove_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package removepeer
 
 import (
diff --git a/command/operator/raft/transferleader/transfer_leader.go b/command/operator/raft/transferleader/transfer_leader.go
index c7694b65a6ed9..31f8e208a0140 100644
--- a/command/operator/raft/transferleader/transfer_leader.go
+++ b/command/operator/raft/transferleader/transfer_leader.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package transferleader
 
 import (
@@ -53,7 +50,7 @@ func (c *cmd) Run(args []string) int {
 	}
 
 	// Fetch the current configuration.
-	result, err := raftTransferLeader(client, c.http.Stale(), c.id)
+	result, err := raftTransferLeader(client, c.http.Stale())
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error transfering leadership: %v", err))
 		return 1
@@ -63,11 +60,11 @@ func (c *cmd) Run(args []string) int {
 	return 0
 }
 
-func raftTransferLeader(client *api.Client, stale bool, id string) (string, error) {
+func raftTransferLeader(client *api.Client, stale bool) (string, error) {
 	q := &api.QueryOptions{
 		AllowStale: stale,
 	}
-	reply, err := client.Operator().RaftLeaderTransfer(id, q)
+	reply, err := client.Operator().RaftLeaderTransfer(q)
 	if err != nil {
 		return "", fmt.Errorf("Failed to transfer leadership %w", err)
 	}
diff --git a/command/operator/raft/transferleader/transfer_leader_test.go b/command/operator/raft/transferleader/transfer_leader_test.go
index 2b56fe1d784f6..b5979711989ad 100644
--- a/command/operator/raft/transferleader/transfer_leader_test.go
+++ b/command/operator/raft/transferleader/transfer_leader_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package transferleader
 
 import (
diff --git a/command/operator/usage/instances/usage_instances.go b/command/operator/usage/instances/usage_instances.go
index 4926f85ead9c3..c1c94caa69ba1 100644
--- a/command/operator/usage/instances/usage_instances.go
+++ b/command/operator/usage/instances/usage_instances.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package instances
 
 import (
@@ -11,11 +8,9 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/mitchellh/cli"
-	"golang.org/x/exp/maps"
-
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/command/flags"
+	"github.com/mitchellh/cli"
 )
 
 func New(ui cli.Ui) *cmd {
@@ -101,14 +96,6 @@ func (c *cmd) Run(args []string) int {
 			return 1
 		}
 		c.UI.Output(billableOutput + "\n")
-
-		c.UI.Output("\nNodes")
-		nodesOutput, err := formatNodesCounts(usage.Usage)
-		if err != nil {
-			c.UI.Error(err.Error())
-			return 1
-		}
-		c.UI.Output(nodesOutput + "\n\n")
 	}
 
 	// Output Connect service counts
@@ -125,36 +112,6 @@ func (c *cmd) Run(args []string) int {
 	return 0
 }
 
-func formatNodesCounts(usageStats map[string]api.ServiceUsage) (string, error) {
-	var output bytes.Buffer
-	tw := tabwriter.NewWriter(&output, 0, 2, 6, ' ', 0)
-
-	nodesTotal := 0
-
-	fmt.Fprintf(tw, "Datacenter\t")
-
-	fmt.Fprintf(tw, "Count\t")
-
-	fmt.Fprint(tw, "\t\n")
-
-	nodes := maps.Keys(usageStats)
-	sort.Strings(nodes)
-	for _, dc := range nodes {
-		nodesTotal += usageStats[dc].Nodes
-		fmt.Fprintf(tw, "%s\t%d\n", dc, usageStats[dc].Nodes)
-	}
-
-	fmt.Fprint(tw, "\t\n")
-	fmt.Fprintf(tw, "Total")
-
-	fmt.Fprintf(tw, "\t%d", nodesTotal)
-
-	if err := tw.Flush(); err != nil {
-		return "", fmt.Errorf("Error flushing tabwriter: %s", err)
-	}
-	return strings.TrimSpace(output.String()), nil
-}
-
 func formatServiceCounts(usageStats map[string]api.ServiceUsage, billable, showDatacenter bool) (string, error) {
 	var output bytes.Buffer
 	tw := tabwriter.NewWriter(&output, 0, 2, 6, ' ', 0)
diff --git a/command/operator/usage/instances/usage_instances_ce.go b/command/operator/usage/instances/usage_instances_ce.go
index 149131ecb3c59..a6845630d6c65 100644
--- a/command/operator/usage/instances/usage_instances_ce.go
+++ b/command/operator/usage/instances/usage_instances_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package instances
 
diff --git a/command/operator/usage/instances/usage_instances_ce_test.go b/command/operator/usage/instances/usage_instances_ce_test.go
index c7d50568a1a2a..01a6e5e57ac4f 100644
--- a/command/operator/usage/instances/usage_instances_ce_test.go
+++ b/command/operator/usage/instances/usage_instances_ce_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package instances
 
@@ -116,54 +114,3 @@ Total                                    45`,
 		})
 	}
 }
-
-func TestUsageInstances_formatNodesCounts(t *testing.T) {
-	usageBasic := map[string]api.ServiceUsage{
-		"dc1": {
-			Nodes: 10,
-		},
-	}
-
-	usageMultiDC := map[string]api.ServiceUsage{
-		"dc1": {
-			Nodes: 10,
-		},
-		"dc2": {
-			Nodes: 11,
-		},
-	}
-
-	cases := []struct {
-		name          string
-		usageStats    map[string]api.ServiceUsage
-		expectedNodes string
-	}{
-		{
-			name:       "basic",
-			usageStats: usageBasic,
-			expectedNodes: `
-Datacenter      Count            
-dc1             10
-                
-Total           10`,
-		},
-		{
-			name:       "multi-datacenter",
-			usageStats: usageMultiDC,
-			expectedNodes: `
-Datacenter      Count            
-dc1             10
-dc2             11
-                
-Total           21`,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			nodesOutput, err := formatNodesCounts(tc.usageStats)
-			require.NoError(t, err)
-			require.Equal(t, strings.TrimSpace(tc.expectedNodes), nodesOutput)
-		})
-	}
-}
diff --git a/command/operator/usage/instances/usage_instances_test.go b/command/operator/usage/instances/usage_instances_test.go
index 7dac04dd3e323..0f41b79aa0b82 100644
--- a/command/operator/usage/instances/usage_instances_test.go
+++ b/command/operator/usage/instances/usage_instances_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package instances
 
 import (
diff --git a/command/operator/usage/usage.go b/command/operator/usage/usage.go
index 6e7cde57e4bf5..ae0d01dbc6edc 100644
--- a/command/operator/usage/usage.go
+++ b/command/operator/usage/usage.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package usage
 
 import (
diff --git a/command/peering/delete/delete.go b/command/peering/delete/delete.go
index 039ace5391884..cb98189006211 100644
--- a/command/peering/delete/delete.go
+++ b/command/peering/delete/delete.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package delete
 
 import (
diff --git a/command/peering/delete/delete_test.go b/command/peering/delete/delete_test.go
index 5aa299b78d52a..984e773f5738b 100644
--- a/command/peering/delete/delete_test.go
+++ b/command/peering/delete/delete_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package delete
 
 import (
diff --git a/command/peering/establish/establish.go b/command/peering/establish/establish.go
index 42178f149040d..14cd0e310e761 100644
--- a/command/peering/establish/establish.go
+++ b/command/peering/establish/establish.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package establish
 
 import (
diff --git a/command/peering/establish/establish_test.go b/command/peering/establish/establish_test.go
index 25abae316bc43..f24ac2a265a52 100644
--- a/command/peering/establish/establish_test.go
+++ b/command/peering/establish/establish_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package establish
 
 import (
diff --git a/command/peering/generate/generate.go b/command/peering/generate/generate.go
index e2122aa7aa095..5753b9b79e79b 100644
--- a/command/peering/generate/generate.go
+++ b/command/peering/generate/generate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package generate
 
 import (
diff --git a/command/peering/generate/generate_test.go b/command/peering/generate/generate_test.go
index 863b266ed15e2..b23d664d84f3e 100644
--- a/command/peering/generate/generate_test.go
+++ b/command/peering/generate/generate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package generate
 
 import (
diff --git a/command/peering/list/list.go b/command/peering/list/list.go
index 10e85d9b582f4..8cdeea7a98368 100644
--- a/command/peering/list/list.go
+++ b/command/peering/list/list.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package list
 
 import (
diff --git a/command/peering/list/list_test.go b/command/peering/list/list_test.go
index 43da9684728e0..c015fc8e86bf2 100644
--- a/command/peering/list/list_test.go
+++ b/command/peering/list/list_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package list
 
 import (
diff --git a/command/peering/peering.go b/command/peering/peering.go
index 157dd42c63d71..1872f37387e0f 100644
--- a/command/peering/peering.go
+++ b/command/peering/peering.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peering
 
 import (
diff --git a/command/peering/read/read.go b/command/peering/read/read.go
index 8d15210fcfaa9..cef63e4fd3a39 100644
--- a/command/peering/read/read.go
+++ b/command/peering/read/read.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package read
 
 import (
diff --git a/command/peering/read/read_test.go b/command/peering/read/read_test.go
index 90a2ac879244e..aac0e9e2f1cc5 100644
--- a/command/peering/read/read_test.go
+++ b/command/peering/read/read_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package read
 
 import (
diff --git a/command/registry.go b/command/registry.go
index 559189b6f9885..8def9aca96e08 100644
--- a/command/registry.go
+++ b/command/registry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package command
 
 import (
@@ -36,10 +33,6 @@ import (
 	aclrlist "github.com/hashicorp/consul/command/acl/role/list"
 	aclrread "github.com/hashicorp/consul/command/acl/role/read"
 	aclrupdate "github.com/hashicorp/consul/command/acl/role/update"
-	acltp "github.com/hashicorp/consul/command/acl/templatedpolicy"
-	acltplist "github.com/hashicorp/consul/command/acl/templatedpolicy/list"
-	acltppreview "github.com/hashicorp/consul/command/acl/templatedpolicy/preview"
-	acltpread "github.com/hashicorp/consul/command/acl/templatedpolicy/read"
 	acltoken "github.com/hashicorp/consul/command/acl/token"
 	acltclone "github.com/hashicorp/consul/command/acl/token/clone"
 	acltcreate "github.com/hashicorp/consul/command/acl/token/create"
@@ -112,15 +105,9 @@ import (
 	peerlist "github.com/hashicorp/consul/command/peering/list"
 	peerread "github.com/hashicorp/consul/command/peering/read"
 	"github.com/hashicorp/consul/command/reload"
-	"github.com/hashicorp/consul/command/resource"
-	resourceapply "github.com/hashicorp/consul/command/resource/apply"
-	resourcedelete "github.com/hashicorp/consul/command/resource/delete"
-	resourcelist "github.com/hashicorp/consul/command/resource/list"
-	resourceread "github.com/hashicorp/consul/command/resource/read"
 	"github.com/hashicorp/consul/command/rtt"
 	"github.com/hashicorp/consul/command/services"
 	svcsderegister "github.com/hashicorp/consul/command/services/deregister"
-	svcsexport "github.com/hashicorp/consul/command/services/export"
 	svcsregister "github.com/hashicorp/consul/command/services/register"
 	"github.com/hashicorp/consul/command/snapshot"
 	snapinspect "github.com/hashicorp/consul/command/snapshot/inspect"
@@ -131,7 +118,7 @@ import (
 	tlscacreate "github.com/hashicorp/consul/command/tls/ca/create"
 	tlscert "github.com/hashicorp/consul/command/tls/cert"
 	tlscertcreate "github.com/hashicorp/consul/command/tls/cert/create"
-	"github.com/hashicorp/consul/command/troubleshoot"
+	troubleshoot "github.com/hashicorp/consul/command/troubleshoot"
 	troubleshootproxy "github.com/hashicorp/consul/command/troubleshoot/proxy"
 	troubleshootupstreams "github.com/hashicorp/consul/command/troubleshoot/upstreams"
 	"github.com/hashicorp/consul/command/validate"
@@ -182,10 +169,6 @@ func RegisteredCommands(ui cli.Ui) map[string]mcli.CommandFactory {
 		entry{"acl binding-rule read", func(ui cli.Ui) (cli.Command, error) { return aclbrread.New(ui), nil }},
 		entry{"acl binding-rule update", func(ui cli.Ui) (cli.Command, error) { return aclbrupdate.New(ui), nil }},
 		entry{"acl binding-rule delete", func(ui cli.Ui) (cli.Command, error) { return aclbrdelete.New(ui), nil }},
-		entry{"acl templated-policy", func(cli.Ui) (cli.Command, error) { return acltp.New(), nil }},
-		entry{"acl templated-policy list", func(ui cli.Ui) (cli.Command, error) { return acltplist.New(ui), nil }},
-		entry{"acl templated-policy read", func(ui cli.Ui) (cli.Command, error) { return acltpread.New(ui), nil }},
-		entry{"acl templated-policy preview", func(ui cli.Ui) (cli.Command, error) { return acltppreview.New(ui), nil }},
 		entry{"agent", func(ui cli.Ui) (cli.Command, error) { return agent.New(ui), nil }},
 		entry{"catalog", func(cli.Ui) (cli.Command, error) { return catalog.New(), nil }},
 		entry{"catalog datacenters", func(ui cli.Ui) (cli.Command, error) { return catlistdc.New(ui), nil }},
@@ -251,16 +234,10 @@ func RegisteredCommands(ui cli.Ui) map[string]mcli.CommandFactory {
 		entry{"peering list", func(ui cli.Ui) (cli.Command, error) { return peerlist.New(ui), nil }},
 		entry{"peering read", func(ui cli.Ui) (cli.Command, error) { return peerread.New(ui), nil }},
 		entry{"reload", func(ui cli.Ui) (cli.Command, error) { return reload.New(ui), nil }},
-		entry{"resource", func(cli.Ui) (cli.Command, error) { return resource.New(), nil }},
-		entry{"resource read", func(ui cli.Ui) (cli.Command, error) { return resourceread.New(ui), nil }},
-		entry{"resource delete", func(ui cli.Ui) (cli.Command, error) { return resourcedelete.New(ui), nil }},
-		entry{"resource apply", func(ui cli.Ui) (cli.Command, error) { return resourceapply.New(ui), nil }},
-		entry{"resource list", func(ui cli.Ui) (cli.Command, error) { return resourcelist.New(ui), nil }},
 		entry{"rtt", func(ui cli.Ui) (cli.Command, error) { return rtt.New(ui), nil }},
 		entry{"services", func(cli.Ui) (cli.Command, error) { return services.New(), nil }},
 		entry{"services register", func(ui cli.Ui) (cli.Command, error) { return svcsregister.New(ui), nil }},
 		entry{"services deregister", func(ui cli.Ui) (cli.Command, error) { return svcsderegister.New(ui), nil }},
-		entry{"services export", func(ui cli.Ui) (cli.Command, error) { return svcsexport.New(ui), nil }},
 		entry{"snapshot", func(cli.Ui) (cli.Command, error) { return snapshot.New(), nil }},
 		entry{"snapshot inspect", func(ui cli.Ui) (cli.Command, error) { return snapinspect.New(ui), nil }},
 		entry{"snapshot restore", func(ui cli.Ui) (cli.Command, error) { return snaprestore.New(ui), nil }},
diff --git a/command/registry_ce.go b/command/registry_ce.go
index f797b8f75b496..cd5d2ee2e63cc 100644
--- a/command/registry_ce.go
+++ b/command/registry_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package command
 
diff --git a/command/reload/reload.go b/command/reload/reload.go
index 458b90cbf6a89..16fed1c7f8663 100644
--- a/command/reload/reload.go
+++ b/command/reload/reload.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package reload
 
 import (
diff --git a/command/reload/reload_test.go b/command/reload/reload_test.go
index 11313fb138418..ca6e60dec0cb5 100644
--- a/command/reload/reload_test.go
+++ b/command/reload/reload_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package reload
 
 import (
diff --git a/command/resource/apply/apply.go b/command/resource/apply/apply.go
deleted file mode 100644
index 9f0b8e45812d7..0000000000000
--- a/command/resource/apply/apply.go
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package apply
-
-import (
-	"encoding/json"
-	"errors"
-	"flag"
-	"fmt"
-
-	"github.com/mitchellh/cli"
-	"google.golang.org/protobuf/encoding/protojson"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/command/flags"
-	"github.com/hashicorp/consul/command/resource"
-	"github.com/hashicorp/consul/command/resource/client"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func New(ui cli.Ui) *cmd {
-	c := &cmd{UI: ui}
-	c.init()
-	return c
-}
-
-type cmd struct {
-	UI    cli.Ui
-	flags *flag.FlagSet
-	http  *flags.HTTPFlags
-	help  string
-
-	filePath string
-}
-
-func (c *cmd) init() {
-	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
-	c.flags.StringVar(&c.filePath, "f", "",
-		"File path with resource definition")
-
-	c.http = &flags.HTTPFlags{}
-	flags.Merge(c.flags, c.http.ClientFlags())
-	c.help = flags.Usage(help, c.flags)
-}
-
-func makeWriteRequest(parsedResource *pbresource.Resource) (payload *resource.WriteRequest, error error) {
-	// The parsed hcl file has data field in proto message format anypb.Any
-	// Converting to json format requires us to fisrt marshal it then unmarshal it
-	data, err := protojson.Marshal(parsedResource.Data)
-	if err != nil {
-		return nil, fmt.Errorf("unrecognized hcl format: %s", err)
-	}
-
-	var resourceData map[string]any
-	err = json.Unmarshal(data, &resourceData)
-	if err != nil {
-		return nil, fmt.Errorf("unrecognized hcl format: %s", err)
-	}
-	delete(resourceData, "@type")
-
-	return &resource.WriteRequest{
-		Data:     resourceData,
-		Metadata: parsedResource.GetMetadata(),
-		Owner:    parsedResource.GetOwner(),
-	}, nil
-}
-
-func (c *cmd) Run(args []string) int {
-	if err := c.flags.Parse(args); err != nil {
-		if !errors.Is(err, flag.ErrHelp) {
-			c.UI.Error(fmt.Sprintf("Failed to parse args: %v", err))
-			return 1
-		}
-	}
-
-	var parsedResource *pbresource.Resource
-
-	if c.filePath != "" {
-		data, err := resource.ParseResourceFromFile(c.filePath)
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Failed to decode resource from input file: %v", err))
-			return 1
-		}
-		parsedResource = data
-	} else {
-		c.UI.Error("Incorrect argument format: Flag -f with file path argument is required")
-		return 1
-	}
-
-	if parsedResource == nil {
-		c.UI.Error("Unable to parse the file argument")
-		return 1
-	}
-
-	config := api.DefaultConfig()
-
-	c.http.MergeOntoConfig(config)
-	resourceClient, err := client.NewClient(config)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error connect to Consul agent: %s", err))
-		return 1
-	}
-
-	res := resource.Resource{C: resourceClient}
-
-	opts := &client.QueryOptions{
-		Namespace: parsedResource.Id.Tenancy.GetNamespace(),
-		Partition: parsedResource.Id.Tenancy.GetPartition(),
-		Peer:      parsedResource.Id.Tenancy.GetPeerName(),
-		Token:     c.http.Token(),
-	}
-
-	gvk := &resource.GVK{
-		Group:   parsedResource.Id.Type.GetGroup(),
-		Version: parsedResource.Id.Type.GetGroupVersion(),
-		Kind:    parsedResource.Id.Type.GetKind(),
-	}
-
-	writeRequest, err := makeWriteRequest(parsedResource)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error parsing hcl input: %v", err))
-		return 1
-	}
-
-	entry, err := res.Apply(gvk, parsedResource.Id.GetName(), opts, writeRequest)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error writing resource %s/%s: %v", gvk, parsedResource.Id.GetName(), err))
-		return 1
-	}
-
-	b, err := json.MarshalIndent(entry, "", "    ")
-	if err != nil {
-		c.UI.Error("Failed to encode output data")
-		return 1
-	}
-
-	c.UI.Info(fmt.Sprintf("%s.%s.%s '%s' created.", gvk.Group, gvk.Version, gvk.Kind, parsedResource.Id.GetName()))
-	c.UI.Info(string(b))
-	return 0
-}
-
-func (c *cmd) Synopsis() string {
-	return synopsis
-}
-
-func (c *cmd) Help() string {
-	return flags.Usage(c.help, nil)
-}
-
-const synopsis = "Writes/updates resource information"
-
-const help = `
-Usage: consul resource apply -f=<file-path>
-
-Write and/or update a resource by providing the definition in an hcl file as an argument
-
-Example:
-
-$ consul resource apply -f=demo.hcl
-
-Sample demo.hcl:
-
-ID {
-	Type = gvk("group.version.kind")
-	Name = "resource-name"
-	Tenancy {
-	  Namespace = "default"
-	  Partition = "default"
-	  PeerName = "local"
-	}
-  }
-
-  Data {
-	Name = "demo"
-  }
-
-  Metadata = {
-	"foo" = "bar"
-  }
-`
diff --git a/command/resource/apply/apply_test.go b/command/resource/apply/apply_test.go
deleted file mode 100644
index 6f9f3b15683c1..0000000000000
--- a/command/resource/apply/apply_test.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package apply
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/mitchellh/cli"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/agent"
-	"github.com/hashicorp/consul/testrpc"
-)
-
-func TestResourceApplyCommand(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-	a := agent.NewTestAgent(t, ``)
-	defer a.Shutdown()
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1")
-
-	cases := []struct {
-		name   string
-		output string
-		args   []string
-	}{
-		{
-			name:   "sample output",
-			args:   []string{"-f=../testdata/demo.hcl"},
-			output: "demo.v2.Artist 'korn' created.",
-		},
-		{
-			name:   "nested data format",
-			args:   []string{"-f=../testdata/nested_data.hcl"},
-			output: "mesh.v2beta1.Destinations 'api' created.",
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			ui := cli.NewMockUi()
-			c := New(ui)
-
-			args := []string{
-				"-http-addr=" + a.HTTPAddr(),
-				"-token=root",
-			}
-
-			args = append(args, tc.args...)
-
-			code := c.Run(args)
-			require.Equal(t, 0, code)
-			require.Empty(t, ui.ErrorWriter.String())
-			require.Contains(t, ui.OutputWriter.String(), tc.output)
-		})
-	}
-}
-
-func TestResourceApplyInvalidArgs(t *testing.T) {
-	t.Parallel()
-
-	type tc struct {
-		args         []string
-		expectedCode int
-		expectedErr  error
-	}
-
-	cases := map[string]tc{
-		"no file path": {
-			args:         []string{"-f"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Failed to parse args: flag needs an argument: -f"),
-		},
-		"missing required flag": {
-			args:         []string{},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: Flag -f with file path argument is required"),
-		},
-		"file parsing failure": {
-			args:         []string{"-f=../testdata/invalid.hcl"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Failed to decode resource from input file"),
-		},
-		"file not found": {
-			args:         []string{"-f=../testdata/test.hcl"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Failed to load data: Failed to read file: open ../testdata/test.hcl: no such file or directory"),
-		},
-	}
-
-	for desc, tc := range cases {
-		t.Run(desc, func(t *testing.T) {
-			ui := cli.NewMockUi()
-			c := New(ui)
-
-			code := c.Run(tc.args)
-
-			require.Equal(t, tc.expectedCode, code)
-			require.Contains(t, ui.ErrorWriter.String(), tc.expectedErr.Error())
-		})
-	}
-}
diff --git a/command/resource/client/client.go b/command/resource/client/client.go
deleted file mode 100644
index 0d0d59e2df996..0000000000000
--- a/command/resource/client/client.go
+++ /dev/null
@@ -1,1073 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package client
-
-import (
-	"bytes"
-	"context"
-	"crypto/tls"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/go-cleanhttp"
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-rootcerts"
-)
-
-// NOTE: This client is copied from the api module to temporarily facilitate the resource cli commands
-
-const (
-	// HTTPAddrEnvName defines an environment variable name which sets
-	// the HTTP address if there is no -http-addr specified.
-	HTTPAddrEnvName = "CONSUL_HTTP_ADDR"
-
-	// HTTPTokenEnvName defines an environment variable name which sets
-	// the HTTP token.
-	HTTPTokenEnvName = "CONSUL_HTTP_TOKEN"
-
-	// HTTPTokenFileEnvName defines an environment variable name which sets
-	// the HTTP token file.
-	HTTPTokenFileEnvName = "CONSUL_HTTP_TOKEN_FILE"
-
-	// HTTPAuthEnvName defines an environment variable name which sets
-	// the HTTP authentication header.
-	HTTPAuthEnvName = "CONSUL_HTTP_AUTH"
-
-	// HTTPSSLEnvName defines an environment variable name which sets
-	// whether or not to use HTTPS.
-	HTTPSSLEnvName = "CONSUL_HTTP_SSL"
-
-	// HTTPCAFile defines an environment variable name which sets the
-	// CA file to use for talking to Consul over TLS.
-	HTTPCAFile = "CONSUL_CACERT"
-
-	// HTTPCAPath defines an environment variable name which sets the
-	// path to a directory of CA certs to use for talking to Consul over TLS.
-	HTTPCAPath = "CONSUL_CAPATH"
-
-	// HTTPClientCert defines an environment variable name which sets the
-	// client cert file to use for talking to Consul over TLS.
-	HTTPClientCert = "CONSUL_CLIENT_CERT"
-
-	// HTTPClientKey defines an environment variable name which sets the
-	// client key file to use for talking to Consul over TLS.
-	HTTPClientKey = "CONSUL_CLIENT_KEY"
-
-	// HTTPTLSServerName defines an environment variable name which sets the
-	// server name to use as the SNI host when connecting via TLS
-	HTTPTLSServerName = "CONSUL_TLS_SERVER_NAME"
-
-	// HTTPSSLVerifyEnvName defines an environment variable name which sets
-	// whether or not to disable certificate checking.
-	HTTPSSLVerifyEnvName = "CONSUL_HTTP_SSL_VERIFY"
-
-	// GRPCAddrEnvName defines an environment variable name which sets the gRPC
-	// address for consul connect envoy. Note this isn't actually used by the api
-	// client in this package but is defined here for consistency with all the
-	// other ENV names we use.
-	GRPCAddrEnvName = "CONSUL_GRPC_ADDR"
-
-	// GRPCCAFileEnvName defines an environment variable name which sets the
-	// CA file to use for talking to Consul gRPC over TLS.
-	GRPCCAFileEnvName = "CONSUL_GRPC_CACERT"
-
-	// GRPCCAPathEnvName defines an environment variable name which sets the
-	// path to a directory of CA certs to use for talking to Consul gRPC over TLS.
-	GRPCCAPathEnvName = "CONSUL_GRPC_CAPATH"
-
-	// HTTPNamespaceEnvVar defines an environment variable name which sets
-	// the HTTP Namespace to be used by default. This can still be overridden.
-	HTTPNamespaceEnvName = "CONSUL_NAMESPACE"
-
-	// HTTPPartitionEnvName defines an environment variable name which sets
-	// the HTTP Partition to be used by default. This can still be overridden.
-	HTTPPartitionEnvName = "CONSUL_PARTITION"
-
-	// QueryBackendStreaming Query backend of type streaming
-	QueryBackendStreaming = "streaming"
-
-	// QueryBackendBlockingQuery Query backend of type blocking query
-	QueryBackendBlockingQuery = "blocking-query"
-)
-
-type StatusError struct {
-	Code int
-	Body string
-}
-
-func (e StatusError) Error() string {
-	return fmt.Sprintf("Unexpected response code: %d (%s)", e.Code, e.Body)
-}
-
-// QueryOptions are used to parameterize a query
-type QueryOptions struct {
-	// Namespace overrides the `default` namespace
-	// Note: Namespaces are available only in Consul Enterprise
-	Namespace string
-
-	// Partition overrides the `default` partition
-	// Note: Partitions are available only in Consul Enterprise
-	Partition string
-
-	// Providing a datacenter overwrites the DC provided
-	// by the Config
-	Datacenter string
-
-	// Providing a peer name in the query option
-	Peer string
-
-	// AllowStale allows any Consul server (non-leader) to service
-	// a read. This allows for lower latency and higher throughput
-	AllowStale bool
-
-	// RequireConsistent forces the read to be fully consistent.
-	// This is more expensive but prevents ever performing a stale
-	// read.
-	RequireConsistent bool
-
-	// UseCache requests that the agent cache results locally. See
-	// https://www.consul.io/api/features/caching.html for more details on the
-	// semantics.
-	UseCache bool
-
-	// MaxAge limits how old a cached value will be returned if UseCache is true.
-	// If there is a cached response that is older than the MaxAge, it is treated
-	// as a cache miss and a new fetch invoked. If the fetch fails, the error is
-	// returned. Clients that wish to allow for stale results on error can set
-	// StaleIfError to a longer duration to change this behavior. It is ignored
-	// if the endpoint supports background refresh caching. See
-	// https://www.consul.io/api/features/caching.html for more details.
-	MaxAge time.Duration
-
-	// StaleIfError specifies how stale the client will accept a cached response
-	// if the servers are unavailable to fetch a fresh one. Only makes sense when
-	// UseCache is true and MaxAge is set to a lower, non-zero value. It is
-	// ignored if the endpoint supports background refresh caching. See
-	// https://www.consul.io/api/features/caching.html for more details.
-	StaleIfError time.Duration
-
-	// WaitIndex is used to enable a blocking query. Waits
-	// until the timeout or the next index is reached
-	WaitIndex uint64
-
-	// WaitHash is used by some endpoints instead of WaitIndex to perform blocking
-	// on state based on a hash of the response rather than a monotonic index.
-	// This is required when the state being blocked on is not stored in Raft, for
-	// example agent-local proxy configuration.
-	WaitHash string
-
-	// WaitTime is used to bound the duration of a wait.
-	// Defaults to that of the Config, but can be overridden.
-	WaitTime time.Duration
-
-	// Token is used to provide a per-request ACL token
-	// which overrides the agent's default token.
-	Token string
-
-	// Near is used to provide a node name that will sort the results
-	// in ascending order based on the estimated round trip time from
-	// that node. Setting this to "_agent" will use the agent's node
-	// for the sort.
-	Near string
-
-	// NodeMeta is used to filter results by nodes with the given
-	// metadata key/value pairs. Currently, only one key/value pair can
-	// be provided for filtering.
-	NodeMeta map[string]string
-
-	// RelayFactor is used in keyring operations to cause responses to be
-	// relayed back to the sender through N other random nodes. Must be
-	// a value from 0 to 5 (inclusive).
-	RelayFactor uint8
-
-	// LocalOnly is used in keyring list operation to force the keyring
-	// query to only hit local servers (no WAN traffic).
-	LocalOnly bool
-
-	// Connect filters prepared query execution to only include Connect-capable
-	// services. This currently affects prepared query execution.
-	Connect bool
-
-	// ctx is an optional context pass through to the underlying HTTP
-	// request layer. Use Context() and WithContext() to manage this.
-	ctx context.Context
-
-	// Filter requests filtering data prior to it being returned. The string
-	// is a go-bexpr compatible expression.
-	Filter string
-
-	// MergeCentralConfig returns a service definition merged with the
-	// proxy-defaults/global and service-defaults/:service config entries.
-	// This can be used to ensure a full service definition is returned in the response
-	// especially when the service might not be written into the catalog that way.
-	MergeCentralConfig bool
-
-	// Global is used to request information from all datacenters. Currently only
-	// used for operator usage requests.
-	Global bool
-}
-
-func (o *QueryOptions) Context() context.Context {
-	if o != nil && o.ctx != nil {
-		return o.ctx
-	}
-	return context.Background()
-}
-
-func (o *QueryOptions) WithContext(ctx context.Context) *QueryOptions {
-	o2 := new(QueryOptions)
-	if o != nil {
-		*o2 = *o
-	}
-	o2.ctx = ctx
-	return o2
-}
-
-// WriteOptions are used to parameterize a write
-type WriteOptions struct {
-	// Namespace overrides the `default` namespace
-	// Note: Namespaces are available only in Consul Enterprise
-	Namespace string
-
-	// Partition overrides the `default` partition
-	// Note: Partitions are available only in Consul Enterprise
-	Partition string
-
-	// Providing a datacenter overwrites the DC provided
-	// by the Config
-	Datacenter string
-
-	// Token is used to provide a per-request ACL token
-	// which overrides the agent's default token.
-	Token string
-
-	// RelayFactor is used in keyring operations to cause responses to be
-	// relayed back to the sender through N other random nodes. Must be
-	// a value from 0 to 5 (inclusive).
-	RelayFactor uint8
-
-	// ctx is an optional context pass through to the underlying HTTP
-	// request layer. Use Context() and WithContext() to manage this.
-	ctx context.Context
-}
-
-func (o *WriteOptions) Context() context.Context {
-	if o != nil && o.ctx != nil {
-		return o.ctx
-	}
-	return context.Background()
-}
-
-func (o *WriteOptions) WithContext(ctx context.Context) *WriteOptions {
-	o2 := new(WriteOptions)
-	if o != nil {
-		*o2 = *o
-	}
-	o2.ctx = ctx
-	return o2
-}
-
-// QueryMeta is used to return meta data about a query
-type QueryMeta struct {
-	// LastIndex. This can be used as a WaitIndex to perform
-	// a blocking query
-	LastIndex uint64
-
-	// LastContentHash. This can be used as a WaitHash to perform a blocking query
-	// for endpoints that support hash-based blocking. Endpoints that do not
-	// support it will return an empty hash.
-	LastContentHash string
-
-	// Time of last contact from the leader for the
-	// server servicing the request
-	LastContact time.Duration
-
-	// Is there a known leader
-	KnownLeader bool
-
-	// How long did the request take
-	RequestTime time.Duration
-
-	// Is address translation enabled for HTTP responses on this agent
-	AddressTranslationEnabled bool
-
-	// CacheHit is true if the result was served from agent-local cache.
-	CacheHit bool
-
-	// CacheAge is set if request was ?cached and indicates how stale the cached
-	// response is.
-	CacheAge time.Duration
-
-	// QueryBackend represent which backend served the request.
-	QueryBackend string
-
-	// DefaultACLPolicy is used to control the ACL interaction when there is no
-	// defined policy. This can be "allow" which means ACLs are used to
-	// deny-list, or "deny" which means ACLs are allow-lists.
-	DefaultACLPolicy string
-
-	// ResultsFilteredByACLs is true when some of the query's results were
-	// filtered out by enforcing ACLs. It may be false because nothing was
-	// removed, or because the endpoint does not yet support this flag.
-	ResultsFilteredByACLs bool
-}
-
-// WriteMeta is used to return meta data about a write
-type WriteMeta struct {
-	// How long did the request take
-	RequestTime time.Duration
-}
-
-// HttpBasicAuth is used to authenticate http client with HTTP Basic Authentication
-type HttpBasicAuth struct {
-	// Username to use for HTTP Basic Authentication
-	Username string
-
-	// Password to use for HTTP Basic Authentication
-	Password string
-}
-
-// Config is used to configure the creation of a client
-type Config struct {
-	// Address is the address of the Consul server
-	Address string
-
-	// Scheme is the URI scheme for the Consul server
-	Scheme string
-
-	// Prefix for URIs for when consul is behind an API gateway (reverse
-	// proxy).  The API gateway must strip off the PathPrefix before
-	// passing the request onto consul.
-	PathPrefix string
-
-	// Datacenter to use. If not provided, the default agent datacenter is used.
-	Datacenter string
-
-	// Transport is the Transport to use for the http client.
-	Transport *http.Transport
-
-	// HttpClient is the client to use. Default will be
-	// used if not provided.
-	HttpClient *http.Client
-
-	// HttpAuth is the auth info to use for http access.
-	HttpAuth *HttpBasicAuth
-
-	// WaitTime limits how long a Watch will block. If not provided,
-	// the agent default values will be used.
-	WaitTime time.Duration
-
-	// Token is used to provide a per-request ACL token
-	// which overrides the agent's default token.
-	Token string
-
-	// TokenFile is a file containing the current token to use for this client.
-	// If provided it is read once at startup and never again.
-	TokenFile string
-
-	// Namespace is the name of the namespace to send along for the request
-	// when no other Namespace is present in the QueryOptions
-	Namespace string
-
-	// Partition is the name of the partition to send along for the request
-	// when no other Partition is present in the QueryOptions
-	Partition string
-
-	TLSConfig TLSConfig
-}
-
-// TLSConfig is used to generate a TLSClientConfig that's useful for talking to
-// Consul using TLS.
-type TLSConfig struct {
-	// Address is the optional address of the Consul server. The port, if any
-	// will be removed from here and this will be set to the ServerName of the
-	// resulting config.
-	Address string
-
-	// CAFile is the optional path to the CA certificate used for Consul
-	// communication, defaults to the system bundle if not specified.
-	CAFile string
-
-	// CAPath is the optional path to a directory of CA certificates to use for
-	// Consul communication, defaults to the system bundle if not specified.
-	CAPath string
-
-	// CAPem is the optional PEM-encoded CA certificate used for Consul
-	// communication, defaults to the system bundle if not specified.
-	CAPem []byte
-
-	// CertFile is the optional path to the certificate for Consul
-	// communication. If this is set then you need to also set KeyFile.
-	CertFile string
-
-	// CertPEM is the optional PEM-encoded certificate for Consul
-	// communication. If this is set then you need to also set KeyPEM.
-	CertPEM []byte
-
-	// KeyFile is the optional path to the private key for Consul communication.
-	// If this is set then you need to also set CertFile.
-	KeyFile string
-
-	// KeyPEM is the optional PEM-encoded private key for Consul communication.
-	// If this is set then you need to also set CertPEM.
-	KeyPEM []byte
-
-	// InsecureSkipVerify if set to true will disable TLS host verification.
-	InsecureSkipVerify bool
-}
-
-// DefaultConfig returns a default configuration for the client. By default this
-// will pool and reuse idle connections to Consul. If you have a long-lived
-// client object, this is the desired behavior and should make the most efficient
-// use of the connections to Consul. If you don't reuse a client object, which
-// is not recommended, then you may notice idle connections building up over
-// time. To avoid this, use the DefaultNonPooledConfig() instead.
-func DefaultConfig() *Config {
-	return defaultConfig(nil, cleanhttp.DefaultPooledTransport)
-}
-
-// DefaultConfigWithLogger returns a default configuration for the client. It
-// is exactly the same as DefaultConfig, but allows for a pre-configured logger
-// object to be passed through.
-func DefaultConfigWithLogger(logger hclog.Logger) *Config {
-	return defaultConfig(logger, cleanhttp.DefaultPooledTransport)
-}
-
-// DefaultNonPooledConfig returns a default configuration for the client which
-// does not pool connections. This isn't a recommended configuration because it
-// will reconnect to Consul on every request, but this is useful to avoid the
-// accumulation of idle connections if you make many client objects during the
-// lifetime of your application.
-func DefaultNonPooledConfig() *Config {
-	return defaultConfig(nil, cleanhttp.DefaultTransport)
-}
-
-// defaultConfig returns the default configuration for the client, using the
-// given function to make the transport.
-func defaultConfig(logger hclog.Logger, transportFn func() *http.Transport) *Config {
-	if logger == nil {
-		logger = hclog.New(&hclog.LoggerOptions{
-			Name: "consul-api",
-		})
-	}
-
-	config := &Config{
-		Address:   "127.0.0.1:8500",
-		Scheme:    "http",
-		Transport: transportFn(),
-	}
-
-	if addr := os.Getenv(HTTPAddrEnvName); addr != "" {
-		config.Address = addr
-	}
-
-	if tokenFile := os.Getenv(HTTPTokenFileEnvName); tokenFile != "" {
-		config.TokenFile = tokenFile
-	}
-
-	if token := os.Getenv(HTTPTokenEnvName); token != "" {
-		config.Token = token
-	}
-
-	if auth := os.Getenv(HTTPAuthEnvName); auth != "" {
-		var username, password string
-		if strings.Contains(auth, ":") {
-			split := strings.SplitN(auth, ":", 2)
-			username = split[0]
-			password = split[1]
-		} else {
-			username = auth
-		}
-
-		config.HttpAuth = &HttpBasicAuth{
-			Username: username,
-			Password: password,
-		}
-	}
-
-	if ssl := os.Getenv(HTTPSSLEnvName); ssl != "" {
-		enabled, err := strconv.ParseBool(ssl)
-		if err != nil {
-			logger.Warn(fmt.Sprintf("could not parse %s", HTTPSSLEnvName), "error", err)
-		}
-
-		if enabled {
-			config.Scheme = "https"
-		}
-	}
-
-	if v := os.Getenv(HTTPTLSServerName); v != "" {
-		config.TLSConfig.Address = v
-	}
-	if v := os.Getenv(HTTPCAFile); v != "" {
-		config.TLSConfig.CAFile = v
-	}
-	if v := os.Getenv(HTTPCAPath); v != "" {
-		config.TLSConfig.CAPath = v
-	}
-	if v := os.Getenv(HTTPClientCert); v != "" {
-		config.TLSConfig.CertFile = v
-	}
-	if v := os.Getenv(HTTPClientKey); v != "" {
-		config.TLSConfig.KeyFile = v
-	}
-	if v := os.Getenv(HTTPSSLVerifyEnvName); v != "" {
-		doVerify, err := strconv.ParseBool(v)
-		if err != nil {
-			logger.Warn(fmt.Sprintf("could not parse %s", HTTPSSLVerifyEnvName), "error", err)
-		}
-		if !doVerify {
-			config.TLSConfig.InsecureSkipVerify = true
-		}
-	}
-
-	if v := os.Getenv(HTTPNamespaceEnvName); v != "" {
-		config.Namespace = v
-	}
-
-	if v := os.Getenv(HTTPPartitionEnvName); v != "" {
-		config.Partition = v
-	}
-
-	return config
-}
-
-// TLSConfig is used to generate a TLSClientConfig that's useful for talking to
-// Consul using TLS.
-func SetupTLSConfig(tlsConfig *TLSConfig) (*tls.Config, error) {
-	tlsClientConfig := &tls.Config{
-		InsecureSkipVerify: tlsConfig.InsecureSkipVerify,
-	}
-
-	if tlsConfig.Address != "" {
-		server := tlsConfig.Address
-		hasPort := strings.LastIndex(server, ":") > strings.LastIndex(server, "]")
-		if hasPort {
-			var err error
-			server, _, err = net.SplitHostPort(server)
-			if err != nil {
-				return nil, err
-			}
-		}
-		tlsClientConfig.ServerName = server
-	}
-
-	if len(tlsConfig.CertPEM) != 0 && len(tlsConfig.KeyPEM) != 0 {
-		tlsCert, err := tls.X509KeyPair(tlsConfig.CertPEM, tlsConfig.KeyPEM)
-		if err != nil {
-			return nil, err
-		}
-		tlsClientConfig.Certificates = []tls.Certificate{tlsCert}
-	} else if len(tlsConfig.CertPEM) != 0 || len(tlsConfig.KeyPEM) != 0 {
-		return nil, fmt.Errorf("both client cert and client key must be provided")
-	}
-
-	if tlsConfig.CertFile != "" && tlsConfig.KeyFile != "" {
-		tlsCert, err := tls.LoadX509KeyPair(tlsConfig.CertFile, tlsConfig.KeyFile)
-		if err != nil {
-			return nil, err
-		}
-		tlsClientConfig.Certificates = []tls.Certificate{tlsCert}
-	} else if tlsConfig.CertFile != "" || tlsConfig.KeyFile != "" {
-		return nil, fmt.Errorf("both client cert and client key must be provided")
-	}
-
-	if tlsConfig.CAFile != "" || tlsConfig.CAPath != "" || len(tlsConfig.CAPem) != 0 {
-		rootConfig := &rootcerts.Config{
-			CAFile:        tlsConfig.CAFile,
-			CAPath:        tlsConfig.CAPath,
-			CACertificate: tlsConfig.CAPem,
-		}
-		if err := rootcerts.ConfigureTLS(tlsClientConfig, rootConfig); err != nil {
-			return nil, err
-		}
-	}
-
-	return tlsClientConfig, nil
-}
-
-func (c *Config) GenerateEnv() []string {
-	env := make([]string, 0, 10)
-
-	env = append(env,
-		fmt.Sprintf("%s=%s", HTTPAddrEnvName, c.Address),
-		fmt.Sprintf("%s=%s", HTTPTokenEnvName, c.Token),
-		fmt.Sprintf("%s=%s", HTTPTokenFileEnvName, c.TokenFile),
-		fmt.Sprintf("%s=%t", HTTPSSLEnvName, c.Scheme == "https"),
-		fmt.Sprintf("%s=%s", HTTPCAFile, c.TLSConfig.CAFile),
-		fmt.Sprintf("%s=%s", HTTPCAPath, c.TLSConfig.CAPath),
-		fmt.Sprintf("%s=%s", HTTPClientCert, c.TLSConfig.CertFile),
-		fmt.Sprintf("%s=%s", HTTPClientKey, c.TLSConfig.KeyFile),
-		fmt.Sprintf("%s=%s", HTTPTLSServerName, c.TLSConfig.Address),
-		fmt.Sprintf("%s=%t", HTTPSSLVerifyEnvName, !c.TLSConfig.InsecureSkipVerify))
-
-	if c.HttpAuth != nil {
-		env = append(env, fmt.Sprintf("%s=%s:%s", HTTPAuthEnvName, c.HttpAuth.Username, c.HttpAuth.Password))
-	} else {
-		env = append(env, fmt.Sprintf("%s=", HTTPAuthEnvName))
-	}
-
-	return env
-}
-
-// Client provides a client to the Consul API
-type Client struct {
-	modifyLock sync.RWMutex
-	headers    http.Header
-
-	config api.Config
-}
-
-// Headers gets the current set of headers used for requests. This returns a
-// copy; to modify it call AddHeader or SetHeaders.
-func (c *Client) Headers() http.Header {
-	c.modifyLock.RLock()
-	defer c.modifyLock.RUnlock()
-
-	if c.headers == nil {
-		return nil
-	}
-
-	ret := make(http.Header)
-	for k, v := range c.headers {
-		for _, val := range v {
-			ret[k] = append(ret[k], val)
-		}
-	}
-
-	return ret
-}
-
-// NewClient returns a new client
-func NewClient(config *api.Config) (*Client, error) {
-	// bootstrap the config
-	defConfig := api.DefaultConfig()
-
-	if config.Address == "" {
-		config.Address = defConfig.Address
-	}
-
-	if config.Scheme == "" {
-		config.Scheme = defConfig.Scheme
-	}
-
-	if config.Transport == nil {
-		config.Transport = defConfig.Transport
-	}
-
-	if config.TLSConfig.Address == "" {
-		config.TLSConfig.Address = defConfig.TLSConfig.Address
-	}
-
-	if config.TLSConfig.CAFile == "" {
-		config.TLSConfig.CAFile = defConfig.TLSConfig.CAFile
-	}
-
-	if config.TLSConfig.CAPath == "" {
-		config.TLSConfig.CAPath = defConfig.TLSConfig.CAPath
-	}
-
-	if config.TLSConfig.CertFile == "" {
-		config.TLSConfig.CertFile = defConfig.TLSConfig.CertFile
-	}
-
-	if config.TLSConfig.KeyFile == "" {
-		config.TLSConfig.KeyFile = defConfig.TLSConfig.KeyFile
-	}
-
-	if !config.TLSConfig.InsecureSkipVerify {
-		config.TLSConfig.InsecureSkipVerify = defConfig.TLSConfig.InsecureSkipVerify
-	}
-
-	if config.HttpClient == nil {
-		var err error
-		config.HttpClient, err = NewHttpClient(config.Transport, config.TLSConfig)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if config.Namespace == "" {
-		config.Namespace = defConfig.Namespace
-	}
-
-	if config.Partition == "" {
-		config.Partition = defConfig.Partition
-	}
-
-	parts := strings.SplitN(config.Address, "://", 2)
-	if len(parts) == 2 {
-		switch parts[0] {
-		case "http":
-			// Never revert to http if TLS was explicitly requested.
-		case "https":
-			config.Scheme = "https"
-		case "unix":
-			trans := cleanhttp.DefaultTransport()
-			trans.DialContext = func(_ context.Context, _, _ string) (net.Conn, error) {
-				return net.Dial("unix", parts[1])
-			}
-			httpClient, err := NewHttpClient(trans, config.TLSConfig)
-			if err != nil {
-				return nil, err
-			}
-			config.HttpClient = httpClient
-		default:
-			return nil, fmt.Errorf("Unknown protocol scheme: %s", parts[0])
-		}
-		config.Address = parts[1]
-
-		// separate out a reverse proxy prefix, if it is present.
-		// NOTE: Rewriting this code to use url.Parse() instead of
-		// strings.SplitN() breaks existing test cases.
-		switch parts[0] {
-		case "http", "https":
-			parts := strings.SplitN(parts[1], "/", 2)
-			if len(parts) == 2 {
-				config.Address = parts[0]
-				config.PathPrefix = "/" + parts[1]
-			}
-		}
-	}
-
-	// If the TokenFile is set, always use that, even if a Token is configured.
-	// This is because when TokenFile is set it is read into the Token field.
-	// We want any derived clients to have to re-read the token file.
-	// The precedence of ACL token should be:
-	// 1. -token-file cli option
-	// 2. -token cli option
-	// 3. CONSUL_HTTP_TOKEN_FILE environment variable
-	// 4. CONSUL_HTTP_TOKEN environment variable
-	if config.TokenFile != "" && config.TokenFile != defConfig.TokenFile {
-		data, err := os.ReadFile(config.TokenFile)
-		if err != nil {
-			return nil, fmt.Errorf("Error loading token file %s : %s", config.TokenFile, err)
-		}
-
-		if token := strings.TrimSpace(string(data)); token != "" {
-			config.Token = token
-		}
-	} else if config.Token != "" && defConfig.Token != config.Token {
-		// Fall through
-	} else if defConfig.TokenFile != "" {
-		data, err := os.ReadFile(defConfig.TokenFile)
-		if err != nil {
-			return nil, fmt.Errorf("Error loading token file %s : %s", defConfig.TokenFile, err)
-		}
-
-		if token := strings.TrimSpace(string(data)); token != "" {
-			config.Token = token
-			config.TokenFile = defConfig.TokenFile
-		}
-	} else {
-		config.Token = defConfig.Token
-	}
-	return &Client{config: *config, headers: make(http.Header)}, nil
-}
-
-// NewHttpClient returns an http client configured with the given Transport and TLS
-// config.
-func NewHttpClient(transport *http.Transport, tlsConf api.TLSConfig) (*http.Client, error) {
-	client := &http.Client{
-		Transport: transport,
-	}
-
-	// TODO (slackpad) - Once we get some run time on the HTTP/2 support we
-	// should turn it on by default if TLS is enabled. We would basically
-	// just need to call http2.ConfigureTransport(transport) here. We also
-	// don't want to introduce another external dependency on
-	// golang.org/x/net/http2 at this time. For a complete recipe for how
-	// to enable HTTP/2 support on a transport suitable for the API client
-	// library see agent/http_test.go:TestHTTPServer_H2.
-
-	if transport.TLSClientConfig == nil {
-		tlsClientConfig, err := api.SetupTLSConfig(&tlsConf)
-
-		if err != nil {
-			return nil, err
-		}
-
-		transport.TLSClientConfig = tlsClientConfig
-	}
-
-	return client, nil
-}
-
-// request is used to help build up a request
-// defined a custom object that includes use-case specific config
-type request struct {
-	config *api.Config
-	method string
-	url    *url.URL
-	params url.Values
-	body   io.Reader
-	header http.Header
-	Obj    interface{}
-	ctx    context.Context
-}
-
-// setQueryOptions is used to annotate the request with
-// additional query options
-func (r *request) SetQueryOptions(q *QueryOptions) {
-	if q == nil {
-		return
-	}
-	if q.Namespace != "" {
-		// For backwards-compatibility with existing tests,
-		// use the short-hand query param name "ns"
-		// rather than the alternative long-hand "namespace"
-		r.params.Set("ns", q.Namespace)
-	}
-	if q.Partition != "" {
-		// For backwards-compatibility with existing tests,
-		// use the long-hand query param name "partition"
-		// rather than the alternative short-hand "ap"
-		r.params.Set("partition", q.Partition)
-	}
-	if q.Datacenter != "" {
-		// For backwards-compatibility with existing tests,
-		// use the short-hand query param name "dc"
-		// rather than the alternative long-hand "datacenter"
-		r.params.Set("dc", q.Datacenter)
-	}
-	if q.Peer != "" {
-		r.params.Set("peer", q.Peer)
-	}
-	if q.AllowStale {
-		r.params.Set("stale", "")
-	}
-	if q.RequireConsistent {
-		r.params.Set("consistent", "")
-	}
-	if q.WaitIndex != 0 {
-		r.params.Set("index", strconv.FormatUint(q.WaitIndex, 10))
-	}
-	if q.WaitTime != 0 {
-		r.params.Set("wait", durToMsec(q.WaitTime))
-	}
-	if q.WaitHash != "" {
-		r.params.Set("hash", q.WaitHash)
-	}
-	if q.Token != "" {
-		r.header.Set("X-Consul-Token", q.Token)
-	}
-	if q.Near != "" {
-		r.params.Set("near", q.Near)
-	}
-	if q.Filter != "" {
-		r.params.Set("filter", q.Filter)
-	}
-	if len(q.NodeMeta) > 0 {
-		for key, value := range q.NodeMeta {
-			r.params.Add("node-meta", key+":"+value)
-		}
-	}
-	if q.RelayFactor != 0 {
-		r.params.Set("relay-factor", strconv.Itoa(int(q.RelayFactor)))
-	}
-	if q.LocalOnly {
-		r.params.Set("local-only", fmt.Sprintf("%t", q.LocalOnly))
-	}
-	if q.Connect {
-		r.params.Set("connect", "true")
-	}
-	if q.UseCache && !q.RequireConsistent {
-		r.params.Set("cached", "")
-
-		cc := []string{}
-		if q.MaxAge > 0 {
-			cc = append(cc, fmt.Sprintf("max-age=%.0f", q.MaxAge.Seconds()))
-		}
-		if q.StaleIfError > 0 {
-			cc = append(cc, fmt.Sprintf("stale-if-error=%.0f", q.StaleIfError.Seconds()))
-		}
-		if len(cc) > 0 {
-			r.header.Set("Cache-Control", strings.Join(cc, ", "))
-		}
-	}
-	if q.MergeCentralConfig {
-		r.params.Set("merge-central-config", "")
-	}
-	if q.Global {
-		r.params.Set("global", "")
-	}
-
-	r.ctx = q.ctx
-}
-
-// durToMsec converts a duration to a millisecond specified string. If the
-// user selected a positive value that rounds to 0 ms, then we will use 1 ms
-// so they get a short delay, otherwise Consul will translate the 0 ms into
-// a huge default delay.
-func durToMsec(dur time.Duration) string {
-	ms := dur / time.Millisecond
-	if dur > 0 && ms == 0 {
-		ms = 1
-	}
-	return fmt.Sprintf("%dms", ms)
-}
-
-// toHTTP converts the request to an HTTP request
-func (r *request) toHTTP() (*http.Request, error) {
-	// Encode the query parameters
-	r.url.RawQuery = r.params.Encode()
-
-	// Check if we should encode the body
-	if r.body == nil && r.Obj != nil {
-		b, err := encodeBody(r.Obj)
-		if err != nil {
-			return nil, err
-		}
-		r.body = b
-	}
-
-	// Create the HTTP request
-	req, err := http.NewRequest(r.method, r.url.RequestURI(), r.body)
-	if err != nil {
-		return nil, err
-	}
-
-	// validate that socket communications that do not use the host, detect
-	// slashes in the host name and replace it with local host.
-	// this is required since go started validating req.host in 1.20.6 and 1.19.11.
-	// prior to that they would strip out the slashes for you.  They removed that
-	// behavior and added more strict validation as part of a CVE.
-	// This issue is being tracked by the Go team:
-	// https://github.com/golang/go/issues/61431
-	// If there is a resolution in this issue, we will remove this code.
-	// In the time being, this is the accepted workaround.
-	if strings.HasPrefix(r.url.Host, "/") {
-		r.url.Host = "localhost"
-	}
-
-	req.URL.Host = r.url.Host
-	req.URL.Scheme = r.url.Scheme
-	req.Host = r.url.Host
-	req.Header = r.header
-
-	// Content-Type must always be set when a body is present
-	// See https://github.com/hashicorp/consul/issues/10011
-	if req.Body != nil && req.Header.Get("Content-Type") == "" {
-		req.Header.Set("Content-Type", "application/json")
-	}
-
-	// Setup auth
-	if r.config.HttpAuth != nil {
-		req.SetBasicAuth(r.config.HttpAuth.Username, r.config.HttpAuth.Password)
-	}
-	if r.ctx != nil {
-		return req.WithContext(r.ctx), nil
-	}
-
-	return req, nil
-}
-
-// newRequest is used to create a new request
-func (c *Client) NewRequest(method, path string) *request {
-	r := &request{
-		config: &c.config,
-		method: method,
-		url: &url.URL{
-			Scheme: c.config.Scheme,
-			Host:   c.config.Address,
-			Path:   c.config.PathPrefix + path,
-		},
-		params: make(map[string][]string),
-		header: c.Headers(),
-	}
-
-	if c.config.Datacenter != "" {
-		r.params.Set("dc", c.config.Datacenter)
-	}
-	if c.config.Namespace != "" {
-		r.params.Set("ns", c.config.Namespace)
-	}
-	if c.config.Partition != "" {
-		r.params.Set("partition", c.config.Partition)
-	}
-	if c.config.WaitTime != 0 {
-		r.params.Set("wait", durToMsec(r.config.WaitTime))
-	}
-	if c.config.Token != "" {
-		r.header.Set("X-Consul-Token", r.config.Token)
-	}
-	return r
-}
-
-// doRequest runs a request with our client
-func (c *Client) DoRequest(r *request) (time.Duration, *http.Response, error) {
-	req, err := r.toHTTP()
-	if err != nil {
-		return 0, nil, err
-	}
-	start := time.Now()
-	resp, err := c.config.HttpClient.Do(req)
-	diff := time.Since(start)
-	return diff, resp, err
-}
-
-// DecodeBody is used to JSON decode a body
-func DecodeBody(resp *http.Response, out interface{}) error {
-	dec := json.NewDecoder(resp.Body)
-	return dec.Decode(out)
-}
-
-// encodeBody is used to encode a request body
-func encodeBody(obj interface{}) (io.Reader, error) {
-	buf := bytes.NewBuffer(nil)
-	enc := json.NewEncoder(buf)
-	if err := enc.Encode(obj); err != nil {
-		return nil, err
-	}
-	return buf, nil
-}
-
-// requireOK is used to wrap doRequest and check for a 200
-func RequireOK(resp *http.Response) error {
-	return RequireHttpCodes(resp, 200)
-}
-
-// requireHttpCodes checks for the "allowable" http codes for a response
-func RequireHttpCodes(resp *http.Response, httpCodes ...int) error {
-	// if there is an http code that we require, return w no error
-	for _, httpCode := range httpCodes {
-		if resp.StatusCode == httpCode {
-			return nil
-		}
-	}
-
-	// if we reached here, then none of the http codes in resp matched any that we expected
-	// so err out
-	return generateUnexpectedResponseCodeError(resp)
-}
-
-// closeResponseBody reads resp.Body until EOF, and then closes it. The read
-// is necessary to ensure that the http.Client's underlying RoundTripper is able
-// to re-use the TCP connection. See godoc on net/http.Client.Do.
-func CloseResponseBody(resp *http.Response) error {
-	_, _ = io.Copy(io.Discard, resp.Body)
-	return resp.Body.Close()
-}
-
-// generateUnexpectedResponseCodeError consumes the rest of the body, closes
-// the body stream and generates an error indicating the status code was
-// unexpected.
-func generateUnexpectedResponseCodeError(resp *http.Response) error {
-	var buf bytes.Buffer
-	io.Copy(&buf, resp.Body)
-	CloseResponseBody(resp)
-
-	trimmed := strings.TrimSpace(string(buf.Bytes()))
-	return StatusError{Code: resp.StatusCode, Body: trimmed}
-}
diff --git a/command/resource/delete/delete.go b/command/resource/delete/delete.go
deleted file mode 100644
index 2679951da8b16..0000000000000
--- a/command/resource/delete/delete.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package delete
-
-import (
-	"errors"
-	"flag"
-	"fmt"
-
-	"github.com/mitchellh/cli"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/command/flags"
-	"github.com/hashicorp/consul/command/resource"
-	"github.com/hashicorp/consul/command/resource/client"
-)
-
-func New(ui cli.Ui) *cmd {
-	c := &cmd{UI: ui}
-	c.init()
-	return c
-}
-
-type cmd struct {
-	UI    cli.Ui
-	flags *flag.FlagSet
-	http  *flags.HTTPFlags
-	help  string
-
-	filePath string
-}
-
-func (c *cmd) init() {
-	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
-	c.http = &flags.HTTPFlags{}
-	c.flags.StringVar(&c.filePath, "f", "", "File path with resource definition")
-	flags.Merge(c.flags, c.http.ClientFlags())
-	flags.Merge(c.flags, c.http.ServerFlags())
-	flags.Merge(c.flags, c.http.MultiTenancyFlags())
-	flags.Merge(c.flags, c.http.AddPeerName())
-	c.help = flags.Usage(help, c.flags)
-}
-
-func (c *cmd) Run(args []string) int {
-	var gvk *resource.GVK
-	var resourceName string
-	var opts *client.QueryOptions
-
-	if err := c.flags.Parse(args); err != nil {
-		if !errors.Is(err, flag.ErrHelp) {
-			c.UI.Error(fmt.Sprintf("Failed to parse args: %v", err))
-			return 1
-		}
-	}
-
-	if c.flags.Lookup("f").Value.String() != "" {
-		if c.filePath != "" {
-			parsedResource, err := resource.ParseResourceFromFile(c.filePath)
-			if err != nil {
-				c.UI.Error(fmt.Sprintf("Failed to decode resource from input file: %v", err))
-				return 1
-			}
-
-			if parsedResource == nil {
-				c.UI.Error("Unable to parse the file argument")
-				return 1
-			}
-
-			gvk = &resource.GVK{
-				Group:   parsedResource.Id.Type.GetGroup(),
-				Version: parsedResource.Id.Type.GetGroupVersion(),
-				Kind:    parsedResource.Id.Type.GetKind(),
-			}
-			resourceName = parsedResource.Id.GetName()
-			opts = &client.QueryOptions{
-				Namespace: parsedResource.Id.Tenancy.GetNamespace(),
-				Partition: parsedResource.Id.Tenancy.GetPartition(),
-				Peer:      parsedResource.Id.Tenancy.GetPeerName(),
-				Token:     c.http.Token(),
-			}
-		} else {
-			c.UI.Error(fmt.Sprintf("Please provide an input file with resource definition"))
-			return 1
-		}
-	} else {
-		if len(args) < 2 {
-			c.UI.Error("Incorrect argument format: Must specify two arguments: resource type and resource name")
-			return 1
-		}
-		var err error
-		gvk, resourceName, err = resource.GetTypeAndResourceName(args)
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Incorrect argument format: %s", err))
-			return 1
-		}
-
-		inputArgs := args[2:]
-		err = resource.ParseInputParams(inputArgs, c.flags)
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Error parsing input arguments: %v", err))
-			return 1
-		}
-		if c.filePath != "" {
-			c.UI.Error("Incorrect argument format: File argument is not needed when resource information is provided with the command")
-			return 1
-		}
-		opts = &client.QueryOptions{
-			Namespace: c.http.Namespace(),
-			Partition: c.http.Partition(),
-			Peer:      c.http.PeerName(),
-			Token:     c.http.Token(),
-		}
-	}
-
-	config := api.DefaultConfig()
-
-	c.http.MergeOntoConfig(config)
-	resourceClient, err := client.NewClient(config)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error connect to Consul agent: %s", err))
-		return 1
-	}
-
-	res := resource.Resource{C: resourceClient}
-
-	if err := res.Delete(gvk, resourceName, opts); err != nil {
-		c.UI.Error(fmt.Sprintf("Error deleting resource %s.%s.%s/%s: %v", gvk.Group, gvk.Version, gvk.Kind, resourceName, err))
-		return 1
-	}
-
-	c.UI.Info(fmt.Sprintf("%s.%s.%s/%s deleted", gvk.Group, gvk.Version, gvk.Kind, resourceName))
-	return 0
-}
-
-func (c *cmd) Synopsis() string {
-	return synopsis
-}
-
-func (c *cmd) Help() string {
-	return flags.Usage(c.help, nil)
-}
-
-const synopsis = "Delete resource information"
-const help = `
-Usage: You have two options to delete the resource specified by the given
-type, name, partition, namespace and peer and outputs its JSON representation.
-
-consul resource delete [type] [name] -partition=<default> -namespace=<default> -peer=<local>
-consul resource delete -f [resource_file_path]
-
-But you could only use one of the approaches.
-
-Example:
-
-$ consul resource delete catalog.v2beta1.Service card-processor -partition=billing -namespace=payments -peer=eu
-$ consul resource delete -f resource.hcl
-
-In resource.hcl, it could be:
-ID {
-  Type = gvk("catalog.v2beta1.Service")
-  Name = "card-processor"
-  Tenancy {
-    Namespace = "payments"
-    Partition = "billing"
-    PeerName = "eu"
-  }
-}
-`
diff --git a/command/resource/delete/delete_test.go b/command/resource/delete/delete_test.go
deleted file mode 100644
index f888bb3c8fd52..0000000000000
--- a/command/resource/delete/delete_test.go
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-package delete
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/mitchellh/cli"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/agent"
-	"github.com/hashicorp/consul/command/resource/apply"
-	"github.com/hashicorp/consul/testrpc"
-)
-
-func TestResourceDeleteInvalidArgs(t *testing.T) {
-	t.Parallel()
-
-	type tc struct {
-		args         []string
-		expectedCode int
-		expectedErr  error
-	}
-
-	cases := map[string]tc{
-		"nil args": {
-			args:         nil,
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: Must specify two arguments: resource type and resource name"),
-		},
-		"empty args": {
-			args:         []string{},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: Must specify two arguments: resource type and resource name"),
-		},
-		"missing file path": {
-			args:         []string{"-f"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Failed to parse args: flag needs an argument: -f"),
-		},
-		"file not found": {
-			args:         []string{"-f=../testdata/test.hcl"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Failed to load data: Failed to read file: open ../testdata/test.hcl: no such file or directory"),
-		},
-		"provide type and name": {
-			args:         []string{"a.b.c"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: Must specify two arguments: resource type and resource name"),
-		},
-		"provide type and name with -f": {
-			args:         []string{"a.b.c", "name", "-f", "test.hcl"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: File argument is not needed when resource information is provided with the command"),
-		},
-		"provide type and name with -f and other flags": {
-			args:         []string{"a.b.c", "name", "-f", "test.hcl", "-namespace", "default"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: File argument is not needed when resource information is provided with the command"),
-		},
-		"does not provide resource name after type": {
-			args:         []string{"a.b.c", "-namespace", "default"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: Must provide resource name right after type"),
-		},
-		"invalid resource type format": {
-			args:         []string{"a.", "name", "-namespace", "default"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: Must include resource type argument in group.verion.kind format"),
-		},
-	}
-
-	for desc, tc := range cases {
-		t.Run(desc, func(t *testing.T) {
-			ui := cli.NewMockUi()
-			c := New(ui)
-
-			code := c.Run(tc.args)
-
-			require.Equal(t, tc.expectedCode, code)
-			require.Contains(t, ui.ErrorWriter.String(), tc.expectedErr.Error())
-		})
-	}
-}
-
-func createResource(t *testing.T, a *agent.TestAgent) {
-	applyUi := cli.NewMockUi()
-	applyCmd := apply.New(applyUi)
-
-	args := []string{
-		"-http-addr=" + a.HTTPAddr(),
-		"-token=root",
-	}
-
-	args = append(args, []string{"-f=../testdata/demo.hcl"}...)
-
-	code := applyCmd.Run(args)
-	require.Equal(t, 0, code)
-	require.Empty(t, applyUi.ErrorWriter.String())
-}
-
-func TestResourceDelete(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	a := agent.NewTestAgent(t, ``)
-	defer a.Shutdown()
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1")
-
-	defaultCmdArgs := []string{
-		"-http-addr=" + a.HTTPAddr(),
-		"-token=root",
-	}
-	cases := []struct {
-		name           string
-		args           []string
-		expectedCode   int
-		createResource bool
-	}{
-		{
-			name:           "delete resource in hcl format",
-			args:           []string{"-f=../testdata/demo.hcl"},
-			expectedCode:   0,
-			createResource: true,
-		},
-		{
-			name:           "delete resource in command line format",
-			args:           []string{"demo.v2.Artist", "korn", "-partition=default", "-namespace=default", "-peer=local"},
-			expectedCode:   0,
-			createResource: true,
-		},
-		{
-			name:           "delete resource that doesn't exist in command line format",
-			args:           []string{"demo.v2.Artist", "korn", "-partition=default", "-namespace=default", "-peer=local"},
-			expectedCode:   0,
-			createResource: false,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			ui := cli.NewMockUi()
-			c := New(ui)
-			cliArgs := append(tc.args, defaultCmdArgs...)
-			if tc.createResource {
-				createResource(t, a)
-			}
-			code := c.Run(cliArgs)
-			require.Empty(t, ui.ErrorWriter.String())
-			require.Equal(t, tc.expectedCode, code)
-			require.Contains(t, ui.OutputWriter.String(), "deleted")
-		})
-	}
-}
diff --git a/command/resource/helper.go b/command/resource/helper.go
deleted file mode 100644
index 6e07c9f98d94b..0000000000000
--- a/command/resource/helper.go
+++ /dev/null
@@ -1,264 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"encoding/json"
-	"errors"
-	"flag"
-	"fmt"
-	"net/http"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-
-	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/agent/consul"
-	"github.com/hashicorp/consul/command/helpers"
-	"github.com/hashicorp/consul/command/resource/client"
-	"github.com/hashicorp/consul/internal/resourcehcl"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type OuterResource struct {
-	ID         *ID            `json:"id"`
-	Owner      *ID            `json:"owner"`
-	Generation string         `json:"generation"`
-	Version    string         `json:"version"`
-	Metadata   map[string]any `json:"metadata"`
-	Data       map[string]any `json:"data"`
-}
-
-type Tenancy struct {
-	Namespace string `json:"namespace"`
-	Partition string `json:"partition"`
-	PeerName  string `json:"peerName"`
-}
-
-type Type struct {
-	Group        string `json:"group"`
-	GroupVersion string `json:"groupVersion"`
-	Kind         string `json:"kind"`
-}
-
-type ID struct {
-	Name    string  `json:"name"`
-	Tenancy Tenancy `json:"tenancy"`
-	Type    Type    `json:"type"`
-	UID     string  `json:"uid"`
-}
-
-func parseJson(js string) (*pbresource.Resource, error) {
-
-	parsedResource := new(pbresource.Resource)
-
-	var outerResource OuterResource
-
-	if err := json.Unmarshal([]byte(js), &outerResource); err != nil {
-		return nil, err
-	}
-
-	if outerResource.ID == nil {
-		return nil, fmt.Errorf("\"id\" field need to be provided")
-	}
-
-	typ := pbresource.Type{
-		Kind:         outerResource.ID.Type.Kind,
-		Group:        outerResource.ID.Type.Group,
-		GroupVersion: outerResource.ID.Type.GroupVersion,
-	}
-
-	reg, ok := consul.NewTypeRegistry().Resolve(&typ)
-	if !ok {
-		return nil, fmt.Errorf("invalid type %v", parsedResource)
-	}
-	data := reg.Proto.ProtoReflect().New().Interface()
-	anyProtoMsg, err := anypb.New(data)
-	if err != nil {
-		return nil, err
-	}
-
-	outerResource.Data["@type"] = anyProtoMsg.TypeUrl
-
-	marshal, err := json.Marshal(outerResource)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := protojson.Unmarshal(marshal, parsedResource); err != nil {
-		return nil, err
-	}
-	return parsedResource, nil
-}
-
-func ParseResourceFromFile(filePath string) (*pbresource.Resource, error) {
-	data, err := helpers.LoadDataSourceNoRaw(filePath, nil)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to load data: %v", err)
-	}
-	var parsedResource *pbresource.Resource
-	if isHCL([]byte(data)) {
-		parsedResource, err = resourcehcl.Unmarshal([]byte(data), consul.NewTypeRegistry())
-	} else {
-		parsedResource, err = parseJson(data)
-	}
-	if err != nil {
-		return nil, fmt.Errorf("Failed to decode resource from input file: %v", err)
-	}
-
-	return parsedResource, nil
-}
-
-// this is an inlined variant of hcl.lexMode()
-func isHCL(v []byte) bool {
-	var (
-		r      rune
-		w      int
-		offset int
-	)
-
-	for {
-		r, w = utf8.DecodeRune(v[offset:])
-		offset += w
-		if unicode.IsSpace(r) {
-			continue
-		}
-		if r == '{' {
-			return false
-		}
-		break
-	}
-
-	return true
-}
-
-func ParseInputParams(inputArgs []string, flags *flag.FlagSet) error {
-	if err := flags.Parse(inputArgs); err != nil {
-		if !errors.Is(err, flag.ErrHelp) {
-			return fmt.Errorf("Failed to parse args: %v", err)
-		}
-	}
-	return nil
-}
-
-func GetTypeAndResourceName(args []string) (gvk *GVK, resourceName string, e error) {
-	// it has to be resource name after the type
-	if strings.HasPrefix(args[1], "-") {
-		return nil, "", fmt.Errorf("Must provide resource name right after type")
-	}
-
-	s := strings.Split(args[0], ".")
-	if len(s) != 3 {
-		return nil, "", fmt.Errorf("Must include resource type argument in group.verion.kind format")
-	}
-
-	gvk = &GVK{
-		Group:   s[0],
-		Version: s[1],
-		Kind:    s[2],
-	}
-
-	resourceName = args[1]
-	return
-}
-
-type Resource struct {
-	C *client.Client
-}
-
-type GVK struct {
-	Group   string
-	Version string
-	Kind    string
-}
-
-type WriteRequest struct {
-	Metadata map[string]string `json:"metadata"`
-	Data     map[string]any    `json:"data"`
-	Owner    *pbresource.ID    `json:"owner"`
-}
-
-type ListResponse struct {
-	Resources []map[string]interface{} `json:"resources"`
-}
-
-func (resource *Resource) Read(gvk *GVK, resourceName string, q *client.QueryOptions) (map[string]interface{}, error) {
-	r := resource.C.NewRequest("GET", strings.ToLower(fmt.Sprintf("/api/%s/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind, resourceName)))
-	r.SetQueryOptions(q)
-	_, resp, err := resource.C.DoRequest(r)
-	if err != nil {
-		return nil, err
-	}
-	defer client.CloseResponseBody(resp)
-	if err := client.RequireOK(resp); err != nil {
-		return nil, err
-	}
-
-	var out map[string]interface{}
-	if err := client.DecodeBody(resp, &out); err != nil {
-		return nil, err
-	}
-
-	return out, nil
-}
-
-func (resource *Resource) Delete(gvk *GVK, resourceName string, q *client.QueryOptions) error {
-	r := resource.C.NewRequest("DELETE", strings.ToLower(fmt.Sprintf("/api/%s/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind, resourceName)))
-	r.SetQueryOptions(q)
-	_, resp, err := resource.C.DoRequest(r)
-	if err != nil {
-		return err
-	}
-	defer client.CloseResponseBody(resp)
-	if err := client.RequireHttpCodes(resp, http.StatusNoContent); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (resource *Resource) Apply(gvk *GVK, resourceName string, q *client.QueryOptions, payload *WriteRequest) (*map[string]interface{}, error) {
-	url := strings.ToLower(fmt.Sprintf("/api/%s/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind, resourceName))
-
-	r := resource.C.NewRequest("PUT", url)
-	r.SetQueryOptions(q)
-	r.Obj = payload
-	_, resp, err := resource.C.DoRequest(r)
-	if err != nil {
-		return nil, err
-	}
-	defer client.CloseResponseBody(resp)
-	if err := client.RequireOK(resp); err != nil {
-		return nil, err
-	}
-
-	var out map[string]interface{}
-
-	if err := client.DecodeBody(resp, &out); err != nil {
-		return nil, err
-	}
-
-	return &out, nil
-}
-
-func (resource *Resource) List(gvk *GVK, q *client.QueryOptions) (*ListResponse, error) {
-	r := resource.C.NewRequest("GET", strings.ToLower(fmt.Sprintf("/api/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind)))
-	r.SetQueryOptions(q)
-	_, resp, err := resource.C.DoRequest(r)
-	if err != nil {
-		return nil, err
-	}
-	defer client.CloseResponseBody(resp)
-	if err := client.RequireOK(resp); err != nil {
-		return nil, err
-	}
-
-	var out *ListResponse
-	if err := client.DecodeBody(resp, &out); err != nil {
-		return nil, err
-	}
-
-	return out, nil
-}
diff --git a/command/resource/helper_test.go b/command/resource/helper_test.go
deleted file mode 100644
index 003c2b7aa63aa..0000000000000
--- a/command/resource/helper_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"github.com/stretchr/testify/require"
-	"testing"
-)
-
-func Test_parseJson(t *testing.T) {
-	tests := []struct {
-		name    string
-		js      string
-		wantErr bool
-	}{
-		{"valid resource", "{\n    \"data\": {\n        \"genre\": \"GENRE_METAL\",\n        \"name\": \"Korn\"\n    },\n    \"generation\": \"01HAYWBPV1KMT2KWECJ6CEWDQ0\",\n    \"id\": {\n        \"name\": \"korn\",\n        \"tenancy\": {\n            \"namespace\": \"default\",\n            \"partition\": \"default\",\n            \"peerName\": \"local\"\n        },\n        \"type\": {\n            \"group\": \"demo\",\n            \"groupVersion\": \"v2\",\n            \"kind\": \"Artist\"\n        },\n        \"uid\": \"01HAYWBPV1KMT2KWECJ4NW88S1\"\n    },\n    \"metadata\": {\n        \"foo\": \"bar\"\n    },\n    \"version\": \"18\"\n}", false},
-		{"invalid resource", "{\n    \"data\": {\n        \"genre\": \"GENRE_METAL\",\n        \"name\": \"Korn\"\n    },\n    \"id\": {\n        \"name\": \"korn\",\n        \"tenancy\": {\n            \"namespace\": \"default\",\n            \"partition\": \"default\",\n            \"peerName\": \"local\"\n        },\n        \"type\": \"\"\n    },\n    \"metadata\": {\n        \"foo\": \"bar\"\n    }\n}\n", true},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := parseJson(tt.js)
-			if tt.wantErr {
-				require.Error(t, err)
-				require.Nil(t, got)
-			} else {
-				require.NoError(t, err)
-				require.NotNil(t, got)
-			}
-
-		})
-	}
-}
diff --git a/command/resource/list/list.go b/command/resource/list/list.go
deleted file mode 100644
index d0a5f398a6349..0000000000000
--- a/command/resource/list/list.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package list
-
-import (
-	"encoding/json"
-	"errors"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/mitchellh/cli"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/command/flags"
-	"github.com/hashicorp/consul/command/resource"
-	"github.com/hashicorp/consul/command/resource/client"
-)
-
-func New(ui cli.Ui) *cmd {
-	c := &cmd{UI: ui}
-	c.init()
-	return c
-}
-
-type cmd struct {
-	UI    cli.Ui
-	flags *flag.FlagSet
-	http  *flags.HTTPFlags
-	help  string
-
-	filePath string
-}
-
-func (c *cmd) init() {
-	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
-	c.http = &flags.HTTPFlags{}
-	c.flags.StringVar(&c.filePath, "f", "", "File path with resource definition")
-	flags.Merge(c.flags, c.http.ClientFlags())
-	flags.Merge(c.flags, c.http.ServerFlags())
-	flags.Merge(c.flags, c.http.MultiTenancyFlags())
-	flags.Merge(c.flags, c.http.AddPeerName())
-	c.help = flags.Usage(help, c.flags)
-}
-
-func (c *cmd) Run(args []string) int {
-	var gvk *resource.GVK
-	var opts *client.QueryOptions
-
-	if err := c.flags.Parse(args); err != nil {
-		if !errors.Is(err, flag.ErrHelp) {
-			c.UI.Error(fmt.Sprintf("Failed to parse args: %v", err))
-			return 1
-		}
-	}
-
-	if c.flags.Lookup("f").Value.String() != "" {
-		if c.filePath != "" {
-			parsedResource, err := resource.ParseResourceFromFile(c.filePath)
-			if err != nil {
-				c.UI.Error(fmt.Sprintf("Failed to decode resource from input file: %v", err))
-				return 1
-			}
-
-			if parsedResource == nil {
-				c.UI.Error("Unable to parse the file argument")
-				return 1
-			}
-
-			gvk = &resource.GVK{
-				Group:   parsedResource.Id.Type.GetGroup(),
-				Version: parsedResource.Id.Type.GetGroupVersion(),
-				Kind:    parsedResource.Id.Type.GetKind(),
-			}
-			opts = &client.QueryOptions{
-				Namespace:         parsedResource.Id.Tenancy.GetNamespace(),
-				Partition:         parsedResource.Id.Tenancy.GetPartition(),
-				Peer:              parsedResource.Id.Tenancy.GetPeerName(),
-				Token:             c.http.Token(),
-				RequireConsistent: !c.http.Stale(),
-			}
-		} else {
-			c.UI.Error(fmt.Sprintf("Please provide an input file with resource definition"))
-			return 1
-		}
-	} else {
-		var err error
-		// extract resource type
-		gvk, err = getResourceType(c.flags.Args())
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Incorrect argument format: %v", err))
-			return 1
-		}
-		// skip resource type to parse remaining args
-		inputArgs := c.flags.Args()[1:]
-		err = resource.ParseInputParams(inputArgs, c.flags)
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Error parsing input arguments: %v", err))
-			return 1
-		}
-		if c.filePath != "" {
-			c.UI.Error("Incorrect argument format: File argument is not needed when resource information is provided with the command")
-			return 1
-		}
-
-		opts = &client.QueryOptions{
-			Namespace:         c.http.Namespace(),
-			Partition:         c.http.Partition(),
-			Peer:              c.http.PeerName(),
-			Token:             c.http.Token(),
-			RequireConsistent: !c.http.Stale(),
-		}
-	}
-
-	config := api.DefaultConfig()
-
-	c.http.MergeOntoConfig(config)
-	resourceClient, err := client.NewClient(config)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error connect to Consul agent: %s", err))
-		return 1
-	}
-
-	res := resource.Resource{C: resourceClient}
-
-	entry, err := res.List(gvk, opts)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error reading resources for type %s: %v", gvk, err))
-		return 1
-	}
-
-	b, err := json.MarshalIndent(entry, "", "    ")
-	if err != nil {
-		c.UI.Error("Failed to encode output data")
-		return 1
-	}
-
-	c.UI.Info(string(b))
-	return 0
-}
-
-func getResourceType(args []string) (gvk *resource.GVK, e error) {
-	if len(args) < 1 {
-		return nil, fmt.Errorf("Must include resource type argument")
-	}
-	// it should not have resource name
-	if len(args) > 1 && !strings.HasPrefix(args[1], "-") {
-		return nil, fmt.Errorf("Must include flag arguments after resource type")
-	}
-
-	s := strings.Split(args[0], ".")
-	if len(s) < 3 {
-		return nil, fmt.Errorf("Must include resource type argument in group.verion.kind format")
-	}
-	gvk = &resource.GVK{
-		Group:   s[0],
-		Version: s[1],
-		Kind:    s[2],
-	}
-
-	return
-}
-
-func (c *cmd) Synopsis() string {
-	return synopsis
-}
-
-func (c *cmd) Help() string {
-	return flags.Usage(c.help, nil)
-}
-
-const synopsis = "Reads all resources by type"
-const help = `
-Usage: consul resource list [type] -partition=<default> -namespace=<default> -peer=<local>
-or
-consul resource list -f [path/to/file.hcl]
-
-Lists all the resources specified by the type under the given partition, namespace and peer
-and outputs in JSON format.
-
-Example:
-
-$ consul resource list catalog.v2beta1.Service card-processor -partition=billing -namespace=payments -peer=eu
-
-$ consul resource list -f=demo.hcl
-
-Sample demo.hcl:
-
-ID {
-	Type = gvk("group.version.kind")
-	Name = "resource-name"
-	Tenancy {
-	  Namespace = "default"
-	  Partition = "default"
-	  PeerName = "local"
-	}
-  }
-`
diff --git a/command/resource/list/list_test.go b/command/resource/list/list_test.go
deleted file mode 100644
index b8fc12556a144..0000000000000
--- a/command/resource/list/list_test.go
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package list
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/hashicorp/consul/agent"
-	"github.com/hashicorp/consul/testrpc"
-	"github.com/mitchellh/cli"
-
-	"github.com/stretchr/testify/require"
-
-	apply "github.com/hashicorp/consul/command/resource/apply"
-)
-
-func TestResourceListCommand(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-	a := agent.NewTestAgent(t, ``)
-	defer a.Shutdown()
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1")
-
-	applyCli := cli.NewMockUi()
-
-	applyCmd := apply.New(applyCli)
-	code := applyCmd.Run([]string{
-		"-f=../testdata/demo.hcl",
-		"-http-addr=" + a.HTTPAddr(),
-		"-token=root",
-	})
-	require.Equal(t, 0, code)
-	require.Empty(t, applyCli.ErrorWriter.String())
-	require.Contains(t, applyCli.OutputWriter.String(), "demo.v2.Artist 'korn' created.")
-
-	cases := []struct {
-		name      string
-		output    string
-		extraArgs []string
-	}{
-		{
-			name:   "sample output",
-			output: "\"name\": \"korn\"",
-			extraArgs: []string{
-				"demo.v2.artist",
-				"-namespace=default",
-				"-peer=local",
-				"-partition=default",
-			},
-		},
-		{
-			name:   "file input",
-			output: "\"name\": \"korn\"",
-			extraArgs: []string{
-				"-f=../testdata/demo.hcl",
-			},
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			ui := cli.NewMockUi()
-			c := New(ui)
-
-			args := []string{
-				"-http-addr=" + a.HTTPAddr(),
-				"-token=root",
-			}
-
-			args = append(args, tc.extraArgs...)
-
-			actualCode := c.Run(args)
-			require.Equal(t, 0, actualCode)
-			require.Empty(t, ui.ErrorWriter.String())
-			require.Contains(t, ui.OutputWriter.String(), tc.output)
-		})
-	}
-}
-
-func TestResourceListInvalidArgs(t *testing.T) {
-	t.Parallel()
-
-	a := agent.NewTestAgent(t, ``)
-	defer a.Shutdown()
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1")
-
-	type tc struct {
-		args         []string
-		expectedCode int
-		expectedErr  error
-	}
-
-	cases := map[string]tc{
-		"nil args": {
-			args:         nil,
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: Must include resource type argument"),
-		},
-		"minimum args required": {
-			args:         []string{},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: Must include resource type argument"),
-		},
-		"no file path": {
-			args: []string{
-				"-f",
-			},
-			expectedCode: 1,
-			expectedErr:  errors.New("Failed to parse args: flag needs an argument: -f"),
-		},
-		"file not found": {
-			args: []string{
-				"-f=../testdata/test.hcl",
-			},
-			expectedCode: 1,
-			expectedErr:  errors.New("Failed to load data: Failed to read file: open ../testdata/test.hcl: no such file or directory"),
-		},
-		"file parsing failure": {
-			args: []string{
-				"-f=../testdata/invalid_type.hcl",
-			},
-			expectedCode: 1,
-			expectedErr:  errors.New("Failed to decode resource from input file"),
-		},
-		"file argument with resource type": {
-			args: []string{
-				"demo.v2.artist",
-				"-namespace=default",
-				"-peer=local",
-				"-partition=default",
-				"-http-addr=" + a.HTTPAddr(),
-				"-token=root",
-				"-f=demo.hcl",
-			},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: File argument is not needed when resource information is provided with the command"),
-		},
-		"resource type invalid": {
-			args: []string{
-				"test",
-				"-namespace=default",
-				"-peer=local",
-				"-partition=default",
-			},
-			expectedCode: 1,
-			expectedErr:  errors.New("Must include resource type argument in group.verion.kind format"),
-		},
-		"resource name is provided": {
-			args: []string{
-				"demo.v2.artist",
-				"test",
-				"-namespace=default",
-				"-peer=local",
-				"-partition=default",
-			},
-			expectedCode: 1,
-			expectedErr:  errors.New("Must include flag arguments after resource type"),
-		},
-	}
-
-	for desc, tc := range cases {
-		t.Run(desc, func(t *testing.T) {
-			ui := cli.NewMockUi()
-			c := New(ui)
-
-			code := c.Run(tc.args)
-
-			require.Equal(t, tc.expectedCode, code)
-			require.Contains(t, ui.ErrorWriter.String(), tc.expectedErr.Error())
-		})
-	}
-}
diff --git a/command/resource/read/read.go b/command/resource/read/read.go
deleted file mode 100644
index fe35521056ba4..0000000000000
--- a/command/resource/read/read.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package read
-
-import (
-	"encoding/json"
-	"errors"
-	"flag"
-	"fmt"
-
-	"github.com/mitchellh/cli"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/command/flags"
-	"github.com/hashicorp/consul/command/resource"
-	"github.com/hashicorp/consul/command/resource/client"
-)
-
-func New(ui cli.Ui) *cmd {
-	c := &cmd{UI: ui}
-	c.init()
-	return c
-}
-
-type cmd struct {
-	UI    cli.Ui
-	flags *flag.FlagSet
-	http  *flags.HTTPFlags
-	help  string
-
-	filePath string
-}
-
-func (c *cmd) init() {
-	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
-	c.http = &flags.HTTPFlags{}
-	c.flags.StringVar(&c.filePath, "f", "", "File path with resource definition")
-	flags.Merge(c.flags, c.http.ClientFlags())
-	flags.Merge(c.flags, c.http.ServerFlags())
-	flags.Merge(c.flags, c.http.MultiTenancyFlags())
-	flags.Merge(c.flags, c.http.AddPeerName())
-	c.help = flags.Usage(help, c.flags)
-}
-
-func (c *cmd) Run(args []string) int {
-	var gvk *resource.GVK
-	var resourceName string
-	var opts *client.QueryOptions
-
-	if err := c.flags.Parse(args); err != nil {
-		if !errors.Is(err, flag.ErrHelp) {
-			c.UI.Error(fmt.Sprintf("Failed to parse args: %v", err))
-			return 1
-		}
-	}
-
-	if c.flags.Lookup("f").Value.String() != "" {
-		if c.filePath != "" {
-			parsedResource, err := resource.ParseResourceFromFile(c.filePath)
-			if err != nil {
-				c.UI.Error(fmt.Sprintf("Failed to decode resource from input file: %v", err))
-				return 1
-			}
-
-			if parsedResource == nil {
-				c.UI.Error("Unable to parse the file argument")
-				return 1
-			}
-
-			gvk = &resource.GVK{
-				Group:   parsedResource.Id.Type.GetGroup(),
-				Version: parsedResource.Id.Type.GetGroupVersion(),
-				Kind:    parsedResource.Id.Type.GetKind(),
-			}
-			resourceName = parsedResource.Id.GetName()
-			opts = &client.QueryOptions{
-				Namespace:         parsedResource.Id.Tenancy.GetNamespace(),
-				Partition:         parsedResource.Id.Tenancy.GetPartition(),
-				Peer:              parsedResource.Id.Tenancy.GetPeerName(),
-				Token:             c.http.Token(),
-				RequireConsistent: !c.http.Stale(),
-			}
-		} else {
-			c.UI.Error(fmt.Sprintf("Please provide an input file with resource definition"))
-			return 1
-		}
-	} else {
-		if len(args) < 2 {
-			c.UI.Error("Incorrect argument format: Must specify two arguments: resource type and resource name")
-			return 1
-		}
-		var err error
-		gvk, resourceName, err = resource.GetTypeAndResourceName(args)
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Incorrect argument format: %s", err))
-			return 1
-		}
-
-		inputArgs := args[2:]
-		err = resource.ParseInputParams(inputArgs, c.flags)
-		if err != nil {
-			c.UI.Error(fmt.Sprintf("Error parsing input arguments: %v", err))
-			return 1
-		}
-		if c.filePath != "" {
-			c.UI.Error("Incorrect argument format: File argument is not needed when resource information is provided with the command")
-			return 1
-		}
-		opts = &client.QueryOptions{
-			Namespace:         c.http.Namespace(),
-			Partition:         c.http.Partition(),
-			Peer:              c.http.PeerName(),
-			Token:             c.http.Token(),
-			RequireConsistent: !c.http.Stale(),
-		}
-	}
-
-	config := api.DefaultConfig()
-
-	c.http.MergeOntoConfig(config)
-	resourceClient, err := client.NewClient(config)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error connect to Consul agent: %s", err))
-		return 1
-	}
-
-	res := resource.Resource{C: resourceClient}
-
-	entry, err := res.Read(gvk, resourceName, opts)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error reading resource %s/%s: %v", gvk, resourceName, err))
-		return 1
-	}
-
-	b, err := json.MarshalIndent(entry, "", "    ")
-	if err != nil {
-		c.UI.Error("Failed to encode output data")
-		return 1
-	}
-
-	c.UI.Info(string(b))
-	return 0
-}
-
-func (c *cmd) Synopsis() string {
-	return synopsis
-}
-
-func (c *cmd) Help() string {
-	return flags.Usage(c.help, nil)
-}
-
-const synopsis = "Read resource information"
-const help = `
-Usage: You have two options to read the resource specified by the given
-type, name, partition, namespace and peer and outputs its JSON representation.
-
-consul resource read [type] [name] -partition=<default> -namespace=<default> -peer=<local>
-consul resource read -f [resource_file_path]
-
-But you could only use one of the approaches.
-
-Example:
-
-$ consul resource read catalog.v2beta1.Service card-processor -partition=billing -namespace=payments -peer=eu
-$ consul resource read -f resource.hcl
-
-In resource.hcl, it could be:
-ID {
-  Type = gvk("catalog.v2beta1.Service")
-  Name = "card-processor"
-  Tenancy {
-    Namespace = "payments"
-    Partition = "billing"
-    PeerName = "eu"
-  }
-}
-`
diff --git a/command/resource/read/read_test.go b/command/resource/read/read_test.go
deleted file mode 100644
index 766f86b02cc19..0000000000000
--- a/command/resource/read/read_test.go
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-package read
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/mitchellh/cli"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/agent"
-	"github.com/hashicorp/consul/command/resource/apply"
-	"github.com/hashicorp/consul/testrpc"
-)
-
-func TestResourceReadInvalidArgs(t *testing.T) {
-	t.Parallel()
-
-	type tc struct {
-		args         []string
-		expectedCode int
-		expectedErr  error
-	}
-
-	cases := map[string]tc{
-		"nil args": {
-			args:         nil,
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: Must specify two arguments: resource type and resource name"),
-		},
-		"empty args": {
-			args:         []string{},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: Must specify two arguments: resource type and resource name"),
-		},
-		"missing file path": {
-			args:         []string{"-f"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Failed to parse args: flag needs an argument: -f"),
-		},
-		"file not found": {
-			args:         []string{"-f=../testdata/test.hcl"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Failed to load data: Failed to read file: open ../testdata/test.hcl: no such file or directory"),
-		},
-		"provide type and name": {
-			args:         []string{"a.b.c"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: Must specify two arguments: resource type and resource name"),
-		},
-		"provide type and name with -f": {
-			args:         []string{"a.b.c", "name", "-f", "test.hcl"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: File argument is not needed when resource information is provided with the command"),
-		},
-		"provide type and name with -f and other flags": {
-			args:         []string{"a.b.c", "name", "-f", "test.hcl", "-namespace", "default"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: File argument is not needed when resource information is provided with the command"),
-		},
-		"does not provide resource name after type": {
-			args:         []string{"a.b.c", "-namespace", "default"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: Must provide resource name right after type"),
-		},
-		"invalid resource type format": {
-			args:         []string{"a.", "name", "-namespace", "default"},
-			expectedCode: 1,
-			expectedErr:  errors.New("Incorrect argument format: Must include resource type argument in group.verion.kind format"),
-		},
-	}
-
-	for desc, tc := range cases {
-		t.Run(desc, func(t *testing.T) {
-			ui := cli.NewMockUi()
-			c := New(ui)
-
-			code := c.Run(tc.args)
-
-			require.Equal(t, tc.expectedCode, code)
-			require.Contains(t, ui.ErrorWriter.String(), tc.expectedErr.Error())
-		})
-	}
-}
-
-func createResource(t *testing.T, a *agent.TestAgent) {
-	applyUi := cli.NewMockUi()
-	applyCmd := apply.New(applyUi)
-
-	args := []string{
-		"-http-addr=" + a.HTTPAddr(),
-		"-token=root",
-	}
-
-	args = append(args, []string{"-f=../testdata/demo.hcl"}...)
-
-	code := applyCmd.Run(args)
-	require.Equal(t, 0, code)
-	require.Empty(t, applyUi.ErrorWriter.String())
-}
-
-func TestResourceRead(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	a := agent.NewTestAgent(t, ``)
-	defer a.Shutdown()
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1")
-
-	defaultCmdArgs := []string{
-		"-http-addr=" + a.HTTPAddr(),
-		"-token=root",
-	}
-
-	createResource(t, a)
-	cases := []struct {
-		name         string
-		args         []string
-		expectedCode int
-		errMsg       string
-	}{
-		{
-			name:         "read resource in hcl format",
-			args:         []string{"-f=../testdata/demo.hcl"},
-			expectedCode: 0,
-			errMsg:       "",
-		},
-		{
-			name:         "read resource in command line format",
-			args:         []string{"demo.v2.Artist", "korn", "-partition=default", "-namespace=default", "-peer=local"},
-			expectedCode: 0,
-			errMsg:       "",
-		},
-		{
-			name:         "read resource that doesn't exist",
-			args:         []string{"demo.v2.Artist", "fake-korn", "-partition=default", "-namespace=default", "-peer=local"},
-			expectedCode: 1,
-			errMsg:       "Error reading resource &{demo v2 Artist}/fake-korn: Unexpected response code: 404 (rpc error: code = NotFound desc = resource not found)\n",
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			ui := cli.NewMockUi()
-			c := New(ui)
-			cliArgs := append(tc.args, defaultCmdArgs...)
-			code := c.Run(cliArgs)
-			require.Equal(t, ui.ErrorWriter.String(), tc.errMsg)
-			require.Equal(t, tc.expectedCode, code)
-		})
-	}
-}
diff --git a/command/resource/resource.go b/command/resource/resource.go
deleted file mode 100644
index 709b03e4e49d2..0000000000000
--- a/command/resource/resource.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"github.com/mitchellh/cli"
-
-	"github.com/hashicorp/consul/command/flags"
-)
-
-func New() *cmd {
-	return &cmd{}
-}
-
-type cmd struct{}
-
-func (c *cmd) Run(args []string) int {
-	return cli.RunResultHelp
-}
-
-func (c *cmd) Synopsis() string {
-	return synopsis
-}
-
-func (c *cmd) Help() string {
-	return flags.Usage(help, nil)
-}
-
-const synopsis = "Interact with Consul's resources"
-const help = `
-Usage: consul resource <subcommand> [options]
-
-This command has subcommands for interacting with Consul's resources.
-Here are some simple examples, and more detailed examples are available
-in the subcommands or the documentation.
-
-Read a resource:
-
-$ consul resource read [type] [name] -partition=<default> -namespace=<default> -peer=<local> -consistent=<false> -json
-
-Write/update a resource:
-
-$ consul resource apply -f=<file-path>
-
-List resources by type:
-
-$ consul resource list [type] -partition=<default> -namespace=<default> -peer=<local>
-
-Run
-
-consul resource <subcommand> -h 
-
-for help on that subcommand.
-`
diff --git a/command/resource/testdata/demo.hcl b/command/resource/testdata/demo.hcl
deleted file mode 100644
index 35e72aba31258..0000000000000
--- a/command/resource/testdata/demo.hcl
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-ID {
-  Type = gvk("demo.v2.Artist")
-  Name = "korn"
-  Tenancy {
-    Namespace = "default"
-    Partition = "default"
-    PeerName = "local"
-  }
-}
-
-Data {
-  Name = "Korn"
-  Genre = "GENRE_METAL"
-}
-
-Metadata = {
-  "foo" = "bar"
-}
diff --git a/command/resource/testdata/invalid.hcl b/command/resource/testdata/invalid.hcl
deleted file mode 100644
index 04c08e9212f21..0000000000000
--- a/command/resource/testdata/invalid.hcl
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-ID {
-  Type = gvk("demo.v2.Artist")
-  Name = "korn"
-  Tenancy {
-    Namespace = "default"
-    Partition = "default"
-    PeerName = "local"
-  }
-}
-
-D {
-  Name = "Korn"
-  Genre = "GENRE_METAL"
-}
-
-Metadata = {
-  "foo" = "bar"
-}
diff --git a/command/resource/testdata/invalid_type.hcl b/command/resource/testdata/invalid_type.hcl
deleted file mode 100644
index b3b87ae2458b0..0000000000000
--- a/command/resource/testdata/invalid_type.hcl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-D {
-  Type = gvk("demo.v2.Artist")
-  Tenancy {
-    Namespace = "default"
-    Partition = "default"
-    PeerName = "local"
-  }
-}
diff --git a/command/resource/testdata/nested_data.hcl b/command/resource/testdata/nested_data.hcl
deleted file mode 100644
index aab8aa401ee9a..0000000000000
--- a/command/resource/testdata/nested_data.hcl
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-ID {
-  Type = gvk("mesh.v2beta1.Destinations")
-  Name = "api"
-}
-
-Data {
-  Workloads {
-    Prefixes = ["api"]
-  }
-
-  Destinations = [
-    {
-      DestinationRef = {
-        Type = gvk("catalog.v2beta1.Service")
-        Name = "db"
-      }
-
-      DestinationPort = "tcp"
-
-      IpPort = {
-        Port = 1234
-      }
-    }
-  ]
-}
diff --git a/command/rtt/rtt.go b/command/rtt/rtt.go
index db9e3efd06be2..dfd50d9bf4db2 100644
--- a/command/rtt/rtt.go
+++ b/command/rtt/rtt.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package rtt
 
 import (
diff --git a/command/rtt/rtt_test.go b/command/rtt/rtt_test.go
index 4b0621cfe33f8..a5bf58a24bb93 100644
--- a/command/rtt/rtt_test.go
+++ b/command/rtt/rtt_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package rtt
 
 import (
diff --git a/command/services/config.go b/command/services/config.go
index 1a173078d6f04..56a9562234c88 100644
--- a/command/services/config.go
+++ b/command/services/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package services
 
 import (
diff --git a/command/services/config_test.go b/command/services/config_test.go
index b8a2207fb9e86..b54a793aa4740 100644
--- a/command/services/config_test.go
+++ b/command/services/config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package services
 
 import (
diff --git a/command/services/deregister/deregister.go b/command/services/deregister/deregister.go
index bff2c972704a8..3f352b36a68ad 100644
--- a/command/services/deregister/deregister.go
+++ b/command/services/deregister/deregister.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package deregister
 
 import (
diff --git a/command/services/deregister/deregister_test.go b/command/services/deregister/deregister_test.go
index 2ee9d8de5fab5..b2b7cf577ebac 100644
--- a/command/services/deregister/deregister_test.go
+++ b/command/services/deregister/deregister_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package deregister
 
 import (
diff --git a/command/services/export/export.go b/command/services/export/export.go
deleted file mode 100644
index 49a5756602006..0000000000000
--- a/command/services/export/export.go
+++ /dev/null
@@ -1,263 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package export
-
-import (
-	"errors"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/mitchellh/cli"
-
-	"github.com/hashicorp/consul/agent"
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/command/flags"
-)
-
-func New(ui cli.Ui) *cmd {
-	c := &cmd{UI: ui}
-	c.init()
-	return c
-}
-
-type cmd struct {
-	UI    cli.Ui
-	flags *flag.FlagSet
-	http  *flags.HTTPFlags
-	help  string
-
-	serviceName    string
-	peerNames      string
-	partitionNames string
-}
-
-func (c *cmd) init() {
-	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
-
-	c.flags.StringVar(&c.serviceName, "name", "", "(Required) Specify the name of the service you want to export.")
-	c.flags.StringVar(&c.peerNames, "consumer-peers", "", "(Required) A comma-separated list of cluster peers to export the service to. In Consul Enterprise, this flag is optional if -consumer-partitions is specified.")
-	c.flags.StringVar(&c.partitionNames, "consumer-partitions", "", "(Enterprise only) A comma-separated list of admin partitions within the same datacenter to export the service to. This flag is optional if -consumer-peers is specified.")
-
-	c.http = &flags.HTTPFlags{}
-	flags.Merge(c.flags, c.http.ClientFlags())
-	flags.Merge(c.flags, c.http.MultiTenancyFlags())
-	c.help = flags.Usage(help, c.flags)
-}
-
-func (c *cmd) Run(args []string) int {
-	if err := c.flags.Parse(args); err != nil {
-		return 1
-	}
-
-	if err := c.validateFlags(); err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
-	peerNames, err := c.getPeerNames()
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
-	partitionNames, err := c.getPartitionNames()
-	if err != nil {
-		c.UI.Error(err.Error())
-		return 1
-	}
-
-	client, err := c.http.APIClient()
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error connect to Consul agent: %s", err))
-		return 1
-	}
-
-	// Name matches partition, so "default" if none specified
-	cfgName := "default"
-	if c.http.Partition() != "" {
-		cfgName = c.http.Partition()
-	}
-
-	entry, _, err := client.ConfigEntries().Get(api.ExportedServices, cfgName, &api.QueryOptions{Namespace: ""})
-	if err != nil && !strings.Contains(err.Error(), agent.ConfigEntryNotFoundErr) {
-		c.UI.Error(fmt.Sprintf("Error reading config entry %s/%s: %v", "exported-services", "default", err))
-		return 1
-	}
-
-	var cfg *api.ExportedServicesConfigEntry
-	if entry == nil {
-		cfg = c.initializeConfigEntry(cfgName, peerNames, partitionNames)
-	} else {
-		existingCfg, ok := entry.(*api.ExportedServicesConfigEntry)
-		if !ok {
-			c.UI.Error(fmt.Sprintf("Existing config entry has incorrect type: %t", entry))
-			return 1
-		}
-
-		cfg = c.updateConfigEntry(existingCfg, peerNames, partitionNames)
-	}
-
-	ok, _, err := client.ConfigEntries().CAS(cfg, cfg.GetModifyIndex(), nil)
-	if err != nil {
-		c.UI.Error(fmt.Sprintf("Error writing config entry: %s", err))
-		return 1
-	} else if !ok {
-		c.UI.Error(fmt.Sprintf("Config entry was changed during update. Please try again"))
-		return 1
-	}
-
-	switch {
-	case len(c.peerNames) > 0 && len(c.partitionNames) > 0:
-		c.UI.Info(fmt.Sprintf("Successfully exported service %q to cluster peers %q and to partitions %q", c.serviceName, c.peerNames, c.partitionNames))
-	case len(c.peerNames) > 0:
-		c.UI.Info(fmt.Sprintf("Successfully exported service %q to cluster peers %q", c.serviceName, c.peerNames))
-	case len(c.partitionNames) > 0:
-		c.UI.Info(fmt.Sprintf("Successfully exported service %q to partitions %q", c.serviceName, c.partitionNames))
-	}
-
-	return 0
-}
-
-func (c *cmd) validateFlags() error {
-	if c.serviceName == "" {
-		return errors.New("Missing the required -name flag")
-	}
-
-	if c.peerNames == "" && c.partitionNames == "" {
-		return errors.New("Missing the required -consumer-peers or -consumer-partitions flag")
-	}
-
-	return nil
-}
-
-func (c *cmd) getPeerNames() ([]string, error) {
-	var peerNames []string
-	if c.peerNames != "" {
-		peerNames = strings.Split(c.peerNames, ",")
-		for _, peerName := range peerNames {
-			if peerName == "" {
-				return nil, fmt.Errorf("Invalid peer %q", peerName)
-			}
-		}
-	}
-	return peerNames, nil
-}
-
-func (c *cmd) getPartitionNames() ([]string, error) {
-	var partitionNames []string
-	if c.partitionNames != "" {
-		partitionNames = strings.Split(c.partitionNames, ",")
-		for _, partitionName := range partitionNames {
-			if partitionName == "" {
-				return nil, fmt.Errorf("Invalid partition %q", partitionName)
-			}
-		}
-	}
-	return partitionNames, nil
-}
-
-func (c *cmd) initializeConfigEntry(cfgName string, peerNames, partitionNames []string) *api.ExportedServicesConfigEntry {
-	return &api.ExportedServicesConfigEntry{
-		Name: cfgName,
-		Services: []api.ExportedService{
-			{
-				Name:      c.serviceName,
-				Namespace: c.http.Namespace(),
-				Consumers: buildConsumers(peerNames, partitionNames),
-			},
-		},
-	}
-}
-
-func (c *cmd) updateConfigEntry(cfg *api.ExportedServicesConfigEntry, peerNames, partitionNames []string) *api.ExportedServicesConfigEntry {
-	serviceExists := false
-
-	for i, service := range cfg.Services {
-		if service.Name == c.serviceName && service.Namespace == c.http.Namespace() {
-			serviceExists = true
-
-			// Add a consumer for each peer where one doesn't already exist
-			for _, peerName := range peerNames {
-				peerExists := false
-				for _, consumer := range service.Consumers {
-					if consumer.Peer == peerName {
-						peerExists = true
-						break
-					}
-				}
-				if !peerExists {
-					cfg.Services[i].Consumers = append(cfg.Services[i].Consumers, api.ServiceConsumer{Peer: peerName})
-				}
-			}
-
-			// Add a consumer for each partition where one doesn't already exist
-			for _, partitionName := range partitionNames {
-				partitionExists := false
-
-				for _, consumer := range service.Consumers {
-					if consumer.Partition == partitionName {
-						partitionExists = true
-						break
-					}
-				}
-				if !partitionExists {
-					cfg.Services[i].Consumers = append(cfg.Services[i].Consumers, api.ServiceConsumer{Partition: partitionName})
-				}
-			}
-		}
-	}
-
-	if !serviceExists {
-		cfg.Services = append(cfg.Services, api.ExportedService{
-			Name:      c.serviceName,
-			Namespace: c.http.Namespace(),
-			Consumers: buildConsumers(peerNames, partitionNames),
-		})
-	}
-
-	return cfg
-}
-
-func buildConsumers(peerNames []string, partitionNames []string) []api.ServiceConsumer {
-	var consumers []api.ServiceConsumer
-	for _, peer := range peerNames {
-		consumers = append(consumers, api.ServiceConsumer{
-			Peer: peer,
-		})
-	}
-	for _, partition := range partitionNames {
-		consumers = append(consumers, api.ServiceConsumer{
-			Partition: partition,
-		})
-	}
-	return consumers
-}
-
-//========
-
-func (c *cmd) Synopsis() string {
-	return synopsis
-}
-
-func (c *cmd) Help() string {
-	return flags.Usage(c.help, nil)
-}
-
-const (
-	synopsis = "Export a service from one peer or admin partition to another"
-	help     = `
-Usage: consul services export [options] -name <service name> -consumer-peers <other cluster name>
-
-  Export a service to a peered cluster.
-
-      $ consul services export -name=web -consumer-peers=other-cluster
-
-  Use the -consumer-partitions flag instead of -consumer-peers to export to a different partition in the same cluster.
-
-      $ consul services export -name=web -consumer-partitions=other-partition
-
-  Additional flags and more advanced use cases are detailed below.
-`
-)
diff --git a/command/services/export/export_test.go b/command/services/export/export_test.go
deleted file mode 100644
index aa13aff63c238..0000000000000
--- a/command/services/export/export_test.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package export
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/mitchellh/cli"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/agent"
-	"github.com/hashicorp/consul/testrpc"
-)
-
-func TestExportCommand(t *testing.T) {
-
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	t.Run("help output should have no tabs", func(t *testing.T) {
-		if strings.ContainsRune(New(cli.NewMockUi()).Help(), '\t') {
-			t.Fatal("help has tabs")
-		}
-	})
-
-	a := agent.NewTestAgent(t, ``)
-	t.Cleanup(func() { _ = a.Shutdown() })
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1")
-	t.Run("peer or partition is required", func(t *testing.T) {
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-
-		args := []string{
-			"-name=testservice",
-		}
-
-		code := cmd.Run(args)
-		require.Equal(t, 1, code, "err: %s", ui.ErrorWriter.String())
-		require.Contains(t, ui.ErrorWriter.String(), "Missing the required -consumer-peers or -consumer-partitions flag")
-	})
-	t.Run("service name is required", func(t *testing.T) {
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-
-		args := []string{}
-
-		code := cmd.Run(args)
-		require.Equal(t, 1, code, "err: %s", ui.ErrorWriter.String())
-		require.Contains(t, ui.ErrorWriter.String(), "Missing the required -name flag")
-	})
-
-	t.Run("valid peer name is required", func(t *testing.T) {
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-
-		args := []string{
-			"-name=testservice",
-			"-consumer-peers=a,",
-		}
-
-		code := cmd.Run(args)
-		require.Equal(t, 1, code, "err: %s", ui.ErrorWriter.String())
-		require.Contains(t, ui.ErrorWriter.String(), "Invalid peer")
-	})
-
-	t.Run("valid partition name is required", func(t *testing.T) {
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-
-		args := []string{
-			"-name=testservice",
-			"-consumer-partitions=a,",
-		}
-
-		code := cmd.Run(args)
-		require.Equal(t, 1, code, "err: %s", ui.ErrorWriter.String())
-		require.Contains(t, ui.ErrorWriter.String(), "Invalid partition")
-	})
-
-	t.Run("initial config entry should be created w/ partitions", func(t *testing.T) {
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-name=testservice",
-			"-consumer-partitions=a,b",
-		}
-
-		code := cmd.Run(args)
-		require.Equal(t, 0, code)
-		require.Contains(t, ui.OutputWriter.String(), "Successfully exported service")
-	})
-
-	t.Run("initial config entry should be created w/ peers", func(t *testing.T) {
-
-		ui := cli.NewMockUi()
-		cmd := New(ui)
-
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-name=testservice",
-			"-consumer-peers=a,b",
-		}
-
-		code := cmd.Run(args)
-		require.Equal(t, 0, code)
-		require.Contains(t, ui.OutputWriter.String(), "Successfully exported service")
-	})
-
-	t.Run("existing config entry should be updated w/ new peers and partitions", func(t *testing.T) {
-
-		ui := cli.NewMockUi()
-
-		args := []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-name=testservice",
-			"-consumer-peers=a,b",
-		}
-
-		code := New(ui).Run(args)
-		require.Equal(t, 0, code)
-		require.Contains(t, ui.OutputWriter.String(), `Successfully exported service "testservice" to cluster peers "a,b"`)
-
-		args = []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-name=testservice",
-			"-consumer-peers=c",
-		}
-
-		code = New(ui).Run(args)
-		require.Equal(t, 0, code)
-		require.Contains(t, ui.OutputWriter.String(), `Successfully exported service "testservice" to cluster peers "c"`)
-
-		args = []string{
-			"-http-addr=" + a.HTTPAddr(),
-			"-name=testservice",
-			"-consumer-partitions=d",
-		}
-
-		code = New(ui).Run(args)
-		require.Equal(t, 0, code)
-		require.Contains(t, ui.OutputWriter.String(), `Successfully exported service "testservice" to partitions "d"`)
-	})
-}
diff --git a/command/services/register/register.go b/command/services/register/register.go
index 33599dda01323..33e5e2ab539ba 100644
--- a/command/services/register/register.go
+++ b/command/services/register/register.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package register
 
 import (
diff --git a/command/services/register/register_test.go b/command/services/register/register_test.go
index 24d5f4fb87ea1..80badaaad3480 100644
--- a/command/services/register/register_test.go
+++ b/command/services/register/register_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package register
 
 import (
diff --git a/command/services/services.go b/command/services/services.go
index 521092f063ae5..0e050d77d3e42 100644
--- a/command/services/services.go
+++ b/command/services/services.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package services
 
 import (
diff --git a/command/services/services_test.go b/command/services/services_test.go
index a2d4b45262be5..c7521718a33a5 100644
--- a/command/services/services_test.go
+++ b/command/services/services_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package services
 
 import (
diff --git a/command/snapshot/inspect/formatter.go b/command/snapshot/inspect/formatter.go
index 53da998b25c8b..1258fb8502eb2 100644
--- a/command/snapshot/inspect/formatter.go
+++ b/command/snapshot/inspect/formatter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package inspect
 
 import (
diff --git a/command/snapshot/inspect/formatter_test.go b/command/snapshot/inspect/formatter_test.go
index 48b8d1da4d966..428995a27c53a 100644
--- a/command/snapshot/inspect/formatter_test.go
+++ b/command/snapshot/inspect/formatter_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package inspect
 
 import (
diff --git a/command/snapshot/inspect/snapshot_inspect.go b/command/snapshot/inspect/snapshot_inspect.go
index 483e937eb4810..2a09067a16b45 100644
--- a/command/snapshot/inspect/snapshot_inspect.go
+++ b/command/snapshot/inspect/snapshot_inspect.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package inspect
 
 import (
diff --git a/command/snapshot/inspect/snapshot_inspect_test.go b/command/snapshot/inspect/snapshot_inspect_test.go
index 1f7ff69f1bc35..5c302c6a7aaf6 100644
--- a/command/snapshot/inspect/snapshot_inspect_test.go
+++ b/command/snapshot/inspect/snapshot_inspect_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package inspect
 
 import (
diff --git a/command/snapshot/restore/snapshot_restore.go b/command/snapshot/restore/snapshot_restore.go
index aaa08a162d7a8..ae09f0f40b707 100644
--- a/command/snapshot/restore/snapshot_restore.go
+++ b/command/snapshot/restore/snapshot_restore.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package restore
 
 import (
diff --git a/command/snapshot/restore/snapshot_restore_test.go b/command/snapshot/restore/snapshot_restore_test.go
index 61c8b2bed0d67..38a54967e1e98 100644
--- a/command/snapshot/restore/snapshot_restore_test.go
+++ b/command/snapshot/restore/snapshot_restore_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package restore
 
 import (
diff --git a/command/snapshot/save/snapshot_save.go b/command/snapshot/save/snapshot_save.go
index ac333e8ca3d36..6820406067e6a 100644
--- a/command/snapshot/save/snapshot_save.go
+++ b/command/snapshot/save/snapshot_save.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package save
 
 import (
diff --git a/command/snapshot/save/snapshot_save_test.go b/command/snapshot/save/snapshot_save_test.go
index 44d07aebb882f..5c916415d45d3 100644
--- a/command/snapshot/save/snapshot_save_test.go
+++ b/command/snapshot/save/snapshot_save_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package save
 
 import (
diff --git a/command/snapshot/snapshot_command.go b/command/snapshot/snapshot_command.go
index 2e96550e191fd..0ef9af526a7cc 100644
--- a/command/snapshot/snapshot_command.go
+++ b/command/snapshot/snapshot_command.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package snapshot
 
 import (
diff --git a/command/snapshot/snapshot_command_test.go b/command/snapshot/snapshot_command_test.go
index d38f5cde9271b..5ac6236bc6ca2 100644
--- a/command/snapshot/snapshot_command_test.go
+++ b/command/snapshot/snapshot_command_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package snapshot
 
 import (
diff --git a/command/tls/ca/create/tls_ca_create.go b/command/tls/ca/create/tls_ca_create.go
index 43a9c249f154e..fd97acfd2c50e 100644
--- a/command/tls/ca/create/tls_ca_create.go
+++ b/command/tls/ca/create/tls_ca_create.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package create
 
 import (
diff --git a/command/tls/ca/create/tls_ca_create_test.go b/command/tls/ca/create/tls_ca_create_test.go
index aee2b69062cff..72292ee5b6424 100644
--- a/command/tls/ca/create/tls_ca_create_test.go
+++ b/command/tls/ca/create/tls_ca_create_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package create
 
 import (
diff --git a/command/tls/ca/tls_ca.go b/command/tls/ca/tls_ca.go
index ef943a4fbfe0e..64fe986ccd388 100644
--- a/command/tls/ca/tls_ca.go
+++ b/command/tls/ca/tls_ca.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
diff --git a/command/tls/ca/tls_ca_test.go b/command/tls/ca/tls_ca_test.go
index d24c15665f307..eee5f400911e1 100644
--- a/command/tls/ca/tls_ca_test.go
+++ b/command/tls/ca/tls_ca_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ca
 
 import (
diff --git a/command/tls/cert/create/tls_cert_create.go b/command/tls/cert/create/tls_cert_create.go
index 9e0f92173bd15..75c9b1ada1fca 100644
--- a/command/tls/cert/create/tls_cert_create.go
+++ b/command/tls/cert/create/tls_cert_create.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package create
 
 import (
diff --git a/command/tls/cert/create/tls_cert_create_test.go b/command/tls/cert/create/tls_cert_create_test.go
index 6e807d4a4fc71..e5134b1bd1ab0 100644
--- a/command/tls/cert/create/tls_cert_create_test.go
+++ b/command/tls/cert/create/tls_cert_create_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package create
 
 import (
diff --git a/command/tls/cert/tls_cert.go b/command/tls/cert/tls_cert.go
index 38551ef6c621d..d6fe01bddbe33 100644
--- a/command/tls/cert/tls_cert.go
+++ b/command/tls/cert/tls_cert.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cert
 
 import (
diff --git a/command/tls/cert/tls_cert_test.go b/command/tls/cert/tls_cert_test.go
index 912ff3e58e4b2..958c7f76fa7ca 100644
--- a/command/tls/cert/tls_cert_test.go
+++ b/command/tls/cert/tls_cert_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cert
 
 import (
diff --git a/command/tls/tls.go b/command/tls/tls.go
index a25a313ed02ec..c3a5e35451352 100644
--- a/command/tls/tls.go
+++ b/command/tls/tls.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tls
 
 import (
diff --git a/command/tls/tls_test.go b/command/tls/tls_test.go
index 7bd99fd4c11c4..ccf8c22ac034e 100644
--- a/command/tls/tls_test.go
+++ b/command/tls/tls_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tls
 
 import (
diff --git a/command/troubleshoot/proxy/troubleshoot_proxy.go b/command/troubleshoot/proxy/troubleshoot_proxy.go
index 1f513043fb17d..57d982dea0dbe 100644
--- a/command/troubleshoot/proxy/troubleshoot_proxy.go
+++ b/command/troubleshoot/proxy/troubleshoot_proxy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/command/troubleshoot/troubleshoot.go b/command/troubleshoot/troubleshoot.go
index 36c77ff104352..2935d52cf8d96 100644
--- a/command/troubleshoot/troubleshoot.go
+++ b/command/troubleshoot/troubleshoot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package troubleshoot
 
 import (
diff --git a/command/troubleshoot/troubleshoot_test.go b/command/troubleshoot/troubleshoot_test.go
index a0e3f1c06957f..65e0042753be3 100644
--- a/command/troubleshoot/troubleshoot_test.go
+++ b/command/troubleshoot/troubleshoot_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package troubleshoot
 
 import (
diff --git a/command/troubleshoot/upstreams/troubleshoot_upstreams.go b/command/troubleshoot/upstreams/troubleshoot_upstreams.go
index 5796dac583764..8f941699ce0c2 100644
--- a/command/troubleshoot/upstreams/troubleshoot_upstreams.go
+++ b/command/troubleshoot/upstreams/troubleshoot_upstreams.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package upstreams
 
 import (
@@ -80,7 +77,7 @@ func (c *cmd) Run(args []string) int {
 		return 1
 	}
 
-	c.UI.HeaderOutput(fmt.Sprintf("Upstreams (explicit upstreams only) (%v)\n", len(envoyIDs)))
+	c.UI.HeaderOutput(fmt.Sprintf("Upstreams (explicit upstreams only) (%v)", len(envoyIDs)))
 	for _, u := range envoyIDs {
 		c.UI.UnchangedOutput(u)
 	}
diff --git a/command/validate/validate.go b/command/validate/validate.go
index 1a9630c65f47e..67370b792c4d5 100644
--- a/command/validate/validate.go
+++ b/command/validate/validate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package validate
 
 import (
diff --git a/command/validate/validate_test.go b/command/validate/validate_test.go
index dc5b519dbe31a..29091f1292c6e 100644
--- a/command/validate/validate_test.go
+++ b/command/validate/validate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package validate
 
 import (
diff --git a/command/version/formatter.go b/command/version/formatter.go
index 612c305a7985d..c5753f10597c9 100644
--- a/command/version/formatter.go
+++ b/command/version/formatter.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package version
 
 import (
@@ -49,10 +46,6 @@ func (_ *prettyFormatter) Format(info *VersionInfo) (string, error) {
 
 	buffer.WriteString(fmt.Sprintf("Build Date %s\n", info.BuildDate.Format(time.RFC3339)))
 
-	if info.FIPS != "" {
-		buffer.WriteString(fmt.Sprintf("FIPS: %s\n", info.FIPS))
-	}
-
 	var supplement string
 	if info.RPC.Default < info.RPC.Max {
 		supplement = fmt.Sprintf(" (agent will automatically use protocol >%d when speaking to compatible agents)",
diff --git a/command/version/formatter_test.go b/command/version/formatter_test.go
index 45e4019dfb5c8..094f8ede17be0 100644
--- a/command/version/formatter_test.go
+++ b/command/version/formatter_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package version
 
 import (
diff --git a/command/version/version.go b/command/version/version.go
index da8978c3e72f7..9cda50ed85f55 100644
--- a/command/version/version.go
+++ b/command/version/version.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package version
 
 import (
@@ -9,11 +6,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mitchellh/cli"
-
 	"github.com/hashicorp/consul/agent/consul"
 	"github.com/hashicorp/consul/command/flags"
 	"github.com/hashicorp/consul/version"
+	"github.com/mitchellh/cli"
 )
 
 func New(ui cli.Ui) *cmd {
@@ -51,7 +47,6 @@ type VersionInfo struct {
 	Version      string
 	Revision     string
 	Prerelease   string
-	FIPS         string `json:",omitempty"`
 	BuildDate    time.Time
 	RPC          RPCVersionInfo
 }
@@ -80,7 +75,6 @@ func (c *cmd) Run(args []string) int {
 		Revision:     version.GitCommit,
 		Prerelease:   version.VersionPrerelease,
 		BuildDate:    buildDate,
-		FIPS:         version.GetFIPSInfo(),
 		RPC: RPCVersionInfo{
 			Default: consul.DefaultRPCProtocol,
 			Min:     int(consul.ProtocolVersionMin),
diff --git a/command/version/version_test.go b/command/version/version_test.go
index d0af11506e383..d795f9715c01b 100644
--- a/command/version/version_test.go
+++ b/command/version/version_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package version
 
 import (
diff --git a/command/watch/watch.go b/command/watch/watch.go
index 205ff3fb083d7..09de508713748 100644
--- a/command/watch/watch.go
+++ b/command/watch/watch.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package watch
 
 import (
diff --git a/command/watch/watch_test.go b/command/watch/watch_test.go
index ba29c2731a8c0..503a83dd038e7 100644
--- a/command/watch/watch_test.go
+++ b/command/watch/watch_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package watch
 
 import (
diff --git a/connect/certgen/certgen.go b/connect/certgen/certgen.go
index 509e7f8df4f3b..afc3c3a027502 100644
--- a/connect/certgen/certgen.go
+++ b/connect/certgen/certgen.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // certgen: a tool for generating test certificates on disk for use as
 // test-fixtures and for end-to-end testing and local development.
 //
diff --git a/connect/example_test.go b/connect/example_test.go
index 51571bf1818cb..eb66bdbc02913 100644
--- a/connect/example_test.go
+++ b/connect/example_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/connect/proxy/config.go b/connect/proxy/config.go
index 19476d48d49f5..80f9f4da0a82a 100644
--- a/connect/proxy/config.go
+++ b/connect/proxy/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/connect/proxy/config_test.go b/connect/proxy/config_test.go
index a196958316816..b93f4d779d6a5 100644
--- a/connect/proxy/config_test.go
+++ b/connect/proxy/config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/connect/proxy/conn.go b/connect/proxy/conn.go
index acc1a49eb4b77..de41c3ea98d16 100644
--- a/connect/proxy/conn.go
+++ b/connect/proxy/conn.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/connect/proxy/conn_test.go b/connect/proxy/conn_test.go
index b5be7952d0ee5..ab12ef96df8cd 100644
--- a/connect/proxy/conn_test.go
+++ b/connect/proxy/conn_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/connect/proxy/listener.go b/connect/proxy/listener.go
index fc823d2712845..7839df0428cb5 100644
--- a/connect/proxy/listener.go
+++ b/connect/proxy/listener.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/connect/proxy/listener_test.go b/connect/proxy/listener_test.go
index 5554ecf353a6e..e0f182b9522f3 100644
--- a/connect/proxy/listener_test.go
+++ b/connect/proxy/listener_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/connect/proxy/proxy.go b/connect/proxy/proxy.go
index c365862ad8ec7..fcce3115602ee 100644
--- a/connect/proxy/proxy.go
+++ b/connect/proxy/proxy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/connect/proxy/proxy_test.go b/connect/proxy/proxy_test.go
index 20b4cdd55efef..904e9c7c44032 100644
--- a/connect/proxy/proxy_test.go
+++ b/connect/proxy/proxy_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/connect/proxy/testing.go b/connect/proxy/testing.go
index 6756f16a2567b..db27581d0f937 100644
--- a/connect/proxy/testing.go
+++ b/connect/proxy/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package proxy
 
 import (
diff --git a/connect/resolver.go b/connect/resolver.go
index fa89bc36d33d8..68d56cc7b9727 100644
--- a/connect/resolver.go
+++ b/connect/resolver.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/connect/resolver_test.go b/connect/resolver_test.go
index 3aece268b5dc3..e84ea1f2b935e 100644
--- a/connect/resolver_test.go
+++ b/connect/resolver_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/connect/service.go b/connect/service.go
index ea38dd59b2e53..bad2d7fe5c8c4 100644
--- a/connect/service.go
+++ b/connect/service.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/connect/service_test.go b/connect/service_test.go
index 0f6ed51a8b458..5405a32362b00 100644
--- a/connect/service_test.go
+++ b/connect/service_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/connect/testing.go b/connect/testing.go
index 1017ee15f5e7d..d054c0dee9d4e 100644
--- a/connect/testing.go
+++ b/connect/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
diff --git a/connect/tls.go b/connect/tls.go
index 3d29cf48e1c0a..b142515ecaf5e 100644
--- a/connect/tls.go
+++ b/connect/tls.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
@@ -425,7 +422,7 @@ func (cfg *dynamicTLSConfig) Ready() bool {
 	return cfg.VerifyLeafWithRoots() == nil
 }
 
-// ReadyWait returns a chan that is closed when the Service becomes ready
+// ReadyWait returns a chan that is closed when the the Service becomes ready
 // for use for the first time. Note that if the Service is ready when it is
 // called it returns a nil chan. Ready means that it has root and leaf
 // certificates configured but not that the combination is valid nor that
diff --git a/connect/tls_test.go b/connect/tls_test.go
index 74609b1740e35..1f8307224050e 100644
--- a/connect/tls_test.go
+++ b/connect/tls_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package connect
 
 import (
@@ -16,7 +13,7 @@ import (
 	"github.com/hashicorp/consul/agent"
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto/private/prototest"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/testrpc"
 )
diff --git a/docs/README.md b/docs/README.md
index 0d61b30fa5778..4a7523fd14bf8 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -25,7 +25,6 @@ be found in the public [user documentation].
 1. [Agent Configuration](./config)
 1. [RPC](./rpc)
 1. [Cluster Persistence](./persistence)
-1. [Resources and Controllers](./resources)
 1. [Client Agent](./client-agent)
 1. [Service Discovery](./service-discovery)
 1. [Service Mesh (Connect)](./service-mesh)
@@ -40,8 +39,6 @@ Also see the [FAQ](./faq.md).
 
 1. [Integration Tests](../test/integration/connect/envoy/README.md)
 1. [Upgrade Tests](../test/integration/consul-container/test/upgrade/README.md)
-1. [Remote Debugging Integration Tests](../test/integration/consul-container/test/debugging.md)
-1. [Peering Common Topology Tests](../test-integ/peering_commontopo/README.md)
 
 ## Important Directories
 
@@ -56,7 +53,7 @@ contain other important source related to Consul.
 * [.changelog] contains markdown files that are used by [hashicorp/go-changelog] to produce the
   [CHANGELOG.md].
 * [build-support] contains bash functions and scripts used to automate.
-  development tasks. Generally these scripts are called from the [Makefile].
+  development tasks. Generally these scripts are called from the [GNUmakefile].
 * [grafana] contains the source for a [Grafana dashboard] that can be used to
   monitor Consul.
 
@@ -67,7 +64,7 @@ contain other important source related to Consul.
 [hashicorp/go-changelog]: https://github.com/hashicorp/go-changelog
 [CHANGELOG.md]: https://github.com/hashicorp/consul/blob/main/CHANGELOG.md
 [build-support]: https://github.com/hashicorp/consul/tree/main/build-support
-[Makefile]: https://github.com/hashicorp/consul/tree/main/Makefile
+[GNUmakefile]: https://github.com/hashicorp/consul/tree/main/GNUmakefile
 [Grafana dashboard]: https://grafana.com/grafana/dashboards
 [grafana]: https://github.com/hashicorp/consul/tree/main/grafana
 
diff --git a/docs/persistence/README.md b/docs/persistence/README.md
index c8ca1089d807d..a9388c714c942 100644
--- a/docs/persistence/README.md
+++ b/docs/persistence/README.md
@@ -1,10 +1,5 @@
 # Cluster Persistence
 
-> **Note**  
-> While the content of this document is still accurate, it doesn't cover the new
-> generic resource-oriented storage layer introduced in Consul 1.16. Please see
-> [Resources](../resources) for more information.
-
 The cluser persistence subsystem runs entirely in Server Agents. It handles both read and
 write requests from the [RPC] subsystem. See the [Consul Architecture Guide] for an
 introduction to the Consul deployment architecture and the [Consensus Protocol] used by
diff --git a/docs/resources/README.md b/docs/resources/README.md
deleted file mode 100644
index b2a05744ad563..0000000000000
--- a/docs/resources/README.md
+++ /dev/null
@@ -1,115 +0,0 @@
-# Resources
-
-> **Note**  
-> Looking for guidance on adding new resources and controllers to Consul? Check
-> out the [developer guide](./guide.md).
-
-Consul 1.16 introduced a set of [generic APIs] for managing resources, and a
-[controller runtime] for building functionality on top of them.
-
-[generic APIs]: ../../proto-public/pbresource/resource.proto
-[controller runtime]: ../../internal/controller
-
-Previously, adding features to Consul involved making changes at every layer of
-the stack, including: HTTP handlers, RPC handlers, MemDB tables, Raft
-operations, and CLI commands.
-
-This architecture made sense when the product was maintained by a small core
-group who could keep the entire system in their heads, but presented significant
-collaboration, ownership, and onboarding challenges when our contributor base
-expanded to many engineers, across several teams, and the product grew in
-complexity.
-
-In the new model, teams can work with much greater autonomy by building on top
-of a shared platform and own their resource types and controllers.
-
-## Architecture Overview
-
-![architecture diagram](./architecture-overview.png)
-
-<sup>[source](https://whimsical.com/state-store-v2-UKE6SaEPXNc4UrZBrZj4Kg)</sup>
-
-Our resource-oriented architecture comprises the following components:
-
-#### Resource Service
-
-[Resource Service](../../proto-public/pbresource/resource.proto) is a gRPC
-service that contains the shared logic for creating, reading, updating,
-deleting, and watching resources. It will be consumed by controllers, our
-Kubernetes integration, the CLI, and mapped to an HTTP+JSON API.
-
-#### Type Registry
-
-[Type Registry](../../internal/resource/registry.go) is where teams register
-their resource types, along with hooks for performing structural validation,
-authorization, etc.
-
-#### Storage Backend
-
-[Storage Backend](../../internal/storage/storage.go) is an abstraction over
-low-level storage primitives. Today, there are two implementations (Raft and
-an in-memory backend for tests) but in the future, we envisage external storage
-systems such as the Kubernetes API or an RDBMS could be supported which would
-reduce operational complexity for our customers.
-
-#### Controllers
-
-[Controllers](../../internal/controller/api.go) implement Consul's business
-logic using asynchronous control loops that respond to changes in resources.
-
-## Raft Storage Backend
-
-Our [Raft Storage Backend](../../internal/storage/raft/backend.go) integrates
-with the existing Raft machinery (e.g. FSM) used by the [old state store]. It
-also transparently forwards writes and strongly consistent reads to the leader
-over gRPC.
-
-There's quite a lot going on here, so to dig into the details, let's take a look
-at how a write operation is handled.
-
-[old state store]: ../persistence/
-
-![raft storage backend diagram](./raft-backend.png)
-
-<sup>[source](https://whimsical.com/state-store-v2-UKE6SaEPXNc4UrZBrZj4Kg)</sup>
-
-#### Steps 1 & 2
-
-User calls the resource service's `Write` endpoint, on a Raft follower, which
-in-turn calls the storage backend's `WriteCAS` method.
-
-#### Steps 3 & 4
-
-The storage backend determines that the current server is a Raft follower, and
-forwards the operation to the leader via a gRPC [forwarding service] listening
-on the multiplexed RPC port ([`ports.server`]).
-
-[forwarding service]: ../../proto/private/pbstorage/raft.proto
-[`ports.server`]: https://developer.hashicorp.com/consul/docs/agent/config/config-files#server_rpc_port
-
-#### Step 5
-
-The leader's storage backend serializes the operation to protobuf and applies it
-to the Raft log. As we need to share the Raft log with the old state store, we go
-through the [`consul.raftHandle`](../../agent/consul/raft_handle.go) and
-[`consul.Server`](../../agent/consul/server/server.go) which applies a msgpack
-envelope and type byte prefix.
-
-#### Step 6
-
-Raft consensus happens! Once the log has been committed, it is applied to the
-[FSM](../../agent/consul/fsm/fsm.go) which calls the storage backend's `Apply`
-method to apply the protobuf-encoded operation to the [`inmem.Store`].
-
-[`inmem.Store`]: ../../internal/storage/inmem/store.go
-
-#### Steps 7, 8, 9
-
-At this point, the operation is complete. The forwarding service returns a
-successful response, as does the follower's storage backend, and the user
-gets a successful response too.
-
-#### Steps 10 & 11
-
-Asynchronously, the log is replicated to followers and applied to their storage
-backends.
diff --git a/docs/resources/architecture-overview.png b/docs/resources/architecture-overview.png
deleted file mode 100644
index 656844393e1c8..0000000000000
Binary files a/docs/resources/architecture-overview.png and /dev/null differ
diff --git a/docs/resources/guide.md b/docs/resources/guide.md
deleted file mode 100644
index aaecdecef07df..0000000000000
--- a/docs/resources/guide.md
+++ /dev/null
@@ -1,441 +0,0 @@
-# Resource and Controller Developer Guide
-
-This is a whistle-stop tour through adding a new resource type and controller to
-Consul 🚂
-
-## Resource Schema
-
-Adding a new resource type begins with defining the object schema as a protobuf
-message, in the appropriate package under [`proto-public`](../../proto-public).
-
-```shell
-$ mkdir proto-public/pbfoo/v1alpha1
-```
-
-```proto
-// proto-public/pbfoo/v1alpha1/foo.proto
-syntax = "proto3";
-
-import "pbresource/resource.proto";
-import "pbresource/annotations.proto";
-
-package hashicorp.consul.foo.v1alpha1;
-
-message Bar {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-  
-  string baz = 1;
-  hashicorp.consul.resource.ID qux = 2;
-}
-```
-
-```shell
-$ make proto
-```
-
-Next, we must add our resource type to the registry. At this point, it's useful
-to add a package (e.g. under [`internal`](../../internal)) to contain the logic
-associated with this resource type.
-
-The convention is to have this package export variables for its type identifiers
-along with a method for registering its types:
-
-```Go
-// internal/foo/types.go
-package foo
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-	pbv1alpha1 "github.com/hashicorp/consul/proto-public/pbfoo/v1alpha1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterTypes(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:  pbv1alpha1.BarType, 
-		Scope: resource.ScopePartition,
-		Proto: &pbv1alpha1.Bar{},
-	})
-}
-```
-Note that Scope reference the scope of the new resource, `resource.ScopePartition` 
-mean that resource will be at the partition level and have no namespace, while `resource.ScopeNamespace` mean it will have both a namespace 
-and a partition.
-
-Update the `NewTypeRegistry` method in [`type_registry.go`] to call your
-package's type registration method:
-
-[`type_registry.go`]: ../../agent/consul/type_registry.go
-
-```Go
-import (
-	// …
-	"github.com/hashicorp/consul/internal/foo"
-	// …
-)
-
-func NewTypeRegistry() resource.Registry {
-	// …
-    foo.RegisterTypes(registry)
-	// …
-}
-```
-
-That should be all you need to start using your new resource type. Test it out
-by starting an agent in dev mode:
-
-```shell
-$ make dev
-$ consul agent -dev
-```
-
-You can now use [grpcurl](https://github.com/fullstorydev/grpcurl) to interact
-with the [resource service](../../proto-public/pbresource/resource.proto):
-
-```shell
-$ grpcurl -d @ \
-  -plaintext \
-  -protoset pkg/consul.protoset \
-  127.0.0.1:8502 \
-  hashicorp.consul.resource.ResourceService.Write \
-<<EOF
-  {
-    "resource": {
-      "id": {
-        "type": {
-          "group": "foo",
-          "group_version": "v1alpha1",
-          "kind": "bar"
-        },
-        "tenancy": {
-          "partition": "default",
-          "peer_name": "local",
-          "namespace": "default"
-        }
-      },
-      "data": {
-        "@type": "types.googleapis.com/hashicorp.consul.foo.v1alpha1.Bar",
-        "baz": "Hello World"
-      }
-    }
-  }
-EOF
-```
-
-## Validation
-
-Broadly, there are two kinds of validation you might want to perform against
-your resources:
-
-- **Structural** validation ensures the user's input is well-formed, for
-  example: checking that a required field is provided, or that a port is within
-  an acceptable range.
-- **Semantic** validation ensures that the resource makes sense in the context
-  of *other* resources, for example: checking that an L7 intention is not
-  targeting an L4 service.
-
-Structural validation should be done up-front, before the resource is admitted,
-using a validation hook provided in the type registration:
-
-```Go
-func RegisterTypes(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbv1alpha1.BarType,
-		Proto:    &pbv1alpha1.Bar{}, 
-		Scope:    resource.ScopeNamespace,
-		Validate: validateBar,
-	})
-}
-
-func validateBar(res *pbresource.Resource) error {
-	var bar pbv1alpha1.Bar
-	if err := res.Data.UnmarshalTo(&bar); err != nil {
-		return resource.NewErrDataParse(&bar, err)
-	}
-	if bar.Baz == "" {
-		return resource.ErrInvalidField{
-			Name:    "baz",
-			Wrapped: resource.ErrMissing,
-		}
-	}
-	return nil
-}
-```
-
-Semantic validation should be done asynchronously, after the resource is
-written, by controllers ([covered below](#controllers)).
-
-## Authorization
-
-You can control how operations on your resource type are authorized by providing
-a set of ACL hooks:
-
-```Go
-func RegisterTypes(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:  pbv1alpha1.BarType,
-		Proto: &pbv1alpha1.Bar{}, 
-		Scope: resource.ScopeNamespace,
-		ACLs: &resource.ACLHooks{,
-			Read:  authzReadBar,
-			Write: authzWriteBar,
-			List:  authzListBar,
-		},
-	})
-}
-
-func authzReadBar(authz acl.Authorizer, authzContext *acl.AuthorizerContext, id *pbresource.ID,  _ *pbresource.Resource) error {
-	return authz.ToAllowAuthorizer().
-		BarReadAllowed(id.Name, authzContext)
-}
-
-func authzWriteBar(authz acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
-	return authz.ToAllowAuthorizer().
-		BarWriteAllowed(res.ID().Name, authzContext)
-}
-
-func authzListBar(authz acl.Authorizer, authzContext *acl.AuthorizerContext) error {
-	return authz.ToAllowAuthorizer().
-		BarListAllowed(authzContext)
-}
-```
-
-If you do not provide ACL hooks, `operator:read` and `operator:write`
-permissions will be required.
-
-## Mutation
-
-Sometimes, it's necessary to modify resources before they're persisted. For
-example, to set sensible default values or normalize user input. You can do this
-by providing a mutation hook:
-
-```Go
-func RegisterTypes(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:   pbv1alpha1.BarType,
-		Proto:  &pbv1alpha1.Bar{}, 
-		Scope:  resource.ScopeNamespace,
-		Mutate: mutateBar,
-	})
-}
-
-func mutateBar(res *pbresource.Resource) error {
-	var bar pbv1alpha1.Bar
-	if err := res.Data.UnmarshalTo(&bar); err != nil {
-		return resource.NewErrDataParse(&bar, err)
-	}
-	bar.Baz = strings.ToLower(bar.Baz)
-	return res.Data.MarshalFrom(&bar)
-}
-```
-
-## Controllers
-
-Controllers are where the business logic of your resources will live. They're
-asynchronous [reconciliation loops] that "wake up" whenever a resource is
-modified to validate and realize the changes.
-
-You can create a new controller using the [builder API]. Start by identifying
-the resource type you want this controller to manage, and provide a reconciler
-that will be called whenever a resource of that type is changed.
-
-```Go
-package foo
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/internal/controller"
-	pbv1alpha1 "github.com/hashicorp/consul/proto-public/pbfoo/v1alpha1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func barController() controller.Controller {
-	return controller.ForType(pbv1alpha1.BarType).
-		WithReconciler(barReconciler{})
-}
-
-type barReconciler struct{}
-
-func (barReconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	rsp, err := rt.Client.Read(ctx, &pbresource.ReadRequest{Id: req.ID})
-	switch {
-	case status.Code(err) == codes.NotFound:
-		return nil
-	case err != nil:
-		return err
-	}
-
-	var bar pbv1alpha1.Bar
-	if err := rsp.Resource.Data.UnmarshalTo(&bar); err != nil {
-		return err
-	}
-	rt.Logger.Debug("Hello from bar reconciler!", "baz", bar.Baz)
-
-	return nil
-}
-```
-
-[reconciliation loops]: https://www.oreilly.com/library/view/97-things-every/9781492050896/ch73.html
-[builder API]: https://pkg.go.dev/github.com/hashicorp/consul/internal/controller#Controller
-
-Next, register your controller with the controller manager. Another common
-pattern is to have your package expose a method for registering controllers,
-which is called from `registerControllers` in [`server.go`].
-
-[`server.go`]: ../../agent/consul/server.go
-
-```Go
-package foo
-
-func RegisterControllers(mgr *controller.Manager) {
-	mgr.Register(barController())
-}
-```
-
-```Go
-package consul
-
-func (s *Server) registerControllers() {
-	// …
-	foo.RegisterControllers(s.controllerManager)
-	// …
-}
-```
-
-### Retries
-
-By default, if your reconciler returns an error, it will be retried with
-exponential backoff. While this is correct in most circumstances, you can
-override it by returning [`RequeueAfter`] or [`RequeueNow`].
-
-[`RequeueAfter`]: https://pkg.go.dev/github.com/hashicorp/consul/internal/controller#RequeueAfter
-[`RequeueNow`]: https://pkg.go.dev/github.com/hashicorp/consul/internal/controller#RequeueNow
-
-```Go
-func (barReconciler) Reconcile(context.Context, controller.Runtime, controller.Request) error {
-	if time.Now().Hour() < 9 {
-		return controller.RequeueAfter(1 * time.Hour)
-	}
-	return nil
-}
-```
-
-### Status
-
-Controllers can communicate the result of reconciling resource changes (e.g.
-surfacing semantic validation issues) with users and other controllers by
-updating the resource's status using the `WriteStatus` method.
-
-Each resource can have multiple statuses, typically one per controller,
-identified by a string key. Statuses are composed of a set of conditions, which
-represent discreet observations about the resource in relation to the current
-state of the system.
-
-That all sounds a little abstract, so let's take a look at an example.
-
-```Go
-client.WriteStatus(ctx, &pbresource.WriteStatusRequest{
-	Id:     res.Id,
-	Key:    "consul.io/bar",
-	Status: &pbresource.Status{
-		ObservedGeneration: res.Generation,
-		Conditions: []*pbresource.Condition{
-			{
-				Type:    "Healthy",
-				State:   pbresource.Condition_STATE_TRUE,
-				Reason:  "OK",
-				Message: "All checks are passing",
-			},
-			{
-				Type:    "ResolvedRefs",
-				State:   pbresource.Condition_STATE_FALSE,
-				Reason:  "INVALID_REFERENCE",
-				Message: "Bar contained an invalid reference to qux",
-				Resource: resource.Reference(bar.Qux, ""),
-			},
-		},
-	},
-})
-```
-
-In the previous example, the controller makes two observations about the
-current state of the resource:
-
-1. That it's "healthy" (whatever that means in this hypothetical scenario)
-1. That it contains a reference that couldn't be resolved
-
-The `Type` and `Reason` should be simple, machine-readable, strings, but there
-aren't any strict rules about what are acceptable values. Over time, we
-anticipate that common values will emerge that we'll standardize on for
-consistency.
-
-`Message` should be a human-readable explanation of the condition.
-
-> **Warning**  
-> Writing a status to the resource will cause it to be re-reconciled. To avoid
-> infinite loops, we recommend dirty checking the status before writing it with
-> [`resource.EqualStatus`].
-
-[`resource.EqualStatus`]: https://pkg.go.dev/github.com/hashicorp/consul/internal/resource#EqualStatus
-
-### Watching Other Resources
-
-In addition to watching their "managed" resources, controllers can also watch
-resources of different, related, types. For example, the service endpoints
-controller also watches workloads and services.
-
-```Go
-func barController() controller.Controller {
-	return controller.ForType(pbv1alpha1.BarType).
-		WithWatch(pbv1alpha1.BazType, controller.MapOwner)
-		WithReconciler(barReconciler{})
-}
-```
-
-The second argument to `WithWatch` is a [dependency mapper] function. Whenever a
-resource of the watched type is modified, the dependency mapper will be called
-to determine which of the controller's managed resources need to be reconciled.
-
-[`controller.MapOwner`] is a convenience function which causes the watched
-resource's [owner](#ownership--cascading-deletion) to be reconciled.
-
-[dependency mapper]: https://pkg.go.dev/github.com/hashicorp/consul/internal/controller#DependencyMapper
-[`controller.MapOwner`]: https://pkg.go.dev/github.com/hashicorp/consul/internal/controller#MapOwner
-
-### Placement
-
-By default, only a single, leader-elected, replica of each controller will run
-within a cluster. Sometimes it's necessary to override this, for example when
-you want to run a copy of the controller on each server (e.g. to apply some
-configuration to the server whenever it changes). You can do this by changing
-the controller's placement.
-
-```Go
-func barController() controller.Controller {
-	return controller.ForType(pbv1alpha1.BarType).
-		WithPlacement(controller.PlacementEachServer)
-		WithReconciler(barReconciler{})
-}
-```
-
-> **Warning**  
-> Controllers placed with [`controller.PlacementEachServer`] generally shouldn't
-> modify resources (as it could lead to race conditions).
-
-[`controller.PlacementEachServer`]: https://pkg.go.dev/github.com/hashicorp/consul/internal/controller#PlacementEachServer
-
-## Ownership & Cascading Deletion
-
-The resource service implements a lightweight `1:N` ownership model where, on
-creation, you can mark a resource as being "owned" by another resource. When the
-owner is deleted, the owned resource will be deleted too.
-
-```Go
-client.Write(ctx, &pbresource.WriteRequest{
-	Resource: &pbresource.Resource{,
-		Owner: ownerID,
-		// …
-	},
-})
-```
diff --git a/docs/resources/raft-backend.png b/docs/resources/raft-backend.png
deleted file mode 100644
index 42499fa86a5a2..0000000000000
Binary files a/docs/resources/raft-backend.png and /dev/null differ
diff --git a/docs/service-mesh/README.md b/docs/service-mesh/README.md
index e7876f3e526e4..a24ea3d393657 100644
--- a/docs/service-mesh/README.md
+++ b/docs/service-mesh/README.md
@@ -37,7 +37,7 @@ The core of the built-in proxy is implemented in the [connect/proxy](https://git
 The high-level flow of configuring Envoy is:
 1. The initial "bootstrap" configuration is generated for an Envoy proxy by a consul-dataplane instance or a Consul client agent.
 2. Envoy dials the xDS server, requesting configuration to act as a particular proxy or gateway instance. The xDS server will either be a Consul server or a Consul client agent.
-3. Consul initializes internal watches for the snapshot of data necessary to configure Envoy. This snapshot will contain data as collected from Consul's state.
+3. Consul in initializes internal watches for the snapshot of data necessary to configure Envoy. This snapshot will contain data as collected from Consul's state.
 4. As these snapshots are generated and updated, Consul will generate and push Envoy configuration for the various xDS resource types if there were changes.
 
 ### Bootstrapping Envoy proxies
diff --git a/envoyextensions/extensioncommon/basic_envoy_extender.go b/envoyextensions/extensioncommon/basic_envoy_extender.go
index 86cee8f14a4e8..9eb78ba61ff72 100644
--- a/envoyextensions/extensioncommon/basic_envoy_extender.go
+++ b/envoyextensions/extensioncommon/basic_envoy_extender.go
@@ -1,98 +1,38 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package extensioncommon
 
 import (
 	"fmt"
-
 	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
 	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
 	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
+	envoy_tcp_proxy_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3"
+	envoy_resource_v3 "github.com/envoyproxy/go-control-plane/pkg/resource/v3"
 	"github.com/hashicorp/go-multierror"
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/types/known/anypb"
 
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/envoyextensions/xdscommon"
 )
 
-// ClusterMap is a map of clusters indexed by name.
-type ClusterMap map[string]*envoy_cluster_v3.Cluster
-
-// ClusterLoadAssignmentMap is a map of cluster load assignments indexed by name.
-type ClusterLoadAssignmentMap map[string]*envoy_endpoint_v3.ClusterLoadAssignment
-
-// ListenerMap is a map of listeners indexed by name.
-type ListenerMap map[string]*envoy_listener_v3.Listener
-
-// RouteMap is a map of routes indexed by name.
-type RouteMap map[string]*envoy_route_v3.RouteConfiguration
-
 // BasicExtension is the interface that each user of BasicEnvoyExtender must implement. It
 // is responsible for modifying the xDS structures based on only the state of
 // the extension.
 type BasicExtension interface {
-	// CanApply determines if the extension can mutate resources for the given runtime configuration.
+	// CanApply determines if the extension can mutate resources for the given xdscommon.ExtensionConfiguration.
 	CanApply(*RuntimeConfig) bool
 
 	// PatchRoute patches a route to include the custom Envoy configuration
 	// required to integrate with the built in extension template.
-	// See also PatchRoutes.
-	PatchRoute(RoutePayload) (*envoy_route_v3.RouteConfiguration, bool, error)
-
-	// PatchRoutes patches routes to include the custom Envoy configuration
-	// required to integrate with the built in extension template.
-	// This allows extensions to operate on a collection of routes.
-	// For extensions that implement both PatchRoute and PatchRoutes,
-	// PatchRoutes is always called first with the entire collection of routes.
-	// Then PatchRoute is called for each individual route.
-	PatchRoutes(*RuntimeConfig, RouteMap) (RouteMap, error)
+	PatchRoute(*RuntimeConfig, *envoy_route_v3.RouteConfiguration) (*envoy_route_v3.RouteConfiguration, bool, error)
 
 	// PatchCluster patches a cluster to include the custom Envoy configuration
 	// required to integrate with the built in extension template.
-	// See also PatchClusters.
-	PatchCluster(ClusterPayload) (*envoy_cluster_v3.Cluster, bool, error)
-
-	// PatchClusters patches clusters to include the custom Envoy configuration
-	// required to integrate with the built in extension template.
-	// This allows extensions to operate on a collection of clusters.
-	// For extensions that implement both PatchCluster and PatchClusters,
-	// PatchClusters is always called first with the entire collection of clusters.
-	// Then PatchClusters is called for each individual cluster.
-	PatchClusters(*RuntimeConfig, ClusterMap) (ClusterMap, error)
-
-	// PatchClusterLoadAssignment patches a cluster load assignment to include the custom Envoy configuration
-	// required to integrate with the built in extension template.
-	PatchClusterLoadAssignment(ClusterLoadAssignmentPayload) (*envoy_endpoint_v3.ClusterLoadAssignment, bool, error)
-
-	// PatchListener patches a listener to include the custom Envoy configuration
-	// required to integrate with the built in extension template.
-	// See also PatchListeners.
-	PatchListener(ListenerPayload) (*envoy_listener_v3.Listener, bool, error)
-
-	// PatchListeners patches listeners to include the custom Envoy configuration
-	// required to integrate with the built in extension template.
-	// This allows extensions to operate on a collection of listeners.
-	// For extensions that implement both PatchListener and PatchListeners,
-	// PatchListeners is always called first with the entire collection of listeners.
-	// Then PatchListeners is called for each individual listener.
-	PatchListeners(*RuntimeConfig, ListenerMap) (ListenerMap, error)
+	PatchCluster(*RuntimeConfig, *envoy_cluster_v3.Cluster) (*envoy_cluster_v3.Cluster, bool, error)
 
 	// PatchFilter patches an Envoy filter to include the custom Envoy
 	// configuration required to integrate with the built in extension template.
-	// See also PatchFilters.
-	PatchFilter(FilterPayload) (*envoy_listener_v3.Filter, bool, error)
-
-	// PatchFilters patches Envoy filters to include the custom Envoy
-	// configuration required to integrate with the built in extension template.
-	// This allows extensions to operate on a collection of filters.
-	// For extensions that implement both PatchFilter and PatchFilters,
-	// PatchFilters is always called first with the entire collection of filters.
-	// Then PatchFilter is called for each individual filter.
-	PatchFilters(cfg *RuntimeConfig, f []*envoy_listener_v3.Filter, isInboundListener bool) ([]*envoy_listener_v3.Filter, error)
-
-	// Validate determines if the runtime configuration provided is valid for the extension.
-	Validate(*RuntimeConfig) error
+	PatchFilter(cfg *RuntimeConfig, f *envoy_listener_v3.Filter, isInboundListener bool) (*envoy_listener_v3.Filter, bool, error)
 }
 
 var _ EnvoyExtender = (*BasicEnvoyExtender)(nil)
@@ -103,12 +43,8 @@ type BasicEnvoyExtender struct {
 	Extension BasicExtension
 }
 
-func (b *BasicEnvoyExtender) CanApply(config *RuntimeConfig) bool {
-	return b.Extension.CanApply(config)
-}
-
-func (b *BasicEnvoyExtender) Validate(config *RuntimeConfig) error {
-	return b.Extension.Validate(config)
+func (b *BasicEnvoyExtender) Validate(_ *RuntimeConfig) error {
+	return nil
 }
 
 func (b *BasicEnvoyExtender) Extend(resources *xdscommon.IndexedResources, config *RuntimeConfig) (*xdscommon.IndexedResources, error) {
@@ -121,210 +57,187 @@ func (b *BasicEnvoyExtender) Extend(resources *xdscommon.IndexedResources, confi
 	}
 
 	switch config.Kind {
-	// Currently we only support extensions for terminating gateways and connect proxies.
 	case api.ServiceKindTerminatingGateway, api.ServiceKindConnectProxy:
 	default:
 		return resources, nil
 	}
 
-	clusters := make(ClusterMap)
-	clusterLoadAssignments := make(ClusterLoadAssignmentMap)
-	routes := make(RouteMap)
-	listeners := make(ListenerMap)
+	if !b.Extension.CanApply(config) {
+		return resources, nil
+	}
 
 	for _, indexType := range []string{
 		xdscommon.ListenerType,
 		xdscommon.RouteType,
 		xdscommon.ClusterType,
-		xdscommon.EndpointType,
 	} {
 		for nameOrSNI, msg := range resources.Index[indexType] {
 			switch resource := msg.(type) {
 			case *envoy_cluster_v3.Cluster:
-				clusters[nameOrSNI] = resource
-			case *envoy_endpoint_v3.ClusterLoadAssignment:
-				clusterLoadAssignments[nameOrSNI] = resource
+				newCluster, patched, err := b.Extension.PatchCluster(config, resource)
+				if err != nil {
+					resultErr = multierror.Append(resultErr, fmt.Errorf("error patching cluster: %w", err))
+					continue
+				}
+				if patched {
+					resources.Index[xdscommon.ClusterType][nameOrSNI] = newCluster
+				}
+
 			case *envoy_listener_v3.Listener:
-				listeners[nameOrSNI] = resource
+				newListener, patched, err := b.patchSupportedListenerFilterChains(config, resource)
+				if err != nil {
+					resultErr = multierror.Append(resultErr, fmt.Errorf("error patching listener: %w", err))
+					continue
+				}
+				if patched {
+					resources.Index[xdscommon.ListenerType][nameOrSNI] = newListener
+				}
+
 			case *envoy_route_v3.RouteConfiguration:
-				routes[nameOrSNI] = resource
+				newRoute, patched, err := b.Extension.PatchRoute(config, resource)
+				if err != nil {
+					resultErr = multierror.Append(resultErr, fmt.Errorf("error patching route: %w", err))
+					continue
+				}
+				if patched {
+					resources.Index[xdscommon.RouteType][nameOrSNI] = newRoute
+				}
 			default:
 				resultErr = multierror.Append(resultErr, fmt.Errorf("unsupported type was skipped: %T", resource))
 			}
 		}
 	}
 
-	if patchedClusters, err := b.patchClusters(config, clusters); err == nil {
-		for k, v := range patchedClusters {
-			resources.Index[xdscommon.ClusterType][k] = v
-		}
-	} else {
-		resultErr = multierror.Append(resultErr, err)
-	}
-
-	if patchedClusterLoadAssignments, err := b.patchClusterLoadAssignments(config, clusterLoadAssignments); err == nil {
-		for k, v := range patchedClusterLoadAssignments {
-			resources.Index[xdscommon.EndpointType][k] = v
-		}
-	} else {
-		resultErr = multierror.Append(resultErr, err)
-	}
-
-	if patchedListeners, err := b.patchListeners(config, listeners); err == nil {
-		for k, v := range patchedListeners {
-			resources.Index[xdscommon.ListenerType][k] = v
-		}
-	} else {
-		resultErr = multierror.Append(resultErr, err)
-	}
+	return resources, resultErr
+}
 
-	if patchedRoutes, err := b.patchRoutes(config, routes); err == nil {
-		for k, v := range patchedRoutes {
-			resources.Index[xdscommon.RouteType][k] = v
-		}
-	} else {
-		resultErr = multierror.Append(resultErr, err)
+func (b *BasicEnvoyExtender) patchSupportedListenerFilterChains(config *RuntimeConfig, l *envoy_listener_v3.Listener) (proto.Message, bool, error) {
+	switch config.Kind {
+	case api.ServiceKindTerminatingGateway, api.ServiceKindConnectProxy:
+		return b.patchListenerFilterChains(config, l)
 	}
-
-	return resources, resultErr
+	return l, false, nil
 }
 
-func (b *BasicEnvoyExtender) patchClusters(config *RuntimeConfig, clusters ClusterMap) (ClusterMap, error) {
+func (b *BasicEnvoyExtender) patchListenerFilterChains(config *RuntimeConfig, l *envoy_listener_v3.Listener) (proto.Message, bool, error) {
 	var resultErr error
+	patched := false
 
-	patchedClusters, err := b.Extension.PatchClusters(config, clusters)
-	if err != nil {
-		return clusters, fmt.Errorf("error patching clusters: %w", err)
-	}
-	for nameOrSNI, cluster := range clusters {
-		patchedCluster, patched, err := b.Extension.PatchCluster(config.GetClusterPayload(cluster))
-		if err != nil {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("error patching cluster %q: %w", nameOrSNI, err))
-		}
-		if !patched {
-			patchedCluster = cluster
-		}
+	for _, filterChain := range l.FilterChains {
+		var filters []*envoy_listener_v3.Filter
 
-		// We patch cluster load assignments directly above for EDS, but also here for CDS,
-		// since updates can come from either.
-		if patchedCluster.LoadAssignment != nil {
-			patchedClusterLoadAssignment, patched, err := b.Extension.PatchClusterLoadAssignment(config.GetClusterLoadAssignmentPayload(patchedCluster.LoadAssignment))
+		for _, filter := range filterChain.Filters {
+			newFilter, ok, err := b.Extension.PatchFilter(config, filter, IsInboundPublicListener(l))
 			if err != nil {
-				resultErr = multierror.Append(resultErr, fmt.Errorf("error patching load assignment for cluster %q: %w", nameOrSNI, err))
-			} else if patched {
-				patchedCluster.LoadAssignment = patchedClusterLoadAssignment
+				resultErr = multierror.Append(resultErr, fmt.Errorf("error patching listener filter: %w", err))
+				filters = append(filters, filter)
+				continue
 			}
-		}
 
-		patchedClusters[nameOrSNI] = patchedCluster
+			if ok {
+				filters = append(filters, newFilter)
+				patched = true
+			} else {
+				filters = append(filters, filter)
+			}
+		}
+		filterChain.Filters = filters
 	}
-	return patchedClusters, resultErr
-}
 
-func (b *BasicEnvoyExtender) patchClusterLoadAssignments(config *RuntimeConfig, clusterLoadAssignments ClusterLoadAssignmentMap) (ClusterLoadAssignmentMap, error) {
-	var resultErr error
+	return l, patched, resultErr
+}
 
-	for nameOrSNI, clusterLoadAssignment := range clusterLoadAssignments {
-		patchedClusterLoadAssignment, patched, err := b.Extension.PatchClusterLoadAssignment(config.GetClusterLoadAssignmentPayload(clusterLoadAssignment))
-		if err != nil {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("error patching cluster load assignment %q: %w", nameOrSNI, err))
-		}
-		if patched {
-			clusterLoadAssignments[nameOrSNI] = patchedClusterLoadAssignment
-		} else {
-			clusterLoadAssignments[nameOrSNI] = clusterLoadAssignment
+func filterChainTProxyMatch(vip string, filterChain *envoy_listener_v3.FilterChain) bool {
+	for _, prefixRange := range filterChain.FilterChainMatch.PrefixRanges {
+		// Since we always set the address prefix as the full VIP (rather than a prefix), we can just check if they are
+		// equal to find the matching filter chain.
+		if vip == prefixRange.AddressPrefix {
+			return true
 		}
 	}
-	return clusterLoadAssignments, resultErr
-}
 
-func (b *BasicEnvoyExtender) patchRoutes(config *RuntimeConfig, routes RouteMap) (RouteMap, error) {
-	var resultErr error
+	return false
+}
 
-	patchedRoutes, err := b.Extension.PatchRoutes(config, routes)
-	if err != nil {
-		return routes, fmt.Errorf("error patching routes: %w", err)
+func FilterClusterNames(filter *envoy_listener_v3.Filter) map[string]struct{} {
+	clusterNames := make(map[string]struct{})
+	if filter == nil {
+		return clusterNames
 	}
-	for nameOrSNI, route := range patchedRoutes {
-		patchedRoute, patched, err := b.Extension.PatchRoute(config.GetRoutePayload(route))
-		if err != nil {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("error patching route %q: %w", nameOrSNI, err))
-		}
-		if patched {
-			patchedRoutes[nameOrSNI] = patchedRoute
-		} else {
-			patchedRoutes[nameOrSNI] = route
+
+	if config := envoy_resource_v3.GetHTTPConnectionManager(filter); config != nil {
+		// If it's using RDS, the cluster names will be in the route, rather than in the http filter's route config, so
+		// we don't return any cluster names in this case. They can be gathered from the route.
+		if config.GetRds() != nil {
+			return clusterNames
 		}
-	}
-	return patchedRoutes, resultErr
-}
 
-func (b *BasicEnvoyExtender) patchListeners(config *RuntimeConfig, listeners ListenerMap) (ListenerMap, error) {
-	var resultErr error
+		cfg := config.GetRouteConfig()
 
-	patchedListeners, err := b.Extension.PatchListeners(config, listeners)
-	if err != nil {
-		return listeners, fmt.Errorf("error patching listeners: %w", err)
+		clusterNames = RouteClusterNames(cfg)
 	}
-	for nameOrSNI, listener := range listeners {
-		patchedListener, patched, err := b.Extension.PatchListener(config.GetListenerPayload(listener))
-		if err != nil {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("error patching listener %q: %w", nameOrSNI, err))
-		}
-		if !patched {
-			patchedListener = listener
-		}
 
-		if patchedListener, err = b.patchSupportedListenerFilterChains(config, patchedListener, nameOrSNI); err == nil {
-			patchedListeners[nameOrSNI] = patchedListener
-		} else {
-			resultErr = multierror.Append(resultErr, err)
-			patchedListeners[nameOrSNI] = listener
-		}
+	if config := GetTCPProxy(filter); config != nil {
+		clusterNames[config.GetCluster()] = struct{}{}
 	}
-	return patchedListeners, resultErr
+
+	return clusterNames
 }
 
-func (b *BasicEnvoyExtender) patchSupportedListenerFilterChains(config *RuntimeConfig, l *envoy_listener_v3.Listener, nameOrSNI string) (*envoy_listener_v3.Listener, error) {
-	switch config.Kind {
-	case api.ServiceKindTerminatingGateway, api.ServiceKindConnectProxy:
-		return b.patchListenerFilterChains(config, l, nameOrSNI)
+func RouteClusterNames(route *envoy_route_v3.RouteConfiguration) map[string]struct{} {
+	if route == nil {
+		return nil
 	}
-	return l, nil
-}
 
-func (b *BasicEnvoyExtender) patchListenerFilterChains(config *RuntimeConfig, l *envoy_listener_v3.Listener, nameOrSNI string) (*envoy_listener_v3.Listener, error) {
-	var resultErr error
+	clusterNames := make(map[string]struct{})
+
+	for _, virtualHost := range route.VirtualHosts {
+		for _, route := range virtualHost.Routes {
+			r := route.GetRoute()
+			if r == nil {
+				continue
+			}
+			if c := r.GetCluster(); c != "" {
+				clusterNames[r.GetCluster()] = struct{}{}
+			}
+
+			if wc := r.GetWeightedClusters(); wc != nil {
+				for _, c := range wc.GetClusters() {
+					if c.Name != "" {
+						clusterNames[c.Name] = struct{}{}
+					}
+				}
+			}
+		}
+	}
+	return clusterNames
+}
 
-	for idx, filterChain := range l.FilterChains {
-		if patchedFilterChain, err := b.patchFilterChain(config, filterChain, l); err == nil {
-			l.FilterChains[idx] = patchedFilterChain
-		} else {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("error patching listener filter chain %q: %w", nameOrSNI, err))
+func GetTCPProxy(filter *envoy_listener_v3.Filter) *envoy_tcp_proxy_v3.TcpProxy {
+	if typedConfig := filter.GetTypedConfig(); typedConfig != nil {
+		config := &envoy_tcp_proxy_v3.TcpProxy{}
+		if err := anypb.UnmarshalTo(typedConfig, config, proto.UnmarshalOptions{}); err == nil {
+			return config
 		}
 	}
 
-	return l, resultErr
+	return nil
 }
 
-func (b *BasicEnvoyExtender) patchFilterChain(config *RuntimeConfig, filterChain *envoy_listener_v3.FilterChain, l *envoy_listener_v3.Listener) (*envoy_listener_v3.FilterChain, error) {
-	var resultErr error
-	inbound := IsInboundPublicListener(l)
-	patchedFilters, err := b.Extension.PatchFilters(config, filterChain.Filters, inbound)
-	if err != nil {
-		return filterChain, fmt.Errorf("error patching filters: %w", err)
+func getSNI(chain *envoy_listener_v3.FilterChain) string {
+	var sni string
+
+	if chain == nil {
+		return sni
 	}
-	for idx, filter := range patchedFilters {
-		patchedFilter, patched, err := b.Extension.PatchFilter(config.GetFilterPayload(filter, l))
-		if err != nil {
-			resultErr = multierror.Append(resultErr, fmt.Errorf("error patching filter: %w", err))
-		}
-		if patched {
-			patchedFilters[idx] = patchedFilter
-		} else {
-			patchedFilters[idx] = filter
-		}
+
+	if chain.FilterChainMatch == nil {
+		return sni
 	}
-	filterChain.Filters = patchedFilters
-	return filterChain, err
+
+	if len(chain.FilterChainMatch.ServerNames) == 0 {
+		return sni
+	}
+
+	return chain.FilterChainMatch.ServerNames[0]
 }
diff --git a/envoyextensions/extensioncommon/basic_extension_adapter.go b/envoyextensions/extensioncommon/basic_extension_adapter.go
deleted file mode 100644
index 39e1e8c8363bf..0000000000000
--- a/envoyextensions/extensioncommon/basic_extension_adapter.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package extensioncommon
-
-import (
-	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
-)
-
-// BasicExtensionAdapter is an adapter that provides default implementations for all of the EnvoyExtension
-// interface functions. Extension implementations can extend the adapter and implement only the functions
-// they are interested in. At a minimum, extensions must override the adapter's CanApply and Validate
-// functions.
-type BasicExtensionAdapter struct{}
-
-// CanApply provides a default implementation of the CanApply interface that always returns false.
-func (BasicExtensionAdapter) CanApply(_ *RuntimeConfig) bool { return false }
-
-// PatchCluster provides a default implementation of the PatchCluster interface that does nothing.
-func (BasicExtensionAdapter) PatchCluster(p ClusterPayload) (*envoy_cluster_v3.Cluster, bool, error) {
-	return p.Message, false, nil
-}
-
-// PatchClusters provides a default implementation of the PatchClusters interface that does nothing.
-func (BasicExtensionAdapter) PatchClusters(_ *RuntimeConfig, c ClusterMap) (ClusterMap, error) {
-	return c, nil
-}
-
-// PatchClusterLoadAssignment provides a default implementation of the PatchClusterLoadAssignment interface that does nothing.
-func (BasicExtensionAdapter) PatchClusterLoadAssignment(p ClusterLoadAssignmentPayload) (*envoy_endpoint_v3.ClusterLoadAssignment, bool, error) {
-	return p.Message, false, nil
-}
-
-// PatchListener provides a default implementation of the PatchListener interface that does nothing.
-func (BasicExtensionAdapter) PatchListener(p ListenerPayload) (*envoy_listener_v3.Listener, bool, error) {
-	return p.Message, false, nil
-}
-
-// PatchListeners provides a default implementation of the PatchListeners interface that does nothing.
-func (BasicExtensionAdapter) PatchListeners(_ *RuntimeConfig, l ListenerMap) (ListenerMap, error) {
-	return l, nil
-}
-
-// PatchFilter provides a default implementation of the PatchFilter interface that does nothing.
-func (BasicExtensionAdapter) PatchFilter(p FilterPayload) (*envoy_listener_v3.Filter, bool, error) {
-	return p.Message, false, nil
-}
-
-// PatchFilters provides a default implementation of the PatchFilters interface that does nothing.
-func (BasicExtensionAdapter) PatchFilters(_ *RuntimeConfig, f []*envoy_listener_v3.Filter, _ bool) ([]*envoy_listener_v3.Filter, error) {
-	return f, nil
-}
-
-// PatchRoute provides a default implementation of the PatchRoute interface that does nothing.
-func (BasicExtensionAdapter) PatchRoute(p RoutePayload) (*envoy_route_v3.RouteConfiguration, bool, error) {
-	return p.Message, false, nil
-}
-
-// PatchRoutes provides a default implementation of the PatchRoutes interface that does nothing.
-func (BasicExtensionAdapter) PatchRoutes(_ *RuntimeConfig, r RouteMap) (RouteMap, error) {
-	return r, nil
-}
-
-// Validate provides a default implementation of the Validate interface that always returns nil.
-func (BasicExtensionAdapter) Validate(_ *RuntimeConfig) error { return nil }
diff --git a/envoyextensions/extensioncommon/envoy_extender.go b/envoyextensions/extensioncommon/envoy_extender.go
index 269f01acd6de4..6345a7dc6ea4f 100644
--- a/envoyextensions/extensioncommon/envoy_extender.go
+++ b/envoyextensions/extensioncommon/envoy_extender.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package extensioncommon
 
 import (
@@ -11,17 +8,13 @@ import (
 // to be dynamically executed during runtime.
 type EnvoyExtender interface {
 
-	// CanApply checks whether the extension configured for this extender is eligible
-	// for application based on the specified RuntimeConfig.
-	CanApply(*RuntimeConfig) bool
-
 	// Validate ensures the data in config can successfuly be used
 	// to apply the specified Envoy extension.
 	Validate(*RuntimeConfig) error
 
 	// Extend updates indexed xDS structures to include patches for
 	// built-in extensions. It is responsible for applying extensions to
-	// the appropriate xDS resources. If any portion of this function fails,
+	// the the appropriate xDS resources. If any portion of this function fails,
 	// it will attempt continue and return an error. The caller can then determine
 	// if it is better to use a partially applied extension or error out.
 	Extend(*xdscommon.IndexedResources, *RuntimeConfig) (*xdscommon.IndexedResources, error)
diff --git a/envoyextensions/extensioncommon/envoy_extender_test.go b/envoyextensions/extensioncommon/envoy_extender_test.go
index 9fe6b49aeb33b..48e338ed896f3 100644
--- a/envoyextensions/extensioncommon/envoy_extender_test.go
+++ b/envoyextensions/extensioncommon/envoy_extender_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package extensioncommon
 
 import (
diff --git a/envoyextensions/extensioncommon/resources.go b/envoyextensions/extensioncommon/resources.go
index c5febfb6dd30a..24f25cab6230e 100644
--- a/envoyextensions/extensioncommon/resources.go
+++ b/envoyextensions/extensioncommon/resources.go
@@ -1,277 +1,14 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package extensioncommon
 
 import (
-	"errors"
-	"fmt"
-	"strings"
-
 	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
 	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
 	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
-	envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
-	envoy_tcp_proxy_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3"
-	envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
-	envoy_resource_v3 "github.com/envoyproxy/go-control-plane/pkg/resource/v3"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-)
-
-// MakeUpstreamTLSTransportSocket generates an Envoy transport socket for the given TLS context.
-func MakeUpstreamTLSTransportSocket(tlsContext *envoy_tls_v3.UpstreamTlsContext) (*envoy_core_v3.TransportSocket, error) {
-	if tlsContext == nil {
-		return nil, nil
-	}
-	return MakeTransportSocket("tls", tlsContext)
-}
-
-// MakeTransportSocket generates an Envoy transport socket from the given proto message.
-func MakeTransportSocket(name string, config proto.Message) (*envoy_core_v3.TransportSocket, error) {
-	any, err := anypb.New(config)
-	if err != nil {
-		return nil, err
-	}
-	return &envoy_core_v3.TransportSocket{
-		Name: name,
-		ConfigType: &envoy_core_v3.TransportSocket_TypedConfig{
-			TypedConfig: any,
-		},
-	}, nil
-}
-
-// MakeEnvoyHTTPFilter generates an Envoy HTTP filter from the given proto message.
-func MakeEnvoyHTTPFilter(name string, cfg proto.Message) (*envoy_http_v3.HttpFilter, error) {
-	any, err := anypb.New(cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	return &envoy_http_v3.HttpFilter{
-		Name:       name,
-		ConfigType: &envoy_http_v3.HttpFilter_TypedConfig{TypedConfig: any},
-	}, nil
-}
-
-// MakeFilter generates an Envoy listener filter from the given proto message.
-func MakeFilter(name string, cfg proto.Message) (*envoy_listener_v3.Filter, error) {
-	any, err := anypb.New(cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	return &envoy_listener_v3.Filter{
-		Name:       name,
-		ConfigType: &envoy_listener_v3.Filter_TypedConfig{TypedConfig: any},
-	}, nil
-}
-
-// TrafficDirection determines whether inbound or outbound Envoy resources will be patched.
-type TrafficDirection string
 
-const (
-	TrafficDirectionInbound  TrafficDirection = "inbound"
-	TrafficDirectionOutbound TrafficDirection = "outbound"
+	"strings"
 )
 
-var TrafficDirections = StringSet{string(TrafficDirectionInbound): {}, string(TrafficDirectionOutbound): {}}
-
-type StringSet map[string]struct{}
-
-func (c *StringSet) CheckRequired(v, fieldName string) error {
-	if _, ok := (*c)[v]; !ok {
-		if v == "" {
-			return fmt.Errorf("field %s is required", fieldName)
-		}
-
-		var keys []string
-		for k := range *c {
-			keys = append(keys, k)
-		}
-
-		return fmt.Errorf("invalid %s '%q'; supported values: %s",
-			fieldName, v, strings.Join(keys, ", "))
-	}
-	return nil
-}
-
-func NormalizeEmptyToDefault(s string) string {
-	if s == "" {
-		return "default"
-	}
-
-	return s
-}
-
-func NormalizeServiceName(sn *api.CompoundServiceName) {
-	sn.Namespace = NormalizeEmptyToDefault(sn.Namespace)
-	sn.Partition = NormalizeEmptyToDefault(sn.Partition)
-}
-
-// Payload represents a single Envoy resource to be modified by extensions.
-// It associates the RuntimeConfig of the local proxy, the TrafficDirection
-// of the resource, and the CompoundServiceName and UpstreamData (if outbound)
-// of a service the Envoy resource corresponds to.
-type Payload[K proto.Message] struct {
-	RuntimeConfig    *RuntimeConfig
-	ServiceName      *api.CompoundServiceName
-	Upstream         *UpstreamData
-	TrafficDirection TrafficDirection
-	Message          K
-}
-
-func (p Payload[K]) IsInbound() bool {
-	return p.TrafficDirection == TrafficDirectionInbound
-}
-
-type ClusterPayload = Payload[*envoy_cluster_v3.Cluster]
-type ClusterLoadAssignmentPayload = Payload[*envoy_endpoint_v3.ClusterLoadAssignment]
-type ListenerPayload = Payload[*envoy_listener_v3.Listener]
-type FilterPayload = Payload[*envoy_listener_v3.Filter]
-type RoutePayload = Payload[*envoy_route_v3.RouteConfiguration]
-
-func (cfg *RuntimeConfig) GetClusterPayload(c *envoy_cluster_v3.Cluster) ClusterPayload {
-	d := TrafficDirectionOutbound
-	var u *UpstreamData
-	var sn *api.CompoundServiceName
-
-	if IsLocalAppCluster(c) {
-		d = TrafficDirectionInbound
-	} else {
-		u, sn = cfg.findUpstreamBySNI(c.Name)
-	}
-
-	return ClusterPayload{
-		RuntimeConfig:    cfg,
-		ServiceName:      sn,
-		Upstream:         u,
-		TrafficDirection: d,
-		Message:          c,
-	}
-}
-
-func (c *RuntimeConfig) GetListenerPayload(l *envoy_listener_v3.Listener) ListenerPayload {
-	d := TrafficDirectionOutbound
-	var u *UpstreamData
-	var sn *api.CompoundServiceName
-
-	if IsInboundPublicListener(l) {
-		d = TrafficDirectionInbound
-	} else {
-		u, sn = c.findUpstreamByEnvoyID(GetListenerEnvoyID(l))
-	}
-
-	return ListenerPayload{
-		RuntimeConfig:    c,
-		ServiceName:      sn,
-		Upstream:         u,
-		TrafficDirection: d,
-		Message:          l,
-	}
-}
-
-func (c *RuntimeConfig) GetFilterPayload(f *envoy_listener_v3.Filter, l *envoy_listener_v3.Listener) FilterPayload {
-	d := TrafficDirectionOutbound
-	var u *UpstreamData
-	var sn *api.CompoundServiceName
-
-	if IsInboundPublicListener(l) {
-		d = TrafficDirectionInbound
-	} else {
-		u, sn = c.findUpstreamByEnvoyID(GetListenerEnvoyID(l))
-	}
-
-	return FilterPayload{
-		RuntimeConfig:    c,
-		ServiceName:      sn,
-		Upstream:         u,
-		TrafficDirection: d,
-		Message:          f,
-	}
-}
-
-func (c *RuntimeConfig) GetRoutePayload(r *envoy_route_v3.RouteConfiguration) RoutePayload {
-	d := TrafficDirectionOutbound
-	var u *UpstreamData
-	var sn *api.CompoundServiceName
-
-	if IsRouteToLocalAppCluster(r) {
-		d = TrafficDirectionInbound
-	} else {
-		u, sn = c.findUpstreamByEnvoyID(r.Name)
-	}
-
-	return RoutePayload{
-		RuntimeConfig:    c,
-		ServiceName:      sn,
-		Upstream:         u,
-		TrafficDirection: d,
-		Message:          r,
-	}
-}
-
-func (cfg *RuntimeConfig) GetClusterLoadAssignmentPayload(c *envoy_endpoint_v3.ClusterLoadAssignment) ClusterLoadAssignmentPayload {
-	d := TrafficDirectionOutbound
-	var u *UpstreamData
-	var sn *api.CompoundServiceName
-
-	if IsLocalAppClusterLoadAssignment(c) {
-		d = TrafficDirectionInbound
-	} else {
-		u, sn = cfg.findUpstreamBySNI(c.ClusterName)
-
-	}
-
-	return ClusterLoadAssignmentPayload{
-		RuntimeConfig:    cfg,
-		ServiceName:      sn,
-		Upstream:         u,
-		TrafficDirection: d,
-		Message:          c,
-	}
-}
-
-func (c *RuntimeConfig) findUpstreamByEnvoyID(envoyID string) (*UpstreamData, *api.CompoundServiceName) {
-	for sn, u := range c.Upstreams {
-		if u.EnvoyID == envoyID {
-			return u, &sn
-		}
-	}
-
-	return nil, nil
-}
-
-func (c *RuntimeConfig) findUpstreamBySNI(sni string) (*UpstreamData, *api.CompoundServiceName) {
-	for sn, u := range c.Upstreams {
-		_, ok := u.SNIs[sni]
-		if ok {
-			return u, &sn
-		}
-
-		if strings.HasPrefix(sni, xdscommon.FailoverClusterNamePrefix) {
-			parts := strings.Split(sni, "~")
-
-			if len(parts) != 3 {
-				continue
-			}
-
-			id := parts[2]
-			_, ok := u.SNIs[id]
-			if ok {
-				return u, &sn
-			}
-		}
-	}
-
-	return nil, nil
-}
-
 // GetListenerEnvoyID returns the Envoy ID string parsed from the name of the given Listener. If none is found, it
 // returns the empty string.
 func GetListenerEnvoyID(l *envoy_listener_v3.Listener) string {
@@ -287,12 +24,6 @@ func IsLocalAppCluster(c *envoy_cluster_v3.Cluster) bool {
 	return c.Name == xdscommon.LocalAppClusterName
 }
 
-// IsLocalAppClusterLoadAssignment returns true if the given ClusterLoadAssignment represents the local Cluster, which
-// receives inbound traffic to the local proxy.
-func IsLocalAppClusterLoadAssignment(a *envoy_endpoint_v3.ClusterLoadAssignment) bool {
-	return a.ClusterName == xdscommon.LocalAppClusterName
-}
-
 // IsRouteToLocalAppCluster takes a RouteConfiguration and returns true if all routes within it target the local
 // Cluster. Note that because we currently target RouteConfiguration in PatchRoute, we have to check multiple individual
 // Route resources.
@@ -314,256 +45,3 @@ func IsInboundPublicListener(l *envoy_listener_v3.Listener) bool {
 func IsOutboundTProxyListener(l *envoy_listener_v3.Listener) bool {
 	return GetListenerEnvoyID(l) == xdscommon.OutboundListenerName
 }
-
-func filterChainTProxyMatch(vip string, filterChain *envoy_listener_v3.FilterChain) bool {
-	for _, prefixRange := range filterChain.FilterChainMatch.PrefixRanges {
-		// Since we always set the address prefix as the full VIP (rather than a prefix), we can just check if they are
-		// equal to find the matching filter chain.
-		if vip == prefixRange.AddressPrefix {
-			return true
-		}
-	}
-
-	return false
-}
-
-func FilterClusterNames(filter *envoy_listener_v3.Filter) map[string]struct{} {
-	clusterNames := make(map[string]struct{})
-	if filter == nil {
-		return clusterNames
-	}
-
-	if config := envoy_resource_v3.GetHTTPConnectionManager(filter); config != nil {
-		// If it's using RDS, the cluster names will be in the route, rather than in the http filter's route config, so
-		// we don't return any cluster names in this case. They can be gathered from the route.
-		if config.GetRds() != nil {
-			return clusterNames
-		}
-
-		cfg := config.GetRouteConfig()
-
-		clusterNames = RouteClusterNames(cfg)
-	}
-
-	if config := GetTCPProxy(filter); config != nil {
-		clusterNames[config.GetCluster()] = struct{}{}
-	}
-
-	return clusterNames
-}
-
-func RouteClusterNames(route *envoy_route_v3.RouteConfiguration) map[string]struct{} {
-	if route == nil {
-		return nil
-	}
-
-	clusterNames := make(map[string]struct{})
-
-	for _, virtualHost := range route.VirtualHosts {
-		for _, route := range virtualHost.Routes {
-			r := route.GetRoute()
-			if r == nil {
-				continue
-			}
-			if c := r.GetCluster(); c != "" {
-				clusterNames[r.GetCluster()] = struct{}{}
-			}
-
-			if wc := r.GetWeightedClusters(); wc != nil {
-				for _, c := range wc.GetClusters() {
-					if c.Name != "" {
-						clusterNames[c.Name] = struct{}{}
-					}
-				}
-			}
-		}
-	}
-	return clusterNames
-}
-
-func GetTCPProxy(filter *envoy_listener_v3.Filter) *envoy_tcp_proxy_v3.TcpProxy {
-	if typedConfig := filter.GetTypedConfig(); typedConfig != nil {
-		config := &envoy_tcp_proxy_v3.TcpProxy{}
-		if err := anypb.UnmarshalTo(typedConfig, config, proto.UnmarshalOptions{}); err == nil {
-			return config
-		}
-	}
-
-	return nil
-}
-
-func getSNI(chain *envoy_listener_v3.FilterChain) string {
-	var sni string
-
-	if chain == nil {
-		return sni
-	}
-
-	if chain.FilterChainMatch == nil {
-		return sni
-	}
-
-	if len(chain.FilterChainMatch.ServerNames) == 0 {
-		return sni
-	}
-
-	return chain.FilterChainMatch.ServerNames[0]
-}
-
-// GetHTTPConnectionManager returns the Envoy HttpConnectionManager filter from the list of network filters.
-// It also returns the index within the list of filters where the connection manager was found in case the
-// caller needs to overwrite the original filter.
-// It returns a non-nil error if the HttpConnectionManager is not found.
-func GetHTTPConnectionManager(filters ...*envoy_listener_v3.Filter) (*envoy_http_v3.HttpConnectionManager, int, error) {
-	for idx, filter := range filters {
-		if filter.Name == "envoy.filters.network.http_connection_manager" {
-			if httpConnMgr := envoy_resource_v3.GetHTTPConnectionManager(filter); httpConnMgr != nil {
-				return httpConnMgr, idx, nil
-			}
-		}
-	}
-	return nil, 0, errors.New("failed to get HTTP connection manager")
-}
-
-// InsertLocation indicates where to insert an Envoy resource within a list of resources.
-type InsertLocation string
-
-const (
-	// InsertFirst inserts the resource as the first entry in the list.
-	InsertFirst InsertLocation = "First"
-	// InsertLast inserts the resource as the last entry in the list.
-	InsertLast InsertLocation = "Last"
-	// InsertBeforeFirstMatch inserts the resource before the first resource with a matching name.
-	InsertBeforeFirstMatch InsertLocation = "BeforeFirstMatch"
-	// InsertAfterFirstMatch inserts the resource after the first resource with a matching name.
-	InsertAfterFirstMatch InsertLocation = "AfterFirstMatch"
-	// InsertBeforeLastMatch inserts the resource before the last resource with a matching name.
-	InsertBeforeLastMatch InsertLocation = "BeforeLastMatch"
-	// InsertAfterLastMatch inserts the resource after the last resource with a matching name.
-	InsertAfterLastMatch InsertLocation = "AfterLastMatch"
-)
-
-// InsertOptions controls how and where to insert Envoy resources.
-type InsertOptions struct {
-	// Location defines where to insert the resource within the list.
-	Location InsertLocation
-	// FilterName indicates the name of the resource to insert relative to.
-	FilterName string
-}
-
-// InsertHTTPFilter inserts the given HTTP filter into the HttpConnectionManager's filter chain in the location
-// determined by the insert options. This list of filters must include the HttpConnectionManager network
-// filter or the operation will fail.
-//
-// It returns the modified list of filters including the updated HttpConnectionManager.
-// If a matching location is not found to insert the filter, a non-nil error is returned.
-func InsertHTTPFilter(filters []*envoy_listener_v3.Filter, filter *envoy_http_v3.HttpFilter, opts InsertOptions) ([]*envoy_listener_v3.Filter, error) {
-	httpConnMgr, idx, err := GetHTTPConnectionManager(filters...)
-	if err != nil {
-		return filters, err
-	}
-
-	namedFilters := make([]namedFilter, 0, len(httpConnMgr.HttpFilters)+1)
-	for _, f := range httpConnMgr.HttpFilters {
-		namedFilters = append(namedFilters, f)
-	}
-	insertIdx, err := locateInsertIndex(opts, namedFilters)
-	if err != nil {
-		return filters, fmt.Errorf("failed to insert %q filter: %w", filter.Name, err)
-	}
-
-	currIdx := 0
-	newHttpFilters := make([]*envoy_http_v3.HttpFilter, len(httpConnMgr.HttpFilters)+1)
-	for idx, httpFilter := range httpConnMgr.HttpFilters {
-		if idx == insertIdx {
-			newHttpFilters[currIdx] = filter
-			currIdx++
-		}
-		newHttpFilters[currIdx] = httpFilter
-		currIdx++
-	}
-	if currIdx == insertIdx {
-		newHttpFilters[currIdx] = filter
-	}
-
-	httpConnMgr.HttpFilters = newHttpFilters
-	newHttpConMan, err := MakeFilter("envoy.filters.network.http_connection_manager", httpConnMgr)
-	if err != nil {
-		return filters, errors.New("failed to insert new HTTP connection manager filter")
-	}
-	filtersCopy := make([]*envoy_listener_v3.Filter, len(filters))
-	copy(filtersCopy, filters)
-	filtersCopy[idx] = newHttpConMan
-
-	return filtersCopy, nil
-}
-
-// InsertNetworkFilter inserts the given network filter into the filter chain in the location
-// determined by the insert options.
-//
-// It returns the modified list of filters including the new filter.
-// If a matching location is not found to insert the filter, a non-nil error is returned.
-func InsertNetworkFilter(filters []*envoy_listener_v3.Filter, filter *envoy_listener_v3.Filter, opts InsertOptions) ([]*envoy_listener_v3.Filter, error) {
-	namedFilters := make([]namedFilter, 0, len(filters)+1)
-	for _, f := range filters {
-		namedFilters = append(namedFilters, f)
-	}
-	insertIdx, err := locateInsertIndex(opts, namedFilters)
-	if err != nil {
-		return filters, fmt.Errorf("failed to insert %q filter: %w", filter.Name, err)
-	}
-
-	currIdx := 0
-	newFilters := make([]*envoy_listener_v3.Filter, len(filters)+1)
-	for idx, f := range filters {
-		if idx == insertIdx {
-			newFilters[currIdx] = filter
-			currIdx++
-		}
-		newFilters[currIdx] = f
-		currIdx++
-	}
-	if currIdx == insertIdx {
-		newFilters[currIdx] = filter
-	}
-
-	return newFilters, nil
-}
-
-// namedFilter is a convenience interface for locating Envoy filters based on name.
-type namedFilter interface {
-	GetName() string
-}
-
-// locateInsertIndex returns the index where a filter should be inserted based on the given
-// insert options.
-func locateInsertIndex(opts InsertOptions, filters []namedFilter) (int, error) {
-	idx := 0
-	if opts.Location == InsertFirst {
-		return idx, nil
-	}
-	if opts.Location == InsertLast {
-		return len(filters), nil
-	}
-
-	matched := false
-	for currIdx, filter := range filters {
-		if filter.GetName() == opts.FilterName {
-			matched = true
-			switch opts.Location {
-			case InsertBeforeFirstMatch:
-				return currIdx, nil
-			case InsertAfterFirstMatch:
-				return currIdx + 1, nil
-			case InsertBeforeLastMatch:
-				idx = currIdx
-			case InsertAfterLastMatch:
-				idx = currIdx + 1
-			}
-		}
-	}
-	if matched {
-		return idx, nil
-	}
-	return idx, fmt.Errorf("failed to find insert location %q for %q", opts.Location, opts.FilterName)
-}
diff --git a/envoyextensions/extensioncommon/resources_test.go b/envoyextensions/extensioncommon/resources_test.go
deleted file mode 100644
index 477e66494ce5f..0000000000000
--- a/envoyextensions/extensioncommon/resources_test.go
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package extensioncommon
-
-import (
-	"testing"
-
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
-	"github.com/stretchr/testify/require"
-)
-
-func TestInsertHTTPFilter(t *testing.T) {
-	cases := map[string]struct {
-		inputFilters    []*envoy_http_v3.HttpFilter
-		insertOptions   InsertOptions
-		filterName      string
-		expectedFilters []*envoy_http_v3.HttpFilter
-		errStr          string
-	}{
-		"insert first": {
-			inputFilters:    makeHttpFilters(t, "a", "b", "b", "b", "c"),
-			insertOptions:   InsertOptions{Location: InsertFirst},
-			filterName:      "test.filter",
-			expectedFilters: makeHttpFilters(t, "test.filter", "a", "b", "b", "b", "c"),
-		},
-		"insert last": {
-			inputFilters:    makeHttpFilters(t, "a", "b", "b", "b", "c"),
-			insertOptions:   InsertOptions{Location: InsertLast},
-			filterName:      "test.filter",
-			expectedFilters: makeHttpFilters(t, "a", "b", "b", "b", "c", "test.filter"),
-		},
-		"insert before first match": {
-			inputFilters:    makeHttpFilters(t, "a", "b", "b", "b", "c"),
-			insertOptions:   InsertOptions{Location: InsertBeforeFirstMatch, FilterName: "b"},
-			filterName:      "test.filter",
-			expectedFilters: makeHttpFilters(t, "a", "test.filter", "b", "b", "b", "c"),
-		},
-		"insert after first match": {
-			inputFilters:    makeHttpFilters(t, "a", "b", "b", "b", "c"),
-			insertOptions:   InsertOptions{Location: InsertAfterFirstMatch, FilterName: "b"},
-			filterName:      "test.filter",
-			expectedFilters: makeHttpFilters(t, "a", "b", "test.filter", "b", "b", "c"),
-		},
-		"insert before last match": {
-			inputFilters:    makeHttpFilters(t, "a", "b", "b", "b", "c"),
-			insertOptions:   InsertOptions{Location: InsertBeforeLastMatch, FilterName: "b"},
-			filterName:      "test.filter",
-			expectedFilters: makeHttpFilters(t, "a", "b", "b", "test.filter", "b", "c"),
-		},
-		"insert after last match": {
-			inputFilters:    makeHttpFilters(t, "a", "b", "b", "b", "c"),
-			insertOptions:   InsertOptions{Location: InsertAfterLastMatch, FilterName: "b"},
-			filterName:      "test.filter",
-			expectedFilters: makeHttpFilters(t, "a", "b", "b", "b", "test.filter", "c"),
-		},
-		"insert last after last match": {
-			inputFilters:    makeHttpFilters(t, "a", "b", "b", "b", "c"),
-			insertOptions:   InsertOptions{Location: InsertAfterLastMatch, FilterName: "c"},
-			filterName:      "test.filter",
-			expectedFilters: makeHttpFilters(t, "a", "b", "b", "b", "c", "test.filter"),
-		},
-	}
-
-	t.Parallel()
-	for name, c := range cases {
-		c := c
-
-		t.Run(name, func(t *testing.T) {
-			filters := []*envoy_listener_v3.Filter{makeHttpConMgr(t, c.inputFilters)}
-			newFilter := &envoy_http_v3.HttpFilter{Name: c.filterName}
-			obsFilters, err := InsertHTTPFilter(filters, newFilter, c.insertOptions)
-			if c.errStr != "" {
-				require.Error(t, err)
-				require.Contains(t, err.Error(), c.errStr)
-			} else {
-				require.NoError(t, err)
-				httpConMgr, idx, err := GetHTTPConnectionManager(obsFilters...)
-				require.NoError(t, err)
-				require.NotNil(t, httpConMgr)
-				require.Equal(t, 0, idx)
-				require.ElementsMatch(t, c.expectedFilters, httpConMgr.HttpFilters)
-			}
-		})
-	}
-}
-
-func TestInsertFilter(t *testing.T) {
-	cases := map[string]struct {
-		inputFilters    []*envoy_listener_v3.Filter
-		filterName      string
-		insertOptions   InsertOptions
-		expectedFilters []*envoy_listener_v3.Filter
-		errStr          string
-	}{
-		"insert first": {
-			inputFilters:    makeFilters(t, "a", "b", "b", "b", "c"),
-			insertOptions:   InsertOptions{Location: InsertFirst},
-			filterName:      "test.filter",
-			expectedFilters: makeFilters(t, "test.filter", "a", "b", "b", "b", "c"),
-		},
-		"insert last": {
-			inputFilters:    makeFilters(t, "a", "b", "b", "b", "c"),
-			insertOptions:   InsertOptions{Location: InsertLast},
-			filterName:      "test.filter",
-			expectedFilters: makeFilters(t, "a", "b", "b", "b", "c", "test.filter"),
-		},
-		"insert before first match": {
-			inputFilters:    makeFilters(t, "a", "b", "b", "b", "c"),
-			insertOptions:   InsertOptions{Location: InsertBeforeFirstMatch, FilterName: "b"},
-			filterName:      "test.filter",
-			expectedFilters: makeFilters(t, "a", "test.filter", "b", "b", "b", "c"),
-		},
-		"insert after first match": {
-			inputFilters:    makeFilters(t, "a", "b", "b", "b", "c"),
-			insertOptions:   InsertOptions{Location: InsertAfterFirstMatch, FilterName: "b"},
-			filterName:      "test.filter",
-			expectedFilters: makeFilters(t, "a", "b", "test.filter", "b", "b", "c"),
-		},
-		"insert before last match": {
-			inputFilters:    makeFilters(t, "a", "b", "b", "b", "c"),
-			insertOptions:   InsertOptions{Location: InsertBeforeLastMatch, FilterName: "b"},
-			filterName:      "test.filter",
-			expectedFilters: makeFilters(t, "a", "b", "b", "test.filter", "b", "c"),
-		},
-		"insert after last match": {
-			inputFilters:    makeFilters(t, "a", "b", "b", "b", "c"),
-			insertOptions:   InsertOptions{Location: InsertAfterLastMatch, FilterName: "b"},
-			filterName:      "test.filter",
-			expectedFilters: makeFilters(t, "a", "b", "b", "b", "test.filter", "c"),
-		},
-	}
-
-	t.Parallel()
-	for name, c := range cases {
-		c := c
-
-		t.Run(name, func(t *testing.T) {
-			filter := &envoy_listener_v3.Filter{Name: c.filterName}
-			obsFilters, err := InsertNetworkFilter(c.inputFilters, filter, c.insertOptions)
-			if c.errStr != "" {
-				require.Error(t, err)
-				require.Contains(t, err.Error(), c.errStr)
-			} else {
-				require.NoError(t, err)
-				require.ElementsMatch(t, c.expectedFilters, obsFilters)
-			}
-		})
-	}
-}
-
-func makeHttpConMgr(t *testing.T, filters []*envoy_http_v3.HttpFilter) *envoy_listener_v3.Filter {
-	t.Helper()
-	httpConMgr := &envoy_http_v3.HttpConnectionManager{HttpFilters: filters}
-	filter, err := MakeFilter("envoy.filters.network.http_connection_manager", httpConMgr)
-	require.NoError(t, err)
-	return filter
-}
-
-func makeHttpFilters(t *testing.T, names ...string) []*envoy_http_v3.HttpFilter {
-	var filters []*envoy_http_v3.HttpFilter
-	for _, name := range names {
-		filters = append(filters, &envoy_http_v3.HttpFilter{Name: name})
-	}
-	return filters
-}
-
-func makeFilters(t *testing.T, names ...string) []*envoy_listener_v3.Filter {
-	var filters []*envoy_listener_v3.Filter
-	for _, name := range names {
-		filters = append(filters, &envoy_listener_v3.Filter{Name: name})
-	}
-	return filters
-}
diff --git a/envoyextensions/extensioncommon/runtime_config.go b/envoyextensions/extensioncommon/runtime_config.go
index 2a5e7d60077be..918577c8c904e 100644
--- a/envoyextensions/extensioncommon/runtime_config.go
+++ b/envoyextensions/extensioncommon/runtime_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package extensioncommon
 
 import "github.com/hashicorp/consul/api"
@@ -8,11 +5,8 @@ import "github.com/hashicorp/consul/api"
 // UpstreamData has the SNI, EnvoyID, and OutgoingProxyKind of the upstream services for the local proxy and this data
 // is used to choose which Envoy resources to patch.
 type UpstreamData struct {
-	// This is the SNI for the upstream service without accounting for any discovery chain magic.
-	PrimarySNI string
-
-	// SNIs is the SNIs header used to reach an upstream service.
-	SNIs map[string]struct{}
+	// SNI is the SNI header used to reach an upstream service.
+	SNI map[string]struct{}
 
 	// EnvoyID is the envoy ID of an upstream service, structured <service> or <partition>/<ns>/<service> when using a
 	// non-default namespace or partition.
@@ -26,9 +20,10 @@ type UpstreamData struct {
 	VIP string
 }
 
-// RuntimeConfig is the configuration for an extension attached to a service on the local proxy.
-// It should depend on the API client rather than the structs package because the API client is
-// meant to be public.
+// RuntimeConfig is the configuration for an extension attached to a service on the local proxy. Currently, it
+// is only created for the local proxy's upstream service if the upstream service has an extension configured. In the
+// future it will also include information about the service local to the local proxy as well. It should depend on the
+// API client rather than the structs package because the API client is meant to be public.
 type RuntimeConfig struct {
 	// EnvoyExtension is the extension that will patch Envoy resources.
 	EnvoyExtension api.EnvoyExtension
@@ -61,20 +56,14 @@ type RuntimeConfig struct {
 	// Kind is mode the local Envoy proxy is running in. For now, only connect proxy and
 	// terminating gateways are supported.
 	Kind api.ServiceKind
-
-	// Protocol is the protocol configured for the local service. It may be empty which implies tcp.
-	Protocol string
 }
 
 // MatchesUpstreamServiceSNI indicates if the extension configuration is for an upstream service
 // that matches the given SNI, if the RuntimeConfig corresponds to an upstream of the local service.
 // Only used when IsSourcedFromUpstream is true.
 func (c RuntimeConfig) MatchesUpstreamServiceSNI(sni string) bool {
-	u, ok := c.Upstreams[c.ServiceName]
-	if !ok {
-		return false
-	}
-	_, match := u.SNIs[sni]
+	u := c.Upstreams[c.ServiceName]
+	_, match := u.SNI[sni]
 	return match
 }
 
@@ -82,10 +71,7 @@ func (c RuntimeConfig) MatchesUpstreamServiceSNI(sni string) bool {
 // upstream of the local service. Note that this could be the local service if it targets itself as an upstream.
 // Only used when IsSourcedFromUpstream is true.
 func (c RuntimeConfig) UpstreamEnvoyID() string {
-	u, ok := c.Upstreams[c.ServiceName]
-	if !ok {
-		return ""
-	}
+	u := c.Upstreams[c.ServiceName]
 	return u.EnvoyID
 }
 
@@ -93,9 +79,6 @@ func (c RuntimeConfig) UpstreamEnvoyID() string {
 // RuntimeConfig corresponds to an upstream of the local service.
 // Only used when IsSourcedFromUpstream is true.
 func (c RuntimeConfig) UpstreamOutgoingProxyKind() api.ServiceKind {
-	u, ok := c.Upstreams[c.ServiceName]
-	if !ok {
-		return ""
-	}
+	u := c.Upstreams[c.ServiceName]
 	return u.OutgoingProxyKind
 }
diff --git a/envoyextensions/extensioncommon/runtime_config_test.go b/envoyextensions/extensioncommon/runtime_config_test.go
index 8c4c9bed6eb69..8fcbb09427200 100644
--- a/envoyextensions/extensioncommon/runtime_config_test.go
+++ b/envoyextensions/extensioncommon/runtime_config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package extensioncommon
 
 import (
@@ -20,7 +17,7 @@ func makeTestRuntimeConfig() RuntimeConfig {
 			sn: {
 				EnvoyID:           "eid",
 				OutgoingProxyKind: api.ServiceKindTerminatingGateway,
-				SNIs: map[string]struct{}{
+				SNI: map[string]struct{}{
 					"sni1": {},
 					"sni2": {},
 				},
diff --git a/envoyextensions/extensioncommon/upstream_envoy_extender.go b/envoyextensions/extensioncommon/upstream_envoy_extender.go
index 35cebe2fa5301..5816e976958b2 100644
--- a/envoyextensions/extensioncommon/upstream_envoy_extender.go
+++ b/envoyextensions/extensioncommon/upstream_envoy_extender.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MPL-2.0
 
 package extensioncommon
 
@@ -30,10 +30,6 @@ type UpstreamEnvoyExtender struct {
 
 var _ EnvoyExtender = (*UpstreamEnvoyExtender)(nil)
 
-func (ext *UpstreamEnvoyExtender) CanApply(config *RuntimeConfig) bool {
-	return ext.Extension.CanApply(config)
-}
-
 func (ext *UpstreamEnvoyExtender) Validate(_ *RuntimeConfig) error {
 	return nil
 }
@@ -60,6 +56,10 @@ func (ext *UpstreamEnvoyExtender) Extend(resources *xdscommon.IndexedResources,
 		return resources, nil
 	}
 
+	if !ext.Extension.CanApply(config) {
+		return resources, nil
+	}
+
 	for _, indexType := range []string{
 		xdscommon.ListenerType,
 		xdscommon.RouteType,
@@ -74,7 +74,7 @@ func (ext *UpstreamEnvoyExtender) Extend(resources *xdscommon.IndexedResources,
 					continue
 				}
 
-				newCluster, patched, err := ext.Extension.PatchCluster(config.GetClusterPayload(resource))
+				newCluster, patched, err := ext.Extension.PatchCluster(config, resource)
 				if err != nil {
 					resultErr = multierror.Append(resultErr, fmt.Errorf("error patching cluster: %w", err))
 					continue
@@ -101,7 +101,7 @@ func (ext *UpstreamEnvoyExtender) Extend(resources *xdscommon.IndexedResources,
 					continue
 				}
 
-				newRoute, patched, err := ext.Extension.PatchRoute(config.GetRoutePayload(resource))
+				newRoute, patched, err := ext.Extension.PatchRoute(config, resource)
 				if err != nil {
 					resultErr = multierror.Append(resultErr, fmt.Errorf("error patching route: %w", err))
 					continue
@@ -146,7 +146,7 @@ func (ext *UpstreamEnvoyExtender) patchTerminatingGatewayListener(config *Runtim
 		var filters []*envoy_listener_v3.Filter
 
 		for _, filter := range filterChain.Filters {
-			newFilter, ok, err := ext.Extension.PatchFilter(config.GetFilterPayload(filter, l))
+			newFilter, ok, err := ext.Extension.PatchFilter(config, filter, IsInboundPublicListener(l))
 
 			if err != nil {
 				resultErr = multierror.Append(resultErr, fmt.Errorf("error patching listener filter: %w", err))
@@ -190,7 +190,7 @@ func (ext *UpstreamEnvoyExtender) patchConnectProxyListener(config *RuntimeConfi
 		var filters []*envoy_listener_v3.Filter
 
 		for _, filter := range filterChain.Filters {
-			newFilter, ok, err := ext.Extension.PatchFilter(config.GetFilterPayload(filter, l))
+			newFilter, ok, err := ext.Extension.PatchFilter(config, filter, IsInboundPublicListener(l))
 			if err != nil {
 				resultErr = multierror.Append(resultErr, fmt.Errorf("error patching listener filter: %w", err))
 				filters = append(filters, filter)
@@ -229,7 +229,7 @@ func (ext *UpstreamEnvoyExtender) patchTProxyListener(config *RuntimeConfig, l *
 		}
 
 		for _, filter := range filterChain.Filters {
-			newFilter, ok, err := ext.Extension.PatchFilter(config.GetFilterPayload(filter, l))
+			newFilter, ok, err := ext.Extension.PatchFilter(config, filter, IsInboundPublicListener(l))
 			if err != nil {
 				resultErr = multierror.Append(resultErr, fmt.Errorf("error patching listener filter: %w", err))
 				filters = append(filters, filter)
diff --git a/envoyextensions/go.mod b/envoyextensions/go.mod
index 4d4301841ea32..2e33c8d601c12 100644
--- a/envoyextensions/go.mod
+++ b/envoyextensions/go.mod
@@ -1,47 +1,42 @@
 module github.com/hashicorp/consul/envoyextensions
 
-go 1.20
+go 1.19
 
-replace (
-	github.com/hashicorp/consul/api => ../api
-	github.com/hashicorp/consul/sdk => ../sdk
-)
+replace github.com/hashicorp/consul/api => ../api
 
 require (
-	github.com/envoyproxy/go-control-plane v0.11.0
-	github.com/google/go-cmp v0.5.9
-	github.com/hashicorp/consul/api v1.24.0
-	github.com/hashicorp/consul/sdk v0.14.1
-	github.com/hashicorp/go-hclog v1.5.0
+	github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1
+	github.com/hashicorp/consul/api v1.21.0
+	github.com/hashicorp/consul/sdk v0.13.1
+	github.com/hashicorp/go-hclog v1.2.1
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/go-version v1.2.1
-	github.com/stretchr/testify v1.8.3
-	google.golang.org/protobuf v1.30.0
+	github.com/stretchr/testify v1.7.2
+	google.golang.org/protobuf v1.27.1
 )
 
 require (
-	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/envoyproxy/protoc-gen-validate v0.10.0 // indirect
-	github.com/fatih/color v1.14.1 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
+	github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect
+	github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect
+	github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/envoyproxy/protoc-gen-validate v0.1.0 // indirect
+	github.com/fatih/color v1.13.0 // indirect
+	github.com/golang/protobuf v1.5.0 // indirect
+	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
+	github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
-	github.com/hashicorp/go-uuid v1.0.3 // indirect
+	github.com/hashicorp/go-uuid v1.0.2 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/serf v0.10.1 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
-	golang.org/x/sys v0.11.0 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
+	golang.org/x/sys v0.10.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/envoyextensions/go.sum b/envoyextensions/go.sum
index de21ca6c0b42e..d5401e1d5e3e5 100644
--- a/envoyextensions/go.sum
+++ b/envoyextensions/go.sum
@@ -1,85 +1,79 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
+github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
-github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
-github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
-github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 h1:58f1tJ1ra+zFINPlwLWvQsR9CzAKt2e+EWV2yX9oXQ4=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe h1:QJDJubh0OEcpeGjC7/8uF9tt4e39U/Ya1uyK+itnNPQ=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.11.0 h1:jtLewhRR2vMRNnq2ZZUoCjUlgut+Y0+sDDWPOfwOi1o=
-github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 h1:xvqufLtNVwAhN8NMyWklVgxnWohi+wtMGQMhtxexlm0=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
+github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.10.0 h1:oIfnZFdC0YhpNNEX+SuIqko4cqqVZeN9IGTrhZje83Y=
-github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
+github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
-github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/hashicorp/consul/sdk v0.13.1 h1:EygWVWWMczTzXGpO93awkHFzfUka6hLYJ0qhETd+6lY=
+github.com/hashicorp/consul/sdk v0.13.1/go.mod h1:SW/mM4LbKfqmMvcFu8v+eiQQ7oitXEFeiBe9StxERb0=
+github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
-github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
+github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-hclog v1.2.1 h1:YQsLlGDJgwhXFpucSPyVbCBviQtjlHv3jLTlp8YmtEw=
+github.com/hashicorp/go-hclog v1.2.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-immutable-radix v1.0.0 h1:AKDB1HM5PWEA7i4nhcpwOrO2byshxBjXVn/J/3+z5/0=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
-github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-msgpack v0.5.3 h1:zKjpN5BK/P5lMYrLmBHdBULWbJ0XpYR+7NGzqkZzoD4=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
@@ -87,8 +81,8 @@ github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0S
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
-github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
 github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -100,32 +94,20 @@ github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR
 github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
 github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
 github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
@@ -133,104 +115,81 @@ github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXx
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
+github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
-github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -244,27 +203,36 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/envoyextensions/xdscommon/envoy_versioning.go b/envoyextensions/xdscommon/envoy_versioning.go
index c5f9d4798c105..3f9e9d2c6e461 100644
--- a/envoyextensions/xdscommon/envoy_versioning.go
+++ b/envoyextensions/xdscommon/envoy_versioning.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xdscommon
 
 import (
@@ -30,7 +27,7 @@ type SupportedProxyFeatures struct {
 }
 
 func DetermineSupportedProxyFeatures(node *envoy_core_v3.Node) (SupportedProxyFeatures, error) {
-	version := DetermineEnvoyVersionFromNode(node)
+	version := determineEnvoyVersionFromNode(node)
 	return determineSupportedProxyFeaturesFromVersion(version)
 }
 
@@ -69,7 +66,7 @@ func determineSupportedProxyFeaturesFromVersion(version *version.Version) (Suppo
 	return sf, nil
 }
 
-func DetermineEnvoyVersionFromNode(node *envoy_core_v3.Node) *version.Version {
+func determineEnvoyVersionFromNode(node *envoy_core_v3.Node) *version.Version {
 	if node == nil {
 		return nil
 	}
diff --git a/envoyextensions/xdscommon/envoy_versioning_test.go b/envoyextensions/xdscommon/envoy_versioning_test.go
index bc02e9c4aadc7..234ecb0ad0d24 100644
--- a/envoyextensions/xdscommon/envoy_versioning_test.go
+++ b/envoyextensions/xdscommon/envoy_versioning_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xdscommon
 
 import (
@@ -59,7 +56,7 @@ func TestDetermineEnvoyVersionFromNode(t *testing.T) {
 	for name, tc := range cases {
 		tc := tc
 		t.Run(name, func(t *testing.T) {
-			got := DetermineEnvoyVersionFromNode(tc.node)
+			got := determineEnvoyVersionFromNode(tc.node)
 			if tc.expect != nil {
 				require.Equal(t, tc.expect, got)
 			} else {
@@ -81,62 +78,50 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
 
 	// Just the bad versions
 	cases := map[string]testcase{
-		"1.9.0":   {expectErr: "Envoy 1.9.0 " + errTooOld},
-		"1.10.0":  {expectErr: "Envoy 1.10.0 " + errTooOld},
-		"1.11.0":  {expectErr: "Envoy 1.11.0 " + errTooOld},
-		"1.12.0":  {expectErr: "Envoy 1.12.0 " + errTooOld},
-		"1.12.1":  {expectErr: "Envoy 1.12.1 " + errTooOld},
-		"1.12.2":  {expectErr: "Envoy 1.12.2 " + errTooOld},
-		"1.12.3":  {expectErr: "Envoy 1.12.3 " + errTooOld},
-		"1.12.4":  {expectErr: "Envoy 1.12.4 " + errTooOld},
-		"1.12.5":  {expectErr: "Envoy 1.12.5 " + errTooOld},
-		"1.12.6":  {expectErr: "Envoy 1.12.6 " + errTooOld},
-		"1.12.7":  {expectErr: "Envoy 1.12.7 " + errTooOld},
-		"1.13.0":  {expectErr: "Envoy 1.13.0 " + errTooOld},
-		"1.13.1":  {expectErr: "Envoy 1.13.1 " + errTooOld},
-		"1.13.2":  {expectErr: "Envoy 1.13.2 " + errTooOld},
-		"1.13.3":  {expectErr: "Envoy 1.13.3 " + errTooOld},
-		"1.13.4":  {expectErr: "Envoy 1.13.4 " + errTooOld},
-		"1.13.5":  {expectErr: "Envoy 1.13.5 " + errTooOld},
-		"1.13.6":  {expectErr: "Envoy 1.13.6 " + errTooOld},
-		"1.13.7":  {expectErr: "Envoy 1.13.7 " + errTooOld},
-		"1.14.0":  {expectErr: "Envoy 1.14.0 " + errTooOld},
-		"1.14.1":  {expectErr: "Envoy 1.14.1 " + errTooOld},
-		"1.14.2":  {expectErr: "Envoy 1.14.2 " + errTooOld},
-		"1.14.3":  {expectErr: "Envoy 1.14.3 " + errTooOld},
-		"1.14.4":  {expectErr: "Envoy 1.14.4 " + errTooOld},
-		"1.14.5":  {expectErr: "Envoy 1.14.5 " + errTooOld},
-		"1.14.6":  {expectErr: "Envoy 1.14.6 " + errTooOld},
-		"1.14.7":  {expectErr: "Envoy 1.14.7 " + errTooOld},
-		"1.15.0":  {expectErr: "Envoy 1.15.0 " + errTooOld},
-		"1.15.1":  {expectErr: "Envoy 1.15.1 " + errTooOld},
-		"1.15.2":  {expectErr: "Envoy 1.15.2 " + errTooOld},
-		"1.15.3":  {expectErr: "Envoy 1.15.3 " + errTooOld},
-		"1.15.4":  {expectErr: "Envoy 1.15.4 " + errTooOld},
-		"1.15.5":  {expectErr: "Envoy 1.15.5 " + errTooOld},
-		"1.16.1":  {expectErr: "Envoy 1.16.1 " + errTooOld},
-		"1.16.2":  {expectErr: "Envoy 1.16.2 " + errTooOld},
-		"1.16.3":  {expectErr: "Envoy 1.16.3 " + errTooOld},
-		"1.16.4":  {expectErr: "Envoy 1.16.4 " + errTooOld},
-		"1.16.5":  {expectErr: "Envoy 1.16.5 " + errTooOld},
-		"1.16.6":  {expectErr: "Envoy 1.16.6 " + errTooOld},
-		"1.17.4":  {expectErr: "Envoy 1.17.4 " + errTooOld},
-		"1.18.6":  {expectErr: "Envoy 1.18.6 " + errTooOld},
-		"1.19.5":  {expectErr: "Envoy 1.19.5 " + errTooOld},
-		"1.20.7":  {expectErr: "Envoy 1.20.7 " + errTooOld},
-		"1.21.5":  {expectErr: "Envoy 1.21.5 " + errTooOld},
-		"1.22.0":  {expectErr: "Envoy 1.22.0 " + errTooOld},
-		"1.22.1":  {expectErr: "Envoy 1.22.1 " + errTooOld},
-		"1.22.2":  {expectErr: "Envoy 1.22.2 " + errTooOld},
-		"1.22.3":  {expectErr: "Envoy 1.22.3 " + errTooOld},
-		"1.22.4":  {expectErr: "Envoy 1.22.4 " + errTooOld},
-		"1.22.5":  {expectErr: "Envoy 1.22.5 " + errTooOld},
-		"1.22.6":  {expectErr: "Envoy 1.22.6 " + errTooOld},
-		"1.22.7":  {expectErr: "Envoy 1.22.7 " + errTooOld},
-		"1.22.8":  {expectErr: "Envoy 1.22.8 " + errTooOld},
-		"1.22.9":  {expectErr: "Envoy 1.22.9 " + errTooOld},
-		"1.22.10": {expectErr: "Envoy 1.22.10 " + errTooOld},
-		"1.22.11": {expectErr: "Envoy 1.22.11 " + errTooOld},
+		"1.9.0":  {expectErr: "Envoy 1.9.0 " + errTooOld},
+		"1.10.0": {expectErr: "Envoy 1.10.0 " + errTooOld},
+		"1.11.0": {expectErr: "Envoy 1.11.0 " + errTooOld},
+		"1.12.0": {expectErr: "Envoy 1.12.0 " + errTooOld},
+		"1.12.1": {expectErr: "Envoy 1.12.1 " + errTooOld},
+		"1.12.2": {expectErr: "Envoy 1.12.2 " + errTooOld},
+		"1.12.3": {expectErr: "Envoy 1.12.3 " + errTooOld},
+		"1.12.4": {expectErr: "Envoy 1.12.4 " + errTooOld},
+		"1.12.5": {expectErr: "Envoy 1.12.5 " + errTooOld},
+		"1.12.6": {expectErr: "Envoy 1.12.6 " + errTooOld},
+		"1.12.7": {expectErr: "Envoy 1.12.7 " + errTooOld},
+		"1.13.0": {expectErr: "Envoy 1.13.0 " + errTooOld},
+		"1.13.1": {expectErr: "Envoy 1.13.1 " + errTooOld},
+		"1.13.2": {expectErr: "Envoy 1.13.2 " + errTooOld},
+		"1.13.3": {expectErr: "Envoy 1.13.3 " + errTooOld},
+		"1.13.4": {expectErr: "Envoy 1.13.4 " + errTooOld},
+		"1.13.5": {expectErr: "Envoy 1.13.5 " + errTooOld},
+		"1.13.6": {expectErr: "Envoy 1.13.6 " + errTooOld},
+		"1.13.7": {expectErr: "Envoy 1.13.7 " + errTooOld},
+		"1.14.0": {expectErr: "Envoy 1.14.0 " + errTooOld},
+		"1.14.1": {expectErr: "Envoy 1.14.1 " + errTooOld},
+		"1.14.2": {expectErr: "Envoy 1.14.2 " + errTooOld},
+		"1.14.3": {expectErr: "Envoy 1.14.3 " + errTooOld},
+		"1.14.4": {expectErr: "Envoy 1.14.4 " + errTooOld},
+		"1.14.5": {expectErr: "Envoy 1.14.5 " + errTooOld},
+		"1.14.6": {expectErr: "Envoy 1.14.6 " + errTooOld},
+		"1.14.7": {expectErr: "Envoy 1.14.7 " + errTooOld},
+		"1.15.0": {expectErr: "Envoy 1.15.0 " + errTooOld},
+		"1.15.1": {expectErr: "Envoy 1.15.1 " + errTooOld},
+		"1.15.2": {expectErr: "Envoy 1.15.2 " + errTooOld},
+		"1.15.3": {expectErr: "Envoy 1.15.3 " + errTooOld},
+		"1.15.4": {expectErr: "Envoy 1.15.4 " + errTooOld},
+		"1.15.5": {expectErr: "Envoy 1.15.5 " + errTooOld},
+		"1.16.1": {expectErr: "Envoy 1.16.1 " + errTooOld},
+		"1.16.2": {expectErr: "Envoy 1.16.2 " + errTooOld},
+		"1.16.3": {expectErr: "Envoy 1.16.3 " + errTooOld},
+		"1.16.4": {expectErr: "Envoy 1.16.4 " + errTooOld},
+		"1.16.5": {expectErr: "Envoy 1.16.5 " + errTooOld},
+		"1.16.6": {expectErr: "Envoy 1.16.6 " + errTooOld},
+		"1.17.4": {expectErr: "Envoy 1.17.4 " + errTooOld},
+		"1.18.6": {expectErr: "Envoy 1.18.6 " + errTooOld},
+		"1.19.5": {expectErr: "Envoy 1.19.5 " + errTooOld},
+		"1.20.7": {expectErr: "Envoy 1.20.7 " + errTooOld},
+		"1.21.5": {expectErr: "Envoy 1.21.5 " + errTooOld},
 	}
 
 	// Insert a bunch of valid versions.
@@ -151,10 +136,10 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
 	}
 	*/
 	for _, v := range []string{
+		"1.22.0", "1.22.1", "1.22.2", "1.22.3", "1.22.4", "1.22.5", "1.22.6", "1.22.7", "1.22.8", "1.22.9", "1.22.10", "1.22.11",
+		"1.23.0", "1.23.1", "1.23.2", "1.23.3", "1.23.4", "1.23.5", "1.23.6", "1.23.7", "1.23.8", "1.23.9", "1.23.10", "1.23.11", "1.23.12",
 		"1.24.0", "1.24.1", "1.24.2", "1.24.3", "1.24.4", "1.24.5", "1.24.6", "1.24.7", "1.24.8", "1.24.9", "1.24.10",
 		"1.25.0", "1.25.1", "1.25.2", "1.25.3", "1.25.4", "1.25.5", "1.25.6", "1.25.7", "1.25.8", "1.25.9",
-		"1.26.0", "1.26.1", "1.26.2", "1.26.3", "1.26.4",
-		"1.27.0",
 	} {
 		cases[v] = testcase{expect: SupportedProxyFeatures{}}
 	}
@@ -164,7 +149,6 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			sf, err := DetermineSupportedProxyFeaturesFromString(name)
 			if tc.expectErr == "" {
-				require.NoError(t, err)
 				require.Equal(t, tc.expect, sf)
 			} else {
 				testutil.RequireErrorContains(t, err, tc.expectErr)
diff --git a/envoyextensions/xdscommon/proxysupport.go b/envoyextensions/xdscommon/proxysupport.go
index 764d967616f6d..b6faaa35fa7dc 100644
--- a/envoyextensions/xdscommon/proxysupport.go
+++ b/envoyextensions/xdscommon/proxysupport.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xdscommon
 
 import "strings"
@@ -12,10 +9,10 @@ import "strings"
 //
 // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
 var EnvoyVersions = []string{
-	"1.27.0",
-	"1.26.4",
 	"1.25.9",
 	"1.24.10",
+	"1.23.12",
+	"1.22.11",
 }
 
 // UnsupportedEnvoyVersions lists any unsupported Envoy versions (mainly minor versions) that fall
diff --git a/envoyextensions/xdscommon/proxysupport_test.go b/envoyextensions/xdscommon/proxysupport_test.go
index cc90b726c9d94..61f793c4df21b 100644
--- a/envoyextensions/xdscommon/proxysupport_test.go
+++ b/envoyextensions/xdscommon/proxysupport_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xdscommon
 
 import (
diff --git a/envoyextensions/xdscommon/xdscommon.go b/envoyextensions/xdscommon/xdscommon.go
index ae40f070210ff..b1061fb101815 100644
--- a/envoyextensions/xdscommon/xdscommon.go
+++ b/envoyextensions/xdscommon/xdscommon.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package xdscommon
 
 import (
@@ -52,12 +49,6 @@ const (
 
 	// SecretType is the TypeURL for Secret discovery responses.
 	SecretType = apiTypePrefix + "envoy.extensions.transport_sockets.tls.v3.Secret"
-
-	FailoverClusterNamePrefix = "failover-target~"
-
-	// BlackHoleClusterName is the cluster we use for black-holing traffic for cases when a workload
-	// has no inbound ports to route to.
-	BlackHoleClusterName = "black-hole-cluster"
 )
 
 type IndexedResources struct {
@@ -70,29 +61,6 @@ type IndexedResources struct {
 	ChildIndex map[string]map[string][]string
 }
 
-// Clone makes a deep copy of the IndexedResources value at the given pointer and
-// returns a pointer to the copy.
-func Clone(i *IndexedResources) *IndexedResources {
-	if i == nil {
-		return nil
-	}
-
-	iCopy := EmptyIndexedResources()
-	for typeURL, typeMap := range i.Index {
-		for name, msg := range typeMap {
-			clone := proto.Clone(msg)
-			iCopy.Index[typeURL][name] = clone
-		}
-	}
-	for typeURL, parentMap := range i.ChildIndex {
-		for name, childName := range parentMap {
-			iCopy.ChildIndex[typeURL][name] = childName
-		}
-	}
-
-	return iCopy
-}
-
 func IndexResources(logger hclog.Logger, resources map[string][]proto.Message) *IndexedResources {
 	data := EmptyIndexedResources()
 
diff --git a/envoyextensions/xdscommon/xdscommon_test.go b/envoyextensions/xdscommon/xdscommon_test.go
deleted file mode 100644
index 2d1aec40b54f7..0000000000000
--- a/envoyextensions/xdscommon/xdscommon_test.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xdscommon
-
-import (
-	envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/testing/protocmp"
-	duration "google.golang.org/protobuf/types/known/durationpb"
-	"testing"
-)
-
-func TestCloneIndexedResources(t *testing.T) {
-	exampleResources := map[string][]proto.Message{
-		ListenerType: {
-			&envoy_listener_v3.Listener{
-				Name:                  "listener1",
-				IgnoreGlobalConnLimit: true,
-				ListenerFiltersTimeout: &duration.Duration{
-					Seconds: 123,
-				},
-			},
-			&envoy_listener_v3.Listener{
-				Name:       "listener2",
-				StatPrefix: "stats.foo",
-				ListenerFiltersTimeout: &duration.Duration{
-					Seconds: 456,
-				},
-			},
-		},
-		ClusterType: {
-			&envoy_cluster_v3.Cluster{
-				Name:          "cluster1",
-				RespectDnsTtl: true,
-				TransportSocketMatches: []*envoy_cluster_v3.Cluster_TransportSocketMatch{
-					{
-						Name: "match1",
-					},
-				},
-			},
-		},
-	}
-
-	getPointerField := func(msg proto.Message) interface{} {
-		switch typedMsg := msg.(type) {
-		case *envoy_cluster_v3.Cluster:
-			return typedMsg.TransportSocketMatches[0]
-		case *envoy_listener_v3.Listener:
-			return typedMsg.ListenerFiltersTimeout
-		default:
-			panic("should not happen")
-		}
-	}
-	updatePointerField := func(msg proto.Message) {
-		switch typedMsg := msg.(type) {
-		case *envoy_cluster_v3.Cluster:
-			typedMsg.TransportSocketMatches[0] = &envoy_cluster_v3.Cluster_TransportSocketMatch{
-				Name: "match1-updated",
-			}
-		case *envoy_listener_v3.Listener:
-			typedMsg.ListenerFiltersTimeout = &duration.Duration{
-				Seconds: 999,
-			}
-		default:
-			panic("should not happen")
-		}
-	}
-
-	cases := []struct {
-		name         string
-		input        *IndexedResources
-		hasResources bool
-	}{
-		{
-			name:         "simple compare",
-			input:        IndexResources(testutil.Logger(t), exampleResources),
-			hasResources: true,
-		},
-		{
-			name:  "empty input returns empty",
-			input: EmptyIndexedResources(),
-		},
-		{
-			name:  "nil input returns nil",
-			input: nil,
-		},
-	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			clone := Clone(tc.input)
-
-			if tc.input == nil {
-				require.Nil(t, clone)
-			} else {
-				if diff := cmp.Diff(tc.input, clone, protocmp.Transform()); diff != "" {
-					t.Errorf("unexpected difference:\n%v", diff)
-				}
-
-				require.NotSame(t, tc.input, clone)
-				require.NotSame(t, tc.input.Index, clone.Index)
-				require.NotSame(t, tc.input.ChildIndex, clone.ChildIndex)
-
-				// Ensure deep clone of protos
-				for typeURL, typeMap := range tc.input.Index {
-					for name, msg := range typeMap {
-						require.NotSame(t, msg, clone.Index[typeURL][name])
-						require.NotSame(t, getPointerField(msg), getPointerField(clone.Index[typeURL][name]))
-						updatePointerField(msg)
-					}
-				}
-
-				// Only check post-update difference if there are resources to differ
-				if tc.hasResources {
-					if diff := cmp.Diff(tc.input, clone, protocmp.Transform()); diff == "" {
-						t.Errorf("updated original and clone should be different:\n%v", diff)
-					}
-				}
-			}
-		})
-	}
-}
diff --git a/fixup_acl_move.sh b/fixup_acl_move.sh
index ac57c8c7e9334..e8fa2698ae743 100644
--- a/fixup_acl_move.sh
+++ b/fixup_acl_move.sh
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 GOIMPORTS=~/go/bin/goimports
 
diff --git a/go.mod b/go.mod
index b89b5d420c249..e5d36f76bba29 100644
--- a/go.mod
+++ b/go.mod
@@ -17,32 +17,30 @@ exclude (
 
 require (
 	github.com/NYTimes/gziphandler v1.0.1
-	github.com/aliyun/alibaba-cloud-sdk-go v1.62.156
 	github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e
 	github.com/armon/go-metrics v0.4.1
 	github.com/armon/go-radix v1.0.0
 	github.com/aws/aws-sdk-go v1.44.289
 	github.com/coredns/coredns v1.10.1
 	github.com/coreos/go-oidc v2.1.0+incompatible
-	github.com/docker/go-connections v0.4.0
-	github.com/envoyproxy/go-control-plane v0.11.0
-	github.com/envoyproxy/go-control-plane/xdsmatcher v0.0.0-20230524161521-aaaacbfbe53e
+	github.com/docker/go-connections v0.3.0
+	github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1
 	github.com/fatih/color v1.14.1
-	github.com/fsnotify/fsnotify v1.6.0
+	github.com/fsnotify/fsnotify v1.5.1
 	github.com/go-openapi/runtime v0.25.0
 	github.com/go-openapi/strfmt v0.21.3
 	github.com/google/go-cmp v0.5.9
 	github.com/google/gofuzz v1.2.0
 	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1
 	github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2
-	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
+	github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4
 	github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706
 	github.com/hashicorp/consul-net-rpc v0.0.0-20221205195236-156cfab66a69
-	github.com/hashicorp/consul/api v1.24.0
-	github.com/hashicorp/consul/envoyextensions v0.4.1
-	github.com/hashicorp/consul/proto-public v0.4.1
+	github.com/hashicorp/consul/api v1.21.1
+	github.com/hashicorp/consul/envoyextensions v0.2.1
+	github.com/hashicorp/consul/proto-public v0.3.0
 	github.com/hashicorp/consul/sdk v0.14.1
-	github.com/hashicorp/consul/troubleshoot v0.3.1
+	github.com/hashicorp/consul/troubleshoot v0.2.0
 	github.com/hashicorp/go-bexpr v0.1.2
 	github.com/hashicorp/go-checkpoint v0.5.0
 	github.com/hashicorp/go-cleanhttp v0.5.2
@@ -54,7 +52,6 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/go-raftchunking v0.7.0
 	github.com/hashicorp/go-retryablehttp v0.6.7
-	github.com/hashicorp/go-rootcerts v1.0.2
 	github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6
 	github.com/hashicorp/go-sockaddr v1.0.2
 	github.com/hashicorp/go-syslog v1.0.0
@@ -63,7 +60,6 @@ require (
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/hashicorp/hcdiag v0.5.1
 	github.com/hashicorp/hcl v1.0.0
-	github.com/hashicorp/hcl/v2 v2.14.1
 	github.com/hashicorp/hcp-scada-provider v0.2.3
 	github.com/hashicorp/hcp-sdk-go v0.61.0
 	github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038
@@ -73,12 +69,11 @@ require (
 	github.com/hashicorp/raft-boltdb/v2 v2.2.2
 	github.com/hashicorp/raft-wal v0.3.0
 	github.com/hashicorp/serf v0.10.1
-	github.com/hashicorp/vault-plugin-auth-alicloud v0.14.0
-	github.com/hashicorp/vault/api v1.8.3
+	github.com/hashicorp/vault/api v1.8.2
 	github.com/hashicorp/vault/api/auth/gcp v0.3.0
-	github.com/hashicorp/vault/sdk v0.7.0
+	github.com/hashicorp/vault/sdk v0.6.0
 	github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87
-	github.com/imdario/mergo v0.3.15
+	github.com/imdario/mergo v0.3.13
 	github.com/kr/text v0.2.0
 	github.com/miekg/dns v1.1.50
 	github.com/mitchellh/cli v1.1.4
@@ -89,9 +84,6 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/mitchellh/pointerstructure v1.2.1
 	github.com/mitchellh/reflectwalk v1.0.2
-	github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce
-	github.com/oklog/ulid v1.3.1
-	github.com/oklog/ulid/v2 v2.1.0
 	github.com/olekukonko/tablewriter v0.0.4
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/errors v0.9.1
@@ -100,8 +92,6 @@ require (
 	github.com/ryanuber/columnize v2.1.2+incompatible
 	github.com/shirou/gopsutil/v3 v3.22.9
 	github.com/stretchr/testify v1.8.3
-	github.com/xeipuuv/gojsonschema v1.2.0
-	github.com/zclconf/go-cty v1.11.1
 	go.etcd.io/bbolt v1.3.7
 	go.opentelemetry.io/otel v1.16.0
 	go.opentelemetry.io/otel/metric v1.16.0
@@ -109,28 +99,27 @@ require (
 	go.opentelemetry.io/otel/sdk/metric v0.39.0
 	go.opentelemetry.io/proto/otlp v0.19.0
 	go.uber.org/goleak v1.1.10
-	golang.org/x/crypto v0.12.0
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
-	golang.org/x/net v0.14.0
+	golang.org/x/crypto v0.11.0
+	golang.org/x/exp v0.0.0-20230321023759-10a507213a29
+	golang.org/x/net v0.13.0
 	golang.org/x/oauth2 v0.6.0
-	golang.org/x/sync v0.3.0
-	golang.org/x/sys v0.11.0
+	golang.org/x/sync v0.2.0
+	golang.org/x/sys v0.10.0
 	golang.org/x/time v0.3.0
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
-	google.golang.org/grpc v1.55.0
-	google.golang.org/protobuf v1.30.0
+	google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef
+	google.golang.org/grpc v1.52.3
+	google.golang.org/protobuf v1.28.1
 	gopkg.in/square/go-jose.v2 v2.5.1
-	gotest.tools/v3 v3.4.0
-	k8s.io/api v0.26.2
-	k8s.io/apimachinery v0.26.2
-	k8s.io/client-go v0.26.2
-	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
+	gotest.tools/v3 v3.0.3
+	k8s.io/api v0.26.1
+	k8s.io/apimachinery v0.26.1
+	k8s.io/client-go v0.26.1
 )
 
 require (
-	cloud.google.com/go/compute v1.19.0 // indirect
+	cloud.google.com/go/compute v1.14.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/iam v0.13.0 // indirect
+	cloud.google.com/go/iam v0.8.0 // indirect
 	github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
 	github.com/Azure/go-autorest/autorest v0.11.28 // indirect
@@ -155,11 +144,11 @@ require (
 	github.com/bgentry/speakeasy v0.1.0 // indirect
 	github.com/boltdb/bolt v1.3.1 // indirect
 	github.com/cenkalti/backoff/v3 v3.0.0 // indirect
-	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible // indirect
 	github.com/circonus-labs/circonusllhist v0.1.3 // indirect
-	github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 // indirect
+	github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 // indirect
 	github.com/coreos/etcd v3.3.27+incompatible // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
 	github.com/coreos/pkg v0.0.0-20220810130054-c7d1c02cb6cf // indirect
@@ -168,8 +157,8 @@ require (
 	github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661 // indirect
 	github.com/digitalocean/godo v1.10.0 // indirect
 	github.com/dimchansky/utfbom v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
-	github.com/envoyproxy/protoc-gen-validate v0.10.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/envoyproxy/protoc-gen-validate v0.1.0 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
@@ -185,23 +174,25 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/btree v1.0.1 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
-	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect
+	github.com/googleapis/gax-go/v2 v2.7.0 // indirect
 	github.com/gophercloud/gophercloud v0.3.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-msgpack v0.5.5 // indirect
 	github.com/hashicorp/go-msgpack/v2 v2.0.0 // indirect
 	github.com/hashicorp/go-plugin v1.4.5 // indirect
+	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 // indirect
 	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
 	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
+	github.com/hashicorp/hcl/v2 v2.14.1 // indirect
 	github.com/hashicorp/mdns v1.0.4 // indirect
 	github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0 // indirect
 	github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 // indirect
@@ -215,7 +206,7 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
-	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/mattn/go-runewidth v0.0.7 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -226,7 +217,8 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
-	github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
+	github.com/oklog/ulid v1.3.1 // indirect
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c // indirect
 	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -237,7 +229,6 @@ require (
 	github.com/prometheus/common v0.39.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
 	github.com/segmentio/fasthash v1.0.3 // indirect
@@ -254,27 +245,26 @@ require (
 	github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 // indirect
 	github.com/vmware/govmomi v0.18.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
-	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	github.com/zclconf/go-cty v1.11.1 // indirect
 	go.mongodb.org/mongo-driver v1.11.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.16.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/term v0.11.0 // indirect
-	golang.org/x/text v0.12.0 // indirect
-	golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
-	google.golang.org/api v0.114.0 // indirect
+	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/term v0.10.0 // indirect
+	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/tools v0.6.0 // indirect
+	google.golang.org/api v0.109.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.66.2 // indirect
-	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/resty.v1 v1.12.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/klog/v2 v2.90.1 // indirect
+	k8s.io/klog/v2 v2.90.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
+	k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
 	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
diff --git a/go.sum b/go.sum
index a809cbba80707..6dd7fb04e2780 100644
--- a/go.sum
+++ b/go.sum
@@ -25,22 +25,22 @@ cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aD
 cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
 cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
 cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
-cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute v1.19.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ=
-cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU=
+cloud.google.com/go/compute v1.14.0 h1:hfm2+FfxVmnRlh6LpB7cg1ZNU+5edAHmW679JePztk0=
+cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k=
-cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0=
-cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
+cloud.google.com/go/iam v0.8.0 h1:E2osAkZzxI/+8pZcxVLcDtAQx/u+hZXVryUaYQ5O0Kk=
+cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE=
+cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+CamDs=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -125,8 +125,6 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/aliyun/alibaba-cloud-sdk-go v1.62.156 h1:K4N91T1+RlSlx+t2dujeDviy4ehSGVjEltluDgmeHS4=
-github.com/aliyun/alibaba-cloud-sdk-go v1.62.156/go.mod h1:Api2AkmMgGaSUAhmk76oaFObkoeCPc/bKAqcyplPODs=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
 github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
@@ -160,13 +158,12 @@ github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
 github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
+github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
-github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -182,9 +179,9 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 h1:zH8ljVhhq7yC0MIeUL/IviMtY8hx2mK8cN9wEYb8ggw=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 h1:58f1tJ1ra+zFINPlwLWvQsR9CzAKt2e+EWV2yX9oXQ4=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coredns/coredns v1.10.1 h1:6OyL7tcvYxeNHONj5iQlVM2GXBzAOq57L3/LUKP1DbA=
 github.com/coredns/coredns v1.10.1/go.mod h1:oGgoY6cRrdJzKgNrsT30Hztu7/MutSHCYwqGDWngXCc=
@@ -223,15 +220,15 @@ github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/
 github.com/dnaeon/go-vcr v0.0.0-20180814043457-aafff18a5cc2/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
 github.com/dnaeon/go-vcr v1.0.1 h1:r8L/HqC0Hje5AXMu1ooW8oyQyOFv4GxqpL0nRP7SLLY=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
-github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
-github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
+github.com/docker/go-connections v0.3.0 h1:3lOnM9cSzgGwx8VfK/NGOW5fLQ0GjIlCkaktF+n1M6o=
+github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
-github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
+github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -240,13 +237,10 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
-github.com/envoyproxy/go-control-plane v0.11.0 h1:jtLewhRR2vMRNnq2ZZUoCjUlgut+Y0+sDDWPOfwOi1o=
-github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI=
-github.com/envoyproxy/go-control-plane/xdsmatcher v0.0.0-20230524161521-aaaacbfbe53e h1:g8euodkL4GdSpVAjfzhssb07KgVmOUqyF4QOmwFumTs=
-github.com/envoyproxy/go-control-plane/xdsmatcher v0.0.0-20230524161521-aaaacbfbe53e/go.mod h1:/NGEcKqwNq3HAS2vCqHfsPx9sJZbkiNQ6dGx9gTE/NA=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 h1:xvqufLtNVwAhN8NMyWklVgxnWohi+wtMGQMhtxexlm0=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
+github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.10.0 h1:oIfnZFdC0YhpNNEX+SuIqko4cqqVZeN9IGTrhZje83Y=
-github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -261,8 +255,8 @@ github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq
 github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
 github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
+github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
@@ -357,13 +351,12 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
 github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU=
 github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
 github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
-github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -397,9 +390,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
@@ -457,13 +449,13 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
+github.com/googleapis/enterprise-certificate-proxy v0.2.1 h1:RY7tHKZcRlk788d5WSo/e83gOyyy742E8GSs771ySpg=
+github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
-github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A=
-github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
+github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ=
+github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
@@ -473,14 +465,13 @@ github.com/gophercloud/gophercloud v0.3.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEo
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4 h1:z53tR0945TRRQO/fLEVPI6SMv7ZflF0TEaTAoU7tOzg=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 h1:BZHcxBETFHIdVyhyEfOvn/RdU/QGdLI4y34qQGjGWO0=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 h1:lLT7ZLSzGLI08vc9cpd+tYmNWjdKDqyr/2L+f6U12Fk=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
 github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706 h1:1ZEjnveDe20yFa6lSkfdQZm5BR/b271n0MsB5R2L3us=
 github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706/go.mod h1:1Cs8FlmD1BfSQXJGcFLSV5FuIx1AbJP+EJGdxosoS2g=
 github.com/hashicorp/consul-net-rpc v0.0.0-20221205195236-156cfab66a69 h1:wzWurXrxfSyG1PHskIZlfuXlTSCj1Tsyatp9DtaasuY=
@@ -599,16 +590,13 @@ github.com/hashicorp/raft-wal v0.3.0 h1:Mi6RPoRbsxIIYZryI+bSTXHD97Ua6rIYO51ibYV9
 github.com/hashicorp/raft-wal v0.3.0/go.mod h1:A6vP5o8hGOs1LHfC1Okh9xPwWDcmb6Vvuz/QyqUXlOE=
 github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
 github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
-github.com/hashicorp/vault-plugin-auth-alicloud v0.14.0 h1:O6tNk0s/arubLUbLeCyaRs5xGo9VwmbQazISY/BfPK4=
-github.com/hashicorp/vault-plugin-auth-alicloud v0.14.0/go.mod h1:We3fJplmALwK1VpjwrLuXr/4QCQHYMdnXLHmLUU6Ntg=
 github.com/hashicorp/vault/api v1.8.0/go.mod h1:uJrw6D3y9Rv7hhmS17JQC50jbPDAZdjZoTtrCCxxs7E=
-github.com/hashicorp/vault/api v1.8.3 h1:cHQOLcMhBR+aVI0HzhPxO62w2+gJhIrKguQNONPzu6o=
-github.com/hashicorp/vault/api v1.8.3/go.mod h1:4g/9lj9lmuJQMtT6CmVMHC5FW1yENaVv+Nv4ZfG8fAg=
+github.com/hashicorp/vault/api v1.8.2 h1:C7OL9YtOtwQbTKI9ogB0A1wffRbCN+rH/LLCHO3d8HM=
+github.com/hashicorp/vault/api v1.8.2/go.mod h1:ML8aYzBIhY5m1MD1B2Q0JV89cC85YVH4t5kBaZiyVaE=
 github.com/hashicorp/vault/api/auth/gcp v0.3.0 h1:taum+3pCmOXnNgEKHlQbmgXmKw5daWHk7YJrLPP/w8g=
 github.com/hashicorp/vault/api/auth/gcp v0.3.0/go.mod h1:gnNBFOASYUaFunedTHOzdir7vKcHL3skWBUzEn263bo=
+github.com/hashicorp/vault/sdk v0.6.0 h1:6Z+In5DXHiUfZvIZdMx7e2loL1PPyDjA4bVh9ZTIAhs=
 github.com/hashicorp/vault/sdk v0.6.0/go.mod h1:+DRpzoXIdMvKc88R4qxr+edwy/RvH5QK8itmxLiDHLc=
-github.com/hashicorp/vault/sdk v0.7.0 h1:2pQRO40R1etpKkia5fb4kjrdYMx3BHklPxl1pxpxDHg=
-github.com/hashicorp/vault/sdk v0.7.0/go.mod h1:KyfArJkhooyba7gYCKSq8v66QdqJmnbAxtV/OX1+JTs=
 github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 h1:O/pT5C1Q3mVXMyuqg7yuAWUg/jMZR1/0QTzTRdNR6Uw=
 github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod h1:bEpDU35nTu0ey1EXjwNwPjI9xErAsoOCmcMb9GKvyxo=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
@@ -623,8 +611,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
-github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
+github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
 github.com/jackc/pgx v3.3.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
@@ -646,7 +634,6 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF
 github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod h1:U+RSyWxWd04xTqnuOQxnai7XGS2PrPY2cfGoDKtMHjA=
 github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f h1:ENpDacvnr8faw5ugQmEF1QYk+f/Y9lXFvuYmRxykago=
 github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod h1:KDSfL7qe5ZfQqvlDMkVjCztbmcpp/c8M77vhQP8ZPvk=
-github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -708,9 +695,8 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
 github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
 github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
-github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
@@ -767,8 +753,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce h1:TqjP/BTDrwN7zP9xyXVuLsMBXYMt6LLYi55PlrIcq8U=
-github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:ifHPsLndGGzvgzcaXUvzmt6LxKT4pJ+uzEhtnMt+f7A=
 github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 h1:BQ1HW7hr4IVovMwWg0E0PYcyW8CzqDcVmaew9cujU4s=
 github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod h1:TLb2Sg7HQcgGdloNxkrmtgDNR9uVYF3lfdFIN4Ro6Sk=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
@@ -776,8 +760,6 @@ github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/oklog/ulid/v2 v2.1.0 h1:+9lhoxAP56we25tyYETBBY1YLA2SaoLvUFgrP2miPJU=
-github.com/oklog/ulid/v2 v2.1.0/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
 github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
@@ -789,9 +771,8 @@ github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b h1:FfH+VrHHk6Lxt9HdVS0PXzSXFyS2NbZKXv33FYPol0A=
-github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b/go.mod h1:AC62GU6hc0BrNm+9RK9VSiwa/EUe1bkIeFORAMcHvJU=
+github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
+github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c h1:vwpFWvAO8DeIZfFeqASzZfsxuWPno9ncAebBEP0N3uE=
 github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod h1:otzZQXgoO96RTzDB/Hycg0qZcXZsWJGJRSXbmEIJ+4M=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -799,7 +780,6 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
@@ -853,15 +833,13 @@ github.com/rboyer/safeio v0.2.3 h1:gUybicx1kp8nuM4vO0GA5xTBX58/OBd8MQuErBfDxP8=
 github.com/rboyer/safeio v0.2.3/go.mod h1:d7RMmt7utQBJZ4B7f0H/cU/EdZibQAU1Y8NWepK2dS8=
 github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 h1:Wdi9nwnhFNAlseAOekn6B5G/+GMtks9UKbvRU/CMM/o=
 github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod h1:gRAiPF5C5Nd0eyyRdqIu9qTiFSoZzpTq727b5B8fkkU=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rs/zerolog v1.4.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
@@ -944,10 +922,6 @@ github.com/tklauser/numcpus v0.5.0/go.mod h1:OGzpTxpcIMNGYQdit2BYL1pvk/dSOaJWjKo
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 h1:G3dpKMzFDjgEh2q1Z7zUUtKa8ViPtH+ocF0bE0g00O8=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
-github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
-github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
-github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/vmware/govmomi v0.18.0 h1:f7QxSmP7meCtoAmiKZogvVbLInT+CZx6Px6K5rYsJZo=
@@ -957,13 +931,8 @@ github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+
 github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
 github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
 github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
-github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
-github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
-github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
@@ -1037,8 +1006,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
-golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
+golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
+golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1049,8 +1018,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -1078,8 +1047,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180611182652-db08ff08e862/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1133,8 +1102,8 @@ golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
-golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
-golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
+golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
+golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1166,8 +1135,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
+golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1249,15 +1218,14 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=
-golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
+golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
+golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1269,8 +1237,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
-golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
+golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1296,6 +1264,7 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -1342,8 +1311,8 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 h1:Vve/L0v7CXXuxUmaMGIEK/dEeq7uiqb5qBgQrZzIE7E=
-golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1376,8 +1345,8 @@ google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00
 google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
 google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
 google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
-google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE=
-google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg=
+google.golang.org/api v0.109.0 h1:sW9hgHyX497PP5//NUM7nqfV8D0iDfBApqq7sOh1XR8=
+google.golang.org/api v0.109.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1408,7 +1377,6 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
@@ -1445,8 +1413,8 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc
 google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
 google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
+google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef h1:uQ2vjV/sHTsWSqdKeLqmwitzgvjMl7o4IdtHwUDXSJY=
+google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
 google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -1476,8 +1444,8 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD
 google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
 google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
 google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
-google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
+google.golang.org/grpc v1.52.3 h1:pf7sOysg4LdgBqduXveGKrcEwbStiK2rtfghdzlUYDQ=
+google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -1492,9 +1460,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1507,10 +1474,6 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI=
-gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=
-gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
 gopkg.in/resty.v1 v1.9.1/go.mod h1:vo52Hzryw9PnPHcJfPsBiFW62XhNx5OczbV9y+IMpgc=
 gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
@@ -1531,10 +1494,11 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
-gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
+gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
+gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -1543,26 +1507,26 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
-k8s.io/api v0.26.2 h1:dM3cinp3PGB6asOySalOZxEG4CZ0IAdJsrYZXE/ovGQ=
-k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU=
+k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
+k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg=
 k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
-k8s.io/apimachinery v0.26.2 h1:da1u3D5wfR5u2RpLhE/ZtZS2P7QvDgLZTi9wrNZl/tQ=
-k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
+k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ=
+k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
 k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU=
-k8s.io/client-go v0.26.2 h1:s1WkVujHX3kTp4Zn4yGNFK+dlDXy1bAAkIl+cFAiuYI=
-k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU=
+k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU=
+k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
-k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
-k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/klog/v2 v2.90.0 h1:VkTxIV/FjRXn1fgNNcKGM8cfmL1Z33ZjXRTVxKCoF5M=
+k8s.io/klog/v2 v2.90.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
 k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
 k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
-k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 h1:kmDqav+P+/5e1i9tFfHq1qcF3sOrDp+YEkVDAHu7Jwk=
-k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=
+k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/grafana/README.md b/grafana/README.md
index 2e8b2b588b75d..b3dec68183a9d 100644
--- a/grafana/README.md
+++ b/grafana/README.md
@@ -9,7 +9,3 @@ The page for publishing this dashboard is https://grafana.com/grafana/dashboards
     - Click "share" and export for external publishing
     - Login to Grafana via the team account (message a manager)
     - Publish as a new version, including change notes.
-
-### Grafana dashboard for consul-k8s (control plane)
-
-A grafana dashboard for monitoring consul-k8s (control plane) can also be found in this directory: `consul-k8s-control-plane-monitoring.json`. This dashboard has not been published to https://grafana.com.
diff --git a/grafana/consul-k8s-control-plane-monitoring.json b/grafana/consul-k8s-control-plane-monitoring.json
deleted file mode 100644
index 2298a77b53628..0000000000000
--- a/grafana/consul-k8s-control-plane-monitoring.json
+++ /dev/null
@@ -1,3598 +0,0 @@
-{
-    "annotations": {
-        "list": [
-            {
-                "builtIn": 1,
-                "datasource": {
-                    "type": "grafana",
-                    "uid": "-- Grafana --"
-                },
-                "enable": true,
-                "hide": true,
-                "iconColor": "rgba(0, 211, 255, 1)",
-                "name": "Annotations & Alerts",
-                "target": {
-                    "limit": 100,
-                    "matchAny": false,
-                    "tags": [],
-                    "type": "dashboard"
-                },
-                "type": "dashboard"
-            }
-        ]
-    },
-    "editable": true,
-    "fiscalYearStartMonth": 0,
-    "graphTooltip": 0,
-    "id": 3,
-    "links": [],
-    "liveNow": false,
-    "panels": [
-        {
-            "collapsed": false,
-            "gridPos": {
-                "h": 1,
-                "w": 24,
-                "x": 0,
-                "y": 0
-            },
-            "id": 16,
-            "panels": [],
-            "title": "Cluster Status",
-            "type": "row"
-        },
-        {
-            "datasource": {
-                "type": "prometheus",
-                "uid": "PBFA97CFB590B2093"
-            },
-            "fieldConfig": {
-                "defaults": {
-                    "mappings": [],
-                    "thresholds": {
-                        "mode": "absolute",
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null
-                            },
-                            {
-                                "color": "red",
-                                "value": 80
-                            }
-                        ]
-                    },
-                    "unit": "short"
-                },
-                "overrides": []
-            },
-            "gridPos": {
-                "h": 8,
-                "w": 6,
-                "x": 0,
-                "y": 1
-            },
-            "id": 10,
-            "options": {
-                "colorMode": "value",
-                "graphMode": "none",
-                "justifyMode": "auto",
-                "orientation": "auto",
-                "reduceOptions": {
-                    "calcs": [
-                        "last"
-                    ],
-                    "fields": "",
-                    "limit": 1,
-                    "values": true
-                },
-                "textMode": "auto"
-            },
-            "pluginVersion": "9.5.5",
-            "targets": [
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "editorMode": "code",
-                    "exemplar": false,
-                    "expr": "consul_consul_server_0_consul_members_servers{pod=\"consul-server-0\"}",
-                    "hide": false,
-                    "instant": true,
-                    "legendFormat": "__auto",
-                    "range": false,
-                    "refId": "A"
-                }
-            ],
-            "title": "Number of Consul Servers",
-            "type": "stat"
-        },
-        {
-            "datasource": {
-                "type": "prometheus",
-                "uid": "PBFA97CFB590B2093"
-            },
-            "description": "",
-            "fieldConfig": {
-                "defaults": {
-                    "mappings": [],
-                    "thresholds": {
-                        "mode": "absolute",
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null
-                            },
-                            {
-                                "color": "red",
-                                "value": 80
-                            }
-                        ]
-                    },
-                    "unit": "short"
-                },
-                "overrides": []
-            },
-            "gridPos": {
-                "h": 8,
-                "w": 8,
-                "x": 6,
-                "y": 1
-            },
-            "id": 60,
-            "options": {
-                "colorMode": "value",
-                "graphMode": "none",
-                "justifyMode": "auto",
-                "orientation": "auto",
-                "reduceOptions": {
-                    "calcs": [
-                        "last"
-                    ],
-                    "fields": "",
-                    "values": false
-                },
-                "textMode": "auto"
-            },
-            "pluginVersion": "9.5.5",
-            "targets": [
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "editorMode": "builder",
-                    "exemplar": false,
-                    "expr": "count(consul_dataplane_envoy_connected)",
-                    "hide": false,
-                    "instant": true,
-                    "legendFormat": "__auto",
-                    "range": false,
-                    "refId": "A"
-                }
-            ],
-            "title": "Number of Connected Consul-dataplanes",
-            "type": "stat"
-        },
-        {
-            "datasource": {
-                "type": "prometheus",
-                "uid": "PBFA97CFB590B2093"
-            },
-            "description": "Must be 1",
-            "fieldConfig": {
-                "defaults": {
-                    "color": {
-                        "mode": "palette-classic"
-                    },
-                    "custom": {
-                        "axisCenteredZero": false,
-                        "axisColorMode": "text",
-                        "axisLabel": "",
-                        "axisPlacement": "auto",
-                        "barAlignment": 0,
-                        "drawStyle": "line",
-                        "fillOpacity": 0,
-                        "gradientMode": "none",
-                        "hideFrom": {
-                            "legend": false,
-                            "tooltip": false,
-                            "viz": false
-                        },
-                        "lineInterpolation": "linear",
-                        "lineWidth": 1,
-                        "pointSize": 5,
-                        "scaleDistribution": {
-                            "type": "linear"
-                        },
-                        "showPoints": "auto",
-                        "spanNulls": false,
-                        "stacking": {
-                            "group": "A",
-                            "mode": "none"
-                        },
-                        "thresholdsStyle": {
-                            "mode": "off"
-                        }
-                    },
-                    "mappings": [],
-                    "thresholds": {
-                        "mode": "absolute",
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null
-                            },
-                            {
-                                "color": "red",
-                                "value": 1
-                            }
-                        ]
-                    }
-                },
-                "overrides": []
-            },
-            "gridPos": {
-                "h": 8,
-                "w": 10,
-                "x": 14,
-                "y": 1
-            },
-            "id": 12,
-            "options": {
-                "legend": {
-                    "calcs": [],
-                    "displayMode": "list",
-                    "placement": "bottom",
-                    "showLegend": true
-                },
-                "tooltip": {
-                    "mode": "single",
-                    "sort": "none"
-                }
-            },
-            "targets": [
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "editorMode": "code",
-                    "exemplar": false,
-                    "expr": "sum({__name__=~\".+server_isLeader\"})",
-                    "instant": false,
-                    "legendFormat": "__auto",
-                    "range": true,
-                    "refId": "A"
-                }
-            ],
-            "title": "Number of Leader (1: Healthy)",
-            "type": "timeseries"
-        },
-        {
-            "datasource": {
-                "type": "prometheus",
-                "uid": "PBFA97CFB590B2093"
-            },
-            "fieldConfig": {
-                "defaults": {
-                    "mappings": [],
-                    "thresholds": {
-                        "mode": "absolute",
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "unit": "short"
-                },
-                "overrides": []
-            },
-            "gridPos": {
-                "h": 8,
-                "w": 6,
-                "x": 0,
-                "y": 9
-            },
-            "id": 61,
-            "options": {
-                "colorMode": "value",
-                "graphMode": "none",
-                "justifyMode": "auto",
-                "orientation": "auto",
-                "reduceOptions": {
-                    "calcs": [
-                        "last"
-                    ],
-                    "fields": "/.*/",
-                    "limit": 1,
-                    "values": false
-                },
-                "textMode": "auto"
-            },
-            "pluginVersion": "9.5.5",
-            "targets": [
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "editorMode": "code",
-                    "exemplar": false,
-                    "expr": "max(consul_consul_server_0_version{pod=\"consul-server-0\"}) by (version)",
-                    "format": "table",
-                    "hide": false,
-                    "instant": true,
-                    "legendFormat": "",
-                    "range": false,
-                    "refId": "A"
-                }
-            ],
-            "title": "Consul Server Version",
-            "transformations": [
-                {
-                    "id": "organize",
-                    "options": {
-                        "excludeByName": {
-                            "Time": true,
-                            "Value": true
-                        },
-                        "indexByName": {},
-                        "renameByName": {
-                            "Time": ""
-                        }
-                    }
-                }
-            ],
-            "type": "stat"
-        },
-        {
-            "datasource": {
-                "type": "prometheus",
-                "uid": "PBFA97CFB590B2093"
-            },
-            "description": "No data in agentless mode",
-            "fieldConfig": {
-                "defaults": {
-                    "mappings": [],
-                    "thresholds": {
-                        "mode": "absolute",
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null
-                            },
-                            {
-                                "color": "red",
-                                "value": 80
-                            }
-                        ]
-                    },
-                    "unit": "short"
-                },
-                "overrides": []
-            },
-            "gridPos": {
-                "h": 8,
-                "w": 8,
-                "x": 6,
-                "y": 9
-            },
-            "id": 29,
-            "options": {
-                "colorMode": "value",
-                "graphMode": "none",
-                "justifyMode": "auto",
-                "orientation": "auto",
-                "reduceOptions": {
-                    "calcs": [
-                        "last"
-                    ],
-                    "fields": "",
-                    "values": false
-                },
-                "textMode": "auto"
-            },
-            "pluginVersion": "9.5.5",
-            "targets": [
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "editorMode": "code",
-                    "exemplar": false,
-                    "expr": "count(kube_pod_container_resource_limits{pod=~\"consul-client-.*\", container=\"consul\", resource=\"memory\"})",
-                    "hide": false,
-                    "instant": true,
-                    "legendFormat": "__auto",
-                    "range": false,
-                    "refId": "A"
-                }
-            ],
-            "title": "Number of Consul Clients (No data in agentless mode)",
-            "type": "stat"
-        },
-        {
-            "collapsed": true,
-            "gridPos": {
-                "h": 1,
-                "w": 24,
-                "x": 0,
-                "y": 17
-            },
-            "id": 40,
-            "panels": [
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 0,
-                        "y": 18
-                    },
-                    "id": 22,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "builder",
-                            "expr": "consul_raft_leader_lastContact{quantile=\"0.5\"}",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        },
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "consul_raft_leader_lastContact{quantile=\"0.99\"}",
-                            "hide": false,
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "B"
-                        }
-                    ],
-                    "title": "Raft Leader LastContact 99th and 50th (ms)",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "Use consul.raft.rpc.appendEntries to understand how long it takes a follower node to process newly received Raft logs from the leader. Like consul.raft.commitTime, increases in this metric can indicate higher load on your Consul servers, and come with a risk of stale data. Since this metric is exposed within each follower, you should aggregate it as both an average (to track overall load on your Raft servers) and a percentile (to watch for outlier nodes).",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 12,
-                        "y": 18
-                    },
-                    "id": 18,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "consul_raft_rpc_appendEntries{quantile=\"0.99\"}",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        },
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "consul_raft_rpc_appendEntries{quantile=\"0.5\"}",
-                            "hide": false,
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "B"
-                        }
-                    ],
-                    "title": "Follower Append Entries Latency 99th and 50th (ms)",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 0,
-                        "y": 26
-                    },
-                    "id": 20,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "consul_raft_commitTime{quantile=\"0.99\"}",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        },
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "consul_raft_commitTime{quantile=\"0.5\"}",
-                            "hide": false,
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "B"
-                        }
-                    ],
-                    "title": "Leader Raft Commit Latency 99th and 50th (ms)",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 12,
-                        "y": 26
-                    },
-                    "id": 46,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "rate(consul_raft_fsm_apply_sum[5m])\n/\nrate(consul_raft_fsm_apply_count[5m])",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Average Raft FSM Apply Latency per 5 minutes (ms)",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 0,
-                        "y": 34
-                    },
-                    "id": 47,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "sum(rate(consul_raft_apply[5m]))",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Raft Apply Rate per 5 minutes",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "An approximate measurement of the proportion of time the main Raft goroutine is busy and unavailable to accept new work.",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 12,
-                        "y": 34
-                    },
-                    "id": 41,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "builder",
-                            "expr": "consul_raft_thread_main_saturation{pod=~\"consul-server-.*\",quantile=\"0.9\"}",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Raft thread main saturation (percentage)",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "An approximate measurement of the proportion of time the FSM Raft goroutine is busy and unavailable to accept new work.",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 0,
-                        "y": 42
-                    },
-                    "id": 42,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "builder",
-                            "expr": "consul_raft_thread_fsm_saturation{pod=~\"consul-server-.*\", quantile=\"0.9\"}",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Raft thread FSM saturation (percentage)",
-                    "type": "timeseries"
-                }
-            ],
-            "title": "Raft",
-            "type": "row"
-        },
-        {
-            "collapsed": true,
-            "gridPos": {
-                "h": 1,
-                "w": 24,
-                "x": 0,
-                "y": 18
-            },
-            "id": 43,
-            "panels": [
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "Measures the time spent updating the raft store from the serf member information.",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green",
-                                        "value": null
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 0,
-                        "y": 19
-                    },
-                    "id": 44,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "rate(consul_leader_reconcile_sum{pod=~\"consul-server-.*\"}[5m])\n/ \nrate(consul_leader_reconcile_count{pod=~\"consul-server-.*\"}[5m])",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Average latency of leader reconcile per 5 minutes (ms)",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "Increments whenever a Consul server becomes a leader.",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green",
-                                        "value": null
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 12,
-                        "y": 19
-                    },
-                    "id": 45,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "sum(consul_raft_state_leader{pod=~\"consul-server-.*\"})",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Count of a new leader elected [so far] (increasing only)",
-                    "type": "timeseries"
-                }
-            ],
-            "title": "Leadership Changes",
-            "type": "row"
-        },
-        {
-            "collapsed": true,
-            "gridPos": {
-                "h": 1,
-                "w": 24,
-                "x": 0,
-                "y": 19
-            },
-            "id": 14,
-            "panels": [
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green",
-                                        "value": null
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 15,
-                        "x": 0,
-                        "y": 20
-                    },
-                    "id": 6,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "builder",
-                            "expr": "rate(container_cpu_usage_seconds_total{container=\"consul\", pod=~\"consul-server-.*\"}[5m])",
-                            "hide": false,
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        },
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "builder",
-                            "expr": "kube_pod_container_resource_limits{resource=\"cpu\", container=\"consul\"}",
-                            "hide": true,
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "B"
-                        }
-                    ],
-                    "title": "CPU Usage in Seconds (Consul servers)",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "All consul servers have the same limit",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "thresholds"
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green",
-                                        "value": null
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 9,
-                        "x": 15,
-                        "y": 20
-                    },
-                    "id": 4,
-                    "options": {
-                        "orientation": "auto",
-                        "reduceOptions": {
-                            "calcs": [
-                                "lastNotNull"
-                            ],
-                            "fields": "",
-                            "values": false
-                        },
-                        "showThresholdLabels": false,
-                        "showThresholdMarkers": true
-                    },
-                    "pluginVersion": "9.5.5",
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "builder",
-                            "exemplar": false,
-                            "expr": "kube_pod_container_resource_limits{resource=\"cpu\", pod=\"consul-server-0\"}",
-                            "instant": true,
-                            "legendFormat": "__auto",
-                            "range": false,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "CPU Limit in Seconds (Consul Servers)",
-                    "type": "gauge"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green",
-                                        "value": null
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            },
-                            "unit": "bytes"
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 15,
-                        "x": 0,
-                        "y": 28
-                    },
-                    "id": 2,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "builder",
-                            "expr": "container_memory_working_set_bytes{container=\"consul\", pod=~\"consul-server-.*\"}",
-                            "hide": false,
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Memory Usage (Consul servers)",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "All consul servers have the same limit",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "continuous-BlYlRd"
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green",
-                                        "value": null
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            },
-                            "unit": "bytes"
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 9,
-                        "x": 15,
-                        "y": 28
-                    },
-                    "id": 8,
-                    "options": {
-                        "orientation": "auto",
-                        "reduceOptions": {
-                            "calcs": [
-                                "lastNotNull"
-                            ],
-                            "fields": "",
-                            "values": false
-                        },
-                        "showThresholdLabels": false,
-                        "showThresholdMarkers": true
-                    },
-                    "pluginVersion": "9.5.5",
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "exemplar": false,
-                            "expr": "kube_pod_container_resource_limits{resource=\"memory\", pod=\"consul-server-0\"}",
-                            "instant": true,
-                            "legendFormat": "__auto",
-                            "range": false,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Memory Limit (Consul Servers)",
-                    "type": "gauge"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green",
-                                        "value": null
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            },
-                            "unit": "bytes"
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 15,
-                        "x": 0,
-                        "y": 36
-                    },
-                    "id": 48,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "sum(rate(container_network_receive_bytes_total{pod=~\"consul-server-.*\"}[5m])) by (pod)",
-                            "hide": false,
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Received bytes total per 5 minutes (Consul servers)",
-                    "type": "timeseries"
-                }
-            ],
-            "title": "Resource Utilization (Consul Servers)",
-            "type": "row"
-        },
-        {
-            "collapsed": true,
-            "gridPos": {
-                "h": 1,
-                "w": 24,
-                "x": 0,
-                "y": 20
-            },
-            "id": 24,
-            "panels": [
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 15,
-                        "x": 0,
-                        "y": 21
-                    },
-                    "id": 26,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "rate(container_cpu_usage_seconds_total{container=\"consul\", pod=~\"consul-client-.*\"}[5m])",
-                            "hide": false,
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        },
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "builder",
-                            "expr": "kube_pod_container_resource_limits{resource=\"cpu\", container=\"consul\"}",
-                            "hide": true,
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "B"
-                        }
-                    ],
-                    "title": "CPU Usage in Seconds (Consul Clients)",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "All consul clients have the same limit",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "thresholds"
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 9,
-                        "x": 15,
-                        "y": 21
-                    },
-                    "id": 28,
-                    "options": {
-                        "orientation": "auto",
-                        "reduceOptions": {
-                            "calcs": [
-                                "lastNotNull"
-                            ],
-                            "fields": "",
-                            "values": false
-                        },
-                        "showThresholdLabels": false,
-                        "showThresholdMarkers": true
-                    },
-                    "pluginVersion": "9.5.5",
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "exemplar": false,
-                            "expr": "max(kube_pod_container_resource_limits{resource=\"cpu\", pod=~\"consul-client-.*\"})",
-                            "instant": true,
-                            "legendFormat": "__auto",
-                            "range": false,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "CPU Limit in Seconds (Consul Clients)",
-                    "type": "gauge"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            },
-                            "unit": "bytes"
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 15,
-                        "x": 0,
-                        "y": 29
-                    },
-                    "id": 23,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "container_memory_working_set_bytes{container=\"consul\", pod=~\"consul-client-.*\"}",
-                            "hide": false,
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Memory Usage (Consul clients)",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "All consul servers have the same limit",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "continuous-BlYlRd"
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            },
-                            "unit": "bytes"
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 9,
-                        "x": 15,
-                        "y": 29
-                    },
-                    "id": 25,
-                    "options": {
-                        "orientation": "auto",
-                        "reduceOptions": {
-                            "calcs": [
-                                "lastNotNull"
-                            ],
-                            "fields": "",
-                            "values": false
-                        },
-                        "showThresholdLabels": false,
-                        "showThresholdMarkers": true
-                    },
-                    "pluginVersion": "9.5.5",
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "exemplar": false,
-                            "expr": "max(kube_pod_container_resource_limits{resource=\"memory\", pod=~\"consul-client-.*\"})",
-                            "instant": true,
-                            "legendFormat": "__auto",
-                            "range": false,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Memory Limit (Consul Clients)",
-                    "type": "gauge"
-                }
-            ],
-            "title": "Resource Utilization (Consul Clients) - N/A in agentless mode",
-            "type": "row"
-        },
-        {
-            "collapsed": true,
-            "gridPos": {
-                "h": 1,
-                "w": 24,
-                "x": 0,
-                "y": 21
-            },
-            "id": 54,
-            "panels": [
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 15,
-                        "x": 0,
-                        "y": 25
-                    },
-                    "id": 55,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "rate(container_cpu_usage_seconds_total{pod=~\".*-connect-injector-.*\",container=\"sidecar-injector\"}[5m])",
-                            "hide": false,
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        },
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "builder",
-                            "expr": "kube_pod_container_resource_limits{resource=\"cpu\", container=\"consul\"}",
-                            "hide": true,
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "B"
-                        }
-                    ],
-                    "title": "CPU Usage in Seconds (Connect Injector)",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "All consul servers have the same limit",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "thresholds"
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 9,
-                        "x": 15,
-                        "y": 25
-                    },
-                    "id": 56,
-                    "options": {
-                        "orientation": "auto",
-                        "reduceOptions": {
-                            "calcs": [
-                                "lastNotNull"
-                            ],
-                            "fields": "",
-                            "values": false
-                        },
-                        "showThresholdLabels": false,
-                        "showThresholdMarkers": true
-                    },
-                    "pluginVersion": "9.5.5",
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "exemplar": false,
-                            "expr": "max(kube_pod_container_resource_limits{resource=\"cpu\", container=\"sidecar-injector\"})",
-                            "instant": true,
-                            "legendFormat": "__auto",
-                            "range": false,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "CPU Limit in Seconds (Connect Injector)",
-                    "type": "gauge"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            },
-                            "unit": "bytes"
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 15,
-                        "x": 0,
-                        "y": 33
-                    },
-                    "id": 59,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "container_memory_working_set_bytes{pod=~\".*-connect-injector-.*\",container=\"sidecar-injector\"}",
-                            "hide": false,
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Memory Usage (Connect Injector)",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "All consul servers have the same limit",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "continuous-BlYlRd"
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            },
-                            "unit": "bytes"
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 9,
-                        "x": 15,
-                        "y": 33
-                    },
-                    "id": 58,
-                    "options": {
-                        "orientation": "auto",
-                        "reduceOptions": {
-                            "calcs": [
-                                "lastNotNull"
-                            ],
-                            "fields": "",
-                            "values": false
-                        },
-                        "showThresholdLabels": false,
-                        "showThresholdMarkers": true
-                    },
-                    "pluginVersion": "9.5.5",
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "exemplar": false,
-                            "expr": "max(kube_pod_container_resource_limits{resource=\"memory\", container=\"sidecar-injector\"})",
-                            "instant": true,
-                            "legendFormat": "__auto",
-                            "range": false,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Memory Limit (Connect Injector)",
-                    "type": "gauge"
-                }
-            ],
-            "title": "Resource Utilization (Connect Injector)",
-            "type": "row"
-        },
-        {
-            "collapsed": true,
-            "gridPos": {
-                "h": 1,
-                "w": 24,
-                "x": 0,
-                "y": 22
-            },
-            "id": 30,
-            "panels": [
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 0,
-                        "y": 23
-                    },
-                    "id": 31,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "sum(rate(consul_catalog_register_count{pod=~\"consul-server-.*\"}[5m]))",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Catalog Register Count per 5 minutes",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 12,
-                        "y": 23
-                    },
-                    "id": 34,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "rate(consul_catalog_register_sum{pod=~\"consul-server-.*\"}[5m])\n/\nrate(consul_catalog_register_count{pod=~\"consul-server-.*\"}[5m])",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Average latency of catalog register per 5 minutes (ms)",
-                    "type": "timeseries"
-                }
-            ],
-            "title": "Feature: Catalog",
-            "type": "row"
-        },
-        {
-            "collapsed": true,
-            "gridPos": {
-                "h": 1,
-                "w": 24,
-                "x": 0,
-                "y": 23
-            },
-            "id": 49,
-            "panels": [
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 0,
-                        "y": 24
-                    },
-                    "id": 50,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "sum(rate(consul_acl_ResolveToken_count{pod=~\"consul-server-.*\"}[5m]))",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "ACL Token Resolve Count per 5 minutes",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 12,
-                        "y": 24
-                    },
-                    "id": 51,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "rate(consul_acl_ResolveToken_sum{pod=~\"consul-server-.*\"}[5m])/rate(consul_acl_ResolveToken_count{pod=~\"consul-server-.*\"}[5m])",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Average latency of resolving ACL token per 5 minutes (ms)",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 0,
-                        "y": 32
-                    },
-                    "id": 52,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "rate(consul_acl_token_cache_hit{pod=~\"consul-server-.*\"}[5m])",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Rate of ACL token cache hit per 5 minutes",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 12,
-                        "y": 32
-                    },
-                    "id": 53,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "rate(consul_acl_token_cache_miss{pod=~\"consul-server-.*\"}[5m])",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Rate of ACL token cache miss per 5 minutes",
-                    "type": "timeseries"
-                }
-            ],
-            "title": "ACL",
-            "type": "row"
-        },
-        {
-            "collapsed": true,
-            "gridPos": {
-                "h": 1,
-                "w": 24,
-                "x": 0,
-                "y": 24
-            },
-            "id": 33,
-            "panels": [
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "Increments whenever a Consul agent in client mode makes an RPC request to a Consul server",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 0,
-                        "y": 22
-                    },
-                    "id": 37,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "rate(consul_client_rpc{namespace=\"consul\"}[5m])",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Rate of RPC requests per 5 minutes - client side ",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "Increments when a server accepts an RPC connection.",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 12,
-                        "y": 22
-                    },
-                    "id": 36,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "rate(consul_rpc_accept_conn{namespace=\"consul\",pod=~\"consul-server-.*\"}[5m])",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "RPC Accept Connection Count Rate per 5 minutes - server side",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "Increments whenever a Consul agent in client mode makes an RPC request to a Consul server and fails.",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 0,
-                        "y": 30
-                    },
-                    "id": 39,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "rate(consul_client_rpc_failed{namespace=\"consul\"}[5m])",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Rate of Failed RPC requests per 5 minutes - client side ",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "Increments when a server receives a Consul-related RPC request.",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 12,
-                        "y": 30
-                    },
-                    "id": 32,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "rate(consul_rpc_request{namespace=\"consul\",pod=~\"consul-server-.*\"}[5m])",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Rate of RPC requests per 5 minutes - server side",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "Increments whenever a Consul agent in client mode makes an RPC request to a Consul server gets rate limited by that agent's limits configuration.",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 0,
-                        "y": 38
-                    },
-                    "id": 38,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "rate(consul_client_rpc_exceeded{namespace=\"consul\"}[5m])",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Rate of Exceeded RPC requests per 5 minutes - client side ",
-                    "type": "timeseries"
-                },
-                {
-                    "datasource": {
-                        "type": "prometheus",
-                        "uid": "PBFA97CFB590B2093"
-                    },
-                    "description": "Increments when a server returns an error from an RPC request.",
-                    "fieldConfig": {
-                        "defaults": {
-                            "color": {
-                                "mode": "palette-classic"
-                            },
-                            "custom": {
-                                "axisCenteredZero": false,
-                                "axisColorMode": "text",
-                                "axisLabel": "",
-                                "axisPlacement": "auto",
-                                "barAlignment": 0,
-                                "drawStyle": "line",
-                                "fillOpacity": 0,
-                                "gradientMode": "none",
-                                "hideFrom": {
-                                    "legend": false,
-                                    "tooltip": false,
-                                    "viz": false
-                                },
-                                "lineInterpolation": "linear",
-                                "lineWidth": 1,
-                                "pointSize": 5,
-                                "scaleDistribution": {
-                                    "type": "linear"
-                                },
-                                "showPoints": "auto",
-                                "spanNulls": false,
-                                "stacking": {
-                                    "group": "A",
-                                    "mode": "none"
-                                },
-                                "thresholdsStyle": {
-                                    "mode": "off"
-                                }
-                            },
-                            "mappings": [],
-                            "thresholds": {
-                                "mode": "absolute",
-                                "steps": [
-                                    {
-                                        "color": "green"
-                                    },
-                                    {
-                                        "color": "red",
-                                        "value": 80
-                                    }
-                                ]
-                            }
-                        },
-                        "overrides": []
-                    },
-                    "gridPos": {
-                        "h": 8,
-                        "w": 12,
-                        "x": 12,
-                        "y": 38
-                    },
-                    "id": 35,
-                    "options": {
-                        "legend": {
-                            "calcs": [],
-                            "displayMode": "list",
-                            "placement": "bottom",
-                            "showLegend": true
-                        },
-                        "tooltip": {
-                            "mode": "single",
-                            "sort": "none"
-                        }
-                    },
-                    "targets": [
-                        {
-                            "datasource": {
-                                "type": "prometheus",
-                                "uid": "PBFA97CFB590B2093"
-                            },
-                            "editorMode": "code",
-                            "expr": "rate(consul_rpc_request_error{namespace=\"consul\",pod=~\"consul-server-.*\"}[5m])",
-                            "legendFormat": "__auto",
-                            "range": true,
-                            "refId": "A"
-                        }
-                    ],
-                    "title": "Error rate of RPC requests per 5 minutes - server side",
-                    "type": "timeseries"
-                }
-            ],
-            "title": "RPC",
-            "type": "row"
-        }
-    ],
-    "refresh": "30s",
-    "revision": 1,
-    "schemaVersion": 38,
-    "style": "dark",
-    "tags": [],
-    "templating": {
-        "list": []
-    },
-    "time": {
-        "from": "now-30m",
-        "to": "now"
-    },
-    "timepicker": {},
-    "timezone": "",
-    "title": "Consul K8s monitoring (control plane)",
-    "version": 8,
-    "weekStart": ""
-}
\ No newline at end of file
diff --git a/internal/auth/exports.go b/internal/auth/exports.go
deleted file mode 100644
index abbed80abe031..0000000000000
--- a/internal/auth/exports.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package auth
-
-import (
-	"github.com/hashicorp/consul/internal/auth/internal/controllers"
-	"github.com/hashicorp/consul/internal/auth/internal/controllers/trafficpermissions"
-	"github.com/hashicorp/consul/internal/auth/internal/mappers/trafficpermissionsmapper"
-	"github.com/hashicorp/consul/internal/auth/internal/types"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-)
-
-var (
-	// Controller statuses
-
-	StatusKey                                  = trafficpermissions.StatusKey
-	TrafficPermissionsConditionComputed        = trafficpermissions.ConditionComputed
-	TrafficPermissionsConditionFailedToCompute = trafficpermissions.ConditionFailedToCompute
-)
-
-// RegisterTypes adds all resource types within the "catalog" API group
-// to the given type registry
-func RegisterTypes(r resource.Registry) {
-	types.Register(r)
-}
-
-type ControllerDependencies = controllers.Dependencies
-
-func DefaultControllerDependencies() ControllerDependencies {
-	return ControllerDependencies{
-		TrafficPermissionsMapper: trafficpermissionsmapper.New(),
-	}
-}
-
-// RegisterControllers registers controllers for the auth types with
-// the given controller manager.
-func RegisterControllers(mgr *controller.Manager, deps ControllerDependencies) {
-	controllers.Register(mgr, deps)
-}
diff --git a/internal/auth/internal/controllers/register.go b/internal/auth/internal/controllers/register.go
deleted file mode 100644
index 03fc31c5bc45d..0000000000000
--- a/internal/auth/internal/controllers/register.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controllers
-
-import (
-	"github.com/hashicorp/consul/internal/auth/internal/controllers/trafficpermissions"
-	"github.com/hashicorp/consul/internal/controller"
-)
-
-type Dependencies struct {
-	TrafficPermissionsMapper trafficpermissions.TrafficPermissionsMapper
-}
-
-func Register(mgr *controller.Manager, deps Dependencies) {
-	mgr.Register(trafficpermissions.Controller(deps.TrafficPermissionsMapper))
-}
diff --git a/internal/auth/internal/controllers/trafficpermissions/controller.go b/internal/auth/internal/controllers/trafficpermissions/controller.go
deleted file mode 100644
index 9e5912dc5e3c7..0000000000000
--- a/internal/auth/internal/controllers/trafficpermissions/controller.go
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package trafficpermissions
-
-import (
-	"context"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// TrafficPermissionsMapper is used to map a watch event for a TrafficPermissions resource and translate
-// it to a ComputedTrafficPermissions resource which contains the effective permissions
-// from all referencing TrafficPermissions resources.
-type TrafficPermissionsMapper interface {
-	// MapTrafficPermissions will take a TrafficPermission resource and return controller requests for all
-	// ComputedTrafficPermissions associated with that TrafficPermission.
-	MapTrafficPermissions(context.Context, controller.Runtime, *pbresource.Resource) ([]controller.Request, error)
-
-	// UntrackTrafficPermissions instructs the Mapper to forget about the TrafficPermission.
-	UntrackTrafficPermissions(*pbresource.ID)
-
-	// GetTrafficPermissionsForCTP returns the tracked TrafficPermissions that are used to create a CTP
-	GetTrafficPermissionsForCTP(*pbresource.ID) []*pbresource.Reference
-}
-
-// Controller creates a controller for automatic ComputedTrafficPermissions management for
-// updates to WorkloadIdentity or TrafficPermission resources.
-func Controller(mapper TrafficPermissionsMapper) controller.Controller {
-	if mapper == nil {
-		panic("No TrafficPermissionsMapper was provided to the TrafficPermissionsController constructor")
-	}
-
-	return controller.ForType(pbauth.ComputedTrafficPermissionsType).
-		WithWatch(pbauth.WorkloadIdentityType, controller.ReplaceType(pbauth.ComputedTrafficPermissionsType)).
-		WithWatch(pbauth.TrafficPermissionsType, mapper.MapTrafficPermissions).
-		WithReconciler(&reconciler{mapper: mapper})
-}
-
-type reconciler struct {
-	mapper TrafficPermissionsMapper
-}
-
-// Reconcile will reconcile one ComputedTrafficPermission (CTP) in response to some event.
-// Events include adding, modifying or deleting a WorkloadIdentity or TrafficPermission.
-func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	rt.Logger = rt.Logger.With("resource-id", req.ID, "controller", StatusKey)
-	/*
-	 * A CTP ID could come in for a variety of reasons.
-	 * 1. workload identity create / delete: this results in the creation / deletion of a new CTP
-	 * 2. traffic permission create / modify / delete: this results in a potential modification of an existing CTP
-	 *
-	 * Part 1: Handle Workload Identity changes:
-	 * Check if the workload identity exists. If it doesn't we can stop here.
-	 * CTPs are always generated from WorkloadIdentities, therefore the WI resource must already exist.
-	 * If it is missing, that means it was deleted.
-	 */
-	ctpID := req.ID
-	wi := resource.ReplaceType(pbauth.WorkloadIdentityType, ctpID)
-	workloadIdentity, err := resource.GetDecodedResource[*pbauth.WorkloadIdentity](ctx, rt.Client, wi)
-	if err != nil {
-		rt.Logger.Error("error retrieving corresponding Workload Identity", "error", err)
-		return err
-	}
-	if workloadIdentity == nil || workloadIdentity.Resource == nil {
-		rt.Logger.Trace("workload identity has been deleted")
-		return nil
-	}
-
-	// Check if CTP exists:
-	oldCTPData, err := resource.GetDecodedResource[*pbauth.ComputedTrafficPermissions](ctx, rt.Client, ctpID)
-	if err != nil {
-		rt.Logger.Error("error retrieving computed permissions", "error", err)
-		return err
-	}
-	var oldResource *pbresource.Resource
-	var owner *pbresource.ID
-	if oldCTPData == nil {
-		// CTP does not yet exist, so we need to make a new one
-		rt.Logger.Trace("creating new computed traffic permissions for workload identity")
-		owner = workloadIdentity.Resource.Id
-	} else {
-		oldResource = oldCTPData.Resource
-		owner = oldCTPData.Resource.Owner
-	}
-
-	// Part 2: Recompute a CTP from TP create / modify / delete, or create a new CTP from existing TPs:
-	latestTrafficPermissions, err := computeNewTrafficPermissions(ctx, rt, r.mapper, ctpID, oldResource)
-	if err != nil {
-		rt.Logger.Error("error calculating computed permissions", "error", err)
-		return err
-	}
-
-	if oldCTPData != nil && proto.Equal(oldCTPData.Data, latestTrafficPermissions) {
-		// there are no changes to the computed traffic permissions, and we can return early
-		rt.Logger.Trace("no new computed traffic permissions")
-		return nil
-	}
-	newCTPData, err := anypb.New(latestTrafficPermissions)
-	if err != nil {
-		rt.Logger.Error("error marshalling latest traffic permissions", "error", err)
-		writeFailedStatus(ctx, rt, oldResource, nil, err.Error())
-		return err
-	}
-	rt.Logger.Trace("writing computed traffic permissions")
-	rsp, err := rt.Client.Write(ctx, &pbresource.WriteRequest{
-		Resource: &pbresource.Resource{
-			Id:    req.ID,
-			Data:  newCTPData,
-			Owner: owner,
-		},
-	})
-	if err != nil || rsp.Resource == nil {
-		rt.Logger.Error("error writing new computed traffic permissions", "error", err)
-		writeFailedStatus(ctx, rt, oldResource, nil, err.Error())
-		return err
-	} else {
-		rt.Logger.Trace("new computed traffic permissions were successfully written")
-	}
-	newStatus := &pbresource.Status{
-		ObservedGeneration: rsp.Resource.Generation,
-		Conditions: []*pbresource.Condition{
-			ConditionComputed(req.ID.Name, latestTrafficPermissions.IsDefault),
-		},
-	}
-	_, err = rt.Client.WriteStatus(ctx, &pbresource.WriteStatusRequest{
-		Id:     rsp.Resource.Id,
-		Key:    StatusKey,
-		Status: newStatus,
-	})
-	return err
-}
-
-func writeFailedStatus(ctx context.Context, rt controller.Runtime, ctp *pbresource.Resource, tp *pbresource.ID, errDetail string) error {
-	if ctp == nil {
-		return nil
-	}
-	newStatus := &pbresource.Status{
-		ObservedGeneration: ctp.Generation,
-		Conditions: []*pbresource.Condition{
-			ConditionFailedToCompute(ctp.Id.Name, tp.Name, errDetail),
-		},
-	}
-	_, err := rt.Client.WriteStatus(ctx, &pbresource.WriteStatusRequest{
-		Id:     ctp.Id,
-		Key:    StatusKey,
-		Status: newStatus,
-	})
-	return err
-}
-
-// computeNewTrafficPermissions will use all associated Traffic Permissions to create new ComputedTrafficPermissions data
-func computeNewTrafficPermissions(ctx context.Context, rt controller.Runtime, wm TrafficPermissionsMapper, ctpID *pbresource.ID, ctp *pbresource.Resource) (*pbauth.ComputedTrafficPermissions, error) {
-	// Part 1: Get all TPs that apply to workload identity
-	// Get already associated WorkloadIdentities/CTPs for reconcile requests:
-	trackedTPs := wm.GetTrafficPermissionsForCTP(ctpID)
-	if len(trackedTPs) > 0 {
-		rt.Logger.Trace("got tracked traffic permissions for CTP", "tps:", trackedTPs)
-	} else {
-		rt.Logger.Trace("found no tracked traffic permissions for CTP")
-	}
-	ap := make([]*pbauth.Permission, 0)
-	dp := make([]*pbauth.Permission, 0)
-	isDefault := true
-	for _, t := range trackedTPs {
-		rsp, err := resource.GetDecodedResource[*pbauth.TrafficPermissions](ctx, rt.Client, resource.IDFromReference(t))
-		if err != nil {
-			rt.Logger.Error("error reading traffic permissions resource for computation", "error", err)
-			writeFailedStatus(ctx, rt, ctp, resource.IDFromReference(t), err.Error())
-			return nil, err
-		}
-		if rsp == nil {
-			rt.Logger.Trace("untracking deleted TrafficPermissions", "traffic-permissions-name", t.Name)
-			wm.UntrackTrafficPermissions(resource.IDFromReference(t))
-			continue
-		}
-		isDefault = false
-		if rsp.Data.Action == pbauth.Action_ACTION_ALLOW {
-			ap = append(ap, rsp.Data.Permissions...)
-		} else {
-			dp = append(dp, rsp.Data.Permissions...)
-		}
-	}
-	return &pbauth.ComputedTrafficPermissions{
-		AllowPermissions: ap,
-		DenyPermissions:  dp,
-		IsDefault:        isDefault,
-	}, nil
-}
diff --git a/internal/auth/internal/controllers/trafficpermissions/controller_test.go b/internal/auth/internal/controllers/trafficpermissions/controller_test.go
deleted file mode 100644
index 910a6fb88e71e..0000000000000
--- a/internal/auth/internal/controllers/trafficpermissions/controller_test.go
+++ /dev/null
@@ -1,681 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package trafficpermissions
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/auth/internal/mappers/trafficpermissionsmapper"
-	"github.com/hashicorp/consul/internal/auth/internal/types"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-type controllerSuite struct {
-	suite.Suite
-	ctx    context.Context
-	client *rtest.Client
-	rt     controller.Runtime
-
-	mapper     *trafficpermissionsmapper.TrafficPermissionsMapper
-	reconciler *reconciler
-}
-
-func (suite *controllerSuite) SetupTest() {
-	suite.ctx = testutil.TestContext(suite.T())
-	client := svctest.RunResourceService(suite.T(), types.Register)
-	suite.client = rtest.NewClient(client)
-	suite.rt = controller.Runtime{
-		Client: suite.client,
-		Logger: testutil.Logger(suite.T()),
-	}
-	suite.mapper = trafficpermissionsmapper.New()
-	suite.reconciler = &reconciler{mapper: suite.mapper}
-}
-
-func (suite *controllerSuite) requireTrafficPermissionsTracking(tp *pbresource.Resource, ids ...*pbresource.ID) {
-	reqs, err := suite.mapper.MapTrafficPermissions(suite.ctx, suite.rt, tp)
-	require.NoError(suite.T(), err)
-	require.Len(suite.T(), reqs, len(ids))
-	for _, id := range ids {
-		prototest.AssertContainsElement(suite.T(), reqs, controller.Request{ID: id})
-	}
-	for _, req := range reqs {
-		prototest.AssertContainsElement(suite.T(), ids, req.ID)
-	}
-}
-
-func (suite *controllerSuite) requireCTP(resource *pbresource.Resource, allowExpected []*pbauth.Permission, denyExpected []*pbauth.Permission) {
-	dec := rtest.MustDecode[*pbauth.ComputedTrafficPermissions](suite.T(), resource)
-	ctp := dec.Data
-	require.Len(suite.T(), ctp.AllowPermissions, len(allowExpected))
-	require.Len(suite.T(), ctp.DenyPermissions, len(denyExpected))
-	prototest.AssertElementsMatch(suite.T(), allowExpected, ctp.AllowPermissions)
-	prototest.AssertElementsMatch(suite.T(), denyExpected, ctp.DenyPermissions)
-}
-
-func (suite *controllerSuite) TestReconcile_CTPCreate_NoReferencingTrafficPermissionsExist() {
-	wi := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").Write(suite.T(), suite.client)
-	require.NotNil(suite.T(), wi)
-	id := rtest.Resource(pbauth.ComputedTrafficPermissionsType, wi.Id.Name).WithTenancy(resource.DefaultNamespacedTenancy()).WithOwner(wi.Id).ID()
-	require.NotNil(suite.T(), id)
-
-	err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	// Ensure that the CTP was created
-	ctp := suite.client.RequireResourceExists(suite.T(), id)
-	suite.requireCTP(ctp, []*pbauth.Permission{}, []*pbauth.Permission{})
-}
-
-func (suite *controllerSuite) TestReconcile_CTPCreate_ReferencingTrafficPermissionsExist() {
-	// create dead-end traffic permissions
-	p1 := &pbauth.Permission{
-		Sources: []*pbauth.Source{
-			{
-				IdentityName: "foo",
-				Namespace:    "default",
-				Partition:    "default",
-				Peer:         "local",
-			}},
-	}
-	tp1 := rtest.Resource(pbauth.TrafficPermissionsType, "tp1").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{
-			IdentityName: "wi1",
-		},
-		Action:      pbauth.Action_ACTION_DENY,
-		Permissions: []*pbauth.Permission{p1},
-	}).Write(suite.T(), suite.client)
-	wi1ID := &pbresource.ID{
-		Name:    "wi1",
-		Type:    pbauth.ComputedTrafficPermissionsType,
-		Tenancy: tp1.Id.Tenancy,
-	}
-	suite.requireTrafficPermissionsTracking(tp1, wi1ID)
-	p2 := &pbauth.Permission{
-		Sources: []*pbauth.Source{
-			{
-				IdentityName: "wi2",
-				Namespace:    "default",
-				Partition:    "default",
-				Peer:         "local",
-			}},
-	}
-	tp2 := rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{
-			IdentityName: "wi1",
-		},
-		Action:      pbauth.Action_ACTION_ALLOW,
-		Permissions: []*pbauth.Permission{p2},
-	}).Write(suite.T(), suite.client)
-	suite.requireTrafficPermissionsTracking(tp2, wi1ID)
-
-	// create the workload identity that they reference
-	wi := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").Write(suite.T(), suite.client)
-	id := rtest.Resource(pbauth.ComputedTrafficPermissionsType, wi.Id.Name).WithTenancy(resource.DefaultNamespacedTenancy()).WithOwner(wi.Id).ID()
-
-	err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	// Ensure that the CTP was created
-	ctp := suite.client.RequireResourceExists(suite.T(), id)
-	suite.requireCTP(ctp, []*pbauth.Permission{p2}, []*pbauth.Permission{p1})
-	rtest.RequireOwner(suite.T(), ctp, wi.Id, true)
-}
-
-func (suite *controllerSuite) TestReconcile_WorkloadIdentityDelete_ReferencingTrafficPermissionsExist() {
-	p1 := &pbauth.Permission{
-		Sources: []*pbauth.Source{
-			{
-				IdentityName: "foo",
-				Namespace:    "default",
-				Partition:    "default",
-				Peer:         "local",
-			}},
-	}
-	tp1 := rtest.Resource(pbauth.TrafficPermissionsType, "tp1").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{
-			IdentityName: "wi1",
-		},
-		Action:      pbauth.Action_ACTION_DENY,
-		Permissions: []*pbauth.Permission{p1},
-	}).Write(suite.T(), suite.client)
-	wi1ID := &pbresource.ID{
-		Name:    "wi1",
-		Type:    pbauth.ComputedTrafficPermissionsType,
-		Tenancy: tp1.Id.Tenancy,
-	}
-	suite.requireTrafficPermissionsTracking(tp1, wi1ID)
-	p2 := &pbauth.Permission{
-		Sources: []*pbauth.Source{
-			{
-				IdentityName: "wi2",
-				Namespace:    "default",
-				Partition:    "default",
-				Peer:         "local",
-			}},
-	}
-	tp2 := rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{
-			IdentityName: "wi1",
-		},
-		Action:      pbauth.Action_ACTION_ALLOW,
-		Permissions: []*pbauth.Permission{p2},
-	}).Write(suite.T(), suite.client)
-	suite.requireTrafficPermissionsTracking(tp2, wi1ID)
-
-	// create the workload identity that they reference
-	wi := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").Write(suite.T(), suite.client)
-	id := rtest.Resource(pbauth.ComputedTrafficPermissionsType, wi.Id.Name).WithTenancy(resource.DefaultNamespacedTenancy()).WithOwner(wi.Id).ID()
-
-	err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	// delete the workload identity
-	suite.client.MustDelete(suite.T(), wi.Id)
-
-	// re-reconcile: should untrack the CTP
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-}
-
-func (suite *controllerSuite) TestReconcile_WorkloadIdentityDelete_NoReferencingTrafficPermissionsExist() {
-	// create the workload identity that they reference
-	wi := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").Write(suite.T(), suite.client)
-	id := rtest.Resource(pbauth.ComputedTrafficPermissionsType, wi.Id.Name).WithTenancy(resource.DefaultNamespacedTenancy()).WithOwner(wi.Id).ID()
-
-	err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	// delete the workload identity
-	suite.client.MustDelete(suite.T(), wi.Id)
-
-	// re-reconcile: should untrack the CTP
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	// there should not be any traffic permissions to compute
-	tps := suite.mapper.GetTrafficPermissionsForCTP(id)
-	require.Len(suite.T(), tps, 0)
-}
-
-func (suite *controllerSuite) TestReconcile_TrafficPermissionsCreate_DestinationWorkloadIdentityExists() {
-	// create the workload identity to be referenced
-	wi := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").Write(suite.T(), suite.client)
-	id := rtest.Resource(pbauth.ComputedTrafficPermissionsType, wi.Id.Name).WithTenancy(resource.DefaultNamespacedTenancy()).WithOwner(wi.Id).ID()
-
-	err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	ctpResource := suite.client.RequireResourceExists(suite.T(), id)
-	assertCTPDefaultStatus(suite.T(), ctpResource, true)
-
-	// create traffic permissions
-	p1 := &pbauth.Permission{
-		Sources: []*pbauth.Source{
-			{
-				IdentityName: "foo",
-				Namespace:    "default",
-				Partition:    "default",
-				Peer:         "local",
-			}},
-	}
-	tp1 := rtest.Resource(pbauth.TrafficPermissionsType, "tp1").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{
-			IdentityName: "wi1",
-		},
-		Action:      pbauth.Action_ACTION_DENY,
-		Permissions: []*pbauth.Permission{p1},
-	}).Write(suite.T(), suite.client)
-	suite.requireTrafficPermissionsTracking(tp1, id)
-
-	p2 := &pbauth.Permission{
-		Sources: []*pbauth.Source{
-			{
-				IdentityName: "wi2",
-				Namespace:    "default",
-				Partition:    "default",
-				Peer:         "local",
-			}},
-	}
-	tp2 := rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{
-			IdentityName: "wi1",
-		},
-		Action:      pbauth.Action_ACTION_ALLOW,
-		Permissions: []*pbauth.Permission{p2},
-	}).Write(suite.T(), suite.client)
-	suite.requireTrafficPermissionsTracking(tp2, id)
-
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	// Ensure that the CTP was updated
-	ctpResource = suite.client.RequireResourceExists(suite.T(), id)
-	suite.requireCTP(ctpResource, []*pbauth.Permission{p2}, []*pbauth.Permission{p1})
-	rtest.RequireOwner(suite.T(), ctpResource, wi.Id, true)
-	assertCTPDefaultStatus(suite.T(), ctpResource, false)
-
-	// Add another TP
-	p3 := &pbauth.Permission{
-		Sources: []*pbauth.Source{
-			{
-				IdentityName: "wi3",
-				Namespace:    "default",
-				Partition:    "default",
-				Peer:         "local",
-			}},
-	}
-	tp3 := rtest.Resource(pbauth.TrafficPermissionsType, "tp3").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{
-			IdentityName: "wi1",
-		},
-		Action:      pbauth.Action_ACTION_DENY,
-		Permissions: []*pbauth.Permission{p3},
-	}).Write(suite.T(), suite.client)
-	suite.requireTrafficPermissionsTracking(tp3, id)
-
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	// Ensure that the CTP was updated
-	ctpResource = suite.client.RequireResourceExists(suite.T(), id)
-	suite.requireCTP(ctpResource, []*pbauth.Permission{p2}, []*pbauth.Permission{p1, p3})
-	rtest.RequireOwner(suite.T(), ctpResource, wi.Id, true)
-	assertCTPDefaultStatus(suite.T(), ctpResource, false)
-
-	// Delete the traffic permissions without updating the caches. Ensure is default is right even when the caches contain stale data.
-	suite.client.MustDelete(suite.T(), tp1.Id)
-	suite.client.MustDelete(suite.T(), tp2.Id)
-	suite.client.MustDelete(suite.T(), tp3.Id)
-
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	ctpResource = suite.client.RequireResourceExists(suite.T(), id)
-	suite.requireCTP(ctpResource, []*pbauth.Permission{}, []*pbauth.Permission{})
-	rtest.RequireOwner(suite.T(), ctpResource, wi.Id, true)
-	assertCTPDefaultStatus(suite.T(), ctpResource, true)
-}
-
-func (suite *controllerSuite) TestReconcile_TrafficPermissionsDelete_DestinationWorkloadIdentityExists() {
-	// create the workload identity to be referenced
-	wi := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").Write(suite.T(), suite.client)
-	id := rtest.Resource(pbauth.ComputedTrafficPermissionsType, wi.Id.Name).WithTenancy(resource.DefaultNamespacedTenancy()).WithOwner(wi.Id).ID()
-
-	err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	// create traffic permissions
-	p1 := &pbauth.Permission{
-		Sources: []*pbauth.Source{
-			{
-				IdentityName: "foo",
-				Namespace:    "default",
-				Partition:    "default",
-				Peer:         "local",
-			}},
-	}
-	tp1 := rtest.Resource(pbauth.TrafficPermissionsType, "tp1").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{
-			IdentityName: "wi1",
-		},
-		Action:      pbauth.Action_ACTION_DENY,
-		Permissions: []*pbauth.Permission{p1},
-	}).Write(suite.T(), suite.client)
-	suite.requireTrafficPermissionsTracking(tp1, id)
-	p2 := &pbauth.Permission{
-		Sources: []*pbauth.Source{
-			{
-				IdentityName: "wi2",
-				Namespace:    "default",
-				Partition:    "default",
-				Peer:         "local",
-			}},
-	}
-	tp2 := rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{
-			IdentityName: "wi1",
-		},
-		Action:      pbauth.Action_ACTION_ALLOW,
-		Permissions: []*pbauth.Permission{p2},
-	}).Write(suite.T(), suite.client)
-	suite.requireTrafficPermissionsTracking(tp2, id)
-
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	ctp := suite.client.RequireResourceExists(suite.T(), id)
-	suite.requireCTP(ctp, []*pbauth.Permission{p2}, []*pbauth.Permission{p1})
-	rtest.RequireOwner(suite.T(), ctp, wi.Id, true)
-
-	// Delete TP2
-	suite.client.MustDelete(suite.T(), tp2.Id)
-
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	// Ensure that the CTP was updated
-	ctp = suite.client.RequireResourceExists(suite.T(), id)
-	suite.requireCTP(ctp, []*pbauth.Permission{}, []*pbauth.Permission{p1})
-
-	// Ensure TP2 is untracked
-	newTps := suite.mapper.GetTrafficPermissionsForCTP(ctp.Id)
-	require.Len(suite.T(), newTps, 1)
-	require.Equal(suite.T(), newTps[0].Name, tp1.Id.Name)
-}
-
-func (suite *controllerSuite) TestReconcile_TrafficPermissionsDelete_DestinationWorkloadIdentityDoesNotExist() {
-	// create traffic permissions
-	p1 := &pbauth.Permission{
-		Sources: []*pbauth.Source{
-			{
-				IdentityName: "foo",
-				Namespace:    "default",
-				Partition:    "default",
-				Peer:         "local",
-			}},
-	}
-	tp1 := rtest.Resource(pbauth.TrafficPermissionsType, "tp1").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{
-			IdentityName: "wi1",
-		},
-		Action:      pbauth.Action_ACTION_DENY,
-		Permissions: []*pbauth.Permission{p1},
-	}).Write(suite.T(), suite.client)
-	wi1ID := &pbresource.ID{
-		Name:    "wi1",
-		Type:    pbauth.ComputedTrafficPermissionsType,
-		Tenancy: tp1.Id.Tenancy,
-	}
-	suite.requireTrafficPermissionsTracking(tp1, wi1ID)
-	p2 := &pbauth.Permission{
-		Sources: []*pbauth.Source{
-			{
-				IdentityName: "wi2",
-				Namespace:    "default",
-				Partition:    "default",
-				Peer:         "local",
-			}},
-	}
-	tp2 := rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{
-			IdentityName: "wi1",
-		},
-		Action:      pbauth.Action_ACTION_ALLOW,
-		Permissions: []*pbauth.Permission{p2},
-	}).Write(suite.T(), suite.client)
-	suite.requireTrafficPermissionsTracking(tp2, wi1ID)
-
-	// Delete TP2
-	suite.client.MustDelete(suite.T(), tp2.Id)
-
-	// Ensure that no CTPs exist
-	rsp, err := suite.client.List(suite.ctx, &pbresource.ListRequest{
-		Type:    pbauth.ComputedTrafficPermissionsType,
-		Tenancy: resource.DefaultNamespacedTenancy(),
-	})
-	require.NoError(suite.T(), err)
-	require.Empty(suite.T(), rsp.Resources)
-}
-
-func (suite *controllerSuite) TestControllerBasic() {
-	// TODO: refactor this
-	// In this test we check basic operations for a workload identity and referencing traffic permission
-	mgr := controller.NewManager(suite.client, suite.rt.Logger)
-	mgr.Register(Controller(suite.mapper))
-	mgr.SetRaftLeader(true)
-	go mgr.Run(suite.ctx)
-
-	// Add a workload identity
-	workloadIdentity := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").Write(suite.T(), suite.client)
-
-	// Wait for the controller to record that the CTP has been computed
-	res := suite.client.WaitForReconciliation(suite.T(), resource.ReplaceType(pbauth.ComputedTrafficPermissionsType, workloadIdentity.Id), StatusKey)
-	// Check that the status was updated
-	rtest.RequireStatusCondition(suite.T(), res, StatusKey, ConditionComputed("wi1", true))
-
-	// Check that the CTP resource exists and contains no permissions
-	ctpID := rtest.Resource(pbauth.ComputedTrafficPermissionsType, "wi1").ID()
-	ctpObject := suite.client.RequireResourceExists(suite.T(), ctpID)
-	suite.requireCTP(ctpObject, nil, nil)
-
-	// add a traffic permission that references wi1
-	p1 := &pbauth.Permission{
-		Sources: []*pbauth.Source{{
-			IdentityName: "wi2",
-			Namespace:    "default",
-			Partition:    "default",
-			Peer:         "local",
-		}},
-		DestinationRules: nil,
-	}
-	tp1 := rtest.Resource(pbauth.TrafficPermissionsType, "tp1").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{IdentityName: "wi1"},
-		Action:      pbauth.Action_ACTION_ALLOW,
-		Permissions: []*pbauth.Permission{p1},
-	}).Write(suite.T(), suite.client)
-	suite.client.RequireResourceExists(suite.T(), tp1.Id)
-	// Wait for the controller to record that the CTP has been re-computed
-	suite.client.WaitForReconciliation(suite.T(), resource.ReplaceType(pbauth.ComputedTrafficPermissionsType, workloadIdentity.Id), StatusKey)
-	// Check that the ctp has been regenerated
-	ctpObject = suite.client.WaitForNewVersion(suite.T(), ctpID, ctpObject.Version)
-	rtest.RequireStatusCondition(suite.T(), ctpObject, StatusKey, ConditionComputed("wi1", false))
-	// check wi1
-	suite.requireCTP(ctpObject, []*pbauth.Permission{p1}, nil)
-
-	// add a traffic permission that references wi2
-	p2 := &pbauth.Permission{
-		Sources: []*pbauth.Source{{
-			IdentityName: "wi1",
-			Namespace:    "default",
-			Partition:    "default",
-			Peer:         "local",
-		}},
-		DestinationRules: nil,
-	}
-	tp2 := rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{IdentityName: "wi2"},
-		Action:      pbauth.Action_ACTION_ALLOW,
-		Permissions: []*pbauth.Permission{p2},
-	}).Write(suite.T(), suite.client)
-	suite.client.RequireResourceExists(suite.T(), tp2.Id)
-	// check wi1 is the same
-	ctpObject = suite.client.RequireResourceExists(suite.T(), ctpID)
-	suite.requireCTP(ctpObject, []*pbauth.Permission{p1}, nil)
-	// check no ctp2
-	ctpID2 := rtest.Resource(pbauth.ComputedTrafficPermissionsType, "wi2").ID()
-	suite.client.RequireResourceNotFound(suite.T(), ctpID2)
-
-	// delete tp1
-	suite.client.MustDelete(suite.T(), tp1.Id)
-	suite.client.WaitForDeletion(suite.T(), tp1.Id)
-	// check wi1 has no permissions
-	ctpObject = suite.client.WaitForNewVersion(suite.T(), ctpID, ctpObject.Version)
-	suite.requireCTP(ctpObject, nil, nil)
-
-	// edit tp2 to point to wi1
-	rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{IdentityName: "wi1"},
-		Action:      pbauth.Action_ACTION_ALLOW,
-		Permissions: []*pbauth.Permission{p2},
-	}).Write(suite.T(), suite.client)
-	// check wi1 has tp2's permissions
-	ctpObject = suite.client.WaitForNewVersion(suite.T(), ctpID, ctpObject.Version)
-	suite.requireCTP(ctpObject, []*pbauth.Permission{p2}, nil)
-	// check no ctp2
-	ctpID2 = rtest.Resource(pbauth.ComputedTrafficPermissionsType, "wi2").ID()
-	suite.client.RequireResourceNotFound(suite.T(), ctpID2)
-}
-
-func (suite *controllerSuite) TestControllerMultipleTrafficPermissions() {
-	// TODO: refactor this, turn back on once timing flakes are understood
-	suite.T().Skip("flaky behavior observed")
-	// In this test we check operations for a workload identity and multiple referencing traffic permissions
-	mgr := controller.NewManager(suite.client, suite.rt.Logger)
-	mgr.Register(Controller(suite.mapper))
-	mgr.SetRaftLeader(true)
-	go mgr.Run(suite.ctx)
-
-	wi1ID := &pbresource.ID{
-		Name:    "wi1",
-		Type:    pbauth.ComputedTrafficPermissionsType,
-		Tenancy: resource.DefaultNamespacedTenancy(),
-	}
-	// add tp1 and tp2
-	p1 := &pbauth.Permission{
-		Sources: []*pbauth.Source{{
-			IdentityName: "wi2",
-			Namespace:    "default",
-			Partition:    "default",
-			Peer:         "local",
-		}},
-		DestinationRules: nil,
-	}
-	tp1 := rtest.Resource(pbauth.TrafficPermissionsType, "tp1").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{IdentityName: "wi1"},
-		Action:      pbauth.Action_ACTION_ALLOW,
-		Permissions: []*pbauth.Permission{p1},
-	}).Write(suite.T(), suite.client)
-	suite.client.RequireResourceExists(suite.T(), tp1.Id)
-	suite.requireTrafficPermissionsTracking(tp1, wi1ID)
-	p2 := &pbauth.Permission{
-		Sources: []*pbauth.Source{{
-			IdentityName: "wi3",
-			Namespace:    "default",
-			Partition:    "default",
-			Peer:         "local",
-		}},
-		DestinationRules: nil,
-	}
-	tp2 := rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{IdentityName: "wi1"},
-		Action:      pbauth.Action_ACTION_ALLOW,
-		Permissions: []*pbauth.Permission{p2},
-	}).Write(suite.T(), suite.client)
-	suite.client.RequireResourceExists(suite.T(), tp2.Id)
-	suite.requireTrafficPermissionsTracking(tp1, wi1ID)
-
-	// Add a workload identity
-	workloadIdentity := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").Write(suite.T(), suite.client)
-	ctpID := resource.ReplaceType(pbauth.ComputedTrafficPermissionsType, workloadIdentity.Id)
-	// Wait for the controller to record that the CTP has been computed
-	res := suite.client.WaitForReconciliation(suite.T(), ctpID, StatusKey)
-	rtest.RequireStatusCondition(suite.T(), res, StatusKey, ConditionComputed("wi1", false))
-	// check ctp1 has tp1 and tp2
-	ctpObject := suite.client.RequireResourceExists(suite.T(), res.Id)
-	suite.requireCTP(ctpObject, []*pbauth.Permission{p1, p2}, nil)
-
-	// add tp3
-	p3 := &pbauth.Permission{
-		Sources: []*pbauth.Source{{
-			IdentityName: "wi4",
-			Namespace:    "default",
-			Partition:    "default",
-			Peer:         "local",
-		}},
-		DestinationRules: nil,
-	}
-	tp3 := rtest.Resource(pbauth.TrafficPermissionsType, "tp3").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{IdentityName: "wi1"},
-		Action:      pbauth.Action_ACTION_DENY,
-		Permissions: []*pbauth.Permission{p3},
-	}).Write(suite.T(), suite.client)
-	suite.client.RequireResourceExists(suite.T(), tp3.Id)
-	// check ctp1 has tp3
-	ctpObject = suite.client.WaitForReconciliation(suite.T(), ctpObject.Id, StatusKey)
-	ctpObject = suite.client.WaitForNewVersion(suite.T(), ctpObject.Id, ctpObject.Version)
-	suite.requireCTP(ctpObject, []*pbauth.Permission{p1, p2}, []*pbauth.Permission{p3})
-
-	// delete ctp
-	suite.client.MustDelete(suite.T(), ctpObject.Id)
-	suite.client.WaitForDeletion(suite.T(), ctpObject.Id)
-	// check ctp regenerated, has all permissions
-	res = suite.client.WaitForReconciliation(suite.T(), ctpID, StatusKey)
-	rtest.RequireStatusCondition(suite.T(), res, StatusKey, ConditionComputed("wi1", false))
-	ctpObject = suite.client.RequireResourceExists(suite.T(), res.Id)
-	suite.requireCTP(ctpObject, []*pbauth.Permission{p1, p2}, []*pbauth.Permission{p3})
-
-	// delete wi1
-	suite.client.MustDelete(suite.T(), workloadIdentity.Id)
-	suite.client.WaitForDeletion(suite.T(), workloadIdentity.Id)
-
-	// recreate wi1
-	rtest.Resource(pbauth.WorkloadIdentityType, "wi1").Write(suite.T(), suite.client)
-	// check ctp regenerated, has all permissions
-	res = suite.client.WaitForReconciliation(suite.T(), ctpID, StatusKey)
-	rtest.RequireStatusCondition(suite.T(), res, StatusKey, ConditionComputed("wi1", false))
-	ctpObject = suite.client.RequireResourceExists(suite.T(), res.Id)
-	suite.requireCTP(ctpObject, []*pbauth.Permission{p1, p2}, []*pbauth.Permission{p3})
-
-	// delete tp3
-	suite.client.MustDelete(suite.T(), tp3.Id)
-	suite.client.WaitForDeletion(suite.T(), tp3.Id)
-	suite.client.RequireResourceNotFound(suite.T(), tp3.Id)
-	// check ctp1 has tp1 and tp2, and not tp3
-	res = suite.client.WaitForReconciliation(suite.T(), ctpObject.Id, StatusKey)
-	ctpObject = suite.client.WaitForNewVersion(suite.T(), res.Id, ctpObject.Version)
-	suite.requireCTP(ctpObject, []*pbauth.Permission{p1, p2}, nil)
-
-	// add wi2
-	workloadIdentity2 := rtest.Resource(pbauth.WorkloadIdentityType, "wi2").Write(suite.T(), suite.client)
-	// Wait for the controller to record that the CTP has been computed
-	res2 := suite.client.WaitForReconciliation(suite.T(), resource.ReplaceType(pbauth.ComputedTrafficPermissionsType, workloadIdentity2.Id), StatusKey)
-	rtest.RequireStatusCondition(suite.T(), res2, StatusKey, ConditionComputed("wi2", false))
-	// check ctp2 has no permissions
-	ctpObject2 := suite.client.RequireResourceExists(suite.T(), res2.Id)
-	suite.requireCTP(ctpObject2, nil, nil)
-
-	// edit all traffic permissions to point to wi2
-	tp1 = rtest.Resource(pbauth.TrafficPermissionsType, "tp1").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{IdentityName: "wi2"},
-		Action:      pbauth.Action_ACTION_ALLOW,
-		Permissions: []*pbauth.Permission{p1},
-	}).Write(suite.T(), suite.client)
-	tp2 = rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{IdentityName: "wi2"},
-		Action:      pbauth.Action_ACTION_ALLOW,
-		Permissions: []*pbauth.Permission{p2},
-	}).Write(suite.T(), suite.client)
-	tp3 = rtest.Resource(pbauth.TrafficPermissionsType, "tp3").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{IdentityName: "wi2"},
-		Action:      pbauth.Action_ACTION_DENY,
-		Permissions: []*pbauth.Permission{p3},
-	}).Write(suite.T(), suite.client)
-	suite.client.RequireResourceExists(suite.T(), tp1.Id)
-	suite.client.RequireResourceExists(suite.T(), tp2.Id)
-	suite.client.RequireResourceExists(suite.T(), tp3.Id)
-
-	// check wi2 has updated with all permissions after 6 reconciles
-	ctpObject2 = suite.client.WaitForReconciliation(suite.T(), ctpObject2.Id, StatusKey)
-	res2 = suite.client.WaitForReconciliation(suite.T(), ctpObject2.Id, StatusKey)
-	suite.client.WaitForResourceState(suite.T(), res2.Id, func(t rtest.T, res *pbresource.Resource) {
-		suite.requireCTP(res, []*pbauth.Permission{p1, p2}, []*pbauth.Permission{p3})
-	})
-	// check wi1 has no permissions after 6 reconciles
-	ctpObject = suite.client.WaitForReconciliation(suite.T(), ctpObject.Id, StatusKey)
-	res = suite.client.WaitForReconciliation(suite.T(), ctpObject.Id, StatusKey)
-	suite.client.WaitForResourceState(suite.T(), res.Id, func(t rtest.T, res *pbresource.Resource) {
-		suite.requireCTP(res, nil, nil)
-	})
-}
-
-func TestController(t *testing.T) {
-	suite.Run(t, new(controllerSuite))
-}
-
-func assertCTPDefaultStatus(t *testing.T, resource *pbresource.Resource, isDefault bool) {
-	dec := rtest.MustDecode[*pbauth.ComputedTrafficPermissions](t, resource)
-	require.Equal(t, isDefault, dec.Data.IsDefault)
-}
diff --git a/internal/auth/internal/controllers/trafficpermissions/status.go b/internal/auth/internal/controllers/trafficpermissions/status.go
deleted file mode 100644
index bfcc64bc131ce..0000000000000
--- a/internal/auth/internal/controllers/trafficpermissions/status.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package trafficpermissions
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	StatusKey                           = "consul.io/traffic-permissions"
-	StatusTrafficPermissionsComputed    = "Traffic permissions have been computed"
-	StatusTrafficPermissionsNotComputed = "Traffic permissions have not been computed"
-	ConditionPermissionsAppliedMsg      = "Workload identity %s has new permissions"
-	ConditionNoPermissionsMsg           = "Workload identity %s has no permissions"
-	ConditionPermissionsFailedMsg       = "Unable to calculate new permission set for Workload identity %s"
-)
-
-func ConditionComputed(workloadIdentity string, isDefault bool) *pbresource.Condition {
-	msgTpl := ConditionPermissionsAppliedMsg
-	if isDefault {
-		msgTpl = ConditionNoPermissionsMsg
-	}
-	return &pbresource.Condition{
-		Type:    StatusTrafficPermissionsComputed,
-		State:   pbresource.Condition_STATE_TRUE,
-		Message: fmt.Sprintf(msgTpl, workloadIdentity),
-	}
-}
-
-func ConditionFailedToCompute(workloadIdentity string, trafficPermissions string, errDetail string) *pbresource.Condition {
-	message := fmt.Sprintf(ConditionPermissionsFailedMsg, workloadIdentity)
-	if len(trafficPermissions) > 0 {
-		message = message + fmt.Sprintf(", traffic permission %s cannot be computed", trafficPermissions)
-	}
-	if len(errDetail) > 0 {
-		message = message + fmt.Sprintf(", error details: %s", errDetail)
-	}
-	return &pbresource.Condition{
-		Type:    StatusTrafficPermissionsNotComputed,
-		State:   pbresource.Condition_STATE_FALSE,
-		Message: message,
-	}
-}
diff --git a/internal/auth/internal/mappers/trafficpermissionsmapper/traffic_permissions_mapper.go b/internal/auth/internal/mappers/trafficpermissionsmapper/traffic_permissions_mapper.go
deleted file mode 100644
index be28126458801..0000000000000
--- a/internal/auth/internal/mappers/trafficpermissionsmapper/traffic_permissions_mapper.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package trafficpermissionsmapper
-
-import (
-	"context"
-	"sync"
-
-	"github.com/hashicorp/consul/internal/auth/internal/types"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/mappers/bimapper"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type TrafficPermissionsMapper struct {
-	lock   sync.Mutex
-	mapper *bimapper.Mapper
-}
-
-func New() *TrafficPermissionsMapper {
-	return &TrafficPermissionsMapper{
-		lock:   sync.Mutex{},
-		mapper: bimapper.New(pbauth.TrafficPermissionsType, pbauth.ComputedTrafficPermissionsType),
-	}
-}
-
-//  TrafficPermissionsMapper functions
-
-func (tm *TrafficPermissionsMapper) MapTrafficPermissions(_ context.Context, _ controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	tm.lock.Lock()
-	defer tm.lock.Unlock()
-	var tp pbauth.TrafficPermissions
-	err := res.Data.UnmarshalTo(&tp)
-	if err != nil {
-		return nil, resource.NewErrDataParse(&tp, err)
-	}
-	// get new CTP associations based on destination
-	if len(tp.Destination.IdentityName) == 0 {
-		// this error should never happen if validation is working
-		return nil, types.ErrWildcardNotSupported
-	}
-	newCTP := &pbresource.ID{
-		Name:    tp.Destination.IdentityName,
-		Type:    pbauth.ComputedTrafficPermissionsType,
-		Tenancy: res.Id.Tenancy,
-	}
-	requests := []controller.Request{{ID: newCTP}}
-	// add already associated WorkloadIdentities/CTPs for reconcile requests:
-	oldCTPs := tm.mapper.LinkIDsForItem(res.Id)
-	for _, mappedWI := range oldCTPs {
-		if mappedWI.Name != newCTP.Name {
-			requests = append(requests, controller.Request{ID: mappedWI})
-		}
-	}
-	// re-map traffic permission to new CTP
-	tm.mapper.TrackItem(res.Id, []resource.ReferenceOrID{newCTP})
-	return requests, nil
-}
-
-func (tm *TrafficPermissionsMapper) UntrackTrafficPermissions(tp *pbresource.ID) {
-	tm.lock.Lock()
-	defer tm.lock.Unlock()
-	tm.mapper.UntrackItem(tp)
-}
-
-func (tm *TrafficPermissionsMapper) GetTrafficPermissionsForCTP(ctp *pbresource.ID) []*pbresource.Reference {
-	tm.lock.Lock()
-	defer tm.lock.Unlock()
-	return tm.mapper.ItemRefsForLink(ctp)
-}
diff --git a/internal/auth/internal/types/computed_traffic_permissions.go b/internal/auth/internal/types/computed_traffic_permissions.go
deleted file mode 100644
index 0ba88427233b5..0000000000000
--- a/internal/auth/internal/types/computed_traffic_permissions.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterComputedTrafficPermission(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:  pbauth.ComputedTrafficPermissionsType,
-		Proto: &pbauth.ComputedTrafficPermissions{},
-		ACLs: &resource.ACLHooks{
-			Read:  aclReadHookComputedTrafficPermissions,
-			Write: aclWriteHookComputedTrafficPermissions,
-			List:  aclListHookComputedTrafficPermissions,
-		},
-		Validate: ValidateComputedTrafficPermissions,
-		Scope:    resource.ScopeNamespace,
-	})
-}
-
-func ValidateComputedTrafficPermissions(res *pbresource.Resource) error {
-	var ctp pbauth.ComputedTrafficPermissions
-
-	if err := res.Data.UnmarshalTo(&ctp); err != nil {
-		return resource.NewErrDataParse(&ctp, err)
-	}
-
-	var merr error
-
-	for i, permission := range ctp.AllowPermissions {
-		wrapErr := func(err error) error {
-			return resource.ErrInvalidListElement{
-				Name:    "allow_permissions",
-				Index:   i,
-				Wrapped: err,
-			}
-		}
-		if err := validatePermission(permission, wrapErr); err != nil {
-			merr = multierror.Append(merr, err)
-		}
-	}
-
-	for i, permission := range ctp.DenyPermissions {
-		wrapErr := func(err error) error {
-			return resource.ErrInvalidListElement{
-				Name:    "deny_permissions",
-				Index:   i,
-				Wrapped: err,
-			}
-		}
-		if err := validatePermission(permission, wrapErr); err != nil {
-			merr = multierror.Append(merr, err)
-		}
-	}
-
-	return merr
-}
-
-func aclReadHookComputedTrafficPermissions(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, id *pbresource.ID, _ *pbresource.Resource) error {
-	return authorizer.ToAllowAuthorizer().TrafficPermissionsReadAllowed(id.Name, authzContext)
-}
-
-func aclWriteHookComputedTrafficPermissions(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
-	return authorizer.ToAllowAuthorizer().TrafficPermissionsWriteAllowed(res.Id.Name, authzContext)
-}
-
-func aclListHookComputedTrafficPermissions(_ acl.Authorizer, _ *acl.AuthorizerContext) error {
-	// No-op List permission as we want to default to filtering resources
-	// from the list using the Read enforcement
-	return nil
-}
diff --git a/internal/auth/internal/types/computed_traffic_permissions_test.go b/internal/auth/internal/types/computed_traffic_permissions_test.go
deleted file mode 100644
index e5c4379a81806..0000000000000
--- a/internal/auth/internal/types/computed_traffic_permissions_test.go
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestValidateComputedTrafficPermissions_Permissions(t *testing.T) {
-	for n, tc := range permissionsTestCases() {
-		t.Run(n, func(t *testing.T) {
-
-			for _, s := range tc.p.Sources {
-				normalizedTenancyForSource(s, resource.DefaultNamespacedTenancy())
-			}
-
-			allowCTP := &pbauth.ComputedTrafficPermissions{
-				AllowPermissions: []*pbauth.Permission{tc.p},
-			}
-
-			denyCTP := &pbauth.ComputedTrafficPermissions{
-				DenyPermissions: []*pbauth.Permission{tc.p},
-			}
-
-			for _, ctp := range []*pbauth.ComputedTrafficPermissions{allowCTP, denyCTP} {
-				res := resourcetest.Resource(pbauth.ComputedTrafficPermissionsType, "tp").
-					WithData(t, ctp).
-					Build()
-
-				err := ValidateComputedTrafficPermissions(res)
-				if tc.expectErr == "" {
-					require.NoError(t, err)
-				} else {
-					testutil.RequireErrorContains(t, err, tc.expectErr)
-				}
-			}
-		})
-	}
-}
-
-func TestComputedTrafficPermissionsACLs(t *testing.T) {
-	// Wire up a registry to generically invoke hooks
-	registry := resource.NewRegistry()
-	Register(registry)
-
-	type testcase struct {
-		rules   string
-		check   func(t *testing.T, authz acl.Authorizer, res *pbresource.Resource)
-		readOK  string
-		writeOK string
-		listOK  string
-	}
-
-	const (
-		DENY    = "deny"
-		ALLOW   = "allow"
-		DEFAULT = "default"
-	)
-
-	checkF := func(t *testing.T, expect string, got error) {
-		switch expect {
-		case ALLOW:
-			if acl.IsErrPermissionDenied(got) {
-				t.Fatal("should be allowed")
-			}
-		case DENY:
-			if !acl.IsErrPermissionDenied(got) {
-				t.Fatal("should be denied")
-			}
-		case DEFAULT:
-			require.Nil(t, got, "expected fallthrough decision")
-		default:
-			t.Fatalf("unexpected expectation: %q", expect)
-		}
-	}
-
-	reg, ok := registry.Resolve(pbauth.ComputedTrafficPermissionsType)
-	require.True(t, ok)
-
-	run := func(t *testing.T, tc testcase) {
-		ctpData := &pbauth.ComputedTrafficPermissions{}
-		res := resourcetest.Resource(pbauth.ComputedTrafficPermissionsType, "wi1").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, ctpData).
-			Build()
-		resourcetest.ValidateAndNormalize(t, registry, res)
-
-		config := acl.Config{
-			WildcardName: structs.WildcardSpecifier,
-		}
-		authz, err := acl.NewAuthorizerFromRules(tc.rules, &config, nil)
-		require.NoError(t, err)
-		authz = acl.NewChainedAuthorizer([]acl.Authorizer{authz, acl.DenyAll()})
-
-		t.Run("read", func(t *testing.T) {
-			err := reg.ACLs.Read(authz, &acl.AuthorizerContext{}, res.Id, res)
-			checkF(t, tc.readOK, err)
-		})
-		t.Run("write", func(t *testing.T) {
-			err := reg.ACLs.Write(authz, &acl.AuthorizerContext{}, res)
-			checkF(t, tc.writeOK, err)
-		})
-		t.Run("list", func(t *testing.T) {
-			err := reg.ACLs.List(authz, &acl.AuthorizerContext{})
-			checkF(t, tc.listOK, err)
-		})
-	}
-
-	cases := map[string]testcase{
-		"no rules": {
-			rules:   ``,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity w1 read, no intentions": {
-			rules:   `identity "wi1" { policy = "read" }`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity w1 read, deny intentions": {
-			rules:   `identity "wi1" { policy = "read", intentions = "deny" }`,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity w1 read, intentions read": {
-			rules:   `identity "wi1" { policy = "read", intentions = "read" }`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity w1 write, write intentions": {
-			rules:   `identity "wi1" { policy = "read", intentions = "write" }`,
-			readOK:  ALLOW,
-			writeOK: ALLOW,
-			listOK:  DEFAULT,
-		},
-		"workload identity w1 write, deny intentions": {
-			rules:   `identity "wi1" { policy = "write", intentions = "deny" }`,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity w1 write, intentions read": {
-			rules:   `identity "wi1" { policy = "write", intentions = "read" }`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity w1 write, intentions write": {
-			rules:   `identity "wi1" { policy = "write", intentions = "write" }`,
-			readOK:  ALLOW,
-			writeOK: ALLOW,
-			listOK:  DEFAULT,
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
diff --git a/internal/auth/internal/types/errors.go b/internal/auth/internal/types/errors.go
deleted file mode 100644
index b79d7a3b98e9b..0000000000000
--- a/internal/auth/internal/types/errors.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import "errors"
-
-var (
-	errInvalidAction        = errors.New("action must be either allow or deny")
-	errSourcesTenancy       = errors.New("permissions sources may not specify partitions, peers, and sameness_groups together")
-	errSourceWildcards      = errors.New("permission sources may not have wildcard namespaces and explicit names.")
-	errSourceExcludes       = errors.New("must be defined on wildcard sources")
-	errInvalidPrefixValues  = errors.New("prefix values, regex values, and explicit names must not combined")
-	ErrWildcardNotSupported = errors.New("traffic permissions without explicit destinations are not yet supported")
-)
diff --git a/internal/auth/internal/types/traffic_permissions.go b/internal/auth/internal/types/traffic_permissions.go
deleted file mode 100644
index fb1de7acff901..0000000000000
--- a/internal/auth/internal/types/traffic_permissions.go
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterTrafficPermissions(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:  pbauth.TrafficPermissionsType,
-		Proto: &pbauth.TrafficPermissions{},
-		ACLs: &resource.ACLHooks{
-			Read:  aclReadHookTrafficPermissions,
-			Write: aclWriteHookTrafficPermissions,
-			List:  aclListHookTrafficPermissions,
-		},
-		Validate: ValidateTrafficPermissions,
-		Mutate:   MutateTrafficPermissions,
-		Scope:    resource.ScopeNamespace,
-	})
-}
-
-func MutateTrafficPermissions(res *pbresource.Resource) error {
-	var tp pbauth.TrafficPermissions
-
-	if err := res.Data.UnmarshalTo(&tp); err != nil {
-		return resource.NewErrDataParse(&tp, err)
-	}
-
-	var changed bool
-
-	for _, p := range tp.Permissions {
-		for _, s := range p.Sources {
-			if updated := normalizedTenancyForSource(s, res.Id.Tenancy); updated {
-				changed = true
-			}
-		}
-	}
-
-	if !changed {
-		return nil
-	}
-
-	return res.Data.MarshalFrom(&tp)
-}
-
-func normalizedTenancyForSource(src *pbauth.Source, parentTenancy *pbresource.Tenancy) bool {
-	var changed bool
-
-	if t, c := defaultedSourceTenancy(src, parentTenancy); c {
-		src.Partition = t.Partition
-		src.Peer = t.PeerName
-		src.Namespace = t.Namespace
-		changed = true
-	}
-
-	for _, e := range src.Exclude {
-		if t, c := defaultedSourceTenancy(e, parentTenancy); c {
-			e.Partition = t.Partition
-			e.Peer = t.PeerName
-			e.Namespace = t.Namespace
-			changed = true
-		}
-	}
-
-	return changed
-}
-
-func defaultedSourceTenancy(s pbauth.SourceToSpiffe, parentTenancy *pbresource.Tenancy) (*pbresource.Tenancy, bool) {
-	if !isLocalPeer(s.GetPeer()) {
-		return nil, false
-	}
-
-	tenancy := pbauth.SourceToTenancy(s)
-
-	var peerChanged bool
-	tenancy.PeerName, peerChanged = firstNonEmptyString(tenancy.PeerName, parentTenancy.PeerName, resource.DefaultPeerName)
-
-	var partitionChanged bool
-	tenancy.Partition, partitionChanged = firstNonEmptyString(tenancy.Partition, parentTenancy.Partition, resource.DefaultPartitionName)
-
-	var namespaceChanged bool
-	if s.GetIdentityName() != "" {
-		if tenancy.Partition == parentTenancy.Partition {
-			tenancy.Namespace, namespaceChanged = firstNonEmptyString(tenancy.Namespace, parentTenancy.Namespace, resource.DefaultNamespaceName)
-		} else {
-			tenancy.Namespace, namespaceChanged = firstNonEmptyString(tenancy.Namespace, resource.DefaultNamespaceName, resource.DefaultNamespaceName)
-		}
-	}
-
-	return tenancy, peerChanged || partitionChanged || namespaceChanged
-}
-
-func firstNonEmptyString(a, b, c string) (string, bool) {
-	if a != "" {
-		return a, false
-	}
-
-	if b != "" {
-		return b, true
-	}
-
-	return c, true
-}
-
-func ValidateTrafficPermissions(res *pbresource.Resource) error {
-	var tp pbauth.TrafficPermissions
-
-	if err := res.Data.UnmarshalTo(&tp); err != nil {
-		return resource.NewErrDataParse(&tp, err)
-	}
-
-	var merr error
-
-	// enumcover:pbauth.Action
-	switch tp.Action {
-	case pbauth.Action_ACTION_ALLOW:
-	case pbauth.Action_ACTION_DENY:
-	case pbauth.Action_ACTION_UNSPECIFIED:
-		fallthrough
-	default:
-		merr = multierror.Append(merr, resource.ErrInvalidField{
-			Name:    "data.action",
-			Wrapped: errInvalidAction,
-		})
-	}
-
-	if tp.Destination == nil || (len(tp.Destination.IdentityName) == 0) {
-		merr = multierror.Append(merr, resource.ErrInvalidField{
-			Name:    "data.destination",
-			Wrapped: resource.ErrEmpty,
-		})
-	}
-	// Validate permissions
-	for i, permission := range tp.Permissions {
-		wrapErr := func(err error) error {
-			return resource.ErrInvalidListElement{
-				Name:    "permissions",
-				Index:   i,
-				Wrapped: err,
-			}
-		}
-		if err := validatePermission(permission, wrapErr); err != nil {
-			merr = multierror.Append(merr, err)
-		}
-	}
-
-	return merr
-}
-
-func validatePermission(p *pbauth.Permission, wrapErr func(error) error) error {
-	var merr error
-
-	if len(p.Sources) == 0 {
-		merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-			Name:    "sources",
-			Wrapped: resource.ErrEmpty,
-		}))
-	}
-
-	for s, src := range p.Sources {
-		wrapSrcErr := func(err error) error {
-			return wrapErr(resource.ErrInvalidListElement{
-				Name:    "sources",
-				Index:   s,
-				Wrapped: err,
-			})
-		}
-		if sourceHasIncompatibleTenancies(src) {
-			merr = multierror.Append(merr, wrapSrcErr(resource.ErrInvalidListElement{
-				Name:    "source",
-				Wrapped: errSourcesTenancy,
-			}))
-		}
-
-		if src.Namespace == "" && src.IdentityName != "" {
-			merr = multierror.Append(merr, wrapSrcErr(resource.ErrInvalidField{
-				Name:    "source",
-				Wrapped: errSourceWildcards,
-			}))
-		}
-
-		// Excludes are only valid for wildcard sources.
-		if src.IdentityName != "" && len(src.Exclude) > 0 {
-			merr = multierror.Append(merr, wrapSrcErr(resource.ErrInvalidField{
-				Name:    "exclude_sources",
-				Wrapped: errSourceExcludes,
-			}))
-			continue
-		}
-
-		for e, d := range src.Exclude {
-			wrapExclSrcErr := func(err error) error {
-				return wrapErr(resource.ErrInvalidListElement{
-					Name:    "exclude_sources",
-					Index:   e,
-					Wrapped: err,
-				})
-			}
-			if sourceHasIncompatibleTenancies(d) {
-				merr = multierror.Append(merr, wrapExclSrcErr(resource.ErrInvalidField{
-					Name:    "exclude_source",
-					Wrapped: errSourcesTenancy,
-				}))
-			}
-
-			if d.Namespace == "" && d.IdentityName != "" {
-				merr = multierror.Append(merr, wrapExclSrcErr(resource.ErrInvalidField{
-					Name:    "source",
-					Wrapped: errSourceWildcards,
-				}))
-			}
-		}
-	}
-	for d, dest := range p.DestinationRules {
-		wrapDestRuleErr := func(err error) error {
-			return wrapErr(resource.ErrInvalidListElement{
-				Name:    "destination_rules",
-				Index:   d,
-				Wrapped: err,
-			})
-		}
-		if (len(dest.PathExact) > 0 && len(dest.PathPrefix) > 0) ||
-			(len(dest.PathRegex) > 0 && len(dest.PathExact) > 0) ||
-			(len(dest.PathRegex) > 0 && len(dest.PathPrefix) > 0) {
-			merr = multierror.Append(merr, wrapDestRuleErr(resource.ErrInvalidListElement{
-				Name:    "destination_rule",
-				Wrapped: errInvalidPrefixValues,
-			}))
-		}
-		if len(dest.Exclude) > 0 {
-			for e, excl := range dest.Exclude {
-				wrapExclPermRuleErr := func(err error) error {
-					return wrapDestRuleErr(resource.ErrInvalidListElement{
-						Name:    "exclude_permission_rules",
-						Index:   e,
-						Wrapped: err,
-					})
-				}
-				if (len(excl.PathExact) > 0 && len(excl.PathPrefix) > 0) ||
-					(len(excl.PathRegex) > 0 && len(excl.PathExact) > 0) ||
-					(len(excl.PathRegex) > 0 && len(excl.PathPrefix) > 0) {
-					merr = multierror.Append(merr, wrapExclPermRuleErr(resource.ErrInvalidListElement{
-						Name:    "exclude_permission_rule",
-						Wrapped: errInvalidPrefixValues,
-					}))
-				}
-			}
-		}
-	}
-
-	return merr
-}
-
-func sourceHasIncompatibleTenancies(src pbauth.SourceToSpiffe) bool {
-	peerSet := src.GetPeer() != resource.DefaultPeerName
-	apSet := src.GetPartition() != resource.DefaultPartitionName
-	sgSet := src.GetSamenessGroup() != ""
-
-	return (apSet && peerSet) || (apSet && sgSet) || (peerSet && sgSet)
-}
-
-func isLocalPeer(p string) bool {
-	return p == "local" || p == ""
-}
-
-func aclReadHookTrafficPermissions(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, _ *pbresource.ID, res *pbresource.Resource) error {
-	if res == nil {
-		return resource.ErrNeedData
-	}
-	return authorizeDestination(res, func(dest string) error {
-		return authorizer.ToAllowAuthorizer().TrafficPermissionsReadAllowed(dest, authzContext)
-	})
-}
-
-func aclWriteHookTrafficPermissions(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
-	return authorizeDestination(res, func(dest string) error {
-		return authorizer.ToAllowAuthorizer().TrafficPermissionsWriteAllowed(dest, authzContext)
-	})
-}
-
-func aclListHookTrafficPermissions(_ acl.Authorizer, _ *acl.AuthorizerContext) error {
-	// No-op List permission as we want to default to filtering resources
-	// from the list using the Read enforcement
-	return nil
-}
-
-func authorizeDestination(res *pbresource.Resource, intentionAllowed func(string) error) error {
-	tp, err := resource.Decode[*pbauth.TrafficPermissions](res)
-	if err != nil {
-		return err
-	}
-	// Check intention:x permissions for identity
-	err = intentionAllowed(tp.Data.Destination.IdentityName)
-	if err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/internal/auth/internal/types/traffic_permissions_test.go b/internal/auth/internal/types/traffic_permissions_test.go
deleted file mode 100644
index 0948d240b699e..0000000000000
--- a/internal/auth/internal/types/traffic_permissions_test.go
+++ /dev/null
@@ -1,777 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestValidateTrafficPermissions_ParseError(t *testing.T) {
-	data := &pbauth.ComputedTrafficPermissions{AllowPermissions: nil}
-
-	res := resourcetest.Resource(pbauth.TrafficPermissionsType, "tp").
-		WithData(t, data).
-		Build()
-
-	err := ValidateTrafficPermissions(res)
-	require.Error(t, err)
-	require.ErrorAs(t, err, &resource.ErrDataParse{})
-}
-
-func TestValidateTrafficPermissions(t *testing.T) {
-	cases := map[string]struct {
-		tp        *pbauth.TrafficPermissions
-		expectErr string
-	}{
-		"ok-minimal": {
-			tp: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{IdentityName: "wi-1"},
-				Action:      pbauth.Action_ACTION_ALLOW,
-			},
-		},
-		"unspecified-action": {
-			// Any type other than the TrafficPermissions type would work
-			// to cause the error we are expecting
-			tp: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: "wi1",
-				},
-				Action:      pbauth.Action_ACTION_UNSPECIFIED,
-				Permissions: nil,
-			},
-			expectErr: `invalid "data.action" field: action must be either allow or deny`,
-		},
-		"invalid-action": {
-			tp: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: "wi1",
-				},
-				Action:      pbauth.Action(50),
-				Permissions: nil,
-			},
-			expectErr: `invalid "data.action" field: action must be either allow or deny`,
-		},
-		"no-destination": {
-			tp: &pbauth.TrafficPermissions{
-				Action: pbauth.Action_ACTION_ALLOW,
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: nil,
-						DestinationRules: []*pbauth.DestinationRule{
-							{
-								PathExact: "wi2",
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid "data.destination" field: cannot be empty`,
-		},
-		"source-tenancy": {
-			tp: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: "w1",
-				},
-				Action: pbauth.Action_ACTION_ALLOW,
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								Partition:     "ap1",
-								Peer:          "cl1",
-								SamenessGroup: "sg1",
-							},
-						},
-						DestinationRules: nil,
-					},
-				},
-			},
-			expectErr: `invalid element at index 0 of list "permissions": invalid element at index 0 of list "sources": invalid element at index 0 of list "source": permissions sources may not specify partitions, peers, and sameness_groups together`,
-		},
-	}
-
-	for n, tc := range cases {
-		t.Run(n, func(t *testing.T) {
-			res := resourcetest.Resource(pbauth.TrafficPermissionsType, "tp").
-				WithData(t, tc.tp).
-				Build()
-
-			err := ValidateTrafficPermissions(res)
-			if tc.expectErr == "" {
-				require.NoError(t, err)
-			} else {
-				testutil.RequireErrorContains(t, err, tc.expectErr)
-			}
-		})
-	}
-}
-
-type permissionTestCase struct {
-	p         *pbauth.Permission
-	expectErr string
-}
-
-func permissionsTestCases() map[string]permissionTestCase {
-	return map[string]permissionTestCase{
-		"empty": {
-			p:         &pbauth.Permission{},
-			expectErr: `invalid "sources" field: cannot be empty`,
-		},
-		"empty-sources": {
-			p: &pbauth.Permission{
-				Sources: nil,
-				DestinationRules: []*pbauth.DestinationRule{
-					{
-						PathPrefix: "foo",
-						Exclude: []*pbauth.ExcludePermissionRule{
-							{
-								PathExact: "baz",
-							},
-						},
-					},
-					{
-						PathPrefix: "bar",
-					},
-				},
-			},
-			expectErr: `invalid "sources" field: cannot be empty`,
-		},
-		"empty-destination-rules": {
-			p: &pbauth.Permission{
-				Sources: []*pbauth.Source{
-					{
-						// wildcard identity name
-						Namespace: "ns1",
-					},
-					{
-						Namespace: "ns1",
-						Exclude: []*pbauth.ExcludeSource{
-							// wildcard identity name
-							{Namespace: "ns1"},
-						},
-					},
-					{
-						IdentityName: "wi-3",
-						Namespace:    "ns1",
-					},
-				},
-			},
-		},
-		"explicit source with excludes": {
-			p: &pbauth.Permission{
-				Sources: []*pbauth.Source{
-					{
-						IdentityName: "i1",
-						Exclude: []*pbauth.ExcludeSource{
-							{
-								IdentityName: "i1",
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid "exclude_sources" field: must be defined on wildcard sources`,
-		},
-		"source-partition-and-peer": {
-			p: &pbauth.Permission{
-				Sources: []*pbauth.Source{
-					{
-						Partition: "ap1",
-						Peer:      "cluster-01",
-					},
-				},
-			},
-			expectErr: `permissions sources may not specify partitions, peers, and sameness_groups together`,
-		},
-		"source-partition-and-sameness-group": {
-			p: &pbauth.Permission{
-				Sources: []*pbauth.Source{
-					{
-						Partition:     "ap1",
-						SamenessGroup: "sg-1",
-					},
-				},
-			},
-			expectErr: `permissions sources may not specify partitions, peers, and sameness_groups together`,
-		},
-		"source-peer-and-sameness-group": {
-			p: &pbauth.Permission{
-				Sources: []*pbauth.Source{
-					{
-						Partition:     "ap1",
-						SamenessGroup: "sg-1",
-					},
-				},
-			},
-			expectErr: `permissions sources may not specify partitions, peers, and sameness_groups together`,
-		},
-		"exclude-source-partition-and-peer": {
-			p: &pbauth.Permission{
-				Sources: []*pbauth.Source{
-					{
-						Exclude: []*pbauth.ExcludeSource{
-							{
-								Partition: "ap1",
-								Peer:      "cluster-01",
-							},
-						},
-					},
-				},
-			},
-			expectErr: `permissions sources may not specify partitions, peers, and sameness_groups together`,
-		},
-		"exclude-source-partition-and-sameness-group": {
-			p: &pbauth.Permission{
-				Sources: []*pbauth.Source{
-					{
-						Exclude: []*pbauth.ExcludeSource{
-							{
-								Partition:     "ap1",
-								SamenessGroup: "sg-1",
-							},
-						},
-					},
-				},
-			},
-			expectErr: `permissions sources may not specify partitions, peers, and sameness_groups together`,
-		},
-		"exclude-source-peer-and-sameness-group": {
-			p: &pbauth.Permission{
-				Sources: []*pbauth.Source{
-					{
-						Exclude: []*pbauth.ExcludeSource{
-							{
-								Peer:          "ap1",
-								SamenessGroup: "sg-1",
-							},
-						},
-					},
-				},
-			},
-			expectErr: `permissions sources may not specify partitions, peers, and sameness_groups together`,
-		},
-		"destination-rule-path-prefix-regex": {
-			p: &pbauth.Permission{
-				Sources: nil,
-				DestinationRules: []*pbauth.DestinationRule{
-					{
-						PathExact:  "wi2",
-						PathPrefix: "wi",
-						PathRegex:  "wi.*",
-					},
-				},
-			},
-			expectErr: `invalid element at index 0 of list "destination_rule": prefix values, regex values, and explicit names must not combined`,
-		},
-	}
-}
-
-func TestValidateTrafficPermissions_Permissions(t *testing.T) {
-	for n, tc := range permissionsTestCases() {
-		t.Run(n, func(t *testing.T) {
-			tp := &pbauth.TrafficPermissions{
-				Action: pbauth.Action_ACTION_ALLOW,
-				Destination: &pbauth.Destination{
-					IdentityName: "w1",
-				},
-				Permissions: []*pbauth.Permission{tc.p},
-			}
-
-			res := resourcetest.Resource(pbauth.TrafficPermissionsType, "tp").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				WithData(t, tp).
-				Build()
-
-			err := MutateTrafficPermissions(res)
-			require.NoError(t, err)
-
-			err = ValidateTrafficPermissions(res)
-			if tc.expectErr == "" {
-				require.NoError(t, err)
-			} else {
-				testutil.RequireErrorContains(t, err, tc.expectErr)
-			}
-		})
-	}
-}
-
-func TestMutateTrafficPermissions(t *testing.T) {
-	type testcase struct {
-		policyTenancy *pbresource.Tenancy
-		tp            *pbauth.TrafficPermissions
-		expect        *pbauth.TrafficPermissions
-		expectErr     string
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		tenancy := tc.policyTenancy
-		if tenancy == nil {
-			tenancy = resource.DefaultNamespacedTenancy()
-		}
-		res := resourcetest.Resource(pbauth.TrafficPermissionsType, "api").
-			WithTenancy(tenancy).
-			WithData(t, tc.tp).
-			Build()
-
-		err := MutateTrafficPermissions(res)
-
-		got := resourcetest.MustDecode[*pbauth.TrafficPermissions](t, res)
-
-		if tc.expectErr == "" {
-			require.NoError(t, err)
-			prototest.AssertDeepEqual(t, tc.expect, got.Data)
-		} else {
-			testutil.RequireErrorContains(t, err, tc.expectErr)
-		}
-	}
-
-	cases := map[string]testcase{
-		"empty-1": {
-			tp:     &pbauth.TrafficPermissions{},
-			expect: &pbauth.TrafficPermissions{},
-		},
-		"kitchen-sink-default-partition": {
-			tp: &pbauth.TrafficPermissions{
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{},
-							{
-								Peer: "not-default",
-							},
-							{
-								Namespace: "ns1",
-							},
-							{
-								IdentityName: "i1",
-								Namespace:    "ns1",
-								Partition:    "ap1",
-							},
-							{
-								IdentityName: "i1",
-								Namespace:    "ns1",
-								Peer:         "local",
-							},
-						},
-					},
-				},
-			},
-			expect: &pbauth.TrafficPermissions{
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								Partition: "default",
-								Peer:      "local",
-							},
-							{
-								Peer: "not-default",
-							},
-							{
-								Namespace: "ns1",
-								Partition: "default",
-								Peer:      "local",
-							},
-							{
-								IdentityName: "i1",
-								Namespace:    "ns1",
-								Partition:    "ap1",
-								Peer:         "local",
-							},
-							{
-								IdentityName: "i1",
-								Namespace:    "ns1",
-								Partition:    "default",
-								Peer:         "local",
-							},
-						},
-					},
-				},
-			},
-		},
-		"kitchen-sink-excludes-default-partition": {
-			tp: &pbauth.TrafficPermissions{
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								Exclude: []*pbauth.ExcludeSource{
-									{},
-									{
-										Peer: "not-default",
-									},
-									{
-										Namespace: "ns1",
-									},
-									{
-										IdentityName: "i1",
-										Namespace:    "ns1",
-										Partition:    "ap1",
-									},
-									{
-										IdentityName: "i1",
-										Namespace:    "ns1",
-										Peer:         "local",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			expect: &pbauth.TrafficPermissions{
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								Partition: "default",
-								Peer:      "local",
-								Exclude: []*pbauth.ExcludeSource{
-									{
-										Partition: "default",
-										Peer:      "local",
-									},
-									{
-										Peer: "not-default",
-									},
-									{
-										Namespace: "ns1",
-										Partition: "default",
-										Peer:      "local",
-									},
-									{
-										IdentityName: "i1",
-										Namespace:    "ns1",
-										Partition:    "ap1",
-										Peer:         "local",
-									},
-									{
-										IdentityName: "i1",
-										Namespace:    "ns1",
-										Partition:    "default",
-										Peer:         "local",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		"kitchen-sink-non-default-partition": {
-			policyTenancy: &pbresource.Tenancy{
-				Partition: "ap1",
-				Namespace: "ns3",
-				PeerName:  "local",
-			},
-			tp: &pbauth.TrafficPermissions{
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{},
-							{
-								Peer: "not-default",
-							},
-							{
-								Namespace: "ns1",
-							},
-							{
-								IdentityName: "i1",
-								Namespace:    "ns1",
-								Partition:    "ap5",
-							},
-							{
-								IdentityName: "i1",
-								Namespace:    "ns1",
-								Peer:         "local",
-							},
-							{
-								IdentityName: "i2",
-							},
-							{
-								IdentityName: "i2",
-								Partition:    "non-default",
-							},
-						},
-					},
-				},
-			},
-			expect: &pbauth.TrafficPermissions{
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								Partition: "ap1",
-								Namespace: "",
-								Peer:      "local",
-							},
-							{
-								Peer: "not-default",
-							},
-							{
-								Namespace: "ns1",
-								Partition: "ap1",
-								Peer:      "local",
-							},
-							{
-								IdentityName: "i1",
-								Namespace:    "ns1",
-								Partition:    "ap5",
-								Peer:         "local",
-							},
-							{
-								IdentityName: "i1",
-								Namespace:    "ns1",
-								Partition:    "ap1",
-								Peer:         "local",
-							},
-							{
-								IdentityName: "i2",
-								Namespace:    "ns3",
-								Partition:    "ap1",
-								Peer:         "local",
-							},
-							{
-								IdentityName: "i2",
-								Namespace:    "default",
-								Partition:    "non-default",
-								Peer:         "local",
-							},
-						},
-					},
-				},
-			},
-		},
-		"kitchen-sink-excludes-non-default-partition": {
-			policyTenancy: &pbresource.Tenancy{
-				Partition: "ap1",
-				Namespace: "ns3",
-				PeerName:  "local",
-			},
-			tp: &pbauth.TrafficPermissions{
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								Exclude: []*pbauth.ExcludeSource{
-									{},
-									{
-										Peer: "not-default",
-									},
-									{
-										Namespace: "ns1",
-									},
-									{
-										IdentityName: "i1",
-										Namespace:    "ns1",
-										Partition:    "ap5",
-									},
-									{
-										IdentityName: "i1",
-										Namespace:    "ns1",
-										Peer:         "local",
-									},
-									{
-										IdentityName: "i2",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			expect: &pbauth.TrafficPermissions{
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								Partition: "ap1",
-								Peer:      "local",
-								Exclude: []*pbauth.ExcludeSource{
-									{
-										Partition: "ap1",
-										Namespace: "",
-										Peer:      "local",
-									},
-									{
-										Peer: "not-default",
-									},
-									{
-										Namespace: "ns1",
-										Partition: "ap1",
-										Peer:      "local",
-									},
-									{
-										IdentityName: "i1",
-										Namespace:    "ns1",
-										Partition:    "ap5",
-										Peer:         "local",
-									},
-									{
-										IdentityName: "i1",
-										Namespace:    "ns1",
-										Partition:    "ap1",
-										Peer:         "local",
-									},
-									{
-										IdentityName: "i2",
-										Namespace:    "ns3",
-										Partition:    "ap1",
-										Peer:         "local",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func TestTrafficPermissionsACLs(t *testing.T) {
-	// Wire up a registry to generically invoke hooks
-	registry := resource.NewRegistry()
-	Register(registry)
-
-	type testcase struct {
-		rules   string
-		check   func(t *testing.T, authz acl.Authorizer, res *pbresource.Resource)
-		readOK  string
-		writeOK string
-		listOK  string
-	}
-
-	const (
-		DENY    = "deny"
-		ALLOW   = "allow"
-		DEFAULT = "default"
-	)
-
-	checkF := func(t *testing.T, expect string, got error) {
-		switch expect {
-		case ALLOW:
-			if acl.IsErrPermissionDenied(got) {
-				t.Fatal("should be allowed")
-			}
-		case DENY:
-			if !acl.IsErrPermissionDenied(got) {
-				t.Fatal("should be denied")
-			}
-		case DEFAULT:
-			require.Nil(t, got, "expected fallthrough decision")
-		default:
-			t.Fatalf("unexpected expectation: %q", expect)
-		}
-	}
-
-	reg, ok := registry.Resolve(pbauth.TrafficPermissionsType)
-	require.True(t, ok)
-
-	run := func(t *testing.T, tc testcase) {
-		tpData := &pbauth.TrafficPermissions{
-			Destination: &pbauth.Destination{IdentityName: "wi1"},
-			Action:      pbauth.Action_ACTION_ALLOW,
-		}
-		res := resourcetest.Resource(pbauth.TrafficPermissionsType, "tp1").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, tpData).
-			Build()
-		resourcetest.ValidateAndNormalize(t, registry, res)
-
-		config := acl.Config{
-			WildcardName: structs.WildcardSpecifier,
-		}
-		authz, err := acl.NewAuthorizerFromRules(tc.rules, &config, nil)
-		require.NoError(t, err)
-		authz = acl.NewChainedAuthorizer([]acl.Authorizer{authz, acl.DenyAll()})
-
-		t.Run("read", func(t *testing.T) {
-			err := reg.ACLs.Read(authz, &acl.AuthorizerContext{}, res.Id, res)
-			checkF(t, tc.readOK, err)
-		})
-		t.Run("write", func(t *testing.T) {
-			err := reg.ACLs.Write(authz, &acl.AuthorizerContext{}, res)
-			checkF(t, tc.writeOK, err)
-		})
-		t.Run("list", func(t *testing.T) {
-			err := reg.ACLs.List(authz, &acl.AuthorizerContext{})
-			checkF(t, tc.listOK, err)
-		})
-	}
-
-	cases := map[string]testcase{
-		"no rules": {
-			rules:   ``,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity w1 read, no intentions": {
-			rules:   `identity "wi1" { policy = "read" }`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity w1 read, deny intentions": {
-			rules:   `identity "wi1" { policy = "read", intentions = "deny" }`,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity w1 read, intentions read": {
-			rules:   `identity "wi1" { policy = "read", intentions = "read" }`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity w1 write, write intentions": {
-			rules:   `identity "wi1" { policy = "read", intentions = "write" }`,
-			readOK:  ALLOW,
-			writeOK: ALLOW,
-			listOK:  DEFAULT,
-		},
-		"workload identity w1 write, deny intentions": {
-			rules:   `identity "wi1" { policy = "write", intentions = "deny" }`,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity w1 write, intentions read": {
-			rules:   `identity "wi1" { policy = "write", intentions = "read" }`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity w1 write, intentions write": {
-			rules:   `identity "wi1" { policy = "write", intentions = "write" }`,
-			readOK:  ALLOW,
-			writeOK: ALLOW,
-			listOK:  DEFAULT,
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
diff --git a/internal/auth/internal/types/types.go b/internal/auth/internal/types/types.go
deleted file mode 100644
index 46fc49e1b75fe..0000000000000
--- a/internal/auth/internal/types/types.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-)
-
-func Register(r resource.Registry) {
-	RegisterWorkloadIdentity(r)
-	RegisterTrafficPermissions(r)
-	RegisterComputedTrafficPermission(r)
-}
diff --git a/internal/auth/internal/types/workload_identity.go b/internal/auth/internal/types/workload_identity.go
deleted file mode 100644
index 5379d256ba4f9..0000000000000
--- a/internal/auth/internal/types/workload_identity.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterWorkloadIdentity(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:  pbauth.WorkloadIdentityType,
-		Proto: &pbauth.WorkloadIdentity{},
-		Scope: resource.ScopeNamespace,
-		ACLs: &resource.ACLHooks{
-			Read:  aclReadHookWorkloadIdentity,
-			Write: aclWriteHookWorkloadIdentity,
-			List:  aclListHookWorkloadIdentity,
-		},
-		Validate: nil,
-	})
-}
-
-func aclReadHookWorkloadIdentity(
-	authorizer acl.Authorizer,
-	authzCtx *acl.AuthorizerContext,
-	id *pbresource.ID,
-	res *pbresource.Resource,
-) error {
-	if id != nil {
-		return authorizer.ToAllowAuthorizer().IdentityReadAllowed(id.Name, authzCtx)
-	}
-	if res != nil {
-		return authorizer.ToAllowAuthorizer().IdentityReadAllowed(res.Id.Name, authzCtx)
-	}
-	return resource.ErrNeedData
-}
-
-func aclWriteHookWorkloadIdentity(
-	authorizer acl.Authorizer,
-	authzCtx *acl.AuthorizerContext,
-	res *pbresource.Resource) error {
-	if res == nil {
-		return resource.ErrNeedData
-	}
-	return authorizer.ToAllowAuthorizer().IdentityWriteAllowed(res.Id.Name, authzCtx)
-}
-
-func aclListHookWorkloadIdentity(authorizer acl.Authorizer, context *acl.AuthorizerContext) error {
-	// No-op List permission as we want to default to filtering resources
-	// from the list using the Read enforcement
-	return nil
-}
diff --git a/internal/auth/internal/types/workload_identity_test.go b/internal/auth/internal/types/workload_identity_test.go
deleted file mode 100644
index 1ca59952ecee3..0000000000000
--- a/internal/auth/internal/types/workload_identity_test.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func TestWorkloadIdentityACLs(t *testing.T) {
-	const (
-		DENY    = "deny"
-		ALLOW   = "allow"
-		DEFAULT = "default"
-	)
-
-	registry := resource.NewRegistry()
-	Register(registry)
-
-	reg, ok := registry.Resolve(pbauth.WorkloadIdentityType)
-	require.True(t, ok)
-
-	type testcase struct {
-		rules   string
-		check   func(t *testing.T, authz acl.Authorizer, res *pbresource.Resource)
-		readOK  string
-		writeOK string
-		listOK  string
-	}
-
-	checkF := func(t *testing.T, expect string, got error) {
-		switch expect {
-		case ALLOW:
-			if acl.IsErrPermissionDenied(got) {
-				t.Fatal("should be allowed")
-			}
-		case DENY:
-			if !acl.IsErrPermissionDenied(got) {
-				t.Fatal("should be denied")
-			}
-		case DEFAULT:
-			require.Nil(t, got, "expected fallthrough decision")
-		default:
-			t.Fatalf("unexpected expectation: %q", expect)
-		}
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		wid := &pbauth.WorkloadIdentity{}
-		res := resourcetest.Resource(pbauth.WorkloadIdentityType, "wi1").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, wid).
-			Build()
-		resourcetest.ValidateAndNormalize(t, registry, res)
-
-		config := acl.Config{
-			WildcardName: structs.WildcardSpecifier,
-		}
-		authz, err := acl.NewAuthorizerFromRules(tc.rules, &config, nil)
-		require.NoError(t, err)
-		authz = acl.NewChainedAuthorizer([]acl.Authorizer{authz, acl.DenyAll()})
-
-		t.Run("read", func(t *testing.T) {
-			err := reg.ACLs.Read(authz, &acl.AuthorizerContext{}, res.Id, res)
-			checkF(t, tc.readOK, err)
-		})
-		t.Run("write", func(t *testing.T) {
-			err := reg.ACLs.Write(authz, &acl.AuthorizerContext{}, res)
-			checkF(t, tc.writeOK, err)
-		})
-		t.Run("list", func(t *testing.T) {
-			err := reg.ACLs.List(authz, &acl.AuthorizerContext{})
-			checkF(t, tc.listOK, err)
-		})
-		t.Run("errors", func(t *testing.T) {
-			require.ErrorIs(t, reg.ACLs.Read(authz, &acl.AuthorizerContext{}, nil, nil), resource.ErrNeedData)
-			require.ErrorIs(t, reg.ACLs.Write(authz, &acl.AuthorizerContext{}, nil), resource.ErrNeedData)
-		})
-	}
-
-	cases := map[string]testcase{
-		"no rules": {
-			rules:   ``,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity wi1 read, no intentions": {
-			rules:   `identity "wi1" { policy = "read" }`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity wi1 read, deny intentions has no effect": {
-			rules:   `identity "wi1" { policy = "read", intentions = "deny" }`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity wi1 read, intentions read has no effect": {
-			rules:   `identity "wi1" { policy = "read", intentions = "read" }`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity wi1 write, write intentions has no effect": {
-			rules:   `identity "wi1" { policy = "read", intentions = "write" }`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"workload identity wi1 write, deny intentions has no effect": {
-			rules:   `identity "wi1" { policy = "write", intentions = "deny" }`,
-			readOK:  ALLOW,
-			writeOK: ALLOW,
-			listOK:  DEFAULT,
-		},
-		"workload identity wi1 write, intentions read has no effect": {
-			rules:   `identity "wi1" { policy = "write", intentions = "read" }`,
-			readOK:  ALLOW,
-			writeOK: ALLOW,
-			listOK:  DEFAULT,
-		},
-		"workload identity wi1 write, intentions write": {
-			rules:   `identity "wi1" { policy = "write", intentions = "write" }`,
-			readOK:  ALLOW,
-			writeOK: ALLOW,
-			listOK:  DEFAULT,
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-service.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-service.json
deleted file mode 100644
index 5509e726d8dce..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-service.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Service"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Service",
-      "workloads": {
-         "prefixes": [
-            "api-"
-         ]
-      },
-      "ports": [
-         {
-            "target_port": "http",
-            "protocol": "PROTOCOL_HTTP"
-         },
-         {
-            "target_port": "grpc",
-            "protocol": "PROTOCOL_GRPC"
-         },
-         {
-            "target_port": "mesh",
-            "protocol": "PROTOCOL_MESH"
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-1-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-1-health.json
deleted file mode 100644
index d64671960ad73..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-1-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-1-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-1"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_PASSING"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-1.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-1.json
deleted file mode 100644
index fe7d6318fb507..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-1.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-1"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.1"
-         },
-         {
-            "host": "198.18.2.1",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-1"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-10-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-10-health.json
deleted file mode 100644
index f1f4c05968872..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-10-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-10-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-10"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_WARNING"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-10.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-10.json
deleted file mode 100644
index 768cab21d0205..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-10.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-10"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.10"
-         },
-         {
-            "host": "198.18.2.10",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-3"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-11-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-11-health.json
deleted file mode 100644
index 4c266d4e2a765..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-11-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-11-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-11"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_CRITICAL"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-11.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-11.json
deleted file mode 100644
index c0110034565f1..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-11.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-11"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.11"
-         },
-         {
-            "host": "198.18.2.11",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-3"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-12-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-12-health.json
deleted file mode 100644
index 9b8079ed4a8d8..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-12-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-12-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-12"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_MAINTENANCE"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-12.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-12.json
deleted file mode 100644
index 0c406c0ecdcb8..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-12.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-12"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.12"
-         },
-         {
-            "host": "198.18.2.12",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-3"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-13-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-13-health.json
deleted file mode 100644
index 346ebfb2f4898..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-13-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-13-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-13"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_PASSING"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-13.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-13.json
deleted file mode 100644
index acedb1ebd4771..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-13.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-13"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.13"
-         },
-         {
-            "host": "198.18.2.13",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-4"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-14-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-14-health.json
deleted file mode 100644
index 9a97dfda14394..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-14-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-14-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-14"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_WARNING"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-14.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-14.json
deleted file mode 100644
index fefe9dabcf3bd..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-14.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-14"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.14"
-         },
-         {
-            "host": "198.18.2.14",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-4"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-15-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-15-health.json
deleted file mode 100644
index b289dd269e680..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-15-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-15-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-15"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_CRITICAL"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-15.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-15.json
deleted file mode 100644
index faddd57fe7042..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-15.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-15"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.15"
-         },
-         {
-            "host": "198.18.2.15",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-4"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-16-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-16-health.json
deleted file mode 100644
index e4de67be793ef..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-16-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-16-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-16"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_MAINTENANCE"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-16.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-16.json
deleted file mode 100644
index 46590c467fb3a..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-16.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-16"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.16"
-         },
-         {
-            "host": "198.18.2.16",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-4"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-17-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-17-health.json
deleted file mode 100644
index e9955bf2097ee..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-17-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-17-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-17"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_PASSING"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-17.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-17.json
deleted file mode 100644
index bf3069201f5d9..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-17.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-17"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.17"
-         },
-         {
-            "host": "198.18.2.17",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-18-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-18-health.json
deleted file mode 100644
index ec8490601267e..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-18-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-18-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-18"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_WARNING"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-18.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-18.json
deleted file mode 100644
index cb96652199b69..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-18.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-18"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.18"
-         },
-         {
-            "host": "198.18.2.18",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-19-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-19-health.json
deleted file mode 100644
index d353aac240e21..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-19-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-19-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-19"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_CRITICAL"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-19.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-19.json
deleted file mode 100644
index dcf2cf4b03405..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-19.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-19"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.19"
-         },
-         {
-            "host": "198.18.2.19",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-2-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-2-health.json
deleted file mode 100644
index 08165a75d0a65..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-2-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-2-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-2"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_WARNING"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-2.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-2.json
deleted file mode 100644
index cc2ea0fdc26e7..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-2.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-2"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.2"
-         },
-         {
-            "host": "198.18.2.2",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-1"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-20-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-20-health.json
deleted file mode 100644
index 49283150584c7..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-20-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-20-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-20"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_MAINTENANCE"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-20.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-20.json
deleted file mode 100644
index 315874eeaf2b5..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-20.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-20"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.20"
-         },
-         {
-            "host": "198.18.2.20",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-3-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-3-health.json
deleted file mode 100644
index 44bc2a3531bb5..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-3-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-3-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-3"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_CRITICAL"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-3.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-3.json
deleted file mode 100644
index 2ecd501d6e989..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-3.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-3"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.3"
-         },
-         {
-            "host": "198.18.2.3",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-1"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-4-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-4-health.json
deleted file mode 100644
index 5ead7793f1207..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-4-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-4-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-4"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_MAINTENANCE"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-4.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-4.json
deleted file mode 100644
index 639fdd3f6773a..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-4"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.4"
-         },
-         {
-            "host": "198.18.2.4",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-1"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-5-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-5-health.json
deleted file mode 100644
index f2f1013f20217..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-5-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-5-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-5"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_PASSING"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-5.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-5.json
deleted file mode 100644
index 0e19253d4df5b..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-5.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-5"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.5"
-         },
-         {
-            "host": "198.18.2.5",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-2"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-6-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-6-health.json
deleted file mode 100644
index ef0bef454b665..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-6-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-6-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-6"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_WARNING"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-6.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-6.json
deleted file mode 100644
index fe9780e946980..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-6.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-6"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.6"
-         },
-         {
-            "host": "198.18.2.6",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-2"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-7-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-7-health.json
deleted file mode 100644
index f3c963481e0da..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-7-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-7-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-7"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_CRITICAL"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-7.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-7.json
deleted file mode 100644
index 7199c042b8a64..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-7.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-7"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.7"
-         },
-         {
-            "host": "198.18.2.7",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-2"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-8-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-8-health.json
deleted file mode 100644
index e55348b1ea357..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-8-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-8-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-8"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_MAINTENANCE"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-8.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-8.json
deleted file mode 100644
index 8828e1ee2653c..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-8.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-8"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.8"
-         },
-         {
-            "host": "198.18.2.8",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-2"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-9-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-9-health.json
deleted file mode 100644
index 81ac189b173b0..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-9-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-9-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-9"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_PASSING"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-9.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-9.json
deleted file mode 100644
index 1c02d466fbfe8..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/api-workload-9.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Workload"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "api-9"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Workload",
-      "addresses": [
-         {
-            "host": "172.16.1.9"
-         },
-         {
-            "host": "198.18.2.9",
-            "external": true,
-            "ports": [
-               "mesh"
-            ]
-         }
-      ],
-      "ports": {
-         "http": {
-            "port": 8080,
-            "protocol": "PROTOCOL_HTTP"
-         },
-         "grpc": {
-            "port": 9090,
-            "protocol": "PROTOCOL_GRPC"
-         },
-         "mesh": {
-            "port": 10000,
-            "protocol": "PROTOCOL_MESH"
-         }
-      },
-      "identity": "api",
-      "node_name": "node-3"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/foo-service-endpoints.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/foo-service-endpoints.json
deleted file mode 100644
index fe7925a885010..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/foo-service-endpoints.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "ServiceEndpoints"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "foo"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Service"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "foo"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.ServiceEndpoints",
-      "endpoints": [
-         {
-            "addresses": [
-               {
-                  "host": "198.18.0.1"
-               }
-            ],
-            "ports": {
-               "external-service-port": {
-                  "port": 9876,
-                  "protocol": "PROTOCOL_HTTP2"
-               }
-            },
-            "health_status": "HEALTH_PASSING"
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/foo-service.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/foo-service.json
deleted file mode 100644
index bbe87511e17e0..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/foo-service.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Service"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "foo"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Service",
-      "ports": [
-         {
-            "target_port": "external-service-port",
-            "protocol": "PROTOCOL_HTTP2"
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/grpc-api-service.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/grpc-api-service.json
deleted file mode 100644
index 7dff2ee10ff34..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/grpc-api-service.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Service"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "grpc-api"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Service",
-      "workloads": {
-         "names": [
-            "api-1",
-            "api-2",
-            "api-3",
-            "api-4",
-            "api-5",
-            "api-6",
-            "api-7",
-            "api-8",
-            "api-9",
-            "api-20"
-         ]
-      },
-      "ports": [
-         {
-            "target_port": "grpc",
-            "protocol": "PROTOCOL_GRPC"
-         },
-         {
-            "target_port": "mesh",
-            "protocol": "PROTOCOL_MESH"
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/http-api-service.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/http-api-service.json
deleted file mode 100644
index 02b80d29aef65..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/http-api-service.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Service"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "http-api"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Service",
-      "workloads": {
-         "prefixes": [
-            "api-1"
-         ]
-      },
-      "ports": [
-         {
-            "target_port": "http",
-            "protocol": "PROTOCOL_HTTP"
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1-health.json
deleted file mode 100644
index 705eeb6ced262..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "node-1-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Node"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "node-1"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_PASSING"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1.json
deleted file mode 100644
index a190e5bc1ab1e..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Node"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "node-1"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Node",
-      "addresses": [
-         {
-            "host": "198.18.1.1",
-            "external": true
-         },
-         {
-            "host": "172.16.0.1"
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2-health.json
deleted file mode 100644
index 1e9baaefde5ec..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "node-2-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Node"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "node-2"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_WARNING"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2.json
deleted file mode 100644
index 218f8d1ae35bb..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Node"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "node-2"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Node",
-      "addresses": [
-         {
-            "host": "198.18.1.2",
-            "external": true
-         },
-         {
-            "host": "172.16.0.2"
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3-health.json
deleted file mode 100644
index 5e2df1a13f8b1..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "node-3-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Node"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "node-3"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_CRITICAL"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3.json
deleted file mode 100644
index f02361cd58faa..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Node"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "node-3"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Node",
-      "addresses": [
-         {
-            "host": "198.18.1.3",
-            "external": true
-         },
-         {
-            "host": "172.16.0.3"
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4-health.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4-health.json
deleted file mode 100644
index f403c929b4eae..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "HealthStatus"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "node-4-health"
-   },
-   "owner": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Node"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "node-4"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
-      "type": "synthetic",
-      "status": "HEALTH_MAINTENANCE"
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4.json
deleted file mode 100644
index c66e70fd0c64e..0000000000000
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-   "id": {
-      "type": {
-         "group": "catalog",
-         "group_version": "v2beta1",
-         "kind": "Node"
-      },
-      "tenancy": {
-         "partition": "default",
-         "namespace": "default",
-         "peer_name": "local"
-      },
-      "name": "node-4"
-   },
-   "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.Node",
-      "addresses": [
-         {
-            "host": "198.18.1.4",
-            "external": true
-         },
-         {
-            "host": "172.16.0.4"
-         }
-      ]
-   }
-}
\ No newline at end of file
diff --git a/internal/catalog/catalogtest/run_test.go b/internal/catalog/catalogtest/run_test.go
deleted file mode 100644
index 2c12785bbb0be..0000000000000
--- a/internal/catalog/catalogtest/run_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package catalogtest
-
-import (
-	"testing"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource/reaper"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func runInMemResourceServiceAndControllers(t *testing.T, deps controllers.Dependencies) pbresource.ResourceServiceClient {
-	t.Helper()
-
-	ctx := testutil.TestContext(t)
-
-	// Create the in-mem resource service
-	client := svctest.RunResourceService(t, catalog.RegisterTypes)
-
-	// Setup/Run the controller manager
-	mgr := controller.NewManager(client, testutil.Logger(t))
-	catalog.RegisterControllers(mgr, deps)
-
-	// We also depend on the reaper to take care of cleaning up owned health statuses and
-	// service endpoints so we must enable that controller as well
-	reaper.RegisterControllers(mgr)
-	mgr.SetRaftLeader(true)
-	go mgr.Run(ctx)
-
-	return client
-}
-
-func TestControllers_Integration(t *testing.T) {
-	client := runInMemResourceServiceAndControllers(t, catalog.DefaultControllerDependencies())
-	RunCatalogV1Alpha1IntegrationTest(t, client)
-}
-
-func TestControllers_Lifecycle(t *testing.T) {
-	client := runInMemResourceServiceAndControllers(t, catalog.DefaultControllerDependencies())
-	RunCatalogV2Beta1LifecycleIntegrationTest(t, client)
-}
diff --git a/internal/catalog/catalogtest/test_integration_v2beta1.go b/internal/catalog/catalogtest/test_integration_v2beta1.go
deleted file mode 100644
index 9f83ab3655912..0000000000000
--- a/internal/catalog/catalogtest/test_integration_v2beta1.go
+++ /dev/null
@@ -1,752 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package catalogtest
-
-import (
-	"embed"
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/endpoints"
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/nodehealth"
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/workloadhealth"
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-var (
-	//go:embed integration_test_data
-	testData embed.FS
-)
-
-// RunCatalogV1Alpha1IntegrationTest will push up a bunch of catalog related data and then
-// verify that all the expected reconciliations happened correctly. This test is
-// intended to exercise a large swathe of behavior of the overall catalog package.
-// Besides just controller reconciliation behavior, the intent is also to verify
-// that integrations with the resource service are also working (i.e. the various
-// validation, mutation and ACL hooks get invoked and are working properly)
-//
-// This test specifically is not doing any sort of lifecycle related tests to ensure
-// that modification to values results in re-reconciliation as expected. Instead there
-// is another RunCatalogIntegrationTestLifeCycle function that can be used for those
-// purposes. The two are distinct so that the data being published and the assertions
-// made against the system can be reused in upgrade tests.
-func RunCatalogV1Alpha1IntegrationTest(t *testing.T, client pbresource.ResourceServiceClient) {
-	t.Helper()
-
-	PublishCatalogV2Beta1IntegrationTestData(t, client)
-	VerifyCatalogV2Beta1IntegrationTestResults(t, client)
-}
-
-// PublishCatalogV2Beta1IntegrationTestData will perform a whole bunch of resource writes
-// for Service, ServiceEndpoints, Workload, Node and HealthStatus objects
-func PublishCatalogV2Beta1IntegrationTestData(t *testing.T, client pbresource.ResourceServiceClient) {
-	t.Helper()
-
-	c := rtest.NewClient(client)
-
-	resources := rtest.ParseResourcesFromFilesystem(t, testData, "integration_test_data/v2beta1")
-	c.PublishResources(t, resources)
-}
-
-func VerifyCatalogV2Beta1IntegrationTestResults(t *testing.T, client pbresource.ResourceServiceClient) {
-	t.Helper()
-
-	c := rtest.NewClient(client)
-
-	testutil.RunStep(t, "resources-exist", func(t *testing.T) {
-		c.RequireResourceExists(t, rtest.Resource(pbcatalog.ServiceType, "api").ID())
-		c.RequireResourceExists(t, rtest.Resource(pbcatalog.ServiceType, "http-api").ID())
-		c.RequireResourceExists(t, rtest.Resource(pbcatalog.ServiceType, "grpc-api").ID())
-		c.RequireResourceExists(t, rtest.Resource(pbcatalog.ServiceType, "foo").ID())
-
-		for i := 1; i < 5; i++ {
-			nodeId := rtest.Resource(pbcatalog.NodeType, fmt.Sprintf("node-%d", i)).WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-			c.RequireResourceExists(t, nodeId)
-
-			res := c.RequireResourceExists(t, rtest.Resource(pbcatalog.HealthStatusType, fmt.Sprintf("node-%d-health", i)).ID())
-			rtest.RequireOwner(t, res, nodeId, true)
-		}
-
-		for i := 1; i < 21; i++ {
-			workloadId := rtest.Resource(pbcatalog.WorkloadType, fmt.Sprintf("api-%d", i)).WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-			c.RequireResourceExists(t, workloadId)
-
-			res := c.RequireResourceExists(t, rtest.Resource(pbcatalog.HealthStatusType, fmt.Sprintf("api-%d-health", i)).ID())
-			rtest.RequireOwner(t, res, workloadId, true)
-		}
-	})
-
-	testutil.RunStep(t, "node-health-reconciliation", func(t *testing.T) {
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.NodeType, "node-1").ID(), nodehealth.StatusKey, nodehealth.ConditionPassing)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.NodeType, "node-2").ID(), nodehealth.StatusKey, nodehealth.ConditionWarning)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.NodeType, "node-3").ID(), nodehealth.StatusKey, nodehealth.ConditionCritical)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.NodeType, "node-4").ID(), nodehealth.StatusKey, nodehealth.ConditionMaintenance)
-	})
-
-	testutil.RunStep(t, "workload-health-reconciliation", func(t *testing.T) {
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-1").ID(), workloadhealth.StatusKey, workloadhealth.ConditionNodeAndWorkloadPassing)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-2").ID(), workloadhealth.StatusKey, workloadhealth.ConditionWorkloadWarning)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-3").ID(), workloadhealth.StatusKey, workloadhealth.ConditionWorkloadCritical)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-4").ID(), workloadhealth.StatusKey, workloadhealth.ConditionWorkloadMaintenance)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-5").ID(), workloadhealth.StatusKey, workloadhealth.ConditionNodeWarning)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-6").ID(), workloadhealth.StatusKey, workloadhealth.ConditionNodeAndWorkloadWarning)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-7").ID(), workloadhealth.StatusKey, workloadhealth.ConditionNodeAndWorkloadCritical)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-8").ID(), workloadhealth.StatusKey, workloadhealth.ConditionNodeAndWorkloadMaintenance)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-9").ID(), workloadhealth.StatusKey, workloadhealth.ConditionNodeCritical)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-10").ID(), workloadhealth.StatusKey, workloadhealth.ConditionNodeAndWorkloadCritical)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-11").ID(), workloadhealth.StatusKey, workloadhealth.ConditionNodeAndWorkloadCritical)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-12").ID(), workloadhealth.StatusKey, workloadhealth.ConditionNodeAndWorkloadMaintenance)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-13").ID(), workloadhealth.StatusKey, workloadhealth.ConditionNodeMaintenance)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-14").ID(), workloadhealth.StatusKey, workloadhealth.ConditionNodeAndWorkloadMaintenance)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-15").ID(), workloadhealth.StatusKey, workloadhealth.ConditionNodeAndWorkloadMaintenance)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-16").ID(), workloadhealth.StatusKey, workloadhealth.ConditionNodeAndWorkloadMaintenance)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-17").ID(), workloadhealth.StatusKey, workloadhealth.ConditionWorkloadPassing)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-18").ID(), workloadhealth.StatusKey, workloadhealth.ConditionWorkloadWarning)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-19").ID(), workloadhealth.StatusKey, workloadhealth.ConditionWorkloadCritical)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.WorkloadType, "api-20").ID(), workloadhealth.StatusKey, workloadhealth.ConditionWorkloadMaintenance)
-	})
-
-	testutil.RunStep(t, "service-reconciliation", func(t *testing.T) {
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.ServiceType, "foo").ID(), endpoints.StatusKey, endpoints.ConditionUnmanaged)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.ServiceType, "api").ID(), endpoints.StatusKey, endpoints.ConditionManaged)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.ServiceType, "http-api").ID(), endpoints.StatusKey, endpoints.ConditionManaged)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.ServiceType, "grpc-api").ID(), endpoints.StatusKey, endpoints.ConditionManaged)
-	})
-
-	testutil.RunStep(t, "service-endpoints-generation", func(t *testing.T) {
-		verifyServiceEndpoints(t, c, rtest.Resource(pbcatalog.ServiceEndpointsType, "foo").ID(), expectedFooServiceEndpoints())
-		verifyServiceEndpoints(t, c, rtest.Resource(pbcatalog.ServiceEndpointsType, "api").ID(), expectedApiServiceEndpoints(t, c))
-		verifyServiceEndpoints(t, c, rtest.Resource(pbcatalog.ServiceEndpointsType, "http-api").ID(), expectedHTTPApiServiceEndpoints(t, c))
-		verifyServiceEndpoints(t, c, rtest.Resource(pbcatalog.ServiceEndpointsType, "grpc-api").ID(), expectedGRPCApiServiceEndpoints(t, c))
-	})
-}
-
-func expectedFooServiceEndpoints() *pbcatalog.ServiceEndpoints {
-	return &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "198.18.0.1"},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"external-service-port": {
-						Port:     9876,
-						Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2,
-					},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-			},
-		},
-	}
-}
-
-func expectedApiServiceEndpoints(t *testing.T, c *rtest.Client) *pbcatalog.ServiceEndpoints {
-	return &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			// api-1
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-1").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.1", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.1", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-				Identity:     "api",
-			},
-			// api-2
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-2").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.2", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.2", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_WARNING,
-				Identity:     "api",
-			},
-			// api-3
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-3").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.3", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.3", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-				Identity:     "api",
-			},
-			// api-4
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-4").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.4", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.4", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-			// api-5
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-5").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.5", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.5", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_WARNING,
-				Identity:     "api",
-			},
-			// api-6
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-6").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.6", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.6", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_WARNING,
-				Identity:     "api",
-			},
-			// api-7
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-7").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.7", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.7", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-				Identity:     "api",
-			},
-			// api-8
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-8").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.8", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.8", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-			// api-9
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-9").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.9", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.9", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-				Identity:     "api",
-			},
-			// api-10
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-10").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.10", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.10", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-				Identity:     "api",
-			},
-			// api-11
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-11").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.11", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.11", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-				Identity:     "api",
-			},
-			// api-12
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-12").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.12", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.12", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-			// api-13
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-13").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.13", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.13", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-			// api-14
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-14").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.14", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.14", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-			// api-15
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-15").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.15", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.15", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-			// api-16
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-16").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.16", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.16", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-			// api-17
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-17").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.17", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.17", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-				Identity:     "api",
-			},
-			// api-18
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-18").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.18", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.18", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_WARNING,
-				Identity:     "api",
-			},
-			// api-19
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-19").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.19", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.19", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-				Identity:     "api",
-			},
-			// api-20
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-20").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.20", Ports: []string{"grpc", "http", "mesh"}},
-					{Host: "198.18.2.20", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-		},
-	}
-}
-
-func expectedHTTPApiServiceEndpoints(t *testing.T, c *rtest.Client) *pbcatalog.ServiceEndpoints {
-	return &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			// api-1
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-1").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.1", Ports: []string{"http"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-				Identity:     "api",
-			},
-			// api-10
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-10").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.10", Ports: []string{"http"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-				Identity:     "api",
-			},
-			// api-11
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-11").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.11", Ports: []string{"http"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-				Identity:     "api",
-			},
-			// api-12
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-12").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.12", Ports: []string{"http"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-			// api-13
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-13").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.13", Ports: []string{"http"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-			// api-14
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-14").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.14", Ports: []string{"http"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-			// api-15
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-15").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.15", Ports: []string{"http"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-			// api-16
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-16").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.16", Ports: []string{"http"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-			// api-17
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-17").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.17", Ports: []string{"http"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-				Identity:     "api",
-			},
-			// api-18
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-18").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.18", Ports: []string{"http"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_WARNING,
-				Identity:     "api",
-			},
-			// api-19
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-19").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.19", Ports: []string{"http"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-				Identity:     "api",
-			},
-		},
-	}
-}
-
-func expectedGRPCApiServiceEndpoints(t *testing.T, c *rtest.Client) *pbcatalog.ServiceEndpoints {
-	return &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			// api-1
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-1").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.1", Ports: []string{"grpc", "mesh"}},
-					{Host: "198.18.2.1", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-				Identity:     "api",
-			},
-			// api-2
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-2").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.2", Ports: []string{"grpc", "mesh"}},
-					{Host: "198.18.2.2", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_WARNING,
-				Identity:     "api",
-			},
-			// api-3
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-3").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.3", Ports: []string{"grpc", "mesh"}},
-					{Host: "198.18.2.3", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-				Identity:     "api",
-			},
-			// api-4
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-4").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.4", Ports: []string{"grpc", "mesh"}},
-					{Host: "198.18.2.4", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-			// api-5
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-5").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.5", Ports: []string{"grpc", "mesh"}},
-					{Host: "198.18.2.5", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_WARNING,
-				Identity:     "api",
-			},
-			// api-6
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-6").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.6", Ports: []string{"grpc", "mesh"}},
-					{Host: "198.18.2.6", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_WARNING,
-				Identity:     "api",
-			},
-			// api-7
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-7").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.7", Ports: []string{"grpc", "mesh"}},
-					{Host: "198.18.2.7", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-				Identity:     "api",
-			},
-			// api-8
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-8").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.8", Ports: []string{"grpc", "mesh"}},
-					{Host: "198.18.2.8", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-			// api-9
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-9").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.9", Ports: []string{"grpc", "mesh"}},
-					{Host: "198.18.2.9", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-				Identity:     "api",
-			},
-			// api-20
-			{
-				TargetRef: c.ResolveResourceID(t, rtest.Resource(pbcatalog.WorkloadType, "api-20").ID()),
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "172.16.1.20", Ports: []string{"grpc", "mesh"}},
-					{Host: "198.18.2.20", External: true, Ports: []string{"mesh"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_MAINTENANCE,
-				Identity:     "api",
-			},
-		},
-	}
-}
-
-func verifyServiceEndpoints(t *testing.T, c *rtest.Client, id *pbresource.ID, expected *pbcatalog.ServiceEndpoints) {
-	t.Helper()
-	c.WaitForResourceState(t, id, func(t rtest.T, res *pbresource.Resource) {
-		var actual pbcatalog.ServiceEndpoints
-		err := res.Data.UnmarshalTo(&actual)
-		require.NoError(t, err)
-		prototest.AssertElementsMatch(t, expected.Endpoints, actual.Endpoints)
-	})
-}
diff --git a/internal/catalog/catalogtest/test_lifecycle_v2beta1.go b/internal/catalog/catalogtest/test_lifecycle_v2beta1.go
deleted file mode 100644
index ea935dd4c56b7..0000000000000
--- a/internal/catalog/catalogtest/test_lifecycle_v2beta1.go
+++ /dev/null
@@ -1,716 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package catalogtest
-
-import (
-	"testing"
-
-	"github.com/hashicorp/consul/internal/catalog"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-// RunCatalogV2Beta1LifecycleIntegrationTest intends to excercise functionality of
-// managing catalog resources over their normal lifecycle where they will be modified
-// several times, change state etc.
-func RunCatalogV2Beta1LifecycleIntegrationTest(t *testing.T, client pbresource.ResourceServiceClient) {
-	t.Helper()
-
-	testutil.RunStep(t, "node-lifecycle", func(t *testing.T) {
-		RunCatalogV2Beta1NodeLifecycleIntegrationTest(t, client)
-	})
-
-	testutil.RunStep(t, "workload-lifecycle", func(t *testing.T) {
-		RunCatalogV2Beta1WorkloadLifecycleIntegrationTest(t, client)
-	})
-
-	testutil.RunStep(t, "endpoints-lifecycle", func(t *testing.T) {
-		RunCatalogV2Beta1EndpointsLifecycleIntegrationTest(t, client)
-	})
-}
-
-// RunCatalogV2Beta1NodeLifecycleIntegrationTest verifies correct functionality of
-// the node-health controller. This test will exercise the following behaviors:
-//
-// * Creating a Node without associated HealthStatuses will mark the node as passing
-// * Associating a HealthStatus with a Node will cause recomputation of the Health
-// * Changing HealthStatus to a worse health will cause recomputation of the Health
-// * Changing HealthStatus to a better health will cause recomputation of the Health
-// * Deletion of associated HealthStatuses will recompute the Health (back to passing)
-// * Deletion of the node will cause deletion of associated health statuses
-func RunCatalogV2Beta1NodeLifecycleIntegrationTest(t *testing.T, client pbresource.ResourceServiceClient) {
-	c := rtest.NewClient(client)
-
-	nodeName := "test-lifecycle"
-	nodeHealthName := "test-lifecycle-node-status"
-
-	// initial node creation
-	node := rtest.Resource(pbcatalog.NodeType, nodeName).
-		WithData(t, &pbcatalog.Node{
-			Addresses: []*pbcatalog.NodeAddress{
-				{Host: "172.16.2.3"},
-				{Host: "198.18.2.3", External: true},
-			},
-		}).
-		Write(t, c)
-
-	// wait for the node health controller to mark the node as healthy
-	c.WaitForStatusCondition(t, node.Id,
-		catalog.NodeHealthStatusKey,
-		catalog.NodeHealthConditions[pbcatalog.Health_HEALTH_PASSING])
-
-	// Its easy enough to simply repeatedly set the health status and it proves
-	// that going both from better to worse health and worse to better all
-	// happen as expected. We leave the health in a warning state to allow for
-	// the subsequent health status deletion to cause the health to go back
-	// to passing.
-	healthChanges := []pbcatalog.Health{
-		pbcatalog.Health_HEALTH_PASSING,
-		pbcatalog.Health_HEALTH_WARNING,
-		pbcatalog.Health_HEALTH_CRITICAL,
-		pbcatalog.Health_HEALTH_MAINTENANCE,
-		pbcatalog.Health_HEALTH_CRITICAL,
-		pbcatalog.Health_HEALTH_WARNING,
-		pbcatalog.Health_HEALTH_PASSING,
-		pbcatalog.Health_HEALTH_WARNING,
-	}
-
-	// This will be set within the loop and used afterwards to delete the health status
-	var nodeHealth *pbresource.Resource
-
-	// Iterate through the various desired health statuses, updating
-	// a HealthStatus resource owned by the node and waiting for
-	// reconciliation at each point
-	for _, health := range healthChanges {
-		// update the health check
-		nodeHealth = setHealthStatus(t, c, node.Id, nodeHealthName, health)
-
-		// wait for reconciliation to kick in and put the node into the right
-		// health status.
-		c.WaitForStatusCondition(t, node.Id,
-			catalog.NodeHealthStatusKey,
-			catalog.NodeHealthConditions[health])
-	}
-
-	// now delete the health status and ensure things go back to passing
-	c.MustDelete(t, nodeHealth.Id)
-
-	// wait for the node health controller to mark the node as healthy
-	c.WaitForStatusCondition(t, node.Id,
-		catalog.NodeHealthStatusKey,
-		catalog.NodeHealthConditions[pbcatalog.Health_HEALTH_PASSING])
-
-	// Add the health status back once more, the actual status doesn't matter.
-	// It just must be owned by the node so that we can show cascading
-	// deletions of owned health statuses working.
-	healthStatus := setHealthStatus(t, c, node.Id, nodeHealthName, pbcatalog.Health_HEALTH_CRITICAL)
-
-	// Delete the node and wait for the health status to be deleted.
-	c.MustDelete(t, node.Id)
-	c.WaitForDeletion(t, healthStatus.Id)
-}
-
-// RunCatalogV2Beta1WorkloadLifecycleIntegrationTest verifies correct functionality of
-// the workload-health controller. This test will exercise the following behaviors:
-//
-//   - Associating a workload with a node causes recomputation of the health and takes
-//     into account the nodes health
-//   - Modifying the workloads associated node causes health recomputation and takes into
-//     account the new nodes health
-//   - Removal of the node association causes recomputation of health and for no node health
-//     to be taken into account.
-//   - Creating a workload without associated health statuses or node association will
-//     be marked passing
-//   - Creating a workload without associated health statuses but with a node will
-//     inherit its health from the node.
-//   - Changing HealthStatus to a worse health will cause recompuation of the Health
-//   - Changing HealthStatus to a better health will cause recompuation of the Health
-//   - Overall health is computed as the worst health amongst the nodes health and all
-//     of the workloads associated HealthStatuses
-//   - Deletion of the workload will cause deletion of all associated health statuses.
-func RunCatalogV2Beta1WorkloadLifecycleIntegrationTest(t *testing.T, client pbresource.ResourceServiceClient) {
-	c := rtest.NewClient(client)
-	testutil.RunStep(t, "nodeless-workload", func(t *testing.T) {
-		runV2Beta1NodelessWorkloadLifecycleIntegrationTest(t, c)
-	})
-
-	testutil.RunStep(t, "node-associated-workload", func(t *testing.T) {
-		runV2Beta1NodeAssociatedWorkloadLifecycleIntegrationTest(t, c)
-	})
-}
-
-// runV2Beta1NodelessWorkloadLifecycleIntegrationTest verifies correct functionality of
-// the workload-health controller for workloads without node associations. In particular
-// the following behaviors are being tested
-//
-//   - Creating a workload without associated health statuses or node association will
-//     be marked passing
-//   - Changing HealthStatus to a worse health will cause recompuation of the Health
-//   - Changing HealthStatus to a better health will cause recompuation of the Health
-//   - Deletion of associated HealthStatus for a nodeless workload will be set back to passing
-//   - Deletion of the workload will cause deletion of all associated health statuses.
-func runV2Beta1NodelessWorkloadLifecycleIntegrationTest(t *testing.T, c *rtest.Client) {
-	workloadName := "test-lifecycle-workload"
-	workloadHealthName := "test-lifecycle-workload-status"
-
-	// create a workload without a node association or health statuses yet
-	workload := rtest.Resource(pbcatalog.WorkloadType, workloadName).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "198.18.9.8"},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-			Identity: "test-lifecycle",
-		}).
-		Write(t, c)
-
-	// wait for the workload health controller to mark the workload as healthy
-	c.WaitForStatusCondition(t, workload.Id,
-		catalog.WorkloadHealthStatusKey,
-		catalog.WorkloadHealthConditions[pbcatalog.Health_HEALTH_PASSING])
-
-	// We may not need to iterate through all of these states but its easy
-	// enough and quick enough to do so. The general rationale is that we
-	// should move through changing the workloads associated health status
-	// in this progression. We can prove that moving from better to worse
-	// health or worse to better both function correctly.
-	healthChanges := []pbcatalog.Health{
-		pbcatalog.Health_HEALTH_PASSING,
-		pbcatalog.Health_HEALTH_WARNING,
-		pbcatalog.Health_HEALTH_CRITICAL,
-		pbcatalog.Health_HEALTH_MAINTENANCE,
-		pbcatalog.Health_HEALTH_CRITICAL,
-		pbcatalog.Health_HEALTH_WARNING,
-		pbcatalog.Health_HEALTH_PASSING,
-		pbcatalog.Health_HEALTH_WARNING,
-	}
-
-	var workloadHealth *pbresource.Resource
-	// Iterate through the various desired health statuses, updating
-	// a HealthStatus resource owned by the workload and waiting for
-	// reconciliation at each point
-	for _, health := range healthChanges {
-		// update the health status
-		workloadHealth = setHealthStatus(t, c, workload.Id, workloadHealthName, health)
-
-		// wait for reconciliation to kick in and put the workload into
-		// the right health status.
-		c.WaitForStatusCondition(t, workload.Id,
-			catalog.WorkloadHealthStatusKey,
-			catalog.WorkloadHealthConditions[health])
-	}
-
-	// Now delete the health status, things should go back to passing status
-	c.MustDelete(t, workloadHealth.Id)
-
-	// ensure the workloads health went back to passing
-	c.WaitForStatusCondition(t, workload.Id,
-		catalog.WorkloadHealthStatusKey,
-		catalog.WorkloadHealthConditions[pbcatalog.Health_HEALTH_PASSING])
-
-	// Reset the workload health. The actual health is irrelevant, we just want it
-	// to exist to provde that Health Statuses get deleted along with the workload
-	// when its deleted.
-	workloadHealth = setHealthStatus(t, c, workload.Id, workloadHealthName, pbcatalog.Health_HEALTH_WARNING)
-
-	// Delete the workload and wait for the HealthStatus to also be deleted
-	c.MustDelete(t, workload.Id)
-	c.WaitForDeletion(t, workloadHealth.Id)
-}
-
-// runV2Beta1NodeAssociatedWorkloadLifecycleIntegrationTest verifies correct functionality of
-// the workload-health controller. This test will exercise the following behaviors:
-//
-//   - Associating a workload with a node causes recomputation of the health and takes
-//     into account the nodes health
-//   - Modifying the workloads associated node causes health recomputation and takes into
-//     account the new nodes health
-//   - Removal of the node association causes recomputation of health and for no node health
-//     to be taken into account.
-//   - Creating a workload without associated health statuses but with a node will
-//     inherit its health from the node.
-//   - Overall health is computed as the worst health amongst the nodes health and all
-//     of the workloads associated HealthStatuses
-func runV2Beta1NodeAssociatedWorkloadLifecycleIntegrationTest(t *testing.T, c *rtest.Client) {
-	workloadName := "test-lifecycle"
-	workloadHealthName := "test-lifecycle"
-	nodeName1 := "test-lifecycle-1"
-	nodeName2 := "test-lifecycle-2"
-	nodeHealthName1 := "test-lifecycle-node-1"
-	nodeHealthName2 := "test-lifecycle-node-2"
-
-	// Insert a some nodes to link the workloads to at various points throughout the test
-	node1 := rtest.Resource(pbcatalog.NodeType, nodeName1).
-		WithData(t, &pbcatalog.Node{
-			Addresses: []*pbcatalog.NodeAddress{{Host: "172.17.9.10"}},
-		}).
-		Write(t, c)
-	node2 := rtest.Resource(pbcatalog.NodeType, nodeName2).
-		WithData(t, &pbcatalog.Node{
-			Addresses: []*pbcatalog.NodeAddress{{Host: "172.17.9.11"}},
-		}).
-		Write(t, c)
-
-	// Set some non-passing health statuses for those nodes. Using non-passing will make
-	// it easy to see that changing a passing workloads node association appropriately
-	// impacts the overall workload health.
-	setHealthStatus(t, c, node1.Id, nodeHealthName1, pbcatalog.Health_HEALTH_CRITICAL)
-	setHealthStatus(t, c, node2.Id, nodeHealthName2, pbcatalog.Health_HEALTH_WARNING)
-
-	// Add the workload but don't immediately associate with any node.
-	workload := rtest.Resource(pbcatalog.WorkloadType, workloadName).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "198.18.9.8"},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-			Identity: "test-lifecycle",
-		}).
-		Write(t, c)
-
-	// wait for the workload health controller to mark the workload as healthy
-	c.WaitForStatusCondition(t, workload.Id,
-		catalog.WorkloadHealthStatusKey,
-		catalog.WorkloadHealthConditions[pbcatalog.Health_HEALTH_PASSING])
-
-	// now modify the workload to associate it with node 1 (currently with CRITICAL health)
-	workload = rtest.ResourceID(workload.Id).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{{Host: "198.18.9.8"}},
-			Ports:     map[string]*pbcatalog.WorkloadPort{"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP}},
-			Identity:  "test-lifecycle",
-			// this is the only difference from the previous write
-			NodeName: node1.Id.Name,
-		}).
-		Write(t, c)
-
-	// wait for the workload health controller to mark the workload as critical (due to node 1 having critical health)
-	c.WaitForStatusCondition(t, workload.Id,
-		catalog.WorkloadHealthStatusKey,
-		catalog.WorkloadAndNodeHealthConditions[pbcatalog.Health_HEALTH_PASSING][pbcatalog.Health_HEALTH_CRITICAL])
-
-	// Now reassociate the workload with node 2. This should cause recalculation of its health into the warning state
-	workload = rtest.ResourceID(workload.Id).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{{Host: "198.18.9.8"}},
-			Ports:     map[string]*pbcatalog.WorkloadPort{"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP}},
-			Identity:  "test-lifecycle",
-			// this is the only difference from the previous write
-			NodeName: node2.Id.Name,
-		}).
-		Write(t, c)
-
-	// Wait for the workload health controller to mark the workload as warning (due to node 2 having warning health)
-	c.WaitForStatusCondition(t, workload.Id,
-		catalog.WorkloadHealthStatusKey,
-		catalog.WorkloadAndNodeHealthConditions[pbcatalog.Health_HEALTH_PASSING][pbcatalog.Health_HEALTH_WARNING])
-
-	// Delete the node, this should cause the health to be recalculated as critical because the node association
-	// is broken.
-	c.MustDelete(t, node2.Id)
-
-	// Wait for the workload health controller to mark the workload as critical due to the missing node
-	c.WaitForStatusCondition(t, workload.Id,
-		catalog.WorkloadHealthStatusKey,
-		catalog.WorkloadAndNodeHealthConditions[pbcatalog.Health_HEALTH_PASSING][pbcatalog.Health_HEALTH_CRITICAL])
-
-	// Now fixup the node association to point at node 1
-	workload = rtest.ResourceID(workload.Id).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{{Host: "198.18.9.8"}},
-			Ports:     map[string]*pbcatalog.WorkloadPort{"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP}},
-			Identity:  "test-lifecycle",
-			// this is the only difference from the previous write
-			NodeName: node1.Id.Name,
-		}).
-		Write(t, c)
-
-	// Also set node 1 health down to WARNING
-	setHealthStatus(t, c, node1.Id, nodeHealthName1, pbcatalog.Health_HEALTH_WARNING)
-
-	// Wait for the workload health controller to mark the workload as warning (due to node 1 having warning health now)
-	c.WaitForStatusCondition(t, workload.Id,
-		catalog.WorkloadHealthStatusKey,
-		catalog.WorkloadAndNodeHealthConditions[pbcatalog.Health_HEALTH_PASSING][pbcatalog.Health_HEALTH_WARNING])
-
-	// Now add a critical workload health check to ensure that both node and workload health are accounted for.
-	setHealthStatus(t, c, workload.Id, workloadHealthName, pbcatalog.Health_HEALTH_CRITICAL)
-
-	// Wait for the workload health to be recomputed and put into the critical status.
-	c.WaitForStatusCondition(t, workload.Id,
-		catalog.WorkloadHealthStatusKey,
-		catalog.WorkloadAndNodeHealthConditions[pbcatalog.Health_HEALTH_CRITICAL][pbcatalog.Health_HEALTH_WARNING])
-
-	// Reset the workloads health to passing. We expect the overall health to go back to warning
-	setHealthStatus(t, c, workload.Id, workloadHealthName, pbcatalog.Health_HEALTH_PASSING)
-	c.WaitForStatusCondition(t, workload.Id,
-		catalog.WorkloadHealthStatusKey,
-		catalog.WorkloadAndNodeHealthConditions[pbcatalog.Health_HEALTH_PASSING][pbcatalog.Health_HEALTH_WARNING])
-
-	// Remove the node association and wait for the health to go back to passing
-	workload = rtest.ResourceID(workload.Id).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{{Host: "198.18.9.8"}},
-			Ports:     map[string]*pbcatalog.WorkloadPort{"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP}},
-			Identity:  "test-lifecycle",
-		}).
-		Write(t, c)
-	c.WaitForStatusCondition(t, workload.Id,
-		catalog.WorkloadHealthStatusKey,
-		catalog.WorkloadHealthConditions[pbcatalog.Health_HEALTH_PASSING])
-}
-
-// RunCatalogV2Beta1EndpointsLifecycleIntegrationTest verifies the correct functionality of
-// the endpoints controller. This test will exercise the following behaviors:
-//
-// * Services without a selector get marked with status indicating their endpoints are unmanaged
-// * Services with a selector get marked with status indicating their endpoints are managed
-// * Deleting a service will delete the associated endpoints (regardless of them being managed or not)
-// * Moving from managed to unmanaged endpoints will delete the managed endpoints
-// * Moving from unmanaged to managed endpoints will overwrite any previous endpoints.
-// * A service with a selector that matches no workloads will still have the endpoints object written.
-// * Adding ports to a service will recalculate the endpoints
-// * Removing ports from a service will recalculate the endpoints
-// * Changing the workload will recalculate the endpoints (ports, addresses, or health)
-func RunCatalogV2Beta1EndpointsLifecycleIntegrationTest(t *testing.T, client pbresource.ResourceServiceClient) {
-	c := rtest.NewClient(client)
-	serviceName := "test-lifecycle"
-
-	// Create the service without a selector. We should not see endpoints generated but we should see the
-	// status updated to note endpoints are not being managed.
-	service := rtest.Resource(pbcatalog.ServiceType, serviceName).
-		WithData(t, &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP}},
-		}).
-		Write(t, c)
-
-	// Wait to ensure the status is updated accordingly
-	c.WaitForStatusCondition(t, service.Id, catalog.EndpointsStatusKey, catalog.EndpointsStatusConditionUnmanaged)
-
-	// Verify that no endpoints were created.
-	endpointsID := rtest.Resource(pbcatalog.ServiceEndpointsType, serviceName).ID()
-	c.RequireResourceNotFound(t, endpointsID)
-
-	// Add some empty endpoints (type validations enforce that they are owned by the service)
-	rtest.ResourceID(endpointsID).
-		WithData(t, &pbcatalog.ServiceEndpoints{}).
-		WithOwner(service.Id).
-		Write(t, c)
-
-	// Now delete the service and ensure that they are cleaned up.
-	c.MustDelete(t, service.Id)
-	c.WaitForDeletion(t, endpointsID)
-
-	// Add some workloads to eventually select by the service
-
-	// api-1 has all ports (http, grpc and mesh). It also has a mixture of Addresses
-	// that select individual ports and one that selects all ports implicitly
-	api1 := rtest.Resource(pbcatalog.WorkloadType, "api-1").
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "127.0.0.1"},
-				{Host: "::1", Ports: []string{"grpc"}},
-				{Host: "127.0.0.2", Ports: []string{"http"}},
-				{Host: "172.17.1.1", Ports: []string{"mesh"}},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-			},
-			Identity: "api",
-		}).
-		Write(t, c)
-
-	// api-2 has only grpc and mesh ports. It also has a mixture of Addresses that
-	// select individual ports and one that selects all ports implicitly
-	api2 := rtest.Resource(pbcatalog.WorkloadType, "api-2").
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "127.0.0.1"},
-				{Host: "::1", Ports: []string{"grpc"}},
-				{Host: "172.17.1.2", Ports: []string{"mesh"}},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-			},
-			Identity: "api",
-		}).
-		Write(t, c)
-
-	// api-3 has the mesh and HTTP ports. It also has a mixture of Addresses that
-	// select individual ports and one that selects all ports.
-	api3 := rtest.Resource(pbcatalog.WorkloadType, "api-3").
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "127.0.0.1"},
-				{Host: "172.17.1.3", Ports: []string{"mesh"}},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-			Identity: "api",
-		}).
-		Write(t, c)
-
-	// Now create a service with unmanaged endpoints again
-	service = rtest.Resource(pbcatalog.ServiceType, serviceName).
-		WithData(t, &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP}},
-		}).
-		Write(t, c)
-
-	// Inject the endpoints resource. We want to prove that transition from unmanaged to
-	// managed endpoints results in overwriting of the old endpoints
-	rtest.ResourceID(endpointsID).
-		WithData(t, &pbcatalog.ServiceEndpoints{
-			Endpoints: []*pbcatalog.Endpoint{
-				{
-					Addresses: []*pbcatalog.WorkloadAddress{
-						{Host: "198.18.1.1", External: true},
-					},
-					Ports: map[string]*pbcatalog.WorkloadPort{
-						"http": {Port: 443, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					},
-					HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-					Identity:     "api",
-				},
-			},
-		}).
-		WithOwner(service.Id).
-		Write(t, c)
-
-	// Wait to ensure the status is updated accordingly
-	c.WaitForStatusCondition(t, service.Id, catalog.EndpointsStatusKey, catalog.EndpointsStatusConditionUnmanaged)
-
-	// Now move the service to having managed endpoints
-	service = rtest.ResourceID(service.Id).
-		WithData(t, &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{Names: []string{"bar"}},
-			Ports:     []*pbcatalog.ServicePort{{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP}},
-		}).
-		Write(t, c)
-
-	// Verify that this status is updated to show this service as having managed endpoints
-	c.WaitForStatusCondition(t, service.Id, catalog.EndpointsStatusKey, catalog.EndpointsStatusConditionManaged)
-
-	// Verify that the service endpoints are created. In this case they will be empty
-	verifyServiceEndpoints(t, c, endpointsID, &pbcatalog.ServiceEndpoints{})
-
-	// Rewrite the service to select the API workloads - just select the singular port for now
-	service = rtest.ResourceID(service.Id).
-		WithData(t, &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"api-"}},
-			Ports:     []*pbcatalog.ServicePort{{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP}},
-		}).
-		Write(t, c)
-
-	// Wait for the status to be updated. The condition itself will remain unchanged but we are waiting for
-	// the generations to match to know that the endpoints would have been regenerated
-	c.WaitForStatusCondition(t, service.Id, catalog.EndpointsStatusKey, catalog.EndpointsStatusConditionManaged)
-
-	// ensure that api-1 and api-3 are selected but api-2 is excluded due to not having the desired port
-	verifyServiceEndpoints(t, c, endpointsID, &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				TargetRef: api1.Id,
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "127.0.0.1", Ports: []string{"http"}},
-					{Host: "127.0.0.2", Ports: []string{"http"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-				Identity:     "api",
-			},
-			{
-				TargetRef: api3.Id,
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "127.0.0.1", Ports: []string{"http"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-				Identity:     "api",
-			},
-		},
-	})
-
-	// Rewrite the service to select the API workloads - changing from selecting the HTTP port to the gRPC port
-	service = rtest.ResourceID(service.Id).
-		WithData(t, &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"api-"}},
-			Ports:     []*pbcatalog.ServicePort{{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC}},
-		}).
-		Write(t, c)
-
-	// Wait for the status to be updated. The condition itself will remain unchanged but we are waiting for
-	// the generations to match to know that the endpoints would have been regenerated
-	c.WaitForStatusCondition(t, service.Id, catalog.EndpointsStatusKey, catalog.EndpointsStatusConditionManaged)
-
-	// Check that the endpoints were generated as expected
-	verifyServiceEndpoints(t, c, endpointsID, &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				TargetRef: api1.Id,
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "127.0.0.1", Ports: []string{"grpc"}},
-					{Host: "::1", Ports: []string{"grpc"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-				Identity:     "api",
-			},
-			{
-				TargetRef: api2.Id,
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "127.0.0.1", Ports: []string{"grpc"}},
-					{Host: "::1", Ports: []string{"grpc"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-				Identity:     "api",
-			},
-		},
-	})
-
-	// Update the service to change the ports used. This should result in the workload being removed
-	// from the endpoints
-	rtest.ResourceID(api2.Id).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "127.0.0.1"},
-				{Host: "::1", Ports: []string{"http"}},
-				{Host: "172.17.1.2", Ports: []string{"mesh"}},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-			Identity: "api",
-		}).
-		Write(t, c)
-
-	// Verify that api-2 was removed from the service endpoints as it no longer has a grpc port
-	verifyServiceEndpoints(t, c, endpointsID, &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				TargetRef: api1.Id,
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "127.0.0.1", Ports: []string{"grpc"}},
-					{Host: "::1", Ports: []string{"grpc"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-				Identity:     "api",
-			},
-		},
-	})
-
-	// Remove the ::1 address from workload api1 which should result in recomputing endpoints
-	rtest.ResourceID(api1.Id).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "127.0.0.1"},
-				{Host: "172.17.1.1", Ports: []string{"mesh"}},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"mesh": {Port: 10000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-			},
-			Identity: "api",
-		}).
-		Write(t, c)
-
-	// Verify that api-1 had its addresses modified appropriately
-	verifyServiceEndpoints(t, c, endpointsID, &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				TargetRef: api1.Id,
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "127.0.0.1", Ports: []string{"grpc"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-				Identity:     "api",
-			},
-		},
-	})
-
-	// Add a failing health status to the api1 workload to force recomputation of endpoints
-	setHealthStatus(t, c, api1.Id, "api-failed", pbcatalog.Health_HEALTH_CRITICAL)
-
-	// Verify that api-1 within the endpoints has the expected health
-	verifyServiceEndpoints(t, c, endpointsID, &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				TargetRef: api1.Id,
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "127.0.0.1", Ports: []string{"grpc"}},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-				Identity:     "api",
-			},
-		},
-	})
-
-	// Move the service to being unmanaged. We should see the ServiceEndpoints being removed.
-	service = rtest.ResourceID(service.Id).
-		WithData(t, &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC}},
-		}).
-		Write(t, c)
-
-	// Wait for the endpoints controller to inform us that the endpoints are not being managed
-	c.WaitForStatusCondition(t, service.Id, catalog.EndpointsStatusKey, catalog.EndpointsStatusConditionUnmanaged)
-	// Ensure that the managed endpoints were deleted
-	c.WaitForDeletion(t, endpointsID)
-
-	// Put the service back into managed mode.
-	service = rtest.ResourceID(service.Id).
-		WithData(t, &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"api-"}},
-			Ports:     []*pbcatalog.ServicePort{{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC}},
-		}).
-		Write(t, c)
-
-	// Wait for the service endpoints to be regenerated
-	c.WaitForStatusCondition(t, service.Id, catalog.EndpointsStatusKey, catalog.EndpointsStatusConditionManaged)
-	c.RequireResourceExists(t, endpointsID)
-
-	// Now delete the service and ensure that the endpoints eventually are deleted as well
-	c.MustDelete(t, service.Id)
-	c.WaitForDeletion(t, endpointsID)
-}
-
-func setHealthStatus(t *testing.T, client *rtest.Client, owner *pbresource.ID, name string, health pbcatalog.Health) *pbresource.Resource {
-	return rtest.Resource(pbcatalog.HealthStatusType, name).
-		WithData(t, &pbcatalog.HealthStatus{
-			Type:   "synthetic",
-			Status: health,
-		}).
-		WithOwner(owner).
-		Write(t, client)
-}
diff --git a/internal/catalog/exports.go b/internal/catalog/exports.go
deleted file mode 100644
index 63c8a8443bf08..0000000000000
--- a/internal/catalog/exports.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package catalog
-
-import (
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers"
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/endpoints"
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/failover"
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/nodehealth"
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/workloadhealth"
-	"github.com/hashicorp/consul/internal/catalog/internal/mappers/failovermapper"
-	"github.com/hashicorp/consul/internal/catalog/internal/mappers/nodemapper"
-	"github.com/hashicorp/consul/internal/catalog/internal/types"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/mappers/selectiontracker"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-var (
-	// Controller Statuses
-	NodeHealthStatusKey              = nodehealth.StatusKey
-	NodeHealthStatusConditionHealthy = nodehealth.StatusConditionHealthy
-	NodeHealthConditions             = nodehealth.Conditions
-
-	WorkloadHealthStatusKey              = workloadhealth.StatusKey
-	WorkloadHealthStatusConditionHealthy = workloadhealth.StatusConditionHealthy
-	WorkloadHealthConditions             = workloadhealth.WorkloadConditions
-	WorkloadAndNodeHealthConditions      = workloadhealth.NodeAndWorkloadConditions
-
-	EndpointsStatusKey                       = endpoints.StatusKey
-	EndpointsStatusConditionEndpointsManaged = endpoints.StatusConditionEndpointsManaged
-	EndpointsStatusConditionManaged          = endpoints.ConditionManaged
-	EndpointsStatusConditionUnmanaged        = endpoints.ConditionUnmanaged
-
-	FailoverStatusKey                                              = failover.StatusKey
-	FailoverStatusConditionAccepted                                = failover.StatusConditionAccepted
-	FailoverStatusConditionAcceptedOKReason                        = failover.OKReason
-	FailoverStatusConditionAcceptedMissingServiceReason            = failover.MissingServiceReason
-	FailoverStatusConditionAcceptedUnknownPortReason               = failover.UnknownPortReason
-	FailoverStatusConditionAcceptedMissingDestinationServiceReason = failover.MissingDestinationServiceReason
-	FailoverStatusConditionAcceptedUnknownDestinationPortReason    = failover.UnknownDestinationPortReason
-	FailoverStatusConditionAcceptedUsingMeshDestinationPortReason  = failover.UsingMeshDestinationPortReason
-)
-
-// RegisterTypes adds all resource types within the "catalog" API group
-// to the given type registry
-func RegisterTypes(r resource.Registry) {
-	types.Register(r)
-}
-
-type ControllerDependencies = controllers.Dependencies
-
-func DefaultControllerDependencies() ControllerDependencies {
-	return ControllerDependencies{
-		WorkloadHealthNodeMapper: nodemapper.New(),
-		EndpointsWorkloadMapper:  selectiontracker.New(),
-		FailoverMapper:           failovermapper.New(),
-	}
-}
-
-// RegisterControllers registers controllers for the catalog types with
-// the given controller Manager.
-func RegisterControllers(mgr *controller.Manager, deps ControllerDependencies) {
-	controllers.Register(mgr, deps)
-}
-
-// SimplifyFailoverPolicy fully populates the PortConfigs map and clears the
-// Configs map using the provided Service.
-func SimplifyFailoverPolicy(svc *pbcatalog.Service, failover *pbcatalog.FailoverPolicy) *pbcatalog.FailoverPolicy {
-	return types.SimplifyFailoverPolicy(svc, failover)
-}
-
-// FailoverPolicyMapper maintains the bidirectional tracking relationship of a
-// FailoverPolicy to the Services related to it.
-type FailoverPolicyMapper interface {
-	TrackFailover(failover *resource.DecodedResource[*pbcatalog.FailoverPolicy])
-	UntrackFailover(failoverID *pbresource.ID)
-	FailoverIDsByService(svcID *pbresource.ID) []*pbresource.ID
-}
-
-func NewFailoverPolicyMapper() FailoverPolicyMapper {
-	return failovermapper.New()
-}
-
-// ValidateLocalServiceRefNoSection ensures the following:
-//
-// - ref is non-nil
-// - type is ServiceType
-// - section is empty
-// - tenancy is set and partition/namespace are both non-empty
-// - peer_name must be "local"
-//
-// Each possible validation error is wrapped in the wrapErr function before
-// being collected in a multierror.Error.
-func ValidateLocalServiceRefNoSection(ref *pbresource.Reference, wrapErr func(error) error) error {
-	return types.ValidateLocalServiceRefNoSection(ref, wrapErr)
-}
diff --git a/internal/catalog/internal/controllers/endpoints/controller.go b/internal/catalog/internal/controllers/endpoints/controller.go
deleted file mode 100644
index 16a0b4f1f5443..0000000000000
--- a/internal/catalog/internal/controllers/endpoints/controller.go
+++ /dev/null
@@ -1,390 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package endpoints
-
-import (
-	"context"
-	"sort"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/workloadhealth"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	endpointsMetaManagedBy = "managed-by-controller"
-)
-
-// The WorkloadMapper interface is used to provide an implementation around being able
-// to map a watch even for a Workload resource and translate it to reconciliation requests
-type WorkloadMapper interface {
-	// MapWorkload conforms to the controller.DependencyMapper signature. Given a Workload
-	// resource it should report the resource IDs that have selected the workload.
-	MapWorkload(context.Context, controller.Runtime, *pbresource.Resource) ([]controller.Request, error)
-
-	// TrackIDForSelector should be used to associate the specified WorkloadSelector with
-	// the given resource ID. Future calls to MapWorkload
-	TrackIDForSelector(*pbresource.ID, *pbcatalog.WorkloadSelector)
-
-	// UntrackID should be used to inform the tracker to forget about the specified ID
-	UntrackID(*pbresource.ID)
-}
-
-// ServiceEndpointsController creates a controller to perform automatic endpoint management for
-// services.
-func ServiceEndpointsController(workloadMap WorkloadMapper) controller.Controller {
-	if workloadMap == nil {
-		panic("No WorkloadMapper was provided to the ServiceEndpointsController constructor")
-	}
-
-	return controller.ForType(pbcatalog.ServiceEndpointsType).
-		WithWatch(pbcatalog.ServiceType, controller.ReplaceType(pbcatalog.ServiceEndpointsType)).
-		WithWatch(pbcatalog.WorkloadType, workloadMap.MapWorkload).
-		WithReconciler(newServiceEndpointsReconciler(workloadMap))
-}
-
-type serviceEndpointsReconciler struct {
-	workloadMap WorkloadMapper
-}
-
-func newServiceEndpointsReconciler(workloadMap WorkloadMapper) *serviceEndpointsReconciler {
-	return &serviceEndpointsReconciler{
-		workloadMap: workloadMap,
-	}
-}
-
-// Reconcile will reconcile one ServiceEndpoints resource in response to some event.
-func (r *serviceEndpointsReconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	// The runtime is passed by value so replacing it here for the remainder of this
-	// reconciliation request processing will not affect future invocations.
-	rt.Logger = rt.Logger.With("resource-id", req.ID, "controller", StatusKey)
-
-	rt.Logger.Trace("reconciling service endpoints")
-
-	endpointsID := req.ID
-	serviceID := &pbresource.ID{
-		Type:    pbcatalog.ServiceType,
-		Tenancy: endpointsID.Tenancy,
-		Name:    endpointsID.Name,
-	}
-
-	// First we read and unmarshal the service
-
-	serviceData, err := getServiceData(ctx, rt, serviceID)
-	if err != nil {
-		rt.Logger.Error("error retrieving corresponding Service", "error", err)
-		return err
-	}
-
-	// Check if the service exists. If it doesn't we can avoid a bunch of other work.
-	if serviceData == nil {
-		rt.Logger.Trace("service has been deleted")
-
-		// The service was deleted so we need to update the WorkloadMapper to tell it to
-		// stop tracking this service
-		r.workloadMap.UntrackID(req.ID)
-
-		// Note that because we configured ServiceEndpoints to be owned by the service,
-		// the service endpoints object should eventually be automatically deleted.
-		// There is no reason to attempt deletion here.
-		return nil
-	}
-
-	// Now read and unmarshal the endpoints. We don't need this data just yet but all
-	// code paths from this point on will need this regardless of branching so we pull
-	// it now.
-	endpointsData, err := getEndpointsData(ctx, rt, endpointsID)
-	if err != nil {
-		rt.Logger.Error("error retrieving existing endpoints", "error", err)
-		return err
-	}
-
-	var status *pbresource.Condition
-
-	if serviceUnderManagement(serviceData.service) {
-		rt.Logger.Trace("service is enabled for automatic endpoint management")
-		// This service should have its endpoints automatically managed
-		status = ConditionManaged
-
-		// Inform the WorkloadMapper to track this service and its selectors. So
-		// future workload updates that would be matched by the services selectors
-		// cause this service to be rereconciled.
-		r.workloadMap.TrackIDForSelector(req.ID, serviceData.service.GetWorkloads())
-
-		// Now read and unmarshal all workloads selected by the service. It is imperative
-		// that this happens after we notify the selection tracker to be tracking that
-		// selection criteria. If the order were reversed we could potentially miss
-		// workload creations that should be selected if they happen after gathering
-		// the workloads but before tracking the selector. Tracking first ensures that
-		// any event that happens after that would get mapped to an event for these
-		// endpoints.
-		workloadData, err := getWorkloadData(ctx, rt, serviceData)
-		if err != nil {
-			rt.Logger.Trace("error retrieving selected workloads", "error", err)
-			return err
-		}
-
-		// Calculate the latest endpoints from the already gathered workloads
-		latestEndpoints := workloadsToEndpoints(serviceData.service, workloadData)
-
-		// Before writing the endpoints actually check to see if they are changed
-		if endpointsData == nil || !proto.Equal(endpointsData.endpoints, latestEndpoints) {
-			rt.Logger.Trace("endpoints have changed")
-
-			// First encode the endpoints data as an Any type.
-			endpointData, err := anypb.New(latestEndpoints)
-			if err != nil {
-				rt.Logger.Error("error marshalling latest endpoints", "error", err)
-				return err
-			}
-
-			// Now perform the write. The endpoints resource should be owned by the service
-			// so that it will automatically be deleted upon service deletion. We are using
-			// a special metadata entry to track that this controller is responsible for
-			// the management of this resource.
-			_, err = rt.Client.Write(ctx, &pbresource.WriteRequest{
-				Resource: &pbresource.Resource{
-					Id:    req.ID,
-					Owner: serviceData.resource.Id,
-					Metadata: map[string]string{
-						endpointsMetaManagedBy: StatusKey,
-					},
-					Data: endpointData,
-				},
-			})
-			if err != nil {
-				rt.Logger.Error("error writing generated endpoints", "error", err)
-				return err
-			} else {
-				rt.Logger.Trace("updated endpoints were successfully written")
-			}
-		}
-	} else {
-		rt.Logger.Trace("endpoints are not being automatically managed")
-		// This service is not having its endpoints automatically managed
-		status = ConditionUnmanaged
-
-		// Inform the WorkloadMapper that it no longer needs to track this service
-		// as it is no longer under endpoint management
-		r.workloadMap.UntrackID(req.ID)
-
-		// Delete the managed ServiceEndpoints if necessary if the metadata would
-		// indicate that they were previously managed by this controller
-		if endpointsData != nil && endpointsData.resource.Metadata[endpointsMetaManagedBy] == StatusKey {
-			rt.Logger.Trace("removing previous managed endpoints")
-
-			// This performs a CAS deletion to protect against the case where the user
-			// has overwritten the endpoints since we fetched them.
-			_, err := rt.Client.Delete(ctx, &pbresource.DeleteRequest{
-				Id:      endpointsData.resource.Id,
-				Version: endpointsData.resource.Version,
-			})
-
-			// Potentially we could look for CAS failures by checking if the gRPC
-			// status code is Aborted. However its an edge case and there could
-			// possibly be other reasons why the gRPC status code would be aborted
-			// besides CAS version mismatches. The simplest thing to do is to just
-			// propagate the error and retry reconciliation later.
-			if err != nil {
-				rt.Logger.Error("error deleting previously managed endpoints", "error", err)
-				return err
-			}
-		}
-	}
-
-	// Update the Service status if necessary. Mainly we want to inform the user
-	// whether we are automatically managing the endpoints to set expectations
-	// for that object existing or not.
-	newStatus := &pbresource.Status{
-		ObservedGeneration: serviceData.resource.Generation,
-		Conditions: []*pbresource.Condition{
-			status,
-		},
-	}
-	// If the status is unchanged then we should return and avoid the unnecessary write
-	if resource.EqualStatus(serviceData.resource.Status[StatusKey], newStatus, false) {
-		return nil
-	}
-
-	_, err = rt.Client.WriteStatus(ctx, &pbresource.WriteStatusRequest{
-		Id:     serviceData.resource.Id,
-		Key:    StatusKey,
-		Status: newStatus,
-	})
-
-	if err != nil {
-		rt.Logger.Error("error updating the service's status", "error", err, "service", serviceID)
-	}
-	return err
-}
-
-// determineWorkloadHealth will find the workload-health controller's status
-// within the resource status and parse the workloads health out of it. If
-// the workload-health controller has yet to reconcile the workload health
-// or the status isn't in the expected form then this function will return
-// HEALTH_CRITICAL.
-func determineWorkloadHealth(workload *pbresource.Resource) pbcatalog.Health {
-	status, found := workload.Status[workloadhealth.StatusKey]
-	if !found {
-		return pbcatalog.Health_HEALTH_CRITICAL
-	}
-
-	for _, condition := range status.Conditions {
-		if condition.Type == workloadhealth.StatusConditionHealthy {
-			raw, found := pbcatalog.Health_value[condition.Reason]
-			if found {
-				return pbcatalog.Health(raw)
-			}
-			return pbcatalog.Health_HEALTH_CRITICAL
-		}
-	}
-	return pbcatalog.Health_HEALTH_CRITICAL
-}
-
-// serviceUnderManagement detects whether this service should have its
-// endpoints automatically managed by the controller
-func serviceUnderManagement(svc *pbcatalog.Service) bool {
-	sel := svc.GetWorkloads()
-	if sel == nil {
-		// The selector wasn't present at all. Therefore this service is not under
-		// automatic endpoint management.
-		return false
-	}
-
-	if len(sel.Names) < 1 && len(sel.Prefixes) < 1 {
-		// The selector was set in the request but the list of workload names
-		// and prefixes were both empty. Therefore this service is not under
-		// automatic endpoint management
-		return false
-	}
-
-	// Some workload selection criteria exists, so this service is considered
-	// under automatic endpoint management.
-	return true
-}
-
-// workloadsToEndpoints will translate the Workload resources into a ServiceEndpoints resource
-func workloadsToEndpoints(svc *pbcatalog.Service, workloads []*workloadData) *pbcatalog.ServiceEndpoints {
-	var endpoints []*pbcatalog.Endpoint
-
-	for _, workload := range workloads {
-		endpoint := workloadToEndpoint(svc, workload)
-		if endpoint != nil {
-			endpoints = append(endpoints, endpoint)
-		}
-	}
-
-	return &pbcatalog.ServiceEndpoints{
-		Endpoints: endpoints,
-	}
-}
-
-// workloadToEndpoint will convert a workload resource into a singular Endpoint to be
-// put within a ServiceEndpoints resource.
-//
-// The conversion process involves parsing the workloads health and filtering its
-// addresses and ports down to just what the service wants to consume.
-//
-// Determining the workloads health requires the workload-health controller to already
-// have reconciled the workloads health and stored it within the resources Status field.
-// Any unreconciled workload health will be represented in the ServiceEndpoints with
-// the ANY health status.
-func workloadToEndpoint(svc *pbcatalog.Service, data *workloadData) *pbcatalog.Endpoint {
-	health := determineWorkloadHealth(data.resource)
-
-	endpointPorts := make(map[string]*pbcatalog.WorkloadPort)
-
-	// Create the endpoints filtered ports map. Only workload ports specified in
-	// one of the services ports are included. Ports with a protocol mismatch
-	// between the service and workload will be excluded as well.
-	for _, svcPort := range svc.Ports {
-		workloadPort, found := data.workload.Ports[svcPort.TargetPort]
-		if !found {
-			// this workload doesn't have this port so ignore it
-			continue
-		}
-
-		// If workload protocol is not specified, we will default to service's protocol.
-		// This is because on some platforms (kubernetes), workload protocol is not always
-		// known, and so we need to inherit from the service instead.
-		if workloadPort.Protocol == pbcatalog.Protocol_PROTOCOL_UNSPECIFIED {
-			workloadPort.Protocol = svcPort.Protocol
-		} else if workloadPort.Protocol != svcPort.Protocol {
-			// Otherwise, there's workload port mismatch - ignore it.
-			continue
-		}
-
-		endpointPorts[svcPort.TargetPort] = workloadPort
-	}
-
-	var workloadAddrs []*pbcatalog.WorkloadAddress
-
-	// Now we filter down the addresses and their corresponding port usage to just
-	// what the service needs to consume. If the address isn't being used to serve
-	// any of the services target ports, it will be entirely excluded from the
-	// address list. If some but not all of its ports are served, then the list
-	// of ports will be reduced to just the intersection of the service ports
-	// and the workload addresses ports
-	for _, addr := range data.workload.Addresses {
-		var ports []string
-
-		if len(addr.Ports) > 0 {
-			// The workload address has defined ports, filter these as necessary
-
-			for _, portName := range addr.Ports {
-				// check if the workload port has been selected by the service
-				_, found := endpointPorts[portName]
-				if !found {
-					// this port isn't selected by the service so drop this port
-					continue
-				}
-
-				ports = append(ports, portName)
-			}
-		} else {
-			// The workload address doesn't specify ports. This lack of port specification
-			// means that all ports are exposed on the interface so here we create a list
-			// of all the port names exposed by the service.
-			for portName := range endpointPorts {
-				ports = append(ports, portName)
-			}
-		}
-
-		// sort the ports to keep them stable and prevent unnecessary rewrites when the endpoints
-		// get diffed
-		sort.Slice(ports, func(i, j int) bool {
-			return ports[i] < ports[j]
-		})
-
-		// Only record this workload address if one or more of its ports were consumed
-		// by the service.
-		if len(ports) > 0 {
-			workloadAddrs = append(workloadAddrs, &pbcatalog.WorkloadAddress{
-				Host:     addr.Host,
-				External: addr.External,
-				Ports:    ports,
-			})
-		}
-	}
-
-	// If all the workload addresses were filtered out then we should completely ignore
-	// the workload. While the name matched nothing else did so it isn't useable as
-	// far as the service is concerned.
-	if len(workloadAddrs) < 1 {
-		return nil
-	}
-
-	return &pbcatalog.Endpoint{
-		TargetRef:    data.resource.Id,
-		HealthStatus: health,
-		Addresses:    workloadAddrs,
-		Ports:        endpointPorts,
-		Identity:     data.workload.Identity,
-	}
-}
diff --git a/internal/catalog/internal/controllers/endpoints/controller_test.go b/internal/catalog/internal/controllers/endpoints/controller_test.go
deleted file mode 100644
index 8a725ce021cb0..0000000000000
--- a/internal/catalog/internal/controllers/endpoints/controller_test.go
+++ /dev/null
@@ -1,780 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package endpoints
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/workloadhealth"
-	"github.com/hashicorp/consul/internal/catalog/internal/types"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource/mappers/selectiontracker"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-)
-
-var (
-	badId = rtest.Resource(&pbresource.Type{Group: "not", Kind: "found", GroupVersion: "vfake"}, "foo").ID()
-)
-
-func TestWorkloadsToEndpoints(t *testing.T) {
-	// This test's purpose is to ensure that converting multiple workloads to endpoints
-	// happens as expected. It is not concerned with the data in each endpoint but rather
-	// the removal of unconvertable workloads (nil endpoints returned by workloadToEndpoint).
-
-	// The workload to endpoint conversion only cares about the service ports
-	service := &pbcatalog.Service{
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "http2", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-		},
-	}
-
-	workloadAddresses := []*pbcatalog.WorkloadAddress{
-		{Host: "127.0.0.1"},
-	}
-
-	// This workload is port-matched with the service and should show up as an
-	// endpoint in the final set.
-	workloadData1 := &pbcatalog.Workload{
-		Addresses: workloadAddresses,
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"http2": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-		},
-	}
-
-	// This workload is NOT port-matched with the service and should be omitted.
-	workloadData2 := &pbcatalog.Workload{
-		Addresses: workloadAddresses,
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-		},
-	}
-
-	// Build out the workloads.
-	workloads := []*workloadData{
-		{
-			// this workload should result in an endpoints
-			resource: rtest.Resource(pbcatalog.WorkloadType, "foo").
-				WithData(t, workloadData1).
-				Build(),
-			workload: workloadData1,
-		},
-		{
-			// this workload should be filtered out
-			resource: rtest.Resource(pbcatalog.WorkloadType, "bar").
-				WithData(t, workloadData2).
-				Build(),
-			workload: workloadData2,
-		},
-	}
-
-	endpoints := workloadsToEndpoints(service, workloads)
-	require.Len(t, endpoints.Endpoints, 1)
-	prototest.AssertDeepEqual(t, workloads[0].resource.Id, endpoints.Endpoints[0].TargetRef)
-}
-
-func TestWorkloadToEndpoint(t *testing.T) {
-	// This test handles ensuring that the bulk of the functionality of
-	// the workloadToEndpoint function works correctly.
-	//
-	// * WorkloadPorts that are not selected by one service port are ignored
-	//   and not present in the resulting Endpoint
-	// * WorkloadPorts that have a protocol mismatch with the service port
-	//   are ignored and not present in the resulting Endpoint
-	// * WorkloadAddresses with 0 non-ignored ports are omitted from the
-	//   resulting Endpoint.
-	// * Specifying no ports for a WorkloadAddress will use all the non-ignored
-	//   ports. These are explicitly set but that is intended to be an
-	//   implementation detail at this point.
-
-	service := &pbcatalog.Service{
-		Ports: []*pbcatalog.ServicePort{
-			// the workload will not have this port so it should be ignored
-			{TargetPort: "not-found", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-			{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			// the workload will have a different protocol for this port and so it
-			// will be ignored.
-			{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-		},
-	}
-
-	workload := &pbcatalog.Workload{
-		Addresses: []*pbcatalog.WorkloadAddress{
-			// this address will be in the endpoint with all the ports that are
-			// not filtered out - so just http
-			{Host: "127.0.0.1"},
-			// this address will be in the endpoint but with a filtered ports list
-			{Host: "198.18.1.1", Ports: []string{"http", "grpc"}},
-			// this address should not show up in the endpoint because the port it
-			// uses is filtered out
-			{Host: "198.8.0.1", Ports: []string{"grpc"}},
-		},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			// the protocol is wrong here so it will not show up in the endpoints.
-			"grpc": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-		},
-		Identity: "test-identity",
-	}
-
-	data := &workloadData{
-		resource: rtest.Resource(pbcatalog.WorkloadType, "foo").
-			WithData(t, workload).
-			Build(),
-		workload: workload,
-	}
-
-	expected := &pbcatalog.Endpoint{
-		TargetRef: data.resource.Id,
-		Addresses: []*pbcatalog.WorkloadAddress{
-			{Host: "127.0.0.1", Ports: []string{"http"}},
-			{Host: "198.18.1.1", Ports: []string{"http"}},
-		},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"http": workload.Ports["http"],
-		},
-		// The health is critical because we are not setting the workload's
-		// health status. The tests for determineWorkloadHealth will ensure
-		// that we can properly determine the health status and the overall
-		// controller tests will prove that the integration works as expected.
-		HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-		Identity:     workload.Identity,
-	}
-
-	prototest.AssertDeepEqual(t, expected, workloadToEndpoint(service, data))
-}
-
-func TestWorkloadToEndpoint_AllAddressesFiltered(t *testing.T) {
-	// This test checks the specific case where the workload has no
-	// address/port combinations that remain unfiltered. In this
-	// case we want to ensure nil is returned instead of an Endpoint
-	// with no addresses.
-
-	service := &pbcatalog.Service{
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "not-found", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-		},
-	}
-
-	workload := &pbcatalog.Workload{
-		Addresses: []*pbcatalog.WorkloadAddress{
-			{Host: "127.0.0.1"},
-		},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-		},
-	}
-
-	data := &workloadData{
-		resource: rtest.Resource(pbcatalog.WorkloadType, "foo").
-			WithData(t, workload).
-			Build(),
-		workload: workload,
-	}
-
-	require.Nil(t, workloadToEndpoint(service, data))
-}
-
-func TestWorkloadToEndpoint_MissingWorkloadProtocol(t *testing.T) {
-	// This test checks that when a workload is missing its protocol,
-	// we will default to service's protocol.
-
-	service := &pbcatalog.Service{
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "test-port", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-		},
-	}
-
-	workload := &pbcatalog.Workload{
-		Addresses: []*pbcatalog.WorkloadAddress{
-			{Host: "127.0.0.1"},
-		},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"test-port": {Port: 8080},
-		},
-	}
-
-	data := &workloadData{
-		resource: rtest.Resource(pbcatalog.WorkloadType, "foo").
-			WithData(t, workload).
-			Build(),
-		workload: workload,
-	}
-
-	expected := &pbcatalog.Endpoint{
-		TargetRef: data.resource.Id,
-		Addresses: []*pbcatalog.WorkloadAddress{
-			{Host: "127.0.0.1", Ports: []string{"test-port"}},
-		},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"test-port": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-		},
-		// The health is critical because we are not setting the workload's
-		// health status. The tests for determineWorkloadHealth will ensure
-		// that we can properly determine the health status and the overall
-		// controller tests will prove that the integration works as expected.
-		HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-		Identity:     workload.Identity,
-	}
-
-	prototest.AssertDeepEqual(t, expected, workloadToEndpoint(service, data))
-}
-
-func TestServiceUnderManagement(t *testing.T) {
-	// This test ensures that we can properly detect when a service
-	// should have endpoints generated for it vs when those endpoints
-	// are not being automatically managed.
-
-	type testCase struct {
-		svc     *pbcatalog.Service
-		managed bool
-	}
-
-	cases := map[string]testCase{
-		"nil": {
-			svc:     nil,
-			managed: false,
-		},
-		"nil-selector": {
-			svc:     &pbcatalog.Service{Workloads: nil},
-			managed: false,
-		},
-		"empty-selector": {
-			svc:     &pbcatalog.Service{Workloads: &pbcatalog.WorkloadSelector{}},
-			managed: false,
-		},
-		"exact-match": {
-			svc: &pbcatalog.Service{Workloads: &pbcatalog.WorkloadSelector{
-				Names: []string{"foo"},
-			}},
-			managed: true,
-		},
-		"prefix-match": {
-			svc: &pbcatalog.Service{Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"foo"},
-			}},
-			managed: true,
-		},
-		"multiple": {
-			svc: &pbcatalog.Service{Workloads: &pbcatalog.WorkloadSelector{
-				Names:    []string{"foo"},
-				Prefixes: []string{"api-"},
-			}},
-			managed: true,
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			require.Equal(t, tcase.managed, serviceUnderManagement(tcase.svc))
-		})
-	}
-}
-
-func TestDetermineWorkloadHealth(t *testing.T) {
-	// This test ensures that parsing workload health out of the
-	// resource status works as expected.
-
-	type testCase struct {
-		res      *pbresource.Resource
-		expected pbcatalog.Health
-	}
-
-	cases := map[string]testCase{
-		"no-status": {
-			res:      rtest.Resource(pbcatalog.WorkloadType, "foo").Build(),
-			expected: pbcatalog.Health_HEALTH_CRITICAL,
-		},
-		"condition-not-found": {
-			res: rtest.Resource(pbcatalog.WorkloadType, "foo").
-				WithStatus(workloadhealth.StatusKey, &pbresource.Status{
-					Conditions: []*pbresource.Condition{
-						{
-							Type:   "other",
-							State:  pbresource.Condition_STATE_TRUE,
-							Reason: "NOT_RELEVANT",
-						},
-					},
-				}).
-				Build(),
-			expected: pbcatalog.Health_HEALTH_CRITICAL,
-		},
-		"invalid-reason": {
-			res: rtest.Resource(pbcatalog.WorkloadType, "foo").
-				WithStatus(workloadhealth.StatusKey, &pbresource.Status{
-					Conditions: []*pbresource.Condition{
-						{
-							Type:   workloadhealth.StatusConditionHealthy,
-							State:  pbresource.Condition_STATE_TRUE,
-							Reason: "INVALID_HEALTH_STATUS_REASON",
-						},
-					},
-				}).
-				Build(),
-			expected: pbcatalog.Health_HEALTH_CRITICAL,
-		},
-		"passing": {
-			res: rtest.Resource(pbcatalog.WorkloadType, "foo").
-				WithStatus(workloadhealth.StatusKey, &pbresource.Status{
-					Conditions: []*pbresource.Condition{
-						{
-							Type:   workloadhealth.StatusConditionHealthy,
-							State:  pbresource.Condition_STATE_TRUE,
-							Reason: pbcatalog.Health_HEALTH_PASSING.String(),
-						},
-					},
-				}).
-				Build(),
-			expected: pbcatalog.Health_HEALTH_PASSING,
-		},
-		"warning": {
-			res: rtest.Resource(pbcatalog.WorkloadType, "foo").
-				WithStatus(workloadhealth.StatusKey, &pbresource.Status{
-					Conditions: []*pbresource.Condition{
-						{
-							Type:   workloadhealth.StatusConditionHealthy,
-							State:  pbresource.Condition_STATE_TRUE,
-							Reason: pbcatalog.Health_HEALTH_WARNING.String(),
-						},
-					},
-				}).
-				Build(),
-			expected: pbcatalog.Health_HEALTH_WARNING,
-		},
-		"critical": {
-			res: rtest.Resource(pbcatalog.WorkloadType, "foo").
-				WithStatus(workloadhealth.StatusKey, &pbresource.Status{
-					Conditions: []*pbresource.Condition{
-						{
-							Type:   workloadhealth.StatusConditionHealthy,
-							State:  pbresource.Condition_STATE_TRUE,
-							Reason: pbcatalog.Health_HEALTH_CRITICAL.String(),
-						},
-					},
-				}).
-				Build(),
-			expected: pbcatalog.Health_HEALTH_CRITICAL,
-		},
-		"maintenance": {
-			res: rtest.Resource(pbcatalog.WorkloadType, "foo").
-				WithStatus(workloadhealth.StatusKey, &pbresource.Status{
-					Conditions: []*pbresource.Condition{
-						{
-							Type:   workloadhealth.StatusConditionHealthy,
-							State:  pbresource.Condition_STATE_TRUE,
-							Reason: pbcatalog.Health_HEALTH_MAINTENANCE.String(),
-						},
-					},
-				}).
-				Build(),
-			expected: pbcatalog.Health_HEALTH_MAINTENANCE,
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			require.Equal(t, tcase.expected, determineWorkloadHealth(tcase.res))
-		})
-	}
-}
-
-type controllerSuite struct {
-	suite.Suite
-
-	ctx    context.Context
-	client *rtest.Client
-	rt     controller.Runtime
-
-	tracker    *selectiontracker.WorkloadSelectionTracker
-	reconciler *serviceEndpointsReconciler
-}
-
-func (suite *controllerSuite) SetupTest() {
-	suite.ctx = testutil.TestContext(suite.T())
-	client := svctest.RunResourceService(suite.T(), types.Register)
-	suite.rt = controller.Runtime{
-		Client: client,
-		Logger: testutil.Logger(suite.T()),
-	}
-	suite.client = rtest.NewClient(client)
-	suite.tracker = selectiontracker.New()
-	suite.reconciler = newServiceEndpointsReconciler(suite.tracker)
-}
-
-func (suite *controllerSuite) requireTracking(workload *pbresource.Resource, ids ...*pbresource.ID) {
-	reqs, err := suite.tracker.MapWorkload(suite.ctx, suite.rt, workload)
-	require.NoError(suite.T(), err)
-	require.Len(suite.T(), reqs, len(ids))
-	for _, id := range ids {
-		prototest.AssertContainsElement(suite.T(), reqs, controller.Request{ID: id})
-	}
-}
-
-func (suite *controllerSuite) requireEndpoints(resource *pbresource.Resource, expected ...*pbcatalog.Endpoint) {
-	var svcEndpoints pbcatalog.ServiceEndpoints
-	require.NoError(suite.T(), resource.Data.UnmarshalTo(&svcEndpoints))
-	require.Len(suite.T(), svcEndpoints.Endpoints, len(expected))
-	prototest.AssertElementsMatch(suite.T(), expected, svcEndpoints.Endpoints)
-}
-
-func (suite *controllerSuite) TestReconcile_ServiceNotFound() {
-	// This test's purpose is to ensure that when we are reconciling
-	// endpoints for a service that no longer exists, we stop
-	// tracking the endpoints resource ID in the selection tracker.
-
-	// generate a workload resource to use for checking if it maps
-	// to a service endpoints object
-	workload := rtest.Resource(pbcatalog.WorkloadType, "foo").Build()
-
-	// ensure that the tracker knows about the service prior to
-	// calling reconcile so that we can ensure it removes tracking
-	id := rtest.Resource(pbcatalog.ServiceEndpointsType, "not-found").ID()
-	suite.tracker.TrackIDForSelector(id, &pbcatalog.WorkloadSelector{Prefixes: []string{""}})
-
-	// verify that mapping the workload to service endpoints returns a
-	// non-empty list prior to reconciliation which should remove the
-	// tracking.
-	suite.requireTracking(workload, id)
-
-	// Because the endpoints don't exist, this reconcile call should
-	// cause tracking of the endpoints to be removed
-	err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	// Now ensure that the tracking was removed
-	suite.requireTracking(workload)
-}
-
-func (suite *controllerSuite) TestReconcile_NoSelector_NoEndpoints() {
-	// This test's purpose is to ensure that the service's status is
-	// updated to record that its endpoints are not being automatically
-	// managed. Additionally, with no endpoints pre-existing it will
-	// not attempt to delete them.
-
-	service := rtest.Resource(pbcatalog.ServiceType, "test").
-		WithData(suite.T(), &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		Write(suite.T(), suite.client)
-
-	endpointsID := rtest.Resource(pbcatalog.ServiceEndpointsType, "test").ID()
-
-	err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: endpointsID})
-	require.NoError(suite.T(), err)
-
-	suite.client.RequireStatusCondition(suite.T(), service.Id, StatusKey, ConditionUnmanaged)
-}
-
-func (suite *controllerSuite) TestReconcile_NoSelector_ManagedEndpoints() {
-	// This test's purpose is to ensure that when moving from managed endpoints
-	// to unmanaged endpoints for a service, any already generated managed endpoints
-	// get deleted.
-
-	service := rtest.Resource(pbcatalog.ServiceType, "test").
-		WithData(suite.T(), &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		Write(suite.T(), suite.client)
-
-	endpoints := rtest.Resource(pbcatalog.ServiceEndpointsType, "test").
-		WithData(suite.T(), &pbcatalog.ServiceEndpoints{}).
-		// this marks these endpoints as under management
-		WithMeta(endpointsMetaManagedBy, StatusKey).
-		Write(suite.T(), suite.client)
-
-	err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: endpoints.Id})
-	require.NoError(suite.T(), err)
-	// the status should indicate the services endpoints are not being managed
-	suite.client.RequireStatusCondition(suite.T(), service.Id, StatusKey, ConditionUnmanaged)
-	// endpoints under management should be deleted
-	suite.client.RequireResourceNotFound(suite.T(), endpoints.Id)
-}
-
-func (suite *controllerSuite) TestReconcile_NoSelector_UnmanagedEndpoints() {
-	// This test's purpose is to ensure that when re-reconciling a service that
-	// doesn't have its endpoints managed, that we do not delete any unmanaged
-	// ServiceEndpoints resource that the user would have manually written.
-
-	service := rtest.Resource(pbcatalog.ServiceType, "test").
-		WithData(suite.T(), &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		Write(suite.T(), suite.client)
-
-	endpoints := rtest.Resource(pbcatalog.ServiceEndpointsType, "test").
-		WithData(suite.T(), &pbcatalog.ServiceEndpoints{}).
-		Write(suite.T(), suite.client)
-
-	err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: endpoints.Id})
-	require.NoError(suite.T(), err)
-	// the status should indicate the services endpoints are not being managed
-	suite.client.RequireStatusCondition(suite.T(), service.Id, StatusKey, ConditionUnmanaged)
-	// unmanaged endpoints should not be deleted when the service is unmanaged
-	suite.client.RequireResourceExists(suite.T(), endpoints.Id)
-}
-
-func (suite *controllerSuite) TestReconcile_Managed_NoPreviousEndpoints() {
-	// This test's purpose is to ensure the managed endpoint generation occurs
-	// as expected when there are no pre-existing endpoints.
-
-	service := rtest.Resource(pbcatalog.ServiceType, "test").
-		WithData(suite.T(), &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{""},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		Write(suite.T(), suite.client)
-
-	endpointsID := rtest.Resource(pbcatalog.ServiceEndpointsType, "test").ID()
-
-	rtest.Resource(pbcatalog.WorkloadType, "test-workload").
-		WithData(suite.T(), &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{{Host: "127.0.0.1"}},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		Write(suite.T(), suite.client)
-
-	err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: endpointsID})
-	require.NoError(suite.T(), err)
-
-	// Verify that the services status has been set to indicate endpoints are automatically managed.
-	suite.client.RequireStatusCondition(suite.T(), service.Id, StatusKey, ConditionManaged)
-
-	// The service endpoints metadata should include our tag to indcate it was generated by this controller
-	res := suite.client.RequireResourceMeta(suite.T(), endpointsID, endpointsMetaManagedBy, StatusKey)
-
-	var endpoints pbcatalog.ServiceEndpoints
-	err = res.Data.UnmarshalTo(&endpoints)
-	require.NoError(suite.T(), err)
-	require.Len(suite.T(), endpoints.Endpoints, 1)
-	// We are not going to retest that the workloads to endpoints conversion process
-	// The length check should be sufficient to prove the endpoints are being
-	// converted. The unit tests for the workloadsToEndpoints functions prove that
-	// the process works correctly in all cases.
-}
-
-func (suite *controllerSuite) TestReconcile_Managed_ExistingEndpoints() {
-	// This test's purpose is to ensure that when the current set of endpoints
-	// differs from any prior set of endpoints that the resource gets rewritten.
-
-	service := rtest.Resource(pbcatalog.ServiceType, "test").
-		WithData(suite.T(), &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{""},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		Write(suite.T(), suite.client)
-
-	endpoints := rtest.Resource(pbcatalog.ServiceEndpointsType, "test").
-		WithData(suite.T(), &pbcatalog.ServiceEndpoints{}).
-		WithOwner(service.Id).
-		Write(suite.T(), suite.client)
-
-	rtest.Resource(pbcatalog.WorkloadType, "test-workload").
-		WithData(suite.T(), &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{{Host: "127.0.0.1"}},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		Write(suite.T(), suite.client)
-
-	err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: endpoints.Id})
-	require.NoError(suite.T(), err)
-
-	suite.client.RequireStatusCondition(suite.T(), service.Id, StatusKey, ConditionManaged)
-	res := suite.client.RequireResourceMeta(suite.T(), endpoints.Id, endpointsMetaManagedBy, StatusKey)
-
-	var newEndpoints pbcatalog.ServiceEndpoints
-	err = res.Data.UnmarshalTo(&newEndpoints)
-	require.NoError(suite.T(), err)
-	require.Len(suite.T(), newEndpoints.Endpoints, 1)
-}
-
-func (suite *controllerSuite) TestController() {
-	// This test's purpose is to exercise the controller in a halfway realistic way.
-	// Generally we are trying to go through the whole lifecycle of creating services,
-	// adding workloads, modifying workload health and modifying the service selection
-	// criteria. This isn't a full integration test as that would require also
-	// executing the workload health controller. Instead workload health status is
-	// synthesized as necessary.
-
-	// Run the controller manager
-	mgr := controller.NewManager(suite.client, suite.rt.Logger)
-	mgr.Register(ServiceEndpointsController(suite.tracker))
-	mgr.SetRaftLeader(true)
-	go mgr.Run(suite.ctx)
-
-	// Add a service - there are no workloads so an empty endpoints
-	// object should be created.
-	service := rtest.Resource(pbcatalog.ServiceType, "api").
-		WithData(suite.T(), &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		Write(suite.T(), suite.client)
-
-	// Wait for the controller to record that the endpoints are being managed
-	res := suite.client.WaitForReconciliation(suite.T(), service.Id, StatusKey)
-	// Check that the services status was updated accordingly
-	rtest.RequireStatusCondition(suite.T(), res, StatusKey, ConditionManaged)
-
-	// Check that the endpoints resource exists and contains 0 endpoints
-	endpointsID := rtest.Resource(pbcatalog.ServiceEndpointsType, "api").ID()
-	endpoints := suite.client.RequireResourceExists(suite.T(), endpointsID)
-	suite.requireEndpoints(endpoints)
-
-	// Now add a workload that would be selected by the service. Leave
-	// the workload in a state where its health has not been reconciled
-	workload := rtest.Resource(pbcatalog.WorkloadType, "api-1").
-		WithData(suite.T(), &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{{Host: "127.0.0.1"}},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				"grpc": {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-			},
-			Identity: "api",
-		}).
-		Write(suite.T(), suite.client)
-
-	// Wait for the endpoints to be regenerated
-	endpoints = suite.client.WaitForNewVersion(suite.T(), endpointsID, endpoints.Version)
-
-	// Verify that the generated endpoints now contain the workload
-	suite.requireEndpoints(endpoints, &pbcatalog.Endpoint{
-		TargetRef: workload.Id,
-		Addresses: []*pbcatalog.WorkloadAddress{
-			{Host: "127.0.0.1", Ports: []string{"http"}},
-		},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-		},
-		HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-		Identity:     "api",
-	})
-
-	// Update the health status of the workload
-	suite.client.WriteStatus(suite.ctx, &pbresource.WriteStatusRequest{
-		Id:  workload.Id,
-		Key: workloadhealth.StatusKey,
-		Status: &pbresource.Status{
-			ObservedGeneration: workload.Generation,
-			Conditions: []*pbresource.Condition{
-				{
-					Type:   workloadhealth.StatusConditionHealthy,
-					State:  pbresource.Condition_STATE_TRUE,
-					Reason: "HEALTH_PASSING",
-				},
-			},
-		},
-	})
-
-	// Wait for the endpoints to be regenerated
-	endpoints = suite.client.WaitForNewVersion(suite.T(), endpointsID, endpoints.Version)
-
-	// ensure the endpoint was put into the passing state
-	suite.requireEndpoints(endpoints, &pbcatalog.Endpoint{
-		TargetRef: workload.Id,
-		Addresses: []*pbcatalog.WorkloadAddress{
-			{Host: "127.0.0.1", Ports: []string{"http"}},
-		},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-		},
-		HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-		Identity:     "api",
-	})
-
-	// rewrite the service to add more selection criteria. This should trigger
-	// reconciliation but shouldn't result in updating the endpoints because
-	// the actual list of currently selected workloads has not changed
-	rtest.Resource(pbcatalog.ServiceType, "api").
-		WithData(suite.T(), &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-				Names:    []string{"doesnt-matter"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		Write(suite.T(), suite.client)
-
-	// Wait for the service status' observed generation to get bumped
-	service = suite.client.WaitForReconciliation(suite.T(), service.Id, StatusKey)
-
-	// Verify that the endpoints were not regenerated
-	suite.client.RequireVersionUnchanged(suite.T(), endpointsID, endpoints.Version)
-
-	// Update the service.
-	updatedService := rtest.Resource(pbcatalog.ServiceType, "api").
-		WithData(suite.T(), &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-			},
-		}).
-		Write(suite.T(), suite.client)
-
-	// Wait for the endpoints to be regenerated
-	endpoints = suite.client.WaitForNewVersion(suite.T(), endpointsID, endpoints.Version)
-	rtest.RequireOwner(suite.T(), endpoints, updatedService.Id, false)
-
-	// Delete the endpoints. The controller should bring these back momentarily
-	suite.client.Delete(suite.ctx, &pbresource.DeleteRequest{Id: endpointsID})
-
-	// Wait for controller to recreate the endpoints
-	retry.Run(suite.T(), func(r *retry.R) {
-		suite.client.RequireResourceExists(r, endpointsID)
-	})
-
-	// Move the service to having unmanaged endpoints
-	rtest.Resource(pbcatalog.ServiceType, "api").
-		WithData(suite.T(), &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		Write(suite.T(), suite.client)
-
-	res = suite.client.WaitForReconciliation(suite.T(), service.Id, StatusKey)
-	rtest.RequireStatusCondition(suite.T(), res, StatusKey, ConditionUnmanaged)
-
-	// Verify that the endpoints were deleted
-	suite.client.RequireResourceNotFound(suite.T(), endpointsID)
-}
-
-func TestController(t *testing.T) {
-	suite.Run(t, new(controllerSuite))
-}
diff --git a/internal/catalog/internal/controllers/endpoints/reconciliation_data.go b/internal/catalog/internal/controllers/endpoints/reconciliation_data.go
deleted file mode 100644
index 9bd0622714ffa..0000000000000
--- a/internal/catalog/internal/controllers/endpoints/reconciliation_data.go
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package endpoints
-
-import (
-	"context"
-	"sort"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type serviceData struct {
-	resource *pbresource.Resource
-	service  *pbcatalog.Service
-}
-
-type endpointsData struct {
-	resource  *pbresource.Resource
-	endpoints *pbcatalog.ServiceEndpoints
-}
-
-type workloadData struct {
-	resource *pbresource.Resource
-	workload *pbcatalog.Workload
-}
-
-// getServiceData will read the service with the given ID and unmarshal the
-// Data field. The return value is a struct that contains the retrieved
-// resource as well as the unmsashalled form. If the resource doesn't
-// exist, nil will be returned. Any other error either with retrieving
-// the resource or unmarshalling it will cause the error to be returned
-// to the caller
-func getServiceData(ctx context.Context, rt controller.Runtime, id *pbresource.ID) (*serviceData, error) {
-	rsp, err := rt.Client.Read(ctx, &pbresource.ReadRequest{Id: id})
-	switch {
-	case status.Code(err) == codes.NotFound:
-		return nil, nil
-	case err != nil:
-		return nil, err
-	}
-
-	var service pbcatalog.Service
-	err = rsp.Resource.Data.UnmarshalTo(&service)
-	if err != nil {
-		return nil, resource.NewErrDataParse(&service, err)
-	}
-
-	return &serviceData{resource: rsp.Resource, service: &service}, nil
-}
-
-// getEndpointsData will read the endpoints with the given ID and unmarshal the
-// Data field. The return value is a struct that contains the retrieved
-// resource as well as the unmsashalled form. If the resource doesn't
-// exist, nil will be returned. Any other error either with retrieving
-// the resource or unmarshalling it will cause the error to be returned
-// to the caller
-func getEndpointsData(ctx context.Context, rt controller.Runtime, id *pbresource.ID) (*endpointsData, error) {
-	rsp, err := rt.Client.Read(ctx, &pbresource.ReadRequest{Id: id})
-	switch {
-	case status.Code(err) == codes.NotFound:
-		return nil, nil
-	case err != nil:
-		return nil, err
-	}
-
-	var endpoints pbcatalog.ServiceEndpoints
-	err = rsp.Resource.Data.UnmarshalTo(&endpoints)
-	if err != nil {
-		return nil, resource.NewErrDataParse(&endpoints, err)
-	}
-
-	return &endpointsData{resource: rsp.Resource, endpoints: &endpoints}, nil
-}
-
-// getWorkloadData will retrieve all workloads for the given services selector
-// and unmarhshal them, returning a slic of objects hold both the resource and
-// unmarshaled forms. Unmarshalling errors, or other resource service errors
-// will be returned to the caller.
-func getWorkloadData(ctx context.Context, rt controller.Runtime, svc *serviceData) ([]*workloadData, error) {
-	workloadResources, err := gatherWorkloadsForService(ctx, rt, svc)
-	if err != nil {
-		return nil, err
-	}
-
-	var results []*workloadData
-	for _, res := range workloadResources {
-		var workload pbcatalog.Workload
-		err = res.Data.UnmarshalTo(&workload)
-		if err != nil {
-			return nil, resource.NewErrDataParse(&workload, err)
-		}
-
-		results = append(results, &workloadData{resource: res, workload: &workload})
-	}
-
-	return results, nil
-}
-
-// gatherWorkloadsForService will retrieve all the unique workloads for a given selector.
-// NotFound errors for workloads selected by Name will be ignored. Any other
-// resource service errors will be returned to the caller. Prior to returning
-// the slice of resources, they will be sorted by name. The consistent ordering
-// will allow callers to diff two versions of the data to determine if anything
-// has changed but it also will make testing a little easier.
-func gatherWorkloadsForService(ctx context.Context, rt controller.Runtime, svc *serviceData) ([]*pbresource.Resource, error) {
-	var workloads []*pbresource.Resource
-
-	sel := svc.service.GetWorkloads()
-
-	// this map will track all the gathered workloads by name, this is mainly to deduplicate workloads if they
-	// are specified multiple times throughout the list of selection criteria
-	workloadNames := make(map[string]struct{})
-
-	// First gather all the prefix matched workloads. We could do this second but by doing
-	// it first its possible we can avoid some resource service calls to read individual
-	// workloads selected by name if they are also matched by a prefix.
-	for _, prefix := range sel.GetPrefixes() {
-		rsp, err := rt.Client.List(ctx, &pbresource.ListRequest{
-			Type:       pbcatalog.WorkloadType,
-			Tenancy:    svc.resource.Id.Tenancy,
-			NamePrefix: prefix,
-		})
-		if err != nil {
-			return nil, err
-		}
-
-		// append all workloads in the list response to our list of all selected workloads
-		for _, workload := range rsp.Resources {
-			// ignore duplicate workloads
-			if _, found := workloadNames[workload.Id.Name]; !found {
-				workloads = append(workloads, workload)
-				workloadNames[workload.Id.Name] = struct{}{}
-			}
-		}
-	}
-
-	// Now gather the exact match selections
-	for _, name := range sel.GetNames() {
-		// ignore names we have already fetched
-		if _, found := workloadNames[name]; found {
-			continue
-		}
-
-		workloadID := &pbresource.ID{
-			Type:    pbcatalog.WorkloadType,
-			Tenancy: svc.resource.Id.Tenancy,
-			Name:    name,
-		}
-
-		rsp, err := rt.Client.Read(ctx, &pbresource.ReadRequest{Id: workloadID})
-		switch {
-		case status.Code(err) == codes.NotFound:
-			// Ignore not found errors as services may select workloads that do not
-			// yet exist. This is not considered an error state or mis-configuration
-			// as the user could be getting ready to add the workloads.
-			continue
-		case err != nil:
-			return nil, err
-		}
-
-		workloads = append(workloads, rsp.Resource)
-		workloadNames[rsp.Resource.Id.Name] = struct{}{}
-	}
-
-	// Sorting ensures deterministic output. This will help for testing but
-	// the real reason to do this is so we will be able to diff the set of
-	// workloads endpoints to determine if we need to update them.
-	sort.Slice(workloads, func(i, j int) bool {
-		return workloads[i].Id.Name < workloads[j].Id.Name
-	})
-
-	return workloads, nil
-}
diff --git a/internal/catalog/internal/controllers/endpoints/reconciliation_data_test.go b/internal/catalog/internal/controllers/endpoints/reconciliation_data_test.go
deleted file mode 100644
index d9bb3de7228bd..0000000000000
--- a/internal/catalog/internal/controllers/endpoints/reconciliation_data_test.go
+++ /dev/null
@@ -1,264 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package endpoints
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog/internal/types"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-type reconciliationDataSuite struct {
-	suite.Suite
-
-	ctx    context.Context
-	client pbresource.ResourceServiceClient
-	rt     controller.Runtime
-
-	apiServiceData *pbcatalog.Service
-	apiService     *pbresource.Resource
-	apiEndpoints   *pbresource.Resource
-	api1Workload   *pbresource.Resource
-	api2Workload   *pbresource.Resource
-	api123Workload *pbresource.Resource
-	web1Workload   *pbresource.Resource
-	web2Workload   *pbresource.Resource
-}
-
-func (suite *reconciliationDataSuite) SetupTest() {
-	suite.ctx = testutil.TestContext(suite.T())
-	suite.client = svctest.RunResourceService(suite.T(), types.Register)
-	suite.rt = controller.Runtime{
-		Client: suite.client,
-		Logger: testutil.Logger(suite.T()),
-	}
-
-	suite.apiServiceData = &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{
-			// This services selectors are specially crafted to exercise both the
-			// dedeuplication and sorting behaviors of gatherWorkloadsForService
-			Prefixes: []string{"api-"},
-			Names:    []string{"api-1", "web-2", "web-1", "api-1", "not-found"},
-		},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort: "http",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-		},
-	}
-
-	suite.apiService = rtest.Resource(pbcatalog.ServiceType, "api").
-		WithData(suite.T(), suite.apiServiceData).
-		Write(suite.T(), suite.client)
-
-	suite.api1Workload = rtest.Resource(pbcatalog.WorkloadType, "api-1").
-		WithData(suite.T(), &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "127.0.0.1"},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-			Identity: "api",
-		}).
-		Write(suite.T(), suite.client)
-
-	suite.api2Workload = rtest.Resource(pbcatalog.WorkloadType, "api-2").
-		WithData(suite.T(), &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "127.0.0.1"},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-			Identity: "api",
-		}).
-		Write(suite.T(), suite.client)
-
-	suite.api123Workload = rtest.Resource(pbcatalog.WorkloadType, "api-123").
-		WithData(suite.T(), &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "127.0.0.1"},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-			Identity: "api",
-		}).
-		Write(suite.T(), suite.client)
-
-	suite.web1Workload = rtest.Resource(pbcatalog.WorkloadType, "web-1").
-		WithData(suite.T(), &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "127.0.0.1"},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-			Identity: "web",
-		}).
-		Write(suite.T(), suite.client)
-
-	suite.web2Workload = rtest.Resource(pbcatalog.WorkloadType, "web-2").
-		WithData(suite.T(), &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "127.0.0.1"},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-			Identity: "web",
-		}).
-		Write(suite.T(), suite.client)
-
-	suite.apiEndpoints = rtest.Resource(pbcatalog.ServiceEndpointsType, "api").
-		WithData(suite.T(), &pbcatalog.ServiceEndpoints{
-			Endpoints: []*pbcatalog.Endpoint{
-				{
-					TargetRef: rtest.Resource(pbcatalog.WorkloadType, "api-1").WithTenancy(resource.DefaultNamespacedTenancy()).ID(),
-					Addresses: []*pbcatalog.WorkloadAddress{
-						{
-							Host:  "127.0.0.1",
-							Ports: []string{"http"},
-						},
-					},
-					Ports: map[string]*pbcatalog.WorkloadPort{
-						"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					},
-					HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-				},
-			},
-		}).
-		Write(suite.T(), suite.client)
-}
-
-func (suite *reconciliationDataSuite) TestGetServiceData_NotFound() {
-	// This test's purposes is to ensure that NotFound errors when retrieving
-	// the service data are ignored properly.
-	data, err := getServiceData(suite.ctx, suite.rt, rtest.Resource(pbcatalog.ServiceType, "not-found").WithTenancy(resource.DefaultNamespacedTenancy()).ID())
-	require.NoError(suite.T(), err)
-	require.Nil(suite.T(), data)
-}
-
-func (suite *reconciliationDataSuite) TestGetServiceData_ReadError() {
-	// This test's purpose is to ensure that Read errors other than NotFound
-	// are propagated back to the caller. Specifying a resource ID with an
-	// unregistered type is the easiest way to force a resource service error.
-	badType := &pbresource.Type{
-		Group:        "not",
-		Kind:         "found",
-		GroupVersion: "vfake",
-	}
-	data, err := getServiceData(suite.ctx, suite.rt, rtest.Resource(badType, "foo").ID())
-	require.Error(suite.T(), err)
-	require.Equal(suite.T(), codes.InvalidArgument, status.Code(err))
-	require.Nil(suite.T(), data)
-}
-
-func (suite *reconciliationDataSuite) TestGetServiceData_UnmarshalError() {
-	// This test's purpose is to ensure that unmarshlling errors are returned
-	// to the caller. We are using a resource id that points to an endpoints
-	// object instead of a service to ensure that the data will be unmarshallable.
-	data, err := getServiceData(suite.ctx, suite.rt, rtest.Resource(pbcatalog.ServiceEndpointsType, "api").ID())
-	require.Error(suite.T(), err)
-	var parseErr resource.ErrDataParse
-	require.ErrorAs(suite.T(), err, &parseErr)
-	require.Nil(suite.T(), data)
-}
-
-func (suite *reconciliationDataSuite) TestGetServiceData_Ok() {
-	// This test's purpose is to ensure that the happy path for
-	// retrieving a service works as expected.
-	data, err := getServiceData(suite.ctx, suite.rt, suite.apiService.Id)
-	require.NoError(suite.T(), err)
-	require.NotNil(suite.T(), data)
-	require.NotNil(suite.T(), data.resource)
-	prototest.AssertDeepEqual(suite.T(), suite.apiService.Id, data.resource.Id)
-	require.Len(suite.T(), data.service.Ports, 1)
-}
-
-func (suite *reconciliationDataSuite) TestGetEndpointsData_NotFound() {
-	// This test's purposes is to ensure that NotFound errors when retrieving
-	// the endpoint data are ignored properly.
-	data, err := getEndpointsData(suite.ctx, suite.rt, rtest.Resource(pbcatalog.ServiceEndpointsType, "not-found").ID())
-	require.NoError(suite.T(), err)
-	require.Nil(suite.T(), data)
-}
-
-func (suite *reconciliationDataSuite) TestGetEndpointsData_ReadError() {
-	// This test's purpose is to ensure that Read errors other than NotFound
-	// are propagated back to the caller. Specifying a resource ID with an
-	// unregistered type is the easiest way to force a resource service error.
-	badType := &pbresource.Type{
-		Group:        "not",
-		Kind:         "found",
-		GroupVersion: "vfake",
-	}
-	data, err := getEndpointsData(suite.ctx, suite.rt, rtest.Resource(badType, "foo").ID())
-	require.Error(suite.T(), err)
-	require.Equal(suite.T(), codes.InvalidArgument, status.Code(err))
-	require.Nil(suite.T(), data)
-}
-
-func (suite *reconciliationDataSuite) TestGetEndpointsData_UnmarshalError() {
-	// This test's purpose is to ensure that unmarshlling errors are returned
-	// to the caller. We are using a resource id that points to a service object
-	// instead of an endpoints object to ensure that the data will be unmarshallable.
-	data, err := getEndpointsData(suite.ctx, suite.rt, rtest.Resource(pbcatalog.ServiceType, "api").ID())
-	require.Error(suite.T(), err)
-	var parseErr resource.ErrDataParse
-	require.ErrorAs(suite.T(), err, &parseErr)
-	require.Nil(suite.T(), data)
-}
-
-func (suite *reconciliationDataSuite) TestGetEndpointsData_Ok() {
-	// This test's purpose is to ensure that the happy path for
-	// retrieving an endpoints object works as expected.
-	data, err := getEndpointsData(suite.ctx, suite.rt, suite.apiEndpoints.Id)
-	require.NoError(suite.T(), err)
-	require.NotNil(suite.T(), data)
-	require.NotNil(suite.T(), data.resource)
-	prototest.AssertDeepEqual(suite.T(), suite.apiEndpoints.Id, data.resource.Id)
-	require.Len(suite.T(), data.endpoints.Endpoints, 1)
-}
-
-func (suite *reconciliationDataSuite) TestGetWorkloadData() {
-	// This test's purpose is to ensure that gather workloads for
-	// a service work as expected. The services selector was crafted
-	// to exercise the deduplication behavior as well as the sorting
-	// behavior. The assertions in this test will verify that only
-	// unique workloads are returned and that they are ordered.
-
-	data, err := getWorkloadData(suite.ctx, suite.rt, &serviceData{
-		resource: suite.apiService,
-		service:  suite.apiServiceData,
-	})
-
-	require.NoError(suite.T(), err)
-	require.Len(suite.T(), data, 5)
-	prototest.AssertDeepEqual(suite.T(), suite.api1Workload, data[0].resource)
-	prototest.AssertDeepEqual(suite.T(), suite.api123Workload, data[1].resource)
-	prototest.AssertDeepEqual(suite.T(), suite.api2Workload, data[2].resource)
-	prototest.AssertDeepEqual(suite.T(), suite.web1Workload, data[3].resource)
-	prototest.AssertDeepEqual(suite.T(), suite.web2Workload, data[4].resource)
-}
-
-func TestReconciliationData(t *testing.T) {
-	suite.Run(t, new(reconciliationDataSuite))
-}
diff --git a/internal/catalog/internal/controllers/endpoints/status.go b/internal/catalog/internal/controllers/endpoints/status.go
deleted file mode 100644
index 75066978361ca..0000000000000
--- a/internal/catalog/internal/controllers/endpoints/status.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package endpoints
-
-import "github.com/hashicorp/consul/proto-public/pbresource"
-
-const (
-	StatusKey                       = "consul.io/endpoint-manager"
-	StatusConditionEndpointsManaged = "EndpointsManaged"
-
-	StatusReasonSelectorNotFound = "SelectorNotFound"
-	StatusReasonSelectorFound    = "SelectorFound"
-
-	SelectorFoundMessage    = "A valid workload selector is present within the service."
-	SelectorNotFoundMessage = "Either the workload selector was not present or contained no selection criteria."
-)
-
-var (
-	ConditionManaged = &pbresource.Condition{
-		Type:    StatusConditionEndpointsManaged,
-		State:   pbresource.Condition_STATE_TRUE,
-		Reason:  StatusReasonSelectorFound,
-		Message: SelectorFoundMessage,
-	}
-
-	ConditionUnmanaged = &pbresource.Condition{
-		Type:    StatusConditionEndpointsManaged,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  StatusReasonSelectorNotFound,
-		Message: SelectorNotFoundMessage,
-	}
-)
diff --git a/internal/catalog/internal/controllers/failover/controller.go b/internal/catalog/internal/controllers/failover/controller.go
deleted file mode 100644
index ef236b954ca4e..0000000000000
--- a/internal/catalog/internal/controllers/failover/controller.go
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package failover
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/internal/catalog/internal/types"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// FailoverMapper tracks the relationship between a FailoverPolicy an a Service
-// it references whether due to name-alignment or from a reference in a
-// FailoverDestination leg.
-type FailoverMapper interface {
-	// TrackFailover extracts all Service references from the provided
-	// FailoverPolicy and indexes them so that MapService can turn Service
-	// events into FailoverPolicy events properly.
-	TrackFailover(failover *resource.DecodedResource[*pbcatalog.FailoverPolicy])
-
-	// UntrackFailover forgets the links inserted by TrackFailover for the
-	// provided FailoverPolicyID.
-	UntrackFailover(failoverID *pbresource.ID)
-
-	// MapService will take a Service resource and return controller requests
-	// for all FailoverPolicies associated with the Service.
-	MapService(ctx context.Context, rt controller.Runtime, res *pbresource.Resource) ([]controller.Request, error)
-}
-
-func FailoverPolicyController(mapper FailoverMapper) controller.Controller {
-	if mapper == nil {
-		panic("No FailoverMapper was provided to the FailoverPolicyController constructor")
-	}
-	return controller.ForType(pbcatalog.FailoverPolicyType).
-		WithWatch(pbcatalog.ServiceType, mapper.MapService).
-		WithReconciler(newFailoverPolicyReconciler(mapper))
-}
-
-type failoverPolicyReconciler struct {
-	mapper FailoverMapper
-}
-
-func newFailoverPolicyReconciler(mapper FailoverMapper) *failoverPolicyReconciler {
-	return &failoverPolicyReconciler{
-		mapper: mapper,
-	}
-}
-
-func (r *failoverPolicyReconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	// The runtime is passed by value so replacing it here for the remainder of this
-	// reconciliation request processing will not affect future invocations.
-	rt.Logger = rt.Logger.With("resource-id", req.ID, "controller", StatusKey)
-
-	rt.Logger.Trace("reconciling failover policy")
-
-	failoverPolicyID := req.ID
-
-	failoverPolicy, err := getFailoverPolicy(ctx, rt, failoverPolicyID)
-	if err != nil {
-		rt.Logger.Error("error retrieving failover policy", "error", err)
-		return err
-	}
-	if failoverPolicy == nil {
-		r.mapper.UntrackFailover(failoverPolicyID)
-
-		// Either the failover policy was deleted, or it doesn't exist but an
-		// update to a Service came through and we can ignore it.
-		return nil
-	}
-
-	r.mapper.TrackFailover(failoverPolicy)
-
-	// FailoverPolicy is name-aligned with the Service it controls.
-	serviceID := &pbresource.ID{
-		Type:    pbcatalog.ServiceType,
-		Tenancy: failoverPolicyID.Tenancy,
-		Name:    failoverPolicyID.Name,
-	}
-
-	service, err := getService(ctx, rt, serviceID)
-	if err != nil {
-		rt.Logger.Error("error retrieving corresponding service", "error", err)
-		return err
-	}
-	destServices := make(map[resource.ReferenceKey]*resource.DecodedResource[*pbcatalog.Service])
-	if service != nil {
-		destServices[resource.NewReferenceKey(serviceID)] = service
-	}
-
-	// Denorm the ports and stuff. After this we have no empty ports.
-	if service != nil {
-		failoverPolicy.Data = types.SimplifyFailoverPolicy(
-			service.Data,
-			failoverPolicy.Data,
-		)
-	}
-
-	// Fetch services.
-	for _, dest := range failoverPolicy.Data.GetUnderlyingDestinations() {
-		if dest.Ref == nil || !isServiceType(dest.Ref.Type) || dest.Ref.Section != "" {
-			continue // invalid, not possible due to validation hook
-		}
-
-		key := resource.NewReferenceKey(dest.Ref)
-
-		if _, ok := destServices[key]; ok {
-			continue
-		}
-
-		destID := resource.IDFromReference(dest.Ref)
-
-		destService, err := getService(ctx, rt, destID)
-		if err != nil {
-			rt.Logger.Error("error retrieving destination service", "service", key, "error", err)
-			return err
-		}
-
-		if destService != nil {
-			destServices[key] = destService
-		}
-	}
-
-	newStatus := computeNewStatus(failoverPolicy, service, destServices)
-
-	if resource.EqualStatus(failoverPolicy.Resource.Status[StatusKey], newStatus, false) {
-		rt.Logger.Trace("resource's failover policy status is unchanged",
-			"conditions", newStatus.Conditions)
-		return nil
-	}
-
-	_, err = rt.Client.WriteStatus(ctx, &pbresource.WriteStatusRequest{
-		Id:     failoverPolicy.Resource.Id,
-		Key:    StatusKey,
-		Status: newStatus,
-	})
-
-	if err != nil {
-		rt.Logger.Error("error encountered when attempting to update the resource's failover policy status", "error", err)
-		return err
-	}
-
-	rt.Logger.Trace("resource's failover policy status was updated",
-		"conditions", newStatus.Conditions)
-	return nil
-}
-
-func getFailoverPolicy(ctx context.Context, rt controller.Runtime, id *pbresource.ID) (*resource.DecodedResource[*pbcatalog.FailoverPolicy], error) {
-	return resource.GetDecodedResource[*pbcatalog.FailoverPolicy](ctx, rt.Client, id)
-}
-
-func getService(ctx context.Context, rt controller.Runtime, id *pbresource.ID) (*resource.DecodedResource[*pbcatalog.Service], error) {
-	return resource.GetDecodedResource[*pbcatalog.Service](ctx, rt.Client, id)
-}
-
-func computeNewStatus(
-	failoverPolicy *resource.DecodedResource[*pbcatalog.FailoverPolicy],
-	service *resource.DecodedResource[*pbcatalog.Service],
-	destServices map[resource.ReferenceKey]*resource.DecodedResource[*pbcatalog.Service],
-) *pbresource.Status {
-	if service == nil {
-		return &pbresource.Status{
-			ObservedGeneration: failoverPolicy.Resource.Generation,
-			Conditions: []*pbresource.Condition{
-				ConditionMissingService,
-			},
-		}
-	}
-
-	allowedPortProtocols := make(map[string]pbcatalog.Protocol)
-	for _, port := range service.Data.Ports {
-		if port.Protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-			continue // skip
-		}
-		allowedPortProtocols[port.TargetPort] = port.Protocol
-	}
-
-	var conditions []*pbresource.Condition
-
-	if failoverPolicy.Data.Config != nil {
-		for _, dest := range failoverPolicy.Data.Config.Destinations {
-			// We know from validation that a Ref must be set, and the type it
-			// points to is a Service.
-			//
-			// Rather than do additional validation, just do a quick
-			// belt-and-suspenders check-and-skip if something looks weird.
-			if dest.Ref == nil || !isServiceType(dest.Ref.Type) {
-				continue
-			}
-
-			if cond := serviceHasPort(dest, destServices); cond != nil {
-				conditions = append(conditions, cond)
-			}
-		}
-		// TODO: validate that referenced sameness groups exist
-	}
-
-	for port, pc := range failoverPolicy.Data.PortConfigs {
-		if _, ok := allowedPortProtocols[port]; !ok {
-			conditions = append(conditions, ConditionUnknownPort(port))
-		}
-
-		for _, dest := range pc.Destinations {
-			// We know from validation that a Ref must be set, and the type it
-			// points to is a Service.
-			//
-			// Rather than do additional validation, just do a quick
-			// belt-and-suspenders check-and-skip if something looks weird.
-			if dest.Ref == nil || !isServiceType(dest.Ref.Type) {
-				continue
-			}
-
-			if cond := serviceHasPort(dest, destServices); cond != nil {
-				conditions = append(conditions, cond)
-			}
-		}
-
-		// TODO: validate that referenced sameness groups exist
-	}
-
-	if len(conditions) > 0 {
-		return &pbresource.Status{
-			ObservedGeneration: failoverPolicy.Resource.Generation,
-			Conditions:         conditions,
-		}
-	}
-
-	return &pbresource.Status{
-		ObservedGeneration: failoverPolicy.Resource.Generation,
-		Conditions: []*pbresource.Condition{
-			ConditionOK,
-		},
-	}
-}
-
-func serviceHasPort(
-	dest *pbcatalog.FailoverDestination,
-	destServices map[resource.ReferenceKey]*resource.DecodedResource[*pbcatalog.Service],
-) *pbresource.Condition {
-	key := resource.NewReferenceKey(dest.Ref)
-	destService, ok := destServices[key]
-	if !ok {
-		return ConditionMissingDestinationService(dest.Ref)
-	}
-
-	found := false
-	mesh := false
-	for _, port := range destService.Data.Ports {
-		if port.TargetPort == dest.Port {
-			found = true
-			if port.Protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-				mesh = true
-			}
-			break
-		}
-	}
-
-	if !found {
-		return ConditionUnknownDestinationPort(dest.Ref, dest.Port)
-	} else if mesh {
-		return ConditionUsingMeshDestinationPort(dest.Ref, dest.Port)
-	}
-
-	return nil
-}
-
-func isServiceType(typ *pbresource.Type) bool {
-	switch {
-	case resource.EqualType(typ, pbcatalog.ServiceType):
-		return true
-	}
-	return false
-}
diff --git a/internal/catalog/internal/controllers/failover/controller_test.go b/internal/catalog/internal/controllers/failover/controller_test.go
deleted file mode 100644
index a82a6f0fdee60..0000000000000
--- a/internal/catalog/internal/controllers/failover/controller_test.go
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package failover
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/suite"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog/internal/mappers/failovermapper"
-	"github.com/hashicorp/consul/internal/catalog/internal/types"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-type controllerSuite struct {
-	suite.Suite
-
-	ctx    context.Context
-	client *rtest.Client
-	rt     controller.Runtime
-
-	failoverMapper FailoverMapper
-
-	ctl failoverPolicyReconciler
-}
-
-func (suite *controllerSuite) SetupTest() {
-	suite.ctx = testutil.TestContext(suite.T())
-	client := svctest.RunResourceService(suite.T(), types.Register)
-	suite.rt = controller.Runtime{
-		Client: client,
-		Logger: testutil.Logger(suite.T()),
-	}
-	suite.client = rtest.NewClient(client)
-
-	suite.failoverMapper = failovermapper.New()
-}
-
-func (suite *controllerSuite) TestController() {
-	// This test's purpose is to exercise the controller in a halfway realistic
-	// way, verifying the event triggers work in the live code.
-
-	// Run the controller manager
-	mgr := controller.NewManager(suite.client, suite.rt.Logger)
-	mgr.Register(FailoverPolicyController(suite.failoverMapper))
-	mgr.SetRaftLeader(true)
-	go mgr.Run(suite.ctx)
-
-	// Create an advance pointer to some services.
-	apiServiceRef := resource.Reference(rtest.Resource(pbcatalog.ServiceType, "api").WithTenancy(resource.DefaultNamespacedTenancy()).ID(), "")
-	otherServiceRef := resource.Reference(rtest.Resource(pbcatalog.ServiceType, "other").WithTenancy(resource.DefaultNamespacedTenancy()).ID(), "")
-
-	// create a failover without any services
-	failoverData := &pbcatalog.FailoverPolicy{
-		Config: &pbcatalog.FailoverConfig{
-			Destinations: []*pbcatalog.FailoverDestination{{
-				Ref: apiServiceRef,
-			}},
-		},
-	}
-	failover := rtest.Resource(pbcatalog.FailoverPolicyType, "api").
-		WithData(suite.T(), failoverData).
-		Write(suite.T(), suite.client)
-
-	suite.client.WaitForStatusCondition(suite.T(), failover.Id, StatusKey, ConditionMissingService)
-
-	// Provide the service.
-	apiServiceData := &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"api-"}},
-		Ports: []*pbcatalog.ServicePort{{
-			TargetPort: "http",
-			Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-		}},
-	}
-	_ = rtest.Resource(pbcatalog.ServiceType, "api").
-		WithData(suite.T(), apiServiceData).
-		Write(suite.T(), suite.client)
-	suite.client.WaitForStatusCondition(suite.T(), failover.Id, StatusKey, ConditionOK)
-
-	// Update the failover to reference an unknown port
-	failoverData = &pbcatalog.FailoverPolicy{
-		PortConfigs: map[string]*pbcatalog.FailoverConfig{
-			"http": {
-				Destinations: []*pbcatalog.FailoverDestination{{
-					Ref:  apiServiceRef,
-					Port: "http",
-				}},
-			},
-			"admin": {
-				Destinations: []*pbcatalog.FailoverDestination{{
-					Ref:  apiServiceRef,
-					Port: "admin",
-				}},
-			},
-		},
-	}
-	_ = rtest.Resource(pbcatalog.FailoverPolicyType, "api").
-		WithData(suite.T(), failoverData).
-		Write(suite.T(), suite.client)
-	suite.client.WaitForStatusCondition(suite.T(), failover.Id, StatusKey, ConditionUnknownPort("admin"))
-
-	// update the service to fix the stray reference, but point to a mesh port
-	apiServiceData = &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"api-"}},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort: "http",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-			{
-				TargetPort: "admin",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_MESH,
-			},
-		},
-	}
-	_ = rtest.Resource(pbcatalog.ServiceType, "api").
-		WithData(suite.T(), apiServiceData).
-		Write(suite.T(), suite.client)
-	suite.client.WaitForStatusCondition(suite.T(), failover.Id, StatusKey, ConditionUsingMeshDestinationPort(apiServiceRef, "admin"))
-
-	// update the service to fix the stray reference to not be a mesh port
-	apiServiceData = &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"api-"}},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort: "http",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-			{
-				TargetPort: "admin",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-		},
-	}
-	_ = rtest.Resource(pbcatalog.ServiceType, "api").
-		WithData(suite.T(), apiServiceData).
-		Write(suite.T(), suite.client)
-	suite.client.WaitForStatusCondition(suite.T(), failover.Id, StatusKey, ConditionOK)
-
-	// change failover leg to point to missing service
-	failoverData = &pbcatalog.FailoverPolicy{
-		PortConfigs: map[string]*pbcatalog.FailoverConfig{
-			"http": {
-				Destinations: []*pbcatalog.FailoverDestination{{
-					Ref:  apiServiceRef,
-					Port: "http",
-				}},
-			},
-			"admin": {
-				Destinations: []*pbcatalog.FailoverDestination{{
-					Ref:  otherServiceRef,
-					Port: "admin",
-				}},
-			},
-		},
-	}
-	_ = rtest.Resource(pbcatalog.FailoverPolicyType, "api").
-		WithData(suite.T(), failoverData).
-		Write(suite.T(), suite.client)
-	suite.client.WaitForStatusCondition(suite.T(), failover.Id, StatusKey, ConditionMissingDestinationService(otherServiceRef))
-
-	// Create the missing service, but forget the port.
-	otherServiceData := &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"other-"}},
-		Ports: []*pbcatalog.ServicePort{{
-			TargetPort: "http",
-			Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-		}},
-	}
-	_ = rtest.Resource(pbcatalog.ServiceType, "other").
-		WithData(suite.T(), otherServiceData).
-		Write(suite.T(), suite.client)
-	suite.client.WaitForStatusCondition(suite.T(), failover.Id, StatusKey, ConditionUnknownDestinationPort(otherServiceRef, "admin"))
-
-	// fix the destination leg's port
-	otherServiceData = &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"other-"}},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort: "http",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-			{
-				TargetPort: "admin",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-		},
-	}
-	_ = rtest.Resource(pbcatalog.ServiceType, "other").
-		WithData(suite.T(), otherServiceData).
-		Write(suite.T(), suite.client)
-	suite.client.WaitForStatusCondition(suite.T(), failover.Id, StatusKey, ConditionOK)
-
-	// Update the two services to use differnet port names so the easy path doesn't work
-	apiServiceData = &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"api-"}},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort: "foo",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-			{
-				TargetPort: "bar",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-		},
-	}
-	_ = rtest.Resource(pbcatalog.ServiceType, "api").
-		WithData(suite.T(), apiServiceData).
-		Write(suite.T(), suite.client)
-
-	otherServiceData = &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"other-"}},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort: "foo",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-			{
-				TargetPort: "baz",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-		},
-	}
-	_ = rtest.Resource(pbcatalog.ServiceType, "other").
-		WithData(suite.T(), otherServiceData).
-		Write(suite.T(), suite.client)
-
-	failoverData = &pbcatalog.FailoverPolicy{
-		Config: &pbcatalog.FailoverConfig{
-			Destinations: []*pbcatalog.FailoverDestination{{
-				Ref: otherServiceRef,
-			}},
-		},
-	}
-	failover = rtest.Resource(pbcatalog.FailoverPolicyType, "api").
-		WithData(suite.T(), failoverData).
-		Write(suite.T(), suite.client)
-
-	suite.client.WaitForStatusCondition(suite.T(), failover.Id, StatusKey, ConditionUnknownDestinationPort(otherServiceRef, "bar"))
-
-	// and fix it the silly way by removing it from api+failover
-	apiServiceData = &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"api-"}},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort: "foo",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-		},
-	}
-	_ = rtest.Resource(pbcatalog.ServiceType, "api").
-		WithData(suite.T(), apiServiceData).
-		Write(suite.T(), suite.client)
-
-	suite.client.WaitForStatusCondition(suite.T(), failover.Id, StatusKey, ConditionOK)
-}
-
-func TestFailoverController(t *testing.T) {
-	suite.Run(t, new(controllerSuite))
-}
diff --git a/internal/catalog/internal/controllers/failover/status.go b/internal/catalog/internal/controllers/failover/status.go
deleted file mode 100644
index b2801c41ed93e..0000000000000
--- a/internal/catalog/internal/controllers/failover/status.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package failover
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	StatusKey               = "consul.io/failover-policy"
-	StatusConditionAccepted = "accepted"
-
-	OKReason  = "Ok"
-	OKMessage = "failover policy was accepted"
-
-	MissingServiceReason  = "MissingService"
-	MissingServiceMessage = "service for failover policy does not exist"
-
-	UnknownPortReason        = "UnknownPort"
-	UnknownPortMessagePrefix = "port is not defined on service: "
-
-	MissingDestinationServiceReason        = "MissingDestinationService"
-	MissingDestinationServiceMessagePrefix = "destination service for failover policy does not exist: "
-
-	UnknownDestinationPortReason        = "UnknownDestinationPort"
-	UnknownDestinationPortMessagePrefix = "port is not defined on destination service: "
-
-	UsingMeshDestinationPortReason        = "UsingMeshDestinationPort"
-	UsingMeshDestinationPortMessagePrefix = "port is a special unroutable mesh port on destination service: "
-)
-
-var (
-	ConditionOK = &pbresource.Condition{
-		Type:    StatusConditionAccepted,
-		State:   pbresource.Condition_STATE_TRUE,
-		Reason:  OKReason,
-		Message: OKMessage,
-	}
-
-	ConditionMissingService = &pbresource.Condition{
-		Type:    StatusConditionAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  MissingServiceReason,
-		Message: MissingServiceMessage,
-	}
-)
-
-func ConditionUnknownPort(port string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  UnknownPortReason,
-		Message: UnknownPortMessagePrefix + port,
-	}
-}
-
-func ConditionMissingDestinationService(ref *pbresource.Reference) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  MissingDestinationServiceReason,
-		Message: MissingDestinationServiceMessagePrefix + resource.ReferenceToString(ref),
-	}
-}
-
-func ConditionUnknownDestinationPort(ref *pbresource.Reference, port string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  UnknownDestinationPortReason,
-		Message: UnknownDestinationPortMessagePrefix + port + " on " + resource.ReferenceToString(ref),
-	}
-}
-
-func ConditionUsingMeshDestinationPort(ref *pbresource.Reference, port string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  UnknownDestinationPortReason,
-		Message: UnknownDestinationPortMessagePrefix + port + " on " + resource.ReferenceToString(ref),
-	}
-}
diff --git a/internal/catalog/internal/controllers/nodehealth/controller.go b/internal/catalog/internal/controllers/nodehealth/controller.go
deleted file mode 100644
index 9ef656b6a8bb9..0000000000000
--- a/internal/catalog/internal/controllers/nodehealth/controller.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package nodehealth
-
-import (
-	"context"
-	"fmt"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func NodeHealthController() controller.Controller {
-	return controller.ForType(pbcatalog.NodeType).
-		WithWatch(pbcatalog.HealthStatusType, controller.MapOwnerFiltered(pbcatalog.NodeType)).
-		WithReconciler(&nodeHealthReconciler{})
-}
-
-type nodeHealthReconciler struct{}
-
-func (r *nodeHealthReconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	// The runtime is passed by value so replacing it here for the remainder of this
-	// reconciliation request processing will not affect future invocations.
-	rt.Logger = rt.Logger.With("resource-id", req.ID)
-
-	rt.Logger.Trace("reconciling node health")
-
-	// read the node
-	rsp, err := rt.Client.Read(ctx, &pbresource.ReadRequest{Id: req.ID})
-	switch {
-	case status.Code(err) == codes.NotFound:
-		rt.Logger.Trace("node has been deleted")
-		return nil
-	case err != nil:
-		rt.Logger.Error("the resource service has returned an unexpected error", "error", err)
-		return err
-	}
-
-	res := rsp.Resource
-
-	health, err := getNodeHealth(ctx, rt, req.ID)
-	if err != nil {
-		rt.Logger.Error("failed to calculate the nodes health", "error", err)
-		return err
-	}
-
-	newStatus := &pbresource.Status{
-		ObservedGeneration: res.Generation,
-		Conditions: []*pbresource.Condition{
-			Conditions[health],
-		},
-	}
-
-	if resource.EqualStatus(res.Status[StatusKey], newStatus, false) {
-		rt.Logger.Trace("resources node health status is unchanged", "health", health.String())
-		return nil
-	}
-
-	_, err = rt.Client.WriteStatus(ctx, &pbresource.WriteStatusRequest{
-		Id:     res.Id,
-		Key:    StatusKey,
-		Status: newStatus,
-	})
-
-	if err != nil {
-		rt.Logger.Error("error encountered when attempting to update the resources node health status", "error", err)
-		return err
-	}
-
-	rt.Logger.Trace("resources node health status was updated", "health", health.String())
-	return nil
-}
-
-func getNodeHealth(ctx context.Context, rt controller.Runtime, nodeRef *pbresource.ID) (pbcatalog.Health, error) {
-	rsp, err := rt.Client.ListByOwner(ctx, &pbresource.ListByOwnerRequest{
-		Owner: nodeRef,
-	})
-
-	if err != nil {
-		return pbcatalog.Health_HEALTH_CRITICAL, err
-	}
-
-	health := pbcatalog.Health_HEALTH_PASSING
-
-	for _, res := range rsp.Resources {
-		if resource.EqualType(res.Id.Type, pbcatalog.HealthStatusType) {
-			var hs pbcatalog.HealthStatus
-			if err := res.Data.UnmarshalTo(&hs); err != nil {
-				// This should be impossible as the resource service + type validations the
-				// catalog is performing will ensure that no data gets written where unmarshalling
-				// to this type will error.
-				return pbcatalog.Health_HEALTH_CRITICAL, fmt.Errorf("error unmarshalling health status data: %w", err)
-			}
-
-			if hs.Status > health {
-				health = hs.Status
-			}
-		}
-	}
-
-	return health, nil
-}
diff --git a/internal/catalog/internal/controllers/nodehealth/controller_test.go b/internal/catalog/internal/controllers/nodehealth/controller_test.go
deleted file mode 100644
index 30989b479b0f3..0000000000000
--- a/internal/catalog/internal/controllers/nodehealth/controller_test.go
+++ /dev/null
@@ -1,366 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package nodehealth
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/oklog/ulid/v2"
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog/internal/types"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-)
-
-var (
-	nodeData = &pbcatalog.Node{
-		Addresses: []*pbcatalog.NodeAddress{
-			{
-				Host: "127.0.0.1",
-			},
-		},
-	}
-
-	dnsPolicyData = &pbcatalog.DNSPolicy{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{""},
-		},
-		Weights: &pbcatalog.Weights{
-			Passing: 1,
-			Warning: 1,
-		},
-	}
-)
-
-func resourceID(rtype *pbresource.Type, name string) *pbresource.ID {
-	return &pbresource.ID{
-		Type: rtype,
-		Tenancy: &pbresource.Tenancy{
-			Partition: "default",
-			Namespace: "default",
-			PeerName:  "local",
-		},
-		Name: name,
-	}
-}
-
-type nodeHealthControllerTestSuite struct {
-	suite.Suite
-
-	resourceClient pbresource.ResourceServiceClient
-	runtime        controller.Runtime
-
-	ctl nodeHealthReconciler
-
-	nodeNoHealth    *pbresource.ID
-	nodePassing     *pbresource.ID
-	nodeWarning     *pbresource.ID
-	nodeCritical    *pbresource.ID
-	nodeMaintenance *pbresource.ID
-}
-
-func (suite *nodeHealthControllerTestSuite) SetupTest() {
-	suite.resourceClient = svctest.RunResourceService(suite.T(), types.Register)
-	suite.runtime = controller.Runtime{Client: suite.resourceClient, Logger: testutil.Logger(suite.T())}
-
-	// The rest of the setup will be to prime the resource service with some data
-	suite.nodeNoHealth = resourcetest.Resource(pbcatalog.NodeType, "test-node-no-health").
-		WithData(suite.T(), nodeData).
-		Write(suite.T(), suite.resourceClient).Id
-
-	suite.nodePassing = resourcetest.Resource(pbcatalog.NodeType, "test-node-passing").
-		WithData(suite.T(), nodeData).
-		Write(suite.T(), suite.resourceClient).Id
-
-	suite.nodeWarning = resourcetest.Resource(pbcatalog.NodeType, "test-node-warning").
-		WithData(suite.T(), nodeData).
-		Write(suite.T(), suite.resourceClient).Id
-
-	suite.nodeCritical = resourcetest.Resource(pbcatalog.NodeType, "test-node-critical").
-		WithData(suite.T(), nodeData).
-		Write(suite.T(), suite.resourceClient).Id
-
-	suite.nodeMaintenance = resourcetest.Resource(pbcatalog.NodeType, "test-node-maintenance").
-		WithData(suite.T(), nodeData).
-		Write(suite.T(), suite.resourceClient).Id
-
-	nodeHealthDesiredStatus := map[string]pbcatalog.Health{
-		suite.nodePassing.Name:     pbcatalog.Health_HEALTH_PASSING,
-		suite.nodeWarning.Name:     pbcatalog.Health_HEALTH_WARNING,
-		suite.nodeCritical.Name:    pbcatalog.Health_HEALTH_CRITICAL,
-		suite.nodeMaintenance.Name: pbcatalog.Health_HEALTH_MAINTENANCE,
-	}
-
-	// In order to exercise the behavior to ensure that its not a last-status-wins sort of thing
-	// we are strategically naming health statuses so that they will be returned in an order with
-	// the most precedent status being in the middle of the list. This will ensure that statuses
-	// seen later can overide a previous status and that statuses seen later do not override if
-	// they would lower the overall status such as going from critical -> warning.
-	precedenceHealth := []pbcatalog.Health{
-		pbcatalog.Health_HEALTH_PASSING,
-		pbcatalog.Health_HEALTH_WARNING,
-		pbcatalog.Health_HEALTH_CRITICAL,
-		pbcatalog.Health_HEALTH_MAINTENANCE,
-		pbcatalog.Health_HEALTH_CRITICAL,
-		pbcatalog.Health_HEALTH_WARNING,
-		pbcatalog.Health_HEALTH_PASSING,
-	}
-
-	for _, node := range []*pbresource.ID{suite.nodePassing, suite.nodeWarning, suite.nodeCritical, suite.nodeMaintenance} {
-		for idx, health := range precedenceHealth {
-			if nodeHealthDesiredStatus[node.Name] >= health {
-				resourcetest.Resource(pbcatalog.HealthStatusType, fmt.Sprintf("test-check-%s-%d", node.Name, idx)).
-					WithData(suite.T(), &pbcatalog.HealthStatus{Type: "tcp", Status: health}).
-					WithOwner(node).
-					Write(suite.T(), suite.resourceClient)
-			}
-		}
-	}
-
-	// create a DNSPolicy to be owned by the node. The type doesn't really matter it just needs
-	// to be something that doesn't care about its owner. All we want to prove is that we are
-	// filtering out non-HealthStatus types appropriately.
-	resourcetest.Resource(pbcatalog.DNSPolicyType, "test-policy").
-		WithData(suite.T(), dnsPolicyData).
-		WithOwner(suite.nodeNoHealth).
-		Write(suite.T(), suite.resourceClient)
-}
-
-func (suite *nodeHealthControllerTestSuite) TestGetNodeHealthListError() {
-	// This resource id references a resource type that will not be
-	// registered with the resource service. The ListByOwner call
-	// should produce an InvalidArgument error. This test is meant
-	// to validate how that error is handled (its propagated back
-	// to the caller)
-	ref := resourceID(
-		&pbresource.Type{Group: "not", GroupVersion: "v1", Kind: "found"},
-		"irrelevant",
-	)
-	health, err := getNodeHealth(context.Background(), suite.runtime, ref)
-	require.Equal(suite.T(), pbcatalog.Health_HEALTH_CRITICAL, health)
-	require.Error(suite.T(), err)
-	require.Equal(suite.T(), codes.InvalidArgument, status.Code(err))
-}
-
-func (suite *nodeHealthControllerTestSuite) TestGetNodeHealthNoNode() {
-	// This test is meant to ensure that when the node doesn't exist
-	// no error is returned but also no data is. The default passing
-	// status should then be returned in the same manner as the node
-	// existing but with no associated HealthStatus resources.
-	ref := resourceID(pbcatalog.NodeType, "foo")
-	ref.Uid = ulid.Make().String()
-	health, err := getNodeHealth(context.Background(), suite.runtime, ref)
-
-	require.NoError(suite.T(), err)
-	require.Equal(suite.T(), pbcatalog.Health_HEALTH_PASSING, health)
-}
-
-func (suite *nodeHealthControllerTestSuite) TestGetNodeHealthNoStatus() {
-	health, err := getNodeHealth(context.Background(), suite.runtime, suite.nodeNoHealth)
-	require.NoError(suite.T(), err)
-	require.Equal(suite.T(), pbcatalog.Health_HEALTH_PASSING, health)
-}
-
-func (suite *nodeHealthControllerTestSuite) TestGetNodeHealthPassingStatus() {
-	health, err := getNodeHealth(context.Background(), suite.runtime, suite.nodePassing)
-	require.NoError(suite.T(), err)
-	require.Equal(suite.T(), pbcatalog.Health_HEALTH_PASSING, health)
-}
-
-func (suite *nodeHealthControllerTestSuite) TestGetNodeHealthCriticalStatus() {
-	health, err := getNodeHealth(context.Background(), suite.runtime, suite.nodeCritical)
-	require.NoError(suite.T(), err)
-	require.Equal(suite.T(), pbcatalog.Health_HEALTH_CRITICAL, health)
-}
-
-func (suite *nodeHealthControllerTestSuite) TestGetNodeHealthWarningStatus() {
-	health, err := getNodeHealth(context.Background(), suite.runtime, suite.nodeWarning)
-	require.NoError(suite.T(), err)
-	require.Equal(suite.T(), pbcatalog.Health_HEALTH_WARNING, health)
-}
-
-func (suite *nodeHealthControllerTestSuite) TestGetNodeHealthMaintenanceStatus() {
-	health, err := getNodeHealth(context.Background(), suite.runtime, suite.nodeMaintenance)
-	require.NoError(suite.T(), err)
-	require.Equal(suite.T(), pbcatalog.Health_HEALTH_MAINTENANCE, health)
-}
-
-func (suite *nodeHealthControllerTestSuite) TestReconcileNodeNotFound() {
-	// This test ensures that removed nodes are ignored. In particular we don't
-	// want to propagate the error and indefinitely keep re-reconciling in this case.
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: resourceID(pbcatalog.NodeType, "not-found"),
-	})
-	require.NoError(suite.T(), err)
-}
-
-func (suite *nodeHealthControllerTestSuite) TestReconcilePropagateReadError() {
-	// This test aims to ensure that errors other than NotFound errors coming
-	// from the initial resource read get propagated. This case is very unrealistic
-	// as the controller should not have given us a request ID for a resource type
-	// that doesn't exist but this was the easiest way I could think of to synthesize
-	// a Read error.
-	ref := resourceID(
-		&pbresource.Type{Group: "not", GroupVersion: "v1", Kind: "found"},
-		"irrelevant",
-	)
-
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: ref,
-	})
-	require.Error(suite.T(), err)
-	require.Equal(suite.T(), codes.InvalidArgument, status.Code(err))
-}
-
-func (suite *nodeHealthControllerTestSuite) testReconcileStatus(id *pbresource.ID, expectedStatus *pbresource.Condition) *pbresource.Resource {
-	suite.T().Helper()
-
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: id,
-	})
-	require.NoError(suite.T(), err)
-
-	rsp, err := suite.resourceClient.Read(context.Background(), &pbresource.ReadRequest{
-		Id: id,
-	})
-	require.NoError(suite.T(), err)
-
-	nodeHealthStatus, found := rsp.Resource.Status[StatusKey]
-	require.True(suite.T(), found)
-	require.Equal(suite.T(), rsp.Resource.Generation, nodeHealthStatus.ObservedGeneration)
-	require.Len(suite.T(), nodeHealthStatus.Conditions, 1)
-	prototest.AssertDeepEqual(suite.T(),
-		nodeHealthStatus.Conditions[0],
-		expectedStatus)
-
-	return rsp.Resource
-}
-
-func (suite *nodeHealthControllerTestSuite) TestReconcile_StatusPassing() {
-	suite.testReconcileStatus(suite.nodePassing, &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_TRUE,
-		Reason:  "HEALTH_PASSING",
-		Message: NodeHealthyMessage,
-	})
-}
-
-func (suite *nodeHealthControllerTestSuite) TestReconcile_StatusWarning() {
-	suite.testReconcileStatus(suite.nodeWarning, &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  "HEALTH_WARNING",
-		Message: NodeUnhealthyMessage,
-	})
-}
-
-func (suite *nodeHealthControllerTestSuite) TestReconcile_StatusCritical() {
-	suite.testReconcileStatus(suite.nodeCritical, &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  "HEALTH_CRITICAL",
-		Message: NodeUnhealthyMessage,
-	})
-}
-
-func (suite *nodeHealthControllerTestSuite) TestReconcile_StatusMaintenance() {
-	suite.testReconcileStatus(suite.nodeMaintenance, &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  "HEALTH_MAINTENANCE",
-		Message: NodeUnhealthyMessage,
-	})
-}
-
-func (suite *nodeHealthControllerTestSuite) TestReconcile_AvoidRereconciliationWrite() {
-	res1 := suite.testReconcileStatus(suite.nodeWarning, &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  "HEALTH_WARNING",
-		Message: NodeUnhealthyMessage,
-	})
-
-	res2 := suite.testReconcileStatus(suite.nodeWarning, &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  "HEALTH_WARNING",
-		Message: NodeUnhealthyMessage,
-	})
-
-	// If another status write was performed then the versions would differ. This
-	// therefore proves that after a second reconciliation without any change in status
-	// that we are not making subsequent status writes.
-	require.Equal(suite.T(), res1.Version, res2.Version)
-}
-
-func (suite *nodeHealthControllerTestSuite) waitForReconciliation(id *pbresource.ID, reason string) {
-	suite.T().Helper()
-
-	retry.Run(suite.T(), func(r *retry.R) {
-		rsp, err := suite.resourceClient.Read(context.Background(), &pbresource.ReadRequest{
-			Id: id,
-		})
-		require.NoError(r, err)
-
-		nodeHealthStatus, found := rsp.Resource.Status[StatusKey]
-		require.True(r, found)
-		require.Equal(r, rsp.Resource.Generation, nodeHealthStatus.ObservedGeneration)
-		require.Len(r, nodeHealthStatus.Conditions, 1)
-		require.Equal(r, reason, nodeHealthStatus.Conditions[0].Reason)
-	})
-}
-func (suite *nodeHealthControllerTestSuite) TestController() {
-	// create the controller manager
-	mgr := controller.NewManager(suite.resourceClient, testutil.Logger(suite.T()))
-
-	// register our controller
-	mgr.Register(NodeHealthController())
-	mgr.SetRaftLeader(true)
-	ctx, cancel := context.WithCancel(context.Background())
-	suite.T().Cleanup(cancel)
-
-	// run the manager
-	go mgr.Run(ctx)
-
-	// ensure that the node health eventually gets set.
-	suite.waitForReconciliation(suite.nodePassing, "HEALTH_PASSING")
-
-	// rewrite the resource - this will cause the nodes health
-	// to be rereconciled but wont result in any health change
-	resourcetest.Resource(pbcatalog.NodeType, suite.nodePassing.Name).
-		WithData(suite.T(), &pbcatalog.Node{
-			Addresses: []*pbcatalog.NodeAddress{
-				{
-					Host: "198.18.0.1",
-				},
-			},
-		}).
-		Write(suite.T(), suite.resourceClient)
-
-	// wait for rereconciliation to happen
-	suite.waitForReconciliation(suite.nodePassing, "HEALTH_PASSING")
-
-	resourcetest.Resource(pbcatalog.HealthStatusType, "failure").
-		WithData(suite.T(), &pbcatalog.HealthStatus{Type: "fake", Status: pbcatalog.Health_HEALTH_CRITICAL}).
-		WithOwner(suite.nodePassing).
-		Write(suite.T(), suite.resourceClient)
-
-	suite.waitForReconciliation(suite.nodePassing, "HEALTH_CRITICAL")
-}
-
-func TestNodeHealthController(t *testing.T) {
-	suite.Run(t, new(nodeHealthControllerTestSuite))
-}
diff --git a/internal/catalog/internal/controllers/nodehealth/status.go b/internal/catalog/internal/controllers/nodehealth/status.go
deleted file mode 100644
index 11997bc47e684..0000000000000
--- a/internal/catalog/internal/controllers/nodehealth/status.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package nodehealth
-
-import (
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	StatusKey              = "consul.io/node-health"
-	StatusConditionHealthy = "healthy"
-
-	NodeHealthyMessage   = "All node health checks are passing"
-	NodeUnhealthyMessage = "One or more node health checks are not passing"
-)
-
-var (
-	ConditionPassing = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_TRUE,
-		Reason:  pbcatalog.Health_HEALTH_PASSING.String(),
-		Message: NodeHealthyMessage,
-	}
-
-	ConditionWarning = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  pbcatalog.Health_HEALTH_WARNING.String(),
-		Message: NodeUnhealthyMessage,
-	}
-
-	ConditionCritical = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  pbcatalog.Health_HEALTH_CRITICAL.String(),
-		Message: NodeUnhealthyMessage,
-	}
-
-	ConditionMaintenance = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  pbcatalog.Health_HEALTH_MAINTENANCE.String(),
-		Message: NodeUnhealthyMessage,
-	}
-
-	Conditions = map[pbcatalog.Health]*pbresource.Condition{
-		pbcatalog.Health_HEALTH_PASSING:     ConditionPassing,
-		pbcatalog.Health_HEALTH_WARNING:     ConditionWarning,
-		pbcatalog.Health_HEALTH_CRITICAL:    ConditionCritical,
-		pbcatalog.Health_HEALTH_MAINTENANCE: ConditionMaintenance,
-	}
-)
diff --git a/internal/catalog/internal/controllers/register.go b/internal/catalog/internal/controllers/register.go
deleted file mode 100644
index df1f7c88c7b2e..0000000000000
--- a/internal/catalog/internal/controllers/register.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controllers
-
-import (
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/endpoints"
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/failover"
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/nodehealth"
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/workloadhealth"
-	"github.com/hashicorp/consul/internal/controller"
-)
-
-type Dependencies struct {
-	WorkloadHealthNodeMapper workloadhealth.NodeMapper
-	EndpointsWorkloadMapper  endpoints.WorkloadMapper
-	FailoverMapper           failover.FailoverMapper
-}
-
-func Register(mgr *controller.Manager, deps Dependencies) {
-	mgr.Register(nodehealth.NodeHealthController())
-	mgr.Register(workloadhealth.WorkloadHealthController(deps.WorkloadHealthNodeMapper))
-	mgr.Register(endpoints.ServiceEndpointsController(deps.EndpointsWorkloadMapper))
-	mgr.Register(failover.FailoverPolicyController(deps.FailoverMapper))
-}
diff --git a/internal/catalog/internal/controllers/workloadhealth/controller.go b/internal/catalog/internal/controllers/workloadhealth/controller.go
deleted file mode 100644
index ab25346454aa4..0000000000000
--- a/internal/catalog/internal/controllers/workloadhealth/controller.go
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package workloadhealth
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/nodehealth"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-var (
-	errNodeUnreconciled            = errors.New("Node health has not been reconciled yet")
-	errNodeHealthInvalid           = errors.New("Node health has invalid reason")
-	errNodeHealthConditionNotFound = fmt.Errorf("Node health status is missing the %s condition", nodehealth.StatusConditionHealthy)
-)
-
-// The NodeMapper interface is used to provide an implementation around being able to
-// map a watch event for a Node resource and translate it to reconciliation requests
-// for all Workloads assigned to that node.
-type NodeMapper interface {
-	// MapNodeToWorkloads will take a Node resource and return controller requests
-	// for all Workloads associated with the Node.
-	MapNodeToWorkloads(ctx context.Context, rt controller.Runtime, res *pbresource.Resource) ([]controller.Request, error)
-
-	// TrackWorkload instructs the NodeMapper to associate the given workload
-	// ID with the given node ID.
-	TrackWorkload(workloadID *pbresource.ID, nodeID *pbresource.ID)
-
-	// UntrackWorkload instructs the Nodemapper to forget about any
-	// association it was tracking for this workload.
-	UntrackWorkload(workloadID *pbresource.ID)
-
-	// NodeIDFromWorkload is used to generate the resource ID for the Node referenced
-	// within the NodeName field of the Workload.
-	NodeIDFromWorkload(workload *pbresource.Resource, workloadData *pbcatalog.Workload) *pbresource.ID
-}
-
-func WorkloadHealthController(nodeMap NodeMapper) controller.Controller {
-	if nodeMap == nil {
-		panic("No NodeMapper was provided to the WorkloadHealthController constructor")
-	}
-
-	return controller.ForType(pbcatalog.WorkloadType).
-		WithWatch(pbcatalog.HealthStatusType, controller.MapOwnerFiltered(pbcatalog.WorkloadType)).
-		WithWatch(pbcatalog.NodeType, nodeMap.MapNodeToWorkloads).
-		WithReconciler(&workloadHealthReconciler{nodeMap: nodeMap})
-}
-
-type workloadHealthReconciler struct {
-	nodeMap NodeMapper
-}
-
-func (r *workloadHealthReconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	// The runtime is passed by value so replacing it here for the remainder of this
-	// reconciliation request processing will not affect future invocations.
-	rt.Logger = rt.Logger.With("resource-id", req.ID, "controller", StatusKey)
-
-	rt.Logger.Trace("reconciling workload health")
-
-	// read the workload
-	rsp, err := rt.Client.Read(ctx, &pbresource.ReadRequest{Id: req.ID})
-	switch {
-	case status.Code(err) == codes.NotFound:
-		rt.Logger.Trace("workload has been deleted")
-		r.nodeMap.UntrackWorkload(req.ID)
-		return nil
-	case err != nil:
-		rt.Logger.Error("the resource service has returned an unexpected error", "error", err)
-		return err
-	}
-
-	res := rsp.Resource
-	var workload pbcatalog.Workload
-	if err := res.Data.UnmarshalTo(&workload); err != nil {
-		// This should be impossible and will not be exercised in tests. Various
-		// type validations on admission ensure that all Workloads would
-		// be marshallable in this way.
-		rt.Logger.Error("error unmarshalling workload data", "error", err)
-		return err
-	}
-
-	nodeHealth := pbcatalog.Health_HEALTH_PASSING
-	if workload.NodeName != "" {
-		nodeID := r.nodeMap.NodeIDFromWorkload(res, &workload)
-		r.nodeMap.TrackWorkload(res.Id, nodeID)
-
-		// It is important that getting the nodes health happens after tracking the
-		// Workload with the node mapper. If the order were reversed we could
-		// potentially miss events for data that changes after we read the node but
-		// before we configured the node mapper to map subsequent events to this
-		// workload.
-		nodeHealth, err = getNodeHealth(ctx, rt, nodeID)
-		if err != nil {
-			rt.Logger.Error("error looking up node health", "error", err, "node-id", nodeID)
-			return err
-		}
-	} else {
-		// the node association may be been removed so stop tracking it.
-		r.nodeMap.UntrackWorkload(res.Id)
-	}
-
-	workloadHealth, err := getWorkloadHealth(ctx, rt, req.ID)
-	if err != nil {
-		// This should be impossible under normal operations and will not be exercised
-		// within the unit tests. This can only fail if the resource service fails
-		// or allows admission of invalid health statuses.
-		rt.Logger.Error("error aggregating workload health statuses", "error", err)
-		return err
-	}
-
-	health := nodeHealth
-	if workloadHealth > health {
-		health = workloadHealth
-	}
-
-	condition := WorkloadConditions[workloadHealth]
-	if workload.NodeName != "" {
-		condition = NodeAndWorkloadConditions[workloadHealth][nodeHealth]
-	}
-
-	newStatus := &pbresource.Status{
-		ObservedGeneration: res.Generation,
-		Conditions: []*pbresource.Condition{
-			condition,
-		},
-	}
-
-	if resource.EqualStatus(res.Status[StatusKey], newStatus, false) {
-		rt.Logger.Trace("resources workload health status is unchanged",
-			"health", health.String(),
-			"node-health", nodeHealth.String(),
-			"workload-health", workloadHealth.String())
-		return nil
-	}
-
-	_, err = rt.Client.WriteStatus(ctx, &pbresource.WriteStatusRequest{
-		Id:     res.Id,
-		Key:    StatusKey,
-		Status: newStatus,
-	})
-
-	if err != nil {
-		rt.Logger.Error("error encountered when attempting to update the resources workload status", "error", err)
-		return err
-	}
-
-	rt.Logger.Trace("resource's workload health status was updated",
-		"health", health.String(),
-		"node-health", nodeHealth.String(),
-		"workload-health", workloadHealth.String())
-	return nil
-}
-
-func getNodeHealth(ctx context.Context, rt controller.Runtime, nodeRef *pbresource.ID) (pbcatalog.Health, error) {
-	rsp, err := rt.Client.Read(ctx, &pbresource.ReadRequest{Id: nodeRef})
-	switch {
-	case status.Code(err) == codes.NotFound:
-		return pbcatalog.Health_HEALTH_CRITICAL, nil
-	case err != nil:
-		return pbcatalog.Health_HEALTH_CRITICAL, err
-	default:
-		healthStatus, ok := rsp.Resource.Status[nodehealth.StatusKey]
-		if !ok {
-			// The Nodes health has never been reconciled and therefore the
-			// workloads health cannot be determined. Returning nil is acceptable
-			// because the controller should sometime soon run reconciliation for
-			// the node which will then trigger rereconciliation of this workload
-			return pbcatalog.Health_HEALTH_CRITICAL, errNodeUnreconciled
-		}
-
-		for _, condition := range healthStatus.Conditions {
-			if condition.Type == nodehealth.StatusConditionHealthy {
-				if condition.State == pbresource.Condition_STATE_TRUE {
-					return pbcatalog.Health_HEALTH_PASSING, nil
-				}
-
-				healthReason, valid := pbcatalog.Health_value[condition.Reason]
-				if !valid {
-					// The Nodes health is unknown - presumably the node health controller
-					// will come along and fix that up momentarily causing this workload
-					// reconciliation to occur again.
-					return pbcatalog.Health_HEALTH_CRITICAL, errNodeHealthInvalid
-				}
-				return pbcatalog.Health(healthReason), nil
-			}
-		}
-		return pbcatalog.Health_HEALTH_CRITICAL, errNodeHealthConditionNotFound
-	}
-}
-
-func getWorkloadHealth(ctx context.Context, rt controller.Runtime, workloadRef *pbresource.ID) (pbcatalog.Health, error) {
-	rsp, err := rt.Client.ListByOwner(ctx, &pbresource.ListByOwnerRequest{
-		Owner: workloadRef,
-	})
-
-	if err != nil {
-		return pbcatalog.Health_HEALTH_CRITICAL, err
-	}
-
-	workloadHealth := pbcatalog.Health_HEALTH_PASSING
-
-	for _, res := range rsp.Resources {
-		if resource.EqualType(res.Id.Type, pbcatalog.HealthStatusType) {
-			var hs pbcatalog.HealthStatus
-			if err := res.Data.UnmarshalTo(&hs); err != nil {
-				// This should be impossible and will not be executing in tests. The resource type
-				// is the HealthStatus type and therefore must be unmarshallable into the HealthStatus
-				// object or else it wouldn't have passed admission validation checks.
-				return workloadHealth, fmt.Errorf("error unmarshalling health status data: %w", err)
-			}
-
-			if hs.Status > workloadHealth {
-				workloadHealth = hs.Status
-			}
-		}
-	}
-
-	return workloadHealth, nil
-}
diff --git a/internal/catalog/internal/controllers/workloadhealth/controller_test.go b/internal/catalog/internal/controllers/workloadhealth/controller_test.go
deleted file mode 100644
index 56ce526c80443..0000000000000
--- a/internal/catalog/internal/controllers/workloadhealth/controller_test.go
+++ /dev/null
@@ -1,761 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package workloadhealth
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/nodehealth"
-	"github.com/hashicorp/consul/internal/catalog/internal/mappers/nodemapper"
-	"github.com/hashicorp/consul/internal/catalog/internal/types"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-)
-
-var (
-	nodeData = &pbcatalog.Node{
-		Addresses: []*pbcatalog.NodeAddress{
-			{
-				Host: "127.0.0.1",
-			},
-		},
-	}
-
-	fakeType = &pbresource.Type{
-		Group:        "not",
-		GroupVersion: "vfake",
-		Kind:         "found",
-	}
-)
-
-func resourceID(rtype *pbresource.Type, name string) *pbresource.ID {
-	return &pbresource.ID{
-		Type: rtype,
-		Tenancy: &pbresource.Tenancy{
-			Partition: "default",
-			Namespace: "default",
-			PeerName:  "local",
-		},
-		Name: name,
-	}
-}
-
-func workloadData(nodeName string) *pbcatalog.Workload {
-	return &pbcatalog.Workload{
-		Addresses: []*pbcatalog.WorkloadAddress{
-			{
-				Host: "198.18.0.1",
-			},
-		},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"http": {
-				Port:     8080,
-				Protocol: pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-		},
-		Identity: "test",
-		NodeName: nodeName,
-	}
-}
-
-// controllerSuite is just the base information the three other test suites
-// in this file will use. It will be embedded into the others allowing
-// for the test helpers and default setup to be reused and to force consistent
-// anming of the various data bits this holds on to.
-type controllerSuite struct {
-	suite.Suite
-	client  pbresource.ResourceServiceClient
-	runtime controller.Runtime
-}
-
-func (suite *controllerSuite) SetupTest() {
-	suite.client = svctest.RunResourceService(suite.T(), types.Register)
-	suite.runtime = controller.Runtime{Client: suite.client, Logger: testutil.Logger(suite.T())}
-}
-
-// injectNodeWithStatus is a helper method to write a Node resource and synthesize its status
-// in a manner consistent with the node-health controller. This allows us to not actually
-// run and test the node-health controller but consume its "api" in the form of how
-// it encodes status.
-func (suite *controllerSuite) injectNodeWithStatus(name string, health pbcatalog.Health) *pbresource.Resource {
-	suite.T().Helper()
-	state := pbresource.Condition_STATE_TRUE
-	if health >= pbcatalog.Health_HEALTH_WARNING {
-		state = pbresource.Condition_STATE_FALSE
-	}
-
-	return resourcetest.Resource(pbcatalog.NodeType, name).
-		WithData(suite.T(), nodeData).
-		WithStatus(nodehealth.StatusKey, &pbresource.Status{
-			Conditions: []*pbresource.Condition{
-				{
-					Type:   nodehealth.StatusConditionHealthy,
-					State:  state,
-					Reason: health.String(),
-				},
-			},
-		}).
-		Write(suite.T(), suite.client)
-}
-
-// the workloadHealthControllerTestSuite intends to test the main Reconciliation
-// functionality but will not do exhaustive testing of the getNodeHealth
-// or getWorkloadHealth functions. Without mocking the resource service which
-// we for now are avoiding, it should be impossible to inject errors into
-// those functions that would force some kinds of error cases. Therefore,
-// those other functions will be tested with their own test suites.
-type workloadHealthControllerTestSuite struct {
-	controllerSuite
-
-	mapper     *nodemapper.NodeMapper
-	reconciler *workloadHealthReconciler
-}
-
-func (suite *workloadHealthControllerTestSuite) SetupTest() {
-	// invoke all the other suite setup
-	suite.controllerSuite.SetupTest()
-
-	suite.mapper = nodemapper.New()
-	suite.reconciler = &workloadHealthReconciler{
-		nodeMap: suite.mapper,
-	}
-}
-
-// testReconcileWithNode will inject a node with the given health, a workload
-// associated with that node and then a health status owned by the workload
-// with the given workload health. Once all the resource injection has been
-// performed this will invoke the Reconcile method once on the reconciler
-// and checks a couple things:
-//
-// * The node to workload association is now being tracked by the node mapper
-// * The workloads status was updated and now matches the expected value
-func (suite *workloadHealthControllerTestSuite) testReconcileWithNode(nodeHealth, workloadHealth pbcatalog.Health, status *pbresource.Condition) *pbresource.Resource {
-	suite.T().Helper()
-
-	node := suite.injectNodeWithStatus("test-node", nodeHealth)
-
-	workload := resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
-		WithData(suite.T(), workloadData(node.Id.Name)).
-		Write(suite.T(), suite.client)
-
-	resourcetest.Resource(pbcatalog.HealthStatusType, "test-status").
-		WithData(suite.T(), &pbcatalog.HealthStatus{Type: "tcp", Status: workloadHealth}).
-		WithOwner(workload.Id).
-		Write(suite.T(), suite.client)
-
-	err := suite.reconciler.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: workload.Id,
-	})
-
-	require.NoError(suite.T(), err)
-
-	// ensure that the node is now being tracked by the mapper
-	reqs, err := suite.mapper.MapNodeToWorkloads(context.Background(), suite.runtime, node)
-	require.NoError(suite.T(), err)
-	require.Len(suite.T(), reqs, 1)
-	prototest.AssertDeepEqual(suite.T(), reqs[0].ID, workload.Id)
-
-	suite.T().Cleanup(func() {
-		// future calls to reconcile would normally have done this as the resource was
-		// removed. In the case of reconcile being called manually, when the resources
-		// are automatically removed, the tracking will be stale. In most tests this step
-		// to remove the tracking should be unnecessary as they will not be reusing a
-		// mapper between subtests and so it will get "removed" as the mapper is gc'ed.
-		suite.mapper.UntrackWorkload(workload.Id)
-	})
-
-	return suite.checkWorkloadStatus(workload.Id, status)
-}
-
-// testReconcileWithoutNode will inject a workload associated and then a health status
-// owned by the workload with the given workload health. Once all the resource injection
-// has been performed this will invoke the Reconcile method once on the reconciler
-// and check that the computed status matches the expected value
-//
-// This is really just a tirmmed down version of testReconcileWithNode. It seemed
-// simpler and easier to read if these were two separate methods instead of combining
-// them in one with more branching based off of detecting whether nodes are in use.
-func (suite *workloadHealthControllerTestSuite) testReconcileWithoutNode(workloadHealth pbcatalog.Health, status *pbresource.Condition) *pbresource.Resource {
-	suite.T().Helper()
-	workload := resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
-		WithData(suite.T(), workloadData("")).
-		Write(suite.T(), suite.client)
-
-	resourcetest.Resource(pbcatalog.HealthStatusType, "test-status").
-		WithData(suite.T(), &pbcatalog.HealthStatus{Type: "tcp", Status: workloadHealth}).
-		WithOwner(workload.Id).
-		Write(suite.T(), suite.client)
-
-	err := suite.reconciler.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: workload.Id,
-	})
-
-	require.NoError(suite.T(), err)
-
-	// Read the resource back so we can detect the status changes
-	return suite.checkWorkloadStatus(workload.Id, status)
-}
-
-// checkWorkloadStatus will read the workload resource and verify that its
-// status has the expected value.
-func (suite *workloadHealthControllerTestSuite) checkWorkloadStatus(id *pbresource.ID, status *pbresource.Condition) *pbresource.Resource {
-	suite.T().Helper()
-
-	rsp, err := suite.client.Read(context.Background(), &pbresource.ReadRequest{
-		Id: id,
-	})
-
-	require.NoError(suite.T(), err)
-
-	actualStatus, found := rsp.Resource.Status[StatusKey]
-	require.True(suite.T(), found)
-	require.Equal(suite.T(), rsp.Resource.Generation, actualStatus.ObservedGeneration)
-	require.Len(suite.T(), actualStatus.Conditions, 1)
-	prototest.AssertDeepEqual(suite.T(), status, actualStatus.Conditions[0])
-
-	return rsp.Resource
-}
-
-func (suite *workloadHealthControllerTestSuite) TestReconcile() {
-	// This test intends to ensure all the permutations of node health and workload
-	// health end up with the correct computed status. When a test case omits
-	// the workload health (or sets it to pbcatalog.Health_HEALTH_ANY) then the
-	// workloads are nodeless and therefore node health will not be considered.
-	// Additionally the messages put in the status for nodeless workloads are
-	// a little different to not mention nodes and provide the user more context
-	// about where the failing health checks are.
-
-	type testCase struct {
-		nodeHealth     pbcatalog.Health
-		workloadHealth pbcatalog.Health
-		expectedStatus *pbresource.Condition
-	}
-
-	cases := map[string]testCase{
-		"workload-passing": {
-			workloadHealth: pbcatalog.Health_HEALTH_PASSING,
-			expectedStatus: &pbresource.Condition{
-				Type:    StatusConditionHealthy,
-				State:   pbresource.Condition_STATE_TRUE,
-				Reason:  "HEALTH_PASSING",
-				Message: WorkloadHealthyMessage,
-			},
-		},
-		"workload-warning": {
-			workloadHealth: pbcatalog.Health_HEALTH_WARNING,
-			expectedStatus: &pbresource.Condition{
-				Type:    StatusConditionHealthy,
-				State:   pbresource.Condition_STATE_FALSE,
-				Reason:  "HEALTH_WARNING",
-				Message: WorkloadUnhealthyMessage,
-			},
-		},
-		"workload-critical": {
-			workloadHealth: pbcatalog.Health_HEALTH_CRITICAL,
-			expectedStatus: &pbresource.Condition{
-				Type:    StatusConditionHealthy,
-				State:   pbresource.Condition_STATE_FALSE,
-				Reason:  "HEALTH_CRITICAL",
-				Message: WorkloadUnhealthyMessage,
-			},
-		},
-		"workload-maintenance": {
-			workloadHealth: pbcatalog.Health_HEALTH_MAINTENANCE,
-			expectedStatus: &pbresource.Condition{
-				Type:    StatusConditionHealthy,
-				State:   pbresource.Condition_STATE_FALSE,
-				Reason:  "HEALTH_MAINTENANCE",
-				Message: WorkloadUnhealthyMessage,
-			},
-		},
-		"combined-passing": {
-			nodeHealth:     pbcatalog.Health_HEALTH_PASSING,
-			workloadHealth: pbcatalog.Health_HEALTH_PASSING,
-			expectedStatus: &pbresource.Condition{
-				Type:    StatusConditionHealthy,
-				State:   pbresource.Condition_STATE_TRUE,
-				Reason:  "HEALTH_PASSING",
-				Message: NodeAndWorkloadHealthyMessage,
-			},
-		},
-		"combined-warning-node": {
-			nodeHealth:     pbcatalog.Health_HEALTH_WARNING,
-			workloadHealth: pbcatalog.Health_HEALTH_PASSING,
-			expectedStatus: &pbresource.Condition{
-				Type:    StatusConditionHealthy,
-				State:   pbresource.Condition_STATE_FALSE,
-				Reason:  "HEALTH_WARNING",
-				Message: nodehealth.NodeUnhealthyMessage,
-			},
-		},
-		"combined-warning-workload": {
-			nodeHealth:     pbcatalog.Health_HEALTH_PASSING,
-			workloadHealth: pbcatalog.Health_HEALTH_WARNING,
-			expectedStatus: &pbresource.Condition{
-				Type:    StatusConditionHealthy,
-				State:   pbresource.Condition_STATE_FALSE,
-				Reason:  "HEALTH_WARNING",
-				Message: WorkloadUnhealthyMessage,
-			},
-		},
-		"combined-critical-node": {
-			nodeHealth:     pbcatalog.Health_HEALTH_CRITICAL,
-			workloadHealth: pbcatalog.Health_HEALTH_WARNING,
-			expectedStatus: &pbresource.Condition{
-				Type:    StatusConditionHealthy,
-				State:   pbresource.Condition_STATE_FALSE,
-				Reason:  "HEALTH_CRITICAL",
-				Message: NodeAndWorkloadUnhealthyMessage,
-			},
-		},
-		"combined-critical-workload": {
-			nodeHealth:     pbcatalog.Health_HEALTH_WARNING,
-			workloadHealth: pbcatalog.Health_HEALTH_CRITICAL,
-			expectedStatus: &pbresource.Condition{
-				Type:    StatusConditionHealthy,
-				State:   pbresource.Condition_STATE_FALSE,
-				Reason:  "HEALTH_CRITICAL",
-				Message: NodeAndWorkloadUnhealthyMessage,
-			},
-		},
-		"combined-maintenance-node": {
-			nodeHealth:     pbcatalog.Health_HEALTH_MAINTENANCE,
-			workloadHealth: pbcatalog.Health_HEALTH_CRITICAL,
-			expectedStatus: &pbresource.Condition{
-				Type:    StatusConditionHealthy,
-				State:   pbresource.Condition_STATE_FALSE,
-				Reason:  "HEALTH_MAINTENANCE",
-				Message: NodeAndWorkloadUnhealthyMessage,
-			},
-		},
-		"combined-maintenance-workload": {
-			nodeHealth:     pbcatalog.Health_HEALTH_CRITICAL,
-			workloadHealth: pbcatalog.Health_HEALTH_MAINTENANCE,
-			expectedStatus: &pbresource.Condition{
-				Type:    StatusConditionHealthy,
-				State:   pbresource.Condition_STATE_FALSE,
-				Reason:  "HEALTH_MAINTENANCE",
-				Message: NodeAndWorkloadUnhealthyMessage,
-			},
-		},
-	}
-
-	for name, tcase := range cases {
-		suite.Run(name, func() {
-			if tcase.nodeHealth != pbcatalog.Health_HEALTH_ANY {
-				suite.testReconcileWithNode(tcase.nodeHealth, tcase.workloadHealth, tcase.expectedStatus)
-			} else {
-				suite.testReconcileWithoutNode(tcase.workloadHealth, tcase.expectedStatus)
-			}
-		})
-	}
-}
-
-func (suite *workloadHealthControllerTestSuite) TestReconcileReadError() {
-	// This test's goal is to prove that errors other than NotFound from the Resource service
-	// when reading the workload to reconcile will be propagate back to the Reconcile caller.
-	//
-	// Passing a resource with an unknown type isn't particularly realistic as the controller
-	// manager running our reconciliation will ensure all resource ids used are valid. However
-	// its a really easy way right not to force the error.
-	id := resourceID(fakeType, "blah")
-
-	err := suite.reconciler.Reconcile(context.Background(), suite.runtime, controller.Request{ID: id})
-	require.Error(suite.T(), err)
-	require.Equal(suite.T(), codes.InvalidArgument, status.Code(err))
-}
-
-func (suite *workloadHealthControllerTestSuite) TestReconcileNotFound() {
-	// This test wants to ensure that tracking for a workload is removed when the workload is deleted
-	// so this test will inject the tracking, issue the Reconcile call which will get a
-	// not found error and then ensure that the tracking was removed.
-
-	workload := resourcetest.Resource(pbcatalog.WorkloadType, "foo").
-		WithData(suite.T(), workloadData("test-node")).
-		// don't write this because then in the call to reconcile the resource
-		// would be found and defeat the purpose of the tes
-		Build()
-
-	node := resourcetest.Resource(pbcatalog.NodeType, "test-node").
-		WithData(suite.T(), nodeData).
-		// Whether this gets written or not doesn't matter
-		Build()
-
-	// Track the workload - this simulates a previous round of reconciliation
-	// where the workload existed and was associated to the node. Other tests
-	// will cover more of the lifecycle of the controller so for the purposes
-	// of this test we can just inject it ourselves.
-	suite.mapper.TrackWorkload(workload.Id, node.Id)
-
-	// check that the worklooad is in fact tracked properly
-	reqs, err := suite.mapper.MapNodeToWorkloads(context.Background(), suite.runtime, node)
-
-	require.NoError(suite.T(), err)
-	require.Len(suite.T(), reqs, 1)
-	prototest.AssertDeepEqual(suite.T(), workload.Id, reqs[0].ID)
-
-	// This workload was never actually inserted so the request should return a NotFound
-	// error and remove the workload from tracking
-	require.NoError(
-		suite.T(),
-		suite.reconciler.Reconcile(
-			context.Background(),
-			suite.runtime,
-			controller.Request{ID: workload.Id}))
-
-	// Check the mapper again to ensure the node:workload association was removed.
-	reqs, err = suite.mapper.MapNodeToWorkloads(context.Background(), suite.runtime, node)
-	require.NoError(suite.T(), err)
-	require.Empty(suite.T(), reqs)
-}
-
-func (suite *workloadHealthControllerTestSuite) TestGetNodeHealthError() {
-	// This test aims to ensure that errors coming from the getNodeHealth
-	// function are propagated back to the caller. In order to do so
-	// we are going to inject a node but not set its status yet. This
-	// simulates the condition where the workload health controller happened
-	// to start reconciliation before the node health controller. In that
-	// case we also expect the errNodeUnreconciled error to be returned
-	// but the exact error isn't very relevant to the core reason this
-	// test exists.
-
-	node := resourcetest.Resource(pbcatalog.NodeType, "test-node").
-		WithData(suite.T(), nodeData).
-		Write(suite.T(), suite.client)
-
-	workload := resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
-		WithData(suite.T(), workloadData(node.Id.Name)).
-		Write(suite.T(), suite.client)
-
-	resourcetest.Resource(pbcatalog.HealthStatusType, "test-status").
-		WithData(suite.T(), &pbcatalog.HealthStatus{Type: "tcp", Status: pbcatalog.Health_HEALTH_CRITICAL}).
-		WithOwner(workload.Id).
-		Write(suite.T(), suite.client)
-
-	err := suite.reconciler.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: workload.Id,
-	})
-
-	require.Error(suite.T(), err)
-	require.Equal(suite.T(), errNodeUnreconciled, err)
-}
-
-func (suite *workloadHealthControllerTestSuite) TestReconcile_AvoidReconciliationWrite() {
-	// The sole purpose of this test is to ensure that calls to Reconcile for an already
-	// reconciled workload will not perform extra/unnecessary status writes. Basically
-	// we check that calling Reconcile twice in a row without any actual health change
-	// doesn't bump the Version (which would increased for any write of the resource
-	// or its status)
-	status := &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  "HEALTH_WARNING",
-		Message: WorkloadUnhealthyMessage,
-	}
-	res1 := suite.testReconcileWithoutNode(pbcatalog.Health_HEALTH_WARNING, status)
-
-	err := suite.reconciler.Reconcile(context.Background(), suite.runtime, controller.Request{ID: res1.Id})
-	require.NoError(suite.T(), err)
-
-	// check that the status hasn't changed
-	res2 := suite.checkWorkloadStatus(res1.Id, status)
-
-	// If another status write was performed then the versions would differ. This
-	// therefore proves that after a second reconciliation without any change
-	// in status that the controller is not making extra status writes.
-	require.Equal(suite.T(), res1.Version, res2.Version)
-}
-
-func (suite *workloadHealthControllerTestSuite) TestController() {
-	// This test aims to be a very light weight integration test of the
-	// controller with the controller manager as well as a general
-	// controller lifecycle test.
-
-	// create the controller manager
-	mgr := controller.NewManager(suite.client, testutil.Logger(suite.T()))
-
-	// register our controller
-	mgr.Register(WorkloadHealthController(suite.mapper))
-	mgr.SetRaftLeader(true)
-	ctx, cancel := context.WithCancel(context.Background())
-	suite.T().Cleanup(cancel)
-
-	// run the manager
-	go mgr.Run(ctx)
-
-	// create a node to link things with
-	node := suite.injectNodeWithStatus("test-node", pbcatalog.Health_HEALTH_PASSING)
-
-	// create the workload
-	workload := resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
-		WithData(suite.T(), workloadData(node.Id.Name)).
-		Write(suite.T(), suite.client)
-
-	// Wait for reconciliation to occur and mark the workload as passing.
-	suite.waitForReconciliation(workload.Id, "HEALTH_PASSING")
-
-	// Simulate a node unhealty
-	suite.injectNodeWithStatus("test-node", pbcatalog.Health_HEALTH_WARNING)
-
-	// Wait for reconciliation to occur and mark the workload as warning
-	// due to the node going into the warning state.
-	suite.waitForReconciliation(workload.Id, "HEALTH_WARNING")
-
-	// Now register a critical health check that should supercede the nodes
-	// warning status
-
-	resourcetest.Resource(pbcatalog.HealthStatusType, "test-status").
-		WithData(suite.T(), &pbcatalog.HealthStatus{Type: "tcp", Status: pbcatalog.Health_HEALTH_CRITICAL}).
-		WithOwner(workload.Id).
-		Write(suite.T(), suite.client)
-
-	// Wait for reconciliation to occur again and mark the workload as unhealthy
-	suite.waitForReconciliation(workload.Id, "HEALTH_CRITICAL")
-
-	// Put the health status back into a passing state and delink the node
-	resourcetest.Resource(pbcatalog.HealthStatusType, "test-status").
-		WithData(suite.T(), &pbcatalog.HealthStatus{Type: "tcp", Status: pbcatalog.Health_HEALTH_PASSING}).
-		WithOwner(workload.Id).
-		Write(suite.T(), suite.client)
-	workload = resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
-		WithData(suite.T(), workloadData("")).
-		Write(suite.T(), suite.client)
-
-	// Now that the workload health is passing and its not associated with the node its status should
-	// eventually become passing
-	suite.waitForReconciliation(workload.Id, "HEALTH_PASSING")
-}
-
-// wait for reconciliation is a helper to check if a resource has been reconciled and
-// is marked with the expected status.
-func (suite *workloadHealthControllerTestSuite) waitForReconciliation(id *pbresource.ID, reason string) {
-	suite.T().Helper()
-
-	retry.Run(suite.T(), func(r *retry.R) {
-		rsp, err := suite.client.Read(context.Background(), &pbresource.ReadRequest{
-			Id: id,
-		})
-		require.NoError(r, err)
-
-		status, found := rsp.Resource.Status[StatusKey]
-		require.True(r, found)
-		require.Equal(r, rsp.Resource.Generation, status.ObservedGeneration)
-		require.Len(r, status.Conditions, 1)
-		require.Equal(r, reason, status.Conditions[0].Reason)
-	})
-}
-
-func TestWorkloadHealthController(t *testing.T) {
-	suite.Run(t, new(workloadHealthControllerTestSuite))
-}
-
-type getWorkloadHealthTestSuite struct {
-	controllerSuite
-}
-
-func (suite *getWorkloadHealthTestSuite) addHealthStatuses(workload *pbresource.ID, desiredHealth pbcatalog.Health) {
-	// In order to exercise the behavior to ensure that the ordering a health status is
-	// seen doesn't matter this is strategically naming health status so that they will be
-	// returned in an order with the most precedent status being in the middle of the list.
-	// This will ensure that statuses seen later can override a previous status that that
-	// status seen later do not override if they would lower the overall status such as
-	// going from critical -> warning.
-	healthStatuses := []pbcatalog.Health{
-		pbcatalog.Health_HEALTH_PASSING,
-		pbcatalog.Health_HEALTH_WARNING,
-		pbcatalog.Health_HEALTH_CRITICAL,
-		pbcatalog.Health_HEALTH_MAINTENANCE,
-		pbcatalog.Health_HEALTH_CRITICAL,
-		pbcatalog.Health_HEALTH_WARNING,
-		pbcatalog.Health_HEALTH_PASSING,
-	}
-
-	for idx, health := range healthStatuses {
-		if desiredHealth >= health {
-			resourcetest.Resource(pbcatalog.HealthStatusType, fmt.Sprintf("check-%s-%d", workload.Name, idx)).
-				WithData(suite.T(), &pbcatalog.HealthStatus{Type: "tcp", Status: health}).
-				WithOwner(workload).
-				Write(suite.T(), suite.client)
-		}
-	}
-}
-
-func (suite *getWorkloadHealthTestSuite) TestListError() {
-	// This test's goal is to exercise the error propgataion behavior within
-	// getWorkloadHealth. When the resource listing fails, we want to
-	// propagate the error which should eventually result in retrying
-	// the operation.
-	health, err := getWorkloadHealth(context.Background(), suite.runtime, resourceID(fakeType, "foo"))
-
-	require.Error(suite.T(), err)
-	require.Equal(suite.T(), codes.InvalidArgument, status.Code(err))
-	require.Equal(suite.T(), pbcatalog.Health_HEALTH_CRITICAL, health)
-}
-
-func (suite *getWorkloadHealthTestSuite) TestNoHealthStatuses() {
-	// This test's goal is to ensure that when no HealthStatuses are owned by the
-	// workload that the health is assumed to be passing.
-	workload := resourcetest.Resource(pbcatalog.WorkloadType, "foo").
-		WithData(suite.T(), workloadData("")).
-		Write(suite.T(), suite.client)
-
-	health, err := getWorkloadHealth(context.Background(), suite.runtime, workload.Id)
-	require.NoError(suite.T(), err)
-	require.Equal(suite.T(), pbcatalog.Health_HEALTH_PASSING, health)
-}
-
-func (suite *getWorkloadHealthTestSuite) TestWithStatuses() {
-	// This test's goal is to ensure that the health calculation given multiple
-	// statuses results in the most precedent winning. The addHealthStatuses
-	// helper method is used to inject multiple statuses in a way such that
-	// the resource service will return them in a predictable order and can
-	// properly exercise the code.
-	for value, status := range pbcatalog.Health_name {
-		health := pbcatalog.Health(value)
-		if health == pbcatalog.Health_HEALTH_ANY {
-			continue
-		}
-
-		suite.Run(status, func() {
-			workload := resourcetest.Resource(pbcatalog.WorkloadType, "foo").
-				WithData(suite.T(), workloadData("")).
-				Write(suite.T(), suite.client)
-
-			suite.addHealthStatuses(workload.Id, health)
-
-			actualHealth, err := getWorkloadHealth(context.Background(), suite.runtime, workload.Id)
-			require.NoError(suite.T(), err)
-			require.Equal(suite.T(), health, actualHealth)
-		})
-	}
-}
-
-func TestGetWorkloadHealth(t *testing.T) {
-	suite.Run(t, new(getWorkloadHealthTestSuite))
-}
-
-type getNodeHealthTestSuite struct {
-	controllerSuite
-}
-
-func (suite *getNodeHealthTestSuite) TestNotfound() {
-	// This test's goal is to ensure that getNodeHealth when called with a node id that isn't
-	// present in the system results in a the critical health but no error. This situation
-	// could occur when a linked node gets removed without the workloads being modified/removed.
-	// When that occurs we want to steer traffic away from the linked node as soon as possible.
-	health, err := getNodeHealth(context.Background(), suite.runtime, resourceID(pbcatalog.NodeType, "not-found"))
-	require.NoError(suite.T(), err)
-	require.Equal(suite.T(), pbcatalog.Health_HEALTH_CRITICAL, health)
-
-}
-
-func (suite *getNodeHealthTestSuite) TestReadError() {
-	// This test's goal is to ensure the getNodeHealth propagates unexpected errors from
-	// its resource read call back to the caller.
-	health, err := getNodeHealth(context.Background(), suite.runtime, resourceID(fakeType, "not-found"))
-	require.Error(suite.T(), err)
-	require.Equal(suite.T(), codes.InvalidArgument, status.Code(err))
-	require.Equal(suite.T(), pbcatalog.Health_HEALTH_CRITICAL, health)
-}
-
-func (suite *getNodeHealthTestSuite) TestUnreconciled() {
-	// This test's goal is to ensure that nodes with unreconciled health are deemed
-	// critical. Basically, the workload health controller should defer calculating
-	// the workload health until the associated nodes health is known.
-	node := resourcetest.Resource(pbcatalog.NodeType, "unreconciled").
-		WithData(suite.T(), nodeData).
-		Write(suite.T(), suite.client).
-		GetId()
-
-	health, err := getNodeHealth(context.Background(), suite.runtime, node)
-	require.Error(suite.T(), err)
-	require.Equal(suite.T(), errNodeUnreconciled, err)
-	require.Equal(suite.T(), pbcatalog.Health_HEALTH_CRITICAL, health)
-}
-
-func (suite *getNodeHealthTestSuite) TestNoConditions() {
-	// This test's goal is to ensure that if a node's health status doesn't have
-	// the expected condition then its deemedd critical. This should never happen
-	// in the integrated system as the node health controller would have to be
-	// buggy to add an empty status. However it could also indicate some breaking
-	// change went in. Regardless, the code to handle this state is written
-	// and it will be tested here.
-	node := resourcetest.Resource(pbcatalog.NodeType, "no-conditions").
-		WithData(suite.T(), nodeData).
-		WithStatus(nodehealth.StatusKey, &pbresource.Status{}).
-		Write(suite.T(), suite.client).
-		GetId()
-
-	health, err := getNodeHealth(context.Background(), suite.runtime, node)
-	require.Error(suite.T(), err)
-	require.Equal(suite.T(), errNodeHealthConditionNotFound, err)
-	require.Equal(suite.T(), pbcatalog.Health_HEALTH_CRITICAL, health)
-}
-
-func (suite *getNodeHealthTestSuite) TestInvalidReason() {
-	// This test has the same goal as TestNoConditions which is to ensure that if
-	// the node health status isn't properly formed then we assume it is unhealthy.
-	// Just like that other test, it should be impossible for the normal running
-	// system to actually get into this state or at least for the node-health
-	// controller to put it into this state. As users or other controllers could
-	// potentially force it into this state by writing the status themselves, it
-	// would be good to ensure the defined behavior works as expected.
-	node := resourcetest.Resource(pbcatalog.NodeType, "invalid-reason").
-		WithData(suite.T(), nodeData).
-		WithStatus(nodehealth.StatusKey, &pbresource.Status{
-			Conditions: []*pbresource.Condition{
-				{
-					Type:   nodehealth.StatusConditionHealthy,
-					State:  pbresource.Condition_STATE_FALSE,
-					Reason: "INVALID_REASON",
-				},
-			},
-		}).
-		Write(suite.T(), suite.client).
-		GetId()
-
-	health, err := getNodeHealth(context.Background(), suite.runtime, node)
-	require.Error(suite.T(), err)
-	require.Equal(suite.T(), errNodeHealthInvalid, err)
-	require.Equal(suite.T(), pbcatalog.Health_HEALTH_CRITICAL, health)
-}
-
-func (suite *getNodeHealthTestSuite) TestValidHealth() {
-	// This test aims to ensure that all status that would be reported by the node-health
-	// controller gets accurately detected and returned by the getNodeHealth function.
-	for value, healthStr := range pbcatalog.Health_name {
-		health := pbcatalog.Health(value)
-
-		// this is not a valid health that a health status
-		// may be in.
-		if health == pbcatalog.Health_HEALTH_ANY {
-			continue
-		}
-
-		suite.T().Run(healthStr, func(t *testing.T) {
-			node := suite.injectNodeWithStatus("test-node", health)
-
-			actualHealth, err := getNodeHealth(context.Background(), suite.runtime, node.Id)
-			require.NoError(t, err)
-			require.Equal(t, health, actualHealth)
-		})
-	}
-}
-
-func TestGetNodeHealth(t *testing.T) {
-	suite.Run(t, new(getNodeHealthTestSuite))
-}
diff --git a/internal/catalog/internal/controllers/workloadhealth/status.go b/internal/catalog/internal/controllers/workloadhealth/status.go
deleted file mode 100644
index 133bd4cec989d..0000000000000
--- a/internal/catalog/internal/controllers/workloadhealth/status.go
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package workloadhealth
-
-import (
-	"github.com/hashicorp/consul/internal/catalog/internal/controllers/nodehealth"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	StatusKey              = "consul.io/workload-health"
-	StatusConditionHealthy = "healthy"
-
-	NodeAndWorkloadHealthyMessage   = "All workload and associated node health checks are passing"
-	WorkloadHealthyMessage          = "All workload health checks are passing"
-	NodeAndWorkloadUnhealthyMessage = "One or more workload and node health checks are not passing"
-	WorkloadUnhealthyMessage        = "One or more workload health checks are not passing"
-)
-
-var (
-	ConditionWorkloadPassing = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_TRUE,
-		Reason:  pbcatalog.Health_HEALTH_PASSING.String(),
-		Message: WorkloadHealthyMessage,
-	}
-
-	ConditionWorkloadWarning = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  pbcatalog.Health_HEALTH_WARNING.String(),
-		Message: WorkloadUnhealthyMessage,
-	}
-
-	ConditionWorkloadCritical = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  pbcatalog.Health_HEALTH_CRITICAL.String(),
-		Message: WorkloadUnhealthyMessage,
-	}
-
-	ConditionWorkloadMaintenance = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  pbcatalog.Health_HEALTH_MAINTENANCE.String(),
-		Message: WorkloadUnhealthyMessage,
-	}
-
-	ConditionNodeAndWorkloadPassing = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_TRUE,
-		Reason:  pbcatalog.Health_HEALTH_PASSING.String(),
-		Message: NodeAndWorkloadHealthyMessage,
-	}
-
-	ConditionNodeAndWorkloadWarning = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  pbcatalog.Health_HEALTH_WARNING.String(),
-		Message: NodeAndWorkloadUnhealthyMessage,
-	}
-
-	ConditionNodeAndWorkloadCritical = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  pbcatalog.Health_HEALTH_CRITICAL.String(),
-		Message: NodeAndWorkloadUnhealthyMessage,
-	}
-
-	ConditionNodeAndWorkloadMaintenance = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  pbcatalog.Health_HEALTH_MAINTENANCE.String(),
-		Message: NodeAndWorkloadUnhealthyMessage,
-	}
-
-	ConditionNodeWarning = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  pbcatalog.Health_HEALTH_WARNING.String(),
-		Message: nodehealth.NodeUnhealthyMessage,
-	}
-
-	ConditionNodeCritical = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  pbcatalog.Health_HEALTH_CRITICAL.String(),
-		Message: nodehealth.NodeUnhealthyMessage,
-	}
-
-	ConditionNodeMaintenance = &pbresource.Condition{
-		Type:    StatusConditionHealthy,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  pbcatalog.Health_HEALTH_MAINTENANCE.String(),
-		Message: nodehealth.NodeUnhealthyMessage,
-	}
-
-	// WorkloadConditions is a map of the workloadhealth to the status condition
-	// used to represent that health.
-	WorkloadConditions = map[pbcatalog.Health]*pbresource.Condition{
-		pbcatalog.Health_HEALTH_PASSING:     ConditionWorkloadPassing,
-		pbcatalog.Health_HEALTH_WARNING:     ConditionWorkloadWarning,
-		pbcatalog.Health_HEALTH_CRITICAL:    ConditionWorkloadCritical,
-		pbcatalog.Health_HEALTH_MAINTENANCE: ConditionWorkloadMaintenance,
-	}
-
-	// NodeAndWorkloadConditions is a map whose ultimate values are the status conditions
-	// used to represent the combined health of a workload and its associated node.
-	// The outer map's keys are the workloads health and the inner maps keys are the nodes
-	// health
-	NodeAndWorkloadConditions = map[pbcatalog.Health]map[pbcatalog.Health]*pbresource.Condition{
-		pbcatalog.Health_HEALTH_PASSING: {
-			pbcatalog.Health_HEALTH_PASSING:     ConditionNodeAndWorkloadPassing,
-			pbcatalog.Health_HEALTH_WARNING:     ConditionNodeWarning,
-			pbcatalog.Health_HEALTH_CRITICAL:    ConditionNodeCritical,
-			pbcatalog.Health_HEALTH_MAINTENANCE: ConditionNodeMaintenance,
-		},
-		pbcatalog.Health_HEALTH_WARNING: {
-			pbcatalog.Health_HEALTH_PASSING:     ConditionWorkloadWarning,
-			pbcatalog.Health_HEALTH_WARNING:     ConditionNodeAndWorkloadWarning,
-			pbcatalog.Health_HEALTH_CRITICAL:    ConditionNodeAndWorkloadCritical,
-			pbcatalog.Health_HEALTH_MAINTENANCE: ConditionNodeAndWorkloadMaintenance,
-		},
-		pbcatalog.Health_HEALTH_CRITICAL: {
-			pbcatalog.Health_HEALTH_PASSING:     ConditionWorkloadCritical,
-			pbcatalog.Health_HEALTH_WARNING:     ConditionNodeAndWorkloadCritical,
-			pbcatalog.Health_HEALTH_CRITICAL:    ConditionNodeAndWorkloadCritical,
-			pbcatalog.Health_HEALTH_MAINTENANCE: ConditionNodeAndWorkloadMaintenance,
-		},
-		pbcatalog.Health_HEALTH_MAINTENANCE: {
-			pbcatalog.Health_HEALTH_PASSING:     ConditionWorkloadMaintenance,
-			pbcatalog.Health_HEALTH_WARNING:     ConditionNodeAndWorkloadMaintenance,
-			pbcatalog.Health_HEALTH_CRITICAL:    ConditionNodeAndWorkloadMaintenance,
-			pbcatalog.Health_HEALTH_MAINTENANCE: ConditionNodeAndWorkloadMaintenance,
-		},
-	}
-)
diff --git a/internal/catalog/internal/mappers/failovermapper/failover_mapper.go b/internal/catalog/internal/mappers/failovermapper/failover_mapper.go
deleted file mode 100644
index 7cd40b47b453a..0000000000000
--- a/internal/catalog/internal/mappers/failovermapper/failover_mapper.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package failovermapper
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/mappers/bimapper"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// Mapper tracks the relationship between a FailoverPolicy an a Service it
-// references whether due to name-alignment or from a reference in a
-// FailoverDestination leg.
-type Mapper struct {
-	b *bimapper.Mapper
-}
-
-// New creates a new Mapper.
-func New() *Mapper {
-	return &Mapper{
-		b: bimapper.New(pbcatalog.FailoverPolicyType, pbcatalog.ServiceType),
-	}
-}
-
-// TrackFailover extracts all Service references from the provided
-// FailoverPolicy and indexes them so that MapService can turn Service events
-// into FailoverPolicy events properly.
-func (m *Mapper) TrackFailover(failover *resource.DecodedResource[*pbcatalog.FailoverPolicy]) {
-	destRefs := failover.Data.GetUnderlyingDestinationRefs()
-	destRefs = append(destRefs, &pbresource.Reference{
-		Type:    pbcatalog.ServiceType,
-		Tenancy: failover.Resource.Id.Tenancy,
-		Name:    failover.Resource.Id.Name,
-	})
-	m.trackFailover(failover.Resource.Id, destRefs)
-}
-
-func (m *Mapper) trackFailover(failover *pbresource.ID, services []*pbresource.Reference) {
-	var servicesAsIDsOrRefs []resource.ReferenceOrID
-	for _, s := range services {
-		servicesAsIDsOrRefs = append(servicesAsIDsOrRefs, s)
-	}
-	m.b.TrackItem(failover, servicesAsIDsOrRefs)
-}
-
-// UntrackFailover forgets the links inserted by TrackFailover for the provided
-// FailoverPolicyID.
-func (m *Mapper) UntrackFailover(failoverID *pbresource.ID) {
-	m.b.UntrackItem(failoverID)
-}
-
-func (m *Mapper) MapService(ctx context.Context, rt controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	return m.b.MapLink(ctx, rt, res)
-}
-
-func (m *Mapper) FailoverIDsByService(svcID *pbresource.ID) []*pbresource.ID {
-	return m.b.ItemsForLink(svcID)
-}
diff --git a/internal/catalog/internal/mappers/failovermapper/failover_mapper_test.go b/internal/catalog/internal/mappers/failovermapper/failover_mapper_test.go
deleted file mode 100644
index 6149fddbf2613..0000000000000
--- a/internal/catalog/internal/mappers/failovermapper/failover_mapper_test.go
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package failovermapper
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/catalog/internal/types"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestMapper_Tracking(t *testing.T) {
-	registry := resource.NewRegistry()
-	types.Register(registry)
-
-	// Create an advance pointer to some services.
-	randoSvc := rtest.Resource(pbcatalog.ServiceType, "rando").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.Service{}).
-		Build()
-	rtest.ValidateAndNormalize(t, registry, randoSvc)
-
-	apiSvc := rtest.Resource(pbcatalog.ServiceType, "api").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.Service{}).
-		Build()
-	rtest.ValidateAndNormalize(t, registry, apiSvc)
-
-	fooSvc := rtest.Resource(pbcatalog.ServiceType, "foo").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.Service{}).
-		Build()
-	rtest.ValidateAndNormalize(t, registry, fooSvc)
-
-	barSvc := rtest.Resource(pbcatalog.ServiceType, "bar").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.Service{}).
-		Build()
-	rtest.ValidateAndNormalize(t, registry, barSvc)
-
-	wwwSvc := rtest.Resource(pbcatalog.ServiceType, "www").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.Service{}).
-		Build()
-	rtest.ValidateAndNormalize(t, registry, wwwSvc)
-
-	fail1 := rtest.Resource(pbcatalog.FailoverPolicyType, "api").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.FailoverPolicy{
-			Config: &pbcatalog.FailoverConfig{
-				Destinations: []*pbcatalog.FailoverDestination{
-					{Ref: newRef(pbcatalog.ServiceType, "foo")},
-					{Ref: newRef(pbcatalog.ServiceType, "bar")},
-				},
-			},
-		}).
-		Build()
-	rtest.ValidateAndNormalize(t, registry, fail1)
-	failDec1 := rtest.MustDecode[*pbcatalog.FailoverPolicy](t, fail1)
-
-	fail2 := rtest.Resource(pbcatalog.FailoverPolicyType, "www").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.FailoverPolicy{
-			Config: &pbcatalog.FailoverConfig{
-				Destinations: []*pbcatalog.FailoverDestination{
-					{Ref: newRef(pbcatalog.ServiceType, "www"), Datacenter: "dc2"},
-					{Ref: newRef(pbcatalog.ServiceType, "foo")},
-				},
-			},
-		}).
-		Build()
-	rtest.ValidateAndNormalize(t, registry, fail2)
-	failDec2 := rtest.MustDecode[*pbcatalog.FailoverPolicy](t, fail2)
-
-	fail1_updated := rtest.Resource(pbcatalog.FailoverPolicyType, "api").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.FailoverPolicy{
-			Config: &pbcatalog.FailoverConfig{
-				Destinations: []*pbcatalog.FailoverDestination{
-					{Ref: newRef(pbcatalog.ServiceType, "bar")},
-				},
-			},
-		}).
-		Build()
-	rtest.ValidateAndNormalize(t, registry, fail1_updated)
-	failDec1_updated := rtest.MustDecode[*pbcatalog.FailoverPolicy](t, fail1_updated)
-
-	m := New()
-
-	// Nothing tracked yet so we assume nothing.
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc)
-	requireServicesTracked(t, m, fooSvc)
-	requireServicesTracked(t, m, barSvc)
-	requireServicesTracked(t, m, wwwSvc)
-
-	// no-ops
-	m.UntrackFailover(fail1.Id)
-
-	// still nothing
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc)
-	requireServicesTracked(t, m, fooSvc)
-	requireServicesTracked(t, m, barSvc)
-	requireServicesTracked(t, m, wwwSvc)
-
-	// Actually insert some data.
-	m.TrackFailover(failDec1)
-
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc, fail1.Id)
-	requireServicesTracked(t, m, fooSvc, fail1.Id)
-	requireServicesTracked(t, m, barSvc, fail1.Id)
-	requireServicesTracked(t, m, wwwSvc)
-
-	// track it again, no change
-	m.TrackFailover(failDec1)
-
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc, fail1.Id)
-	requireServicesTracked(t, m, fooSvc, fail1.Id)
-	requireServicesTracked(t, m, barSvc, fail1.Id)
-	requireServicesTracked(t, m, wwwSvc)
-
-	// track new one that overlaps slightly
-	m.TrackFailover(failDec2)
-
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc, fail1.Id)
-	requireServicesTracked(t, m, fooSvc, fail1.Id, fail2.Id)
-	requireServicesTracked(t, m, barSvc, fail1.Id)
-	requireServicesTracked(t, m, wwwSvc, fail2.Id)
-
-	// update the original to change it
-	m.TrackFailover(failDec1_updated)
-
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc, fail1.Id)
-	requireServicesTracked(t, m, fooSvc, fail2.Id)
-	requireServicesTracked(t, m, barSvc, fail1.Id)
-	requireServicesTracked(t, m, wwwSvc, fail2.Id)
-
-	// delete the original
-	m.UntrackFailover(fail1.Id)
-
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc)
-	requireServicesTracked(t, m, fooSvc, fail2.Id)
-	requireServicesTracked(t, m, barSvc)
-	requireServicesTracked(t, m, wwwSvc, fail2.Id)
-
-	// delete the other one
-	m.UntrackFailover(fail2.Id)
-
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc)
-	requireServicesTracked(t, m, fooSvc)
-	requireServicesTracked(t, m, barSvc)
-	requireServicesTracked(t, m, wwwSvc)
-}
-
-func requireServicesTracked(t *testing.T, mapper *Mapper, svc *pbresource.Resource, failovers ...*pbresource.ID) {
-	t.Helper()
-
-	reqs, err := mapper.MapService(
-		context.Background(),
-		controller.Runtime{},
-		svc,
-	)
-	require.NoError(t, err)
-
-	require.Len(t, reqs, len(failovers))
-
-	for _, failover := range failovers {
-		prototest.AssertContainsElement(t, reqs, controller.Request{ID: failover})
-	}
-}
-
-func newRef(typ *pbresource.Type, name string) *pbresource.Reference {
-	return rtest.Resource(typ, name).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		Reference("")
-}
diff --git a/internal/catalog/internal/mappers/nodemapper/node_mapper.go b/internal/catalog/internal/mappers/nodemapper/node_mapper.go
deleted file mode 100644
index 4a9a3cfe38c8c..0000000000000
--- a/internal/catalog/internal/mappers/nodemapper/node_mapper.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package nodemapper
-
-import (
-	"context"
-	"sync"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type NodeMapper struct {
-	lock             sync.Mutex
-	nodesToWorkloads map[string][]controller.Request
-	workloadsToNodes map[string]string
-}
-
-func New() *NodeMapper {
-	return &NodeMapper{
-		workloadsToNodes: make(map[string]string),
-		nodesToWorkloads: make(map[string][]controller.Request),
-	}
-}
-
-// NodeIDFromWorkload will create a resource ID referencing the Node type with the same tenancy as
-// the workload and with the name populated from the workloads NodeName field.
-func (m *NodeMapper) NodeIDFromWorkload(workload *pbresource.Resource, workloadData *pbcatalog.Workload) *pbresource.ID {
-	return &pbresource.ID{
-		Type:    pbcatalog.NodeType,
-		Tenancy: workload.Id.Tenancy,
-		Name:    workloadData.NodeName,
-	}
-}
-
-// MapNodeToWorkloads will take a Node resource and return controller requests
-// for all Workloads associated with the Node.
-func (m *NodeMapper) MapNodeToWorkloads(_ context.Context, _ controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	return m.nodesToWorkloads[res.Id.Name], nil
-}
-
-// TrackWorkload instructs the NodeMapper to associate the given workload
-// ID with the given node ID.
-func (m *NodeMapper) TrackWorkload(workloadID *pbresource.ID, nodeID *pbresource.ID) {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-
-	if previousNode, found := m.workloadsToNodes[workloadID.Name]; found && previousNode == nodeID.Name {
-		return
-	} else if found {
-		// the node association is being changed
-		m.untrackWorkloadFromNode(workloadID, previousNode)
-	}
-
-	// Now set up the latest tracking
-	m.nodesToWorkloads[nodeID.Name] = append(m.nodesToWorkloads[nodeID.Name], controller.Request{ID: workloadID})
-	m.workloadsToNodes[workloadID.Name] = nodeID.Name
-}
-
-// UntrackWorkload will cause the node mapper to forget about the specified
-// workload if it is currently tracking it.
-func (m *NodeMapper) UntrackWorkload(workloadID *pbresource.ID) {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-
-	node, found := m.workloadsToNodes[workloadID.Name]
-	if !found {
-		return
-	}
-	m.untrackWorkloadFromNode(workloadID, node)
-}
-
-// untrackWorkloadFromNode will disassociate the specified workload and node.
-// This method will clean up unnecessary tracking entries if the node name
-// is no longer associated with any workloads.
-func (m *NodeMapper) untrackWorkloadFromNode(workloadID *pbresource.ID, node string) {
-	foundIdx := -1
-	for idx, req := range m.nodesToWorkloads[node] {
-		if resource.EqualID(req.ID, workloadID) {
-			foundIdx = idx
-			break
-		}
-	}
-
-	if foundIdx != -1 {
-		workloads := m.nodesToWorkloads[node]
-		l := len(workloads)
-
-		if l == 1 {
-			delete(m.nodesToWorkloads, node)
-		} else if foundIdx == l-1 {
-			m.nodesToWorkloads[node] = workloads[:foundIdx]
-		} else if foundIdx == 0 {
-			m.nodesToWorkloads[node] = workloads[1:]
-		} else {
-			m.nodesToWorkloads[node] = append(workloads[:foundIdx], workloads[foundIdx+1:]...)
-		}
-	}
-
-	delete(m.workloadsToNodes, workloadID.Name)
-}
diff --git a/internal/catalog/internal/mappers/nodemapper/node_mapper_test.go b/internal/catalog/internal/mappers/nodemapper/node_mapper_test.go
deleted file mode 100644
index fda260361fe8d..0000000000000
--- a/internal/catalog/internal/mappers/nodemapper/node_mapper_test.go
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package nodemapper
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestNodeMapper_NodeIDFromWorkload(t *testing.T) {
-	mapper := New()
-
-	data := &pbcatalog.Workload{
-		NodeName: "test-node",
-		// the other fields should be irrelevant
-	}
-
-	workload := resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
-		WithData(t, data).Build()
-
-	actual := mapper.NodeIDFromWorkload(workload, data)
-	expected := &pbresource.ID{
-		Type:    pbcatalog.NodeType,
-		Tenancy: workload.Id.Tenancy,
-		Name:    "test-node",
-	}
-
-	prototest.AssertDeepEqual(t, expected, actual)
-}
-
-func requireWorkloadsTracked(t *testing.T, mapper *NodeMapper, node *pbresource.Resource, workloads ...*pbresource.ID) {
-	t.Helper()
-	reqs, err := mapper.MapNodeToWorkloads(
-		context.Background(),
-		controller.Runtime{},
-		node)
-
-	require.NoError(t, err)
-	require.Len(t, reqs, len(workloads))
-	for _, workload := range workloads {
-		prototest.AssertContainsElement(t, reqs, controller.Request{ID: workload})
-	}
-}
-
-func TestNodeMapper_WorkloadTracking(t *testing.T) {
-	mapper := New()
-
-	node1 := resourcetest.Resource(pbcatalog.NodeType, "node1").
-		WithData(t, &pbcatalog.Node{Addresses: []*pbcatalog.NodeAddress{{Host: "198.18.0.1"}}}).
-		Build()
-
-	node2 := resourcetest.Resource(pbcatalog.NodeType, "node2").
-		WithData(t, &pbcatalog.Node{Addresses: []*pbcatalog.NodeAddress{{Host: "198.18.0.2"}}}).
-		Build()
-
-	tenant := &pbresource.Tenancy{
-		Partition: "default",
-		Namespace: "default",
-		PeerName:  "local",
-	}
-
-	workload1 := &pbresource.ID{Type: pbcatalog.WorkloadType, Tenancy: tenant, Name: "workload1"}
-	workload2 := &pbresource.ID{Type: pbcatalog.WorkloadType, Tenancy: tenant, Name: "workload2"}
-	workload3 := &pbresource.ID{Type: pbcatalog.WorkloadType, Tenancy: tenant, Name: "workload3"}
-	workload4 := &pbresource.ID{Type: pbcatalog.WorkloadType, Tenancy: tenant, Name: "workload4"}
-	workload5 := &pbresource.ID{Type: pbcatalog.WorkloadType, Tenancy: tenant, Name: "workload5"}
-
-	// No Workloads have been tracked so the mapper should return empty lists
-	requireWorkloadsTracked(t, mapper, node1)
-	requireWorkloadsTracked(t, mapper, node2)
-	// As nothing is tracked these should be pretty much no-ops
-	mapper.UntrackWorkload(workload1)
-	mapper.UntrackWorkload(workload2)
-	mapper.UntrackWorkload(workload2)
-	mapper.UntrackWorkload(workload3)
-	mapper.UntrackWorkload(workload4)
-	mapper.UntrackWorkload(workload5)
-
-	// Now track some workloads
-	mapper.TrackWorkload(workload1, node1.Id)
-	mapper.TrackWorkload(workload2, node1.Id)
-	mapper.TrackWorkload(workload3, node2.Id)
-	mapper.TrackWorkload(workload4, node2.Id)
-
-	// Mapping should now return 2 workload requests for each node
-	requireWorkloadsTracked(t, mapper, node1, workload1, workload2)
-	requireWorkloadsTracked(t, mapper, node2, workload3, workload4)
-
-	// Track the same workloads again, this should end up being mostly a no-op
-	mapper.TrackWorkload(workload1, node1.Id)
-	mapper.TrackWorkload(workload2, node1.Id)
-	mapper.TrackWorkload(workload3, node2.Id)
-	mapper.TrackWorkload(workload4, node2.Id)
-
-	// Mappings should be unchanged from the initial workload tracking
-	requireWorkloadsTracked(t, mapper, node1, workload1, workload2)
-	requireWorkloadsTracked(t, mapper, node2, workload3, workload4)
-
-	// Change the workload association for workload2
-	mapper.TrackWorkload(workload2, node2.Id)
-
-	// Node1 should now track just the single workload and node2 should track 3
-	requireWorkloadsTracked(t, mapper, node1, workload1)
-	requireWorkloadsTracked(t, mapper, node2, workload2, workload3, workload4)
-
-	// Untrack the workloads - this is done in very specific ordering to ensure all
-	// the workload tracking removal paths get hit. This does assume that the ordering
-	// of requests is stable between removals.
-
-	// remove the one and only workload from a node
-	mapper.UntrackWorkload(workload1)
-	requireWorkloadsTracked(t, mapper, node1)
-
-	// track an additional workload
-	mapper.TrackWorkload(workload5, node2.Id)
-	reqs, err := mapper.MapNodeToWorkloads(context.Background(), controller.Runtime{}, node2)
-	require.NoError(t, err)
-	require.Len(t, reqs, 4)
-
-	first := reqs[0].ID
-	second := reqs[1].ID
-	third := reqs[2].ID
-	fourth := reqs[3].ID
-
-	// remove from the middle of the request list
-	mapper.UntrackWorkload(second)
-	requireWorkloadsTracked(t, mapper, node2, first, third, fourth)
-
-	// remove from the end of the list
-	mapper.UntrackWorkload(fourth)
-	requireWorkloadsTracked(t, mapper, node2, first, third)
-
-	// remove from the beginning of the list
-	mapper.UntrackWorkload(first)
-	requireWorkloadsTracked(t, mapper, node2, third)
-
-	// remove the last element
-	mapper.UntrackWorkload(third)
-	requireWorkloadsTracked(t, mapper, node2)
-}
diff --git a/internal/catalog/internal/types/dns_policy.go b/internal/catalog/internal/types/dns_policy.go
deleted file mode 100644
index 8927bdbd49c49..0000000000000
--- a/internal/catalog/internal/types/dns_policy.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"math"
-
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterDNSPolicy(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbcatalog.DNSPolicyType,
-		Proto:    &pbcatalog.DNSPolicy{},
-		Scope:    resource.ScopeNamespace,
-		Validate: ValidateDNSPolicy,
-	})
-}
-
-func ValidateDNSPolicy(res *pbresource.Resource) error {
-	var policy pbcatalog.DNSPolicy
-
-	if err := res.Data.UnmarshalTo(&policy); err != nil {
-		return resource.NewErrDataParse(&policy, err)
-	}
-
-	var err error
-	// Ensure that this resource isn't useless and is attempting to
-	// select at least one workload.
-	if selErr := validateSelector(policy.Workloads, false); selErr != nil {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "workloads",
-			Wrapped: selErr,
-		})
-	}
-
-	// Validate the weights
-	if weightErr := validateDNSPolicyWeights(policy.Weights); weightErr != nil {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "weights",
-			Wrapped: weightErr,
-		})
-	}
-
-	return err
-}
-
-func validateDNSPolicyWeights(weights *pbcatalog.Weights) error {
-	// Non nil weights are required
-	if weights == nil {
-		return resource.ErrMissing
-	}
-
-	var err error
-	if weights.Passing < 1 || weights.Passing > math.MaxUint16 {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "passing",
-			Wrapped: errDNSPassingWeightOutOfRange,
-		})
-	}
-
-	// Each weight is an unsigned integer so we don't need to
-	// check for negative weights.
-	if weights.Warning > math.MaxUint16 {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "warning",
-			Wrapped: errDNSWarningWeightOutOfRange,
-		})
-	}
-
-	return err
-}
diff --git a/internal/catalog/internal/types/dns_policy_test.go b/internal/catalog/internal/types/dns_policy_test.go
deleted file mode 100644
index 3a611171070a1..0000000000000
--- a/internal/catalog/internal/types/dns_policy_test.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func createDNSPolicyResource(t *testing.T, data protoreflect.ProtoMessage) *pbresource.Resource {
-	res := &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type: pbcatalog.DNSPolicyType,
-			Tenancy: &pbresource.Tenancy{
-				Partition: "default",
-				Namespace: "default",
-				PeerName:  "local",
-			},
-			Name: "test-policy",
-		},
-	}
-
-	var err error
-	res.Data, err = anypb.New(data)
-	require.NoError(t, err)
-	return res
-}
-
-func TestValidateDNSPolicy_Ok(t *testing.T) {
-	data := &pbcatalog.DNSPolicy{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{""},
-		},
-		Weights: &pbcatalog.Weights{
-			Passing: 3,
-			Warning: 0,
-		},
-	}
-
-	res := createDNSPolicyResource(t, data)
-
-	err := ValidateDNSPolicy(res)
-	require.NoError(t, err)
-}
-
-func TestValidateDNSPolicy_ParseError(t *testing.T) {
-	// Any type other than the DNSPolicy type would work
-	// to cause the error we are expecting
-	data := &pbcatalog.IP{Address: "198.18.0.1"}
-
-	res := createDNSPolicyResource(t, data)
-
-	err := ValidateDNSPolicy(res)
-	require.Error(t, err)
-	require.ErrorAs(t, err, &resource.ErrDataParse{})
-}
-
-func TestValidateDNSPolicy_MissingWeights(t *testing.T) {
-	data := &pbcatalog.DNSPolicy{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{""},
-		},
-	}
-
-	res := createDNSPolicyResource(t, data)
-
-	err := ValidateDNSPolicy(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "weights",
-		Wrapped: resource.ErrMissing,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateDNSPolicy_InvalidPassingWeight(t *testing.T) {
-	for _, weight := range []uint32{0, 1000000} {
-		t.Run(fmt.Sprintf("%d", weight), func(t *testing.T) {
-			data := &pbcatalog.DNSPolicy{
-				Workloads: &pbcatalog.WorkloadSelector{
-					Prefixes: []string{""},
-				},
-				Weights: &pbcatalog.Weights{
-					Passing: weight,
-				},
-			}
-
-			res := createDNSPolicyResource(t, data)
-
-			err := ValidateDNSPolicy(res)
-			require.Error(t, err)
-			expected := resource.ErrInvalidField{
-				Name:    "passing",
-				Wrapped: errDNSPassingWeightOutOfRange,
-			}
-			var actual resource.ErrInvalidField
-			require.ErrorAs(t, err, &actual)
-			require.Equal(t, "weights", actual.Name)
-			err = actual.Unwrap()
-			require.ErrorAs(t, err, &actual)
-			require.Equal(t, expected, actual)
-		})
-	}
-}
-
-func TestValidateDNSPolicy_InvalidWarningWeight(t *testing.T) {
-	data := &pbcatalog.DNSPolicy{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{""},
-		},
-		Weights: &pbcatalog.Weights{
-			Passing: 1,
-			Warning: 1000000,
-		},
-	}
-
-	res := createDNSPolicyResource(t, data)
-
-	err := ValidateDNSPolicy(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "warning",
-		Wrapped: errDNSWarningWeightOutOfRange,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, "weights", actual.Name)
-	err = actual.Unwrap()
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateDNSPolicy_EmptySelector(t *testing.T) {
-	data := &pbcatalog.DNSPolicy{
-		Weights: &pbcatalog.Weights{
-			Passing: 10,
-			Warning: 3,
-		},
-	}
-
-	res := createDNSPolicyResource(t, data)
-
-	err := ValidateDNSPolicy(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "workloads",
-		Wrapped: resource.ErrEmpty,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
diff --git a/internal/catalog/internal/types/errors.go b/internal/catalog/internal/types/errors.go
deleted file mode 100644
index 3b331a9a6302c..0000000000000
--- a/internal/catalog/internal/types/errors.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"errors"
-	"fmt"
-)
-
-var (
-	errNotDNSLabel                = errors.New(fmt.Sprintf("value must match regex: %s", dnsLabelRegex))
-	errNotIPAddress               = errors.New("value is not a valid IP address")
-	errUnixSocketMultiport        = errors.New("Unix socket address references more than one port")
-	errInvalidPhysicalPort        = errors.New("port number is outside the range 1 to 65535")
-	errInvalidVirtualPort         = errors.New("port number is outside the range 0 to 65535")
-	errDNSWarningWeightOutOfRange = errors.New("DNS warning weight is outside the range 0 to 65535")
-	errDNSPassingWeightOutOfRange = errors.New("DNS passing weight is outside of the range 1 to 65535")
-	errLocalityZoneNoRegion       = errors.New("locality region cannot be empty if the zone is set")
-	errInvalidHealth              = errors.New("health status must be one of: passing, warning, critical or maintenance")
-)
-
-type errInvalidWorkloadHostFormat struct {
-	Host string
-}
-
-func (err errInvalidWorkloadHostFormat) Error() string {
-	return fmt.Sprintf("%q is not an IP address, Unix socket path or a DNS name.", err.Host)
-}
-
-type errInvalidNodeHostFormat struct {
-	Host string
-}
-
-func (err errInvalidNodeHostFormat) Error() string {
-	return fmt.Sprintf("%q is not an IP address or a DNS name.", err.Host)
-}
-
-type errInvalidPortReference struct {
-	Name string
-}
-
-func (err errInvalidPortReference) Error() string {
-	return fmt.Sprintf("port with name %q has not been defined", err.Name)
-}
-
-type errVirtualPortReused struct {
-	Index int
-	Value uint32
-}
-
-func (err errVirtualPortReused) Error() string {
-	return fmt.Sprintf("virtual port %d was previously assigned at index %d", err.Value, err.Index)
-}
-
-type errTooMuchMesh struct {
-	Ports []string
-}
-
-func (err errTooMuchMesh) Error() string {
-	return fmt.Sprintf("protocol \"mesh\" was specified in more than 1 port: %+v", err.Ports)
-}
-
-type errInvalidEndpointsOwnerName struct {
-	Name      string
-	OwnerName string
-}
-
-func (err errInvalidEndpointsOwnerName) Error() string {
-	return fmt.Sprintf("invalid owner name %q. ServiceEndpoints objects must be owned by a Service with the same name: %q", err.OwnerName, err.Name)
-}
diff --git a/internal/catalog/internal/types/errors_test.go b/internal/catalog/internal/types/errors_test.go
deleted file mode 100644
index 08f227166aa22..0000000000000
--- a/internal/catalog/internal/types/errors_test.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"flag"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-// update allows golden files to be updated based on the current output.
-var update = flag.Bool("update", false, "update golden files")
-
-func goldenError(t *testing.T, name string, actual string) {
-	t.Helper()
-
-	fpath := filepath.Join("testdata", name+".golden")
-
-	if *update {
-		require.NoError(t, os.WriteFile(fpath, []byte(actual), 0644))
-	} else {
-		expected, err := os.ReadFile(fpath)
-		require.NoError(t, err)
-		require.Equal(t, string(expected), actual)
-	}
-}
-
-func TestErrorStrings(t *testing.T) {
-	type testCase struct {
-		err      error
-		expected string
-	}
-
-	cases := map[string]error{
-		"errInvalidWorkloadHostFormat": errInvalidWorkloadHostFormat{
-			Host: "-foo-bar-",
-		},
-		"errInvalidNodeHostFormat": errInvalidNodeHostFormat{
-			Host: "unix:///node.sock",
-		},
-		"errInvalidPortReference": errInvalidPortReference{
-			Name: "http",
-		},
-		"errVirtualPortReused": errVirtualPortReused{
-			Index: 3,
-			Value: 8080,
-		},
-		"errTooMuchMesh": errTooMuchMesh{
-			Ports: []string{"http", "grpc"},
-		},
-		"errInvalidEndpointsOwnerName": errInvalidEndpointsOwnerName{
-			Name:      "foo",
-			OwnerName: "bar",
-		},
-		"errNotDNSLabel":                errNotDNSLabel,
-		"errNotIPAddress":               errNotIPAddress,
-		"errUnixSocketMultiport":        errUnixSocketMultiport,
-		"errInvalidPhysicalPort":        errInvalidPhysicalPort,
-		"errInvalidVirtualPort":         errInvalidVirtualPort,
-		"errDNSWarningWeightOutOfRange": errDNSWarningWeightOutOfRange,
-		"errDNSPassingWeightOutOfRange": errDNSPassingWeightOutOfRange,
-		"errLocalityZoneNoRegion":       errLocalityZoneNoRegion,
-	}
-
-	for name, err := range cases {
-		t.Run(name, func(t *testing.T) {
-			goldenError(t, name, err.Error())
-		})
-	}
-}
diff --git a/internal/catalog/internal/types/failover_policy.go b/internal/catalog/internal/types/failover_policy.go
deleted file mode 100644
index e1884f2d328ec..0000000000000
--- a/internal/catalog/internal/types/failover_policy.go
+++ /dev/null
@@ -1,363 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/go-multierror"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterFailoverPolicy(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbcatalog.FailoverPolicyType,
-		Proto:    &pbcatalog.FailoverPolicy{},
-		Scope:    resource.ScopeNamespace,
-		Mutate:   MutateFailoverPolicy,
-		Validate: ValidateFailoverPolicy,
-		ACLs: &resource.ACLHooks{
-			Read:  aclReadHookFailoverPolicy,
-			Write: aclWriteHookFailoverPolicy,
-			List:  aclListHookFailoverPolicy,
-		},
-	})
-}
-
-func MutateFailoverPolicy(res *pbresource.Resource) error {
-	var failover pbcatalog.FailoverPolicy
-
-	if err := res.Data.UnmarshalTo(&failover); err != nil {
-		return resource.NewErrDataParse(&failover, err)
-	}
-
-	changed := false
-
-	// Handle eliding empty configs.
-	if failover.Config != nil && failover.Config.IsEmpty() {
-		failover.Config = nil
-		changed = true
-	}
-
-	if failover.Config != nil {
-		if mutateFailoverConfig(res.Id.Tenancy, failover.Config) {
-			changed = true
-		}
-	}
-
-	for port, pc := range failover.PortConfigs {
-		if pc.IsEmpty() {
-			delete(failover.PortConfigs, port)
-			changed = true
-		} else {
-			if mutateFailoverConfig(res.Id.Tenancy, pc) {
-				changed = true
-			}
-		}
-	}
-	if len(failover.PortConfigs) == 0 {
-		failover.PortConfigs = nil
-		changed = true
-	}
-
-	if !changed {
-		return nil
-	}
-
-	return res.Data.MarshalFrom(&failover)
-}
-
-func mutateFailoverConfig(policyTenancy *pbresource.Tenancy, config *pbcatalog.FailoverConfig) (changed bool) {
-	if policyTenancy != nil && !isLocalPeer(policyTenancy.PeerName) {
-		// TODO(peering/v2): remove this bypass when we know what to do with
-		// non-local peer references.
-		return false
-	}
-
-	for _, dest := range config.Destinations {
-		if dest.Ref == nil {
-			continue
-		}
-		if dest.Ref.Tenancy != nil && !isLocalPeer(dest.Ref.Tenancy.PeerName) {
-			// TODO(peering/v2): remove this bypass when we know what to do with
-			// non-local peer references.
-			continue
-		}
-
-		orig := proto.Clone(dest.Ref).(*pbresource.Reference)
-		resource.DefaultReferenceTenancy(
-			dest.Ref,
-			policyTenancy,
-			resource.DefaultNamespacedTenancy(), // Services are all namespace scoped.
-		)
-
-		if !proto.Equal(orig, dest.Ref) {
-			changed = true
-		}
-	}
-
-	return changed
-}
-
-func isLocalPeer(p string) bool {
-	return p == "local" || p == ""
-}
-
-func ValidateFailoverPolicy(res *pbresource.Resource) error {
-	var failover pbcatalog.FailoverPolicy
-
-	if err := res.Data.UnmarshalTo(&failover); err != nil {
-		return resource.NewErrDataParse(&failover, err)
-	}
-
-	var merr error
-
-	if failover.Config == nil && len(failover.PortConfigs) == 0 {
-		merr = multierror.Append(merr, resource.ErrInvalidField{
-			Name:    "config",
-			Wrapped: fmt.Errorf("at least one of config or port_configs must be set"),
-		})
-	}
-
-	if failover.Config != nil {
-		wrapConfigErr := func(err error) error {
-			return resource.ErrInvalidField{
-				Name:    "config",
-				Wrapped: err,
-			}
-		}
-		if cfgErr := validateFailoverConfig(failover.Config, false, wrapConfigErr); cfgErr != nil {
-			merr = multierror.Append(merr, cfgErr)
-		}
-	}
-
-	for portName, pc := range failover.PortConfigs {
-		wrapConfigErr := func(err error) error {
-			return resource.ErrInvalidMapValue{
-				Map:     "port_configs",
-				Key:     portName,
-				Wrapped: err,
-			}
-		}
-		if portNameErr := validatePortName(portName); portNameErr != nil {
-			merr = multierror.Append(merr, resource.ErrInvalidMapKey{
-				Map:     "port_configs",
-				Key:     portName,
-				Wrapped: portNameErr,
-			})
-		}
-
-		if cfgErr := validateFailoverConfig(pc, true, wrapConfigErr); cfgErr != nil {
-			merr = multierror.Append(merr, cfgErr)
-		}
-
-		// TODO: should sameness group be a ref once that's a resource?
-	}
-
-	return merr
-}
-
-func validateFailoverConfig(config *pbcatalog.FailoverConfig, ported bool, wrapErr func(error) error) error {
-	var merr error
-
-	if config.SamenessGroup != "" {
-		// TODO(v2): handle other forms of failover
-		merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-			Name:    "sameness_group",
-			Wrapped: fmt.Errorf("not supported in this release"),
-		}))
-	}
-	// TODO(peering/v2): remove this bypass when we know what to do with
-
-	if (len(config.Destinations) > 0) == (config.SamenessGroup != "") {
-		merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-			Name:    "destinations",
-			Wrapped: fmt.Errorf("exactly one of destinations or sameness_group should be set"),
-		}))
-	}
-	for i, dest := range config.Destinations {
-		wrapDestErr := func(err error) error {
-			return wrapErr(resource.ErrInvalidListElement{
-				Name:    "destinations",
-				Index:   i,
-				Wrapped: err,
-			})
-		}
-		if destErr := validateFailoverPolicyDestination(dest, ported, wrapDestErr); destErr != nil {
-			merr = multierror.Append(merr, destErr)
-		}
-	}
-
-	switch config.Mode {
-	case pbcatalog.FailoverMode_FAILOVER_MODE_UNSPECIFIED:
-		// means pbcatalog.FailoverMode_FAILOVER_MODE_SEQUENTIAL
-	case pbcatalog.FailoverMode_FAILOVER_MODE_SEQUENTIAL:
-	case pbcatalog.FailoverMode_FAILOVER_MODE_ORDER_BY_LOCALITY:
-	default:
-		merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-			Name:    "mode",
-			Wrapped: fmt.Errorf("not a supported enum value: %v", config.Mode),
-		}))
-	}
-
-	// TODO: validate sameness group requirements
-
-	return merr
-}
-
-func validateFailoverPolicyDestination(dest *pbcatalog.FailoverDestination, ported bool, wrapErr func(error) error) error {
-	var merr error
-
-	wrapRefErr := func(err error) error {
-		return wrapErr(resource.ErrInvalidField{
-			Name:    "ref",
-			Wrapped: err,
-		})
-	}
-
-	if refErr := ValidateLocalServiceRefNoSection(dest.Ref, wrapRefErr); refErr != nil {
-		merr = multierror.Append(merr, refErr)
-	}
-
-	// NOTE: Destinations here cannot define ports. Port equality is
-	// assumed and will be reconciled.
-	if dest.Port != "" {
-		if ported {
-			if portNameErr := validatePortName(dest.Port); portNameErr != nil {
-				merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-					Name:    "port",
-					Wrapped: portNameErr,
-				}))
-			}
-		} else {
-			merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-				Name:    "port",
-				Wrapped: fmt.Errorf("ports cannot be specified explicitly for the general failover section since it relies upon port alignment"),
-			}))
-		}
-	}
-
-	hasPeer := false
-	if dest.Ref != nil {
-		hasPeer = dest.Ref.Tenancy.PeerName != "" && dest.Ref.Tenancy.PeerName != "local"
-	}
-
-	if hasPeer && dest.Datacenter != "" {
-		merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-			Name:    "datacenter",
-			Wrapped: fmt.Errorf("ref.tenancy.peer_name and datacenter are mutually exclusive fields"),
-		}))
-	}
-
-	return merr
-}
-
-// SimplifyFailoverPolicy fully populates the PortConfigs map and clears the
-// Configs map using the provided Service.
-func SimplifyFailoverPolicy(svc *pbcatalog.Service, failover *pbcatalog.FailoverPolicy) *pbcatalog.FailoverPolicy {
-	if failover == nil {
-		panic("failover is required")
-	}
-	if svc == nil {
-		panic("service is required")
-	}
-
-	// Copy so we can edit it.
-	dup := proto.Clone(failover)
-	failover = dup.(*pbcatalog.FailoverPolicy)
-
-	if failover.PortConfigs == nil {
-		failover.PortConfigs = make(map[string]*pbcatalog.FailoverConfig)
-	}
-
-	for _, port := range svc.Ports {
-		if port.Protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-			continue // skip
-		}
-
-		if pc, ok := failover.PortConfigs[port.TargetPort]; ok {
-			for i, dest := range pc.Destinations {
-				// Assume port alignment.
-				if dest.Port == "" {
-					dest.Port = port.TargetPort
-					pc.Destinations[i] = dest
-				}
-			}
-			continue
-		}
-
-		if failover.Config != nil {
-			// Duplicate because each port will get this uniquely.
-			pc2 := proto.Clone(failover.Config).(*pbcatalog.FailoverConfig)
-			for _, dest := range pc2.Destinations {
-				dest.Port = port.TargetPort
-			}
-			failover.PortConfigs[port.TargetPort] = pc2
-		}
-	}
-
-	if failover.Config != nil {
-		failover.Config = nil
-	}
-
-	return failover
-}
-
-func aclReadHookFailoverPolicy(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, id *pbresource.ID, _ *pbresource.Resource) error {
-	// FailoverPolicy is name-aligned with Service
-	serviceName := id.Name
-
-	// Check service:read permissions.
-	return authorizer.ToAllowAuthorizer().ServiceReadAllowed(serviceName, authzContext)
-}
-
-func aclWriteHookFailoverPolicy(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
-	// FailoverPolicy is name-aligned with Service
-	serviceName := res.Id.Name
-
-	// Check service:write permissions on the service this is controlling.
-	if err := authorizer.ToAllowAuthorizer().ServiceWriteAllowed(serviceName, authzContext); err != nil {
-		return err
-	}
-
-	dec, err := resource.Decode[*pbcatalog.FailoverPolicy](res)
-	if err != nil {
-		return err
-	}
-
-	// Ensure you have service:read on any destination that may be affected by
-	// traffic FROM this config change.
-	if dec.Data.Config != nil {
-		for _, dest := range dec.Data.Config.Destinations {
-			destAuthzContext := resource.AuthorizerContext(dest.Ref.GetTenancy())
-			destServiceName := dest.Ref.GetName()
-			if err := authorizer.ToAllowAuthorizer().ServiceReadAllowed(destServiceName, destAuthzContext); err != nil {
-				return err
-			}
-		}
-	}
-	for _, pc := range dec.Data.PortConfigs {
-		for _, dest := range pc.Destinations {
-			destAuthzContext := resource.AuthorizerContext(dest.Ref.GetTenancy())
-			destServiceName := dest.Ref.GetName()
-			if err := authorizer.ToAllowAuthorizer().ServiceReadAllowed(destServiceName, destAuthzContext); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-
-}
-
-func aclListHookFailoverPolicy(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext) error {
-	// No-op List permission as we want to default to filtering resources
-	// from the list using the Read enforcement.
-	return nil
-}
diff --git a/internal/catalog/internal/types/failover_policy_test.go b/internal/catalog/internal/types/failover_policy_test.go
deleted file mode 100644
index 8fca6064eae70..0000000000000
--- a/internal/catalog/internal/types/failover_policy_test.go
+++ /dev/null
@@ -1,811 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestMutateFailoverPolicy(t *testing.T) {
-	type testcase struct {
-		policyTenancy *pbresource.Tenancy
-		failover      *pbcatalog.FailoverPolicy
-		expect        *pbcatalog.FailoverPolicy
-		expectErr     string
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		res := resourcetest.Resource(pbcatalog.FailoverPolicyType, "api").
-			WithTenancy(tc.policyTenancy).
-			WithData(t, tc.failover).
-			Build()
-
-		err := MutateFailoverPolicy(res)
-
-		got := resourcetest.MustDecode[*pbcatalog.FailoverPolicy](t, res)
-
-		if tc.expectErr == "" {
-			require.NoError(t, err)
-			prototest.AssertDeepEqual(t, tc.expect, got.Data)
-		} else {
-			testutil.RequireErrorContains(t, err, tc.expectErr)
-		}
-	}
-
-	cases := map[string]testcase{
-		"empty-1": {
-			failover: &pbcatalog.FailoverPolicy{},
-			expect:   &pbcatalog.FailoverPolicy{},
-		},
-		"empty-config-1": {
-			failover: &pbcatalog.FailoverPolicy{
-				Config: &pbcatalog.FailoverConfig{},
-			},
-			expect: &pbcatalog.FailoverPolicy{},
-		},
-		"empty-config-2": {
-			failover: &pbcatalog.FailoverPolicy{
-				Config: &pbcatalog.FailoverConfig{
-					Destinations: make([]*pbcatalog.FailoverDestination, 0),
-				},
-			},
-			expect: &pbcatalog.FailoverPolicy{},
-		},
-		"empty-map-1": {
-			failover: &pbcatalog.FailoverPolicy{
-				PortConfigs: make(map[string]*pbcatalog.FailoverConfig),
-			},
-			expect: &pbcatalog.FailoverPolicy{},
-		},
-		"empty-map-config-1": {
-			failover: &pbcatalog.FailoverPolicy{
-				PortConfigs: map[string]*pbcatalog.FailoverConfig{
-					"http": {},
-				},
-			},
-			expect: &pbcatalog.FailoverPolicy{},
-		},
-		"empty-map-config-2": {
-			failover: &pbcatalog.FailoverPolicy{
-				PortConfigs: map[string]*pbcatalog.FailoverConfig{
-					"http": {
-						Destinations: make([]*pbcatalog.FailoverDestination, 0),
-					},
-				},
-			},
-			expect: &pbcatalog.FailoverPolicy{},
-		},
-		"normal": {
-			failover: &pbcatalog.FailoverPolicy{
-				Config: &pbcatalog.FailoverConfig{
-					Mode:    pbcatalog.FailoverMode_FAILOVER_MODE_SEQUENTIAL,
-					Regions: []string{"foo", "bar"},
-					Destinations: []*pbcatalog.FailoverDestination{
-						{Ref: newRef(pbcatalog.ServiceType, "a")},
-						{Ref: newRef(pbcatalog.ServiceType, "b")},
-					},
-				},
-				PortConfigs: map[string]*pbcatalog.FailoverConfig{
-					"http": {
-						Destinations: []*pbcatalog.FailoverDestination{
-							{Ref: newRef(pbcatalog.ServiceType, "foo")},
-							{Ref: newRef(pbcatalog.ServiceType, "bar")},
-						},
-					},
-					"admin": {
-						Destinations: []*pbcatalog.FailoverDestination{
-							{Ref: newRef(pbcatalog.ServiceType, "y")},
-							{Ref: newRef(pbcatalog.ServiceType, "z")},
-						},
-					},
-				},
-			},
-			expect: &pbcatalog.FailoverPolicy{
-				Config: &pbcatalog.FailoverConfig{
-					Mode:    pbcatalog.FailoverMode_FAILOVER_MODE_SEQUENTIAL,
-					Regions: []string{"foo", "bar"},
-					Destinations: []*pbcatalog.FailoverDestination{
-						{Ref: newRef(pbcatalog.ServiceType, "a")},
-						{Ref: newRef(pbcatalog.ServiceType, "b")},
-					},
-				},
-				PortConfigs: map[string]*pbcatalog.FailoverConfig{
-					"http": {
-						Destinations: []*pbcatalog.FailoverDestination{
-							{Ref: newRef(pbcatalog.ServiceType, "foo")},
-							{Ref: newRef(pbcatalog.ServiceType, "bar")},
-						},
-					},
-					"admin": {
-						Destinations: []*pbcatalog.FailoverDestination{
-							{Ref: newRef(pbcatalog.ServiceType, "y")},
-							{Ref: newRef(pbcatalog.ServiceType, "z")},
-						},
-					},
-				},
-			},
-		},
-		"dest ref tenancy defaulting": {
-			policyTenancy: newTestTenancy("foo.bar"),
-			failover: &pbcatalog.FailoverPolicy{
-				Config: &pbcatalog.FailoverConfig{
-					Mode:    pbcatalog.FailoverMode_FAILOVER_MODE_SEQUENTIAL,
-					Regions: []string{"foo", "bar"},
-					Destinations: []*pbcatalog.FailoverDestination{
-						{Ref: newRefWithTenancy(pbcatalog.ServiceType, "", "api")},
-						{Ref: newRefWithTenancy(pbcatalog.ServiceType, ".zim", "api")},
-						{Ref: newRefWithTenancy(pbcatalog.ServiceType, "gir.zim", "api")},
-					},
-				},
-				PortConfigs: map[string]*pbcatalog.FailoverConfig{
-					"http": {
-						Destinations: []*pbcatalog.FailoverDestination{
-							{Ref: newRefWithTenancy(pbcatalog.ServiceType, "", "api")},
-							{Ref: newRefWithTenancy(pbcatalog.ServiceType, ".luthor", "api")},
-							{Ref: newRefWithTenancy(pbcatalog.ServiceType, "lex.luthor", "api")},
-						},
-					},
-				},
-			},
-			expect: &pbcatalog.FailoverPolicy{
-				Config: &pbcatalog.FailoverConfig{
-					Mode:    pbcatalog.FailoverMode_FAILOVER_MODE_SEQUENTIAL,
-					Regions: []string{"foo", "bar"},
-					Destinations: []*pbcatalog.FailoverDestination{
-						{Ref: newRefWithTenancy(pbcatalog.ServiceType, "foo.bar", "api")},
-						{Ref: newRefWithTenancy(pbcatalog.ServiceType, "foo.zim", "api")},
-						{Ref: newRefWithTenancy(pbcatalog.ServiceType, "gir.zim", "api")},
-					},
-				},
-				PortConfigs: map[string]*pbcatalog.FailoverConfig{
-					"http": {
-						Destinations: []*pbcatalog.FailoverDestination{
-							{Ref: newRefWithTenancy(pbcatalog.ServiceType, "foo.bar", "api")},
-							{Ref: newRefWithTenancy(pbcatalog.ServiceType, "foo.luthor", "api")},
-							{Ref: newRefWithTenancy(pbcatalog.ServiceType, "lex.luthor", "api")},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func TestValidateFailoverPolicy(t *testing.T) {
-	type configTestcase struct {
-		config    *pbcatalog.FailoverConfig
-		expectErr string
-	}
-
-	type testcase struct {
-		failover  *pbcatalog.FailoverPolicy
-		expectErr string
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		res := resourcetest.Resource(pbcatalog.FailoverPolicyType, "api").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, tc.failover).
-			Build()
-
-		require.NoError(t, MutateFailoverPolicy(res))
-
-		// Verify that mutate didn't actually change the object.
-		got := resourcetest.MustDecode[*pbcatalog.FailoverPolicy](t, res)
-		prototest.AssertDeepEqual(t, tc.failover, got.Data)
-
-		err := ValidateFailoverPolicy(res)
-
-		// Verify that validate didn't actually change the object.
-		got = resourcetest.MustDecode[*pbcatalog.FailoverPolicy](t, res)
-		prototest.AssertDeepEqual(t, tc.failover, got.Data)
-
-		if tc.expectErr == "" {
-			require.NoError(t, err)
-		} else {
-			testutil.RequireErrorContains(t, err, tc.expectErr)
-		}
-	}
-
-	configCases := map[string]configTestcase{
-		"dest with sameness": {
-			config: &pbcatalog.FailoverConfig{
-				Destinations: []*pbcatalog.FailoverDestination{
-					{Ref: newRef(pbcatalog.ServiceType, "api-backup")},
-				},
-				SamenessGroup: "blah",
-			},
-			// TODO(v2): uncomment after this is supported
-			// expectErr: `invalid "destinations" field: exactly one of destinations or sameness_group should be set`,
-			expectErr: `invalid "sameness_group" field: not supported in this release`,
-		},
-		"dest without sameness": {
-			config: &pbcatalog.FailoverConfig{
-				Destinations: []*pbcatalog.FailoverDestination{
-					{Ref: newRef(pbcatalog.ServiceType, "api-backup")},
-				},
-			},
-		},
-		"sameness without dest": {
-			config: &pbcatalog.FailoverConfig{
-				SamenessGroup: "blah",
-			},
-			// TODO(v2): remove after this is supported
-			expectErr: `invalid "sameness_group" field: not supported in this release`,
-		},
-		"mode: invalid": {
-			config: &pbcatalog.FailoverConfig{
-				Mode: 99,
-				Destinations: []*pbcatalog.FailoverDestination{
-					{Ref: newRef(pbcatalog.ServiceType, "api-backup")},
-				},
-			},
-			expectErr: `invalid "mode" field: not a supported enum value: 99`,
-		},
-		"dest: no ref": {
-			config: &pbcatalog.FailoverConfig{
-				Destinations: []*pbcatalog.FailoverDestination{
-					{},
-				},
-			},
-			expectErr: `invalid element at index 0 of list "destinations": invalid "ref" field: missing required field`,
-		},
-		"dest: non-service ref": {
-			config: &pbcatalog.FailoverConfig{
-				Destinations: []*pbcatalog.FailoverDestination{
-					{Ref: newRef(pbcatalog.WorkloadType, "api-backup")},
-				},
-			},
-			expectErr: `invalid element at index 0 of list "destinations": invalid "ref" field: invalid "type" field: reference must have type catalog.v2beta1.Service`,
-		},
-		"dest: ref with section": {
-			config: &pbcatalog.FailoverConfig{
-				Destinations: []*pbcatalog.FailoverDestination{
-					{Ref: resourcetest.Resource(pbcatalog.ServiceType, "api").WithTenancy(resource.DefaultNamespacedTenancy()).Reference("blah")},
-				},
-			},
-			expectErr: `invalid element at index 0 of list "destinations": invalid "ref" field: invalid "section" field: section cannot be set here`,
-		},
-		// TODO(v2/peering): re-enable when peering can exist
-		// "dest: ref peer and datacenter": {
-		// 	config: &pbcatalog.FailoverConfig{
-		// 		Destinations: []*pbcatalog.FailoverDestination{
-		// 			{Ref: newRefWithPeer(pbcatalog.ServiceType, "api", "peer1"), Datacenter: "dc2"},
-		// 		},
-		// 	},
-		// 	expectErr: `invalid element at index 0 of list "destinations": invalid "datacenter" field: ref.tenancy.peer_name and datacenter are mutually exclusive fields`,
-		// },
-		// TODO(v2/peering): re-enable when peering can exist
-		// "dest: ref peer without datacenter": {
-		// 	config: &pbcatalog.FailoverConfig{
-		// 		Destinations: []*pbcatalog.FailoverDestination{
-		// 			{Ref: newRefWithPeer(pbcatalog.ServiceType, "api", "peer1")},
-		// 		},
-		// 	},
-		// },
-		"dest: ref datacenter without peer": {
-			config: &pbcatalog.FailoverConfig{
-				Destinations: []*pbcatalog.FailoverDestination{
-					{Ref: newRef(pbcatalog.ServiceType, "api"), Datacenter: "dc2"},
-				},
-			},
-		},
-	}
-
-	cases := map[string]testcase{
-		// emptiness
-		"empty": {
-			failover:  &pbcatalog.FailoverPolicy{},
-			expectErr: `invalid "config" field: at least one of config or port_configs must be set`,
-		},
-		"non-empty: one port config but no plain config": {
-			failover: &pbcatalog.FailoverPolicy{
-				PortConfigs: map[string]*pbcatalog.FailoverConfig{
-					"http": {
-						Destinations: []*pbcatalog.FailoverDestination{
-							{Ref: newRef(pbcatalog.ServiceType, "api-backup")},
-						},
-					},
-				},
-			},
-		},
-		"non-empty: some plain config but no port configs": {
-			failover: &pbcatalog.FailoverPolicy{
-				Config: &pbcatalog.FailoverConfig{
-					Destinations: []*pbcatalog.FailoverDestination{
-						{Ref: newRef(pbcatalog.ServiceType, "api-backup")},
-					},
-				},
-			},
-		},
-		// plain config
-		"plain config: bad dest: any port name": {
-			failover: &pbcatalog.FailoverPolicy{
-				Config: &pbcatalog.FailoverConfig{
-					Destinations: []*pbcatalog.FailoverDestination{
-						{Ref: newRef(pbcatalog.ServiceType, "api-backup"), Port: "web"},
-					},
-				},
-			},
-			expectErr: `invalid "config" field: invalid element at index 0 of list "destinations": invalid "port" field: ports cannot be specified explicitly for the general failover section since it relies upon port alignment`,
-		},
-		// ported config
-		"ported config: bad dest: invalid port name": {
-			failover: &pbcatalog.FailoverPolicy{
-				PortConfigs: map[string]*pbcatalog.FailoverConfig{
-					"http": {
-						Destinations: []*pbcatalog.FailoverDestination{
-							{Ref: newRef(pbcatalog.ServiceType, "api-backup"), Port: "$bad$"},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within port_configs: invalid element at index 0 of list "destinations": invalid "port" field: value must match regex: ^[a-z0-9]([a-z0-9\-_]*[a-z0-9])?$`,
-		},
-		"ported config: bad ported in map": {
-			failover: &pbcatalog.FailoverPolicy{
-				PortConfigs: map[string]*pbcatalog.FailoverConfig{
-					"$bad$": {
-						Destinations: []*pbcatalog.FailoverDestination{
-							{Ref: newRef(pbcatalog.ServiceType, "api-backup"), Port: "http"},
-						},
-					},
-				},
-			},
-			expectErr: `map port_configs contains an invalid key - "$bad$": value must match regex: ^[a-z0-9]([a-z0-9\-_]*[a-z0-9])?$`,
-		},
-	}
-
-	maybeWrap := func(wrapPrefix, base string) string {
-		if base != "" {
-			return wrapPrefix + base
-		}
-		return ""
-	}
-
-	for name, tc := range configCases {
-		cases["plain config: "+name] = testcase{
-			failover: &pbcatalog.FailoverPolicy{
-				Config: proto.Clone(tc.config).(*pbcatalog.FailoverConfig),
-			},
-			expectErr: maybeWrap(`invalid "config" field: `, tc.expectErr),
-		}
-
-		cases["ported config: "+name] = testcase{
-			failover: &pbcatalog.FailoverPolicy{
-				PortConfigs: map[string]*pbcatalog.FailoverConfig{
-					"http": proto.Clone(tc.config).(*pbcatalog.FailoverConfig),
-				},
-			},
-			expectErr: maybeWrap(`invalid value of key "http" within port_configs: `, tc.expectErr),
-		}
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func TestSimplifyFailoverPolicy(t *testing.T) {
-	registry := resource.NewRegistry()
-	Register(registry)
-
-	type testcase struct {
-		svc      *pbresource.Resource
-		failover *pbresource.Resource
-		expect   *pbresource.Resource
-	}
-	run := func(t *testing.T, tc testcase) {
-		// Ensure we only use valid inputs.
-		resourcetest.ValidateAndNormalize(t, registry, tc.svc)
-		resourcetest.ValidateAndNormalize(t, registry, tc.failover)
-		resourcetest.ValidateAndNormalize(t, registry, tc.expect)
-
-		svc := resourcetest.MustDecode[*pbcatalog.Service](t, tc.svc)
-		failover := resourcetest.MustDecode[*pbcatalog.FailoverPolicy](t, tc.failover)
-		expect := resourcetest.MustDecode[*pbcatalog.FailoverPolicy](t, tc.expect)
-
-		inputFailoverCopy := proto.Clone(failover.Data).(*pbcatalog.FailoverPolicy)
-
-		got := SimplifyFailoverPolicy(svc.Data, failover.Data)
-		prototest.AssertDeepEqual(t, expect.Data, got)
-
-		// verify input was not altered
-		prototest.AssertDeepEqual(t, inputFailoverCopy, failover.Data)
-	}
-
-	newPort := func(name string, virtualPort uint32, protocol pbcatalog.Protocol) *pbcatalog.ServicePort {
-		return &pbcatalog.ServicePort{
-			VirtualPort: virtualPort,
-			TargetPort:  name,
-			Protocol:    protocol,
-		}
-	}
-
-	cases := map[string]testcase{
-		"implicit with mesh port skipping": {
-			svc: resourcetest.Resource(pbcatalog.ServiceType, "api").
-				WithData(t, &pbcatalog.Service{
-					Ports: []*pbcatalog.ServicePort{
-						newPort("mesh", 21001, pbcatalog.Protocol_PROTOCOL_MESH),
-						newPort("http", 8080, pbcatalog.Protocol_PROTOCOL_HTTP),
-					},
-				}).
-				Build(),
-			failover: resourcetest.Resource(pbcatalog.FailoverPolicyType, "api").
-				WithData(t, &pbcatalog.FailoverPolicy{
-					Config: &pbcatalog.FailoverConfig{
-						Destinations: []*pbcatalog.FailoverDestination{
-							{
-								Ref: newRef(pbcatalog.ServiceType, "api-backup"),
-							},
-						},
-					},
-				}).
-				Build(),
-			expect: resourcetest.Resource(pbcatalog.FailoverPolicyType, "api").
-				WithData(t, &pbcatalog.FailoverPolicy{
-					PortConfigs: map[string]*pbcatalog.FailoverConfig{
-						"http": {
-							Destinations: []*pbcatalog.FailoverDestination{
-								{
-									Ref:  newRef(pbcatalog.ServiceType, "api-backup"),
-									Port: "http", // port defaulted
-								},
-							},
-						},
-					},
-				}).
-				Build(),
-		},
-		"explicit with port aligned defaulting": {
-			svc: resourcetest.Resource(pbcatalog.ServiceType, "api").
-				WithData(t, &pbcatalog.Service{
-					Ports: []*pbcatalog.ServicePort{
-						newPort("mesh", 9999, pbcatalog.Protocol_PROTOCOL_MESH),
-						newPort("http", 8080, pbcatalog.Protocol_PROTOCOL_HTTP),
-						newPort("rest", 8282, pbcatalog.Protocol_PROTOCOL_HTTP2),
-					},
-				}).
-				Build(),
-			failover: resourcetest.Resource(pbcatalog.FailoverPolicyType, "api").
-				WithData(t, &pbcatalog.FailoverPolicy{
-					PortConfigs: map[string]*pbcatalog.FailoverConfig{
-						"http": {
-							Destinations: []*pbcatalog.FailoverDestination{
-								{
-									Ref:  newRef(pbcatalog.ServiceType, "api-backup"),
-									Port: "www",
-								},
-								{
-									Ref: newRef(pbcatalog.ServiceType, "api-double-backup"),
-								},
-							},
-						},
-					},
-				}).
-				Build(),
-			expect: resourcetest.Resource(pbcatalog.FailoverPolicyType, "api").
-				WithData(t, &pbcatalog.FailoverPolicy{
-					PortConfigs: map[string]*pbcatalog.FailoverConfig{
-						"http": {
-							Destinations: []*pbcatalog.FailoverDestination{
-								{
-									Ref:  newRef(pbcatalog.ServiceType, "api-backup"),
-									Port: "www",
-								},
-								{
-									Ref:  newRef(pbcatalog.ServiceType, "api-double-backup"),
-									Port: "http", // port defaulted
-								},
-							},
-						},
-					},
-				}).
-				Build(),
-		},
-		"implicit port explosion": {
-			svc: resourcetest.Resource(pbcatalog.ServiceType, "api").
-				WithData(t, &pbcatalog.Service{
-					Ports: []*pbcatalog.ServicePort{
-						newPort("http", 8080, pbcatalog.Protocol_PROTOCOL_HTTP),
-						newPort("rest", 8282, pbcatalog.Protocol_PROTOCOL_HTTP2),
-					},
-				}).
-				Build(),
-			failover: resourcetest.Resource(pbcatalog.FailoverPolicyType, "api").
-				WithData(t, &pbcatalog.FailoverPolicy{
-					Config: &pbcatalog.FailoverConfig{
-						Destinations: []*pbcatalog.FailoverDestination{
-							{
-								Ref: newRef(pbcatalog.ServiceType, "api-backup"),
-							},
-							{
-								Ref: newRef(pbcatalog.ServiceType, "api-double-backup"),
-							},
-						},
-					},
-				}).
-				Build(),
-			expect: resourcetest.Resource(pbcatalog.FailoverPolicyType, "api").
-				WithData(t, &pbcatalog.FailoverPolicy{
-					PortConfigs: map[string]*pbcatalog.FailoverConfig{
-						"http": {
-							Destinations: []*pbcatalog.FailoverDestination{
-								{
-									Ref:  newRef(pbcatalog.ServiceType, "api-backup"),
-									Port: "http",
-								},
-								{
-									Ref:  newRef(pbcatalog.ServiceType, "api-double-backup"),
-									Port: "http",
-								},
-							},
-						},
-						"rest": {
-							Destinations: []*pbcatalog.FailoverDestination{
-								{
-									Ref:  newRef(pbcatalog.ServiceType, "api-backup"),
-									Port: "rest",
-								},
-								{
-									Ref:  newRef(pbcatalog.ServiceType, "api-double-backup"),
-									Port: "rest",
-								},
-							},
-						},
-					},
-				}).
-				Build(),
-		},
-		"mixed port explosion with skip": {
-			svc: resourcetest.Resource(pbcatalog.ServiceType, "api").
-				WithData(t, &pbcatalog.Service{
-					Ports: []*pbcatalog.ServicePort{
-						newPort("http", 8080, pbcatalog.Protocol_PROTOCOL_HTTP),
-						newPort("rest", 8282, pbcatalog.Protocol_PROTOCOL_HTTP2),
-					},
-				}).
-				Build(),
-			failover: resourcetest.Resource(pbcatalog.FailoverPolicyType, "api").
-				WithData(t, &pbcatalog.FailoverPolicy{
-					Config: &pbcatalog.FailoverConfig{
-						Destinations: []*pbcatalog.FailoverDestination{
-							{
-								Ref: newRef(pbcatalog.ServiceType, "api-backup"),
-							},
-							{
-								Ref: newRef(pbcatalog.ServiceType, "api-double-backup"),
-							},
-						},
-					},
-					PortConfigs: map[string]*pbcatalog.FailoverConfig{
-						"rest": {
-							// TODO(v2): uncomment when this works
-							// Mode:          pbcatalog.FailoverMode_FAILOVER_MODE_ORDER_BY_LOCALITY,
-							// Regions:       []string{"us", "eu"},
-							// SamenessGroup: "sameweb",
-							Destinations: []*pbcatalog.FailoverDestination{
-								{
-									Ref:  newRef(pbcatalog.ServiceType, "api-backup"),
-									Port: "rest",
-								},
-								{
-									Ref:  newRef(pbcatalog.ServiceType, "api-double-backup"),
-									Port: "rest",
-								},
-							},
-						},
-					},
-				}).
-				Build(),
-			expect: resourcetest.Resource(pbcatalog.FailoverPolicyType, "api").
-				WithData(t, &pbcatalog.FailoverPolicy{
-					PortConfigs: map[string]*pbcatalog.FailoverConfig{
-						"http": {
-							Destinations: []*pbcatalog.FailoverDestination{
-								{
-									Ref:  newRef(pbcatalog.ServiceType, "api-backup"),
-									Port: "http",
-								},
-								{
-									Ref:  newRef(pbcatalog.ServiceType, "api-double-backup"),
-									Port: "http",
-								},
-							},
-						},
-						"rest": {
-							// TODO(v2): uncomment when this works
-							// Mode:          pbcatalog.FailoverMode_FAILOVER_MODE_ORDER_BY_LOCALITY,
-							// Regions:       []string{"us", "eu"},
-							// SamenessGroup: "sameweb",
-							Destinations: []*pbcatalog.FailoverDestination{
-								{
-									Ref:  newRef(pbcatalog.ServiceType, "api-backup"),
-									Port: "rest",
-								},
-								{
-									Ref:  newRef(pbcatalog.ServiceType, "api-double-backup"),
-									Port: "rest",
-								},
-							},
-						},
-					},
-				}).
-				Build(),
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func TestFailoverPolicyACLs(t *testing.T) {
-	// Wire up a registry to generically invoke hooks
-	registry := resource.NewRegistry()
-	Register(registry)
-
-	type testcase struct {
-		rules   string
-		check   func(t *testing.T, authz acl.Authorizer, res *pbresource.Resource)
-		readOK  string
-		writeOK string
-		listOK  string
-	}
-
-	const (
-		DENY    = "deny"
-		ALLOW   = "allow"
-		DEFAULT = "default"
-	)
-
-	checkF := func(t *testing.T, expect string, got error) {
-		switch expect {
-		case ALLOW:
-			if acl.IsErrPermissionDenied(got) {
-				t.Fatal("should be allowed")
-			}
-		case DENY:
-			if !acl.IsErrPermissionDenied(got) {
-				t.Fatal("should be denied")
-			}
-		case DEFAULT:
-			require.Nil(t, got, "expected fallthrough decision")
-		default:
-			t.Fatalf("unexpected expectation: %q", expect)
-		}
-	}
-
-	reg, ok := registry.Resolve(pbcatalog.FailoverPolicyType)
-	require.True(t, ok)
-
-	run := func(t *testing.T, tc testcase) {
-		failoverData := &pbcatalog.FailoverPolicy{
-			Config: &pbcatalog.FailoverConfig{
-				Destinations: []*pbcatalog.FailoverDestination{
-					{Ref: newRef(pbcatalog.ServiceType, "api-backup")},
-				},
-			},
-		}
-		res := resourcetest.Resource(pbcatalog.FailoverPolicyType, "api").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, failoverData).
-			Build()
-		resourcetest.ValidateAndNormalize(t, registry, res)
-
-		config := acl.Config{
-			WildcardName: structs.WildcardSpecifier,
-		}
-		authz, err := acl.NewAuthorizerFromRules(tc.rules, &config, nil)
-		require.NoError(t, err)
-		authz = acl.NewChainedAuthorizer([]acl.Authorizer{authz, acl.DenyAll()})
-
-		t.Run("read", func(t *testing.T) {
-			err := reg.ACLs.Read(authz, &acl.AuthorizerContext{}, res.Id, nil)
-			checkF(t, tc.readOK, err)
-		})
-		t.Run("write", func(t *testing.T) {
-			err := reg.ACLs.Write(authz, &acl.AuthorizerContext{}, res)
-			checkF(t, tc.writeOK, err)
-		})
-		t.Run("list", func(t *testing.T) {
-			err := reg.ACLs.List(authz, &acl.AuthorizerContext{})
-			checkF(t, tc.listOK, err)
-		})
-	}
-
-	cases := map[string]testcase{
-		"no rules": {
-			rules:   ``,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"service api read": {
-			rules:   `service "api" { policy = "read" }`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"service api write": {
-			rules:   `service "api" { policy = "write" }`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"service api write and api-backup read": {
-			rules:   `service "api" { policy = "write" } service "api-backup" { policy = "read" }`,
-			readOK:  ALLOW,
-			writeOK: ALLOW,
-			listOK:  DEFAULT,
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func newRef(typ *pbresource.Type, name string) *pbresource.Reference {
-	return resourcetest.Resource(typ, name).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		Reference("")
-}
-
-func newRefWithTenancy(typ *pbresource.Type, tenancyStr, name string) *pbresource.Reference {
-	return resourcetest.Resource(typ, name).
-		WithTenancy(newTestTenancy(tenancyStr)).
-		Reference("")
-}
-
-func newRefWithPeer(typ *pbresource.Type, name string, peer string) *pbresource.Reference {
-	ref := newRef(typ, name)
-	ref.Tenancy.PeerName = peer
-	return ref
-}
-
-func newTestTenancy(s string) *pbresource.Tenancy {
-	parts := strings.Split(s, ".")
-	switch len(parts) {
-	case 0:
-		return resource.DefaultClusteredTenancy()
-	case 1:
-		v := resource.DefaultPartitionedTenancy()
-		v.Partition = parts[0]
-		return v
-	case 2:
-		v := resource.DefaultNamespacedTenancy()
-		v.Partition = parts[0]
-		v.Namespace = parts[1]
-		return v
-	default:
-		return &pbresource.Tenancy{Partition: "BAD", Namespace: "BAD", PeerName: "BAD"}
-	}
-}
diff --git a/internal/catalog/internal/types/health_checks.go b/internal/catalog/internal/types/health_checks.go
deleted file mode 100644
index 96bd582e1ef9d..0000000000000
--- a/internal/catalog/internal/types/health_checks.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterHealthChecks(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbcatalog.HealthChecksType,
-		Proto:    &pbcatalog.HealthChecks{},
-		Scope:    resource.ScopeNamespace,
-		Validate: ValidateHealthChecks,
-	})
-}
-
-func ValidateHealthChecks(res *pbresource.Resource) error {
-	var checks pbcatalog.HealthChecks
-
-	if err := res.Data.UnmarshalTo(&checks); err != nil {
-		return resource.NewErrDataParse(&checks, err)
-	}
-
-	var err error
-
-	// Validate the workload selector
-	if selErr := validateSelector(checks.Workloads, false); selErr != nil {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "workloads",
-			Wrapped: selErr,
-		})
-	}
-
-	// Validate each check
-	for idx, check := range checks.HealthChecks {
-		if checkErr := validateCheck(check); checkErr != nil {
-			err = multierror.Append(err, resource.ErrInvalidListElement{
-				Name:    "checks",
-				Index:   idx,
-				Wrapped: checkErr,
-			})
-		}
-	}
-
-	return err
-}
-
-func validateCheck(check *pbcatalog.HealthCheck) error {
-	var err error
-	// Validate the check name
-	if check.Name == "" {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "name",
-			Wrapped: resource.ErrMissing,
-		})
-	} else if !isValidDNSLabel(check.Name) {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "name",
-			Wrapped: errNotDNSLabel,
-		})
-	}
-
-	// Validate the definition
-	if check.Definition == nil {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "definition",
-			Wrapped: resource.ErrMissing,
-		})
-	}
-
-	// In theory it would be nice to validate the individual check definition.
-	// However whether a check is valid will be up for interpretation by
-	// the check executor. The executor may default some addressing,
-	// allow for templating etc. Therefore we cannot really know at admission
-	// time whether the check will be executable. Therefore it is expected
-	// that check executors will update the status of the resource to note
-	// whether it was valid for that executor.
-
-	return err
-}
diff --git a/internal/catalog/internal/types/health_checks_test.go b/internal/catalog/internal/types/health_checks_test.go
deleted file mode 100644
index 8af0ffde9face..0000000000000
--- a/internal/catalog/internal/types/health_checks_test.go
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/types/known/anypb"
-	"google.golang.org/protobuf/types/known/durationpb"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func createHealthChecksResource(t *testing.T, data protoreflect.ProtoMessage) *pbresource.Resource {
-	res := &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type: pbcatalog.HealthChecksType,
-			Tenancy: &pbresource.Tenancy{
-				Partition: "default",
-				Namespace: "default",
-				PeerName:  "local",
-			},
-			Name: "test-checks",
-		},
-	}
-
-	var err error
-	res.Data, err = anypb.New(data)
-	require.NoError(t, err)
-	return res
-}
-
-func TestValidateHealthChecks_Ok(t *testing.T) {
-	data := &pbcatalog.HealthChecks{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{""},
-		},
-		HealthChecks: []*pbcatalog.HealthCheck{
-			{
-				Name: "test-check",
-				Definition: &pbcatalog.HealthCheck_Tcp{
-					Tcp: &pbcatalog.TCPCheck{
-						Address: "198.18.0.1",
-					},
-				},
-				Interval: durationpb.New(30 * time.Second),
-				Timeout:  durationpb.New(15 * time.Second),
-			},
-		},
-	}
-
-	res := createHealthChecksResource(t, data)
-
-	err := ValidateHealthChecks(res)
-	require.NoError(t, err)
-}
-
-func TestValidateHealthChecks_ParseError(t *testing.T) {
-	// Any type other than the HealthChecks type would work
-	// to cause the error we are expecting
-	data := &pbcatalog.IP{Address: "198.18.0.1"}
-
-	res := createHealthChecksResource(t, data)
-
-	err := ValidateHealthChecks(res)
-	require.Error(t, err)
-	require.ErrorAs(t, err, &resource.ErrDataParse{})
-}
-
-func TestValidateHealthChecks_InvalidCheckName(t *testing.T) {
-	genData := func(name string) *pbcatalog.HealthChecks {
-		return &pbcatalog.HealthChecks{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{""},
-			},
-			HealthChecks: []*pbcatalog.HealthCheck{
-				{
-					Name: name,
-					Definition: &pbcatalog.HealthCheck_Tcp{
-						Tcp: &pbcatalog.TCPCheck{
-							Address: "198.18.0.1",
-						},
-					},
-					Interval: durationpb.New(30 * time.Second),
-					Timeout:  durationpb.New(15 * time.Second),
-				},
-			},
-		}
-	}
-
-	type testCase struct {
-		name        string
-		err         bool
-		expectedErr resource.ErrInvalidField
-	}
-
-	// These checks are not exhaustive of the classes of names which
-	// would be accepted or rejected. The tests for the isValidDNSLabel
-	// function have more thorough testing. Here we just ensure that
-	// we can get the errNotDNSLabel error to indicate that calling
-	// that function returned false and was emitted by ValidateHealthChecks
-	cases := map[string]testCase{
-		"basic": {
-			name: "foo-check",
-		},
-		"missing-name": {
-			err: true,
-			expectedErr: resource.ErrInvalidField{
-				Name:    "name",
-				Wrapped: resource.ErrEmpty,
-			},
-		},
-		"invalid-dns-label": {
-			name: "UPPERCASE",
-			err:  true,
-			expectedErr: resource.ErrInvalidField{
-				Name:    "name",
-				Wrapped: errNotDNSLabel,
-			},
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			data := genData(tcase.name)
-			err := ValidateHealthChecks(createHealthChecksResource(t, data))
-
-			if tcase.err {
-				require.Error(t, err)
-
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func TestValidateHealthChecks_MissingDefinition(t *testing.T) {
-	data := &pbcatalog.HealthChecks{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{""},
-		},
-		HealthChecks: []*pbcatalog.HealthCheck{
-			{
-				Name:     "test-check",
-				Interval: durationpb.New(30 * time.Second),
-				Timeout:  durationpb.New(15 * time.Second),
-			},
-		},
-	}
-
-	res := createHealthChecksResource(t, data)
-
-	err := ValidateHealthChecks(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "definition",
-		Wrapped: resource.ErrMissing,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateHealthChecks_EmptySelector(t *testing.T) {
-	data := &pbcatalog.HealthChecks{
-		HealthChecks: []*pbcatalog.HealthCheck{
-			{
-				Name: "test-check",
-				Definition: &pbcatalog.HealthCheck_Tcp{
-					Tcp: &pbcatalog.TCPCheck{
-						Address: "198.18.0.1",
-					},
-				},
-				Interval: durationpb.New(30 * time.Second),
-				Timeout:  durationpb.New(15 * time.Second),
-			},
-		},
-	}
-
-	res := createHealthChecksResource(t, data)
-
-	err := ValidateHealthChecks(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "workloads",
-		Wrapped: resource.ErrEmpty,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
diff --git a/internal/catalog/internal/types/health_status.go b/internal/catalog/internal/types/health_status.go
deleted file mode 100644
index 99b153895c1f7..0000000000000
--- a/internal/catalog/internal/types/health_status.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterHealthStatus(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbcatalog.HealthStatusType,
-		Proto:    &pbcatalog.HealthStatus{},
-		Scope:    resource.ScopeNamespace,
-		Validate: ValidateHealthStatus,
-	})
-}
-
-func ValidateHealthStatus(res *pbresource.Resource) error {
-	var hs pbcatalog.HealthStatus
-
-	if err := res.Data.UnmarshalTo(&hs); err != nil {
-		return resource.NewErrDataParse(&hs, err)
-	}
-
-	var err error
-
-	// Should we allow empty types? I think for now it will be safest to require
-	// the type field is set and we can relax this restriction in the future
-	// if we deem it desirable.
-	if hs.Type == "" {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "type",
-			Wrapped: resource.ErrMissing,
-		})
-	}
-
-	switch hs.Status {
-	case pbcatalog.Health_HEALTH_PASSING,
-		pbcatalog.Health_HEALTH_WARNING,
-		pbcatalog.Health_HEALTH_CRITICAL,
-		pbcatalog.Health_HEALTH_MAINTENANCE:
-	default:
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "status",
-			Wrapped: errInvalidHealth,
-		})
-	}
-
-	// Ensure that the HealthStatus' owner is a type that we want to allow. The
-	// owner is currently the resource that this HealthStatus applies to. If we
-	// change this to be a parent reference within the HealthStatus.Data then
-	// we could allow for other owners.
-	if res.Owner == nil {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "owner",
-			Wrapped: resource.ErrMissing,
-		})
-	} else if !resource.EqualType(res.Owner.Type, pbcatalog.WorkloadType) && !resource.EqualType(res.Owner.Type, pbcatalog.NodeType) {
-		err = multierror.Append(err, resource.ErrOwnerTypeInvalid{ResourceType: res.Id.Type, OwnerType: res.Owner.Type})
-	}
-
-	return err
-}
diff --git a/internal/catalog/internal/types/health_status_test.go b/internal/catalog/internal/types/health_status_test.go
deleted file mode 100644
index 654573d24a532..0000000000000
--- a/internal/catalog/internal/types/health_status_test.go
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-var (
-	defaultHealthStatusOwnerTenancy = &pbresource.Tenancy{
-		Partition: "default",
-		Namespace: "default",
-		PeerName:  "local",
-	}
-
-	defaultHealthStatusOwner = &pbresource.ID{
-		Type:    pbcatalog.WorkloadType,
-		Tenancy: defaultHealthStatusOwnerTenancy,
-		Name:    "foo",
-	}
-)
-
-func createHealthStatusResource(t *testing.T, data protoreflect.ProtoMessage, owner *pbresource.ID) *pbresource.Resource {
-	res := &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type: pbcatalog.HealthStatusType,
-			Tenancy: &pbresource.Tenancy{
-				Partition: "default",
-				Namespace: "default",
-				PeerName:  "local",
-			},
-			Name: "test-status",
-		},
-		Owner: owner,
-	}
-
-	var err error
-	res.Data, err = anypb.New(data)
-	require.NoError(t, err)
-	return res
-}
-
-func TestValidateHealthStatus_Ok(t *testing.T) {
-	data := &pbcatalog.HealthStatus{
-		Type:        "tcp",
-		Status:      pbcatalog.Health_HEALTH_PASSING,
-		Description: "Doesn't matter as this is user settable",
-		Output:      "Health check executors are free to use this field",
-	}
-
-	type testCase struct {
-		owner *pbresource.ID
-	}
-
-	cases := map[string]testCase{
-		"workload-owned": {
-			owner: &pbresource.ID{
-				Type:    pbcatalog.WorkloadType,
-				Tenancy: defaultHealthStatusOwnerTenancy,
-				Name:    "foo-workload",
-			},
-		},
-		"node-owned": {
-			owner: &pbresource.ID{
-				Type:    pbcatalog.NodeType,
-				Tenancy: defaultHealthStatusOwnerTenancy,
-				Name:    "bar-node",
-			},
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			res := createHealthStatusResource(t, data, tcase.owner)
-			err := ValidateHealthStatus(res)
-			require.NoError(t, err)
-		})
-	}
-}
-
-func TestValidateHealthStatus_ParseError(t *testing.T) {
-	// Any type other than the HealthStatus type would work
-	// to cause the error we are expecting
-	data := &pbcatalog.IP{Address: "198.18.0.1"}
-
-	res := createHealthStatusResource(t, data, defaultHealthStatusOwner)
-
-	err := ValidateHealthStatus(res)
-	require.Error(t, err)
-	require.ErrorAs(t, err, &resource.ErrDataParse{})
-}
-
-func TestValidateHealthStatus_InvalidHealth(t *testing.T) {
-	// while this is a valid enum value it is not allowed to be used
-	// as the Status field.
-	data := &pbcatalog.HealthStatus{
-		Type:   "tcp",
-		Status: pbcatalog.Health_HEALTH_ANY,
-	}
-
-	res := createHealthStatusResource(t, data, defaultHealthStatusOwner)
-
-	err := ValidateHealthStatus(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "status",
-		Wrapped: errInvalidHealth,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateHealthStatus_MissingType(t *testing.T) {
-	data := &pbcatalog.HealthStatus{
-		Status: pbcatalog.Health_HEALTH_PASSING,
-	}
-
-	res := createHealthStatusResource(t, data, defaultHealthStatusOwner)
-
-	err := ValidateHealthStatus(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "type",
-		Wrapped: resource.ErrMissing,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateHealthStatus_MissingOwner(t *testing.T) {
-	data := &pbcatalog.HealthStatus{
-		Type:   "tcp",
-		Status: pbcatalog.Health_HEALTH_PASSING,
-	}
-
-	res := createHealthStatusResource(t, data, nil)
-
-	err := ValidateHealthStatus(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "owner",
-		Wrapped: resource.ErrMissing,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateHealthStatus_InvalidOwner(t *testing.T) {
-	data := &pbcatalog.HealthStatus{
-		Type:   "tcp",
-		Status: pbcatalog.Health_HEALTH_PASSING,
-	}
-
-	type testCase struct {
-		owner *pbresource.ID
-	}
-
-	cases := map[string]testCase{
-		"group-mismatch": {
-			owner: &pbresource.ID{
-				Type: &pbresource.Type{
-					Group:        "fake",
-					GroupVersion: pbcatalog.Version,
-					Kind:         pbcatalog.WorkloadKind,
-				},
-				Tenancy: defaultHealthStatusOwnerTenancy,
-				Name:    "baz",
-			},
-		},
-		"group-version-mismatch": {
-			owner: &pbresource.ID{
-				Type: &pbresource.Type{
-					Group:        pbcatalog.GroupName,
-					GroupVersion: "v99",
-					Kind:         pbcatalog.WorkloadKind,
-				},
-				Tenancy: defaultHealthStatusOwnerTenancy,
-				Name:    "baz",
-			},
-		},
-		"kind-mismatch": {
-			owner: &pbresource.ID{
-				Type:    pbcatalog.ServiceType,
-				Tenancy: defaultHealthStatusOwnerTenancy,
-				Name:    "baz",
-			},
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			res := createHealthStatusResource(t, data, tcase.owner)
-			err := ValidateHealthStatus(res)
-			require.Error(t, err)
-			expected := resource.ErrOwnerTypeInvalid{
-				ResourceType: pbcatalog.HealthStatusType,
-				OwnerType:    tcase.owner.Type,
-			}
-			var actual resource.ErrOwnerTypeInvalid
-			require.ErrorAs(t, err, &actual)
-			require.Equal(t, expected, actual)
-		})
-	}
-}
diff --git a/internal/catalog/internal/types/node.go b/internal/catalog/internal/types/node.go
deleted file mode 100644
index 9c59228a49b63..0000000000000
--- a/internal/catalog/internal/types/node.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterNode(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:  pbcatalog.NodeType,
-		Proto: &pbcatalog.Node{},
-		// TODO: A node should be partition scoped. However its HealthStatus which is
-		// namespace scoped has Node as an owner. We do not support ownership between resources
-		// of differing scope at this time. HealthStatus will probably be split out into two different
-		// types, one for namespace scoped owners and the other for partition scoped owners.
-		// Until that time, Node will remain namespace scoped.
-		Scope:    resource.ScopeNamespace,
-		Validate: ValidateNode,
-	})
-}
-
-func ValidateNode(res *pbresource.Resource) error {
-	var node pbcatalog.Node
-
-	if err := res.Data.UnmarshalTo(&node); err != nil {
-		return resource.NewErrDataParse(&node, err)
-	}
-
-	var err error
-	// Validate that the node has at least 1 address
-	if len(node.Addresses) < 1 {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "addresses",
-			Wrapped: resource.ErrEmpty,
-		})
-	}
-
-	// Validate each node address
-	for idx, addr := range node.Addresses {
-		if addrErr := validateNodeAddress(addr); addrErr != nil {
-			err = multierror.Append(err, resource.ErrInvalidListElement{
-				Name:    "addresses",
-				Index:   idx,
-				Wrapped: addrErr,
-			})
-		}
-	}
-
-	return err
-}
-
-// Validates a single node address
-func validateNodeAddress(addr *pbcatalog.NodeAddress) error {
-	// Currently the only field needing validation is the Host field. If that
-	// changes then this func should get updated to use a multierror.Append
-	// to collect the errors and return the overall set.
-
-	// Check that the host is empty
-	if addr.Host == "" {
-		return resource.ErrInvalidField{
-			Name:    "host",
-			Wrapped: resource.ErrMissing,
-		}
-	}
-
-	// Check if the host represents an IP address or a DNS name. Unix socket paths
-	// are not allowed for Node addresses unlike workload addresses.
-	if !isValidIPAddress(addr.Host) && !isValidDNSName(addr.Host) {
-		return resource.ErrInvalidField{
-			Name:    "host",
-			Wrapped: errInvalidNodeHostFormat{Host: addr.Host},
-		}
-	}
-
-	return nil
-}
diff --git a/internal/catalog/internal/types/node_test.go b/internal/catalog/internal/types/node_test.go
deleted file mode 100644
index 130551fad2b60..0000000000000
--- a/internal/catalog/internal/types/node_test.go
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func createNodeResource(t *testing.T, data protoreflect.ProtoMessage) *pbresource.Resource {
-	res := &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type: pbcatalog.NodeType,
-			Tenancy: &pbresource.Tenancy{
-				Partition: "default",
-				Namespace: "default",
-				PeerName:  "local",
-			},
-			Name: "test-node",
-		},
-	}
-
-	var err error
-	res.Data, err = anypb.New(data)
-	require.NoError(t, err)
-	return res
-}
-
-func TestValidateNode_Ok(t *testing.T) {
-	data := &pbcatalog.Node{
-		Addresses: []*pbcatalog.NodeAddress{
-			{
-				Host: "198.18.0.1",
-			},
-			{
-				Host: "fe80::316a:ed5b:f62c:7321",
-			},
-			{
-				Host:     "foo.node.example.com",
-				External: true,
-			},
-		},
-	}
-
-	res := createNodeResource(t, data)
-
-	err := ValidateNode(res)
-	require.NoError(t, err)
-}
-
-func TestValidateNode_ParseError(t *testing.T) {
-	// Any type other than the Node type would work
-	// to cause the error we are expecting
-	data := &pbcatalog.IP{Address: "198.18.0.1"}
-
-	res := createNodeResource(t, data)
-
-	err := ValidateNode(res)
-	require.Error(t, err)
-	require.ErrorAs(t, err, &resource.ErrDataParse{})
-}
-
-func TestValidateNode_EmptyAddresses(t *testing.T) {
-	data := &pbcatalog.Node{}
-
-	res := createNodeResource(t, data)
-
-	err := ValidateNode(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "addresses",
-		Wrapped: resource.ErrEmpty,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateNode_InvalidAddress(t *testing.T) {
-	data := &pbcatalog.Node{
-		Addresses: []*pbcatalog.NodeAddress{
-			{
-				Host: "unix:///node.sock",
-			},
-		},
-	}
-
-	res := createNodeResource(t, data)
-
-	err := ValidateNode(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "host",
-		Wrapped: errInvalidNodeHostFormat{Host: "unix:///node.sock"},
-	}
-
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateNode_AddressMissingHost(t *testing.T) {
-	data := &pbcatalog.Node{
-		Addresses: []*pbcatalog.NodeAddress{
-			{},
-		},
-	}
-
-	res := createNodeResource(t, data)
-
-	err := ValidateNode(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "host",
-		Wrapped: resource.ErrMissing,
-	}
-
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
diff --git a/internal/catalog/internal/types/service.go b/internal/catalog/internal/types/service.go
deleted file mode 100644
index cec08122c0175..0000000000000
--- a/internal/catalog/internal/types/service.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"math"
-
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterService(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbcatalog.ServiceType,
-		Proto:    &pbcatalog.Service{},
-		Scope:    resource.ScopeNamespace,
-		Validate: ValidateService,
-		Mutate:   MutateService,
-	})
-}
-
-func MutateService(res *pbresource.Resource) error {
-	var service pbcatalog.Service
-
-	if err := res.Data.UnmarshalTo(&service); err != nil {
-		return err
-	}
-
-	changed := false
-
-	// Default service port protocols.
-	for _, port := range service.Ports {
-		if port.Protocol == pbcatalog.Protocol_PROTOCOL_UNSPECIFIED {
-			port.Protocol = pbcatalog.Protocol_PROTOCOL_TCP
-			changed = true
-		}
-	}
-
-	if !changed {
-		return nil
-	}
-
-	return res.Data.MarshalFrom(&service)
-}
-
-func ValidateService(res *pbresource.Resource) error {
-	var service pbcatalog.Service
-
-	if err := res.Data.UnmarshalTo(&service); err != nil {
-		return resource.NewErrDataParse(&service, err)
-	}
-
-	var err error
-
-	// Validate the workload selector. We are allowing selectors with no
-	// selection criteria as it will allow for users to manually manage
-	// ServiceEndpoints objects for this service such as when desiring to
-	// configure endpoint information for external services that are not
-	// registered as workloads
-	if selErr := validateSelector(service.Workloads, true); selErr != nil {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "workloads",
-			Wrapped: selErr,
-		})
-	}
-
-	usedVirtualPorts := make(map[uint32]int)
-
-	// Validate each port
-	for idx, port := range service.Ports {
-		if usedIdx, found := usedVirtualPorts[port.VirtualPort]; found {
-			err = multierror.Append(err, resource.ErrInvalidListElement{
-				Name:  "ports",
-				Index: idx,
-				Wrapped: resource.ErrInvalidField{
-					Name: "virtual_port",
-					Wrapped: errVirtualPortReused{
-						Index: usedIdx,
-						Value: port.VirtualPort,
-					},
-				},
-			})
-		} else if port.VirtualPort != 0 {
-			usedVirtualPorts[port.VirtualPort] = idx
-		}
-
-		// validate the target port
-		if nameErr := validatePortName(port.TargetPort); nameErr != nil {
-			err = multierror.Append(err, resource.ErrInvalidListElement{
-				Name:  "ports",
-				Index: idx,
-				Wrapped: resource.ErrInvalidField{
-					Name:    "target_port",
-					Wrapped: nameErr,
-				},
-			})
-		}
-
-		if protoErr := validateProtocol(port.Protocol); protoErr != nil {
-			err = multierror.Append(err, resource.ErrInvalidListElement{
-				Name:  "ports",
-				Index: idx,
-				Wrapped: resource.ErrInvalidField{
-					Name:    "protocol",
-					Wrapped: protoErr,
-				},
-			})
-		}
-
-		// validate the virtual port is within the allowed range - 0 is allowed
-		// to signify that no virtual port should be used and the port will not
-		// be available for transparent proxying within the mesh.
-		if port.VirtualPort > math.MaxUint16 {
-			err = multierror.Append(err, resource.ErrInvalidListElement{
-				Name:  "ports",
-				Index: idx,
-				Wrapped: resource.ErrInvalidField{
-					Name:    "virtual_port",
-					Wrapped: errInvalidVirtualPort,
-				},
-			})
-		}
-
-		// basic protobuf deserialization should enforce that only known variants of the protocol field are set.
-	}
-
-	// Validate that the Virtual IPs are all IP addresses
-	for idx, vip := range service.VirtualIps {
-		if vipErr := validateIPAddress(vip); vipErr != nil {
-			err = multierror.Append(err, resource.ErrInvalidListElement{
-				Name:    "virtual_ips",
-				Index:   idx,
-				Wrapped: vipErr,
-			})
-		}
-	}
-
-	return err
-}
diff --git a/internal/catalog/internal/types/service_endpoints.go b/internal/catalog/internal/types/service_endpoints.go
deleted file mode 100644
index 8008ada845b4f..0000000000000
--- a/internal/catalog/internal/types/service_endpoints.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"math"
-
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterServiceEndpoints(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbcatalog.ServiceEndpointsType,
-		Proto:    &pbcatalog.ServiceEndpoints{},
-		Scope:    resource.ScopeNamespace,
-		Validate: ValidateServiceEndpoints,
-		Mutate:   MutateServiceEndpoints,
-	})
-}
-
-func MutateServiceEndpoints(res *pbresource.Resource) error {
-	if res.Owner == nil {
-		res.Owner = &pbresource.ID{
-			Type:    pbcatalog.ServiceType,
-			Tenancy: res.Id.Tenancy,
-			Name:    res.Id.Name,
-		}
-	}
-
-	return nil
-}
-
-func ValidateServiceEndpoints(res *pbresource.Resource) error {
-	var svcEndpoints pbcatalog.ServiceEndpoints
-
-	if err := res.Data.UnmarshalTo(&svcEndpoints); err != nil {
-		return resource.NewErrDataParse(&svcEndpoints, err)
-	}
-
-	var err error
-	if !resource.EqualType(res.Owner.Type, pbcatalog.ServiceType) {
-		err = multierror.Append(err, resource.ErrOwnerTypeInvalid{
-			ResourceType: pbcatalog.ServiceEndpointsType,
-			OwnerType:    res.Owner.Type,
-		})
-	}
-
-	if !resource.EqualTenancy(res.Owner.Tenancy, res.Id.Tenancy) {
-		err = multierror.Append(err, resource.ErrOwnerTenantInvalid{
-			ResourceType:    pbcatalog.ServiceEndpointsType,
-			ResourceTenancy: res.Id.Tenancy,
-			OwnerTenancy:    res.Owner.Tenancy,
-		})
-	}
-
-	if res.Owner.Name != res.Id.Name {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name: "name",
-			Wrapped: errInvalidEndpointsOwnerName{
-				Name:      res.Id.Name,
-				OwnerName: res.Owner.Name,
-			},
-		})
-	}
-
-	for idx, endpoint := range svcEndpoints.Endpoints {
-		if endpointErr := validateEndpoint(endpoint, res); endpointErr != nil {
-			err = multierror.Append(err, resource.ErrInvalidListElement{
-				Name:    "endpoints",
-				Index:   idx,
-				Wrapped: endpointErr,
-			})
-		}
-	}
-
-	return err
-}
-
-func validateEndpoint(endpoint *pbcatalog.Endpoint, res *pbresource.Resource) error {
-	var err error
-
-	// Validate the target ref if not nil. When it is nil we are assuming that
-	// the endpoints are being managed for an external service that has no
-	// corresponding workloads that Consul has knowledge of.
-	if endpoint.TargetRef != nil {
-		// Validate the target reference
-		if refErr := validateReference(pbcatalog.WorkloadType, res.Id.GetTenancy(), endpoint.TargetRef); refErr != nil {
-			err = multierror.Append(err, resource.ErrInvalidField{
-				Name:    "target_ref",
-				Wrapped: refErr,
-			})
-		}
-	}
-
-	// Validate the endpoint Addresses
-	for addrIdx, addr := range endpoint.Addresses {
-		if addrErr := validateWorkloadAddress(addr, endpoint.Ports); addrErr != nil {
-			err = multierror.Append(err, resource.ErrInvalidListElement{
-				Name:    "addresses",
-				Index:   addrIdx,
-				Wrapped: addrErr,
-			})
-		}
-	}
-
-	// Ensure that the endpoint has at least 1 port.
-	if len(endpoint.Ports) < 1 {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "ports",
-			Wrapped: resource.ErrEmpty,
-		})
-	}
-
-	if healthErr := validateHealth(endpoint.HealthStatus); healthErr != nil {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "health_status",
-			Wrapped: healthErr,
-		})
-	}
-
-	// Validate the endpoints ports
-	for portName, port := range endpoint.Ports {
-		// Port names must be DNS labels
-		if portNameErr := validatePortName(portName); portNameErr != nil {
-			err = multierror.Append(err, resource.ErrInvalidMapKey{
-				Map:     "ports",
-				Key:     portName,
-				Wrapped: portNameErr,
-			})
-		}
-
-		if protoErr := validateProtocol(port.Protocol); protoErr != nil {
-			err = multierror.Append(err, resource.ErrInvalidMapValue{
-				Map: "ports",
-				Key: portName,
-				Wrapped: resource.ErrInvalidField{
-					Name:    "protocol",
-					Wrapped: protoErr,
-				},
-			})
-		}
-
-		// As the physical port is the real port the endpoint will be bound to
-		// it must be in the standard 1-65535 range.
-		if port.Port < 1 || port.Port > math.MaxUint16 {
-			err = multierror.Append(err, resource.ErrInvalidMapValue{
-				Map: "ports",
-				Key: portName,
-				Wrapped: resource.ErrInvalidField{
-					Name:    "physical_port",
-					Wrapped: errInvalidPhysicalPort,
-				},
-			})
-		}
-	}
-
-	return err
-}
diff --git a/internal/catalog/internal/types/service_endpoints_test.go b/internal/catalog/internal/types/service_endpoints_test.go
deleted file mode 100644
index d210ba1aaafd2..0000000000000
--- a/internal/catalog/internal/types/service_endpoints_test.go
+++ /dev/null
@@ -1,260 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-var (
-	defaultEndpointTenancy = &pbresource.Tenancy{
-		Partition: "default",
-		Namespace: "default",
-		PeerName:  "local",
-	}
-
-	badEndpointTenancy = &pbresource.Tenancy{
-		Partition: "default",
-		Namespace: "bad",
-		PeerName:  "local",
-	}
-)
-
-func TestValidateServiceEndpoints_Ok(t *testing.T) {
-	data := &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				TargetRef: &pbresource.ID{
-					Type:    pbcatalog.WorkloadType,
-					Tenancy: defaultEndpointTenancy,
-					Name:    "foo",
-				},
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host: "198.18.0.1",
-					},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"foo": {
-						Port:     8443,
-						Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-					},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-			},
-		},
-	}
-
-	res := rtest.Resource(pbcatalog.ServiceEndpointsType, "test-service").
-		WithTenancy(defaultEndpointTenancy).
-		WithData(t, data).
-		Build()
-
-	// fill in owner automatically
-	require.NoError(t, MutateServiceEndpoints(res))
-
-	// Now validate that everything is good.
-	err := ValidateServiceEndpoints(res)
-	require.NoError(t, err)
-}
-
-func TestValidateServiceEndpoints_ParseError(t *testing.T) {
-	// Any type other than the ServiceEndpoints type would work
-	// to cause the error we are expecting
-	data := &pbcatalog.IP{Address: "198.18.0.1"}
-
-	res := rtest.Resource(pbcatalog.ServiceEndpointsType, "test-service").WithData(t, data).Build()
-
-	err := ValidateServiceEndpoints(res)
-	require.Error(t, err)
-	require.ErrorAs(t, err, &resource.ErrDataParse{})
-}
-
-func TestValidateServiceEndpoints_EndpointInvalid(t *testing.T) {
-	genData := func() *pbcatalog.Endpoint {
-		return &pbcatalog.Endpoint{
-			TargetRef: &pbresource.ID{
-				Type:    pbcatalog.WorkloadType,
-				Tenancy: defaultEndpointTenancy,
-				Name:    "foo",
-			},
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{
-					Host:  "198.18.0.1",
-					Ports: []string{"foo"},
-				},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"foo": {
-					Port: 42,
-				},
-			},
-			HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-		}
-	}
-
-	type testCase struct {
-		owner       *pbresource.ID
-		modify      func(*pbcatalog.Endpoint)
-		validateErr func(t *testing.T, err error)
-	}
-
-	cases := map[string]testCase{
-		"invalid-target": {
-			modify: func(endpoint *pbcatalog.Endpoint) {
-				endpoint.TargetRef.Type = pbcatalog.NodeType
-			},
-			validateErr: func(t *testing.T, err error) {
-				require.ErrorIs(t, err, resource.ErrInvalidReferenceType{AllowedType: pbcatalog.WorkloadType})
-			},
-		},
-		"invalid-address": {
-			modify: func(endpoint *pbcatalog.Endpoint) {
-				endpoint.Addresses[0].Ports = []string{"bar"}
-			},
-			validateErr: func(t *testing.T, err error) {
-				require.ErrorIs(t, err, errInvalidPortReference{Name: "bar"})
-			},
-		},
-		"no-ports": {
-			modify: func(endpoint *pbcatalog.Endpoint) {
-				endpoint.Ports = nil
-			},
-			validateErr: func(t *testing.T, err error) {
-				require.ErrorIs(t, err, resource.ErrEmpty)
-			},
-		},
-		"invalid-health-status": {
-			modify: func(endpoint *pbcatalog.Endpoint) {
-				endpoint.Ports["foo"] = &pbcatalog.WorkloadPort{
-					Port: 42,
-				}
-				endpoint.HealthStatus = 99
-			},
-			validateErr: func(t *testing.T, err error) {
-				rtest.RequireError(t, err, resource.ErrInvalidField{
-					Name:    "health_status",
-					Wrapped: resource.NewConstError("not a supported enum value: 99"),
-				})
-			},
-		},
-		"invalid-port-name": {
-			modify: func(endpoint *pbcatalog.Endpoint) {
-				endpoint.Ports[""] = &pbcatalog.WorkloadPort{
-					Port: 42,
-				}
-			},
-			validateErr: func(t *testing.T, err error) {
-				rtest.RequireError(t, err, resource.ErrInvalidMapKey{
-					Map:     "ports",
-					Key:     "",
-					Wrapped: resource.ErrEmpty,
-				})
-			},
-		},
-		"invalid-port-protocol": {
-			modify: func(endpoint *pbcatalog.Endpoint) {
-				endpoint.Ports["foo"] = &pbcatalog.WorkloadPort{
-					Port:     42,
-					Protocol: 99,
-				}
-			},
-			validateErr: func(t *testing.T, err error) {
-				rtest.RequireError(t, err, resource.ErrInvalidMapValue{
-					Map: "ports",
-					Key: "foo",
-					Wrapped: resource.ErrInvalidField{
-						Name:    "protocol",
-						Wrapped: resource.NewConstError("not a supported enum value: 99"),
-					},
-				})
-			},
-		},
-		"port-0": {
-			modify: func(endpoint *pbcatalog.Endpoint) {
-				endpoint.Ports["foo"].Port = 0
-			},
-			validateErr: func(t *testing.T, err error) {
-				require.ErrorIs(t, err, errInvalidPhysicalPort)
-			},
-		},
-		"port-out-of-range": {
-			modify: func(endpoint *pbcatalog.Endpoint) {
-				endpoint.Ports["foo"].Port = 65536
-			},
-			validateErr: func(t *testing.T, err error) {
-				require.ErrorIs(t, err, errInvalidPhysicalPort)
-			},
-		},
-		"invalid-owner": {
-			owner: &pbresource.ID{
-				Type:    pbcatalog.DNSPolicyType,
-				Tenancy: badEndpointTenancy,
-				Name:    "wrong",
-			},
-			validateErr: func(t *testing.T, err error) {
-				rtest.RequireError(t, err, resource.ErrOwnerTypeInvalid{
-					ResourceType: pbcatalog.ServiceEndpointsType,
-					OwnerType:    pbcatalog.DNSPolicyType})
-				rtest.RequireError(t, err, resource.ErrOwnerTenantInvalid{
-					ResourceType:    pbcatalog.ServiceEndpointsType,
-					ResourceTenancy: defaultEndpointTenancy,
-					OwnerTenancy:    badEndpointTenancy,
-				})
-				rtest.RequireError(t, err, resource.ErrInvalidField{
-					Name: "name",
-					Wrapped: errInvalidEndpointsOwnerName{
-						Name:      "test-service",
-						OwnerName: "wrong"},
-				})
-			},
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			endpoint := genData()
-			if tcase.modify != nil {
-				tcase.modify(endpoint)
-			}
-
-			data := &pbcatalog.ServiceEndpoints{
-				Endpoints: []*pbcatalog.Endpoint{
-					endpoint,
-				},
-			}
-			res := rtest.Resource(pbcatalog.ServiceEndpointsType, "test-service").
-				WithTenancy(defaultEndpointTenancy).
-				WithOwner(tcase.owner).
-				WithData(t, data).
-				Build()
-
-			// Run the mututation to setup defaults
-			require.NoError(t, MutateServiceEndpoints(res))
-
-			err := ValidateServiceEndpoints(res)
-			require.Error(t, err)
-			tcase.validateErr(t, err)
-		})
-	}
-}
-
-func TestMutateServiceEndpoints_PopulateOwner(t *testing.T) {
-	res := rtest.Resource(pbcatalog.ServiceEndpointsType, "test-service").
-		WithTenancy(defaultEndpointTenancy).
-		Build()
-
-	require.NoError(t, MutateServiceEndpoints(res))
-	require.NotNil(t, res.Owner)
-	require.True(t, resource.EqualType(res.Owner.Type, pbcatalog.ServiceType))
-	require.True(t, resource.EqualTenancy(res.Owner.Tenancy, defaultEndpointTenancy))
-	require.Equal(t, res.Owner.Name, res.Id.Name)
-}
diff --git a/internal/catalog/internal/types/service_test.go b/internal/catalog/internal/types/service_test.go
deleted file mode 100644
index b47c022184059..0000000000000
--- a/internal/catalog/internal/types/service_test.go
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func createServiceResource(t *testing.T, data protoreflect.ProtoMessage) *pbresource.Resource {
-	res := &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type: pbcatalog.ServiceType,
-			Tenancy: &pbresource.Tenancy{
-				Partition: "default",
-				Namespace: "default",
-				PeerName:  "local",
-			},
-			Name: "test-policy",
-		},
-	}
-
-	var err error
-	res.Data, err = anypb.New(data)
-	require.NoError(t, err)
-	return res
-}
-
-func TestMutateServicePorts(t *testing.T) {
-	data := &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Names: []string{"foo", "bar"},
-		},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort: "tcp",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_UNSPECIFIED,
-			},
-			{
-				TargetPort: "http",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-		},
-		VirtualIps: []string{"198.18.0.1"},
-	}
-
-	res := createServiceResource(t, data)
-
-	err := MutateService(res)
-	require.NoError(t, err)
-
-	got := resourcetest.MustDecode[*pbcatalog.Service](t, res)
-
-	require.Len(t, got.Data.Ports, 2)
-	require.Equal(t, pbcatalog.Protocol_PROTOCOL_TCP, got.Data.Ports[0].Protocol)
-
-	// Check that specified protocol is not mutated.
-	require.Equal(t, data.Ports[1].Protocol, got.Data.Ports[1].Protocol)
-}
-
-func TestValidateService_Ok(t *testing.T) {
-	data := &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Names:    []string{"foo", "bar"},
-			Prefixes: []string{"abc-"},
-		},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort:  "http-internal",
-				VirtualPort: 42,
-				Protocol:    pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-			{
-				TargetPort: "other",
-				// leaving VirtualPort unset to verify that seeing
-				// a zero virtual port multiple times is fine.
-				Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2,
-			},
-			{
-				TargetPort: "other2",
-				// leaving VirtualPort unset to verify that seeing
-				// a zero virtual port multiple times is fine.
-				Protocol: pbcatalog.Protocol_PROTOCOL_GRPC,
-			},
-		},
-		VirtualIps: []string{"198.18.0.1"},
-	}
-
-	res := createServiceResource(t, data)
-
-	err := ValidateService(res)
-	require.NoError(t, err)
-}
-
-func TestValidateService_ParseError(t *testing.T) {
-	// Any type other than the Service type would work
-	// to cause the error we are expecting
-	data := &pbcatalog.IP{Address: "198.18.0.1"}
-
-	res := createServiceResource(t, data)
-
-	err := ValidateService(res)
-	require.Error(t, err)
-	require.ErrorAs(t, err, &resource.ErrDataParse{})
-}
-
-func TestValidateService_EmptySelector(t *testing.T) {
-	data := &pbcatalog.Service{
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort: "http-internal",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-		},
-	}
-
-	res := createServiceResource(t, data)
-
-	err := ValidateService(res)
-	require.NoError(t, err)
-}
-
-func TestValidateService_InvalidSelector(t *testing.T) {
-	data := &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Names: []string{""},
-		},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort: "http-internal",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-		},
-	}
-
-	res := createServiceResource(t, data)
-
-	err := ValidateService(res)
-	expected := resource.ErrInvalidListElement{
-		Name:    "names",
-		Index:   0,
-		Wrapped: resource.ErrEmpty,
-	}
-
-	var actual resource.ErrInvalidListElement
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateService_InvalidTargetPort(t *testing.T) {
-	data := &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{""},
-		},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort: "",
-			},
-		},
-	}
-
-	res := createServiceResource(t, data)
-
-	err := ValidateService(res)
-	require.Error(t, err)
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, "target_port", actual.Name)
-	require.Equal(t, resource.ErrEmpty, actual.Wrapped)
-}
-
-func TestValidateService_VirtualPortReused(t *testing.T) {
-	data := &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{""},
-		},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				VirtualPort: 42,
-				TargetPort:  "foo",
-			},
-			{
-				VirtualPort: 42,
-				TargetPort:  "bar",
-			},
-		},
-	}
-
-	res := createServiceResource(t, data)
-
-	err := ValidateService(res)
-	require.Error(t, err)
-	var actual errVirtualPortReused
-	require.ErrorAs(t, err, &actual)
-	require.EqualValues(t, 0, actual.Index)
-	require.EqualValues(t, 42, actual.Value)
-}
-
-func TestValidateService_InvalidPortProtocol(t *testing.T) {
-	data := &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{""},
-		},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort: "foo",
-				Protocol:   99,
-			},
-		},
-	}
-
-	res := createServiceResource(t, data)
-
-	err := ValidateService(res)
-
-	expected := resource.ErrInvalidListElement{
-		Name:  "ports",
-		Index: 0,
-		Wrapped: resource.ErrInvalidField{
-			Name:    "protocol",
-			Wrapped: resource.NewConstError("not a supported enum value: 99"),
-		},
-	}
-
-	var actual resource.ErrInvalidListElement
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateService_VirtualPortInvalid(t *testing.T) {
-	data := &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{""},
-		},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				VirtualPort: 100000,
-				TargetPort:  "foo",
-			},
-		},
-	}
-
-	res := createServiceResource(t, data)
-
-	err := ValidateService(res)
-	require.Error(t, err)
-	require.ErrorIs(t, err, errInvalidVirtualPort)
-}
-
-func TestValidateService_InvalidVIP(t *testing.T) {
-	data := &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{""},
-		},
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort: "foo",
-			},
-		},
-		VirtualIps: []string{"foo"},
-	}
-
-	res := createServiceResource(t, data)
-
-	err := ValidateService(res)
-	require.Error(t, err)
-	require.ErrorIs(t, err, errNotIPAddress)
-}
diff --git a/internal/catalog/internal/types/testdata/errDNSPassingWeightOutOfRange.golden b/internal/catalog/internal/types/testdata/errDNSPassingWeightOutOfRange.golden
deleted file mode 100644
index c364e6a17571f..0000000000000
--- a/internal/catalog/internal/types/testdata/errDNSPassingWeightOutOfRange.golden
+++ /dev/null
@@ -1 +0,0 @@
-DNS passing weight is outside of the range 1 to 65535
\ No newline at end of file
diff --git a/internal/catalog/internal/types/testdata/errDNSWarningWeightOutOfRange.golden b/internal/catalog/internal/types/testdata/errDNSWarningWeightOutOfRange.golden
deleted file mode 100644
index 0457e418b45c4..0000000000000
--- a/internal/catalog/internal/types/testdata/errDNSWarningWeightOutOfRange.golden
+++ /dev/null
@@ -1 +0,0 @@
-DNS warning weight is outside the range 0 to 65535
\ No newline at end of file
diff --git a/internal/catalog/internal/types/testdata/errInvalidEndpointsOwnerName.golden b/internal/catalog/internal/types/testdata/errInvalidEndpointsOwnerName.golden
deleted file mode 100644
index 38fc896f57e3d..0000000000000
--- a/internal/catalog/internal/types/testdata/errInvalidEndpointsOwnerName.golden
+++ /dev/null
@@ -1 +0,0 @@
-invalid owner name "bar". ServiceEndpoints objects must be owned by a Service with the same name: "foo"
\ No newline at end of file
diff --git a/internal/catalog/internal/types/testdata/errInvalidNodeHostFormat.golden b/internal/catalog/internal/types/testdata/errInvalidNodeHostFormat.golden
deleted file mode 100644
index 6eb2e24ebdf47..0000000000000
--- a/internal/catalog/internal/types/testdata/errInvalidNodeHostFormat.golden
+++ /dev/null
@@ -1 +0,0 @@
-"unix:///node.sock" is not an IP address or a DNS name.
\ No newline at end of file
diff --git a/internal/catalog/internal/types/testdata/errInvalidPhysicalPort.golden b/internal/catalog/internal/types/testdata/errInvalidPhysicalPort.golden
deleted file mode 100644
index eb971cb8a399f..0000000000000
--- a/internal/catalog/internal/types/testdata/errInvalidPhysicalPort.golden
+++ /dev/null
@@ -1 +0,0 @@
-port number is outside the range 1 to 65535
\ No newline at end of file
diff --git a/internal/catalog/internal/types/testdata/errInvalidPortReference.golden b/internal/catalog/internal/types/testdata/errInvalidPortReference.golden
deleted file mode 100644
index 3a165011c512d..0000000000000
--- a/internal/catalog/internal/types/testdata/errInvalidPortReference.golden
+++ /dev/null
@@ -1 +0,0 @@
-port with name "http" has not been defined
\ No newline at end of file
diff --git a/internal/catalog/internal/types/testdata/errInvalidVirtualPort.golden b/internal/catalog/internal/types/testdata/errInvalidVirtualPort.golden
deleted file mode 100644
index 2cabd9cb28a08..0000000000000
--- a/internal/catalog/internal/types/testdata/errInvalidVirtualPort.golden
+++ /dev/null
@@ -1 +0,0 @@
-port number is outside the range 0 to 65535
\ No newline at end of file
diff --git a/internal/catalog/internal/types/testdata/errInvalidWorkloadHostFormat.golden b/internal/catalog/internal/types/testdata/errInvalidWorkloadHostFormat.golden
deleted file mode 100644
index eb57dc2ef03c7..0000000000000
--- a/internal/catalog/internal/types/testdata/errInvalidWorkloadHostFormat.golden
+++ /dev/null
@@ -1 +0,0 @@
-"-foo-bar-" is not an IP address, Unix socket path or a DNS name.
\ No newline at end of file
diff --git a/internal/catalog/internal/types/testdata/errLocalityZoneNoRegion.golden b/internal/catalog/internal/types/testdata/errLocalityZoneNoRegion.golden
deleted file mode 100644
index 9a6ec59d0861c..0000000000000
--- a/internal/catalog/internal/types/testdata/errLocalityZoneNoRegion.golden
+++ /dev/null
@@ -1 +0,0 @@
-locality region cannot be empty if the zone is set
\ No newline at end of file
diff --git a/internal/catalog/internal/types/testdata/errNotDNSLabel.golden b/internal/catalog/internal/types/testdata/errNotDNSLabel.golden
deleted file mode 100644
index a5866fbbf0f26..0000000000000
--- a/internal/catalog/internal/types/testdata/errNotDNSLabel.golden
+++ /dev/null
@@ -1 +0,0 @@
-value must match regex: ^[a-z0-9]([a-z0-9\-_]*[a-z0-9])?$
\ No newline at end of file
diff --git a/internal/catalog/internal/types/testdata/errNotIPAddress.golden b/internal/catalog/internal/types/testdata/errNotIPAddress.golden
deleted file mode 100644
index db33684367dfc..0000000000000
--- a/internal/catalog/internal/types/testdata/errNotIPAddress.golden
+++ /dev/null
@@ -1 +0,0 @@
-value is not a valid IP address
\ No newline at end of file
diff --git a/internal/catalog/internal/types/testdata/errTooMuchMesh.golden b/internal/catalog/internal/types/testdata/errTooMuchMesh.golden
deleted file mode 100644
index 48ce0969d82dc..0000000000000
--- a/internal/catalog/internal/types/testdata/errTooMuchMesh.golden
+++ /dev/null
@@ -1 +0,0 @@
-protocol "mesh" was specified in more than 1 port: [http grpc]
\ No newline at end of file
diff --git a/internal/catalog/internal/types/testdata/errUnixSocketMultiport.golden b/internal/catalog/internal/types/testdata/errUnixSocketMultiport.golden
deleted file mode 100644
index c28c2f069509e..0000000000000
--- a/internal/catalog/internal/types/testdata/errUnixSocketMultiport.golden
+++ /dev/null
@@ -1 +0,0 @@
-Unix socket address references more than one port
\ No newline at end of file
diff --git a/internal/catalog/internal/types/testdata/errVirtualPortReused.golden b/internal/catalog/internal/types/testdata/errVirtualPortReused.golden
deleted file mode 100644
index 5a8c8b799b08b..0000000000000
--- a/internal/catalog/internal/types/testdata/errVirtualPortReused.golden
+++ /dev/null
@@ -1 +0,0 @@
-virtual port 8080 was previously assigned at index 3
\ No newline at end of file
diff --git a/internal/catalog/internal/types/types.go b/internal/catalog/internal/types/types.go
deleted file mode 100644
index 6ce29a2659634..0000000000000
--- a/internal/catalog/internal/types/types.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-)
-
-func Register(r resource.Registry) {
-	RegisterWorkload(r)
-	RegisterService(r)
-	RegisterServiceEndpoints(r)
-	RegisterNode(r)
-	RegisterHealthStatus(r)
-	RegisterHealthChecks(r)
-	RegisterDNSPolicy(r)
-	RegisterVirtualIPs(r)
-	RegisterFailoverPolicy(r)
-}
diff --git a/internal/catalog/internal/types/types_test.go b/internal/catalog/internal/types/types_test.go
deleted file mode 100644
index ba4243b62805b..0000000000000
--- a/internal/catalog/internal/types/types_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func TestTypeRegistration(t *testing.T) {
-	// This test will ensure that all the required types have been registered
-	// It is not trying to determine whether the settings for the registrations
-	// are correct as that would amount more or less to hardcoding structs
-	// from types.go a second time here.
-	requiredKinds := []string{
-		pbcatalog.WorkloadKind,
-		pbcatalog.ServiceKind,
-		pbcatalog.ServiceEndpointsKind,
-		pbcatalog.NodeKind,
-		pbcatalog.HealthStatusKind,
-		pbcatalog.HealthChecksKind,
-		pbcatalog.DNSPolicyKind,
-		// todo (ishustava): uncomment once we implement these
-		//pbcatalog.VirtualIPsKind,
-	}
-
-	r := resource.NewRegistry()
-	Register(r)
-
-	for _, kind := range requiredKinds {
-		t.Run(kind, func(t *testing.T) {
-			registration, ok := r.Resolve(&pbresource.Type{
-				Group:        pbcatalog.GroupName,
-				GroupVersion: pbcatalog.Version,
-				Kind:         kind,
-			})
-
-			require.True(t, ok, "Resource kind %s has not been registered to the type registry", kind)
-			require.NotNil(t, registration, "Registration for %s was found but is nil", kind)
-		})
-	}
-}
diff --git a/internal/catalog/internal/types/validators.go b/internal/catalog/internal/types/validators.go
deleted file mode 100644
index 61620485cd19f..0000000000000
--- a/internal/catalog/internal/types/validators.go
+++ /dev/null
@@ -1,318 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"regexp"
-	"strings"
-
-	"github.com/hashicorp/go-multierror"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	// 108 characters is the max size that Linux (and probably other OSes) will
-	// allow for the length of the Unix socket path.
-	maxUnixSocketPathLen = 108
-)
-
-var (
-	dnsLabelRegex   = `^[a-z0-9]([a-z0-9\-_]*[a-z0-9])?$`
-	dnsLabelMatcher = regexp.MustCompile(dnsLabelRegex)
-)
-
-func isValidIPAddress(host string) bool {
-	return net.ParseIP(host) != nil
-}
-
-func isValidDNSName(host string) bool {
-	if len(host) > 256 {
-		return false
-	}
-
-	labels := strings.Split(host, ".")
-	for _, label := range labels {
-		if !isValidDNSLabel(label) {
-			return false
-		}
-	}
-
-	return true
-}
-
-func isValidDNSLabel(label string) bool {
-	if len(label) > 64 {
-		return false
-	}
-
-	return dnsLabelMatcher.Match([]byte(label))
-}
-
-func isValidUnixSocketPath(host string) bool {
-	if len(host) > maxUnixSocketPathLen || !strings.HasPrefix(host, "unix://") || strings.Contains(host, "\000") {
-		return false
-	}
-
-	return true
-}
-
-func validateWorkloadHost(host string) error {
-	// Check that the host is empty
-	if host == "" {
-		return errInvalidWorkloadHostFormat{Host: host}
-	}
-
-	// Check if the host represents an IP address, unix socket path or a DNS name
-	if !isValidIPAddress(host) && !isValidUnixSocketPath(host) && !isValidDNSName(host) {
-		return errInvalidWorkloadHostFormat{Host: host}
-	}
-
-	return nil
-}
-
-func validateSelector(sel *pbcatalog.WorkloadSelector, allowEmpty bool) error {
-	if sel == nil {
-		if allowEmpty {
-			return nil
-		}
-
-		return resource.ErrEmpty
-	}
-
-	if len(sel.Names) == 0 && len(sel.Prefixes) == 0 {
-		if allowEmpty {
-			return nil
-		}
-
-		return resource.ErrEmpty
-	}
-
-	var err error
-
-	// Validate that all the exact match names are non-empty. This is
-	// mostly for the sake of not admitting values that should always
-	// be meaningless and never actually cause selection of a workload.
-	// This is because workloads must have non-empty names.
-	for idx, name := range sel.Names {
-		if name == "" {
-			err = multierror.Append(err, resource.ErrInvalidListElement{
-				Name:    "names",
-				Index:   idx,
-				Wrapped: resource.ErrEmpty,
-			})
-		}
-	}
-
-	return err
-}
-
-func validateIPAddress(ip string) error {
-	if ip == "" {
-		return resource.ErrEmpty
-	}
-
-	if !isValidIPAddress(ip) {
-		return errNotIPAddress
-	}
-
-	return nil
-}
-
-func validatePortName(name string) error {
-	if name == "" {
-		return resource.ErrEmpty
-	}
-
-	if !isValidDNSLabel(name) {
-		return errNotDNSLabel
-	}
-
-	return nil
-}
-
-func validateProtocol(protocol pbcatalog.Protocol) error {
-	switch protocol {
-	case pbcatalog.Protocol_PROTOCOL_UNSPECIFIED,
-		// means pbcatalog.FailoverMode_FAILOVER_MODE_TCP
-		pbcatalog.Protocol_PROTOCOL_TCP,
-		pbcatalog.Protocol_PROTOCOL_HTTP,
-		pbcatalog.Protocol_PROTOCOL_HTTP2,
-		pbcatalog.Protocol_PROTOCOL_GRPC,
-		pbcatalog.Protocol_PROTOCOL_MESH:
-		return nil
-	default:
-		return resource.NewConstError(fmt.Sprintf("not a supported enum value: %v", protocol))
-	}
-}
-
-// validateWorkloadAddress will validate the WorkloadAddress type. This involves validating
-// the Host within the workload address and the ports references. For ports references we
-// ensure that values in the addresses ports array are present in the set of map keys.
-// Additionally for UNIX socket addresses we ensure that they specify only 1 port either
-// explicitly in their ports references or implicitly by omitting the references and there
-// only being 1 value in the ports map.
-func validateWorkloadAddress(addr *pbcatalog.WorkloadAddress, ports map[string]*pbcatalog.WorkloadPort) error {
-	var err error
-
-	if hostErr := validateWorkloadHost(addr.Host); hostErr != nil {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "host",
-			Wrapped: hostErr,
-		})
-	}
-
-	// Ensure that unix sockets reference exactly 1 port. They may also indirectly reference 1 port
-	// by the workload having only a single port and omitting any explicit port assignment.
-	if isValidUnixSocketPath(addr.Host) &&
-		(len(addr.Ports) > 1 || (len(addr.Ports) == 0 && len(ports) > 1)) {
-		err = multierror.Append(err, errUnixSocketMultiport)
-	}
-
-	// Check that all referenced ports exist
-	for idx, port := range addr.Ports {
-		_, found := ports[port]
-		if !found {
-			err = multierror.Append(err, resource.ErrInvalidListElement{
-				Name:    "ports",
-				Index:   idx,
-				Wrapped: errInvalidPortReference{Name: port},
-			})
-		}
-	}
-	return err
-}
-
-func validateReferenceType(allowed *pbresource.Type, check *pbresource.Type) error {
-	if allowed.Group == check.Group &&
-		allowed.GroupVersion == check.GroupVersion &&
-		allowed.Kind == check.Kind {
-		return nil
-	}
-
-	return resource.ErrInvalidReferenceType{
-		AllowedType: allowed,
-	}
-}
-
-func validateReferenceTenancy(allowed *pbresource.Tenancy, check *pbresource.Tenancy) error {
-	if proto.Equal(allowed, check) {
-		return nil
-	}
-
-	return resource.ErrReferenceTenancyNotEqual
-}
-
-func validateReference(allowedType *pbresource.Type, allowedTenancy *pbresource.Tenancy, check *pbresource.ID) error {
-	var err error
-
-	// Validate the references type is the allowed type.
-	if typeErr := validateReferenceType(allowedType, check.GetType()); typeErr != nil {
-		err = multierror.Append(err, typeErr)
-	}
-
-	// Validate the references tenancy matches the allowed tenancy.
-	if tenancyErr := validateReferenceTenancy(allowedTenancy, check.GetTenancy()); tenancyErr != nil {
-		err = multierror.Append(err, tenancyErr)
-	}
-
-	return err
-}
-
-func validateHealth(health pbcatalog.Health) error {
-	switch health {
-	case pbcatalog.Health_HEALTH_ANY,
-		pbcatalog.Health_HEALTH_PASSING,
-		pbcatalog.Health_HEALTH_WARNING,
-		pbcatalog.Health_HEALTH_CRITICAL,
-		pbcatalog.Health_HEALTH_MAINTENANCE:
-		return nil
-	default:
-		return resource.NewConstError(fmt.Sprintf("not a supported enum value: %v", health))
-	}
-}
-
-// ValidateLocalServiceRefNoSection ensures the following:
-//
-// - ref is non-nil
-// - type is ServiceType
-// - section is empty
-// - tenancy is set and partition/namespace are both non-empty
-// - peer_name must be "local"
-//
-// Each possible validation error is wrapped in the wrapErr function before
-// being collected in a multierror.Error.
-func ValidateLocalServiceRefNoSection(ref *pbresource.Reference, wrapErr func(error) error) error {
-	if ref == nil {
-		return wrapErr(resource.ErrMissing)
-	}
-
-	if !resource.EqualType(ref.Type, pbcatalog.ServiceType) {
-		return wrapErr(resource.ErrInvalidField{
-			Name: "type",
-			Wrapped: resource.ErrInvalidReferenceType{
-				AllowedType: pbcatalog.ServiceType,
-			},
-		})
-	}
-
-	var merr error
-	if ref.Section != "" {
-		merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-			Name:    "section",
-			Wrapped: errors.New("section cannot be set here"),
-		}))
-	}
-
-	if ref.Tenancy == nil {
-		merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-			Name:    "tenancy",
-			Wrapped: resource.ErrMissing,
-		}))
-	} else {
-		// NOTE: these are Service specific, since that's a Namespace-scoped type.
-		if ref.Tenancy.Partition == "" {
-			merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-				Name: "tenancy",
-				Wrapped: resource.ErrInvalidField{
-					Name:    "partition",
-					Wrapped: resource.ErrEmpty,
-				},
-			}))
-		}
-		if ref.Tenancy.Namespace == "" {
-			merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-				Name: "tenancy",
-				Wrapped: resource.ErrInvalidField{
-					Name:    "namespace",
-					Wrapped: resource.ErrEmpty,
-				},
-			}))
-		}
-		if ref.Tenancy.PeerName != "local" {
-			merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-				Name: "tenancy",
-				Wrapped: resource.ErrInvalidField{
-					Name:    "peer_name",
-					Wrapped: errors.New(`must be set to "local"`),
-				},
-			}))
-		}
-	}
-
-	if ref.Name == "" {
-		merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-			Name:    "name",
-			Wrapped: resource.ErrMissing,
-		}))
-	}
-
-	return merr
-}
diff --git a/internal/catalog/internal/types/validators_test.go b/internal/catalog/internal/types/validators_test.go
deleted file mode 100644
index 827126676b12a..0000000000000
--- a/internal/catalog/internal/types/validators_test.go
+++ /dev/null
@@ -1,616 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/go-multierror"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func TestIsValidDNSLabel(t *testing.T) {
-	type testCase struct {
-		name  string
-		valid bool
-	}
-
-	cases := map[string]testCase{
-		"min-length": {
-			name:  "a",
-			valid: true,
-		},
-		"max-length": {
-			name:  strings.Repeat("a1b2c3d4", 8),
-			valid: true,
-		},
-		"underscores": {
-			name:  "has_underscores",
-			valid: true,
-		},
-		"hyphenated": {
-			name:  "has-hyphen3",
-			valid: true,
-		},
-		"uppercase-not-allowed": {
-			name:  "UPPERCASE",
-			valid: false,
-		},
-		"numeric-start": {
-			name:  "1abc",
-			valid: true,
-		},
-		"underscore-start-not-allowed": {
-			name:  "_abc",
-			valid: false,
-		},
-		"hyphen-start-not-allowed": {
-			name:  "-abc",
-			valid: false,
-		},
-		"underscore-end-not-allowed": {
-			name:  "abc_",
-			valid: false,
-		},
-		"hyphen-end-not-allowed": {
-			name:  "abc-",
-			valid: false,
-		},
-		"unicode-not allowed": {
-			name:  "abc∑",
-			valid: false,
-		},
-		"too-long": {
-			name:  strings.Repeat("aaaaaaaaa", 8),
-			valid: false,
-		},
-		"missing-name": {
-			name:  "",
-			valid: false,
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			require.Equal(t, tcase.valid, isValidDNSLabel(tcase.name))
-		})
-	}
-}
-
-func TestIsValidDNSName(t *testing.T) {
-	// TestIsValidDNSLabel tests all of the individual label matching
-	// criteria. This test therefore is more limited to just the extra
-	// validations that IsValidDNSName does. Mainly that it ensures
-	// the overall length is less than 256 and that generally is made
-	// up of DNS labels joined with '.'
-
-	type testCase struct {
-		name  string
-		valid bool
-	}
-
-	cases := map[string]testCase{
-		"valid": {
-			name:  "foo-something.example3.com",
-			valid: true,
-		},
-		"exceeds-max-length": {
-			name:  strings.Repeat("aaaa.aaaa", 29),
-			valid: false,
-		},
-		"invalid-label": {
-			name:  "foo._bar.com",
-			valid: false,
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			require.Equal(t, tcase.valid, isValidDNSName(tcase.name))
-		})
-	}
-}
-
-func TestIsValidIPAddress(t *testing.T) {
-	type testCase struct {
-		name  string
-		valid bool
-	}
-
-	cases := map[string]testCase{
-		"ipv4": {
-			name:  "192.168.1.2",
-			valid: true,
-		},
-		"ipv6": {
-			name:  "2001:db8::1",
-			valid: true,
-		},
-		"ipv4-mapped-ipv6": {
-			name:  "::ffff:192.0.2.128",
-			valid: true,
-		},
-		"invalid": {
-			name:  "foo",
-			valid: false,
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			require.Equal(t, tcase.valid, isValidIPAddress(tcase.name))
-		})
-	}
-}
-
-func TestIsValidUnixSocketPath(t *testing.T) {
-	type testCase struct {
-		name  string
-		valid bool
-	}
-
-	cases := map[string]testCase{
-		"valid": {
-			name:  "unix:///foo/bar.sock",
-			valid: true,
-		},
-		"missing-prefix": {
-			name:  "/foo/bar.sock",
-			valid: false,
-		},
-		"too-long": {
-			name:  fmt.Sprintf("unix://%s/bar.sock", strings.Repeat("/aaaaaaaaaa", 11)),
-			valid: false,
-		},
-		"nul-in-name": {
-			name:  "unix:///foo/bar\000sock",
-			valid: false,
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			require.Equal(t, tcase.valid, isValidUnixSocketPath(tcase.name))
-		})
-	}
-}
-
-func TestValidateHost(t *testing.T) {
-	type testCase struct {
-		name  string
-		valid bool
-	}
-
-	cases := map[string]testCase{
-		"ip-address": {
-			name:  "198.18.0.1",
-			valid: true,
-		},
-		"unix-socket": {
-			name:  "unix:///foo.sock",
-			valid: true,
-		},
-		"dns-name": {
-			name:  "foo.com",
-			valid: true,
-		},
-		"host-empty": {
-			name:  "",
-			valid: false,
-		},
-		"host-invalid": {
-			name:  "unix:///foo/bar\000sock",
-			valid: false,
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			err := validateWorkloadHost(tcase.name)
-			if tcase.valid {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				require.Equal(t, errInvalidWorkloadHostFormat{Host: tcase.name}, err)
-			}
-		})
-	}
-}
-
-func TestValidateSelector(t *testing.T) {
-	type testCase struct {
-		selector   *pbcatalog.WorkloadSelector
-		allowEmpty bool
-		err        error
-	}
-
-	cases := map[string]testCase{
-		"nil-disallowed": {
-			selector:   nil,
-			allowEmpty: false,
-			err:        resource.ErrEmpty,
-		},
-		"nil-allowed": {
-			selector:   nil,
-			allowEmpty: true,
-			err:        nil,
-		},
-		"empty-allowed": {
-			selector:   &pbcatalog.WorkloadSelector{},
-			allowEmpty: true,
-			err:        nil,
-		},
-		"empty-disallowed": {
-			selector:   &pbcatalog.WorkloadSelector{},
-			allowEmpty: false,
-			err:        resource.ErrEmpty,
-		},
-		"ok": {
-			selector: &pbcatalog.WorkloadSelector{
-				Names:    []string{"foo", "bar"},
-				Prefixes: []string{"foo", "bar"},
-			},
-			allowEmpty: false,
-			err:        nil,
-		},
-		"empty-name": {
-			selector: &pbcatalog.WorkloadSelector{
-				Names:    []string{"", "bar", ""},
-				Prefixes: []string{"foo", "bar"},
-			},
-			allowEmpty: false,
-			err: &multierror.Error{
-				Errors: []error{
-					resource.ErrInvalidListElement{
-						Name:    "names",
-						Index:   0,
-						Wrapped: resource.ErrEmpty,
-					},
-					resource.ErrInvalidListElement{
-						Name:    "names",
-						Index:   2,
-						Wrapped: resource.ErrEmpty,
-					},
-				},
-			},
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			err := validateSelector(tcase.selector, tcase.allowEmpty)
-			if tcase.err == nil {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				require.Equal(t, tcase.err, err)
-			}
-		})
-	}
-}
-
-func TestValidateIPAddress(t *testing.T) {
-	// this test does not perform extensive validation of what constitutes
-	// an IP address. Instead that is handled in the test for the
-	// isValidIPAddress function
-
-	t.Run("empty", func(t *testing.T) {
-		require.Equal(t, resource.ErrEmpty, validateIPAddress(""))
-	})
-
-	t.Run("invalid", func(t *testing.T) {
-		require.Equal(t, errNotIPAddress, validateIPAddress("foo.com"))
-	})
-
-	t.Run("ok", func(t *testing.T) {
-		require.NoError(t, validateIPAddress("192.168.0.1"))
-	})
-}
-
-func TestValidatePortName(t *testing.T) {
-	// this test does not perform extensive validation of what constitutes
-	// a valid port name. In general the criteria is that it must not
-	// be empty and must be a valid DNS label. Therefore extensive testing
-	// of what it means to be a valid DNS label is performed within the
-	// test for the isValidDNSLabel function.
-
-	t.Run("empty", func(t *testing.T) {
-		require.Equal(t, resource.ErrEmpty, validatePortName(""))
-	})
-
-	t.Run("invalid", func(t *testing.T) {
-		require.Equal(t, errNotDNSLabel, validatePortName("foo.com"))
-	})
-
-	t.Run("ok", func(t *testing.T) {
-		require.NoError(t, validatePortName("http"))
-	})
-}
-
-func TestValidateProtocol(t *testing.T) {
-	// this test simply verifies that we accept all enum values specified in our proto
-	// in order to avoid validator drift.
-	for name, value := range pbcatalog.Protocol_value {
-		t.Run(name, func(t *testing.T) {
-			require.NoError(t, validateProtocol(pbcatalog.Protocol(value)))
-		})
-	}
-}
-
-func TestValidateHealth(t *testing.T) {
-	// this test simply verifies that we accept all enum values specified in our proto
-	// in order to avoid validator drift.
-	for name, value := range pbcatalog.Health_value {
-		t.Run(name, func(t *testing.T) {
-			require.NoError(t, validateHealth(pbcatalog.Health(value)))
-		})
-	}
-}
-
-func TestValidateWorkloadAddress(t *testing.T) {
-	type testCase struct {
-		addr        *pbcatalog.WorkloadAddress
-		ports       map[string]*pbcatalog.WorkloadPort
-		validateErr func(*testing.T, error)
-	}
-
-	cases := map[string]testCase{
-		"invalid-host": {
-			addr: &pbcatalog.WorkloadAddress{
-				Host: "-blarg",
-			},
-			ports: map[string]*pbcatalog.WorkloadPort{},
-			validateErr: func(t *testing.T, err error) {
-				var actual resource.ErrInvalidField
-				require.ErrorAs(t, err, &actual)
-				require.Equal(t, "host", actual.Name)
-			},
-		},
-		"unix-socket-multiport-explicit": {
-			addr: &pbcatalog.WorkloadAddress{
-				Host:  "unix:///foo.sock",
-				Ports: []string{"foo", "bar"},
-			},
-			ports: map[string]*pbcatalog.WorkloadPort{
-				"foo": {},
-				"bar": {},
-			},
-			validateErr: func(t *testing.T, err error) {
-				require.ErrorIs(t, err, errUnixSocketMultiport)
-			},
-		},
-		"unix-socket-multiport-implicit": {
-			addr: &pbcatalog.WorkloadAddress{
-				Host: "unix:///foo.sock",
-			},
-			ports: map[string]*pbcatalog.WorkloadPort{
-				"foo": {},
-				"bar": {},
-			},
-			validateErr: func(t *testing.T, err error) {
-				require.ErrorIs(t, err, errUnixSocketMultiport)
-			},
-		},
-
-		"unix-socket-singleport": {
-			addr: &pbcatalog.WorkloadAddress{
-				Host:  "unix:///foo.sock",
-				Ports: []string{"foo"},
-			},
-			ports: map[string]*pbcatalog.WorkloadPort{
-				"foo": {},
-				"bar": {},
-			},
-		},
-		"invalid-port-reference": {
-			addr: &pbcatalog.WorkloadAddress{
-				Host:  "198.18.0.1",
-				Ports: []string{"foo"},
-			},
-			ports: map[string]*pbcatalog.WorkloadPort{
-				"http": {},
-			},
-			validateErr: func(t *testing.T, err error) {
-				var actual errInvalidPortReference
-				require.ErrorAs(t, err, &actual)
-				require.Equal(t, "foo", actual.Name)
-			},
-		},
-		"ok": {
-			addr: &pbcatalog.WorkloadAddress{
-				Host:     "198.18.0.1",
-				Ports:    []string{"http", "grpc"},
-				External: true,
-			},
-			ports: map[string]*pbcatalog.WorkloadPort{
-				"http": {},
-				"grpc": {},
-			},
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			err := validateWorkloadAddress(tcase.addr, tcase.ports)
-			if tcase.validateErr != nil {
-				require.Error(t, err)
-				tcase.validateErr(t, err)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func TestValidateReferenceType(t *testing.T) {
-	allowedType := &pbresource.Type{
-		Group:        "foo",
-		GroupVersion: "v1",
-		Kind:         "Bar",
-	}
-
-	type testCase struct {
-		check *pbresource.Type
-		err   bool
-	}
-
-	cases := map[string]testCase{
-		"ok": {
-			check: allowedType,
-			err:   false,
-		},
-		"group-mismatch": {
-			check: &pbresource.Type{
-				Group:        "food",
-				GroupVersion: "v1",
-				Kind:         "Bar",
-			},
-			err: true,
-		},
-		"group-version-mismatch": {
-			check: &pbresource.Type{
-				Group:        "foo",
-				GroupVersion: "v2",
-				Kind:         "Bar",
-			},
-			err: true,
-		},
-		"kind-mismatch": {
-			check: &pbresource.Type{
-				Group:        "foo",
-				GroupVersion: "v1",
-				Kind:         "Baz",
-			},
-			err: true,
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			err := validateReferenceType(allowedType, tcase.check)
-			if tcase.err {
-				require.Equal(t, resource.ErrInvalidReferenceType{AllowedType: allowedType}, err)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func TestValidateReferenceTenancy(t *testing.T) {
-	allowedTenancy := &pbresource.Tenancy{
-		Partition: "default",
-		Namespace: "default",
-		PeerName:  "local",
-	}
-
-	type testCase struct {
-		check *pbresource.Tenancy
-		err   bool
-	}
-
-	cases := map[string]testCase{
-		"ok": {
-			check: allowedTenancy,
-			err:   false,
-		},
-		"partition-mismatch": {
-			check: &pbresource.Tenancy{
-				Partition: "food",
-				Namespace: "default",
-				PeerName:  "local",
-			},
-			err: true,
-		},
-		"group-version-mismatch": {
-			check: &pbresource.Tenancy{
-				Partition: "default",
-				Namespace: "v2",
-				PeerName:  "local",
-			},
-			err: true,
-		},
-		"kind-mismatch": {
-			check: &pbresource.Tenancy{
-				Partition: "default",
-				Namespace: "default",
-				PeerName:  "Baz",
-			},
-			err: true,
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			err := validateReferenceTenancy(allowedTenancy, tcase.check)
-			if tcase.err {
-				require.Equal(t, resource.ErrReferenceTenancyNotEqual, err)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func TestValidateReference(t *testing.T) {
-	allowedTenancy := &pbresource.Tenancy{
-		Partition: "default",
-		Namespace: "default",
-		PeerName:  "local",
-	}
-
-	allowedType := pbcatalog.WorkloadType
-
-	type testCase struct {
-		check *pbresource.ID
-		err   error
-	}
-
-	cases := map[string]testCase{
-		"ok": {
-			check: &pbresource.ID{
-				Type:    allowedType,
-				Tenancy: allowedTenancy,
-				Name:    "foo",
-			},
-		},
-		"type-err": {
-			check: &pbresource.ID{
-				Type:    pbcatalog.NodeType,
-				Tenancy: allowedTenancy,
-				Name:    "foo",
-			},
-			err: resource.ErrInvalidReferenceType{AllowedType: allowedType},
-		},
-		"tenancy-mismatch": {
-			check: &pbresource.ID{
-				Type: allowedType,
-				Tenancy: &pbresource.Tenancy{
-					Partition: "foo",
-					Namespace: "bar",
-					PeerName:  "baz",
-				},
-				Name: "foo",
-			},
-			err: resource.ErrReferenceTenancyNotEqual,
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			err := validateReference(allowedType, allowedTenancy, tcase.check)
-			if tcase.err != nil {
-				require.ErrorIs(t, err, tcase.err)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
diff --git a/internal/catalog/internal/types/virtual_ips.go b/internal/catalog/internal/types/virtual_ips.go
deleted file mode 100644
index 7a4cee276ae6a..0000000000000
--- a/internal/catalog/internal/types/virtual_ips.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterVirtualIPs(r resource.Registry) {
-	// todo (ishustava): uncomment when we implement it
-	//r.Register(resource.Registration{
-	//	Type:     pbcatalog.VirtualIPsV2Beta1Type,
-	//	Proto:    &pbcatalog.VirtualIPs{},
-	//	Scope:    resource.ScopeNamespace,
-	//	Validate: ValidateVirtualIPs,
-	//})
-}
-
-func ValidateVirtualIPs(res *pbresource.Resource) error {
-	var vips pbcatalog.VirtualIPs
-
-	if err := res.Data.UnmarshalTo(&vips); err != nil {
-		return resource.NewErrDataParse(&vips, err)
-	}
-
-	var err error
-	for idx, ip := range vips.Ips {
-		if vipErr := validateIPAddress(ip.Address); vipErr != nil {
-			err = multierror.Append(err, resource.ErrInvalidListElement{
-				Name:  "ips",
-				Index: idx,
-				Wrapped: resource.ErrInvalidField{
-					Name:    "address",
-					Wrapped: vipErr,
-				},
-			})
-		}
-	}
-	return err
-}
diff --git a/internal/catalog/internal/types/virtual_ips_test.go b/internal/catalog/internal/types/virtual_ips_test.go
deleted file mode 100644
index c7ed70972530c..0000000000000
--- a/internal/catalog/internal/types/virtual_ips_test.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func createVirtualIPsResource(t *testing.T, data protoreflect.ProtoMessage) *pbresource.Resource {
-	res := &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type: pbcatalog.VirtualIPsType,
-			Tenancy: &pbresource.Tenancy{
-				Partition: "default",
-				Namespace: "default",
-				PeerName:  "local",
-			},
-			Name: "test-vip",
-		},
-	}
-
-	var err error
-	res.Data, err = anypb.New(data)
-	require.NoError(t, err)
-	return res
-}
-
-func TestValidateVirtualIPs_Ok(t *testing.T) {
-	data := &pbcatalog.VirtualIPs{
-		Ips: []*pbcatalog.IP{
-			{
-				Address:   "::ffff:192.0.2.128",
-				Generated: true,
-			},
-			{
-				Address:   "10.0.1.42",
-				Generated: false,
-			},
-		},
-	}
-
-	res := createVirtualIPsResource(t, data)
-
-	err := ValidateVirtualIPs(res)
-	require.NoError(t, err)
-}
-
-func TestValidateVirtualIPs_ParseError(t *testing.T) {
-	// Any type other than the VirtualIPs type would work
-	// to cause the error we are expecting
-	data := &pbcatalog.IP{Address: "198.18.0.1"}
-
-	res := createVirtualIPsResource(t, data)
-
-	err := ValidateVirtualIPs(res)
-	require.Error(t, err)
-	require.ErrorAs(t, err, &resource.ErrDataParse{})
-}
-
-func TestValidateVirtualIPs_InvalidIP(t *testing.T) {
-	data := &pbcatalog.VirtualIPs{
-		Ips: []*pbcatalog.IP{
-			{
-				Address: "foo",
-			},
-		},
-	}
-
-	res := createVirtualIPsResource(t, data)
-
-	err := ValidateVirtualIPs(res)
-	require.Error(t, err)
-	require.ErrorIs(t, err, errNotIPAddress)
-}
diff --git a/internal/catalog/internal/types/workload.go b/internal/catalog/internal/types/workload.go
deleted file mode 100644
index 961a85346c4ff..0000000000000
--- a/internal/catalog/internal/types/workload.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"math"
-	"sort"
-
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterWorkload(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbcatalog.WorkloadType,
-		Proto:    &pbcatalog.Workload{},
-		Scope:    resource.ScopeNamespace,
-		Validate: ValidateWorkload,
-	})
-}
-
-func ValidateWorkload(res *pbresource.Resource) error {
-	var workload pbcatalog.Workload
-
-	if err := res.Data.UnmarshalTo(&workload); err != nil {
-		return resource.NewErrDataParse(&workload, err)
-	}
-
-	var err error
-
-	// Validate that the workload has at least one port
-	if len(workload.Ports) < 1 {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "ports",
-			Wrapped: resource.ErrEmpty,
-		})
-	}
-
-	var meshPorts []string
-
-	// Validate the Workload Ports
-	for portName, port := range workload.Ports {
-		if portNameErr := validatePortName(portName); portNameErr != nil {
-			err = multierror.Append(err, resource.ErrInvalidMapKey{
-				Map:     "ports",
-				Key:     portName,
-				Wrapped: portNameErr,
-			})
-		}
-
-		// disallow port 0 for now
-		if port.Port < 1 || port.Port > math.MaxUint16 {
-			err = multierror.Append(err, resource.ErrInvalidMapValue{
-				Map: "ports",
-				Key: portName,
-				Wrapped: resource.ErrInvalidField{
-					Name:    "port",
-					Wrapped: errInvalidPhysicalPort,
-				},
-			})
-		}
-
-		if protoErr := validateProtocol(port.Protocol); protoErr != nil {
-			err = multierror.Append(err, resource.ErrInvalidMapValue{
-				Map: "ports",
-				Key: portName,
-				Wrapped: resource.ErrInvalidField{
-					Name:    "protocol",
-					Wrapped: protoErr,
-				},
-			})
-		}
-
-		// Collect the list of mesh ports
-		if port.Protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-			meshPorts = append(meshPorts, portName)
-		}
-	}
-
-	if len(meshPorts) > 1 {
-		sort.Strings(meshPorts)
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name: "ports",
-			Wrapped: errTooMuchMesh{
-				Ports: meshPorts,
-			},
-		})
-	}
-
-	// If the workload is mesh enabled then a valid identity must be provided.
-	// If not mesh enabled but a non-empty identity is provided then we still
-	// validate that its valid.
-	if len(meshPorts) > 0 && workload.Identity == "" {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "identity",
-			Wrapped: resource.ErrMissing,
-		})
-	} else if workload.Identity != "" && !isValidDNSLabel(workload.Identity) {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "identity",
-			Wrapped: errNotDNSLabel,
-		})
-	}
-
-	// Validate workload locality
-	if workload.Locality != nil && workload.Locality.Region == "" && workload.Locality.Zone != "" {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "locality",
-			Wrapped: errLocalityZoneNoRegion,
-		})
-	}
-
-	// Node associations are optional but if present the name should
-	// be a valid DNS label.
-	if workload.NodeName != "" {
-		if !isValidDNSLabel(workload.NodeName) {
-			err = multierror.Append(err, resource.ErrInvalidField{
-				Name:    "node_name",
-				Wrapped: errNotDNSLabel,
-			})
-		}
-	}
-
-	if len(workload.Addresses) < 1 {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "addresses",
-			Wrapped: resource.ErrEmpty,
-		})
-	}
-
-	// Validate Workload Addresses
-	for idx, addr := range workload.Addresses {
-		if addrErr := validateWorkloadAddress(addr, workload.Ports); addrErr != nil {
-			err = multierror.Append(err, resource.ErrInvalidListElement{
-				Name:    "addresses",
-				Index:   idx,
-				Wrapped: addrErr,
-			})
-		}
-	}
-
-	return err
-}
diff --git a/internal/catalog/internal/types/workload_test.go b/internal/catalog/internal/types/workload_test.go
deleted file mode 100644
index e55d9a44fd2b8..0000000000000
--- a/internal/catalog/internal/types/workload_test.go
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func createWorkloadResource(t *testing.T, data protoreflect.ProtoMessage) *pbresource.Resource {
-	res := &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type: pbcatalog.WorkloadType,
-			Tenancy: &pbresource.Tenancy{
-				Partition: "default",
-				Namespace: "default",
-				PeerName:  "local",
-			},
-			Name: "api-1234",
-		},
-	}
-
-	var err error
-	res.Data, err = anypb.New(data)
-	require.NoError(t, err)
-	return res
-}
-
-func validWorkload() *pbcatalog.Workload {
-	return &pbcatalog.Workload{
-		Addresses: []*pbcatalog.WorkloadAddress{
-			{
-				Host: "127.0.0.1",
-			},
-		},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"http": {
-				Port:     8443,
-				Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2,
-			},
-		},
-		NodeName: "foo",
-		Identity: "api",
-		Locality: &pbcatalog.Locality{
-			Region: "us-east-1",
-			Zone:   "1a",
-		},
-	}
-}
-
-func TestValidateWorkload_Ok(t *testing.T) {
-	res := createWorkloadResource(t, validWorkload())
-
-	err := ValidateWorkload(res)
-	require.NoError(t, err)
-}
-
-func TestValidateWorkload_ParseError(t *testing.T) {
-	// Any type other than the Workload type would work
-	// to cause the error we are expecting
-	data := &pbcatalog.IP{Address: "198.18.0.1"}
-
-	res := createWorkloadResource(t, data)
-
-	err := ValidateWorkload(res)
-	require.Error(t, err)
-	require.ErrorAs(t, err, &resource.ErrDataParse{})
-}
-
-func TestValidateWorkload_EmptyAddresses(t *testing.T) {
-	data := validWorkload()
-	data.Addresses = nil
-
-	res := createWorkloadResource(t, data)
-
-	err := ValidateWorkload(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "addresses",
-		Wrapped: resource.ErrEmpty,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateWorkload_InvalidAddress(t *testing.T) {
-	data := validWorkload()
-	data.Addresses[0].Host = "-not-a-host"
-
-	res := createWorkloadResource(t, data)
-
-	err := ValidateWorkload(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "host",
-		Wrapped: errInvalidWorkloadHostFormat{Host: "-not-a-host"},
-	}
-
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateWorkload_MissingIdentity(t *testing.T) {
-	data := validWorkload()
-	data.Ports["mesh"] = &pbcatalog.WorkloadPort{
-		Port:     9090,
-		Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-	}
-	data.Identity = ""
-
-	res := createWorkloadResource(t, data)
-
-	err := ValidateWorkload(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "identity",
-		Wrapped: resource.ErrMissing,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateWorkload_InvalidIdentity(t *testing.T) {
-	data := validWorkload()
-	data.Identity = "/foiujd"
-
-	res := createWorkloadResource(t, data)
-
-	err := ValidateWorkload(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "identity",
-		Wrapped: errNotDNSLabel,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateWorkload_InvalidNodeName(t *testing.T) {
-	data := validWorkload()
-	data.NodeName = "/foiujd"
-
-	res := createWorkloadResource(t, data)
-
-	err := ValidateWorkload(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "node_name",
-		Wrapped: errNotDNSLabel,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateWorkload_NoPorts(t *testing.T) {
-	data := validWorkload()
-	data.Ports = nil
-
-	res := createWorkloadResource(t, data)
-
-	err := ValidateWorkload(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "ports",
-		Wrapped: resource.ErrEmpty,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateWorkload_TooMuchMesh(t *testing.T) {
-	data := validWorkload()
-	data.Ports["mesh1"] = &pbcatalog.WorkloadPort{
-		Port:     9090,
-		Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-	}
-	data.Ports["mesh2"] = &pbcatalog.WorkloadPort{
-		Port:     9091,
-		Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-	}
-
-	res := createWorkloadResource(t, data)
-
-	err := ValidateWorkload(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name: "ports",
-		Wrapped: errTooMuchMesh{
-			Ports: []string{"mesh1", "mesh2"},
-		},
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateWorkload_InvalidPortName(t *testing.T) {
-	data := validWorkload()
-	data.Ports[""] = &pbcatalog.WorkloadPort{
-		Port: 42,
-	}
-
-	res := createWorkloadResource(t, data)
-
-	err := ValidateWorkload(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidMapKey{
-		Map:     "ports",
-		Key:     "",
-		Wrapped: resource.ErrEmpty,
-	}
-	var actual resource.ErrInvalidMapKey
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateWorkload_InvalidPortProtocol(t *testing.T) {
-	data := validWorkload()
-	data.Ports["foo"] = &pbcatalog.WorkloadPort{
-		Port:     42,
-		Protocol: 99,
-	}
-
-	res := createWorkloadResource(t, data)
-
-	err := ValidateWorkload(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidMapValue{
-		Map: "ports",
-		Key: "foo",
-		Wrapped: resource.ErrInvalidField{
-			Name:    "protocol",
-			Wrapped: resource.NewConstError("not a supported enum value: 99"),
-		},
-	}
-	var actual resource.ErrInvalidMapValue
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateWorkload_Port0(t *testing.T) {
-	data := validWorkload()
-	data.Ports["bar"] = &pbcatalog.WorkloadPort{Port: 0}
-
-	res := createWorkloadResource(t, data)
-
-	err := ValidateWorkload(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "port",
-		Wrapped: errInvalidPhysicalPort,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateWorkload_PortTooHigh(t *testing.T) {
-	data := validWorkload()
-	data.Ports["bar"] = &pbcatalog.WorkloadPort{Port: 65536}
-
-	res := createWorkloadResource(t, data)
-
-	err := ValidateWorkload(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "port",
-		Wrapped: errInvalidPhysicalPort,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
-
-func TestValidateWorkload_Locality(t *testing.T) {
-	data := validWorkload()
-	data.Locality = &pbcatalog.Locality{
-		Zone: "1a",
-	}
-
-	res := createWorkloadResource(t, data)
-
-	err := ValidateWorkload(res)
-	require.Error(t, err)
-	expected := resource.ErrInvalidField{
-		Name:    "locality",
-		Wrapped: errLocalityZoneNoRegion,
-	}
-	var actual resource.ErrInvalidField
-	require.ErrorAs(t, err, &actual)
-	require.Equal(t, expected, actual)
-}
diff --git a/internal/controller/api.go b/internal/controller/api.go
deleted file mode 100644
index 5c2fc2e782717..0000000000000
--- a/internal/controller/api.go
+++ /dev/null
@@ -1,260 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controller
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-
-	"github.com/hashicorp/consul/agent/consul/controller/queue"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// ForType begins building a Controller for the given resource type.
-func ForType(managedType *pbresource.Type) Controller {
-	return Controller{managedType: managedType}
-}
-
-// WithReconciler changes the controller's reconciler.
-func (c Controller) WithReconciler(reconciler Reconciler) Controller {
-	if reconciler == nil {
-		panic("reconciler must not be nil")
-	}
-
-	c.reconciler = reconciler
-	return c
-}
-
-// WithWatch adds a watch on the given type/dependency to the controller. mapper
-// will be called to determine which resources must be reconciled as a result of
-// a watched resource changing.
-func (c Controller) WithWatch(watchedType *pbresource.Type, mapper DependencyMapper) Controller {
-	if watchedType == nil {
-		panic("watchedType must not be nil")
-	}
-
-	if mapper == nil {
-		panic("mapper must not be nil")
-	}
-
-	c.watches = append(c.watches, watch{watchedType, mapper})
-	return c
-}
-
-// WithCustomWatch adds a custom watch on the given dependency to the controller. Custom mapper
-// will be called to map events produced by source to the controller's watched type.
-func (c Controller) WithCustomWatch(source *Source, mapper CustomDependencyMapper) Controller {
-	if source == nil {
-		panic("source must not be nil")
-	}
-
-	if mapper == nil {
-		panic("mapper must not be nil")
-	}
-
-	c.customWatches = append(c.customWatches, customWatch{source, mapper})
-	return c
-}
-
-// WithLogger changes the controller's logger.
-func (c Controller) WithLogger(logger hclog.Logger) Controller {
-	if logger == nil {
-		panic("logger must not be nil")
-	}
-
-	c.logger = logger
-	return c
-}
-
-// WithBackoff changes the base and maximum backoff values for the controller's
-// retry rate limiter.
-func (c Controller) WithBackoff(base, max time.Duration) Controller {
-	c.baseBackoff = base
-	c.maxBackoff = max
-	return c
-}
-
-// WithPlacement changes where and how many replicas of the controller will run.
-// In the majority of cases, the default placement (one leader elected instance
-// per cluster) is the most appropriate and you shouldn't need to override it.
-func (c Controller) WithPlacement(placement Placement) Controller {
-	c.placement = placement
-	return c
-}
-
-// String returns a textual description of the controller, useful for debugging.
-func (c Controller) String() string {
-	watchedTypes := make([]string, len(c.watches))
-	for idx, w := range c.watches {
-		watchedTypes[idx] = fmt.Sprintf("%q", resource.ToGVK(w.watchedType))
-	}
-	base, max := c.backoff()
-	return fmt.Sprintf(
-		"<Controller managed_type=%q, watched_types=[%s], backoff=<base=%q, max=%q>, placement=%q>",
-		resource.ToGVK(c.managedType),
-		strings.Join(watchedTypes, ", "),
-		base, max,
-		c.placement,
-	)
-}
-
-func (c Controller) backoff() (time.Duration, time.Duration) {
-	base := c.baseBackoff
-	if base == 0 {
-		base = 5 * time.Millisecond
-	}
-	max := c.maxBackoff
-	if max == 0 {
-		max = 1000 * time.Second
-	}
-	return base, max
-}
-
-// Controller runs a reconciliation loop to respond to changes in resources and
-// their dependencies. It is heavily inspired by Kubernetes' controller pattern:
-// https://kubernetes.io/docs/concepts/architecture/controller/
-//
-// Use the builder methods in this package (starting with ForType) to construct
-// a controller, and then pass it to a Manager to be executed.
-type Controller struct {
-	managedType   *pbresource.Type
-	reconciler    Reconciler
-	logger        hclog.Logger
-	watches       []watch
-	customWatches []customWatch
-	baseBackoff   time.Duration
-	maxBackoff    time.Duration
-	placement     Placement
-}
-
-type watch struct {
-	watchedType *pbresource.Type
-	mapper      DependencyMapper
-}
-
-// Watch is responsible for watching for custom events from source and adding them to
-// the event queue.
-func (s *Source) Watch(ctx context.Context, add func(e Event)) error {
-	for {
-		select {
-		case <-ctx.Done():
-			return nil
-		case evt, ok := <-s.Source:
-			if !ok {
-				return nil
-			}
-			add(evt)
-		}
-	}
-}
-
-// Source is used as a generic source of events. This can be used when events aren't coming from resources
-// stored by the resource API.
-type Source struct {
-	Source <-chan Event
-}
-
-// Event captures an event in the system which the API can choose to respond to.
-type Event struct {
-	Obj queue.ItemType
-}
-
-// Key returns a string that will be used to de-duplicate items in the queue.
-func (e Event) Key() string {
-	return e.Obj.Key()
-}
-
-// customWatch represent a Watch on a custom Event source and a Mapper to map said
-// Events into Requests that the controller can respond to.
-type customWatch struct {
-	source *Source
-	mapper CustomDependencyMapper
-}
-
-// Request represents a request to reconcile the resource with the given ID.
-type Request struct {
-	// ID of the resource that needs to be reconciled.
-	ID *pbresource.ID
-}
-
-// Key satisfies the queue.ItemType interface. It returns a string which will be
-// used to de-duplicate requests in the queue.
-func (r Request) Key() string {
-	return fmt.Sprintf(
-		"part=%q,peer=%q,ns=%q,name=%q,uid=%q",
-		r.ID.Tenancy.Partition,
-		r.ID.Tenancy.PeerName,
-		r.ID.Tenancy.Namespace,
-		r.ID.Name,
-		r.ID.Uid,
-	)
-}
-
-// Runtime contains the dependencies required by reconcilers.
-type Runtime struct {
-	Client pbresource.ResourceServiceClient
-	Logger hclog.Logger
-}
-
-// Reconciler implements the business logic of a controller.
-type Reconciler interface {
-	// Reconcile the resource identified by req.ID.
-	Reconcile(ctx context.Context, rt Runtime, req Request) error
-}
-
-// Placement determines where and how many replicas of the controller will run.
-type Placement int
-
-const (
-	// PlacementSingleton ensures there is a single, leader-elected, instance of
-	// the controller running in the cluster at any time. It's the default and is
-	// suitable for most use-cases.
-	PlacementSingleton Placement = iota
-
-	// PlacementEachServer ensures there is a replica of the controller running on
-	// each server in the cluster. It is useful for cases where the controller is
-	// responsible for applying some configuration resource to the server whenever
-	// it changes (e.g. rate-limit configuration). Generally, controllers in this
-	// placement mode should not modify resources.
-	PlacementEachServer
-)
-
-// String satisfies the fmt.Stringer interface.
-func (p Placement) String() string {
-	switch p {
-	case PlacementSingleton:
-		return "singleton"
-	case PlacementEachServer:
-		return "each-server"
-	}
-	panic(fmt.Sprintf("unknown placement %d", p))
-}
-
-// RequeueAfterError is an error that allows a Reconciler to override the
-// exponential backoff behavior of the Controller, rather than applying
-// the backoff algorithm, returning a RequeueAfterError will cause the
-// Controller to reschedule the Request at a given time in the future.
-type RequeueAfterError time.Duration
-
-// Error implements the error interface.
-func (r RequeueAfterError) Error() string {
-	return fmt.Sprintf("requeue at %s", time.Duration(r))
-}
-
-// RequeueAfter constructs a RequeueAfterError with the given duration
-// setting.
-func RequeueAfter(after time.Duration) error {
-	return RequeueAfterError(after)
-}
-
-// RequeueNow constructs a RequeueAfterError that reschedules the Request
-// immediately.
-func RequeueNow() error {
-	return RequeueAfterError(0)
-}
diff --git a/internal/controller/api_test.go b/internal/controller/api_test.go
deleted file mode 100644
index 40d3ec99bebdb..0000000000000
--- a/internal/controller/api_test.go
+++ /dev/null
@@ -1,314 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controller_test
-
-import (
-	"context"
-	"errors"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestController_API(t *testing.T) {
-	t.Parallel()
-
-	rec := newTestReconciler()
-	client := svctest.RunResourceService(t, demo.RegisterTypes)
-
-	concertsChan := make(chan controller.Event)
-	defer close(concertsChan)
-	concertSource := &controller.Source{Source: concertsChan}
-	concertMapper := func(ctx context.Context, rt controller.Runtime, event controller.Event) ([]controller.Request, error) {
-		artistID := event.Obj.(*Concert).artistID
-		var requests []controller.Request
-		requests = append(requests, controller.Request{ID: artistID})
-		return requests, nil
-	}
-
-	ctrl := controller.
-		ForType(demo.TypeV2Artist).
-		WithWatch(demo.TypeV2Album, controller.MapOwner).
-		WithCustomWatch(concertSource, concertMapper).
-		WithBackoff(10*time.Millisecond, 100*time.Millisecond).
-		WithReconciler(rec)
-
-	mgr := controller.NewManager(client, testutil.Logger(t))
-	mgr.Register(ctrl)
-	mgr.SetRaftLeader(true)
-	go mgr.Run(testContext(t))
-
-	t.Run("managed resource type", func(t *testing.T) {
-		res, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-		require.NoError(t, err)
-
-		req := rec.wait(t)
-		prototest.AssertDeepEqual(t, rsp.Resource.Id, req.ID)
-	})
-
-	t.Run("watched resource type", func(t *testing.T) {
-		res, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-		require.NoError(t, err)
-
-		req := rec.wait(t)
-		prototest.AssertDeepEqual(t, rsp.Resource.Id, req.ID)
-
-		rec.expectNoRequest(t, 500*time.Millisecond)
-
-		album, err := demo.GenerateV2Album(rsp.Resource.Id)
-		require.NoError(t, err)
-
-		_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: album})
-		require.NoError(t, err)
-
-		req = rec.wait(t)
-		prototest.AssertDeepEqual(t, rsp.Resource.Id, req.ID)
-	})
-
-	t.Run("custom watched resource type", func(t *testing.T) {
-		res, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-		require.NoError(t, err)
-
-		req := rec.wait(t)
-		prototest.AssertDeepEqual(t, rsp.Resource.Id, req.ID)
-
-		rec.expectNoRequest(t, 500*time.Millisecond)
-
-		concertsChan <- controller.Event{Obj: &Concert{name: "test-concert", artistID: rsp.Resource.Id}}
-
-		watchedReq := rec.wait(t)
-		prototest.AssertDeepEqual(t, req.ID, watchedReq.ID)
-
-		otherArtist, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		concertsChan <- controller.Event{Obj: &Concert{name: "test-concert", artistID: otherArtist.Id}}
-
-		watchedReq = rec.wait(t)
-		prototest.AssertDeepEqual(t, otherArtist.Id, watchedReq.ID)
-	})
-
-	t.Run("error retries", func(t *testing.T) {
-		rec.failNext(errors.New("KABOOM"))
-
-		res, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-		require.NoError(t, err)
-
-		req := rec.wait(t)
-		prototest.AssertDeepEqual(t, rsp.Resource.Id, req.ID)
-
-		// Reconciler should be called with the same request again.
-		req = rec.wait(t)
-		prototest.AssertDeepEqual(t, rsp.Resource.Id, req.ID)
-	})
-
-	t.Run("panic retries", func(t *testing.T) {
-		rec.panicNext("KABOOM")
-
-		res, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-		require.NoError(t, err)
-
-		req := rec.wait(t)
-		prototest.AssertDeepEqual(t, rsp.Resource.Id, req.ID)
-
-		// Reconciler should be called with the same request again.
-		req = rec.wait(t)
-		prototest.AssertDeepEqual(t, rsp.Resource.Id, req.ID)
-	})
-
-	t.Run("defer", func(t *testing.T) {
-		rec.failNext(controller.RequeueAfter(1 * time.Second))
-
-		res, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-		require.NoError(t, err)
-
-		req := rec.wait(t)
-		prototest.AssertDeepEqual(t, rsp.Resource.Id, req.ID)
-
-		rec.expectNoRequest(t, 750*time.Millisecond)
-
-		req = rec.wait(t)
-		prototest.AssertDeepEqual(t, rsp.Resource.Id, req.ID)
-	})
-}
-
-func TestController_Placement(t *testing.T) {
-	t.Parallel()
-
-	t.Run("singleton", func(t *testing.T) {
-		rec := newTestReconciler()
-		client := svctest.RunResourceService(t, demo.RegisterTypes)
-
-		ctrl := controller.
-			ForType(demo.TypeV2Artist).
-			WithWatch(demo.TypeV2Album, controller.MapOwner).
-			WithPlacement(controller.PlacementSingleton).
-			WithReconciler(rec)
-
-		mgr := controller.NewManager(client, testutil.Logger(t))
-		mgr.Register(ctrl)
-		go mgr.Run(testContext(t))
-
-		res, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		// Reconciler should not be called until we're the Raft leader.
-		_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-		require.NoError(t, err)
-		rec.expectNoRequest(t, 500*time.Millisecond)
-
-		// Become the leader and check the reconciler is called.
-		mgr.SetRaftLeader(true)
-		_ = rec.wait(t)
-
-		// Should not be called after losing leadership.
-		mgr.SetRaftLeader(false)
-		_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-		require.NoError(t, err)
-		rec.expectNoRequest(t, 500*time.Millisecond)
-	})
-
-	t.Run("each server", func(t *testing.T) {
-		rec := newTestReconciler()
-		client := svctest.RunResourceService(t, demo.RegisterTypes)
-
-		ctrl := controller.
-			ForType(demo.TypeV2Artist).
-			WithWatch(demo.TypeV2Album, controller.MapOwner).
-			WithPlacement(controller.PlacementEachServer).
-			WithReconciler(rec)
-
-		mgr := controller.NewManager(client, testutil.Logger(t))
-		mgr.Register(ctrl)
-		go mgr.Run(testContext(t))
-
-		res, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		// Reconciler should be called even though we're not the Raft leader.
-		_, err = client.Write(testContext(t), &pbresource.WriteRequest{Resource: res})
-		require.NoError(t, err)
-		_ = rec.wait(t)
-	})
-}
-
-func TestController_String(t *testing.T) {
-	ctrl := controller.
-		ForType(demo.TypeV2Artist).
-		WithWatch(demo.TypeV2Album, controller.MapOwner).
-		WithBackoff(5*time.Second, 1*time.Hour).
-		WithPlacement(controller.PlacementEachServer)
-
-	require.Equal(t,
-		`<Controller managed_type="demo.v2.Artist", watched_types=["demo.v2.Album"], backoff=<base="5s", max="1h0m0s">, placement="each-server">`,
-		ctrl.String(),
-	)
-}
-
-func TestController_NoReconciler(t *testing.T) {
-	client := svctest.RunResourceService(t, demo.RegisterTypes)
-	mgr := controller.NewManager(client, testutil.Logger(t))
-
-	ctrl := controller.ForType(demo.TypeV2Artist)
-	require.PanicsWithValue(t,
-		`cannot register controller without a reconciler <Controller managed_type="demo.v2.Artist", watched_types=[], backoff=<base="5ms", max="16m40s">, placement="singleton">`,
-		func() { mgr.Register(ctrl) })
-}
-
-func newTestReconciler() *testReconciler {
-	return &testReconciler{
-		calls:  make(chan controller.Request),
-		errors: make(chan error, 1),
-		panics: make(chan any, 1),
-	}
-}
-
-type testReconciler struct {
-	calls  chan controller.Request
-	errors chan error
-	panics chan any
-}
-
-func (r *testReconciler) Reconcile(_ context.Context, _ controller.Runtime, req controller.Request) error {
-	r.calls <- req
-
-	select {
-	case err := <-r.errors:
-		return err
-	case p := <-r.panics:
-		panic(p)
-	default:
-		return nil
-	}
-}
-
-func (r *testReconciler) failNext(err error) { r.errors <- err }
-func (r *testReconciler) panicNext(p any)    { r.panics <- p }
-
-func (r *testReconciler) expectNoRequest(t *testing.T, duration time.Duration) {
-	t.Helper()
-
-	started := time.Now()
-	select {
-	case req := <-r.calls:
-		t.Fatalf("expected no request for %s, but got: %s after %s", duration, req.ID, time.Since(started))
-	case <-time.After(duration):
-	}
-}
-
-func (r *testReconciler) wait(t *testing.T) controller.Request {
-	t.Helper()
-
-	var req controller.Request
-	select {
-	case req = <-r.calls:
-	case <-time.After(500 * time.Millisecond):
-		t.Fatal("Reconcile was not called after 500ms")
-	}
-	return req
-}
-
-func testContext(t *testing.T) context.Context {
-	t.Helper()
-
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-
-	return ctx
-}
-
-type Concert struct {
-	name     string
-	artistID *pbresource.ID
-}
-
-func (c Concert) Key() string {
-	return c.name
-}
diff --git a/internal/controller/controller.go b/internal/controller/controller.go
deleted file mode 100644
index ac901d355b6e3..0000000000000
--- a/internal/controller/controller.go
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controller
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	"golang.org/x/sync/errgroup"
-
-	"github.com/hashicorp/consul/agent/consul/controller/queue"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// controllerRunner contains the actual implementation of running a controller
-// including creating watches, calling the reconciler, handling retries, etc.
-type controllerRunner struct {
-	ctrl   Controller
-	client pbresource.ResourceServiceClient
-	logger hclog.Logger
-}
-
-func (c *controllerRunner) run(ctx context.Context) error {
-	c.logger.Debug("controller running")
-	defer c.logger.Debug("controller stopping")
-
-	group, groupCtx := errgroup.WithContext(ctx)
-	recQueue := runQueue[Request](groupCtx, c.ctrl)
-
-	// Managed Type Events → Reconciliation Queue
-	group.Go(func() error {
-		return c.watch(groupCtx, c.ctrl.managedType, func(res *pbresource.Resource) {
-			recQueue.Add(Request{ID: res.Id})
-		})
-	})
-
-	for _, w := range c.ctrl.watches {
-		mapQueue := runQueue[mapperRequest](groupCtx, c.ctrl)
-		watcher := w
-		// Watched Type Events → Mapper Queue
-		group.Go(func() error {
-			return c.watch(groupCtx, watcher.watchedType, func(res *pbresource.Resource) {
-				mapQueue.Add(mapperRequest{res: res})
-			})
-		})
-
-		// Mapper Queue → Mapper → Reconciliation Queue
-		group.Go(func() error {
-			return c.runMapper(groupCtx, watcher, mapQueue, recQueue, func(ctx context.Context, runtime Runtime, itemType queue.ItemType) ([]Request, error) {
-				return watcher.mapper(ctx, runtime, itemType.(mapperRequest).res)
-			})
-		})
-	}
-
-	for _, cw := range c.ctrl.customWatches {
-		customMapQueue := runQueue[Event](groupCtx, c.ctrl)
-		watcher := cw
-		// Custom Events → Mapper Queue
-		group.Go(func() error {
-			return watcher.source.Watch(groupCtx, func(e Event) {
-				customMapQueue.Add(e)
-			})
-		})
-
-		// Mapper Queue → Mapper → Reconciliation Queue
-		group.Go(func() error {
-			return c.runCustomMapper(groupCtx, watcher, customMapQueue, recQueue, func(ctx context.Context, runtime Runtime, itemType queue.ItemType) ([]Request, error) {
-				return watcher.mapper(ctx, runtime, itemType.(Event))
-			})
-		})
-	}
-
-	// Reconciliation Queue → Reconciler
-	group.Go(func() error {
-		return c.runReconciler(groupCtx, recQueue)
-	})
-
-	return group.Wait()
-}
-
-func runQueue[T queue.ItemType](ctx context.Context, ctrl Controller) queue.WorkQueue[T] {
-	base, max := ctrl.backoff()
-	return queue.RunWorkQueue[T](ctx, base, max)
-}
-
-func (c *controllerRunner) watch(ctx context.Context, typ *pbresource.Type, add func(*pbresource.Resource)) error {
-	wl, err := c.client.WatchList(ctx, &pbresource.WatchListRequest{
-		Type: typ,
-		Tenancy: &pbresource.Tenancy{
-			Partition: storage.Wildcard,
-			PeerName:  storage.Wildcard,
-			Namespace: storage.Wildcard,
-		},
-	})
-	if err != nil {
-		c.logger.Error("failed to create watch", "error", err)
-		return err
-	}
-
-	for {
-		event, err := wl.Recv()
-		if err != nil {
-			c.logger.Warn("error received from watch", "error", err)
-			return err
-		}
-		add(event.Resource)
-	}
-}
-
-func (c *controllerRunner) runMapper(
-	ctx context.Context,
-	w watch,
-	from queue.WorkQueue[mapperRequest],
-	to queue.WorkQueue[Request],
-	mapper func(ctx context.Context, runtime Runtime, itemType queue.ItemType) ([]Request, error),
-) error {
-	logger := c.logger.With("watched_resource_type", resource.ToGVK(w.watchedType))
-
-	for {
-		item, shutdown := from.Get()
-		if shutdown {
-			return nil
-		}
-
-		if err := c.doMap(ctx, mapper, to, item, logger); err != nil {
-			from.AddRateLimited(item)
-			from.Done(item)
-			continue
-		}
-
-		from.Forget(item)
-		from.Done(item)
-	}
-}
-
-func (c *controllerRunner) runCustomMapper(
-	ctx context.Context,
-	cw customWatch,
-	from queue.WorkQueue[Event],
-	to queue.WorkQueue[Request],
-	mapper func(ctx context.Context, runtime Runtime, itemType queue.ItemType) ([]Request, error),
-) error {
-	logger := c.logger.With("watched_event", cw.source)
-
-	for {
-		item, shutdown := from.Get()
-		if shutdown {
-			return nil
-		}
-
-		if err := c.doMap(ctx, mapper, to, item, logger); err != nil {
-			from.AddRateLimited(item)
-			from.Done(item)
-			continue
-		}
-
-		from.Forget(item)
-		from.Done(item)
-	}
-}
-
-func (c *controllerRunner) doMap(ctx context.Context, mapper func(ctx context.Context, runtime Runtime, itemType queue.ItemType) ([]Request, error), to queue.WorkQueue[Request], item queue.ItemType, logger hclog.Logger) error {
-	var reqs []Request
-	if err := c.handlePanic(func() error {
-		var err error
-		reqs, err = mapper(ctx, c.runtime(), item)
-		return err
-	}); err != nil {
-		return err
-	}
-
-	for _, r := range reqs {
-		if !resource.EqualType(r.ID.Type, c.ctrl.managedType) {
-			logger.Error("dependency mapper returned request for a resource of the wrong type",
-				"type_expected", resource.ToGVK(c.ctrl.managedType),
-				"type_got", resource.ToGVK(r.ID.Type),
-			)
-			continue
-		}
-		to.Add(r)
-	}
-	return nil
-}
-
-func (c *controllerRunner) runReconciler(ctx context.Context, queue queue.WorkQueue[Request]) error {
-	for {
-		req, shutdown := queue.Get()
-		if shutdown {
-			return nil
-		}
-
-		c.logger.Trace("handling request", "request", req)
-		err := c.handlePanic(func() error {
-			return c.ctrl.reconciler.Reconcile(ctx, c.runtime(), req)
-		})
-		if err == nil {
-			queue.Forget(req)
-		} else {
-			var requeueAfter RequeueAfterError
-			if errors.As(err, &requeueAfter) {
-				queue.Forget(req)
-				queue.AddAfter(req, time.Duration(requeueAfter))
-			} else {
-				queue.AddRateLimited(req)
-			}
-		}
-		queue.Done(req)
-	}
-}
-
-func (c *controllerRunner) handlePanic(fn func() error) (err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			stack := hclog.Stacktrace()
-			c.logger.Error("controller panic",
-				"panic", r,
-				"stack", stack,
-			)
-			err = fmt.Errorf("panic [recovered]: %v", r)
-			return
-		}
-	}()
-
-	return fn()
-}
-
-func (c *controllerRunner) runtime() Runtime {
-	return Runtime{
-		Client: c.client,
-		Logger: c.logger,
-	}
-}
-
-type mapperRequest struct{ res *pbresource.Resource }
-
-// Key satisfies the queue.ItemType interface. It returns a string which will be
-// used to de-duplicate requests in the queue.
-func (i mapperRequest) Key() string {
-	return fmt.Sprintf(
-		"type=%q,part=%q,peer=%q,ns=%q,name=%q,uid=%q",
-		resource.ToGVK(i.res.Id.Type),
-		i.res.Id.Tenancy.Partition,
-		i.res.Id.Tenancy.PeerName,
-		i.res.Id.Tenancy.Namespace,
-		i.res.Id.Name,
-		i.res.Id.Uid,
-	)
-}
diff --git a/internal/controller/dependency_mappers.go b/internal/controller/dependency_mappers.go
deleted file mode 100644
index 1ac331ffafdd4..0000000000000
--- a/internal/controller/dependency_mappers.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controller
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// DependencyMapper is called when a dependency watched via WithWatch is changed
-// to determine which of the controller's managed resources need to be reconciled.
-type DependencyMapper func(
-	ctx context.Context,
-	rt Runtime,
-	res *pbresource.Resource,
-) ([]Request, error)
-
-// CustomDependencyMapper is called when an Event occurs to determine which of the
-// controller's managed resources need to be reconciled.
-type CustomDependencyMapper func(
-	ctx context.Context,
-	rt Runtime,
-	event Event,
-) ([]Request, error)
-
-// MapOwner implements a DependencyMapper that returns the updated resource's owner.
-func MapOwner(_ context.Context, _ Runtime, res *pbresource.Resource) ([]Request, error) {
-	var reqs []Request
-	if res.Owner != nil {
-		reqs = append(reqs, Request{ID: res.Owner})
-	}
-	return reqs, nil
-}
-
-// MapOwnerFiltered creates a DependencyMapper that returns owner IDs as Requests
-// if the type of the owner ID matches the given filter type.
-func MapOwnerFiltered(filter *pbresource.Type) DependencyMapper {
-	return func(_ context.Context, _ Runtime, res *pbresource.Resource) ([]Request, error) {
-		if res.Owner == nil {
-			return nil, nil
-		}
-
-		if !resource.EqualType(res.Owner.GetType(), filter) {
-			return nil, nil
-		}
-
-		return []Request{{ID: res.Owner}}, nil
-	}
-}
-
-// ReplaceType creates a DependencyMapper that returns request IDs with the same
-// name and tenancy as the original resource but with the type replaced with
-// the type specified as this functions parameter.
-func ReplaceType(desiredType *pbresource.Type) DependencyMapper {
-	return func(_ context.Context, _ Runtime, res *pbresource.Resource) ([]Request, error) {
-		return []Request{
-			{
-				ID: &pbresource.ID{
-					Type:    desiredType,
-					Tenancy: res.Id.Tenancy,
-					Name:    res.Id.Name,
-				},
-			},
-		}, nil
-	}
-}
diff --git a/internal/controller/dependency_mappers_test.go b/internal/controller/dependency_mappers_test.go
deleted file mode 100644
index b9956cdb71f48..0000000000000
--- a/internal/controller/dependency_mappers_test.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controller
-
-import (
-	"context"
-	"testing"
-
-	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/stretchr/testify/require"
-)
-
-func resourceID(group string, version string, kind string, name string) *pbresource.ID {
-	return &pbresource.ID{
-		Type: &pbresource.Type{
-			Group:        group,
-			GroupVersion: version,
-			Kind:         kind,
-		},
-		Tenancy: &pbresource.Tenancy{
-			Partition: "default",
-			Namespace: "default",
-			PeerName:  "local",
-		},
-		Name: name,
-	}
-}
-
-func TestMapOwner(t *testing.T) {
-	owner := resourceID("foo", "v99", "bar", "object")
-
-	res := &pbresource.Resource{
-		Id:    resourceID("something", "v1", "else", "x"),
-		Owner: owner,
-	}
-
-	reqs, err := MapOwner(context.Background(), Runtime{}, res)
-	require.NoError(t, err)
-	require.Len(t, reqs, 1)
-	prototest.AssertDeepEqual(t, owner, reqs[0].ID)
-}
-
-func TestMapOwnerFiltered(t *testing.T) {
-	mapper := MapOwnerFiltered(&pbresource.Type{
-		Group:        "foo",
-		GroupVersion: "v1",
-		Kind:         "bar",
-	})
-
-	type testCase struct {
-		owner   *pbresource.ID
-		matches bool
-	}
-
-	cases := map[string]testCase{
-		"nil-owner": {
-			owner:   nil,
-			matches: false,
-		},
-		"group-mismatch": {
-			owner:   resourceID("other", "v1", "bar", "irrelevant"),
-			matches: false,
-		},
-		"group-version-mismatch": {
-			owner:   resourceID("foo", "v2", "bar", "irrelevant"),
-			matches: false,
-		},
-		"kind-mismatch": {
-			owner:   resourceID("foo", "v1", "baz", "irrelevant"),
-			matches: false,
-		},
-		"match": {
-			owner:   resourceID("foo", "v1", "bar", "irrelevant"),
-			matches: true,
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			// the runtime is not used by the mapper so its fine to pass an empty struct
-			req, err := mapper(context.Background(), Runtime{}, &pbresource.Resource{
-				Id:    resourceID("foo", "v1", "other", "x"),
-				Owner: tcase.owner,
-			})
-
-			// The mapper has no error paths at present
-			require.NoError(t, err)
-
-			if tcase.matches {
-				require.NotNil(t, req)
-				require.Len(t, req, 1)
-				prototest.AssertDeepEqual(t, req[0].ID, tcase.owner, cmpopts.EquateEmpty())
-			} else {
-				require.Nil(t, req)
-			}
-		})
-	}
-}
-
-func TestReplaceType(t *testing.T) {
-	rtype := &pbresource.Type{
-		Group:        "foo",
-		GroupVersion: "v1",
-		Kind:         "bar",
-	}
-
-	tenant := &pbresource.Tenancy{
-		Partition: "not",
-		Namespace: "using",
-		PeerName:  "the-defaults",
-	}
-
-	in := &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "other",
-				GroupVersion: "v2",
-				Kind:         "baz",
-			},
-			Tenancy: tenant,
-			Name:    "arr-matey",
-		},
-	}
-
-	mapper := ReplaceType(rtype)
-
-	reqs, err := mapper(nil, Runtime{}, in)
-	require.NoError(t, err)
-	require.Len(t, reqs, 1)
-
-	expected := &pbresource.ID{
-		Type:    rtype,
-		Tenancy: tenant,
-		Name:    "arr-matey",
-	}
-	prototest.AssertDeepEqual(t, expected, reqs[0].ID)
-}
diff --git a/internal/controller/doc.go b/internal/controller/doc.go
deleted file mode 100644
index db7d944e932e8..0000000000000
--- a/internal/controller/doc.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Package controller provides an API for implementing control loops on top of
-// Consul resources. It is heavily inspired by [Kubebuilder] and the Kubernetes
-// [controller runtime].
-//
-// [Kubebuilder]: https://github.com/kubernetes-sigs/kubebuilder
-// [controller runtime]: https://github.com/kubernetes-sigs/controller-runtime
-package controller
diff --git a/internal/controller/helper.go b/internal/controller/helper.go
deleted file mode 100644
index 431ca5e6f3cef..0000000000000
--- a/internal/controller/helper.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controller
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// MakeRequests accepts a list of pbresource.ID and pbresource.Reference items,
-// and mirrors them into a slice of []controller.Request items where the Type
-// of the items has replaced by 'typ'.
-func MakeRequests[V resource.ReferenceOrID](
-	typ *pbresource.Type,
-	refs []V,
-) []Request {
-	if len(refs) == 0 {
-		return nil
-	}
-
-	out := make([]Request, 0, len(refs))
-	for _, ref := range refs {
-		// if type is not provided, we will use the type in the ID or reference.
-		if typ == nil {
-			typ = ref.GetType()
-		}
-		out = append(out, Request{
-			ID: &pbresource.ID{
-				Type:    typ,
-				Tenancy: ref.GetTenancy(),
-				Name:    ref.GetName(),
-			},
-		})
-	}
-
-	return out
-}
diff --git a/internal/controller/helper_test.go b/internal/controller/helper_test.go
deleted file mode 100644
index 47509e7a952e1..0000000000000
--- a/internal/controller/helper_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controller
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestMakeRequests(t *testing.T) {
-	redType := &pbresource.Type{
-		Group:        "colors",
-		GroupVersion: "vfake",
-		Kind:         "red",
-	}
-	blueType := &pbresource.Type{
-		Group:        "colors",
-		GroupVersion: "vfake",
-		Kind:         "blue",
-	}
-
-	casparID := &pbresource.ID{
-		Type:    redType,
-		Tenancy: resource.DefaultNamespacedTenancy(),
-		Name:    "caspar",
-		Uid:     "ignored",
-	}
-	babypantsID := &pbresource.ID{
-		Type:    redType,
-		Tenancy: resource.DefaultNamespacedTenancy(),
-		Name:    "babypants",
-		Uid:     "ignored",
-	}
-	zimRef := &pbresource.Reference{
-		Type:    redType,
-		Tenancy: resource.DefaultNamespacedTenancy(),
-		Name:    "zim",
-		Section: "ignored",
-	}
-	girRef := &pbresource.Reference{
-		Type:    redType,
-		Tenancy: resource.DefaultNamespacedTenancy(),
-		Name:    "gir",
-		Section: "ignored",
-	}
-
-	newBlueReq := func(name string) Request {
-		return Request{
-			ID: &pbresource.ID{
-				Type:    blueType,
-				Tenancy: resource.DefaultNamespacedTenancy(),
-				Name:    name,
-			},
-		}
-	}
-
-	require.Nil(t, MakeRequests[*pbresource.ID](blueType, nil))
-	require.Nil(t, MakeRequests[*pbresource.Reference](blueType, nil))
-
-	prototest.AssertElementsMatch(t, []Request{
-		newBlueReq("caspar"), newBlueReq("babypants"),
-	}, MakeRequests[*pbresource.ID](blueType, []*pbresource.ID{
-		casparID, babypantsID,
-	}))
-
-	prototest.AssertElementsMatch(t, []Request{
-		newBlueReq("gir"), newBlueReq("zim"),
-	}, MakeRequests[*pbresource.Reference](blueType, []*pbresource.Reference{
-		girRef, zimRef,
-	}))
-}
diff --git a/internal/controller/lease.go b/internal/controller/lease.go
deleted file mode 100644
index 596bd2546bce7..0000000000000
--- a/internal/controller/lease.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controller
-
-// Lease is used to ensure controllers are run as singletons (i.e. one leader-
-// elected instance per cluster).
-//
-// Currently, this is just an abstraction over Raft leadership. In the future,
-// we'll build a backend-agnostic leasing system into the Resource Service which
-// will allow us to balance controllers between many servers.
-type Lease interface {
-	// Held returns whether we are the current lease-holders.
-	Held() bool
-
-	// Changed returns a channel on which you can receive notifications whenever
-	// the lease is acquired or lost.
-	Changed() <-chan struct{}
-}
-
-type raftLease struct {
-	m  *Manager
-	ch <-chan struct{}
-}
-
-func (l *raftLease) Held() bool               { return l.m.raftLeader.Load() }
-func (l *raftLease) Changed() <-chan struct{} { return l.ch }
-
-type eternalLease struct{}
-
-func (eternalLease) Held() bool               { return true }
-func (eternalLease) Changed() <-chan struct{} { return nil }
diff --git a/internal/controller/manager.go b/internal/controller/manager.go
deleted file mode 100644
index 1e7e910210616..0000000000000
--- a/internal/controller/manager.go
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controller
-
-import (
-	"context"
-	"fmt"
-	"sync"
-	"sync/atomic"
-
-	"github.com/hashicorp/go-hclog"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// Manager is responsible for scheduling the execution of controllers.
-type Manager struct {
-	client pbresource.ResourceServiceClient
-	logger hclog.Logger
-
-	raftLeader atomic.Bool
-
-	mu          sync.Mutex
-	running     bool
-	controllers []Controller
-	leaseChans  []chan struct{}
-}
-
-// NewManager creates a Manager. logger will be used by the Manager, and as the
-// base logger for controllers when one is not specified using WithLogger.
-func NewManager(client pbresource.ResourceServiceClient, logger hclog.Logger) *Manager {
-	return &Manager{
-		client: client,
-		logger: logger,
-	}
-}
-
-// Register the given controller to be executed by the Manager. Cannot be called
-// once the Manager is running.
-func (m *Manager) Register(ctrl Controller) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.running {
-		panic("cannot register additional controllers after calling Run")
-	}
-
-	if ctrl.reconciler == nil {
-		panic(fmt.Sprintf("cannot register controller without a reconciler %s", ctrl))
-	}
-
-	m.controllers = append(m.controllers, ctrl)
-}
-
-// Run the Manager and start executing controllers until the given context is
-// canceled. Cannot be called more than once.
-func (m *Manager) Run(ctx context.Context) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.running {
-		panic("cannot call Run more than once")
-	}
-	m.running = true
-
-	for _, desc := range m.controllers {
-		logger := desc.logger
-		if logger == nil {
-			logger = m.logger.With("managed_type", resource.ToGVK(desc.managedType))
-		}
-
-		runner := &controllerRunner{
-			ctrl:   desc,
-			client: m.client,
-			logger: logger,
-		}
-		go newSupervisor(runner.run, m.newLeaseLocked(desc)).run(ctx)
-	}
-}
-
-// SetRaftLeader notifies the Manager of Raft leadership changes. Controllers
-// are currently only executed on the Raft leader, so calling this method will
-// cause the Manager to spin them up/down accordingly.
-func (m *Manager) SetRaftLeader(leader bool) {
-	m.raftLeader.Store(leader)
-
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	for _, ch := range m.leaseChans {
-		select {
-		case ch <- struct{}{}:
-		default:
-			// Do not block if there's nothing receiving on ch (because the supervisor is
-			// busy doing something else). Note that ch has a buffer of 1, so we'll never
-			// miss the notification that something has changed so we need to re-evaluate
-			// the lease.
-		}
-	}
-}
-
-func (m *Manager) newLeaseLocked(ctrl Controller) Lease {
-	if ctrl.placement == PlacementEachServer {
-		return eternalLease{}
-	}
-
-	ch := make(chan struct{}, 1)
-	m.leaseChans = append(m.leaseChans, ch)
-	return &raftLease{m: m, ch: ch}
-}
diff --git a/internal/controller/supervisor.go b/internal/controller/supervisor.go
deleted file mode 100644
index 4abb841f60e0f..0000000000000
--- a/internal/controller/supervisor.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controller
-
-import (
-	"context"
-	"time"
-
-	"github.com/hashicorp/consul/lib/retry"
-)
-
-// flapThreshold is the minimum amount of time between restarts for us *not* to
-// consider a controller to be stuck in a crash-loop.
-const flapThreshold = 2 * time.Second
-
-// supervisor keeps a task running, restarting it on-error, for as long as the
-// given lease is held. When the lease is lost, the context given to the task
-// will be canceled. If the task persistently fails (i.e. the controller is in
-// a crash-loop) supervisor will use exponential backoff to delay restarts.
-type supervisor struct {
-	task  task
-	lease Lease
-
-	running    bool
-	startedAt  time.Time
-	errCh      chan error
-	cancelTask context.CancelFunc
-
-	backoff        *retry.Waiter
-	backoffUntil   time.Time
-	backoffTimerCh <-chan time.Time
-}
-
-func newSupervisor(task task, lease Lease) *supervisor {
-	return &supervisor{
-		task:  task,
-		lease: lease,
-		errCh: make(chan error),
-		backoff: &retry.Waiter{
-			MinFailures: 1,
-			MinWait:     500 * time.Millisecond,
-			MaxWait:     time.Minute,
-			Jitter:      retry.NewJitter(25),
-		},
-	}
-}
-
-type task func(context.Context) error
-
-func (s *supervisor) run(ctx context.Context) {
-	for {
-		if s.shouldStart() {
-			s.startTask(ctx)
-		} else if s.shouldStop() {
-			s.stopTask()
-		}
-
-		select {
-		// Outer context canceled.
-		case <-ctx.Done():
-			if s.cancelTask != nil {
-				s.cancelTask()
-			}
-			return
-
-		// Task stopped running.
-		case <-s.errCh:
-			stopBackoffTimer := s.handleError()
-			if stopBackoffTimer != nil {
-				defer stopBackoffTimer()
-			}
-
-		// Unblock when the lease is acquired/lost, or the backoff timer fires.
-		case <-s.lease.Changed():
-		case <-s.backoffTimerCh:
-		}
-	}
-}
-
-func (s *supervisor) shouldStart() bool {
-	if s.running {
-		return false
-	}
-
-	if !s.lease.Held() {
-		return false
-	}
-
-	if time.Now().Before(s.backoffUntil) {
-		return false
-	}
-
-	return true
-}
-
-func (s *supervisor) startTask(ctx context.Context) {
-	if s.cancelTask != nil {
-		s.cancelTask()
-	}
-
-	taskCtx, cancelTask := context.WithCancel(ctx)
-	s.cancelTask = cancelTask
-	s.startedAt = time.Now()
-	s.running = true
-
-	go func() {
-		err := s.task(taskCtx)
-
-		select {
-		case s.errCh <- err:
-		case <-ctx.Done():
-		}
-	}()
-}
-
-func (s *supervisor) shouldStop() bool {
-	return s.running && !s.lease.Held()
-}
-
-func (s *supervisor) stopTask() {
-	s.cancelTask()
-	s.backoff.Reset()
-	s.running = false
-}
-
-func (s *supervisor) handleError() func() bool {
-	s.running = false
-
-	if time.Since(s.startedAt) > flapThreshold {
-		s.backoff.Reset()
-		s.backoffUntil = time.Time{}
-	} else {
-		delay := s.backoff.WaitDuration()
-		s.backoffUntil = time.Now().Add(delay)
-
-		timer := time.NewTimer(delay)
-		s.backoffTimerCh = timer.C
-		return timer.Stop
-	}
-
-	return nil
-}
diff --git a/internal/controller/supervisor_test.go b/internal/controller/supervisor_test.go
deleted file mode 100644
index e455565d88b76..0000000000000
--- a/internal/controller/supervisor_test.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controller
-
-import (
-	"context"
-	"errors"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-func TestSupervise(t *testing.T) {
-	t.Parallel()
-
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-
-	runCh := make(chan struct{})
-	stopCh := make(chan struct{})
-	errCh := make(chan error)
-
-	task := func(taskCtx context.Context) error {
-		runCh <- struct{}{}
-
-		select {
-		case err := <-errCh:
-			return err
-		case <-taskCtx.Done():
-			stopCh <- struct{}{}
-			return taskCtx.Err()
-		}
-	}
-
-	lease := newTestLease()
-
-	go newSupervisor(task, lease).run(ctx)
-
-	select {
-	case <-runCh:
-		t.Fatal("task should not be running before lease is held")
-	case <-time.After(500 * time.Millisecond):
-	}
-
-	lease.acquired()
-
-	select {
-	case <-runCh:
-	case <-time.After(500 * time.Millisecond):
-		t.Fatal("task not running after lease is acquired")
-	}
-
-	select {
-	case <-stopCh:
-		t.Fatal("task should not have stopped before lease is lost")
-	case <-time.After(500 * time.Millisecond):
-	}
-
-	lease.lost()
-
-	select {
-	case <-stopCh:
-	case <-time.After(500 * time.Millisecond):
-		t.Fatal("task still running after lease was lost")
-	}
-
-	select {
-	case <-runCh:
-		t.Fatal("task should not be run again before lease is re-acquired")
-	case <-time.After(500 * time.Millisecond):
-	}
-
-	lease.acquired()
-
-	select {
-	case <-runCh:
-	case <-time.After(500 * time.Millisecond):
-		t.Fatal("task not running after lease is re-acquired")
-	}
-
-	errCh <- errors.New("KABOOM")
-
-	select {
-	case <-runCh:
-	case <-time.After(2 * time.Second):
-		t.Fatal("task was not restarted")
-	}
-
-	cancel()
-
-	select {
-	case <-stopCh:
-	case <-time.After(500 * time.Millisecond):
-		t.Fatal("task still running after parent context was canceled")
-	}
-}
-
-func newTestLease() *testLease {
-	return &testLease{ch: make(chan struct{}, 1)}
-}
-
-type testLease struct {
-	held atomic.Bool
-	ch   chan struct{}
-}
-
-func (l *testLease) Held() bool               { return l.held.Load() }
-func (l *testLease) Changed() <-chan struct{} { return l.ch }
-
-func (l *testLease) acquired() { l.setHeld(true) }
-func (l *testLease) lost()     { l.setHeld(false) }
-
-func (l *testLease) setHeld(held bool) {
-	l.held.Store(held)
-
-	select {
-	case l.ch <- struct{}{}:
-	default:
-	}
-}
diff --git a/internal/go-sso/oidcauth/auth.go b/internal/go-sso/oidcauth/auth.go
index a2f35763a3d0e..d1c69744a0838 100644
--- a/internal/go-sso/oidcauth/auth.go
+++ b/internal/go-sso/oidcauth/auth.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // package oidcauth bundles up an opinionated approach to authentication using
 // both the OIDC authorization code workflow and simple JWT decoding (via
 // static keys, JWKS, and OIDC discovery).
diff --git a/internal/go-sso/oidcauth/config.go b/internal/go-sso/oidcauth/config.go
index 84bbac9e0cbe5..49fec039d3593 100644
--- a/internal/go-sso/oidcauth/config.go
+++ b/internal/go-sso/oidcauth/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package oidcauth
 
 import (
diff --git a/internal/go-sso/oidcauth/config_test.go b/internal/go-sso/oidcauth/config_test.go
index c72a69e0845f0..ec3e668dbc1f9 100644
--- a/internal/go-sso/oidcauth/config_test.go
+++ b/internal/go-sso/oidcauth/config_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package oidcauth
 
 import (
diff --git a/internal/go-sso/oidcauth/internal/strutil/util.go b/internal/go-sso/oidcauth/internal/strutil/util.go
index 9cdc0b1acb1c1..73bc6bcb0e938 100644
--- a/internal/go-sso/oidcauth/internal/strutil/util.go
+++ b/internal/go-sso/oidcauth/internal/strutil/util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package strutil
 
 // StrListContains looks for a string in a list of strings.
diff --git a/internal/go-sso/oidcauth/internal/strutil/util_test.go b/internal/go-sso/oidcauth/internal/strutil/util_test.go
index 06d76a6c69d51..3a58ae0caca2c 100644
--- a/internal/go-sso/oidcauth/internal/strutil/util_test.go
+++ b/internal/go-sso/oidcauth/internal/strutil/util_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package strutil
 
 import (
diff --git a/internal/go-sso/oidcauth/jwt.go b/internal/go-sso/oidcauth/jwt.go
index fbb6a31669c8e..c0488f8b3a6b6 100644
--- a/internal/go-sso/oidcauth/jwt.go
+++ b/internal/go-sso/oidcauth/jwt.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package oidcauth
 
 import (
diff --git a/internal/go-sso/oidcauth/jwt_test.go b/internal/go-sso/oidcauth/jwt_test.go
index 621fb6660b537..e43c634d75407 100644
--- a/internal/go-sso/oidcauth/jwt_test.go
+++ b/internal/go-sso/oidcauth/jwt_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package oidcauth
 
 import (
diff --git a/internal/go-sso/oidcauth/oidc.go b/internal/go-sso/oidcauth/oidc.go
index df00dfcc25f60..bd0f5ebd7f6aa 100644
--- a/internal/go-sso/oidcauth/oidc.go
+++ b/internal/go-sso/oidcauth/oidc.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package oidcauth
 
 import (
diff --git a/internal/go-sso/oidcauth/oidc_test.go b/internal/go-sso/oidcauth/oidc_test.go
index 48de99b641812..0de099741326b 100644
--- a/internal/go-sso/oidcauth/oidc_test.go
+++ b/internal/go-sso/oidcauth/oidc_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package oidcauth
 
 import (
diff --git a/internal/go-sso/oidcauth/oidcauthtest/testing.go b/internal/go-sso/oidcauth/oidcauthtest/testing.go
index 0956673c05156..46b1a8ff393f6 100644
--- a/internal/go-sso/oidcauth/oidcauthtest/testing.go
+++ b/internal/go-sso/oidcauth/oidcauthtest/testing.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // package oidcauthtest exposes tools to assist in writing unit tests of OIDC
 // and JWT authentication workflows.
 //
diff --git a/internal/go-sso/oidcauth/oidcjwt.go b/internal/go-sso/oidcauth/oidcjwt.go
index 14a6b4def2ad4..b2df662cd51dc 100644
--- a/internal/go-sso/oidcauth/oidcjwt.go
+++ b/internal/go-sso/oidcauth/oidcjwt.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package oidcauth
 
 import (
diff --git a/internal/go-sso/oidcauth/oidcjwt_test.go b/internal/go-sso/oidcauth/oidcjwt_test.go
index 49574856332a5..814f54c67b220 100644
--- a/internal/go-sso/oidcauth/oidcjwt_test.go
+++ b/internal/go-sso/oidcauth/oidcjwt_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package oidcauth
 
 import (
diff --git a/internal/go-sso/oidcauth/util.go b/internal/go-sso/oidcauth/util.go
index 709798dee6353..c68cae9d65060 100644
--- a/internal/go-sso/oidcauth/util.go
+++ b/internal/go-sso/oidcauth/util.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package oidcauth
 
 import (
diff --git a/internal/go-sso/oidcauth/util_test.go b/internal/go-sso/oidcauth/util_test.go
index 6cf8bae1b3bd4..772e0f1d87556 100644
--- a/internal/go-sso/oidcauth/util_test.go
+++ b/internal/go-sso/oidcauth/util_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package oidcauth
 
 import (
diff --git a/internal/mesh/exports.go b/internal/mesh/exports.go
deleted file mode 100644
index eb2843c56b8f4..0000000000000
--- a/internal/mesh/exports.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package mesh
-
-import (
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/sidecarproxy"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/sidecarproxy/status"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-)
-
-var (
-	// Controller statuses.
-
-	// Sidecar-proxy controller.
-	SidecarProxyStatusKey                                  = sidecarproxy.ControllerName
-	SidecarProxyStatusConditionMeshDestination             = status.StatusConditionDestinationAccepted
-	SidecarProxyStatusReasonNonMeshDestination             = status.StatusReasonMeshProtocolNotFound
-	SidecarProxyStatusReasonMeshDestination                = status.StatusReasonMeshProtocolFound
-	SidecarProxyStatusReasonDestinationServiceNotFound     = status.StatusReasonDestinationServiceNotFound
-	SidecarProxyStatusReasonDestinationServiceFound        = status.StatusReasonDestinationServiceFound
-	SidecarProxyStatusReasonMeshProtocolDestinationPort    = status.StatusReasonMeshProtocolDestinationPort
-	SidecarProxyStatusReasonNonMeshProtocolDestinationPort = status.StatusReasonNonMeshProtocolDestinationPort
-
-	// Routes controller
-	RoutesStatusKey                                                = routes.StatusKey
-	RoutesStatusConditionAccepted                                  = routes.StatusConditionAccepted
-	RoutesStatusConditionAcceptedMissingParentRefReason            = routes.MissingParentRefReason
-	RoutesStatusConditionAcceptedMissingBackendRefReason           = routes.MissingBackendRefReason
-	RoutesStatusConditionAcceptedParentRefOutsideMeshReason        = routes.ParentRefOutsideMeshReason
-	RoutesStatusConditionAcceptedBackendRefOutsideMeshReason       = routes.BackendRefOutsideMeshReason
-	RoutesStatusConditionAcceptedParentRefUsingMeshPortReason      = routes.ParentRefUsingMeshPortReason
-	RoutesStatusConditionAcceptedBackendRefUsingMeshPortReason     = routes.BackendRefUsingMeshPortReason
-	RoutesStatusConditionAcceptedUnknownParentRefPortReason        = routes.UnknownParentRefPortReason
-	RoutesStatusConditionAcceptedUnknownBackendRefPortReason       = routes.UnknownBackendRefPortReason
-	RoutesStatusConditionAcceptedConflictNotBoundToParentRefReason = routes.ConflictNotBoundToParentRefReason
-)
-
-const (
-	// Important constants
-
-	NullRouteBackend = types.NullRouteBackend
-)
-
-// RegisterTypes adds all resource types within the "mesh" API group
-// to the given type registry
-func RegisterTypes(r resource.Registry) {
-	types.Register(r)
-}
-
-// RegisterControllers registers controllers for the mesh types with
-// the given controller Manager.
-func RegisterControllers(mgr *controller.Manager, deps ControllerDependencies) {
-	controllers.Register(mgr, deps)
-}
-
-type TrustDomainFetcher = sidecarproxy.TrustDomainFetcher
-
-type ControllerDependencies = controllers.Dependencies
diff --git a/internal/mesh/internal/cache/sidecarproxycache/computed_routes_cache.go b/internal/mesh/internal/cache/sidecarproxycache/computed_routes_cache.go
deleted file mode 100644
index 92b3a4140cecb..0000000000000
--- a/internal/mesh/internal/cache/sidecarproxycache/computed_routes_cache.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxycache
-
-import (
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/mappers/bimapper"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type ComputedRoutesCache struct {
-	mapper *bimapper.Mapper
-}
-
-func NewComputedRoutesCache() *ComputedRoutesCache {
-	return &ComputedRoutesCache{
-		mapper: bimapper.New(pbmesh.ComputedRoutesType, pbcatalog.ServiceType),
-	}
-}
-
-func (c *ComputedRoutesCache) TrackComputedRoutes(computedRoutes *types.DecodedComputedRoutes) {
-	var serviceRefs []resource.ReferenceOrID
-
-	for _, pcr := range computedRoutes.Data.PortedConfigs {
-		for _, details := range pcr.Targets {
-			serviceRefs = append(serviceRefs, details.BackendRef.Ref)
-		}
-	}
-
-	c.mapper.TrackItem(computedRoutes.Resource.Id, serviceRefs)
-}
-
-func (c *ComputedRoutesCache) UntrackComputedRoutes(computedRoutesID *pbresource.ID) {
-	c.mapper.UntrackItem(computedRoutesID)
-}
-
-func (c *ComputedRoutesCache) ComputedRoutesByService(id resource.ReferenceOrID) []*pbresource.ID {
-	return c.mapper.ItemIDsForLink(id)
-}
diff --git a/internal/mesh/internal/cache/sidecarproxycache/destinations_cache.go b/internal/mesh/internal/cache/sidecarproxycache/destinations_cache.go
deleted file mode 100644
index 4371757e74362..0000000000000
--- a/internal/mesh/internal/cache/sidecarproxycache/destinations_cache.go
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxycache
-
-import (
-	"sync"
-
-	"github.com/hashicorp/consul/internal/mesh/internal/types/intermediate"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// DestinationsCache stores information needed for the sidecar-proxy controller to reconcile efficiently.
-// This currently means storing a list of all destinations for easy look up
-// as well as indices of source proxies where those destinations are referenced.
-//
-// It is the responsibility of the controller and its subcomponents (like mapper and data fetcher)
-// to keep this cache up-to-date as we're observing new data.
-type DestinationsCache struct {
-	lock sync.RWMutex
-
-	// store is a map from destination service reference and port as a reference key
-	// to the object representing destination reference.
-	store       map[ReferenceKeyWithPort]intermediate.CombinedDestinationRef
-	storedPorts map[resource.ReferenceKey]map[string]struct{}
-
-	// sourceProxiesIndex stores a map from a reference key of source proxy IDs
-	// to the keys in the store map.
-	sourceProxiesIndex map[resource.ReferenceKey]storeKeys
-}
-
-type storeKeys map[ReferenceKeyWithPort]struct{}
-
-func NewDestinationsCache() *DestinationsCache {
-	return &DestinationsCache{
-		store:              make(map[ReferenceKeyWithPort]intermediate.CombinedDestinationRef),
-		storedPorts:        make(map[resource.ReferenceKey]map[string]struct{}),
-		sourceProxiesIndex: make(map[resource.ReferenceKey]storeKeys),
-	}
-}
-
-type ReferenceKeyWithPort struct {
-	resource.ReferenceKey
-	port string
-}
-
-func KeyFromRefAndPort(ref *pbresource.Reference, port string) ReferenceKeyWithPort {
-	refKey := resource.NewReferenceKey(ref)
-	return ReferenceKeyWithPort{refKey, port}
-}
-
-// WriteDestination adds destination reference to the cache.
-func (c *DestinationsCache) WriteDestination(d intermediate.CombinedDestinationRef) {
-	// Check that reference is a catalog.Service type.
-	if !resource.EqualType(pbcatalog.ServiceType, d.ServiceRef.Type) {
-		panic("ref must of type catalog.Service")
-	}
-
-	// Also, check that explicit destination reference is a mesh.Upstreams type.
-	if d.ExplicitDestinationsID != nil &&
-		!resource.EqualType(pbmesh.DestinationsType, d.ExplicitDestinationsID.Type) {
-		panic("ExplicitDestinationsID must be of type mesh.Upstreams")
-	}
-
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	c.deleteLocked(d.ServiceRef, d.Port)
-	c.addLocked(d)
-}
-
-// DeleteDestination deletes a given destination reference and port from cache.
-func (c *DestinationsCache) DeleteDestination(ref *pbresource.Reference, port string) {
-	// Check that reference is a catalog.Service type.
-	if !resource.EqualType(pbcatalog.ServiceType, ref.Type) {
-		panic("ref must of type catalog.Service")
-	}
-
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	c.deleteLocked(ref, port)
-}
-
-func (c *DestinationsCache) addLocked(d intermediate.CombinedDestinationRef) {
-	key := KeyFromRefAndPort(d.ServiceRef, d.Port)
-
-	c.store[key] = d
-	c.addPortLocked(d.ServiceRef, d.Port)
-
-	// Update source proxies index.
-	for proxyRef := range d.SourceProxies {
-		_, ok := c.sourceProxiesIndex[proxyRef]
-		if !ok {
-			c.sourceProxiesIndex[proxyRef] = make(storeKeys)
-		}
-
-		c.sourceProxiesIndex[proxyRef][key] = struct{}{}
-	}
-}
-
-func (c *DestinationsCache) addPortLocked(ref *pbresource.Reference, port string) {
-	rk := resource.NewReferenceKey(ref)
-
-	m, ok := c.storedPorts[rk]
-	if !ok {
-		m = make(map[string]struct{})
-		c.storedPorts[rk] = m
-	}
-
-	m[port] = struct{}{}
-}
-
-func (c *DestinationsCache) deleteLocked(ref *pbresource.Reference, port string) {
-	key := KeyFromRefAndPort(ref, port)
-
-	// First get it from the store.
-	dest, ok := c.store[key]
-	if !ok {
-		// If it's not there, return as there's nothing for us to.
-		return
-	}
-
-	// Update source proxies indices.
-	for proxyRef := range dest.SourceProxies {
-		// Delete our destination key from this source proxy.
-		delete(c.sourceProxiesIndex[proxyRef], key)
-	}
-
-	// Finally, delete this destination from the store.
-	delete(c.store, key)
-	c.deletePortLocked(ref, port)
-}
-
-func (c *DestinationsCache) deletePortLocked(ref *pbresource.Reference, port string) {
-	rk := resource.NewReferenceKey(ref)
-
-	m, ok := c.storedPorts[rk]
-	if !ok {
-		return
-	}
-
-	delete(m, port)
-
-	if len(m) == 0 {
-		delete(c.storedPorts, rk)
-	}
-}
-
-// DeleteSourceProxy deletes the source proxy given by id from the cache.
-func (c *DestinationsCache) DeleteSourceProxy(id *pbresource.ID) {
-	// Check that id is the ProxyStateTemplate type.
-	if !resource.EqualType(pbmesh.ProxyStateTemplateType, id.Type) {
-		panic("id must of type mesh.ProxyStateTemplate")
-	}
-
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	proxyIDKey := resource.NewReferenceKey(id)
-
-	// Get all destination keys.
-	destKeys := c.sourceProxiesIndex[proxyIDKey]
-
-	for destKey := range destKeys {
-		// Read destination.
-		dest, ok := c.store[destKey]
-		if !ok {
-			// If there's no destination with that key, skip it as there's nothing for us to do.
-			continue
-		}
-
-		// Delete the source proxy ID.
-		delete(dest.SourceProxies, proxyIDKey)
-	}
-
-	// Finally, delete the index for this proxy.
-	delete(c.sourceProxiesIndex, proxyIDKey)
-}
-
-// ReadDestination returns a destination reference for the given service reference and port.
-func (c *DestinationsCache) ReadDestination(ref *pbresource.Reference, port string) (intermediate.CombinedDestinationRef, bool) {
-	// Check that reference is a catalog.Service type.
-	if !resource.EqualType(pbcatalog.ServiceType, ref.Type) {
-		panic("ref must of type catalog.Service")
-	}
-
-	c.lock.RLock()
-	defer c.lock.RUnlock()
-
-	key := KeyFromRefAndPort(ref, port)
-
-	d, found := c.store[key]
-	return d, found
-}
-
-func (c *DestinationsCache) ReadDestinationsByServiceAllPorts(ref *pbresource.Reference) []intermediate.CombinedDestinationRef {
-	// Check that reference is a catalog.Service type.
-	if !resource.EqualType(pbcatalog.ServiceType, ref.Type) {
-		panic("ref must of type catalog.Service")
-	}
-
-	c.lock.RLock()
-	defer c.lock.RUnlock()
-
-	rk := resource.NewReferenceKey(ref)
-
-	ports, ok := c.storedPorts[rk]
-	if !ok {
-		return nil
-	}
-
-	var destinations []intermediate.CombinedDestinationRef
-	for port := range ports {
-		key := KeyFromRefAndPort(ref, port)
-
-		d, found := c.store[key]
-		if found {
-			destinations = append(destinations, d)
-		}
-	}
-
-	return destinations
-}
-
-// DestinationsBySourceProxy returns all destinations that are a referenced by the given source proxy id.
-func (c *DestinationsCache) DestinationsBySourceProxy(id *pbresource.ID) []intermediate.CombinedDestinationRef {
-	// Check that id is the ProxyStateTemplate type.
-	if !resource.EqualType(pbmesh.ProxyStateTemplateType, id.Type) {
-		panic("id must of type mesh.ProxyStateTemplate")
-	}
-
-	c.lock.RLock()
-	defer c.lock.RUnlock()
-
-	var destinations []intermediate.CombinedDestinationRef
-
-	proxyIDKey := resource.NewReferenceKey(id)
-
-	for destKey := range c.sourceProxiesIndex[proxyIDKey] {
-		destinations = append(destinations, c.store[destKey])
-	}
-
-	return destinations
-}
diff --git a/internal/mesh/internal/cache/sidecarproxycache/destinations_cache_test.go b/internal/mesh/internal/cache/sidecarproxycache/destinations_cache_test.go
deleted file mode 100644
index 0c668eb12c227..0000000000000
--- a/internal/mesh/internal/cache/sidecarproxycache/destinations_cache_test.go
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxycache
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/mesh/internal/types/intermediate"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestWrite_Create(t *testing.T) {
-	cache := NewDestinationsCache()
-
-	proxyID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "service-workload-abc").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	destination := testDestination(proxyID)
-	cache.WriteDestination(destination)
-
-	destKey := KeyFromRefAndPort(destination.ServiceRef, destination.Port)
-	require.Equal(t, destination, cache.store[destKey])
-	actualSourceProxies := cache.sourceProxiesIndex
-	expectedSourceProxies := map[resource.ReferenceKey]storeKeys{
-		resource.NewReferenceKey(proxyID): {destKey: struct{}{}},
-	}
-	require.Equal(t, expectedSourceProxies, actualSourceProxies)
-
-	// Check that we can read back the destination successfully.
-	actualDestination, found := cache.ReadDestination(destination.ServiceRef, destination.Port)
-	require.True(t, found)
-	require.Equal(t, destination, actualDestination)
-}
-
-func TestWrite_Update(t *testing.T) {
-	cache := NewDestinationsCache()
-
-	proxyID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "service-workload-abc").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	destination1 := testDestination(proxyID)
-	cache.WriteDestination(destination1)
-
-	// Add another destination for the same proxy ID.
-	destination2 := testDestination(proxyID)
-	destination2.ServiceRef = resourcetest.Resource(pbcatalog.ServiceType, "test-service-2").ReferenceNoSection()
-	cache.WriteDestination(destination2)
-
-	// Check that the source proxies are updated.
-	actualSourceProxies := cache.sourceProxiesIndex
-	expectedSourceProxies := map[resource.ReferenceKey]storeKeys{
-		resource.NewReferenceKey(proxyID): {
-			KeyFromRefAndPort(destination1.ServiceRef, destination1.Port): struct{}{},
-			KeyFromRefAndPort(destination2.ServiceRef, destination2.Port): struct{}{},
-		},
-	}
-	require.Equal(t, expectedSourceProxies, actualSourceProxies)
-
-	// Add another destination for a different proxy.
-	anotherProxyID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "service-workload-def").ID()
-	destination3 := testDestination(anotherProxyID)
-	destination3.ServiceRef = resourcetest.Resource(pbcatalog.ServiceType, "test-service-3").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ReferenceNoSection()
-	cache.WriteDestination(destination3)
-
-	actualSourceProxies = cache.sourceProxiesIndex
-	expectedSourceProxies = map[resource.ReferenceKey]storeKeys{
-		resource.NewReferenceKey(proxyID): {
-			KeyFromRefAndPort(destination1.ServiceRef, destination1.Port): struct{}{},
-			KeyFromRefAndPort(destination2.ServiceRef, destination2.Port): struct{}{},
-		},
-		resource.NewReferenceKey(anotherProxyID): {
-			KeyFromRefAndPort(destination3.ServiceRef, destination3.Port): struct{}{},
-		},
-	}
-	require.Equal(t, expectedSourceProxies, actualSourceProxies)
-
-	// Overwrite the proxy id completely.
-	destination1.SourceProxies = map[resource.ReferenceKey]struct{}{resource.NewReferenceKey(anotherProxyID): {}}
-	cache.WriteDestination(destination1)
-
-	actualSourceProxies = cache.sourceProxiesIndex
-	expectedSourceProxies = map[resource.ReferenceKey]storeKeys{
-		resource.NewReferenceKey(proxyID): {
-			KeyFromRefAndPort(destination2.ServiceRef, destination2.Port): struct{}{},
-		},
-		resource.NewReferenceKey(anotherProxyID): {
-			KeyFromRefAndPort(destination1.ServiceRef, destination1.Port): struct{}{},
-			KeyFromRefAndPort(destination3.ServiceRef, destination3.Port): struct{}{},
-		},
-	}
-	require.Equal(t, expectedSourceProxies, actualSourceProxies)
-}
-
-func TestWrite_Delete(t *testing.T) {
-	cache := NewDestinationsCache()
-
-	proxyID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "service-workload-abc").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	destination1 := testDestination(proxyID)
-	cache.WriteDestination(destination1)
-
-	// Add another destination for the same proxy ID.
-	destination2 := testDestination(proxyID)
-	destination2.ServiceRef = resourcetest.Resource(pbcatalog.ServiceType, "test-service-2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ReferenceNoSection()
-	cache.WriteDestination(destination2)
-
-	cache.DeleteDestination(destination1.ServiceRef, destination1.Port)
-
-	require.NotContains(t, cache.store, KeyFromRefAndPort(destination1.ServiceRef, destination1.Port))
-
-	// Check that the source proxies are updated.
-	actualSourceProxies := cache.sourceProxiesIndex
-	expectedSourceProxies := map[resource.ReferenceKey]storeKeys{
-		resource.NewReferenceKey(proxyID): {
-			KeyFromRefAndPort(destination2.ServiceRef, destination2.Port): struct{}{},
-		},
-	}
-	require.Equal(t, expectedSourceProxies, actualSourceProxies)
-
-	// Try to delete non-existing destination and check that nothing has changed..
-	cache.DeleteDestination(
-		resourcetest.Resource(pbcatalog.ServiceType, "does-not-exist").
-			WithTenancy(resource.DefaultNamespacedTenancy()).ReferenceNoSection(),
-		"doesn't-matter")
-
-	require.Contains(t, cache.store, KeyFromRefAndPort(destination2.ServiceRef, destination2.Port))
-	require.Equal(t, expectedSourceProxies, cache.sourceProxiesIndex)
-}
-
-func TestDeleteSourceProxy(t *testing.T) {
-	cache := NewDestinationsCache()
-
-	proxyID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "service-workload-abc").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	destination1 := testDestination(proxyID)
-	cache.WriteDestination(destination1)
-
-	// Add another destination for the same proxy ID.
-	destination2 := testDestination(proxyID)
-	destination2.ServiceRef = resourcetest.Resource(pbcatalog.ServiceType, "test-service-2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ReferenceNoSection()
-	cache.WriteDestination(destination2)
-
-	cache.DeleteSourceProxy(proxyID)
-
-	// Check that source proxy index is gone.
-	proxyKey := resource.NewReferenceKey(proxyID)
-	require.NotContains(t, cache.sourceProxiesIndex, proxyKey)
-
-	// Check that the destinations no longer have this proxy as the source.
-	require.NotContains(t, destination1.SourceProxies, proxyKey)
-	require.NotContains(t, destination2.SourceProxies, proxyKey)
-
-	// Try to add a non-existent key to source proxy index
-	cache.sourceProxiesIndex[proxyKey] = map[ReferenceKeyWithPort]struct{}{
-		{port: "doesn't-matter"}: {}}
-	cache.DeleteSourceProxy(proxyID)
-
-	// Check that source proxy index is gone.
-	require.NotContains(t, cache.sourceProxiesIndex, proxyKey)
-
-	// Check that the destinations no longer have this proxy as the source.
-	require.NotContains(t, destination1.SourceProxies, proxyKey)
-	require.NotContains(t, destination2.SourceProxies, proxyKey)
-}
-
-func TestDestinationsBySourceProxy(t *testing.T) {
-	cache := NewDestinationsCache()
-
-	proxyID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "service-workload-abc").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	destination1 := testDestination(proxyID)
-	cache.WriteDestination(destination1)
-
-	// Add another destination for the same proxy ID.
-	destination2 := testDestination(proxyID)
-	destination2.ServiceRef = resourcetest.Resource(pbcatalog.ServiceType, "test-service-2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ReferenceNoSection()
-	cache.WriteDestination(destination2)
-
-	actualDestinations := cache.DestinationsBySourceProxy(proxyID)
-	expectedDestinations := []intermediate.CombinedDestinationRef{destination1, destination2}
-	require.ElementsMatch(t, expectedDestinations, actualDestinations)
-}
-
-func TestReadDestinationsByServiceAllPorts(t *testing.T) {
-	cache := NewDestinationsCache()
-
-	proxyID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "service-workload-abc").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-
-	// test-service@tcp
-	destination1 := testDestination(proxyID)
-	cache.WriteDestination(destination1)
-
-	// test-service@tcp2
-	destination2 := testDestination(proxyID)
-	destination2.Port = "tcp2"
-	cache.WriteDestination(destination2)
-
-	// other-service@tcp
-	destination3 := testDestination(proxyID)
-	destination3.ServiceRef = resourcetest.Resource(pbcatalog.ServiceType, "other-service").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ReferenceNoSection()
-	cache.WriteDestination(destination3)
-
-	t.Run("test-service referenced by two ports", func(t *testing.T) {
-		dests := cache.ReadDestinationsByServiceAllPorts(destination1.ServiceRef)
-		require.Len(t, dests, 2)
-		prototest.AssertElementsMatch(t, []intermediate.CombinedDestinationRef{
-			destination1, destination2,
-		}, dests)
-	})
-	t.Run("other-service referenced by one port", func(t *testing.T) {
-		dests := cache.ReadDestinationsByServiceAllPorts(destination3.ServiceRef)
-		require.Len(t, dests, 1)
-		prototest.AssertElementsMatch(t, []intermediate.CombinedDestinationRef{
-			destination3,
-		}, dests)
-	})
-}
-
-func testDestination(proxyID *pbresource.ID) intermediate.CombinedDestinationRef {
-	return intermediate.CombinedDestinationRef{
-		ServiceRef: resourcetest.Resource(pbcatalog.ServiceType, "test-service").
-			WithTenancy(resource.DefaultNamespacedTenancy()).ReferenceNoSection(),
-		Port: "tcp",
-		ExplicitDestinationsID: resourcetest.Resource(pbmesh.DestinationsType, "test-servicedestinations").
-			WithTenancy(resource.DefaultNamespacedTenancy()).ID(),
-		SourceProxies: map[resource.ReferenceKey]struct{}{
-			resource.NewReferenceKey(proxyID): {},
-		},
-	}
-}
diff --git a/internal/mesh/internal/cache/sidecarproxycache/identities_cache.go b/internal/mesh/internal/cache/sidecarproxycache/identities_cache.go
deleted file mode 100644
index 8276488317133..0000000000000
--- a/internal/mesh/internal/cache/sidecarproxycache/identities_cache.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxycache
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/mappers/bimapper"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// IdentitiesCache tracks mappings between workload identities and proxy IDs
-// that a configuration applies to. It is the responsibility of the controller to
-// keep this cache up-to-date.
-type IdentitiesCache struct {
-	mapper *bimapper.Mapper
-}
-
-func NewIdentitiesCache() *IdentitiesCache {
-	return &IdentitiesCache{
-		mapper: bimapper.New(pbmesh.ProxyStateTemplateType, pbauth.WorkloadIdentityType),
-	}
-}
-
-func (c *IdentitiesCache) ProxyIDsByWorkloadIdentity(id *pbresource.ID) []*pbresource.ID {
-	return c.mapper.ItemIDsForLink(id)
-}
-
-func (c *IdentitiesCache) TrackPair(identityID *pbresource.ID, proxyID *pbresource.ID) {
-	c.mapper.TrackItem(proxyID, []resource.ReferenceOrID{identityID})
-}
-
-// UntrackProxyID removes tracking for the given proxy state template ID.
-func (c *IdentitiesCache) UntrackProxyID(proxyID *pbresource.ID) {
-	c.mapper.UntrackItem(proxyID)
-}
diff --git a/internal/mesh/internal/cache/sidecarproxycache/identities_cache_test.go b/internal/mesh/internal/cache/sidecarproxycache/identities_cache_test.go
deleted file mode 100644
index 2c5add2e07cc7..0000000000000
--- a/internal/mesh/internal/cache/sidecarproxycache/identities_cache_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxycache
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func TestIdentitiesCache(t *testing.T) {
-	cache := NewIdentitiesCache()
-
-	identityID1 := resourcetest.Resource(pbauth.WorkloadIdentityType, "workload-identity-1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	identityID2 := resourcetest.Resource(pbauth.WorkloadIdentityType, "workload-identity-2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-
-	proxyID1 := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "service-workload-1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	proxyID2 := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "service-workload-2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-
-	// Empty cache
-	require.Nil(t, cache.ProxyIDsByWorkloadIdentity(identityID1))
-	require.Nil(t, cache.ProxyIDsByWorkloadIdentity(identityID2))
-
-	// Insert value and fetch it.
-	cache.TrackPair(identityID1, proxyID1)
-	require.Equal(t, []*pbresource.ID{proxyID1}, cache.ProxyIDsByWorkloadIdentity(identityID1))
-	require.Nil(t, cache.ProxyIDsByWorkloadIdentity(identityID2))
-
-	// Insert another value referencing the same identity.
-	cache.TrackPair(identityID1, proxyID2)
-	require.ElementsMatch(t, []*pbresource.ID{proxyID1, proxyID2}, cache.ProxyIDsByWorkloadIdentity(identityID1))
-	require.Nil(t, cache.ProxyIDsByWorkloadIdentity(identityID2))
-
-	// Now proxy 1 uses identity 2
-	cache.TrackPair(identityID2, proxyID1)
-	require.Equal(t, []*pbresource.ID{proxyID1}, cache.ProxyIDsByWorkloadIdentity(identityID2))
-	require.Equal(t, []*pbresource.ID{proxyID2}, cache.ProxyIDsByWorkloadIdentity(identityID1))
-
-	// Untrack proxy 2
-	cache.UntrackProxyID(proxyID2)
-	require.Equal(t, []*pbresource.ID{proxyID1}, cache.ProxyIDsByWorkloadIdentity(identityID2))
-	require.Nil(t, cache.ProxyIDsByWorkloadIdentity(identityID1))
-
-	// Untrack proxy 1
-	cache.UntrackProxyID(proxyID1)
-	require.Nil(t, cache.ProxyIDsByWorkloadIdentity(identityID2))
-	require.Nil(t, cache.ProxyIDsByWorkloadIdentity(identityID1))
-}
diff --git a/internal/mesh/internal/cache/sidecarproxycache/proxy_configuration_cache.go b/internal/mesh/internal/cache/sidecarproxycache/proxy_configuration_cache.go
deleted file mode 100644
index e5e457701346c..0000000000000
--- a/internal/mesh/internal/cache/sidecarproxycache/proxy_configuration_cache.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxycache
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/mappers/bimapper"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// ProxyConfigurationCache tracks mappings between proxy configurations and proxy IDs
-// that a configuration applies to. It is the responsibility of the controller to
-// keep this cache up-to-date.
-type ProxyConfigurationCache struct {
-	mapper *bimapper.Mapper
-}
-
-func NewProxyConfigurationCache() *ProxyConfigurationCache {
-	return &ProxyConfigurationCache{
-		mapper: bimapper.New(pbmesh.ProxyConfigurationType, pbmesh.ProxyStateTemplateType),
-	}
-}
-
-// ProxyConfigurationsByProxyID returns proxy configuration IDs given the id of the proxy state template.
-func (c *ProxyConfigurationCache) ProxyConfigurationsByProxyID(id *pbresource.ID) []*pbresource.ID {
-	return c.mapper.ItemIDsForLink(id)
-}
-
-// TrackProxyConfiguration tracks given proxy configuration ID and the linked proxy state template IDs.
-func (c *ProxyConfigurationCache) TrackProxyConfiguration(proxyCfgID *pbresource.ID, proxyIDs []resource.ReferenceOrID) {
-	c.mapper.TrackItem(proxyCfgID, proxyIDs)
-}
-
-// UntrackProxyConfiguration removes tracking for the given proxy configuration ID.
-func (c *ProxyConfigurationCache) UntrackProxyConfiguration(proxyCfgID *pbresource.ID) {
-	c.mapper.UntrackItem(proxyCfgID)
-}
-
-// UntrackProxyID removes tracking for the given proxy state template ID.
-func (c *ProxyConfigurationCache) UntrackProxyID(proxyID *pbresource.ID) {
-	c.mapper.UntrackLink(proxyID)
-}
diff --git a/internal/mesh/internal/cache/sidecarproxycache/proxy_configuration_cache_test.go b/internal/mesh/internal/cache/sidecarproxycache/proxy_configuration_cache_test.go
deleted file mode 100644
index 57921afc5b1c8..0000000000000
--- a/internal/mesh/internal/cache/sidecarproxycache/proxy_configuration_cache_test.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxycache
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestProxyConfigurationCache(t *testing.T) {
-	cache := NewProxyConfigurationCache()
-
-	// Create some proxy configurations.
-	proxyCfg1 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "test-cfg-1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	proxyCfg2 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "test-cfg-2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	proxyCfg3 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "test-cfg-3").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-
-	// Create some proxy state templates.
-	p1 := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "w-111").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	p2 := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "w-222").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	p3 := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "w-333").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	p4 := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "w-444").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	p5 := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "w-555").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-
-	// Track these and make sure there's some overlap.
-	cache.TrackProxyConfiguration(proxyCfg1, []resource.ReferenceOrID{p1, p2, p4})
-	cache.TrackProxyConfiguration(proxyCfg2, []resource.ReferenceOrID{p3, p4, p5})
-	cache.TrackProxyConfiguration(proxyCfg3, []resource.ReferenceOrID{p1, p3})
-
-	// Read proxy configurations by proxy.
-	requireProxyConfigurations(t, cache, p1, proxyCfg1, proxyCfg3)
-	requireProxyConfigurations(t, cache, p2, proxyCfg1)
-	requireProxyConfigurations(t, cache, p3, proxyCfg2, proxyCfg3)
-	requireProxyConfigurations(t, cache, p4, proxyCfg1, proxyCfg2)
-	requireProxyConfigurations(t, cache, p5, proxyCfg2)
-
-	// Untrack some proxy IDs.
-	cache.UntrackProxyID(p1)
-
-	requireProxyConfigurations(t, cache, p1)
-
-	// Untrack some proxy IDs.
-	cache.UntrackProxyID(p3)
-
-	requireProxyConfigurations(t, cache, p3)
-
-	// Untrack proxy cfg.
-	cache.UntrackProxyConfiguration(proxyCfg1)
-
-	requireProxyConfigurations(t, cache, p1) // no-op because we untracked it earlier
-	requireProxyConfigurations(t, cache, p2)
-	requireProxyConfigurations(t, cache, p3) // no-op because we untracked it earlier
-	requireProxyConfigurations(t, cache, p4, proxyCfg2)
-	requireProxyConfigurations(t, cache, p5, proxyCfg2)
-}
-
-func requireProxyConfigurations(t *testing.T, cache *ProxyConfigurationCache, proxyID *pbresource.ID, proxyCfgs ...*pbresource.ID) {
-	t.Helper()
-
-	actualProxyCfgs := cache.ProxyConfigurationsByProxyID(proxyID)
-
-	require.Len(t, actualProxyCfgs, len(proxyCfgs))
-	prototest.AssertElementsMatch(t, proxyCfgs, actualProxyCfgs)
-}
diff --git a/internal/mesh/internal/controllers/proxyconfiguration/controller.go b/internal/mesh/internal/controllers/proxyconfiguration/controller.go
deleted file mode 100644
index c73a358b27adf..0000000000000
--- a/internal/mesh/internal/controllers/proxyconfiguration/controller.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxyconfiguration
-
-import (
-	"context"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/proxyconfiguration/mapper"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const ControllerName = "consul.io/proxy-configuration-controller"
-
-func Controller(proxyConfigMapper *mapper.Mapper) controller.Controller {
-	if proxyConfigMapper == nil {
-		panic("proxy config mapper is required")
-	}
-
-	return controller.ForType(pbmesh.ComputedProxyConfigurationType).
-		WithWatch(pbmesh.ProxyConfigurationType, proxyConfigMapper.MapProxyConfiguration).
-		WithWatch(pbcatalog.WorkloadType, controller.ReplaceType(pbmesh.ComputedProxyConfigurationType)).
-		WithReconciler(&reconciler{proxyConfigMapper: proxyConfigMapper})
-}
-
-type reconciler struct {
-	proxyConfigMapper *mapper.Mapper
-}
-
-func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	rt.Logger = rt.Logger.With("controller", ControllerName, "id", req.ID)
-
-	// Look up the associated workload.
-	workloadID := resource.ReplaceType(pbcatalog.WorkloadType, req.ID)
-	workload, err := resource.GetDecodedResource[*pbcatalog.Workload](ctx, rt.Client, workloadID)
-	if err != nil {
-		rt.Logger.Error("error fetching workload", "error", err)
-		return err
-	}
-
-	// If workload is not found, the decoded resource will be nil.
-	if workload == nil {
-		// When workload is not there, we don't need to manually delete the resource
-		// because it is owned by the workload. In this case, we skip reconcile
-		// because there's nothing for us to do.
-		rt.Logger.Trace("the corresponding workload does not exist", "id", workloadID)
-		return nil
-	}
-
-	// Get existing ComputedProxyConfiguration resource (if any).
-	cpc, err := resource.GetDecodedResource[*pbmesh.ComputedProxyConfiguration](ctx, rt.Client, req.ID)
-	if err != nil {
-		rt.Logger.Error("error fetching ComputedProxyConfiguration", "error", err)
-		return err
-	}
-
-	// If workload is not on the mesh, we need to delete the resource and return
-	// as for non-mesh workloads there should be no proxy configuration.
-	if !workload.GetData().IsMeshEnabled() {
-		rt.Logger.Trace("workload is not on the mesh, skipping reconcile and deleting any corresponding ComputedProxyConfiguration", "id", workloadID)
-
-		// Delete CPC only if it exists.
-		if cpc != nil {
-			_, err = rt.Client.Delete(ctx, &pbresource.DeleteRequest{Id: req.ID})
-			if err != nil {
-				// If there's an error deleting CPC, we want to re-trigger reconcile again.
-				rt.Logger.Error("error deleting ComputedProxyConfiguration", "error", err)
-				return err
-			}
-		}
-
-		// Otherwise, return as there's nothing else for us to do.
-		return nil
-	}
-
-	// Now get any proxy configurations IDs that we have in the cache that have selectors matching the name
-	// of this CPC (name-aligned with the workload).
-	proxyCfgIDs := r.proxyConfigMapper.ProxyConfigurationsForWorkload(req.ID)
-	rt.Logger.Trace("cached proxy cfg IDs", "ids", proxyCfgIDs)
-
-	decodedProxyCfgs, err := r.fetchProxyConfigs(ctx, rt.Client, proxyCfgIDs)
-	if err != nil {
-		rt.Logger.Error("error fetching proxy configurations", "error", err)
-		return err
-	}
-
-	// If after fetching, we don't have any proxy configs, we need to skip reconcile and delete the resource.
-	if len(decodedProxyCfgs) == 0 {
-		rt.Logger.Trace("found no proxy configurations associated with this workload")
-
-		if cpc != nil {
-			rt.Logger.Trace("deleting ComputedProxyConfiguration")
-			_, err = rt.Client.Delete(ctx, &pbresource.DeleteRequest{Id: req.ID})
-			if err != nil {
-				// If there's an error deleting CPC, we want to re-trigger reconcile again.
-				rt.Logger.Error("error deleting ComputedProxyConfiguration", "error", err)
-				return err
-			}
-		}
-
-		return nil
-	}
-
-	// Next, we need to sort configs so that we can resolve conflicts.
-	sortedProxyCfgs := SortProxyConfigurations(decodedProxyCfgs, req.ID.GetName())
-
-	mergedProxyCfg := &pbmesh.ProxyConfiguration{}
-	// Walk sorted configs in reverse order so that the ones that take precedence
-	// do not overwrite the ones that don't.
-	for i := len(sortedProxyCfgs) - 1; i >= 0; i-- {
-		proto.Merge(mergedProxyCfg, sortedProxyCfgs[i].GetData())
-	}
-
-	newCPCData := &pbmesh.ComputedProxyConfiguration{
-		DynamicConfig:   mergedProxyCfg.GetDynamicConfig(),
-		BootstrapConfig: mergedProxyCfg.GetBootstrapConfig(),
-	}
-
-	// Lastly, write the resource.
-	if cpc == nil || !proto.Equal(cpc.GetData(), newCPCData) {
-		rt.Logger.Trace("writing new ComputedProxyConfiguration")
-
-		// First encode the endpoints data as an Any type.
-		cpcDataAsAny, err := anypb.New(newCPCData)
-		if err != nil {
-			rt.Logger.Error("error marshalling latest ComputedProxyConfiguration", "error", err)
-			return err
-		}
-
-		_, err = rt.Client.Write(ctx, &pbresource.WriteRequest{
-			Resource: &pbresource.Resource{
-				Id:    req.ID,
-				Owner: workloadID,
-				Data:  cpcDataAsAny,
-			},
-		})
-		if err != nil {
-			rt.Logger.Error("error writing latest ComputedProxyConfiguration", "error", err)
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (r *reconciler) fetchProxyConfigs(
-	ctx context.Context,
-	client pbresource.ResourceServiceClient,
-	proxyCfgIds []*pbresource.ID) ([]*types.DecodedProxyConfiguration, error) {
-
-	var decoded []*types.DecodedProxyConfiguration
-	for _, id := range proxyCfgIds {
-		res, err := resource.GetDecodedResource[*pbmesh.ProxyConfiguration](ctx, client, id)
-		if err != nil {
-			return nil, err
-		}
-		if res == nil || res.GetResource() == nil || res.GetData() == nil {
-			// If resource is not found, we should untrack it.
-			r.proxyConfigMapper.UntrackProxyConfiguration(id)
-			continue
-		}
-		decoded = append(decoded, res)
-	}
-
-	return decoded, nil
-}
diff --git a/internal/mesh/internal/controllers/proxyconfiguration/controller_test.go b/internal/mesh/internal/controllers/proxyconfiguration/controller_test.go
deleted file mode 100644
index e1ff9a57c14bd..0000000000000
--- a/internal/mesh/internal/controllers/proxyconfiguration/controller_test.go
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxyconfiguration
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/durationpb"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/proxyconfiguration/mapper"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-)
-
-type controllerTestSuite struct {
-	suite.Suite
-
-	client  *resourcetest.Client
-	runtime controller.Runtime
-
-	ctl *reconciler
-	ctx context.Context
-
-	workload    *pbcatalog.Workload
-	workloadRes *pbresource.Resource
-
-	proxyCfg1 *pbmesh.ProxyConfiguration
-	proxyCfg2 *pbmesh.ProxyConfiguration
-	proxyCfg3 *pbmesh.ProxyConfiguration
-
-	expComputedProxyCfg *pbmesh.ComputedProxyConfiguration
-}
-
-func (suite *controllerTestSuite) SetupTest() {
-	resourceClient := svctest.RunResourceService(suite.T(), types.Register, catalog.RegisterTypes)
-	suite.client = resourcetest.NewClient(resourceClient)
-	suite.runtime = controller.Runtime{Client: resourceClient, Logger: testutil.Logger(suite.T())}
-	suite.ctx = testutil.TestContext(suite.T())
-
-	suite.ctl = &reconciler{
-		proxyConfigMapper: mapper.New(),
-	}
-
-	suite.workload = &pbcatalog.Workload{
-		Addresses: []*pbcatalog.WorkloadAddress{{Host: "1.1.1.1"}},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"tcp":  {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			"mesh": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-		},
-		Identity: "test",
-	}
-
-	suite.workloadRes = resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
-		WithData(suite.T(), suite.workload).
-		Write(suite.T(), suite.client)
-
-	suite.proxyCfg1 = &pbmesh.ProxyConfiguration{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Names: []string{suite.workloadRes.Id.Name},
-		},
-		DynamicConfig: &pbmesh.DynamicConfig{
-			Mode: pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
-		},
-	}
-
-	suite.proxyCfg2 = &pbmesh.ProxyConfiguration{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{"test-"},
-		},
-		DynamicConfig: &pbmesh.DynamicConfig{
-			Mode: pbmesh.ProxyMode_PROXY_MODE_DIRECT, // this setting should be overridden by proxycfg1
-			LocalConnection: map[string]*pbmesh.ConnectionConfig{
-				"tcp": {ConnectTimeout: durationpb.New(2 * time.Second)},
-			},
-		},
-	}
-
-	suite.proxyCfg3 = &pbmesh.ProxyConfiguration{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{"test-wor"},
-		},
-		BootstrapConfig: &pbmesh.BootstrapConfig{
-			PrometheusBindAddr: "0.0.0.0:9000",
-		},
-	}
-
-	suite.expComputedProxyCfg = &pbmesh.ComputedProxyConfiguration{
-		DynamicConfig: &pbmesh.DynamicConfig{
-			Mode: pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
-			LocalConnection: map[string]*pbmesh.ConnectionConfig{
-				"tcp": {ConnectTimeout: durationpb.New(2 * time.Second)},
-			},
-		},
-		BootstrapConfig: &pbmesh.BootstrapConfig{
-			PrometheusBindAddr: "0.0.0.0:9000",
-		},
-	}
-}
-
-func (suite *controllerTestSuite) TestReconcile_NoWorkload() {
-	// This test ensures that removed workloads are ignored and don't result
-	// in the creation of the proxy state template.
-	id := resourcetest.Resource(pbmesh.ComputedProxyConfigurationType, "not-found").ID()
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: id,
-	})
-	require.NoError(suite.T(), err)
-
-	suite.client.RequireResourceNotFound(suite.T(), id)
-}
-
-func (suite *controllerTestSuite) TestReconcile_NonMeshWorkload() {
-	resourcetest.Resource(pbcatalog.WorkloadType, "non-mesh").
-		WithData(suite.T(), &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{{Host: "1.1.1.1"}},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"tcp": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			},
-		}).
-		Write(suite.T(), suite.client)
-
-	cpcID := resourcetest.Resource(pbmesh.ComputedProxyConfigurationType, "non-mesh").
-		Write(suite.T(), suite.client).Id
-
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: cpcID,
-	})
-	require.NoError(suite.T(), err)
-
-	suite.client.RequireResourceNotFound(suite.T(), cpcID)
-}
-
-func (suite *controllerTestSuite) TestReconcile_HappyPath() {
-	// Write all three proxy cfgs.
-	pCfg1 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg1").
-		WithData(suite.T(), suite.proxyCfg1).
-		Write(suite.T(), suite.client)
-	_, err := suite.ctl.proxyConfigMapper.MapProxyConfiguration(suite.ctx, suite.runtime, pCfg1)
-	require.NoError(suite.T(), err)
-
-	pCfg2 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg2").
-		WithData(suite.T(), suite.proxyCfg2).
-		Write(suite.T(), suite.client)
-	_, err = suite.ctl.proxyConfigMapper.MapProxyConfiguration(suite.ctx, suite.runtime, pCfg2)
-	require.NoError(suite.T(), err)
-
-	pCfg3 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg3").
-		WithData(suite.T(), suite.proxyCfg3).
-		Write(suite.T(), suite.client)
-	_, err = suite.ctl.proxyConfigMapper.MapProxyConfiguration(suite.ctx, suite.runtime, pCfg3)
-	require.NoError(suite.T(), err)
-
-	cpcID := resource.ReplaceType(pbmesh.ComputedProxyConfigurationType, suite.workloadRes.Id)
-	err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: cpcID,
-	})
-
-	require.NoError(suite.T(), err)
-
-	suite.requireComputedProxyConfiguration(suite.T(), cpcID)
-}
-
-func (suite *controllerTestSuite) TestReconcile_NoProxyConfigs() {
-	// Create a proxy cfg and map it so that it gets saved to cache.
-	pCfg1 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg1").
-		WithData(suite.T(), suite.proxyCfg1).
-		Build()
-	_, err := suite.ctl.proxyConfigMapper.MapProxyConfiguration(suite.ctx, suite.runtime, pCfg1)
-	require.NoError(suite.T(), err)
-
-	cpcID := resourcetest.Resource(pbmesh.ComputedProxyConfigurationType, suite.workloadRes.Id.Name).
-		Write(suite.T(), suite.client).Id
-	err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: cpcID,
-	})
-
-	require.NoError(suite.T(), err)
-
-	suite.client.RequireResourceNotFound(suite.T(), cpcID)
-}
-
-func (suite *controllerTestSuite) TestController() {
-	// Run the controller manager
-	mgr := controller.NewManager(suite.client, suite.runtime.Logger)
-
-	m := mapper.New()
-	mgr.Register(Controller(m))
-	mgr.SetRaftLeader(true)
-	go mgr.Run(suite.ctx)
-
-	// Write proxy configs.
-	pCfg1 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg1").
-		WithData(suite.T(), suite.proxyCfg1).
-		Write(suite.T(), suite.client)
-
-	pCfg2 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg2").
-		WithData(suite.T(), suite.proxyCfg2).
-		Write(suite.T(), suite.client)
-
-	pCfg3 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg3").
-		WithData(suite.T(), suite.proxyCfg3).
-		Write(suite.T(), suite.client)
-
-	cpcID := resource.ReplaceType(pbmesh.ComputedProxyConfigurationType, suite.workloadRes.Id)
-	testutil.RunStep(suite.T(), "computed proxy config generation", func(t *testing.T) {
-		retry.Run(t, func(r *retry.R) {
-			suite.client.RequireResourceExists(r, cpcID)
-			suite.requireComputedProxyConfiguration(r, cpcID)
-		})
-	})
-
-	testutil.RunStep(suite.T(), "add another workload", func(t *testing.T) {
-		// Create another workload that will match only proxyCfg2.
-		matchingWorkload := resourcetest.Resource(pbcatalog.WorkloadType, "test-extra-workload").
-			WithData(t, suite.workload).
-			Write(t, suite.client)
-		matchingWorkloadCPCID := resource.ReplaceType(pbmesh.ComputedProxyConfigurationType, matchingWorkload.Id)
-
-		retry.Run(t, func(r *retry.R) {
-			suite.client.RequireResourceExists(r, cpcID)
-			suite.requireComputedProxyConfiguration(r, cpcID)
-
-			matchingWorkloadCPC := suite.client.RequireResourceExists(r, matchingWorkloadCPCID)
-			dec := resourcetest.MustDecode[*pbmesh.ComputedProxyConfiguration](r, matchingWorkloadCPC)
-			prototest.AssertDeepEqual(r, suite.proxyCfg2.GetDynamicConfig(), dec.GetData().GetDynamicConfig())
-			prototest.AssertDeepEqual(r, suite.proxyCfg2.GetBootstrapConfig(), dec.GetData().GetBootstrapConfig())
-		})
-	})
-
-	testutil.RunStep(suite.T(), "update proxy config selector", func(t *testing.T) {
-		t.Log("running update proxy config selector")
-		// Update proxy config selector to no longer select "test-workload"
-		updatedProxyCfg := proto.Clone(suite.proxyCfg2).(*pbmesh.ProxyConfiguration)
-		updatedProxyCfg.Workloads = &pbcatalog.WorkloadSelector{
-			Names: []string{"test-extra-workload"},
-		}
-
-		matchingWorkload := resourcetest.Resource(pbcatalog.WorkloadType, "test-extra-workload").
-			WithData(t, suite.workload).
-			Write(t, suite.client)
-		matchingWorkloadCPCID := resource.ReplaceType(pbmesh.ComputedProxyConfigurationType, matchingWorkload.Id)
-		resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg2").
-			WithData(suite.T(), updatedProxyCfg).
-			Write(suite.T(), suite.client)
-
-		retry.Run(t, func(r *retry.R) {
-			res := suite.client.RequireResourceExists(r, cpcID)
-
-			// The "test-workload" computed traffic permissions should now be updated to use only proxy cfg 1 and 3.
-			expProxyCfg := &pbmesh.ComputedProxyConfiguration{
-				DynamicConfig: &pbmesh.DynamicConfig{
-					Mode: pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
-				},
-				BootstrapConfig: &pbmesh.BootstrapConfig{
-					PrometheusBindAddr: "0.0.0.0:9000",
-				},
-			}
-			dec := resourcetest.MustDecode[*pbmesh.ComputedProxyConfiguration](t, res)
-			prototest.AssertDeepEqual(r, expProxyCfg.GetDynamicConfig(), dec.GetData().GetDynamicConfig())
-			prototest.AssertDeepEqual(r, expProxyCfg.GetBootstrapConfig(), dec.GetData().GetBootstrapConfig())
-
-			matchingWorkloadCPC := suite.client.RequireResourceExists(r, matchingWorkloadCPCID)
-			dec = resourcetest.MustDecode[*pbmesh.ComputedProxyConfiguration](r, matchingWorkloadCPC)
-			prototest.AssertDeepEqual(r, suite.proxyCfg2.GetDynamicConfig(), dec.GetData().GetDynamicConfig())
-			prototest.AssertDeepEqual(r, suite.proxyCfg2.GetBootstrapConfig(), dec.GetData().GetBootstrapConfig())
-		})
-	})
-
-	// Delete all proxy cfgs.
-	suite.client.MustDelete(suite.T(), pCfg1.Id)
-	suite.client.MustDelete(suite.T(), pCfg2.Id)
-	suite.client.MustDelete(suite.T(), pCfg3.Id)
-
-	testutil.RunStep(suite.T(), "all proxy configs are deleted", func(t *testing.T) {
-		retry.Run(t, func(r *retry.R) {
-			suite.client.RequireResourceNotFound(r, cpcID)
-		})
-	})
-}
-
-func TestControllerSuite(t *testing.T) {
-	suite.Run(t, new(controllerTestSuite))
-}
-
-func (suite *controllerTestSuite) requireComputedProxyConfiguration(t resourcetest.T, id *pbresource.ID) {
-	cpcRes := suite.client.RequireResourceExists(t, id)
-	decCPC := resourcetest.MustDecode[*pbmesh.ComputedProxyConfiguration](t, cpcRes)
-	prototest.AssertDeepEqual(t, suite.expComputedProxyCfg, decCPC.Data)
-	resourcetest.RequireOwner(t, cpcRes, resource.ReplaceType(pbcatalog.WorkloadType, id), true)
-}
diff --git a/internal/mesh/internal/controllers/proxyconfiguration/mapper/proxy_configuration_mapper.go b/internal/mesh/internal/controllers/proxyconfiguration/mapper/proxy_configuration_mapper.go
deleted file mode 100644
index eb988aedab0b3..0000000000000
--- a/internal/mesh/internal/controllers/proxyconfiguration/mapper/proxy_configuration_mapper.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package mapper
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/mappers/common"
-	"github.com/hashicorp/consul/internal/resource/mappers/selectiontracker"
-	"github.com/hashicorp/consul/lib/stringslice"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type Mapper struct {
-	workloadSelectionTracker *selectiontracker.WorkloadSelectionTracker
-}
-
-func New() *Mapper {
-	return &Mapper{
-		workloadSelectionTracker: selectiontracker.New(),
-	}
-}
-
-// MapProxyConfiguration is responsible for mapping ProxyConfiguration resources to the corresponding ComputedProxyConfiguration
-// resource which are name-aligned with the workload.
-func (m *Mapper) MapProxyConfiguration(ctx context.Context, rt controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	var proxyConfig pbmesh.ProxyConfiguration
-	err := res.Data.UnmarshalTo(&proxyConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	// First, we return any existing workloads that this proxy configuration selects.
-	// The number of selected workloads may change in the future, but for this even we
-	// only need to care about triggering reconcile requests for the current ones.
-	requests, err := common.MapSelector(ctx, rt.Client, pbmesh.ComputedProxyConfigurationType,
-		proxyConfig.GetWorkloads(), res.Id.Tenancy)
-	if err != nil {
-		return nil, err
-	}
-
-	// Then generate requests for any previously selected workloads.
-	prevSelector := m.workloadSelectionTracker.GetSelector(res.GetId())
-
-	if !(stringslice.Equal(prevSelector.GetNames(), proxyConfig.GetWorkloads().GetNames()) &&
-		stringslice.Equal(prevSelector.GetPrefixes(), proxyConfig.GetWorkloads().GetPrefixes())) {
-		// the selector is different, so we need to map those selectors as well.
-		requestsForPrevSelector, err := common.MapSelector(ctx, rt.Client, pbmesh.ComputedProxyConfigurationType,
-			prevSelector, res.Id.Tenancy)
-		if err != nil {
-			return nil, err
-		}
-		requests = append(requests, requestsForPrevSelector...)
-	}
-
-	// Second, we track this proxy configuration's selector and ID in the tracker.
-	m.workloadSelectionTracker.TrackIDForSelector(res.Id, proxyConfig.GetWorkloads())
-
-	return requests, nil
-}
-
-func (m *Mapper) ProxyConfigurationsForWorkload(id *pbresource.ID) []*pbresource.ID {
-	return m.workloadSelectionTracker.GetIDsForWorkload(id)
-}
-
-func (m *Mapper) UntrackProxyConfiguration(id *pbresource.ID) {
-	m.workloadSelectionTracker.UntrackID(id)
-}
diff --git a/internal/mesh/internal/controllers/proxyconfiguration/mapper/proxy_configuration_mapper_test.go b/internal/mesh/internal/controllers/proxyconfiguration/mapper/proxy_configuration_mapper_test.go
deleted file mode 100644
index 09126a11fc07d..0000000000000
--- a/internal/mesh/internal/controllers/proxyconfiguration/mapper/proxy_configuration_mapper_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package mapper
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestMapProxyConfiguration(t *testing.T) {
-	resourceClient := svctest.RunResourceService(t, types.Register, catalog.RegisterTypes)
-	mapper := New()
-
-	workloadData := &pbcatalog.Workload{
-		Addresses: []*pbcatalog.WorkloadAddress{{Host: "1.1.1.1"}},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"tcp":  {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			"mesh": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-		},
-		Identity: "test",
-	}
-	wID1 := resourcetest.Resource(pbcatalog.WorkloadType, "api-1").
-		WithData(t, workloadData).
-		Write(t, resourceClient).GetId()
-	wID2 := resourcetest.Resource(pbcatalog.WorkloadType, "api-2").
-		WithData(t, workloadData).
-		Write(t, resourceClient).GetId()
-	wID3 := resourcetest.Resource(pbcatalog.WorkloadType, "api-abc").
-		WithData(t, workloadData).
-		Write(t, resourceClient).GetId()
-	wID4 := resourcetest.Resource(pbcatalog.WorkloadType, "foo").
-		WithData(t, workloadData).
-		Write(t, resourceClient).GetId()
-
-	pCfg1 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbmesh.ProxyConfiguration{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Names:    []string{"foo", "api-1"},
-				Prefixes: []string{"api-a"},
-			},
-			DynamicConfig: &pbmesh.DynamicConfig{
-				Mode: pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
-			},
-		}).Build()
-	reqs, err := mapper.MapProxyConfiguration(context.Background(), controller.Runtime{Client: resourceClient}, pCfg1)
-	require.NoError(t, err)
-	prototest.AssertElementsMatch(t,
-		controller.MakeRequests(pbmesh.ComputedProxyConfigurationType, []*pbresource.ID{wID1, wID3, wID4}),
-		reqs)
-
-	pCfg2 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbmesh.ProxyConfiguration{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-				Names:    []string{"foo"},
-			},
-			BootstrapConfig: &pbmesh.BootstrapConfig{
-				PrometheusBindAddr: "0.0.0.0:9000",
-			},
-		}).Build()
-
-	reqs, err = mapper.MapProxyConfiguration(context.Background(), controller.Runtime{Client: resourceClient}, pCfg2)
-	require.NoError(t, err)
-	prototest.AssertElementsMatch(t,
-		controller.MakeRequests(pbmesh.ComputedProxyConfigurationType, []*pbresource.ID{wID1, wID2, wID3, wID4}),
-		reqs)
-
-	// Check mapper state for each workload.
-	ids := mapper.ProxyConfigurationsForWorkload(wID1)
-	prototest.AssertElementsMatch(t, []*pbresource.ID{pCfg1.Id, pCfg2.Id}, ids)
-
-	ids = mapper.ProxyConfigurationsForWorkload(wID2)
-	prototest.AssertElementsMatch(t, []*pbresource.ID{pCfg2.Id}, ids)
-
-	ids = mapper.ProxyConfigurationsForWorkload(wID3)
-	prototest.AssertElementsMatch(t, []*pbresource.ID{pCfg1.Id, pCfg2.Id}, ids)
-
-	ids = mapper.ProxyConfigurationsForWorkload(wID4)
-	prototest.AssertElementsMatch(t, []*pbresource.ID{pCfg1.Id, pCfg2.Id}, ids)
-
-	// Update pCfg2's selector and check that we generate requests for previous and new selector.
-	pCfg2 = resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbmesh.ProxyConfiguration{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Names: []string{"foo"},
-			},
-			BootstrapConfig: &pbmesh.BootstrapConfig{
-				PrometheusBindAddr: "0.0.0.0:9000",
-			},
-		}).Build()
-
-	reqs, err = mapper.MapProxyConfiguration(context.Background(), controller.Runtime{Client: resourceClient}, pCfg2)
-	require.NoError(t, err)
-	prototest.AssertElementsMatch(t,
-		controller.MakeRequests(pbmesh.ComputedProxyConfigurationType, []*pbresource.ID{wID4, wID1, wID2, wID3, wID4}),
-		reqs)
-
-	// Check mapper state for each workload.
-	ids = mapper.ProxyConfigurationsForWorkload(wID1)
-	prototest.AssertElementsMatch(t, []*pbresource.ID{pCfg1.Id}, ids)
-
-	ids = mapper.ProxyConfigurationsForWorkload(wID2)
-	prototest.AssertElementsMatch(t, []*pbresource.ID{}, ids)
-
-	ids = mapper.ProxyConfigurationsForWorkload(wID3)
-	prototest.AssertElementsMatch(t, []*pbresource.ID{pCfg1.Id}, ids)
-
-	ids = mapper.ProxyConfigurationsForWorkload(wID4)
-	prototest.AssertElementsMatch(t, []*pbresource.ID{pCfg1.Id, pCfg2.Id}, ids)
-
-	// Untrack one of the proxy cfgs and check that mapper is updated.
-	mapper.UntrackProxyConfiguration(pCfg1.Id)
-
-	ids = mapper.ProxyConfigurationsForWorkload(wID1)
-	prototest.AssertElementsMatch(t, []*pbresource.ID{}, ids)
-
-	ids = mapper.ProxyConfigurationsForWorkload(wID2)
-	prototest.AssertElementsMatch(t, []*pbresource.ID{}, ids)
-
-	ids = mapper.ProxyConfigurationsForWorkload(wID3)
-	prototest.AssertElementsMatch(t, []*pbresource.ID{}, ids)
-
-	ids = mapper.ProxyConfigurationsForWorkload(wID4)
-	prototest.AssertElementsMatch(t, []*pbresource.ID{pCfg2.Id}, ids)
-}
diff --git a/internal/mesh/internal/controllers/proxyconfiguration/sort.go b/internal/mesh/internal/controllers/proxyconfiguration/sort.go
deleted file mode 100644
index 771286899d0c4..0000000000000
--- a/internal/mesh/internal/controllers/proxyconfiguration/sort.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxyconfiguration
-
-import (
-	"sort"
-	"strings"
-
-	"github.com/oklog/ulid/v2"
-	"golang.org/x/exp/slices"
-
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-)
-
-// SortProxyConfigurations sorts proxy configurations using the following rules:
-//
-//  1. Proxy config with a more specific selector wins. For example,
-//     if there's a proxy config with a name selector and another conflicting
-//     with a prefix selector, we will choose the one that selects by name because
-//     it's more specific. For two prefix-based conflicting proxy configs, we will choose
-//     the one that has the longer prefix.
-//  2. Otherwise, the proxy configuration created first (i.e. with an earlier timestamp) wins.
-//  3. Lastly, if creation timestamps are the same, the conflict will be resolved using lexicographic
-//     order.
-//
-// It returns them in order such that proxy configurations that take precedence occur first in the list.
-func SortProxyConfigurations(proxyCfgs []*types.DecodedProxyConfiguration, workloadName string) []*types.DecodedProxyConfiguration {
-	// Shallow-copy proxy configs so that we don't mutate the original slice.
-	proxyCfgsToSort := make([]*types.DecodedProxyConfiguration, len(proxyCfgs))
-	for i, cfg := range proxyCfgs {
-		proxyCfgsToSort[i] = cfg
-	}
-
-	sorter := proxyCfgsSorter{
-		proxyCfgs:    proxyCfgsToSort,
-		workloadName: workloadName,
-	}
-
-	sort.Sort(sorter)
-
-	return sorter.proxyCfgs
-}
-
-type proxyCfgsSorter struct {
-	proxyCfgs    []*types.DecodedProxyConfiguration
-	workloadName string
-}
-
-func (p proxyCfgsSorter) Len() int { return len(p.proxyCfgs) }
-
-// Less returns true if i-th element is less than j-th element.
-func (p proxyCfgsSorter) Less(i, j int) bool {
-	iPrefixMatch := p.findLongestPrefixMatch(i)
-	iMatchesByName := p.matchesByName(i)
-
-	jPrefixMatch := p.findLongestPrefixMatch(j)
-	jMatchesByName := p.matchesByName(j)
-
-	switch {
-	// If i matches by name but j doesn't, then i should come before j.
-	case iMatchesByName && !jMatchesByName:
-		return true
-	case !iMatchesByName && jMatchesByName:
-		return false
-	case !iMatchesByName && !jMatchesByName:
-		if len(iPrefixMatch) != len(jPrefixMatch) {
-			// In this case, the longest prefix wins.
-			return len(iPrefixMatch) > len(jPrefixMatch)
-		}
-
-		// Fallthrough to the default case if lengths of prefix matches are the same.
-		fallthrough
-	case iMatchesByName && jMatchesByName:
-		fallthrough
-	default:
-		iID := ulid.MustParse(p.proxyCfgs[i].Resource.Id.Uid)
-		jID := ulid.MustParse(p.proxyCfgs[j].Resource.Id.Uid)
-		if iID.Time() != jID.Time() {
-			return iID.Time() < jID.Time()
-		} else {
-			// It's impossible for names to be equal, and so we are checking if
-			// i's name is "less" lexicographically than j's name.
-			return p.proxyCfgs[i].GetResource().GetId().GetName() < p.proxyCfgs[j].GetResource().GetId().GetName()
-		}
-	}
-}
-
-func (p proxyCfgsSorter) Swap(i, j int) {
-	p.proxyCfgs[i], p.proxyCfgs[j] = p.proxyCfgs[j], p.proxyCfgs[i]
-}
-
-func (p proxyCfgsSorter) matchesByName(idx int) bool {
-	return slices.Contains(p.proxyCfgs[idx].GetData().GetWorkloads().GetNames(), p.workloadName)
-}
-
-func (p proxyCfgsSorter) findLongestPrefixMatch(idx int) string {
-	var prefixMatch string
-	for _, prefix := range p.proxyCfgs[idx].GetData().GetWorkloads().GetPrefixes() {
-		if strings.Contains(p.workloadName, prefix) &&
-			len(prefix) > len(prefixMatch) {
-
-			prefixMatch = prefix
-		}
-	}
-
-	return prefixMatch
-}
diff --git a/internal/mesh/internal/controllers/proxyconfiguration/sort_test.go b/internal/mesh/internal/controllers/proxyconfiguration/sort_test.go
deleted file mode 100644
index 36033a47e4777..0000000000000
--- a/internal/mesh/internal/controllers/proxyconfiguration/sort_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxyconfiguration
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/oklog/ulid/v2"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestSortProxyConfigurations(t *testing.T) {
-	workloadName := "foo-123"
-	cases := map[string]struct {
-		selectors        []*pbcatalog.WorkloadSelector
-		expSortedIndices []int
-	}{
-		"first matched by name, second by prefix": {
-			selectors: []*pbcatalog.WorkloadSelector{
-				{
-					Names: []string{workloadName},
-				},
-				{
-					Prefixes: []string{"foo-"},
-				},
-			},
-			expSortedIndices: []int{0, 1},
-		},
-		"first matched by prefix, second by name": {
-			selectors: []*pbcatalog.WorkloadSelector{
-				{
-					Prefixes: []string{"foo-"},
-				},
-				{
-					Names: []string{workloadName},
-				},
-			},
-			expSortedIndices: []int{1, 0},
-		},
-		"both matched by name (sorted order should match the order of creation)": {
-			selectors: []*pbcatalog.WorkloadSelector{
-				{
-					Names: []string{workloadName},
-				},
-				{
-					Names: []string{workloadName},
-				},
-			},
-			expSortedIndices: []int{0, 1},
-		},
-		"both matched by different prefix": {
-			selectors: []*pbcatalog.WorkloadSelector{
-				{
-					Prefixes: []string{"foo"},
-				},
-				{
-					Prefixes: []string{"foo-"},
-				},
-			},
-			expSortedIndices: []int{1, 0},
-		},
-		"both matched by the same prefix": {
-			selectors: []*pbcatalog.WorkloadSelector{
-				{
-					Prefixes: []string{"foo-"},
-				},
-				{
-					Prefixes: []string{"foo-"},
-				},
-			},
-			expSortedIndices: []int{0, 1},
-		},
-		"both matched by the multiple different prefixes": {
-			selectors: []*pbcatalog.WorkloadSelector{
-				{
-					Prefixes: []string{"foo-1", "foo-"},
-				},
-				{
-					Prefixes: []string{"foo-1", "foo-12"},
-				},
-			},
-			expSortedIndices: []int{1, 0},
-		},
-	}
-
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			resourceClient := svctest.RunResourceService(t, types.Register)
-
-			var decProxyCfgs []*types.DecodedProxyConfiguration
-			for i, ws := range c.selectors {
-				proxyCfg := &pbmesh.ProxyConfiguration{
-					Workloads: ws,
-				}
-				resName := fmt.Sprintf("cfg-%d", i)
-				proxyCfgRes := resourcetest.Resource(pbmesh.ProxyConfigurationType, resName).
-					WithData(t, proxyCfg).
-					// We need to run it through resource service so that ULIDs are set.
-					Write(t, resourceClient)
-				decProxyCfgs = append(decProxyCfgs, resourcetest.MustDecode[*pbmesh.ProxyConfiguration](t, proxyCfgRes))
-
-				// Wait for a few milliseconds so that creation timestamp will always be different between resources.
-				time.Sleep(2 * time.Millisecond)
-			}
-
-			sortedCfgs := SortProxyConfigurations(decProxyCfgs, workloadName)
-
-			for i, idx := range c.expSortedIndices {
-				prototest.AssertDeepEqual(t, decProxyCfgs[idx], sortedCfgs[i])
-			}
-		})
-	}
-}
-
-func TestSortProxyConfigurations_SameCreationTime(t *testing.T) {
-	var decProxyCfgs []*types.DecodedProxyConfiguration
-
-	proxyCfg := &pbmesh.ProxyConfiguration{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Names: []string{"foo-123"},
-		},
-	}
-
-	// Make cfg1 name such that it should appear after cfg2 lexicographically.
-	cfg1 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "def-cfg-1").
-		WithData(t, proxyCfg).
-		Build()
-	// Explicitly set ulid. For the first one, we'll just the current timestamp.
-	cfg1.Id.Uid = ulid.Make().String()
-
-	decProxyCfgs = append(decProxyCfgs, resourcetest.MustDecode[*pbmesh.ProxyConfiguration](t, cfg1))
-
-	cfg2 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "abc-cfg-2").
-		WithData(t, proxyCfg).
-		Build()
-	// Explicitly set ulid. For the second one, we'll the timestamp of the first one.
-	parsedCfg1Ulid := ulid.MustParse(cfg1.Id.Uid)
-	cfg2.Id.Uid = ulid.MustNew(parsedCfg1Ulid.Time(), ulid.DefaultEntropy()).String()
-
-	decProxyCfgs = append(decProxyCfgs, resourcetest.MustDecode[*pbmesh.ProxyConfiguration](t, cfg2))
-
-	sortedCfgs := SortProxyConfigurations(decProxyCfgs, "foo-123")
-
-	// We expect that given the same creation timestamp, the second proxy cfg should be first
-	// in the sorted order because of its name.
-	prototest.AssertDeepEqual(t, decProxyCfgs[0], sortedCfgs[1])
-	prototest.AssertDeepEqual(t, decProxyCfgs[1], sortedCfgs[0])
-}
diff --git a/internal/mesh/internal/controllers/register.go b/internal/mesh/internal/controllers/register.go
deleted file mode 100644
index 002555500d1e2..0000000000000
--- a/internal/mesh/internal/controllers/register.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controllers
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/agent/leafcert"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/cache/sidecarproxycache"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/proxyconfiguration"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/proxyconfiguration/mapper"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/sidecarproxy"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/xds"
-	"github.com/hashicorp/consul/internal/mesh/internal/mappers/sidecarproxymapper"
-	"github.com/hashicorp/consul/internal/resource/mappers/bimapper"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-)
-
-type Dependencies struct {
-	TrustDomainFetcher sidecarproxy.TrustDomainFetcher
-	LocalDatacenter    string
-	DefaultAllow       bool
-	TrustBundleFetcher xds.TrustBundleFetcher
-	ProxyUpdater       xds.ProxyUpdater
-	LeafCertManager    *leafcert.Manager
-}
-
-func Register(mgr *controller.Manager, deps Dependencies) {
-	endpointsMapper := bimapper.New(pbmesh.ProxyStateTemplateType, pbcatalog.ServiceEndpointsType)
-	leafMapper := &xds.LeafMapper{
-		Mapper: bimapper.New(pbmesh.ProxyStateTemplateType, xds.InternalLeafType),
-	}
-	leafCancels := &xds.LeafCancels{
-		Cancels: make(map[string]context.CancelFunc),
-	}
-	mgr.Register(xds.Controller(endpointsMapper, deps.ProxyUpdater, deps.TrustBundleFetcher, deps.LeafCertManager, leafMapper, leafCancels, deps.LocalDatacenter))
-
-	var (
-		destinationsCache   = sidecarproxycache.NewDestinationsCache()
-		proxyCfgCache       = sidecarproxycache.NewProxyConfigurationCache()
-		computedRoutesCache = sidecarproxycache.NewComputedRoutesCache()
-		identitiesCache     = sidecarproxycache.NewIdentitiesCache()
-		m                   = sidecarproxymapper.New(destinationsCache, proxyCfgCache, computedRoutesCache, identitiesCache)
-	)
-	mgr.Register(
-		sidecarproxy.Controller(destinationsCache, proxyCfgCache, computedRoutesCache, identitiesCache, m, deps.TrustDomainFetcher, deps.LocalDatacenter, deps.DefaultAllow),
-	)
-
-	mgr.Register(routes.Controller())
-
-	mgr.Register(proxyconfiguration.Controller(mapper.New()))
-}
diff --git a/internal/mesh/internal/controllers/routes/bound_refs.go b/internal/mesh/internal/controllers/routes/bound_refs.go
deleted file mode 100644
index afdac8460be80..0000000000000
--- a/internal/mesh/internal/controllers/routes/bound_refs.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package routes
-
-import (
-	"sort"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type sectionRefKey struct {
-	resource.ReferenceKey
-	Section string
-}
-
-type BoundReferenceCollector struct {
-	refs map[sectionRefKey]*pbresource.Reference
-}
-
-func NewBoundReferenceCollector() *BoundReferenceCollector {
-	return &BoundReferenceCollector{
-		refs: make(map[sectionRefKey]*pbresource.Reference),
-	}
-}
-
-func (c *BoundReferenceCollector) List() []*pbresource.Reference {
-	if len(c.refs) == 0 {
-		return nil
-	}
-
-	out := make([]*pbresource.Reference, 0, len(c.refs))
-	for _, ref := range c.refs {
-		out = append(out, ref)
-	}
-
-	sort.Slice(out, func(i, j int) bool {
-		return resource.LessReference(out[i], out[j])
-	})
-
-	return out
-}
-
-func (c *BoundReferenceCollector) AddRefOrID(ref resource.ReferenceOrID) {
-	if c == nil {
-		return
-	}
-	c.AddRef(resource.ReferenceFromReferenceOrID(ref))
-}
-
-func (c *BoundReferenceCollector) AddRef(ref *pbresource.Reference) {
-	if c == nil {
-		return
-	}
-	srk := sectionRefKey{
-		ReferenceKey: resource.NewReferenceKey(ref),
-		Section:      ref.Section,
-	}
-
-	if _, ok := c.refs[srk]; ok {
-		return
-	}
-
-	c.refs[srk] = ref
-}
diff --git a/internal/mesh/internal/controllers/routes/controller.go b/internal/mesh/internal/controllers/routes/controller.go
deleted file mode 100644
index e55bac45ccb7f..0000000000000
--- a/internal/mesh/internal/controllers/routes/controller.go
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package routes
-
-import (
-	"context"
-
-	"github.com/hashicorp/go-hclog"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes/loader"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes/xroutemapper"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func Controller() controller.Controller {
-	mapper := xroutemapper.New()
-
-	r := &routesReconciler{
-		mapper: mapper,
-	}
-	return controller.ForType(pbmesh.ComputedRoutesType).
-		WithWatch(pbmesh.HTTPRouteType, mapper.MapHTTPRoute).
-		WithWatch(pbmesh.GRPCRouteType, mapper.MapGRPCRoute).
-		WithWatch(pbmesh.TCPRouteType, mapper.MapTCPRoute).
-		WithWatch(pbmesh.DestinationPolicyType, mapper.MapDestinationPolicy).
-		WithWatch(pbcatalog.FailoverPolicyType, mapper.MapFailoverPolicy).
-		WithWatch(pbcatalog.ServiceType, mapper.MapService).
-		WithReconciler(r)
-}
-
-type routesReconciler struct {
-	mapper *xroutemapper.Mapper
-}
-
-func (r *routesReconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	// Notably don't inject the resource-id here into the logger, since we have
-	// to do a fan-out to multiple resources due to xRoutes having multiple
-	// parent refs.
-	rt.Logger = rt.Logger.With("controller", StatusKey)
-
-	rt.Logger.Trace("reconciling computed routes")
-
-	loggerFor := func(id *pbresource.ID) hclog.Logger {
-		return rt.Logger.With("resource-id", id)
-	}
-	related, err := loader.LoadResourcesForComputedRoutes(ctx, loggerFor, rt.Client, r.mapper, req.ID)
-	if err != nil {
-		rt.Logger.Error("error loading relevant resources", "error", err)
-		return err
-	}
-
-	pending := make(PendingStatuses)
-
-	ValidateXRouteReferences(related, pending)
-
-	generatedResults := GenerateComputedRoutes(related, pending)
-
-	if err := UpdatePendingStatuses(ctx, rt, pending); err != nil {
-		rt.Logger.Error("error updating statuses for affected relevant resources", "error", err)
-		return err
-	}
-
-	for _, result := range generatedResults {
-		computedRoutesID := result.ID
-
-		logger := rt.Logger.With("resource-id", computedRoutesID)
-
-		prev, err := resource.GetDecodedResource[*pbmesh.ComputedRoutes](ctx, rt.Client, computedRoutesID)
-		if err != nil {
-			logger.Error("error loading previous computed routes", "error", err)
-			return err
-		}
-
-		if prev != nil {
-			r.mapper.TrackComputedRoutes(prev)
-		} else {
-			r.mapper.UntrackComputedRoutes(computedRoutesID)
-		}
-
-		if err := ensureComputedRoutesIsSynced(ctx, logger, rt.Client, result, prev); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func ensureComputedRoutesIsSynced(
-	ctx context.Context,
-	logger hclog.Logger,
-	client pbresource.ResourceServiceClient,
-	result *ComputedRoutesResult,
-	prev *types.DecodedComputedRoutes,
-) error {
-	if result.Data == nil {
-		return deleteComputedRoutes(ctx, logger, client, prev)
-	}
-
-	// Upsert the resource if changed.
-	if prev != nil {
-		if proto.Equal(prev.Data, result.Data) {
-			return nil // no change
-		}
-		result.ID = prev.Resource.Id
-	}
-
-	return upsertComputedRoutes(ctx, logger, client, result.ID, result.OwnerID, result.Data)
-}
-
-func upsertComputedRoutes(
-	ctx context.Context,
-	logger hclog.Logger,
-	client pbresource.ResourceServiceClient,
-	id *pbresource.ID,
-	ownerID *pbresource.ID,
-	data *pbmesh.ComputedRoutes,
-) error {
-	mcData, err := anypb.New(data)
-	if err != nil {
-		logger.Error("error marshalling new computed routes payload", "error", err)
-		return err
-	}
-
-	// Now perform the write. The computed routes resource should be owned
-	// by the service so that it will automatically be deleted upon service
-	// deletion.
-
-	_, err = client.Write(ctx, &pbresource.WriteRequest{
-		Resource: &pbresource.Resource{
-			Id:    id,
-			Owner: ownerID,
-			Data:  mcData,
-		},
-	})
-	if err != nil {
-		logger.Error("error writing computed routes", "error", err)
-		return err
-	}
-
-	logger.Trace("updated computed routes resource was successfully written")
-
-	return nil
-}
-
-func deleteComputedRoutes(
-	ctx context.Context,
-	logger hclog.Logger,
-	client pbresource.ResourceServiceClient,
-	prev *types.DecodedComputedRoutes,
-) error {
-	if prev == nil {
-		return nil
-	}
-
-	// The service the computed routes controls no longer participates in the
-	// mesh at all.
-
-	logger.Trace("removing previous computed routes")
-
-	// This performs a CAS deletion.
-	_, err := client.Delete(ctx, &pbresource.DeleteRequest{
-		Id:      prev.Resource.Id,
-		Version: prev.Resource.Version,
-	})
-	// Potentially we could look for CAS failures by checking if the gRPC
-	// status code is Aborted. However its an edge case and there could
-	// possibly be other reasons why the gRPC status code would be aborted
-	// besides CAS version mismatches. The simplest thing to do is to just
-	// propagate the error and retry reconciliation later.
-	if err != nil {
-		logger.Error("error deleting previous computed routes resource", "error", err)
-		return err
-	}
-
-	return nil
-}
diff --git a/internal/mesh/internal/controllers/routes/controller_test.go b/internal/mesh/internal/controllers/routes/controller_test.go
deleted file mode 100644
index 653eac28ed153..0000000000000
--- a/internal/mesh/internal/controllers/routes/controller_test.go
+++ /dev/null
@@ -1,1340 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package routes
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-)
-
-type controllerSuite struct {
-	suite.Suite
-
-	ctx    context.Context
-	client *rtest.Client
-	rt     controller.Runtime
-}
-
-func (suite *controllerSuite) SetupTest() {
-	suite.ctx = testutil.TestContext(suite.T())
-	client := svctest.RunResourceService(suite.T(), types.Register, catalog.RegisterTypes)
-	suite.rt = controller.Runtime{
-		Client: client,
-		Logger: testutil.Logger(suite.T()),
-	}
-	suite.client = rtest.NewClient(client)
-}
-
-func (suite *controllerSuite) TestController() {
-	mgr := controller.NewManager(suite.client, suite.rt.Logger)
-	mgr.Register(Controller())
-	mgr.SetRaftLeader(true)
-	go mgr.Run(suite.ctx)
-
-	backendName := func(name, port string) string {
-		return fmt.Sprintf("catalog.v2beta1.Service/default.local.default/%s?port=%s", name, port)
-	}
-
-	var (
-		apiServiceRef = rtest.Resource(pbcatalog.ServiceType, "api").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				Reference("")
-		fooServiceRef = rtest.Resource(pbcatalog.ServiceType, "foo").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				Reference("")
-		barServiceRef = rtest.Resource(pbcatalog.ServiceType, "bar").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				Reference("")
-
-		computedRoutesID = rtest.Resource(pbmesh.ComputedRoutesType, "api").
-					WithTenancy(resource.DefaultNamespacedTenancy()).
-					ID()
-	)
-
-	// Start out by creating a single port service and let it create the
-	// default computed routes for tcp.
-
-	apiServiceData := &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{"api-"},
-		},
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			// {TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-		},
-	}
-
-	_ = rtest.Resource(pbcatalog.ServiceType, "api").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), apiServiceData).
-		Write(suite.T(), suite.client)
-
-	var lastVersion string
-	testutil.RunStep(suite.T(), "default tcp route", func(t *testing.T) {
-		// Check that the computed routes resource exists and it has one port that is the default.
-		expect := &pbmesh.ComputedRoutes{
-			BoundReferences: []*pbresource.Reference{
-				apiServiceRef,
-			},
-			PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-				"tcp": {
-					UsingDefaultConfig: true,
-					Config: &pbmesh.ComputedPortRoutes_Tcp{
-						Tcp: &pbmesh.ComputedTCPRoute{
-							Rules: []*pbmesh.ComputedTCPRouteRule{{
-								BackendRefs: []*pbmesh.ComputedTCPBackendRef{{
-									BackendTarget: backendName("api", "tcp"),
-								}},
-							}},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "tcp"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_TCP,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("api", "tcp"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(apiServiceRef, "tcp", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-			},
-		}
-
-		lastVersion = requireNewComputedRoutesVersion(t, suite.client, computedRoutesID, "", expect)
-	})
-
-	// Let the default http/http2/grpc routes get created.
-
-	apiServiceData = &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{"api-"},
-		},
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			{TargetPort: "http2", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-			{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-		},
-	}
-
-	_ = rtest.Resource(pbcatalog.ServiceType, "api").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), apiServiceData).
-		Write(suite.T(), suite.client)
-
-	// also create the fooService so we can point to it.
-	fooServiceData := &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{"foo-"},
-		},
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			{TargetPort: "http2", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-			{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-		},
-	}
-
-	_ = rtest.Resource(pbcatalog.ServiceType, "foo").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), fooServiceData).
-		Write(suite.T(), suite.client)
-
-	testutil.RunStep(suite.T(), "default other routes", func(t *testing.T) {
-		expect := &pbmesh.ComputedRoutes{
-			BoundReferences: []*pbresource.Reference{
-				apiServiceRef,
-			},
-			PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-				"tcp": {
-					UsingDefaultConfig: true,
-					Config: &pbmesh.ComputedPortRoutes_Tcp{
-						Tcp: &pbmesh.ComputedTCPRoute{
-							Rules: []*pbmesh.ComputedTCPRouteRule{{
-								BackendRefs: []*pbmesh.ComputedTCPBackendRef{{
-									BackendTarget: backendName("api", "tcp"),
-								}},
-							}},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "tcp"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_TCP,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("api", "tcp"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(apiServiceRef, "tcp", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"http": {
-					UsingDefaultConfig: true,
-					Config: &pbmesh.ComputedPortRoutes_Http{
-						Http: &pbmesh.ComputedHTTPRoute{
-							Rules: []*pbmesh.ComputedHTTPRouteRule{{
-								Matches: []*pbmesh.HTTPRouteMatch{{
-									Path: &pbmesh.HTTPPathMatch{
-										Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-										Value: "/",
-									},
-								}},
-								BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-									BackendTarget: backendName("api", "http"),
-								}},
-							}},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "http"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("api", "http"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(apiServiceRef, "http", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"http2": {
-					UsingDefaultConfig: true,
-					Config: &pbmesh.ComputedPortRoutes_Http{
-						Http: &pbmesh.ComputedHTTPRoute{
-							Rules: []*pbmesh.ComputedHTTPRouteRule{{
-								Matches: []*pbmesh.HTTPRouteMatch{{
-									Path: &pbmesh.HTTPPathMatch{
-										Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-										Value: "/",
-									},
-								}},
-								BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-									BackendTarget: backendName("api", "http2"),
-								}},
-							}},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "http2"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP2,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("api", "http2"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(apiServiceRef, "http2", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"grpc": {
-					UsingDefaultConfig: true,
-					Config: &pbmesh.ComputedPortRoutes_Grpc{
-						Grpc: &pbmesh.ComputedGRPCRoute{
-							Rules: []*pbmesh.ComputedGRPCRouteRule{{
-								Matches: []*pbmesh.GRPCRouteMatch{{}},
-								BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-									BackendTarget: backendName("api", "grpc"),
-								}},
-							}},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "grpc"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_GRPC,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("api", "grpc"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(apiServiceRef, "grpc", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-			},
-		}
-
-		lastVersion = requireNewComputedRoutesVersion(t, suite.client, computedRoutesID, lastVersion, expect)
-	})
-
-	// Customize each route type.
-
-	tcpRoute1 := &pbmesh.TCPRoute{
-		ParentRefs: []*pbmesh.ParentReference{
-			newParentRef(newRef(pbcatalog.ServiceType, "api"), "tcp"),
-		},
-		Rules: []*pbmesh.TCPRouteRule{{
-			BackendRefs: []*pbmesh.TCPBackendRef{{
-				BackendRef: newBackendRef(fooServiceRef, "", ""),
-			}},
-		}},
-	}
-	tcpRoute1ID := rtest.Resource(pbmesh.TCPRouteType, "api-tcp-route1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), tcpRoute1).
-		Write(suite.T(), suite.client).
-		Id
-
-	httpRoute1 := &pbmesh.HTTPRoute{
-		ParentRefs: []*pbmesh.ParentReference{
-			newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
-			newParentRef(newRef(pbcatalog.ServiceType, "api"), "http2"),
-		},
-		Rules: []*pbmesh.HTTPRouteRule{{
-			BackendRefs: []*pbmesh.HTTPBackendRef{{
-				BackendRef: newBackendRef(fooServiceRef, "", ""),
-			}},
-		}},
-	}
-	httpRoute1ID := rtest.Resource(pbmesh.HTTPRouteType, "api-http-route1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), httpRoute1).
-		Write(suite.T(), suite.client).
-		Id
-
-	grpcRoute1 := &pbmesh.GRPCRoute{
-		ParentRefs: []*pbmesh.ParentReference{
-			newParentRef(newRef(pbcatalog.ServiceType, "api"), "grpc"),
-		},
-		Rules: []*pbmesh.GRPCRouteRule{{
-			BackendRefs: []*pbmesh.GRPCBackendRef{{
-				BackendRef: newBackendRef(fooServiceRef, "", ""),
-			}},
-		}},
-	}
-	grpcRoute1ID := rtest.Resource(pbmesh.GRPCRouteType, "api-grpc-route1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), grpcRoute1).
-		Write(suite.T(), suite.client).
-		Id
-
-	testutil.RunStep(suite.T(), "one of each", func(t *testing.T) {
-		expect := &pbmesh.ComputedRoutes{
-			BoundReferences: []*pbresource.Reference{
-				apiServiceRef,
-				fooServiceRef,
-				resource.Reference(grpcRoute1ID, ""),
-				resource.Reference(httpRoute1ID, ""),
-				resource.Reference(tcpRoute1ID, ""),
-			},
-			PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-				"tcp": {
-					Config: &pbmesh.ComputedPortRoutes_Tcp{
-						Tcp: &pbmesh.ComputedTCPRoute{
-							Rules: []*pbmesh.ComputedTCPRouteRule{{
-								BackendRefs: []*pbmesh.ComputedTCPBackendRef{{
-									BackendTarget: backendName("foo", "tcp"),
-								}},
-							}},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "tcp"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_TCP,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "tcp"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "tcp", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"http": {
-					Config: &pbmesh.ComputedPortRoutes_Http{
-						Http: &pbmesh.ComputedHTTPRoute{
-							Rules: []*pbmesh.ComputedHTTPRouteRule{
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: backendName("foo", "http"),
-									}},
-								},
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "http"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "http"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "http", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"grpc": {
-					Config: &pbmesh.ComputedPortRoutes_Grpc{
-						Grpc: &pbmesh.ComputedGRPCRoute{
-							Rules: []*pbmesh.ComputedGRPCRouteRule{
-								{
-									Matches: []*pbmesh.GRPCRouteMatch{{}},
-									BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-										BackendTarget: backendName("foo", "grpc"),
-									}},
-								},
-								{
-									Matches: []*pbmesh.GRPCRouteMatch{{}},
-									BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "grpc"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_GRPC,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "grpc"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "grpc", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"http2": {
-					Config: &pbmesh.ComputedPortRoutes_Http{
-						Http: &pbmesh.ComputedHTTPRoute{
-							Rules: []*pbmesh.ComputedHTTPRouteRule{
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: backendName("foo", "http2"),
-									}},
-								},
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "http2"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP2,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "http2"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "http2", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-			},
-		}
-
-		lastVersion = requireNewComputedRoutesVersion(t, suite.client, computedRoutesID, lastVersion, expect)
-
-		suite.client.WaitForStatusCondition(t, tcpRoute1ID, StatusKey, ConditionXRouteOK)
-		suite.client.WaitForStatusCondition(t, httpRoute1ID, StatusKey, ConditionXRouteOK)
-		suite.client.WaitForStatusCondition(t, grpcRoute1ID, StatusKey, ConditionXRouteOK)
-	})
-
-	// Add another route, with a bad mapping.
-
-	tcpRoute2 := &pbmesh.TCPRoute{
-		ParentRefs: []*pbmesh.ParentReference{
-			newParentRef(newRef(pbcatalog.ServiceType, "api"), "tcp"),
-		},
-		Rules: []*pbmesh.TCPRouteRule{{
-			BackendRefs: []*pbmesh.TCPBackendRef{{
-				BackendRef: newBackendRef(barServiceRef, "", ""),
-			}},
-		}},
-	}
-	tcpRoute2ID := rtest.Resource(pbmesh.TCPRouteType, "api-tcp-route2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), tcpRoute2).
-		Write(suite.T(), suite.client).
-		Id
-
-	httpRoute2 := &pbmesh.HTTPRoute{
-		ParentRefs: []*pbmesh.ParentReference{
-			newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
-			newParentRef(newRef(pbcatalog.ServiceType, "api"), "http2"),
-		},
-		Rules: []*pbmesh.HTTPRouteRule{{
-			Matches: []*pbmesh.HTTPRouteMatch{{
-				Path: &pbmesh.HTTPPathMatch{
-					Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-					Value: "/healthz",
-				},
-			}},
-			BackendRefs: []*pbmesh.HTTPBackendRef{{
-				BackendRef: newBackendRef(barServiceRef, "", ""),
-			}},
-		}},
-	}
-	httpRoute2ID := rtest.Resource(pbmesh.HTTPRouteType, "api-http-route2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), httpRoute2).
-		Write(suite.T(), suite.client).
-		Id
-
-	grpcRoute2 := &pbmesh.GRPCRoute{
-		ParentRefs: []*pbmesh.ParentReference{
-			newParentRef(newRef(pbcatalog.ServiceType, "api"), "grpc"),
-		},
-		Rules: []*pbmesh.GRPCRouteRule{{
-			Matches: []*pbmesh.GRPCRouteMatch{{
-				Method: &pbmesh.GRPCMethodMatch{
-					Type:    pbmesh.GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_EXACT,
-					Service: "billing",
-					Method:  "charge",
-				},
-			}},
-			BackendRefs: []*pbmesh.GRPCBackendRef{{
-				BackendRef: newBackendRef(barServiceRef, "", ""),
-			}},
-		}},
-	}
-	grpcRoute2ID := rtest.Resource(pbmesh.GRPCRouteType, "api-grpc-route2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), grpcRoute2).
-		Write(suite.T(), suite.client).
-		Id
-
-	testutil.RunStep(suite.T(), "one good one bad route", func(t *testing.T) {
-		expect := &pbmesh.ComputedRoutes{
-			BoundReferences: []*pbresource.Reference{
-				apiServiceRef,
-				fooServiceRef,
-				resource.Reference(grpcRoute1ID, ""),
-				resource.Reference(grpcRoute2ID, ""),
-				resource.Reference(httpRoute1ID, ""),
-				resource.Reference(httpRoute2ID, ""),
-				resource.Reference(tcpRoute1ID, ""),
-				resource.Reference(tcpRoute2ID, ""),
-			},
-			PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-				"tcp": {
-					Config: &pbmesh.ComputedPortRoutes_Tcp{
-						Tcp: &pbmesh.ComputedTCPRoute{
-							Rules: []*pbmesh.ComputedTCPRouteRule{
-								{
-									BackendRefs: []*pbmesh.ComputedTCPBackendRef{{
-										BackendTarget: backendName("foo", "tcp"),
-									}},
-								},
-								{
-									BackendRefs: []*pbmesh.ComputedTCPBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "tcp"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_TCP,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "tcp"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "tcp", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"http": {
-					Config: &pbmesh.ComputedPortRoutes_Http{
-						Http: &pbmesh.ComputedHTTPRoute{
-							Rules: []*pbmesh.ComputedHTTPRouteRule{
-								{
-									Matches: []*pbmesh.HTTPRouteMatch{{
-										Path: &pbmesh.HTTPPathMatch{
-											Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-											Value: "/healthz",
-										},
-									}},
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: backendName("foo", "http"),
-									}},
-								},
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "http"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "http"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "http", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"grpc": {
-					Config: &pbmesh.ComputedPortRoutes_Grpc{
-						Grpc: &pbmesh.ComputedGRPCRoute{
-							Rules: []*pbmesh.ComputedGRPCRouteRule{
-								{
-									Matches: []*pbmesh.GRPCRouteMatch{{}},
-									BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-										BackendTarget: backendName("foo", "grpc"),
-									}},
-								},
-								{
-									Matches: []*pbmesh.GRPCRouteMatch{{
-										Method: &pbmesh.GRPCMethodMatch{
-											Type:    pbmesh.GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_EXACT,
-											Service: "billing",
-											Method:  "charge",
-										},
-									}},
-									BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-								{
-									Matches: []*pbmesh.GRPCRouteMatch{{}},
-									BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "grpc"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_GRPC,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "grpc"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "grpc", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"http2": {
-					Config: &pbmesh.ComputedPortRoutes_Http{
-						Http: &pbmesh.ComputedHTTPRoute{
-							Rules: []*pbmesh.ComputedHTTPRouteRule{
-								{
-									Matches: []*pbmesh.HTTPRouteMatch{{
-										Path: &pbmesh.HTTPPathMatch{
-											Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-											Value: "/healthz",
-										},
-									}},
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: backendName("foo", "http2"),
-									}},
-								},
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "http2"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP2,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "http2"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "http2", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-			},
-		}
-
-		lastVersion = requireNewComputedRoutesVersion(t, suite.client, computedRoutesID, lastVersion, expect)
-
-		suite.client.WaitForStatusCondition(t, tcpRoute1ID, StatusKey, ConditionXRouteOK)
-		suite.client.WaitForStatusCondition(t, httpRoute1ID, StatusKey, ConditionXRouteOK)
-		suite.client.WaitForStatusCondition(t, grpcRoute1ID, StatusKey, ConditionXRouteOK)
-
-		suite.client.WaitForStatusCondition(t, tcpRoute2ID, StatusKey,
-			ConditionMissingBackendRef(newRef(pbcatalog.ServiceType, "bar")))
-		suite.client.WaitForStatusCondition(t, httpRoute2ID, StatusKey,
-			ConditionMissingBackendRef(newRef(pbcatalog.ServiceType, "bar")))
-		suite.client.WaitForStatusCondition(t, grpcRoute2ID, StatusKey,
-			ConditionMissingBackendRef(newRef(pbcatalog.ServiceType, "bar")))
-	})
-
-	// Update the route2 routes to point to a real service, but overlap in
-	// their parentrefs with existing ports tied to other xRoutes.
-	//
-	// tcp2 -> http1
-	// http2 -> grpc1
-	// grpc2 -> tcp1
-	//
-	// Also remove customization for the protocol http2.
-
-	tcpRoute2 = &pbmesh.TCPRoute{
-		ParentRefs: []*pbmesh.ParentReference{
-			newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
-		},
-		Rules: []*pbmesh.TCPRouteRule{{
-			BackendRefs: []*pbmesh.TCPBackendRef{{
-				BackendRef: newBackendRef(fooServiceRef, "", ""),
-			}},
-		}},
-	}
-	rtest.ResourceID(tcpRoute2ID).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), tcpRoute2).
-		Write(suite.T(), suite.client)
-
-	httpRoute2 = &pbmesh.HTTPRoute{
-		ParentRefs: []*pbmesh.ParentReference{
-			newParentRef(newRef(pbcatalog.ServiceType, "api"), "grpc"),
-		},
-		Rules: []*pbmesh.HTTPRouteRule{{
-			Matches: []*pbmesh.HTTPRouteMatch{{
-				Path: &pbmesh.HTTPPathMatch{
-					Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-					Value: "/healthz",
-				},
-			}},
-			BackendRefs: []*pbmesh.HTTPBackendRef{{
-				BackendRef: newBackendRef(fooServiceRef, "", ""),
-			}},
-		}},
-	}
-	rtest.ResourceID(httpRoute2ID).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), httpRoute2).
-		Write(suite.T(), suite.client)
-
-	grpcRoute2 = &pbmesh.GRPCRoute{
-		ParentRefs: []*pbmesh.ParentReference{
-			newParentRef(newRef(pbcatalog.ServiceType, "api"), "tcp"),
-		},
-		Rules: []*pbmesh.GRPCRouteRule{{
-			Matches: []*pbmesh.GRPCRouteMatch{{
-				Method: &pbmesh.GRPCMethodMatch{
-					Type:    pbmesh.GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_EXACT,
-					Service: "billing",
-					Method:  "charge",
-				},
-			}},
-			BackendRefs: []*pbmesh.GRPCBackendRef{{
-				BackendRef: newBackendRef(fooServiceRef, "", ""),
-			}},
-		}},
-	}
-	rtest.ResourceID(grpcRoute2ID).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), grpcRoute2).
-		Write(suite.T(), suite.client)
-
-	testutil.RunStep(suite.T(), "overlapping xRoutes generate conflicts", func(t *testing.T) {
-		expect := &pbmesh.ComputedRoutes{
-			BoundReferences: []*pbresource.Reference{
-				apiServiceRef,
-				fooServiceRef,
-				resource.Reference(grpcRoute1ID, ""),
-				resource.Reference(grpcRoute2ID, ""),
-				resource.Reference(httpRoute1ID, ""),
-				resource.Reference(httpRoute2ID, ""),
-				resource.Reference(tcpRoute1ID, ""),
-				resource.Reference(tcpRoute2ID, ""),
-			},
-			PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-				"tcp": {
-					Config: &pbmesh.ComputedPortRoutes_Tcp{
-						Tcp: &pbmesh.ComputedTCPRoute{
-							Rules: []*pbmesh.ComputedTCPRouteRule{{
-								BackendRefs: []*pbmesh.ComputedTCPBackendRef{{
-									BackendTarget: backendName("foo", "tcp"),
-								}},
-							}},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "tcp"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_TCP,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "tcp"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "tcp", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"http": {
-					Config: &pbmesh.ComputedPortRoutes_Http{
-						Http: &pbmesh.ComputedHTTPRoute{
-							Rules: []*pbmesh.ComputedHTTPRouteRule{
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: backendName("foo", "http"),
-									}},
-								},
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "http"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "http"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "http", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"grpc": {
-					Config: &pbmesh.ComputedPortRoutes_Grpc{
-						Grpc: &pbmesh.ComputedGRPCRoute{
-							Rules: []*pbmesh.ComputedGRPCRouteRule{
-								{
-									Matches: []*pbmesh.GRPCRouteMatch{{}},
-									BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-										BackendTarget: backendName("foo", "grpc"),
-									}},
-								},
-								{
-									Matches: []*pbmesh.GRPCRouteMatch{{}},
-									BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "grpc"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_GRPC,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "grpc"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "grpc", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"http2": {
-					Config: &pbmesh.ComputedPortRoutes_Http{
-						Http: &pbmesh.ComputedHTTPRoute{
-							Rules: []*pbmesh.ComputedHTTPRouteRule{
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: backendName("foo", "http2"),
-									}},
-								},
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "http2"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP2,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "http2"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "http2", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-			},
-		}
-
-		lastVersion = requireNewComputedRoutesVersion(t, suite.client, computedRoutesID, lastVersion, expect)
-
-		suite.client.WaitForStatusCondition(t, tcpRoute1ID, StatusKey, ConditionXRouteOK)
-		suite.client.WaitForStatusCondition(t, httpRoute1ID, StatusKey, ConditionXRouteOK)
-		suite.client.WaitForStatusCondition(t, grpcRoute1ID, StatusKey, ConditionXRouteOK)
-
-		suite.client.WaitForStatusCondition(t, tcpRoute2ID, StatusKey,
-			ConditionConflictNotBoundToParentRef(newRef(pbcatalog.ServiceType, "api"), "http", pbmesh.HTTPRouteType))
-		suite.client.WaitForStatusCondition(t, httpRoute2ID, StatusKey,
-			ConditionConflictNotBoundToParentRef(newRef(pbcatalog.ServiceType, "api"), "grpc", pbmesh.GRPCRouteType))
-		suite.client.WaitForStatusCondition(t, grpcRoute2ID, StatusKey,
-			ConditionConflictNotBoundToParentRef(newRef(pbcatalog.ServiceType, "api"), "tcp", pbmesh.TCPRouteType))
-	})
-
-	// - Delete the bad routes
-	// - delete the original grpc route
-	// - create a new grpc route with a later name so it loses the conflict
-	//   battle, and do a wildcard port binding
-
-	suite.client.MustDelete(suite.T(), tcpRoute2ID)
-	suite.client.MustDelete(suite.T(), httpRoute2ID)
-	suite.client.MustDelete(suite.T(), grpcRoute1ID)
-	suite.client.MustDelete(suite.T(), grpcRoute2ID)
-
-	suite.client.WaitForDeletion(suite.T(), tcpRoute2ID)
-	suite.client.WaitForDeletion(suite.T(), httpRoute2ID)
-	suite.client.WaitForDeletion(suite.T(), grpcRoute1ID)
-	suite.client.WaitForDeletion(suite.T(), grpcRoute2ID)
-
-	// Re-create with newarly the same data (wildcard port now) with a newer name.
-	grpcRoute1 = &pbmesh.GRPCRoute{
-		ParentRefs: []*pbmesh.ParentReference{
-			newParentRef(newRef(pbcatalog.ServiceType, "api"), ""),
-		},
-		Rules: []*pbmesh.GRPCRouteRule{{
-			BackendRefs: []*pbmesh.GRPCBackendRef{{
-				BackendRef: newBackendRef(fooServiceRef, "", ""),
-			}},
-		}},
-	}
-	grpcRoute1ID = rtest.Resource(pbmesh.GRPCRouteType, "zzz-bad-route").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), grpcRoute1).
-		Write(suite.T(), suite.client).
-		Id
-
-	testutil.RunStep(suite.T(), "overlapping xRoutes due to port wildcarding", func(t *testing.T) {
-		expect := &pbmesh.ComputedRoutes{
-			BoundReferences: []*pbresource.Reference{
-				apiServiceRef,
-				fooServiceRef,
-				resource.Reference(grpcRoute1ID, ""),
-				resource.Reference(httpRoute1ID, ""),
-				resource.Reference(tcpRoute1ID, ""),
-			},
-			PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-				"tcp": {
-					Config: &pbmesh.ComputedPortRoutes_Tcp{
-						Tcp: &pbmesh.ComputedTCPRoute{
-							Rules: []*pbmesh.ComputedTCPRouteRule{{
-								BackendRefs: []*pbmesh.ComputedTCPBackendRef{{
-									BackendTarget: backendName("foo", "tcp"),
-								}},
-							}},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "tcp"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_TCP,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "tcp"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "tcp", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"http": {
-					Config: &pbmesh.ComputedPortRoutes_Http{
-						Http: &pbmesh.ComputedHTTPRoute{
-							Rules: []*pbmesh.ComputedHTTPRouteRule{
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: backendName("foo", "http"),
-									}},
-								},
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "http"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "http"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "http", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"grpc": {
-					Config: &pbmesh.ComputedPortRoutes_Grpc{
-						Grpc: &pbmesh.ComputedGRPCRoute{
-							Rules: []*pbmesh.ComputedGRPCRouteRule{
-								{
-									Matches: []*pbmesh.GRPCRouteMatch{{}},
-									BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-										BackendTarget: backendName("foo", "grpc"),
-									}},
-								},
-								{
-									Matches: []*pbmesh.GRPCRouteMatch{{}},
-									BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "grpc"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_GRPC,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "grpc"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "grpc", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-				"http2": {
-					Config: &pbmesh.ComputedPortRoutes_Http{
-						Http: &pbmesh.ComputedHTTPRoute{
-							Rules: []*pbmesh.ComputedHTTPRouteRule{
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: backendName("foo", "http2"),
-									}},
-								},
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(apiServiceRef, "http2"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP2,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("foo", "http2"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(fooServiceRef, "http2", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-			},
-		}
-
-		suite.client.WaitForStatusConditions(t, grpcRoute1ID, StatusKey,
-			ConditionConflictNotBoundToParentRef(newRef(pbcatalog.ServiceType, "api"), "http", pbmesh.HTTPRouteType),
-			ConditionConflictNotBoundToParentRef(newRef(pbcatalog.ServiceType, "api"), "http2", pbmesh.HTTPRouteType),
-			ConditionConflictNotBoundToParentRef(newRef(pbcatalog.ServiceType, "api"), "tcp", pbmesh.TCPRouteType))
-
-		lastVersion = requireNewComputedRoutesVersion(t, suite.client, computedRoutesID, "" /*no change*/, expect)
-
-		suite.client.WaitForStatusCondition(t, tcpRoute1ID, StatusKey, ConditionXRouteOK)
-		suite.client.WaitForStatusCondition(t, httpRoute1ID, StatusKey, ConditionXRouteOK)
-
-	})
-
-	// Remove the mesh port from api service.
-
-	apiServiceData = &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Prefixes: []string{"api-"},
-		},
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			{TargetPort: "http2", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-			{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-		},
-	}
-
-	_ = rtest.Resource(pbcatalog.ServiceType, "api").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), apiServiceData).
-		Write(suite.T(), suite.client)
-
-	testutil.RunStep(suite.T(), "entire generated resource is deleted", func(t *testing.T) {
-		suite.client.WaitForDeletion(t, computedRoutesID)
-
-		suite.client.WaitForStatusCondition(t, tcpRoute1ID, StatusKey,
-			ConditionParentRefOutsideMesh(newRef(pbcatalog.ServiceType, "api")))
-		suite.client.WaitForStatusCondition(t, httpRoute1ID, StatusKey,
-			ConditionParentRefOutsideMesh(newRef(pbcatalog.ServiceType, "api")))
-		suite.client.WaitForStatusCondition(t, grpcRoute1ID, StatusKey,
-			ConditionParentRefOutsideMesh(newRef(pbcatalog.ServiceType, "api")))
-	})
-
-	// Get down to just 2 ports for all relevant services.
-	for _, name := range []string{"foo", "bar", "api"} {
-		_ = rtest.Resource(pbcatalog.ServiceType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(suite.T(), &pbcatalog.Service{
-				Workloads: &pbcatalog.WorkloadSelector{
-					Prefixes: []string{name + "-"},
-				},
-				Ports: []*pbcatalog.ServicePort{
-					{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-					{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-			}).
-			Write(suite.T(), suite.client)
-	}
-
-	httpRoute1 = &pbmesh.HTTPRoute{
-		ParentRefs: []*pbmesh.ParentReference{
-			newParentRef(fooServiceRef, "http"),
-			newParentRef(barServiceRef, "http"),
-		},
-		Rules: []*pbmesh.HTTPRouteRule{{
-			BackendRefs: []*pbmesh.HTTPBackendRef{{
-				BackendRef: newBackendRef(apiServiceRef, "", ""),
-			}},
-		}},
-	}
-	httpRoute1ID = rtest.Resource(pbmesh.HTTPRouteType, "route1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), httpRoute1).
-		Write(suite.T(), suite.client).
-		Id
-
-	var (
-		fooLastVersion string
-		barLastVersion string
-
-		fooComputedRoutesID = rtest.Resource(pbmesh.ComputedRoutesType, "foo").
-					WithTenancy(resource.DefaultNamespacedTenancy()).
-					ID()
-		barComputedRoutesID = rtest.Resource(pbmesh.ComputedRoutesType, "bar").
-					WithTenancy(resource.DefaultNamespacedTenancy()).
-					ID()
-	)
-
-	testutil.RunStep(suite.T(), "create a route linked to two parents", func(t *testing.T) {
-		expectFoo := &pbmesh.ComputedRoutes{
-			BoundReferences: []*pbresource.Reference{
-				apiServiceRef,
-				fooServiceRef,
-				resource.Reference(httpRoute1ID, ""),
-			},
-			PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-				"http": {
-					Config: &pbmesh.ComputedPortRoutes_Http{
-						Http: &pbmesh.ComputedHTTPRoute{
-							Rules: []*pbmesh.ComputedHTTPRouteRule{
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: backendName("api", "http"),
-									}},
-								},
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(fooServiceRef, "http"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("api", "http"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(apiServiceRef, "http", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-			},
-		}
-		expectBar := &pbmesh.ComputedRoutes{
-			BoundReferences: []*pbresource.Reference{
-				apiServiceRef,
-				barServiceRef,
-				resource.Reference(httpRoute1ID, ""),
-			},
-			PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-				"http": {
-					Config: &pbmesh.ComputedPortRoutes_Http{
-						Http: &pbmesh.ComputedHTTPRoute{
-							Rules: []*pbmesh.ComputedHTTPRouteRule{
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: backendName("api", "http"),
-									}},
-								},
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: types.NullRouteBackend,
-									}},
-								},
-							},
-						},
-					},
-					ParentRef: newParentRef(barServiceRef, "http"),
-					Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("api", "http"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(apiServiceRef, "http", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-			},
-		}
-
-		fooLastVersion = requireNewComputedRoutesVersion(t, suite.client, fooComputedRoutesID, fooLastVersion, expectFoo)
-		barLastVersion = requireNewComputedRoutesVersion(t, suite.client, barComputedRoutesID, barLastVersion, expectBar)
-
-		suite.client.WaitForStatusCondition(t, httpRoute1ID, StatusKey, ConditionXRouteOK)
-	})
-
-	// Remove bar parent
-	httpRoute1 = &pbmesh.HTTPRoute{
-		ParentRefs: []*pbmesh.ParentReference{
-			newParentRef(fooServiceRef, "http"),
-		},
-		Rules: []*pbmesh.HTTPRouteRule{{
-			BackendRefs: []*pbmesh.HTTPBackendRef{{
-				BackendRef: newBackendRef(apiServiceRef, "", ""),
-			}},
-		}},
-	}
-	httpRoute1ID = rtest.Resource(pbmesh.HTTPRouteType, "route1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), httpRoute1).
-		Write(suite.T(), suite.client).
-		Id
-
-	testutil.RunStep(suite.T(), "remove a parent ref and show that the old computed routes is reconciled one more time", func(t *testing.T) {
-		expectBar := &pbmesh.ComputedRoutes{
-			BoundReferences: []*pbresource.Reference{
-				barServiceRef,
-			},
-			PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-				"http": {
-					Config: &pbmesh.ComputedPortRoutes_Http{
-						Http: &pbmesh.ComputedHTTPRoute{
-							Rules: []*pbmesh.ComputedHTTPRouteRule{
-								{
-									Matches: defaultHTTPRouteMatches(),
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: backendName("bar", "http"),
-									}},
-								},
-							},
-						},
-					},
-					UsingDefaultConfig: true,
-					ParentRef:          newParentRef(barServiceRef, "http"),
-					Protocol:           pbcatalog.Protocol_PROTOCOL_HTTP,
-					Targets: map[string]*pbmesh.BackendTargetDetails{
-						backendName("bar", "http"): {
-							Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-							MeshPort:          "mesh",
-							BackendRef:        newBackendRef(barServiceRef, "http", ""),
-							DestinationConfig: defaultDestConfig(),
-						},
-					},
-				},
-			},
-		}
-
-		barLastVersion = requireNewComputedRoutesVersion(t, suite.client, barComputedRoutesID, barLastVersion, expectBar)
-
-		suite.client.WaitForStatusCondition(t, httpRoute1ID, StatusKey, ConditionXRouteOK)
-	})
-}
-
-func newParentRef(ref *pbresource.Reference, port string) *pbmesh.ParentReference {
-	return &pbmesh.ParentReference{
-		Ref:  ref,
-		Port: port,
-	}
-}
-
-func newBackendRef(ref *pbresource.Reference, port string, datacenter string) *pbmesh.BackendReference {
-	return &pbmesh.BackendReference{
-		Ref:        ref,
-		Port:       port,
-		Datacenter: datacenter,
-	}
-}
-
-func requireNewComputedRoutesVersion(
-	t *testing.T,
-	client *rtest.Client,
-	id *pbresource.ID,
-	version string,
-	expected *pbmesh.ComputedRoutes,
-) string {
-	t.Helper()
-
-	var nextVersion string
-	retry.Run(t, func(r *retry.R) {
-		res := client.WaitForNewVersion(r, id, version)
-
-		var mc pbmesh.ComputedRoutes
-		require.NoError(r, res.Data.UnmarshalTo(&mc))
-		prototest.AssertDeepEqual(r, expected, &mc)
-
-		nextVersion = res.Version
-	})
-	return nextVersion
-}
-
-func TestController(t *testing.T) {
-	suite.Run(t, new(controllerSuite))
-}
diff --git a/internal/mesh/internal/controllers/routes/generate.go b/internal/mesh/internal/controllers/routes/generate.go
deleted file mode 100644
index 9bfb2808e3035..0000000000000
--- a/internal/mesh/internal/controllers/routes/generate.go
+++ /dev/null
@@ -1,835 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package routes
-
-import (
-	"fmt"
-	"time"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/durationpb"
-
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes/loader"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// GenerateComputedRoutes walks a set of related resources and assembles them
-// into one effective easy-to-consume ComputedRoutes result.
-//
-// Any status conditions generated during traversal can be queued for
-// persistence using the PendingStatuses map.
-//
-// This should not internally generate, nor return any errors.
-func GenerateComputedRoutes(
-	related *loader.RelatedResources,
-	pending PendingStatuses,
-) []*ComputedRoutesResult {
-	out := make([]*ComputedRoutesResult, 0, len(related.ComputedRoutesList))
-	for _, computedRoutesID := range related.ComputedRoutesList {
-		out = append(out, compile(related, computedRoutesID, pending))
-	}
-	return out
-}
-
-type ComputedRoutesResult struct {
-	// ID is always required.
-	ID *pbresource.ID
-	// OwnerID is only required on upserts.
-	OwnerID *pbresource.ID
-	// Data being empty means delete if exists.
-	Data *pbmesh.ComputedRoutes
-}
-
-func compile(
-	related *loader.RelatedResources,
-	computedRoutesID *pbresource.ID,
-	pending PendingStatuses,
-) *ComputedRoutesResult {
-	// There is one computed routes resource for the entire service (perfect name alignment).
-	//
-	// All ports are embedded within.
-
-	parentServiceID := &pbresource.ID{
-		Type:    pbcatalog.ServiceType,
-		Tenancy: computedRoutesID.Tenancy,
-		Name:    computedRoutesID.Name,
-	}
-
-	parentServiceRef := resource.Reference(parentServiceID, "")
-
-	// The bound reference collector is supposed to aggregate all
-	// references to resources that influence the production of
-	// a ComputedRoutes resource.
-	//
-	// We only add a reference to the collector if the following are ALL true:
-	//
-	// - We load the resource for some reason.
-	// - The resource is found.
-	// - We decided to use the information in that resource to produce
-	//   ComputedRoutes.
-	//
-	// We currently add all of the data here, but only use the xRoute
-	// references to enhance the DependencyMappers for this Controller. In the
-	// future we could use the others, but for now they are harmless to include
-	// in the produced resource and is beneficial from an audit/debugging
-	// perspective to know all of the inputs that produced this output.
-	boundRefCollector := NewBoundReferenceCollector()
-
-	parentServiceDec := related.GetService(parentServiceID)
-	if parentServiceDec == nil {
-		return &ComputedRoutesResult{
-			ID:   computedRoutesID,
-			Data: nil, // returning nil signals a delete is requested
-		}
-	}
-	parentServiceID = parentServiceDec.Resource.Id // get ULID out of it
-
-	boundRefCollector.AddRefOrID(parentServiceRef)
-
-	var (
-		inMesh               = false
-		parentMeshPort       string
-		allowedPortProtocols = make(map[string]pbcatalog.Protocol)
-	)
-	for _, port := range parentServiceDec.Data.Ports {
-		if port.Protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-			inMesh = true
-			parentMeshPort = port.TargetPort
-			continue // skip
-		}
-		allowedPortProtocols[port.TargetPort] = port.Protocol
-	}
-
-	if !inMesh {
-		return &ComputedRoutesResult{
-			ID:   computedRoutesID,
-			Data: nil, // returning nil signals a delete is requested
-		}
-	}
-
-	computedRoutes := &pbmesh.ComputedRoutes{
-		PortedConfigs: make(map[string]*pbmesh.ComputedPortRoutes),
-	}
-
-	// Visit all of the routes relevant to this computed routes.
-	routeNodesByPort := make(map[string][]*inputRouteNode)
-	related.WalkRoutesForParentRef(parentServiceRef, func(
-		rk resource.ReferenceKey,
-		res *pbresource.Resource,
-		xroute types.XRouteData,
-	) {
-		var (
-			ports          []string
-			wildcardedPort bool
-		)
-		for _, ref := range xroute.GetParentRefs() {
-			if resource.ReferenceOrIDMatch(ref.Ref, parentServiceRef) {
-				if ref.Port == "" {
-					wildcardedPort = true
-					break
-				}
-				if _, ok := allowedPortProtocols[ref.Port]; ok {
-					ports = append(ports, ref.Port)
-				}
-			}
-		}
-
-		// Do a port explosion.
-		if wildcardedPort {
-			ports = nil
-			for port := range allowedPortProtocols {
-				ports = append(ports, port)
-			}
-		}
-
-		if len(ports) == 0 {
-			return // not relevant to this computed routes
-		}
-		boundRefCollector.AddRefOrID(res.Id)
-
-		for _, port := range ports {
-			if port == "" {
-				panic("impossible to have an empty port here")
-			}
-
-			var node *inputRouteNode
-			switch route := xroute.(type) {
-			case *pbmesh.HTTPRoute:
-				node = compileHTTPRouteNode(port, res, route, related, boundRefCollector)
-			case *pbmesh.GRPCRoute:
-				node = compileGRPCRouteNode(port, res, route, related, boundRefCollector)
-			case *pbmesh.TCPRoute:
-				node = compileTCPRouteNode(port, res, route, related, boundRefCollector)
-			default:
-				panic(fmt.Sprintf("unexpected xroute type: %T", xroute))
-			}
-
-			routeNodesByPort[node.ParentPort] = append(routeNodesByPort[node.ParentPort], node)
-		}
-	})
-
-	// Fill in defaults where there was no xroute defined at all.
-	for port, protocol := range allowedPortProtocols {
-		if _, ok := routeNodesByPort[port]; !ok {
-			var typ *pbresource.Type
-
-			// enumcover:pbcatalog.Protocol
-			switch protocol {
-			case pbcatalog.Protocol_PROTOCOL_HTTP2:
-				typ = pbmesh.HTTPRouteType
-			case pbcatalog.Protocol_PROTOCOL_HTTP:
-				typ = pbmesh.HTTPRouteType
-			case pbcatalog.Protocol_PROTOCOL_GRPC:
-				typ = pbmesh.GRPCRouteType
-			case pbcatalog.Protocol_PROTOCOL_TCP:
-				typ = pbmesh.TCPRouteType
-			case pbcatalog.Protocol_PROTOCOL_MESH:
-				fallthrough // to default
-			case pbcatalog.Protocol_PROTOCOL_UNSPECIFIED:
-				fallthrough // to default
-			default:
-				continue // not possible
-			}
-
-			routeNode := createDefaultRouteNode(parentServiceRef, parentMeshPort, port, typ)
-
-			routeNodesByPort[port] = append(routeNodesByPort[port], routeNode)
-		}
-	}
-
-	// First sort the input routes by the final criteria, so we can let the
-	// stable sort take care of the ultimate tiebreakers.
-	for port, routeNodes := range routeNodesByPort {
-		gammaInitialSortWrappedRoutes(routeNodes)
-
-		// Now that they are sorted by age and name, we can figure out which
-		// xRoute should apply to each port (the first).
-		var top *inputRouteNode
-		for i, routeNode := range routeNodes {
-			if i == 0 {
-				top = routeNode
-				continue
-			}
-			if top.RouteType != routeNode.RouteType {
-				// This should only happen with user-provided ones, since we
-				// would never have two synthetic default routes at once.
-				res := routeNode.OriginalResource
-				if res != nil {
-					pending.AddConditions(resource.NewReferenceKey(res.Id), res, []*pbresource.Condition{
-						ConditionConflictNotBoundToParentRef(
-							parentServiceRef,
-							port,
-							top.RouteType,
-						),
-					})
-				}
-				continue
-			}
-			top.AppendRulesFrom(routeNode)
-			top.AddTargetsFrom(routeNode)
-		}
-
-		// Clear this field as it's no longer used and doesn't make sense once
-		// this represents multiple xRoutes or defaults.
-		top.OriginalResource = nil
-
-		// Now we can do the big sort.
-		gammaSortRouteRules(top)
-
-		// Inject catch-all rules to ensure stray requests will explicitly be blackholed.
-		if !top.Default {
-			if types.IsTCPRouteType(top.RouteType) {
-				if len(top.TCPRules) == 0 {
-					// User requests traffic blackhole.
-					appendDefaultRouteNode(top, types.NullRouteBackend)
-				}
-			} else {
-				// There are no match criteria on a TCPRoute, so never a need
-				// to add a catch-all.
-				appendDefaultRouteNode(top, types.NullRouteBackend)
-			}
-		}
-
-		parentRef := &pbmesh.ParentReference{
-			Ref:  parentServiceRef,
-			Port: port,
-		}
-
-		mc := &pbmesh.ComputedPortRoutes{
-			UsingDefaultConfig: top.Default,
-			ParentRef:          parentRef,
-			Protocol:           allowedPortProtocols[port],
-			Targets:            top.NewTargets,
-		}
-
-		switch {
-		case resource.EqualType(top.RouteType, pbmesh.HTTPRouteType):
-			if mc.Protocol == pbcatalog.Protocol_PROTOCOL_TCP {
-				// The rest are HTTP-like
-				mc.Protocol = pbcatalog.Protocol_PROTOCOL_HTTP
-			}
-			mc.Config = &pbmesh.ComputedPortRoutes_Http{
-				Http: &pbmesh.ComputedHTTPRoute{
-					Rules: top.HTTPRules,
-				},
-			}
-		case resource.EqualType(top.RouteType, pbmesh.GRPCRouteType):
-			mc.Protocol = pbcatalog.Protocol_PROTOCOL_GRPC
-			mc.Config = &pbmesh.ComputedPortRoutes_Grpc{
-				Grpc: &pbmesh.ComputedGRPCRoute{
-					Rules: top.GRPCRules,
-				},
-			}
-		case resource.EqualType(top.RouteType, pbmesh.TCPRouteType):
-			mc.Protocol = pbcatalog.Protocol_PROTOCOL_TCP
-			mc.Config = &pbmesh.ComputedPortRoutes_Tcp{
-				Tcp: &pbmesh.ComputedTCPRoute{
-					Rules: top.TCPRules,
-				},
-			}
-		default:
-			panic("impossible")
-		}
-
-		computedRoutes.PortedConfigs[port] = mc
-
-		// The first pass collects the failover policies and generates additional targets.
-		for _, details := range mc.Targets {
-			svcRef := details.BackendRef.Ref
-
-			svc := related.GetService(svcRef)
-			if svc == nil {
-				panic("impossible at this point; should already have been handled before getting here")
-			}
-			boundRefCollector.AddRefOrID(svcRef)
-
-			failoverPolicy := related.GetFailoverPolicyForService(svcRef)
-			if failoverPolicy != nil {
-				simpleFailoverPolicy := catalog.SimplifyFailoverPolicy(svc.Data, failoverPolicy.Data)
-				portFailoverConfig, ok := simpleFailoverPolicy.PortConfigs[details.BackendRef.Port]
-				if ok {
-					boundRefCollector.AddRefOrID(failoverPolicy.Resource.Id)
-
-					details.FailoverConfig = compileFailoverConfig(
-						related,
-						portFailoverConfig,
-						mc.Targets,
-						boundRefCollector,
-					)
-				}
-			}
-		}
-
-		// Do a second pass to handle shared things after we've dumped the
-		// failover legs into here.
-		for _, details := range mc.Targets {
-			svcRef := details.BackendRef.Ref
-			destPolicy := related.GetDestinationPolicyForService(svcRef)
-			if destPolicy != nil {
-				portDestConfig, ok := destPolicy.Data.PortConfigs[details.BackendRef.Port]
-				if ok {
-					boundRefCollector.AddRefOrID(destPolicy.Resource.Id)
-					details.DestinationConfig = portDestConfig
-				}
-			}
-			details.DestinationConfig = fillInDefaultDestConfig(details.DestinationConfig)
-		}
-
-		// Pull target information up to the level of the rules.
-		switch x := mc.Config.(type) {
-		case *pbmesh.ComputedPortRoutes_Http:
-			route := x.Http
-			for _, rule := range route.Rules {
-				// If there are multiple legs (split) then choose the first actually set value.
-				var requestTimeoutFallback *durationpb.Duration
-				for _, backendRef := range rule.BackendRefs {
-					if backendRef.BackendTarget == types.NullRouteBackend {
-						continue
-					}
-					details, ok := mc.Targets[backendRef.BackendTarget]
-					if !ok {
-						continue
-					}
-					if details.DestinationConfig.RequestTimeout != nil {
-						requestTimeoutFallback = details.DestinationConfig.RequestTimeout
-						break
-					}
-				}
-
-				if requestTimeoutFallback == nil {
-					continue // nothing to do
-				}
-
-				if rule.Timeouts == nil {
-					rule.Timeouts = &pbmesh.HTTPRouteTimeouts{}
-				}
-				if rule.Timeouts.Request == nil {
-					rule.Timeouts.Request = requestTimeoutFallback
-				}
-			}
-		case *pbmesh.ComputedPortRoutes_Grpc:
-			route := x.Grpc
-			for _, rule := range route.Rules {
-				// If there are multiple legs (split) then choose the first actually set value.
-				var requestTimeoutFallback *durationpb.Duration
-				for _, backendRef := range rule.BackendRefs {
-					if backendRef.BackendTarget == types.NullRouteBackend {
-						continue
-					}
-					details, ok := mc.Targets[backendRef.BackendTarget]
-					if !ok {
-						continue
-					}
-					if details.DestinationConfig.RequestTimeout != nil {
-						requestTimeoutFallback = details.DestinationConfig.RequestTimeout
-						break
-					}
-				}
-
-				if requestTimeoutFallback == nil {
-					continue // nothing to do
-				}
-
-				if rule.Timeouts == nil {
-					rule.Timeouts = &pbmesh.HTTPRouteTimeouts{}
-				}
-				if rule.Timeouts.Request == nil {
-					rule.Timeouts.Request = requestTimeoutFallback
-				}
-			}
-		case *pbmesh.ComputedPortRoutes_Tcp:
-		}
-
-		computedRoutes.PortedConfigs[port] = mc
-	}
-
-	if len(computedRoutes.PortedConfigs) == 0 {
-		// This service only exposes a "mesh" port, so it cannot be another service's upstream.
-		return &ComputedRoutesResult{
-			ID:   computedRoutesID,
-			Data: nil, // returning nil signals a delete is requested
-		}
-	}
-
-	computedRoutes.BoundReferences = boundRefCollector.List()
-
-	return &ComputedRoutesResult{
-		ID:      computedRoutesID,
-		OwnerID: parentServiceID,
-		Data:    computedRoutes,
-	}
-}
-
-func compileFailoverConfig(
-	related *loader.RelatedResources,
-	failoverConfig *pbcatalog.FailoverConfig,
-	targets map[string]*pbmesh.BackendTargetDetails,
-	brc *BoundReferenceCollector,
-) *pbmesh.ComputedFailoverConfig {
-	if failoverConfig == nil {
-		return nil
-	}
-
-	cfc := &pbmesh.ComputedFailoverConfig{
-		Destinations:  make([]*pbmesh.ComputedFailoverDestination, 0, len(failoverConfig.Destinations)),
-		Mode:          failoverConfig.Mode,
-		Regions:       failoverConfig.Regions,
-		SamenessGroup: failoverConfig.SamenessGroup,
-	}
-
-	for _, dest := range failoverConfig.Destinations {
-		backendRef := &pbmesh.BackendReference{
-			Ref:        dest.Ref,
-			Port:       dest.Port,
-			Datacenter: dest.Datacenter,
-		}
-
-		destSvcRef := dest.Ref
-
-		svc := related.GetService(destSvcRef)
-		if svc != nil {
-			brc.AddRefOrID(svc.Resource.Id)
-		}
-
-		var backendTargetName string
-		ok, meshPort := shouldRouteTrafficToBackend(svc, backendRef)
-		if !ok {
-			continue // skip this leg of failover for now
-		}
-
-		destTargetName := types.BackendRefToComputedRoutesTarget(backendRef)
-
-		if _, exists := targets[destTargetName]; !exists {
-			// Add to output as an indirect target.
-			targets[destTargetName] = &pbmesh.BackendTargetDetails{
-				Type:       pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_INDIRECT,
-				BackendRef: backendRef,
-				MeshPort:   meshPort,
-			}
-		}
-		backendTargetName = destTargetName
-
-		cfc.Destinations = append(cfc.Destinations, &pbmesh.ComputedFailoverDestination{
-			BackendTarget: backendTargetName,
-		})
-	}
-	return cfc
-}
-
-func fillInDefaultDestConfig(target *pbmesh.DestinationConfig) *pbmesh.DestinationConfig {
-	base := defaultDestConfig()
-
-	if target == nil {
-		return proto.Clone(base).(*pbmesh.DestinationConfig)
-	}
-
-	out := proto.Clone(target).(*pbmesh.DestinationConfig)
-
-	if out.ConnectTimeout == nil {
-		out.ConnectTimeout = base.GetConnectTimeout()
-	}
-
-	return out
-}
-
-func defaultDestConfig() *pbmesh.DestinationConfig {
-	return &pbmesh.DestinationConfig{
-		ConnectTimeout: durationpb.New(5 * time.Second),
-	}
-}
-
-func compileHTTPRouteNode(
-	port string,
-	res *pbresource.Resource,
-	route *pbmesh.HTTPRoute,
-	serviceGetter serviceGetter,
-	brc *BoundReferenceCollector,
-) *inputRouteNode {
-	route = protoClone(route)
-	node := newInputRouteNode(port)
-
-	node.RouteType = pbmesh.HTTPRouteType
-	node.OriginalResource = res
-	node.HTTPRules = make([]*pbmesh.ComputedHTTPRouteRule, 0, len(route.Rules))
-	for _, rule := range route.Rules {
-		irule := &pbmesh.ComputedHTTPRouteRule{
-			Matches:     protoSliceClone(rule.Matches),
-			Filters:     protoSliceClone(rule.Filters),
-			BackendRefs: make([]*pbmesh.ComputedHTTPBackendRef, 0, len(rule.BackendRefs)),
-			Timeouts:    rule.Timeouts,
-			Retries:     rule.Retries,
-		}
-
-		// https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1beta1.HTTPRouteRule
-		//
-		// If no matches are specified, the default is a prefix path match
-		// on “/”, which has the effect of matching every HTTP request.
-		if len(irule.Matches) == 0 {
-			irule.Matches = defaultHTTPRouteMatches()
-		}
-		for _, match := range irule.Matches {
-			if match.Path == nil {
-				// Path specifies a HTTP request path matcher. If this
-				// field is not specified, a default prefix match on
-				// the “/” path is provided.
-				match.Path = defaultHTTPPathMatch()
-			}
-		}
-
-		for _, backendRef := range rule.BackendRefs {
-			// Infer port name from parent ref.
-			if backendRef.BackendRef.Port == "" {
-				backendRef.BackendRef.Port = port
-			}
-
-			var (
-				backendTarget string
-				backendSvc    = serviceGetter.GetService(backendRef.BackendRef.Ref)
-			)
-			if backendSvc != nil {
-				brc.AddRefOrID(backendSvc.Resource.Id)
-			}
-			if ok, meshPort := shouldRouteTrafficToBackend(backendSvc, backendRef.BackendRef); ok {
-				details := &pbmesh.BackendTargetDetails{
-					Type:       pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-					BackendRef: backendRef.BackendRef,
-					MeshPort:   meshPort,
-				}
-				backendTarget = node.AddTarget(backendRef.BackendRef, details)
-			} else {
-				backendTarget = types.NullRouteBackend
-			}
-			ibr := &pbmesh.ComputedHTTPBackendRef{
-				BackendTarget: backendTarget,
-				Weight:        backendRef.Weight,
-				Filters:       backendRef.Filters,
-			}
-			irule.BackendRefs = append(irule.BackendRefs, ibr)
-		}
-
-		node.HTTPRules = append(node.HTTPRules, irule)
-	}
-
-	return node
-}
-
-func compileGRPCRouteNode(
-	port string,
-	res *pbresource.Resource,
-	route *pbmesh.GRPCRoute,
-	serviceGetter serviceGetter,
-	brc *BoundReferenceCollector,
-) *inputRouteNode {
-	route = protoClone(route)
-
-	node := newInputRouteNode(port)
-
-	node.RouteType = pbmesh.GRPCRouteType
-	node.OriginalResource = res
-	node.GRPCRules = make([]*pbmesh.ComputedGRPCRouteRule, 0, len(route.Rules))
-	for _, rule := range route.Rules {
-		irule := &pbmesh.ComputedGRPCRouteRule{
-			Matches:     protoSliceClone(rule.Matches),
-			Filters:     protoSliceClone(rule.Filters),
-			BackendRefs: make([]*pbmesh.ComputedGRPCBackendRef, 0, len(rule.BackendRefs)),
-			Timeouts:    rule.Timeouts,
-			Retries:     rule.Retries,
-		}
-
-		// https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1alpha2.GRPCRouteRule
-		//
-		// If no matches are specified, the implementation MUST match every gRPC request.
-		if len(irule.Matches) == 0 {
-			irule.Matches = defaultGRPCRouteMatches()
-		}
-
-		for _, backendRef := range rule.BackendRefs {
-			// Infer port name from parent ref.
-			if backendRef.BackendRef.Port == "" {
-				backendRef.BackendRef.Port = port
-			}
-
-			var (
-				backendTarget string
-				backendSvc    = serviceGetter.GetService(backendRef.BackendRef.Ref)
-			)
-			if backendSvc != nil {
-				brc.AddRefOrID(backendSvc.Resource.Id)
-			}
-			if ok, meshPort := shouldRouteTrafficToBackend(backendSvc, backendRef.BackendRef); ok {
-				details := &pbmesh.BackendTargetDetails{
-					Type:       pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-					BackendRef: backendRef.BackendRef,
-					MeshPort:   meshPort,
-				}
-				backendTarget = node.AddTarget(backendRef.BackendRef, details)
-			} else {
-				backendTarget = types.NullRouteBackend
-			}
-
-			ibr := &pbmesh.ComputedGRPCBackendRef{
-				BackendTarget: backendTarget,
-				Weight:        backendRef.Weight,
-				Filters:       backendRef.Filters,
-			}
-			irule.BackendRefs = append(irule.BackendRefs, ibr)
-		}
-
-		node.GRPCRules = append(node.GRPCRules, irule)
-	}
-
-	return node
-}
-
-func compileTCPRouteNode(
-	port string,
-	res *pbresource.Resource,
-	route *pbmesh.TCPRoute,
-	serviceGetter serviceGetter,
-	brc *BoundReferenceCollector,
-) *inputRouteNode {
-	route = protoClone(route)
-
-	node := newInputRouteNode(port)
-
-	node.RouteType = pbmesh.TCPRouteType
-	node.OriginalResource = res
-	node.TCPRules = make([]*pbmesh.ComputedTCPRouteRule, 0, len(route.Rules))
-	for _, rule := range route.Rules {
-		irule := &pbmesh.ComputedTCPRouteRule{
-			BackendRefs: make([]*pbmesh.ComputedTCPBackendRef, 0, len(rule.BackendRefs)),
-		}
-
-		// https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1alpha2.TCPRoute
-
-		for _, backendRef := range rule.BackendRefs {
-			// Infer port name from parent ref.
-			if backendRef.BackendRef.Port == "" {
-				backendRef.BackendRef.Port = port
-			}
-
-			var (
-				backendTarget string
-				backendSvc    = serviceGetter.GetService(backendRef.BackendRef.Ref)
-			)
-			if backendSvc != nil {
-				brc.AddRefOrID(backendSvc.Resource.Id)
-			}
-			if ok, meshPort := shouldRouteTrafficToBackend(backendSvc, backendRef.BackendRef); ok {
-				details := &pbmesh.BackendTargetDetails{
-					Type:       pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-					BackendRef: backendRef.BackendRef,
-					MeshPort:   meshPort,
-				}
-				backendTarget = node.AddTarget(backendRef.BackendRef, details)
-			} else {
-				backendTarget = types.NullRouteBackend
-			}
-
-			ibr := &pbmesh.ComputedTCPBackendRef{
-				BackendTarget: backendTarget,
-				Weight:        backendRef.Weight,
-			}
-			irule.BackendRefs = append(irule.BackendRefs, ibr)
-		}
-
-		node.TCPRules = append(node.TCPRules, irule)
-	}
-
-	return node
-}
-
-func shouldRouteTrafficToBackend(backendSvc *types.DecodedService, backendRef *pbmesh.BackendReference) (bool, string) {
-	if backendSvc == nil {
-		return false, ""
-	}
-
-	var (
-		found    = false
-		inMesh   = false
-		meshPort string
-	)
-	for _, port := range backendSvc.Data.Ports {
-		if port.Protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-			inMesh = true
-			meshPort = port.TargetPort
-			continue
-		}
-		if port.TargetPort == backendRef.Port {
-			found = true
-		}
-	}
-
-	return inMesh && found, meshPort
-}
-
-func createDefaultRouteNode(
-	parentServiceRef *pbresource.Reference,
-	parentMeshPort string,
-	port string,
-	typ *pbresource.Type,
-) *inputRouteNode {
-	// always add the parent as a possible target due to catch-all
-	defaultBackendRef := &pbmesh.BackendReference{
-		Ref:  parentServiceRef,
-		Port: port,
-	}
-
-	routeNode := newInputRouteNode(port)
-
-	defaultBackendTarget := routeNode.AddTarget(defaultBackendRef, &pbmesh.BackendTargetDetails{
-		Type:       pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-		BackendRef: defaultBackendRef,
-		MeshPort:   parentMeshPort,
-	})
-	switch {
-	case resource.EqualType(pbmesh.HTTPRouteType, typ):
-		routeNode.RouteType = pbmesh.HTTPRouteType
-		appendDefaultHTTPRouteRule(routeNode, defaultBackendTarget)
-	case resource.EqualType(pbmesh.GRPCRouteType, typ):
-		routeNode.RouteType = pbmesh.GRPCRouteType
-		appendDefaultGRPCRouteRule(routeNode, defaultBackendTarget)
-	case resource.EqualType(pbmesh.TCPRouteType, typ):
-		fallthrough
-	default:
-		routeNode.RouteType = pbmesh.TCPRouteType
-		appendDefaultTCPRouteRule(routeNode, defaultBackendTarget)
-	}
-
-	routeNode.Default = true
-	return routeNode
-}
-
-func appendDefaultRouteNode(
-	routeNode *inputRouteNode,
-	defaultBackendTarget string,
-) {
-	switch {
-	case resource.EqualType(pbmesh.HTTPRouteType, routeNode.RouteType):
-		appendDefaultHTTPRouteRule(routeNode, defaultBackendTarget)
-	case resource.EqualType(pbmesh.GRPCRouteType, routeNode.RouteType):
-		appendDefaultGRPCRouteRule(routeNode, defaultBackendTarget)
-	case resource.EqualType(pbmesh.TCPRouteType, routeNode.RouteType):
-		fallthrough
-	default:
-		appendDefaultTCPRouteRule(routeNode, defaultBackendTarget)
-	}
-}
-
-func appendDefaultHTTPRouteRule(
-	routeNode *inputRouteNode,
-	backendTarget string,
-) {
-	routeNode.HTTPRules = append(routeNode.HTTPRules, &pbmesh.ComputedHTTPRouteRule{
-		Matches: defaultHTTPRouteMatches(),
-		BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-			BackendTarget: backendTarget,
-		}},
-	})
-}
-
-func appendDefaultGRPCRouteRule(
-	routeNode *inputRouteNode,
-	backendTarget string,
-) {
-	routeNode.GRPCRules = append(routeNode.GRPCRules, &pbmesh.ComputedGRPCRouteRule{
-		Matches: defaultGRPCRouteMatches(),
-		BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-			BackendTarget: backendTarget,
-		}},
-	})
-}
-
-func appendDefaultTCPRouteRule(
-	routeNode *inputRouteNode,
-	backendTarget string,
-) {
-	routeNode.TCPRules = append(routeNode.TCPRules, &pbmesh.ComputedTCPRouteRule{
-		BackendRefs: []*pbmesh.ComputedTCPBackendRef{{
-			BackendTarget: backendTarget,
-		}},
-	})
-}
-
-func defaultHTTPRouteMatches() []*pbmesh.HTTPRouteMatch {
-	return []*pbmesh.HTTPRouteMatch{{
-		Path: defaultHTTPPathMatch(),
-	}}
-}
-
-func defaultHTTPPathMatch() *pbmesh.HTTPPathMatch {
-	return &pbmesh.HTTPPathMatch{
-		Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-		Value: "/",
-	}
-}
-
-func defaultGRPCRouteMatches() []*pbmesh.GRPCRouteMatch {
-	return []*pbmesh.GRPCRouteMatch{{}}
-}
diff --git a/internal/mesh/internal/controllers/routes/generate_test.go b/internal/mesh/internal/controllers/routes/generate_test.go
deleted file mode 100644
index 4dc4a9c0793e7..0000000000000
--- a/internal/mesh/internal/controllers/routes/generate_test.go
+++ /dev/null
@@ -1,1684 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package routes
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/types/known/anypb"
-	"google.golang.org/protobuf/types/known/durationpb"
-
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes/loader"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestGenerateComputedRoutes(t *testing.T) {
-	registry := resource.NewRegistry()
-	types.Register(registry)
-	catalog.RegisterTypes(registry)
-
-	run := func(
-		t *testing.T,
-		related *loader.RelatedResources,
-		expect []*ComputedRoutesResult,
-		expectPending PendingStatuses,
-	) {
-		pending := make(PendingStatuses)
-
-		got := GenerateComputedRoutes(related, pending)
-
-		prototest.AssertElementsMatch[*ComputedRoutesResult](
-			t, expect, got,
-		)
-
-		require.Len(t, pending, len(expectPending))
-		if len(expectPending) > 0 {
-			for rk, expectItem := range expectPending {
-				gotItem, ok := pending[rk]
-				require.True(t, ok, "missing expected pending status for %v", rk)
-				prototest.AssertDeepEqual(t, expectItem, gotItem)
-			}
-			for rk := range pending {
-				_, ok := expectPending[rk]
-				require.True(t, ok, "extra pending status for %v", rk)
-			}
-		}
-	}
-
-	newService := func(name string, data *pbcatalog.Service) *types.DecodedService {
-		svc := rtest.Resource(pbcatalog.ServiceType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).Build()
-		rtest.ValidateAndNormalize(t, registry, svc)
-		return rtest.MustDecode[*pbcatalog.Service](t, svc)
-	}
-
-	newHTTPRoute := func(name string, data *pbmesh.HTTPRoute) *types.DecodedHTTPRoute {
-		svc := rtest.Resource(pbmesh.HTTPRouteType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).Build()
-		rtest.ValidateAndNormalize(t, registry, svc)
-		return rtest.MustDecode[*pbmesh.HTTPRoute](t, svc)
-	}
-	newGRPCRoute := func(name string, data *pbmesh.GRPCRoute) *types.DecodedGRPCRoute {
-		svc := rtest.Resource(pbmesh.GRPCRouteType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).Build()
-		rtest.ValidateAndNormalize(t, registry, svc)
-		return rtest.MustDecode[*pbmesh.GRPCRoute](t, svc)
-	}
-	newTCPRoute := func(name string, data *pbmesh.TCPRoute) *types.DecodedTCPRoute {
-		svc := rtest.Resource(pbmesh.TCPRouteType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).Build()
-		rtest.ValidateAndNormalize(t, registry, svc)
-		return rtest.MustDecode[*pbmesh.TCPRoute](t, svc)
-	}
-
-	newDestPolicy := func(name string, data *pbmesh.DestinationPolicy) *types.DecodedDestinationPolicy {
-		policy := rtest.Resource(pbmesh.DestinationPolicyType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).Build()
-		rtest.ValidateAndNormalize(t, registry, policy)
-		return rtest.MustDecode[*pbmesh.DestinationPolicy](t, policy)
-	}
-
-	newFailPolicy := func(name string, data *pbcatalog.FailoverPolicy) *types.DecodedFailoverPolicy {
-		policy := rtest.Resource(pbcatalog.FailoverPolicyType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).Build()
-		rtest.ValidateAndNormalize(t, registry, policy)
-		return rtest.MustDecode[*pbcatalog.FailoverPolicy](t, policy)
-	}
-
-	backendName := func(name, port string) string {
-		return fmt.Sprintf("catalog.v2beta1.Service/default.local.default/%s?port=%s", name, port)
-	}
-
-	var (
-		apiServiceID = rtest.Resource(pbcatalog.ServiceType, "api").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				ID()
-		apiServiceRef       = resource.Reference(apiServiceID, "")
-		apiComputedRoutesID = rtest.Resource(pbmesh.ComputedRoutesType, "api").
-					WithTenancy(resource.DefaultNamespacedTenancy()).
-					ID()
-
-		fooServiceID = rtest.Resource(pbcatalog.ServiceType, "foo").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				ID()
-		fooServiceRef = resource.Reference(fooServiceID, "")
-
-		barServiceID = rtest.Resource(pbcatalog.ServiceType, "bar").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				ID()
-		barServiceRef = resource.Reference(barServiceID, "")
-
-		deadServiceID = rtest.Resource(pbcatalog.ServiceType, "dead").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				ID()
-		deadServiceRef = resource.Reference(deadServiceID, "")
-	)
-
-	t.Run("none", func(t *testing.T) {
-		run(t, loader.NewRelatedResources(), nil, nil)
-	})
-
-	t.Run("no aligned service", func(t *testing.T) {
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID)
-		expect := []*ComputedRoutesResult{
-			{
-				ID:   apiComputedRoutesID,
-				Data: nil,
-			},
-		}
-		run(t, related, expect, nil)
-	})
-
-	t.Run("aligned service not in mesh", func(t *testing.T) {
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID).
-			AddResources(newService("api", &pbcatalog.Service{
-				Workloads: &pbcatalog.WorkloadSelector{
-					Prefixes: []string{"api-"},
-				},
-				Ports: []*pbcatalog.ServicePort{
-					{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-				},
-			}))
-		expect := []*ComputedRoutesResult{{
-			ID:   apiComputedRoutesID,
-			Data: nil,
-		}}
-		run(t, related, expect, nil)
-	})
-
-	t.Run("aligned service in mesh but no actual ports", func(t *testing.T) {
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID).
-			AddResources(newService("api", &pbcatalog.Service{
-				Workloads: &pbcatalog.WorkloadSelector{
-					Prefixes: []string{"api-"},
-				},
-				Ports: []*pbcatalog.ServicePort{
-					{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			}))
-		expect := []*ComputedRoutesResult{{
-			ID:   apiComputedRoutesID,
-			Data: nil,
-		}}
-		run(t, related, expect, nil)
-	})
-
-	t.Run("tcp service with default route", func(t *testing.T) {
-		apiServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			},
-		}
-
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID).
-			AddResources(newService("api", apiServiceData))
-
-		expect := []*ComputedRoutesResult{{
-			ID:      apiComputedRoutesID,
-			OwnerID: apiServiceID,
-			Data: &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					apiServiceRef,
-				},
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"tcp": {
-						Config: &pbmesh.ComputedPortRoutes_Tcp{
-							Tcp: &pbmesh.ComputedTCPRoute{
-								Rules: []*pbmesh.ComputedTCPRouteRule{{
-									BackendRefs: []*pbmesh.ComputedTCPBackendRef{{
-										BackendTarget: backendName("api", "tcp"),
-									}},
-								}},
-							},
-						},
-						UsingDefaultConfig: true,
-						ParentRef:          newParentRef(apiServiceRef, "tcp"),
-						Protocol:           pbcatalog.Protocol_PROTOCOL_TCP,
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							backendName("api", "tcp"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(apiServiceRef, "tcp", ""),
-								DestinationConfig: defaultDestConfig(),
-							},
-						},
-					},
-				},
-			}},
-		}
-		run(t, related, expect, nil)
-	})
-
-	for protoName, protocol := range map[string]pbcatalog.Protocol{
-		"http":  pbcatalog.Protocol_PROTOCOL_HTTP,
-		"http2": pbcatalog.Protocol_PROTOCOL_HTTP2,
-	} {
-		t.Run(protoName+" service with default route", func(t *testing.T) {
-			apiServiceData := &pbcatalog.Service{
-				Workloads: &pbcatalog.WorkloadSelector{
-					Prefixes: []string{"api-"},
-				},
-				Ports: []*pbcatalog.ServicePort{
-					{TargetPort: protoName, Protocol: protocol},
-					{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			}
-
-			related := loader.NewRelatedResources().
-				AddComputedRoutesIDs(apiComputedRoutesID).
-				AddResources(newService("api", apiServiceData))
-
-			expect := []*ComputedRoutesResult{{
-				ID:      apiComputedRoutesID,
-				OwnerID: apiServiceID,
-				Data: &pbmesh.ComputedRoutes{
-					BoundReferences: []*pbresource.Reference{
-						apiServiceRef,
-					},
-					PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-						protoName: {
-							Config: &pbmesh.ComputedPortRoutes_Http{
-								Http: &pbmesh.ComputedHTTPRoute{
-									Rules: []*pbmesh.ComputedHTTPRouteRule{{
-										Matches: []*pbmesh.HTTPRouteMatch{{
-											Path: &pbmesh.HTTPPathMatch{
-												Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-												Value: "/",
-											},
-										}},
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: backendName("api", protoName),
-										}},
-									}},
-								},
-							},
-							UsingDefaultConfig: true,
-							ParentRef:          newParentRef(apiServiceRef, protoName),
-							Protocol:           protocol,
-							Targets: map[string]*pbmesh.BackendTargetDetails{
-								backendName("api", protoName): {
-									Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-									MeshPort:          "mesh",
-									BackendRef:        newBackendRef(apiServiceRef, protoName, ""),
-									DestinationConfig: defaultDestConfig(),
-								},
-							},
-						},
-					},
-				},
-			}}
-			run(t, related, expect, nil)
-		})
-	}
-
-	t.Run("grpc service with default route", func(t *testing.T) {
-		apiServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			},
-		}
-
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID).
-			AddResources(newService("api", apiServiceData))
-
-		expect := []*ComputedRoutesResult{{
-			ID:      apiComputedRoutesID,
-			OwnerID: apiServiceID,
-			Data: &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					apiServiceRef,
-				},
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"grpc": {
-						Config: &pbmesh.ComputedPortRoutes_Grpc{
-							Grpc: &pbmesh.ComputedGRPCRoute{
-								Rules: []*pbmesh.ComputedGRPCRouteRule{{
-									Matches: []*pbmesh.GRPCRouteMatch{{}},
-									BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-										BackendTarget: backendName("api", "grpc"),
-									}},
-								}},
-							},
-						},
-						UsingDefaultConfig: true,
-						ParentRef:          newParentRef(apiServiceRef, "grpc"),
-						Protocol:           pbcatalog.Protocol_PROTOCOL_GRPC,
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							backendName("api", "grpc"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(apiServiceRef, "grpc", ""),
-								DestinationConfig: defaultDestConfig(),
-							},
-						},
-					},
-				},
-			},
-		}}
-		run(t, related, expect, nil)
-	})
-
-	t.Run("all ports with a mix of routes", func(t *testing.T) {
-		apiServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				{TargetPort: "http2", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-				{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-			},
-		}
-
-		fooServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"foo-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				{TargetPort: "http2", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-				{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-			},
-		}
-
-		tcpRoute1 := &pbmesh.TCPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "tcp"),
-			},
-			Rules: []*pbmesh.TCPRouteRule{{
-				BackendRefs: []*pbmesh.TCPBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "", ""),
-				}},
-			}},
-		}
-
-		httpRoute1 := &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "http2"),
-			},
-			Rules: []*pbmesh.HTTPRouteRule{{
-				BackendRefs: []*pbmesh.HTTPBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "", ""),
-				}},
-			}},
-		}
-
-		grpcRoute1 := &pbmesh.GRPCRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "grpc"),
-			},
-			Rules: []*pbmesh.GRPCRouteRule{{
-				BackendRefs: []*pbmesh.GRPCBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "", ""),
-				}},
-			}},
-		}
-
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID).
-			AddResources(
-				newService("api", apiServiceData),
-				newService("foo", fooServiceData),
-				newTCPRoute("api-tcp-route1", tcpRoute1),
-				newHTTPRoute("api-http-route1", httpRoute1),
-				newGRPCRoute("api-grpc-route1", grpcRoute1),
-			)
-
-		expect := []*ComputedRoutesResult{{
-			ID:      apiComputedRoutesID,
-			OwnerID: apiServiceID,
-			Data: &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					apiServiceRef,
-					fooServiceRef,
-					newRef(pbmesh.GRPCRouteType, "api-grpc-route1"),
-					newRef(pbmesh.HTTPRouteType, "api-http-route1"),
-					newRef(pbmesh.TCPRouteType, "api-tcp-route1"),
-				},
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"tcp": {
-						Config: &pbmesh.ComputedPortRoutes_Tcp{
-							Tcp: &pbmesh.ComputedTCPRoute{
-								Rules: []*pbmesh.ComputedTCPRouteRule{{
-									BackendRefs: []*pbmesh.ComputedTCPBackendRef{{
-										BackendTarget: backendName("foo", "tcp"),
-									}},
-								}},
-							},
-						},
-						ParentRef: newParentRef(apiServiceRef, "tcp"),
-						Protocol:  pbcatalog.Protocol_PROTOCOL_TCP,
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							backendName("foo", "tcp"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(fooServiceRef, "tcp", ""),
-								DestinationConfig: defaultDestConfig(),
-							},
-						},
-					},
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Http{
-							Http: &pbmesh.ComputedHTTPRoute{
-								Rules: []*pbmesh.ComputedHTTPRouteRule{
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: backendName("foo", "http"),
-										}},
-									},
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: types.NullRouteBackend,
-										}},
-									},
-								},
-							},
-						},
-						ParentRef: newParentRef(apiServiceRef, "http"),
-						Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							backendName("foo", "http"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(fooServiceRef, "http", ""),
-								DestinationConfig: defaultDestConfig(),
-							},
-						},
-					},
-					"http2": {
-						Config: &pbmesh.ComputedPortRoutes_Http{
-							Http: &pbmesh.ComputedHTTPRoute{
-								Rules: []*pbmesh.ComputedHTTPRouteRule{
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: backendName("foo", "http2"),
-										}},
-									},
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: types.NullRouteBackend,
-										}},
-									},
-								},
-							},
-						},
-						ParentRef: newParentRef(apiServiceRef, "http2"),
-						Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP2,
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							backendName("foo", "http2"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(fooServiceRef, "http2", ""),
-								DestinationConfig: defaultDestConfig(),
-							},
-						},
-					},
-					"grpc": {
-						Config: &pbmesh.ComputedPortRoutes_Grpc{
-							Grpc: &pbmesh.ComputedGRPCRoute{
-								Rules: []*pbmesh.ComputedGRPCRouteRule{
-									{
-										Matches: []*pbmesh.GRPCRouteMatch{{}},
-										BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-											BackendTarget: backendName("foo", "grpc"),
-										}},
-									},
-									{
-										Matches: []*pbmesh.GRPCRouteMatch{{}},
-										BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-											BackendTarget: types.NullRouteBackend,
-										}},
-									},
-								},
-							},
-						},
-						ParentRef: newParentRef(apiServiceRef, "grpc"),
-						Protocol:  pbcatalog.Protocol_PROTOCOL_GRPC,
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							backendName("foo", "grpc"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(fooServiceRef, "grpc", ""),
-								DestinationConfig: defaultDestConfig(),
-							},
-						},
-					},
-				},
-			},
-		}}
-		run(t, related, expect, nil)
-	})
-
-	t.Run("all ports with a wildcard route only bypassing the protocol", func(t *testing.T) {
-		apiServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				{TargetPort: "http2", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-				{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-			},
-		}
-
-		fooServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"foo-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				{TargetPort: "http2", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-				{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-			},
-		}
-
-		httpRoute1 := &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), ""),
-			},
-			Rules: []*pbmesh.HTTPRouteRule{{
-				BackendRefs: []*pbmesh.HTTPBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "", ""),
-				}},
-			}},
-		}
-
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID).
-			AddResources(
-				newService("api", apiServiceData),
-				newService("foo", fooServiceData),
-				newHTTPRoute("api-http-route1", httpRoute1),
-			)
-
-		chunk := func(portName string, protocol pbcatalog.Protocol) *pbmesh.ComputedPortRoutes {
-			return &pbmesh.ComputedPortRoutes{
-				Config: &pbmesh.ComputedPortRoutes_Http{
-					Http: &pbmesh.ComputedHTTPRoute{
-						Rules: []*pbmesh.ComputedHTTPRouteRule{
-							{
-								Matches: defaultHTTPRouteMatches(),
-								BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-									BackendTarget: backendName("foo", portName),
-								}},
-							},
-							{
-								Matches: defaultHTTPRouteMatches(),
-								BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-									BackendTarget: types.NullRouteBackend,
-								}},
-							},
-						},
-					},
-				},
-				ParentRef: newParentRef(apiServiceRef, portName),
-				Protocol:  protocol,
-				Targets: map[string]*pbmesh.BackendTargetDetails{
-					backendName("foo", portName): {
-						Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-						MeshPort:          "mesh",
-						BackendRef:        newBackendRef(fooServiceRef, portName, ""),
-						DestinationConfig: defaultDestConfig(),
-					},
-				},
-			}
-		}
-
-		expect := []*ComputedRoutesResult{{
-			ID:      apiComputedRoutesID,
-			OwnerID: apiServiceID,
-			Data: &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					apiServiceRef,
-					fooServiceRef,
-					newRef(pbmesh.HTTPRouteType, "api-http-route1"),
-				},
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					// note: tcp has been upgraded to http in the presence of an HTTPRoute
-					"tcp":   chunk("tcp", pbcatalog.Protocol_PROTOCOL_HTTP),
-					"http":  chunk("http", pbcatalog.Protocol_PROTOCOL_HTTP),
-					"http2": chunk("http2", pbcatalog.Protocol_PROTOCOL_HTTP2),
-					"grpc":  chunk("grpc", pbcatalog.Protocol_PROTOCOL_GRPC),
-				},
-			},
-		}}
-		run(t, related, expect, nil)
-	})
-
-	t.Run("stale-weird: stale mapper causes visit of irrelevant xRoute", func(t *testing.T) {
-		apiServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		fooServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"foo-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		httpRoute1 := &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), ""),
-			},
-			Rules: []*pbmesh.HTTPRouteRule{{
-				BackendRefs: []*pbmesh.HTTPBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "", ""),
-				}},
-			}},
-		}
-
-		apiSvc := newService("api", apiServiceData)
-		fooSvc := newService("foo", fooServiceData)
-		apiHTTPRoute1 := newHTTPRoute("api-http-route1", httpRoute1)
-
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID). // deliberately skip adding 'foo' here to exercise the bug
-			AddResources(apiSvc, fooSvc, apiHTTPRoute1)
-
-		// Update this after the fact, but don't update the inner indexing in
-		// the 'related' struct.
-		{
-			httpRoute1.ParentRefs[0] = newParentRef(newRef(pbcatalog.ServiceType, "foo"), "")
-			apiHTTPRoute1.Data = httpRoute1
-
-			anyData, err := anypb.New(httpRoute1)
-			require.NoError(t, err)
-			apiHTTPRoute1.Resource.Data = anyData
-		}
-
-		expect := []*ComputedRoutesResult{{
-			ID:      apiComputedRoutesID,
-			OwnerID: apiServiceID,
-			Data: &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					apiServiceRef,
-				},
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Http{
-							Http: &pbmesh.ComputedHTTPRoute{
-								Rules: []*pbmesh.ComputedHTTPRouteRule{{
-									Matches: []*pbmesh.HTTPRouteMatch{{
-										Path: &pbmesh.HTTPPathMatch{
-											Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-											Value: "/",
-										},
-									}},
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: backendName("api", "http"),
-									}},
-								}},
-							},
-						},
-						UsingDefaultConfig: true,
-						ParentRef:          newParentRef(apiServiceRef, "http"),
-						Protocol:           pbcatalog.Protocol_PROTOCOL_HTTP,
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							backendName("api", "http"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(apiServiceRef, "http", ""),
-								DestinationConfig: defaultDestConfig(),
-							},
-						},
-					},
-				},
-			},
-		}}
-		run(t, related, expect, nil)
-	})
-
-	t.Run("stale-weird: parent ref uses invalid port", func(t *testing.T) {
-		apiServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		fooServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"foo-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		httpRoute1 := &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				// Using bad parent port (www).
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "www"),
-			},
-			Rules: []*pbmesh.HTTPRouteRule{{
-				BackendRefs: []*pbmesh.HTTPBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "http", ""),
-				}},
-			}},
-		}
-
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID).
-			AddResources(
-				newService("api", apiServiceData),
-				newService("foo", fooServiceData),
-				newHTTPRoute("api-http-route1", httpRoute1),
-			)
-
-		expect := []*ComputedRoutesResult{{
-			ID:      apiComputedRoutesID,
-			OwnerID: apiServiceID,
-			Data: &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					apiServiceRef,
-				},
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Http{
-							Http: &pbmesh.ComputedHTTPRoute{
-								Rules: []*pbmesh.ComputedHTTPRouteRule{{
-									Matches: []*pbmesh.HTTPRouteMatch{{
-										Path: &pbmesh.HTTPPathMatch{
-											Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-											Value: "/",
-										},
-									}},
-									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: backendName("api", "http"),
-									}},
-								}},
-							},
-						},
-						UsingDefaultConfig: true,
-						ParentRef:          newParentRef(apiServiceRef, "http"),
-						Protocol:           pbcatalog.Protocol_PROTOCOL_HTTP,
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							backendName("api", "http"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(apiServiceRef, "http", ""),
-								DestinationConfig: defaultDestConfig(),
-							},
-						},
-					},
-				},
-			},
-		}}
-		run(t, related, expect, nil)
-	})
-
-	t.Run("overlapping xRoutes", func(t *testing.T) {
-		apiServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		fooServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"foo-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		httpRouteData := &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				// Using bad parent port (www).
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
-			},
-			Rules: []*pbmesh.HTTPRouteRule{{
-				BackendRefs: []*pbmesh.HTTPBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "http", ""),
-				}},
-			}},
-		}
-		httpRoute := newHTTPRoute("api-http-route", httpRouteData)
-
-		tcpRouteData := &pbmesh.TCPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				// Using bad parent port (www).
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
-			},
-			Rules: []*pbmesh.TCPRouteRule{{
-				BackendRefs: []*pbmesh.TCPBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "http", ""),
-				}},
-			}},
-		}
-		tcpRoute := newTCPRoute("api-tcp-route", tcpRouteData)
-		// Force them to have the same generation, so that we fall back on
-		// lexicographic sort on the names as tiebreaker.
-		//
-		// api-http-route < api-tcp-route
-		tcpRoute.Resource.Generation = httpRoute.Resource.Generation
-
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID).
-			AddResources(
-				newService("api", apiServiceData),
-				newService("foo", fooServiceData),
-				httpRoute,
-				tcpRoute,
-			)
-
-		expect := []*ComputedRoutesResult{{
-			ID:      apiComputedRoutesID,
-			OwnerID: apiServiceID,
-			Data: &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					apiServiceRef,
-					fooServiceRef,
-					resource.Reference(httpRoute.Resource.Id, ""),
-					resource.Reference(tcpRoute.Resource.Id, ""),
-				},
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Http{
-							Http: &pbmesh.ComputedHTTPRoute{
-								Rules: []*pbmesh.ComputedHTTPRouteRule{
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: backendName("foo", "http"),
-										}},
-									},
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: types.NullRouteBackend,
-										}},
-									},
-								},
-							},
-						},
-						ParentRef: newParentRef(apiServiceRef, "http"),
-						Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							backendName("foo", "http"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(fooServiceRef, "http", ""),
-								DestinationConfig: defaultDestConfig(),
-							},
-						},
-					},
-				},
-			},
-		}}
-
-		expectPending := make(PendingStatuses)
-		expectPending[resource.NewReferenceKey(tcpRoute.Resource.Id)] = &PendingResourceStatusUpdate{
-			ID:         tcpRoute.Resource.Id,
-			Generation: tcpRoute.Resource.Generation,
-			NewConditions: []*pbresource.Condition{
-				ConditionConflictNotBoundToParentRef(
-					apiServiceRef,
-					"http",
-					pbmesh.HTTPRouteType,
-				),
-			},
-		}
-
-		run(t, related, expect, expectPending)
-	})
-
-	t.Run("two http routes", func(t *testing.T) {
-		apiServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		fooServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"foo-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		barServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"bar-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		httpRoute1 := &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
-			},
-			Rules: []*pbmesh.HTTPRouteRule{{
-				Matches: []*pbmesh.HTTPRouteMatch{{
-					Path: &pbmesh.HTTPPathMatch{
-						Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-						Value: "/gir",
-					},
-				}},
-				BackendRefs: []*pbmesh.HTTPBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "", ""),
-				}},
-			}},
-		}
-
-		httpRoute2 := &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
-			},
-			Rules: []*pbmesh.HTTPRouteRule{{
-				Matches: []*pbmesh.HTTPRouteMatch{{
-					Path: &pbmesh.HTTPPathMatch{
-						Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-						Value: "/zim",
-					},
-				}},
-				BackendRefs: []*pbmesh.HTTPBackendRef{{
-					BackendRef: newBackendRef(barServiceRef, "", ""),
-				}},
-			}},
-		}
-
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID).
-			AddResources(
-				newService("api", apiServiceData),
-				newService("foo", fooServiceData),
-				newService("bar", barServiceData),
-				newHTTPRoute("api-http-route1", httpRoute1),
-				newHTTPRoute("api-http-route2", httpRoute2),
-			)
-
-		expect := []*ComputedRoutesResult{{
-			ID:      apiComputedRoutesID,
-			OwnerID: apiServiceID,
-			Data: &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					apiServiceRef,
-					barServiceRef,
-					fooServiceRef,
-					newRef(pbmesh.HTTPRouteType, "api-http-route1"),
-					newRef(pbmesh.HTTPRouteType, "api-http-route2"),
-				},
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Http{
-							Http: &pbmesh.ComputedHTTPRoute{
-								Rules: []*pbmesh.ComputedHTTPRouteRule{
-									{
-										Matches: []*pbmesh.HTTPRouteMatch{{
-											Path: &pbmesh.HTTPPathMatch{
-												Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-												Value: "/gir",
-											},
-										}},
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: backendName("foo", "http"),
-										}},
-									},
-									{
-										Matches: []*pbmesh.HTTPRouteMatch{{
-											Path: &pbmesh.HTTPPathMatch{
-												Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-												Value: "/zim",
-											},
-										}},
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: backendName("bar", "http"),
-										}},
-									},
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: types.NullRouteBackend,
-										}},
-									},
-								},
-							},
-						},
-						ParentRef: newParentRef(apiServiceRef, "http"),
-						Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							backendName("foo", "http"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(fooServiceRef, "http", ""),
-								DestinationConfig: defaultDestConfig(),
-							},
-							backendName("bar", "http"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(barServiceRef, "http", ""),
-								DestinationConfig: defaultDestConfig(),
-							},
-						},
-					},
-				},
-			},
-		}}
-		run(t, related, expect, nil)
-	})
-
-	t.Run("http route with empty match path", func(t *testing.T) {
-		apiServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		fooServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"foo-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		httpRoute1 := &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
-			},
-			Rules: []*pbmesh.HTTPRouteRule{{
-				Matches: []*pbmesh.HTTPRouteMatch{{
-					Path: nil,
-				}},
-				BackendRefs: []*pbmesh.HTTPBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "", ""),
-				}},
-			}},
-		}
-
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID).
-			AddResources(
-				newService("api", apiServiceData),
-				newService("foo", fooServiceData),
-				newHTTPRoute("api-http-route1", httpRoute1),
-			)
-
-		expect := []*ComputedRoutesResult{{
-			ID:      apiComputedRoutesID,
-			OwnerID: apiServiceID,
-			Data: &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					apiServiceRef,
-					fooServiceRef,
-					newRef(pbmesh.HTTPRouteType, "api-http-route1"),
-				},
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Http{
-							Http: &pbmesh.ComputedHTTPRoute{
-								Rules: []*pbmesh.ComputedHTTPRouteRule{
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: backendName("foo", "http"),
-										}},
-									},
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: types.NullRouteBackend,
-										}},
-									},
-								},
-							},
-						},
-						ParentRef: newParentRef(apiServiceRef, "http"),
-						Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							backendName("foo", "http"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(fooServiceRef, "http", ""),
-								DestinationConfig: defaultDestConfig(),
-							},
-						},
-					},
-				},
-			},
-		}}
-		run(t, related, expect, nil)
-	})
-
-	t.Run("stale-weird: destination with no service", func(t *testing.T) {
-		t.Run("http", func(t *testing.T) {
-			apiServiceData := &pbcatalog.Service{
-				Workloads: &pbcatalog.WorkloadSelector{
-					Prefixes: []string{"api-"},
-				},
-				Ports: []*pbcatalog.ServicePort{
-					{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-					{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-			}
-
-			httpRoute1 := &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(fooServiceRef, "", ""),
-					}},
-				}},
-			}
-
-			related := loader.NewRelatedResources().
-				AddComputedRoutesIDs(apiComputedRoutesID).
-				AddResources(
-					newService("api", apiServiceData),
-					newHTTPRoute("api-http-route1", httpRoute1),
-				)
-
-			expect := []*ComputedRoutesResult{{
-				ID:      apiComputedRoutesID,
-				OwnerID: apiServiceID,
-				Data: &pbmesh.ComputedRoutes{
-					BoundReferences: []*pbresource.Reference{
-						apiServiceRef,
-						newRef(pbmesh.HTTPRouteType, "api-http-route1"),
-					},
-					PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-						"http": {
-							ParentRef: newParentRef(apiServiceRef, "http"),
-							Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-							Config: &pbmesh.ComputedPortRoutes_Http{
-								Http: &pbmesh.ComputedHTTPRoute{
-									Rules: []*pbmesh.ComputedHTTPRouteRule{
-										{
-											Matches: defaultHTTPRouteMatches(),
-											BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-												BackendTarget: types.NullRouteBackend,
-											}},
-										},
-										{
-											Matches: defaultHTTPRouteMatches(),
-											BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-												BackendTarget: types.NullRouteBackend,
-											}},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			}}
-			run(t, related, expect, nil)
-		})
-		t.Run("grpc", func(t *testing.T) {
-			apiServiceData := &pbcatalog.Service{
-				Workloads: &pbcatalog.WorkloadSelector{
-					Prefixes: []string{"api-"},
-				},
-				Ports: []*pbcatalog.ServicePort{
-					{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-					{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-				},
-			}
-
-			grpcRoute1 := &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(newRef(pbcatalog.ServiceType, "api"), "grpc"),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(fooServiceRef, "", ""),
-					}},
-				}},
-			}
-
-			related := loader.NewRelatedResources().
-				AddComputedRoutesIDs(apiComputedRoutesID).
-				AddResources(
-					newService("api", apiServiceData),
-					newGRPCRoute("api-grpc-route1", grpcRoute1),
-				)
-
-			expect := []*ComputedRoutesResult{{
-				ID:      apiComputedRoutesID,
-				OwnerID: apiServiceID,
-				Data: &pbmesh.ComputedRoutes{
-					BoundReferences: []*pbresource.Reference{
-						apiServiceRef,
-						newRef(pbmesh.GRPCRouteType, "api-grpc-route1"),
-					},
-					PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-						"grpc": {
-							ParentRef: newParentRef(apiServiceRef, "grpc"),
-							Protocol:  pbcatalog.Protocol_PROTOCOL_GRPC,
-							Config: &pbmesh.ComputedPortRoutes_Grpc{
-								Grpc: &pbmesh.ComputedGRPCRoute{
-									Rules: []*pbmesh.ComputedGRPCRouteRule{
-										{
-											Matches: defaultGRPCRouteMatches(),
-											BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-												BackendTarget: types.NullRouteBackend,
-											}},
-										},
-										{
-											Matches: defaultGRPCRouteMatches(),
-											BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-												BackendTarget: types.NullRouteBackend,
-											}},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			}}
-			run(t, related, expect, nil)
-		})
-		t.Run("tcp", func(t *testing.T) {
-			apiServiceData := &pbcatalog.Service{
-				Workloads: &pbcatalog.WorkloadSelector{
-					Prefixes: []string{"api-"},
-				},
-				Ports: []*pbcatalog.ServicePort{
-					{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-					{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-				},
-			}
-
-			tcpRoute1 := &pbmesh.TCPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(newRef(pbcatalog.ServiceType, "api"), "tcp"),
-				},
-				Rules: []*pbmesh.TCPRouteRule{{
-					BackendRefs: []*pbmesh.TCPBackendRef{{
-						BackendRef: newBackendRef(fooServiceRef, "", ""),
-					}},
-				}},
-			}
-
-			related := loader.NewRelatedResources().
-				AddComputedRoutesIDs(apiComputedRoutesID).
-				AddResources(
-					newService("api", apiServiceData),
-					newTCPRoute("api-tcp-route1", tcpRoute1),
-				)
-
-			expect := []*ComputedRoutesResult{{
-				ID:      apiComputedRoutesID,
-				OwnerID: apiServiceID,
-				Data: &pbmesh.ComputedRoutes{
-					BoundReferences: []*pbresource.Reference{
-						apiServiceRef,
-						newRef(pbmesh.TCPRouteType, "api-tcp-route1"),
-					},
-					PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-						"tcp": {
-							ParentRef: newParentRef(apiServiceRef, "tcp"),
-							Protocol:  pbcatalog.Protocol_PROTOCOL_TCP,
-							Config: &pbmesh.ComputedPortRoutes_Tcp{
-								Tcp: &pbmesh.ComputedTCPRoute{
-									Rules: []*pbmesh.ComputedTCPRouteRule{
-										{
-											BackendRefs: []*pbmesh.ComputedTCPBackendRef{{
-												BackendTarget: types.NullRouteBackend,
-											}},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			}}
-			run(t, related, expect, nil)
-		})
-	})
-
-	t.Run("stale-weird: http destination with service not in mesh", func(t *testing.T) {
-		apiServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		fooServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"foo-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		httpRoute1 := &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
-			},
-			Rules: []*pbmesh.HTTPRouteRule{{
-				BackendRefs: []*pbmesh.HTTPBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "", ""),
-				}},
-			}},
-		}
-
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID).
-			AddResources(
-				newService("api", apiServiceData),
-				newService("foo", fooServiceData),
-				newHTTPRoute("api-http-route1", httpRoute1),
-			)
-
-		expect := []*ComputedRoutesResult{{
-			ID:      apiComputedRoutesID,
-			OwnerID: apiServiceID,
-			Data: &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					apiServiceRef,
-					fooServiceRef,
-					newRef(pbmesh.HTTPRouteType, "api-http-route1"),
-				},
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						ParentRef: newParentRef(apiServiceRef, "http"),
-						Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-						Config: &pbmesh.ComputedPortRoutes_Http{
-							Http: &pbmesh.ComputedHTTPRoute{
-								Rules: []*pbmesh.ComputedHTTPRouteRule{
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: types.NullRouteBackend,
-										}},
-									},
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: types.NullRouteBackend,
-										}},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		}}
-		run(t, related, expect, nil)
-	})
-
-	t.Run("http route with dest policy", func(t *testing.T) {
-		apiServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		fooServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"foo-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		httpRoute1 := &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
-			},
-			Rules: []*pbmesh.HTTPRouteRule{{
-				Matches: []*pbmesh.HTTPRouteMatch{{
-					Path: &pbmesh.HTTPPathMatch{
-						Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-						Value: "/",
-					},
-				}},
-				BackendRefs: []*pbmesh.HTTPBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "", ""),
-				}},
-			}},
-		}
-
-		destPolicy := &pbmesh.DestinationPolicy{
-			PortConfigs: map[string]*pbmesh.DestinationConfig{
-				"http": {
-					ConnectTimeout: durationpb.New(55 * time.Second),
-				},
-			},
-		}
-		portDestConfig := &pbmesh.DestinationConfig{
-			ConnectTimeout: durationpb.New(55 * time.Second),
-		}
-
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID).
-			AddResources(
-				newService("api", apiServiceData),
-				newService("foo", fooServiceData),
-				newHTTPRoute("api-http-route1", httpRoute1),
-				newDestPolicy("foo", destPolicy),
-			)
-
-		expect := []*ComputedRoutesResult{{
-			ID:      apiComputedRoutesID,
-			OwnerID: apiServiceID,
-			Data: &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					apiServiceRef,
-					fooServiceRef,
-					newRef(pbmesh.DestinationPolicyType, "foo"),
-					newRef(pbmesh.HTTPRouteType, "api-http-route1"),
-				},
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Http{
-							Http: &pbmesh.ComputedHTTPRoute{
-								Rules: []*pbmesh.ComputedHTTPRouteRule{
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: backendName("foo", "http"),
-										}},
-									},
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: types.NullRouteBackend,
-										}},
-									},
-								},
-							},
-						},
-						ParentRef: newParentRef(apiServiceRef, "http"),
-						Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							backendName("foo", "http"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(fooServiceRef, "http", ""),
-								DestinationConfig: portDestConfig,
-							},
-						},
-					},
-				},
-			},
-		}}
-		run(t, related, expect, nil)
-	})
-
-	t.Run("http route with failover policy", func(t *testing.T) {
-		apiServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		fooServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"foo-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		barServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"bar-"},
-			},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}
-
-		httpRoute1 := &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
-			},
-			Rules: []*pbmesh.HTTPRouteRule{{
-				Matches: []*pbmesh.HTTPRouteMatch{{
-					Path: &pbmesh.HTTPPathMatch{
-						Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-						Value: "/",
-					},
-				}},
-				BackendRefs: []*pbmesh.HTTPBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "", ""),
-				}},
-			}},
-		}
-
-		failoverPolicy := &pbcatalog.FailoverPolicy{
-			Config: &pbcatalog.FailoverConfig{
-				Destinations: []*pbcatalog.FailoverDestination{
-					{Ref: barServiceRef},
-					{Ref: deadServiceRef}, // no service
-				},
-			},
-		}
-		portFailoverConfig := &pbmesh.ComputedFailoverConfig{
-			Destinations: []*pbmesh.ComputedFailoverDestination{
-				{BackendTarget: backendName("bar", "http")},
-				// we skip the dead route
-			},
-		}
-
-		related := loader.NewRelatedResources().
-			AddComputedRoutesIDs(apiComputedRoutesID).
-			AddResources(
-				newService("api", apiServiceData),
-				newService("foo", fooServiceData),
-				newService("bar", barServiceData),
-				newHTTPRoute("api-http-route1", httpRoute1),
-				newFailPolicy("foo", failoverPolicy),
-			)
-
-		expect := []*ComputedRoutesResult{{
-			ID:      apiComputedRoutesID,
-			OwnerID: apiServiceID,
-			Data: &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					newRef(pbcatalog.FailoverPolicyType, "foo"),
-					apiServiceRef,
-					barServiceRef,
-					fooServiceRef,
-					newRef(pbmesh.HTTPRouteType, "api-http-route1"),
-				},
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Http{
-							Http: &pbmesh.ComputedHTTPRoute{
-								Rules: []*pbmesh.ComputedHTTPRouteRule{
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: backendName("foo", "http"),
-										}},
-									},
-									{
-										Matches: defaultHTTPRouteMatches(),
-										BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-											BackendTarget: types.NullRouteBackend,
-										}},
-									},
-								},
-							},
-						},
-						ParentRef: newParentRef(apiServiceRef, "http"),
-						Protocol:  pbcatalog.Protocol_PROTOCOL_HTTP,
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							backendName("foo", "http"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(fooServiceRef, "http", ""),
-								FailoverConfig:    portFailoverConfig,
-								DestinationConfig: defaultDestConfig(),
-							},
-							backendName("bar", "http"): {
-								Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_INDIRECT,
-								MeshPort:          "mesh",
-								BackendRef:        newBackendRef(barServiceRef, "http", ""),
-								DestinationConfig: defaultDestConfig(),
-							},
-						},
-					},
-				},
-			},
-		}}
-		run(t, related, expect, nil)
-	})
-}
diff --git a/internal/mesh/internal/controllers/routes/intermediate.go b/internal/mesh/internal/controllers/routes/intermediate.go
deleted file mode 100644
index bc7aa348eea4e..0000000000000
--- a/internal/mesh/internal/controllers/routes/intermediate.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package routes
-
-import (
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// inputRouteNode is a dressed up version of an XRoute meant as working state
-// for one pass of the compilation procedure.
-type inputRouteNode struct {
-	ParentPort string // always set
-
-	RouteType *pbresource.Type
-	Default   bool
-
-	// only one of these can be set to non-empty
-	HTTPRules []*pbmesh.ComputedHTTPRouteRule
-	GRPCRules []*pbmesh.ComputedGRPCRouteRule
-	TCPRules  []*pbmesh.ComputedTCPRouteRule
-
-	NewTargets map[string]*pbmesh.BackendTargetDetails
-
-	// This field is non-nil for nodes based on a single xRoute, and nil for
-	// composite nodes or default nodes.
-	OriginalResource *pbresource.Resource
-}
-
-func newInputRouteNode(port string) *inputRouteNode {
-	return &inputRouteNode{
-		ParentPort: port,
-		NewTargets: make(map[string]*pbmesh.BackendTargetDetails),
-	}
-}
-
-func (n *inputRouteNode) AddTarget(backendRef *pbmesh.BackendReference, data *pbmesh.BackendTargetDetails) string {
-	n.Default = false
-	key := types.BackendRefToComputedRoutesTarget(backendRef)
-
-	if _, ok := n.NewTargets[key]; !ok {
-		n.NewTargets[key] = data
-	}
-
-	return key
-}
-
-func (n *inputRouteNode) AddTargetsFrom(next *inputRouteNode) {
-	n.Default = false
-	for key, details := range next.NewTargets {
-		if _, ok := n.NewTargets[key]; !ok {
-			n.NewTargets[key] = details // add if not already there
-		}
-	}
-}
-
-func (n *inputRouteNode) AppendRulesFrom(next *inputRouteNode) {
-	n.Default = false
-	switch {
-	case resource.EqualType(n.RouteType, pbmesh.HTTPRouteType):
-		n.HTTPRules = append(n.HTTPRules, next.HTTPRules...)
-	case resource.EqualType(n.RouteType, pbmesh.GRPCRouteType):
-		n.GRPCRules = append(n.GRPCRules, next.GRPCRules...)
-	case resource.EqualType(n.RouteType, pbmesh.TCPRouteType):
-		n.TCPRules = append(n.TCPRules, next.TCPRules...)
-	default:
-		panic("impossible")
-	}
-}
diff --git a/internal/mesh/internal/controllers/routes/loader/loader.go b/internal/mesh/internal/controllers/routes/loader/loader.go
deleted file mode 100644
index 4e7be5e64971f..0000000000000
--- a/internal/mesh/internal/controllers/routes/loader/loader.go
+++ /dev/null
@@ -1,323 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package loader
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/hashicorp/go-hclog"
-
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes/xroutemapper"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type loader struct {
-	mapper *xroutemapper.Mapper
-
-	mem *memoizingLoader
-
-	// output var
-	out *RelatedResources
-
-	// working state
-	mcToLoad map[resource.ReferenceKey]struct{}
-	mcDone   map[resource.ReferenceKey]struct{}
-}
-
-func LoadResourcesForComputedRoutes(
-	ctx context.Context,
-	loggerFor func(*pbresource.ID) hclog.Logger,
-	client pbresource.ResourceServiceClient,
-	mapper *xroutemapper.Mapper,
-	computedRoutesID *pbresource.ID,
-) (*RelatedResources, error) {
-	if loggerFor == nil {
-		loggerFor = func(_ *pbresource.ID) hclog.Logger {
-			return hclog.NewNullLogger()
-		}
-	}
-	loader := &loader{
-		mapper:   mapper,
-		mem:      newMemoizingLoader(client),
-		mcToLoad: make(map[resource.ReferenceKey]struct{}),
-		mcDone:   make(map[resource.ReferenceKey]struct{}),
-	}
-
-	if err := loader.load(ctx, loggerFor, computedRoutesID); err != nil {
-		return nil, err
-	}
-
-	return loader.out, nil
-}
-
-func (l *loader) requestLoad(computedRoutesID *pbresource.ID) {
-	if !resource.EqualType(computedRoutesID.Type, pbmesh.ComputedRoutesType) {
-		panic("input must be a ComputedRoutes type")
-	}
-	rk := resource.NewReferenceKey(computedRoutesID)
-
-	if _, done := l.mcDone[rk]; done {
-		return
-	}
-	l.mcToLoad[rk] = struct{}{}
-}
-
-func (l *loader) markLoaded(computedRoutesID *pbresource.ID) {
-	if !resource.EqualType(computedRoutesID.Type, pbmesh.ComputedRoutesType) {
-		panic("input must be a ComputedRoutes type")
-	}
-	rk := resource.NewReferenceKey(computedRoutesID)
-
-	l.mcDone[rk] = struct{}{}
-	delete(l.mcToLoad, rk)
-}
-
-func (l *loader) nextRequested() *pbresource.ID {
-	for rk := range l.mcToLoad {
-		return rk.ToID()
-	}
-	return nil
-}
-
-func (l *loader) load(
-	ctx context.Context,
-	loggerFor func(*pbresource.ID) hclog.Logger,
-	computedRoutesID *pbresource.ID,
-) error {
-	l.out = NewRelatedResources()
-
-	// Seed the graph fetch for our starting position.
-	l.requestLoad(computedRoutesID)
-
-	for {
-		mcID := l.nextRequested()
-		if mcID == nil {
-			break
-		}
-
-		if err := l.loadOne(ctx, loggerFor, mcID); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (l *loader) loadOne(
-	ctx context.Context,
-	loggerFor func(*pbresource.ID) hclog.Logger,
-	computedRoutesID *pbresource.ID,
-) error {
-	logger := loggerFor(computedRoutesID)
-
-	// There is one computed routes for the entire service (perfect name alignment).
-	//
-	// All ports are embedded within.
-
-	parentServiceID := changeResourceType(computedRoutesID, pbcatalog.ServiceType)
-	parentServiceRef := resource.Reference(parentServiceID, "")
-
-	if err := l.loadUpstreamService(ctx, logger, parentServiceID); err != nil {
-		return err
-	}
-
-	if err := l.gatherXRoutesAsInput(ctx, logger, parentServiceRef); err != nil {
-		return err
-	}
-
-	l.out.AddComputedRoutesIDs(computedRoutesID)
-
-	l.markLoaded(computedRoutesID)
-
-	return nil
-}
-
-func (l *loader) gatherXRoutesAsInput(
-	ctx context.Context,
-	logger hclog.Logger,
-	parentServiceRef *pbresource.Reference,
-) error {
-	routeIDs := l.mapper.RouteIDsByParentServiceRef(parentServiceRef)
-
-	// read the xRoutes
-	for _, routeID := range routeIDs {
-		switch {
-		case resource.EqualType(routeID.Type, pbmesh.HTTPRouteType):
-			route, err := l.mem.GetHTTPRoute(ctx, routeID)
-			if err != nil {
-				return fmt.Errorf("the resource service has returned an unexpected error loading %s: %w", routeID, err)
-			}
-			var routeData types.XRouteData
-			if route != nil {
-				routeData = route.Data
-			}
-			err = l.gatherSingleXRouteAsInput(ctx, logger, routeID, routeData, func() {
-				l.out.AddHTTPRoute(route)
-			})
-			if err != nil {
-				return fmt.Errorf("the resource service has returned an unexpected error loading %s: %w", routeID, err)
-			}
-		case resource.EqualType(routeID.Type, pbmesh.GRPCRouteType):
-			route, err := l.mem.GetGRPCRoute(ctx, routeID)
-			if err != nil {
-				return fmt.Errorf("the resource service has returned an unexpected error loading %s: %w", routeID, err)
-			}
-			var routeData types.XRouteData
-			if route != nil {
-				routeData = route.Data
-			}
-			err = l.gatherSingleXRouteAsInput(ctx, logger, routeID, routeData, func() {
-				l.out.AddGRPCRoute(route)
-			})
-			if err != nil {
-				return fmt.Errorf("the resource service has returned an unexpected error loading %s: %w", routeID, err)
-			}
-		case resource.EqualType(routeID.Type, pbmesh.TCPRouteType):
-			route, err := l.mem.GetTCPRoute(ctx, routeID)
-			if err != nil {
-				return fmt.Errorf("the resource service has returned an unexpected error loading %s: %w", routeID, err)
-			}
-			var routeData types.XRouteData
-			if route != nil {
-				routeData = route.Data
-			}
-			err = l.gatherSingleXRouteAsInput(ctx, logger, routeID, routeData, func() {
-				l.out.AddTCPRoute(route)
-			})
-			if err != nil {
-				return fmt.Errorf("the resource service has returned an unexpected error loading %s: %w", routeID, err)
-			}
-		default:
-			logger.Warn("skipping xRoute reference of unknown type", "ID", resource.IDToString(routeID))
-			continue
-		}
-	}
-
-	return nil
-}
-
-func (l *loader) loadUpstreamService(
-	ctx context.Context,
-	logger hclog.Logger,
-	svcID *pbresource.ID,
-) error {
-	logger = logger.With("service-id", resource.IDToString(svcID))
-
-	service, err := l.mem.GetService(ctx, svcID)
-	if err != nil {
-		logger.Error("error retrieving the service", "serviceID", svcID, "error", err)
-		return err
-	}
-	if service != nil {
-		l.out.AddService(service)
-
-		failoverPolicyID := changeResourceType(svcID, pbcatalog.FailoverPolicyType)
-		failoverPolicy, err := l.mem.GetFailoverPolicy(ctx, failoverPolicyID)
-		if err != nil {
-			logger.Error("error retrieving the failover policy", "failoverPolicyID", failoverPolicyID, "error", err)
-			return err
-		}
-		if failoverPolicy != nil {
-			l.mapper.TrackFailoverPolicy(failoverPolicy)
-			l.out.AddFailoverPolicy(failoverPolicy)
-
-			destRefs := failoverPolicy.Data.GetUnderlyingDestinationRefs()
-			for _, destRef := range destRefs {
-				destID := resource.IDFromReference(destRef)
-
-				failService, err := l.mem.GetService(ctx, destID)
-				if err != nil {
-					logger.Error("error retrieving a failover destination service",
-						"serviceID", destID, "error", err)
-					return err
-				}
-				if failService != nil {
-					l.out.AddService(failService)
-
-					if err := l.loadDestConfig(ctx, logger, failService.Resource.Id); err != nil {
-						return err
-					}
-				}
-			}
-		} else {
-			l.mapper.UntrackFailoverPolicy(failoverPolicyID)
-		}
-
-		if err := l.loadDestConfig(ctx, logger, svcID); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (l *loader) loadDestConfig(
-	ctx context.Context,
-	logger hclog.Logger,
-	svcID *pbresource.ID,
-) error {
-	destPolicyID := changeResourceType(svcID, pbmesh.DestinationPolicyType)
-	destPolicy, err := l.mem.GetDestinationPolicy(ctx, destPolicyID)
-	if err != nil {
-		logger.Error("error retrieving the destination config", "destPolicyID", destPolicyID, "error", err)
-		return err
-	}
-	if destPolicy != nil {
-		l.out.AddDestinationPolicy(destPolicy)
-	}
-	return nil
-}
-
-func (l *loader) gatherSingleXRouteAsInput(
-	ctx context.Context,
-	logger hclog.Logger,
-	routeID *pbresource.ID,
-	route types.XRouteData,
-	relatedRouteCaptureFn func(),
-) error {
-	if route == nil {
-		logger.Trace("XRoute has been deleted")
-		l.mapper.UntrackXRoute(routeID)
-		return nil
-	}
-	l.mapper.TrackXRoute(routeID, route)
-
-	relatedRouteCaptureFn()
-
-	for _, parentRef := range route.GetParentRefs() {
-		if types.IsServiceType(parentRef.Ref.Type) {
-			parentComputedRoutesID := &pbresource.ID{
-				Type:    pbmesh.ComputedRoutesType,
-				Tenancy: parentRef.Ref.Tenancy,
-				Name:    parentRef.Ref.Name,
-			}
-			// Note: this will only schedule things to load that have not already been loaded
-			l.requestLoad(parentComputedRoutesID)
-		}
-	}
-
-	for _, backendRef := range route.GetUnderlyingBackendRefs() {
-		if types.IsServiceType(backendRef.Ref.Type) {
-			svcID := resource.IDFromReference(backendRef.Ref)
-			if err := l.loadUpstreamService(ctx, logger, svcID); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func changeResourceType(id *pbresource.ID, newType *pbresource.Type) *pbresource.ID {
-	return &pbresource.ID{
-		Type:    newType,
-		Tenancy: id.Tenancy,
-		Name:    id.Name,
-	}
-}
diff --git a/internal/mesh/internal/controllers/routes/loader/loader_test.go b/internal/mesh/internal/controllers/routes/loader/loader_test.go
deleted file mode 100644
index a665635d05f7f..0000000000000
--- a/internal/mesh/internal/controllers/routes/loader/loader_test.go
+++ /dev/null
@@ -1,413 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package loader
-
-import (
-	"testing"
-	"time"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/types/known/durationpb"
-
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes/xroutemapper"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestLoadResourcesForComputedRoutes(t *testing.T) {
-	ctx := testutil.TestContext(t)
-	rclient := svctest.RunResourceService(t, types.Register, catalog.RegisterTypes)
-	rt := controller.Runtime{
-		Client: rclient,
-		Logger: testutil.Logger(t),
-	}
-	client := rtest.NewClient(rclient)
-
-	loggerFor := func(id *pbresource.ID) hclog.Logger {
-		return rt.Logger.With("resource-id", id)
-	}
-
-	mapper := xroutemapper.New()
-
-	deleteRes := func(id *pbresource.ID, untrack bool) {
-		client.MustDelete(t, id)
-		if untrack {
-			switch {
-			case types.IsRouteType(id.Type):
-				mapper.UntrackXRoute(id)
-			case types.IsFailoverPolicyType(id.Type):
-				mapper.UntrackFailoverPolicy(id)
-			}
-		}
-	}
-
-	writeHTTP := func(name string, data *pbmesh.HTTPRoute) *types.DecodedHTTPRoute {
-		res := rtest.Resource(pbmesh.HTTPRouteType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).
-			Write(t, client)
-		mapper.TrackXRoute(res.Id, data)
-		dec, err := resource.Decode[*pbmesh.HTTPRoute](res)
-		require.NoError(t, err)
-		return dec
-	}
-
-	writeGRPC := func(name string, data *pbmesh.GRPCRoute) *types.DecodedGRPCRoute {
-		res := rtest.Resource(pbmesh.GRPCRouteType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).
-			Write(t, client)
-		mapper.TrackXRoute(res.Id, data)
-		dec, err := resource.Decode[*pbmesh.GRPCRoute](res)
-		require.NoError(t, err)
-		return dec
-	}
-	_ = writeGRPC // TODO
-
-	writeTCP := func(name string, data *pbmesh.TCPRoute) *types.DecodedTCPRoute {
-		res := rtest.Resource(pbmesh.TCPRouteType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).
-			Write(t, client)
-		mapper.TrackXRoute(res.Id, data)
-		dec, err := resource.Decode[*pbmesh.TCPRoute](res)
-		require.NoError(t, err)
-		return dec
-	}
-	_ = writeTCP // TODO
-
-	writeDestPolicy := func(name string, data *pbmesh.DestinationPolicy) *types.DecodedDestinationPolicy {
-		res := rtest.Resource(pbmesh.DestinationPolicyType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).
-			Write(t, client)
-		dec, err := resource.Decode[*pbmesh.DestinationPolicy](res)
-		require.NoError(t, err)
-		return dec
-	}
-
-	writeFailover := func(name string, data *pbcatalog.FailoverPolicy) *types.DecodedFailoverPolicy {
-		res := rtest.Resource(pbcatalog.FailoverPolicyType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).
-			Write(t, client)
-		dec, err := resource.Decode[*pbcatalog.FailoverPolicy](res)
-		require.NoError(t, err)
-		return dec
-	}
-
-	writeService := func(name string, data *pbcatalog.Service) *types.DecodedService {
-		res := rtest.Resource(pbcatalog.ServiceType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).
-			Write(t, client)
-		dec, err := resource.Decode[*pbcatalog.Service](res)
-		require.NoError(t, err)
-		return dec
-	}
-
-	/////////////////////////////////////
-
-	// Init some port-aligned services.
-	apiSvc := writeService("api", &pbcatalog.Service{
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-		},
-	})
-	adminSvc := writeService("admin", &pbcatalog.Service{
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-		},
-	})
-	fooSvc := writeService("foo", &pbcatalog.Service{
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-		},
-	})
-	barSvc := writeService("bar", &pbcatalog.Service{
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-		},
-	})
-
-	apiRoutesID := &pbresource.ID{
-		Type:    pbmesh.ComputedRoutesType,
-		Tenancy: resource.DefaultNamespacedTenancy(),
-		Name:    "api",
-	}
-	adminRoutesID := &pbresource.ID{
-		Type:    pbmesh.ComputedRoutesType,
-		Tenancy: resource.DefaultNamespacedTenancy(),
-		Name:    "admin",
-	}
-
-	testutil.RunStep(t, "only service", func(t *testing.T) {
-		out, err := LoadResourcesForComputedRoutes(ctx, loggerFor, rt.Client, mapper, apiRoutesID)
-		require.NoError(t, err)
-
-		prototest.AssertDeepEqual(t, NewRelatedResources().AddResources(
-			apiSvc,
-		).AddComputedRoutesIDs(apiRoutesID), out)
-		require.Equal(t, doubleMap(t /* empty */), out.RoutesByParentRef)
-	})
-
-	// Write one silly http route
-	route1 := writeHTTP("api-route1", &pbmesh.HTTPRoute{
-		ParentRefs: []*pbmesh.ParentReference{{
-			Ref: newRef(pbcatalog.ServiceType, "api"),
-			// all ports
-		}},
-	})
-
-	testutil.RunStep(t, "one silly route", func(t *testing.T) {
-		out, err := LoadResourcesForComputedRoutes(ctx, loggerFor, rt.Client, mapper, apiRoutesID)
-		require.NoError(t, err)
-
-		prototest.AssertDeepEqual(t, NewRelatedResources().AddResources(
-			apiSvc,
-			route1,
-		).AddComputedRoutesIDs(apiRoutesID), out)
-		require.Equal(t, doubleMap(t,
-			apiSvc, route1,
-		), out.RoutesByParentRef)
-	})
-
-	// add a second route that is more interesting and is TCP
-	route2 := writeTCP("api-route2", &pbmesh.TCPRoute{
-		ParentRefs: []*pbmesh.ParentReference{{
-			Ref: newRef(pbcatalog.ServiceType, "api"),
-			// all ports
-		}},
-		Rules: []*pbmesh.TCPRouteRule{{
-			BackendRefs: []*pbmesh.TCPBackendRef{
-				{
-					BackendRef: &pbmesh.BackendReference{
-						Ref: newRef(pbcatalog.ServiceType, "foo"),
-					},
-					Weight: 30,
-				},
-				{
-					BackendRef: &pbmesh.BackendReference{
-						Ref: newRef(pbcatalog.ServiceType, "bar"),
-					},
-					Weight: 70,
-				},
-			},
-		}},
-	})
-
-	testutil.RunStep(t, "two routes", func(t *testing.T) {
-		out, err := LoadResourcesForComputedRoutes(ctx, loggerFor, rt.Client, mapper, apiRoutesID)
-		require.NoError(t, err)
-
-		prototest.AssertDeepEqual(t, NewRelatedResources().AddResources(
-			apiSvc,
-			fooSvc,
-			barSvc,
-			route1,
-			route2,
-		).AddComputedRoutesIDs(apiRoutesID), out)
-		require.Equal(t, doubleMap(t,
-			apiSvc, route1,
-			apiSvc, route2,
-		), out.RoutesByParentRef)
-	})
-
-	// update the first to overlap with the second
-	route1 = writeHTTP("api-route1", &pbmesh.HTTPRoute{
-		ParentRefs: []*pbmesh.ParentReference{
-			{
-				Ref: newRef(pbcatalog.ServiceType, "api"),
-				// all ports
-			},
-			{
-				Ref: newRef(pbcatalog.ServiceType, "admin"),
-				// all ports
-			},
-		},
-	})
-
-	testutil.RunStep(t, "two overlapping computed routes resources", func(t *testing.T) {
-		out, err := LoadResourcesForComputedRoutes(ctx, loggerFor, rt.Client, mapper, apiRoutesID)
-		require.NoError(t, err)
-
-		prototest.AssertDeepEqual(t, NewRelatedResources().AddResources(
-			apiSvc,
-			fooSvc,
-			barSvc,
-			adminSvc,
-			route1,
-			route2,
-		).AddComputedRoutesIDs(apiRoutesID, adminRoutesID), out)
-		require.Equal(t, doubleMap(t,
-			apiSvc, route1,
-			apiSvc, route2,
-			adminSvc, route1,
-		), out.RoutesByParentRef)
-	})
-
-	// add a third (GRPC) that overlaps them both
-
-	route3 := writeGRPC("api-route3", &pbmesh.GRPCRoute{
-		ParentRefs: []*pbmesh.ParentReference{
-			{
-				Ref: newRef(pbcatalog.ServiceType, "api"),
-				// all ports
-			},
-			{
-				Ref: newRef(pbcatalog.ServiceType, "admin"),
-				// all ports
-			},
-		},
-	})
-
-	testutil.RunStep(t, "three overlapping computed routes resources", func(t *testing.T) {
-		out, err := LoadResourcesForComputedRoutes(ctx, loggerFor, rt.Client, mapper, apiRoutesID)
-		require.NoError(t, err)
-
-		prototest.AssertDeepEqual(t, NewRelatedResources().AddResources(
-			apiSvc,
-			fooSvc,
-			barSvc,
-			adminSvc,
-			route1,
-			route2,
-			route3,
-		).AddComputedRoutesIDs(apiRoutesID, adminRoutesID), out)
-		require.Equal(t, doubleMap(t,
-			apiSvc, route1,
-			apiSvc, route2,
-			apiSvc, route3,
-			adminSvc, route1,
-			adminSvc, route3,
-		), out.RoutesByParentRef)
-	})
-
-	// We untrack the first, but we let the third one be a dangling reference
-	// so that the loader has to fix it up.
-	deleteRes(route1.Resource.Id, true)
-	deleteRes(route3.Resource.Id, false)
-
-	testutil.RunStep(t, "delete first and third route", func(t *testing.T) {
-		out, err := LoadResourcesForComputedRoutes(ctx, loggerFor, rt.Client, mapper, apiRoutesID)
-		require.NoError(t, err)
-
-		prototest.AssertDeepEqual(t, NewRelatedResources().AddResources(
-			apiSvc,
-			fooSvc,
-			barSvc,
-			route2,
-		).AddComputedRoutesIDs(apiRoutesID), out)
-		require.Equal(t, doubleMap(t,
-			apiSvc, route2,
-		), out.RoutesByParentRef)
-	})
-
-	barFailover := writeFailover("bar", &pbcatalog.FailoverPolicy{
-		Config: &pbcatalog.FailoverConfig{
-			Destinations: []*pbcatalog.FailoverDestination{{
-				Ref: newRef(pbcatalog.ServiceType, "admin"),
-			}},
-		},
-	})
-
-	testutil.RunStep(t, "add a failover", func(t *testing.T) {
-		out, err := LoadResourcesForComputedRoutes(ctx, loggerFor, rt.Client, mapper, apiRoutesID)
-		require.NoError(t, err)
-
-		prototest.AssertDeepEqual(t, NewRelatedResources().AddResources(
-			apiSvc,
-			fooSvc,
-			barSvc,
-			adminSvc,
-			route2,
-			barFailover,
-		).AddComputedRoutesIDs(apiRoutesID), out)
-		require.Equal(t, doubleMap(t,
-			apiSvc, route2,
-		), out.RoutesByParentRef)
-	})
-
-	fooDestPolicy := writeDestPolicy("foo", &pbmesh.DestinationPolicy{
-		PortConfigs: map[string]*pbmesh.DestinationConfig{
-			"www": {
-				ConnectTimeout: durationpb.New(55 * time.Second),
-			},
-		},
-	})
-	adminDestPolicy := writeDestPolicy("admin", &pbmesh.DestinationPolicy{
-		PortConfigs: map[string]*pbmesh.DestinationConfig{
-			"http": {
-				ConnectTimeout: durationpb.New(222 * time.Second),
-			},
-		},
-	})
-
-	testutil.RunStep(t, "add a dest policy", func(t *testing.T) {
-		out, err := LoadResourcesForComputedRoutes(ctx, loggerFor, rt.Client, mapper, apiRoutesID)
-		require.NoError(t, err)
-
-		prototest.AssertDeepEqual(t, NewRelatedResources().AddResources(
-			apiSvc,
-			fooSvc,
-			barSvc,
-			adminSvc,
-			route2,
-			barFailover,
-			fooDestPolicy,
-			adminDestPolicy, // adminDestPolicy shows up indirectly via a FailoverPolicy
-		).AddComputedRoutesIDs(apiRoutesID), out)
-		require.Equal(t, doubleMap(t,
-			apiSvc, route2,
-		), out.RoutesByParentRef)
-	})
-}
-
-func newRef(typ *pbresource.Type, name string) *pbresource.Reference {
-	return rtest.Resource(typ, name).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		Reference("")
-}
-
-type resourceGetter interface {
-	GetResource() *pbresource.Resource
-}
-
-func doubleMap(t *testing.T, list ...resourceGetter) map[resource.ReferenceKey]map[resource.ReferenceKey]struct{} {
-	if len(list)%2 != 0 {
-		t.Fatalf("list must have an even number of references")
-	}
-	out := make(map[resource.ReferenceKey]map[resource.ReferenceKey]struct{})
-	for i := 0; i < len(list); i += 2 {
-		svcRK := resource.NewReferenceKey(list[i].GetResource().Id)
-		routeRK := resource.NewReferenceKey(list[i+1].GetResource().Id)
-
-		m, ok := out[svcRK]
-		if !ok {
-			m = make(map[resource.ReferenceKey]struct{})
-			out[svcRK] = m
-		}
-		m[routeRK] = struct{}{}
-	}
-	return out
-}
diff --git a/internal/mesh/internal/controllers/routes/loader/memoized.go b/internal/mesh/internal/controllers/routes/loader/memoized.go
deleted file mode 100644
index 8fe912496f5ab..0000000000000
--- a/internal/mesh/internal/controllers/routes/loader/memoized.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package loader
-
-import (
-	"context"
-	"fmt"
-
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type memoizingLoader struct {
-	client pbresource.ResourceServiceClient
-
-	mapHTTPRoute         map[resource.ReferenceKey]*types.DecodedHTTPRoute
-	mapGRPCRoute         map[resource.ReferenceKey]*types.DecodedGRPCRoute
-	mapTCPRoute          map[resource.ReferenceKey]*types.DecodedTCPRoute
-	mapDestinationPolicy map[resource.ReferenceKey]*types.DecodedDestinationPolicy
-	mapFailoverPolicy    map[resource.ReferenceKey]*types.DecodedFailoverPolicy
-	mapService           map[resource.ReferenceKey]*types.DecodedService
-}
-
-func newMemoizingLoader(client pbresource.ResourceServiceClient) *memoizingLoader {
-	if client == nil {
-		panic("client is required")
-	}
-	return &memoizingLoader{
-		client:               client,
-		mapHTTPRoute:         make(map[resource.ReferenceKey]*types.DecodedHTTPRoute),
-		mapGRPCRoute:         make(map[resource.ReferenceKey]*types.DecodedGRPCRoute),
-		mapTCPRoute:          make(map[resource.ReferenceKey]*types.DecodedTCPRoute),
-		mapDestinationPolicy: make(map[resource.ReferenceKey]*types.DecodedDestinationPolicy),
-		mapFailoverPolicy:    make(map[resource.ReferenceKey]*types.DecodedFailoverPolicy),
-		mapService:           make(map[resource.ReferenceKey]*types.DecodedService),
-	}
-}
-
-func (m *memoizingLoader) GetHTTPRoute(ctx context.Context, id *pbresource.ID) (*types.DecodedHTTPRoute, error) {
-	return getOrCacheResource[*pbmesh.HTTPRoute](ctx, m.client, m.mapHTTPRoute, pbmesh.HTTPRouteType, id)
-}
-
-func (m *memoizingLoader) GetGRPCRoute(ctx context.Context, id *pbresource.ID) (*types.DecodedGRPCRoute, error) {
-	return getOrCacheResource[*pbmesh.GRPCRoute](ctx, m.client, m.mapGRPCRoute, pbmesh.GRPCRouteType, id)
-}
-
-func (m *memoizingLoader) GetTCPRoute(ctx context.Context, id *pbresource.ID) (*types.DecodedTCPRoute, error) {
-	return getOrCacheResource[*pbmesh.TCPRoute](ctx, m.client, m.mapTCPRoute, pbmesh.TCPRouteType, id)
-}
-
-func (m *memoizingLoader) GetDestinationPolicy(ctx context.Context, id *pbresource.ID) (*types.DecodedDestinationPolicy, error) {
-	return getOrCacheResource[*pbmesh.DestinationPolicy](ctx, m.client, m.mapDestinationPolicy, pbmesh.DestinationPolicyType, id)
-}
-
-func (m *memoizingLoader) GetFailoverPolicy(ctx context.Context, id *pbresource.ID) (*types.DecodedFailoverPolicy, error) {
-	return getOrCacheResource[*pbcatalog.FailoverPolicy](ctx, m.client, m.mapFailoverPolicy, pbcatalog.FailoverPolicyType, id)
-}
-
-func (m *memoizingLoader) GetService(ctx context.Context, id *pbresource.ID) (*types.DecodedService, error) {
-	return getOrCacheResource[*pbcatalog.Service](ctx, m.client, m.mapService, pbcatalog.ServiceType, id)
-}
-
-func getOrCacheResource[T proto.Message](
-	ctx context.Context,
-	client pbresource.ResourceServiceClient,
-	cache map[resource.ReferenceKey]*resource.DecodedResource[T],
-	typ *pbresource.Type,
-	id *pbresource.ID,
-) (*resource.DecodedResource[T], error) {
-	if !resource.EqualType(id.Type, typ) {
-		return nil, fmt.Errorf("expected %s not %s", resource.TypeToString(typ), resource.TypeToString(id.Type))
-	}
-
-	rk := resource.NewReferenceKey(id)
-
-	if cached, ok := cache[rk]; ok {
-		return cached, nil // cached value may be nil
-	}
-
-	dec, err := resource.GetDecodedResource[T](ctx, client, id)
-	if err != nil {
-		return nil, err
-	}
-
-	cache[rk] = dec
-	return dec, nil
-}
diff --git a/internal/mesh/internal/controllers/routes/loader/related.go b/internal/mesh/internal/controllers/routes/loader/related.go
deleted file mode 100644
index a2ae9d853ab7d..0000000000000
--- a/internal/mesh/internal/controllers/routes/loader/related.go
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package loader
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// RelatedResources is a spiritual successor of *configentry.DiscoveryChainSet
-type RelatedResources struct {
-	ComputedRoutesList []*pbresource.ID
-	// RoutesByParentRef is a map of a parent Service to the xRoutes that compose it.
-	RoutesByParentRef   map[resource.ReferenceKey]map[resource.ReferenceKey]struct{}
-	HTTPRoutes          map[resource.ReferenceKey]*types.DecodedHTTPRoute
-	GRPCRoutes          map[resource.ReferenceKey]*types.DecodedGRPCRoute
-	TCPRoutes           map[resource.ReferenceKey]*types.DecodedTCPRoute
-	Services            map[resource.ReferenceKey]*types.DecodedService
-	FailoverPolicies    map[resource.ReferenceKey]*types.DecodedFailoverPolicy
-	DestinationPolicies map[resource.ReferenceKey]*types.DecodedDestinationPolicy
-}
-
-func NewRelatedResources() *RelatedResources {
-	return &RelatedResources{
-		RoutesByParentRef:   make(map[resource.ReferenceKey]map[resource.ReferenceKey]struct{}),
-		HTTPRoutes:          make(map[resource.ReferenceKey]*types.DecodedHTTPRoute),
-		GRPCRoutes:          make(map[resource.ReferenceKey]*types.DecodedGRPCRoute),
-		TCPRoutes:           make(map[resource.ReferenceKey]*types.DecodedTCPRoute),
-		Services:            make(map[resource.ReferenceKey]*types.DecodedService),
-		FailoverPolicies:    make(map[resource.ReferenceKey]*types.DecodedFailoverPolicy),
-		DestinationPolicies: make(map[resource.ReferenceKey]*types.DecodedDestinationPolicy),
-	}
-}
-
-func (r *RelatedResources) AddComputedRoutesIDs(list ...*pbresource.ID) *RelatedResources {
-	for _, id := range list {
-		r.AddComputedRoutesID(id)
-	}
-	return r
-}
-
-func (r *RelatedResources) AddComputedRoutesID(id *pbresource.ID) *RelatedResources {
-	if !resource.EqualType(id.Type, pbmesh.ComputedRoutesType) {
-		panic(fmt.Sprintf("expected *mesh.ComputedRoutes, not %s", resource.TypeToString(id.Type)))
-	}
-	r.ComputedRoutesList = append(r.ComputedRoutesList, id)
-	return r
-}
-
-// AddResources must only be called with valid *resource.DecodedResource[T]
-// types.
-//
-// This is provided as a testing convenience. Non-test code should call the
-// type-specific adder.
-func (r *RelatedResources) AddResources(list ...any) *RelatedResources {
-	for _, res := range list {
-		r.AddResource(res)
-	}
-	return r
-}
-
-// AddResource must only be called with valid *resource.DecodedResource[T] types.
-//
-// This is provided as a testing convenience. Non-test code should call the
-// type-specific adder.
-func (r *RelatedResources) AddResource(res any) {
-	if res == nil {
-		return
-	}
-
-	switch dec := res.(type) {
-	case *types.DecodedHTTPRoute:
-		r.AddHTTPRoute(dec)
-	case *types.DecodedGRPCRoute:
-		r.AddGRPCRoute(dec)
-	case *types.DecodedTCPRoute:
-		r.AddTCPRoute(dec)
-	case *types.DecodedDestinationPolicy:
-		r.AddDestinationPolicy(dec)
-	case *types.DecodedService:
-		r.AddService(dec)
-	case *types.DecodedFailoverPolicy:
-		r.AddFailoverPolicy(dec)
-	default:
-		panic(fmt.Sprintf("unknown decoded resource type: %T", res))
-	}
-}
-
-func (r *RelatedResources) AddHTTPRoute(dec *types.DecodedHTTPRoute) {
-	r.addRouteSetEntries(dec.Resource, dec.Data)
-	addResource(dec.Resource.Id, dec, r.HTTPRoutes)
-}
-
-func (r *RelatedResources) AddGRPCRoute(dec *types.DecodedGRPCRoute) {
-	r.addRouteSetEntries(dec.Resource, dec.Data)
-	addResource(dec.Resource.Id, dec, r.GRPCRoutes)
-}
-
-func (r *RelatedResources) AddTCPRoute(dec *types.DecodedTCPRoute) {
-	r.addRouteSetEntries(dec.Resource, dec.Data)
-	addResource(dec.Resource.Id, dec, r.TCPRoutes)
-}
-
-func (r *RelatedResources) AddDestinationPolicy(dec *types.DecodedDestinationPolicy) {
-	addResource(dec.Resource.Id, dec, r.DestinationPolicies)
-}
-
-func (r *RelatedResources) AddService(dec *types.DecodedService) {
-	addResource(dec.Resource.Id, dec, r.Services)
-}
-
-func (r *RelatedResources) AddFailoverPolicy(dec *types.DecodedFailoverPolicy) {
-	addResource(dec.Resource.Id, dec, r.FailoverPolicies)
-}
-
-func (r *RelatedResources) addRouteSetEntries(
-	res *pbresource.Resource,
-	xroute types.XRouteData,
-) {
-	if res == nil || xroute == nil {
-		return
-	}
-
-	routeRK := resource.NewReferenceKey(res.Id)
-
-	for _, parentRef := range xroute.GetParentRefs() {
-		if parentRef.Ref == nil || !types.IsServiceType(parentRef.Ref.Type) {
-			continue
-		}
-		svcRK := resource.NewReferenceKey(parentRef.Ref)
-
-		r.addRouteByParentRef(svcRK, routeRK)
-	}
-}
-
-func (r *RelatedResources) addRouteByParentRef(svcRK, xRouteRK resource.ReferenceKey) {
-	m, ok := r.RoutesByParentRef[svcRK]
-	if !ok {
-		m = make(map[resource.ReferenceKey]struct{})
-		r.RoutesByParentRef[svcRK] = m
-	}
-	m[xRouteRK] = struct{}{}
-}
-
-type RouteWalkFunc func(
-	rk resource.ReferenceKey,
-	res *pbresource.Resource,
-	route types.XRouteData,
-)
-
-func (r *RelatedResources) WalkRoutes(fn RouteWalkFunc) {
-	for rk, route := range r.HTTPRoutes {
-		fn(rk, route.Resource, route.Data)
-	}
-	for rk, route := range r.GRPCRoutes {
-		fn(rk, route.Resource, route.Data)
-	}
-	for rk, route := range r.TCPRoutes {
-		fn(rk, route.Resource, route.Data)
-	}
-}
-
-func (r *RelatedResources) WalkRoutesForParentRef(parentRef *pbresource.Reference, fn RouteWalkFunc) {
-	if !resource.EqualType(parentRef.Type, pbcatalog.ServiceType) {
-		panic(fmt.Sprintf("expected *catalog.Service, not %s", resource.TypeToString(parentRef.Type)))
-	}
-	routeMap := r.RoutesByParentRef[resource.NewReferenceKey(parentRef)]
-	if len(routeMap) == 0 {
-		return
-	}
-
-	for rk := range routeMap {
-		if route, ok := r.HTTPRoutes[rk]; ok {
-			fn(rk, route.Resource, route.Data)
-			continue
-		}
-		if route, ok := r.GRPCRoutes[rk]; ok {
-			fn(rk, route.Resource, route.Data)
-			continue
-		}
-		if route, ok := r.TCPRoutes[rk]; ok {
-			fn(rk, route.Resource, route.Data)
-			continue
-		}
-	}
-}
-
-func (r *RelatedResources) GetService(ref resource.ReferenceOrID) *types.DecodedService {
-	return r.Services[resource.NewReferenceKey(ref)]
-}
-
-func (r *RelatedResources) GetFailoverPolicy(ref resource.ReferenceOrID) *types.DecodedFailoverPolicy {
-	return r.FailoverPolicies[resource.NewReferenceKey(ref)]
-}
-
-func (r *RelatedResources) GetFailoverPolicyForService(ref resource.ReferenceOrID) *types.DecodedFailoverPolicy {
-	failRef := &pbresource.Reference{
-		Type:    pbcatalog.FailoverPolicyType,
-		Tenancy: ref.GetTenancy(),
-		Name:    ref.GetName(),
-	}
-	return r.GetFailoverPolicy(failRef)
-}
-
-func (r *RelatedResources) GetDestinationPolicy(ref resource.ReferenceOrID) *types.DecodedDestinationPolicy {
-	return r.DestinationPolicies[resource.NewReferenceKey(ref)]
-}
-
-func (r *RelatedResources) GetDestinationPolicyForService(ref resource.ReferenceOrID) *types.DecodedDestinationPolicy {
-	destRef := &pbresource.Reference{
-		Type:    pbmesh.DestinationPolicyType,
-		Tenancy: ref.GetTenancy(),
-		Name:    ref.GetName(),
-	}
-	return r.GetDestinationPolicy(destRef)
-}
-
-func addResource[V any](id *pbresource.ID, res *V, m map[resource.ReferenceKey]*V) {
-	if res == nil {
-		return
-	}
-
-	rk := resource.NewReferenceKey(id)
-	if _, ok := m[rk]; !ok {
-		m[rk] = res
-	}
-}
diff --git a/internal/mesh/internal/controllers/routes/pending_status.go b/internal/mesh/internal/controllers/routes/pending_status.go
deleted file mode 100644
index 1c33e2db2b82b..0000000000000
--- a/internal/mesh/internal/controllers/routes/pending_status.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package routes
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type PendingResourceStatusUpdate struct {
-	ID         *pbresource.ID
-	Generation string
-	CurrStatus *pbresource.Status
-
-	NewConditions []*pbresource.Condition
-}
-
-type PendingStatuses map[resource.ReferenceKey]*PendingResourceStatusUpdate
-
-func (p PendingStatuses) AddConditions(
-	rk resource.ReferenceKey,
-	res *pbresource.Resource,
-	newConditions []*pbresource.Condition,
-) {
-	state, ok := p[rk]
-	if !ok {
-		state = &PendingResourceStatusUpdate{
-			ID:         res.Id,
-			Generation: res.Generation,
-			CurrStatus: res.Status[StatusKey],
-		}
-		p[rk] = state
-	}
-
-	state.NewConditions = append(state.NewConditions, newConditions...)
-}
-
-func UpdatePendingStatuses(
-	ctx context.Context,
-	rt controller.Runtime,
-	pending PendingStatuses,
-) error {
-	for _, state := range pending {
-		logger := rt.Logger.With("resource", resource.IDToString(state.ID))
-
-		var newStatus *pbresource.Status
-		if len(state.NewConditions) > 0 {
-			newStatus = &pbresource.Status{
-				ObservedGeneration: state.Generation,
-				Conditions:         state.NewConditions,
-			}
-		} else {
-			newStatus = &pbresource.Status{
-				ObservedGeneration: state.Generation,
-				Conditions: []*pbresource.Condition{
-					ConditionXRouteOK,
-				},
-			}
-		}
-		if resource.EqualStatus(state.CurrStatus, newStatus, false) {
-			logger.Trace(
-				"resource's status is unchanged",
-				"conditions", newStatus.Conditions,
-			)
-		} else {
-			_, err := rt.Client.WriteStatus(ctx, &pbresource.WriteStatusRequest{
-				Id:     state.ID,
-				Key:    StatusKey,
-				Status: newStatus,
-			})
-
-			if err != nil {
-				logger.Error(
-					"error encountered when attempting to update the resource's status",
-					"error", err,
-				)
-				return err
-			}
-
-			logger.Trace(
-				"resource's status was updated",
-				"conditions", newStatus.Conditions,
-			)
-		}
-	}
-
-	return nil
-}
diff --git a/internal/mesh/internal/controllers/routes/ref_validation.go b/internal/mesh/internal/controllers/routes/ref_validation.go
deleted file mode 100644
index b860eede202db..0000000000000
--- a/internal/mesh/internal/controllers/routes/ref_validation.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package routes
-
-import (
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes/loader"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// ValidateXRouteReferences examines all of the ParentRefs and BackendRefs of
-// xRoutes provided and issues status conditions if anything is unacceptable.
-func ValidateXRouteReferences(related *loader.RelatedResources, pending PendingStatuses) {
-	related.WalkRoutes(func(
-		rk resource.ReferenceKey,
-		res *pbresource.Resource,
-		route types.XRouteData,
-	) {
-		parentRefs := route.GetParentRefs()
-		backendRefs := route.GetUnderlyingBackendRefs()
-
-		conditions := computeNewRouteRefConditions(related, parentRefs, backendRefs)
-
-		pending.AddConditions(rk, res, conditions)
-	})
-}
-
-type serviceGetter interface {
-	GetService(ref resource.ReferenceOrID) *types.DecodedService
-}
-
-func computeNewRouteRefConditions(
-	related serviceGetter,
-	parentRefs []*pbmesh.ParentReference,
-	backendRefs []*pbmesh.BackendReference,
-) []*pbresource.Condition {
-	var conditions []*pbresource.Condition
-
-	// TODO(rb): handle port numbers here too if we are allowing those instead of the name?
-
-	for _, parentRef := range parentRefs {
-		if parentRef.Ref == nil || !resource.EqualType(parentRef.Ref.Type, pbcatalog.ServiceType) {
-			continue // not possible due to xRoute validation
-		}
-		if parentRef.Ref.Section != "" {
-			continue // not possible due to xRoute validation
-		}
-		if svc := related.GetService(parentRef.Ref); svc != nil {
-			found := false
-			usingMesh := false
-			hasMesh := false
-			for _, port := range svc.Data.Ports {
-				if port.Protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-					hasMesh = true
-				}
-				if port.TargetPort == parentRef.Port {
-					found = true
-					if port.Protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-						usingMesh = true
-					}
-				}
-			}
-			switch {
-			case !hasMesh:
-				conditions = append(conditions, ConditionParentRefOutsideMesh(parentRef.Ref))
-			case !found:
-				if parentRef.Port != "" {
-					conditions = append(conditions, ConditionUnknownParentRefPort(parentRef.Ref, parentRef.Port))
-				}
-			case usingMesh:
-				conditions = append(conditions, ConditionParentRefUsingMeshPort(parentRef.Ref, parentRef.Port))
-			}
-		} else {
-			conditions = append(conditions, ConditionMissingParentRef(parentRef.Ref))
-		}
-	}
-
-	for _, backendRef := range backendRefs {
-		if backendRef.Ref == nil || !resource.EqualType(backendRef.Ref.Type, pbcatalog.ServiceType) {
-			continue // not possible due to xRoute validation
-		}
-		if backendRef.Ref.Section != "" {
-			continue // not possible due to xRoute validation
-		}
-		if svc := related.GetService(backendRef.Ref); svc != nil {
-			found := false
-			usingMesh := false
-			hasMesh := false
-			for _, port := range svc.Data.Ports {
-				if port.Protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-					hasMesh = true
-				}
-				if port.TargetPort == backendRef.Port {
-					found = true
-					if port.Protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-						usingMesh = true
-					}
-				}
-			}
-			switch {
-			case !hasMesh:
-				conditions = append(conditions, ConditionBackendRefOutsideMesh(backendRef.Ref))
-			case !found:
-				if backendRef.Port != "" {
-					conditions = append(conditions, ConditionUnknownBackendRefPort(backendRef.Ref, backendRef.Port))
-				}
-			case usingMesh:
-				conditions = append(conditions, ConditionBackendRefUsingMeshPort(backendRef.Ref, backendRef.Port))
-			}
-		} else {
-			conditions = append(conditions, ConditionMissingBackendRef(backendRef.Ref))
-		}
-	}
-
-	return conditions
-}
diff --git a/internal/mesh/internal/controllers/routes/ref_validation_test.go b/internal/mesh/internal/controllers/routes/ref_validation_test.go
deleted file mode 100644
index 3f6db4207865b..0000000000000
--- a/internal/mesh/internal/controllers/routes/ref_validation_test.go
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package routes
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestComputeNewRouteRefConditions(t *testing.T) {
-	registry := resource.NewRegistry()
-	types.Register(registry)
-	catalog.RegisterTypes(registry)
-
-	newService := func(name string, ports map[string]pbcatalog.Protocol) *types.DecodedService {
-		var portSlice []*pbcatalog.ServicePort
-		for name, proto := range ports {
-			portSlice = append(portSlice, &pbcatalog.ServicePort{
-				TargetPort: name,
-				Protocol:   proto,
-			})
-		}
-		svc := rtest.Resource(pbcatalog.ServiceType, name).
-			WithData(t, &pbcatalog.Service{Ports: portSlice}).
-			Build()
-		rtest.ValidateAndNormalize(t, registry, svc)
-
-		dec, err := resource.Decode[*pbcatalog.Service](svc)
-		require.NoError(t, err)
-		return dec
-	}
-
-	t.Run("no refs", func(t *testing.T) {
-		sg := newTestServiceGetter()
-		got := computeNewRouteRefConditions(sg, nil, nil)
-		require.Empty(t, got)
-	})
-
-	t.Run("parent refs", func(t *testing.T) {
-		t.Run("with no service", func(t *testing.T) {
-			sg := newTestServiceGetter()
-			got := computeNewRouteRefConditions(sg, []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), ""),
-			}, nil)
-			require.Len(t, got, 1)
-			prototest.AssertContainsElement(t, got, ConditionMissingParentRef(
-				newRef(pbcatalog.ServiceType, "api"),
-			))
-		})
-
-		t.Run("with service but no mesh port", func(t *testing.T) {
-			sg := newTestServiceGetter(newService("api", map[string]pbcatalog.Protocol{
-				"http": pbcatalog.Protocol_PROTOCOL_HTTP,
-			}))
-			got := computeNewRouteRefConditions(sg, []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), ""),
-			}, nil)
-			require.Len(t, got, 1)
-			prototest.AssertContainsElement(t, got, ConditionParentRefOutsideMesh(
-				newRef(pbcatalog.ServiceType, "api"),
-			))
-		})
-
-		t.Run("with service but using mesh port", func(t *testing.T) {
-			sg := newTestServiceGetter(newService("api", map[string]pbcatalog.Protocol{
-				"http": pbcatalog.Protocol_PROTOCOL_HTTP,
-				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
-			}))
-			got := computeNewRouteRefConditions(sg, []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "mesh"),
-			}, nil)
-			require.Len(t, got, 1)
-			prototest.AssertContainsElement(t, got, ConditionParentRefUsingMeshPort(
-				newRef(pbcatalog.ServiceType, "api"),
-				"mesh",
-			))
-		})
-
-		t.Run("with service and using missing port", func(t *testing.T) {
-			sg := newTestServiceGetter(newService("api", map[string]pbcatalog.Protocol{
-				"http": pbcatalog.Protocol_PROTOCOL_HTTP,
-				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
-			}))
-			got := computeNewRouteRefConditions(sg, []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "web"),
-			}, nil)
-			require.Len(t, got, 1)
-			prototest.AssertContainsElement(t, got, ConditionUnknownParentRefPort(
-				newRef(pbcatalog.ServiceType, "api"),
-				"web",
-			))
-		})
-
-		t.Run("with service and using empty port", func(t *testing.T) {
-			sg := newTestServiceGetter(newService("api", map[string]pbcatalog.Protocol{
-				"http": pbcatalog.Protocol_PROTOCOL_HTTP,
-				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
-			}))
-			got := computeNewRouteRefConditions(sg, []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), ""),
-			}, nil)
-			require.Empty(t, got)
-		})
-
-		t.Run("with service and using correct port", func(t *testing.T) {
-			sg := newTestServiceGetter(newService("api", map[string]pbcatalog.Protocol{
-				"http": pbcatalog.Protocol_PROTOCOL_HTTP,
-				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
-			}))
-			got := computeNewRouteRefConditions(sg, []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
-			}, nil)
-			require.Empty(t, got)
-		})
-	})
-
-	t.Run("backend refs", func(t *testing.T) {
-		t.Run("with no service", func(t *testing.T) {
-			sg := newTestServiceGetter()
-			got := computeNewRouteRefConditions(sg, nil, []*pbmesh.BackendReference{
-				newBackendRef(newRef(pbcatalog.ServiceType, "api"), "", ""),
-			})
-			require.Len(t, got, 1)
-			prototest.AssertContainsElement(t, got, ConditionMissingBackendRef(
-				newRef(pbcatalog.ServiceType, "api"),
-			))
-		})
-
-		t.Run("with service but no mesh port", func(t *testing.T) {
-			sg := newTestServiceGetter(newService("api", map[string]pbcatalog.Protocol{
-				"http": pbcatalog.Protocol_PROTOCOL_HTTP,
-			}))
-			got := computeNewRouteRefConditions(sg, nil, []*pbmesh.BackendReference{
-				newBackendRef(newRef(pbcatalog.ServiceType, "api"), "", ""),
-			})
-			require.Len(t, got, 1)
-			prototest.AssertContainsElement(t, got, ConditionBackendRefOutsideMesh(
-				newRef(pbcatalog.ServiceType, "api"),
-			))
-		})
-
-		t.Run("with service but using mesh port", func(t *testing.T) {
-			sg := newTestServiceGetter(newService("api", map[string]pbcatalog.Protocol{
-				"http": pbcatalog.Protocol_PROTOCOL_HTTP,
-				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
-			}))
-			got := computeNewRouteRefConditions(sg, nil, []*pbmesh.BackendReference{
-				newBackendRef(newRef(pbcatalog.ServiceType, "api"), "mesh", ""),
-			})
-			require.Len(t, got, 1)
-			prototest.AssertContainsElement(t, got, ConditionBackendRefUsingMeshPort(
-				newRef(pbcatalog.ServiceType, "api"),
-				"mesh",
-			))
-		})
-
-		t.Run("with service and using missing port", func(t *testing.T) {
-			sg := newTestServiceGetter(newService("api", map[string]pbcatalog.Protocol{
-				"http": pbcatalog.Protocol_PROTOCOL_HTTP,
-				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
-			}))
-			got := computeNewRouteRefConditions(sg, nil, []*pbmesh.BackendReference{
-				newBackendRef(newRef(pbcatalog.ServiceType, "api"), "web", ""),
-			})
-			require.Len(t, got, 1)
-			prototest.AssertContainsElement(t, got, ConditionUnknownBackendRefPort(
-				newRef(pbcatalog.ServiceType, "api"),
-				"web",
-			))
-		})
-
-		t.Run("with service and using empty port", func(t *testing.T) {
-			sg := newTestServiceGetter(newService("api", map[string]pbcatalog.Protocol{
-				"http": pbcatalog.Protocol_PROTOCOL_HTTP,
-				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
-			}))
-			got := computeNewRouteRefConditions(sg, nil, []*pbmesh.BackendReference{
-				newBackendRef(newRef(pbcatalog.ServiceType, "api"), "", ""),
-			})
-			require.Empty(t, got)
-		})
-
-		t.Run("with service and using correct port", func(t *testing.T) {
-			sg := newTestServiceGetter(newService("api", map[string]pbcatalog.Protocol{
-				"http": pbcatalog.Protocol_PROTOCOL_HTTP,
-				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
-			}))
-			got := computeNewRouteRefConditions(sg, nil, []*pbmesh.BackendReference{
-				newBackendRef(newRef(pbcatalog.ServiceType, "api"), "http", ""),
-			})
-			require.Empty(t, got)
-		})
-	})
-}
-
-func newRef(typ *pbresource.Type, name string) *pbresource.Reference {
-	return rtest.Resource(typ, name).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		Reference("")
-}
-
-type testServiceGetter struct {
-	services map[resource.ReferenceKey]*types.DecodedService
-}
-
-func newTestServiceGetter(svcs ...*types.DecodedService) serviceGetter {
-	g := &testServiceGetter{
-		services: make(map[resource.ReferenceKey]*types.DecodedService),
-	}
-	for _, svc := range svcs {
-		g.services[resource.NewReferenceKey(svc.Resource.Id)] = svc
-	}
-	return g
-}
-
-func (g *testServiceGetter) GetService(ref resource.ReferenceOrID) *types.DecodedService {
-	if g.services == nil {
-		return nil
-	}
-	return g.services[resource.NewReferenceKey(ref)]
-}
diff --git a/internal/mesh/internal/controllers/routes/routestest/routestest.go b/internal/mesh/internal/controllers/routes/routestest/routestest.go
deleted file mode 100644
index 77ba33138d906..0000000000000
--- a/internal/mesh/internal/controllers/routes/routestest/routestest.go
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package routestest
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes/loader"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func ReconcileComputedRoutes(
-	t *testing.T,
-	client pbresource.ResourceServiceClient,
-	id *pbresource.ID,
-	decResList ...any,
-) *types.DecodedComputedRoutes {
-	t.Helper()
-	if client == nil {
-		panic("client is required")
-	}
-	return makeComputedRoutes(t, client, id, decResList...)
-}
-
-func BuildComputedRoutes(
-	t *testing.T,
-	id *pbresource.ID,
-	decResList ...any,
-) *types.DecodedComputedRoutes {
-	t.Helper()
-	return makeComputedRoutes(t, nil, id, decResList...)
-}
-
-func MutateTargets(
-	t *testing.T,
-	routes *pbmesh.ComputedRoutes,
-	parentPort string,
-	mutFn func(t *testing.T, details *pbmesh.BackendTargetDetails),
-) *pbmesh.ComputedPortRoutes {
-	t.Helper()
-
-	portConfig, ok := routes.PortedConfigs[parentPort]
-	require.True(t, ok, "port %q not found in ported_configs", parentPort)
-
-	portConfig = proto.Clone(portConfig).(*pbmesh.ComputedPortRoutes)
-
-	for _, details := range portConfig.Targets {
-		mutFn(t, details)
-	}
-
-	return portConfig
-}
-
-func makeComputedRoutes(
-	t *testing.T,
-	client pbresource.ResourceServiceClient,
-	id *pbresource.ID,
-	decResList ...any,
-) *types.DecodedComputedRoutes {
-	t.Helper()
-
-	related := loader.NewRelatedResources().
-		AddComputedRoutesID(id).
-		AddResources(decResList...)
-
-	pending := make(routes.PendingStatuses)
-	got := routes.GenerateComputedRoutes(related, pending)
-	require.Empty(t, pending, "programmer error if there are warnings")
-	require.Len(t, got, 1, "should only compute one output")
-
-	item := got[0]
-
-	if item.Data == nil {
-		if client != nil {
-			ctx := testutil.TestContext(t)
-			_, err := client.Delete(ctx, &pbresource.DeleteRequest{Id: got[0].ID})
-			require.NoError(t, err)
-		}
-		return nil
-	}
-
-	b := rtest.ResourceID(id).
-		// WithOwner(item.OwnerID).
-		WithData(t, item.Data)
-
-	var res *pbresource.Resource
-	if client != nil {
-		res = b.Write(t, client)
-	} else {
-		res = b.Build()
-	}
-	require.NoError(t, types.ValidateComputedRoutes(res))
-
-	return rtest.MustDecode[*pbmesh.ComputedRoutes](t, res)
-}
diff --git a/internal/mesh/internal/controllers/routes/sort_rules.go b/internal/mesh/internal/controllers/routes/sort_rules.go
deleted file mode 100644
index a7198d31300f9..0000000000000
--- a/internal/mesh/internal/controllers/routes/sort_rules.go
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package routes
-
-import (
-	"sort"
-
-	"github.com/oklog/ulid"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-)
-
-func gammaSortRouteRules(node *inputRouteNode) {
-	switch {
-	case resource.EqualType(node.RouteType, pbmesh.HTTPRouteType):
-		gammaSortHTTPRouteRules(node.HTTPRules)
-	case resource.EqualType(node.RouteType, pbmesh.GRPCRouteType):
-		// TODO(rb): do a determinstic sort of something
-	case resource.EqualType(node.RouteType, pbmesh.TCPRouteType):
-		// TODO(rb): do a determinstic sort of something
-	default:
-		panic("impossible")
-	}
-}
-
-func gammaSortHTTPRouteRules(rules []*pbmesh.ComputedHTTPRouteRule) {
-	// First generate a parallel slice.
-	sortable := &sortableHTTPRouteRules{
-		rules:       rules,
-		derivedInfo: make([]*derivedHTTPRouteRuleInfo, 0, len(rules)),
-	}
-
-	for _, rule := range rules {
-		var sr derivedHTTPRouteRuleInfo
-		for _, m := range rule.Matches {
-			if m.Path != nil {
-				switch m.Path.Type {
-				case pbmesh.PathMatchType_PATH_MATCH_TYPE_EXACT:
-					sr.hasPathExact = true
-				case pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX:
-					sr.hasPathPrefix = true
-					v := len(m.Path.Value)
-					if v > sr.pathPrefixLength {
-						sr.pathPrefixLength = v
-					}
-				}
-			}
-
-			if m.Method != "" {
-				sr.hasMethod = true
-			}
-			if v := len(m.Headers); v > sr.numHeaders {
-				sr.numHeaders = v
-			}
-			if v := len(m.QueryParams); v > sr.numQueryParams {
-				sr.numQueryParams = v
-			}
-		}
-		sortable.derivedInfo = append(sortable.derivedInfo, &sr)
-	}
-
-	// Similar to
-	// "agent/consul/discoverychain/gateway_httproute.go"
-	// compareHTTPRules
-
-	// Sort this by the GAMMA spec. We assume the caller has pre-sorted this
-	// for tiebreakers based on resource metadata.
-
-	sort.Stable(sortable)
-}
-
-type derivedHTTPRouteRuleInfo struct {
-	// sortable fields extracted from route
-	hasPathExact     bool
-	hasPathPrefix    bool
-	pathPrefixLength int
-	hasMethod        bool
-	numHeaders       int
-	numQueryParams   int
-}
-
-type sortableHTTPRouteRules struct {
-	rules       []*pbmesh.ComputedHTTPRouteRule
-	derivedInfo []*derivedHTTPRouteRuleInfo
-}
-
-var _ sort.Interface = (*sortableHTTPRouteRules)(nil)
-
-func (r *sortableHTTPRouteRules) Len() int { return len(r.rules) }
-
-func (r *sortableHTTPRouteRules) Swap(i, j int) {
-	r.rules[i], r.rules[j] = r.rules[j], r.rules[i]
-	r.derivedInfo[i], r.derivedInfo[j] = r.derivedInfo[j], r.derivedInfo[i]
-}
-
-func (r *sortableHTTPRouteRules) Less(i, j int) bool {
-	a := r.derivedInfo[i]
-	b := r.derivedInfo[j]
-
-	// (1) “Exact” path match.
-	switch {
-	case a.hasPathExact && b.hasPathExact:
-		// NEXT TIE BREAK
-	case a.hasPathExact && !b.hasPathExact:
-		return true
-	case !a.hasPathExact && b.hasPathExact:
-		return false
-	}
-
-	// (2) “Prefix” path match with largest number of characters.
-	switch {
-	case a.hasPathPrefix && b.hasPathPrefix:
-		if a.pathPrefixLength != b.pathPrefixLength {
-			return a.pathPrefixLength > b.pathPrefixLength
-		}
-		// NEXT TIE BREAK
-	case a.hasPathPrefix && !b.hasPathPrefix:
-		return true
-	case !a.hasPathPrefix && b.hasPathPrefix:
-		return false
-	}
-
-	// (3) Method match.
-	switch {
-	case a.hasMethod && b.hasMethod:
-		// NEXT TIE BREAK
-	case a.hasMethod && !b.hasMethod:
-		return true
-	case !a.hasMethod && b.hasMethod:
-		return false
-	}
-
-	// (4) Largest number of header matches.
-	switch {
-	case a.numHeaders == b.numHeaders:
-		// NEXT TIE BREAK
-	case a.numHeaders > b.numHeaders:
-		return true
-	case a.numHeaders < b.numHeaders:
-		return false
-	}
-
-	// (5) Largest number of query param matches.
-	return a.numQueryParams > b.numQueryParams
-}
-
-// gammaInitialSortWrappedRoutes will sort the original inputs by the
-// resource-envelope-only fields before we further stable sort by type-specific
-// fields.
-//
-// If more than 1 route is provided the OriginalResource field must be set on
-// all inputs (i.e. no synthetic default routes should be processed here).
-func gammaInitialSortWrappedRoutes(routes []*inputRouteNode) {
-	if len(routes) < 2 {
-		return
-	}
-
-	// First sort the input routes by the final criteria, so we can let the
-	// stable sort take care of the ultimate tiebreakers.
-	sort.Slice(routes, func(i, j int) bool {
-		var (
-			resA = routes[i].OriginalResource
-			resB = routes[j].OriginalResource
-		)
-
-		if resA == nil || resB == nil {
-			panic("some provided nodes lacked original resources")
-		}
-
-		var (
-			genA = resA.Generation
-			genB = resB.Generation
-		)
-
-		// (END-1) The oldest Route based on creation timestamp.
-		//
-		// Because these are ULIDs, we should be able to lexicographically sort
-		// them to determine the oldest, but we also need to have a further
-		// tiebreaker AFTER per-gamma so we cannot.
-		aULID, aErr := ulid.Parse(genA)
-		bULID, bErr := ulid.Parse(genB)
-		if aErr == nil && bErr == nil {
-			aTime := aULID.Time()
-			bTime := bULID.Time()
-
-			switch {
-			case aTime < bTime:
-				return true
-			case aTime > bTime:
-				return false
-			default:
-				// NEXT TIE BREAK
-			}
-		}
-
-		// (END-2) The Route appearing first in alphabetical order by “{namespace}/{name}”.
-		var (
-			tenancyA = resA.Id.Tenancy
-			tenancyB = resB.Id.Tenancy
-
-			nsA = tenancyA.Namespace
-			nsB = tenancyB.Namespace
-		)
-
-		if nsA == "" {
-			nsA = "default"
-		}
-		if nsB == "" {
-			nsB = "default"
-		}
-		switch {
-		case nsA < nsB:
-			return true
-		case nsA > nsB:
-			return false
-		default:
-			// NEXT TIE BREAK
-		}
-
-		return resA.Id.Name < resB.Id.Name
-
-		// We get this for free b/c of the stable sort.
-		//
-		// If ties still exist within an HTTPRoute, matching precedence MUST
-		// be granted to the FIRST matching rule (in list order) with a match
-		// meeting the above criteria.
-	})
-}
diff --git a/internal/mesh/internal/controllers/routes/sort_rules_test.go b/internal/mesh/internal/controllers/routes/sort_rules_test.go
deleted file mode 100644
index 50504f09cf4dc..0000000000000
--- a/internal/mesh/internal/controllers/routes/sort_rules_test.go
+++ /dev/null
@@ -1,493 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package routes
-
-import (
-	"math/rand"
-	"sort"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
-
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func TestGammaInitialSortWrappedRoutes(t *testing.T) {
-	// These generations were created with ulid.Make().String() at 1 second
-	// intervals. They are in ascending order.
-	generations := []string{
-		"01H8HGKHXCAJY7TRNJ06JGEZP9",
-		"01H8HGKJWMEYWKZATG44QZF0G7",
-		"01H8HGKKVW2339KFHAFXMEFRHP",
-		"01H8HGKMV45XAC2W1KCQ7KJ00J",
-		"01H8HGKNTCB3ZYN16AZ2KSXN54",
-		"01H8HGKPSN9V3QQXTQVZ1EQM2T",
-		"01H8HGKQRXMR8NY662AC520CDE",
-		"01H8HGKRR5C41RHGXY7H3N0JYX",
-		"01H8HGKSQDNSQ54VN86SBTR149",
-		"01H8HGKTPPRWFXWHKV90M2WW5R",
-	}
-	require.True(t, sort.StringsAreSorted(generations))
-
-	nodeID := func(node *inputRouteNode) string {
-		return resource.IDToString(node.OriginalResource.Id) + ":" + node.OriginalResource.Generation
-	}
-
-	nodeIDSlice := func(nodes []*inputRouteNode) []string {
-		var out []string
-		for _, node := range nodes {
-			out = append(out, nodeID(node))
-		}
-		return out
-	}
-
-	// newNode will only populate the fields that the sorting function cares
-	// about.
-	newNode := func(tenancy *pbresource.Tenancy, name string, gen string) *inputRouteNode {
-		id := rtest.Resource(pbmesh.HTTPRouteType, name).
-			WithTenancy(tenancy).
-			ID()
-
-		res := rtest.ResourceID(id).
-			WithGeneration(gen).
-			WithData(t, &pbmesh.HTTPRoute{}).
-			Build()
-
-		return &inputRouteNode{
-			OriginalResource: res,
-		}
-	}
-
-	type testcase struct {
-		routes []*inputRouteNode
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		expect := nodeIDSlice(tc.routes)
-
-		if len(tc.routes) > 1 {
-			// Randomly permute it
-			in := tc.routes
-			for {
-				rand.Shuffle(len(in), func(i, j int) {
-					in[i], in[j] = in[j], in[i]
-				})
-				curr := nodeIDSlice(tc.routes)
-
-				if slices.Equal(expect, curr) {
-					// Loop until the shuffle was actually different.
-				} else {
-					break
-				}
-
-			}
-		}
-
-		gammaInitialSortWrappedRoutes(tc.routes)
-
-		got := nodeIDSlice(tc.routes)
-
-		require.Equal(t, expect, got)
-	}
-
-	// Order:
-	// 1. generation older first
-	// 2. tenancy namespace A first
-	// 3. object name A first
-	cases := map[string]testcase{
-		"empty": {},
-		"one": {
-			routes: []*inputRouteNode{
-				newNode(defaultTenancy(), "foo", generations[0]),
-			},
-		},
-		"two: by generation": {
-			routes: []*inputRouteNode{
-				newNode(defaultTenancy(), "foo", generations[0]),
-				newNode(defaultTenancy(), "foo", generations[1]),
-			},
-		},
-		"two: by namespace": {
-			routes: []*inputRouteNode{
-				newNode(&pbresource.Tenancy{Namespace: "aaa"}, "foo", generations[0]),
-				newNode(&pbresource.Tenancy{Namespace: "bbb"}, "foo", generations[0]),
-			},
-		},
-		"two: by name": {
-			routes: []*inputRouteNode{
-				newNode(defaultTenancy(), "bar", generations[0]),
-				newNode(defaultTenancy(), "foo", generations[0]),
-			},
-		},
-		"two: by name with empty namespace": {
-			routes: []*inputRouteNode{
-				newNode(nsTenancy(""), "bar", generations[0]),
-				newNode(nsTenancy(""), "foo", generations[0]),
-			},
-		},
-		"four: by generation": {
-			routes: []*inputRouteNode{
-				newNode(defaultTenancy(), "foo", generations[0]),
-				newNode(defaultTenancy(), "foo", generations[1]),
-				newNode(defaultTenancy(), "foo", generations[2]),
-				newNode(defaultTenancy(), "foo", generations[3]),
-			},
-		},
-		"four: by name with some empty namespaces": {
-			routes: []*inputRouteNode{
-				newNode(nsTenancy("aaa"), "foo", generations[0]),
-				newNode(nsTenancy("bbb"), "foo", generations[0]),
-				newNode(&pbresource.Tenancy{}, "bar", generations[0]),
-				newNode(&pbresource.Tenancy{}, "foo", generations[0]),
-			},
-		},
-		"mixed": {
-			// Seed this with data such that each later sort criteria should
-			// want to be more to the top than an earlier criteria would allow,
-			// to prove that the sort is going to have to shake out the way the
-			// algorithm wants it to for maximum algorithm exercise.
-			routes: []*inputRouteNode{
-				// gen beats name
-				newNode(defaultTenancy(), "zzz", generations[0]),
-				newNode(defaultTenancy(), "aaa", generations[1]),
-				// gen beats ns
-				newNode(nsTenancy("zzz"), "foo", generations[2]),
-				newNode(nsTenancy("aaa"), "foo", generations[3]),
-				// ns beats name
-				newNode(nsTenancy("aaa"), "zzz", generations[4]),
-				newNode(nsTenancy("bbb"), "aaa", generations[5]),
-			},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func TestGammaSortHTTPRouteRules(t *testing.T) {
-	type testcase struct {
-		rules []*pbmesh.ComputedHTTPRouteRule
-	}
-
-	// In this test we will use the 'backend target' field to track the rule
-	// identity to make assertions easy.
-
-	targetSlice := func(rules []*pbmesh.ComputedHTTPRouteRule) []string {
-		var out []string
-		for _, rule := range rules {
-			out = append(out, rule.BackendRefs[0].BackendTarget)
-		}
-		return out
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		expect := targetSlice(tc.rules)
-
-		if len(tc.rules) > 1 {
-			// Randomly permute it
-			in := tc.rules
-			for {
-				rand.Shuffle(len(in), func(i, j int) {
-					in[i], in[j] = in[j], in[i]
-				})
-				curr := targetSlice(tc.rules)
-
-				if slices.Equal(expect, curr) {
-					// Loop until the shuffle was actually different.
-				} else {
-					break
-				}
-
-			}
-		}
-
-		gammaSortHTTPRouteRules(tc.rules)
-
-		got := targetSlice(tc.rules)
-
-		require.Equal(t, expect, got)
-	}
-
-	newRule := func(target string, m ...*pbmesh.HTTPRouteMatch) *pbmesh.ComputedHTTPRouteRule {
-		return &pbmesh.ComputedHTTPRouteRule{
-			Matches: m,
-			BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-				BackendTarget: target,
-			}},
-		}
-	}
-
-	// Rules:
-	// 1. exact path match exists
-	// 2. prefix match exists
-	// 3. prefix match has lots of characters
-	// 4. has method match
-	// 5. has lots of header matches
-	// 6. has lots of query param matches
-	cases := map[string]testcase{
-		"empty": {},
-		"one": {
-			rules: []*pbmesh.ComputedHTTPRouteRule{
-				newRule("r1", &pbmesh.HTTPRouteMatch{
-					//
-				}),
-			},
-		},
-		"two: by exact path match exists": {
-			rules: []*pbmesh.ComputedHTTPRouteRule{
-				newRule("r1", &pbmesh.HTTPRouteMatch{
-					Path: &pbmesh.HTTPPathMatch{
-						Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_EXACT,
-						Value: "/",
-					},
-				}),
-				newRule("r2", &pbmesh.HTTPRouteMatch{
-					Path: &pbmesh.HTTPPathMatch{
-						Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-						Value: "/",
-					},
-				}),
-			},
-		},
-		"two: by prefix path match exists": {
-			rules: []*pbmesh.ComputedHTTPRouteRule{
-				newRule("r1", &pbmesh.HTTPRouteMatch{
-					Path: &pbmesh.HTTPPathMatch{
-						Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-						Value: "/",
-					},
-				}),
-				newRule("r2", &pbmesh.HTTPRouteMatch{
-					Path: &pbmesh.HTTPPathMatch{
-						Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_REGEX,
-						Value: "/[a]",
-					},
-				}),
-			},
-		},
-		"two: by prefix path match length": {
-			rules: []*pbmesh.ComputedHTTPRouteRule{
-				newRule("r1", &pbmesh.HTTPRouteMatch{
-					Path: &pbmesh.HTTPPathMatch{
-						Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-						Value: "/longer",
-					},
-				}),
-				newRule("r2", &pbmesh.HTTPRouteMatch{
-					Path: &pbmesh.HTTPPathMatch{
-						Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-						Value: "/short",
-					},
-				}),
-			},
-		},
-		"two: by method match exists": {
-			rules: []*pbmesh.ComputedHTTPRouteRule{
-				newRule("r1", &pbmesh.HTTPRouteMatch{
-					Method: "GET",
-				}),
-				newRule("r2", &pbmesh.HTTPRouteMatch{
-					Headers: []*pbmesh.HTTPHeaderMatch{{
-						Type:  pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT,
-						Name:  "x-blah",
-						Value: "foo",
-					}},
-				}),
-			},
-		},
-		"two: by header match quantity": {
-			rules: []*pbmesh.ComputedHTTPRouteRule{
-				newRule("r1", &pbmesh.HTTPRouteMatch{
-					Headers: []*pbmesh.HTTPHeaderMatch{
-						{
-							Type:  pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT,
-							Name:  "x-blah",
-							Value: "foo",
-						},
-						{
-							Type:  pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT,
-							Name:  "x-other",
-							Value: "bar",
-						},
-					},
-				}),
-				newRule("r2", &pbmesh.HTTPRouteMatch{
-					Headers: []*pbmesh.HTTPHeaderMatch{{
-						Type:  pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT,
-						Name:  "x-blah",
-						Value: "foo",
-					}},
-				}),
-			},
-		},
-		"two: by query param match quantity": {
-			rules: []*pbmesh.ComputedHTTPRouteRule{
-				newRule("r1", &pbmesh.HTTPRouteMatch{
-					QueryParams: []*pbmesh.HTTPQueryParamMatch{
-						{
-							Type:  pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_EXACT,
-							Name:  "foo",
-							Value: "1",
-						},
-						{
-							Type:  pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_EXACT,
-							Name:  "bar",
-							Value: "1",
-						},
-					},
-				}),
-				newRule("r2", &pbmesh.HTTPRouteMatch{
-					QueryParams: []*pbmesh.HTTPQueryParamMatch{{
-						Type:  pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_EXACT,
-						Name:  "foo",
-						Value: "1",
-					}},
-				}),
-			},
-		},
-		"mixed: has path exact beats has path prefix when both are present": {
-			rules: []*pbmesh.ComputedHTTPRouteRule{
-				newRule("r1",
-					&pbmesh.HTTPRouteMatch{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_EXACT,
-							Value: "/",
-						},
-					},
-					&pbmesh.HTTPRouteMatch{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-							Value: "/short",
-						},
-					},
-				),
-				newRule("r2", &pbmesh.HTTPRouteMatch{
-					Path: &pbmesh.HTTPPathMatch{
-						Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-						Value: "/longer",
-					},
-				}),
-			},
-		},
-		"mixed: longer path prefix beats shorter when both are present": {
-			rules: []*pbmesh.ComputedHTTPRouteRule{
-				newRule("r1",
-					&pbmesh.HTTPRouteMatch{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-							Value: "/longer",
-						},
-					},
-					&pbmesh.HTTPRouteMatch{
-						Method: "GET",
-					},
-				),
-				newRule("r2", &pbmesh.HTTPRouteMatch{
-					Path: &pbmesh.HTTPPathMatch{
-						Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-						Value: "/short",
-					},
-				}),
-			},
-		},
-		"mixed: has method match beats header match when both are present": {
-			rules: []*pbmesh.ComputedHTTPRouteRule{
-				newRule("r1",
-					&pbmesh.HTTPRouteMatch{
-						Method: "GET",
-					},
-					&pbmesh.HTTPRouteMatch{
-						Headers: []*pbmesh.HTTPHeaderMatch{{
-							Type:  pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT,
-							Name:  "x-blah",
-							Value: "foo",
-						}},
-					},
-				),
-				newRule("r2", &pbmesh.HTTPRouteMatch{
-					Headers: []*pbmesh.HTTPHeaderMatch{
-						{
-							Type:  pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT,
-							Name:  "x-blah",
-							Value: "foo",
-						},
-						{
-							Type:  pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT,
-							Name:  "x-other",
-							Value: "bar",
-						},
-					},
-				}),
-			},
-		},
-		"mixed: header match beats query param match when both are present": {
-			rules: []*pbmesh.ComputedHTTPRouteRule{
-				newRule("r1", &pbmesh.HTTPRouteMatch{
-					Headers: []*pbmesh.HTTPHeaderMatch{
-						{
-							Type:  pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT,
-							Name:  "x-blah",
-							Value: "foo",
-						},
-						{
-							Type:  pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT,
-							Name:  "x-other",
-							Value: "bar",
-						},
-					},
-					QueryParams: []*pbmesh.HTTPQueryParamMatch{{
-						Type:  pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_EXACT,
-						Name:  "foo",
-						Value: "1",
-					}},
-				}),
-				newRule("r2", &pbmesh.HTTPRouteMatch{
-					QueryParams: []*pbmesh.HTTPQueryParamMatch{
-						{
-							Type:  pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_EXACT,
-							Name:  "foo",
-							Value: "1",
-						},
-						{
-							Type:  pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_EXACT,
-							Name:  "bar",
-							Value: "1",
-						},
-					},
-				}),
-			},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func newID(typ *pbresource.Type, tenancy *pbresource.Tenancy, name string) *pbresource.ID {
-	return rtest.Resource(typ, name).
-		WithTenancy(tenancy).
-		ID()
-}
-
-func nsTenancy(ns string) *pbresource.Tenancy {
-	return &pbresource.Tenancy{
-		Partition: "default",
-		Namespace: ns,
-		PeerName:  "local",
-	}
-}
-
-func defaultTenancy() *pbresource.Tenancy {
-	return nsTenancy("default")
-}
diff --git a/internal/mesh/internal/controllers/routes/status.go b/internal/mesh/internal/controllers/routes/status.go
deleted file mode 100644
index 71b6b8cd5b0b4..0000000000000
--- a/internal/mesh/internal/controllers/routes/status.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package routes
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	StatusKey               = "consul.io/routes-controller"
-	StatusConditionAccepted = "accepted"
-
-	// conditions on xRoutes
-
-	XRouteOKReason  = "Ok"
-	XRouteOKMessage = "xRoute was accepted"
-
-	MissingParentRefReason  = "MissingParentRef"
-	MissingBackendRefReason = "MissingBackendRef"
-
-	ParentRefOutsideMeshReason  = "ParentRefOutsideMesh"
-	BackendRefOutsideMeshReason = "BackendRefOutsideMesh"
-
-	ParentRefUsingMeshPortReason  = "ParentRefUsingMeshPort"
-	BackendRefUsingMeshPortReason = "BackendRefUsingMeshPort"
-
-	UnknownParentRefPortReason  = "UnknownParentRefPort"
-	UnknownBackendRefPortReason = "UnknownBackendRefPort"
-
-	ConflictNotBoundToParentRefReason = "ConflictNotBoundToParentRef"
-)
-
-var (
-	ConditionXRouteOK = &pbresource.Condition{
-		Type:    StatusConditionAccepted,
-		State:   pbresource.Condition_STATE_TRUE,
-		Reason:  XRouteOKReason,
-		Message: XRouteOKMessage,
-	}
-)
-
-func ConditionParentRefUsingMeshPort(ref *pbresource.Reference, port string) *pbresource.Condition {
-	return conditionRefUsingMeshPort(ref, port, false)
-}
-
-func ConditionBackendRefUsingMeshPort(ref *pbresource.Reference, port string) *pbresource.Condition {
-	return conditionRefUsingMeshPort(ref, port, true)
-}
-
-func conditionRefUsingMeshPort(ref *pbresource.Reference, port string, forBackend bool) *pbresource.Condition {
-	reason := ParentRefUsingMeshPortReason
-	short := "parent"
-	if forBackend {
-		reason = BackendRefUsingMeshPortReason
-		short = "backend"
-	}
-	return &pbresource.Condition{
-		Type:   StatusConditionAccepted,
-		State:  pbresource.Condition_STATE_FALSE,
-		Reason: reason,
-		Message: fmt.Sprintf(
-			"service for %s ref %q uses port %q which is a special unroutable mesh port",
-			short,
-			resource.ReferenceToString(ref),
-			port,
-		),
-	}
-}
-
-func ConditionMissingParentRef(ref *pbresource.Reference) *pbresource.Condition {
-	return conditionMissingRef(ref, false)
-}
-
-func ConditionMissingBackendRef(ref *pbresource.Reference) *pbresource.Condition {
-	return conditionMissingRef(ref, true)
-}
-
-func conditionMissingRef(ref *pbresource.Reference, forBackend bool) *pbresource.Condition {
-	reason := MissingParentRefReason
-	short := "parent"
-	if forBackend {
-		reason = MissingBackendRefReason
-		short = "backend"
-	}
-	return &pbresource.Condition{
-		Type:   StatusConditionAccepted,
-		State:  pbresource.Condition_STATE_FALSE,
-		Reason: reason,
-		Message: fmt.Sprintf(
-			"service for %s ref %q does not exist",
-			short,
-			resource.ReferenceToString(ref),
-		),
-	}
-}
-
-func ConditionParentRefOutsideMesh(ref *pbresource.Reference) *pbresource.Condition {
-	return conditionRefOutsideMesh(ref, false)
-}
-
-func ConditionBackendRefOutsideMesh(ref *pbresource.Reference) *pbresource.Condition {
-	return conditionRefOutsideMesh(ref, true)
-}
-
-func conditionRefOutsideMesh(ref *pbresource.Reference, forBackend bool) *pbresource.Condition {
-	reason := ParentRefOutsideMeshReason
-	short := "parent"
-	if forBackend {
-		reason = BackendRefOutsideMeshReason
-		short = "backend"
-	}
-	return &pbresource.Condition{
-		Type:   StatusConditionAccepted,
-		State:  pbresource.Condition_STATE_FALSE,
-		Reason: reason,
-		Message: fmt.Sprintf(
-			"service for %s ref %q does not expose a mesh port",
-			short,
-			resource.ReferenceToString(ref),
-		),
-	}
-}
-
-func ConditionUnknownParentRefPort(ref *pbresource.Reference, port string) *pbresource.Condition {
-	return conditionUnknownRefPort(ref, port, false)
-}
-
-func ConditionUnknownBackendRefPort(ref *pbresource.Reference, port string) *pbresource.Condition {
-	return conditionUnknownRefPort(ref, port, true)
-}
-
-func conditionUnknownRefPort(ref *pbresource.Reference, port string, forBackend bool) *pbresource.Condition {
-	reason := UnknownParentRefPortReason
-	short := "parent"
-	if forBackend {
-		reason = UnknownBackendRefPortReason
-		short = "backend"
-	}
-	return &pbresource.Condition{
-		Type:   StatusConditionAccepted,
-		State:  pbresource.Condition_STATE_FALSE,
-		Reason: reason,
-		Message: fmt.Sprintf(
-			"service for %s ref %q does not expose port %q",
-			short,
-			resource.ReferenceToString(ref),
-			port,
-		),
-	}
-}
-
-func ConditionConflictNotBoundToParentRef(ref *pbresource.Reference, port string, realType *pbresource.Type) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:   StatusConditionAccepted,
-		State:  pbresource.Condition_STATE_FALSE,
-		Reason: ConflictNotBoundToParentRefReason,
-		Message: fmt.Sprintf(
-			"Existing routes of type %q are bound to parent ref %q on port %q preventing this from binding",
-			resource.TypeToString(realType),
-			resource.ReferenceToString(ref),
-			port,
-		),
-	}
-}
diff --git a/internal/mesh/internal/controllers/routes/util.go b/internal/mesh/internal/controllers/routes/util.go
deleted file mode 100644
index 8f9fb87825aea..0000000000000
--- a/internal/mesh/internal/controllers/routes/util.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package routes
-
-import (
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/internal/protoutil"
-)
-
-// Deprecated: see protoutil.Clone
-func protoClone[T proto.Message](v T) T {
-	return protoutil.Clone(v)
-}
-
-// Deprecated: see protoutil.CloneSlice
-func protoSliceClone[T proto.Message](in []T) []T {
-	return protoutil.CloneSlice(in)
-}
diff --git a/internal/mesh/internal/controllers/routes/xroutemapper/util.go b/internal/mesh/internal/controllers/routes/xroutemapper/util.go
deleted file mode 100644
index e3d843cb2833c..0000000000000
--- a/internal/mesh/internal/controllers/routes/xroutemapper/util.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xroutemapper
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func refSliceToRefSlice(refs []*pbresource.Reference) []resource.ReferenceOrID {
-	if refs == nil {
-		return nil
-	}
-	out := make([]resource.ReferenceOrID, 0, len(refs))
-	for _, ref := range refs {
-		out = append(out, ref)
-	}
-	return out
-}
-
-func parentRefSliceToRefSlice(parentRefs []*pbmesh.ParentReference) []resource.ReferenceOrID {
-	if parentRefs == nil {
-		return nil
-	}
-	parents := make([]resource.ReferenceOrID, 0, len(parentRefs))
-	for _, parentRef := range parentRefs {
-		if parentRef.Ref != nil {
-			parents = append(parents, parentRef.Ref)
-		}
-	}
-	return parents
-}
-
-func backendRefSliceToRefSlice(backendRefs []*pbmesh.BackendReference) []resource.ReferenceOrID {
-	if backendRefs == nil {
-		return nil
-	}
-	backends := make([]resource.ReferenceOrID, 0, len(backendRefs))
-	for _, backendRef := range backendRefs {
-		if backendRef.Ref != nil {
-			backends = append(backends, backendRef.Ref)
-		}
-	}
-	return backends
-}
-
-func sliceReplaceType(list []*pbresource.ID, typ *pbresource.Type) []*pbresource.ID {
-	if list == nil {
-		return nil
-	}
-	out := make([]*pbresource.ID, 0, len(list))
-	for _, id := range list {
-		out = append(out, resource.ReplaceType(typ, id))
-	}
-	return out
-}
diff --git a/internal/mesh/internal/controllers/routes/xroutemapper/xroutemapper.go b/internal/mesh/internal/controllers/routes/xroutemapper/xroutemapper.go
deleted file mode 100644
index 2c240ee718196..0000000000000
--- a/internal/mesh/internal/controllers/routes/xroutemapper/xroutemapper.go
+++ /dev/null
@@ -1,322 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xroutemapper
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/mappers/bimapper"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// Mapper tracks the following relationships:
-//
-// - xRoute         <-> ParentRef Service
-// - xRoute         <-> BackendRef Service
-// - FailoverPolicy <-> DestRef Service
-//
-// It is the job of the controller, loader, and mapper to keep the mappings up
-// to date whenever new data is loaded. Notably because the dep mapper events
-// do not signal when data is deleted, it is the job of the reconcile load of
-// the data causing the event to notice something has been deleted and to
-// untrack it here.
-type Mapper struct {
-	boundRefMapper *bimapper.Mapper
-
-	httpRouteParentMapper *bimapper.Mapper
-	grpcRouteParentMapper *bimapper.Mapper
-	tcpRouteParentMapper  *bimapper.Mapper
-
-	httpRouteBackendMapper *bimapper.Mapper
-	grpcRouteBackendMapper *bimapper.Mapper
-	tcpRouteBackendMapper  *bimapper.Mapper
-
-	failMapper catalog.FailoverPolicyMapper
-}
-
-// New creates a new Mapper.
-func New() *Mapper {
-	return &Mapper{
-		boundRefMapper: bimapper.NewWithWildcardLinkType(pbmesh.ComputedRoutesType),
-
-		httpRouteParentMapper: bimapper.New(pbmesh.HTTPRouteType, pbcatalog.ServiceType),
-		grpcRouteParentMapper: bimapper.New(pbmesh.GRPCRouteType, pbcatalog.ServiceType),
-		tcpRouteParentMapper:  bimapper.New(pbmesh.TCPRouteType, pbcatalog.ServiceType),
-
-		httpRouteBackendMapper: bimapper.New(pbmesh.HTTPRouteType, pbcatalog.ServiceType),
-		grpcRouteBackendMapper: bimapper.New(pbmesh.GRPCRouteType, pbcatalog.ServiceType),
-		tcpRouteBackendMapper:  bimapper.New(pbmesh.TCPRouteType, pbcatalog.ServiceType),
-
-		failMapper: catalog.NewFailoverPolicyMapper(),
-	}
-}
-
-func (m *Mapper) getRouteBiMappers(typ *pbresource.Type) (parent, backend *bimapper.Mapper) {
-	switch {
-	case resource.EqualType(pbmesh.HTTPRouteType, typ):
-		return m.httpRouteParentMapper, m.httpRouteBackendMapper
-	case resource.EqualType(pbmesh.GRPCRouteType, typ):
-		return m.grpcRouteParentMapper, m.grpcRouteBackendMapper
-	case resource.EqualType(pbmesh.TCPRouteType, typ):
-		return m.tcpRouteParentMapper, m.tcpRouteBackendMapper
-	default:
-		panic("unknown xroute type: " + resource.TypeToString(typ))
-	}
-}
-
-func (m *Mapper) walkRouteParentBiMappers(fn func(bm *bimapper.Mapper)) {
-	for _, bm := range []*bimapper.Mapper{
-		m.httpRouteParentMapper,
-		m.grpcRouteParentMapper,
-		m.tcpRouteParentMapper,
-	} {
-		fn(bm)
-	}
-}
-
-func (m *Mapper) walkRouteBackendBiMappers(fn func(bm *bimapper.Mapper)) {
-	for _, bm := range []*bimapper.Mapper{
-		m.httpRouteBackendMapper,
-		m.grpcRouteBackendMapper,
-		m.tcpRouteBackendMapper,
-	} {
-		fn(bm)
-	}
-}
-
-func (m *Mapper) TrackComputedRoutes(cr *types.DecodedComputedRoutes) {
-	if cr != nil {
-		refs := refSliceToRefSlice(cr.Data.BoundReferences)
-		m.boundRefMapper.TrackItem(cr.Resource.Id, refs)
-	}
-}
-
-func (m *Mapper) UntrackComputedRoutes(id *pbresource.ID) {
-	m.boundRefMapper.UntrackItem(id)
-}
-
-// TrackXRoute indexes the xRoute->parentRefService and
-// xRoute->backendRefService relationship.
-func (m *Mapper) TrackXRoute(id *pbresource.ID, xroute types.XRouteData) {
-	parent, backend := m.getRouteBiMappers(id.Type)
-	if parent == nil || backend == nil {
-		return
-	}
-
-	parentRefs := parentRefSliceToRefSlice(xroute.GetParentRefs())
-	backendRefs := backendRefSliceToRefSlice(xroute.GetUnderlyingBackendRefs())
-
-	parent.TrackItem(id, parentRefs)
-	backend.TrackItem(id, backendRefs)
-}
-
-// UntrackXRoute undoes TrackXRoute.
-func (m *Mapper) UntrackXRoute(id *pbresource.ID) {
-	parent, backend := m.getRouteBiMappers(id.Type)
-	if parent == nil || backend == nil {
-		return
-	}
-
-	parent.UntrackItem(id)
-	backend.UntrackItem(id)
-}
-
-// RouteIDsByParentServiceRef returns xRoute IDs that have a direct parentRef link to
-// the provided service.
-func (m *Mapper) RouteIDsByParentServiceRef(ref *pbresource.Reference) []*pbresource.ID {
-	var out []*pbresource.ID
-	m.walkRouteParentBiMappers(func(bm *bimapper.Mapper) {
-		got := bm.ItemsForLink(resource.IDFromReference(ref))
-		out = append(out, got...)
-	})
-	return out
-}
-
-// RouteIDsByBackendServiceRef returns xRoute IDs that have a direct backendRef
-// link to the provided service.
-func (m *Mapper) RouteIDsByBackendServiceRef(ref *pbresource.Reference) []*pbresource.ID {
-	var out []*pbresource.ID
-	m.walkRouteBackendBiMappers(func(bm *bimapper.Mapper) {
-		got := bm.ItemsForLink(resource.IDFromReference(ref))
-		out = append(out, got...)
-	})
-	return out
-}
-
-// ParentServiceRefsByRouteID is the opposite of RouteIDsByParentServiceRef.
-func (m *Mapper) ParentServiceRefsByRouteID(item *pbresource.ID) []*pbresource.Reference {
-	parent, _ := m.getRouteBiMappers(item.Type)
-	if parent == nil {
-		return nil
-	}
-	return parent.LinksForItem(item)
-}
-
-// BackendServiceRefsByRouteID is the opposite of RouteIDsByBackendServiceRef.
-func (m *Mapper) BackendServiceRefsByRouteID(item *pbresource.ID) []*pbresource.Reference {
-	_, backend := m.getRouteBiMappers(item.Type)
-	if backend == nil {
-		return nil
-	}
-	return backend.LinksForItem(item)
-}
-
-// MapHTTPRoute will map HTTPRoute changes to ComputedRoutes changes.
-func (m *Mapper) MapHTTPRoute(_ context.Context, _ controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	return mapXRouteToComputedRoutes[*pbmesh.HTTPRoute](res, m)
-}
-
-// MapGRPCRoute will map GRPCRoute changes to ComputedRoutes changes.
-func (m *Mapper) MapGRPCRoute(_ context.Context, _ controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	return mapXRouteToComputedRoutes[*pbmesh.GRPCRoute](res, m)
-}
-
-// MapTCPRoute will map TCPRoute changes to ComputedRoutes changes.
-func (m *Mapper) MapTCPRoute(_ context.Context, _ controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	return mapXRouteToComputedRoutes[*pbmesh.TCPRoute](res, m)
-}
-
-// mapXRouteToComputedRoutes will map xRoute changes to ComputedRoutes changes.
-func mapXRouteToComputedRoutes[T types.XRouteData](res *pbresource.Resource, m *Mapper) ([]controller.Request, error) {
-	dec, err := resource.Decode[T](res)
-	if err != nil {
-		return nil, fmt.Errorf("error unmarshalling xRoute: %w", err)
-	}
-
-	route := dec.Data
-
-	m.TrackXRoute(res.Id, route)
-
-	refs := parentRefSliceToRefSlice(route.GetParentRefs())
-
-	// Augment with any bound refs to cover the case where an xRoute used to
-	// have a parentRef to a service and now no longer does.
-	prevRefs := m.boundRefMapper.ItemRefsForLink(dec.Resource.Id)
-	for _, ref := range prevRefs {
-		refs = append(refs, ref)
-	}
-
-	return controller.MakeRequests(pbmesh.ComputedRoutesType, refs), nil
-}
-
-func (m *Mapper) MapFailoverPolicy(
-	_ context.Context,
-	_ controller.Runtime,
-	res *pbresource.Resource,
-) ([]controller.Request, error) {
-	if !types.IsFailoverPolicyType(res.Id.Type) {
-		return nil, fmt.Errorf("type is not a failover policy type: %s", res.Id.Type)
-	}
-
-	dec, err := resource.Decode[*pbcatalog.FailoverPolicy](res)
-	if err != nil {
-		return nil, fmt.Errorf("error unmarshalling failover policy: %w", err)
-	}
-
-	m.failMapper.TrackFailover(dec)
-
-	// Since this is name-aligned, just switch the type and find routes that
-	// will route any traffic to this destination service.
-	svcID := resource.ReplaceType(pbcatalog.ServiceType, res.Id)
-
-	return m.mapXRouteDirectServiceRefToComputedRoutesByID(svcID)
-}
-
-func (m *Mapper) TrackFailoverPolicy(failover *types.DecodedFailoverPolicy) {
-	if failover != nil {
-		m.failMapper.TrackFailover(failover)
-	}
-}
-
-func (m *Mapper) UntrackFailoverPolicy(failoverPolicyID *pbresource.ID) {
-	m.failMapper.UntrackFailover(failoverPolicyID)
-}
-
-func (m *Mapper) MapDestinationPolicy(
-	_ context.Context,
-	_ controller.Runtime,
-	res *pbresource.Resource,
-) ([]controller.Request, error) {
-	if !types.IsDestinationPolicyType(res.Id.Type) {
-		return nil, fmt.Errorf("type is not a destination policy type: %s", res.Id.Type)
-	}
-
-	// Since this is name-aligned, just switch the type and find routes that
-	// will route any traffic to this destination service.
-	svcID := resource.ReplaceType(pbcatalog.ServiceType, res.Id)
-
-	return m.mapXRouteDirectServiceRefToComputedRoutesByID(svcID)
-}
-
-func (m *Mapper) MapService(
-	_ context.Context,
-	_ controller.Runtime,
-	res *pbresource.Resource,
-) ([]controller.Request, error) {
-	// Ultimately we want to wake up a ComputedRoutes if either of the
-	// following exist:
-	//
-	// 1. xRoute[parentRef=OUTPUT_EVENT; backendRef=INPUT_EVENT]
-	// 2. xRoute[parentRef=OUTPUT_EVENT; backendRef=SOMETHING], FailoverPolicy[name=SOMETHING, destRef=INPUT_EVENT]
-
-	// (case 2) First find all failover policies that have a reference to our input service.
-	failPolicyIDs := m.failMapper.FailoverIDsByService(res.Id)
-	effectiveServiceIDs := sliceReplaceType(failPolicyIDs, pbcatalog.ServiceType)
-
-	// (case 1) Do the direct mapping also.
-	effectiveServiceIDs = append(effectiveServiceIDs, res.Id)
-
-	var reqs []controller.Request
-	for _, svcID := range effectiveServiceIDs {
-		got, err := m.mapXRouteDirectServiceRefToComputedRoutesByID(svcID)
-		if err != nil {
-			return nil, err
-		}
-		reqs = append(reqs, got...)
-	}
-
-	return reqs, nil
-}
-
-// NOTE: this function does not interrogate down into failover policies
-func (m *Mapper) mapXRouteDirectServiceRefToComputedRoutesByID(svcID *pbresource.ID) ([]controller.Request, error) {
-	if !types.IsServiceType(svcID.Type) {
-		return nil, fmt.Errorf("type is not a service type: %s", svcID.Type)
-	}
-
-	// return 1 hit for the name aligned mesh config
-	primaryReq := controller.Request{
-		ID: resource.ReplaceType(pbmesh.ComputedRoutesType, svcID),
-	}
-
-	svcRef := resource.Reference(svcID, "")
-
-	// Find all routes with an explicit backend ref to this service.
-	//
-	// the "name aligned" inclusion above should handle the implicit default
-	// destination implied by a parent ref without us having to do much more.
-	routeIDs := m.RouteIDsByBackendServiceRef(svcRef)
-
-	out := make([]controller.Request, 0, 1+len(routeIDs)) // estimated
-	out = append(out, primaryReq)
-
-	for _, routeID := range routeIDs {
-		// Find all parent refs of this route.
-		svcRefs := m.ParentServiceRefsByRouteID(routeID)
-
-		out = append(out, controller.MakeRequests(
-			pbmesh.ComputedRoutesType,
-			svcRefs,
-		)...)
-	}
-
-	return out, nil
-}
diff --git a/internal/mesh/internal/controllers/routes/xroutemapper/xroutemapper_test.go b/internal/mesh/internal/controllers/routes/xroutemapper/xroutemapper_test.go
deleted file mode 100644
index e74b049b7dce6..0000000000000
--- a/internal/mesh/internal/controllers/routes/xroutemapper/xroutemapper_test.go
+++ /dev/null
@@ -1,694 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xroutemapper
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/durationpb"
-
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestMapper_HTTPRoute_Tracking(t *testing.T) {
-	testMapper_Tracking(t, pbmesh.HTTPRouteType, func(t *testing.T, parentRefs []*pbmesh.ParentReference, backendRefs []*pbmesh.BackendReference) proto.Message {
-		route := &pbmesh.HTTPRoute{
-			ParentRefs: parentRefs,
-		}
-		for _, backendRef := range backendRefs {
-			route.Rules = append(route.Rules, &pbmesh.HTTPRouteRule{
-				BackendRefs: []*pbmesh.HTTPBackendRef{
-					{BackendRef: backendRef},
-				},
-			})
-		}
-		return route
-	})
-}
-
-func TestMapper_GRPCRoute_Tracking(t *testing.T) {
-	testMapper_Tracking(t, pbmesh.GRPCRouteType, func(t *testing.T, parentRefs []*pbmesh.ParentReference, backendRefs []*pbmesh.BackendReference) proto.Message {
-		route := &pbmesh.GRPCRoute{
-			ParentRefs: parentRefs,
-		}
-		for _, backendRef := range backendRefs {
-			route.Rules = append(route.Rules, &pbmesh.GRPCRouteRule{
-				BackendRefs: []*pbmesh.GRPCBackendRef{
-					{BackendRef: backendRef},
-				},
-			})
-		}
-		return route
-	})
-}
-
-func TestMapper_TCPRoute_Tracking(t *testing.T) {
-	testMapper_Tracking(t, pbmesh.TCPRouteType, func(t *testing.T, parentRefs []*pbmesh.ParentReference, backendRefs []*pbmesh.BackendReference) proto.Message {
-		route := &pbmesh.TCPRoute{
-			ParentRefs: parentRefs,
-		}
-		for _, backendRef := range backendRefs {
-			route.Rules = append(route.Rules, &pbmesh.TCPRouteRule{
-				BackendRefs: []*pbmesh.TCPBackendRef{
-					{BackendRef: backendRef},
-				},
-			})
-		}
-		return route
-	})
-}
-
-func testMapper_Tracking(t *testing.T, typ *pbresource.Type, newRoute func(t *testing.T, parentRefs []*pbmesh.ParentReference, backendRefs []*pbmesh.BackendReference) proto.Message) {
-	registry := resource.NewRegistry()
-	types.Register(registry)
-	catalog.RegisterTypes(registry)
-
-	newService := func(name string) *pbresource.Resource {
-		svc := rtest.Resource(pbcatalog.ServiceType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, &pbcatalog.Service{}).
-			Build()
-		rtest.ValidateAndNormalize(t, registry, svc)
-		return svc
-	}
-
-	newDestPolicy := func(name string, dur time.Duration) *pbresource.Resource {
-		policy := rtest.Resource(pbmesh.DestinationPolicyType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(dur),
-					},
-				},
-			}).Build()
-		rtest.ValidateAndNormalize(t, registry, policy)
-		return policy
-	}
-
-	newFailPolicy := func(name string, refs ...*pbresource.Reference) *pbresource.Resource {
-		var dests []*pbcatalog.FailoverDestination
-		for _, ref := range refs {
-			dests = append(dests, &pbcatalog.FailoverDestination{
-				Ref: ref,
-			})
-		}
-		policy := rtest.Resource(pbcatalog.FailoverPolicyType, name).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, &pbcatalog.FailoverPolicy{
-				Config: &pbcatalog.FailoverConfig{
-					Destinations: dests,
-				},
-			}).Build()
-		rtest.ValidateAndNormalize(t, registry, policy)
-		return policy
-	}
-
-	apiComputedRoutes := newID(pbmesh.ComputedRoutesType, "api")
-	wwwComputedRoutes := newID(pbmesh.ComputedRoutesType, "www")
-	barComputedRoutes := newID(pbmesh.ComputedRoutesType, "bar")
-	fooComputedRoutes := newID(pbmesh.ComputedRoutesType, "foo")
-	zimComputedRoutes := newID(pbmesh.ComputedRoutesType, "zim")
-	girComputedRoutes := newID(pbmesh.ComputedRoutesType, "gir")
-
-	m := New()
-
-	var (
-		apiSvc = newService("api")
-		wwwSvc = newService("www")
-		barSvc = newService("bar")
-		fooSvc = newService("foo")
-		zimSvc = newService("zim")
-		girSvc = newService("gir")
-
-		apiSvcRef = resource.Reference(apiSvc.Id, "")
-		wwwSvcRef = resource.Reference(wwwSvc.Id, "")
-		barSvcRef = resource.Reference(barSvc.Id, "")
-		fooSvcRef = resource.Reference(fooSvc.Id, "")
-		zimSvcRef = resource.Reference(zimSvc.Id, "")
-		girSvcRef = resource.Reference(girSvc.Id, "")
-
-		apiDest = newDestPolicy("api", 55*time.Second)
-		wwwDest = newDestPolicy("www", 123*time.Second)
-
-		// Start out easy and don't have failover policies that reference other services.
-		apiFail = newFailPolicy("api", newRef(pbcatalog.ServiceType, "api"))
-		wwwFail = newFailPolicy("www", newRef(pbcatalog.ServiceType, "www"))
-		barFail = newFailPolicy("bar", newRef(pbcatalog.ServiceType, "bar"))
-	)
-
-	testutil.RunStep(t, "only name aligned defaults", func(t *testing.T) {
-		requireTracking(t, m, apiSvc, apiComputedRoutes)
-		requireTracking(t, m, wwwSvc, wwwComputedRoutes)
-		requireTracking(t, m, barSvc, barComputedRoutes)
-		requireTracking(t, m, fooSvc, fooComputedRoutes)
-		requireTracking(t, m, zimSvc, zimComputedRoutes)
-		requireTracking(t, m, girSvc, girComputedRoutes)
-
-		requireTracking(t, m, apiDest, apiComputedRoutes)
-		requireTracking(t, m, wwwDest, wwwComputedRoutes)
-
-		// This will track the failover policies.
-		requireTracking(t, m, apiFail, apiComputedRoutes)
-		requireTracking(t, m, wwwFail, wwwComputedRoutes)
-		requireTracking(t, m, barFail, barComputedRoutes)
-
-		// verify other helper methods
-		for _, ref := range []*pbresource.Reference{apiSvcRef, wwwSvcRef, barSvcRef, fooSvcRef, zimSvcRef, girSvcRef} {
-			require.Empty(t, m.RouteIDsByBackendServiceRef(ref))
-			require.Empty(t, m.RouteIDsByParentServiceRef(ref))
-		}
-	})
-
-	var (
-		route1 *pbresource.Resource
-	)
-	testutil.RunStep(t, "track a name-aligned xroute", func(t *testing.T) {
-		// First route will also not cross any services.
-		route1 := rtest.Resource(typ, "route-1").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, newRoute(t,
-				[]*pbmesh.ParentReference{
-					{Ref: newRef(pbcatalog.ServiceType, "api")},
-				},
-				[]*pbmesh.BackendReference{
-					newBackendRef("api"),
-				},
-			)).Build()
-		rtest.ValidateAndNormalize(t, registry, route1)
-
-		requireTracking(t, m, route1, apiComputedRoutes)
-
-		// Now 'api' references should trigger more, but be duplicate-suppressed.
-		requireTracking(t, m, apiSvc, apiComputedRoutes)
-		requireTracking(t, m, wwwSvc, wwwComputedRoutes)
-		requireTracking(t, m, barSvc, barComputedRoutes)
-		requireTracking(t, m, fooSvc, fooComputedRoutes)
-		requireTracking(t, m, zimSvc, zimComputedRoutes)
-		requireTracking(t, m, girSvc, girComputedRoutes)
-
-		requireTracking(t, m, apiDest, apiComputedRoutes)
-		requireTracking(t, m, wwwDest, wwwComputedRoutes)
-
-		requireTracking(t, m, apiFail, apiComputedRoutes)
-		requireTracking(t, m, wwwFail, wwwComputedRoutes)
-		requireTracking(t, m, barFail, barComputedRoutes)
-
-		// verify other helper methods
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{apiSvcRef}, m.BackendServiceRefsByRouteID(route1.Id))
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{apiSvcRef}, m.ParentServiceRefsByRouteID(route1.Id))
-
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route1.Id}, m.RouteIDsByBackendServiceRef(apiSvcRef))
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route1.Id}, m.RouteIDsByParentServiceRef(apiSvcRef))
-
-		for _, ref := range []*pbresource.Reference{wwwSvcRef, barSvcRef, fooSvcRef, zimSvcRef, girSvcRef} {
-			require.Empty(t, m.RouteIDsByBackendServiceRef(ref))
-			require.Empty(t, m.RouteIDsByParentServiceRef(ref))
-		}
-	})
-
-	testutil.RunStep(t, "make the route cross services", func(t *testing.T) {
-		route1 = rtest.Resource(typ, "route-1").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, newRoute(t,
-				[]*pbmesh.ParentReference{
-					{Ref: newRef(pbcatalog.ServiceType, "api")},
-				},
-				[]*pbmesh.BackendReference{
-					newBackendRef("www"),
-				},
-			)).Build()
-		rtest.ValidateAndNormalize(t, registry, route1)
-
-		// Now witness the update.
-		requireTracking(t, m, route1, apiComputedRoutes)
-
-		// Now 'api' references should trigger different things.
-		requireTracking(t, m, apiSvc, apiComputedRoutes)
-		requireTracking(t, m, wwwSvc, wwwComputedRoutes, apiComputedRoutes)
-		requireTracking(t, m, barSvc, barComputedRoutes)
-		requireTracking(t, m, fooSvc, fooComputedRoutes)
-		requireTracking(t, m, zimSvc, zimComputedRoutes)
-		requireTracking(t, m, girSvc, girComputedRoutes)
-
-		requireTracking(t, m, apiDest, apiComputedRoutes)
-		requireTracking(t, m, wwwDest, wwwComputedRoutes, apiComputedRoutes)
-
-		requireTracking(t, m, apiFail, apiComputedRoutes)
-		requireTracking(t, m, wwwFail, wwwComputedRoutes, apiComputedRoutes)
-		requireTracking(t, m, barFail, barComputedRoutes)
-
-		// verify other helper methods
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{wwwSvcRef}, m.BackendServiceRefsByRouteID(route1.Id))
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{apiSvcRef}, m.ParentServiceRefsByRouteID(route1.Id))
-
-		require.Empty(t, m.RouteIDsByBackendServiceRef(apiSvcRef))
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route1.Id}, m.RouteIDsByParentServiceRef(apiSvcRef))
-
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route1.Id}, m.RouteIDsByBackendServiceRef(wwwSvcRef))
-		require.Empty(t, m.RouteIDsByParentServiceRef(wwwSvcRef))
-
-		for _, ref := range []*pbresource.Reference{barSvcRef, fooSvcRef, zimSvcRef, girSvcRef} {
-			require.Empty(t, m.RouteIDsByBackendServiceRef(ref))
-			require.Empty(t, m.RouteIDsByParentServiceRef(ref))
-		}
-	})
-
-	var (
-		route2 *pbresource.Resource
-	)
-	testutil.RunStep(t, "make another route sharing a parent with the first", func(t *testing.T) {
-		route2 = rtest.Resource(typ, "route-2").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, newRoute(t,
-				[]*pbmesh.ParentReference{
-					{Ref: newRef(pbcatalog.ServiceType, "api")},
-					{Ref: newRef(pbcatalog.ServiceType, "foo")},
-				},
-				[]*pbmesh.BackendReference{
-					newBackendRef("bar"),
-				},
-			)).Build()
-		rtest.ValidateAndNormalize(t, registry, route1)
-
-		// Now witness a route with multiple parents, overlapping the other route.
-		requireTracking(t, m, route2, apiComputedRoutes, fooComputedRoutes)
-
-		requireTracking(t, m, apiSvc, apiComputedRoutes)
-		requireTracking(t, m, wwwSvc, wwwComputedRoutes, apiComputedRoutes)
-		requireTracking(t, m, barSvc, barComputedRoutes, apiComputedRoutes, fooComputedRoutes)
-
-		requireTracking(t, m, fooSvc, fooComputedRoutes)
-		requireTracking(t, m, zimSvc, zimComputedRoutes)
-		requireTracking(t, m, girSvc, girComputedRoutes)
-
-		requireTracking(t, m, apiDest, apiComputedRoutes)
-		requireTracking(t, m, wwwDest, wwwComputedRoutes, apiComputedRoutes)
-
-		requireTracking(t, m, apiFail, apiComputedRoutes)
-		requireTracking(t, m, wwwFail, wwwComputedRoutes, apiComputedRoutes)
-		requireTracking(t, m, barFail, barComputedRoutes, apiComputedRoutes, fooComputedRoutes)
-
-		requireTracking(t, m, route1, apiComputedRoutes)
-		// skip re-verifying route2
-		// requireTracking(t, m, route2, apiComputedRoutes, fooComputedRoutes)
-
-		// verify other helper methods
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{wwwSvcRef}, m.BackendServiceRefsByRouteID(route1.Id))
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{apiSvcRef}, m.ParentServiceRefsByRouteID(route1.Id))
-
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{barSvcRef}, m.BackendServiceRefsByRouteID(route2.Id))
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{apiSvcRef, fooSvcRef}, m.ParentServiceRefsByRouteID(route2.Id))
-
-		require.Empty(t, m.RouteIDsByBackendServiceRef(apiSvcRef))
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route1.Id, route2.Id}, m.RouteIDsByParentServiceRef(apiSvcRef))
-
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route1.Id}, m.RouteIDsByBackendServiceRef(wwwSvcRef))
-		require.Empty(t, m.RouteIDsByParentServiceRef(wwwSvcRef))
-
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route2.Id}, m.RouteIDsByBackendServiceRef(barSvcRef))
-		require.Empty(t, m.RouteIDsByParentServiceRef(barSvcRef))
-
-		require.Empty(t, m.RouteIDsByBackendServiceRef(fooSvcRef))
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route2.Id}, m.RouteIDsByParentServiceRef(fooSvcRef))
-
-		for _, ref := range []*pbresource.Reference{zimSvcRef, girSvcRef} {
-			require.Empty(t, m.RouteIDsByBackendServiceRef(ref))
-			require.Empty(t, m.RouteIDsByParentServiceRef(ref))
-		}
-	})
-
-	testutil.RunStep(t, "update the failover policy to cross services", func(t *testing.T) {
-		apiFail = newFailPolicy("api",
-			newRef(pbcatalog.ServiceType, "foo"),
-			newRef(pbcatalog.ServiceType, "zim"))
-		requireTracking(t, m, apiFail, apiComputedRoutes)
-
-		requireTracking(t, m, apiSvc, apiComputedRoutes)
-		requireTracking(t, m, wwwSvc, wwwComputedRoutes, apiComputedRoutes)
-		requireTracking(t, m, barSvc, barComputedRoutes, apiComputedRoutes, fooComputedRoutes)
-
-		requireTracking(t, m, fooSvc, fooComputedRoutes, apiComputedRoutes)
-		requireTracking(t, m, zimSvc, zimComputedRoutes, apiComputedRoutes)
-		requireTracking(t, m, girSvc, girComputedRoutes)
-
-		requireTracking(t, m, apiDest, apiComputedRoutes)
-		requireTracking(t, m, wwwDest, wwwComputedRoutes, apiComputedRoutes)
-
-		// skipping verification of apiFail b/c it happened above already
-		// requireTracking(t, m, apiFail, apiComputedRoutes)
-		requireTracking(t, m, wwwFail, wwwComputedRoutes, apiComputedRoutes)
-		requireTracking(t, m, barFail, barComputedRoutes, apiComputedRoutes, fooComputedRoutes)
-
-		requireTracking(t, m, route1, apiComputedRoutes)
-		requireTracking(t, m, route2, apiComputedRoutes, fooComputedRoutes)
-
-		// verify other helper methods
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{wwwSvcRef}, m.BackendServiceRefsByRouteID(route1.Id))
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{apiSvcRef}, m.ParentServiceRefsByRouteID(route1.Id))
-
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{barSvcRef}, m.BackendServiceRefsByRouteID(route2.Id))
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{apiSvcRef, fooSvcRef}, m.ParentServiceRefsByRouteID(route2.Id))
-
-		require.Empty(t, m.RouteIDsByBackendServiceRef(apiSvcRef))
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route1.Id, route2.Id}, m.RouteIDsByParentServiceRef(apiSvcRef))
-
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route1.Id}, m.RouteIDsByBackendServiceRef(wwwSvcRef))
-		require.Empty(t, m.RouteIDsByParentServiceRef(wwwSvcRef))
-
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route2.Id}, m.RouteIDsByBackendServiceRef(barSvcRef))
-		require.Empty(t, m.RouteIDsByParentServiceRef(barSvcRef))
-
-		require.Empty(t, m.RouteIDsByBackendServiceRef(fooSvcRef))
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route2.Id}, m.RouteIDsByParentServiceRef(fooSvcRef))
-
-		for _, ref := range []*pbresource.Reference{zimSvcRef, girSvcRef} {
-			require.Empty(t, m.RouteIDsByBackendServiceRef(ref))
-			require.Empty(t, m.RouteIDsByParentServiceRef(ref))
-		}
-	})
-
-	testutil.RunStep(t, "set a new failover policy for a service in route2", func(t *testing.T) {
-		barFail = newFailPolicy("bar",
-			newRef(pbcatalog.ServiceType, "gir"))
-		requireTracking(t, m, barFail, barComputedRoutes, apiComputedRoutes, fooComputedRoutes)
-
-		requireTracking(t, m, apiSvc, apiComputedRoutes)
-		requireTracking(t, m, wwwSvc, wwwComputedRoutes, apiComputedRoutes)
-		requireTracking(t, m, barSvc, barComputedRoutes, apiComputedRoutes, fooComputedRoutes)
-
-		requireTracking(t, m, fooSvc, fooComputedRoutes, apiComputedRoutes)
-		requireTracking(t, m, zimSvc, zimComputedRoutes, apiComputedRoutes)
-		requireTracking(t, m, girSvc, girComputedRoutes, barComputedRoutes, apiComputedRoutes, fooComputedRoutes)
-
-		requireTracking(t, m, apiDest, apiComputedRoutes)
-		requireTracking(t, m, wwwDest, wwwComputedRoutes, apiComputedRoutes)
-
-		requireTracking(t, m, apiFail, apiComputedRoutes)
-		requireTracking(t, m, wwwFail, wwwComputedRoutes, apiComputedRoutes)
-		// skipping verification of barFail b/c it happened above already
-		// requireTracking(t, m, barFail, barComputedRoutes, apiComputedRoutes, fooComputedRoutes)
-
-		requireTracking(t, m, route1, apiComputedRoutes)
-		requireTracking(t, m, route2, apiComputedRoutes, fooComputedRoutes)
-
-		// verify other helper methods
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{wwwSvcRef}, m.BackendServiceRefsByRouteID(route1.Id))
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{apiSvcRef}, m.ParentServiceRefsByRouteID(route1.Id))
-
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{barSvcRef}, m.BackendServiceRefsByRouteID(route2.Id))
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{apiSvcRef, fooSvcRef}, m.ParentServiceRefsByRouteID(route2.Id))
-
-		require.Empty(t, m.RouteIDsByBackendServiceRef(apiSvcRef))
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route1.Id, route2.Id}, m.RouteIDsByParentServiceRef(apiSvcRef))
-
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route1.Id}, m.RouteIDsByBackendServiceRef(wwwSvcRef))
-		require.Empty(t, m.RouteIDsByParentServiceRef(wwwSvcRef))
-
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route2.Id}, m.RouteIDsByBackendServiceRef(barSvcRef))
-		require.Empty(t, m.RouteIDsByParentServiceRef(barSvcRef))
-
-		require.Empty(t, m.RouteIDsByBackendServiceRef(fooSvcRef))
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route2.Id}, m.RouteIDsByParentServiceRef(fooSvcRef))
-
-		for _, ref := range []*pbresource.Reference{zimSvcRef, girSvcRef} {
-			require.Empty(t, m.RouteIDsByBackendServiceRef(ref))
-			require.Empty(t, m.RouteIDsByParentServiceRef(ref))
-		}
-	})
-
-	testutil.RunStep(t, "delete first route", func(t *testing.T) {
-		m.UntrackXRoute(route1.Id)
-		route1 = nil
-
-		requireTracking(t, m, apiSvc, apiComputedRoutes)
-		requireTracking(t, m, wwwSvc, wwwComputedRoutes)
-		requireTracking(t, m, barSvc, barComputedRoutes, apiComputedRoutes, fooComputedRoutes)
-
-		requireTracking(t, m, fooSvc, fooComputedRoutes, apiComputedRoutes)
-		requireTracking(t, m, zimSvc, zimComputedRoutes, apiComputedRoutes)
-		requireTracking(t, m, girSvc, girComputedRoutes, barComputedRoutes, apiComputedRoutes, fooComputedRoutes)
-
-		requireTracking(t, m, apiDest, apiComputedRoutes)
-		requireTracking(t, m, wwwDest, wwwComputedRoutes)
-
-		requireTracking(t, m, apiFail, apiComputedRoutes)
-		requireTracking(t, m, wwwFail, wwwComputedRoutes)
-		requireTracking(t, m, barFail, barComputedRoutes, apiComputedRoutes, fooComputedRoutes)
-
-		requireTracking(t, m, route2, apiComputedRoutes, fooComputedRoutes)
-
-		// verify other helper methods
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{barSvcRef}, m.BackendServiceRefsByRouteID(route2.Id))
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{apiSvcRef, fooSvcRef}, m.ParentServiceRefsByRouteID(route2.Id))
-
-		require.Empty(t, m.RouteIDsByBackendServiceRef(apiSvcRef))
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route2.Id}, m.RouteIDsByParentServiceRef(apiSvcRef))
-
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route2.Id}, m.RouteIDsByBackendServiceRef(barSvcRef))
-		require.Empty(t, m.RouteIDsByParentServiceRef(barSvcRef))
-
-		require.Empty(t, m.RouteIDsByBackendServiceRef(fooSvcRef))
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route2.Id}, m.RouteIDsByParentServiceRef(fooSvcRef))
-
-		for _, ref := range []*pbresource.Reference{wwwSvcRef, zimSvcRef, girSvcRef} {
-			require.Empty(t, m.RouteIDsByBackendServiceRef(ref))
-			require.Empty(t, m.RouteIDsByParentServiceRef(ref))
-		}
-	})
-
-	testutil.RunStep(t, "delete all failover", func(t *testing.T) {
-		m.UntrackFailoverPolicy(apiFail.Id)
-		m.UntrackFailoverPolicy(wwwFail.Id)
-		m.UntrackFailoverPolicy(barFail.Id)
-
-		apiFail = nil
-		wwwFail = nil
-		barFail = nil
-
-		requireTracking(t, m, apiSvc, apiComputedRoutes)
-		requireTracking(t, m, wwwSvc, wwwComputedRoutes)
-		requireTracking(t, m, barSvc, barComputedRoutes, apiComputedRoutes, fooComputedRoutes)
-
-		requireTracking(t, m, fooSvc, fooComputedRoutes)
-		requireTracking(t, m, zimSvc, zimComputedRoutes)
-		requireTracking(t, m, girSvc, girComputedRoutes)
-
-		requireTracking(t, m, apiDest, apiComputedRoutes)
-		requireTracking(t, m, wwwDest, wwwComputedRoutes)
-
-		requireTracking(t, m, route2, apiComputedRoutes, fooComputedRoutes)
-
-		// verify other helper methods
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{barSvcRef}, m.BackendServiceRefsByRouteID(route2.Id))
-		prototest.AssertElementsMatch(t, []*pbresource.Reference{apiSvcRef, fooSvcRef}, m.ParentServiceRefsByRouteID(route2.Id))
-
-		require.Empty(t, m.RouteIDsByBackendServiceRef(apiSvcRef))
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route2.Id}, m.RouteIDsByParentServiceRef(apiSvcRef))
-
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route2.Id}, m.RouteIDsByBackendServiceRef(barSvcRef))
-		require.Empty(t, m.RouteIDsByParentServiceRef(barSvcRef))
-
-		require.Empty(t, m.RouteIDsByBackendServiceRef(fooSvcRef))
-		prototest.AssertElementsMatch(t, []*pbresource.ID{route2.Id}, m.RouteIDsByParentServiceRef(fooSvcRef))
-
-		for _, ref := range []*pbresource.Reference{wwwSvcRef, zimSvcRef, girSvcRef} {
-			require.Empty(t, m.RouteIDsByBackendServiceRef(ref))
-			require.Empty(t, m.RouteIDsByParentServiceRef(ref))
-		}
-	})
-
-	testutil.RunStep(t, "delete second route", func(t *testing.T) {
-		m.UntrackXRoute(route2.Id)
-		route2 = nil
-
-		requireTracking(t, m, apiSvc, apiComputedRoutes)
-		requireTracking(t, m, wwwSvc, wwwComputedRoutes)
-		requireTracking(t, m, barSvc, barComputedRoutes)
-
-		requireTracking(t, m, fooSvc, fooComputedRoutes)
-		requireTracking(t, m, zimSvc, zimComputedRoutes)
-		requireTracking(t, m, girSvc, girComputedRoutes)
-
-		requireTracking(t, m, apiDest, apiComputedRoutes)
-		requireTracking(t, m, wwwDest, wwwComputedRoutes)
-
-		// verify other helper methods
-		for _, ref := range []*pbresource.Reference{apiSvcRef, wwwSvcRef, barSvcRef, fooSvcRef, zimSvcRef, girSvcRef} {
-			require.Empty(t, m.RouteIDsByBackendServiceRef(ref))
-			require.Empty(t, m.RouteIDsByParentServiceRef(ref))
-		}
-	})
-
-	testutil.RunStep(t, "removal of a parent still triggers for old computed routes until the bound reference is cleared", func(t *testing.T) {
-		route1 = rtest.Resource(typ, "route-1").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, newRoute(t,
-				[]*pbmesh.ParentReference{
-					{Ref: newRef(pbcatalog.ServiceType, "bar")},
-					{Ref: newRef(pbcatalog.ServiceType, "foo")},
-				},
-				[]*pbmesh.BackendReference{
-					newBackendRef("api"),
-				},
-			)).Build()
-		rtest.ValidateAndNormalize(t, registry, route1)
-
-		requireTracking(t, m, route1, barComputedRoutes, fooComputedRoutes)
-
-		// Simulate a Reconcile that would update the mapper.
-		//
-		// NOTE: we do not ValidateAndNormalize these since the mapper doesn't use the data.
-		fooCR := rtest.ResourceID(fooComputedRoutes).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					apiSvcRef,
-					fooSvcRef,
-					resource.Reference(route1.Id, ""),
-				},
-			}).Build()
-		m.TrackComputedRoutes(rtest.MustDecode[*pbmesh.ComputedRoutes](t, fooCR))
-
-		barCR := rtest.ResourceID(barComputedRoutes).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					apiSvcRef,
-					barSvcRef,
-					resource.Reference(route1.Id, ""),
-				},
-			}).Build()
-		m.TrackComputedRoutes(rtest.MustDecode[*pbmesh.ComputedRoutes](t, barCR))
-
-		// Still has the same tracking.
-		requireTracking(t, m, route1, barComputedRoutes, fooComputedRoutes)
-
-		// Now change the route to remove "bar"
-
-		route1 = rtest.Resource(typ, "route-1").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, newRoute(t,
-				[]*pbmesh.ParentReference{
-					{Ref: newRef(pbcatalog.ServiceType, "foo")},
-				},
-				[]*pbmesh.BackendReference{
-					newBackendRef("api"),
-				},
-			)).Build()
-		rtest.ValidateAndNormalize(t, registry, route1)
-
-		// Now we see that it still emits the event for bar, so we get a chance to update it.
-		requireTracking(t, m, route1, barComputedRoutes, fooComputedRoutes)
-
-		// Update the bound references on 'bar' to remove the route
-		barCR = rtest.ResourceID(barComputedRoutes).
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, &pbmesh.ComputedRoutes{
-				BoundReferences: []*pbresource.Reference{
-					apiSvcRef,
-					barSvcRef,
-				},
-			}).Build()
-		m.TrackComputedRoutes(rtest.MustDecode[*pbmesh.ComputedRoutes](t, barCR))
-
-		// Now 'bar' no longer has a link to the route.
-		requireTracking(t, m, route1, fooComputedRoutes)
-	})
-}
-
-func requireTracking(
-	t *testing.T,
-	mapper *Mapper,
-	res *pbresource.Resource,
-	computedRoutesIDs ...*pbresource.ID,
-) {
-	t.Helper()
-
-	require.NotNil(t, res)
-
-	var (
-		reqs []controller.Request
-		err  error
-	)
-	switch {
-	case resource.EqualType(pbmesh.HTTPRouteType, res.Id.Type):
-		reqs, err = mapper.MapHTTPRoute(context.Background(), controller.Runtime{}, res)
-	case resource.EqualType(pbmesh.GRPCRouteType, res.Id.Type):
-		reqs, err = mapper.MapGRPCRoute(context.Background(), controller.Runtime{}, res)
-	case resource.EqualType(pbmesh.TCPRouteType, res.Id.Type):
-		reqs, err = mapper.MapTCPRoute(context.Background(), controller.Runtime{}, res)
-	case resource.EqualType(pbmesh.DestinationPolicyType, res.Id.Type):
-		reqs, err = mapper.MapDestinationPolicy(context.Background(), controller.Runtime{}, res)
-	case resource.EqualType(pbcatalog.FailoverPolicyType, res.Id.Type):
-		reqs, err = mapper.MapFailoverPolicy(context.Background(), controller.Runtime{}, res)
-	case resource.EqualType(pbcatalog.ServiceType, res.Id.Type):
-		reqs, err = mapper.MapService(context.Background(), controller.Runtime{}, res)
-	default:
-		t.Fatalf("unhandled resource type: %s", resource.TypeToString(res.Id.Type))
-	}
-
-	require.NoError(t, err)
-	reqs = testDeduplicateRequests(reqs)
-	require.Len(t, reqs, len(computedRoutesIDs))
-	for _, computedRoutesID := range computedRoutesIDs {
-		require.NotNil(t, computedRoutesID)
-		prototest.AssertContainsElement(t, reqs, controller.Request{ID: computedRoutesID})
-	}
-}
-
-func newBackendRef(name string) *pbmesh.BackendReference {
-	return &pbmesh.BackendReference{
-		Ref: newRef(pbcatalog.ServiceType, name),
-	}
-}
-
-func newRef(typ *pbresource.Type, name string) *pbresource.Reference {
-	return rtest.Resource(typ, name).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		Reference("")
-}
-
-func newID(typ *pbresource.Type, name string) *pbresource.ID {
-	return rtest.Resource(typ, name).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		ID()
-}
-
-func testDeduplicateRequests(reqs []controller.Request) []controller.Request {
-	type resID struct {
-		resource.ReferenceKey
-		UID string
-	}
-
-	out := make([]controller.Request, 0, len(reqs))
-	seen := make(map[resID]struct{})
-
-	for _, req := range reqs {
-		rid := resID{
-			ReferenceKey: resource.NewReferenceKey(req.ID),
-			UID:          req.ID.Uid,
-		}
-		if _, ok := seen[rid]; !ok {
-			out = append(out, req)
-			seen[rid] = struct{}{}
-		}
-	}
-
-	return out
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/builder.go b/internal/mesh/internal/controllers/sidecarproxy/builder/builder.go
deleted file mode 100644
index ec173b6e7e8bb..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/builder.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package builder
-
-import (
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// Builder builds a ProxyStateTemplate.
-type Builder struct {
-	id                 *pbresource.ID
-	proxyStateTemplate *pbmesh.ProxyStateTemplate
-	proxyCfg           *pbmesh.ProxyConfiguration
-	trustDomain        string
-	localDatacenter    string
-	defaultAllow       bool
-}
-
-func New(
-	id *pbresource.ID,
-	identity *pbresource.Reference,
-	trustDomain string,
-	dc string,
-	defaultAllow bool,
-	proxyCfg *pbmesh.ProxyConfiguration,
-) *Builder {
-	return &Builder{
-		id:              id,
-		trustDomain:     trustDomain,
-		localDatacenter: dc,
-		defaultAllow:    defaultAllow,
-		proxyCfg:        proxyCfg,
-		proxyStateTemplate: &pbmesh.ProxyStateTemplate{
-			ProxyState: &pbmesh.ProxyState{
-				Identity:  identity,
-				Clusters:  make(map[string]*pbproxystate.Cluster),
-				Endpoints: make(map[string]*pbproxystate.Endpoints),
-				Routes:    make(map[string]*pbproxystate.Route),
-			},
-			RequiredEndpoints:        make(map[string]*pbproxystate.EndpointRef),
-			RequiredLeafCertificates: make(map[string]*pbproxystate.LeafCertificateRef),
-			RequiredTrustBundles:     make(map[string]*pbproxystate.TrustBundleRef),
-		},
-	}
-}
-
-func (b *Builder) Build() *pbmesh.ProxyStateTemplate {
-	workloadIdentity := b.proxyStateTemplate.ProxyState.Identity.Name
-	b.proxyStateTemplate.RequiredLeafCertificates[workloadIdentity] = &pbproxystate.LeafCertificateRef{
-		Name:      workloadIdentity,
-		Namespace: b.id.Tenancy.Namespace,
-		Partition: b.id.Tenancy.Partition,
-	}
-
-	b.proxyStateTemplate.RequiredTrustBundles[b.id.Tenancy.PeerName] = &pbproxystate.TrustBundleRef{
-		Peer: b.id.Tenancy.PeerName,
-	}
-
-	finalCleanupOfProxyStateTemplate(b.proxyStateTemplate)
-
-	return b.proxyStateTemplate
-}
-
-func finalCleanupOfProxyStateTemplate(pst *pbmesh.ProxyStateTemplate) {
-	if pst.ProxyState != nil {
-		// Ensure all clusters have names by duplicating them from the map
-		// if the above assembly code neglected any.
-		for name, cluster := range pst.ProxyState.Clusters {
-			if cluster.Name == "" && name != "" {
-				cluster.Name = name
-			}
-		}
-	}
-}
-
-type ListenerBuilder struct {
-	listener *pbproxystate.Listener
-	builder  *Builder
-}
-
-func (b *Builder) NewListenerBuilder(l *pbproxystate.Listener) *ListenerBuilder {
-	return &ListenerBuilder{
-		listener: l,
-		builder:  b,
-	}
-}
-
-func (l *ListenerBuilder) buildListener() {
-	l.builder.proxyStateTemplate.ProxyState.Listeners = append(l.builder.proxyStateTemplate.ProxyState.Listeners, l.listener)
-}
-
-type RouterBuilder struct {
-	router  *pbproxystate.Router
-	builder *ListenerBuilder
-}
-
-func (b *ListenerBuilder) NewRouterBuilder(r *pbproxystate.Router) *RouterBuilder {
-	return &RouterBuilder{
-		router:  r,
-		builder: b,
-	}
-}
-
-func (r *RouterBuilder) buildRouter() {
-	r.builder.listener.Routers = append(r.builder.listener.Routers, r.router)
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/builder_test.go b/internal/mesh/internal/controllers/sidecarproxy/builder/builder_test.go
deleted file mode 100644
index 4128fc0839505..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/builder_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package builder
-
-import (
-	"flag"
-	"os"
-	"testing"
-
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestMain(m *testing.M) {
-	flag.Parse()
-	os.Exit(m.Run())
-}
-
-func protoToJSON(t *testing.T, pb proto.Message) string {
-	return prototest.ProtoToJSON(t, pb)
-}
-
-func JSONToProxyTemplate(t *testing.T, json []byte) *pbmesh.ProxyStateTemplate {
-	t.Helper()
-	proxyTemplate := &pbmesh.ProxyStateTemplate{}
-	m := protojson.UnmarshalOptions{}
-	err := m.Unmarshal(json, proxyTemplate)
-	require.NoError(t, err)
-	return proxyTemplate
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/destination_builder.go b/internal/mesh/internal/controllers/sidecarproxy/builder/destination_builder.go
deleted file mode 100644
index 9bb2b1f612997..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/destination_builder.go
+++ /dev/null
@@ -1,696 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package builder
-
-import (
-	"fmt"
-	"github.com/hashicorp/consul/agent/xds/naming"
-	"time"
-
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-
-	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/mesh/internal/types/intermediate"
-	"github.com/hashicorp/consul/internal/protoutil"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// BuildDestinations creates listeners, routers, clusters, and endpointRefs for all destinations
-// and adds them to the proxyState.
-func (b *Builder) BuildDestinations(destinations []*intermediate.Destination) *Builder {
-	var lb *ListenerBuilder
-	if b.proxyCfg.IsTransparentProxy() {
-		lb = b.addTransparentProxyOutboundListener(b.proxyCfg.DynamicConfig.TransparentProxy.OutboundListenerPort)
-		lb.listener.DefaultRouter = lb.addL4RouterForDirect(naming.OriginalDestinationClusterName, fmt.Sprintf("upstream.%s", naming.OriginalDestinationClusterName)).router
-		b.addL4ClusterForDirect(naming.OriginalDestinationClusterName)
-	}
-
-	for _, destination := range destinations {
-		b.buildDestination(lb, destination)
-	}
-
-	if b.proxyCfg.IsTransparentProxy() {
-		lb.buildListener()
-	}
-
-	return b
-}
-
-func (b *Builder) buildDestination(
-	tproxyOutboundListenerBuilder *ListenerBuilder,
-	destination *intermediate.Destination,
-) *Builder {
-	var (
-		effectiveProtocol = destination.ComputedPortRoutes.Protocol
-		targets           = destination.ComputedPortRoutes.Targets
-	)
-
-	cpr := destination.ComputedPortRoutes
-
-	var lb *ListenerBuilder
-	if destination.Explicit != nil {
-		lb = b.addExplicitOutboundListener(destination.Explicit)
-	} else {
-		lb = tproxyOutboundListenerBuilder
-	}
-
-	// router matches based on destination ports should only occur on
-	// implicit destinations for explicit
-	var virtualPortNumber uint32
-	if destination.Explicit == nil {
-		for _, port := range destination.Service.Data.Ports {
-			if port.TargetPort == cpr.ParentRef.Port {
-				virtualPortNumber = port.VirtualPort
-			}
-		}
-	}
-
-	defaultDC := func(dc string) string {
-		if destination.Explicit != nil {
-			dc = orDefault(dc, destination.Explicit.Datacenter)
-		}
-		dc = orDefault(dc, b.localDatacenter)
-		if dc != b.localDatacenter {
-			panic("cross datacenter service discovery clusters are not supported in v2")
-		}
-		return dc
-	}
-
-	statPrefix := DestinationStatPrefix(
-		cpr.ParentRef.Ref,
-		cpr.ParentRef.Port,
-		defaultDC(""),
-	)
-
-	var (
-		useRDS                bool
-		needsNullRouteCluster bool
-	)
-	switch config := cpr.Config.(type) {
-	case *pbmesh.ComputedPortRoutes_Http:
-		// NOTE: this could be HTTP/HTTP2/GRPC
-		useRDS = true
-
-		route := config.Http
-
-		listenerName := lb.listener.Name
-
-		// this corresponds to roughly "makeUpstreamRouteForDiscoveryChain"
-
-		var proxyRouteRules []*pbproxystate.RouteRule
-		for _, routeRule := range route.Rules {
-			for _, backendRef := range routeRule.BackendRefs {
-				if backendRef.BackendTarget == types.NullRouteBackend {
-					needsNullRouteCluster = true
-				}
-			}
-			destConfig := b.makeDestinationConfiguration(routeRule.Timeouts, routeRule.Retries)
-			headerMutations := applyRouteFilters(destConfig, routeRule.Filters)
-			applyLoadBalancerPolicy(destConfig, cpr, routeRule.BackendRefs)
-
-			dest := b.makeHTTPRouteDestination(
-				routeRule.BackendRefs,
-				destConfig,
-				targets,
-				defaultDC,
-			)
-
-			// Explode out by matches
-			for _, match := range routeRule.Matches {
-				routeMatch := makeHTTPRouteMatch(match)
-
-				proxyRouteRules = append(proxyRouteRules, &pbproxystate.RouteRule{
-					Match:           routeMatch,
-					Destination:     protoutil.Clone(dest),
-					HeaderMutations: protoutil.CloneSlice(headerMutations),
-				})
-			}
-		}
-
-		b.addRoute(listenerName, &pbproxystate.Route{
-			VirtualHosts: []*pbproxystate.VirtualHost{{
-				Name:       listenerName,
-				RouteRules: proxyRouteRules,
-			}},
-		})
-
-	case *pbmesh.ComputedPortRoutes_Grpc:
-		useRDS = true
-		route := config.Grpc
-
-		listenerName := lb.listener.Name
-
-		var proxyRouteRules []*pbproxystate.RouteRule
-		for _, routeRule := range route.Rules {
-			for _, backendRef := range routeRule.BackendRefs {
-				if backendRef.BackendTarget == types.NullRouteBackend {
-					needsNullRouteCluster = true
-				}
-			}
-			destConfig := b.makeDestinationConfiguration(routeRule.Timeouts, routeRule.Retries)
-			headerMutations := applyRouteFilters(destConfig, routeRule.Filters)
-			applyLoadBalancerPolicy(destConfig, cpr, routeRule.BackendRefs)
-
-			// nolint:staticcheck
-			dest := b.makeGRPCRouteDestination(
-				routeRule.BackendRefs,
-				destConfig,
-				targets,
-				defaultDC,
-			)
-
-			// Explode out by matches
-			for _, match := range routeRule.Matches {
-				routeMatch := makeGRPCRouteMatch(match)
-
-				proxyRouteRules = append(proxyRouteRules, &pbproxystate.RouteRule{
-					Match:           routeMatch,
-					Destination:     protoutil.Clone(dest),
-					HeaderMutations: protoutil.CloneSlice(headerMutations),
-				})
-			}
-		}
-
-		b.addRoute(listenerName, &pbproxystate.Route{
-			VirtualHosts: []*pbproxystate.VirtualHost{{
-				Name:       listenerName,
-				RouteRules: proxyRouteRules,
-			}},
-		})
-
-	case *pbmesh.ComputedPortRoutes_Tcp:
-		route := config.Tcp
-		useRDS = false
-
-		if len(route.Rules) != 1 {
-			panic("not possible due to validation and computation")
-		}
-
-		// When not using RDS we must generate a cluster name to attach to
-		// the filter chain. With RDS, cluster names get attached to the
-		// dynamic routes instead.
-
-		routeRule := route.Rules[0]
-
-		for _, backendRef := range routeRule.BackendRefs {
-			if backendRef.BackendTarget == types.NullRouteBackend {
-				needsNullRouteCluster = true
-			}
-		}
-
-		switch len(routeRule.BackendRefs) {
-		case 0:
-			panic("not possible to have a tcp route rule with no backend refs")
-		case 1:
-			tcpBackendRef := routeRule.BackendRefs[0]
-
-			clusterName := b.backendTargetToClusterName(tcpBackendRef.BackendTarget, targets, defaultDC)
-
-			rb := lb.addL4RouterForDirect(clusterName, statPrefix)
-			if destination.Explicit == nil {
-				rb.addIPAndPortMatch(destination.VirtualIPs, virtualPortNumber)
-			}
-			rb.buildRouter()
-		default:
-			clusters := make([]*pbproxystate.L4WeightedDestinationCluster, 0, len(routeRule.BackendRefs))
-			for _, tcpBackendRef := range routeRule.BackendRefs {
-				clusterName := b.backendTargetToClusterName(tcpBackendRef.BackendTarget, targets, defaultDC)
-
-				clusters = append(clusters, &pbproxystate.L4WeightedDestinationCluster{
-					Name:   clusterName,
-					Weight: wrapperspb.UInt32(tcpBackendRef.Weight),
-				})
-			}
-
-			rb := lb.addL4RouterForSplit(clusters, statPrefix)
-			if destination.Explicit == nil {
-				rb.addIPAndPortMatch(destination.VirtualIPs, virtualPortNumber)
-			}
-			rb.buildRouter()
-		}
-	}
-
-	if useRDS {
-		if !isProtocolHTTPLike(effectiveProtocol) {
-			panic(fmt.Sprintf("it should not be possible to have a tcp protocol here: %v", effectiveProtocol))
-		}
-
-		rb := lb.addL7Router("", effectiveProtocol)
-		if destination.Explicit == nil {
-			rb.addIPAndPortMatch(destination.VirtualIPs, virtualPortNumber)
-		}
-		rb.buildRouter()
-	} else {
-		if isProtocolHTTPLike(effectiveProtocol) {
-			panic(fmt.Sprintf("it should not be possible to have an http-like protocol here: %v", effectiveProtocol))
-		}
-	}
-
-	// Build outbound listener if the destination is explicit.
-	if destination.Explicit != nil {
-		lb.buildListener()
-	}
-
-	if needsNullRouteCluster {
-		b.addNullRouteCluster()
-	}
-
-	for _, details := range targets {
-		// NOTE: we only emit clusters for DIRECT targets here. The others will
-		// be folded into one or more aggregate clusters somehow.
-		if details.Type != pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT {
-			continue
-		}
-
-		connectTimeout := details.DestinationConfig.ConnectTimeout
-		loadBalancer := details.DestinationConfig.LoadBalancer
-
-		// NOTE: we collect both DIRECT and INDIRECT target information here.
-		dc := defaultDC(details.BackendRef.Datacenter)
-		portName := details.BackendRef.Port
-
-		sni := DestinationSNI(
-			details.BackendRef.Ref,
-			dc,
-			b.trustDomain,
-		)
-		clusterName := fmt.Sprintf("%s.%s", portName, sni)
-
-		egBase := b.newClusterEndpointGroup("", sni, portName, details.IdentityRefs, connectTimeout, loadBalancer)
-
-		var endpointGroups []*pbproxystate.EndpointGroup
-
-		// Original target is the first (or only) target.
-		endpointGroups = append(endpointGroups, egBase)
-		b.addEndpointsRef(clusterName, details.ServiceEndpointsId, details.MeshPort)
-
-		if details.FailoverConfig != nil {
-			failover := details.FailoverConfig
-			// TODO(v2): handle other forms of failover (regions/locality/etc)
-
-			for i, dest := range failover.Destinations {
-				if dest.BackendTarget == types.NullRouteBackend {
-					continue // not possible
-				}
-				destDetails, ok := targets[dest.BackendTarget]
-				if !ok {
-					continue // not possible
-				}
-
-				destConnectTimeout := destDetails.DestinationConfig.ConnectTimeout
-				destLoadBalancer := destDetails.DestinationConfig.LoadBalancer
-
-				destDC := defaultDC(destDetails.BackendRef.Datacenter)
-				destPortName := destDetails.BackendRef.Port
-
-				destSNI := DestinationSNI(
-					destDetails.BackendRef.Ref,
-					destDC,
-					b.trustDomain,
-				)
-				destClusterName := fmt.Sprintf("%s%d~%s", xdscommon.FailoverClusterNamePrefix, i, clusterName)
-
-				egDest := b.newClusterEndpointGroup(destClusterName, destSNI, destPortName, destDetails.IdentityRefs, destConnectTimeout, destLoadBalancer)
-
-				endpointGroups = append(endpointGroups, egDest)
-				b.addEndpointsRef(destClusterName, destDetails.ServiceEndpointsId, destDetails.MeshPort)
-			}
-		}
-
-		b.addCluster(clusterName, endpointGroups, connectTimeout)
-	}
-
-	return b
-}
-
-const NullRouteClusterName = "null_route_cluster"
-
-func (b *Builder) addNullRouteCluster() *Builder {
-	cluster := &pbproxystate.Cluster{
-		Name: NullRouteClusterName,
-		Group: &pbproxystate.Cluster_EndpointGroup{
-			EndpointGroup: &pbproxystate.EndpointGroup{
-				Group: &pbproxystate.EndpointGroup_Static{
-					Static: &pbproxystate.StaticEndpointGroup{
-						Config: &pbproxystate.StaticEndpointGroupConfig{
-							ConnectTimeout: durationpb.New(10 * time.Second),
-						},
-					},
-				},
-			},
-		},
-	}
-
-	b.proxyStateTemplate.ProxyState.Clusters[cluster.Name] = cluster
-	return b
-}
-
-func (b *ListenerBuilder) addL4RouterForDirect(clusterName, statPrefix string) *RouterBuilder {
-	// For explicit destinations, we have no filter chain match, and filters
-	// are based on port protocol.
-	router := &pbproxystate.Router{}
-
-	if statPrefix == "" {
-		statPrefix = "upstream."
-	}
-
-	router.Destination = &pbproxystate.Router_L4{
-		L4: &pbproxystate.L4Destination{
-			Destination: &pbproxystate.L4Destination_Cluster{
-				Cluster: &pbproxystate.DestinationCluster{
-					Name: clusterName,
-				},
-			},
-			StatPrefix: statPrefix,
-		},
-	}
-
-	return b.NewRouterBuilder(router)
-}
-
-func (b *Builder) addL4ClusterForDirect(clusterName string) *Builder {
-	cluster := &pbproxystate.Cluster{
-		Name: clusterName,
-		Group: &pbproxystate.Cluster_EndpointGroup{
-			EndpointGroup: &pbproxystate.EndpointGroup{
-				Group: &pbproxystate.EndpointGroup_Passthrough{
-					Passthrough: &pbproxystate.PassthroughEndpointGroup{
-						Config: &pbproxystate.PassthroughEndpointGroupConfig{
-							ConnectTimeout: durationpb.New(5 * time.Second),
-						},
-					},
-				},
-			},
-		},
-	}
-
-	b.proxyStateTemplate.ProxyState.Clusters[cluster.Name] = cluster
-	return b
-}
-
-func (b *ListenerBuilder) addL4RouterForSplit(
-	clusters []*pbproxystate.L4WeightedDestinationCluster,
-	statPrefix string,
-) *RouterBuilder {
-	// For explicit destinations, we have no filter chain match, and filters
-	// are based on port protocol.
-	router := &pbproxystate.Router{}
-
-	if statPrefix == "" {
-		statPrefix = "upstream."
-	}
-
-	router.Destination = &pbproxystate.Router_L4{
-		L4: &pbproxystate.L4Destination{
-			Destination: &pbproxystate.L4Destination_WeightedClusters{
-				WeightedClusters: &pbproxystate.L4WeightedClusterGroup{
-					Clusters: clusters,
-				},
-			},
-			StatPrefix: statPrefix,
-			// TODO(rb/v2): can we use RDS for TCPRoute split?
-		},
-	}
-
-	return b.NewRouterBuilder(router)
-}
-
-func (b *ListenerBuilder) addL7Router(statPrefix string, protocol pbcatalog.Protocol) *RouterBuilder {
-	// For explicit destinations, we have no filter chain match, and filters
-	// are based on port protocol.
-	router := &pbproxystate.Router{}
-
-	listenerName := b.listener.Name
-	if listenerName == "" {
-		panic("listenerName is required")
-	}
-
-	if statPrefix == "" {
-		statPrefix = "upstream."
-	}
-
-	if !isProtocolHTTPLike(protocol) {
-		panic(fmt.Sprintf("unexpected protocol: %v", protocol))
-	}
-
-	router.Destination = &pbproxystate.Router_L7{
-		L7: &pbproxystate.L7Destination{
-			Name:        listenerName,
-			StatPrefix:  statPrefix,
-			StaticRoute: false,
-		},
-	}
-
-	return b.NewRouterBuilder(router)
-}
-
-// addExplicitOutboundListener creates an outbound listener for an explicit destination.
-func (b *Builder) addExplicitOutboundListener(explicit *pbmesh.Destination) *ListenerBuilder {
-	listener := makeExplicitListener(explicit, pbproxystate.Direction_DIRECTION_OUTBOUND)
-
-	return b.NewListenerBuilder(listener)
-}
-
-func makeExplicitListener(explicit *pbmesh.Destination, direction pbproxystate.Direction) *pbproxystate.Listener {
-	if explicit == nil {
-		panic("explicit upstream required")
-	}
-
-	listener := &pbproxystate.Listener{
-		Direction: direction,
-	}
-
-	// TODO(v2): access logs, connection balancing
-
-	// Create outbound listener address.
-	switch explicit.ListenAddr.(type) {
-	case *pbmesh.Destination_IpPort:
-		destinationAddr := explicit.ListenAddr.(*pbmesh.Destination_IpPort)
-		listener.BindAddress = &pbproxystate.Listener_HostPort{
-			HostPort: &pbproxystate.HostPortAddress{
-				Host: destinationAddr.IpPort.Ip,
-				Port: destinationAddr.IpPort.Port,
-			},
-		}
-		listener.Name = DestinationListenerName(explicit.DestinationRef.Name, explicit.DestinationPort, destinationAddr.IpPort.Ip, destinationAddr.IpPort.Port)
-	case *pbmesh.Destination_Unix:
-		destinationAddr := explicit.ListenAddr.(*pbmesh.Destination_Unix)
-		listener.BindAddress = &pbproxystate.Listener_UnixSocket{
-			UnixSocket: &pbproxystate.UnixSocketAddress{
-				Path: destinationAddr.Unix.Path,
-				Mode: destinationAddr.Unix.Mode,
-			},
-		}
-		listener.Name = DestinationListenerName(explicit.DestinationRef.Name, explicit.DestinationPort, destinationAddr.Unix.Path, 0)
-	}
-
-	return listener
-}
-
-// addTransparentProxyOutboundListener creates an outbound listener for transparent proxy mode.
-func (b *Builder) addTransparentProxyOutboundListener(port uint32) *ListenerBuilder {
-	listener := &pbproxystate.Listener{
-		Name:      xdscommon.OutboundListenerName,
-		Direction: pbproxystate.Direction_DIRECTION_OUTBOUND,
-		BindAddress: &pbproxystate.Listener_HostPort{
-			HostPort: &pbproxystate.HostPortAddress{
-				Host: "127.0.0.1",
-				Port: port,
-			},
-		},
-		Capabilities: []pbproxystate.Capability{pbproxystate.Capability_CAPABILITY_TRANSPARENT},
-	}
-
-	return b.NewListenerBuilder(listener)
-}
-
-func isProtocolHTTPLike(protocol pbcatalog.Protocol) bool {
-	// enumcover:pbcatalog.Protocol
-	switch protocol {
-	case pbcatalog.Protocol_PROTOCOL_TCP:
-		return false
-	case pbcatalog.Protocol_PROTOCOL_HTTP2,
-		pbcatalog.Protocol_PROTOCOL_HTTP,
-		pbcatalog.Protocol_PROTOCOL_GRPC:
-		return true
-	case pbcatalog.Protocol_PROTOCOL_MESH:
-		fallthrough // to default
-	case pbcatalog.Protocol_PROTOCOL_UNSPECIFIED:
-		fallthrough // to default
-	default:
-		return false
-	}
-}
-
-func (b *RouterBuilder) addIPMatch(vips []string) *RouterBuilder {
-	return b.addIPAndPortMatch(vips, 0)
-}
-
-func (b *RouterBuilder) addIPAndPortMatch(vips []string, virtualPort uint32) *RouterBuilder {
-	b.router.Match = makeRouterMatchForIPAndPort(vips, virtualPort)
-	return b
-}
-
-func makeRouterMatchForIPAndPort(vips []string, virtualPort uint32) *pbproxystate.Match {
-	match := &pbproxystate.Match{}
-	for _, vip := range vips {
-		match.PrefixRanges = append(match.PrefixRanges, &pbproxystate.CidrRange{
-			AddressPrefix: vip,
-			PrefixLen:     &wrapperspb.UInt32Value{Value: 32},
-		})
-
-		if virtualPort > 0 {
-			match.DestinationPort = &wrapperspb.UInt32Value{Value: virtualPort}
-		}
-	}
-	return match
-}
-
-// addCluster creates and adds a cluster to the proxyState based on the destination.
-func (b *Builder) addCluster(
-	clusterName string,
-	endpointGroups []*pbproxystate.EndpointGroup,
-	connectTimeout *durationpb.Duration,
-) {
-	cluster := &pbproxystate.Cluster{
-		Name:        clusterName,
-		AltStatName: clusterName,
-	}
-	switch len(endpointGroups) {
-	case 0:
-		panic("no endpoint groups provided")
-	case 1:
-		cluster.Group = &pbproxystate.Cluster_EndpointGroup{
-			EndpointGroup: endpointGroups[0],
-		}
-	default:
-		cluster.Group = &pbproxystate.Cluster_FailoverGroup{
-			FailoverGroup: &pbproxystate.FailoverGroup{
-				EndpointGroups: endpointGroups,
-				Config: &pbproxystate.FailoverGroupConfig{
-					UseAltStatName: true,
-					ConnectTimeout: connectTimeout,
-				},
-			},
-		}
-	}
-
-	b.proxyStateTemplate.ProxyState.Clusters[cluster.Name] = cluster
-}
-
-func (b *Builder) newClusterEndpointGroup(
-	clusterName string,
-	sni string,
-	portName string,
-	destinationIdentities []*pbresource.Reference,
-	connectTimeout *durationpb.Duration,
-	loadBalancer *pbmesh.LoadBalancer,
-) *pbproxystate.EndpointGroup {
-	var spiffeIDs []string
-	for _, identity := range destinationIdentities {
-		spiffeIDs = append(spiffeIDs, connect.SpiffeIDFromIdentityRef(b.trustDomain, identity))
-	}
-
-	// TODO(v2): DestinationPolicy: circuit breakers, outlier detection
-
-	// TODO(v2): if http2/grpc then set http2protocol options
-
-	degConfig := &pbproxystate.DynamicEndpointGroupConfig{
-		DisablePanicThreshold: true,
-		ConnectTimeout:        connectTimeout,
-	}
-
-	if loadBalancer != nil {
-		// enumcover:pbmesh.LoadBalancerPolicy
-		switch loadBalancer.Policy {
-		case pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_RANDOM:
-			degConfig.LbPolicy = &pbproxystate.DynamicEndpointGroupConfig_Random{}
-
-		case pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_ROUND_ROBIN:
-			degConfig.LbPolicy = &pbproxystate.DynamicEndpointGroupConfig_RoundRobin{}
-
-		case pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_LEAST_REQUEST:
-			var choiceCount uint32
-			cfg, ok := loadBalancer.Config.(*pbmesh.LoadBalancer_LeastRequestConfig)
-			if ok {
-				choiceCount = cfg.LeastRequestConfig.GetChoiceCount()
-			}
-			degConfig.LbPolicy = &pbproxystate.DynamicEndpointGroupConfig_LeastRequest{
-				LeastRequest: &pbproxystate.LBPolicyLeastRequest{
-					ChoiceCount: wrapperspb.UInt32(choiceCount),
-				},
-			}
-
-		case pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_MAGLEV:
-			degConfig.LbPolicy = &pbproxystate.DynamicEndpointGroupConfig_Maglev{}
-
-		case pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_RING_HASH:
-			policy := &pbproxystate.DynamicEndpointGroupConfig_RingHash{}
-
-			cfg, ok := loadBalancer.Config.(*pbmesh.LoadBalancer_RingHashConfig)
-			if ok {
-				policy.RingHash = &pbproxystate.LBPolicyRingHash{
-					MinimumRingSize: wrapperspb.UInt64(cfg.RingHashConfig.MinimumRingSize),
-					MaximumRingSize: wrapperspb.UInt64(cfg.RingHashConfig.MaximumRingSize),
-				}
-			}
-
-			degConfig.LbPolicy = policy
-
-		case pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_UNSPECIFIED:
-			// fallthrough to default
-		default:
-			// do nothing
-		}
-	}
-
-	return &pbproxystate.EndpointGroup{
-		Name: clusterName,
-		Group: &pbproxystate.EndpointGroup_Dynamic{
-			Dynamic: &pbproxystate.DynamicEndpointGroup{
-				Config: degConfig,
-				OutboundTls: &pbproxystate.TransportSocket{
-					ConnectionTls: &pbproxystate.TransportSocket_OutboundMesh{
-						OutboundMesh: &pbproxystate.OutboundMeshMTLS{
-							IdentityKey: b.proxyStateTemplate.ProxyState.Identity.Name,
-							ValidationContext: &pbproxystate.MeshOutboundValidationContext{
-								SpiffeIds:              spiffeIDs,
-								TrustBundlePeerNameKey: b.id.Tenancy.PeerName,
-							},
-							Sni: sni,
-						},
-					},
-					AlpnProtocols: []string{getAlpnProtocolFromPortName(portName)},
-				},
-			},
-		},
-	}
-}
-
-func (b *Builder) addRoute(listenerName string, route *pbproxystate.Route) {
-	b.proxyStateTemplate.ProxyState.Routes[listenerName] = route
-}
-
-// addEndpointsRef creates and add an endpointRef for each serviceEndpoint for a destination and
-// adds it to the proxyStateTemplate so it will be processed later during reconciliation by
-// the XDS controller.
-func (b *Builder) addEndpointsRef(clusterName string, serviceEndpointsID *pbresource.ID, destinationPort string) {
-	b.proxyStateTemplate.RequiredEndpoints[clusterName] = &pbproxystate.EndpointRef{
-		Id:   serviceEndpointsID,
-		Port: destinationPort,
-	}
-}
-
-func orDefault(v, def string) string {
-	if v != "" {
-		return v
-	}
-	return def
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/destination_builder_multiport_test.go b/internal/mesh/internal/controllers/sidecarproxy/builder/destination_builder_multiport_test.go
deleted file mode 100644
index 2f57d667137dc..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/destination_builder_multiport_test.go
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package builder
-
-import (
-	"fmt"
-	"sort"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes/routestest"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/mesh/internal/types/intermediate"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	"github.com/hashicorp/consul/internal/testing/golden"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func TestBuildMultiportImplicitDestinations(t *testing.T) {
-	// TODO(rb/v2): add a fetchertest package to construct implicit upstreams
-	// correctly from inputs. the following is far too manual and error prone
-	// to be an accurate representation of what implicit upstreams look like.
-	const (
-		apiApp      = "api-app"
-		apiApp2     = "api-app2"
-		trustDomain = "foo.consul"
-		datacenter  = "dc1"
-	)
-	proxyCfg := &pbmesh.ProxyConfiguration{
-		DynamicConfig: &pbmesh.DynamicConfig{
-			Mode: pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
-			TransparentProxy: &pbmesh.TransparentProxy{
-				OutboundListenerPort: 15001,
-			},
-		},
-	}
-
-	multiportEndpointsData := &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "10.0.0.1"},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"admin-port": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"api-port":   {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"mesh":       {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			},
-		},
-	}
-	apiAppService := resourcetest.Resource(pbcatalog.ServiceType, apiApp).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, serviceData).
-		Build()
-
-	apiApp2Service := resourcetest.Resource(pbcatalog.ServiceType, apiApp2).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, serviceData).
-		Build()
-
-	apiAppEndpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, apiApp).
-		WithOwner(apiAppService.Id).
-		WithData(t, multiportEndpointsData).
-		WithTenancy(resource.DefaultNamespacedTenancy()).Build()
-
-	apiApp2Endpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, apiApp2).
-		WithOwner(apiApp2Service.Id).
-		WithData(t, multiportEndpointsData).
-		WithTenancy(resource.DefaultNamespacedTenancy()).Build()
-
-	mwEndpointsData := &pbcatalog.ServiceEndpoints{ // variant on apiAppEndpoints
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "10.0.0.1"},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"admin-port": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"api-port":   {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"mesh":       {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			},
-			{
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "10.0.0.2"},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"admin-port": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"api-port":   {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"mesh":       {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			},
-		},
-	}
-	mwEndpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, apiApp).
-		WithOwner(apiAppService.Id).
-		WithData(t, mwEndpointsData).
-		WithTenancy(resource.DefaultNamespacedTenancy()).Build()
-
-	apiAppIdentity := &pbresource.Reference{
-		Name:    fmt.Sprintf("%s-identity", apiApp),
-		Tenancy: apiAppEndpoints.Id.Tenancy,
-	}
-
-	apiApp2Identity := &pbresource.Reference{
-		Name:    fmt.Sprintf("%s-identity", apiApp2),
-		Tenancy: apiApp2Endpoints.Id.Tenancy,
-	}
-
-	apiAppComputedRoutesID := resource.ReplaceType(pbmesh.ComputedRoutesType, apiAppService.Id)
-	apiAppComputedRoutes := routestest.BuildComputedRoutes(t, apiAppComputedRoutesID,
-		resourcetest.MustDecode[*pbcatalog.Service](t, apiAppService),
-	)
-	require.NotNil(t, apiAppComputedRoutes)
-
-	apiApp2ComputedRoutesID := resource.ReplaceType(pbmesh.ComputedRoutesType, apiApp2Service.Id)
-	apiApp2ComputedRoutes := routestest.BuildComputedRoutes(t, apiApp2ComputedRoutesID,
-		resourcetest.MustDecode[*pbcatalog.Service](t, apiApp2Service),
-	)
-	require.NotNil(t, apiApp2ComputedRoutes)
-
-	newImplicitDestination := func(
-		svc *pbresource.Resource,
-		endpoints *pbresource.Resource,
-		computedRoutes *types.DecodedComputedRoutes,
-		identities []*pbresource.Reference,
-		virtualIPs []string,
-	) []*intermediate.Destination {
-		svcDec := resourcetest.MustDecode[*pbcatalog.Service](t, svc)
-		seDec := resourcetest.MustDecode[*pbcatalog.ServiceEndpoints](t, endpoints)
-
-		var out []*intermediate.Destination
-		for _, port := range svcDec.Data.Ports {
-			portName := port.TargetPort
-			if port.Protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-				continue
-			}
-
-			dest := &intermediate.Destination{
-				Service: svcDec,
-				ComputedPortRoutes: routestest.MutateTargets(t, computedRoutes.Data, portName, func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-					switch {
-					case resource.ReferenceOrIDMatch(svc.Id, details.BackendRef.Ref) && details.BackendRef.Port == portName:
-						details.ServiceEndpointsId = endpoints.Id
-						details.ServiceEndpoints = seDec.Data
-						details.IdentityRefs = identities
-					}
-				}),
-				VirtualIPs: virtualIPs,
-			}
-			out = append(out, dest)
-		}
-		return out
-	}
-
-	apiAppDestinations := newImplicitDestination(
-		apiAppService,
-		apiAppEndpoints,
-		apiAppComputedRoutes,
-		[]*pbresource.Reference{apiAppIdentity},
-		[]string{"1.1.1.1"},
-	)
-
-	apiApp2Destinations := newImplicitDestination(
-		apiApp2Service,
-		apiApp2Endpoints,
-		apiApp2ComputedRoutes,
-		[]*pbresource.Reference{apiApp2Identity},
-		[]string{"2.2.2.2", "3.3.3.3"},
-	)
-
-	mwDestinations := newImplicitDestination(
-		apiAppService,
-		mwEndpoints,
-		apiAppComputedRoutes,
-		[]*pbresource.Reference{apiAppIdentity},
-		[]string{"1.1.1.1"},
-	)
-
-	twoImplicitDestinations := append(
-		append([]*intermediate.Destination{}, apiAppDestinations...),
-		apiApp2Destinations...,
-	)
-
-	cases := map[string]struct {
-		getDestinations func() []*intermediate.Destination
-	}{
-		// Most basic test that multiport configuration works
-		"destination/multiport-l4-single-implicit-destination-tproxy": {
-			getDestinations: func() []*intermediate.Destination { return apiAppDestinations },
-		},
-		// Test shows that with multiple workloads for a service exposing the same ports, the routers
-		// and clusters do not get duplicated.
-		"destination/multiport-l4-single-implicit-destination-with-multiple-workloads-tproxy": {
-			getDestinations: func() []*intermediate.Destination { return mwDestinations },
-		},
-		// Test shows that with multiple workloads for a service exposing the same ports, the routers
-		// and clusters do not get duplicated.
-		"destination/multiport-l4-multiple-implicit-destinations-tproxy": {
-			getDestinations: func() []*intermediate.Destination { return twoImplicitDestinations },
-		},
-	}
-
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			proxyTmpl := New(testProxyStateTemplateID(), testIdentityRef(), trustDomain, datacenter, false, proxyCfg).
-				BuildDestinations(c.getDestinations()).
-				Build()
-
-			// sort routers because of test flakes where order was flip flopping.
-			actualRouters := proxyTmpl.ProxyState.Listeners[0].Routers
-			sort.Slice(actualRouters, func(i, j int) bool {
-				return actualRouters[i].String() < actualRouters[j].String()
-			})
-
-			actual := protoToJSON(t, proxyTmpl)
-			expected := JSONToProxyTemplate(t, golden.GetBytes(t, actual, name+".golden"))
-
-			// sort routers on listener from golden file
-			expectedRouters := expected.ProxyState.Listeners[0].Routers
-			sort.Slice(expectedRouters, func(i, j int) bool {
-				return expectedRouters[i].String() < expectedRouters[j].String()
-			})
-
-			// convert back to json after sorting so that test output does not contain extraneous fields.
-			require.Equal(t, protoToJSON(t, expected), protoToJSON(t, proxyTmpl))
-		})
-	}
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/destination_builder_test.go b/internal/mesh/internal/controllers/sidecarproxy/builder/destination_builder_test.go
deleted file mode 100644
index 1bbb520d82007..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/destination_builder_test.go
+++ /dev/null
@@ -1,581 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package builder
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes/routestest"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/mesh/internal/types/intermediate"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	"github.com/hashicorp/consul/internal/testing/golden"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-var (
-	endpointsData = &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{Host: "10.0.0.1"},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"tcp":  {Port: 7070, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"tcp2": {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					"mesh": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			},
-		},
-	}
-
-	serviceData = &pbcatalog.Service{
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort:  "tcp",
-				VirtualPort: 7070,
-				Protocol:    pbcatalog.Protocol_PROTOCOL_TCP,
-			},
-			{
-				TargetPort:  "tcp2",
-				VirtualPort: 8081,
-				Protocol:    pbcatalog.Protocol_PROTOCOL_TCP,
-			},
-			{
-				TargetPort:  "http",
-				VirtualPort: 8080,
-				Protocol:    pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-			{
-				TargetPort:  "mesh",
-				VirtualPort: 20000,
-				Protocol:    pbcatalog.Protocol_PROTOCOL_MESH,
-			},
-		},
-	}
-)
-
-func TestBuildExplicitDestinations(t *testing.T) {
-	registry := resource.NewRegistry()
-	types.Register(registry)
-	catalog.RegisterTypes(registry)
-
-	api1Service := resourcetest.Resource(pbcatalog.ServiceType, "api-1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, serviceData).
-		Build()
-
-	api2Service := resourcetest.Resource(pbcatalog.ServiceType, "api-2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, serviceData).
-		Build()
-
-	api3Service := resourcetest.Resource(pbcatalog.ServiceType, "api-3").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, serviceData).
-		Build()
-
-	backup1Service := resourcetest.Resource(pbcatalog.ServiceType, "backup-1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, serviceData).
-		Build()
-
-	for _, res := range []*pbresource.Resource{
-		api1Service, api2Service, api3Service, backup1Service,
-	} {
-		resourcetest.ValidateAndNormalize(t, registry, res)
-	}
-
-	api1Endpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, endpointsData).
-		Build()
-
-	api2Endpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, endpointsData).
-		Build()
-
-	backup1Endpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "backup-1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, endpointsData).
-		Build()
-
-	for _, res := range []*pbresource.Resource{
-		api1Endpoints, api2Endpoints, backup1Endpoints,
-	} {
-		resourcetest.ValidateAndNormalize(t, registry, res)
-	}
-
-	api1Identity := &pbresource.Reference{
-		Name:    "api1-identity",
-		Tenancy: api1Endpoints.Id.Tenancy,
-	}
-
-	api2Identity := &pbresource.Reference{
-		Name:    "api2-identity",
-		Tenancy: api2Endpoints.Id.Tenancy,
-	}
-
-	backup1Identity := &pbresource.Reference{
-		Name:    "backup1-identity",
-		Tenancy: backup1Endpoints.Id.Tenancy,
-	}
-
-	api1DestPolicy := resourcetest.Resource(pbmesh.DestinationPolicyType, api1Service.Id.Name).
-		WithTenancy(api1Service.Id.GetTenancy()).
-		WithData(t, &pbmesh.DestinationPolicy{
-			PortConfigs: map[string]*pbmesh.DestinationConfig{
-				"http": {
-					ConnectTimeout: durationpb.New(55 * time.Second),
-					RequestTimeout: durationpb.New(77 * time.Second),
-					// LoadBalancer *LoadBalancer `protobuf:"bytes,3,opt,name=load_balancer,json=loadBalancer,proto3" json:"load_balancer,omitempty"`
-				},
-			},
-		}).
-		Build()
-
-	api1HTTPRoute := resourcetest.Resource(pbmesh.HTTPRouteType, "api-1-http-route").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{{
-				Ref:  resource.Reference(api1Service.Id, ""),
-				Port: "http",
-			}},
-			Rules: []*pbmesh.HTTPRouteRule{
-				{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-							Value: "/split",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{
-						{
-							BackendRef: &pbmesh.BackendReference{
-								Ref: resource.Reference(api2Service.Id, ""),
-							},
-							Weight: 60,
-						},
-						{
-							BackendRef: &pbmesh.BackendReference{
-								Ref: resource.Reference(api1Service.Id, ""),
-							},
-							Weight: 40,
-						},
-						{
-							BackendRef: &pbmesh.BackendReference{
-								Ref: resource.Reference(api3Service.Id, ""),
-							},
-							Weight: 10,
-						},
-					},
-				},
-				{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-							Value: "/",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: &pbmesh.BackendReference{
-							Ref: resource.Reference(api1Service.Id, ""),
-						},
-					}},
-					Timeouts: &pbmesh.HTTPRouteTimeouts{
-						Request: durationpb.New(606 * time.Second), // differnet than the 77s
-					},
-					Retries: &pbmesh.HTTPRouteRetries{
-						Number:           wrapperspb.UInt32(4),
-						OnConnectFailure: true,
-					},
-				},
-			},
-		}).
-		Build()
-	resourcetest.ValidateAndNormalize(t, registry, api1HTTPRoute)
-
-	api1FailoverPolicy := resourcetest.Resource(pbcatalog.FailoverPolicyType, "api-1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.FailoverPolicy{
-			PortConfigs: map[string]*pbcatalog.FailoverConfig{
-				"http": {
-					Destinations: []*pbcatalog.FailoverDestination{{
-						Ref:  resource.Reference(backup1Service.Id, ""),
-						Port: "http",
-					}},
-				},
-			},
-		}).
-		Build()
-	resourcetest.ValidateAndNormalize(t, registry, api1FailoverPolicy)
-
-	api1TCPRoute := resourcetest.Resource(pbmesh.TCPRouteType, "api-1-tcp-route").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbmesh.TCPRoute{
-			ParentRefs: []*pbmesh.ParentReference{{
-				Ref:  resource.Reference(api1Service.Id, ""),
-				Port: "tcp",
-			}},
-			Rules: []*pbmesh.TCPRouteRule{{
-				BackendRefs: []*pbmesh.TCPBackendRef{
-					{
-						BackendRef: &pbmesh.BackendReference{
-							Ref: resource.Reference(api2Service.Id, ""),
-						},
-						Weight: 60,
-					},
-					{
-						BackendRef: &pbmesh.BackendReference{
-							Ref: resource.Reference(api1Service.Id, ""),
-						},
-						Weight: 40,
-					},
-					{
-						BackendRef: &pbmesh.BackendReference{
-							Ref: resource.Reference(api3Service.Id, ""),
-						},
-						Weight: 10,
-					},
-				},
-			}},
-		}).
-		Build()
-	resourcetest.ValidateAndNormalize(t, registry, api1TCPRoute)
-
-	api1TCP2Route := resourcetest.Resource(pbmesh.TCPRouteType, "api-1-tcp2-route").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbmesh.TCPRoute{
-			ParentRefs: []*pbmesh.ParentReference{{
-				Ref:  resource.Reference(api1Service.Id, ""),
-				Port: "tcp2",
-			}},
-			Rules: []*pbmesh.TCPRouteRule{{
-				BackendRefs: []*pbmesh.TCPBackendRef{
-					{
-						BackendRef: &pbmesh.BackendReference{
-							Ref: resource.Reference(api2Service.Id, ""),
-						},
-						Weight: 60,
-					},
-					{
-						BackendRef: &pbmesh.BackendReference{
-							Ref: resource.Reference(api1Service.Id, ""),
-						},
-						Weight: 40,
-					},
-					{
-						BackendRef: &pbmesh.BackendReference{
-							Ref: resource.Reference(api3Service.Id, ""),
-						},
-						Weight: 10,
-					},
-				},
-			}},
-		}).
-		Build()
-
-	api1ComputedRoutesID := resource.ReplaceType(pbmesh.ComputedRoutesType, api1Service.Id)
-	api1ComputedRoutes := routestest.BuildComputedRoutes(t, api1ComputedRoutesID,
-		resourcetest.MustDecode[*pbcatalog.Service](t, api1Service),
-		resourcetest.MustDecode[*pbcatalog.Service](t, api2Service),
-		resourcetest.MustDecode[*pbcatalog.Service](t, backup1Service),
-		// notably we do NOT include api3Service here so we trigger a null route to be generated
-		resourcetest.MustDecode[*pbmesh.DestinationPolicy](t, api1DestPolicy),
-		resourcetest.MustDecode[*pbmesh.HTTPRoute](t, api1HTTPRoute),
-		resourcetest.MustDecode[*pbmesh.TCPRoute](t, api1TCPRoute),
-		resourcetest.MustDecode[*pbcatalog.FailoverPolicy](t, api1FailoverPolicy),
-		resourcetest.MustDecode[*pbmesh.TCPRoute](t, api1TCP2Route),
-	)
-	require.NotNil(t, api1ComputedRoutes)
-
-	api2ComputedRoutesID := resource.ReplaceType(pbmesh.ComputedRoutesType, api2Service.Id)
-	api2ComputedRoutes := routestest.BuildComputedRoutes(t, api2ComputedRoutesID,
-		resourcetest.MustDecode[*pbcatalog.Service](t, api2Service),
-	)
-	require.NotNil(t, api2ComputedRoutes)
-
-	destinationIpPort := &intermediate.Destination{
-		Explicit: &pbmesh.Destination{
-			DestinationRef:  resource.Reference(api1Endpoints.Id, ""),
-			DestinationPort: "tcp",
-			Datacenter:      "dc1",
-			ListenAddr: &pbmesh.Destination_IpPort{
-				IpPort: &pbmesh.IPPortAddress{Ip: "1.1.1.1", Port: 1234},
-			},
-		},
-		Service: resourcetest.MustDecode[*pbcatalog.Service](t, api1Service),
-		ComputedPortRoutes: routestest.MutateTargets(t, api1ComputedRoutes.Data, "tcp", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-			switch {
-			case resource.ReferenceOrIDMatch(api1Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp":
-				details.ServiceEndpointsId = api1Endpoints.Id
-				details.ServiceEndpoints = endpointsData
-				details.IdentityRefs = []*pbresource.Reference{api1Identity}
-			case resource.ReferenceOrIDMatch(api2Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp":
-				details.ServiceEndpointsId = api2Endpoints.Id
-				details.ServiceEndpoints = endpointsData
-				details.IdentityRefs = []*pbresource.Reference{api2Identity}
-			}
-		}),
-	}
-
-	destinationIpPort2 := &intermediate.Destination{
-		Explicit: &pbmesh.Destination{
-			DestinationRef:  resource.Reference(api1Endpoints.Id, ""),
-			DestinationPort: "tcp2",
-			Datacenter:      "dc1",
-			ListenAddr: &pbmesh.Destination_IpPort{
-				IpPort: &pbmesh.IPPortAddress{Ip: "1.1.1.1", Port: 2345},
-			},
-		},
-		Service: resourcetest.MustDecode[*pbcatalog.Service](t, api1Service),
-		ComputedPortRoutes: routestest.MutateTargets(t, api1ComputedRoutes.Data, "tcp2", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-			switch {
-			case resource.ReferenceOrIDMatch(api1Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp2":
-				details.ServiceEndpointsId = api1Endpoints.Id
-				details.ServiceEndpoints = endpointsData
-				details.IdentityRefs = []*pbresource.Reference{api1Identity}
-			case resource.ReferenceOrIDMatch(api2Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp2":
-				details.ServiceEndpointsId = api2Endpoints.Id
-				details.ServiceEndpoints = endpointsData
-				details.IdentityRefs = []*pbresource.Reference{api2Identity}
-			}
-		}),
-	}
-
-	destinationUnix := &intermediate.Destination{
-		Explicit: &pbmesh.Destination{
-			DestinationRef:  resource.Reference(api2Endpoints.Id, ""),
-			DestinationPort: "tcp",
-			Datacenter:      "dc1",
-			ListenAddr: &pbmesh.Destination_Unix{
-				Unix: &pbmesh.UnixSocketAddress{Path: "/path/to/socket", Mode: "0666"},
-			},
-		},
-		Service: resourcetest.MustDecode[*pbcatalog.Service](t, api2Service),
-		ComputedPortRoutes: routestest.MutateTargets(t, api2ComputedRoutes.Data, "tcp", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-			switch {
-			case resource.ReferenceOrIDMatch(api2Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp":
-				details.ServiceEndpointsId = api2Endpoints.Id
-				details.ServiceEndpoints = endpointsData
-				details.IdentityRefs = []*pbresource.Reference{api2Identity}
-			}
-		}),
-	}
-
-	destinationUnix2 := &intermediate.Destination{
-		Explicit: &pbmesh.Destination{
-			DestinationRef:  resource.Reference(api2Endpoints.Id, ""),
-			DestinationPort: "tcp2",
-			Datacenter:      "dc1",
-			ListenAddr: &pbmesh.Destination_Unix{
-				Unix: &pbmesh.UnixSocketAddress{Path: "/path/to/socket", Mode: "0666"},
-			},
-		},
-		Service: resourcetest.MustDecode[*pbcatalog.Service](t, api2Service),
-		ComputedPortRoutes: routestest.MutateTargets(t, api2ComputedRoutes.Data, "tcp2", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-			switch {
-			case resource.ReferenceOrIDMatch(api2Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp2":
-				details.ServiceEndpointsId = api2Endpoints.Id
-				details.ServiceEndpoints = endpointsData
-				details.IdentityRefs = []*pbresource.Reference{api2Identity}
-			}
-		}),
-	}
-	destinationIpPortHTTP := &intermediate.Destination{
-		Explicit: &pbmesh.Destination{
-			DestinationRef:  resource.Reference(api1Endpoints.Id, ""),
-			DestinationPort: "http",
-			Datacenter:      "dc1",
-			ListenAddr: &pbmesh.Destination_IpPort{
-				IpPort: &pbmesh.IPPortAddress{Ip: "1.1.1.1", Port: 1234},
-			},
-		},
-		Service: resourcetest.MustDecode[*pbcatalog.Service](t, api1Service),
-		ComputedPortRoutes: routestest.MutateTargets(t, api1ComputedRoutes.Data, "http", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-			switch {
-			case resource.ReferenceOrIDMatch(api1Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "http":
-				details.ServiceEndpointsId = api1Endpoints.Id
-				details.ServiceEndpoints = endpointsData
-				details.IdentityRefs = []*pbresource.Reference{api1Identity}
-			case resource.ReferenceOrIDMatch(api2Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "http":
-				details.ServiceEndpointsId = api2Endpoints.Id
-				details.ServiceEndpoints = endpointsData
-				details.IdentityRefs = []*pbresource.Reference{api2Identity}
-			case resource.ReferenceOrIDMatch(backup1Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "http":
-				details.ServiceEndpointsId = backup1Endpoints.Id
-				details.ServiceEndpoints = endpointsData
-				details.IdentityRefs = []*pbresource.Reference{backup1Identity}
-			}
-		}),
-	}
-	_ = backup1Identity
-
-	cases := map[string]struct {
-		destinations []*intermediate.Destination
-	}{
-		"destination/l4-single-destination-ip-port-bind-address": {
-			destinations: []*intermediate.Destination{destinationIpPort},
-		},
-		"destination/l4-single-destination-unix-socket-bind-address": {
-			destinations: []*intermediate.Destination{destinationUnix},
-		},
-		"destination/l4-multi-destination": {
-			destinations: []*intermediate.Destination{destinationIpPort, destinationUnix, destinationIpPort2, destinationUnix2},
-		},
-		"destination/mixed-multi-destination": {
-			destinations: []*intermediate.Destination{destinationIpPort, destinationUnix, destinationIpPortHTTP},
-		},
-	}
-
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			proxyTmpl := New(testProxyStateTemplateID(), testIdentityRef(), "foo.consul", "dc1", false, nil).
-				BuildDestinations(c.destinations).
-				Build()
-
-			actual := protoToJSON(t, proxyTmpl)
-			expected := golden.Get(t, actual, name+".golden")
-
-			require.JSONEq(t, expected, actual)
-		})
-	}
-}
-
-func TestBuildImplicitDestinations(t *testing.T) {
-	api1Service := resourcetest.Resource(pbcatalog.ServiceType, "api-1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, serviceData).
-		Build()
-
-	api2Service := resourcetest.Resource(pbcatalog.ServiceType, "api-2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, serviceData).
-		Build()
-
-	api1Endpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-1").
-		WithOwner(api1Service.Id).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, endpointsData).Build()
-
-	api2Endpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-2").
-		WithOwner(api2Service.Id).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, endpointsData).Build()
-
-	api1Identity := &pbresource.Reference{
-		Name:    "api1-identity",
-		Tenancy: api1Endpoints.Id.Tenancy,
-	}
-
-	api2Identity := &pbresource.Reference{
-		Name:    "api2-identity",
-		Tenancy: api2Endpoints.Id.Tenancy,
-	}
-
-	api1ComputedRoutesID := resource.ReplaceType(pbmesh.ComputedRoutesType, api1Service.Id)
-	api1ComputedRoutes := routestest.BuildComputedRoutes(t, api1ComputedRoutesID,
-		resourcetest.MustDecode[*pbcatalog.Service](t, api1Service),
-	)
-	require.NotNil(t, api1ComputedRoutes)
-
-	api2ComputedRoutesID := resource.ReplaceType(pbmesh.ComputedRoutesType, api2Service.Id)
-	api2ComputedRoutes := routestest.BuildComputedRoutes(t, api2ComputedRoutesID,
-		resourcetest.MustDecode[*pbcatalog.Service](t, api2Service),
-	)
-	require.NotNil(t, api2ComputedRoutes)
-
-	proxyCfg := &pbmesh.ProxyConfiguration{
-		DynamicConfig: &pbmesh.DynamicConfig{
-			Mode: pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
-			TransparentProxy: &pbmesh.TransparentProxy{
-				OutboundListenerPort: 15001,
-			},
-		},
-	}
-
-	destination1 := &intermediate.Destination{
-		Service: resourcetest.MustDecode[*pbcatalog.Service](t, api1Service),
-		ComputedPortRoutes: routestest.MutateTargets(t, api1ComputedRoutes.Data, "tcp", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-			switch {
-			case resource.ReferenceOrIDMatch(api1Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp":
-				details.ServiceEndpointsId = api1Endpoints.Id
-				details.ServiceEndpoints = endpointsData
-				details.IdentityRefs = []*pbresource.Reference{api1Identity}
-			}
-		}),
-		VirtualIPs: []string{"1.1.1.1"},
-	}
-
-	destination2 := &intermediate.Destination{
-		Service: resourcetest.MustDecode[*pbcatalog.Service](t, api2Service),
-		ComputedPortRoutes: routestest.MutateTargets(t, api2ComputedRoutes.Data, "tcp", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-			switch {
-			case resource.ReferenceOrIDMatch(api2Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp":
-				details.ServiceEndpointsId = api2Endpoints.Id
-				details.ServiceEndpoints = endpointsData
-				details.IdentityRefs = []*pbresource.Reference{api2Identity}
-			}
-		}),
-		VirtualIPs: []string{"2.2.2.2", "3.3.3.3"},
-	}
-
-	destination3 := &intermediate.Destination{
-		Explicit: &pbmesh.Destination{
-			DestinationRef:  resource.Reference(api1Endpoints.Id, ""),
-			DestinationPort: "tcp",
-			Datacenter:      "dc1",
-			ListenAddr: &pbmesh.Destination_IpPort{
-				IpPort: &pbmesh.IPPortAddress{Ip: "1.1.1.1", Port: 1234},
-			},
-		},
-		Service: resourcetest.MustDecode[*pbcatalog.Service](t, api1Service),
-		ComputedPortRoutes: routestest.MutateTargets(t, api1ComputedRoutes.Data, "tcp", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-			switch {
-			case resource.ReferenceOrIDMatch(api1Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp":
-				details.ServiceEndpointsId = api1Endpoints.Id
-				details.ServiceEndpoints = endpointsData
-				details.IdentityRefs = []*pbresource.Reference{api1Identity}
-			}
-		}),
-	}
-
-	cases := map[string]struct {
-		destinations []*intermediate.Destination
-	}{
-		"destination/l4-single-implicit-destination-tproxy": {
-			destinations: []*intermediate.Destination{destination1},
-		},
-		"destination/l4-multiple-implicit-destinations-tproxy": {
-			destinations: []*intermediate.Destination{destination1, destination2},
-		},
-		"destination/l4-implicit-and-explicit-destinations-tproxy": {
-			destinations: []*intermediate.Destination{destination2, destination3},
-		},
-	}
-
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			proxyTmpl := New(testProxyStateTemplateID(), testIdentityRef(), "foo.consul", "dc1", false, proxyCfg).
-				BuildDestinations(c.destinations).
-				Build()
-
-			actual := protoToJSON(t, proxyTmpl)
-			expected := golden.Get(t, actual, name+".golden")
-
-			require.JSONEq(t, expected, actual)
-		})
-	}
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/local_app.go b/internal/mesh/internal/controllers/sidecarproxy/builder/local_app.go
deleted file mode 100644
index 3313b3ffae72b..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/local_app.go
+++ /dev/null
@@ -1,385 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package builder
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-)
-
-func (b *Builder) BuildLocalApp(workload *pbcatalog.Workload, ctp *pbauth.ComputedTrafficPermissions) *Builder {
-	// Add the public listener.
-	lb := b.addInboundListener(xdscommon.PublicListenerName, workload)
-	lb.buildListener()
-
-	trafficPermissions := buildTrafficPermissions(b.defaultAllow, b.trustDomain, workload, ctp)
-
-	// Go through workload ports and add the routers, clusters, endpoints, and TLS.
-	// Note that the order of ports is non-deterministic here but the xds generation
-	// code should make sure to send it in the same order to Envoy to avoid unnecessary
-	// updates.
-	foundInboundNonMeshPorts := false
-	for portName, port := range workload.Ports {
-		clusterName := fmt.Sprintf("%s:%s", xdscommon.LocalAppClusterName, portName)
-
-		if port.Protocol != pbcatalog.Protocol_PROTOCOL_MESH {
-			foundInboundNonMeshPorts = true
-			lb.addInboundRouter(clusterName, port, portName, trafficPermissions[portName]).
-				addInboundTLS()
-
-			b.addLocalAppCluster(clusterName).
-				addLocalAppStaticEndpoints(clusterName, port)
-		}
-	}
-
-	// If there are no inbound ports other than the mesh port, we black-hole all inbound traffic.
-	if !foundInboundNonMeshPorts {
-		lb.addBlackHoleRouter()
-		b.addBlackHoleCluster()
-	}
-
-	return b
-}
-
-func buildTrafficPermissions(globalDefaultAllow bool, trustDomain string, workload *pbcatalog.Workload, computed *pbauth.ComputedTrafficPermissions) map[string]*pbproxystate.TrafficPermissions {
-	portsWithProtocol := workload.GetPortsByProtocol()
-	var defaultAllow bool
-	// If the computed traffic permissions don't exist yet, use default deny just to be safe.
-	// When it exists, use default deny unless no traffic permissions exist and default allow
-	// is configured globally.
-	if computed != nil && computed.IsDefault && globalDefaultAllow {
-		defaultAllow = true
-	}
-
-	out := make(map[string]*pbproxystate.TrafficPermissions)
-	portToProtocol := make(map[string]pbcatalog.Protocol)
-	var allPorts []string
-	for protocol, ports := range portsWithProtocol {
-		if protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-			continue
-		}
-
-		for _, p := range ports {
-			allPorts = append(allPorts, p)
-			portToProtocol[p] = protocol
-			out[p] = &pbproxystate.TrafficPermissions{
-				DefaultAllow: defaultAllow,
-			}
-		}
-	}
-
-	if computed == nil {
-		return out
-	}
-
-	for _, p := range computed.DenyPermissions {
-		drsByPort := destinationRulesByPort(allPorts, p.DestinationRules)
-		principals := makePrincipals(trustDomain, p)
-		for port := range drsByPort {
-			out[port].DenyPermissions = append(out[port].DenyPermissions, &pbproxystate.Permission{
-				Principals: principals,
-			})
-		}
-	}
-
-	for _, p := range computed.AllowPermissions {
-		drsByPort := destinationRulesByPort(allPorts, p.DestinationRules)
-		principals := makePrincipals(trustDomain, p)
-		for port := range drsByPort {
-			if _, ok := out[port]; !ok {
-				continue
-			}
-
-			out[port].AllowPermissions = append(out[port].AllowPermissions, &pbproxystate.Permission{
-				Principals: principals,
-			})
-		}
-	}
-
-	return out
-}
-
-// TODO this is a placeholder until we add them to the IR.
-type DestinationRule struct{}
-
-func destinationRulesByPort(allPorts []string, destinationRules []*pbauth.DestinationRule) map[string][]DestinationRule {
-	out := make(map[string][]DestinationRule)
-
-	if len(destinationRules) == 0 {
-		for _, p := range allPorts {
-			out[p] = nil
-		}
-
-		return out
-	}
-
-	for _, destinationRule := range destinationRules {
-		ports, dr := convertDestinationRule(allPorts, destinationRule)
-		for _, p := range ports {
-			out[p] = append(out[p], dr)
-		}
-	}
-
-	return out
-}
-
-func convertDestinationRule(allPorts []string, dr *pbauth.DestinationRule) ([]string, DestinationRule) {
-	ports := make(map[string]struct{})
-	if len(dr.PortNames) > 0 {
-		for _, p := range dr.PortNames {
-			ports[p] = struct{}{}
-		}
-	} else {
-		for _, p := range allPorts {
-			ports[p] = struct{}{}
-		}
-	}
-
-	for _, exclude := range dr.Exclude {
-		for _, p := range exclude.PortNames {
-			delete(ports, p)
-		}
-	}
-
-	var out []string
-	for p := range ports {
-		out = append(out, p)
-	}
-
-	return out, DestinationRule{}
-}
-
-func makePrincipals(trustDomain string, perm *pbauth.Permission) []*pbproxystate.Principal {
-	var principals []*pbproxystate.Principal
-	for _, s := range perm.Sources {
-		principals = append(principals, makePrincipal(trustDomain, s))
-	}
-
-	return principals
-}
-
-func makePrincipal(trustDomain string, s *pbauth.Source) *pbproxystate.Principal {
-	excludes := make([]*pbproxystate.Spiffe, 0, len(s.Exclude))
-	for _, es := range s.Exclude {
-		excludes = append(excludes, sourceToSpiffe(trustDomain, es))
-	}
-
-	return &pbproxystate.Principal{
-		Spiffe:         sourceToSpiffe(trustDomain, s),
-		ExcludeSpiffes: excludes,
-	}
-}
-
-const (
-	anyPath = `[^/]+`
-)
-
-func sourceToSpiffe(trustDomain string, s pbauth.SourceToSpiffe) *pbproxystate.Spiffe {
-	var (
-		name = s.GetIdentityName()
-		ns   = s.GetNamespace()
-		ap   = s.GetPartition()
-	)
-
-	if ns == "" && name != "" {
-		panic(fmt.Sprintf("not possible to have a wildcarded namespace %q but an exact identity %q", ns, name))
-	}
-
-	if ap == "" {
-		panic("not possible to have a wildcarded source partition")
-	}
-
-	if ns == "" {
-		ns = anyPath
-	}
-	if name == "" {
-		name = anyPath
-	}
-
-	spiffeURI := connect.SpiffeIDWorkloadIdentity{
-		TrustDomain:      trustDomain,
-		Partition:        ap,
-		Namespace:        ns,
-		WorkloadIdentity: name,
-	}.URI()
-
-	matcher := fmt.Sprintf(`^%s://%s%s$`, spiffeURI.Scheme, spiffeURI.Host, spiffeURI.Path)
-
-	return &pbproxystate.Spiffe{
-		Regex: matcher,
-	}
-}
-
-func (b *Builder) addInboundListener(name string, workload *pbcatalog.Workload) *ListenerBuilder {
-	listener := &pbproxystate.Listener{
-		Name:      name,
-		Direction: pbproxystate.Direction_DIRECTION_INBOUND,
-	}
-
-	// We will take listener bind port from the workload.
-	// Find mesh port.
-	meshPort, ok := workload.GetMeshPortName()
-	if !ok {
-		// At this point, we should only get workloads that have mesh ports.
-		return &ListenerBuilder{
-			builder: b,
-		}
-	}
-
-	// Check if the workload has a specific address for the mesh port.
-	meshAddresses := workload.GetNonExternalAddressesForPort(meshPort)
-
-	// If there are no mesh addresses, return. This should be impossible.
-	if len(meshAddresses) == 0 {
-		return &ListenerBuilder{
-			builder: b,
-		}
-	}
-
-	// If there are more than one mesh address, use the first one in the list.
-	var meshAddress string
-	if len(meshAddresses) > 0 {
-		meshAddress = meshAddresses[0].Host
-	}
-
-	listener.BindAddress = &pbproxystate.Listener_HostPort{
-		HostPort: &pbproxystate.HostPortAddress{
-			Host: meshAddress,
-			Port: workload.Ports[meshPort].Port,
-		},
-	}
-
-	// Add TLS inspection capability to be able to parse ALPN and/or SNI information from inbound connections.
-	listener.Capabilities = append(listener.Capabilities, pbproxystate.Capability_CAPABILITY_L4_TLS_INSPECTION)
-
-	return b.NewListenerBuilder(listener)
-}
-
-func (l *ListenerBuilder) addInboundRouter(clusterName string, port *pbcatalog.WorkloadPort, portName string, tp *pbproxystate.TrafficPermissions) *ListenerBuilder {
-	if l.listener == nil {
-		return l
-	}
-
-	if port.Protocol == pbcatalog.Protocol_PROTOCOL_TCP || port.Protocol == pbcatalog.Protocol_PROTOCOL_UNSPECIFIED {
-		r := &pbproxystate.Router{
-			Destination: &pbproxystate.Router_L4{
-				L4: &pbproxystate.L4Destination{
-					Destination: &pbproxystate.L4Destination_Cluster{
-						Cluster: &pbproxystate.DestinationCluster{
-							Name: clusterName,
-						},
-					},
-					StatPrefix:         l.listener.Name,
-					TrafficPermissions: tp,
-				},
-			},
-			Match: &pbproxystate.Match{
-				AlpnProtocols: []string{getAlpnProtocolFromPortName(portName)},
-			},
-		}
-		l.listener.Routers = append(l.listener.Routers, r)
-	}
-	return l
-}
-
-func (l *ListenerBuilder) addBlackHoleRouter() *ListenerBuilder {
-	if l.listener == nil {
-		return l
-	}
-
-	r := &pbproxystate.Router{
-		Destination: &pbproxystate.Router_L4{
-			L4: &pbproxystate.L4Destination{
-				Destination: &pbproxystate.L4Destination_Cluster{
-					Cluster: &pbproxystate.DestinationCluster{
-						Name: xdscommon.BlackHoleClusterName,
-					},
-				},
-				StatPrefix: l.listener.Name,
-			},
-		},
-	}
-	l.listener.Routers = append(l.listener.Routers, r)
-
-	return l
-}
-
-func getAlpnProtocolFromPortName(portName string) string {
-	return fmt.Sprintf("consul~%s", portName)
-}
-
-func (b *Builder) addLocalAppCluster(clusterName string) *Builder {
-	// Make cluster for this router destination.
-	b.proxyStateTemplate.ProxyState.Clusters[clusterName] = &pbproxystate.Cluster{
-		Group: &pbproxystate.Cluster_EndpointGroup{
-			EndpointGroup: &pbproxystate.EndpointGroup{
-				Group: &pbproxystate.EndpointGroup_Static{
-					Static: &pbproxystate.StaticEndpointGroup{},
-				},
-			},
-		},
-	}
-	return b
-}
-
-func (b *Builder) addBlackHoleCluster() *Builder {
-	b.proxyStateTemplate.ProxyState.Clusters[xdscommon.BlackHoleClusterName] = &pbproxystate.Cluster{
-		Group: &pbproxystate.Cluster_EndpointGroup{
-			EndpointGroup: &pbproxystate.EndpointGroup{
-				Group: &pbproxystate.EndpointGroup_Static{
-					Static: &pbproxystate.StaticEndpointGroup{},
-				},
-			},
-		},
-	}
-	return b
-}
-
-func (b *Builder) addLocalAppStaticEndpoints(clusterName string, port *pbcatalog.WorkloadPort) *Builder {
-	// We're adding endpoints statically as opposed to creating an endpoint ref
-	// because this endpoint is less likely to change as we're not tracking the health.
-	endpoint := &pbproxystate.Endpoint{
-		Address: &pbproxystate.Endpoint_HostPort{
-			HostPort: &pbproxystate.HostPortAddress{
-				Host: "127.0.0.1",
-				Port: port.Port,
-			},
-		},
-	}
-	b.proxyStateTemplate.ProxyState.Endpoints[clusterName] = &pbproxystate.Endpoints{
-		Endpoints: []*pbproxystate.Endpoint{endpoint},
-	}
-
-	return b
-}
-
-func (l *ListenerBuilder) addInboundTLS() *ListenerBuilder {
-	if l.listener == nil {
-		return nil
-	}
-
-	// For inbound TLS, we want to use this proxy's identity.
-	workloadIdentity := l.builder.proxyStateTemplate.ProxyState.Identity.Name
-
-	inboundTLS := &pbproxystate.TransportSocket{
-		ConnectionTls: &pbproxystate.TransportSocket_InboundMesh{
-			InboundMesh: &pbproxystate.InboundMeshMTLS{
-				IdentityKey: workloadIdentity,
-				ValidationContext: &pbproxystate.MeshInboundValidationContext{
-					TrustBundlePeerNameKeys: []string{l.builder.id.Tenancy.PeerName},
-				},
-			},
-		},
-	}
-
-	for i := range l.listener.Routers {
-		l.listener.Routers[i].InboundTls = inboundTLS
-	}
-	return l
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/local_app_multiport_test.go b/internal/mesh/internal/controllers/sidecarproxy/builder/local_app_multiport_test.go
deleted file mode 100644
index b54921ae9f777..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/local_app_multiport_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package builder
-
-import (
-	"sort"
-	"testing"
-
-	"github.com/hashicorp/consul/internal/testing/golden"
-
-	"github.com/stretchr/testify/require"
-
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-)
-
-func TestBuildLocalApp_Multiport(t *testing.T) {
-	cases := map[string]struct {
-		workload *pbcatalog.Workload
-	}{
-		"source/multiport-l4-single-workload-address-without-ports": {
-			workload: &pbcatalog.Workload{
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host: "10.0.0.1",
-					},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"admin-port": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"api-port":   {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"mesh":       {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			},
-		},
-		"source/multiport-l4-multiple-workload-addresses-without-ports": {
-			workload: &pbcatalog.Workload{
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host: "10.0.0.1",
-					},
-					{
-						Host: "10.0.0.2",
-					},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"admin-port": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"api-port":   {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"mesh":       {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			},
-		},
-		"source/multiport-l4-multiple-workload-addresses-with-specific-ports": {
-			workload: &pbcatalog.Workload{
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host:  "10.0.0.1",
-						Ports: []string{"admin-port"},
-					},
-					{
-						Host:  "10.0.0.2",
-						Ports: []string{"api-port"},
-					},
-					{
-						Host:  "10.0.0.3",
-						Ports: []string{"mesh"},
-					},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"admin-port": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"api-port":   {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"mesh":       {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			},
-		},
-		"source/multiport-l4-workload-with-only-mesh-port": {
-			workload: &pbcatalog.Workload{
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host: "10.0.0.1",
-					},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"mesh": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			},
-		},
-	}
-
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			proxyTmpl := New(testProxyStateTemplateID(), testIdentityRef(), "foo.consul", "dc1", false, nil).
-				BuildLocalApp(c.workload, nil).
-				Build()
-
-			// sort routers because of test flakes where order was flip flopping.
-			actualRouters := proxyTmpl.ProxyState.Listeners[0].Routers
-			sort.Slice(actualRouters, func(i, j int) bool {
-				return actualRouters[i].String() < actualRouters[j].String()
-			})
-
-			actual := protoToJSON(t, proxyTmpl)
-			expected := JSONToProxyTemplate(t, golden.GetBytes(t, actual, name+".golden"))
-
-			// sort routers on listener from golden file
-			expectedRouters := expected.ProxyState.Listeners[0].Routers
-			sort.Slice(expectedRouters, func(i, j int) bool {
-				return expectedRouters[i].String() < expectedRouters[j].String()
-			})
-
-			// convert back to json after sorting so that test output does not contain extraneous fields.
-			require.Equal(t, protoToJSON(t, expected), protoToJSON(t, proxyTmpl))
-		})
-	}
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/local_app_test.go b/internal/mesh/internal/controllers/sidecarproxy/builder/local_app_test.go
deleted file mode 100644
index 2b117155abc5b..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/local_app_test.go
+++ /dev/null
@@ -1,439 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package builder
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	"github.com/hashicorp/consul/internal/testing/golden"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestBuildLocalApp(t *testing.T) {
-	cases := map[string]struct {
-		workload     *pbcatalog.Workload
-		ctp          *pbauth.ComputedTrafficPermissions
-		defaultAllow bool
-	}{
-		"source/l4-single-workload-address-without-ports": {
-			workload: &pbcatalog.Workload{
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host: "10.0.0.1",
-					},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"port1": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"port2": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			},
-		},
-		"source/l4-multiple-workload-addresses-without-ports": {
-			workload: &pbcatalog.Workload{
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host: "10.0.0.1",
-					},
-					{
-						Host: "10.0.0.2",
-					},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"port1": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"port2": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			},
-		},
-		"source/l4-multiple-workload-addresses-with-specific-ports": {
-			workload: &pbcatalog.Workload{
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host:  "127.0.0.1",
-						Ports: []string{"port1"},
-					},
-					{
-						Host:  "10.0.0.2",
-						Ports: []string{"port2"},
-					},
-				},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"port1": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"port2": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			},
-			ctp: &pbauth.ComputedTrafficPermissions{
-				AllowPermissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								IdentityName: "foo",
-								Namespace:    "default",
-								Partition:    "default",
-							},
-						},
-					},
-				},
-			},
-			defaultAllow: true,
-		},
-	}
-
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			proxyTmpl := New(testProxyStateTemplateID(), testIdentityRef(), "foo.consul", "dc1", c.defaultAllow, nil).
-				BuildLocalApp(c.workload, c.ctp).
-				Build()
-			actual := protoToJSON(t, proxyTmpl)
-			expected := golden.Get(t, actual, name+".golden")
-
-			require.JSONEq(t, expected, actual)
-		})
-	}
-}
-
-func testProxyStateTemplateID() *pbresource.ID {
-	return resourcetest.Resource(pbmesh.ProxyStateTemplateType, "test").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		ID()
-}
-
-func testIdentityRef() *pbresource.Reference {
-	return &pbresource.Reference{
-		Name: "test-identity",
-		Tenancy: &pbresource.Tenancy{
-			Namespace: "default",
-			Partition: "default",
-			PeerName:  "local",
-		},
-	}
-}
-
-func TestBuildL4TrafficPermissions(t *testing.T) {
-	testTrustDomain := "test.consul"
-
-	cases := map[string]struct {
-		defaultAllow  bool
-		workloadPorts map[string]*pbcatalog.WorkloadPort
-		ctp           *pbauth.ComputedTrafficPermissions
-		expected      map[string]*pbproxystate.TrafficPermissions
-	}{
-		"empty": {
-			defaultAllow: true,
-			workloadPorts: map[string]*pbcatalog.WorkloadPort{
-				"p1": {
-					Protocol: pbcatalog.Protocol_PROTOCOL_TCP,
-				},
-				"p2": {
-					Protocol: pbcatalog.Protocol_PROTOCOL_HTTP,
-				},
-				"p3": {},
-				"mesh": {
-					Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-				},
-			},
-			expected: map[string]*pbproxystate.TrafficPermissions{
-				"p1": {
-					DefaultAllow: false,
-				},
-				"p2": {
-					DefaultAllow: false,
-				},
-				"p3": {
-					DefaultAllow: false,
-				},
-			},
-		},
-		"default allow everywhere": {
-			defaultAllow: true,
-			workloadPorts: map[string]*pbcatalog.WorkloadPort{
-				"p1": {
-					Protocol: pbcatalog.Protocol_PROTOCOL_TCP,
-				},
-				"p2": {
-					Protocol: pbcatalog.Protocol_PROTOCOL_HTTP,
-				},
-				"p3": {},
-				"mesh": {
-					Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-				},
-			},
-			ctp: &pbauth.ComputedTrafficPermissions{
-				IsDefault: true,
-			},
-			expected: map[string]*pbproxystate.TrafficPermissions{
-				"p1": {
-					DefaultAllow: true,
-				},
-				"p2": {
-					DefaultAllow: true,
-				},
-				"p3": {
-					DefaultAllow: true,
-				},
-			},
-		},
-		"preserves default deny": {
-			defaultAllow: false,
-			workloadPorts: map[string]*pbcatalog.WorkloadPort{
-				"p1": {
-					Protocol: pbcatalog.Protocol_PROTOCOL_TCP,
-				},
-				"p2": {
-					Protocol: pbcatalog.Protocol_PROTOCOL_HTTP,
-				},
-			},
-			ctp: &pbauth.ComputedTrafficPermissions{
-				AllowPermissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								IdentityName: "foo",
-								Partition:    "default",
-								Namespace:    "default",
-							},
-						},
-						DestinationRules: []*pbauth.DestinationRule{
-							{
-								PortNames: []string{"p1"},
-							},
-						},
-					},
-				},
-			},
-			expected: map[string]*pbproxystate.TrafficPermissions{
-				"p1": {
-					DefaultAllow: false,
-					AllowPermissions: []*pbproxystate.Permission{
-						{
-							Principals: []*pbproxystate.Principal{
-								{
-									Spiffe: &pbproxystate.Spiffe{Regex: "^spiffe://test.consul/ap/default/ns/default/identity/foo$"},
-								},
-							},
-						},
-					},
-				},
-				"p2": {
-					DefaultAllow: false,
-				},
-			},
-		},
-		"default allow with a non-empty ctp becomes default deny on all ports": {
-			defaultAllow: true,
-			workloadPorts: map[string]*pbcatalog.WorkloadPort{
-				"p1": {
-					Protocol: pbcatalog.Protocol_PROTOCOL_TCP,
-				},
-				"p2": {
-					Protocol: pbcatalog.Protocol_PROTOCOL_HTTP,
-				},
-			},
-			ctp: &pbauth.ComputedTrafficPermissions{
-				AllowPermissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								IdentityName: "baz",
-								Partition:    "default",
-								Namespace:    "default",
-							},
-						},
-						DestinationRules: []*pbauth.DestinationRule{
-							{
-								PortNames: []string{"no-match"},
-							},
-						},
-					},
-				},
-			},
-			expected: map[string]*pbproxystate.TrafficPermissions{
-				"p1": {
-					DefaultAllow: false,
-				},
-				"p2": {
-					DefaultAllow: false,
-				},
-			},
-		},
-		"kitchen sink": {
-			defaultAllow: true,
-			workloadPorts: map[string]*pbcatalog.WorkloadPort{
-				"p1": {
-					Protocol: pbcatalog.Protocol_PROTOCOL_TCP,
-				},
-				"p2": {
-					Protocol: pbcatalog.Protocol_PROTOCOL_HTTP,
-				},
-			},
-			ctp: &pbauth.ComputedTrafficPermissions{
-				AllowPermissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								IdentityName: "foo",
-								Partition:    "default",
-								Namespace:    "default",
-							},
-							{
-								IdentityName: "",
-								Partition:    "default",
-								Namespace:    "default",
-								Exclude: []*pbauth.ExcludeSource{
-									{
-										IdentityName: "bar",
-										Namespace:    "default",
-										Partition:    "default",
-									},
-								},
-							},
-						},
-						DestinationRules: []*pbauth.DestinationRule{
-							// This should be p2.
-							{
-								Exclude: []*pbauth.ExcludePermissionRule{
-									{
-										PortNames: []string{"p1"},
-									},
-								},
-							},
-						},
-					},
-					{
-						Sources: []*pbauth.Source{
-							{
-								IdentityName: "baz",
-								Partition:    "default",
-								Namespace:    "default",
-							},
-						},
-						DestinationRules: []*pbauth.DestinationRule{
-							{
-								PortNames: []string{"p1"},
-							},
-						},
-					},
-				},
-				DenyPermissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								IdentityName: "qux",
-								Partition:    "default",
-								Namespace:    "default",
-							},
-						},
-					},
-					{
-						Sources: []*pbauth.Source{
-							{
-								IdentityName: "",
-								Namespace:    "default",
-								Partition:    "default",
-								Exclude: []*pbauth.ExcludeSource{
-									{
-										IdentityName: "quux",
-										Partition:    "default",
-										Namespace:    "default",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			expected: map[string]*pbproxystate.TrafficPermissions{
-				"p1": {
-					DefaultAllow: false,
-					DenyPermissions: []*pbproxystate.Permission{
-						{
-							Principals: []*pbproxystate.Principal{
-								{
-									Spiffe: &pbproxystate.Spiffe{Regex: "^spiffe://test.consul/ap/default/ns/default/identity/qux$"},
-								},
-							},
-						},
-						{
-							Principals: []*pbproxystate.Principal{
-								{
-									Spiffe: &pbproxystate.Spiffe{Regex: `^spiffe://test.consul/ap/default/ns/default/identity/[^/]+$`},
-									ExcludeSpiffes: []*pbproxystate.Spiffe{
-										{Regex: "^spiffe://test.consul/ap/default/ns/default/identity/quux$"},
-									},
-								},
-							},
-						},
-					},
-					AllowPermissions: []*pbproxystate.Permission{
-						{
-							Principals: []*pbproxystate.Principal{
-								{
-									Spiffe: &pbproxystate.Spiffe{Regex: "^spiffe://test.consul/ap/default/ns/default/identity/baz$"},
-								},
-							},
-						},
-					},
-				},
-				"p2": {
-					DefaultAllow: false,
-					DenyPermissions: []*pbproxystate.Permission{
-						{
-							Principals: []*pbproxystate.Principal{
-								{
-									Spiffe: &pbproxystate.Spiffe{Regex: "^spiffe://test.consul/ap/default/ns/default/identity/qux$"},
-								},
-							},
-						},
-						{
-							Principals: []*pbproxystate.Principal{
-								{
-									Spiffe: &pbproxystate.Spiffe{Regex: `^spiffe://test.consul/ap/default/ns/default/identity/[^/]+$`},
-									ExcludeSpiffes: []*pbproxystate.Spiffe{
-										{Regex: "^spiffe://test.consul/ap/default/ns/default/identity/quux$"},
-									},
-								},
-							},
-						},
-					},
-					AllowPermissions: []*pbproxystate.Permission{
-						{
-							Principals: []*pbproxystate.Principal{
-								{
-									Spiffe: &pbproxystate.Spiffe{Regex: "^spiffe://test.consul/ap/default/ns/default/identity/foo$"},
-								},
-								{
-									Spiffe: &pbproxystate.Spiffe{Regex: `^spiffe://test.consul/ap/default/ns/default/identity/[^/]+$`},
-									ExcludeSpiffes: []*pbproxystate.Spiffe{
-										{Regex: "^spiffe://test.consul/ap/default/ns/default/identity/bar$"},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			workload := &pbcatalog.Workload{
-				Ports: tc.workloadPorts,
-			}
-			permissions := buildTrafficPermissions(tc.defaultAllow, testTrustDomain, workload, tc.ctp)
-			require.Equal(t, len(tc.expected), len(permissions))
-			for k, v := range tc.expected {
-				prototest.AssertDeepEqual(t, v, permissions[k])
-			}
-		})
-	}
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/naming.go b/internal/mesh/internal/controllers/sidecarproxy/builder/naming.go
deleted file mode 100644
index 6826191bdf1e3..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/naming.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package builder
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/agent/connect"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func DestinationSNI(serviceRef *pbresource.Reference, datacenter, trustDomain string) string {
-	return connect.ServiceSNI(serviceRef.Name,
-		"",
-		serviceRef.Tenancy.Namespace,
-		serviceRef.Tenancy.Partition,
-		datacenter,
-		trustDomain)
-}
-
-func DestinationStatPrefix(serviceRef *pbresource.Reference, portName, datacenter string) string {
-	return fmt.Sprintf("upstream.%s.%s.%s.%s.%s",
-		portName,
-		serviceRef.Name,
-		serviceRef.Tenancy.Namespace,
-		serviceRef.Tenancy.Partition,
-		datacenter)
-}
-
-func DestinationListenerName(name, portName string, address string, port uint32) string {
-	if port != 0 {
-		return fmt.Sprintf("%s:%s:%s:%d", name, portName, address, port)
-	}
-
-	return fmt.Sprintf("%s:%s:%s", name, portName, address)
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/routes.go b/internal/mesh/internal/controllers/sidecarproxy/builder/routes.go
deleted file mode 100644
index b5c8fafebbbb2..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/routes.go
+++ /dev/null
@@ -1,589 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package builder
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-)
-
-func (b *Builder) backendTargetToClusterName(
-	backendTarget string,
-	targets map[string]*pbmesh.BackendTargetDetails,
-	defaultDC func(string) string,
-) string {
-	if backendTarget == types.NullRouteBackend {
-		return NullRouteClusterName
-	}
-
-	details, ok := targets[backendTarget]
-	if !ok {
-		panic("dangling reference")
-	}
-
-	backendRef := details.BackendRef
-
-	dc := defaultDC(backendRef.Datacenter)
-
-	sni := DestinationSNI(
-		details.BackendRef.Ref,
-		dc,
-		b.trustDomain,
-	)
-
-	return fmt.Sprintf("%s.%s", details.BackendRef.Port, sni)
-}
-
-func (b *Builder) makeHTTPRouteDestination(
-	computedBackendRefs []*pbmesh.ComputedHTTPBackendRef,
-	destConfig *pbproxystate.DestinationConfiguration,
-	targets map[string]*pbmesh.BackendTargetDetails,
-	defaultDC func(string) string,
-) *pbproxystate.RouteDestination {
-	switch len(computedBackendRefs) {
-	case 0:
-		panic("not possible to have a route rule with no backend refs")
-	case 1:
-		return b.makeRouteDestinationForDirect(computedBackendRefs[0].BackendTarget, destConfig, targets, defaultDC)
-	default:
-		clusters := make([]*pbproxystate.L7WeightedDestinationCluster, 0, len(computedBackendRefs))
-		for _, computedBackendRef := range computedBackendRefs {
-			clusterName := b.backendTargetToClusterName(computedBackendRef.BackendTarget, targets, defaultDC)
-
-			clusters = append(clusters, &pbproxystate.L7WeightedDestinationCluster{
-				Name: clusterName,
-				Weight: &wrapperspb.UInt32Value{
-					Value: computedBackendRef.Weight,
-				},
-			})
-		}
-		return b.makeRouteDestinationForSplit(clusters, destConfig)
-	}
-}
-
-func (b *Builder) makeGRPCRouteDestination(
-	computedBackendRefs []*pbmesh.ComputedGRPCBackendRef,
-	destConfig *pbproxystate.DestinationConfiguration,
-	targets map[string]*pbmesh.BackendTargetDetails,
-	defaultDC func(string) string,
-) *pbproxystate.RouteDestination {
-	switch len(computedBackendRefs) {
-	case 0:
-		panic("not possible to have a route rule with no backend refs")
-	case 1:
-		return b.makeRouteDestinationForDirect(computedBackendRefs[0].BackendTarget, destConfig, targets, defaultDC)
-	default:
-		clusters := make([]*pbproxystate.L7WeightedDestinationCluster, 0, len(computedBackendRefs))
-		for _, computedBackendRef := range computedBackendRefs {
-			clusterName := b.backendTargetToClusterName(computedBackendRef.BackendTarget, targets, defaultDC)
-
-			clusters = append(clusters, &pbproxystate.L7WeightedDestinationCluster{
-				Name: clusterName,
-				Weight: &wrapperspb.UInt32Value{
-					Value: computedBackendRef.Weight,
-				},
-			})
-		}
-		return b.makeRouteDestinationForSplit(clusters, destConfig)
-	}
-}
-
-func (b *Builder) makeRouteDestinationForDirect(
-	backendTarget string,
-	destConfig *pbproxystate.DestinationConfiguration,
-	targets map[string]*pbmesh.BackendTargetDetails,
-	defaultDC func(string) string,
-) *pbproxystate.RouteDestination {
-	clusterName := b.backendTargetToClusterName(backendTarget, targets, defaultDC)
-
-	return &pbproxystate.RouteDestination{
-		Destination: &pbproxystate.RouteDestination_Cluster{
-			Cluster: &pbproxystate.DestinationCluster{
-				Name: clusterName,
-			},
-		},
-		DestinationConfiguration: destConfig,
-	}
-}
-
-func (b *Builder) makeRouteDestinationForSplit(
-	clusters []*pbproxystate.L7WeightedDestinationCluster,
-	destConfig *pbproxystate.DestinationConfiguration,
-) *pbproxystate.RouteDestination {
-	return &pbproxystate.RouteDestination{
-		Destination: &pbproxystate.RouteDestination_WeightedClusters{
-			WeightedClusters: &pbproxystate.L7WeightedClusterGroup{
-				Clusters: clusters,
-			},
-		},
-		DestinationConfiguration: destConfig,
-	}
-}
-
-func (b *Builder) makeDestinationConfiguration(
-	timeouts *pbmesh.HTTPRouteTimeouts,
-	retries *pbmesh.HTTPRouteRetries,
-) *pbproxystate.DestinationConfiguration {
-	cfg := &pbproxystate.DestinationConfiguration{
-		TimeoutConfig: translateTimeouts(timeouts),
-		RetryPolicy:   translateRetries(retries),
-	}
-	if cfg.TimeoutConfig == nil && cfg.RetryPolicy == nil {
-		return nil
-	}
-
-	return cfg
-}
-
-func applyRouteFilters[V interface {
-	GetRequestHeaderModifier() *pbmesh.HTTPHeaderFilter
-	GetResponseHeaderModifier() *pbmesh.HTTPHeaderFilter
-	GetUrlRewrite() *pbmesh.HTTPURLRewriteFilter
-}](
-	psDestConfig *pbproxystate.DestinationConfiguration,
-	filters []V,
-) []*pbproxystate.HeaderMutation {
-	var headerMutations []*pbproxystate.HeaderMutation
-	for _, filter := range filters {
-		switch {
-		case filter.GetRequestHeaderModifier() != nil:
-			mod := filter.GetRequestHeaderModifier()
-
-			for _, hdr := range mod.Set {
-				headerMutations = append(headerMutations, &pbproxystate.HeaderMutation{
-					Action: &pbproxystate.HeaderMutation_RequestHeaderAdd{
-						RequestHeaderAdd: &pbproxystate.RequestHeaderAdd{
-							Header: &pbproxystate.Header{
-								Key:   hdr.Name,
-								Value: hdr.Value,
-							},
-							AppendAction: pbproxystate.AppendAction_APPEND_ACTION_OVERWRITE_IF_EXISTS_OR_ADD,
-						},
-					},
-				})
-			}
-			for _, hdr := range mod.Add {
-				headerMutations = append(headerMutations, &pbproxystate.HeaderMutation{
-					Action: &pbproxystate.HeaderMutation_RequestHeaderAdd{
-						RequestHeaderAdd: &pbproxystate.RequestHeaderAdd{
-							Header: &pbproxystate.Header{
-								Key:   hdr.Name,
-								Value: hdr.Value,
-							},
-							AppendAction: pbproxystate.AppendAction_APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD,
-						},
-					},
-				})
-			}
-
-			if len(mod.Remove) > 0 {
-				headerMutations = append(headerMutations, &pbproxystate.HeaderMutation{
-					Action: &pbproxystate.HeaderMutation_RequestHeaderRemove{
-						RequestHeaderRemove: &pbproxystate.RequestHeaderRemove{
-							HeaderKeys: mod.Remove,
-						},
-					},
-				})
-			}
-
-		case filter.GetResponseHeaderModifier() != nil:
-			mod := filter.GetResponseHeaderModifier()
-
-			for _, hdr := range mod.Set {
-				headerMutations = append(headerMutations, &pbproxystate.HeaderMutation{
-					Action: &pbproxystate.HeaderMutation_ResponseHeaderAdd{
-						ResponseHeaderAdd: &pbproxystate.ResponseHeaderAdd{
-							Header: &pbproxystate.Header{
-								Key:   hdr.Name,
-								Value: hdr.Value,
-							},
-							AppendAction: pbproxystate.AppendAction_APPEND_ACTION_OVERWRITE_IF_EXISTS_OR_ADD,
-						},
-					},
-				})
-			}
-			for _, hdr := range mod.Add {
-				headerMutations = append(headerMutations, &pbproxystate.HeaderMutation{
-					Action: &pbproxystate.HeaderMutation_ResponseHeaderAdd{
-						ResponseHeaderAdd: &pbproxystate.ResponseHeaderAdd{
-							Header: &pbproxystate.Header{
-								Key:   hdr.Name,
-								Value: hdr.Value,
-							},
-							AppendAction: pbproxystate.AppendAction_APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD,
-						},
-					},
-				})
-			}
-
-			if len(mod.Remove) > 0 {
-				headerMutations = append(headerMutations, &pbproxystate.HeaderMutation{
-					Action: &pbproxystate.HeaderMutation_ResponseHeaderRemove{
-						ResponseHeaderRemove: &pbproxystate.ResponseHeaderRemove{
-							HeaderKeys: mod.Remove,
-						},
-					},
-				})
-			}
-
-		case filter.GetUrlRewrite() != nil:
-			prefix := filter.GetUrlRewrite().PathPrefix
-			if prefix != "" {
-				psDestConfig.PrefixRewrite = prefix
-			}
-		}
-	}
-	return headerMutations
-}
-
-func applyLoadBalancerPolicy[V interface {
-	GetBackendTarget() string
-}](
-	psDestConfig *pbproxystate.DestinationConfiguration,
-	cpr *pbmesh.ComputedPortRoutes,
-	backendRefs []V,
-) {
-	var lb *pbmesh.LoadBalancer
-
-	// If there are multiple targets, just pick the lb policy from
-	// the first one configured.
-	for _, backendRef := range backendRefs {
-		if backendRef.GetBackendTarget() == types.NullRouteBackend {
-			continue
-		}
-		details, ok := cpr.Targets[backendRef.GetBackendTarget()]
-		if !ok {
-			continue
-		}
-		thisLB := details.DestinationConfig.LoadBalancer
-		if thisLB != nil {
-			lb = thisLB
-			break
-		}
-	}
-
-	if lb == nil {
-		return
-	}
-
-	for _, policy := range lb.HashPolicies {
-		if policy.SourceIp {
-			psDestConfig.HashPolicies = append(psDestConfig.HashPolicies, &pbproxystate.LoadBalancerHashPolicy{
-				Policy: &pbproxystate.LoadBalancerHashPolicy_ConnectionProperties{
-					ConnectionProperties: &pbproxystate.ConnectionPropertiesPolicy{
-						SourceIp: true,
-						Terminal: policy.Terminal,
-					},
-				},
-			})
-
-			continue
-		}
-
-		// enumcover:pbmesh.HashPolicyField
-		switch policy.Field {
-		case pbmesh.HashPolicyField_HASH_POLICY_FIELD_HEADER:
-			psDestConfig.HashPolicies = append(psDestConfig.HashPolicies, &pbproxystate.LoadBalancerHashPolicy{
-				Policy: &pbproxystate.LoadBalancerHashPolicy_Header{
-					Header: &pbproxystate.HeaderPolicy{
-						Name:     policy.FieldValue,
-						Terminal: policy.Terminal,
-					},
-				},
-			})
-		case pbmesh.HashPolicyField_HASH_POLICY_FIELD_COOKIE:
-			cookie := &pbproxystate.CookiePolicy{
-				Name:     policy.FieldValue,
-				Terminal: policy.Terminal,
-			}
-			if policy.CookieConfig != nil {
-				cookie.Path = policy.CookieConfig.Path
-
-				if policy.CookieConfig.Ttl != nil {
-					if policy.CookieConfig.Ttl.AsDuration() != 0 {
-						cookie.Ttl = policy.CookieConfig.Ttl
-					}
-				}
-
-				// Envoy will generate a session cookie if the ttl is present and zero.
-				if policy.CookieConfig.Session {
-					cookie.Ttl = durationpb.New(0 * time.Second)
-				}
-			}
-
-			psDestConfig.HashPolicies = append(psDestConfig.HashPolicies, &pbproxystate.LoadBalancerHashPolicy{
-				Policy: &pbproxystate.LoadBalancerHashPolicy_Cookie{
-					Cookie: cookie,
-				},
-			})
-		case pbmesh.HashPolicyField_HASH_POLICY_FIELD_QUERY_PARAMETER:
-			psDestConfig.HashPolicies = append(psDestConfig.HashPolicies, &pbproxystate.LoadBalancerHashPolicy{
-				Policy: &pbproxystate.LoadBalancerHashPolicy_QueryParameter{
-					QueryParameter: &pbproxystate.QueryParameterPolicy{
-						Name:     policy.FieldValue,
-						Terminal: policy.Terminal,
-					},
-				},
-			})
-		case pbmesh.HashPolicyField_HASH_POLICY_FIELD_UNSPECIFIED:
-			// fallthrough to default
-		default:
-			// not possible from validation
-		}
-	}
-}
-
-func makeHTTPRouteMatch(match *pbmesh.HTTPRouteMatch) *pbproxystate.RouteMatch {
-	em := &pbproxystate.RouteMatch{}
-
-	if match.Path != nil {
-		// enumcover:pbmesh.PathMatchType
-		switch match.Path.Type {
-		case pbmesh.PathMatchType_PATH_MATCH_TYPE_EXACT:
-			em.PathMatch = &pbproxystate.PathMatch{
-				PathMatch: &pbproxystate.PathMatch_Exact{
-					Exact: match.Path.Value,
-				},
-			}
-		case pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX:
-			em.PathMatch = &pbproxystate.PathMatch{
-				PathMatch: &pbproxystate.PathMatch_Prefix{
-					Prefix: match.Path.Value,
-				},
-			}
-		case pbmesh.PathMatchType_PATH_MATCH_TYPE_REGEX:
-			em.PathMatch = &pbproxystate.PathMatch{
-				PathMatch: &pbproxystate.PathMatch_Regex{
-					Regex: match.Path.Value,
-				},
-			}
-		case pbmesh.PathMatchType_PATH_MATCH_TYPE_UNSPECIFIED:
-			fallthrough // to default
-		default:
-			panic(fmt.Sprintf("unknown path match type: %v", match.Path.Type))
-		}
-	} else {
-		em.PathMatch = &pbproxystate.PathMatch{
-			PathMatch: &pbproxystate.PathMatch_Prefix{
-				Prefix: "/",
-			},
-		}
-	}
-
-	em.HeaderMatches = translateHeaderMatches(match.Headers, (*pbmesh.HTTPHeaderMatch).GetInvert)
-
-	if match.Method != "" {
-		em.MethodMatches = []string{match.Method}
-	}
-
-	if len(match.QueryParams) > 0 {
-		em.QueryParameterMatches = make([]*pbproxystate.QueryParameterMatch, 0, len(match.QueryParams))
-		for _, qm := range match.QueryParams {
-			eq := &pbproxystate.QueryParameterMatch{
-				Name: qm.Name,
-			}
-
-			//	*QueryParameterMatch_Exact
-			// enumcover:pbmesh.QueryParamMatchType
-			switch qm.Type {
-			case pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_EXACT:
-				eq.Match = &pbproxystate.QueryParameterMatch_Exact{
-					Exact: qm.Value,
-				}
-			case pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_REGEX:
-				eq.Match = &pbproxystate.QueryParameterMatch_Regex{
-					Regex: qm.Value,
-				}
-			case pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_PRESENT:
-				eq.Match = &pbproxystate.QueryParameterMatch_Present{
-					Present: true,
-				}
-			case pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_UNSPECIFIED:
-				fallthrough // to default
-			default:
-				panic(fmt.Sprintf("unknown query param match type: %v", qm.Type))
-			}
-
-			em.QueryParameterMatches = append(em.QueryParameterMatches, eq)
-		}
-	}
-
-	return em
-}
-
-func makeGRPCRouteMatch(match *pbmesh.GRPCRouteMatch) *pbproxystate.RouteMatch {
-	em := &pbproxystate.RouteMatch{}
-
-	if match.Method != nil {
-		mm := match.Method
-		switch mm.Type {
-		case pbmesh.GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_EXACT:
-			switch {
-			case mm.Method == "":
-				em.PathMatch = &pbproxystate.PathMatch{
-					PathMatch: &pbproxystate.PathMatch_Prefix{
-						Prefix: fmt.Sprintf("/%s/", mm.Service),
-					},
-				}
-			case mm.Service == "":
-				em.PathMatch = &pbproxystate.PathMatch{
-					PathMatch: &pbproxystate.PathMatch_Regex{
-						Regex: fmt.Sprintf("/[^/]+/%s", mm.Method),
-					},
-				}
-			default:
-				em.PathMatch = &pbproxystate.PathMatch{
-					PathMatch: &pbproxystate.PathMatch_Exact{
-						Exact: fmt.Sprintf("/%s/%s", mm.Service, mm.Method),
-					},
-				}
-			}
-		case pbmesh.GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_REGEX:
-			switch {
-			case mm.Method == "":
-				em.PathMatch = &pbproxystate.PathMatch{
-					PathMatch: &pbproxystate.PathMatch_Regex{
-						Regex: fmt.Sprintf("/%s/.+", mm.Service),
-					},
-				}
-			case mm.Service == "":
-				em.PathMatch = &pbproxystate.PathMatch{
-					PathMatch: &pbproxystate.PathMatch_Regex{
-						Regex: fmt.Sprintf("/[^/]+/%s", mm.Method),
-					},
-				}
-			default:
-				em.PathMatch = &pbproxystate.PathMatch{
-					PathMatch: &pbproxystate.PathMatch_Regex{
-						Regex: fmt.Sprintf("/%s/%s", mm.Service, mm.Method),
-					},
-				}
-			}
-		case pbmesh.GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_UNSPECIFIED:
-			fallthrough // to default
-		default:
-			panic(fmt.Sprintf("unknown method match type: %v", match.Method.Type))
-		}
-	}
-
-	em.HeaderMatches = translateHeaderMatches(match.Headers, nil)
-
-	return em
-}
-
-func translateHeaderMatches[V interface {
-	GetType() pbmesh.HeaderMatchType
-	GetName() string
-	GetValue() string
-}](
-	headers []V,
-	getInvert func(v V) bool,
-) []*pbproxystate.HeaderMatch {
-	if len(headers) == 0 {
-		return nil
-	}
-	var out []*pbproxystate.HeaderMatch
-	out = make([]*pbproxystate.HeaderMatch, 0, len(headers))
-	for _, hdr := range headers {
-		eh := &pbproxystate.HeaderMatch{
-			Name: hdr.GetName(),
-		}
-
-		// enumcover:pbmesh.HeaderMatchType
-		switch hdr.GetType() {
-		case pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT:
-			eh.Match = &pbproxystate.HeaderMatch_Exact{
-				Exact: hdr.GetValue(),
-			}
-		case pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_REGEX:
-			eh.Match = &pbproxystate.HeaderMatch_Regex{
-				Regex: hdr.GetValue(),
-			}
-		case pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_PREFIX:
-			eh.Match = &pbproxystate.HeaderMatch_Prefix{
-				Prefix: hdr.GetValue(),
-			}
-		case pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_SUFFIX:
-			eh.Match = &pbproxystate.HeaderMatch_Suffix{
-				Suffix: hdr.GetValue(),
-			}
-		case pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_PRESENT:
-			eh.Match = &pbproxystate.HeaderMatch_Present{
-				Present: true,
-			}
-		case pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_UNSPECIFIED:
-			fallthrough // to default
-		default:
-			panic(fmt.Sprintf("unknown header match type: %v", hdr.GetType()))
-		}
-
-		// HTTPHeaderMatch only
-		if getInvert != nil && getInvert(hdr) {
-			eh.InvertMatch = true
-		}
-
-		out = append(out, eh)
-	}
-	return out
-}
-
-func translateTimeouts(timeouts *pbmesh.HTTPRouteTimeouts) *pbproxystate.TimeoutConfig {
-	if timeouts == nil || (timeouts.Request == nil && timeouts.Idle == nil) {
-		return nil
-	}
-
-	return &pbproxystate.TimeoutConfig{
-		Timeout:     timeouts.Request,
-		IdleTimeout: timeouts.Idle,
-	}
-}
-
-func translateRetries(retries *pbmesh.HTTPRouteRetries) *pbproxystate.RetryPolicy {
-	if retries == nil {
-		return nil
-	}
-
-	retryPolicy := &pbproxystate.RetryPolicy{}
-	if retries.Number != nil {
-		retryPolicy.NumRetries = retries.Number
-	}
-
-	// The RetryOn magic values come from: https://www.envoyproxy.io/docs/envoy/v1.10.0/configuration/http_filters/router_filter#config-http-filters-router-x-envoy-retry-on
-	var retryStrings []string
-
-	if len(retries.OnConditions) > 0 {
-		retryStrings = append(retryStrings, retries.OnConditions...)
-	}
-
-	if retries.OnConnectFailure {
-		// connect-failure can be enabled by either adding connect-failure to the RetryOn list or by using the legacy RetryOnConnectFailure option
-		// Check that it's not already in the RetryOn list, so we don't set it twice
-		connectFailureExists := false
-		for _, r := range retryStrings {
-			if r == "connect-failure" {
-				connectFailureExists = true
-			}
-		}
-		if !connectFailureExists {
-			retryStrings = append(retryStrings, "connect-failure")
-		}
-	}
-
-	if len(retries.OnStatusCodes) > 0 {
-		retryStrings = append(retryStrings, "retriable-status-codes")
-		retryPolicy.RetriableStatusCodes = retries.OnStatusCodes
-	}
-
-	retryPolicy.RetryOn = strings.Join(retryStrings, ",")
-
-	return retryPolicy
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy.golden
deleted file mode 100644
index a6650f6710e31..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy.golden
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination"
-      },
-      "tcp.api-1.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-1.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.default.dc1.internal.foo.consul"
-      },
-      "tcp.api-2.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-2.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.default.dc1.internal.foo.consul"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-1.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-1.default.default.dc1"
-            }
-          }
-        ]
-      },
-      {
-        "capabilities": [
-          "CAPABILITY_TRANSPARENT"
-        ],
-        "defaultRouter": {
-          "l4": {
-            "cluster": {
-              "name": "original-destination"
-            },
-            "statPrefix": "upstream.original-destination"
-          }
-        },
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "127.0.0.1",
-          "port": 15001
-        },
-        "name": "outbound_listener",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.default.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination.golden
deleted file mode 100644
index 6d85b6dc6e32c..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination.golden
+++ /dev/null
@@ -1,310 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster"
-      },
-      "tcp.api-1.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-1.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.default.dc1.internal.foo.consul"
-      },
-      "tcp.api-2.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-2.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.default.dc1.internal.foo.consul"
-      },
-      "tcp2.api-1.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.api-1.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-1.default.dc1.internal.foo.consul"
-      },
-      "tcp2.api-2.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.api-2.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-2.default.dc1.internal.foo.consul"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp.api-1.default.default.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp.api-2.default.dc1.internal.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp.api-1.default.dc1.internal.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "api-2:tcp:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.default.default.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 2345
-        },
-        "name": "api-1:tcp2:1.1.1.1:2345",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp2.api-1.default.default.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp2.api-2.default.dc1.internal.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp2.api-1.default.dc1.internal.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "api-2:tcp2:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-2.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-2.default.default.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-1.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-2.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy.golden
deleted file mode 100644
index 128c8fff3e26f..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy.golden
+++ /dev/null
@@ -1,185 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination"
-      },
-      "tcp.api-1.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-1.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.default.dc1.internal.foo.consul"
-      },
-      "tcp.api-2.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-2.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.default.dc1.internal.foo.consul"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_TRANSPARENT"
-        ],
-        "defaultRouter": {
-          "l4": {
-            "cluster": {
-              "name": "original-destination"
-            },
-            "statPrefix": "upstream.original-destination"
-          }
-        },
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "127.0.0.1",
-          "port": 15001
-        },
-        "name": "outbound_listener",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-1.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-1.default.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.default.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address.golden
deleted file mode 100644
index 19536f05ccb81..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address.golden
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster"
-      },
-      "tcp.api-1.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-1.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.default.dc1.internal.foo.consul"
-      },
-      "tcp.api-2.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-2.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.default.dc1.internal.foo.consul"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp.api-1.default.default.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp.api-2.default.dc1.internal.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp.api-1.default.dc1.internal.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address.golden
deleted file mode 100644
index 37e499a6ae3e1..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address.golden
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "tcp.api-2.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-2.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.default.dc1.internal.foo.consul"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "api-2:tcp:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.default.default.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-2.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy.golden
deleted file mode 100644
index 36be8f2f94ad5..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy.golden
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination"
-      },
-      "tcp.api-1.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-1.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.default.dc1.internal.foo.consul"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_TRANSPARENT"
-        ],
-        "defaultRouter": {
-          "l4": {
-            "cluster": {
-              "name": "original-destination"
-            },
-            "statPrefix": "upstream.original-destination"
-          }
-        },
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "127.0.0.1",
-          "port": 15001
-        },
-        "name": "outbound_listener",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-1.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-1.default.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination.golden
deleted file mode 100644
index 5ccf817640dad..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination.golden
+++ /dev/null
@@ -1,399 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "http.api-1.default.dc1.internal.foo.consul": {
-        "altStatName": "http.api-1.default.dc1.internal.foo.consul",
-        "failoverGroup": {
-          "config": {
-            "connectTimeout": "55s",
-            "useAltStatName": true
-          },
-          "endpointGroups": [
-            {
-              "dynamic": {
-                "config": {
-                  "connectTimeout": "55s",
-                  "disablePanicThreshold": true
-                },
-                "outboundTls": {
-                  "alpnProtocols": [
-                    "consul~http"
-                  ],
-                  "outboundMesh": {
-                    "identityKey": "test-identity",
-                    "sni": "api-1.default.dc1.internal.foo.consul",
-                    "validationContext": {
-                      "spiffeIds": [
-                        "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity"
-                      ],
-                      "trustBundlePeerNameKey": "local"
-                    }
-                  }
-                }
-              }
-            },
-            {
-              "dynamic": {
-                "config": {
-                  "connectTimeout": "5s",
-                  "disablePanicThreshold": true
-                },
-                "outboundTls": {
-                  "alpnProtocols": [
-                    "consul~http"
-                  ],
-                  "outboundMesh": {
-                    "identityKey": "test-identity",
-                    "sni": "backup-1.default.dc1.internal.foo.consul",
-                    "validationContext": {
-                      "spiffeIds": [
-                        "spiffe://foo.consul/ap/default/ns/default/identity/backup1-identity"
-                      ],
-                      "trustBundlePeerNameKey": "local"
-                    }
-                  }
-                }
-              },
-              "name": "failover-target~0~http.api-1.default.dc1.internal.foo.consul"
-            }
-          ]
-        },
-        "name": "http.api-1.default.dc1.internal.foo.consul"
-      },
-      "http.api-2.default.dc1.internal.foo.consul": {
-        "altStatName": "http.api-2.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-2.default.dc1.internal.foo.consul"
-      },
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster"
-      },
-      "tcp.api-1.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-1.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.default.dc1.internal.foo.consul"
-      },
-      "tcp.api-2.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-2.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.default.dc1.internal.foo.consul"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp.api-1.default.default.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp.api-2.default.dc1.internal.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp.api-1.default.dc1.internal.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "api-2:tcp:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.default.default.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "api-1:http:1.1.1.1:1234",
-        "routers": [
-          {
-            "l7": {
-              "name": "api-1:http:1.1.1.1:1234",
-              "statPrefix": "upstream."
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "api-1:http:1.1.1.1:1234": {
-        "virtualHosts": [
-          {
-            "name": "api-1:http:1.1.1.1:1234",
-            "routeRules": [
-              {
-                "destination": {
-                  "destinationConfiguration": {
-                    "timeoutConfig": {
-                      "timeout": "77s"
-                    }
-                  },
-                  "weightedClusters": {
-                    "clusters": [
-                      {
-                        "name": "http.api-2.default.dc1.internal.foo.consul",
-                        "weight": 60
-                      },
-                      {
-                        "name": "http.api-1.default.dc1.internal.foo.consul",
-                        "weight": 40
-                      },
-                      {
-                        "name": "null_route_cluster",
-                        "weight": 10
-                      }
-                    ]
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/split"
-                  }
-                }
-              },
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-1.default.dc1.internal.foo.consul"
-                  },
-                  "destinationConfiguration": {
-                    "retryPolicy": {
-                      "numRetries": 4,
-                      "retryOn": "connect-failure"
-                    },
-                    "timeoutConfig": {
-                      "timeout": "606s"
-                    }
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              },
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "null_route_cluster"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredEndpoints": {
-    "failover-target~0~http.api-1.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "backup-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "http.api-1.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "http.api-2.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-1.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-multiple-implicit-destinations-tproxy.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-multiple-implicit-destinations-tproxy.golden
deleted file mode 100644
index 53aacf89445cb..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-multiple-implicit-destinations-tproxy.golden
+++ /dev/null
@@ -1,452 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination"
-      },
-      "http.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "http.api-app.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-app.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": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app2.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api-app2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-app2.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": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-app.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": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app2.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api-app2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-app2.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": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app.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": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app2.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api-app2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app2.default.dc1.internal.foo.consul"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_TRANSPARENT"
-        ],
-        "defaultRouter": {
-          "l4": {
-            "cluster": {
-              "name": "original-destination"
-            },
-            "statPrefix": "upstream.original-destination"
-          }
-        },
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "127.0.0.1",
-          "port": 15001
-        },
-        "name": "outbound_listener",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-app.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app.default.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-app2.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app2.default.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "name": "outbound_listener",
-              "statPrefix": "upstream."
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "name": "outbound_listener",
-              "statPrefix": "upstream."
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app.default.default.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app2.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app2.default.default.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "outbound_listener": {
-        "virtualHosts": [
-          {
-            "name": "outbound_listener",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app2.default.dc1.internal.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredEndpoints": {
-    "http.api-app.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "http.api-app2.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app2.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app2.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-single-implicit-destination-tproxy.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-single-implicit-destination-tproxy.golden
deleted file mode 100644
index 11d37d6b19abc..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-single-implicit-destination-tproxy.golden
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination"
-      },
-      "http.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "http.api-app.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "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": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "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": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app.default.dc1.internal.foo.consul"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_TRANSPARENT"
-        ],
-        "defaultRouter": {
-          "l4": {
-            "cluster": {
-              "name": "original-destination"
-            },
-            "statPrefix": "upstream.original-destination"
-          }
-        },
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "127.0.0.1",
-          "port": 15001
-        },
-        "name": "outbound_listener",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-app.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app.default.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "name": "outbound_listener",
-              "statPrefix": "upstream."
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app.default.default.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "outbound_listener": {
-        "virtualHosts": [
-          {
-            "name": "outbound_listener",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app.default.dc1.internal.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredEndpoints": {
-    "http.api-app.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-single-implicit-destination-with-multiple-workloads-tproxy.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-single-implicit-destination-with-multiple-workloads-tproxy.golden
deleted file mode 100644
index 11d37d6b19abc..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-single-implicit-destination-with-multiple-workloads-tproxy.golden
+++ /dev/null
@@ -1,262 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination"
-      },
-      "http.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "http.api-app.default.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "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": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "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": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app.default.dc1.internal.foo.consul"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_TRANSPARENT"
-        ],
-        "defaultRouter": {
-          "l4": {
-            "cluster": {
-              "name": "original-destination"
-            },
-            "statPrefix": "upstream.original-destination"
-          }
-        },
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "127.0.0.1",
-          "port": 15001
-        },
-        "name": "outbound_listener",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-app.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app.default.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "name": "outbound_listener",
-              "statPrefix": "upstream."
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app.default.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app.default.default.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "outbound_listener": {
-        "virtualHosts": [
-          {
-            "name": "outbound_listener",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app.default.dc1.internal.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredEndpoints": {
-    "http.api-app.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app.default.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-multiple-workload-addresses-with-specific-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-multiple-workload-addresses-with-specific-ports.golden
deleted file mode 100644
index 153c5b3ddaf5e..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-multiple-workload-addresses-with-specific-ports.golden
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:port1": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:port1"
-      }
-    },
-    "endpoints": {
-      "local_app:port1": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_L4_TLS_INSPECTION"
-        ],
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.2",
-          "port": 20000
-        },
-        "name": "public_listener",
-        "routers": [
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:port1"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {
-                "allowPermissions": [
-                  {
-                    "principals": [
-                      {
-                        "spiffe": {
-                          "regex": "^spiffe://foo.consul/ap/default/ns/default/identity/foo$"
-                        }
-                      }
-                    ]
-                  }
-                ]
-              }
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~port1"
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-multiple-workload-addresses-without-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-multiple-workload-addresses-without-ports.golden
deleted file mode 100644
index c1cf420a73326..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-multiple-workload-addresses-without-ports.golden
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:port1": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:port1"
-      }
-    },
-    "endpoints": {
-      "local_app:port1": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_L4_TLS_INSPECTION"
-        ],
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 20000
-        },
-        "name": "public_listener",
-        "routers": [
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:port1"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~port1"
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-single-workload-address-without-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-single-workload-address-without-ports.golden
deleted file mode 100644
index c1cf420a73326..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-single-workload-address-without-ports.golden
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:port1": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:port1"
-      }
-    },
-    "endpoints": {
-      "local_app:port1": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_L4_TLS_INSPECTION"
-        ],
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 20000
-        },
-        "name": "public_listener",
-        "routers": [
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:port1"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~port1"
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden
deleted file mode 100644
index 4df1d263fb7ee..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port"
-      }
-    },
-    "endpoints": {
-      "local_app:admin-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      },
-      "local_app:api-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9090
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_L4_TLS_INSPECTION"
-        ],
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.3",
-          "port": 20000
-        },
-        "name": "public_listener",
-        "routers": [
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:api-port"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports.golden
deleted file mode 100644
index 6c9a1942dcc91..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports.golden
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port"
-      }
-    },
-    "endpoints": {
-      "local_app:admin-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      },
-      "local_app:api-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9090
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_L4_TLS_INSPECTION"
-        ],
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 20000
-        },
-        "name": "public_listener",
-        "routers": [
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:api-port"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports.golden
deleted file mode 100644
index 6c9a1942dcc91..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports.golden
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port"
-      }
-    },
-    "endpoints": {
-      "local_app:admin-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      },
-      "local_app:api-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9090
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_L4_TLS_INSPECTION"
-        ],
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 20000
-        },
-        "name": "public_listener",
-        "routers": [
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:api-port"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port.golden
deleted file mode 100644
index cadf4eed657e7..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "black-hole-cluster": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "black-hole-cluster"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_L4_TLS_INSPECTION"
-        ],
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 20000
-        },
-        "name": "public_listener",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "black-hole-cluster"
-              },
-              "statPrefix": "public_listener"
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/controller.go b/internal/mesh/internal/controllers/sidecarproxy/controller.go
deleted file mode 100644
index 17d69cce4393e..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/controller.go
+++ /dev/null
@@ -1,289 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxy
-
-import (
-	"context"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/cache/sidecarproxycache"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/sidecarproxy/builder"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/sidecarproxy/fetcher"
-	"github.com/hashicorp/consul/internal/mesh/internal/mappers/sidecarproxymapper"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// ControllerName is the name for this controller. It's used for logging or status keys.
-const ControllerName = "consul.io/sidecar-proxy-controller"
-
-type TrustDomainFetcher func() (string, error)
-
-func Controller(
-	destinationsCache *sidecarproxycache.DestinationsCache,
-	proxyCfgCache *sidecarproxycache.ProxyConfigurationCache,
-	computedRoutesCache *sidecarproxycache.ComputedRoutesCache,
-	identitiesCache *sidecarproxycache.IdentitiesCache,
-	mapper *sidecarproxymapper.Mapper,
-	trustDomainFetcher TrustDomainFetcher,
-	dc string,
-	defaultAllow bool,
-) controller.Controller {
-	if destinationsCache == nil || proxyCfgCache == nil || computedRoutesCache == nil || identitiesCache == nil || mapper == nil || trustDomainFetcher == nil {
-		panic("destinations cache, proxy configuration cache, computed routes cache, identities cache, mapper, and trust domain fetcher are required")
-	}
-
-	/*
-		Workload           <align>   PST
-		Upstreams          <select>  PST(==Workload)
-		Upstreams          <contain> Service(upstream)
-		ProxyConfiguration <select>  PST(==Workload)
-		ComputedRoutes     <align>   Service(upstream)
-		ComputedRoutes     <contain> Service(disco)
-		ServiceEndpoints   <align>   Service(disco)
-
-		These relationships then dicate the following reconcile logic.
-
-		controller: read workload for PST
-		controller: read previous PST
-		controller: read ProxyConfiguration for Workload
-		controller: use cached Upstreams data to walk explicit upstreams
-		<EXPLICIT-for-each>
-			fetcher: read Upstreams to find single Upstream
-			fetcher: read Service(upstream)
-			fetcher: read ComputedRoutes
-			<TARGET-for-each>
-				fetcher: read ServiceEndpoints
-			</TARGET-for-each>
-		</EXPLICIT-for-each>
-		<IMPLICIT>
-			fetcher: list ALL ComputedRoutes
-			<CR-for-each>
-				fetcher: read Service(upstream)
-				<TARGET-for-each>
-					fetcher: read ServiceEndpoints
-				</TARGET-for-each>
-			</CR-for-each>
-		</IMPLICIT>
-	*/
-
-	/*
-		Which means for equivalence, the following mapper relationships should exist:
-
-		Service:            find upstreams with Service; Recurse(Upstreams)
-		ServiceEndpoints:   ServiceEndpoints=>Service; find ComputedRoutes with this in a Target or FailoverConfig; Recurse(ComputedRoutes)
-		Upstreams:          use selector to select workloads; workloads=>PST
-		ProxyConfiguration: use selector to select workloads; workloads=>PST
-		ComputedRoutes:     CR=>Service; find upstreams with Service; Recurse(Upstreams)
-							[implicit/temp]: trigger all
-	*/
-
-	return controller.ForType(pbmesh.ProxyStateTemplateType).
-		WithWatch(pbcatalog.ServiceType, mapper.MapServiceToProxyStateTemplate).
-		WithWatch(pbcatalog.ServiceEndpointsType, mapper.MapServiceEndpointsToProxyStateTemplate).
-		WithWatch(pbmesh.DestinationsType, mapper.MapDestinationsToProxyStateTemplate).
-		WithWatch(pbmesh.ProxyConfigurationType, mapper.MapProxyConfigurationToProxyStateTemplate).
-		WithWatch(pbmesh.ComputedRoutesType, mapper.MapComputedRoutesToProxyStateTemplate).
-		WithWatch(pbauth.ComputedTrafficPermissionsType, mapper.MapComputedTrafficPermissionsToProxyStateTemplate).
-		WithReconciler(&reconciler{
-			destinationsCache:   destinationsCache,
-			proxyCfgCache:       proxyCfgCache,
-			computedRoutesCache: computedRoutesCache,
-			identitiesCache:     identitiesCache,
-			getTrustDomain:      trustDomainFetcher,
-			dc:                  dc,
-			defaultAllow:        defaultAllow,
-		})
-}
-
-type reconciler struct {
-	destinationsCache   *sidecarproxycache.DestinationsCache
-	proxyCfgCache       *sidecarproxycache.ProxyConfigurationCache
-	computedRoutesCache *sidecarproxycache.ComputedRoutesCache
-	identitiesCache     *sidecarproxycache.IdentitiesCache
-	getTrustDomain      TrustDomainFetcher
-	defaultAllow        bool
-	dc                  string
-}
-
-func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	rt.Logger = rt.Logger.With("resource-id", req.ID, "controller", ControllerName)
-
-	rt.Logger.Trace("reconciling proxy state template")
-
-	// Instantiate a data fetcher to fetch all reconciliation data.
-	dataFetcher := fetcher.New(
-		rt.Client,
-		r.destinationsCache,
-		r.proxyCfgCache,
-		r.computedRoutesCache,
-		r.identitiesCache,
-	)
-
-	// Check if the workload exists.
-	workloadID := resource.ReplaceType(pbcatalog.WorkloadType, req.ID)
-	workload, err := dataFetcher.FetchWorkload(ctx, workloadID)
-	if err != nil {
-		rt.Logger.Error("error reading the associated workload", "error", err)
-		return err
-	}
-	if workload == nil {
-		// If workload has been deleted, then return as ProxyStateTemplate should be cleaned up
-		// by the garbage collector because of the owner reference.
-		rt.Logger.Trace("workload doesn't exist; skipping reconciliation", "workload", workloadID)
-		return nil
-	}
-
-	proxyStateTemplate, err := dataFetcher.FetchProxyStateTemplate(ctx, req.ID)
-	if err != nil {
-		rt.Logger.Error("error reading proxy state template", "error", err)
-		return nil
-	}
-
-	if proxyStateTemplate == nil {
-		// If proxy state template has been deleted, we will need to generate a new one.
-		rt.Logger.Trace("proxy state template for this workload doesn't yet exist; generating a new one")
-	}
-
-	if !fetcher.IsWorkloadMeshEnabled(workload.Data.Ports) {
-		// Skip non-mesh workloads.
-
-		// If there's existing proxy state template, delete it.
-		if proxyStateTemplate != nil {
-			rt.Logger.Trace("deleting existing proxy state template because workload is no longer on the mesh")
-			_, err = rt.Client.Delete(ctx, &pbresource.DeleteRequest{Id: req.ID})
-			if err != nil {
-				rt.Logger.Error("error deleting existing proxy state template", "error", err)
-				return err
-			}
-
-			// Remove it from destinationsCache.
-			r.destinationsCache.DeleteSourceProxy(req.ID)
-		}
-		rt.Logger.Trace("skipping proxy state template generation because workload is not on the mesh", "workload", workload.Resource.Id)
-		return nil
-	}
-
-	// First get the trust domain.
-	trustDomain, err := r.getTrustDomain()
-	if err != nil {
-		rt.Logger.Error("error fetching trust domain to compute proxy state template", "error", err)
-		return err
-	}
-
-	// Fetch proxy configuration.
-	proxyCfg, err := dataFetcher.FetchAndMergeProxyConfigurations(ctx, req.ID)
-	if err != nil {
-		rt.Logger.Error("error fetching proxy and merging proxy configurations", "error", err)
-		return err
-	}
-
-	trafficPermissions, err := dataFetcher.FetchComputedTrafficPermissions(ctx, computedTrafficPermissionsIDFromWorkload(workload))
-	if err != nil {
-		rt.Logger.Error("error fetching computed traffic permissions to compute proxy state template", "error", err)
-		return err
-	}
-
-	var ctp *pbauth.ComputedTrafficPermissions
-	if trafficPermissions != nil {
-		ctp = trafficPermissions.Data
-	}
-
-	b := builder.New(req.ID, identityRefFromWorkload(workload), trustDomain, r.dc, r.defaultAllow, proxyCfg).
-		BuildLocalApp(workload.Data, ctp)
-
-	// Get all destinationsData.
-	destinationsRefs := r.destinationsCache.DestinationsBySourceProxy(req.ID)
-	if len(destinationsRefs) > 0 {
-		rt.Logger.Trace("found destinations for this proxy", "id", req.ID, "destination_refs", destinationsRefs)
-	} else {
-		rt.Logger.Trace("did not find any destinations for this proxy", "id", req.ID)
-	}
-	destinationsData, statuses, err := dataFetcher.FetchExplicitDestinationsData(ctx, destinationsRefs)
-	if err != nil {
-		rt.Logger.Error("error fetching explicit destinations for this proxy", "error", err)
-		return err
-	}
-
-	if proxyCfg.IsTransparentProxy() {
-		destinationsData, err = dataFetcher.FetchImplicitDestinationsData(ctx, req.ID, destinationsData)
-		if err != nil {
-			rt.Logger.Error("error fetching implicit destinations for this proxy", "error", err)
-			return err
-		}
-	}
-
-	b.BuildDestinations(destinationsData)
-
-	newProxyTemplate := b.Build()
-
-	if proxyStateTemplate == nil || !proto.Equal(proxyStateTemplate.Data, newProxyTemplate) {
-		if proxyStateTemplate == nil {
-			req.ID.Uid = ""
-		}
-		proxyTemplateData, err := anypb.New(newProxyTemplate)
-		if err != nil {
-			rt.Logger.Error("error creating proxy state template data", "error", err)
-			return err
-		}
-		rt.Logger.Trace("updating proxy state template")
-		_, err = rt.Client.Write(ctx, &pbresource.WriteRequest{
-			Resource: &pbresource.Resource{
-				Id:    req.ID,
-				Owner: workload.Resource.Id,
-				Data:  proxyTemplateData,
-			},
-		})
-		if err != nil {
-			rt.Logger.Error("error writing proxy state template", "error", err)
-			return err
-		}
-	} else {
-		rt.Logger.Trace("proxy state template data has not changed, skipping update")
-	}
-
-	// Update any statuses.
-	for _, status := range statuses {
-		updatedStatus := &pbresource.Status{
-			ObservedGeneration: status.Generation,
-		}
-		updatedStatus.Conditions = status.Conditions
-		// If the status is unchanged then we should return and avoid the unnecessary write
-		if !resource.EqualStatus(status.OldStatus[ControllerName], updatedStatus, false) {
-			rt.Logger.Trace("updating status", "id", status.ID)
-			_, err = rt.Client.WriteStatus(ctx, &pbresource.WriteStatusRequest{
-				Id:     status.ID,
-				Key:    ControllerName,
-				Status: updatedStatus,
-			})
-			if err != nil {
-				rt.Logger.Error("error writing new status", "id", status.ID, "error", err)
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func identityRefFromWorkload(w *types.DecodedWorkload) *pbresource.Reference {
-	return &pbresource.Reference{
-		Name:    w.Data.Identity,
-		Tenancy: w.Resource.Id.Tenancy,
-	}
-}
-
-func computedTrafficPermissionsIDFromWorkload(w *types.DecodedWorkload) *pbresource.ID {
-	return &pbresource.ID{
-		Type:    pbauth.ComputedTrafficPermissionsType,
-		Name:    w.Data.Identity,
-		Tenancy: w.Resource.Id.Tenancy,
-	}
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/controller_test.go b/internal/mesh/internal/controllers/sidecarproxy/controller_test.go
deleted file mode 100644
index 7c6d634c3637b..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/controller_test.go
+++ /dev/null
@@ -1,797 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxy
-
-import (
-	"context"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/envoyextensions/xdscommon"
-	"github.com/hashicorp/consul/internal/auth"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/cache/sidecarproxycache"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes/routestest"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/sidecarproxy/builder"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/sidecarproxy/status"
-	"github.com/hashicorp/consul/internal/mesh/internal/mappers/sidecarproxymapper"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-)
-
-type meshControllerTestSuite struct {
-	suite.Suite
-
-	client  *resourcetest.Client
-	runtime controller.Runtime
-
-	ctl *reconciler
-	ctx context.Context
-
-	apiWorkloadID                     *pbresource.ID
-	apiWorkload                       *pbcatalog.Workload
-	apiComputedTrafficPermissions     *pbresource.Resource
-	apiComputedTrafficPermissionsData *pbauth.ComputedTrafficPermissions
-	apiService                        *pbresource.Resource
-	apiServiceData                    *pbcatalog.Service
-	apiEndpoints                      *pbresource.Resource
-	apiEndpointsData                  *pbcatalog.ServiceEndpoints
-	webWorkload                       *pbresource.Resource
-
-	dbWorkloadID    *pbresource.ID
-	dbWorkload      *pbcatalog.Workload
-	dbService       *pbresource.Resource
-	dbEndpoints     *pbresource.Resource
-	dbEndpointsData *pbcatalog.ServiceEndpoints
-
-	proxyStateTemplate *pbmesh.ProxyStateTemplate
-}
-
-func (suite *meshControllerTestSuite) SetupTest() {
-	resourceClient := svctest.RunResourceService(suite.T(), types.Register, catalog.RegisterTypes, auth.RegisterTypes)
-	suite.client = resourcetest.NewClient(resourceClient)
-	suite.runtime = controller.Runtime{Client: resourceClient, Logger: testutil.Logger(suite.T())}
-	suite.ctx = testutil.TestContext(suite.T())
-
-	suite.ctl = &reconciler{
-		destinationsCache: sidecarproxycache.NewDestinationsCache(),
-		proxyCfgCache:     sidecarproxycache.NewProxyConfigurationCache(),
-		identitiesCache:   sidecarproxycache.NewIdentitiesCache(),
-		getTrustDomain: func() (string, error) {
-			return "test.consul", nil
-		},
-	}
-
-	{
-		// DB will be a service with a single workload, IN the mesh that will
-		// be a destination of web.
-
-		suite.dbWorkload = &pbcatalog.Workload{
-			Identity: "db-identity",
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "10.0.4.1"},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				"mesh": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			},
-		}
-		suite.dbWorkloadID = resourcetest.Resource(pbcatalog.WorkloadType, "db-abc").
-			WithData(suite.T(), suite.dbWorkload).
-			Write(suite.T(), resourceClient).Id
-
-		suite.dbService = resourcetest.Resource(pbcatalog.ServiceType, "db-service").
-			WithData(suite.T(), &pbcatalog.Service{
-				Workloads:  &pbcatalog.WorkloadSelector{Names: []string{"db-abc"}},
-				VirtualIps: []string{"1.1.1.1"},
-				Ports: []*pbcatalog.ServicePort{
-					{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-					{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				}}).
-			Write(suite.T(), suite.client)
-
-		suite.dbEndpointsData = &pbcatalog.ServiceEndpoints{
-			Endpoints: []*pbcatalog.Endpoint{
-				{
-					TargetRef: suite.dbWorkloadID,
-					Addresses: suite.dbWorkload.Addresses,
-					Ports:     suite.dbWorkload.Ports,
-					Identity:  "db-identity",
-				},
-			},
-		}
-		suite.dbEndpoints = resourcetest.Resource(pbcatalog.ServiceEndpointsType, "db-service").
-			WithData(suite.T(), suite.dbEndpointsData).
-			Write(suite.T(), suite.client)
-
-	}
-
-	suite.apiWorkload = &pbcatalog.Workload{
-		Identity: "api-identity",
-		Addresses: []*pbcatalog.WorkloadAddress{
-			{
-				Host: "10.0.0.1",
-			},
-		},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"tcp":  {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			"mesh": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-		},
-	}
-
-	suite.apiWorkloadID = resourcetest.Resource(pbcatalog.WorkloadType, "api-abc").
-		WithData(suite.T(), suite.apiWorkload).
-		Write(suite.T(), resourceClient).Id
-
-	suite.apiServiceData = &pbcatalog.Service{
-		Workloads:  &pbcatalog.WorkloadSelector{Names: []string{"api-abc"}},
-		VirtualIps: []string{"1.1.1.1"},
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-		},
-	}
-
-	suite.apiComputedTrafficPermissionsData = &pbauth.ComputedTrafficPermissions{
-		IsDefault: false,
-		AllowPermissions: []*pbauth.Permission{
-			{
-				Sources: []*pbauth.Source{
-					{
-						IdentityName: "foo",
-						Namespace:    "default",
-						Partition:    "default",
-						Peer:         "local",
-					},
-				},
-			},
-		},
-	}
-
-	suite.apiComputedTrafficPermissions = resourcetest.Resource(pbauth.ComputedTrafficPermissionsType, suite.apiWorkload.Identity).
-		WithData(suite.T(), suite.apiComputedTrafficPermissionsData).
-		Write(suite.T(), resourceClient)
-
-	suite.apiService = resourcetest.Resource(pbcatalog.ServiceType, "api-service").
-		WithData(suite.T(), suite.apiServiceData).
-		Write(suite.T(), suite.client.ResourceServiceClient)
-
-	suite.apiEndpointsData = &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				TargetRef: suite.apiWorkloadID,
-				Addresses: suite.apiWorkload.Addresses,
-				Ports:     suite.apiWorkload.Ports,
-				Identity:  "api-identity",
-			},
-		},
-	}
-	suite.apiEndpoints = resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-service").
-		WithData(suite.T(), suite.apiEndpointsData).
-		Write(suite.T(), suite.client.ResourceServiceClient)
-
-	webWorkloadData := &pbcatalog.Workload{
-		Identity: "web-identity",
-		Addresses: []*pbcatalog.WorkloadAddress{
-			{
-				Host: "10.0.0.2",
-			},
-		},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"tcp":  {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			"mesh": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-		},
-	}
-	suite.webWorkload = resourcetest.Resource(pbcatalog.WorkloadType, "web-def").
-		WithData(suite.T(), webWorkloadData).
-		Write(suite.T(), suite.client)
-
-	resourcetest.Resource(pbauth.ComputedTrafficPermissionsType, webWorkloadData.Identity).
-		WithData(suite.T(), &pbauth.ComputedTrafficPermissions{IsDefault: true}).
-		Write(suite.T(), resourceClient)
-
-	resourcetest.Resource(pbcatalog.ServiceType, "web").
-		WithData(suite.T(), &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{Names: []string{"web-def"}},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			}}).
-		Write(suite.T(), suite.client)
-
-	resourcetest.Resource(pbcatalog.ServiceEndpointsType, "web").
-		WithData(suite.T(), &pbcatalog.ServiceEndpoints{
-			Endpoints: []*pbcatalog.Endpoint{
-				{
-					TargetRef: suite.webWorkload.Id,
-					Addresses: webWorkloadData.Addresses,
-					Ports:     webWorkloadData.Ports,
-					Identity:  "web-identity",
-				},
-			},
-		}).Write(suite.T(), suite.client)
-
-	identityRef := &pbresource.Reference{
-		Name:    suite.apiWorkload.Identity,
-		Tenancy: suite.apiWorkloadID.Tenancy,
-	}
-
-	suite.proxyStateTemplate = builder.New(suite.apiWorkloadID, identityRef, "test.consul", "dc1", false, nil).
-		BuildLocalApp(suite.apiWorkload, suite.apiComputedTrafficPermissionsData).
-		Build()
-}
-
-func (suite *meshControllerTestSuite) TestReconcile_NoWorkload() {
-	// This test ensures that removed workloads are ignored and don't result
-	// in the creation of the proxy state template.
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: resourceID(pbmesh.ProxyStateTemplateType, "not-found"),
-	})
-	require.NoError(suite.T(), err)
-
-	suite.client.RequireResourceNotFound(suite.T(), resourceID(pbmesh.ProxyStateTemplateType, "not-found"))
-}
-
-func (suite *meshControllerTestSuite) TestReconcile_NonMeshWorkload() {
-	// This test ensures that non-mesh workloads are ignored by the controller.
-
-	nonMeshWorkload := &pbcatalog.Workload{
-		Addresses: []*pbcatalog.WorkloadAddress{
-			{
-				Host: "10.0.0.1",
-			},
-		},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"tcp": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-		},
-	}
-
-	resourcetest.Resource(pbcatalog.WorkloadType, "test-non-mesh-api-workload").
-		WithData(suite.T(), nonMeshWorkload).
-		Write(suite.T(), suite.client.ResourceServiceClient)
-
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: resourceID(pbmesh.ProxyStateTemplateType, "test-non-mesh-api-workload"),
-	})
-
-	require.NoError(suite.T(), err)
-	suite.client.RequireResourceNotFound(suite.T(), resourceID(pbmesh.ProxyStateTemplateType, "test-non-mesh-api-workload"))
-}
-
-func (suite *meshControllerTestSuite) TestReconcile_NoExistingProxyStateTemplate() {
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: resourceID(pbmesh.ProxyStateTemplateType, suite.apiWorkloadID.Name),
-	})
-	require.NoError(suite.T(), err)
-
-	res := suite.client.RequireResourceExists(suite.T(), resourceID(pbmesh.ProxyStateTemplateType, suite.apiWorkloadID.Name))
-	require.NoError(suite.T(), err)
-	require.NotNil(suite.T(), res.Data)
-	prototest.AssertDeepEqual(suite.T(), suite.apiWorkloadID, res.Owner)
-}
-
-func (suite *meshControllerTestSuite) TestReconcile_ExistingProxyStateTemplate_WithUpdates() {
-	// This test ensures that we write a new proxy state template when there are changes.
-
-	// Write the original.
-	resourcetest.Resource(pbmesh.ProxyStateTemplateType, "api-abc").
-		WithData(suite.T(), suite.proxyStateTemplate).
-		WithOwner(suite.apiWorkloadID).
-		Write(suite.T(), suite.client.ResourceServiceClient)
-
-	// Update the apiWorkload.
-	suite.apiWorkload.Ports["mesh"].Port = 21000
-	updatedWorkloadID := resourcetest.Resource(pbcatalog.WorkloadType, "api-abc").
-		WithData(suite.T(), suite.apiWorkload).
-		Write(suite.T(), suite.client.ResourceServiceClient).Id
-
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: resourceID(pbmesh.ProxyStateTemplateType, updatedWorkloadID.Name),
-	})
-	require.NoError(suite.T(), err)
-
-	res := suite.client.RequireResourceExists(suite.T(), resourceID(pbmesh.ProxyStateTemplateType, updatedWorkloadID.Name))
-	require.NoError(suite.T(), err)
-	require.NotNil(suite.T(), res.Data)
-	prototest.AssertDeepEqual(suite.T(), updatedWorkloadID, res.Owner)
-
-	var updatedProxyStateTemplate pbmesh.ProxyStateTemplate
-	err = res.Data.UnmarshalTo(&updatedProxyStateTemplate)
-	require.NoError(suite.T(), err)
-
-	// Check that our value is updated in the proxy state template.
-	inboundListenerPort := updatedProxyStateTemplate.ProxyState.Listeners[0].
-		BindAddress.(*pbproxystate.Listener_HostPort).HostPort.Port
-	require.Equal(suite.T(), uint32(21000), inboundListenerPort)
-}
-
-func (suite *meshControllerTestSuite) TestReconcile_ExistingProxyStateTemplate_NoUpdates() {
-	// This test ensures that we skip writing of the proxy state template when there are no changes to it.
-
-	// Write the original.
-	originalProxyState := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "api-abc").
-		WithData(suite.T(), suite.proxyStateTemplate).
-		WithOwner(suite.apiWorkloadID).
-		Write(suite.T(), suite.client.ResourceServiceClient)
-
-	// Update the metadata on the apiWorkload which should result in no changes.
-	updatedWorkloadID := resourcetest.Resource(pbcatalog.WorkloadType, "api-abc").
-		WithData(suite.T(), suite.apiWorkload).
-		WithMeta("some", "meta").
-		Write(suite.T(), suite.client.ResourceServiceClient).Id
-
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: resourceID(pbmesh.ProxyStateTemplateType, updatedWorkloadID.Name),
-	})
-	require.NoError(suite.T(), err)
-
-	updatedProxyState := suite.client.RequireResourceExists(suite.T(), resourceID(pbmesh.ProxyStateTemplateType, suite.apiWorkloadID.Name))
-	resourcetest.RequireVersionUnchanged(suite.T(), updatedProxyState, originalProxyState.Version)
-}
-
-func (suite *meshControllerTestSuite) TestController() {
-	// This is a comprehensive test that checks the overall controller behavior as various resources change state.
-	// This should test interactions between the reconciler, the mappers, and the destinationsCache to ensure they work
-	// together and produce expected result.
-
-	// Run the controller manager
-	mgr := controller.NewManager(suite.client, suite.runtime.Logger)
-
-	// Initialize controller dependencies.
-	var (
-		destinationsCache   = sidecarproxycache.NewDestinationsCache()
-		proxyCfgCache       = sidecarproxycache.NewProxyConfigurationCache()
-		computedRoutesCache = sidecarproxycache.NewComputedRoutesCache()
-		identitiesCache     = sidecarproxycache.NewIdentitiesCache()
-		m                   = sidecarproxymapper.New(destinationsCache, proxyCfgCache, computedRoutesCache, identitiesCache)
-	)
-	trustDomainFetcher := func() (string, error) { return "test.consul", nil }
-
-	mgr.Register(Controller(destinationsCache, proxyCfgCache, computedRoutesCache, identitiesCache, m, trustDomainFetcher, "dc1", false))
-	mgr.SetRaftLeader(true)
-	go mgr.Run(suite.ctx)
-
-	var (
-		// Create proxy state template IDs to check against in this test.
-		apiProxyStateTemplateID = resourcetest.Resource(pbmesh.ProxyStateTemplateType, "api-abc").ID()
-		webProxyStateTemplateID = resourcetest.Resource(pbmesh.ProxyStateTemplateType, "web-def").ID()
-
-		apiComputedRoutesID = resource.ReplaceType(pbmesh.ComputedRoutesType, suite.apiService.Id)
-		dbComputedRoutesID  = resource.ReplaceType(pbmesh.ComputedRoutesType, suite.dbService.Id)
-
-		apiProxyStateTemplate *pbresource.Resource
-		webProxyStateTemplate *pbresource.Resource
-		webDestinations       *pbresource.Resource
-	)
-
-	testutil.RunStep(suite.T(), "proxy state template generation", func(t *testing.T) {
-		// Check that proxy state template resource is generated for both the api and web workloads.
-		retry.Run(t, func(r *retry.R) {
-			suite.client.RequireResourceExists(r, apiProxyStateTemplateID)
-			webProxyStateTemplate = suite.client.RequireResourceExists(r, webProxyStateTemplateID)
-			apiProxyStateTemplate = suite.client.RequireResourceExists(r, apiProxyStateTemplateID)
-		})
-	})
-
-	testutil.RunStep(suite.T(), "add explicit destinations and check that new proxy state is generated", func(t *testing.T) {
-		// Write a default ComputedRoutes for api.
-		routestest.ReconcileComputedRoutes(suite.T(), suite.client, apiComputedRoutesID,
-			resourcetest.MustDecode[*pbcatalog.Service](t, suite.apiService),
-		)
-
-		// Add a source service and check that a new proxy state is generated.
-		webDestinations = resourcetest.Resource(pbmesh.DestinationsType, "web-destinations").
-			WithData(suite.T(), &pbmesh.Destinations{
-				Workloads: &pbcatalog.WorkloadSelector{Names: []string{"web-def"}},
-				Destinations: []*pbmesh.Destination{
-					{
-						DestinationRef:  resource.Reference(suite.apiService.Id, ""),
-						DestinationPort: "tcp",
-						ListenAddr: &pbmesh.Destination_IpPort{
-							IpPort: &pbmesh.IPPortAddress{
-								Ip:   "127.0.0.1",
-								Port: 1234,
-							},
-						},
-					},
-				},
-			}).Write(suite.T(), suite.client)
-
-		webProxyStateTemplate = suite.client.WaitForNewVersion(t, webProxyStateTemplateID, webProxyStateTemplate.Version)
-
-		requireExplicitDestinationsFound(t, "api", webProxyStateTemplate)
-	})
-
-	testutil.RunStep(suite.T(), "update api's ports to be non-mesh", func(t *testing.T) {
-		// Update destination's service endpoints and workload to be non-mesh
-		// and check that:
-		// * api's proxy state template is deleted
-		// * we get a new web proxy resource re-generated
-		// * the status on Upstreams resource is updated with a validation error
-		nonMeshPorts := map[string]*pbcatalog.WorkloadPort{
-			"tcp": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-		}
-
-		// Note: the order matters here because in reality service endpoints will only
-		// be reconciled after the workload has been updated, and so we need to write the
-		// workload and service before we write service endpoints.
-		resourcetest.Resource(pbcatalog.WorkloadType, "api-abc").
-			WithData(suite.T(), &pbcatalog.Workload{
-				Identity:  "api-identity",
-				Addresses: suite.apiWorkload.Addresses,
-				Ports:     nonMeshPorts}).
-			Write(suite.T(), suite.client)
-
-		suite.apiService = resourcetest.ResourceID(suite.apiService.Id).
-			WithData(t, &pbcatalog.Service{
-				Workloads:  &pbcatalog.WorkloadSelector{Names: []string{"api-abc"}},
-				VirtualIps: []string{"1.1.1.1"},
-				Ports: []*pbcatalog.ServicePort{
-					{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					// {TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			}).
-			Write(suite.T(), suite.client)
-
-		resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-service").
-			WithData(suite.T(), &pbcatalog.ServiceEndpoints{
-				Endpoints: []*pbcatalog.Endpoint{
-					{
-						TargetRef: suite.apiWorkloadID,
-						Addresses: suite.apiWorkload.Addresses,
-						Ports:     nonMeshPorts,
-						Identity:  "api-identity",
-					},
-				},
-			}).
-			Write(suite.T(), suite.client.ResourceServiceClient)
-
-		// Refresh the computed routes in light of api losing a mesh port.
-		routestest.ReconcileComputedRoutes(suite.T(), suite.client, apiComputedRoutesID,
-			resourcetest.MustDecode[*pbcatalog.Service](t, suite.apiService),
-		)
-
-		// Check that api proxy template is gone.
-		retry.Run(t, func(r *retry.R) {
-			suite.client.RequireResourceNotFound(r, apiProxyStateTemplateID)
-		})
-
-		// Check status on the pbmesh.Destinations resource.
-		serviceRef := resource.ReferenceToString(resource.Reference(suite.apiService.Id, ""))
-		suite.client.WaitForStatusCondition(t, webDestinations.Id, ControllerName,
-			status.ConditionMeshProtocolNotFound(serviceRef))
-
-		// We should get a new web proxy template resource because this destination should be removed.
-		webProxyStateTemplate = suite.client.WaitForNewVersion(t, webProxyStateTemplateID, webProxyStateTemplate.Version)
-
-		requireExplicitDestinationsNotFound(t, "api", webProxyStateTemplate)
-	})
-
-	testutil.RunStep(suite.T(), "update ports to be mesh again", func(t *testing.T) {
-		// Update destination's service endpoints back to mesh and check that we get a new web proxy resource re-generated
-		// and that the status on Upstreams resource is updated to be empty.
-		suite.runtime.Logger.Trace("updating ports to mesh")
-
-		resourcetest.Resource(pbcatalog.WorkloadType, "api-abc").
-			WithData(suite.T(), suite.apiWorkload).
-			Write(suite.T(), suite.client)
-
-		suite.apiService = resourcetest.Resource(pbcatalog.ServiceType, "api-service").
-			WithData(suite.T(), suite.apiServiceData).
-			Write(suite.T(), suite.client.ResourceServiceClient)
-
-		resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-service").
-			WithData(suite.T(), suite.apiEndpointsData).
-			Write(suite.T(), suite.client.ResourceServiceClient)
-
-		// Refresh the computed routes in light of api losing a mesh port.
-		routestest.ReconcileComputedRoutes(suite.T(), suite.client, apiComputedRoutesID,
-			resourcetest.MustDecode[*pbcatalog.Service](t, suite.apiService),
-		)
-
-		serviceRef := resource.ReferenceToString(resource.Reference(suite.apiService.Id, ""))
-		suite.client.WaitForStatusCondition(t, webDestinations.Id, ControllerName,
-			status.ConditionMeshProtocolFound(serviceRef))
-
-		// We should also get a new web proxy template resource as this destination should be added again.
-		webProxyStateTemplate = suite.client.WaitForNewVersion(t, webProxyStateTemplateID, webProxyStateTemplate.Version)
-
-		requireExplicitDestinationsFound(t, "api", webProxyStateTemplate)
-	})
-
-	testutil.RunStep(suite.T(), "delete the proxy state template and check re-generation", func(t *testing.T) {
-		// Delete the proxy state template resource and check that it gets regenerated.
-		suite.runtime.Logger.Trace("deleting web proxy")
-		_, err := suite.client.Delete(suite.ctx, &pbresource.DeleteRequest{Id: webProxyStateTemplateID})
-		require.NoError(suite.T(), err)
-
-		webProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), webProxyStateTemplateID, webProxyStateTemplate.Version)
-		requireExplicitDestinationsFound(t, "api", webProxyStateTemplate)
-	})
-
-	testutil.RunStep(suite.T(), "add implicit upstream and enable tproxy", func(t *testing.T) {
-		// Delete explicit destinations resource.
-		suite.runtime.Logger.Trace("deleting web destinations")
-		_, err := suite.client.Delete(suite.ctx, &pbresource.DeleteRequest{Id: webDestinations.Id})
-		require.NoError(t, err)
-
-		webProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), webProxyStateTemplateID, webProxyStateTemplate.Version)
-
-		// Write a default ComputedRoutes for db, so it's eligible.
-		dbCR := routestest.ReconcileComputedRoutes(suite.T(), suite.client, dbComputedRoutesID,
-			resourcetest.MustDecode[*pbcatalog.Service](t, suite.dbService),
-		)
-		require.NotNil(t, dbCR)
-
-		// Enable transparent proxy for the web proxy.
-		resourcetest.Resource(pbmesh.ProxyConfigurationType, "proxy-config").
-			WithData(t, &pbmesh.ProxyConfiguration{
-				Workloads: &pbcatalog.WorkloadSelector{
-					Prefixes: []string{"web"},
-				},
-				DynamicConfig: &pbmesh.DynamicConfig{
-					Mode: pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
-					TransparentProxy: &pbmesh.TransparentProxy{
-						OutboundListenerPort: 15001,
-					},
-				},
-			}).Write(suite.T(), suite.client)
-
-		webProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), webProxyStateTemplateID, webProxyStateTemplate.Version)
-		apiProxyStateTemplate = suite.client.WaitForNewVersion(t, apiProxyStateTemplateID, apiProxyStateTemplate.Version)
-
-		requireImplicitDestinationsFound(t, "api", webProxyStateTemplate)
-		requireImplicitDestinationsFound(t, "db", webProxyStateTemplate)
-	})
-
-	testutil.RunStep(suite.T(), "traffic permissions", func(t *testing.T) {
-		// Global default deny applies to all identities.
-		assertTrafficPermissionDefaultPolicy(t, false, apiProxyStateTemplate)
-		assertTrafficPermissionDefaultPolicy(t, false, webProxyStateTemplate)
-
-		suite.runtime.Logger.Trace("deleting computed traffic permissions")
-		_, err := suite.client.Delete(suite.ctx, &pbresource.DeleteRequest{Id: suite.apiComputedTrafficPermissions.Id})
-		require.NoError(t, err)
-		suite.client.WaitForDeletion(t, suite.apiComputedTrafficPermissions.Id)
-
-		apiProxyStateTemplate = suite.client.WaitForNewVersion(t, apiProxyStateTemplateID, apiProxyStateTemplate.Version)
-
-		suite.runtime.Logger.Trace("creating computed traffic permissions")
-		resourcetest.Resource(pbauth.ComputedTrafficPermissionsType, suite.apiWorkload.Identity).
-			WithData(t, suite.apiComputedTrafficPermissionsData).
-			Write(t, suite.client)
-
-		suite.client.WaitForNewVersion(t, apiProxyStateTemplateID, apiProxyStateTemplate.Version)
-	})
-
-	testutil.RunStep(suite.T(), "add an HTTPRoute with a simple split on the tcp port", func(t *testing.T) {
-		// NOTE: because at this point we have tproxy in all-to-all mode, we will get an
-		// implicit upstream on 'db'
-
-		// Create a route NOT in the state store, only to more easily feed
-		// into the generator.
-		routeData := &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{{
-				Ref:  resource.Reference(suite.dbService.Id, ""),
-				Port: "", // implicitly applies to 'http'
-			}},
-			Rules: []*pbmesh.HTTPRouteRule{{
-				BackendRefs: []*pbmesh.HTTPBackendRef{
-					{
-						BackendRef: &pbmesh.BackendReference{
-							Ref:  resource.Reference(suite.apiService.Id, ""),
-							Port: "tcp",
-						},
-						Weight: 60,
-					},
-					{
-						BackendRef: &pbmesh.BackendReference{
-							Ref:  resource.Reference(suite.dbService.Id, ""),
-							Port: "", // assumed to be 'http'
-						},
-						Weight: 40,
-					},
-				},
-			}},
-		}
-		route := resourcetest.Resource(pbmesh.HTTPRouteType, "db-http-route").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, routeData).
-			Build()
-		require.NoError(t, types.MutateHTTPRoute(route))
-		require.NoError(t, types.ValidateHTTPRoute(route))
-
-		dbCRID := resource.ReplaceType(pbmesh.ComputedRoutesType, suite.dbService.Id)
-
-		dbCR := routestest.ReconcileComputedRoutes(suite.T(), suite.client, dbCRID,
-			resourcetest.MustDecode[*pbmesh.HTTPRoute](t, route),
-			resourcetest.MustDecode[*pbcatalog.Service](t, suite.dbService),
-			resourcetest.MustDecode[*pbcatalog.Service](t, suite.apiService),
-		)
-		require.NotNil(t, dbCR, "computed routes for db was deleted instead of created")
-
-		webProxyStateTemplate = suite.client.WaitForNewVersion(t, webProxyStateTemplateID, webProxyStateTemplate.Version)
-
-		requireImplicitDestinationsFound(t, "api", webProxyStateTemplate)
-		requireImplicitDestinationsFound(t, "db", webProxyStateTemplate)
-	})
-}
-
-func (suite *meshControllerTestSuite) TestControllerDefaultAllow() {
-	// Run the controller manager
-	mgr := controller.NewManager(suite.client, suite.runtime.Logger)
-
-	// Initialize controller dependencies.
-	var (
-		destinationsCache   = sidecarproxycache.NewDestinationsCache()
-		proxyCfgCache       = sidecarproxycache.NewProxyConfigurationCache()
-		computedRoutesCache = sidecarproxycache.NewComputedRoutesCache()
-		identitiesCache     = sidecarproxycache.NewIdentitiesCache()
-		m                   = sidecarproxymapper.New(destinationsCache, proxyCfgCache, computedRoutesCache, identitiesCache)
-	)
-	trustDomainFetcher := func() (string, error) { return "test.consul", nil }
-
-	mgr.Register(Controller(destinationsCache, proxyCfgCache, computedRoutesCache, identitiesCache, m, trustDomainFetcher, "dc1", true))
-	mgr.SetRaftLeader(true)
-	go mgr.Run(suite.ctx)
-
-	var (
-		// Create proxy state template IDs to check against in this test.
-		apiProxyStateTemplateID = resourcetest.Resource(pbmesh.ProxyStateTemplateType, "api-abc").ID()
-		webProxyStateTemplateID = resourcetest.Resource(pbmesh.ProxyStateTemplateType, "web-def").ID()
-	)
-
-	retry.Run(suite.T(), func(r *retry.R) {
-		webProxyStateTemplate := suite.client.RequireResourceExists(r, webProxyStateTemplateID)
-		apiProxyStateTemplate := suite.client.RequireResourceExists(r, apiProxyStateTemplateID)
-
-		// Default deny because api has non-empty computed traffic permissions.
-		assertTrafficPermissionDefaultPolicy(r, false, apiProxyStateTemplate)
-		assertTrafficPermissionDefaultPolicy(r, true, webProxyStateTemplate)
-	})
-}
-
-func TestMeshController(t *testing.T) {
-	suite.Run(t, new(meshControllerTestSuite))
-}
-
-func requireExplicitDestinationsFound(t *testing.T, name string, tmplResource *pbresource.Resource) {
-	requireExplicitDestinations(t, name, tmplResource, true)
-}
-
-func requireExplicitDestinationsNotFound(t *testing.T, name string, tmplResource *pbresource.Resource) {
-	requireExplicitDestinations(t, name, tmplResource, false)
-}
-
-func requireExplicitDestinations(t *testing.T, name string, tmplResource *pbresource.Resource, found bool) {
-	t.Helper()
-
-	var tmpl pbmesh.ProxyStateTemplate
-	err := tmplResource.Data.UnmarshalTo(&tmpl)
-	require.NoError(t, err)
-
-	// Check outbound listener.
-	var foundListener bool
-	for _, l := range tmpl.ProxyState.Listeners {
-		if strings.Contains(l.Name, name) && l.Direction == pbproxystate.Direction_DIRECTION_OUTBOUND {
-			foundListener = true
-			break
-		}
-	}
-
-	require.Equal(t, found, foundListener)
-
-	requireClustersAndEndpoints(t, name, &tmpl, found)
-}
-
-func requireImplicitDestinationsFound(t *testing.T, name string, tmplResource *pbresource.Resource) {
-	t.Helper()
-
-	var tmpl pbmesh.ProxyStateTemplate
-	err := tmplResource.Data.UnmarshalTo(&tmpl)
-	require.NoError(t, err)
-
-	// Check outbound listener.
-	var foundListener bool
-	for _, l := range tmpl.ProxyState.Listeners {
-		if strings.Contains(l.Name, xdscommon.OutboundListenerName) && l.Direction == pbproxystate.Direction_DIRECTION_OUTBOUND {
-			foundListener = true
-
-			// Check the listener filter chain
-			for _, r := range l.Routers {
-				foundByName := false
-				switch x := r.Destination.(type) {
-				case *pbproxystate.Router_L4:
-					// TcpProxy is easy, so just having this exist is
-					// sufficient. We don't have to deep inspect it. We care
-					// that there IS a listener matching the destination. If
-					// there is a TCPRoute with a split or a rename we don't
-					// care here.
-					foundByName = true
-				case *pbproxystate.Router_L7:
-					routerName := x.L7.Name
-					foundByName = strings.Contains(routerName, name)
-				default:
-					t.Fatalf("unexpected type of destination: %T", r.Destination)
-				}
-
-				if foundByName {
-					// We expect that there is a filter chain match for transparent proxy destinations.
-					require.NotNil(t, r.Match)
-					require.NotEmpty(t, r.Match.PrefixRanges)
-					break
-				}
-			}
-			break
-		}
-	}
-	require.True(t, foundListener)
-
-	requireClustersAndEndpoints(t, name, &tmpl, true)
-}
-
-func requireClustersAndEndpoints(t *testing.T, name string, tmpl *pbmesh.ProxyStateTemplate, found bool) {
-	t.Helper()
-
-	var foundCluster bool
-	for c := range tmpl.ProxyState.Clusters {
-		if strings.Contains(c, name) {
-			foundCluster = true
-			break
-		}
-	}
-
-	require.Equal(t, found, foundCluster)
-
-	var foundEndpoints bool
-	for c := range tmpl.RequiredEndpoints {
-		if strings.Contains(c, name) {
-			foundEndpoints = true
-			break
-		}
-	}
-
-	require.Equal(t, found, foundEndpoints)
-}
-
-func resourceID(rtype *pbresource.Type, name string) *pbresource.ID {
-	return &pbresource.ID{
-		Type: rtype,
-		Tenancy: &pbresource.Tenancy{
-			Partition: "default",
-			Namespace: "default",
-			PeerName:  "local",
-		},
-		Name: name,
-	}
-}
-
-func assertTrafficPermissionDefaultPolicy(t resourcetest.T, defaultAllow bool, resource *pbresource.Resource) {
-	dec := resourcetest.MustDecode[*pbmesh.ProxyStateTemplate](t, resource)
-	var listener *pbproxystate.Listener
-	for _, l := range dec.Data.ProxyState.Listeners {
-		if l.Name == "public_listener" {
-			listener = l
-			break
-		}
-	}
-	require.Len(t, listener.Routers, 1)
-	l4 := listener.Routers[0].GetL4()
-	require.NotNil(t, l4)
-	require.Equal(t, defaultAllow, l4.TrafficPermissions.DefaultAllow)
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher.go b/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher.go
deleted file mode 100644
index 78bbb93751898..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher.go
+++ /dev/null
@@ -1,538 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package fetcher
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/internal/mesh/internal/cache/sidecarproxycache"
-	ctrlStatus "github.com/hashicorp/consul/internal/mesh/internal/controllers/sidecarproxy/status"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	intermediateTypes "github.com/hashicorp/consul/internal/mesh/internal/types/intermediate"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type Fetcher struct {
-	Client              pbresource.ResourceServiceClient
-	DestinationsCache   *sidecarproxycache.DestinationsCache
-	ProxyCfgCache       *sidecarproxycache.ProxyConfigurationCache
-	ComputedRoutesCache *sidecarproxycache.ComputedRoutesCache
-	IdentitiesCache     *sidecarproxycache.IdentitiesCache
-}
-
-func New(
-	client pbresource.ResourceServiceClient,
-	dCache *sidecarproxycache.DestinationsCache,
-	pcfgCache *sidecarproxycache.ProxyConfigurationCache,
-	computedRoutesCache *sidecarproxycache.ComputedRoutesCache,
-	iCache *sidecarproxycache.IdentitiesCache,
-) *Fetcher {
-	return &Fetcher{
-		Client:              client,
-		DestinationsCache:   dCache,
-		ProxyCfgCache:       pcfgCache,
-		ComputedRoutesCache: computedRoutesCache,
-		IdentitiesCache:     iCache,
-	}
-}
-
-func (f *Fetcher) FetchWorkload(ctx context.Context, id *pbresource.ID) (*types.DecodedWorkload, error) {
-	proxyID := resource.ReplaceType(pbmesh.ProxyStateTemplateType, id)
-	dec, err := resource.GetDecodedResource[*pbcatalog.Workload](ctx, f.Client, id)
-	if err != nil {
-		return nil, err
-	} else if dec == nil {
-		// We also need to make sure to delete the associated proxy from cache.
-		// We are ignoring errors from cache here as this deletion is best effort.
-		f.DestinationsCache.DeleteSourceProxy(proxyID)
-		f.ProxyCfgCache.UntrackProxyID(proxyID)
-		f.IdentitiesCache.UntrackProxyID(proxyID)
-		return nil, nil
-	}
-
-	identityID := &pbresource.ID{
-		Name:    dec.Data.Identity,
-		Tenancy: dec.Resource.Id.Tenancy,
-		Type:    pbauth.WorkloadIdentityType,
-	}
-
-	f.IdentitiesCache.TrackPair(identityID, proxyID)
-
-	return dec, err
-}
-
-func (f *Fetcher) FetchProxyStateTemplate(ctx context.Context, id *pbresource.ID) (*types.DecodedProxyStateTemplate, error) {
-	return resource.GetDecodedResource[*pbmesh.ProxyStateTemplate](ctx, f.Client, id)
-}
-
-func (f *Fetcher) FetchComputedTrafficPermissions(ctx context.Context, id *pbresource.ID) (*types.DecodedComputedTrafficPermissions, error) {
-	return resource.GetDecodedResource[*pbauth.ComputedTrafficPermissions](ctx, f.Client, id)
-}
-
-func (f *Fetcher) FetchServiceEndpoints(ctx context.Context, id *pbresource.ID) (*types.DecodedServiceEndpoints, error) {
-	return resource.GetDecodedResource[*pbcatalog.ServiceEndpoints](ctx, f.Client, id)
-}
-
-func (f *Fetcher) FetchService(ctx context.Context, id *pbresource.ID) (*types.DecodedService, error) {
-	return resource.GetDecodedResource[*pbcatalog.Service](ctx, f.Client, id)
-}
-
-func (f *Fetcher) FetchDestinations(ctx context.Context, id *pbresource.ID) (*types.DecodedDestinations, error) {
-	return resource.GetDecodedResource[*pbmesh.Destinations](ctx, f.Client, id)
-}
-
-func (f *Fetcher) FetchComputedRoutes(ctx context.Context, id *pbresource.ID) (*types.DecodedComputedRoutes, error) {
-	if !types.IsComputedRoutesType(id.Type) {
-		return nil, fmt.Errorf("id must be a ComputedRoutes type")
-	}
-
-	dec, err := resource.GetDecodedResource[*pbmesh.ComputedRoutes](ctx, f.Client, id)
-	if err != nil {
-		return nil, err
-	} else if dec == nil {
-		f.ComputedRoutesCache.UntrackComputedRoutes(id)
-	}
-
-	return dec, err
-}
-
-func (f *Fetcher) FetchExplicitDestinationsData(
-	ctx context.Context,
-	explDestRefs []intermediateTypes.CombinedDestinationRef,
-) ([]*intermediateTypes.Destination, map[string]*intermediateTypes.Status, error) {
-	var (
-		destinations []*intermediateTypes.Destination
-		statuses     = make(map[string]*intermediateTypes.Status)
-	)
-
-	for _, dest := range explDestRefs {
-		// Fetch Destinations resource if there is one.
-		us, err := f.FetchDestinations(ctx, dest.ExplicitDestinationsID)
-		if err != nil {
-			// If there's an error, return and force another reconcile instead of computing
-			// partial proxy state.
-			return nil, statuses, err
-		}
-
-		if us == nil {
-			// If the Destinations resource is not found, then we should delete it from cache and continue.
-			f.DestinationsCache.DeleteDestination(dest.ServiceRef, dest.Port)
-			continue
-		}
-
-		d := &intermediateTypes.Destination{}
-
-		var (
-			serviceID    = resource.IDFromReference(dest.ServiceRef)
-			serviceRef   = resource.ReferenceToString(dest.ServiceRef)
-			upstreamsRef = resource.IDToString(us.Resource.Id)
-		)
-
-		// Fetch Service
-		svc, err := f.FetchService(ctx, serviceID)
-		if err != nil {
-			return nil, statuses, err
-		}
-
-		if svc == nil {
-			// If the Service resource is not found, then we update the status
-			// of the Upstreams resource but don't remove it from cache in case
-			// it comes back.
-			updateStatusCondition(statuses, upstreamsRef, dest.ExplicitDestinationsID,
-				us.Resource.Status, us.Resource.Generation, ctrlStatus.ConditionDestinationServiceNotFound(serviceRef))
-			continue
-		} else {
-			updateStatusCondition(statuses, upstreamsRef, dest.ExplicitDestinationsID,
-				us.Resource.Status, us.Resource.Generation, ctrlStatus.ConditionDestinationServiceFound(serviceRef))
-		}
-
-		d.Service = svc
-
-		// Check if this endpoints is mesh-enabled. If not, remove it from cache and return an error.
-		if !IsMeshEnabled(svc.Data.Ports) {
-			// Add invalid status but don't remove from cache. If this state changes,
-			// we want to be able to detect this change.
-			updateStatusCondition(statuses, upstreamsRef, dest.ExplicitDestinationsID,
-				us.Resource.Status, us.Resource.Generation, ctrlStatus.ConditionMeshProtocolNotFound(serviceRef))
-
-			// This error should not cause the execution to stop, as we want to make sure that this non-mesh destination
-			// gets removed from the proxy state.
-			continue
-		} else {
-			// If everything was successful, add an empty condition so that we can remove any existing statuses.
-			updateStatusCondition(statuses, upstreamsRef, dest.ExplicitDestinationsID,
-				us.Resource.Status, us.Resource.Generation, ctrlStatus.ConditionMeshProtocolFound(serviceRef))
-		}
-
-		// No destination port should point to a port with "mesh" protocol,
-		// so check if destination port has the mesh protocol and update the status.
-		if isServicePortMeshProtocol(svc.Data.Ports, dest.Port) {
-			updateStatusCondition(statuses, upstreamsRef, dest.ExplicitDestinationsID,
-				us.Resource.Status, us.Resource.Generation, ctrlStatus.ConditionMeshProtocolDestinationPort(serviceRef, dest.Port))
-			continue
-		} else {
-			updateStatusCondition(statuses, upstreamsRef, dest.ExplicitDestinationsID,
-				us.Resource.Status, us.Resource.Generation, ctrlStatus.ConditionNonMeshProtocolDestinationPort(serviceRef, dest.Port))
-		}
-
-		// Fetch ComputedRoutes.
-		cr, err := f.FetchComputedRoutes(ctx, resource.ReplaceType(pbmesh.ComputedRoutesType, serviceID))
-		if err != nil {
-			return nil, statuses, err
-		} else if cr == nil {
-			// This is required, so wait until it exists.
-			updateStatusCondition(statuses, upstreamsRef, dest.ExplicitDestinationsID,
-				us.Resource.Status, us.Resource.Generation,
-				ctrlStatus.ConditionDestinationComputedRoutesNotFound(serviceRef))
-			continue
-		} else {
-			updateStatusCondition(statuses, upstreamsRef, dest.ExplicitDestinationsID,
-				us.Resource.Status, us.Resource.Generation,
-				ctrlStatus.ConditionDestinationComputedRoutesFound(serviceRef))
-		}
-
-		portConfig, ok := cr.Data.PortedConfigs[dest.Port]
-		if !ok {
-			// This is required, so wait until it exists.
-			updateStatusCondition(statuses, upstreamsRef, dest.ExplicitDestinationsID,
-				us.Resource.Status, us.Resource.Generation,
-				ctrlStatus.ConditionDestinationComputedRoutesPortNotFound(serviceRef, dest.Port))
-			continue
-		} else {
-			updateStatusCondition(statuses, upstreamsRef, dest.ExplicitDestinationsID,
-				us.Resource.Status, us.Resource.Generation,
-				ctrlStatus.ConditionDestinationComputedRoutesPortFound(serviceRef, dest.Port))
-		}
-		// Copy this so we can mutate the targets.
-		d.ComputedPortRoutes = proto.Clone(portConfig).(*pbmesh.ComputedPortRoutes)
-
-		// As Destinations resource contains a list of destinations,
-		// we need to find the one that references our service and port.
-		d.Explicit = findDestination(dest.ServiceRef, dest.Port, us.Data)
-		if d.Explicit == nil {
-			continue // the cache is out of sync
-		}
-
-		// NOTE: we collect both DIRECT and INDIRECT target information here.
-		for _, routeTarget := range d.ComputedPortRoutes.Targets {
-			targetServiceID := resource.IDFromReference(routeTarget.BackendRef.Ref)
-
-			// Fetch ServiceEndpoints.
-			se, err := f.FetchServiceEndpoints(ctx, resource.ReplaceType(pbcatalog.ServiceEndpointsType, targetServiceID))
-			if err != nil {
-				return nil, statuses, err
-			}
-
-			if se != nil {
-				routeTarget.ServiceEndpointsId = se.Resource.Id
-				routeTarget.ServiceEndpoints = se.Data
-
-				// Gather all identities.
-				var identities []*pbresource.Reference
-				for _, ep := range se.Data.Endpoints {
-					identities = append(identities, &pbresource.Reference{
-						Name:    ep.Identity,
-						Tenancy: se.Resource.Id.Tenancy,
-					})
-				}
-				routeTarget.IdentityRefs = identities
-			}
-		}
-
-		destinations = append(destinations, d)
-	}
-
-	return destinations, statuses, nil
-}
-
-type PortReferenceKey struct {
-	resource.ReferenceKey
-	Port string
-}
-
-// FetchImplicitDestinationsData fetches all implicit destinations and adds them to existing destinations.
-// If the implicit destination is already in addToDestinations, it will be skipped.
-// todo (ishustava): this function will eventually need to fetch implicit destinations from the ImplicitDestinations resource instead.
-func (f *Fetcher) FetchImplicitDestinationsData(
-	ctx context.Context,
-	proxyID *pbresource.ID,
-	addToDestinations []*intermediateTypes.Destination,
-) ([]*intermediateTypes.Destination, error) {
-	// First, convert existing destinations to a map so we can de-dup.
-	//
-	// This is keyed by the serviceID+port of the upstream, which is effectively
-	// the same as the id of the computed routes for the service.
-	destinations := make(map[PortReferenceKey]*intermediateTypes.Destination)
-	for _, d := range addToDestinations {
-		prk := PortReferenceKey{
-			ReferenceKey: resource.NewReferenceKey(d.Service.Resource.Id),
-			Port:         d.ComputedPortRoutes.ParentRef.Port,
-		}
-		destinations[prk] = d
-	}
-
-	// For now we need to look up all computed routes within a partition.
-	rsp, err := f.Client.List(ctx, &pbresource.ListRequest{
-		Type: pbmesh.ComputedRoutesType,
-		Tenancy: &pbresource.Tenancy{
-			Namespace: storage.Wildcard,
-			Partition: proxyID.Tenancy.Partition,
-			PeerName:  proxyID.Tenancy.PeerName,
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	for _, r := range rsp.Resources {
-		svcID := resource.ReplaceType(pbcatalog.ServiceType, r.Id)
-		computedRoutes, err := resource.Decode[*pbmesh.ComputedRoutes](r)
-		if err != nil {
-			return nil, err
-		}
-
-		if computedRoutes == nil {
-			// the routes-controller doesn't deem this worthy of the mesh
-			continue
-		}
-
-		// Fetch the service.
-		// todo (ishustava): this should eventually grab virtual IPs resource.
-		svc, err := f.FetchService(ctx, resource.ReplaceType(pbcatalog.ServiceType, r.Id))
-		if err != nil {
-			return nil, err
-		}
-		if svc == nil {
-			// If service no longer exists, skip.
-			continue
-		}
-
-		// If this proxy is a part of this service, ignore it.
-		if isPartOfService(resource.ReplaceType(pbcatalog.WorkloadType, proxyID), svc) {
-			continue
-		}
-
-		inMesh := false
-		for _, port := range svc.Data.Ports {
-			if port.Protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-				inMesh = true
-				break
-			}
-		}
-
-		if !inMesh {
-			// If a service is no longer in the mesh, skip.
-			continue
-		}
-
-		// Fetch the resources that may show up duplicated.
-		//
-		// NOTE: we collect both DIRECT and INDIRECT target information here.
-		endpointsMap := make(map[resource.ReferenceKey]*types.DecodedServiceEndpoints)
-		for _, portConfig := range computedRoutes.Data.PortedConfigs {
-			for _, routeTarget := range portConfig.Targets {
-				targetServiceID := resource.IDFromReference(routeTarget.BackendRef.Ref)
-
-				seID := resource.ReplaceType(pbcatalog.ServiceEndpointsType, targetServiceID)
-				seRK := resource.NewReferenceKey(seID)
-
-				if _, ok := endpointsMap[seRK]; !ok {
-					se, err := f.FetchServiceEndpoints(ctx, seID)
-					if err != nil {
-						return nil, err
-					}
-					// We only add the endpoint to the map if it's not nil. If it's missing on lookup now, the
-					// controller should get triggered when the endpoint exists again since it watches service
-					// endpoints.
-					if se != nil {
-						endpointsMap[seRK] = se
-					}
-				}
-			}
-		}
-
-		for portName, portConfig := range computedRoutes.Data.PortedConfigs {
-			// If it's already in destinations, ignore it.
-			prk := PortReferenceKey{
-				ReferenceKey: resource.NewReferenceKey(svcID),
-				Port:         portName,
-			}
-			if _, ok := destinations[prk]; ok {
-				continue
-			}
-
-			// Copy this so we can mutate the targets.
-			portConfig = proto.Clone(portConfig).(*pbmesh.ComputedPortRoutes)
-
-			d := &intermediateTypes.Destination{
-				Service:            svc,
-				ComputedPortRoutes: portConfig,
-				VirtualIPs:         svc.Data.VirtualIps,
-			}
-			for _, routeTarget := range portConfig.Targets {
-				targetServiceID := resource.IDFromReference(routeTarget.BackendRef.Ref)
-				seID := resource.ReplaceType(pbcatalog.ServiceEndpointsType, targetServiceID)
-
-				// Fetch ServiceEndpoints.
-				se, ok := endpointsMap[resource.NewReferenceKey(seID)]
-				if ok {
-					routeTarget.ServiceEndpointsId = se.Resource.Id
-					routeTarget.ServiceEndpoints = se.Data
-
-					// Gather all identities.
-					var identities []*pbresource.Reference
-					for _, ep := range se.Data.Endpoints {
-						identities = append(identities, &pbresource.Reference{
-							Name:    ep.Identity,
-							Tenancy: se.Resource.Id.Tenancy,
-						})
-					}
-					routeTarget.IdentityRefs = identities
-				}
-			}
-			addToDestinations = append(addToDestinations, d)
-		}
-	}
-	return addToDestinations, err
-}
-
-// FetchAndMergeProxyConfigurations fetches proxy configurations for the proxy state template provided by id
-// and merges them into one object.
-func (f *Fetcher) FetchAndMergeProxyConfigurations(ctx context.Context, id *pbresource.ID) (*pbmesh.ProxyConfiguration, error) {
-	proxyCfgRefs := f.ProxyCfgCache.ProxyConfigurationsByProxyID(id)
-
-	result := &pbmesh.ProxyConfiguration{
-		DynamicConfig: &pbmesh.DynamicConfig{},
-	}
-	for _, ref := range proxyCfgRefs {
-		proxyCfgID := &pbresource.ID{
-			Name:    ref.GetName(),
-			Type:    ref.GetType(),
-			Tenancy: ref.GetTenancy(),
-		}
-		rsp, err := f.Client.Read(ctx, &pbresource.ReadRequest{
-			Id: proxyCfgID,
-		})
-		switch {
-		case status.Code(err) == codes.NotFound:
-			f.ProxyCfgCache.UntrackProxyConfiguration(proxyCfgID)
-			return nil, nil
-		case err != nil:
-			return nil, err
-		}
-
-		var proxyCfg pbmesh.ProxyConfiguration
-		err = rsp.Resource.Data.UnmarshalTo(&proxyCfg)
-		if err != nil {
-			return nil, err
-		}
-
-		// Note that we only care about dynamic config as bootstrap config
-		// will not be updated dynamically by this controller.
-		// todo (ishustava): do sorting etc.
-		proto.Merge(result.DynamicConfig, proxyCfg.DynamicConfig)
-	}
-
-	// Default the outbound listener port. If we don't do the nil check here, then BuildDestinations will panic creating
-	// the outbound listener.
-	if result.DynamicConfig.TransparentProxy == nil {
-		result.DynamicConfig.TransparentProxy = &pbmesh.TransparentProxy{OutboundListenerPort: 15001}
-	}
-
-	return result, nil
-}
-
-// IsWorkloadMeshEnabled returns true if the workload or service endpoints port
-// contain a port with the "mesh" protocol.
-func IsWorkloadMeshEnabled(ports map[string]*pbcatalog.WorkloadPort) bool {
-	for _, port := range ports {
-		if port.Protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-			return true
-		}
-	}
-	return false
-}
-
-// IsMeshEnabled returns true if the service ports contain a port with the
-// "mesh" protocol.
-func IsMeshEnabled(ports []*pbcatalog.ServicePort) bool {
-	for _, port := range ports {
-		if port.Protocol == pbcatalog.Protocol_PROTOCOL_MESH {
-			return true
-		}
-	}
-	return false
-}
-
-func isServicePortMeshProtocol(ports []*pbcatalog.ServicePort, name string) bool {
-	sp := findServicePort(ports, name)
-	return sp != nil && sp.Protocol == pbcatalog.Protocol_PROTOCOL_MESH
-}
-
-func findServicePort(ports []*pbcatalog.ServicePort, name string) *pbcatalog.ServicePort {
-	for _, port := range ports {
-		if port.TargetPort == name {
-			return port
-		}
-	}
-	return nil
-}
-
-func findDestination(ref *pbresource.Reference, port string, destinations *pbmesh.Destinations) *pbmesh.Destination {
-	for _, destination := range destinations.Destinations {
-		if resource.EqualReference(ref, destination.DestinationRef) &&
-			port == destination.DestinationPort {
-			return destination
-		}
-	}
-	return nil
-}
-
-func updateStatusCondition(
-	statuses map[string]*intermediateTypes.Status,
-	key string,
-	id *pbresource.ID,
-	oldStatus map[string]*pbresource.Status,
-	generation string,
-	condition *pbresource.Condition) {
-	if _, ok := statuses[key]; ok {
-		statuses[key].Conditions = append(statuses[key].Conditions, condition)
-	} else {
-		statuses[key] = &intermediateTypes.Status{
-			ID:         id,
-			Generation: generation,
-			Conditions: []*pbresource.Condition{condition},
-			OldStatus:  oldStatus,
-		}
-	}
-}
-
-func isPartOfService(workloadID *pbresource.ID, svc *types.DecodedService) bool {
-	if !resource.EqualTenancy(workloadID.GetTenancy(), svc.Resource.Id.GetTenancy()) {
-		return false
-	}
-	sel := svc.Data.Workloads
-	for _, exact := range sel.GetNames() {
-		if workloadID.GetName() == exact {
-			return true
-		}
-	}
-	for _, prefix := range sel.GetPrefixes() {
-		if strings.HasPrefix(workloadID.GetName(), prefix) {
-			return true
-		}
-	}
-	return false
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher_test.go b/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher_test.go
deleted file mode 100644
index 9f412b66de835..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher_test.go
+++ /dev/null
@@ -1,1083 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package fetcher
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/cache/sidecarproxycache"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes/routestest"
-	meshStatus "github.com/hashicorp/consul/internal/mesh/internal/controllers/sidecarproxy/status"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/mesh/internal/types/intermediate"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestIsMeshEnabled(t *testing.T) {
-	cases := map[string]struct {
-		ports []*pbcatalog.ServicePort
-		exp   bool
-	}{
-		"nil ports": {
-			ports: nil,
-			exp:   false,
-		},
-		"empty ports": {
-			ports: []*pbcatalog.ServicePort{},
-			exp:   false,
-		},
-		"no mesh ports": {
-			ports: []*pbcatalog.ServicePort{
-				{VirtualPort: 1000, TargetPort: "p1", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				{VirtualPort: 2000, TargetPort: "p2", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			},
-			exp: false,
-		},
-		"one mesh port": {
-			ports: []*pbcatalog.ServicePort{
-				{VirtualPort: 1000, TargetPort: "p1", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				{VirtualPort: 2000, TargetPort: "p2", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-				{VirtualPort: 3000, TargetPort: "p3", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			},
-			exp: true,
-		},
-		"multiple mesh ports": {
-			ports: []*pbcatalog.ServicePort{
-				{VirtualPort: 1000, TargetPort: "p1", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				{VirtualPort: 2000, TargetPort: "p2", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-				{VirtualPort: 3000, TargetPort: "p3", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				{VirtualPort: 4000, TargetPort: "p4", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			},
-			exp: true,
-		},
-	}
-
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			require.Equal(t, c.exp, IsMeshEnabled(c.ports))
-		})
-	}
-}
-
-func TestIsWorkloadMeshEnabled(t *testing.T) {
-	cases := map[string]struct {
-		ports map[string]*pbcatalog.WorkloadPort
-		exp   bool
-	}{
-		"nil ports": {
-			ports: nil,
-			exp:   false,
-		},
-		"empty ports": {
-			ports: make(map[string]*pbcatalog.WorkloadPort),
-			exp:   false,
-		},
-		"no mesh ports": {
-			ports: map[string]*pbcatalog.WorkloadPort{
-				"p1": {Port: 1000, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				"p2": {Port: 2000, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			},
-			exp: false,
-		},
-		"one mesh port": {
-			ports: map[string]*pbcatalog.WorkloadPort{
-				"p1": {Port: 1000, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				"p2": {Port: 2000, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-				"p3": {Port: 3000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			},
-			exp: true,
-		},
-		"multiple mesh ports": {
-			ports: map[string]*pbcatalog.WorkloadPort{
-				"p1": {Port: 1000, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				"p2": {Port: 2000, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-				"p3": {Port: 3000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				"p4": {Port: 4000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			},
-			exp: true,
-		},
-	}
-
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			require.Equal(t, c.exp, IsWorkloadMeshEnabled(c.ports))
-		})
-	}
-}
-
-type dataFetcherSuite struct {
-	suite.Suite
-
-	ctx    context.Context
-	client pbresource.ResourceServiceClient
-	rt     controller.Runtime
-
-	api1Service              *pbresource.Resource
-	api1ServiceData          *pbcatalog.Service
-	api2Service              *pbresource.Resource
-	api2ServiceData          *pbcatalog.Service
-	api1ServiceEndpoints     *pbresource.Resource
-	api1ServiceEndpointsData *pbcatalog.ServiceEndpoints
-	api2ServiceEndpoints     *pbresource.Resource
-	api2ServiceEndpointsData *pbcatalog.ServiceEndpoints
-	webDestinations          *pbresource.Resource
-	webDestinationsData      *pbmesh.Destinations
-	webProxy                 *pbresource.Resource
-	webWorkload              *pbresource.Resource
-}
-
-func (suite *dataFetcherSuite) SetupTest() {
-	suite.ctx = testutil.TestContext(suite.T())
-	suite.client = svctest.RunResourceService(suite.T(), types.Register, catalog.RegisterTypes)
-	suite.rt = controller.Runtime{
-		Client: suite.client,
-		Logger: testutil.Logger(suite.T()),
-	}
-
-	suite.api1ServiceData = &pbcatalog.Service{
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "tcp", VirtualPort: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			{TargetPort: "mesh", VirtualPort: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-		},
-	}
-	suite.api1Service = resourcetest.Resource(pbcatalog.ServiceType, "api-1").
-		WithData(suite.T(), suite.api1ServiceData).
-		Write(suite.T(), suite.client)
-
-	suite.api1ServiceEndpointsData = &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				Addresses: []*pbcatalog.WorkloadAddress{{Host: "10.0.0.1"}},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"tcp":  {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"mesh": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				Identity: "api-1-identity",
-			},
-		},
-	}
-	suite.api1ServiceEndpoints = resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-1").
-		WithData(suite.T(), suite.api1ServiceEndpointsData).
-		Write(suite.T(), suite.client)
-
-	suite.api2ServiceData = &pbcatalog.Service{
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "tcp1", VirtualPort: 9080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			{TargetPort: "tcp2", VirtualPort: 9081, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			{TargetPort: "mesh", VirtualPort: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-		},
-	}
-	suite.api2Service = resourcetest.Resource(pbcatalog.ServiceType, "api-2").
-		WithData(suite.T(), suite.api2ServiceData).
-		Write(suite.T(), suite.client)
-
-	suite.api2ServiceEndpointsData = &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				Addresses: []*pbcatalog.WorkloadAddress{{Host: "10.0.0.2"}},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"tcp1": {Port: 9080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"tcp2": {Port: 9081, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"mesh": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				Identity: "api-2-identity",
-			},
-		},
-	}
-	suite.api2ServiceEndpoints = resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-2").
-		WithData(suite.T(), suite.api2ServiceEndpointsData).
-		Write(suite.T(), suite.client)
-
-	suite.webDestinationsData = &pbmesh.Destinations{
-		Destinations: []*pbmesh.Destination{
-			{
-				DestinationRef:  resource.Reference(suite.api1Service.Id, ""),
-				DestinationPort: "tcp",
-			},
-			{
-				DestinationRef:  resource.Reference(suite.api2Service.Id, ""),
-				DestinationPort: "tcp1",
-			},
-			{
-				DestinationRef:  resource.Reference(suite.api2Service.Id, ""),
-				DestinationPort: "tcp2",
-			},
-		},
-	}
-
-	suite.webDestinations = resourcetest.Resource(pbmesh.DestinationsType, "web-destinations").
-		WithData(suite.T(), suite.webDestinationsData).
-		Write(suite.T(), suite.client)
-
-	suite.webProxy = resourcetest.Resource(pbmesh.ProxyStateTemplateType, "web-abc").
-		WithData(suite.T(), &pbmesh.ProxyStateTemplate{}).
-		Write(suite.T(), suite.client)
-
-	suite.webWorkload = resourcetest.Resource(pbcatalog.WorkloadType, "web-abc").
-		WithData(suite.T(), &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{{Host: "10.0.0.2"}},
-			Ports:     map[string]*pbcatalog.WorkloadPort{"tcp": {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_TCP}},
-		}).
-		Write(suite.T(), suite.client)
-}
-
-func (suite *dataFetcherSuite) TestFetcher_FetchWorkload_WorkloadNotFound() {
-	proxyID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "service-workload-abc").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		ID()
-	identityID := resourcetest.Resource(pbauth.WorkloadIdentityType, "workload-identity-abc").ID()
-
-	// Create cache and pre-populate it.
-	var (
-		destCache           = sidecarproxycache.NewDestinationsCache()
-		proxyCfgCache       = sidecarproxycache.NewProxyConfigurationCache()
-		computedRoutesCache = sidecarproxycache.NewComputedRoutesCache()
-		identitiesCache     = sidecarproxycache.NewIdentitiesCache()
-	)
-
-	f := Fetcher{
-		DestinationsCache:   destCache,
-		ProxyCfgCache:       proxyCfgCache,
-		ComputedRoutesCache: computedRoutesCache,
-		IdentitiesCache:     identitiesCache,
-		Client:              suite.client,
-	}
-
-	// Prepopulate the cache.
-	dest1 := intermediate.CombinedDestinationRef{
-		ServiceRef:             resourcetest.Resource(pbcatalog.ServiceType, "test-service-1").ReferenceNoSection(),
-		Port:                   "tcp",
-		ExplicitDestinationsID: resourcetest.Resource(pbmesh.DestinationsType, "test-servicedestinations-1").ID(),
-		SourceProxies: map[resource.ReferenceKey]struct{}{
-			resource.NewReferenceKey(proxyID): {},
-		},
-	}
-	dest2 := intermediate.CombinedDestinationRef{
-		ServiceRef:             resourcetest.Resource(pbcatalog.ServiceType, "test-service-2").ReferenceNoSection(),
-		Port:                   "tcp",
-		ExplicitDestinationsID: resourcetest.Resource(pbmesh.DestinationsType, "test-servicedestinations-2").ID(),
-		SourceProxies: map[resource.ReferenceKey]struct{}{
-			resource.NewReferenceKey(proxyID): {},
-		},
-	}
-
-	destCache.WriteDestination(dest1)
-	destCache.WriteDestination(dest2)
-	suite.syncDestinations(dest1, dest2)
-
-	workload := resourcetest.Resource(pbcatalog.WorkloadType, "service-workload-abc").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), &pbcatalog.Workload{
-			Identity: identityID.Name,
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"foo": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{
-					Host:  "10.0.0.1",
-					Ports: []string{"foo"},
-				},
-			},
-		}).Write(suite.T(), suite.client)
-
-	// Track the workload's identity
-	_, err := f.FetchWorkload(context.Background(), workload.Id)
-	require.NoError(suite.T(), err)
-	require.NotNil(suite.T(), destCache.DestinationsBySourceProxy(proxyID))
-	require.Nil(suite.T(), proxyCfgCache.ProxyConfigurationsByProxyID(proxyID))
-	require.Nil(suite.T(), proxyCfgCache.ProxyConfigurationsByProxyID(proxyID))
-	require.Equal(suite.T(), []*pbresource.ID{proxyID}, identitiesCache.ProxyIDsByWorkloadIdentity(identityID))
-
-	proxyCfgID := resourcetest.Resource(pbmesh.ProxyConfigurationType, "proxy-config").ID()
-	proxyCfgCache.TrackProxyConfiguration(proxyCfgID, []resource.ReferenceOrID{proxyID})
-
-	_, err = f.FetchWorkload(context.Background(), proxyID)
-	require.NoError(suite.T(), err)
-
-	// Check that cache is updated to remove proxy id.
-	require.Nil(suite.T(), destCache.DestinationsBySourceProxy(proxyID))
-	require.Nil(suite.T(), proxyCfgCache.ProxyConfigurationsByProxyID(proxyID))
-	require.Nil(suite.T(), proxyCfgCache.ProxyConfigurationsByProxyID(proxyID))
-	require.Nil(suite.T(), identitiesCache.ProxyIDsByWorkloadIdentity(identityID))
-}
-
-func (suite *dataFetcherSuite) TestFetcher_NotFound() {
-	// This test checks that we ignore not found errors for various types we need to fetch.
-
-	f := Fetcher{
-		Client: suite.client,
-	}
-
-	cases := map[string]struct {
-		typ       *pbresource.Type
-		fetchFunc func(id *pbresource.ID) error
-	}{
-		"proxy state template": {
-			typ: pbmesh.ProxyStateTemplateType,
-			fetchFunc: func(id *pbresource.ID) error {
-				_, err := f.FetchProxyStateTemplate(context.Background(), id)
-				return err
-			},
-		},
-		"service endpoints": {
-			typ: pbcatalog.ServiceEndpointsType,
-			fetchFunc: func(id *pbresource.ID) error {
-				_, err := f.FetchServiceEndpoints(context.Background(), id)
-				return err
-			},
-		},
-		"destinations": {
-			typ: pbmesh.DestinationsType,
-			fetchFunc: func(id *pbresource.ID) error {
-				_, err := f.FetchDestinations(context.Background(), id)
-				return err
-			},
-		},
-		"service": {
-			typ: pbcatalog.ServiceType,
-			fetchFunc: func(id *pbresource.ID) error {
-				_, err := f.FetchService(context.Background(), id)
-				return err
-			},
-		},
-	}
-
-	for name, c := range cases {
-		suite.T().Run(name, func(t *testing.T) {
-			err := c.fetchFunc(resourcetest.Resource(c.typ, "not-found").ID())
-			require.NoError(t, err)
-		})
-	}
-}
-
-func (suite *dataFetcherSuite) TestFetcher_FetchErrors() {
-	f := Fetcher{
-		Client: suite.client,
-	}
-
-	cases := map[string]struct {
-		name      string
-		fetchFunc func(id *pbresource.ID) error
-	}{
-		"workload": {
-			name: "web-abc",
-			fetchFunc: func(id *pbresource.ID) error {
-				_, err := f.FetchWorkload(context.Background(), id)
-				return err
-			},
-		},
-		"proxy state template": {
-			name: "web-abc",
-			fetchFunc: func(id *pbresource.ID) error {
-				_, err := f.FetchProxyStateTemplate(context.Background(), id)
-				return err
-			},
-		},
-		"service endpoints": {
-			name: "api-1",
-			fetchFunc: func(id *pbresource.ID) error {
-				_, err := f.FetchServiceEndpoints(context.Background(), id)
-				return err
-			},
-		},
-		"destinations": {
-			name: "web-destinations",
-			fetchFunc: func(id *pbresource.ID) error {
-				_, err := f.FetchDestinations(context.Background(), id)
-				return err
-			},
-		},
-		"service": {
-			name: "web-service",
-			fetchFunc: func(id *pbresource.ID) error {
-				_, err := f.FetchService(context.Background(), id)
-				return err
-			},
-		},
-	}
-
-	for name, c := range cases {
-		suite.T().Run(name+"-read", func(t *testing.T) {
-			badType := &pbresource.Type{
-				Group:        "not",
-				Kind:         "found",
-				GroupVersion: "vfake",
-			}
-			err := c.fetchFunc(resourcetest.Resource(badType, c.name).ID())
-			require.Error(t, err)
-			require.Equal(t, codes.InvalidArgument, status.Code(err))
-		})
-
-		suite.T().Run(name+"-unmarshal", func(t *testing.T) {
-			// Create a dummy health checks type as it won't be any of the types mesh controller cares about
-			resourcetest.Resource(pbcatalog.HealthChecksType, c.name).
-				WithData(suite.T(), &pbcatalog.HealthChecks{
-					Workloads: &pbcatalog.WorkloadSelector{Names: []string{"web-abc"}},
-				}).
-				Write(suite.T(), suite.client)
-
-			err := c.fetchFunc(resourcetest.Resource(pbcatalog.HealthChecksType, c.name).ID())
-			require.Error(t, err)
-			var parseErr resource.ErrDataParse
-			require.ErrorAs(t, err, &parseErr)
-		})
-	}
-}
-
-func (suite *dataFetcherSuite) syncDestinations(destinations ...intermediate.CombinedDestinationRef) {
-	data := &pbmesh.Destinations{}
-	for _, dest := range destinations {
-		data.Destinations = append(data.Destinations, &pbmesh.Destination{
-			DestinationRef:  dest.ServiceRef,
-			DestinationPort: dest.Port,
-		})
-	}
-
-	suite.webDestinations = resourcetest.Resource(pbmesh.DestinationsType, "web-destinations").
-		WithData(suite.T(), data).
-		Write(suite.T(), suite.client)
-}
-
-func (suite *dataFetcherSuite) TestFetcher_FetchExplicitDestinationsData() {
-	var (
-		c       = sidecarproxycache.NewDestinationsCache()
-		crCache = sidecarproxycache.NewComputedRoutesCache()
-	)
-
-	writeDestination := func(t *testing.T, dest intermediate.CombinedDestinationRef) {
-		c.WriteDestination(dest)
-		t.Cleanup(func() {
-			c.DeleteDestination(dest.ServiceRef, dest.Port)
-		})
-	}
-
-	var (
-		api1ServiceRef = resource.Reference(suite.api1Service.Id, "")
-	)
-
-	f := Fetcher{
-		DestinationsCache:   c,
-		ComputedRoutesCache: crCache,
-		Client:              suite.client,
-	}
-
-	testutil.RunStep(suite.T(), "invalid destinations: destinations not found", func(t *testing.T) {
-		destinationRefNoDestinations := intermediate.CombinedDestinationRef{
-			ServiceRef:             api1ServiceRef,
-			Port:                   "tcp",
-			ExplicitDestinationsID: resourcetest.Resource(pbmesh.DestinationsType, "not-found").ID(),
-			SourceProxies: map[resource.ReferenceKey]struct{}{
-				resource.NewReferenceKey(suite.webProxy.Id): {},
-			},
-		}
-		c.WriteDestination(destinationRefNoDestinations)
-		suite.syncDestinations(destinationRefNoDestinations)
-
-		destinationRefs := []intermediate.CombinedDestinationRef{destinationRefNoDestinations}
-		destinations, _, err := f.FetchExplicitDestinationsData(suite.ctx, destinationRefs)
-		require.NoError(t, err)
-		require.Nil(t, destinations)
-		_, foundDest := c.ReadDestination(destinationRefNoDestinations.ServiceRef, destinationRefNoDestinations.Port)
-		require.False(t, foundDest)
-	})
-
-	testutil.RunStep(suite.T(), "invalid destinations: service not found", func(t *testing.T) {
-		notFoundServiceRef := resourcetest.Resource(pbcatalog.ServiceType, "not-found").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			ReferenceNoSection()
-		destinationNoServiceEndpoints := intermediate.CombinedDestinationRef{
-			ServiceRef:             notFoundServiceRef,
-			Port:                   "tcp",
-			ExplicitDestinationsID: suite.webDestinations.Id,
-			SourceProxies: map[resource.ReferenceKey]struct{}{
-				resource.NewReferenceKey(suite.webProxy.Id): {},
-			},
-		}
-		c.WriteDestination(destinationNoServiceEndpoints)
-		suite.syncDestinations(destinationNoServiceEndpoints)
-
-		t.Cleanup(func() {
-			// Restore this for the next test step.
-			suite.webDestinations = resourcetest.Resource(pbmesh.DestinationsType, "web-destinations").
-				WithData(suite.T(), suite.webDestinationsData).
-				Write(suite.T(), suite.client)
-		})
-		suite.webDestinations = resourcetest.Resource(pbmesh.DestinationsType, "web-destinations").
-			WithData(suite.T(), &pbmesh.Destinations{
-				Destinations: []*pbmesh.Destination{{
-					DestinationRef:  notFoundServiceRef,
-					DestinationPort: "tcp",
-				}},
-			}).
-			Write(suite.T(), suite.client)
-
-		destinationRefs := []intermediate.CombinedDestinationRef{destinationNoServiceEndpoints}
-		destinations, statuses, err := f.FetchExplicitDestinationsData(suite.ctx, destinationRefs)
-		require.NoError(t, err)
-		require.Empty(t, destinations)
-
-		destinationRef := resource.IDToString(destinationNoServiceEndpoints.ExplicitDestinationsID)
-		serviceRef := resource.ReferenceToString(destinationNoServiceEndpoints.ServiceRef)
-
-		destStatus, exists := statuses[destinationRef]
-		require.True(t, exists, "status map does not contain service: %s", destinationRef)
-
-		require.Len(t, destStatus.Conditions, 1)
-		require.Equal(t, destStatus.Conditions[0],
-			meshStatus.ConditionDestinationServiceNotFound(serviceRef))
-
-		_, foundDest := c.ReadDestination(destinationNoServiceEndpoints.ServiceRef, destinationNoServiceEndpoints.Port)
-		require.True(t, foundDest)
-	})
-
-	testutil.RunStep(suite.T(), "invalid destinations: service not on mesh", func(t *testing.T) {
-		apiNonMeshServiceData := &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			},
-		}
-		suite.api1Service = resourcetest.ResourceID(suite.api1Service.Id).
-			WithData(suite.T(), apiNonMeshServiceData).
-			Write(suite.T(), suite.client)
-		destinationNonMeshServiceEndpoints := intermediate.CombinedDestinationRef{
-			ServiceRef:             api1ServiceRef,
-			Port:                   "tcp",
-			ExplicitDestinationsID: suite.webDestinations.Id,
-			SourceProxies: map[resource.ReferenceKey]struct{}{
-				resource.NewReferenceKey(suite.webProxy.Id): {},
-			},
-		}
-		c.WriteDestination(destinationNonMeshServiceEndpoints)
-		suite.syncDestinations(destinationNonMeshServiceEndpoints)
-
-		destinationRefs := []intermediate.CombinedDestinationRef{destinationNonMeshServiceEndpoints}
-		destinations, statuses, err := f.FetchExplicitDestinationsData(suite.ctx, destinationRefs)
-		require.NoError(t, err)
-		require.Nil(t, destinations)
-
-		destinationRef := resource.IDToString(destinationNonMeshServiceEndpoints.ExplicitDestinationsID)
-		serviceRef := resource.ReferenceToString(destinationNonMeshServiceEndpoints.ServiceRef)
-
-		destStatus, exists := statuses[destinationRef]
-		require.True(t, exists, "status map does not contain service: %s", destinationRef)
-
-		prototest.AssertElementsMatch(t, []*pbresource.Condition{
-			meshStatus.ConditionDestinationServiceFound(serviceRef),
-			meshStatus.ConditionMeshProtocolNotFound(serviceRef),
-		}, destStatus.Conditions)
-
-		_, foundDest := c.ReadDestination(destinationNonMeshServiceEndpoints.ServiceRef, destinationNonMeshServiceEndpoints.Port)
-		require.True(t, foundDest)
-
-		// Update the service to be mesh enabled again and check that the status is now valid.
-		suite.api1Service = resourcetest.ResourceID(suite.api1Service.Id).
-			WithData(suite.T(), suite.api1ServiceData).
-			Write(suite.T(), suite.client)
-
-		destinations, statuses, err = f.FetchExplicitDestinationsData(suite.ctx, destinationRefs)
-		require.NoError(t, err)
-		require.Nil(t, destinations)
-
-		destStatus, exists = statuses[destinationRef]
-		require.True(t, exists, "status map does not contain service: %s", destinationRef)
-
-		prototest.AssertElementsMatch(t, []*pbresource.Condition{
-			meshStatus.ConditionDestinationServiceFound(serviceRef),
-			meshStatus.ConditionMeshProtocolFound(serviceRef),
-			meshStatus.ConditionNonMeshProtocolDestinationPort(serviceRef, destinationNonMeshServiceEndpoints.Port),
-			meshStatus.ConditionDestinationComputedRoutesNotFound(serviceRef),
-		}, destStatus.Conditions)
-	})
-
-	testutil.RunStep(suite.T(), "invalid destinations: destination is pointing to a mesh port", func(t *testing.T) {
-		// Create a destination pointing to the mesh port.
-		destinationMeshDestinationPort := intermediate.CombinedDestinationRef{
-			ServiceRef:             api1ServiceRef,
-			Port:                   "mesh",
-			ExplicitDestinationsID: suite.webDestinations.Id,
-			SourceProxies: map[resource.ReferenceKey]struct{}{
-				resource.NewReferenceKey(suite.webProxy.Id): {},
-			},
-		}
-		c.WriteDestination(destinationMeshDestinationPort)
-		suite.syncDestinations(destinationMeshDestinationPort)
-		destinationRefs := []intermediate.CombinedDestinationRef{destinationMeshDestinationPort}
-
-		destinations, statuses, err := f.FetchExplicitDestinationsData(suite.ctx, destinationRefs)
-		serviceRef := resource.ReferenceToString(destinationMeshDestinationPort.ServiceRef)
-		destinationRef := resource.IDToString(destinationMeshDestinationPort.ExplicitDestinationsID)
-		expectedStatus := &intermediate.Status{
-			ID:         suite.webDestinations.Id,
-			Generation: suite.webDestinations.Generation,
-			Conditions: []*pbresource.Condition{
-				meshStatus.ConditionDestinationServiceFound(serviceRef),
-				meshStatus.ConditionMeshProtocolFound(serviceRef),
-				meshStatus.ConditionMeshProtocolDestinationPort(serviceRef, destinationMeshDestinationPort.Port),
-			},
-		}
-
-		require.NoError(t, err)
-
-		destStatus, exists := statuses[destinationRef]
-		require.True(t, exists, "status map does not contain service: %s", destinationRef)
-
-		// Check that the status is generated correctly.
-		prototest.AssertDeepEqual(t, expectedStatus, destStatus)
-
-		// Check that we didn't return any destinations.
-		require.Empty(t, destinations)
-
-		// Check that destination service is still in cache because it's still referenced from the pbmesh.Destinations
-		// resource.
-		_, foundDest := c.ReadDestination(destinationMeshDestinationPort.ServiceRef, destinationMeshDestinationPort.Port)
-		require.True(t, foundDest)
-
-		// Update the destination to point to a non-mesh port and check that the status is now updated.
-		destinationRefs[0].Port = "tcp"
-		c.WriteDestination(destinationMeshDestinationPort)
-		suite.syncDestinations(destinationMeshDestinationPort)
-		expectedStatus = &intermediate.Status{
-			ID:         suite.webDestinations.Id,
-			Generation: suite.webDestinations.Generation,
-			Conditions: []*pbresource.Condition{
-				meshStatus.ConditionDestinationServiceFound(serviceRef),
-				meshStatus.ConditionMeshProtocolFound(serviceRef),
-				meshStatus.ConditionNonMeshProtocolDestinationPort(serviceRef, destinationRefs[0].Port),
-				meshStatus.ConditionDestinationComputedRoutesNotFound(serviceRef),
-			},
-		}
-
-		_, statuses, err = f.FetchExplicitDestinationsData(suite.ctx, destinationRefs)
-		require.NoError(t, err)
-
-		destStatus, exists = statuses[destinationRef]
-		require.True(t, exists, "status map does not contain service: %s", destinationRef)
-
-		prototest.AssertDeepEqual(t, expectedStatus, destStatus)
-	})
-
-	destination1 := intermediate.CombinedDestinationRef{
-		ServiceRef:             resource.Reference(suite.api1Service.Id, ""),
-		Port:                   "tcp",
-		ExplicitDestinationsID: suite.webDestinations.Id,
-		SourceProxies: map[resource.ReferenceKey]struct{}{
-			resource.NewReferenceKey(suite.webProxy.Id): {},
-		},
-	}
-	destination2 := intermediate.CombinedDestinationRef{
-		ServiceRef:             resource.Reference(suite.api2Service.Id, ""),
-		Port:                   "tcp1",
-		ExplicitDestinationsID: suite.webDestinations.Id,
-		SourceProxies: map[resource.ReferenceKey]struct{}{
-			resource.NewReferenceKey(suite.webProxy.Id): {},
-		},
-	}
-	destination3 := intermediate.CombinedDestinationRef{
-		ServiceRef:             resource.Reference(suite.api2Service.Id, ""),
-		Port:                   "tcp2",
-		ExplicitDestinationsID: suite.webDestinations.Id,
-		SourceProxies: map[resource.ReferenceKey]struct{}{
-			resource.NewReferenceKey(suite.webProxy.Id): {},
-		},
-	}
-
-	testutil.RunStep(suite.T(), "invalid destinations: destination is pointing to a port but computed routes is not aware of it yet", func(t *testing.T) {
-		apiNonTCPServiceData := &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			},
-		}
-		apiNonTCPService := resourcetest.ResourceID(suite.api1Service.Id).
-			WithData(suite.T(), apiNonTCPServiceData).
-			Build()
-
-		api1ComputedRoutesID := resource.ReplaceType(pbmesh.ComputedRoutesType, suite.api1Service.Id)
-		api1ComputedRoutes := routestest.ReconcileComputedRoutes(suite.T(), suite.client, api1ComputedRoutesID,
-			resourcetest.MustDecode[*pbcatalog.Service](suite.T(), apiNonTCPService),
-		)
-		require.NotNil(suite.T(), api1ComputedRoutes)
-
-		// This destination points to TCP, but the computed routes is stale and only knows about HTTP.
-		writeDestination(t, destination1)
-		suite.syncDestinations(destination1)
-		destinationRefs := []intermediate.CombinedDestinationRef{destination1}
-
-		destinations, statuses, err := f.FetchExplicitDestinationsData(suite.ctx, destinationRefs)
-		serviceRef := resource.ReferenceToString(destination1.ServiceRef)
-		destinationRef := resource.IDToString(destination1.ExplicitDestinationsID)
-		expectedStatus := &intermediate.Status{
-			ID:         suite.webDestinations.Id,
-			Generation: suite.webDestinations.Generation,
-			Conditions: []*pbresource.Condition{
-				meshStatus.ConditionDestinationServiceFound(serviceRef),
-				meshStatus.ConditionMeshProtocolFound(serviceRef),
-				meshStatus.ConditionNonMeshProtocolDestinationPort(serviceRef, destination1.Port),
-				meshStatus.ConditionDestinationComputedRoutesFound(serviceRef),
-				meshStatus.ConditionDestinationComputedRoutesPortNotFound(serviceRef, destination1.Port),
-			},
-		}
-
-		require.NoError(t, err)
-
-		destStatus, exists := statuses[destinationRef]
-		require.True(t, exists, "status map does not contain service: %s", destinationRef)
-
-		// Check that the status is generated correctly.
-		prototest.AssertDeepEqual(t, expectedStatus, destStatus)
-
-		// Check that we didn't return any destinations.
-		require.Nil(t, destinations)
-
-		// Check that destination service is still in cache because it's still referenced from the pbmesh.Destinations
-		// resource.
-		_, foundDest := c.ReadDestination(destination1.ServiceRef, destination1.Port)
-		require.True(t, foundDest)
-
-		// Update the computed routes not not lag.
-		api1ComputedRoutes = routestest.ReconcileComputedRoutes(suite.T(), suite.client, api1ComputedRoutesID,
-			resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.api1Service),
-		)
-		require.NotNil(suite.T(), api1ComputedRoutes)
-
-		expectedStatus = &intermediate.Status{
-			ID:         suite.webDestinations.Id,
-			Generation: suite.webDestinations.Generation,
-			Conditions: []*pbresource.Condition{
-				meshStatus.ConditionDestinationServiceFound(serviceRef),
-				meshStatus.ConditionMeshProtocolFound(serviceRef),
-				meshStatus.ConditionNonMeshProtocolDestinationPort(serviceRef, destination1.Port),
-				meshStatus.ConditionDestinationComputedRoutesFound(serviceRef),
-				meshStatus.ConditionDestinationComputedRoutesPortFound(serviceRef, destination1.Port),
-			},
-		}
-
-		actualDestinations, statuses, err := f.FetchExplicitDestinationsData(suite.ctx, destinationRefs)
-		require.NoError(t, err)
-
-		destStatus, exists = statuses[destinationRef]
-		require.True(t, exists, "status map does not contain service: %s", destinationRef)
-
-		prototest.AssertDeepEqual(t, expectedStatus, destStatus)
-
-		expectedDestinations := []*intermediate.Destination{
-			{
-				Explicit: suite.webDestinationsData.Destinations[0],
-				Service:  resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.api1Service),
-				ComputedPortRoutes: routestest.MutateTargets(suite.T(), api1ComputedRoutes.Data, "tcp", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-					switch {
-					case resource.ReferenceOrIDMatch(suite.api1Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp":
-						se := resourcetest.MustDecode[*pbcatalog.ServiceEndpoints](suite.T(), suite.api1ServiceEndpoints)
-						details.ServiceEndpointsId = se.Resource.Id
-						details.ServiceEndpoints = se.Data
-						details.IdentityRefs = []*pbresource.Reference{{
-							Name:    "api-1-identity",
-							Tenancy: suite.api1Service.Id.Tenancy,
-						}}
-					}
-				}),
-			},
-		}
-		prototest.AssertElementsMatch(t, expectedDestinations, actualDestinations)
-	})
-
-	testutil.RunStep(suite.T(), "happy path", func(t *testing.T) {
-		writeDestination(t, destination1)
-		writeDestination(t, destination2)
-		writeDestination(t, destination3)
-		suite.syncDestinations(destination1, destination2, destination3)
-
-		// Write a default ComputedRoutes for api1 and api2.
-		var (
-			api1ComputedRoutesID = resource.ReplaceType(pbmesh.ComputedRoutesType, suite.api1Service.Id)
-			api2ComputedRoutesID = resource.ReplaceType(pbmesh.ComputedRoutesType, suite.api2Service.Id)
-		)
-		api1ComputedRoutes := routestest.ReconcileComputedRoutes(suite.T(), suite.client, api1ComputedRoutesID,
-			resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.api1Service),
-		)
-		require.NotNil(suite.T(), api1ComputedRoutes)
-		api2ComputedRoutes := routestest.ReconcileComputedRoutes(suite.T(), suite.client, api2ComputedRoutesID,
-			resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.api2Service),
-		)
-		require.NotNil(suite.T(), api2ComputedRoutes)
-
-		destinationRefs := []intermediate.CombinedDestinationRef{destination1, destination2, destination3}
-		expectedDestinations := []*intermediate.Destination{
-			{
-				Explicit: suite.webDestinationsData.Destinations[0],
-				Service:  resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.api1Service),
-				ComputedPortRoutes: routestest.MutateTargets(suite.T(), api1ComputedRoutes.Data, "tcp", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-					switch {
-					case resource.ReferenceOrIDMatch(suite.api1Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp":
-						se := resourcetest.MustDecode[*pbcatalog.ServiceEndpoints](suite.T(), suite.api1ServiceEndpoints)
-						details.ServiceEndpointsId = se.Resource.Id
-						details.ServiceEndpoints = se.Data
-						details.IdentityRefs = []*pbresource.Reference{{
-							Name:    "api-1-identity",
-							Tenancy: suite.api1Service.Id.Tenancy,
-						}}
-					}
-				}),
-			},
-			{
-				Explicit: suite.webDestinationsData.Destinations[1],
-				Service:  resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.api2Service),
-				ComputedPortRoutes: routestest.MutateTargets(suite.T(), api2ComputedRoutes.Data, "tcp1", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-					switch {
-					case resource.ReferenceOrIDMatch(suite.api2Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp1":
-						se := resourcetest.MustDecode[*pbcatalog.ServiceEndpoints](suite.T(), suite.api2ServiceEndpoints)
-						details.ServiceEndpointsId = se.Resource.Id
-						details.ServiceEndpoints = se.Data
-						details.IdentityRefs = []*pbresource.Reference{{
-							Name:    "api-2-identity",
-							Tenancy: suite.api2Service.Id.Tenancy,
-						}}
-					}
-				}),
-			},
-			{
-				Explicit: suite.webDestinationsData.Destinations[2],
-				Service:  resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.api2Service),
-				ComputedPortRoutes: routestest.MutateTargets(suite.T(), api2ComputedRoutes.Data, "tcp2", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-					switch {
-					case resource.ReferenceOrIDMatch(suite.api2Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp2":
-						se := resourcetest.MustDecode[*pbcatalog.ServiceEndpoints](suite.T(), suite.api2ServiceEndpoints)
-						details.ServiceEndpointsId = se.Resource.Id
-						details.ServiceEndpoints = se.Data
-						details.IdentityRefs = []*pbresource.Reference{{
-							Name:    "api-2-identity",
-							Tenancy: suite.api2Service.Id.Tenancy,
-						}}
-					}
-				}),
-			},
-		}
-		var expectedConditions []*pbresource.Condition
-		for _, d := range destinationRefs {
-			ref := resource.ReferenceToString(d.ServiceRef)
-			expectedConditions = append(expectedConditions,
-				meshStatus.ConditionDestinationServiceFound(ref),
-				meshStatus.ConditionMeshProtocolFound(ref),
-				meshStatus.ConditionNonMeshProtocolDestinationPort(ref, d.Port),
-				meshStatus.ConditionDestinationComputedRoutesFound(ref),
-				meshStatus.ConditionDestinationComputedRoutesPortFound(ref, d.Port),
-			)
-		}
-
-		actualDestinations, statuses, err := f.FetchExplicitDestinationsData(suite.ctx, destinationRefs)
-		require.NoError(t, err)
-
-		// Check that all statuses have "happy" conditions.
-		dref := resource.IDToString(destination1.ExplicitDestinationsID)
-		prototest.AssertElementsMatch(t, expectedConditions, statuses[dref].Conditions)
-
-		// Check that we've computed expanded destinations correctly.
-		prototest.AssertElementsMatch(t, expectedDestinations, actualDestinations)
-	})
-}
-
-func (suite *dataFetcherSuite) TestFetcher_FetchImplicitDestinationsData() {
-	// Create a few other services to be implicit upstreams.
-	api3Service := resourcetest.Resource(pbcatalog.ServiceType, "api-3").
-		WithData(suite.T(), &pbcatalog.Service{
-			VirtualIps: []string{"192.1.1.1"},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "tcp", VirtualPort: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-				{TargetPort: "mesh", VirtualPort: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			},
-		}).
-		Write(suite.T(), suite.client)
-
-	api3ServiceEndpointsData := &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				TargetRef: &pbresource.ID{
-					Name:    "api-3-abc",
-					Tenancy: api3Service.Id.Tenancy,
-					Type:    pbcatalog.WorkloadType,
-				},
-				Addresses: []*pbcatalog.WorkloadAddress{{Host: "10.0.0.1"}},
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"tcp":  {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-					"mesh": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-				Identity: "api-3-identity",
-			},
-		},
-	}
-	api3ServiceEndpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-3").
-		WithData(suite.T(), api3ServiceEndpointsData).
-		Write(suite.T(), suite.client)
-
-	// Write a default ComputedRoutes for api1, api2, and api3.
-	var (
-		api1ComputedRoutesID = resource.ReplaceType(pbmesh.ComputedRoutesType, suite.api1Service.Id)
-		api2ComputedRoutesID = resource.ReplaceType(pbmesh.ComputedRoutesType, suite.api2Service.Id)
-		api3ComputedRoutesID = resource.ReplaceType(pbmesh.ComputedRoutesType, api3Service.Id)
-	)
-	api1ComputedRoutes := routestest.ReconcileComputedRoutes(suite.T(), suite.client, api1ComputedRoutesID,
-		resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.api1Service),
-	)
-	require.NotNil(suite.T(), api1ComputedRoutes)
-	api2ComputedRoutes := routestest.ReconcileComputedRoutes(suite.T(), suite.client, api2ComputedRoutesID,
-		resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.api2Service),
-	)
-	require.NotNil(suite.T(), api2ComputedRoutes)
-	api3ComputedRoutes := routestest.ReconcileComputedRoutes(suite.T(), suite.client, api3ComputedRoutesID,
-		resourcetest.MustDecode[*pbcatalog.Service](suite.T(), api3Service),
-	)
-	require.NotNil(suite.T(), api3ComputedRoutes)
-
-	existingDestinations := []*intermediate.Destination{
-		{
-			Explicit: suite.webDestinationsData.Destinations[0],
-			Service:  resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.api1Service),
-			ComputedPortRoutes: routestest.MutateTargets(suite.T(), api1ComputedRoutes.Data, "tcp", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-				switch {
-				case resource.ReferenceOrIDMatch(suite.api1Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp":
-					se := resourcetest.MustDecode[*pbcatalog.ServiceEndpoints](suite.T(), suite.api1ServiceEndpoints)
-					details.ServiceEndpointsId = se.Resource.Id
-					details.ServiceEndpoints = se.Data
-					details.IdentityRefs = []*pbresource.Reference{{
-						Name:    "api-1-identity",
-						Tenancy: suite.api1Service.Id.Tenancy,
-					}}
-				}
-			}),
-		},
-		{
-			Explicit: suite.webDestinationsData.Destinations[1],
-			Service:  resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.api2Service),
-			ComputedPortRoutes: routestest.MutateTargets(suite.T(), api2ComputedRoutes.Data, "tcp1", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-				switch {
-				case resource.ReferenceOrIDMatch(suite.api2Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp1":
-					se := resourcetest.MustDecode[*pbcatalog.ServiceEndpoints](suite.T(), suite.api2ServiceEndpoints)
-					details.ServiceEndpointsId = se.Resource.Id
-					details.ServiceEndpoints = se.Data
-					details.IdentityRefs = []*pbresource.Reference{{
-						Name:    "api-2-identity",
-						Tenancy: suite.api1Service.Id.Tenancy,
-					}}
-				}
-			}),
-		},
-		{
-			Explicit: suite.webDestinationsData.Destinations[2],
-			Service:  resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.api2Service),
-			ComputedPortRoutes: routestest.MutateTargets(suite.T(), api2ComputedRoutes.Data, "tcp2", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-				switch {
-				case resource.ReferenceOrIDMatch(suite.api2Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp2":
-					se := resourcetest.MustDecode[*pbcatalog.ServiceEndpoints](suite.T(), suite.api2ServiceEndpoints)
-					details.ServiceEndpointsId = se.Resource.Id
-					details.ServiceEndpoints = se.Data
-					details.IdentityRefs = []*pbresource.Reference{{
-						Name:    "api-2-identity",
-						Tenancy: suite.api1Service.Id.Tenancy,
-					}}
-				}
-			}),
-		},
-		{
-			// implicit
-			Service: resourcetest.MustDecode[*pbcatalog.Service](suite.T(), api3Service),
-			ComputedPortRoutes: routestest.MutateTargets(suite.T(), api3ComputedRoutes.Data, "tcp", func(t *testing.T, details *pbmesh.BackendTargetDetails) {
-				switch {
-				case resource.ReferenceOrIDMatch(api3Service.Id, details.BackendRef.Ref) && details.BackendRef.Port == "tcp":
-					se := resourcetest.MustDecode[*pbcatalog.ServiceEndpoints](suite.T(), api3ServiceEndpoints)
-					details.ServiceEndpointsId = se.Resource.Id
-					details.ServiceEndpoints = se.Data
-					details.IdentityRefs = []*pbresource.Reference{{
-						Name:    "api-3-identity",
-						Tenancy: suite.api1Service.Id.Tenancy,
-					}}
-				}
-			}),
-			VirtualIPs: []string{"192.1.1.1"},
-		},
-	}
-
-	f := Fetcher{
-		Client: suite.client,
-	}
-
-	actualDestinations, err := f.FetchImplicitDestinationsData(context.Background(), suite.webProxy.Id, existingDestinations)
-	require.NoError(suite.T(), err)
-
-	prototest.AssertElementsMatch(suite.T(), existingDestinations, actualDestinations)
-}
-
-func (suite *dataFetcherSuite) TestFetcher_FetchAndMergeProxyConfigurations() {
-	// Create some proxy configurations.
-	proxyCfg1Data := &pbmesh.ProxyConfiguration{
-		DynamicConfig: &pbmesh.DynamicConfig{
-			Mode: pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
-		},
-	}
-
-	proxyCfg2Data := &pbmesh.ProxyConfiguration{
-		DynamicConfig: &pbmesh.DynamicConfig{
-			MutualTlsMode: pbmesh.MutualTLSMode_MUTUAL_TLS_MODE_DEFAULT,
-		},
-	}
-
-	proxyCfg1 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "config-1").
-		WithData(suite.T(), proxyCfg1Data).
-		Write(suite.T(), suite.client)
-
-	proxyCfg2 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "config-2").
-		WithData(suite.T(), proxyCfg2Data).
-		Write(suite.T(), suite.client)
-
-	proxyCfgCache := sidecarproxycache.NewProxyConfigurationCache()
-	proxyCfgCache.TrackProxyConfiguration(proxyCfg1.Id, []resource.ReferenceOrID{suite.webProxy.Id})
-	proxyCfgCache.TrackProxyConfiguration(proxyCfg2.Id, []resource.ReferenceOrID{suite.webProxy.Id})
-
-	expectedProxyCfg := &pbmesh.ProxyConfiguration{
-		DynamicConfig: &pbmesh.DynamicConfig{
-			Mode:          pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
-			MutualTlsMode: pbmesh.MutualTLSMode_MUTUAL_TLS_MODE_DEFAULT,
-			TransparentProxy: &pbmesh.TransparentProxy{
-				OutboundListenerPort: 15001,
-			},
-		},
-	}
-
-	fetcher := Fetcher{Client: suite.client, ProxyCfgCache: proxyCfgCache}
-
-	actualProxyCfg, err := fetcher.FetchAndMergeProxyConfigurations(suite.ctx, suite.webProxy.Id)
-	require.NoError(suite.T(), err)
-	prototest.AssertDeepEqual(suite.T(), expectedProxyCfg, actualProxyCfg)
-
-	// Delete proxy cfg and check that the cache gets updated.
-	_, err = suite.client.Delete(suite.ctx, &pbresource.DeleteRequest{Id: proxyCfg1.Id})
-	require.NoError(suite.T(), err)
-
-	_, err = fetcher.FetchAndMergeProxyConfigurations(suite.ctx, suite.webProxy.Id)
-	require.NoError(suite.T(), err)
-
-	proxyCfg2.Id.Uid = ""
-	prototest.AssertElementsMatch(suite.T(),
-		[]*pbresource.ID{proxyCfg2.Id},
-		fetcher.ProxyCfgCache.ProxyConfigurationsByProxyID(suite.webProxy.Id))
-}
-
-func TestDataFetcher(t *testing.T) {
-	suite.Run(t, new(dataFetcherSuite))
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/status/status.go b/internal/mesh/internal/controllers/sidecarproxy/status/status.go
deleted file mode 100644
index 04a315e14897a..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/status/status.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package status
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	StatusConditionDestinationAccepted = "DestinationAccepted"
-
-	StatusReasonMeshProtocolNotFound = "MeshPortProtocolNotFound"
-	StatusReasonMeshProtocolFound    = "MeshPortProtocolFound"
-
-	StatusReasonMeshProtocolDestinationPort    = "DestinationWithMeshPortProtocol"
-	StatusReasonNonMeshProtocolDestinationPort = "DestinationWithNonMeshPortProtocol"
-
-	StatusReasonDestinationServiceNotFound = "ServiceNotFound"
-	StatusReasonDestinationServiceFound    = "ServiceFound"
-
-	StatusReasonDestinationComputedRoutesNotFound = "ComputedRoutesNotFound"
-	StatusReasonDestinationComputedRoutesFound    = "ComputedRoutesFound"
-
-	StatusReasonDestinationComputedRoutesPortNotFound = "ComputedRoutesPortNotFound"
-	StatusReasonDestinationComputedRoutesPortFound    = "ComputedRoutesPortFound"
-)
-
-func ConditionMeshProtocolNotFound(serviceRef string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionDestinationAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  StatusReasonMeshProtocolNotFound,
-		Message: fmt.Sprintf("service %q cannot be referenced as a Destination because it's not mesh-enabled.", serviceRef),
-	}
-}
-
-func ConditionMeshProtocolFound(serviceRef string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionDestinationAccepted,
-		State:   pbresource.Condition_STATE_TRUE,
-		Reason:  StatusReasonMeshProtocolFound,
-		Message: fmt.Sprintf("service %q is on the mesh.", serviceRef),
-	}
-}
-
-func ConditionDestinationServiceNotFound(serviceRef string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionDestinationAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  StatusReasonDestinationServiceNotFound,
-		Message: fmt.Sprintf("service %q does not exist.", serviceRef),
-	}
-}
-
-func ConditionDestinationServiceFound(serviceRef string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionDestinationAccepted,
-		State:   pbresource.Condition_STATE_TRUE,
-		Reason:  StatusReasonDestinationServiceFound,
-		Message: fmt.Sprintf("service %q exists.", serviceRef),
-	}
-}
-
-func ConditionMeshProtocolDestinationPort(serviceRef, port string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionDestinationAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  StatusReasonMeshProtocolDestinationPort,
-		Message: fmt.Sprintf("destination port %q for service %q has PROTOCOL_MESH which is unsupported for destination services", port, serviceRef),
-	}
-}
-
-func ConditionNonMeshProtocolDestinationPort(serviceRef, port string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionDestinationAccepted,
-		State:   pbresource.Condition_STATE_TRUE,
-		Reason:  StatusReasonNonMeshProtocolDestinationPort,
-		Message: fmt.Sprintf("destination port %q for service %q has a non-mesh protocol", port, serviceRef),
-	}
-}
-
-func ConditionDestinationComputedRoutesNotFound(serviceRef string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionDestinationAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  StatusReasonDestinationComputedRoutesNotFound,
-		Message: fmt.Sprintf("computed routes %q does not exist.", serviceRef),
-	}
-}
-
-func ConditionDestinationComputedRoutesFound(serviceRef string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionDestinationAccepted,
-		State:   pbresource.Condition_STATE_TRUE,
-		Reason:  StatusReasonDestinationComputedRoutesNotFound,
-		Message: fmt.Sprintf("computed routes %q exists.", serviceRef),
-	}
-}
-
-func ConditionDestinationComputedRoutesPortNotFound(serviceRef, port string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionDestinationAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  StatusReasonDestinationComputedRoutesPortNotFound,
-		Message: fmt.Sprintf("computed routes %q does not exist for port %q.", serviceRef, port),
-	}
-}
-
-func ConditionDestinationComputedRoutesPortFound(serviceRef, port string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionDestinationAccepted,
-		State:   pbresource.Condition_STATE_TRUE,
-		Reason:  StatusReasonDestinationComputedRoutesPortNotFound,
-		Message: fmt.Sprintf("computed routes %q exists for port %q.", serviceRef, port),
-	}
-}
diff --git a/internal/mesh/internal/controllers/xds/controller.go b/internal/mesh/internal/controllers/xds/controller.go
deleted file mode 100644
index 678cfd0539d8d..0000000000000
--- a/internal/mesh/internal/controllers/xds/controller.go
+++ /dev/null
@@ -1,418 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/cacheshim"
-	"github.com/hashicorp/consul/agent/leafcert"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/xds/status"
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
-	proxytracker "github.com/hashicorp/consul/internal/mesh/proxy-tracker"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/mappers/bimapper"
-	"github.com/hashicorp/consul/lib"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const ControllerName = "consul.io/xds-controller"
-
-const defaultTenancy = "default"
-
-func Controller(endpointsMapper *bimapper.Mapper, updater ProxyUpdater, fetcher TrustBundleFetcher, leafCertManager *leafcert.Manager, leafMapper *LeafMapper, leafCancels *LeafCancels, datacenter string) controller.Controller {
-	leafCertEvents := make(chan controller.Event, 1000)
-	if endpointsMapper == nil || fetcher == nil || leafCertManager == nil || leafMapper == nil || datacenter == "" {
-		panic("endpointsMapper, updater, fetcher, leafCertManager, leafMapper, and datacenter are required")
-	}
-
-	return controller.ForType(pbmesh.ProxyStateTemplateType).
-		WithWatch(pbcatalog.ServiceEndpointsType, endpointsMapper.MapLink).
-		WithCustomWatch(proxySource(updater), proxyMapper).
-		WithCustomWatch(&controller.Source{Source: leafCertEvents}, leafMapper.EventMapLink).
-		WithPlacement(controller.PlacementEachServer).
-		WithReconciler(&xdsReconciler{endpointsMapper: endpointsMapper, updater: updater, fetchTrustBundle: fetcher, leafCertManager: leafCertManager, leafCancels: leafCancels, leafCertEvents: leafCertEvents, leafMapper: leafMapper, datacenter: datacenter})
-}
-
-type xdsReconciler struct {
-	// Fields for fetching and watching endpoints.
-	endpointsMapper *bimapper.Mapper
-	// Fields for proxy management.
-	updater ProxyUpdater
-	// Fields for fetching and watching trust bundles.
-	fetchTrustBundle TrustBundleFetcher
-	// Fields for fetching and watching leaf certificates.
-	leafCertManager *leafcert.Manager
-	leafMapper      *LeafMapper
-	leafCancels     *LeafCancels
-	leafCertEvents  chan controller.Event
-	datacenter      string
-}
-
-type TrustBundleFetcher func() (*pbproxystate.TrustBundle, error)
-
-// ProxyUpdater is an interface that defines the ability to push proxy updates to the updater
-// and also check its connectivity to the server.
-type ProxyUpdater interface {
-	// PushChange allows pushing a computed ProxyState to xds for xds resource generation to send to a proxy.
-	PushChange(id *pbresource.ID, snapshot proxysnapshot.ProxySnapshot) error
-
-	// ProxyConnectedToServer returns whether this id is connected to this server.
-	ProxyConnectedToServer(id *pbresource.ID) (string, bool)
-
-	// EventChannel returns a channel of events that are consumed by the Custom Watcher.
-	EventChannel() chan controller.Event
-}
-
-func (r *xdsReconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	rt.Logger = rt.Logger.With("resource-id", req.ID, "controller", ControllerName)
-
-	rt.Logger.Trace("reconciling  proxy state template", "id", req.ID)
-
-	// Get the ProxyStateTemplate.
-	proxyStateTemplate, err := getProxyStateTemplate(ctx, rt, req.ID)
-	if err != nil {
-		rt.Logger.Error("error reading proxy state template", "error", err)
-		return err
-	}
-
-	token, proxyConnected := r.updater.ProxyConnectedToServer(req.ID)
-
-	if proxyStateTemplate == nil || proxyStateTemplate.Template == nil || !proxyConnected {
-		rt.Logger.Trace("proxy state template has been deleted or this controller is not responsible for this proxy state template", "id", req.ID)
-
-		// If the proxy state template (PST) was deleted, we should:
-		// 1. Remove references from endpoints mapper.
-		// 2. Remove references from leaf mapper.
-		// 3. Cancel all leaf watches.
-
-		// 1. Remove PST from endpoints mapper.
-		r.endpointsMapper.UntrackItem(req.ID)
-		// Grab the leafs related to this PST before untracking the PST so we know which ones to cancel.
-		leafLinks := r.leafMapper.LinkRefsForItem(req.ID)
-		// 2. Remove PST from leaf mapper.
-		r.leafMapper.UntrackItem(req.ID)
-
-		// 3. Cancel watches for leafs that were related to this PST as long as it's not referenced by any other PST.
-		r.cancelWatches(leafLinks)
-
-		return nil
-	}
-
-	var (
-		statusCondition *pbresource.Condition
-		pstResource     *pbresource.Resource
-	)
-	pstResource = proxyStateTemplate.Resource
-
-	if proxyStateTemplate.Template.ProxyState == nil {
-		rt.Logger.Error("proxy state was missing from proxy state template")
-		// Set the status.
-		statusCondition = status.ConditionRejectedNilProxyState(status.KeyFromID(req.ID))
-		status.WriteStatusIfChanged(ctx, rt, pstResource, statusCondition)
-
-		return err
-	}
-
-	// TODO: Fetch trust bundles for all peers when peering is supported.
-	trustBundle, err := r.fetchTrustBundle()
-	if err != nil {
-		rt.Logger.Error("error fetching root trust bundle", "error", err)
-		// Set the status.
-		statusCondition = status.ConditionRejectedTrustBundleFetchFailed(status.KeyFromID(req.ID))
-		status.WriteStatusIfChanged(ctx, rt, pstResource, statusCondition)
-		return err
-	}
-
-	// Initialize ProxyState maps.
-	if proxyStateTemplate.Template.ProxyState.TrustBundles == nil {
-		proxyStateTemplate.Template.ProxyState.TrustBundles = make(map[string]*pbproxystate.TrustBundle)
-	}
-	// TODO: Figure out the correct key for the default trust bundle.
-	proxyStateTemplate.Template.ProxyState.TrustBundles["local"] = trustBundle
-
-	if proxyStateTemplate.Template.ProxyState.Endpoints == nil {
-		proxyStateTemplate.Template.ProxyState.Endpoints = make(map[string]*pbproxystate.Endpoints)
-	}
-	if proxyStateTemplate.Template.ProxyState.LeafCertificates == nil {
-		proxyStateTemplate.Template.ProxyState.LeafCertificates = make(map[string]*pbproxystate.LeafCertificate)
-	}
-
-	// Iterate through the endpoint references.
-	// For endpoints, the controller should:
-	//  1. Resolve ServiceEndpoint references
-	//  2. Translate them into pbproxystate.Endpoints
-	//  3. Add the pbproxystate.Endpoints to the ProxyState endpoints map.
-	//  4. Track relationships between ProxyState and ServiceEndpoints, such that we can look up ServiceEndpoints and
-	//  figure out which ProxyStates are associated with it (for mapping watches) and vice versa (for looking up
-	//  references). The bimapper package is useful for tracking these relationships.
-	endpointReferencesMap := proxyStateTemplate.Template.RequiredEndpoints
-	var endpointsInProxyStateTemplate []resource.ReferenceOrID
-	for xdsClusterName, endpointRef := range endpointReferencesMap {
-
-		// Step 1: Resolve the reference by looking up the ServiceEndpoints.
-		// serviceEndpoints will not be nil unless there is an error.
-		//
-		// TODO(rb/v2): note we should expose a flag on the endpointRef indicating if the user
-		// wants the absence of an Endpoints to imply returning a slice of no data, vs failing outright.
-		// In xdsv1 we call this the "allowEmpty" semantic. Here we are assuming "allowEmpty=true"
-		var psEndpoints *pbproxystate.Endpoints
-		if endpointRef.Id != nil {
-			serviceEndpoints, err := getServiceEndpoints(ctx, rt, endpointRef.Id)
-			if err != nil {
-				rt.Logger.Error("error reading service endpoint", "id", endpointRef.Id, "error", err)
-				// Set the status.
-				statusCondition = status.ConditionRejectedErrorReadingEndpoints(status.KeyFromID(endpointRef.Id), err.Error())
-				status.WriteStatusIfChanged(ctx, rt, pstResource, statusCondition)
-
-				return err
-			}
-
-			// Step 2: Translate it into pbproxystate.Endpoints.
-			psEndpoints, err = generateProxyStateEndpoints(serviceEndpoints, endpointRef.Port)
-			if err != nil {
-				rt.Logger.Error("error translating service endpoints to proxy state endpoints", "endpoint", endpointRef.Id, "error", err)
-
-				// Set the status.
-				statusCondition = status.ConditionRejectedCreatingProxyStateEndpoints(status.KeyFromID(endpointRef.Id), err.Error())
-				status.WriteStatusIfChanged(ctx, rt, pstResource, statusCondition)
-
-				return err
-			}
-		} else {
-			psEndpoints = &pbproxystate.Endpoints{}
-		}
-
-		// Step 3: Add the endpoints to ProxyState.
-		proxyStateTemplate.Template.ProxyState.Endpoints[xdsClusterName] = psEndpoints
-
-		if endpointRef.Id != nil {
-			// Track all the endpoints that are used by this ProxyStateTemplate, so we can use this for step 4.
-			endpointResourceRef := resource.Reference(endpointRef.Id, "")
-			endpointsInProxyStateTemplate = append(endpointsInProxyStateTemplate, endpointResourceRef)
-		}
-	}
-
-	// Step 4: Track relationships between ProxyStateTemplates and ServiceEndpoints.
-	r.endpointsMapper.TrackItem(req.ID, endpointsInProxyStateTemplate)
-	if len(endpointsInProxyStateTemplate) == 0 {
-		r.endpointsMapper.UntrackItem(req.ID)
-	}
-
-	// Iterate through leaf certificate references.
-	// For each leaf certificate reference, the controller should:
-	// 1. Setup a watch for the leaf certificate so that the leaf cert manager will generate and store a leaf
-	// certificate if it's not already in the leaf cert manager cache.
-	// 1a. Store a cancel function for that leaf certificate watch.
-	// 2. Get the leaf certificate from the leaf cert manager. (This should succeed if a watch has been set up).
-	// 3. Put the leaf certificate contents into the ProxyState leaf certificates map.
-	// 4. Track relationships between ProxyState and leaf certificates using a bimapper.
-	leafReferencesMap := proxyStateTemplate.Template.RequiredLeafCertificates
-	var leafsInProxyStateTemplate []resource.ReferenceOrID
-	for workloadIdentityName, leafRef := range leafReferencesMap {
-
-		// leafRef must include the namespace and partition
-		leafResourceReference := leafResourceRef(leafRef.Name, leafRef.Namespace, leafRef.Partition)
-		leafKey := keyFromReference(leafResourceReference)
-		leafRequest := &leafcert.ConnectCALeafRequest{
-			Token:            token,
-			WorkloadIdentity: leafRef.Name,
-			EnterpriseMeta:   acl.NewEnterpriseMetaWithPartition(leafRef.Partition, leafRef.Namespace),
-			// Add some jitter to the max query time so that all goroutines don't wake up at approximately the same time.
-			// Without this, it's likely that these queries will all fire at roughly the same time, because the server
-			// will have spawned many watches immediately on boot. Typically because the index number will not have changed,
-			// this controller will not be notified anyway, but it's still better to space out the waking of goroutines.
-			MaxQueryTime: (10 * time.Minute) + lib.RandomStagger(10*time.Minute),
-		}
-
-		// Step 1: Setup a watch for this leaf if one doesn't already exist.
-		if _, ok := r.leafCancels.Get(leafKey); !ok {
-			certWatchContext, cancel := context.WithCancel(ctx)
-			err = r.leafCertManager.NotifyCallback(certWatchContext, leafRequest, "", func(ctx context.Context, event cacheshim.UpdateEvent) {
-				cert, ok := event.Result.(*structs.IssuedCert)
-				if !ok {
-					panic("wrong type")
-				}
-				if cert == nil {
-					return
-				}
-				controllerEvent := controller.Event{
-					Obj: cert,
-				}
-				select {
-				// This callback function is running in its own goroutine, so blocking inside this goroutine to send the
-				// update event doesn't affect the controller or other leaf certificates. r.leafCertEvents is a buffered
-				// channel, which should constantly be consumed by the controller custom events queue. If the controller
-				// custom events consumer isn't clearing up the leafCertEvents channel, then that would be the main
-				// issue to address, as opposed to this goroutine blocking.
-				case r.leafCertEvents <- controllerEvent:
-				// This context is the certWatchContext, so we will reach this case if the watch is canceled, and exit
-				// the callback goroutine.
-				case <-ctx.Done():
-				}
-			})
-			if err != nil {
-				rt.Logger.Error("error creating leaf watch", "leafRef", leafResourceReference, "error", err)
-				// Set the status.
-				statusCondition = status.ConditionRejectedErrorCreatingLeafWatch(keyFromReference(leafResourceReference), err.Error())
-				status.WriteStatusIfChanged(ctx, rt, pstResource, statusCondition)
-
-				cancel()
-				return err
-			}
-			r.leafCancels.Set(leafKey, cancel)
-		}
-
-		// Step 2: Get the leaf certificate.
-		cert, _, err := r.leafCertManager.Get(ctx, leafRequest)
-		if err != nil {
-			rt.Logger.Error("error getting leaf", "leafRef", leafResourceReference, "error", err)
-			// Set the status.
-			statusCondition = status.ConditionRejectedErrorGettingLeaf(keyFromReference(leafResourceReference), err.Error())
-			status.WriteStatusIfChanged(ctx, rt, pstResource, statusCondition)
-
-			return err
-		}
-
-		// Create the pbproxystate.LeafCertificate out of the structs.IssuedCert returned from the manager.
-		psLeaf := generateProxyStateLeafCertificates(cert)
-		if psLeaf == nil {
-			rt.Logger.Error("error getting leaf certificate contents", "leafRef", leafResourceReference)
-
-			// Set the status.
-			statusCondition = status.ConditionRejectedErrorCreatingProxyStateLeaf(keyFromReference(leafResourceReference), err.Error())
-			status.WriteStatusIfChanged(ctx, rt, pstResource, statusCondition)
-
-			return err
-		}
-
-		// Step 3: Add the leaf certificate to ProxyState.
-		proxyStateTemplate.Template.ProxyState.LeafCertificates[workloadIdentityName] = psLeaf
-
-		// Track all the leaf certificates that are used by this ProxyStateTemplate, so we can use this for step 4.
-		leafsInProxyStateTemplate = append(leafsInProxyStateTemplate, leafResourceReference)
-
-	}
-	// Get the previously tracked leafs for this ProxyStateTemplate so we can use this to cancel watches in step 5.
-	prevWatchedLeafs := r.leafMapper.LinkRefsForItem(req.ID)
-
-	// Step 4: Track relationships between ProxyStateTemplates and leaf certificates for the current leafs referenced in
-	// ProxyStateTemplate.
-	r.leafMapper.TrackItem(req.ID, leafsInProxyStateTemplate)
-
-	// Step 5: Compute whether there are leafs that are no longer referenced by this proxy state template, and cancel
-	// watches for them if they aren't referenced anywhere.
-	watches := prevWatchesToCancel(prevWatchedLeafs, leafsInProxyStateTemplate)
-	r.cancelWatches(watches)
-
-	// Now that the references have been resolved, push the computed proxy state to the updater.
-	computedProxyState := proxyStateTemplate.Template.ProxyState
-
-	err = r.updater.PushChange(req.ID, &proxytracker.ProxyState{ProxyState: computedProxyState})
-	if err != nil {
-		// Set the status.
-		statusCondition = status.ConditionRejectedPushChangeFailed(status.KeyFromID(req.ID))
-		status.WriteStatusIfChanged(ctx, rt, pstResource, statusCondition)
-		return err
-	}
-
-	// Set the status.
-	statusCondition = status.ConditionAccepted()
-	status.WriteStatusIfChanged(ctx, rt, pstResource, statusCondition)
-	return nil
-}
-
-// leafResourceRef translates a leaf certificate reference in ProxyState template to an internal resource reference. The
-// bimapper package uses resource references, so we use an internal type to create a leaf resource reference since leaf
-// certificates are not v2 resources.
-func leafResourceRef(workloadIdentity, namespace, partition string) *pbresource.Reference {
-	// Since leaf certificate references aren't resources in the resource API, we don't have the same guarantees that
-	// namespace and partition are set. So this is to ensure that we always do set values for tenancy.
-	if namespace == "" {
-		namespace = defaultTenancy
-	}
-	if partition == "" {
-		partition = defaultTenancy
-	}
-	ref := &pbresource.Reference{
-		Name: workloadIdentity,
-		Type: InternalLeafType,
-		Tenancy: &pbresource.Tenancy{
-			Partition: partition,
-			Namespace: namespace,
-		},
-	}
-	return ref
-}
-
-// InternalLeafType sets up an internal resource type to use for leaf certificates, since they are not yet a v2
-// resource. It's exported because it's used by the mesh controller registration which needs to set up the bimapper for
-// leaf certificates.
-var InternalLeafType = &pbresource.Type{
-	Group:        "internal",
-	GroupVersion: "v2beta1",
-	Kind:         "leaf",
-}
-
-// keyFromReference is used to create string keys from resource references.
-func keyFromReference(ref resource.ReferenceOrID) string {
-	return fmt.Sprintf("%s/%s/%s",
-		resource.ToGVK(ref.GetType()),
-		tenancyToString(ref.GetTenancy()),
-		ref.GetName())
-}
-
-func tenancyToString(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s.%s", tenancy.Partition, tenancy.Namespace)
-}
-
-// generateProxyStateLeafCertificates translates a *structs.IssuedCert into a *pbproxystate.LeafCertificate.
-func generateProxyStateLeafCertificates(cert *structs.IssuedCert) *pbproxystate.LeafCertificate {
-	if cert.CertPEM == "" || cert.PrivateKeyPEM == "" {
-		return nil
-	}
-	return &pbproxystate.LeafCertificate{
-		Cert: cert.CertPEM,
-		Key:  cert.PrivateKeyPEM,
-	}
-}
-
-// cancelWatches cancels watches for leafs that no longer need to be watched, as long as it is referenced by zero ProxyStateTemplates.
-func (r *xdsReconciler) cancelWatches(leafResourceRefs []*pbresource.Reference) {
-	for _, leaf := range leafResourceRefs {
-		pstItems := r.leafMapper.ItemRefsForLink(leaf)
-		if len(pstItems) > 0 {
-			// Don't delete and cancel watches, since this leaf is referenced elsewhere.
-			continue
-		}
-		cancel, ok := r.leafCancels.Get(keyFromReference(leaf))
-		if ok {
-			cancel()
-			r.leafCancels.Delete(keyFromReference(leaf))
-		}
-	}
-}
-
-// prevWatchesToCancel computes if there are any items in prevWatchedLeafs that are not in currentLeafs, and returns a list of those items.
-func prevWatchesToCancel(prevWatchedLeafs []*pbresource.Reference, currentLeafs []resource.ReferenceOrID) []*pbresource.Reference {
-	prevWatchedLeafsToCancel := make([]*pbresource.Reference, 0, len(prevWatchedLeafs))
-	newLeafs := make(map[string]struct{})
-	for _, newLeaf := range currentLeafs {
-		newLeafs[keyFromReference(newLeaf)] = struct{}{}
-	}
-	for _, prevLeaf := range prevWatchedLeafs {
-		if _, ok := newLeafs[keyFromReference(prevLeaf)]; !ok {
-			prevWatchedLeafsToCancel = append(prevWatchedLeafsToCancel, prevLeaf)
-		}
-	}
-	return prevWatchedLeafsToCancel
-}
diff --git a/internal/mesh/internal/controllers/xds/controller_test.go b/internal/mesh/internal/controllers/xds/controller_test.go
deleted file mode 100644
index 6bb5f85c9908f..0000000000000
--- a/internal/mesh/internal/controllers/xds/controller_test.go
+++ /dev/null
@@ -1,997 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"context"
-	"crypto/x509"
-	"encoding/pem"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/agent/leafcert"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/xds/status"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	proxytracker "github.com/hashicorp/consul/internal/mesh/proxy-tracker"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/mappers/bimapper"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-)
-
-type xdsControllerTestSuite struct {
-	suite.Suite
-
-	ctx     context.Context
-	client  *resourcetest.Client
-	runtime controller.Runtime
-
-	ctl             *xdsReconciler
-	mapper          *bimapper.Mapper
-	updater         *mockUpdater
-	fetcher         TrustBundleFetcher
-	leafMapper      *LeafMapper
-	leafCertManager *leafcert.Manager
-	leafCancels     *LeafCancels
-	leafCertEvents  chan controller.Event
-	signer          *leafcert.TestSigner
-
-	fooProxyStateTemplate          *pbresource.Resource
-	barProxyStateTemplate          *pbresource.Resource
-	barEndpointRefs                map[string]*pbproxystate.EndpointRef
-	fooEndpointRefs                map[string]*pbproxystate.EndpointRef
-	fooLeafRefs                    map[string]*pbproxystate.LeafCertificateRef
-	fooEndpoints                   *pbresource.Resource
-	fooService                     *pbresource.Resource
-	fooBarEndpoints                *pbresource.Resource
-	fooBarService                  *pbresource.Resource
-	expectedFooProxyStateEndpoints map[string]*pbproxystate.Endpoints
-	expectedBarProxyStateEndpoints map[string]*pbproxystate.Endpoints
-	expectedFooProxyStateSpiffes   map[string]string
-	expectedTrustBundle            map[string]*pbproxystate.TrustBundle
-}
-
-func (suite *xdsControllerTestSuite) SetupTest() {
-	suite.ctx = testutil.TestContext(suite.T())
-	resourceClient := svctest.RunResourceService(suite.T(), types.Register, catalog.RegisterTypes)
-	suite.runtime = controller.Runtime{Client: resourceClient, Logger: testutil.Logger(suite.T())}
-	suite.client = resourcetest.NewClient(resourceClient)
-	suite.fetcher = mockFetcher
-
-	suite.mapper = bimapper.New(pbmesh.ProxyStateTemplateType, pbcatalog.ServiceEndpointsType)
-	suite.updater = newMockUpdater()
-
-	suite.leafMapper = &LeafMapper{
-		bimapper.New(pbmesh.ProxyStateTemplateType, InternalLeafType),
-	}
-	lcm, signer := leafcert.NewTestManager(suite.T(), nil)
-	signer.UpdateCA(suite.T(), nil)
-	suite.signer = signer
-	suite.leafCertManager = lcm
-	suite.leafCancels = &LeafCancels{
-		Cancels: make(map[string]context.CancelFunc),
-	}
-	suite.leafCertEvents = make(chan controller.Event, 1000)
-
-	suite.ctl = &xdsReconciler{
-		endpointsMapper:  suite.mapper,
-		updater:          suite.updater,
-		fetchTrustBundle: suite.fetcher,
-		leafMapper:       suite.leafMapper,
-		leafCertManager:  suite.leafCertManager,
-		leafCancels:      suite.leafCancels,
-		leafCertEvents:   suite.leafCertEvents,
-		datacenter:       "dc1",
-	}
-}
-
-func mockFetcher() (*pbproxystate.TrustBundle, error) {
-	var bundle pbproxystate.TrustBundle
-	bundle = pbproxystate.TrustBundle{
-		TrustDomain: "some-trust-domain",
-		Roots:       []string{"some-root", "some-other-root"},
-	}
-	return &bundle, nil
-}
-
-// This test ensures when a ProxyState is deleted, it is no longer tracked in the mappers.
-func (suite *xdsControllerTestSuite) TestReconcile_NoProxyStateTemplate() {
-	// Track the id of a non-existent ProxyStateTemplate.
-	proxyStateTemplateId := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "not-found").ID()
-	suite.mapper.TrackItem(proxyStateTemplateId, []resource.ReferenceOrID{})
-	suite.leafMapper.TrackItem(proxyStateTemplateId, []resource.ReferenceOrID{})
-	require.False(suite.T(), suite.mapper.IsEmpty())
-	require.False(suite.T(), suite.leafMapper.IsEmpty())
-
-	// Run the reconcile, and since no ProxyStateTemplate is stored, this simulates a deletion.
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: proxyStateTemplateId,
-	})
-	require.NoError(suite.T(), err)
-
-	// Assert that nothing is tracked in the endpoints mapper.
-	require.True(suite.T(), suite.mapper.IsEmpty())
-	require.True(suite.T(), suite.leafMapper.IsEmpty())
-}
-
-// This test ensures if the controller was previously tracking a ProxyStateTemplate, and now that proxy has
-// disconnected from this server, it's ignored and removed from the mapper.
-func (suite *xdsControllerTestSuite) TestReconcile_RemoveTrackingProxiesNotConnectedToServer() {
-	// Store the initial ProxyStateTemplate and track it in the mapper.
-	proxyStateTemplate := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "test").
-		WithData(suite.T(), &pbmesh.ProxyStateTemplate{}).
-		Write(suite.T(), suite.client)
-
-	suite.mapper.TrackItem(proxyStateTemplate.Id, []resource.ReferenceOrID{})
-
-	// Simulate the proxy disconnecting from this server. The resource still exists, but this proxy might be connected
-	// to a different server now, so we no longer need to track it.
-	suite.updater.notConnected = true
-
-	// Run the reconcile.
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: proxyStateTemplate.Id,
-	})
-	require.NoError(suite.T(), err)
-
-	// Assert that nothing is tracked in the mapper.
-	require.True(suite.T(), suite.mapper.IsEmpty())
-}
-
-// This test sets up the updater to return an error when calling PushChange, and ensures the status is set
-// correctly.
-func (suite *xdsControllerTestSuite) TestReconcile_PushChangeError() {
-	// Have the mock simulate an error from the PushChange call.
-	suite.updater.pushChangeError = true
-
-	// Setup a happy path scenario.
-	suite.setupFooProxyStateTemplateWithReferences()
-
-	// Run the reconcile.
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: suite.fooProxyStateTemplate.Id,
-	})
-	require.Error(suite.T(), err)
-
-	// Assert on the status reflecting endpoint not found.
-	suite.client.RequireStatusCondition(suite.T(), suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionRejectedPushChangeFailed(status.KeyFromID(suite.fooProxyStateTemplate.Id)))
-}
-
-// This test sets up a ProxyStateTemplate that references a ServiceEndpoints that doesn't exist, and ensures the
-// status is correct.
-func (suite *xdsControllerTestSuite) TestReconcile_MissingEndpoint() {
-	// Set fooProxyStateTemplate with a reference to fooEndpoints, without storing fooEndpoints so the controller should
-	// notice it's missing.
-	fooEndpointsId := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "foo-service").WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	fooRequiredEndpoints := make(map[string]*pbproxystate.EndpointRef)
-	fooRequiredEndpoints["test-cluster-1"] = &pbproxystate.EndpointRef{
-		Id:   fooEndpointsId,
-		Port: "mesh",
-	}
-
-	fooProxyStateTemplate := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "foo-pst").
-		WithData(suite.T(), &pbmesh.ProxyStateTemplate{
-			RequiredEndpoints: fooRequiredEndpoints,
-			ProxyState:        &pbmesh.ProxyState{},
-		}).
-		Write(suite.T(), suite.client)
-
-	retry.Run(suite.T(), func(r *retry.R) {
-		suite.client.RequireResourceExists(r, fooProxyStateTemplate.Id)
-	})
-
-	// Run the reconcile.
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: fooProxyStateTemplate.Id,
-	})
-	require.Error(suite.T(), err)
-
-	// Assert on the status reflecting endpoint not found.
-	suite.client.RequireStatusCondition(suite.T(), fooProxyStateTemplate.Id, ControllerName, status.ConditionRejectedErrorReadingEndpoints(status.KeyFromID(fooEndpointsId), "rpc error: code = NotFound desc = resource not found"))
-}
-
-// This test sets up a ProxyStateTemplate that references a ServiceEndpoints that can't be read correctly, and
-// checks the status is correct.
-func (suite *xdsControllerTestSuite) TestReconcile_ReadEndpointError() {
-	badID := &pbresource.ID{
-		Type: &pbresource.Type{
-			Group:        "not",
-			Kind:         "found",
-			GroupVersion: "vfake",
-		},
-		Tenancy: &pbresource.Tenancy{Namespace: "default", Partition: "default", PeerName: "local"},
-	}
-	fooRequiredEndpoints := make(map[string]*pbproxystate.EndpointRef)
-	fooRequiredEndpoints["test-cluster-1"] = &pbproxystate.EndpointRef{
-		Id:   badID,
-		Port: "mesh",
-	}
-
-	fooProxyStateTemplate := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "foo-pst").
-		WithData(suite.T(), &pbmesh.ProxyStateTemplate{
-			RequiredEndpoints: fooRequiredEndpoints,
-			ProxyState:        &pbmesh.ProxyState{},
-		}).
-		Write(suite.T(), suite.client)
-
-	retry.Run(suite.T(), func(r *retry.R) {
-		suite.client.RequireResourceExists(r, fooProxyStateTemplate.Id)
-	})
-
-	// Run the reconcile.
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: fooProxyStateTemplate.Id,
-	})
-	require.Error(suite.T(), err)
-
-	// Assert on the status reflecting endpoint couldn't be read.
-	suite.client.RequireStatusCondition(suite.T(), fooProxyStateTemplate.Id, ControllerName, status.ConditionRejectedErrorReadingEndpoints(status.KeyFromID(badID), "rpc error: code = InvalidArgument desc = id.name is required"))
-}
-
-// This test is a happy path creation test to make sure pbproxystate.Endpoints are created in the computed
-// pbmesh.ProxyState from the RequiredEndpoints references. More specific translations between endpoint references
-// and pbproxystate.Endpoints are unit tested in endpoint_builder.go.
-func (suite *xdsControllerTestSuite) TestReconcile_ProxyStateTemplateComputesEndpoints() {
-	// Set up fooEndpoints and fooProxyStateTemplate with a reference to fooEndpoints and store them in the state store.
-	// This setup saves expected values in the suite so it can be asserted against later.
-	suite.setupFooProxyStateTemplateWithReferences()
-
-	// Run the reconcile.
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: suite.fooProxyStateTemplate.Id,
-	})
-	require.NoError(suite.T(), err)
-
-	// Assert on the status.
-	suite.client.RequireStatusCondition(suite.T(), suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
-
-	// Assert that the endpoints computed in the controller matches the expected endpoints.
-	actualEndpoints := suite.updater.GetEndpoints(suite.fooProxyStateTemplate.Id.Name)
-	prototest.AssertDeepEqual(suite.T(), suite.expectedFooProxyStateEndpoints, actualEndpoints)
-}
-
-func (suite *xdsControllerTestSuite) TestReconcile_ProxyStateTemplateComputesLeafCerts() {
-	// Set up fooEndpoints and fooProxyStateTemplate with a reference to fooEndpoints and store them in the state store.
-	// This setup saves expected values in the suite so it can be asserted against later.
-	suite.setupFooProxyStateTemplateWithReferences()
-
-	// Run the reconcile.
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: suite.fooProxyStateTemplate.Id,
-	})
-	require.NoError(suite.T(), err)
-
-	// Assert on the status.
-	suite.client.RequireStatusCondition(suite.T(), suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
-
-	// Assert that the actual leaf certs computed are match the expected leaf cert spiffes.
-	actualLeafs := suite.updater.GetLeafs(suite.fooProxyStateTemplate.Id.Name)
-
-	for k, l := range actualLeafs {
-		pem, _ := pem.Decode([]byte(l.Cert))
-		cert, err := x509.ParseCertificate(pem.Bytes)
-		require.NoError(suite.T(), err)
-		require.Equal(suite.T(), cert.URIs[0].String(), suite.expectedFooProxyStateSpiffes[k])
-	}
-}
-
-// This test is a happy path creation test to make sure pbproxystate.Template.TrustBundles are created in the computed
-// pbmesh.ProxyState from the TrustBundleFetcher.
-func (suite *xdsControllerTestSuite) TestReconcile_ProxyStateTemplateSetsTrustBundles() {
-	suite.setupFooProxyStateTemplateWithReferences()
-
-	// Run the reconcile.
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: suite.fooProxyStateTemplate.Id,
-	})
-	require.NoError(suite.T(), err)
-
-	// Assert on the status.
-	suite.client.RequireStatusCondition(suite.T(), suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
-
-	// Assert that the endpoints computed in the controller matches the expected endpoints.
-	actualTrustBundle := suite.updater.GetTrustBundle(suite.fooProxyStateTemplate.Id.Name)
-	prototest.AssertDeepEqual(suite.T(), suite.expectedTrustBundle, actualTrustBundle)
-}
-
-// This test is a happy path creation test that calls reconcile multiple times with a more complex setup. This
-// scenario is trickier to test in the controller test because the end computation of the xds controller is not
-// stored in the state store. So this test ensures that between multiple reconciles the correct ProxyStates are
-// computed for each ProxyStateTemplate.
-func (suite *xdsControllerTestSuite) TestReconcile_MultipleProxyStateTemplatesComputesMultipleEndpoints() {
-	// Set up fooProxyStateTemplate and barProxyStateTemplate and their associated resources and store them. Resources
-	// and expected results are stored in the suite to assert against.
-	suite.setupFooBarProxyStateTemplateAndEndpoints()
-
-	// Reconcile the fooProxyStateTemplate.
-	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: suite.fooProxyStateTemplate.Id,
-	})
-	require.NoError(suite.T(), err)
-
-	// Assert on the status.
-	suite.client.RequireStatusCondition(suite.T(), suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
-
-	// Assert that the endpoints computed in the controller matches the expected endpoints.
-	actualEndpoints := suite.updater.GetEndpoints(suite.fooProxyStateTemplate.Id.Name)
-	prototest.AssertDeepEqual(suite.T(), suite.expectedFooProxyStateEndpoints, actualEndpoints)
-
-	// Reconcile the barProxyStateTemplate.
-	err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-		ID: suite.barProxyStateTemplate.Id,
-	})
-	require.NoError(suite.T(), err)
-
-	// Assert on the status.
-	suite.client.RequireStatusCondition(suite.T(), suite.barProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
-
-	// Assert that the endpoints computed in the controller matches the expected endpoints.
-	actualBarEndpoints := suite.updater.GetEndpoints(suite.barProxyStateTemplate.Id.Name)
-	prototest.AssertDeepEqual(suite.T(), suite.expectedBarProxyStateEndpoints, actualBarEndpoints)
-}
-
-// Sets up a full controller, and tests that reconciles are getting triggered for the events it should.
-func (suite *xdsControllerTestSuite) TestController_ComputeAddUpdateEndpointReferences() {
-	// Run the controller manager.
-	mgr := controller.NewManager(suite.client, suite.runtime.Logger)
-	mgr.Register(Controller(suite.mapper, suite.updater, suite.fetcher, suite.leafCertManager, suite.leafMapper, suite.leafCancels, "dc1"))
-	mgr.SetRaftLeader(true)
-	go mgr.Run(suite.ctx)
-
-	suite.setupFooProxyStateTemplateWithReferences()
-
-	// Assert that the expected ProxyState matches the actual ProxyState that PushChange was called with. This needs to
-	// be in a retry block unlike the Reconcile tests because the controller triggers asynchronously.
-	retry.Run(suite.T(), func(r *retry.R) {
-		actualEndpoints := suite.updater.GetEndpoints(suite.fooProxyStateTemplate.Id.Name)
-		// Assert on the status.
-		suite.client.RequireStatusCondition(r, suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
-		// Assert that the endpoints computed in the controller matches the expected endpoints.
-		prototest.AssertDeepEqual(r, suite.expectedFooProxyStateEndpoints, actualEndpoints)
-	})
-
-	// Now, update the endpoint to be unhealthy. This will ensure the controller is getting triggered on changes to this
-	// endpoint that it should be tracking, even when the ProxyStateTemplate does not change.
-	resourcetest.Resource(pbcatalog.ServiceEndpointsType, "foo-service").
-		WithData(suite.T(), &pbcatalog.ServiceEndpoints{Endpoints: []*pbcatalog.Endpoint{
-			{
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"mesh": {
-						Port:     20000,
-						Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-					},
-				},
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host:  "10.1.1.1",
-						Ports: []string{"mesh"},
-					},
-					{
-						Host:  "10.2.2.2",
-						Ports: []string{"mesh"},
-					},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-			},
-		}}).
-		WithOwner(suite.fooService.Id).
-		Write(suite.T(), suite.client)
-
-	// Wait for the endpoint to be written.
-	retry.Run(suite.T(), func(r *retry.R) {
-		suite.client.RequireVersionChanged(suite.T(), suite.fooEndpoints.Id, suite.fooEndpoints.Version)
-	})
-
-	// Update the expected endpoints to also have unhealthy status.
-	suite.expectedFooProxyStateEndpoints["test-cluster-1"].Endpoints[0].HealthStatus = pbproxystate.HealthStatus_HEALTH_STATUS_UNHEALTHY
-	suite.expectedFooProxyStateEndpoints["test-cluster-1"].Endpoints[1].HealthStatus = pbproxystate.HealthStatus_HEALTH_STATUS_UNHEALTHY
-
-	retry.Run(suite.T(), func(r *retry.R) {
-		actualEndpoints := suite.updater.GetEndpoints(suite.fooProxyStateTemplate.Id.Name)
-		// Assert on the status.
-		suite.client.RequireStatusCondition(suite.T(), suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
-		// Assert that the endpoints computed in the controller matches the expected endpoints.
-		prototest.AssertDeepEqual(r, suite.expectedFooProxyStateEndpoints, actualEndpoints)
-	})
-
-	// Now add a new endpoint reference and endpoint to the fooProxyStateTemplate. This will ensure that the controller
-	// now tracks the newly added endpoint.
-	secondService := resourcetest.Resource(pbcatalog.ServiceType, "second-service").
-		WithData(suite.T(), &pbcatalog.Service{}).
-		Write(suite.T(), suite.client)
-
-	secondEndpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "second-service").
-		WithData(suite.T(), &pbcatalog.ServiceEndpoints{Endpoints: []*pbcatalog.Endpoint{
-			{
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"mesh": {
-						Port:     20000,
-						Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-					},
-				},
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host:  "10.5.5.5",
-						Ports: []string{"mesh"},
-					},
-					{
-						Host:  "10.6.6.6",
-						Ports: []string{"mesh"},
-					},
-				},
-			},
-		}}).
-		WithOwner(secondService.Id).
-		Write(suite.T(), suite.client)
-
-	// Update the endpoint references on the fooProxyStateTemplate.
-	suite.fooEndpointRefs["test-cluster-2"] = &pbproxystate.EndpointRef{
-		Id:   secondEndpoints.Id,
-		Port: "mesh",
-	}
-
-	oldVersion := suite.fooProxyStateTemplate.Version
-	fooProxyStateTemplate := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "foo-pst").
-		WithData(suite.T(), &pbmesh.ProxyStateTemplate{
-			RequiredEndpoints:        suite.fooEndpointRefs,
-			ProxyState:               &pbmesh.ProxyState{},
-			RequiredLeafCertificates: suite.fooLeafRefs,
-		}).
-		Write(suite.T(), suite.client)
-
-	retry.Run(suite.T(), func(r *retry.R) {
-		suite.client.RequireVersionChanged(r, fooProxyStateTemplate.Id, oldVersion)
-	})
-
-	// Update the expected endpoints with this new endpoints.
-	suite.expectedFooProxyStateEndpoints["test-cluster-2"] = &pbproxystate.Endpoints{
-		Endpoints: []*pbproxystate.Endpoint{
-			{
-				Address: &pbproxystate.Endpoint_HostPort{
-					HostPort: &pbproxystate.HostPortAddress{
-						Host: "10.5.5.5",
-						Port: 20000,
-					},
-				},
-				HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-			},
-			{
-				Address: &pbproxystate.Endpoint_HostPort{
-					HostPort: &pbproxystate.HostPortAddress{
-						Host: "10.6.6.6",
-						Port: 20000,
-					},
-				},
-				HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-			},
-		},
-	}
-
-	retry.Run(suite.T(), func(r *retry.R) {
-		actualEndpoints := suite.updater.GetEndpoints(suite.fooProxyStateTemplate.Id.Name)
-		// Assert on the status.
-		suite.client.RequireStatusCondition(suite.T(), suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
-		// Assert that the endpoints computed in the controller matches the expected endpoints.
-		prototest.AssertDeepEqual(r, suite.expectedFooProxyStateEndpoints, actualEndpoints)
-	})
-
-}
-
-// Sets up a full controller, and tests that reconciles are getting triggered for the leaf cert events it should.
-// This test ensures when a CA is updated, the controller is triggered to update the leaf cert when it changes.
-func (suite *xdsControllerTestSuite) TestController_ComputeAddUpdateDeleteLeafReferences() {
-	// Run the controller manager.
-	mgr := controller.NewManager(suite.client, suite.runtime.Logger)
-	mgr.Register(Controller(suite.mapper, suite.updater, suite.fetcher, suite.leafCertManager, suite.leafMapper, suite.leafCancels, "dc1"))
-	mgr.SetRaftLeader(true)
-	go mgr.Run(suite.ctx)
-
-	suite.setupFooProxyStateTemplateWithReferences()
-	leafCertRef := suite.fooLeafRefs["foo-workload-identity"]
-	fooLeafResRef := leafResourceRef(leafCertRef.Name, leafCertRef.Namespace, leafCertRef.Partition)
-
-	// oldLeaf will store the original leaf from before we trigger a CA update.
-	var oldLeaf *x509.Certificate
-
-	// Assert that the expected ProxyState matches the actual ProxyState that PushChange was called with. This needs to
-	// be in a retry block unlike the Reconcile tests because the controller triggers asynchronously.
-	retry.Run(suite.T(), func(r *retry.R) {
-		actualEndpoints := suite.updater.GetEndpoints(suite.fooProxyStateTemplate.Id.Name)
-		actualLeafs := suite.updater.GetLeafs(suite.fooProxyStateTemplate.Id.Name)
-		// Assert on the status.
-		suite.client.RequireStatusCondition(r, suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
-		// Assert that the endpoints computed in the controller matches the expected endpoints.
-		prototest.AssertDeepEqual(r, suite.expectedFooProxyStateEndpoints, actualEndpoints)
-		// Assert that the leafs computed in the controller matches the expected leafs.
-		require.Len(r, actualLeafs, 1)
-		for k, l := range actualLeafs {
-			pem, _ := pem.Decode([]byte(l.Cert))
-			cert, err := x509.ParseCertificate(pem.Bytes)
-			oldLeaf = cert
-			require.NoError(r, err)
-			require.Equal(r, cert.URIs[0].String(), suite.expectedFooProxyStateSpiffes[k])
-			// Check the state of the cancel functions map.
-			_, ok := suite.leafCancels.Get(keyFromReference(fooLeafResRef))
-			require.True(r, ok)
-		}
-	})
-
-	// Update the CA, and ensure the leaf cert is different from the leaf certificate from the step above.
-	suite.signer.UpdateCA(suite.T(), nil)
-	retry.Run(suite.T(), func(r *retry.R) {
-		actualLeafs := suite.updater.GetLeafs(suite.fooProxyStateTemplate.Id.Name)
-		require.Len(r, actualLeafs, 1)
-		for k, l := range actualLeafs {
-			pem, _ := pem.Decode([]byte(l.Cert))
-			cert, err := x509.ParseCertificate(pem.Bytes)
-			// Ensure the leaf was actually updated by checking that the leaf we just got is different from the old leaf.
-			require.NotEqual(r, oldLeaf.Raw, cert.Raw)
-			require.NoError(r, err)
-			require.Equal(r, suite.expectedFooProxyStateSpiffes[k], cert.URIs[0].String())
-			// Check the state of the cancel functions map. Even though we've updated the leaf cert, we should still
-			// have a watch going for it.
-			_, ok := suite.leafCancels.Get(keyFromReference(fooLeafResRef))
-			require.True(r, ok)
-		}
-	})
-
-	// Delete the leaf references on the fooProxyStateTemplate
-	delete(suite.fooLeafRefs, "foo-workload-identity")
-	oldVersion := suite.fooProxyStateTemplate.Version
-	fooProxyStateTemplate := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "foo-pst").
-		WithData(suite.T(), &pbmesh.ProxyStateTemplate{
-			RequiredEndpoints:        suite.fooEndpointRefs,
-			ProxyState:               &pbmesh.ProxyState{},
-			RequiredLeafCertificates: suite.fooLeafRefs,
-		}).
-		Write(suite.T(), suite.client)
-
-	retry.Run(suite.T(), func(r *retry.R) {
-		suite.client.RequireVersionChanged(r, fooProxyStateTemplate.Id, oldVersion)
-	})
-
-	// Ensure the leaf certificate watches were cancelled since we deleted the leaf reference.
-	retry.Run(suite.T(), func(r *retry.R) {
-		_, ok := suite.leafCancels.Get(keyFromReference(fooLeafResRef))
-		require.False(r, ok)
-	})
-}
-
-// Sets up a full controller, and tests that reconciles are getting triggered for the leaf cert events it should.
-// This test ensures that when a ProxyStateTemplate is deleted, the leaf watches are cancelled.
-func (suite *xdsControllerTestSuite) TestController_ComputeLeafReferencesDeletePST() {
-	// Run the controller manager.
-	mgr := controller.NewManager(suite.client, suite.runtime.Logger)
-	mgr.Register(Controller(suite.mapper, suite.updater, suite.fetcher, suite.leafCertManager, suite.leafMapper, suite.leafCancels, "dc1"))
-	mgr.SetRaftLeader(true)
-	go mgr.Run(suite.ctx)
-
-	suite.setupFooProxyStateTemplateWithReferences()
-	leafCertRef := suite.fooLeafRefs["foo-workload-identity"]
-	fooLeafResRef := leafResourceRef(leafCertRef.Name, leafCertRef.Namespace, leafCertRef.Partition)
-
-	// Assert that the expected ProxyState matches the actual ProxyState that PushChange was called with. This needs to
-	// be in a retry block unlike the Reconcile tests because the controller triggers asynchronously.
-	retry.Run(suite.T(), func(r *retry.R) {
-		actualEndpoints := suite.updater.GetEndpoints(suite.fooProxyStateTemplate.Id.Name)
-		actualLeafs := suite.updater.GetLeafs(suite.fooProxyStateTemplate.Id.Name)
-		// Assert on the status.
-		suite.client.RequireStatusCondition(r, suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
-		// Assert that the endpoints computed in the controller matches the expected endpoints.
-		prototest.AssertDeepEqual(r, suite.expectedFooProxyStateEndpoints, actualEndpoints)
-		// Assert that the leafs computed in the controller matches the expected leafs.
-		require.Len(r, actualLeafs, 1)
-		for k, l := range actualLeafs {
-			pem, _ := pem.Decode([]byte(l.Cert))
-			cert, err := x509.ParseCertificate(pem.Bytes)
-			require.NoError(r, err)
-			require.Equal(r, cert.URIs[0].String(), suite.expectedFooProxyStateSpiffes[k])
-			// Check the state of the cancel functions map.
-			_, ok := suite.leafCancels.Get(keyFromReference(fooLeafResRef))
-			require.True(r, ok)
-		}
-	})
-
-	// Delete the fooProxyStateTemplate
-
-	req := &pbresource.DeleteRequest{
-		Id: suite.fooProxyStateTemplate.Id,
-	}
-	suite.client.Delete(suite.ctx, req)
-
-	// Ensure the leaf certificate watches were cancelled since we deleted the leaf reference.
-	retry.Run(suite.T(), func(r *retry.R) {
-		_, ok := suite.leafCancels.Get(keyFromReference(fooLeafResRef))
-		require.False(r, ok)
-	})
-}
-
-// Sets up a full controller, and tests that reconciles are getting triggered for the events it should.
-func (suite *xdsControllerTestSuite) TestController_ComputeEndpointForProxyConnections() {
-	// Run the controller manager.
-	mgr := controller.NewManager(suite.client, suite.runtime.Logger)
-
-	mgr.Register(Controller(suite.mapper, suite.updater, suite.fetcher, suite.leafCertManager, suite.leafMapper, suite.leafCancels, "dc1"))
-	mgr.SetRaftLeader(true)
-	go mgr.Run(suite.ctx)
-
-	// Set up fooEndpoints and fooProxyStateTemplate with a reference to fooEndpoints. These need to be stored
-	// because the controller reconcile looks them up.
-	suite.setupFooProxyStateTemplateWithReferences()
-
-	// Assert that the expected ProxyState matches the actual ProxyState that PushChange was called with. This needs to
-	// be in a retry block unlike the Reconcile tests because the controller triggers asynchronously.
-	retry.Run(suite.T(), func(r *retry.R) {
-		actualEndpoints := suite.updater.GetEndpoints(suite.fooProxyStateTemplate.Id.Name)
-		// Assert on the status.
-		suite.client.RequireStatusCondition(r, suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
-		// Assert that the endpoints computed in the controller matches the expected endpoints.
-		prototest.AssertDeepEqual(r, suite.expectedFooProxyStateEndpoints, actualEndpoints)
-	})
-
-	eventChannel := suite.updater.EventChannel()
-	eventChannel <- controller.Event{Obj: &proxytracker.ProxyConnection{ProxyID: suite.fooProxyStateTemplate.Id}}
-
-	// Wait for the proxy state template to be re-evaluated.
-	proxyStateTemp := suite.client.WaitForNewVersion(suite.T(), suite.fooProxyStateTemplate.Id, suite.fooProxyStateTemplate.Version)
-	require.NotNil(suite.T(), proxyStateTemp)
-}
-
-// Setup: fooProxyStateTemplate with:
-//   - an EndpointsRef to fooEndpoints
-//   - a LeafCertificateRef to "foo-workload-identity"
-//
-// Saves all related resources to the suite so they can be looked up by the controller or modified if needed.
-func (suite *xdsControllerTestSuite) setupFooProxyStateTemplateWithReferences() {
-	fooService := resourcetest.Resource(pbcatalog.ServiceType, "foo-service").
-		WithData(suite.T(), &pbcatalog.Service{}).
-		Write(suite.T(), suite.client)
-
-	fooEndpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "foo-service").
-		WithData(suite.T(), &pbcatalog.ServiceEndpoints{Endpoints: []*pbcatalog.Endpoint{
-			{
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"mesh": {
-						Port:     20000,
-						Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-					},
-				},
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host:  "10.1.1.1",
-						Ports: []string{"mesh"},
-					},
-					{
-						Host:  "10.2.2.2",
-						Ports: []string{"mesh"},
-					},
-				},
-			},
-		}}).
-		WithOwner(fooService.Id).
-		Write(suite.T(), suite.client)
-
-	fooRequiredEndpoints := make(map[string]*pbproxystate.EndpointRef)
-	fooRequiredEndpoints["test-cluster-1"] = &pbproxystate.EndpointRef{
-		Id:   fooEndpoints.Id,
-		Port: "mesh",
-	}
-
-	fooRequiredLeafs := make(map[string]*pbproxystate.LeafCertificateRef)
-	fooRequiredLeafs["foo-workload-identity"] = &pbproxystate.LeafCertificateRef{
-		Name: "foo-workload-identity",
-	}
-
-	fooProxyStateTemplate := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "foo-pst").
-		WithData(suite.T(), &pbmesh.ProxyStateTemplate{
-			RequiredEndpoints:        fooRequiredEndpoints,
-			RequiredLeafCertificates: fooRequiredLeafs,
-			ProxyState:               &pbmesh.ProxyState{},
-		}).
-		Write(suite.T(), suite.client)
-
-	retry.Run(suite.T(), func(r *retry.R) {
-		suite.client.RequireResourceExists(r, fooProxyStateTemplate.Id)
-	})
-
-	expectedFooLeafSpiffes := map[string]string{
-		"foo-workload-identity": "spiffe://11111111-2222-3333-4444-555555555555.consul/ap/default/ns/default/identity/foo-workload-identity",
-	}
-	expectedFooProxyStateEndpoints := map[string]*pbproxystate.Endpoints{
-		"test-cluster-1": {Endpoints: []*pbproxystate.Endpoint{
-			{
-				Address: &pbproxystate.Endpoint_HostPort{
-					HostPort: &pbproxystate.HostPortAddress{
-						Host: "10.1.1.1",
-						Port: 20000,
-					},
-				},
-				HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-			},
-			{
-				Address: &pbproxystate.Endpoint_HostPort{
-					HostPort: &pbproxystate.HostPortAddress{
-						Host: "10.2.2.2",
-						Port: 20000,
-					},
-				},
-				HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-			},
-		}},
-	}
-
-	expectedTrustBundle := map[string]*pbproxystate.TrustBundle{
-		"local": {
-			TrustDomain: "some-trust-domain",
-			Roots:       []string{"some-root", "some-other-root"},
-		},
-	}
-
-	suite.fooService = fooService
-	suite.fooEndpoints = fooEndpoints
-	suite.fooEndpointRefs = fooRequiredEndpoints
-	suite.fooLeafRefs = fooRequiredLeafs
-	suite.fooProxyStateTemplate = fooProxyStateTemplate
-	suite.expectedFooProxyStateEndpoints = expectedFooProxyStateEndpoints
-	suite.expectedTrustBundle = expectedTrustBundle
-	suite.expectedFooProxyStateSpiffes = expectedFooLeafSpiffes
-}
-
-// Setup:
-//   - fooProxyStateTemplate with an EndpointsRef to fooEndpoints and fooBarEndpoints.
-//   - barProxyStateTemplate with an EndpointsRef to fooBarEndpoints.
-//
-// Saves all related resources to the suite so they can be modified if needed.
-func (suite *xdsControllerTestSuite) setupFooBarProxyStateTemplateAndEndpoints() {
-	fooService := resourcetest.Resource(pbcatalog.ServiceType, "foo-service").
-		WithData(suite.T(), &pbcatalog.Service{}).
-		Write(suite.T(), suite.client)
-
-	fooEndpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "foo-service").
-		WithData(suite.T(), &pbcatalog.ServiceEndpoints{Endpoints: []*pbcatalog.Endpoint{
-			{
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"mesh": {
-						Port:     20000,
-						Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-					},
-				},
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host:  "10.1.1.1",
-						Ports: []string{"mesh"},
-					},
-					{
-						Host:  "10.2.2.2",
-						Ports: []string{"mesh"},
-					},
-				},
-			},
-		}}).
-		WithOwner(fooService.Id).
-		Write(suite.T(), suite.client)
-
-	fooBarService := resourcetest.Resource(pbcatalog.ServiceType, "foo-bar-service").
-		WithData(suite.T(), &pbcatalog.Service{}).
-		Write(suite.T(), suite.client)
-
-	fooBarEndpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "foo-bar-service").
-		WithData(suite.T(), &pbcatalog.ServiceEndpoints{Endpoints: []*pbcatalog.Endpoint{
-			{
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"mesh": {
-						Port:     20000,
-						Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-					},
-				},
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host:  "10.3.3.3",
-						Ports: []string{"mesh"},
-					},
-					{
-						Host:  "10.4.4.4",
-						Ports: []string{"mesh"},
-					},
-				},
-			},
-		}}).
-		WithOwner(fooBarService.Id).
-		Write(suite.T(), suite.client)
-
-	fooRequiredEndpoints := make(map[string]*pbproxystate.EndpointRef)
-	fooRequiredEndpoints["test-cluster-1"] = &pbproxystate.EndpointRef{
-		Id:   fooEndpoints.Id,
-		Port: "mesh",
-	}
-	fooRequiredEndpoints["test-cluster-2"] = &pbproxystate.EndpointRef{
-		Id:   fooBarEndpoints.Id,
-		Port: "mesh",
-	}
-
-	barRequiredEndpoints := make(map[string]*pbproxystate.EndpointRef)
-	barRequiredEndpoints["test-cluster-1"] = &pbproxystate.EndpointRef{
-		Id: fooBarEndpoints.Id,
-		// Sidecar proxy controller will usually set mesh port here.
-		Port: "mesh",
-	}
-
-	fooProxyStateTemplate := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "foo-pst").
-		WithData(suite.T(), &pbmesh.ProxyStateTemplate{
-			// Contains the foo and foobar endpoints.
-			RequiredEndpoints: fooRequiredEndpoints,
-			ProxyState:        &pbmesh.ProxyState{},
-		}).
-		Write(suite.T(), suite.client)
-
-	retry.Run(suite.T(), func(r *retry.R) {
-		suite.client.RequireResourceExists(r, fooProxyStateTemplate.Id)
-	})
-
-	barProxyStateTemplate := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "bar-pst").
-		WithData(suite.T(), &pbmesh.ProxyStateTemplate{
-			// Contains the foobar endpoint.
-			RequiredEndpoints: barRequiredEndpoints,
-			ProxyState:        &pbmesh.ProxyState{},
-		}).
-		Write(suite.T(), suite.client)
-
-	retry.Run(suite.T(), func(r *retry.R) {
-		suite.client.RequireResourceExists(r, barProxyStateTemplate.Id)
-	})
-
-	expectedFooProxyStateEndpoints := map[string]*pbproxystate.Endpoints{
-		"test-cluster-1": {Endpoints: []*pbproxystate.Endpoint{
-			{
-				Address: &pbproxystate.Endpoint_HostPort{
-					HostPort: &pbproxystate.HostPortAddress{
-						Host: "10.1.1.1",
-						Port: 20000,
-					},
-				},
-				HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-			},
-			{
-				Address: &pbproxystate.Endpoint_HostPort{
-					HostPort: &pbproxystate.HostPortAddress{
-						Host: "10.2.2.2",
-						Port: 20000,
-					},
-				},
-				HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-			},
-		}},
-		"test-cluster-2": {Endpoints: []*pbproxystate.Endpoint{
-			{
-				Address: &pbproxystate.Endpoint_HostPort{
-					HostPort: &pbproxystate.HostPortAddress{
-						Host: "10.3.3.3",
-						Port: 20000,
-					},
-				},
-				HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-			},
-			{
-				Address: &pbproxystate.Endpoint_HostPort{
-					HostPort: &pbproxystate.HostPortAddress{
-						Host: "10.4.4.4",
-						Port: 20000,
-					},
-				},
-				HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-			},
-		}},
-	}
-
-	expectedBarProxyStateEndpoints := map[string]*pbproxystate.Endpoints{
-		"test-cluster-1": {Endpoints: []*pbproxystate.Endpoint{
-			{
-				Address: &pbproxystate.Endpoint_HostPort{
-					HostPort: &pbproxystate.HostPortAddress{
-						Host: "10.3.3.3",
-						Port: 20000,
-					},
-				},
-				HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-			},
-			{
-				Address: &pbproxystate.Endpoint_HostPort{
-					HostPort: &pbproxystate.HostPortAddress{
-						Host: "10.4.4.4",
-						Port: 20000,
-					},
-				},
-				HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-			},
-		}},
-	}
-
-	suite.fooProxyStateTemplate = fooProxyStateTemplate
-	suite.barProxyStateTemplate = barProxyStateTemplate
-	suite.barEndpointRefs = barRequiredEndpoints
-	suite.fooEndpointRefs = fooRequiredEndpoints
-	suite.fooEndpoints = fooEndpoints
-	suite.fooService = fooService
-	suite.fooBarEndpoints = fooBarEndpoints
-	suite.fooBarService = fooBarService
-	suite.expectedFooProxyStateEndpoints = expectedFooProxyStateEndpoints
-	suite.expectedBarProxyStateEndpoints = expectedBarProxyStateEndpoints
-}
-
-func (suite *xdsControllerTestSuite) TestReconcile_prevWatchesToCancel() {
-	makeRef := func(names ...string) []*pbresource.Reference {
-		out := make([]*pbresource.Reference, len(names))
-		for i, name := range names {
-			out[i] = &pbresource.Reference{
-				Name: name,
-				Type: &pbresource.Type{
-					Group:        "g",
-					GroupVersion: "v",
-					Kind:         "k",
-				},
-				Tenancy: &pbresource.Tenancy{},
-			}
-		}
-		return out
-	}
-	convert := func(input []*pbresource.Reference) []resource.ReferenceOrID {
-		asInterface := make([]resource.ReferenceOrID, len(input))
-		for i := range input {
-			asInterface[i] = input[i]
-		}
-		return asInterface
-	}
-
-	cases := []struct {
-		old    []*pbresource.Reference
-		new    []*pbresource.Reference
-		expect []*pbresource.Reference
-	}{
-		{
-			old:    makeRef("a", "b", "c"),
-			new:    makeRef("a", "c"),
-			expect: makeRef("b"),
-		},
-		{
-			old:    makeRef("a", "b", "c"),
-			new:    makeRef("a", "b", "c"),
-			expect: makeRef(),
-		},
-		{
-			old:    makeRef(),
-			new:    makeRef("a", "b"),
-			expect: makeRef(),
-		},
-		{
-			old:    makeRef("a", "b"),
-			new:    makeRef(),
-			expect: makeRef("a", "b"),
-		},
-		{
-			old:    makeRef(),
-			new:    makeRef(),
-			expect: makeRef(),
-		},
-	}
-
-	for _, tc := range cases {
-		toCancel := prevWatchesToCancel(tc.old, convert(tc.new))
-		require.ElementsMatch(suite.T(), toCancel, tc.expect)
-	}
-}
-
-func TestXdsController(t *testing.T) {
-	suite.Run(t, new(xdsControllerTestSuite))
-}
diff --git a/internal/mesh/internal/controllers/xds/endpoint_builder.go b/internal/mesh/internal/controllers/xds/endpoint_builder.go
deleted file mode 100644
index d0e3f84366f9c..0000000000000
--- a/internal/mesh/internal/controllers/xds/endpoint_builder.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"fmt"
-	"net"
-
-	"golang.org/x/exp/slices"
-
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-)
-
-func generateProxyStateEndpoints(serviceEndpoints *ServiceEndpointsData, portName string) (*pbproxystate.Endpoints, error) {
-	var psEndpoints []*pbproxystate.Endpoint
-
-	if serviceEndpoints.Endpoints == nil || serviceEndpoints.Resource == nil {
-		return nil, fmt.Errorf("service endpoints requires both endpoints and resource")
-	}
-	eps := serviceEndpoints.Endpoints.GetEndpoints()
-
-	for _, ep := range eps {
-		for _, addr := range ep.Addresses {
-			// Check if the address is using the portName name this proxy state endpoints is for. If it does, create the
-			// endpoint.
-			if slices.Contains(addr.Ports, portName) {
-				// Lookup the portName number from the portName name.
-				wlPort, ok := ep.Ports[portName]
-				if !ok {
-					// This should never happen, as it should be validated by the ServiceEndpoints controller.
-					return nil, fmt.Errorf("could not find portName %q in endpoint %s", portName, serviceEndpoints.Resource.Id)
-				}
-				portNum := wlPort.Port
-
-				psEndpoint, err := createProxyStateEndpoint(addr.Host, portNum, ep.HealthStatus)
-				if err != nil {
-					return nil, err
-				}
-				psEndpoints = append(psEndpoints, psEndpoint)
-			}
-		}
-	}
-
-	return &pbproxystate.Endpoints{Endpoints: psEndpoints}, nil
-}
-
-func createProxyStateEndpoint(host string, port uint32, health pbcatalog.Health) (*pbproxystate.Endpoint, error) {
-	addr := net.ParseIP(host)
-	if addr == nil {
-		return nil, fmt.Errorf("host is not an ip")
-	}
-
-	psEndpoint := &pbproxystate.Endpoint{
-		Address: &pbproxystate.Endpoint_HostPort{
-			HostPort: &pbproxystate.HostPortAddress{
-				Host: host,
-				Port: port,
-			},
-		},
-		HealthStatus: endpointHealth(health),
-		// TODO(xds): Weight will be added later. More information is potentially needed in the reference.
-	}
-	return psEndpoint, nil
-}
-
-func endpointHealth(catalogHealth pbcatalog.Health) pbproxystate.HealthStatus {
-	health := pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY
-
-	if catalogHealth == pbcatalog.Health_HEALTH_CRITICAL {
-		health = pbproxystate.HealthStatus_HEALTH_STATUS_UNHEALTHY
-	}
-	return health
-}
diff --git a/internal/mesh/internal/controllers/xds/endpoint_builder_test.go b/internal/mesh/internal/controllers/xds/endpoint_builder_test.go
deleted file mode 100644
index 756acdb7e9907..0000000000000
--- a/internal/mesh/internal/controllers/xds/endpoint_builder_test.go
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestMakeProxyStateEndpointsFromServiceEndpoints(t *testing.T) {
-	type test struct {
-		name                        string
-		serviceEndpointsData        *ServiceEndpointsData
-		portName                    string
-		expErr                      string
-		expectedProxyStateEndpoints *pbproxystate.Endpoints
-	}
-	cases := []test{
-		{
-			name:                 "endpoints with passing health",
-			serviceEndpointsData: serviceEndpointsData("passing"),
-			portName:             "mesh",
-			expectedProxyStateEndpoints: &pbproxystate.Endpoints{
-				Endpoints: []*pbproxystate.Endpoint{
-					{
-						Address: &pbproxystate.Endpoint_HostPort{
-							HostPort: &pbproxystate.HostPortAddress{
-								Host: "10.1.1.1",
-								Port: 20000,
-							},
-						},
-						HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-					},
-					{
-						Address: &pbproxystate.Endpoint_HostPort{
-							HostPort: &pbproxystate.HostPortAddress{
-								Host: "10.2.2.2",
-								Port: 20000,
-							},
-						},
-						HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-					},
-					{
-						Address: &pbproxystate.Endpoint_HostPort{
-							HostPort: &pbproxystate.HostPortAddress{
-								Host: "10.3.3.3",
-								Port: 20000,
-							},
-						},
-						HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-					},
-				},
-			},
-		},
-		{
-			name:                 "endpoints with critical health",
-			serviceEndpointsData: serviceEndpointsData("critical"),
-			portName:             "mesh",
-			expectedProxyStateEndpoints: &pbproxystate.Endpoints{
-				Endpoints: []*pbproxystate.Endpoint{
-					{
-						Address: &pbproxystate.Endpoint_HostPort{
-							HostPort: &pbproxystate.HostPortAddress{
-								Host: "10.1.1.1",
-								Port: 20000,
-							},
-						},
-						HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_UNHEALTHY,
-					},
-					{
-						Address: &pbproxystate.Endpoint_HostPort{
-							HostPort: &pbproxystate.HostPortAddress{
-								Host: "10.2.2.2",
-								Port: 20000,
-							},
-						},
-						HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_UNHEALTHY,
-					},
-					{
-						Address: &pbproxystate.Endpoint_HostPort{
-							HostPort: &pbproxystate.HostPortAddress{
-								Host: "10.3.3.3",
-								Port: 20000,
-							},
-						},
-						HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_UNHEALTHY,
-					},
-				},
-			},
-		},
-		{
-			name:                 "endpoints with any health are considered healthy",
-			serviceEndpointsData: serviceEndpointsData("any"),
-			portName:             "mesh",
-			expectedProxyStateEndpoints: &pbproxystate.Endpoints{
-				Endpoints: []*pbproxystate.Endpoint{
-					{
-						Address: &pbproxystate.Endpoint_HostPort{
-							HostPort: &pbproxystate.HostPortAddress{
-								Host: "10.1.1.1",
-								Port: 20000,
-							},
-						},
-						HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-					},
-					{
-						Address: &pbproxystate.Endpoint_HostPort{
-							HostPort: &pbproxystate.HostPortAddress{
-								Host: "10.2.2.2",
-								Port: 20000,
-							},
-						},
-						HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-					},
-					{
-						Address: &pbproxystate.Endpoint_HostPort{
-							HostPort: &pbproxystate.HostPortAddress{
-								Host: "10.3.3.3",
-								Port: 20000,
-							},
-						},
-						HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
-					},
-				},
-			},
-		},
-		{
-			name:                 "endpoints with missing ports returns an error",
-			serviceEndpointsData: serviceEndpointsData("missing port lookup"),
-			portName:             "mesh",
-			expErr:               "could not find portName",
-		},
-		{
-			name:                 "nil endpoints returns an error",
-			serviceEndpointsData: serviceEndpointsData("nil endpoints"),
-			portName:             "mesh",
-			expErr:               "service endpoints requires both endpoints and resource",
-		},
-		{
-			name:                 "nil resource returns an error",
-			serviceEndpointsData: serviceEndpointsData("nil resource"),
-			portName:             "mesh",
-			expErr:               "service endpoints requires both endpoints and resource",
-		},
-		{
-			name:                 "portName doesn't exist in endpoints results in empty endpoints",
-			serviceEndpointsData: serviceEndpointsData("passing"),
-			portName:             "does-not-exist",
-			expectedProxyStateEndpoints: &pbproxystate.Endpoints{
-				Endpoints: []*pbproxystate.Endpoint{},
-			},
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			actualEndpoints, err := generateProxyStateEndpoints(tc.serviceEndpointsData, tc.portName)
-			if tc.expErr != "" {
-				require.ErrorContains(t, err, tc.expErr)
-			} else {
-				prototest.AssertDeepEqual(t, tc.expectedProxyStateEndpoints, actualEndpoints)
-			}
-		})
-	}
-}
-
-func serviceEndpointsData(variation string) *ServiceEndpointsData {
-	r := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "test").Build()
-	eps := &pbcatalog.ServiceEndpoints{
-		Endpoints: []*pbcatalog.Endpoint{
-			{
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"mesh": {
-						Port:     20000,
-						Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-					},
-				},
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host:  "10.1.1.1",
-						Ports: []string{"mesh"},
-					},
-					{
-						Host:  "10.2.2.2",
-						Ports: []string{"mesh"},
-					},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-			},
-			{
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"mesh": {
-						Port:     20000,
-						Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-					},
-				},
-				Addresses: []*pbcatalog.WorkloadAddress{
-					{
-						Host:  "10.3.3.3",
-						Ports: []string{"mesh"},
-					},
-				},
-				HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-			},
-		},
-	}
-
-	switch variation {
-	case "passing":
-	case "critical":
-		eps.Endpoints[0].HealthStatus = pbcatalog.Health_HEALTH_CRITICAL
-		eps.Endpoints[1].HealthStatus = pbcatalog.Health_HEALTH_CRITICAL
-	case "any":
-		eps.Endpoints[0].HealthStatus = pbcatalog.Health_HEALTH_ANY
-		eps.Endpoints[1].HealthStatus = pbcatalog.Health_HEALTH_ANY
-	case "missing port lookup":
-		delete(eps.Endpoints[0].Ports, "mesh")
-	case "nil endpoints":
-		eps = nil
-	case "nil resource":
-		r = nil
-	}
-
-	return &ServiceEndpointsData{
-		Resource:  r,
-		Endpoints: eps,
-	}
-}
diff --git a/internal/mesh/internal/controllers/xds/leaf_cancels.go b/internal/mesh/internal/controllers/xds/leaf_cancels.go
deleted file mode 100644
index b1451487d7db5..0000000000000
--- a/internal/mesh/internal/controllers/xds/leaf_cancels.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"context"
-	"sync"
-)
-
-// LeafCancels holds the cancel functions for leaf certificates being watched by this controller instance.
-type LeafCancels struct {
-	sync.Mutex
-	// Cancels is a map from a string key constructed from the pbproxystate.LeafReference to a cancel function for the
-	// leaf watch.
-	Cancels map[string]context.CancelFunc
-}
-
-func (l *LeafCancels) Get(key string) (context.CancelFunc, bool) {
-	l.Lock()
-	defer l.Unlock()
-	v, ok := l.Cancels[key]
-	return v, ok
-}
-func (l *LeafCancels) Set(key string, value context.CancelFunc) {
-	l.Lock()
-	defer l.Unlock()
-	l.Cancels[key] = value
-}
-func (l *LeafCancels) Delete(key string) {
-	l.Lock()
-	defer l.Unlock()
-	delete(l.Cancels, key)
-}
diff --git a/internal/mesh/internal/controllers/xds/leaf_mapper.go b/internal/mesh/internal/controllers/xds/leaf_mapper.go
deleted file mode 100644
index b268b6b97ccb8..0000000000000
--- a/internal/mesh/internal/controllers/xds/leaf_mapper.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource/mappers/bimapper"
-)
-
-// LeafMapper is a wrapper around endpointsMapper to allow mapping from events to requests for PSTs (as opposed to from a resource to requests for PSTs).
-type LeafMapper struct {
-	*bimapper.Mapper
-}
-
-func (m *LeafMapper) EventMapLink(_ context.Context, _ controller.Runtime, event controller.Event) ([]controller.Request, error) {
-	// Get cert from event.
-	cert, ok := event.Obj.(*structs.IssuedCert)
-	if !ok {
-		return nil, fmt.Errorf("got invalid event type; expected *structs.IssuedCert")
-	}
-
-	// The LeafMapper has mappings from leaf certificate resource references to PSTs. So we need to translate the
-	// contents of the certificate from the event to a leaf resource reference.
-	leafRef := leafResourceRef(cert.WorkloadIdentity, cert.EnterpriseMeta.NamespaceOrDefault(), cert.EnterpriseMeta.PartitionOrDefault())
-
-	// Get all the ProxyStateTemplates that reference this leaf.
-	itemIDs := m.ItemIDsForLink(leafRef)
-	out := make([]controller.Request, 0, len(itemIDs))
-
-	for _, item := range itemIDs {
-		out = append(out, controller.Request{ID: item})
-	}
-	return out, nil
-}
diff --git a/internal/mesh/internal/controllers/xds/mock_updater.go b/internal/mesh/internal/controllers/xds/mock_updater.go
deleted file mode 100644
index 5d62acc4855ea..0000000000000
--- a/internal/mesh/internal/controllers/xds/mock_updater.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"fmt"
-	"sync"
-
-	"github.com/hashicorp/consul/internal/controller"
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
-	proxytracker "github.com/hashicorp/consul/internal/mesh/proxy-tracker"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// mockUpdater mocks the updater functions, and stores ProxyStates from calls to PushChange, so we can assert it was
-// computed correctly in the controller.
-type mockUpdater struct {
-	lock sync.Mutex
-	// latestPs is a map from a ProxyStateTemplate's id.Name in string form to the last computed ProxyState for that
-	// ProxyStateTemplate.
-	latestPs        map[string]proxysnapshot.ProxySnapshot
-	notConnected    bool
-	pushChangeError bool
-	eventChan       chan controller.Event
-}
-
-func newMockUpdater() *mockUpdater {
-	return &mockUpdater{
-		latestPs: make(map[string]proxysnapshot.ProxySnapshot),
-	}
-}
-
-func (m *mockUpdater) SetPushChangeErrorTrue() {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	m.pushChangeError = true
-}
-
-func (m *mockUpdater) SetProxyAsNotConnected() {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	m.notConnected = true
-}
-
-func (m *mockUpdater) PushChange(id *pbresource.ID, snapshot proxysnapshot.ProxySnapshot) error {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	if m.pushChangeError {
-		return fmt.Errorf("mock push change error")
-	} else {
-		m.setUnsafe(id.Name, snapshot.(*proxytracker.ProxyState))
-	}
-	return nil
-}
-
-func (m *mockUpdater) ProxyConnectedToServer(_ *pbresource.ID) (string, bool) {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	if m.notConnected {
-		return "", false
-	}
-	return "atoken", true
-}
-
-func (m *mockUpdater) EventChannel() chan controller.Event {
-	if m.eventChan == nil {
-		m.eventChan = make(chan controller.Event)
-	}
-	return m.eventChan
-}
-
-func (p *mockUpdater) Get(name string) *proxytracker.ProxyState {
-	p.lock.Lock()
-	defer p.lock.Unlock()
-	ps, ok := p.latestPs[name]
-	if ok {
-		return ps.(*proxytracker.ProxyState)
-	}
-	return nil
-}
-
-func (p *mockUpdater) GetEndpoints(name string) map[string]*pbproxystate.Endpoints {
-	p.lock.Lock()
-	defer p.lock.Unlock()
-	ps, ok := p.latestPs[name]
-	if ok {
-		return ps.(*proxytracker.ProxyState).Endpoints
-	}
-	return nil
-}
-
-func (p *mockUpdater) GetLeafs(name string) map[string]*pbproxystate.LeafCertificate {
-	p.lock.Lock()
-	defer p.lock.Unlock()
-	ps, ok := p.latestPs[name]
-	if ok {
-		return ps.(*proxytracker.ProxyState).LeafCertificates
-	}
-	return nil
-}
-
-func (p *mockUpdater) GetTrustBundle(name string) map[string]*pbproxystate.TrustBundle {
-	p.lock.Lock()
-	defer p.lock.Unlock()
-	ps, ok := p.latestPs[name]
-	if ok {
-		return ps.(*proxytracker.ProxyState).TrustBundles
-	}
-	return nil
-}
-
-func (p *mockUpdater) Set(name string, ps *proxytracker.ProxyState) {
-	p.lock.Lock()
-	defer p.lock.Unlock()
-	p.setUnsafe(name, ps)
-}
-
-func (p *mockUpdater) setUnsafe(name string, ps *proxytracker.ProxyState) {
-	p.latestPs[name] = ps
-}
diff --git a/internal/mesh/internal/controllers/xds/proxy_tracker_watch.go b/internal/mesh/internal/controllers/xds/proxy_tracker_watch.go
deleted file mode 100644
index cf21dc0f7f409..0000000000000
--- a/internal/mesh/internal/controllers/xds/proxy_tracker_watch.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/hashicorp/consul/internal/controller"
-	proxytracker "github.com/hashicorp/consul/internal/mesh/proxy-tracker"
-)
-
-func proxySource(updater ProxyUpdater) *controller.Source {
-	return &controller.Source{Source: updater.EventChannel()}
-}
-
-func proxyMapper(ctx context.Context, rt controller.Runtime, event controller.Event) ([]controller.Request, error) {
-	connection, ok := event.Obj.(*proxytracker.ProxyConnection)
-	if !ok {
-		return nil, fmt.Errorf("expected event to be of type *proxytracker.ProxyConnection but was %+v", event)
-	}
-	return []controller.Request{{ID: connection.ProxyID}}, nil
-}
diff --git a/internal/mesh/internal/controllers/xds/reconciliation_data.go b/internal/mesh/internal/controllers/xds/reconciliation_data.go
deleted file mode 100644
index cdbb3a1cd3342..0000000000000
--- a/internal/mesh/internal/controllers/xds/reconciliation_data.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package xds
-
-import (
-	"context"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type ServiceEndpointsData struct {
-	Resource  *pbresource.Resource
-	Endpoints *pbcatalog.ServiceEndpoints
-}
-
-type ProxyStateTemplateData struct {
-	Resource *pbresource.Resource
-	Template *pbmesh.ProxyStateTemplate
-}
-
-// getServiceEndpoints will return a non-nil &ServiceEndpointsData unless there is an error.
-func getServiceEndpoints(ctx context.Context, rt controller.Runtime, id *pbresource.ID) (*ServiceEndpointsData, error) {
-	rsp, err := rt.Client.Read(ctx, &pbresource.ReadRequest{Id: id})
-	if err != nil {
-		return nil, err
-	}
-
-	var se pbcatalog.ServiceEndpoints
-	err = rsp.Resource.Data.UnmarshalTo(&se)
-	if err != nil {
-		return nil, resource.NewErrDataParse(&se, err)
-	}
-
-	return &ServiceEndpointsData{Resource: rsp.Resource, Endpoints: &se}, nil
-}
-
-func getProxyStateTemplate(ctx context.Context, rt controller.Runtime, id *pbresource.ID) (*ProxyStateTemplateData, error) {
-	rsp, err := rt.Client.Read(ctx, &pbresource.ReadRequest{Id: id})
-	switch {
-	case status.Code(err) == codes.NotFound:
-		return nil, nil
-	case err != nil:
-		return nil, err
-	}
-
-	var pst pbmesh.ProxyStateTemplate
-	err = rsp.Resource.Data.UnmarshalTo(&pst)
-	if err != nil {
-		return nil, resource.NewErrDataParse(&pst, err)
-	}
-
-	return &ProxyStateTemplateData{Resource: rsp.Resource, Template: &pst}, nil
-}
diff --git a/internal/mesh/internal/controllers/xds/status/status.go b/internal/mesh/internal/controllers/xds/status/status.go
deleted file mode 100644
index 145451f91471d..0000000000000
--- a/internal/mesh/internal/controllers/xds/status/status.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package status
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	StatusConditionProxyStateAccepted             = "ProxyStateAccepted"
-	StatusReasonNilProxyState                     = "ProxyStateNil"
-	StatusReasonProxyStateReferencesComputed      = "ProxyStateReferencesComputed"
-	StatusReasonEndpointNotRead                   = "ProxyStateEndpointReferenceReadError"
-	StatusReasonCreatingProxyStateEndpointsFailed = "ProxyStateEndpointsNotComputed"
-	StatusReasonPushChangeFailed                  = "ProxyStatePushChangeFailed"
-	StatusReasonTrustBundleFetchFailed            = "ProxyStateTrustBundleFetchFailed"
-	StatusReasonLeafWatchSetupFailed              = "ProxyStateLeafWatchSetupError"
-	StatusReasonLeafFetchFailed                   = "ProxyStateLeafFetchError"
-	StatusReasonLeafEmpty                         = "ProxyStateLeafEmptyError"
-)
-
-func KeyFromID(id *pbresource.ID) string {
-	return fmt.Sprintf("%s/%s/%s",
-		resource.ToGVK(id.Type),
-		resource.TenancyToString(id.Tenancy),
-		id.Name)
-}
-
-func ConditionAccepted() *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionProxyStateAccepted,
-		State:   pbresource.Condition_STATE_TRUE,
-		Reason:  StatusReasonProxyStateReferencesComputed,
-		Message: fmt.Sprintf("proxy state was computed and pushed."),
-	}
-}
-func ConditionRejectedNilProxyState(pstRef string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionProxyStateAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  StatusReasonNilProxyState,
-		Message: fmt.Sprintf("nil proxy state is not valid %q.", pstRef),
-	}
-}
-func ConditionRejectedErrorCreatingLeafWatch(leafRef string, err string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionProxyStateAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  StatusReasonLeafWatchSetupFailed,
-		Message: fmt.Sprintf("error creating leaf watch %q: %s", leafRef, err),
-	}
-}
-func ConditionRejectedErrorGettingLeaf(leafRef string, err string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionProxyStateAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  StatusReasonLeafFetchFailed,
-		Message: fmt.Sprintf("error getting leaf from leaf certificate manager %q: %s", leafRef, err),
-	}
-}
-func ConditionRejectedErrorCreatingProxyStateLeaf(leafRef string, err string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionProxyStateAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  StatusReasonLeafEmpty,
-		Message: fmt.Sprintf("error getting leaf certificate contents %q: %s", leafRef, err),
-	}
-}
-func ConditionRejectedErrorReadingEndpoints(endpointRef string, err string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionProxyStateAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  StatusReasonEndpointNotRead,
-		Message: fmt.Sprintf("error reading referenced service endpoints %q: %s", endpointRef, err),
-	}
-}
-func ConditionRejectedCreatingProxyStateEndpoints(endpointRef string, err string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionProxyStateAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  StatusReasonCreatingProxyStateEndpointsFailed,
-		Message: fmt.Sprintf("could not create proxy state endpoints from service endpoints %q: %s", endpointRef, err),
-	}
-}
-func ConditionRejectedPushChangeFailed(pstRef string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionProxyStateAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  StatusReasonPushChangeFailed,
-		Message: fmt.Sprintf("failed to push change for proxy state template %q", pstRef),
-	}
-}
-func ConditionRejectedTrustBundleFetchFailed(pstRef string) *pbresource.Condition {
-	return &pbresource.Condition{
-		Type:    StatusConditionProxyStateAccepted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  StatusReasonTrustBundleFetchFailed,
-		Message: fmt.Sprintf("failed to fetch trust bundle for proxy state template %q", pstRef),
-	}
-}
-
-// WriteStatusIfChanged updates the ProxyStateTemplate status if it has changed.
-func WriteStatusIfChanged(ctx context.Context, rt controller.Runtime, res *pbresource.Resource, condition *pbresource.Condition) {
-	newStatus := &pbresource.Status{
-		ObservedGeneration: res.Generation,
-		Conditions: []*pbresource.Condition{
-			condition,
-		},
-	}
-	// If the status is unchanged then we should return and avoid the unnecessary write
-	const controllerName = "consul.io/xds-controller"
-	if resource.EqualStatus(res.Status[controllerName], newStatus, false) {
-		return
-	} else {
-		_, err := rt.Client.WriteStatus(ctx, &pbresource.WriteStatusRequest{
-			Id:     res.Id,
-			Key:    controllerName,
-			Status: newStatus,
-		})
-
-		if err != nil {
-			rt.Logger.Error("error updating the proxy state template status", "error", err, "proxyStateTeamplate", res.Id)
-		}
-	}
-}
diff --git a/internal/mesh/internal/mappers/common/workload_selector_util.go b/internal/mesh/internal/mappers/common/workload_selector_util.go
deleted file mode 100644
index 90d96b8f9b47c..0000000000000
--- a/internal/mesh/internal/mappers/common/workload_selector_util.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package common
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// MapSelector returns requests of the provided type given a workload
-// selector and tenancy. The type has to be name-aligned with the workload.
-func MapSelector(ctx context.Context,
-	client pbresource.ResourceServiceClient,
-	typ *pbresource.Type,
-	selector *pbcatalog.WorkloadSelector,
-	tenancy *pbresource.Tenancy) ([]controller.Request, error) {
-	if selector == nil {
-		return nil, nil
-	}
-
-	var result []controller.Request
-
-	for _, prefix := range selector.GetPrefixes() {
-		resp, err := client.List(ctx, &pbresource.ListRequest{
-			Type:       pbcatalog.WorkloadType,
-			Tenancy:    tenancy,
-			NamePrefix: prefix,
-		})
-		if err != nil {
-			return nil, err
-		}
-		for _, r := range resp.Resources {
-			id := resource.ReplaceType(typ, r.Id)
-			result = append(result, controller.Request{
-				ID: id,
-			})
-		}
-	}
-
-	// We don't do lookups for names as this should be done in the controller's reconcile.
-	for _, name := range selector.GetNames() {
-		id := &pbresource.ID{
-			Name:    name,
-			Tenancy: tenancy,
-			Type:    typ,
-		}
-		result = append(result, controller.Request{
-			ID: id,
-		})
-	}
-
-	return result, nil
-}
diff --git a/internal/mesh/internal/mappers/common/workload_selector_util_test.go b/internal/mesh/internal/mappers/common/workload_selector_util_test.go
deleted file mode 100644
index 6f9e71e1af54d..0000000000000
--- a/internal/mesh/internal/mappers/common/workload_selector_util_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package common
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestMapSelector(t *testing.T) {
-	client := svctest.RunResourceService(t, types.Register, catalog.RegisterTypes)
-
-	// Create some workloads.
-	// For this test, we don't care about the workload data, so we will re-use
-	// the same data for all workloads.
-	workloadData := &pbcatalog.Workload{
-		Addresses: []*pbcatalog.WorkloadAddress{{Host: "127.0.0.1"}},
-		Ports:     map[string]*pbcatalog.WorkloadPort{"p1": {Port: 8080}},
-	}
-	w1 := resourcetest.Resource(pbcatalog.WorkloadType, "w1").
-		WithData(t, workloadData).
-		Write(t, client).Id
-	w2 := resourcetest.Resource(pbcatalog.WorkloadType, "w2").
-		WithData(t, workloadData).
-		Write(t, client).Id
-	w3 := resourcetest.Resource(pbcatalog.WorkloadType, "prefix-w3").
-		WithData(t, workloadData).
-		Write(t, client).Id
-	w4 := resourcetest.Resource(pbcatalog.WorkloadType, "prefix-w4").
-		WithData(t, workloadData).
-		Write(t, client).Id
-	// This workload should not be used as it's not selected by the workload selector.
-	resourcetest.Resource(pbcatalog.WorkloadType, "not-selected-workload").
-		WithData(t, workloadData).
-		Write(t, client)
-
-	selector := &pbcatalog.WorkloadSelector{
-		Names:    []string{"w1", "w2"},
-		Prefixes: []string{"prefix"},
-	}
-	expReqs := []controller.Request{
-		{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, w1)},
-		{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, w2)},
-		{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, w3)},
-		{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, w4)},
-	}
-
-	reqs, err := MapSelector(context.Background(), client,
-		pbmesh.ProxyStateTemplateType, selector, resource.DefaultNamespacedTenancy())
-	require.NoError(t, err)
-	require.Len(t, reqs, len(expReqs))
-	prototest.AssertElementsMatch(t, expReqs, reqs)
-}
diff --git a/internal/mesh/internal/mappers/sidecarproxymapper/computed_routes_mapper.go b/internal/mesh/internal/mappers/sidecarproxymapper/computed_routes_mapper.go
deleted file mode 100644
index 6a04b4c95fe9a..0000000000000
--- a/internal/mesh/internal/mappers/sidecarproxymapper/computed_routes_mapper.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxymapper
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func (m *Mapper) MapComputedRoutesToProxyStateTemplate(ctx context.Context, rt controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	computedRoutes, err := resource.Decode[*pbmesh.ComputedRoutes](res)
-	if err != nil {
-		return nil, err
-	}
-
-	reqs, err := m.mapComputedRoutesToProxyStateTemplate(ctx, rt, res.Id)
-	if err != nil {
-		return nil, err
-	}
-
-	m.computedRoutesCache.TrackComputedRoutes(computedRoutes)
-
-	return reqs, nil
-}
-
-func (m *Mapper) mapComputedRoutesToProxyStateTemplate(ctx context.Context, rt controller.Runtime, computedRoutesID *pbresource.ID) ([]controller.Request, error) {
-	// Each Destination gets a single ComputedRoutes.
-	serviceID := resource.ReplaceType(pbcatalog.ServiceType, computedRoutesID)
-	serviceRef := resource.Reference(serviceID, "")
-
-	ids, err := m.mapServiceThroughDestinationsToProxyStateTemplates(ctx, rt, serviceRef)
-	if err != nil {
-		return nil, err
-	}
-
-	return controller.MakeRequests(pbmesh.ProxyStateTemplateType, ids), nil
-}
diff --git a/internal/mesh/internal/mappers/sidecarproxymapper/destinations_mapper.go b/internal/mesh/internal/mappers/sidecarproxymapper/destinations_mapper.go
deleted file mode 100644
index 6f13c198efe6f..0000000000000
--- a/internal/mesh/internal/mappers/sidecarproxymapper/destinations_mapper.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxymapper
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/types/intermediate"
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func (m *Mapper) MapDestinationsToProxyStateTemplate(ctx context.Context, rt controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	destinations, err := resource.Decode[*pbmesh.Destinations](res)
-	if err != nil {
-		return nil, err
-	}
-
-	// Look up workloads for this destinations.
-	sourceProxyIDs := make(map[resource.ReferenceKey]struct{})
-
-	requests, err := mapSelectorToProxyStateTemplates(ctx, rt.Client, destinations.Data.Workloads, res.Id.Tenancy, func(id *pbresource.ID) {
-		sourceProxyIDs[resource.NewReferenceKey(id)] = struct{}{}
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	// Add this destination to destinationsCache.
-	for _, destination := range destinations.Data.Destinations {
-		destinationRef := intermediate.CombinedDestinationRef{
-			ServiceRef:             destination.DestinationRef,
-			Port:                   destination.DestinationPort,
-			ExplicitDestinationsID: res.Id,
-			SourceProxies:          sourceProxyIDs,
-		}
-		m.destinationsCache.WriteDestination(destinationRef)
-	}
-
-	return requests, nil
-}
diff --git a/internal/mesh/internal/mappers/sidecarproxymapper/destinations_mapper_test.go b/internal/mesh/internal/mappers/sidecarproxymapper/destinations_mapper_test.go
deleted file mode 100644
index fd29d3fa88f32..0000000000000
--- a/internal/mesh/internal/mappers/sidecarproxymapper/destinations_mapper_test.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxymapper
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/cache/sidecarproxycache"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/mesh/internal/types/intermediate"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestMapDestinationsToProxyStateTemplate(t *testing.T) {
-	client := svctest.RunResourceService(t, types.Register, catalog.RegisterTypes)
-	webWorkload1 := resourcetest.Resource(pbcatalog.WorkloadType, "web-abc").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{{Host: "10.0.0.1"}},
-			Ports:     map[string]*pbcatalog.WorkloadPort{"tcp": {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_TCP}},
-		}).
-		Write(t, client)
-	webWorkload2 := resourcetest.Resource(pbcatalog.WorkloadType, "web-def").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{{Host: "10.0.0.2"}},
-			Ports:     map[string]*pbcatalog.WorkloadPort{"tcp": {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_TCP}},
-		}).
-		Write(t, client)
-	webWorkload3 := resourcetest.Resource(pbcatalog.WorkloadType, "non-prefix-web").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{{Host: "10.0.0.3"}},
-			Ports:     map[string]*pbcatalog.WorkloadPort{"tcp": {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_TCP}},
-		}).
-		Write(t, client)
-
-	var (
-		api1ServiceRef = resourcetest.Resource(pbcatalog.ServiceType, "api-1").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				ReferenceNoSection()
-		api2ServiceRef = resourcetest.Resource(pbcatalog.ServiceType, "api-2").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				ReferenceNoSection()
-	)
-
-	webDestinationsData := &pbmesh.Destinations{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Names:    []string{"non-prefix-web"},
-			Prefixes: []string{"web"},
-		},
-		Destinations: []*pbmesh.Destination{
-			{
-				DestinationRef:  api1ServiceRef,
-				DestinationPort: "tcp",
-			},
-			{
-				DestinationRef:  api2ServiceRef,
-				DestinationPort: "tcp1",
-			},
-			{
-				DestinationRef:  api2ServiceRef,
-				DestinationPort: "tcp2",
-			},
-		},
-	}
-
-	webDestinations := resourcetest.Resource(pbmesh.DestinationsType, "web-destinations").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, webDestinationsData).
-		Write(t, client)
-
-	c := sidecarproxycache.NewDestinationsCache()
-	mapper := &Mapper{destinationsCache: c}
-
-	expRequests := []controller.Request{
-		{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, webWorkload1.Id)},
-		{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, webWorkload2.Id)},
-		{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, webWorkload3.Id)},
-	}
-
-	requests, err := mapper.MapDestinationsToProxyStateTemplate(context.Background(), controller.Runtime{Client: client}, webDestinations)
-	require.NoError(t, err)
-	prototest.AssertElementsMatch(t, expRequests, requests)
-
-	var (
-		proxy1ID = resourcetest.Resource(pbmesh.ProxyStateTemplateType, webWorkload1.Id.Name).
-				WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-		proxy2ID = resourcetest.Resource(pbmesh.ProxyStateTemplateType, webWorkload2.Id.Name).
-				WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-		proxy3ID = resourcetest.Resource(pbmesh.ProxyStateTemplateType, webWorkload3.Id.Name).
-				WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	)
-	for _, u := range webDestinationsData.Destinations {
-		expDestination := intermediate.CombinedDestinationRef{
-			ServiceRef:             u.DestinationRef,
-			Port:                   u.DestinationPort,
-			ExplicitDestinationsID: webDestinations.Id,
-			SourceProxies: map[resource.ReferenceKey]struct{}{
-				resource.NewReferenceKey(proxy1ID): {},
-				resource.NewReferenceKey(proxy2ID): {},
-				resource.NewReferenceKey(proxy3ID): {},
-			},
-		}
-		actualDestination, found := c.ReadDestination(u.DestinationRef, u.DestinationPort)
-		require.True(t, found)
-		prototest.AssertDeepEqual(t, expDestination, actualDestination)
-	}
-}
diff --git a/internal/mesh/internal/mappers/sidecarproxymapper/mapper.go b/internal/mesh/internal/mappers/sidecarproxymapper/mapper.go
deleted file mode 100644
index 12d08b4ae3b7b..0000000000000
--- a/internal/mesh/internal/mappers/sidecarproxymapper/mapper.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxymapper
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/cache/sidecarproxycache"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type Mapper struct {
-	destinationsCache   *sidecarproxycache.DestinationsCache
-	proxyCfgCache       *sidecarproxycache.ProxyConfigurationCache
-	computedRoutesCache *sidecarproxycache.ComputedRoutesCache
-	identitiesCache     *sidecarproxycache.IdentitiesCache
-}
-
-func New(
-	destinationsCache *sidecarproxycache.DestinationsCache,
-	proxyCfgCache *sidecarproxycache.ProxyConfigurationCache,
-	computedRoutesCache *sidecarproxycache.ComputedRoutesCache,
-	identitiesCache *sidecarproxycache.IdentitiesCache,
-) *Mapper {
-	return &Mapper{
-		destinationsCache:   destinationsCache,
-		proxyCfgCache:       proxyCfgCache,
-		computedRoutesCache: computedRoutesCache,
-		identitiesCache:     identitiesCache,
-	}
-}
-
-// mapSelectorToProxyStateTemplates returns ProxyStateTemplate requests given a workload
-// selector and tenancy. The cacheFunc can be called if the resulting ids need to be cached.
-func mapSelectorToProxyStateTemplates(ctx context.Context,
-	client pbresource.ResourceServiceClient,
-	selector *pbcatalog.WorkloadSelector,
-	tenancy *pbresource.Tenancy,
-	cacheFunc func(id *pbresource.ID)) ([]controller.Request, error) {
-	var result []controller.Request
-
-	for _, prefix := range selector.Prefixes {
-		resp, err := client.List(ctx, &pbresource.ListRequest{
-			Type:       pbcatalog.WorkloadType,
-			Tenancy:    tenancy,
-			NamePrefix: prefix,
-		})
-		if err != nil {
-			return nil, err
-		}
-		if len(resp.Resources) == 0 {
-			return nil, fmt.Errorf("no workloads found")
-		}
-		for _, r := range resp.Resources {
-			id := resource.ReplaceType(pbmesh.ProxyStateTemplateType, r.Id)
-			result = append(result, controller.Request{
-				ID: id,
-			})
-			cacheFunc(id)
-		}
-	}
-
-	for _, name := range selector.Names {
-		id := &pbresource.ID{
-			Name:    name,
-			Tenancy: tenancy,
-			Type:    pbmesh.ProxyStateTemplateType,
-		}
-		result = append(result, controller.Request{
-			ID: id,
-		})
-		cacheFunc(id)
-	}
-
-	return result, nil
-}
diff --git a/internal/mesh/internal/mappers/sidecarproxymapper/mapper_test.go b/internal/mesh/internal/mappers/sidecarproxymapper/mapper_test.go
deleted file mode 100644
index 678f09be82a4b..0000000000000
--- a/internal/mesh/internal/mappers/sidecarproxymapper/mapper_test.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxymapper
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestMapWorkloadsBySelector(t *testing.T) {
-	client := svctest.RunResourceService(t, types.Register, catalog.RegisterTypes)
-
-	// Create some workloads.
-	// For this test, we don't care about the workload data, so we will re-use
-	// the same data for all workloads.
-	workloadData := &pbcatalog.Workload{
-		Addresses: []*pbcatalog.WorkloadAddress{{Host: "127.0.0.1"}},
-		Ports:     map[string]*pbcatalog.WorkloadPort{"p1": {Port: 8080}},
-	}
-	w1 := resourcetest.Resource(pbcatalog.WorkloadType, "w1").
-		WithData(t, workloadData).
-		Write(t, client).Id
-	w2 := resourcetest.Resource(pbcatalog.WorkloadType, "w2").
-		WithData(t, workloadData).
-		Write(t, client).Id
-	w3 := resourcetest.Resource(pbcatalog.WorkloadType, "prefix-w3").
-		WithData(t, workloadData).
-		Write(t, client).Id
-	w4 := resourcetest.Resource(pbcatalog.WorkloadType, "prefix-w4").
-		WithData(t, workloadData).
-		Write(t, client).Id
-	// This workload should not be used as it's not selected by the workload selector.
-	resourcetest.Resource(pbcatalog.WorkloadType, "not-selected-workload").
-		WithData(t, workloadData).
-		Write(t, client)
-
-	selector := &pbcatalog.WorkloadSelector{
-		Names:    []string{"w1", "w2"},
-		Prefixes: []string{"prefix"},
-	}
-	expReqs := []controller.Request{
-		{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, w1)},
-		{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, w2)},
-		{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, w3)},
-		{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, w4)},
-	}
-
-	var cachedReqs []controller.Request
-
-	reqs, err := mapSelectorToProxyStateTemplates(context.Background(), client, selector, defaultTenancy(), func(id *pbresource.ID) {
-		// save IDs to check that the cache func is called
-		cachedReqs = append(cachedReqs, controller.Request{ID: id})
-	})
-	require.NoError(t, err)
-	require.Len(t, reqs, len(expReqs))
-	prototest.AssertElementsMatch(t, expReqs, reqs)
-	prototest.AssertElementsMatch(t, expReqs, cachedReqs)
-}
-
-func defaultTenancy() *pbresource.Tenancy {
-	return &pbresource.Tenancy{
-		Namespace: "default",
-		Partition: "default",
-		PeerName:  "local",
-	}
-}
diff --git a/internal/mesh/internal/mappers/sidecarproxymapper/proxy_configuration_mapper.go b/internal/mesh/internal/mappers/sidecarproxymapper/proxy_configuration_mapper.go
deleted file mode 100644
index 1c13099762b0d..0000000000000
--- a/internal/mesh/internal/mappers/sidecarproxymapper/proxy_configuration_mapper.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxymapper
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func (m *Mapper) MapProxyConfigurationToProxyStateTemplate(ctx context.Context, rt controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	var proxyConfig pbmesh.ProxyConfiguration
-	err := res.Data.UnmarshalTo(&proxyConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	var proxyIDs []resource.ReferenceOrID
-
-	requests, err := mapSelectorToProxyStateTemplates(ctx, rt.Client, proxyConfig.Workloads, res.Id.Tenancy, func(id *pbresource.ID) {
-		proxyIDs = append(proxyIDs, id)
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	m.proxyCfgCache.TrackProxyConfiguration(res.Id, proxyIDs)
-
-	return requests, nil
-}
diff --git a/internal/mesh/internal/mappers/sidecarproxymapper/proxy_configuration_mapper_test.go b/internal/mesh/internal/mappers/sidecarproxymapper/proxy_configuration_mapper_test.go
deleted file mode 100644
index b62e16257a4e3..0000000000000
--- a/internal/mesh/internal/mappers/sidecarproxymapper/proxy_configuration_mapper_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxymapper
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/cache/sidecarproxycache"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestProxyConfigurationMapper(t *testing.T) {
-	client := svctest.RunResourceService(t, types.Register, catalog.RegisterTypes)
-
-	// Create some workloads.
-	// For this test, we don't care about the workload data, so we will re-use
-	// the same data for all workloads.
-	workloadData := &pbcatalog.Workload{
-		Addresses: []*pbcatalog.WorkloadAddress{{Host: "127.0.0.1"}},
-		Ports:     map[string]*pbcatalog.WorkloadPort{"p1": {Port: 8080}},
-	}
-	w1 := resourcetest.Resource(pbcatalog.WorkloadType, "w1").
-		WithData(t, workloadData).
-		Write(t, client).Id
-	w2 := resourcetest.Resource(pbcatalog.WorkloadType, "w2").
-		WithData(t, workloadData).
-		Write(t, client).Id
-
-	// Create proxy configuration.
-	proxyCfgData := &pbmesh.ProxyConfiguration{
-		Workloads: &pbcatalog.WorkloadSelector{
-			Names: []string{"w1", "w2"},
-		},
-	}
-	pCfg := resourcetest.Resource(pbmesh.ProxyConfigurationType, "proxy-config").
-		WithData(t, proxyCfgData).
-		Write(t, client)
-
-	m := Mapper{proxyCfgCache: sidecarproxycache.NewProxyConfigurationCache()}
-	reqs, err := m.MapProxyConfigurationToProxyStateTemplate(context.Background(), controller.Runtime{
-		Client: client,
-	}, pCfg)
-	require.NoError(t, err)
-
-	p1 := resource.ReplaceType(pbmesh.ProxyStateTemplateType, w1)
-	p2 := resource.ReplaceType(pbmesh.ProxyStateTemplateType, w2)
-	expReqs := []controller.Request{
-		{ID: p1},
-		{ID: p2},
-	}
-	prototest.AssertElementsMatch(t, expReqs, reqs)
-
-	// Check that the cache is populated.
-
-	// Clean out UID as we don't care about it in the cache.
-	pCfg.Id.Uid = ""
-	prototest.AssertElementsMatch(t,
-		[]*pbresource.ID{pCfg.Id},
-		m.proxyCfgCache.ProxyConfigurationsByProxyID(p1))
-
-	prototest.AssertElementsMatch(t,
-		[]*pbresource.ID{pCfg.Id},
-		m.proxyCfgCache.ProxyConfigurationsByProxyID(p2))
-}
diff --git a/internal/mesh/internal/mappers/sidecarproxymapper/service_endpoints_mapper.go b/internal/mesh/internal/mappers/sidecarproxymapper/service_endpoints_mapper.go
deleted file mode 100644
index d7f14e212c70f..0000000000000
--- a/internal/mesh/internal/mappers/sidecarproxymapper/service_endpoints_mapper.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxymapper
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// MapServiceEndpointsToProxyStateTemplate maps catalog.ServiceEndpoints objects to the IDs of
-// ProxyStateTemplate.
-func (m *Mapper) MapServiceEndpointsToProxyStateTemplate(ctx context.Context, rt controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	// This mapper has two jobs:
-	//
-	// 1. It needs to look up workload IDs from service endpoints and replace
-	// them with ProxyStateTemplate type. We do this so we don't need to watch
-	// Workloads to discover them, since ProxyStateTemplates are name-aligned
-	// with Workloads.
-	//
-	// 2. It needs to find any PST that needs to DISCOVER endpoints for this
-	// service as a part of mesh configuration and traffic routing.
-
-	serviceEndpoints, err := resource.Decode[*pbcatalog.ServiceEndpoints](res)
-	if err != nil {
-		return nil, err
-	}
-
-	var result []controller.Request
-
-	// (1) First, we need to generate requests from workloads this "endpoints"
-	// points to so that we can re-generate proxy state for the sidecar proxy.
-	for _, endpoint := range serviceEndpoints.Data.Endpoints {
-		// Convert the reference to a workload to a ProxyStateTemplate ID.
-		// Because these resources are name and tenancy aligned, we only need to change the type.
-
-		// Skip service endpoints without target refs. These resources would typically be created for
-		// services external to Consul, and we don't need to reconcile those as they don't have
-		// associated workloads.
-		if endpoint.TargetRef != nil {
-			result = append(result, controller.Request{
-				ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, endpoint.TargetRef),
-			})
-		}
-	}
-
-	// (2) Now walk the mesh configuration information backwards.
-
-	// ServiceEndpoints -> Service
-	targetServiceRef := resource.ReplaceType(pbcatalog.ServiceType, res.Id)
-
-	// Find all ComputedRoutes that reference this service.
-	routeIDs := m.computedRoutesCache.ComputedRoutesByService(targetServiceRef)
-	for _, routeID := range routeIDs {
-		// Find all Upstreams that reference a Service aligned with this ComputedRoutes.
-		// Afterwards, find all Workloads selected by the Upstreams, and align a PST with those.
-		reqs, err := m.mapComputedRoutesToProxyStateTemplate(ctx, rt, routeID)
-		if err != nil {
-			return nil, err
-		}
-
-		result = append(result, reqs...)
-	}
-
-	return result, nil
-}
diff --git a/internal/mesh/internal/mappers/sidecarproxymapper/service_mapper.go b/internal/mesh/internal/mappers/sidecarproxymapper/service_mapper.go
deleted file mode 100644
index e94bff8a44617..0000000000000
--- a/internal/mesh/internal/mappers/sidecarproxymapper/service_mapper.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxymapper
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func (m *Mapper) MapServiceToProxyStateTemplate(ctx context.Context, rt controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	serviceRef := resource.Reference(res.Id, "")
-
-	ids, err := m.mapServiceThroughDestinationsToProxyStateTemplates(ctx, rt, serviceRef)
-	if err != nil {
-		return nil, err
-	}
-
-	return controller.MakeRequests(pbmesh.ProxyStateTemplateType, ids), nil
-}
-
-// mapServiceThroughDestinationsToProxyStateTemplates takes an explicit
-// Service and traverses back through Destinations to Workloads to
-// ProxyStateTemplates.
-//
-// This is in a separate function so it can be chained for more complicated
-// relationships.
-func (m *Mapper) mapServiceThroughDestinationsToProxyStateTemplates(
-	ctx context.Context,
-	rt controller.Runtime,
-	serviceRef *pbresource.Reference,
-) ([]*pbresource.ID, error) {
-
-	// The relationship is:
-	//
-	// - PST (replace type) Workload
-	// - Workload (selected by) Upstreams
-	// - Upstream (contains) Service
-	//
-	// When we wake up for Service we should:
-	//
-	// - look for Service in all Destinations(upstreams)
-	// - follow selectors backwards to Workloads
-	// - rewrite types to PST
-
-	var pstIDs []*pbresource.ID
-
-	destinations := m.destinationsCache.ReadDestinationsByServiceAllPorts(serviceRef)
-	for _, destination := range destinations {
-		for refKey := range destination.SourceProxies {
-			pstIDs = append(pstIDs, refKey.ToID())
-		}
-	}
-
-	// TODO(v2): remove this after we can do proper performant implicit upstream determination
-	//
-	// TODO(rb): shouldn't this instead list all Workloads that have a mesh port?
-	allIDs, err := m.listAllProxyStateTemplatesTemporarily(ctx, rt, serviceRef.Tenancy)
-	if err != nil {
-		return nil, err
-	}
-
-	pstIDs = append(pstIDs, allIDs...)
-
-	return pstIDs, nil
-}
-
-func (m *Mapper) listAllProxyStateTemplatesTemporarily(ctx context.Context, rt controller.Runtime, tenancy *pbresource.Tenancy) ([]*pbresource.ID, error) {
-	// todo (ishustava): this is a stub for now until we implement implicit destinations.
-	// For tproxy, we generate requests for all proxy states in the cluster.
-	// This will generate duplicate events for proxies already added above,
-	// however, we expect that the controller runtime will de-dup for us.
-	rsp, err := rt.Client.List(ctx, &pbresource.ListRequest{
-		Type: pbmesh.ProxyStateTemplateType,
-		Tenancy: &pbresource.Tenancy{
-			Namespace: storage.Wildcard,
-			Partition: tenancy.Partition,
-			PeerName:  tenancy.PeerName,
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	result := make([]*pbresource.ID, 0, len(rsp.Resources))
-	for _, r := range rsp.Resources {
-		result = append(result, r.Id)
-	}
-	return result, nil
-}
diff --git a/internal/mesh/internal/mappers/sidecarproxymapper/traffic_permissions_mapper.go b/internal/mesh/internal/mappers/sidecarproxymapper/traffic_permissions_mapper.go
deleted file mode 100644
index ca576a3610b07..0000000000000
--- a/internal/mesh/internal/mappers/sidecarproxymapper/traffic_permissions_mapper.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxymapper
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func (m *Mapper) MapComputedTrafficPermissionsToProxyStateTemplate(_ context.Context, _ controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	var ctp pbauth.ComputedTrafficPermissions
-	err := res.Data.UnmarshalTo(&ctp)
-	if err != nil {
-		return nil, err
-	}
-
-	pid := resource.ReplaceType(pbauth.WorkloadIdentityType, res.Id)
-	ids := m.identitiesCache.ProxyIDsByWorkloadIdentity(pid)
-
-	requests := make([]controller.Request, 0, len(ids))
-	for _, id := range ids {
-		requests = append(requests, controller.Request{
-			ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, id)},
-		)
-	}
-
-	return requests, nil
-}
diff --git a/internal/mesh/internal/mappers/sidecarproxymapper/traffic_permissions_mapper_test.go b/internal/mesh/internal/mappers/sidecarproxymapper/traffic_permissions_mapper_test.go
deleted file mode 100644
index 8136f5bbed303..0000000000000
--- a/internal/mesh/internal/mappers/sidecarproxymapper/traffic_permissions_mapper_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxymapper
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/cache/sidecarproxycache"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestMapComputedTrafficPermissionsToProxyStateTemplate(t *testing.T) {
-	client := svctest.RunResourceService(t, types.Register, catalog.RegisterTypes)
-	ctp := resourcetest.Resource(pbauth.ComputedTrafficPermissionsType, "workload-identity-1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbauth.ComputedTrafficPermissions{}).
-		Build()
-
-	i := sidecarproxycache.NewIdentitiesCache()
-	mapper := &Mapper{identitiesCache: i}
-
-	// Empty results when the cache isn't populated.
-	requests, err := mapper.MapComputedTrafficPermissionsToProxyStateTemplate(context.Background(), controller.Runtime{Client: client}, ctp)
-	require.NoError(t, err)
-	require.Len(t, requests, 0)
-
-	identityID1 := resourcetest.Resource(pbauth.WorkloadIdentityType, "workload-identity-1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-
-	proxyID1 := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "service-workload-1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	proxyID2 := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "service-workload-2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-
-	i.TrackPair(identityID1, proxyID1)
-
-	// Empty results when the cache isn't populated.
-	requests, err = mapper.MapComputedTrafficPermissionsToProxyStateTemplate(context.Background(), controller.Runtime{Client: client}, ctp)
-	require.NoError(t, err)
-	prototest.AssertElementsMatch(t, []controller.Request{{ID: proxyID1}}, requests)
-
-	i.TrackPair(identityID1, proxyID2)
-
-	// Empty results when the cache isn't populated.
-	requests, err = mapper.MapComputedTrafficPermissionsToProxyStateTemplate(context.Background(), controller.Runtime{Client: client}, ctp)
-	require.NoError(t, err)
-	prototest.AssertElementsMatch(t, []controller.Request{
-		{ID: proxyID1},
-		{ID: proxyID2},
-	}, requests)
-}
diff --git a/internal/mesh/internal/mappers/sidecarproxymapper/unified_mapper_test.go b/internal/mesh/internal/mappers/sidecarproxymapper/unified_mapper_test.go
deleted file mode 100644
index 06025dd536d08..0000000000000
--- a/internal/mesh/internal/mappers/sidecarproxymapper/unified_mapper_test.go
+++ /dev/null
@@ -1,404 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sidecarproxymapper
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/mesh/internal/cache/sidecarproxycache"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes/routestest"
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/mesh/internal/types/intermediate"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestUnified_AllMappingsToProxyStateTemplate(t *testing.T) {
-	var (
-		destCache = sidecarproxycache.NewDestinationsCache()
-		// proxyCfgCache = sidecarproxycache.NewProxyConfigurationCache()
-		routesCache = sidecarproxycache.NewComputedRoutesCache()
-		mapper      = New(destCache, nil, routesCache, nil)
-
-		client = svctest.RunResourceService(t, types.Register, catalog.RegisterTypes)
-	)
-
-	anyServiceData := &pbcatalog.Service{
-		Ports: []*pbcatalog.ServicePort{
-			{
-				TargetPort: "tcp1",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_TCP,
-			},
-			{
-				TargetPort: "tcp2",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_TCP,
-			},
-			{
-				TargetPort: "mesh",
-				Protocol:   pbcatalog.Protocol_PROTOCOL_MESH,
-			},
-		},
-	}
-
-	anyWorkloadPorts := map[string]*pbcatalog.WorkloadPort{
-		"tcp1": {Port: 8080},
-		"tcp2": {Port: 8081},
-		"mesh": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-	}
-
-	// The thing we link through Destinations.
-	destService := resourcetest.Resource(pbcatalog.ServiceType, "web").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, anyServiceData).
-		Build()
-	destServiceRef := resource.Reference(destService.Id, "")
-
-	// The thing we reach through the mesh config.
-	targetService := resourcetest.Resource(pbcatalog.ServiceType, "db").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, anyServiceData).
-		Build()
-	targetServiceRef := resource.Reference(targetService.Id, "")
-
-	backupTargetService := resourcetest.Resource(pbcatalog.ServiceType, "db-backup").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, anyServiceData).
-		Build()
-	backupTargetServiceRef := resource.Reference(backupTargetService.Id, "")
-
-	// The way we make 'web' actually route traffic to 'db'.
-	tcpRoute := resourcetest.Resource(pbmesh.TCPRouteType, "tcp-route").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbmesh.TCPRoute{
-			ParentRefs: []*pbmesh.ParentReference{{
-				Ref: destServiceRef,
-			}},
-			Rules: []*pbmesh.TCPRouteRule{{
-				BackendRefs: []*pbmesh.TCPBackendRef{{
-					BackendRef: &pbmesh.BackendReference{
-						Ref: targetServiceRef,
-					},
-				}},
-			}},
-		}).
-		Build()
-	failoverPolicy := resourcetest.ResourceID(resource.ReplaceType(pbcatalog.FailoverPolicyType, targetService.Id)).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.FailoverPolicy{
-			Config: &pbcatalog.FailoverConfig{
-				Destinations: []*pbcatalog.FailoverDestination{{
-					Ref: backupTargetServiceRef,
-				}},
-			},
-		}).
-		Build()
-	webRoutes := routestest.BuildComputedRoutes(t, resource.ReplaceType(pbmesh.ComputedRoutesType, destService.Id),
-		resourcetest.MustDecode[*pbcatalog.Service](t, destService),
-		resourcetest.MustDecode[*pbcatalog.Service](t, targetService),
-		resourcetest.MustDecode[*pbcatalog.Service](t, backupTargetService),
-		resourcetest.MustDecode[*pbmesh.TCPRoute](t, tcpRoute),
-		resourcetest.MustDecode[*pbcatalog.FailoverPolicy](t, failoverPolicy),
-	)
-
-	var (
-		destWorkload1 = newID(pbcatalog.WorkloadType, "dest-workload-1")
-		destWorkload2 = newID(pbcatalog.WorkloadType, "dest-workload-2")
-
-		destProxy1 = resource.ReplaceType(pbmesh.ProxyStateTemplateType, destWorkload1)
-		destProxy2 = resource.ReplaceType(pbmesh.ProxyStateTemplateType, destWorkload2)
-	)
-
-	// Endpoints for original destination
-	destEndpoints := resourcetest.ResourceID(resource.ReplaceType(pbcatalog.ServiceEndpointsType, destService.Id)).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.ServiceEndpoints{
-			Endpoints: []*pbcatalog.Endpoint{
-				{
-					TargetRef: destWorkload1,
-					Ports:     anyWorkloadPorts,
-				},
-				{
-					TargetRef: destWorkload2,
-					Ports:     anyWorkloadPorts,
-				},
-			},
-		}).
-		Build()
-
-	var (
-		targetWorkload1       = newID(pbcatalog.WorkloadType, "target-workload-1")
-		targetWorkload2       = newID(pbcatalog.WorkloadType, "target-workload-2")
-		targetWorkload3       = newID(pbcatalog.WorkloadType, "target-workload-3")
-		backupTargetWorkload1 = newID(pbcatalog.WorkloadType, "backup-target-workload-1")
-		backupTargetWorkload2 = newID(pbcatalog.WorkloadType, "backup-target-workload-2")
-		backupTargetWorkload3 = newID(pbcatalog.WorkloadType, "backup-target-workload-3")
-
-		targetProxy1       = resource.ReplaceType(pbmesh.ProxyStateTemplateType, targetWorkload1)
-		targetProxy2       = resource.ReplaceType(pbmesh.ProxyStateTemplateType, targetWorkload2)
-		targetProxy3       = resource.ReplaceType(pbmesh.ProxyStateTemplateType, targetWorkload3)
-		backupTargetProxy1 = resource.ReplaceType(pbmesh.ProxyStateTemplateType, backupTargetWorkload1)
-		backupTargetProxy2 = resource.ReplaceType(pbmesh.ProxyStateTemplateType, backupTargetWorkload2)
-		backupTargetProxy3 = resource.ReplaceType(pbmesh.ProxyStateTemplateType, backupTargetWorkload3)
-	)
-
-	// Endpoints for actual destination
-	targetEndpoints := resourcetest.ResourceID(resource.ReplaceType(pbcatalog.ServiceEndpointsType, targetService.Id)).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.ServiceEndpoints{
-			Endpoints: []*pbcatalog.Endpoint{
-				{
-					TargetRef: targetWorkload1,
-					Ports:     anyWorkloadPorts,
-				},
-				{
-					TargetRef: targetWorkload2,
-					Ports:     anyWorkloadPorts,
-				},
-				{
-					TargetRef: targetWorkload3,
-					Ports:     anyWorkloadPorts,
-				},
-			},
-		}).
-		Build()
-	backupTargetEndpoints := resourcetest.ResourceID(resource.ReplaceType(pbcatalog.ServiceEndpointsType, backupTargetService.Id)).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbcatalog.ServiceEndpoints{
-			Endpoints: []*pbcatalog.Endpoint{
-				{
-					TargetRef: backupTargetWorkload1,
-					Ports:     anyWorkloadPorts,
-				},
-				{
-					TargetRef: backupTargetWorkload2,
-					Ports:     anyWorkloadPorts,
-				},
-				{
-					TargetRef: backupTargetWorkload3,
-					Ports:     anyWorkloadPorts,
-				},
-			},
-		}).
-		Build()
-
-	var (
-		sourceProxy1 = newID(pbmesh.ProxyStateTemplateType, "src-workload-1")
-		sourceProxy2 = newID(pbmesh.ProxyStateTemplateType, "src-workload-2")
-		sourceProxy3 = newID(pbmesh.ProxyStateTemplateType, "src-workload-3")
-		sourceProxy4 = newID(pbmesh.ProxyStateTemplateType, "src-workload-4")
-		sourceProxy5 = newID(pbmesh.ProxyStateTemplateType, "src-workload-5")
-		sourceProxy6 = newID(pbmesh.ProxyStateTemplateType, "src-workload-6")
-	)
-
-	destination1 := intermediate.CombinedDestinationRef{
-		ServiceRef: destServiceRef,
-		Port:       "tcp1",
-		SourceProxies: map[resource.ReferenceKey]struct{}{
-			resource.NewReferenceKey(sourceProxy1): {},
-			resource.NewReferenceKey(sourceProxy2): {},
-		},
-	}
-	destination2 := intermediate.CombinedDestinationRef{
-		ServiceRef: destServiceRef,
-		Port:       "tcp2",
-		SourceProxies: map[resource.ReferenceKey]struct{}{
-			resource.NewReferenceKey(sourceProxy3): {},
-			resource.NewReferenceKey(sourceProxy4): {},
-		},
-	}
-	destination3 := intermediate.CombinedDestinationRef{
-		ServiceRef: destServiceRef,
-		Port:       "mesh",
-		SourceProxies: map[resource.ReferenceKey]struct{}{
-			resource.NewReferenceKey(sourceProxy5): {},
-			resource.NewReferenceKey(sourceProxy6): {},
-		},
-	}
-
-	routesCache.TrackComputedRoutes(webRoutes)
-	destCache.WriteDestination(destination1)
-	destCache.WriteDestination(destination2)
-	destCache.WriteDestination(destination3)
-
-	t.Run("ServiceEndpoints", func(t *testing.T) {
-		t.Run("map dest endpoints", func(t *testing.T) {
-			requests, err := mapper.MapServiceEndpointsToProxyStateTemplate(
-				context.Background(),
-				controller.Runtime{Client: client},
-				destEndpoints,
-			)
-			require.NoError(t, err)
-
-			expRequests := []controller.Request{
-				// Just wakeup proxies for these workloads.
-				{ID: destProxy1},
-				{ID: destProxy2},
-			}
-
-			prototest.AssertElementsMatch(t, expRequests, requests)
-		})
-
-		t.Run("map target endpoints (TCPRoute)", func(t *testing.T) {
-			requests, err := mapper.MapServiceEndpointsToProxyStateTemplate(
-				context.Background(),
-				controller.Runtime{Client: client},
-				targetEndpoints,
-			)
-			require.NoError(t, err)
-
-			requests = testDeduplicateRequests(requests)
-
-			expRequests := []controller.Request{
-				// Wakeup proxies for these workloads.
-				{ID: targetProxy1},
-				{ID: targetProxy2},
-				{ID: targetProxy3},
-				// Also wakeup things that have destService as a destination b/c of the TCPRoute reference.
-				{ID: sourceProxy1},
-				{ID: sourceProxy2},
-				{ID: sourceProxy3},
-				{ID: sourceProxy4},
-				{ID: sourceProxy5},
-				{ID: sourceProxy6},
-			}
-
-			prototest.AssertElementsMatch(t, expRequests, requests)
-		})
-
-		t.Run("map backup target endpoints (FailoverPolicy)", func(t *testing.T) {
-			requests, err := mapper.MapServiceEndpointsToProxyStateTemplate(
-				context.Background(),
-				controller.Runtime{Client: client},
-				backupTargetEndpoints,
-			)
-			require.NoError(t, err)
-
-			requests = testDeduplicateRequests(requests)
-
-			expRequests := []controller.Request{
-				// Wakeup proxies for these workloads.
-				{ID: backupTargetProxy1},
-				{ID: backupTargetProxy2},
-				{ID: backupTargetProxy3},
-				// Also wakeup things that have destService as a destination b/c of the FailoverPolicy reference.
-				{ID: sourceProxy1},
-				{ID: sourceProxy2},
-				{ID: sourceProxy3},
-				{ID: sourceProxy4},
-				{ID: sourceProxy5},
-				{ID: sourceProxy6},
-			}
-
-			prototest.AssertElementsMatch(t, expRequests, requests)
-		})
-	})
-
-	t.Run("Service", func(t *testing.T) {
-		t.Run("map dest service", func(t *testing.T) {
-			requests, err := mapper.MapServiceToProxyStateTemplate(
-				context.Background(),
-				controller.Runtime{Client: client},
-				destService,
-			)
-			require.NoError(t, err)
-
-			// Only wake up things with dest as an upstream.
-			expRequests := []controller.Request{
-				{ID: sourceProxy1},
-				{ID: sourceProxy2},
-				{ID: sourceProxy3},
-				{ID: sourceProxy4},
-				{ID: sourceProxy5},
-				{ID: sourceProxy6},
-			}
-
-			prototest.AssertElementsMatch(t, expRequests, requests)
-		})
-
-		t.Run("map target endpoints (TCPRoute)", func(t *testing.T) {
-			requests, err := mapper.MapServiceToProxyStateTemplate(
-				context.Background(),
-				controller.Runtime{Client: client},
-				targetService,
-			)
-			require.NoError(t, err)
-
-			requests = testDeduplicateRequests(requests)
-
-			// No upstream referrs to target directly.
-			expRequests := []controller.Request{}
-
-			prototest.AssertElementsMatch(t, expRequests, requests)
-		})
-	})
-
-	t.Run("ComputedRoutes", func(t *testing.T) {
-		t.Run("map web routes", func(t *testing.T) {
-			requests, err := mapper.MapComputedRoutesToProxyStateTemplate(
-				context.Background(),
-				controller.Runtime{Client: client},
-				webRoutes.Resource,
-			)
-			require.NoError(t, err)
-
-			// Only wake up things with dest as an upstream.
-			expRequests := []controller.Request{
-				{ID: sourceProxy1},
-				{ID: sourceProxy2},
-				{ID: sourceProxy3},
-				{ID: sourceProxy4},
-				{ID: sourceProxy5},
-				{ID: sourceProxy6},
-			}
-
-			prototest.AssertElementsMatch(t, expRequests, requests)
-		})
-	})
-}
-
-func newRef(typ *pbresource.Type, name string) *pbresource.Reference {
-	return resource.Reference(newID(typ, name), "")
-}
-
-func newID(typ *pbresource.Type, name string) *pbresource.ID {
-	return &pbresource.ID{
-		Type:    typ,
-		Tenancy: resource.DefaultNamespacedTenancy(),
-		Name:    name,
-	}
-}
-
-func testDeduplicateRequests(reqs []controller.Request) []controller.Request {
-	type resID struct {
-		resource.ReferenceKey
-		UID string
-	}
-
-	out := make([]controller.Request, 0, len(reqs))
-	seen := make(map[resID]struct{})
-
-	for _, req := range reqs {
-		rid := resID{
-			ReferenceKey: resource.NewReferenceKey(req.ID),
-			UID:          req.ID.Uid,
-		}
-		if _, ok := seen[rid]; !ok {
-			out = append(out, req)
-			seen[rid] = struct{}{}
-		}
-	}
-
-	return out
-}
diff --git a/internal/mesh/internal/types/computed_proxy_configuration.go b/internal/mesh/internal/types/computed_proxy_configuration.go
deleted file mode 100644
index 672f4426b6341..0000000000000
--- a/internal/mesh/internal/types/computed_proxy_configuration.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-)
-
-func RegisterComputedProxyConfiguration(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:  pbmesh.ComputedProxyConfigurationType,
-		Proto: &pbmesh.ComputedProxyConfiguration{},
-		Scope: resource.ScopeNamespace,
-	})
-}
diff --git a/internal/mesh/internal/types/computed_routes.go b/internal/mesh/internal/types/computed_routes.go
deleted file mode 100644
index 1f66cc97ac211..0000000000000
--- a/internal/mesh/internal/types/computed_routes.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	// NullRouteBackend is the sentinel string used in ComputedRoutes backend
-	// targets to indicate that traffic arriving at this destination should
-	// fail in a protocol-specific way (i.e. HTTP is 5xx)
-	NullRouteBackend = "NULL-ROUTE"
-)
-
-func RegisterComputedRoutes(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbmesh.ComputedRoutesType,
-		Proto:    &pbmesh.ComputedRoutes{},
-		Scope:    resource.ScopeNamespace,
-		Validate: ValidateComputedRoutes,
-	})
-}
-
-func ValidateComputedRoutes(res *pbresource.Resource) error {
-	var config pbmesh.ComputedRoutes
-
-	if err := res.Data.UnmarshalTo(&config); err != nil {
-		return resource.NewErrDataParse(&config, err)
-	}
-
-	var merr error
-
-	if len(config.PortedConfigs) == 0 {
-		merr = multierror.Append(merr, resource.ErrInvalidField{
-			Name:    "ported_configs",
-			Wrapped: resource.ErrEmpty,
-		})
-	}
-
-	// TODO(rb): do more elaborate validation
-
-	for port, pmc := range config.PortedConfigs {
-		wrapErr := func(err error) error {
-			return resource.ErrInvalidMapValue{
-				Map:     "ported_configs",
-				Key:     port,
-				Wrapped: err,
-			}
-		}
-		if pmc.Config == nil {
-			merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-				Name:    "config",
-				Wrapped: resource.ErrEmpty,
-			}))
-		}
-
-		for targetName, target := range pmc.Targets {
-			wrapTargetErr := func(err error) error {
-				return wrapErr(resource.ErrInvalidMapValue{
-					Map:     "targets",
-					Key:     targetName,
-					Wrapped: err,
-				})
-			}
-
-			switch target.Type {
-			case pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_UNSPECIFIED:
-				merr = multierror.Append(merr, wrapTargetErr(
-					resource.ErrInvalidField{
-						Name:    "type",
-						Wrapped: resource.ErrMissing,
-					}),
-				)
-			case pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT:
-			case pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_INDIRECT:
-				if target.FailoverConfig != nil {
-					merr = multierror.Append(merr, wrapTargetErr(
-						resource.ErrInvalidField{
-							Name:    "failover_config",
-							Wrapped: errors.New("failover_config not supported for type = INDIRECT"),
-						}),
-					)
-				}
-			default:
-				merr = multierror.Append(merr, wrapTargetErr(
-					resource.ErrInvalidField{
-						Name:    "type",
-						Wrapped: fmt.Errorf("not a supported enum value: %v", target.Type),
-					},
-				))
-			}
-
-			if target.DestinationConfig == nil {
-				merr = multierror.Append(merr, wrapTargetErr(resource.ErrInvalidField{
-					Name:    "destination_config",
-					Wrapped: resource.ErrMissing,
-				}))
-			} else {
-				wrapDestConfigErr := func(err error) error {
-					return wrapTargetErr(resource.ErrInvalidField{
-						Name:    "destination_config",
-						Wrapped: err,
-					})
-				}
-
-				destConfig := target.DestinationConfig
-				if destConfig.ConnectTimeout == nil {
-					merr = multierror.Append(merr, wrapDestConfigErr(resource.ErrInvalidField{
-						Name:    "connect_timeout",
-						Wrapped: resource.ErrMissing,
-					}))
-				} else {
-					connectTimeout := destConfig.ConnectTimeout.AsDuration()
-					if connectTimeout < 0 {
-						merr = multierror.Append(merr, wrapDestConfigErr(resource.ErrInvalidField{
-							Name:    "connect_timeout",
-							Wrapped: errTimeoutCannotBeNegative(connectTimeout),
-						}))
-					}
-				}
-			}
-
-			if target.MeshPort == "" {
-				merr = multierror.Append(merr, wrapTargetErr(resource.ErrInvalidField{
-					Name:    "mesh_port",
-					Wrapped: resource.ErrEmpty,
-				}))
-			}
-			if target.ServiceEndpointsId != nil {
-				merr = multierror.Append(merr, wrapTargetErr(resource.ErrInvalidField{
-					Name:    "service_endpoints_id",
-					Wrapped: fmt.Errorf("field should be empty"),
-				}))
-			}
-			if target.ServiceEndpoints != nil {
-				merr = multierror.Append(merr, wrapTargetErr(resource.ErrInvalidField{
-					Name:    "service_endpoints",
-					Wrapped: fmt.Errorf("field should be empty"),
-				}))
-			}
-			if len(target.IdentityRefs) > 0 {
-				merr = multierror.Append(merr, wrapTargetErr(resource.ErrInvalidField{
-					Name:    "identity_refs",
-					Wrapped: fmt.Errorf("field should be empty"),
-				}))
-			}
-		}
-
-		// TODO(rb): do a deep inspection of the config to verify that all
-		// xRoute backends ultimately point to an item in the targets map.
-	}
-
-	return merr
-}
diff --git a/internal/mesh/internal/types/computed_routes_test.go b/internal/mesh/internal/types/computed_routes_test.go
deleted file mode 100644
index 8f6aa06f8fcf9..0000000000000
--- a/internal/mesh/internal/types/computed_routes_test.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/types/known/durationpb"
-
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestValidateComputedRoutes(t *testing.T) {
-	type testcase struct {
-		routes    *pbmesh.ComputedRoutes
-		expectErr string
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		res := resourcetest.Resource(pbmesh.ComputedRoutesType, "api").
-			WithData(t, tc.routes).
-			Build()
-
-		err := ValidateComputedRoutes(res)
-
-		// Verify that validate didn't actually change the object.
-		got := resourcetest.MustDecode[*pbmesh.ComputedRoutes](t, res)
-		prototest.AssertDeepEqual(t, tc.routes, got.Data)
-
-		if tc.expectErr == "" {
-			require.NoError(t, err)
-		} else {
-			testutil.RequireErrorContains(t, err, tc.expectErr)
-		}
-	}
-
-	cases := map[string]testcase{
-		"empty": {
-			routes:    &pbmesh.ComputedRoutes{},
-			expectErr: `invalid "ported_configs" field: cannot be empty`,
-		},
-		"empty config": {
-			routes: &pbmesh.ComputedRoutes{
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: nil,
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within ported_configs: invalid "config" field: cannot be empty`,
-		},
-		"target/missing mesh port": {
-			routes: &pbmesh.ComputedRoutes{
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Tcp{
-							Tcp: &pbmesh.ComputedTCPRoute{},
-						},
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							"foo": {
-								Type:     pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort: "",
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within ported_configs: invalid value of key "foo" within targets: invalid "mesh_port" field: cannot be empty`,
-		},
-		"target/missing type": {
-			routes: &pbmesh.ComputedRoutes{
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Tcp{
-							Tcp: &pbmesh.ComputedTCPRoute{},
-						},
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							"foo": {
-								MeshPort: "mesh",
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within ported_configs: invalid value of key "foo" within targets: invalid "type" field: missing required field`,
-		},
-		"target/bad type": {
-			routes: &pbmesh.ComputedRoutes{
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Tcp{
-							Tcp: &pbmesh.ComputedTCPRoute{},
-						},
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							"foo": {
-								Type:     99,
-								MeshPort: "mesh",
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within ported_configs: invalid value of key "foo" within targets: invalid "type" field: not a supported enum value: 99`,
-		},
-		"target/indirect cannot have failover": {
-			routes: &pbmesh.ComputedRoutes{
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Tcp{
-							Tcp: &pbmesh.ComputedTCPRoute{},
-						},
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							"foo": {
-								Type:           pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_INDIRECT,
-								MeshPort:       "mesh",
-								FailoverConfig: &pbmesh.ComputedFailoverConfig{},
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within ported_configs: invalid value of key "foo" within targets: invalid "failover_config" field: failover_config not supported for type = INDIRECT`,
-		},
-		"target/should not have service endpoints id": {
-			routes: &pbmesh.ComputedRoutes{
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Tcp{
-							Tcp: &pbmesh.ComputedTCPRoute{},
-						},
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							"foo": {
-								Type:               pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:           "mesh",
-								ServiceEndpointsId: &pbresource.ID{},
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within ported_configs: invalid value of key "foo" within targets: invalid "service_endpoints_id" field: field should be empty`,
-		},
-		"target/should not have service endpoints": {
-			routes: &pbmesh.ComputedRoutes{
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Tcp{
-							Tcp: &pbmesh.ComputedTCPRoute{},
-						},
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							"foo": {
-								Type:             pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort:         "mesh",
-								ServiceEndpoints: &pbcatalog.ServiceEndpoints{},
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within ported_configs: invalid value of key "foo" within targets: invalid "service_endpoints" field: field should be empty`,
-		},
-		"target/should not have identity refs": {
-			routes: &pbmesh.ComputedRoutes{
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Tcp{
-							Tcp: &pbmesh.ComputedTCPRoute{},
-						},
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							"foo": {
-								Type:     pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort: "mesh",
-								IdentityRefs: []*pbresource.Reference{
-									{},
-								},
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within ported_configs: invalid value of key "foo" within targets: invalid "identity_refs" field: field should be empty`,
-		},
-		"valid": {
-			routes: &pbmesh.ComputedRoutes{
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"http": {
-						Config: &pbmesh.ComputedPortRoutes_Tcp{
-							Tcp: &pbmesh.ComputedTCPRoute{},
-						},
-						Targets: map[string]*pbmesh.BackendTargetDetails{
-							"foo": {
-								Type:     pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
-								MeshPort: "mesh",
-								DestinationConfig: &pbmesh.DestinationConfig{
-									ConnectTimeout: durationpb.New(5 * time.Second),
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
diff --git a/internal/mesh/internal/types/decoded.go b/internal/mesh/internal/types/decoded.go
deleted file mode 100644
index 91c08a72048f4..0000000000000
--- a/internal/mesh/internal/types/decoded.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-)
-
-type (
-	DecodedHTTPRoute                  = resource.DecodedResource[*pbmesh.HTTPRoute]
-	DecodedGRPCRoute                  = resource.DecodedResource[*pbmesh.GRPCRoute]
-	DecodedTCPRoute                   = resource.DecodedResource[*pbmesh.TCPRoute]
-	DecodedDestinationPolicy          = resource.DecodedResource[*pbmesh.DestinationPolicy]
-	DecodedComputedRoutes             = resource.DecodedResource[*pbmesh.ComputedRoutes]
-	DecodedComputedTrafficPermissions = resource.DecodedResource[*pbauth.ComputedTrafficPermissions]
-	DecodedFailoverPolicy             = resource.DecodedResource[*pbcatalog.FailoverPolicy]
-	DecodedService                    = resource.DecodedResource[*pbcatalog.Service]
-	DecodedServiceEndpoints           = resource.DecodedResource[*pbcatalog.ServiceEndpoints]
-	DecodedWorkload                   = resource.DecodedResource[*pbcatalog.Workload]
-	DecodedProxyConfiguration         = resource.DecodedResource[*pbmesh.ProxyConfiguration]
-	DecodedDestinations               = resource.DecodedResource[*pbmesh.Destinations]
-	DecodedProxyStateTemplate         = resource.DecodedResource[*pbmesh.ProxyStateTemplate]
-)
diff --git a/internal/mesh/internal/types/destination_policy.go b/internal/mesh/internal/types/destination_policy.go
deleted file mode 100644
index 75a6b9f18fb0b..0000000000000
--- a/internal/mesh/internal/types/destination_policy.go
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterDestinationPolicy(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbmesh.DestinationPolicyType,
-		Proto:    &pbmesh.DestinationPolicy{},
-		Scope:    resource.ScopeNamespace,
-		Validate: ValidateDestinationPolicy,
-		ACLs: &resource.ACLHooks{
-			Read:  aclReadHookDestinationPolicy,
-			Write: aclWriteHookDestinationPolicy,
-			List:  aclListHookDestinationPolicy,
-		},
-	})
-}
-
-func ValidateDestinationPolicy(res *pbresource.Resource) error {
-	var policy pbmesh.DestinationPolicy
-
-	if err := res.Data.UnmarshalTo(&policy); err != nil {
-		return resource.NewErrDataParse(&policy, err)
-	}
-
-	var merr error
-
-	if len(policy.PortConfigs) == 0 {
-		merr = multierror.Append(merr, resource.ErrInvalidField{
-			Name:    "port_configs",
-			Wrapped: resource.ErrEmpty,
-		})
-	}
-
-	for port, pc := range policy.PortConfigs {
-		wrapErr := func(err error) error {
-			return resource.ErrInvalidMapValue{
-				Map:     "port_configs",
-				Key:     port,
-				Wrapped: err,
-			}
-		}
-
-		if dur := pc.ConnectTimeout.AsDuration(); dur < 0 {
-			merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-				Name:    "connect_timeout",
-				Wrapped: fmt.Errorf("'%v', must be >= 0", dur),
-			}))
-		}
-		if dur := pc.RequestTimeout.AsDuration(); dur < 0 {
-			merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-				Name:    "request_timeout",
-				Wrapped: fmt.Errorf("'%v', must be >= 0", dur),
-			}))
-		}
-
-		if pc.LoadBalancer != nil {
-			lb := pc.LoadBalancer
-			wrapLBErr := func(err error) error {
-				return wrapErr(resource.ErrInvalidField{
-					Name:    "load_balancer",
-					Wrapped: err,
-				})
-			}
-
-			switch lb.Policy {
-			case pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_UNSPECIFIED:
-				// means just do the default
-			case pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_RANDOM:
-			case pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_ROUND_ROBIN:
-			case pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_LEAST_REQUEST:
-			case pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_MAGLEV:
-			case pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_RING_HASH:
-			default:
-				merr = multierror.Append(merr, wrapLBErr(resource.ErrInvalidField{
-					Name:    "policy",
-					Wrapped: fmt.Errorf("not a supported enum value: %v", lb.Policy),
-				}))
-			}
-
-			if lb.Policy != pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_RING_HASH && lb.Config != nil {
-				if _, ok := lb.Config.(*pbmesh.LoadBalancer_RingHashConfig); ok {
-					merr = multierror.Append(merr, wrapLBErr(resource.ErrInvalidField{
-						Name:    "config",
-						Wrapped: fmt.Errorf("ring_hash_config specified for incompatible load balancing policy %q", lb.Policy),
-					}))
-				}
-			}
-
-			if lb.Policy != pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_LEAST_REQUEST && lb.Config != nil {
-				if _, ok := lb.Config.(*pbmesh.LoadBalancer_LeastRequestConfig); ok {
-					merr = multierror.Append(merr, wrapLBErr(resource.ErrInvalidField{
-						Name:    "config",
-						Wrapped: fmt.Errorf("least_request_config specified for incompatible load balancing policy %q", lb.Policy),
-					}))
-				}
-			}
-
-			if !lb.Policy.IsHashBased() && len(lb.HashPolicies) > 0 {
-				merr = multierror.Append(merr, wrapLBErr(resource.ErrInvalidField{
-					Name:    "hash_policies",
-					Wrapped: fmt.Errorf("hash_policies specified for non-hash-based policy %q", lb.Policy),
-				}))
-			}
-
-		LOOP:
-			for i, hp := range lb.HashPolicies {
-				wrapHPErr := func(err error) error {
-					return wrapLBErr(resource.ErrInvalidListElement{
-						Name:    "hash_policies",
-						Index:   i,
-						Wrapped: err,
-					})
-				}
-
-				var hasField bool
-				switch hp.Field {
-				case pbmesh.HashPolicyField_HASH_POLICY_FIELD_UNSPECIFIED:
-				case pbmesh.HashPolicyField_HASH_POLICY_FIELD_HEADER,
-					pbmesh.HashPolicyField_HASH_POLICY_FIELD_COOKIE,
-					pbmesh.HashPolicyField_HASH_POLICY_FIELD_QUERY_PARAMETER:
-					hasField = true
-				default:
-					merr = multierror.Append(merr, wrapHPErr(resource.ErrInvalidField{
-						Name:    "field",
-						Wrapped: fmt.Errorf("not a supported enum value: %v", hp.Field),
-					}))
-					continue LOOP // no need to keep validating
-				}
-
-				if hp.SourceIp {
-					if hasField {
-						merr = multierror.Append(merr, wrapHPErr(resource.ErrInvalidField{
-							Name:    "field",
-							Wrapped: fmt.Errorf("a single hash policy cannot hash both a source address and a %q", hp.Field),
-						}))
-					}
-					if hp.FieldValue != "" {
-						merr = multierror.Append(merr, wrapHPErr(resource.ErrInvalidField{
-							Name:    "field_value",
-							Wrapped: errors.New("cannot be specified when hashing source_ip"),
-						}))
-					}
-				}
-
-				if hasField && hp.FieldValue == "" {
-					merr = multierror.Append(merr, wrapHPErr(resource.ErrInvalidField{
-						Name:    "field_value",
-						Wrapped: fmt.Errorf("field %q was specified without a field_value", hp.Field),
-					}))
-				}
-				if hp.FieldValue != "" && !hasField {
-					merr = multierror.Append(merr, wrapHPErr(resource.ErrInvalidField{
-						Name:    "field",
-						Wrapped: resource.ErrMissing,
-					}))
-					merr = multierror.Append(merr, wrapHPErr(resource.ErrInvalidField{
-						Name:    "field_value",
-						Wrapped: errors.New("requires a field to apply to"),
-					}))
-				}
-				if hp.CookieConfig != nil {
-					if hp.Field != pbmesh.HashPolicyField_HASH_POLICY_FIELD_COOKIE {
-						merr = multierror.Append(merr, wrapHPErr(resource.ErrInvalidField{
-							Name:    "cookie_config",
-							Wrapped: fmt.Errorf("incompatible with field %q", hp.Field),
-						}))
-					}
-					if hp.CookieConfig.Session && hp.CookieConfig.Ttl.AsDuration() != 0 {
-						merr = multierror.Append(merr, wrapHPErr(resource.ErrInvalidField{
-							Name: "cookie_config",
-							Wrapped: resource.ErrInvalidField{
-								Name:    "ttl",
-								Wrapped: fmt.Errorf("a session cookie cannot have an associated TTL"),
-							},
-						}))
-					}
-				}
-			}
-		}
-
-		if pc.LocalityPrioritization != nil {
-			lp := pc.LocalityPrioritization
-			wrapLPErr := func(err error) error {
-				return wrapErr(resource.ErrInvalidField{
-					Name:    "locality_prioritization",
-					Wrapped: err,
-				})
-			}
-
-			switch lp.Mode {
-			case pbmesh.LocalityPrioritizationMode_LOCALITY_PRIORITIZATION_MODE_UNSPECIFIED:
-				// means pbmesh.LocalityPrioritizationMode_LOCALITY_PRIORITIZATION_MODE_NONE
-			case pbmesh.LocalityPrioritizationMode_LOCALITY_PRIORITIZATION_MODE_NONE:
-			case pbmesh.LocalityPrioritizationMode_LOCALITY_PRIORITIZATION_MODE_FAILOVER:
-			default:
-				merr = multierror.Append(merr, wrapLPErr(resource.ErrInvalidField{
-					Name:    "mode",
-					Wrapped: fmt.Errorf("not a supported enum value: %v", lp.Mode),
-				}))
-			}
-		}
-	}
-
-	return merr
-}
-
-func aclReadHookDestinationPolicy(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, id *pbresource.ID, _ *pbresource.Resource) error {
-	// DestinationPolicy is name-aligned with Service
-	serviceName := id.Name
-
-	// Check service:read permissions.
-	return authorizer.ToAllowAuthorizer().ServiceReadAllowed(serviceName, authzContext)
-}
-
-func aclWriteHookDestinationPolicy(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
-	// DestinationPolicy is name-aligned with Service
-	serviceName := res.Id.Name
-
-	// Check service:write permissions on the service this is controlling.
-	return authorizer.ToAllowAuthorizer().ServiceWriteAllowed(serviceName, authzContext)
-}
-
-func aclListHookDestinationPolicy(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext) error {
-	// No-op List permission as we want to default to filtering resources
-	// from the list using the Read enforcement.
-	return nil
-}
diff --git a/internal/mesh/internal/types/destination_policy_test.go b/internal/mesh/internal/types/destination_policy_test.go
deleted file mode 100644
index c2f89eeb0a9f0..0000000000000
--- a/internal/mesh/internal/types/destination_policy_test.go
+++ /dev/null
@@ -1,616 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/types/known/durationpb"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestValidateDestinationPolicy(t *testing.T) {
-	type testcase struct {
-		policy     *pbmesh.DestinationPolicy
-		expectErr  string
-		expectErrs []string
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		res := resourcetest.Resource(pbmesh.DestinationPolicyType, "api").
-			WithData(t, tc.policy).
-			Build()
-
-		err := ValidateDestinationPolicy(res)
-
-		// Verify that validate didn't actually change the object.
-		got := resourcetest.MustDecode[*pbmesh.DestinationPolicy](t, res)
-		prototest.AssertDeepEqual(t, tc.policy, got.Data)
-
-		if tc.expectErr != "" && len(tc.expectErrs) > 0 {
-			t.Fatalf("cannot test singular and list errors at the same time")
-		}
-
-		if tc.expectErr == "" && len(tc.expectErrs) == 0 {
-			require.NoError(t, err)
-		} else if tc.expectErr != "" {
-			testutil.RequireErrorContains(t, err, tc.expectErr)
-		} else {
-			for _, expectErr := range tc.expectErrs {
-				testutil.RequireErrorContains(t, err, expectErr)
-			}
-		}
-	}
-
-	cases := map[string]testcase{
-		// emptiness
-		"empty": {
-			policy:    &pbmesh.DestinationPolicy{},
-			expectErr: `invalid "port_configs" field: cannot be empty`,
-		},
-		"good connect timeout": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-					},
-				},
-			},
-		},
-		"bad connect timeout": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(-55 * time.Second),
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within port_configs: invalid "connect_timeout" field: '-55s', must be >= 0`,
-		},
-		"good request timeout": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						RequestTimeout: durationpb.New(55 * time.Second),
-					},
-				},
-			},
-		},
-		"bad request timeout": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						RequestTimeout: durationpb.New(-55 * time.Second),
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within port_configs: invalid "request_timeout" field: '-55s', must be >= 0`,
-		},
-		// load balancer
-		"lbpolicy: missing enum": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer:   &pbmesh.LoadBalancer{},
-					},
-				},
-			},
-		},
-		"lbpolicy: bad enum": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: 99,
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid "policy" field: not a supported enum value: 99`,
-		},
-		"lbpolicy: supported": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_RANDOM,
-						},
-					},
-				},
-			},
-		},
-		"lbpolicy: bad for least request config": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_RING_HASH,
-							Config: &pbmesh.LoadBalancer_LeastRequestConfig{
-								LeastRequestConfig: &pbmesh.LeastRequestConfig{
-									ChoiceCount: 10,
-								},
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid "config" field: least_request_config specified for incompatible load balancing policy "LOAD_BALANCER_POLICY_RING_HASH"`,
-		},
-		"lbpolicy: bad for ring hash config": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_LEAST_REQUEST,
-							Config: &pbmesh.LoadBalancer_RingHashConfig{
-								RingHashConfig: &pbmesh.RingHashConfig{
-									MinimumRingSize: 1024,
-								},
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid "config" field: ring_hash_config specified for incompatible load balancing policy "LOAD_BALANCER_POLICY_LEAST_REQUEST"`,
-		},
-		"lbpolicy: good for least request config": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_LEAST_REQUEST,
-							Config: &pbmesh.LoadBalancer_LeastRequestConfig{
-								LeastRequestConfig: &pbmesh.LeastRequestConfig{
-									ChoiceCount: 10,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		"lbpolicy: good for ring hash config": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_RING_HASH,
-							Config: &pbmesh.LoadBalancer_RingHashConfig{
-								RingHashConfig: &pbmesh.RingHashConfig{
-									MinimumRingSize: 1024,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		"lbpolicy: empty policy with hash policy": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							HashPolicies: []*pbmesh.HashPolicy{
-								{SourceIp: true},
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid "hash_policies" field: hash_policies specified for non-hash-based policy "LOAD_BALANCER_POLICY_UNSPECIFIED"`,
-		},
-		"lbconfig: cookie config with header policy": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_MAGLEV,
-							HashPolicies: []*pbmesh.HashPolicy{
-								{
-									Field:      pbmesh.HashPolicyField_HASH_POLICY_FIELD_HEADER,
-									FieldValue: "x-user-id",
-									CookieConfig: &pbmesh.CookieConfig{
-										Ttl:  durationpb.New(10 * time.Second),
-										Path: "/root",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid element at index 0 of list "hash_policies": invalid "cookie_config" field: incompatible with field "HASH_POLICY_FIELD_HEADER"`,
-		},
-		"lbconfig: cannot generate session cookie with ttl": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_MAGLEV,
-							HashPolicies: []*pbmesh.HashPolicy{
-								{
-									Field:      pbmesh.HashPolicyField_HASH_POLICY_FIELD_COOKIE,
-									FieldValue: "good-cookie",
-									CookieConfig: &pbmesh.CookieConfig{
-										Session: true,
-										Ttl:     durationpb.New(10 * time.Second),
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid element at index 0 of list "hash_policies": invalid "cookie_config" field: invalid "ttl" field: a session cookie cannot have an associated TTL`,
-		},
-		"lbconfig: valid cookie policy": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_MAGLEV,
-							HashPolicies: []*pbmesh.HashPolicy{
-								{
-									Field:      pbmesh.HashPolicyField_HASH_POLICY_FIELD_COOKIE,
-									FieldValue: "good-cookie",
-									CookieConfig: &pbmesh.CookieConfig{
-										Ttl:  durationpb.New(10 * time.Second),
-										Path: "/oven",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		"lbconfig: bad match field": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_MAGLEV,
-							HashPolicies: []*pbmesh.HashPolicy{
-								{
-									Field:      99,
-									FieldValue: "X-Consul-Token",
-								},
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid element at index 0 of list "hash_policies": invalid "field" field: not a supported enum value: 99`,
-		},
-		"lbconfig: supported match field": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_MAGLEV,
-							HashPolicies: []*pbmesh.HashPolicy{
-								{
-									Field:      pbmesh.HashPolicyField_HASH_POLICY_FIELD_HEADER,
-									FieldValue: "X-Consul-Token",
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		"lbconfig: missing match field": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_MAGLEV,
-							HashPolicies: []*pbmesh.HashPolicy{
-								{
-									FieldValue: "X-Consul-Token",
-								},
-							},
-						},
-					},
-				},
-			},
-			expectErrs: []string{
-				`invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid element at index 0 of list "hash_policies": invalid "field" field: missing required field`,
-				`invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid element at index 0 of list "hash_policies": invalid "field_value" field: requires a field to apply to`,
-			},
-		},
-		"lbconfig: cannot match on source address and custom field": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_MAGLEV,
-							HashPolicies: []*pbmesh.HashPolicy{
-								{
-									Field:    pbmesh.HashPolicyField_HASH_POLICY_FIELD_HEADER,
-									SourceIp: true,
-								},
-							},
-						},
-					},
-				},
-			},
-			expectErrs: []string{
-				`invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid element at index 0 of list "hash_policies": invalid "field" field: a single hash policy cannot hash both a source address and a "HASH_POLICY_FIELD_HEADER"`,
-				`invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid element at index 0 of list "hash_policies": invalid "field_value" field: field "HASH_POLICY_FIELD_HEADER" was specified without a field_value`,
-			},
-		},
-		"lbconfig: matchvalue not compatible with source address": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_MAGLEV,
-							HashPolicies: []*pbmesh.HashPolicy{
-								{
-									FieldValue: "X-Consul-Token",
-									SourceIp:   true,
-								},
-							},
-						},
-					},
-				},
-			},
-			expectErrs: []string{
-				`invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid element at index 0 of list "hash_policies": invalid "field_value" field: cannot be specified when hashing source_ip`,
-				`invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid element at index 0 of list "hash_policies": invalid "field_value" field: requires a field to apply to`,
-			},
-		},
-		"lbconfig: field without match value": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_MAGLEV,
-							HashPolicies: []*pbmesh.HashPolicy{
-								{
-									Field: pbmesh.HashPolicyField_HASH_POLICY_FIELD_HEADER,
-								},
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid element at index 0 of list "hash_policies": invalid "field_value" field: field "HASH_POLICY_FIELD_HEADER" was specified without a field_value`,
-		},
-		"lbconfig: matchvalue without field": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_MAGLEV,
-							HashPolicies: []*pbmesh.HashPolicy{
-								{
-									FieldValue: "my-cookie",
-								},
-							},
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within port_configs: invalid "load_balancer" field: invalid element at index 0 of list "hash_policies": invalid "field_value" field: requires a field to apply to`,
-		},
-		"lbconfig: ring hash kitchen sink": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_RING_HASH,
-							Config: &pbmesh.LoadBalancer_RingHashConfig{
-								RingHashConfig: &pbmesh.RingHashConfig{
-									MaximumRingSize: 10,
-									MinimumRingSize: 2,
-								},
-							},
-							HashPolicies: []*pbmesh.HashPolicy{
-								{
-									Field:      pbmesh.HashPolicyField_HASH_POLICY_FIELD_COOKIE,
-									FieldValue: "my-cookie",
-								},
-								{
-									Field:      pbmesh.HashPolicyField_HASH_POLICY_FIELD_HEADER,
-									FieldValue: "alt-header",
-									Terminal:   true,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		"lbconfig: least request kitchen sink": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						ConnectTimeout: durationpb.New(55 * time.Second),
-						LoadBalancer: &pbmesh.LoadBalancer{
-							Policy: pbmesh.LoadBalancerPolicy_LOAD_BALANCER_POLICY_LEAST_REQUEST,
-							Config: &pbmesh.LoadBalancer_LeastRequestConfig{
-								LeastRequestConfig: &pbmesh.LeastRequestConfig{
-									ChoiceCount: 10,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		"locality: good mode": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						LocalityPrioritization: &pbmesh.LocalityPrioritization{
-							Mode: pbmesh.LocalityPrioritizationMode_LOCALITY_PRIORITIZATION_MODE_FAILOVER,
-						},
-					},
-				},
-			},
-		},
-		"locality: unset mode": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						LocalityPrioritization: &pbmesh.LocalityPrioritization{
-							Mode: pbmesh.LocalityPrioritizationMode_LOCALITY_PRIORITIZATION_MODE_UNSPECIFIED,
-						},
-					},
-				},
-			},
-		},
-		"locality: bad mode": {
-			policy: &pbmesh.DestinationPolicy{
-				PortConfigs: map[string]*pbmesh.DestinationConfig{
-					"http": {
-						LocalityPrioritization: &pbmesh.LocalityPrioritization{
-							Mode: 99,
-						},
-					},
-				},
-			},
-			expectErr: `invalid value of key "http" within port_configs: invalid "locality_prioritization" field: invalid "mode" field: not a supported enum value: 99`,
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func TestDestinationPolicyACLs(t *testing.T) {
-	// Wire up a registry to generically invoke hooks
-	registry := resource.NewRegistry()
-	Register(registry)
-
-	type testcase struct {
-		rules   string
-		check   func(t *testing.T, authz acl.Authorizer, res *pbresource.Resource)
-		readOK  string
-		writeOK string
-		listOK  string
-	}
-
-	const (
-		DENY    = "deny"
-		ALLOW   = "allow"
-		DEFAULT = "default"
-	)
-
-	checkF := func(t *testing.T, expect string, got error) {
-		switch expect {
-		case ALLOW:
-			if acl.IsErrPermissionDenied(got) {
-				t.Fatal("should be allowed")
-			}
-		case DENY:
-			if !acl.IsErrPermissionDenied(got) {
-				t.Fatal("should be denied")
-			}
-		case DEFAULT:
-			require.Nil(t, got, "expected fallthrough decision")
-		default:
-			t.Fatalf("unexpected expectation: %q", expect)
-		}
-	}
-
-	reg, ok := registry.Resolve(pbmesh.DestinationPolicyType)
-	require.True(t, ok)
-
-	run := func(t *testing.T, tc testcase) {
-		destData := &pbmesh.DestinationPolicy{
-			PortConfigs: map[string]*pbmesh.DestinationConfig{
-				"http": {
-					ConnectTimeout: durationpb.New(55 * time.Second),
-				},
-			},
-		}
-		res := resourcetest.Resource(pbmesh.DestinationPolicyType, "api").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, destData).
-			Build()
-		resourcetest.ValidateAndNormalize(t, registry, res)
-
-		config := acl.Config{
-			WildcardName: structs.WildcardSpecifier,
-		}
-		authz, err := acl.NewAuthorizerFromRules(tc.rules, &config, nil)
-		require.NoError(t, err)
-		authz = acl.NewChainedAuthorizer([]acl.Authorizer{authz, acl.DenyAll()})
-
-		t.Run("read", func(t *testing.T) {
-			err := reg.ACLs.Read(authz, &acl.AuthorizerContext{}, res.Id, nil)
-			checkF(t, tc.readOK, err)
-		})
-		t.Run("write", func(t *testing.T) {
-			err := reg.ACLs.Write(authz, &acl.AuthorizerContext{}, res)
-			checkF(t, tc.writeOK, err)
-		})
-		t.Run("list", func(t *testing.T) {
-			err := reg.ACLs.List(authz, &acl.AuthorizerContext{})
-			checkF(t, tc.listOK, err)
-		})
-	}
-
-	cases := map[string]testcase{
-		"no rules": {
-			rules:   ``,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"service api read": {
-			rules:   `service "api" { policy = "read" }`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"service api write": {
-			rules:   `service "api" { policy = "write" }`,
-			readOK:  ALLOW,
-			writeOK: ALLOW,
-			listOK:  DEFAULT,
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
diff --git a/internal/mesh/internal/types/destinations.go b/internal/mesh/internal/types/destinations.go
deleted file mode 100644
index 0e9e13ca15770..0000000000000
--- a/internal/mesh/internal/types/destinations.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/go-multierror"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterUpstreams(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbmesh.DestinationsType,
-		Proto:    &pbmesh.Destinations{},
-		Scope:    resource.ScopeNamespace,
-		Mutate:   MutateUpstreams,
-		Validate: ValidateUpstreams,
-	})
-}
-
-func MutateUpstreams(res *pbresource.Resource) error {
-	var destinations pbmesh.Destinations
-
-	if err := res.Data.UnmarshalTo(&destinations); err != nil {
-		return resource.NewErrDataParse(&destinations, err)
-	}
-
-	changed := false
-
-	for _, dest := range destinations.Destinations {
-		if dest.DestinationRef == nil {
-			continue // skip; let the validation hook error out instead
-		}
-		if dest.DestinationRef.Tenancy != nil && !isLocalPeer(dest.DestinationRef.Tenancy.PeerName) {
-			// TODO(peering/v2): remove this bypass when we know what to do with
-			// non-local peer references.
-			continue
-		}
-		orig := proto.Clone(dest.DestinationRef).(*pbresource.Reference)
-		resource.DefaultReferenceTenancy(
-			dest.DestinationRef,
-			res.Id.GetTenancy(),
-			resource.DefaultNamespacedTenancy(), // Services are all namespace scoped.
-		)
-
-		if !proto.Equal(orig, dest.DestinationRef) {
-			changed = true
-		}
-	}
-
-	if !changed {
-		return nil
-	}
-
-	return res.Data.MarshalFrom(&destinations)
-}
-
-func isLocalPeer(p string) bool {
-	return p == "local" || p == ""
-}
-
-func ValidateUpstreams(res *pbresource.Resource) error {
-	var destinations pbmesh.Destinations
-
-	if err := res.Data.UnmarshalTo(&destinations); err != nil {
-		return resource.NewErrDataParse(&destinations, err)
-	}
-
-	var merr error
-
-	for i, dest := range destinations.Destinations {
-		wrapDestErr := func(err error) error {
-			return resource.ErrInvalidListElement{
-				Name:    "upstreams",
-				Index:   i,
-				Wrapped: err,
-			}
-		}
-
-		wrapRefErr := func(err error) error {
-			return wrapDestErr(resource.ErrInvalidField{
-				Name:    "destination_ref",
-				Wrapped: err,
-			})
-		}
-
-		if refErr := catalog.ValidateLocalServiceRefNoSection(dest.DestinationRef, wrapRefErr); refErr != nil {
-			merr = multierror.Append(merr, refErr)
-		}
-
-		// TODO(v2): validate port name using catalog validator
-		// TODO(v2): validate ListenAddr
-	}
-
-	// TODO(v2): validate workload selectors
-
-	return merr
-}
diff --git a/internal/mesh/internal/types/destinations_configuration.go b/internal/mesh/internal/types/destinations_configuration.go
deleted file mode 100644
index 39d6053bf49de..0000000000000
--- a/internal/mesh/internal/types/destinations_configuration.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-)
-
-func RegisterUpstreamsConfiguration(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbmesh.DestinationsConfigurationType,
-		Proto:    &pbmesh.DestinationsConfiguration{},
-		Scope:    resource.ScopeNamespace,
-		Validate: nil,
-	})
-}
diff --git a/internal/mesh/internal/types/destinations_test.go b/internal/mesh/internal/types/destinations_test.go
deleted file mode 100644
index 79ac26bec1945..0000000000000
--- a/internal/mesh/internal/types/destinations_test.go
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestMutateUpstreams(t *testing.T) {
-	type testcase struct {
-		tenancy   *pbresource.Tenancy
-		data      *pbmesh.Destinations
-		expect    *pbmesh.Destinations
-		expectErr string
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		res := resourcetest.Resource(pbmesh.DestinationsType, "api").
-			WithTenancy(tc.tenancy).
-			WithData(t, tc.data).
-			Build()
-
-		err := MutateUpstreams(res)
-
-		got := resourcetest.MustDecode[*pbmesh.Destinations](t, res)
-
-		if tc.expectErr == "" {
-			require.NoError(t, err)
-			prototest.AssertDeepEqual(t, tc.expect, got.Data)
-		} else {
-			testutil.RequireErrorContains(t, err, tc.expectErr)
-		}
-	}
-
-	cases := map[string]testcase{
-		"empty-1": {
-			data:   &pbmesh.Destinations{},
-			expect: &pbmesh.Destinations{},
-		},
-		"invalid/nil dest ref": {
-			data: &pbmesh.Destinations{
-				Destinations: []*pbmesh.Destination{
-					{DestinationRef: nil},
-				},
-			},
-			expect: &pbmesh.Destinations{ // untouched
-				Destinations: []*pbmesh.Destination{
-					{DestinationRef: nil},
-				},
-			},
-		},
-		"dest ref tenancy defaulting": {
-			tenancy: newTestTenancy("foo.bar"),
-			data: &pbmesh.Destinations{
-				Destinations: []*pbmesh.Destination{
-					{DestinationRef: newRefWithTenancy(pbcatalog.ServiceType, newTestTenancy(""), "api")},
-					{DestinationRef: newRefWithTenancy(pbcatalog.ServiceType, newTestTenancy(".zim"), "api")},
-					{DestinationRef: newRefWithTenancy(pbcatalog.ServiceType, newTestTenancy("gir.zim"), "api")},
-				},
-			},
-			expect: &pbmesh.Destinations{
-				Destinations: []*pbmesh.Destination{
-					{DestinationRef: newRefWithTenancy(pbcatalog.ServiceType, newTestTenancy("foo.bar"), "api")},
-					{DestinationRef: newRefWithTenancy(pbcatalog.ServiceType, newTestTenancy("foo.zim"), "api")},
-					{DestinationRef: newRefWithTenancy(pbcatalog.ServiceType, newTestTenancy("gir.zim"), "api")},
-				},
-			},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func TestValidateUpstreams(t *testing.T) {
-	type testcase struct {
-		data       *pbmesh.Destinations
-		skipMutate bool
-		expectErr  string
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		res := resourcetest.Resource(pbmesh.DestinationsType, "api").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, tc.data).
-			Build()
-
-		if !tc.skipMutate {
-			require.NoError(t, MutateUpstreams(res))
-
-			// Verify that mutate didn't actually change the object.
-			got := resourcetest.MustDecode[*pbmesh.Destinations](t, res)
-			prototest.AssertDeepEqual(t, tc.data, got.Data)
-		}
-
-		err := ValidateUpstreams(res)
-
-		// Verify that validate didn't actually change the object.
-		got := resourcetest.MustDecode[*pbmesh.Destinations](t, res)
-		prototest.AssertDeepEqual(t, tc.data, got.Data)
-
-		if tc.expectErr == "" {
-			require.NoError(t, err)
-		} else {
-			testutil.RequireErrorContains(t, err, tc.expectErr)
-		}
-	}
-
-	cases := map[string]testcase{
-		// emptiness
-		"empty": {
-			data: &pbmesh.Destinations{},
-		},
-		"dest/nil ref": {
-			skipMutate: true,
-			data: &pbmesh.Destinations{
-				Destinations: []*pbmesh.Destination{
-					{DestinationRef: nil},
-				},
-			},
-			expectErr: `invalid element at index 0 of list "upstreams": invalid "destination_ref" field: missing required field`,
-		},
-		"dest/bad type": {
-			skipMutate: true,
-			data: &pbmesh.Destinations{
-				Destinations: []*pbmesh.Destination{
-					{DestinationRef: newRefWithTenancy(pbcatalog.WorkloadType, nil, "api")},
-				},
-			},
-			expectErr: `invalid element at index 0 of list "upstreams": invalid "destination_ref" field: invalid "type" field: reference must have type catalog.v2beta1.Service`,
-		},
-		"dest/nil tenancy": {
-			skipMutate: true,
-			data: &pbmesh.Destinations{
-				Destinations: []*pbmesh.Destination{
-					{DestinationRef: &pbresource.Reference{Type: pbcatalog.ServiceType, Name: "api"}},
-				},
-			},
-			expectErr: `invalid element at index 0 of list "upstreams": invalid "destination_ref" field: invalid "tenancy" field: missing required field`,
-		},
-		"dest/bad dest tenancy/partition": {
-			skipMutate: true,
-			data: &pbmesh.Destinations{
-				Destinations: []*pbmesh.Destination{
-					{DestinationRef: newRefWithTenancy(pbcatalog.ServiceType, newTestTenancy(".bar"), "api")},
-				},
-			},
-			expectErr: `invalid element at index 0 of list "upstreams": invalid "destination_ref" field: invalid "tenancy" field: invalid "partition" field: cannot be empty`,
-		},
-		"dest/bad dest tenancy/namespace": {
-			skipMutate: true,
-			data: &pbmesh.Destinations{
-				Destinations: []*pbmesh.Destination{
-					{DestinationRef: newRefWithTenancy(pbcatalog.ServiceType, newTestTenancy("foo"), "api")},
-				},
-			},
-			expectErr: `invalid element at index 0 of list "upstreams": invalid "destination_ref" field: invalid "tenancy" field: invalid "namespace" field: cannot be empty`,
-		},
-		"dest/bad dest tenancy/peer_name": {
-			skipMutate: true,
-			data: &pbmesh.Destinations{
-				Destinations: []*pbmesh.Destination{
-					{DestinationRef: newRefWithTenancy(pbcatalog.ServiceType, &pbresource.Tenancy{Partition: "foo", Namespace: "bar"}, "api")},
-				},
-			},
-			expectErr: `invalid element at index 0 of list "upstreams": invalid "destination_ref" field: invalid "tenancy" field: invalid "peer_name" field: must be set to "local"`,
-		},
-		"normal": {
-			data: &pbmesh.Destinations{
-				Destinations: []*pbmesh.Destination{
-					{DestinationRef: newRefWithTenancy(pbcatalog.ServiceType, newTestTenancy("foo.bar"), "api")},
-					{DestinationRef: newRefWithTenancy(pbcatalog.ServiceType, newTestTenancy("foo.zim"), "api")},
-					{DestinationRef: newRefWithTenancy(pbcatalog.ServiceType, newTestTenancy("gir.zim"), "api")},
-				},
-			},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
diff --git a/internal/mesh/internal/types/grpc_route.go b/internal/mesh/internal/types/grpc_route.go
deleted file mode 100644
index ab556c69479b8..0000000000000
--- a/internal/mesh/internal/types/grpc_route.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterGRPCRoute(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbmesh.GRPCRouteType,
-		Proto:    &pbmesh.GRPCRoute{},
-		Scope:    resource.ScopeNamespace,
-		Mutate:   MutateGRPCRoute,
-		Validate: ValidateGRPCRoute,
-		ACLs:     xRouteACLHooks[*pbmesh.GRPCRoute](),
-	})
-}
-
-func MutateGRPCRoute(res *pbresource.Resource) error {
-	var route pbmesh.GRPCRoute
-
-	if err := res.Data.UnmarshalTo(&route); err != nil {
-		return resource.NewErrDataParse(&route, err)
-	}
-
-	changed := false
-
-	if mutateParentRefs(res.Id.Tenancy, route.ParentRefs) {
-		changed = true
-	}
-
-	for _, rule := range route.Rules {
-		for _, backend := range rule.BackendRefs {
-			if backend.BackendRef == nil || backend.BackendRef.Ref == nil {
-				continue
-			}
-			if mutateXRouteRef(res.Id.Tenancy, backend.BackendRef.Ref) {
-				changed = true
-			}
-		}
-	}
-
-	if !changed {
-		return nil
-	}
-
-	return res.Data.MarshalFrom(&route)
-}
-
-func ValidateGRPCRoute(res *pbresource.Resource) error {
-	var route pbmesh.GRPCRoute
-
-	if err := res.Data.UnmarshalTo(&route); err != nil {
-		return resource.NewErrDataParse(&route, err)
-	}
-
-	var merr error
-	if err := validateParentRefs(route.ParentRefs); err != nil {
-		merr = multierror.Append(merr, err)
-	}
-
-	if len(route.Hostnames) > 0 {
-		merr = multierror.Append(merr, resource.ErrInvalidField{
-			Name:    "hostnames",
-			Wrapped: errors.New("should not populate hostnames"),
-		})
-	}
-
-	for i, rule := range route.Rules {
-		wrapRuleErr := func(err error) error {
-			return resource.ErrInvalidListElement{
-				Name:    "rules",
-				Index:   i,
-				Wrapped: err,
-			}
-		}
-
-		for j, match := range rule.Matches {
-			wrapMatchErr := func(err error) error {
-				return wrapRuleErr(resource.ErrInvalidListElement{
-					Name:    "matches",
-					Index:   j,
-					Wrapped: err,
-				})
-			}
-
-			if match.Method != nil {
-				switch match.Method.Type {
-				case pbmesh.GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_UNSPECIFIED:
-					merr = multierror.Append(merr, wrapMatchErr(
-						resource.ErrInvalidField{
-							Name:    "type",
-							Wrapped: resource.ErrMissing,
-						},
-					))
-				case pbmesh.GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_EXACT:
-				case pbmesh.GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_REGEX:
-				default:
-					merr = multierror.Append(merr, wrapMatchErr(
-						resource.ErrInvalidField{
-							Name:    "type",
-							Wrapped: fmt.Errorf("not a supported enum value: %v", match.Method.Type),
-						},
-					))
-				}
-				if match.Method.Service == "" && match.Method.Method == "" {
-					merr = multierror.Append(merr, wrapMatchErr(
-						resource.ErrInvalidField{
-							Name:    "service",
-							Wrapped: errors.New("at least one of \"service\" or \"method\" must be set"),
-						},
-					))
-				}
-			}
-
-			for k, header := range match.Headers {
-				wrapMatchHeaderErr := func(err error) error {
-					return wrapRuleErr(resource.ErrInvalidListElement{
-						Name:    "headers",
-						Index:   k,
-						Wrapped: err,
-					})
-				}
-
-				if err := validateHeaderMatchType(header.Type); err != nil {
-					merr = multierror.Append(merr, wrapMatchHeaderErr(
-						resource.ErrInvalidField{
-							Name:    "type",
-							Wrapped: err,
-						}),
-					)
-				}
-
-				if header.Name == "" {
-					merr = multierror.Append(merr, wrapMatchHeaderErr(
-						resource.ErrInvalidField{
-							Name:    "name",
-							Wrapped: resource.ErrMissing,
-						}),
-					)
-				}
-			}
-		}
-
-		for j, filter := range rule.Filters {
-			wrapFilterErr := func(err error) error {
-				return wrapRuleErr(resource.ErrInvalidListElement{
-					Name:    "filters",
-					Index:   j,
-					Wrapped: err,
-				})
-			}
-			set := 0
-			if filter.RequestHeaderModifier != nil {
-				set++
-			}
-			if filter.ResponseHeaderModifier != nil {
-				set++
-			}
-			if filter.UrlRewrite != nil {
-				set++
-				if filter.UrlRewrite.PathPrefix == "" {
-					merr = multierror.Append(merr, wrapFilterErr(
-						resource.ErrInvalidField{
-							Name: "url_rewrite",
-							Wrapped: resource.ErrInvalidField{
-								Name:    "path_prefix",
-								Wrapped: errors.New("field should not be empty if enclosing section is set"),
-							},
-						},
-					))
-				}
-			}
-			if set != 1 {
-				merr = multierror.Append(merr, wrapFilterErr(
-					errors.New("exactly one of request_header_modifier, response_header_modifier, or url_rewrite is required"),
-				))
-			}
-		}
-
-		if len(rule.BackendRefs) == 0 {
-			merr = multierror.Append(merr, wrapRuleErr(
-				resource.ErrInvalidField{
-					Name:    "backend_refs",
-					Wrapped: resource.ErrEmpty,
-				},
-			))
-		}
-		for j, hbref := range rule.BackendRefs {
-			wrapBackendRefErr := func(err error) error {
-				return wrapRuleErr(resource.ErrInvalidListElement{
-					Name:    "backend_refs",
-					Index:   j,
-					Wrapped: err,
-				})
-			}
-
-			wrapBackendRefFieldErr := func(err error) error {
-				return wrapBackendRefErr(resource.ErrInvalidField{
-					Name:    "backend_ref",
-					Wrapped: err,
-				})
-			}
-			if err := validateBackendRef(hbref.BackendRef, wrapBackendRefFieldErr); err != nil {
-				merr = multierror.Append(merr, err)
-			}
-
-			if len(hbref.Filters) > 0 {
-				merr = multierror.Append(merr, wrapBackendRefErr(
-					resource.ErrInvalidField{
-						Name:    "filters",
-						Wrapped: errors.New("filters are not supported at this level yet"),
-					},
-				))
-			}
-		}
-
-		if rule.Timeouts != nil {
-			for _, err := range validateHTTPTimeouts(rule.Timeouts) {
-				merr = multierror.Append(merr, wrapRuleErr(
-					resource.ErrInvalidField{
-						Name:    "timeouts",
-						Wrapped: err,
-					},
-				))
-			}
-		}
-		if rule.Retries != nil {
-			for _, err := range validateHTTPRetries(rule.Retries) {
-				merr = multierror.Append(merr, wrapRuleErr(
-					resource.ErrInvalidField{
-						Name:    "retries",
-						Wrapped: err,
-					},
-				))
-			}
-		}
-	}
-
-	return merr
-}
diff --git a/internal/mesh/internal/types/grpc_route_test.go b/internal/mesh/internal/types/grpc_route_test.go
deleted file mode 100644
index 0ca13e8563d15..0000000000000
--- a/internal/mesh/internal/types/grpc_route_test.go
+++ /dev/null
@@ -1,647 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestMutateGRPCRoute(t *testing.T) {
-	type testcase struct {
-		routeTenancy *pbresource.Tenancy
-		route        *pbmesh.GRPCRoute
-		expect       *pbmesh.GRPCRoute
-	}
-
-	cases := map[string]testcase{}
-
-	// Add common parent refs test cases.
-	for name, parentTC := range getXRouteParentRefMutateTestCases() {
-		cases["parent-ref: "+name] = testcase{
-			routeTenancy: parentTC.routeTenancy,
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: parentTC.refs,
-			},
-			expect: &pbmesh.GRPCRoute{
-				ParentRefs: parentTC.expect,
-			},
-		}
-	}
-	// add common backend ref test cases.
-	for name, backendTC := range getXRouteBackendRefMutateTestCases() {
-		var (
-			refs   []*pbmesh.GRPCBackendRef
-			expect []*pbmesh.GRPCBackendRef
-		)
-		for _, br := range backendTC.refs {
-			refs = append(refs, &pbmesh.GRPCBackendRef{
-				BackendRef: br,
-			})
-		}
-		for _, br := range backendTC.expect {
-			expect = append(expect, &pbmesh.GRPCBackendRef{
-				BackendRef: br,
-			})
-		}
-		cases["backend-ref: "+name] = testcase{
-			routeTenancy: backendTC.routeTenancy,
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{
-					{BackendRefs: refs},
-				},
-			},
-			expect: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{
-					{BackendRefs: expect},
-				},
-			},
-		}
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		res := resourcetest.Resource(pbmesh.GRPCRouteType, "api").
-			WithTenancy(tc.routeTenancy).
-			WithData(t, tc.route).
-			Build()
-
-		err := MutateGRPCRoute(res)
-		require.NoError(t, err)
-
-		got := resourcetest.MustDecode[*pbmesh.GRPCRoute](t, res)
-
-		if tc.expect == nil {
-			tc.expect = proto.Clone(tc.route).(*pbmesh.GRPCRoute)
-		}
-
-		prototest.AssertDeepEqual(t, tc.expect, got.Data)
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func TestValidateGRPCRoute(t *testing.T) {
-	type testcase struct {
-		route     *pbmesh.GRPCRoute
-		expectErr string
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		res := resourcetest.Resource(pbmesh.GRPCRouteType, "api").
-			WithData(t, tc.route).
-			Build()
-
-		// Ensure things are properly mutated and updated in the inputs.
-		err := MutateGRPCRoute(res)
-		require.NoError(t, err)
-		{
-			mutated := resourcetest.MustDecode[*pbmesh.GRPCRoute](t, res)
-			tc.route = mutated.Data
-		}
-
-		err = ValidateGRPCRoute(res)
-
-		// Verify that validate didn't actually change the object.
-		got := resourcetest.MustDecode[*pbmesh.GRPCRoute](t, res)
-		prototest.AssertDeepEqual(t, tc.route, got.Data)
-
-		if tc.expectErr == "" {
-			require.NoError(t, err)
-		} else {
-			testutil.RequireErrorContains(t, err, tc.expectErr)
-		}
-	}
-
-	cases := map[string]testcase{
-		"hostnames not supported for services": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Hostnames: []string{"foo.local"},
-			},
-			expectErr: `invalid "hostnames" field: should not populate hostnames`,
-		},
-		"no rules": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-			},
-		},
-		"rules with no matches": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"rules with matches that are empty": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Matches: []*pbmesh.GRPCRouteMatch{{
-						// none
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"method match with no type is bad": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Matches: []*pbmesh.GRPCRouteMatch{{
-						Method: &pbmesh.GRPCMethodMatch{
-							Service: "foo",
-						},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid "type" field: missing required field`,
-		},
-		"method match with unknown type is bad": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Matches: []*pbmesh.GRPCRouteMatch{{
-						Method: &pbmesh.GRPCMethodMatch{
-							Type:    99,
-							Service: "foo",
-						},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid "type" field: not a supported enum value: 99`,
-		},
-		"method match with no service nor method is bad": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Matches: []*pbmesh.GRPCRouteMatch{{
-						Method: &pbmesh.GRPCMethodMatch{
-							Type: pbmesh.GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_EXACT,
-						},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid "service" field: at least one of "service" or "method" must be set`,
-		},
-		"method match is good (1)": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Matches: []*pbmesh.GRPCRouteMatch{{
-						Method: &pbmesh.GRPCMethodMatch{
-							Type:    pbmesh.GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_EXACT,
-							Service: "foo",
-						},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"method match is good (2)": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Matches: []*pbmesh.GRPCRouteMatch{{
-						Method: &pbmesh.GRPCMethodMatch{
-							Type:   pbmesh.GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_EXACT,
-							Method: "bar",
-						},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"method match is good (3)": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Matches: []*pbmesh.GRPCRouteMatch{{
-						Method: &pbmesh.GRPCMethodMatch{
-							Type:    pbmesh.GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_EXACT,
-							Service: "foo",
-							Method:  "bar",
-						},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"header match with no type is bad": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Matches: []*pbmesh.GRPCRouteMatch{{
-						Headers: []*pbmesh.GRPCHeaderMatch{{
-							Name: "x-foo",
-						}},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "headers": invalid "type" field: missing required field`,
-		},
-		"header match with unknown type is bad": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Matches: []*pbmesh.GRPCRouteMatch{{
-						Headers: []*pbmesh.GRPCHeaderMatch{{
-							Type: 99,
-							Name: "x-foo",
-						}},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "headers": invalid "type" field: not a supported enum value: 99`,
-		},
-		"header match with no name is bad": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Matches: []*pbmesh.GRPCRouteMatch{{
-						Headers: []*pbmesh.GRPCHeaderMatch{{
-							Type: pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT,
-						}},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "headers": invalid "name" field: missing required field`,
-		},
-		"header match is good": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Matches: []*pbmesh.GRPCRouteMatch{{
-						Headers: []*pbmesh.GRPCHeaderMatch{{
-							Type: pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT,
-							Name: "x-foo",
-						}},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"filter empty is bad": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Filters: []*pbmesh.GRPCRouteFilter{{
-						// none
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "filters": exactly one of request_header_modifier, response_header_modifier, or url_rewrite`,
-		},
-		"filter req header mod is ok": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Filters: []*pbmesh.GRPCRouteFilter{{
-						RequestHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"filter resp header mod is ok": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Filters: []*pbmesh.GRPCRouteFilter{{
-						ResponseHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"filter rewrite header mod missing path prefix": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Filters: []*pbmesh.GRPCRouteFilter{{
-						UrlRewrite: &pbmesh.HTTPURLRewriteFilter{},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "filters": invalid "url_rewrite" field: invalid "path_prefix" field: field should not be empty if enclosing section is set`,
-		},
-		"filter rewrite header mod is ok": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Filters: []*pbmesh.GRPCRouteFilter{{
-						UrlRewrite: &pbmesh.HTTPURLRewriteFilter{
-							PathPrefix: "/blah",
-						},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"filter req+resp header mod is bad": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Filters: []*pbmesh.GRPCRouteFilter{{
-						RequestHeaderModifier:  &pbmesh.HTTPHeaderFilter{},
-						ResponseHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "filters": exactly one of request_header_modifier, response_header_modifier, or url_rewrite`,
-		},
-		"filter req+rewrite header mod is bad": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Filters: []*pbmesh.GRPCRouteFilter{{
-						RequestHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-						UrlRewrite: &pbmesh.HTTPURLRewriteFilter{
-							PathPrefix: "/blah",
-						},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "filters": exactly one of request_header_modifier, response_header_modifier, or url_rewrite`,
-		},
-		"filter resp+rewrite header mod is bad": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Filters: []*pbmesh.GRPCRouteFilter{{
-						ResponseHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-						UrlRewrite: &pbmesh.HTTPURLRewriteFilter{
-							PathPrefix: "/blah",
-						},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "filters": exactly one of request_header_modifier, response_header_modifier, or url_rewrite`,
-		},
-		"filter req+resp+rewrite header mod is bad": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Filters: []*pbmesh.GRPCRouteFilter{{
-						RequestHeaderModifier:  &pbmesh.HTTPHeaderFilter{},
-						ResponseHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-						UrlRewrite: &pbmesh.HTTPURLRewriteFilter{
-							PathPrefix: "/blah",
-						},
-					}},
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "filters": exactly one of request_header_modifier, response_header_modifier, or url_rewrite`,
-		},
-		"backend ref with filters is unsupported": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-						Filters: []*pbmesh.GRPCRouteFilter{{
-							RequestHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-						}},
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "backend_refs": invalid "filters" field: filters are not supported at this level yet`,
-		},
-		"nil backend ref": {
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					BackendRefs: []*pbmesh.GRPCBackendRef{nil},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "backend_refs": invalid "backend_ref" field: missing required field`,
-		},
-	}
-
-	// Add common timeouts test cases.
-	for name, timeoutsTC := range getXRouteTimeoutsTestCases() {
-		cases["timeouts: "+name] = testcase{
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Timeouts: timeoutsTC.timeouts,
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: timeoutsTC.expectErr,
-		}
-	}
-
-	// Add common retries test cases.
-	for name, retriesTC := range getXRouteRetriesTestCases() {
-		cases["retries: "+name] = testcase{
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					Retries: retriesTC.retries,
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: retriesTC.expectErr,
-		}
-	}
-
-	// Add common parent refs test cases.
-	for name, parentTC := range getXRouteParentRefTestCases() {
-		cases["parent-ref: "+name] = testcase{
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: parentTC.refs,
-			},
-			expectErr: parentTC.expectErr,
-		}
-	}
-	// add common backend ref test cases.
-	for name, backendTC := range getXRouteBackendRefTestCases() {
-		var refs []*pbmesh.GRPCBackendRef
-		for _, br := range backendTC.refs {
-			refs = append(refs, &pbmesh.GRPCBackendRef{
-				BackendRef: br,
-			})
-		}
-		cases["backend-ref: "+name] = testcase{
-			route: &pbmesh.GRPCRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{
-					{BackendRefs: refs},
-				},
-			},
-			expectErr: backendTC.expectErr,
-		}
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func TestGRPCRouteACLs(t *testing.T) {
-	testXRouteACLs[*pbmesh.GRPCRoute](t, func(t *testing.T, parentRefs, backendRefs []*pbresource.Reference) *pbresource.Resource {
-		data := &pbmesh.GRPCRoute{
-			ParentRefs: nil,
-		}
-		for _, ref := range parentRefs {
-			data.ParentRefs = append(data.ParentRefs, &pbmesh.ParentReference{
-				Ref: ref,
-			})
-		}
-
-		var ruleRefs []*pbmesh.GRPCBackendRef
-		for _, ref := range backendRefs {
-			ruleRefs = append(ruleRefs, &pbmesh.GRPCBackendRef{
-				BackendRef: &pbmesh.BackendReference{
-					Ref: ref,
-				},
-			})
-		}
-		data.Rules = []*pbmesh.GRPCRouteRule{
-			{BackendRefs: ruleRefs},
-		}
-
-		return resourcetest.Resource(pbmesh.GRPCRouteType, "api-grpc-route").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).
-			Build()
-	})
-}
diff --git a/internal/mesh/internal/types/http_route.go b/internal/mesh/internal/types/http_route.go
deleted file mode 100644
index 847e23aed968a..0000000000000
--- a/internal/mesh/internal/types/http_route.go
+++ /dev/null
@@ -1,363 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"strings"
-
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterHTTPRoute(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbmesh.HTTPRouteType,
-		Proto:    &pbmesh.HTTPRoute{},
-		Scope:    resource.ScopeNamespace,
-		Mutate:   MutateHTTPRoute,
-		Validate: ValidateHTTPRoute,
-		ACLs:     xRouteACLHooks[*pbmesh.HTTPRoute](),
-	})
-}
-
-func MutateHTTPRoute(res *pbresource.Resource) error {
-	var route pbmesh.HTTPRoute
-
-	if err := res.Data.UnmarshalTo(&route); err != nil {
-		return resource.NewErrDataParse(&route, err)
-	}
-
-	changed := false
-
-	if mutateParentRefs(res.Id.Tenancy, route.ParentRefs) {
-		changed = true
-	}
-
-	for _, rule := range route.Rules {
-		for _, match := range rule.Matches {
-			if match.Method != "" {
-				norm := strings.ToUpper(match.Method)
-				if match.Method != norm {
-					match.Method = norm
-					changed = true
-				}
-			}
-		}
-		for _, backend := range rule.BackendRefs {
-			if backend.BackendRef == nil || backend.BackendRef.Ref == nil {
-				continue
-			}
-			if mutateXRouteRef(res.Id.Tenancy, backend.BackendRef.Ref) {
-				changed = true
-			}
-		}
-	}
-
-	if !changed {
-		return nil
-	}
-
-	return res.Data.MarshalFrom(&route)
-}
-
-func ValidateHTTPRoute(res *pbresource.Resource) error {
-	var route pbmesh.HTTPRoute
-
-	if err := res.Data.UnmarshalTo(&route); err != nil {
-		return resource.NewErrDataParse(&route, err)
-	}
-
-	var merr error
-	if err := validateParentRefs(route.ParentRefs); err != nil {
-		merr = multierror.Append(merr, err)
-	}
-
-	if len(route.Hostnames) > 0 {
-		merr = multierror.Append(merr, resource.ErrInvalidField{
-			Name:    "hostnames",
-			Wrapped: errors.New("should not populate hostnames"),
-		})
-	}
-
-	for i, rule := range route.Rules {
-		wrapRuleErr := func(err error) error {
-			return resource.ErrInvalidListElement{
-				Name:    "rules",
-				Index:   i,
-				Wrapped: err,
-			}
-		}
-
-		for j, match := range rule.Matches {
-			wrapMatchErr := func(err error) error {
-				return wrapRuleErr(resource.ErrInvalidListElement{
-					Name:    "matches",
-					Index:   j,
-					Wrapped: err,
-				})
-			}
-
-			if match.Path != nil {
-				wrapMatchPathErr := func(err error) error {
-					return wrapMatchErr(resource.ErrInvalidField{
-						Name:    "path",
-						Wrapped: err,
-					})
-				}
-				// enumcover:pbmesh.PathMatchType
-				switch match.Path.Type {
-				case pbmesh.PathMatchType_PATH_MATCH_TYPE_UNSPECIFIED:
-					merr = multierror.Append(merr, wrapMatchPathErr(
-						resource.ErrInvalidField{
-							Name:    "type",
-							Wrapped: resource.ErrMissing,
-						},
-					))
-				case pbmesh.PathMatchType_PATH_MATCH_TYPE_EXACT:
-					if !strings.HasPrefix(match.Path.Value, "/") {
-						merr = multierror.Append(merr, wrapMatchPathErr(
-							resource.ErrInvalidField{
-								Name:    "value",
-								Wrapped: fmt.Errorf("exact patch value does not start with '/': %q", match.Path.Value),
-							},
-						))
-					}
-				case pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX:
-					if !strings.HasPrefix(match.Path.Value, "/") {
-						merr = multierror.Append(merr, wrapMatchPathErr(
-							resource.ErrInvalidField{
-								Name:    "value",
-								Wrapped: fmt.Errorf("prefix patch value does not start with '/': %q", match.Path.Value),
-							},
-						))
-					}
-				case pbmesh.PathMatchType_PATH_MATCH_TYPE_REGEX:
-					if match.Path.Value == "" {
-						merr = multierror.Append(merr, wrapMatchPathErr(
-							resource.ErrInvalidField{
-								Name:    "value",
-								Wrapped: resource.ErrEmpty,
-							},
-						))
-					}
-				default:
-					merr = multierror.Append(merr, wrapMatchPathErr(
-						resource.ErrInvalidField{
-							Name:    "type",
-							Wrapped: fmt.Errorf("not a supported enum value: %v", match.Path.Type),
-						},
-					))
-				}
-			}
-
-			for k, hdr := range match.Headers {
-				wrapMatchHeaderErr := func(err error) error {
-					return wrapMatchErr(resource.ErrInvalidListElement{
-						Name:    "headers",
-						Index:   k,
-						Wrapped: err,
-					})
-				}
-
-				if err := validateHeaderMatchType(hdr.Type); err != nil {
-					merr = multierror.Append(merr, wrapMatchHeaderErr(
-						resource.ErrInvalidField{
-							Name:    "type",
-							Wrapped: err,
-						}),
-					)
-				}
-
-				if hdr.Name == "" {
-					merr = multierror.Append(merr, wrapMatchHeaderErr(
-						resource.ErrInvalidField{
-							Name:    "name",
-							Wrapped: resource.ErrMissing,
-						}),
-					)
-				}
-			}
-
-			for k, qm := range match.QueryParams {
-				wrapMatchParamErr := func(err error) error {
-					return wrapMatchErr(resource.ErrInvalidListElement{
-						Name:    "query_params",
-						Index:   k,
-						Wrapped: err,
-					})
-				}
-
-				// enumcover:pbmesh.QueryParamMatchType
-				switch qm.Type {
-				case pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_UNSPECIFIED:
-					merr = multierror.Append(merr, wrapMatchParamErr(
-						resource.ErrInvalidField{
-							Name:    "type",
-							Wrapped: resource.ErrMissing,
-						}),
-					)
-				case pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_EXACT:
-				case pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_REGEX:
-				case pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_PRESENT:
-				default:
-					merr = multierror.Append(merr, wrapMatchParamErr(
-						resource.ErrInvalidField{
-							Name:    "type",
-							Wrapped: fmt.Errorf("not a supported enum value: %v", qm.Type),
-						},
-					))
-				}
-
-				if qm.Name == "" {
-					merr = multierror.Append(merr, wrapMatchParamErr(
-						resource.ErrInvalidField{
-							Name:    "name",
-							Wrapped: resource.ErrMissing,
-						}),
-					)
-				}
-			}
-
-			if match.Method != "" && !isValidHTTPMethod(match.Method) {
-				merr = multierror.Append(merr, wrapMatchErr(
-					resource.ErrInvalidField{
-						Name:    "method",
-						Wrapped: fmt.Errorf("not a valid http method: %q", match.Method),
-					},
-				))
-			}
-		}
-
-		var (
-			hasReqMod     bool
-			hasUrlRewrite bool
-		)
-		for j, filter := range rule.Filters {
-			wrapFilterErr := func(err error) error {
-				return wrapRuleErr(resource.ErrInvalidListElement{
-					Name:    "filters",
-					Index:   j,
-					Wrapped: err,
-				})
-			}
-			set := 0
-			if filter.RequestHeaderModifier != nil {
-				set++
-				hasReqMod = true
-			}
-			if filter.ResponseHeaderModifier != nil {
-				set++
-			}
-			if filter.UrlRewrite != nil {
-				set++
-				hasUrlRewrite = true
-				if filter.UrlRewrite.PathPrefix == "" {
-					merr = multierror.Append(merr, wrapFilterErr(
-						resource.ErrInvalidField{
-							Name: "url_rewrite",
-							Wrapped: resource.ErrInvalidField{
-								Name:    "path_prefix",
-								Wrapped: errors.New("field should not be empty if enclosing section is set"),
-							},
-						},
-					))
-				}
-			}
-			if set != 1 {
-				merr = multierror.Append(merr, wrapFilterErr(
-					errors.New("exactly one of request_header_modifier, response_header_modifier, or url_rewrite is required"),
-				))
-			}
-		}
-
-		if hasReqMod && hasUrlRewrite {
-			merr = multierror.Append(merr, wrapRuleErr(
-				errors.New("exactly one of request_header_modifier or url_rewrite can be set at a time"),
-			))
-		}
-
-		if len(rule.BackendRefs) == 0 {
-			merr = multierror.Append(merr, wrapRuleErr(
-				resource.ErrInvalidField{
-					Name:    "backend_refs",
-					Wrapped: resource.ErrEmpty,
-				},
-			))
-		}
-		for j, hbref := range rule.BackendRefs {
-			wrapBackendRefErr := func(err error) error {
-				return wrapRuleErr(resource.ErrInvalidListElement{
-					Name:    "backend_refs",
-					Index:   j,
-					Wrapped: err,
-				})
-			}
-
-			wrapBackendRefFieldErr := func(err error) error {
-				return wrapBackendRefErr(resource.ErrInvalidField{
-					Name:    "backend_ref",
-					Wrapped: err,
-				})
-			}
-			if err := validateBackendRef(hbref.BackendRef, wrapBackendRefFieldErr); err != nil {
-				merr = multierror.Append(merr, err)
-			}
-
-			if len(hbref.Filters) > 0 {
-				merr = multierror.Append(merr, wrapBackendRefErr(
-					resource.ErrInvalidField{
-						Name:    "filters",
-						Wrapped: errors.New("filters are not supported at this level yet"),
-					},
-				))
-			}
-		}
-
-		if rule.Timeouts != nil {
-			for _, err := range validateHTTPTimeouts(rule.Timeouts) {
-				merr = multierror.Append(merr, wrapRuleErr(
-					resource.ErrInvalidField{
-						Name:    "timeouts",
-						Wrapped: err,
-					},
-				))
-			}
-		}
-		if rule.Retries != nil {
-			for _, err := range validateHTTPRetries(rule.Retries) {
-				merr = multierror.Append(merr, wrapRuleErr(
-					resource.ErrInvalidField{
-						Name:    "retries",
-						Wrapped: err,
-					},
-				))
-			}
-		}
-	}
-
-	return merr
-}
-
-func isValidHTTPMethod(method string) bool {
-	switch method {
-	case http.MethodGet,
-		http.MethodHead,
-		http.MethodPost,
-		http.MethodPut,
-		http.MethodPatch,
-		http.MethodDelete,
-		http.MethodConnect,
-		http.MethodOptions,
-		http.MethodTrace:
-		return true
-	default:
-		return false
-	}
-}
diff --git a/internal/mesh/internal/types/http_route_test.go b/internal/mesh/internal/types/http_route_test.go
deleted file mode 100644
index 5f5dad54605e9..0000000000000
--- a/internal/mesh/internal/types/http_route_test.go
+++ /dev/null
@@ -1,1222 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestMutateHTTPRoute(t *testing.T) {
-	type testcase struct {
-		routeTenancy *pbresource.Tenancy
-		route        *pbmesh.HTTPRoute
-		expect       *pbmesh.HTTPRoute
-		expectErr    string
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		res := resourcetest.Resource(pbmesh.HTTPRouteType, "api").
-			WithTenancy(tc.routeTenancy).
-			WithData(t, tc.route).
-			Build()
-
-		err := MutateHTTPRoute(res)
-
-		got := resourcetest.MustDecode[*pbmesh.HTTPRoute](t, res)
-
-		if tc.expectErr == "" {
-			require.NoError(t, err)
-
-			if tc.expect == nil {
-				tc.expect = proto.Clone(tc.route).(*pbmesh.HTTPRoute)
-			}
-
-			prototest.AssertDeepEqual(t, tc.expect, got.Data)
-		} else {
-			testutil.RequireErrorContains(t, err, tc.expectErr)
-		}
-	}
-
-	cases := map[string]testcase{
-		"no-rules": {
-			route: &pbmesh.HTTPRoute{},
-		},
-		"rules-with-no-matches": {
-			route: &pbmesh.HTTPRoute{
-				Rules: []*pbmesh.HTTPRouteRule{{
-					// none
-				}},
-			},
-		},
-		"rules-with-matches-no-methods": {
-			route: &pbmesh.HTTPRoute{
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-							Value: "/foo",
-						},
-					}},
-				}},
-			},
-		},
-		"rules-with-matches-methods-uppercase": {
-			route: &pbmesh.HTTPRoute{
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{
-						{
-							Path: &pbmesh.HTTPPathMatch{
-								Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-								Value: "/foo",
-							},
-							Method: "GET",
-						},
-						{
-							Path: &pbmesh.HTTPPathMatch{
-								Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-								Value: "/bar",
-							},
-							Method: "POST",
-						},
-					},
-				}},
-			},
-		},
-		"rules-with-matches-methods-lowercase": {
-			route: &pbmesh.HTTPRoute{
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{
-						{
-							Path: &pbmesh.HTTPPathMatch{
-								Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-								Value: "/foo",
-							},
-							Method: "get",
-						},
-						{
-							Path: &pbmesh.HTTPPathMatch{
-								Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-								Value: "/bar",
-							},
-							Method: "post",
-						},
-					},
-				}},
-			},
-			expect: &pbmesh.HTTPRoute{
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{
-						{
-							Path: &pbmesh.HTTPPathMatch{
-								Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-								Value: "/foo",
-							},
-							Method: "GET",
-						},
-						{
-							Path: &pbmesh.HTTPPathMatch{
-								Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-								Value: "/bar",
-							},
-							Method: "POST",
-						},
-					},
-				}},
-			},
-		},
-	}
-
-	// Add common parent refs test cases.
-	for name, parentTC := range getXRouteParentRefMutateTestCases() {
-		cases["parent-ref: "+name] = testcase{
-			routeTenancy: parentTC.routeTenancy,
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: parentTC.refs,
-			},
-			expect: &pbmesh.HTTPRoute{
-				ParentRefs: parentTC.expect,
-			},
-		}
-	}
-	// add common backend ref test cases.
-	for name, backendTC := range getXRouteBackendRefMutateTestCases() {
-		var (
-			refs   []*pbmesh.HTTPBackendRef
-			expect []*pbmesh.HTTPBackendRef
-		)
-		for _, br := range backendTC.refs {
-			refs = append(refs, &pbmesh.HTTPBackendRef{
-				BackendRef: br,
-			})
-		}
-		for _, br := range backendTC.expect {
-			expect = append(expect, &pbmesh.HTTPBackendRef{
-				BackendRef: br,
-			})
-		}
-		cases["backend-ref: "+name] = testcase{
-			routeTenancy: backendTC.routeTenancy,
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{
-					{BackendRefs: refs},
-				},
-			},
-			expect: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{
-					{BackendRefs: expect},
-				},
-			},
-		}
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func TestValidateHTTPRoute(t *testing.T) {
-	type testcase struct {
-		route     *pbmesh.HTTPRoute
-		expectErr string
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		res := resourcetest.Resource(pbmesh.HTTPRouteType, "api").
-			WithData(t, tc.route).
-			Build()
-
-		// Ensure things are properly mutated and updated in the inputs.
-		err := MutateHTTPRoute(res)
-		require.NoError(t, err)
-		{
-			mutated := resourcetest.MustDecode[*pbmesh.HTTPRoute](t, res)
-			tc.route = mutated.Data
-		}
-
-		err = ValidateHTTPRoute(res)
-
-		// Verify that validate didn't actually change the object.
-		got := resourcetest.MustDecode[*pbmesh.HTTPRoute](t, res)
-		prototest.AssertDeepEqual(t, tc.route, got.Data)
-
-		if tc.expectErr == "" {
-			require.NoError(t, err)
-		} else {
-			testutil.RequireErrorContains(t, err, tc.expectErr)
-		}
-	}
-
-	cases := map[string]testcase{
-		"hostnames not supported for services": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Hostnames: []string{"foo.local"},
-			},
-			expectErr: `invalid "hostnames" field: should not populate hostnames`,
-		},
-		"no rules": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-			},
-		},
-		"rules with no matches": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"rules with matches that are empty": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						// none
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"path match with no type is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Path: &pbmesh.HTTPPathMatch{
-							Value: "/foo",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid "path" field: invalid "type" field: missing required field`,
-		},
-		"path match with unknown type is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  99,
-							Value: "/foo",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid "path" field: invalid "type" field: not a supported enum value: 99`,
-		},
-		"exact path match with no leading slash is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_EXACT,
-							Value: "foo",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid "path" field: invalid "value" field: exact patch value does not start with '/': "foo"`,
-		},
-		"prefix path match with no leading slash is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-							Value: "foo",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid "path" field: invalid "value" field: prefix patch value does not start with '/': "foo"`,
-		},
-		"exact path match with leading slash is good": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_EXACT,
-							Value: "/foo",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"prefix path match with leading slash is good": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-							Value: "/foo",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"regex empty path match is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_REGEX,
-							Value: "",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid "path" field: invalid "value" field: cannot be empty`,
-		},
-		"regex path match is good": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_REGEX,
-							Value: "/[^/]+/healthz",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"header match with no type is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Headers: []*pbmesh.HTTPHeaderMatch{{
-							Name: "x-foo",
-						}},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid element at index 0 of list "headers": invalid "type" field: missing required field`,
-		},
-		"header match with unknown type is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Headers: []*pbmesh.HTTPHeaderMatch{{
-							Type: 99,
-							Name: "x-foo",
-						}},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid element at index 0 of list "headers": invalid "type" field: not a supported enum value: 99`,
-		},
-		"header match with no name is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Headers: []*pbmesh.HTTPHeaderMatch{{
-							Type: pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT,
-						}},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid element at index 0 of list "headers": invalid "name" field: missing required field`,
-		},
-		"header match is good": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Headers: []*pbmesh.HTTPHeaderMatch{{
-							Type: pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT,
-							Name: "x-foo",
-						}},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"queryparam match with no type is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						QueryParams: []*pbmesh.HTTPQueryParamMatch{{
-							Name: "x-foo",
-						}},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid element at index 0 of list "query_params": invalid "type" field: missing required field`,
-		},
-		"queryparam match with unknown type is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						QueryParams: []*pbmesh.HTTPQueryParamMatch{{
-							Type: 99,
-							Name: "x-foo",
-						}},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid element at index 0 of list "query_params": invalid "type" field: not a supported enum value: 99`,
-		},
-		"queryparam match with no name is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						QueryParams: []*pbmesh.HTTPQueryParamMatch{{
-							Type: pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_EXACT,
-						}},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid element at index 0 of list "query_params": invalid "name" field: missing required field`,
-		},
-		"queryparam match is good": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						QueryParams: []*pbmesh.HTTPQueryParamMatch{{
-							Type: pbmesh.QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_EXACT,
-							Name: "x-foo",
-						}},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"method match is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Method: "BOB",
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "matches": invalid "method" field: not a valid http method: "BOB"`,
-		},
-		"method match is good": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Method: "DELETE",
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"filter empty is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Filters: []*pbmesh.HTTPRouteFilter{{
-						// none
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "filters": exactly one of request_header_modifier, response_header_modifier, or url_rewrite`,
-		},
-		"filter req header mod is ok": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Filters: []*pbmesh.HTTPRouteFilter{{
-						RequestHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"filter resp header mod is ok": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Filters: []*pbmesh.HTTPRouteFilter{{
-						ResponseHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"filter rewrite header mod missing path prefix": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Filters: []*pbmesh.HTTPRouteFilter{{
-						UrlRewrite: &pbmesh.HTTPURLRewriteFilter{},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "filters": invalid "url_rewrite" field: invalid "path_prefix" field: field should not be empty if enclosing section is set`,
-		},
-		"filter rewrite header mod is ok": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Filters: []*pbmesh.HTTPRouteFilter{{
-						UrlRewrite: &pbmesh.HTTPURLRewriteFilter{
-							PathPrefix: "/blah",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-		},
-		"filter req+resp header mod is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Filters: []*pbmesh.HTTPRouteFilter{{
-						RequestHeaderModifier:  &pbmesh.HTTPHeaderFilter{},
-						ResponseHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "filters": exactly one of request_header_modifier, response_header_modifier, or url_rewrite`,
-		},
-		"filter req+rewrite header mod is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Filters: []*pbmesh.HTTPRouteFilter{{
-						RequestHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-						UrlRewrite: &pbmesh.HTTPURLRewriteFilter{
-							PathPrefix: "/blah",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "filters": exactly one of request_header_modifier, response_header_modifier, or url_rewrite`,
-		},
-		"filter resp+rewrite header mod is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Filters: []*pbmesh.HTTPRouteFilter{{
-						ResponseHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-						UrlRewrite: &pbmesh.HTTPURLRewriteFilter{
-							PathPrefix: "/blah",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "filters": exactly one of request_header_modifier, response_header_modifier, or url_rewrite`,
-		},
-		"filter req+rewrite on two rules is not allowed": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Filters: []*pbmesh.HTTPRouteFilter{
-						{
-							RequestHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-						},
-						{
-							UrlRewrite: &pbmesh.HTTPURLRewriteFilter{
-								PathPrefix: "/blah",
-							},
-						},
-					},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": exactly one of request_header_modifier or url_rewrite can be set at a time`,
-		},
-		"filter req+resp+rewrite header mod is bad": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Filters: []*pbmesh.HTTPRouteFilter{{
-						RequestHeaderModifier:  &pbmesh.HTTPHeaderFilter{},
-						ResponseHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-						UrlRewrite: &pbmesh.HTTPURLRewriteFilter{
-							PathPrefix: "/blah",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "filters": exactly one of request_header_modifier, response_header_modifier, or url_rewrite`,
-		},
-		"backend ref with filters is unsupported": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-						Filters: []*pbmesh.HTTPRouteFilter{{
-							RequestHeaderModifier: &pbmesh.HTTPHeaderFilter{},
-						}},
-					}},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "backend_refs": invalid "filters" field: filters are not supported at this level yet`,
-		},
-		"nil backend ref": {
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					BackendRefs: []*pbmesh.HTTPBackendRef{nil},
-				}},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 0 of list "backend_refs": invalid "backend_ref" field: missing required field`,
-		},
-	}
-
-	// Add common timeouts test cases.
-	for name, timeoutsTC := range getXRouteTimeoutsTestCases() {
-		cases["timeouts: "+name] = testcase{
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Timeouts: timeoutsTC.timeouts,
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: timeoutsTC.expectErr,
-		}
-	}
-
-	// Add common retries test cases.
-	for name, retriesTC := range getXRouteRetriesTestCases() {
-		cases["retries: "+name] = testcase{
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Retries: retriesTC.retries,
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-					}},
-				}},
-			},
-			expectErr: retriesTC.expectErr,
-		}
-	}
-
-	// Add common parent refs test cases.
-	for name, parentTC := range getXRouteParentRefTestCases() {
-		cases["parent-ref: "+name] = testcase{
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: parentTC.refs,
-			},
-			expectErr: parentTC.expectErr,
-		}
-	}
-	// add common backend ref test cases.
-	for name, backendTC := range getXRouteBackendRefTestCases() {
-		var refs []*pbmesh.HTTPBackendRef
-		for _, br := range backendTC.refs {
-			refs = append(refs, &pbmesh.HTTPBackendRef{
-				BackendRef: br,
-			})
-		}
-		cases["backend-ref: "+name] = testcase{
-			route: &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{
-					{BackendRefs: refs},
-				},
-			},
-			expectErr: backendTC.expectErr,
-		}
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-type xRouteParentRefMutateTestcase struct {
-	routeTenancy *pbresource.Tenancy
-	refs         []*pbmesh.ParentReference
-	expect       []*pbmesh.ParentReference
-}
-
-func getXRouteParentRefMutateTestCases() map[string]xRouteParentRefMutateTestcase {
-	newRef := func(typ *pbresource.Type, tenancyStr, name string) *pbresource.Reference {
-		return resourcetest.Resource(typ, name).
-			WithTenancy(newTestTenancy(tenancyStr)).
-			Reference("")
-	}
-
-	newParentRef := func(typ *pbresource.Type, tenancyStr, name, port string) *pbmesh.ParentReference {
-		return &pbmesh.ParentReference{
-			Ref:  newRef(typ, tenancyStr, name),
-			Port: port,
-		}
-	}
-
-	return map[string]xRouteParentRefMutateTestcase{
-		"parent ref tenancies defaulted": {
-			routeTenancy: newTestTenancy("foo.bar"),
-			refs: []*pbmesh.ParentReference{
-				newParentRef(pbcatalog.ServiceType, "", "api", ""),
-				newParentRef(pbcatalog.ServiceType, ".zim", "api", ""),
-				newParentRef(pbcatalog.ServiceType, "gir.zim", "api", ""),
-			},
-			expect: []*pbmesh.ParentReference{
-				newParentRef(pbcatalog.ServiceType, "foo.bar", "api", ""),
-				newParentRef(pbcatalog.ServiceType, "foo.zim", "api", ""),
-				newParentRef(pbcatalog.ServiceType, "gir.zim", "api", ""),
-			},
-		},
-	}
-}
-
-type xRouteBackendRefMutateTestcase struct {
-	routeTenancy *pbresource.Tenancy
-	refs         []*pbmesh.BackendReference
-	expect       []*pbmesh.BackendReference
-}
-
-func getXRouteBackendRefMutateTestCases() map[string]xRouteBackendRefMutateTestcase {
-	newRef := func(typ *pbresource.Type, tenancyStr, name string) *pbresource.Reference {
-		return resourcetest.Resource(typ, name).
-			WithTenancy(newTestTenancy(tenancyStr)).
-			Reference("")
-	}
-
-	newBackendRef := func(typ *pbresource.Type, tenancyStr, name, port string) *pbmesh.BackendReference {
-		return &pbmesh.BackendReference{
-			Ref:  newRef(typ, tenancyStr, name),
-			Port: port,
-		}
-	}
-
-	return map[string]xRouteBackendRefMutateTestcase{
-		"backend ref tenancies defaulted": {
-			routeTenancy: newTestTenancy("foo.bar"),
-			refs: []*pbmesh.BackendReference{
-				newBackendRef(pbcatalog.ServiceType, "", "api", ""),
-				newBackendRef(pbcatalog.ServiceType, ".zim", "api", ""),
-				newBackendRef(pbcatalog.ServiceType, "gir.zim", "api", ""),
-			},
-			expect: []*pbmesh.BackendReference{
-				newBackendRef(pbcatalog.ServiceType, "foo.bar", "api", ""),
-				newBackendRef(pbcatalog.ServiceType, "foo.zim", "api", ""),
-				newBackendRef(pbcatalog.ServiceType, "gir.zim", "api", ""),
-			},
-		},
-	}
-}
-
-type xRouteParentRefTestcase struct {
-	refs      []*pbmesh.ParentReference
-	expectErr string
-}
-
-func getXRouteParentRefTestCases() map[string]xRouteParentRefTestcase {
-	return map[string]xRouteParentRefTestcase{
-		"no parent refs": {
-			expectErr: `invalid "parent_refs" field: cannot be empty`,
-		},
-		"parent ref with nil ref": {
-			refs: []*pbmesh.ParentReference{
-				newParentRef(pbcatalog.ServiceType, "api", ""),
-				{
-					Ref:  nil,
-					Port: "http",
-				},
-			},
-			expectErr: `invalid element at index 1 of list "parent_refs": invalid "ref" field: missing required field`,
-		},
-		"parent ref with bad type ref": {
-			refs: []*pbmesh.ParentReference{
-				newParentRef(pbcatalog.ServiceType, "api", ""),
-				newParentRef(pbcatalog.WorkloadType, "api", ""),
-			},
-			expectErr: `invalid element at index 1 of list "parent_refs": invalid "ref" field: invalid "type" field: reference must have type catalog.v2beta1.Service`,
-		},
-		"parent ref with section": {
-			refs: []*pbmesh.ParentReference{
-				newParentRef(pbcatalog.ServiceType, "api", ""),
-				{
-					Ref:  resourcetest.Resource(pbcatalog.ServiceType, "web").Reference("section2"),
-					Port: "http",
-				},
-			},
-			expectErr: `invalid element at index 1 of list "parent_refs": invalid "ref" field: invalid "section" field: section cannot be set here`,
-		},
-		"duplicate exact parents": {
-			refs: []*pbmesh.ParentReference{
-				newParentRef(pbcatalog.ServiceType, "api", "http"),
-				newParentRef(pbcatalog.ServiceType, "api", "http"),
-			},
-			expectErr: `invalid element at index 1 of list "parent_refs": invalid "port" field: parent ref "catalog.v2beta1.Service/default.local.default/api" for port "http" exists twice`,
-		},
-		"duplicate wild parents": {
-			refs: []*pbmesh.ParentReference{
-				newParentRef(pbcatalog.ServiceType, "api", ""),
-				newParentRef(pbcatalog.ServiceType, "api", ""),
-			},
-			expectErr: `invalid element at index 1 of list "parent_refs": invalid "port" field: parent ref "catalog.v2beta1.Service/default.local.default/api" for wildcard port exists twice`,
-		},
-		"duplicate parents via exact+wild overlap": {
-			refs: []*pbmesh.ParentReference{
-				newParentRef(pbcatalog.ServiceType, "api", "http"),
-				newParentRef(pbcatalog.ServiceType, "api", ""),
-			},
-			expectErr: `invalid element at index 1 of list "parent_refs": invalid "port" field: parent ref "catalog.v2beta1.Service/default.local.default/api" for ports [http] covered by wildcard port already`,
-		},
-		"duplicate parents via exact+wild overlap (reversed)": {
-			refs: []*pbmesh.ParentReference{
-				newParentRef(pbcatalog.ServiceType, "api", ""),
-				newParentRef(pbcatalog.ServiceType, "api", "http"),
-			},
-			expectErr: `invalid element at index 1 of list "parent_refs": invalid "port" field: parent ref "catalog.v2beta1.Service/default.local.default/api" for port "http" covered by wildcard port already`,
-		},
-		"good single parent ref": {
-			refs: []*pbmesh.ParentReference{
-				newParentRef(pbcatalog.ServiceType, "api", "http"),
-			},
-		},
-		"good muliple parent refs": {
-			refs: []*pbmesh.ParentReference{
-				newParentRef(pbcatalog.ServiceType, "api", "http"),
-				newParentRef(pbcatalog.ServiceType, "web", ""),
-			},
-		},
-	}
-}
-
-type xRouteBackendRefTestcase struct {
-	refs      []*pbmesh.BackendReference
-	expectErr string
-}
-
-func getXRouteBackendRefTestCases() map[string]xRouteBackendRefTestcase {
-	return map[string]xRouteBackendRefTestcase{
-		"no backend refs": {
-			expectErr: `invalid "backend_refs" field: cannot be empty`,
-		},
-		"backend ref with nil ref": {
-			refs: []*pbmesh.BackendReference{
-				newBackendRef(pbcatalog.ServiceType, "api", ""),
-				{
-					Ref:  nil,
-					Port: "http",
-				},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 1 of list "backend_refs": invalid "backend_ref" field: invalid "ref" field: missing required field`,
-		},
-		"backend ref with bad type ref": {
-			refs: []*pbmesh.BackendReference{
-				newBackendRef(pbcatalog.ServiceType, "api", ""),
-				newBackendRef(pbcatalog.WorkloadType, "api", ""),
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 1 of list "backend_refs": invalid "backend_ref" field: invalid "ref" field: invalid "type" field: reference must have type catalog.v2beta1.Service`,
-		},
-		"backend ref with section": {
-			refs: []*pbmesh.BackendReference{
-				newBackendRef(pbcatalog.ServiceType, "api", ""),
-				{
-					Ref:  resourcetest.Resource(pbcatalog.ServiceType, "web").Reference("section2"),
-					Port: "http",
-				},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 1 of list "backend_refs": invalid "backend_ref" field: invalid "ref" field: invalid "section" field: section cannot be set here`,
-		},
-		"backend ref with datacenter": {
-			refs: []*pbmesh.BackendReference{
-				newBackendRef(pbcatalog.ServiceType, "api", ""),
-				{
-					Ref:        newRef(pbcatalog.ServiceType, "db"),
-					Port:       "http",
-					Datacenter: "dc2",
-				},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid element at index 1 of list "backend_refs": invalid "backend_ref" field: invalid "datacenter" field: datacenter is not yet supported on backend refs`,
-		},
-		"good backend ref": {
-			refs: []*pbmesh.BackendReference{
-				newBackendRef(pbcatalog.ServiceType, "api", ""),
-				{
-					Ref:  newRef(pbcatalog.ServiceType, "db"),
-					Port: "http",
-				},
-			},
-		},
-	}
-}
-
-type xRouteTimeoutsTestcase struct {
-	timeouts  *pbmesh.HTTPRouteTimeouts
-	expectErr string
-}
-
-func getXRouteTimeoutsTestCases() map[string]xRouteTimeoutsTestcase {
-	return map[string]xRouteTimeoutsTestcase{
-		"bad request": {
-			timeouts: &pbmesh.HTTPRouteTimeouts{
-				Request: durationpb.New(-1 * time.Second),
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid "timeouts" field: invalid "request" field: timeout cannot be negative: -1s`,
-		},
-		"bad idle": {
-			timeouts: &pbmesh.HTTPRouteTimeouts{
-				Idle: durationpb.New(-1 * time.Second),
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid "timeouts" field: invalid "idle" field: timeout cannot be negative: -1s`,
-		},
-		"good all": {
-			timeouts: &pbmesh.HTTPRouteTimeouts{
-				Request: durationpb.New(1 * time.Second),
-				Idle:    durationpb.New(3 * time.Second),
-			},
-		},
-	}
-}
-
-type xRouteRetriesTestcase struct {
-	retries   *pbmesh.HTTPRouteRetries
-	expectErr string
-}
-
-func getXRouteRetriesTestCases() map[string]xRouteRetriesTestcase {
-	return map[string]xRouteRetriesTestcase{
-		"bad conditions": {
-			retries: &pbmesh.HTTPRouteRetries{
-				OnConditions: []string{"garbage"},
-			},
-			expectErr: `invalid element at index 0 of list "rules": invalid "retries" field: invalid element at index 0 of list "on_conditions": not a valid retry condition: "garbage"`,
-		},
-		"good all": {
-			retries: &pbmesh.HTTPRouteRetries{
-				Number:       wrapperspb.UInt32(5),
-				OnConditions: []string{"internal"},
-			},
-		},
-	}
-}
-
-func newRef(typ *pbresource.Type, name string) *pbresource.Reference {
-	return newRefWithTenancy(typ, nil, name)
-}
-
-func newRefWithTenancy(typ *pbresource.Type, tenancy *pbresource.Tenancy, name string) *pbresource.Reference {
-	if tenancy == nil {
-		tenancy = resource.DefaultNamespacedTenancy()
-	}
-	return resourcetest.Resource(typ, name).
-		WithTenancy(tenancy).
-		Reference("")
-}
-
-func newBackendRef(typ *pbresource.Type, name, port string) *pbmesh.BackendReference {
-	return &pbmesh.BackendReference{
-		Ref:  newRef(typ, name),
-		Port: port,
-	}
-}
-
-func newParentRef(typ *pbresource.Type, name, port string) *pbmesh.ParentReference {
-	return newParentRefWithTenancy(typ, nil, name, port)
-}
-
-func newParentRefWithTenancy(typ *pbresource.Type, tenancy *pbresource.Tenancy, name, port string) *pbmesh.ParentReference {
-	return &pbmesh.ParentReference{
-		Ref:  newRefWithTenancy(typ, tenancy, name),
-		Port: port,
-	}
-}
-
-func newTestTenancy(s string) *pbresource.Tenancy {
-	parts := strings.Split(s, ".")
-	switch len(parts) {
-	case 0:
-		return resource.DefaultClusteredTenancy()
-	case 1:
-		v := resource.DefaultPartitionedTenancy()
-		v.Partition = parts[0]
-		return v
-	case 2:
-		v := resource.DefaultNamespacedTenancy()
-		v.Partition = parts[0]
-		v.Namespace = parts[1]
-		return v
-	default:
-		return &pbresource.Tenancy{Partition: "BAD", Namespace: "BAD", PeerName: "BAD"}
-	}
-}
-
-func TestHTTPRouteACLs(t *testing.T) {
-	testXRouteACLs[*pbmesh.HTTPRoute](t, func(t *testing.T, parentRefs, backendRefs []*pbresource.Reference) *pbresource.Resource {
-		data := &pbmesh.HTTPRoute{
-			ParentRefs: nil,
-		}
-		for _, ref := range parentRefs {
-			data.ParentRefs = append(data.ParentRefs, &pbmesh.ParentReference{
-				Ref: ref,
-			})
-		}
-
-		var ruleRefs []*pbmesh.HTTPBackendRef
-		for _, ref := range backendRefs {
-			ruleRefs = append(ruleRefs, &pbmesh.HTTPBackendRef{
-				BackendRef: &pbmesh.BackendReference{
-					Ref: ref,
-				},
-			})
-		}
-		data.Rules = []*pbmesh.HTTPRouteRule{
-			{BackendRefs: ruleRefs},
-		}
-
-		return resourcetest.Resource(pbmesh.HTTPRouteType, "api-http-route").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).
-			Build()
-	})
-}
diff --git a/internal/mesh/internal/types/intermediate/types.go b/internal/mesh/internal/types/intermediate/types.go
deleted file mode 100644
index 7caef88b76585..0000000000000
--- a/internal/mesh/internal/types/intermediate/types.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package intermediate
-
-import (
-	"github.com/hashicorp/consul/internal/mesh/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// CombinedDestinationRef contains all references we need for a specific
-// destination on the mesh.
-type CombinedDestinationRef struct {
-	// ServiceRef is the reference to the destination service.
-	ServiceRef *pbresource.Reference
-
-	// Port is the port name for this destination.
-	Port string
-
-	// SourceProxies are the reference keys of source proxy state template resources.
-	SourceProxies map[resource.ReferenceKey]struct{}
-
-	// ExplicitDestinationsID is the id of the pbmesh.Destinations resource. For implicit destinations,
-	// this should be nil.
-	ExplicitDestinationsID *pbresource.ID
-}
-
-type Destination struct {
-	Explicit           *pbmesh.Destination
-	Service            *types.DecodedService      // for the name of this destination
-	VirtualIPs         []string                   // for the name of this destination
-	ComputedPortRoutes *pbmesh.ComputedPortRoutes // for the name of this destination
-}
-
-type Status struct {
-	ID         *pbresource.ID
-	Generation string
-	Conditions []*pbresource.Condition
-	OldStatus  map[string]*pbresource.Status
-}
diff --git a/internal/mesh/internal/types/proxy_configuration.go b/internal/mesh/internal/types/proxy_configuration.go
deleted file mode 100644
index baa2f71bdee6c..0000000000000
--- a/internal/mesh/internal/types/proxy_configuration.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-)
-
-func RegisterProxyConfiguration(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:  pbmesh.ProxyConfigurationType,
-		Proto: &pbmesh.ProxyConfiguration{},
-		Scope: resource.ScopeNamespace,
-		// TODO(rb): add validation for proxy configuration
-		Validate: nil,
-	})
-}
diff --git a/internal/mesh/internal/types/proxy_state_template.go b/internal/mesh/internal/types/proxy_state_template.go
deleted file mode 100644
index 010d0f9591b32..0000000000000
--- a/internal/mesh/internal/types/proxy_state_template.go
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterProxyStateTemplate(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbmesh.ProxyStateTemplateType,
-		Proto:    &pbmesh.ProxyStateTemplate{},
-		Scope:    resource.ScopeNamespace,
-		Validate: ValidateProxyStateTemplate,
-		ACLs: &resource.ACLHooks{
-			Read: func(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, id *pbresource.ID, _ *pbresource.Resource) error {
-				// Check service:read and operator:read permissions.
-				// If service:read is not allowed, check operator:read. We want to allow both as this
-				// resource is mostly useful for debuggability and we want to cover
-				// the most cases that serve that purpose.
-				serviceReadErr := authorizer.ToAllowAuthorizer().ServiceReadAllowed(id.Name, authzContext)
-				operatorReadErr := authorizer.ToAllowAuthorizer().OperatorReadAllowed(authzContext)
-
-				switch {
-				case serviceReadErr != nil:
-					return serviceReadErr
-				case operatorReadErr != nil:
-					return operatorReadErr
-				}
-
-				return nil
-			},
-			Write: func(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, p *pbresource.Resource) error {
-				// Require operator:write only for "break-glass" scenarios as this resource should be mostly
-				// managed by a controller.
-				return authorizer.ToAllowAuthorizer().OperatorWriteAllowed(authzContext)
-			},
-			List: func(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext) error {
-				// No-op List permission as we want to default to filtering resources
-				// from the list using the Read enforcement.
-				return nil
-			},
-		},
-	})
-}
-
-func ValidateProxyStateTemplate(res *pbresource.Resource) error {
-	// TODO(v2): validate a lot more of this
-
-	var pst pbmesh.ProxyStateTemplate
-
-	if err := res.Data.UnmarshalTo(&pst); err != nil {
-		return resource.NewErrDataParse(&pst, err)
-	}
-
-	var merr error
-
-	if pst.ProxyState != nil {
-		wrapProxyStateErr := func(err error) error {
-			return resource.ErrInvalidField{
-				Name:    "proxy_state",
-				Wrapped: err,
-			}
-		}
-		for name, cluster := range pst.ProxyState.Clusters {
-			if name == "" {
-				merr = multierror.Append(merr, wrapProxyStateErr(resource.ErrInvalidMapKey{
-					Map:     "clusters",
-					Key:     name,
-					Wrapped: resource.ErrEmpty,
-				}))
-				continue
-			}
-
-			wrapClusterErr := func(err error) error {
-				return wrapProxyStateErr(resource.ErrInvalidMapValue{
-					Map:     "clusters",
-					Key:     name,
-					Wrapped: err,
-				})
-			}
-
-			if name != cluster.Name {
-				merr = multierror.Append(merr, wrapClusterErr(resource.ErrInvalidField{
-					Name:    "name",
-					Wrapped: fmt.Errorf("cluster name %q does not match map key %q", cluster.Name, name),
-				}))
-			}
-
-			wrapGroupErr := func(err error) error {
-				return wrapClusterErr(resource.ErrInvalidField{
-					Name:    "group",
-					Wrapped: err,
-				})
-			}
-
-			if cluster.Group == nil {
-				merr = multierror.Append(merr, wrapGroupErr(resource.ErrMissing))
-			} else {
-				switch x := cluster.Group.(type) {
-				case *pbproxystate.Cluster_EndpointGroup:
-					wrapInnerGroupErr := func(err error) error {
-						return wrapGroupErr(resource.ErrInvalidField{
-							Name:    "endpoint_group",
-							Wrapped: err,
-						})
-					}
-
-					if x.EndpointGroup == nil {
-						merr = multierror.Append(merr, wrapInnerGroupErr(resource.ErrMissing))
-						continue
-					}
-
-					// The inner name field is optional, but if specified it has to
-					// match the enclosing cluster.
-
-					if x.EndpointGroup.Name != "" && x.EndpointGroup.Name != cluster.Name {
-						merr = multierror.Append(merr, wrapInnerGroupErr(resource.ErrInvalidField{
-							Name: "name",
-							Wrapped: fmt.Errorf("optional but %q does not match enclosing cluster name %q",
-								x.EndpointGroup.Name, cluster.Name),
-						}))
-					}
-
-				case *pbproxystate.Cluster_FailoverGroup:
-					wrapInnerGroupErr := func(err error) error {
-						return wrapGroupErr(resource.ErrInvalidField{
-							Name:    "failover_group",
-							Wrapped: err,
-						})
-					}
-
-					if x.FailoverGroup == nil {
-						merr = multierror.Append(merr, wrapInnerGroupErr(resource.ErrMissing))
-						continue
-					}
-
-					if len(x.FailoverGroup.EndpointGroups) == 0 {
-						merr = multierror.Append(merr, wrapInnerGroupErr(resource.ErrInvalidField{
-							Name:    "endpoint_groups",
-							Wrapped: resource.ErrEmpty,
-						}))
-					}
-
-					for i, eg := range x.FailoverGroup.EndpointGroups {
-						wrapFailoverEndpointGroupErr := func(err error) error {
-							return wrapInnerGroupErr(resource.ErrInvalidListElement{
-								Name:    "endpoint_groups",
-								Index:   i,
-								Wrapped: err,
-							})
-						}
-						// The inner name field is required and cannot match the enclosing cluster.
-						switch {
-						case eg.Name == "":
-							merr = multierror.Append(merr, wrapFailoverEndpointGroupErr(resource.ErrInvalidField{
-								Name:    "name",
-								Wrapped: resource.ErrEmpty,
-							}))
-						case eg.Name == cluster.Name:
-							merr = multierror.Append(merr, wrapFailoverEndpointGroupErr(resource.ErrInvalidField{
-								Name: "name",
-								Wrapped: fmt.Errorf(
-									"name cannot be the same as the enclosing cluster %q",
-									eg.Name,
-								),
-							}))
-						}
-					}
-				default:
-					merr = multierror.Append(merr, wrapGroupErr(fmt.Errorf("unknown type: %T", cluster.Group)))
-				}
-			}
-		}
-	}
-
-	return merr
-}
diff --git a/internal/mesh/internal/types/proxy_state_template_test.go b/internal/mesh/internal/types/proxy_state_template_test.go
deleted file mode 100644
index 3f0216436f4e2..0000000000000
--- a/internal/mesh/internal/types/proxy_state_template_test.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestValidateProxyStateTemplate(t *testing.T) {
-	type testcase struct {
-		pst       *pbmesh.ProxyStateTemplate
-		expectErr string
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		res := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "api").
-			WithData(t, tc.pst).
-			Build()
-
-		err := ValidateProxyStateTemplate(res)
-
-		// Verify that validate didn't actually change the object.
-		got := resourcetest.MustDecode[*pbmesh.ProxyStateTemplate](t, res)
-		prototest.AssertDeepEqual(t, tc.pst, got.Data)
-
-		if tc.expectErr == "" {
-			require.NoError(t, err)
-		} else {
-			testutil.RequireErrorContains(t, err, tc.expectErr)
-		}
-	}
-
-	pstForCluster := func(name string, cluster *pbproxystate.Cluster) *pbmesh.ProxyStateTemplate {
-		return &pbmesh.ProxyStateTemplate{
-			ProxyState: &pbmesh.ProxyState{
-				Clusters: map[string]*pbproxystate.Cluster{
-					name: cluster,
-				},
-			},
-		}
-	}
-
-	clusterForGroups := func(name string, groups ...*pbproxystate.EndpointGroup) *pbproxystate.Cluster {
-		cluster := &pbproxystate.Cluster{
-			Name: name,
-		}
-
-		require.NotEmpty(t, groups)
-
-		if len(groups) == 1 {
-			cluster.Group = &pbproxystate.Cluster_EndpointGroup{
-				EndpointGroup: groups[0],
-			}
-		} else {
-			cluster.Group = &pbproxystate.Cluster_FailoverGroup{
-				FailoverGroup: &pbproxystate.FailoverGroup{
-					EndpointGroups: groups,
-				},
-			}
-		}
-		return cluster
-	}
-
-	endpointGroup := func(name string) *pbproxystate.EndpointGroup {
-		return &pbproxystate.EndpointGroup{
-			Name: name,
-			Group: &pbproxystate.EndpointGroup_Dynamic{
-				Dynamic: &pbproxystate.DynamicEndpointGroup{},
-			},
-		}
-	}
-
-	// also cover clusters with names that don't match the map key
-	// also empty map keys
-	cases := map[string]testcase{
-		// ============== COMMON ==============
-		"cluster with missing cluster group": {
-			pst: pstForCluster("api-cluster", &pbproxystate.Cluster{
-				Name: "api-cluster",
-			}),
-			expectErr: `invalid "proxy_state" field: invalid value of key "api-cluster" within clusters: invalid "group" field: missing required field`,
-		},
-		// ============== STANDARD ==============
-		"standard cluster with empty map key": {
-			pst: pstForCluster("", clusterForGroups("api-cluster",
-				endpointGroup(""),
-			)),
-			expectErr: `invalid "proxy_state" field: map clusters contains an invalid key - "": cannot be empty`,
-		},
-		"standard cluster with missing cluster name": {
-			pst: pstForCluster("api-cluster", clusterForGroups("",
-				endpointGroup(""),
-			)),
-			expectErr: `invalid "proxy_state" field: invalid value of key "api-cluster" within clusters: invalid "name" field: cluster name "" does not match map key "api-cluster"`,
-		},
-		"standard cluster with empty endpoint group name": {
-			pst: pstForCluster("api-cluster", clusterForGroups("api-cluster",
-				endpointGroup(""),
-			)),
-		},
-		"standard cluster with same endpoint group name": {
-			pst: pstForCluster("api-cluster", clusterForGroups("api-cluster",
-				endpointGroup("api-cluster"),
-			)),
-		},
-		"standard cluster with different endpoint group name": {
-			pst: pstForCluster("api-cluster", clusterForGroups("api-cluster",
-				endpointGroup("garbage"),
-			)),
-			expectErr: `invalid "proxy_state" field: invalid value of key "api-cluster" within clusters: invalid "group" field: invalid "endpoint_group" field: invalid "name" field: optional but "garbage" does not match enclosing cluster name "api-cluster"`,
-		},
-		// ============== FAILOVER ==============
-		"failover cluster with empty map key": {
-			pst: pstForCluster("", clusterForGroups("api-cluster",
-				endpointGroup("api-cluster~0"),
-				endpointGroup("api-cluster~1"),
-			)),
-			expectErr: `invalid "proxy_state" field: map clusters contains an invalid key - "": cannot be empty`,
-		},
-		"failover cluster with missing cluster name": {
-			pst: pstForCluster("api-cluster", clusterForGroups("",
-				endpointGroup("api-cluster~0"),
-				endpointGroup("api-cluster~1"),
-			)),
-			expectErr: `invalid "proxy_state" field: invalid value of key "api-cluster" within clusters: invalid "name" field: cluster name "" does not match map key "api-cluster"`,
-		},
-		"failover cluster with empty endpoint group name": {
-			pst: pstForCluster("api-cluster", clusterForGroups("api-cluster",
-				endpointGroup("api-cluster~0"),
-				endpointGroup(""),
-			)),
-			expectErr: `invalid "proxy_state" field: invalid value of key "api-cluster" within clusters: invalid "group" field: invalid "failover_group" field: invalid element at index 1 of list "endpoint_groups": invalid "name" field: cannot be empty`,
-		},
-		"failover cluster with same endpoint group name": {
-			pst: pstForCluster("api-cluster", clusterForGroups("api-cluster",
-				endpointGroup("api-cluster~0"),
-				endpointGroup("api-cluster"),
-			)),
-			expectErr: `invalid "proxy_state" field: invalid value of key "api-cluster" within clusters: invalid "group" field: invalid "failover_group" field: invalid element at index 1 of list "endpoint_groups": invalid "name" field: name cannot be the same as the enclosing cluster "api-cluster"`,
-		},
-		"failover cluster with no groups": {
-			pst: pstForCluster("api-cluster", &pbproxystate.Cluster{
-				Name: "api-cluster",
-				Group: &pbproxystate.Cluster_FailoverGroup{
-					FailoverGroup: &pbproxystate.FailoverGroup{
-						EndpointGroups: nil,
-					},
-				},
-			}),
-			expectErr: `invalid "proxy_state" field: invalid value of key "api-cluster" within clusters: invalid "group" field: invalid "failover_group" field: invalid "endpoint_groups" field: cannot be empty`,
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			t.Logf("%+v", tc.pst)
-			run(t, tc)
-		})
-	}
-}
diff --git a/internal/mesh/internal/types/tcp_route.go b/internal/mesh/internal/types/tcp_route.go
deleted file mode 100644
index e8a7b361ee6c9..0000000000000
--- a/internal/mesh/internal/types/tcp_route.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterTCPRoute(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbmesh.TCPRouteType,
-		Proto:    &pbmesh.TCPRoute{},
-		Scope:    resource.ScopeNamespace,
-		Mutate:   MutateTCPRoute,
-		Validate: ValidateTCPRoute,
-		ACLs:     xRouteACLHooks[*pbmesh.TCPRoute](),
-	})
-}
-
-func MutateTCPRoute(res *pbresource.Resource) error {
-	var route pbmesh.TCPRoute
-
-	if err := res.Data.UnmarshalTo(&route); err != nil {
-		return resource.NewErrDataParse(&route, err)
-	}
-
-	changed := false
-
-	if mutateParentRefs(res.Id.Tenancy, route.ParentRefs) {
-		changed = true
-	}
-
-	for _, rule := range route.Rules {
-		for _, backend := range rule.BackendRefs {
-			if backend.BackendRef == nil || backend.BackendRef.Ref == nil {
-				continue
-			}
-			if mutateXRouteRef(res.Id.Tenancy, backend.BackendRef.Ref) {
-				changed = true
-			}
-		}
-	}
-
-	if !changed {
-		return nil
-	}
-
-	return res.Data.MarshalFrom(&route)
-}
-
-func ValidateTCPRoute(res *pbresource.Resource) error {
-	var route pbmesh.TCPRoute
-
-	if err := res.Data.UnmarshalTo(&route); err != nil {
-		return resource.NewErrDataParse(&route, err)
-	}
-
-	var merr error
-
-	if err := validateParentRefs(route.ParentRefs); err != nil {
-		merr = multierror.Append(merr, err)
-	}
-
-	if len(route.Rules) > 1 {
-		merr = multierror.Append(merr, resource.ErrInvalidField{
-			Name:    "rules",
-			Wrapped: fmt.Errorf("must only specify a single rule for now"),
-		})
-	}
-
-	for i, rule := range route.Rules {
-		wrapRuleErr := func(err error) error {
-			return resource.ErrInvalidListElement{
-				Name:    "rules",
-				Index:   i,
-				Wrapped: err,
-			}
-		}
-
-		if len(rule.BackendRefs) == 0 {
-			merr = multierror.Append(merr, wrapRuleErr(
-				resource.ErrInvalidField{
-					Name:    "backend_refs",
-					Wrapped: resource.ErrEmpty,
-				},
-			))
-		}
-		for j, hbref := range rule.BackendRefs {
-			wrapBackendRefErr := func(err error) error {
-				return wrapRuleErr(resource.ErrInvalidListElement{
-					Name:    "backend_refs",
-					Index:   j,
-					Wrapped: err,
-				})
-			}
-
-			wrapBackendRefFieldErr := func(err error) error {
-				return wrapBackendRefErr(resource.ErrInvalidField{
-					Name:    "backend_ref",
-					Wrapped: err,
-				})
-			}
-			if err := validateBackendRef(hbref.BackendRef, wrapBackendRefFieldErr); err != nil {
-				merr = multierror.Append(merr, err)
-			}
-		}
-	}
-
-	return merr
-}
diff --git a/internal/mesh/internal/types/tcp_route_test.go b/internal/mesh/internal/types/tcp_route_test.go
deleted file mode 100644
index 10f30deb5c3eb..0000000000000
--- a/internal/mesh/internal/types/tcp_route_test.go
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestMutateTCPRoute(t *testing.T) {
-	type testcase struct {
-		routeTenancy *pbresource.Tenancy
-		route        *pbmesh.TCPRoute
-		expect       *pbmesh.TCPRoute
-	}
-
-	cases := map[string]testcase{}
-
-	// Add common parent refs test cases.
-	for name, parentTC := range getXRouteParentRefMutateTestCases() {
-		cases["parent-ref: "+name] = testcase{
-			routeTenancy: parentTC.routeTenancy,
-			route: &pbmesh.TCPRoute{
-				ParentRefs: parentTC.refs,
-			},
-			expect: &pbmesh.TCPRoute{
-				ParentRefs: parentTC.expect,
-			},
-		}
-	}
-	// add common backend ref test cases.
-	for name, backendTC := range getXRouteBackendRefMutateTestCases() {
-		var (
-			refs   []*pbmesh.TCPBackendRef
-			expect []*pbmesh.TCPBackendRef
-		)
-		for _, br := range backendTC.refs {
-			refs = append(refs, &pbmesh.TCPBackendRef{
-				BackendRef: br,
-			})
-		}
-		for _, br := range backendTC.expect {
-			expect = append(expect, &pbmesh.TCPBackendRef{
-				BackendRef: br,
-			})
-		}
-		cases["backend-ref: "+name] = testcase{
-			routeTenancy: backendTC.routeTenancy,
-			route: &pbmesh.TCPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.TCPRouteRule{
-					{BackendRefs: refs},
-				},
-			},
-			expect: &pbmesh.TCPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.TCPRouteRule{
-					{BackendRefs: expect},
-				},
-			},
-		}
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		res := resourcetest.Resource(pbmesh.TCPRouteType, "api").
-			WithTenancy(tc.routeTenancy).
-			WithData(t, tc.route).
-			Build()
-
-		err := MutateTCPRoute(res)
-		require.NoError(t, err)
-
-		got := resourcetest.MustDecode[*pbmesh.TCPRoute](t, res)
-
-		if tc.expect == nil {
-			tc.expect = proto.Clone(tc.route).(*pbmesh.TCPRoute)
-		}
-
-		prototest.AssertDeepEqual(t, tc.expect, got.Data)
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func TestValidateTCPRoute(t *testing.T) {
-	type testcase struct {
-		route     *pbmesh.TCPRoute
-		expectErr string
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		res := resourcetest.Resource(pbmesh.TCPRouteType, "api").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, tc.route).
-			Build()
-
-		// Ensure things are properly mutated and updated in the inputs.
-		err := MutateTCPRoute(res)
-		require.NoError(t, err)
-		{
-			mutated := resourcetest.MustDecode[*pbmesh.TCPRoute](t, res)
-			tc.route = mutated.Data
-		}
-
-		err = ValidateTCPRoute(res)
-
-		// Verify that validate didn't actually change the object.
-		got := resourcetest.MustDecode[*pbmesh.TCPRoute](t, res)
-		prototest.AssertDeepEqual(t, tc.route, got.Data)
-
-		if tc.expectErr == "" {
-			require.NoError(t, err)
-		} else {
-			testutil.RequireErrorContains(t, err, tc.expectErr)
-		}
-	}
-
-	cases := map[string]testcase{
-		"no rules": {
-			route: &pbmesh.TCPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-			},
-		},
-		"more than one rule": {
-			route: &pbmesh.TCPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.TCPRouteRule{
-					{
-						BackendRefs: []*pbmesh.TCPBackendRef{{
-							BackendRef: newBackendRef(pbcatalog.ServiceType, "api", ""),
-						}},
-					},
-					{
-						BackendRefs: []*pbmesh.TCPBackendRef{{
-							BackendRef: newBackendRef(pbcatalog.ServiceType, "db", ""),
-						}},
-					},
-				},
-			},
-			expectErr: `invalid "rules" field: must only specify a single rule for now`,
-		},
-	}
-
-	// Add common parent refs test cases.
-	for name, parentTC := range getXRouteParentRefTestCases() {
-		cases["parent-ref: "+name] = testcase{
-			route: &pbmesh.TCPRoute{
-				ParentRefs: parentTC.refs,
-			},
-			expectErr: parentTC.expectErr,
-		}
-	}
-	// add common backend ref test cases.
-	for name, backendTC := range getXRouteBackendRefTestCases() {
-		var refs []*pbmesh.TCPBackendRef
-		for _, br := range backendTC.refs {
-			refs = append(refs, &pbmesh.TCPBackendRef{
-				BackendRef: br,
-			})
-		}
-		cases["backend-ref: "+name] = testcase{
-			route: &pbmesh.TCPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(pbcatalog.ServiceType, "web", ""),
-				},
-				Rules: []*pbmesh.TCPRouteRule{
-					{BackendRefs: refs},
-				},
-			},
-			expectErr: backendTC.expectErr,
-		}
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func TestTCPRouteACLs(t *testing.T) {
-	testXRouteACLs[*pbmesh.TCPRoute](t, func(t *testing.T, parentRefs, backendRefs []*pbresource.Reference) *pbresource.Resource {
-		data := &pbmesh.TCPRoute{
-			ParentRefs: nil,
-		}
-		for _, ref := range parentRefs {
-			data.ParentRefs = append(data.ParentRefs, &pbmesh.ParentReference{
-				Ref: ref,
-			})
-		}
-
-		var ruleRefs []*pbmesh.TCPBackendRef
-		for _, ref := range backendRefs {
-			ruleRefs = append(ruleRefs, &pbmesh.TCPBackendRef{
-				BackendRef: &pbmesh.BackendReference{
-					Ref: ref,
-				},
-			})
-		}
-		data.Rules = []*pbmesh.TCPRouteRule{
-			{BackendRefs: ruleRefs},
-		}
-
-		return resourcetest.Resource(pbmesh.TCPRouteType, "api-tcp-route").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).
-			Build()
-	})
-}
diff --git a/internal/mesh/internal/types/types.go b/internal/mesh/internal/types/types.go
deleted file mode 100644
index 202989262901c..0000000000000
--- a/internal/mesh/internal/types/types.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-)
-
-func Register(r resource.Registry) {
-	RegisterProxyConfiguration(r)
-	RegisterComputedProxyConfiguration(r)
-	RegisterUpstreams(r)
-	RegisterUpstreamsConfiguration(r)
-	RegisterProxyStateTemplate(r)
-	RegisterHTTPRoute(r)
-	RegisterTCPRoute(r)
-	RegisterGRPCRoute(r)
-	RegisterDestinationPolicy(r)
-	RegisterComputedRoutes(r)
-}
diff --git a/internal/mesh/internal/types/types_test.go b/internal/mesh/internal/types/types_test.go
deleted file mode 100644
index 631e1b4be8d0a..0000000000000
--- a/internal/mesh/internal/types/types_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func TestTypeRegistration(t *testing.T) {
-	// This test will ensure that all the required types have been registered
-	// It is not trying to determine whether the settings for the registrations
-	// are correct as that would amount more or less to hardcoding structs
-	// from types.go a second time here.
-	requiredKinds := []string{
-		pbmesh.ProxyConfigurationKind,
-		pbmesh.DestinationsKind,
-		pbmesh.DestinationsConfigurationKind,
-		pbmesh.ProxyStateTemplateKind,
-		pbmesh.HTTPRouteKind,
-		pbmesh.TCPRouteKind,
-		pbmesh.GRPCRouteKind,
-		pbmesh.DestinationPolicyKind,
-		pbmesh.ComputedRoutesKind,
-	}
-
-	r := resource.NewRegistry()
-	Register(r)
-
-	for _, kind := range requiredKinds {
-		t.Run(kind, func(t *testing.T) {
-			registration, ok := r.Resolve(&pbresource.Type{
-				Group:        pbmesh.GroupName,
-				GroupVersion: pbmesh.Version,
-				Kind:         kind,
-			})
-
-			require.True(t, ok, "Resource kind %s has not been registered to the type registry", kind)
-			require.NotNil(t, registration, "Registration for %s was found but is nil", kind)
-		})
-	}
-}
diff --git a/internal/mesh/internal/types/util.go b/internal/mesh/internal/types/util.go
deleted file mode 100644
index a484f0943f8d6..0000000000000
--- a/internal/mesh/internal/types/util.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func IsRouteType(typ *pbresource.Type) bool {
-	return IsHTTPRouteType(typ) ||
-		IsGRPCRouteType(typ) ||
-		IsTCPRouteType(typ)
-}
-
-func IsHTTPRouteType(typ *pbresource.Type) bool {
-	switch {
-	case resource.EqualType(typ, pbmesh.HTTPRouteType):
-		return true
-	}
-	return false
-}
-
-func IsGRPCRouteType(typ *pbresource.Type) bool {
-	switch {
-	case resource.EqualType(typ, pbmesh.GRPCRouteType):
-		return true
-	}
-	return false
-}
-
-func IsTCPRouteType(typ *pbresource.Type) bool {
-	switch {
-	case resource.EqualType(typ, pbmesh.TCPRouteType):
-		return true
-	}
-	return false
-}
-
-func IsFailoverPolicyType(typ *pbresource.Type) bool {
-	switch {
-	case resource.EqualType(typ, pbcatalog.FailoverPolicyType):
-		return true
-	}
-	return false
-}
-
-func IsDestinationPolicyType(typ *pbresource.Type) bool {
-	switch {
-	case resource.EqualType(typ, pbmesh.DestinationPolicyType):
-		return true
-	}
-	return false
-}
-
-func IsServiceType(typ *pbresource.Type) bool {
-	switch {
-	case resource.EqualType(typ, pbcatalog.ServiceType):
-		return true
-	}
-	return false
-}
-
-func IsComputedRoutesType(typ *pbresource.Type) bool {
-	switch {
-	case resource.EqualType(typ, pbmesh.ComputedRoutesType):
-		return true
-	}
-	return false
-}
-
-// BackendRefToComputedRoutesTarget turns the provided BackendReference into an
-// opaque string format suitable for use as a map key and reference in a
-// standalone object or reference.
-//
-// It is opaque in that the caller should not attempt to parse it, and there is
-// no implied storage or wire compatibility concern, since the data is treated
-// opaquely at use time.
-func BackendRefToComputedRoutesTarget(backendRef *pbmesh.BackendReference) string {
-	ref := backendRef.Ref
-
-	s := fmt.Sprintf(
-		"%s/%s/%s?port=%s",
-		resource.TypeToString(ref.Type),
-		resource.TenancyToString(ref.Tenancy),
-		ref.Name,
-		backendRef.Port,
-	)
-
-	if backendRef.Datacenter != "" {
-		s += "&dc=" + backendRef.Datacenter
-	}
-
-	return s
-}
diff --git a/internal/mesh/internal/types/xroute.go b/internal/mesh/internal/types/xroute.go
deleted file mode 100644
index 449e58b393764..0000000000000
--- a/internal/mesh/internal/types/xroute.go
+++ /dev/null
@@ -1,353 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/hashicorp/go-multierror"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/catalog"
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type XRouteData interface {
-	proto.Message
-	XRouteWithRefs
-}
-
-type XRouteWithRefs interface {
-	GetParentRefs() []*pbmesh.ParentReference
-	GetUnderlyingBackendRefs() []*pbmesh.BackendReference
-}
-
-type portedRefKey struct {
-	Key  resource.ReferenceKey
-	Port string
-}
-
-func mutateParentRefs(xrouteTenancy *pbresource.Tenancy, parentRefs []*pbmesh.ParentReference) (changed bool) {
-	for _, parent := range parentRefs {
-		if parent.Ref == nil {
-			continue
-		}
-		changedThis := mutateXRouteRef(xrouteTenancy, parent.Ref)
-		if changedThis {
-			changed = true
-		}
-	}
-	return changed
-}
-
-func mutateXRouteRef(xrouteTenancy *pbresource.Tenancy, ref *pbresource.Reference) (changed bool) {
-	if ref == nil {
-		return false
-	}
-	orig := proto.Clone(ref).(*pbresource.Reference)
-	resource.DefaultReferenceTenancy(
-		ref,
-		xrouteTenancy,
-		resource.DefaultNamespacedTenancy(), // All xRoutes are namespace scoped.
-	)
-
-	return !proto.Equal(orig, ref)
-}
-
-func validateParentRefs(parentRefs []*pbmesh.ParentReference) error {
-	var merr error
-	if len(parentRefs) == 0 {
-		merr = multierror.Append(merr, resource.ErrInvalidField{
-			Name:    "parent_refs",
-			Wrapped: resource.ErrEmpty,
-		})
-	}
-
-	var (
-		seen    = make(map[portedRefKey]struct{})
-		seenAny = make(map[resource.ReferenceKey][]string)
-	)
-	for i, parent := range parentRefs {
-		wrapErr := func(err error) error {
-			return resource.ErrInvalidListElement{
-				Name:    "parent_refs",
-				Index:   i,
-				Wrapped: err,
-			}
-		}
-
-		wrapRefErr := func(err error) error {
-			return wrapErr(resource.ErrInvalidField{
-				Name:    "ref",
-				Wrapped: err,
-			})
-		}
-
-		if err := catalog.ValidateLocalServiceRefNoSection(parent.Ref, wrapRefErr); err != nil {
-			merr = multierror.Append(merr, err)
-		} else {
-			prk := portedRefKey{
-				Key:  resource.NewReferenceKey(parent.Ref),
-				Port: parent.Port,
-			}
-
-			_, portExist := seen[prk]
-
-			if parent.Port == "" {
-				coveredPorts, exactExists := seenAny[prk.Key]
-
-				if portExist { // check for duplicate wild
-					merr = multierror.Append(merr, wrapErr(
-						resource.ErrInvalidField{
-							Name: "port",
-							Wrapped: fmt.Errorf(
-								"parent ref %q for wildcard port exists twice",
-								resource.ReferenceToString(parent.Ref),
-							),
-						},
-					))
-				} else if exactExists { // check for existing exact
-					merr = multierror.Append(merr, wrapErr(
-						resource.ErrInvalidField{
-							Name: "port",
-							Wrapped: fmt.Errorf(
-								"parent ref %q for ports %v covered by wildcard port already",
-								resource.ReferenceToString(parent.Ref),
-								coveredPorts,
-							),
-						},
-					))
-				} else {
-					seen[prk] = struct{}{}
-				}
-
-			} else {
-				prkWild := prk
-				prkWild.Port = ""
-				_, wildExist := seen[prkWild]
-
-				if portExist { // check for duplicate exact
-					merr = multierror.Append(merr, wrapErr(
-						resource.ErrInvalidField{
-							Name: "port",
-							Wrapped: fmt.Errorf(
-								"parent ref %q for port %q exists twice",
-								resource.ReferenceToString(parent.Ref),
-								parent.Port,
-							),
-						},
-					))
-				} else if wildExist { // check for existing wild
-					merr = multierror.Append(merr, wrapErr(
-						resource.ErrInvalidField{
-							Name: "port",
-							Wrapped: fmt.Errorf(
-								"parent ref %q for port %q covered by wildcard port already",
-								resource.ReferenceToString(parent.Ref),
-								parent.Port,
-							),
-						},
-					))
-				} else {
-					seen[prk] = struct{}{}
-					seenAny[prk.Key] = append(seenAny[prk.Key], parent.Port)
-				}
-			}
-		}
-	}
-
-	return merr
-}
-
-func validateBackendRef(backendRef *pbmesh.BackendReference, wrapErr func(error) error) error {
-	if backendRef == nil {
-		return wrapErr(resource.ErrMissing)
-	}
-
-	var merr error
-
-	wrapRefErr := func(err error) error {
-		return wrapErr(resource.ErrInvalidField{
-			Name:    "ref",
-			Wrapped: err,
-		})
-	}
-	if err := catalog.ValidateLocalServiceRefNoSection(backendRef.Ref, wrapRefErr); err != nil {
-		merr = multierror.Append(merr, err)
-	}
-	if backendRef.Datacenter != "" {
-		merr = multierror.Append(merr, wrapErr(resource.ErrInvalidField{
-			Name:    "datacenter",
-			Wrapped: errors.New("datacenter is not yet supported on backend refs"),
-		}))
-	}
-
-	return merr
-}
-
-func validateHeaderMatchType(typ pbmesh.HeaderMatchType) error {
-	// enumcover:pbmesh.HeaderMatchType
-	switch typ {
-	case pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_UNSPECIFIED:
-		return resource.ErrMissing
-	case pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_EXACT:
-	case pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_REGEX:
-	case pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_PRESENT:
-	case pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_PREFIX:
-	case pbmesh.HeaderMatchType_HEADER_MATCH_TYPE_SUFFIX:
-	default:
-		return fmt.Errorf("not a supported enum value: %v", typ)
-	}
-	return nil
-}
-
-func errTimeoutCannotBeNegative(d time.Duration) error {
-	return fmt.Errorf("timeout cannot be negative: %v", d)
-}
-
-func validateHTTPTimeouts(timeouts *pbmesh.HTTPRouteTimeouts) []error {
-	if timeouts == nil {
-		return nil
-	}
-
-	var errs []error
-
-	if timeouts.Request != nil {
-		val := timeouts.Request.AsDuration()
-		if val < 0 {
-			errs = append(errs, resource.ErrInvalidField{
-				Name:    "request",
-				Wrapped: errTimeoutCannotBeNegative(val),
-			})
-		}
-	}
-	if timeouts.Idle != nil {
-		val := timeouts.Idle.AsDuration()
-		if val < 0 {
-			errs = append(errs, resource.ErrInvalidField{
-				Name:    "idle",
-				Wrapped: errTimeoutCannotBeNegative(val),
-			})
-		}
-	}
-
-	return errs
-}
-
-func validateHTTPRetries(retries *pbmesh.HTTPRouteRetries) []error {
-	if retries == nil {
-		return nil
-	}
-
-	var errs []error
-
-	for i, condition := range retries.OnConditions {
-		if !isValidRetryCondition(condition) {
-			errs = append(errs, resource.ErrInvalidListElement{
-				Name:    "on_conditions",
-				Index:   i,
-				Wrapped: fmt.Errorf("not a valid retry condition: %q", condition),
-			})
-		}
-	}
-
-	return errs
-}
-
-func isValidRetryCondition(retryOn string) bool {
-	switch retryOn {
-	case "5xx",
-		"gateway-error",
-		"reset",
-		"connect-failure",
-		"envoy-ratelimited",
-		"retriable-4xx",
-		"refused-stream",
-		"cancelled",
-		"deadline-exceeded",
-		"internal",
-		"resource-exhausted",
-		"unavailable":
-		return true
-	default:
-		return false
-	}
-}
-
-func xRouteACLHooks[R XRouteData]() *resource.ACLHooks {
-	hooks := &resource.ACLHooks{
-		Read:  aclReadHookXRoute[R],
-		Write: aclWriteHookXRoute[R],
-		List:  aclListHookXRoute[R],
-	}
-
-	return hooks
-}
-
-func aclReadHookXRoute[R XRouteData](authorizer acl.Authorizer, _ *acl.AuthorizerContext, _ *pbresource.ID, res *pbresource.Resource) error {
-	if res == nil {
-		return resource.ErrNeedData
-	}
-
-	dec, err := resource.Decode[R](res)
-	if err != nil {
-		return err
-	}
-
-	route := dec.Data
-
-	// Need service:read on ALL of the services this is controlling traffic for.
-	for _, parentRef := range route.GetParentRefs() {
-		parentAuthzContext := resource.AuthorizerContext(parentRef.Ref.GetTenancy())
-		parentServiceName := parentRef.Ref.GetName()
-
-		if err := authorizer.ToAllowAuthorizer().ServiceReadAllowed(parentServiceName, parentAuthzContext); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func aclWriteHookXRoute[R XRouteData](authorizer acl.Authorizer, _ *acl.AuthorizerContext, res *pbresource.Resource) error {
-	dec, err := resource.Decode[R](res)
-	if err != nil {
-		return err
-	}
-
-	route := dec.Data
-
-	// Need service:write on ALL of the services this is controlling traffic for.
-	for _, parentRef := range route.GetParentRefs() {
-		parentAuthzContext := resource.AuthorizerContext(parentRef.Ref.GetTenancy())
-		parentServiceName := parentRef.Ref.GetName()
-
-		if err := authorizer.ToAllowAuthorizer().ServiceWriteAllowed(parentServiceName, parentAuthzContext); err != nil {
-			return err
-		}
-	}
-
-	// Need service:read on ALL of the services this directs traffic at.
-	for _, backendRef := range route.GetUnderlyingBackendRefs() {
-		backendAuthzContext := resource.AuthorizerContext(backendRef.Ref.GetTenancy())
-		backendServiceName := backendRef.Ref.GetName()
-
-		if err := authorizer.ToAllowAuthorizer().ServiceReadAllowed(backendServiceName, backendAuthzContext); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func aclListHookXRoute[R XRouteData](authorizer acl.Authorizer, authzContext *acl.AuthorizerContext) error {
-	// No-op List permission as we want to default to filtering resources
-	// from the list using the Read enforcement.
-	return nil
-}
diff --git a/internal/mesh/internal/types/xroute_test.go b/internal/mesh/internal/types/xroute_test.go
deleted file mode 100644
index 67674aac147fa..0000000000000
--- a/internal/mesh/internal/types/xroute_test.go
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func testXRouteACLs[R XRouteData](t *testing.T, newRoute func(t *testing.T, parentRefs, backendRefs []*pbresource.Reference) *pbresource.Resource) {
-	// Wire up a registry to generically invoke hooks
-	registry := resource.NewRegistry()
-	Register(registry)
-
-	userNewRoute := newRoute
-	newRoute = func(t *testing.T, parentRefs, backendRefs []*pbresource.Reference) *pbresource.Resource {
-		res := userNewRoute(t, parentRefs, backendRefs)
-		resourcetest.ValidateAndNormalize(t, registry, res)
-		return res
-	}
-
-	type testcase struct {
-		res     *pbresource.Resource
-		rules   string
-		check   func(t *testing.T, authz acl.Authorizer, res *pbresource.Resource)
-		readOK  string
-		writeOK string
-	}
-
-	const (
-		DENY    = "deny"
-		ALLOW   = "allow"
-		DEFAULT = "default"
-	)
-
-	checkF := func(t *testing.T, name string, expect string, got error) {
-		switch expect {
-		case ALLOW:
-			if acl.IsErrPermissionDenied(got) {
-				t.Fatal(name + " should be allowed")
-			}
-		case DENY:
-			if !acl.IsErrPermissionDenied(got) {
-				t.Fatal(name + " should be denied")
-			}
-		case DEFAULT:
-			require.Nil(t, got, name+" expected fallthrough decision")
-		default:
-			t.Fatalf(name+" unexpected expectation: %q", expect)
-		}
-	}
-
-	resOneParentOneBackend := newRoute(t,
-		[]*pbresource.Reference{
-			newRef(pbcatalog.ServiceType, "api1"),
-		},
-		[]*pbresource.Reference{
-			newRef(pbcatalog.ServiceType, "backend1"),
-		},
-	)
-	resTwoParentsOneBackend := newRoute(t,
-		[]*pbresource.Reference{
-			newRef(pbcatalog.ServiceType, "api1"),
-			newRef(pbcatalog.ServiceType, "api2"),
-		},
-		[]*pbresource.Reference{
-			newRef(pbcatalog.ServiceType, "backend1"),
-		},
-	)
-	resOneParentTwoBackends := newRoute(t,
-		[]*pbresource.Reference{
-			newRef(pbcatalog.ServiceType, "api1"),
-		},
-		[]*pbresource.Reference{
-			newRef(pbcatalog.ServiceType, "backend1"),
-			newRef(pbcatalog.ServiceType, "backend2"),
-		},
-	)
-	resTwoParentsTwoBackends := newRoute(t,
-		[]*pbresource.Reference{
-			newRef(pbcatalog.ServiceType, "api1"),
-			newRef(pbcatalog.ServiceType, "api2"),
-		},
-		[]*pbresource.Reference{
-			newRef(pbcatalog.ServiceType, "backend1"),
-			newRef(pbcatalog.ServiceType, "backend2"),
-		},
-	)
-
-	run := func(t *testing.T, name string, tc testcase) {
-		t.Run(name, func(t *testing.T) {
-			config := acl.Config{
-				WildcardName: structs.WildcardSpecifier,
-			}
-			authz, err := acl.NewAuthorizerFromRules(tc.rules, &config, nil)
-			require.NoError(t, err)
-			authz = acl.NewChainedAuthorizer([]acl.Authorizer{authz, acl.DenyAll()})
-
-			reg, ok := registry.Resolve(tc.res.Id.GetType())
-			require.True(t, ok)
-
-			err = reg.ACLs.Read(authz, &acl.AuthorizerContext{}, tc.res.Id, nil)
-			require.ErrorIs(t, err, resource.ErrNeedData, "read hook should require the data payload")
-
-			checkF(t, "read", tc.readOK, reg.ACLs.Read(authz, &acl.AuthorizerContext{}, tc.res.Id, tc.res))
-			checkF(t, "write", tc.writeOK, reg.ACLs.Write(authz, &acl.AuthorizerContext{}, tc.res))
-			checkF(t, "list", DEFAULT, reg.ACLs.List(authz, &acl.AuthorizerContext{}))
-		})
-	}
-
-	serviceRead := func(name string) string {
-		return fmt.Sprintf(` service %q { policy = "read" } `, name)
-	}
-	serviceWrite := func(name string) string {
-		return fmt.Sprintf(` service %q { policy = "write" } `, name)
-	}
-
-	assert := func(t *testing.T, name string, rules string, res *pbresource.Resource, readOK, writeOK string) {
-		tc := testcase{
-			res:     res,
-			rules:   rules,
-			readOK:  readOK,
-			writeOK: writeOK,
-		}
-		run(t, name, tc)
-	}
-
-	t.Run("no rules", func(t *testing.T) {
-		rules := ``
-		assert(t, "1parent 1backend", rules, resOneParentOneBackend, DENY, DENY)
-		assert(t, "1parent 2backends", rules, resOneParentTwoBackends, DENY, DENY)
-		assert(t, "2parents 1backend", rules, resTwoParentsOneBackend, DENY, DENY)
-		assert(t, "2parents 2backends", rules, resTwoParentsTwoBackends, DENY, DENY)
-	})
-	t.Run("api1:read", func(t *testing.T) {
-		rules := serviceRead("api1")
-		assert(t, "1parent 1backend", rules, resOneParentOneBackend, ALLOW, DENY)
-		assert(t, "1parent 2backends", rules, resOneParentTwoBackends, ALLOW, DENY)
-		assert(t, "2parents 1backend", rules, resTwoParentsOneBackend, DENY, DENY)
-		assert(t, "2parents 2backends", rules, resTwoParentsTwoBackends, DENY, DENY)
-	})
-	t.Run("api1:write", func(t *testing.T) {
-		rules := serviceWrite("api1")
-		assert(t, "1parent 1backend", rules, resOneParentOneBackend, ALLOW, DENY)
-		assert(t, "1parent 2backends", rules, resOneParentTwoBackends, ALLOW, DENY)
-		assert(t, "2parents 1backend", rules, resTwoParentsOneBackend, DENY, DENY)
-		assert(t, "2parents 2backends", rules, resTwoParentsTwoBackends, DENY, DENY)
-	})
-	t.Run("api1:write backend1:read", func(t *testing.T) {
-		rules := serviceWrite("api1") + serviceRead("backend1")
-		assert(t, "1parent 1backend", rules, resOneParentOneBackend, ALLOW, ALLOW)
-		assert(t, "1parent 2backends", rules, resOneParentTwoBackends, ALLOW, DENY)
-		assert(t, "2parents 1backend", rules, resTwoParentsOneBackend, DENY, DENY)
-		assert(t, "2parents 2backends", rules, resTwoParentsTwoBackends, DENY, DENY)
-	})
-}
diff --git a/internal/mesh/proxy-snapshot/proxy_snapshot.go b/internal/mesh/proxy-snapshot/proxy_snapshot.go
deleted file mode 100644
index e1c972c08a4e6..0000000000000
--- a/internal/mesh/proxy-snapshot/proxy_snapshot.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxysnapshot
-
-import "github.com/hashicorp/consul/acl"
-
-// ProxySnapshot is an abstraction that allows interchangeability between
-// Catalog V1 ConfigSnapshot and Catalog V2 ProxyState.
-type ProxySnapshot interface {
-	AllowEmptyListeners() bool
-	AllowEmptyRoutes() bool
-	AllowEmptyClusters() bool
-	Authorize(authz acl.Authorizer) error
-	LoggerName() string
-}
-
-// CancelFunc is a type for a returned function that can be called to cancel a
-// watch.
-type CancelFunc func()
diff --git a/internal/mesh/proxy-tracker/mock_SessionLimiter.go b/internal/mesh/proxy-tracker/mock_SessionLimiter.go
deleted file mode 100644
index 32375dbdc3862..0000000000000
--- a/internal/mesh/proxy-tracker/mock_SessionLimiter.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Code generated by mockery v2.33.1. DO NOT EDIT.
-
-package proxytracker
-
-import (
-	limiter "github.com/hashicorp/consul/agent/grpc-external/limiter"
-	mock "github.com/stretchr/testify/mock"
-)
-
-// MockSessionLimiter is an autogenerated mock type for the SessionLimiter type
-type MockSessionLimiter struct {
-	mock.Mock
-}
-
-// BeginSession provides a mock function with given fields:
-func (_m *MockSessionLimiter) BeginSession() (limiter.Session, error) {
-	ret := _m.Called()
-
-	var r0 limiter.Session
-	var r1 error
-	if rf, ok := ret.Get(0).(func() (limiter.Session, error)); ok {
-		return rf()
-	}
-	if rf, ok := ret.Get(0).(func() limiter.Session); ok {
-		r0 = rf()
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(limiter.Session)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func() error); ok {
-		r1 = rf()
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// NewMockSessionLimiter creates a new instance of MockSessionLimiter. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockSessionLimiter(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockSessionLimiter {
-	mock := &MockSessionLimiter{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/internal/mesh/proxy-tracker/proxy_state_exports.go b/internal/mesh/proxy-tracker/proxy_state_exports.go
deleted file mode 100644
index cdc6d6d845807..0000000000000
--- a/internal/mesh/proxy-tracker/proxy_state_exports.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxytracker
-
-import (
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-)
-
-// ProxyState is an implementation of the ProxySnapshot interface for pbmesh.ProxyState.
-// It is a simple wrapper around pbmesh.ProxyState so that it can be used
-// by the ProxyWatcher interface in XDS processing.  This struct is necessary
-// because pbmesh.ProxyState is a proto definition and there were complications
-// adding these functions directly to that proto definition.
-type ProxyState struct {
-	*pbmesh.ProxyState
-}
-
-// TODO(proxystate): need to modify ProxyState to carry a type/kind (connect proxy, mesh gateway, etc.)
-// for sidecar proxies, all Allow* functions
-// should return false, but for different gateways we'd need to add it to IR.
-
-func (p *ProxyState) AllowEmptyListeners() bool {
-	return false
-}
-
-func (p *ProxyState) AllowEmptyRoutes() bool {
-	return false
-}
-
-func (p *ProxyState) AllowEmptyClusters() bool {
-	return false
-}
-
-func (p *ProxyState) Authorize(authz acl.Authorizer) error {
-	// authorize for mesh proxies.
-	// TODO(proxystate): implement differently for gateways
-	allow := authz.ToAllowAuthorizer()
-	if err := allow.IdentityWriteAllowed(p.Identity.Name, resource.AuthorizerContext(p.Identity.Tenancy)); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (p *ProxyState) LoggerName() string {
-	return ""
-}
diff --git a/internal/mesh/proxy-tracker/proxy_state_exports_test.go b/internal/mesh/proxy-tracker/proxy_state_exports_test.go
deleted file mode 100644
index 18d15fb53dad5..0000000000000
--- a/internal/mesh/proxy-tracker/proxy_state_exports_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxytracker
-
-import (
-	"github.com/hashicorp/consul/acl"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"strings"
-	"testing"
-)
-
-func TestProxyState_Authorize(t *testing.T) {
-	testIdentity := &pbresource.Reference{
-		Type: &pbresource.Type{
-			Group:        "mesh",
-			GroupVersion: "v1alpha1",
-			Kind:         "Identity",
-		},
-		Tenancy: &pbresource.Tenancy{
-			Partition: "default",
-			Namespace: "default",
-			PeerName:  "local",
-		},
-		Name: "test-identity",
-	}
-
-	type testCase struct {
-		description          string
-		proxyState           *ProxyState
-		configureAuthorizer  func(authorizer *acl.MockAuthorizer)
-		expectedErrorMessage string
-	}
-	testsCases := []testCase{
-		{
-			description: "ProxyState - if identity write is allowed for the workload then allow.",
-			proxyState: &ProxyState{
-				ProxyState: &pbmesh.ProxyState{
-					Identity: testIdentity,
-				},
-			},
-			expectedErrorMessage: "",
-			configureAuthorizer: func(authz *acl.MockAuthorizer) {
-				authz.On("IdentityWrite", testIdentity.Name, mock.Anything).Return(acl.Allow)
-			},
-		},
-		{
-			description: "ProxyState - if identity write is not allowed for the workload then deny.",
-			proxyState: &ProxyState{
-				ProxyState: &pbmesh.ProxyState{
-					Identity: testIdentity,
-				},
-			},
-			expectedErrorMessage: "Permission denied: token with AccessorID '' lacks permission 'identity:write' on \"test-identity\"",
-			configureAuthorizer: func(authz *acl.MockAuthorizer) {
-				authz.On("IdentityWrite", testIdentity.Name, mock.Anything).Return(acl.Deny)
-			},
-		},
-	}
-	for _, tc := range testsCases {
-		t.Run(tc.description, func(t *testing.T) {
-			authz := &acl.MockAuthorizer{}
-			authz.On("ToAllow").Return(acl.AllowAuthorizer{Authorizer: authz})
-			tc.configureAuthorizer(authz)
-			err := tc.proxyState.Authorize(authz)
-			errMsg := ""
-			if err != nil {
-				errMsg = err.Error()
-			}
-			// using contains because Enterprise tests append the parition and namespace
-			// information to the message.
-			require.True(t, strings.Contains(errMsg, tc.expectedErrorMessage))
-		})
-	}
-}
diff --git a/internal/mesh/proxy-tracker/proxy_tracker.go b/internal/mesh/proxy-tracker/proxy_tracker.go
deleted file mode 100644
index d9dae03a13cde..0000000000000
--- a/internal/mesh/proxy-tracker/proxy_tracker.go
+++ /dev/null
@@ -1,284 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxytracker
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-
-	"github.com/hashicorp/go-hclog"
-
-	"github.com/hashicorp/consul/agent/grpc-external/limiter"
-	"github.com/hashicorp/consul/internal/controller"
-	proxysnapshot "github.com/hashicorp/consul/internal/mesh/proxy-snapshot"
-	"github.com/hashicorp/consul/internal/resource"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// ProxyConnection implements the queue.ItemType interface so that it can be used in a controller.Event.
-// It is sent on the newProxyConnectionCh channel.
-// TODO(ProxyState): needs to support tenancy in the future.
-type ProxyConnection struct {
-	ProxyID *pbresource.ID
-}
-
-// Key is current resourceID.Name.
-func (e *ProxyConnection) Key() string {
-	return e.ProxyID.GetName()
-}
-
-// proxyWatchData is a handle on all of the relevant bits that is created by calling Watch().
-// It is meant to be stored in the proxies cache by proxyID so that watches can be notified
-// when the ProxyState for that proxyID has changed.
-type proxyWatchData struct {
-	// notifyCh is the channel that the watcher receives updates from ProxyTracker.
-	notifyCh chan proxysnapshot.ProxySnapshot
-	// state is the current/last updated ProxyState for a given proxy.
-	state proxysnapshot.ProxySnapshot
-	// token is the ACL token provided by the watcher.
-	token string
-	// nodeName is the node where the given proxy resides.
-	nodeName string
-}
-
-type ProxyTrackerConfig struct {
-	// logger will be used to write log messages.
-	Logger hclog.Logger
-
-	// sessionLimiter is used to enforce xDS concurrency limits.
-	SessionLimiter SessionLimiter
-}
-
-// ProxyTracker implements the Watcher and Updater interfaces. The Watcher is used by the xds server to add a new proxy
-// to this server, and get back a channel for updates. The Updater is used by the ProxyState controller running on the
-// server to push ProxyState updates to the notify channel.
-type ProxyTracker struct {
-	config ProxyTrackerConfig
-	// proxies is a cache of the proxies connected to this server and configuration information for each one.
-	proxies map[resource.ReferenceKey]*proxyWatchData
-	// newProxyConnectionCh is the channel that the "updater" retains to receive messages from ProxyTracker that a new
-	// proxy has connected to ProxyTracker and a signal the "updater" should call PushChanges with a new state.
-	newProxyConnectionCh chan controller.Event
-	// shutdownCh is a channel that closes when ProxyTracker is shutdown. ShutdownChannel is never written to, only closed to
-	// indicate a shutdown has been initiated.
-	shutdownCh chan struct{}
-	// mu is a mutex that is used internally for locking when reading and modifying ProxyTracker state, namely the proxies map.
-	mu sync.Mutex
-}
-
-// NewProxyTracker returns a ProxyTracker instance given a configuration.
-func NewProxyTracker(cfg ProxyTrackerConfig) *ProxyTracker {
-	return &ProxyTracker{
-		config:  cfg,
-		proxies: make(map[resource.ReferenceKey]*proxyWatchData),
-		// buffering this channel since ProxyTracker will be registering watches for all proxies.
-		// using the buffer will limit errors related to controller and the proxy are both running
-		// but the controllers listening function is not blocking on the particular receive line.
-		// This channel is meant to error when the controller is "not ready" which means up and alive.
-		// This buffer will try to reduce false negatives and limit unnecessary erroring.
-		newProxyConnectionCh: make(chan controller.Event, 1000),
-		shutdownCh:           make(chan struct{}),
-	}
-}
-
-// Watch connects a proxy with ProxyTracker and returns the consumer a channel to receive updates,
-// a channel to notify of xDS terminated session, and a cancel function to cancel the watch.
-func (pt *ProxyTracker) Watch(proxyID *pbresource.ID,
-	nodeName string, token string) (<-chan proxysnapshot.ProxySnapshot,
-	limiter.SessionTerminatedChan, proxysnapshot.CancelFunc, error) {
-	pt.config.Logger.Trace("watch initiated", "proxyID", proxyID, "nodeName", nodeName)
-	if err := pt.validateWatchArgs(proxyID, nodeName); err != nil {
-		pt.config.Logger.Error("args failed validation", err)
-		return nil, nil, nil, err
-	}
-	// Begin a session with the xDS session concurrency limiter.
-	//
-	// See: https://github.com/hashicorp/consul/issues/15753
-	session, err := pt.config.SessionLimiter.BeginSession()
-	if err != nil {
-		pt.config.Logger.Error("failed to begin session with xDS session concurrency limiter", err)
-		return nil, nil, nil, err
-	}
-
-	// This buffering is crucial otherwise we'd block immediately trying to
-	// deliver the current snapshot below if we already have one.
-
-	proxyStateChan := make(chan proxysnapshot.ProxySnapshot, 1)
-	watchData := &proxyWatchData{
-		notifyCh: proxyStateChan,
-		state:    nil,
-		token:    token,
-		nodeName: nodeName,
-	}
-
-	proxyReferenceKey := resource.NewReferenceKey(proxyID)
-	cancel := func() {
-		pt.mu.Lock()
-		defer pt.mu.Unlock()
-		pt.cancelWatchLocked(proxyReferenceKey, proxyStateChan, session)
-	}
-
-	pt.mu.Lock()
-	defer pt.mu.Unlock()
-
-	pt.proxies[proxyReferenceKey] = watchData
-
-	//Send an event to the controller
-	err = pt.notifyNewProxyChannel(proxyID)
-	if err != nil {
-		pt.config.Logger.Error("failed to notify controller of new proxy connection", err)
-		pt.cancelWatchLocked(proxyReferenceKey, watchData.notifyCh, session)
-		return nil, nil, nil, err
-	}
-	pt.config.Logger.Trace("controller notified of watch created", "proxyID", proxyID, "nodeName", nodeName)
-
-	return proxyStateChan, session.Terminated(), cancel, nil
-}
-
-// notifyNewProxyChannel attempts to send a message to newProxyConnectionCh and will return an error if there's no receiver.
-// This will handle conditions where a proxy is connected but there's no controller for some reason to receive the event.
-// This will error back to the proxy's Watch call and will cause the proxy call Watch again to retry connection until the controller
-// is available.
-func (pt *ProxyTracker) notifyNewProxyChannel(proxyID *pbresource.ID) error {
-	controllerEvent := controller.Event{
-		Obj: &ProxyConnection{
-			ProxyID: proxyID,
-		},
-	}
-	select {
-	case pt.newProxyConnectionCh <- controllerEvent:
-		return nil
-		// using default here to return errors is only safe when we have a large buffer.
-		// the receiver is on a loop to read from the channel.  If the sequence of
-		// sender blocks on the channel and then the receiver blocks on the channel is not
-		// aligned, then extraneous errors could be returned to the proxy that are just
-		// false negatives and the controller could be up and healthy.
-	default:
-		return fmt.Errorf("failed to notify the controller of the proxy connecting")
-	}
-}
-
-// cancelWatchLocked does the following:
-// - deletes the key from the proxies array.
-// - ends the session with xDS session limiter.
-// - closes the proxy state channel assigned to the proxy.
-// This function assumes the state lock is already held.
-func (pt *ProxyTracker) cancelWatchLocked(proxyReferenceKey resource.ReferenceKey, proxyStateChan chan proxysnapshot.ProxySnapshot, session limiter.Session) {
-	delete(pt.proxies, proxyReferenceKey)
-	session.End()
-	close(proxyStateChan)
-	pt.config.Logger.Trace("watch cancelled", "proxyReferenceKey", proxyReferenceKey)
-}
-
-// validateWatchArgs checks the proxyIDand nodeName passed to Watch
-// and returns an error if the args are not properly constructed.
-func (pt *ProxyTracker) validateWatchArgs(proxyID *pbresource.ID,
-	nodeName string) error {
-	if proxyID == nil {
-		return errors.New("proxyID is required")
-	} else if proxyID.GetType().GetKind() != pbmesh.ProxyStateTemplateType.Kind {
-		return fmt.Errorf("proxyID must be a %s", pbmesh.ProxyStateTemplateType.GetKind())
-	} else if nodeName == "" {
-		return errors.New("nodeName is required")
-	}
-
-	return nil
-}
-
-// PushChange allows pushing a computed ProxyState to xds for xds resource generation to send to a proxy.
-func (pt *ProxyTracker) PushChange(proxyID *pbresource.ID, proxyState proxysnapshot.ProxySnapshot) error {
-	pt.config.Logger.Trace("push change called for proxy", "proxyID", proxyID)
-	proxyReferenceKey := resource.NewReferenceKey(proxyID)
-	pt.mu.Lock()
-	defer pt.mu.Unlock()
-	if data, ok := pt.proxies[proxyReferenceKey]; ok {
-		data.state = proxyState
-
-		pt.deliverLatest(proxyID, proxyState, data.notifyCh)
-	} else {
-		return errors.New("proxyState change could not be sent because proxy is not connected")
-	}
-
-	return nil
-}
-
-func (pt *ProxyTracker) deliverLatest(proxyID *pbresource.ID, proxyState proxysnapshot.ProxySnapshot, ch chan proxysnapshot.ProxySnapshot) {
-	pt.config.Logger.Trace("delivering latest proxy snapshot to proxy", "proxyID", proxyID)
-	// Send if chan is empty
-	select {
-	case ch <- proxyState:
-		return
-	default:
-	}
-
-	// Not empty, drain the chan of older snapshots and redeliver. For now we only
-	// use 1-buffered chans but this will still work if we change that later.
-OUTER:
-	for {
-		select {
-		case <-ch:
-			continue
-		default:
-			break OUTER
-		}
-	}
-
-	// Now send again
-	select {
-	case ch <- proxyState:
-		return
-	default:
-		// This should not be possible since we should be the only sender, enforced
-		// by m.mu but error and drop the update rather than panic.
-		pt.config.Logger.Error("failed to deliver proxyState to proxy",
-			"proxy", proxyID.String(),
-		)
-	}
-}
-
-// EventChannel returns an event channel that sends controller events when a proxy connects to a server.
-func (pt *ProxyTracker) EventChannel() chan controller.Event {
-	return pt.newProxyConnectionCh
-}
-
-// ShutdownChannel returns a channel that closes when ProxyTracker is shutdown. ShutdownChannel is never written to, only closed to
-// indicate a shutdown has been initiated.
-func (pt *ProxyTracker) ShutdownChannel() chan struct{} {
-	return pt.shutdownCh
-}
-
-// ProxyConnectedToServer returns whether this id is connected to this server.
-func (pt *ProxyTracker) ProxyConnectedToServer(proxyID *pbresource.ID) (string, bool) {
-	pt.mu.Lock()
-	defer pt.mu.Unlock()
-	proxyReferenceKey := resource.NewReferenceKey(proxyID)
-	proxyData, ok := pt.proxies[proxyReferenceKey]
-	if ok {
-		return proxyData.token, ok
-	}
-	return "", ok
-}
-
-// Shutdown removes all state and close all channels.
-func (pt *ProxyTracker) Shutdown() {
-	pt.config.Logger.Info("proxy tracker shutdown initiated")
-	pt.mu.Lock()
-	defer pt.mu.Unlock()
-
-	// Close all current watchers first
-	for proxyID, watchData := range pt.proxies {
-		close(watchData.notifyCh)
-		delete(pt.proxies, proxyID)
-	}
-
-	close(pt.newProxyConnectionCh)
-	close(pt.shutdownCh)
-}
-
-//go:generate mockery --name SessionLimiter --inpackage
-type SessionLimiter interface {
-	BeginSession() (limiter.Session, error)
-}
diff --git a/internal/mesh/proxy-tracker/proxy_tracker_test.go b/internal/mesh/proxy-tracker/proxy_tracker_test.go
deleted file mode 100644
index d6c1fc1ce5e06..0000000000000
--- a/internal/mesh/proxy-tracker/proxy_tracker_test.go
+++ /dev/null
@@ -1,340 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package proxytracker
-
-import (
-	"errors"
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/agent/grpc-external/limiter"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestProxyTracker_Watch(t *testing.T) {
-	resourceID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "test").ID()
-	proxyReferenceKey := resource.NewReferenceKey(resourceID)
-	lim := NewMockSessionLimiter(t)
-	session1 := newMockSession(t)
-	session1TermCh := make(limiter.SessionTerminatedChan)
-	session1.On("Terminated").Return(session1TermCh)
-	session1.On("End").Return()
-	lim.On("BeginSession").Return(session1, nil)
-	logger := testutil.Logger(t)
-
-	pt := NewProxyTracker(ProxyTrackerConfig{
-		Logger:         logger,
-		SessionLimiter: lim,
-	})
-
-	// Watch()
-	proxyStateChan, _, cancelFunc, err := pt.Watch(resourceID, "node 1", "token")
-	require.NoError(t, err)
-
-	// ensure New Proxy Connection message is sent
-	newProxyMsg := <-pt.EventChannel()
-	require.Equal(t, resourceID.Name, newProxyMsg.Obj.Key())
-
-	// watchData is stored in the proxies array with a nil state
-	watchData, ok := pt.proxies[proxyReferenceKey]
-	require.True(t, ok)
-	require.NotNil(t, watchData)
-	require.Nil(t, watchData.state)
-
-	// calling cancelFunc does the following:
-	// - closes the proxy state channel
-	// - and removes the map entry for the proxy
-	// - session is ended
-	cancelFunc()
-
-	// read channel to see if there is data and it is open.
-	receivedState, channelOpen := <-proxyStateChan
-	require.Nil(t, receivedState)
-	require.False(t, channelOpen)
-
-	// key is removed from proxies array
-	_, ok = pt.proxies[proxyReferenceKey]
-	require.False(t, ok)
-
-	// session ended
-	session1.AssertCalled(t, "Terminated")
-	session1.AssertCalled(t, "End")
-}
-
-func TestProxyTracker_Watch_ErrorConsumerNotReady(t *testing.T) {
-	resourceID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "test").ID()
-	proxyReferenceKey := resource.NewReferenceKey(resourceID)
-	lim := NewMockSessionLimiter(t)
-	session1 := newMockSession(t)
-	session1.On("End").Return()
-	lim.On("BeginSession").Return(session1, nil)
-	logger := testutil.Logger(t)
-
-	pt := NewProxyTracker(ProxyTrackerConfig{
-		Logger:         logger,
-		SessionLimiter: lim,
-	})
-
-	//fill up buffered channel while the consumer is not ready to simulate the error
-	for i := 0; i < 1000; i++ {
-		event := controller.Event{Obj: &ProxyConnection{ProxyID: resourcetest.Resource(pbmesh.ProxyStateTemplateType, fmt.Sprintf("test%d", i)).ID()}}
-		pt.newProxyConnectionCh <- event
-	}
-
-	// Watch()
-	proxyStateChan, sessionTerminatedCh, cancelFunc, err := pt.Watch(resourceID, "node 1", "token")
-	require.Nil(t, cancelFunc)
-	require.Nil(t, proxyStateChan)
-	require.Nil(t, sessionTerminatedCh)
-	require.Error(t, err)
-	require.Equal(t, "failed to notify the controller of the proxy connecting", err.Error())
-
-	// it is not stored in the proxies array
-	watchData, ok := pt.proxies[proxyReferenceKey]
-	require.False(t, ok)
-	require.Nil(t, watchData)
-}
-
-func TestProxyTracker_Watch_ArgValidationErrors(t *testing.T) {
-	type testcase struct {
-		description   string
-		proxyID       *pbresource.ID
-		nodeName      string
-		token         string
-		expectedError error
-	}
-	testcases := []*testcase{
-		{
-			description:   "Empty proxyID",
-			proxyID:       nil,
-			nodeName:      "something",
-			token:         "something",
-			expectedError: errors.New("proxyID is required"),
-		},
-		{
-			description:   "Empty nodeName",
-			proxyID:       resourcetest.Resource(pbmesh.ProxyStateTemplateType, "test").ID(),
-			nodeName:      "",
-			token:         "something",
-			expectedError: errors.New("nodeName is required"),
-		},
-		{
-			description:   "resource is not ProxyStateTemplate",
-			proxyID:       resourcetest.Resource(pbmesh.ProxyConfigurationType, "test").ID(),
-			nodeName:      "something",
-			token:         "something else",
-			expectedError: errors.New("proxyID must be a ProxyStateTemplate"),
-		},
-	}
-	for _, tc := range testcases {
-		lim := NewMockSessionLimiter(t)
-		lim.On("BeginSession").Return(nil, nil).Maybe()
-		logger := testutil.Logger(t)
-
-		pt := NewProxyTracker(ProxyTrackerConfig{
-			Logger:         logger,
-			SessionLimiter: lim,
-		})
-
-		// Watch()
-		proxyStateChan, sessionTerminateCh, cancelFunc, err := pt.Watch(tc.proxyID, tc.nodeName, tc.token)
-		require.Error(t, err)
-		require.Equal(t, tc.expectedError, err)
-		require.Nil(t, proxyStateChan)
-		require.Nil(t, sessionTerminateCh)
-		require.Nil(t, cancelFunc)
-	}
-}
-
-func TestProxyTracker_Watch_SessionLimiterError(t *testing.T) {
-	resourceID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "test").ID()
-	lim := NewMockSessionLimiter(t)
-	lim.On("BeginSession").Return(nil, errors.New("kaboom"))
-	logger := testutil.Logger(t)
-	pt := NewProxyTracker(ProxyTrackerConfig{
-		Logger:         logger,
-		SessionLimiter: lim,
-	})
-
-	// Watch()
-	proxyStateChan, sessionTerminateCh, cancelFunc, err := pt.Watch(resourceID, "node 1", "token")
-	require.Error(t, err)
-	require.Equal(t, "kaboom", err.Error())
-	require.Nil(t, proxyStateChan)
-	require.Nil(t, sessionTerminateCh)
-	require.Nil(t, cancelFunc)
-}
-
-func TestProxyTracker_PushChange(t *testing.T) {
-	resourceID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "test").ID()
-	proxyReferenceKey := resource.NewReferenceKey(resourceID)
-	lim := NewMockSessionLimiter(t)
-	session1 := newMockSession(t)
-	session1TermCh := make(limiter.SessionTerminatedChan)
-	session1.On("Terminated").Return(session1TermCh)
-	lim.On("BeginSession").Return(session1, nil)
-	logger := testutil.Logger(t)
-
-	pt := NewProxyTracker(ProxyTrackerConfig{
-		Logger:         logger,
-		SessionLimiter: lim,
-	})
-
-	// Watch()
-	proxyStateChan, _, _, err := pt.Watch(resourceID, "node 1", "token")
-	require.NoError(t, err)
-
-	// PushChange
-	proxyState := &ProxyState{ProxyState: &pbmesh.ProxyState{}}
-
-	// using a goroutine so that the channel and main test thread do not cause
-	// blocking issues with each other
-	go func() {
-		err = pt.PushChange(resourceID, proxyState)
-		require.NoError(t, err)
-	}()
-
-	// channel receives a copy
-	receivedState, channelOpen := <-proxyStateChan
-	require.True(t, channelOpen)
-	require.Equal(t, proxyState, receivedState)
-
-	// it is stored in the proxies array
-	watchData, ok := pt.proxies[proxyReferenceKey]
-	require.True(t, ok)
-	require.Equal(t, proxyState, watchData.state)
-}
-
-func TestProxyTracker_PushChanges_ErrorProxyNotConnected(t *testing.T) {
-	resourceID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "test").ID()
-	lim := NewMockSessionLimiter(t)
-	logger := testutil.Logger(t)
-
-	pt := NewProxyTracker(ProxyTrackerConfig{
-		Logger:         logger,
-		SessionLimiter: lim,
-	})
-
-	// PushChange
-	proxyState := &ProxyState{ProxyState: &pbmesh.ProxyState{}}
-
-	err := pt.PushChange(resourceID, proxyState)
-	require.Error(t, err)
-	require.Equal(t, "proxyState change could not be sent because proxy is not connected", err.Error())
-}
-
-func TestProxyTracker_ProxyConnectedToServer(t *testing.T) {
-	type testcase struct {
-		name              string
-		shouldExist       bool
-		preProcessingFunc func(pt *ProxyTracker, resourceID *pbresource.ID, limiter *MockSessionLimiter, session *mockSession, channel limiter.SessionTerminatedChan)
-	}
-	testsCases := []*testcase{
-		{
-			name:        "Resource that has not been sent through Watch() should return false",
-			shouldExist: false,
-			preProcessingFunc: func(pt *ProxyTracker, resourceID *pbresource.ID, limiter *MockSessionLimiter, session *mockSession, channel limiter.SessionTerminatedChan) {
-				session.On("Terminated").Return(channel).Maybe()
-				session.On("End").Return().Maybe()
-				limiter.On("BeginSession").Return(session, nil).Maybe()
-			},
-		},
-		{
-			name:        "Resource used that is already passed in through Watch() should return true",
-			shouldExist: true,
-			preProcessingFunc: func(pt *ProxyTracker, resourceID *pbresource.ID, limiter *MockSessionLimiter, session *mockSession, channel limiter.SessionTerminatedChan) {
-				session.On("Terminated").Return(channel).Maybe()
-				session.On("End").Return().Maybe()
-				limiter.On("BeginSession").Return(session, nil)
-				_, _, _, _ = pt.Watch(resourceID, "node 1", "token")
-			},
-		},
-	}
-
-	for _, tc := range testsCases {
-		lim := NewMockSessionLimiter(t)
-		session1 := newMockSession(t)
-		session1TermCh := make(limiter.SessionTerminatedChan)
-		logger := testutil.Logger(t)
-
-		pt := NewProxyTracker(ProxyTrackerConfig{
-			Logger:         logger,
-			SessionLimiter: lim,
-		})
-		resourceID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "test").ID()
-		tc.preProcessingFunc(pt, resourceID, lim, session1, session1TermCh)
-		_, ok := pt.ProxyConnectedToServer(resourceID)
-		require.Equal(t, tc.shouldExist, ok)
-	}
-}
-
-func TestProxyTracker_Shutdown(t *testing.T) {
-	resourceID := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "test").ID()
-	proxyReferenceKey := resource.NewReferenceKey(resourceID)
-	lim := NewMockSessionLimiter(t)
-	session1 := newMockSession(t)
-	session1TermCh := make(limiter.SessionTerminatedChan)
-	session1.On("Terminated").Return(session1TermCh)
-	session1.On("End").Return().Maybe()
-	lim.On("BeginSession").Return(session1, nil)
-	logger := testutil.Logger(t)
-
-	pt := NewProxyTracker(ProxyTrackerConfig{
-		Logger:         logger,
-		SessionLimiter: lim,
-	})
-
-	// Watch()
-	proxyStateChan, _, _, err := pt.Watch(resourceID, "node 1", "token")
-	require.NoError(t, err)
-
-	pt.Shutdown()
-
-	// proxy channels are all disconnected and proxy is removed from proxies map
-	receivedState, channelOpen := <-proxyStateChan
-	require.Nil(t, receivedState)
-	require.False(t, channelOpen)
-	_, ok := pt.proxies[proxyReferenceKey]
-	require.False(t, ok)
-
-	// shutdownCh is closed
-	select {
-	case <-pt.ShutdownChannel():
-	default:
-		t.Fatalf("shutdown channel should be closed")
-	}
-	// newProxyConnectionCh is closed
-	select {
-	case <-pt.EventChannel():
-	default:
-		t.Fatalf("shutdown channel should be closed")
-	}
-}
-
-type mockSession struct {
-	mock.Mock
-}
-
-func newMockSession(t *testing.T) *mockSession {
-	m := &mockSession{}
-	m.Mock.Test(t)
-
-	t.Cleanup(func() { m.AssertExpectations(t) })
-
-	return m
-}
-
-func (m *mockSession) End() { m.Called() }
-
-func (m *mockSession) Terminated() limiter.SessionTerminatedChan {
-	return m.Called().Get(0).(limiter.SessionTerminatedChan)
-}
diff --git a/internal/protohcl/any.go b/internal/protohcl/any.go
deleted file mode 100644
index 87b4549bfd079..0000000000000
--- a/internal/protohcl/any.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package protohcl
-
-import (
-	"fmt"
-	"strings"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/reflect/protoregistry"
-	"google.golang.org/protobuf/types/known/anypb"
-)
-
-const wellKnownTypeAny = "google.protobuf.Any"
-
-type AnyTypeProvider interface {
-	AnyType(*UnmarshalContext, MessageDecoder) (protoreflect.FullName, MessageDecoder, error)
-}
-
-type AnyTypeURLProvider struct {
-	TypeURLFieldName string
-}
-
-func (p *AnyTypeURLProvider) AnyType(ctx *UnmarshalContext, decoder MessageDecoder) (protoreflect.FullName, MessageDecoder, error) {
-	typeURLFieldName := "type_url"
-	if p != nil {
-		typeURLFieldName = p.TypeURLFieldName
-	}
-
-	var typeURL *IterField
-	err := decoder.EachField(FieldIterator{
-		Desc: (&anypb.Any{}).ProtoReflect().Descriptor(),
-		Func: func(field *IterField) error {
-			if field.Name == typeURLFieldName {
-				typeURL = field
-			}
-			return nil
-		},
-		IgnoreUnknown: true,
-	})
-	if err != nil {
-		return "", nil, err
-	}
-
-	if typeURL == nil || typeURL.Val == nil {
-		return "", nil, fmt.Errorf("%s field is required to decode Any", typeURLFieldName)
-	}
-
-	url, err := stringFromCty(*typeURL.Val)
-	if err != nil {
-		return "", nil, err
-	}
-
-	slashIdx := strings.LastIndex(url, "/")
-	typeName := url
-	// strip all "hostname" parts of the URL path
-	if slashIdx > 1 && slashIdx+1 < len(url) {
-		typeName = url[slashIdx+1:]
-	}
-
-	return protoreflect.FullName(typeName), decoder.SkipFields(typeURLFieldName), nil
-}
-
-func (u UnmarshalOptions) decodeAny(ctx *UnmarshalContext, decoder MessageDecoder, msg protoreflect.Message) error {
-	var typeProvider AnyTypeProvider = &AnyTypeURLProvider{TypeURLFieldName: "type_url"}
-	if u.AnyTypeProvider != nil {
-		typeProvider = u.AnyTypeProvider
-	}
-
-	var (
-		typeName protoreflect.FullName
-		err      error
-	)
-	typeName, decoder, err = typeProvider.AnyType(ctx, decoder)
-	if err != nil {
-		return fmt.Errorf("error getting type for Any field: %w", err)
-	}
-
-	// the type.googleapis.come/ should be optional
-	mt, err := protoregistry.GlobalTypes.FindMessageByName(typeName)
-	if err != nil {
-		return fmt.Errorf("error looking up type information for %s: %w", typeName, err)
-	}
-
-	newMsg := mt.New()
-
-	err = u.decodeMessage(&UnmarshalContext{
-		Parent:  ctx.Parent,
-		Name:    ctx.Name,
-		Message: newMsg,
-	}, decoder, newMsg)
-	if err != nil {
-		return err
-	}
-
-	enc, err := proto.Marshal(newMsg.Interface())
-	if err != nil {
-		return fmt.Errorf("error marshalling Any data as protobuf value: %w", err)
-	}
-
-	anyValue := msg.Interface().(*anypb.Any)
-
-	// This will look like <proto package>.<proto Message name> and not quite like a full URL with a path
-	anyValue.TypeUrl = string(newMsg.Descriptor().FullName())
-	anyValue.Value = enc
-
-	return nil
-}
-
-func isAnyField(desc protoreflect.FieldDescriptor) bool {
-	if desc.Kind() != protoreflect.MessageKind {
-		return false
-	}
-	return desc.Message().FullName() == wellKnownTypeAny
-}
diff --git a/internal/protohcl/attributes.go b/internal/protohcl/attributes.go
deleted file mode 100644
index 90501722b1fe3..0000000000000
--- a/internal/protohcl/attributes.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package protohcl
-
-import (
-	"fmt"
-
-	"github.com/pkg/errors"
-	"github.com/zclconf/go-cty/cty"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-)
-
-func (u UnmarshalOptions) decodeAttribute(ctx *UnmarshalContext, newMessage newMessageFn, f protoreflect.FieldDescriptor, val cty.Value, listAllowed bool) (protoreflect.Value, error) {
-	if f.IsMap() {
-		return u.decodeAttributeToMap(ctx, newMessage, f, val)
-	}
-
-	if f.IsList() && listAllowed {
-		return u.decodeAttributeToList(ctx, newMessage, f, val)
-	}
-
-	ok, value, err := decodeAttributeToWellKnownType(f, val)
-	if ok {
-		return value, errors.Wrapf(err, "%s: Failed to unmarshal argument %s", ctx.ErrorRange(), ctx.Name)
-	}
-
-	ok, value, err = u.decodeAttributeToMessage(ctx, newMessage, f, val)
-	if ok {
-		return value, err
-	}
-
-	value, err = decodeAttributeToPrimitive(f, val)
-	if err != nil {
-		return value, errors.Wrapf(err, "%s: Failed to unmarshal argument %s", ctx.ErrorRange(), ctx.Name)
-	}
-	return value, nil
-}
-
-func (u UnmarshalOptions) decodeAttributeToMessage(ctx *UnmarshalContext, newMessage newMessageFn, desc protoreflect.FieldDescriptor, val cty.Value) (bool, protoreflect.Value, error) {
-	if desc.Kind() != protoreflect.MessageKind {
-		return false, protoreflect.Value{}, nil
-	}
-
-	msg := newMessage().Message()
-
-	ctx = &UnmarshalContext{
-		Parent:  ctx.Parent,
-		Name:    ctx.Name,
-		Message: msg,
-		Range:   ctx.Range,
-	}
-
-	// We have limited support for HCL functions, essentially just those that
-	// return a protobuf message (like the resource `gvk` function) in which
-	// case, the message will be wrapped in a cty capsule.
-	if val.Type().IsCapsuleType() {
-		msg, ok := val.EncapsulatedValue().(proto.Message)
-		if ok {
-			return true, protoreflect.ValueOf(msg.ProtoReflect()), nil
-		} else {
-			return true, protoreflect.Value{}, fmt.Errorf("expected encapsulated value to be a message, actual type: %T", val.EncapsulatedValue())
-		}
-	}
-
-	if !val.Type().IsObjectType() {
-		return false, protoreflect.Value{}, nil
-	}
-
-	decoder := newObjectDecoder(val, u.FieldNamer, ctx.ErrorRange())
-
-	if err := u.decodeMessage(ctx, decoder, msg); err != nil {
-		return true, protoreflect.Value{}, err
-	}
-	return true, protoreflect.ValueOf(msg), nil
-}
-
-func (u UnmarshalOptions) decodeAttributeToList(ctx *UnmarshalContext, newMessage newMessageFn, desc protoreflect.FieldDescriptor, value cty.Value) (protoreflect.Value, error) {
-	if value.IsNull() {
-		return protoreflect.Value{}, nil
-	}
-
-	valueType := value.Type()
-	if !valueType.IsListType() && !valueType.IsTupleType() {
-		return protoreflect.Value{}, fmt.Errorf("expected list/tuple type after HCL decode but the actual type was %s", valueType.FriendlyName())
-	}
-
-	if value.LengthInt() < 1 {
-		return protoreflect.Value{}, nil
-	}
-
-	protoList := newMessage().List()
-
-	var err error
-	var idx int
-	value.ForEachElement(func(_ cty.Value, val cty.Value) bool {
-		var protoVal protoreflect.Value
-		protoVal, err = u.decodeAttribute(&UnmarshalContext{
-			Parent: ctx,
-			Name:   fmt.Sprintf("%s[%d]", u.FieldNamer.NameField(desc), idx),
-		}, protoList.NewElement, desc, val, false)
-		if err != nil {
-			return true
-		}
-
-		idx++
-		protoList.Append(protoVal)
-		return false
-	})
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-
-	return protoreflect.ValueOfList(protoList), nil
-}
-
-func (u UnmarshalOptions) decodeAttributeToMap(ctx *UnmarshalContext, newMessage newMessageFn, desc protoreflect.FieldDescriptor, value cty.Value) (protoreflect.Value, error) {
-	if value.IsNull() {
-		return protoreflect.Value{}, nil
-	}
-
-	valueType := value.Type()
-	if !valueType.IsMapType() && !valueType.IsObjectType() {
-		return protoreflect.Value{}, fmt.Errorf("expected map/object type after HCL decode but the actual type was %s", valueType.FriendlyName())
-	}
-
-	if value.LengthInt() < 1 {
-		return protoreflect.Value{}, nil
-	}
-
-	protoMap := newMessage().Map()
-	protoValueDesc := desc.MapValue()
-	var err error
-
-	value.ForEachElement(func(key cty.Value, val cty.Value) (stop bool) {
-		var protoVal protoreflect.Value
-		protoVal, err = u.decodeAttribute(&UnmarshalContext{
-			Parent:  ctx,
-			Name:    fmt.Sprintf("%s[%q]", u.FieldNamer.NameField(desc), key.AsString()),
-			Message: nil, // TODO: what should this really be?
-		}, protoMap.NewValue, protoValueDesc, val, false)
-		if err != nil {
-			return true
-		}
-		if protoVal.IsValid() {
-			// HCL doesn't support non-string keyed maps so we blindly use string keys
-			protoMap.Set(protoreflect.ValueOfString(key.AsString()).MapKey(), protoVal)
-		}
-		return false
-	})
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-
-	return protoreflect.ValueOfMap(protoMap), nil
-}
diff --git a/internal/protohcl/blocks.go b/internal/protohcl/blocks.go
deleted file mode 100644
index cafffa99367da..0000000000000
--- a/internal/protohcl/blocks.go
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package protohcl
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/hcl/v2"
-	"google.golang.org/protobuf/reflect/protoreflect"
-)
-
-func (u UnmarshalOptions) decodeBlocks(ctx *UnmarshalContext, blocks hcl.Blocks, msg protoreflect.Message, f protoreflect.FieldDescriptor) (protoreflect.Value, error) {
-	if f.Kind() != protoreflect.MessageKind {
-		return protoreflect.Value{}, fmt.Errorf("only protobuf message kinds can use HCL block syntax")
-	}
-
-	if f.IsMap() {
-		return u.decodeBlocksToMap(ctx, blocks, msg, f)
-	}
-
-	if f.IsList() {
-		return u.decodeBlocksToList(ctx, blocks, msg, f)
-	}
-
-	return u.decodeBlocksToMessage(ctx, blocks, msg, f)
-}
-
-func (u UnmarshalOptions) decodeBlocksToMap(ctx *UnmarshalContext, blocks hcl.Blocks, msg protoreflect.Message, f protoreflect.FieldDescriptor) (protoreflect.Value, error) {
-	val := msg.NewField(f)
-	mapVal := val.Map()
-
-	for _, block := range blocks {
-		if len(block.Labels) != 1 {
-			return protoreflect.Value{}, fmt.Errorf("protobuf map fields must have 1 HCL block label")
-		}
-
-		key := protoreflect.ValueOfString(block.Labels[0])
-		value := mapVal.NewValue()
-		msgVal := value.Message()
-
-		err := u.decodeMessage(
-			&UnmarshalContext{
-				Parent:  ctx,
-				Name:    fmt.Sprintf("%s[%q]", u.FieldNamer.NameField(f), block.Labels[0]),
-				Message: msgVal,
-				Range:   block.DefRange,
-			},
-			u.bodyDecoder(block.Body),
-			msgVal,
-		)
-		if err != nil {
-			return protoreflect.Value{}, err
-		}
-
-		mapVal.Set(key.MapKey(), value)
-	}
-	return val, nil
-}
-
-func (u UnmarshalOptions) decodeBlocksToList(ctx *UnmarshalContext, blocks hcl.Blocks, msg protoreflect.Message, f protoreflect.FieldDescriptor) (protoreflect.Value, error) {
-	val := msg.NewField(f)
-	listVal := val.List()
-
-	var err error
-	for idx, block := range blocks {
-		if len(block.Labels) > 0 {
-			return protoreflect.Value{}, fmt.Errorf("repeated protobuf fields must not have HCL block labels")
-		}
-		elem := listVal.NewElement()
-		elemMsg := elem.Message()
-
-		err = u.decodeMessage(
-			&UnmarshalContext{
-				Parent:  ctx,
-				Name:    fmt.Sprintf("%s[%d]", u.FieldNamer.NameField(f), idx),
-				Message: elemMsg,
-				Range:   block.DefRange,
-			},
-			u.bodyDecoder(block.Body),
-			elemMsg,
-		)
-		if err != nil {
-			return protoreflect.Value{}, err
-		}
-		listVal.Append(elem)
-	}
-
-	return val, nil
-}
-
-func (u UnmarshalOptions) decodeBlocksToMessage(ctx *UnmarshalContext, blocks hcl.Blocks, msg protoreflect.Message, f protoreflect.FieldDescriptor) (protoreflect.Value, error) {
-	if len(blocks) > 1 {
-		return protoreflect.Value{}, fmt.Errorf("only one HCL block may be specified for a non-repeated protobuf Message")
-	}
-
-	val := msg.NewField(f)
-	valMsg := val.Message()
-
-	err := u.decodeMessage(
-		&UnmarshalContext{
-			Parent:  ctx,
-			Name:    blocks[0].Type,
-			Message: valMsg,
-			Range:   blocks[0].DefRange,
-		},
-		u.bodyDecoder(blocks[0].Body),
-		valMsg,
-	)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-
-	return val, nil
-}
diff --git a/internal/protohcl/cty.go b/internal/protohcl/cty.go
deleted file mode 100644
index e7ed37ed16996..0000000000000
--- a/internal/protohcl/cty.go
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package protohcl
-
-import (
-	"encoding/base64"
-	"fmt"
-
-	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-cty/cty/gocty"
-)
-
-func boolFromCty(val cty.Value) (bool, error) {
-	if val.Type() != cty.Bool {
-		return false, fmt.Errorf("expected value of type %s but actual type is %s", cty.Bool.FriendlyName(), val.Type().FriendlyName())
-	}
-
-	if val.IsNull() {
-		return false, nil
-	}
-
-	return val.True(), nil
-}
-
-func int32FromCty(val cty.Value) (int32, error) {
-	if val.Type() != cty.Number {
-		return 0, fmt.Errorf("expected value of type %s but actual type is %s", cty.Number.FriendlyName(), val.Type().FriendlyName())
-	}
-
-	if val.IsNull() {
-		return 0, nil
-	}
-
-	var goVal int32
-	if err := gocty.FromCtyValue(val, &goVal); err != nil {
-		return 0, fmt.Errorf("error converting cty value of type %s to int32: %w", val.Type().FriendlyName(), err)
-	}
-	return goVal, nil
-}
-
-func uint32FromCty(val cty.Value) (uint32, error) {
-	if val.Type() != cty.Number {
-		return 0, fmt.Errorf("expected value of type %s but actual type is %s", cty.Number.FriendlyName(), val.Type().FriendlyName())
-	}
-
-	if val.IsNull() {
-		return 0, nil
-	}
-
-	var goVal uint32
-	if err := gocty.FromCtyValue(val, &goVal); err != nil {
-		return 0, fmt.Errorf("error converting cty value of type %s to uint32: %w", val.Type().FriendlyName(), err)
-	}
-	return goVal, nil
-}
-
-func int64FromCty(val cty.Value) (int64, error) {
-	if val.Type() != cty.Number {
-		return 0, fmt.Errorf("expected value of type %s but actual type is %s", cty.Number.FriendlyName(), val.Type().FriendlyName())
-	}
-
-	if val.IsNull() {
-		return 0, nil
-	}
-
-	var goVal int64
-	if err := gocty.FromCtyValue(val, &goVal); err != nil {
-		return 0, fmt.Errorf("error converting cty value of type %s to int64: %w", val.Type().FriendlyName(), err)
-	}
-	return goVal, nil
-}
-
-func uint64FromCty(val cty.Value) (uint64, error) {
-	if val.Type() != cty.Number {
-		return 0, fmt.Errorf("expected value of type %s but actual type is %s", cty.Number.FriendlyName(), val.Type().FriendlyName())
-	}
-
-	if val.IsNull() {
-		return 0, nil
-	}
-
-	var goVal uint64
-	if err := gocty.FromCtyValue(val, &goVal); err != nil {
-		return 0, fmt.Errorf("error converting cty value of type %s to uint64: %w", val.Type().FriendlyName(), err)
-	}
-	return goVal, nil
-}
-
-func floatFromCty(val cty.Value) (float32, error) {
-	if val.Type() != cty.Number {
-		return 0, fmt.Errorf("expected value of type %s but actual type is %s", cty.Number.FriendlyName(), val.Type().FriendlyName())
-	}
-
-	if val.IsNull() {
-		return 0, nil
-	}
-
-	var goVal float32
-	if err := gocty.FromCtyValue(val, &goVal); err != nil {
-		return 0, fmt.Errorf("error converting cty value of type %s to float32: %w", val.Type().FriendlyName(), err)
-	}
-	return goVal, nil
-}
-
-func doubleFromCty(val cty.Value) (float64, error) {
-	if val.Type() != cty.Number {
-		return 0, fmt.Errorf("expected value of type %s but actual type is %s", cty.Number.FriendlyName(), val.Type().FriendlyName())
-	}
-
-	if val.IsNull() {
-		return 0, nil
-	}
-
-	var goVal float64
-	if err := gocty.FromCtyValue(val, &goVal); err != nil {
-		return 0, fmt.Errorf("error converting cty value of type %s to float64: %w", val.Type().FriendlyName(), err)
-	}
-	return goVal, nil
-}
-
-func stringFromCty(val cty.Value) (string, error) {
-	if val.Type() != cty.String {
-		return "", fmt.Errorf("expected value of type %s but actual type is %s", cty.String.FriendlyName(), val.Type().FriendlyName())
-	}
-
-	if val.IsNull() {
-		return "", nil
-	}
-	return val.AsString(), nil
-}
-
-func bytesFromCty(val cty.Value) ([]byte, error) {
-	if val.Type() != cty.String {
-		return nil, fmt.Errorf("expected value of type %s but actual type is %s", cty.String.FriendlyName(), val.Type().FriendlyName())
-	}
-
-	if val.IsNull() {
-		return nil, nil
-	}
-
-	encoded := val.AsString()
-	decoded, err := base64.StdEncoding.DecodeString(encoded)
-	if err != nil {
-		return nil, fmt.Errorf("error base64 decoding byte string: %w", err)
-	}
-
-	return decoded, nil
-}
diff --git a/internal/protohcl/decoder.go b/internal/protohcl/decoder.go
deleted file mode 100644
index 95b3bb86ffd92..0000000000000
--- a/internal/protohcl/decoder.go
+++ /dev/null
@@ -1,287 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package protohcl
-
-import (
-	"fmt"
-	"sort"
-
-	"github.com/hashicorp/hcl/v2"
-	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-cty/cty/function"
-	"google.golang.org/protobuf/reflect/protoreflect"
-)
-
-// MessageDecoder provides an abstract way to decode protobuf messages from HCL
-// blocks or objects.
-type MessageDecoder interface {
-	// EachField calls the given iterator for each field provided in the HCL source.
-	EachField(iter FieldIterator) error
-
-	// SkipFields returns a MessageDecoder that skips over the given fields. It is
-	// primarily used for doing two-pass decoding of protobuf `Any` fields.
-	SkipFields(fields ...string) MessageDecoder
-}
-
-// IterField represents a field discovered by the MessageDecoder.
-type IterField struct {
-	// Name is the HCL name of the field.
-	Name string
-
-	// Desc is the protobuf field descriptor.
-	Desc protoreflect.FieldDescriptor
-
-	// Val is the field value, only if it was given using HCL attribute syntax.
-	Val *cty.Value
-
-	// Blocks contains the HCL blocks that were given for this field.
-	Blocks []*hcl.Block
-
-	// Range determines where in the HCL source the field was given, it is useful
-	// for error messages.
-	Range hcl.Range
-}
-
-// FieldIterator is given to MessageDecoder.EachField to iterate over all of the
-// fields in a given HCL block or object.
-type FieldIterator struct {
-	// IgnoreUnknown instructs the MessageDecoder to skip over any fields not
-	// included in Desc.
-	IgnoreUnknown bool
-
-	// Desc is the protobuf descriptor for the message the caller is decoding into.
-	// It is used to determine which fields are valid.
-	Desc protoreflect.MessageDescriptor
-
-	// Func is called for each field in the given HCL block or object.
-	Func func(field *IterField) error
-}
-
-func newBodyDecoder(
-	body hcl.Body,
-	namer FieldNamer,
-	functions map[string]function.Function,
-) MessageDecoder {
-	return bodyDecoder{
-		body:       body,
-		namer:      namer,
-		functions:  functions,
-		skipFields: make(map[string]struct{}),
-	}
-}
-
-type bodyDecoder struct {
-	body       hcl.Body
-	namer      FieldNamer
-	functions  map[string]function.Function
-	skipFields map[string]struct{}
-}
-
-func (bd bodyDecoder) EachField(iter FieldIterator) error {
-	schema, err := bd.schema(iter.Desc)
-	if err != nil {
-		return err
-	}
-
-	var (
-		content *hcl.BodyContent
-		diags   hcl.Diagnostics
-	)
-	if iter.IgnoreUnknown {
-		content, _, diags = bd.body.PartialContent(schema)
-	} else {
-		content, diags = bd.body.Content(schema)
-	}
-	if diags.HasErrors() {
-		return diags
-	}
-
-	fields := make([]*IterField, 0)
-
-	for _, attr := range content.Attributes {
-		if _, ok := bd.skipFields[attr.Name]; ok {
-			continue
-		}
-
-		desc := bd.namer.GetField(iter.Desc.Fields(), attr.Name)
-
-		val, err := attr.Expr.Value(&hcl.EvalContext{Functions: bd.functions})
-		if err != nil {
-			return err
-		}
-
-		fields = append(fields, &IterField{
-			Name:  attr.Name,
-			Desc:  desc,
-			Val:   &val,
-			Range: attr.Expr.Range(),
-		})
-	}
-
-	for blockType, blocks := range content.Blocks.ByType() {
-		if _, ok := bd.skipFields[blockType]; ok {
-			continue
-		}
-
-		desc := bd.namer.GetField(iter.Desc.Fields(), blockType)
-
-		fields = append(fields, &IterField{
-			Name:   blockType,
-			Desc:   desc,
-			Blocks: blocks,
-		})
-	}
-
-	// Always handle Any fields last, as decoding them may require type information
-	// gathered from other fields (e.g. as in the case of Resource GVKs).
-	sort.Slice(fields, func(a, b int) bool {
-		if isAnyField(fields[b].Desc) && !isAnyField(fields[a].Desc) {
-			return true
-		}
-		return a < b
-	})
-
-	for _, field := range fields {
-		if err := iter.Func(field); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (bd bodyDecoder) SkipFields(fields ...string) MessageDecoder {
-	skip := make(map[string]struct{}, len(fields)+len(bd.skipFields))
-	for k, v := range bd.skipFields {
-		skip[k] = v
-	}
-	for _, field := range fields {
-		skip[field] = struct{}{}
-	}
-
-	// Note: we rely on the fact bd isn't a pointer to copy the struct here.
-	bd.skipFields = skip
-	return bd
-}
-
-func (bd bodyDecoder) schema(desc protoreflect.MessageDescriptor) (*hcl.BodySchema, error) {
-	var schema hcl.BodySchema
-
-	fields := desc.Fields()
-	for i := 0; i < fields.Len(); i++ {
-		f := fields.Get(i)
-
-		kind := f.Kind()
-		// maps are special and whether they can use block syntax depends on the value type
-		if f.IsMap() {
-			valueDesc := f.MapValue()
-			valueKind := valueDesc.Kind()
-
-			wktHint := wellKnownTypeSchemaHint(valueDesc)
-
-			// Maps with values that are Messages can generally be decoded using the block syntax.
-			// The exception are some of the Well-Known-Types that appear as scalar values with
-			// either string or numeric encoding but get parsed into message types. It is still
-			// fine to also decode these from the attribute syntax.
-			if valueKind == protoreflect.MessageKind && wktHint != wellKnownAttribute {
-				schema.Blocks = append(schema.Blocks, hcl.BlockHeaderSchema{
-					Type:       bd.namer.NameField(f),
-					LabelNames: []string{"key"},
-				})
-			}
-
-			// non-message types or Well Known Message types that need attribute encoding
-			// get decoded as attributes
-			schema.Attributes = append(schema.Attributes, hcl.AttributeSchema{
-				Name: bd.namer.NameField(f),
-			})
-			continue
-		}
-
-		wktHint := wellKnownTypeSchemaHint(f)
-
-		// message types generally will use block syntax unless its a well known
-		// message type that requires attribute syntax specifically.
-		if kind == protoreflect.MessageKind && wktHint != wellKnownAttribute {
-			schema.Blocks = append(schema.Blocks, hcl.BlockHeaderSchema{
-				Type: bd.namer.NameField(f),
-			})
-		}
-
-		// by default use attribute encoding
-		// - primitives
-		// - repeated primitives
-		// - Well Known Types requiring attribute syntax
-		// - repeated Well Known Types requiring attribute syntax
-		schema.Attributes = append(schema.Attributes, hcl.AttributeSchema{
-			Name: bd.namer.NameField(f),
-		})
-		continue
-	}
-
-	// Add skipped fields to the schema so HCL doesn't throw an error when it finds them.
-	for field := range bd.skipFields {
-		schema.Attributes = append(schema.Attributes, hcl.AttributeSchema{Name: field})
-		schema.Blocks = append(schema.Blocks, hcl.BlockHeaderSchema{Type: field})
-	}
-
-	return &schema, nil
-}
-
-func newObjectDecoder(object cty.Value, namer FieldNamer, rng hcl.Range) MessageDecoder {
-	return objectDecoder{
-		object:     object,
-		namer:      namer,
-		rng:        rng,
-		skipFields: make(map[string]struct{}),
-	}
-}
-
-type objectDecoder struct {
-	object     cty.Value
-	namer      FieldNamer
-	rng        hcl.Range
-	skipFields map[string]struct{}
-}
-
-func (od objectDecoder) EachField(iter FieldIterator) error {
-	for attr := range od.object.Type().AttributeTypes() {
-		if _, ok := od.skipFields[attr]; ok {
-			continue
-		}
-
-		desc := od.namer.GetField(iter.Desc.Fields(), attr)
-		if desc == nil {
-			if iter.IgnoreUnknown {
-				continue
-			} else {
-				return fmt.Errorf("%s: Unsupported argument; An argument named %q is not expected here.", od.rng, attr)
-			}
-		}
-
-		val := od.object.GetAttr(attr)
-		if err := iter.Func(&IterField{
-			Name: attr,
-			Desc: desc,
-			Val:  &val,
-		}); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (od objectDecoder) SkipFields(fields ...string) MessageDecoder {
-	skip := make(map[string]struct{}, len(fields)+len(od.skipFields))
-	for k, v := range od.skipFields {
-		skip[k] = v
-	}
-	for _, field := range fields {
-		skip[field] = struct{}{}
-	}
-
-	// Note: we rely on the fact od isn't a pointer to copy the struct here.
-	od.skipFields = skip
-	return od
-}
diff --git a/internal/protohcl/doc.go b/internal/protohcl/doc.go
deleted file mode 100644
index e3270f7cdcf19..0000000000000
--- a/internal/protohcl/doc.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// The protohcl package aims to define a canonical way to translate between
-// protobuf and HCL encodings of data.
-//
-// Similar to google.golang.org/protobuf/encoding/protojson it intends to be
-// opinionated about what the canonical HCL representation of a protobuf type
-// should be.
-//
-// As HCL is a user centric data format as opposed to JSON/Protobuf which
-// are intended to be used more by machines, efficiency is not a primary goal
-// of this package as it is expected that users are either doing the encoding to and
-// decoding from HCL at the edge (such as within the Consul CLI) or that even
-// when done on servers, the rate that servers perform these translations should
-// be low enough to have any inefficiency produce a tangible performance impact.
-//
-// HCL has two different syntaxes that could be used to represent data: attribute and block
-//
-// This implementation chooses to represent primitive values, enums and the well known wrapper types and
-// collections of these values (maps and repeated fields) with attribute syntax. Other messages and collections
-// with message value types will be represented with block syntax for example
-//
-// message Foo {
-//    map<string, int32> map_of_ints = 1;
-//	   map<string, OtherMessage> map_of_messages = 2;
-// }
-//
-// would have HCL like:
-//
-// map_of_ints = {
-//    "foo": 1,
-//    "bar": 2,
-// }
-// map_of_messages "foo" {
-//    ...other fields
-// }
-// map_of_messages "bar" {
-//    ...other fields
-// }
-//
-// Similar goes for list of primitives vs list of messages (except the block syntax uses no labels). The differences
-// between primitive fields outside of a collection and a message field really just amounts to not having to specify
-// the "=" between the field name and the "{" character.
-//
-// Field Mapping
-// | proto3                 | HCL Type      | example | notes                                                                           |
-// |------------------------+---------------+---------+---------------------------------------------------------------------------------+
-// | message                | Object        |         | Represented as a block                                                          |
-// | enum                   | String        |         |                                                                                 |
-// | map<K,V>               | Map           |         | All keys are converted to/from strings.                                         |
-// | repeated V             | List          |         |                                                                                 |
-// | bool                   | Bool          |         |                                                                                 |
-// | string                 | String        |         |                                                                                 |
-// | bytes                  | base64 String |         |                                                                                 |
-// | int32, fixed32, uint32 | Number        |         |                                                                                 |
-// | int64, fixed64, uint64 | Number        |         |                                                                                 |
-// | float, double          | Number        |         |                                                                                 |
-//
-// ----- Well Known Types -----
-//
-// | Any                    | Object        |         |                                                                                 |
-// | Timestamp              | String        |         | RFC 3339 compliant                                                              |
-// | Duration               | String        |         | String form is what would be accepted by time.ParseDuration                     |
-// | Struct                 | Map           |         |                                                                                 |
-// | Empty                  | Object        |         | An object with no fields                                                        |
-// | BoolValue              | Bool          |         | Mostly the same as a regular bool except null values in the HCL are preserved   |
-// | BytesValue             | Bytes         |         | Mostly the same as a regular bytes except null values in the HCL are preserved  |
-// | StringValue            | String        |         | Mostly the same as a regular string except null values in the HCL are preserved |
-// | FloatValue             | Number        |         | Mostly the same as a regular float except null values in the HCL are preserved  |
-// | DoubleValue            | Number        |         | Mostly the same as a regular double except null values in the HCL are preserved |
-// | Int32Value             | Number        |         | Mostly the same as a regular int32 except null values in the HCL are preserved  |
-// | UInt32Value            | Number        |         | Mostly the same as a regular uint32 except null values in the HCL are preserved |
-// | Int64Value             | Number        |         | Mostly the same as a regular int64 except null values in the HCL are preserved  |
-// | UInt64Value            | Number        |         | Mostly the same as a regular uint64 except null values in the HCL are preserved |
-// | FieldMask              | String        |         | Each string of the FieldMask will be joined with a '.'                          |
-//
-
-package protohcl
diff --git a/internal/protohcl/naming.go b/internal/protohcl/naming.go
deleted file mode 100644
index d8eef2275fd7d..0000000000000
--- a/internal/protohcl/naming.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package protohcl
-
-import "google.golang.org/protobuf/reflect/protoreflect"
-
-type FieldNamer interface {
-	NameField(protoreflect.FieldDescriptor) string
-	GetField(protoreflect.FieldDescriptors, string) protoreflect.FieldDescriptor
-}
-
-type textFieldNamer struct{}
-
-func (textFieldNamer) NameField(fd protoreflect.FieldDescriptor) string {
-	return fd.TextName()
-}
-
-func (textFieldNamer) GetField(fds protoreflect.FieldDescriptors, name string) protoreflect.FieldDescriptor {
-	return fds.ByTextName(name)
-}
diff --git a/internal/protohcl/oneof.go b/internal/protohcl/oneof.go
deleted file mode 100644
index 0c95326614bda..0000000000000
--- a/internal/protohcl/oneof.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package protohcl
-
-import (
-	"fmt"
-	"strings"
-
-	"google.golang.org/protobuf/reflect/protoreflect"
-)
-
-type oneOfTracker struct {
-	namer FieldNamer
-	set   map[protoreflect.FullName]string
-}
-
-func newOneOfTracker(namer FieldNamer) *oneOfTracker {
-	return &oneOfTracker{
-		namer: namer,
-		set:   make(map[protoreflect.FullName]string),
-	}
-}
-
-func (o *oneOfTracker) markFieldAsSet(desc protoreflect.FieldDescriptor) error {
-	oneof := desc.ContainingOneof()
-	if oneof == nil {
-		return nil
-	}
-
-	oneOfName := oneof.FullName()
-
-	if otherFieldName, ok := o.set[oneOfName]; ok {
-		oneOfFields := oneof.Fields()
-		var builder strings.Builder
-
-		for i := 0; i < oneOfFields.Len(); i++ {
-			name := o.namer.NameField(oneOfFields.Get(i))
-
-			if i == oneOfFields.Len()-1 {
-				builder.WriteString(fmt.Sprintf("%q", name))
-			} else if i == oneOfFields.Len()-2 {
-				builder.WriteString(fmt.Sprintf("%q and ", name))
-			} else {
-				builder.WriteString(fmt.Sprintf("%q, ", name))
-			}
-		}
-
-		return fmt.Errorf("Cannot set %q because %q was previously set. Only one of %s may be set.", o.namer.NameField(desc), otherFieldName, builder.String())
-	}
-
-	o.set[oneOfName] = o.namer.NameField(desc)
-	return nil
-}
diff --git a/internal/protohcl/primitives.go b/internal/protohcl/primitives.go
deleted file mode 100644
index c93218c997484..0000000000000
--- a/internal/protohcl/primitives.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package protohcl
-
-import (
-	"fmt"
-
-	"github.com/zclconf/go-cty/cty"
-	"google.golang.org/protobuf/reflect/protoreflect"
-)
-
-func decodeAttributeToPrimitive(desc protoreflect.FieldDescriptor, val cty.Value) (protoreflect.Value, error) {
-	switch kind := desc.Kind(); kind {
-	case protoreflect.BoolKind:
-		return protoBoolFromCty(val)
-	case protoreflect.EnumKind:
-		return protoEnumFromCty(desc, val)
-	case protoreflect.Int32Kind:
-		return protoInt32FromCty(val)
-	case protoreflect.Sint32Kind:
-		return protoInt32FromCty(val)
-	case protoreflect.Uint32Kind:
-		return protoUint32FromCty(val)
-	case protoreflect.Int64Kind:
-		return protoInt64FromCty(val)
-	case protoreflect.Sint64Kind:
-		return protoInt64FromCty(val)
-	case protoreflect.Uint64Kind:
-		return protoUint64FromCty(val)
-	case protoreflect.Sfixed32Kind:
-		return protoInt32FromCty(val)
-	case protoreflect.Fixed32Kind:
-		return protoUint32FromCty(val)
-	case protoreflect.FloatKind:
-		return protoFloatFromCty(val)
-	case protoreflect.Sfixed64Kind:
-		return protoInt64FromCty(val)
-	case protoreflect.Fixed64Kind:
-		return protoUint64FromCty(val)
-	case protoreflect.DoubleKind:
-		return protoDoubleFromCty(val)
-	case protoreflect.StringKind:
-		return protoStringFromCty(val)
-	case protoreflect.BytesKind:
-		return protoBytesFromCty(val)
-	default:
-		return protoreflect.Value{}, fmt.Errorf("unknown primitive protobuf kind: %q", kind.String())
-	}
-}
-
-func protoBoolFromCty(val cty.Value) (protoreflect.Value, error) {
-	goVal, err := boolFromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoreflect.ValueOfBool(goVal), nil
-}
-
-func protoEnumFromCty(desc protoreflect.FieldDescriptor, val cty.Value) (protoreflect.Value, error) {
-	if val.Type() != cty.String {
-		return protoreflect.Value{}, fmt.Errorf("expected value of type %s but actual type is %s", cty.String.FriendlyName(), val.Type().FriendlyName())
-	}
-
-	if val.IsNull() {
-		if desc.HasDefault() {
-			defaultValDesc := desc.DefaultEnumValue()
-			return protoreflect.ValueOfEnum(defaultValDesc.Number()), nil
-		}
-		return protoreflect.Value{}, fmt.Errorf("no default value for type and value is null")
-	}
-
-	valDesc := desc.Enum().Values().ByName(protoreflect.Name(val.AsString()))
-	if valDesc == nil {
-		if desc.HasDefault() {
-			defaultValDesc := desc.DefaultEnumValue()
-			return protoreflect.ValueOfEnum(defaultValDesc.Number()), nil
-		}
-		return protoreflect.Value{}, fmt.Errorf("no default value for type and value is invalid")
-	}
-
-	return protoreflect.ValueOfEnum(valDesc.Number()), nil
-}
-
-func protoInt32FromCty(val cty.Value) (protoreflect.Value, error) {
-	goVal, err := int32FromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoreflect.ValueOfInt32(goVal), nil
-}
-
-func protoUint32FromCty(val cty.Value) (protoreflect.Value, error) {
-	goVal, err := uint32FromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoreflect.ValueOfUint32(goVal), nil
-}
-
-func protoInt64FromCty(val cty.Value) (protoreflect.Value, error) {
-	goVal, err := int64FromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoreflect.ValueOfInt64(goVal), nil
-}
-
-func protoUint64FromCty(val cty.Value) (protoreflect.Value, error) {
-	goVal, err := uint64FromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoreflect.ValueOfUint64(goVal), nil
-}
-
-func protoFloatFromCty(val cty.Value) (protoreflect.Value, error) {
-	goVal, err := floatFromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoreflect.ValueOfFloat32(goVal), nil
-}
-
-func protoDoubleFromCty(val cty.Value) (protoreflect.Value, error) {
-	goVal, err := doubleFromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoreflect.ValueOfFloat64(goVal), nil
-}
-
-func protoStringFromCty(val cty.Value) (protoreflect.Value, error) {
-	goVal, err := stringFromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoreflect.ValueOfString(goVal), nil
-}
-
-func protoBytesFromCty(val cty.Value) (protoreflect.Value, error) {
-	goVal, err := bytesFromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoreflect.ValueOfBytes(goVal), nil
-}
diff --git a/internal/protohcl/testproto/buf.gen.yaml b/internal/protohcl/testproto/buf.gen.yaml
deleted file mode 100644
index fecee5cf24962..0000000000000
--- a/internal/protohcl/testproto/buf.gen.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-version: v1
-managed:
-  enabled: true
-  go_package_prefix:
-    default: github.com/hashicorp/consul/internal/protohcl/testproto
-plugins:
-  - name: go
-    out: .
-    opt: paths=source_relative
diff --git a/internal/protohcl/testproto/example.pb.go b/internal/protohcl/testproto/example.pb.go
deleted file mode 100644
index 304eac53d6d90..0000000000000
--- a/internal/protohcl/testproto/example.pb.go
+++ /dev/null
@@ -1,997 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: example.proto
-
-package testproto
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	anypb "google.golang.org/protobuf/types/known/anypb"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
-	emptypb "google.golang.org/protobuf/types/known/emptypb"
-	structpb "google.golang.org/protobuf/types/known/structpb"
-	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
-	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Protocol int32
-
-const (
-	Protocol_PROTOCOL_UNSPECIFIED Protocol = 0
-	Protocol_PROTOCOL_TCP         Protocol = 1
-	Protocol_PROTOCOL_UDP         Protocol = 2
-)
-
-// Enum value maps for Protocol.
-var (
-	Protocol_name = map[int32]string{
-		0: "PROTOCOL_UNSPECIFIED",
-		1: "PROTOCOL_TCP",
-		2: "PROTOCOL_UDP",
-	}
-	Protocol_value = map[string]int32{
-		"PROTOCOL_UNSPECIFIED": 0,
-		"PROTOCOL_TCP":         1,
-		"PROTOCOL_UDP":         2,
-	}
-)
-
-func (x Protocol) Enum() *Protocol {
-	p := new(Protocol)
-	*p = x
-	return p
-}
-
-func (x Protocol) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Protocol) Descriptor() protoreflect.EnumDescriptor {
-	return file_example_proto_enumTypes[0].Descriptor()
-}
-
-func (Protocol) Type() protoreflect.EnumType {
-	return &file_example_proto_enumTypes[0]
-}
-
-func (x Protocol) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Protocol.Descriptor instead.
-func (Protocol) EnumDescriptor() ([]byte, []int) {
-	return file_example_proto_rawDescGZIP(), []int{0}
-}
-
-type Primitives struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	DoubleVal   float64 `protobuf:"fixed64,1,opt,name=double_val,json=doubleVal,proto3" json:"double_val,omitempty"`
-	FloatVal    float32 `protobuf:"fixed32,2,opt,name=float_val,json=floatVal,proto3" json:"float_val,omitempty"`
-	Int32Val    int32   `protobuf:"varint,3,opt,name=int32_val,json=int32Val,proto3" json:"int32_val,omitempty"`
-	Int64Val    int64   `protobuf:"varint,4,opt,name=int64_val,json=int64Val,proto3" json:"int64_val,omitempty"`
-	Uint32Val   uint32  `protobuf:"varint,5,opt,name=uint32_val,json=uint32Val,proto3" json:"uint32_val,omitempty"`
-	Uint64Val   uint64  `protobuf:"varint,6,opt,name=uint64_val,json=uint64Val,proto3" json:"uint64_val,omitempty"`
-	Sint32Val   int32   `protobuf:"zigzag32,7,opt,name=sint32_val,json=sint32Val,proto3" json:"sint32_val,omitempty"`
-	Sint64Val   int64   `protobuf:"zigzag64,8,opt,name=sint64_val,json=sint64Val,proto3" json:"sint64_val,omitempty"`
-	Fixed32Val  uint32  `protobuf:"fixed32,9,opt,name=fixed32_val,json=fixed32Val,proto3" json:"fixed32_val,omitempty"`
-	Fixed64Val  uint64  `protobuf:"fixed64,10,opt,name=fixed64_val,json=fixed64Val,proto3" json:"fixed64_val,omitempty"`
-	Sfixed32Val int32   `protobuf:"fixed32,11,opt,name=sfixed32_val,json=sfixed32Val,proto3" json:"sfixed32_val,omitempty"`
-	Sfixed64Val int64   `protobuf:"fixed64,12,opt,name=sfixed64_val,json=sfixed64Val,proto3" json:"sfixed64_val,omitempty"`
-	BoolVal     bool    `protobuf:"varint,13,opt,name=bool_val,json=boolVal,proto3" json:"bool_val,omitempty"`
-	StringVal   string  `protobuf:"bytes,14,opt,name=string_val,json=stringVal,proto3" json:"string_val,omitempty"`
-	ByteVal     []byte  `protobuf:"bytes,15,opt,name=byte_val,json=byteVal,proto3" json:"byte_val,omitempty"`
-}
-
-func (x *Primitives) Reset() {
-	*x = Primitives{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_example_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Primitives) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Primitives) ProtoMessage() {}
-
-func (x *Primitives) ProtoReflect() protoreflect.Message {
-	mi := &file_example_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Primitives.ProtoReflect.Descriptor instead.
-func (*Primitives) Descriptor() ([]byte, []int) {
-	return file_example_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Primitives) GetDoubleVal() float64 {
-	if x != nil {
-		return x.DoubleVal
-	}
-	return 0
-}
-
-func (x *Primitives) GetFloatVal() float32 {
-	if x != nil {
-		return x.FloatVal
-	}
-	return 0
-}
-
-func (x *Primitives) GetInt32Val() int32 {
-	if x != nil {
-		return x.Int32Val
-	}
-	return 0
-}
-
-func (x *Primitives) GetInt64Val() int64 {
-	if x != nil {
-		return x.Int64Val
-	}
-	return 0
-}
-
-func (x *Primitives) GetUint32Val() uint32 {
-	if x != nil {
-		return x.Uint32Val
-	}
-	return 0
-}
-
-func (x *Primitives) GetUint64Val() uint64 {
-	if x != nil {
-		return x.Uint64Val
-	}
-	return 0
-}
-
-func (x *Primitives) GetSint32Val() int32 {
-	if x != nil {
-		return x.Sint32Val
-	}
-	return 0
-}
-
-func (x *Primitives) GetSint64Val() int64 {
-	if x != nil {
-		return x.Sint64Val
-	}
-	return 0
-}
-
-func (x *Primitives) GetFixed32Val() uint32 {
-	if x != nil {
-		return x.Fixed32Val
-	}
-	return 0
-}
-
-func (x *Primitives) GetFixed64Val() uint64 {
-	if x != nil {
-		return x.Fixed64Val
-	}
-	return 0
-}
-
-func (x *Primitives) GetSfixed32Val() int32 {
-	if x != nil {
-		return x.Sfixed32Val
-	}
-	return 0
-}
-
-func (x *Primitives) GetSfixed64Val() int64 {
-	if x != nil {
-		return x.Sfixed64Val
-	}
-	return 0
-}
-
-func (x *Primitives) GetBoolVal() bool {
-	if x != nil {
-		return x.BoolVal
-	}
-	return false
-}
-
-func (x *Primitives) GetStringVal() string {
-	if x != nil {
-		return x.StringVal
-	}
-	return ""
-}
-
-func (x *Primitives) GetByteVal() []byte {
-	if x != nil {
-		return x.ByteVal
-	}
-	return nil
-}
-
-type NestedAndCollections struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Primitives     *Primitives            `protobuf:"bytes,1,opt,name=primitives,proto3" json:"primitives,omitempty"`
-	PrimitivesList []*Primitives          `protobuf:"bytes,2,rep,name=primitives_list,json=primitivesList,proto3" json:"primitives_list,omitempty"`
-	PrimitivesMap  map[string]*Primitives `protobuf:"bytes,3,rep,name=primitives_map,json=primitivesMap,proto3" json:"primitives_map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	ProtocolMap    map[string]Protocol    `protobuf:"bytes,4,rep,name=protocol_map,json=protocolMap,proto3" json:"protocol_map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=hashicorp.consul.internal.protohcl.testproto.Protocol"`
-	IntList        []int32                `protobuf:"varint,5,rep,packed,name=int_list,json=intList,proto3" json:"int_list,omitempty"`
-}
-
-func (x *NestedAndCollections) Reset() {
-	*x = NestedAndCollections{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_example_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *NestedAndCollections) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*NestedAndCollections) ProtoMessage() {}
-
-func (x *NestedAndCollections) ProtoReflect() protoreflect.Message {
-	mi := &file_example_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use NestedAndCollections.ProtoReflect.Descriptor instead.
-func (*NestedAndCollections) Descriptor() ([]byte, []int) {
-	return file_example_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *NestedAndCollections) GetPrimitives() *Primitives {
-	if x != nil {
-		return x.Primitives
-	}
-	return nil
-}
-
-func (x *NestedAndCollections) GetPrimitivesList() []*Primitives {
-	if x != nil {
-		return x.PrimitivesList
-	}
-	return nil
-}
-
-func (x *NestedAndCollections) GetPrimitivesMap() map[string]*Primitives {
-	if x != nil {
-		return x.PrimitivesMap
-	}
-	return nil
-}
-
-func (x *NestedAndCollections) GetProtocolMap() map[string]Protocol {
-	if x != nil {
-		return x.ProtocolMap
-	}
-	return nil
-}
-
-func (x *NestedAndCollections) GetIntList() []int32 {
-	if x != nil {
-		return x.IntList
-	}
-	return nil
-}
-
-type Wrappers struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	DoubleVal *wrapperspb.DoubleValue `protobuf:"bytes,1,opt,name=double_val,json=doubleVal,proto3" json:"double_val,omitempty"`
-	FloatVal  *wrapperspb.FloatValue  `protobuf:"bytes,2,opt,name=float_val,json=floatVal,proto3" json:"float_val,omitempty"`
-	Int32Val  *wrapperspb.Int32Value  `protobuf:"bytes,3,opt,name=int32_val,json=int32Val,proto3" json:"int32_val,omitempty"`
-	Int64Val  *wrapperspb.Int64Value  `protobuf:"bytes,4,opt,name=int64_val,json=int64Val,proto3" json:"int64_val,omitempty"`
-	Uint32Val *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=uint32_val,json=uint32Val,proto3" json:"uint32_val,omitempty"`
-	Uint64Val *wrapperspb.UInt64Value `protobuf:"bytes,6,opt,name=uint64_val,json=uint64Val,proto3" json:"uint64_val,omitempty"`
-	BoolVal   *wrapperspb.BoolValue   `protobuf:"bytes,13,opt,name=bool_val,json=boolVal,proto3" json:"bool_val,omitempty"`
-	StringVal *wrapperspb.StringValue `protobuf:"bytes,14,opt,name=string_val,json=stringVal,proto3" json:"string_val,omitempty"`
-	BytesVal  *wrapperspb.BytesValue  `protobuf:"bytes,15,opt,name=bytes_val,json=bytesVal,proto3" json:"bytes_val,omitempty"`
-}
-
-func (x *Wrappers) Reset() {
-	*x = Wrappers{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_example_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Wrappers) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Wrappers) ProtoMessage() {}
-
-func (x *Wrappers) ProtoReflect() protoreflect.Message {
-	mi := &file_example_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Wrappers.ProtoReflect.Descriptor instead.
-func (*Wrappers) Descriptor() ([]byte, []int) {
-	return file_example_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *Wrappers) GetDoubleVal() *wrapperspb.DoubleValue {
-	if x != nil {
-		return x.DoubleVal
-	}
-	return nil
-}
-
-func (x *Wrappers) GetFloatVal() *wrapperspb.FloatValue {
-	if x != nil {
-		return x.FloatVal
-	}
-	return nil
-}
-
-func (x *Wrappers) GetInt32Val() *wrapperspb.Int32Value {
-	if x != nil {
-		return x.Int32Val
-	}
-	return nil
-}
-
-func (x *Wrappers) GetInt64Val() *wrapperspb.Int64Value {
-	if x != nil {
-		return x.Int64Val
-	}
-	return nil
-}
-
-func (x *Wrappers) GetUint32Val() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.Uint32Val
-	}
-	return nil
-}
-
-func (x *Wrappers) GetUint64Val() *wrapperspb.UInt64Value {
-	if x != nil {
-		return x.Uint64Val
-	}
-	return nil
-}
-
-func (x *Wrappers) GetBoolVal() *wrapperspb.BoolValue {
-	if x != nil {
-		return x.BoolVal
-	}
-	return nil
-}
-
-func (x *Wrappers) GetStringVal() *wrapperspb.StringValue {
-	if x != nil {
-		return x.StringVal
-	}
-	return nil
-}
-
-func (x *Wrappers) GetBytesVal() *wrapperspb.BytesValue {
-	if x != nil {
-		return x.BytesVal
-	}
-	return nil
-}
-
-type OneOf struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to Data:
-	//
-	//	*OneOf_Int32Val
-	//	*OneOf_Primitives
-	Data isOneOf_Data `protobuf_oneof:"data"`
-}
-
-func (x *OneOf) Reset() {
-	*x = OneOf{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_example_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OneOf) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OneOf) ProtoMessage() {}
-
-func (x *OneOf) ProtoReflect() protoreflect.Message {
-	mi := &file_example_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OneOf.ProtoReflect.Descriptor instead.
-func (*OneOf) Descriptor() ([]byte, []int) {
-	return file_example_proto_rawDescGZIP(), []int{3}
-}
-
-func (m *OneOf) GetData() isOneOf_Data {
-	if m != nil {
-		return m.Data
-	}
-	return nil
-}
-
-func (x *OneOf) GetInt32Val() int32 {
-	if x, ok := x.GetData().(*OneOf_Int32Val); ok {
-		return x.Int32Val
-	}
-	return 0
-}
-
-func (x *OneOf) GetPrimitives() *Primitives {
-	if x, ok := x.GetData().(*OneOf_Primitives); ok {
-		return x.Primitives
-	}
-	return nil
-}
-
-type isOneOf_Data interface {
-	isOneOf_Data()
-}
-
-type OneOf_Int32Val struct {
-	Int32Val int32 `protobuf:"varint,1,opt,name=int32_val,json=int32Val,proto3,oneof"`
-}
-
-type OneOf_Primitives struct {
-	Primitives *Primitives `protobuf:"bytes,2,opt,name=primitives,proto3,oneof"` // note repeated fields (including maps) are not allowed in oneofs
-}
-
-func (*OneOf_Int32Val) isOneOf_Data() {}
-
-func (*OneOf_Primitives) isOneOf_Data() {}
-
-type NonDynamicWellKnown struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EmptyVal     *emptypb.Empty         `protobuf:"bytes,1,opt,name=empty_val,json=emptyVal,proto3" json:"empty_val,omitempty"`
-	TimestampVal *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=timestamp_val,json=timestampVal,proto3" json:"timestamp_val,omitempty"`
-	DurationVal  *durationpb.Duration   `protobuf:"bytes,3,opt,name=duration_val,json=durationVal,proto3" json:"duration_val,omitempty"`
-}
-
-func (x *NonDynamicWellKnown) Reset() {
-	*x = NonDynamicWellKnown{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_example_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *NonDynamicWellKnown) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*NonDynamicWellKnown) ProtoMessage() {}
-
-func (x *NonDynamicWellKnown) ProtoReflect() protoreflect.Message {
-	mi := &file_example_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use NonDynamicWellKnown.ProtoReflect.Descriptor instead.
-func (*NonDynamicWellKnown) Descriptor() ([]byte, []int) {
-	return file_example_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *NonDynamicWellKnown) GetEmptyVal() *emptypb.Empty {
-	if x != nil {
-		return x.EmptyVal
-	}
-	return nil
-}
-
-func (x *NonDynamicWellKnown) GetTimestampVal() *timestamppb.Timestamp {
-	if x != nil {
-		return x.TimestampVal
-	}
-	return nil
-}
-
-func (x *NonDynamicWellKnown) GetDurationVal() *durationpb.Duration {
-	if x != nil {
-		return x.DurationVal
-	}
-	return nil
-}
-
-type DynamicWellKnown struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	AnyVal    *anypb.Any       `protobuf:"bytes,1,opt,name=any_val,json=anyVal,proto3" json:"any_val,omitempty"`
-	StructVal *structpb.Struct `protobuf:"bytes,2,opt,name=struct_val,json=structVal,proto3" json:"struct_val,omitempty"`
-	AnyList   []*anypb.Any     `protobuf:"bytes,3,rep,name=any_list,json=anyList,proto3" json:"any_list,omitempty"`
-}
-
-func (x *DynamicWellKnown) Reset() {
-	*x = DynamicWellKnown{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_example_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DynamicWellKnown) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DynamicWellKnown) ProtoMessage() {}
-
-func (x *DynamicWellKnown) ProtoReflect() protoreflect.Message {
-	mi := &file_example_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DynamicWellKnown.ProtoReflect.Descriptor instead.
-func (*DynamicWellKnown) Descriptor() ([]byte, []int) {
-	return file_example_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *DynamicWellKnown) GetAnyVal() *anypb.Any {
-	if x != nil {
-		return x.AnyVal
-	}
-	return nil
-}
-
-func (x *DynamicWellKnown) GetStructVal() *structpb.Struct {
-	if x != nil {
-		return x.StructVal
-	}
-	return nil
-}
-
-func (x *DynamicWellKnown) GetAnyList() []*anypb.Any {
-	if x != nil {
-		return x.AnyList
-	}
-	return nil
-}
-
-var File_example_proto protoreflect.FileDescriptor
-
-var file_example_proto_rawDesc = []byte{
-	0x0a, 0x0d, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x2c, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x68, 0x63, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65,
-	0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65,
-	0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61,
-	0x70, 0x70, 0x65, 0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdb, 0x03, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69,
-	0x76, 0x65, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x5f, 0x76, 0x61,
-	0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x52, 0x09, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56,
-	0x61, 0x6c, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x56, 0x61, 0x6c, 0x12,
-	0x1b, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x12, 0x1b, 0x0a, 0x09,
-	0x69, 0x6e, 0x74, 0x36, 0x34, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x08, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x0a, 0x75, 0x69, 0x6e,
-	0x74, 0x33, 0x32, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x75,
-	0x69, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x0a, 0x75, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x75, 0x69,
-	0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x69, 0x6e, 0x74, 0x33,
-	0x32, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x11, 0x52, 0x09, 0x73, 0x69, 0x6e,
-	0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x69, 0x6e, 0x74, 0x36, 0x34,
-	0x5f, 0x76, 0x61, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x12, 0x52, 0x09, 0x73, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x56, 0x61, 0x6c, 0x12, 0x1f, 0x0a, 0x0b, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32,
-	0x5f, 0x76, 0x61, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x07, 0x52, 0x0a, 0x66, 0x69, 0x78, 0x65,
-	0x64, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x12, 0x1f, 0x0a, 0x0b, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36,
-	0x34, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x06, 0x52, 0x0a, 0x66, 0x69, 0x78,
-	0x65, 0x64, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x66, 0x69, 0x78, 0x65,
-	0x64, 0x33, 0x32, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0f, 0x52, 0x0b, 0x73,
-	0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x66,
-	0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x10,
-	0x52, 0x0b, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x12, 0x19, 0x0a,
-	0x08, 0x62, 0x6f, 0x6f, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x07, 0x62, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x74, 0x72, 0x69,
-	0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x74,
-	0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x12, 0x19, 0x0a, 0x08, 0x62, 0x79, 0x74, 0x65, 0x5f,
-	0x76, 0x61, 0x6c, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x62, 0x79, 0x74, 0x65, 0x56,
-	0x61, 0x6c, 0x22, 0xd8, 0x05, 0x0a, 0x14, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x41, 0x6e, 0x64,
-	0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x58, 0x0a, 0x0a, 0x70,
-	0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x68, 0x63, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50,
-	0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x6d, 0x69,
-	0x74, 0x69, 0x76, 0x65, 0x73, 0x12, 0x61, 0x0a, 0x0f, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69,
-	0x76, 0x65, 0x73, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x68, 0x63, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x72,
-	0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x52, 0x0e, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74,
-	0x69, 0x76, 0x65, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x7c, 0x0a, 0x0e, 0x70, 0x72, 0x69, 0x6d,
-	0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x6d, 0x61, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x55, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x68, 0x63, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x41, 0x6e, 0x64, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x4d,
-	0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0d, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69,
-	0x76, 0x65, 0x73, 0x4d, 0x61, 0x70, 0x12, 0x76, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x5f, 0x6d, 0x61, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x53, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x68, 0x63,
-	0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4e, 0x65, 0x73, 0x74,
-	0x65, 0x64, 0x41, 0x6e, 0x64, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x0b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x4d, 0x61, 0x70, 0x12, 0x19,
-	0x0a, 0x08, 0x69, 0x6e, 0x74, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05,
-	0x52, 0x07, 0x69, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x1a, 0x7a, 0x0a, 0x12, 0x50, 0x72, 0x69,
-	0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x4e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x68, 0x63, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x76, 0x0a, 0x10, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
-	0x6c, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x4c, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x68, 0x63, 0x6c, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x9d, 0x04,
-	0x0a, 0x08, 0x57, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x12, 0x3b, 0x0a, 0x0a, 0x64, 0x6f,
-	0x75, 0x62, 0x6c, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x64, 0x6f,
-	0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x12, 0x38, 0x0a, 0x09, 0x66, 0x6c, 0x6f, 0x61, 0x74,
-	0x5f, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x6c, 0x6f,
-	0x61, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x08, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x56, 0x61,
-	0x6c, 0x12, 0x38, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x12, 0x38, 0x0a, 0x09, 0x69,
-	0x6e, 0x74, 0x36, 0x34, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x08, 0x69, 0x6e, 0x74,
-	0x36, 0x34, 0x56, 0x61, 0x6c, 0x12, 0x3b, 0x0a, 0x0a, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f,
-	0x76, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74,
-	0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x56,
-	0x61, 0x6c, 0x12, 0x3b, 0x0a, 0x0a, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x5f, 0x76, 0x61, 0x6c,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x12,
-	0x35, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x0d, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x62,
-	0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x12, 0x3b, 0x0a, 0x0a, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x5f, 0x76, 0x61, 0x6c, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x56, 0x61, 0x6c, 0x12, 0x38, 0x0a, 0x09, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x76, 0x61, 0x6c,
-	0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x79, 0x74, 0x65, 0x73, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x52, 0x08, 0x62, 0x79, 0x74, 0x65, 0x73, 0x56, 0x61, 0x6c, 0x22, 0x8a, 0x01,
-	0x0a, 0x05, 0x4f, 0x6e, 0x65, 0x4f, 0x66, 0x12, 0x1d, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x5f, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x08, 0x69, 0x6e,
-	0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x12, 0x5a, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74,
-	0x69, 0x76, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x68, 0x63, 0x6c, 0x2e,
-	0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74,
-	0x69, 0x76, 0x65, 0x73, 0x48, 0x00, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76,
-	0x65, 0x73, 0x42, 0x06, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xc9, 0x01, 0x0a, 0x13, 0x4e,
-	0x6f, 0x6e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f,
-	0x77, 0x6e, 0x12, 0x33, 0x0a, 0x09, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x08, 0x65,
-	0x6d, 0x70, 0x74, 0x79, 0x56, 0x61, 0x6c, 0x12, 0x3f, 0x0a, 0x0d, 0x74, 0x69, 0x6d, 0x65, 0x73,
-	0x74, 0x61, 0x6d, 0x70, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0c, 0x74, 0x69, 0x6d, 0x65,
-	0x73, 0x74, 0x61, 0x6d, 0x70, 0x56, 0x61, 0x6c, 0x12, 0x3c, 0x0a, 0x0c, 0x64, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x64, 0x75, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x56, 0x61, 0x6c, 0x22, 0xaa, 0x01, 0x0a, 0x10, 0x44, 0x79, 0x6e, 0x61, 0x6d,
-	0x69, 0x63, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x12, 0x2d, 0x0a, 0x07, 0x61,
-	0x6e, 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41,
-	0x6e, 0x79, 0x52, 0x06, 0x61, 0x6e, 0x79, 0x56, 0x61, 0x6c, 0x12, 0x36, 0x0a, 0x0a, 0x73, 0x74,
-	0x72, 0x75, 0x63, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x09, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x56,
-	0x61, 0x6c, 0x12, 0x2f, 0x0a, 0x08, 0x61, 0x6e, 0x79, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x03,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x07, 0x61, 0x6e, 0x79, 0x4c,
-	0x69, 0x73, 0x74, 0x2a, 0x48, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12,
-	0x18, 0x0a, 0x14, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x50,
-	0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x52, 0x4f,
-	0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x54, 0x43, 0x50, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x50,
-	0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x55, 0x44, 0x50, 0x10, 0x02, 0x42, 0xcf, 0x02,
-	0x0a, 0x30, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x68, 0x63, 0x6c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x42, 0x0c, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x68, 0x63,
-	0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xa2, 0x02, 0x05, 0x48, 0x43,
-	0x49, 0x50, 0x54, 0xaa, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x68, 0x63, 0x6c, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0xca, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x68, 0x63, 0x6c, 0x5c, 0x54, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0xe2, 0x02, 0x38, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x68, 0x63, 0x6c, 0x5c, 0x54, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x30, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x68, 0x63, 0x6c, 0x3a, 0x3a, 0x54, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_example_proto_rawDescOnce sync.Once
-	file_example_proto_rawDescData = file_example_proto_rawDesc
-)
-
-func file_example_proto_rawDescGZIP() []byte {
-	file_example_proto_rawDescOnce.Do(func() {
-		file_example_proto_rawDescData = protoimpl.X.CompressGZIP(file_example_proto_rawDescData)
-	})
-	return file_example_proto_rawDescData
-}
-
-var file_example_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_example_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
-var file_example_proto_goTypes = []interface{}{
-	(Protocol)(0),                  // 0: hashicorp.consul.internal.protohcl.testproto.Protocol
-	(*Primitives)(nil),             // 1: hashicorp.consul.internal.protohcl.testproto.Primitives
-	(*NestedAndCollections)(nil),   // 2: hashicorp.consul.internal.protohcl.testproto.NestedAndCollections
-	(*Wrappers)(nil),               // 3: hashicorp.consul.internal.protohcl.testproto.Wrappers
-	(*OneOf)(nil),                  // 4: hashicorp.consul.internal.protohcl.testproto.OneOf
-	(*NonDynamicWellKnown)(nil),    // 5: hashicorp.consul.internal.protohcl.testproto.NonDynamicWellKnown
-	(*DynamicWellKnown)(nil),       // 6: hashicorp.consul.internal.protohcl.testproto.DynamicWellKnown
-	nil,                            // 7: hashicorp.consul.internal.protohcl.testproto.NestedAndCollections.PrimitivesMapEntry
-	nil,                            // 8: hashicorp.consul.internal.protohcl.testproto.NestedAndCollections.ProtocolMapEntry
-	(*wrapperspb.DoubleValue)(nil), // 9: google.protobuf.DoubleValue
-	(*wrapperspb.FloatValue)(nil),  // 10: google.protobuf.FloatValue
-	(*wrapperspb.Int32Value)(nil),  // 11: google.protobuf.Int32Value
-	(*wrapperspb.Int64Value)(nil),  // 12: google.protobuf.Int64Value
-	(*wrapperspb.UInt32Value)(nil), // 13: google.protobuf.UInt32Value
-	(*wrapperspb.UInt64Value)(nil), // 14: google.protobuf.UInt64Value
-	(*wrapperspb.BoolValue)(nil),   // 15: google.protobuf.BoolValue
-	(*wrapperspb.StringValue)(nil), // 16: google.protobuf.StringValue
-	(*wrapperspb.BytesValue)(nil),  // 17: google.protobuf.BytesValue
-	(*emptypb.Empty)(nil),          // 18: google.protobuf.Empty
-	(*timestamppb.Timestamp)(nil),  // 19: google.protobuf.Timestamp
-	(*durationpb.Duration)(nil),    // 20: google.protobuf.Duration
-	(*anypb.Any)(nil),              // 21: google.protobuf.Any
-	(*structpb.Struct)(nil),        // 22: google.protobuf.Struct
-}
-var file_example_proto_depIdxs = []int32{
-	1,  // 0: hashicorp.consul.internal.protohcl.testproto.NestedAndCollections.primitives:type_name -> hashicorp.consul.internal.protohcl.testproto.Primitives
-	1,  // 1: hashicorp.consul.internal.protohcl.testproto.NestedAndCollections.primitives_list:type_name -> hashicorp.consul.internal.protohcl.testproto.Primitives
-	7,  // 2: hashicorp.consul.internal.protohcl.testproto.NestedAndCollections.primitives_map:type_name -> hashicorp.consul.internal.protohcl.testproto.NestedAndCollections.PrimitivesMapEntry
-	8,  // 3: hashicorp.consul.internal.protohcl.testproto.NestedAndCollections.protocol_map:type_name -> hashicorp.consul.internal.protohcl.testproto.NestedAndCollections.ProtocolMapEntry
-	9,  // 4: hashicorp.consul.internal.protohcl.testproto.Wrappers.double_val:type_name -> google.protobuf.DoubleValue
-	10, // 5: hashicorp.consul.internal.protohcl.testproto.Wrappers.float_val:type_name -> google.protobuf.FloatValue
-	11, // 6: hashicorp.consul.internal.protohcl.testproto.Wrappers.int32_val:type_name -> google.protobuf.Int32Value
-	12, // 7: hashicorp.consul.internal.protohcl.testproto.Wrappers.int64_val:type_name -> google.protobuf.Int64Value
-	13, // 8: hashicorp.consul.internal.protohcl.testproto.Wrappers.uint32_val:type_name -> google.protobuf.UInt32Value
-	14, // 9: hashicorp.consul.internal.protohcl.testproto.Wrappers.uint64_val:type_name -> google.protobuf.UInt64Value
-	15, // 10: hashicorp.consul.internal.protohcl.testproto.Wrappers.bool_val:type_name -> google.protobuf.BoolValue
-	16, // 11: hashicorp.consul.internal.protohcl.testproto.Wrappers.string_val:type_name -> google.protobuf.StringValue
-	17, // 12: hashicorp.consul.internal.protohcl.testproto.Wrappers.bytes_val:type_name -> google.protobuf.BytesValue
-	1,  // 13: hashicorp.consul.internal.protohcl.testproto.OneOf.primitives:type_name -> hashicorp.consul.internal.protohcl.testproto.Primitives
-	18, // 14: hashicorp.consul.internal.protohcl.testproto.NonDynamicWellKnown.empty_val:type_name -> google.protobuf.Empty
-	19, // 15: hashicorp.consul.internal.protohcl.testproto.NonDynamicWellKnown.timestamp_val:type_name -> google.protobuf.Timestamp
-	20, // 16: hashicorp.consul.internal.protohcl.testproto.NonDynamicWellKnown.duration_val:type_name -> google.protobuf.Duration
-	21, // 17: hashicorp.consul.internal.protohcl.testproto.DynamicWellKnown.any_val:type_name -> google.protobuf.Any
-	22, // 18: hashicorp.consul.internal.protohcl.testproto.DynamicWellKnown.struct_val:type_name -> google.protobuf.Struct
-	21, // 19: hashicorp.consul.internal.protohcl.testproto.DynamicWellKnown.any_list:type_name -> google.protobuf.Any
-	1,  // 20: hashicorp.consul.internal.protohcl.testproto.NestedAndCollections.PrimitivesMapEntry.value:type_name -> hashicorp.consul.internal.protohcl.testproto.Primitives
-	0,  // 21: hashicorp.consul.internal.protohcl.testproto.NestedAndCollections.ProtocolMapEntry.value:type_name -> hashicorp.consul.internal.protohcl.testproto.Protocol
-	22, // [22:22] is the sub-list for method output_type
-	22, // [22:22] is the sub-list for method input_type
-	22, // [22:22] is the sub-list for extension type_name
-	22, // [22:22] is the sub-list for extension extendee
-	0,  // [0:22] is the sub-list for field type_name
-}
-
-func init() { file_example_proto_init() }
-func file_example_proto_init() {
-	if File_example_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_example_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Primitives); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_example_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NestedAndCollections); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_example_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Wrappers); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_example_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OneOf); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_example_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NonDynamicWellKnown); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_example_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DynamicWellKnown); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_example_proto_msgTypes[3].OneofWrappers = []interface{}{
-		(*OneOf_Int32Val)(nil),
-		(*OneOf_Primitives)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_example_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   8,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_example_proto_goTypes,
-		DependencyIndexes: file_example_proto_depIdxs,
-		EnumInfos:         file_example_proto_enumTypes,
-		MessageInfos:      file_example_proto_msgTypes,
-	}.Build()
-	File_example_proto = out.File
-	file_example_proto_rawDesc = nil
-	file_example_proto_goTypes = nil
-	file_example_proto_depIdxs = nil
-}
diff --git a/internal/protohcl/testproto/example.proto b/internal/protohcl/testproto/example.proto
deleted file mode 100644
index 17bf737fa3aca..0000000000000
--- a/internal/protohcl/testproto/example.proto
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-package hashicorp.consul.internal.protohcl.testproto;
-
-import "google/protobuf/duration.proto";
-import "google/protobuf/empty.proto";
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/wrappers.proto";
-import "google/protobuf/any.proto";
-import "google/protobuf/struct.proto";
-
-message Primitives {
-  double double_val = 1;
-  float float_val = 2;
-  int32 int32_val = 3;
-  int64 int64_val = 4;
-  uint32 uint32_val = 5;
-  uint64 uint64_val = 6;
-  sint32 sint32_val = 7;
-  sint64 sint64_val = 8;
-  fixed32 fixed32_val = 9;
-  fixed64 fixed64_val = 10;
-  sfixed32 sfixed32_val = 11;
-  sfixed64 sfixed64_val = 12;
-  bool bool_val = 13;
-  string string_val = 14;
-  bytes byte_val = 15;
-}
-
-enum Protocol {
-  PROTOCOL_UNSPECIFIED = 0;
-  PROTOCOL_TCP = 1;
-  PROTOCOL_UDP = 2;
-}
-
-message NestedAndCollections {
-  Primitives primitives = 1;
-  repeated Primitives primitives_list = 2;
-  map<string, Primitives> primitives_map = 3;
-  map<string, Protocol> protocol_map = 4;
-  repeated int32 int_list = 5;
-}
-
-message Wrappers {
-  google.protobuf.DoubleValue double_val = 1;
-  google.protobuf.FloatValue float_val = 2;
-  google.protobuf.Int32Value int32_val = 3;
-  google.protobuf.Int64Value int64_val = 4;
-  google.protobuf.UInt32Value uint32_val = 5;
-  google.protobuf.UInt64Value uint64_val = 6;
-  google.protobuf.BoolValue bool_val = 13;
-  google.protobuf.StringValue string_val = 14;
-  google.protobuf.BytesValue bytes_val = 15;
-}
-
-message OneOf {
-  oneof data {
-    int32 int32_val = 1;
-    Primitives primitives = 2;
-    // note repeated fields (including maps) are not allowed in oneofs
-  }
-}
-
-message NonDynamicWellKnown {
-  google.protobuf.Empty empty_val = 1;
-  google.protobuf.Timestamp timestamp_val = 2;
-  google.protobuf.Duration duration_val = 3;
-}
-
-message DynamicWellKnown {
-  google.protobuf.Any any_val = 1;
-  google.protobuf.Struct struct_val = 2;
-  repeated google.protobuf.Any any_list = 3;
-}
diff --git a/internal/protohcl/unmarshal.go b/internal/protohcl/unmarshal.go
deleted file mode 100644
index 0f3c80a4c26e3..0000000000000
--- a/internal/protohcl/unmarshal.go
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package protohcl
-
-import (
-	"github.com/hashicorp/hcl/v2"
-	"github.com/hashicorp/hcl/v2/hclparse"
-	"github.com/zclconf/go-cty/cty/function"
-	"google.golang.org/protobuf/reflect/protoreflect"
-)
-
-// UnmarshalContext provides information about the context in which we are
-// unmarshalling HCL. It is primarily used for decoding Any fields based on
-// surrounding information (e.g. the resource Type block).
-type UnmarshalContext struct {
-	// Parent context.
-	Parent *UnmarshalContext
-
-	// Name of the field that we are unmarshalling.
-	Name string
-
-	// Message is the protobuf message that we are unmarshalling into (may be nil).
-	Message protoreflect.Message
-
-	// Range of where this field was in the HCL source.
-	Range hcl.Range
-}
-
-// ErrorRange returns a range that can be used in error messages.
-func (ctx *UnmarshalContext) ErrorRange() hcl.Range {
-	for {
-		if !ctx.Range.Empty() || ctx.Parent == nil {
-			return ctx.Range
-		}
-		ctx = ctx.Parent
-	}
-}
-
-func Unmarshal(src []byte, dest protoreflect.ProtoMessage) error {
-	return UnmarshalOptions{}.Unmarshal(src, dest)
-}
-
-type UnmarshalOptions struct {
-	AnyTypeProvider AnyTypeProvider
-	SourceFileName  string
-	FieldNamer      FieldNamer
-	Functions       map[string]function.Function
-}
-
-func (u UnmarshalOptions) Unmarshal(src []byte, dest protoreflect.ProtoMessage) error {
-	rmsg := dest.ProtoReflect()
-
-	file, diags := hclparse.NewParser().ParseHCL(src, u.SourceFileName)
-
-	// error performing basic HCL parsing
-	if diags.HasErrors() {
-		return diags
-	}
-
-	u.clearAll(rmsg)
-
-	if u.FieldNamer == nil {
-		u.FieldNamer = textFieldNamer{}
-	}
-
-	return u.decodeMessage(
-		&UnmarshalContext{Message: rmsg},
-		u.bodyDecoder(file.Body),
-		rmsg,
-	)
-}
-
-func (u UnmarshalOptions) bodyDecoder(body hcl.Body) MessageDecoder {
-	return newBodyDecoder(body, u.FieldNamer, u.Functions)
-}
-
-func (u UnmarshalOptions) decodeMessage(ctx *UnmarshalContext, decoder MessageDecoder, msg protoreflect.Message) error {
-	desc := msg.Descriptor()
-
-	if desc.FullName() == wellKnownTypeAny {
-		return u.decodeAny(ctx, decoder, msg)
-	}
-
-	tracker := newOneOfTracker(u.FieldNamer)
-
-	return decoder.EachField(FieldIterator{
-		Desc: desc,
-		Func: func(field *IterField) error {
-			if err := tracker.markFieldAsSet(field.Desc); err != nil {
-				return err
-			}
-
-			var (
-				protoVal protoreflect.Value
-				err      error
-			)
-			switch {
-			case field.Val != nil:
-				protoVal, err = u.decodeAttribute(
-					&UnmarshalContext{
-						Parent: ctx,
-						Name:   field.Name,
-						Range:  field.Range,
-					},
-					func() protoreflect.Value { return msg.NewField(field.Desc) },
-					field.Desc,
-					*field.Val,
-					true,
-				)
-			case len(field.Blocks) != 0:
-				protoVal, err = u.decodeBlocks(ctx, field.Blocks, msg, field.Desc)
-			default:
-				panic("decoder yielded no blocks or attributes")
-			}
-			if err != nil {
-				return err
-			}
-
-			if protoVal.IsValid() {
-				msg.Set(field.Desc, protoVal)
-			}
-
-			return nil
-		},
-	})
-}
-
-type newMessageFn func() protoreflect.Value
-
-func (u UnmarshalOptions) clearAll(msg protoreflect.Message) {
-	fields := msg.Descriptor().Fields()
-
-	for i := 0; i < fields.Len(); i++ {
-		msg.Clear(fields.Get(i))
-	}
-}
diff --git a/internal/protohcl/unmarshal_test.go b/internal/protohcl/unmarshal_test.go
deleted file mode 100644
index b1fc854279af2..0000000000000
--- a/internal/protohcl/unmarshal_test.go
+++ /dev/null
@@ -1,610 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package protohcl
-
-import (
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-cty/cty/function"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/protohcl/testproto"
-	"github.com/hashicorp/hcl/v2/hclparse"
-)
-
-func TestPrimitives(t *testing.T) {
-	hcl := `
-		double_val = 1.234
-  		float_val = 2.345
-  		int32_val = 536870912
-  		int64_val = 25769803776
-  		uint32_val = 2148532224
-  		uint64_val = 9223372041149743104
-  		sint32_val = 536870912
-  		sint64_val = 25769803776
-  		fixed32_val = 2148532224
-  		fixed64_val = 9223372041149743104
-  		sfixed32_val = 536870912
-  		sfixed64_val = 25769803776
-  		bool_val = true
-  		string_val = "foo"
-		// This is base64 encoded "bar"
-  		byte_val = "YmFy"
-	`
-
-	var out testproto.Primitives
-
-	err := Unmarshal([]byte(hcl), &out)
-	require.NoError(t, err)
-
-	require.Equal(t, out.DoubleVal, float64(1.234))
-	require.Equal(t, out.FloatVal, float32(2.345))
-	require.Equal(t, out.Int32Val, int32(536870912))
-	require.Equal(t, out.Int64Val, int64(25769803776))
-	require.Equal(t, out.Uint32Val, uint32(2148532224))
-	require.Equal(t, out.Uint64Val, uint64(9223372041149743104))
-	require.Equal(t, out.Sint32Val, int32(536870912))
-	require.Equal(t, out.Sint64Val, int64(25769803776))
-	require.Equal(t, out.Fixed32Val, uint32(2148532224))
-	require.Equal(t, out.Fixed64Val, uint64(9223372041149743104))
-	require.Equal(t, out.Sfixed32Val, int32(536870912))
-	require.Equal(t, out.Sfixed64Val, int64(25769803776))
-	require.Equal(t, out.BoolVal, true)
-	require.Equal(t, out.StringVal, "foo")
-	require.Equal(t, out.ByteVal, []byte("bar"))
-}
-
-func TestNestedAndCollections(t *testing.T) {
-	hcl := `
-		primitives {
-			uint32_val = 42
-		}
-		
-		primitives_map "foo" {
-			uint32_val = 42
-		}
-		
-		protocol_map = {
-			"foo" = "PROTOCOL_TCP"
-		}
-		
-		primitives_list {
-			uint32_val = 42
-		}
-		
-		primitives_list {
-			uint32_val = 56
-		}
-		
-		int_list = [
-			1,
-			2
-		]
-	
-	`
-
-	var out testproto.NestedAndCollections
-
-	err := Unmarshal([]byte(hcl), &out)
-	require.NoError(t, err)
-
-	require.NotNil(t, out.Primitives)
-	require.Equal(t, out.Primitives.Uint32Val, uint32(42))
-	require.NotNil(t, out.PrimitivesMap)
-	require.Equal(t, out.PrimitivesMap["foo"].Uint32Val, uint32(42))
-	require.NotNil(t, out.ProtocolMap)
-	require.Equal(t, out.ProtocolMap["foo"], testproto.Protocol_PROTOCOL_TCP)
-	require.Len(t, out.PrimitivesList, 2)
-	require.Equal(t, out.PrimitivesList[0].Uint32Val, uint32(42))
-	require.Equal(t, out.PrimitivesList[1].Uint32Val, uint32(56))
-	require.Len(t, out.IntList, 2)
-	require.Equal(t, out.IntList[1], int32(2))
-}
-
-func TestNestedAndCollections_AttributeSyntax(t *testing.T) {
-	hcl := `
-		primitives {
-			uint32_val = 42
-		}
-		
-		primitives_map = {
-			"foo" = {
-			   uint32_val = 42
-			}
-		}
-		
-		protocol_map = {
-			"foo" = "PROTOCOL_TCP"
-		}
-		
-		primitives_list = [
-			{
-				uint32_val = 42
-			},
-			{
-				uint32_val = 56
-			}
-		] 
-		
-		int_list = [
-			1,
-			2
-		]
-	
-	`
-
-	var out testproto.NestedAndCollections
-
-	err := Unmarshal([]byte(hcl), &out)
-	require.NoError(t, err)
-
-	require.NotNil(t, out.Primitives)
-	require.Equal(t, out.Primitives.Uint32Val, uint32(42))
-	require.NotNil(t, out.PrimitivesMap)
-	require.Equal(t, out.PrimitivesMap["foo"].Uint32Val, uint32(42))
-	require.NotNil(t, out.ProtocolMap)
-	require.Equal(t, out.ProtocolMap["foo"], testproto.Protocol_PROTOCOL_TCP)
-	require.Len(t, out.PrimitivesList, 2)
-	require.Equal(t, out.PrimitivesList[0].Uint32Val, uint32(42))
-	require.Equal(t, out.PrimitivesList[1].Uint32Val, uint32(56))
-	require.Len(t, out.IntList, 2)
-	require.Equal(t, out.IntList[1], int32(2))
-}
-
-func TestPrimitiveWrappers(t *testing.T) {
-	hcl := `
-		double_val = 1.234
-  		float_val = 2.345
-  		int32_val = 536870912
-  		int64_val = 25769803776
-  		uint32_val = 2148532224
-  		uint64_val = 9223372041149743104
-  		bool_val = true
-  		string_val = "foo"
-		// This is base64 encoded "bar"
-  		bytes_val = "YmFy"
-	`
-	var out testproto.Wrappers
-
-	err := Unmarshal([]byte(hcl), &out)
-	require.NoError(t, err)
-	require.Equal(t, out.DoubleVal.Value, float64(1.234))
-	require.Equal(t, out.FloatVal.Value, float32(2.345))
-	require.Equal(t, out.Int32Val.Value, int32(536870912))
-	require.Equal(t, out.Int64Val.Value, int64(25769803776))
-	require.Equal(t, out.Uint32Val.Value, uint32(2148532224))
-	require.Equal(t, out.Uint64Val.Value, uint64(9223372041149743104))
-	require.Equal(t, out.BoolVal.Value, true)
-	require.Equal(t, out.StringVal.Value, "foo")
-	require.Equal(t, out.BytesVal.Value, []byte("bar"))
-}
-
-func TestNonDynamicWellKnown(t *testing.T) {
-	hcl := `
-		empty_val = {}
-		timestamp_val = "2023-02-27T12:34:56.789Z"
-		duration_val = "12s"
-	`
-	var out testproto.NonDynamicWellKnown
-
-	err := Unmarshal([]byte(hcl), &out)
-	require.NoError(t, err)
-	require.NotNil(t, out.EmptyVal)
-	require.NotNil(t, out.TimestampVal)
-	require.Equal(t, out.TimestampVal.AsTime(), time.Date(2023, 2, 27, 12, 34, 56, 789000000, time.UTC))
-	require.NotNil(t, out.DurationVal)
-	require.Equal(t, out.DurationVal.AsDuration(), time.Second*12)
-}
-
-func TestInvalidTimestamp(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	cases := map[string]struct {
-		hcl       string
-		expectXDS bool
-	}{
-		"invalid": {
-			hcl: `
-				timestamp_val = "Sat Jun 12 2023 14:59:57 GMT+0200"
-			`,
-		},
-		"range error": {
-			hcl: `
-				timestamp_val = "2023-02-27T25:34:56.789Z"
-			`,
-		},
-	}
-
-	for name, tc := range cases {
-		tc := tc
-		var out testproto.NonDynamicWellKnown
-		t.Run(name, func(t *testing.T) {
-
-			err := Unmarshal([]byte(tc.hcl), &out)
-			require.Error(t, err)
-			require.Nil(t, out.TimestampVal)
-			require.ErrorContains(t, err, "error parsing timestamp")
-		})
-	}
-}
-
-func TestInvalidDuration(t *testing.T) {
-	hcl := `
-		duration_val = "abc"
-	`
-	var out testproto.NonDynamicWellKnown
-
-	err := Unmarshal([]byte(hcl), &out)
-	require.ErrorContains(t, err, "error parsing string duration:")
-	require.Nil(t, out.DurationVal)
-}
-
-func TestOneOf(t *testing.T) {
-	hcl1 := `
-		int32_val = 3
-	`
-
-	hcl2 := `
-		primitives {
-			int32_val = 3
-		}
-	`
-
-	hcl3 := `
-		int32_val = 3
-		primitives {
-			int32_val = 4
-		}
-	`
-
-	var out testproto.OneOf
-
-	err := Unmarshal([]byte(hcl1), &out)
-	require.NoError(t, err)
-	require.Equal(t, out.GetInt32Val(), int32(3))
-
-	err = Unmarshal([]byte(hcl2), &out)
-	require.NoError(t, err)
-	primitives := out.GetPrimitives()
-	require.NotNil(t, primitives)
-	require.Equal(t, primitives.Int32Val, int32(3))
-
-	err = Unmarshal([]byte(hcl3), &out)
-	require.Error(t, err)
-}
-
-func TestAny(t *testing.T) {
-	hcl := `
-		any_val {
-		    type_url = "hashicorp.consul.internal.protohcl.testproto.Primitives"
-		    uint32_val = 42
-		}
-
-		any_list = [
-			{
-				type_url = "hashicorp.consul.internal.protohcl.testproto.Primitives"
-				uint32_val = 123
-			},
-			{
-				type_url = "hashicorp.consul.internal.protohcl.testproto.Wrappers"
-				uint32_val = 321
-			}
-		]
-	`
-	var out testproto.DynamicWellKnown
-
-	err := Unmarshal([]byte(hcl), &out)
-	require.NoError(t, err)
-	require.NotNil(t, out.AnyVal)
-	require.Equal(t, out.AnyVal.TypeUrl, "hashicorp.consul.internal.protohcl.testproto.Primitives")
-
-	raw, err := anypb.UnmarshalNew(out.AnyVal, proto.UnmarshalOptions{})
-	require.NoError(t, err)
-	require.NotNil(t, raw)
-
-	primitives, ok := raw.(*testproto.Primitives)
-	require.True(t, ok)
-	require.Equal(t, primitives.Uint32Val, uint32(42))
-}
-
-func TestAnyTypeDynamicWellKnown(t *testing.T) {
-	hcl := `
-		any_val {
-			type_url = "hashicorp.consul.internal.protohcl.testproto.DynamicWellKnown"
-		    any_val {
-				type_url = "hashicorp.consul.internal.protohcl.testproto.Primitives"
-				uint32_val = 42
-			}
-		}
-	`
-	var out testproto.DynamicWellKnown
-
-	err := Unmarshal([]byte(hcl), &out)
-	require.NoError(t, err)
-	require.NotNil(t, out.AnyVal)
-	require.Equal(t, out.AnyVal.TypeUrl, "hashicorp.consul.internal.protohcl.testproto.DynamicWellKnown")
-
-	raw, err := anypb.UnmarshalNew(out.AnyVal, proto.UnmarshalOptions{})
-	require.NoError(t, err)
-	require.NotNil(t, raw)
-
-	anyVal, ok := raw.(*testproto.DynamicWellKnown)
-	require.True(t, ok)
-
-	res, err := anypb.UnmarshalNew(anyVal.AnyVal, proto.UnmarshalOptions{})
-	require.NoError(t, err)
-	require.NotNil(t, res)
-
-	primitives, ok := res.(*testproto.Primitives)
-	require.True(t, ok)
-	require.Equal(t, primitives.Uint32Val, uint32(42))
-}
-
-func TestAnyTypeNestedAndCollections(t *testing.T) {
-	hcl := `
-		any_val {
-			type_url = "hashicorp.consul.internal.protohcl.testproto.NestedAndCollections"
-		    primitives {
-				uint32_val = 42
-			}
-		}
-	`
-	var out testproto.DynamicWellKnown
-
-	err := Unmarshal([]byte(hcl), &out)
-	require.NoError(t, err)
-	require.NotNil(t, out.AnyVal)
-	require.Equal(t, out.AnyVal.TypeUrl, "hashicorp.consul.internal.protohcl.testproto.NestedAndCollections")
-
-	raw, err := anypb.UnmarshalNew(out.AnyVal, proto.UnmarshalOptions{})
-	require.NoError(t, err)
-	require.NotNil(t, raw)
-
-	nestedCollections, ok := raw.(*testproto.NestedAndCollections)
-	require.True(t, ok)
-	require.NotNil(t, nestedCollections.Primitives)
-	require.Equal(t, nestedCollections.Primitives.Uint32Val, uint32(42))
-}
-
-func TestAnyTypeErrors(t *testing.T) {
-	type testCase struct {
-		description string
-		hcl         string
-		error       string
-	}
-	testCases := []testCase{
-		{
-			description: "type_url is expected",
-			hcl: `
-			  any_val {
-				uint32_val = 42
-			}
-			`,
-			error: "type_url field is required to decode Any",
-		},
-		{
-			description: "type_url is unknown",
-			hcl: `
-			  any_val {
-				type_url = "hashicorp.consul.internal.protohcl.testproto.Integer"
-				uint32_val = 42
-			}
-			`,
-			error: "error looking up type information for hashicorp.consul.internal.protohcl.testproto.Integer",
-		},
-		{
-			description: "unknown field",
-			hcl: `
-			  any_val {
-				type_url = "hashicorp.consul.internal.protohcl.testproto.Primitives"
-				int_val = 42
-			}
-			`,
-			error: "Unsupported argument; An argument named \"int_val\" is not expected here",
-		},
-	}
-
-	for _, tc := range testCases {
-		tc := tc
-		t.Run(tc.description, func(t *testing.T) {
-			t.Parallel()
-			var out testproto.DynamicWellKnown
-
-			err := Unmarshal([]byte(tc.hcl), &out)
-			require.Error(t, err)
-			require.Contains(t, err.Error(), tc.error)
-		})
-	}
-}
-
-func TestStruct(t *testing.T) {
-	hcl := `
-		struct_val = {
-			"null"= null
-			"bool"= true
-			"foo" = "bar"
-			"baz" = 1.234
-			"nested" = {
-				"foo" = 12,
-				"bar" = "something"
-			}
-		}
-	`
-
-	var out testproto.DynamicWellKnown
-
-	err := Unmarshal([]byte(hcl), &out)
-	require.NoError(t, err)
-	require.NotNil(t, out.StructVal)
-
-	valMap := out.StructVal.AsMap()
-	jsonVal, err := json.Marshal(valMap)
-	require.NoError(t, err)
-
-	expected := `{
-		"null": null,
-		"bool": true,
-		"foo": "bar",
-		"baz": 1.234,
-		"nested": {
-			"foo": 12,
-			"bar": "something"
-		}
-	}
-	`
-	require.JSONEq(t, expected, string(jsonVal))
-}
-
-func TestStructList(t *testing.T) {
-	hcl := `
-		struct_val = {
-			"list_int" = [
-				1,
-				2,
-				3,
-			]
-			"list_string": [
-				"abc",
-				"def"
-			]
-			"list_bool": [
-				true,
-				false
-			]
-			"list_maps" = [
-				{
-					"arrr" = "matey"
-				},
-				{
-					"hoist" = "the colors"
-				}
-			]
-			"list_list" = [
-				[
-					"hello",
-					"world",
-					null
-				]
-			]
-		}
-	`
-
-	var out testproto.DynamicWellKnown
-
-	err := Unmarshal([]byte(hcl), &out)
-	require.NoError(t, err)
-	require.NotNil(t, out.StructVal)
-
-	valMap := out.StructVal.AsMap()
-	jsonVal, err := json.Marshal(valMap)
-	require.NoError(t, err)
-
-	expected := `{
-		"list_int": [
-			1,
-			2,
-			3
-		],
-		"list_string": [
-			"abc",
-			"def"
-		],
-		"list_bool": [
-			true,
-			false
-		],
-		"list_maps": [
-			{
-				"arrr": "matey"
-			},
-			{
-				"hoist": "the colors"
-			}
-		],
-		"list_list": [
-			[
-				"hello",
-				"world",
-				null
-			]
-		]
-	}
-	`
-	require.JSONEq(t, expected, string(jsonVal))
-}
-
-func TestFunctionExecution(t *testing.T) {
-	hcl := `
-		primitives = primitive_defaults()
-	`
-
-	var out testproto.NestedAndCollections
-
-	var (
-		testType = cty.Capsule("type", reflect.TypeOf(testproto.Primitives{}))
-
-		test = function.New(&function.Spec{
-			Params: []function.Parameter{},
-			Type:   function.StaticReturnType(testType),
-			Impl: func(args []cty.Value, _ cty.Type) (cty.Value, error) {
-				t := &testproto.Primitives{
-					StringVal: "test",
-					Int32Val:  10,
-					BoolVal:   false,
-				}
-				return cty.CapsuleVal(testType, t), nil
-			},
-		})
-	)
-
-	err := UnmarshalOptions{
-		Functions: map[string]function.Function{"primitive_defaults": test},
-	}.Unmarshal([]byte(hcl), &out)
-
-	require.NoError(t, err)
-
-	require.NotNil(t, out.Primitives)
-	require.Equal(t, out.Primitives.StringVal, "test")
-	require.Equal(t, out.Primitives.Int32Val, int32(10))
-	require.Equal(t, out.Primitives.BoolVal, false)
-}
-
-func TestSkipFields(t *testing.T) {
-
-	u := UnmarshalOptions{}
-
-	hcl := `
-		any_val {
-			type_url = "hashicorp.consul.internal.protohcl.testproto.Primitives"
-			uint32_val = 10
-		}`
-
-	file, diags := hclparse.NewParser().ParseHCL([]byte(hcl), "")
-
-	require.False(t, diags.HasErrors())
-
-	decoder := u.bodyDecoder(file.Body)
-
-	decoder = decoder.SkipFields("type_url")
-
-	decoder = decoder.SkipFields("type_url", "uint32_val")
-
-	expected := map[string]struct{}{
-		"type_url":   {},
-		"uint32_val": {},
-	}
-
-	require.Contains(t, fmt.Sprintf("%v", decoder), fmt.Sprintf("%v", expected))
-}
diff --git a/internal/protohcl/well_known_types.go b/internal/protohcl/well_known_types.go
deleted file mode 100644
index 756f908fc413d..0000000000000
--- a/internal/protohcl/well_known_types.go
+++ /dev/null
@@ -1,421 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package protohcl
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/zclconf/go-cty/cty"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/types/known/durationpb"
-	"google.golang.org/protobuf/types/known/emptypb"
-	"google.golang.org/protobuf/types/known/structpb"
-	"google.golang.org/protobuf/types/known/timestamppb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
-)
-
-const (
-	// maximum time in seconds that a time.Time which comes from
-	// an RFC 3339 timestamp can represent
-	maxTimestampSeconds = 253402300799
-	// minimum time in seconds that a time.Time which comes from
-	// an RFC 3339 timestamp can represent. This is negative
-	// because RFC 3339 base time is year 0001 whereas time.Time
-	// starts in 1970
-	minTimestampSeconds = -62135596800
-)
-
-var (
-	// minTime is the earliest time representable as both an
-	// RFC 3339 timestamp and a time.Time value
-	minTime = time.Unix(minTimestampSeconds, 0)
-	// maxTime is the latest time respresentable as both an
-	// RFC 3339 timestamp and a time.Time value
-	maxTime = time.Unix(maxTimestampSeconds, 999999999)
-)
-
-type wktSchemaHint int
-
-const (
-	notWellKnownType wktSchemaHint = iota
-	wellKnownBlock
-	wellKnownAttribute
-)
-
-// wellKnownTypeSchemaHint returns what sort of syntax should be used to represent
-// the well known type field.
-//
-// NotWellKnownType - use attribute block syntax based on other information
-// WellKnownAttribute - use attribute syntax
-// WellKnownBlock - use block syntax
-func wellKnownTypeSchemaHint(desc protoreflect.FieldDescriptor) wktSchemaHint {
-	if desc.Kind() != protoreflect.MessageKind {
-		return notWellKnownType
-	}
-
-	switch desc.Message().FullName() {
-	case "google.protobuf.DoubleValue":
-		return wellKnownAttribute
-	case "google.protobuf.FloatValue":
-		return wellKnownAttribute
-	case "google.protobuf.Int32Value":
-		return wellKnownAttribute
-	case "google.protobuf.Int64Value":
-		return wellKnownAttribute
-	case "google.protobuf.UInt32Value":
-		return wellKnownAttribute
-	case "google.protobuf.UInt64Value":
-		return wellKnownAttribute
-	case "google.protobuf.BoolValue":
-		return wellKnownAttribute
-	case "google.protobuf.StringValue":
-		return wellKnownAttribute
-	case "google.protobuf.BytesValue":
-		return wellKnownAttribute
-	case "google.protobuf.Empty":
-		// block syntax is used for Empty to allow transitioning to using
-		// a different proto message with fields in the future.
-		return wellKnownBlock
-	case "google.protobuf.Timestamp":
-		return wellKnownAttribute
-	case "google.protobuf.Duration":
-		return wellKnownAttribute
-	case "google.protobuf.Struct":
-		// as the Struct has completely free form fields that we cannot
-		// know about in advance we cannot use block syntax
-		return wellKnownAttribute
-	case "google.protobuf.Any":
-		return wellKnownBlock
-	default:
-		return notWellKnownType
-	}
-}
-
-func decodeAttributeToWellKnownType(desc protoreflect.FieldDescriptor, val cty.Value) (bool, protoreflect.Value, error) {
-	if desc.Kind() != protoreflect.MessageKind {
-		return false, protoreflect.Value{}, nil
-	}
-
-	switch desc.Message().FullName() {
-	case "google.protobuf.DoubleValue":
-		protoVal, err := protoDoubleWrapperFromCty(val)
-		return true, protoVal, err
-	case "google.protobuf.FloatValue":
-		protoVal, err := protoFloatWrapperFromCty(val)
-		return true, protoVal, err
-	case "google.protobuf.Int32Value":
-		protoVal, err := protoInt32WrapperFromCty(val)
-		return true, protoVal, err
-	case "google.protobuf.Int64Value":
-		protoVal, err := protoInt64WrapperFromCty(val)
-		return true, protoVal, err
-	case "google.protobuf.UInt32Value":
-		protoVal, err := protoUint32WrapperFromCty(val)
-		return true, protoVal, err
-	case "google.protobuf.UInt64Value":
-		protoVal, err := protoUint64WrapperFromCty(val)
-		return true, protoVal, err
-	case "google.protobuf.BoolValue":
-		protoVal, err := protoBoolWrapperFromCty(val)
-		return true, protoVal, err
-	case "google.protobuf.StringValue":
-		protoVal, err := protoStringWrapperFromCty(val)
-		return true, protoVal, err
-	case "google.protobuf.BytesValue":
-		protoVal, err := protoBytesWrapperFromCty(val)
-		return true, protoVal, err
-	case "google.protobuf.Empty":
-		protoVal, err := protoEmptyFromCty(val)
-		return true, protoVal, err
-	case "google.protobuf.Timestamp":
-		protoVal, err := protoTimestampFromCty(val)
-		return true, protoVal, err
-	case "google.protobuf.Duration":
-		protoVal, err := protoDurationFromCty(val)
-		return true, protoVal, err
-	case "google.protobuf.Struct":
-		protoVal, err := protoStructFromCty(val)
-		return true, protoVal, err
-	default:
-		return false, protoreflect.Value{}, nil
-	}
-}
-
-func protoWrapperFromBool(v bool) protoreflect.Value {
-	return protoreflect.ValueOfMessage(wrapperspb.Bool(v).ProtoReflect())
-}
-func protoWrapperFromInt32(v int32) protoreflect.Value {
-	return protoreflect.ValueOfMessage(wrapperspb.Int32(v).ProtoReflect())
-}
-func protoWrapperFromInt64(v int64) protoreflect.Value {
-	return protoreflect.ValueOfMessage(wrapperspb.Int64(v).ProtoReflect())
-}
-func protoWrapperFromUint32(v uint32) protoreflect.Value {
-	return protoreflect.ValueOfMessage(wrapperspb.UInt32(v).ProtoReflect())
-}
-func protoWrapperFromUint64(v uint64) protoreflect.Value {
-	return protoreflect.ValueOfMessage(wrapperspb.UInt64(v).ProtoReflect())
-}
-func protoWrapperFromFloat(v float32) protoreflect.Value {
-	return protoreflect.ValueOfMessage(wrapperspb.Float(v).ProtoReflect())
-}
-func protoWrapperFromDouble(v float64) protoreflect.Value {
-	return protoreflect.ValueOfMessage(wrapperspb.Double(v).ProtoReflect())
-}
-func protoWrapperFromString(v string) protoreflect.Value {
-	return protoreflect.ValueOfMessage(wrapperspb.String(v).ProtoReflect())
-}
-func protoWrapperFromBytes(v []byte) protoreflect.Value {
-	return protoreflect.ValueOfMessage(wrapperspb.Bytes(v).ProtoReflect())
-}
-
-func protoBoolWrapperFromCty(val cty.Value) (protoreflect.Value, error) {
-	v, err := boolFromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoWrapperFromBool(v), nil
-}
-func protoInt32WrapperFromCty(val cty.Value) (protoreflect.Value, error) {
-	v, err := int32FromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoWrapperFromInt32(v), nil
-}
-func protoInt64WrapperFromCty(val cty.Value) (protoreflect.Value, error) {
-	v, err := int64FromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoWrapperFromInt64(v), nil
-}
-func protoUint32WrapperFromCty(val cty.Value) (protoreflect.Value, error) {
-	v, err := uint32FromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoWrapperFromUint32(v), nil
-}
-func protoUint64WrapperFromCty(val cty.Value) (protoreflect.Value, error) {
-	v, err := uint64FromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoWrapperFromUint64(v), nil
-}
-func protoFloatWrapperFromCty(val cty.Value) (protoreflect.Value, error) {
-	v, err := floatFromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoWrapperFromFloat(v), nil
-}
-func protoDoubleWrapperFromCty(val cty.Value) (protoreflect.Value, error) {
-	v, err := doubleFromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoWrapperFromDouble(v), nil
-}
-func protoStringWrapperFromCty(val cty.Value) (protoreflect.Value, error) {
-	v, err := stringFromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoWrapperFromString(v), nil
-}
-func protoBytesWrapperFromCty(val cty.Value) (protoreflect.Value, error) {
-	v, err := bytesFromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-	return protoWrapperFromBytes(v), nil
-}
-
-func protoEmptyFromCty(val cty.Value) (protoreflect.Value, error) {
-	var e emptypb.Empty
-	if val.IsNull() {
-		return protoreflect.Value{}, nil
-	}
-
-	valType := val.Type()
-	if (valType.IsObjectType() || valType.IsMapType()) && val.LengthInt() == 0 {
-		return protoreflect.ValueOfMessage(e.ProtoReflect()), nil
-	}
-
-	return protoreflect.Value{}, fmt.Errorf("well known empty type can only be represented as an hcl map/object - actual type %q", valType.FriendlyName())
-}
-
-func protoTimestampFromCty(val cty.Value) (protoreflect.Value, error) {
-	v, err := stringFromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-
-	t, err := time.Parse(time.RFC3339Nano, v)
-	if err != nil {
-		return protoreflect.Value{}, fmt.Errorf("error parsing timestamp: %w", err)
-	}
-
-	if t.Before(minTime) || t.After(maxTime) {
-		return protoreflect.Value{}, fmt.Errorf("time is out of range %s to %s - %s", minTime.String(), maxTime.String(), v)
-	}
-
-	return protoreflect.ValueOfMessage(timestamppb.New(t).ProtoReflect()), nil
-}
-
-func protoDurationFromCty(val cty.Value) (protoreflect.Value, error) {
-	v, err := stringFromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-
-	d, err := time.ParseDuration(v)
-	if err != nil {
-		return protoreflect.Value{}, fmt.Errorf("error parsing string duration: %w", err)
-	}
-
-	return protoreflect.ValueOfMessage(durationpb.New(d).ProtoReflect()), nil
-}
-
-func protoStructFromCty(val cty.Value) (protoreflect.Value, error) {
-	s, err := protoStructObjectFromCty(val)
-	if err != nil {
-		return protoreflect.Value{}, err
-	}
-
-	return protoreflect.ValueOfMessage(s.ProtoReflect()), nil
-}
-
-func protoStructObjectFromCty(val cty.Value) (*structpb.Struct, error) {
-	valType := val.Type()
-	if !valType.IsObjectType() && !valType.IsMapType() {
-		return nil, fmt.Errorf("Struct type must be either an object or map type")
-	}
-
-	structValues := make(map[string]*structpb.Value)
-
-	for k, v := range val.AsValueMap() {
-		vType := v.Type()
-
-		if v.IsNull() {
-			structValues[k] = structpb.NewNullValue()
-		} else if vType.IsListType() || vType.IsSetType() || vType.IsTupleType() {
-			listVal, err := protoStructListValueFromCty(v)
-			if err != nil {
-				return nil, err
-			}
-			structValues[k] = structpb.NewListValue(listVal)
-		} else if vType.IsMapType() || vType.IsObjectType() {
-			objVal, err := protoStructObjectFromCty(v)
-			if err != nil {
-				return nil, err
-			}
-			structValues[k] = structpb.NewStructValue(objVal)
-		} else if vType.IsPrimitiveType() {
-			switch vType {
-			case cty.String:
-				stringVal, err := stringFromCty(v)
-				if err != nil {
-					return nil, err
-				}
-
-				structValues[k] = structpb.NewStringValue(stringVal)
-			case cty.Bool:
-				boolVal, err := boolFromCty(v)
-				if err != nil {
-					return nil, err
-				}
-
-				structValues[k] = structpb.NewBoolValue(boolVal)
-			case cty.Number:
-				doubleVal, err := doubleFromCty(v)
-				if err != nil {
-					return nil, err
-				}
-
-				structValues[k] = structpb.NewNumberValue(doubleVal)
-			default:
-				return nil, fmt.Errorf("unknown cty primitive type: %s", vType.FriendlyName())
-			}
-		} else {
-			return nil, fmt.Errorf("unsupported cty type: %s", vType.FriendlyName())
-		}
-	}
-
-	return &structpb.Struct{
-		Fields: structValues,
-	}, nil
-}
-
-func protoStructListValueFromCty(val cty.Value) (*structpb.ListValue, error) {
-	var values []*structpb.Value
-
-	var err error
-	val.ForEachElement(func(_ cty.Value, value cty.Value) bool {
-		vType := value.Type()
-
-		if value.IsNull() {
-			values = append(values, structpb.NewNullValue())
-		} else if vType.IsListType() || vType.IsSetType() || vType.IsTupleType() {
-			var listVal *structpb.ListValue
-			listVal, err = protoStructListValueFromCty(value)
-			if err != nil {
-				return true
-			}
-			values = append(values, structpb.NewListValue(listVal))
-		} else if vType.IsMapType() || vType.IsObjectType() {
-			var objVal *structpb.Struct
-			objVal, err = protoStructObjectFromCty(value)
-			if err != nil {
-				return true
-			}
-			values = append(values, structpb.NewStructValue(objVal))
-		} else if vType.IsPrimitiveType() {
-			switch vType {
-			case cty.String:
-				var stringVal string
-				stringVal, err = stringFromCty(value)
-				if err != nil {
-					return true
-				}
-
-				values = append(values, structpb.NewStringValue(stringVal))
-			case cty.Bool:
-				var boolVal bool
-				boolVal, err = boolFromCty(value)
-				if err != nil {
-					return true
-				}
-
-				values = append(values, structpb.NewBoolValue(boolVal))
-			case cty.Number:
-				var doubleVal float64
-				doubleVal, err = doubleFromCty(value)
-				if err != nil {
-					return true
-				}
-
-				values = append(values, structpb.NewNumberValue(doubleVal))
-			default:
-				err = fmt.Errorf("unknown cty primitive type: %s", vType.FriendlyName())
-				return true
-			}
-		} else {
-			err = fmt.Errorf("unsupported cty type: %s", vType.FriendlyName())
-			return true
-		}
-		return false
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	return &structpb.ListValue{
-		Values: values,
-	}, nil
-}
diff --git a/internal/protoutil/protoutil.go b/internal/protoutil/protoutil.go
deleted file mode 100644
index 21a16dd1f3fe8..0000000000000
--- a/internal/protoutil/protoutil.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package protoutil
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-func Clone[T proto.Message](v T) T {
-	return proto.Clone(v).(T)
-}
-
-func CloneSlice[T proto.Message](in []T) []T {
-	if in == nil {
-		return nil
-	}
-	out := make([]T, 0, len(in))
-	for _, v := range in {
-		out = append(out, Clone[T](v))
-	}
-	return out
-}
diff --git a/internal/radix/doc.go b/internal/radix/doc.go
deleted file mode 100644
index f69f68a2d6b07..0000000000000
--- a/internal/radix/doc.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// This packages contents were originally copied from github.com/armon/go-radix.
-// After the intial copy all the data structures were made to use Go 1.18 generics
-// instead of relying on the use of interface{} or the any type.
-package radix
diff --git a/internal/radix/radix.go b/internal/radix/radix.go
deleted file mode 100644
index c2b7ee838935f..0000000000000
--- a/internal/radix/radix.go
+++ /dev/null
@@ -1,571 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package radix
-
-import (
-	"sort"
-	"strings"
-)
-
-// WalkFn is used when walking the tree. Takes a
-// key and value, returning if iteration should
-// be terminated.
-type WalkFn[T any] func(s string, v T) bool
-
-// leafNode is used to represent a value
-type leafNode[T any] struct {
-	key string
-	val T
-}
-
-// edge is used to represent an edge node
-type edge[T any] struct {
-	label byte
-	node  *node[T]
-}
-
-type node[T any] struct {
-	// leaf is used to store possible leaf
-	leaf *leafNode[T]
-
-	// prefix is the common prefix we ignore
-	prefix string
-
-	// Edges should be stored in-order for iteration.
-	// We avoid a fully materialized slice to save memory,
-	// since in most cases we expect to be sparse
-	edges edges[T]
-}
-
-func (n *node[T]) isLeaf() bool {
-	return n.leaf != nil
-}
-
-func (n *node[T]) addEdge(e edge[T]) {
-	num := len(n.edges)
-	idx := sort.Search(num, func(i int) bool {
-		return n.edges[i].label >= e.label
-	})
-
-	n.edges = append(n.edges, edge[T]{})
-	copy(n.edges[idx+1:], n.edges[idx:])
-	n.edges[idx] = e
-}
-
-func (n *node[T]) updateEdge(label byte, node *node[T]) {
-	num := len(n.edges)
-	idx := sort.Search(num, func(i int) bool {
-		return n.edges[i].label >= label
-	})
-	if idx < num && n.edges[idx].label == label {
-		n.edges[idx].node = node
-		return
-	}
-	panic("replacing missing edge")
-}
-
-func (n *node[T]) getEdge(label byte) *node[T] {
-	num := len(n.edges)
-	idx := sort.Search(num, func(i int) bool {
-		return n.edges[i].label >= label
-	})
-	if idx < num && n.edges[idx].label == label {
-		return n.edges[idx].node
-	}
-	return nil
-}
-
-func (n *node[T]) delEdge(label byte) {
-	num := len(n.edges)
-	idx := sort.Search(num, func(i int) bool {
-		return n.edges[i].label >= label
-	})
-	if idx < num && n.edges[idx].label == label {
-		copy(n.edges[idx:], n.edges[idx+1:])
-		n.edges[len(n.edges)-1] = edge[T]{}
-		n.edges = n.edges[:len(n.edges)-1]
-	}
-}
-
-type edges[T any] []edge[T]
-
-func (e edges[T]) Len() int {
-	return len(e)
-}
-
-func (e edges[T]) Less(i, j int) bool {
-	return e[i].label < e[j].label
-}
-
-func (e edges[T]) Swap(i, j int) {
-	e[i], e[j] = e[j], e[i]
-}
-
-func (e edges[T]) Sort() {
-	sort.Sort(e)
-}
-
-// Tree implements a radix tree. This can be treated as a
-// Dictionary abstract data type. The main advantage over
-// a standard hash map is prefix-based lookups and
-// ordered iteration,
-type Tree[T any] struct {
-	root *node[T]
-	size int
-}
-
-// New returns an empty Tree
-func New[T any]() *Tree[T] {
-	return NewFromMap[T](nil)
-}
-
-// NewFromMap returns a new tree containing the keys
-// from an existing map
-func NewFromMap[T any](m map[string]T) *Tree[T] {
-	t := &Tree[T]{root: &node[T]{}}
-	for k, v := range m {
-		t.Insert(k, v)
-	}
-	return t
-}
-
-// Len is used to return the number of elements in the tree
-func (t *Tree[T]) Len() int {
-	return t.size
-}
-
-// longestPrefix finds the length of the shared prefix
-// of two strings
-func longestPrefix(k1, k2 string) int {
-	max := len(k1)
-	if l := len(k2); l < max {
-		max = l
-	}
-	var i int
-	for i = 0; i < max; i++ {
-		if k1[i] != k2[i] {
-			break
-		}
-	}
-	return i
-}
-
-// Insert is used to add a newentry or update
-// an existing entry. Returns true if an existing record is updated.
-func (t *Tree[T]) Insert(s string, v T) (T, bool) {
-	var zeroVal T
-	var parent *node[T]
-	n := t.root
-	search := s
-	for {
-		// Handle key exhaution
-		if len(search) == 0 {
-			if n.isLeaf() {
-				old := n.leaf.val
-				n.leaf.val = v
-				return old, true
-			}
-
-			n.leaf = &leafNode[T]{
-				key: s,
-				val: v,
-			}
-			t.size++
-			return zeroVal, false
-		}
-
-		// Look for the edge
-		parent = n
-		n = n.getEdge(search[0])
-
-		// No edge, create one
-		if n == nil {
-			e := edge[T]{
-				label: search[0],
-				node: &node[T]{
-					leaf: &leafNode[T]{
-						key: s,
-						val: v,
-					},
-					prefix: search,
-				},
-			}
-			parent.addEdge(e)
-			t.size++
-			return zeroVal, false
-		}
-
-		// Determine longest prefix of the search key on match
-		commonPrefix := longestPrefix(search, n.prefix)
-		if commonPrefix == len(n.prefix) {
-			search = search[commonPrefix:]
-			continue
-		}
-
-		// Split the node
-		t.size++
-		child := &node[T]{
-			prefix: search[:commonPrefix],
-		}
-		parent.updateEdge(search[0], child)
-
-		// Restore the existing node
-		child.addEdge(edge[T]{
-			label: n.prefix[commonPrefix],
-			node:  n,
-		})
-		n.prefix = n.prefix[commonPrefix:]
-
-		// Create a new leaf node
-		leaf := &leafNode[T]{
-			key: s,
-			val: v,
-		}
-
-		// If the new key is a subset, add to this node
-		search = search[commonPrefix:]
-		if len(search) == 0 {
-			child.leaf = leaf
-			return zeroVal, false
-		}
-
-		// Create a new edge for the node
-		child.addEdge(edge[T]{
-			label: search[0],
-			node: &node[T]{
-				leaf:   leaf,
-				prefix: search,
-			},
-		})
-		return zeroVal, false
-	}
-}
-
-// Delete is used to delete a key, returning the previous
-// value and if it was deleted
-func (t *Tree[T]) Delete(s string) (T, bool) {
-	var zeroVal T
-
-	var parent *node[T]
-	var label byte
-	n := t.root
-	search := s
-	for {
-		// Check for key exhaution
-		if len(search) == 0 {
-			if !n.isLeaf() {
-				break
-			}
-			goto DELETE
-		}
-
-		// Look for an edge
-		parent = n
-		label = search[0]
-		n = n.getEdge(label)
-		if n == nil {
-			break
-		}
-
-		// Consume the search prefix
-		if strings.HasPrefix(search, n.prefix) {
-			search = search[len(n.prefix):]
-		} else {
-			break
-		}
-	}
-	return zeroVal, false
-
-DELETE:
-	// Delete the leaf
-	leaf := n.leaf
-	n.leaf = nil
-	t.size--
-
-	// Check if we should delete this node from the parent
-	if parent != nil && len(n.edges) == 0 {
-		parent.delEdge(label)
-	}
-
-	// Check if we should merge this node
-	if n != t.root && len(n.edges) == 1 {
-		n.mergeChild()
-	}
-
-	// Check if we should merge the parent's other child
-	if parent != nil && parent != t.root && len(parent.edges) == 1 && !parent.isLeaf() {
-		parent.mergeChild()
-	}
-
-	return leaf.val, true
-}
-
-// DeletePrefix is used to delete the subtree under a prefix
-// Returns how many nodes were deleted
-// Use this to delete large subtrees efficiently
-func (t *Tree[T]) DeletePrefix(s string) int {
-	return t.deletePrefix(nil, t.root, s)
-}
-
-// delete does a recursive deletion
-func (t *Tree[T]) deletePrefix(parent, n *node[T], prefix string) int {
-	// Check for key exhaustion
-	if len(prefix) == 0 {
-		// Remove the leaf node
-		subTreeSize := 0
-		//recursively walk from all edges of the node to be deleted
-		recursiveWalk(n, func(s string, v T) bool {
-			subTreeSize++
-			return false
-		})
-		if n.isLeaf() {
-			n.leaf = nil
-		}
-		n.edges = nil // deletes the entire subtree
-
-		// Check if we should merge the parent's other child
-		if parent != nil && parent != t.root && len(parent.edges) == 1 && !parent.isLeaf() {
-			parent.mergeChild()
-		}
-		t.size -= subTreeSize
-		return subTreeSize
-	}
-
-	// Look for an edge
-	label := prefix[0]
-	child := n.getEdge(label)
-	if child == nil || (!strings.HasPrefix(child.prefix, prefix) && !strings.HasPrefix(prefix, child.prefix)) {
-		return 0
-	}
-
-	// Consume the search prefix
-	if len(child.prefix) > len(prefix) {
-		prefix = prefix[len(prefix):]
-	} else {
-		prefix = prefix[len(child.prefix):]
-	}
-	return t.deletePrefix(n, child, prefix)
-}
-
-func (n *node[T]) mergeChild() {
-	e := n.edges[0]
-	child := e.node
-	n.prefix = n.prefix + child.prefix
-	n.leaf = child.leaf
-	n.edges = child.edges
-}
-
-// Get is used to lookup a specific key, returning
-// the value and if it was found
-func (t *Tree[T]) Get(s string) (T, bool) {
-	var zeroVal T
-	n := t.root
-	search := s
-	for {
-		// Check for key exhaution
-		if len(search) == 0 {
-			if n.isLeaf() {
-				return n.leaf.val, true
-			}
-			break
-		}
-
-		// Look for an edge
-		n = n.getEdge(search[0])
-		if n == nil {
-			break
-		}
-
-		// Consume the search prefix
-		if strings.HasPrefix(search, n.prefix) {
-			search = search[len(n.prefix):]
-		} else {
-			break
-		}
-	}
-	return zeroVal, false
-}
-
-// LongestPrefix is like Get, but instead of an
-// exact match, it will return the longest prefix match.
-func (t *Tree[T]) LongestPrefix(s string) (string, T, bool) {
-	var zeroVal T
-	var last *leafNode[T]
-	n := t.root
-	search := s
-	for {
-		// Look for a leaf node
-		if n.isLeaf() {
-			last = n.leaf
-		}
-
-		// Check for key exhaution
-		if len(search) == 0 {
-			break
-		}
-
-		// Look for an edge
-		n = n.getEdge(search[0])
-		if n == nil {
-			break
-		}
-
-		// Consume the search prefix
-		if strings.HasPrefix(search, n.prefix) {
-			search = search[len(n.prefix):]
-		} else {
-			break
-		}
-	}
-	if last != nil {
-		return last.key, last.val, true
-	}
-	return "", zeroVal, false
-}
-
-// Minimum is used to return the minimum value in the tree
-func (t *Tree[T]) Minimum() (string, T, bool) {
-	var zeroVal T
-	n := t.root
-	for {
-		if n.isLeaf() {
-			return n.leaf.key, n.leaf.val, true
-		}
-		if len(n.edges) > 0 {
-			n = n.edges[0].node
-		} else {
-			break
-		}
-	}
-	return "", zeroVal, false
-}
-
-// Maximum is used to return the maximum value in the tree
-func (t *Tree[T]) Maximum() (string, T, bool) {
-	var zeroVal T
-	n := t.root
-	for {
-		if num := len(n.edges); num > 0 {
-			n = n.edges[num-1].node
-			continue
-		}
-		if n.isLeaf() {
-			return n.leaf.key, n.leaf.val, true
-		}
-		break
-	}
-	return "", zeroVal, false
-}
-
-// Walk is used to walk the tree
-func (t *Tree[T]) Walk(fn WalkFn[T]) {
-	recursiveWalk(t.root, fn)
-}
-
-// WalkPrefix is used to walk the tree under a prefix
-func (t *Tree[T]) WalkPrefix(prefix string, fn WalkFn[T]) {
-	n := t.root
-	search := prefix
-	for {
-		// Check for key exhaustion
-		if len(search) == 0 {
-			recursiveWalk(n, fn)
-			return
-		}
-
-		// Look for an edge
-		n = n.getEdge(search[0])
-		if n == nil {
-			return
-		}
-
-		// Consume the search prefix
-		if strings.HasPrefix(search, n.prefix) {
-			search = search[len(n.prefix):]
-			continue
-		}
-		if strings.HasPrefix(n.prefix, search) {
-			// Child may be under our search prefix
-			recursiveWalk(n, fn)
-		}
-		return
-	}
-}
-
-// WalkPath is used to walk the tree, but only visiting nodes
-// from the root down to a given leaf. Where WalkPrefix walks
-// all the entries *under* the given prefix, this walks the
-// entries *above* the given prefix.
-func (t *Tree[T]) WalkPath(path string, fn WalkFn[T]) {
-	n := t.root
-	search := path
-	for {
-		// Visit the leaf values if any
-		if n.leaf != nil && fn(n.leaf.key, n.leaf.val) {
-			return
-		}
-
-		// Check for key exhaution
-		if len(search) == 0 {
-			return
-		}
-
-		// Look for an edge
-		n = n.getEdge(search[0])
-		if n == nil {
-			return
-		}
-
-		// Consume the search prefix
-		if strings.HasPrefix(search, n.prefix) {
-			search = search[len(n.prefix):]
-		} else {
-			break
-		}
-	}
-}
-
-// recursiveWalk is used to do a pre-order walk of a node
-// recursively. Returns true if the walk should be aborted
-func recursiveWalk[T any](n *node[T], fn WalkFn[T]) bool {
-	// Visit the leaf values if any
-	if n.leaf != nil && fn(n.leaf.key, n.leaf.val) {
-		return true
-	}
-
-	// Recurse on the children
-	i := 0
-	k := len(n.edges) // keeps track of number of edges in previous iteration
-	for i < k {
-		e := n.edges[i]
-		if recursiveWalk(e.node, fn) {
-			return true
-		}
-		// It is a possibility that the WalkFn modified the node we are
-		// iterating on. If there are no more edges, mergeChild happened,
-		// so the last edge became the current node n, on which we'll
-		// iterate one last time.
-		if len(n.edges) == 0 {
-			return recursiveWalk(n, fn)
-		}
-		// If there are now less edges than in the previous iteration,
-		// then do not increment the loop index, since the current index
-		// points to a new edge. Otherwise, get to the next index.
-		if len(n.edges) >= k {
-			i++
-		}
-		k = len(n.edges)
-	}
-	return false
-}
-
-// ToMap is used to walk the tree and convert it into a map
-func (t *Tree[T]) ToMap() map[string]T {
-	out := make(map[string]T, t.size)
-	t.Walk(func(k string, v T) bool {
-		out[k] = v
-		return false
-	})
-	return out
-}
diff --git a/internal/radix/radix_test.go b/internal/radix/radix_test.go
deleted file mode 100644
index ea7015dc29c24..0000000000000
--- a/internal/radix/radix_test.go
+++ /dev/null
@@ -1,411 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package radix
-
-import (
-	crand "crypto/rand"
-	"fmt"
-	"reflect"
-	"sort"
-	"strconv"
-	"testing"
-)
-
-func TestRadix(t *testing.T) {
-	var min, max string
-	inp := make(map[string]interface{})
-	for i := 0; i < 1000; i++ {
-		gen := generateUUID()
-		inp[gen] = i
-		if gen < min || i == 0 {
-			min = gen
-		}
-		if gen > max || i == 0 {
-			max = gen
-		}
-	}
-
-	r := NewFromMap(inp)
-	if r.Len() != len(inp) {
-		t.Fatalf("bad length: %v %v", r.Len(), len(inp))
-	}
-
-	r.Walk(func(k string, v interface{}) bool {
-		println(k)
-		return false
-	})
-
-	for k, v := range inp {
-		out, ok := r.Get(k)
-		if !ok {
-			t.Fatalf("missing key: %v", k)
-		}
-		if out != v {
-			t.Fatalf("value mis-match: %v %v", out, v)
-		}
-	}
-
-	// Check min and max
-	outMin, _, _ := r.Minimum()
-	if outMin != min {
-		t.Fatalf("bad minimum: %v %v", outMin, min)
-	}
-	outMax, _, _ := r.Maximum()
-	if outMax != max {
-		t.Fatalf("bad maximum: %v %v", outMax, max)
-	}
-
-	for k, v := range inp {
-		out, ok := r.Delete(k)
-		if !ok {
-			t.Fatalf("missing key: %v", k)
-		}
-		if out != v {
-			t.Fatalf("value mis-match: %v %v", out, v)
-		}
-	}
-	if r.Len() != 0 {
-		t.Fatalf("bad length: %v", r.Len())
-	}
-}
-
-func TestRoot(t *testing.T) {
-	r := New[bool]()
-	_, ok := r.Delete("")
-	if ok {
-		t.Fatalf("bad")
-	}
-	_, ok = r.Insert("", true)
-	if ok {
-		t.Fatalf("bad")
-	}
-	val, ok := r.Get("")
-	if !ok || val != true {
-		t.Fatalf("bad: %v", val)
-	}
-	val, ok = r.Delete("")
-	if !ok || val != true {
-		t.Fatalf("bad: %v", val)
-	}
-}
-
-func TestDelete(t *testing.T) {
-
-	r := New[bool]()
-
-	s := []string{"", "A", "AB"}
-
-	for _, ss := range s {
-		r.Insert(ss, true)
-	}
-
-	for _, ss := range s {
-		_, ok := r.Delete(ss)
-		if !ok {
-			t.Fatalf("bad %q", ss)
-		}
-	}
-}
-
-func TestDeletePrefix(t *testing.T) {
-	type exp struct {
-		inp        []string
-		prefix     string
-		out        []string
-		numDeleted int
-	}
-
-	cases := []exp{
-		{[]string{"", "A", "AB", "ABC", "R", "S"}, "A", []string{"", "R", "S"}, 3},
-		{[]string{"", "A", "AB", "ABC", "R", "S"}, "ABC", []string{"", "A", "AB", "R", "S"}, 1},
-		{[]string{"", "A", "AB", "ABC", "R", "S"}, "", []string{}, 6},
-		{[]string{"", "A", "AB", "ABC", "R", "S"}, "S", []string{"", "A", "AB", "ABC", "R"}, 1},
-		{[]string{"", "A", "AB", "ABC", "R", "S"}, "SS", []string{"", "A", "AB", "ABC", "R", "S"}, 0},
-	}
-
-	for _, test := range cases {
-		r := New[bool]()
-		for _, ss := range test.inp {
-			r.Insert(ss, true)
-		}
-
-		deleted := r.DeletePrefix(test.prefix)
-		if deleted != test.numDeleted {
-			t.Fatalf("Bad delete, expected %v to be deleted but got %v", test.numDeleted, deleted)
-		}
-
-		out := []string{}
-		fn := func(s string, v bool) bool {
-			out = append(out, s)
-			return false
-		}
-		r.Walk(fn)
-
-		if !reflect.DeepEqual(out, test.out) {
-			t.Fatalf("mis-match: %v %v", out, test.out)
-		}
-	}
-}
-
-func TestLongestPrefix(t *testing.T) {
-	r := New[interface{}]()
-
-	keys := []string{
-		"",
-		"foo",
-		"foobar",
-		"foobarbaz",
-		"foobarbazzip",
-		"foozip",
-	}
-	for _, k := range keys {
-		r.Insert(k, nil)
-	}
-	if r.Len() != len(keys) {
-		t.Fatalf("bad len: %v %v", r.Len(), len(keys))
-	}
-
-	type exp struct {
-		inp string
-		out string
-	}
-	cases := []exp{
-		{"a", ""},
-		{"abc", ""},
-		{"fo", ""},
-		{"foo", "foo"},
-		{"foob", "foo"},
-		{"foobar", "foobar"},
-		{"foobarba", "foobar"},
-		{"foobarbaz", "foobarbaz"},
-		{"foobarbazzi", "foobarbaz"},
-		{"foobarbazzip", "foobarbazzip"},
-		{"foozi", "foo"},
-		{"foozip", "foozip"},
-		{"foozipzap", "foozip"},
-	}
-	for _, test := range cases {
-		m, _, ok := r.LongestPrefix(test.inp)
-		if !ok {
-			t.Fatalf("no match: %v", test)
-		}
-		if m != test.out {
-			t.Fatalf("mis-match: %v %v", m, test)
-		}
-	}
-}
-
-func TestWalkPrefix(t *testing.T) {
-	r := New[interface{}]()
-
-	keys := []string{
-		"foobar",
-		"foo/bar/baz",
-		"foo/baz/bar",
-		"foo/zip/zap",
-		"zipzap",
-	}
-	for _, k := range keys {
-		r.Insert(k, nil)
-	}
-	if r.Len() != len(keys) {
-		t.Fatalf("bad len: %v %v", r.Len(), len(keys))
-	}
-
-	type exp struct {
-		inp string
-		out []string
-	}
-	cases := []exp{
-		{
-			"f",
-			[]string{"foobar", "foo/bar/baz", "foo/baz/bar", "foo/zip/zap"},
-		},
-		{
-			"foo",
-			[]string{"foobar", "foo/bar/baz", "foo/baz/bar", "foo/zip/zap"},
-		},
-		{
-			"foob",
-			[]string{"foobar"},
-		},
-		{
-			"foo/",
-			[]string{"foo/bar/baz", "foo/baz/bar", "foo/zip/zap"},
-		},
-		{
-			"foo/b",
-			[]string{"foo/bar/baz", "foo/baz/bar"},
-		},
-		{
-			"foo/ba",
-			[]string{"foo/bar/baz", "foo/baz/bar"},
-		},
-		{
-			"foo/bar",
-			[]string{"foo/bar/baz"},
-		},
-		{
-			"foo/bar/baz",
-			[]string{"foo/bar/baz"},
-		},
-		{
-			"foo/bar/bazoo",
-			[]string{},
-		},
-		{
-			"z",
-			[]string{"zipzap"},
-		},
-	}
-
-	for _, test := range cases {
-		out := []string{}
-		fn := func(s string, v interface{}) bool {
-			out = append(out, s)
-			return false
-		}
-		r.WalkPrefix(test.inp, fn)
-		sort.Strings(out)
-		sort.Strings(test.out)
-		if !reflect.DeepEqual(out, test.out) {
-			t.Fatalf("mis-match: %v %v", out, test.out)
-		}
-	}
-}
-
-func TestWalkPath(t *testing.T) {
-	r := New[interface{}]()
-
-	keys := []string{
-		"foo",
-		"foo/bar",
-		"foo/bar/baz",
-		"foo/baz/bar",
-		"foo/zip/zap",
-		"zipzap",
-	}
-	for _, k := range keys {
-		r.Insert(k, nil)
-	}
-	if r.Len() != len(keys) {
-		t.Fatalf("bad len: %v %v", r.Len(), len(keys))
-	}
-
-	type exp struct {
-		inp string
-		out []string
-	}
-	cases := []exp{
-		{
-			"f",
-			[]string{},
-		},
-		{
-			"foo",
-			[]string{"foo"},
-		},
-		{
-			"foo/",
-			[]string{"foo"},
-		},
-		{
-			"foo/ba",
-			[]string{"foo"},
-		},
-		{
-			"foo/bar",
-			[]string{"foo", "foo/bar"},
-		},
-		{
-			"foo/bar/baz",
-			[]string{"foo", "foo/bar", "foo/bar/baz"},
-		},
-		{
-			"foo/bar/bazoo",
-			[]string{"foo", "foo/bar", "foo/bar/baz"},
-		},
-		{
-			"z",
-			[]string{},
-		},
-	}
-
-	for _, test := range cases {
-		out := []string{}
-		fn := func(s string, v interface{}) bool {
-			out = append(out, s)
-			return false
-		}
-		r.WalkPath(test.inp, fn)
-		sort.Strings(out)
-		sort.Strings(test.out)
-		if !reflect.DeepEqual(out, test.out) {
-			t.Fatalf("mis-match: %v %v", out, test.out)
-		}
-	}
-}
-
-func TestWalkDelete(t *testing.T) {
-	r := New[interface{}]()
-	r.Insert("init0/0", nil)
-	r.Insert("init0/1", nil)
-	r.Insert("init0/2", nil)
-	r.Insert("init0/3", nil)
-	r.Insert("init1/0", nil)
-	r.Insert("init1/1", nil)
-	r.Insert("init1/2", nil)
-	r.Insert("init1/3", nil)
-	r.Insert("init2", nil)
-
-	deleteFn := func(s string, v interface{}) bool {
-		r.Delete(s)
-		return false
-	}
-
-	r.WalkPrefix("init1", deleteFn)
-
-	for _, s := range []string{"init0/0", "init0/1", "init0/2", "init0/3", "init2"} {
-		if _, ok := r.Get(s); !ok {
-			t.Fatalf("expecting to still find %q", s)
-		}
-	}
-	if n := r.Len(); n != 5 {
-		t.Fatalf("expected to find exactly 5 nodes, instead found %d: %v", n, r.ToMap())
-	}
-
-	r.Walk(deleteFn)
-	if n := r.Len(); n != 0 {
-		t.Fatalf("expected to find exactly 0 nodes, instead found %d: %v", n, r.ToMap())
-	}
-}
-
-// generateUUID is used to generate a random UUID
-func generateUUID() string {
-	buf := make([]byte, 16)
-	if _, err := crand.Read(buf); err != nil {
-		panic(fmt.Errorf("failed to read random bytes: %v", err))
-	}
-
-	return fmt.Sprintf("%08x-%04x-%04x-%04x-%12x",
-		buf[0:4],
-		buf[4:6],
-		buf[6:8],
-		buf[8:10],
-		buf[10:16])
-}
-
-func BenchmarkInsert(b *testing.B) {
-	r := New[bool]()
-	for i := 0; i < 10000; i++ {
-		r.Insert(fmt.Sprintf("init%d", i), true)
-	}
-	b.ResetTimer()
-	for n := 0; n < b.N; n++ {
-		_, updated := r.Insert(strconv.Itoa(n), true)
-		if updated {
-			b.Fatal("bad")
-		}
-	}
-}
diff --git a/internal/resource/authz.go b/internal/resource/authz.go
deleted file mode 100644
index 77a5d7850f9a8..0000000000000
--- a/internal/resource/authz.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-func peerNameV2ToV1(peer string) string {
-	// The name of the local/default peer is different between v1 and v2.
-	if peer == "local" {
-		return ""
-	}
-	return peer
-}
-
-func peerNameV1ToV2(peer string) string {
-	// The name of the local/default peer is different between v1 and v2.
-	if peer == "" {
-		return "local"
-	}
-	return peer
-}
diff --git a/internal/resource/authz_ce.go b/internal/resource/authz_ce.go
deleted file mode 100644
index 69a1749e20177..0000000000000
--- a/internal/resource/authz_ce.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package resource
-
-import (
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// AuthorizerContext builds an ACL AuthorizerContext for the given tenancy.
-func AuthorizerContext(t *pbresource.Tenancy) *acl.AuthorizerContext {
-	return &acl.AuthorizerContext{
-		Peer: peerNameV2ToV1(t.PeerName),
-	}
-}
diff --git a/internal/resource/authz_ce_test.go b/internal/resource/authz_ce_test.go
deleted file mode 100644
index a2b76f86bfe1a..0000000000000
--- a/internal/resource/authz_ce_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package resource
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func TestAuthorizerContext_CE(t *testing.T) {
-	t.Run("no peer", func(t *testing.T) {
-		require.Equal(t,
-			&acl.AuthorizerContext{},
-			AuthorizerContext(&pbresource.Tenancy{
-				Partition: "foo",
-				Namespace: "bar",
-			}),
-		)
-	})
-
-	t.Run("with local peer", func(t *testing.T) {
-		require.Equal(t,
-			&acl.AuthorizerContext{},
-			AuthorizerContext(&pbresource.Tenancy{
-				Partition: "foo",
-				Namespace: "bar",
-				PeerName:  "local",
-			}),
-		)
-	})
-
-	t.Run("with non-local peer", func(t *testing.T) {
-		require.Equal(t,
-			&acl.AuthorizerContext{
-				Peer: "remote",
-			},
-			AuthorizerContext(&pbresource.Tenancy{
-				Partition: "foo",
-				Namespace: "bar",
-				PeerName:  "remote",
-			}),
-		)
-	})
-}
diff --git a/internal/resource/decode.go b/internal/resource/decode.go
deleted file mode 100644
index ba9abd87d60d9..0000000000000
--- a/internal/resource/decode.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"context"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// DecodedResource is a generic holder to contain an original Resource and its
-// decoded contents.
-type DecodedResource[T proto.Message] struct {
-	Resource *pbresource.Resource
-	Data     T
-}
-
-func (d *DecodedResource[T]) GetResource() *pbresource.Resource {
-	if d == nil {
-		return nil
-	}
-
-	return d.Resource
-}
-
-func (d *DecodedResource[T]) GetData() T {
-	if d == nil {
-		var zero T
-		return zero
-	}
-
-	return d.Data
-}
-
-// Decode will generically decode the provided resource into a 2-field
-// structure that holds onto the original Resource and the decoded contents.
-//
-// Returns an ErrDataParse on unmarshalling errors.
-func Decode[T proto.Message](res *pbresource.Resource) (*DecodedResource[T], error) {
-	var zero T
-	data := zero.ProtoReflect().New().Interface().(T)
-	// check that there is data to unmarshall
-	if res.Data != nil {
-		if err := res.Data.UnmarshalTo(data); err != nil {
-			return nil, NewErrDataParse(data, err)
-		}
-	}
-	return &DecodedResource[T]{
-		Resource: res,
-		Data:     data,
-	}, nil
-}
-
-// GetDecodedResource will generically read the requested resource using the
-// client and either return nil on a NotFound or decode the response value.
-func GetDecodedResource[T proto.Message](ctx context.Context, client pbresource.ResourceServiceClient, id *pbresource.ID) (*DecodedResource[T], error) {
-	rsp, err := client.Read(ctx, &pbresource.ReadRequest{Id: id})
-	switch {
-	case status.Code(err) == codes.NotFound:
-		return nil, nil
-	case err != nil:
-		return nil, err
-	}
-	return Decode[T](rsp.Resource)
-}
diff --git a/internal/resource/decode_test.go b/internal/resource/decode_test.go
deleted file mode 100644
index 02e86fddfbf7d..0000000000000
--- a/internal/resource/decode_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbdemo "github.com/hashicorp/consul/proto/private/pbdemo/v2"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestGetDecodedResource(t *testing.T) {
-	var (
-		baseClient = svctest.RunResourceService(t, demo.RegisterTypes)
-		client     = rtest.NewClient(baseClient)
-		ctx        = testutil.TestContext(t)
-	)
-
-	babypantsID := &pbresource.ID{
-		Type:    demo.TypeV2Artist,
-		Tenancy: resource.DefaultNamespacedTenancy(),
-		Name:    "babypants",
-	}
-
-	testutil.RunStep(t, "not found", func(t *testing.T) {
-		got, err := resource.GetDecodedResource[*pbdemo.Artist](ctx, client, babypantsID)
-		require.NoError(t, err)
-		require.Nil(t, got)
-	})
-
-	testutil.RunStep(t, "found", func(t *testing.T) {
-		data := &pbdemo.Artist{
-			Name: "caspar babypants",
-		}
-		res := rtest.Resource(demo.TypeV2Artist, "babypants").
-			WithTenancy(resource.DefaultNamespacedTenancy()).
-			WithData(t, data).
-			Write(t, client)
-
-		got, err := resource.GetDecodedResource[*pbdemo.Artist](ctx, client, babypantsID)
-		require.NoError(t, err)
-		require.NotNil(t, got)
-
-		// Clone generated fields over.
-		res.Id.Uid = got.Resource.Id.Uid
-		res.Version = got.Resource.Version
-		res.Generation = got.Resource.Generation
-
-		// Clone defaulted fields over
-		data.Genre = pbdemo.Genre_GENRE_DISCO
-
-		prototest.AssertDeepEqual(t, res, got.Resource)
-		prototest.AssertDeepEqual(t, data, got.Data)
-	})
-}
-
-func TestDecode(t *testing.T) {
-	t.Run("good", func(t *testing.T) {
-		fooData := &pbdemo.Artist{
-			Name: "caspar babypants",
-		}
-		any, err := anypb.New(fooData)
-		require.NoError(t, err)
-
-		foo := &pbresource.Resource{
-			Id: &pbresource.ID{
-				Type:    demo.TypeV2Artist,
-				Tenancy: resource.DefaultNamespacedTenancy(),
-				Name:    "babypants",
-			},
-			Data: any,
-			Metadata: map[string]string{
-				"generated_at": time.Now().Format(time.RFC3339),
-			},
-		}
-
-		dec, err := resource.Decode[*pbdemo.Artist](foo)
-		require.NoError(t, err)
-
-		prototest.AssertDeepEqual(t, foo, dec.Resource)
-		prototest.AssertDeepEqual(t, fooData, dec.Data)
-	})
-
-	t.Run("bad", func(t *testing.T) {
-		foo := &pbresource.Resource{
-			Id: &pbresource.ID{
-				Type:    demo.TypeV2Artist,
-				Tenancy: resource.DefaultNamespacedTenancy(),
-				Name:    "babypants",
-			},
-			Data: &anypb.Any{
-				TypeUrl: "garbage",
-				Value:   []byte("more garbage"),
-			},
-			Metadata: map[string]string{
-				"generated_at": time.Now().Format(time.RFC3339),
-			},
-		}
-
-		_, err := resource.Decode[*pbdemo.Artist](foo)
-		require.Error(t, err)
-	})
-}
diff --git a/internal/resource/demo/controller.go b/internal/resource/demo/controller.go
deleted file mode 100644
index 7f1bba902ea51..0000000000000
--- a/internal/resource/demo/controller.go
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package demo
-
-import (
-	"context"
-	"fmt"
-	"math/rand"
-
-	"github.com/oklog/ulid/v2"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbdemov2 "github.com/hashicorp/consul/proto/private/pbdemo/v2"
-)
-
-const statusKeyArtistController = "consul.io/artist-controller"
-
-// RegisterControllers registers controllers for the demo types. Should only be
-// called in dev mode.
-func RegisterControllers(mgr *controller.Manager) {
-	mgr.Register(artistController())
-}
-
-func artistController() controller.Controller {
-	return controller.ForType(TypeV2Artist).
-		WithWatch(TypeV2Album, controller.MapOwner).
-		WithReconciler(&artistReconciler{})
-}
-
-type artistReconciler struct{}
-
-func (r *artistReconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	rsp, err := rt.Client.Read(ctx, &pbresource.ReadRequest{Id: req.ID})
-	switch {
-	case status.Code(err) == codes.NotFound:
-		return nil
-	case err != nil:
-		return err
-	}
-	res := rsp.Resource
-
-	var artist pbdemov2.Artist
-	if err := res.Data.UnmarshalTo(&artist); err != nil {
-		return err
-	}
-	conditions := []*pbresource.Condition{
-		{
-			Type:    "Accepted",
-			State:   pbresource.Condition_STATE_TRUE,
-			Reason:  "Accepted",
-			Message: fmt.Sprintf("Artist '%s' accepted", artist.Name),
-		},
-	}
-
-	numAlbums := 3
-	if artist.Genre == pbdemov2.Genre_GENRE_BLUES {
-		numAlbums = 10
-	}
-
-	desiredAlbums, err := generateV2AlbumsDeterministic(res.Id, numAlbums)
-	if err != nil {
-		return err
-	}
-
-	actualAlbums, err := rt.Client.List(ctx, &pbresource.ListRequest{
-		Type:       TypeV2Album,
-		Tenancy:    res.Id.Tenancy,
-		NamePrefix: fmt.Sprintf("%s/", res.Id.Name),
-	})
-	if err != nil {
-		return err
-	}
-
-	writes, deletions, err := diffAlbums(desiredAlbums, actualAlbums.Resources)
-	if err != nil {
-		return err
-	}
-	for _, w := range writes {
-		if _, err := rt.Client.Write(ctx, &pbresource.WriteRequest{Resource: w}); err != nil {
-			return err
-		}
-	}
-	for _, d := range deletions {
-		if _, err := rt.Client.Delete(ctx, &pbresource.DeleteRequest{Id: d}); err != nil {
-			return err
-		}
-	}
-
-	for _, want := range desiredAlbums {
-		var album pbdemov2.Album
-		if err := want.Data.UnmarshalTo(&album); err != nil {
-			return err
-		}
-		conditions = append(conditions, &pbresource.Condition{
-			Type:     "AlbumCreated",
-			State:    pbresource.Condition_STATE_TRUE,
-			Reason:   "AlbumCreated",
-			Message:  fmt.Sprintf("Album '%s' created for artist '%s'", album.Title, artist.Name),
-			Resource: resource.Reference(want.Id, ""),
-		})
-	}
-
-	newStatus := &pbresource.Status{
-		ObservedGeneration: res.Generation,
-		Conditions:         conditions,
-	}
-
-	if resource.EqualStatus(res.Status[statusKeyArtistController], newStatus, false) {
-		return nil
-	}
-
-	_, err = rt.Client.WriteStatus(ctx, &pbresource.WriteStatusRequest{
-		Id:     res.Id,
-		Key:    statusKeyArtistController,
-		Status: newStatus,
-	})
-	return err
-}
-
-func diffAlbums(want, have []*pbresource.Resource) ([]*pbresource.Resource, []*pbresource.ID, error) {
-	haveMap := make(map[string]*pbresource.Resource, len(have))
-	for _, r := range have {
-		haveMap[r.Id.Name] = r
-	}
-
-	wantMap := make(map[string]struct{}, len(want))
-	for _, r := range want {
-		wantMap[r.Id.Name] = struct{}{}
-	}
-
-	writes := make([]*pbresource.Resource, 0)
-	for _, w := range want {
-		h, ok := haveMap[w.Id.Name]
-		if ok {
-			var wd, hd pbdemov2.Album
-			if err := w.Data.UnmarshalTo(&wd); err != nil {
-				return nil, nil, err
-			}
-			if err := h.Data.UnmarshalTo(&hd); err != nil {
-				return nil, nil, err
-			}
-			if proto.Equal(&wd, &hd) {
-				continue
-			}
-		}
-
-		writes = append(writes, w)
-	}
-
-	deletions := make([]*pbresource.ID, 0)
-	for _, h := range have {
-		if _, ok := wantMap[h.Id.Name]; ok {
-			continue
-		}
-		deletions = append(deletions, h.Id)
-	}
-
-	return writes, deletions, nil
-}
-
-func generateV2AlbumsDeterministic(artistID *pbresource.ID, count int) ([]*pbresource.Resource, error) {
-	uid, err := ulid.Parse(artistID.Uid)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse Uid: %w", err)
-	}
-	rand := rand.New(rand.NewSource(int64(uid.Time())))
-
-	albums := make([]*pbresource.Resource, count)
-	for i := 0; i < count; i++ {
-		album, err := generateV2Album(artistID, rand)
-		if err != nil {
-			return nil, err
-		}
-		// Add suffix to avoid collisions.
-		album.Id.Name = fmt.Sprintf("%s-%d", album.Id.Name, i)
-		albums[i] = album
-	}
-	return albums, nil
-}
diff --git a/internal/resource/demo/controller_test.go b/internal/resource/demo/controller_test.go
deleted file mode 100644
index a8c2640d615a8..0000000000000
--- a/internal/resource/demo/controller_test.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package demo
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbdemov2 "github.com/hashicorp/consul/proto/private/pbdemo/v2"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestArtistReconciler(t *testing.T) {
-	client := svctest.RunResourceService(t, RegisterTypes)
-
-	// Seed the database with an artist.
-	res, err := GenerateV2Artist()
-	require.NoError(t, err)
-
-	// Set the genre to BLUES to ensure there are 10 albums.
-	var artist pbdemov2.Artist
-	require.NoError(t, res.Data.UnmarshalTo(&artist))
-	artist.Genre = pbdemov2.Genre_GENRE_BLUES
-	require.NoError(t, res.Data.MarshalFrom(&artist))
-
-	ctx := testutil.TestContext(t)
-	writeRsp, err := client.Write(ctx, &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	// Call the reconciler for that artist.
-	var rec artistReconciler
-	runtime := controller.Runtime{
-		Client: client,
-		Logger: testutil.Logger(t),
-	}
-	req := controller.Request{
-		ID: writeRsp.Resource.Id,
-	}
-	require.NoError(t, rec.Reconcile(ctx, runtime, req))
-
-	// Check the status was updated.
-	readRsp, err := client.Read(ctx, &pbresource.ReadRequest{Id: writeRsp.Resource.Id})
-	require.NoError(t, err)
-	require.Contains(t, readRsp.Resource.Status, "consul.io/artist-controller")
-
-	status := readRsp.Resource.Status["consul.io/artist-controller"]
-	require.Equal(t, writeRsp.Resource.Generation, status.ObservedGeneration)
-	require.Len(t, status.Conditions, 11)
-	require.Equal(t, "Accepted", status.Conditions[0].Type)
-	require.Equal(t, "AlbumCreated", status.Conditions[1].Type)
-
-	// Check the albums were created.
-	listRsp, err := client.List(ctx, &pbresource.ListRequest{
-		Type:    TypeV2Album,
-		Tenancy: readRsp.Resource.Id.Tenancy,
-	})
-	require.NoError(t, err)
-	require.Len(t, listRsp.Resources, 10)
-
-	// Delete an album.
-	_, err = client.Delete(ctx, &pbresource.DeleteRequest{Id: listRsp.Resources[0].Id})
-	require.NoError(t, err)
-
-	// Call the reconciler again.
-	require.NoError(t, rec.Reconcile(ctx, runtime, req))
-
-	// Check the album was recreated.
-	listRsp, err = client.List(ctx, &pbresource.ListRequest{
-		Type:    TypeV2Album,
-		Tenancy: readRsp.Resource.Id.Tenancy,
-	})
-	require.NoError(t, err)
-	require.Len(t, listRsp.Resources, 10)
-
-	// Set the genre to DISCO.
-	readRsp, err = client.Read(ctx, &pbresource.ReadRequest{Id: writeRsp.Resource.Id})
-	require.NoError(t, err)
-
-	res = readRsp.Resource
-	require.NoError(t, res.Data.UnmarshalTo(&artist))
-	artist.Genre = pbdemov2.Genre_GENRE_DISCO
-	require.NoError(t, res.Data.MarshalFrom(&artist))
-
-	_, err = client.Write(ctx, &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	// Call the reconciler again.
-	require.NoError(t, rec.Reconcile(ctx, runtime, req))
-
-	// Check there are only 3 albums now.
-	listRsp, err = client.List(ctx, &pbresource.ListRequest{
-		Type:    TypeV2Album,
-		Tenancy: readRsp.Resource.Id.Tenancy,
-	})
-	require.NoError(t, err)
-	require.Len(t, listRsp.Resources, 3)
-}
diff --git a/internal/resource/demo/demo.go b/internal/resource/demo/demo.go
deleted file mode 100644
index b6a9263842d34..0000000000000
--- a/internal/resource/demo/demo.go
+++ /dev/null
@@ -1,419 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Package demo includes fake resource types for working on Consul's generic
-// state storage without having to refer to specific features.
-package demo
-
-import (
-	"fmt"
-	"math/rand"
-	"strings"
-	"time"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbdemov1 "github.com/hashicorp/consul/proto/private/pbdemo/v1"
-	pbdemov2 "github.com/hashicorp/consul/proto/private/pbdemo/v2"
-)
-
-var (
-	// TypeV1Executive represents a a C-suite executive of the company.
-	// Used as a resource to test cluster scope.
-	TypeV1Executive = &pbresource.Type{
-		Group:        "demo",
-		GroupVersion: "v1",
-		Kind:         "Executive",
-	}
-
-	// TypeV1RecordLabel represents a record label which artists are signed to.
-	// Used as a resource to test partiion scope.
-	TypeV1RecordLabel = &pbresource.Type{
-		Group:        "demo",
-		GroupVersion: "v1",
-		Kind:         "RecordLabel",
-	}
-
-	// TypeV1Artist represents a musician or group of musicians.
-	TypeV1Artist = &pbresource.Type{
-		Group:        "demo",
-		GroupVersion: "v1",
-		Kind:         "Artist",
-	}
-
-	// TypeV1Album represents a collection of an artist's songs.
-	TypeV1Album = &pbresource.Type{
-		Group:        "demo",
-		GroupVersion: "v1",
-		Kind:         "Album",
-	}
-
-	// TypeV1Concept represents an abstract concept that can be associated with any other resource.
-	TypeV1Concept = &pbresource.Type{
-		Group:        "demo",
-		GroupVersion: "v1",
-		Kind:         "Concept",
-	}
-
-	// TypeV2Artist represents a musician or group of musicians.
-	TypeV2Artist = &pbresource.Type{
-		Group:        "demo",
-		GroupVersion: "v2",
-		Kind:         "Artist",
-	}
-
-	// TypeV2Album represents a collection of an artist's songs.
-	TypeV2Album = &pbresource.Type{
-		Group:        "demo",
-		GroupVersion: "v2",
-		Kind:         "Album",
-	}
-)
-
-const (
-	ArtistV1ReadPolicy  = `key_prefix "resource/demo.v1.Artist/" { policy = "read" }`
-	ArtistV1WritePolicy = `key_prefix "resource/demo.v1.Artist/" { policy = "write" }`
-	ArtistV2ReadPolicy  = `key_prefix "resource/demo.v2.Artist/" { policy = "read" }`
-	ArtistV2WritePolicy = `key_prefix "resource/demo.v2.Artist/" { policy = "write" }`
-	ArtistV2ListPolicy  = `key_prefix "resource/" { policy = "list" }`
-
-	ExecutiveV1ReadPolicy  = `key_prefix "resource/demo.v1.Executive/" { policy = "read" }`
-	ExecutiveV1WritePolicy = `key_prefix "resource/demo.v1.Executive/" { policy = "write" }`
-
-	LabelV1ReadPolicy  = `key_prefix "resource/demo.v1.Label/" { policy = "read" }`
-	LabelV1WritePolicy = `key_prefix "resource/demo.v1.Label/" { policy = "write" }`
-)
-
-// RegisterTypes registers the demo types. Should only be called in tests and
-// dev mode.
-//
-// TODO(spatel): We're standing-in key ACLs for demo resources until our ACL
-// system can be more modularly extended (or support generic resource permissions).
-func RegisterTypes(r resource.Registry) {
-	readACL := func(authz acl.Authorizer, authzContext *acl.AuthorizerContext, id *pbresource.ID, res *pbresource.Resource) error {
-		if resource.EqualType(TypeV1RecordLabel, id.Type) {
-			if res == nil {
-				return resource.ErrNeedData
-			}
-		}
-		key := fmt.Sprintf("resource/%s/%s", resource.ToGVK(id.Type), id.Name)
-		return authz.ToAllowAuthorizer().KeyReadAllowed(key, authzContext)
-	}
-
-	writeACL := func(authz acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
-		key := fmt.Sprintf("resource/%s/%s", resource.ToGVK(res.Id.Type), res.Id.Name)
-		return authz.ToAllowAuthorizer().KeyWriteAllowed(key, authzContext)
-	}
-
-	makeListACL := func(typ *pbresource.Type) func(acl.Authorizer, *acl.AuthorizerContext) error {
-		return func(authz acl.Authorizer, authzContext *acl.AuthorizerContext) error {
-			key := fmt.Sprintf("resource/%s", resource.ToGVK(typ))
-			return authz.ToAllowAuthorizer().KeyListAllowed(key, authzContext)
-		}
-	}
-
-	validateV1ArtistFn := func(res *pbresource.Resource) error {
-		artist := &pbdemov1.Artist{}
-		if err := anypb.UnmarshalTo(res.Data, artist, proto.UnmarshalOptions{}); err != nil {
-			return err
-		}
-		if artist.Name == "" {
-			return fmt.Errorf("artist.name required")
-		}
-		return nil
-	}
-
-	validateV2ArtistFn := func(res *pbresource.Resource) error {
-		artist := &pbdemov2.Artist{}
-		if err := anypb.UnmarshalTo(res.Data, artist, proto.UnmarshalOptions{}); err != nil {
-			return err
-		}
-		if artist.Name == "" {
-			return fmt.Errorf("artist.name required")
-		}
-		return nil
-	}
-
-	mutateV2ArtistFn := func(res *pbresource.Resource) error {
-		// Not a realistic use for this hook, but set genre if not specified
-		artist := &pbdemov2.Artist{}
-		if err := anypb.UnmarshalTo(res.Data, artist, proto.UnmarshalOptions{}); err != nil {
-			return err
-		}
-		if artist.Genre == pbdemov2.Genre_GENRE_UNSPECIFIED {
-			artist.Genre = pbdemov2.Genre_GENRE_DISCO
-			return res.Data.MarshalFrom(artist)
-		}
-		return nil
-	}
-
-	r.Register(resource.Registration{
-		Type:  TypeV1Executive,
-		Proto: &pbdemov1.Executive{},
-		Scope: resource.ScopeCluster,
-		ACLs: &resource.ACLHooks{
-			Read:  readACL,
-			Write: writeACL,
-			List:  makeListACL(TypeV1Executive),
-		},
-	})
-
-	r.Register(resource.Registration{
-		Type:  TypeV1RecordLabel,
-		Proto: &pbdemov1.RecordLabel{},
-		Scope: resource.ScopePartition,
-		ACLs: &resource.ACLHooks{
-			Read:  readACL,
-			Write: writeACL,
-			List:  makeListACL(TypeV1RecordLabel),
-		},
-	})
-
-	r.Register(resource.Registration{
-		Type:  TypeV1Artist,
-		Proto: &pbdemov1.Artist{},
-		Scope: resource.ScopeNamespace,
-		ACLs: &resource.ACLHooks{
-			Read:  readACL,
-			Write: writeACL,
-			List:  makeListACL(TypeV1Artist),
-		},
-		Validate: validateV1ArtistFn,
-	})
-
-	r.Register(resource.Registration{
-		Type:  TypeV1Album,
-		Proto: &pbdemov1.Album{},
-		Scope: resource.ScopeNamespace,
-		ACLs: &resource.ACLHooks{
-			Read:  readACL,
-			Write: writeACL,
-			List:  makeListACL(TypeV1Album),
-		},
-	})
-
-	r.Register(resource.Registration{
-		Type:  TypeV1Concept,
-		Proto: &pbdemov1.Concept{},
-		Scope: resource.ScopeNamespace,
-		ACLs: &resource.ACLHooks{
-			Read:  readACL,
-			Write: writeACL,
-			List:  makeListACL(TypeV1Concept),
-		},
-	})
-
-	r.Register(resource.Registration{
-		Type:  TypeV2Artist,
-		Proto: &pbdemov2.Artist{},
-		Scope: resource.ScopeNamespace,
-		ACLs: &resource.ACLHooks{
-			Read:  readACL,
-			Write: writeACL,
-			List:  makeListACL(TypeV2Artist),
-		},
-		Validate: validateV2ArtistFn,
-		Mutate:   mutateV2ArtistFn,
-	})
-
-	r.Register(resource.Registration{
-		Type:  TypeV2Album,
-		Proto: &pbdemov2.Album{},
-		Scope: resource.ScopeNamespace,
-		ACLs: &resource.ACLHooks{
-			Read:  readACL,
-			Write: writeACL,
-			List:  makeListACL(TypeV2Album),
-		},
-	})
-}
-
-// GenerateV1Executive generates a named Executive resource.
-func GenerateV1Executive(name, position string) (*pbresource.Resource, error) {
-	data, err := anypb.New(&pbdemov1.Executive{Position: position})
-	if err != nil {
-		return nil, err
-	}
-
-	return &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type:    TypeV1Executive,
-			Tenancy: resource.DefaultClusteredTenancy(),
-			Name:    name,
-		},
-		Data: data,
-		Metadata: map[string]string{
-			"generated_at": time.Now().Format(time.RFC3339),
-		},
-	}, nil
-}
-
-// GenerateV1RecordLabel generates a named RecordLabel resource.
-func GenerateV1RecordLabel(name string) (*pbresource.Resource, error) {
-	data, err := anypb.New(&pbdemov1.RecordLabel{Name: name})
-	if err != nil {
-		return nil, err
-	}
-
-	return &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type:    TypeV1RecordLabel,
-			Tenancy: resource.DefaultPartitionedTenancy(),
-			Name:    name,
-		},
-		Data: data,
-		Metadata: map[string]string{
-			"generated_at": time.Now().Format(time.RFC3339),
-		},
-	}, nil
-}
-
-// GenerateV1Concept generates a named concept resource.
-func GenerateV1Concept(name string) (*pbresource.Resource, error) {
-	return &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type:    TypeV1Concept,
-			Tenancy: resource.DefaultPartitionedTenancy(),
-			Name:    name,
-		},
-		Data: nil,
-		Metadata: map[string]string{
-			"generated_at": time.Now().Format(time.RFC3339),
-		},
-	}, nil
-}
-
-// GenerateV2Artist generates a random Artist resource.
-func GenerateV2Artist() (*pbresource.Resource, error) {
-	adjective := adjectives[rand.Intn(len(adjectives))]
-	noun := nouns[rand.Intn(len(nouns))]
-
-	numMembers := rand.Intn(5) + 1
-	groupMembers := make(map[string]string, numMembers)
-	for i := 0; i < numMembers; i++ {
-		groupMembers[members[rand.Intn(len(members))]] = instruments[rand.Intn(len(instruments))]
-	}
-
-	data, err := anypb.New(&pbdemov2.Artist{
-		Name:         fmt.Sprintf("%s %s", adjective, noun),
-		Genre:        randomGenre(),
-		GroupMembers: groupMembers,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type:    TypeV2Artist,
-			Tenancy: resource.DefaultNamespacedTenancy(),
-			Name:    fmt.Sprintf("%s-%s", strings.ToLower(adjective), strings.ToLower(noun)),
-		},
-		Data: data,
-		Metadata: map[string]string{
-			"generated_at": time.Now().Format(time.RFC3339),
-		},
-	}, nil
-}
-
-// GenerateV2Album generates a random Album resource, owned by the Artist with
-// the given ID.
-func GenerateV2Album(artistID *pbresource.ID) (*pbresource.Resource, error) {
-	return generateV2Album(artistID, rand.New(rand.NewSource(time.Now().UnixNano())))
-}
-
-func generateV2Album(artistID *pbresource.ID, rand *rand.Rand) (*pbresource.Resource, error) {
-	adjective := adjectives[rand.Intn(len(adjectives))]
-	noun := nouns[rand.Intn(len(nouns))]
-
-	numTracks := 3 + rand.Intn(3)
-	tracks := make([]string, numTracks)
-	for i := 0; i < numTracks; i++ {
-		words := nouns
-		if i%3 == 0 {
-			words = adjectives
-		}
-		tracks[i] = words[rand.Intn(len(words))]
-	}
-
-	data, err := anypb.New(&pbdemov2.Album{
-		Title:              fmt.Sprintf("%s %s", adjective, noun),
-		YearOfRelease:      int32(1990 + rand.Intn(time.Now().Year()-1990)),
-		CriticallyAclaimed: rand.Int()%2 == 0,
-		Tracks:             tracks,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type:    TypeV2Album,
-			Tenancy: clone(artistID.Tenancy),
-			Name:    fmt.Sprintf("%s/%s-%s", artistID.Name, strings.ToLower(adjective), strings.ToLower(noun)),
-		},
-		Owner: artistID,
-		Data:  data,
-		Metadata: map[string]string{
-			"generated_at": time.Now().Format(time.RFC3339),
-		},
-	}, nil
-}
-
-func randomGenre() pbdemov2.Genre {
-	return pbdemov2.Genre(rand.Intn(len(pbdemov1.Genre_name)-1) + 1)
-}
-
-var (
-	adjectives = []string{
-		"Purple",
-		"Angry",
-		"Euphoric",
-		"Unexpected",
-		"Cheesy",
-		"Rancid",
-		"Pleasant",
-		"Mumbling",
-		"Enlightened",
-	}
-
-	nouns = []string{
-		"Speakerphone",
-		"Fox",
-		"Guppy",
-		"Smile",
-		"Emacs",
-		"Grapefruit",
-		"Engineer",
-		"Basketball",
-	}
-
-	members = []string{
-		"Owl",
-		"Tiger",
-		"Beetle",
-		"Lion",
-		"Chicken",
-		"Snake",
-		"Monkey",
-		"Kitten",
-		"Hound",
-	}
-
-	instruments = []string{
-		"Guitar",
-		"Bass",
-		"Lead Vocals",
-		"Backing Vocals",
-		"Drums",
-		"Synthesizer",
-		"Triangle",
-		"Standing by the stage looking cool",
-	}
-)
-
-func clone[T proto.Message](v T) T { return proto.Clone(v).(T) }
diff --git a/internal/resource/equality.go b/internal/resource/equality.go
deleted file mode 100644
index 25e098b1a3610..0000000000000
--- a/internal/resource/equality.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import "github.com/hashicorp/consul/proto-public/pbresource"
-
-// EqualType compares two resource types for equality without reflection.
-func EqualType(a, b *pbresource.Type) bool {
-	if a == b {
-		return true
-	}
-
-	if a == nil || b == nil {
-		return false
-	}
-
-	return a.Group == b.Group &&
-		a.GroupVersion == b.GroupVersion &&
-		a.Kind == b.Kind
-}
-
-// EqualTenancy compares two resource tenancies for equality without reflection.
-func EqualTenancy(a, b *pbresource.Tenancy) bool {
-	if a == b {
-		return true
-	}
-
-	if a == nil || b == nil {
-		return false
-	}
-
-	return a.Partition == b.Partition &&
-		a.PeerName == b.PeerName &&
-		a.Namespace == b.Namespace
-}
-
-// EqualID compares two resource IDs for equality without reflection.
-func EqualID(a, b *pbresource.ID) bool {
-	if a == b {
-		return true
-	}
-
-	if a == nil || b == nil {
-		return false
-	}
-
-	return EqualType(a.Type, b.Type) &&
-		EqualTenancy(a.Tenancy, b.Tenancy) &&
-		a.Name == b.Name &&
-		a.Uid == b.Uid
-}
-
-// EqualStatus compares two statuses for equality without reflection.
-//
-// Pass true for compareUpdatedAt to compare the UpdatedAt timestamps, which you
-// generally *don't* want when dirty checking the status in a controller.
-func EqualStatus(a, b *pbresource.Status, compareUpdatedAt bool) bool {
-	if a == b {
-		return true
-	}
-
-	if a == nil || b == nil {
-		return false
-	}
-
-	if a.ObservedGeneration != b.ObservedGeneration {
-		return false
-	}
-
-	if compareUpdatedAt && !a.UpdatedAt.AsTime().Equal(b.UpdatedAt.AsTime()) {
-		return false
-	}
-
-	if len(a.Conditions) != len(b.Conditions) {
-		return false
-	}
-
-	for i, ac := range a.Conditions {
-		bc := b.Conditions[i]
-
-		if !EqualCondition(ac, bc) {
-			return false
-		}
-	}
-
-	return true
-}
-
-// EqualCondition compares two conditions for equality without reflection.
-func EqualCondition(a, b *pbresource.Condition) bool {
-	if a == b {
-		return true
-	}
-
-	if a == nil || b == nil {
-		return false
-	}
-
-	return a.Type == b.Type &&
-		a.State == b.State &&
-		a.Reason == b.Reason &&
-		a.Message == b.Message &&
-		EqualReference(a.Resource, b.Resource)
-}
-
-// EqualReference compares two references for equality without reflection.
-func EqualReference(a, b *pbresource.Reference) bool {
-	if a == b {
-		return true
-	}
-
-	if a == nil || b == nil {
-		return false
-	}
-
-	return EqualType(a.Type, b.Type) &&
-		EqualTenancy(a.Tenancy, b.Tenancy) &&
-		a.Name == b.Name &&
-		a.Section == b.Section
-}
-
-// ReferenceOrIDMatch compares two references or IDs to see if they both refer
-// to the same thing.
-//
-// Note that this only compares fields that are common between them as
-// represented by the ReferenceOrID interface and notably ignores the section
-// field on references and the uid field on ids.
-func ReferenceOrIDMatch(ref1, ref2 ReferenceOrID) bool {
-	if ref1 == nil || ref2 == nil {
-		return false
-	}
-
-	return EqualType(ref1.GetType(), ref2.GetType()) &&
-		EqualTenancy(ref1.GetTenancy(), ref2.GetTenancy()) &&
-		ref1.GetName() == ref2.GetName()
-}
-
-// EqualStatusMap compares two status maps for equality without reflection.
-func EqualStatusMap(a, b map[string]*pbresource.Status) bool {
-	if len(a) != len(b) {
-		return false
-	}
-
-	compared := make(map[string]struct{})
-	for k, av := range a {
-		bv, ok := b[k]
-		if !ok {
-			return false
-		}
-		if !EqualStatus(av, bv, true) {
-			return false
-		}
-		compared[k] = struct{}{}
-	}
-
-	for k, bv := range b {
-		if _, skip := compared[k]; skip {
-			continue
-		}
-
-		av, ok := a[k]
-		if !ok {
-			return false
-		}
-
-		if !EqualStatus(av, bv, true) {
-			return false
-		}
-	}
-
-	return true
-}
diff --git a/internal/resource/equality_test.go b/internal/resource/equality_test.go
deleted file mode 100644
index 8413905606383..0000000000000
--- a/internal/resource/equality_test.go
+++ /dev/null
@@ -1,949 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource_test
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/oklog/ulid/v2"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/timestamppb"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func TestEqualType(t *testing.T) {
-	t.Run("same pointer", func(t *testing.T) {
-		typ := &pbresource.Type{
-			Group:        "foo",
-			GroupVersion: "v1",
-			Kind:         "bar",
-		}
-		require.True(t, resource.EqualType(typ, typ))
-	})
-
-	t.Run("equal", func(t *testing.T) {
-		a := &pbresource.Type{
-			Group:        "foo",
-			GroupVersion: "v1",
-			Kind:         "bar",
-		}
-		b := clone(a)
-		require.True(t, resource.EqualType(a, b))
-	})
-
-	t.Run("nil", func(t *testing.T) {
-		a := &pbresource.Type{
-			Group:        "foo",
-			GroupVersion: "v1",
-			Kind:         "bar",
-		}
-		require.False(t, resource.EqualType(a, nil))
-		require.False(t, resource.EqualType(nil, a))
-	})
-
-	t.Run("different Group", func(t *testing.T) {
-		a := &pbresource.Type{
-			Group:        "foo",
-			GroupVersion: "v1",
-			Kind:         "bar",
-		}
-		b := clone(a)
-		b.Group = "bar"
-		require.False(t, resource.EqualType(a, b))
-	})
-
-	t.Run("different GroupVersion", func(t *testing.T) {
-		a := &pbresource.Type{
-			Group:        "foo",
-			GroupVersion: "v1",
-			Kind:         "bar",
-		}
-		b := clone(a)
-		b.GroupVersion = "v2"
-		require.False(t, resource.EqualType(a, b))
-	})
-
-	t.Run("different Kind", func(t *testing.T) {
-		a := &pbresource.Type{
-			Group:        "foo",
-			GroupVersion: "v1",
-			Kind:         "bar",
-		}
-		b := clone(a)
-		b.Kind = "baz"
-		require.False(t, resource.EqualType(a, b))
-	})
-}
-
-func TestEqualTenancy(t *testing.T) {
-	t.Run("same pointer", func(t *testing.T) {
-		ten := &pbresource.Tenancy{
-			Partition: "foo",
-			PeerName:  "bar",
-			Namespace: "baz",
-		}
-		require.True(t, resource.EqualTenancy(ten, ten))
-	})
-
-	t.Run("equal", func(t *testing.T) {
-		a := &pbresource.Tenancy{
-			Partition: "foo",
-			PeerName:  "bar",
-			Namespace: "baz",
-		}
-		b := clone(a)
-		require.True(t, resource.EqualTenancy(a, b))
-	})
-
-	t.Run("nil", func(t *testing.T) {
-		a := &pbresource.Tenancy{
-			Partition: "foo",
-			PeerName:  "bar",
-			Namespace: "baz",
-		}
-		require.False(t, resource.EqualTenancy(a, nil))
-		require.False(t, resource.EqualTenancy(nil, a))
-	})
-
-	t.Run("different Partition", func(t *testing.T) {
-		a := &pbresource.Tenancy{
-			Partition: "foo",
-			PeerName:  "bar",
-			Namespace: "baz",
-		}
-		b := clone(a)
-		b.Partition = "qux"
-		require.False(t, resource.EqualTenancy(a, b))
-	})
-
-	t.Run("different PeerName", func(t *testing.T) {
-		a := &pbresource.Tenancy{
-			Partition: "foo",
-			PeerName:  "bar",
-			Namespace: "baz",
-		}
-		b := clone(a)
-		b.PeerName = "qux"
-		require.False(t, resource.EqualTenancy(a, b))
-	})
-
-	t.Run("different Namespace", func(t *testing.T) {
-		a := &pbresource.Tenancy{
-			Partition: "foo",
-			PeerName:  "bar",
-			Namespace: "baz",
-		}
-		b := clone(a)
-		b.Namespace = "qux"
-		require.False(t, resource.EqualTenancy(a, b))
-	})
-}
-
-func TestEqualID(t *testing.T) {
-	t.Run("same pointer", func(t *testing.T) {
-		id := &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name: "qux",
-			Uid:  ulid.Make().String(),
-		}
-		require.True(t, resource.EqualID(id, id))
-	})
-
-	t.Run("equal", func(t *testing.T) {
-		a := &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name: "qux",
-			Uid:  ulid.Make().String(),
-		}
-		b := clone(a)
-		require.True(t, resource.EqualID(a, b))
-	})
-
-	t.Run("nil", func(t *testing.T) {
-		a := &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name: "qux",
-			Uid:  ulid.Make().String(),
-		}
-		require.False(t, resource.EqualID(a, nil))
-		require.False(t, resource.EqualID(nil, a))
-	})
-
-	t.Run("different type", func(t *testing.T) {
-		a := &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name: "qux",
-			Uid:  ulid.Make().String(),
-		}
-		b := clone(a)
-		b.Type.Kind = "album"
-		require.False(t, resource.EqualID(a, b))
-	})
-
-	t.Run("different tenancy", func(t *testing.T) {
-		a := &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name: "qux",
-			Uid:  ulid.Make().String(),
-		}
-		b := clone(a)
-		b.Tenancy.Namespace = "qux"
-		require.False(t, resource.EqualID(a, b))
-	})
-
-	t.Run("different name", func(t *testing.T) {
-		a := &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name: "qux",
-			Uid:  ulid.Make().String(),
-		}
-		b := clone(a)
-		b.Name = "boom"
-		require.False(t, resource.EqualID(a, b))
-	})
-
-	t.Run("different uid", func(t *testing.T) {
-		a := &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name: "qux",
-			Uid:  ulid.Make().String(),
-		}
-		b := clone(a)
-		b.Uid = ulid.Make().String()
-		require.False(t, resource.EqualID(a, b))
-	})
-}
-
-func TestEqualReference(t *testing.T) {
-	t.Run("same pointer", func(t *testing.T) {
-		id := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name:    "qux",
-			Section: "blah",
-		}
-		require.True(t, resource.EqualReference(id, id))
-	})
-
-	t.Run("equal", func(t *testing.T) {
-		a := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name:    "qux",
-			Section: "blah",
-		}
-		b := clone(a)
-		require.True(t, resource.EqualReference(a, b))
-	})
-
-	t.Run("nil", func(t *testing.T) {
-		a := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name:    "qux",
-			Section: "blah",
-		}
-		require.False(t, resource.EqualReference(a, nil))
-		require.False(t, resource.EqualReference(nil, a))
-	})
-
-	t.Run("different type", func(t *testing.T) {
-		a := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name:    "qux",
-			Section: "blah",
-		}
-		b := clone(a)
-		b.Type.Kind = "album"
-		require.False(t, resource.EqualReference(a, b))
-	})
-
-	t.Run("different tenancy", func(t *testing.T) {
-		a := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name:    "qux",
-			Section: "blah",
-		}
-		b := clone(a)
-		b.Tenancy.Namespace = "qux"
-		require.False(t, resource.EqualReference(a, b))
-	})
-
-	t.Run("different name", func(t *testing.T) {
-		a := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name:    "qux",
-			Section: "blah",
-		}
-		b := clone(a)
-		b.Name = "boom"
-		require.False(t, resource.EqualReference(a, b))
-	})
-
-	t.Run("different section", func(t *testing.T) {
-		a := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name:    "qux",
-			Section: "blah",
-		}
-		b := clone(a)
-		b.Section = "not-blah"
-		require.False(t, resource.EqualReference(a, b))
-	})
-}
-
-func TestReferenceOrIDMatch(t *testing.T) {
-	t.Run("equal", func(t *testing.T) {
-		a := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name:    "qux",
-			Section: "blah",
-		}
-		b := &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name: "qux",
-			Uid:  ulid.Make().String(),
-		}
-		require.True(t, resource.ReferenceOrIDMatch(a, b))
-	})
-
-	t.Run("nil", func(t *testing.T) {
-		a := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name:    "qux",
-			Section: "blah",
-		}
-		b := &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name: "qux",
-			Uid:  ulid.Make().String(),
-		}
-		require.False(t, resource.ReferenceOrIDMatch(a, nil))
-		require.False(t, resource.ReferenceOrIDMatch(nil, b))
-	})
-
-	t.Run("different type", func(t *testing.T) {
-		a := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name:    "qux",
-			Section: "blah",
-		}
-		b := &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name: "qux",
-			Uid:  ulid.Make().String(),
-		}
-		b.Type.Kind = "album"
-		require.False(t, resource.ReferenceOrIDMatch(a, b))
-	})
-
-	t.Run("different tenancy", func(t *testing.T) {
-		a := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name:    "qux",
-			Section: "blah",
-		}
-		b := &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name: "qux",
-			Uid:  ulid.Make().String(),
-		}
-		b.Tenancy.Namespace = "qux"
-		require.False(t, resource.ReferenceOrIDMatch(a, b))
-	})
-
-	t.Run("different name", func(t *testing.T) {
-		a := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name:    "qux",
-			Section: "blah",
-		}
-		b := &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "demo",
-				GroupVersion: "v2",
-				Kind:         "artist",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "foo",
-				PeerName:  "bar",
-				Namespace: "baz",
-			},
-			Name: "qux",
-			Uid:  ulid.Make().String(),
-		}
-		b.Name = "boom"
-		require.False(t, resource.ReferenceOrIDMatch(a, b))
-	})
-}
-
-func TestEqualStatus(t *testing.T) {
-	orig := &pbresource.Status{
-		ObservedGeneration: ulid.Make().String(),
-		Conditions: []*pbresource.Condition{
-			{
-				Type:    "FooType",
-				State:   pbresource.Condition_STATE_TRUE,
-				Reason:  "FooReason",
-				Message: "Foo is true",
-				Resource: &pbresource.Reference{
-					Type: &pbresource.Type{
-						Group:        "foo-group",
-						GroupVersion: "foo-group-version",
-						Kind:         "foo-kind",
-					},
-					Tenancy: &pbresource.Tenancy{
-						Partition: "foo-partition",
-						PeerName:  "foo-peer-name",
-						Namespace: "foo-namespace",
-					},
-					Name:    "foo-name",
-					Section: "foo-section",
-				},
-			},
-		},
-	}
-
-	// Equal cases.
-	t.Run("same pointer", func(t *testing.T) {
-		require.True(t, resource.EqualStatus(orig, orig, true))
-	})
-
-	t.Run("equal", func(t *testing.T) {
-		require.True(t, resource.EqualStatus(orig, clone(orig), true))
-	})
-
-	// Not equal cases.
-	t.Run("nil", func(t *testing.T) {
-		require.False(t, resource.EqualStatus(orig, nil, true))
-		require.False(t, resource.EqualStatus(nil, orig, true))
-	})
-
-	testCases := map[string]func(*pbresource.Status){
-		"different ObservedGeneration": func(s *pbresource.Status) {
-			s.ObservedGeneration = ""
-		},
-		"different Conditions": func(s *pbresource.Status) {
-			s.Conditions = append(s.Conditions, s.Conditions...)
-		},
-		"nil Condition": func(s *pbresource.Status) {
-			s.Conditions[0] = nil
-		},
-		"different Condition.Type": func(s *pbresource.Status) {
-			s.Conditions[0].Type = "BarType"
-		},
-		"different Condition.State": func(s *pbresource.Status) {
-			s.Conditions[0].State = pbresource.Condition_STATE_FALSE
-		},
-		"different Condition.Reason": func(s *pbresource.Status) {
-			s.Conditions[0].Reason = "BarReason"
-		},
-		"different Condition.Message": func(s *pbresource.Status) {
-			s.Conditions[0].Reason = "Bar if false"
-		},
-		"different Condition.Resource": func(s *pbresource.Status) {
-			s.Conditions[0].Resource = nil
-		},
-		"different Condition.Resource.Type": func(s *pbresource.Status) {
-			s.Conditions[0].Resource.Type.Group = "bar-group"
-		},
-		"different Condition.Resource.Tenancy": func(s *pbresource.Status) {
-			s.Conditions[0].Resource.Tenancy.Partition = "bar-partition"
-		},
-		"different Condition.Resource.Name": func(s *pbresource.Status) {
-			s.Conditions[0].Resource.Name = "bar-name"
-		},
-		"different Condition.Resource.Section": func(s *pbresource.Status) {
-			s.Conditions[0].Resource.Section = "bar-section"
-		},
-	}
-	for desc, modFn := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			a, b := clone(orig), clone(orig)
-			modFn(b)
-
-			require.False(t, resource.EqualStatus(a, b, true))
-			require.False(t, resource.EqualStatus(b, a, true))
-		})
-	}
-
-	t.Run("compareUpdatedAt = true", func(t *testing.T) {
-		a, b := clone(orig), clone(orig)
-		b.UpdatedAt = timestamppb.New(b.UpdatedAt.AsTime().Add(1 * time.Minute))
-		require.False(t, resource.EqualStatus(a, b, true))
-		require.False(t, resource.EqualStatus(b, a, true))
-	})
-
-	t.Run("compareUpdatedAt = false", func(t *testing.T) {
-		a, b := clone(orig), clone(orig)
-		b.UpdatedAt = timestamppb.New(b.UpdatedAt.AsTime().Add(1 * time.Minute))
-		require.True(t, resource.EqualStatus(a, b, false))
-		require.True(t, resource.EqualStatus(b, a, false))
-	})
-}
-
-func TestEqualStatusMap(t *testing.T) {
-	generation := ulid.Make().String()
-
-	for idx, tc := range []struct {
-		a, b  map[string]*pbresource.Status
-		equal bool
-	}{
-		{nil, nil, true},
-		{nil, map[string]*pbresource.Status{}, true},
-		{
-			map[string]*pbresource.Status{
-				"consul.io/some-controller": {
-					ObservedGeneration: generation,
-					Conditions: []*pbresource.Condition{
-						{
-							Type:    "Foo",
-							State:   pbresource.Condition_STATE_TRUE,
-							Reason:  "Bar",
-							Message: "Foo is true because of Bar",
-						},
-					},
-				},
-			},
-			map[string]*pbresource.Status{
-				"consul.io/some-controller": {
-					ObservedGeneration: generation,
-					Conditions: []*pbresource.Condition{
-						{
-							Type:    "Foo",
-							State:   pbresource.Condition_STATE_TRUE,
-							Reason:  "Bar",
-							Message: "Foo is true because of Bar",
-						},
-					},
-				},
-			},
-			true,
-		},
-		{
-			map[string]*pbresource.Status{
-				"consul.io/some-controller": {
-					ObservedGeneration: generation,
-					Conditions: []*pbresource.Condition{
-						{
-							Type:    "Foo",
-							State:   pbresource.Condition_STATE_TRUE,
-							Reason:  "Bar",
-							Message: "Foo is true because of Bar",
-						},
-					},
-				},
-			},
-			map[string]*pbresource.Status{
-				"consul.io/some-controller": {
-					ObservedGeneration: generation,
-					Conditions: []*pbresource.Condition{
-						{
-							Type:    "Foo",
-							State:   pbresource.Condition_STATE_FALSE,
-							Reason:  "Bar",
-							Message: "Foo is false because of Bar",
-						},
-					},
-				},
-			},
-			false,
-		},
-		{
-			map[string]*pbresource.Status{
-				"consul.io/some-controller": {
-					ObservedGeneration: generation,
-					Conditions: []*pbresource.Condition{
-						{
-							Type:    "Foo",
-							State:   pbresource.Condition_STATE_TRUE,
-							Reason:  "Bar",
-							Message: "Foo is true because of Bar",
-						},
-					},
-				},
-			},
-			map[string]*pbresource.Status{
-				"consul.io/some-controller": {
-					ObservedGeneration: generation,
-					Conditions: []*pbresource.Condition{
-						{
-							Type:    "Foo",
-							State:   pbresource.Condition_STATE_TRUE,
-							Reason:  "Bar",
-							Message: "Foo is true because of Bar",
-						},
-					},
-				},
-				"consul.io/other-controller": {
-					ObservedGeneration: generation,
-					Conditions: []*pbresource.Condition{
-						{
-							Type:    "Foo",
-							State:   pbresource.Condition_STATE_TRUE,
-							Reason:  "Bar",
-							Message: "Foo is true because of Bar",
-						},
-					},
-				},
-			},
-			false,
-		},
-	} {
-		t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) {
-			require.Equal(t, tc.equal, resource.EqualStatusMap(tc.a, tc.b))
-			require.Equal(t, tc.equal, resource.EqualStatusMap(tc.b, tc.a))
-		})
-	}
-}
-
-func BenchmarkEqualType(b *testing.B) {
-	// cpu: Intel(R) Core(TM) i9-9980HK CPU @ 2.40GHz
-	// BenchmarkEqualType/ours-16      161532109                7.309 ns/op          0 B/op           0 allocs/op
-	// BenchmarkEqualType/reflection-16                 1584954               748.4 ns/op           160 B/op          9 allocs/op
-	typeA := &pbresource.Type{
-		Group:        "foo",
-		GroupVersion: "v1",
-		Kind:         "bar",
-	}
-	typeB := &pbresource.Type{
-		Group:        "foo",
-		GroupVersion: "v1",
-		Kind:         "baz",
-	}
-	b.ResetTimer()
-
-	b.Run("ours", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
-			_ = resource.EqualType(typeA, typeB)
-		}
-	})
-
-	b.Run("reflection", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
-			_ = proto.Equal(typeA, typeB)
-		}
-	})
-}
-
-func BenchmarkEqualTenancy(b *testing.B) {
-	// cpu: Intel(R) Core(TM) i9-9980HK CPU @ 2.40GHz
-	// BenchmarkEqualTenancy/ours-16                   159998534                7.426 ns/op           0 B/op          0 allocs/op
-	// BenchmarkEqualTenancy/reflection-16              2283500               550.3 ns/op           128 B/op          7 allocs/op
-	tenA := &pbresource.Tenancy{
-		Partition: "foo",
-		PeerName:  "bar",
-		Namespace: "baz",
-	}
-	tenB := &pbresource.Tenancy{
-		Partition: "foo",
-		PeerName:  "bar",
-		Namespace: "qux",
-	}
-	b.ResetTimer()
-
-	b.Run("ours", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
-			_ = resource.EqualTenancy(tenA, tenB)
-		}
-	})
-
-	b.Run("reflection", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
-			_ = proto.Equal(tenA, tenB)
-		}
-	})
-}
-
-func BenchmarkEqualID(b *testing.B) {
-	// cpu: Intel(R) Core(TM) i9-9980HK CPU @ 2.40GHz
-	// BenchmarkEqualID/ours-16                        57818125                21.40 ns/op            0 B/op          0 allocs/op
-	// BenchmarkEqualID/reflection-16                   3596365               330.1 ns/op            96 B/op          5 allocs/op
-	idA := &pbresource.ID{
-		Type: &pbresource.Type{
-			Group:        "demo",
-			GroupVersion: "v2",
-			Kind:         "artist",
-		},
-		Tenancy: &pbresource.Tenancy{
-			Partition: "foo",
-			PeerName:  "bar",
-			Namespace: "baz",
-		},
-		Name: "qux",
-		Uid:  ulid.Make().String(),
-	}
-	idB := clone(idA)
-	idB.Uid = ulid.Make().String()
-	b.ResetTimer()
-
-	b.Run("ours", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
-			_ = resource.EqualID(idA, idB)
-		}
-	})
-
-	b.Run("reflection", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
-			_ = proto.Equal(idA, idB)
-		}
-	})
-}
-
-func BenchmarkEqualStatus(b *testing.B) {
-	// 	cpu: Intel(R) Core(TM) i9-9980HK CPU @ 2.40GHz
-	// BenchmarkEqualStatus/ours-16                    38648232                30.75 ns/op            0 B/op          0 allocs/op
-	// BenchmarkEqualStatus/reflection-16                237694              5267 ns/op             944 B/op         51 allocs/op
-	statusA := &pbresource.Status{
-		ObservedGeneration: ulid.Make().String(),
-		Conditions: []*pbresource.Condition{
-			{
-				Type:    "FooType",
-				State:   pbresource.Condition_STATE_TRUE,
-				Reason:  "FooReason",
-				Message: "Foo is true",
-				Resource: &pbresource.Reference{
-					Type: &pbresource.Type{
-						Group:        "foo-group",
-						GroupVersion: "foo-group-version",
-						Kind:         "foo-kind",
-					},
-					Tenancy: &pbresource.Tenancy{
-						Partition: "foo-partition",
-						PeerName:  "foo-peer-name",
-						Namespace: "foo-namespace",
-					},
-					Name:    "foo-name",
-					Section: "foo-section",
-				},
-			},
-		},
-	}
-	statusB := clone(statusA)
-	statusB.Conditions[0].Resource.Section = "bar-section"
-	b.ResetTimer()
-
-	b.Run("ours", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
-			_ = resource.EqualStatus(statusA, statusB, true)
-		}
-	})
-
-	b.Run("reflection", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
-			_ = proto.Equal(statusA, statusB)
-		}
-	})
-}
-
-func clone[T proto.Message](v T) T { return proto.Clone(v).(T) }
diff --git a/internal/resource/errors.go b/internal/resource/errors.go
deleted file mode 100644
index dbb624c8d0045..0000000000000
--- a/internal/resource/errors.go
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"google.golang.org/protobuf/reflect/protoreflect"
-)
-
-var (
-	ErrMissing                  = NewConstError("missing required field")
-	ErrEmpty                    = NewConstError("cannot be empty")
-	ErrReferenceTenancyNotEqual = NewConstError("resource tenancy and reference tenancy differ")
-)
-
-// ConstError is more or less equivalent to the stdlib errors.errorstring. However, having
-// our own exported type allows us to more accurately compare error values in tests.
-//
-//   - go-cmp will not compared unexported fields by default.
-//   - cmp.AllowUnexported(<type>) requires a concrete struct type and due to the stdlib not
-//     exporting the errorstring type there doesn't seem to be a way to get at the type.
-//   - cmpopts.EquateErrors has issues with protobuf types within other error structs.
-//
-// Due to these factors the easiest thing to do is to create a custom comparer for
-// the ConstError type and use it where necessary.
-type ConstError struct {
-	message string
-}
-
-func NewConstError(msg string) ConstError {
-	return ConstError{message: msg}
-}
-
-func (e ConstError) Error() string {
-	return e.message
-}
-
-type ErrDataParse struct {
-	TypeName string
-	Wrapped  error
-}
-
-func NewErrDataParse(msg protoreflect.ProtoMessage, err error) ErrDataParse {
-	return ErrDataParse{
-		TypeName: string(msg.ProtoReflect().Descriptor().FullName()),
-		Wrapped:  err,
-	}
-}
-
-func (err ErrDataParse) Error() string {
-	return fmt.Sprintf("error parsing resource data as type %q: %s", err.TypeName, err.Wrapped.Error())
-}
-
-func (err ErrDataParse) Unwrap() error {
-	return err.Wrapped
-}
-
-type ErrInvalidField struct {
-	Name    string
-	Wrapped error
-}
-
-func (err ErrInvalidField) Error() string {
-	return fmt.Sprintf("invalid %q field: %v", err.Name, err.Wrapped)
-}
-
-func (err ErrInvalidField) Unwrap() error {
-	return err.Wrapped
-}
-
-type ErrInvalidListElement struct {
-	Name    string
-	Index   int
-	Wrapped error
-}
-
-func (err ErrInvalidListElement) Error() string {
-	return fmt.Sprintf("invalid element at index %d of list %q: %v", err.Index, err.Name, err.Wrapped)
-}
-
-func (err ErrInvalidListElement) Unwrap() error {
-	return err.Wrapped
-}
-
-type ErrInvalidMapValue struct {
-	Map     string
-	Key     string
-	Wrapped error
-}
-
-func (err ErrInvalidMapValue) Error() string {
-	return fmt.Sprintf("invalid value of key %q within %s: %v", err.Key, err.Map, err.Wrapped)
-}
-
-func (err ErrInvalidMapValue) Unwrap() error {
-	return err.Wrapped
-}
-
-type ErrInvalidMapKey struct {
-	Map     string
-	Key     string
-	Wrapped error
-}
-
-func (err ErrInvalidMapKey) Error() string {
-	return fmt.Sprintf("map %s contains an invalid key - %q: %v", err.Map, err.Key, err.Wrapped)
-}
-
-func (err ErrInvalidMapKey) Unwrap() error {
-	return err.Wrapped
-}
-
-type ErrOwnerTypeInvalid struct {
-	ResourceType *pbresource.Type
-	OwnerType    *pbresource.Type
-}
-
-func (err ErrOwnerTypeInvalid) Error() string {
-	return fmt.Sprintf(
-		"resources of type %s cannot be owned by resources with type %s",
-		ToGVK(err.ResourceType),
-		ToGVK(err.OwnerType),
-	)
-}
-
-type ErrOwnerTenantInvalid struct {
-	ResourceType    *pbresource.Type
-	ResourceTenancy *pbresource.Tenancy
-	OwnerTenancy    *pbresource.Tenancy
-}
-
-func (err ErrOwnerTenantInvalid) Error() string {
-	return fmt.Sprintf(
-		"resource in partition %s, namespace %s and peer %s cannot be owned by a resource in partition %s, namespace %s and peer %s",
-		err.ResourceTenancy.Partition, err.ResourceTenancy.Namespace, err.ResourceTenancy.PeerName,
-		err.OwnerTenancy.Partition, err.OwnerTenancy.Namespace, err.OwnerTenancy.PeerName,
-	)
-}
-
-type ErrInvalidReferenceType struct {
-	AllowedType *pbresource.Type
-}
-
-func (err ErrInvalidReferenceType) Error() string {
-	return fmt.Sprintf("reference must have type %s", ToGVK(err.AllowedType))
-}
diff --git a/internal/resource/errors_test.go b/internal/resource/errors_test.go
deleted file mode 100644
index 2c1ca911976fc..0000000000000
--- a/internal/resource/errors_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"errors"
-	"flag"
-	"fmt"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// update allows golden files to be updated based on the current output.
-var update = flag.Bool("update", false, "update golden files")
-
-func goldenError(t *testing.T, name string, actual string) {
-	t.Helper()
-
-	fpath := filepath.Join("testdata", name+".golden")
-
-	if *update {
-		require.NoError(t, os.WriteFile(fpath, []byte(actual), 0644))
-	} else {
-		expected, err := os.ReadFile(fpath)
-		require.NoError(t, err)
-		require.Equal(t, string(expected), actual)
-	}
-}
-
-func TestErrorStrings(t *testing.T) {
-	type testCase struct {
-		err      error
-		expected string
-	}
-
-	fakeWrappedErr := fmt.Errorf("fake test error")
-
-	cond := &pbresource.Condition{}
-
-	cases := map[string]error{
-		"ErrDataParse": NewErrDataParse(cond, fakeWrappedErr),
-		"ErrInvalidField": ErrInvalidField{
-			Name:    "host",
-			Wrapped: fakeWrappedErr,
-		},
-		"ErrInvalidListElement": ErrInvalidListElement{
-			Name:    "addresses",
-			Index:   42,
-			Wrapped: fakeWrappedErr,
-		},
-		"ErrInvalidMapKey": ErrInvalidMapKey{
-			Map:     "ports",
-			Key:     "http",
-			Wrapped: fakeWrappedErr,
-		},
-		"ErrInvalidMapValue": ErrInvalidMapValue{
-			Map:     "ports",
-			Key:     "http",
-			Wrapped: fakeWrappedErr,
-		},
-		"ErrOwnerInvalid": ErrOwnerTypeInvalid{
-			ResourceType: &pbresource.Type{Group: "foo", GroupVersion: "v1", Kind: "bar"},
-			OwnerType:    &pbresource.Type{Group: "other", GroupVersion: "v2", Kind: "something"},
-		},
-		"ErrInvalidReferenceType": ErrInvalidReferenceType{
-			AllowedType: &pbresource.Type{Group: "foo", GroupVersion: "v1", Kind: "bar"},
-		},
-		"ErrMissing":                  ErrMissing,
-		"ErrEmpty":                    ErrEmpty,
-		"ErrReferenceTenancyNotEqual": ErrReferenceTenancyNotEqual,
-	}
-
-	for name, err := range cases {
-		t.Run(name, func(t *testing.T) {
-			goldenError(t, name, err.Error())
-		})
-	}
-}
-
-func TestErrorUnwrap(t *testing.T) {
-	type testCase struct {
-		err      error
-		expected string
-	}
-
-	fakeWrappedErr := fmt.Errorf("fake test error")
-
-	cases := map[string]error{
-		"ErrDataParse": ErrDataParse{
-			TypeName: "hashicorp.consul.catalog.v2beta1.Service",
-			Wrapped:  fakeWrappedErr,
-		},
-		"ErrInvalidField": ErrInvalidField{
-			Name:    "host",
-			Wrapped: fakeWrappedErr,
-		},
-		"ErrInvalidListElement": ErrInvalidListElement{
-			Name:    "addresses",
-			Index:   42,
-			Wrapped: fakeWrappedErr,
-		},
-		"ErrInvalidMapKey": ErrInvalidMapKey{
-			Map:     "ports",
-			Key:     "http",
-			Wrapped: fakeWrappedErr,
-		},
-		"ErrInvalidMapValue": ErrInvalidMapValue{
-			Map:     "ports",
-			Key:     "http",
-			Wrapped: fakeWrappedErr,
-		},
-	}
-
-	for name, err := range cases {
-		t.Run(name, func(t *testing.T) {
-			require.Equal(t, fakeWrappedErr, errors.Unwrap(err))
-		})
-	}
-}
diff --git a/internal/resource/http/http.go b/internal/resource/http/http.go
deleted file mode 100644
index fd5d6adb7979c..0000000000000
--- a/internal/resource/http/http.go
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package http
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"path"
-	"strings"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/go-hclog"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	HeaderConsulToken     = "x-consul-token"
-	HeaderConsistencyMode = "x-consul-consistency-mode"
-)
-
-func NewHandler(
-	client pbresource.ResourceServiceClient,
-	registry resource.Registry,
-	parseToken func(req *http.Request, token *string),
-	logger hclog.Logger) http.Handler {
-	mux := http.NewServeMux()
-	for _, t := range registry.Types() {
-		// List Endpoint
-		base := strings.ToLower(fmt.Sprintf("/%s/%s/%s", t.Type.Group, t.Type.GroupVersion, t.Type.Kind))
-		mux.Handle(base, http.StripPrefix(base, &listHandler{t, client, parseToken, logger}))
-
-		// Individual Resource Endpoints
-		prefix := strings.ToLower(fmt.Sprintf("%s/", base))
-		logger.Info("Registered resource endpoint", "endpoint", prefix)
-		mux.Handle(prefix, http.StripPrefix(prefix, &resourceHandler{t, client, parseToken, logger}))
-	}
-
-	return mux
-}
-
-type writeRequest struct {
-	Metadata map[string]string `json:"metadata"`
-	Data     json.RawMessage   `json:"data"`
-	Owner    *pbresource.ID    `json:"owner"`
-}
-
-type resourceHandler struct {
-	reg        resource.Registration
-	client     pbresource.ResourceServiceClient
-	parseToken func(req *http.Request, token *string)
-	logger     hclog.Logger
-}
-
-func (h *resourceHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	var token string
-	h.parseToken(r, &token)
-	ctx := metadata.AppendToOutgoingContext(r.Context(), HeaderConsulToken, token)
-	switch r.Method {
-	case http.MethodPut:
-		h.handleWrite(w, r, ctx)
-	case http.MethodGet:
-		h.handleRead(w, r, ctx)
-	case http.MethodDelete:
-		h.handleDelete(w, r, ctx)
-	default:
-		w.WriteHeader(http.StatusMethodNotAllowed)
-		return
-	}
-}
-
-func (h *resourceHandler) handleWrite(w http.ResponseWriter, r *http.Request, ctx context.Context) {
-	var req writeRequest
-	// convert req body to writeRequest
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		h.logger.Error("Failed to decode request body", "error", err)
-		w.WriteHeader(http.StatusBadRequest)
-		w.Write([]byte("Request body format is invalid"))
-		return
-	}
-	// convert data struct to proto message
-	data := h.reg.Proto.ProtoReflect().New().Interface()
-	if err := protojson.Unmarshal(req.Data, data); err != nil {
-		h.logger.Error("Failed to unmarshal to proto message", "error", err)
-		w.WriteHeader(http.StatusBadRequest)
-		w.Write([]byte("Request body didn't follow the resource schema"))
-		return
-	}
-	// proto message to any
-	anyProtoMsg, err := anypb.New(data)
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		h.logger.Error("Failed to convert proto message to any type", "error", err)
-		return
-	}
-
-	tenancyInfo, params := parseParams(r)
-
-	rsp, err := h.client.Write(ctx, &pbresource.WriteRequest{
-		Resource: &pbresource.Resource{
-			Id: &pbresource.ID{
-				Type:    h.reg.Type,
-				Tenancy: tenancyInfo,
-				Name:    params["resourceName"],
-			},
-			Owner:    req.Owner,
-			Version:  params["version"],
-			Metadata: req.Metadata,
-			Data:     anyProtoMsg,
-		},
-	})
-	if err != nil {
-		handleResponseError(err, w, h.logger)
-		return
-	}
-
-	output, err := jsonMarshal(rsp.Resource)
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		h.logger.Error("Failed to unmarshal GRPC resource response", "error", err)
-		return
-	}
-	w.Write(output)
-}
-
-func (h *resourceHandler) handleRead(w http.ResponseWriter, r *http.Request, ctx context.Context) {
-	tenancyInfo, params := parseParams(r)
-	if params["consistent"] != "" {
-		ctx = metadata.AppendToOutgoingContext(ctx, "x-consul-consistency-mode", "consistent")
-	}
-
-	rsp, err := h.client.Read(ctx, &pbresource.ReadRequest{
-		Id: &pbresource.ID{
-			Type:    h.reg.Type,
-			Tenancy: tenancyInfo,
-			Name:    params["resourceName"],
-		},
-	})
-	if err != nil {
-		handleResponseError(err, w, h.logger)
-		return
-	}
-
-	output, err := jsonMarshal(rsp.Resource)
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		h.logger.Error("Failed to unmarshal GRPC resource response", "error", err)
-		return
-	}
-	w.Write(output)
-}
-
-// Note: The HTTP endpoints do not accept UID since it is quite unlikely that the user will have access to it
-func (h *resourceHandler) handleDelete(w http.ResponseWriter, r *http.Request, ctx context.Context) {
-	tenancyInfo, params := parseParams(r)
-	_, err := h.client.Delete(ctx, &pbresource.DeleteRequest{
-		Id: &pbresource.ID{
-			Type:    h.reg.Type,
-			Tenancy: tenancyInfo,
-			Name:    params["resourceName"],
-		},
-		Version: params["version"],
-	})
-	if err != nil {
-		handleResponseError(err, w, h.logger)
-		return
-	}
-	w.WriteHeader(http.StatusNoContent)
-	w.Write([]byte("{}"))
-}
-
-func parseParams(r *http.Request) (tenancy *pbresource.Tenancy, params map[string]string) {
-	query := r.URL.Query()
-	namespace := query.Get("namespace")
-	if namespace == "" {
-		namespace = query.Get("ns")
-	}
-	peer := query.Get("peer")
-	if peer == "" {
-		peer = query.Get("peer_name")
-	}
-	tenancy = &pbresource.Tenancy{
-		Partition: query.Get("partition"),
-		PeerName:  peer,
-		Namespace: namespace,
-	}
-
-	resourceName := path.Base(r.URL.Path)
-	if resourceName == "." || resourceName == "/" {
-		resourceName = ""
-	}
-
-	params = make(map[string]string)
-	params["resourceName"] = resourceName
-	params["version"] = query.Get("version")
-	params["namePrefix"] = query.Get("name_prefix")
-	// coming from command line
-	params["consistent"] = query.Get("RequireConsistent")
-	// coming from http client
-	if _, ok := query["consistent"]; ok {
-		params["consistent"] = "true"
-	}
-
-	return tenancy, params
-}
-
-func jsonMarshal(res *pbresource.Resource) ([]byte, error) {
-	output, err := protojson.Marshal(res)
-	if err != nil {
-		return nil, err
-	}
-
-	var stuff map[string]any
-	if err := json.Unmarshal(output, &stuff); err != nil {
-		return nil, err
-	}
-
-	delete(stuff["data"].(map[string]any), "@type")
-	return json.MarshalIndent(stuff, "", "  ")
-}
-
-func handleResponseError(err error, w http.ResponseWriter, logger hclog.Logger) {
-	if e, ok := status.FromError(err); ok {
-		switch e.Code() {
-		case codes.InvalidArgument:
-			w.WriteHeader(http.StatusBadRequest)
-			logger.Info("User has mal-formed request", "error", err)
-		case codes.NotFound:
-			w.WriteHeader(http.StatusNotFound)
-			logger.Info("Received error from resource service: Not found", "error", err)
-		case codes.PermissionDenied:
-			w.WriteHeader(http.StatusForbidden)
-			logger.Info("Received error from resource service: User not authenticated", "error", err)
-		case codes.Aborted:
-			w.WriteHeader(http.StatusConflict)
-			logger.Info("Received error from resource service: the request conflict with the current state of the target resource", "error", err)
-		default:
-			w.WriteHeader(http.StatusInternalServerError)
-			logger.Error("Received error from resource service", "error", err)
-		}
-	} else {
-		w.WriteHeader(http.StatusInternalServerError)
-		logger.Error("Received error from resource service: not able to parse error returned", "error", err)
-	}
-	w.Write([]byte(err.Error()))
-}
-
-type listHandler struct {
-	reg        resource.Registration
-	client     pbresource.ResourceServiceClient
-	parseToken func(req *http.Request, token *string)
-	logger     hclog.Logger
-}
-
-func (h *listHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodGet {
-		w.WriteHeader(http.StatusMethodNotAllowed)
-		return
-	}
-
-	var token string
-	h.parseToken(r, &token)
-	ctx := metadata.AppendToOutgoingContext(r.Context(), HeaderConsulToken, token)
-
-	tenancyInfo, params := parseParams(r)
-	if params["consistent"] == "true" {
-		ctx = metadata.AppendToOutgoingContext(ctx, HeaderConsistencyMode, "consistent")
-	}
-
-	rsp, err := h.client.List(ctx, &pbresource.ListRequest{
-		Type:       h.reg.Type,
-		Tenancy:    tenancyInfo,
-		NamePrefix: params["namePrefix"],
-	})
-	if err != nil {
-		handleResponseError(err, w, h.logger)
-		return
-	}
-
-	output := make([]json.RawMessage, len(rsp.Resources))
-	for idx, res := range rsp.Resources {
-		b, err := jsonMarshal(res)
-		if err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-			h.logger.Error("Failed to unmarshal GRPC resource response", "error", err)
-			return
-		}
-		output[idx] = b
-	}
-
-	b, err := json.MarshalIndent(struct {
-		Resources []json.RawMessage `json:"resources"`
-	}{output}, "", "  ")
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		h.logger.Error("Failed to correctly format the list response", "error", err)
-		return
-	}
-	w.Write(b)
-}
diff --git a/internal/resource/http/http_test.go b/internal/resource/http/http_test.go
deleted file mode 100644
index 50f50fbe39488..0000000000000
--- a/internal/resource/http/http_test.go
+++ /dev/null
@@ -1,617 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package http
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-
-	resourceSvc "github.com/hashicorp/consul/agent/grpc-external/services/resource"
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	pbdemov1 "github.com/hashicorp/consul/proto/private/pbdemo/v1"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbdemov2 "github.com/hashicorp/consul/proto/private/pbdemo/v2"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-const testACLTokenArtistReadPolicy = "00000000-0000-0000-0000-000000000001"
-const testACLTokenArtistWritePolicy = "00000000-0000-0000-0000-000000000002"
-const testACLTokenArtistListPolicy = "00000000-0000-0000-0000-000000000003"
-const fakeToken = "fake-token"
-
-func parseToken(req *http.Request, token *string) {
-	*token = req.Header.Get("x-consul-token")
-}
-
-func TestResourceHandler_InputValidation(t *testing.T) {
-	type testCase struct {
-		description          string
-		request              *http.Request
-		response             *httptest.ResponseRecorder
-		expectedResponseCode int
-		expectedErrorMessage string
-	}
-	client := svctest.RunResourceService(t, demo.RegisterTypes)
-	resourceHandler := resourceHandler{
-		resource.Registration{
-			Type:  demo.TypeV2Artist,
-			Proto: &pbdemov2.Artist{},
-			Scope: resource.ScopeNamespace,
-		},
-		client,
-		func(req *http.Request, token *string) { return },
-		hclog.NewNullLogger(),
-	}
-
-	testCases := []testCase{
-		{
-			description: "missing resource name",
-			request: httptest.NewRequest("PUT", "/?partition=default&peer_name=local&namespace=default", strings.NewReader(`
-				{
-					"metadata": {
-						"foo": "bar"
-					},
-					"data": {
-						"name": "Keith Urban",
-						"genre": "GENRE_COUNTRY"
-					}
-				}
-			`)),
-			response:             httptest.NewRecorder(),
-			expectedResponseCode: http.StatusBadRequest,
-			expectedErrorMessage: "rpc error: code = InvalidArgument desc = resource.id.name is required",
-		},
-		{
-			description: "wrong schema",
-			request: httptest.NewRequest("PUT", "/keith-urban?partition=default&peer_name=local&namespace=default", strings.NewReader(`
-				{
-					"metadata": {
-						"foo": "bar"
-					},
-					"dada": {
-						"name": "Keith Urban",
-						"genre": "GENRE_COUNTRY"
-					}
-				}
-			`)),
-			response:             httptest.NewRecorder(),
-			expectedResponseCode: http.StatusBadRequest,
-			expectedErrorMessage: "Request body didn't follow the resource schema",
-		},
-		{
-			description:          "invalid request body",
-			request:              httptest.NewRequest("PUT", "/keith-urban?partition=default&peer_name=local&namespace=default", strings.NewReader("bad-input")),
-			response:             httptest.NewRecorder(),
-			expectedResponseCode: http.StatusBadRequest,
-			expectedErrorMessage: "Request body format is invalid",
-		},
-		{
-			description:          "no id",
-			request:              httptest.NewRequest("DELETE", "/?partition=default&peer_name=local&namespace=default", strings.NewReader("")),
-			response:             httptest.NewRecorder(),
-			expectedResponseCode: http.StatusBadRequest,
-			expectedErrorMessage: "rpc error: code = InvalidArgument desc = id.name is required",
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			resourceHandler.ServeHTTP(tc.response, tc.request)
-
-			response := tc.response.Result()
-
-			defer response.Body.Close()
-
-			b, err := io.ReadAll(tc.response.Body)
-			require.NoError(t, err)
-
-			require.Equal(t, tc.expectedResponseCode, tc.response.Result().StatusCode)
-			require.Equal(t, tc.expectedErrorMessage, string(b))
-		})
-	}
-}
-
-func TestResourceWriteHandler(t *testing.T) {
-	aclResolver := &resourceSvc.MockACLResolver{}
-	aclResolver.On("ResolveTokenAndDefaultMeta", testACLTokenArtistReadPolicy, mock.Anything, mock.Anything).
-		Return(svctest.AuthorizerFrom(t, demo.ArtistV1ReadPolicy, demo.ArtistV2ReadPolicy), nil)
-	aclResolver.On("ResolveTokenAndDefaultMeta", testACLTokenArtistWritePolicy, mock.Anything, mock.Anything).
-		Return(svctest.AuthorizerFrom(t, demo.ArtistV1WritePolicy, demo.ArtistV2WritePolicy), nil)
-
-	client := svctest.RunResourceServiceWithConfig(t, resourceSvc.Config{ACLResolver: aclResolver}, demo.RegisterTypes)
-
-	r := resource.NewRegistry()
-	demo.RegisterTypes(r)
-	handler := NewHandler(client, r, parseToken, hclog.NewNullLogger())
-
-	t.Run("should be blocked if the token is not authorized", func(t *testing.T) {
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("PUT", "/demo/v2/artist/keith-urban?partition=default&peer_name=local&namespace=default", strings.NewReader(`
-			{
-				"metadata": {
-					"foo": "bar"
-				},
-				"data": {
-					"name": "Keith Urban",
-					"genre": "GENRE_COUNTRY"
-				}
-			}
-		`))
-
-		req.Header.Add("x-consul-token", testACLTokenArtistReadPolicy)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusForbidden, rsp.Result().StatusCode)
-	})
-
-	t.Run("should write to the resource backend", func(t *testing.T) {
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("PUT", "/demo/v2/artist/keith-urban?partition=default&peer_name=local&namespace=default", strings.NewReader(`
-			{
-				"metadata": {
-					"foo": "bar"
-				},
-				"data": {
-					"name": "Keith Urban",
-					"genre": "GENRE_COUNTRY"
-				}
-			}
-		`))
-
-		req.Header.Add("x-consul-token", testACLTokenArtistWritePolicy)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusOK, rsp.Result().StatusCode)
-
-		var result map[string]any
-		require.NoError(t, json.NewDecoder(rsp.Body).Decode(&result))
-		require.Equal(t, "Keith Urban", result["data"].(map[string]any)["name"])
-		require.Equal(t, "keith-urban", result["id"].(map[string]any)["name"])
-
-		readRsp, err := client.Read(testutil.TestContext(t), &pbresource.ReadRequest{
-			Id: &pbresource.ID{
-				Type:    demo.TypeV2Artist,
-				Tenancy: resource.DefaultNamespacedTenancy(),
-				Name:    "keith-urban",
-			},
-		})
-		require.NoError(t, err)
-		require.NotNil(t, readRsp.Resource)
-
-		var artist pbdemov2.Artist
-		require.NoError(t, readRsp.Resource.Data.UnmarshalTo(&artist))
-		require.Equal(t, "Keith Urban", artist.Name)
-	})
-
-	t.Run("should update the record with version parameter", func(t *testing.T) {
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("PUT", "/demo/v2/artist/keith-urban?partition=default&peer_name=local&namespace=default&version=1", strings.NewReader(`
-			{
-				"metadata": {
-					"foo": "bar"
-				},
-				"data": {
-					"name": "Keith Urban Two",
-					"genre": "GENRE_COUNTRY"
-				}
-			}
-		`))
-
-		req.Header.Add("x-consul-token", testACLTokenArtistWritePolicy)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusOK, rsp.Result().StatusCode)
-		var result map[string]any
-		require.NoError(t, json.NewDecoder(rsp.Body).Decode(&result))
-		require.Equal(t, "Keith Urban Two", result["data"].(map[string]any)["name"])
-		require.Equal(t, "keith-urban", result["id"].(map[string]any)["name"])
-	})
-
-	t.Run("should fail the update if the resource's version doesn't match the version of the existing resource", func(t *testing.T) {
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("PUT", "/demo/v2/artist/keith-urban?partition=default&peer_name=local&namespace=default&version=1", strings.NewReader(`
-			{
-				"metadata": {
-					"foo": "bar"
-				},
-				"data": {
-					"name": "Keith Urban",
-					"genre": "GENRE_COUNTRY"
-				}
-			}
-		`))
-
-		req.Header.Add("x-consul-token", testACLTokenArtistWritePolicy)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusConflict, rsp.Result().StatusCode)
-	})
-
-	t.Run("should write to the resource backend with owner", func(t *testing.T) {
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("PUT", "/demo/v1/artist/keith-urban-v1?partition=default&peer_name=local&namespace=default", strings.NewReader(`
-			{
-				"metadata": {
-					"foo": "bar"
-				},
-				"data": {
-					"name": "Keith Urban V1",
-					"genre": "GENRE_COUNTRY"
-				},
-				"owner": {
-					"name": "keith-urban",
-					"type": {
-						"group": "demo",
-						"group_version": "v2",
-						"kind": "Artist"
-					},
-					"tenancy": {
-						"partition": "default",
-						"peer_name": "local",
-						"namespace": "default"
-					}
-				}
-			}
-		`))
-
-		req.Header.Add("x-consul-token", testACLTokenArtistWritePolicy)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusOK, rsp.Result().StatusCode)
-
-		var result map[string]any
-		require.NoError(t, json.NewDecoder(rsp.Body).Decode(&result))
-		require.Equal(t, "Keith Urban V1", result["data"].(map[string]any)["name"])
-		require.Equal(t, "keith-urban-v1", result["id"].(map[string]any)["name"])
-
-		readRsp, err := client.Read(testutil.TestContext(t), &pbresource.ReadRequest{
-			Id: &pbresource.ID{
-				Type:    demo.TypeV1Artist,
-				Tenancy: resource.DefaultNamespacedTenancy(),
-				Name:    "keith-urban-v1",
-			},
-		})
-		require.NoError(t, err)
-		require.NotNil(t, readRsp.Resource)
-		require.Equal(t, "keith-urban", readRsp.Resource.Owner.Name)
-
-		var artist pbdemov1.Artist
-		require.NoError(t, readRsp.Resource.Data.UnmarshalTo(&artist))
-		require.Equal(t, "Keith Urban V1", artist.Name)
-	})
-}
-
-type ResourceUri struct {
-	group        string
-	version      string
-	kind         string
-	resourceName string
-}
-
-func createResource(t *testing.T, artistHandler http.Handler, resourceUri *ResourceUri) map[string]any {
-	rsp := httptest.NewRecorder()
-
-	if resourceUri == nil {
-		resourceUri = &ResourceUri{group: "demo", version: "v2", kind: "artist", resourceName: "keith-urban"}
-	}
-
-	req := httptest.NewRequest("PUT", fmt.Sprintf("/%s/%s/%s/%s?partition=default&peer_name=local&namespace=default", resourceUri.group, resourceUri.version, resourceUri.kind, resourceUri.resourceName), strings.NewReader(`
-		{
-			"metadata": {
-				"foo": "bar"
-			},
-			"data": {
-				"name": "test",
-				"genre": "GENRE_COUNTRY"
-			}
-		}
-	`))
-
-	req.Header.Add("x-consul-token", testACLTokenArtistWritePolicy)
-
-	artistHandler.ServeHTTP(rsp, req)
-	require.Equal(t, http.StatusOK, rsp.Result().StatusCode)
-
-	var result map[string]any
-	require.NoError(t, json.NewDecoder(rsp.Body).Decode(&result))
-	return result
-}
-
-func deleteResource(t *testing.T, artistHandler http.Handler, resourceUri *ResourceUri) {
-	rsp := httptest.NewRecorder()
-
-	if resourceUri == nil {
-		resourceUri = &ResourceUri{group: "demo", version: "v2", kind: "artist", resourceName: "keith-urban"}
-	}
-
-	req := httptest.NewRequest("DELETE", fmt.Sprintf("/%s/%s/%s/%s?partition=default&peer_name=local&namespace=default", resourceUri.group, resourceUri.version, resourceUri.kind, resourceUri.resourceName), strings.NewReader(""))
-
-	req.Header.Add("x-consul-token", testACLTokenArtistWritePolicy)
-
-	artistHandler.ServeHTTP(rsp, req)
-	require.Equal(t, http.StatusNoContent, rsp.Result().StatusCode)
-}
-
-func TestResourceReadHandler(t *testing.T) {
-	aclResolver := &resourceSvc.MockACLResolver{}
-	aclResolver.On("ResolveTokenAndDefaultMeta", testACLTokenArtistReadPolicy, mock.Anything, mock.Anything).
-		Return(svctest.AuthorizerFrom(t, demo.ArtistV1ReadPolicy, demo.ArtistV2ReadPolicy), nil)
-	aclResolver.On("ResolveTokenAndDefaultMeta", testACLTokenArtistWritePolicy, mock.Anything, mock.Anything).
-		Return(svctest.AuthorizerFrom(t, demo.ArtistV1WritePolicy, demo.ArtistV2WritePolicy), nil)
-	aclResolver.On("ResolveTokenAndDefaultMeta", fakeToken, mock.Anything, mock.Anything).
-		Return(svctest.AuthorizerFrom(t, ""), nil)
-
-	client := svctest.RunResourceServiceWithConfig(t, resourceSvc.Config{ACLResolver: aclResolver}, demo.RegisterTypes)
-
-	r := resource.NewRegistry()
-	demo.RegisterTypes(r)
-	handler := NewHandler(client, r, parseToken, hclog.NewNullLogger())
-
-	createdResource := createResource(t, handler, nil)
-
-	t.Run("Read resource", func(t *testing.T) {
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("GET", "/demo/v2/artist/keith-urban?partition=default&peer_name=local&namespace=default&consistent", nil)
-
-		req.Header.Add("x-consul-token", testACLTokenArtistReadPolicy)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusOK, rsp.Result().StatusCode)
-
-		var result map[string]any
-		require.NoError(t, json.NewDecoder(rsp.Body).Decode(&result))
-		require.Equal(t, result, createdResource)
-	})
-
-	t.Run("should not be found if resource not exist", func(t *testing.T) {
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("GET", "/demo/v2/artist/keith-not-exist?partition=default&peer_name=local&namespace=default&consistent", nil)
-
-		req.Header.Add("x-consul-token", testACLTokenArtistReadPolicy)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusNotFound, rsp.Result().StatusCode)
-	})
-
-	t.Run("should be blocked if the token is not authorized", func(t *testing.T) {
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("GET", "/demo/v2/artist/keith-urban?partition=default&peer_name=local&namespace=default&consistent", nil)
-
-		req.Header.Add("x-consul-token", fakeToken)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusForbidden, rsp.Result().StatusCode)
-	})
-}
-
-func TestResourceDeleteHandler(t *testing.T) {
-	aclResolver := &resourceSvc.MockACLResolver{}
-	aclResolver.On("ResolveTokenAndDefaultMeta", testACLTokenArtistReadPolicy, mock.Anything, mock.Anything).
-		Return(svctest.AuthorizerFrom(t, demo.ArtistV2ReadPolicy), nil)
-	aclResolver.On("ResolveTokenAndDefaultMeta", testACLTokenArtistWritePolicy, mock.Anything, mock.Anything).
-		Return(svctest.AuthorizerFrom(t, demo.ArtistV2WritePolicy), nil)
-
-	client := svctest.RunResourceServiceWithConfig(t, resourceSvc.Config{ACLResolver: aclResolver}, demo.RegisterTypes)
-
-	r := resource.NewRegistry()
-	demo.RegisterTypes(r)
-
-	handler := NewHandler(client, r, parseToken, hclog.NewNullLogger())
-
-	t.Run("should surface PermissionDenied error from resource service", func(t *testing.T) {
-		createResource(t, handler, nil)
-
-		deleteRsp := httptest.NewRecorder()
-		deletReq := httptest.NewRequest("DELETE", "/demo/v2/artist/keith-urban?partition=default&peer_name=local&namespace=default", strings.NewReader(""))
-
-		deletReq.Header.Add("x-consul-token", testACLTokenArtistReadPolicy)
-
-		handler.ServeHTTP(deleteRsp, deletReq)
-
-		require.Equal(t, http.StatusForbidden, deleteRsp.Result().StatusCode)
-	})
-
-	t.Run("should delete a resource without version", func(t *testing.T) {
-		createResource(t, handler, nil)
-
-		deleteRsp := httptest.NewRecorder()
-		deletReq := httptest.NewRequest("DELETE", "/demo/v2/artist/keith-urban?partition=default&peer_name=local&namespace=default", strings.NewReader(""))
-
-		deletReq.Header.Add("x-consul-token", testACLTokenArtistWritePolicy)
-
-		handler.ServeHTTP(deleteRsp, deletReq)
-
-		require.Equal(t, http.StatusNoContent, deleteRsp.Result().StatusCode)
-
-		var result map[string]any
-		require.NoError(t, json.NewDecoder(deleteRsp.Body).Decode(&result))
-		require.Empty(t, result)
-
-		_, err := client.Read(testutil.TestContext(t), &pbresource.ReadRequest{
-			Id: &pbresource.ID{
-				Type:    demo.TypeV2Artist,
-				Tenancy: resource.DefaultNamespacedTenancy(),
-				Name:    "keith-urban",
-			},
-		})
-		require.ErrorContains(t, err, "resource not found")
-	})
-
-	t.Run("should delete a resource with version", func(t *testing.T) {
-		createResource(t, handler, nil)
-
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("DELETE", "/demo/v2/artist/keith-urban?partition=default&peer_name=local&namespace=default&version=1", strings.NewReader(""))
-
-		req.Header.Add("x-consul-token", testACLTokenArtistWritePolicy)
-		req.Header.Add("x-consul-token", testACLTokenArtistListPolicy)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusNoContent, rsp.Result().StatusCode)
-
-		_, err := client.Read(testutil.TestContext(t), &pbresource.ReadRequest{
-			Id: &pbresource.ID{
-				Type:    demo.TypeV2Artist,
-				Tenancy: resource.DefaultNamespacedTenancy(),
-				Name:    "keith-urban",
-			},
-		})
-		require.ErrorContains(t, err, "resource not found")
-	})
-}
-
-func TestResourceListHandler(t *testing.T) {
-	aclResolver := &resourceSvc.MockACLResolver{}
-	aclResolver.On("ResolveTokenAndDefaultMeta", testACLTokenArtistListPolicy, mock.Anything, mock.Anything).
-		Return(svctest.AuthorizerFrom(t, demo.ArtistV2ListPolicy), nil)
-	aclResolver.On("ResolveTokenAndDefaultMeta", testACLTokenArtistWritePolicy, mock.Anything, mock.Anything).
-		Return(svctest.AuthorizerFrom(t, demo.ArtistV2WritePolicy), nil)
-
-	client := svctest.RunResourceServiceWithConfig(t, resourceSvc.Config{ACLResolver: aclResolver}, demo.RegisterTypes)
-
-	r := resource.NewRegistry()
-	demo.RegisterTypes(r)
-
-	handler := NewHandler(client, r, parseToken, hclog.NewNullLogger())
-
-	t.Run("should return MethodNotAllowed", func(t *testing.T) {
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("PUT", "/demo/v2/artist?partition=default&peer_name=local&namespace=default", strings.NewReader(""))
-
-		req.Header.Add("x-consul-token", testACLTokenArtistListPolicy)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusMethodNotAllowed, rsp.Result().StatusCode)
-	})
-
-	t.Run("should be blocked if the token is not authorized", func(t *testing.T) {
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("GET", "/demo/v2/artist?partition=default&peer_name=local&namespace=default", strings.NewReader(""))
-
-		req.Header.Add("x-consul-token", testACLTokenArtistWritePolicy)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusForbidden, rsp.Result().StatusCode)
-	})
-
-	t.Run("should return list of resources", func(t *testing.T) {
-		resourceUri1 := &ResourceUri{group: "demo", version: "v2", kind: "artist", resourceName: "steve"}
-		resource1 := createResource(t, handler, resourceUri1)
-		resourceUri2 := &ResourceUri{group: "demo", version: "v2", kind: "artist", resourceName: "elvis"}
-		resource2 := createResource(t, handler, resourceUri2)
-
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("GET", "/demo/v2/artist?partition=default&peer_name=local&namespace=default", strings.NewReader(""))
-
-		req.Header.Add("x-consul-token", testACLTokenArtistListPolicy)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusOK, rsp.Result().StatusCode)
-
-		var result map[string]any
-		require.NoError(t, json.NewDecoder(rsp.Body).Decode(&result))
-
-		resources, _ := result["resources"].([]any)
-		require.Len(t, resources, 2)
-
-		expected := []map[string]any{resource1, resource2}
-		require.Contains(t, expected, resources[0])
-		require.Contains(t, expected, resources[1])
-
-		// clean up
-		deleteResource(t, handler, resourceUri1)
-		deleteResource(t, handler, resourceUri2)
-	})
-
-	t.Run("should return empty list when no resources are found", func(t *testing.T) {
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("GET", "/demo/v2/artist?partition=default&peer_name=local&namespace=default", strings.NewReader(""))
-
-		req.Header.Add("x-consul-token", testACLTokenArtistListPolicy)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusOK, rsp.Result().StatusCode)
-
-		var result map[string]any
-		require.NoError(t, json.NewDecoder(rsp.Body).Decode(&result))
-
-		resources, _ := result["resources"].([]any)
-		require.Len(t, resources, 0)
-	})
-
-	t.Run("should return empty list when name prefix matches don't match", func(t *testing.T) {
-		createResource(t, handler, nil)
-
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("GET", "/demo/v2/artist?partition=default&peer_name=local&namespace=default&name_prefix=noname", strings.NewReader(""))
-
-		req.Header.Add("x-consul-token", testACLTokenArtistListPolicy)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusOK, rsp.Result().StatusCode)
-
-		var result map[string]any
-		require.NoError(t, json.NewDecoder(rsp.Body).Decode(&result))
-
-		resources, _ := result["resources"].([]any)
-		require.Len(t, resources, 0)
-
-		// clean up
-		deleteResource(t, handler, nil)
-	})
-
-	t.Run("should return list of resources matching name prefix", func(t *testing.T) {
-		resourceUri1 := &ResourceUri{group: "demo", version: "v2", kind: "artist", resourceName: "steve"}
-		resource1 := createResource(t, handler, resourceUri1)
-		resourceUri2 := &ResourceUri{group: "demo", version: "v2", kind: "artist", resourceName: "elvis"}
-		createResource(t, handler, resourceUri2)
-
-		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("GET", "/demo/v2/artist?partition=default&peer_name=local&namespace=default&name_prefix=steve", strings.NewReader(""))
-
-		req.Header.Add("x-consul-token", testACLTokenArtistListPolicy)
-
-		handler.ServeHTTP(rsp, req)
-
-		require.Equal(t, http.StatusOK, rsp.Result().StatusCode)
-
-		var result map[string]any
-		require.NoError(t, json.NewDecoder(rsp.Body).Decode(&result))
-
-		resources, _ := result["resources"].([]any)
-		require.Len(t, resources, 1)
-
-		require.Equal(t, resource1, resources[0])
-
-		// clean up
-		deleteResource(t, handler, resourceUri1)
-		deleteResource(t, handler, resourceUri2)
-	})
-}
diff --git a/internal/resource/mappers/bimapper/bimapper.go b/internal/resource/mappers/bimapper/bimapper.go
deleted file mode 100644
index f1c2f5122676e..0000000000000
--- a/internal/resource/mappers/bimapper/bimapper.go
+++ /dev/null
@@ -1,323 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package bimapper
-
-import (
-	"context"
-	"fmt"
-	"sync"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-var wildcardType = &pbresource.Type{
-	Group:        "@@any@@",
-	GroupVersion: "@@any@@",
-	Kind:         "@@any@@",
-}
-
-// Mapper tracks bidirectional lookup for an item that contains references to
-// other items. For example: an HTTPRoute has many references to Services.
-//
-// The primary object is called the "item" and an item has many "links".
-// Tracking is done on items.
-type Mapper struct {
-	itemType, linkType *pbresource.Type
-	wildcardLink       bool
-
-	lock       sync.Mutex
-	itemToLink map[resource.ReferenceKey]map[resource.ReferenceKey]struct{}
-	linkToItem map[resource.ReferenceKey]map[resource.ReferenceKey]struct{}
-}
-
-// New creates a bimapper between the two required provided types.
-func New(itemType, linkType *pbresource.Type) *Mapper {
-	if itemType == nil {
-		panic("itemType is required")
-	}
-	if linkType == nil {
-		panic("linkType is required")
-	}
-	return &Mapper{
-		itemType:   itemType,
-		linkType:   linkType,
-		itemToLink: make(map[resource.ReferenceKey]map[resource.ReferenceKey]struct{}),
-		linkToItem: make(map[resource.ReferenceKey]map[resource.ReferenceKey]struct{}),
-	}
-}
-
-// NewWithWildcardLinkType creates a bimapper between the provided item type
-// and can have a mixed set of link types.
-func NewWithWildcardLinkType(itemType *pbresource.Type) *Mapper {
-	m := New(itemType, wildcardType)
-	m.wildcardLink = true
-	return m
-}
-
-// Reset clears the internal mappings.
-func (m *Mapper) Reset() {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	m.itemToLink = make(map[resource.ReferenceKey]map[resource.ReferenceKey]struct{})
-	m.linkToItem = make(map[resource.ReferenceKey]map[resource.ReferenceKey]struct{})
-}
-
-// IsEmpty returns true if the internal structures are empty.
-func (m *Mapper) IsEmpty() bool {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	return len(m.itemToLink) == 0 && len(m.linkToItem) == 0
-}
-
-// UntrackItem removes tracking for the provided item. The item type MUST match
-// the type configured for the item.
-func (m *Mapper) UntrackItem(item resource.ReferenceOrID) {
-	if !resource.EqualType(item.GetType(), m.itemType) {
-		panic(fmt.Sprintf("expected item type %q got %q",
-			resource.TypeToString(m.itemType),
-			resource.TypeToString(item.GetType()),
-		))
-	}
-	m.untrackItem(resource.NewReferenceKey(item))
-}
-
-// UntrackLink removes tracking for the provided link. The link type MUST match
-// the type configured for the link.
-func (m *Mapper) UntrackLink(link resource.ReferenceOrID) {
-	if !m.wildcardLink && !resource.EqualType(link.GetType(), m.linkType) {
-		panic(fmt.Sprintf("expected link type %q got %q",
-			resource.TypeToString(m.linkType),
-			resource.TypeToString(link.GetType()),
-		))
-	}
-	m.untrackLink(resource.NewReferenceKey(link))
-}
-
-func (m *Mapper) untrackLink(link resource.ReferenceKey) {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	m.removeLinkLocked(link)
-}
-
-func (m *Mapper) untrackItem(item resource.ReferenceKey) {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	m.removeItemLocked(item)
-}
-
-// TrackItem adds tracking for the provided item. The item and link types MUST
-// match the types configured for the items and links.
-func (m *Mapper) TrackItem(item resource.ReferenceOrID, links []resource.ReferenceOrID) {
-	if !resource.EqualType(item.GetType(), m.itemType) {
-		panic(fmt.Sprintf("expected item type %q got %q",
-			resource.TypeToString(m.itemType),
-			resource.TypeToString(item.GetType()),
-		))
-	}
-
-	linksAsKeys := make([]resource.ReferenceKey, 0, len(links))
-	for _, link := range links {
-		if !m.wildcardLink && !resource.EqualType(link.GetType(), m.linkType) {
-			panic(fmt.Sprintf("expected link type %q got %q",
-				resource.TypeToString(m.linkType),
-				resource.TypeToString(link.GetType()),
-			))
-		}
-		linksAsKeys = append(linksAsKeys, resource.NewReferenceKey(link))
-	}
-
-	m.trackItem(resource.NewReferenceKey(item), linksAsKeys)
-}
-
-func (m *Mapper) trackItem(item resource.ReferenceKey, links []resource.ReferenceKey) {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-
-	m.removeItemLocked(item)
-	m.addItemLocked(item, links)
-}
-
-// you must hold the lock before calling this function
-func (m *Mapper) removeItemLocked(item resource.ReferenceKey) {
-	for link := range m.itemToLink[item] {
-		delete(m.linkToItem[link], item)
-		if len(m.linkToItem[link]) == 0 {
-			delete(m.linkToItem, link)
-		}
-	}
-	delete(m.itemToLink, item)
-}
-
-func (m *Mapper) removeLinkLocked(link resource.ReferenceKey) {
-	for item := range m.linkToItem[link] {
-		delete(m.itemToLink[item], link)
-		if len(m.itemToLink[item]) == 0 {
-			delete(m.itemToLink, item)
-		}
-	}
-	delete(m.linkToItem, link)
-}
-
-// you must hold the lock before calling this function
-func (m *Mapper) addItemLocked(item resource.ReferenceKey, links []resource.ReferenceKey) {
-	if m.itemToLink[item] == nil {
-		m.itemToLink[item] = make(map[resource.ReferenceKey]struct{})
-	}
-	for _, link := range links {
-		m.itemToLink[item][link] = struct{}{}
-
-		if m.linkToItem[link] == nil {
-			m.linkToItem[link] = make(map[resource.ReferenceKey]struct{})
-		}
-		m.linkToItem[link][item] = struct{}{}
-	}
-}
-
-// LinksForItem returns references to links related to the requested item.
-// Deprecated: use LinksRefs
-func (m *Mapper) LinksForItem(item *pbresource.ID) []*pbresource.Reference {
-	return m.LinkRefsForItem(item)
-}
-
-// LinkRefsForItem returns references to links related to the requested item.
-func (m *Mapper) LinkRefsForItem(item *pbresource.ID) []*pbresource.Reference {
-	if !resource.EqualType(item.Type, m.itemType) {
-		panic(fmt.Sprintf("expected item type %q got %q",
-			resource.TypeToString(m.itemType),
-			resource.TypeToString(item.Type),
-		))
-	}
-
-	m.lock.Lock()
-	defer m.lock.Unlock()
-
-	links, ok := m.itemToLink[resource.NewReferenceKey(item)]
-	if !ok {
-		return nil
-	}
-
-	out := make([]*pbresource.Reference, 0, len(links))
-	for link := range links {
-		out = append(out, link.ToReference())
-	}
-	return out
-}
-
-// LinkIDsForItem returns IDs to links related to the requested item.
-func (m *Mapper) LinkIDsForItem(item *pbresource.ID) []*pbresource.ID {
-	if !resource.EqualType(item.Type, m.itemType) {
-		panic(fmt.Sprintf("expected item type %q got %q",
-			resource.TypeToString(m.itemType),
-			resource.TypeToString(item.Type),
-		))
-	}
-
-	m.lock.Lock()
-	defer m.lock.Unlock()
-
-	links, ok := m.itemToLink[resource.NewReferenceKey(item)]
-	if !ok {
-		return nil
-	}
-
-	out := make([]*pbresource.ID, 0, len(links))
-	for l := range links {
-		out = append(out, l.ToID())
-	}
-	return out
-}
-
-// ItemsForLink returns item ids for items related to the provided link.
-// Deprecated: use ItemIDsForLink
-func (m *Mapper) ItemsForLink(link *pbresource.ID) []*pbresource.ID {
-	return m.ItemIDsForLink(link)
-}
-
-// ItemIDsForLink returns item ids for items related to the provided link.
-func (m *Mapper) ItemIDsForLink(link resource.ReferenceOrID) []*pbresource.ID {
-	if !m.wildcardLink && !resource.EqualType(link.GetType(), m.linkType) {
-		panic(fmt.Sprintf("expected link type %q got %q",
-			resource.TypeToString(m.linkType),
-			resource.TypeToString(link.GetType()),
-		))
-	}
-
-	return m.itemIDsByLink(resource.NewReferenceKey(link))
-}
-
-// ItemRefsForLink returns item references for items related to the provided link.
-func (m *Mapper) ItemRefsForLink(link resource.ReferenceOrID) []*pbresource.Reference {
-	if !m.wildcardLink && !resource.EqualType(link.GetType(), m.linkType) {
-		panic(fmt.Sprintf("expected link type %q got %q",
-			resource.TypeToString(m.linkType),
-			resource.TypeToString(link.GetType()),
-		))
-	}
-
-	return m.itemRefsByLink(resource.NewReferenceKey(link))
-}
-
-// MapLink is suitable as a DependencyMapper to map the provided link event to its item.
-func (m *Mapper) MapLink(_ context.Context, _ controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	link := res.Id
-
-	if !m.wildcardLink && !resource.EqualType(link.Type, m.linkType) {
-		return nil, fmt.Errorf("expected type %q got %q",
-			resource.TypeToString(m.linkType),
-			resource.TypeToString(link.Type),
-		)
-	}
-
-	itemIDs := m.itemIDsByLink(resource.NewReferenceKey(link))
-
-	out := make([]controller.Request, 0, len(itemIDs))
-	for _, item := range itemIDs {
-		if !resource.EqualType(item.Type, m.itemType) {
-			return nil, fmt.Errorf("expected type %q got %q",
-				resource.TypeToString(m.itemType),
-				resource.TypeToString(item.Type),
-			)
-		}
-		out = append(out, controller.Request{ID: item})
-	}
-	return out, nil
-}
-
-func (m *Mapper) itemIDsByLink(link resource.ReferenceKey) []*pbresource.ID {
-	// a lock must be held both to read item from the map and to read the
-	// the returned items.
-	m.lock.Lock()
-	defer m.lock.Unlock()
-
-	items, ok := m.linkToItem[link]
-	if !ok {
-		return nil
-	}
-
-	out := make([]*pbresource.ID, 0, len(items))
-	for item := range items {
-		out = append(out, item.ToID())
-	}
-	return out
-}
-
-func (m *Mapper) itemRefsByLink(link resource.ReferenceKey) []*pbresource.Reference {
-	// a lock must be held both to read item from the map and to read the
-	// the returned items.
-	m.lock.Lock()
-	defer m.lock.Unlock()
-
-	items, ok := m.linkToItem[link]
-	if !ok {
-		return nil
-	}
-
-	out := make([]*pbresource.Reference, 0, len(items))
-	for item := range items {
-		out = append(out, item.ToReference())
-	}
-	return out
-}
diff --git a/internal/resource/mappers/bimapper/bimapper_test.go b/internal/resource/mappers/bimapper/bimapper_test.go
deleted file mode 100644
index 00dac874bc303..0000000000000
--- a/internal/resource/mappers/bimapper/bimapper_test.go
+++ /dev/null
@@ -1,489 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package bimapper
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-const (
-	fakeGroupName = "catalog"
-	fakeVersion   = "v1"
-)
-
-var (
-	fakeFooType = &pbresource.Type{
-		Group:        fakeGroupName,
-		GroupVersion: fakeVersion,
-		Kind:         "Foo",
-	}
-	fakeBarType = &pbresource.Type{
-		Group:        fakeGroupName,
-		GroupVersion: fakeVersion,
-		Kind:         "Bar",
-	}
-	fakeBazType = &pbresource.Type{
-		Group:        fakeGroupName,
-		GroupVersion: fakeVersion,
-		Kind:         "Baz",
-	}
-)
-
-func TestMapper(t *testing.T) {
-	// Create an advance pointer to some services.
-
-	randoSvc := rtest.Resource(fakeBarType, "rando").WithTenancy(resource.DefaultNamespacedTenancy()).Build()
-	apiSvc := rtest.Resource(fakeBarType, "api").WithTenancy(resource.DefaultNamespacedTenancy()).Build()
-	fooSvc := rtest.Resource(fakeBarType, "foo").WithTenancy(resource.DefaultNamespacedTenancy()).Build()
-	barSvc := rtest.Resource(fakeBarType, "bar").WithTenancy(resource.DefaultNamespacedTenancy()).Build()
-	wwwSvc := rtest.Resource(fakeBarType, "www").WithTenancy(resource.DefaultNamespacedTenancy()).Build()
-
-	apiRef := newRef(fakeBarType, "api")
-	fooRef := newRef(fakeBarType, "foo")
-	barRef := newRef(fakeBarType, "bar")
-	wwwRef := newRef(fakeBarType, "www")
-
-	fail1 := rtest.Resource(fakeFooType, "api").WithTenancy(resource.DefaultNamespacedTenancy()).Build()
-	fail1Refs := []resource.ReferenceOrID{
-		apiRef,
-		fooRef,
-		barRef,
-	}
-
-	fail2 := rtest.Resource(fakeFooType, "www").WithTenancy(resource.DefaultNamespacedTenancy()).Build()
-	fail2Refs := []resource.ReferenceOrID{
-		wwwRef,
-		fooRef,
-	}
-
-	fail1UpdatedRefs := []resource.ReferenceOrID{
-		apiRef,
-		barRef,
-	}
-
-	m := New(fakeFooType, fakeBarType)
-
-	// Nothing tracked yet so we assume nothing.
-	requireLinksForItem(t, m, fail1.Id)
-	requireLinksForItem(t, m, fail2.Id)
-	requireItemsForLink(t, m, apiRef)
-	requireItemsForLink(t, m, fooRef)
-	requireItemsForLink(t, m, barRef)
-	requireItemsForLink(t, m, wwwRef)
-
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc)
-	requireServicesTracked(t, m, fooSvc)
-	requireServicesTracked(t, m, barSvc)
-	requireServicesTracked(t, m, wwwSvc)
-
-	// no-ops
-	m.UntrackItem(fail1.Id)
-
-	// still nothing
-	requireLinksForItem(t, m, fail1.Id)
-	requireLinksForItem(t, m, fail2.Id)
-	requireItemsForLink(t, m, apiRef)
-	requireItemsForLink(t, m, fooRef)
-	requireItemsForLink(t, m, barRef)
-	requireItemsForLink(t, m, wwwRef)
-
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc)
-	requireServicesTracked(t, m, fooSvc)
-	requireServicesTracked(t, m, barSvc)
-	requireServicesTracked(t, m, wwwSvc)
-
-	// Actually insert some data.
-	m.TrackItem(fail1.Id, fail1Refs)
-
-	// Check links mapping
-	requireLinksForItem(t, m, fail1.Id, fail1Refs...)
-
-	requireLinksForItem(t, m, fail1.Id, fail1Refs...)
-	requireItemsForLink(t, m, apiRef, fail1.Id)
-	requireItemsForLink(t, m, fooRef, fail1.Id)
-	requireItemsForLink(t, m, barRef, fail1.Id)
-	requireItemsForLink(t, m, wwwRef)
-
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc, fail1.Id)
-	requireServicesTracked(t, m, fooSvc, fail1.Id)
-	requireServicesTracked(t, m, barSvc, fail1.Id)
-	requireServicesTracked(t, m, wwwSvc)
-
-	// track it again, no change
-	m.TrackItem(fail1.Id, fail1Refs)
-
-	requireLinksForItem(t, m, fail1.Id, fail1Refs...)
-	requireItemsForLink(t, m, apiRef, fail1.Id)
-	requireItemsForLink(t, m, fooRef, fail1.Id)
-	requireItemsForLink(t, m, barRef, fail1.Id)
-	requireItemsForLink(t, m, wwwRef)
-
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc, fail1.Id)
-	requireServicesTracked(t, m, fooSvc, fail1.Id)
-	requireServicesTracked(t, m, barSvc, fail1.Id)
-	requireServicesTracked(t, m, wwwSvc)
-
-	// track new one that overlaps slightly
-	m.TrackItem(fail2.Id, fail2Refs)
-
-	// Check links mapping for the new one
-	requireLinksForItem(t, m, fail1.Id, fail1Refs...)
-	requireLinksForItem(t, m, fail2.Id, fail2Refs...)
-	requireItemsForLink(t, m, apiRef, fail1.Id)
-	requireItemsForLink(t, m, fooRef, fail1.Id, fail2.Id)
-	requireItemsForLink(t, m, barRef, fail1.Id)
-	requireItemsForLink(t, m, wwwRef, fail2.Id)
-
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc, fail1.Id)
-	requireServicesTracked(t, m, fooSvc, fail1.Id, fail2.Id)
-	requireServicesTracked(t, m, barSvc, fail1.Id)
-	requireServicesTracked(t, m, wwwSvc, fail2.Id)
-
-	// update the original to change it
-	m.TrackItem(fail1.Id, fail1UpdatedRefs)
-
-	requireLinksForItem(t, m, fail1.Id, fail1UpdatedRefs...)
-	requireLinksForItem(t, m, fail2.Id, fail2Refs...)
-	requireItemsForLink(t, m, apiRef, fail1.Id)
-	requireItemsForLink(t, m, fooRef, fail2.Id)
-	requireItemsForLink(t, m, barRef, fail1.Id)
-	requireItemsForLink(t, m, wwwRef, fail2.Id)
-
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc, fail1.Id)
-	requireServicesTracked(t, m, fooSvc, fail2.Id)
-	requireServicesTracked(t, m, barSvc, fail1.Id)
-	requireServicesTracked(t, m, wwwSvc, fail2.Id)
-
-	// delete the original
-	m.UntrackItem(fail1.Id)
-
-	requireLinksForItem(t, m, fail1.Id)
-	requireLinksForItem(t, m, fail2.Id, fail2Refs...)
-	requireItemsForLink(t, m, apiRef)
-	requireItemsForLink(t, m, fooRef, fail2.Id)
-	requireItemsForLink(t, m, barRef)
-	requireItemsForLink(t, m, wwwRef, fail2.Id)
-
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc)
-	requireServicesTracked(t, m, fooSvc, fail2.Id)
-	requireServicesTracked(t, m, barSvc)
-	requireServicesTracked(t, m, wwwSvc, fail2.Id)
-
-	// delete the link
-	m.UntrackLink(newRef(fakeBarType, "www"))
-
-	requireLinksForItem(t, m, fail2.Id, newRef(fakeBarType, "foo"))
-
-	m.UntrackLink(newRef(fakeBarType, "foo"))
-
-	requireLinksForItem(t, m, fail2.Id)
-
-	// delete another item
-	m.UntrackItem(fail2.Id)
-
-	requireLinksForItem(t, m, fail1.Id)
-	requireLinksForItem(t, m, fail2.Id)
-	requireItemsForLink(t, m, apiRef)
-	requireItemsForLink(t, m, fooRef)
-	requireItemsForLink(t, m, barRef)
-	requireItemsForLink(t, m, wwwRef)
-
-	requireServicesTracked(t, m, randoSvc)
-	requireServicesTracked(t, m, apiSvc)
-	requireServicesTracked(t, m, fooSvc)
-	requireServicesTracked(t, m, barSvc)
-	requireServicesTracked(t, m, wwwSvc)
-
-	// Reset the mapper and check that its internal maps are empty.
-	m.Reset()
-	require.True(t, m.IsEmpty())
-}
-
-func TestMapper_Wildcard(t *testing.T) {
-	bar1Ref := newRef(fakeBarType, "uno")
-	bar2Ref := newRef(fakeBarType, "dos")
-
-	baz1Ref := newRef(fakeBazType, "uno")
-	baz2Ref := newRef(fakeBazType, "dos")
-
-	m := NewWithWildcardLinkType(fakeFooType)
-
-	foo1 := rtest.Resource(fakeFooType, "foo1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		Build()
-	foo1Refs := []resource.ReferenceOrID{
-		bar1Ref,
-		baz1Ref,
-	}
-
-	foo2 := rtest.Resource(fakeFooType, "foo2").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		Build()
-	foo2Refs := []resource.ReferenceOrID{
-		bar1Ref,
-		bar2Ref,
-		baz2Ref,
-	}
-	foo2UpdatedRefs := []resource.ReferenceOrID{
-		bar2Ref,
-		baz2Ref,
-	}
-
-	// Nothing tracked yet so we assume nothing.
-	requireLinksForItem(t, m, foo1.Id)
-	requireLinksForItem(t, m, foo2.Id)
-	requireItemsForLink(t, m, bar1Ref)
-	requireItemsForLink(t, m, bar2Ref)
-	requireItemsForLink(t, m, baz1Ref)
-	requireItemsForLink(t, m, baz2Ref)
-
-	// no-ops
-	m.UntrackItem(foo1.Id)
-
-	// still nothing
-	requireLinksForItem(t, m, foo1.Id)
-	requireLinksForItem(t, m, foo2.Id)
-	requireItemsForLink(t, m, bar1Ref)
-	requireItemsForLink(t, m, bar2Ref)
-	requireItemsForLink(t, m, baz1Ref)
-	requireItemsForLink(t, m, baz2Ref)
-
-	// Actually insert some data.
-	m.TrackItem(foo1.Id, foo1Refs)
-
-	// Check links mapping
-	requireLinksForItem(t, m, foo1.Id, foo1Refs...)
-	requireItemsForLink(t, m, bar1Ref, foo1.Id)
-	requireItemsForLink(t, m, bar2Ref)
-	requireItemsForLink(t, m, baz1Ref, foo1.Id)
-	requireItemsForLink(t, m, baz2Ref)
-
-	// track it again, no change
-	m.TrackItem(foo1.Id, foo1Refs)
-
-	requireLinksForItem(t, m, foo1.Id, foo1Refs...)
-	requireItemsForLink(t, m, bar1Ref, foo1.Id)
-	requireItemsForLink(t, m, bar2Ref)
-	requireItemsForLink(t, m, baz1Ref, foo1.Id)
-	requireItemsForLink(t, m, baz2Ref)
-
-	// track new one that overlaps slightly
-	m.TrackItem(foo2.Id, foo2Refs)
-
-	// Check links mapping for the new one
-	requireLinksForItem(t, m, foo1.Id, foo1Refs...)
-	requireLinksForItem(t, m, foo2.Id, foo2Refs...)
-	requireItemsForLink(t, m, bar1Ref, foo1.Id, foo2.Id)
-	requireItemsForLink(t, m, bar2Ref, foo2.Id)
-	requireItemsForLink(t, m, baz1Ref, foo1.Id)
-	requireItemsForLink(t, m, baz2Ref, foo2.Id)
-
-	// update the original to change it
-	m.TrackItem(foo2.Id, foo2UpdatedRefs)
-
-	requireLinksForItem(t, m, foo1.Id, foo1Refs...)
-	requireLinksForItem(t, m, foo2.Id, foo2UpdatedRefs...)
-	requireItemsForLink(t, m, bar1Ref, foo1.Id)
-	requireItemsForLink(t, m, bar2Ref, foo2.Id)
-	requireItemsForLink(t, m, baz1Ref, foo1.Id)
-	requireItemsForLink(t, m, baz2Ref, foo2.Id)
-
-	// delete the original
-	m.UntrackItem(foo1.Id)
-
-	requireLinksForItem(t, m, foo1.Id)
-	requireLinksForItem(t, m, foo2.Id, foo2UpdatedRefs...)
-	requireItemsForLink(t, m, bar1Ref)
-	requireItemsForLink(t, m, bar2Ref, foo2.Id)
-	requireItemsForLink(t, m, baz1Ref)
-	requireItemsForLink(t, m, baz2Ref, foo2.Id)
-
-	// delete the link
-	m.UntrackLink(baz2Ref)
-
-	foo2DoubleUpdatedRefs := []resource.ReferenceOrID{
-		bar2Ref,
-	}
-
-	requireLinksForItem(t, m, foo1.Id)
-	requireLinksForItem(t, m, foo2.Id, foo2DoubleUpdatedRefs...)
-	requireItemsForLink(t, m, bar1Ref)
-	requireItemsForLink(t, m, bar2Ref, foo2.Id)
-	requireItemsForLink(t, m, baz1Ref)
-	requireItemsForLink(t, m, baz2Ref)
-
-	// delete another item
-	m.UntrackItem(foo2.Id)
-
-	requireLinksForItem(t, m, foo1.Id)
-	requireLinksForItem(t, m, foo2.Id)
-	requireItemsForLink(t, m, bar1Ref)
-	requireItemsForLink(t, m, bar2Ref)
-	requireItemsForLink(t, m, baz1Ref)
-	requireItemsForLink(t, m, baz2Ref)
-
-	// Reset the mapper and check that its internal maps are empty.
-	m.Reset()
-	require.True(t, m.IsEmpty())
-}
-
-func TestPanics(t *testing.T) {
-	t.Run("new mapper without types", func(t *testing.T) {
-		require.PanicsWithValue(t, "itemType is required", func() {
-			New(nil, nil)
-		})
-
-		require.PanicsWithValue(t, "itemType is required", func() {
-			New(nil, fakeBarType)
-		})
-
-		require.PanicsWithValue(t, "linkType is required", func() {
-			New(fakeFooType, nil)
-		})
-	})
-
-	t.Run("UntrackItem: mismatched type", func(t *testing.T) {
-		m := New(fakeFooType, fakeBarType)
-		require.PanicsWithValue(t, "expected item type \"catalog.v1.Foo\" got \"catalog.v1.Bar\"", func() {
-			// Calling UntrackItem with link type instead of item type
-			m.UntrackItem(rtest.Resource(fakeBarType, "test").ID())
-		})
-	})
-
-	t.Run("TrackItem: mismatched item type", func(t *testing.T) {
-		m := New(fakeFooType, fakeBarType)
-		require.PanicsWithValue(t, "expected item type \"catalog.v1.Foo\" got \"catalog.v1.Bar\"", func() {
-			// Calling UntrackItem with link type instead of item type
-			m.TrackItem(rtest.Resource(fakeBarType, "test").ID(), nil)
-		})
-	})
-
-	t.Run("TrackItem: mismatched link type", func(t *testing.T) {
-		m := New(fakeFooType, fakeBarType)
-		require.PanicsWithValue(t, "expected link type \"catalog.v1.Bar\" got \"catalog.v1.Foo\"", func() {
-			// Calling UntrackItem with link type instead of item type
-			links := []resource.ReferenceOrID{
-				rtest.Resource(fakeFooType, "link").ID(),
-			}
-			m.TrackItem(rtest.Resource(fakeFooType, "test").ID(), links)
-		})
-	})
-
-	t.Run("UntrackLink: mismatched type", func(t *testing.T) {
-		m := New(fakeFooType, fakeBarType)
-		require.PanicsWithValue(t, "expected link type \"catalog.v1.Bar\" got \"catalog.v1.Foo\"", func() {
-			m.UntrackLink(rtest.Resource(fakeFooType, "test").ID())
-		})
-	})
-
-	t.Run("LinkRefsForItem: mismatched type", func(t *testing.T) {
-		m := New(fakeFooType, fakeBarType)
-		require.PanicsWithValue(t, "expected item type \"catalog.v1.Foo\" got \"catalog.v1.Bar\"", func() {
-			m.LinkRefsForItem(rtest.Resource(fakeBarType, "test").ID())
-		})
-	})
-
-	t.Run("LinkRefsForItem: mismatched type", func(t *testing.T) {
-		m := New(fakeFooType, fakeBarType)
-		require.PanicsWithValue(t, "expected item type \"catalog.v1.Foo\" got \"catalog.v1.Bar\"", func() {
-			m.LinkIDsForItem(rtest.Resource(fakeBarType, "test").ID())
-		})
-	})
-
-	t.Run("ItemRefsForLink: mismatched type", func(t *testing.T) {
-		m := New(fakeFooType, fakeBarType)
-		require.PanicsWithValue(t, "expected link type \"catalog.v1.Bar\" got \"catalog.v1.Foo\"", func() {
-			m.ItemRefsForLink(rtest.Resource(fakeFooType, "test").ID())
-		})
-	})
-
-	t.Run("ItemIDsForLink: mismatched type", func(t *testing.T) {
-		m := New(fakeFooType, fakeBarType)
-		require.PanicsWithValue(t, "expected link type \"catalog.v1.Bar\" got \"catalog.v1.Foo\"", func() {
-			m.ItemIDsForLink(rtest.Resource(fakeFooType, "test").ID())
-		})
-	})
-}
-
-func requireServicesTracked(t *testing.T, mapper *Mapper, link *pbresource.Resource, items ...*pbresource.ID) {
-	t.Helper()
-
-	reqs, err := mapper.MapLink(
-		context.Background(),
-		controller.Runtime{},
-		link,
-	)
-	require.NoError(t, err)
-
-	require.Len(t, reqs, len(items))
-
-	// Also check items IDs and Refs for link.
-	ids := mapper.ItemIDsForLink(link.Id)
-	require.Len(t, ids, len(items))
-
-	refs := mapper.ItemRefsForLink(link.Id)
-	require.Len(t, refs, len(items))
-
-	for _, item := range items {
-		prototest.AssertContainsElement(t, reqs, controller.Request{ID: item})
-		prototest.AssertContainsElement(t, ids, item)
-		prototest.AssertContainsElement(t, refs, resource.Reference(item, ""))
-	}
-}
-
-func requireItemsForLink(t *testing.T, mapper *Mapper, link *pbresource.Reference, items ...*pbresource.ID) {
-	t.Helper()
-
-	got := mapper.ItemIDsForLink(resource.IDFromReference(link))
-
-	prototest.AssertElementsMatch(t, items, got)
-}
-
-func requireLinksForItem(t *testing.T, mapper *Mapper, item *pbresource.ID, links ...resource.ReferenceOrID) {
-	t.Helper()
-
-	var expLinkRefs []*pbresource.Reference
-	var expLinkIDs []*pbresource.ID
-
-	for _, l := range links {
-		expLinkRefs = append(expLinkRefs, &pbresource.Reference{
-			Name:    l.GetName(),
-			Tenancy: l.GetTenancy(),
-			Type:    l.GetType(),
-		})
-		expLinkIDs = append(expLinkIDs, &pbresource.ID{
-			Name:    l.GetName(),
-			Tenancy: l.GetTenancy(),
-			Type:    l.GetType(),
-		})
-	}
-
-	refs := mapper.LinkRefsForItem(item)
-	require.Len(t, refs, len(links))
-	prototest.AssertElementsMatch(t, expLinkRefs, refs)
-
-	ids := mapper.LinkIDsForItem(item)
-	require.Len(t, refs, len(links))
-	prototest.AssertElementsMatch(t, expLinkIDs, ids)
-}
-
-func newRef(typ *pbresource.Type, name string) *pbresource.Reference {
-	return rtest.Resource(typ, name).WithTenancy(resource.DefaultNamespacedTenancy()).Reference("")
-}
diff --git a/internal/resource/mappers/selectiontracker/selection_tracker.go b/internal/resource/mappers/selectiontracker/selection_tracker.go
deleted file mode 100644
index 5b60680bb546f..0000000000000
--- a/internal/resource/mappers/selectiontracker/selection_tracker.go
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package selectiontracker
-
-import (
-	"context"
-	"fmt"
-	"sync"
-
-	"golang.org/x/exp/slices"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/radix"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/lib/stringslice"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type WorkloadSelectionTracker struct {
-	lock     sync.Mutex
-	prefixes *radix.Tree[[]*pbresource.ID]
-	exact    *radix.Tree[[]*pbresource.ID]
-
-	// workloadSelectors contains a map keyed on resource references with values
-	// being the selector that resource is currently associated with. This map
-	// is kept mainly to make tracking removal operations more efficient.
-	// Generally any operation that could take advantage of knowing where
-	// in the trees the resource id is referenced can use this to prevent
-	// needing to search the whole tree.
-	workloadSelectors map[resource.ReferenceKey]*pbcatalog.WorkloadSelector
-}
-
-func New() *WorkloadSelectionTracker {
-	return &WorkloadSelectionTracker{
-		prefixes:          radix.New[[]*pbresource.ID](),
-		exact:             radix.New[[]*pbresource.ID](),
-		workloadSelectors: make(map[resource.ReferenceKey]*pbcatalog.WorkloadSelector),
-	}
-}
-
-// MapWorkload will return a slice of controller.Requests with 1 resource for
-// each resource that selects the specified Workload resource.
-func (t *WorkloadSelectionTracker) MapWorkload(_ context.Context, _ controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-	resIds := t.GetIDsForWorkload(res.Id)
-
-	return controller.MakeRequests(nil, resIds), nil
-}
-
-func (t *WorkloadSelectionTracker) GetIDsForWorkload(id *pbresource.ID) []*pbresource.ID {
-	t.lock.Lock()
-	defer t.lock.Unlock()
-
-	var result []*pbresource.ID
-
-	workloadTreeKey := treePathFromNameOrPrefix(id.GetTenancy(), id.GetName())
-
-	// gather the list of all resources that select the specified workload using a prefix match
-	t.prefixes.WalkPath(workloadTreeKey, func(path string, ids []*pbresource.ID) bool {
-		result = append(result, ids...)
-		return false
-	})
-
-	// gather the list of all resources that select the specified workload using an exact match
-	exactReqs, _ := t.exact.Get(workloadTreeKey)
-
-	// return the combined list of all resources that select the specified workload
-	return append(result, exactReqs...)
-}
-
-// TrackIDForSelector will associate workloads matching the specified workload
-// selector with the given resource id.
-func (t *WorkloadSelectionTracker) TrackIDForSelector(id *pbresource.ID, selector *pbcatalog.WorkloadSelector) {
-	t.lock.Lock()
-	defer t.lock.Unlock()
-
-	ref := resource.NewReferenceKey(id)
-	if previousSelector, found := t.workloadSelectors[ref]; found {
-		if stringslice.Equal(previousSelector.Names, selector.Names) &&
-			stringslice.Equal(previousSelector.Prefixes, selector.Prefixes) {
-			// the selector is unchanged so do nothing
-			return
-		}
-
-		// Potentially we could detect differences and do more minimal work. However
-		// users are not expected to alter workload selectors often and therefore
-		// not optimizing this further is probably fine. Therefore we are going
-		// to wipe all tracking of the id and reinsert things.
-		t.untrackID(id)
-	}
-
-	// loop over all the exact matching rules and associate those workload names
-	// with the given resource id
-	for _, name := range selector.GetNames() {
-		key := treePathFromNameOrPrefix(id.GetTenancy(), name)
-
-		// lookup any resource id associations for the given workload name
-		leaf, _ := t.exact.Get(key)
-
-		// append the ID to the existing request list
-		t.exact.Insert(key, append(leaf, id))
-	}
-
-	// loop over all the prefix matching rules and associate those prefixes
-	// with the given resource id.
-	for _, prefix := range selector.GetPrefixes() {
-		key := treePathFromNameOrPrefix(id.GetTenancy(), prefix)
-
-		// lookup any resource id associations for the given workload name prefix
-		leaf, _ := t.prefixes.Get(key)
-
-		// append the new resource ID to the existing request list
-		t.prefixes.Insert(key, append(leaf, id))
-	}
-
-	t.workloadSelectors[ref] = selector
-}
-
-// UntrackID causes the tracker to stop tracking the given resource ID
-func (t *WorkloadSelectionTracker) UntrackID(id *pbresource.ID) {
-	t.lock.Lock()
-	defer t.lock.Unlock()
-	t.untrackID(id)
-}
-
-// GetSelector returns the currently stored selector for the given ID.
-func (t *WorkloadSelectionTracker) GetSelector(id *pbresource.ID) *pbcatalog.WorkloadSelector {
-	t.lock.Lock()
-	defer t.lock.Unlock()
-
-	return t.workloadSelectors[resource.NewReferenceKey(id)]
-}
-
-// untrackID should be called to stop tracking a resource ID.
-// This method assumes the lock is already held. Besides modifying
-// the prefix & name trees to not reference this ID, it will also
-// delete any corresponding entry within the workloadSelectors map
-func (t *WorkloadSelectionTracker) untrackID(id *pbresource.ID) {
-	ref := resource.NewReferenceKey(id)
-	selector, found := t.workloadSelectors[ref]
-	if !found {
-		return
-	}
-
-	exactTreePaths := make([]string, len(selector.GetNames()))
-	for i, name := range selector.GetNames() {
-		exactTreePaths[i] = treePathFromNameOrPrefix(id.GetTenancy(), name)
-	}
-
-	prefixTreePaths := make([]string, len(selector.GetPrefixes()))
-	for i, prefix := range selector.GetPrefixes() {
-		prefixTreePaths[i] = treePathFromNameOrPrefix(id.GetTenancy(), prefix)
-	}
-
-	removeIDFromTreeAtPaths(t.exact, id, exactTreePaths)
-	removeIDFromTreeAtPaths(t.prefixes, id, prefixTreePaths)
-
-	// If we don't do this deletion then reinsertion of the id for
-	// tracking in the future could prevent selection criteria from
-	// being properly inserted into the radix trees.
-	delete(t.workloadSelectors, ref)
-}
-
-// removeIDFromTree will remove the given resource ID from all leaf nodes in the radix tree.
-func removeIDFromTreeAtPaths(t *radix.Tree[[]*pbresource.ID], id *pbresource.ID, paths []string) {
-	for _, path := range paths {
-		ids, _ := t.Get(path)
-
-		foundIdx := -1
-		for idx, resID := range ids {
-			if resource.EqualID(resID, id) {
-				foundIdx = idx
-				break
-			}
-		}
-
-		if foundIdx != -1 {
-			l := len(ids)
-
-			if foundIdx == l-1 {
-				ids = ids[:foundIdx]
-			} else {
-				ids = slices.Delete(ids, foundIdx, foundIdx+1)
-			}
-
-			if len(ids) > 0 {
-				t.Insert(path, ids)
-			} else {
-				t.Delete(path)
-			}
-		}
-	}
-}
-
-// treePathFromNameOrPrefix computes radix tree key from the resource tenancy and a selector name or prefix.
-// The keys will be computed in the following form:
-// <partition>/<peer>/<namespace>/<name or prefix>.
-func treePathFromNameOrPrefix(tenancy *pbresource.Tenancy, nameOrPrefix string) string {
-	return fmt.Sprintf("%s/%s/%s/%s",
-		tenancy.GetPartition(),
-		tenancy.GetPeerName(),
-		tenancy.GetNamespace(),
-		nameOrPrefix)
-}
diff --git a/internal/resource/mappers/selectiontracker/selection_tracker_test.go b/internal/resource/mappers/selectiontracker/selection_tracker_test.go
deleted file mode 100644
index 345ac848ab40a..0000000000000
--- a/internal/resource/mappers/selectiontracker/selection_tracker_test.go
+++ /dev/null
@@ -1,383 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package selectiontracker
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/radix"
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-var (
-	workloadData = &pbcatalog.Workload{
-		Addresses: []*pbcatalog.WorkloadAddress{
-			{
-				Host: "198.18.0.1",
-			},
-		},
-		Ports: map[string]*pbcatalog.WorkloadPort{
-			"http": {
-				Port:     8080,
-				Protocol: pbcatalog.Protocol_PROTOCOL_HTTP,
-			},
-		},
-	}
-
-	tenancyCases = map[string]*pbresource.Tenancy{
-		"default": resource.DefaultNamespacedTenancy(),
-		"bar ns, default partition, local peer": {
-			Partition: "default",
-			Namespace: "bar",
-			PeerName:  "local",
-		},
-		"default ns, baz partition, local peer": {
-			Partition: "baz",
-			Namespace: "default",
-			PeerName:  "local",
-		},
-		"bar ns, baz partition, local peer": {
-			Partition: "baz",
-			Namespace: "bar",
-			PeerName:  "local",
-		},
-		"bar ns, baz partition, non-local peer": {
-			Partition: "baz",
-			Namespace: "bar",
-			PeerName:  "non-local",
-		},
-	}
-)
-
-func TestRemoveIDFromTreeAtPaths(t *testing.T) {
-	tree := radix.New[[]*pbresource.ID]()
-
-	tenancy := resource.DefaultNamespacedTenancy()
-	toRemove := rtest.Resource(pbcatalog.ServiceEndpointsType, "blah").WithTenancy(tenancy).ID()
-	other1 := rtest.Resource(pbcatalog.ServiceEndpointsType, "other1").WithTenancy(tenancy).ID()
-	other2 := rtest.Resource(pbcatalog.ServiceEndpointsType, "other2").WithTenancy(tenancy).ID()
-
-	// we are trying to create a tree such that removal of the toRemove id causes a
-	// few things to happen.
-	//
-	// * All the slice modification conditions are executed
-	//   - removal from beginning of the list
-	//   - removal from the end of the list
-	//   - removal of only element in the list
-	//   - removal from middle of the list
-	// * Paths without matching ids are ignored
-
-	notMatching := []*pbresource.ID{
-		other1,
-		other2,
-	}
-
-	matchAtBeginning := []*pbresource.ID{
-		toRemove,
-		other1,
-		other2,
-	}
-
-	// For this case, we only add one other not matching to test that we don't remove
-	// non-matching ones.
-	matchAtEnd := []*pbresource.ID{
-		other1,
-		toRemove,
-	}
-
-	matchInMiddle := []*pbresource.ID{
-		other1,
-		toRemove,
-		other2,
-	}
-
-	matchOnly := []*pbresource.ID{
-		toRemove,
-	}
-
-	noMatchKey := treePathFromNameOrPrefix(tenancy, "no-match")
-	matchBeginningKey := treePathFromNameOrPrefix(tenancy, "match-beginning")
-	matchEndKey := treePathFromNameOrPrefix(tenancy, "match-end")
-	matchMiddleKey := treePathFromNameOrPrefix(tenancy, "match-middle")
-	matchOnlyKey := treePathFromNameOrPrefix(tenancy, "match-only")
-
-	tree.Insert(noMatchKey, notMatching)
-	tree.Insert(matchBeginningKey, matchAtBeginning)
-	tree.Insert(matchEndKey, matchAtEnd)
-	tree.Insert(matchMiddleKey, matchInMiddle)
-	tree.Insert(matchOnlyKey, matchOnly)
-
-	removeIDFromTreeAtPaths(tree, toRemove, []string{
-		noMatchKey,
-		matchBeginningKey,
-		matchEndKey,
-		matchMiddleKey,
-		matchOnlyKey,
-	})
-
-	reqs, found := tree.Get(noMatchKey)
-	require.True(t, found)
-	require.Equal(t, notMatching, reqs)
-
-	reqs, found = tree.Get(matchBeginningKey)
-	require.True(t, found)
-	require.Equal(t, notMatching, reqs)
-
-	reqs, found = tree.Get(matchEndKey)
-	require.True(t, found)
-	require.Equal(t, []*pbresource.ID{other1}, reqs)
-
-	reqs, found = tree.Get(matchMiddleKey)
-	require.True(t, found)
-	require.Equal(t, notMatching, reqs)
-
-	// The last tracked request should cause removal from the tree
-	_, found = tree.Get(matchOnlyKey)
-	require.False(t, found)
-}
-
-type selectionTrackerSuite struct {
-	suite.Suite
-
-	rt      controller.Runtime
-	tracker *WorkloadSelectionTracker
-
-	// The test setup adds resources with various tenancy settings. Because tenancies are stored in a map,
-	// it adds "free" order randomization, and so we need to remember the order in which those tenancy were executed.
-	executedTenancies []*pbresource.Tenancy
-
-	endpointsFoo []*pbresource.ID
-	endpointsBar []*pbresource.ID
-	workloadsAPI []*pbresource.Resource
-	workloadsWeb []*pbresource.Resource
-}
-
-func (suite *selectionTrackerSuite) SetupTest() {
-	suite.tracker = New()
-
-	for _, tenancy := range tenancyCases {
-		suite.executedTenancies = append(suite.executedTenancies, tenancy)
-
-		endpointsFooID := rtest.Resource(pbcatalog.ServiceEndpointsType, "foo").
-			WithTenancy(tenancy).ID()
-		suite.endpointsFoo = append(suite.endpointsFoo, endpointsFooID)
-
-		endpointsBarID := rtest.Resource(pbcatalog.ServiceEndpointsType, "bar").
-			WithTenancy(tenancy).ID()
-		suite.endpointsBar = append(suite.endpointsBar, endpointsBarID)
-
-		suite.workloadsAPI = append(suite.workloadsAPI, rtest.Resource(pbcatalog.WorkloadType, "api-1").
-			WithData(suite.T(), workloadData).
-			WithTenancy(tenancy).
-			Build())
-		suite.workloadsWeb = append(suite.workloadsWeb, rtest.Resource(pbcatalog.WorkloadType, "web-1").
-			WithData(suite.T(), workloadData).
-			WithTenancy(tenancy).
-			Build())
-	}
-}
-
-func (suite *selectionTrackerSuite) TearDownTest() {
-	suite.executedTenancies = nil
-	suite.workloadsAPI = nil
-	suite.workloadsWeb = nil
-	suite.endpointsFoo = nil
-	suite.endpointsBar = nil
-}
-
-func (suite *selectionTrackerSuite) requireMappedIDs(t *testing.T, workload *pbresource.Resource, ids ...*pbresource.ID) {
-	t.Helper()
-
-	reqs, err := suite.tracker.MapWorkload(context.Background(), suite.rt, workload)
-	require.NoError(suite.T(), err)
-	require.Len(t, reqs, len(ids))
-	for _, id := range ids {
-		prototest.AssertContainsElement(t, reqs, controller.Request{ID: id})
-	}
-}
-
-func (suite *selectionTrackerSuite) requireMappedIDsAllTenancies(t *testing.T, workloads []*pbresource.Resource, ids ...[]*pbresource.ID) {
-	t.Helper()
-
-	for i := range suite.executedTenancies {
-		reqs, err := suite.tracker.MapWorkload(context.Background(), suite.rt, workloads[i])
-		require.NoError(suite.T(), err)
-		require.Len(t, reqs, len(ids))
-		for _, id := range ids {
-			prototest.AssertContainsElement(t, reqs, controller.Request{ID: id[i]})
-		}
-	}
-}
-
-func (suite *selectionTrackerSuite) trackIDForSelectorInAllTenancies(ids []*pbresource.ID, selector *pbcatalog.WorkloadSelector) {
-	suite.T().Helper()
-
-	for i := range suite.executedTenancies {
-		suite.tracker.TrackIDForSelector(ids[i], selector)
-	}
-}
-
-func (suite *selectionTrackerSuite) TestMapWorkload_Empty() {
-	// If we aren't tracking anything than the default mapping behavior
-	// should be to return an empty list of requests.
-	suite.requireMappedIDs(suite.T(),
-		rtest.Resource(pbcatalog.WorkloadType, "api-1").WithData(suite.T(), workloadData).Build())
-}
-
-func (suite *selectionTrackerSuite) TestUntrackID_Empty() {
-	// this test has no assertions but mainly is here to prove that things
-	// don't explode if this is attempted.
-	suite.tracker.UntrackID(rtest.Resource(pbcatalog.ServiceEndpointsType, "foo").ID())
-}
-
-func (suite *selectionTrackerSuite) TestTrackAndMap_SingleResource_MultipleWorkloadMappings() {
-	// This test aims to prove that tracking a resources workload selector and
-	// then mapping a workload back to that resource works as expected when the
-	// result set is a single resource. This test will ensure that both prefix
-	// and exact match criteria are handle correctly and that one resource
-	// can be mapped from multiple distinct workloads.
-
-	// Create resources for the test and track endpoints.
-	suite.trackIDForSelectorInAllTenancies(suite.endpointsFoo, &pbcatalog.WorkloadSelector{
-		Names:    []string{"bar", "api", "web-1"},
-		Prefixes: []string{"api-"},
-	})
-
-	suite.requireMappedIDsAllTenancies(suite.T(), suite.workloadsAPI, suite.endpointsFoo)
-	suite.requireMappedIDsAllTenancies(suite.T(), suite.workloadsWeb, suite.endpointsFoo)
-}
-
-func (suite *selectionTrackerSuite) TestTrackAndMap_MultiResource_SingleWorkloadMapping() {
-	// This test aims to prove that multiple resources selecting of a workload
-	// will result in multiple requests when mapping that workload.
-
-	cases := map[string]struct {
-		selector *pbcatalog.WorkloadSelector
-	}{
-		"names": {
-			selector: &pbcatalog.WorkloadSelector{
-				Names: []string{"api-1"},
-			},
-		},
-		"prefixes": {
-			selector: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"api"},
-			},
-		},
-	}
-
-	for name, c := range cases {
-		suite.T().Run(name, func(t *testing.T) {
-			for i := range suite.executedTenancies {
-				// associate the foo endpoints with some workloads
-				suite.tracker.TrackIDForSelector(suite.endpointsFoo[i], c.selector)
-
-				// associate the bar endpoints with some workloads
-				suite.tracker.TrackIDForSelector(suite.endpointsBar[i], c.selector)
-			}
-
-			// now the mapping should return both endpoints resource ids
-			suite.requireMappedIDsAllTenancies(t, suite.workloadsAPI, suite.endpointsFoo, suite.endpointsBar)
-		})
-	}
-}
-
-func (suite *selectionTrackerSuite) TestDuplicateTracking() {
-	// This test aims to prove that tracking some ID multiple times doesn't
-	// result in multiple requests for the same ID
-
-	// associate the foo endpoints with some workloads 3 times without changing
-	// the selection criteria. The second two times should be no-ops
-	workloadAPI1 := rtest.Resource(pbcatalog.WorkloadType, "api-1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(suite.T(), workloadData).Build()
-	endpointsFoo := rtest.Resource(pbcatalog.ServiceEndpointsType, "foo").
-		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-
-	suite.tracker.TrackIDForSelector(endpointsFoo, &pbcatalog.WorkloadSelector{
-		Prefixes: []string{"api-"},
-	})
-
-	suite.tracker.TrackIDForSelector(endpointsFoo, &pbcatalog.WorkloadSelector{
-		Prefixes: []string{"api-"},
-	})
-
-	suite.tracker.TrackIDForSelector(endpointsFoo, &pbcatalog.WorkloadSelector{
-		Prefixes: []string{"api-"},
-	})
-
-	// regardless of the number of times tracked we should only see a single request
-	suite.requireMappedIDs(suite.T(), workloadAPI1, endpointsFoo)
-}
-
-func (suite *selectionTrackerSuite) TestModifyTracking() {
-	// This test aims to prove that modifying selection criteria for a resource
-	// works as expected. Adding new criteria results in all being tracked.
-	// Removal of some criteria doesn't result in removal of all etc. More or
-	// less we want to ensure that updating selection criteria leaves the
-	// tracker in a consistent/expected state.
-
-	// Create resources for the test and track endpoints.
-	suite.trackIDForSelectorInAllTenancies(suite.endpointsFoo, &pbcatalog.WorkloadSelector{
-		Names: []string{"web-1"},
-	})
-
-	// ensure that api-1 isn't mapped but web-1 is
-	suite.requireMappedIDsAllTenancies(suite.T(), suite.workloadsAPI)
-	suite.requireMappedIDsAllTenancies(suite.T(), suite.workloadsWeb, suite.endpointsFoo)
-
-	// now also track the api- prefix
-	suite.trackIDForSelectorInAllTenancies(suite.endpointsFoo, &pbcatalog.WorkloadSelector{
-		Names:    []string{"web-1"},
-		Prefixes: []string{"api-"},
-	})
-
-	// ensure that both workloads are mapped appropriately
-	suite.requireMappedIDsAllTenancies(suite.T(), suite.workloadsAPI, suite.endpointsFoo)
-	suite.requireMappedIDsAllTenancies(suite.T(), suite.workloadsWeb, suite.endpointsFoo)
-
-	// now remove the web tracking
-	suite.trackIDForSelectorInAllTenancies(suite.endpointsFoo, &pbcatalog.WorkloadSelector{
-		Prefixes: []string{"api-"},
-	})
-
-	// ensure that only api-1 is mapped
-	suite.requireMappedIDsAllTenancies(suite.T(), suite.workloadsAPI, suite.endpointsFoo)
-	suite.requireMappedIDsAllTenancies(suite.T(), suite.workloadsWeb)
-}
-
-func (suite *selectionTrackerSuite) TestRemove() {
-	// This test aims to prove that removal of a resource from tracking
-	// actually prevents subsequent mapping calls from returning the
-	// workload.
-
-	// track the web-1 workload
-	suite.trackIDForSelectorInAllTenancies(suite.endpointsFoo, &pbcatalog.WorkloadSelector{
-		Names: []string{"web-1"},
-	})
-
-	// ensure web-1 is mapped
-	suite.requireMappedIDsAllTenancies(suite.T(), suite.workloadsWeb, suite.endpointsFoo)
-
-	for i := range suite.executedTenancies {
-		// untrack the resource
-		suite.tracker.UntrackID(suite.endpointsFoo[i])
-	}
-
-	// ensure that we no longer map the previous workload to the resource
-	suite.requireMappedIDsAllTenancies(suite.T(), suite.workloadsWeb)
-}
-
-func TestWorkloadSelectionSuite(t *testing.T) {
-	suite.Run(t, new(selectionTrackerSuite))
-}
diff --git a/internal/resource/protoc-gen-resource-types/internal/generate/generate.go b/internal/resource/protoc-gen-resource-types/internal/generate/generate.go
deleted file mode 100644
index 3d74077da93b0..0000000000000
--- a/internal/resource/protoc-gen-resource-types/internal/generate/generate.go
+++ /dev/null
@@ -1,158 +0,0 @@
-package generate
-
-import (
-	"fmt"
-	"path/filepath"
-	"sort"
-	"strings"
-	"text/template"
-
-	"google.golang.org/protobuf/compiler/protogen"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func Generate(gp *protogen.Plugin) error {
-	g := newGenerator()
-
-	for _, file := range gp.Files {
-		err := g.addResourceKindsFromFile(file)
-		if err != nil {
-			return err
-		}
-	}
-
-	return g.generateTypes(gp)
-}
-
-type apiGroupVersion struct {
-	Group   string
-	Version string
-}
-
-type groupInfo struct {
-	Name    string
-	Version string
-
-	Kinds       []kind
-	ImportPath  protogen.GoImportPath
-	PackageName protogen.GoPackageName
-	Directory   string
-}
-
-type kind struct {
-	Name     string
-	Comments protogen.CommentSet
-}
-
-type generator struct {
-	resources map[apiGroupVersion]*groupInfo
-}
-
-func newGenerator() *generator {
-	return &generator{
-		resources: make(map[apiGroupVersion]*groupInfo),
-	}
-}
-
-func (g *generator) addResourceKindsFromFile(f *protogen.File) error {
-	if !f.Generate {
-		return nil
-	}
-
-	for _, m := range f.Messages {
-		ext := proto.GetExtension(m.Desc.Options(), pbresource.E_Spec).(*pbresource.ResourceTypeSpec)
-		if ext == nil {
-			continue
-		}
-
-		gvkString := strings.TrimPrefix(string(m.Desc.FullName()), "hashicorp.consul.")
-		rtype, err := resource.ParseGVK(gvkString)
-		if err != nil {
-			return err
-		}
-
-		apiGroupDir := filepath.Dir(f.Proto.GetName())
-
-		gv := apiGroupVersion{
-			Group:   rtype.Group,
-			Version: rtype.GroupVersion,
-		}
-
-		grp, err := g.ensureAPIGroup(gv, f.GoImportPath, f.GoPackageName, apiGroupDir)
-		if err != nil {
-			return err
-		}
-
-		grp.Kinds = append(grp.Kinds, kind{Name: rtype.Kind, Comments: m.Comments})
-	}
-
-	return nil
-}
-
-func (g *generator) ensureAPIGroup(gv apiGroupVersion, importPath protogen.GoImportPath, pkg protogen.GoPackageName, dir string) (*groupInfo, error) {
-	grp, found := g.resources[gv]
-	if !found {
-		grp = &groupInfo{
-			Name:    gv.Group,
-			Version: gv.Version,
-
-			ImportPath:  importPath,
-			PackageName: pkg,
-			Directory:   dir,
-		}
-		g.resources[gv] = grp
-	} else if grp.ImportPath != importPath {
-		return nil, fmt.Errorf("resources from the same api group must share the same import path")
-	}
-
-	return grp, nil
-}
-
-func (g *generator) generateTypes(gp *protogen.Plugin) error {
-	for _, info := range g.resources {
-		f := gp.NewGeneratedFile(filepath.Join(info.Directory, "resource_types.gen.go"), info.ImportPath)
-
-		sort.Slice(info.Kinds, func(a, b int) bool {
-			return info.Kinds[a].Name < info.Kinds[b].Name
-		})
-
-		if err := typesTemplate.Execute(f, info); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-var (
-	typesTemplate = template.Must(template.New("types").Parse(`
-// Code generated by protoc-gen-resource-types. DO NOT EDIT.
-
-package {{.PackageName}}
-
-import (	
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	GroupName = "{{.Name}}"
-	Version = "{{.Version}}"
-
-{{range $kind := .Kinds}}
-	{{$kind.Name}}Kind = "{{$kind.Name}}"
-{{- end}}
-)
-
-var (
-{{range $kind := .Kinds}}
-	{{$kind.Name}}Type = &pbresource.Type{
- 		Group:        GroupName,
- 		GroupVersion: Version,
- 		Kind:         {{$kind.Name}}Kind,
- 	}
-{{end}}	
-)
-`))
-)
diff --git a/internal/resource/protoc-gen-resource-types/main.go b/internal/resource/protoc-gen-resource-types/main.go
deleted file mode 100644
index 26e5c8ab693c9..0000000000000
--- a/internal/resource/protoc-gen-resource-types/main.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package main
-
-import (
-	"flag"
-
-	"github.com/hashicorp/consul/internal/resource/protoc-gen-resource-types/internal/generate"
-	"google.golang.org/protobuf/compiler/protogen"
-	plugin "google.golang.org/protobuf/types/pluginpb"
-)
-
-var (
-	file = flag.String("file", "-", "where to load data from")
-)
-
-func main() {
-	flag.Parse()
-
-	protogen.Options{
-		ParamFunc: flag.CommandLine.Set,
-	}.Run(func(gp *protogen.Plugin) error {
-		gp.SupportedFeatures = uint64(plugin.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL)
-		return generate.Generate(gp)
-	})
-}
diff --git a/internal/resource/reaper/controller.go b/internal/resource/reaper/controller.go
deleted file mode 100644
index f8de86f92196e..0000000000000
--- a/internal/resource/reaper/controller.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package reaper
-
-import (
-	"context"
-	"time"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-)
-
-const (
-	statusKeyReaperController       = "consul.io/reaper-controller"
-	secondPassDelay                 = 30 * time.Second
-	conditionTypeFirstPassCompleted = "FirstPassCompleted"
-)
-
-// RegisterControllers registers controllers for the tombstone type.
-func RegisterControllers(mgr *controller.Manager) {
-	mgr.Register(reaperController())
-}
-
-func reaperController() controller.Controller {
-	return controller.ForType(resource.TypeV1Tombstone).
-		WithReconciler(newReconciler())
-}
-
-func newReconciler() *tombstoneReconciler {
-	return &tombstoneReconciler{
-		timeNow: time.Now,
-	}
-}
-
-type tombstoneReconciler struct {
-	// Testing shim
-	timeNow func() time.Time
-}
-
-// Deletes all owned (child) resources of an owner (parent) resource.
-//
-// The reconciliation for tombstones is split into two passes.
-// The first pass attempts to delete child resources created before the owner resource was deleted.
-// The second pass is run after a reasonable delay to delete child resources that may have been
-// created during or after the completion of the first pass.
-func (r *tombstoneReconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	rsp, err := rt.Client.Read(ctx, &pbresource.ReadRequest{Id: req.ID})
-	switch {
-	case status.Code(err) == codes.NotFound:
-		// tombstone not found. nothing to do
-		return nil
-	case err != nil:
-		// retry later
-		return err
-	}
-	res := rsp.Resource
-
-	var tombstone pbresource.Tombstone
-	if err := res.Data.UnmarshalTo(&tombstone); err != nil {
-		return err
-	}
-
-	firstPassCompletedOnEntry := isFirstPassCompleted(res)
-
-	// Corner case:
-	// Check secondPassDelay has elasped since first pass in cases where queued
-	// reconciliation requests are lost between the first and second pass
-	// (e.g. controller relocated to a different server due to raft leadership
-	// change).
-	if firstPassCompletedOnEntry && !r.secondPassDelayElapsed(res.Status[statusKeyReaperController]) {
-		return controller.RequeueAfter(secondPassDelay)
-	}
-
-	// Retrieve owner's children
-	listRsp, err := rt.Client.ListByOwner(ctx, &pbresource.ListByOwnerRequest{Owner: tombstone.Owner})
-	if err != nil {
-		return err
-	}
-
-	// Attempt to delete each child
-	for _, child := range listRsp.Resources {
-		_, err := rt.Client.Delete(ctx, &pbresource.DeleteRequest{Id: child.Id})
-		if err != nil {
-			return err
-		}
-	}
-
-	if firstPassCompletedOnEntry {
-		// we just did the second pass -> delete tombstone
-		_, err := rt.Client.Delete(ctx, &pbresource.DeleteRequest{Id: res.Id})
-		if err != nil {
-			// tombstone deletion failed, just retry
-			return err
-		}
-		// tombstone delete succeeded and reconciliation complete
-		return nil
-	} else {
-		// we just did the first pass -> queue up the second pass
-		_, err = rt.Client.WriteStatus(ctx, &pbresource.WriteStatusRequest{
-			Id:  res.Id,
-			Key: statusKeyReaperController,
-			Status: &pbresource.Status{
-				ObservedGeneration: res.Generation,
-				Conditions: []*pbresource.Condition{
-					{
-						Type:    conditionTypeFirstPassCompleted,
-						State:   pbresource.Condition_STATE_TRUE,
-						Reason:  "Success",
-						Message: "First pass of child resource deletion completed",
-					},
-				},
-			},
-		})
-		if err != nil {
-			return err
-		}
-		return controller.RequeueAfter(secondPassDelay)
-	}
-}
-
-func (r *tombstoneReconciler) secondPassDelayElapsed(status *pbresource.Status) bool {
-	firstPassTime := status.UpdatedAt.AsTime()
-	return firstPassTime.Add(secondPassDelay).Before(r.timeNow())
-}
-
-func isFirstPassCompleted(res *pbresource.Resource) bool {
-	if res.Status == nil {
-		return false
-	}
-
-	status, ok := res.Status[statusKeyReaperController]
-	if !ok {
-		return false
-	}
-
-	// First time through, first and second pass ahead of us
-	if len(status.Conditions) == 0 {
-		return false
-	}
-
-	// Single condition "FirstPassCompleted"
-	condition := status.Conditions[0]
-	return condition.State == pbresource.Condition_STATE_TRUE
-}
diff --git a/internal/resource/reaper/controller_test.go b/internal/resource/reaper/controller_test.go
deleted file mode 100644
index c06ccedab582d..0000000000000
--- a/internal/resource/reaper/controller_test.go
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package reaper
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestReconcile_ResourceWithNoChildren(t *testing.T) {
-	client := svctest.RunResourceService(t, demo.RegisterTypes)
-
-	// Seed the database with an artist.
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-	ctx := testutil.TestContext(t)
-	writeRsp, err := client.Write(ctx, &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	// Delete the artist to create a tombstone
-	_, err = client.Delete(ctx, &pbresource.DeleteRequest{Id: writeRsp.Resource.Id})
-	require.NoError(t, err)
-
-	// Retrieve tombstone
-	listRsp, err := client.List(ctx, &pbresource.ListRequest{
-		Type:    resource.TypeV1Tombstone,
-		Tenancy: writeRsp.Resource.Id.Tenancy,
-	})
-	require.NoError(t, err)
-	require.Len(t, listRsp.Resources, 1)
-	tombstone := listRsp.Resources[0]
-
-	// Verify reconcile does first pass and queues up for a second pass
-	rec := newReconciler()
-	runtime := controller.Runtime{
-		Client: client,
-		Logger: testutil.Logger(t),
-	}
-	req := controller.Request{ID: tombstone.Id}
-	require.ErrorIs(t, controller.RequeueAfterError(secondPassDelay), rec.Reconcile(ctx, runtime, req))
-
-	// Verify condition FirstPassCompleted is true
-	readRsp, err := client.Read(ctx, &pbresource.ReadRequest{Id: tombstone.Id})
-	require.NoError(t, err)
-	tombstone = readRsp.Resource
-	condition := tombstone.Status[statusKeyReaperController].Conditions[0]
-	require.Equal(t, conditionTypeFirstPassCompleted, condition.Type)
-	require.Equal(t, pbresource.Condition_STATE_TRUE, condition.State)
-
-	// Verify reconcile does second pass and tombstone is deleted
-	// Fake out time so elapsed time > secondPassDelay
-	rec.timeNow = func() time.Time { return time.Now().Add(secondPassDelay + time.Second) }
-	require.NoError(t, rec.Reconcile(ctx, runtime, req))
-	_, err = client.Read(ctx, &pbresource.ReadRequest{Id: tombstone.Id})
-	require.Error(t, err)
-	require.Equal(t, codes.NotFound.String(), status.Code(err).String())
-
-	// Reconcile again to verify no-op on an already deleted tombstone
-	require.NoError(t, rec.Reconcile(ctx, runtime, req))
-}
-
-func TestReconcile_ResourceWithChildren(t *testing.T) {
-	client := svctest.RunResourceService(t, demo.RegisterTypes)
-
-	// Seed the database with an artist
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-	ctx := testutil.TestContext(t)
-	writeRsp, err := client.Write(ctx, &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-	artist := writeRsp.Resource
-
-	// Create 3 albums owned by the artist
-	numAlbums := 3
-	for i := 0; i < numAlbums; i++ {
-		res, err = demo.GenerateV2Album(artist.Id)
-		require.NoError(t, err)
-		_, err := client.Write(ctx, &pbresource.WriteRequest{Resource: res})
-		require.NoError(t, err)
-	}
-
-	// Delete the artist to create a tombstone
-	_, err = client.Delete(ctx, &pbresource.DeleteRequest{Id: writeRsp.Resource.Id})
-	require.NoError(t, err)
-
-	// Retrieve the tombstone
-	listRsp, err := client.List(ctx, &pbresource.ListRequest{
-		Type:    resource.TypeV1Tombstone,
-		Tenancy: writeRsp.Resource.Id.Tenancy,
-	})
-	require.NoError(t, err)
-	require.Len(t, listRsp.Resources, 1)
-	tombstone := listRsp.Resources[0]
-
-	// Verify reconcile does first pass delete and queues up for a second pass
-	rec := newReconciler()
-	runtime := controller.Runtime{
-		Client: client,
-		Logger: testutil.Logger(t),
-	}
-	req := controller.Request{ID: tombstone.Id}
-	require.ErrorIs(t, controller.RequeueAfterError(secondPassDelay), rec.Reconcile(ctx, runtime, req))
-
-	// Verify 3 albums deleted
-	listRsp, err = client.List(ctx, &pbresource.ListRequest{
-		Type:    demo.TypeV2Album,
-		Tenancy: artist.Id.Tenancy,
-	})
-	require.NoError(t, err)
-	require.Empty(t, listRsp.Resources)
-
-	// Verify condition FirstPassCompleted is true
-	readRsp, err := client.Read(ctx, &pbresource.ReadRequest{Id: tombstone.Id})
-	require.NoError(t, err)
-	tombstone = readRsp.Resource
-	condition := tombstone.Status[statusKeyReaperController].Conditions[0]
-	require.Equal(t, conditionTypeFirstPassCompleted, condition.Type)
-	require.Equal(t, pbresource.Condition_STATE_TRUE, condition.State)
-
-	// Verify reconcile does second pass
-	// Fake out time so elapsed time > secondPassDelay
-	rec.timeNow = func() time.Time { return time.Now().Add(secondPassDelay + time.Second) }
-	require.NoError(t, rec.Reconcile(ctx, runtime, req))
-
-	// Verify artist tombstone deleted
-	_, err = client.Read(ctx, &pbresource.ReadRequest{Id: tombstone.Id})
-	require.Error(t, err)
-	require.Equal(t, codes.NotFound.String(), status.Code(err).String())
-
-	// Verify tombstones for 3 albums created
-	listRsp, err = client.List(ctx, &pbresource.ListRequest{
-		Type:    resource.TypeV1Tombstone,
-		Tenancy: artist.Id.Tenancy,
-	})
-	require.NoError(t, err)
-	require.Len(t, listRsp.Resources, numAlbums)
-}
-
-func TestReconcile_RequeueWithDelayWhenSecondPassDelayNotElapsed(t *testing.T) {
-	client := svctest.RunResourceService(t, demo.RegisterTypes)
-
-	// Seed the database with an artist.
-	res, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-	ctx := testutil.TestContext(t)
-	writeRsp, err := client.Write(ctx, &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-
-	// Delete the artist to create a tombstone
-	_, err = client.Delete(ctx, &pbresource.DeleteRequest{Id: writeRsp.Resource.Id})
-	require.NoError(t, err)
-
-	// Retrieve tombstone
-	listRsp, err := client.List(ctx, &pbresource.ListRequest{
-		Type:    resource.TypeV1Tombstone,
-		Tenancy: writeRsp.Resource.Id.Tenancy,
-	})
-	require.NoError(t, err)
-	require.Len(t, listRsp.Resources, 1)
-	tombstone := listRsp.Resources[0]
-
-	// Verify reconcile does first pass and queues up for a second pass
-	rec := newReconciler()
-	runtime := controller.Runtime{
-		Client: client,
-		Logger: testutil.Logger(t),
-	}
-	req := controller.Request{ID: tombstone.Id}
-	require.ErrorIs(t, controller.RequeueAfterError(secondPassDelay), rec.Reconcile(ctx, runtime, req))
-
-	// Verify condition FirstPassCompleted is true
-	readRsp, err := client.Read(ctx, &pbresource.ReadRequest{Id: tombstone.Id})
-	require.NoError(t, err)
-	tombstone = readRsp.Resource
-	condition := tombstone.Status[statusKeyReaperController].Conditions[0]
-	require.Equal(t, conditionTypeFirstPassCompleted, condition.Type)
-	require.Equal(t, pbresource.Condition_STATE_TRUE, condition.State)
-
-	// Verify requeued for second pass since secondPassDelay time has not elapsed
-	require.ErrorIs(t, controller.RequeueAfterError(secondPassDelay), rec.Reconcile(ctx, runtime, req))
-}
diff --git a/internal/resource/reference.go b/internal/resource/reference.go
deleted file mode 100644
index a2ff0588acf03..0000000000000
--- a/internal/resource/reference.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import "github.com/hashicorp/consul/proto-public/pbresource"
-
-// Reference returns a reference to the resource with the given ID.
-func Reference(id *pbresource.ID, section string) *pbresource.Reference {
-	return &pbresource.Reference{
-		Type:    id.Type,
-		Tenancy: id.Tenancy,
-		Name:    id.Name,
-		Section: section,
-	}
-}
-
-// IDFromReference returns a Reference converted into an ID. NOTE: the UID
-// field is not populated, and the Section field of a reference is dropped.
-func IDFromReference(ref *pbresource.Reference) *pbresource.ID {
-	return &pbresource.ID{
-		Type:    ref.Type,
-		Tenancy: ref.Tenancy,
-		Name:    ref.Name,
-	}
-}
-
-// ReferenceOrID is the common accessors shared by pbresource.Reference and
-// pbresource.ID.
-type ReferenceOrID interface {
-	GetType() *pbresource.Type
-	GetTenancy() *pbresource.Tenancy
-	GetName() string
-}
-
-var (
-	_ ReferenceOrID = (*pbresource.ID)(nil)
-	_ ReferenceOrID = (*pbresource.Reference)(nil)
-)
-
-func ReferenceFromReferenceOrID(ref ReferenceOrID) *pbresource.Reference {
-	switch x := ref.(type) {
-	case *pbresource.Reference:
-		return x
-	default:
-		return &pbresource.Reference{
-			Type:    ref.GetType(),
-			Tenancy: ref.GetTenancy(),
-			Name:    ref.GetName(),
-			Section: "",
-		}
-	}
-}
-
-func ReplaceType(typ *pbresource.Type, id *pbresource.ID) *pbresource.ID {
-	return &pbresource.ID{
-		Type:    typ,
-		Name:    id.Name,
-		Tenancy: id.Tenancy,
-	}
-}
diff --git a/internal/resource/refkey.go b/internal/resource/refkey.go
deleted file mode 100644
index 44f0765c206c0..0000000000000
--- a/internal/resource/refkey.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// ReferenceKey is the pointer-free representation of a ReferenceOrID
-// suitable for a go map key.
-type ReferenceKey struct {
-	GVK       string
-	Partition string // Tenancy.*
-	Namespace string // Tenancy.*
-	PeerName  string // Tenancy.*
-	Name      string
-}
-
-// String returns a string representation of the ReferenceKey. This should not
-// be relied upon nor parsed and is provided just for debugging and logging
-// reasons.
-//
-// This format should be aligned with IDToString and ReferenceToString.
-func (r ReferenceKey) String() string {
-	return fmt.Sprintf("%s/%s.%s.%s/%s",
-		r.GVK,
-		orDefault(r.Partition, "default"),
-		orDefault(r.PeerName, "local"),
-		orDefault(r.Namespace, "default"),
-		r.Name,
-	)
-}
-
-func (r ReferenceKey) GetTenancy() *pbresource.Tenancy {
-	return &pbresource.Tenancy{
-		Partition: r.Partition,
-		PeerName:  r.PeerName,
-		Namespace: r.Namespace,
-	}
-}
-
-// ToReference converts this back into a pbresource.ID.
-func (r ReferenceKey) ToID() *pbresource.ID {
-	return &pbresource.ID{
-		Type:    GVKToType(r.GVK),
-		Tenancy: r.GetTenancy(),
-		Name:    r.Name,
-	}
-}
-
-// ToReference converts this back into a pbresource.Reference.
-func (r ReferenceKey) ToReference() *pbresource.Reference {
-	return &pbresource.Reference{
-		Type:    GVKToType(r.GVK),
-		Tenancy: r.GetTenancy(),
-		Name:    r.Name,
-	}
-}
-
-func (r ReferenceKey) GoString() string { return r.String() }
-
-func NewReferenceKey(refOrID ReferenceOrID) ReferenceKey {
-	return ReferenceKey{
-		GVK:       ToGVK(refOrID.GetType()),
-		Partition: orDefault(refOrID.GetTenancy().GetPartition(), "default"),
-		Namespace: orDefault(refOrID.GetTenancy().GetNamespace(), "default"),
-		PeerName:  orDefault(refOrID.GetTenancy().GetPeerName(), "local"),
-		Name:      refOrID.GetName(),
-	}
-}
-
-func orDefault(v, def string) string {
-	if v == "" {
-		return def
-	}
-	return v
-}
-
-func GVKToType(gvk string) *pbresource.Type {
-	parts := strings.Split(gvk, ".")
-	if len(parts) != 3 {
-		panic("bad gvk")
-	}
-	return &pbresource.Type{
-		Group:        parts[0],
-		GroupVersion: parts[1],
-		Kind:         parts[2],
-	}
-}
diff --git a/internal/resource/refkey_test.go b/internal/resource/refkey_test.go
deleted file mode 100644
index 8c4b5eaf92b2f..0000000000000
--- a/internal/resource/refkey_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource_test
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestReferenceKey(t *testing.T) {
-	tenancy1 := &pbresource.Tenancy{}
-	tenancy1_actual := defaultTenancy()
-	tenancy2 := &pbresource.Tenancy{
-		Partition: "ap1",
-		Namespace: "ns-billing",
-		PeerName:  "peer-dc4",
-	}
-	tenancy3 := &pbresource.Tenancy{
-		Partition: "ap2",
-		Namespace: "ns-intern",
-		PeerName:  "peer-sea",
-	}
-
-	res1, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-	res1.Id.Tenancy = tenancy1
-
-	res2, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-	res2.Id.Tenancy = tenancy2
-
-	res3, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-	res3.Id.Tenancy = tenancy3
-
-	id1 := res1.Id
-	id2 := res2.Id
-	id3 := res3.Id
-
-	ref1 := resource.Reference(id1, "")
-	ref2 := resource.Reference(id2, "")
-	ref3 := resource.Reference(id3, "")
-
-	idRK1 := resource.NewReferenceKey(id1)
-	idRK2 := resource.NewReferenceKey(id2)
-	idRK3 := resource.NewReferenceKey(id3)
-
-	refRK1 := resource.NewReferenceKey(ref1)
-	refRK2 := resource.NewReferenceKey(ref2)
-	refRK3 := resource.NewReferenceKey(ref3)
-
-	require.Equal(t, idRK1, refRK1)
-	require.Equal(t, idRK2, refRK2)
-	require.Equal(t, idRK3, refRK3)
-
-	prototest.AssertDeepEqual(t, tenancy1_actual, idRK1.GetTenancy())
-	prototest.AssertDeepEqual(t, tenancy2, idRK2.GetTenancy())
-	prototest.AssertDeepEqual(t, tenancy3, idRK3.GetTenancy())
-
-	// Now that we tested the defaulting, swap out the tenancy in the id so
-	// that the comparisons work.
-	id1.Tenancy = tenancy1_actual
-	ref1.Tenancy = tenancy1_actual
-
-	prototest.AssertDeepEqual(t, id1, idRK1.ToID())
-	prototest.AssertDeepEqual(t, id2, idRK2.ToID())
-	prototest.AssertDeepEqual(t, id3, idRK3.ToID())
-
-	prototest.AssertDeepEqual(t, ref1, refRK1.ToReference())
-	prototest.AssertDeepEqual(t, ref2, refRK2.ToReference())
-	prototest.AssertDeepEqual(t, ref3, refRK3.ToReference())
-}
-
-func defaultTenancy() *pbresource.Tenancy {
-	return &pbresource.Tenancy{
-		Partition: "default",
-		Namespace: "default",
-		PeerName:  "local",
-	}
-}
diff --git a/internal/resource/registry.go b/internal/resource/registry.go
deleted file mode 100644
index 2b004b6b4c0ca..0000000000000
--- a/internal/resource/registry.go
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"errors"
-	"fmt"
-	"regexp"
-	"strings"
-	"sync"
-
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-var (
-	groupRegexp        = regexp.MustCompile(`^[a-z][a-z\d_]+$`)
-	groupVersionRegexp = regexp.MustCompile(`^v([a-z\d]+)?\d$`)
-	kindRegexp         = regexp.MustCompile(`^[A-Z][A-Za-z\d]+$`)
-	// Track resource types that are allowed to have an undefined scope. These are usually
-	// non-customer facing or internal types.
-	undefinedScopeAllowed = map[string]bool{
-		storage.UnversionedTypeFrom(TypeV1Tombstone).String(): true,
-	}
-)
-
-func isUndefinedScopeAllowed(t *pbresource.Type) bool {
-	return undefinedScopeAllowed[storage.UnversionedTypeFrom(t).String()]
-}
-
-type Registry interface {
-	// Register the given resource type and its hooks.
-	Register(reg Registration)
-
-	// Resolve the given resource type and its hooks.
-	Resolve(typ *pbresource.Type) (reg Registration, ok bool)
-
-	Types() []Registration
-}
-
-type Registration struct {
-	// Type is the GVK of the resource type.
-	Type *pbresource.Type
-
-	// Proto is the resource's protobuf message type.
-	Proto proto.Message
-
-	// ACLs are hooks called to perform authorization on RPCs.
-	// The hooks can assume that Validate has been called.
-	ACLs *ACLHooks
-
-	// Validate is called to structurally validate the resource (e.g.
-	// check for required fields). Validate can assume that Mutate
-	// has been called.
-	Validate func(*pbresource.Resource) error
-
-	// Mutate is called to fill out any autogenerated fields (e.g. UUIDs) or
-	// apply defaults before validation. Mutate can assume that
-	// Resource.ID is populated and has non-empty tenancy fields. This does
-	// not mean those tenancy fields actually exist.
-	Mutate func(*pbresource.Resource) error
-
-	// Scope describes the tenancy scope of a resource.
-	Scope Scope
-}
-
-var ErrNeedData = errors.New("authorization check requires resource data")
-
-type ACLHooks struct {
-	// Read is used to authorize Read RPCs and to filter results in List
-	// RPCs.
-	//
-	// It can be called an ID and possibly a Resource. The check will first
-	// attempt to use the ID and if the hook returns ErrNeedData, then the
-	// check will be deferred until the data is fetched from the storage layer.
-	//
-	// If it is omitted, `operator:read` permission is assumed.
-	Read func(acl.Authorizer, *acl.AuthorizerContext, *pbresource.ID, *pbresource.Resource) error
-
-	// Write is used to authorize Write and Delete RPCs.
-	//
-	// If it is omitted, `operator:write` permission is assumed.
-	Write func(acl.Authorizer, *acl.AuthorizerContext, *pbresource.Resource) error
-
-	// List is used to authorize List RPCs.
-	//
-	// If it is omitted, we only filter the results using Read.
-	List func(acl.Authorizer, *acl.AuthorizerContext) error
-}
-
-// Resource type registry
-type TypeRegistry struct {
-	// registrations keyed by GVK
-	registrations map[string]Registration
-	lock          sync.RWMutex
-}
-
-func NewRegistry() Registry {
-	registry := &TypeRegistry{registrations: make(map[string]Registration)}
-	// Tombstone is an implicitly registered type since it is used to implement
-	// the cascading deletion of resources. ACLs end up being defaulted to
-	// operator:<read,write>. It is useful to note that tombstone creation
-	// does not get routed through the resource service and bypasses ACLs
-	// as part of the Delete endpoint.
-	registry.Register(Registration{
-		Type:  TypeV1Tombstone,
-		Proto: &pbresource.Tombstone{},
-	})
-	return registry
-}
-
-func (r *TypeRegistry) Register(registration Registration) {
-	typ := registration.Type
-	if typ.Group == "" || typ.GroupVersion == "" || typ.Kind == "" {
-		panic("type field(s) cannot be empty")
-	}
-
-	switch {
-	case !groupRegexp.MatchString(typ.Group):
-		panic(fmt.Sprintf("Type.Group must be in snake_case. Got: %q", typ.Group))
-	case !groupVersionRegexp.MatchString(typ.GroupVersion):
-		panic(fmt.Sprintf("Type.GroupVersion must be lowercase, start with `v`, and end with a number (e.g. `v2` or `v2beta1`). Got: %q", typ.Group))
-	case !kindRegexp.MatchString(typ.Kind):
-		panic(fmt.Sprintf("Type.Kind must be in PascalCase. Got: %q", typ.Kind))
-	}
-
-	if registration.Proto == nil {
-		panic("Proto field is required.")
-	}
-
-	if registration.Scope == ScopeUndefined && !isUndefinedScopeAllowed(typ) {
-		panic(fmt.Sprintf("scope required for %s. Got: %q", typ, registration.Scope))
-	}
-
-	r.lock.Lock()
-	defer r.lock.Unlock()
-
-	key := ToGVK(registration.Type)
-	if _, ok := r.registrations[key]; ok {
-		panic(fmt.Sprintf("resource type %s already registered", key))
-	}
-
-	// set default acl hooks for those not provided
-	if registration.ACLs == nil {
-		registration.ACLs = &ACLHooks{}
-	}
-	if registration.ACLs.Read == nil {
-		registration.ACLs.Read = func(authz acl.Authorizer, authzContext *acl.AuthorizerContext, id *pbresource.ID, _ *pbresource.Resource) error {
-			return authz.ToAllowAuthorizer().OperatorReadAllowed(authzContext)
-		}
-	}
-	if registration.ACLs.Write == nil {
-		registration.ACLs.Write = func(authz acl.Authorizer, authzContext *acl.AuthorizerContext, id *pbresource.Resource) error {
-			return authz.ToAllowAuthorizer().OperatorWriteAllowed(authzContext)
-		}
-	}
-	if registration.ACLs.List == nil {
-		registration.ACLs.List = func(authz acl.Authorizer, authzContext *acl.AuthorizerContext) error {
-			return authz.ToAllowAuthorizer().OperatorReadAllowed(&acl.AuthorizerContext{})
-		}
-	}
-
-	// default validation to a no-op
-	if registration.Validate == nil {
-		registration.Validate = func(resource *pbresource.Resource) error { return nil }
-	}
-
-	// default mutate to a no-op
-	if registration.Mutate == nil {
-		registration.Mutate = func(resource *pbresource.Resource) error { return nil }
-	}
-
-	r.registrations[key] = registration
-}
-
-func (r *TypeRegistry) Resolve(typ *pbresource.Type) (reg Registration, ok bool) {
-	r.lock.RLock()
-	defer r.lock.RUnlock()
-
-	if registration, ok := r.registrations[ToGVK(typ)]; ok {
-		return registration, true
-	}
-	return Registration{}, false
-}
-
-func (r *TypeRegistry) Types() []Registration {
-	r.lock.RLock()
-	defer r.lock.RUnlock()
-
-	types := make([]Registration, 0, len(r.registrations))
-	for _, v := range r.registrations {
-		types = append(types, v)
-	}
-	return types
-}
-
-func ToGVK(resourceType *pbresource.Type) string {
-	return fmt.Sprintf("%s.%s.%s", resourceType.Group, resourceType.GroupVersion, resourceType.Kind)
-}
-
-func ParseGVK(gvk string) (*pbresource.Type, error) {
-	parts := strings.Split(gvk, ".")
-	if len(parts) != 3 {
-		return nil, fmt.Errorf("GVK string must be in the form <Group>.<GroupVersion>.<Kind>, got: %s", gvk)
-	}
-	return &pbresource.Type{
-		Group:        parts[0],
-		GroupVersion: parts[1],
-		Kind:         parts[2],
-	}, nil
-}
diff --git a/internal/resource/registry_test.go b/internal/resource/registry_test.go
deleted file mode 100644
index 8ecfcd7661d17..0000000000000
--- a/internal/resource/registry_test.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource_test
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/grpc-external/testutils"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbdemov1 "github.com/hashicorp/consul/proto/private/pbdemo/v1"
-	demov2 "github.com/hashicorp/consul/proto/private/pbdemo/v2"
-)
-
-func TestRegister(t *testing.T) {
-	r := resource.NewRegistry()
-
-	// register success
-	reg := resource.Registration{
-		Type:  demo.TypeV2Artist,
-		Proto: &demov2.Artist{},
-		Scope: resource.ScopeNamespace,
-	}
-	r.Register(reg)
-	actual, ok := r.Resolve(demo.TypeV2Artist)
-	require.True(t, ok)
-	require.True(t, proto.Equal(demo.TypeV2Artist, actual.Type))
-
-	// register existing should panic
-	require.PanicsWithValue(t, "resource type demo.v2.Artist already registered", func() {
-		r.Register(reg)
-	})
-
-	// register success when scope undefined and type exempt from scope
-	// skip: can't test this because tombstone type is registered as part of NewRegistry()
-}
-
-func TestRegister_Defaults(t *testing.T) {
-	r := resource.NewRegistry()
-	r.Register(resource.Registration{
-		Type:  demo.TypeV2Artist,
-		Proto: &demov2.Artist{},
-		Scope: resource.ScopeNamespace,
-	})
-	artist, err := demo.GenerateV2Artist()
-	require.NoError(t, err)
-
-	reg, ok := r.Resolve(demo.TypeV2Artist)
-	require.True(t, ok)
-
-	// verify default read hook requires operator:read
-	require.NoError(t, reg.ACLs.Read(testutils.ACLOperatorRead(t), nil, artist.Id, nil))
-	require.True(t, acl.IsErrPermissionDenied(reg.ACLs.Read(testutils.ACLNoPermissions(t), nil, artist.Id, nil)))
-
-	// verify default write hook requires operator:write
-	require.NoError(t, reg.ACLs.Write(testutils.ACLOperatorWrite(t), nil, artist))
-	require.True(t, acl.IsErrPermissionDenied(reg.ACLs.Write(testutils.ACLNoPermissions(t), nil, artist)))
-
-	// verify default list hook requires operator:read
-	require.NoError(t, reg.ACLs.List(testutils.ACLOperatorRead(t), nil))
-	require.True(t, acl.IsErrPermissionDenied(reg.ACLs.List(testutils.ACLNoPermissions(t), nil)))
-
-	// verify default validate is a no-op
-	require.NoError(t, reg.Validate(nil))
-
-	// verify default mutate is a no-op
-	require.NoError(t, reg.Mutate(nil))
-}
-
-func TestNewRegistry(t *testing.T) {
-	r := resource.NewRegistry()
-
-	// verify tombstone type registered implicitly
-	_, ok := r.Resolve(resource.TypeV1Tombstone)
-	require.True(t, ok)
-}
-
-func TestResolve(t *testing.T) {
-	r := resource.NewRegistry()
-
-	// not found
-	_, ok := r.Resolve(demo.TypeV1Album)
-	assert.False(t, ok)
-
-	// found
-	r.Register(resource.Registration{
-		Type:  demo.TypeV1Album,
-		Proto: &pbdemov1.Album{},
-		Scope: resource.ScopeNamespace,
-	})
-	registration, ok := r.Resolve(demo.TypeV1Album)
-	assert.True(t, ok)
-	assert.Equal(t, registration.Type, demo.TypeV1Album)
-}
-
-func TestRegister_TypeValidation(t *testing.T) {
-	registry := resource.NewRegistry()
-
-	testCases := map[string]struct {
-		fn    func(*pbresource.Type)
-		valid bool
-	}{
-		"Valid": {valid: true},
-		"Group empty": {
-			fn:    func(t *pbresource.Type) { t.Group = "" },
-			valid: false,
-		},
-		"Group PascalCase": {
-			fn:    func(t *pbresource.Type) { t.Group = "Foo" },
-			valid: false,
-		},
-		"Group kebab-case": {
-			fn:    func(t *pbresource.Type) { t.Group = "foo-bar" },
-			valid: false,
-		},
-		"Group snake_case": {
-			fn:    func(t *pbresource.Type) { t.Group = "foo_bar" },
-			valid: true,
-		},
-		"GroupVersion empty": {
-			fn:    func(t *pbresource.Type) { t.GroupVersion = "" },
-			valid: false,
-		},
-		"GroupVersion snake_case": {
-			fn:    func(t *pbresource.Type) { t.GroupVersion = "v_1" },
-			valid: false,
-		},
-		"GroupVersion kebab-case": {
-			fn:    func(t *pbresource.Type) { t.GroupVersion = "v-1" },
-			valid: false,
-		},
-		"GroupVersion no leading v": {
-			fn:    func(t *pbresource.Type) { t.GroupVersion = "1" },
-			valid: false,
-		},
-		"GroupVersion no trailing number": {
-			fn:    func(t *pbresource.Type) { t.GroupVersion = "OnePointOh" },
-			valid: false,
-		},
-		"Kind PascalCase with numbers": {
-			fn:    func(t *pbresource.Type) { t.Kind = "Number1" },
-			valid: true,
-		},
-		"Kind camelCase": {
-			fn:    func(t *pbresource.Type) { t.Kind = "barBaz" },
-			valid: false,
-		},
-		"Kind snake_case": {
-			fn:    func(t *pbresource.Type) { t.Kind = "bar_baz" },
-			valid: false,
-		},
-		"Kind empty": {
-			fn:    func(t *pbresource.Type) { t.Kind = "" },
-			valid: false,
-		},
-	}
-	for desc, tc := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			reg := func() {
-				typ := &pbresource.Type{
-					Group:        "foo",
-					GroupVersion: "v1",
-					Kind:         "Bar",
-				}
-				if tc.fn != nil {
-					tc.fn(typ)
-				}
-				registry.Register(resource.Registration{
-					Type: typ,
-					// Just pass anything since proto is a required field.
-					Proto: &pbdemov1.Artist{},
-					// Scope is also required
-					Scope: resource.ScopeNamespace,
-				})
-			}
-
-			if tc.valid {
-				require.NotPanics(t, reg)
-			} else {
-				require.Panics(t, reg)
-			}
-		})
-	}
-}
diff --git a/internal/resource/resourcetest/builder.go b/internal/resource/resourcetest/builder.go
deleted file mode 100644
index 3de836a71db34..0000000000000
--- a/internal/resource/resourcetest/builder.go
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resourcetest
-
-import (
-	"context"
-	"strings"
-
-	"github.com/oklog/ulid/v2"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-)
-
-type resourceBuilder struct {
-	resource    *pbresource.Resource
-	statuses    map[string]*pbresource.Status
-	dontCleanup bool
-}
-
-func Resource(rtype *pbresource.Type, name string) *resourceBuilder {
-	return &resourceBuilder{
-		resource: &pbresource.Resource{
-			Id: &pbresource.ID{
-				Type: &pbresource.Type{
-					Group:        rtype.Group,
-					GroupVersion: rtype.GroupVersion,
-					Kind:         rtype.Kind,
-				},
-				Name: name,
-			},
-		},
-	}
-}
-
-func ResourceID(id *pbresource.ID) *resourceBuilder {
-	return &resourceBuilder{
-		resource: &pbresource.Resource{
-			Id: id,
-		},
-	}
-}
-
-func (b *resourceBuilder) WithTenancy(tenant *pbresource.Tenancy) *resourceBuilder {
-	b.resource.Id.Tenancy = tenant
-	return b
-}
-
-func (b *resourceBuilder) WithData(t T, data protoreflect.ProtoMessage) *resourceBuilder {
-	t.Helper()
-
-	anyData, err := anypb.New(data)
-	require.NoError(t, err)
-	b.resource.Data = anyData
-	return b
-}
-
-func (b *resourceBuilder) WithMeta(key string, value string) *resourceBuilder {
-	if b.resource.Metadata == nil {
-		b.resource.Metadata = make(map[string]string)
-	}
-
-	b.resource.Metadata[key] = value
-	return b
-}
-
-func (b *resourceBuilder) WithOwner(id *pbresource.ID) *resourceBuilder {
-	b.resource.Owner = id
-	return b
-}
-
-func (b *resourceBuilder) WithStatus(key string, status *pbresource.Status) *resourceBuilder {
-	if b.statuses == nil {
-		b.statuses = make(map[string]*pbresource.Status)
-	}
-	b.statuses[key] = status
-	return b
-}
-
-func (b *resourceBuilder) WithoutCleanup() *resourceBuilder {
-	b.dontCleanup = true
-	return b
-}
-
-func (b *resourceBuilder) WithGeneration(gen string) *resourceBuilder {
-	b.resource.Generation = gen
-	return b
-}
-
-func (b *resourceBuilder) Build() *pbresource.Resource {
-	// clone the resource so we can add on status information
-	res := proto.Clone(b.resource).(*pbresource.Resource)
-
-	// fill in the generation if empty to make it look like
-	// a real managed resource
-	if res.Generation == "" {
-		res.Generation = ulid.Make().String()
-	}
-
-	// Now create the status map
-	res.Status = make(map[string]*pbresource.Status)
-	for key, original := range b.statuses {
-		status := &pbresource.Status{
-			ObservedGeneration: res.Generation,
-			Conditions:         original.Conditions,
-		}
-		res.Status[key] = status
-	}
-
-	return res
-}
-
-func (b *resourceBuilder) ID() *pbresource.ID {
-	return b.resource.Id
-}
-
-func (b *resourceBuilder) Reference(section string) *pbresource.Reference {
-	return resource.Reference(b.ID(), section)
-}
-
-func (b *resourceBuilder) ReferenceNoSection() *pbresource.Reference {
-	return resource.Reference(b.ID(), "")
-}
-
-func (b *resourceBuilder) Write(t T, client pbresource.ResourceServiceClient) *pbresource.Resource {
-	t.Helper()
-
-	var ctx context.Context
-	rtestClient, ok := client.(*Client)
-	if ok {
-		ctx = rtestClient.Context(t)
-	} else {
-		ctx = testutil.TestContext(t)
-		rtestClient = NewClient(client)
-	}
-
-	res := b.resource
-
-	var rsp *pbresource.WriteResponse
-	var err error
-
-	// Retry any writes where the error is a UID mismatch and the UID was not specified. This is indicative
-	// of using a follower to rewrite an object who is not perfectly in-sync with the leader.
-	retry.Run(t, func(r *retry.R) {
-		rsp, err = client.Write(ctx, &pbresource.WriteRequest{
-			Resource: res,
-		})
-
-		if err == nil || res.Id.Uid != "" || status.Code(err) != codes.FailedPrecondition {
-			if err != nil {
-				t.Logf("write saw error: %v", err)
-			}
-			return
-		}
-
-		if strings.Contains(err.Error(), storage.ErrWrongUid.Error()) {
-			r.Fatalf("resource write failed due to uid mismatch - most likely a transient issue when talking to a non-leader")
-		} else {
-			// other errors are unexpected and should cause an immediate failure
-			r.Stop(err)
-		}
-	})
-
-	require.NoError(t, err)
-	require.NotNil(t, rsp)
-
-	if !b.dontCleanup {
-		id := proto.Clone(rsp.Resource.Id).(*pbresource.ID)
-		id.Uid = ""
-		t.Cleanup(func() {
-			rtestClient.MustDelete(t, id)
-		})
-	}
-
-	if len(b.statuses) == 0 {
-		return rsp.Resource
-	}
-
-	for key, original := range b.statuses {
-		status := &pbresource.Status{
-			ObservedGeneration: rsp.Resource.Generation,
-			Conditions:         original.Conditions,
-		}
-		_, err := client.WriteStatus(ctx, &pbresource.WriteStatusRequest{
-			Id:     rsp.Resource.Id,
-			Key:    key,
-			Status: status,
-		})
-		require.NoError(t, err)
-	}
-
-	readResp, err := client.Read(ctx, &pbresource.ReadRequest{
-		Id: rsp.Resource.Id,
-	})
-
-	require.NoError(t, err)
-
-	return readResp.Resource
-}
diff --git a/internal/resource/resourcetest/client.go b/internal/resource/resourcetest/client.go
deleted file mode 100644
index 8983a858ac87b..0000000000000
--- a/internal/resource/resourcetest/client.go
+++ /dev/null
@@ -1,302 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resourcetest
-
-import (
-	"context"
-	"fmt"
-	"math/rand"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/status"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-)
-
-type Client struct {
-	pbresource.ResourceServiceClient
-
-	timeout time.Duration
-	wait    time.Duration
-	token   string
-}
-
-func NewClient(client pbresource.ResourceServiceClient) *Client {
-	return NewClientWithACLToken(client, "")
-}
-
-func NewClientWithACLToken(client pbresource.ResourceServiceClient, token string) *Client {
-	return &Client{
-		ResourceServiceClient: client,
-		timeout:               7 * time.Second,
-		wait:                  25 * time.Millisecond,
-		token:                 token,
-	}
-}
-
-func (client *Client) SetRetryerConfig(timeout time.Duration, wait time.Duration) {
-	client.timeout = timeout
-	client.wait = wait
-}
-
-func (client *Client) retry(t T, fn func(r *retry.R)) {
-	t.Helper()
-	retryer := &retry.Timer{Timeout: client.timeout, Wait: client.wait}
-	retry.RunWith(retryer, t, fn)
-}
-
-func (client *Client) PublishResources(t T, resources []*pbresource.Resource) {
-	ctx := client.Context(t)
-
-	// Randomize the order of insertion. Generally insertion order shouldn't matter as the
-	// controllers should eventually converge on the desired state. The exception to this
-	// is that you cannot insert resources with owner refs before the resource they are
-	// owned by or insert a resource into a non-default tenant before that tenant exists.
-	rand.Shuffle(len(resources), func(i, j int) {
-		temp := resources[i]
-		resources[i] = resources[j]
-		resources[j] = temp
-	})
-
-	// This slice will be used to track the resources actually published each round. When
-	// a resource with an owner ID is encountered we will not attempt to write but defer it
-	// to the next round of publishing
-	var written []*pbresource.ID
-
-	for len(resources) > 0 {
-		var left []*pbresource.Resource
-		published := 0
-		for _, res := range resources {
-
-			// check that any owner references would be satisfied
-			if res.Owner != nil {
-				found := slices.ContainsFunc(written, func(id *pbresource.ID) bool {
-					return resource.EqualID(res.Owner, id)
-				})
-
-				// the owner hasn't yet been published then we cannot publish this resource
-				if !found {
-					left = append(left, res)
-					continue
-				}
-			}
-
-			t.Logf("Writing resource %s with type %s", res.Id.Name, resource.ToGVK(res.Id.Type))
-			rsp, err := client.Write(ctx, &pbresource.WriteRequest{
-				Resource: res,
-			})
-			require.NoError(t, err)
-
-			id := rsp.Resource.Id
-			t.Cleanup(func() {
-				client.MustDelete(t, id)
-			})
-
-			// track the number of resources published
-			published += 1
-			written = append(written, res.Id)
-		}
-
-		// the next round only has this subset of resources to attempt writing
-		resources = left
-
-		// if we didn't publish any resources this round then nothing would
-		// enable us to do so by iterating again so we break to prevent infinite
-		// loooping.
-		if published == 0 {
-			break
-		}
-	}
-
-	require.Empty(t, resources, "Could not publish all resources - some resources have invalid owner references")
-}
-
-func (client *Client) Context(t T) context.Context {
-	ctx := testutil.TestContext(t)
-
-	if client.token != "" {
-		md := metadata.New(map[string]string{
-			"x-consul-token": client.token,
-		})
-		ctx = metadata.NewOutgoingContext(ctx, md)
-	}
-
-	return ctx
-}
-
-func (client *Client) RequireResourceNotFound(t T, id *pbresource.ID) {
-	t.Helper()
-
-	rsp, err := client.Read(client.Context(t), &pbresource.ReadRequest{Id: id})
-	require.Error(t, err)
-	require.Equal(t, codes.NotFound, status.Code(err))
-	require.Nil(t, rsp)
-}
-
-func (client *Client) RequireResourceExists(t T, id *pbresource.ID) *pbresource.Resource {
-	t.Helper()
-
-	rsp, err := client.Read(client.Context(t), &pbresource.ReadRequest{Id: id})
-	require.NoError(t, err, "error reading %s with type %s", id.Name, resource.ToGVK(id.Type))
-	require.NotNil(t, rsp)
-	return rsp.Resource
-}
-
-func (client *Client) RequireVersionUnchanged(t T, id *pbresource.ID, version string) *pbresource.Resource {
-	t.Helper()
-
-	res := client.RequireResourceExists(t, id)
-	RequireVersionUnchanged(t, res, version)
-	return res
-}
-
-func (client *Client) RequireVersionChanged(t T, id *pbresource.ID, version string) *pbresource.Resource {
-	t.Helper()
-
-	res := client.RequireResourceExists(t, id)
-	RequireVersionChanged(t, res, version)
-	return res
-}
-
-func (client *Client) RequireStatusCondition(t T, id *pbresource.ID, statusKey string, condition *pbresource.Condition) *pbresource.Resource {
-	t.Helper()
-
-	res := client.RequireResourceExists(t, id)
-	RequireStatusCondition(t, res, statusKey, condition)
-	return res
-}
-
-func (client *Client) RequireStatusConditionForCurrentGen(t T, id *pbresource.ID, statusKey string, condition *pbresource.Condition) *pbresource.Resource {
-	t.Helper()
-
-	res := client.RequireResourceExists(t, id)
-	RequireStatusConditionForCurrentGen(t, res, statusKey, condition)
-	return res
-}
-
-func (client *Client) RequireStatusConditionsForCurrentGen(t T, id *pbresource.ID, statusKey string, conditions []*pbresource.Condition) *pbresource.Resource {
-	t.Helper()
-
-	res := client.RequireResourceExists(t, id)
-	for _, condition := range conditions {
-		RequireStatusConditionForCurrentGen(t, res, statusKey, condition)
-	}
-	return res
-}
-
-func (client *Client) RequireResourceMeta(t T, id *pbresource.ID, key string, value string) *pbresource.Resource {
-	t.Helper()
-
-	res := client.RequireResourceExists(t, id)
-	RequireResourceMeta(t, res, key, value)
-	return res
-}
-
-func (client *Client) RequireReconciledCurrentGen(t T, id *pbresource.ID, statusKey string) *pbresource.Resource {
-	t.Helper()
-
-	res := client.RequireResourceExists(t, id)
-	RequireReconciledCurrentGen(t, res, statusKey)
-	return res
-}
-
-func (client *Client) WaitForReconciliation(t T, id *pbresource.ID, statusKey string) *pbresource.Resource {
-	t.Helper()
-
-	var res *pbresource.Resource
-
-	client.retry(t, func(r *retry.R) {
-		res = client.RequireReconciledCurrentGen(r, id, statusKey)
-	})
-
-	return res
-}
-
-func (client *Client) WaitForStatusCondition(t T, id *pbresource.ID, statusKey string, condition *pbresource.Condition) *pbresource.Resource {
-	t.Helper()
-
-	var res *pbresource.Resource
-	client.retry(t, func(r *retry.R) {
-		res = client.RequireStatusConditionForCurrentGen(r, id, statusKey, condition)
-	})
-
-	return res
-}
-
-func (client *Client) WaitForStatusConditions(t T, id *pbresource.ID, statusKey string, conditions ...*pbresource.Condition) *pbresource.Resource {
-	t.Helper()
-
-	var res *pbresource.Resource
-	client.retry(t, func(r *retry.R) {
-		res = client.RequireStatusConditionsForCurrentGen(r, id, statusKey, conditions)
-	})
-
-	return res
-}
-
-func (client *Client) WaitForNewVersion(t T, id *pbresource.ID, version string) *pbresource.Resource {
-	t.Helper()
-
-	var res *pbresource.Resource
-	client.retry(t, func(r *retry.R) {
-		res = client.RequireVersionChanged(r, id, version)
-	})
-	return res
-}
-
-func (client *Client) WaitForResourceState(t T, id *pbresource.ID, verify func(T, *pbresource.Resource)) *pbresource.Resource {
-	t.Helper()
-
-	var res *pbresource.Resource
-	client.retry(t, func(r *retry.R) {
-		res = client.RequireResourceExists(r, id)
-		verify(r, res)
-	})
-
-	return res
-}
-
-func (client *Client) WaitForDeletion(t T, id *pbresource.ID) {
-	t.Helper()
-
-	client.retry(t, func(r *retry.R) {
-		client.RequireResourceNotFound(r, id)
-	})
-}
-
-// ResolveResourceID will read the specified resource and returns its full ID.
-// This is mainly useful to get the ID with the Uid filled out.
-func (client *Client) ResolveResourceID(t T, id *pbresource.ID) *pbresource.ID {
-	t.Helper()
-
-	return client.RequireResourceExists(t, id).Id
-}
-
-func (client *Client) MustDelete(t T, id *pbresource.ID) {
-	t.Helper()
-	ctx := client.Context(t)
-
-	client.retry(t, func(r *retry.R) {
-		_, err := client.Delete(ctx, &pbresource.DeleteRequest{Id: id})
-		if status.Code(err) == codes.NotFound {
-			return
-		}
-
-		// codes.Aborted indicates a CAS failure and that the delete request should
-		// be retried. Anything else should be considered an unrecoverable error.
-		if err != nil && status.Code(err) != codes.Aborted {
-			r.Stop(fmt.Errorf("failed to delete the resource: %w", err))
-			return
-		}
-
-		require.NoError(r, err)
-	})
-}
diff --git a/internal/resource/resourcetest/decode.go b/internal/resource/resourcetest/decode.go
deleted file mode 100644
index 109ad39ceb753..0000000000000
--- a/internal/resource/resourcetest/decode.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resourcetest
-
-import (
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func MustDecode[Tp proto.Message](t T, res *pbresource.Resource) *resource.DecodedResource[Tp] {
-	dec, err := resource.Decode[Tp](res)
-	require.NoError(t, err)
-	return dec
-}
diff --git a/internal/resource/resourcetest/fs.go b/internal/resource/resourcetest/fs.go
deleted file mode 100644
index a31ac0f10c4b7..0000000000000
--- a/internal/resource/resourcetest/fs.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resourcetest
-
-import (
-	"fmt"
-	"io/fs"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/encoding/protojson"
-)
-
-// ParseResourcesFromFilesystem will walk the filesystem at the given path
-// and parse all files as protobuf/JSON resources.
-func ParseResourcesFromFilesystem(t T, files fs.FS, path string) []*pbresource.Resource {
-	t.Helper()
-
-	var resources []*pbresource.Resource
-	err := fs.WalkDir(files, path, func(fpath string, dent fs.DirEntry, _ error) error {
-		if dent.IsDir() {
-			return nil
-		}
-
-		data, err := fs.ReadFile(files, fpath)
-		if err != nil {
-			return err
-		}
-
-		var res pbresource.Resource
-		err = protojson.Unmarshal(data, &res)
-		if err != nil {
-			return fmt.Errorf("error decoding data from %s: %w", fpath, err)
-		}
-
-		resources = append(resources, &res)
-		return nil
-	})
-
-	require.NoError(t, err)
-	return resources
-}
diff --git a/internal/resource/resourcetest/require.go b/internal/resource/resourcetest/require.go
deleted file mode 100644
index b57bab8b2e3a2..0000000000000
--- a/internal/resource/resourcetest/require.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resourcetest
-
-import (
-	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/testing/protocmp"
-)
-
-// CompareErrorString is a helper to generate a custom go-cmp comparer method
-// that will perform an equality check on the error message. This is mainly
-// useful to get around not being able to see unexported data within errors.
-func CompareErrorString[T error]() cmp.Option {
-	return cmp.Comparer(func(e1, e2 T) bool {
-		return e1.Error() == e2.Error()
-	})
-}
-
-// default comparers for known types that don't play well with go-cmp
-var comparers = []cmp.Option{
-	CompareErrorString[resource.ConstError](),
-}
-
-// RequireError is useful for asserting that some chained multierror contains a specific error.
-func RequireError[E error](t T, err error, expected E, opts ...cmp.Option) {
-	t.Helper()
-
-	var actual E
-	require.ErrorAs(t, err, &actual)
-
-	opts = append(opts, comparers...)
-	prototest.AssertDeepEqual(t, expected, actual, opts...)
-}
-
-func RequireVersionUnchanged(t T, res *pbresource.Resource, version string) {
-	t.Helper()
-	require.Equal(t, version, res.Version)
-}
-
-func RequireVersionChanged(t T, res *pbresource.Resource, version string) {
-	t.Helper()
-	require.NotEqual(t, version, res.Version)
-}
-
-func RequireStatusCondition(t T, res *pbresource.Resource, statusKey string, condition *pbresource.Condition) {
-	t.Helper()
-	require.NotNil(t, res.Status)
-	status, found := res.Status[statusKey]
-	require.True(t, found)
-	prototest.AssertContainsElement(t, status.Conditions, condition)
-}
-
-func RequireStatusConditionForCurrentGen(t T, res *pbresource.Resource, statusKey string, condition *pbresource.Condition) {
-	t.Helper()
-	require.NotNil(t, res.Status)
-	status, found := res.Status[statusKey]
-	require.True(t, found)
-	require.Equal(t, res.Generation, status.ObservedGeneration)
-	prototest.AssertContainsElement(t, status.Conditions, condition)
-}
-
-func RequireResourceMeta(t T, res *pbresource.Resource, key string, value string) {
-	t.Helper()
-	require.NotNil(t, res.Metadata)
-	require.Contains(t, res.Metadata, key)
-	require.Equal(t, value, res.Metadata[key])
-}
-
-func RequireReconciledCurrentGen(t T, res *pbresource.Resource, statusKey string) {
-	t.Helper()
-	require.NotNil(t, res.Status)
-	status, found := res.Status[statusKey]
-	require.True(t, found)
-	require.Equal(t, res.Generation, status.ObservedGeneration)
-}
-
-func RequireOwner(t T, res *pbresource.Resource, owner *pbresource.ID, ignoreUid bool) {
-	t.Helper()
-
-	var opts []cmp.Option
-	if ignoreUid {
-		opts = append(opts, protocmp.IgnoreFields(owner, "uid"))
-	}
-
-	prototest.AssertDeepEqual(t, res.Owner, owner, opts...)
-}
diff --git a/internal/resource/resourcetest/testing.go b/internal/resource/resourcetest/testing.go
deleted file mode 100644
index 1be9947226bd2..0000000000000
--- a/internal/resource/resourcetest/testing.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resourcetest
-
-// T represents the subset of testing.T methods that will be used
-// by the various functionality in this package
-type T interface {
-	Helper()
-	Log(args ...interface{})
-	Logf(format string, args ...interface{})
-	Errorf(format string, args ...interface{})
-	Fatalf(format string, args ...interface{})
-	FailNow()
-	Cleanup(func())
-}
diff --git a/internal/resource/resourcetest/validation.go b/internal/resource/resourcetest/validation.go
deleted file mode 100644
index 1ba6a080484fb..0000000000000
--- a/internal/resource/resourcetest/validation.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resourcetest
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func ValidateAndNormalize(t *testing.T, registry resource.Registry, res *pbresource.Resource) {
-	t.Helper()
-	typ := res.Id.Type
-
-	typeInfo, ok := registry.Resolve(typ)
-	if !ok {
-		t.Fatalf("unhandled resource type: %q", resource.ToGVK(typ))
-	}
-
-	if typeInfo.Mutate != nil {
-		require.NoError(t, typeInfo.Mutate(res), "failed to apply type mutation to resource")
-	}
-
-	if typeInfo.Validate != nil {
-		require.NoError(t, typeInfo.Validate(res), "failed to validate resource")
-	}
-}
diff --git a/internal/resource/sort.go b/internal/resource/sort.go
deleted file mode 100644
index 1373f08e14213..0000000000000
--- a/internal/resource/sort.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import "github.com/hashicorp/consul/proto-public/pbresource"
-
-func LessReference(a, b *pbresource.Reference) bool {
-	return compareReference(a, b) < 0
-}
-
-func compareReference(a, b *pbresource.Reference) int {
-	if a == nil || b == nil {
-		panic("nil references cannot be compared")
-	}
-
-	diff := compareType(a.Type, b.Type)
-	if diff != 0 {
-		return diff
-	}
-	diff = compareTenancy(a.Tenancy, b.Tenancy)
-	if diff != 0 {
-		return diff
-	}
-	diff = compareString(a.Name, b.Name)
-	if diff != 0 {
-		return diff
-	}
-	return compareString(a.Section, b.Section)
-}
-
-func compareType(a, b *pbresource.Type) int {
-	if a == nil || b == nil {
-		panic("nil types cannot be compared")
-	}
-	diff := compareString(a.Group, b.Group)
-	if diff != 0 {
-		return diff
-	}
-	diff = compareString(a.GroupVersion, b.GroupVersion)
-	if diff != 0 {
-		return diff
-	}
-	return compareString(a.Kind, b.Kind)
-}
-
-func compareTenancy(a, b *pbresource.Tenancy) int {
-	if a == nil || b == nil {
-		panic("nil tenancies cannot be compared")
-	}
-	diff := compareString(a.Partition, b.Partition)
-	if diff != 0 {
-		return diff
-	}
-	diff = compareString(a.PeerName, b.PeerName)
-	if diff != 0 {
-		return diff
-	}
-	return compareString(a.Namespace, b.Namespace)
-}
-
-func compareString(a, b string) int {
-	switch {
-	case a < b:
-		return -1
-	case a > b:
-		return 1
-	default:
-		return 0
-	}
-}
diff --git a/internal/resource/sort_test.go b/internal/resource/sort_test.go
deleted file mode 100644
index e319266d9a925..0000000000000
--- a/internal/resource/sort_test.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"fmt"
-	"math/rand"
-	"sort"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func TestLessReference(t *testing.T) {
-	parseTenancy := func(s string) *pbresource.Tenancy {
-		// format is: <partition>.<peerName>.<namespace>
-		parts := strings.Split(s, ".")
-		if len(parts) != 3 {
-			panic("bad tenancy")
-		}
-		return &pbresource.Tenancy{
-			Partition: parts[0],
-			PeerName:  parts[1],
-			Namespace: parts[2],
-		}
-	}
-
-	makeRef := func(s string) *pbresource.Reference {
-		// format is:
-		// - <type>/<tenancy>/<name>@<section>
-		// - <type>/<tenancy>/<name>
-		//
-		// type = (gvk style)
-		// tenancy = <partition>.<peerName>.<namespace>
-
-		parts := strings.Split(s, "/")
-		require.Len(t, parts, 3)
-
-		name, section, _ := strings.Cut(parts[2], "@")
-
-		return &pbresource.Reference{
-			Type:    GVKToType(parts[0]),
-			Tenancy: parseTenancy(parts[1]),
-			Name:    name,
-			Section: section,
-		}
-	}
-
-	var inputs []*pbresource.Reference
-
-	stringify := func(all []*pbresource.Reference) []string {
-		var out []string
-		for _, ref := range all {
-			out = append(out, ReferenceToString(ref))
-		}
-		return out
-	}
-
-	// We generate pre-sorted data.
-	vals := []string{"a", "aa", "b", "bb"}
-	sectionVals := append([]string{""}, vals...)
-	for _, group := range vals {
-		for _, version := range vals {
-			for _, kind := range vals {
-				for _, partition := range vals {
-					for _, peer := range vals {
-						for _, namespace := range vals {
-							for _, name := range vals {
-								for _, section := range sectionVals {
-									if section != "" {
-										section = "@" + section
-									}
-									inputs = append(inputs, makeRef(
-										fmt.Sprintf(
-											"%s.%s.%s/%s.%s.%s/%s%s",
-											group, version, kind,
-											partition, peer, namespace,
-											name, section,
-										),
-									))
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	require.True(t, sort.IsSorted(sortedReferences(inputs)))
-
-	const randomTrials = 5
-
-	mixed := protoSliceClone(inputs)
-	for i := 0; i < randomTrials; i++ {
-		rand.Shuffle(len(mixed), func(i, j int) {
-			mixed[i], mixed[j] = mixed[j], mixed[i]
-		})
-
-		// We actually got a permuted list out of this.
-		require.NotEqual(t, stringify(inputs), stringify(mixed))
-
-		sort.Slice(mixed, func(i, j int) bool {
-			return LessReference(mixed[i], mixed[j])
-		})
-
-		// And it sorted.
-		require.Equal(t, stringify(inputs), stringify(mixed))
-	}
-
-}
-
-type sortedReferences []*pbresource.Reference
-
-func (r sortedReferences) Len() int {
-	return len(r)
-}
-
-func (r sortedReferences) Less(i, j int) bool {
-	return LessReference(r[i], r[j])
-}
-
-func (r sortedReferences) Swap(i, j int) {
-	r[i], r[j] = r[j], r[i]
-}
-
-func protoClone[T proto.Message](v T) T {
-	return proto.Clone(v).(T)
-}
-
-func protoSliceClone[T proto.Message](in []T) []T {
-	if in == nil {
-		return nil
-	}
-	out := make([]T, 0, len(in))
-	for _, v := range in {
-		out = append(out, protoClone[T](v))
-	}
-	return out
-}
diff --git a/internal/resource/stringer.go b/internal/resource/stringer.go
deleted file mode 100644
index 075c08ac0d9c4..0000000000000
--- a/internal/resource/stringer.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// IDToString returns a string representation of pbresource.ID. This should not
-// be relied upon nor parsed and is provided just for debugging and logging
-// reasons.
-//
-// This format should be aligned with ReferenceToString and
-// (ReferenceKey).String.
-func IDToString(id *pbresource.ID) string {
-	s := fmt.Sprintf("%s/%s/%s",
-		TypeToString(id.Type),
-		TenancyToString(id.Tenancy),
-		id.Name,
-	)
-	if id.Uid != "" {
-		return s + "?uid=" + id.Uid
-	}
-	return s
-}
-
-// ReferenceToString returns a string representation of pbresource.Reference.
-// This should not be relied upon nor parsed and is provided just for debugging
-// and logging reasons.
-//
-// This format should be aligned with IDToString and (ReferenceKey).String.
-func ReferenceToString(ref *pbresource.Reference) string {
-	s := fmt.Sprintf("%s/%s/%s",
-		TypeToString(ref.Type),
-		TenancyToString(ref.Tenancy),
-		ref.Name,
-	)
-
-	if ref.Section != "" {
-		return s + "?section=" + ref.Section
-	}
-	return s
-}
-
-// TenancyToString returns a string representation of pbresource.Tenancy. This
-// should not be relied upon nor parsed and is provided just for debugging and
-// logging reasons.
-func TenancyToString(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s.%s.%s", tenancy.Partition, tenancy.PeerName, tenancy.Namespace)
-}
-
-// TypeToString returns a string representation of pbresource.Type. This should
-// not be relied upon nor parsed and is provided just for debugging and logging
-// reasons.
-func TypeToString(typ *pbresource.Type) string {
-	return ToGVK(typ)
-}
diff --git a/internal/resource/tenancy.go b/internal/resource/tenancy.go
deleted file mode 100644
index 99ae0becf4b7e..0000000000000
--- a/internal/resource/tenancy.go
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"fmt"
-	"strings"
-
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type TenancyBridge interface {
-	PartitionExists(partition string) (bool, error)
-	IsPartitionMarkedForDeletion(partition string) (bool, error)
-	NamespaceExists(partition, namespace string) (bool, error)
-	IsNamespaceMarkedForDeletion(partition, namespace string) (bool, error)
-}
-
-const (
-	DefaultPartitionName = "default"
-	DefaultNamespaceName = "default"
-	DefaultPeerName      = "local"
-)
-
-// V2TenancyBridge is used by the resource service to access V2 implementations of
-// partitions and namespaces.
-type V2TenancyBridge struct {
-}
-
-func NewV2TenancyBridge() TenancyBridge {
-	return &V2TenancyBridge{}
-}
-
-// Scope describes the tenancy scope of a resource.
-type Scope int
-
-const (
-	// There is no default scope, it must be set explicitly.
-	ScopeUndefined Scope = iota
-	// ScopeCluster describes a resource that is scoped to a cluster.
-	ScopeCluster
-	// ScopePartition describes a resource that is scoped to a partition.
-	ScopePartition
-	// ScopeNamespace applies to a resource that is scoped to a partition and namespace.
-	ScopeNamespace
-)
-
-func (s Scope) String() string {
-	switch s {
-	case ScopeUndefined:
-		return "undefined"
-	case ScopeCluster:
-		return "cluster"
-	case ScopePartition:
-		return "partition"
-	case ScopeNamespace:
-		return "namespace"
-	}
-	panic(fmt.Sprintf("string mapping missing for scope %v", int(s)))
-}
-
-// Normalize lowercases the partition and namespace.
-func Normalize(tenancy *pbresource.Tenancy) {
-	if tenancy == nil {
-		return
-	}
-	tenancy.Partition = strings.ToLower(tenancy.Partition)
-	tenancy.Namespace = strings.ToLower(tenancy.Namespace)
-
-	// TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy
-	if tenancy.PeerName == "" {
-		tenancy.PeerName = DefaultPeerName
-	}
-}
-
-// DefaultClusteredTenancy returns the default tenancy for a cluster scoped resource.
-func DefaultClusteredTenancy() *pbresource.Tenancy {
-	return &pbresource.Tenancy{
-		// TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy
-		PeerName: DefaultPeerName,
-	}
-}
-
-// DefaultPartitionedTenancy returns the default tenancy for a partition scoped resource.
-func DefaultPartitionedTenancy() *pbresource.Tenancy {
-	return &pbresource.Tenancy{
-		Partition: DefaultPartitionName,
-		// TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy
-		PeerName: DefaultPeerName,
-	}
-}
-
-// DefaultNamespedTenancy returns the default tenancy for a namespace scoped resource.
-func DefaultNamespacedTenancy() *pbresource.Tenancy {
-	return &pbresource.Tenancy{
-		Partition: DefaultPartitionName,
-		Namespace: DefaultNamespaceName,
-		// TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy
-		PeerName: DefaultPeerName,
-	}
-}
-
-// DefaultReferenceTenancy will default/normalize the Tenancy of the provided
-// Reference in the context of some parent resource containing that Reference.
-// The default tenancy for the Reference's type is also provided in cases where
-// "default" is needed selectively or the parent is more precise than the
-// child.
-func DefaultReferenceTenancy(ref *pbresource.Reference, parentTenancy, scopeTenancy *pbresource.Tenancy) {
-	if ref == nil {
-		return
-	}
-	if ref.Tenancy == nil {
-		ref.Tenancy = &pbresource.Tenancy{}
-	}
-
-	if parentTenancy != nil {
-		dup := proto.Clone(parentTenancy).(*pbresource.Tenancy)
-		parentTenancy = dup
-	}
-
-	defaultTenancy(ref.Tenancy, parentTenancy, scopeTenancy)
-}
-
-func defaultTenancy(itemTenancy, parentTenancy, scopeTenancy *pbresource.Tenancy) {
-	if itemTenancy == nil {
-		panic("item tenancy is required")
-	}
-	if scopeTenancy == nil {
-		panic("scope tenancy is required")
-	}
-
-	if itemTenancy.PeerName == "" {
-		itemTenancy.PeerName = DefaultPeerName
-	}
-	Normalize(itemTenancy)
-
-	if parentTenancy != nil {
-		// Recursively normalize this tenancy as well.
-		defaultTenancy(parentTenancy, nil, scopeTenancy)
-	}
-
-	// use scope defaults for parent
-	if parentTenancy == nil {
-		parentTenancy = scopeTenancy
-	}
-	Normalize(parentTenancy)
-
-	if !equalOrEmpty(itemTenancy.PeerName, DefaultPeerName) {
-		panic("peering is not supported yet for resource tenancies")
-	}
-	if !equalOrEmpty(parentTenancy.PeerName, DefaultPeerName) {
-		panic("peering is not supported yet for parent tenancies")
-	}
-	if !equalOrEmpty(scopeTenancy.PeerName, DefaultPeerName) {
-		panic("peering is not supported yet for scopes")
-	}
-
-	// Only retain the parts of the parent that apply to this resource.
-	if scopeTenancy.Partition == "" {
-		parentTenancy.Partition = ""
-		itemTenancy.Partition = ""
-	}
-	if scopeTenancy.Namespace == "" {
-		parentTenancy.Namespace = ""
-		itemTenancy.Namespace = ""
-	}
-
-	if parentTenancy.Partition == "" {
-		// (cluster scoped)
-	} else {
-		if itemTenancy.Partition == "" {
-			itemTenancy.Partition = parentTenancy.Partition
-		}
-		if parentTenancy.Namespace == "" {
-			// (partition scoped)
-		} else {
-			// (namespace scoped)
-
-			if itemTenancy.Namespace == "" {
-				if itemTenancy.Partition == parentTenancy.Partition {
-					// safe to copy the namespace
-					itemTenancy.Namespace = parentTenancy.Namespace
-				} else {
-					// cross-peer, the namespace must come from the scope default
-					itemTenancy.Namespace = scopeTenancy.Namespace
-				}
-			}
-		}
-	}
-}
-
-func equalOrEmpty(a, b string) bool {
-	return (a == b) || (a == "") || (b == "")
-}
diff --git a/internal/resource/tenancy_bridge_ce.go b/internal/resource/tenancy_bridge_ce.go
deleted file mode 100644
index 9f88c22361998..0000000000000
--- a/internal/resource/tenancy_bridge_ce.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package resource
-
-func (b *V2TenancyBridge) PartitionExists(partition string) (bool, error) {
-	if partition == "default" {
-		return true, nil
-	}
-	return false, nil
-}
-
-func (b *V2TenancyBridge) IsPartitionMarkedForDeletion(partition string) (bool, error) {
-	return false, nil
-}
-
-func (b *V2TenancyBridge) NamespaceExists(partition, namespace string) (bool, error) {
-	if partition == "default" && namespace == "default" {
-		return true, nil
-	}
-	return false, nil
-}
-
-func (b *V2TenancyBridge) IsNamespaceMarkedForDeletion(partition, namespace string) (bool, error) {
-	return false, nil
-}
diff --git a/internal/resource/tenancy_test.go b/internal/resource/tenancy_test.go
deleted file mode 100644
index 654ebb183d1dd..0000000000000
--- a/internal/resource/tenancy_test.go
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"strings"
-	"testing"
-
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestDefaultReferenceTenancy(t *testing.T) {
-	// Just do a few small tests here and let the more complicated cases be covered by
-	// TestDefaultTenancy below.
-
-	t.Run("partition inference", func(t *testing.T) {
-		ref := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "fake",
-				GroupVersion: "v1fake",
-				Kind:         "artificial",
-			},
-			Name: "blah",
-			Tenancy: &pbresource.Tenancy{
-				Namespace: "zim",
-			},
-		}
-
-		expect := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "fake",
-				GroupVersion: "v1fake",
-				Kind:         "artificial",
-			},
-			Name:    "blah",
-			Tenancy: newTestTenancy("gir.zim"),
-		}
-
-		parent := newTestTenancy("gir.gaz")
-
-		DefaultReferenceTenancy(ref, parent, DefaultNamespacedTenancy())
-		prototest.AssertDeepEqual(t, expect, ref)
-	})
-
-	t.Run("full default", func(t *testing.T) {
-		ref := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "fake",
-				GroupVersion: "v1fake",
-				Kind:         "artificial",
-			},
-			Name: "blah",
-		}
-
-		expect := &pbresource.Reference{
-			Type: &pbresource.Type{
-				Group:        "fake",
-				GroupVersion: "v1fake",
-				Kind:         "artificial",
-			},
-			Name:    "blah",
-			Tenancy: newTestTenancy("gir.gaz"),
-		}
-
-		parent := newTestTenancy("gir.gaz")
-
-		DefaultReferenceTenancy(ref, parent, DefaultNamespacedTenancy())
-		prototest.AssertDeepEqual(t, expect, ref)
-	})
-}
-
-func TestDefaultTenancy(t *testing.T) {
-	type testcase struct {
-		ref    *pbresource.Tenancy
-		parent *pbresource.Tenancy
-		scope  *pbresource.Tenancy
-		expect *pbresource.Tenancy
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		got := proto.Clone(tc.ref).(*pbresource.Tenancy)
-
-		defaultTenancy(got, tc.parent, tc.scope)
-		prototest.AssertDeepEqual(t, tc.expect, got)
-	}
-
-	cases := map[string]testcase{
-		// Completely empty values get backfilled from the scope.
-		"clustered/empty/no-parent": {
-			ref:    newTestTenancy(""),
-			parent: nil,
-			scope:  DefaultClusteredTenancy(),
-			expect: DefaultClusteredTenancy(),
-		},
-		"partitioned/empty/no-parent": {
-			ref:    newTestTenancy(""),
-			parent: nil,
-			scope:  DefaultPartitionedTenancy(),
-			expect: DefaultPartitionedTenancy(),
-		},
-		"namespaced/empty/no-parent": {
-			ref:    newTestTenancy(""),
-			parent: nil,
-			scope:  DefaultNamespacedTenancy(),
-			expect: DefaultNamespacedTenancy(),
-		},
-		// Completely provided values are limited by the scope.
-		"clustered/full/no-parent": {
-			ref:    newTestTenancy("foo.bar"),
-			parent: nil,
-			scope:  DefaultClusteredTenancy(),
-			expect: DefaultClusteredTenancy(),
-		},
-		"partitioned/full/no-parent": {
-			ref:    newTestTenancy("foo.bar"),
-			parent: nil,
-			scope:  DefaultPartitionedTenancy(),
-			expect: newTestTenancy("foo"),
-		},
-		"namespaced/full/no-parent": {
-			ref:    newTestTenancy("foo.bar"),
-			parent: nil,
-			scope:  DefaultNamespacedTenancy(),
-			expect: newTestTenancy("foo.bar"),
-		},
-		// Completely provided parent values are limited by the scope before
-		// being blindly used for to fill in for the empty provided value.
-		"clustered/empty/full-parent": {
-			ref:    newTestTenancy(""),
-			parent: newTestTenancy("foo.bar"),
-			scope:  DefaultClusteredTenancy(),
-			expect: DefaultClusteredTenancy(),
-		},
-		"partitioned/empty/full-parent": {
-			ref:    newTestTenancy(""),
-			parent: newTestTenancy("foo.bar"),
-			scope:  DefaultPartitionedTenancy(),
-			expect: newTestTenancy("foo"),
-		},
-		"namespaced/empty/full-parent": {
-			ref:    newTestTenancy(""),
-			parent: newTestTenancy("foo.bar"),
-			scope:  DefaultNamespacedTenancy(),
-			expect: newTestTenancy("foo.bar"),
-		},
-		// (1) Partially filled values are only partially populated by parents.
-		"clustered/part-only/full-parent": {
-			ref:    newTestTenancy("zim"),
-			parent: newTestTenancy("foo.bar"),
-			scope:  DefaultClusteredTenancy(),
-			expect: DefaultClusteredTenancy(),
-		},
-		"partitioned/part-only/full-parent": {
-			ref:    newTestTenancy("zim"),
-			parent: newTestTenancy("foo.bar"),
-			scope:  DefaultPartitionedTenancy(),
-			expect: newTestTenancy("zim"),
-		},
-		"namespaced/part-only/full-parent": {
-			ref:    newTestTenancy("zim"),
-			parent: newTestTenancy("foo.bar"),
-			scope:  DefaultNamespacedTenancy(),
-			// partitions don't match so the namespace comes from the scope
-			expect: newTestTenancy("zim.default"),
-		},
-		// (2) Partially filled values are only partially populated by parents.
-		"clustered/ns-only/full-parent": {
-			// Leading dot implies no partition
-			ref:    newTestTenancy(".gir"),
-			parent: newTestTenancy("foo.bar"),
-			scope:  DefaultClusteredTenancy(),
-			expect: DefaultClusteredTenancy(),
-		},
-		"partitioned/ns-only/full-parent": {
-			// Leading dot implies no partition
-			ref:    newTestTenancy(".gir"),
-			parent: newTestTenancy("foo.bar"),
-			scope:  DefaultPartitionedTenancy(),
-			expect: newTestTenancy("foo"),
-		},
-		"namespaced/ns-only/full-parent": {
-			// Leading dot implies no partition
-			ref:    newTestTenancy(".gir"),
-			parent: newTestTenancy("foo.bar"),
-			scope:  DefaultNamespacedTenancy(),
-			expect: newTestTenancy("foo.gir"),
-		},
-		// Fully specified ignores parent.
-		"clustered/full/full-parent": {
-			ref:    newTestTenancy("foo.bar"),
-			parent: newTestTenancy("zim.gir"),
-			scope:  DefaultClusteredTenancy(),
-			expect: DefaultClusteredTenancy(),
-		},
-		"partitioned/full/full-parent": {
-			ref:    newTestTenancy("foo.bar"),
-			parent: newTestTenancy("zim.gir"),
-			scope:  DefaultPartitionedTenancy(),
-			expect: newTestTenancy("foo"),
-		},
-		"namespaced/full/full-parent": {
-			ref:    newTestTenancy("foo.bar"),
-			parent: newTestTenancy("zim.gir"),
-			scope:  DefaultNamespacedTenancy(),
-			expect: newTestTenancy("foo.bar"),
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func newTestTenancy(s string) *pbresource.Tenancy {
-	parts := strings.Split(s, ".")
-	switch len(parts) {
-	case 0:
-		return DefaultClusteredTenancy()
-	case 1:
-		v := DefaultPartitionedTenancy()
-		v.Partition = parts[0]
-		return v
-	case 2:
-		v := DefaultNamespacedTenancy()
-		v.Partition = parts[0]
-		v.Namespace = parts[1]
-		return v
-	default:
-		return &pbresource.Tenancy{Partition: "BAD", Namespace: "BAD", PeerName: "BAD"}
-	}
-}
diff --git a/internal/resource/testdata/ErrDataParse.golden b/internal/resource/testdata/ErrDataParse.golden
deleted file mode 100644
index b980ddb94b145..0000000000000
--- a/internal/resource/testdata/ErrDataParse.golden
+++ /dev/null
@@ -1 +0,0 @@
-error parsing resource data as type "hashicorp.consul.resource.Condition": fake test error
\ No newline at end of file
diff --git a/internal/resource/testdata/ErrEmpty.golden b/internal/resource/testdata/ErrEmpty.golden
deleted file mode 100644
index 96d45cf55bf72..0000000000000
--- a/internal/resource/testdata/ErrEmpty.golden
+++ /dev/null
@@ -1 +0,0 @@
-cannot be empty
\ No newline at end of file
diff --git a/internal/resource/testdata/ErrInvalidField.golden b/internal/resource/testdata/ErrInvalidField.golden
deleted file mode 100644
index 9b213c55b0c9b..0000000000000
--- a/internal/resource/testdata/ErrInvalidField.golden
+++ /dev/null
@@ -1 +0,0 @@
-invalid "host" field: fake test error
\ No newline at end of file
diff --git a/internal/resource/testdata/ErrInvalidListElement.golden b/internal/resource/testdata/ErrInvalidListElement.golden
deleted file mode 100644
index fa6530e677d41..0000000000000
--- a/internal/resource/testdata/ErrInvalidListElement.golden
+++ /dev/null
@@ -1 +0,0 @@
-invalid element at index 42 of list "addresses": fake test error
\ No newline at end of file
diff --git a/internal/resource/testdata/ErrInvalidMapKey.golden b/internal/resource/testdata/ErrInvalidMapKey.golden
deleted file mode 100644
index 25b72c9d319be..0000000000000
--- a/internal/resource/testdata/ErrInvalidMapKey.golden
+++ /dev/null
@@ -1 +0,0 @@
-map ports contains an invalid key - "http": fake test error
\ No newline at end of file
diff --git a/internal/resource/testdata/ErrInvalidMapValue.golden b/internal/resource/testdata/ErrInvalidMapValue.golden
deleted file mode 100644
index 359d4e69d853b..0000000000000
--- a/internal/resource/testdata/ErrInvalidMapValue.golden
+++ /dev/null
@@ -1 +0,0 @@
-invalid value of key "http" within ports: fake test error
\ No newline at end of file
diff --git a/internal/resource/testdata/ErrInvalidReferenceType.golden b/internal/resource/testdata/ErrInvalidReferenceType.golden
deleted file mode 100644
index c8d57e1efbb09..0000000000000
--- a/internal/resource/testdata/ErrInvalidReferenceType.golden
+++ /dev/null
@@ -1 +0,0 @@
-reference must have type foo.v1.bar
\ No newline at end of file
diff --git a/internal/resource/testdata/ErrMissing.golden b/internal/resource/testdata/ErrMissing.golden
deleted file mode 100644
index dec5d632b4347..0000000000000
--- a/internal/resource/testdata/ErrMissing.golden
+++ /dev/null
@@ -1 +0,0 @@
-missing required field
\ No newline at end of file
diff --git a/internal/resource/testdata/ErrOwnerInvalid.golden b/internal/resource/testdata/ErrOwnerInvalid.golden
deleted file mode 100644
index c0921c43232e4..0000000000000
--- a/internal/resource/testdata/ErrOwnerInvalid.golden
+++ /dev/null
@@ -1 +0,0 @@
-resources of type foo.v1.bar cannot be owned by resources with type other.v2.something
\ No newline at end of file
diff --git a/internal/resource/testdata/ErrReferenceTenancyNotEqual.golden b/internal/resource/testdata/ErrReferenceTenancyNotEqual.golden
deleted file mode 100644
index be53478d6959d..0000000000000
--- a/internal/resource/testdata/ErrReferenceTenancyNotEqual.golden
+++ /dev/null
@@ -1 +0,0 @@
-resource tenancy and reference tenancy differ
\ No newline at end of file
diff --git a/internal/resource/tombstone.go b/internal/resource/tombstone.go
deleted file mode 100644
index d86ae96ec4d50..0000000000000
--- a/internal/resource/tombstone.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import "github.com/hashicorp/consul/proto-public/pbresource"
-
-var (
-	TypeV1Tombstone = &pbresource.Type{
-		Group:        "internal",
-		GroupVersion: "v1",
-		Kind:         "Tombstone",
-	}
-)
diff --git a/internal/resourcehcl/any.go b/internal/resourcehcl/any.go
deleted file mode 100644
index 71086f655de06..0000000000000
--- a/internal/resourcehcl/any.go
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resourcehcl
-
-import (
-	"errors"
-	"fmt"
-
-	"google.golang.org/protobuf/reflect/protoreflect"
-
-	"github.com/hashicorp/consul/internal/protohcl"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// anyProvider implements protohcl.AnyTypeProvider to infer the `Data` block
-// type from `ID.Type`.
-type anyProvider struct {
-	base protohcl.AnyTypeProvider
-	reg  resource.Registry
-}
-
-func (p anyProvider) AnyType(ctx *protohcl.UnmarshalContext, decoder protohcl.MessageDecoder) (protoreflect.FullName, protohcl.MessageDecoder, error) {
-	if ctx.Name != "Data" {
-		return p.base.AnyType(ctx, decoder)
-	}
-
-	if ctx.Parent == nil || ctx.Parent.Message == nil {
-		return p.base.AnyType(ctx, decoder)
-	}
-
-	res, isResource := ctx.Parent.Message.Interface().(*pbresource.Resource)
-	if !isResource {
-		return p.base.AnyType(ctx, decoder)
-	}
-	if res == nil {
-		return "", nil, errors.New("ID.Type not found")
-	}
-
-	resourceType := res.GetId().GetType()
-	if resourceType == nil {
-		return "", nil, errors.New("ID.Type is nil")
-	}
-
-	reg, ok := p.reg.Resolve(resourceType)
-	if !ok {
-		return "", nil, fmt.Errorf("unknown resource type: %s", resource.ToGVK(resourceType))
-	}
-
-	return reg.Proto.ProtoReflect().Descriptor().FullName(), decoder, nil
-}
diff --git a/internal/resourcehcl/naming.go b/internal/resourcehcl/naming.go
deleted file mode 100644
index 590ea067886df..0000000000000
--- a/internal/resourcehcl/naming.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resourcehcl
-
-import (
-	"strings"
-
-	"google.golang.org/protobuf/reflect/protoreflect"
-)
-
-// fieldNamer implements protohcl.FieldNamer to name fields using PascalCase
-// with support for acroynms (e.g. ID, TCP).
-type fieldNamer struct{ acroynms []string }
-
-func (n fieldNamer) NameField(fd protoreflect.FieldDescriptor) string {
-	camel := fd.JSONName()
-	upper := strings.ToUpper(camel)
-
-	for _, a := range n.acroynms {
-		if upper == a {
-			return a
-		}
-	}
-
-	return strings.ToUpper(camel[:1]) + camel[1:]
-}
-
-func (n fieldNamer) GetField(fds protoreflect.FieldDescriptors, name string) protoreflect.FieldDescriptor {
-	for _, a := range n.acroynms {
-		if name == a {
-			return fds.ByJSONName(strings.ToLower(a))
-		}
-	}
-
-	if len(name) <= 1 {
-		return fds.ByJSONName(name)
-	}
-	camel := strings.ToLower(name[:1]) + name[1:]
-	return fds.ByJSONName(camel)
-}
diff --git a/internal/resourcehcl/testdata/destinations.golden b/internal/resourcehcl/testdata/destinations.golden
deleted file mode 100644
index b6ffce953751f..0000000000000
--- a/internal/resourcehcl/testdata/destinations.golden
+++ /dev/null
@@ -1 +0,0 @@
-{"id":{"name":"api","type":{"group":"mesh","groupVersion":"v2beta1","kind":"Destinations"}},"data":{"@type":"hashicorp.consul.mesh.v2beta1.Destinations","workloads":{"prefixes":["api"]},"destinations":[{"destinationRef":{"name":"db","type":{"group":"catalog","groupVersion":"v2beta1","kind":"Service"}},"destinationPort":"tcp","ipPort":{"port":1234}}]}}
diff --git a/internal/resourcehcl/testdata/destinations.hcl b/internal/resourcehcl/testdata/destinations.hcl
deleted file mode 100644
index fa62538abb44b..0000000000000
--- a/internal/resourcehcl/testdata/destinations.hcl
+++ /dev/null
@@ -1,25 +0,0 @@
-ID {
-  Type = gvk("mesh.v2beta1.Destinations")
-  Name = "api"
-}
-
-Data {
-  Workloads {
-    Prefixes = ["api"]
-  }
-
-  Destinations = [
-    {
-      DestinationRef = {
-        Type = gvk("catalog.v2beta1.Service")
-        Name = "db"
-      }
-
-      DestinationPort = "tcp"
-
-      IpPort = {
-        Port = 1234
-      }
-    }
-  ]
-}
diff --git a/internal/resourcehcl/testdata/fuzz/FuzzUnmarshall/0e4b8ec300611dbc b/internal/resourcehcl/testdata/fuzz/FuzzUnmarshall/0e4b8ec300611dbc
deleted file mode 100644
index 7f8a2357c7385..0000000000000
--- a/internal/resourcehcl/testdata/fuzz/FuzzUnmarshall/0e4b8ec300611dbc
+++ /dev/null
@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("Data{}")
diff --git a/internal/resourcehcl/testdata/fuzz/FuzzUnmarshall/c800420b7494c6d1 b/internal/resourcehcl/testdata/fuzz/FuzzUnmarshall/c800420b7494c6d1
deleted file mode 100644
index 3d99674458c26..0000000000000
--- a/internal/resourcehcl/testdata/fuzz/FuzzUnmarshall/c800420b7494c6d1
+++ /dev/null
@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("ID={\"\"=\"\"}")
diff --git a/internal/resourcehcl/testdata/fuzz/FuzzUnmarshall/eaba8205942c3f31 b/internal/resourcehcl/testdata/fuzz/FuzzUnmarshall/eaba8205942c3f31
deleted file mode 100644
index b63214c55a5fd..0000000000000
--- a/internal/resourcehcl/testdata/fuzz/FuzzUnmarshall/eaba8205942c3f31
+++ /dev/null
@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("ID {\nType = gvk(\"demo.v1.Artist\")\n} \nData {\nGenre = \"\"\n} ")
diff --git a/internal/resourcehcl/testdata/gvk-no-arguments.error b/internal/resourcehcl/testdata/gvk-no-arguments.error
deleted file mode 100644
index 1c290dd3d6135..0000000000000
--- a/internal/resourcehcl/testdata/gvk-no-arguments.error
+++ /dev/null
@@ -1 +0,0 @@
-gvk-no-arguments.hcl:2,14-15: Not enough function arguments; Function "gvk" expects 1 argument(s). Missing value for "GVK String".
\ No newline at end of file
diff --git a/internal/resourcehcl/testdata/gvk-no-arguments.hcl b/internal/resourcehcl/testdata/gvk-no-arguments.hcl
deleted file mode 100644
index 69aee02b2cfa8..0000000000000
--- a/internal/resourcehcl/testdata/gvk-no-arguments.hcl
+++ /dev/null
@@ -1,4 +0,0 @@
-ID {
-  Type = gvk()
-  Name = "foo"
-}
diff --git a/internal/resourcehcl/testdata/invalid-group.error b/internal/resourcehcl/testdata/invalid-group.error
deleted file mode 100644
index 6db3a339c2a18..0000000000000
--- a/internal/resourcehcl/testdata/invalid-group.error
+++ /dev/null
@@ -1 +0,0 @@
-invalid-group.hcl:3,13-17: Failed to unmarshal argument Group: expected value of type string but actual type is number
\ No newline at end of file
diff --git a/internal/resourcehcl/testdata/invalid-group.hcl b/internal/resourcehcl/testdata/invalid-group.hcl
deleted file mode 100644
index ca6920163ecce..0000000000000
--- a/internal/resourcehcl/testdata/invalid-group.hcl
+++ /dev/null
@@ -1,8 +0,0 @@
-ID {
-  Type {
-    Group = 1234
-    GroupVersion = "v1"
-    Kind = "Artist"
-  }
-  Name = "foo"
-}
diff --git a/internal/resourcehcl/testdata/invalid-gvk.error b/internal/resourcehcl/testdata/invalid-gvk.error
deleted file mode 100644
index 92ebca5eb0c12..0000000000000
--- a/internal/resourcehcl/testdata/invalid-gvk.error
+++ /dev/null
@@ -1 +0,0 @@
-invalid-gvk.hcl:2,10-14: Error in function call; Call to function "gvk" failed: GVK string must be in the form <Group>.<GroupVersion>.<Kind>, got: nope.
\ No newline at end of file
diff --git a/internal/resourcehcl/testdata/invalid-gvk.hcl b/internal/resourcehcl/testdata/invalid-gvk.hcl
deleted file mode 100644
index 565a4cc3f9c84..0000000000000
--- a/internal/resourcehcl/testdata/invalid-gvk.hcl
+++ /dev/null
@@ -1,4 +0,0 @@
-ID {
-  Type = gvk("nope")
-  Name = "foo"
-}
diff --git a/internal/resourcehcl/testdata/invalid-metadata.error b/internal/resourcehcl/testdata/invalid-metadata.error
deleted file mode 100644
index 352f2ffa056c6..0000000000000
--- a/internal/resourcehcl/testdata/invalid-metadata.error
+++ /dev/null
@@ -1 +0,0 @@
-invalid-metadata.hcl:6,12-8,2: Failed to unmarshal argument Metadata["foo"]: expected value of type string but actual type is tuple
\ No newline at end of file
diff --git a/internal/resourcehcl/testdata/invalid-metadata.hcl b/internal/resourcehcl/testdata/invalid-metadata.hcl
deleted file mode 100644
index aa10b5686e7f1..0000000000000
--- a/internal/resourcehcl/testdata/invalid-metadata.hcl
+++ /dev/null
@@ -1,8 +0,0 @@
-ID {
-  Type = gvk("demo.v1.Artist")
-  Name = "korn"
-}
-
-Metadata = {
-  "foo" = ["bar"]
-}
diff --git a/internal/resourcehcl/testdata/invalid-name.error b/internal/resourcehcl/testdata/invalid-name.error
deleted file mode 100644
index ba977a2e279c7..0000000000000
--- a/internal/resourcehcl/testdata/invalid-name.error
+++ /dev/null
@@ -1 +0,0 @@
-invalid-name.hcl:3,10-14: Failed to unmarshal argument Name: expected value of type string but actual type is number
\ No newline at end of file
diff --git a/internal/resourcehcl/testdata/invalid-name.hcl b/internal/resourcehcl/testdata/invalid-name.hcl
deleted file mode 100644
index 54ca6b186bbcf..0000000000000
--- a/internal/resourcehcl/testdata/invalid-name.hcl
+++ /dev/null
@@ -1,4 +0,0 @@
-ID {
-  Type = gvk("demo.v1.Artist")
-  Name = 1234
-}
diff --git a/internal/resourcehcl/testdata/no-blocks-any-first.golden b/internal/resourcehcl/testdata/no-blocks-any-first.golden
deleted file mode 100644
index 18a7cfd9aeecb..0000000000000
--- a/internal/resourcehcl/testdata/no-blocks-any-first.golden
+++ /dev/null
@@ -1 +0,0 @@
-{"id":{"name":"korn","type":{"group":"demo","groupVersion":"v1","kind":"Artist"}},"data":{"@type":"hashicorp.consul.internal.demo.v1.Artist","name":"Korn"}}
\ No newline at end of file
diff --git a/internal/resourcehcl/testdata/no-blocks-any-first.hcl b/internal/resourcehcl/testdata/no-blocks-any-first.hcl
deleted file mode 100644
index 8eb8d75f43170..0000000000000
--- a/internal/resourcehcl/testdata/no-blocks-any-first.hcl
+++ /dev/null
@@ -1,8 +0,0 @@
-Data = {
-  Name = "Korn"
-}
-
-ID = {
-  Type = gvk("demo.v1.Artist")
-  Name = "korn"
-}
diff --git a/internal/resourcehcl/testdata/no-blocks.golden b/internal/resourcehcl/testdata/no-blocks.golden
deleted file mode 100644
index 5e3bff82bd883..0000000000000
--- a/internal/resourcehcl/testdata/no-blocks.golden
+++ /dev/null
@@ -1 +0,0 @@
-{"id":{"type":{"group":"mesh","groupVersion":"v2beta1","kind":"Destinations"}},"data":{"@type":"hashicorp.consul.mesh.v2beta1.Destinations","workloads":{"prefixes":["api"]},"destinations":[{"destinationRef":{"name":"db","type":{"group":"catalog","groupVersion":"v2beta1","kind":"Service"}},"destinationPort":"tcp","ipPort":{"port":1234}}]}}
diff --git a/internal/resourcehcl/testdata/no-blocks.hcl b/internal/resourcehcl/testdata/no-blocks.hcl
deleted file mode 100644
index 197fd43f8776b..0000000000000
--- a/internal/resourcehcl/testdata/no-blocks.hcl
+++ /dev/null
@@ -1,33 +0,0 @@
-ID = {
-  Type = {
-    Group = "mesh"
-    GroupVersion = "v2beta1"
-    Kind = "Destinations"
-  }
-}
-
-Data = {
-  Workloads = {
-    Prefixes = ["api"]
-  }
-
-  Destinations = [
-    {
-      DestinationRef = {
-        Type = {
-          Group = "catalog"
-          GroupVersion = "v2beta1"
-          Kind = "Service"
-        }
-
-        Name = "db"
-      }
-
-      DestinationPort = "tcp"
-
-      IpPort = {
-        Port = 1234
-      }
-    }
-  ]
-}
diff --git a/internal/resourcehcl/testdata/owner.golden b/internal/resourcehcl/testdata/owner.golden
deleted file mode 100644
index 9054db09bfd35..0000000000000
--- a/internal/resourcehcl/testdata/owner.golden
+++ /dev/null
@@ -1 +0,0 @@
-{"id":{"name":"twisted-transistor","type":{"group":"demo","groupVersion":"v1","kind":"Album"}},"owner":{"name":"korn","type":{"group":"demo","groupVersion":"v1","kind":"Artist"}}}
\ No newline at end of file
diff --git a/internal/resourcehcl/testdata/owner.hcl b/internal/resourcehcl/testdata/owner.hcl
deleted file mode 100644
index 2cc65e4c66582..0000000000000
--- a/internal/resourcehcl/testdata/owner.hcl
+++ /dev/null
@@ -1,9 +0,0 @@
-ID {
-  Type = gvk("demo.v1.Album")
-  Name = "twisted-transistor"
-}
-
-Owner {
-  Type = gvk("demo.v1.Artist")
-  Name = "korn"
-}
diff --git a/internal/resourcehcl/testdata/simple-gvk.golden b/internal/resourcehcl/testdata/simple-gvk.golden
deleted file mode 100644
index ba3fddcd6d176..0000000000000
--- a/internal/resourcehcl/testdata/simple-gvk.golden
+++ /dev/null
@@ -1 +0,0 @@
-{"id":{"name":"korn","type":{"group":"demo","groupVersion":"v1","kind":"Artist"}},"metadata":{"foo":"bar"},"data":{"@type":"hashicorp.consul.internal.demo.v1.Artist","name":"Korn","genre":"GENRE_METAL"}}
\ No newline at end of file
diff --git a/internal/resourcehcl/testdata/simple-gvk.hcl b/internal/resourcehcl/testdata/simple-gvk.hcl
deleted file mode 100644
index adddcd42c8c1c..0000000000000
--- a/internal/resourcehcl/testdata/simple-gvk.hcl
+++ /dev/null
@@ -1,13 +0,0 @@
-ID {
-  Type = gvk("demo.v1.Artist")
-  Name = "korn"
-}
-
-Data {
-  Name = "Korn"
-  Genre = "GENRE_METAL"
-}
-
-Metadata = {
-  "foo" = "bar"
-}
diff --git a/internal/resourcehcl/testdata/type-block.golden b/internal/resourcehcl/testdata/type-block.golden
deleted file mode 100644
index 963695616bee8..0000000000000
--- a/internal/resourcehcl/testdata/type-block.golden
+++ /dev/null
@@ -1 +0,0 @@
-{"id":{"name":"korn","type":{"group":"demo","groupVersion":"v1","kind":"Artist"}}}
\ No newline at end of file
diff --git a/internal/resourcehcl/testdata/type-block.hcl b/internal/resourcehcl/testdata/type-block.hcl
deleted file mode 100644
index f927fbe2fe613..0000000000000
--- a/internal/resourcehcl/testdata/type-block.hcl
+++ /dev/null
@@ -1,8 +0,0 @@
-ID {
-  Type {
-    Group = "demo"
-    GroupVersion = "v1"
-    Kind = "Artist"
-  }
-  Name = "korn"
-}
diff --git a/internal/resourcehcl/testdata/unknown-field-block.error b/internal/resourcehcl/testdata/unknown-field-block.error
deleted file mode 100644
index 602212543d66a..0000000000000
--- a/internal/resourcehcl/testdata/unknown-field-block.error
+++ /dev/null
@@ -1 +0,0 @@
-unknown-field-block.hcl:2,3-6: Unsupported argument; An argument named "Foo" is not expected here.
\ No newline at end of file
diff --git a/internal/resourcehcl/testdata/unknown-field-block.hcl b/internal/resourcehcl/testdata/unknown-field-block.hcl
deleted file mode 100644
index 534fdb11b8d25..0000000000000
--- a/internal/resourcehcl/testdata/unknown-field-block.hcl
+++ /dev/null
@@ -1,3 +0,0 @@
-ID {
-  Foo = "bar"
-}
diff --git a/internal/resourcehcl/testdata/unknown-field-object.error b/internal/resourcehcl/testdata/unknown-field-object.error
deleted file mode 100644
index b7651d5eb0d59..0000000000000
--- a/internal/resourcehcl/testdata/unknown-field-object.error
+++ /dev/null
@@ -1 +0,0 @@
-unknown-field-object.hcl:1,6-3,2: Unsupported argument; An argument named "Foo" is not expected here.
\ No newline at end of file
diff --git a/internal/resourcehcl/testdata/unknown-field-object.hcl b/internal/resourcehcl/testdata/unknown-field-object.hcl
deleted file mode 100644
index 43220099bb0a3..0000000000000
--- a/internal/resourcehcl/testdata/unknown-field-object.hcl
+++ /dev/null
@@ -1,3 +0,0 @@
-ID = {
-  Foo = "bar"
-}
diff --git a/internal/resourcehcl/testdata/unknown-type.error b/internal/resourcehcl/testdata/unknown-type.error
deleted file mode 100644
index 81e0ea1c81597..0000000000000
--- a/internal/resourcehcl/testdata/unknown-type.error
+++ /dev/null
@@ -1 +0,0 @@
-error getting type for Any field: unknown resource type: foo.bar.Baz
\ No newline at end of file
diff --git a/internal/resourcehcl/testdata/unknown-type.hcl b/internal/resourcehcl/testdata/unknown-type.hcl
deleted file mode 100644
index f1669b8ba882b..0000000000000
--- a/internal/resourcehcl/testdata/unknown-type.hcl
+++ /dev/null
@@ -1,8 +0,0 @@
-ID {
-  Type = gvk("foo.bar.Baz")
-  Name = "qux"
-}
-
-Data {
-  Foo = "bar"
-}
diff --git a/internal/resourcehcl/unmarshal.go b/internal/resourcehcl/unmarshal.go
deleted file mode 100644
index 610ebc641b825..0000000000000
--- a/internal/resourcehcl/unmarshal.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resourcehcl
-
-import (
-	"reflect"
-
-	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-cty/cty/function"
-
-	"github.com/hashicorp/consul/internal/protohcl"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// Unmarshal the given HCL source into a resource.
-func Unmarshal(src []byte, reg resource.Registry) (*pbresource.Resource, error) {
-	return UnmarshalOptions{}.Unmarshal(src, reg)
-}
-
-type UnmarshalOptions struct{ SourceFileName string }
-
-// Unmarshal the given HCL source into a resource.
-func (u UnmarshalOptions) Unmarshal(src []byte, reg resource.Registry) (*pbresource.Resource, error) {
-	var out pbresource.Resource
-	err := (protohcl.UnmarshalOptions{
-		SourceFileName: u.SourceFileName,
-		AnyTypeProvider: anyProvider{
-			base: &protohcl.AnyTypeURLProvider{TypeURLFieldName: "Type"},
-			reg:  reg,
-		},
-		FieldNamer: fieldNamer{acroynms: []string{"ID", "TCP", "UDP", "HTTP"}},
-		Functions:  map[string]function.Function{"gvk": gvk},
-	}).Unmarshal(src, &out)
-	return &out, err
-}
-
-var (
-	typeType = cty.Capsule("type", reflect.TypeOf(pbresource.Type{}))
-
-	gvk = function.New(&function.Spec{
-		Params: []function.Parameter{
-			{Name: "GVK String", Type: cty.String},
-		},
-		Type: function.StaticReturnType(typeType),
-		Impl: func(args []cty.Value, _ cty.Type) (cty.Value, error) {
-			t, err := resource.ParseGVK(args[0].AsString())
-			if err != nil {
-				return cty.NilVal, err
-			}
-			return cty.CapsuleVal(typeType, t), nil
-		},
-	})
-)
diff --git a/internal/resourcehcl/unmarshal_test.go b/internal/resourcehcl/unmarshal_test.go
deleted file mode 100644
index e5b6506744723..0000000000000
--- a/internal/resourcehcl/unmarshal_test.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resourcehcl_test
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"path"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/encoding/protojson"
-
-	"github.com/hashicorp/consul/internal/mesh"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/internal/resourcehcl"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-var update = flag.Bool("update", false, "update golden files")
-
-func FuzzUnmarshall(f *testing.F) {
-	entries, err := os.ReadDir("./testdata")
-	require.NoError(f, err)
-
-	read := func(t *testing.F, path string) ([]byte, bool) {
-		t.Helper()
-
-		bytes, err := os.ReadFile(fmt.Sprintf("./testdata/%s", path))
-		switch {
-		case err == nil:
-			return bytes, true
-		case os.IsNotExist(err):
-			return nil, false
-		}
-
-		t.Fatalf("failed to read file %s %v", path, err)
-		return nil, false
-	}
-	for _, entry := range entries {
-		ext := path.Ext(entry.Name())
-
-		if ext != ".hcl" {
-			continue
-		}
-		input, _ := read(f, entry.Name())
-		f.Add(input)
-	}
-	registry := resource.NewRegistry()
-	demo.RegisterTypes(registry)
-	mesh.RegisterTypes(registry)
-
-	f.Fuzz(func(t *testing.T, input []byte) {
-		got, err := resourcehcl.Unmarshal(input, registry)
-		if err != nil {
-			return
-		}
-		require.NotNil(t, got)
-	})
-
-}
-
-func TestUnmarshal(t *testing.T) {
-	entries, err := os.ReadDir("./testdata")
-	require.NoError(t, err)
-
-	read := func(t *testing.T, path string) ([]byte, bool) {
-		t.Helper()
-
-		bytes, err := os.ReadFile(fmt.Sprintf("./testdata/%s", path))
-		switch {
-		case err == nil:
-			return bytes, true
-		case os.IsNotExist(err):
-			return nil, false
-		}
-
-		t.Fatalf("failed to read file %s %v", path, err)
-		return nil, false
-	}
-
-	write := func(t *testing.T, path string, src []byte) {
-		t.Helper()
-
-		require.NoError(t, os.WriteFile(fmt.Sprintf("./testdata/%s", path), src, 0o600))
-	}
-
-	for _, entry := range entries {
-		name := entry.Name()
-		ext := path.Ext(name)
-
-		if ext != ".hcl" {
-			continue
-		}
-
-		base := name[0 : len(name)-len(ext)]
-
-		t.Run(base, func(t *testing.T) {
-			input, _ := read(t, name)
-
-			registry := resource.NewRegistry()
-			demo.RegisterTypes(registry)
-			mesh.RegisterTypes(registry)
-
-			output, err := resourcehcl.UnmarshalOptions{SourceFileName: name}.
-				Unmarshal(input, registry)
-
-			if *update {
-				if err == nil {
-					json, err := protojson.Marshal(output)
-					require.NoError(t, err)
-					write(t, base+".golden", json)
-				} else {
-					write(t, base+".error", []byte(err.Error()))
-				}
-			}
-
-			goldenJSON, haveGoldenJSON := read(t, base+".golden")
-			goldenError, haveGoldenError := read(t, base+".error")
-
-			if haveGoldenError && haveGoldenJSON {
-				t.Fatalf("both %s.golden and %s.error exist, delete one", base, base)
-			}
-
-			if !haveGoldenError && !haveGoldenJSON && !*update {
-				t.Fatalf("neither %s.golden or %s.error exist, run the tests again with the -update flag to create one", base, base)
-			}
-
-			if haveGoldenError {
-				require.Error(t, err)
-				require.Equal(t, string(goldenError), err.Error())
-			}
-
-			if haveGoldenJSON {
-				require.NoError(t, err)
-
-				var exp pbresource.Resource
-				require.NoError(t, protojson.Unmarshal(goldenJSON, &exp))
-				prototest.AssertDeepEqual(t, &exp, output)
-			}
-		})
-	}
-}
diff --git a/internal/storage/conformance/conformance.go b/internal/storage/conformance/conformance.go
deleted file mode 100644
index 543a574fb5a60..0000000000000
--- a/internal/storage/conformance/conformance.go
+++ /dev/null
@@ -1,680 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package conformance
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"math/rand"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/testing/protocmp"
-
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-)
-
-type TestOptions struct {
-	// NewBackend will be called to construct a storage.Backend to run the tests
-	// against.
-	NewBackend func(t *testing.T) storage.Backend
-
-	// SupportsStronglyConsistentList indicates whether the given storage backend
-	// supports strongly consistent list operations.
-	SupportsStronglyConsistentList bool
-}
-
-// Test runs a suite of tests against a storage.Backend implementation to check
-// it correctly implements our required behaviours.
-func Test(t *testing.T, opts TestOptions) {
-	require.NotNil(t, opts.NewBackend, "NewBackend method is required")
-
-	t.Run("Read", func(t *testing.T) { testRead(t, opts) })
-	t.Run("CAS Write", func(t *testing.T) { testCASWrite(t, opts) })
-	t.Run("CAS Delete", func(t *testing.T) { testCASDelete(t, opts) })
-	t.Run("ListByOwner", func(t *testing.T) { testListByOwner(t, opts) })
-
-	testListWatch(t, opts)
-}
-
-func testRead(t *testing.T, opts TestOptions) {
-	ctx := testContext(t)
-
-	for consistency, check := range map[storage.ReadConsistency]consistencyChecker{
-		storage.EventualConsistency: eventually,
-		storage.StrongConsistency:   immediately,
-	} {
-		t.Run(consistency.String(), func(t *testing.T) {
-			res := &pbresource.Resource{
-				Id: &pbresource.ID{
-					Type:    typeAv1,
-					Tenancy: tenancyDefault,
-					Name:    "web",
-					Uid:     "a",
-				},
-			}
-
-			t.Run("simple", func(t *testing.T) {
-				backend := opts.NewBackend(t)
-
-				_, err := backend.WriteCAS(ctx, res)
-				require.NoError(t, err)
-
-				check(t, func(t testingT) {
-					output, err := backend.Read(ctx, consistency, res.Id)
-					require.NoError(t, err)
-					prototest.AssertDeepEqual(t, res, output, ignoreVersion)
-				})
-			})
-
-			t.Run("no uid", func(t *testing.T) {
-				backend := opts.NewBackend(t)
-
-				_, err := backend.WriteCAS(ctx, res)
-				require.NoError(t, err)
-
-				id := clone(res.Id)
-				id.Uid = ""
-
-				check(t, func(t testingT) {
-					output, err := backend.Read(ctx, consistency, id)
-					require.NoError(t, err)
-					prototest.AssertDeepEqual(t, res, output, ignoreVersion)
-				})
-			})
-
-			t.Run("different id", func(t *testing.T) {
-				backend := opts.NewBackend(t)
-
-				_, err := backend.WriteCAS(ctx, res)
-				require.NoError(t, err)
-
-				id := clone(res.Id)
-				id.Name = "different"
-
-				check(t, func(t testingT) {
-					_, err := backend.Read(ctx, consistency, id)
-					require.ErrorIs(t, err, storage.ErrNotFound)
-				})
-			})
-
-			t.Run("different uid", func(t *testing.T) {
-				backend := opts.NewBackend(t)
-
-				_, err := backend.WriteCAS(ctx, res)
-				require.NoError(t, err)
-
-				id := clone(res.Id)
-				id.Uid = "b"
-
-				check(t, func(t testingT) {
-					_, err := backend.Read(ctx, consistency, id)
-					require.ErrorIs(t, err, storage.ErrNotFound)
-				})
-			})
-
-			t.Run("different GroupVersion", func(t *testing.T) {
-				backend := opts.NewBackend(t)
-
-				_, err := backend.WriteCAS(ctx, res)
-				require.NoError(t, err)
-
-				id := clone(res.Id)
-				id.Type = typeAv2
-
-				check(t, func(t testingT) {
-					_, err := backend.Read(ctx, consistency, id)
-					require.Error(t, err)
-
-					var e storage.GroupVersionMismatchError
-					if errors.As(err, &e) {
-						prototest.AssertDeepEqual(t, id.Type, e.RequestedType)
-						prototest.AssertDeepEqual(t, res, e.Stored, ignoreVersion)
-					} else {
-						t.Fatalf("expected storage.GroupVersionMismatchError, got: %T", err)
-					}
-				})
-			})
-		})
-	}
-
-}
-
-func testCASWrite(t *testing.T, opts TestOptions) {
-	t.Run("version-based CAS", func(t *testing.T) {
-		backend := opts.NewBackend(t)
-		ctx := testContext(t)
-
-		v1 := &pbresource.Resource{
-			Id: &pbresource.ID{
-				Type:    typeB,
-				Tenancy: tenancyDefault,
-				Name:    "web",
-				Uid:     "a",
-			},
-		}
-
-		v1.Version = "some-version"
-		_, err := backend.WriteCAS(ctx, v1)
-		require.ErrorIs(t, err, storage.ErrCASFailure)
-
-		v1.Version = ""
-		v1, err = backend.WriteCAS(ctx, v1)
-		require.NoError(t, err)
-		require.NotEmpty(t, v1.Version)
-
-		v2, err := backend.WriteCAS(ctx, v1)
-		require.NoError(t, err)
-		require.NotEmpty(t, v2.Version)
-		require.NotEqual(t, v1.Version, v2.Version)
-
-		v3 := clone(v2)
-		v3.Version = ""
-		_, err = backend.WriteCAS(ctx, v3)
-		require.ErrorIs(t, err, storage.ErrCASFailure)
-
-		v3.Version = v1.Version
-		_, err = backend.WriteCAS(ctx, v3)
-		require.ErrorIs(t, err, storage.ErrCASFailure)
-	})
-
-	t.Run("uid immutability", func(t *testing.T) {
-		backend := opts.NewBackend(t)
-		ctx := testContext(t)
-
-		v1, err := backend.WriteCAS(ctx, &pbresource.Resource{
-			Id: &pbresource.ID{
-				Type:    typeB,
-				Tenancy: tenancyDefault,
-				Name:    "web",
-				Uid:     "a",
-			},
-		})
-		require.NoError(t, err)
-
-		// Uid cannot change.
-		v2 := clone(v1)
-		v2.Id.Uid = ""
-		_, err = backend.WriteCAS(ctx, v2)
-		require.Error(t, err)
-
-		v2.Id.Uid = "b"
-		_, err = backend.WriteCAS(ctx, v2)
-		require.ErrorIs(t, err, storage.ErrWrongUid)
-
-		v2.Id.Uid = v1.Id.Uid
-		v2, err = backend.WriteCAS(ctx, v2)
-		require.NoError(t, err)
-
-		// Uid can change after original resource is deleted.
-		require.NoError(t, backend.DeleteCAS(ctx, v2.Id, v2.Version))
-
-		v3 := clone(v2)
-		v3.Id.Uid = "b"
-		v3.Version = ""
-
-		_, err = backend.WriteCAS(ctx, v3)
-		require.NoError(t, err)
-	})
-}
-
-func testCASDelete(t *testing.T, opts TestOptions) {
-	t.Run("version-based CAS", func(t *testing.T) {
-		backend := opts.NewBackend(t)
-		ctx := testContext(t)
-
-		res, err := backend.WriteCAS(ctx, &pbresource.Resource{
-			Id: &pbresource.ID{
-				Type:    typeB,
-				Tenancy: tenancyDefault,
-				Name:    "web",
-				Uid:     "a",
-			},
-		})
-		require.NoError(t, err)
-
-		require.ErrorIs(t, backend.DeleteCAS(ctx, res.Id, ""), storage.ErrCASFailure)
-		require.ErrorIs(t, backend.DeleteCAS(ctx, res.Id, "some-version"), storage.ErrCASFailure)
-
-		require.NoError(t, backend.DeleteCAS(ctx, res.Id, res.Version))
-
-		eventually(t, func(t testingT) {
-			_, err = backend.Read(ctx, storage.EventualConsistency, res.Id)
-			require.ErrorIs(t, err, storage.ErrNotFound)
-		})
-	})
-
-	t.Run("uid must match", func(t *testing.T) {
-		backend := opts.NewBackend(t)
-		ctx := testContext(t)
-
-		res, err := backend.WriteCAS(ctx, &pbresource.Resource{
-			Id: &pbresource.ID{
-				Type:    typeB,
-				Tenancy: tenancyDefault,
-				Name:    "web",
-				Uid:     "a",
-			},
-		})
-		require.NoError(t, err)
-
-		id := clone(res.Id)
-		id.Uid = "b"
-		require.NoError(t, backend.DeleteCAS(ctx, id, res.Version))
-
-		eventually(t, func(t testingT) {
-			_, err = backend.Read(ctx, storage.EventualConsistency, res.Id)
-			require.NoError(t, err)
-		})
-	})
-}
-
-func testListWatch(t *testing.T, opts TestOptions) {
-	testCases := map[string]struct {
-		resourceType storage.UnversionedType
-		tenancy      *pbresource.Tenancy
-		namePrefix   string
-		results      []*pbresource.Resource
-	}{
-		"simple #1": {
-			resourceType: storage.UnversionedTypeFrom(typeAv1),
-			tenancy:      tenancyDefault,
-			namePrefix:   "",
-			results: []*pbresource.Resource{
-				seedData[0],
-				seedData[1],
-				seedData[2],
-			},
-		},
-		"simple #2": {
-			resourceType: storage.UnversionedTypeFrom(typeAv1),
-			tenancy:      tenancyOther,
-			namePrefix:   "",
-			results: []*pbresource.Resource{
-				seedData[3],
-			},
-		},
-		"fixed tenancy, name prefix": {
-			resourceType: storage.UnversionedTypeFrom(typeAv1),
-			tenancy:      tenancyDefault,
-			namePrefix:   "a",
-			results: []*pbresource.Resource{
-				seedData[0],
-				seedData[1],
-			},
-		},
-		"wildcard tenancy": {
-			resourceType: storage.UnversionedTypeFrom(typeAv1),
-			tenancy: &pbresource.Tenancy{
-				Partition: storage.Wildcard,
-				PeerName:  storage.Wildcard,
-				Namespace: storage.Wildcard,
-			},
-			namePrefix: "",
-			results: []*pbresource.Resource{
-				seedData[0],
-				seedData[1],
-				seedData[2],
-				seedData[3],
-				seedData[5],
-				seedData[6],
-			},
-		},
-		"fixed partition, wildcard peer, wildcard namespace": {
-			resourceType: storage.UnversionedTypeFrom(typeAv1),
-			tenancy: &pbresource.Tenancy{
-				Partition: "default",
-				PeerName:  storage.Wildcard,
-				Namespace: storage.Wildcard,
-			},
-			namePrefix: "",
-			results: []*pbresource.Resource{
-				seedData[0],
-				seedData[1],
-				seedData[2],
-				seedData[5],
-				seedData[6],
-			},
-		},
-		"wildcard partition, fixed peer, wildcard namespace": {
-			resourceType: storage.UnversionedTypeFrom(typeAv1),
-			tenancy: &pbresource.Tenancy{
-				Partition: storage.Wildcard,
-				PeerName:  "local",
-				Namespace: storage.Wildcard,
-			},
-			namePrefix: "",
-			results: []*pbresource.Resource{
-				seedData[0],
-				seedData[1],
-				seedData[2],
-				seedData[3],
-				seedData[5],
-			},
-		},
-		"wildcard partition, wildcard peer, fixed namespace": {
-			resourceType: storage.UnversionedTypeFrom(typeAv1),
-			tenancy: &pbresource.Tenancy{
-				Partition: storage.Wildcard,
-				PeerName:  storage.Wildcard,
-				Namespace: "default",
-			},
-			namePrefix: "",
-			results: []*pbresource.Resource{
-				seedData[0],
-				seedData[1],
-				seedData[2],
-				seedData[6],
-			},
-		},
-		"fixed partition, fixed peer, wildcard namespace": {
-			resourceType: storage.UnversionedTypeFrom(typeAv1),
-			tenancy: &pbresource.Tenancy{
-				Partition: "default",
-				PeerName:  "local",
-				Namespace: storage.Wildcard,
-			},
-			namePrefix: "",
-			results: []*pbresource.Resource{
-				seedData[0],
-				seedData[1],
-				seedData[2],
-				seedData[5],
-			},
-		},
-		"wildcard tenancy, name prefix": {
-			resourceType: storage.UnversionedTypeFrom(typeAv1),
-			tenancy: &pbresource.Tenancy{
-				Partition: storage.Wildcard,
-				PeerName:  storage.Wildcard,
-				Namespace: storage.Wildcard,
-			},
-			namePrefix: "a",
-			results: []*pbresource.Resource{
-				seedData[0],
-				seedData[1],
-				seedData[3],
-				seedData[5],
-				seedData[6],
-			},
-		},
-	}
-
-	t.Run("List", func(t *testing.T) {
-		ctx := testContext(t)
-
-		consistencyModes := map[storage.ReadConsistency]consistencyChecker{
-			storage.EventualConsistency: eventually,
-		}
-		if opts.SupportsStronglyConsistentList {
-			consistencyModes[storage.StrongConsistency] = immediately
-		}
-
-		for consistency, check := range consistencyModes {
-			t.Run(consistency.String(), func(t *testing.T) {
-				for desc, tc := range testCases {
-					t.Run(desc, func(t *testing.T) {
-						backend := opts.NewBackend(t)
-						for _, r := range seedData {
-							_, err := backend.WriteCAS(ctx, r)
-							require.NoError(t, err)
-						}
-
-						check(t, func(t testingT) {
-							res, err := backend.List(ctx, consistency, tc.resourceType, tc.tenancy, tc.namePrefix)
-							require.NoError(t, err)
-							prototest.AssertElementsMatch(t, res, tc.results, ignoreVersion)
-						})
-					})
-				}
-			})
-		}
-	})
-
-	t.Run("WatchList", func(t *testing.T) {
-		for desc, tc := range testCases {
-			t.Run(fmt.Sprintf("%s - initial snapshot", desc), func(t *testing.T) {
-				backend := opts.NewBackend(t)
-				ctx := testContext(t)
-
-				// Write the seed data before the watch has been established.
-				for _, r := range seedData {
-					_, err := backend.WriteCAS(ctx, r)
-					require.NoError(t, err)
-				}
-
-				watch, err := backend.WatchList(ctx, tc.resourceType, tc.tenancy, tc.namePrefix)
-				require.NoError(t, err)
-				t.Cleanup(watch.Close)
-
-				for i := 0; i < len(tc.results); i++ {
-					ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
-					t.Cleanup(cancel)
-
-					event, err := watch.Next(ctx)
-					require.NoError(t, err)
-
-					require.Equal(t, pbresource.WatchEvent_OPERATION_UPSERT, event.Operation)
-					prototest.AssertContainsElement(t, tc.results, event.Resource, ignoreVersion)
-				}
-			})
-
-			t.Run(fmt.Sprintf("%s - following events", desc), func(t *testing.T) {
-				backend := opts.NewBackend(t)
-				ctx := testContext(t)
-
-				watch, err := backend.WatchList(ctx, tc.resourceType, tc.tenancy, tc.namePrefix)
-				require.NoError(t, err)
-				t.Cleanup(watch.Close)
-
-				// Write the seed data after the watch has been established.
-				for _, r := range seedData {
-					_, err := backend.WriteCAS(ctx, r)
-					require.NoError(t, err)
-				}
-
-				for i := 0; i < len(tc.results); i++ {
-					ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
-					t.Cleanup(cancel)
-
-					event, err := watch.Next(ctx)
-					require.NoError(t, err)
-
-					require.Equal(t, pbresource.WatchEvent_OPERATION_UPSERT, event.Operation)
-					prototest.AssertContainsElement(t, tc.results, event.Resource, ignoreVersion)
-
-					// Check that Read implements "monotonic reads" with Watch.
-					readRes, err := backend.Read(ctx, storage.EventualConsistency, event.Resource.Id)
-					require.NoError(t, err)
-					prototest.AssertDeepEqual(t, event.Resource, readRes)
-				}
-
-				// Delete a random resource to check we get an event.
-				del, err := backend.Read(ctx, storage.EventualConsistency, tc.results[rand.Intn(len(tc.results))].Id)
-				require.NoError(t, err)
-				require.NoError(t, backend.DeleteCAS(ctx, del.Id, del.Version))
-
-				ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
-				t.Cleanup(cancel)
-
-				event, err := watch.Next(ctx)
-				require.NoError(t, err)
-
-				require.Equal(t, pbresource.WatchEvent_OPERATION_DELETE, event.Operation)
-				prototest.AssertDeepEqual(t, del, event.Resource)
-
-				// Check that Read implements "monotonic reads" with Watch.
-				_, err = backend.Read(ctx, storage.EventualConsistency, del.Id)
-				require.ErrorIs(t, err, storage.ErrNotFound)
-			})
-		}
-	})
-}
-
-func testListByOwner(t *testing.T, opts TestOptions) {
-	backend := opts.NewBackend(t)
-	ctx := testContext(t)
-
-	owner, err := backend.WriteCAS(ctx, &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type:    typeAv1,
-			Tenancy: tenancyDefault,
-			Name:    "owner",
-			Uid:     "a",
-		},
-	})
-	require.NoError(t, err)
-
-	r1, err := backend.WriteCAS(ctx, &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type:    typeB,
-			Tenancy: tenancyDefault,
-			Name:    "r1",
-			Uid:     "a",
-		},
-		Owner: owner.Id,
-	})
-	require.NoError(t, err)
-
-	r2, err := backend.WriteCAS(ctx, &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type:    typeAv2,
-			Tenancy: tenancyDefault,
-			Name:    "r2",
-			Uid:     "a",
-		},
-		Owner: owner.Id,
-	})
-	require.NoError(t, err)
-
-	eventually(t, func(t testingT) {
-		res, err := backend.ListByOwner(ctx, owner.Id)
-		require.NoError(t, err)
-		prototest.AssertElementsMatch(t, res, []*pbresource.Resource{r1, r2})
-	})
-
-	t.Run("references are anchored to a specific uid", func(t *testing.T) {
-		id := clone(owner.Id)
-		id.Uid = "different"
-
-		eventually(t, func(t testingT) {
-			res, err := backend.ListByOwner(ctx, id)
-			require.NoError(t, err)
-			require.Empty(t, res)
-		})
-	})
-
-	t.Run("deleting the owner doesn't remove the references", func(t *testing.T) {
-		require.NoError(t, backend.DeleteCAS(ctx, owner.Id, owner.Version))
-
-		eventually(t, func(t testingT) {
-			res, err := backend.ListByOwner(ctx, owner.Id)
-			require.NoError(t, err)
-			prototest.AssertElementsMatch(t, res, []*pbresource.Resource{r1, r2})
-		})
-	})
-
-	t.Run("deleting the owned resource removes its reference", func(t *testing.T) {
-		require.NoError(t, backend.DeleteCAS(ctx, r2.Id, r2.Version))
-
-		eventually(t, func(t testingT) {
-			res, err := backend.ListByOwner(ctx, owner.Id)
-			require.NoError(t, err)
-			prototest.AssertElementsMatch(t, res, []*pbresource.Resource{r1})
-		})
-	})
-}
-
-var (
-	typeAv1 = &pbresource.Type{
-		Group:        "test",
-		GroupVersion: "v1",
-		Kind:         "a",
-	}
-	typeAv2 = &pbresource.Type{
-		Group:        "test",
-		GroupVersion: "v2",
-		Kind:         "a",
-	}
-	typeB = &pbresource.Type{
-		Group:        "test",
-		GroupVersion: "v1",
-		Kind:         "b",
-	}
-	tenancyDefault = &pbresource.Tenancy{
-		Partition: "default",
-		PeerName:  "local",
-		Namespace: "default",
-	}
-
-	tenancyDefaultOtherNamespace = &pbresource.Tenancy{
-		Partition: "default",
-		PeerName:  "local",
-		Namespace: "other",
-	}
-	tenancyDefaultOtherPeer = &pbresource.Tenancy{
-		Partition: "default",
-		PeerName:  "remote",
-		Namespace: "default",
-	}
-	tenancyOther = &pbresource.Tenancy{
-		Partition: "billing",
-		PeerName:  "local",
-		Namespace: "payments",
-	}
-
-	seedData = []*pbresource.Resource{
-		resource(typeAv1, tenancyDefault, "admin"),                    // 0
-		resource(typeAv1, tenancyDefault, "api"),                      // 1
-		resource(typeAv2, tenancyDefault, "web"),                      // 2
-		resource(typeAv1, tenancyOther, "api"),                        // 3
-		resource(typeB, tenancyDefault, "admin"),                      // 4
-		resource(typeAv1, tenancyDefaultOtherNamespace, "autoscaler"), // 5
-		resource(typeAv1, tenancyDefaultOtherPeer, "amplifier"),       // 6
-	}
-
-	ignoreVersion = protocmp.IgnoreFields(&pbresource.Resource{}, "version")
-)
-
-func resource(typ *pbresource.Type, ten *pbresource.Tenancy, name string) *pbresource.Resource {
-	return &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type:    typ,
-			Tenancy: ten,
-			Name:    name,
-			Uid:     "a",
-		},
-	}
-}
-
-func testContext(t *testing.T) context.Context {
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-	return ctx
-}
-
-func clone[T proto.Message](v T) T { return proto.Clone(v).(T) }
-
-type testingT interface {
-	require.TestingT
-	prototest.TestingT
-}
-
-type consistencyChecker func(t *testing.T, fn func(testingT))
-
-func eventually(t *testing.T, fn func(testingT)) {
-	t.Helper()
-	retry.Run(t, func(r *retry.R) { fn(r) })
-}
-
-func immediately(t *testing.T, fn func(testingT)) {
-	t.Helper()
-	fn(t)
-}
diff --git a/internal/storage/inmem/backend.go b/internal/storage/inmem/backend.go
deleted file mode 100644
index bf256e508f4d6..0000000000000
--- a/internal/storage/inmem/backend.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package inmem
-
-import (
-	"context"
-	"strconv"
-	"sync/atomic"
-
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// NewBackend returns a purely in-memory storage backend. It's suitable for
-// testing and development mode, but should NOT be used in production as it
-// has no support for durable persistence, so all of your data will be lost
-// when the process restarts or crashes.
-//
-// You must call Run before using the backend.
-func NewBackend() (*Backend, error) {
-	store, err := NewStore()
-	if err != nil {
-		return nil, err
-	}
-	return &Backend{store: store}, nil
-}
-
-// Backend is a purely in-memory storage backend implementation.
-type Backend struct {
-	vsn uint64
-
-	store *Store
-}
-
-// Run until the given context is canceled. This method blocks, so should be
-// called in a goroutine.
-func (b *Backend) Run(ctx context.Context) { b.store.Run(ctx) }
-
-// Read implements the storage.Backend interface.
-func (b *Backend) Read(_ context.Context, _ storage.ReadConsistency, id *pbresource.ID) (*pbresource.Resource, error) {
-	return b.store.Read(id)
-}
-
-// WriteCAS implements the storage.Backend interface.
-func (b *Backend) WriteCAS(_ context.Context, res *pbresource.Resource) (*pbresource.Resource, error) {
-	stored := proto.Clone(res).(*pbresource.Resource)
-	stored.Version = strconv.Itoa(int(atomic.AddUint64(&b.vsn, 1)))
-
-	if err := b.store.WriteCAS(stored, res.Version); err != nil {
-		return nil, err
-	}
-	return stored, nil
-}
-
-// DeleteCAS implements the storage.Backend interface.
-func (b *Backend) DeleteCAS(_ context.Context, id *pbresource.ID, version string) error {
-	return b.store.DeleteCAS(id, version)
-}
-
-// List implements the storage.Backend interface.
-func (b *Backend) List(_ context.Context, _ storage.ReadConsistency, resType storage.UnversionedType, tenancy *pbresource.Tenancy, namePrefix string) ([]*pbresource.Resource, error) {
-	return b.store.List(resType, tenancy, namePrefix)
-}
-
-// WatchList implements the storage.Backend interface.
-func (b *Backend) WatchList(_ context.Context, resType storage.UnversionedType, tenancy *pbresource.Tenancy, namePrefix string) (storage.Watch, error) {
-	return b.store.WatchList(resType, tenancy, namePrefix)
-}
-
-// ListByOwner implements the storage.Backend interface.
-func (b *Backend) ListByOwner(_ context.Context, id *pbresource.ID) ([]*pbresource.Resource, error) {
-	return b.store.ListByOwner(id)
-}
diff --git a/internal/storage/inmem/backend_test.go b/internal/storage/inmem/backend_test.go
deleted file mode 100644
index 7978dcdf29935..0000000000000
--- a/internal/storage/inmem/backend_test.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package inmem_test
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/internal/storage/conformance"
-	"github.com/hashicorp/consul/internal/storage/inmem"
-)
-
-func TestBackend_Conformance(t *testing.T) {
-	conformance.Test(t, conformance.TestOptions{
-		NewBackend: func(t *testing.T) storage.Backend {
-			backend, err := inmem.NewBackend()
-			require.NoError(t, err)
-
-			ctx, cancel := context.WithCancel(context.Background())
-			t.Cleanup(cancel)
-			go backend.Run(ctx)
-
-			return backend
-		},
-		SupportsStronglyConsistentList: true,
-	})
-}
diff --git a/internal/storage/inmem/event_index.go b/internal/storage/inmem/event_index.go
deleted file mode 100644
index f71e809289aca..0000000000000
--- a/internal/storage/inmem/event_index.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package inmem
-
-import "github.com/hashicorp/go-memdb"
-
-type meta struct {
-	Key   string
-	Value any
-}
-
-func incrementEventIndex(tx *memdb.Txn) (uint64, error) {
-	idx, err := currentEventIndex(tx)
-	if err != nil {
-		return 0, err
-	}
-
-	idx++
-	if err := tx.Insert(tableNameMetadata, meta{Key: metaKeyEventIndex, Value: idx}); err != nil {
-		return 0, nil
-	}
-	return idx, nil
-}
-
-func currentEventIndex(tx *memdb.Txn) (uint64, error) {
-	v, err := tx.First(tableNameMetadata, indexNameID, metaKeyEventIndex)
-	if err != nil {
-		return 0, err
-	}
-	if v == nil {
-		// 0 and 1 index are reserved for special use in the stream package.
-		return 2, nil
-	}
-	return v.(meta).Value.(uint64), nil
-}
diff --git a/internal/storage/inmem/schema.go b/internal/storage/inmem/schema.go
deleted file mode 100644
index 37e39dbc57076..0000000000000
--- a/internal/storage/inmem/schema.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package inmem
-
-import (
-	"bytes"
-	"fmt"
-	"strings"
-
-	"github.com/hashicorp/go-memdb"
-
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	tableNameMetadata  = "metadata"
-	tableNameResources = "resources"
-
-	indexNameID    = "id"
-	indexNameOwner = "owner"
-
-	metaKeyEventIndex = "index"
-)
-
-func newDB() (*memdb.MemDB, error) {
-	return memdb.NewMemDB(&memdb.DBSchema{
-		Tables: map[string]*memdb.TableSchema{
-			tableNameMetadata: {
-				Name: tableNameMetadata,
-				Indexes: map[string]*memdb.IndexSchema{
-					indexNameID: {
-						Name:         indexNameID,
-						AllowMissing: false,
-						Unique:       true,
-						Indexer:      &memdb.StringFieldIndex{Field: "Key"},
-					},
-				},
-			},
-			tableNameResources: {
-				Name: tableNameResources,
-				Indexes: map[string]*memdb.IndexSchema{
-					indexNameID: {
-						Name:         indexNameID,
-						AllowMissing: false,
-						Unique:       true,
-						Indexer:      idIndexer{},
-					},
-					indexNameOwner: {
-						Name:         indexNameOwner,
-						AllowMissing: true,
-						Unique:       false,
-						Indexer:      ownerIndexer{},
-					},
-				},
-			},
-		},
-	})
-}
-
-// indexSeparator delimits the segments of our radix tree keys.
-const indexSeparator = "\x00"
-
-// idIndexer implements the memdb.Indexer, memdb.SingleIndexer and
-// memdb.PrefixIndexer interfaces. It is used for indexing resources
-// by their IDs.
-type idIndexer struct{}
-
-// FromArgs constructs a radix tree key from an ID for lookup.
-func (i idIndexer) FromArgs(args ...any) ([]byte, error) {
-	if l := len(args); l != 1 {
-		return nil, fmt.Errorf("expected 1 arg, got: %d", l)
-	}
-	id, ok := args[0].(*pbresource.ID)
-	if !ok {
-		return nil, fmt.Errorf("expected *pbresource.ID, got: %T", args[0])
-	}
-	return indexFromID(id, false), nil
-}
-
-// FromObject constructs a radix tree key from a Resource at write-time, or an
-// ID at delete-time.
-func (i idIndexer) FromObject(raw any) (bool, []byte, error) {
-	switch t := raw.(type) {
-	case *pbresource.ID:
-		return true, indexFromID(t, false), nil
-	case *pbresource.Resource:
-		return true, indexFromID(t.Id, false), nil
-	}
-	return false, nil, fmt.Errorf("expected *pbresource.Resource or *pbresource.ID, got: %T", raw)
-}
-
-// PrefixFromArgs constructs a radix tree key prefix from a query for listing.
-func (i idIndexer) PrefixFromArgs(args ...any) ([]byte, error) {
-	if l := len(args); l != 1 {
-		return nil, fmt.Errorf("expected 1 arg, got: %d", l)
-	}
-
-	q, ok := args[0].(query)
-	if !ok {
-		return nil, fmt.Errorf("expected query, got: %T", args[0])
-	}
-	return q.indexPrefix(), nil
-}
-
-// ownerIndexer implements the memdb.Indexer and memdb.SingleIndexer interfaces.
-// It is used for indexing resources by their owners.
-type ownerIndexer struct{}
-
-// FromArgs constructs a radix tree key from an ID for lookup.
-func (i ownerIndexer) FromArgs(args ...any) ([]byte, error) {
-	if l := len(args); l != 1 {
-		return nil, fmt.Errorf("expected 1 arg, got: %d", l)
-	}
-	id, ok := args[0].(*pbresource.ID)
-	if !ok {
-		return nil, fmt.Errorf("expected *pbresource.ID, got: %T", args[0])
-	}
-	return indexFromID(id, true), nil
-}
-
-// FromObject constructs a radix key tree from a Resource at write-time.
-func (i ownerIndexer) FromObject(raw any) (bool, []byte, error) {
-	res, ok := raw.(*pbresource.Resource)
-	if !ok {
-		return false, nil, fmt.Errorf("expected *pbresource.Resource, got: %T", raw)
-	}
-	if res.Owner == nil {
-		return false, nil, nil
-	}
-	return true, indexFromID(res.Owner, true), nil
-}
-
-func indexFromType(t storage.UnversionedType) []byte {
-	var b indexBuilder
-	b.String(t.Group)
-	b.String(t.Kind)
-	return b.Bytes()
-}
-
-func indexFromTenancy(t *pbresource.Tenancy) []byte {
-	var b indexBuilder
-	b.String(t.Partition)
-	b.String(t.PeerName)
-	b.String(t.Namespace)
-	return b.Bytes()
-}
-
-func indexFromID(id *pbresource.ID, includeUid bool) []byte {
-	var b indexBuilder
-	b.Raw(indexFromType(storage.UnversionedTypeFrom(id.Type)))
-	b.Raw(indexFromTenancy(id.Tenancy))
-	b.String(id.Name)
-	if includeUid {
-		b.String(id.Uid)
-	}
-	return b.Bytes()
-}
-
-type indexBuilder bytes.Buffer
-
-func (i *indexBuilder) Raw(v []byte) {
-	(*bytes.Buffer)(i).Write(v)
-}
-
-func (i *indexBuilder) String(s string) {
-	(*bytes.Buffer)(i).WriteString(s)
-	(*bytes.Buffer)(i).WriteString(indexSeparator)
-}
-
-func (i *indexBuilder) Bytes() []byte {
-	return (*bytes.Buffer)(i).Bytes()
-}
-
-type query struct {
-	resourceType storage.UnversionedType
-	tenancy      *pbresource.Tenancy
-	namePrefix   string
-}
-
-// indexPrefix is called by idIndexer.PrefixFromArgs to construct a radix tree
-// key prefix for list queries.
-//
-// Our radix tree keys are structured like so:
-//
-//	<type><partition><peer><namespace><name>
-//
-// Where each segment is followed by a NULL terminator.
-//
-// In order to handle wildcard queries, we return a prefix up to the wildcarded
-// field. For example:
-//
-//	 Query: type={mesh,v1,service}, partition=default, peer=*, namespace=default
-//	Prefix: mesh[NULL]v1[NULL]service[NULL]default[NULL]
-//
-// Which means that we must manually apply filters after the wildcard (i.e.
-// namespace in the above example) in the matches method.
-func (q query) indexPrefix() []byte {
-	var b indexBuilder
-	b.Raw(indexFromType(q.resourceType))
-
-	if v := q.tenancy.Partition; v == storage.Wildcard {
-		return b.Bytes()
-	} else {
-		b.String(v)
-	}
-
-	if v := q.tenancy.PeerName; v == storage.Wildcard {
-		return b.Bytes()
-	} else {
-		b.String(v)
-	}
-
-	if v := q.tenancy.Namespace; v == storage.Wildcard {
-		return b.Bytes()
-	} else {
-		b.String(v)
-	}
-
-	if q.namePrefix != "" {
-		b.Raw([]byte(q.namePrefix))
-	}
-
-	return b.Bytes()
-}
-
-// matches applies filters that couldn't be applied by just doing a radix tree
-// prefix scan, because an earlier segment of the key prefix was wildcarded.
-//
-// See docs on query.indexPrefix for an example.
-func (q query) matches(res *pbresource.Resource) bool {
-	if q.tenancy.Partition != storage.Wildcard && res.Id.Tenancy.Partition != q.tenancy.Partition {
-		return false
-	}
-
-	if q.tenancy.PeerName != storage.Wildcard && res.Id.Tenancy.PeerName != q.tenancy.PeerName {
-		return false
-	}
-
-	if q.tenancy.Namespace != storage.Wildcard && res.Id.Tenancy.Namespace != q.tenancy.Namespace {
-		return false
-	}
-
-	if len(q.namePrefix) != 0 && !strings.HasPrefix(res.Id.Name, q.namePrefix) {
-		return false
-	}
-
-	return true
-}
diff --git a/internal/storage/inmem/snapshot.go b/internal/storage/inmem/snapshot.go
deleted file mode 100644
index 36739ac65b20e..0000000000000
--- a/internal/storage/inmem/snapshot.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package inmem
-
-import (
-	"github.com/hashicorp/go-memdb"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// Snapshot obtains a point-in-time snapshot of the store that can later be
-// persisted and restored later.
-func (s *Store) Snapshot() (*Snapshot, error) {
-	tx := s.txn(false)
-
-	iter, err := tx.Get(tableNameResources, indexNameID)
-	if err != nil {
-		return nil, err
-	}
-
-	return &Snapshot{iter: iter}, nil
-}
-
-// Snapshot is a point-in-time snapshot of a store.
-type Snapshot struct {
-	iter memdb.ResultIterator
-}
-
-// Next returns the next resource in the snapshot. nil will be returned when
-// the end of the snapshot has been reached.
-func (s *Snapshot) Next() *pbresource.Resource {
-	v := s.iter.Next()
-	if v == nil {
-		return nil
-	}
-	return v.(*pbresource.Resource)
-}
-
-// Restore starts the process of restoring a snapshot.
-//
-// Callers *must* call Abort or Commit when done, to free resources.
-func (s *Store) Restore() (*Restoration, error) {
-	db, err := newDB()
-	if err != nil {
-		return nil, err
-	}
-	return &Restoration{
-		s:  s,
-		db: db,
-		tx: db.Txn(true),
-	}, nil
-}
-
-// Restoration is a handle that can be used to restore a snapshot.
-type Restoration struct {
-	s  *Store
-	db *memdb.MemDB
-	tx *memdb.Txn
-}
-
-// Apply the given resource to the store.
-func (r *Restoration) Apply(res *pbresource.Resource) error {
-	return r.tx.Insert(tableNameResources, res)
-}
-
-// Commit the restoration. Replaces the in-memory database wholesale and closes
-// any watches.
-func (r *Restoration) Commit() {
-	r.tx.Commit()
-
-	r.s.mu.Lock()
-	defer r.s.mu.Unlock()
-
-	r.s.db = r.db
-	r.s.pub.RefreshTopic(eventTopic)
-}
-
-// Abort the restoration. It's safe to always call this in a defer statement
-// because aborting a committed restoration is a no-op.
-func (r *Restoration) Abort() { r.tx.Abort() }
diff --git a/internal/storage/inmem/snapshot_test.go b/internal/storage/inmem/snapshot_test.go
deleted file mode 100644
index f3e1bdbaa79e5..0000000000000
--- a/internal/storage/inmem/snapshot_test.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package inmem_test
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/internal/storage/inmem"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestSnapshotRestore(t *testing.T) {
-	oldStore, err := inmem.NewStore()
-	require.NoError(t, err)
-
-	a := &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "mesh",
-				GroupVersion: "v1",
-				Kind:         "service",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "default",
-				PeerName:  "local",
-				Namespace: "default",
-			},
-			Name: "billing",
-			Uid:  "a",
-		},
-		Version: "1",
-	}
-	require.NoError(t, oldStore.WriteCAS(a, ""))
-
-	newStore, err := inmem.NewStore()
-	require.NoError(t, err)
-
-	// Write something to the new store to make sure it gets blown away.
-	b := &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "mesh",
-				GroupVersion: "v1",
-				Kind:         "service",
-			},
-			Tenancy: &pbresource.Tenancy{
-				Partition: "default",
-				PeerName:  "local",
-				Namespace: "default",
-			},
-			Name: "api",
-			Uid:  "a",
-		},
-		Version: "1",
-	}
-	require.NoError(t, newStore.WriteCAS(b, ""))
-
-	snap, err := oldStore.Snapshot()
-	require.NoError(t, err)
-
-	// Start a watch on the new store to make sure it gets closed.
-	watch, err := newStore.WatchList(storage.UnversionedTypeFrom(b.Id.Type), b.Id.Tenancy, "")
-	require.NoError(t, err)
-
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-
-	// Expect the initial state on the watch.
-	_, err = watch.Next(ctx)
-	require.NoError(t, err)
-
-	restore, err := newStore.Restore()
-	require.NoError(t, err)
-	defer restore.Abort()
-
-	for r := snap.Next(); r != nil; r = snap.Next() {
-		restore.Apply(r)
-	}
-	restore.Commit()
-
-	// Check that resource we wrote to oldStore has been restored to newStore.
-	rsp, err := newStore.Read(a.Id)
-	require.NoError(t, err)
-	prototest.AssertDeepEqual(t, a, rsp)
-
-	// Check that resource written to newStore was removed by snapshot restore.
-	_, err = newStore.Read(b.Id)
-	require.ErrorIs(t, err, storage.ErrNotFound)
-
-	// Check the watch has been closed.
-	_, err = watch.Next(ctx)
-	require.ErrorIs(t, err, storage.ErrWatchClosed)
-}
diff --git a/internal/storage/inmem/store.go b/internal/storage/inmem/store.go
deleted file mode 100644
index d9c27d339fa3d..0000000000000
--- a/internal/storage/inmem/store.go
+++ /dev/null
@@ -1,286 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package inmem
-
-import (
-	"context"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/go-memdb"
-
-	"github.com/hashicorp/consul/agent/consul/stream"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// Store implements an in-memory resource database using go-memdb.
-//
-// It can be used as a storage backend directly via the Backend type in this
-// package, but also handles reads in our Raft backend, and can be used as a
-// local cache when storing data in external systems (e.g. RDBMS, K/V stores).
-type Store struct {
-	mu sync.RWMutex // guards db, because Restore.Commit will replace it wholesale.
-	db *memdb.MemDB
-
-	pub *stream.EventPublisher
-
-	// eventLock is used to serialize operations that result in the publishing of
-	// events (i.e. writes and deletes) to ensure correct ordering when there are
-	// concurrent writers.
-	//
-	// We cannot rely on MemDB's write lock for this, because events must be
-	// published *after* the transaction is committed to provide monotonic reads
-	// between Watch and Read calls. In other words, if we were to publish an event
-	// before the transaction was committed, there would be a small window of time
-	// where a watcher (e.g. controller) could try to Read the resource and not get
-	// the version they were notified about.
-	//
-	// Without this lock, it would be possible to publish events out-of-order.
-	eventLock sync.Mutex
-}
-
-// NewStore creates a Store.
-//
-// You must call Run before using the store.
-func NewStore() (*Store, error) {
-	db, err := newDB()
-	if err != nil {
-		return nil, err
-	}
-
-	s := &Store{
-		db:  db,
-		pub: stream.NewEventPublisher(10 * time.Second),
-	}
-	s.pub.RegisterHandler(eventTopic, s.watchSnapshot, false)
-
-	return s, nil
-}
-
-// Run until the given context is canceled. This method blocks, so should be
-// called in a goroutine.
-func (s *Store) Run(ctx context.Context) { s.pub.Run(ctx) }
-
-// Read a resource using its ID.
-//
-// For more information, see the storage.Backend documentation.
-func (s *Store) Read(id *pbresource.ID) (*pbresource.Resource, error) {
-	tx := s.txn(false)
-
-	defer tx.Abort()
-
-	val, err := tx.First(tableNameResources, indexNameID, id)
-	if err != nil {
-		return nil, err
-	}
-	if val == nil {
-		return nil, storage.ErrNotFound
-	}
-
-	res := val.(*pbresource.Resource)
-
-	// Observe the Uid if it was given.
-	if id.Uid != "" && res.Id.Uid != id.Uid {
-		return nil, storage.ErrNotFound
-	}
-
-	// Let the caller know they need to upgrade/downgrade the schema version.
-	if id.Type.GroupVersion != res.Id.Type.GroupVersion {
-		return nil, storage.GroupVersionMismatchError{
-			RequestedType: id.Type,
-			Stored:        res,
-		}
-	}
-
-	return res, nil
-}
-
-// WriteCAS performs an atomic Compare-And-Swap (CAS) write of a resource.
-//
-// For more information, see the storage.Backend documentation.
-func (s *Store) WriteCAS(res *pbresource.Resource, vsn string) error {
-	s.eventLock.Lock()
-	defer s.eventLock.Unlock()
-
-	tx := s.txn(true)
-	defer tx.Abort()
-
-	existing, err := tx.First(tableNameResources, indexNameID, res.Id)
-	if err != nil {
-		return err
-	}
-
-	// Callers provide an empty version string on initial resource creation.
-	if existing == nil && vsn != "" {
-		return storage.ErrCASFailure
-	}
-
-	if existing != nil {
-		existingRes := existing.(*pbresource.Resource)
-
-		// Uid is immutable.
-		if existingRes.Id.Uid != res.Id.Uid {
-			return storage.ErrWrongUid
-		}
-
-		// Ensure CAS semantics.
-		if existingRes.Version != vsn {
-			return storage.ErrCASFailure
-		}
-	}
-
-	if err := tx.Insert(tableNameResources, res); err != nil {
-		return err
-	}
-
-	idx, err := incrementEventIndex(tx)
-	if err != nil {
-		return nil
-	}
-	tx.Commit()
-
-	s.publishEvent(idx, pbresource.WatchEvent_OPERATION_UPSERT, res)
-
-	return nil
-}
-
-// DeleteCAS performs an atomic Compare-And-Swap (CAS) deletion of a resource.
-//
-// For more information, see the storage.Backend documentation.
-func (s *Store) DeleteCAS(id *pbresource.ID, vsn string) error {
-	s.eventLock.Lock()
-	defer s.eventLock.Unlock()
-
-	tx := s.txn(true)
-	defer tx.Abort()
-
-	existing, err := tx.First(tableNameResources, indexNameID, id)
-	if err != nil {
-		return err
-	}
-
-	// Deleting an already deleted resource is a no-op.
-	if existing == nil {
-		return nil
-	}
-
-	res := existing.(*pbresource.Resource)
-
-	// Deleting a resource using a previous Uid is a no-op.
-	if id.Uid != res.Id.Uid {
-		return nil
-	}
-
-	// Ensure CAS semantics.
-	if vsn != res.Version {
-		return storage.ErrCASFailure
-	}
-
-	if err := tx.Delete(tableNameResources, id); err != nil {
-		return err
-	}
-
-	idx, err := incrementEventIndex(tx)
-	if err != nil {
-		return nil
-	}
-	tx.Commit()
-
-	s.publishEvent(idx, pbresource.WatchEvent_OPERATION_DELETE, res)
-
-	return nil
-}
-
-// List resources of the given type, tenancy, and optionally matching the given
-// name prefix.
-//
-// For more information, see the storage.Backend documentation.
-func (s *Store) List(typ storage.UnversionedType, ten *pbresource.Tenancy, namePrefix string) ([]*pbresource.Resource, error) {
-	tx := s.txn(false)
-	defer tx.Abort()
-
-	return listTxn(tx, query{typ, ten, namePrefix})
-}
-
-func listTxn(tx *memdb.Txn, q query) ([]*pbresource.Resource, error) {
-	iter, err := tx.Get(tableNameResources, indexNameID+"_prefix", q)
-	if err != nil {
-		return nil, err
-	}
-
-	list := make([]*pbresource.Resource, 0)
-	for v := iter.Next(); v != nil; v = iter.Next() {
-		res := v.(*pbresource.Resource)
-
-		if q.matches(res) {
-			list = append(list, res)
-		}
-	}
-	return list, nil
-}
-
-// WatchList watches resources of the given type, tenancy, and optionally
-// matching the given name prefix.
-//
-// For more information, see the storage.Backend documentation.
-func (s *Store) WatchList(typ storage.UnversionedType, ten *pbresource.Tenancy, namePrefix string) (*Watch, error) {
-	// If the user specifies a wildcard, we subscribe to events for resources in
-	// all partitions, peers, and namespaces, and manually filter out irrelevant
-	// stuff (in Watch.Next).
-	//
-	// If the user gave exact tenancy values, we can subscribe to events for the
-	// relevant resources only, which is far more efficient.
-	var sub stream.Subject
-	if ten.Partition == storage.Wildcard ||
-		ten.PeerName == storage.Wildcard ||
-		ten.Namespace == storage.Wildcard {
-		sub = wildcardSubject{typ}
-	} else {
-		sub = tenancySubject{typ, ten}
-	}
-
-	ss, err := s.pub.Subscribe(&stream.SubscribeRequest{
-		Topic:   eventTopic,
-		Subject: sub,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return &Watch{
-		sub: ss,
-		query: query{
-			resourceType: typ,
-			tenancy:      ten,
-			namePrefix:   namePrefix,
-		},
-	}, nil
-}
-
-// ListByOwner returns resources owned by the resource with the given ID.
-//
-// For more information, see the storage.Backend documentation.
-func (s *Store) ListByOwner(id *pbresource.ID) ([]*pbresource.Resource, error) {
-	tx := s.txn(false)
-	defer tx.Abort()
-
-	iter, err := tx.Get(tableNameResources, indexNameOwner, id)
-	if err != nil {
-		return nil, err
-	}
-
-	var res []*pbresource.Resource
-	for v := iter.Next(); v != nil; v = iter.Next() {
-		res = append(res, v.(*pbresource.Resource))
-	}
-	return res, nil
-}
-
-func (s *Store) txn(write bool) *memdb.Txn {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-
-	return s.db.Txn(write)
-}
diff --git a/internal/storage/inmem/watch.go b/internal/storage/inmem/watch.go
deleted file mode 100644
index bdab0fc5ee864..0000000000000
--- a/internal/storage/inmem/watch.go
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package inmem
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/agent/consul/stream"
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/proto/private/pbsubscribe"
-)
-
-// Watch implements the storage.Watch interface using a stream.Subscription.
-type Watch struct {
-	sub   *stream.Subscription
-	query query
-
-	// events holds excess events when they are bundled in a stream.PayloadEvents,
-	// until Next is called again.
-	events []stream.Event
-}
-
-// Next returns the next WatchEvent, blocking until one is available.
-func (w *Watch) Next(ctx context.Context) (*pbresource.WatchEvent, error) {
-	for {
-		e, err := w.nextEvent(ctx)
-		if err == stream.ErrSubForceClosed {
-			return nil, storage.ErrWatchClosed
-		}
-		if err != nil {
-			return nil, err
-		}
-
-		event := e.Payload.(eventPayload).event
-		if w.query.matches(event.Resource) {
-			return event, nil
-		}
-	}
-}
-
-func (w *Watch) nextEvent(ctx context.Context) (*stream.Event, error) {
-	if len(w.events) != 0 {
-		event := w.events[0]
-		w.events = w.events[1:]
-		return &event, nil
-	}
-
-	var idx uint64
-	for {
-		e, err := w.sub.Next(ctx)
-		if err != nil {
-			return nil, err
-		}
-
-		if e.IsFramingEvent() {
-			continue
-		}
-
-		// This works around a *very* rare race-condition in the EventPublisher where
-		// it's possible to see duplicate events when events are published at the same
-		// time as the first subscription is created on a {topic, subject} pair.
-		//
-		// We see this problem when a call to WriteCAS is happening in parallel with
-		// a call to WatchList. It happens because our snapshot handler returns events
-		// that have not yet been published (in the gap between us committing changes
-		// to MemDB and the EventPublisher dispatching events onto its event buffers).
-		//
-		// An intuitive solution to this problem would be to take eventLock in the
-		// snapshot handler to avoid it racing with publishing, but this does not
-		// work because publishing is asynchronous.
-		//
-		// We should fix this problem at the root, but it's complicated, so for now
-		// we'll work around it.
-		if e.Index <= idx {
-			continue
-		}
-		idx = e.Index
-
-		switch t := e.Payload.(type) {
-		case eventPayload:
-			return &e, nil
-		case *stream.PayloadEvents:
-			if len(t.Items) == 0 {
-				continue
-			}
-
-			event, rest := t.Items[0], t.Items[1:]
-			w.events = rest
-			return &event, nil
-		}
-	}
-}
-
-// Close the watch and free its associated resources.
-func (w *Watch) Close() { w.sub.Unsubscribe() }
-
-var eventTopic = stream.StringTopic("resources")
-
-type eventPayload struct {
-	subject stream.Subject
-	event   *pbresource.WatchEvent
-}
-
-func (p eventPayload) Subject() stream.Subject { return p.subject }
-
-// These methods are required by the stream.Payload interface, but we don't use them.
-func (eventPayload) HasReadPermission(acl.Authorizer) bool         { return false }
-func (eventPayload) ToSubscriptionEvent(uint64) *pbsubscribe.Event { return nil }
-
-type wildcardSubject struct {
-	resourceType storage.UnversionedType
-}
-
-func (s wildcardSubject) String() string {
-	return s.resourceType.Group + indexSeparator +
-		s.resourceType.Kind + indexSeparator +
-		storage.Wildcard
-}
-
-type tenancySubject struct {
-	resourceType storage.UnversionedType
-	tenancy      *pbresource.Tenancy
-}
-
-func (s tenancySubject) String() string {
-	return s.resourceType.Group + indexSeparator +
-		s.resourceType.Kind + indexSeparator +
-		s.tenancy.Partition + indexSeparator +
-		s.tenancy.PeerName + indexSeparator +
-		s.tenancy.Namespace
-}
-
-// publishEvent sends the event to the relevant Watches.
-func (s *Store) publishEvent(idx uint64, op pbresource.WatchEvent_Operation, res *pbresource.Resource) {
-	id := res.Id
-	resourceType := storage.UnversionedTypeFrom(id.Type)
-	event := &pbresource.WatchEvent{Operation: op, Resource: res}
-
-	// We publish two copies of the event: one to the tenancy-specific subject and
-	// another to a wildcard subject. Ideally, we'd be able to put the type in the
-	// topic instead and use stream.SubjectWildcard, but this requires knowing all
-	// types up-front (to register the snapshot handlers).
-	s.pub.Publish([]stream.Event{
-		{
-			Topic: eventTopic,
-			Index: idx,
-			Payload: eventPayload{
-				subject: wildcardSubject{resourceType},
-				event:   event,
-			},
-		},
-		{
-			Topic: eventTopic,
-			Index: idx,
-			Payload: eventPayload{
-				subject: tenancySubject{
-					resourceType: resourceType,
-					tenancy:      id.Tenancy,
-				},
-				event: event,
-			},
-		},
-	})
-}
-
-// watchSnapshot implements a stream.SnapshotFunc to provide upsert events for
-// the initial state of the world.
-func (s *Store) watchSnapshot(req stream.SubscribeRequest, snap stream.SnapshotAppender) (uint64, error) {
-	var q query
-	switch t := req.Subject.(type) {
-	case tenancySubject:
-		q.resourceType = t.resourceType
-		q.tenancy = t.tenancy
-	case wildcardSubject:
-		q.resourceType = t.resourceType
-		q.tenancy = &pbresource.Tenancy{
-			Partition: storage.Wildcard,
-			PeerName:  storage.Wildcard,
-			Namespace: storage.Wildcard,
-		}
-	default:
-		return 0, fmt.Errorf("unhandled subject type: %T", req.Subject)
-	}
-
-	tx := s.txn(false)
-	defer tx.Abort()
-
-	idx, err := currentEventIndex(tx)
-	if err != nil {
-		return 0, err
-	}
-
-	results, err := listTxn(tx, q)
-	if err != nil {
-		return 0, nil
-	}
-
-	events := make([]stream.Event, len(results))
-	for i, r := range results {
-		events[i] = stream.Event{
-			Topic: eventTopic,
-			Index: idx,
-			Payload: eventPayload{
-				subject: req.Subject,
-				event: &pbresource.WatchEvent{
-					Operation: pbresource.WatchEvent_OPERATION_UPSERT,
-					Resource:  r,
-				},
-			},
-		}
-	}
-	snap.Append(events)
-
-	return idx, nil
-}
diff --git a/internal/storage/raft/backend.go b/internal/storage/raft/backend.go
deleted file mode 100644
index 8a7a973c3e7cf..0000000000000
--- a/internal/storage/raft/backend.go
+++ /dev/null
@@ -1,350 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package raft
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"strconv"
-
-	"golang.org/x/sync/errgroup"
-	"google.golang.org/grpc"
-
-	"github.com/hashicorp/go-hclog"
-
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/internal/storage/inmem"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-
-	pbstorage "github.com/hashicorp/consul/proto/private/pbstorage"
-)
-
-// NewBackend returns a storage backend that uses Raft for durable persistence
-// and serves reads from an in-memory database. It's suitable for production use.
-//
-// It's not an entirely clean abstraction because rather than owning the Raft
-// subsystem directly, it has to integrate with the existing FSM and related
-// machinery from before generic resources.
-//
-// The given Handle will be used to apply logs and interrogate leadership state.
-// In certain restricted circumstances, Handle may be nil, such as during tests
-// that only exercise snapshot restoration, or when initializing a throwaway FSM
-// during peers.json recovery - but calling any of the data access methods (read
-// or write) will result in a panic.
-//
-// With Raft, writes and strongly consistent reads must be done on the leader.
-// Backend implements a gRPC server, which followers will use to transparently
-// forward operations to the leader. To do so, they will obtain a connection
-// using Handle.DialLeader. Connections are cached for re-use, so when there's
-// a new leader, you must call LeaderChanged to refresh the connection. Leaders
-// must accept connections and hand them off by calling Backend.HandleConnection.
-// Backend's gRPC client and server *DO NOT* handle TLS themselves, as they are
-// intended to communicate over Consul's multiplexed server port (which handles
-// TLS).
-//
-// For more information, see here:
-// https://github.com/hashicorp/consul/tree/main/docs/resources#raft-storage-backend
-//
-// You must call Run before using the backend.
-func NewBackend(h Handle, l hclog.Logger) (*Backend, error) {
-	s, err := inmem.NewStore()
-	if err != nil {
-		return nil, err
-	}
-	b := &Backend{handle: h, store: s}
-	b.forwardingServer = newForwardingServer(b)
-	b.forwardingClient = newForwardingClient(h, l)
-	return b, nil
-}
-
-// Handle provides glue for interacting with the Raft subsystem via existing
-// machinery on consul.Server.
-type Handle interface {
-	// Apply the given log message.
-	Apply(msg []byte) (any, error)
-
-	// IsLeader determines if this server is the Raft leader (so can handle writes).
-	IsLeader() bool
-
-	// EnsureStrongConsistency checks the server is able to handle consistent reads by
-	// verifying its leadership and checking the FSM has applied all queued writes.
-	EnsureStrongConsistency(ctx context.Context) error
-
-	// DialLeader dials a gRPC connection to the leader for forwarding.
-	DialLeader() (*grpc.ClientConn, error)
-}
-
-// Backend is a Raft-backed storage backend implementation.
-type Backend struct {
-	handle Handle
-	store  *inmem.Store
-
-	forwardingServer *forwardingServer
-	forwardingClient *forwardingClient
-}
-
-// Run until the given context is canceled. This method blocks, so should be
-// called in a goroutine.
-func (b *Backend) Run(ctx context.Context) {
-	group, groupCtx := errgroup.WithContext(ctx)
-
-	group.Go(func() error {
-		b.store.Run(groupCtx)
-		return nil
-	})
-
-	group.Go(func() error {
-		return b.forwardingServer.run(groupCtx)
-	})
-
-	group.Wait()
-}
-
-// Read implements the storage.Backend interface.
-func (b *Backend) Read(ctx context.Context, consistency storage.ReadConsistency, id *pbresource.ID) (*pbresource.Resource, error) {
-	// Easy case. Both leaders and followers can read from the local store.
-	if consistency == storage.EventualConsistency {
-		return b.store.Read(id)
-	}
-
-	if consistency != storage.StrongConsistency {
-		return nil, fmt.Errorf("%w: unknown consistency: %s", storage.ErrInconsistent, consistency)
-	}
-
-	// We are the leader. Handle the request ourself.
-	if b.handle.IsLeader() {
-		return b.leaderRead(ctx, id)
-	}
-
-	// Forward the request to the leader.
-	rsp, err := b.forwardingClient.read(ctx, &pbstorage.ReadRequest{Id: id})
-	if err != nil {
-		return nil, err
-	}
-	return rsp.GetResource(), nil
-}
-
-func (b *Backend) leaderRead(ctx context.Context, id *pbresource.ID) (*pbresource.Resource, error) {
-	if err := b.ensureStrongConsistency(ctx); err != nil {
-		return nil, err
-	}
-	return b.store.Read(id)
-}
-
-// WriteCAS implements the storage.Backend interface.
-func (b *Backend) WriteCAS(ctx context.Context, res *pbresource.Resource) (*pbresource.Resource, error) {
-	req := &pbstorage.WriteRequest{Resource: res}
-
-	if b.handle.IsLeader() {
-		rsp, err := b.raftApply(&pbstorage.Log{
-			Type: pbstorage.LogType_LOG_TYPE_WRITE,
-			Request: &pbstorage.Log_Write{
-				Write: req,
-			},
-		})
-		if err != nil {
-			return nil, err
-		}
-		return rsp.GetWrite().GetResource(), nil
-	}
-
-	rsp, err := b.forwardingClient.write(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-	return rsp.GetResource(), nil
-}
-
-// DeleteCAS implements the storage.Backend interface.
-func (b *Backend) DeleteCAS(ctx context.Context, id *pbresource.ID, version string) error {
-	req := &pbstorage.DeleteRequest{
-		Id:      id,
-		Version: version,
-	}
-
-	if b.handle.IsLeader() {
-		_, err := b.raftApply(&pbstorage.Log{
-			Type: pbstorage.LogType_LOG_TYPE_DELETE,
-			Request: &pbstorage.Log_Delete{
-				Delete: req,
-			},
-		})
-		return err
-	}
-
-	return b.forwardingClient.delete(ctx, req)
-}
-
-// List implements the storage.Backend interface.
-func (b *Backend) List(ctx context.Context, consistency storage.ReadConsistency, resType storage.UnversionedType, tenancy *pbresource.Tenancy, namePrefix string) ([]*pbresource.Resource, error) {
-	// Easy case. Both leaders and followers can read from the local store.
-	if consistency == storage.EventualConsistency {
-		return b.store.List(resType, tenancy, namePrefix)
-	}
-
-	if consistency != storage.StrongConsistency {
-		return nil, fmt.Errorf("%w: unknown consistency: %s", storage.ErrInconsistent, consistency)
-	}
-
-	// We are the leader. Handle the request ourself.
-	if b.handle.IsLeader() {
-		return b.leaderList(ctx, resType, tenancy, namePrefix)
-	}
-
-	// Forward the request to the leader.
-	rsp, err := b.forwardingClient.list(ctx, &pbstorage.ListRequest{
-		Type: &pbresource.Type{
-			Group: resType.Group,
-			Kind:  resType.Kind,
-		},
-		Tenancy:    tenancy,
-		NamePrefix: namePrefix,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return rsp.GetResources(), nil
-}
-
-func (b *Backend) leaderList(ctx context.Context, resType storage.UnversionedType, tenancy *pbresource.Tenancy, namePrefix string) ([]*pbresource.Resource, error) {
-	if err := b.ensureStrongConsistency(ctx); err != nil {
-		return nil, err
-	}
-	return b.store.List(resType, tenancy, namePrefix)
-}
-
-// WatchList implements the storage.Backend interface.
-func (b *Backend) WatchList(_ context.Context, resType storage.UnversionedType, tenancy *pbresource.Tenancy, namePrefix string) (storage.Watch, error) {
-	return b.store.WatchList(resType, tenancy, namePrefix)
-}
-
-// ListByOwner implements the storage.Backend interface.
-func (b *Backend) ListByOwner(_ context.Context, id *pbresource.ID) ([]*pbresource.Resource, error) {
-	return b.store.ListByOwner(id)
-}
-
-// Apply is called by the FSM with the bytes of a Raft log entry, with Consul's
-// envelope (i.e. type prefix and msgpack wrapper) stripped off.
-func (b *Backend) Apply(buf []byte, idx uint64) any {
-	var req pbstorage.Log
-	if err := req.UnmarshalBinary(buf); err != nil {
-		return fmt.Errorf("failed to decode request: %w", err)
-	}
-
-	switch req.Type {
-	case pbstorage.LogType_LOG_TYPE_WRITE:
-		res := req.GetWrite().GetResource()
-		oldVsn := res.Version
-		res.Version = strconv.Itoa(int(idx))
-
-		if err := b.store.WriteCAS(res, oldVsn); err != nil {
-			return err
-		}
-
-		return &pbstorage.LogResponse{
-			Response: &pbstorage.LogResponse_Write{
-				Write: &pbstorage.WriteResponse{Resource: res},
-			},
-		}
-	case pbstorage.LogType_LOG_TYPE_DELETE:
-		req := req.GetDelete()
-		if err := b.store.DeleteCAS(req.Id, req.Version); err != nil {
-			return err
-		}
-		return &pbstorage.LogResponse{
-			Response: &pbstorage.LogResponse_Delete{},
-		}
-	}
-
-	return fmt.Errorf("unexpected request type: %s", req.Type)
-}
-
-// LeaderChanged should be called whenever the current Raft leader changes, to
-// drop and re-create the gRPC connection used for forwarding.
-func (b *Backend) LeaderChanged() { b.forwardingClient.leaderChanged() }
-
-// HandleConnection should be called whenever a forwarding connection is opened.
-func (b *Backend) HandleConnection(conn net.Conn) { b.forwardingServer.listener.Handle(conn) }
-
-// raftApply round trips the given request through the Raft log and FSM.
-func (b *Backend) raftApply(req *pbstorage.Log) (*pbstorage.LogResponse, error) {
-	msg, err := req.MarshalBinary()
-	if err != nil {
-		return nil, err
-	}
-
-	rsp, err := b.handle.Apply(msg)
-	if err != nil {
-		return nil, err
-	}
-
-	switch t := rsp.(type) {
-	case *pbstorage.LogResponse:
-		return t, nil
-	default:
-		return nil, fmt.Errorf("unexpected response from Raft apply: %T", rsp)
-	}
-}
-
-func (b *Backend) ensureStrongConsistency(ctx context.Context) error {
-	if err := b.handle.EnsureStrongConsistency(ctx); err != nil {
-		return fmt.Errorf("%w: %v", storage.ErrInconsistent, err)
-	}
-	return nil
-}
-
-// Snapshot obtains a point-in-time snapshot of the backend's state, so that it
-// can be written to disk as a backup or sent to bootstrap a follower.
-func (b *Backend) Snapshot() (*Snapshot, error) {
-	s, err := b.store.Snapshot()
-	if err != nil {
-		return nil, err
-	}
-	return &Snapshot{s}, nil
-}
-
-// Snapshot is a point-in-time snapshot of a backend's state.
-type Snapshot struct{ s *inmem.Snapshot }
-
-// Next returns the next resource in the snapshot, protobuf encoded. nil bytes
-// will be returned when the end of the snapshot has been reached.
-func (s *Snapshot) Next() ([]byte, error) {
-	res := s.s.Next()
-	if res == nil {
-		return nil, nil
-	}
-	return res.MarshalBinary()
-}
-
-// Restore starts the process of restoring a snapshot (i.e. from an on-disk
-// backup, or to bootstrap from a leader).
-//
-// Callers *must* call Abort or Commit when done, to free resources.
-func (b *Backend) Restore() (*Restoration, error) {
-	r, err := b.store.Restore()
-	if err != nil {
-		return nil, err
-	}
-	return &Restoration{r}, nil
-}
-
-// Restoration is a handle that can be used to restore a snapshot.
-type Restoration struct{ r *inmem.Restoration }
-
-// Apply the given protobuf-encoded resource to the backend.
-func (r *Restoration) Apply(msg []byte) error {
-	var res pbresource.Resource
-	if err := res.UnmarshalBinary(msg); err != nil {
-		return err
-	}
-	return r.r.Apply(&res)
-}
-
-// Commit the restoration.
-func (r *Restoration) Commit() { r.r.Commit() }
-
-// Abort the restoration. It's safe to always call this in a defer statement
-// because aborting a committed restoration is a no-op.
-func (r *Restoration) Abort() { r.r.Abort() }
diff --git a/internal/storage/raft/conformance_test.go b/internal/storage/raft/conformance_test.go
deleted file mode 100644
index 6c75e462d21c3..0000000000000
--- a/internal/storage/raft/conformance_test.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package raft_test
-
-import (
-	"context"
-	"errors"
-	"math/rand"
-	"net"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-
-	"github.com/hashicorp/consul/internal/storage"
-	"github.com/hashicorp/consul/internal/storage/conformance"
-	"github.com/hashicorp/consul/internal/storage/raft"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-func TestBackend_Conformance(t *testing.T) {
-	t.Run("Leader", func(t *testing.T) {
-		conformance.Test(t, conformance.TestOptions{
-			NewBackend: func(t *testing.T) storage.Backend {
-				leader, _ := newRaftCluster(t)
-				return leader
-			},
-			SupportsStronglyConsistentList: true,
-		})
-	})
-
-	t.Run("Follower", func(t *testing.T) {
-		conformance.Test(t, conformance.TestOptions{
-			NewBackend: func(t *testing.T) storage.Backend {
-				_, follower := newRaftCluster(t)
-				return follower
-			},
-			SupportsStronglyConsistentList: true,
-		})
-	})
-}
-
-func newRaftCluster(t *testing.T) (*raft.Backend, *raft.Backend) {
-	t.Helper()
-
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-
-	lis, err := net.Listen("tcp", ":0")
-	require.NoError(t, err)
-
-	lc, err := grpc.DialContext(ctx, lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
-	require.NoError(t, err)
-
-	lh := &leaderHandle{replCh: make(chan log, 10)}
-	leader, err := raft.NewBackend(lh, testutil.Logger(t))
-	require.NoError(t, err)
-	lh.backend = leader
-	go leader.Run(ctx)
-
-	go func() {
-		for {
-			conn, err := lis.Accept()
-			if errors.Is(err, net.ErrClosed) {
-				return
-			}
-			require.NoError(t, err)
-			go leader.HandleConnection(conn)
-		}
-	}()
-
-	follower, err := raft.NewBackend(&followerHandle{leaderConn: lc}, testutil.Logger(t))
-	require.NoError(t, err)
-	go follower.Run(ctx)
-	follower.LeaderChanged()
-
-	go lh.replicate(t, follower)
-
-	return leader, follower
-}
-
-type followerHandle struct {
-	leaderConn *grpc.ClientConn
-}
-
-func (followerHandle) Apply([]byte) (any, error) {
-	return nil, errors.New("not leader")
-}
-
-func (followerHandle) IsLeader() bool {
-	return false
-}
-
-func (followerHandle) EnsureStrongConsistency(context.Context) error {
-	return errors.New("not leader")
-}
-
-func (f *followerHandle) DialLeader() (*grpc.ClientConn, error) {
-	return f.leaderConn, nil
-}
-
-type leaderHandle struct {
-	index  uint64
-	replCh chan log
-
-	backend *raft.Backend
-}
-
-type log struct {
-	idx uint64
-	msg []byte
-}
-
-func (l *leaderHandle) Apply(msg []byte) (any, error) {
-	idx := atomic.AddUint64(&l.index, 1)
-
-	// Apply the operation to the leader synchronously and capture its response
-	// to return to the caller.
-	rsp := l.backend.Apply(msg, idx)
-
-	// Replicate the operation to the follower asynchronously.
-	l.replCh <- log{idx, msg}
-
-	if err, ok := rsp.(error); ok {
-		return nil, err
-	}
-	return rsp, nil
-}
-
-func (leaderHandle) IsLeader() bool {
-	return true
-}
-
-func (leaderHandle) EnsureStrongConsistency(context.Context) error {
-	return nil
-}
-
-func (leaderHandle) DialLeader() (*grpc.ClientConn, error) {
-	return nil, errors.New("leader should not dial itself")
-}
-
-func (h *leaderHandle) replicate(t *testing.T, follower *raft.Backend) {
-	doneCh := make(chan struct{})
-	t.Cleanup(func() { close(doneCh) })
-
-	timer := time.NewTimer(replicationLag())
-	defer timer.Stop()
-
-	for {
-		select {
-		case <-timer.C:
-			select {
-			case l := <-h.replCh:
-				_ = follower.Apply(l.msg, l.idx)
-			default:
-			}
-			timer.Reset(replicationLag())
-		case <-doneCh:
-			return
-		}
-	}
-}
-
-func replicationLag() time.Duration {
-	if testing.Short() {
-		return 0
-	}
-	return time.Duration(rand.Intn(50)) * time.Millisecond
-}
diff --git a/internal/storage/raft/forwarding.go b/internal/storage/raft/forwarding.go
deleted file mode 100644
index 2700339afbe58..0000000000000
--- a/internal/storage/raft/forwarding.go
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package raft
-
-import (
-	"context"
-	"errors"
-	"net"
-	"sync"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/types/known/emptypb"
-
-	"github.com/hashicorp/go-hclog"
-
-	grpcinternal "github.com/hashicorp/consul/agent/grpc-internal"
-	"github.com/hashicorp/consul/internal/storage"
-	pbstorage "github.com/hashicorp/consul/proto/private/pbstorage"
-)
-
-// forwardingServer implements the gRPC forwarding service.
-type forwardingServer struct {
-	backend  *Backend
-	listener *grpcinternal.Listener
-}
-
-var _ pbstorage.ForwardingServiceServer = (*forwardingServer)(nil)
-
-func newForwardingServer(backend *Backend) *forwardingServer {
-	return &forwardingServer{
-		backend: backend,
-
-		// The address here doesn't actually matter. gRPC uses it as an identifier
-		// internally, but we only bind the server to a single listener.
-		listener: grpcinternal.NewListener(&net.TCPAddr{
-			IP:   net.ParseIP("0.0.0.0"),
-			Port: 0,
-		}),
-	}
-}
-
-func (s *forwardingServer) Write(ctx context.Context, req *pbstorage.WriteRequest) (*pbstorage.WriteResponse, error) {
-	rsp, err := s.raftApply(ctx, &pbstorage.Log{
-		Type:    pbstorage.LogType_LOG_TYPE_WRITE,
-		Request: &pbstorage.Log_Write{Write: req},
-	})
-	if err != nil {
-		return nil, err
-	}
-	return rsp.GetWrite(), nil
-}
-
-func (s *forwardingServer) Delete(ctx context.Context, req *pbstorage.DeleteRequest) (*emptypb.Empty, error) {
-	_, err := s.raftApply(ctx, &pbstorage.Log{
-		Type:    pbstorage.LogType_LOG_TYPE_DELETE,
-		Request: &pbstorage.Log_Delete{Delete: req},
-	})
-	if err != nil {
-		return nil, err
-	}
-	return &emptypb.Empty{}, nil
-}
-
-func (s *forwardingServer) Read(ctx context.Context, req *pbstorage.ReadRequest) (*pbstorage.ReadResponse, error) {
-	res, err := s.backend.leaderRead(ctx, req.Id)
-	if err != nil {
-		return nil, wrapError(err)
-	}
-	return &pbstorage.ReadResponse{Resource: res}, nil
-}
-
-func (s *forwardingServer) List(ctx context.Context, req *pbstorage.ListRequest) (*pbstorage.ListResponse, error) {
-	res, err := s.backend.leaderList(ctx, storage.UnversionedTypeFrom(req.Type), req.Tenancy, req.NamePrefix)
-	if err != nil {
-		return nil, wrapError(err)
-	}
-	return &pbstorage.ListResponse{Resources: res}, nil
-}
-
-func (s *forwardingServer) raftApply(_ context.Context, req *pbstorage.Log) (*pbstorage.LogResponse, error) {
-	msg, err := req.MarshalBinary()
-	if err != nil {
-		return nil, wrapError(err)
-	}
-
-	rsp, err := s.backend.handle.Apply(msg)
-	if err != nil {
-		return nil, wrapError(err)
-	}
-
-	switch t := rsp.(type) {
-	case *pbstorage.LogResponse:
-		return t, nil
-	default:
-		return nil, status.Errorf(codes.Internal, "unexpected response from Raft apply: %T", rsp)
-	}
-}
-
-func (s *forwardingServer) run(ctx context.Context) error {
-	server := grpc.NewServer()
-	pbstorage.RegisterForwardingServiceServer(server, s)
-
-	go func() {
-		<-ctx.Done()
-		server.Stop()
-	}()
-
-	return server.Serve(s.listener)
-}
-
-// forwardingClient is used to forward operations to the leader.
-type forwardingClient struct {
-	handle Handle
-	logger hclog.Logger
-
-	mu   sync.RWMutex
-	conn *grpc.ClientConn
-}
-
-func newForwardingClient(h Handle, l hclog.Logger) *forwardingClient {
-	return &forwardingClient{
-		handle: h,
-		logger: l,
-	}
-}
-
-func (c *forwardingClient) leaderChanged() {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	if c.conn == nil {
-		return
-	}
-
-	if err := c.conn.Close(); err != nil {
-		c.logger.Error("failed to close connection to previous leader", "error", err)
-	}
-	c.conn = nil
-}
-
-func (c *forwardingClient) getConn() (*grpc.ClientConn, error) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	if c.conn != nil {
-		return c.conn, nil
-	}
-
-	conn, err := c.handle.DialLeader()
-	if err != nil {
-		c.logger.Error("failed to dial leader", "error", err)
-		return nil, err
-	}
-	c.conn = conn
-
-	return conn, nil
-}
-
-func (c *forwardingClient) getClient() (pbstorage.ForwardingServiceClient, error) {
-	conn, err := c.getConn()
-	if err != nil {
-		return nil, err
-	}
-	return pbstorage.NewForwardingServiceClient(conn), nil
-}
-
-func (c *forwardingClient) delete(ctx context.Context, req *pbstorage.DeleteRequest) error {
-	client, err := c.getClient()
-	if err != nil {
-		return err
-	}
-	_, err = client.Delete(ctx, req)
-	return unwrapError(err)
-}
-
-func (c *forwardingClient) write(ctx context.Context, req *pbstorage.WriteRequest) (*pbstorage.WriteResponse, error) {
-	client, err := c.getClient()
-	if err != nil {
-		return nil, err
-	}
-	rsp, err := client.Write(ctx, req)
-	return rsp, unwrapError(err)
-}
-
-func (c *forwardingClient) read(ctx context.Context, req *pbstorage.ReadRequest) (*pbstorage.ReadResponse, error) {
-	client, err := c.getClient()
-	if err != nil {
-		return nil, err
-	}
-	rsp, err := client.Read(ctx, req)
-	return rsp, unwrapError(err)
-}
-
-func (c *forwardingClient) list(ctx context.Context, req *pbstorage.ListRequest) (*pbstorage.ListResponse, error) {
-	client, err := c.getClient()
-	if err != nil {
-		return nil, err
-	}
-	rsp, err := client.List(ctx, req)
-	return rsp, unwrapError(err)
-}
-
-var (
-	errorToCode = map[error]codes.Code{
-		// Note: OutOfRange is used to represent GroupVersionMismatchError, but is
-		// handled specially in wrapError and unwrapError because it has extra details.
-		storage.ErrNotFound:     codes.NotFound,
-		storage.ErrCASFailure:   codes.Aborted,
-		storage.ErrWrongUid:     codes.AlreadyExists,
-		storage.ErrInconsistent: codes.FailedPrecondition,
-	}
-
-	codeToError = func() map[codes.Code]error {
-		inverted := make(map[codes.Code]error, len(errorToCode))
-		for k, v := range errorToCode {
-			inverted[v] = k
-		}
-		return inverted
-	}()
-)
-
-// wrapError converts the given error to a gRPC status to send over the wire.
-func wrapError(err error) error {
-	var gvm storage.GroupVersionMismatchError
-	if errors.As(err, &gvm) {
-		s, err := status.New(codes.OutOfRange, err.Error()).
-			WithDetails(&pbstorage.GroupVersionMismatchErrorDetails{
-				RequestedType: gvm.RequestedType,
-				Stored:        gvm.Stored,
-			})
-		if err == nil {
-			return s.Err()
-		}
-	}
-
-	code, ok := errorToCode[err]
-	if !ok {
-		code = codes.Internal
-	}
-	return status.Error(code, err.Error())
-}
-
-// unwrapError converts the given gRPC status error back to a storage package
-// error.
-func unwrapError(err error) error {
-	s, ok := status.FromError(err)
-	if !ok {
-		return err
-	}
-
-	for _, d := range s.Details() {
-		if gvm, ok := d.(*pbstorage.GroupVersionMismatchErrorDetails); ok {
-			return storage.GroupVersionMismatchError{
-				RequestedType: gvm.RequestedType,
-				Stored:        gvm.Stored,
-			}
-		}
-	}
-
-	unwrapped, ok := codeToError[s.Code()]
-	if !ok {
-		return err
-	}
-	return unwrapped
-}
diff --git a/internal/storage/storage.go b/internal/storage/storage.go
deleted file mode 100644
index 4411bc77caf03..0000000000000
--- a/internal/storage/storage.go
+++ /dev/null
@@ -1,322 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package storage
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// Wildcard can be given as Tenancy fields in List and Watch calls, to enumerate
-// resources across multiple partitions, peers, namespaces, etc.
-const Wildcard = "*"
-
-var (
-	// ErrNotFound indicates that the resource could not be found.
-	ErrNotFound = errors.New("resource not found")
-
-	// ErrCASFailure indicates that the attempted write failed because the given
-	// version does not match what is currently stored.
-	ErrCASFailure = errors.New("CAS operation failed because the given version doesn't match what is stored")
-
-	// ErrWrongUid indicates that the attempted write failed because the resource's
-	// Uid doesn't match what is currently stored (e.g. the caller is trying to
-	// operate on a deleted resource with the same name).
-	ErrWrongUid = errors.New("write failed because the given uid doesn't match what is stored")
-
-	// ErrInconsistent indicates that the attempted write or consistent read could
-	// not be achieved because of a consistency or availability issue (e.g. loss of
-	// quorum, or when interacting with a Raft follower).
-	ErrInconsistent = errors.New("cannot satisfy consistency requirements")
-
-	// ErrWatchClosed is returned by Watch.Next when the watch is closed, e.g. when
-	// a snapshot is restored and the watch's events are no longer valid. Consumers
-	// should discard any materialized state and start a new watch.
-	ErrWatchClosed = errors.New("watch closed")
-)
-
-// ReadConsistency is used to specify the required consistency guarantees for
-// a read operation.
-type ReadConsistency int
-
-const (
-	// EventualConsistency provides a weak set of guarantees, but is much cheaper
-	// than using StrongConsistency and therefore should be treated as the default.
-	//
-	// It guarantees [monotonic reads]. That is, a read will always return results
-	// that are as up-to-date as an earlier read, provided both happen on the same
-	// Consul server. But does not make any such guarantee about writes.
-	//
-	// In other words, reads won't necessarily reflect earlier writes, even when
-	// made against the same server.
-	//
-	// Operations that don't allow the caller to specify the consistency mode will
-	// hold the same guarantees as EventualConsistency, but check the method docs
-	// for caveats.
-	//
-	// [monotonic reads]: https://jepsen.io/consistency/models/monotonic-reads
-	EventualConsistency ReadConsistency = iota
-
-	// StrongConsistency provides a very strong set of guarantees but is much more
-	// expensive, so should be used sparingly.
-	//
-	// It guarantees full [linearizability], such that a read will always return
-	// the most up-to-date version of a resource, without caveat.
-	//
-	// [linearizability]: https://jepsen.io/consistency/models/linearizable
-	StrongConsistency
-)
-
-// String implements the fmt.Stringer interface.
-func (c ReadConsistency) String() string {
-	switch c {
-	case EventualConsistency:
-		return "Eventual Consistency"
-	case StrongConsistency:
-		return "Strong Consistency"
-	}
-	panic(fmt.Sprintf("unknown ReadConsistency (%d)", c))
-}
-
-// Backend provides the low-level storage substrate for resources. It can be
-// implemented using internal (i.e. Raft+MemDB) or external (e.g. DynamoDB)
-// storage systems.
-//
-// Refer to the method comments for details of the behaviors and invariants
-// provided, which are also verified by the conformance test suite in the
-// internal/storage/conformance package.
-//
-// Cross-cutting concerns:
-//
-// # UIDs
-//
-// Users identify resources with a name of their choice (e.g. service "billing")
-// but internally, we add our own identifier in the Uid field to disambiguate
-// references when resources are deleted and re-created with the same name.
-//
-// # GroupVersion
-//
-// In order to support automatic translation between schema versions, we only
-// store a single version of a resource, and treat types with the same Group
-// and Kind, but different GroupVersions, as equivalent.
-//
-// # Read-Modify-Write Patterns
-//
-// All writes at the storage backend level are CAS (Compare-And-Swap) operations
-// where the caller must provide the resource in its entirety, with the current
-// version string.
-//
-// Non-CAS writes should be implemented at a higher level (i.e. in the Resource
-// Service) by reading the resource, applying the user's requested modifications,
-// and writing it back. This allows us to ensure we're correctly carrying over
-// the resource's Status and Uid, without requiring support for partial update
-// or "patch" operations from external storage systems.
-//
-// In cases where there are concurrent interleaving writes made to a resource,
-// it's likely that a CAS operation will fail, so callers may need to put their
-// Read-Modify-Write cycle in a retry loop.
-type Backend interface {
-	// Read a resource using its ID.
-	//
-	// # UIDs
-	//
-	// If id.Uid is empty, Read will ignore it and return whatever resource is
-	// stored with the given name. This is the desired behavior for user-initiated
-	// reads.
-	//
-	// If id.Uid is non-empty, Read will only return a resource if its Uid matches,
-	// otherwise it'll return ErrNotFound. This is the desired behaviour for reads
-	// initiated by controllers, which tend to operate on a specific lifetime of a
-	// resource.
-	//
-	// See Backend docs for more details.
-	//
-	// # GroupVersion
-	//
-	// If id.Type.GroupVersion doesn't match what is stored, Read will return a
-	// GroupVersionMismatchError which contains a pointer to the stored resource.
-	//
-	// See Backend docs for more details.
-	//
-	// # Consistency
-	//
-	// Read supports both EventualConsistency and StrongConsistency.
-	Read(ctx context.Context, consistency ReadConsistency, id *pbresource.ID) (*pbresource.Resource, error)
-
-	// WriteCAS performs an atomic CAS (Compare-And-Swap) write of a resource based
-	// on its version. The given version will be compared to what is stored, and if
-	// it does not match, ErrCASFailure will be returned. To create new resources,
-	// set version to an empty string.
-	//
-	// If a write cannot be performed because of a consistency or availability
-	// issue (e.g. when interacting with a Raft follower, or when quorum is lost)
-	// ErrInconsistent will be returned.
-	//
-	// # UIDs
-	//
-	// UIDs are immutable, so if the given resource's Uid field doesn't match what
-	// is stored, ErrWrongUid will be returned.
-	//
-	// See Backend docs for more details.
-	//
-	// # GroupVersion
-	//
-	// Write does not validate the GroupVersion and allows you to overwrite a
-	// resource stored in an older form with a newer, and vice versa.
-	//
-	// See Backend docs for more details.
-	WriteCAS(ctx context.Context, res *pbresource.Resource) (*pbresource.Resource, error)
-
-	// DeleteCAS performs an atomic CAS (Compare-And-Swap) deletion of a resource
-	// based on its version. The given version will be compared to what is stored,
-	// and if it does not match, ErrCASFailure will be returned.
-	//
-	// If the resource does not exist (i.e. has already been deleted) no error will
-	// be returned.
-	//
-	// If a deletion cannot be performed because of a consistency or availability
-	// issue (e.g. when interacting with a Raft follower, or when quorum is lost)
-	// ErrInconsistent will be returned.
-	//
-	// # UIDs
-	//
-	// If the given id's Uid does not match what is stored, the deletion will be a
-	// no-op (i.e. it is considered to be a different resource).
-	//
-	// See Backend docs for more details.
-	//
-	// # GroupVersion
-	//
-	// Delete does not check or refer to the GroupVersion. Resources of the same
-	// Group and Kind are considered equivalent, so requests to delete a resource
-	// using a new GroupVersion will delete a resource even if it's stored with an
-	// old GroupVersion.
-	//
-	// See Backend docs for more details.
-	DeleteCAS(ctx context.Context, id *pbresource.ID, version string) error
-
-	// List resources of the given type, tenancy, and optionally matching the given
-	// name prefix.
-	//
-	// # Tenancy Wildcard
-	//
-	// In order to list resources across multiple tenancy units (e.g. namespaces)
-	// pass the Wildcard sentinel value in tenancy fields.
-	//
-	// # GroupVersion
-	//
-	// The resType argument contains only the Group and Kind, to reflect the fact
-	// that resources may be stored in a mix of old and new forms. As such, it's
-	// the caller's responsibility to check the resource's GroupVersion and
-	// translate or filter accordingly.
-	//
-	// # Consistency
-	//
-	// Generally, List only supports EventualConsistency. However, for backward
-	// compatability with our v1 APIs, the Raft backend supports StrongConsistency
-	// for list operations.
-	//
-	// When the v1 APIs finally goes away, so will this consistency parameter, so
-	// it should not be depended on outside of the backward compatability layer.
-	List(ctx context.Context, consistency ReadConsistency, resType UnversionedType, tenancy *pbresource.Tenancy, namePrefix string) ([]*pbresource.Resource, error)
-
-	// WatchList watches resources of the given type, tenancy, and optionally
-	// matching the given name prefix. Upsert events for the current state of the
-	// world (i.e. existing resources that match the given filters) will be emitted
-	// immediately, and will be followed by delta events whenever resources are
-	// written or deleted.
-	//
-	// # Consistency
-	//
-	// WatchList makes no guarantees about event timeliness (e.g. an event for a
-	// write may not be received immediately), but it does guarantee that events
-	// will be emitted in the correct order.
-	//
-	// There's also a guarantee of [monotonic reads] between Read and WatchList,
-	// such that Read will never return data that is older than the most recent
-	// event you received. Note: this guarantee holds at the (in-process) storage
-	// backend level, only. Controllers and other users of the Resource Service API
-	// must remain connected to the same Consul server process to avoid receiving
-	// events about writes that they then cannot read. In other words, it is *not*
-	// linearizable.
-	//
-	// There's a similar guarantee between WatchList and ListByOwner, see the
-	// ListByOwner docs for more information.
-	//
-	// See List docs for details about Tenancy Wildcard and GroupVersion.
-	//
-	// [monotonic reads]: https://jepsen.io/consistency/models/monotonic-reads
-	WatchList(ctx context.Context, resType UnversionedType, tenancy *pbresource.Tenancy, namePrefix string) (Watch, error)
-
-	// ListByOwner returns resources owned by the resource with the given ID. It
-	// is typically used to implement cascading deletion.
-	//
-	// # Consistency
-	//
-	// ListByOwner may return stale results, but guarantees [monotonic reads]
-	// with events received from WatchList. In practice, this means that if you
-	// learn that a resource has been deleted through a watch event, the results
-	// you receive from ListByOwner will represent all references that existed
-	// at the time the owner was deleted. It doesn't make any guarantees about
-	// references that are created *after* the owner was deleted, though, so you
-	// must either prevent that from happening (e.g. by performing a consistent
-	// read of the owner in the write-path, which has its own ordering/correctness
-	// challenges), or by calling ListByOwner after the expected window of
-	// inconsistency (e.g. deferring cascading deletion, or doing a second pass
-	// an hour later).
-	//
-	// [montonic reads]: https://jepsen.io/consistency/models/monotonic-reads
-	ListByOwner(ctx context.Context, id *pbresource.ID) ([]*pbresource.Resource, error)
-}
-
-// Watch represents a watch on a given set of resources. Call Next to get the
-// next event (i.e. upsert or deletion) and Close when you're done watching.
-type Watch interface {
-	// Next returns the next event (i.e. upsert or deletion)
-	Next(ctx context.Context) (*pbresource.WatchEvent, error)
-
-	// Close the watch and free its associated resources.
-	Close()
-}
-
-// UnversionedType represents a pbresource.Type as it is stored without the
-// GroupVersion.
-type UnversionedType struct {
-	Group string
-	Kind  string
-}
-
-// UnversionedTypeFrom creates an UnversionedType from the given *pbresource.Type.
-func UnversionedTypeFrom(t *pbresource.Type) UnversionedType {
-	return UnversionedType{
-		Group: t.Group,
-		Kind:  t.Kind,
-	}
-}
-
-func (u UnversionedType) String() string {
-	return fmt.Sprintf("%s.%s", u.Group, u.Kind)
-}
-
-// GroupVersionMismatchError is returned when a resource is stored as a type
-// with a different GroupVersion than was requested.
-type GroupVersionMismatchError struct {
-	// RequestedType is the type that was requested.
-	RequestedType *pbresource.Type
-
-	// Stored is the resource as it is stored.
-	Stored *pbresource.Resource
-}
-
-// Error implements the error interface.
-func (e GroupVersionMismatchError) Error() string {
-	return fmt.Sprintf(
-		"resource was requested with GroupVersion=%q, but stored with GroupVersion=%q",
-		e.RequestedType.GroupVersion,
-		e.Stored.Id.Type.GroupVersion,
-	)
-}
diff --git a/internal/tenancy/exports.go b/internal/tenancy/exports.go
deleted file mode 100644
index aadd7efb59beb..0000000000000
--- a/internal/tenancy/exports.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tenancy
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/tenancy/internal/types"
-)
-
-var (
-	// API Group Information
-
-	APIGroup        = types.GroupName
-	VersionV1Alpha1 = types.VersionV1Alpha1
-	CurrentVersion  = types.CurrentVersion
-
-	// Resource Kind Names.
-
-	NamespaceKind         = types.NamespaceKind
-	NamespaceV1Alpha1Type = types.NamespaceV1Alpha1Type
-)
-
-// RegisterTypes adds all resource types within the "tenancy" API group
-// to the given type registry
-func RegisterTypes(r resource.Registry) {
-	types.Register(r)
-}
diff --git a/internal/tenancy/internal/types/errors.go b/internal/tenancy/internal/types/errors.go
deleted file mode 100644
index 42df9b319fb7c..0000000000000
--- a/internal/tenancy/internal/types/errors.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import "errors"
-
-var (
-	errInvalidName   = errors.New("invalid namespace name provided")
-	errOwnerNonEmpty = errors.New("namespace should not have an owner")
-)
diff --git a/internal/tenancy/internal/types/namespace.go b/internal/tenancy/internal/types/namespace.go
deleted file mode 100644
index ac9848a4f2065..0000000000000
--- a/internal/tenancy/internal/types/namespace.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"fmt"
-	"github.com/hashicorp/consul/agent/dns"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	tenancyv1alpha1 "github.com/hashicorp/consul/proto-public/pbtenancy/v1alpha1"
-	"strings"
-)
-
-const (
-	NamespaceKind = "Namespace"
-)
-
-var (
-	NamespaceV1Alpha1Type = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: VersionV1Alpha1,
-		Kind:         NamespaceKind,
-	}
-	NamespaceType = NamespaceV1Alpha1Type
-)
-
-func RegisterNamespace(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     NamespaceV1Alpha1Type,
-		Proto:    &tenancyv1alpha1.Namespace{},
-		Scope:    resource.ScopePartition,
-		Validate: ValidateNamespace,
-		Mutate:   MutateNamespace,
-	})
-}
-
-func MutateNamespace(res *pbresource.Resource) error {
-	res.Id.Name = strings.ToLower(res.Id.Name)
-	return nil
-}
-
-func ValidateNamespace(res *pbresource.Resource) error {
-	var ns tenancyv1alpha1.Namespace
-
-	if err := res.Data.UnmarshalTo(&ns); err != nil {
-		return resource.NewErrDataParse(&ns, err)
-	}
-	if res.Owner != nil {
-		return errOwnerNonEmpty
-	}
-
-	// it's not allowed to create default/default tenancy
-	if res.Id.Name == resource.DefaultNamespaceName && res.Id.Tenancy.Partition == resource.DefaultPartitionName {
-		return errInvalidName
-	}
-
-	if !dns.IsValidLabel(res.Id.Name) {
-		return fmt.Errorf("namespace name %q is not a valid DNS hostname", res.Id.Name)
-	}
-
-	switch strings.ToLower(res.Id.Name) {
-	case "system", "universal", "operator", "root":
-		return fmt.Errorf("namespace %q is reserved for future internal use", res.Id.Name)
-	default:
-
-		return nil
-	}
-}
diff --git a/internal/tenancy/internal/types/namespace_test.go b/internal/tenancy/internal/types/namespace_test.go
deleted file mode 100644
index 48d5e51ce2dcc..0000000000000
--- a/internal/tenancy/internal/types/namespace_test.go
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/resource"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	tenancyv1alpha1 "github.com/hashicorp/consul/proto-public/pbtenancy/v1alpha1"
-)
-
-func createNamespaceResource(t *testing.T, data protoreflect.ProtoMessage) *pbresource.Resource {
-	res := &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type:    NamespaceV1Alpha1Type,
-			Tenancy: resource.DefaultPartitionedTenancy(),
-			Name:    "ns1234",
-		},
-	}
-
-	var err error
-	res.Data, err = anypb.New(data)
-	require.NoError(t, err)
-	return res
-}
-
-func validNamespace() *tenancyv1alpha1.Namespace {
-	return &tenancyv1alpha1.Namespace{
-		Description: "description from user",
-	}
-}
-
-func TestValidateNamespace_Ok(t *testing.T) {
-	res := createNamespaceResource(t, validNamespace())
-
-	err := ValidateNamespace(res)
-	require.NoError(t, err)
-}
-
-func TestValidateNamespace_defaultNamespace(t *testing.T) {
-	res := createNamespaceResource(t, validNamespace())
-	res.Id.Name = resource.DefaultNamespaceName
-
-	err := ValidateNamespace(res)
-	require.Error(t, err)
-	require.ErrorAs(t, err, &errInvalidName)
-}
-
-func TestValidateNamespace_defaultNamespaceNonDefaultPartition(t *testing.T) {
-	res := createNamespaceResource(t, validNamespace())
-	res.Id.Name = resource.DefaultNamespaceName
-	res.Id.Tenancy.Partition = "foo"
-
-	err := ValidateNamespace(res)
-	require.NoError(t, err)
-}
-
-func TestValidateNamespace_InvalidName(t *testing.T) {
-	res := createNamespaceResource(t, validNamespace())
-	res.Id.Name = "-invalid"
-
-	err := ValidateNamespace(res)
-	require.Error(t, err)
-	require.ErrorAs(t, err, &errInvalidName)
-}
-
-func TestValidateNamespace_InvalidOwner(t *testing.T) {
-	res := createNamespaceResource(t, validNamespace())
-	res.Owner = &pbresource.ID{}
-	err := ValidateNamespace(res)
-
-	require.Error(t, err)
-	require.ErrorAs(t, err, &errOwnerNonEmpty)
-}
-
-func TestValidateNamespace_ParseError(t *testing.T) {
-	// Any type other than the Namespace type would work
-	// to cause the error we are expecting
-	data := &pbcatalog.IP{Address: "198.18.0.1"}
-
-	res := createNamespaceResource(t, data)
-
-	err := ValidateNamespace(res)
-	require.Error(t, err)
-	require.ErrorAs(t, err, &resource.ErrDataParse{})
-}
-
-func TestMutateNamespace(t *testing.T) {
-	tests := []struct {
-		name          string
-		namespaceName string
-		expectedName  string
-		err           error
-	}{
-		{"lower", "lower", "lower", nil},
-		{"mixed", "MiXeD", "mixed", nil},
-		{"upper", "UPPER", "upper", nil},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			res := &pbresource.Resource{Id: &pbresource.ID{Name: tt.namespaceName}}
-			if err := MutateNamespace(res); !errors.Is(err, tt.err) {
-				t.Errorf("MutateNamespace() error = %v", err)
-			}
-			require.Equal(t, res.Id.Name, tt.expectedName)
-		})
-	}
-}
-
-func TestValidateNamespace(t *testing.T) {
-	tests := []struct {
-		name          string
-		namespaceName string
-		err           string
-	}{
-		{"system", "System", "namespace \"System\" is reserved for future internal use"},
-		{"invalid", "-inval", "namespace name \"-inval\" is not a valid DNS hostname"},
-		{"valid", "ns1", ""},
-		{"space prefix", " foo", "namespace name \" foo\" is not a valid DNS hostname"},
-		{"space suffix", "bar ", "namespace name \"bar \" is not a valid DNS hostname"},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			a, err := anypb.New(&tenancyv1alpha1.Namespace{})
-			require.NoError(t, err)
-			res := &pbresource.Resource{Id: &pbresource.ID{Name: tt.namespaceName}, Data: a}
-			err = ValidateNamespace(res)
-			if tt.err == "" {
-				require.NoError(t, err)
-			} else {
-				require.Equal(t, err.Error(), tt.err)
-			}
-
-		})
-	}
-}
diff --git a/internal/tenancy/internal/types/types.go b/internal/tenancy/internal/types/types.go
deleted file mode 100644
index be0a615153fd0..0000000000000
--- a/internal/tenancy/internal/types/types.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-const (
-	GroupName       = "tenancy"
-	VersionV1Alpha1 = "v1alpha1"
-	CurrentVersion  = VersionV1Alpha1
-)
diff --git a/internal/tenancy/internal/types/types_ce.go b/internal/tenancy/internal/types/types_ce.go
deleted file mode 100644
index 8d475789710c3..0000000000000
--- a/internal/tenancy/internal/types/types_ce.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package types
-
-import "github.com/hashicorp/consul/internal/resource"
-
-func Register(r resource.Registry) {
-	RegisterNamespace(r)
-}
diff --git a/internal/testing/golden/golden.go b/internal/testing/golden/golden.go
index 8145d16814bf8..50f0a4f65bfd6 100644
--- a/internal/testing/golden/golden.go
+++ b/internal/testing/golden/golden.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package golden
 
 import (
@@ -22,16 +19,6 @@ var update = flag.Bool("update", false, "update golden files")
 // to the value of actual.
 func Get(t *testing.T, actual, filename string) string {
 	t.Helper()
-	return string(GetBytes(t, actual, filename))
-}
-
-// GetBytes reads the expected value from the file at filename and returns the
-// value as a byte array. filename is relative to the ./testdata directory.
-//
-// If the `-update` flag is used with `go test`, the golden file will be updated
-// to the value of actual.
-func GetBytes(t *testing.T, actual, filename string) []byte {
-	t.Helper()
 
 	path := filepath.Join("testdata", filename)
 	if *update {
@@ -44,5 +31,5 @@ func GetBytes(t *testing.T, actual, filename string) []byte {
 
 	expected, err := os.ReadFile(path)
 	require.NoError(t, err)
-	return expected
+	return string(expected)
 }
diff --git a/internal/tools/proto-gen-rpc-glue/e2e/consul/agent/structs/structs.go b/internal/tools/proto-gen-rpc-glue/e2e/consul/agent/structs/structs.go
index 6e76027299ded..3021dd00d6c1c 100644
--- a/internal/tools/proto-gen-rpc-glue/e2e/consul/agent/structs/structs.go
+++ b/internal/tools/proto-gen-rpc-glue/e2e/consul/agent/structs/structs.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package structs
 
 import (
diff --git a/internal/tools/proto-gen-rpc-glue/e2e/consul/proto/pbcommon/common.go b/internal/tools/proto-gen-rpc-glue/e2e/consul/proto/pbcommon/common.go
index 1395e682edd3c..f8211604d4cc8 100644
--- a/internal/tools/proto-gen-rpc-glue/e2e/consul/proto/pbcommon/common.go
+++ b/internal/tools/proto-gen-rpc-glue/e2e/consul/proto/pbcommon/common.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pbcommon
 
 import (
diff --git a/internal/tools/proto-gen-rpc-glue/e2e/source.pb.go b/internal/tools/proto-gen-rpc-glue/e2e/source.pb.go
index c69dac63b5c08..a75728bb57e4c 100644
--- a/internal/tools/proto-gen-rpc-glue/e2e/source.pb.go
+++ b/internal/tools/proto-gen-rpc-glue/e2e/source.pb.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build example
 // +build example
 
diff --git a/internal/tools/proto-gen-rpc-glue/e2e/source.rpcglue.pb.go.golden b/internal/tools/proto-gen-rpc-glue/e2e/source.rpcglue.pb.go.golden
index 92ee7c682ccf0..4e0360060a372 100644
--- a/internal/tools/proto-gen-rpc-glue/e2e/source.rpcglue.pb.go.golden
+++ b/internal/tools/proto-gen-rpc-glue/e2e/source.rpcglue.pb.go.golden
@@ -1,3 +1,6 @@
+//go:build example
+// +build example
+
 // Code generated by proto-gen-rpc-glue. DO NOT EDIT.
 
 package e2e
diff --git a/internal/tools/proto-gen-rpc-glue/go.mod b/internal/tools/proto-gen-rpc-glue/go.mod
index 0dc54c62dfebc..1ae6e1d999fbe 100644
--- a/internal/tools/proto-gen-rpc-glue/go.mod
+++ b/internal/tools/proto-gen-rpc-glue/go.mod
@@ -2,13 +2,10 @@ module github.com/hashicorp/consul/internal/tools/proto-gen-rpc-glue
 
 go 1.17
 
-require github.com/stretchr/testify v1.8.3
+require github.com/stretchr/testify v1.7.1
 
 require (
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/kr/pretty v0.3.0 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/rogpeppe/go-internal v1.9.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/davecgh/go-spew v1.1.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )
diff --git a/internal/tools/proto-gen-rpc-glue/go.sum b/internal/tools/proto-gen-rpc-glue/go.sum
index 5135bf7e717a2..2dca7c9c64eb3 100644
--- a/internal/tools/proto-gen-rpc-glue/go.sum
+++ b/internal/tools/proto-gen-rpc-glue/go.sum
@@ -1,35 +1,11 @@
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/internal/tools/proto-gen-rpc-glue/main.go b/internal/tools/proto-gen-rpc-glue/main.go
index 2412c3386208d..38ef20eb2fa38 100644
--- a/internal/tools/proto-gen-rpc-glue/main.go
+++ b/internal/tools/proto-gen-rpc-glue/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package main
 
 import (
diff --git a/internal/tools/proto-gen-rpc-glue/main_test.go b/internal/tools/proto-gen-rpc-glue/main_test.go
index 01eb28e92a31d..f5df2184edf75 100644
--- a/internal/tools/proto-gen-rpc-glue/main_test.go
+++ b/internal/tools/proto-gen-rpc-glue/main_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package main
 
 import (
diff --git a/internal/tools/protoc-gen-consul-rate-limit/go.mod b/internal/tools/protoc-gen-consul-rate-limit/go.mod
index 1337ca7371eb1..c1c40938e2894 100644
--- a/internal/tools/protoc-gen-consul-rate-limit/go.mod
+++ b/internal/tools/protoc-gen-consul-rate-limit/go.mod
@@ -6,7 +6,5 @@ replace github.com/hashicorp/consul/proto-public => ../../../proto-public
 
 require (
 	github.com/hashicorp/consul/proto-public v0.0.0-00010101000000-000000000000
-	google.golang.org/protobuf v1.30.0
+	google.golang.org/protobuf v1.28.1
 )
-
-require github.com/google/go-cmp v0.5.9 // indirect
diff --git a/internal/tools/protoc-gen-consul-rate-limit/go.sum b/internal/tools/protoc-gen-consul-rate-limit/go.sum
index a3ed1d4569d78..00f5993c956c4 100644
--- a/internal/tools/protoc-gen-consul-rate-limit/go.sum
+++ b/internal/tools/protoc-gen-consul-rate-limit/go.sum
@@ -1,8 +1,8 @@
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
diff --git a/internal/tools/protoc-gen-consul-rate-limit/main.go b/internal/tools/protoc-gen-consul-rate-limit/main.go
index 61d46dd8c77c8..7ba20604acf46 100644
--- a/internal/tools/protoc-gen-consul-rate-limit/main.go
+++ b/internal/tools/protoc-gen-consul-rate-limit/main.go
@@ -1,41 +1,33 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// protoc-gen-consul-rate-limit
-// This protoc plugin maintains the mapping of gRPC method names to
+// protoc-gen-consul-rate-limit maintains the mapping of gRPC method names to
 // a specification of how they should be rate-limited. This is used by the gRPC
 // InTapHandle function (see agent/grpc-middleware/rate.go) to enforce relevant
-// limits without having to call the handler. It works in two phases:
-//
-// # Phase 1
+// limits without having to call the handler.
 //
-//	Buf/protoc invokes this plugin for each .proto file. We extract the rate limit
-//	specification from an annotation on the RPC:
+// It works in two phases:
 //
-//		service Foo {
-//			rpc Bar(BarRequest) returns (BarResponse) {
-//				option (hashicorp.consul.internal.ratelimit.spec) = {
-//					operation_type: OPERATION_TYPE_WRITE,
-//					operation_category: OPERATION_CATEGORY_ACL
-//				};
-//			}
-//		}
+//	1. Buf/protoc invokes this plugin for each .proto file. We extract the rate
+//	   limit specification from an annotation on the RPC:
 //
-// We write a JSON array of the limits to protobuf/package/path/.ratelimit.tmp:
+//	   service Foo {
+//	     rpc Bar(BarRequest) returns (BarResponse) {
+//	       option (hashicorp.consul.internal.ratelimit.spec) = {
+//	         operation_type: OPERATION_TYPE_WRITE,
+//	       };
+//	     }
+//	   }
 //
-//	[
-//		{
-//			"MethodName": "/Foo/Bar",
-//			"OperationType": "OPERATION_TYPE_WRITE",
-//			"OperationCategory": "OPERATION_CATEGORY_ACL"
-//		}
-//	]
+//	   We write a JSON array of the limits to protobuf/package/path/.ratelimit.tmp:
 //
-// # Phase 2
+//	   [
+//	     {
+//	       "MethodName": "/Foo/Bar",
+//	       "OperationType": "OPERATION_TYPE_WRITE",
+//	     }
+//	   ]
 //
-// The protobuf.sh script (invoked by make proto) runs our postprocess script
-// which reads all of the .ratelimit.tmp files in proto and proto-public and
-// generates a single Go map in agent/grpc-middleware/rate_limit_mappings.gen.go
+//	2. The protobuf.sh script (invoked by make proto) runs our postprocess script
+//	   which reads all of the .ratelimit.tmp files in proto and proto-public and
+//	   generates a single Go map in agent/grpc-middleware/rate_limit_mappings.gen.go
 package main
 
 import (
@@ -62,7 +54,6 @@ const (
 	  rpc %s(...) returns (...) {
 	    option (hashicorp.consul.internal.ratelimit.spec) = {
 	      operation_type: OPERATION_TYPE_READ | OPERATION_TYPE_WRITE | OPERATION_TYPE_EXEMPT,
-		  operation_category: OPERATION_CATEGORY_ACL | OPERATION_CATEGORY_PEER_STREAM | OPERATION_CATEGORY_CONNECT_CA | OPERATION_CATEGORY_PARTITION | OPERATION_CATEGORY_PEERING | OPERATION_CATEGORY_SERVER_DISCOVERY | OPERATION_CATEGORY_DATAPLANE | OPERATION_CATEGORY_DNS | OPERATION_CATEGORY_SUBSCRIBE | OPERATION_CATEGORY_OPERATOR | OPERATION_CATEGORY_RESOURCE,
 	    };
 	  }
 	}
@@ -72,10 +63,9 @@ const (
 )
 
 type rateLimitSpec struct {
-	MethodName        string
-	OperationType     string
-	OperationCategory string
-	Enterprise        bool
+	MethodName    string
+	OperationType string
+	Enterprise    bool
 }
 
 func main() {
@@ -93,7 +83,7 @@ func main() {
 			}
 
 			if len(specs) == 0 {
-				continue
+				return nil
 			}
 
 			outputPath := filepath.Join(filepath.Dir(path), outputFileName)
@@ -133,7 +123,6 @@ func rateLimitSpecs(file *protogen.File) ([]rateLimitSpec, error) {
 
 			def := proto.GetExtension(options, ratelimit.E_Spec).(*ratelimit.Spec)
 			spec.OperationType = def.OperationType.String()
-			spec.OperationCategory = def.OperationCategory.String()
 
 			specs = append(specs, spec)
 		}
diff --git a/internal/tools/protoc-gen-consul-rate-limit/postprocess/main.go b/internal/tools/protoc-gen-consul-rate-limit/postprocess/main.go
index 570e2ebdac72b..adf3c25f3cefa 100644
--- a/internal/tools/protoc-gen-consul-rate-limit/postprocess/main.go
+++ b/internal/tools/protoc-gen-consul-rate-limit/postprocess/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package main
 
 import (
@@ -10,7 +7,6 @@ import (
 	"flag"
 	"fmt"
 	"go/format"
-	"io/fs"
 	"os"
 	"path/filepath"
 	"sort"
@@ -27,6 +23,7 @@ import "github.com/hashicorp/consul/agent/consul/rate"
 `
 
 	entTags = `//go:build consulent
+// +build consulent
 `
 )
 
@@ -98,10 +95,9 @@ func enterpriseFileName(filename string) string {
 }
 
 type spec struct {
-	MethodName        string
-	OperationType     string
-	Enterprise        bool
-	OperationCategory string
+	MethodName    string
+	OperationType string
+	Enterprise    bool
 }
 
 func (s spec) GoOperationType() string {
@@ -116,64 +112,26 @@ func (s spec) GoOperationType() string {
 	panic(fmt.Sprintf("unknown rate limit operation type: %s", s.OperationType))
 }
 
-func (s spec) GoOperationCategory() string {
-	switch s.OperationCategory {
-	case "OPERATION_CATEGORY_ACL":
-		return "rate.OperationCategoryACL"
-	case "OPERATION_CATEGORY_PEER_STREAM":
-		return "rate.OperationCategoryPeerStream"
-	case "OPERATION_CATEGORY_CONNECT_CA":
-		return "rate.OperationCategoryConnectCA"
-	case "OPERATION_CATEGORY_PARTITION":
-		return "rate.OperationCategoryPartition"
-	case "OPERATION_CATEGORY_PEERING":
-		return "rate.OperationCategoryPeering"
-	case "OPERATION_CATEGORY_SERVER_DISCOVERY":
-		return "rate.OperationCategoryServerDiscovery"
-	case "OPERATION_CATEGORY_DATAPLANE":
-		return "rate.OperationCategoryDataPlane"
-	case "OPERATION_CATEGORY_DNS":
-		return "rate.OperationCategoryDNS"
-	case "OPERATION_CATEGORY_SUBSCRIBE":
-		return "rate.OperationCategorySubscribe"
-	case "OPERATION_CATEGORY_OPERATOR":
-		return "rate.OperationCategoryOperator"
-	case "OPERATION_CATEGORY_RESOURCE":
-		return "rate.OperationCategoryResource"
-	}
-	panic(fmt.Sprintf("unknown rate limit operation category: %s found in method: %s", s.OperationCategory, s.MethodName))
-}
-
 func collectSpecs(inputPaths []string) ([]spec, []spec, error) {
 	var specs []spec
-	var specFiles []string
 	for _, protoPath := range inputPaths {
-		err := filepath.WalkDir(protoPath, func(path string, info fs.DirEntry, err error) error {
-			if err != nil {
-				return err
-			}
-			if info.Name() == ".ratelimit.tmp" {
-				specFiles = append(specFiles, path)
-			}
-
-			return nil
-		})
+		specFiles, err := filepath.Glob(filepath.Join(protoPath, "*", ".ratelimit.tmp"))
 		if err != nil {
-			return nil, nil, fmt.Errorf("failed to walk directory: %s - %w", protoPath, err)
+			return nil, nil, fmt.Errorf("failed to glob directory: %s - %s", protoPath, err)
 		}
-	}
 
-	for _, file := range specFiles {
-		b, err := os.ReadFile(file)
-		if err != nil {
-			return nil, nil, fmt.Errorf("failed to read ratelimit file: %w", err)
-		}
+		for _, file := range specFiles {
+			b, err := os.ReadFile(file)
+			if err != nil {
+				return nil, nil, fmt.Errorf("failed to read ratelimit file: %w", err)
+			}
 
-		var fileSpecs []spec
-		if err := json.Unmarshal(b, &fileSpecs); err != nil {
-			return nil, nil, fmt.Errorf("failed to unmarshal ratelimit file %s - %w", file, err)
+			var fileSpecs []spec
+			if err := json.Unmarshal(b, &fileSpecs); err != nil {
+				return nil, nil, fmt.Errorf("failed to unmarshal ratelimit file %s - %w", file, err)
+			}
+			specs = append(specs, fileSpecs...)
 		}
-		specs = append(specs, fileSpecs...)
 	}
 
 	sort.Slice(specs, func(a, b int) bool {
@@ -196,16 +154,16 @@ func generateCE(specs []spec) ([]byte, error) {
 	var output bytes.Buffer
 	output.WriteString(fileHeader)
 
-	fmt.Fprintln(&output, `var rpcRateLimitSpecs = map[string]rate.OperationSpec{`)
+	fmt.Fprintln(&output, `var rpcRateLimitSpecs = map[string]rate.OperationType{`)
 	for _, spec := range specs {
-		fmt.Fprintf(&output, `"%s": {Type: %s, Category: %s},`, spec.MethodName, spec.GoOperationType(), spec.GoOperationCategory())
+		fmt.Fprintf(&output, `"%s": %s,`, spec.MethodName, spec.GoOperationType())
 		output.WriteString("\n")
 	}
 	output.WriteString("}")
 
 	formatted, err := format.Source(output.Bytes())
 	if err != nil {
-		return nil, fmt.Errorf("failed to format source in ce: %w", err)
+		return nil, fmt.Errorf("failed to format source: %w", err)
 	}
 	return formatted, nil
 }
@@ -217,14 +175,14 @@ func generateENT(specs []spec) ([]byte, error) {
 
 	output.WriteString("func init() {\n")
 	for _, spec := range specs {
-		fmt.Fprintf(&output, `rpcRateLimitSpecs["%s"] = rate.OperationSpec{Type: %s, Category: %s}`, spec.MethodName, spec.GoOperationType(), spec.GoOperationCategory())
+		fmt.Fprintf(&output, `rpcRateLimitSpecs["%s"] = %s`, spec.MethodName, spec.GoOperationType())
 		output.WriteString("\n")
 	}
 	output.WriteString("}")
 
 	formatted, err := format.Source(output.Bytes())
 	if err != nil {
-		return nil, fmt.Errorf("failed to format source in ent: %w", err)
+		return nil, fmt.Errorf("failed to format source: %w", err)
 	}
 	return formatted, nil
 }
diff --git a/ipaddr/detect.go b/ipaddr/detect.go
index bc2bf56c350cb..1512a00498614 100644
--- a/ipaddr/detect.go
+++ b/ipaddr/detect.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ipaddr
 
 import (
diff --git a/ipaddr/detect_test.go b/ipaddr/detect_test.go
index c199492c174f9..91eea1b9f6649 100644
--- a/ipaddr/detect_test.go
+++ b/ipaddr/detect_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ipaddr
 
 import (
diff --git a/ipaddr/ipaddr.go b/ipaddr/ipaddr.go
index 89f8c70a4ceba..321c8d9b1d1fa 100644
--- a/ipaddr/ipaddr.go
+++ b/ipaddr/ipaddr.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ipaddr
 
 import (
diff --git a/ipaddr/ipaddr_test.go b/ipaddr/ipaddr_test.go
index 009144c2de25d..e08bfe266e77e 100644
--- a/ipaddr/ipaddr_test.go
+++ b/ipaddr/ipaddr_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ipaddr
 
 import (
diff --git a/lib/cluster.go b/lib/cluster.go
index a97ceea722e97..b69d17bfe2311 100644
--- a/lib/cluster.go
+++ b/lib/cluster.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/cluster_test.go b/lib/cluster_test.go
index 3493a6fb39f12..02629c827f68e 100644
--- a/lib/cluster_test.go
+++ b/lib/cluster_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/decode/decode.go b/lib/decode/decode.go
index 645916d2d6654..f47b5a4bc368c 100644
--- a/lib/decode/decode.go
+++ b/lib/decode/decode.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 /*
 Package decode provides tools for customizing the decoding of configuration,
 into structures using mapstructure.
diff --git a/lib/decode/decode_test.go b/lib/decode/decode_test.go
index 3219e96b4bf9a..b8243233d124a 100644
--- a/lib/decode/decode_test.go
+++ b/lib/decode/decode_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package decode
 
 import (
diff --git a/lib/eof.go b/lib/eof.go
index e208ca73d7535..d4bd1b75a2858 100644
--- a/lib/eof.go
+++ b/lib/eof.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/eof_test.go b/lib/eof_test.go
index 330a1152a8eb7..de63e15e17bc8 100644
--- a/lib/eof_test.go
+++ b/lib/eof_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/file/atomic.go b/lib/file/atomic.go
index 4053f443d8b36..3b72656705385 100644
--- a/lib/file/atomic.go
+++ b/lib/file/atomic.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package file
 
 import (
diff --git a/lib/file/atomic_test.go b/lib/file/atomic_test.go
index baf4bc1771f8e..575fc6067ce69 100644
--- a/lib/file/atomic_test.go
+++ b/lib/file/atomic_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package file
 
 import (
diff --git a/lib/hoststats/collector.go b/lib/hoststats/collector.go
index fb316e0dce38f..c4c57b35c5c25 100644
--- a/lib/hoststats/collector.go
+++ b/lib/hoststats/collector.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package hoststats
 
 import (
diff --git a/lib/hoststats/cpu.go b/lib/hoststats/cpu.go
index 420a80ef94240..45633b40df064 100644
--- a/lib/hoststats/cpu.go
+++ b/lib/hoststats/cpu.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package hoststats
 
 import (
diff --git a/lib/hoststats/cpu_test.go b/lib/hoststats/cpu_test.go
index dcc1df9aab50e..5d5efbe9769a1 100644
--- a/lib/hoststats/cpu_test.go
+++ b/lib/hoststats/cpu_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package hoststats
 
 import (
diff --git a/lib/hoststats/host.go b/lib/hoststats/host.go
index 3a44618d20f16..426cf43ea21e5 100644
--- a/lib/hoststats/host.go
+++ b/lib/hoststats/host.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package hoststats
 
 import (
diff --git a/lib/hoststats/metrics.go b/lib/hoststats/metrics.go
index 95055cea43fb3..c89d40b813ff1 100644
--- a/lib/hoststats/metrics.go
+++ b/lib/hoststats/metrics.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package hoststats
 
 import (
diff --git a/lib/json.go b/lib/json.go
index 7e58942a823de..59c7612d1a73c 100644
--- a/lib/json.go
+++ b/lib/json.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/map_walker.go b/lib/map_walker.go
index 1be33b61f15fd..b3779311be8b8 100644
--- a/lib/map_walker.go
+++ b/lib/map_walker.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/map_walker_test.go b/lib/map_walker_test.go
index 6156abe4624f8..068add7590a3b 100644
--- a/lib/map_walker_test.go
+++ b/lib/map_walker_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/maps/maps.go b/lib/maps/maps.go
index ae19d030a2c01..eea90683c0932 100644
--- a/lib/maps/maps.go
+++ b/lib/maps/maps.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package maps
 
 func SliceOfKeys[K comparable, V any](m map[K]V) []K {
diff --git a/lib/maps/maps_test.go b/lib/maps/maps_test.go
index 5d0f4edbc44ef..bf9268d7a1b17 100644
--- a/lib/maps/maps_test.go
+++ b/lib/maps/maps_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package maps
 
 import (
diff --git a/lib/math.go b/lib/math.go
index 673dfb84e99cf..0cfc2ad289275 100644
--- a/lib/math.go
+++ b/lib/math.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 func AbsInt(a int) int {
diff --git a/lib/math_test.go b/lib/math_test.go
index 2ce631fe75dce..e0e52f123eaf2 100644
--- a/lib/math_test.go
+++ b/lib/math_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib_test
 
 import (
diff --git a/lib/mutex/mutex.go b/lib/mutex/mutex.go
index 8101204c2e006..9841acb49b852 100644
--- a/lib/mutex/mutex.go
+++ b/lib/mutex/mutex.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 /*
 Package mutex implements the sync.Locker interface using x/sync/semaphore. It
 may be used as a replacement for sync.Mutex when one or more goroutines need to
diff --git a/lib/mutex/mutex_test.go b/lib/mutex/mutex_test.go
index 2d51706e4e855..0324b3900341f 100644
--- a/lib/mutex/mutex_test.go
+++ b/lib/mutex/mutex_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package mutex
 
 import (
diff --git a/lib/path.go b/lib/path.go
index fd45378ec1804..8c959a72fa981 100644
--- a/lib/path.go
+++ b/lib/path.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/retry/retry.go b/lib/retry/retry.go
index e0605f89c4a89..b76b10e53244a 100644
--- a/lib/retry/retry.go
+++ b/lib/retry/retry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package retry
 
 import (
@@ -104,8 +101,8 @@ func (w *Waiter) Failures() int {
 // such as when the context is canceled. This makes it suitable for
 // long-running routines that do not get re-initialized, such as replication.
 func (w *Waiter) Wait(ctx context.Context) error {
-	delay := w.WaitDuration()
-	timer := time.NewTimer(delay)
+	w.failures++
+	timer := time.NewTimer(w.delay())
 	select {
 	case <-ctx.Done():
 		timer.Stop()
@@ -115,15 +112,6 @@ func (w *Waiter) Wait(ctx context.Context) error {
 	}
 }
 
-// WaitDuration increases the number of failures by one, and returns the
-// duration the caller must wait for. This is an alternative to the Wait
-// method for cases where you want to handle the timer yourself (e.g. as
-// part of a larger select statement).
-func (w *Waiter) WaitDuration() time.Duration {
-	w.failures++
-	return w.delay()
-}
-
 // NextWait returns the period the next call to Wait with block for assuming
 // it's context is not cancelled. It's useful for informing a user how long
 // it will be before the next attempt is made.
diff --git a/lib/retry/retry_test.go b/lib/retry/retry_test.go
index d8a822f6b606a..470d0db66e2a9 100644
--- a/lib/retry/retry_test.go
+++ b/lib/retry/retry_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package retry
 
 import (
diff --git a/lib/routine/routine.go b/lib/routine/routine.go
index b5ebe85e22f14..4b7277ff996ea 100644
--- a/lib/routine/routine.go
+++ b/lib/routine/routine.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package routine
 
 import (
diff --git a/lib/routine/routine_test.go b/lib/routine/routine_test.go
index c04311ac59f49..61eb15ccd8d9b 100644
--- a/lib/routine/routine_test.go
+++ b/lib/routine/routine_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package routine
 
 import (
diff --git a/lib/rtt.go b/lib/rtt.go
index d716e6fcbe1c5..fb9090ab1dbff 100644
--- a/lib/rtt.go
+++ b/lib/rtt.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/rtt_test.go b/lib/rtt_test.go
index 1e7779b9addeb..4e08b38c85641 100644
--- a/lib/rtt_test.go
+++ b/lib/rtt_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/semaphore/semaphore.go b/lib/semaphore/semaphore.go
index fdfbbb34db021..30db570f06cfc 100644
--- a/lib/semaphore/semaphore.go
+++ b/lib/semaphore/semaphore.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // Package semaphore implements a simple semaphore that is based on
 // golang.org/x/sync/semaphore but doesn't support weights. It's advantage over
 // a simple buffered chan is that the capacity of the semaphore (i.e. the number
diff --git a/lib/semaphore/semaphore_test.go b/lib/semaphore/semaphore_test.go
index b3182e1107af7..02c2d5fdeccd4 100644
--- a/lib/semaphore/semaphore_test.go
+++ b/lib/semaphore/semaphore_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package semaphore
 
 // Based on https://github.com/golang/sync/blob/master/semaphore/semaphore_test.go
diff --git a/lib/serf/serf.go b/lib/serf/serf.go
index 932fed427ba94..8f97e24d85a7c 100644
--- a/lib/serf/serf.go
+++ b/lib/serf/serf.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package serf
 
 import (
diff --git a/lib/stop_context.go b/lib/stop_context.go
index 98bde25e452b5..b8e81aa4fc58d 100644
--- a/lib/stop_context.go
+++ b/lib/stop_context.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/stop_context_test.go b/lib/stop_context_test.go
index b62749513f2f7..8512e7dce9db9 100644
--- a/lib/stop_context_test.go
+++ b/lib/stop_context_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/strings.go b/lib/strings.go
index 7213a93259141..fea1cf58b15e4 100644
--- a/lib/strings.go
+++ b/lib/strings.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/stringslice/stringslice.go b/lib/stringslice/stringslice.go
index 7c32864b9458c..aadf8a5517c69 100644
--- a/lib/stringslice/stringslice.go
+++ b/lib/stringslice/stringslice.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package stringslice
 
 // StrContains => Contains
diff --git a/lib/stringslice/stringslice_test.go b/lib/stringslice/stringslice_test.go
index dd25071757442..6a6a7ff58d0a0 100644
--- a/lib/stringslice/stringslice_test.go
+++ b/lib/stringslice/stringslice_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package stringslice
 
 import (
diff --git a/lib/telemetry.go b/lib/telemetry.go
index e06341eefb05b..c1af5a3afdd56 100644
--- a/lib/telemetry.go
+++ b/lib/telemetry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/telemetry_test.go b/lib/telemetry_test.go
index ab0f7e5b91411..7009a805648bc 100644
--- a/lib/telemetry_test.go
+++ b/lib/telemetry_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/template/hil.go b/lib/template/hil.go
index 502f10d258b20..f3b22f5b1c31b 100644
--- a/lib/template/hil.go
+++ b/lib/template/hil.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package template
 
 import (
diff --git a/lib/template/hil_test.go b/lib/template/hil_test.go
index 4f582f61d1685..3147ab3097fb4 100644
--- a/lib/template/hil_test.go
+++ b/lib/template/hil_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package template
 
 import (
diff --git a/lib/translate.go b/lib/translate.go
index 6fd49010fc81e..3404039a6e5a2 100644
--- a/lib/translate.go
+++ b/lib/translate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/translate_test.go b/lib/translate_test.go
index f36588b7404b1..eb04c8cf69442 100644
--- a/lib/translate_test.go
+++ b/lib/translate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/ttlcache/eviction.go b/lib/ttlcache/eviction.go
index 5d5012e7dbacb..7e985a1309101 100644
--- a/lib/ttlcache/eviction.go
+++ b/lib/ttlcache/eviction.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 /*
 Package ttlcache provides an ExpiryHeap that can be used by a cache to track the
 expiration time of its entries. When an expiry is reached the Timer will fire
diff --git a/lib/ttlcache/eviction_test.go b/lib/ttlcache/eviction_test.go
index 18bf2fbbc78bf..ab5ae83329b90 100644
--- a/lib/ttlcache/eviction_test.go
+++ b/lib/ttlcache/eviction_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ttlcache
 
 import (
diff --git a/lib/useragent.go b/lib/useragent.go
index 89c73dec55297..f083fe3f19034 100644
--- a/lib/useragent.go
+++ b/lib/useragent.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/useragent_test.go b/lib/useragent_test.go
index 23df537c9d4ac..3ebaa9ecb7194 100644
--- a/lib/useragent_test.go
+++ b/lib/useragent_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/lib/uuid.go b/lib/uuid.go
index 2c0d657f5b062..7815ef9eec09e 100644
--- a/lib/uuid.go
+++ b/lib/uuid.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package lib
 
 import (
diff --git a/logging/gated_writer.go b/logging/gated_writer.go
index 5a28c8cf52339..c8b5f920fc630 100644
--- a/logging/gated_writer.go
+++ b/logging/gated_writer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logging
 
 import (
diff --git a/logging/gated_writer_test.go b/logging/gated_writer_test.go
index cc44ad04b2b94..05e0dd871fb2a 100644
--- a/logging/gated_writer_test.go
+++ b/logging/gated_writer_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logging
 
 import (
diff --git a/logging/grpc.go b/logging/grpc.go
index ebe2207e454b8..6e960a0c7b1ba 100644
--- a/logging/grpc.go
+++ b/logging/grpc.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logging
 
 import (
diff --git a/logging/grpc_test.go b/logging/grpc_test.go
index 0a90f11066093..de803ce4e69a5 100644
--- a/logging/grpc_test.go
+++ b/logging/grpc_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logging
 
 import (
diff --git a/logging/log_levels.go b/logging/log_levels.go
index 5ed830ee30503..11824409c0f25 100644
--- a/logging/log_levels.go
+++ b/logging/log_levels.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logging
 
 import (
diff --git a/logging/logfile.go b/logging/logfile.go
index a4d48da2d6311..bb0c712697356 100644
--- a/logging/logfile.go
+++ b/logging/logfile.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logging
 
 import (
diff --git a/logging/logfile_bsd.go b/logging/logfile_bsd.go
index df599358d0478..d81d065be1ce5 100644
--- a/logging/logfile_bsd.go
+++ b/logging/logfile_bsd.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build darwin || freebsd || netbsd || openbsd
+// +build darwin freebsd netbsd openbsd
 
 package logging
 
diff --git a/logging/logfile_linux.go b/logging/logfile_linux.go
index 1e8f19b1da721..6cdacfe80e227 100644
--- a/logging/logfile_linux.go
+++ b/logging/logfile_linux.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build dragonfly || linux
+// +build dragonfly linux
 
 package logging
 
diff --git a/logging/logfile_solaris.go b/logging/logfile_solaris.go
index ba92442084a94..b64610cc38fc6 100644
--- a/logging/logfile_solaris.go
+++ b/logging/logfile_solaris.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build solaris
+// +build solaris
 
 package logging
 
diff --git a/logging/logfile_test.go b/logging/logfile_test.go
index 26c23439f20b2..64b051fda6dba 100644
--- a/logging/logfile_test.go
+++ b/logging/logfile_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logging
 
 import (
diff --git a/logging/logfile_windows.go b/logging/logfile_windows.go
index d60f8d2a99e3c..688a8351cdbea 100644
--- a/logging/logfile_windows.go
+++ b/logging/logfile_windows.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logging
 
 import (
diff --git a/logging/logger.go b/logging/logger.go
index 8d63ed7e15eb3..39b5383362b41 100644
--- a/logging/logger.go
+++ b/logging/logger.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logging
 
 import (
diff --git a/logging/logger_test.go b/logging/logger_test.go
index 5cb0c1e44189a..bfd02646501b9 100644
--- a/logging/logger_test.go
+++ b/logging/logger_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logging
 
 import (
diff --git a/logging/monitor/monitor.go b/logging/monitor/monitor.go
index 6a812a879f642..e286bf76c77ce 100644
--- a/logging/monitor/monitor.go
+++ b/logging/monitor/monitor.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package monitor
 
 import (
diff --git a/logging/monitor/monitor_test.go b/logging/monitor/monitor_test.go
index 5f834f4f2322e..a8b02aed1f287 100644
--- a/logging/monitor/monitor_test.go
+++ b/logging/monitor/monitor_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package monitor
 
 import (
diff --git a/logging/names.go b/logging/names.go
index 69a859443cfb9..003bb3e86a7f6 100644
--- a/logging/names.go
+++ b/logging/names.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logging
 
 const (
@@ -20,7 +17,6 @@ const (
 	Consul                string = "consul"
 	ConsulClient          string = "client"
 	ConsulServer          string = "server"
-	ControllerRuntime     string = "controller-runtime"
 	Coordinate            string = "coordinate"
 	DNS                   string = "dns"
 	Envoy                 string = "envoy"
diff --git a/logging/syslog.go b/logging/syslog.go
index ceb0ae0ac2f2d..6e2c71e262d01 100644
--- a/logging/syslog.go
+++ b/logging/syslog.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package logging
 
 import (
diff --git a/logging/syslog_test.go b/logging/syslog_test.go
index 0e814a84fb01a..19931e3461363 100644
--- a/logging/syslog_test.go
+++ b/logging/syslog_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build linux || darwin || dragonfly || freebsd || netbsd || openbsd || solaris
+// +build linux darwin dragonfly freebsd netbsd openbsd solaris
 
 package logging
 
diff --git a/logging/syslog_unsupported_test.go b/logging/syslog_unsupported_test.go
index 650fc2225d0c3..5a3f4886de350 100644
--- a/logging/syslog_unsupported_test.go
+++ b/logging/syslog_unsupported_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build windows || plan9 || nacl
+// +build windows plan9 nacl
 
 package logging
 
diff --git a/main.go b/main.go
index d29454035b12f..804635060a814 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package main
 
 import (
diff --git a/proto-public/LICENSE b/proto-public/LICENSE
deleted file mode 100644
index 7c5baa45e1c29..0000000000000
--- a/proto-public/LICENSE
+++ /dev/null
@@ -1,365 +0,0 @@
-Copyright (c) 2020 HashiCorp, Inc.
-
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. "Contributor"
-
-     means each individual or legal entity that creates, contributes to the
-     creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-
-     means the combination of the Contributions of others (if any) used by a
-     Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-
-     means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-
-     means Source Code Form to which the initial Contributor has attached the
-     notice in Exhibit A, the Executable Form of such Source Code Form, and
-     Modifications of such Source Code Form, in each case including portions
-     thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-     means
-
-     a. that the initial Contributor has attached the notice described in
-        Exhibit B to the Covered Software; or
-
-     b. that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the terms of
-        a Secondary License.
-
-1.6. "Executable Form"
-
-     means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-
-     means a work that combines Covered Software with other material, in a
-     separate file or files, that is not Covered Software.
-
-1.8. "License"
-
-     means this document.
-
-1.9. "Licensable"
-
-     means having the right to grant, to the maximum extent possible, whether
-     at the time of the initial grant or subsequently, any and all of the
-     rights conveyed by this License.
-
-1.10. "Modifications"
-
-     means any of the following:
-
-     a. any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered Software; or
-
-     b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. "Patent Claims" of a Contributor
-
-      means any patent claim(s), including without limitation, method,
-      process, and apparatus claims, in any patent Licensable by such
-      Contributor that would be infringed, but for the grant of the License,
-      by the making, using, selling, offering for sale, having made, import,
-      or transfer of either its Contributions or its Contributor Version.
-
-1.12. "Secondary License"
-
-      means either the GNU General Public License, Version 2.0, the GNU Lesser
-      General Public License, Version 2.1, the GNU Affero General Public
-      License, Version 3.0, or any later versions of those licenses.
-
-1.13. "Source Code Form"
-
-      means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-
-      means an individual or a legal entity exercising rights under this
-      License. For legal entities, "You" includes any entity that controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, "control" means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-     Each Contributor hereby grants You a world-wide, royalty-free,
-     non-exclusive license:
-
-     a. under intellectual property rights (other than patent or trademark)
-        Licensable by such Contributor to use, reproduce, make available,
-        modify, display, perform, distribute, and otherwise exploit its
-        Contributions, either on an unmodified basis, with Modifications, or
-        as part of a Larger Work; and
-
-     b. under Patent Claims of such Contributor to make, use, sell, offer for
-        sale, have made, import, and otherwise transfer either its
-        Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-     The licenses granted in Section 2.1 with respect to any Contribution
-     become effective for each Contribution on the date the Contributor first
-     distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-     The licenses granted in this Section 2 are the only rights granted under
-     this License. No additional rights or licenses will be implied from the
-     distribution or licensing of Covered Software under this License.
-     Notwithstanding Section 2.1(b) above, no patent license is granted by a
-     Contributor:
-
-     a. for any code that a Contributor has removed from Covered Software; or
-
-     b. for infringements caused by: (i) Your and any other third party's
-        modifications of Covered Software, or (ii) the combination of its
-        Contributions with other software (except as part of its Contributor
-        Version); or
-
-     c. under Patent Claims infringed by Covered Software in the absence of
-        its Contributions.
-
-     This License does not grant any rights in the trademarks, service marks,
-     or logos of any Contributor (except as may be necessary to comply with
-     the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-     No Contributor makes additional grants as a result of Your choice to
-     distribute the Covered Software under a subsequent version of this
-     License (see Section 10.2) or under the terms of a Secondary License (if
-     permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-     Each Contributor represents that the Contributor believes its
-     Contributions are its original creation(s) or it has sufficient rights to
-     grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-     This License is not intended to limit any rights You have under
-     applicable copyright doctrines of fair use, fair dealing, or other
-     equivalents.
-
-2.7. Conditions
-
-     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
-     Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-     All distribution of Covered Software in Source Code Form, including any
-     Modifications that You create or to which You contribute, must be under
-     the terms of this License. You must inform recipients that the Source
-     Code Form of the Covered Software is governed by the terms of this
-     License, and how they can obtain a copy of this License. You may not
-     attempt to alter or restrict the recipients' rights in the Source Code
-     Form.
-
-3.2. Distribution of Executable Form
-
-     If You distribute Covered Software in Executable Form then:
-
-     a. such Covered Software must also be made available in Source Code Form,
-        as described in Section 3.1, and You must inform recipients of the
-        Executable Form how they can obtain a copy of such Source Code Form by
-        reasonable means in a timely manner, at a charge no more than the cost
-        of distribution to the recipient; and
-
-     b. You may distribute such Executable Form under the terms of this
-        License, or sublicense it under different terms, provided that the
-        license for the Executable Form does not attempt to limit or alter the
-        recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-     You may create and distribute a Larger Work under terms of Your choice,
-     provided that You also comply with the requirements of this License for
-     the Covered Software. If the Larger Work is a combination of Covered
-     Software with a work governed by one or more Secondary Licenses, and the
-     Covered Software is not Incompatible With Secondary Licenses, this
-     License permits You to additionally distribute such Covered Software
-     under the terms of such Secondary License(s), so that the recipient of
-     the Larger Work may, at their option, further distribute the Covered
-     Software under the terms of either this License or such Secondary
-     License(s).
-
-3.4. Notices
-
-     You may not remove or alter the substance of any license notices
-     (including copyright notices, patent notices, disclaimers of warranty, or
-     limitations of liability) contained within the Source Code Form of the
-     Covered Software, except that You may alter any license notices to the
-     extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-     You may choose to offer, and to charge a fee for, warranty, support,
-     indemnity or liability obligations to one or more recipients of Covered
-     Software. However, You may do so only on Your own behalf, and not on
-     behalf of any Contributor. You must make it absolutely clear that any
-     such warranty, support, indemnity, or liability obligation is offered by
-     You alone, and You hereby agree to indemnify every Contributor for any
-     liability incurred by such Contributor as a result of warranty, support,
-     indemnity or liability terms You offer. You may include additional
-     disclaimers of warranty and limitations of liability specific to any
-     jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-   If it is impossible for You to comply with any of the terms of this License
-   with respect to some or all of the Covered Software due to statute,
-   judicial order, or regulation then You must: (a) comply with the terms of
-   this License to the maximum extent possible; and (b) describe the
-   limitations and the code they affect. Such description must be placed in a
-   text file included with all distributions of the Covered Software under
-   this License. Except to the extent prohibited by statute or regulation,
-   such description must be sufficiently detailed for a recipient of ordinary
-   skill to be able to understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
-     fail to comply with any of its terms. However, if You become compliant,
-     then the rights granted under this License from a particular Contributor
-     are reinstated (a) provisionally, unless and until such Contributor
-     explicitly and finally terminates Your grants, and (b) on an ongoing
-     basis, if such Contributor fails to notify You of the non-compliance by
-     some reasonable means prior to 60 days after You have come back into
-     compliance. Moreover, Your grants from a particular Contributor are
-     reinstated on an ongoing basis if such Contributor notifies You of the
-     non-compliance by some reasonable means, this is the first time You have
-     received notice of non-compliance with this License from such
-     Contributor, and You become compliant prior to 30 days after Your receipt
-     of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-     infringement claim (excluding declaratory judgment actions,
-     counter-claims, and cross-claims) alleging that a Contributor Version
-     directly or indirectly infringes any patent, then the rights granted to
-     You by any and all Contributors for the Covered Software under Section
-     2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
-     license agreements (excluding distributors and resellers) which have been
-     validly granted by You or Your distributors under this License prior to
-     termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-   Covered Software is provided under this License on an "as is" basis,
-   without warranty of any kind, either expressed, implied, or statutory,
-   including, without limitation, warranties that the Covered Software is free
-   of defects, merchantable, fit for a particular purpose or non-infringing.
-   The entire risk as to the quality and performance of the Covered Software
-   is with You. Should any Covered Software prove defective in any respect,
-   You (not any Contributor) assume the cost of any necessary servicing,
-   repair, or correction. This disclaimer of warranty constitutes an essential
-   part of this License. No use of  any Covered Software is authorized under
-   this License except under this disclaimer.
-
-7. Limitation of Liability
-
-   Under no circumstances and under no legal theory, whether tort (including
-   negligence), contract, or otherwise, shall any Contributor, or anyone who
-   distributes Covered Software as permitted above, be liable to You for any
-   direct, indirect, special, incidental, or consequential damages of any
-   character including, without limitation, damages for lost profits, loss of
-   goodwill, work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses, even if such party shall have been
-   informed of the possibility of such damages. This limitation of liability
-   shall not apply to liability for death or personal injury resulting from
-   such party's negligence to the extent applicable law prohibits such
-   limitation. Some jurisdictions do not allow the exclusion or limitation of
-   incidental or consequential damages, so this exclusion and limitation may
-   not apply to You.
-
-8. Litigation
-
-   Any litigation relating to this License may be brought only in the courts
-   of a jurisdiction where the defendant maintains its principal place of
-   business and such litigation shall be governed by laws of that
-   jurisdiction, without reference to its conflict-of-law provisions. Nothing
-   in this Section shall prevent a party's ability to bring cross-claims or
-   counter-claims.
-
-9. Miscellaneous
-
-   This License represents the complete agreement concerning the subject
-   matter hereof. If any provision of this License is held to be
-   unenforceable, such provision shall be reformed only to the extent
-   necessary to make it enforceable. Any law or regulation which provides that
-   the language of a contract shall be construed against the drafter shall not
-   be used to construe this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
-      Mozilla Foundation is the license steward. Except as provided in Section
-      10.3, no one other than the license steward has the right to modify or
-      publish new versions of this License. Each version will be given a
-      distinguishing version number.
-
-10.2. Effect of New Versions
-
-      You may distribute the Covered Software under the terms of the version
-      of the License under which You originally received the Covered Software,
-      or under the terms of any subsequent version published by the license
-      steward.
-
-10.3. Modified Versions
-
-      If you create software not governed by this License, and you want to
-      create a new license for such software, you may create and use a
-      modified version of this License if you rename the license and remove
-      any references to the name of the license steward (except to note that
-      such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-      Licenses If You choose to distribute Source Code Form that is
-      Incompatible With Secondary Licenses under the terms of this version of
-      the License, the notice described in Exhibit B of this License must be
-      attached.
-
-Exhibit A - Source Code Form License Notice
-
-      This Source Code Form is subject to the
-      terms of the Mozilla Public License, v.
-      2.0. If a copy of the MPL was not
-      distributed with this file, You can
-      obtain one at
-      http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file,
-then You may include the notice in a location (such as a LICENSE file in a
-relevant directory) where a recipient would be likely to look for such a
-notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
-
-      This Source Code Form is "Incompatible
-      With Secondary Licenses", as defined by
-      the Mozilla Public License, v. 2.0.
-
diff --git a/proto-public/annotations/ratelimit/ratelimit.pb.binary.go b/proto-public/annotations/ratelimit/ratelimit.pb.binary.go
index a1bf8983f6949..316afdc87e031 100644
--- a/proto-public/annotations/ratelimit/ratelimit.pb.binary.go
+++ b/proto-public/annotations/ratelimit/ratelimit.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: annotations/ratelimit/ratelimit.proto
+// source: proto-public/annotations/ratelimit/ratelimit.proto
 
 package ratelimit
 
diff --git a/proto-public/annotations/ratelimit/ratelimit.pb.go b/proto-public/annotations/ratelimit/ratelimit.pb.go
index 3514d47ceb29d..80d21fb41ceaa 100644
--- a/proto-public/annotations/ratelimit/ratelimit.pb.go
+++ b/proto-public/annotations/ratelimit/ratelimit.pb.go
@@ -1,11 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
+// 	protoc-gen-go v1.28.1
 // 	protoc        (unknown)
-// source: annotations/ratelimit/ratelimit.proto
+// source: proto-public/annotations/ratelimit/ratelimit.proto
 
 package ratelimit
 
@@ -62,11 +59,11 @@ func (x OperationType) String() string {
 }
 
 func (OperationType) Descriptor() protoreflect.EnumDescriptor {
-	return file_annotations_ratelimit_ratelimit_proto_enumTypes[0].Descriptor()
+	return file_proto_public_annotations_ratelimit_ratelimit_proto_enumTypes[0].Descriptor()
 }
 
 func (OperationType) Type() protoreflect.EnumType {
-	return &file_annotations_ratelimit_ratelimit_proto_enumTypes[0]
+	return &file_proto_public_annotations_ratelimit_ratelimit_proto_enumTypes[0]
 }
 
 func (x OperationType) Number() protoreflect.EnumNumber {
@@ -75,83 +72,7 @@ func (x OperationType) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use OperationType.Descriptor instead.
 func (OperationType) EnumDescriptor() ([]byte, []int) {
-	return file_annotations_ratelimit_ratelimit_proto_rawDescGZIP(), []int{0}
-}
-
-type OperationCategory int32
-
-const (
-	OperationCategory_OPERATION_CATEGORY_UNSPECIFIED      OperationCategory = 0
-	OperationCategory_OPERATION_CATEGORY_ACL              OperationCategory = 1
-	OperationCategory_OPERATION_CATEGORY_PEER_STREAM      OperationCategory = 2
-	OperationCategory_OPERATION_CATEGORY_CONNECT_CA       OperationCategory = 3
-	OperationCategory_OPERATION_CATEGORY_PARTITION        OperationCategory = 4
-	OperationCategory_OPERATION_CATEGORY_PEERING          OperationCategory = 5
-	OperationCategory_OPERATION_CATEGORY_SERVER_DISCOVERY OperationCategory = 6
-	OperationCategory_OPERATION_CATEGORY_DATAPLANE        OperationCategory = 7
-	OperationCategory_OPERATION_CATEGORY_DNS              OperationCategory = 8
-	OperationCategory_OPERATION_CATEGORY_SUBSCRIBE        OperationCategory = 9
-	OperationCategory_OPERATION_CATEGORY_OPERATOR         OperationCategory = 10
-	OperationCategory_OPERATION_CATEGORY_RESOURCE         OperationCategory = 11
-)
-
-// Enum value maps for OperationCategory.
-var (
-	OperationCategory_name = map[int32]string{
-		0:  "OPERATION_CATEGORY_UNSPECIFIED",
-		1:  "OPERATION_CATEGORY_ACL",
-		2:  "OPERATION_CATEGORY_PEER_STREAM",
-		3:  "OPERATION_CATEGORY_CONNECT_CA",
-		4:  "OPERATION_CATEGORY_PARTITION",
-		5:  "OPERATION_CATEGORY_PEERING",
-		6:  "OPERATION_CATEGORY_SERVER_DISCOVERY",
-		7:  "OPERATION_CATEGORY_DATAPLANE",
-		8:  "OPERATION_CATEGORY_DNS",
-		9:  "OPERATION_CATEGORY_SUBSCRIBE",
-		10: "OPERATION_CATEGORY_OPERATOR",
-		11: "OPERATION_CATEGORY_RESOURCE",
-	}
-	OperationCategory_value = map[string]int32{
-		"OPERATION_CATEGORY_UNSPECIFIED":      0,
-		"OPERATION_CATEGORY_ACL":              1,
-		"OPERATION_CATEGORY_PEER_STREAM":      2,
-		"OPERATION_CATEGORY_CONNECT_CA":       3,
-		"OPERATION_CATEGORY_PARTITION":        4,
-		"OPERATION_CATEGORY_PEERING":          5,
-		"OPERATION_CATEGORY_SERVER_DISCOVERY": 6,
-		"OPERATION_CATEGORY_DATAPLANE":        7,
-		"OPERATION_CATEGORY_DNS":              8,
-		"OPERATION_CATEGORY_SUBSCRIBE":        9,
-		"OPERATION_CATEGORY_OPERATOR":         10,
-		"OPERATION_CATEGORY_RESOURCE":         11,
-	}
-)
-
-func (x OperationCategory) Enum() *OperationCategory {
-	p := new(OperationCategory)
-	*p = x
-	return p
-}
-
-func (x OperationCategory) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (OperationCategory) Descriptor() protoreflect.EnumDescriptor {
-	return file_annotations_ratelimit_ratelimit_proto_enumTypes[1].Descriptor()
-}
-
-func (OperationCategory) Type() protoreflect.EnumType {
-	return &file_annotations_ratelimit_ratelimit_proto_enumTypes[1]
-}
-
-func (x OperationCategory) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use OperationCategory.Descriptor instead.
-func (OperationCategory) EnumDescriptor() ([]byte, []int) {
-	return file_annotations_ratelimit_ratelimit_proto_rawDescGZIP(), []int{1}
+	return file_proto_public_annotations_ratelimit_ratelimit_proto_rawDescGZIP(), []int{0}
 }
 
 // Spec describes the kind of rate limit that will be applied to this RPC.
@@ -160,14 +81,13 @@ type Spec struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OperationType     OperationType     `protobuf:"varint,1,opt,name=operation_type,json=operationType,proto3,enum=hashicorp.consul.internal.ratelimit.OperationType" json:"operation_type,omitempty"`
-	OperationCategory OperationCategory `protobuf:"varint,2,opt,name=operation_category,json=operationCategory,proto3,enum=hashicorp.consul.internal.ratelimit.OperationCategory" json:"operation_category,omitempty"`
+	OperationType OperationType `protobuf:"varint,1,opt,name=operation_type,json=operationType,proto3,enum=hashicorp.consul.internal.ratelimit.OperationType" json:"operation_type,omitempty"`
 }
 
 func (x *Spec) Reset() {
 	*x = Spec{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_annotations_ratelimit_ratelimit_proto_msgTypes[0]
+		mi := &file_proto_public_annotations_ratelimit_ratelimit_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -180,7 +100,7 @@ func (x *Spec) String() string {
 func (*Spec) ProtoMessage() {}
 
 func (x *Spec) ProtoReflect() protoreflect.Message {
-	mi := &file_annotations_ratelimit_ratelimit_proto_msgTypes[0]
+	mi := &file_proto_public_annotations_ratelimit_ratelimit_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -193,7 +113,7 @@ func (x *Spec) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Spec.ProtoReflect.Descriptor instead.
 func (*Spec) Descriptor() ([]byte, []int) {
-	return file_annotations_ratelimit_ratelimit_proto_rawDescGZIP(), []int{0}
+	return file_proto_public_annotations_ratelimit_ratelimit_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *Spec) GetOperationType() OperationType {
@@ -203,154 +123,113 @@ func (x *Spec) GetOperationType() OperationType {
 	return OperationType_OPERATION_TYPE_UNSPECIFIED
 }
 
-func (x *Spec) GetOperationCategory() OperationCategory {
-	if x != nil {
-		return x.OperationCategory
-	}
-	return OperationCategory_OPERATION_CATEGORY_UNSPECIFIED
-}
-
-var file_annotations_ratelimit_ratelimit_proto_extTypes = []protoimpl.ExtensionInfo{
+var file_proto_public_annotations_ratelimit_ratelimit_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
 		ExtendedType:  (*descriptorpb.MethodOptions)(nil),
 		ExtensionType: (*Spec)(nil),
 		Field:         8300,
 		Name:          "hashicorp.consul.internal.ratelimit.spec",
 		Tag:           "bytes,8300,opt,name=spec",
-		Filename:      "annotations/ratelimit/ratelimit.proto",
+		Filename:      "proto-public/annotations/ratelimit/ratelimit.proto",
 	},
 }
 
 // Extension fields to descriptorpb.MethodOptions.
 var (
 	// optional hashicorp.consul.internal.ratelimit.Spec spec = 8300;
-	E_Spec = &file_annotations_ratelimit_ratelimit_proto_extTypes[0]
+	E_Spec = &file_proto_public_annotations_ratelimit_ratelimit_proto_extTypes[0]
 )
 
-var File_annotations_ratelimit_ratelimit_proto protoreflect.FileDescriptor
-
-var file_annotations_ratelimit_ratelimit_proto_rawDesc = []byte{
-	0x0a, 0x25, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61,
-	0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69,
-	0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x23, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x20, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc8,
-	0x01, 0x0a, 0x04, 0x53, 0x70, 0x65, 0x63, 0x12, 0x59, 0x0a, 0x0e, 0x6f, 0x70, 0x65, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x72, 0x61, 0x74, 0x65,
-	0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54,
-	0x79, 0x70, 0x65, 0x52, 0x0d, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79,
-	0x70, 0x65, 0x12, 0x65, 0x0a, 0x12, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
-	0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x36,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x72, 0x61, 0x74, 0x65, 0x6c,
-	0x69, 0x6d, 0x69, 0x74, 0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x61,
-	0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x11, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x2a, 0x7d, 0x0a, 0x0d, 0x4f, 0x70, 0x65,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x1a, 0x4f, 0x50,
-	0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53,
-	0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x4f, 0x50,
-	0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x58, 0x45,
-	0x4d, 0x50, 0x54, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49,
-	0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x41, 0x44, 0x10, 0x02, 0x12, 0x18,
-	0x0a, 0x14, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45,
-	0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x03, 0x2a, 0xa7, 0x03, 0x0a, 0x11, 0x4f, 0x70, 0x65,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x22,
-	0x0a, 0x1e, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x43, 0x41, 0x54, 0x45,
-	0x47, 0x4f, 0x52, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44,
-	0x10, 0x00, 0x12, 0x1a, 0x0a, 0x16, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f,
-	0x43, 0x41, 0x54, 0x45, 0x47, 0x4f, 0x52, 0x59, 0x5f, 0x41, 0x43, 0x4c, 0x10, 0x01, 0x12, 0x22,
-	0x0a, 0x1e, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x43, 0x41, 0x54, 0x45,
-	0x47, 0x4f, 0x52, 0x59, 0x5f, 0x50, 0x45, 0x45, 0x52, 0x5f, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d,
-	0x10, 0x02, 0x12, 0x21, 0x0a, 0x1d, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f,
-	0x43, 0x41, 0x54, 0x45, 0x47, 0x4f, 0x52, 0x59, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54,
-	0x5f, 0x43, 0x41, 0x10, 0x03, 0x12, 0x20, 0x0a, 0x1c, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49,
-	0x4f, 0x4e, 0x5f, 0x43, 0x41, 0x54, 0x45, 0x47, 0x4f, 0x52, 0x59, 0x5f, 0x50, 0x41, 0x52, 0x54,
-	0x49, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x04, 0x12, 0x1e, 0x0a, 0x1a, 0x4f, 0x50, 0x45, 0x52, 0x41,
-	0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x43, 0x41, 0x54, 0x45, 0x47, 0x4f, 0x52, 0x59, 0x5f, 0x50, 0x45,
-	0x45, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x05, 0x12, 0x27, 0x0a, 0x23, 0x4f, 0x50, 0x45, 0x52, 0x41,
-	0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x43, 0x41, 0x54, 0x45, 0x47, 0x4f, 0x52, 0x59, 0x5f, 0x53, 0x45,
-	0x52, 0x56, 0x45, 0x52, 0x5f, 0x44, 0x49, 0x53, 0x43, 0x4f, 0x56, 0x45, 0x52, 0x59, 0x10, 0x06,
-	0x12, 0x20, 0x0a, 0x1c, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x43, 0x41,
-	0x54, 0x45, 0x47, 0x4f, 0x52, 0x59, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x50, 0x4c, 0x41, 0x4e, 0x45,
-	0x10, 0x07, 0x12, 0x1a, 0x0a, 0x16, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f,
-	0x43, 0x41, 0x54, 0x45, 0x47, 0x4f, 0x52, 0x59, 0x5f, 0x44, 0x4e, 0x53, 0x10, 0x08, 0x12, 0x20,
-	0x0a, 0x1c, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x43, 0x41, 0x54, 0x45,
-	0x47, 0x4f, 0x52, 0x59, 0x5f, 0x53, 0x55, 0x42, 0x53, 0x43, 0x52, 0x49, 0x42, 0x45, 0x10, 0x09,
-	0x12, 0x1f, 0x0a, 0x1b, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x43, 0x41,
-	0x54, 0x45, 0x47, 0x4f, 0x52, 0x59, 0x5f, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x4f, 0x52, 0x10,
-	0x0a, 0x12, 0x1f, 0x0a, 0x1b, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x43,
-	0x41, 0x54, 0x45, 0x47, 0x4f, 0x52, 0x59, 0x5f, 0x52, 0x45, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45,
-	0x10, 0x0b, 0x3a, 0x5e, 0x0a, 0x04, 0x73, 0x70, 0x65, 0x63, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74,
-	0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xec, 0x40, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x29, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x72, 0x61,
-	0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x53, 0x70, 0x65, 0x63, 0x52, 0x04, 0x73, 0x70,
-	0x65, 0x63, 0x42, 0xa9, 0x02, 0x0a, 0x27, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x42, 0x0e,
-	0x52, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74,
-	0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x52, 0xaa, 0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x52, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0xca, 0x02, 0x23,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x52, 0x61, 0x74, 0x65, 0x6c, 0x69,
-	0x6d, 0x69, 0x74, 0xe2, 0x02, 0x2f, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c,
-	0x52, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74,
-	0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x26, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x52, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+var File_proto_public_annotations_ratelimit_ratelimit_proto protoreflect.FileDescriptor
+
+var file_proto_public_annotations_ratelimit_ratelimit_proto_rawDesc = []byte{
+	0x0a, 0x32, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x61,
+	0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c,
+	0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x23, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72,
+	0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x61, 0x0a, 0x04, 0x53,
+	0x70, 0x65, 0x63, 0x12, 0x59, 0x0a, 0x0e, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69,
+	0x74, 0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x52,
+	0x0d, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x2a, 0x7d,
+	0x0a, 0x0d, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x1e, 0x0a, 0x1a, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50,
+	0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12,
+	0x19, 0x0a, 0x15, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50,
+	0x45, 0x5f, 0x45, 0x58, 0x45, 0x4d, 0x50, 0x54, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x4f, 0x50,
+	0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x41,
+	0x44, 0x10, 0x02, 0x12, 0x18, 0x0a, 0x14, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e,
+	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x03, 0x3a, 0x5e, 0x0a,
+	0x04, 0x73, 0x70, 0x65, 0x63, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xec, 0x40, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d,
+	0x69, 0x74, 0x2e, 0x53, 0x70, 0x65, 0x63, 0x52, 0x04, 0x73, 0x70, 0x65, 0x63, 0x42, 0xa9, 0x02,
+	0x0a, 0x27, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x42, 0x0e, 0x52, 0x61, 0x74, 0x65, 0x6c,
+	0x69, 0x6d, 0x69, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3e, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70,
+	0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0xa2, 0x02, 0x04, 0x48, 0x43,
+	0x49, 0x52, 0xaa, 0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x52,
+	0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0xca, 0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x52, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0xe2, 0x02,
+	0x2f, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x52, 0x61, 0x74, 0x65, 0x6c,
+	0x69, 0x6d, 0x69, 0x74, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
+	0xea, 0x02, 0x26, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a,
+	0x52, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
-	file_annotations_ratelimit_ratelimit_proto_rawDescOnce sync.Once
-	file_annotations_ratelimit_ratelimit_proto_rawDescData = file_annotations_ratelimit_ratelimit_proto_rawDesc
+	file_proto_public_annotations_ratelimit_ratelimit_proto_rawDescOnce sync.Once
+	file_proto_public_annotations_ratelimit_ratelimit_proto_rawDescData = file_proto_public_annotations_ratelimit_ratelimit_proto_rawDesc
 )
 
-func file_annotations_ratelimit_ratelimit_proto_rawDescGZIP() []byte {
-	file_annotations_ratelimit_ratelimit_proto_rawDescOnce.Do(func() {
-		file_annotations_ratelimit_ratelimit_proto_rawDescData = protoimpl.X.CompressGZIP(file_annotations_ratelimit_ratelimit_proto_rawDescData)
+func file_proto_public_annotations_ratelimit_ratelimit_proto_rawDescGZIP() []byte {
+	file_proto_public_annotations_ratelimit_ratelimit_proto_rawDescOnce.Do(func() {
+		file_proto_public_annotations_ratelimit_ratelimit_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_public_annotations_ratelimit_ratelimit_proto_rawDescData)
 	})
-	return file_annotations_ratelimit_ratelimit_proto_rawDescData
+	return file_proto_public_annotations_ratelimit_ratelimit_proto_rawDescData
 }
 
-var file_annotations_ratelimit_ratelimit_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_annotations_ratelimit_ratelimit_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_annotations_ratelimit_ratelimit_proto_goTypes = []interface{}{
+var file_proto_public_annotations_ratelimit_ratelimit_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_proto_public_annotations_ratelimit_ratelimit_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_proto_public_annotations_ratelimit_ratelimit_proto_goTypes = []interface{}{
 	(OperationType)(0),                 // 0: hashicorp.consul.internal.ratelimit.OperationType
-	(OperationCategory)(0),             // 1: hashicorp.consul.internal.ratelimit.OperationCategory
-	(*Spec)(nil),                       // 2: hashicorp.consul.internal.ratelimit.Spec
-	(*descriptorpb.MethodOptions)(nil), // 3: google.protobuf.MethodOptions
+	(*Spec)(nil),                       // 1: hashicorp.consul.internal.ratelimit.Spec
+	(*descriptorpb.MethodOptions)(nil), // 2: google.protobuf.MethodOptions
 }
-var file_annotations_ratelimit_ratelimit_proto_depIdxs = []int32{
+var file_proto_public_annotations_ratelimit_ratelimit_proto_depIdxs = []int32{
 	0, // 0: hashicorp.consul.internal.ratelimit.Spec.operation_type:type_name -> hashicorp.consul.internal.ratelimit.OperationType
-	1, // 1: hashicorp.consul.internal.ratelimit.Spec.operation_category:type_name -> hashicorp.consul.internal.ratelimit.OperationCategory
-	3, // 2: hashicorp.consul.internal.ratelimit.spec:extendee -> google.protobuf.MethodOptions
-	2, // 3: hashicorp.consul.internal.ratelimit.spec:type_name -> hashicorp.consul.internal.ratelimit.Spec
-	4, // [4:4] is the sub-list for method output_type
-	4, // [4:4] is the sub-list for method input_type
-	3, // [3:4] is the sub-list for extension type_name
-	2, // [2:3] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
+	2, // 1: hashicorp.consul.internal.ratelimit.spec:extendee -> google.protobuf.MethodOptions
+	1, // 2: hashicorp.consul.internal.ratelimit.spec:type_name -> hashicorp.consul.internal.ratelimit.Spec
+	3, // [3:3] is the sub-list for method output_type
+	3, // [3:3] is the sub-list for method input_type
+	2, // [2:3] is the sub-list for extension type_name
+	1, // [1:2] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
 }
 
-func init() { file_annotations_ratelimit_ratelimit_proto_init() }
-func file_annotations_ratelimit_ratelimit_proto_init() {
-	if File_annotations_ratelimit_ratelimit_proto != nil {
+func init() { file_proto_public_annotations_ratelimit_ratelimit_proto_init() }
+func file_proto_public_annotations_ratelimit_ratelimit_proto_init() {
+	if File_proto_public_annotations_ratelimit_ratelimit_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_annotations_ratelimit_ratelimit_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_annotations_ratelimit_ratelimit_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Spec); i {
 			case 0:
 				return &v.state
@@ -367,20 +246,20 @@ func file_annotations_ratelimit_ratelimit_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_annotations_ratelimit_ratelimit_proto_rawDesc,
-			NumEnums:      2,
+			RawDescriptor: file_proto_public_annotations_ratelimit_ratelimit_proto_rawDesc,
+			NumEnums:      1,
 			NumMessages:   1,
 			NumExtensions: 1,
 			NumServices:   0,
 		},
-		GoTypes:           file_annotations_ratelimit_ratelimit_proto_goTypes,
-		DependencyIndexes: file_annotations_ratelimit_ratelimit_proto_depIdxs,
-		EnumInfos:         file_annotations_ratelimit_ratelimit_proto_enumTypes,
-		MessageInfos:      file_annotations_ratelimit_ratelimit_proto_msgTypes,
-		ExtensionInfos:    file_annotations_ratelimit_ratelimit_proto_extTypes,
+		GoTypes:           file_proto_public_annotations_ratelimit_ratelimit_proto_goTypes,
+		DependencyIndexes: file_proto_public_annotations_ratelimit_ratelimit_proto_depIdxs,
+		EnumInfos:         file_proto_public_annotations_ratelimit_ratelimit_proto_enumTypes,
+		MessageInfos:      file_proto_public_annotations_ratelimit_ratelimit_proto_msgTypes,
+		ExtensionInfos:    file_proto_public_annotations_ratelimit_ratelimit_proto_extTypes,
 	}.Build()
-	File_annotations_ratelimit_ratelimit_proto = out.File
-	file_annotations_ratelimit_ratelimit_proto_rawDesc = nil
-	file_annotations_ratelimit_ratelimit_proto_goTypes = nil
-	file_annotations_ratelimit_ratelimit_proto_depIdxs = nil
+	File_proto_public_annotations_ratelimit_ratelimit_proto = out.File
+	file_proto_public_annotations_ratelimit_ratelimit_proto_rawDesc = nil
+	file_proto_public_annotations_ratelimit_ratelimit_proto_goTypes = nil
+	file_proto_public_annotations_ratelimit_ratelimit_proto_depIdxs = nil
 }
diff --git a/proto-public/annotations/ratelimit/ratelimit.proto b/proto-public/annotations/ratelimit/ratelimit.proto
index 9869d86f8538e..f60a7880ac1fc 100644
--- a/proto-public/annotations/ratelimit/ratelimit.proto
+++ b/proto-public/annotations/ratelimit/ratelimit.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 package hashicorp.consul.internal.ratelimit;
@@ -16,25 +13,9 @@ enum OperationType {
   OPERATION_TYPE_WRITE = 3;
 }
 
-enum OperationCategory {
-  OPERATION_CATEGORY_UNSPECIFIED = 0;
-  OPERATION_CATEGORY_ACL = 1;
-  OPERATION_CATEGORY_PEER_STREAM = 2;
-  OPERATION_CATEGORY_CONNECT_CA = 3;
-  OPERATION_CATEGORY_PARTITION = 4;
-  OPERATION_CATEGORY_PEERING = 5;
-  OPERATION_CATEGORY_SERVER_DISCOVERY = 6;
-  OPERATION_CATEGORY_DATAPLANE = 7;
-  OPERATION_CATEGORY_DNS = 8;
-  OPERATION_CATEGORY_SUBSCRIBE = 9;
-  OPERATION_CATEGORY_OPERATOR = 10;
-  OPERATION_CATEGORY_RESOURCE = 11;
-}
-
 // Spec describes the kind of rate limit that will be applied to this RPC.
 message Spec {
   OperationType operation_type = 1;
-  OperationCategory operation_category = 2;
 }
 
 extend google.protobuf.MethodOptions {
diff --git a/proto-public/buf.gen.yaml b/proto-public/buf.gen.yaml
index 8ea9af5507f99..8a878a3d33326 100644
--- a/proto-public/buf.gen.yaml
+++ b/proto-public/buf.gen.yaml
@@ -1,11 +1,14 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: github.com/hashicorp/consul/proto-public
+    # this is not github.com/hashicorp/consul/proto-public because we are going
+    # to execute buf generate from the top level directory so that the filepaths
+    # contain the full path within the repo. This avoids registration conflicts
+    # in protocolbuffers/protobuf-go when Consul starts. Those conflicts would
+    # have been due to a protobuf file being registered to a global registry
+    # using a relative file name.
+    default: github.com/hashicorp/consul
 plugins:
   - name: go
     out: .
@@ -19,11 +22,6 @@ plugins:
     out: .
     opt:
       - paths=source_relative
-  - name: resource-types
-    out: .
-    opt:
-      - paths=source_relative
-    strategy: all
   - name: consul-rate-limit
     out: .
     opt:
diff --git a/proto-public/buf.yaml b/proto-public/buf.yaml
index 878225723ea34..85ac0bcd5bd19 100644
--- a/proto-public/buf.yaml
+++ b/proto-public/buf.yaml
@@ -1,8 +1,4 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 version: v1
-name: buf.build/hashicorp/consul
 lint:
   use:
     - DEFAULT
@@ -15,7 +11,6 @@ lint:
     - PACKAGE_VERSION_SUFFIX
 
   service_suffix: Service
-  allow_comment_ignores: true
 breaking:
   use:
     - FILE
diff --git a/proto-public/go.mod b/proto-public/go.mod
index b77474df64bb0..cecca73b03698 100644
--- a/proto-public/go.mod
+++ b/proto-public/go.mod
@@ -3,23 +3,19 @@ module github.com/hashicorp/consul/proto-public
 go 1.19
 
 require (
-	github.com/stretchr/testify v1.8.3
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
-	google.golang.org/grpc v1.55.0
-	google.golang.org/protobuf v1.30.0
+	github.com/stretchr/testify v1.5.1
+	google.golang.org/grpc v1.37.1
+	google.golang.org/protobuf v1.27.1
 )
 
 require (
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/davecgh/go-spew v1.1.0 // indirect
+	github.com/golang/protobuf v1.5.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/objx v0.1.0 // indirect
 	golang.org/x/net v0.13.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
 	golang.org/x/text v0.11.0 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
+	gopkg.in/yaml.v2 v2.2.2 // indirect
 )
diff --git a/proto-public/go.sum b/proto-public/go.sum
index ffb9a0538ca91..74915e0d847c1 100644
--- a/proto-public/go.sum
+++ b/proto-public/go.sum
@@ -1,57 +1,97 @@
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
 golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
-golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
 golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
-google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
-google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.37.1 h1:ARnQJNWxGyYJpdf/JXscNlQr/uv607ZPU9Z7ogHi+iI=
+google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/proto-public/pbacl/acl.pb.binary.go b/proto-public/pbacl/acl.pb.binary.go
index ce563f31b8a6e..63284c9ce98dc 100644
--- a/proto-public/pbacl/acl.pb.binary.go
+++ b/proto-public/pbacl/acl.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbacl/acl.proto
+// source: proto-public/pbacl/acl.proto
 
 package pbacl
 
diff --git a/proto-public/pbacl/acl.pb.go b/proto-public/pbacl/acl.pb.go
index f85a9e0b48e8f..2fb7cd034442c 100644
--- a/proto-public/pbacl/acl.pb.go
+++ b/proto-public/pbacl/acl.pb.go
@@ -1,11 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
+// 	protoc-gen-go v1.28.1
 // 	protoc        (unknown)
-// source: pbacl/acl.proto
+// source: proto-public/pbacl/acl.proto
 
 package pbacl
 
@@ -33,7 +30,7 @@ type LogoutResponse struct {
 func (x *LogoutResponse) Reset() {
 	*x = LogoutResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbacl_acl_proto_msgTypes[0]
+		mi := &file_proto_public_pbacl_acl_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -46,7 +43,7 @@ func (x *LogoutResponse) String() string {
 func (*LogoutResponse) ProtoMessage() {}
 
 func (x *LogoutResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pbacl_acl_proto_msgTypes[0]
+	mi := &file_proto_public_pbacl_acl_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -59,7 +56,7 @@ func (x *LogoutResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LogoutResponse.ProtoReflect.Descriptor instead.
 func (*LogoutResponse) Descriptor() ([]byte, []int) {
-	return file_pbacl_acl_proto_rawDescGZIP(), []int{0}
+	return file_proto_public_pbacl_acl_proto_rawDescGZIP(), []int{0}
 }
 
 type LoginRequest struct {
@@ -89,7 +86,7 @@ type LoginRequest struct {
 func (x *LoginRequest) Reset() {
 	*x = LoginRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbacl_acl_proto_msgTypes[1]
+		mi := &file_proto_public_pbacl_acl_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -102,7 +99,7 @@ func (x *LoginRequest) String() string {
 func (*LoginRequest) ProtoMessage() {}
 
 func (x *LoginRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbacl_acl_proto_msgTypes[1]
+	mi := &file_proto_public_pbacl_acl_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -115,7 +112,7 @@ func (x *LoginRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LoginRequest.ProtoReflect.Descriptor instead.
 func (*LoginRequest) Descriptor() ([]byte, []int) {
-	return file_pbacl_acl_proto_rawDescGZIP(), []int{1}
+	return file_proto_public_pbacl_acl_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *LoginRequest) GetAuthMethod() string {
@@ -172,7 +169,7 @@ type LoginResponse struct {
 func (x *LoginResponse) Reset() {
 	*x = LoginResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbacl_acl_proto_msgTypes[2]
+		mi := &file_proto_public_pbacl_acl_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -185,7 +182,7 @@ func (x *LoginResponse) String() string {
 func (*LoginResponse) ProtoMessage() {}
 
 func (x *LoginResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pbacl_acl_proto_msgTypes[2]
+	mi := &file_proto_public_pbacl_acl_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -198,7 +195,7 @@ func (x *LoginResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LoginResponse.ProtoReflect.Descriptor instead.
 func (*LoginResponse) Descriptor() ([]byte, []int) {
-	return file_pbacl_acl_proto_rawDescGZIP(), []int{2}
+	return file_proto_public_pbacl_acl_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *LoginResponse) GetToken() *LoginToken {
@@ -222,7 +219,7 @@ type LoginToken struct {
 func (x *LoginToken) Reset() {
 	*x = LoginToken{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbacl_acl_proto_msgTypes[3]
+		mi := &file_proto_public_pbacl_acl_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -235,7 +232,7 @@ func (x *LoginToken) String() string {
 func (*LoginToken) ProtoMessage() {}
 
 func (x *LoginToken) ProtoReflect() protoreflect.Message {
-	mi := &file_pbacl_acl_proto_msgTypes[3]
+	mi := &file_proto_public_pbacl_acl_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -248,7 +245,7 @@ func (x *LoginToken) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LoginToken.ProtoReflect.Descriptor instead.
 func (*LoginToken) Descriptor() ([]byte, []int) {
-	return file_pbacl_acl_proto_rawDescGZIP(), []int{3}
+	return file_proto_public_pbacl_acl_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *LoginToken) GetAccessorId() string {
@@ -279,7 +276,7 @@ type LogoutRequest struct {
 func (x *LogoutRequest) Reset() {
 	*x = LogoutRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbacl_acl_proto_msgTypes[4]
+		mi := &file_proto_public_pbacl_acl_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -292,7 +289,7 @@ func (x *LogoutRequest) String() string {
 func (*LogoutRequest) ProtoMessage() {}
 
 func (x *LogoutRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbacl_acl_proto_msgTypes[4]
+	mi := &file_proto_public_pbacl_acl_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -305,7 +302,7 @@ func (x *LogoutRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LogoutRequest.ProtoReflect.Descriptor instead.
 func (*LogoutRequest) Descriptor() ([]byte, []int) {
-	return file_pbacl_acl_proto_rawDescGZIP(), []int{4}
+	return file_proto_public_pbacl_acl_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *LogoutRequest) GetToken() string {
@@ -322,90 +319,91 @@ func (x *LogoutRequest) GetDatacenter() string {
 	return ""
 }
 
-var File_pbacl_acl_proto protoreflect.FileDescriptor
-
-var file_pbacl_acl_proto_rawDesc = []byte{
-	0x0a, 0x0f, 0x70, 0x62, 0x61, 0x63, 0x6c, 0x2f, 0x61, 0x63, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x14, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x61, 0x63, 0x6c, 0x1a, 0x25, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72,
-	0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x10,
-	0x0a, 0x0e, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0xa9, 0x02, 0x0a, 0x0c, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x75, 0x74, 0x68, 0x4d, 0x65, 0x74, 0x68,
-	0x6f, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x65, 0x61, 0x72, 0x65, 0x72, 0x5f, 0x74, 0x6f, 0x6b,
-	0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x62, 0x65, 0x61, 0x72, 0x65, 0x72,
-	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x40, 0x0a, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x63, 0x6c, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65,
-	0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65,
-	0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e,
-	0x74, 0x65, 0x72, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x47, 0x0a, 0x0d,
-	0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x36, 0x0a,
-	0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x61, 0x63, 0x6c, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x05,
-	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x4a, 0x0a, 0x0a, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x54, 0x6f,
-	0x6b, 0x65, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x5f,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73,
-	0x6f, 0x72, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x5f, 0x69,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x49,
-	0x64, 0x22, 0x45, 0x0a, 0x0d, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61,
-	0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x61,
-	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x32, 0xc7, 0x01, 0x0a, 0x0a, 0x41, 0x43, 0x4c,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x5a, 0x0a, 0x05, 0x4c, 0x6f, 0x67, 0x69, 0x6e,
-	0x12, 0x22, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x61, 0x63, 0x6c, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x63, 0x6c, 0x2e, 0x4c, 0x6f, 0x67, 0x69,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08,
-	0x03, 0x10, 0x01, 0x12, 0x5d, 0x0a, 0x06, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x12, 0x23, 0x2e,
+var File_proto_public_pbacl_acl_proto protoreflect.FileDescriptor
+
+var file_proto_public_pbacl_acl_proto_rawDesc = []byte{
+	0x0a, 0x1c, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70,
+	0x62, 0x61, 0x63, 0x6c, 0x2f, 0x61, 0x63, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x14,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x61, 0x63, 0x6c, 0x1a, 0x32, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c,
+	0x69, 0x63, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72,
+	0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d,
+	0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x10, 0x0a, 0x0e, 0x4c, 0x6f, 0x67, 0x6f,
+	0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xa9, 0x02, 0x0a, 0x0c, 0x4c,
+	0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x61,
+	0x75, 0x74, 0x68, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0a, 0x61, 0x75, 0x74, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x21, 0x0a, 0x0c,
+	0x62, 0x65, 0x61, 0x72, 0x65, 0x72, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0b, 0x62, 0x65, 0x61, 0x72, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12,
+	0x40, 0x0a, 0x04, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e,
 	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x61, 0x63, 0x6c, 0x2e, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x24, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x63, 0x6c, 0x2e, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x03,
-	0x10, 0x01, 0x42, 0xc6, 0x01, 0x0a, 0x18, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x63, 0x6c, 0x42,
-	0x08, 0x41, 0x63, 0x6c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70,
-	0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x61, 0x63, 0x6c, 0xa2, 0x02, 0x03, 0x48, 0x43,
-	0x41, 0xaa, 0x02, 0x14, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x41, 0x63, 0x6c, 0xca, 0x02, 0x14, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x41, 0x63, 0x6c, 0xe2,
-	0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x5c, 0x41, 0x63, 0x6c, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0xea, 0x02, 0x16, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x41, 0x63, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x2e, 0x61, 0x63, 0x6c, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6d, 0x65, 0x74,
+	0x61, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12,
+	0x1c, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a,
+	0x0a, 0x64, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x1a, 0x37, 0x0a,
+	0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x47, 0x0a, 0x0d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x36, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x63, 0x6c, 0x2e, 0x4c, 0x6f,
+	0x67, 0x69, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x22,
+	0x4a, 0x0a, 0x0a, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1f, 0x0a,
+	0x0b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x49, 0x64, 0x12, 0x1b,
+	0x0a, 0x09, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x49, 0x64, 0x22, 0x45, 0x0a, 0x0d, 0x4c,
+	0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05,
+	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b,
+	0x65, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74,
+	0x65, 0x72, 0x32, 0xc3, 0x01, 0x0a, 0x0a, 0x41, 0x43, 0x4c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x12, 0x58, 0x0a, 0x05, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x22, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x63,
+	0x6c, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x61, 0x63, 0x6c, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08, 0x03, 0x12, 0x5b, 0x0a, 0x06, 0x4c,
+	0x6f, 0x67, 0x6f, 0x75, 0x74, 0x12, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x63, 0x6c, 0x2e, 0x4c, 0x6f, 0x67,
+	0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x63,
+	0x6c, 0x2e, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08, 0x03, 0x42, 0xc6, 0x01, 0x0a, 0x18, 0x63, 0x6f, 0x6d,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x61, 0x63, 0x6c, 0x42, 0x08, 0x41, 0x63, 0x6c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x61, 0x63,
+	0x6c, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x41, 0xaa, 0x02, 0x14, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x41, 0x63, 0x6c, 0xca, 0x02,
+	0x14, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x5c, 0x41, 0x63, 0x6c, 0xe2, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x41, 0x63, 0x6c, 0x5c, 0x47, 0x50, 0x42,
+	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x16, 0x48, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x41, 0x63,
+	0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_pbacl_acl_proto_rawDescOnce sync.Once
-	file_pbacl_acl_proto_rawDescData = file_pbacl_acl_proto_rawDesc
+	file_proto_public_pbacl_acl_proto_rawDescOnce sync.Once
+	file_proto_public_pbacl_acl_proto_rawDescData = file_proto_public_pbacl_acl_proto_rawDesc
 )
 
-func file_pbacl_acl_proto_rawDescGZIP() []byte {
-	file_pbacl_acl_proto_rawDescOnce.Do(func() {
-		file_pbacl_acl_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbacl_acl_proto_rawDescData)
+func file_proto_public_pbacl_acl_proto_rawDescGZIP() []byte {
+	file_proto_public_pbacl_acl_proto_rawDescOnce.Do(func() {
+		file_proto_public_pbacl_acl_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_public_pbacl_acl_proto_rawDescData)
 	})
-	return file_pbacl_acl_proto_rawDescData
+	return file_proto_public_pbacl_acl_proto_rawDescData
 }
 
-var file_pbacl_acl_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
-var file_pbacl_acl_proto_goTypes = []interface{}{
+var file_proto_public_pbacl_acl_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_proto_public_pbacl_acl_proto_goTypes = []interface{}{
 	(*LogoutResponse)(nil), // 0: hashicorp.consul.acl.LogoutResponse
 	(*LoginRequest)(nil),   // 1: hashicorp.consul.acl.LoginRequest
 	(*LoginResponse)(nil),  // 2: hashicorp.consul.acl.LoginResponse
@@ -413,7 +411,7 @@ var file_pbacl_acl_proto_goTypes = []interface{}{
 	(*LogoutRequest)(nil),  // 4: hashicorp.consul.acl.LogoutRequest
 	nil,                    // 5: hashicorp.consul.acl.LoginRequest.MetaEntry
 }
-var file_pbacl_acl_proto_depIdxs = []int32{
+var file_proto_public_pbacl_acl_proto_depIdxs = []int32{
 	5, // 0: hashicorp.consul.acl.LoginRequest.meta:type_name -> hashicorp.consul.acl.LoginRequest.MetaEntry
 	3, // 1: hashicorp.consul.acl.LoginResponse.token:type_name -> hashicorp.consul.acl.LoginToken
 	1, // 2: hashicorp.consul.acl.ACLService.Login:input_type -> hashicorp.consul.acl.LoginRequest
@@ -427,13 +425,13 @@ var file_pbacl_acl_proto_depIdxs = []int32{
 	0, // [0:2] is the sub-list for field type_name
 }
 
-func init() { file_pbacl_acl_proto_init() }
-func file_pbacl_acl_proto_init() {
-	if File_pbacl_acl_proto != nil {
+func init() { file_proto_public_pbacl_acl_proto_init() }
+func file_proto_public_pbacl_acl_proto_init() {
+	if File_proto_public_pbacl_acl_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_pbacl_acl_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbacl_acl_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LogoutResponse); i {
 			case 0:
 				return &v.state
@@ -445,7 +443,7 @@ func file_pbacl_acl_proto_init() {
 				return nil
 			}
 		}
-		file_pbacl_acl_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbacl_acl_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LoginRequest); i {
 			case 0:
 				return &v.state
@@ -457,7 +455,7 @@ func file_pbacl_acl_proto_init() {
 				return nil
 			}
 		}
-		file_pbacl_acl_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbacl_acl_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LoginResponse); i {
 			case 0:
 				return &v.state
@@ -469,7 +467,7 @@ func file_pbacl_acl_proto_init() {
 				return nil
 			}
 		}
-		file_pbacl_acl_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbacl_acl_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LoginToken); i {
 			case 0:
 				return &v.state
@@ -481,7 +479,7 @@ func file_pbacl_acl_proto_init() {
 				return nil
 			}
 		}
-		file_pbacl_acl_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbacl_acl_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LogoutRequest); i {
 			case 0:
 				return &v.state
@@ -498,18 +496,18 @@ func file_pbacl_acl_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbacl_acl_proto_rawDesc,
+			RawDescriptor: file_proto_public_pbacl_acl_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   6,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_pbacl_acl_proto_goTypes,
-		DependencyIndexes: file_pbacl_acl_proto_depIdxs,
-		MessageInfos:      file_pbacl_acl_proto_msgTypes,
+		GoTypes:           file_proto_public_pbacl_acl_proto_goTypes,
+		DependencyIndexes: file_proto_public_pbacl_acl_proto_depIdxs,
+		MessageInfos:      file_proto_public_pbacl_acl_proto_msgTypes,
 	}.Build()
-	File_pbacl_acl_proto = out.File
-	file_pbacl_acl_proto_rawDesc = nil
-	file_pbacl_acl_proto_goTypes = nil
-	file_pbacl_acl_proto_depIdxs = nil
+	File_proto_public_pbacl_acl_proto = out.File
+	file_proto_public_pbacl_acl_proto_rawDesc = nil
+	file_proto_public_pbacl_acl_proto_goTypes = nil
+	file_proto_public_pbacl_acl_proto_depIdxs = nil
 }
diff --git a/proto-public/pbacl/acl.proto b/proto-public/pbacl/acl.proto
index bfb71ad4f2e01..71395acc5defe 100644
--- a/proto-public/pbacl/acl.proto
+++ b/proto-public/pbacl/acl.proto
@@ -1,11 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 package hashicorp.consul.acl;
 
-import "annotations/ratelimit/ratelimit.proto";
+import "proto-public/annotations/ratelimit/ratelimit.proto";
 
 service ACLService {
   // Login exchanges the presented bearer token for a Consul ACL token using a
@@ -13,7 +10,6 @@ service ACLService {
   rpc Login(LoginRequest) returns (LoginResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_WRITE,
-      operation_category: OPERATION_CATEGORY_ACL
     };
   }
 
@@ -21,7 +17,6 @@ service ACLService {
   rpc Logout(LogoutRequest) returns (LogoutResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_WRITE,
-      operation_category: OPERATION_CATEGORY_ACL
     };
   }
 }
diff --git a/proto-public/pbacl/acl_grpc.pb.go b/proto-public/pbacl/acl_grpc.pb.go
index 19fd5553f3261..87155b8d0fca9 100644
--- a/proto-public/pbacl/acl_grpc.pb.go
+++ b/proto-public/pbacl/acl_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             (unknown)
-// source: pbacl/acl.proto
+// source: proto-public/pbacl/acl.proto
 
 package pbacl
 
@@ -141,5 +141,5 @@ var ACLService_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "pbacl/acl.proto",
+	Metadata: "proto-public/pbacl/acl.proto",
 }
diff --git a/proto-public/pbauth/v2beta1/computed_traffic_permissions.pb.binary.go b/proto-public/pbauth/v2beta1/computed_traffic_permissions.pb.binary.go
deleted file mode 100644
index 2e1f9bd899644..0000000000000
--- a/proto-public/pbauth/v2beta1/computed_traffic_permissions.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbauth/v2beta1/computed_traffic_permissions.proto
-
-package authv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedTrafficPermissions) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedTrafficPermissions) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbauth/v2beta1/computed_traffic_permissions.pb.go b/proto-public/pbauth/v2beta1/computed_traffic_permissions.pb.go
deleted file mode 100644
index b88c2e86bd037..0000000000000
--- a/proto-public/pbauth/v2beta1/computed_traffic_permissions.pb.go
+++ /dev/null
@@ -1,201 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbauth/v2beta1/computed_traffic_permissions.proto
-
-package authv2beta1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type ComputedTrafficPermissions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	AllowPermissions []*Permission `protobuf:"bytes,1,rep,name=allow_permissions,json=allowPermissions,proto3" json:"allow_permissions,omitempty"`
-	DenyPermissions  []*Permission `protobuf:"bytes,2,rep,name=deny_permissions,json=denyPermissions,proto3" json:"deny_permissions,omitempty"`
-	IsDefault        bool          `protobuf:"varint,3,opt,name=is_default,json=isDefault,proto3" json:"is_default,omitempty"`
-}
-
-func (x *ComputedTrafficPermissions) Reset() {
-	*x = ComputedTrafficPermissions{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbauth_v2beta1_computed_traffic_permissions_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedTrafficPermissions) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedTrafficPermissions) ProtoMessage() {}
-
-func (x *ComputedTrafficPermissions) ProtoReflect() protoreflect.Message {
-	mi := &file_pbauth_v2beta1_computed_traffic_permissions_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedTrafficPermissions.ProtoReflect.Descriptor instead.
-func (*ComputedTrafficPermissions) Descriptor() ([]byte, []int) {
-	return file_pbauth_v2beta1_computed_traffic_permissions_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ComputedTrafficPermissions) GetAllowPermissions() []*Permission {
-	if x != nil {
-		return x.AllowPermissions
-	}
-	return nil
-}
-
-func (x *ComputedTrafficPermissions) GetDenyPermissions() []*Permission {
-	if x != nil {
-		return x.DenyPermissions
-	}
-	return nil
-}
-
-func (x *ComputedTrafficPermissions) GetIsDefault() bool {
-	if x != nil {
-		return x.IsDefault
-	}
-	return false
-}
-
-var File_pbauth_v2beta1_computed_traffic_permissions_proto protoreflect.FileDescriptor
-
-var file_pbauth_v2beta1_computed_traffic_permissions_proto_rawDesc = []byte{
-	0x0a, 0x31, 0x70, 0x62, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x72, 0x61, 0x66, 0x66, 0x69,
-	0x63, 0x5f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x1a, 0x28, 0x70, 0x62, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2f, 0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x5f, 0x70, 0x65, 0x72, 0x6d, 0x69,
-	0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x70, 0x62,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf1, 0x01, 0x0a, 0x1a, 0x43,
-	0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x50, 0x65,
-	0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x56, 0x0a, 0x11, 0x61, 0x6c, 0x6c,
-	0x6f, 0x77, 0x5f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52,
-	0x10, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x54, 0x0a, 0x10, 0x64, 0x65, 0x6e, 0x79, 0x5f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61,
-	0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x65, 0x72, 0x6d,
-	0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x64, 0x65, 0x6e, 0x79, 0x50, 0x65, 0x72, 0x6d,
-	0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x69, 0x73, 0x5f, 0x64, 0x65,
-	0x66, 0x61, 0x75, 0x6c, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x44,
-	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x42, 0xa0,
-	0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x42, 0x1f, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x54, 0x72,
-	0x61, 0x66, 0x66, 0x69, 0x63, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69,
-	0x63, 0x2f, 0x70, 0x62, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x3b, 0x61, 0x75, 0x74, 0x68, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48,
-	0x43, 0x41, 0xaa, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0xca, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x41, 0x75, 0x74, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0xe2, 0x02, 0x29, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x41, 0x75, 0x74, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02,
-	0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x3a, 0x3a, 0x41, 0x75, 0x74, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbauth_v2beta1_computed_traffic_permissions_proto_rawDescOnce sync.Once
-	file_pbauth_v2beta1_computed_traffic_permissions_proto_rawDescData = file_pbauth_v2beta1_computed_traffic_permissions_proto_rawDesc
-)
-
-func file_pbauth_v2beta1_computed_traffic_permissions_proto_rawDescGZIP() []byte {
-	file_pbauth_v2beta1_computed_traffic_permissions_proto_rawDescOnce.Do(func() {
-		file_pbauth_v2beta1_computed_traffic_permissions_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbauth_v2beta1_computed_traffic_permissions_proto_rawDescData)
-	})
-	return file_pbauth_v2beta1_computed_traffic_permissions_proto_rawDescData
-}
-
-var file_pbauth_v2beta1_computed_traffic_permissions_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbauth_v2beta1_computed_traffic_permissions_proto_goTypes = []interface{}{
-	(*ComputedTrafficPermissions)(nil), // 0: hashicorp.consul.auth.v2beta1.ComputedTrafficPermissions
-	(*Permission)(nil),                 // 1: hashicorp.consul.auth.v2beta1.Permission
-}
-var file_pbauth_v2beta1_computed_traffic_permissions_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.auth.v2beta1.ComputedTrafficPermissions.allow_permissions:type_name -> hashicorp.consul.auth.v2beta1.Permission
-	1, // 1: hashicorp.consul.auth.v2beta1.ComputedTrafficPermissions.deny_permissions:type_name -> hashicorp.consul.auth.v2beta1.Permission
-	2, // [2:2] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
-}
-
-func init() { file_pbauth_v2beta1_computed_traffic_permissions_proto_init() }
-func file_pbauth_v2beta1_computed_traffic_permissions_proto_init() {
-	if File_pbauth_v2beta1_computed_traffic_permissions_proto != nil {
-		return
-	}
-	file_pbauth_v2beta1_traffic_permissions_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbauth_v2beta1_computed_traffic_permissions_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedTrafficPermissions); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbauth_v2beta1_computed_traffic_permissions_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbauth_v2beta1_computed_traffic_permissions_proto_goTypes,
-		DependencyIndexes: file_pbauth_v2beta1_computed_traffic_permissions_proto_depIdxs,
-		MessageInfos:      file_pbauth_v2beta1_computed_traffic_permissions_proto_msgTypes,
-	}.Build()
-	File_pbauth_v2beta1_computed_traffic_permissions_proto = out.File
-	file_pbauth_v2beta1_computed_traffic_permissions_proto_rawDesc = nil
-	file_pbauth_v2beta1_computed_traffic_permissions_proto_goTypes = nil
-	file_pbauth_v2beta1_computed_traffic_permissions_proto_depIdxs = nil
-}
diff --git a/proto-public/pbauth/v2beta1/computed_traffic_permissions.proto b/proto-public/pbauth/v2beta1/computed_traffic_permissions.proto
deleted file mode 100644
index 24127cc6a4684..0000000000000
--- a/proto-public/pbauth/v2beta1/computed_traffic_permissions.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-syntax = "proto3";
-
-package hashicorp.consul.auth.v2beta1;
-
-import "pbauth/v2beta1/traffic_permissions.proto";
-import "pbresource/annotations.proto";
-
-message ComputedTrafficPermissions {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  repeated Permission allow_permissions = 1;
-  repeated Permission deny_permissions = 2;
-  bool is_default = 3;
-}
diff --git a/proto-public/pbauth/v2beta1/resource_types.gen.go b/proto-public/pbauth/v2beta1/resource_types.gen.go
deleted file mode 100644
index 850dcaa9d6612..0000000000000
--- a/proto-public/pbauth/v2beta1/resource_types.gen.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Code generated by protoc-gen-resource-types. DO NOT EDIT.
-
-package authv2beta1
-
-import (
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	GroupName = "auth"
-	Version   = "v2beta1"
-
-	ComputedTrafficPermissionsKind  = "ComputedTrafficPermissions"
-	NamespaceTrafficPermissionsKind = "NamespaceTrafficPermissions"
-	PartitionTrafficPermissionsKind = "PartitionTrafficPermissions"
-	TrafficPermissionsKind          = "TrafficPermissions"
-	WorkloadIdentityKind            = "WorkloadIdentity"
-)
-
-var (
-	ComputedTrafficPermissionsType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         ComputedTrafficPermissionsKind,
-	}
-
-	NamespaceTrafficPermissionsType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         NamespaceTrafficPermissionsKind,
-	}
-
-	PartitionTrafficPermissionsType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         PartitionTrafficPermissionsKind,
-	}
-
-	TrafficPermissionsType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         TrafficPermissionsKind,
-	}
-
-	WorkloadIdentityType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         WorkloadIdentityKind,
-	}
-)
diff --git a/proto-public/pbauth/v2beta1/traffic_permissions.pb.binary.go b/proto-public/pbauth/v2beta1/traffic_permissions.pb.binary.go
deleted file mode 100644
index c1af15492ae71..0000000000000
--- a/proto-public/pbauth/v2beta1/traffic_permissions.pb.binary.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbauth/v2beta1/traffic_permissions.proto
-
-package authv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TrafficPermissions) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TrafficPermissions) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *NamespaceTrafficPermissions) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *NamespaceTrafficPermissions) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *PartitionTrafficPermissions) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *PartitionTrafficPermissions) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Destination) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Destination) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Permission) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Permission) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Source) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Source) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ExcludeSource) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ExcludeSource) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DestinationRule) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DestinationRule) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ExcludePermissionRule) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ExcludePermissionRule) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DestinationRuleHeader) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DestinationRuleHeader) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbauth/v2beta1/traffic_permissions.pb.go b/proto-public/pbauth/v2beta1/traffic_permissions.pb.go
deleted file mode 100644
index e803c20e9f827..0000000000000
--- a/proto-public/pbauth/v2beta1/traffic_permissions.pb.go
+++ /dev/null
@@ -1,1184 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbauth/v2beta1/traffic_permissions.proto
-
-package authv2beta1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Action int32
-
-const (
-	Action_ACTION_UNSPECIFIED Action = 0
-	Action_ACTION_DENY        Action = 1
-	Action_ACTION_ALLOW       Action = 2
-)
-
-// Enum value maps for Action.
-var (
-	Action_name = map[int32]string{
-		0: "ACTION_UNSPECIFIED",
-		1: "ACTION_DENY",
-		2: "ACTION_ALLOW",
-	}
-	Action_value = map[string]int32{
-		"ACTION_UNSPECIFIED": 0,
-		"ACTION_DENY":        1,
-		"ACTION_ALLOW":       2,
-	}
-)
-
-func (x Action) Enum() *Action {
-	p := new(Action)
-	*p = x
-	return p
-}
-
-func (x Action) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Action) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbauth_v2beta1_traffic_permissions_proto_enumTypes[0].Descriptor()
-}
-
-func (Action) Type() protoreflect.EnumType {
-	return &file_pbauth_v2beta1_traffic_permissions_proto_enumTypes[0]
-}
-
-func (x Action) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Action.Descriptor instead.
-func (Action) EnumDescriptor() ([]byte, []int) {
-	return file_pbauth_v2beta1_traffic_permissions_proto_rawDescGZIP(), []int{0}
-}
-
-type TrafficPermissions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// destination is a configuration of the destination proxies
-	// where these traffic permissions should apply.
-	Destination *Destination `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"`
-	// Action can be either allow or deny for the entire object. It will default to allow.
-	//
-	// If action is allow,
-	// we will allow the connection if one of the rules in Rules matches, in other words, we will deny
-	// all requests except for the ones that match Rules. If Consul is in default allow mode, then allow
-	// actions have no effect without a deny permission as everything is allowed by default.
-	//
-	// If action is deny,
-	// we will deny the connection if one of the rules in Rules match, in other words,
-	// we will allow all requests except for the ones that match Rules. If Consul is default deny mode,
-	// then deny permissions have no effect without an allow permission as everything is denied by default.
-	//
-	// Action unspecified is reserved for compatibility with the addition of future actions.
-	Action Action `protobuf:"varint,2,opt,name=action,proto3,enum=hashicorp.consul.auth.v2beta1.Action" json:"action,omitempty"`
-	// permissions is a list of permissions to match on.
-	// They are applied using OR semantics.
-	Permissions []*Permission `protobuf:"bytes,3,rep,name=permissions,proto3" json:"permissions,omitempty"`
-}
-
-func (x *TrafficPermissions) Reset() {
-	*x = TrafficPermissions{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TrafficPermissions) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TrafficPermissions) ProtoMessage() {}
-
-func (x *TrafficPermissions) ProtoReflect() protoreflect.Message {
-	mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TrafficPermissions.ProtoReflect.Descriptor instead.
-func (*TrafficPermissions) Descriptor() ([]byte, []int) {
-	return file_pbauth_v2beta1_traffic_permissions_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *TrafficPermissions) GetDestination() *Destination {
-	if x != nil {
-		return x.Destination
-	}
-	return nil
-}
-
-func (x *TrafficPermissions) GetAction() Action {
-	if x != nil {
-		return x.Action
-	}
-	return Action_ACTION_UNSPECIFIED
-}
-
-func (x *TrafficPermissions) GetPermissions() []*Permission {
-	if x != nil {
-		return x.Permissions
-	}
-	return nil
-}
-
-type NamespaceTrafficPermissions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Action      Action        `protobuf:"varint,1,opt,name=action,proto3,enum=hashicorp.consul.auth.v2beta1.Action" json:"action,omitempty"`
-	Permissions []*Permission `protobuf:"bytes,2,rep,name=permissions,proto3" json:"permissions,omitempty"`
-}
-
-func (x *NamespaceTrafficPermissions) Reset() {
-	*x = NamespaceTrafficPermissions{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *NamespaceTrafficPermissions) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*NamespaceTrafficPermissions) ProtoMessage() {}
-
-func (x *NamespaceTrafficPermissions) ProtoReflect() protoreflect.Message {
-	mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use NamespaceTrafficPermissions.ProtoReflect.Descriptor instead.
-func (*NamespaceTrafficPermissions) Descriptor() ([]byte, []int) {
-	return file_pbauth_v2beta1_traffic_permissions_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *NamespaceTrafficPermissions) GetAction() Action {
-	if x != nil {
-		return x.Action
-	}
-	return Action_ACTION_UNSPECIFIED
-}
-
-func (x *NamespaceTrafficPermissions) GetPermissions() []*Permission {
-	if x != nil {
-		return x.Permissions
-	}
-	return nil
-}
-
-type PartitionTrafficPermissions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Action      Action        `protobuf:"varint,1,opt,name=action,proto3,enum=hashicorp.consul.auth.v2beta1.Action" json:"action,omitempty"`
-	Permissions []*Permission `protobuf:"bytes,2,rep,name=permissions,proto3" json:"permissions,omitempty"`
-}
-
-func (x *PartitionTrafficPermissions) Reset() {
-	*x = PartitionTrafficPermissions{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PartitionTrafficPermissions) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PartitionTrafficPermissions) ProtoMessage() {}
-
-func (x *PartitionTrafficPermissions) ProtoReflect() protoreflect.Message {
-	mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PartitionTrafficPermissions.ProtoReflect.Descriptor instead.
-func (*PartitionTrafficPermissions) Descriptor() ([]byte, []int) {
-	return file_pbauth_v2beta1_traffic_permissions_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *PartitionTrafficPermissions) GetAction() Action {
-	if x != nil {
-		return x.Action
-	}
-	return Action_ACTION_UNSPECIFIED
-}
-
-func (x *PartitionTrafficPermissions) GetPermissions() []*Permission {
-	if x != nil {
-		return x.Permissions
-	}
-	return nil
-}
-
-// Destination contains the name or name-prefix of the WorkloadIdentity.
-// The WorkloadIdentity resource must
-// be in the same tenancy as the TrafficPermissions resource.
-type Destination struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	IdentityName string `protobuf:"bytes,1,opt,name=identity_name,json=identityName,proto3" json:"identity_name,omitempty"`
-}
-
-func (x *Destination) Reset() {
-	*x = Destination{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Destination) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Destination) ProtoMessage() {}
-
-func (x *Destination) ProtoReflect() protoreflect.Message {
-	mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Destination.ProtoReflect.Descriptor instead.
-func (*Destination) Descriptor() ([]byte, []int) {
-	return file_pbauth_v2beta1_traffic_permissions_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *Destination) GetIdentityName() string {
-	if x != nil {
-		return x.IdentityName
-	}
-	return ""
-}
-
-// permissions is a list of permissions to match on.
-type Permission struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// sources is a list of sources in this traffic permission.
-	Sources []*Source `protobuf:"bytes,1,rep,name=sources,proto3" json:"sources,omitempty"`
-	// destination_rules is a list of rules to apply for matching sources in this Permission.
-	// These rules are specific to the request or connection that is going to the destination(s)
-	// selected by the TrafficPermissions resource.
-	DestinationRules []*DestinationRule `protobuf:"bytes,2,rep,name=destination_rules,json=destinationRules,proto3" json:"destination_rules,omitempty"`
-}
-
-func (x *Permission) Reset() {
-	*x = Permission{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Permission) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Permission) ProtoMessage() {}
-
-func (x *Permission) ProtoReflect() protoreflect.Message {
-	mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Permission.ProtoReflect.Descriptor instead.
-func (*Permission) Descriptor() ([]byte, []int) {
-	return file_pbauth_v2beta1_traffic_permissions_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *Permission) GetSources() []*Source {
-	if x != nil {
-		return x.Sources
-	}
-	return nil
-}
-
-func (x *Permission) GetDestinationRules() []*DestinationRule {
-	if x != nil {
-		return x.DestinationRules
-	}
-	return nil
-}
-
-// Source represents the source identity.
-// To specify any of the wildcard sources, the specific fields need to be omitted.
-// For example, for a wildcard namespace, identity_name should be omitted.
-type Source struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	IdentityName  string `protobuf:"bytes,1,opt,name=identity_name,json=identityName,proto3" json:"identity_name,omitempty"`
-	Namespace     string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
-	Partition     string `protobuf:"bytes,3,opt,name=partition,proto3" json:"partition,omitempty"`
-	Peer          string `protobuf:"bytes,4,opt,name=peer,proto3" json:"peer,omitempty"`
-	SamenessGroup string `protobuf:"bytes,5,opt,name=sameness_group,json=samenessGroup,proto3" json:"sameness_group,omitempty"`
-	// exclude is a list of sources to exclude from this source.
-	Exclude []*ExcludeSource `protobuf:"bytes,6,rep,name=exclude,proto3" json:"exclude,omitempty"`
-}
-
-func (x *Source) Reset() {
-	*x = Source{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Source) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Source) ProtoMessage() {}
-
-func (x *Source) ProtoReflect() protoreflect.Message {
-	mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Source.ProtoReflect.Descriptor instead.
-func (*Source) Descriptor() ([]byte, []int) {
-	return file_pbauth_v2beta1_traffic_permissions_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *Source) GetIdentityName() string {
-	if x != nil {
-		return x.IdentityName
-	}
-	return ""
-}
-
-func (x *Source) GetNamespace() string {
-	if x != nil {
-		return x.Namespace
-	}
-	return ""
-}
-
-func (x *Source) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *Source) GetPeer() string {
-	if x != nil {
-		return x.Peer
-	}
-	return ""
-}
-
-func (x *Source) GetSamenessGroup() string {
-	if x != nil {
-		return x.SamenessGroup
-	}
-	return ""
-}
-
-func (x *Source) GetExclude() []*ExcludeSource {
-	if x != nil {
-		return x.Exclude
-	}
-	return nil
-}
-
-// ExcludeSource is almost the same as source but it prevents the addition of
-// matchiing sources.
-type ExcludeSource struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	IdentityName  string `protobuf:"bytes,1,opt,name=identity_name,json=identityName,proto3" json:"identity_name,omitempty"`
-	Namespace     string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
-	Partition     string `protobuf:"bytes,3,opt,name=partition,proto3" json:"partition,omitempty"`
-	Peer          string `protobuf:"bytes,4,opt,name=peer,proto3" json:"peer,omitempty"`
-	SamenessGroup string `protobuf:"bytes,5,opt,name=sameness_group,json=samenessGroup,proto3" json:"sameness_group,omitempty"`
-}
-
-func (x *ExcludeSource) Reset() {
-	*x = ExcludeSource{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExcludeSource) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExcludeSource) ProtoMessage() {}
-
-func (x *ExcludeSource) ProtoReflect() protoreflect.Message {
-	mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExcludeSource.ProtoReflect.Descriptor instead.
-func (*ExcludeSource) Descriptor() ([]byte, []int) {
-	return file_pbauth_v2beta1_traffic_permissions_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *ExcludeSource) GetIdentityName() string {
-	if x != nil {
-		return x.IdentityName
-	}
-	return ""
-}
-
-func (x *ExcludeSource) GetNamespace() string {
-	if x != nil {
-		return x.Namespace
-	}
-	return ""
-}
-
-func (x *ExcludeSource) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *ExcludeSource) GetPeer() string {
-	if x != nil {
-		return x.Peer
-	}
-	return ""
-}
-
-func (x *ExcludeSource) GetSamenessGroup() string {
-	if x != nil {
-		return x.SamenessGroup
-	}
-	return ""
-}
-
-// DestinationRule contains rules rules to apply to the incoming connection.
-type DestinationRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PathExact  string `protobuf:"bytes,1,opt,name=path_exact,json=pathExact,proto3" json:"path_exact,omitempty"`
-	PathPrefix string `protobuf:"bytes,2,opt,name=path_prefix,json=pathPrefix,proto3" json:"path_prefix,omitempty"`
-	PathRegex  string `protobuf:"bytes,3,opt,name=path_regex,json=pathRegex,proto3" json:"path_regex,omitempty"`
-	// methods is the list of HTTP methods. If no methods are specified,
-	// this rule will apply to all methods.
-	Methods   []string               `protobuf:"bytes,4,rep,name=methods,proto3" json:"methods,omitempty"`
-	Header    *DestinationRuleHeader `protobuf:"bytes,5,opt,name=header,proto3" json:"header,omitempty"`
-	PortNames []string               `protobuf:"bytes,6,rep,name=port_names,json=portNames,proto3" json:"port_names,omitempty"`
-	// exclude contains a list of rules to exclude when evaluating rules for the incoming connection.
-	Exclude []*ExcludePermissionRule `protobuf:"bytes,7,rep,name=exclude,proto3" json:"exclude,omitempty"`
-}
-
-func (x *DestinationRule) Reset() {
-	*x = DestinationRule{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DestinationRule) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DestinationRule) ProtoMessage() {}
-
-func (x *DestinationRule) ProtoReflect() protoreflect.Message {
-	mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DestinationRule.ProtoReflect.Descriptor instead.
-func (*DestinationRule) Descriptor() ([]byte, []int) {
-	return file_pbauth_v2beta1_traffic_permissions_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *DestinationRule) GetPathExact() string {
-	if x != nil {
-		return x.PathExact
-	}
-	return ""
-}
-
-func (x *DestinationRule) GetPathPrefix() string {
-	if x != nil {
-		return x.PathPrefix
-	}
-	return ""
-}
-
-func (x *DestinationRule) GetPathRegex() string {
-	if x != nil {
-		return x.PathRegex
-	}
-	return ""
-}
-
-func (x *DestinationRule) GetMethods() []string {
-	if x != nil {
-		return x.Methods
-	}
-	return nil
-}
-
-func (x *DestinationRule) GetHeader() *DestinationRuleHeader {
-	if x != nil {
-		return x.Header
-	}
-	return nil
-}
-
-func (x *DestinationRule) GetPortNames() []string {
-	if x != nil {
-		return x.PortNames
-	}
-	return nil
-}
-
-func (x *DestinationRule) GetExclude() []*ExcludePermissionRule {
-	if x != nil {
-		return x.Exclude
-	}
-	return nil
-}
-
-type ExcludePermissionRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PathExact  string `protobuf:"bytes,1,opt,name=path_exact,json=pathExact,proto3" json:"path_exact,omitempty"`
-	PathPrefix string `protobuf:"bytes,2,opt,name=path_prefix,json=pathPrefix,proto3" json:"path_prefix,omitempty"`
-	PathRegex  string `protobuf:"bytes,3,opt,name=path_regex,json=pathRegex,proto3" json:"path_regex,omitempty"`
-	// methods is the list of HTTP methods.
-	Methods []string               `protobuf:"bytes,4,rep,name=methods,proto3" json:"methods,omitempty"`
-	Header  *DestinationRuleHeader `protobuf:"bytes,5,opt,name=header,proto3" json:"header,omitempty"`
-	// port_names is a list of workload ports to apply this rule to. The ports specified here
-	// must be the ports used in the connection.
-	PortNames []string `protobuf:"bytes,6,rep,name=port_names,json=portNames,proto3" json:"port_names,omitempty"`
-}
-
-func (x *ExcludePermissionRule) Reset() {
-	*x = ExcludePermissionRule{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExcludePermissionRule) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExcludePermissionRule) ProtoMessage() {}
-
-func (x *ExcludePermissionRule) ProtoReflect() protoreflect.Message {
-	mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExcludePermissionRule.ProtoReflect.Descriptor instead.
-func (*ExcludePermissionRule) Descriptor() ([]byte, []int) {
-	return file_pbauth_v2beta1_traffic_permissions_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *ExcludePermissionRule) GetPathExact() string {
-	if x != nil {
-		return x.PathExact
-	}
-	return ""
-}
-
-func (x *ExcludePermissionRule) GetPathPrefix() string {
-	if x != nil {
-		return x.PathPrefix
-	}
-	return ""
-}
-
-func (x *ExcludePermissionRule) GetPathRegex() string {
-	if x != nil {
-		return x.PathRegex
-	}
-	return ""
-}
-
-func (x *ExcludePermissionRule) GetMethods() []string {
-	if x != nil {
-		return x.Methods
-	}
-	return nil
-}
-
-func (x *ExcludePermissionRule) GetHeader() *DestinationRuleHeader {
-	if x != nil {
-		return x.Header
-	}
-	return nil
-}
-
-func (x *ExcludePermissionRule) GetPortNames() []string {
-	if x != nil {
-		return x.PortNames
-	}
-	return nil
-}
-
-type DestinationRuleHeader struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name    string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Present bool   `protobuf:"varint,2,opt,name=present,proto3" json:"present,omitempty"`
-	Exact   string `protobuf:"bytes,3,opt,name=exact,proto3" json:"exact,omitempty"`
-	Prefix  string `protobuf:"bytes,4,opt,name=prefix,proto3" json:"prefix,omitempty"`
-	Suffix  string `protobuf:"bytes,5,opt,name=suffix,proto3" json:"suffix,omitempty"`
-	Regex   string `protobuf:"bytes,6,opt,name=regex,proto3" json:"regex,omitempty"`
-	Invert  bool   `protobuf:"varint,7,opt,name=invert,proto3" json:"invert,omitempty"`
-}
-
-func (x *DestinationRuleHeader) Reset() {
-	*x = DestinationRuleHeader{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DestinationRuleHeader) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DestinationRuleHeader) ProtoMessage() {}
-
-func (x *DestinationRuleHeader) ProtoReflect() protoreflect.Message {
-	mi := &file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DestinationRuleHeader.ProtoReflect.Descriptor instead.
-func (*DestinationRuleHeader) Descriptor() ([]byte, []int) {
-	return file_pbauth_v2beta1_traffic_permissions_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *DestinationRuleHeader) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *DestinationRuleHeader) GetPresent() bool {
-	if x != nil {
-		return x.Present
-	}
-	return false
-}
-
-func (x *DestinationRuleHeader) GetExact() string {
-	if x != nil {
-		return x.Exact
-	}
-	return ""
-}
-
-func (x *DestinationRuleHeader) GetPrefix() string {
-	if x != nil {
-		return x.Prefix
-	}
-	return ""
-}
-
-func (x *DestinationRuleHeader) GetSuffix() string {
-	if x != nil {
-		return x.Suffix
-	}
-	return ""
-}
-
-func (x *DestinationRuleHeader) GetRegex() string {
-	if x != nil {
-		return x.Regex
-	}
-	return ""
-}
-
-func (x *DestinationRuleHeader) GetInvert() bool {
-	if x != nil {
-		return x.Invert
-	}
-	return false
-}
-
-var File_pbauth_v2beta1_traffic_permissions_proto protoreflect.FileDescriptor
-
-var file_pbauth_v2beta1_traffic_permissions_proto_rawDesc = []byte{
-	0x0a, 0x28, 0x70, 0x62, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x5f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf6, 0x01, 0x0a, 0x12, 0x54, 0x72, 0x61, 0x66,
-	0x66, 0x69, 0x63, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x4c,
-	0x0a, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3d, 0x0a, 0x06,
-	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x41, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4b, 0x0a, 0x0b, 0x70,
-	0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x29, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x70, 0x65, 0x72,
-	0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03,
-	0x22, 0xb1, 0x01, 0x0a, 0x1b, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x54, 0x72,
-	0x61, 0x66, 0x66, 0x69, 0x63, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x12, 0x3d, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x25, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x4b, 0x0a, 0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52,
-	0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x3a, 0x06, 0xa2, 0x93,
-	0x04, 0x02, 0x08, 0x03, 0x22, 0xb1, 0x01, 0x0a, 0x1b, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3d, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x4b, 0x0a, 0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
-	0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x02, 0x22, 0x32, 0x0a, 0x0b, 0x44, 0x65, 0x73, 0x74,
-	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x64, 0x65, 0x6e, 0x74,
-	0x69, 0x74, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
-	0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xaa, 0x01, 0x0a,
-	0x0a, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x3f, 0x0a, 0x07, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x53, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x52, 0x07, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x5b, 0x0a, 0x11,
-	0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x75, 0x6c, 0x65,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x10, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x22, 0xec, 0x01, 0x0a, 0x06, 0x53, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
-	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x64, 0x65,
-	0x6e, 0x74, 0x69, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d,
-	0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61,
-	0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x65, 0x65, 0x72, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x65, 0x65, 0x72, 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x61, 0x6d,
-	0x65, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0d, 0x73, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70,
-	0x12, 0x46, 0x0a, 0x07, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x18, 0x06, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x2c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52,
-	0x07, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x22, 0xab, 0x01, 0x0a, 0x0d, 0x45, 0x78, 0x63,
-	0x6c, 0x75, 0x64, 0x65, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x64,
-	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0c, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12,
-	0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a,
-	0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x70,
-	0x65, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x65, 0x65, 0x72, 0x12,
-	0x25, 0x0a, 0x0e, 0x73, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x72, 0x6f, 0x75,
-	0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73,
-	0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x22, 0xc7, 0x02, 0x0a, 0x0f, 0x44, 0x65, 0x73, 0x74, 0x69,
-	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61,
-	0x74, 0x68, 0x5f, 0x65, 0x78, 0x61, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x70, 0x61, 0x74, 0x68, 0x45, 0x78, 0x61, 0x63, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x61, 0x74,
-	0x68, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
-	0x70, 0x61, 0x74, 0x68, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61,
-	0x74, 0x68, 0x5f, 0x72, 0x65, 0x67, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x70, 0x61, 0x74, 0x68, 0x52, 0x65, 0x67, 0x65, 0x78, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x74,
-	0x68, 0x6f, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x74, 0x68,
-	0x6f, 0x64, 0x73, 0x12, 0x4c, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x75, 0x6c, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18,
-	0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x70, 0x6f, 0x72, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73,
-	0x12, 0x4e, 0x0a, 0x07, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
-	0x69, 0x6f, 0x6e, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x07, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65,
-	0x22, 0xfd, 0x01, 0x0a, 0x15, 0x45, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x50, 0x65, 0x72, 0x6d,
-	0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61,
-	0x74, 0x68, 0x5f, 0x65, 0x78, 0x61, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x70, 0x61, 0x74, 0x68, 0x45, 0x78, 0x61, 0x63, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x61, 0x74,
-	0x68, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
-	0x70, 0x61, 0x74, 0x68, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61,
-	0x74, 0x68, 0x5f, 0x72, 0x65, 0x67, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x70, 0x61, 0x74, 0x68, 0x52, 0x65, 0x67, 0x65, 0x78, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x74,
-	0x68, 0x6f, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x74, 0x68,
-	0x6f, 0x64, 0x73, 0x12, 0x4c, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x75, 0x6c, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18,
-	0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x70, 0x6f, 0x72, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73,
-	0x22, 0xb9, 0x01, 0x0a, 0x15, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x75, 0x6c, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18,
-	0x0a, 0x07, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x07, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x78, 0x61, 0x63,
-	0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x78, 0x61, 0x63, 0x74, 0x12, 0x16,
-	0x0a, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, 0x12, 0x14,
-	0x0a, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x72,
-	0x65, 0x67, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x2a, 0x43, 0x0a, 0x06,
-	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x12, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e,
-	0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0f,
-	0x0a, 0x0b, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x44, 0x45, 0x4e, 0x59, 0x10, 0x01, 0x12,
-	0x10, 0x0a, 0x0c, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x10,
-	0x02, 0x42, 0x98, 0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x17, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63,
-	0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x61,
-	0x75, 0x74, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x61, 0x75, 0x74, 0x68,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x41, 0xaa, 0x02, 0x1d,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x41, 0x75, 0x74, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x1d,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x5c, 0x41, 0x75, 0x74, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x29,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x5c, 0x41, 0x75, 0x74, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50,
-	0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x41,
-	0x75, 0x74, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbauth_v2beta1_traffic_permissions_proto_rawDescOnce sync.Once
-	file_pbauth_v2beta1_traffic_permissions_proto_rawDescData = file_pbauth_v2beta1_traffic_permissions_proto_rawDesc
-)
-
-func file_pbauth_v2beta1_traffic_permissions_proto_rawDescGZIP() []byte {
-	file_pbauth_v2beta1_traffic_permissions_proto_rawDescOnce.Do(func() {
-		file_pbauth_v2beta1_traffic_permissions_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbauth_v2beta1_traffic_permissions_proto_rawDescData)
-	})
-	return file_pbauth_v2beta1_traffic_permissions_proto_rawDescData
-}
-
-var file_pbauth_v2beta1_traffic_permissions_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbauth_v2beta1_traffic_permissions_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
-var file_pbauth_v2beta1_traffic_permissions_proto_goTypes = []interface{}{
-	(Action)(0),                         // 0: hashicorp.consul.auth.v2beta1.Action
-	(*TrafficPermissions)(nil),          // 1: hashicorp.consul.auth.v2beta1.TrafficPermissions
-	(*NamespaceTrafficPermissions)(nil), // 2: hashicorp.consul.auth.v2beta1.NamespaceTrafficPermissions
-	(*PartitionTrafficPermissions)(nil), // 3: hashicorp.consul.auth.v2beta1.PartitionTrafficPermissions
-	(*Destination)(nil),                 // 4: hashicorp.consul.auth.v2beta1.Destination
-	(*Permission)(nil),                  // 5: hashicorp.consul.auth.v2beta1.Permission
-	(*Source)(nil),                      // 6: hashicorp.consul.auth.v2beta1.Source
-	(*ExcludeSource)(nil),               // 7: hashicorp.consul.auth.v2beta1.ExcludeSource
-	(*DestinationRule)(nil),             // 8: hashicorp.consul.auth.v2beta1.DestinationRule
-	(*ExcludePermissionRule)(nil),       // 9: hashicorp.consul.auth.v2beta1.ExcludePermissionRule
-	(*DestinationRuleHeader)(nil),       // 10: hashicorp.consul.auth.v2beta1.DestinationRuleHeader
-}
-var file_pbauth_v2beta1_traffic_permissions_proto_depIdxs = []int32{
-	4,  // 0: hashicorp.consul.auth.v2beta1.TrafficPermissions.destination:type_name -> hashicorp.consul.auth.v2beta1.Destination
-	0,  // 1: hashicorp.consul.auth.v2beta1.TrafficPermissions.action:type_name -> hashicorp.consul.auth.v2beta1.Action
-	5,  // 2: hashicorp.consul.auth.v2beta1.TrafficPermissions.permissions:type_name -> hashicorp.consul.auth.v2beta1.Permission
-	0,  // 3: hashicorp.consul.auth.v2beta1.NamespaceTrafficPermissions.action:type_name -> hashicorp.consul.auth.v2beta1.Action
-	5,  // 4: hashicorp.consul.auth.v2beta1.NamespaceTrafficPermissions.permissions:type_name -> hashicorp.consul.auth.v2beta1.Permission
-	0,  // 5: hashicorp.consul.auth.v2beta1.PartitionTrafficPermissions.action:type_name -> hashicorp.consul.auth.v2beta1.Action
-	5,  // 6: hashicorp.consul.auth.v2beta1.PartitionTrafficPermissions.permissions:type_name -> hashicorp.consul.auth.v2beta1.Permission
-	6,  // 7: hashicorp.consul.auth.v2beta1.Permission.sources:type_name -> hashicorp.consul.auth.v2beta1.Source
-	8,  // 8: hashicorp.consul.auth.v2beta1.Permission.destination_rules:type_name -> hashicorp.consul.auth.v2beta1.DestinationRule
-	7,  // 9: hashicorp.consul.auth.v2beta1.Source.exclude:type_name -> hashicorp.consul.auth.v2beta1.ExcludeSource
-	10, // 10: hashicorp.consul.auth.v2beta1.DestinationRule.header:type_name -> hashicorp.consul.auth.v2beta1.DestinationRuleHeader
-	9,  // 11: hashicorp.consul.auth.v2beta1.DestinationRule.exclude:type_name -> hashicorp.consul.auth.v2beta1.ExcludePermissionRule
-	10, // 12: hashicorp.consul.auth.v2beta1.ExcludePermissionRule.header:type_name -> hashicorp.consul.auth.v2beta1.DestinationRuleHeader
-	13, // [13:13] is the sub-list for method output_type
-	13, // [13:13] is the sub-list for method input_type
-	13, // [13:13] is the sub-list for extension type_name
-	13, // [13:13] is the sub-list for extension extendee
-	0,  // [0:13] is the sub-list for field type_name
-}
-
-func init() { file_pbauth_v2beta1_traffic_permissions_proto_init() }
-func file_pbauth_v2beta1_traffic_permissions_proto_init() {
-	if File_pbauth_v2beta1_traffic_permissions_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TrafficPermissions); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NamespaceTrafficPermissions); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PartitionTrafficPermissions); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Destination); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Permission); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Source); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExcludeSource); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DestinationRule); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExcludePermissionRule); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbauth_v2beta1_traffic_permissions_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DestinationRuleHeader); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbauth_v2beta1_traffic_permissions_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   10,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbauth_v2beta1_traffic_permissions_proto_goTypes,
-		DependencyIndexes: file_pbauth_v2beta1_traffic_permissions_proto_depIdxs,
-		EnumInfos:         file_pbauth_v2beta1_traffic_permissions_proto_enumTypes,
-		MessageInfos:      file_pbauth_v2beta1_traffic_permissions_proto_msgTypes,
-	}.Build()
-	File_pbauth_v2beta1_traffic_permissions_proto = out.File
-	file_pbauth_v2beta1_traffic_permissions_proto_rawDesc = nil
-	file_pbauth_v2beta1_traffic_permissions_proto_goTypes = nil
-	file_pbauth_v2beta1_traffic_permissions_proto_depIdxs = nil
-}
diff --git a/proto-public/pbauth/v2beta1/traffic_permissions.proto b/proto-public/pbauth/v2beta1/traffic_permissions.proto
deleted file mode 100644
index 9eab2250260c7..0000000000000
--- a/proto-public/pbauth/v2beta1/traffic_permissions.proto
+++ /dev/null
@@ -1,131 +0,0 @@
-syntax = "proto3";
-
-package hashicorp.consul.auth.v2beta1;
-
-import "pbresource/annotations.proto";
-
-message TrafficPermissions {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  // destination is a configuration of the destination proxies
-  // where these traffic permissions should apply.
-  Destination destination = 1;
-
-  // Action can be either allow or deny for the entire object. It will default to allow.
-  //
-  // If action is allow,
-  // we will allow the connection if one of the rules in Rules matches, in other words, we will deny
-  // all requests except for the ones that match Rules. If Consul is in default allow mode, then allow
-  // actions have no effect without a deny permission as everything is allowed by default.
-  //
-  // If action is deny,
-  // we will deny the connection if one of the rules in Rules match, in other words,
-  // we will allow all requests except for the ones that match Rules. If Consul is default deny mode,
-  // then deny permissions have no effect without an allow permission as everything is denied by default.
-  //
-  // Action unspecified is reserved for compatibility with the addition of future actions.
-  Action action = 2;
-
-  // permissions is a list of permissions to match on.
-  // They are applied using OR semantics.
-  repeated Permission permissions = 3;
-}
-
-message NamespaceTrafficPermissions {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  Action action = 1;
-  repeated Permission permissions = 2;
-}
-
-message PartitionTrafficPermissions {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_PARTITION};
-
-  Action action = 1;
-  repeated Permission permissions = 2;
-}
-
-// Destination contains the name or name-prefix of the WorkloadIdentity.
-// The WorkloadIdentity resource must
-// be in the same tenancy as the TrafficPermissions resource.
-message Destination {
-  string identity_name = 1;
-}
-
-enum Action {
-  ACTION_UNSPECIFIED = 0;
-  ACTION_DENY = 1;
-  ACTION_ALLOW = 2;
-}
-
-// permissions is a list of permissions to match on.
-message Permission {
-  // sources is a list of sources in this traffic permission.
-  repeated Source sources = 1;
-  // destination_rules is a list of rules to apply for matching sources in this Permission.
-  // These rules are specific to the request or connection that is going to the destination(s)
-  // selected by the TrafficPermissions resource.
-  repeated DestinationRule destination_rules = 2;
-}
-
-// Source represents the source identity.
-// To specify any of the wildcard sources, the specific fields need to be omitted.
-// For example, for a wildcard namespace, identity_name should be omitted.
-message Source {
-  string identity_name = 1;
-  string namespace = 2;
-  string partition = 3;
-  string peer = 4;
-  string sameness_group = 5;
-
-  // exclude is a list of sources to exclude from this source.
-  repeated ExcludeSource exclude = 6;
-}
-
-// ExcludeSource is almost the same as source but it prevents the addition of
-// matchiing sources.
-message ExcludeSource {
-  string identity_name = 1;
-  string namespace = 2;
-  string partition = 3;
-  string peer = 4;
-  string sameness_group = 5;
-}
-
-// DestinationRule contains rules rules to apply to the incoming connection.
-message DestinationRule {
-  string path_exact = 1;
-  string path_prefix = 2;
-  string path_regex = 3;
-  // methods is the list of HTTP methods. If no methods are specified,
-  // this rule will apply to all methods.
-  repeated string methods = 4;
-  DestinationRuleHeader header = 5;
-  repeated string port_names = 6;
-  // exclude contains a list of rules to exclude when evaluating rules for the incoming connection.
-  repeated ExcludePermissionRule exclude = 7;
-}
-
-message ExcludePermissionRule {
-  string path_exact = 1;
-  string path_prefix = 2;
-  string path_regex = 3;
-  // methods is the list of HTTP methods.
-  repeated string methods = 4;
-
-  DestinationRuleHeader header = 5;
-
-  // port_names is a list of workload ports to apply this rule to. The ports specified here
-  // must be the ports used in the connection.
-  repeated string port_names = 6;
-}
-
-message DestinationRuleHeader {
-  string name = 1;
-  bool present = 2;
-  string exact = 3;
-  string prefix = 4;
-  string suffix = 5;
-  string regex = 6;
-  bool invert = 7;
-}
diff --git a/proto-public/pbauth/v2beta1/traffic_permissions_addon.go b/proto-public/pbauth/v2beta1/traffic_permissions_addon.go
deleted file mode 100644
index 9f778504f7574..0000000000000
--- a/proto-public/pbauth/v2beta1/traffic_permissions_addon.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package authv2beta1
-
-import "github.com/hashicorp/consul/proto-public/pbresource"
-
-type SourceToSpiffe interface {
-	GetIdentityName() string
-	GetPartition() string
-	GetNamespace() string
-	GetPeer() string
-	GetSamenessGroup() string
-}
-
-var _ SourceToSpiffe = (*Source)(nil)
-var _ SourceToSpiffe = (*ExcludeSource)(nil)
-
-func SourceToTenancy(s SourceToSpiffe) *pbresource.Tenancy {
-	return &pbresource.Tenancy{
-		Partition: s.GetPartition(),
-		Namespace: s.GetNamespace(),
-		PeerName:  s.GetPeer(),
-	}
-}
diff --git a/proto-public/pbauth/v2beta1/workload_identity.pb.binary.go b/proto-public/pbauth/v2beta1/workload_identity.pb.binary.go
deleted file mode 100644
index 5161f35d9562e..0000000000000
--- a/proto-public/pbauth/v2beta1/workload_identity.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbauth/v2beta1/workload_identity.proto
-
-package authv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *WorkloadIdentity) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *WorkloadIdentity) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbauth/v2beta1/workload_identity.pb.go b/proto-public/pbauth/v2beta1/workload_identity.pb.go
deleted file mode 100644
index c24f45c776eac..0000000000000
--- a/proto-public/pbauth/v2beta1/workload_identity.pb.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbauth/v2beta1/workload_identity.proto
-
-package authv2beta1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type WorkloadIdentity struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *WorkloadIdentity) Reset() {
-	*x = WorkloadIdentity{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbauth_v2beta1_workload_identity_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WorkloadIdentity) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WorkloadIdentity) ProtoMessage() {}
-
-func (x *WorkloadIdentity) ProtoReflect() protoreflect.Message {
-	mi := &file_pbauth_v2beta1_workload_identity_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WorkloadIdentity.ProtoReflect.Descriptor instead.
-func (*WorkloadIdentity) Descriptor() ([]byte, []int) {
-	return file_pbauth_v2beta1_workload_identity_proto_rawDescGZIP(), []int{0}
-}
-
-var File_pbauth_v2beta1_workload_identity_proto protoreflect.FileDescriptor
-
-var file_pbauth_v2beta1_workload_identity_proto_rawDesc = []byte{
-	0x0a, 0x26, 0x70, 0x62, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x1a, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61,
-	0x64, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08,
-	0x03, 0x42, 0x96, 0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x15, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61,
-	0x64, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x61, 0x75, 0x74,
-	0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x61, 0x75, 0x74, 0x68, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x41, 0xaa, 0x02, 0x1d, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x41,
-	0x75, 0x74, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x1d, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x41,
-	0x75, 0x74, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x29, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x41,
-	0x75, 0x74, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x41, 0x75, 0x74,
-	0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
-}
-
-var (
-	file_pbauth_v2beta1_workload_identity_proto_rawDescOnce sync.Once
-	file_pbauth_v2beta1_workload_identity_proto_rawDescData = file_pbauth_v2beta1_workload_identity_proto_rawDesc
-)
-
-func file_pbauth_v2beta1_workload_identity_proto_rawDescGZIP() []byte {
-	file_pbauth_v2beta1_workload_identity_proto_rawDescOnce.Do(func() {
-		file_pbauth_v2beta1_workload_identity_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbauth_v2beta1_workload_identity_proto_rawDescData)
-	})
-	return file_pbauth_v2beta1_workload_identity_proto_rawDescData
-}
-
-var file_pbauth_v2beta1_workload_identity_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbauth_v2beta1_workload_identity_proto_goTypes = []interface{}{
-	(*WorkloadIdentity)(nil), // 0: hashicorp.consul.auth.v2beta1.WorkloadIdentity
-}
-var file_pbauth_v2beta1_workload_identity_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_pbauth_v2beta1_workload_identity_proto_init() }
-func file_pbauth_v2beta1_workload_identity_proto_init() {
-	if File_pbauth_v2beta1_workload_identity_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbauth_v2beta1_workload_identity_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WorkloadIdentity); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbauth_v2beta1_workload_identity_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbauth_v2beta1_workload_identity_proto_goTypes,
-		DependencyIndexes: file_pbauth_v2beta1_workload_identity_proto_depIdxs,
-		MessageInfos:      file_pbauth_v2beta1_workload_identity_proto_msgTypes,
-	}.Build()
-	File_pbauth_v2beta1_workload_identity_proto = out.File
-	file_pbauth_v2beta1_workload_identity_proto_rawDesc = nil
-	file_pbauth_v2beta1_workload_identity_proto_goTypes = nil
-	file_pbauth_v2beta1_workload_identity_proto_depIdxs = nil
-}
diff --git a/proto-public/pbauth/v2beta1/workload_identity.proto b/proto-public/pbauth/v2beta1/workload_identity.proto
deleted file mode 100644
index 32347810182fc..0000000000000
--- a/proto-public/pbauth/v2beta1/workload_identity.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package hashicorp.consul.auth.v2beta1;
-
-import "pbresource/annotations.proto";
-
-message WorkloadIdentity {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-}
diff --git a/proto-public/pbcatalog/v2beta1/dns.pb.binary.go b/proto-public/pbcatalog/v2beta1/dns.pb.binary.go
deleted file mode 100644
index 41ad32c0ef6d0..0000000000000
--- a/proto-public/pbcatalog/v2beta1/dns.pb.binary.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbcatalog/v2beta1/dns.proto
-
-package catalogv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DNSPolicy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DNSPolicy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Weights) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Weights) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbcatalog/v2beta1/dns.pb.go b/proto-public/pbcatalog/v2beta1/dns.pb.go
deleted file mode 100644
index 446e788d3e955..0000000000000
--- a/proto-public/pbcatalog/v2beta1/dns.pb.go
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbcatalog/v2beta1/dns.proto
-
-package catalogv2beta1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type DNSPolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Workloads *WorkloadSelector `protobuf:"bytes,1,opt,name=workloads,proto3" json:"workloads,omitempty"`
-	Weights   *Weights          `protobuf:"bytes,2,opt,name=weights,proto3" json:"weights,omitempty"`
-}
-
-func (x *DNSPolicy) Reset() {
-	*x = DNSPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_dns_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DNSPolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DNSPolicy) ProtoMessage() {}
-
-func (x *DNSPolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_dns_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DNSPolicy.ProtoReflect.Descriptor instead.
-func (*DNSPolicy) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_dns_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *DNSPolicy) GetWorkloads() *WorkloadSelector {
-	if x != nil {
-		return x.Workloads
-	}
-	return nil
-}
-
-func (x *DNSPolicy) GetWeights() *Weights {
-	if x != nil {
-		return x.Weights
-	}
-	return nil
-}
-
-type Weights struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Passing uint32 `protobuf:"varint,1,opt,name=passing,proto3" json:"passing,omitempty"`
-	Warning uint32 `protobuf:"varint,2,opt,name=warning,proto3" json:"warning,omitempty"`
-}
-
-func (x *Weights) Reset() {
-	*x = Weights{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_dns_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Weights) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Weights) ProtoMessage() {}
-
-func (x *Weights) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_dns_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Weights.ProtoReflect.Descriptor instead.
-func (*Weights) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_dns_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Weights) GetPassing() uint32 {
-	if x != nil {
-		return x.Passing
-	}
-	return 0
-}
-
-func (x *Weights) GetWarning() uint32 {
-	if x != nil {
-		return x.Warning
-	}
-	return 0
-}
-
-var File_pbcatalog_v2beta1_dns_proto protoreflect.FileDescriptor
-
-var file_pbcatalog_v2beta1_dns_proto_rawDesc = []byte{
-	0x0a, 0x1b, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x64, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a,
-	0x20, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e,
-	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0xaa, 0x01, 0x0a, 0x09, 0x44, 0x4e, 0x53, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x50, 0x0a,
-	0x09, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x65, 0x6c, 0x65,
-	0x63, 0x74, 0x6f, 0x72, 0x52, 0x09, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x12,
-	0x43, 0x0a, 0x07, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x29, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x52, 0x07, 0x77, 0x65, 0x69,
-	0x67, 0x68, 0x74, 0x73, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0x3d, 0x0a, 0x07,
-	0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x73, 0x73, 0x69,
-	0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x70, 0x61, 0x73, 0x73, 0x69, 0x6e,
-	0x67, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0d, 0x52, 0x07, 0x77, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x42, 0x9e, 0x02, 0x0a, 0x24,
-	0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x42, 0x08, 0x44, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x63, 0x61, 0x74,
-	0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x63, 0x61, 0x74,
-	0x61, 0x6c, 0x6f, 0x67, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43,
-	0x43, 0xaa, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c,
-	0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
-	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x43, 0x61, 0x74, 0x61,
-	0x6c, 0x6f, 0x67, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbcatalog_v2beta1_dns_proto_rawDescOnce sync.Once
-	file_pbcatalog_v2beta1_dns_proto_rawDescData = file_pbcatalog_v2beta1_dns_proto_rawDesc
-)
-
-func file_pbcatalog_v2beta1_dns_proto_rawDescGZIP() []byte {
-	file_pbcatalog_v2beta1_dns_proto_rawDescOnce.Do(func() {
-		file_pbcatalog_v2beta1_dns_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbcatalog_v2beta1_dns_proto_rawDescData)
-	})
-	return file_pbcatalog_v2beta1_dns_proto_rawDescData
-}
-
-var file_pbcatalog_v2beta1_dns_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_pbcatalog_v2beta1_dns_proto_goTypes = []interface{}{
-	(*DNSPolicy)(nil),        // 0: hashicorp.consul.catalog.v2beta1.DNSPolicy
-	(*Weights)(nil),          // 1: hashicorp.consul.catalog.v2beta1.Weights
-	(*WorkloadSelector)(nil), // 2: hashicorp.consul.catalog.v2beta1.WorkloadSelector
-}
-var file_pbcatalog_v2beta1_dns_proto_depIdxs = []int32{
-	2, // 0: hashicorp.consul.catalog.v2beta1.DNSPolicy.workloads:type_name -> hashicorp.consul.catalog.v2beta1.WorkloadSelector
-	1, // 1: hashicorp.consul.catalog.v2beta1.DNSPolicy.weights:type_name -> hashicorp.consul.catalog.v2beta1.Weights
-	2, // [2:2] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
-}
-
-func init() { file_pbcatalog_v2beta1_dns_proto_init() }
-func file_pbcatalog_v2beta1_dns_proto_init() {
-	if File_pbcatalog_v2beta1_dns_proto != nil {
-		return
-	}
-	file_pbcatalog_v2beta1_selector_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbcatalog_v2beta1_dns_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DNSPolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_dns_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Weights); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbcatalog_v2beta1_dns_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbcatalog_v2beta1_dns_proto_goTypes,
-		DependencyIndexes: file_pbcatalog_v2beta1_dns_proto_depIdxs,
-		MessageInfos:      file_pbcatalog_v2beta1_dns_proto_msgTypes,
-	}.Build()
-	File_pbcatalog_v2beta1_dns_proto = out.File
-	file_pbcatalog_v2beta1_dns_proto_rawDesc = nil
-	file_pbcatalog_v2beta1_dns_proto_goTypes = nil
-	file_pbcatalog_v2beta1_dns_proto_depIdxs = nil
-}
diff --git a/proto-public/pbcatalog/v2beta1/dns.proto b/proto-public/pbcatalog/v2beta1/dns.proto
deleted file mode 100644
index b62cc8e10e90d..0000000000000
--- a/proto-public/pbcatalog/v2beta1/dns.proto
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.catalog.v2beta1;
-
-import "pbcatalog/v2beta1/selector.proto";
-import "pbresource/annotations.proto";
-
-message DNSPolicy {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  WorkloadSelector workloads = 1;
-  Weights weights = 2;
-}
-
-message Weights {
-  uint32 passing = 1;
-  uint32 warning = 2;
-}
diff --git a/proto-public/pbcatalog/v2beta1/failover_policy.pb.binary.go b/proto-public/pbcatalog/v2beta1/failover_policy.pb.binary.go
deleted file mode 100644
index d6733fa876982..0000000000000
--- a/proto-public/pbcatalog/v2beta1/failover_policy.pb.binary.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbcatalog/v2beta1/failover_policy.proto
-
-package catalogv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *FailoverPolicy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *FailoverPolicy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *FailoverConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *FailoverConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *FailoverDestination) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *FailoverDestination) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbcatalog/v2beta1/failover_policy.pb.go b/proto-public/pbcatalog/v2beta1/failover_policy.pb.go
deleted file mode 100644
index 58e70174a1e86..0000000000000
--- a/proto-public/pbcatalog/v2beta1/failover_policy.pb.go
+++ /dev/null
@@ -1,458 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbcatalog/v2beta1/failover_policy.proto
-
-package catalogv2beta1
-
-import (
-	pbresource "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type FailoverMode int32
-
-const (
-	FailoverMode_FAILOVER_MODE_UNSPECIFIED       FailoverMode = 0
-	FailoverMode_FAILOVER_MODE_SEQUENTIAL        FailoverMode = 1
-	FailoverMode_FAILOVER_MODE_ORDER_BY_LOCALITY FailoverMode = 2
-)
-
-// Enum value maps for FailoverMode.
-var (
-	FailoverMode_name = map[int32]string{
-		0: "FAILOVER_MODE_UNSPECIFIED",
-		1: "FAILOVER_MODE_SEQUENTIAL",
-		2: "FAILOVER_MODE_ORDER_BY_LOCALITY",
-	}
-	FailoverMode_value = map[string]int32{
-		"FAILOVER_MODE_UNSPECIFIED":       0,
-		"FAILOVER_MODE_SEQUENTIAL":        1,
-		"FAILOVER_MODE_ORDER_BY_LOCALITY": 2,
-	}
-)
-
-func (x FailoverMode) Enum() *FailoverMode {
-	p := new(FailoverMode)
-	*p = x
-	return p
-}
-
-func (x FailoverMode) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (FailoverMode) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbcatalog_v2beta1_failover_policy_proto_enumTypes[0].Descriptor()
-}
-
-func (FailoverMode) Type() protoreflect.EnumType {
-	return &file_pbcatalog_v2beta1_failover_policy_proto_enumTypes[0]
-}
-
-func (x FailoverMode) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use FailoverMode.Descriptor instead.
-func (FailoverMode) EnumDescriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_failover_policy_proto_rawDescGZIP(), []int{0}
-}
-
-// This is a Resource type.
-type FailoverPolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Config defines failover for any named port not present in PortConfigs.
-	Config *FailoverConfig `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
-	// PortConfigs defines failover for a specific port on this service and takes
-	// precedence over Config.
-	PortConfigs map[string]*FailoverConfig `protobuf:"bytes,2,rep,name=port_configs,json=portConfigs,proto3" json:"port_configs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (x *FailoverPolicy) Reset() {
-	*x = FailoverPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_failover_policy_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FailoverPolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FailoverPolicy) ProtoMessage() {}
-
-func (x *FailoverPolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_failover_policy_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use FailoverPolicy.ProtoReflect.Descriptor instead.
-func (*FailoverPolicy) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_failover_policy_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *FailoverPolicy) GetConfig() *FailoverConfig {
-	if x != nil {
-		return x.Config
-	}
-	return nil
-}
-
-func (x *FailoverPolicy) GetPortConfigs() map[string]*FailoverConfig {
-	if x != nil {
-		return x.PortConfigs
-	}
-	return nil
-}
-
-type FailoverConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Destinations specifies a fixed list of failover destinations to try. We
-	// never try a destination multiple times, so those are subtracted from this
-	// list before proceeding.
-	Destinations []*FailoverDestination `protobuf:"bytes,1,rep,name=destinations,proto3" json:"destinations,omitempty"`
-	// Mode specifies the type of failover that will be performed. Valid values are
-	// "sequential", "" (equivalent to "sequential") and "order-by-locality".
-	Mode    FailoverMode `protobuf:"varint,2,opt,name=mode,proto3,enum=hashicorp.consul.catalog.v2beta1.FailoverMode" json:"mode,omitempty"`
-	Regions []string     `protobuf:"bytes,3,rep,name=regions,proto3" json:"regions,omitempty"`
-	// SamenessGroup specifies the sameness group to failover to.
-	SamenessGroup string `protobuf:"bytes,4,opt,name=sameness_group,json=samenessGroup,proto3" json:"sameness_group,omitempty"`
-}
-
-func (x *FailoverConfig) Reset() {
-	*x = FailoverConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_failover_policy_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FailoverConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FailoverConfig) ProtoMessage() {}
-
-func (x *FailoverConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_failover_policy_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use FailoverConfig.ProtoReflect.Descriptor instead.
-func (*FailoverConfig) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_failover_policy_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *FailoverConfig) GetDestinations() []*FailoverDestination {
-	if x != nil {
-		return x.Destinations
-	}
-	return nil
-}
-
-func (x *FailoverConfig) GetMode() FailoverMode {
-	if x != nil {
-		return x.Mode
-	}
-	return FailoverMode_FAILOVER_MODE_UNSPECIFIED
-}
-
-func (x *FailoverConfig) GetRegions() []string {
-	if x != nil {
-		return x.Regions
-	}
-	return nil
-}
-
-func (x *FailoverConfig) GetSamenessGroup() string {
-	if x != nil {
-		return x.SamenessGroup
-	}
-	return ""
-}
-
-type FailoverDestination struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// This must be a Service.
-	Ref *pbresource.Reference `protobuf:"bytes,1,opt,name=ref,proto3" json:"ref,omitempty"`
-	// TODO: what should an empty port mean?
-	Port       string `protobuf:"bytes,2,opt,name=port,proto3" json:"port,omitempty"`
-	Datacenter string `protobuf:"bytes,3,opt,name=datacenter,proto3" json:"datacenter,omitempty"`
-}
-
-func (x *FailoverDestination) Reset() {
-	*x = FailoverDestination{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_failover_policy_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FailoverDestination) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FailoverDestination) ProtoMessage() {}
-
-func (x *FailoverDestination) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_failover_policy_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use FailoverDestination.ProtoReflect.Descriptor instead.
-func (*FailoverDestination) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_failover_policy_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *FailoverDestination) GetRef() *pbresource.Reference {
-	if x != nil {
-		return x.Ref
-	}
-	return nil
-}
-
-func (x *FailoverDestination) GetPort() string {
-	if x != nil {
-		return x.Port
-	}
-	return ""
-}
-
-func (x *FailoverDestination) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-var File_pbcatalog_v2beta1_failover_policy_proto protoreflect.FileDescriptor
-
-var file_pbcatalog_v2beta1_failover_policy_proto_rawDesc = []byte{
-	0x0a, 0x27, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x66, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x5f, 0x70, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61,
-	0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x1c, 0x70, 0x62, 0x72,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x70, 0x62, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xba, 0x02, 0x0a, 0x0e, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65,
-	0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x48, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x46, 0x61, 0x69, 0x6c, 0x6f,
-	0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x64, 0x0a, 0x0c, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x46, 0x61, 0x69, 0x6c, 0x6f,
-	0x76, 0x65, 0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x50, 0x6f, 0x72, 0x74, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x70, 0x6f, 0x72, 0x74,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x1a, 0x70, 0x0a, 0x10, 0x50, 0x6f, 0x72, 0x74, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x46, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08,
-	0x03, 0x22, 0xf0, 0x01, 0x0a, 0x0e, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x59, 0x0a, 0x0c, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61,
-	0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x46, 0x61,
-	0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x0c, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
-	0x42, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x6d,
-	0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a,
-	0x0e, 0x73, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47,
-	0x72, 0x6f, 0x75, 0x70, 0x22, 0x81, 0x01, 0x0a, 0x13, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65,
-	0x72, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x36, 0x0a, 0x03,
-	0x72, 0x65, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52,
-	0x03, 0x72, 0x65, 0x66, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61,
-	0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x61,
-	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2a, 0x70, 0x0a, 0x0c, 0x46, 0x61, 0x69, 0x6c,
-	0x6f, 0x76, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x1d, 0x0a, 0x19, 0x46, 0x41, 0x49, 0x4c,
-	0x4f, 0x56, 0x45, 0x52, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
-	0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x46, 0x41, 0x49, 0x4c, 0x4f,
-	0x56, 0x45, 0x52, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x53, 0x45, 0x51, 0x55, 0x45, 0x4e, 0x54,
-	0x49, 0x41, 0x4c, 0x10, 0x01, 0x12, 0x23, 0x0a, 0x1f, 0x46, 0x41, 0x49, 0x4c, 0x4f, 0x56, 0x45,
-	0x52, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x5f, 0x42, 0x59, 0x5f,
-	0x4c, 0x4f, 0x43, 0x41, 0x4c, 0x49, 0x54, 0x59, 0x10, 0x02, 0x42, 0xa9, 0x02, 0x0a, 0x24, 0x63,
-	0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x42, 0x13, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x50, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75,
-	0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x43, 0xaa, 0x02, 0x20, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x43,
-	0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02,
-	0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0xe2, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0xea, 0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x3a, 0x3a, 0x56,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbcatalog_v2beta1_failover_policy_proto_rawDescOnce sync.Once
-	file_pbcatalog_v2beta1_failover_policy_proto_rawDescData = file_pbcatalog_v2beta1_failover_policy_proto_rawDesc
-)
-
-func file_pbcatalog_v2beta1_failover_policy_proto_rawDescGZIP() []byte {
-	file_pbcatalog_v2beta1_failover_policy_proto_rawDescOnce.Do(func() {
-		file_pbcatalog_v2beta1_failover_policy_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbcatalog_v2beta1_failover_policy_proto_rawDescData)
-	})
-	return file_pbcatalog_v2beta1_failover_policy_proto_rawDescData
-}
-
-var file_pbcatalog_v2beta1_failover_policy_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbcatalog_v2beta1_failover_policy_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_pbcatalog_v2beta1_failover_policy_proto_goTypes = []interface{}{
-	(FailoverMode)(0),            // 0: hashicorp.consul.catalog.v2beta1.FailoverMode
-	(*FailoverPolicy)(nil),       // 1: hashicorp.consul.catalog.v2beta1.FailoverPolicy
-	(*FailoverConfig)(nil),       // 2: hashicorp.consul.catalog.v2beta1.FailoverConfig
-	(*FailoverDestination)(nil),  // 3: hashicorp.consul.catalog.v2beta1.FailoverDestination
-	nil,                          // 4: hashicorp.consul.catalog.v2beta1.FailoverPolicy.PortConfigsEntry
-	(*pbresource.Reference)(nil), // 5: hashicorp.consul.resource.Reference
-}
-var file_pbcatalog_v2beta1_failover_policy_proto_depIdxs = []int32{
-	2, // 0: hashicorp.consul.catalog.v2beta1.FailoverPolicy.config:type_name -> hashicorp.consul.catalog.v2beta1.FailoverConfig
-	4, // 1: hashicorp.consul.catalog.v2beta1.FailoverPolicy.port_configs:type_name -> hashicorp.consul.catalog.v2beta1.FailoverPolicy.PortConfigsEntry
-	3, // 2: hashicorp.consul.catalog.v2beta1.FailoverConfig.destinations:type_name -> hashicorp.consul.catalog.v2beta1.FailoverDestination
-	0, // 3: hashicorp.consul.catalog.v2beta1.FailoverConfig.mode:type_name -> hashicorp.consul.catalog.v2beta1.FailoverMode
-	5, // 4: hashicorp.consul.catalog.v2beta1.FailoverDestination.ref:type_name -> hashicorp.consul.resource.Reference
-	2, // 5: hashicorp.consul.catalog.v2beta1.FailoverPolicy.PortConfigsEntry.value:type_name -> hashicorp.consul.catalog.v2beta1.FailoverConfig
-	6, // [6:6] is the sub-list for method output_type
-	6, // [6:6] is the sub-list for method input_type
-	6, // [6:6] is the sub-list for extension type_name
-	6, // [6:6] is the sub-list for extension extendee
-	0, // [0:6] is the sub-list for field type_name
-}
-
-func init() { file_pbcatalog_v2beta1_failover_policy_proto_init() }
-func file_pbcatalog_v2beta1_failover_policy_proto_init() {
-	if File_pbcatalog_v2beta1_failover_policy_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbcatalog_v2beta1_failover_policy_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FailoverPolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_failover_policy_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FailoverConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_failover_policy_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FailoverDestination); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbcatalog_v2beta1_failover_policy_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   4,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbcatalog_v2beta1_failover_policy_proto_goTypes,
-		DependencyIndexes: file_pbcatalog_v2beta1_failover_policy_proto_depIdxs,
-		EnumInfos:         file_pbcatalog_v2beta1_failover_policy_proto_enumTypes,
-		MessageInfos:      file_pbcatalog_v2beta1_failover_policy_proto_msgTypes,
-	}.Build()
-	File_pbcatalog_v2beta1_failover_policy_proto = out.File
-	file_pbcatalog_v2beta1_failover_policy_proto_rawDesc = nil
-	file_pbcatalog_v2beta1_failover_policy_proto_goTypes = nil
-	file_pbcatalog_v2beta1_failover_policy_proto_depIdxs = nil
-}
diff --git a/proto-public/pbcatalog/v2beta1/failover_policy.proto b/proto-public/pbcatalog/v2beta1/failover_policy.proto
deleted file mode 100644
index dec86807f7543..0000000000000
--- a/proto-public/pbcatalog/v2beta1/failover_policy.proto
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.catalog.v2beta1;
-
-import "pbresource/annotations.proto";
-import "pbresource/resource.proto";
-
-// This is a Resource type.
-message FailoverPolicy {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  // Config defines failover for any named port not present in PortConfigs.
-  FailoverConfig config = 1;
-
-  // PortConfigs defines failover for a specific port on this service and takes
-  // precedence over Config.
-  map<string, FailoverConfig> port_configs = 2;
-}
-
-message FailoverConfig {
-  // Destinations specifies a fixed list of failover destinations to try. We
-  // never try a destination multiple times, so those are subtracted from this
-  // list before proceeding.
-  repeated FailoverDestination destinations = 1;
-
-  // Mode specifies the type of failover that will be performed. Valid values are
-  // "sequential", "" (equivalent to "sequential") and "order-by-locality".
-  FailoverMode mode = 2;
-  repeated string regions = 3;
-
-  // SamenessGroup specifies the sameness group to failover to.
-  string sameness_group = 4;
-}
-
-message FailoverDestination {
-  // This must be a Service.
-  hashicorp.consul.resource.Reference ref = 1;
-  // TODO: what should an empty port mean?
-  string port = 2;
-  string datacenter = 3;
-}
-
-enum FailoverMode {
-  FAILOVER_MODE_UNSPECIFIED = 0;
-  FAILOVER_MODE_SEQUENTIAL = 1;
-  FAILOVER_MODE_ORDER_BY_LOCALITY = 2;
-}
diff --git a/proto-public/pbcatalog/v2beta1/failover_policy_extras.go b/proto-public/pbcatalog/v2beta1/failover_policy_extras.go
deleted file mode 100644
index 1187e93d7ae73..0000000000000
--- a/proto-public/pbcatalog/v2beta1/failover_policy_extras.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package catalogv2beta1
-
-import "github.com/hashicorp/consul/proto-public/pbresource"
-
-// GetUnderlyingDestinations will collect FailoverDestinations from all
-// internal fields and bundle them up in one slice.
-//
-// NOTE: no deduplication occurs.
-func (x *FailoverPolicy) GetUnderlyingDestinations() []*FailoverDestination {
-	if x == nil {
-		return nil
-	}
-
-	estimate := 0
-	if x.Config != nil {
-		estimate += len(x.Config.Destinations)
-	}
-	for _, pc := range x.PortConfigs {
-		estimate += len(pc.Destinations)
-	}
-
-	out := make([]*FailoverDestination, 0, estimate)
-	if x.Config != nil {
-		out = append(out, x.Config.Destinations...)
-	}
-	for _, pc := range x.PortConfigs {
-		out = append(out, pc.Destinations...)
-	}
-	return out
-}
-
-// GetUnderlyingDestinationRefs is like GetUnderlyingDestinations except it
-// returns a slice of References.
-//
-// NOTE: no deduplication occurs.
-func (x *FailoverPolicy) GetUnderlyingDestinationRefs() []*pbresource.Reference {
-	if x == nil {
-		return nil
-	}
-
-	dests := x.GetUnderlyingDestinations()
-
-	out := make([]*pbresource.Reference, 0, len(dests))
-	for _, dest := range dests {
-		if dest.Ref != nil {
-			out = append(out, dest.Ref)
-		}
-	}
-
-	return out
-}
-
-// IsEmpty returns true if a config has no definition.
-func (x *FailoverConfig) IsEmpty() bool {
-	if x == nil {
-		return true
-	}
-	return len(x.Destinations) == 0 &&
-		x.Mode == 0 &&
-		len(x.Regions) == 0 &&
-		x.SamenessGroup == ""
-}
diff --git a/proto-public/pbcatalog/v2beta1/failover_policy_extras_test.go b/proto-public/pbcatalog/v2beta1/failover_policy_extras_test.go
deleted file mode 100644
index 073573e857ffc..0000000000000
--- a/proto-public/pbcatalog/v2beta1/failover_policy_extras_test.go
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package catalogv2beta1
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func TestFailoverPolicy_IsEmpty(t *testing.T) {
-	t.Run("nil", func(t *testing.T) {
-		var fc *FailoverConfig
-		require.True(t, fc.IsEmpty())
-	})
-	t.Run("empty", func(t *testing.T) {
-		fc := &FailoverConfig{}
-		require.True(t, fc.IsEmpty())
-	})
-	t.Run("dest", func(t *testing.T) {
-		fc := &FailoverConfig{
-			Destinations: []*FailoverDestination{
-				newFailoverDestination("foo"),
-			},
-		}
-		require.False(t, fc.IsEmpty())
-	})
-	t.Run("regions", func(t *testing.T) {
-		fc := &FailoverConfig{
-			Regions: []string{"us-east"},
-		}
-		require.False(t, fc.IsEmpty())
-	})
-	t.Run("regions", func(t *testing.T) {
-		fc := &FailoverConfig{
-			SamenessGroup: "blah",
-		}
-		require.False(t, fc.IsEmpty())
-	})
-}
-
-func TestFailoverPolicy_GetUnderlyingDestinations_AndRefs(t *testing.T) {
-	type testcase struct {
-		failover    *FailoverPolicy
-		expectDests []*FailoverDestination
-		expectRefs  []*pbresource.Reference
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		assertSliceEquals(t, tc.expectDests, tc.failover.GetUnderlyingDestinations())
-		assertSliceEquals(t, tc.expectRefs, tc.failover.GetUnderlyingDestinationRefs())
-	}
-
-	cases := map[string]testcase{
-		"nil": {},
-		"kitchen sink dests": {
-			failover: &FailoverPolicy{
-				Config: &FailoverConfig{
-					Destinations: []*FailoverDestination{
-						newFailoverDestination("foo"),
-						newFailoverDestination("bar"),
-					},
-				},
-				PortConfigs: map[string]*FailoverConfig{
-					"admin": {
-						Destinations: []*FailoverDestination{
-							newFailoverDestination("admin"),
-						},
-					},
-					"web": {
-						Destinations: []*FailoverDestination{
-							newFailoverDestination("foo"), // duplicated
-							newFailoverDestination("www"),
-						},
-					},
-				},
-			},
-			expectDests: []*FailoverDestination{
-				newFailoverDestination("foo"),
-				newFailoverDestination("bar"),
-				newFailoverDestination("admin"),
-				newFailoverDestination("foo"), // duplicated
-				newFailoverDestination("www"),
-			},
-			expectRefs: []*pbresource.Reference{
-				newFailoverRef("foo"),
-				newFailoverRef("bar"),
-				newFailoverRef("admin"),
-				newFailoverRef("foo"), // duplicated
-				newFailoverRef("www"),
-			},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func assertSliceEquals[V proto.Message](t *testing.T, expect, got []V) {
-	t.Helper()
-
-	require.Len(t, got, len(expect))
-
-	// O(N*M) scan
-	var expectedMissing []string
-	for _, expectVal := range expect {
-		found := false
-		for j, gotVal := range got {
-			if proto.Equal(expectVal, gotVal) {
-				found = true
-				got = append(got[:j], got[j+1:]...) // remove found item
-				break
-			}
-		}
-
-		if !found {
-			expectedMissing = append(expectedMissing, protoToString(t, expectVal))
-		}
-	}
-
-	if len(expectedMissing) > 0 || len(got) > 0 {
-		var gotMissing []string
-		for _, gotVal := range got {
-			gotMissing = append(gotMissing, protoToString(t, gotVal))
-		}
-
-		t.Fatalf("assertion failed: unmatched values\n\texpected: %s\n\tactual: %s",
-			expectedMissing,
-			gotMissing,
-		)
-	}
-}
-
-func protoToString[V proto.Message](t *testing.T, pb V) string {
-	m := protojson.MarshalOptions{
-		Indent: "  ",
-	}
-	gotJSON, err := m.Marshal(pb)
-	require.NoError(t, err)
-	return string(gotJSON)
-}
-
-func newFailoverRef(name string) *pbresource.Reference {
-	return &pbresource.Reference{
-		Type: &pbresource.Type{
-			Group:        "fake",
-			GroupVersion: "v1alpha1",
-			Kind:         "fake",
-		},
-		Tenancy: &pbresource.Tenancy{
-			Partition: "default",
-			Namespace: "default",
-			PeerName:  "local",
-		},
-		Name: name,
-	}
-}
-
-func newFailoverDestination(name string) *FailoverDestination {
-	return &FailoverDestination{
-		Ref: newFailoverRef(name),
-	}
-}
diff --git a/proto-public/pbcatalog/v2beta1/health.pb.binary.go b/proto-public/pbcatalog/v2beta1/health.pb.binary.go
deleted file mode 100644
index b5592db6c4647..0000000000000
--- a/proto-public/pbcatalog/v2beta1/health.pb.binary.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbcatalog/v2beta1/health.proto
-
-package catalogv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HealthStatus) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HealthStatus) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HealthChecks) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HealthChecks) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HealthCheck) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HealthCheck) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPCheck) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPCheck) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TCPCheck) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TCPCheck) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *UDPCheck) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *UDPCheck) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *GRPCCheck) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *GRPCCheck) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *OSServiceCheck) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *OSServiceCheck) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *CheckTLSConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *CheckTLSConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbcatalog/v2beta1/health.pb.go b/proto-public/pbcatalog/v2beta1/health.pb.go
deleted file mode 100644
index efb9cdfcafc4d..0000000000000
--- a/proto-public/pbcatalog/v2beta1/health.pb.go
+++ /dev/null
@@ -1,1052 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbcatalog/v2beta1/health.proto
-
-package catalogv2beta1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Health int32
-
-const (
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	Health_HEALTH_ANY         Health = 0
-	Health_HEALTH_PASSING     Health = 1
-	Health_HEALTH_WARNING     Health = 2
-	Health_HEALTH_CRITICAL    Health = 3
-	Health_HEALTH_MAINTENANCE Health = 4
-)
-
-// Enum value maps for Health.
-var (
-	Health_name = map[int32]string{
-		0: "HEALTH_ANY",
-		1: "HEALTH_PASSING",
-		2: "HEALTH_WARNING",
-		3: "HEALTH_CRITICAL",
-		4: "HEALTH_MAINTENANCE",
-	}
-	Health_value = map[string]int32{
-		"HEALTH_ANY":         0,
-		"HEALTH_PASSING":     1,
-		"HEALTH_WARNING":     2,
-		"HEALTH_CRITICAL":    3,
-		"HEALTH_MAINTENANCE": 4,
-	}
-)
-
-func (x Health) Enum() *Health {
-	p := new(Health)
-	*p = x
-	return p
-}
-
-func (x Health) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Health) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbcatalog_v2beta1_health_proto_enumTypes[0].Descriptor()
-}
-
-func (Health) Type() protoreflect.EnumType {
-	return &file_pbcatalog_v2beta1_health_proto_enumTypes[0]
-}
-
-func (x Health) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Health.Descriptor instead.
-func (Health) EnumDescriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_health_proto_rawDescGZIP(), []int{0}
-}
-
-// This resource will belong to a workload or a node and will have an ownership relationship.
-type HealthStatus struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Type is the type of this health check, such as http, tcp, or kubernetes-readiness
-	Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
-	// Health is the status. This maps to existing health check statuses.
-	Status Health `protobuf:"varint,2,opt,name=status,proto3,enum=hashicorp.consul.catalog.v2beta1.Health" json:"status,omitempty"`
-	// Description is the description for this status.
-	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
-	// Output is the output from running the check that resulted in this status
-	Output string `protobuf:"bytes,4,opt,name=output,proto3" json:"output,omitempty"`
-}
-
-func (x *HealthStatus) Reset() {
-	*x = HealthStatus{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HealthStatus) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HealthStatus) ProtoMessage() {}
-
-func (x *HealthStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HealthStatus.ProtoReflect.Descriptor instead.
-func (*HealthStatus) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_health_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *HealthStatus) GetType() string {
-	if x != nil {
-		return x.Type
-	}
-	return ""
-}
-
-func (x *HealthStatus) GetStatus() Health {
-	if x != nil {
-		return x.Status
-	}
-	return Health_HEALTH_ANY
-}
-
-func (x *HealthStatus) GetDescription() string {
-	if x != nil {
-		return x.Description
-	}
-	return ""
-}
-
-func (x *HealthStatus) GetOutput() string {
-	if x != nil {
-		return x.Output
-	}
-	return ""
-}
-
-type HealthChecks struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Workloads    *WorkloadSelector `protobuf:"bytes,1,opt,name=workloads,proto3" json:"workloads,omitempty"`
-	HealthChecks []*HealthCheck    `protobuf:"bytes,2,rep,name=health_checks,json=healthChecks,proto3" json:"health_checks,omitempty"`
-}
-
-func (x *HealthChecks) Reset() {
-	*x = HealthChecks{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HealthChecks) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HealthChecks) ProtoMessage() {}
-
-func (x *HealthChecks) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HealthChecks.ProtoReflect.Descriptor instead.
-func (*HealthChecks) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_health_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *HealthChecks) GetWorkloads() *WorkloadSelector {
-	if x != nil {
-		return x.Workloads
-	}
-	return nil
-}
-
-func (x *HealthChecks) GetHealthChecks() []*HealthCheck {
-	if x != nil {
-		return x.HealthChecks
-	}
-	return nil
-}
-
-type HealthCheck struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	// Types that are assignable to Definition:
-	//
-	//	*HealthCheck_Http
-	//	*HealthCheck_Tcp
-	//	*HealthCheck_Udp
-	//	*HealthCheck_Grpc
-	//	*HealthCheck_OsService
-	Definition              isHealthCheck_Definition `protobuf_oneof:"definition"`
-	Interval                *durationpb.Duration     `protobuf:"bytes,7,opt,name=interval,proto3" json:"interval,omitempty"`
-	Timeout                 *durationpb.Duration     `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"`
-	DeregisterCriticalAfter *durationpb.Duration     `protobuf:"bytes,9,opt,name=deregister_critical_after,json=deregisterCriticalAfter,proto3" json:"deregister_critical_after,omitempty"`
-}
-
-func (x *HealthCheck) Reset() {
-	*x = HealthCheck{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HealthCheck) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HealthCheck) ProtoMessage() {}
-
-func (x *HealthCheck) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HealthCheck.ProtoReflect.Descriptor instead.
-func (*HealthCheck) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_health_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *HealthCheck) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (m *HealthCheck) GetDefinition() isHealthCheck_Definition {
-	if m != nil {
-		return m.Definition
-	}
-	return nil
-}
-
-func (x *HealthCheck) GetHttp() *HTTPCheck {
-	if x, ok := x.GetDefinition().(*HealthCheck_Http); ok {
-		return x.Http
-	}
-	return nil
-}
-
-func (x *HealthCheck) GetTcp() *TCPCheck {
-	if x, ok := x.GetDefinition().(*HealthCheck_Tcp); ok {
-		return x.Tcp
-	}
-	return nil
-}
-
-func (x *HealthCheck) GetUdp() *UDPCheck {
-	if x, ok := x.GetDefinition().(*HealthCheck_Udp); ok {
-		return x.Udp
-	}
-	return nil
-}
-
-func (x *HealthCheck) GetGrpc() *GRPCCheck {
-	if x, ok := x.GetDefinition().(*HealthCheck_Grpc); ok {
-		return x.Grpc
-	}
-	return nil
-}
-
-func (x *HealthCheck) GetOsService() *OSServiceCheck {
-	if x, ok := x.GetDefinition().(*HealthCheck_OsService); ok {
-		return x.OsService
-	}
-	return nil
-}
-
-func (x *HealthCheck) GetInterval() *durationpb.Duration {
-	if x != nil {
-		return x.Interval
-	}
-	return nil
-}
-
-func (x *HealthCheck) GetTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.Timeout
-	}
-	return nil
-}
-
-func (x *HealthCheck) GetDeregisterCriticalAfter() *durationpb.Duration {
-	if x != nil {
-		return x.DeregisterCriticalAfter
-	}
-	return nil
-}
-
-type isHealthCheck_Definition interface {
-	isHealthCheck_Definition()
-}
-
-type HealthCheck_Http struct {
-	Http *HTTPCheck `protobuf:"bytes,2,opt,name=http,proto3,oneof"`
-}
-
-type HealthCheck_Tcp struct {
-	Tcp *TCPCheck `protobuf:"bytes,3,opt,name=tcp,proto3,oneof"`
-}
-
-type HealthCheck_Udp struct {
-	Udp *UDPCheck `protobuf:"bytes,4,opt,name=udp,proto3,oneof"`
-}
-
-type HealthCheck_Grpc struct {
-	Grpc *GRPCCheck `protobuf:"bytes,5,opt,name=grpc,proto3,oneof"`
-}
-
-type HealthCheck_OsService struct {
-	OsService *OSServiceCheck `protobuf:"bytes,6,opt,name=os_service,json=osService,proto3,oneof"`
-}
-
-func (*HealthCheck_Http) isHealthCheck_Definition() {}
-
-func (*HealthCheck_Tcp) isHealthCheck_Definition() {}
-
-func (*HealthCheck_Udp) isHealthCheck_Definition() {}
-
-func (*HealthCheck_Grpc) isHealthCheck_Definition() {}
-
-func (*HealthCheck_OsService) isHealthCheck_Definition() {}
-
-type HTTPCheck struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Url              string            `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
-	Header           map[string]string `protobuf:"bytes,2,rep,name=header,proto3" json:"header,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Method           string            `protobuf:"bytes,3,opt,name=method,proto3" json:"method,omitempty"`
-	Body             string            `protobuf:"bytes,4,opt,name=body,proto3" json:"body,omitempty"`
-	DisableRedirects bool              `protobuf:"varint,5,opt,name=disable_redirects,json=disableRedirects,proto3" json:"disable_redirects,omitempty"`
-	Tls              *CheckTLSConfig   `protobuf:"bytes,6,opt,name=tls,proto3" json:"tls,omitempty"`
-}
-
-func (x *HTTPCheck) Reset() {
-	*x = HTTPCheck{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPCheck) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPCheck) ProtoMessage() {}
-
-func (x *HTTPCheck) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPCheck.ProtoReflect.Descriptor instead.
-func (*HTTPCheck) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_health_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *HTTPCheck) GetUrl() string {
-	if x != nil {
-		return x.Url
-	}
-	return ""
-}
-
-func (x *HTTPCheck) GetHeader() map[string]string {
-	if x != nil {
-		return x.Header
-	}
-	return nil
-}
-
-func (x *HTTPCheck) GetMethod() string {
-	if x != nil {
-		return x.Method
-	}
-	return ""
-}
-
-func (x *HTTPCheck) GetBody() string {
-	if x != nil {
-		return x.Body
-	}
-	return ""
-}
-
-func (x *HTTPCheck) GetDisableRedirects() bool {
-	if x != nil {
-		return x.DisableRedirects
-	}
-	return false
-}
-
-func (x *HTTPCheck) GetTls() *CheckTLSConfig {
-	if x != nil {
-		return x.Tls
-	}
-	return nil
-}
-
-type TCPCheck struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-}
-
-func (x *TCPCheck) Reset() {
-	*x = TCPCheck{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TCPCheck) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TCPCheck) ProtoMessage() {}
-
-func (x *TCPCheck) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TCPCheck.ProtoReflect.Descriptor instead.
-func (*TCPCheck) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_health_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *TCPCheck) GetAddress() string {
-	if x != nil {
-		return x.Address
-	}
-	return ""
-}
-
-type UDPCheck struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-}
-
-func (x *UDPCheck) Reset() {
-	*x = UDPCheck{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UDPCheck) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UDPCheck) ProtoMessage() {}
-
-func (x *UDPCheck) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UDPCheck.ProtoReflect.Descriptor instead.
-func (*UDPCheck) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_health_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *UDPCheck) GetAddress() string {
-	if x != nil {
-		return x.Address
-	}
-	return ""
-}
-
-type GRPCCheck struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Address string          `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-	Tls     *CheckTLSConfig `protobuf:"bytes,2,opt,name=tls,proto3" json:"tls,omitempty"`
-}
-
-func (x *GRPCCheck) Reset() {
-	*x = GRPCCheck{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GRPCCheck) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GRPCCheck) ProtoMessage() {}
-
-func (x *GRPCCheck) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GRPCCheck.ProtoReflect.Descriptor instead.
-func (*GRPCCheck) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_health_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *GRPCCheck) GetAddress() string {
-	if x != nil {
-		return x.Address
-	}
-	return ""
-}
-
-func (x *GRPCCheck) GetTls() *CheckTLSConfig {
-	if x != nil {
-		return x.Tls
-	}
-	return nil
-}
-
-type OSServiceCheck struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-}
-
-func (x *OSServiceCheck) Reset() {
-	*x = OSServiceCheck{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OSServiceCheck) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OSServiceCheck) ProtoMessage() {}
-
-func (x *OSServiceCheck) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OSServiceCheck.ProtoReflect.Descriptor instead.
-func (*OSServiceCheck) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_health_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *OSServiceCheck) GetAddress() string {
-	if x != nil {
-		return x.Address
-	}
-	return ""
-}
-
-type CheckTLSConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TlsServerName string `protobuf:"bytes,1,opt,name=tls_server_name,json=tlsServerName,proto3" json:"tls_server_name,omitempty"`
-	TlsSkipVerify bool   `protobuf:"varint,2,opt,name=tls_skip_verify,json=tlsSkipVerify,proto3" json:"tls_skip_verify,omitempty"`
-	UseTls        bool   `protobuf:"varint,3,opt,name=use_tls,json=useTls,proto3" json:"use_tls,omitempty"`
-}
-
-func (x *CheckTLSConfig) Reset() {
-	*x = CheckTLSConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CheckTLSConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CheckTLSConfig) ProtoMessage() {}
-
-func (x *CheckTLSConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CheckTLSConfig.ProtoReflect.Descriptor instead.
-func (*CheckTLSConfig) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_health_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *CheckTLSConfig) GetTlsServerName() string {
-	if x != nil {
-		return x.TlsServerName
-	}
-	return ""
-}
-
-func (x *CheckTLSConfig) GetTlsSkipVerify() bool {
-	if x != nil {
-		return x.TlsSkipVerify
-	}
-	return false
-}
-
-func (x *CheckTLSConfig) GetUseTls() bool {
-	if x != nil {
-		return x.UseTls
-	}
-	return false
-}
-
-var File_pbcatalog_v2beta1_health_proto protoreflect.FileDescriptor
-
-var file_pbcatalog_v2beta1_health_proto_rawDesc = []byte{
-	0x0a, 0x1e, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x12, 0x20, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x20, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x22, 0xa6, 0x01, 0x0a, 0x0c, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x53, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x40, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x28, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74,
-	0x68, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
-	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6f,
-	0x75, 0x74, 0x70, 0x75, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x75, 0x74,
-	0x70, 0x75, 0x74, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0xbc, 0x01, 0x0a, 0x0c,
-	0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x12, 0x50, 0x0a, 0x09,
-	0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x52, 0x09, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x12, 0x52,
-	0x0a, 0x0d, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43,
-	0x68, 0x65, 0x63, 0x6b, 0x52, 0x0c, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63,
-	0x6b, 0x73, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0xcb, 0x04, 0x0a, 0x0b, 0x48,
-	0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x41,
-	0x0a, 0x04, 0x68, 0x74, 0x74, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x48, 0x54, 0x54, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x48, 0x00, 0x52, 0x04, 0x68, 0x74, 0x74,
-	0x70, 0x12, 0x3e, 0x0a, 0x03, 0x74, 0x63, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x54, 0x43, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x48, 0x00, 0x52, 0x03, 0x74, 0x63,
-	0x70, 0x12, 0x3e, 0x0a, 0x03, 0x75, 0x64, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x55, 0x44, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x48, 0x00, 0x52, 0x03, 0x75, 0x64,
-	0x70, 0x12, 0x41, 0x0a, 0x04, 0x67, 0x72, 0x70, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x47, 0x52, 0x50, 0x43, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x48, 0x00, 0x52, 0x04,
-	0x67, 0x72, 0x70, 0x63, 0x12, 0x51, 0x0a, 0x0a, 0x6f, 0x73, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61,
-	0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4f, 0x53, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x48, 0x00, 0x52, 0x09, 0x6f, 0x73,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x76, 0x61, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x33,
-	0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65,
-	0x6f, 0x75, 0x74, 0x12, 0x55, 0x0a, 0x19, 0x64, 0x65, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65,
-	0x72, 0x5f, 0x63, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x61, 0x66, 0x74, 0x65, 0x72,
-	0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x17, 0x64, 0x65, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x72, 0x69,
-	0x74, 0x69, 0x63, 0x61, 0x6c, 0x41, 0x66, 0x74, 0x65, 0x72, 0x42, 0x0c, 0x0a, 0x0a, 0x64, 0x65,
-	0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xc6, 0x02, 0x0a, 0x09, 0x48, 0x54, 0x54,
-	0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x4f, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61,
-	0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50,
-	0x43, 0x68, 0x65, 0x63, 0x6b, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74,
-	0x68, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f,
-	0x64, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x2b, 0x0a, 0x11, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65,
-	0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x10, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63,
-	0x74, 0x73, 0x12, 0x42, 0x0a, 0x03, 0x74, 0x6c, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x52, 0x03, 0x74, 0x6c, 0x73, 0x1a, 0x39, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x22, 0x24, 0x0a, 0x08, 0x54, 0x43, 0x50, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x18, 0x0a,
-	0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x24, 0x0a, 0x08, 0x55, 0x44, 0x50, 0x43, 0x68,
-	0x65, 0x63, 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x69, 0x0a,
-	0x09, 0x47, 0x52, 0x50, 0x43, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x12, 0x42, 0x0a, 0x03, 0x74, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x52, 0x03, 0x74, 0x6c, 0x73, 0x22, 0x2a, 0x0a, 0x0e, 0x4f, 0x53, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x22, 0x79, 0x0a, 0x0e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x4c, 0x53,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x26, 0x0a, 0x0f, 0x74, 0x6c, 0x73, 0x5f, 0x73, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0d, 0x74, 0x6c, 0x73, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x26,
-	0x0a, 0x0f, 0x74, 0x6c, 0x73, 0x5f, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x76, 0x65, 0x72, 0x69, 0x66,
-	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x74, 0x6c, 0x73, 0x53, 0x6b, 0x69, 0x70,
-	0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x12, 0x17, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x5f, 0x74, 0x6c,
-	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x75, 0x73, 0x65, 0x54, 0x6c, 0x73, 0x2a,
-	0x6d, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x0e, 0x0a, 0x0a, 0x48, 0x45, 0x41,
-	0x4c, 0x54, 0x48, 0x5f, 0x41, 0x4e, 0x59, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x45, 0x41,
-	0x4c, 0x54, 0x48, 0x5f, 0x50, 0x41, 0x53, 0x53, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x12, 0x0a,
-	0x0e, 0x48, 0x45, 0x41, 0x4c, 0x54, 0x48, 0x5f, 0x57, 0x41, 0x52, 0x4e, 0x49, 0x4e, 0x47, 0x10,
-	0x02, 0x12, 0x13, 0x0a, 0x0f, 0x48, 0x45, 0x41, 0x4c, 0x54, 0x48, 0x5f, 0x43, 0x52, 0x49, 0x54,
-	0x49, 0x43, 0x41, 0x4c, 0x10, 0x03, 0x12, 0x16, 0x0a, 0x12, 0x48, 0x45, 0x41, 0x4c, 0x54, 0x48,
-	0x5f, 0x4d, 0x41, 0x49, 0x4e, 0x54, 0x45, 0x4e, 0x41, 0x4e, 0x43, 0x45, 0x10, 0x04, 0x42, 0xa1,
-	0x02, 0x0a, 0x24, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x0b, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
-	0x2f, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x3b, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x43, 0xaa, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x43, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61,
-	0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x2c,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x23, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x3a, 0x3a, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbcatalog_v2beta1_health_proto_rawDescOnce sync.Once
-	file_pbcatalog_v2beta1_health_proto_rawDescData = file_pbcatalog_v2beta1_health_proto_rawDesc
-)
-
-func file_pbcatalog_v2beta1_health_proto_rawDescGZIP() []byte {
-	file_pbcatalog_v2beta1_health_proto_rawDescOnce.Do(func() {
-		file_pbcatalog_v2beta1_health_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbcatalog_v2beta1_health_proto_rawDescData)
-	})
-	return file_pbcatalog_v2beta1_health_proto_rawDescData
-}
-
-var file_pbcatalog_v2beta1_health_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbcatalog_v2beta1_health_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
-var file_pbcatalog_v2beta1_health_proto_goTypes = []interface{}{
-	(Health)(0),                 // 0: hashicorp.consul.catalog.v2beta1.Health
-	(*HealthStatus)(nil),        // 1: hashicorp.consul.catalog.v2beta1.HealthStatus
-	(*HealthChecks)(nil),        // 2: hashicorp.consul.catalog.v2beta1.HealthChecks
-	(*HealthCheck)(nil),         // 3: hashicorp.consul.catalog.v2beta1.HealthCheck
-	(*HTTPCheck)(nil),           // 4: hashicorp.consul.catalog.v2beta1.HTTPCheck
-	(*TCPCheck)(nil),            // 5: hashicorp.consul.catalog.v2beta1.TCPCheck
-	(*UDPCheck)(nil),            // 6: hashicorp.consul.catalog.v2beta1.UDPCheck
-	(*GRPCCheck)(nil),           // 7: hashicorp.consul.catalog.v2beta1.GRPCCheck
-	(*OSServiceCheck)(nil),      // 8: hashicorp.consul.catalog.v2beta1.OSServiceCheck
-	(*CheckTLSConfig)(nil),      // 9: hashicorp.consul.catalog.v2beta1.CheckTLSConfig
-	nil,                         // 10: hashicorp.consul.catalog.v2beta1.HTTPCheck.HeaderEntry
-	(*WorkloadSelector)(nil),    // 11: hashicorp.consul.catalog.v2beta1.WorkloadSelector
-	(*durationpb.Duration)(nil), // 12: google.protobuf.Duration
-}
-var file_pbcatalog_v2beta1_health_proto_depIdxs = []int32{
-	0,  // 0: hashicorp.consul.catalog.v2beta1.HealthStatus.status:type_name -> hashicorp.consul.catalog.v2beta1.Health
-	11, // 1: hashicorp.consul.catalog.v2beta1.HealthChecks.workloads:type_name -> hashicorp.consul.catalog.v2beta1.WorkloadSelector
-	3,  // 2: hashicorp.consul.catalog.v2beta1.HealthChecks.health_checks:type_name -> hashicorp.consul.catalog.v2beta1.HealthCheck
-	4,  // 3: hashicorp.consul.catalog.v2beta1.HealthCheck.http:type_name -> hashicorp.consul.catalog.v2beta1.HTTPCheck
-	5,  // 4: hashicorp.consul.catalog.v2beta1.HealthCheck.tcp:type_name -> hashicorp.consul.catalog.v2beta1.TCPCheck
-	6,  // 5: hashicorp.consul.catalog.v2beta1.HealthCheck.udp:type_name -> hashicorp.consul.catalog.v2beta1.UDPCheck
-	7,  // 6: hashicorp.consul.catalog.v2beta1.HealthCheck.grpc:type_name -> hashicorp.consul.catalog.v2beta1.GRPCCheck
-	8,  // 7: hashicorp.consul.catalog.v2beta1.HealthCheck.os_service:type_name -> hashicorp.consul.catalog.v2beta1.OSServiceCheck
-	12, // 8: hashicorp.consul.catalog.v2beta1.HealthCheck.interval:type_name -> google.protobuf.Duration
-	12, // 9: hashicorp.consul.catalog.v2beta1.HealthCheck.timeout:type_name -> google.protobuf.Duration
-	12, // 10: hashicorp.consul.catalog.v2beta1.HealthCheck.deregister_critical_after:type_name -> google.protobuf.Duration
-	10, // 11: hashicorp.consul.catalog.v2beta1.HTTPCheck.header:type_name -> hashicorp.consul.catalog.v2beta1.HTTPCheck.HeaderEntry
-	9,  // 12: hashicorp.consul.catalog.v2beta1.HTTPCheck.tls:type_name -> hashicorp.consul.catalog.v2beta1.CheckTLSConfig
-	9,  // 13: hashicorp.consul.catalog.v2beta1.GRPCCheck.tls:type_name -> hashicorp.consul.catalog.v2beta1.CheckTLSConfig
-	14, // [14:14] is the sub-list for method output_type
-	14, // [14:14] is the sub-list for method input_type
-	14, // [14:14] is the sub-list for extension type_name
-	14, // [14:14] is the sub-list for extension extendee
-	0,  // [0:14] is the sub-list for field type_name
-}
-
-func init() { file_pbcatalog_v2beta1_health_proto_init() }
-func file_pbcatalog_v2beta1_health_proto_init() {
-	if File_pbcatalog_v2beta1_health_proto != nil {
-		return
-	}
-	file_pbcatalog_v2beta1_selector_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbcatalog_v2beta1_health_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HealthStatus); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_health_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HealthChecks); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_health_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HealthCheck); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_health_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPCheck); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_health_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TCPCheck); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_health_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UDPCheck); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_health_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GRPCCheck); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_health_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OSServiceCheck); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_health_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CheckTLSConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbcatalog_v2beta1_health_proto_msgTypes[2].OneofWrappers = []interface{}{
-		(*HealthCheck_Http)(nil),
-		(*HealthCheck_Tcp)(nil),
-		(*HealthCheck_Udp)(nil),
-		(*HealthCheck_Grpc)(nil),
-		(*HealthCheck_OsService)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbcatalog_v2beta1_health_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   10,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbcatalog_v2beta1_health_proto_goTypes,
-		DependencyIndexes: file_pbcatalog_v2beta1_health_proto_depIdxs,
-		EnumInfos:         file_pbcatalog_v2beta1_health_proto_enumTypes,
-		MessageInfos:      file_pbcatalog_v2beta1_health_proto_msgTypes,
-	}.Build()
-	File_pbcatalog_v2beta1_health_proto = out.File
-	file_pbcatalog_v2beta1_health_proto_rawDesc = nil
-	file_pbcatalog_v2beta1_health_proto_goTypes = nil
-	file_pbcatalog_v2beta1_health_proto_depIdxs = nil
-}
diff --git a/proto-public/pbcatalog/v2beta1/health.proto b/proto-public/pbcatalog/v2beta1/health.proto
deleted file mode 100644
index 022a6169e9943..0000000000000
--- a/proto-public/pbcatalog/v2beta1/health.proto
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.catalog.v2beta1;
-
-import "google/protobuf/duration.proto";
-import "pbcatalog/v2beta1/selector.proto";
-import "pbresource/annotations.proto";
-
-// This resource will belong to a workload or a node and will have an ownership relationship.
-message HealthStatus {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  // Type is the type of this health check, such as http, tcp, or kubernetes-readiness
-  string type = 1;
-  // Health is the status. This maps to existing health check statuses.
-  Health status = 2;
-  // Description is the description for this status.
-  string description = 3;
-  // Output is the output from running the check that resulted in this status
-  string output = 4;
-}
-
-enum Health {
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  HEALTH_ANY = 0;
-  HEALTH_PASSING = 1;
-  HEALTH_WARNING = 2;
-  HEALTH_CRITICAL = 3;
-  HEALTH_MAINTENANCE = 4;
-}
-
-message HealthChecks {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  WorkloadSelector workloads = 1;
-  repeated HealthCheck health_checks = 2;
-}
-
-message HealthCheck {
-  string name = 1;
-  oneof definition {
-    HTTPCheck http = 2;
-    TCPCheck tcp = 3;
-    UDPCheck udp = 4;
-    GRPCCheck grpc = 5;
-    OSServiceCheck os_service = 6;
-  }
-  google.protobuf.Duration interval = 7;
-  google.protobuf.Duration timeout = 8;
-  google.protobuf.Duration deregister_critical_after = 9;
-}
-
-message HTTPCheck {
-  string url = 1;
-  map<string, string> header = 2;
-  string method = 3;
-  string body = 4;
-  bool disable_redirects = 5;
-  CheckTLSConfig tls = 6;
-}
-
-message TCPCheck {
-  string address = 1;
-}
-
-message UDPCheck {
-  string address = 1;
-}
-
-message GRPCCheck {
-  string address = 1;
-  CheckTLSConfig tls = 2;
-}
-
-message OSServiceCheck {
-  string address = 1;
-}
-
-message CheckTLSConfig {
-  string tls_server_name = 1;
-  bool tls_skip_verify = 2;
-  bool use_tls = 3;
-}
diff --git a/proto-public/pbcatalog/v2beta1/node.pb.binary.go b/proto-public/pbcatalog/v2beta1/node.pb.binary.go
deleted file mode 100644
index 984bc57b71d02..0000000000000
--- a/proto-public/pbcatalog/v2beta1/node.pb.binary.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbcatalog/v2beta1/node.proto
-
-package catalogv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Node) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Node) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *NodeAddress) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *NodeAddress) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbcatalog/v2beta1/node.pb.go b/proto-public/pbcatalog/v2beta1/node.pb.go
deleted file mode 100644
index fc6d57f7fc227..0000000000000
--- a/proto-public/pbcatalog/v2beta1/node.pb.go
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbcatalog/v2beta1/node.proto
-
-package catalogv2beta1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Node struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Addresses []*NodeAddress `protobuf:"bytes,1,rep,name=addresses,proto3" json:"addresses,omitempty"`
-}
-
-func (x *Node) Reset() {
-	*x = Node{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_node_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Node) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Node) ProtoMessage() {}
-
-func (x *Node) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_node_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Node.ProtoReflect.Descriptor instead.
-func (*Node) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_node_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Node) GetAddresses() []*NodeAddress {
-	if x != nil {
-		return x.Addresses
-	}
-	return nil
-}
-
-type NodeAddress struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// host can be an IP or DNS name.Í
-	Host string `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"`
-	// external indicates whether this address should be used for external communication
-	// (aka a WAN address).
-	External bool `protobuf:"varint,3,opt,name=external,proto3" json:"external,omitempty"`
-}
-
-func (x *NodeAddress) Reset() {
-	*x = NodeAddress{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_node_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *NodeAddress) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*NodeAddress) ProtoMessage() {}
-
-func (x *NodeAddress) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_node_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use NodeAddress.ProtoReflect.Descriptor instead.
-func (*NodeAddress) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_node_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *NodeAddress) GetHost() string {
-	if x != nil {
-		return x.Host
-	}
-	return ""
-}
-
-func (x *NodeAddress) GetExternal() bool {
-	if x != nil {
-		return x.External
-	}
-	return false
-}
-
-var File_pbcatalog_v2beta1_node_proto protoreflect.FileDescriptor
-
-var file_pbcatalog_v2beta1_node_proto_rawDesc = []byte{
-	0x0a, 0x1c, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e,
-	0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5b,
-	0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x4b, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74,
-	0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4e, 0x6f, 0x64,
-	0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x65, 0x73, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0x3d, 0x0a, 0x0b, 0x4e,
-	0x6f, 0x64, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f,
-	0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x1a,
-	0x0a, 0x08, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x08, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x42, 0x9f, 0x02, 0x0a, 0x24, 0x63,
-	0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x42, 0x09, 0x4e, 0x6f, 0x64, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x63, 0x61, 0x74,
-	0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x63, 0x61, 0x74,
-	0x61, 0x6c, 0x6f, 0x67, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43,
-	0x43, 0xaa, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c,
-	0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
-	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x43, 0x61, 0x74, 0x61,
-	0x6c, 0x6f, 0x67, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbcatalog_v2beta1_node_proto_rawDescOnce sync.Once
-	file_pbcatalog_v2beta1_node_proto_rawDescData = file_pbcatalog_v2beta1_node_proto_rawDesc
-)
-
-func file_pbcatalog_v2beta1_node_proto_rawDescGZIP() []byte {
-	file_pbcatalog_v2beta1_node_proto_rawDescOnce.Do(func() {
-		file_pbcatalog_v2beta1_node_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbcatalog_v2beta1_node_proto_rawDescData)
-	})
-	return file_pbcatalog_v2beta1_node_proto_rawDescData
-}
-
-var file_pbcatalog_v2beta1_node_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_pbcatalog_v2beta1_node_proto_goTypes = []interface{}{
-	(*Node)(nil),        // 0: hashicorp.consul.catalog.v2beta1.Node
-	(*NodeAddress)(nil), // 1: hashicorp.consul.catalog.v2beta1.NodeAddress
-}
-var file_pbcatalog_v2beta1_node_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.catalog.v2beta1.Node.addresses:type_name -> hashicorp.consul.catalog.v2beta1.NodeAddress
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
-}
-
-func init() { file_pbcatalog_v2beta1_node_proto_init() }
-func file_pbcatalog_v2beta1_node_proto_init() {
-	if File_pbcatalog_v2beta1_node_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbcatalog_v2beta1_node_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Node); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_node_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NodeAddress); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbcatalog_v2beta1_node_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbcatalog_v2beta1_node_proto_goTypes,
-		DependencyIndexes: file_pbcatalog_v2beta1_node_proto_depIdxs,
-		MessageInfos:      file_pbcatalog_v2beta1_node_proto_msgTypes,
-	}.Build()
-	File_pbcatalog_v2beta1_node_proto = out.File
-	file_pbcatalog_v2beta1_node_proto_rawDesc = nil
-	file_pbcatalog_v2beta1_node_proto_goTypes = nil
-	file_pbcatalog_v2beta1_node_proto_depIdxs = nil
-}
diff --git a/proto-public/pbcatalog/v2beta1/node.proto b/proto-public/pbcatalog/v2beta1/node.proto
deleted file mode 100644
index 99c54ae48b749..0000000000000
--- a/proto-public/pbcatalog/v2beta1/node.proto
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.catalog.v2beta1;
-
-import "pbresource/annotations.proto";
-
-message Node {
-  option (hashicorp.consul.resource.spec) = {
-    // TODO: This should eventually be SCOPE_PARTITION but that will require further changes to code
-    scope: SCOPE_NAMESPACE,
-  };
-
-  repeated NodeAddress addresses = 1;
-}
-
-message NodeAddress {
-  // host can be an IP or DNS name.Í
-  string host = 1;
-
-  // external indicates whether this address should be used for external communication
-  // (aka a WAN address).
-  bool external = 3;
-}
diff --git a/proto-public/pbcatalog/v2beta1/protocol.pb.go b/proto-public/pbcatalog/v2beta1/protocol.pb.go
deleted file mode 100644
index dec440c52ffe3..0000000000000
--- a/proto-public/pbcatalog/v2beta1/protocol.pb.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbcatalog/v2beta1/protocol.proto
-
-package catalogv2beta1
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Protocol int32
-
-const (
-	Protocol_PROTOCOL_UNSPECIFIED Protocol = 0
-	Protocol_PROTOCOL_TCP         Protocol = 1
-	Protocol_PROTOCOL_HTTP        Protocol = 2
-	Protocol_PROTOCOL_HTTP2       Protocol = 3
-	Protocol_PROTOCOL_GRPC        Protocol = 4
-	// Protocol Mesh indicates that this port can speak Consul's mTLS based mesh protocol.
-	Protocol_PROTOCOL_MESH Protocol = 5
-)
-
-// Enum value maps for Protocol.
-var (
-	Protocol_name = map[int32]string{
-		0: "PROTOCOL_UNSPECIFIED",
-		1: "PROTOCOL_TCP",
-		2: "PROTOCOL_HTTP",
-		3: "PROTOCOL_HTTP2",
-		4: "PROTOCOL_GRPC",
-		5: "PROTOCOL_MESH",
-	}
-	Protocol_value = map[string]int32{
-		"PROTOCOL_UNSPECIFIED": 0,
-		"PROTOCOL_TCP":         1,
-		"PROTOCOL_HTTP":        2,
-		"PROTOCOL_HTTP2":       3,
-		"PROTOCOL_GRPC":        4,
-		"PROTOCOL_MESH":        5,
-	}
-)
-
-func (x Protocol) Enum() *Protocol {
-	p := new(Protocol)
-	*p = x
-	return p
-}
-
-func (x Protocol) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Protocol) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbcatalog_v2beta1_protocol_proto_enumTypes[0].Descriptor()
-}
-
-func (Protocol) Type() protoreflect.EnumType {
-	return &file_pbcatalog_v2beta1_protocol_proto_enumTypes[0]
-}
-
-func (x Protocol) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Protocol.Descriptor instead.
-func (Protocol) EnumDescriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_protocol_proto_rawDescGZIP(), []int{0}
-}
-
-var File_pbcatalog_v2beta1_protocol_proto protoreflect.FileDescriptor
-
-var file_pbcatalog_v2beta1_protocol_proto_rawDesc = []byte{
-	0x0a, 0x20, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x12, 0x20, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2a, 0x83, 0x01, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
-	0x6c, 0x12, 0x18, 0x0a, 0x14, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x55, 0x4e,
-	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x50,
-	0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x54, 0x43, 0x50, 0x10, 0x01, 0x12, 0x11, 0x0a,
-	0x0d, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x48, 0x54, 0x54, 0x50, 0x10, 0x02,
-	0x12, 0x12, 0x0a, 0x0e, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x48, 0x54, 0x54,
-	0x50, 0x32, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c,
-	0x5f, 0x47, 0x52, 0x50, 0x43, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x52, 0x4f, 0x54, 0x4f,
-	0x43, 0x4f, 0x4c, 0x5f, 0x4d, 0x45, 0x53, 0x48, 0x10, 0x05, 0x42, 0xa3, 0x02, 0x0a, 0x24, 0x63,
-	0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x42, 0x0d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70,
-	0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x3b, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2,
-	0x02, 0x03, 0x48, 0x43, 0x43, 0xaa, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67,
-	0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61,
-	0x6c, 0x6f, 0x67, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x2c, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43,
-	0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47,
-	0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x23, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a,
-	0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbcatalog_v2beta1_protocol_proto_rawDescOnce sync.Once
-	file_pbcatalog_v2beta1_protocol_proto_rawDescData = file_pbcatalog_v2beta1_protocol_proto_rawDesc
-)
-
-func file_pbcatalog_v2beta1_protocol_proto_rawDescGZIP() []byte {
-	file_pbcatalog_v2beta1_protocol_proto_rawDescOnce.Do(func() {
-		file_pbcatalog_v2beta1_protocol_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbcatalog_v2beta1_protocol_proto_rawDescData)
-	})
-	return file_pbcatalog_v2beta1_protocol_proto_rawDescData
-}
-
-var file_pbcatalog_v2beta1_protocol_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbcatalog_v2beta1_protocol_proto_goTypes = []interface{}{
-	(Protocol)(0), // 0: hashicorp.consul.catalog.v2beta1.Protocol
-}
-var file_pbcatalog_v2beta1_protocol_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_pbcatalog_v2beta1_protocol_proto_init() }
-func file_pbcatalog_v2beta1_protocol_proto_init() {
-	if File_pbcatalog_v2beta1_protocol_proto != nil {
-		return
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbcatalog_v2beta1_protocol_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   0,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbcatalog_v2beta1_protocol_proto_goTypes,
-		DependencyIndexes: file_pbcatalog_v2beta1_protocol_proto_depIdxs,
-		EnumInfos:         file_pbcatalog_v2beta1_protocol_proto_enumTypes,
-	}.Build()
-	File_pbcatalog_v2beta1_protocol_proto = out.File
-	file_pbcatalog_v2beta1_protocol_proto_rawDesc = nil
-	file_pbcatalog_v2beta1_protocol_proto_goTypes = nil
-	file_pbcatalog_v2beta1_protocol_proto_depIdxs = nil
-}
diff --git a/proto-public/pbcatalog/v2beta1/protocol.proto b/proto-public/pbcatalog/v2beta1/protocol.proto
deleted file mode 100644
index 698756934aa43..0000000000000
--- a/proto-public/pbcatalog/v2beta1/protocol.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.catalog.v2beta1;
-
-enum Protocol {
-  PROTOCOL_UNSPECIFIED = 0;
-  PROTOCOL_TCP = 1;
-  PROTOCOL_HTTP = 2;
-  PROTOCOL_HTTP2 = 3;
-  PROTOCOL_GRPC = 4;
-
-  // Protocol Mesh indicates that this port can speak Consul's mTLS based mesh protocol.
-  PROTOCOL_MESH = 5;
-}
diff --git a/proto-public/pbcatalog/v2beta1/resource_types.gen.go b/proto-public/pbcatalog/v2beta1/resource_types.gen.go
deleted file mode 100644
index c71a38ac70cda..0000000000000
--- a/proto-public/pbcatalog/v2beta1/resource_types.gen.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Code generated by protoc-gen-resource-types. DO NOT EDIT.
-
-package catalogv2beta1
-
-import (
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	GroupName = "catalog"
-	Version   = "v2beta1"
-
-	DNSPolicyKind        = "DNSPolicy"
-	FailoverPolicyKind   = "FailoverPolicy"
-	HealthChecksKind     = "HealthChecks"
-	HealthStatusKind     = "HealthStatus"
-	NodeKind             = "Node"
-	ServiceKind          = "Service"
-	ServiceEndpointsKind = "ServiceEndpoints"
-	VirtualIPsKind       = "VirtualIPs"
-	WorkloadKind         = "Workload"
-)
-
-var (
-	DNSPolicyType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         DNSPolicyKind,
-	}
-
-	FailoverPolicyType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         FailoverPolicyKind,
-	}
-
-	HealthChecksType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         HealthChecksKind,
-	}
-
-	HealthStatusType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         HealthStatusKind,
-	}
-
-	NodeType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         NodeKind,
-	}
-
-	ServiceType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         ServiceKind,
-	}
-
-	ServiceEndpointsType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         ServiceEndpointsKind,
-	}
-
-	VirtualIPsType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         VirtualIPsKind,
-	}
-
-	WorkloadType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         WorkloadKind,
-	}
-)
diff --git a/proto-public/pbcatalog/v2beta1/selector.pb.binary.go b/proto-public/pbcatalog/v2beta1/selector.pb.binary.go
deleted file mode 100644
index cb55c9be5be6e..0000000000000
--- a/proto-public/pbcatalog/v2beta1/selector.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbcatalog/v2beta1/selector.proto
-
-package catalogv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *WorkloadSelector) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *WorkloadSelector) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbcatalog/v2beta1/selector.pb.go b/proto-public/pbcatalog/v2beta1/selector.pb.go
deleted file mode 100644
index be51858d72c6b..0000000000000
--- a/proto-public/pbcatalog/v2beta1/selector.pb.go
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbcatalog/v2beta1/selector.proto
-
-package catalogv2beta1
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// WorkloadSelector represents criteria for selecting a subset of workloads.
-type WorkloadSelector struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Prefixes []string `protobuf:"bytes,1,rep,name=prefixes,proto3" json:"prefixes,omitempty"`
-	Names    []string `protobuf:"bytes,2,rep,name=names,proto3" json:"names,omitempty"`
-	Filter   string   `protobuf:"bytes,3,opt,name=filter,proto3" json:"filter,omitempty"`
-}
-
-func (x *WorkloadSelector) Reset() {
-	*x = WorkloadSelector{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_selector_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WorkloadSelector) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WorkloadSelector) ProtoMessage() {}
-
-func (x *WorkloadSelector) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_selector_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WorkloadSelector.ProtoReflect.Descriptor instead.
-func (*WorkloadSelector) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_selector_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *WorkloadSelector) GetPrefixes() []string {
-	if x != nil {
-		return x.Prefixes
-	}
-	return nil
-}
-
-func (x *WorkloadSelector) GetNames() []string {
-	if x != nil {
-		return x.Names
-	}
-	return nil
-}
-
-func (x *WorkloadSelector) GetFilter() string {
-	if x != nil {
-		return x.Filter
-	}
-	return ""
-}
-
-var File_pbcatalog_v2beta1_selector_proto protoreflect.FileDescriptor
-
-var file_pbcatalog_v2beta1_selector_proto_rawDesc = []byte{
-	0x0a, 0x20, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x12, 0x20, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x22, 0x5c, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64,
-	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x65, 0x66,
-	0x69, 0x78, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x65, 0x66,
-	0x69, 0x78, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x42, 0xa3, 0x02, 0x0a, 0x24, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61,
-	0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x0d, 0x53, 0x65, 0x6c,
-	0x65, 0x63, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d,
-	0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67,
-	0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x43, 0xaa, 0x02, 0x20,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0xca, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c, 0x56, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0xe2, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c, 0x56,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0xea, 0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x3a,
-	0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbcatalog_v2beta1_selector_proto_rawDescOnce sync.Once
-	file_pbcatalog_v2beta1_selector_proto_rawDescData = file_pbcatalog_v2beta1_selector_proto_rawDesc
-)
-
-func file_pbcatalog_v2beta1_selector_proto_rawDescGZIP() []byte {
-	file_pbcatalog_v2beta1_selector_proto_rawDescOnce.Do(func() {
-		file_pbcatalog_v2beta1_selector_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbcatalog_v2beta1_selector_proto_rawDescData)
-	})
-	return file_pbcatalog_v2beta1_selector_proto_rawDescData
-}
-
-var file_pbcatalog_v2beta1_selector_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbcatalog_v2beta1_selector_proto_goTypes = []interface{}{
-	(*WorkloadSelector)(nil), // 0: hashicorp.consul.catalog.v2beta1.WorkloadSelector
-}
-var file_pbcatalog_v2beta1_selector_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_pbcatalog_v2beta1_selector_proto_init() }
-func file_pbcatalog_v2beta1_selector_proto_init() {
-	if File_pbcatalog_v2beta1_selector_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbcatalog_v2beta1_selector_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WorkloadSelector); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbcatalog_v2beta1_selector_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbcatalog_v2beta1_selector_proto_goTypes,
-		DependencyIndexes: file_pbcatalog_v2beta1_selector_proto_depIdxs,
-		MessageInfos:      file_pbcatalog_v2beta1_selector_proto_msgTypes,
-	}.Build()
-	File_pbcatalog_v2beta1_selector_proto = out.File
-	file_pbcatalog_v2beta1_selector_proto_rawDesc = nil
-	file_pbcatalog_v2beta1_selector_proto_goTypes = nil
-	file_pbcatalog_v2beta1_selector_proto_depIdxs = nil
-}
diff --git a/proto-public/pbcatalog/v2beta1/selector.proto b/proto-public/pbcatalog/v2beta1/selector.proto
deleted file mode 100644
index 6786e7faf9868..0000000000000
--- a/proto-public/pbcatalog/v2beta1/selector.proto
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.catalog.v2beta1;
-
-// WorkloadSelector represents criteria for selecting a subset of workloads.
-message WorkloadSelector {
-  repeated string prefixes = 1;
-  repeated string names = 2;
-  string filter = 3;
-}
diff --git a/proto-public/pbcatalog/v2beta1/service.pb.binary.go b/proto-public/pbcatalog/v2beta1/service.pb.binary.go
deleted file mode 100644
index a017a7bf37212..0000000000000
--- a/proto-public/pbcatalog/v2beta1/service.pb.binary.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbcatalog/v2beta1/service.proto
-
-package catalogv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Service) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Service) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ServicePort) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ServicePort) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbcatalog/v2beta1/service.pb.go b/proto-public/pbcatalog/v2beta1/service.pb.go
deleted file mode 100644
index 99d51a9783b55..0000000000000
--- a/proto-public/pbcatalog/v2beta1/service.pb.go
+++ /dev/null
@@ -1,303 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbcatalog/v2beta1/service.proto
-
-package catalogv2beta1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Service struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// workloads is a selector for the workloads this service should represent.
-	Workloads *WorkloadSelector `protobuf:"bytes,1,opt,name=workloads,proto3" json:"workloads,omitempty"`
-	// ports is the list of mappings of workload ports that this service
-	// represents.
-	Ports []*ServicePort `protobuf:"bytes,2,rep,name=ports,proto3" json:"ports,omitempty"`
-	// virtual_ips is a list of virtual IPs for this service. This is useful when you need to set
-	// an IP from an external system (like Kubernetes). This can be an IPv4 or IPv6 string.
-	VirtualIps []string `protobuf:"bytes,3,rep,name=virtual_ips,json=virtualIps,proto3" json:"virtual_ips,omitempty"`
-}
-
-func (x *Service) Reset() {
-	*x = Service{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_service_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Service) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Service) ProtoMessage() {}
-
-func (x *Service) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_service_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Service.ProtoReflect.Descriptor instead.
-func (*Service) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_service_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Service) GetWorkloads() *WorkloadSelector {
-	if x != nil {
-		return x.Workloads
-	}
-	return nil
-}
-
-func (x *Service) GetPorts() []*ServicePort {
-	if x != nil {
-		return x.Ports
-	}
-	return nil
-}
-
-func (x *Service) GetVirtualIps() []string {
-	if x != nil {
-		return x.VirtualIps
-	}
-	return nil
-}
-
-type ServicePort struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// virtual_port is the port that could only be used when transparent
-	// proxy is used alongside a virtual IP or a virtual DNS address.
-	// This value is ignored in other cases. Whether or not using transparent
-	// proxy, this value is optional.
-	VirtualPort uint32 `protobuf:"varint,1,opt,name=virtual_port,json=virtualPort,proto3" json:"virtual_port,omitempty"`
-	// target_port is the name of the workload port.
-	TargetPort string `protobuf:"bytes,2,opt,name=target_port,json=targetPort,proto3" json:"target_port,omitempty"`
-	// protocol is the port's protocol. This should be set to "mesh"
-	// if the target port is the proxy's inbound port.
-	Protocol Protocol `protobuf:"varint,3,opt,name=protocol,proto3,enum=hashicorp.consul.catalog.v2beta1.Protocol" json:"protocol,omitempty"`
-}
-
-func (x *ServicePort) Reset() {
-	*x = ServicePort{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_service_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServicePort) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServicePort) ProtoMessage() {}
-
-func (x *ServicePort) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_service_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServicePort.ProtoReflect.Descriptor instead.
-func (*ServicePort) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_service_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *ServicePort) GetVirtualPort() uint32 {
-	if x != nil {
-		return x.VirtualPort
-	}
-	return 0
-}
-
-func (x *ServicePort) GetTargetPort() string {
-	if x != nil {
-		return x.TargetPort
-	}
-	return ""
-}
-
-func (x *ServicePort) GetProtocol() Protocol {
-	if x != nil {
-		return x.Protocol
-	}
-	return Protocol_PROTOCOL_UNSPECIFIED
-}
-
-var File_pbcatalog_v2beta1_service_proto protoreflect.FileDescriptor
-
-var file_pbcatalog_v2beta1_service_proto_rawDesc = []byte{
-	0x0a, 0x1f, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x20, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x1a, 0x20, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67,
-	0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc9, 0x01, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x12, 0x50, 0x0a, 0x09, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64,
-	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x09, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f,
-	0x61, 0x64, 0x73, 0x12, 0x43, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x6f, 0x72,
-	0x74, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x76, 0x69, 0x72, 0x74,
-	0x75, 0x61, 0x6c, 0x5f, 0x69, 0x70, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x76,
-	0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x49, 0x70, 0x73, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08,
-	0x03, 0x22, 0x99, 0x01, 0x0a, 0x0b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x6f, 0x72,
-	0x74, 0x12, 0x21, 0x0a, 0x0c, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x70, 0x6f, 0x72,
-	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c,
-	0x50, 0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x70,
-	0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x74, 0x61, 0x72, 0x67, 0x65,
-	0x74, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x46, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
-	0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x63, 0x6f, 0x6c, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x42, 0xa2, 0x02,
-	0x0a, 0x24, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x0c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
-	0x2f, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x3b, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x43, 0xaa, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x43, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61,
-	0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x2c,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x23, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x3a, 0x3a, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbcatalog_v2beta1_service_proto_rawDescOnce sync.Once
-	file_pbcatalog_v2beta1_service_proto_rawDescData = file_pbcatalog_v2beta1_service_proto_rawDesc
-)
-
-func file_pbcatalog_v2beta1_service_proto_rawDescGZIP() []byte {
-	file_pbcatalog_v2beta1_service_proto_rawDescOnce.Do(func() {
-		file_pbcatalog_v2beta1_service_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbcatalog_v2beta1_service_proto_rawDescData)
-	})
-	return file_pbcatalog_v2beta1_service_proto_rawDescData
-}
-
-var file_pbcatalog_v2beta1_service_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_pbcatalog_v2beta1_service_proto_goTypes = []interface{}{
-	(*Service)(nil),          // 0: hashicorp.consul.catalog.v2beta1.Service
-	(*ServicePort)(nil),      // 1: hashicorp.consul.catalog.v2beta1.ServicePort
-	(*WorkloadSelector)(nil), // 2: hashicorp.consul.catalog.v2beta1.WorkloadSelector
-	(Protocol)(0),            // 3: hashicorp.consul.catalog.v2beta1.Protocol
-}
-var file_pbcatalog_v2beta1_service_proto_depIdxs = []int32{
-	2, // 0: hashicorp.consul.catalog.v2beta1.Service.workloads:type_name -> hashicorp.consul.catalog.v2beta1.WorkloadSelector
-	1, // 1: hashicorp.consul.catalog.v2beta1.Service.ports:type_name -> hashicorp.consul.catalog.v2beta1.ServicePort
-	3, // 2: hashicorp.consul.catalog.v2beta1.ServicePort.protocol:type_name -> hashicorp.consul.catalog.v2beta1.Protocol
-	3, // [3:3] is the sub-list for method output_type
-	3, // [3:3] is the sub-list for method input_type
-	3, // [3:3] is the sub-list for extension type_name
-	3, // [3:3] is the sub-list for extension extendee
-	0, // [0:3] is the sub-list for field type_name
-}
-
-func init() { file_pbcatalog_v2beta1_service_proto_init() }
-func file_pbcatalog_v2beta1_service_proto_init() {
-	if File_pbcatalog_v2beta1_service_proto != nil {
-		return
-	}
-	file_pbcatalog_v2beta1_protocol_proto_init()
-	file_pbcatalog_v2beta1_selector_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbcatalog_v2beta1_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Service); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServicePort); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbcatalog_v2beta1_service_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbcatalog_v2beta1_service_proto_goTypes,
-		DependencyIndexes: file_pbcatalog_v2beta1_service_proto_depIdxs,
-		MessageInfos:      file_pbcatalog_v2beta1_service_proto_msgTypes,
-	}.Build()
-	File_pbcatalog_v2beta1_service_proto = out.File
-	file_pbcatalog_v2beta1_service_proto_rawDesc = nil
-	file_pbcatalog_v2beta1_service_proto_goTypes = nil
-	file_pbcatalog_v2beta1_service_proto_depIdxs = nil
-}
diff --git a/proto-public/pbcatalog/v2beta1/service.proto b/proto-public/pbcatalog/v2beta1/service.proto
deleted file mode 100644
index fd03768b907f3..0000000000000
--- a/proto-public/pbcatalog/v2beta1/service.proto
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.catalog.v2beta1;
-
-import "pbcatalog/v2beta1/protocol.proto";
-import "pbcatalog/v2beta1/selector.proto";
-import "pbresource/annotations.proto";
-
-message Service {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  // workloads is a selector for the workloads this service should represent.
-  WorkloadSelector workloads = 1;
-  // ports is the list of mappings of workload ports that this service
-  // represents.
-  repeated ServicePort ports = 2;
-
-  // virtual_ips is a list of virtual IPs for this service. This is useful when you need to set
-  // an IP from an external system (like Kubernetes). This can be an IPv4 or IPv6 string.
-  repeated string virtual_ips = 3;
-}
-
-message ServicePort {
-  // virtual_port is the port that could only be used when transparent
-  // proxy is used alongside a virtual IP or a virtual DNS address.
-  // This value is ignored in other cases. Whether or not using transparent
-  // proxy, this value is optional.
-  uint32 virtual_port = 1;
-
-  // target_port is the name of the workload port.
-  string target_port = 2;
-
-  // protocol is the port's protocol. This should be set to "mesh"
-  // if the target port is the proxy's inbound port.
-  Protocol protocol = 3;
-}
diff --git a/proto-public/pbcatalog/v2beta1/service_endpoints.pb.binary.go b/proto-public/pbcatalog/v2beta1/service_endpoints.pb.binary.go
deleted file mode 100644
index 1e5fd4a834cd7..0000000000000
--- a/proto-public/pbcatalog/v2beta1/service_endpoints.pb.binary.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbcatalog/v2beta1/service_endpoints.proto
-
-package catalogv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ServiceEndpoints) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ServiceEndpoints) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Endpoint) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Endpoint) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbcatalog/v2beta1/service_endpoints.pb.go b/proto-public/pbcatalog/v2beta1/service_endpoints.pb.go
deleted file mode 100644
index fe98e95b2f27f..0000000000000
--- a/proto-public/pbcatalog/v2beta1/service_endpoints.pb.go
+++ /dev/null
@@ -1,321 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbcatalog/v2beta1/service_endpoints.proto
-
-package catalogv2beta1
-
-import (
-	pbresource "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type ServiceEndpoints struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Endpoints []*Endpoint `protobuf:"bytes,1,rep,name=endpoints,proto3" json:"endpoints,omitempty"`
-}
-
-func (x *ServiceEndpoints) Reset() {
-	*x = ServiceEndpoints{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_service_endpoints_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceEndpoints) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceEndpoints) ProtoMessage() {}
-
-func (x *ServiceEndpoints) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_service_endpoints_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceEndpoints.ProtoReflect.Descriptor instead.
-func (*ServiceEndpoints) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_service_endpoints_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ServiceEndpoints) GetEndpoints() []*Endpoint {
-	if x != nil {
-		return x.Endpoints
-	}
-	return nil
-}
-
-type Endpoint struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// target_ref is the reference to the resource
-	// for this endpoint endpoint. This currently must be a workload.
-	TargetRef *pbresource.ID `protobuf:"bytes,1,opt,name=target_ref,json=targetRef,proto3" json:"target_ref,omitempty"`
-	// addresses is the list of addresses for this endpoint.
-	// This has the same structure as the workload addresses.
-	Addresses []*WorkloadAddress `protobuf:"bytes,2,rep,name=addresses,proto3" json:"addresses,omitempty"`
-	// ports is the map of ports for this endpoint.
-	// This has the same structure as the workload ports but
-	// will be filtered to just the ports selected by the service.
-	Ports map[string]*WorkloadPort `protobuf:"bytes,3,rep,name=ports,proto3" json:"ports,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// health_status is the aggregated health status of this endpoint.
-	HealthStatus Health `protobuf:"varint,4,opt,name=health_status,json=healthStatus,proto3,enum=hashicorp.consul.catalog.v2beta1.Health" json:"health_status,omitempty"`
-	// identity is the name of the workload identity for this endpoint.
-	Identity string `protobuf:"bytes,5,opt,name=identity,proto3" json:"identity,omitempty"`
-}
-
-func (x *Endpoint) Reset() {
-	*x = Endpoint{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_service_endpoints_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Endpoint) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Endpoint) ProtoMessage() {}
-
-func (x *Endpoint) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_service_endpoints_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Endpoint.ProtoReflect.Descriptor instead.
-func (*Endpoint) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_service_endpoints_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Endpoint) GetTargetRef() *pbresource.ID {
-	if x != nil {
-		return x.TargetRef
-	}
-	return nil
-}
-
-func (x *Endpoint) GetAddresses() []*WorkloadAddress {
-	if x != nil {
-		return x.Addresses
-	}
-	return nil
-}
-
-func (x *Endpoint) GetPorts() map[string]*WorkloadPort {
-	if x != nil {
-		return x.Ports
-	}
-	return nil
-}
-
-func (x *Endpoint) GetHealthStatus() Health {
-	if x != nil {
-		return x.HealthStatus
-	}
-	return Health_HEALTH_ANY
-}
-
-func (x *Endpoint) GetIdentity() string {
-	if x != nil {
-		return x.Identity
-	}
-	return ""
-}
-
-var File_pbcatalog_v2beta1_service_endpoints_proto protoreflect.FileDescriptor
-
-var file_pbcatalog_v2beta1_service_endpoints_proto_rawDesc = []byte{
-	0x0a, 0x29, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x65, 0x6e, 0x64, 0x70,
-	0x6f, 0x69, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61,
-	0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x1e, 0x70,
-	0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x70,
-	0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f,
-	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x70,
-	0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x64, 0x0a, 0x10, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x48, 0x0a, 0x09,
-	0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x09, 0x65, 0x6e, 0x64,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0xbb,
-	0x03, 0x0a, 0x08, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x3c, 0x0a, 0x0a, 0x74,
-	0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x72, 0x65, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x09,
-	0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x65, 0x66, 0x12, 0x4f, 0x0a, 0x09, 0x61, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52,
-	0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x4b, 0x0a, 0x05, 0x70, 0x6f,
-	0x72, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74,
-	0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x45, 0x6e, 0x64,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x50, 0x6f, 0x72, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x4d, 0x0a, 0x0d, 0x68, 0x65, 0x61, 0x6c, 0x74,
-	0x68, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x28,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x0c, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x1a, 0x68, 0x0a, 0x0a, 0x50, 0x6f, 0x72, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x44, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x50, 0x6f, 0x72,
-	0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0xab, 0x02, 0x0a,
-	0x24, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x15, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x45, 0x6e,
-	0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x63, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x43, 0xaa,
-	0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c, 0x56, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67,
-	0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f,
-	0x67, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
-}
-
-var (
-	file_pbcatalog_v2beta1_service_endpoints_proto_rawDescOnce sync.Once
-	file_pbcatalog_v2beta1_service_endpoints_proto_rawDescData = file_pbcatalog_v2beta1_service_endpoints_proto_rawDesc
-)
-
-func file_pbcatalog_v2beta1_service_endpoints_proto_rawDescGZIP() []byte {
-	file_pbcatalog_v2beta1_service_endpoints_proto_rawDescOnce.Do(func() {
-		file_pbcatalog_v2beta1_service_endpoints_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbcatalog_v2beta1_service_endpoints_proto_rawDescData)
-	})
-	return file_pbcatalog_v2beta1_service_endpoints_proto_rawDescData
-}
-
-var file_pbcatalog_v2beta1_service_endpoints_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_pbcatalog_v2beta1_service_endpoints_proto_goTypes = []interface{}{
-	(*ServiceEndpoints)(nil), // 0: hashicorp.consul.catalog.v2beta1.ServiceEndpoints
-	(*Endpoint)(nil),         // 1: hashicorp.consul.catalog.v2beta1.Endpoint
-	nil,                      // 2: hashicorp.consul.catalog.v2beta1.Endpoint.PortsEntry
-	(*pbresource.ID)(nil),    // 3: hashicorp.consul.resource.ID
-	(*WorkloadAddress)(nil),  // 4: hashicorp.consul.catalog.v2beta1.WorkloadAddress
-	(Health)(0),              // 5: hashicorp.consul.catalog.v2beta1.Health
-	(*WorkloadPort)(nil),     // 6: hashicorp.consul.catalog.v2beta1.WorkloadPort
-}
-var file_pbcatalog_v2beta1_service_endpoints_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.catalog.v2beta1.ServiceEndpoints.endpoints:type_name -> hashicorp.consul.catalog.v2beta1.Endpoint
-	3, // 1: hashicorp.consul.catalog.v2beta1.Endpoint.target_ref:type_name -> hashicorp.consul.resource.ID
-	4, // 2: hashicorp.consul.catalog.v2beta1.Endpoint.addresses:type_name -> hashicorp.consul.catalog.v2beta1.WorkloadAddress
-	2, // 3: hashicorp.consul.catalog.v2beta1.Endpoint.ports:type_name -> hashicorp.consul.catalog.v2beta1.Endpoint.PortsEntry
-	5, // 4: hashicorp.consul.catalog.v2beta1.Endpoint.health_status:type_name -> hashicorp.consul.catalog.v2beta1.Health
-	6, // 5: hashicorp.consul.catalog.v2beta1.Endpoint.PortsEntry.value:type_name -> hashicorp.consul.catalog.v2beta1.WorkloadPort
-	6, // [6:6] is the sub-list for method output_type
-	6, // [6:6] is the sub-list for method input_type
-	6, // [6:6] is the sub-list for extension type_name
-	6, // [6:6] is the sub-list for extension extendee
-	0, // [0:6] is the sub-list for field type_name
-}
-
-func init() { file_pbcatalog_v2beta1_service_endpoints_proto_init() }
-func file_pbcatalog_v2beta1_service_endpoints_proto_init() {
-	if File_pbcatalog_v2beta1_service_endpoints_proto != nil {
-		return
-	}
-	file_pbcatalog_v2beta1_health_proto_init()
-	file_pbcatalog_v2beta1_workload_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbcatalog_v2beta1_service_endpoints_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceEndpoints); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_service_endpoints_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Endpoint); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbcatalog_v2beta1_service_endpoints_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   3,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbcatalog_v2beta1_service_endpoints_proto_goTypes,
-		DependencyIndexes: file_pbcatalog_v2beta1_service_endpoints_proto_depIdxs,
-		MessageInfos:      file_pbcatalog_v2beta1_service_endpoints_proto_msgTypes,
-	}.Build()
-	File_pbcatalog_v2beta1_service_endpoints_proto = out.File
-	file_pbcatalog_v2beta1_service_endpoints_proto_rawDesc = nil
-	file_pbcatalog_v2beta1_service_endpoints_proto_goTypes = nil
-	file_pbcatalog_v2beta1_service_endpoints_proto_depIdxs = nil
-}
diff --git a/proto-public/pbcatalog/v2beta1/service_endpoints.proto b/proto-public/pbcatalog/v2beta1/service_endpoints.proto
deleted file mode 100644
index cd205a001e404..0000000000000
--- a/proto-public/pbcatalog/v2beta1/service_endpoints.proto
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.catalog.v2beta1;
-
-import "pbcatalog/v2beta1/health.proto";
-import "pbcatalog/v2beta1/workload.proto";
-import "pbresource/annotations.proto";
-import "pbresource/resource.proto";
-
-message ServiceEndpoints {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  repeated Endpoint endpoints = 1;
-}
-
-message Endpoint {
-  // target_ref is the reference to the resource
-  // for this endpoint endpoint. This currently must be a workload.
-  hashicorp.consul.resource.ID target_ref = 1;
-
-  // addresses is the list of addresses for this endpoint.
-  // This has the same structure as the workload addresses.
-  repeated WorkloadAddress addresses = 2;
-
-  // ports is the map of ports for this endpoint.
-  // This has the same structure as the workload ports but
-  // will be filtered to just the ports selected by the service.
-  map<string, WorkloadPort> ports = 3;
-
-  // health_status is the aggregated health status of this endpoint.
-  Health health_status = 4;
-
-  // identity is the name of the workload identity for this endpoint.
-  string identity = 5;
-}
diff --git a/proto-public/pbcatalog/v2beta1/vip.pb.binary.go b/proto-public/pbcatalog/v2beta1/vip.pb.binary.go
deleted file mode 100644
index 2702cdae21e0b..0000000000000
--- a/proto-public/pbcatalog/v2beta1/vip.pb.binary.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbcatalog/v2beta1/vip.proto
-
-package catalogv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *VirtualIPs) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *VirtualIPs) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *IP) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *IP) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbcatalog/v2beta1/vip.pb.go b/proto-public/pbcatalog/v2beta1/vip.pb.go
deleted file mode 100644
index f0774f08b3338..0000000000000
--- a/proto-public/pbcatalog/v2beta1/vip.pb.go
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbcatalog/v2beta1/vip.proto
-
-package catalogv2beta1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type VirtualIPs struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Ips []*IP `protobuf:"bytes,1,rep,name=ips,proto3" json:"ips,omitempty"`
-}
-
-func (x *VirtualIPs) Reset() {
-	*x = VirtualIPs{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_vip_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *VirtualIPs) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*VirtualIPs) ProtoMessage() {}
-
-func (x *VirtualIPs) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_vip_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use VirtualIPs.ProtoReflect.Descriptor instead.
-func (*VirtualIPs) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_vip_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *VirtualIPs) GetIps() []*IP {
-	if x != nil {
-		return x.Ips
-	}
-	return nil
-}
-
-type IP struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// address is the string IPv4 address.
-	// This could also store IPv6 in the future.
-	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-	// generated indicates whether Consul generated or it is user-provided
-	// (e.g. a ClusterIP of the Kubernetes service).
-	Generated bool `protobuf:"varint,2,opt,name=generated,proto3" json:"generated,omitempty"`
-}
-
-func (x *IP) Reset() {
-	*x = IP{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_vip_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IP) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IP) ProtoMessage() {}
-
-func (x *IP) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_vip_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IP.ProtoReflect.Descriptor instead.
-func (*IP) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_vip_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *IP) GetAddress() string {
-	if x != nil {
-		return x.Address
-	}
-	return ""
-}
-
-func (x *IP) GetGenerated() bool {
-	if x != nil {
-		return x.Generated
-	}
-	return false
-}
-
-var File_pbcatalog_v2beta1_vip_proto protoreflect.FileDescriptor
-
-var file_pbcatalog_v2beta1_vip_proto_rawDesc = []byte{
-	0x0a, 0x1b, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x76, 0x69, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a,
-	0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f,
-	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4c, 0x0a,
-	0x0a, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x49, 0x50, 0x73, 0x12, 0x36, 0x0a, 0x03, 0x69,
-	0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61,
-	0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x49, 0x50, 0x52, 0x03,
-	0x69, 0x70, 0x73, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0x3c, 0x0a, 0x02, 0x49,
-	0x50, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x67,
-	0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09,
-	0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x42, 0x9e, 0x02, 0x0a, 0x24, 0x63, 0x6f,
-	0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x42, 0x08, 0x56, 0x69, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x63, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x43, 0xaa,
-	0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c, 0x56, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67,
-	0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f,
-	0x67, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
-}
-
-var (
-	file_pbcatalog_v2beta1_vip_proto_rawDescOnce sync.Once
-	file_pbcatalog_v2beta1_vip_proto_rawDescData = file_pbcatalog_v2beta1_vip_proto_rawDesc
-)
-
-func file_pbcatalog_v2beta1_vip_proto_rawDescGZIP() []byte {
-	file_pbcatalog_v2beta1_vip_proto_rawDescOnce.Do(func() {
-		file_pbcatalog_v2beta1_vip_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbcatalog_v2beta1_vip_proto_rawDescData)
-	})
-	return file_pbcatalog_v2beta1_vip_proto_rawDescData
-}
-
-var file_pbcatalog_v2beta1_vip_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_pbcatalog_v2beta1_vip_proto_goTypes = []interface{}{
-	(*VirtualIPs)(nil), // 0: hashicorp.consul.catalog.v2beta1.VirtualIPs
-	(*IP)(nil),         // 1: hashicorp.consul.catalog.v2beta1.IP
-}
-var file_pbcatalog_v2beta1_vip_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.catalog.v2beta1.VirtualIPs.ips:type_name -> hashicorp.consul.catalog.v2beta1.IP
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
-}
-
-func init() { file_pbcatalog_v2beta1_vip_proto_init() }
-func file_pbcatalog_v2beta1_vip_proto_init() {
-	if File_pbcatalog_v2beta1_vip_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbcatalog_v2beta1_vip_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*VirtualIPs); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_vip_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IP); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbcatalog_v2beta1_vip_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbcatalog_v2beta1_vip_proto_goTypes,
-		DependencyIndexes: file_pbcatalog_v2beta1_vip_proto_depIdxs,
-		MessageInfos:      file_pbcatalog_v2beta1_vip_proto_msgTypes,
-	}.Build()
-	File_pbcatalog_v2beta1_vip_proto = out.File
-	file_pbcatalog_v2beta1_vip_proto_rawDesc = nil
-	file_pbcatalog_v2beta1_vip_proto_goTypes = nil
-	file_pbcatalog_v2beta1_vip_proto_depIdxs = nil
-}
diff --git a/proto-public/pbcatalog/v2beta1/vip.proto b/proto-public/pbcatalog/v2beta1/vip.proto
deleted file mode 100644
index 386ce58f16b98..0000000000000
--- a/proto-public/pbcatalog/v2beta1/vip.proto
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.catalog.v2beta1;
-
-import "pbresource/annotations.proto";
-
-message VirtualIPs {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  repeated IP ips = 1;
-}
-
-message IP {
-  // address is the string IPv4 address.
-  // This could also store IPv6 in the future.
-  string address = 1;
-
-  // generated indicates whether Consul generated or it is user-provided
-  // (e.g. a ClusterIP of the Kubernetes service).
-  bool generated = 2;
-}
diff --git a/proto-public/pbcatalog/v2beta1/workload.pb.binary.go b/proto-public/pbcatalog/v2beta1/workload.pb.binary.go
deleted file mode 100644
index cb083b46e7969..0000000000000
--- a/proto-public/pbcatalog/v2beta1/workload.pb.binary.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbcatalog/v2beta1/workload.proto
-
-package catalogv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Workload) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Workload) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *WorkloadAddress) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *WorkloadAddress) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *WorkloadPort) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *WorkloadPort) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Locality) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Locality) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbcatalog/v2beta1/workload.pb.go b/proto-public/pbcatalog/v2beta1/workload.pb.go
deleted file mode 100644
index fb2ffa773e46b..0000000000000
--- a/proto-public/pbcatalog/v2beta1/workload.pb.go
+++ /dev/null
@@ -1,523 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbcatalog/v2beta1/workload.proto
-
-package catalogv2beta1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// Workload is the representation of a unit of addressable work. This could
-// represent a process on a VM, a Kubernetes pod or something else entirely.
-type Workload struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// addresses has a list of all workload addresses. This should include
-	// LAN and WAN addresses as well as any addresses a proxy would need
-	// to bind to (if different from the default address).
-	Addresses []*WorkloadAddress `protobuf:"bytes,1,rep,name=addresses,proto3" json:"addresses,omitempty"`
-	// ports is a map from port name to workload port’s number and protocol.
-	Ports map[string]*WorkloadPort `protobuf:"bytes,2,rep,name=ports,proto3" json:"ports,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// node_name is the name of the node this workload belongs to.
-	NodeName string `protobuf:"bytes,3,opt,name=node_name,json=nodeName,proto3" json:"node_name,omitempty"`
-	// identity is the name of the workload identity this workload is associated with.
-	Identity string `protobuf:"bytes,4,opt,name=identity,proto3" json:"identity,omitempty"`
-	// Locality specifies workload locality.
-	Locality *Locality `protobuf:"bytes,5,opt,name=locality,proto3" json:"locality,omitempty"`
-	// deprecated: tags correspond to service tags that you can add to a service for DNS resolution.
-	//
-	// Deprecated: Marked as deprecated in pbcatalog/v2beta1/workload.proto.
-	Tags []string `protobuf:"bytes,6,rep,name=tags,proto3" json:"tags,omitempty"`
-	// deprecated: enable_tag_override indicates whether agents should be overriding tags during anti-entropy syncs.
-	//
-	// Deprecated: Marked as deprecated in pbcatalog/v2beta1/workload.proto.
-	EnableTagOverride bool `protobuf:"varint,7,opt,name=enable_tag_override,json=enableTagOverride,proto3" json:"enable_tag_override,omitempty"`
-	// deprecated: connect_native indicates whether this workload is connect native which will allow it to be
-	// part of MeshEndpoints without having the corresponding Proxy resource.
-	//
-	// Deprecated: Marked as deprecated in pbcatalog/v2beta1/workload.proto.
-	ConnectNative bool `protobuf:"varint,8,opt,name=connect_native,json=connectNative,proto3" json:"connect_native,omitempty"`
-}
-
-func (x *Workload) Reset() {
-	*x = Workload{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_workload_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Workload) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Workload) ProtoMessage() {}
-
-func (x *Workload) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_workload_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Workload.ProtoReflect.Descriptor instead.
-func (*Workload) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_workload_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Workload) GetAddresses() []*WorkloadAddress {
-	if x != nil {
-		return x.Addresses
-	}
-	return nil
-}
-
-func (x *Workload) GetPorts() map[string]*WorkloadPort {
-	if x != nil {
-		return x.Ports
-	}
-	return nil
-}
-
-func (x *Workload) GetNodeName() string {
-	if x != nil {
-		return x.NodeName
-	}
-	return ""
-}
-
-func (x *Workload) GetIdentity() string {
-	if x != nil {
-		return x.Identity
-	}
-	return ""
-}
-
-func (x *Workload) GetLocality() *Locality {
-	if x != nil {
-		return x.Locality
-	}
-	return nil
-}
-
-// Deprecated: Marked as deprecated in pbcatalog/v2beta1/workload.proto.
-func (x *Workload) GetTags() []string {
-	if x != nil {
-		return x.Tags
-	}
-	return nil
-}
-
-// Deprecated: Marked as deprecated in pbcatalog/v2beta1/workload.proto.
-func (x *Workload) GetEnableTagOverride() bool {
-	if x != nil {
-		return x.EnableTagOverride
-	}
-	return false
-}
-
-// Deprecated: Marked as deprecated in pbcatalog/v2beta1/workload.proto.
-func (x *Workload) GetConnectNative() bool {
-	if x != nil {
-		return x.ConnectNative
-	}
-	return false
-}
-
-type WorkloadAddress struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// host can be an IP, DNS name or a unix socket.
-	// If it's a unix socket, only one port can be provided.
-	Host string `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"`
-	// ports is a list of names of ports that this host binds to.
-	// If no ports are provided, we will assume all ports from the ports map.
-	Ports []string `protobuf:"bytes,2,rep,name=ports,proto3" json:"ports,omitempty"`
-	// external indicates whether this address should be used for external communication
-	// (aka a WAN address).
-	External bool `protobuf:"varint,3,opt,name=external,proto3" json:"external,omitempty"`
-}
-
-func (x *WorkloadAddress) Reset() {
-	*x = WorkloadAddress{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_workload_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WorkloadAddress) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WorkloadAddress) ProtoMessage() {}
-
-func (x *WorkloadAddress) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_workload_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WorkloadAddress.ProtoReflect.Descriptor instead.
-func (*WorkloadAddress) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_workload_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *WorkloadAddress) GetHost() string {
-	if x != nil {
-		return x.Host
-	}
-	return ""
-}
-
-func (x *WorkloadAddress) GetPorts() []string {
-	if x != nil {
-		return x.Ports
-	}
-	return nil
-}
-
-func (x *WorkloadAddress) GetExternal() bool {
-	if x != nil {
-		return x.External
-	}
-	return false
-}
-
-type WorkloadPort struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Port     uint32   `protobuf:"varint,1,opt,name=port,proto3" json:"port,omitempty"`
-	Protocol Protocol `protobuf:"varint,2,opt,name=protocol,proto3,enum=hashicorp.consul.catalog.v2beta1.Protocol" json:"protocol,omitempty"`
-}
-
-func (x *WorkloadPort) Reset() {
-	*x = WorkloadPort{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_workload_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WorkloadPort) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WorkloadPort) ProtoMessage() {}
-
-func (x *WorkloadPort) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_workload_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WorkloadPort.ProtoReflect.Descriptor instead.
-func (*WorkloadPort) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_workload_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *WorkloadPort) GetPort() uint32 {
-	if x != nil {
-		return x.Port
-	}
-	return 0
-}
-
-func (x *WorkloadPort) GetProtocol() Protocol {
-	if x != nil {
-		return x.Protocol
-	}
-	return Protocol_PROTOCOL_UNSPECIFIED
-}
-
-type Locality struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Region is region the zone belongs to.
-	Region string `protobuf:"bytes,1,opt,name=region,proto3" json:"region,omitempty"`
-	// Zone is the zone the entity is running in.
-	Zone string `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
-}
-
-func (x *Locality) Reset() {
-	*x = Locality{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_workload_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Locality) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Locality) ProtoMessage() {}
-
-func (x *Locality) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_workload_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Locality.ProtoReflect.Descriptor instead.
-func (*Locality) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_workload_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *Locality) GetRegion() string {
-	if x != nil {
-		return x.Region
-	}
-	return ""
-}
-
-func (x *Locality) GetZone() string {
-	if x != nil {
-		return x.Zone
-	}
-	return ""
-}
-
-var File_pbcatalog_v2beta1_workload_proto protoreflect.FileDescriptor
-
-var file_pbcatalog_v2beta1_workload_proto_rawDesc = []byte{
-	0x0a, 0x20, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x12, 0x20, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x1a, 0x20, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0x92, 0x04, 0x0a, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61,
-	0x64, 0x12, 0x4f, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64,
-	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x65, 0x73, 0x12, 0x4b, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x50, 0x6f,
-	0x72, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12,
-	0x1b, 0x0a, 0x09, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08,
-	0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-	0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x46, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61,
-	0x6c, 0x69, 0x74, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61,
-	0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4c, 0x6f,
-	0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79,
-	0x12, 0x16, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x42, 0x02,
-	0x18, 0x01, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x12, 0x32, 0x0a, 0x13, 0x65, 0x6e, 0x61, 0x62,
-	0x6c, 0x65, 0x5f, 0x74, 0x61, 0x67, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x11, 0x65, 0x6e, 0x61, 0x62, 0x6c,
-	0x65, 0x54, 0x61, 0x67, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x12, 0x29, 0x0a, 0x0e,
-	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x4e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x1a, 0x68, 0x0a, 0x0a, 0x50, 0x6f, 0x72, 0x74, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x44, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f,
-	0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f,
-	0x61, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0x57, 0x0a, 0x0f, 0x57, 0x6f, 0x72,
-	0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04,
-	0x68, 0x6f, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74,
-	0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x05, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x22, 0x6a, 0x0a, 0x0c, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x50, 0x6f,
-	0x72, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
-	0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x46, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61,
-	0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x63, 0x6f, 0x6c, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x22, 0x36,
-	0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65,
-	0x67, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x67, 0x69,
-	0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x7a, 0x6f, 0x6e, 0x65, 0x42, 0xa3, 0x02, 0x0a, 0x24, 0x63, 0x6f, 0x6d, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42,
-	0x0d, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x63, 0x61, 0x74,
-	0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x63, 0x61, 0x74,
-	0x61, 0x6c, 0x6f, 0x67, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43,
-	0x43, 0xaa, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x5c,
-	0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
-	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x43, 0x61, 0x74, 0x61,
-	0x6c, 0x6f, 0x67, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbcatalog_v2beta1_workload_proto_rawDescOnce sync.Once
-	file_pbcatalog_v2beta1_workload_proto_rawDescData = file_pbcatalog_v2beta1_workload_proto_rawDesc
-)
-
-func file_pbcatalog_v2beta1_workload_proto_rawDescGZIP() []byte {
-	file_pbcatalog_v2beta1_workload_proto_rawDescOnce.Do(func() {
-		file_pbcatalog_v2beta1_workload_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbcatalog_v2beta1_workload_proto_rawDescData)
-	})
-	return file_pbcatalog_v2beta1_workload_proto_rawDescData
-}
-
-var file_pbcatalog_v2beta1_workload_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_pbcatalog_v2beta1_workload_proto_goTypes = []interface{}{
-	(*Workload)(nil),        // 0: hashicorp.consul.catalog.v2beta1.Workload
-	(*WorkloadAddress)(nil), // 1: hashicorp.consul.catalog.v2beta1.WorkloadAddress
-	(*WorkloadPort)(nil),    // 2: hashicorp.consul.catalog.v2beta1.WorkloadPort
-	(*Locality)(nil),        // 3: hashicorp.consul.catalog.v2beta1.Locality
-	nil,                     // 4: hashicorp.consul.catalog.v2beta1.Workload.PortsEntry
-	(Protocol)(0),           // 5: hashicorp.consul.catalog.v2beta1.Protocol
-}
-var file_pbcatalog_v2beta1_workload_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.catalog.v2beta1.Workload.addresses:type_name -> hashicorp.consul.catalog.v2beta1.WorkloadAddress
-	4, // 1: hashicorp.consul.catalog.v2beta1.Workload.ports:type_name -> hashicorp.consul.catalog.v2beta1.Workload.PortsEntry
-	3, // 2: hashicorp.consul.catalog.v2beta1.Workload.locality:type_name -> hashicorp.consul.catalog.v2beta1.Locality
-	5, // 3: hashicorp.consul.catalog.v2beta1.WorkloadPort.protocol:type_name -> hashicorp.consul.catalog.v2beta1.Protocol
-	2, // 4: hashicorp.consul.catalog.v2beta1.Workload.PortsEntry.value:type_name -> hashicorp.consul.catalog.v2beta1.WorkloadPort
-	5, // [5:5] is the sub-list for method output_type
-	5, // [5:5] is the sub-list for method input_type
-	5, // [5:5] is the sub-list for extension type_name
-	5, // [5:5] is the sub-list for extension extendee
-	0, // [0:5] is the sub-list for field type_name
-}
-
-func init() { file_pbcatalog_v2beta1_workload_proto_init() }
-func file_pbcatalog_v2beta1_workload_proto_init() {
-	if File_pbcatalog_v2beta1_workload_proto != nil {
-		return
-	}
-	file_pbcatalog_v2beta1_protocol_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbcatalog_v2beta1_workload_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Workload); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_workload_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WorkloadAddress); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_workload_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WorkloadPort); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbcatalog_v2beta1_workload_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Locality); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbcatalog_v2beta1_workload_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   5,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbcatalog_v2beta1_workload_proto_goTypes,
-		DependencyIndexes: file_pbcatalog_v2beta1_workload_proto_depIdxs,
-		MessageInfos:      file_pbcatalog_v2beta1_workload_proto_msgTypes,
-	}.Build()
-	File_pbcatalog_v2beta1_workload_proto = out.File
-	file_pbcatalog_v2beta1_workload_proto_rawDesc = nil
-	file_pbcatalog_v2beta1_workload_proto_goTypes = nil
-	file_pbcatalog_v2beta1_workload_proto_depIdxs = nil
-}
diff --git a/proto-public/pbcatalog/v2beta1/workload.proto b/proto-public/pbcatalog/v2beta1/workload.proto
deleted file mode 100644
index 67dd8b72d2728..0000000000000
--- a/proto-public/pbcatalog/v2beta1/workload.proto
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.catalog.v2beta1;
-
-import "pbcatalog/v2beta1/protocol.proto";
-import "pbresource/annotations.proto";
-
-// Workload is the representation of a unit of addressable work. This could
-// represent a process on a VM, a Kubernetes pod or something else entirely.
-message Workload {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  // addresses has a list of all workload addresses. This should include
-  // LAN and WAN addresses as well as any addresses a proxy would need
-  // to bind to (if different from the default address).
-  repeated WorkloadAddress addresses = 1;
-
-  // ports is a map from port name to workload port’s number and protocol.
-  map<string, WorkloadPort> ports = 2;
-
-  // node_name is the name of the node this workload belongs to.
-  string node_name = 3;
-
-  // identity is the name of the workload identity this workload is associated with.
-  string identity = 4;
-
-  // Locality specifies workload locality.
-  Locality locality = 5;
-
-  // Below fields are deprecated but kept here for backward compatibility reasons.
-
-  // deprecated: tags correspond to service tags that you can add to a service for DNS resolution.
-  repeated string tags = 6 [deprecated = true];
-  // deprecated: enable_tag_override indicates whether agents should be overriding tags during anti-entropy syncs.
-  bool enable_tag_override = 7 [deprecated = true];
-  // deprecated: connect_native indicates whether this workload is connect native which will allow it to be
-  // part of MeshEndpoints without having the corresponding Proxy resource.
-  bool connect_native = 8 [deprecated = true];
-}
-
-message WorkloadAddress {
-  // host can be an IP, DNS name or a unix socket.
-  // If it's a unix socket, only one port can be provided.
-  string host = 1;
-
-  // ports is a list of names of ports that this host binds to.
-  // If no ports are provided, we will assume all ports from the ports map.
-  repeated string ports = 2;
-
-  // external indicates whether this address should be used for external communication
-  // (aka a WAN address).
-  bool external = 3;
-}
-
-message WorkloadPort {
-  uint32 port = 1;
-  Protocol protocol = 2;
-}
-
-message Locality {
-  // Region is region the zone belongs to.
-  string region = 1;
-
-  // Zone is the zone the entity is running in.
-  string zone = 2;
-}
diff --git a/proto-public/pbcatalog/v2beta1/workload_addon.go b/proto-public/pbcatalog/v2beta1/workload_addon.go
deleted file mode 100644
index 463e4eaa2208e..0000000000000
--- a/proto-public/pbcatalog/v2beta1/workload_addon.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package catalogv2beta1
-
-import "golang.org/x/exp/slices"
-
-func (w *Workload) GetMeshPortName() (string, bool) {
-	var meshPort string
-
-	for portName, port := range w.Ports {
-		if port.Protocol == Protocol_PROTOCOL_MESH {
-			meshPort = portName
-			return meshPort, true
-		}
-	}
-
-	return "", false
-}
-
-func (w *Workload) IsMeshEnabled() bool {
-	_, ok := w.GetMeshPortName()
-	return ok
-}
-
-func (w *Workload) GetNonExternalAddressesForPort(portName string) []*WorkloadAddress {
-	var addresses []*WorkloadAddress
-
-	for _, address := range w.Addresses {
-		if address.External {
-			// Skip external addresses.
-			continue
-		}
-
-		// If there are no ports, that means this port is selected.
-		// Otherwise, check if the port is explicitly selected by this address
-		if len(address.Ports) == 0 || slices.Contains(address.Ports, portName) {
-			addresses = append(addresses, address)
-		}
-	}
-
-	return addresses
-}
-
-func (w *Workload) GetPortsByProtocol() map[Protocol][]string {
-	if w == nil {
-		return nil
-	}
-
-	out := make(map[Protocol][]string, len(w.Ports))
-	for name, port := range w.Ports {
-		out[port.GetProtocol()] = append(out[port.GetProtocol()], name)
-	}
-
-	return out
-}
diff --git a/proto-public/pbcatalog/v2beta1/workload_addon_test.go b/proto-public/pbcatalog/v2beta1/workload_addon_test.go
deleted file mode 100644
index 9ce7f9c1dbaf2..0000000000000
--- a/proto-public/pbcatalog/v2beta1/workload_addon_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package catalogv2beta1
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestGetMeshPort(t *testing.T) {
-	cases := map[string]struct {
-		ports map[string]*WorkloadPort
-		exp   string
-	}{
-		"nil ports": {
-			ports: nil,
-			exp:   "",
-		},
-		"empty ports": {
-			ports: make(map[string]*WorkloadPort),
-			exp:   "",
-		},
-		"no mesh ports": {
-			ports: map[string]*WorkloadPort{
-				"p1": {Port: 1000, Protocol: Protocol_PROTOCOL_HTTP},
-				"p2": {Port: 2000, Protocol: Protocol_PROTOCOL_TCP},
-			},
-			exp: "",
-		},
-		"one mesh port": {
-			ports: map[string]*WorkloadPort{
-				"p1": {Port: 1000, Protocol: Protocol_PROTOCOL_HTTP},
-				"p2": {Port: 2000, Protocol: Protocol_PROTOCOL_TCP},
-				"p3": {Port: 3000, Protocol: Protocol_PROTOCOL_MESH},
-			},
-			exp: "p3",
-		},
-	}
-
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			workload := Workload{
-				Ports: c.ports,
-			}
-			meshPort, ok := workload.GetMeshPortName()
-			if c.exp != "" {
-				require.True(t, ok)
-				require.Equal(t, c.exp, meshPort)
-			}
-		})
-	}
-}
-
-func TestGetAddressesForPort(t *testing.T) {
-	cases := map[string]struct {
-		addresses    []*WorkloadAddress
-		portName     string
-		expAddresses []*WorkloadAddress
-	}{
-		"empty addresses": {
-			addresses:    nil,
-			portName:     "doesn't matter",
-			expAddresses: nil,
-		},
-		"addresses without selected port": {
-			addresses:    []*WorkloadAddress{{Host: "1.1.1.1"}},
-			portName:     "not-found",
-			expAddresses: nil,
-		},
-		"single selected addresses": {
-			addresses: []*WorkloadAddress{
-				{Host: "1.1.1.1", Ports: []string{"p1", "p2"}},
-				{Host: "2.2.2.2", Ports: []string{"p3", "p4"}},
-			},
-			portName: "p1",
-			expAddresses: []*WorkloadAddress{
-				{Host: "1.1.1.1", Ports: []string{"p1", "p2"}},
-			},
-		},
-		"multiple selected addresses": {
-			addresses: []*WorkloadAddress{
-				{Host: "1.1.1.1", Ports: []string{"p1", "p2"}},
-				{Host: "2.2.2.2", Ports: []string{"p3", "p4"}},
-				{Host: "3.3.3.3"},
-				{Host: "3.3.3.3", Ports: []string{"p1"}, External: true},
-			},
-			portName: "p1",
-			expAddresses: []*WorkloadAddress{
-				{Host: "1.1.1.1", Ports: []string{"p1", "p2"}},
-				{Host: "3.3.3.3"},
-			},
-		},
-	}
-
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			workload := Workload{
-				Addresses: c.addresses,
-			}
-
-			actualAddresses := workload.GetNonExternalAddressesForPort(c.portName)
-			require.Equal(t, actualAddresses, c.expAddresses)
-		})
-	}
-}
diff --git a/proto-public/pbconnectca/ca.pb.binary.go b/proto-public/pbconnectca/ca.pb.binary.go
index c7dea673936b7..5b5821c7acc14 100644
--- a/proto-public/pbconnectca/ca.pb.binary.go
+++ b/proto-public/pbconnectca/ca.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbconnectca/ca.proto
+// source: proto-public/pbconnectca/ca.proto
 
 package pbconnectca
 
diff --git a/proto-public/pbconnectca/ca.pb.go b/proto-public/pbconnectca/ca.pb.go
index b4312816f3105..6b487f2c5a19f 100644
--- a/proto-public/pbconnectca/ca.pb.go
+++ b/proto-public/pbconnectca/ca.pb.go
@@ -1,11 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
+// 	protoc-gen-go v1.28.1
 // 	protoc        (unknown)
-// source: pbconnectca/ca.proto
+// source: proto-public/pbconnectca/ca.proto
 
 package pbconnectca
 
@@ -34,7 +31,7 @@ type WatchRootsRequest struct {
 func (x *WatchRootsRequest) Reset() {
 	*x = WatchRootsRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbconnectca_ca_proto_msgTypes[0]
+		mi := &file_proto_public_pbconnectca_ca_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -47,7 +44,7 @@ func (x *WatchRootsRequest) String() string {
 func (*WatchRootsRequest) ProtoMessage() {}
 
 func (x *WatchRootsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbconnectca_ca_proto_msgTypes[0]
+	mi := &file_proto_public_pbconnectca_ca_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -60,7 +57,7 @@ func (x *WatchRootsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WatchRootsRequest.ProtoReflect.Descriptor instead.
 func (*WatchRootsRequest) Descriptor() ([]byte, []int) {
-	return file_pbconnectca_ca_proto_rawDescGZIP(), []int{0}
+	return file_proto_public_pbconnectca_ca_proto_rawDescGZIP(), []int{0}
 }
 
 type WatchRootsResponse struct {
@@ -87,7 +84,7 @@ type WatchRootsResponse struct {
 func (x *WatchRootsResponse) Reset() {
 	*x = WatchRootsResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbconnectca_ca_proto_msgTypes[1]
+		mi := &file_proto_public_pbconnectca_ca_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -100,7 +97,7 @@ func (x *WatchRootsResponse) String() string {
 func (*WatchRootsResponse) ProtoMessage() {}
 
 func (x *WatchRootsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pbconnectca_ca_proto_msgTypes[1]
+	mi := &file_proto_public_pbconnectca_ca_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -113,7 +110,7 @@ func (x *WatchRootsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WatchRootsResponse.ProtoReflect.Descriptor instead.
 func (*WatchRootsResponse) Descriptor() ([]byte, []int) {
-	return file_pbconnectca_ca_proto_rawDescGZIP(), []int{1}
+	return file_proto_public_pbconnectca_ca_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *WatchRootsResponse) GetActiveRootId() string {
@@ -175,7 +172,7 @@ type CARoot struct {
 func (x *CARoot) Reset() {
 	*x = CARoot{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbconnectca_ca_proto_msgTypes[2]
+		mi := &file_proto_public_pbconnectca_ca_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -188,7 +185,7 @@ func (x *CARoot) String() string {
 func (*CARoot) ProtoMessage() {}
 
 func (x *CARoot) ProtoReflect() protoreflect.Message {
-	mi := &file_pbconnectca_ca_proto_msgTypes[2]
+	mi := &file_proto_public_pbconnectca_ca_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -201,7 +198,7 @@ func (x *CARoot) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CARoot.ProtoReflect.Descriptor instead.
 func (*CARoot) Descriptor() ([]byte, []int) {
-	return file_pbconnectca_ca_proto_rawDescGZIP(), []int{2}
+	return file_proto_public_pbconnectca_ca_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *CARoot) GetId() string {
@@ -276,7 +273,7 @@ type SignRequest struct {
 func (x *SignRequest) Reset() {
 	*x = SignRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbconnectca_ca_proto_msgTypes[3]
+		mi := &file_proto_public_pbconnectca_ca_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -289,7 +286,7 @@ func (x *SignRequest) String() string {
 func (*SignRequest) ProtoMessage() {}
 
 func (x *SignRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbconnectca_ca_proto_msgTypes[3]
+	mi := &file_proto_public_pbconnectca_ca_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -302,7 +299,7 @@ func (x *SignRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SignRequest.ProtoReflect.Descriptor instead.
 func (*SignRequest) Descriptor() ([]byte, []int) {
-	return file_pbconnectca_ca_proto_rawDescGZIP(), []int{3}
+	return file_proto_public_pbconnectca_ca_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *SignRequest) GetCsr() string {
@@ -324,7 +321,7 @@ type SignResponse struct {
 func (x *SignResponse) Reset() {
 	*x = SignResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbconnectca_ca_proto_msgTypes[4]
+		mi := &file_proto_public_pbconnectca_ca_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -337,7 +334,7 @@ func (x *SignResponse) String() string {
 func (*SignResponse) ProtoMessage() {}
 
 func (x *SignResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pbconnectca_ca_proto_msgTypes[4]
+	mi := &file_proto_public_pbconnectca_ca_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -350,7 +347,7 @@ func (x *SignResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SignResponse.ProtoReflect.Descriptor instead.
 func (*SignResponse) Descriptor() ([]byte, []int) {
-	return file_pbconnectca_ca_proto_rawDescGZIP(), []int{4}
+	return file_proto_public_pbconnectca_ca_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *SignResponse) GetCertPem() string {
@@ -360,97 +357,99 @@ func (x *SignResponse) GetCertPem() string {
 	return ""
 }
 
-var File_pbconnectca_ca_proto protoreflect.FileDescriptor
-
-var file_pbconnectca_ca_proto_rawDesc = []byte{
-	0x0a, 0x14, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0x2f, 0x63, 0x61,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1a, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x63, 0x61, 0x1a, 0x25, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
-	0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69,
-	0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73,
-	0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x13, 0x0a, 0x11, 0x57, 0x61,
-	0x74, 0x63, 0x68, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22,
-	0x97, 0x01, 0x0a, 0x12, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x24, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65,
-	0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
-	0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x52, 0x6f, 0x6f, 0x74, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c,
-	0x74, 0x72, 0x75, 0x73, 0x74, 0x5f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0b, 0x74, 0x72, 0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12,
-	0x38, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0x2e, 0x43, 0x41, 0x52, 0x6f,
-	0x6f, 0x74, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x74, 0x73, 0x22, 0x9d, 0x02, 0x0a, 0x06, 0x43, 0x41,
-	0x52, 0x6f, 0x6f, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x65, 0x72, 0x69,
-	0x61, 0x6c, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52,
-	0x0c, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x24, 0x0a,
-	0x0e, 0x73, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x69, 0x64, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x4b, 0x65,
-	0x79, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x63, 0x65, 0x72, 0x74,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x6f, 0x6f, 0x74, 0x43, 0x65, 0x72, 0x74,
-	0x12, 0x2d, 0x0a, 0x12, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65,
-	0x5f, 0x63, 0x65, 0x72, 0x74, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x65, 0x72, 0x74, 0x73, 0x12,
-	0x16, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x06, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x12, 0x40, 0x0a, 0x0e, 0x72, 0x6f, 0x74, 0x61, 0x74,
-	0x65, 0x64, 0x5f, 0x6f, 0x75, 0x74, 0x5f, 0x61, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0c, 0x72, 0x6f, 0x74,
-	0x61, 0x74, 0x65, 0x64, 0x4f, 0x75, 0x74, 0x41, 0x74, 0x22, 0x1f, 0x0a, 0x0b, 0x53, 0x69, 0x67,
-	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x73, 0x72, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x73, 0x72, 0x22, 0x29, 0x0a, 0x0c, 0x53, 0x69,
-	0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x65,
-	0x72, 0x74, 0x5f, 0x70, 0x65, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65,
-	0x72, 0x74, 0x50, 0x65, 0x6d, 0x32, 0xf0, 0x01, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x43, 0x41, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x77, 0x0a, 0x0a, 0x57, 0x61,
-	0x74, 0x63, 0x68, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x12, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+var File_proto_public_pbconnectca_ca_proto protoreflect.FileDescriptor
+
+var file_proto_public_pbconnectca_ca_proto_rawDesc = []byte{
+	0x0a, 0x21, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70,
+	0x62, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0x2f, 0x63, 0x61, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x12, 0x1a, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0x1a,
+	0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x1a, 0x32, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x61,
+	0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c,
+	0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x22, 0x13, 0x0a, 0x11, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x6f, 0x6f,
+	0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x97, 0x01, 0x0a, 0x12, 0x57, 0x61,
+	0x74, 0x63, 0x68, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x24, 0x0a, 0x0e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x5f,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65,
+	0x52, 0x6f, 0x6f, 0x74, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x74, 0x72, 0x75, 0x73, 0x74, 0x5f,
+	0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x74, 0x72,
+	0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x38, 0x0a, 0x05, 0x72, 0x6f, 0x6f,
+	0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
 	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x63, 0x61, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x6f, 0x6f, 0x74, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x63, 0x61, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10,
-	0x03, 0x30, 0x01, 0x12, 0x63, 0x0a, 0x04, 0x53, 0x69, 0x67, 0x6e, 0x12, 0x27, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x65, 0x63, 0x74, 0x63, 0x61, 0x2e, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74, 0x52, 0x05, 0x72, 0x6f,
+	0x6f, 0x74, 0x73, 0x22, 0x9d, 0x02, 0x0a, 0x06, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x0e,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12,
+	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x5f, 0x6e, 0x75, 0x6d,
+	0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x73, 0x65, 0x72, 0x69, 0x61,
+	0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x69, 0x67, 0x6e, 0x69,
+	0x6e, 0x67, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0c, 0x73, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x12, 0x1b, 0x0a,
+	0x09, 0x72, 0x6f, 0x6f, 0x74, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x72, 0x6f, 0x6f, 0x74, 0x43, 0x65, 0x72, 0x74, 0x12, 0x2d, 0x0a, 0x12, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x73,
+	0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6d, 0x65, 0x64,
+	0x69, 0x61, 0x74, 0x65, 0x43, 0x65, 0x72, 0x74, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x63, 0x74,
+	0x69, 0x76, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x76,
+	0x65, 0x12, 0x40, 0x0a, 0x0e, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6f, 0x75, 0x74,
+	0x5f, 0x61, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65,
+	0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0c, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x64, 0x4f, 0x75,
+	0x74, 0x41, 0x74, 0x22, 0x1f, 0x0a, 0x0b, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x73, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x63, 0x73, 0x72, 0x22, 0x29, 0x0a, 0x0c, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x70, 0x65, 0x6d,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x65, 0x72, 0x74, 0x50, 0x65, 0x6d, 0x32,
+	0xec, 0x01, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x43, 0x41, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x12, 0x75, 0x0a, 0x0a, 0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x6f, 0x6f,
+	0x74, 0x73, 0x12, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0x2e,
+	0x57, 0x61, 0x74, 0x63, 0x68, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0x2e, 0x57,
+	0x61, 0x74, 0x63, 0x68, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08, 0x02, 0x30, 0x01, 0x12, 0x61, 0x0a, 0x04, 0x53,
+	0x69, 0x67, 0x6e, 0x12, 0x27, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61,
+	0x2e, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08, 0x03, 0x42, 0xe9,
+	0x01, 0x0a, 0x1e, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
 	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63,
-	0x61, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08,
-	0xe2, 0x86, 0x04, 0x04, 0x08, 0x03, 0x10, 0x03, 0x42, 0xe9, 0x01, 0x0a, 0x1e, 0x63, 0x6f, 0x6d,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0x42, 0x07, 0x43, 0x61, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
-	0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0xa2, 0x02, 0x03, 0x48,
-	0x43, 0x43, 0xaa, 0x02, 0x1a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0xca,
-	0x02, 0x1a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x5c, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0xe2, 0x02, 0x26, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c,
-	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74,
-	0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x63, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x42, 0x07, 0x43, 0x61, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x34, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d,
+	0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x63, 0x61, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x43, 0xaa, 0x02, 0x1a, 0x48, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x63, 0x61, 0xca, 0x02, 0x1a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x63, 0x61, 0xe2, 0x02, 0x26, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0x5c,
+	0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1c, 0x48, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a,
+	0x3a, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x63, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
-	file_pbconnectca_ca_proto_rawDescOnce sync.Once
-	file_pbconnectca_ca_proto_rawDescData = file_pbconnectca_ca_proto_rawDesc
+	file_proto_public_pbconnectca_ca_proto_rawDescOnce sync.Once
+	file_proto_public_pbconnectca_ca_proto_rawDescData = file_proto_public_pbconnectca_ca_proto_rawDesc
 )
 
-func file_pbconnectca_ca_proto_rawDescGZIP() []byte {
-	file_pbconnectca_ca_proto_rawDescOnce.Do(func() {
-		file_pbconnectca_ca_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbconnectca_ca_proto_rawDescData)
+func file_proto_public_pbconnectca_ca_proto_rawDescGZIP() []byte {
+	file_proto_public_pbconnectca_ca_proto_rawDescOnce.Do(func() {
+		file_proto_public_pbconnectca_ca_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_public_pbconnectca_ca_proto_rawDescData)
 	})
-	return file_pbconnectca_ca_proto_rawDescData
+	return file_proto_public_pbconnectca_ca_proto_rawDescData
 }
 
-var file_pbconnectca_ca_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_pbconnectca_ca_proto_goTypes = []interface{}{
+var file_proto_public_pbconnectca_ca_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_proto_public_pbconnectca_ca_proto_goTypes = []interface{}{
 	(*WatchRootsRequest)(nil),     // 0: hashicorp.consul.connectca.WatchRootsRequest
 	(*WatchRootsResponse)(nil),    // 1: hashicorp.consul.connectca.WatchRootsResponse
 	(*CARoot)(nil),                // 2: hashicorp.consul.connectca.CARoot
@@ -458,7 +457,7 @@ var file_pbconnectca_ca_proto_goTypes = []interface{}{
 	(*SignResponse)(nil),          // 4: hashicorp.consul.connectca.SignResponse
 	(*timestamppb.Timestamp)(nil), // 5: google.protobuf.Timestamp
 }
-var file_pbconnectca_ca_proto_depIdxs = []int32{
+var file_proto_public_pbconnectca_ca_proto_depIdxs = []int32{
 	2, // 0: hashicorp.consul.connectca.WatchRootsResponse.roots:type_name -> hashicorp.consul.connectca.CARoot
 	5, // 1: hashicorp.consul.connectca.CARoot.rotated_out_at:type_name -> google.protobuf.Timestamp
 	0, // 2: hashicorp.consul.connectca.ConnectCAService.WatchRoots:input_type -> hashicorp.consul.connectca.WatchRootsRequest
@@ -472,13 +471,13 @@ var file_pbconnectca_ca_proto_depIdxs = []int32{
 	0, // [0:2] is the sub-list for field type_name
 }
 
-func init() { file_pbconnectca_ca_proto_init() }
-func file_pbconnectca_ca_proto_init() {
-	if File_pbconnectca_ca_proto != nil {
+func init() { file_proto_public_pbconnectca_ca_proto_init() }
+func file_proto_public_pbconnectca_ca_proto_init() {
+	if File_proto_public_pbconnectca_ca_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_pbconnectca_ca_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbconnectca_ca_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*WatchRootsRequest); i {
 			case 0:
 				return &v.state
@@ -490,7 +489,7 @@ func file_pbconnectca_ca_proto_init() {
 				return nil
 			}
 		}
-		file_pbconnectca_ca_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbconnectca_ca_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*WatchRootsResponse); i {
 			case 0:
 				return &v.state
@@ -502,7 +501,7 @@ func file_pbconnectca_ca_proto_init() {
 				return nil
 			}
 		}
-		file_pbconnectca_ca_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbconnectca_ca_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CARoot); i {
 			case 0:
 				return &v.state
@@ -514,7 +513,7 @@ func file_pbconnectca_ca_proto_init() {
 				return nil
 			}
 		}
-		file_pbconnectca_ca_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbconnectca_ca_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SignRequest); i {
 			case 0:
 				return &v.state
@@ -526,7 +525,7 @@ func file_pbconnectca_ca_proto_init() {
 				return nil
 			}
 		}
-		file_pbconnectca_ca_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbconnectca_ca_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SignResponse); i {
 			case 0:
 				return &v.state
@@ -543,18 +542,18 @@ func file_pbconnectca_ca_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbconnectca_ca_proto_rawDesc,
+			RawDescriptor: file_proto_public_pbconnectca_ca_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   5,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_pbconnectca_ca_proto_goTypes,
-		DependencyIndexes: file_pbconnectca_ca_proto_depIdxs,
-		MessageInfos:      file_pbconnectca_ca_proto_msgTypes,
+		GoTypes:           file_proto_public_pbconnectca_ca_proto_goTypes,
+		DependencyIndexes: file_proto_public_pbconnectca_ca_proto_depIdxs,
+		MessageInfos:      file_proto_public_pbconnectca_ca_proto_msgTypes,
 	}.Build()
-	File_pbconnectca_ca_proto = out.File
-	file_pbconnectca_ca_proto_rawDesc = nil
-	file_pbconnectca_ca_proto_goTypes = nil
-	file_pbconnectca_ca_proto_depIdxs = nil
+	File_proto_public_pbconnectca_ca_proto = out.File
+	file_proto_public_pbconnectca_ca_proto_rawDesc = nil
+	file_proto_public_pbconnectca_ca_proto_goTypes = nil
+	file_proto_public_pbconnectca_ca_proto_depIdxs = nil
 }
diff --git a/proto-public/pbconnectca/ca.proto b/proto-public/pbconnectca/ca.proto
index 9458e83478d90..0184bfc4aa3df 100644
--- a/proto-public/pbconnectca/ca.proto
+++ b/proto-public/pbconnectca/ca.proto
@@ -1,12 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 package hashicorp.consul.connectca;
 
-import "annotations/ratelimit/ratelimit.proto";
 import "google/protobuf/timestamp.proto";
+import "proto-public/annotations/ratelimit/ratelimit.proto";
 
 service ConnectCAService {
   // WatchRoots provides a stream on which you can receive the list of active
@@ -15,7 +12,6 @@ service ConnectCAService {
   rpc WatchRoots(WatchRootsRequest) returns (stream WatchRootsResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_CONNECT_CA
     };
   }
 
@@ -24,7 +20,6 @@ service ConnectCAService {
   rpc Sign(SignRequest) returns (SignResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_WRITE,
-      operation_category: OPERATION_CATEGORY_CONNECT_CA
     };
   }
 }
diff --git a/proto-public/pbconnectca/ca_grpc.pb.go b/proto-public/pbconnectca/ca_grpc.pb.go
index a4a9db6a1aef6..58669becbcdd6 100644
--- a/proto-public/pbconnectca/ca_grpc.pb.go
+++ b/proto-public/pbconnectca/ca_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             (unknown)
-// source: pbconnectca/ca.proto
+// source: proto-public/pbconnectca/ca.proto
 
 package pbconnectca
 
@@ -173,5 +173,5 @@ var ConnectCAService_ServiceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "pbconnectca/ca.proto",
+	Metadata: "proto-public/pbconnectca/ca.proto",
 }
diff --git a/proto-public/pbdataplane/dataplane.pb.binary.go b/proto-public/pbdataplane/dataplane.pb.binary.go
index 1cf43d3ab2f35..6a754a0f221a5 100644
--- a/proto-public/pbdataplane/dataplane.pb.binary.go
+++ b/proto-public/pbdataplane/dataplane.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbdataplane/dataplane.proto
+// source: proto-public/pbdataplane/dataplane.proto
 
 package pbdataplane
 
diff --git a/proto-public/pbdataplane/dataplane.pb.go b/proto-public/pbdataplane/dataplane.pb.go
index faa826994768a..c989f6df31e68 100644
--- a/proto-public/pbdataplane/dataplane.pb.go
+++ b/proto-public/pbdataplane/dataplane.pb.go
@@ -1,19 +1,15 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Package dataplane provides a service on Consul servers for the Consul Dataplane
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
+// 	protoc-gen-go v1.28.1
 // 	protoc        (unknown)
-// source: pbdataplane/dataplane.proto
+// source: proto-public/pbdataplane/dataplane.proto
 
 package pbdataplane
 
 import (
 	_ "github.com/hashicorp/consul/proto-public/annotations/ratelimit"
-	v2beta1 "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	structpb "google.golang.org/protobuf/types/known/structpb"
@@ -35,7 +31,6 @@ const (
 	DataplaneFeatures_DATAPLANE_FEATURES_WATCH_SERVERS                 DataplaneFeatures = 1
 	DataplaneFeatures_DATAPLANE_FEATURES_EDGE_CERTIFICATE_MANAGEMENT   DataplaneFeatures = 2
 	DataplaneFeatures_DATAPLANE_FEATURES_ENVOY_BOOTSTRAP_CONFIGURATION DataplaneFeatures = 3
-	DataplaneFeatures_DATAPLANE_FEATURES_FIPS                          DataplaneFeatures = 4
 )
 
 // Enum value maps for DataplaneFeatures.
@@ -45,14 +40,12 @@ var (
 		1: "DATAPLANE_FEATURES_WATCH_SERVERS",
 		2: "DATAPLANE_FEATURES_EDGE_CERTIFICATE_MANAGEMENT",
 		3: "DATAPLANE_FEATURES_ENVOY_BOOTSTRAP_CONFIGURATION",
-		4: "DATAPLANE_FEATURES_FIPS",
 	}
 	DataplaneFeatures_value = map[string]int32{
 		"DATAPLANE_FEATURES_UNSPECIFIED":                   0,
 		"DATAPLANE_FEATURES_WATCH_SERVERS":                 1,
 		"DATAPLANE_FEATURES_EDGE_CERTIFICATE_MANAGEMENT":   2,
 		"DATAPLANE_FEATURES_ENVOY_BOOTSTRAP_CONFIGURATION": 3,
-		"DATAPLANE_FEATURES_FIPS":                          4,
 	}
 )
 
@@ -67,11 +60,11 @@ func (x DataplaneFeatures) String() string {
 }
 
 func (DataplaneFeatures) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbdataplane_dataplane_proto_enumTypes[0].Descriptor()
+	return file_proto_public_pbdataplane_dataplane_proto_enumTypes[0].Descriptor()
 }
 
 func (DataplaneFeatures) Type() protoreflect.EnumType {
-	return &file_pbdataplane_dataplane_proto_enumTypes[0]
+	return &file_proto_public_pbdataplane_dataplane_proto_enumTypes[0]
 }
 
 func (x DataplaneFeatures) Number() protoreflect.EnumNumber {
@@ -80,7 +73,7 @@ func (x DataplaneFeatures) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use DataplaneFeatures.Descriptor instead.
 func (DataplaneFeatures) EnumDescriptor() ([]byte, []int) {
-	return file_pbdataplane_dataplane_proto_rawDescGZIP(), []int{0}
+	return file_proto_public_pbdataplane_dataplane_proto_rawDescGZIP(), []int{0}
 }
 
 type ServiceKind int32
@@ -147,11 +140,11 @@ func (x ServiceKind) String() string {
 }
 
 func (ServiceKind) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbdataplane_dataplane_proto_enumTypes[1].Descriptor()
+	return file_proto_public_pbdataplane_dataplane_proto_enumTypes[1].Descriptor()
 }
 
 func (ServiceKind) Type() protoreflect.EnumType {
-	return &file_pbdataplane_dataplane_proto_enumTypes[1]
+	return &file_proto_public_pbdataplane_dataplane_proto_enumTypes[1]
 }
 
 func (x ServiceKind) Number() protoreflect.EnumNumber {
@@ -160,7 +153,7 @@ func (x ServiceKind) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use ServiceKind.Descriptor instead.
 func (ServiceKind) EnumDescriptor() ([]byte, []int) {
-	return file_pbdataplane_dataplane_proto_rawDescGZIP(), []int{1}
+	return file_proto_public_pbdataplane_dataplane_proto_rawDescGZIP(), []int{1}
 }
 
 type GetSupportedDataplaneFeaturesRequest struct {
@@ -172,7 +165,7 @@ type GetSupportedDataplaneFeaturesRequest struct {
 func (x *GetSupportedDataplaneFeaturesRequest) Reset() {
 	*x = GetSupportedDataplaneFeaturesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbdataplane_dataplane_proto_msgTypes[0]
+		mi := &file_proto_public_pbdataplane_dataplane_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -185,7 +178,7 @@ func (x *GetSupportedDataplaneFeaturesRequest) String() string {
 func (*GetSupportedDataplaneFeaturesRequest) ProtoMessage() {}
 
 func (x *GetSupportedDataplaneFeaturesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbdataplane_dataplane_proto_msgTypes[0]
+	mi := &file_proto_public_pbdataplane_dataplane_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -198,7 +191,7 @@ func (x *GetSupportedDataplaneFeaturesRequest) ProtoReflect() protoreflect.Messa
 
 // Deprecated: Use GetSupportedDataplaneFeaturesRequest.ProtoReflect.Descriptor instead.
 func (*GetSupportedDataplaneFeaturesRequest) Descriptor() ([]byte, []int) {
-	return file_pbdataplane_dataplane_proto_rawDescGZIP(), []int{0}
+	return file_proto_public_pbdataplane_dataplane_proto_rawDescGZIP(), []int{0}
 }
 
 type DataplaneFeatureSupport struct {
@@ -213,7 +206,7 @@ type DataplaneFeatureSupport struct {
 func (x *DataplaneFeatureSupport) Reset() {
 	*x = DataplaneFeatureSupport{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbdataplane_dataplane_proto_msgTypes[1]
+		mi := &file_proto_public_pbdataplane_dataplane_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -226,7 +219,7 @@ func (x *DataplaneFeatureSupport) String() string {
 func (*DataplaneFeatureSupport) ProtoMessage() {}
 
 func (x *DataplaneFeatureSupport) ProtoReflect() protoreflect.Message {
-	mi := &file_pbdataplane_dataplane_proto_msgTypes[1]
+	mi := &file_proto_public_pbdataplane_dataplane_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -239,7 +232,7 @@ func (x *DataplaneFeatureSupport) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DataplaneFeatureSupport.ProtoReflect.Descriptor instead.
 func (*DataplaneFeatureSupport) Descriptor() ([]byte, []int) {
-	return file_pbdataplane_dataplane_proto_rawDescGZIP(), []int{1}
+	return file_proto_public_pbdataplane_dataplane_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *DataplaneFeatureSupport) GetFeatureName() DataplaneFeatures {
@@ -267,7 +260,7 @@ type GetSupportedDataplaneFeaturesResponse struct {
 func (x *GetSupportedDataplaneFeaturesResponse) Reset() {
 	*x = GetSupportedDataplaneFeaturesResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbdataplane_dataplane_proto_msgTypes[2]
+		mi := &file_proto_public_pbdataplane_dataplane_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -280,7 +273,7 @@ func (x *GetSupportedDataplaneFeaturesResponse) String() string {
 func (*GetSupportedDataplaneFeaturesResponse) ProtoMessage() {}
 
 func (x *GetSupportedDataplaneFeaturesResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pbdataplane_dataplane_proto_msgTypes[2]
+	mi := &file_proto_public_pbdataplane_dataplane_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -293,7 +286,7 @@ func (x *GetSupportedDataplaneFeaturesResponse) ProtoReflect() protoreflect.Mess
 
 // Deprecated: Use GetSupportedDataplaneFeaturesResponse.ProtoReflect.Descriptor instead.
 func (*GetSupportedDataplaneFeaturesResponse) Descriptor() ([]byte, []int) {
-	return file_pbdataplane_dataplane_proto_rawDescGZIP(), []int{2}
+	return file_proto_public_pbdataplane_dataplane_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *GetSupportedDataplaneFeaturesResponse) GetSupportedDataplaneFeatures() []*DataplaneFeatureSupport {
@@ -314,10 +307,7 @@ type GetEnvoyBootstrapParamsRequest struct {
 	//	*GetEnvoyBootstrapParamsRequest_NodeName
 	NodeSpec isGetEnvoyBootstrapParamsRequest_NodeSpec `protobuf_oneof:"node_spec"`
 	// The proxy service ID
-	//
-	// Deprecated: Marked as deprecated in pbdataplane/dataplane.proto.
 	ServiceId string `protobuf:"bytes,3,opt,name=service_id,json=serviceId,proto3" json:"service_id,omitempty"`
-	ProxyId   string `protobuf:"bytes,6,opt,name=proxy_id,json=proxyId,proto3" json:"proxy_id,omitempty"`
 	Partition string `protobuf:"bytes,4,opt,name=partition,proto3" json:"partition,omitempty"`
 	Namespace string `protobuf:"bytes,5,opt,name=namespace,proto3" json:"namespace,omitempty"`
 }
@@ -325,7 +315,7 @@ type GetEnvoyBootstrapParamsRequest struct {
 func (x *GetEnvoyBootstrapParamsRequest) Reset() {
 	*x = GetEnvoyBootstrapParamsRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbdataplane_dataplane_proto_msgTypes[3]
+		mi := &file_proto_public_pbdataplane_dataplane_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -338,7 +328,7 @@ func (x *GetEnvoyBootstrapParamsRequest) String() string {
 func (*GetEnvoyBootstrapParamsRequest) ProtoMessage() {}
 
 func (x *GetEnvoyBootstrapParamsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbdataplane_dataplane_proto_msgTypes[3]
+	mi := &file_proto_public_pbdataplane_dataplane_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -351,7 +341,7 @@ func (x *GetEnvoyBootstrapParamsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetEnvoyBootstrapParamsRequest.ProtoReflect.Descriptor instead.
 func (*GetEnvoyBootstrapParamsRequest) Descriptor() ([]byte, []int) {
-	return file_pbdataplane_dataplane_proto_rawDescGZIP(), []int{3}
+	return file_proto_public_pbdataplane_dataplane_proto_rawDescGZIP(), []int{3}
 }
 
 func (m *GetEnvoyBootstrapParamsRequest) GetNodeSpec() isGetEnvoyBootstrapParamsRequest_NodeSpec {
@@ -375,7 +365,6 @@ func (x *GetEnvoyBootstrapParamsRequest) GetNodeName() string {
 	return ""
 }
 
-// Deprecated: Marked as deprecated in pbdataplane/dataplane.proto.
 func (x *GetEnvoyBootstrapParamsRequest) GetServiceId() string {
 	if x != nil {
 		return x.ServiceId
@@ -383,13 +372,6 @@ func (x *GetEnvoyBootstrapParamsRequest) GetServiceId() string {
 	return ""
 }
 
-func (x *GetEnvoyBootstrapParamsRequest) GetProxyId() string {
-	if x != nil {
-		return x.ProxyId
-	}
-	return ""
-}
-
 func (x *GetEnvoyBootstrapParamsRequest) GetPartition() string {
 	if x != nil {
 		return x.Partition
@@ -425,34 +407,25 @@ type GetEnvoyBootstrapParamsResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// deprecated: use identity instead.
-	// service is used to identify the service (as the local cluster name and
+	ServiceKind ServiceKind `protobuf:"varint,1,opt,name=service_kind,json=serviceKind,proto3,enum=hashicorp.consul.dataplane.ServiceKind" json:"service_kind,omitempty"`
+	// service is be used to identify the service (as the local cluster name and
 	// in metric tags). If the service is a connect proxy it will be the name of
 	// the proxy's destination service, for gateways it will be the gateway
 	// service's name.
-	//
-	// Deprecated: Marked as deprecated in pbdataplane/dataplane.proto.
-	Service string `protobuf:"bytes,2,opt,name=service,proto3" json:"service,omitempty"`
-	// identity is used to identify this proxy (as the local cluster name and
-	// in metric tags). For v1, this should be the service name.
-	// If the service is a connect proxy it will be the name of
-	// the proxy's destination service, for gateways it will be the gateway
-	// service's name.
-	// For v2, this should be the workload identity name.
-	Identity        string                   `protobuf:"bytes,10,opt,name=identity,proto3" json:"identity,omitempty"`
-	Namespace       string                   `protobuf:"bytes,3,opt,name=namespace,proto3" json:"namespace,omitempty"`
-	Partition       string                   `protobuf:"bytes,4,opt,name=partition,proto3" json:"partition,omitempty"`
-	Datacenter      string                   `protobuf:"bytes,5,opt,name=datacenter,proto3" json:"datacenter,omitempty"`
-	Config          *structpb.Struct         `protobuf:"bytes,6,opt,name=config,proto3" json:"config,omitempty"`
-	BootstrapConfig *v2beta1.BootstrapConfig `protobuf:"bytes,11,opt,name=bootstrap_config,json=bootstrapConfig,proto3" json:"bootstrap_config,omitempty"`
-	NodeName        string                   `protobuf:"bytes,8,opt,name=node_name,json=nodeName,proto3" json:"node_name,omitempty"`
-	AccessLogs      []string                 `protobuf:"bytes,9,rep,name=access_logs,json=accessLogs,proto3" json:"access_logs,omitempty"`
+	Service    string           `protobuf:"bytes,2,opt,name=service,proto3" json:"service,omitempty"`
+	Namespace  string           `protobuf:"bytes,3,opt,name=namespace,proto3" json:"namespace,omitempty"`
+	Partition  string           `protobuf:"bytes,4,opt,name=partition,proto3" json:"partition,omitempty"`
+	Datacenter string           `protobuf:"bytes,5,opt,name=datacenter,proto3" json:"datacenter,omitempty"`
+	Config     *structpb.Struct `protobuf:"bytes,6,opt,name=config,proto3" json:"config,omitempty"`
+	NodeId     string           `protobuf:"bytes,7,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty"`
+	NodeName   string           `protobuf:"bytes,8,opt,name=node_name,json=nodeName,proto3" json:"node_name,omitempty"`
+	AccessLogs []string         `protobuf:"bytes,9,rep,name=access_logs,json=accessLogs,proto3" json:"access_logs,omitempty"`
 }
 
 func (x *GetEnvoyBootstrapParamsResponse) Reset() {
 	*x = GetEnvoyBootstrapParamsResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbdataplane_dataplane_proto_msgTypes[4]
+		mi := &file_proto_public_pbdataplane_dataplane_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -465,7 +438,7 @@ func (x *GetEnvoyBootstrapParamsResponse) String() string {
 func (*GetEnvoyBootstrapParamsResponse) ProtoMessage() {}
 
 func (x *GetEnvoyBootstrapParamsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pbdataplane_dataplane_proto_msgTypes[4]
+	mi := &file_proto_public_pbdataplane_dataplane_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -478,20 +451,19 @@ func (x *GetEnvoyBootstrapParamsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetEnvoyBootstrapParamsResponse.ProtoReflect.Descriptor instead.
 func (*GetEnvoyBootstrapParamsResponse) Descriptor() ([]byte, []int) {
-	return file_pbdataplane_dataplane_proto_rawDescGZIP(), []int{4}
+	return file_proto_public_pbdataplane_dataplane_proto_rawDescGZIP(), []int{4}
 }
 
-// Deprecated: Marked as deprecated in pbdataplane/dataplane.proto.
-func (x *GetEnvoyBootstrapParamsResponse) GetService() string {
+func (x *GetEnvoyBootstrapParamsResponse) GetServiceKind() ServiceKind {
 	if x != nil {
-		return x.Service
+		return x.ServiceKind
 	}
-	return ""
+	return ServiceKind_SERVICE_KIND_UNSPECIFIED
 }
 
-func (x *GetEnvoyBootstrapParamsResponse) GetIdentity() string {
+func (x *GetEnvoyBootstrapParamsResponse) GetService() string {
 	if x != nil {
-		return x.Identity
+		return x.Service
 	}
 	return ""
 }
@@ -524,11 +496,11 @@ func (x *GetEnvoyBootstrapParamsResponse) GetConfig() *structpb.Struct {
 	return nil
 }
 
-func (x *GetEnvoyBootstrapParamsResponse) GetBootstrapConfig() *v2beta1.BootstrapConfig {
+func (x *GetEnvoyBootstrapParamsResponse) GetNodeId() string {
 	if x != nil {
-		return x.BootstrapConfig
+		return x.NodeId
 	}
-	return nil
+	return ""
 }
 
 func (x *GetEnvoyBootstrapParamsResponse) GetNodeName() string {
@@ -545,20 +517,19 @@ func (x *GetEnvoyBootstrapParamsResponse) GetAccessLogs() []string {
 	return nil
 }
 
-var File_pbdataplane_dataplane_proto protoreflect.FileDescriptor
+var File_proto_public_pbdataplane_dataplane_proto protoreflect.FileDescriptor
 
-var file_pbdataplane_dataplane_proto_rawDesc = []byte{
-	0x0a, 0x1b, 0x70, 0x62, 0x64, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x64, 0x61,
-	0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1a, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x64, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x1a, 0x25, 0x61, 0x6e, 0x6e, 0x6f, 0x74,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74,
-	0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x28,
-	0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x26, 0x0a, 0x24, 0x47, 0x65, 0x74, 0x53,
+var file_proto_public_pbdataplane_dataplane_proto_rawDesc = []byte{
+	0x0a, 0x28, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70,
+	0x62, 0x64, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1a, 0x68, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x64, 0x61, 0x74,
+	0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x32, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c,
+	0x69, 0x63, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72,
+	0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d,
+	0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x26, 0x0a, 0x24, 0x47, 0x65, 0x74, 0x53,
 	0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e,
 	0x65, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
 	0x22, 0x89, 0x01, 0x0a, 0x17, 0x44, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x46, 0x65,
@@ -579,88 +550,82 @@ var file_pbdataplane_dataplane_proto_rawDesc = []byte{
 	0x64, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x70, 0x6c,
 	0x61, 0x6e, 0x65, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72,
 	0x74, 0x52, 0x1a, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, 0xe1, 0x01,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, 0xc2, 0x01,
 	0x0a, 0x1e, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74,
 	0x72, 0x61, 0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
 	0x12, 0x19, 0x0a, 0x07, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x48, 0x00, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x09, 0x6e,
 	0x6f, 0x64, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00,
-	0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x0a, 0x73, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02,
-	0x18, 0x01, 0x52, 0x09, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x19, 0x0a,
-	0x08, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x74,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x72,
-	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x42, 0x0b, 0x0a, 0x09, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x73, 0x70, 0x65,
-	0x63, 0x22, 0x8d, 0x03, 0x0a, 0x1f, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x42, 0x6f,
-	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x07, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18,
-	0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12,
-	0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a,
-	0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x64,
-	0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x64, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x2f, 0x0a, 0x06, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74,
-	0x72, 0x75, 0x63, 0x74, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x59, 0x0a, 0x10,
-	0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61,
-	0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x6f, 0x64, 0x65, 0x5f,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65,
-	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c,
-	0x6f, 0x67, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73,
-	0x73, 0x4c, 0x6f, 0x67, 0x73, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a, 0x04, 0x08, 0x07, 0x10,
-	0x08, 0x2a, 0xe4, 0x01, 0x0a, 0x11, 0x44, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x46,
-	0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x22, 0x0a, 0x1e, 0x44, 0x41, 0x54, 0x41, 0x50,
-	0x4c, 0x41, 0x4e, 0x45, 0x5f, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52, 0x45, 0x53, 0x5f, 0x55, 0x4e,
-	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x20, 0x44,
-	0x41, 0x54, 0x41, 0x50, 0x4c, 0x41, 0x4e, 0x45, 0x5f, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52, 0x45,
-	0x53, 0x5f, 0x57, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x53, 0x10,
-	0x01, 0x12, 0x32, 0x0a, 0x2e, 0x44, 0x41, 0x54, 0x41, 0x50, 0x4c, 0x41, 0x4e, 0x45, 0x5f, 0x46,
-	0x45, 0x41, 0x54, 0x55, 0x52, 0x45, 0x53, 0x5f, 0x45, 0x44, 0x47, 0x45, 0x5f, 0x43, 0x45, 0x52,
-	0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x5f, 0x4d, 0x41, 0x4e, 0x41, 0x47, 0x45, 0x4d,
-	0x45, 0x4e, 0x54, 0x10, 0x02, 0x12, 0x34, 0x0a, 0x30, 0x44, 0x41, 0x54, 0x41, 0x50, 0x4c, 0x41,
-	0x4e, 0x45, 0x5f, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52, 0x45, 0x53, 0x5f, 0x45, 0x4e, 0x56, 0x4f,
-	0x59, 0x5f, 0x42, 0x4f, 0x4f, 0x54, 0x53, 0x54, 0x52, 0x41, 0x50, 0x5f, 0x43, 0x4f, 0x4e, 0x46,
-	0x49, 0x47, 0x55, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x03, 0x12, 0x1b, 0x0a, 0x17, 0x44,
-	0x41, 0x54, 0x41, 0x50, 0x4c, 0x41, 0x4e, 0x45, 0x5f, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52, 0x45,
-	0x53, 0x5f, 0x46, 0x49, 0x50, 0x53, 0x10, 0x04, 0x2a, 0xea, 0x01, 0x0a, 0x0b, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x45, 0x52, 0x56,
-	0x49, 0x43, 0x45, 0x5f, 0x4b, 0x49, 0x4e, 0x44, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
-	0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43,
-	0x45, 0x5f, 0x4b, 0x49, 0x4e, 0x44, 0x5f, 0x54, 0x59, 0x50, 0x49, 0x43, 0x41, 0x4c, 0x10, 0x01,
-	0x12, 0x1e, 0x0a, 0x1a, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x4b, 0x49, 0x4e, 0x44,
-	0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x5f, 0x50, 0x52, 0x4f, 0x58, 0x59, 0x10, 0x02,
-	0x12, 0x1d, 0x0a, 0x19, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x4b, 0x49, 0x4e, 0x44,
-	0x5f, 0x4d, 0x45, 0x53, 0x48, 0x5f, 0x47, 0x41, 0x54, 0x45, 0x57, 0x41, 0x59, 0x10, 0x03, 0x12,
-	0x24, 0x0a, 0x20, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x4b, 0x49, 0x4e, 0x44, 0x5f,
-	0x54, 0x45, 0x52, 0x4d, 0x49, 0x4e, 0x41, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x47, 0x41, 0x54, 0x45,
-	0x57, 0x41, 0x59, 0x10, 0x04, 0x12, 0x20, 0x0a, 0x1c, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43, 0x45,
-	0x5f, 0x4b, 0x49, 0x4e, 0x44, 0x5f, 0x49, 0x4e, 0x47, 0x52, 0x45, 0x53, 0x53, 0x5f, 0x47, 0x41,
-	0x54, 0x45, 0x57, 0x41, 0x59, 0x10, 0x05, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x45, 0x52, 0x56, 0x49,
-	0x43, 0x45, 0x5f, 0x4b, 0x49, 0x4e, 0x44, 0x5f, 0x41, 0x50, 0x49, 0x5f, 0x47, 0x41, 0x54, 0x45,
-	0x57, 0x41, 0x59, 0x10, 0x06, 0x32, 0xe2, 0x02, 0x0a, 0x10, 0x44, 0x61, 0x74, 0x61, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0xae, 0x01, 0x0a, 0x1d, 0x47,
-	0x65, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x40, 0x2e, 0x68,
+	0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x61, 0x72,
+	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61,
+	0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73,
+	0x70, 0x61, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x42, 0x0b, 0x0a, 0x09, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x73, 0x70,
+	0x65, 0x63, 0x22, 0xeb, 0x02, 0x0a, 0x1f, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x42,
+	0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4a, 0x0a, 0x0c, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x5f, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x68,
 	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x64, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x75, 0x70,
-	0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x46,
-	0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x41,
+	0x64, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x4b, 0x69, 0x6e, 0x64, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4b, 0x69,
+	0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09,
+	0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x61,
+	0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70,
+	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61,
+	0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x61,
+	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63,
+	0x74, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x17, 0x0a, 0x07, 0x6e, 0x6f, 0x64,
+	0x65, 0x5f, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65,
+	0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+	0x1f, 0x0a, 0x0b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x73, 0x18, 0x09,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73,
+	0x2a, 0xc7, 0x01, 0x0a, 0x11, 0x44, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x46, 0x65,
+	0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x22, 0x0a, 0x1e, 0x44, 0x41, 0x54, 0x41, 0x50, 0x4c,
+	0x41, 0x4e, 0x45, 0x5f, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52, 0x45, 0x53, 0x5f, 0x55, 0x4e, 0x53,
+	0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x20, 0x44, 0x41,
+	0x54, 0x41, 0x50, 0x4c, 0x41, 0x4e, 0x45, 0x5f, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52, 0x45, 0x53,
+	0x5f, 0x57, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x53, 0x10, 0x01,
+	0x12, 0x32, 0x0a, 0x2e, 0x44, 0x41, 0x54, 0x41, 0x50, 0x4c, 0x41, 0x4e, 0x45, 0x5f, 0x46, 0x45,
+	0x41, 0x54, 0x55, 0x52, 0x45, 0x53, 0x5f, 0x45, 0x44, 0x47, 0x45, 0x5f, 0x43, 0x45, 0x52, 0x54,
+	0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x5f, 0x4d, 0x41, 0x4e, 0x41, 0x47, 0x45, 0x4d, 0x45,
+	0x4e, 0x54, 0x10, 0x02, 0x12, 0x34, 0x0a, 0x30, 0x44, 0x41, 0x54, 0x41, 0x50, 0x4c, 0x41, 0x4e,
+	0x45, 0x5f, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52, 0x45, 0x53, 0x5f, 0x45, 0x4e, 0x56, 0x4f, 0x59,
+	0x5f, 0x42, 0x4f, 0x4f, 0x54, 0x53, 0x54, 0x52, 0x41, 0x50, 0x5f, 0x43, 0x4f, 0x4e, 0x46, 0x49,
+	0x47, 0x55, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x03, 0x2a, 0xea, 0x01, 0x0a, 0x0b, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x45,
+	0x52, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x4b, 0x49, 0x4e, 0x44, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45,
+	0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x45, 0x52, 0x56,
+	0x49, 0x43, 0x45, 0x5f, 0x4b, 0x49, 0x4e, 0x44, 0x5f, 0x54, 0x59, 0x50, 0x49, 0x43, 0x41, 0x4c,
+	0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x4b, 0x49,
+	0x4e, 0x44, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x5f, 0x50, 0x52, 0x4f, 0x58, 0x59,
+	0x10, 0x02, 0x12, 0x1d, 0x0a, 0x19, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x4b, 0x49,
+	0x4e, 0x44, 0x5f, 0x4d, 0x45, 0x53, 0x48, 0x5f, 0x47, 0x41, 0x54, 0x45, 0x57, 0x41, 0x59, 0x10,
+	0x03, 0x12, 0x24, 0x0a, 0x20, 0x53, 0x45, 0x52, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x4b, 0x49, 0x4e,
+	0x44, 0x5f, 0x54, 0x45, 0x52, 0x4d, 0x49, 0x4e, 0x41, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x47, 0x41,
+	0x54, 0x45, 0x57, 0x41, 0x59, 0x10, 0x04, 0x12, 0x20, 0x0a, 0x1c, 0x53, 0x45, 0x52, 0x56, 0x49,
+	0x43, 0x45, 0x5f, 0x4b, 0x49, 0x4e, 0x44, 0x5f, 0x49, 0x4e, 0x47, 0x52, 0x45, 0x53, 0x53, 0x5f,
+	0x47, 0x41, 0x54, 0x45, 0x57, 0x41, 0x59, 0x10, 0x05, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x45, 0x52,
+	0x56, 0x49, 0x43, 0x45, 0x5f, 0x4b, 0x49, 0x4e, 0x44, 0x5f, 0x41, 0x50, 0x49, 0x5f, 0x47, 0x41,
+	0x54, 0x45, 0x57, 0x41, 0x59, 0x10, 0x06, 0x32, 0xde, 0x02, 0x0a, 0x10, 0x44, 0x61, 0x74, 0x61,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0xac, 0x01, 0x0a,
+	0x1d, 0x47, 0x65, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x44, 0x61, 0x74,
+	0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x40,
 	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
 	0x6c, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x53,
 	0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x07, 0x12, 0x9c, 0x01, 0x0a, 0x17,
+	0x65, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x41, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x47, 0x65,
+	0x74, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08, 0x02, 0x12, 0x9a, 0x01, 0x0a, 0x17,
 	0x47, 0x65, 0x74, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61,
 	0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
 	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x70,
@@ -670,40 +635,40 @@ var file_pbdataplane_dataplane_proto_rawDesc = []byte{
 	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65,
 	0x2e, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72,
 	0x61, 0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x07, 0x42, 0xf0, 0x01, 0x0a, 0x1e, 0x63,
-	0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x42, 0x0e, 0x44,
-	0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x64, 0x61, 0x74, 0x61,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x44, 0xaa, 0x02, 0x1a, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x44,
-	0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0xca, 0x02, 0x1a, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x44, 0x61, 0x74, 0x61,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0xe2, 0x02, 0x26, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x44, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02,
-	0x1c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x3a, 0x3a, 0x44, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08, 0x02, 0x42, 0xf0, 0x01, 0x0a, 0x1e, 0x63, 0x6f, 0x6d,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x42, 0x0e, 0x44, 0x61, 0x74,
+	0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x34, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x64, 0x61, 0x74, 0x61, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x44, 0xaa, 0x02, 0x1a, 0x48, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x44, 0x61, 0x74,
+	0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0xca, 0x02, 0x1a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x44, 0x61, 0x74, 0x61, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0xe2, 0x02, 0x26, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c,
+	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x44, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1c, 0x48,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x3a, 0x3a, 0x44, 0x61, 0x74, 0x61, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
-	file_pbdataplane_dataplane_proto_rawDescOnce sync.Once
-	file_pbdataplane_dataplane_proto_rawDescData = file_pbdataplane_dataplane_proto_rawDesc
+	file_proto_public_pbdataplane_dataplane_proto_rawDescOnce sync.Once
+	file_proto_public_pbdataplane_dataplane_proto_rawDescData = file_proto_public_pbdataplane_dataplane_proto_rawDesc
 )
 
-func file_pbdataplane_dataplane_proto_rawDescGZIP() []byte {
-	file_pbdataplane_dataplane_proto_rawDescOnce.Do(func() {
-		file_pbdataplane_dataplane_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbdataplane_dataplane_proto_rawDescData)
+func file_proto_public_pbdataplane_dataplane_proto_rawDescGZIP() []byte {
+	file_proto_public_pbdataplane_dataplane_proto_rawDescOnce.Do(func() {
+		file_proto_public_pbdataplane_dataplane_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_public_pbdataplane_dataplane_proto_rawDescData)
 	})
-	return file_pbdataplane_dataplane_proto_rawDescData
+	return file_proto_public_pbdataplane_dataplane_proto_rawDescData
 }
 
-var file_pbdataplane_dataplane_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_pbdataplane_dataplane_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_pbdataplane_dataplane_proto_goTypes = []interface{}{
+var file_proto_public_pbdataplane_dataplane_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
+var file_proto_public_pbdataplane_dataplane_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_proto_public_pbdataplane_dataplane_proto_goTypes = []interface{}{
 	(DataplaneFeatures)(0),                        // 0: hashicorp.consul.dataplane.DataplaneFeatures
 	(ServiceKind)(0),                              // 1: hashicorp.consul.dataplane.ServiceKind
 	(*GetSupportedDataplaneFeaturesRequest)(nil),  // 2: hashicorp.consul.dataplane.GetSupportedDataplaneFeaturesRequest
@@ -712,13 +677,12 @@ var file_pbdataplane_dataplane_proto_goTypes = []interface{}{
 	(*GetEnvoyBootstrapParamsRequest)(nil),        // 5: hashicorp.consul.dataplane.GetEnvoyBootstrapParamsRequest
 	(*GetEnvoyBootstrapParamsResponse)(nil),       // 6: hashicorp.consul.dataplane.GetEnvoyBootstrapParamsResponse
 	(*structpb.Struct)(nil),                       // 7: google.protobuf.Struct
-	(*v2beta1.BootstrapConfig)(nil),               // 8: hashicorp.consul.mesh.v2beta1.BootstrapConfig
 }
-var file_pbdataplane_dataplane_proto_depIdxs = []int32{
+var file_proto_public_pbdataplane_dataplane_proto_depIdxs = []int32{
 	0, // 0: hashicorp.consul.dataplane.DataplaneFeatureSupport.feature_name:type_name -> hashicorp.consul.dataplane.DataplaneFeatures
 	3, // 1: hashicorp.consul.dataplane.GetSupportedDataplaneFeaturesResponse.supported_dataplane_features:type_name -> hashicorp.consul.dataplane.DataplaneFeatureSupport
-	7, // 2: hashicorp.consul.dataplane.GetEnvoyBootstrapParamsResponse.config:type_name -> google.protobuf.Struct
-	8, // 3: hashicorp.consul.dataplane.GetEnvoyBootstrapParamsResponse.bootstrap_config:type_name -> hashicorp.consul.mesh.v2beta1.BootstrapConfig
+	1, // 2: hashicorp.consul.dataplane.GetEnvoyBootstrapParamsResponse.service_kind:type_name -> hashicorp.consul.dataplane.ServiceKind
+	7, // 3: hashicorp.consul.dataplane.GetEnvoyBootstrapParamsResponse.config:type_name -> google.protobuf.Struct
 	2, // 4: hashicorp.consul.dataplane.DataplaneService.GetSupportedDataplaneFeatures:input_type -> hashicorp.consul.dataplane.GetSupportedDataplaneFeaturesRequest
 	5, // 5: hashicorp.consul.dataplane.DataplaneService.GetEnvoyBootstrapParams:input_type -> hashicorp.consul.dataplane.GetEnvoyBootstrapParamsRequest
 	4, // 6: hashicorp.consul.dataplane.DataplaneService.GetSupportedDataplaneFeatures:output_type -> hashicorp.consul.dataplane.GetSupportedDataplaneFeaturesResponse
@@ -730,13 +694,13 @@ var file_pbdataplane_dataplane_proto_depIdxs = []int32{
 	0, // [0:4] is the sub-list for field type_name
 }
 
-func init() { file_pbdataplane_dataplane_proto_init() }
-func file_pbdataplane_dataplane_proto_init() {
-	if File_pbdataplane_dataplane_proto != nil {
+func init() { file_proto_public_pbdataplane_dataplane_proto_init() }
+func file_proto_public_pbdataplane_dataplane_proto_init() {
+	if File_proto_public_pbdataplane_dataplane_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_pbdataplane_dataplane_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbdataplane_dataplane_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetSupportedDataplaneFeaturesRequest); i {
 			case 0:
 				return &v.state
@@ -748,7 +712,7 @@ func file_pbdataplane_dataplane_proto_init() {
 				return nil
 			}
 		}
-		file_pbdataplane_dataplane_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbdataplane_dataplane_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DataplaneFeatureSupport); i {
 			case 0:
 				return &v.state
@@ -760,7 +724,7 @@ func file_pbdataplane_dataplane_proto_init() {
 				return nil
 			}
 		}
-		file_pbdataplane_dataplane_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbdataplane_dataplane_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetSupportedDataplaneFeaturesResponse); i {
 			case 0:
 				return &v.state
@@ -772,7 +736,7 @@ func file_pbdataplane_dataplane_proto_init() {
 				return nil
 			}
 		}
-		file_pbdataplane_dataplane_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbdataplane_dataplane_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetEnvoyBootstrapParamsRequest); i {
 			case 0:
 				return &v.state
@@ -784,7 +748,7 @@ func file_pbdataplane_dataplane_proto_init() {
 				return nil
 			}
 		}
-		file_pbdataplane_dataplane_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbdataplane_dataplane_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetEnvoyBootstrapParamsResponse); i {
 			case 0:
 				return &v.state
@@ -797,7 +761,7 @@ func file_pbdataplane_dataplane_proto_init() {
 			}
 		}
 	}
-	file_pbdataplane_dataplane_proto_msgTypes[3].OneofWrappers = []interface{}{
+	file_proto_public_pbdataplane_dataplane_proto_msgTypes[3].OneofWrappers = []interface{}{
 		(*GetEnvoyBootstrapParamsRequest_NodeId)(nil),
 		(*GetEnvoyBootstrapParamsRequest_NodeName)(nil),
 	}
@@ -805,19 +769,19 @@ func file_pbdataplane_dataplane_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbdataplane_dataplane_proto_rawDesc,
+			RawDescriptor: file_proto_public_pbdataplane_dataplane_proto_rawDesc,
 			NumEnums:      2,
 			NumMessages:   5,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_pbdataplane_dataplane_proto_goTypes,
-		DependencyIndexes: file_pbdataplane_dataplane_proto_depIdxs,
-		EnumInfos:         file_pbdataplane_dataplane_proto_enumTypes,
-		MessageInfos:      file_pbdataplane_dataplane_proto_msgTypes,
+		GoTypes:           file_proto_public_pbdataplane_dataplane_proto_goTypes,
+		DependencyIndexes: file_proto_public_pbdataplane_dataplane_proto_depIdxs,
+		EnumInfos:         file_proto_public_pbdataplane_dataplane_proto_enumTypes,
+		MessageInfos:      file_proto_public_pbdataplane_dataplane_proto_msgTypes,
 	}.Build()
-	File_pbdataplane_dataplane_proto = out.File
-	file_pbdataplane_dataplane_proto_rawDesc = nil
-	file_pbdataplane_dataplane_proto_goTypes = nil
-	file_pbdataplane_dataplane_proto_depIdxs = nil
+	File_proto_public_pbdataplane_dataplane_proto = out.File
+	file_proto_public_pbdataplane_dataplane_proto_rawDesc = nil
+	file_proto_public_pbdataplane_dataplane_proto_goTypes = nil
+	file_proto_public_pbdataplane_dataplane_proto_depIdxs = nil
 }
diff --git a/proto-public/pbdataplane/dataplane.proto b/proto-public/pbdataplane/dataplane.proto
index 8faad919726e1..1eb6b3f374cd0 100644
--- a/proto-public/pbdataplane/dataplane.proto
+++ b/proto-public/pbdataplane/dataplane.proto
@@ -1,15 +1,11 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Package dataplane provides a service on Consul servers for the Consul Dataplane
 
 syntax = "proto3";
 
 package hashicorp.consul.dataplane;
 
-import "annotations/ratelimit/ratelimit.proto";
 import "google/protobuf/struct.proto";
-import "pbmesh/v2beta1/proxy_configuration.proto";
+import "proto-public/annotations/ratelimit/ratelimit.proto";
 
 message GetSupportedDataplaneFeaturesRequest {}
 
@@ -18,7 +14,6 @@ enum DataplaneFeatures {
   DATAPLANE_FEATURES_WATCH_SERVERS = 1;
   DATAPLANE_FEATURES_EDGE_CERTIFICATE_MANAGEMENT = 2;
   DATAPLANE_FEATURES_ENVOY_BOOTSTRAP_CONFIGURATION = 3;
-  DATAPLANE_FEATURES_FIPS = 4;
 }
 
 message DataplaneFeatureSupport {
@@ -36,8 +31,7 @@ message GetEnvoyBootstrapParamsRequest {
     string node_name = 2;
   }
   // The proxy service ID
-  string service_id = 3 [deprecated = true];
-  string proxy_id = 6;
+  string service_id = 3;
   string partition = 4;
   string namespace = 5;
 }
@@ -78,30 +72,17 @@ enum ServiceKind {
 }
 
 message GetEnvoyBootstrapParamsResponse {
-  reserved 1;
-
-  // deprecated: use identity instead.
-  // service is used to identify the service (as the local cluster name and
+  ServiceKind service_kind = 1;
+  // service is be used to identify the service (as the local cluster name and
   // in metric tags). If the service is a connect proxy it will be the name of
   // the proxy's destination service, for gateways it will be the gateway
   // service's name.
-  string service = 2 [deprecated = true];
-
-  // identity is used to identify this proxy (as the local cluster name and
-  // in metric tags). For v1, this should be the service name.
-  // If the service is a connect proxy it will be the name of
-  // the proxy's destination service, for gateways it will be the gateway
-  // service's name.
-  // For v2, this should be the workload identity name.
-  string identity = 10;
+  string service = 2;
   string namespace = 3;
   string partition = 4;
   string datacenter = 5;
   google.protobuf.Struct config = 6;
-  hashicorp.consul.mesh.v2beta1.BootstrapConfig bootstrap_config = 11;
-
-  reserved 7;
-
+  string node_id = 7;
   string node_name = 8;
   repeated string access_logs = 9;
 }
@@ -110,14 +91,12 @@ service DataplaneService {
   rpc GetSupportedDataplaneFeatures(GetSupportedDataplaneFeaturesRequest) returns (GetSupportedDataplaneFeaturesResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_DATAPLANE
     };
   }
 
   rpc GetEnvoyBootstrapParams(GetEnvoyBootstrapParamsRequest) returns (GetEnvoyBootstrapParamsResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_DATAPLANE
     };
   }
 }
diff --git a/proto-public/pbdataplane/dataplane_grpc.pb.go b/proto-public/pbdataplane/dataplane_grpc.pb.go
index 5aec5e9f0b33a..353326d7aa153 100644
--- a/proto-public/pbdataplane/dataplane_grpc.pb.go
+++ b/proto-public/pbdataplane/dataplane_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             (unknown)
-// source: pbdataplane/dataplane.proto
+// source: proto-public/pbdataplane/dataplane.proto
 
 package pbdataplane
 
@@ -135,5 +135,5 @@ var DataplaneService_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "pbdataplane/dataplane.proto",
+	Metadata: "proto-public/pbdataplane/dataplane.proto",
 }
diff --git a/proto-public/pbdns/dns.pb.binary.go b/proto-public/pbdns/dns.pb.binary.go
index 059ec39b5fdb1..c49eeb5eb3f6a 100644
--- a/proto-public/pbdns/dns.pb.binary.go
+++ b/proto-public/pbdns/dns.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbdns/dns.proto
+// source: proto-public/pbdns/dns.proto
 
 package pbdns
 
diff --git a/proto-public/pbdns/dns.pb.go b/proto-public/pbdns/dns.pb.go
index c3825d68e9e4e..9c90b58249366 100644
--- a/proto-public/pbdns/dns.pb.go
+++ b/proto-public/pbdns/dns.pb.go
@@ -1,11 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
+// 	protoc-gen-go v1.28.1
 // 	protoc        (unknown)
-// source: pbdns/dns.proto
+// source: proto-public/pbdns/dns.proto
 
 package pbdns
 
@@ -57,11 +54,11 @@ func (x Protocol) String() string {
 }
 
 func (Protocol) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbdns_dns_proto_enumTypes[0].Descriptor()
+	return file_proto_public_pbdns_dns_proto_enumTypes[0].Descriptor()
 }
 
 func (Protocol) Type() protoreflect.EnumType {
-	return &file_pbdns_dns_proto_enumTypes[0]
+	return &file_proto_public_pbdns_dns_proto_enumTypes[0]
 }
 
 func (x Protocol) Number() protoreflect.EnumNumber {
@@ -70,7 +67,7 @@ func (x Protocol) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use Protocol.Descriptor instead.
 func (Protocol) EnumDescriptor() ([]byte, []int) {
-	return file_pbdns_dns_proto_rawDescGZIP(), []int{0}
+	return file_proto_public_pbdns_dns_proto_rawDescGZIP(), []int{0}
 }
 
 type QueryRequest struct {
@@ -87,7 +84,7 @@ type QueryRequest struct {
 func (x *QueryRequest) Reset() {
 	*x = QueryRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbdns_dns_proto_msgTypes[0]
+		mi := &file_proto_public_pbdns_dns_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -100,7 +97,7 @@ func (x *QueryRequest) String() string {
 func (*QueryRequest) ProtoMessage() {}
 
 func (x *QueryRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbdns_dns_proto_msgTypes[0]
+	mi := &file_proto_public_pbdns_dns_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -113,7 +110,7 @@ func (x *QueryRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use QueryRequest.ProtoReflect.Descriptor instead.
 func (*QueryRequest) Descriptor() ([]byte, []int) {
-	return file_pbdns_dns_proto_rawDescGZIP(), []int{0}
+	return file_proto_public_pbdns_dns_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *QueryRequest) GetMsg() []byte {
@@ -142,7 +139,7 @@ type QueryResponse struct {
 func (x *QueryResponse) Reset() {
 	*x = QueryResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbdns_dns_proto_msgTypes[1]
+		mi := &file_proto_public_pbdns_dns_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -155,7 +152,7 @@ func (x *QueryResponse) String() string {
 func (*QueryResponse) ProtoMessage() {}
 
 func (x *QueryResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pbdns_dns_proto_msgTypes[1]
+	mi := &file_proto_public_pbdns_dns_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -168,7 +165,7 @@ func (x *QueryResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use QueryResponse.ProtoReflect.Descriptor instead.
 func (*QueryResponse) Descriptor() ([]byte, []int) {
-	return file_pbdns_dns_proto_rawDescGZIP(), []int{1}
+	return file_proto_public_pbdns_dns_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *QueryResponse) GetMsg() []byte {
@@ -178,69 +175,71 @@ func (x *QueryResponse) GetMsg() []byte {
 	return nil
 }
 
-var File_pbdns_dns_proto protoreflect.FileDescriptor
-
-var file_pbdns_dns_proto_rawDesc = []byte{
-	0x0a, 0x0f, 0x70, 0x62, 0x64, 0x6e, 0x73, 0x2f, 0x64, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x14, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x64, 0x6e, 0x73, 0x1a, 0x25, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72,
-	0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5c,
-	0x0a, 0x0c, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10,
-	0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6d, 0x73, 0x67,
-	0x12, 0x3a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x64, 0x6e, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x22, 0x21, 0x0a, 0x0d,
-	0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a,
-	0x03, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x2a,
-	0x4e, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x1e, 0x0a, 0x1a, 0x50,
-	0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x45, 0x54, 0x5f, 0x55, 0x4e,
-	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x50,
-	0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x54, 0x43, 0x50, 0x10, 0x01, 0x12, 0x10, 0x0a,
-	0x0c, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x55, 0x44, 0x50, 0x10, 0x02, 0x32,
-	0x68, 0x0a, 0x0a, 0x44, 0x4e, 0x53, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x5a, 0x0a,
-	0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x22, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x64, 0x6e, 0x73, 0x2e, 0x51, 0x75,
-	0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x64, 0x6e,
-	0x73, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x08, 0x42, 0xc6, 0x01, 0x0a, 0x18, 0x63, 0x6f,
-	0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x64, 0x6e, 0x73, 0x42, 0x08, 0x44, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x64,
-	0x6e, 0x73, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x44, 0xaa, 0x02, 0x14, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x44, 0x6e, 0x73, 0xca,
-	0x02, 0x14, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x5c, 0x44, 0x6e, 0x73, 0xe2, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x44, 0x6e, 0x73, 0x5c, 0x47, 0x50,
-	0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x16, 0x48, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x44,
-	0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+var File_proto_public_pbdns_dns_proto protoreflect.FileDescriptor
+
+var file_proto_public_pbdns_dns_proto_rawDesc = []byte{
+	0x0a, 0x1c, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70,
+	0x62, 0x64, 0x6e, 0x73, 0x2f, 0x64, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x14,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x64, 0x6e, 0x73, 0x1a, 0x32, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c,
+	0x69, 0x63, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72,
+	0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d,
+	0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5c, 0x0a, 0x0c, 0x51, 0x75, 0x65, 0x72,
+	0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x3a, 0x0a, 0x08, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x64, 0x6e, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x52, 0x08, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x22, 0x21, 0x0a, 0x0d, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x2a, 0x4e, 0x0a, 0x08, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x1e, 0x0a, 0x1a, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f,
+	0x4c, 0x5f, 0x55, 0x4e, 0x53, 0x45, 0x54, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46,
+	0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f,
+	0x4c, 0x5f, 0x54, 0x43, 0x50, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x52, 0x4f, 0x54, 0x4f,
+	0x43, 0x4f, 0x4c, 0x5f, 0x55, 0x44, 0x50, 0x10, 0x02, 0x32, 0x66, 0x0a, 0x0a, 0x44, 0x4e, 0x53,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x58, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79,
+	0x12, 0x22, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x64, 0x6e, 0x73, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x64, 0x6e, 0x73, 0x2e, 0x51, 0x75, 0x65, 0x72,
+	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08,
+	0x02, 0x42, 0xc6, 0x01, 0x0a, 0x18, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x64, 0x6e, 0x73, 0x42, 0x08,
+	0x44, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75,
+	0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x64, 0x6e, 0x73, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x44,
+	0xaa, 0x02, 0x14, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x44, 0x6e, 0x73, 0xca, 0x02, 0x14, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x44, 0x6e, 0x73, 0xe2, 0x02,
+	0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x5c, 0x44, 0x6e, 0x73, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
+	0x61, 0xea, 0x02, 0x16, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x44, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
-	file_pbdns_dns_proto_rawDescOnce sync.Once
-	file_pbdns_dns_proto_rawDescData = file_pbdns_dns_proto_rawDesc
+	file_proto_public_pbdns_dns_proto_rawDescOnce sync.Once
+	file_proto_public_pbdns_dns_proto_rawDescData = file_proto_public_pbdns_dns_proto_rawDesc
 )
 
-func file_pbdns_dns_proto_rawDescGZIP() []byte {
-	file_pbdns_dns_proto_rawDescOnce.Do(func() {
-		file_pbdns_dns_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbdns_dns_proto_rawDescData)
+func file_proto_public_pbdns_dns_proto_rawDescGZIP() []byte {
+	file_proto_public_pbdns_dns_proto_rawDescOnce.Do(func() {
+		file_proto_public_pbdns_dns_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_public_pbdns_dns_proto_rawDescData)
 	})
-	return file_pbdns_dns_proto_rawDescData
+	return file_proto_public_pbdns_dns_proto_rawDescData
 }
 
-var file_pbdns_dns_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbdns_dns_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_pbdns_dns_proto_goTypes = []interface{}{
+var file_proto_public_pbdns_dns_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_proto_public_pbdns_dns_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_proto_public_pbdns_dns_proto_goTypes = []interface{}{
 	(Protocol)(0),         // 0: hashicorp.consul.dns.Protocol
 	(*QueryRequest)(nil),  // 1: hashicorp.consul.dns.QueryRequest
 	(*QueryResponse)(nil), // 2: hashicorp.consul.dns.QueryResponse
 }
-var file_pbdns_dns_proto_depIdxs = []int32{
+var file_proto_public_pbdns_dns_proto_depIdxs = []int32{
 	0, // 0: hashicorp.consul.dns.QueryRequest.protocol:type_name -> hashicorp.consul.dns.Protocol
 	1, // 1: hashicorp.consul.dns.DNSService.Query:input_type -> hashicorp.consul.dns.QueryRequest
 	2, // 2: hashicorp.consul.dns.DNSService.Query:output_type -> hashicorp.consul.dns.QueryResponse
@@ -251,13 +250,13 @@ var file_pbdns_dns_proto_depIdxs = []int32{
 	0, // [0:1] is the sub-list for field type_name
 }
 
-func init() { file_pbdns_dns_proto_init() }
-func file_pbdns_dns_proto_init() {
-	if File_pbdns_dns_proto != nil {
+func init() { file_proto_public_pbdns_dns_proto_init() }
+func file_proto_public_pbdns_dns_proto_init() {
+	if File_proto_public_pbdns_dns_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_pbdns_dns_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbdns_dns_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*QueryRequest); i {
 			case 0:
 				return &v.state
@@ -269,7 +268,7 @@ func file_pbdns_dns_proto_init() {
 				return nil
 			}
 		}
-		file_pbdns_dns_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbdns_dns_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*QueryResponse); i {
 			case 0:
 				return &v.state
@@ -286,19 +285,19 @@ func file_pbdns_dns_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbdns_dns_proto_rawDesc,
+			RawDescriptor: file_proto_public_pbdns_dns_proto_rawDesc,
 			NumEnums:      1,
 			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_pbdns_dns_proto_goTypes,
-		DependencyIndexes: file_pbdns_dns_proto_depIdxs,
-		EnumInfos:         file_pbdns_dns_proto_enumTypes,
-		MessageInfos:      file_pbdns_dns_proto_msgTypes,
+		GoTypes:           file_proto_public_pbdns_dns_proto_goTypes,
+		DependencyIndexes: file_proto_public_pbdns_dns_proto_depIdxs,
+		EnumInfos:         file_proto_public_pbdns_dns_proto_enumTypes,
+		MessageInfos:      file_proto_public_pbdns_dns_proto_msgTypes,
 	}.Build()
-	File_pbdns_dns_proto = out.File
-	file_pbdns_dns_proto_rawDesc = nil
-	file_pbdns_dns_proto_goTypes = nil
-	file_pbdns_dns_proto_depIdxs = nil
+	File_proto_public_pbdns_dns_proto = out.File
+	file_proto_public_pbdns_dns_proto_rawDesc = nil
+	file_proto_public_pbdns_dns_proto_goTypes = nil
+	file_proto_public_pbdns_dns_proto_depIdxs = nil
 }
diff --git a/proto-public/pbdns/dns.proto b/proto-public/pbdns/dns.proto
index 126b1cc4eb654..bf8afc48f31c5 100644
--- a/proto-public/pbdns/dns.proto
+++ b/proto-public/pbdns/dns.proto
@@ -1,11 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 syntax = "proto3";
 
 package hashicorp.consul.dns;
 
-import "annotations/ratelimit/ratelimit.proto";
+import "proto-public/annotations/ratelimit/ratelimit.proto";
 
 option go_package = "github.com/hashicorp/consul/proto-public/pbdns";
 
@@ -14,7 +11,6 @@ service DNSService {
   rpc Query(QueryRequest) returns (QueryResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_DNS
     };
   }
 }
diff --git a/proto-public/pbdns/dns_grpc.pb.go b/proto-public/pbdns/dns_grpc.pb.go
index 4bccf8c58b9bd..85ecc8d48dc89 100644
--- a/proto-public/pbdns/dns_grpc.pb.go
+++ b/proto-public/pbdns/dns_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             (unknown)
-// source: pbdns/dns.proto
+// source: proto-public/pbdns/dns.proto
 
 package pbdns
 
@@ -101,5 +101,5 @@ var DNSService_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "pbdns/dns.proto",
+	Metadata: "proto-public/pbdns/dns.proto",
 }
diff --git a/proto-public/pbmesh/v2beta1/common.pb.binary.go b/proto-public/pbmesh/v2beta1/common.pb.binary.go
deleted file mode 100644
index eb62aa3358e3b..0000000000000
--- a/proto-public/pbmesh/v2beta1/common.pb.binary.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/common.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ParentReference) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ParentReference) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *BackendReference) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *BackendReference) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/common.pb.go b/proto-public/pbmesh/v2beta1/common.pb.go
deleted file mode 100644
index 113434b29fe24..0000000000000
--- a/proto-public/pbmesh/v2beta1/common.pb.go
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/common.proto
-
-package meshv2beta1
-
-import (
-	pbresource "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// NOTE: roughly equivalent to structs.ResourceReference
-type ParentReference struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// For east/west configuration, this should point to a pbcatalog.Service.
-	// For north/south it should point to a gateway (TBD)
-	Ref *pbresource.Reference `protobuf:"bytes,1,opt,name=ref,proto3" json:"ref,omitempty"`
-	// For east/west this is the name of the Consul Service port to direct traffic to
-	// or empty to imply all.
-	//
-	// For north/south this is TBD.
-	Port string `protobuf:"bytes,2,opt,name=port,proto3" json:"port,omitempty"`
-}
-
-func (x *ParentReference) Reset() {
-	*x = ParentReference{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_common_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ParentReference) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ParentReference) ProtoMessage() {}
-
-func (x *ParentReference) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_common_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ParentReference.ProtoReflect.Descriptor instead.
-func (*ParentReference) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_common_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ParentReference) GetRef() *pbresource.Reference {
-	if x != nil {
-		return x.Ref
-	}
-	return nil
-}
-
-func (x *ParentReference) GetPort() string {
-	if x != nil {
-		return x.Port
-	}
-	return ""
-}
-
-type BackendReference struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// For east/west configuration, this should point to a pbcatalog.Service.
-	Ref *pbresource.Reference `protobuf:"bytes,1,opt,name=ref,proto3" json:"ref,omitempty"`
-	// For east/west this is the name of the Consul Service port to direct traffic to
-	// or empty to imply using the same value as the parent ref.
-	//
-	// For north/south this is TBD.
-	Port       string `protobuf:"bytes,2,opt,name=port,proto3" json:"port,omitempty"`
-	Datacenter string `protobuf:"bytes,3,opt,name=datacenter,proto3" json:"datacenter,omitempty"`
-}
-
-func (x *BackendReference) Reset() {
-	*x = BackendReference{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_common_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *BackendReference) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*BackendReference) ProtoMessage() {}
-
-func (x *BackendReference) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_common_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use BackendReference.ProtoReflect.Descriptor instead.
-func (*BackendReference) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_common_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *BackendReference) GetRef() *pbresource.Reference {
-	if x != nil {
-		return x.Ref
-	}
-	return nil
-}
-
-func (x *BackendReference) GetPort() string {
-	if x != nil {
-		return x.Port
-	}
-	return ""
-}
-
-func (x *BackendReference) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-var File_pbmesh_v2beta1_common_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_common_proto_rawDesc = []byte{
-	0x0a, 0x1b, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x19, 0x70, 0x62,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5d, 0x0a, 0x0f, 0x50, 0x61, 0x72, 0x65, 0x6e,
-	0x74, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x36, 0x0a, 0x03, 0x72, 0x65,
-	0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x03, 0x72,
-	0x65, 0x66, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x7e, 0x0a, 0x10, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e,
-	0x64, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x36, 0x0a, 0x03, 0x72, 0x65,
-	0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x03, 0x72,
-	0x65, 0x66, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x63, 0x65,
-	0x6e, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x61, 0x74, 0x61,
-	0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x42, 0x8c, 0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x0b, 0x43, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x43, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70,
-	0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x3b, 0x6d, 0x65, 0x73, 0x68, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x29, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0xea, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_common_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_common_proto_rawDescData = file_pbmesh_v2beta1_common_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_common_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_common_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_common_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_common_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_common_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_common_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_pbmesh_v2beta1_common_proto_goTypes = []interface{}{
-	(*ParentReference)(nil),      // 0: hashicorp.consul.mesh.v2beta1.ParentReference
-	(*BackendReference)(nil),     // 1: hashicorp.consul.mesh.v2beta1.BackendReference
-	(*pbresource.Reference)(nil), // 2: hashicorp.consul.resource.Reference
-}
-var file_pbmesh_v2beta1_common_proto_depIdxs = []int32{
-	2, // 0: hashicorp.consul.mesh.v2beta1.ParentReference.ref:type_name -> hashicorp.consul.resource.Reference
-	2, // 1: hashicorp.consul.mesh.v2beta1.BackendReference.ref:type_name -> hashicorp.consul.resource.Reference
-	2, // [2:2] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_common_proto_init() }
-func file_pbmesh_v2beta1_common_proto_init() {
-	if File_pbmesh_v2beta1_common_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_common_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParentReference); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_common_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BackendReference); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_common_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_common_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_common_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_common_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_common_proto = out.File
-	file_pbmesh_v2beta1_common_proto_rawDesc = nil
-	file_pbmesh_v2beta1_common_proto_goTypes = nil
-	file_pbmesh_v2beta1_common_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/common.proto b/proto-public/pbmesh/v2beta1/common.proto
deleted file mode 100644
index fa61867c5eb7f..0000000000000
--- a/proto-public/pbmesh/v2beta1/common.proto
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "pbresource/resource.proto";
-
-// NOTE: roughly equivalent to structs.ResourceReference
-message ParentReference {
-  // For east/west configuration, this should point to a pbcatalog.Service.
-  // For north/south it should point to a gateway (TBD)
-  hashicorp.consul.resource.Reference ref = 1;
-
-  // For east/west this is the name of the Consul Service port to direct traffic to
-  // or empty to imply all.
-  //
-  // For north/south this is TBD.
-  string port = 2;
-}
-
-message BackendReference {
-  // For east/west configuration, this should point to a pbcatalog.Service.
-  hashicorp.consul.resource.Reference ref = 1;
-
-  // For east/west this is the name of the Consul Service port to direct traffic to
-  // or empty to imply using the same value as the parent ref.
-  //
-  // For north/south this is TBD.
-  string port = 2;
-  string datacenter = 3;
-}
diff --git a/proto-public/pbmesh/v2beta1/computed_proxy_configuration.pb.binary.go b/proto-public/pbmesh/v2beta1/computed_proxy_configuration.pb.binary.go
deleted file mode 100644
index 25fe0e577bc4e..0000000000000
--- a/proto-public/pbmesh/v2beta1/computed_proxy_configuration.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/computed_proxy_configuration.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedProxyConfiguration) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedProxyConfiguration) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/computed_proxy_configuration.pb.go b/proto-public/pbmesh/v2beta1/computed_proxy_configuration.pb.go
deleted file mode 100644
index a35764664e3c3..0000000000000
--- a/proto-public/pbmesh/v2beta1/computed_proxy_configuration.pb.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/computed_proxy_configuration.proto
-
-package meshv2beta1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type ComputedProxyConfiguration struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// dynamic_config is the configuration that could be changed
-	// dynamically (i.e. without needing restart).
-	DynamicConfig *DynamicConfig `protobuf:"bytes,2,opt,name=dynamic_config,json=dynamicConfig,proto3" json:"dynamic_config,omitempty"`
-	// bootstrap_config is the configuration that requires proxies
-	// to be restarted to be applied.
-	BootstrapConfig *BootstrapConfig `protobuf:"bytes,3,opt,name=bootstrap_config,json=bootstrapConfig,proto3" json:"bootstrap_config,omitempty"`
-}
-
-func (x *ComputedProxyConfiguration) Reset() {
-	*x = ComputedProxyConfiguration{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_proxy_configuration_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedProxyConfiguration) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedProxyConfiguration) ProtoMessage() {}
-
-func (x *ComputedProxyConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_proxy_configuration_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedProxyConfiguration.ProtoReflect.Descriptor instead.
-func (*ComputedProxyConfiguration) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_proxy_configuration_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ComputedProxyConfiguration) GetDynamicConfig() *DynamicConfig {
-	if x != nil {
-		return x.DynamicConfig
-	}
-	return nil
-}
-
-func (x *ComputedProxyConfiguration) GetBootstrapConfig() *BootstrapConfig {
-	if x != nil {
-		return x.BootstrapConfig
-	}
-	return nil
-}
-
-var File_pbmesh_v2beta1_computed_proxy_configuration_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_computed_proxy_configuration_proto_rawDesc = []byte{
-	0x0a, 0x31, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x1a, 0x28, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x70, 0x62,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd4, 0x01, 0x0a, 0x1a, 0x43,
-	0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x53, 0x0a, 0x0e, 0x64, 0x79, 0x6e,
-	0x61, 0x6d, 0x69, 0x63, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
-	0x0d, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x59,
-	0x0a, 0x10, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72,
-	0x61, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74,
-	0x72, 0x61, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08,
-	0x03, 0x42, 0xa0, 0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x1f, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65,
-	0x64, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75,
-	0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x3b, 0x6d, 0x65, 0x73, 0x68, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2,
-	0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x29, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-	0x61, 0xea, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_computed_proxy_configuration_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_computed_proxy_configuration_proto_rawDescData = file_pbmesh_v2beta1_computed_proxy_configuration_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_computed_proxy_configuration_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_computed_proxy_configuration_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_computed_proxy_configuration_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_computed_proxy_configuration_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_computed_proxy_configuration_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_computed_proxy_configuration_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbmesh_v2beta1_computed_proxy_configuration_proto_goTypes = []interface{}{
-	(*ComputedProxyConfiguration)(nil), // 0: hashicorp.consul.mesh.v2beta1.ComputedProxyConfiguration
-	(*DynamicConfig)(nil),              // 1: hashicorp.consul.mesh.v2beta1.DynamicConfig
-	(*BootstrapConfig)(nil),            // 2: hashicorp.consul.mesh.v2beta1.BootstrapConfig
-}
-var file_pbmesh_v2beta1_computed_proxy_configuration_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.mesh.v2beta1.ComputedProxyConfiguration.dynamic_config:type_name -> hashicorp.consul.mesh.v2beta1.DynamicConfig
-	2, // 1: hashicorp.consul.mesh.v2beta1.ComputedProxyConfiguration.bootstrap_config:type_name -> hashicorp.consul.mesh.v2beta1.BootstrapConfig
-	2, // [2:2] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_computed_proxy_configuration_proto_init() }
-func file_pbmesh_v2beta1_computed_proxy_configuration_proto_init() {
-	if File_pbmesh_v2beta1_computed_proxy_configuration_proto != nil {
-		return
-	}
-	file_pbmesh_v2beta1_proxy_configuration_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_computed_proxy_configuration_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedProxyConfiguration); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_computed_proxy_configuration_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_computed_proxy_configuration_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_computed_proxy_configuration_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_computed_proxy_configuration_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_computed_proxy_configuration_proto = out.File
-	file_pbmesh_v2beta1_computed_proxy_configuration_proto_rawDesc = nil
-	file_pbmesh_v2beta1_computed_proxy_configuration_proto_goTypes = nil
-	file_pbmesh_v2beta1_computed_proxy_configuration_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/computed_proxy_configuration.proto b/proto-public/pbmesh/v2beta1/computed_proxy_configuration.proto
deleted file mode 100644
index 52ce0c6ad562c..0000000000000
--- a/proto-public/pbmesh/v2beta1/computed_proxy_configuration.proto
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "pbmesh/v2beta1/proxy_configuration.proto";
-import "pbresource/annotations.proto";
-
-message ComputedProxyConfiguration {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  // dynamic_config is the configuration that could be changed
-  // dynamically (i.e. without needing restart).
-  DynamicConfig dynamic_config = 2;
-
-  // bootstrap_config is the configuration that requires proxies
-  // to be restarted to be applied.
-  BootstrapConfig bootstrap_config = 3;
-}
diff --git a/proto-public/pbmesh/v2beta1/computed_routes.pb.binary.go b/proto-public/pbmesh/v2beta1/computed_routes.pb.binary.go
deleted file mode 100644
index f0f24154692ed..0000000000000
--- a/proto-public/pbmesh/v2beta1/computed_routes.pb.binary.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/computed_routes.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedRoutes) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedRoutes) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedPortRoutes) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedPortRoutes) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedHTTPRoute) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedHTTPRoute) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedHTTPRouteRule) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedHTTPRouteRule) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedHTTPBackendRef) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedHTTPBackendRef) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedGRPCRoute) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedGRPCRoute) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedGRPCRouteRule) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedGRPCRouteRule) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedGRPCBackendRef) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedGRPCBackendRef) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedTCPRoute) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedTCPRoute) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedTCPRouteRule) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedTCPRouteRule) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedTCPBackendRef) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedTCPBackendRef) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *BackendTargetDetails) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *BackendTargetDetails) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedFailoverConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedFailoverConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedFailoverDestination) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedFailoverDestination) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/computed_routes.pb.go b/proto-public/pbmesh/v2beta1/computed_routes.pb.go
deleted file mode 100644
index 4e01b3a80d33a..0000000000000
--- a/proto-public/pbmesh/v2beta1/computed_routes.pb.go
+++ /dev/null
@@ -1,1634 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/computed_routes.proto
-
-package meshv2beta1
-
-import (
-	v2beta1 "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbresource "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type BackendTargetDetailsType int32
-
-const (
-	BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_UNSPECIFIED BackendTargetDetailsType = 0
-	// Direct means that the target is directly routable from a route. This does
-	// not mean that the target is not also indirect though.
-	BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT BackendTargetDetailsType = 1
-	// Indirect means that the target is not directly routable from a route.
-	//
-	// One example would be for a FailoverPolicy destination.
-	BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_INDIRECT BackendTargetDetailsType = 2
-)
-
-// Enum value maps for BackendTargetDetailsType.
-var (
-	BackendTargetDetailsType_name = map[int32]string{
-		0: "BACKEND_TARGET_DETAILS_TYPE_UNSPECIFIED",
-		1: "BACKEND_TARGET_DETAILS_TYPE_DIRECT",
-		2: "BACKEND_TARGET_DETAILS_TYPE_INDIRECT",
-	}
-	BackendTargetDetailsType_value = map[string]int32{
-		"BACKEND_TARGET_DETAILS_TYPE_UNSPECIFIED": 0,
-		"BACKEND_TARGET_DETAILS_TYPE_DIRECT":      1,
-		"BACKEND_TARGET_DETAILS_TYPE_INDIRECT":    2,
-	}
-)
-
-func (x BackendTargetDetailsType) Enum() *BackendTargetDetailsType {
-	p := new(BackendTargetDetailsType)
-	*p = x
-	return p
-}
-
-func (x BackendTargetDetailsType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (BackendTargetDetailsType) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_computed_routes_proto_enumTypes[0].Descriptor()
-}
-
-func (BackendTargetDetailsType) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_computed_routes_proto_enumTypes[0]
-}
-
-func (x BackendTargetDetailsType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use BackendTargetDetailsType.Descriptor instead.
-func (BackendTargetDetailsType) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{0}
-}
-
-// This is a Resource type.
-type ComputedRoutes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PortedConfigs map[string]*ComputedPortRoutes `protobuf:"bytes,1,rep,name=ported_configs,json=portedConfigs,proto3" json:"ported_configs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// BoundReferences is a slice of mixed type references of resources that were
-	// involved in the formulation of this resource.
-	BoundReferences []*pbresource.Reference `protobuf:"bytes,2,rep,name=bound_references,json=boundReferences,proto3" json:"bound_references,omitempty"`
-}
-
-func (x *ComputedRoutes) Reset() {
-	*x = ComputedRoutes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedRoutes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedRoutes) ProtoMessage() {}
-
-func (x *ComputedRoutes) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedRoutes.ProtoReflect.Descriptor instead.
-func (*ComputedRoutes) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ComputedRoutes) GetPortedConfigs() map[string]*ComputedPortRoutes {
-	if x != nil {
-		return x.PortedConfigs
-	}
-	return nil
-}
-
-func (x *ComputedRoutes) GetBoundReferences() []*pbresource.Reference {
-	if x != nil {
-		return x.BoundReferences
-	}
-	return nil
-}
-
-type ComputedPortRoutes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to Config:
-	//
-	//	*ComputedPortRoutes_Http
-	//	*ComputedPortRoutes_Grpc
-	//	*ComputedPortRoutes_Tcp
-	Config             isComputedPortRoutes_Config `protobuf_oneof:"config"`
-	UsingDefaultConfig bool                        `protobuf:"varint,4,opt,name=using_default_config,json=usingDefaultConfig,proto3" json:"using_default_config,omitempty"` // TODO
-	ParentRef          *ParentReference            `protobuf:"bytes,5,opt,name=parent_ref,json=parentRef,proto3" json:"parent_ref,omitempty"`
-	// Protocol is the ParentRef.Port's protocol. It is based on the value in the
-	// Service object, but may differ depending upon which xRoutes are actually
-	// in use.
-	Protocol v2beta1.Protocol `protobuf:"varint,6,opt,name=protocol,proto3,enum=hashicorp.consul.catalog.v2beta1.Protocol" json:"protocol,omitempty"`
-	// map key is an opaque string; like disco chain target name
-	Targets map[string]*BackendTargetDetails `protobuf:"bytes,7,rep,name=targets,proto3" json:"targets,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (x *ComputedPortRoutes) Reset() {
-	*x = ComputedPortRoutes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedPortRoutes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedPortRoutes) ProtoMessage() {}
-
-func (x *ComputedPortRoutes) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedPortRoutes.ProtoReflect.Descriptor instead.
-func (*ComputedPortRoutes) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{1}
-}
-
-func (m *ComputedPortRoutes) GetConfig() isComputedPortRoutes_Config {
-	if m != nil {
-		return m.Config
-	}
-	return nil
-}
-
-func (x *ComputedPortRoutes) GetHttp() *ComputedHTTPRoute {
-	if x, ok := x.GetConfig().(*ComputedPortRoutes_Http); ok {
-		return x.Http
-	}
-	return nil
-}
-
-func (x *ComputedPortRoutes) GetGrpc() *ComputedGRPCRoute {
-	if x, ok := x.GetConfig().(*ComputedPortRoutes_Grpc); ok {
-		return x.Grpc
-	}
-	return nil
-}
-
-func (x *ComputedPortRoutes) GetTcp() *ComputedTCPRoute {
-	if x, ok := x.GetConfig().(*ComputedPortRoutes_Tcp); ok {
-		return x.Tcp
-	}
-	return nil
-}
-
-func (x *ComputedPortRoutes) GetUsingDefaultConfig() bool {
-	if x != nil {
-		return x.UsingDefaultConfig
-	}
-	return false
-}
-
-func (x *ComputedPortRoutes) GetParentRef() *ParentReference {
-	if x != nil {
-		return x.ParentRef
-	}
-	return nil
-}
-
-func (x *ComputedPortRoutes) GetProtocol() v2beta1.Protocol {
-	if x != nil {
-		return x.Protocol
-	}
-	return v2beta1.Protocol(0)
-}
-
-func (x *ComputedPortRoutes) GetTargets() map[string]*BackendTargetDetails {
-	if x != nil {
-		return x.Targets
-	}
-	return nil
-}
-
-type isComputedPortRoutes_Config interface {
-	isComputedPortRoutes_Config()
-}
-
-type ComputedPortRoutes_Http struct {
-	Http *ComputedHTTPRoute `protobuf:"bytes,1,opt,name=http,proto3,oneof"`
-}
-
-type ComputedPortRoutes_Grpc struct {
-	Grpc *ComputedGRPCRoute `protobuf:"bytes,2,opt,name=grpc,proto3,oneof"`
-}
-
-type ComputedPortRoutes_Tcp struct {
-	Tcp *ComputedTCPRoute `protobuf:"bytes,3,opt,name=tcp,proto3,oneof"`
-}
-
-func (*ComputedPortRoutes_Http) isComputedPortRoutes_Config() {}
-
-func (*ComputedPortRoutes_Grpc) isComputedPortRoutes_Config() {}
-
-func (*ComputedPortRoutes_Tcp) isComputedPortRoutes_Config() {}
-
-type ComputedHTTPRoute struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Rules []*ComputedHTTPRouteRule `protobuf:"bytes,2,rep,name=rules,proto3" json:"rules,omitempty"`
-}
-
-func (x *ComputedHTTPRoute) Reset() {
-	*x = ComputedHTTPRoute{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedHTTPRoute) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedHTTPRoute) ProtoMessage() {}
-
-func (x *ComputedHTTPRoute) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedHTTPRoute.ProtoReflect.Descriptor instead.
-func (*ComputedHTTPRoute) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *ComputedHTTPRoute) GetRules() []*ComputedHTTPRouteRule {
-	if x != nil {
-		return x.Rules
-	}
-	return nil
-}
-
-type ComputedHTTPRouteRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Matches     []*HTTPRouteMatch         `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"`
-	Filters     []*HTTPRouteFilter        `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"`
-	BackendRefs []*ComputedHTTPBackendRef `protobuf:"bytes,3,rep,name=backend_refs,json=backendRefs,proto3" json:"backend_refs,omitempty"`
-	Timeouts    *HTTPRouteTimeouts        `protobuf:"bytes,4,opt,name=timeouts,proto3" json:"timeouts,omitempty"`
-	Retries     *HTTPRouteRetries         `protobuf:"bytes,5,opt,name=retries,proto3" json:"retries,omitempty"`
-}
-
-func (x *ComputedHTTPRouteRule) Reset() {
-	*x = ComputedHTTPRouteRule{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedHTTPRouteRule) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedHTTPRouteRule) ProtoMessage() {}
-
-func (x *ComputedHTTPRouteRule) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedHTTPRouteRule.ProtoReflect.Descriptor instead.
-func (*ComputedHTTPRouteRule) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *ComputedHTTPRouteRule) GetMatches() []*HTTPRouteMatch {
-	if x != nil {
-		return x.Matches
-	}
-	return nil
-}
-
-func (x *ComputedHTTPRouteRule) GetFilters() []*HTTPRouteFilter {
-	if x != nil {
-		return x.Filters
-	}
-	return nil
-}
-
-func (x *ComputedHTTPRouteRule) GetBackendRefs() []*ComputedHTTPBackendRef {
-	if x != nil {
-		return x.BackendRefs
-	}
-	return nil
-}
-
-func (x *ComputedHTTPRouteRule) GetTimeouts() *HTTPRouteTimeouts {
-	if x != nil {
-		return x.Timeouts
-	}
-	return nil
-}
-
-func (x *ComputedHTTPRouteRule) GetRetries() *HTTPRouteRetries {
-	if x != nil {
-		return x.Retries
-	}
-	return nil
-}
-
-type ComputedHTTPBackendRef struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// BackendTarget indicates which key in the targets map provides
-	// the rest of the configuration.
-	//
-	// If this field is set to the empty string, or is the sentinel value
-	// "NULL-ROUTE" is an indication that all of the traffic destined for this
-	// backend reference should be null routed in a format appropriate for the
-	// protocol (i.e. for HTTP use 5xx).
-	BackendTarget string             `protobuf:"bytes,1,opt,name=backend_target,json=backendTarget,proto3" json:"backend_target,omitempty"`
-	Weight        uint32             `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"`
-	Filters       []*HTTPRouteFilter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters,omitempty"`
-}
-
-func (x *ComputedHTTPBackendRef) Reset() {
-	*x = ComputedHTTPBackendRef{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedHTTPBackendRef) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedHTTPBackendRef) ProtoMessage() {}
-
-func (x *ComputedHTTPBackendRef) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedHTTPBackendRef.ProtoReflect.Descriptor instead.
-func (*ComputedHTTPBackendRef) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *ComputedHTTPBackendRef) GetBackendTarget() string {
-	if x != nil {
-		return x.BackendTarget
-	}
-	return ""
-}
-
-func (x *ComputedHTTPBackendRef) GetWeight() uint32 {
-	if x != nil {
-		return x.Weight
-	}
-	return 0
-}
-
-func (x *ComputedHTTPBackendRef) GetFilters() []*HTTPRouteFilter {
-	if x != nil {
-		return x.Filters
-	}
-	return nil
-}
-
-type ComputedGRPCRoute struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Rules []*ComputedGRPCRouteRule `protobuf:"bytes,2,rep,name=rules,proto3" json:"rules,omitempty"`
-}
-
-func (x *ComputedGRPCRoute) Reset() {
-	*x = ComputedGRPCRoute{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedGRPCRoute) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedGRPCRoute) ProtoMessage() {}
-
-func (x *ComputedGRPCRoute) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedGRPCRoute.ProtoReflect.Descriptor instead.
-func (*ComputedGRPCRoute) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *ComputedGRPCRoute) GetRules() []*ComputedGRPCRouteRule {
-	if x != nil {
-		return x.Rules
-	}
-	return nil
-}
-
-type ComputedGRPCRouteRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Matches     []*GRPCRouteMatch         `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"`
-	Filters     []*GRPCRouteFilter        `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"`
-	BackendRefs []*ComputedGRPCBackendRef `protobuf:"bytes,3,rep,name=backend_refs,json=backendRefs,proto3" json:"backend_refs,omitempty"`
-	Timeouts    *HTTPRouteTimeouts        `protobuf:"bytes,4,opt,name=timeouts,proto3" json:"timeouts,omitempty"`
-	Retries     *HTTPRouteRetries         `protobuf:"bytes,5,opt,name=retries,proto3" json:"retries,omitempty"`
-}
-
-func (x *ComputedGRPCRouteRule) Reset() {
-	*x = ComputedGRPCRouteRule{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedGRPCRouteRule) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedGRPCRouteRule) ProtoMessage() {}
-
-func (x *ComputedGRPCRouteRule) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedGRPCRouteRule.ProtoReflect.Descriptor instead.
-func (*ComputedGRPCRouteRule) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *ComputedGRPCRouteRule) GetMatches() []*GRPCRouteMatch {
-	if x != nil {
-		return x.Matches
-	}
-	return nil
-}
-
-func (x *ComputedGRPCRouteRule) GetFilters() []*GRPCRouteFilter {
-	if x != nil {
-		return x.Filters
-	}
-	return nil
-}
-
-func (x *ComputedGRPCRouteRule) GetBackendRefs() []*ComputedGRPCBackendRef {
-	if x != nil {
-		return x.BackendRefs
-	}
-	return nil
-}
-
-func (x *ComputedGRPCRouteRule) GetTimeouts() *HTTPRouteTimeouts {
-	if x != nil {
-		return x.Timeouts
-	}
-	return nil
-}
-
-func (x *ComputedGRPCRouteRule) GetRetries() *HTTPRouteRetries {
-	if x != nil {
-		return x.Retries
-	}
-	return nil
-}
-
-type ComputedGRPCBackendRef struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// BackendTarget indicates which key in the targets map provides
-	// the rest of the configuration.
-	//
-	// If this field is set to the empty string, or is the sentinel value
-	// "NULL-ROUTE" is an indication that all of the traffic destined for this
-	// backend reference should be null routed in a format appropriate for the
-	// protocol (i.e. for HTTP use 5xx).
-	BackendTarget string             `protobuf:"bytes,1,opt,name=backend_target,json=backendTarget,proto3" json:"backend_target,omitempty"`
-	Weight        uint32             `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"`
-	Filters       []*GRPCRouteFilter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters,omitempty"`
-}
-
-func (x *ComputedGRPCBackendRef) Reset() {
-	*x = ComputedGRPCBackendRef{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedGRPCBackendRef) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedGRPCBackendRef) ProtoMessage() {}
-
-func (x *ComputedGRPCBackendRef) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedGRPCBackendRef.ProtoReflect.Descriptor instead.
-func (*ComputedGRPCBackendRef) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *ComputedGRPCBackendRef) GetBackendTarget() string {
-	if x != nil {
-		return x.BackendTarget
-	}
-	return ""
-}
-
-func (x *ComputedGRPCBackendRef) GetWeight() uint32 {
-	if x != nil {
-		return x.Weight
-	}
-	return 0
-}
-
-func (x *ComputedGRPCBackendRef) GetFilters() []*GRPCRouteFilter {
-	if x != nil {
-		return x.Filters
-	}
-	return nil
-}
-
-type ComputedTCPRoute struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Rules []*ComputedTCPRouteRule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
-}
-
-func (x *ComputedTCPRoute) Reset() {
-	*x = ComputedTCPRoute{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedTCPRoute) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedTCPRoute) ProtoMessage() {}
-
-func (x *ComputedTCPRoute) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedTCPRoute.ProtoReflect.Descriptor instead.
-func (*ComputedTCPRoute) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *ComputedTCPRoute) GetRules() []*ComputedTCPRouteRule {
-	if x != nil {
-		return x.Rules
-	}
-	return nil
-}
-
-type ComputedTCPRouteRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	BackendRefs []*ComputedTCPBackendRef `protobuf:"bytes,1,rep,name=backend_refs,json=backendRefs,proto3" json:"backend_refs,omitempty"`
-}
-
-func (x *ComputedTCPRouteRule) Reset() {
-	*x = ComputedTCPRouteRule{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedTCPRouteRule) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedTCPRouteRule) ProtoMessage() {}
-
-func (x *ComputedTCPRouteRule) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedTCPRouteRule.ProtoReflect.Descriptor instead.
-func (*ComputedTCPRouteRule) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *ComputedTCPRouteRule) GetBackendRefs() []*ComputedTCPBackendRef {
-	if x != nil {
-		return x.BackendRefs
-	}
-	return nil
-}
-
-// TODO: look into smuggling the target through a different typeURL, or just
-// skip in favor of letting the caller do their own lookups?
-type ComputedTCPBackendRef struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// BackendTarget indicates which key in the targets map provides
-	// the rest of the configuration.
-	//
-	// If this field is set to the empty string, or is the sentinel value
-	// "NULL-ROUTE" is an indication that all of the traffic destined for this
-	// backend reference should be null routed in a format appropriate for the
-	// protocol (i.e. for HTTP use 5xx).
-	BackendTarget string `protobuf:"bytes,1,opt,name=backend_target,json=backendTarget,proto3" json:"backend_target,omitempty"`
-	Weight        uint32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"`
-}
-
-func (x *ComputedTCPBackendRef) Reset() {
-	*x = ComputedTCPBackendRef{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedTCPBackendRef) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedTCPBackendRef) ProtoMessage() {}
-
-func (x *ComputedTCPBackendRef) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedTCPBackendRef.ProtoReflect.Descriptor instead.
-func (*ComputedTCPBackendRef) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *ComputedTCPBackendRef) GetBackendTarget() string {
-	if x != nil {
-		return x.BackendTarget
-	}
-	return ""
-}
-
-func (x *ComputedTCPBackendRef) GetWeight() uint32 {
-	if x != nil {
-		return x.Weight
-	}
-	return 0
-}
-
-type BackendTargetDetails struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Type              BackendTargetDetailsType `protobuf:"varint,1,opt,name=type,proto3,enum=hashicorp.consul.mesh.v2beta1.BackendTargetDetailsType" json:"type,omitempty"`
-	BackendRef        *BackendReference        `protobuf:"bytes,2,opt,name=backend_ref,json=backendRef,proto3" json:"backend_ref,omitempty"`
-	MeshPort          string                   `protobuf:"bytes,3,opt,name=mesh_port,json=meshPort,proto3" json:"mesh_port,omitempty"`
-	FailoverConfig    *ComputedFailoverConfig  `protobuf:"bytes,4,opt,name=failover_config,json=failoverConfig,proto3" json:"failover_config,omitempty"`
-	DestinationConfig *DestinationConfig       `protobuf:"bytes,5,opt,name=destination_config,json=destinationConfig,proto3" json:"destination_config,omitempty"`
-	// ServiceEndpointsID is not populated naturally and the field exists only for
-	// downstream consumers.
-	ServiceEndpointsId *pbresource.ID `protobuf:"bytes,21,opt,name=service_endpoints_id,json=serviceEndpointsId,proto3" json:"service_endpoints_id,omitempty"`
-	// ServiceEndpoints is not populated naturally and the field exists only for
-	// downstream consumers.
-	ServiceEndpoints *v2beta1.ServiceEndpoints `protobuf:"bytes,22,opt,name=service_endpoints,json=serviceEndpoints,proto3" json:"service_endpoints,omitempty"`
-	// IdentityRefs are not populated naturally and the field exists only for
-	// downstream consumers.
-	IdentityRefs []*pbresource.Reference `protobuf:"bytes,23,rep,name=identity_refs,json=identityRefs,proto3" json:"identity_refs,omitempty"`
-}
-
-func (x *BackendTargetDetails) Reset() {
-	*x = BackendTargetDetails{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *BackendTargetDetails) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*BackendTargetDetails) ProtoMessage() {}
-
-func (x *BackendTargetDetails) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use BackendTargetDetails.ProtoReflect.Descriptor instead.
-func (*BackendTargetDetails) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *BackendTargetDetails) GetType() BackendTargetDetailsType {
-	if x != nil {
-		return x.Type
-	}
-	return BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_UNSPECIFIED
-}
-
-func (x *BackendTargetDetails) GetBackendRef() *BackendReference {
-	if x != nil {
-		return x.BackendRef
-	}
-	return nil
-}
-
-func (x *BackendTargetDetails) GetMeshPort() string {
-	if x != nil {
-		return x.MeshPort
-	}
-	return ""
-}
-
-func (x *BackendTargetDetails) GetFailoverConfig() *ComputedFailoverConfig {
-	if x != nil {
-		return x.FailoverConfig
-	}
-	return nil
-}
-
-func (x *BackendTargetDetails) GetDestinationConfig() *DestinationConfig {
-	if x != nil {
-		return x.DestinationConfig
-	}
-	return nil
-}
-
-func (x *BackendTargetDetails) GetServiceEndpointsId() *pbresource.ID {
-	if x != nil {
-		return x.ServiceEndpointsId
-	}
-	return nil
-}
-
-func (x *BackendTargetDetails) GetServiceEndpoints() *v2beta1.ServiceEndpoints {
-	if x != nil {
-		return x.ServiceEndpoints
-	}
-	return nil
-}
-
-func (x *BackendTargetDetails) GetIdentityRefs() []*pbresource.Reference {
-	if x != nil {
-		return x.IdentityRefs
-	}
-	return nil
-}
-
-type ComputedFailoverConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Destinations []*ComputedFailoverDestination `protobuf:"bytes,1,rep,name=destinations,proto3" json:"destinations,omitempty"`
-	Mode         v2beta1.FailoverMode           `protobuf:"varint,2,opt,name=mode,proto3,enum=hashicorp.consul.catalog.v2beta1.FailoverMode" json:"mode,omitempty"`
-	Regions      []string                       `protobuf:"bytes,3,rep,name=regions,proto3" json:"regions,omitempty"`
-	// SamenessGroup specifies the sameness group to failover to.
-	SamenessGroup string `protobuf:"bytes,4,opt,name=sameness_group,json=samenessGroup,proto3" json:"sameness_group,omitempty"`
-}
-
-func (x *ComputedFailoverConfig) Reset() {
-	*x = ComputedFailoverConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedFailoverConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedFailoverConfig) ProtoMessage() {}
-
-func (x *ComputedFailoverConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedFailoverConfig.ProtoReflect.Descriptor instead.
-func (*ComputedFailoverConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *ComputedFailoverConfig) GetDestinations() []*ComputedFailoverDestination {
-	if x != nil {
-		return x.Destinations
-	}
-	return nil
-}
-
-func (x *ComputedFailoverConfig) GetMode() v2beta1.FailoverMode {
-	if x != nil {
-		return x.Mode
-	}
-	return v2beta1.FailoverMode(0)
-}
-
-func (x *ComputedFailoverConfig) GetRegions() []string {
-	if x != nil {
-		return x.Regions
-	}
-	return nil
-}
-
-func (x *ComputedFailoverConfig) GetSamenessGroup() string {
-	if x != nil {
-		return x.SamenessGroup
-	}
-	return ""
-}
-
-type ComputedFailoverDestination struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// This must be a Service.
-	BackendTarget string `protobuf:"bytes,1,opt,name=backend_target,json=backendTarget,proto3" json:"backend_target,omitempty"`
-}
-
-func (x *ComputedFailoverDestination) Reset() {
-	*x = ComputedFailoverDestination{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedFailoverDestination) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedFailoverDestination) ProtoMessage() {}
-
-func (x *ComputedFailoverDestination) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_computed_routes_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ComputedFailoverDestination.ProtoReflect.Descriptor instead.
-func (*ComputedFailoverDestination) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP(), []int{13}
-}
-
-func (x *ComputedFailoverDestination) GetBackendTarget() string {
-	if x != nil {
-		return x.BackendTarget
-	}
-	return ""
-}
-
-var File_pbmesh_v2beta1_computed_routes_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_computed_routes_proto_rawDesc = []byte{
-	0x0a, 0x24, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x27, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67,
-	0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x66, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65,
-	0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20,
-	0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x29, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x65, 0x6e, 0x64, 0x70,
-	0x6f, 0x69, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x70, 0x62, 0x6d,
-	0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x27, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68,
-	0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x1f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x1f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x1a, 0x27, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x72,
-	0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x28, 0x70, 0x62,
-	0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x68, 0x74, 0x74,
-	0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0xc7, 0x02, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74,
-	0x65, 0x73, 0x12, 0x67, 0x0a, 0x0e, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x75,
-	0x74, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x50, 0x6f, 0x72, 0x74, 0x65, 0x64,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0d, 0x70, 0x6f,
-	0x72, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x12, 0x4f, 0x0a, 0x10, 0x62,
-	0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x0f, 0x62, 0x6f, 0x75,
-	0x6e, 0x64, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x1a, 0x73, 0x0a, 0x12,
-	0x50, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x47, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x50, 0x6f, 0x72, 0x74,
-	0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0x87, 0x05, 0x0a, 0x12, 0x43, 0x6f,
-	0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73,
-	0x12, 0x46, 0x0a, 0x04, 0x68, 0x74, 0x74, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43,
-	0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65,
-	0x48, 0x00, 0x52, 0x04, 0x68, 0x74, 0x74, 0x70, 0x12, 0x46, 0x0a, 0x04, 0x67, 0x72, 0x70, 0x63,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x47,
-	0x52, 0x50, 0x43, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x48, 0x00, 0x52, 0x04, 0x67, 0x72, 0x70, 0x63,
-	0x12, 0x43, 0x0a, 0x03, 0x74, 0x63, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f,
-	0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x48, 0x00,
-	0x52, 0x03, 0x74, 0x63, 0x70, 0x12, 0x30, 0x0a, 0x14, 0x75, 0x73, 0x69, 0x6e, 0x67, 0x5f, 0x64,
-	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x12, 0x75, 0x73, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4d, 0x0a, 0x0a, 0x70, 0x61, 0x72, 0x65, 0x6e,
-	0x74, 0x5f, 0x72, 0x65, 0x66, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x65,
-	0x6e, 0x74, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x09, 0x70, 0x61, 0x72,
-	0x65, 0x6e, 0x74, 0x52, 0x65, 0x66, 0x12, 0x46, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61,
-	0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x63, 0x6f, 0x6c, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x58,
-	0x0a, 0x07, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x6f, 0x75, 0x74,
-	0x65, 0x73, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x07, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x1a, 0x6f, 0x0a, 0x0c, 0x54, 0x61, 0x72, 0x67,
-	0x65, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x49, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e,
-	0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x22, 0x65, 0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x48,
-	0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x4a, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64,
-	0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x05, 0x72,
-	0x75, 0x6c, 0x65, 0x73, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x22, 0x9d, 0x03, 0x0a, 0x15, 0x43,
-	0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65,
-	0x52, 0x75, 0x6c, 0x65, 0x12, 0x47, 0x0a, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x52, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x12, 0x48, 0x0a,
-	0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48,
-	0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x07,
-	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x58, 0x0a, 0x0c, 0x62, 0x61, 0x63, 0x6b, 0x65,
-	0x6e, 0x64, 0x5f, 0x72, 0x65, 0x66, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f,
-	0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x48, 0x54, 0x54, 0x50, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e,
-	0x64, 0x52, 0x65, 0x66, 0x52, 0x0b, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66,
-	0x73, 0x12, 0x4c, 0x0a, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x54, 0x69, 0x6d,
-	0x65, 0x6f, 0x75, 0x74, 0x73, 0x52, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x12,
-	0x49, 0x0a, 0x07, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65,
-	0x73, 0x52, 0x07, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x22, 0xa1, 0x01, 0x0a, 0x16, 0x43,
-	0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x48, 0x54, 0x54, 0x50, 0x42, 0x61, 0x63, 0x6b, 0x65,
-	0x6e, 0x64, 0x52, 0x65, 0x66, 0x12, 0x25, 0x0a, 0x0e, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64,
-	0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x62,
-	0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x16, 0x0a, 0x06,
-	0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x77, 0x65,
-	0x69, 0x67, 0x68, 0x74, 0x12, 0x48, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x46,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x22, 0x65,
-	0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x47, 0x52, 0x50, 0x43, 0x52, 0x6f,
-	0x75, 0x74, 0x65, 0x12, 0x4a, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x47, 0x52, 0x50, 0x43, 0x52,
-	0x6f, 0x75, 0x74, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x4a,
-	0x04, 0x08, 0x01, 0x10, 0x02, 0x22, 0x9d, 0x03, 0x0a, 0x15, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74,
-	0x65, 0x64, 0x47, 0x52, 0x50, 0x43, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x12,
-	0x47, 0x0a, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x47, 0x52, 0x50, 0x43, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52,
-	0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x47, 0x52, 0x50, 0x43, 0x52, 0x6f,
-	0x75, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x73, 0x12, 0x58, 0x0a, 0x0c, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x5f, 0x72, 0x65,
-	0x66, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65,
-	0x64, 0x47, 0x52, 0x50, 0x43, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x52,
-	0x0b, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x73, 0x12, 0x4c, 0x0a, 0x08,
-	0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48,
-	0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73,
-	0x52, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x12, 0x49, 0x0a, 0x07, 0x72, 0x65,
-	0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50,
-	0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x52, 0x07, 0x72, 0x65,
-	0x74, 0x72, 0x69, 0x65, 0x73, 0x22, 0xa1, 0x01, 0x0a, 0x16, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74,
-	0x65, 0x64, 0x47, 0x52, 0x50, 0x43, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66,
-	0x12, 0x25, 0x0a, 0x0e, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x61, 0x72, 0x67,
-	0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e,
-	0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68,
-	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12,
-	0x48, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x47, 0x52, 0x50, 0x43, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x22, 0x5d, 0x0a, 0x10, 0x43, 0x6f, 0x6d,
-	0x70, 0x75, 0x74, 0x65, 0x64, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x49, 0x0a,
-	0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x6d,
-	0x70, 0x75, 0x74, 0x65, 0x64, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x75, 0x6c,
-	0x65, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x22, 0x6f, 0x0a, 0x14, 0x43, 0x6f, 0x6d, 0x70,
-	0x75, 0x74, 0x65, 0x64, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x75, 0x6c, 0x65,
-	0x12, 0x57, 0x0a, 0x0c, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x5f, 0x72, 0x65, 0x66, 0x73,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x54,
-	0x43, 0x50, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x52, 0x0b, 0x62, 0x61,
-	0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x73, 0x22, 0x56, 0x0a, 0x15, 0x43, 0x6f, 0x6d,
-	0x70, 0x75, 0x74, 0x65, 0x64, 0x54, 0x43, 0x50, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52,
-	0x65, 0x66, 0x12, 0x25, 0x0a, 0x0e, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x61,
-	0x72, 0x67, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x62, 0x61, 0x63, 0x6b,
-	0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65, 0x69,
-	0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68,
-	0x74, 0x22, 0x96, 0x05, 0x0a, 0x14, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72,
-	0x67, 0x65, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x4b, 0x0a, 0x04, 0x74, 0x79,
-	0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64,
-	0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x54, 0x79, 0x70,
-	0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x50, 0x0a, 0x0b, 0x62, 0x61, 0x63, 0x6b, 0x65,
-	0x6e, 0x64, 0x5f, 0x72, 0x65, 0x66, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x42, 0x61, 0x63,
-	0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x0a, 0x62,
-	0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x65, 0x73,
-	0x68, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6d, 0x65,
-	0x73, 0x68, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x5e, 0x0a, 0x0f, 0x66, 0x61, 0x69, 0x6c, 0x6f, 0x76,
-	0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5f, 0x0a, 0x12, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x52, 0x11, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4f, 0x0a, 0x14, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x5f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x5f, 0x69, 0x64, 0x18,
-	0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x2e, 0x49, 0x44, 0x52, 0x12, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x45, 0x6e, 0x64,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x49, 0x64, 0x12, 0x5f, 0x0a, 0x11, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x5f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x16, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x45, 0x6e,
-	0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x52, 0x10, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x49, 0x0a, 0x0d, 0x69, 0x64, 0x65,
-	0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x72, 0x65, 0x66, 0x73, 0x18, 0x17, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x24, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x66,
-	0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x0c, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
-	0x52, 0x65, 0x66, 0x73, 0x4a, 0x04, 0x08, 0x06, 0x10, 0x15, 0x22, 0xfd, 0x01, 0x0a, 0x16, 0x43,
-	0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5e, 0x0a, 0x0c, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70,
-	0x75, 0x74, 0x65, 0x64, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x44, 0x65, 0x73, 0x74,
-	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x42, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x4d,
-	0x6f, 0x64, 0x65, 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x67,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x67, 0x69,
-	0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x5f,
-	0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x61, 0x6d,
-	0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x44, 0x0a, 0x1b, 0x43, 0x6f,
-	0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x44, 0x65,
-	0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x25, 0x0a, 0x0e, 0x62, 0x61, 0x63,
-	0x6b, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0d, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74,
-	0x2a, 0x99, 0x01, 0x0a, 0x18, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67,
-	0x65, 0x74, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2b, 0x0a,
-	0x27, 0x42, 0x41, 0x43, 0x4b, 0x45, 0x4e, 0x44, 0x5f, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f,
-	0x44, 0x45, 0x54, 0x41, 0x49, 0x4c, 0x53, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53,
-	0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x26, 0x0a, 0x22, 0x42, 0x41,
-	0x43, 0x4b, 0x45, 0x4e, 0x44, 0x5f, 0x54, 0x41, 0x52, 0x47, 0x45, 0x54, 0x5f, 0x44, 0x45, 0x54,
-	0x41, 0x49, 0x4c, 0x53, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54,
-	0x10, 0x01, 0x12, 0x28, 0x0a, 0x24, 0x42, 0x41, 0x43, 0x4b, 0x45, 0x4e, 0x44, 0x5f, 0x54, 0x41,
-	0x52, 0x47, 0x45, 0x54, 0x5f, 0x44, 0x45, 0x54, 0x41, 0x49, 0x4c, 0x53, 0x5f, 0x54, 0x59, 0x50,
-	0x45, 0x5f, 0x49, 0x4e, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x10, 0x02, 0x42, 0x94, 0x02, 0x0a,
-	0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x42, 0x13, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x52, 0x6f, 0x75, 0x74,
-	0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62,
-	0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x3b, 0x6d, 0x65, 0x73, 0x68, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02,
-	0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x29, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0xea, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_computed_routes_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_computed_routes_proto_rawDescData = file_pbmesh_v2beta1_computed_routes_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_computed_routes_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_computed_routes_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_computed_routes_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_computed_routes_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_computed_routes_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_computed_routes_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbmesh_v2beta1_computed_routes_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
-var file_pbmesh_v2beta1_computed_routes_proto_goTypes = []interface{}{
-	(BackendTargetDetailsType)(0),       // 0: hashicorp.consul.mesh.v2beta1.BackendTargetDetailsType
-	(*ComputedRoutes)(nil),              // 1: hashicorp.consul.mesh.v2beta1.ComputedRoutes
-	(*ComputedPortRoutes)(nil),          // 2: hashicorp.consul.mesh.v2beta1.ComputedPortRoutes
-	(*ComputedHTTPRoute)(nil),           // 3: hashicorp.consul.mesh.v2beta1.ComputedHTTPRoute
-	(*ComputedHTTPRouteRule)(nil),       // 4: hashicorp.consul.mesh.v2beta1.ComputedHTTPRouteRule
-	(*ComputedHTTPBackendRef)(nil),      // 5: hashicorp.consul.mesh.v2beta1.ComputedHTTPBackendRef
-	(*ComputedGRPCRoute)(nil),           // 6: hashicorp.consul.mesh.v2beta1.ComputedGRPCRoute
-	(*ComputedGRPCRouteRule)(nil),       // 7: hashicorp.consul.mesh.v2beta1.ComputedGRPCRouteRule
-	(*ComputedGRPCBackendRef)(nil),      // 8: hashicorp.consul.mesh.v2beta1.ComputedGRPCBackendRef
-	(*ComputedTCPRoute)(nil),            // 9: hashicorp.consul.mesh.v2beta1.ComputedTCPRoute
-	(*ComputedTCPRouteRule)(nil),        // 10: hashicorp.consul.mesh.v2beta1.ComputedTCPRouteRule
-	(*ComputedTCPBackendRef)(nil),       // 11: hashicorp.consul.mesh.v2beta1.ComputedTCPBackendRef
-	(*BackendTargetDetails)(nil),        // 12: hashicorp.consul.mesh.v2beta1.BackendTargetDetails
-	(*ComputedFailoverConfig)(nil),      // 13: hashicorp.consul.mesh.v2beta1.ComputedFailoverConfig
-	(*ComputedFailoverDestination)(nil), // 14: hashicorp.consul.mesh.v2beta1.ComputedFailoverDestination
-	nil,                                 // 15: hashicorp.consul.mesh.v2beta1.ComputedRoutes.PortedConfigsEntry
-	nil,                                 // 16: hashicorp.consul.mesh.v2beta1.ComputedPortRoutes.TargetsEntry
-	(*pbresource.Reference)(nil),        // 17: hashicorp.consul.resource.Reference
-	(*ParentReference)(nil),             // 18: hashicorp.consul.mesh.v2beta1.ParentReference
-	(v2beta1.Protocol)(0),               // 19: hashicorp.consul.catalog.v2beta1.Protocol
-	(*HTTPRouteMatch)(nil),              // 20: hashicorp.consul.mesh.v2beta1.HTTPRouteMatch
-	(*HTTPRouteFilter)(nil),             // 21: hashicorp.consul.mesh.v2beta1.HTTPRouteFilter
-	(*HTTPRouteTimeouts)(nil),           // 22: hashicorp.consul.mesh.v2beta1.HTTPRouteTimeouts
-	(*HTTPRouteRetries)(nil),            // 23: hashicorp.consul.mesh.v2beta1.HTTPRouteRetries
-	(*GRPCRouteMatch)(nil),              // 24: hashicorp.consul.mesh.v2beta1.GRPCRouteMatch
-	(*GRPCRouteFilter)(nil),             // 25: hashicorp.consul.mesh.v2beta1.GRPCRouteFilter
-	(*BackendReference)(nil),            // 26: hashicorp.consul.mesh.v2beta1.BackendReference
-	(*DestinationConfig)(nil),           // 27: hashicorp.consul.mesh.v2beta1.DestinationConfig
-	(*pbresource.ID)(nil),               // 28: hashicorp.consul.resource.ID
-	(*v2beta1.ServiceEndpoints)(nil),    // 29: hashicorp.consul.catalog.v2beta1.ServiceEndpoints
-	(v2beta1.FailoverMode)(0),           // 30: hashicorp.consul.catalog.v2beta1.FailoverMode
-}
-var file_pbmesh_v2beta1_computed_routes_proto_depIdxs = []int32{
-	15, // 0: hashicorp.consul.mesh.v2beta1.ComputedRoutes.ported_configs:type_name -> hashicorp.consul.mesh.v2beta1.ComputedRoutes.PortedConfigsEntry
-	17, // 1: hashicorp.consul.mesh.v2beta1.ComputedRoutes.bound_references:type_name -> hashicorp.consul.resource.Reference
-	3,  // 2: hashicorp.consul.mesh.v2beta1.ComputedPortRoutes.http:type_name -> hashicorp.consul.mesh.v2beta1.ComputedHTTPRoute
-	6,  // 3: hashicorp.consul.mesh.v2beta1.ComputedPortRoutes.grpc:type_name -> hashicorp.consul.mesh.v2beta1.ComputedGRPCRoute
-	9,  // 4: hashicorp.consul.mesh.v2beta1.ComputedPortRoutes.tcp:type_name -> hashicorp.consul.mesh.v2beta1.ComputedTCPRoute
-	18, // 5: hashicorp.consul.mesh.v2beta1.ComputedPortRoutes.parent_ref:type_name -> hashicorp.consul.mesh.v2beta1.ParentReference
-	19, // 6: hashicorp.consul.mesh.v2beta1.ComputedPortRoutes.protocol:type_name -> hashicorp.consul.catalog.v2beta1.Protocol
-	16, // 7: hashicorp.consul.mesh.v2beta1.ComputedPortRoutes.targets:type_name -> hashicorp.consul.mesh.v2beta1.ComputedPortRoutes.TargetsEntry
-	4,  // 8: hashicorp.consul.mesh.v2beta1.ComputedHTTPRoute.rules:type_name -> hashicorp.consul.mesh.v2beta1.ComputedHTTPRouteRule
-	20, // 9: hashicorp.consul.mesh.v2beta1.ComputedHTTPRouteRule.matches:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteMatch
-	21, // 10: hashicorp.consul.mesh.v2beta1.ComputedHTTPRouteRule.filters:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteFilter
-	5,  // 11: hashicorp.consul.mesh.v2beta1.ComputedHTTPRouteRule.backend_refs:type_name -> hashicorp.consul.mesh.v2beta1.ComputedHTTPBackendRef
-	22, // 12: hashicorp.consul.mesh.v2beta1.ComputedHTTPRouteRule.timeouts:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteTimeouts
-	23, // 13: hashicorp.consul.mesh.v2beta1.ComputedHTTPRouteRule.retries:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteRetries
-	21, // 14: hashicorp.consul.mesh.v2beta1.ComputedHTTPBackendRef.filters:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteFilter
-	7,  // 15: hashicorp.consul.mesh.v2beta1.ComputedGRPCRoute.rules:type_name -> hashicorp.consul.mesh.v2beta1.ComputedGRPCRouteRule
-	24, // 16: hashicorp.consul.mesh.v2beta1.ComputedGRPCRouteRule.matches:type_name -> hashicorp.consul.mesh.v2beta1.GRPCRouteMatch
-	25, // 17: hashicorp.consul.mesh.v2beta1.ComputedGRPCRouteRule.filters:type_name -> hashicorp.consul.mesh.v2beta1.GRPCRouteFilter
-	8,  // 18: hashicorp.consul.mesh.v2beta1.ComputedGRPCRouteRule.backend_refs:type_name -> hashicorp.consul.mesh.v2beta1.ComputedGRPCBackendRef
-	22, // 19: hashicorp.consul.mesh.v2beta1.ComputedGRPCRouteRule.timeouts:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteTimeouts
-	23, // 20: hashicorp.consul.mesh.v2beta1.ComputedGRPCRouteRule.retries:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteRetries
-	25, // 21: hashicorp.consul.mesh.v2beta1.ComputedGRPCBackendRef.filters:type_name -> hashicorp.consul.mesh.v2beta1.GRPCRouteFilter
-	10, // 22: hashicorp.consul.mesh.v2beta1.ComputedTCPRoute.rules:type_name -> hashicorp.consul.mesh.v2beta1.ComputedTCPRouteRule
-	11, // 23: hashicorp.consul.mesh.v2beta1.ComputedTCPRouteRule.backend_refs:type_name -> hashicorp.consul.mesh.v2beta1.ComputedTCPBackendRef
-	0,  // 24: hashicorp.consul.mesh.v2beta1.BackendTargetDetails.type:type_name -> hashicorp.consul.mesh.v2beta1.BackendTargetDetailsType
-	26, // 25: hashicorp.consul.mesh.v2beta1.BackendTargetDetails.backend_ref:type_name -> hashicorp.consul.mesh.v2beta1.BackendReference
-	13, // 26: hashicorp.consul.mesh.v2beta1.BackendTargetDetails.failover_config:type_name -> hashicorp.consul.mesh.v2beta1.ComputedFailoverConfig
-	27, // 27: hashicorp.consul.mesh.v2beta1.BackendTargetDetails.destination_config:type_name -> hashicorp.consul.mesh.v2beta1.DestinationConfig
-	28, // 28: hashicorp.consul.mesh.v2beta1.BackendTargetDetails.service_endpoints_id:type_name -> hashicorp.consul.resource.ID
-	29, // 29: hashicorp.consul.mesh.v2beta1.BackendTargetDetails.service_endpoints:type_name -> hashicorp.consul.catalog.v2beta1.ServiceEndpoints
-	17, // 30: hashicorp.consul.mesh.v2beta1.BackendTargetDetails.identity_refs:type_name -> hashicorp.consul.resource.Reference
-	14, // 31: hashicorp.consul.mesh.v2beta1.ComputedFailoverConfig.destinations:type_name -> hashicorp.consul.mesh.v2beta1.ComputedFailoverDestination
-	30, // 32: hashicorp.consul.mesh.v2beta1.ComputedFailoverConfig.mode:type_name -> hashicorp.consul.catalog.v2beta1.FailoverMode
-	2,  // 33: hashicorp.consul.mesh.v2beta1.ComputedRoutes.PortedConfigsEntry.value:type_name -> hashicorp.consul.mesh.v2beta1.ComputedPortRoutes
-	12, // 34: hashicorp.consul.mesh.v2beta1.ComputedPortRoutes.TargetsEntry.value:type_name -> hashicorp.consul.mesh.v2beta1.BackendTargetDetails
-	35, // [35:35] is the sub-list for method output_type
-	35, // [35:35] is the sub-list for method input_type
-	35, // [35:35] is the sub-list for extension type_name
-	35, // [35:35] is the sub-list for extension extendee
-	0,  // [0:35] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_computed_routes_proto_init() }
-func file_pbmesh_v2beta1_computed_routes_proto_init() {
-	if File_pbmesh_v2beta1_computed_routes_proto != nil {
-		return
-	}
-	file_pbmesh_v2beta1_common_proto_init()
-	file_pbmesh_v2beta1_destination_policy_proto_init()
-	file_pbmesh_v2beta1_grpc_route_proto_init()
-	file_pbmesh_v2beta1_http_route_proto_init()
-	file_pbmesh_v2beta1_http_route_retries_proto_init()
-	file_pbmesh_v2beta1_http_route_timeouts_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_computed_routes_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedRoutes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_computed_routes_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedPortRoutes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_computed_routes_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedHTTPRoute); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_computed_routes_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedHTTPRouteRule); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_computed_routes_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedHTTPBackendRef); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_computed_routes_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedGRPCRoute); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_computed_routes_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedGRPCRouteRule); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_computed_routes_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedGRPCBackendRef); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_computed_routes_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedTCPRoute); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_computed_routes_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedTCPRouteRule); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_computed_routes_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedTCPBackendRef); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_computed_routes_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BackendTargetDetails); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_computed_routes_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedFailoverConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_computed_routes_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedFailoverDestination); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbmesh_v2beta1_computed_routes_proto_msgTypes[1].OneofWrappers = []interface{}{
-		(*ComputedPortRoutes_Http)(nil),
-		(*ComputedPortRoutes_Grpc)(nil),
-		(*ComputedPortRoutes_Tcp)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_computed_routes_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   16,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_computed_routes_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_computed_routes_proto_depIdxs,
-		EnumInfos:         file_pbmesh_v2beta1_computed_routes_proto_enumTypes,
-		MessageInfos:      file_pbmesh_v2beta1_computed_routes_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_computed_routes_proto = out.File
-	file_pbmesh_v2beta1_computed_routes_proto_rawDesc = nil
-	file_pbmesh_v2beta1_computed_routes_proto_goTypes = nil
-	file_pbmesh_v2beta1_computed_routes_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/computed_routes.proto b/proto-public/pbmesh/v2beta1/computed_routes.proto
deleted file mode 100644
index 09ebb3a31fe23..0000000000000
--- a/proto-public/pbmesh/v2beta1/computed_routes.proto
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "pbcatalog/v2beta1/failover_policy.proto";
-import "pbcatalog/v2beta1/protocol.proto";
-import "pbcatalog/v2beta1/service_endpoints.proto";
-import "pbmesh/v2beta1/common.proto";
-import "pbmesh/v2beta1/destination_policy.proto";
-import "pbmesh/v2beta1/grpc_route.proto";
-import "pbmesh/v2beta1/http_route.proto";
-import "pbmesh/v2beta1/http_route_retries.proto";
-import "pbmesh/v2beta1/http_route_timeouts.proto";
-import "pbresource/annotations.proto";
-import "pbresource/resource.proto";
-
-// This is a Resource type.
-message ComputedRoutes {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  map<string, ComputedPortRoutes> ported_configs = 1;
-
-  // BoundReferences is a slice of mixed type references of resources that were
-  // involved in the formulation of this resource.
-  repeated hashicorp.consul.resource.Reference bound_references = 2;
-}
-
-message ComputedPortRoutes {
-  oneof config {
-    ComputedHTTPRoute http = 1;
-    ComputedGRPCRoute grpc = 2;
-    ComputedTCPRoute tcp = 3;
-  }
-  bool using_default_config = 4; // TODO
-
-  ParentReference parent_ref = 5;
-  // Protocol is the ParentRef.Port's protocol. It is based on the value in the
-  // Service object, but may differ depending upon which xRoutes are actually
-  // in use.
-  hashicorp.consul.catalog.v2beta1.Protocol protocol = 6;
-
-  // map key is an opaque string; like disco chain target name
-  map<string, BackendTargetDetails> targets = 7;
-}
-
-message ComputedHTTPRoute {
-  reserved 1; // hostnames
-  repeated ComputedHTTPRouteRule rules = 2;
-}
-
-message ComputedHTTPRouteRule {
-  repeated HTTPRouteMatch matches = 1;
-  repeated HTTPRouteFilter filters = 2;
-  repeated ComputedHTTPBackendRef backend_refs = 3;
-  HTTPRouteTimeouts timeouts = 4;
-  HTTPRouteRetries retries = 5;
-}
-
-message ComputedHTTPBackendRef {
-  // BackendTarget indicates which key in the targets map provides
-  // the rest of the configuration.
-  //
-  // If this field is set to the empty string, or is the sentinel value
-  // "NULL-ROUTE" is an indication that all of the traffic destined for this
-  // backend reference should be null routed in a format appropriate for the
-  // protocol (i.e. for HTTP use 5xx).
-  string backend_target = 1;
-  uint32 weight = 2;
-  repeated HTTPRouteFilter filters = 3;
-}
-
-message ComputedGRPCRoute {
-  reserved 1; // hostnames
-  repeated ComputedGRPCRouteRule rules = 2;
-}
-
-message ComputedGRPCRouteRule {
-  repeated GRPCRouteMatch matches = 1;
-  repeated GRPCRouteFilter filters = 2;
-  repeated ComputedGRPCBackendRef backend_refs = 3;
-  HTTPRouteTimeouts timeouts = 4;
-  HTTPRouteRetries retries = 5;
-}
-
-message ComputedGRPCBackendRef {
-  // BackendTarget indicates which key in the targets map provides
-  // the rest of the configuration.
-  //
-  // If this field is set to the empty string, or is the sentinel value
-  // "NULL-ROUTE" is an indication that all of the traffic destined for this
-  // backend reference should be null routed in a format appropriate for the
-  // protocol (i.e. for HTTP use 5xx).
-  string backend_target = 1;
-  uint32 weight = 2;
-  repeated GRPCRouteFilter filters = 3;
-}
-
-message ComputedTCPRoute {
-  repeated ComputedTCPRouteRule rules = 1;
-}
-
-message ComputedTCPRouteRule {
-  repeated ComputedTCPBackendRef backend_refs = 1;
-}
-
-// TODO: look into smuggling the target through a different typeURL, or just
-// skip in favor of letting the caller do their own lookups?
-message ComputedTCPBackendRef {
-  // BackendTarget indicates which key in the targets map provides
-  // the rest of the configuration.
-  //
-  // If this field is set to the empty string, or is the sentinel value
-  // "NULL-ROUTE" is an indication that all of the traffic destined for this
-  // backend reference should be null routed in a format appropriate for the
-  // protocol (i.e. for HTTP use 5xx).
-  string backend_target = 1;
-  uint32 weight = 2;
-}
-
-message BackendTargetDetails {
-  BackendTargetDetailsType type = 1;
-  BackendReference backend_ref = 2;
-
-  string mesh_port = 3;
-  ComputedFailoverConfig failover_config = 4;
-  DestinationConfig destination_config = 5;
-
-  reserved 6 to 20; // leaving a gap between computed and retroactively added fields.
-
-  // ServiceEndpointsID is not populated naturally and the field exists only for
-  // downstream consumers.
-  hashicorp.consul.resource.ID service_endpoints_id = 21;
-
-  // ServiceEndpoints is not populated naturally and the field exists only for
-  // downstream consumers.
-  hashicorp.consul.catalog.v2beta1.ServiceEndpoints service_endpoints = 22;
-
-  // IdentityRefs are not populated naturally and the field exists only for
-  // downstream consumers.
-  repeated hashicorp.consul.resource.Reference identity_refs = 23;
-}
-
-enum BackendTargetDetailsType {
-  BACKEND_TARGET_DETAILS_TYPE_UNSPECIFIED = 0;
-
-  // Direct means that the target is directly routable from a route. This does
-  // not mean that the target is not also indirect though.
-  BACKEND_TARGET_DETAILS_TYPE_DIRECT = 1;
-
-  // Indirect means that the target is not directly routable from a route.
-  //
-  // One example would be for a FailoverPolicy destination.
-  BACKEND_TARGET_DETAILS_TYPE_INDIRECT = 2;
-}
-
-message ComputedFailoverConfig {
-  repeated ComputedFailoverDestination destinations = 1;
-  hashicorp.consul.catalog.v2beta1.FailoverMode mode = 2;
-  repeated string regions = 3;
-
-  // SamenessGroup specifies the sameness group to failover to.
-  string sameness_group = 4;
-}
-
-message ComputedFailoverDestination {
-  // This must be a Service.
-  string backend_target = 1;
-}
diff --git a/proto-public/pbmesh/v2beta1/connection.pb.binary.go b/proto-public/pbmesh/v2beta1/connection.pb.binary.go
deleted file mode 100644
index 4ea017a273fb4..0000000000000
--- a/proto-public/pbmesh/v2beta1/connection.pb.binary.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/connection.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ConnectionConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ConnectionConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *InboundConnectionsConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *InboundConnectionsConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/connection.pb.go b/proto-public/pbmesh/v2beta1/connection.pb.go
deleted file mode 100644
index b1009ba22af75..0000000000000
--- a/proto-public/pbmesh/v2beta1/connection.pb.go
+++ /dev/null
@@ -1,324 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/connection.proto
-
-package meshv2beta1
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type BalanceConnections int32
-
-const (
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	BalanceConnections_BALANCE_CONNECTIONS_DEFAULT BalanceConnections = 0
-	BalanceConnections_BALANCE_CONNECTIONS_EXACT   BalanceConnections = 1
-)
-
-// Enum value maps for BalanceConnections.
-var (
-	BalanceConnections_name = map[int32]string{
-		0: "BALANCE_CONNECTIONS_DEFAULT",
-		1: "BALANCE_CONNECTIONS_EXACT",
-	}
-	BalanceConnections_value = map[string]int32{
-		"BALANCE_CONNECTIONS_DEFAULT": 0,
-		"BALANCE_CONNECTIONS_EXACT":   1,
-	}
-)
-
-func (x BalanceConnections) Enum() *BalanceConnections {
-	p := new(BalanceConnections)
-	*p = x
-	return p
-}
-
-func (x BalanceConnections) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (BalanceConnections) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_connection_proto_enumTypes[0].Descriptor()
-}
-
-func (BalanceConnections) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_connection_proto_enumTypes[0]
-}
-
-func (x BalanceConnections) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use BalanceConnections.Descriptor instead.
-func (BalanceConnections) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_connection_proto_rawDescGZIP(), []int{0}
-}
-
-// Referenced by ProxyConfiguration
-type ConnectionConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ConnectTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"`
-	RequestTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"`
-}
-
-func (x *ConnectionConfig) Reset() {
-	*x = ConnectionConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_connection_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ConnectionConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ConnectionConfig) ProtoMessage() {}
-
-func (x *ConnectionConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_connection_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ConnectionConfig.ProtoReflect.Descriptor instead.
-func (*ConnectionConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_connection_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ConnectionConfig) GetConnectTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.ConnectTimeout
-	}
-	return nil
-}
-
-func (x *ConnectionConfig) GetRequestTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.RequestTimeout
-	}
-	return nil
-}
-
-// Referenced by ProxyConfiguration
-type InboundConnectionsConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	MaxInboundConnections     uint64             `protobuf:"varint,12,opt,name=max_inbound_connections,json=maxInboundConnections,proto3" json:"max_inbound_connections,omitempty"`
-	BalanceInboundConnections BalanceConnections `protobuf:"varint,13,opt,name=balance_inbound_connections,json=balanceInboundConnections,proto3,enum=hashicorp.consul.mesh.v2beta1.BalanceConnections" json:"balance_inbound_connections,omitempty"`
-}
-
-func (x *InboundConnectionsConfig) Reset() {
-	*x = InboundConnectionsConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_connection_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *InboundConnectionsConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*InboundConnectionsConfig) ProtoMessage() {}
-
-func (x *InboundConnectionsConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_connection_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use InboundConnectionsConfig.ProtoReflect.Descriptor instead.
-func (*InboundConnectionsConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_connection_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *InboundConnectionsConfig) GetMaxInboundConnections() uint64 {
-	if x != nil {
-		return x.MaxInboundConnections
-	}
-	return 0
-}
-
-func (x *InboundConnectionsConfig) GetBalanceInboundConnections() BalanceConnections {
-	if x != nil {
-		return x.BalanceInboundConnections
-	}
-	return BalanceConnections_BALANCE_CONNECTIONS_DEFAULT
-}
-
-var File_pbmesh_v2beta1_connection_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_connection_proto_rawDesc = []byte{
-	0x0a, 0x1f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x22, 0x9a, 0x01, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x42, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x42, 0x0a, 0x0f, 0x72, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x72,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x22, 0xc5, 0x01,
-	0x0a, 0x18, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x36, 0x0a, 0x17, 0x6d, 0x61,
-	0x78, 0x5f, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x04, 0x52, 0x15, 0x6d, 0x61, 0x78,
-	0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x12, 0x71, 0x0a, 0x1b, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x6e,
-	0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x19, 0x62, 0x61, 0x6c, 0x61,
-	0x6e, 0x63, 0x65, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2a, 0x54, 0x0a, 0x12, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65,
-	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x1b, 0x42,
-	0x41, 0x4c, 0x41, 0x4e, 0x43, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x49, 0x4f,
-	0x4e, 0x53, 0x5f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00, 0x12, 0x1d, 0x0a, 0x19,
-	0x42, 0x41, 0x4c, 0x41, 0x4e, 0x43, 0x45, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x49,
-	0x4f, 0x4e, 0x53, 0x5f, 0x45, 0x58, 0x41, 0x43, 0x54, 0x10, 0x01, 0x42, 0x90, 0x02, 0x0a, 0x21,
-	0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x42, 0x0f, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70,
-	0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x6d, 0x65,
-	0x73, 0x68, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa,
-	0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca,
-	0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2,
-	0x02, 0x29, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c,
-	0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a,
-	0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_connection_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_connection_proto_rawDescData = file_pbmesh_v2beta1_connection_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_connection_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_connection_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_connection_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_connection_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_connection_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_connection_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbmesh_v2beta1_connection_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_pbmesh_v2beta1_connection_proto_goTypes = []interface{}{
-	(BalanceConnections)(0),          // 0: hashicorp.consul.mesh.v2beta1.BalanceConnections
-	(*ConnectionConfig)(nil),         // 1: hashicorp.consul.mesh.v2beta1.ConnectionConfig
-	(*InboundConnectionsConfig)(nil), // 2: hashicorp.consul.mesh.v2beta1.InboundConnectionsConfig
-	(*durationpb.Duration)(nil),      // 3: google.protobuf.Duration
-}
-var file_pbmesh_v2beta1_connection_proto_depIdxs = []int32{
-	3, // 0: hashicorp.consul.mesh.v2beta1.ConnectionConfig.connect_timeout:type_name -> google.protobuf.Duration
-	3, // 1: hashicorp.consul.mesh.v2beta1.ConnectionConfig.request_timeout:type_name -> google.protobuf.Duration
-	0, // 2: hashicorp.consul.mesh.v2beta1.InboundConnectionsConfig.balance_inbound_connections:type_name -> hashicorp.consul.mesh.v2beta1.BalanceConnections
-	3, // [3:3] is the sub-list for method output_type
-	3, // [3:3] is the sub-list for method input_type
-	3, // [3:3] is the sub-list for extension type_name
-	3, // [3:3] is the sub-list for extension extendee
-	0, // [0:3] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_connection_proto_init() }
-func file_pbmesh_v2beta1_connection_proto_init() {
-	if File_pbmesh_v2beta1_connection_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_connection_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ConnectionConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_connection_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InboundConnectionsConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_connection_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_connection_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_connection_proto_depIdxs,
-		EnumInfos:         file_pbmesh_v2beta1_connection_proto_enumTypes,
-		MessageInfos:      file_pbmesh_v2beta1_connection_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_connection_proto = out.File
-	file_pbmesh_v2beta1_connection_proto_rawDesc = nil
-	file_pbmesh_v2beta1_connection_proto_goTypes = nil
-	file_pbmesh_v2beta1_connection_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/connection.proto b/proto-public/pbmesh/v2beta1/connection.proto
deleted file mode 100644
index a0e6cb9150643..0000000000000
--- a/proto-public/pbmesh/v2beta1/connection.proto
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "google/protobuf/duration.proto";
-
-// Referenced by ProxyConfiguration
-message ConnectionConfig {
-  google.protobuf.Duration connect_timeout = 1;
-  google.protobuf.Duration request_timeout = 2;
-}
-
-// Referenced by ProxyConfiguration
-message InboundConnectionsConfig {
-  uint64 max_inbound_connections = 12;
-  BalanceConnections balance_inbound_connections = 13;
-}
-
-enum BalanceConnections {
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  BALANCE_CONNECTIONS_DEFAULT = 0;
-  BALANCE_CONNECTIONS_EXACT = 1;
-}
diff --git a/proto-public/pbmesh/v2beta1/destination_policy.pb.binary.go b/proto-public/pbmesh/v2beta1/destination_policy.pb.binary.go
deleted file mode 100644
index 777d8a8cc03b4..0000000000000
--- a/proto-public/pbmesh/v2beta1/destination_policy.pb.binary.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/destination_policy.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DestinationPolicy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DestinationPolicy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DestinationConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DestinationConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LocalityPrioritization) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LocalityPrioritization) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LoadBalancer) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LoadBalancer) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *RingHashConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *RingHashConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LeastRequestConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LeastRequestConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HashPolicy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HashPolicy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *CookieConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *CookieConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/destination_policy.pb.go b/proto-public/pbmesh/v2beta1/destination_policy.pb.go
deleted file mode 100644
index ee17c97b64b90..0000000000000
--- a/proto-public/pbmesh/v2beta1/destination_policy.pb.go
+++ /dev/null
@@ -1,1093 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/destination_policy.proto
-
-package meshv2beta1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type LocalityPrioritizationMode int32
-
-const (
-	LocalityPrioritizationMode_LOCALITY_PRIORITIZATION_MODE_UNSPECIFIED LocalityPrioritizationMode = 0
-	LocalityPrioritizationMode_LOCALITY_PRIORITIZATION_MODE_NONE        LocalityPrioritizationMode = 1
-	LocalityPrioritizationMode_LOCALITY_PRIORITIZATION_MODE_FAILOVER    LocalityPrioritizationMode = 2
-)
-
-// Enum value maps for LocalityPrioritizationMode.
-var (
-	LocalityPrioritizationMode_name = map[int32]string{
-		0: "LOCALITY_PRIORITIZATION_MODE_UNSPECIFIED",
-		1: "LOCALITY_PRIORITIZATION_MODE_NONE",
-		2: "LOCALITY_PRIORITIZATION_MODE_FAILOVER",
-	}
-	LocalityPrioritizationMode_value = map[string]int32{
-		"LOCALITY_PRIORITIZATION_MODE_UNSPECIFIED": 0,
-		"LOCALITY_PRIORITIZATION_MODE_NONE":        1,
-		"LOCALITY_PRIORITIZATION_MODE_FAILOVER":    2,
-	}
-)
-
-func (x LocalityPrioritizationMode) Enum() *LocalityPrioritizationMode {
-	p := new(LocalityPrioritizationMode)
-	*p = x
-	return p
-}
-
-func (x LocalityPrioritizationMode) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (LocalityPrioritizationMode) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_destination_policy_proto_enumTypes[0].Descriptor()
-}
-
-func (LocalityPrioritizationMode) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_destination_policy_proto_enumTypes[0]
-}
-
-func (x LocalityPrioritizationMode) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use LocalityPrioritizationMode.Descriptor instead.
-func (LocalityPrioritizationMode) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destination_policy_proto_rawDescGZIP(), []int{0}
-}
-
-type LoadBalancerPolicy int32
-
-const (
-	LoadBalancerPolicy_LOAD_BALANCER_POLICY_UNSPECIFIED   LoadBalancerPolicy = 0
-	LoadBalancerPolicy_LOAD_BALANCER_POLICY_RANDOM        LoadBalancerPolicy = 1
-	LoadBalancerPolicy_LOAD_BALANCER_POLICY_ROUND_ROBIN   LoadBalancerPolicy = 2
-	LoadBalancerPolicy_LOAD_BALANCER_POLICY_LEAST_REQUEST LoadBalancerPolicy = 3
-	LoadBalancerPolicy_LOAD_BALANCER_POLICY_MAGLEV        LoadBalancerPolicy = 4
-	LoadBalancerPolicy_LOAD_BALANCER_POLICY_RING_HASH     LoadBalancerPolicy = 5
-)
-
-// Enum value maps for LoadBalancerPolicy.
-var (
-	LoadBalancerPolicy_name = map[int32]string{
-		0: "LOAD_BALANCER_POLICY_UNSPECIFIED",
-		1: "LOAD_BALANCER_POLICY_RANDOM",
-		2: "LOAD_BALANCER_POLICY_ROUND_ROBIN",
-		3: "LOAD_BALANCER_POLICY_LEAST_REQUEST",
-		4: "LOAD_BALANCER_POLICY_MAGLEV",
-		5: "LOAD_BALANCER_POLICY_RING_HASH",
-	}
-	LoadBalancerPolicy_value = map[string]int32{
-		"LOAD_BALANCER_POLICY_UNSPECIFIED":   0,
-		"LOAD_BALANCER_POLICY_RANDOM":        1,
-		"LOAD_BALANCER_POLICY_ROUND_ROBIN":   2,
-		"LOAD_BALANCER_POLICY_LEAST_REQUEST": 3,
-		"LOAD_BALANCER_POLICY_MAGLEV":        4,
-		"LOAD_BALANCER_POLICY_RING_HASH":     5,
-	}
-)
-
-func (x LoadBalancerPolicy) Enum() *LoadBalancerPolicy {
-	p := new(LoadBalancerPolicy)
-	*p = x
-	return p
-}
-
-func (x LoadBalancerPolicy) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (LoadBalancerPolicy) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_destination_policy_proto_enumTypes[1].Descriptor()
-}
-
-func (LoadBalancerPolicy) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_destination_policy_proto_enumTypes[1]
-}
-
-func (x LoadBalancerPolicy) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use LoadBalancerPolicy.Descriptor instead.
-func (LoadBalancerPolicy) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destination_policy_proto_rawDescGZIP(), []int{1}
-}
-
-type HashPolicyField int32
-
-const (
-	HashPolicyField_HASH_POLICY_FIELD_UNSPECIFIED     HashPolicyField = 0
-	HashPolicyField_HASH_POLICY_FIELD_HEADER          HashPolicyField = 1
-	HashPolicyField_HASH_POLICY_FIELD_COOKIE          HashPolicyField = 2
-	HashPolicyField_HASH_POLICY_FIELD_QUERY_PARAMETER HashPolicyField = 3
-)
-
-// Enum value maps for HashPolicyField.
-var (
-	HashPolicyField_name = map[int32]string{
-		0: "HASH_POLICY_FIELD_UNSPECIFIED",
-		1: "HASH_POLICY_FIELD_HEADER",
-		2: "HASH_POLICY_FIELD_COOKIE",
-		3: "HASH_POLICY_FIELD_QUERY_PARAMETER",
-	}
-	HashPolicyField_value = map[string]int32{
-		"HASH_POLICY_FIELD_UNSPECIFIED":     0,
-		"HASH_POLICY_FIELD_HEADER":          1,
-		"HASH_POLICY_FIELD_COOKIE":          2,
-		"HASH_POLICY_FIELD_QUERY_PARAMETER": 3,
-	}
-)
-
-func (x HashPolicyField) Enum() *HashPolicyField {
-	p := new(HashPolicyField)
-	*p = x
-	return p
-}
-
-func (x HashPolicyField) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (HashPolicyField) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_destination_policy_proto_enumTypes[2].Descriptor()
-}
-
-func (HashPolicyField) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_destination_policy_proto_enumTypes[2]
-}
-
-func (x HashPolicyField) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use HashPolicyField.Descriptor instead.
-func (HashPolicyField) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destination_policy_proto_rawDescGZIP(), []int{2}
-}
-
-// DestinationPolicy is the destination-controlled set of defaults that
-// are used when similar controls defined in an UpstreamConfig are left
-// unspecified.
-//
-// Users may wish to share commonly configured settings for communicating with
-// a service in one place, but yet retain the ability to tweak those on a
-// client-by-client basis, which is why there are separate resources to control
-// the definition of these values from either end of the connection.
-//
-// This is a Resource type.
-type DestinationPolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PortConfigs map[string]*DestinationConfig `protobuf:"bytes,1,rep,name=port_configs,json=portConfigs,proto3" json:"port_configs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (x *DestinationPolicy) Reset() {
-	*x = DestinationPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DestinationPolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DestinationPolicy) ProtoMessage() {}
-
-func (x *DestinationPolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DestinationPolicy.ProtoReflect.Descriptor instead.
-func (*DestinationPolicy) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destination_policy_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *DestinationPolicy) GetPortConfigs() map[string]*DestinationConfig {
-	if x != nil {
-		return x.PortConfigs
-	}
-	return nil
-}
-
-type DestinationConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ConnectTimeout is the timeout for establishing new network connections
-	// to this service.
-	ConnectTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"`
-	// RequestTimeout is the timeout for an HTTP request to complete before the
-	// connection is automatically terminated. If unspecified, defaults to 15
-	// seconds.
-	RequestTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"`
-	// LoadBalancer determines the load balancing policy and configuration for
-	// services issuing requests to this upstream service.
-	LoadBalancer *LoadBalancer `protobuf:"bytes,3,opt,name=load_balancer,json=loadBalancer,proto3" json:"load_balancer,omitempty"`
-	// LocalityPrioritization controls whether the locality of services within the
-	// local partition will be used to prioritize connectivity.
-	LocalityPrioritization *LocalityPrioritization `protobuf:"bytes,4,opt,name=locality_prioritization,json=localityPrioritization,proto3" json:"locality_prioritization,omitempty"`
-}
-
-func (x *DestinationConfig) Reset() {
-	*x = DestinationConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DestinationConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DestinationConfig) ProtoMessage() {}
-
-func (x *DestinationConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DestinationConfig.ProtoReflect.Descriptor instead.
-func (*DestinationConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destination_policy_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *DestinationConfig) GetConnectTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.ConnectTimeout
-	}
-	return nil
-}
-
-func (x *DestinationConfig) GetRequestTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.RequestTimeout
-	}
-	return nil
-}
-
-func (x *DestinationConfig) GetLoadBalancer() *LoadBalancer {
-	if x != nil {
-		return x.LoadBalancer
-	}
-	return nil
-}
-
-func (x *DestinationConfig) GetLocalityPrioritization() *LocalityPrioritization {
-	if x != nil {
-		return x.LocalityPrioritization
-	}
-	return nil
-}
-
-type LocalityPrioritization struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Mode specifies the type of prioritization that will be performed
-	// when selecting nodes in the local partition.
-	// Valid values are: "" (default "none"), "none", and "failover".
-	Mode LocalityPrioritizationMode `protobuf:"varint,1,opt,name=mode,proto3,enum=hashicorp.consul.mesh.v2beta1.LocalityPrioritizationMode" json:"mode,omitempty"`
-}
-
-func (x *LocalityPrioritization) Reset() {
-	*x = LocalityPrioritization{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LocalityPrioritization) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LocalityPrioritization) ProtoMessage() {}
-
-func (x *LocalityPrioritization) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LocalityPrioritization.ProtoReflect.Descriptor instead.
-func (*LocalityPrioritization) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destination_policy_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *LocalityPrioritization) GetMode() LocalityPrioritizationMode {
-	if x != nil {
-		return x.Mode
-	}
-	return LocalityPrioritizationMode_LOCALITY_PRIORITIZATION_MODE_UNSPECIFIED
-}
-
-// LoadBalancer determines the load balancing policy and configuration
-// for services issuing requests to this upstream service.
-type LoadBalancer struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Policy is the load balancing policy used to select a host
-	Policy LoadBalancerPolicy `protobuf:"varint,1,opt,name=policy,proto3,enum=hashicorp.consul.mesh.v2beta1.LoadBalancerPolicy" json:"policy,omitempty"`
-	// HashPolicies is a list of hash policies to use for hashing load balancing
-	// algorithms. Hash policies are evaluated individually and combined such
-	// that identical lists result in the same hash.
-	//
-	// If no hash policies are present, or none are successfully evaluated,
-	// then a random backend host will be selected.
-	HashPolicies []*HashPolicy `protobuf:"bytes,2,rep,name=hash_policies,json=hashPolicies,proto3" json:"hash_policies,omitempty"`
-	// Types that are assignable to Config:
-	//
-	//	*LoadBalancer_RingHashConfig
-	//	*LoadBalancer_LeastRequestConfig
-	Config isLoadBalancer_Config `protobuf_oneof:"config"`
-}
-
-func (x *LoadBalancer) Reset() {
-	*x = LoadBalancer{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LoadBalancer) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LoadBalancer) ProtoMessage() {}
-
-func (x *LoadBalancer) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LoadBalancer.ProtoReflect.Descriptor instead.
-func (*LoadBalancer) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destination_policy_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *LoadBalancer) GetPolicy() LoadBalancerPolicy {
-	if x != nil {
-		return x.Policy
-	}
-	return LoadBalancerPolicy_LOAD_BALANCER_POLICY_UNSPECIFIED
-}
-
-func (x *LoadBalancer) GetHashPolicies() []*HashPolicy {
-	if x != nil {
-		return x.HashPolicies
-	}
-	return nil
-}
-
-func (m *LoadBalancer) GetConfig() isLoadBalancer_Config {
-	if m != nil {
-		return m.Config
-	}
-	return nil
-}
-
-func (x *LoadBalancer) GetRingHashConfig() *RingHashConfig {
-	if x, ok := x.GetConfig().(*LoadBalancer_RingHashConfig); ok {
-		return x.RingHashConfig
-	}
-	return nil
-}
-
-func (x *LoadBalancer) GetLeastRequestConfig() *LeastRequestConfig {
-	if x, ok := x.GetConfig().(*LoadBalancer_LeastRequestConfig); ok {
-		return x.LeastRequestConfig
-	}
-	return nil
-}
-
-type isLoadBalancer_Config interface {
-	isLoadBalancer_Config()
-}
-
-type LoadBalancer_RingHashConfig struct {
-	// RingHashConfig contains configuration for the "ring_hash" policy type
-	RingHashConfig *RingHashConfig `protobuf:"bytes,3,opt,name=ring_hash_config,json=ringHashConfig,proto3,oneof"`
-}
-
-type LoadBalancer_LeastRequestConfig struct {
-	// LeastRequestConfig contains configuration for the "least_request" policy type
-	LeastRequestConfig *LeastRequestConfig `protobuf:"bytes,4,opt,name=least_request_config,json=leastRequestConfig,proto3,oneof"`
-}
-
-func (*LoadBalancer_RingHashConfig) isLoadBalancer_Config() {}
-
-func (*LoadBalancer_LeastRequestConfig) isLoadBalancer_Config() {}
-
-// RingHashConfig contains configuration for the "ring_hash" policy type
-type RingHashConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// MinimumRingSize determines the minimum number of entries in the hash ring
-	MinimumRingSize uint64 `protobuf:"varint,1,opt,name=minimum_ring_size,json=minimumRingSize,proto3" json:"minimum_ring_size,omitempty"`
-	// MaximumRingSize determines the maximum number of entries in the hash ring
-	MaximumRingSize uint64 `protobuf:"varint,2,opt,name=maximum_ring_size,json=maximumRingSize,proto3" json:"maximum_ring_size,omitempty"`
-}
-
-func (x *RingHashConfig) Reset() {
-	*x = RingHashConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RingHashConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RingHashConfig) ProtoMessage() {}
-
-func (x *RingHashConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RingHashConfig.ProtoReflect.Descriptor instead.
-func (*RingHashConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destination_policy_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *RingHashConfig) GetMinimumRingSize() uint64 {
-	if x != nil {
-		return x.MinimumRingSize
-	}
-	return 0
-}
-
-func (x *RingHashConfig) GetMaximumRingSize() uint64 {
-	if x != nil {
-		return x.MaximumRingSize
-	}
-	return 0
-}
-
-// LeastRequestConfig contains configuration for the "least_request" policy type
-type LeastRequestConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ChoiceCount determines the number of random healthy hosts from which to select the one with the least requests.
-	ChoiceCount uint32 `protobuf:"varint,1,opt,name=choice_count,json=choiceCount,proto3" json:"choice_count,omitempty"`
-}
-
-func (x *LeastRequestConfig) Reset() {
-	*x = LeastRequestConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LeastRequestConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LeastRequestConfig) ProtoMessage() {}
-
-func (x *LeastRequestConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LeastRequestConfig.ProtoReflect.Descriptor instead.
-func (*LeastRequestConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destination_policy_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *LeastRequestConfig) GetChoiceCount() uint32 {
-	if x != nil {
-		return x.ChoiceCount
-	}
-	return 0
-}
-
-// HashPolicy defines which attributes will be hashed by hash-based LB algorithms
-type HashPolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Field is the attribute type to hash on.
-	// Must be one of "header","cookie", or "query_parameter".
-	// Cannot be specified along with SourceIP.
-	Field HashPolicyField `protobuf:"varint,1,opt,name=field,proto3,enum=hashicorp.consul.mesh.v2beta1.HashPolicyField" json:"field,omitempty"`
-	// FieldValue is the value to hash.
-	// ie. header name, cookie name, URL query parameter name
-	// Cannot be specified along with SourceIP.
-	FieldValue string `protobuf:"bytes,2,opt,name=field_value,json=fieldValue,proto3" json:"field_value,omitempty"`
-	// CookieConfig contains configuration for the "cookie" hash policy type.
-	CookieConfig *CookieConfig `protobuf:"bytes,3,opt,name=cookie_config,json=cookieConfig,proto3" json:"cookie_config,omitempty"`
-	// SourceIP determines whether the hash should be of the source IP rather than of a field and field value.
-	// Cannot be specified along with Field or FieldValue.
-	SourceIp bool `protobuf:"varint,4,opt,name=source_ip,json=sourceIp,proto3" json:"source_ip,omitempty"`
-	// Terminal will short circuit the computation of the hash when multiple hash policies are present.
-	// If a hash is computed when a Terminal policy is evaluated,
-	// then that hash will be used and subsequent hash policies will be ignored.
-	Terminal bool `protobuf:"varint,5,opt,name=terminal,proto3" json:"terminal,omitempty"`
-}
-
-func (x *HashPolicy) Reset() {
-	*x = HashPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HashPolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HashPolicy) ProtoMessage() {}
-
-func (x *HashPolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HashPolicy.ProtoReflect.Descriptor instead.
-func (*HashPolicy) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destination_policy_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *HashPolicy) GetField() HashPolicyField {
-	if x != nil {
-		return x.Field
-	}
-	return HashPolicyField_HASH_POLICY_FIELD_UNSPECIFIED
-}
-
-func (x *HashPolicy) GetFieldValue() string {
-	if x != nil {
-		return x.FieldValue
-	}
-	return ""
-}
-
-func (x *HashPolicy) GetCookieConfig() *CookieConfig {
-	if x != nil {
-		return x.CookieConfig
-	}
-	return nil
-}
-
-func (x *HashPolicy) GetSourceIp() bool {
-	if x != nil {
-		return x.SourceIp
-	}
-	return false
-}
-
-func (x *HashPolicy) GetTerminal() bool {
-	if x != nil {
-		return x.Terminal
-	}
-	return false
-}
-
-// CookieConfig contains configuration for the "cookie" hash policy type.
-// This is specified to have Envoy generate a cookie for a client on its first request.
-type CookieConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Generates a session cookie with no expiration.
-	Session bool `protobuf:"varint,1,opt,name=session,proto3" json:"session,omitempty"`
-	// TTL for generated cookies. Cannot be specified for session cookies.
-	Ttl *durationpb.Duration `protobuf:"bytes,2,opt,name=ttl,proto3" json:"ttl,omitempty"`
-	// The path to set for the cookie
-	Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"`
-}
-
-func (x *CookieConfig) Reset() {
-	*x = CookieConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CookieConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CookieConfig) ProtoMessage() {}
-
-func (x *CookieConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destination_policy_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CookieConfig.ProtoReflect.Descriptor instead.
-func (*CookieConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destination_policy_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *CookieConfig) GetSession() bool {
-	if x != nil {
-		return x.Session
-	}
-	return false
-}
-
-func (x *CookieConfig) GetTtl() *durationpb.Duration {
-	if x != nil {
-		return x.Ttl
-	}
-	return nil
-}
-
-func (x *CookieConfig) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-var File_pbmesh_v2beta1_destination_policy_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_destination_policy_proto_rawDesc = []byte{
-	0x0a, 0x27, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf3, 0x01, 0x0a, 0x11, 0x44, 0x65, 0x73, 0x74, 0x69,
-	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x64, 0x0a, 0x0c,
-	0x70, 0x6f, 0x72, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x41, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f,
-	0x6c, 0x69, 0x63, 0x79, 0x2e, 0x50, 0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x73, 0x1a, 0x70, 0x0a, 0x10, 0x50, 0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x46, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0xdd, 0x02, 0x0a,
-	0x11, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x42, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x74, 0x69,
-	0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x42, 0x0a, 0x0f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x72, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x50, 0x0a, 0x0d, 0x6c, 0x6f,
-	0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x52, 0x0c,
-	0x6c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x12, 0x6e, 0x0a, 0x17,
-	0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74,
-	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4c, 0x6f,
-	0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x16, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x50, 0x72,
-	0x69, 0x6f, 0x72, 0x69, 0x74, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x67, 0x0a, 0x16,
-	0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x69,
-	0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4d, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x50, 0x72, 0x69,
-	0x6f, 0x72, 0x69, 0x74, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x52,
-	0x04, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0xf5, 0x02, 0x0a, 0x0c, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61,
-	0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x12, 0x49, 0x0a, 0x06, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e,
-	0x63, 0x65, 0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x06, 0x70, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x12, 0x4e, 0x0a, 0x0d, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69,
-	0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x52, 0x0c, 0x68, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65,
-	0x73, 0x12, 0x59, 0x0a, 0x10, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x52, 0x69, 0x6e, 0x67,
-	0x48, 0x61, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x0e, 0x72, 0x69,
-	0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x65, 0x0a, 0x14,
-	0x6c, 0x65, 0x61, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4c, 0x65, 0x61, 0x73, 0x74,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52,
-	0x12, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x42, 0x08, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x68, 0x0a,
-	0x0e, 0x52, 0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x2a, 0x0a, 0x11, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x5f, 0x72, 0x69, 0x6e, 0x67, 0x5f,
-	0x73, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0f, 0x6d, 0x69, 0x6e, 0x69,
-	0x6d, 0x75, 0x6d, 0x52, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x2a, 0x0a, 0x11, 0x6d,
-	0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x5f, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x69, 0x7a, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0f, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x52,
-	0x69, 0x6e, 0x67, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x37, 0x0a, 0x12, 0x4c, 0x65, 0x61, 0x73, 0x74,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x21, 0x0a,
-	0x0c, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0d, 0x52, 0x0b, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74,
-	0x22, 0xfe, 0x01, 0x0a, 0x0a, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12,
-	0x44, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48,
-	0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x05,
-	0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x66, 0x69, 0x65, 0x6c,
-	0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x50, 0x0a, 0x0d, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65,
-	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f,
-	0x6f, 0x6b, 0x69, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0c, 0x63, 0x6f, 0x6f, 0x6b,
-	0x69, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x5f, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x49, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61,
-	0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61,
-	0x6c, 0x22, 0x69, 0x0a, 0x0c, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x07, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x03, 0x74,
-	0x74, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x2a, 0x9c, 0x01, 0x0a,
-	0x1a, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74,
-	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x2c, 0x0a, 0x28, 0x4c,
-	0x4f, 0x43, 0x41, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x50, 0x52, 0x49, 0x4f, 0x52, 0x49, 0x54, 0x49,
-	0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50,
-	0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x25, 0x0a, 0x21, 0x4c, 0x4f, 0x43,
-	0x41, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x50, 0x52, 0x49, 0x4f, 0x52, 0x49, 0x54, 0x49, 0x5a, 0x41,
-	0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x01,
-	0x12, 0x29, 0x0a, 0x25, 0x4c, 0x4f, 0x43, 0x41, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x50, 0x52, 0x49,
-	0x4f, 0x52, 0x49, 0x54, 0x49, 0x5a, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4d, 0x4f, 0x44, 0x45,
-	0x5f, 0x46, 0x41, 0x49, 0x4c, 0x4f, 0x56, 0x45, 0x52, 0x10, 0x02, 0x2a, 0xee, 0x01, 0x0a, 0x12,
-	0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x50, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x12, 0x24, 0x0a, 0x20, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x42, 0x41, 0x4c, 0x41, 0x4e,
-	0x43, 0x45, 0x52, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45,
-	0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1f, 0x0a, 0x1b, 0x4c, 0x4f, 0x41, 0x44,
-	0x5f, 0x42, 0x41, 0x4c, 0x41, 0x4e, 0x43, 0x45, 0x52, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59,
-	0x5f, 0x52, 0x41, 0x4e, 0x44, 0x4f, 0x4d, 0x10, 0x01, 0x12, 0x24, 0x0a, 0x20, 0x4c, 0x4f, 0x41,
-	0x44, 0x5f, 0x42, 0x41, 0x4c, 0x41, 0x4e, 0x43, 0x45, 0x52, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43,
-	0x59, 0x5f, 0x52, 0x4f, 0x55, 0x4e, 0x44, 0x5f, 0x52, 0x4f, 0x42, 0x49, 0x4e, 0x10, 0x02, 0x12,
-	0x26, 0x0a, 0x22, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x42, 0x41, 0x4c, 0x41, 0x4e, 0x43, 0x45, 0x52,
-	0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x4c, 0x45, 0x41, 0x53, 0x54, 0x5f, 0x52, 0x45,
-	0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x03, 0x12, 0x1f, 0x0a, 0x1b, 0x4c, 0x4f, 0x41, 0x44, 0x5f,
-	0x42, 0x41, 0x4c, 0x41, 0x4e, 0x43, 0x45, 0x52, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f,
-	0x4d, 0x41, 0x47, 0x4c, 0x45, 0x56, 0x10, 0x04, 0x12, 0x22, 0x0a, 0x1e, 0x4c, 0x4f, 0x41, 0x44,
-	0x5f, 0x42, 0x41, 0x4c, 0x41, 0x4e, 0x43, 0x45, 0x52, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59,
-	0x5f, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x48, 0x41, 0x53, 0x48, 0x10, 0x05, 0x2a, 0x97, 0x01, 0x0a,
-	0x0f, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x46, 0x69, 0x65, 0x6c, 0x64,
-	0x12, 0x21, 0x0a, 0x1d, 0x48, 0x41, 0x53, 0x48, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f,
-	0x46, 0x49, 0x45, 0x4c, 0x44, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
-	0x44, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x48, 0x41, 0x53, 0x48, 0x5f, 0x50, 0x4f, 0x4c, 0x49,
-	0x43, 0x59, 0x5f, 0x46, 0x49, 0x45, 0x4c, 0x44, 0x5f, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x10,
-	0x01, 0x12, 0x1c, 0x0a, 0x18, 0x48, 0x41, 0x53, 0x48, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59,
-	0x5f, 0x46, 0x49, 0x45, 0x4c, 0x44, 0x5f, 0x43, 0x4f, 0x4f, 0x4b, 0x49, 0x45, 0x10, 0x02, 0x12,
-	0x25, 0x0a, 0x21, 0x48, 0x41, 0x53, 0x48, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x46,
-	0x49, 0x45, 0x4c, 0x44, 0x5f, 0x51, 0x55, 0x45, 0x52, 0x59, 0x5f, 0x50, 0x41, 0x52, 0x41, 0x4d,
-	0x45, 0x54, 0x45, 0x52, 0x10, 0x03, 0x42, 0x97, 0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x16, 0x44, 0x65,
-	0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
-	0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b,
-	0x6d, 0x65, 0x73, 0x68, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43,
-	0x4d, 0xaa, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0xca, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0xe2, 0x02, 0x29, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_destination_policy_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_destination_policy_proto_rawDescData = file_pbmesh_v2beta1_destination_policy_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_destination_policy_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_destination_policy_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_destination_policy_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_destination_policy_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_destination_policy_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_destination_policy_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
-var file_pbmesh_v2beta1_destination_policy_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
-var file_pbmesh_v2beta1_destination_policy_proto_goTypes = []interface{}{
-	(LocalityPrioritizationMode)(0), // 0: hashicorp.consul.mesh.v2beta1.LocalityPrioritizationMode
-	(LoadBalancerPolicy)(0),         // 1: hashicorp.consul.mesh.v2beta1.LoadBalancerPolicy
-	(HashPolicyField)(0),            // 2: hashicorp.consul.mesh.v2beta1.HashPolicyField
-	(*DestinationPolicy)(nil),       // 3: hashicorp.consul.mesh.v2beta1.DestinationPolicy
-	(*DestinationConfig)(nil),       // 4: hashicorp.consul.mesh.v2beta1.DestinationConfig
-	(*LocalityPrioritization)(nil),  // 5: hashicorp.consul.mesh.v2beta1.LocalityPrioritization
-	(*LoadBalancer)(nil),            // 6: hashicorp.consul.mesh.v2beta1.LoadBalancer
-	(*RingHashConfig)(nil),          // 7: hashicorp.consul.mesh.v2beta1.RingHashConfig
-	(*LeastRequestConfig)(nil),      // 8: hashicorp.consul.mesh.v2beta1.LeastRequestConfig
-	(*HashPolicy)(nil),              // 9: hashicorp.consul.mesh.v2beta1.HashPolicy
-	(*CookieConfig)(nil),            // 10: hashicorp.consul.mesh.v2beta1.CookieConfig
-	nil,                             // 11: hashicorp.consul.mesh.v2beta1.DestinationPolicy.PortConfigsEntry
-	(*durationpb.Duration)(nil),     // 12: google.protobuf.Duration
-}
-var file_pbmesh_v2beta1_destination_policy_proto_depIdxs = []int32{
-	11, // 0: hashicorp.consul.mesh.v2beta1.DestinationPolicy.port_configs:type_name -> hashicorp.consul.mesh.v2beta1.DestinationPolicy.PortConfigsEntry
-	12, // 1: hashicorp.consul.mesh.v2beta1.DestinationConfig.connect_timeout:type_name -> google.protobuf.Duration
-	12, // 2: hashicorp.consul.mesh.v2beta1.DestinationConfig.request_timeout:type_name -> google.protobuf.Duration
-	6,  // 3: hashicorp.consul.mesh.v2beta1.DestinationConfig.load_balancer:type_name -> hashicorp.consul.mesh.v2beta1.LoadBalancer
-	5,  // 4: hashicorp.consul.mesh.v2beta1.DestinationConfig.locality_prioritization:type_name -> hashicorp.consul.mesh.v2beta1.LocalityPrioritization
-	0,  // 5: hashicorp.consul.mesh.v2beta1.LocalityPrioritization.mode:type_name -> hashicorp.consul.mesh.v2beta1.LocalityPrioritizationMode
-	1,  // 6: hashicorp.consul.mesh.v2beta1.LoadBalancer.policy:type_name -> hashicorp.consul.mesh.v2beta1.LoadBalancerPolicy
-	9,  // 7: hashicorp.consul.mesh.v2beta1.LoadBalancer.hash_policies:type_name -> hashicorp.consul.mesh.v2beta1.HashPolicy
-	7,  // 8: hashicorp.consul.mesh.v2beta1.LoadBalancer.ring_hash_config:type_name -> hashicorp.consul.mesh.v2beta1.RingHashConfig
-	8,  // 9: hashicorp.consul.mesh.v2beta1.LoadBalancer.least_request_config:type_name -> hashicorp.consul.mesh.v2beta1.LeastRequestConfig
-	2,  // 10: hashicorp.consul.mesh.v2beta1.HashPolicy.field:type_name -> hashicorp.consul.mesh.v2beta1.HashPolicyField
-	10, // 11: hashicorp.consul.mesh.v2beta1.HashPolicy.cookie_config:type_name -> hashicorp.consul.mesh.v2beta1.CookieConfig
-	12, // 12: hashicorp.consul.mesh.v2beta1.CookieConfig.ttl:type_name -> google.protobuf.Duration
-	4,  // 13: hashicorp.consul.mesh.v2beta1.DestinationPolicy.PortConfigsEntry.value:type_name -> hashicorp.consul.mesh.v2beta1.DestinationConfig
-	14, // [14:14] is the sub-list for method output_type
-	14, // [14:14] is the sub-list for method input_type
-	14, // [14:14] is the sub-list for extension type_name
-	14, // [14:14] is the sub-list for extension extendee
-	0,  // [0:14] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_destination_policy_proto_init() }
-func file_pbmesh_v2beta1_destination_policy_proto_init() {
-	if File_pbmesh_v2beta1_destination_policy_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_destination_policy_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DestinationPolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destination_policy_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DestinationConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destination_policy_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LocalityPrioritization); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destination_policy_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LoadBalancer); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destination_policy_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RingHashConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destination_policy_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LeastRequestConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destination_policy_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HashPolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destination_policy_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CookieConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbmesh_v2beta1_destination_policy_proto_msgTypes[3].OneofWrappers = []interface{}{
-		(*LoadBalancer_RingHashConfig)(nil),
-		(*LoadBalancer_LeastRequestConfig)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_destination_policy_proto_rawDesc,
-			NumEnums:      3,
-			NumMessages:   9,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_destination_policy_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_destination_policy_proto_depIdxs,
-		EnumInfos:         file_pbmesh_v2beta1_destination_policy_proto_enumTypes,
-		MessageInfos:      file_pbmesh_v2beta1_destination_policy_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_destination_policy_proto = out.File
-	file_pbmesh_v2beta1_destination_policy_proto_rawDesc = nil
-	file_pbmesh_v2beta1_destination_policy_proto_goTypes = nil
-	file_pbmesh_v2beta1_destination_policy_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/destination_policy.proto b/proto-public/pbmesh/v2beta1/destination_policy.proto
deleted file mode 100644
index a5fd32e238e1a..0000000000000
--- a/proto-public/pbmesh/v2beta1/destination_policy.proto
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "google/protobuf/duration.proto";
-import "pbresource/annotations.proto";
-
-// DestinationPolicy is the destination-controlled set of defaults that
-// are used when similar controls defined in an UpstreamConfig are left
-// unspecified.
-//
-// Users may wish to share commonly configured settings for communicating with
-// a service in one place, but yet retain the ability to tweak those on a
-// client-by-client basis, which is why there are separate resources to control
-// the definition of these values from either end of the connection.
-//
-// This is a Resource type.
-message DestinationPolicy {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  map<string, DestinationConfig> port_configs = 1;
-}
-
-message DestinationConfig {
-  // ConnectTimeout is the timeout for establishing new network connections
-  // to this service.
-  google.protobuf.Duration connect_timeout = 1;
-
-  // RequestTimeout is the timeout for an HTTP request to complete before the
-  // connection is automatically terminated. If unspecified, defaults to 15
-  // seconds.
-  google.protobuf.Duration request_timeout = 2;
-
-  // LoadBalancer determines the load balancing policy and configuration for
-  // services issuing requests to this upstream service.
-  LoadBalancer load_balancer = 3;
-
-  // LocalityPrioritization controls whether the locality of services within the
-  // local partition will be used to prioritize connectivity.
-  LocalityPrioritization locality_prioritization = 4;
-}
-
-message LocalityPrioritization {
-  // Mode specifies the type of prioritization that will be performed
-  // when selecting nodes in the local partition.
-  // Valid values are: "" (default "none"), "none", and "failover".
-  LocalityPrioritizationMode mode = 1;
-}
-
-enum LocalityPrioritizationMode {
-  LOCALITY_PRIORITIZATION_MODE_UNSPECIFIED = 0;
-  LOCALITY_PRIORITIZATION_MODE_NONE = 1;
-  LOCALITY_PRIORITIZATION_MODE_FAILOVER = 2;
-}
-
-// LoadBalancer determines the load balancing policy and configuration
-// for services issuing requests to this upstream service.
-//
-message LoadBalancer {
-  // Policy is the load balancing policy used to select a host
-  LoadBalancerPolicy policy = 1;
-
-  // HashPolicies is a list of hash policies to use for hashing load balancing
-  // algorithms. Hash policies are evaluated individually and combined such
-  // that identical lists result in the same hash.
-  //
-  // If no hash policies are present, or none are successfully evaluated,
-  // then a random backend host will be selected.
-  repeated HashPolicy hash_policies = 2;
-
-  oneof config {
-    // RingHashConfig contains configuration for the "ring_hash" policy type
-    RingHashConfig ring_hash_config = 3;
-
-    // LeastRequestConfig contains configuration for the "least_request" policy type
-    LeastRequestConfig least_request_config = 4;
-  }
-}
-
-enum LoadBalancerPolicy {
-  LOAD_BALANCER_POLICY_UNSPECIFIED = 0;
-  LOAD_BALANCER_POLICY_RANDOM = 1;
-  LOAD_BALANCER_POLICY_ROUND_ROBIN = 2;
-  LOAD_BALANCER_POLICY_LEAST_REQUEST = 3;
-  LOAD_BALANCER_POLICY_MAGLEV = 4;
-  LOAD_BALANCER_POLICY_RING_HASH = 5;
-}
-
-// RingHashConfig contains configuration for the "ring_hash" policy type
-message RingHashConfig {
-  // MinimumRingSize determines the minimum number of entries in the hash ring
-  uint64 minimum_ring_size = 1;
-
-  // MaximumRingSize determines the maximum number of entries in the hash ring
-  uint64 maximum_ring_size = 2;
-}
-
-// LeastRequestConfig contains configuration for the "least_request" policy type
-message LeastRequestConfig {
-  // ChoiceCount determines the number of random healthy hosts from which to select the one with the least requests.
-  uint32 choice_count = 1;
-}
-
-// HashPolicy defines which attributes will be hashed by hash-based LB algorithms
-message HashPolicy {
-  // Field is the attribute type to hash on.
-  // Must be one of "header","cookie", or "query_parameter".
-  // Cannot be specified along with SourceIP.
-  HashPolicyField field = 1;
-
-  // FieldValue is the value to hash.
-  // ie. header name, cookie name, URL query parameter name
-  // Cannot be specified along with SourceIP.
-  string field_value = 2;
-
-  // CookieConfig contains configuration for the "cookie" hash policy type.
-  CookieConfig cookie_config = 3;
-
-  // SourceIP determines whether the hash should be of the source IP rather than of a field and field value.
-  // Cannot be specified along with Field or FieldValue.
-  bool source_ip = 4;
-
-  // Terminal will short circuit the computation of the hash when multiple hash policies are present.
-  // If a hash is computed when a Terminal policy is evaluated,
-  // then that hash will be used and subsequent hash policies will be ignored.
-  bool terminal = 5;
-}
-
-enum HashPolicyField {
-  HASH_POLICY_FIELD_UNSPECIFIED = 0;
-  HASH_POLICY_FIELD_HEADER = 1;
-  HASH_POLICY_FIELD_COOKIE = 2;
-  HASH_POLICY_FIELD_QUERY_PARAMETER = 3;
-}
-
-// CookieConfig contains configuration for the "cookie" hash policy type.
-// This is specified to have Envoy generate a cookie for a client on its first request.
-message CookieConfig {
-  // Generates a session cookie with no expiration.
-  bool session = 1;
-
-  // TTL for generated cookies. Cannot be specified for session cookies.
-  google.protobuf.Duration ttl = 2;
-
-  // The path to set for the cookie
-  string path = 3;
-}
diff --git a/proto-public/pbmesh/v2beta1/destinations.pb.binary.go b/proto-public/pbmesh/v2beta1/destinations.pb.binary.go
deleted file mode 100644
index 6716785708c0b..0000000000000
--- a/proto-public/pbmesh/v2beta1/destinations.pb.binary.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/destinations.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Destinations) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Destinations) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Destination) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Destination) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *IPPortAddress) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *IPPortAddress) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *UnixSocketAddress) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *UnixSocketAddress) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *PreparedQueryDestination) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *PreparedQueryDestination) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/destinations.pb.go b/proto-public/pbmesh/v2beta1/destinations.pb.go
deleted file mode 100644
index 0fe229cee8153..0000000000000
--- a/proto-public/pbmesh/v2beta1/destinations.pb.go
+++ /dev/null
@@ -1,670 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/destinations.proto
-
-package meshv2beta1
-
-import (
-	v2beta1 "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbresource "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Destinations struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Selection of workloads these destinations should apply to.
-	// These can be prefixes or specific workload names.
-	Workloads *v2beta1.WorkloadSelector `protobuf:"bytes,1,opt,name=workloads,proto3" json:"workloads,omitempty"`
-	// destinations is the list of explicit destinations to define for the selected workloads.
-	Destinations []*Destination `protobuf:"bytes,2,rep,name=destinations,proto3" json:"destinations,omitempty"`
-	// pq_destinations is the list of prepared query destinations. This field is not supported directly in v2
-	// and should only be used for migration reasons.
-	PqDestinations []*PreparedQueryDestination `protobuf:"bytes,3,rep,name=pq_destinations,json=pqDestinations,proto3" json:"pq_destinations,omitempty"`
-}
-
-func (x *Destinations) Reset() {
-	*x = Destinations{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destinations_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Destinations) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Destinations) ProtoMessage() {}
-
-func (x *Destinations) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destinations_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Destinations.ProtoReflect.Descriptor instead.
-func (*Destinations) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destinations_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Destinations) GetWorkloads() *v2beta1.WorkloadSelector {
-	if x != nil {
-		return x.Workloads
-	}
-	return nil
-}
-
-func (x *Destinations) GetDestinations() []*Destination {
-	if x != nil {
-		return x.Destinations
-	}
-	return nil
-}
-
-func (x *Destinations) GetPqDestinations() []*PreparedQueryDestination {
-	if x != nil {
-		return x.PqDestinations
-	}
-	return nil
-}
-
-type Destination struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// destination_ref is the reference to an destination service. This has to be pbcatalog.Service type.
-	DestinationRef *pbresource.Reference `protobuf:"bytes,1,opt,name=destination_ref,json=destinationRef,proto3" json:"destination_ref,omitempty"`
-	// destination_port is the port name of the destination service. This should be the name
-	// of the service's target port.
-	DestinationPort string `protobuf:"bytes,2,opt,name=destination_port,json=destinationPort,proto3" json:"destination_port,omitempty"`
-	// datacenter is the datacenter for where this destination service lives.
-	Datacenter string `protobuf:"bytes,3,opt,name=datacenter,proto3" json:"datacenter,omitempty"`
-	// listen_addr is the address where Envoy will listen for requests to this destination.
-	// It can provided either as an ip:port or as a Unix domain socket.
-	//
-	// Types that are assignable to ListenAddr:
-	//
-	//	*Destination_IpPort
-	//	*Destination_Unix
-	ListenAddr isDestination_ListenAddr `protobuf_oneof:"listen_addr"`
-}
-
-func (x *Destination) Reset() {
-	*x = Destination{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destinations_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Destination) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Destination) ProtoMessage() {}
-
-func (x *Destination) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destinations_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Destination.ProtoReflect.Descriptor instead.
-func (*Destination) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destinations_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Destination) GetDestinationRef() *pbresource.Reference {
-	if x != nil {
-		return x.DestinationRef
-	}
-	return nil
-}
-
-func (x *Destination) GetDestinationPort() string {
-	if x != nil {
-		return x.DestinationPort
-	}
-	return ""
-}
-
-func (x *Destination) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-func (m *Destination) GetListenAddr() isDestination_ListenAddr {
-	if m != nil {
-		return m.ListenAddr
-	}
-	return nil
-}
-
-func (x *Destination) GetIpPort() *IPPortAddress {
-	if x, ok := x.GetListenAddr().(*Destination_IpPort); ok {
-		return x.IpPort
-	}
-	return nil
-}
-
-func (x *Destination) GetUnix() *UnixSocketAddress {
-	if x, ok := x.GetListenAddr().(*Destination_Unix); ok {
-		return x.Unix
-	}
-	return nil
-}
-
-type isDestination_ListenAddr interface {
-	isDestination_ListenAddr()
-}
-
-type Destination_IpPort struct {
-	IpPort *IPPortAddress `protobuf:"bytes,4,opt,name=ip_port,json=ipPort,proto3,oneof"`
-}
-
-type Destination_Unix struct {
-	Unix *UnixSocketAddress `protobuf:"bytes,5,opt,name=unix,proto3,oneof"`
-}
-
-func (*Destination_IpPort) isDestination_ListenAddr() {}
-
-func (*Destination_Unix) isDestination_ListenAddr() {}
-
-type IPPortAddress struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ip is an IPv4 or an IPv6 address.
-	Ip string `protobuf:"bytes,1,opt,name=ip,proto3" json:"ip,omitempty"`
-	// port is the port number.
-	Port uint32 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"`
-}
-
-func (x *IPPortAddress) Reset() {
-	*x = IPPortAddress{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destinations_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IPPortAddress) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IPPortAddress) ProtoMessage() {}
-
-func (x *IPPortAddress) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destinations_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IPPortAddress.ProtoReflect.Descriptor instead.
-func (*IPPortAddress) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destinations_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *IPPortAddress) GetIp() string {
-	if x != nil {
-		return x.Ip
-	}
-	return ""
-}
-
-func (x *IPPortAddress) GetPort() uint32 {
-	if x != nil {
-		return x.Port
-	}
-	return 0
-}
-
-type UnixSocketAddress struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// path is the file system path at which to bind a Unix domain socket listener.
-	Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
-	// mode is the Unix file mode for the socket file. It should be provided
-	// in the numeric notation, for example, "0600".
-	Mode string `protobuf:"bytes,2,opt,name=mode,proto3" json:"mode,omitempty"`
-}
-
-func (x *UnixSocketAddress) Reset() {
-	*x = UnixSocketAddress{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destinations_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UnixSocketAddress) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UnixSocketAddress) ProtoMessage() {}
-
-func (x *UnixSocketAddress) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destinations_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UnixSocketAddress.ProtoReflect.Descriptor instead.
-func (*UnixSocketAddress) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destinations_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *UnixSocketAddress) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-func (x *UnixSocketAddress) GetMode() string {
-	if x != nil {
-		return x.Mode
-	}
-	return ""
-}
-
-type PreparedQueryDestination struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// name is the name of the prepared query to use as an destination.
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	// datacenter is the datacenter for where this destination service lives.
-	Datacenter string `protobuf:"bytes,2,opt,name=datacenter,proto3" json:"datacenter,omitempty"`
-	// listen_addr is the address where Envoy will listen for requests to this destination.
-	// It can provided either as an ip:port or as a Unix domain socket.
-	//
-	// Types that are assignable to ListenAddr:
-	//
-	//	*PreparedQueryDestination_Tcp
-	//	*PreparedQueryDestination_Unix
-	ListenAddr        isPreparedQueryDestination_ListenAddr `protobuf_oneof:"listen_addr"`
-	DestinationConfig *DestinationConfiguration             `protobuf:"bytes,6,opt,name=destination_config,json=destinationConfig,proto3" json:"destination_config,omitempty"`
-}
-
-func (x *PreparedQueryDestination) Reset() {
-	*x = PreparedQueryDestination{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destinations_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PreparedQueryDestination) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PreparedQueryDestination) ProtoMessage() {}
-
-func (x *PreparedQueryDestination) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destinations_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PreparedQueryDestination.ProtoReflect.Descriptor instead.
-func (*PreparedQueryDestination) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destinations_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *PreparedQueryDestination) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *PreparedQueryDestination) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-func (m *PreparedQueryDestination) GetListenAddr() isPreparedQueryDestination_ListenAddr {
-	if m != nil {
-		return m.ListenAddr
-	}
-	return nil
-}
-
-func (x *PreparedQueryDestination) GetTcp() *IPPortAddress {
-	if x, ok := x.GetListenAddr().(*PreparedQueryDestination_Tcp); ok {
-		return x.Tcp
-	}
-	return nil
-}
-
-func (x *PreparedQueryDestination) GetUnix() *UnixSocketAddress {
-	if x, ok := x.GetListenAddr().(*PreparedQueryDestination_Unix); ok {
-		return x.Unix
-	}
-	return nil
-}
-
-func (x *PreparedQueryDestination) GetDestinationConfig() *DestinationConfiguration {
-	if x != nil {
-		return x.DestinationConfig
-	}
-	return nil
-}
-
-type isPreparedQueryDestination_ListenAddr interface {
-	isPreparedQueryDestination_ListenAddr()
-}
-
-type PreparedQueryDestination_Tcp struct {
-	Tcp *IPPortAddress `protobuf:"bytes,4,opt,name=tcp,proto3,oneof"`
-}
-
-type PreparedQueryDestination_Unix struct {
-	Unix *UnixSocketAddress `protobuf:"bytes,5,opt,name=unix,proto3,oneof"`
-}
-
-func (*PreparedQueryDestination_Tcp) isPreparedQueryDestination_ListenAddr() {}
-
-func (*PreparedQueryDestination_Unix) isPreparedQueryDestination_ListenAddr() {}
-
-var File_pbmesh_v2beta1_destinations_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_destinations_proto_rawDesc = []byte{
-	0x0a, 0x21, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x1a, 0x20, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2f, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9a,
-	0x02, 0x0a, 0x0c, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
-	0x50, 0x0a, 0x09, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x65,
-	0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x09, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64,
-	0x73, 0x12, 0x4e, 0x0a, 0x0c, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x60, 0x0a, 0x0f, 0x70, 0x71, 0x5f, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x72, 0x65, 0x70, 0x61,
-	0x72, 0x65, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x70, 0x71, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0xc7, 0x02, 0x0a, 0x0b,
-	0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4d, 0x0a, 0x0f, 0x64,
-	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x66, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x0e, 0x64, 0x65, 0x73, 0x74,
-	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x66, 0x12, 0x29, 0x0a, 0x10, 0x64, 0x65,
-	0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e,
-	0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x63,
-	0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x07, 0x69, 0x70, 0x5f, 0x70, 0x6f, 0x72, 0x74,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x49, 0x50, 0x50, 0x6f, 0x72, 0x74, 0x41, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x48, 0x00, 0x52, 0x06, 0x69, 0x70, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x46,
-	0x0a, 0x04, 0x75, 0x6e, 0x69, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x55, 0x6e, 0x69,
-	0x78, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x00,
-	0x52, 0x04, 0x75, 0x6e, 0x69, 0x78, 0x42, 0x0d, 0x0a, 0x0b, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e,
-	0x5f, 0x61, 0x64, 0x64, 0x72, 0x22, 0x33, 0x0a, 0x0d, 0x49, 0x50, 0x50, 0x6f, 0x72, 0x74, 0x41,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x3b, 0x0a, 0x11, 0x55, 0x6e,
-	0x69, 0x78, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12,
-	0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70,
-	0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0xcf, 0x02, 0x0a, 0x18, 0x50, 0x72, 0x65, 0x70,
-	0x61, 0x72, 0x65, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61,
-	0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x61,
-	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x40, 0x0a, 0x03, 0x74, 0x63, 0x70, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x49, 0x50, 0x50, 0x6f, 0x72, 0x74, 0x41, 0x64, 0x64, 0x72,
-	0x65, 0x73, 0x73, 0x48, 0x00, 0x52, 0x03, 0x74, 0x63, 0x70, 0x12, 0x46, 0x0a, 0x04, 0x75, 0x6e,
-	0x69, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x55, 0x6e, 0x69, 0x78, 0x53, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48, 0x00, 0x52, 0x04, 0x75, 0x6e,
-	0x69, 0x78, 0x12, 0x66, 0x0a, 0x12, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x44,
-	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x11, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0d, 0x0a, 0x0b, 0x6c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x42, 0x92, 0x02, 0x0a, 0x21, 0x63, 0x6f,
-	0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42,
-	0x11, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70,
-	0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x6d, 0x65,
-	0x73, 0x68, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa,
-	0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca,
-	0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2,
-	0x02, 0x29, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c,
-	0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a,
-	0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_destinations_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_destinations_proto_rawDescData = file_pbmesh_v2beta1_destinations_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_destinations_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_destinations_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_destinations_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_destinations_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_destinations_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_destinations_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_pbmesh_v2beta1_destinations_proto_goTypes = []interface{}{
-	(*Destinations)(nil),             // 0: hashicorp.consul.mesh.v2beta1.Destinations
-	(*Destination)(nil),              // 1: hashicorp.consul.mesh.v2beta1.Destination
-	(*IPPortAddress)(nil),            // 2: hashicorp.consul.mesh.v2beta1.IPPortAddress
-	(*UnixSocketAddress)(nil),        // 3: hashicorp.consul.mesh.v2beta1.UnixSocketAddress
-	(*PreparedQueryDestination)(nil), // 4: hashicorp.consul.mesh.v2beta1.PreparedQueryDestination
-	(*v2beta1.WorkloadSelector)(nil), // 5: hashicorp.consul.catalog.v2beta1.WorkloadSelector
-	(*pbresource.Reference)(nil),     // 6: hashicorp.consul.resource.Reference
-	(*DestinationConfiguration)(nil), // 7: hashicorp.consul.mesh.v2beta1.DestinationConfiguration
-}
-var file_pbmesh_v2beta1_destinations_proto_depIdxs = []int32{
-	5, // 0: hashicorp.consul.mesh.v2beta1.Destinations.workloads:type_name -> hashicorp.consul.catalog.v2beta1.WorkloadSelector
-	1, // 1: hashicorp.consul.mesh.v2beta1.Destinations.destinations:type_name -> hashicorp.consul.mesh.v2beta1.Destination
-	4, // 2: hashicorp.consul.mesh.v2beta1.Destinations.pq_destinations:type_name -> hashicorp.consul.mesh.v2beta1.PreparedQueryDestination
-	6, // 3: hashicorp.consul.mesh.v2beta1.Destination.destination_ref:type_name -> hashicorp.consul.resource.Reference
-	2, // 4: hashicorp.consul.mesh.v2beta1.Destination.ip_port:type_name -> hashicorp.consul.mesh.v2beta1.IPPortAddress
-	3, // 5: hashicorp.consul.mesh.v2beta1.Destination.unix:type_name -> hashicorp.consul.mesh.v2beta1.UnixSocketAddress
-	2, // 6: hashicorp.consul.mesh.v2beta1.PreparedQueryDestination.tcp:type_name -> hashicorp.consul.mesh.v2beta1.IPPortAddress
-	3, // 7: hashicorp.consul.mesh.v2beta1.PreparedQueryDestination.unix:type_name -> hashicorp.consul.mesh.v2beta1.UnixSocketAddress
-	7, // 8: hashicorp.consul.mesh.v2beta1.PreparedQueryDestination.destination_config:type_name -> hashicorp.consul.mesh.v2beta1.DestinationConfiguration
-	9, // [9:9] is the sub-list for method output_type
-	9, // [9:9] is the sub-list for method input_type
-	9, // [9:9] is the sub-list for extension type_name
-	9, // [9:9] is the sub-list for extension extendee
-	0, // [0:9] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_destinations_proto_init() }
-func file_pbmesh_v2beta1_destinations_proto_init() {
-	if File_pbmesh_v2beta1_destinations_proto != nil {
-		return
-	}
-	file_pbmesh_v2beta1_destinations_configuration_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_destinations_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Destinations); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destinations_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Destination); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destinations_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IPPortAddress); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destinations_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UnixSocketAddress); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destinations_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PreparedQueryDestination); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbmesh_v2beta1_destinations_proto_msgTypes[1].OneofWrappers = []interface{}{
-		(*Destination_IpPort)(nil),
-		(*Destination_Unix)(nil),
-	}
-	file_pbmesh_v2beta1_destinations_proto_msgTypes[4].OneofWrappers = []interface{}{
-		(*PreparedQueryDestination_Tcp)(nil),
-		(*PreparedQueryDestination_Unix)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_destinations_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   5,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_destinations_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_destinations_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_destinations_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_destinations_proto = out.File
-	file_pbmesh_v2beta1_destinations_proto_rawDesc = nil
-	file_pbmesh_v2beta1_destinations_proto_goTypes = nil
-	file_pbmesh_v2beta1_destinations_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/destinations.proto b/proto-public/pbmesh/v2beta1/destinations.proto
deleted file mode 100644
index 7f5307842fd79..0000000000000
--- a/proto-public/pbmesh/v2beta1/destinations.proto
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "pbcatalog/v2beta1/selector.proto";
-import "pbmesh/v2beta1/destinations_configuration.proto";
-import "pbresource/annotations.proto";
-import "pbresource/resource.proto";
-
-message Destinations {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  // Selection of workloads these destinations should apply to.
-  // These can be prefixes or specific workload names.
-  hashicorp.consul.catalog.v2beta1.WorkloadSelector workloads = 1;
-
-  // destinations is the list of explicit destinations to define for the selected workloads.
-  repeated Destination destinations = 2;
-
-  // pq_destinations is the list of prepared query destinations. This field is not supported directly in v2
-  // and should only be used for migration reasons.
-  repeated PreparedQueryDestination pq_destinations = 3;
-}
-
-message Destination {
-  // destination_ref is the reference to an destination service. This has to be pbcatalog.Service type.
-  hashicorp.consul.resource.Reference destination_ref = 1;
-
-  // destination_port is the port name of the destination service. This should be the name
-  // of the service's target port.
-  string destination_port = 2;
-
-  // datacenter is the datacenter for where this destination service lives.
-  string datacenter = 3;
-
-  // listen_addr is the address where Envoy will listen for requests to this destination.
-  // It can provided either as an ip:port or as a Unix domain socket.
-  oneof listen_addr {
-    IPPortAddress ip_port = 4;
-    UnixSocketAddress unix = 5;
-  }
-}
-
-message IPPortAddress {
-  // ip is an IPv4 or an IPv6 address.
-  string ip = 1;
-
-  // port is the port number.
-  uint32 port = 2;
-}
-
-message UnixSocketAddress {
-  // path is the file system path at which to bind a Unix domain socket listener.
-  string path = 1;
-
-  // mode is the Unix file mode for the socket file. It should be provided
-  // in the numeric notation, for example, "0600".
-  string mode = 2;
-}
-
-message PreparedQueryDestination {
-  // name is the name of the prepared query to use as an destination.
-  string name = 1;
-
-  // datacenter is the datacenter for where this destination service lives.
-  string datacenter = 2;
-
-  // listen_addr is the address where Envoy will listen for requests to this destination.
-  // It can provided either as an ip:port or as a Unix domain socket.
-  oneof listen_addr {
-    IPPortAddress tcp = 4;
-    UnixSocketAddress unix = 5;
-  }
-
-  DestinationConfiguration destination_config = 6;
-}
diff --git a/proto-public/pbmesh/v2beta1/destinations_configuration.pb.binary.go b/proto-public/pbmesh/v2beta1/destinations_configuration.pb.binary.go
deleted file mode 100644
index 7aa00d90651d9..0000000000000
--- a/proto-public/pbmesh/v2beta1/destinations_configuration.pb.binary.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/destinations_configuration.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DestinationsConfiguration) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DestinationsConfiguration) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DestinationConfigOverrides) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DestinationConfigOverrides) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DestinationConfiguration) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DestinationConfiguration) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DestinationLimits) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DestinationLimits) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *PassiveHealthCheck) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *PassiveHealthCheck) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/destinations_configuration.pb.go b/proto-public/pbmesh/v2beta1/destinations_configuration.pb.go
deleted file mode 100644
index 28bb77f9b35f2..0000000000000
--- a/proto-public/pbmesh/v2beta1/destinations_configuration.pb.go
+++ /dev/null
@@ -1,699 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/destinations_configuration.proto
-
-package meshv2beta1
-
-import (
-	v2beta1 "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbresource "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
-	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type DestinationsConfiguration struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Selection of workloads these destinations should apply to.
-	// These can be prefixes or specific workload names.
-	Workloads *v2beta1.WorkloadSelector `protobuf:"bytes,1,opt,name=workloads,proto3" json:"workloads,omitempty"`
-	// default_config applies to all destinations for the workloads selected by this resource.
-	DefaultConfig *DestinationConfiguration `protobuf:"bytes,2,opt,name=default_config,json=defaultConfig,proto3" json:"default_config,omitempty"`
-	// config_overrides provides per-destination or per-destination-port config overrides.
-	ConfigOverrides []*DestinationConfigOverrides `protobuf:"bytes,3,rep,name=config_overrides,json=configOverrides,proto3" json:"config_overrides,omitempty"`
-}
-
-func (x *DestinationsConfiguration) Reset() {
-	*x = DestinationsConfiguration{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DestinationsConfiguration) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DestinationsConfiguration) ProtoMessage() {}
-
-func (x *DestinationsConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DestinationsConfiguration.ProtoReflect.Descriptor instead.
-func (*DestinationsConfiguration) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destinations_configuration_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *DestinationsConfiguration) GetWorkloads() *v2beta1.WorkloadSelector {
-	if x != nil {
-		return x.Workloads
-	}
-	return nil
-}
-
-func (x *DestinationsConfiguration) GetDefaultConfig() *DestinationConfiguration {
-	if x != nil {
-		return x.DefaultConfig
-	}
-	return nil
-}
-
-func (x *DestinationsConfiguration) GetConfigOverrides() []*DestinationConfigOverrides {
-	if x != nil {
-		return x.ConfigOverrides
-	}
-	return nil
-}
-
-// UpstreamConfigOverrides allow to override destination configuration per destination_ref/port/datacenter.
-// In that sense, those three fields (destination_ref, destination_port and datacenter) are treated
-// sort of like map keys and config is a like a map value for that key.
-type DestinationConfigOverrides struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// destination_ref is the reference to an destination service that this configuration applies to.
-	// This has to be pbcatalog.Service type.
-	DestinationRef *pbresource.Reference `protobuf:"bytes,1,opt,name=destination_ref,json=destinationRef,proto3" json:"destination_ref,omitempty"`
-	// destination_port is the port name of the destination service. This should be the name
-	// of the service's target port. If not provided, this configuration will apply to all ports of an destination.
-	DestinationPort string `protobuf:"bytes,2,opt,name=destination_port,json=destinationPort,proto3" json:"destination_port,omitempty"`
-	// datacenter is the datacenter for where this destination service lives.
-	Datacenter string `protobuf:"bytes,3,opt,name=datacenter,proto3" json:"datacenter,omitempty"`
-	// config is the configuration that should apply to this destination.
-	Config *DestinationConfiguration `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"`
-}
-
-func (x *DestinationConfigOverrides) Reset() {
-	*x = DestinationConfigOverrides{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DestinationConfigOverrides) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DestinationConfigOverrides) ProtoMessage() {}
-
-func (x *DestinationConfigOverrides) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DestinationConfigOverrides.ProtoReflect.Descriptor instead.
-func (*DestinationConfigOverrides) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destinations_configuration_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *DestinationConfigOverrides) GetDestinationRef() *pbresource.Reference {
-	if x != nil {
-		return x.DestinationRef
-	}
-	return nil
-}
-
-func (x *DestinationConfigOverrides) GetDestinationPort() string {
-	if x != nil {
-		return x.DestinationPort
-	}
-	return ""
-}
-
-func (x *DestinationConfigOverrides) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-func (x *DestinationConfigOverrides) GetConfig() *DestinationConfiguration {
-	if x != nil {
-		return x.Config
-	}
-	return nil
-}
-
-type DestinationConfiguration struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// protocol overrides destination's port protocol. If no port for an destination is specified
-	// or if used in the default configuration, this protocol will be used for all ports
-	// or for all ports of all destinations respectively.
-	Protocol v2beta1.Protocol `protobuf:"varint,1,opt,name=protocol,proto3,enum=hashicorp.consul.catalog.v2beta1.Protocol" json:"protocol,omitempty"`
-	// connect_timeout is the timeout used when making a new
-	// connection to this destination. Defaults to 5 seconds if not set.
-	ConnectTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"`
-	// limits are the set of limits that are applied to the proxy for a specific destination.
-	Limits *DestinationLimits `protobuf:"bytes,3,opt,name=limits,proto3" json:"limits,omitempty"`
-	// passive_health_check configuration determines how destination proxy instances will
-	// be monitored for removal from the load balancing pool.
-	PassiveHealthCheck *PassiveHealthCheck `protobuf:"bytes,4,opt,name=passive_health_check,json=passiveHealthCheck,proto3" json:"passive_health_check,omitempty"`
-	// balance_outbound_connections indicates how the proxy should attempt to distribute
-	// connections across worker threads.
-	BalanceOutboundConnections BalanceConnections `protobuf:"varint,5,opt,name=balance_outbound_connections,json=balanceOutboundConnections,proto3,enum=hashicorp.consul.mesh.v2beta1.BalanceConnections" json:"balance_outbound_connections,omitempty"`
-	// MeshGatewayMode is the Mesh Gateway routing mode.
-	MeshGatewayMode MeshGatewayMode `protobuf:"varint,6,opt,name=mesh_gateway_mode,json=meshGatewayMode,proto3,enum=hashicorp.consul.mesh.v2beta1.MeshGatewayMode" json:"mesh_gateway_mode,omitempty"`
-}
-
-func (x *DestinationConfiguration) Reset() {
-	*x = DestinationConfiguration{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DestinationConfiguration) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DestinationConfiguration) ProtoMessage() {}
-
-func (x *DestinationConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DestinationConfiguration.ProtoReflect.Descriptor instead.
-func (*DestinationConfiguration) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destinations_configuration_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *DestinationConfiguration) GetProtocol() v2beta1.Protocol {
-	if x != nil {
-		return x.Protocol
-	}
-	return v2beta1.Protocol(0)
-}
-
-func (x *DestinationConfiguration) GetConnectTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.ConnectTimeout
-	}
-	return nil
-}
-
-func (x *DestinationConfiguration) GetLimits() *DestinationLimits {
-	if x != nil {
-		return x.Limits
-	}
-	return nil
-}
-
-func (x *DestinationConfiguration) GetPassiveHealthCheck() *PassiveHealthCheck {
-	if x != nil {
-		return x.PassiveHealthCheck
-	}
-	return nil
-}
-
-func (x *DestinationConfiguration) GetBalanceOutboundConnections() BalanceConnections {
-	if x != nil {
-		return x.BalanceOutboundConnections
-	}
-	return BalanceConnections_BALANCE_CONNECTIONS_DEFAULT
-}
-
-func (x *DestinationConfiguration) GetMeshGatewayMode() MeshGatewayMode {
-	if x != nil {
-		return x.MeshGatewayMode
-	}
-	return MeshGatewayMode_MESH_GATEWAY_MODE_UNSPECIFIED
-}
-
-// UpstreamLimits describes the limits that are associated with a specific
-// destination of a service instance.
-type DestinationLimits struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// max_connections is the maximum number of connections the local proxy can
-	// make to the destination service.
-	MaxConnections *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_connections,json=maxConnections,proto3" json:"max_connections,omitempty"`
-	// max_pending_requests is the maximum number of requests that will be queued
-	// waiting for an available connection. This is mostly applicable to HTTP/1.1
-	// clusters since all HTTP/2 requests are streamed over a single
-	// connection.
-	MaxPendingRequests *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_pending_requests,json=maxPendingRequests,proto3" json:"max_pending_requests,omitempty"`
-	// max_concurrent_requests is the maximum number of in-flight requests that will be allowed
-	// to the destination cluster at a point in time. This is mostly applicable to HTTP/2
-	// clusters since all HTTP/1.1 requests are limited by MaxConnections.
-	MaxConcurrentRequests *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=max_concurrent_requests,json=maxConcurrentRequests,proto3" json:"max_concurrent_requests,omitempty"`
-}
-
-func (x *DestinationLimits) Reset() {
-	*x = DestinationLimits{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DestinationLimits) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DestinationLimits) ProtoMessage() {}
-
-func (x *DestinationLimits) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DestinationLimits.ProtoReflect.Descriptor instead.
-func (*DestinationLimits) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destinations_configuration_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *DestinationLimits) GetMaxConnections() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.MaxConnections
-	}
-	return nil
-}
-
-func (x *DestinationLimits) GetMaxPendingRequests() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.MaxPendingRequests
-	}
-	return nil
-}
-
-func (x *DestinationLimits) GetMaxConcurrentRequests() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.MaxConcurrentRequests
-	}
-	return nil
-}
-
-type PassiveHealthCheck struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// interval between health check analysis sweeps. Each sweep may remove
-	// hosts or return hosts to the pool.
-	Interval *durationpb.Duration `protobuf:"bytes,1,opt,name=interval,proto3" json:"interval,omitempty"`
-	// max_failures is the count of consecutive failures that results in a host
-	// being removed from the pool.
-	MaxFailures uint32 `protobuf:"varint,2,opt,name=max_failures,json=maxFailures,proto3" json:"max_failures,omitempty"`
-	// enforcing_consecutive_5xx is the % chance that a host will be actually ejected
-	// when an outlier status is detected through consecutive 5xx.
-	// This setting can be used to disable ejection or to ramp it up slowly. Defaults to 100.
-	EnforcingConsecutive_5Xx uint32 `protobuf:"varint,3,opt,name=enforcing_consecutive_5xx,json=enforcingConsecutive5xx,proto3" json:"enforcing_consecutive_5xx,omitempty"`
-}
-
-func (x *PassiveHealthCheck) Reset() {
-	*x = PassiveHealthCheck{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PassiveHealthCheck) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PassiveHealthCheck) ProtoMessage() {}
-
-func (x *PassiveHealthCheck) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PassiveHealthCheck.ProtoReflect.Descriptor instead.
-func (*PassiveHealthCheck) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_destinations_configuration_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *PassiveHealthCheck) GetInterval() *durationpb.Duration {
-	if x != nil {
-		return x.Interval
-	}
-	return nil
-}
-
-func (x *PassiveHealthCheck) GetMaxFailures() uint32 {
-	if x != nil {
-		return x.MaxFailures
-	}
-	return 0
-}
-
-func (x *PassiveHealthCheck) GetEnforcingConsecutive_5Xx() uint32 {
-	if x != nil {
-		return x.EnforcingConsecutive_5Xx
-	}
-	return 0
-}
-
-var File_pbmesh_v2beta1_destinations_configuration_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_destinations_configuration_proto_rawDesc = []byte{
-	0x0a, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x20, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x20, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f,
-	0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x19, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbb, 0x02, 0x0a,
-	0x19, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x50, 0x0a, 0x09, 0x77, 0x6f,
-	0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x52, 0x09, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x12, 0x5e, 0x0a, 0x0e,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x64,
-	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x64, 0x0a, 0x10,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x73,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65,
-	0x73, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64,
-	0x65, 0x73, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0x87, 0x02, 0x0a, 0x1a, 0x44,
-	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x73, 0x12, 0x4d, 0x0a, 0x0f, 0x64, 0x65, 0x73,
-	0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x66, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x24, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52,
-	0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x0e, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x66, 0x12, 0x29, 0x0a, 0x10, 0x64, 0x65, 0x73, 0x74,
-	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50,
-	0x6f, 0x72, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65,
-	0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e,
-	0x74, 0x65, 0x72, 0x12, 0x4f, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x22, 0xa6, 0x04, 0x0a, 0x18, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x46, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x52,
-	0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x42, 0x0a, 0x0f, 0x63, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x63,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x48, 0x0a,
-	0x06, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x44, 0x65,
-	0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x52,
-	0x06, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x63, 0x0a, 0x14, 0x70, 0x61, 0x73, 0x73, 0x69,
-	0x76, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61,
-	0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x12, 0x70, 0x61, 0x73, 0x73, 0x69, 0x76,
-	0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x73, 0x0a, 0x1c,
-	0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64,
-	0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x1a, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x4f, 0x75,
-	0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x5a, 0x0a, 0x11, 0x6d, 0x65, 0x73, 0x68, 0x5f, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61,
-	0x79, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4d, 0x65, 0x73,
-	0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x0f, 0x6d, 0x65,
-	0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x22, 0x80, 0x02,
-	0x0a, 0x11, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x69, 0x6d,
-	0x69, 0x74, 0x73, 0x12, 0x45, 0x0a, 0x0f, 0x6d, 0x61, 0x78, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55,
-	0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0e, 0x6d, 0x61, 0x78, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x4e, 0x0a, 0x14, 0x6d, 0x61,
-	0x78, 0x5f, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33,
-	0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x12, 0x6d, 0x61, 0x78, 0x50, 0x65, 0x6e, 0x64, 0x69,
-	0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x54, 0x0a, 0x17, 0x6d, 0x61,
-	0x78, 0x5f, 0x63, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49,
-	0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x15, 0x6d, 0x61, 0x78, 0x43, 0x6f,
-	0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73,
-	0x22, 0xaa, 0x01, 0x0a, 0x12, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c,
-	0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x35, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x21,
-	0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x73, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65,
-	0x73, 0x12, 0x3a, 0x0a, 0x19, 0x65, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x63,
-	0x6f, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x35, 0x78, 0x78, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0d, 0x52, 0x17, 0x65, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x69, 0x6e, 0x67, 0x43,
-	0x6f, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x74, 0x69, 0x76, 0x65, 0x35, 0x78, 0x78, 0x42, 0x9f, 0x02,
-	0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x42, 0x1e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f,
-	0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x6d,
-	0x65, 0x73, 0x68, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d,
-	0xaa, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0xca, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0xe2, 0x02, 0x29, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_destinations_configuration_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_destinations_configuration_proto_rawDescData = file_pbmesh_v2beta1_destinations_configuration_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_destinations_configuration_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_destinations_configuration_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_destinations_configuration_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_destinations_configuration_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_destinations_configuration_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_pbmesh_v2beta1_destinations_configuration_proto_goTypes = []interface{}{
-	(*DestinationsConfiguration)(nil),  // 0: hashicorp.consul.mesh.v2beta1.DestinationsConfiguration
-	(*DestinationConfigOverrides)(nil), // 1: hashicorp.consul.mesh.v2beta1.DestinationConfigOverrides
-	(*DestinationConfiguration)(nil),   // 2: hashicorp.consul.mesh.v2beta1.DestinationConfiguration
-	(*DestinationLimits)(nil),          // 3: hashicorp.consul.mesh.v2beta1.DestinationLimits
-	(*PassiveHealthCheck)(nil),         // 4: hashicorp.consul.mesh.v2beta1.PassiveHealthCheck
-	(*v2beta1.WorkloadSelector)(nil),   // 5: hashicorp.consul.catalog.v2beta1.WorkloadSelector
-	(*pbresource.Reference)(nil),       // 6: hashicorp.consul.resource.Reference
-	(v2beta1.Protocol)(0),              // 7: hashicorp.consul.catalog.v2beta1.Protocol
-	(*durationpb.Duration)(nil),        // 8: google.protobuf.Duration
-	(BalanceConnections)(0),            // 9: hashicorp.consul.mesh.v2beta1.BalanceConnections
-	(MeshGatewayMode)(0),               // 10: hashicorp.consul.mesh.v2beta1.MeshGatewayMode
-	(*wrapperspb.UInt32Value)(nil),     // 11: google.protobuf.UInt32Value
-}
-var file_pbmesh_v2beta1_destinations_configuration_proto_depIdxs = []int32{
-	5,  // 0: hashicorp.consul.mesh.v2beta1.DestinationsConfiguration.workloads:type_name -> hashicorp.consul.catalog.v2beta1.WorkloadSelector
-	2,  // 1: hashicorp.consul.mesh.v2beta1.DestinationsConfiguration.default_config:type_name -> hashicorp.consul.mesh.v2beta1.DestinationConfiguration
-	1,  // 2: hashicorp.consul.mesh.v2beta1.DestinationsConfiguration.config_overrides:type_name -> hashicorp.consul.mesh.v2beta1.DestinationConfigOverrides
-	6,  // 3: hashicorp.consul.mesh.v2beta1.DestinationConfigOverrides.destination_ref:type_name -> hashicorp.consul.resource.Reference
-	2,  // 4: hashicorp.consul.mesh.v2beta1.DestinationConfigOverrides.config:type_name -> hashicorp.consul.mesh.v2beta1.DestinationConfiguration
-	7,  // 5: hashicorp.consul.mesh.v2beta1.DestinationConfiguration.protocol:type_name -> hashicorp.consul.catalog.v2beta1.Protocol
-	8,  // 6: hashicorp.consul.mesh.v2beta1.DestinationConfiguration.connect_timeout:type_name -> google.protobuf.Duration
-	3,  // 7: hashicorp.consul.mesh.v2beta1.DestinationConfiguration.limits:type_name -> hashicorp.consul.mesh.v2beta1.DestinationLimits
-	4,  // 8: hashicorp.consul.mesh.v2beta1.DestinationConfiguration.passive_health_check:type_name -> hashicorp.consul.mesh.v2beta1.PassiveHealthCheck
-	9,  // 9: hashicorp.consul.mesh.v2beta1.DestinationConfiguration.balance_outbound_connections:type_name -> hashicorp.consul.mesh.v2beta1.BalanceConnections
-	10, // 10: hashicorp.consul.mesh.v2beta1.DestinationConfiguration.mesh_gateway_mode:type_name -> hashicorp.consul.mesh.v2beta1.MeshGatewayMode
-	11, // 11: hashicorp.consul.mesh.v2beta1.DestinationLimits.max_connections:type_name -> google.protobuf.UInt32Value
-	11, // 12: hashicorp.consul.mesh.v2beta1.DestinationLimits.max_pending_requests:type_name -> google.protobuf.UInt32Value
-	11, // 13: hashicorp.consul.mesh.v2beta1.DestinationLimits.max_concurrent_requests:type_name -> google.protobuf.UInt32Value
-	8,  // 14: hashicorp.consul.mesh.v2beta1.PassiveHealthCheck.interval:type_name -> google.protobuf.Duration
-	15, // [15:15] is the sub-list for method output_type
-	15, // [15:15] is the sub-list for method input_type
-	15, // [15:15] is the sub-list for extension type_name
-	15, // [15:15] is the sub-list for extension extendee
-	0,  // [0:15] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_destinations_configuration_proto_init() }
-func file_pbmesh_v2beta1_destinations_configuration_proto_init() {
-	if File_pbmesh_v2beta1_destinations_configuration_proto != nil {
-		return
-	}
-	file_pbmesh_v2beta1_connection_proto_init()
-	file_pbmesh_v2beta1_routing_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DestinationsConfiguration); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DestinationConfigOverrides); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DestinationConfiguration); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DestinationLimits); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PassiveHealthCheck); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_destinations_configuration_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   5,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_destinations_configuration_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_destinations_configuration_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_destinations_configuration_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_destinations_configuration_proto = out.File
-	file_pbmesh_v2beta1_destinations_configuration_proto_rawDesc = nil
-	file_pbmesh_v2beta1_destinations_configuration_proto_goTypes = nil
-	file_pbmesh_v2beta1_destinations_configuration_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/destinations_configuration.proto b/proto-public/pbmesh/v2beta1/destinations_configuration.proto
deleted file mode 100644
index 1ec5d5741840d..0000000000000
--- a/proto-public/pbmesh/v2beta1/destinations_configuration.proto
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "google/protobuf/duration.proto";
-import "google/protobuf/wrappers.proto";
-import "pbcatalog/v2beta1/protocol.proto";
-import "pbcatalog/v2beta1/selector.proto";
-import "pbmesh/v2beta1/connection.proto";
-import "pbmesh/v2beta1/routing.proto";
-import "pbresource/annotations.proto";
-import "pbresource/resource.proto";
-
-message DestinationsConfiguration {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  // Selection of workloads these destinations should apply to.
-  // These can be prefixes or specific workload names.
-  hashicorp.consul.catalog.v2beta1.WorkloadSelector workloads = 1;
-
-  // default_config applies to all destinations for the workloads selected by this resource.
-  DestinationConfiguration default_config = 2;
-
-  // config_overrides provides per-destination or per-destination-port config overrides.
-  repeated DestinationConfigOverrides config_overrides = 3;
-}
-
-// UpstreamConfigOverrides allow to override destination configuration per destination_ref/port/datacenter.
-// In that sense, those three fields (destination_ref, destination_port and datacenter) are treated
-// sort of like map keys and config is a like a map value for that key.
-message DestinationConfigOverrides {
-  // destination_ref is the reference to an destination service that this configuration applies to.
-  // This has to be pbcatalog.Service type.
-  hashicorp.consul.resource.Reference destination_ref = 1;
-
-  // destination_port is the port name of the destination service. This should be the name
-  // of the service's target port. If not provided, this configuration will apply to all ports of an destination.
-  string destination_port = 2;
-
-  // datacenter is the datacenter for where this destination service lives.
-  string datacenter = 3;
-
-  // config is the configuration that should apply to this destination.
-  DestinationConfiguration config = 4;
-}
-
-message DestinationConfiguration {
-  // protocol overrides destination's port protocol. If no port for an destination is specified
-  // or if used in the default configuration, this protocol will be used for all ports
-  // or for all ports of all destinations respectively.
-  hashicorp.consul.catalog.v2beta1.Protocol protocol = 1;
-
-  // connect_timeout is the timeout used when making a new
-  // connection to this destination. Defaults to 5 seconds if not set.
-  google.protobuf.Duration connect_timeout = 2;
-
-  // limits are the set of limits that are applied to the proxy for a specific destination.
-  DestinationLimits limits = 3;
-
-  // passive_health_check configuration determines how destination proxy instances will
-  // be monitored for removal from the load balancing pool.
-  PassiveHealthCheck passive_health_check = 4;
-
-  // balance_outbound_connections indicates how the proxy should attempt to distribute
-  // connections across worker threads.
-  BalanceConnections balance_outbound_connections = 5;
-
-  // MeshGatewayMode is the Mesh Gateway routing mode.
-  MeshGatewayMode mesh_gateway_mode = 6;
-}
-
-// UpstreamLimits describes the limits that are associated with a specific
-// destination of a service instance.
-message DestinationLimits {
-  // max_connections is the maximum number of connections the local proxy can
-  // make to the destination service.
-  google.protobuf.UInt32Value max_connections = 1;
-
-  // max_pending_requests is the maximum number of requests that will be queued
-  // waiting for an available connection. This is mostly applicable to HTTP/1.1
-  // clusters since all HTTP/2 requests are streamed over a single
-  // connection.
-  google.protobuf.UInt32Value max_pending_requests = 2;
-
-  // max_concurrent_requests is the maximum number of in-flight requests that will be allowed
-  // to the destination cluster at a point in time. This is mostly applicable to HTTP/2
-  // clusters since all HTTP/1.1 requests are limited by MaxConnections.
-  google.protobuf.UInt32Value max_concurrent_requests = 3;
-}
-
-message PassiveHealthCheck {
-  // interval between health check analysis sweeps. Each sweep may remove
-  // hosts or return hosts to the pool.
-  google.protobuf.Duration interval = 1;
-
-  // max_failures is the count of consecutive failures that results in a host
-  // being removed from the pool.
-  uint32 max_failures = 2;
-
-  // enforcing_consecutive_5xx is the % chance that a host will be actually ejected
-  // when an outlier status is detected through consecutive 5xx.
-  // This setting can be used to disable ejection or to ramp it up slowly. Defaults to 100.
-  uint32 enforcing_consecutive_5xx = 3;
-}
diff --git a/proto-public/pbmesh/v2beta1/expose.pb.binary.go b/proto-public/pbmesh/v2beta1/expose.pb.binary.go
deleted file mode 100644
index 69154fab8fb2c..0000000000000
--- a/proto-public/pbmesh/v2beta1/expose.pb.binary.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/expose.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ExposeConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ExposeConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ExposePath) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ExposePath) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/expose.pb.go b/proto-public/pbmesh/v2beta1/expose.pb.go
deleted file mode 100644
index 48224fb6abfa4..0000000000000
--- a/proto-public/pbmesh/v2beta1/expose.pb.go
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/expose.proto
-
-package meshv2beta1
-
-import (
-	v2beta1 "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type ExposeConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ExposePaths []*ExposePath `protobuf:"bytes,1,rep,name=expose_paths,json=exposePaths,proto3" json:"expose_paths,omitempty"`
-}
-
-func (x *ExposeConfig) Reset() {
-	*x = ExposeConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_expose_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExposeConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExposeConfig) ProtoMessage() {}
-
-func (x *ExposeConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_expose_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExposeConfig.ProtoReflect.Descriptor instead.
-func (*ExposeConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_expose_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ExposeConfig) GetExposePaths() []*ExposePath {
-	if x != nil {
-		return x.ExposePaths
-	}
-	return nil
-}
-
-type ExposePath struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ListenerPort  uint32           `protobuf:"varint,1,opt,name=listener_port,json=listenerPort,proto3" json:"listener_port,omitempty"`
-	Path          string           `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"`
-	LocalPathPort uint32           `protobuf:"varint,3,opt,name=local_path_port,json=localPathPort,proto3" json:"local_path_port,omitempty"`
-	Protocol      v2beta1.Protocol `protobuf:"varint,4,opt,name=protocol,proto3,enum=hashicorp.consul.catalog.v2beta1.Protocol" json:"protocol,omitempty"`
-}
-
-func (x *ExposePath) Reset() {
-	*x = ExposePath{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_expose_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExposePath) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExposePath) ProtoMessage() {}
-
-func (x *ExposePath) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_expose_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExposePath.ProtoReflect.Descriptor instead.
-func (*ExposePath) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_expose_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *ExposePath) GetListenerPort() uint32 {
-	if x != nil {
-		return x.ListenerPort
-	}
-	return 0
-}
-
-func (x *ExposePath) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-func (x *ExposePath) GetLocalPathPort() uint32 {
-	if x != nil {
-		return x.LocalPathPort
-	}
-	return 0
-}
-
-func (x *ExposePath) GetProtocol() v2beta1.Protocol {
-	if x != nil {
-		return x.Protocol
-	}
-	return v2beta1.Protocol(0)
-}
-
-var File_pbmesh_v2beta1_expose_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_expose_proto_rawDesc = []byte{
-	0x0a, 0x1b, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x65, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x20, 0x70, 0x62,
-	0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5c,
-	0x0a, 0x0c, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4c,
-	0x0a, 0x0c, 0x65, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x50, 0x61, 0x74, 0x68, 0x52,
-	0x0b, 0x65, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x50, 0x61, 0x74, 0x68, 0x73, 0x22, 0xb5, 0x01, 0x0a,
-	0x0a, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x23, 0x0a, 0x0d, 0x6c,
-	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0d, 0x52, 0x0c, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74,
-	0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x70, 0x61, 0x74, 0x68, 0x12, 0x26, 0x0a, 0x0f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x70, 0x61,
-	0x74, 0x68, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x6c,
-	0x6f, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x46, 0x0a, 0x08,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x63, 0x6f, 0x6c, 0x42, 0x8c, 0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x0b, 0x45, 0x78, 0x70, 0x6f,
-	0x73, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62,
-	0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x3b, 0x6d, 0x65, 0x73, 0x68, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02,
-	0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x29, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0xea, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_expose_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_expose_proto_rawDescData = file_pbmesh_v2beta1_expose_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_expose_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_expose_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_expose_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_expose_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_expose_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_expose_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_pbmesh_v2beta1_expose_proto_goTypes = []interface{}{
-	(*ExposeConfig)(nil),  // 0: hashicorp.consul.mesh.v2beta1.ExposeConfig
-	(*ExposePath)(nil),    // 1: hashicorp.consul.mesh.v2beta1.ExposePath
-	(v2beta1.Protocol)(0), // 2: hashicorp.consul.catalog.v2beta1.Protocol
-}
-var file_pbmesh_v2beta1_expose_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.mesh.v2beta1.ExposeConfig.expose_paths:type_name -> hashicorp.consul.mesh.v2beta1.ExposePath
-	2, // 1: hashicorp.consul.mesh.v2beta1.ExposePath.protocol:type_name -> hashicorp.consul.catalog.v2beta1.Protocol
-	2, // [2:2] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_expose_proto_init() }
-func file_pbmesh_v2beta1_expose_proto_init() {
-	if File_pbmesh_v2beta1_expose_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_expose_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExposeConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_expose_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExposePath); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_expose_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_expose_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_expose_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_expose_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_expose_proto = out.File
-	file_pbmesh_v2beta1_expose_proto_rawDesc = nil
-	file_pbmesh_v2beta1_expose_proto_goTypes = nil
-	file_pbmesh_v2beta1_expose_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/expose.proto b/proto-public/pbmesh/v2beta1/expose.proto
deleted file mode 100644
index 3c6ad0f07af55..0000000000000
--- a/proto-public/pbmesh/v2beta1/expose.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "pbcatalog/v2beta1/protocol.proto";
-
-message ExposeConfig {
-  repeated ExposePath expose_paths = 1;
-}
-
-message ExposePath {
-  uint32 listener_port = 1;
-  string path = 2;
-  uint32 local_path_port = 3;
-  hashicorp.consul.catalog.v2beta1.Protocol protocol = 4;
-}
diff --git a/proto-public/pbmesh/v2beta1/grpc_route.pb.binary.go b/proto-public/pbmesh/v2beta1/grpc_route.pb.binary.go
deleted file mode 100644
index 3a5d3ac5a2cd2..0000000000000
--- a/proto-public/pbmesh/v2beta1/grpc_route.pb.binary.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/grpc_route.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *GRPCRoute) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *GRPCRoute) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *GRPCRouteRule) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *GRPCRouteRule) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *GRPCRouteMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *GRPCRouteMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *GRPCMethodMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *GRPCMethodMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *GRPCHeaderMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *GRPCHeaderMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *GRPCRouteFilter) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *GRPCRouteFilter) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *GRPCBackendRef) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *GRPCBackendRef) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/grpc_route.pb.go b/proto-public/pbmesh/v2beta1/grpc_route.pb.go
deleted file mode 100644
index 63c82f3641758..0000000000000
--- a/proto-public/pbmesh/v2beta1/grpc_route.pb.go
+++ /dev/null
@@ -1,907 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/grpc_route.proto
-
-package meshv2beta1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type GRPCMethodMatchType int32
-
-const (
-	GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_UNSPECIFIED GRPCMethodMatchType = 0
-	GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_EXACT       GRPCMethodMatchType = 1
-	GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_REGEX       GRPCMethodMatchType = 2
-)
-
-// Enum value maps for GRPCMethodMatchType.
-var (
-	GRPCMethodMatchType_name = map[int32]string{
-		0: "GRPC_METHOD_MATCH_TYPE_UNSPECIFIED",
-		1: "GRPC_METHOD_MATCH_TYPE_EXACT",
-		2: "GRPC_METHOD_MATCH_TYPE_REGEX",
-	}
-	GRPCMethodMatchType_value = map[string]int32{
-		"GRPC_METHOD_MATCH_TYPE_UNSPECIFIED": 0,
-		"GRPC_METHOD_MATCH_TYPE_EXACT":       1,
-		"GRPC_METHOD_MATCH_TYPE_REGEX":       2,
-	}
-)
-
-func (x GRPCMethodMatchType) Enum() *GRPCMethodMatchType {
-	p := new(GRPCMethodMatchType)
-	*p = x
-	return p
-}
-
-func (x GRPCMethodMatchType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (GRPCMethodMatchType) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_grpc_route_proto_enumTypes[0].Descriptor()
-}
-
-func (GRPCMethodMatchType) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_grpc_route_proto_enumTypes[0]
-}
-
-func (x GRPCMethodMatchType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use GRPCMethodMatchType.Descriptor instead.
-func (GRPCMethodMatchType) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_grpc_route_proto_rawDescGZIP(), []int{0}
-}
-
-// NOTE: this should align to the GAMMA/gateway-api version, or at least be
-// easily translatable.
-//
-// https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1alpha2.GRPCRoute
-//
-// This is a Resource type.
-type GRPCRoute struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ParentRefs references the resources (usually Services) that a Route wants
-	// to be attached to.
-	//
-	// It is invalid to reference an identical parent more than once. It is valid
-	// to reference multiple distinct sections within the same parent resource.
-	ParentRefs []*ParentReference `protobuf:"bytes,1,rep,name=parent_refs,json=parentRefs,proto3" json:"parent_refs,omitempty"`
-	// Hostnames are the hostnames for which this GRPCRoute should respond to requests.
-	//
-	// This is only valid for north/south.
-	Hostnames []string `protobuf:"bytes,2,rep,name=hostnames,proto3" json:"hostnames,omitempty"`
-	// Rules are a list of GRPC matchers, filters and actions.
-	Rules []*GRPCRouteRule `protobuf:"bytes,3,rep,name=rules,proto3" json:"rules,omitempty"`
-}
-
-func (x *GRPCRoute) Reset() {
-	*x = GRPCRoute{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_grpc_route_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GRPCRoute) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GRPCRoute) ProtoMessage() {}
-
-func (x *GRPCRoute) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_grpc_route_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GRPCRoute.ProtoReflect.Descriptor instead.
-func (*GRPCRoute) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_grpc_route_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *GRPCRoute) GetParentRefs() []*ParentReference {
-	if x != nil {
-		return x.ParentRefs
-	}
-	return nil
-}
-
-func (x *GRPCRoute) GetHostnames() []string {
-	if x != nil {
-		return x.Hostnames
-	}
-	return nil
-}
-
-func (x *GRPCRoute) GetRules() []*GRPCRouteRule {
-	if x != nil {
-		return x.Rules
-	}
-	return nil
-}
-
-type GRPCRouteRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Matches []*GRPCRouteMatch  `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"`
-	Filters []*GRPCRouteFilter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"`
-	// BackendRefs defines the backend(s) where matching requests should be sent.
-	//
-	// Failure behavior here depends on how many BackendRefs are specified and
-	// how many are invalid.
-	//
-	// If all entries in BackendRefs are invalid, and there are also no filters
-	// specified in this route rule, all traffic which matches this rule MUST
-	// receive a 500 status code.
-	//
-	// See the GRPCBackendRef definition for the rules about what makes a single
-	// GRPCBackendRef invalid.
-	//
-	// When a GRPCBackendRef is invalid, 500 status codes MUST be returned for
-	// requests that would have otherwise been routed to an invalid backend. If
-	// multiple backends are specified, and some are invalid, the proportion of
-	// requests that would otherwise have been routed to an invalid backend MUST
-	// receive a 500 status code.
-	//
-	// For example, if two backends are specified with equal weights, and one is
-	// invalid, 50 percent of traffic must receive a 500. Implementations may
-	// choose how that 50 percent is determined.
-	BackendRefs []*GRPCBackendRef  `protobuf:"bytes,3,rep,name=backend_refs,json=backendRefs,proto3" json:"backend_refs,omitempty"`
-	Timeouts    *HTTPRouteTimeouts `protobuf:"bytes,4,opt,name=timeouts,proto3" json:"timeouts,omitempty"`
-	Retries     *HTTPRouteRetries  `protobuf:"bytes,5,opt,name=retries,proto3" json:"retries,omitempty"`
-}
-
-func (x *GRPCRouteRule) Reset() {
-	*x = GRPCRouteRule{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_grpc_route_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GRPCRouteRule) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GRPCRouteRule) ProtoMessage() {}
-
-func (x *GRPCRouteRule) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_grpc_route_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GRPCRouteRule.ProtoReflect.Descriptor instead.
-func (*GRPCRouteRule) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_grpc_route_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *GRPCRouteRule) GetMatches() []*GRPCRouteMatch {
-	if x != nil {
-		return x.Matches
-	}
-	return nil
-}
-
-func (x *GRPCRouteRule) GetFilters() []*GRPCRouteFilter {
-	if x != nil {
-		return x.Filters
-	}
-	return nil
-}
-
-func (x *GRPCRouteRule) GetBackendRefs() []*GRPCBackendRef {
-	if x != nil {
-		return x.BackendRefs
-	}
-	return nil
-}
-
-func (x *GRPCRouteRule) GetTimeouts() *HTTPRouteTimeouts {
-	if x != nil {
-		return x.Timeouts
-	}
-	return nil
-}
-
-func (x *GRPCRouteRule) GetRetries() *HTTPRouteRetries {
-	if x != nil {
-		return x.Retries
-	}
-	return nil
-}
-
-type GRPCRouteMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Method specifies a gRPC request service/method matcher. If this field is
-	// not specified, all services and methods will match.
-	Method *GRPCMethodMatch `protobuf:"bytes,1,opt,name=method,proto3" json:"method,omitempty"`
-	// Headers specifies gRPC request header matchers. Multiple match values are
-	// ANDed together, meaning, a request MUST match all the specified headers to
-	// select the route.
-	Headers []*GRPCHeaderMatch `protobuf:"bytes,2,rep,name=headers,proto3" json:"headers,omitempty"`
-}
-
-func (x *GRPCRouteMatch) Reset() {
-	*x = GRPCRouteMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_grpc_route_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GRPCRouteMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GRPCRouteMatch) ProtoMessage() {}
-
-func (x *GRPCRouteMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_grpc_route_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GRPCRouteMatch.ProtoReflect.Descriptor instead.
-func (*GRPCRouteMatch) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_grpc_route_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *GRPCRouteMatch) GetMethod() *GRPCMethodMatch {
-	if x != nil {
-		return x.Method
-	}
-	return nil
-}
-
-func (x *GRPCRouteMatch) GetHeaders() []*GRPCHeaderMatch {
-	if x != nil {
-		return x.Headers
-	}
-	return nil
-}
-
-type GRPCMethodMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Type specifies how to match against the service and/or method. Support:
-	// Core (Exact with service and method specified)
-	Type GRPCMethodMatchType `protobuf:"varint,1,opt,name=type,proto3,enum=hashicorp.consul.mesh.v2beta1.GRPCMethodMatchType" json:"type,omitempty"`
-	// Value of the service to match against. If left empty or omitted, will
-	// match any service.
-	//
-	// At least one of Service and Method MUST be a non-empty string.
-	Service string `protobuf:"bytes,2,opt,name=service,proto3" json:"service,omitempty"`
-	// Value of the method to match against. If left empty or omitted, will match
-	// all services.
-	//
-	// At least one of Service and Method MUST be a non-empty string.}
-	Method string `protobuf:"bytes,3,opt,name=method,proto3" json:"method,omitempty"`
-}
-
-func (x *GRPCMethodMatch) Reset() {
-	*x = GRPCMethodMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_grpc_route_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GRPCMethodMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GRPCMethodMatch) ProtoMessage() {}
-
-func (x *GRPCMethodMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_grpc_route_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GRPCMethodMatch.ProtoReflect.Descriptor instead.
-func (*GRPCMethodMatch) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_grpc_route_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *GRPCMethodMatch) GetType() GRPCMethodMatchType {
-	if x != nil {
-		return x.Type
-	}
-	return GRPCMethodMatchType_GRPC_METHOD_MATCH_TYPE_UNSPECIFIED
-}
-
-func (x *GRPCMethodMatch) GetService() string {
-	if x != nil {
-		return x.Service
-	}
-	return ""
-}
-
-func (x *GRPCMethodMatch) GetMethod() string {
-	if x != nil {
-		return x.Method
-	}
-	return ""
-}
-
-type GRPCHeaderMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Type  HeaderMatchType `protobuf:"varint,1,opt,name=type,proto3,enum=hashicorp.consul.mesh.v2beta1.HeaderMatchType" json:"type,omitempty"`
-	Name  string          `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	Value string          `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"`
-}
-
-func (x *GRPCHeaderMatch) Reset() {
-	*x = GRPCHeaderMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_grpc_route_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GRPCHeaderMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GRPCHeaderMatch) ProtoMessage() {}
-
-func (x *GRPCHeaderMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_grpc_route_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GRPCHeaderMatch.ProtoReflect.Descriptor instead.
-func (*GRPCHeaderMatch) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_grpc_route_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *GRPCHeaderMatch) GetType() HeaderMatchType {
-	if x != nil {
-		return x.Type
-	}
-	return HeaderMatchType_HEADER_MATCH_TYPE_UNSPECIFIED
-}
-
-func (x *GRPCHeaderMatch) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *GRPCHeaderMatch) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-type GRPCRouteFilter struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// RequestHeaderModifier defines a schema for a filter that modifies request
-	// headers.
-	RequestHeaderModifier *HTTPHeaderFilter `protobuf:"bytes,1,opt,name=request_header_modifier,json=requestHeaderModifier,proto3" json:"request_header_modifier,omitempty"`
-	// ResponseHeaderModifier defines a schema for a filter that modifies
-	// response headers.
-	ResponseHeaderModifier *HTTPHeaderFilter `protobuf:"bytes,2,opt,name=response_header_modifier,json=responseHeaderModifier,proto3" json:"response_header_modifier,omitempty"`
-	// URLRewrite defines a schema for a filter that modifies a request during
-	// forwarding.
-	UrlRewrite *HTTPURLRewriteFilter `protobuf:"bytes,5,opt,name=url_rewrite,json=urlRewrite,proto3" json:"url_rewrite,omitempty"`
-}
-
-func (x *GRPCRouteFilter) Reset() {
-	*x = GRPCRouteFilter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_grpc_route_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GRPCRouteFilter) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GRPCRouteFilter) ProtoMessage() {}
-
-func (x *GRPCRouteFilter) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_grpc_route_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GRPCRouteFilter.ProtoReflect.Descriptor instead.
-func (*GRPCRouteFilter) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_grpc_route_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *GRPCRouteFilter) GetRequestHeaderModifier() *HTTPHeaderFilter {
-	if x != nil {
-		return x.RequestHeaderModifier
-	}
-	return nil
-}
-
-func (x *GRPCRouteFilter) GetResponseHeaderModifier() *HTTPHeaderFilter {
-	if x != nil {
-		return x.ResponseHeaderModifier
-	}
-	return nil
-}
-
-func (x *GRPCRouteFilter) GetUrlRewrite() *HTTPURLRewriteFilter {
-	if x != nil {
-		return x.UrlRewrite
-	}
-	return nil
-}
-
-type GRPCBackendRef struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	BackendRef *BackendReference `protobuf:"bytes,1,opt,name=backend_ref,json=backendRef,proto3" json:"backend_ref,omitempty"`
-	// Weight specifies the proportion of requests forwarded to the referenced
-	// backend. This is computed as weight/(sum of all weights in this
-	// BackendRefs list). For non-zero values, there may be some epsilon from the
-	// exact proportion defined here depending on the precision an implementation
-	// supports. Weight is not a percentage and the sum of weights does not need
-	// to equal 100.
-	//
-	// If only one backend is specified and it has a weight greater than 0, 100%
-	// of the traffic is forwarded to that backend. If weight is set to 0, no
-	// traffic should be forwarded for this entry. If unspecified, weight defaults
-	// to 1.
-	Weight uint32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"`
-	// Filters defined at this level should be executed if and only if the
-	// request is being forwarded to the backend defined here.
-	Filters []*GRPCRouteFilter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters,omitempty"`
-}
-
-func (x *GRPCBackendRef) Reset() {
-	*x = GRPCBackendRef{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_grpc_route_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GRPCBackendRef) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GRPCBackendRef) ProtoMessage() {}
-
-func (x *GRPCBackendRef) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_grpc_route_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GRPCBackendRef.ProtoReflect.Descriptor instead.
-func (*GRPCBackendRef) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_grpc_route_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *GRPCBackendRef) GetBackendRef() *BackendReference {
-	if x != nil {
-		return x.BackendRef
-	}
-	return nil
-}
-
-func (x *GRPCBackendRef) GetWeight() uint32 {
-	if x != nil {
-		return x.Weight
-	}
-	return 0
-}
-
-func (x *GRPCBackendRef) GetFilters() []*GRPCRouteFilter {
-	if x != nil {
-		return x.Filters
-	}
-	return nil
-}
-
-var File_pbmesh_v2beta1_grpc_route_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_grpc_route_proto_rawDesc = []byte{
-	0x0a, 0x1f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x1a, 0x1b, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x70,
-	0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x68, 0x74,
-	0x74, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x27,
-	0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x68,
-	0x74, 0x74, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65,
-	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x28, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x6f, 0x75,
-	0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e,
-	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0xc6, 0x01, 0x0a, 0x09, 0x47, 0x52, 0x50, 0x43, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x4f, 0x0a,
-	0x0b, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x65, 0x66, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
-	0x63, 0x65, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x66, 0x73, 0x12, 0x1c,
-	0x0a, 0x09, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x09, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x42, 0x0a, 0x05,
-	0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x47, 0x52, 0x50, 0x43,
-	0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73,
-	0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0x8d, 0x03, 0x0a, 0x0d, 0x47, 0x52, 0x50,
-	0x43, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x47, 0x0a, 0x07, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x47, 0x52, 0x50, 0x43,
-	0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x07, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x47, 0x52, 0x50, 0x43, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x46, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x50, 0x0a,
-	0x0c, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x5f, 0x72, 0x65, 0x66, 0x73, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x47, 0x52, 0x50, 0x43, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52,
-	0x65, 0x66, 0x52, 0x0b, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x73, 0x12,
-	0x4c, 0x0a, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f,
-	0x75, 0x74, 0x73, 0x52, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x12, 0x49, 0x0a,
-	0x07, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48,
-	0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x52,
-	0x07, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x22, 0xa2, 0x01, 0x0a, 0x0e, 0x47, 0x52, 0x50,
-	0x43, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x46, 0x0a, 0x06, 0x6d,
-	0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x47, 0x52, 0x50, 0x43,
-	0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x06, 0x6d, 0x65, 0x74,
-	0x68, 0x6f, 0x64, 0x12, 0x48, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x47, 0x52, 0x50, 0x43, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x22, 0x8b, 0x01,
-	0x0a, 0x0f, 0x47, 0x52, 0x50, 0x43, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x12, 0x46, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x47, 0x52, 0x50, 0x43, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54,
-	0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x22, 0x7f, 0x0a, 0x0f, 0x47,
-	0x52, 0x50, 0x43, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x42,
-	0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79,
-	0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xbb, 0x02, 0x0a,
-	0x0f, 0x47, 0x52, 0x50, 0x43, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x12, 0x67, 0x0a, 0x17, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x52, 0x15, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x69, 0x0a, 0x18, 0x72, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x6f, 0x64,
-	0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50,
-	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x16, 0x72, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69,
-	0x66, 0x69, 0x65, 0x72, 0x12, 0x54, 0x0a, 0x0b, 0x75, 0x72, 0x6c, 0x5f, 0x72, 0x65, 0x77, 0x72,
-	0x69, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x55, 0x52,
-	0x4c, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x0a,
-	0x75, 0x72, 0x6c, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x22, 0xc4, 0x01, 0x0a, 0x0e, 0x47,
-	0x52, 0x50, 0x43, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x12, 0x50, 0x0a,
-	0x0b, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x5f, 0x72, 0x65, 0x66, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65,
-	0x6e, 0x63, 0x65, 0x52, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x12,
-	0x16, 0x0a, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x48, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x47, 0x52, 0x50, 0x43, 0x52, 0x6f, 0x75,
-	0x74, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x73, 0x2a, 0x81, 0x01, 0x0a, 0x13, 0x47, 0x52, 0x50, 0x43, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x12, 0x26, 0x0a, 0x22, 0x47, 0x52, 0x50,
-	0x43, 0x5f, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44, 0x5f, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54,
-	0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,
-	0x00, 0x12, 0x20, 0x0a, 0x1c, 0x47, 0x52, 0x50, 0x43, 0x5f, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44,
-	0x5f, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x58, 0x41, 0x43,
-	0x54, 0x10, 0x01, 0x12, 0x20, 0x0a, 0x1c, 0x47, 0x52, 0x50, 0x43, 0x5f, 0x4d, 0x45, 0x54, 0x48,
-	0x4f, 0x44, 0x5f, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45,
-	0x47, 0x45, 0x58, 0x10, 0x02, 0x42, 0x8f, 0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x0e, 0x47, 0x72, 0x70,
-	0x63, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x43, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x6d, 0x65, 0x73, 0x68, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68,
-	0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68,
-	0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x29, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68,
-	0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a,
-	0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_grpc_route_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_grpc_route_proto_rawDescData = file_pbmesh_v2beta1_grpc_route_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_grpc_route_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_grpc_route_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_grpc_route_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_grpc_route_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_grpc_route_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_grpc_route_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbmesh_v2beta1_grpc_route_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
-var file_pbmesh_v2beta1_grpc_route_proto_goTypes = []interface{}{
-	(GRPCMethodMatchType)(0),     // 0: hashicorp.consul.mesh.v2beta1.GRPCMethodMatchType
-	(*GRPCRoute)(nil),            // 1: hashicorp.consul.mesh.v2beta1.GRPCRoute
-	(*GRPCRouteRule)(nil),        // 2: hashicorp.consul.mesh.v2beta1.GRPCRouteRule
-	(*GRPCRouteMatch)(nil),       // 3: hashicorp.consul.mesh.v2beta1.GRPCRouteMatch
-	(*GRPCMethodMatch)(nil),      // 4: hashicorp.consul.mesh.v2beta1.GRPCMethodMatch
-	(*GRPCHeaderMatch)(nil),      // 5: hashicorp.consul.mesh.v2beta1.GRPCHeaderMatch
-	(*GRPCRouteFilter)(nil),      // 6: hashicorp.consul.mesh.v2beta1.GRPCRouteFilter
-	(*GRPCBackendRef)(nil),       // 7: hashicorp.consul.mesh.v2beta1.GRPCBackendRef
-	(*ParentReference)(nil),      // 8: hashicorp.consul.mesh.v2beta1.ParentReference
-	(*HTTPRouteTimeouts)(nil),    // 9: hashicorp.consul.mesh.v2beta1.HTTPRouteTimeouts
-	(*HTTPRouteRetries)(nil),     // 10: hashicorp.consul.mesh.v2beta1.HTTPRouteRetries
-	(HeaderMatchType)(0),         // 11: hashicorp.consul.mesh.v2beta1.HeaderMatchType
-	(*HTTPHeaderFilter)(nil),     // 12: hashicorp.consul.mesh.v2beta1.HTTPHeaderFilter
-	(*HTTPURLRewriteFilter)(nil), // 13: hashicorp.consul.mesh.v2beta1.HTTPURLRewriteFilter
-	(*BackendReference)(nil),     // 14: hashicorp.consul.mesh.v2beta1.BackendReference
-}
-var file_pbmesh_v2beta1_grpc_route_proto_depIdxs = []int32{
-	8,  // 0: hashicorp.consul.mesh.v2beta1.GRPCRoute.parent_refs:type_name -> hashicorp.consul.mesh.v2beta1.ParentReference
-	2,  // 1: hashicorp.consul.mesh.v2beta1.GRPCRoute.rules:type_name -> hashicorp.consul.mesh.v2beta1.GRPCRouteRule
-	3,  // 2: hashicorp.consul.mesh.v2beta1.GRPCRouteRule.matches:type_name -> hashicorp.consul.mesh.v2beta1.GRPCRouteMatch
-	6,  // 3: hashicorp.consul.mesh.v2beta1.GRPCRouteRule.filters:type_name -> hashicorp.consul.mesh.v2beta1.GRPCRouteFilter
-	7,  // 4: hashicorp.consul.mesh.v2beta1.GRPCRouteRule.backend_refs:type_name -> hashicorp.consul.mesh.v2beta1.GRPCBackendRef
-	9,  // 5: hashicorp.consul.mesh.v2beta1.GRPCRouteRule.timeouts:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteTimeouts
-	10, // 6: hashicorp.consul.mesh.v2beta1.GRPCRouteRule.retries:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteRetries
-	4,  // 7: hashicorp.consul.mesh.v2beta1.GRPCRouteMatch.method:type_name -> hashicorp.consul.mesh.v2beta1.GRPCMethodMatch
-	5,  // 8: hashicorp.consul.mesh.v2beta1.GRPCRouteMatch.headers:type_name -> hashicorp.consul.mesh.v2beta1.GRPCHeaderMatch
-	0,  // 9: hashicorp.consul.mesh.v2beta1.GRPCMethodMatch.type:type_name -> hashicorp.consul.mesh.v2beta1.GRPCMethodMatchType
-	11, // 10: hashicorp.consul.mesh.v2beta1.GRPCHeaderMatch.type:type_name -> hashicorp.consul.mesh.v2beta1.HeaderMatchType
-	12, // 11: hashicorp.consul.mesh.v2beta1.GRPCRouteFilter.request_header_modifier:type_name -> hashicorp.consul.mesh.v2beta1.HTTPHeaderFilter
-	12, // 12: hashicorp.consul.mesh.v2beta1.GRPCRouteFilter.response_header_modifier:type_name -> hashicorp.consul.mesh.v2beta1.HTTPHeaderFilter
-	13, // 13: hashicorp.consul.mesh.v2beta1.GRPCRouteFilter.url_rewrite:type_name -> hashicorp.consul.mesh.v2beta1.HTTPURLRewriteFilter
-	14, // 14: hashicorp.consul.mesh.v2beta1.GRPCBackendRef.backend_ref:type_name -> hashicorp.consul.mesh.v2beta1.BackendReference
-	6,  // 15: hashicorp.consul.mesh.v2beta1.GRPCBackendRef.filters:type_name -> hashicorp.consul.mesh.v2beta1.GRPCRouteFilter
-	16, // [16:16] is the sub-list for method output_type
-	16, // [16:16] is the sub-list for method input_type
-	16, // [16:16] is the sub-list for extension type_name
-	16, // [16:16] is the sub-list for extension extendee
-	0,  // [0:16] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_grpc_route_proto_init() }
-func file_pbmesh_v2beta1_grpc_route_proto_init() {
-	if File_pbmesh_v2beta1_grpc_route_proto != nil {
-		return
-	}
-	file_pbmesh_v2beta1_common_proto_init()
-	file_pbmesh_v2beta1_http_route_proto_init()
-	file_pbmesh_v2beta1_http_route_retries_proto_init()
-	file_pbmesh_v2beta1_http_route_timeouts_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_grpc_route_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GRPCRoute); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_grpc_route_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GRPCRouteRule); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_grpc_route_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GRPCRouteMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_grpc_route_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GRPCMethodMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_grpc_route_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GRPCHeaderMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_grpc_route_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GRPCRouteFilter); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_grpc_route_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GRPCBackendRef); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_grpc_route_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   7,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_grpc_route_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_grpc_route_proto_depIdxs,
-		EnumInfos:         file_pbmesh_v2beta1_grpc_route_proto_enumTypes,
-		MessageInfos:      file_pbmesh_v2beta1_grpc_route_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_grpc_route_proto = out.File
-	file_pbmesh_v2beta1_grpc_route_proto_rawDesc = nil
-	file_pbmesh_v2beta1_grpc_route_proto_goTypes = nil
-	file_pbmesh_v2beta1_grpc_route_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/grpc_route.proto b/proto-public/pbmesh/v2beta1/grpc_route.proto
deleted file mode 100644
index dabce90843880..0000000000000
--- a/proto-public/pbmesh/v2beta1/grpc_route.proto
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "pbmesh/v2beta1/common.proto";
-import "pbmesh/v2beta1/http_route.proto";
-import "pbmesh/v2beta1/http_route_retries.proto";
-import "pbmesh/v2beta1/http_route_timeouts.proto";
-import "pbresource/annotations.proto";
-
-// NOTE: this should align to the GAMMA/gateway-api version, or at least be
-// easily translatable.
-//
-// https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1alpha2.GRPCRoute
-//
-// This is a Resource type.
-message GRPCRoute {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  // ParentRefs references the resources (usually Services) that a Route wants
-  // to be attached to.
-  //
-  // It is invalid to reference an identical parent more than once. It is valid
-  // to reference multiple distinct sections within the same parent resource.
-  repeated ParentReference parent_refs = 1;
-
-  // Hostnames are the hostnames for which this GRPCRoute should respond to requests.
-  //
-  // This is only valid for north/south.
-  repeated string hostnames = 2;
-
-  // Rules are a list of GRPC matchers, filters and actions.
-  repeated GRPCRouteRule rules = 3;
-}
-
-message GRPCRouteRule {
-  repeated GRPCRouteMatch matches = 1;
-  repeated GRPCRouteFilter filters = 2;
-
-  // BackendRefs defines the backend(s) where matching requests should be sent.
-  //
-  // Failure behavior here depends on how many BackendRefs are specified and
-  // how many are invalid.
-  //
-  // If all entries in BackendRefs are invalid, and there are also no filters
-  // specified in this route rule, all traffic which matches this rule MUST
-  // receive a 500 status code.
-  //
-  // See the GRPCBackendRef definition for the rules about what makes a single
-  // GRPCBackendRef invalid.
-  //
-  // When a GRPCBackendRef is invalid, 500 status codes MUST be returned for
-  // requests that would have otherwise been routed to an invalid backend. If
-  // multiple backends are specified, and some are invalid, the proportion of
-  // requests that would otherwise have been routed to an invalid backend MUST
-  // receive a 500 status code.
-  //
-  // For example, if two backends are specified with equal weights, and one is
-  // invalid, 50 percent of traffic must receive a 500. Implementations may
-  // choose how that 50 percent is determined.
-  repeated GRPCBackendRef backend_refs = 3;
-
-  HTTPRouteTimeouts timeouts = 4;
-  HTTPRouteRetries retries = 5;
-}
-
-message GRPCRouteMatch {
-  // Method specifies a gRPC request service/method matcher. If this field is
-  // not specified, all services and methods will match.
-  GRPCMethodMatch method = 1;
-
-  // Headers specifies gRPC request header matchers. Multiple match values are
-  // ANDed together, meaning, a request MUST match all the specified headers to
-  // select the route.
-  repeated GRPCHeaderMatch headers = 2;
-}
-
-message GRPCMethodMatch {
-  // Type specifies how to match against the service and/or method. Support:
-  // Core (Exact with service and method specified)
-  GRPCMethodMatchType type = 1;
-
-  // Value of the service to match against. If left empty or omitted, will
-  // match any service.
-  //
-  // At least one of Service and Method MUST be a non-empty string.
-  string service = 2;
-
-  // Value of the method to match against. If left empty or omitted, will match
-  // all services.
-  //
-  // At least one of Service and Method MUST be a non-empty string.}
-  string method = 3;
-}
-
-enum GRPCMethodMatchType {
-  GRPC_METHOD_MATCH_TYPE_UNSPECIFIED = 0;
-  GRPC_METHOD_MATCH_TYPE_EXACT = 1;
-  GRPC_METHOD_MATCH_TYPE_REGEX = 2;
-}
-
-message GRPCHeaderMatch {
-  HeaderMatchType type = 1;
-  string name = 2;
-  string value = 3;
-}
-
-message GRPCRouteFilter {
-  // RequestHeaderModifier defines a schema for a filter that modifies request
-  // headers.
-  HTTPHeaderFilter request_header_modifier = 1;
-
-  // ResponseHeaderModifier defines a schema for a filter that modifies
-  // response headers.
-  HTTPHeaderFilter response_header_modifier = 2;
-
-  // URLRewrite defines a schema for a filter that modifies a request during
-  // forwarding.
-  HTTPURLRewriteFilter url_rewrite = 5;
-}
-
-message GRPCBackendRef {
-  BackendReference backend_ref = 1;
-
-  // Weight specifies the proportion of requests forwarded to the referenced
-  // backend. This is computed as weight/(sum of all weights in this
-  // BackendRefs list). For non-zero values, there may be some epsilon from the
-  // exact proportion defined here depending on the precision an implementation
-  // supports. Weight is not a percentage and the sum of weights does not need
-  // to equal 100.
-  //
-  //If only one backend is specified and it has a weight greater than 0, 100%
-  //of the traffic is forwarded to that backend. If weight is set to 0, no
-  //traffic should be forwarded for this entry. If unspecified, weight defaults
-  //to 1.
-  uint32 weight = 2;
-
-  // Filters defined at this level should be executed if and only if the
-  // request is being forwarded to the backend defined here.
-  repeated GRPCRouteFilter filters = 3;
-}
diff --git a/proto-public/pbmesh/v2beta1/http_route.pb.binary.go b/proto-public/pbmesh/v2beta1/http_route.pb.binary.go
deleted file mode 100644
index b8b4b08a9cc3f..0000000000000
--- a/proto-public/pbmesh/v2beta1/http_route.pb.binary.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/http_route.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPRoute) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPRoute) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPRouteRule) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPRouteRule) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPRouteMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPRouteMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPPathMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPPathMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPHeaderMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPHeaderMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPQueryParamMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPQueryParamMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPRouteFilter) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPRouteFilter) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPHeaderFilter) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPHeaderFilter) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPHeader) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPHeader) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPURLRewriteFilter) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPURLRewriteFilter) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPBackendRef) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPBackendRef) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/http_route.pb.go b/proto-public/pbmesh/v2beta1/http_route.pb.go
deleted file mode 100644
index 71a3f6b03f10d..0000000000000
--- a/proto-public/pbmesh/v2beta1/http_route.pb.go
+++ /dev/null
@@ -1,1437 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/http_route.proto
-
-package meshv2beta1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// PathMatchType specifies the semantics of how HTTP paths should be compared.
-// Valid PathMatchType values, along with their support levels, are:
-//
-// PathPrefix and Exact paths must be syntactically valid:
-//
-// - Must begin with the / character
-// - Must not contain consecutive / characters (e.g. /foo///, //).
-// - Note that values may be added to this enum, implementations must ensure that unknown values will not cause a crash.
-//
-// Unknown values here must result in the implementation setting the Accepted
-// Condition for the Route to status: False, with a Reason of UnsupportedValue.
-type PathMatchType int32
-
-const (
-	PathMatchType_PATH_MATCH_TYPE_UNSPECIFIED PathMatchType = 0
-	PathMatchType_PATH_MATCH_TYPE_EXACT       PathMatchType = 1
-	PathMatchType_PATH_MATCH_TYPE_PREFIX      PathMatchType = 2
-	PathMatchType_PATH_MATCH_TYPE_REGEX       PathMatchType = 3
-)
-
-// Enum value maps for PathMatchType.
-var (
-	PathMatchType_name = map[int32]string{
-		0: "PATH_MATCH_TYPE_UNSPECIFIED",
-		1: "PATH_MATCH_TYPE_EXACT",
-		2: "PATH_MATCH_TYPE_PREFIX",
-		3: "PATH_MATCH_TYPE_REGEX",
-	}
-	PathMatchType_value = map[string]int32{
-		"PATH_MATCH_TYPE_UNSPECIFIED": 0,
-		"PATH_MATCH_TYPE_EXACT":       1,
-		"PATH_MATCH_TYPE_PREFIX":      2,
-		"PATH_MATCH_TYPE_REGEX":       3,
-	}
-)
-
-func (x PathMatchType) Enum() *PathMatchType {
-	p := new(PathMatchType)
-	*p = x
-	return p
-}
-
-func (x PathMatchType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (PathMatchType) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_http_route_proto_enumTypes[0].Descriptor()
-}
-
-func (PathMatchType) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_http_route_proto_enumTypes[0]
-}
-
-func (x PathMatchType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use PathMatchType.Descriptor instead.
-func (PathMatchType) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_proto_rawDescGZIP(), []int{0}
-}
-
-// HeaderMatchType specifies the semantics of how HTTP header values should be
-// compared. Valid HeaderMatchType values, along with their conformance levels,
-// are:
-//
-// Note that values may be added to this enum, implementations must ensure that
-// unknown values will not cause a crash.
-//
-// Unknown values here must result in the implementation setting the Accepted
-// Condition for the Route to status: False, with a Reason of UnsupportedValue.
-type HeaderMatchType int32
-
-const (
-	HeaderMatchType_HEADER_MATCH_TYPE_UNSPECIFIED HeaderMatchType = 0
-	HeaderMatchType_HEADER_MATCH_TYPE_EXACT       HeaderMatchType = 1
-	HeaderMatchType_HEADER_MATCH_TYPE_REGEX       HeaderMatchType = 2
-	// consul only after this point (service-router compat)
-	HeaderMatchType_HEADER_MATCH_TYPE_PRESENT HeaderMatchType = 3
-	HeaderMatchType_HEADER_MATCH_TYPE_PREFIX  HeaderMatchType = 4
-	HeaderMatchType_HEADER_MATCH_TYPE_SUFFIX  HeaderMatchType = 5
-)
-
-// Enum value maps for HeaderMatchType.
-var (
-	HeaderMatchType_name = map[int32]string{
-		0: "HEADER_MATCH_TYPE_UNSPECIFIED",
-		1: "HEADER_MATCH_TYPE_EXACT",
-		2: "HEADER_MATCH_TYPE_REGEX",
-		3: "HEADER_MATCH_TYPE_PRESENT",
-		4: "HEADER_MATCH_TYPE_PREFIX",
-		5: "HEADER_MATCH_TYPE_SUFFIX",
-	}
-	HeaderMatchType_value = map[string]int32{
-		"HEADER_MATCH_TYPE_UNSPECIFIED": 0,
-		"HEADER_MATCH_TYPE_EXACT":       1,
-		"HEADER_MATCH_TYPE_REGEX":       2,
-		"HEADER_MATCH_TYPE_PRESENT":     3,
-		"HEADER_MATCH_TYPE_PREFIX":      4,
-		"HEADER_MATCH_TYPE_SUFFIX":      5,
-	}
-)
-
-func (x HeaderMatchType) Enum() *HeaderMatchType {
-	p := new(HeaderMatchType)
-	*p = x
-	return p
-}
-
-func (x HeaderMatchType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (HeaderMatchType) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_http_route_proto_enumTypes[1].Descriptor()
-}
-
-func (HeaderMatchType) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_http_route_proto_enumTypes[1]
-}
-
-func (x HeaderMatchType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use HeaderMatchType.Descriptor instead.
-func (HeaderMatchType) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_proto_rawDescGZIP(), []int{1}
-}
-
-type QueryParamMatchType int32
-
-const (
-	QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_UNSPECIFIED QueryParamMatchType = 0
-	QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_EXACT       QueryParamMatchType = 1
-	QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_REGEX       QueryParamMatchType = 2
-	// consul only after this point (service-router compat)
-	QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_PRESENT QueryParamMatchType = 3
-)
-
-// Enum value maps for QueryParamMatchType.
-var (
-	QueryParamMatchType_name = map[int32]string{
-		0: "QUERY_PARAM_MATCH_TYPE_UNSPECIFIED",
-		1: "QUERY_PARAM_MATCH_TYPE_EXACT",
-		2: "QUERY_PARAM_MATCH_TYPE_REGEX",
-		3: "QUERY_PARAM_MATCH_TYPE_PRESENT",
-	}
-	QueryParamMatchType_value = map[string]int32{
-		"QUERY_PARAM_MATCH_TYPE_UNSPECIFIED": 0,
-		"QUERY_PARAM_MATCH_TYPE_EXACT":       1,
-		"QUERY_PARAM_MATCH_TYPE_REGEX":       2,
-		"QUERY_PARAM_MATCH_TYPE_PRESENT":     3,
-	}
-)
-
-func (x QueryParamMatchType) Enum() *QueryParamMatchType {
-	p := new(QueryParamMatchType)
-	*p = x
-	return p
-}
-
-func (x QueryParamMatchType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (QueryParamMatchType) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_http_route_proto_enumTypes[2].Descriptor()
-}
-
-func (QueryParamMatchType) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_http_route_proto_enumTypes[2]
-}
-
-func (x QueryParamMatchType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use QueryParamMatchType.Descriptor instead.
-func (QueryParamMatchType) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_proto_rawDescGZIP(), []int{2}
-}
-
-// NOTE: this should align to the GAMMA/gateway-api version, or at least be
-// easily translatable.
-//
-// https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRoute
-//
-// This is a Resource type.
-type HTTPRoute struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ParentRefs references the resources (usually Services) that a Route wants
-	// to be attached to.
-	//
-	// It is invalid to reference an identical parent more than once. It is valid
-	// to reference multiple distinct sections within the same parent resource.
-	ParentRefs []*ParentReference `protobuf:"bytes,1,rep,name=parent_refs,json=parentRefs,proto3" json:"parent_refs,omitempty"`
-	// Hostnames are the hostnames for which this HTTPRoute should respond to requests.
-	//
-	// This is only valid for north/south.
-	Hostnames []string `protobuf:"bytes,2,rep,name=hostnames,proto3" json:"hostnames,omitempty"`
-	// Rules are a list of HTTP-based routing rules that this route should
-	// use for constructing a routing table.
-	Rules []*HTTPRouteRule `protobuf:"bytes,3,rep,name=rules,proto3" json:"rules,omitempty"`
-}
-
-func (x *HTTPRoute) Reset() {
-	*x = HTTPRoute{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPRoute) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPRoute) ProtoMessage() {}
-
-func (x *HTTPRoute) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPRoute.ProtoReflect.Descriptor instead.
-func (*HTTPRoute) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *HTTPRoute) GetParentRefs() []*ParentReference {
-	if x != nil {
-		return x.ParentRefs
-	}
-	return nil
-}
-
-func (x *HTTPRoute) GetHostnames() []string {
-	if x != nil {
-		return x.Hostnames
-	}
-	return nil
-}
-
-func (x *HTTPRoute) GetRules() []*HTTPRouteRule {
-	if x != nil {
-		return x.Rules
-	}
-	return nil
-}
-
-// HTTPRouteRule specifies the routing rules used to determine what upstream
-// service an HTTP request is routed to.
-type HTTPRouteRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Matches []*HTTPRouteMatch  `protobuf:"bytes,1,rep,name=matches,proto3" json:"matches,omitempty"`
-	Filters []*HTTPRouteFilter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"`
-	// BackendRefs defines the backend(s) where matching requests should be sent.
-	//
-	// Failure behavior here depends on how many BackendRefs are specified and
-	// how many are invalid.
-	//
-	// If all entries in BackendRefs are invalid, and there are also no filters
-	// specified in this route rule, all traffic which matches this rule MUST
-	// receive a 500 status code.
-	//
-	// See the HTTPBackendRef definition for the rules about what makes a single
-	// HTTPBackendRef invalid.
-	//
-	// When a HTTPBackendRef is invalid, 500 status codes MUST be returned for
-	// requests that would have otherwise been routed to an invalid backend. If
-	// multiple backends are specified, and some are invalid, the proportion of
-	// requests that would otherwise have been routed to an invalid backend MUST
-	// receive a 500 status code.
-	//
-	// For example, if two backends are specified with equal weights, and one is
-	// invalid, 50 percent of traffic must receive a 500. Implementations may
-	// choose how that 50 percent is determined.
-	BackendRefs []*HTTPBackendRef  `protobuf:"bytes,3,rep,name=backend_refs,json=backendRefs,proto3" json:"backend_refs,omitempty"`
-	Timeouts    *HTTPRouteTimeouts `protobuf:"bytes,4,opt,name=timeouts,proto3" json:"timeouts,omitempty"`
-	Retries     *HTTPRouteRetries  `protobuf:"bytes,5,opt,name=retries,proto3" json:"retries,omitempty"`
-}
-
-func (x *HTTPRouteRule) Reset() {
-	*x = HTTPRouteRule{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPRouteRule) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPRouteRule) ProtoMessage() {}
-
-func (x *HTTPRouteRule) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPRouteRule.ProtoReflect.Descriptor instead.
-func (*HTTPRouteRule) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *HTTPRouteRule) GetMatches() []*HTTPRouteMatch {
-	if x != nil {
-		return x.Matches
-	}
-	return nil
-}
-
-func (x *HTTPRouteRule) GetFilters() []*HTTPRouteFilter {
-	if x != nil {
-		return x.Filters
-	}
-	return nil
-}
-
-func (x *HTTPRouteRule) GetBackendRefs() []*HTTPBackendRef {
-	if x != nil {
-		return x.BackendRefs
-	}
-	return nil
-}
-
-func (x *HTTPRouteRule) GetTimeouts() *HTTPRouteTimeouts {
-	if x != nil {
-		return x.Timeouts
-	}
-	return nil
-}
-
-func (x *HTTPRouteRule) GetRetries() *HTTPRouteRetries {
-	if x != nil {
-		return x.Retries
-	}
-	return nil
-}
-
-type HTTPRouteMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Path specifies a HTTP request path matcher. If this field is not
-	// specified, a default prefix match on the “/” path is provided.
-	Path *HTTPPathMatch `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
-	// Headers specifies HTTP request header matchers. Multiple match values are
-	// ANDed together, meaning, a request must match all the specified headers to
-	// select the route.
-	Headers []*HTTPHeaderMatch `protobuf:"bytes,2,rep,name=headers,proto3" json:"headers,omitempty"`
-	// QueryParams specifies HTTP query parameter matchers. Multiple match values
-	// are ANDed together, meaning, a request must match all the specified query
-	// parameters to select the route.
-	QueryParams []*HTTPQueryParamMatch `protobuf:"bytes,3,rep,name=query_params,json=queryParams,proto3" json:"query_params,omitempty"`
-	// Method specifies HTTP method matcher. When specified, this route will be
-	// matched only if the request has the specified method.
-	Method string `protobuf:"bytes,4,opt,name=method,proto3" json:"method,omitempty"`
-}
-
-func (x *HTTPRouteMatch) Reset() {
-	*x = HTTPRouteMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPRouteMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPRouteMatch) ProtoMessage() {}
-
-func (x *HTTPRouteMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPRouteMatch.ProtoReflect.Descriptor instead.
-func (*HTTPRouteMatch) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *HTTPRouteMatch) GetPath() *HTTPPathMatch {
-	if x != nil {
-		return x.Path
-	}
-	return nil
-}
-
-func (x *HTTPRouteMatch) GetHeaders() []*HTTPHeaderMatch {
-	if x != nil {
-		return x.Headers
-	}
-	return nil
-}
-
-func (x *HTTPRouteMatch) GetQueryParams() []*HTTPQueryParamMatch {
-	if x != nil {
-		return x.QueryParams
-	}
-	return nil
-}
-
-func (x *HTTPRouteMatch) GetMethod() string {
-	if x != nil {
-		return x.Method
-	}
-	return ""
-}
-
-type HTTPPathMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Type specifies how to match against the path Value.
-	Type PathMatchType `protobuf:"varint,1,opt,name=type,proto3,enum=hashicorp.consul.mesh.v2beta1.PathMatchType" json:"type,omitempty"`
-	// Value of the HTTP path to match against.
-	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
-}
-
-func (x *HTTPPathMatch) Reset() {
-	*x = HTTPPathMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPPathMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPPathMatch) ProtoMessage() {}
-
-func (x *HTTPPathMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPPathMatch.ProtoReflect.Descriptor instead.
-func (*HTTPPathMatch) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *HTTPPathMatch) GetType() PathMatchType {
-	if x != nil {
-		return x.Type
-	}
-	return PathMatchType_PATH_MATCH_TYPE_UNSPECIFIED
-}
-
-func (x *HTTPPathMatch) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-type HTTPHeaderMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Type specifies how to match against the value of the header.
-	Type HeaderMatchType `protobuf:"varint,1,opt,name=type,proto3,enum=hashicorp.consul.mesh.v2beta1.HeaderMatchType" json:"type,omitempty"`
-	// Name is the name of the HTTP Header to be matched. Name matching MUST be
-	// case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2).
-	//
-	// If multiple entries specify equivalent header names, only the first entry
-	// with an equivalent name MUST be considered for a match. Subsequent entries
-	// with an equivalent header name MUST be ignored. Due to the
-	// case-insensitivity of header names, “foo” and “Foo” are considered
-	// equivalent.
-	//
-	// When a header is repeated in an HTTP request, it is
-	// implementation-specific behavior as to how this is represented. Generally,
-	// proxies should follow the guidance from the RFC:
-	// https://www.rfc-editor.org/rfc/rfc7230.html#section-3.2.2 regarding
-	// processing a repeated header, with special handling for “Set-Cookie”.
-	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	// Value is the value of HTTP Header to be matched.
-	Value string `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"`
-	// NOTE: not in gamma; service-router compat
-	Invert bool `protobuf:"varint,4,opt,name=invert,proto3" json:"invert,omitempty"`
-}
-
-func (x *HTTPHeaderMatch) Reset() {
-	*x = HTTPHeaderMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPHeaderMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPHeaderMatch) ProtoMessage() {}
-
-func (x *HTTPHeaderMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPHeaderMatch.ProtoReflect.Descriptor instead.
-func (*HTTPHeaderMatch) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *HTTPHeaderMatch) GetType() HeaderMatchType {
-	if x != nil {
-		return x.Type
-	}
-	return HeaderMatchType_HEADER_MATCH_TYPE_UNSPECIFIED
-}
-
-func (x *HTTPHeaderMatch) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *HTTPHeaderMatch) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-func (x *HTTPHeaderMatch) GetInvert() bool {
-	if x != nil {
-		return x.Invert
-	}
-	return false
-}
-
-type HTTPQueryParamMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Type specifies how to match against the value of the query parameter.
-	Type QueryParamMatchType `protobuf:"varint,1,opt,name=type,proto3,enum=hashicorp.consul.mesh.v2beta1.QueryParamMatchType" json:"type,omitempty"`
-	// Name is the name of the HTTP query param to be matched. This must be an
-	// exact string match. (See
-	// https://tools.ietf.org/html/rfc7230#section-2.7.3).
-	//
-	// If multiple entries specify equivalent query param names, only the first
-	// entry with an equivalent name MUST be considered for a match. Subsequent
-	// entries with an equivalent query param name MUST be ignored.
-	//
-	// If a query param is repeated in an HTTP request, the behavior is purposely
-	// left undefined, since different data planes have different capabilities.
-	// However, it is recommended that implementations should match against the
-	// first value of the param if the data plane supports it, as this behavior
-	// is expected in other load balancing contexts outside of the Gateway API.
-	//
-	// Users SHOULD NOT route traffic based on repeated query params to guard
-	// themselves against potential differences in the implementations.
-	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	// Value is the value of HTTP query param to be matched.
-	Value string `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"`
-}
-
-func (x *HTTPQueryParamMatch) Reset() {
-	*x = HTTPQueryParamMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPQueryParamMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPQueryParamMatch) ProtoMessage() {}
-
-func (x *HTTPQueryParamMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPQueryParamMatch.ProtoReflect.Descriptor instead.
-func (*HTTPQueryParamMatch) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *HTTPQueryParamMatch) GetType() QueryParamMatchType {
-	if x != nil {
-		return x.Type
-	}
-	return QueryParamMatchType_QUERY_PARAM_MATCH_TYPE_UNSPECIFIED
-}
-
-func (x *HTTPQueryParamMatch) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *HTTPQueryParamMatch) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-type HTTPRouteFilter struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// RequestHeaderModifier defines a schema for a filter that modifies request
-	// headers.
-	RequestHeaderModifier *HTTPHeaderFilter `protobuf:"bytes,1,opt,name=request_header_modifier,json=requestHeaderModifier,proto3" json:"request_header_modifier,omitempty"`
-	// ResponseHeaderModifier defines a schema for a filter that modifies
-	// response headers.
-	ResponseHeaderModifier *HTTPHeaderFilter `protobuf:"bytes,2,opt,name=response_header_modifier,json=responseHeaderModifier,proto3" json:"response_header_modifier,omitempty"`
-	// URLRewrite defines a schema for a filter that modifies a request during
-	// forwarding.
-	UrlRewrite *HTTPURLRewriteFilter `protobuf:"bytes,5,opt,name=url_rewrite,json=urlRewrite,proto3" json:"url_rewrite,omitempty"`
-}
-
-func (x *HTTPRouteFilter) Reset() {
-	*x = HTTPRouteFilter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPRouteFilter) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPRouteFilter) ProtoMessage() {}
-
-func (x *HTTPRouteFilter) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPRouteFilter.ProtoReflect.Descriptor instead.
-func (*HTTPRouteFilter) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *HTTPRouteFilter) GetRequestHeaderModifier() *HTTPHeaderFilter {
-	if x != nil {
-		return x.RequestHeaderModifier
-	}
-	return nil
-}
-
-func (x *HTTPRouteFilter) GetResponseHeaderModifier() *HTTPHeaderFilter {
-	if x != nil {
-		return x.ResponseHeaderModifier
-	}
-	return nil
-}
-
-func (x *HTTPRouteFilter) GetUrlRewrite() *HTTPURLRewriteFilter {
-	if x != nil {
-		return x.UrlRewrite
-	}
-	return nil
-}
-
-type HTTPHeaderFilter struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Set overwrites the request with the given header (name, value) before the
-	// action.
-	Set []*HTTPHeader `protobuf:"bytes,1,rep,name=set,proto3" json:"set,omitempty"`
-	// Add adds the given header(s) (name, value) to the request before the
-	// action. It appends to any existing values associated with the header name.
-	Add []*HTTPHeader `protobuf:"bytes,2,rep,name=add,proto3" json:"add,omitempty"`
-	// Remove the given header(s) from the HTTP request before the action. The
-	// value of Remove is a list of HTTP header names. Note that the header names
-	// are case-insensitive (see
-	// https://datatracker.ietf.org/doc/html/rfc2616#section-4.2).
-	Remove []string `protobuf:"bytes,3,rep,name=remove,proto3" json:"remove,omitempty"`
-}
-
-func (x *HTTPHeaderFilter) Reset() {
-	*x = HTTPHeaderFilter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPHeaderFilter) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPHeaderFilter) ProtoMessage() {}
-
-func (x *HTTPHeaderFilter) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPHeaderFilter.ProtoReflect.Descriptor instead.
-func (*HTTPHeaderFilter) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *HTTPHeaderFilter) GetSet() []*HTTPHeader {
-	if x != nil {
-		return x.Set
-	}
-	return nil
-}
-
-func (x *HTTPHeaderFilter) GetAdd() []*HTTPHeader {
-	if x != nil {
-		return x.Add
-	}
-	return nil
-}
-
-func (x *HTTPHeaderFilter) GetRemove() []string {
-	if x != nil {
-		return x.Remove
-	}
-	return nil
-}
-
-type HTTPHeader struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name  string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
-}
-
-func (x *HTTPHeader) Reset() {
-	*x = HTTPHeader{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPHeader) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPHeader) ProtoMessage() {}
-
-func (x *HTTPHeader) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPHeader.ProtoReflect.Descriptor instead.
-func (*HTTPHeader) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *HTTPHeader) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *HTTPHeader) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-type HTTPURLRewriteFilter struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PathPrefix string `protobuf:"bytes,1,opt,name=path_prefix,json=pathPrefix,proto3" json:"path_prefix,omitempty"`
-}
-
-func (x *HTTPURLRewriteFilter) Reset() {
-	*x = HTTPURLRewriteFilter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPURLRewriteFilter) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPURLRewriteFilter) ProtoMessage() {}
-
-func (x *HTTPURLRewriteFilter) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPURLRewriteFilter.ProtoReflect.Descriptor instead.
-func (*HTTPURLRewriteFilter) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *HTTPURLRewriteFilter) GetPathPrefix() string {
-	if x != nil {
-		return x.PathPrefix
-	}
-	return ""
-}
-
-type HTTPBackendRef struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	BackendRef *BackendReference `protobuf:"bytes,1,opt,name=backend_ref,json=backendRef,proto3" json:"backend_ref,omitempty"`
-	// Weight specifies the proportion of requests forwarded to the referenced
-	// backend. This is computed as weight/(sum of all weights in this
-	// BackendRefs list). For non-zero values, there may be some epsilon from the
-	// exact proportion defined here depending on the precision an implementation
-	// supports. Weight is not a percentage and the sum of weights does not need
-	// to equal 100.
-	//
-	// If only one backend is specified and it has a weight greater than 0, 100%
-	// of the traffic is forwarded to that backend. If weight is set to 0, no
-	// traffic should be forwarded for this entry. If unspecified, weight defaults
-	// to 1.
-	Weight uint32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"`
-	// Filters defined at this level should be executed if and only if the
-	// request is being forwarded to the backend defined here.
-	Filters []*HTTPRouteFilter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters,omitempty"`
-}
-
-func (x *HTTPBackendRef) Reset() {
-	*x = HTTPBackendRef{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPBackendRef) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPBackendRef) ProtoMessage() {}
-
-func (x *HTTPBackendRef) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_http_route_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPBackendRef.ProtoReflect.Descriptor instead.
-func (*HTTPBackendRef) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *HTTPBackendRef) GetBackendRef() *BackendReference {
-	if x != nil {
-		return x.BackendRef
-	}
-	return nil
-}
-
-func (x *HTTPBackendRef) GetWeight() uint32 {
-	if x != nil {
-		return x.Weight
-	}
-	return 0
-}
-
-func (x *HTTPBackendRef) GetFilters() []*HTTPRouteFilter {
-	if x != nil {
-		return x.Filters
-	}
-	return nil
-}
-
-var File_pbmesh_v2beta1_http_route_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_http_route_proto_rawDesc = []byte{
-	0x0a, 0x1f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x1a, 0x1b, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x27, 0x70,
-	0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x68, 0x74,
-	0x74, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x28, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74,
-	0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e,
-	0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc6,
-	0x01, 0x0a, 0x09, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x4f, 0x0a, 0x0b,
-	0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x65, 0x66, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
-	0x65, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x66, 0x73, 0x12, 0x1c, 0x0a,
-	0x09, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x09, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x42, 0x0a, 0x05, 0x72,
-	0x75, 0x6c, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52,
-	0x6f, 0x75, 0x74, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x3a,
-	0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0x8d, 0x03, 0x0a, 0x0d, 0x48, 0x54, 0x54, 0x50,
-	0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x47, 0x0a, 0x07, 0x6d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52,
-	0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x73, 0x12, 0x48, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x46, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x50, 0x0a, 0x0c,
-	0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x5f, 0x72, 0x65, 0x66, 0x73, 0x18, 0x03, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65,
-	0x66, 0x52, 0x0b, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x73, 0x12, 0x4c,
-	0x0a, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75,
-	0x74, 0x73, 0x52, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x12, 0x49, 0x0a, 0x07,
-	0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x54,
-	0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x52, 0x07,
-	0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x22, 0x8b, 0x02, 0x0a, 0x0e, 0x48, 0x54, 0x54, 0x50,
-	0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x40, 0x0a, 0x04, 0x70, 0x61,
-	0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x50, 0x61, 0x74,
-	0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x48, 0x0a, 0x07,
-	0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x54,
-	0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x07, 0x68,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x55, 0x0a, 0x0c, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f,
-	0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x54, 0x54,
-	0x50, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x52, 0x0b, 0x71, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x16, 0x0a,
-	0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d,
-	0x65, 0x74, 0x68, 0x6f, 0x64, 0x22, 0x67, 0x0a, 0x0d, 0x48, 0x54, 0x54, 0x50, 0x50, 0x61, 0x74,
-	0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x40, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79,
-	0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x97,
-	0x01, 0x0a, 0x0f, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x12, 0x42, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65,
-	0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x12, 0x16, 0x0a, 0x06, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x06, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x22, 0x87, 0x01, 0x0a, 0x13, 0x48, 0x54, 0x54,
-	0x50, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x12, 0x46, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x32,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x51,
-	0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79,
-	0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x22, 0xbb, 0x02, 0x0a, 0x0f, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65,
-	0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x67, 0x0a, 0x17, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65,
-	0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x15, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12,
-	0x69, 0x0a, 0x18, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x52, 0x16, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x54, 0x0a, 0x0b, 0x75, 0x72,
-	0x6c, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x48, 0x54, 0x54, 0x50, 0x55, 0x52, 0x4c, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x46, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x52, 0x0a, 0x75, 0x72, 0x6c, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65,
-	0x22, 0xa4, 0x01, 0x0a, 0x10, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x3b, 0x0a, 0x03, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x29, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x03, 0x73,
-	0x65, 0x74, 0x12, 0x3b, 0x0a, 0x03, 0x61, 0x64, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x29, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x03, 0x61, 0x64, 0x64, 0x12,
-	0x16, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x06, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x22, 0x36, 0x0a, 0x0a, 0x48, 0x54, 0x54, 0x50, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22,
-	0x37, 0x0a, 0x14, 0x48, 0x54, 0x54, 0x50, 0x55, 0x52, 0x4c, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74,
-	0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x61, 0x74, 0x68, 0x5f,
-	0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x61,
-	0x74, 0x68, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x22, 0xc4, 0x01, 0x0a, 0x0e, 0x48, 0x54, 0x54,
-	0x50, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x12, 0x50, 0x0a, 0x0b, 0x62,
-	0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x5f, 0x72, 0x65, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
-	0x65, 0x52, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x12, 0x16, 0x0a,
-	0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x77,
-	0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x48, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65,
-	0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2a,
-	0x82, 0x01, 0x0a, 0x0d, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x1f, 0x0a, 0x1b, 0x50, 0x41, 0x54, 0x48, 0x5f, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f,
-	0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44,
-	0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x50, 0x41, 0x54, 0x48, 0x5f, 0x4d, 0x41, 0x54, 0x43, 0x48,
-	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x58, 0x41, 0x43, 0x54, 0x10, 0x01, 0x12, 0x1a, 0x0a,
-	0x16, 0x50, 0x41, 0x54, 0x48, 0x5f, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59, 0x50, 0x45,
-	0x5f, 0x50, 0x52, 0x45, 0x46, 0x49, 0x58, 0x10, 0x02, 0x12, 0x19, 0x0a, 0x15, 0x50, 0x41, 0x54,
-	0x48, 0x5f, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x47,
-	0x45, 0x58, 0x10, 0x03, 0x2a, 0xc9, 0x01, 0x0a, 0x0f, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x1d, 0x48, 0x45, 0x41, 0x44,
-	0x45, 0x52, 0x5f, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e,
-	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x48,
-	0x45, 0x41, 0x44, 0x45, 0x52, 0x5f, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59, 0x50, 0x45,
-	0x5f, 0x45, 0x58, 0x41, 0x43, 0x54, 0x10, 0x01, 0x12, 0x1b, 0x0a, 0x17, 0x48, 0x45, 0x41, 0x44,
-	0x45, 0x52, 0x5f, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45,
-	0x47, 0x45, 0x58, 0x10, 0x02, 0x12, 0x1d, 0x0a, 0x19, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x5f,
-	0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x52, 0x45, 0x53, 0x45,
-	0x4e, 0x54, 0x10, 0x03, 0x12, 0x1c, 0x0a, 0x18, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x5f, 0x4d,
-	0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x52, 0x45, 0x46, 0x49, 0x58,
-	0x10, 0x04, 0x12, 0x1c, 0x0a, 0x18, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x5f, 0x4d, 0x41, 0x54,
-	0x43, 0x48, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x55, 0x46, 0x46, 0x49, 0x58, 0x10, 0x05,
-	0x2a, 0xa5, 0x01, 0x0a, 0x13, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x12, 0x26, 0x0a, 0x22, 0x51, 0x55, 0x45, 0x52,
-	0x59, 0x5f, 0x50, 0x41, 0x52, 0x41, 0x4d, 0x5f, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59,
-	0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
-	0x12, 0x20, 0x0a, 0x1c, 0x51, 0x55, 0x45, 0x52, 0x59, 0x5f, 0x50, 0x41, 0x52, 0x41, 0x4d, 0x5f,
-	0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x45, 0x58, 0x41, 0x43, 0x54,
-	0x10, 0x01, 0x12, 0x20, 0x0a, 0x1c, 0x51, 0x55, 0x45, 0x52, 0x59, 0x5f, 0x50, 0x41, 0x52, 0x41,
-	0x4d, 0x5f, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x47,
-	0x45, 0x58, 0x10, 0x02, 0x12, 0x22, 0x0a, 0x1e, 0x51, 0x55, 0x45, 0x52, 0x59, 0x5f, 0x50, 0x41,
-	0x52, 0x41, 0x4d, 0x5f, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50,
-	0x52, 0x45, 0x53, 0x45, 0x4e, 0x54, 0x10, 0x03, 0x42, 0x8f, 0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x0e,
-	0x48, 0x74, 0x74, 0x70, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73,
-	0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x6d, 0x65, 0x73, 0x68, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x1d, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d,
-	0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x1d, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d,
-	0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x29, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d,
-	0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73,
-	0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_http_route_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_http_route_proto_rawDescData = file_pbmesh_v2beta1_http_route_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_http_route_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_http_route_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_http_route_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_http_route_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_http_route_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_http_route_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
-var file_pbmesh_v2beta1_http_route_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
-var file_pbmesh_v2beta1_http_route_proto_goTypes = []interface{}{
-	(PathMatchType)(0),           // 0: hashicorp.consul.mesh.v2beta1.PathMatchType
-	(HeaderMatchType)(0),         // 1: hashicorp.consul.mesh.v2beta1.HeaderMatchType
-	(QueryParamMatchType)(0),     // 2: hashicorp.consul.mesh.v2beta1.QueryParamMatchType
-	(*HTTPRoute)(nil),            // 3: hashicorp.consul.mesh.v2beta1.HTTPRoute
-	(*HTTPRouteRule)(nil),        // 4: hashicorp.consul.mesh.v2beta1.HTTPRouteRule
-	(*HTTPRouteMatch)(nil),       // 5: hashicorp.consul.mesh.v2beta1.HTTPRouteMatch
-	(*HTTPPathMatch)(nil),        // 6: hashicorp.consul.mesh.v2beta1.HTTPPathMatch
-	(*HTTPHeaderMatch)(nil),      // 7: hashicorp.consul.mesh.v2beta1.HTTPHeaderMatch
-	(*HTTPQueryParamMatch)(nil),  // 8: hashicorp.consul.mesh.v2beta1.HTTPQueryParamMatch
-	(*HTTPRouteFilter)(nil),      // 9: hashicorp.consul.mesh.v2beta1.HTTPRouteFilter
-	(*HTTPHeaderFilter)(nil),     // 10: hashicorp.consul.mesh.v2beta1.HTTPHeaderFilter
-	(*HTTPHeader)(nil),           // 11: hashicorp.consul.mesh.v2beta1.HTTPHeader
-	(*HTTPURLRewriteFilter)(nil), // 12: hashicorp.consul.mesh.v2beta1.HTTPURLRewriteFilter
-	(*HTTPBackendRef)(nil),       // 13: hashicorp.consul.mesh.v2beta1.HTTPBackendRef
-	(*ParentReference)(nil),      // 14: hashicorp.consul.mesh.v2beta1.ParentReference
-	(*HTTPRouteTimeouts)(nil),    // 15: hashicorp.consul.mesh.v2beta1.HTTPRouteTimeouts
-	(*HTTPRouteRetries)(nil),     // 16: hashicorp.consul.mesh.v2beta1.HTTPRouteRetries
-	(*BackendReference)(nil),     // 17: hashicorp.consul.mesh.v2beta1.BackendReference
-}
-var file_pbmesh_v2beta1_http_route_proto_depIdxs = []int32{
-	14, // 0: hashicorp.consul.mesh.v2beta1.HTTPRoute.parent_refs:type_name -> hashicorp.consul.mesh.v2beta1.ParentReference
-	4,  // 1: hashicorp.consul.mesh.v2beta1.HTTPRoute.rules:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteRule
-	5,  // 2: hashicorp.consul.mesh.v2beta1.HTTPRouteRule.matches:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteMatch
-	9,  // 3: hashicorp.consul.mesh.v2beta1.HTTPRouteRule.filters:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteFilter
-	13, // 4: hashicorp.consul.mesh.v2beta1.HTTPRouteRule.backend_refs:type_name -> hashicorp.consul.mesh.v2beta1.HTTPBackendRef
-	15, // 5: hashicorp.consul.mesh.v2beta1.HTTPRouteRule.timeouts:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteTimeouts
-	16, // 6: hashicorp.consul.mesh.v2beta1.HTTPRouteRule.retries:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteRetries
-	6,  // 7: hashicorp.consul.mesh.v2beta1.HTTPRouteMatch.path:type_name -> hashicorp.consul.mesh.v2beta1.HTTPPathMatch
-	7,  // 8: hashicorp.consul.mesh.v2beta1.HTTPRouteMatch.headers:type_name -> hashicorp.consul.mesh.v2beta1.HTTPHeaderMatch
-	8,  // 9: hashicorp.consul.mesh.v2beta1.HTTPRouteMatch.query_params:type_name -> hashicorp.consul.mesh.v2beta1.HTTPQueryParamMatch
-	0,  // 10: hashicorp.consul.mesh.v2beta1.HTTPPathMatch.type:type_name -> hashicorp.consul.mesh.v2beta1.PathMatchType
-	1,  // 11: hashicorp.consul.mesh.v2beta1.HTTPHeaderMatch.type:type_name -> hashicorp.consul.mesh.v2beta1.HeaderMatchType
-	2,  // 12: hashicorp.consul.mesh.v2beta1.HTTPQueryParamMatch.type:type_name -> hashicorp.consul.mesh.v2beta1.QueryParamMatchType
-	10, // 13: hashicorp.consul.mesh.v2beta1.HTTPRouteFilter.request_header_modifier:type_name -> hashicorp.consul.mesh.v2beta1.HTTPHeaderFilter
-	10, // 14: hashicorp.consul.mesh.v2beta1.HTTPRouteFilter.response_header_modifier:type_name -> hashicorp.consul.mesh.v2beta1.HTTPHeaderFilter
-	12, // 15: hashicorp.consul.mesh.v2beta1.HTTPRouteFilter.url_rewrite:type_name -> hashicorp.consul.mesh.v2beta1.HTTPURLRewriteFilter
-	11, // 16: hashicorp.consul.mesh.v2beta1.HTTPHeaderFilter.set:type_name -> hashicorp.consul.mesh.v2beta1.HTTPHeader
-	11, // 17: hashicorp.consul.mesh.v2beta1.HTTPHeaderFilter.add:type_name -> hashicorp.consul.mesh.v2beta1.HTTPHeader
-	17, // 18: hashicorp.consul.mesh.v2beta1.HTTPBackendRef.backend_ref:type_name -> hashicorp.consul.mesh.v2beta1.BackendReference
-	9,  // 19: hashicorp.consul.mesh.v2beta1.HTTPBackendRef.filters:type_name -> hashicorp.consul.mesh.v2beta1.HTTPRouteFilter
-	20, // [20:20] is the sub-list for method output_type
-	20, // [20:20] is the sub-list for method input_type
-	20, // [20:20] is the sub-list for extension type_name
-	20, // [20:20] is the sub-list for extension extendee
-	0,  // [0:20] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_http_route_proto_init() }
-func file_pbmesh_v2beta1_http_route_proto_init() {
-	if File_pbmesh_v2beta1_http_route_proto != nil {
-		return
-	}
-	file_pbmesh_v2beta1_common_proto_init()
-	file_pbmesh_v2beta1_http_route_retries_proto_init()
-	file_pbmesh_v2beta1_http_route_timeouts_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_http_route_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPRoute); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_http_route_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPRouteRule); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_http_route_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPRouteMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_http_route_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPPathMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_http_route_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPHeaderMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_http_route_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPQueryParamMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_http_route_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPRouteFilter); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_http_route_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPHeaderFilter); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_http_route_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPHeader); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_http_route_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPURLRewriteFilter); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_http_route_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPBackendRef); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_http_route_proto_rawDesc,
-			NumEnums:      3,
-			NumMessages:   11,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_http_route_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_http_route_proto_depIdxs,
-		EnumInfos:         file_pbmesh_v2beta1_http_route_proto_enumTypes,
-		MessageInfos:      file_pbmesh_v2beta1_http_route_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_http_route_proto = out.File
-	file_pbmesh_v2beta1_http_route_proto_rawDesc = nil
-	file_pbmesh_v2beta1_http_route_proto_goTypes = nil
-	file_pbmesh_v2beta1_http_route_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/http_route.proto b/proto-public/pbmesh/v2beta1/http_route.proto
deleted file mode 100644
index eaf7398a560ae..0000000000000
--- a/proto-public/pbmesh/v2beta1/http_route.proto
+++ /dev/null
@@ -1,255 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "pbmesh/v2beta1/common.proto";
-import "pbmesh/v2beta1/http_route_retries.proto";
-import "pbmesh/v2beta1/http_route_timeouts.proto";
-import "pbresource/annotations.proto";
-
-// NOTE: this should align to the GAMMA/gateway-api version, or at least be
-// easily translatable.
-//
-// https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRoute
-//
-// This is a Resource type.
-message HTTPRoute {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  // ParentRefs references the resources (usually Services) that a Route wants
-  // to be attached to.
-  //
-  // It is invalid to reference an identical parent more than once. It is valid
-  // to reference multiple distinct sections within the same parent resource.
-  repeated ParentReference parent_refs = 1;
-
-  // Hostnames are the hostnames for which this HTTPRoute should respond to requests.
-  //
-  // This is only valid for north/south.
-  repeated string hostnames = 2;
-
-  // Rules are a list of HTTP-based routing rules that this route should
-  // use for constructing a routing table.
-  repeated HTTPRouteRule rules = 3;
-}
-
-// HTTPRouteRule specifies the routing rules used to determine what upstream
-// service an HTTP request is routed to.
-message HTTPRouteRule {
-  repeated HTTPRouteMatch matches = 1;
-  repeated HTTPRouteFilter filters = 2;
-
-  // BackendRefs defines the backend(s) where matching requests should be sent.
-  //
-  // Failure behavior here depends on how many BackendRefs are specified and
-  // how many are invalid.
-  //
-  // If all entries in BackendRefs are invalid, and there are also no filters
-  // specified in this route rule, all traffic which matches this rule MUST
-  // receive a 500 status code.
-  //
-  // See the HTTPBackendRef definition for the rules about what makes a single
-  // HTTPBackendRef invalid.
-  //
-  // When a HTTPBackendRef is invalid, 500 status codes MUST be returned for
-  // requests that would have otherwise been routed to an invalid backend. If
-  // multiple backends are specified, and some are invalid, the proportion of
-  // requests that would otherwise have been routed to an invalid backend MUST
-  // receive a 500 status code.
-  //
-  // For example, if two backends are specified with equal weights, and one is
-  // invalid, 50 percent of traffic must receive a 500. Implementations may
-  // choose how that 50 percent is determined.
-  repeated HTTPBackendRef backend_refs = 3;
-
-  HTTPRouteTimeouts timeouts = 4;
-  HTTPRouteRetries retries = 5;
-}
-
-message HTTPRouteMatch {
-  // Path specifies a HTTP request path matcher. If this field is not
-  // specified, a default prefix match on the “/” path is provided.
-  HTTPPathMatch path = 1;
-
-  // Headers specifies HTTP request header matchers. Multiple match values are
-  // ANDed together, meaning, a request must match all the specified headers to
-  // select the route.
-  repeated HTTPHeaderMatch headers = 2;
-
-  // QueryParams specifies HTTP query parameter matchers. Multiple match values
-  // are ANDed together, meaning, a request must match all the specified query
-  // parameters to select the route.
-  repeated HTTPQueryParamMatch query_params = 3;
-
-  // Method specifies HTTP method matcher. When specified, this route will be
-  // matched only if the request has the specified method.
-  string method = 4;
-}
-
-message HTTPPathMatch {
-  // Type specifies how to match against the path Value.
-  PathMatchType type = 1;
-  // Value of the HTTP path to match against.
-  string value = 2;
-}
-
-// PathMatchType specifies the semantics of how HTTP paths should be compared.
-// Valid PathMatchType values, along with their support levels, are:
-//
-// PathPrefix and Exact paths must be syntactically valid:
-//
-// - Must begin with the / character
-// - Must not contain consecutive / characters (e.g. /foo///, //).
-// - Note that values may be added to this enum, implementations must ensure that unknown values will not cause a crash.
-//
-// Unknown values here must result in the implementation setting the Accepted
-// Condition for the Route to status: False, with a Reason of UnsupportedValue.
-enum PathMatchType {
-  PATH_MATCH_TYPE_UNSPECIFIED = 0;
-  PATH_MATCH_TYPE_EXACT = 1;
-  PATH_MATCH_TYPE_PREFIX = 2;
-  PATH_MATCH_TYPE_REGEX = 3;
-}
-
-message HTTPHeaderMatch {
-  // Type specifies how to match against the value of the header.
-  HeaderMatchType type = 1;
-
-  // Name is the name of the HTTP Header to be matched. Name matching MUST be
-  // case insensitive. (See https://tools.ietf.org/html/rfc7230#section-3.2).
-  //
-  // If multiple entries specify equivalent header names, only the first entry
-  // with an equivalent name MUST be considered for a match. Subsequent entries
-  // with an equivalent header name MUST be ignored. Due to the
-  // case-insensitivity of header names, “foo” and “Foo” are considered
-  // equivalent.
-  //
-  // When a header is repeated in an HTTP request, it is
-  // implementation-specific behavior as to how this is represented. Generally,
-  // proxies should follow the guidance from the RFC:
-  // https://www.rfc-editor.org/rfc/rfc7230.html#section-3.2.2 regarding
-  // processing a repeated header, with special handling for “Set-Cookie”.
-  string name = 2;
-
-  // Value is the value of HTTP Header to be matched.
-  string value = 3;
-
-  // NOTE: not in gamma; service-router compat
-  bool invert = 4;
-}
-
-// HeaderMatchType specifies the semantics of how HTTP header values should be
-// compared. Valid HeaderMatchType values, along with their conformance levels,
-// are:
-//
-// Note that values may be added to this enum, implementations must ensure that
-// unknown values will not cause a crash.
-//
-// Unknown values here must result in the implementation setting the Accepted
-// Condition for the Route to status: False, with a Reason of UnsupportedValue.
-enum HeaderMatchType {
-  HEADER_MATCH_TYPE_UNSPECIFIED = 0;
-  HEADER_MATCH_TYPE_EXACT = 1;
-  HEADER_MATCH_TYPE_REGEX = 2;
-  // consul only after this point (service-router compat)
-  HEADER_MATCH_TYPE_PRESENT = 3;
-  HEADER_MATCH_TYPE_PREFIX = 4;
-  HEADER_MATCH_TYPE_SUFFIX = 5;
-}
-
-message HTTPQueryParamMatch {
-  // Type specifies how to match against the value of the query parameter.
-  QueryParamMatchType type = 1;
-
-  // Name is the name of the HTTP query param to be matched. This must be an
-  // exact string match. (See
-  // https://tools.ietf.org/html/rfc7230#section-2.7.3).
-  //
-  // If multiple entries specify equivalent query param names, only the first
-  // entry with an equivalent name MUST be considered for a match. Subsequent
-  // entries with an equivalent query param name MUST be ignored.
-  //
-  // If a query param is repeated in an HTTP request, the behavior is purposely
-  // left undefined, since different data planes have different capabilities.
-  // However, it is recommended that implementations should match against the
-  // first value of the param if the data plane supports it, as this behavior
-  // is expected in other load balancing contexts outside of the Gateway API.
-  //
-  // Users SHOULD NOT route traffic based on repeated query params to guard
-  // themselves against potential differences in the implementations.
-  string name = 2;
-
-  // Value is the value of HTTP query param to be matched.
-  string value = 3;
-}
-
-enum QueryParamMatchType {
-  QUERY_PARAM_MATCH_TYPE_UNSPECIFIED = 0;
-  QUERY_PARAM_MATCH_TYPE_EXACT = 1;
-  QUERY_PARAM_MATCH_TYPE_REGEX = 2;
-  // consul only after this point (service-router compat)
-  QUERY_PARAM_MATCH_TYPE_PRESENT = 3;
-}
-
-message HTTPRouteFilter {
-  // RequestHeaderModifier defines a schema for a filter that modifies request
-  // headers.
-  HTTPHeaderFilter request_header_modifier = 1;
-
-  // ResponseHeaderModifier defines a schema for a filter that modifies
-  // response headers.
-  HTTPHeaderFilter response_header_modifier = 2;
-
-  // URLRewrite defines a schema for a filter that modifies a request during
-  // forwarding.
-  HTTPURLRewriteFilter url_rewrite = 5;
-}
-
-message HTTPHeaderFilter {
-  // Set overwrites the request with the given header (name, value) before the
-  // action.
-  repeated HTTPHeader set = 1;
-
-  // Add adds the given header(s) (name, value) to the request before the
-  // action. It appends to any existing values associated with the header name.
-  repeated HTTPHeader add = 2;
-
-  // Remove the given header(s) from the HTTP request before the action. The
-  // value of Remove is a list of HTTP header names. Note that the header names
-  // are case-insensitive (see
-  // https://datatracker.ietf.org/doc/html/rfc2616#section-4.2).
-  repeated string remove = 3;
-}
-
-message HTTPHeader {
-  string name = 1;
-  string value = 2;
-}
-
-message HTTPURLRewriteFilter {
-  string path_prefix = 1;
-}
-
-message HTTPBackendRef {
-  BackendReference backend_ref = 1;
-
-  // Weight specifies the proportion of requests forwarded to the referenced
-  // backend. This is computed as weight/(sum of all weights in this
-  // BackendRefs list). For non-zero values, there may be some epsilon from the
-  // exact proportion defined here depending on the precision an implementation
-  // supports. Weight is not a percentage and the sum of weights does not need
-  // to equal 100.
-  //
-  //If only one backend is specified and it has a weight greater than 0, 100%
-  //of the traffic is forwarded to that backend. If weight is set to 0, no
-  //traffic should be forwarded for this entry. If unspecified, weight defaults
-  //to 1.
-  uint32 weight = 2;
-
-  // Filters defined at this level should be executed if and only if the
-  // request is being forwarded to the backend defined here.
-  repeated HTTPRouteFilter filters = 3;
-}
diff --git a/proto-public/pbmesh/v2beta1/http_route_retries.pb.binary.go b/proto-public/pbmesh/v2beta1/http_route_retries.pb.binary.go
deleted file mode 100644
index 390641d255ecd..0000000000000
--- a/proto-public/pbmesh/v2beta1/http_route_retries.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/http_route_retries.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPRouteRetries) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPRouteRetries) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/http_route_retries.pb.go b/proto-public/pbmesh/v2beta1/http_route_retries.pb.go
deleted file mode 100644
index 49f1501fc78e5..0000000000000
--- a/proto-public/pbmesh/v2beta1/http_route_retries.pb.go
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/http_route_retries.proto
-
-package meshv2beta1
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type HTTPRouteRetries struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Number is the number of times to retry the request when a retryable
-	// result occurs.
-	Number *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=number,proto3" json:"number,omitempty"`
-	// RetryOnConnectFailure allows for connection failure errors to trigger a
-	// retry.
-	OnConnectFailure bool `protobuf:"varint,2,opt,name=on_connect_failure,json=onConnectFailure,proto3" json:"on_connect_failure,omitempty"`
-	// RetryOn allows setting envoy specific conditions when a request should
-	// be automatically retried.
-	OnConditions []string `protobuf:"bytes,3,rep,name=on_conditions,json=onConditions,proto3" json:"on_conditions,omitempty"`
-	// RetryOnStatusCodes is a flat list of http response status codes that are
-	// eligible for retry. This again should be feasible in any reasonable proxy.
-	OnStatusCodes []uint32 `protobuf:"varint,4,rep,packed,name=on_status_codes,json=onStatusCodes,proto3" json:"on_status_codes,omitempty"`
-}
-
-func (x *HTTPRouteRetries) Reset() {
-	*x = HTTPRouteRetries{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_http_route_retries_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPRouteRetries) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPRouteRetries) ProtoMessage() {}
-
-func (x *HTTPRouteRetries) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_http_route_retries_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPRouteRetries.ProtoReflect.Descriptor instead.
-func (*HTTPRouteRetries) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_retries_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *HTTPRouteRetries) GetNumber() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.Number
-	}
-	return nil
-}
-
-func (x *HTTPRouteRetries) GetOnConnectFailure() bool {
-	if x != nil {
-		return x.OnConnectFailure
-	}
-	return false
-}
-
-func (x *HTTPRouteRetries) GetOnConditions() []string {
-	if x != nil {
-		return x.OnConditions
-	}
-	return nil
-}
-
-func (x *HTTPRouteRetries) GetOnStatusCodes() []uint32 {
-	if x != nil {
-		return x.OnStatusCodes
-	}
-	return nil
-}
-
-var File_pbmesh_v2beta1_http_route_retries_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_http_route_retries_proto_rawDesc = []byte{
-	0x0a, 0x27, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x74, 0x72,
-	0x69, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65,
-	0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc3, 0x01, 0x0a, 0x10, 0x48, 0x54, 0x54,
-	0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a,
-	0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x06, 0x6e, 0x75, 0x6d,
-	0x62, 0x65, 0x72, 0x12, 0x2c, 0x0a, 0x12, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x5f, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x10, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72,
-	0x65, 0x12, 0x23, 0x0a, 0x0d, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x64,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x0a, 0x0f, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0d, 0x52,
-	0x0d, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x42, 0x96,
-	0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x42, 0x15, 0x48, 0x74, 0x74, 0x70, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52,
-	0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x43, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x6d, 0x65, 0x73, 0x68, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68,
-	0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68,
-	0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x29, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68,
-	0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a,
-	0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_http_route_retries_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_http_route_retries_proto_rawDescData = file_pbmesh_v2beta1_http_route_retries_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_http_route_retries_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_http_route_retries_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_http_route_retries_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_http_route_retries_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_http_route_retries_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_http_route_retries_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbmesh_v2beta1_http_route_retries_proto_goTypes = []interface{}{
-	(*HTTPRouteRetries)(nil),       // 0: hashicorp.consul.mesh.v2beta1.HTTPRouteRetries
-	(*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value
-}
-var file_pbmesh_v2beta1_http_route_retries_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.mesh.v2beta1.HTTPRouteRetries.number:type_name -> google.protobuf.UInt32Value
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_http_route_retries_proto_init() }
-func file_pbmesh_v2beta1_http_route_retries_proto_init() {
-	if File_pbmesh_v2beta1_http_route_retries_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_http_route_retries_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPRouteRetries); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_http_route_retries_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_http_route_retries_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_http_route_retries_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_http_route_retries_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_http_route_retries_proto = out.File
-	file_pbmesh_v2beta1_http_route_retries_proto_rawDesc = nil
-	file_pbmesh_v2beta1_http_route_retries_proto_goTypes = nil
-	file_pbmesh_v2beta1_http_route_retries_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/http_route_retries.proto b/proto-public/pbmesh/v2beta1/http_route_retries.proto
deleted file mode 100644
index 7eae2545866ab..0000000000000
--- a/proto-public/pbmesh/v2beta1/http_route_retries.proto
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "google/protobuf/wrappers.proto";
-
-message HTTPRouteRetries {
-  // Number is the number of times to retry the request when a retryable
-  // result occurs.
-  google.protobuf.UInt32Value number = 1;
-
-  // RetryOnConnectFailure allows for connection failure errors to trigger a
-  // retry.
-  bool on_connect_failure = 2;
-
-  // RetryOn allows setting envoy specific conditions when a request should
-  // be automatically retried.
-  repeated string on_conditions = 3;
-
-  // RetryOnStatusCodes is a flat list of http response status codes that are
-  // eligible for retry. This again should be feasible in any reasonable proxy.
-  repeated uint32 on_status_codes = 4;
-}
diff --git a/proto-public/pbmesh/v2beta1/http_route_timeouts.pb.binary.go b/proto-public/pbmesh/v2beta1/http_route_timeouts.pb.binary.go
deleted file mode 100644
index a85a09cf2fe23..0000000000000
--- a/proto-public/pbmesh/v2beta1/http_route_timeouts.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/http_route_timeouts.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPRouteTimeouts) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPRouteTimeouts) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/http_route_timeouts.pb.go b/proto-public/pbmesh/v2beta1/http_route_timeouts.pb.go
deleted file mode 100644
index 85205f83e406c..0000000000000
--- a/proto-public/pbmesh/v2beta1/http_route_timeouts.pb.go
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/http_route_timeouts.proto
-
-package meshv2beta1
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// HTTPRouteTimeouts defines timeouts that can be configured for an HTTPRoute
-// or GRPCRoute.
-type HTTPRouteTimeouts struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// RequestTimeout is the total amount of time permitted for the entire
-	// downstream request (and retries) to be processed.
-	Request *durationpb.Duration `protobuf:"bytes,1,opt,name=request,proto3" json:"request,omitempty"`
-	// Idle specifies the total amount of time permitted for the request stream to be idle.
-	Idle *durationpb.Duration `protobuf:"bytes,2,opt,name=idle,proto3" json:"idle,omitempty"`
-}
-
-func (x *HTTPRouteTimeouts) Reset() {
-	*x = HTTPRouteTimeouts{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_http_route_timeouts_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPRouteTimeouts) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPRouteTimeouts) ProtoMessage() {}
-
-func (x *HTTPRouteTimeouts) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_http_route_timeouts_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPRouteTimeouts.ProtoReflect.Descriptor instead.
-func (*HTTPRouteTimeouts) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_http_route_timeouts_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *HTTPRouteTimeouts) GetRequest() *durationpb.Duration {
-	if x != nil {
-		return x.Request
-	}
-	return nil
-}
-
-func (x *HTTPRouteTimeouts) GetIdle() *durationpb.Duration {
-	if x != nil {
-		return x.Idle
-	}
-	return nil
-}
-
-var File_pbmesh_v2beta1_http_route_timeouts_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_http_route_timeouts_proto_rawDesc = []byte{
-	0x0a, 0x28, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65,
-	0x6f, 0x75, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x77, 0x0a, 0x11, 0x48, 0x54, 0x54,
-	0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x12, 0x33,
-	0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x2d, 0x0a, 0x04, 0x69, 0x64, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x69, 0x64,
-	0x6c, 0x65, 0x42, 0x97, 0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x16, 0x48, 0x74, 0x74, 0x70, 0x52, 0x6f,
-	0x75, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d,
-	0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x6d, 0x65, 0x73, 0x68,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x1d,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x1d,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x29,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50,
-	0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d,
-	0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_http_route_timeouts_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_http_route_timeouts_proto_rawDescData = file_pbmesh_v2beta1_http_route_timeouts_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_http_route_timeouts_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_http_route_timeouts_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_http_route_timeouts_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_http_route_timeouts_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_http_route_timeouts_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_http_route_timeouts_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbmesh_v2beta1_http_route_timeouts_proto_goTypes = []interface{}{
-	(*HTTPRouteTimeouts)(nil),   // 0: hashicorp.consul.mesh.v2beta1.HTTPRouteTimeouts
-	(*durationpb.Duration)(nil), // 1: google.protobuf.Duration
-}
-var file_pbmesh_v2beta1_http_route_timeouts_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.mesh.v2beta1.HTTPRouteTimeouts.request:type_name -> google.protobuf.Duration
-	1, // 1: hashicorp.consul.mesh.v2beta1.HTTPRouteTimeouts.idle:type_name -> google.protobuf.Duration
-	2, // [2:2] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_http_route_timeouts_proto_init() }
-func file_pbmesh_v2beta1_http_route_timeouts_proto_init() {
-	if File_pbmesh_v2beta1_http_route_timeouts_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_http_route_timeouts_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPRouteTimeouts); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_http_route_timeouts_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_http_route_timeouts_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_http_route_timeouts_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_http_route_timeouts_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_http_route_timeouts_proto = out.File
-	file_pbmesh_v2beta1_http_route_timeouts_proto_rawDesc = nil
-	file_pbmesh_v2beta1_http_route_timeouts_proto_goTypes = nil
-	file_pbmesh_v2beta1_http_route_timeouts_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/http_route_timeouts.proto b/proto-public/pbmesh/v2beta1/http_route_timeouts.proto
deleted file mode 100644
index b17a522bae396..0000000000000
--- a/proto-public/pbmesh/v2beta1/http_route_timeouts.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "google/protobuf/duration.proto";
-
-// HTTPRouteTimeouts defines timeouts that can be configured for an HTTPRoute
-// or GRPCRoute.
-message HTTPRouteTimeouts {
-  // RequestTimeout is the total amount of time permitted for the entire
-  // downstream request (and retries) to be processed.
-  google.protobuf.Duration request = 1;
-
-  // Idle specifies the total amount of time permitted for the request stream to be idle.
-  google.protobuf.Duration idle = 2;
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/access_logs.pb.binary.go b/proto-public/pbmesh/v2beta1/pbproxystate/access_logs.pb.binary.go
deleted file mode 100644
index 1f08bf73b6080..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/access_logs.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/pbproxystate/access_logs.proto
-
-package pbproxystate
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *AccessLogs) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *AccessLogs) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/access_logs.pb.go b/proto-public/pbmesh/v2beta1/pbproxystate/access_logs.pb.go
deleted file mode 100644
index 62fdeab5d7209..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/access_logs.pb.go
+++ /dev/null
@@ -1,325 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/pbproxystate/access_logs.proto
-
-package pbproxystate
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type LogSinkType int32
-
-const (
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	LogSinkType_LOG_SINK_TYPE_DEFAULT LogSinkType = 0
-	LogSinkType_LOG_SINK_TYPE_FILE    LogSinkType = 1
-	LogSinkType_LOG_SINK_TYPE_STDERR  LogSinkType = 2
-	LogSinkType_LOG_SINK_TYPE_STDOUT  LogSinkType = 3
-)
-
-// Enum value maps for LogSinkType.
-var (
-	LogSinkType_name = map[int32]string{
-		0: "LOG_SINK_TYPE_DEFAULT",
-		1: "LOG_SINK_TYPE_FILE",
-		2: "LOG_SINK_TYPE_STDERR",
-		3: "LOG_SINK_TYPE_STDOUT",
-	}
-	LogSinkType_value = map[string]int32{
-		"LOG_SINK_TYPE_DEFAULT": 0,
-		"LOG_SINK_TYPE_FILE":    1,
-		"LOG_SINK_TYPE_STDERR":  2,
-		"LOG_SINK_TYPE_STDOUT":  3,
-	}
-)
-
-func (x LogSinkType) Enum() *LogSinkType {
-	p := new(LogSinkType)
-	*p = x
-	return p
-}
-
-func (x LogSinkType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (LogSinkType) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_pbproxystate_access_logs_proto_enumTypes[0].Descriptor()
-}
-
-func (LogSinkType) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_pbproxystate_access_logs_proto_enumTypes[0]
-}
-
-func (x LogSinkType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use LogSinkType.Descriptor instead.
-func (LogSinkType) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_access_logs_proto_rawDescGZIP(), []int{0}
-}
-
-type AccessLogs struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// enabled enables access logging.
-	Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
-	// disable_listener_logs turns off just listener logs for connections rejected by Envoy because they don't
-	// have a matching listener filter.
-	DisableListenerLogs bool `protobuf:"varint,2,opt,name=disable_listener_logs,json=disableListenerLogs,proto3" json:"disable_listener_logs,omitempty"`
-	// type selects the output for logs: "file", "stderr". "stdout"
-	Type LogSinkType `protobuf:"varint,3,opt,name=type,proto3,enum=hashicorp.consul.mesh.v2beta1.pbproxystate.LogSinkType" json:"type,omitempty"`
-	// path is the output file to write logs
-	Path string `protobuf:"bytes,4,opt,name=path,proto3" json:"path,omitempty"`
-	// The presence of one format string or the other implies the access log string encoding.
-	// Defining both is invalid.
-	//
-	// Types that are assignable to Format:
-	//
-	//	*AccessLogs_Json
-	//	*AccessLogs_Text
-	Format isAccessLogs_Format `protobuf_oneof:"format"`
-}
-
-func (x *AccessLogs) Reset() {
-	*x = AccessLogs{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_access_logs_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AccessLogs) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AccessLogs) ProtoMessage() {}
-
-func (x *AccessLogs) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_access_logs_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AccessLogs.ProtoReflect.Descriptor instead.
-func (*AccessLogs) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_access_logs_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *AccessLogs) GetEnabled() bool {
-	if x != nil {
-		return x.Enabled
-	}
-	return false
-}
-
-func (x *AccessLogs) GetDisableListenerLogs() bool {
-	if x != nil {
-		return x.DisableListenerLogs
-	}
-	return false
-}
-
-func (x *AccessLogs) GetType() LogSinkType {
-	if x != nil {
-		return x.Type
-	}
-	return LogSinkType_LOG_SINK_TYPE_DEFAULT
-}
-
-func (x *AccessLogs) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-func (m *AccessLogs) GetFormat() isAccessLogs_Format {
-	if m != nil {
-		return m.Format
-	}
-	return nil
-}
-
-func (x *AccessLogs) GetJson() string {
-	if x, ok := x.GetFormat().(*AccessLogs_Json); ok {
-		return x.Json
-	}
-	return ""
-}
-
-func (x *AccessLogs) GetText() string {
-	if x, ok := x.GetFormat().(*AccessLogs_Text); ok {
-		return x.Text
-	}
-	return ""
-}
-
-type isAccessLogs_Format interface {
-	isAccessLogs_Format()
-}
-
-type AccessLogs_Json struct {
-	Json string `protobuf:"bytes,5,opt,name=json,proto3,oneof"`
-}
-
-type AccessLogs_Text struct {
-	Text string `protobuf:"bytes,6,opt,name=text,proto3,oneof"`
-}
-
-func (*AccessLogs_Json) isAccessLogs_Format() {}
-
-func (*AccessLogs_Text) isAccessLogs_Format() {}
-
-var File_pbmesh_v2beta1_pbproxystate_access_logs_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_pbproxystate_access_logs_proto_rawDesc = []byte{
-	0x0a, 0x2d, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x61, 0x63,
-	0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x2a, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70,
-	0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0xf1, 0x01, 0x0a, 0x0a,
-	0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e,
-	0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x65, 0x6e, 0x61,
-	0x62, 0x6c, 0x65, 0x64, 0x12, 0x32, 0x0a, 0x15, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f,
-	0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x6c, 0x6f, 0x67, 0x73, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x13, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74,
-	0x65, 0x6e, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x4b, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2e, 0x4c, 0x6f, 0x67, 0x53, 0x69, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x52,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x04, 0x6a, 0x73, 0x6f,
-	0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6a, 0x73, 0x6f, 0x6e, 0x12,
-	0x14, 0x0a, 0x04, 0x74, 0x65, 0x78, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52,
-	0x04, 0x74, 0x65, 0x78, 0x74, 0x42, 0x08, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2a,
-	0x74, 0x0a, 0x0b, 0x4c, 0x6f, 0x67, 0x53, 0x69, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x19,
-	0x0a, 0x15, 0x4c, 0x4f, 0x47, 0x5f, 0x53, 0x49, 0x4e, 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00, 0x12, 0x16, 0x0a, 0x12, 0x4c, 0x4f, 0x47,
-	0x5f, 0x53, 0x49, 0x4e, 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x10,
-	0x01, 0x12, 0x18, 0x0a, 0x14, 0x4c, 0x4f, 0x47, 0x5f, 0x53, 0x49, 0x4e, 0x4b, 0x5f, 0x54, 0x59,
-	0x50, 0x45, 0x5f, 0x53, 0x54, 0x44, 0x45, 0x52, 0x52, 0x10, 0x02, 0x12, 0x18, 0x0a, 0x14, 0x4c,
-	0x4f, 0x47, 0x5f, 0x53, 0x49, 0x4e, 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x54, 0x44,
-	0x4f, 0x55, 0x54, 0x10, 0x03, 0x42, 0xd5, 0x02, 0x0a, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x42, 0x0f, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73,
-	0x4c, 0x6f, 0x67, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70,
-	0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74,
-	0x65, 0xa2, 0x02, 0x05, 0x48, 0x43, 0x4d, 0x56, 0x50, 0xaa, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73,
-	0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xca, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0xe2, 0x02, 0x36, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x2e, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3a,
-	0x3a, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_pbproxystate_access_logs_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_pbproxystate_access_logs_proto_rawDescData = file_pbmesh_v2beta1_pbproxystate_access_logs_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_pbproxystate_access_logs_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_pbproxystate_access_logs_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_pbproxystate_access_logs_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_pbproxystate_access_logs_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_pbproxystate_access_logs_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_pbproxystate_access_logs_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbmesh_v2beta1_pbproxystate_access_logs_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbmesh_v2beta1_pbproxystate_access_logs_proto_goTypes = []interface{}{
-	(LogSinkType)(0),   // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.LogSinkType
-	(*AccessLogs)(nil), // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.AccessLogs
-}
-var file_pbmesh_v2beta1_pbproxystate_access_logs_proto_depIdxs = []int32{
-	0, // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.AccessLogs.type:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.LogSinkType
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_pbproxystate_access_logs_proto_init() }
-func file_pbmesh_v2beta1_pbproxystate_access_logs_proto_init() {
-	if File_pbmesh_v2beta1_pbproxystate_access_logs_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_pbproxystate_access_logs_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AccessLogs); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbmesh_v2beta1_pbproxystate_access_logs_proto_msgTypes[0].OneofWrappers = []interface{}{
-		(*AccessLogs_Json)(nil),
-		(*AccessLogs_Text)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_pbproxystate_access_logs_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_pbproxystate_access_logs_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_pbproxystate_access_logs_proto_depIdxs,
-		EnumInfos:         file_pbmesh_v2beta1_pbproxystate_access_logs_proto_enumTypes,
-		MessageInfos:      file_pbmesh_v2beta1_pbproxystate_access_logs_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_pbproxystate_access_logs_proto = out.File
-	file_pbmesh_v2beta1_pbproxystate_access_logs_proto_rawDesc = nil
-	file_pbmesh_v2beta1_pbproxystate_access_logs_proto_goTypes = nil
-	file_pbmesh_v2beta1_pbproxystate_access_logs_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/access_logs.proto b/proto-public/pbmesh/v2beta1/pbproxystate/access_logs.proto
deleted file mode 100644
index cca82950adf0d..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/access_logs.proto
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1.pbproxystate;
-
-message AccessLogs {
-  // enabled enables access logging.
-  bool enabled = 1;
-  // disable_listener_logs turns off just listener logs for connections rejected by Envoy because they don't
-  // have a matching listener filter.
-  bool disable_listener_logs = 2;
-  // type selects the output for logs: "file", "stderr". "stdout"
-  LogSinkType type = 3;
-  // path is the output file to write logs
-  string path = 4;
-  // The presence of one format string or the other implies the access log string encoding.
-  // Defining both is invalid.
-  oneof format {
-    string json = 5;
-    string text = 6;
-  }
-}
-
-enum LogSinkType {
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  LOG_SINK_TYPE_DEFAULT = 0;
-  LOG_SINK_TYPE_FILE = 1;
-  LOG_SINK_TYPE_STDERR = 2;
-  LOG_SINK_TYPE_STDOUT = 3;
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/address.pb.binary.go b/proto-public/pbmesh/v2beta1/pbproxystate/address.pb.binary.go
deleted file mode 100644
index 4b509e9ed98c3..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/address.pb.binary.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/pbproxystate/address.proto
-
-package pbproxystate
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HostPortAddress) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HostPortAddress) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *UnixSocketAddress) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *UnixSocketAddress) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/address.pb.go b/proto-public/pbmesh/v2beta1/pbproxystate/address.pb.go
deleted file mode 100644
index 6c814f3c8f2d8..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/address.pb.go
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/pbproxystate/address.proto
-
-package pbproxystate
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type HostPortAddress struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Host string `protobuf:"bytes,1,opt,name=host,proto3" json:"host,omitempty"`
-	Port uint32 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"`
-}
-
-func (x *HostPortAddress) Reset() {
-	*x = HostPortAddress{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_address_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HostPortAddress) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HostPortAddress) ProtoMessage() {}
-
-func (x *HostPortAddress) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_address_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HostPortAddress.ProtoReflect.Descriptor instead.
-func (*HostPortAddress) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_address_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *HostPortAddress) GetHost() string {
-	if x != nil {
-		return x.Host
-	}
-	return ""
-}
-
-func (x *HostPortAddress) GetPort() uint32 {
-	if x != nil {
-		return x.Port
-	}
-	return 0
-}
-
-type UnixSocketAddress struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// path is the file system path at which to bind a Unix domain socket listener.
-	Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
-	// mode is the Unix file mode for the socket file. It should be provided
-	// in the numeric notation, for example, "0600".
-	Mode string `protobuf:"bytes,2,opt,name=mode,proto3" json:"mode,omitempty"`
-}
-
-func (x *UnixSocketAddress) Reset() {
-	*x = UnixSocketAddress{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_address_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UnixSocketAddress) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UnixSocketAddress) ProtoMessage() {}
-
-func (x *UnixSocketAddress) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_address_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UnixSocketAddress.ProtoReflect.Descriptor instead.
-func (*UnixSocketAddress) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_address_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *UnixSocketAddress) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-func (x *UnixSocketAddress) GetMode() string {
-	if x != nil {
-		return x.Mode
-	}
-	return ""
-}
-
-var File_pbmesh_v2beta1_pbproxystate_address_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_pbproxystate_address_proto_rawDesc = []byte{
-	0x0a, 0x29, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x61, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x2a, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x39, 0x0a, 0x0f, 0x48, 0x6f, 0x73, 0x74, 0x50,
-	0x6f, 0x72, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f,
-	0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x12,
-	0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x70, 0x6f,
-	0x72, 0x74, 0x22, 0x3b, 0x0a, 0x11, 0x55, 0x6e, 0x69, 0x78, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x6d,
-	0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x42,
-	0xd2, 0x02, 0x0a, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x42, 0x0c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d,
-	0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xa2, 0x02, 0x05, 0x48, 0x43, 0x4d, 0x56, 0x50,
-	0xaa, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xca, 0x02, 0x2a,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xe2, 0x02, 0x36, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65,
-	0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64,
-	0x61, 0x74, 0x61, 0xea, 0x02, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a,
-	0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3a, 0x3a, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_pbproxystate_address_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_pbproxystate_address_proto_rawDescData = file_pbmesh_v2beta1_pbproxystate_address_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_pbproxystate_address_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_pbproxystate_address_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_pbproxystate_address_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_pbproxystate_address_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_pbproxystate_address_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_pbproxystate_address_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_pbmesh_v2beta1_pbproxystate_address_proto_goTypes = []interface{}{
-	(*HostPortAddress)(nil),   // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.HostPortAddress
-	(*UnixSocketAddress)(nil), // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.UnixSocketAddress
-}
-var file_pbmesh_v2beta1_pbproxystate_address_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_pbproxystate_address_proto_init() }
-func file_pbmesh_v2beta1_pbproxystate_address_proto_init() {
-	if File_pbmesh_v2beta1_pbproxystate_address_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_pbproxystate_address_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HostPortAddress); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_address_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UnixSocketAddress); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_pbproxystate_address_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_pbproxystate_address_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_pbproxystate_address_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_pbproxystate_address_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_pbproxystate_address_proto = out.File
-	file_pbmesh_v2beta1_pbproxystate_address_proto_rawDesc = nil
-	file_pbmesh_v2beta1_pbproxystate_address_proto_goTypes = nil
-	file_pbmesh_v2beta1_pbproxystate_address_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/address.proto b/proto-public/pbmesh/v2beta1/pbproxystate/address.proto
deleted file mode 100644
index e13bdba9bb5a0..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/address.proto
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1.pbproxystate;
-
-message HostPortAddress {
-  string host = 1;
-  uint32 port = 2;
-}
-
-message UnixSocketAddress {
-  // path is the file system path at which to bind a Unix domain socket listener.
-  string path = 1;
-
-  // mode is the Unix file mode for the socket file. It should be provided
-  // in the numeric notation, for example, "0600".
-  string mode = 2;
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/cluster.pb.binary.go b/proto-public/pbmesh/v2beta1/pbproxystate/cluster.pb.binary.go
deleted file mode 100644
index eab6e1626c724..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/cluster.pb.binary.go
+++ /dev/null
@@ -1,268 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/pbproxystate/cluster.proto
-
-package pbproxystate
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Cluster) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Cluster) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *FailoverGroup) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *FailoverGroup) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *FailoverGroupConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *FailoverGroupConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *EndpointGroup) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *EndpointGroup) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DynamicEndpointGroup) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DynamicEndpointGroup) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *PassthroughEndpointGroup) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *PassthroughEndpointGroup) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DNSEndpointGroup) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DNSEndpointGroup) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *StaticEndpointGroup) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *StaticEndpointGroup) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DestinationCluster) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DestinationCluster) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *L4WeightedClusterGroup) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *L4WeightedClusterGroup) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *L7WeightedClusterGroup) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *L7WeightedClusterGroup) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *L4WeightedDestinationCluster) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *L4WeightedDestinationCluster) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *L7WeightedDestinationCluster) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *L7WeightedDestinationCluster) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DynamicEndpointGroupConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DynamicEndpointGroupConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LBPolicyLeastRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LBPolicyLeastRequest) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LBPolicyRoundRobin) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LBPolicyRoundRobin) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LBPolicyRandom) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LBPolicyRandom) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LBPolicyRingHash) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LBPolicyRingHash) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LBPolicyMaglev) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LBPolicyMaglev) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *CircuitBreakers) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *CircuitBreakers) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *UpstreamLimits) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *UpstreamLimits) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *OutlierDetection) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *OutlierDetection) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *UpstreamConnectionOptions) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *UpstreamConnectionOptions) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *PassthroughEndpointGroupConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *PassthroughEndpointGroupConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DNSEndpointGroupConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DNSEndpointGroupConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *StaticEndpointGroupConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *StaticEndpointGroupConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/cluster.pb.go b/proto-public/pbmesh/v2beta1/pbproxystate/cluster.pb.go
deleted file mode 100644
index 5575ce6f92bdb..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/cluster.pb.go
+++ /dev/null
@@ -1,2625 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/pbproxystate/cluster.proto
-
-package pbproxystate
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
-	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type DiscoveryType int32
-
-const (
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	DiscoveryType_DISCOVERY_TYPE_LOGICAL DiscoveryType = 0
-	DiscoveryType_DISCOVERY_TYPE_STRICT  DiscoveryType = 1
-)
-
-// Enum value maps for DiscoveryType.
-var (
-	DiscoveryType_name = map[int32]string{
-		0: "DISCOVERY_TYPE_LOGICAL",
-		1: "DISCOVERY_TYPE_STRICT",
-	}
-	DiscoveryType_value = map[string]int32{
-		"DISCOVERY_TYPE_LOGICAL": 0,
-		"DISCOVERY_TYPE_STRICT":  1,
-	}
-)
-
-func (x DiscoveryType) Enum() *DiscoveryType {
-	p := new(DiscoveryType)
-	*p = x
-	return p
-}
-
-func (x DiscoveryType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (DiscoveryType) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_enumTypes[0].Descriptor()
-}
-
-func (DiscoveryType) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_pbproxystate_cluster_proto_enumTypes[0]
-}
-
-func (x DiscoveryType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use DiscoveryType.Descriptor instead.
-func (DiscoveryType) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{0}
-}
-
-type Cluster struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// name is the name of the cluster.
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	// group is either a failover group or endpoint group. If this cluster needs to failover to other clusters, use the failover group. If this cluster routes directly to endpoints, use the endpoint group.
-	//
-	// Types that are assignable to Group:
-	//
-	//	*Cluster_FailoverGroup
-	//	*Cluster_EndpointGroup
-	Group isCluster_Group `protobuf_oneof:"group"`
-	// escape_hatch_cluster_json configures a user configured escape hatch cluster.
-	EscapeHatchClusterJson string `protobuf:"bytes,4,opt,name=escape_hatch_cluster_json,json=escapeHatchClusterJson,proto3" json:"escape_hatch_cluster_json,omitempty"`
-	// alt_stat_name is the name used for observability in place of cluster name if provided.
-	AltStatName string `protobuf:"bytes,5,opt,name=alt_stat_name,json=altStatName,proto3" json:"alt_stat_name,omitempty"`
-	// protocol is the local path protocol or the service protocol.
-	Protocol string `protobuf:"bytes,6,opt,name=protocol,proto3" json:"protocol,omitempty"`
-}
-
-func (x *Cluster) Reset() {
-	*x = Cluster{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Cluster) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Cluster) ProtoMessage() {}
-
-func (x *Cluster) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Cluster.ProtoReflect.Descriptor instead.
-func (*Cluster) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Cluster) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (m *Cluster) GetGroup() isCluster_Group {
-	if m != nil {
-		return m.Group
-	}
-	return nil
-}
-
-func (x *Cluster) GetFailoverGroup() *FailoverGroup {
-	if x, ok := x.GetGroup().(*Cluster_FailoverGroup); ok {
-		return x.FailoverGroup
-	}
-	return nil
-}
-
-func (x *Cluster) GetEndpointGroup() *EndpointGroup {
-	if x, ok := x.GetGroup().(*Cluster_EndpointGroup); ok {
-		return x.EndpointGroup
-	}
-	return nil
-}
-
-func (x *Cluster) GetEscapeHatchClusterJson() string {
-	if x != nil {
-		return x.EscapeHatchClusterJson
-	}
-	return ""
-}
-
-func (x *Cluster) GetAltStatName() string {
-	if x != nil {
-		return x.AltStatName
-	}
-	return ""
-}
-
-func (x *Cluster) GetProtocol() string {
-	if x != nil {
-		return x.Protocol
-	}
-	return ""
-}
-
-type isCluster_Group interface {
-	isCluster_Group()
-}
-
-type Cluster_FailoverGroup struct {
-	FailoverGroup *FailoverGroup `protobuf:"bytes,2,opt,name=failover_group,json=failoverGroup,proto3,oneof"`
-}
-
-type Cluster_EndpointGroup struct {
-	EndpointGroup *EndpointGroup `protobuf:"bytes,3,opt,name=endpoint_group,json=endpointGroup,proto3,oneof"`
-}
-
-func (*Cluster_FailoverGroup) isCluster_Group() {}
-
-func (*Cluster_EndpointGroup) isCluster_Group() {}
-
-type FailoverGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// endpoint_groups is an ordered list of which groups to failover to.
-	EndpointGroups []*EndpointGroup     `protobuf:"bytes,1,rep,name=endpoint_groups,json=endpointGroups,proto3" json:"endpoint_groups,omitempty"`
-	Config         *FailoverGroupConfig `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"`
-}
-
-func (x *FailoverGroup) Reset() {
-	*x = FailoverGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FailoverGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FailoverGroup) ProtoMessage() {}
-
-func (x *FailoverGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use FailoverGroup.ProtoReflect.Descriptor instead.
-func (*FailoverGroup) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *FailoverGroup) GetEndpointGroups() []*EndpointGroup {
-	if x != nil {
-		return x.EndpointGroups
-	}
-	return nil
-}
-
-func (x *FailoverGroup) GetConfig() *FailoverGroupConfig {
-	if x != nil {
-		return x.Config
-	}
-	return nil
-}
-
-type FailoverGroupConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	UseAltStatName bool                 `protobuf:"varint,1,opt,name=use_alt_stat_name,json=useAltStatName,proto3" json:"use_alt_stat_name,omitempty"`
-	ConnectTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"`
-}
-
-func (x *FailoverGroupConfig) Reset() {
-	*x = FailoverGroupConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *FailoverGroupConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*FailoverGroupConfig) ProtoMessage() {}
-
-func (x *FailoverGroupConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use FailoverGroupConfig.ProtoReflect.Descriptor instead.
-func (*FailoverGroupConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *FailoverGroupConfig) GetUseAltStatName() bool {
-	if x != nil {
-		return x.UseAltStatName
-	}
-	return false
-}
-
-func (x *FailoverGroupConfig) GetConnectTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.ConnectTimeout
-	}
-	return nil
-}
-
-type EndpointGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// name is used to name the cluster created. This is only required when used inside of a FailoverGroup.
-	Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
-	// Types that are assignable to Group:
-	//
-	//	*EndpointGroup_Dynamic
-	//	*EndpointGroup_Static
-	//	*EndpointGroup_Dns
-	//	*EndpointGroup_Passthrough
-	Group isEndpointGroup_Group `protobuf_oneof:"group"`
-}
-
-func (x *EndpointGroup) Reset() {
-	*x = EndpointGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EndpointGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EndpointGroup) ProtoMessage() {}
-
-func (x *EndpointGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EndpointGroup.ProtoReflect.Descriptor instead.
-func (*EndpointGroup) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *EndpointGroup) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (m *EndpointGroup) GetGroup() isEndpointGroup_Group {
-	if m != nil {
-		return m.Group
-	}
-	return nil
-}
-
-func (x *EndpointGroup) GetDynamic() *DynamicEndpointGroup {
-	if x, ok := x.GetGroup().(*EndpointGroup_Dynamic); ok {
-		return x.Dynamic
-	}
-	return nil
-}
-
-func (x *EndpointGroup) GetStatic() *StaticEndpointGroup {
-	if x, ok := x.GetGroup().(*EndpointGroup_Static); ok {
-		return x.Static
-	}
-	return nil
-}
-
-func (x *EndpointGroup) GetDns() *DNSEndpointGroup {
-	if x, ok := x.GetGroup().(*EndpointGroup_Dns); ok {
-		return x.Dns
-	}
-	return nil
-}
-
-func (x *EndpointGroup) GetPassthrough() *PassthroughEndpointGroup {
-	if x, ok := x.GetGroup().(*EndpointGroup_Passthrough); ok {
-		return x.Passthrough
-	}
-	return nil
-}
-
-type isEndpointGroup_Group interface {
-	isEndpointGroup_Group()
-}
-
-type EndpointGroup_Dynamic struct {
-	// dynamic endpoint group is used to reach mesh destinations that are dynamically configured from Consul's catalog.
-	Dynamic *DynamicEndpointGroup `protobuf:"bytes,1,opt,name=dynamic,proto3,oneof"`
-}
-
-type EndpointGroup_Static struct {
-	// static endpoint group is used to reach local app ports.
-	Static *StaticEndpointGroup `protobuf:"bytes,2,opt,name=static,proto3,oneof"`
-}
-
-type EndpointGroup_Dns struct {
-	// dns is used to reach mesh and non-mesh destinations using a hostname.
-	Dns *DNSEndpointGroup `protobuf:"bytes,3,opt,name=dns,proto3,oneof"`
-}
-
-type EndpointGroup_Passthrough struct {
-	// passthrough is used to reach destinations that don't have endpoints saved in Consul.
-	Passthrough *PassthroughEndpointGroup `protobuf:"bytes,4,opt,name=passthrough,proto3,oneof"`
-}
-
-func (*EndpointGroup_Dynamic) isEndpointGroup_Group() {}
-
-func (*EndpointGroup_Static) isEndpointGroup_Group() {}
-
-func (*EndpointGroup_Dns) isEndpointGroup_Group() {}
-
-func (*EndpointGroup_Passthrough) isEndpointGroup_Group() {}
-
-type DynamicEndpointGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// config configures how to connect to the endpoints.
-	Config *DynamicEndpointGroupConfig `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
-	// outbound_tls will configure what TLS information to use when connecting to an upstream.
-	OutboundTls *TransportSocket `protobuf:"bytes,2,opt,name=outbound_tls,json=outboundTls,proto3" json:"outbound_tls,omitempty"`
-}
-
-func (x *DynamicEndpointGroup) Reset() {
-	*x = DynamicEndpointGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DynamicEndpointGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DynamicEndpointGroup) ProtoMessage() {}
-
-func (x *DynamicEndpointGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DynamicEndpointGroup.ProtoReflect.Descriptor instead.
-func (*DynamicEndpointGroup) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *DynamicEndpointGroup) GetConfig() *DynamicEndpointGroupConfig {
-	if x != nil {
-		return x.Config
-	}
-	return nil
-}
-
-func (x *DynamicEndpointGroup) GetOutboundTls() *TransportSocket {
-	if x != nil {
-		return x.OutboundTls
-	}
-	return nil
-}
-
-type PassthroughEndpointGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// config configures how to connect to the endpoints.
-	Config *PassthroughEndpointGroupConfig `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
-	// outbound_tls will configure what TLS information to use when connecting to an upstream.
-	OutboundTls *TransportSocket `protobuf:"bytes,2,opt,name=outbound_tls,json=outboundTls,proto3" json:"outbound_tls,omitempty"`
-}
-
-func (x *PassthroughEndpointGroup) Reset() {
-	*x = PassthroughEndpointGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PassthroughEndpointGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PassthroughEndpointGroup) ProtoMessage() {}
-
-func (x *PassthroughEndpointGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PassthroughEndpointGroup.ProtoReflect.Descriptor instead.
-func (*PassthroughEndpointGroup) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *PassthroughEndpointGroup) GetConfig() *PassthroughEndpointGroupConfig {
-	if x != nil {
-		return x.Config
-	}
-	return nil
-}
-
-func (x *PassthroughEndpointGroup) GetOutboundTls() *TransportSocket {
-	if x != nil {
-		return x.OutboundTls
-	}
-	return nil
-}
-
-type DNSEndpointGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// config configures how to connect to the endpoints.
-	Config *DNSEndpointGroupConfig `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
-	// outbound_tls will configure what TLS information to use when connecting to an upstream.
-	OutboundTls *TransportSocket `protobuf:"bytes,2,opt,name=outbound_tls,json=outboundTls,proto3" json:"outbound_tls,omitempty"`
-}
-
-func (x *DNSEndpointGroup) Reset() {
-	*x = DNSEndpointGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DNSEndpointGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DNSEndpointGroup) ProtoMessage() {}
-
-func (x *DNSEndpointGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DNSEndpointGroup.ProtoReflect.Descriptor instead.
-func (*DNSEndpointGroup) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *DNSEndpointGroup) GetConfig() *DNSEndpointGroupConfig {
-	if x != nil {
-		return x.Config
-	}
-	return nil
-}
-
-func (x *DNSEndpointGroup) GetOutboundTls() *TransportSocket {
-	if x != nil {
-		return x.OutboundTls
-	}
-	return nil
-}
-
-// StaticEndpointGroup is used to reach local app ports.
-type StaticEndpointGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// config configures how to connect to the endpoints.
-	Config *StaticEndpointGroupConfig `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
-}
-
-func (x *StaticEndpointGroup) Reset() {
-	*x = StaticEndpointGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *StaticEndpointGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*StaticEndpointGroup) ProtoMessage() {}
-
-func (x *StaticEndpointGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use StaticEndpointGroup.ProtoReflect.Descriptor instead.
-func (*StaticEndpointGroup) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *StaticEndpointGroup) GetConfig() *StaticEndpointGroupConfig {
-	if x != nil {
-		return x.Config
-	}
-	return nil
-}
-
-type DestinationCluster struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// name is the name of the cluster. This will be used to look up a cluster in the clusters map.
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-}
-
-func (x *DestinationCluster) Reset() {
-	*x = DestinationCluster{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DestinationCluster) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DestinationCluster) ProtoMessage() {}
-
-func (x *DestinationCluster) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DestinationCluster.ProtoReflect.Descriptor instead.
-func (*DestinationCluster) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *DestinationCluster) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-type L4WeightedClusterGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// clusters to route to by weight.
-	Clusters []*L4WeightedDestinationCluster `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"`
-}
-
-func (x *L4WeightedClusterGroup) Reset() {
-	*x = L4WeightedClusterGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *L4WeightedClusterGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*L4WeightedClusterGroup) ProtoMessage() {}
-
-func (x *L4WeightedClusterGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use L4WeightedClusterGroup.ProtoReflect.Descriptor instead.
-func (*L4WeightedClusterGroup) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *L4WeightedClusterGroup) GetClusters() []*L4WeightedDestinationCluster {
-	if x != nil {
-		return x.Clusters
-	}
-	return nil
-}
-
-type L7WeightedClusterGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// clusters to route to by weight.
-	Clusters []*L7WeightedDestinationCluster `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"`
-}
-
-func (x *L7WeightedClusterGroup) Reset() {
-	*x = L7WeightedClusterGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *L7WeightedClusterGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*L7WeightedClusterGroup) ProtoMessage() {}
-
-func (x *L7WeightedClusterGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use L7WeightedClusterGroup.ProtoReflect.Descriptor instead.
-func (*L7WeightedClusterGroup) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *L7WeightedClusterGroup) GetClusters() []*L7WeightedDestinationCluster {
-	if x != nil {
-		return x.Clusters
-	}
-	return nil
-}
-
-type L4WeightedDestinationCluster struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// name is the name of the cluster. This will be used to look up a cluster in the clusters map.
-	Name   string                  `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Weight *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"`
-}
-
-func (x *L4WeightedDestinationCluster) Reset() {
-	*x = L4WeightedDestinationCluster{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *L4WeightedDestinationCluster) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*L4WeightedDestinationCluster) ProtoMessage() {}
-
-func (x *L4WeightedDestinationCluster) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use L4WeightedDestinationCluster.ProtoReflect.Descriptor instead.
-func (*L4WeightedDestinationCluster) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *L4WeightedDestinationCluster) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *L4WeightedDestinationCluster) GetWeight() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.Weight
-	}
-	return nil
-}
-
-type L7WeightedDestinationCluster struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// name is the name of the cluster. This will be used to look up a cluster in the clusters map.
-	Name            string                  `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Weight          *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"`
-	HeaderMutations []*HeaderMutation       `protobuf:"bytes,3,rep,name=header_mutations,json=headerMutations,proto3" json:"header_mutations,omitempty"`
-}
-
-func (x *L7WeightedDestinationCluster) Reset() {
-	*x = L7WeightedDestinationCluster{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *L7WeightedDestinationCluster) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*L7WeightedDestinationCluster) ProtoMessage() {}
-
-func (x *L7WeightedDestinationCluster) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use L7WeightedDestinationCluster.ProtoReflect.Descriptor instead.
-func (*L7WeightedDestinationCluster) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *L7WeightedDestinationCluster) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *L7WeightedDestinationCluster) GetWeight() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.Weight
-	}
-	return nil
-}
-
-func (x *L7WeightedDestinationCluster) GetHeaderMutations() []*HeaderMutation {
-	if x != nil {
-		return x.HeaderMutations
-	}
-	return nil
-}
-
-type DynamicEndpointGroupConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ConnectTimeout        *durationpb.Duration `protobuf:"bytes,1,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"`
-	DisablePanicThreshold bool                 `protobuf:"varint,2,opt,name=disable_panic_threshold,json=disablePanicThreshold,proto3" json:"disable_panic_threshold,omitempty"`
-	// Types that are assignable to LbPolicy:
-	//
-	//	*DynamicEndpointGroupConfig_LeastRequest
-	//	*DynamicEndpointGroupConfig_RoundRobin
-	//	*DynamicEndpointGroupConfig_Random
-	//	*DynamicEndpointGroupConfig_RingHash
-	//	*DynamicEndpointGroupConfig_Maglev
-	LbPolicy                  isDynamicEndpointGroupConfig_LbPolicy `protobuf_oneof:"lb_policy"`
-	CircuitBreakers           *CircuitBreakers                      `protobuf:"bytes,8,opt,name=circuit_breakers,json=circuitBreakers,proto3" json:"circuit_breakers,omitempty"`
-	OutlierDetection          *OutlierDetection                     `protobuf:"bytes,9,opt,name=outlier_detection,json=outlierDetection,proto3" json:"outlier_detection,omitempty"`
-	UpstreamConnectionOptions *UpstreamConnectionOptions            `protobuf:"bytes,10,opt,name=upstream_connection_options,json=upstreamConnectionOptions,proto3" json:"upstream_connection_options,omitempty"`
-	UseAltStatName            bool                                  `protobuf:"varint,11,opt,name=use_alt_stat_name,json=useAltStatName,proto3" json:"use_alt_stat_name,omitempty"`
-}
-
-func (x *DynamicEndpointGroupConfig) Reset() {
-	*x = DynamicEndpointGroupConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DynamicEndpointGroupConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DynamicEndpointGroupConfig) ProtoMessage() {}
-
-func (x *DynamicEndpointGroupConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DynamicEndpointGroupConfig.ProtoReflect.Descriptor instead.
-func (*DynamicEndpointGroupConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{13}
-}
-
-func (x *DynamicEndpointGroupConfig) GetConnectTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.ConnectTimeout
-	}
-	return nil
-}
-
-func (x *DynamicEndpointGroupConfig) GetDisablePanicThreshold() bool {
-	if x != nil {
-		return x.DisablePanicThreshold
-	}
-	return false
-}
-
-func (m *DynamicEndpointGroupConfig) GetLbPolicy() isDynamicEndpointGroupConfig_LbPolicy {
-	if m != nil {
-		return m.LbPolicy
-	}
-	return nil
-}
-
-func (x *DynamicEndpointGroupConfig) GetLeastRequest() *LBPolicyLeastRequest {
-	if x, ok := x.GetLbPolicy().(*DynamicEndpointGroupConfig_LeastRequest); ok {
-		return x.LeastRequest
-	}
-	return nil
-}
-
-func (x *DynamicEndpointGroupConfig) GetRoundRobin() *LBPolicyRoundRobin {
-	if x, ok := x.GetLbPolicy().(*DynamicEndpointGroupConfig_RoundRobin); ok {
-		return x.RoundRobin
-	}
-	return nil
-}
-
-func (x *DynamicEndpointGroupConfig) GetRandom() *LBPolicyRandom {
-	if x, ok := x.GetLbPolicy().(*DynamicEndpointGroupConfig_Random); ok {
-		return x.Random
-	}
-	return nil
-}
-
-func (x *DynamicEndpointGroupConfig) GetRingHash() *LBPolicyRingHash {
-	if x, ok := x.GetLbPolicy().(*DynamicEndpointGroupConfig_RingHash); ok {
-		return x.RingHash
-	}
-	return nil
-}
-
-func (x *DynamicEndpointGroupConfig) GetMaglev() *LBPolicyMaglev {
-	if x, ok := x.GetLbPolicy().(*DynamicEndpointGroupConfig_Maglev); ok {
-		return x.Maglev
-	}
-	return nil
-}
-
-func (x *DynamicEndpointGroupConfig) GetCircuitBreakers() *CircuitBreakers {
-	if x != nil {
-		return x.CircuitBreakers
-	}
-	return nil
-}
-
-func (x *DynamicEndpointGroupConfig) GetOutlierDetection() *OutlierDetection {
-	if x != nil {
-		return x.OutlierDetection
-	}
-	return nil
-}
-
-func (x *DynamicEndpointGroupConfig) GetUpstreamConnectionOptions() *UpstreamConnectionOptions {
-	if x != nil {
-		return x.UpstreamConnectionOptions
-	}
-	return nil
-}
-
-func (x *DynamicEndpointGroupConfig) GetUseAltStatName() bool {
-	if x != nil {
-		return x.UseAltStatName
-	}
-	return false
-}
-
-type isDynamicEndpointGroupConfig_LbPolicy interface {
-	isDynamicEndpointGroupConfig_LbPolicy()
-}
-
-type DynamicEndpointGroupConfig_LeastRequest struct {
-	LeastRequest *LBPolicyLeastRequest `protobuf:"bytes,3,opt,name=least_request,json=leastRequest,proto3,oneof"`
-}
-
-type DynamicEndpointGroupConfig_RoundRobin struct {
-	RoundRobin *LBPolicyRoundRobin `protobuf:"bytes,4,opt,name=round_robin,json=roundRobin,proto3,oneof"`
-}
-
-type DynamicEndpointGroupConfig_Random struct {
-	Random *LBPolicyRandom `protobuf:"bytes,5,opt,name=random,proto3,oneof"`
-}
-
-type DynamicEndpointGroupConfig_RingHash struct {
-	RingHash *LBPolicyRingHash `protobuf:"bytes,6,opt,name=ring_hash,json=ringHash,proto3,oneof"`
-}
-
-type DynamicEndpointGroupConfig_Maglev struct {
-	Maglev *LBPolicyMaglev `protobuf:"bytes,7,opt,name=maglev,proto3,oneof"`
-}
-
-func (*DynamicEndpointGroupConfig_LeastRequest) isDynamicEndpointGroupConfig_LbPolicy() {}
-
-func (*DynamicEndpointGroupConfig_RoundRobin) isDynamicEndpointGroupConfig_LbPolicy() {}
-
-func (*DynamicEndpointGroupConfig_Random) isDynamicEndpointGroupConfig_LbPolicy() {}
-
-func (*DynamicEndpointGroupConfig_RingHash) isDynamicEndpointGroupConfig_LbPolicy() {}
-
-func (*DynamicEndpointGroupConfig_Maglev) isDynamicEndpointGroupConfig_LbPolicy() {}
-
-type LBPolicyLeastRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ChoiceCount *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=choice_count,json=choiceCount,proto3" json:"choice_count,omitempty"`
-}
-
-func (x *LBPolicyLeastRequest) Reset() {
-	*x = LBPolicyLeastRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LBPolicyLeastRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LBPolicyLeastRequest) ProtoMessage() {}
-
-func (x *LBPolicyLeastRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LBPolicyLeastRequest.ProtoReflect.Descriptor instead.
-func (*LBPolicyLeastRequest) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{14}
-}
-
-func (x *LBPolicyLeastRequest) GetChoiceCount() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.ChoiceCount
-	}
-	return nil
-}
-
-type LBPolicyRoundRobin struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *LBPolicyRoundRobin) Reset() {
-	*x = LBPolicyRoundRobin{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LBPolicyRoundRobin) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LBPolicyRoundRobin) ProtoMessage() {}
-
-func (x *LBPolicyRoundRobin) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LBPolicyRoundRobin.ProtoReflect.Descriptor instead.
-func (*LBPolicyRoundRobin) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{15}
-}
-
-type LBPolicyRandom struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *LBPolicyRandom) Reset() {
-	*x = LBPolicyRandom{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LBPolicyRandom) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LBPolicyRandom) ProtoMessage() {}
-
-func (x *LBPolicyRandom) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LBPolicyRandom.ProtoReflect.Descriptor instead.
-func (*LBPolicyRandom) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{16}
-}
-
-type LBPolicyRingHash struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	MinimumRingSize *wrapperspb.UInt64Value `protobuf:"bytes,1,opt,name=minimum_ring_size,json=minimumRingSize,proto3" json:"minimum_ring_size,omitempty"`
-	MaximumRingSize *wrapperspb.UInt64Value `protobuf:"bytes,2,opt,name=maximum_ring_size,json=maximumRingSize,proto3" json:"maximum_ring_size,omitempty"`
-}
-
-func (x *LBPolicyRingHash) Reset() {
-	*x = LBPolicyRingHash{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[17]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LBPolicyRingHash) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LBPolicyRingHash) ProtoMessage() {}
-
-func (x *LBPolicyRingHash) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[17]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LBPolicyRingHash.ProtoReflect.Descriptor instead.
-func (*LBPolicyRingHash) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{17}
-}
-
-func (x *LBPolicyRingHash) GetMinimumRingSize() *wrapperspb.UInt64Value {
-	if x != nil {
-		return x.MinimumRingSize
-	}
-	return nil
-}
-
-func (x *LBPolicyRingHash) GetMaximumRingSize() *wrapperspb.UInt64Value {
-	if x != nil {
-		return x.MaximumRingSize
-	}
-	return nil
-}
-
-type LBPolicyMaglev struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *LBPolicyMaglev) Reset() {
-	*x = LBPolicyMaglev{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[18]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LBPolicyMaglev) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LBPolicyMaglev) ProtoMessage() {}
-
-func (x *LBPolicyMaglev) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[18]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LBPolicyMaglev.ProtoReflect.Descriptor instead.
-func (*LBPolicyMaglev) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{18}
-}
-
-type CircuitBreakers struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	UpstreamLimits *UpstreamLimits `protobuf:"bytes,1,opt,name=upstream_limits,json=upstreamLimits,proto3" json:"upstream_limits,omitempty"`
-}
-
-func (x *CircuitBreakers) Reset() {
-	*x = CircuitBreakers{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[19]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CircuitBreakers) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CircuitBreakers) ProtoMessage() {}
-
-func (x *CircuitBreakers) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[19]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CircuitBreakers.ProtoReflect.Descriptor instead.
-func (*CircuitBreakers) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{19}
-}
-
-func (x *CircuitBreakers) GetUpstreamLimits() *UpstreamLimits {
-	if x != nil {
-		return x.UpstreamLimits
-	}
-	return nil
-}
-
-type UpstreamLimits struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	MaxConnections        *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_connections,json=maxConnections,proto3" json:"max_connections,omitempty"`
-	MaxPendingRequests    *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_pending_requests,json=maxPendingRequests,proto3" json:"max_pending_requests,omitempty"`
-	MaxConcurrentRequests *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=max_concurrent_requests,json=maxConcurrentRequests,proto3" json:"max_concurrent_requests,omitempty"`
-}
-
-func (x *UpstreamLimits) Reset() {
-	*x = UpstreamLimits{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[20]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UpstreamLimits) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UpstreamLimits) ProtoMessage() {}
-
-func (x *UpstreamLimits) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[20]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UpstreamLimits.ProtoReflect.Descriptor instead.
-func (*UpstreamLimits) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{20}
-}
-
-func (x *UpstreamLimits) GetMaxConnections() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.MaxConnections
-	}
-	return nil
-}
-
-func (x *UpstreamLimits) GetMaxPendingRequests() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.MaxPendingRequests
-	}
-	return nil
-}
-
-func (x *UpstreamLimits) GetMaxConcurrentRequests() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.MaxConcurrentRequests
-	}
-	return nil
-}
-
-type OutlierDetection struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Interval                 *durationpb.Duration    `protobuf:"bytes,1,opt,name=interval,proto3" json:"interval,omitempty"`
-	Consecutive_5Xx          *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=consecutive_5xx,json=consecutive5xx,proto3" json:"consecutive_5xx,omitempty"`
-	EnforcingConsecutive_5Xx *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=enforcing_consecutive_5xx,json=enforcingConsecutive5xx,proto3" json:"enforcing_consecutive_5xx,omitempty"`
-	MaxEjectionPercent       *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=max_ejection_percent,json=maxEjectionPercent,proto3" json:"max_ejection_percent,omitempty"`
-	BaseEjectionTime         *durationpb.Duration    `protobuf:"bytes,5,opt,name=base_ejection_time,json=baseEjectionTime,proto3" json:"base_ejection_time,omitempty"`
-}
-
-func (x *OutlierDetection) Reset() {
-	*x = OutlierDetection{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[21]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OutlierDetection) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OutlierDetection) ProtoMessage() {}
-
-func (x *OutlierDetection) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[21]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OutlierDetection.ProtoReflect.Descriptor instead.
-func (*OutlierDetection) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{21}
-}
-
-func (x *OutlierDetection) GetInterval() *durationpb.Duration {
-	if x != nil {
-		return x.Interval
-	}
-	return nil
-}
-
-func (x *OutlierDetection) GetConsecutive_5Xx() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.Consecutive_5Xx
-	}
-	return nil
-}
-
-func (x *OutlierDetection) GetEnforcingConsecutive_5Xx() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.EnforcingConsecutive_5Xx
-	}
-	return nil
-}
-
-func (x *OutlierDetection) GetMaxEjectionPercent() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.MaxEjectionPercent
-	}
-	return nil
-}
-
-func (x *OutlierDetection) GetBaseEjectionTime() *durationpb.Duration {
-	if x != nil {
-		return x.BaseEjectionTime
-	}
-	return nil
-}
-
-type UpstreamConnectionOptions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TcpKeepaliveTime     *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=tcp_keepalive_time,json=tcpKeepaliveTime,proto3" json:"tcp_keepalive_time,omitempty"`
-	TcpKeepaliveInterval *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=tcp_keepalive_interval,json=tcpKeepaliveInterval,proto3" json:"tcp_keepalive_interval,omitempty"`
-	TcpKeepaliveProbes   *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=tcp_keepalive_probes,json=tcpKeepaliveProbes,proto3" json:"tcp_keepalive_probes,omitempty"`
-}
-
-func (x *UpstreamConnectionOptions) Reset() {
-	*x = UpstreamConnectionOptions{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[22]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UpstreamConnectionOptions) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UpstreamConnectionOptions) ProtoMessage() {}
-
-func (x *UpstreamConnectionOptions) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[22]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UpstreamConnectionOptions.ProtoReflect.Descriptor instead.
-func (*UpstreamConnectionOptions) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{22}
-}
-
-func (x *UpstreamConnectionOptions) GetTcpKeepaliveTime() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.TcpKeepaliveTime
-	}
-	return nil
-}
-
-func (x *UpstreamConnectionOptions) GetTcpKeepaliveInterval() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.TcpKeepaliveInterval
-	}
-	return nil
-}
-
-func (x *UpstreamConnectionOptions) GetTcpKeepaliveProbes() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.TcpKeepaliveProbes
-	}
-	return nil
-}
-
-type PassthroughEndpointGroupConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ConnectTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"`
-}
-
-func (x *PassthroughEndpointGroupConfig) Reset() {
-	*x = PassthroughEndpointGroupConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[23]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PassthroughEndpointGroupConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PassthroughEndpointGroupConfig) ProtoMessage() {}
-
-func (x *PassthroughEndpointGroupConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[23]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PassthroughEndpointGroupConfig.ProtoReflect.Descriptor instead.
-func (*PassthroughEndpointGroupConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{23}
-}
-
-func (x *PassthroughEndpointGroupConfig) GetConnectTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.ConnectTimeout
-	}
-	return nil
-}
-
-type DNSEndpointGroupConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ConnectTimeout            *durationpb.Duration       `protobuf:"bytes,1,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"`
-	DisablePanicThreshold     bool                       `protobuf:"varint,2,opt,name=disable_panic_threshold,json=disablePanicThreshold,proto3" json:"disable_panic_threshold,omitempty"`
-	DiscoveryType             DiscoveryType              `protobuf:"varint,3,opt,name=discovery_type,json=discoveryType,proto3,enum=hashicorp.consul.mesh.v2beta1.pbproxystate.DiscoveryType" json:"discovery_type,omitempty"`
-	CircuitBreakers           *CircuitBreakers           `protobuf:"bytes,4,opt,name=circuit_breakers,json=circuitBreakers,proto3" json:"circuit_breakers,omitempty"`
-	OutlierDetection          *OutlierDetection          `protobuf:"bytes,5,opt,name=outlier_detection,json=outlierDetection,proto3" json:"outlier_detection,omitempty"`
-	UpstreamConnectionOptions *UpstreamConnectionOptions `protobuf:"bytes,6,opt,name=upstream_connection_options,json=upstreamConnectionOptions,proto3" json:"upstream_connection_options,omitempty"`
-	UseAltStatName            bool                       `protobuf:"varint,7,opt,name=use_alt_stat_name,json=useAltStatName,proto3" json:"use_alt_stat_name,omitempty"`
-}
-
-func (x *DNSEndpointGroupConfig) Reset() {
-	*x = DNSEndpointGroupConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[24]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DNSEndpointGroupConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DNSEndpointGroupConfig) ProtoMessage() {}
-
-func (x *DNSEndpointGroupConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[24]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DNSEndpointGroupConfig.ProtoReflect.Descriptor instead.
-func (*DNSEndpointGroupConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{24}
-}
-
-func (x *DNSEndpointGroupConfig) GetConnectTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.ConnectTimeout
-	}
-	return nil
-}
-
-func (x *DNSEndpointGroupConfig) GetDisablePanicThreshold() bool {
-	if x != nil {
-		return x.DisablePanicThreshold
-	}
-	return false
-}
-
-func (x *DNSEndpointGroupConfig) GetDiscoveryType() DiscoveryType {
-	if x != nil {
-		return x.DiscoveryType
-	}
-	return DiscoveryType_DISCOVERY_TYPE_LOGICAL
-}
-
-func (x *DNSEndpointGroupConfig) GetCircuitBreakers() *CircuitBreakers {
-	if x != nil {
-		return x.CircuitBreakers
-	}
-	return nil
-}
-
-func (x *DNSEndpointGroupConfig) GetOutlierDetection() *OutlierDetection {
-	if x != nil {
-		return x.OutlierDetection
-	}
-	return nil
-}
-
-func (x *DNSEndpointGroupConfig) GetUpstreamConnectionOptions() *UpstreamConnectionOptions {
-	if x != nil {
-		return x.UpstreamConnectionOptions
-	}
-	return nil
-}
-
-func (x *DNSEndpointGroupConfig) GetUseAltStatName() bool {
-	if x != nil {
-		return x.UseAltStatName
-	}
-	return false
-}
-
-type StaticEndpointGroupConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ConnectTimeout  *durationpb.Duration `protobuf:"bytes,1,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"`
-	CircuitBreakers *CircuitBreakers     `protobuf:"bytes,2,opt,name=circuit_breakers,json=circuitBreakers,proto3" json:"circuit_breakers,omitempty"`
-}
-
-func (x *StaticEndpointGroupConfig) Reset() {
-	*x = StaticEndpointGroupConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[25]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *StaticEndpointGroupConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*StaticEndpointGroupConfig) ProtoMessage() {}
-
-func (x *StaticEndpointGroupConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[25]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use StaticEndpointGroupConfig.ProtoReflect.Descriptor instead.
-func (*StaticEndpointGroupConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP(), []int{25}
-}
-
-func (x *StaticEndpointGroupConfig) GetConnectTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.ConnectTimeout
-	}
-	return nil
-}
-
-func (x *StaticEndpointGroupConfig) GetCircuitBreakers() *CircuitBreakers {
-	if x != nil {
-		return x.CircuitBreakers
-	}
-	return nil
-}
-
-var File_pbmesh_v2beta1_pbproxystate_cluster_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDesc = []byte{
-	0x0a, 0x29, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x63, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x2a, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72,
-	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x32, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x2f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x75, 0x74, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x32, 0x70, 0x62, 0x6d,
-	0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f,
-	0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0xe9, 0x02, 0x0a, 0x07, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
-	0x62, 0x0a, 0x0e, 0x66, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x5f, 0x67, 0x72, 0x6f, 0x75,
-	0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x2e, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x47, 0x72, 0x6f,
-	0x75, 0x70, 0x48, 0x00, 0x52, 0x0d, 0x66, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x47, 0x72,
-	0x6f, 0x75, 0x70, 0x12, 0x62, 0x0a, 0x0e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f,
-	0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
-	0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x48, 0x00, 0x52, 0x0d, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x39, 0x0a, 0x19, 0x65, 0x73, 0x63, 0x61, 0x70,
-	0x65, 0x5f, 0x68, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f,
-	0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x65, 0x73, 0x63, 0x61,
-	0x70, 0x65, 0x48, 0x61, 0x74, 0x63, 0x68, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4a, 0x73,
-	0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0d, 0x61, 0x6c, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x5f, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x6c, 0x74, 0x53, 0x74,
-	0x61, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x42, 0x07, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0xcc, 0x01, 0x0a, 0x0d,
-	0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x62, 0x0a,
-	0x0f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75,
-	0x70, 0x52, 0x0e, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70,
-	0x73, 0x12, 0x57, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x3f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x46,
-	0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x84, 0x01, 0x0a, 0x13, 0x46,
-	0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x29, 0x0a, 0x11, 0x75, 0x73, 0x65, 0x5f, 0x61, 0x6c, 0x74, 0x5f, 0x73, 0x74,
-	0x61, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x75,
-	0x73, 0x65, 0x41, 0x6c, 0x74, 0x53, 0x74, 0x61, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x42, 0x0a,
-	0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75,
-	0x74, 0x22, 0xa1, 0x03, 0x0a, 0x0d, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x72,
-	0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x5c, 0x0a, 0x07, 0x64, 0x79, 0x6e, 0x61, 0x6d,
-	0x69, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x45, 0x6e, 0x64,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x48, 0x00, 0x52, 0x07, 0x64, 0x79,
-	0x6e, 0x61, 0x6d, 0x69, 0x63, 0x12, 0x59, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
-	0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x48, 0x00, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63,
-	0x12, 0x50, 0x0a, 0x03, 0x64, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x4e, 0x53, 0x45, 0x6e,
-	0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x48, 0x00, 0x52, 0x03, 0x64,
-	0x6e, 0x73, 0x12, 0x68, 0x0a, 0x0b, 0x70, 0x61, 0x73, 0x73, 0x74, 0x68, 0x72, 0x6f, 0x75, 0x67,
-	0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x44, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x74, 0x68, 0x72, 0x6f, 0x75, 0x67, 0x68,
-	0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x48, 0x00, 0x52,
-	0x0b, 0x70, 0x61, 0x73, 0x73, 0x74, 0x68, 0x72, 0x6f, 0x75, 0x67, 0x68, 0x42, 0x07, 0x0a, 0x05,
-	0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0xd6, 0x01, 0x0a, 0x14, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69,
-	0x63, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x5e,
-	0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x46,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70,
-	0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x79, 0x6e, 0x61,
-	0x6d, 0x69, 0x63, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5e,
-	0x0a, 0x0c, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x74, 0x6c, 0x73, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74,
-	0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65,
-	0x74, 0x52, 0x0b, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x54, 0x6c, 0x73, 0x22, 0xde,
-	0x01, 0x0a, 0x18, 0x50, 0x61, 0x73, 0x73, 0x74, 0x68, 0x72, 0x6f, 0x75, 0x67, 0x68, 0x45, 0x6e,
-	0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x62, 0x0a, 0x06, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4a, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x74, 0x68, 0x72,
-	0x6f, 0x75, 0x67, 0x68, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75,
-	0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x5e, 0x0a, 0x0c, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x74, 0x6c, 0x73, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b,
-	0x65, 0x74, 0x52, 0x0b, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x54, 0x6c, 0x73, 0x22,
-	0xce, 0x01, 0x0a, 0x10, 0x44, 0x4e, 0x53, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47,
-	0x72, 0x6f, 0x75, 0x70, 0x12, 0x5a, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74,
-	0x65, 0x2e, 0x44, 0x4e, 0x53, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x72, 0x6f,
-	0x75, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x5e, 0x0a, 0x0c, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x74, 0x6c, 0x73,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x52, 0x0b, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x54, 0x6c, 0x73,
-	0x22, 0x74, 0x0a, 0x13, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x5d, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x45, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x45, 0x6e, 0x64, 0x70, 0x6f,
-	0x69, 0x6e, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x28, 0x0a, 0x12, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x22, 0x7e, 0x0a, 0x16, 0x4c, 0x34, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x64, 0x0a, 0x08, 0x63, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x48, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c, 0x34, 0x57, 0x65, 0x69, 0x67,
-	0x68, 0x74, 0x65, 0x64, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x08, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73,
-	0x22, 0x7e, 0x0a, 0x16, 0x4c, 0x37, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x64, 0x0a, 0x08, 0x63, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x48, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c, 0x37, 0x57, 0x65, 0x69, 0x67,
-	0x68, 0x74, 0x65, 0x64, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x08, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73,
-	0x22, 0x68, 0x0a, 0x1c, 0x4c, 0x34, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x44, 0x65,
-	0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x34, 0x0a, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0xcf, 0x01, 0x0a, 0x1c, 0x4c,
-	0x37, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
-	0x34, 0x0a, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x06, 0x77,
-	0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x65, 0x0a, 0x10, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f,
-	0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x68, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x80, 0x08, 0x0a,
-	0x1a, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74,
-	0x47, 0x72, 0x6f, 0x75, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x42, 0x0a, 0x0f, 0x63,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12,
-	0x36, 0x0a, 0x17, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x70, 0x61, 0x6e, 0x69, 0x63,
-	0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x15, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x50, 0x61, 0x6e, 0x69, 0x63, 0x54, 0x68,
-	0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x12, 0x67, 0x0a, 0x0d, 0x6c, 0x65, 0x61, 0x73, 0x74,
-	0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x40,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70,
-	0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c, 0x42, 0x50, 0x6f,
-	0x6c, 0x69, 0x63, 0x79, 0x4c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x48, 0x00, 0x52, 0x0c, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x61, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x72, 0x6f, 0x62, 0x69, 0x6e, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x4c, 0x42, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x6f, 0x75, 0x6e, 0x64,
-	0x52, 0x6f, 0x62, 0x69, 0x6e, 0x48, 0x00, 0x52, 0x0a, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x6f,
-	0x62, 0x69, 0x6e, 0x12, 0x54, 0x0a, 0x06, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x2e, 0x4c, 0x42, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x48,
-	0x00, 0x52, 0x06, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x12, 0x5b, 0x0a, 0x09, 0x72, 0x69, 0x6e,
-	0x67, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c, 0x42, 0x50, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x52, 0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x48, 0x00, 0x52, 0x08, 0x72, 0x69,
-	0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x12, 0x54, 0x0a, 0x06, 0x6d, 0x61, 0x67, 0x6c, 0x65, 0x76,
-	0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2e, 0x4c, 0x42, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4d, 0x61, 0x67, 0x6c,
-	0x65, 0x76, 0x48, 0x00, 0x52, 0x06, 0x6d, 0x61, 0x67, 0x6c, 0x65, 0x76, 0x12, 0x66, 0x0a, 0x10,
-	0x63, 0x69, 0x72, 0x63, 0x75, 0x69, 0x74, 0x5f, 0x62, 0x72, 0x65, 0x61, 0x6b, 0x65, 0x72, 0x73,
-	0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2e, 0x43, 0x69, 0x72, 0x63, 0x75, 0x69, 0x74, 0x42, 0x72, 0x65, 0x61, 0x6b,
-	0x65, 0x72, 0x73, 0x52, 0x0f, 0x63, 0x69, 0x72, 0x63, 0x75, 0x69, 0x74, 0x42, 0x72, 0x65, 0x61,
-	0x6b, 0x65, 0x72, 0x73, 0x12, 0x69, 0x0a, 0x11, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x5f,
-	0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x3c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4f, 0x75, 0x74,
-	0x6c, 0x69, 0x65, 0x72, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x6f,
-	0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x85, 0x01, 0x0a, 0x1b, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x63, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x45, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x19, 0x75, 0x70,
-	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x29, 0x0a, 0x11, 0x75, 0x73, 0x65, 0x5f, 0x61,
-	0x6c, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0e, 0x75, 0x73, 0x65, 0x41, 0x6c, 0x74, 0x53, 0x74, 0x61, 0x74, 0x4e, 0x61,
-	0x6d, 0x65, 0x42, 0x0b, 0x0a, 0x09, 0x6c, 0x62, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22,
-	0x57, 0x0a, 0x14, 0x4c, 0x42, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4c, 0x65, 0x61, 0x73, 0x74,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0c, 0x63, 0x68, 0x6f, 0x69, 0x63,
-	0x65, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0b, 0x63, 0x68, 0x6f,
-	0x69, 0x63, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x14, 0x0a, 0x12, 0x4c, 0x42, 0x50, 0x6f,
-	0x6c, 0x69, 0x63, 0x79, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x6f, 0x62, 0x69, 0x6e, 0x22, 0x10,
-	0x0a, 0x0e, 0x4c, 0x42, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d,
-	0x22, 0xa6, 0x01, 0x0a, 0x10, 0x4c, 0x42, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x69, 0x6e,
-	0x67, 0x48, 0x61, 0x73, 0x68, 0x12, 0x48, 0x0a, 0x11, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d,
-	0x5f, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f,
-	0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x52, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x7a, 0x65, 0x12,
-	0x48, 0x0a, 0x11, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x5f, 0x72, 0x69, 0x6e, 0x67, 0x5f,
-	0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e,
-	0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75,
-	0x6d, 0x52, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x10, 0x0a, 0x0e, 0x4c, 0x42, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4d, 0x61, 0x67, 0x6c, 0x65, 0x76, 0x22, 0x76, 0x0a, 0x0f, 0x43,
-	0x69, 0x72, 0x63, 0x75, 0x69, 0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x65, 0x72, 0x73, 0x12, 0x63,
-	0x0a, 0x0f, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74,
-	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x69, 0x6d,
-	0x69, 0x74, 0x73, 0x52, 0x0e, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x69, 0x6d,
-	0x69, 0x74, 0x73, 0x22, 0xfd, 0x01, 0x0a, 0x0e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
-	0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x45, 0x0a, 0x0f, 0x6d, 0x61, 0x78, 0x5f, 0x63, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0e, 0x6d,
-	0x61, 0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x4e, 0x0a,
-	0x14, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49,
-	0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x12, 0x6d, 0x61, 0x78, 0x50, 0x65,
-	0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x54, 0x0a,
-	0x17, 0x6d, 0x61, 0x78, 0x5f, 0x63, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x5f,
-	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x15, 0x6d, 0x61,
-	0x78, 0x43, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x73, 0x22, 0x83, 0x03, 0x0a, 0x10, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x44,
-	0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x35, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12,
-	0x45, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x35,
-	0x78, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33,
-	0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x74,
-	0x69, 0x76, 0x65, 0x35, 0x78, 0x78, 0x12, 0x58, 0x0a, 0x19, 0x65, 0x6e, 0x66, 0x6f, 0x72, 0x63,
-	0x69, 0x6e, 0x67, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x74, 0x69, 0x76, 0x65, 0x5f,
-	0x35, 0x78, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74,
-	0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x17, 0x65, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x69,
-	0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x74, 0x69, 0x76, 0x65, 0x35, 0x78, 0x78,
-	0x12, 0x4e, 0x0a, 0x14, 0x6d, 0x61, 0x78, 0x5f, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x5f, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x12, 0x6d, 0x61,
-	0x78, 0x45, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74,
-	0x12, 0x47, 0x0a, 0x12, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x62, 0x61, 0x73, 0x65, 0x45, 0x6a, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x8b, 0x02, 0x0a, 0x19, 0x55, 0x70,
-	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x4a, 0x0a, 0x12, 0x74, 0x63, 0x70, 0x5f, 0x6b,
-	0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x52, 0x10, 0x74, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x54,
-	0x69, 0x6d, 0x65, 0x12, 0x52, 0x0a, 0x16, 0x74, 0x63, 0x70, 0x5f, 0x6b, 0x65, 0x65, 0x70, 0x61,
-	0x6c, 0x69, 0x76, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x52, 0x14, 0x74, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x49,
-	0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x4e, 0x0a, 0x14, 0x74, 0x63, 0x70, 0x5f, 0x6b,
-	0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x62, 0x65, 0x73, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x52, 0x12, 0x74, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76,
-	0x65, 0x50, 0x72, 0x6f, 0x62, 0x65, 0x73, 0x22, 0x64, 0x0a, 0x1e, 0x50, 0x61, 0x73, 0x73, 0x74,
-	0x68, 0x72, 0x6f, 0x75, 0x67, 0x68, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x72,
-	0x6f, 0x75, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x42, 0x0a, 0x0f, 0x63, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x63,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x22, 0xfc, 0x04,
-	0x0a, 0x16, 0x44, 0x4e, 0x53, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x72, 0x6f,
-	0x75, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x42, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x63, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x36, 0x0a, 0x17,
-	0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x70, 0x61, 0x6e, 0x69, 0x63, 0x5f, 0x74, 0x68,
-	0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x64,
-	0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x50, 0x61, 0x6e, 0x69, 0x63, 0x54, 0x68, 0x72, 0x65, 0x73,
-	0x68, 0x6f, 0x6c, 0x64, 0x12, 0x60, 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
-	0x79, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x39, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76,
-	0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0d, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
-	0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x66, 0x0a, 0x10, 0x63, 0x69, 0x72, 0x63, 0x75, 0x69,
-	0x74, 0x5f, 0x62, 0x72, 0x65, 0x61, 0x6b, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x43, 0x69,
-	0x72, 0x63, 0x75, 0x69, 0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x65, 0x72, 0x73, 0x52, 0x0f, 0x63,
-	0x69, 0x72, 0x63, 0x75, 0x69, 0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x65, 0x72, 0x73, 0x12, 0x69,
-	0x0a, 0x11, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x5f, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72, 0x44, 0x65,
-	0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x65, 0x72,
-	0x44, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x85, 0x01, 0x0a, 0x1b, 0x75, 0x70,
-	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x45, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x55, 0x70, 0x73,
-	0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x19, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
-	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x29, 0x0a, 0x11, 0x75, 0x73, 0x65, 0x5f, 0x61, 0x6c, 0x74, 0x5f, 0x73, 0x74, 0x61,
-	0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x75, 0x73,
-	0x65, 0x41, 0x6c, 0x74, 0x53, 0x74, 0x61, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xc7, 0x01, 0x0a,
-	0x19, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47,
-	0x72, 0x6f, 0x75, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x42, 0x0a, 0x0f, 0x63, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e,
-	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x66,
-	0x0a, 0x10, 0x63, 0x69, 0x72, 0x63, 0x75, 0x69, 0x74, 0x5f, 0x62, 0x72, 0x65, 0x61, 0x6b, 0x65,
-	0x72, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x43, 0x69, 0x72, 0x63, 0x75, 0x69, 0x74, 0x42, 0x72, 0x65,
-	0x61, 0x6b, 0x65, 0x72, 0x73, 0x52, 0x0f, 0x63, 0x69, 0x72, 0x63, 0x75, 0x69, 0x74, 0x42, 0x72,
-	0x65, 0x61, 0x6b, 0x65, 0x72, 0x73, 0x2a, 0x46, 0x0a, 0x0d, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76,
-	0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x16, 0x44, 0x49, 0x53, 0x43, 0x4f,
-	0x56, 0x45, 0x52, 0x59, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4c, 0x4f, 0x47, 0x49, 0x43, 0x41,
-	0x4c, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x44, 0x49, 0x53, 0x43, 0x4f, 0x56, 0x45, 0x52, 0x59,
-	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x43, 0x54, 0x10, 0x01, 0x42, 0xd2,
-	0x02, 0x0a, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74,
-	0x65, 0x42, 0x0c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65,
-	0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xa2, 0x02, 0x05, 0x48, 0x43, 0x4d, 0x56, 0x50, 0xaa,
-	0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xca, 0x02, 0x2a, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c,
-	0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xe2, 0x02, 0x36, 0x48, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73,
-	0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0xea, 0x02, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x3a, 0x3a, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescData = file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_pbproxystate_cluster_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes = make([]protoimpl.MessageInfo, 26)
-var file_pbmesh_v2beta1_pbproxystate_cluster_proto_goTypes = []interface{}{
-	(DiscoveryType)(0),                     // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.DiscoveryType
-	(*Cluster)(nil),                        // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.Cluster
-	(*FailoverGroup)(nil),                  // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.FailoverGroup
-	(*FailoverGroupConfig)(nil),            // 3: hashicorp.consul.mesh.v2beta1.pbproxystate.FailoverGroupConfig
-	(*EndpointGroup)(nil),                  // 4: hashicorp.consul.mesh.v2beta1.pbproxystate.EndpointGroup
-	(*DynamicEndpointGroup)(nil),           // 5: hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroup
-	(*PassthroughEndpointGroup)(nil),       // 6: hashicorp.consul.mesh.v2beta1.pbproxystate.PassthroughEndpointGroup
-	(*DNSEndpointGroup)(nil),               // 7: hashicorp.consul.mesh.v2beta1.pbproxystate.DNSEndpointGroup
-	(*StaticEndpointGroup)(nil),            // 8: hashicorp.consul.mesh.v2beta1.pbproxystate.StaticEndpointGroup
-	(*DestinationCluster)(nil),             // 9: hashicorp.consul.mesh.v2beta1.pbproxystate.DestinationCluster
-	(*L4WeightedClusterGroup)(nil),         // 10: hashicorp.consul.mesh.v2beta1.pbproxystate.L4WeightedClusterGroup
-	(*L7WeightedClusterGroup)(nil),         // 11: hashicorp.consul.mesh.v2beta1.pbproxystate.L7WeightedClusterGroup
-	(*L4WeightedDestinationCluster)(nil),   // 12: hashicorp.consul.mesh.v2beta1.pbproxystate.L4WeightedDestinationCluster
-	(*L7WeightedDestinationCluster)(nil),   // 13: hashicorp.consul.mesh.v2beta1.pbproxystate.L7WeightedDestinationCluster
-	(*DynamicEndpointGroupConfig)(nil),     // 14: hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroupConfig
-	(*LBPolicyLeastRequest)(nil),           // 15: hashicorp.consul.mesh.v2beta1.pbproxystate.LBPolicyLeastRequest
-	(*LBPolicyRoundRobin)(nil),             // 16: hashicorp.consul.mesh.v2beta1.pbproxystate.LBPolicyRoundRobin
-	(*LBPolicyRandom)(nil),                 // 17: hashicorp.consul.mesh.v2beta1.pbproxystate.LBPolicyRandom
-	(*LBPolicyRingHash)(nil),               // 18: hashicorp.consul.mesh.v2beta1.pbproxystate.LBPolicyRingHash
-	(*LBPolicyMaglev)(nil),                 // 19: hashicorp.consul.mesh.v2beta1.pbproxystate.LBPolicyMaglev
-	(*CircuitBreakers)(nil),                // 20: hashicorp.consul.mesh.v2beta1.pbproxystate.CircuitBreakers
-	(*UpstreamLimits)(nil),                 // 21: hashicorp.consul.mesh.v2beta1.pbproxystate.UpstreamLimits
-	(*OutlierDetection)(nil),               // 22: hashicorp.consul.mesh.v2beta1.pbproxystate.OutlierDetection
-	(*UpstreamConnectionOptions)(nil),      // 23: hashicorp.consul.mesh.v2beta1.pbproxystate.UpstreamConnectionOptions
-	(*PassthroughEndpointGroupConfig)(nil), // 24: hashicorp.consul.mesh.v2beta1.pbproxystate.PassthroughEndpointGroupConfig
-	(*DNSEndpointGroupConfig)(nil),         // 25: hashicorp.consul.mesh.v2beta1.pbproxystate.DNSEndpointGroupConfig
-	(*StaticEndpointGroupConfig)(nil),      // 26: hashicorp.consul.mesh.v2beta1.pbproxystate.StaticEndpointGroupConfig
-	(*durationpb.Duration)(nil),            // 27: google.protobuf.Duration
-	(*TransportSocket)(nil),                // 28: hashicorp.consul.mesh.v2beta1.pbproxystate.TransportSocket
-	(*wrapperspb.UInt32Value)(nil),         // 29: google.protobuf.UInt32Value
-	(*HeaderMutation)(nil),                 // 30: hashicorp.consul.mesh.v2beta1.pbproxystate.HeaderMutation
-	(*wrapperspb.UInt64Value)(nil),         // 31: google.protobuf.UInt64Value
-}
-var file_pbmesh_v2beta1_pbproxystate_cluster_proto_depIdxs = []int32{
-	2,  // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.Cluster.failover_group:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.FailoverGroup
-	4,  // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.Cluster.endpoint_group:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.EndpointGroup
-	4,  // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.FailoverGroup.endpoint_groups:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.EndpointGroup
-	3,  // 3: hashicorp.consul.mesh.v2beta1.pbproxystate.FailoverGroup.config:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.FailoverGroupConfig
-	27, // 4: hashicorp.consul.mesh.v2beta1.pbproxystate.FailoverGroupConfig.connect_timeout:type_name -> google.protobuf.Duration
-	5,  // 5: hashicorp.consul.mesh.v2beta1.pbproxystate.EndpointGroup.dynamic:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroup
-	8,  // 6: hashicorp.consul.mesh.v2beta1.pbproxystate.EndpointGroup.static:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.StaticEndpointGroup
-	7,  // 7: hashicorp.consul.mesh.v2beta1.pbproxystate.EndpointGroup.dns:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.DNSEndpointGroup
-	6,  // 8: hashicorp.consul.mesh.v2beta1.pbproxystate.EndpointGroup.passthrough:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.PassthroughEndpointGroup
-	14, // 9: hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroup.config:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroupConfig
-	28, // 10: hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroup.outbound_tls:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TransportSocket
-	24, // 11: hashicorp.consul.mesh.v2beta1.pbproxystate.PassthroughEndpointGroup.config:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.PassthroughEndpointGroupConfig
-	28, // 12: hashicorp.consul.mesh.v2beta1.pbproxystate.PassthroughEndpointGroup.outbound_tls:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TransportSocket
-	25, // 13: hashicorp.consul.mesh.v2beta1.pbproxystate.DNSEndpointGroup.config:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.DNSEndpointGroupConfig
-	28, // 14: hashicorp.consul.mesh.v2beta1.pbproxystate.DNSEndpointGroup.outbound_tls:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TransportSocket
-	26, // 15: hashicorp.consul.mesh.v2beta1.pbproxystate.StaticEndpointGroup.config:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.StaticEndpointGroupConfig
-	12, // 16: hashicorp.consul.mesh.v2beta1.pbproxystate.L4WeightedClusterGroup.clusters:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.L4WeightedDestinationCluster
-	13, // 17: hashicorp.consul.mesh.v2beta1.pbproxystate.L7WeightedClusterGroup.clusters:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.L7WeightedDestinationCluster
-	29, // 18: hashicorp.consul.mesh.v2beta1.pbproxystate.L4WeightedDestinationCluster.weight:type_name -> google.protobuf.UInt32Value
-	29, // 19: hashicorp.consul.mesh.v2beta1.pbproxystate.L7WeightedDestinationCluster.weight:type_name -> google.protobuf.UInt32Value
-	30, // 20: hashicorp.consul.mesh.v2beta1.pbproxystate.L7WeightedDestinationCluster.header_mutations:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.HeaderMutation
-	27, // 21: hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroupConfig.connect_timeout:type_name -> google.protobuf.Duration
-	15, // 22: hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroupConfig.least_request:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.LBPolicyLeastRequest
-	16, // 23: hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroupConfig.round_robin:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.LBPolicyRoundRobin
-	17, // 24: hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroupConfig.random:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.LBPolicyRandom
-	18, // 25: hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroupConfig.ring_hash:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.LBPolicyRingHash
-	19, // 26: hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroupConfig.maglev:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.LBPolicyMaglev
-	20, // 27: hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroupConfig.circuit_breakers:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.CircuitBreakers
-	22, // 28: hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroupConfig.outlier_detection:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.OutlierDetection
-	23, // 29: hashicorp.consul.mesh.v2beta1.pbproxystate.DynamicEndpointGroupConfig.upstream_connection_options:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.UpstreamConnectionOptions
-	29, // 30: hashicorp.consul.mesh.v2beta1.pbproxystate.LBPolicyLeastRequest.choice_count:type_name -> google.protobuf.UInt32Value
-	31, // 31: hashicorp.consul.mesh.v2beta1.pbproxystate.LBPolicyRingHash.minimum_ring_size:type_name -> google.protobuf.UInt64Value
-	31, // 32: hashicorp.consul.mesh.v2beta1.pbproxystate.LBPolicyRingHash.maximum_ring_size:type_name -> google.protobuf.UInt64Value
-	21, // 33: hashicorp.consul.mesh.v2beta1.pbproxystate.CircuitBreakers.upstream_limits:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.UpstreamLimits
-	29, // 34: hashicorp.consul.mesh.v2beta1.pbproxystate.UpstreamLimits.max_connections:type_name -> google.protobuf.UInt32Value
-	29, // 35: hashicorp.consul.mesh.v2beta1.pbproxystate.UpstreamLimits.max_pending_requests:type_name -> google.protobuf.UInt32Value
-	29, // 36: hashicorp.consul.mesh.v2beta1.pbproxystate.UpstreamLimits.max_concurrent_requests:type_name -> google.protobuf.UInt32Value
-	27, // 37: hashicorp.consul.mesh.v2beta1.pbproxystate.OutlierDetection.interval:type_name -> google.protobuf.Duration
-	29, // 38: hashicorp.consul.mesh.v2beta1.pbproxystate.OutlierDetection.consecutive_5xx:type_name -> google.protobuf.UInt32Value
-	29, // 39: hashicorp.consul.mesh.v2beta1.pbproxystate.OutlierDetection.enforcing_consecutive_5xx:type_name -> google.protobuf.UInt32Value
-	29, // 40: hashicorp.consul.mesh.v2beta1.pbproxystate.OutlierDetection.max_ejection_percent:type_name -> google.protobuf.UInt32Value
-	27, // 41: hashicorp.consul.mesh.v2beta1.pbproxystate.OutlierDetection.base_ejection_time:type_name -> google.protobuf.Duration
-	29, // 42: hashicorp.consul.mesh.v2beta1.pbproxystate.UpstreamConnectionOptions.tcp_keepalive_time:type_name -> google.protobuf.UInt32Value
-	29, // 43: hashicorp.consul.mesh.v2beta1.pbproxystate.UpstreamConnectionOptions.tcp_keepalive_interval:type_name -> google.protobuf.UInt32Value
-	29, // 44: hashicorp.consul.mesh.v2beta1.pbproxystate.UpstreamConnectionOptions.tcp_keepalive_probes:type_name -> google.protobuf.UInt32Value
-	27, // 45: hashicorp.consul.mesh.v2beta1.pbproxystate.PassthroughEndpointGroupConfig.connect_timeout:type_name -> google.protobuf.Duration
-	27, // 46: hashicorp.consul.mesh.v2beta1.pbproxystate.DNSEndpointGroupConfig.connect_timeout:type_name -> google.protobuf.Duration
-	0,  // 47: hashicorp.consul.mesh.v2beta1.pbproxystate.DNSEndpointGroupConfig.discovery_type:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.DiscoveryType
-	20, // 48: hashicorp.consul.mesh.v2beta1.pbproxystate.DNSEndpointGroupConfig.circuit_breakers:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.CircuitBreakers
-	22, // 49: hashicorp.consul.mesh.v2beta1.pbproxystate.DNSEndpointGroupConfig.outlier_detection:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.OutlierDetection
-	23, // 50: hashicorp.consul.mesh.v2beta1.pbproxystate.DNSEndpointGroupConfig.upstream_connection_options:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.UpstreamConnectionOptions
-	27, // 51: hashicorp.consul.mesh.v2beta1.pbproxystate.StaticEndpointGroupConfig.connect_timeout:type_name -> google.protobuf.Duration
-	20, // 52: hashicorp.consul.mesh.v2beta1.pbproxystate.StaticEndpointGroupConfig.circuit_breakers:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.CircuitBreakers
-	53, // [53:53] is the sub-list for method output_type
-	53, // [53:53] is the sub-list for method input_type
-	53, // [53:53] is the sub-list for extension type_name
-	53, // [53:53] is the sub-list for extension extendee
-	0,  // [0:53] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_pbproxystate_cluster_proto_init() }
-func file_pbmesh_v2beta1_pbproxystate_cluster_proto_init() {
-	if File_pbmesh_v2beta1_pbproxystate_cluster_proto != nil {
-		return
-	}
-	file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_init()
-	file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Cluster); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FailoverGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FailoverGroupConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EndpointGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DynamicEndpointGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PassthroughEndpointGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DNSEndpointGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*StaticEndpointGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DestinationCluster); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*L4WeightedClusterGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*L7WeightedClusterGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*L4WeightedDestinationCluster); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*L7WeightedDestinationCluster); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DynamicEndpointGroupConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LBPolicyLeastRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LBPolicyRoundRobin); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LBPolicyRandom); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LBPolicyRingHash); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LBPolicyMaglev); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CircuitBreakers); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UpstreamLimits); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OutlierDetection); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UpstreamConnectionOptions); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PassthroughEndpointGroupConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DNSEndpointGroupConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*StaticEndpointGroupConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[0].OneofWrappers = []interface{}{
-		(*Cluster_FailoverGroup)(nil),
-		(*Cluster_EndpointGroup)(nil),
-	}
-	file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[3].OneofWrappers = []interface{}{
-		(*EndpointGroup_Dynamic)(nil),
-		(*EndpointGroup_Static)(nil),
-		(*EndpointGroup_Dns)(nil),
-		(*EndpointGroup_Passthrough)(nil),
-	}
-	file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes[13].OneofWrappers = []interface{}{
-		(*DynamicEndpointGroupConfig_LeastRequest)(nil),
-		(*DynamicEndpointGroupConfig_RoundRobin)(nil),
-		(*DynamicEndpointGroupConfig_Random)(nil),
-		(*DynamicEndpointGroupConfig_RingHash)(nil),
-		(*DynamicEndpointGroupConfig_Maglev)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   26,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_pbproxystate_cluster_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_pbproxystate_cluster_proto_depIdxs,
-		EnumInfos:         file_pbmesh_v2beta1_pbproxystate_cluster_proto_enumTypes,
-		MessageInfos:      file_pbmesh_v2beta1_pbproxystate_cluster_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_pbproxystate_cluster_proto = out.File
-	file_pbmesh_v2beta1_pbproxystate_cluster_proto_rawDesc = nil
-	file_pbmesh_v2beta1_pbproxystate_cluster_proto_goTypes = nil
-	file_pbmesh_v2beta1_pbproxystate_cluster_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/cluster.proto b/proto-public/pbmesh/v2beta1/pbproxystate/cluster.proto
deleted file mode 100644
index af31e583e3b44..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/cluster.proto
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1.pbproxystate;
-
-import "google/protobuf/duration.proto";
-import "google/protobuf/wrappers.proto";
-import "pbmesh/v2beta1/pbproxystate/header_mutations.proto";
-import "pbmesh/v2beta1/pbproxystate/transport_socket.proto";
-
-message Cluster {
-  // name is the name of the cluster.
-  string name = 1;
-  // group is either a failover group or endpoint group. If this cluster needs to failover to other clusters, use the failover group. If this cluster routes directly to endpoints, use the endpoint group.
-  oneof group {
-    FailoverGroup failover_group = 2;
-    EndpointGroup endpoint_group = 3;
-  }
-  // escape_hatch_cluster_json configures a user configured escape hatch cluster.
-  string escape_hatch_cluster_json = 4;
-  // alt_stat_name is the name used for observability in place of cluster name if provided.
-  string alt_stat_name = 5;
-  // protocol is the local path protocol or the service protocol.
-  string protocol = 6;
-}
-
-message FailoverGroup {
-  // endpoint_groups is an ordered list of which groups to failover to.
-  repeated EndpointGroup endpoint_groups = 1;
-  FailoverGroupConfig config = 2;
-}
-
-message FailoverGroupConfig {
-  bool use_alt_stat_name = 1;
-  google.protobuf.Duration connect_timeout = 2;
-}
-
-message EndpointGroup {
-  // name is used to name the cluster created. This is only required when used inside of a FailoverGroup.
-  string name = 5;
-  oneof group {
-    // dynamic endpoint group is used to reach mesh destinations that are dynamically configured from Consul's catalog.
-    DynamicEndpointGroup dynamic = 1;
-    // static endpoint group is used to reach local app ports.
-    StaticEndpointGroup static = 2;
-    // dns is used to reach mesh and non-mesh destinations using a hostname.
-    DNSEndpointGroup dns = 3;
-    // passthrough is used to reach destinations that don't have endpoints saved in Consul.
-    PassthroughEndpointGroup passthrough = 4;
-  }
-}
-
-message DynamicEndpointGroup {
-  // config configures how to connect to the endpoints.
-  DynamicEndpointGroupConfig config = 1;
-  // outbound_tls will configure what TLS information to use when connecting to an upstream.
-  TransportSocket outbound_tls = 2;
-}
-
-message PassthroughEndpointGroup {
-  // config configures how to connect to the endpoints.
-  PassthroughEndpointGroupConfig config = 1;
-  // outbound_tls will configure what TLS information to use when connecting to an upstream.
-  TransportSocket outbound_tls = 2;
-}
-
-message DNSEndpointGroup {
-  // config configures how to connect to the endpoints.
-  DNSEndpointGroupConfig config = 1;
-  // outbound_tls will configure what TLS information to use when connecting to an upstream.
-  TransportSocket outbound_tls = 2;
-}
-
-// StaticEndpointGroup is used to reach local app ports.
-message StaticEndpointGroup {
-  // config configures how to connect to the endpoints.
-  StaticEndpointGroupConfig config = 1;
-}
-
-message DestinationCluster {
-  // name is the name of the cluster. This will be used to look up a cluster in the clusters map.
-  string name = 1;
-}
-
-message L4WeightedClusterGroup {
-  // clusters to route to by weight.
-  repeated L4WeightedDestinationCluster clusters = 1;
-}
-
-message L7WeightedClusterGroup {
-  // clusters to route to by weight.
-  repeated L7WeightedDestinationCluster clusters = 1;
-}
-
-message L4WeightedDestinationCluster {
-  // name is the name of the cluster. This will be used to look up a cluster in the clusters map.
-  string name = 1;
-  google.protobuf.UInt32Value weight = 2;
-}
-
-message L7WeightedDestinationCluster {
-  // name is the name of the cluster. This will be used to look up a cluster in the clusters map.
-  string name = 1;
-  google.protobuf.UInt32Value weight = 2;
-  repeated HeaderMutation header_mutations = 3;
-}
-
-message DynamicEndpointGroupConfig {
-  google.protobuf.Duration connect_timeout = 1;
-  bool disable_panic_threshold = 2;
-  oneof lb_policy {
-    LBPolicyLeastRequest least_request = 3;
-    LBPolicyRoundRobin round_robin = 4;
-    LBPolicyRandom random = 5;
-    LBPolicyRingHash ring_hash = 6;
-    LBPolicyMaglev maglev = 7;
-  }
-  CircuitBreakers circuit_breakers = 8;
-  OutlierDetection outlier_detection = 9;
-  UpstreamConnectionOptions upstream_connection_options = 10;
-  bool use_alt_stat_name = 11;
-}
-
-message LBPolicyLeastRequest {
-  google.protobuf.UInt32Value choice_count = 1;
-}
-message LBPolicyRoundRobin {}
-
-message LBPolicyRandom {}
-
-message LBPolicyRingHash {
-  google.protobuf.UInt64Value minimum_ring_size = 1;
-  google.protobuf.UInt64Value maximum_ring_size = 2;
-}
-
-message LBPolicyMaglev {}
-
-message CircuitBreakers {
-  UpstreamLimits upstream_limits = 1;
-}
-
-message UpstreamLimits {
-  google.protobuf.UInt32Value max_connections = 1;
-  google.protobuf.UInt32Value max_pending_requests = 2;
-  google.protobuf.UInt32Value max_concurrent_requests = 3;
-}
-
-message OutlierDetection {
-  google.protobuf.Duration interval = 1;
-  google.protobuf.UInt32Value consecutive_5xx = 2;
-  google.protobuf.UInt32Value enforcing_consecutive_5xx = 3;
-  google.protobuf.UInt32Value max_ejection_percent = 4;
-  google.protobuf.Duration base_ejection_time = 5;
-}
-
-message UpstreamConnectionOptions {
-  google.protobuf.UInt32Value tcp_keepalive_time = 1;
-  google.protobuf.UInt32Value tcp_keepalive_interval = 2;
-  google.protobuf.UInt32Value tcp_keepalive_probes = 3;
-}
-
-message PassthroughEndpointGroupConfig {
-  google.protobuf.Duration connect_timeout = 1;
-}
-
-message DNSEndpointGroupConfig {
-  google.protobuf.Duration connect_timeout = 1;
-  bool disable_panic_threshold = 2;
-  DiscoveryType discovery_type = 3;
-  CircuitBreakers circuit_breakers = 4;
-  OutlierDetection outlier_detection = 5;
-  UpstreamConnectionOptions upstream_connection_options = 6;
-  bool use_alt_stat_name = 7;
-}
-
-enum DiscoveryType {
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  DISCOVERY_TYPE_LOGICAL = 0;
-  DISCOVERY_TYPE_STRICT = 1;
-}
-
-message StaticEndpointGroupConfig {
-  google.protobuf.Duration connect_timeout = 1;
-  CircuitBreakers circuit_breakers = 2;
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/endpoints.pb.binary.go b/proto-public/pbmesh/v2beta1/pbproxystate/endpoints.pb.binary.go
deleted file mode 100644
index 82ab22a39db0f..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/endpoints.pb.binary.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/pbproxystate/endpoints.proto
-
-package pbproxystate
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Endpoints) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Endpoints) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Endpoint) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Endpoint) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/endpoints.pb.go b/proto-public/pbmesh/v2beta1/pbproxystate/endpoints.pb.go
deleted file mode 100644
index 0f08be375f60a..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/endpoints.pb.go
+++ /dev/null
@@ -1,385 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/pbproxystate/endpoints.proto
-
-package pbproxystate
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type HealthStatus int32
-
-const (
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	HealthStatus_HEALTH_STATUS_UNKNOWN   HealthStatus = 0
-	HealthStatus_HEALTH_STATUS_HEALTHY   HealthStatus = 1
-	HealthStatus_HEALTH_STATUS_UNHEALTHY HealthStatus = 2
-)
-
-// Enum value maps for HealthStatus.
-var (
-	HealthStatus_name = map[int32]string{
-		0: "HEALTH_STATUS_UNKNOWN",
-		1: "HEALTH_STATUS_HEALTHY",
-		2: "HEALTH_STATUS_UNHEALTHY",
-	}
-	HealthStatus_value = map[string]int32{
-		"HEALTH_STATUS_UNKNOWN":   0,
-		"HEALTH_STATUS_HEALTHY":   1,
-		"HEALTH_STATUS_UNHEALTHY": 2,
-	}
-)
-
-func (x HealthStatus) Enum() *HealthStatus {
-	p := new(HealthStatus)
-	*p = x
-	return p
-}
-
-func (x HealthStatus) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (HealthStatus) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_pbproxystate_endpoints_proto_enumTypes[0].Descriptor()
-}
-
-func (HealthStatus) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_pbproxystate_endpoints_proto_enumTypes[0]
-}
-
-func (x HealthStatus) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use HealthStatus.Descriptor instead.
-func (HealthStatus) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_endpoints_proto_rawDescGZIP(), []int{0}
-}
-
-type Endpoints struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Endpoints []*Endpoint `protobuf:"bytes,1,rep,name=endpoints,proto3" json:"endpoints,omitempty"`
-}
-
-func (x *Endpoints) Reset() {
-	*x = Endpoints{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_endpoints_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Endpoints) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Endpoints) ProtoMessage() {}
-
-func (x *Endpoints) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_endpoints_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Endpoints.ProtoReflect.Descriptor instead.
-func (*Endpoints) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_endpoints_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Endpoints) GetEndpoints() []*Endpoint {
-	if x != nil {
-		return x.Endpoints
-	}
-	return nil
-}
-
-type Endpoint struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to Address:
-	//
-	//	*Endpoint_HostPort
-	//	*Endpoint_UnixSocket
-	Address             isEndpoint_Address      `protobuf_oneof:"address"`
-	HealthStatus        HealthStatus            `protobuf:"varint,3,opt,name=health_status,json=healthStatus,proto3,enum=hashicorp.consul.mesh.v2beta1.pbproxystate.HealthStatus" json:"health_status,omitempty"`
-	LoadBalancingWeight *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"`
-}
-
-func (x *Endpoint) Reset() {
-	*x = Endpoint{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_endpoints_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Endpoint) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Endpoint) ProtoMessage() {}
-
-func (x *Endpoint) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_endpoints_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Endpoint.ProtoReflect.Descriptor instead.
-func (*Endpoint) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_endpoints_proto_rawDescGZIP(), []int{1}
-}
-
-func (m *Endpoint) GetAddress() isEndpoint_Address {
-	if m != nil {
-		return m.Address
-	}
-	return nil
-}
-
-func (x *Endpoint) GetHostPort() *HostPortAddress {
-	if x, ok := x.GetAddress().(*Endpoint_HostPort); ok {
-		return x.HostPort
-	}
-	return nil
-}
-
-func (x *Endpoint) GetUnixSocket() *UnixSocketAddress {
-	if x, ok := x.GetAddress().(*Endpoint_UnixSocket); ok {
-		return x.UnixSocket
-	}
-	return nil
-}
-
-func (x *Endpoint) GetHealthStatus() HealthStatus {
-	if x != nil {
-		return x.HealthStatus
-	}
-	return HealthStatus_HEALTH_STATUS_UNKNOWN
-}
-
-func (x *Endpoint) GetLoadBalancingWeight() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.LoadBalancingWeight
-	}
-	return nil
-}
-
-type isEndpoint_Address interface {
-	isEndpoint_Address()
-}
-
-type Endpoint_HostPort struct {
-	HostPort *HostPortAddress `protobuf:"bytes,1,opt,name=host_port,json=hostPort,proto3,oneof"`
-}
-
-type Endpoint_UnixSocket struct {
-	UnixSocket *UnixSocketAddress `protobuf:"bytes,2,opt,name=unix_socket,json=unixSocket,proto3,oneof"`
-}
-
-func (*Endpoint_HostPort) isEndpoint_Address() {}
-
-func (*Endpoint_UnixSocket) isEndpoint_Address() {}
-
-var File_pbmesh_v2beta1_pbproxystate_endpoints_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_pbproxystate_endpoints_proto_rawDesc = []byte{
-	0x0a, 0x2b, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x65, 0x6e,
-	0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x2a, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70,
-	0x65, 0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x29, 0x70, 0x62, 0x6d, 0x65, 0x73,
-	0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5f, 0x0a, 0x09, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74,
-	0x73, 0x12, 0x52, 0x0a, 0x09, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74,
-	0x65, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x09, 0x65, 0x6e, 0x64, 0x70,
-	0x6f, 0x69, 0x6e, 0x74, 0x73, 0x22, 0x84, 0x03, 0x0a, 0x08, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x12, 0x5a, 0x0a, 0x09, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x6f, 0x72, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x48, 0x00, 0x52, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x60,
-	0x0a, 0x0b, 0x75, 0x6e, 0x69, 0x78, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x2e, 0x55, 0x6e, 0x69, 0x78, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x48, 0x00, 0x52, 0x0a, 0x75, 0x6e, 0x69, 0x78, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x12, 0x5d, 0x0a, 0x0d, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x52, 0x0c, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12,
-	0x50, 0x0a, 0x15, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e,
-	0x67, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x13, 0x6c, 0x6f,
-	0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x57, 0x65, 0x69, 0x67, 0x68,
-	0x74, 0x42, 0x09, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2a, 0x61, 0x0a, 0x0c,
-	0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x19, 0x0a, 0x15,
-	0x48, 0x45, 0x41, 0x4c, 0x54, 0x48, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e,
-	0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x48, 0x45, 0x41, 0x4c, 0x54,
-	0x48, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x48, 0x45, 0x41, 0x4c, 0x54, 0x48, 0x59,
-	0x10, 0x01, 0x12, 0x1b, 0x0a, 0x17, 0x48, 0x45, 0x41, 0x4c, 0x54, 0x48, 0x5f, 0x53, 0x54, 0x41,
-	0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x48, 0x45, 0x41, 0x4c, 0x54, 0x48, 0x59, 0x10, 0x02, 0x42,
-	0xd4, 0x02, 0x0a, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x42, 0x0e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70,
-	0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xa2, 0x02, 0x05, 0x48, 0x43, 0x4d,
-	0x56, 0x50, 0xaa, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xca,
-	0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c,
-	0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xe2, 0x02, 0x36, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c,
-	0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74,
-	0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a,
-	0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3a, 0x3a, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_pbproxystate_endpoints_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_pbproxystate_endpoints_proto_rawDescData = file_pbmesh_v2beta1_pbproxystate_endpoints_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_pbproxystate_endpoints_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_pbproxystate_endpoints_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_pbproxystate_endpoints_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_pbproxystate_endpoints_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_pbproxystate_endpoints_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_pbproxystate_endpoints_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbmesh_v2beta1_pbproxystate_endpoints_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_pbmesh_v2beta1_pbproxystate_endpoints_proto_goTypes = []interface{}{
-	(HealthStatus)(0),              // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.HealthStatus
-	(*Endpoints)(nil),              // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.Endpoints
-	(*Endpoint)(nil),               // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.Endpoint
-	(*HostPortAddress)(nil),        // 3: hashicorp.consul.mesh.v2beta1.pbproxystate.HostPortAddress
-	(*UnixSocketAddress)(nil),      // 4: hashicorp.consul.mesh.v2beta1.pbproxystate.UnixSocketAddress
-	(*wrapperspb.UInt32Value)(nil), // 5: google.protobuf.UInt32Value
-}
-var file_pbmesh_v2beta1_pbproxystate_endpoints_proto_depIdxs = []int32{
-	2, // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.Endpoints.endpoints:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Endpoint
-	3, // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.Endpoint.host_port:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.HostPortAddress
-	4, // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.Endpoint.unix_socket:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.UnixSocketAddress
-	0, // 3: hashicorp.consul.mesh.v2beta1.pbproxystate.Endpoint.health_status:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.HealthStatus
-	5, // 4: hashicorp.consul.mesh.v2beta1.pbproxystate.Endpoint.load_balancing_weight:type_name -> google.protobuf.UInt32Value
-	5, // [5:5] is the sub-list for method output_type
-	5, // [5:5] is the sub-list for method input_type
-	5, // [5:5] is the sub-list for extension type_name
-	5, // [5:5] is the sub-list for extension extendee
-	0, // [0:5] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_pbproxystate_endpoints_proto_init() }
-func file_pbmesh_v2beta1_pbproxystate_endpoints_proto_init() {
-	if File_pbmesh_v2beta1_pbproxystate_endpoints_proto != nil {
-		return
-	}
-	file_pbmesh_v2beta1_pbproxystate_address_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_pbproxystate_endpoints_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Endpoints); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_endpoints_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Endpoint); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbmesh_v2beta1_pbproxystate_endpoints_proto_msgTypes[1].OneofWrappers = []interface{}{
-		(*Endpoint_HostPort)(nil),
-		(*Endpoint_UnixSocket)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_pbproxystate_endpoints_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_pbproxystate_endpoints_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_pbproxystate_endpoints_proto_depIdxs,
-		EnumInfos:         file_pbmesh_v2beta1_pbproxystate_endpoints_proto_enumTypes,
-		MessageInfos:      file_pbmesh_v2beta1_pbproxystate_endpoints_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_pbproxystate_endpoints_proto = out.File
-	file_pbmesh_v2beta1_pbproxystate_endpoints_proto_rawDesc = nil
-	file_pbmesh_v2beta1_pbproxystate_endpoints_proto_goTypes = nil
-	file_pbmesh_v2beta1_pbproxystate_endpoints_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/endpoints.proto b/proto-public/pbmesh/v2beta1/pbproxystate/endpoints.proto
deleted file mode 100644
index 44a68efed1704..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/endpoints.proto
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1.pbproxystate;
-
-import "google/protobuf/wrappers.proto";
-import "pbmesh/v2beta1/pbproxystate/address.proto";
-
-message Endpoints {
-  repeated Endpoint endpoints = 1;
-}
-
-message Endpoint {
-  oneof address {
-    HostPortAddress host_port = 1;
-    UnixSocketAddress unix_socket = 2;
-  }
-  HealthStatus health_status = 3;
-  google.protobuf.UInt32Value load_balancing_weight = 4;
-}
-
-enum HealthStatus {
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  HEALTH_STATUS_UNKNOWN = 0;
-  HEALTH_STATUS_HEALTHY = 1;
-  HEALTH_STATUS_UNHEALTHY = 2;
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/escape_hatches.pb.binary.go b/proto-public/pbmesh/v2beta1/pbproxystate/escape_hatches.pb.binary.go
deleted file mode 100644
index e266a07be25dc..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/escape_hatches.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/pbproxystate/escape_hatches.proto
-
-package pbproxystate
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *EscapeHatches) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *EscapeHatches) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/escape_hatches.pb.go b/proto-public/pbmesh/v2beta1/pbproxystate/escape_hatches.pb.go
deleted file mode 100644
index 91e549564ced1..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/escape_hatches.pb.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/pbproxystate/escape_hatches.proto
-
-package pbproxystate
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type EscapeHatches struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// listener_tracing_json contains user provided tracing configuration.
-	ListenerTracingJson string `protobuf:"bytes,1,opt,name=listener_tracing_json,json=listenerTracingJson,proto3" json:"listener_tracing_json,omitempty"`
-}
-
-func (x *EscapeHatches) Reset() {
-	*x = EscapeHatches{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EscapeHatches) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EscapeHatches) ProtoMessage() {}
-
-func (x *EscapeHatches) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EscapeHatches.ProtoReflect.Descriptor instead.
-func (*EscapeHatches) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *EscapeHatches) GetListenerTracingJson() string {
-	if x != nil {
-		return x.ListenerTracingJson
-	}
-	return ""
-}
-
-var File_pbmesh_v2beta1_pbproxystate_escape_hatches_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_rawDesc = []byte{
-	0x0a, 0x30, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x65, 0x73,
-	0x63, 0x61, 0x70, 0x65, 0x5f, 0x68, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x12, 0x2a, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x43,
-	0x0a, 0x0d, 0x45, 0x73, 0x63, 0x61, 0x70, 0x65, 0x48, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x12,
-	0x32, 0x0a, 0x15, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x61, 0x63,
-	0x69, 0x6e, 0x67, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13,
-	0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x4a,
-	0x73, 0x6f, 0x6e, 0x42, 0xd8, 0x02, 0x0a, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x42, 0x12, 0x45, 0x73, 0x63, 0x61, 0x70, 0x65, 0x48, 0x61,
-	0x74, 0x63, 0x68, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d,
-	0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0xa2, 0x02, 0x05, 0x48, 0x43, 0x4d, 0x56, 0x50, 0xaa, 0x02, 0x2a, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65,
-	0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x62, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xca, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c,
-	0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0xe2, 0x02, 0x36, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74,
-	0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x2e,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x3a, 0x3a, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_rawDescData = file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_goTypes = []interface{}{
-	(*EscapeHatches)(nil), // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.EscapeHatches
-}
-var file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_init() }
-func file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_init() {
-	if File_pbmesh_v2beta1_pbproxystate_escape_hatches_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EscapeHatches); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_pbproxystate_escape_hatches_proto = out.File
-	file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_rawDesc = nil
-	file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_goTypes = nil
-	file_pbmesh_v2beta1_pbproxystate_escape_hatches_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/escape_hatches.proto b/proto-public/pbmesh/v2beta1/pbproxystate/escape_hatches.proto
deleted file mode 100644
index 566fc4f06bf6a..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/escape_hatches.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1.pbproxystate;
-
-message EscapeHatches {
-  // listener_tracing_json contains user provided tracing configuration.
-  string listener_tracing_json = 1;
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/header_mutations.pb.binary.go b/proto-public/pbmesh/v2beta1/pbproxystate/header_mutations.pb.binary.go
deleted file mode 100644
index 35b0b8969eaf0..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/header_mutations.pb.binary.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/pbproxystate/header_mutations.proto
-
-package pbproxystate
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HeaderMutation) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HeaderMutation) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *RequestHeaderAdd) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *RequestHeaderAdd) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *RequestHeaderRemove) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *RequestHeaderRemove) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ResponseHeaderAdd) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ResponseHeaderAdd) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ResponseHeaderRemove) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ResponseHeaderRemove) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Header) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Header) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/header_mutations.pb.go b/proto-public/pbmesh/v2beta1/pbproxystate/header_mutations.pb.go
deleted file mode 100644
index 440ea5647261e..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/header_mutations.pb.go
+++ /dev/null
@@ -1,692 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/pbproxystate/header_mutations.proto
-
-package pbproxystate
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type AppendAction int32
-
-const (
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	AppendAction_APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD    AppendAction = 0
-	AppendAction_APPEND_ACTION_OVERWRITE_IF_EXISTS_OR_ADD AppendAction = 1
-)
-
-// Enum value maps for AppendAction.
-var (
-	AppendAction_name = map[int32]string{
-		0: "APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD",
-		1: "APPEND_ACTION_OVERWRITE_IF_EXISTS_OR_ADD",
-	}
-	AppendAction_value = map[string]int32{
-		"APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD":    0,
-		"APPEND_ACTION_OVERWRITE_IF_EXISTS_OR_ADD": 1,
-	}
-)
-
-func (x AppendAction) Enum() *AppendAction {
-	p := new(AppendAction)
-	*p = x
-	return p
-}
-
-func (x AppendAction) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (AppendAction) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_enumTypes[0].Descriptor()
-}
-
-func (AppendAction) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_enumTypes[0]
-}
-
-func (x AppendAction) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use AppendAction.Descriptor instead.
-func (AppendAction) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDescGZIP(), []int{0}
-}
-
-// Note: it's nice to have this list of header mutations as opposed to configuration similar to Envoy because it
-// translates more nicely from GAMMA HTTPRoute, and our existing service router config. Then xds code can handle turning
-// it into envoy xds.
-type HeaderMutation struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to Action:
-	//
-	//	*HeaderMutation_RequestHeaderAdd
-	//	*HeaderMutation_RequestHeaderRemove
-	//	*HeaderMutation_ResponseHeaderAdd
-	//	*HeaderMutation_ResponseHeaderRemove
-	Action isHeaderMutation_Action `protobuf_oneof:"action"`
-}
-
-func (x *HeaderMutation) Reset() {
-	*x = HeaderMutation{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HeaderMutation) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HeaderMutation) ProtoMessage() {}
-
-func (x *HeaderMutation) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HeaderMutation.ProtoReflect.Descriptor instead.
-func (*HeaderMutation) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDescGZIP(), []int{0}
-}
-
-func (m *HeaderMutation) GetAction() isHeaderMutation_Action {
-	if m != nil {
-		return m.Action
-	}
-	return nil
-}
-
-func (x *HeaderMutation) GetRequestHeaderAdd() *RequestHeaderAdd {
-	if x, ok := x.GetAction().(*HeaderMutation_RequestHeaderAdd); ok {
-		return x.RequestHeaderAdd
-	}
-	return nil
-}
-
-func (x *HeaderMutation) GetRequestHeaderRemove() *RequestHeaderRemove {
-	if x, ok := x.GetAction().(*HeaderMutation_RequestHeaderRemove); ok {
-		return x.RequestHeaderRemove
-	}
-	return nil
-}
-
-func (x *HeaderMutation) GetResponseHeaderAdd() *ResponseHeaderAdd {
-	if x, ok := x.GetAction().(*HeaderMutation_ResponseHeaderAdd); ok {
-		return x.ResponseHeaderAdd
-	}
-	return nil
-}
-
-func (x *HeaderMutation) GetResponseHeaderRemove() *ResponseHeaderRemove {
-	if x, ok := x.GetAction().(*HeaderMutation_ResponseHeaderRemove); ok {
-		return x.ResponseHeaderRemove
-	}
-	return nil
-}
-
-type isHeaderMutation_Action interface {
-	isHeaderMutation_Action()
-}
-
-type HeaderMutation_RequestHeaderAdd struct {
-	RequestHeaderAdd *RequestHeaderAdd `protobuf:"bytes,1,opt,name=request_header_add,json=requestHeaderAdd,proto3,oneof"`
-}
-
-type HeaderMutation_RequestHeaderRemove struct {
-	RequestHeaderRemove *RequestHeaderRemove `protobuf:"bytes,2,opt,name=request_header_remove,json=requestHeaderRemove,proto3,oneof"`
-}
-
-type HeaderMutation_ResponseHeaderAdd struct {
-	ResponseHeaderAdd *ResponseHeaderAdd `protobuf:"bytes,3,opt,name=response_header_add,json=responseHeaderAdd,proto3,oneof"`
-}
-
-type HeaderMutation_ResponseHeaderRemove struct {
-	ResponseHeaderRemove *ResponseHeaderRemove `protobuf:"bytes,4,opt,name=response_header_remove,json=responseHeaderRemove,proto3,oneof"`
-}
-
-func (*HeaderMutation_RequestHeaderAdd) isHeaderMutation_Action() {}
-
-func (*HeaderMutation_RequestHeaderRemove) isHeaderMutation_Action() {}
-
-func (*HeaderMutation_ResponseHeaderAdd) isHeaderMutation_Action() {}
-
-func (*HeaderMutation_ResponseHeaderRemove) isHeaderMutation_Action() {}
-
-type RequestHeaderAdd struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Header       *Header      `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"`
-	AppendAction AppendAction `protobuf:"varint,2,opt,name=append_action,json=appendAction,proto3,enum=hashicorp.consul.mesh.v2beta1.pbproxystate.AppendAction" json:"append_action,omitempty"`
-}
-
-func (x *RequestHeaderAdd) Reset() {
-	*x = RequestHeaderAdd{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RequestHeaderAdd) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RequestHeaderAdd) ProtoMessage() {}
-
-func (x *RequestHeaderAdd) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RequestHeaderAdd.ProtoReflect.Descriptor instead.
-func (*RequestHeaderAdd) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *RequestHeaderAdd) GetHeader() *Header {
-	if x != nil {
-		return x.Header
-	}
-	return nil
-}
-
-func (x *RequestHeaderAdd) GetAppendAction() AppendAction {
-	if x != nil {
-		return x.AppendAction
-	}
-	return AppendAction_APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD
-}
-
-type RequestHeaderRemove struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	HeaderKeys []string `protobuf:"bytes,1,rep,name=header_keys,json=headerKeys,proto3" json:"header_keys,omitempty"`
-}
-
-func (x *RequestHeaderRemove) Reset() {
-	*x = RequestHeaderRemove{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RequestHeaderRemove) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RequestHeaderRemove) ProtoMessage() {}
-
-func (x *RequestHeaderRemove) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RequestHeaderRemove.ProtoReflect.Descriptor instead.
-func (*RequestHeaderRemove) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *RequestHeaderRemove) GetHeaderKeys() []string {
-	if x != nil {
-		return x.HeaderKeys
-	}
-	return nil
-}
-
-type ResponseHeaderAdd struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Header       *Header      `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"`
-	AppendAction AppendAction `protobuf:"varint,2,opt,name=append_action,json=appendAction,proto3,enum=hashicorp.consul.mesh.v2beta1.pbproxystate.AppendAction" json:"append_action,omitempty"`
-}
-
-func (x *ResponseHeaderAdd) Reset() {
-	*x = ResponseHeaderAdd{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ResponseHeaderAdd) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ResponseHeaderAdd) ProtoMessage() {}
-
-func (x *ResponseHeaderAdd) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ResponseHeaderAdd.ProtoReflect.Descriptor instead.
-func (*ResponseHeaderAdd) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *ResponseHeaderAdd) GetHeader() *Header {
-	if x != nil {
-		return x.Header
-	}
-	return nil
-}
-
-func (x *ResponseHeaderAdd) GetAppendAction() AppendAction {
-	if x != nil {
-		return x.AppendAction
-	}
-	return AppendAction_APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD
-}
-
-type ResponseHeaderRemove struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	HeaderKeys []string `protobuf:"bytes,1,rep,name=header_keys,json=headerKeys,proto3" json:"header_keys,omitempty"`
-}
-
-func (x *ResponseHeaderRemove) Reset() {
-	*x = ResponseHeaderRemove{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ResponseHeaderRemove) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ResponseHeaderRemove) ProtoMessage() {}
-
-func (x *ResponseHeaderRemove) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ResponseHeaderRemove.ProtoReflect.Descriptor instead.
-func (*ResponseHeaderRemove) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *ResponseHeaderRemove) GetHeaderKeys() []string {
-	if x != nil {
-		return x.HeaderKeys
-	}
-	return nil
-}
-
-type Header struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Key   string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
-	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
-}
-
-func (x *Header) Reset() {
-	*x = Header{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Header) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Header) ProtoMessage() {}
-
-func (x *Header) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Header.ProtoReflect.Descriptor instead.
-func (*Header) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *Header) GetKey() string {
-	if x != nil {
-		return x.Key
-	}
-	return ""
-}
-
-func (x *Header) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-var File_pbmesh_v2beta1_pbproxystate_header_mutations_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDesc = []byte{
-	0x0a, 0x32, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x2a, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x22, 0xea, 0x03, 0x0a, 0x0e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x6c, 0x0a, 0x12, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x3c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x64, 0x64, 0x48, 0x00, 0x52,
-	0x10, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x64,
-	0x64, 0x12, 0x75, 0x0a, 0x15, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x3f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x6d, 0x6f, 0x76,
-	0x65, 0x48, 0x00, 0x52, 0x13, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x6f, 0x0a, 0x13, 0x72, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x41, 0x64, 0x64, 0x48, 0x00, 0x52, 0x11, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x64, 0x64, 0x12, 0x78, 0x0a, 0x16, 0x72, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x72, 0x65, 0x6d,
-	0x6f, 0x76, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x48, 0x00, 0x52, 0x14, 0x72,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x6d,
-	0x6f, 0x76, 0x65, 0x42, 0x08, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xbd, 0x01,
-	0x0a, 0x10, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41,
-	0x64, 0x64, 0x12, 0x4a, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e,
-	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x5d,
-	0x0a, 0x0d, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x0c, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x36, 0x0a,
-	0x13, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65,
-	0x6d, 0x6f, 0x76, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6b,
-	0x65, 0x79, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x4b, 0x65, 0x79, 0x73, 0x22, 0xbe, 0x01, 0x0a, 0x11, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x64, 0x64, 0x12, 0x4a, 0x0a, 0x06, 0x68,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52,
-	0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x5d, 0x0a, 0x0d, 0x61, 0x70, 0x70, 0x65, 0x6e,
-	0x64, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x38,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70,
-	0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x65,
-	0x6e, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64,
-	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x37, 0x0a, 0x14, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x1f,
-	0x0a, 0x0b, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x73, 0x22,
-	0x30, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x2a, 0x67, 0x0a, 0x0c, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x29, 0x0a, 0x25, 0x41, 0x50, 0x50, 0x45, 0x4e, 0x44, 0x5f, 0x41, 0x43, 0x54, 0x49,
-	0x4f, 0x4e, 0x5f, 0x41, 0x50, 0x50, 0x45, 0x4e, 0x44, 0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49,
-	0x53, 0x54, 0x53, 0x5f, 0x4f, 0x52, 0x5f, 0x41, 0x44, 0x44, 0x10, 0x00, 0x12, 0x2c, 0x0a, 0x28,
-	0x41, 0x50, 0x50, 0x45, 0x4e, 0x44, 0x5f, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4f, 0x56,
-	0x45, 0x52, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54,
-	0x53, 0x5f, 0x4f, 0x52, 0x5f, 0x41, 0x44, 0x44, 0x10, 0x01, 0x42, 0xda, 0x02, 0x0a, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x42, 0x14, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f,
-	0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70,
-	0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xa2, 0x02, 0x05, 0x48, 0x43,
-	0x4d, 0x56, 0x50, 0xaa, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0xca, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xe2, 0x02, 0x36,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
-	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68,
-	0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3a, 0x3a, 0x50, 0x62, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDescData = file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
-var file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_goTypes = []interface{}{
-	(AppendAction)(0),            // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.AppendAction
-	(*HeaderMutation)(nil),       // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.HeaderMutation
-	(*RequestHeaderAdd)(nil),     // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.RequestHeaderAdd
-	(*RequestHeaderRemove)(nil),  // 3: hashicorp.consul.mesh.v2beta1.pbproxystate.RequestHeaderRemove
-	(*ResponseHeaderAdd)(nil),    // 4: hashicorp.consul.mesh.v2beta1.pbproxystate.ResponseHeaderAdd
-	(*ResponseHeaderRemove)(nil), // 5: hashicorp.consul.mesh.v2beta1.pbproxystate.ResponseHeaderRemove
-	(*Header)(nil),               // 6: hashicorp.consul.mesh.v2beta1.pbproxystate.Header
-}
-var file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_depIdxs = []int32{
-	2, // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.HeaderMutation.request_header_add:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.RequestHeaderAdd
-	3, // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.HeaderMutation.request_header_remove:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.RequestHeaderRemove
-	4, // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.HeaderMutation.response_header_add:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.ResponseHeaderAdd
-	5, // 3: hashicorp.consul.mesh.v2beta1.pbproxystate.HeaderMutation.response_header_remove:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.ResponseHeaderRemove
-	6, // 4: hashicorp.consul.mesh.v2beta1.pbproxystate.RequestHeaderAdd.header:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Header
-	0, // 5: hashicorp.consul.mesh.v2beta1.pbproxystate.RequestHeaderAdd.append_action:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.AppendAction
-	6, // 6: hashicorp.consul.mesh.v2beta1.pbproxystate.ResponseHeaderAdd.header:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Header
-	0, // 7: hashicorp.consul.mesh.v2beta1.pbproxystate.ResponseHeaderAdd.append_action:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.AppendAction
-	8, // [8:8] is the sub-list for method output_type
-	8, // [8:8] is the sub-list for method input_type
-	8, // [8:8] is the sub-list for extension type_name
-	8, // [8:8] is the sub-list for extension extendee
-	0, // [0:8] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_init() }
-func file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_init() {
-	if File_pbmesh_v2beta1_pbproxystate_header_mutations_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HeaderMutation); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RequestHeaderAdd); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RequestHeaderRemove); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ResponseHeaderAdd); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ResponseHeaderRemove); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Header); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes[0].OneofWrappers = []interface{}{
-		(*HeaderMutation_RequestHeaderAdd)(nil),
-		(*HeaderMutation_RequestHeaderRemove)(nil),
-		(*HeaderMutation_ResponseHeaderAdd)(nil),
-		(*HeaderMutation_ResponseHeaderRemove)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   6,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_depIdxs,
-		EnumInfos:         file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_enumTypes,
-		MessageInfos:      file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_pbproxystate_header_mutations_proto = out.File
-	file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_rawDesc = nil
-	file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_goTypes = nil
-	file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/header_mutations.proto b/proto-public/pbmesh/v2beta1/pbproxystate/header_mutations.proto
deleted file mode 100644
index 913198b254fb1..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/header_mutations.proto
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1.pbproxystate;
-
-// Note: it's nice to have this list of header mutations as opposed to configuration similar to Envoy because it
-// translates more nicely from GAMMA HTTPRoute, and our existing service router config. Then xds code can handle turning
-// it into envoy xds.
-message HeaderMutation {
-  oneof action {
-    RequestHeaderAdd request_header_add = 1;
-    RequestHeaderRemove request_header_remove = 2;
-    ResponseHeaderAdd response_header_add = 3;
-    ResponseHeaderRemove response_header_remove = 4;
-  }
-}
-
-message RequestHeaderAdd {
-  Header header = 1;
-  AppendAction append_action = 2;
-}
-
-message RequestHeaderRemove {
-  repeated string header_keys = 1;
-}
-
-message ResponseHeaderAdd {
-  Header header = 1;
-  AppendAction append_action = 2;
-}
-
-message ResponseHeaderRemove {
-  repeated string header_keys = 1;
-}
-
-message Header {
-  string key = 1;
-  string value = 2;
-}
-
-enum AppendAction {
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  APPEND_ACTION_APPEND_IF_EXISTS_OR_ADD = 0;
-  APPEND_ACTION_OVERWRITE_IF_EXISTS_OR_ADD = 1;
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/intentions.pb.go b/proto-public/pbmesh/v2beta1/pbproxystate/intentions.pb.go
deleted file mode 100644
index 96ca59240fa45..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/intentions.pb.go
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/pbproxystate/intentions.proto
-
-package pbproxystate
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type L7Intention struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *L7Intention) Reset() {
-	*x = L7Intention{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_intentions_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *L7Intention) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*L7Intention) ProtoMessage() {}
-
-func (x *L7Intention) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_intentions_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use L7Intention.ProtoReflect.Descriptor instead.
-func (*L7Intention) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_intentions_proto_rawDescGZIP(), []int{0}
-}
-
-type L4Intention struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *L4Intention) Reset() {
-	*x = L4Intention{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_intentions_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *L4Intention) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*L4Intention) ProtoMessage() {}
-
-func (x *L4Intention) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_intentions_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use L4Intention.ProtoReflect.Descriptor instead.
-func (*L4Intention) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_intentions_proto_rawDescGZIP(), []int{1}
-}
-
-var File_pbmesh_v2beta1_pbproxystate_intentions_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_pbproxystate_intentions_proto_rawDesc = []byte{
-	0x0a, 0x2c, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x69, 0x6e,
-	0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x2a,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x0d, 0x0a, 0x0b, 0x4c, 0x37,
-	0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x0d, 0x0a, 0x0b, 0x4c, 0x34, 0x49,
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0xd5, 0x02, 0x0a, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70,
-	0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x42, 0x0f, 0x49, 0x6e, 0x74,
-	0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0xa2, 0x02, 0x05, 0x48, 0x43, 0x4d, 0x56, 0x50, 0xaa, 0x02, 0x2a, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x62, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xca, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73,
-	0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xe2, 0x02, 0x36, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
-	0x02, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x3a, 0x3a, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_pbproxystate_intentions_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_pbproxystate_intentions_proto_rawDescData = file_pbmesh_v2beta1_pbproxystate_intentions_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_pbproxystate_intentions_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_pbproxystate_intentions_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_pbproxystate_intentions_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_pbproxystate_intentions_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_pbproxystate_intentions_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_pbproxystate_intentions_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_pbmesh_v2beta1_pbproxystate_intentions_proto_goTypes = []interface{}{
-	(*L7Intention)(nil), // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.L7Intention
-	(*L4Intention)(nil), // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.L4Intention
-}
-var file_pbmesh_v2beta1_pbproxystate_intentions_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_pbproxystate_intentions_proto_init() }
-func file_pbmesh_v2beta1_pbproxystate_intentions_proto_init() {
-	if File_pbmesh_v2beta1_pbproxystate_intentions_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_pbproxystate_intentions_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*L7Intention); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_intentions_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*L4Intention); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_pbproxystate_intentions_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_pbproxystate_intentions_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_pbproxystate_intentions_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_pbproxystate_intentions_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_pbproxystate_intentions_proto = out.File
-	file_pbmesh_v2beta1_pbproxystate_intentions_proto_rawDesc = nil
-	file_pbmesh_v2beta1_pbproxystate_intentions_proto_goTypes = nil
-	file_pbmesh_v2beta1_pbproxystate_intentions_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/listener.pb.binary.go b/proto-public/pbmesh/v2beta1/pbproxystate/listener.pb.binary.go
deleted file mode 100644
index 31c05cce5c505..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/listener.pb.binary.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/pbproxystate/listener.proto
-
-package pbproxystate
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Listener) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Listener) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Router) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Router) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Match) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Match) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *CidrRange) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *CidrRange) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *L4Destination) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *L4Destination) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *L7Destination) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *L7Destination) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *SNIDestination) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *SNIDestination) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/listener.pb.go b/proto-public/pbmesh/v2beta1/pbproxystate/listener.pb.go
deleted file mode 100644
index fcee8035010f6..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/listener.pb.go
+++ /dev/null
@@ -1,1316 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/pbproxystate/listener.proto
-
-package pbproxystate
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Direction int32
-
-const (
-	// DIRECTION_UNSPECIFIED is used by mesh gateway listeners.
-	Direction_DIRECTION_UNSPECIFIED Direction = 0
-	Direction_DIRECTION_INBOUND     Direction = 1
-	Direction_DIRECTION_OUTBOUND    Direction = 2
-)
-
-// Enum value maps for Direction.
-var (
-	Direction_name = map[int32]string{
-		0: "DIRECTION_UNSPECIFIED",
-		1: "DIRECTION_INBOUND",
-		2: "DIRECTION_OUTBOUND",
-	}
-	Direction_value = map[string]int32{
-		"DIRECTION_UNSPECIFIED": 0,
-		"DIRECTION_INBOUND":     1,
-		"DIRECTION_OUTBOUND":    2,
-	}
-)
-
-func (x Direction) Enum() *Direction {
-	p := new(Direction)
-	*p = x
-	return p
-}
-
-func (x Direction) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Direction) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_enumTypes[0].Descriptor()
-}
-
-func (Direction) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_pbproxystate_listener_proto_enumTypes[0]
-}
-
-func (x Direction) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Direction.Descriptor instead.
-func (Direction) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescGZIP(), []int{0}
-}
-
-type BalanceConnections int32
-
-const (
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	BalanceConnections_BALANCE_CONNECTIONS_DEFAULT BalanceConnections = 0
-	BalanceConnections_BALANCE_CONNECTIONS_EXACT   BalanceConnections = 1
-)
-
-// Enum value maps for BalanceConnections.
-var (
-	BalanceConnections_name = map[int32]string{
-		0: "BALANCE_CONNECTIONS_DEFAULT",
-		1: "BALANCE_CONNECTIONS_EXACT",
-	}
-	BalanceConnections_value = map[string]int32{
-		"BALANCE_CONNECTIONS_DEFAULT": 0,
-		"BALANCE_CONNECTIONS_EXACT":   1,
-	}
-)
-
-func (x BalanceConnections) Enum() *BalanceConnections {
-	p := new(BalanceConnections)
-	*p = x
-	return p
-}
-
-func (x BalanceConnections) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (BalanceConnections) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_enumTypes[1].Descriptor()
-}
-
-func (BalanceConnections) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_pbproxystate_listener_proto_enumTypes[1]
-}
-
-func (x BalanceConnections) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use BalanceConnections.Descriptor instead.
-func (BalanceConnections) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescGZIP(), []int{1}
-}
-
-// Capabilities map to proxy functionality to enable. These enable tproxy, l7 protocol/alpn inspection, or l4 sni/alpn inspection.
-type Capability int32
-
-const (
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	Capability_CAPABILITY_TRANSPARENT            Capability = 0
-	Capability_CAPABILITY_L7_PROTOCOL_INSPECTION Capability = 1
-	Capability_CAPABILITY_L4_TLS_INSPECTION      Capability = 2
-)
-
-// Enum value maps for Capability.
-var (
-	Capability_name = map[int32]string{
-		0: "CAPABILITY_TRANSPARENT",
-		1: "CAPABILITY_L7_PROTOCOL_INSPECTION",
-		2: "CAPABILITY_L4_TLS_INSPECTION",
-	}
-	Capability_value = map[string]int32{
-		"CAPABILITY_TRANSPARENT":            0,
-		"CAPABILITY_L7_PROTOCOL_INSPECTION": 1,
-		"CAPABILITY_L4_TLS_INSPECTION":      2,
-	}
-)
-
-func (x Capability) Enum() *Capability {
-	p := new(Capability)
-	*p = x
-	return p
-}
-
-func (x Capability) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Capability) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_enumTypes[2].Descriptor()
-}
-
-func (Capability) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_pbproxystate_listener_proto_enumTypes[2]
-}
-
-func (x Capability) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Capability.Descriptor instead.
-func (Capability) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescGZIP(), []int{2}
-}
-
-type L7Protocol int32
-
-const (
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	L7Protocol_L7_PROTOCOL_HTTP  L7Protocol = 0
-	L7Protocol_L7_PROTOCOL_HTTP2 L7Protocol = 1
-	L7Protocol_L7_PROTOCOL_GRPC  L7Protocol = 2
-)
-
-// Enum value maps for L7Protocol.
-var (
-	L7Protocol_name = map[int32]string{
-		0: "L7_PROTOCOL_HTTP",
-		1: "L7_PROTOCOL_HTTP2",
-		2: "L7_PROTOCOL_GRPC",
-	}
-	L7Protocol_value = map[string]int32{
-		"L7_PROTOCOL_HTTP":  0,
-		"L7_PROTOCOL_HTTP2": 1,
-		"L7_PROTOCOL_GRPC":  2,
-	}
-)
-
-func (x L7Protocol) Enum() *L7Protocol {
-	p := new(L7Protocol)
-	*p = x
-	return p
-}
-
-func (x L7Protocol) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (L7Protocol) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_enumTypes[3].Descriptor()
-}
-
-func (L7Protocol) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_pbproxystate_listener_proto_enumTypes[3]
-}
-
-func (x L7Protocol) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use L7Protocol.Descriptor instead.
-func (L7Protocol) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescGZIP(), []int{3}
-}
-
-type Listener struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// name is the name of the listener.
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	// direction tells the listener the direction of traffic.
-	Direction Direction `protobuf:"varint,2,opt,name=direction,proto3,enum=hashicorp.consul.mesh.v2beta1.pbproxystate.Direction" json:"direction,omitempty"`
-	// bind_address describes where to listen.
-	//
-	// Types that are assignable to BindAddress:
-	//
-	//	*Listener_HostPort
-	//	*Listener_UnixSocket
-	BindAddress isListener_BindAddress `protobuf_oneof:"bind_address"`
-	// routers describes how to route traffic from this listener.
-	Routers []*Router `protobuf:"bytes,5,rep,name=routers,proto3" json:"routers,omitempty"`
-	// default_router describes where to route if none of the other router matches match the connection.
-	DefaultRouter *Router `protobuf:"bytes,6,opt,name=default_router,json=defaultRouter,proto3" json:"default_router,omitempty"`
-	// capabilities describe Envoy proxy functionality to enable. These map closely to Envoy listener filters.
-	Capabilities []Capability `protobuf:"varint,7,rep,packed,name=capabilities,proto3,enum=hashicorp.consul.mesh.v2beta1.pbproxystate.Capability" json:"capabilities,omitempty"`
-	// balance_connections configures how the listener should balance connections.
-	BalanceConnections BalanceConnections `protobuf:"varint,8,opt,name=balance_connections,json=balanceConnections,proto3,enum=hashicorp.consul.mesh.v2beta1.pbproxystate.BalanceConnections" json:"balance_connections,omitempty"`
-	// escape_hatch_listener_json configures a user configured escape hatch listener.
-	EscapeHatchListener string `protobuf:"bytes,9,opt,name=escape_hatch_listener,json=escapeHatchListener,proto3" json:"escape_hatch_listener,omitempty"`
-	// use_escape_hatch_tracing configures whether to use the top level user configured tracing escape hatch for this listener.
-	UseEscapeHatchTracing bool `protobuf:"varint,10,opt,name=use_escape_hatch_tracing,json=useEscapeHatchTracing,proto3" json:"use_escape_hatch_tracing,omitempty"`
-}
-
-func (x *Listener) Reset() {
-	*x = Listener{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Listener) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Listener) ProtoMessage() {}
-
-func (x *Listener) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Listener.ProtoReflect.Descriptor instead.
-func (*Listener) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Listener) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *Listener) GetDirection() Direction {
-	if x != nil {
-		return x.Direction
-	}
-	return Direction_DIRECTION_UNSPECIFIED
-}
-
-func (m *Listener) GetBindAddress() isListener_BindAddress {
-	if m != nil {
-		return m.BindAddress
-	}
-	return nil
-}
-
-func (x *Listener) GetHostPort() *HostPortAddress {
-	if x, ok := x.GetBindAddress().(*Listener_HostPort); ok {
-		return x.HostPort
-	}
-	return nil
-}
-
-func (x *Listener) GetUnixSocket() *UnixSocketAddress {
-	if x, ok := x.GetBindAddress().(*Listener_UnixSocket); ok {
-		return x.UnixSocket
-	}
-	return nil
-}
-
-func (x *Listener) GetRouters() []*Router {
-	if x != nil {
-		return x.Routers
-	}
-	return nil
-}
-
-func (x *Listener) GetDefaultRouter() *Router {
-	if x != nil {
-		return x.DefaultRouter
-	}
-	return nil
-}
-
-func (x *Listener) GetCapabilities() []Capability {
-	if x != nil {
-		return x.Capabilities
-	}
-	return nil
-}
-
-func (x *Listener) GetBalanceConnections() BalanceConnections {
-	if x != nil {
-		return x.BalanceConnections
-	}
-	return BalanceConnections_BALANCE_CONNECTIONS_DEFAULT
-}
-
-func (x *Listener) GetEscapeHatchListener() string {
-	if x != nil {
-		return x.EscapeHatchListener
-	}
-	return ""
-}
-
-func (x *Listener) GetUseEscapeHatchTracing() bool {
-	if x != nil {
-		return x.UseEscapeHatchTracing
-	}
-	return false
-}
-
-type isListener_BindAddress interface {
-	isListener_BindAddress()
-}
-
-type Listener_HostPort struct {
-	HostPort *HostPortAddress `protobuf:"bytes,3,opt,name=host_port,json=hostPort,proto3,oneof"`
-}
-
-type Listener_UnixSocket struct {
-	UnixSocket *UnixSocketAddress `protobuf:"bytes,4,opt,name=unix_socket,json=unixSocket,proto3,oneof"`
-}
-
-func (*Listener_HostPort) isListener_BindAddress() {}
-
-func (*Listener_UnixSocket) isListener_BindAddress() {}
-
-type Router struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// match specifies how to match traffic coming into this listener. If the traffic matches, it will be routed to the
-	// destination.
-	Match *Match `protobuf:"bytes,1,opt,name=match,proto3" json:"match,omitempty"`
-	// Types that are assignable to Destination:
-	//
-	//	*Router_L4
-	//	*Router_L7
-	//	*Router_Sni
-	Destination isRouter_Destination `protobuf_oneof:"destination"`
-	// inbound_tls is used by inbound listeners that terminate TLS.
-	InboundTls *TransportSocket `protobuf:"bytes,5,opt,name=inbound_tls,json=inboundTls,proto3" json:"inbound_tls,omitempty"`
-}
-
-func (x *Router) Reset() {
-	*x = Router{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Router) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Router) ProtoMessage() {}
-
-func (x *Router) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Router.ProtoReflect.Descriptor instead.
-func (*Router) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Router) GetMatch() *Match {
-	if x != nil {
-		return x.Match
-	}
-	return nil
-}
-
-func (m *Router) GetDestination() isRouter_Destination {
-	if m != nil {
-		return m.Destination
-	}
-	return nil
-}
-
-func (x *Router) GetL4() *L4Destination {
-	if x, ok := x.GetDestination().(*Router_L4); ok {
-		return x.L4
-	}
-	return nil
-}
-
-func (x *Router) GetL7() *L7Destination {
-	if x, ok := x.GetDestination().(*Router_L7); ok {
-		return x.L7
-	}
-	return nil
-}
-
-func (x *Router) GetSni() *SNIDestination {
-	if x, ok := x.GetDestination().(*Router_Sni); ok {
-		return x.Sni
-	}
-	return nil
-}
-
-func (x *Router) GetInboundTls() *TransportSocket {
-	if x != nil {
-		return x.InboundTls
-	}
-	return nil
-}
-
-type isRouter_Destination interface {
-	isRouter_Destination()
-}
-
-type Router_L4 struct {
-	// l4 is an l4 destination to route to, which will have a reference to a cluster.
-	L4 *L4Destination `protobuf:"bytes,2,opt,name=l4,proto3,oneof"`
-}
-
-type Router_L7 struct {
-	// l7 is an l7 destination to route to, which will have a reference to a route.
-	L7 *L7Destination `protobuf:"bytes,3,opt,name=l7,proto3,oneof"`
-}
-
-type Router_Sni struct {
-	// sni is an SNI destination, which means there will be no references, but the SNI name will be tied to the cluster
-	// name, so we should generate all clusters.
-	Sni *SNIDestination `protobuf:"bytes,4,opt,name=sni,proto3,oneof"`
-}
-
-func (*Router_L4) isRouter_Destination() {}
-
-func (*Router_L7) isRouter_Destination() {}
-
-func (*Router_Sni) isRouter_Destination() {}
-
-type Match struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	AlpnProtocols      []string                `protobuf:"bytes,1,rep,name=alpn_protocols,json=alpnProtocols,proto3" json:"alpn_protocols,omitempty"`
-	DestinationPort    *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=destination_port,json=destinationPort,proto3" json:"destination_port,omitempty"`
-	PrefixRanges       []*CidrRange            `protobuf:"bytes,3,rep,name=prefix_ranges,json=prefixRanges,proto3" json:"prefix_ranges,omitempty"`
-	SourcePrefixRanges []*CidrRange            `protobuf:"bytes,4,rep,name=source_prefix_ranges,json=sourcePrefixRanges,proto3" json:"source_prefix_ranges,omitempty"`
-	// server_names matches based on SNI of the incoming request.
-	ServerNames []string `protobuf:"bytes,5,rep,name=server_names,json=serverNames,proto3" json:"server_names,omitempty"`
-}
-
-func (x *Match) Reset() {
-	*x = Match{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Match) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Match) ProtoMessage() {}
-
-func (x *Match) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Match.ProtoReflect.Descriptor instead.
-func (*Match) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *Match) GetAlpnProtocols() []string {
-	if x != nil {
-		return x.AlpnProtocols
-	}
-	return nil
-}
-
-func (x *Match) GetDestinationPort() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.DestinationPort
-	}
-	return nil
-}
-
-func (x *Match) GetPrefixRanges() []*CidrRange {
-	if x != nil {
-		return x.PrefixRanges
-	}
-	return nil
-}
-
-func (x *Match) GetSourcePrefixRanges() []*CidrRange {
-	if x != nil {
-		return x.SourcePrefixRanges
-	}
-	return nil
-}
-
-func (x *Match) GetServerNames() []string {
-	if x != nil {
-		return x.ServerNames
-	}
-	return nil
-}
-
-type CidrRange struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	AddressPrefix string                  `protobuf:"bytes,1,opt,name=address_prefix,json=addressPrefix,proto3" json:"address_prefix,omitempty"`
-	PrefixLen     *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"`
-}
-
-func (x *CidrRange) Reset() {
-	*x = CidrRange{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CidrRange) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CidrRange) ProtoMessage() {}
-
-func (x *CidrRange) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CidrRange.ProtoReflect.Descriptor instead.
-func (*CidrRange) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *CidrRange) GetAddressPrefix() string {
-	if x != nil {
-		return x.AddressPrefix
-	}
-	return ""
-}
-
-func (x *CidrRange) GetPrefixLen() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.PrefixLen
-	}
-	return nil
-}
-
-type L4Destination struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// destination is one or more clusters to route to.
-	//
-	// Types that are assignable to Destination:
-	//
-	//	*L4Destination_Cluster
-	//	*L4Destination_WeightedClusters
-	Destination isL4Destination_Destination `protobuf_oneof:"destination"`
-	// stat_prefix is for compatibility with v1 xds configuration, so it is generated in exactly the same way.
-	StatPrefix string `protobuf:"bytes,3,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"`
-	// traffic_permissions is a list of traffic permissions for this destination.
-	TrafficPermissions *TrafficPermissions `protobuf:"bytes,4,opt,name=traffic_permissions,json=trafficPermissions,proto3" json:"traffic_permissions,omitempty"`
-	// max_inbound_connections specifies how many connections this destination can accept.
-	MaxInboundConnections uint64 `protobuf:"varint,5,opt,name=max_inbound_connections,json=maxInboundConnections,proto3" json:"max_inbound_connections,omitempty"`
-}
-
-func (x *L4Destination) Reset() {
-	*x = L4Destination{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *L4Destination) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*L4Destination) ProtoMessage() {}
-
-func (x *L4Destination) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use L4Destination.ProtoReflect.Descriptor instead.
-func (*L4Destination) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescGZIP(), []int{4}
-}
-
-func (m *L4Destination) GetDestination() isL4Destination_Destination {
-	if m != nil {
-		return m.Destination
-	}
-	return nil
-}
-
-func (x *L4Destination) GetCluster() *DestinationCluster {
-	if x, ok := x.GetDestination().(*L4Destination_Cluster); ok {
-		return x.Cluster
-	}
-	return nil
-}
-
-func (x *L4Destination) GetWeightedClusters() *L4WeightedClusterGroup {
-	if x, ok := x.GetDestination().(*L4Destination_WeightedClusters); ok {
-		return x.WeightedClusters
-	}
-	return nil
-}
-
-func (x *L4Destination) GetStatPrefix() string {
-	if x != nil {
-		return x.StatPrefix
-	}
-	return ""
-}
-
-func (x *L4Destination) GetTrafficPermissions() *TrafficPermissions {
-	if x != nil {
-		return x.TrafficPermissions
-	}
-	return nil
-}
-
-func (x *L4Destination) GetMaxInboundConnections() uint64 {
-	if x != nil {
-		return x.MaxInboundConnections
-	}
-	return 0
-}
-
-type isL4Destination_Destination interface {
-	isL4Destination_Destination()
-}
-
-type L4Destination_Cluster struct {
-	Cluster *DestinationCluster `protobuf:"bytes,1,opt,name=cluster,proto3,oneof"`
-}
-
-type L4Destination_WeightedClusters struct {
-	WeightedClusters *L4WeightedClusterGroup `protobuf:"bytes,2,opt,name=weighted_clusters,json=weightedClusters,proto3,oneof"`
-}
-
-func (*L4Destination_Cluster) isL4Destination_Destination() {}
-
-func (*L4Destination_WeightedClusters) isL4Destination_Destination() {}
-
-type L7Destination struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// name is a key in the top level routes map. This specifies which route to go to in this L7 destination.
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	// stat_prefix is for compatibility with v1 xds configuration, so it is generated in exactly the same way.
-	StatPrefix string `protobuf:"bytes,2,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"`
-	// protocol for the destination.
-	Protocol L7Protocol `protobuf:"varint,3,opt,name=protocol,proto3,enum=hashicorp.consul.mesh.v2beta1.pbproxystate.L7Protocol" json:"protocol,omitempty"`
-	// traffic_permissions is a list of intentions for this destination.
-	TrafficPermissions *TrafficPermissions `protobuf:"bytes,4,opt,name=traffic_permissions,json=trafficPermissions,proto3" json:"traffic_permissions,omitempty"`
-	// include_xfcc specifies whether to add xfcc header.
-	IncludeXfcc bool `protobuf:"varint,5,opt,name=include_xfcc,json=includeXfcc,proto3" json:"include_xfcc,omitempty"`
-	// static_route specifies whether this is a static route that is inlined in the listener filter. This is required to
-	// match existing xds config.
-	StaticRoute bool `protobuf:"varint,6,opt,name=static_route,json=staticRoute,proto3" json:"static_route,omitempty"`
-	// max_inbound_connections specifies how many connections this destination can accept.
-	MaxInboundConnections uint64 `protobuf:"varint,7,opt,name=max_inbound_connections,json=maxInboundConnections,proto3" json:"max_inbound_connections,omitempty"`
-}
-
-func (x *L7Destination) Reset() {
-	*x = L7Destination{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *L7Destination) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*L7Destination) ProtoMessage() {}
-
-func (x *L7Destination) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use L7Destination.ProtoReflect.Descriptor instead.
-func (*L7Destination) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *L7Destination) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *L7Destination) GetStatPrefix() string {
-	if x != nil {
-		return x.StatPrefix
-	}
-	return ""
-}
-
-func (x *L7Destination) GetProtocol() L7Protocol {
-	if x != nil {
-		return x.Protocol
-	}
-	return L7Protocol_L7_PROTOCOL_HTTP
-}
-
-func (x *L7Destination) GetTrafficPermissions() *TrafficPermissions {
-	if x != nil {
-		return x.TrafficPermissions
-	}
-	return nil
-}
-
-func (x *L7Destination) GetIncludeXfcc() bool {
-	if x != nil {
-		return x.IncludeXfcc
-	}
-	return false
-}
-
-func (x *L7Destination) GetStaticRoute() bool {
-	if x != nil {
-		return x.StaticRoute
-	}
-	return false
-}
-
-func (x *L7Destination) GetMaxInboundConnections() uint64 {
-	if x != nil {
-		return x.MaxInboundConnections
-	}
-	return 0
-}
-
-type SNIDestination struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// stat_prefix is for compatibility with v1 xds configuration, so it is generated in exactly the same way.
-	StatPrefix string `protobuf:"bytes,1,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"`
-}
-
-func (x *SNIDestination) Reset() {
-	*x = SNIDestination{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SNIDestination) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SNIDestination) ProtoMessage() {}
-
-func (x *SNIDestination) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SNIDestination.ProtoReflect.Descriptor instead.
-func (*SNIDestination) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *SNIDestination) GetStatPrefix() string {
-	if x != nil {
-		return x.StatPrefix
-	}
-	return ""
-}
-
-var File_pbmesh_v2beta1_pbproxystate_listener_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDesc = []byte{
-	0x0a, 0x2a, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x6c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x2a, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65,
-	0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x29, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68,
-	0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x1a, 0x29, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x35,
-	0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70,
-	0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x74, 0x72, 0x61, 0x66,
-	0x66, 0x69, 0x63, 0x5f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x32, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa4, 0x06, 0x0a, 0x08, 0x4c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x53, 0x0a, 0x09, 0x64, 0x69,
-	0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x35, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x69, 0x72, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x5a, 0x0a, 0x09, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e,
-	0x48, 0x6f, 0x73, 0x74, 0x50, 0x6f, 0x72, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48,
-	0x00, 0x52, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x60, 0x0a, 0x0b, 0x75,
-	0x6e, 0x69, 0x78, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x3d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x55, 0x6e,
-	0x69, 0x78, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x48,
-	0x00, 0x52, 0x0a, 0x75, 0x6e, 0x69, 0x78, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x4c, 0x0a,
-	0x07, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70,
-	0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74,
-	0x65, 0x72, 0x52, 0x07, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x73, 0x12, 0x59, 0x0a, 0x0e, 0x64,
-	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x12, 0x5a, 0x0a, 0x0c, 0x63, 0x61, 0x70, 0x61, 0x62, 0x69,
-	0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x36, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69,
-	0x6c, 0x69, 0x74, 0x79, 0x52, 0x0c, 0x63, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69,
-	0x65, 0x73, 0x12, 0x6f, 0x0a, 0x13, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x63, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x42, 0x61, 0x6c,
-	0x61, 0x6e, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
-	0x12, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x12, 0x32, 0x0a, 0x15, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x5f, 0x68, 0x61,
-	0x74, 0x63, 0x68, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x18, 0x09, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x13, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x48, 0x61, 0x74, 0x63, 0x68, 0x4c,
-	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x12, 0x37, 0x0a, 0x18, 0x75, 0x73, 0x65, 0x5f, 0x65,
-	0x73, 0x63, 0x61, 0x70, 0x65, 0x5f, 0x68, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x74, 0x72, 0x61, 0x63,
-	0x69, 0x6e, 0x67, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x75, 0x73, 0x65, 0x45, 0x73,
-	0x63, 0x61, 0x70, 0x65, 0x48, 0x61, 0x74, 0x63, 0x68, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67,
-	0x42, 0x0e, 0x0a, 0x0c, 0x62, 0x69, 0x6e, 0x64, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x22, 0xa8, 0x03, 0x0a, 0x06, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x05, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x05, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x12, 0x4b, 0x0a, 0x02, 0x6c, 0x34, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c, 0x34,
-	0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x02, 0x6c,
-	0x34, 0x12, 0x4b, 0x0a, 0x02, 0x6c, 0x37, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c, 0x37, 0x44, 0x65, 0x73,
-	0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x02, 0x6c, 0x37, 0x12, 0x4e,
-	0x0a, 0x03, 0x73, 0x6e, 0x69, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x4e, 0x49, 0x44, 0x65, 0x73, 0x74,
-	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x03, 0x73, 0x6e, 0x69, 0x12, 0x5c,
-	0x0a, 0x0b, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x74, 0x6c, 0x73, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x52, 0x0a, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x54, 0x6c, 0x73, 0x42, 0x0d, 0x0a, 0x0b,
-	0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xdf, 0x02, 0x0a, 0x05,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x25, 0x0a, 0x0e, 0x61, 0x6c, 0x70, 0x6e, 0x5f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x61,
-	0x6c, 0x70, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x12, 0x47, 0x0a, 0x10,
-	0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x6f, 0x72, 0x74,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x5a, 0x0a, 0x0d, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f,
-	0x72, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x43, 0x69, 0x64, 0x72, 0x52, 0x61,
-	0x6e, 0x67, 0x65, 0x52, 0x0c, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x52, 0x61, 0x6e, 0x67, 0x65,
-	0x73, 0x12, 0x67, 0x0a, 0x14, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66,
-	0x69, 0x78, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x43, 0x69, 0x64,
-	0x72, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x12, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x50, 0x72,
-	0x65, 0x66, 0x69, 0x78, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x22, 0x6f, 0x0a,
-	0x09, 0x43, 0x69, 0x64, 0x72, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x61, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0d, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x50, 0x72, 0x65, 0x66, 0x69,
-	0x78, 0x12, 0x3b, 0x0a, 0x0a, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6c, 0x65, 0x6e, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x52, 0x09, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4c, 0x65, 0x6e, 0x22, 0xb7,
-	0x03, 0x0a, 0x0d, 0x4c, 0x34, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x5a, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x44,
-	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x71, 0x0a, 0x11,
-	0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c, 0x34, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x48, 0x00, 0x52, 0x10, 0x77,
-	0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12,
-	0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78,
-	0x12, 0x6f, 0x0a, 0x13, 0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x5f, 0x70, 0x65, 0x72, 0x6d,
-	0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x66, 0x66,
-	0x69, 0x63, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x12, 0x74,
-	0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x36, 0x0a, 0x17, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64,
-	0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x04, 0x52, 0x15, 0x6d, 0x61, 0x78, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x0d, 0x0a, 0x0b, 0x64, 0x65, 0x73,
-	0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x87, 0x03, 0x0a, 0x0d, 0x4c, 0x37, 0x44,
-	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1f,
-	0x0a, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12,
-	0x52, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c,
-	0x37, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x63, 0x6f, 0x6c, 0x12, 0x6f, 0x0a, 0x13, 0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x5f, 0x70,
-	0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72,
-	0x61, 0x66, 0x66, 0x69, 0x63, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x52, 0x12, 0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f,
-	0x78, 0x66, 0x63, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x6e, 0x63, 0x6c,
-	0x75, 0x64, 0x65, 0x58, 0x66, 0x63, 0x63, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x74, 0x61, 0x74, 0x69,
-	0x63, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x73,
-	0x74, 0x61, 0x74, 0x69, 0x63, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x36, 0x0a, 0x17, 0x6d, 0x61,
-	0x78, 0x5f, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x52, 0x15, 0x6d, 0x61, 0x78,
-	0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x22, 0x31, 0x0a, 0x0e, 0x53, 0x4e, 0x49, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x74, 0x5f, 0x70, 0x72, 0x65,
-	0x66, 0x69, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x50,
-	0x72, 0x65, 0x66, 0x69, 0x78, 0x2a, 0x55, 0x0a, 0x09, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x15, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f,
-	0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x15, 0x0a,
-	0x11, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x49, 0x4e, 0x42, 0x4f, 0x55,
-	0x4e, 0x44, 0x10, 0x01, 0x12, 0x16, 0x0a, 0x12, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x49, 0x4f,
-	0x4e, 0x5f, 0x4f, 0x55, 0x54, 0x42, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x02, 0x2a, 0x54, 0x0a, 0x12,
-	0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x1b, 0x42, 0x41, 0x4c, 0x41, 0x4e, 0x43, 0x45, 0x5f, 0x43, 0x4f,
-	0x4e, 0x4e, 0x45, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x5f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c,
-	0x54, 0x10, 0x00, 0x12, 0x1d, 0x0a, 0x19, 0x42, 0x41, 0x4c, 0x41, 0x4e, 0x43, 0x45, 0x5f, 0x43,
-	0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x5f, 0x45, 0x58, 0x41, 0x43, 0x54,
-	0x10, 0x01, 0x2a, 0x71, 0x0a, 0x0a, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79,
-	0x12, 0x1a, 0x0a, 0x16, 0x43, 0x41, 0x50, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x54,
-	0x52, 0x41, 0x4e, 0x53, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54, 0x10, 0x00, 0x12, 0x25, 0x0a, 0x21,
-	0x43, 0x41, 0x50, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x4c, 0x37, 0x5f, 0x50, 0x52,
-	0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x49, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x54, 0x49, 0x4f,
-	0x4e, 0x10, 0x01, 0x12, 0x20, 0x0a, 0x1c, 0x43, 0x41, 0x50, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54,
-	0x59, 0x5f, 0x4c, 0x34, 0x5f, 0x54, 0x4c, 0x53, 0x5f, 0x49, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x54,
-	0x49, 0x4f, 0x4e, 0x10, 0x02, 0x2a, 0x4f, 0x0a, 0x0a, 0x4c, 0x37, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x63, 0x6f, 0x6c, 0x12, 0x14, 0x0a, 0x10, 0x4c, 0x37, 0x5f, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43,
-	0x4f, 0x4c, 0x5f, 0x48, 0x54, 0x54, 0x50, 0x10, 0x00, 0x12, 0x15, 0x0a, 0x11, 0x4c, 0x37, 0x5f,
-	0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f, 0x48, 0x54, 0x54, 0x50, 0x32, 0x10, 0x01,
-	0x12, 0x14, 0x0a, 0x10, 0x4c, 0x37, 0x5f, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x43, 0x4f, 0x4c, 0x5f,
-	0x47, 0x52, 0x50, 0x43, 0x10, 0x02, 0x42, 0xd3, 0x02, 0x0a, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x42, 0x0d, 0x4c, 0x69, 0x73, 0x74, 0x65,
-	0x6e, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75,
-	0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0xa2, 0x02, 0x05, 0x48, 0x43, 0x4d, 0x56, 0x50, 0xaa, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68,
-	0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0xca, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0xe2, 0x02, 0x36, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5c,
-	0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x2e, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a,
-	0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3a, 0x3a,
-	0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescData = file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_pbproxystate_listener_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
-var file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
-var file_pbmesh_v2beta1_pbproxystate_listener_proto_goTypes = []interface{}{
-	(Direction)(0),                 // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.Direction
-	(BalanceConnections)(0),        // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.BalanceConnections
-	(Capability)(0),                // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.Capability
-	(L7Protocol)(0),                // 3: hashicorp.consul.mesh.v2beta1.pbproxystate.L7Protocol
-	(*Listener)(nil),               // 4: hashicorp.consul.mesh.v2beta1.pbproxystate.Listener
-	(*Router)(nil),                 // 5: hashicorp.consul.mesh.v2beta1.pbproxystate.Router
-	(*Match)(nil),                  // 6: hashicorp.consul.mesh.v2beta1.pbproxystate.Match
-	(*CidrRange)(nil),              // 7: hashicorp.consul.mesh.v2beta1.pbproxystate.CidrRange
-	(*L4Destination)(nil),          // 8: hashicorp.consul.mesh.v2beta1.pbproxystate.L4Destination
-	(*L7Destination)(nil),          // 9: hashicorp.consul.mesh.v2beta1.pbproxystate.L7Destination
-	(*SNIDestination)(nil),         // 10: hashicorp.consul.mesh.v2beta1.pbproxystate.SNIDestination
-	(*HostPortAddress)(nil),        // 11: hashicorp.consul.mesh.v2beta1.pbproxystate.HostPortAddress
-	(*UnixSocketAddress)(nil),      // 12: hashicorp.consul.mesh.v2beta1.pbproxystate.UnixSocketAddress
-	(*TransportSocket)(nil),        // 13: hashicorp.consul.mesh.v2beta1.pbproxystate.TransportSocket
-	(*wrapperspb.UInt32Value)(nil), // 14: google.protobuf.UInt32Value
-	(*DestinationCluster)(nil),     // 15: hashicorp.consul.mesh.v2beta1.pbproxystate.DestinationCluster
-	(*L4WeightedClusterGroup)(nil), // 16: hashicorp.consul.mesh.v2beta1.pbproxystate.L4WeightedClusterGroup
-	(*TrafficPermissions)(nil),     // 17: hashicorp.consul.mesh.v2beta1.pbproxystate.TrafficPermissions
-}
-var file_pbmesh_v2beta1_pbproxystate_listener_proto_depIdxs = []int32{
-	0,  // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.Listener.direction:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Direction
-	11, // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.Listener.host_port:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.HostPortAddress
-	12, // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.Listener.unix_socket:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.UnixSocketAddress
-	5,  // 3: hashicorp.consul.mesh.v2beta1.pbproxystate.Listener.routers:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Router
-	5,  // 4: hashicorp.consul.mesh.v2beta1.pbproxystate.Listener.default_router:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Router
-	2,  // 5: hashicorp.consul.mesh.v2beta1.pbproxystate.Listener.capabilities:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Capability
-	1,  // 6: hashicorp.consul.mesh.v2beta1.pbproxystate.Listener.balance_connections:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.BalanceConnections
-	6,  // 7: hashicorp.consul.mesh.v2beta1.pbproxystate.Router.match:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Match
-	8,  // 8: hashicorp.consul.mesh.v2beta1.pbproxystate.Router.l4:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.L4Destination
-	9,  // 9: hashicorp.consul.mesh.v2beta1.pbproxystate.Router.l7:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.L7Destination
-	10, // 10: hashicorp.consul.mesh.v2beta1.pbproxystate.Router.sni:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.SNIDestination
-	13, // 11: hashicorp.consul.mesh.v2beta1.pbproxystate.Router.inbound_tls:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TransportSocket
-	14, // 12: hashicorp.consul.mesh.v2beta1.pbproxystate.Match.destination_port:type_name -> google.protobuf.UInt32Value
-	7,  // 13: hashicorp.consul.mesh.v2beta1.pbproxystate.Match.prefix_ranges:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.CidrRange
-	7,  // 14: hashicorp.consul.mesh.v2beta1.pbproxystate.Match.source_prefix_ranges:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.CidrRange
-	14, // 15: hashicorp.consul.mesh.v2beta1.pbproxystate.CidrRange.prefix_len:type_name -> google.protobuf.UInt32Value
-	15, // 16: hashicorp.consul.mesh.v2beta1.pbproxystate.L4Destination.cluster:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.DestinationCluster
-	16, // 17: hashicorp.consul.mesh.v2beta1.pbproxystate.L4Destination.weighted_clusters:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.L4WeightedClusterGroup
-	17, // 18: hashicorp.consul.mesh.v2beta1.pbproxystate.L4Destination.traffic_permissions:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TrafficPermissions
-	3,  // 19: hashicorp.consul.mesh.v2beta1.pbproxystate.L7Destination.protocol:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.L7Protocol
-	17, // 20: hashicorp.consul.mesh.v2beta1.pbproxystate.L7Destination.traffic_permissions:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TrafficPermissions
-	21, // [21:21] is the sub-list for method output_type
-	21, // [21:21] is the sub-list for method input_type
-	21, // [21:21] is the sub-list for extension type_name
-	21, // [21:21] is the sub-list for extension extendee
-	0,  // [0:21] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_pbproxystate_listener_proto_init() }
-func file_pbmesh_v2beta1_pbproxystate_listener_proto_init() {
-	if File_pbmesh_v2beta1_pbproxystate_listener_proto != nil {
-		return
-	}
-	file_pbmesh_v2beta1_pbproxystate_address_proto_init()
-	file_pbmesh_v2beta1_pbproxystate_cluster_proto_init()
-	file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_init()
-	file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Listener); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Router); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Match); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CidrRange); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*L4Destination); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*L7Destination); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SNIDestination); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[0].OneofWrappers = []interface{}{
-		(*Listener_HostPort)(nil),
-		(*Listener_UnixSocket)(nil),
-	}
-	file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[1].OneofWrappers = []interface{}{
-		(*Router_L4)(nil),
-		(*Router_L7)(nil),
-		(*Router_Sni)(nil),
-	}
-	file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes[4].OneofWrappers = []interface{}{
-		(*L4Destination_Cluster)(nil),
-		(*L4Destination_WeightedClusters)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDesc,
-			NumEnums:      4,
-			NumMessages:   7,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_pbproxystate_listener_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_pbproxystate_listener_proto_depIdxs,
-		EnumInfos:         file_pbmesh_v2beta1_pbproxystate_listener_proto_enumTypes,
-		MessageInfos:      file_pbmesh_v2beta1_pbproxystate_listener_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_pbproxystate_listener_proto = out.File
-	file_pbmesh_v2beta1_pbproxystate_listener_proto_rawDesc = nil
-	file_pbmesh_v2beta1_pbproxystate_listener_proto_goTypes = nil
-	file_pbmesh_v2beta1_pbproxystate_listener_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/listener.proto b/proto-public/pbmesh/v2beta1/pbproxystate/listener.proto
deleted file mode 100644
index 6d7d17f0484ff..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/listener.proto
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1.pbproxystate;
-
-import "google/protobuf/wrappers.proto";
-import "pbmesh/v2beta1/pbproxystate/address.proto";
-import "pbmesh/v2beta1/pbproxystate/cluster.proto";
-import "pbmesh/v2beta1/pbproxystate/traffic_permissions.proto";
-import "pbmesh/v2beta1/pbproxystate/transport_socket.proto";
-
-message Listener {
-  // name is the name of the listener.
-  string name = 1;
-  // direction tells the listener the direction of traffic.
-  Direction direction = 2;
-  // bind_address describes where to listen.
-  oneof bind_address {
-    HostPortAddress host_port = 3;
-    UnixSocketAddress unix_socket = 4;
-  }
-
-  // routers describes how to route traffic from this listener.
-  repeated Router routers = 5;
-  // default_router describes where to route if none of the other router matches match the connection.
-  Router default_router = 6;
-  // capabilities describe Envoy proxy functionality to enable. These map closely to Envoy listener filters.
-  repeated Capability capabilities = 7;
-  // balance_connections configures how the listener should balance connections.
-  BalanceConnections balance_connections = 8;
-  // escape_hatch_listener_json configures a user configured escape hatch listener.
-  string escape_hatch_listener = 9;
-  // use_escape_hatch_tracing configures whether to use the top level user configured tracing escape hatch for this listener.
-  bool use_escape_hatch_tracing = 10;
-}
-
-enum Direction {
-  // DIRECTION_UNSPECIFIED is used by mesh gateway listeners.
-  DIRECTION_UNSPECIFIED = 0;
-  DIRECTION_INBOUND = 1;
-  DIRECTION_OUTBOUND = 2;
-}
-
-enum BalanceConnections {
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  BALANCE_CONNECTIONS_DEFAULT = 0;
-  BALANCE_CONNECTIONS_EXACT = 1;
-}
-
-// Capabilities map to proxy functionality to enable. These enable tproxy, l7 protocol/alpn inspection, or l4 sni/alpn inspection.
-enum Capability {
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  CAPABILITY_TRANSPARENT = 0;
-  CAPABILITY_L7_PROTOCOL_INSPECTION = 1;
-  CAPABILITY_L4_TLS_INSPECTION = 2;
-}
-
-message Router {
-  // match specifies how to match traffic coming into this listener. If the traffic matches, it will be routed to the
-  // destination.
-  Match match = 1;
-  oneof destination {
-    // l4 is an l4 destination to route to, which will have a reference to a cluster.
-    L4Destination l4 = 2;
-    // l7 is an l7 destination to route to, which will have a reference to a route.
-    L7Destination l7 = 3;
-    // sni is an SNI destination, which means there will be no references, but the SNI name will be tied to the cluster
-    // name, so we should generate all clusters.
-    SNIDestination sni = 4;
-  }
-  // inbound_tls is used by inbound listeners that terminate TLS.
-  TransportSocket inbound_tls = 5;
-}
-
-message Match {
-  repeated string alpn_protocols = 1;
-  google.protobuf.UInt32Value destination_port = 2;
-  repeated CidrRange prefix_ranges = 3;
-  repeated CidrRange source_prefix_ranges = 4;
-  // server_names matches based on SNI of the incoming request.
-  repeated string server_names = 5;
-}
-
-message CidrRange {
-  string address_prefix = 1;
-  google.protobuf.UInt32Value prefix_len = 2;
-}
-
-message L4Destination {
-  // destination is one or more clusters to route to.
-  oneof destination {
-    DestinationCluster cluster = 1;
-    L4WeightedClusterGroup weighted_clusters = 2;
-  }
-  // stat_prefix is for compatibility with v1 xds configuration, so it is generated in exactly the same way.
-  string stat_prefix = 3;
-  // traffic_permissions is a list of traffic permissions for this destination.
-  TrafficPermissions traffic_permissions = 4;
-  // max_inbound_connections specifies how many connections this destination can accept.
-  uint64 max_inbound_connections = 5;
-}
-
-message L7Destination {
-  // name is a key in the top level routes map. This specifies which route to go to in this L7 destination.
-  string name = 1;
-  // stat_prefix is for compatibility with v1 xds configuration, so it is generated in exactly the same way.
-  string stat_prefix = 2;
-  // protocol for the destination.
-  L7Protocol protocol = 3;
-  // traffic_permissions is a list of intentions for this destination.
-  TrafficPermissions traffic_permissions = 4;
-  // include_xfcc specifies whether to add xfcc header.
-  bool include_xfcc = 5;
-  // static_route specifies whether this is a static route that is inlined in the listener filter. This is required to
-  // match existing xds config.
-  bool static_route = 6;
-  // max_inbound_connections specifies how many connections this destination can accept.
-  uint64 max_inbound_connections = 7;
-}
-
-enum L7Protocol {
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  L7_PROTOCOL_HTTP = 0;
-  L7_PROTOCOL_HTTP2 = 1;
-  L7_PROTOCOL_GRPC = 2;
-}
-
-message SNIDestination {
-  // stat_prefix is for compatibility with v1 xds configuration, so it is generated in exactly the same way.
-  string stat_prefix = 1;
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/references.pb.binary.go b/proto-public/pbmesh/v2beta1/pbproxystate/references.pb.binary.go
deleted file mode 100644
index ddcc32fc56171..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/references.pb.binary.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/pbproxystate/references.proto
-
-package pbproxystate
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LeafCertificateRef) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LeafCertificateRef) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TrustBundleRef) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TrustBundleRef) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *EndpointRef) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *EndpointRef) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/references.pb.go b/proto-public/pbmesh/v2beta1/pbproxystate/references.pb.go
deleted file mode 100644
index c544d28030954..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/references.pb.go
+++ /dev/null
@@ -1,371 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/pbproxystate/references.proto
-
-package pbproxystate
-
-import (
-	pbresource "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type LeafCertificateRef struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name       string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Namespace  string   `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
-	Partition  string   `protobuf:"bytes,3,opt,name=partition,proto3" json:"partition,omitempty"`
-	Host       string   `protobuf:"bytes,4,opt,name=host,proto3" json:"host,omitempty"`
-	Datacenter string   `protobuf:"bytes,5,opt,name=datacenter,proto3" json:"datacenter,omitempty"`
-	DnsSan     []string `protobuf:"bytes,6,rep,name=dns_san,json=dnsSan,proto3" json:"dns_san,omitempty"`
-}
-
-func (x *LeafCertificateRef) Reset() {
-	*x = LeafCertificateRef{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_references_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LeafCertificateRef) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LeafCertificateRef) ProtoMessage() {}
-
-func (x *LeafCertificateRef) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_references_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LeafCertificateRef.ProtoReflect.Descriptor instead.
-func (*LeafCertificateRef) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_references_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *LeafCertificateRef) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *LeafCertificateRef) GetNamespace() string {
-	if x != nil {
-		return x.Namespace
-	}
-	return ""
-}
-
-func (x *LeafCertificateRef) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *LeafCertificateRef) GetHost() string {
-	if x != nil {
-		return x.Host
-	}
-	return ""
-}
-
-func (x *LeafCertificateRef) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-func (x *LeafCertificateRef) GetDnsSan() []string {
-	if x != nil {
-		return x.DnsSan
-	}
-	return nil
-}
-
-type TrustBundleRef struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Peer        string `protobuf:"bytes,1,opt,name=peer,proto3" json:"peer,omitempty"`
-	TrustDomain string `protobuf:"bytes,2,opt,name=trust_domain,json=trustDomain,proto3" json:"trust_domain,omitempty"`
-}
-
-func (x *TrustBundleRef) Reset() {
-	*x = TrustBundleRef{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_references_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TrustBundleRef) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TrustBundleRef) ProtoMessage() {}
-
-func (x *TrustBundleRef) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_references_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TrustBundleRef.ProtoReflect.Descriptor instead.
-func (*TrustBundleRef) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_references_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *TrustBundleRef) GetPeer() string {
-	if x != nil {
-		return x.Peer
-	}
-	return ""
-}
-
-func (x *TrustBundleRef) GetTrustDomain() string {
-	if x != nil {
-		return x.TrustDomain
-	}
-	return ""
-}
-
-type EndpointRef struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// id is the ServiceEndpoints resource id.
-	Id *pbresource.ID `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	// port is the name of the port in the ServiceEndpoints to generate the Endpoints from.
-	Port string `protobuf:"bytes,2,opt,name=port,proto3" json:"port,omitempty"`
-}
-
-func (x *EndpointRef) Reset() {
-	*x = EndpointRef{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_references_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EndpointRef) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EndpointRef) ProtoMessage() {}
-
-func (x *EndpointRef) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_references_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EndpointRef.ProtoReflect.Descriptor instead.
-func (*EndpointRef) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_references_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *EndpointRef) GetId() *pbresource.ID {
-	if x != nil {
-		return x.Id
-	}
-	return nil
-}
-
-func (x *EndpointRef) GetPort() string {
-	if x != nil {
-		return x.Port
-	}
-	return ""
-}
-
-var File_pbmesh_v2beta1_pbproxystate_references_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_pbproxystate_references_proto_rawDesc = []byte{
-	0x0a, 0x2c, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x72, 0x65,
-	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x2a,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x1a, 0x19, 0x70, 0x62, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb1, 0x01, 0x0a, 0x12, 0x4c, 0x65, 0x61, 0x66, 0x43, 0x65,
-	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x65, 0x66, 0x12, 0x12, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1c,
-	0x0a, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04,
-	0x68, 0x6f, 0x73, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74,
-	0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
-	0x12, 0x17, 0x0a, 0x07, 0x64, 0x6e, 0x73, 0x5f, 0x73, 0x61, 0x6e, 0x18, 0x06, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x06, 0x64, 0x6e, 0x73, 0x53, 0x61, 0x6e, 0x22, 0x47, 0x0a, 0x0e, 0x54, 0x72, 0x75,
-	0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x12, 0x12, 0x0a, 0x04, 0x70,
-	0x65, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x65, 0x65, 0x72, 0x12,
-	0x21, 0x0a, 0x0c, 0x74, 0x72, 0x75, 0x73, 0x74, 0x5f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x74, 0x72, 0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61,
-	0x69, 0x6e, 0x22, 0x50, 0x0a, 0x0b, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x65,
-	0x66, 0x12, 0x2d, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x02, 0x69, 0x64,
-	0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x70, 0x6f, 0x72, 0x74, 0x42, 0xd5, 0x02, 0x0a, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x42, 0x0f, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
-	0x63, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75,
-	0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0xa2, 0x02, 0x05, 0x48, 0x43, 0x4d, 0x56, 0x50, 0xaa, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68,
-	0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0xca, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0xe2, 0x02, 0x36, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5c,
-	0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x2e, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a,
-	0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3a, 0x3a,
-	0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_pbproxystate_references_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_pbproxystate_references_proto_rawDescData = file_pbmesh_v2beta1_pbproxystate_references_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_pbproxystate_references_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_pbproxystate_references_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_pbproxystate_references_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_pbproxystate_references_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_pbproxystate_references_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_pbproxystate_references_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_pbmesh_v2beta1_pbproxystate_references_proto_goTypes = []interface{}{
-	(*LeafCertificateRef)(nil), // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.LeafCertificateRef
-	(*TrustBundleRef)(nil),     // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.TrustBundleRef
-	(*EndpointRef)(nil),        // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.EndpointRef
-	(*pbresource.ID)(nil),      // 3: hashicorp.consul.resource.ID
-}
-var file_pbmesh_v2beta1_pbproxystate_references_proto_depIdxs = []int32{
-	3, // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.EndpointRef.id:type_name -> hashicorp.consul.resource.ID
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_pbproxystate_references_proto_init() }
-func file_pbmesh_v2beta1_pbproxystate_references_proto_init() {
-	if File_pbmesh_v2beta1_pbproxystate_references_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_pbproxystate_references_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LeafCertificateRef); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_references_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TrustBundleRef); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_references_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EndpointRef); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_pbproxystate_references_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   3,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_pbproxystate_references_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_pbproxystate_references_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_pbproxystate_references_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_pbproxystate_references_proto = out.File
-	file_pbmesh_v2beta1_pbproxystate_references_proto_rawDesc = nil
-	file_pbmesh_v2beta1_pbproxystate_references_proto_goTypes = nil
-	file_pbmesh_v2beta1_pbproxystate_references_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/references.proto b/proto-public/pbmesh/v2beta1/pbproxystate/references.proto
deleted file mode 100644
index b169019c603e1..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/references.proto
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1.pbproxystate;
-
-import "pbresource/resource.proto";
-
-message LeafCertificateRef {
-  string name = 1;
-  string namespace = 2;
-  string partition = 3;
-  string host = 4;
-  string datacenter = 5;
-  repeated string dns_san = 6;
-}
-
-message TrustBundleRef {
-  string peer = 1;
-  string trust_domain = 2;
-}
-
-message EndpointRef {
-  // id is the ServiceEndpoints resource id.
-  hashicorp.consul.resource.ID id = 1;
-  // port is the name of the port in the ServiceEndpoints to generate the Endpoints from.
-  string port = 2;
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/route.pb.binary.go b/proto-public/pbmesh/v2beta1/pbproxystate/route.pb.binary.go
deleted file mode 100644
index d6b057e379f11..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/route.pb.binary.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/pbproxystate/route.proto
-
-package pbproxystate
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Route) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Route) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *VirtualHost) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *VirtualHost) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *RouteRule) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *RouteRule) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *RouteMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *RouteMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *PathMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *PathMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *QueryParameterMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *QueryParameterMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HeaderMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HeaderMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *RouteDestination) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *RouteDestination) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DestinationConfiguration) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DestinationConfiguration) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *RetryPolicy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *RetryPolicy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TimeoutConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TimeoutConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LoadBalancerHashPolicy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LoadBalancerHashPolicy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *CookiePolicy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *CookiePolicy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HeaderPolicy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HeaderPolicy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *QueryParameterPolicy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *QueryParameterPolicy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ConnectionPropertiesPolicy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ConnectionPropertiesPolicy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/route.pb.go b/proto-public/pbmesh/v2beta1/pbproxystate/route.pb.go
deleted file mode 100644
index 2dc7aa44c16d6..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/route.pb.go
+++ /dev/null
@@ -1,1827 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/pbproxystate/route.proto
-
-package pbproxystate
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
-	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Route struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// virtual_hosts is a list of virtual hosts. A virtual host is selected based on an incoming request's host header.
-	VirtualHosts []*VirtualHost `protobuf:"bytes,1,rep,name=virtual_hosts,json=virtualHosts,proto3" json:"virtual_hosts,omitempty"`
-}
-
-func (x *Route) Reset() {
-	*x = Route{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Route) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Route) ProtoMessage() {}
-
-func (x *Route) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Route.ProtoReflect.Descriptor instead.
-func (*Route) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Route) GetVirtualHosts() []*VirtualHost {
-	if x != nil {
-		return x.VirtualHosts
-	}
-	return nil
-}
-
-type VirtualHost struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	// domains are used to match an incoming request's host header and determine which virtual host to use.
-	Domains []string `protobuf:"bytes,2,rep,name=domains,proto3" json:"domains,omitempty"`
-	// header_mutations to apply to the request when it matches this virtual host. These are applied after any headers in
-	// the RouteRule.
-	HeaderMutations []*HeaderMutation `protobuf:"bytes,3,rep,name=header_mutations,json=headerMutations,proto3" json:"header_mutations,omitempty"`
-	// route_rules are a list of rules to use for what to do next with this request. The first rule with a match will be
-	// used.
-	RouteRules []*RouteRule `protobuf:"bytes,4,rep,name=route_rules,json=routeRules,proto3" json:"route_rules,omitempty"`
-}
-
-func (x *VirtualHost) Reset() {
-	*x = VirtualHost{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *VirtualHost) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*VirtualHost) ProtoMessage() {}
-
-func (x *VirtualHost) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use VirtualHost.ProtoReflect.Descriptor instead.
-func (*VirtualHost) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *VirtualHost) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *VirtualHost) GetDomains() []string {
-	if x != nil {
-		return x.Domains
-	}
-	return nil
-}
-
-func (x *VirtualHost) GetHeaderMutations() []*HeaderMutation {
-	if x != nil {
-		return x.HeaderMutations
-	}
-	return nil
-}
-
-func (x *VirtualHost) GetRouteRules() []*RouteRule {
-	if x != nil {
-		return x.RouteRules
-	}
-	return nil
-}
-
-type RouteRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// match determines how to match the request. The first match determines which destination the request will go to.
-	Match *RouteMatch `protobuf:"bytes,1,opt,name=match,proto3" json:"match,omitempty"`
-	// destination is where to send the request to.
-	Destination *RouteDestination `protobuf:"bytes,2,opt,name=destination,proto3" json:"destination,omitempty"`
-	// header_mutations to apply to the request. These are applied before the VirtualHost header mutations.
-	HeaderMutations []*HeaderMutation `protobuf:"bytes,3,rep,name=header_mutations,json=headerMutations,proto3" json:"header_mutations,omitempty"`
-}
-
-func (x *RouteRule) Reset() {
-	*x = RouteRule{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RouteRule) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RouteRule) ProtoMessage() {}
-
-func (x *RouteRule) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RouteRule.ProtoReflect.Descriptor instead.
-func (*RouteRule) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *RouteRule) GetMatch() *RouteMatch {
-	if x != nil {
-		return x.Match
-	}
-	return nil
-}
-
-func (x *RouteRule) GetDestination() *RouteDestination {
-	if x != nil {
-		return x.Destination
-	}
-	return nil
-}
-
-func (x *RouteRule) GetHeaderMutations() []*HeaderMutation {
-	if x != nil {
-		return x.HeaderMutations
-	}
-	return nil
-}
-
-// RouteMatch has configuration to match a request.
-type RouteMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PathMatch             *PathMatch             `protobuf:"bytes,1,opt,name=path_match,json=pathMatch,proto3" json:"path_match,omitempty"`
-	HeaderMatches         []*HeaderMatch         `protobuf:"bytes,2,rep,name=header_matches,json=headerMatches,proto3" json:"header_matches,omitempty"`
-	MethodMatches         []string               `protobuf:"bytes,3,rep,name=method_matches,json=methodMatches,proto3" json:"method_matches,omitempty"`
-	QueryParameterMatches []*QueryParameterMatch `protobuf:"bytes,4,rep,name=query_parameter_matches,json=queryParameterMatches,proto3" json:"query_parameter_matches,omitempty"`
-}
-
-func (x *RouteMatch) Reset() {
-	*x = RouteMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RouteMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RouteMatch) ProtoMessage() {}
-
-func (x *RouteMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RouteMatch.ProtoReflect.Descriptor instead.
-func (*RouteMatch) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *RouteMatch) GetPathMatch() *PathMatch {
-	if x != nil {
-		return x.PathMatch
-	}
-	return nil
-}
-
-func (x *RouteMatch) GetHeaderMatches() []*HeaderMatch {
-	if x != nil {
-		return x.HeaderMatches
-	}
-	return nil
-}
-
-func (x *RouteMatch) GetMethodMatches() []string {
-	if x != nil {
-		return x.MethodMatches
-	}
-	return nil
-}
-
-func (x *RouteMatch) GetQueryParameterMatches() []*QueryParameterMatch {
-	if x != nil {
-		return x.QueryParameterMatches
-	}
-	return nil
-}
-
-type PathMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to PathMatch:
-	//
-	//	*PathMatch_Exact
-	//	*PathMatch_Prefix
-	//	*PathMatch_Regex
-	PathMatch isPathMatch_PathMatch `protobuf_oneof:"path_match"`
-}
-
-func (x *PathMatch) Reset() {
-	*x = PathMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PathMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PathMatch) ProtoMessage() {}
-
-func (x *PathMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PathMatch.ProtoReflect.Descriptor instead.
-func (*PathMatch) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{4}
-}
-
-func (m *PathMatch) GetPathMatch() isPathMatch_PathMatch {
-	if m != nil {
-		return m.PathMatch
-	}
-	return nil
-}
-
-func (x *PathMatch) GetExact() string {
-	if x, ok := x.GetPathMatch().(*PathMatch_Exact); ok {
-		return x.Exact
-	}
-	return ""
-}
-
-func (x *PathMatch) GetPrefix() string {
-	if x, ok := x.GetPathMatch().(*PathMatch_Prefix); ok {
-		return x.Prefix
-	}
-	return ""
-}
-
-func (x *PathMatch) GetRegex() string {
-	if x, ok := x.GetPathMatch().(*PathMatch_Regex); ok {
-		return x.Regex
-	}
-	return ""
-}
-
-type isPathMatch_PathMatch interface {
-	isPathMatch_PathMatch()
-}
-
-type PathMatch_Exact struct {
-	Exact string `protobuf:"bytes,1,opt,name=exact,proto3,oneof"`
-}
-
-type PathMatch_Prefix struct {
-	Prefix string `protobuf:"bytes,2,opt,name=prefix,proto3,oneof"`
-}
-
-type PathMatch_Regex struct {
-	Regex string `protobuf:"bytes,3,opt,name=regex,proto3,oneof"`
-}
-
-func (*PathMatch_Exact) isPathMatch_PathMatch() {}
-
-func (*PathMatch_Prefix) isPathMatch_PathMatch() {}
-
-func (*PathMatch_Regex) isPathMatch_PathMatch() {}
-
-type QueryParameterMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	// Types that are assignable to Match:
-	//
-	//	*QueryParameterMatch_Exact
-	//	*QueryParameterMatch_Regex
-	//	*QueryParameterMatch_Present
-	Match isQueryParameterMatch_Match `protobuf_oneof:"match"`
-}
-
-func (x *QueryParameterMatch) Reset() {
-	*x = QueryParameterMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *QueryParameterMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*QueryParameterMatch) ProtoMessage() {}
-
-func (x *QueryParameterMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use QueryParameterMatch.ProtoReflect.Descriptor instead.
-func (*QueryParameterMatch) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *QueryParameterMatch) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (m *QueryParameterMatch) GetMatch() isQueryParameterMatch_Match {
-	if m != nil {
-		return m.Match
-	}
-	return nil
-}
-
-func (x *QueryParameterMatch) GetExact() string {
-	if x, ok := x.GetMatch().(*QueryParameterMatch_Exact); ok {
-		return x.Exact
-	}
-	return ""
-}
-
-func (x *QueryParameterMatch) GetRegex() string {
-	if x, ok := x.GetMatch().(*QueryParameterMatch_Regex); ok {
-		return x.Regex
-	}
-	return ""
-}
-
-func (x *QueryParameterMatch) GetPresent() bool {
-	if x, ok := x.GetMatch().(*QueryParameterMatch_Present); ok {
-		return x.Present
-	}
-	return false
-}
-
-type isQueryParameterMatch_Match interface {
-	isQueryParameterMatch_Match()
-}
-
-type QueryParameterMatch_Exact struct {
-	Exact string `protobuf:"bytes,2,opt,name=exact,proto3,oneof"`
-}
-
-type QueryParameterMatch_Regex struct {
-	Regex string `protobuf:"bytes,3,opt,name=regex,proto3,oneof"`
-}
-
-type QueryParameterMatch_Present struct {
-	Present bool `protobuf:"varint,4,opt,name=present,proto3,oneof"`
-}
-
-func (*QueryParameterMatch_Exact) isQueryParameterMatch_Match() {}
-
-func (*QueryParameterMatch_Regex) isQueryParameterMatch_Match() {}
-
-func (*QueryParameterMatch_Present) isQueryParameterMatch_Match() {}
-
-type HeaderMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	// Types that are assignable to Match:
-	//
-	//	*HeaderMatch_Exact
-	//	*HeaderMatch_Prefix
-	//	*HeaderMatch_Suffix
-	//	*HeaderMatch_Regex
-	//	*HeaderMatch_Present
-	Match       isHeaderMatch_Match `protobuf_oneof:"match"`
-	InvertMatch bool                `protobuf:"varint,7,opt,name=invert_match,json=invertMatch,proto3" json:"invert_match,omitempty"`
-}
-
-func (x *HeaderMatch) Reset() {
-	*x = HeaderMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HeaderMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HeaderMatch) ProtoMessage() {}
-
-func (x *HeaderMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HeaderMatch.ProtoReflect.Descriptor instead.
-func (*HeaderMatch) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *HeaderMatch) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (m *HeaderMatch) GetMatch() isHeaderMatch_Match {
-	if m != nil {
-		return m.Match
-	}
-	return nil
-}
-
-func (x *HeaderMatch) GetExact() string {
-	if x, ok := x.GetMatch().(*HeaderMatch_Exact); ok {
-		return x.Exact
-	}
-	return ""
-}
-
-func (x *HeaderMatch) GetPrefix() string {
-	if x, ok := x.GetMatch().(*HeaderMatch_Prefix); ok {
-		return x.Prefix
-	}
-	return ""
-}
-
-func (x *HeaderMatch) GetSuffix() string {
-	if x, ok := x.GetMatch().(*HeaderMatch_Suffix); ok {
-		return x.Suffix
-	}
-	return ""
-}
-
-func (x *HeaderMatch) GetRegex() string {
-	if x, ok := x.GetMatch().(*HeaderMatch_Regex); ok {
-		return x.Regex
-	}
-	return ""
-}
-
-func (x *HeaderMatch) GetPresent() bool {
-	if x, ok := x.GetMatch().(*HeaderMatch_Present); ok {
-		return x.Present
-	}
-	return false
-}
-
-func (x *HeaderMatch) GetInvertMatch() bool {
-	if x != nil {
-		return x.InvertMatch
-	}
-	return false
-}
-
-type isHeaderMatch_Match interface {
-	isHeaderMatch_Match()
-}
-
-type HeaderMatch_Exact struct {
-	Exact string `protobuf:"bytes,2,opt,name=exact,proto3,oneof"`
-}
-
-type HeaderMatch_Prefix struct {
-	Prefix string `protobuf:"bytes,3,opt,name=prefix,proto3,oneof"`
-}
-
-type HeaderMatch_Suffix struct {
-	Suffix string `protobuf:"bytes,4,opt,name=suffix,proto3,oneof"`
-}
-
-type HeaderMatch_Regex struct {
-	Regex string `protobuf:"bytes,5,opt,name=regex,proto3,oneof"`
-}
-
-type HeaderMatch_Present struct {
-	Present bool `protobuf:"varint,6,opt,name=present,proto3,oneof"`
-}
-
-func (*HeaderMatch_Exact) isHeaderMatch_Match() {}
-
-func (*HeaderMatch_Prefix) isHeaderMatch_Match() {}
-
-func (*HeaderMatch_Suffix) isHeaderMatch_Match() {}
-
-func (*HeaderMatch_Regex) isHeaderMatch_Match() {}
-
-func (*HeaderMatch_Present) isHeaderMatch_Match() {}
-
-// RouteDestination has configuration for where to send a request.
-type RouteDestination struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// destination is one or more clusters to route to.
-	//
-	// Types that are assignable to Destination:
-	//
-	//	*RouteDestination_Cluster
-	//	*RouteDestination_WeightedClusters
-	Destination              isRouteDestination_Destination `protobuf_oneof:"destination"`
-	DestinationConfiguration *DestinationConfiguration      `protobuf:"bytes,3,opt,name=destination_configuration,json=destinationConfiguration,proto3" json:"destination_configuration,omitempty"`
-}
-
-func (x *RouteDestination) Reset() {
-	*x = RouteDestination{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RouteDestination) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RouteDestination) ProtoMessage() {}
-
-func (x *RouteDestination) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RouteDestination.ProtoReflect.Descriptor instead.
-func (*RouteDestination) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{7}
-}
-
-func (m *RouteDestination) GetDestination() isRouteDestination_Destination {
-	if m != nil {
-		return m.Destination
-	}
-	return nil
-}
-
-func (x *RouteDestination) GetCluster() *DestinationCluster {
-	if x, ok := x.GetDestination().(*RouteDestination_Cluster); ok {
-		return x.Cluster
-	}
-	return nil
-}
-
-func (x *RouteDestination) GetWeightedClusters() *L7WeightedClusterGroup {
-	if x, ok := x.GetDestination().(*RouteDestination_WeightedClusters); ok {
-		return x.WeightedClusters
-	}
-	return nil
-}
-
-func (x *RouteDestination) GetDestinationConfiguration() *DestinationConfiguration {
-	if x != nil {
-		return x.DestinationConfiguration
-	}
-	return nil
-}
-
-type isRouteDestination_Destination interface {
-	isRouteDestination_Destination()
-}
-
-type RouteDestination_Cluster struct {
-	Cluster *DestinationCluster `protobuf:"bytes,1,opt,name=cluster,proto3,oneof"`
-}
-
-type RouteDestination_WeightedClusters struct {
-	WeightedClusters *L7WeightedClusterGroup `protobuf:"bytes,2,opt,name=weighted_clusters,json=weightedClusters,proto3,oneof"`
-}
-
-func (*RouteDestination_Cluster) isRouteDestination_Destination() {}
-
-func (*RouteDestination_WeightedClusters) isRouteDestination_Destination() {}
-
-type DestinationConfiguration struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	AutoHostRewrite *wrapperspb.BoolValue     `protobuf:"bytes,1,opt,name=auto_host_rewrite,json=autoHostRewrite,proto3" json:"auto_host_rewrite,omitempty"`
-	HashPolicies    []*LoadBalancerHashPolicy `protobuf:"bytes,2,rep,name=hash_policies,json=hashPolicies,proto3" json:"hash_policies,omitempty"`
-	TimeoutConfig   *TimeoutConfig            `protobuf:"bytes,3,opt,name=timeout_config,json=timeoutConfig,proto3" json:"timeout_config,omitempty"`
-	PrefixRewrite   string                    `protobuf:"bytes,4,opt,name=prefix_rewrite,json=prefixRewrite,proto3" json:"prefix_rewrite,omitempty"`
-	RetryPolicy     *RetryPolicy              `protobuf:"bytes,5,opt,name=retry_policy,json=retryPolicy,proto3" json:"retry_policy,omitempty"`
-}
-
-func (x *DestinationConfiguration) Reset() {
-	*x = DestinationConfiguration{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DestinationConfiguration) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DestinationConfiguration) ProtoMessage() {}
-
-func (x *DestinationConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DestinationConfiguration.ProtoReflect.Descriptor instead.
-func (*DestinationConfiguration) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *DestinationConfiguration) GetAutoHostRewrite() *wrapperspb.BoolValue {
-	if x != nil {
-		return x.AutoHostRewrite
-	}
-	return nil
-}
-
-func (x *DestinationConfiguration) GetHashPolicies() []*LoadBalancerHashPolicy {
-	if x != nil {
-		return x.HashPolicies
-	}
-	return nil
-}
-
-func (x *DestinationConfiguration) GetTimeoutConfig() *TimeoutConfig {
-	if x != nil {
-		return x.TimeoutConfig
-	}
-	return nil
-}
-
-func (x *DestinationConfiguration) GetPrefixRewrite() string {
-	if x != nil {
-		return x.PrefixRewrite
-	}
-	return ""
-}
-
-func (x *DestinationConfiguration) GetRetryPolicy() *RetryPolicy {
-	if x != nil {
-		return x.RetryPolicy
-	}
-	return nil
-}
-
-type RetryPolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RetryOn              string                  `protobuf:"bytes,1,opt,name=retry_on,json=retryOn,proto3" json:"retry_on,omitempty"`
-	NumRetries           *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"`
-	RetriableStatusCodes []uint32                `protobuf:"varint,3,rep,packed,name=retriable_status_codes,json=retriableStatusCodes,proto3" json:"retriable_status_codes,omitempty"`
-}
-
-func (x *RetryPolicy) Reset() {
-	*x = RetryPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RetryPolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RetryPolicy) ProtoMessage() {}
-
-func (x *RetryPolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RetryPolicy.ProtoReflect.Descriptor instead.
-func (*RetryPolicy) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *RetryPolicy) GetRetryOn() string {
-	if x != nil {
-		return x.RetryOn
-	}
-	return ""
-}
-
-func (x *RetryPolicy) GetNumRetries() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.NumRetries
-	}
-	return nil
-}
-
-func (x *RetryPolicy) GetRetriableStatusCodes() []uint32 {
-	if x != nil {
-		return x.RetriableStatusCodes
-	}
-	return nil
-}
-
-type TimeoutConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Timeout     *durationpb.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"`
-	IdleTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"`
-}
-
-func (x *TimeoutConfig) Reset() {
-	*x = TimeoutConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TimeoutConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TimeoutConfig) ProtoMessage() {}
-
-func (x *TimeoutConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TimeoutConfig.ProtoReflect.Descriptor instead.
-func (*TimeoutConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *TimeoutConfig) GetTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.Timeout
-	}
-	return nil
-}
-
-func (x *TimeoutConfig) GetIdleTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.IdleTimeout
-	}
-	return nil
-}
-
-type LoadBalancerHashPolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to Policy:
-	//
-	//	*LoadBalancerHashPolicy_Cookie
-	//	*LoadBalancerHashPolicy_Header
-	//	*LoadBalancerHashPolicy_QueryParameter
-	//	*LoadBalancerHashPolicy_ConnectionProperties
-	Policy isLoadBalancerHashPolicy_Policy `protobuf_oneof:"policy"`
-}
-
-func (x *LoadBalancerHashPolicy) Reset() {
-	*x = LoadBalancerHashPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LoadBalancerHashPolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LoadBalancerHashPolicy) ProtoMessage() {}
-
-func (x *LoadBalancerHashPolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LoadBalancerHashPolicy.ProtoReflect.Descriptor instead.
-func (*LoadBalancerHashPolicy) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{11}
-}
-
-func (m *LoadBalancerHashPolicy) GetPolicy() isLoadBalancerHashPolicy_Policy {
-	if m != nil {
-		return m.Policy
-	}
-	return nil
-}
-
-func (x *LoadBalancerHashPolicy) GetCookie() *CookiePolicy {
-	if x, ok := x.GetPolicy().(*LoadBalancerHashPolicy_Cookie); ok {
-		return x.Cookie
-	}
-	return nil
-}
-
-func (x *LoadBalancerHashPolicy) GetHeader() *HeaderPolicy {
-	if x, ok := x.GetPolicy().(*LoadBalancerHashPolicy_Header); ok {
-		return x.Header
-	}
-	return nil
-}
-
-func (x *LoadBalancerHashPolicy) GetQueryParameter() *QueryParameterPolicy {
-	if x, ok := x.GetPolicy().(*LoadBalancerHashPolicy_QueryParameter); ok {
-		return x.QueryParameter
-	}
-	return nil
-}
-
-func (x *LoadBalancerHashPolicy) GetConnectionProperties() *ConnectionPropertiesPolicy {
-	if x, ok := x.GetPolicy().(*LoadBalancerHashPolicy_ConnectionProperties); ok {
-		return x.ConnectionProperties
-	}
-	return nil
-}
-
-type isLoadBalancerHashPolicy_Policy interface {
-	isLoadBalancerHashPolicy_Policy()
-}
-
-type LoadBalancerHashPolicy_Cookie struct {
-	Cookie *CookiePolicy `protobuf:"bytes,1,opt,name=cookie,proto3,oneof"`
-}
-
-type LoadBalancerHashPolicy_Header struct {
-	Header *HeaderPolicy `protobuf:"bytes,2,opt,name=header,proto3,oneof"`
-}
-
-type LoadBalancerHashPolicy_QueryParameter struct {
-	QueryParameter *QueryParameterPolicy `protobuf:"bytes,3,opt,name=query_parameter,json=queryParameter,proto3,oneof"`
-}
-
-type LoadBalancerHashPolicy_ConnectionProperties struct {
-	ConnectionProperties *ConnectionPropertiesPolicy `protobuf:"bytes,4,opt,name=connection_properties,json=connectionProperties,proto3,oneof"`
-}
-
-func (*LoadBalancerHashPolicy_Cookie) isLoadBalancerHashPolicy_Policy() {}
-
-func (*LoadBalancerHashPolicy_Header) isLoadBalancerHashPolicy_Policy() {}
-
-func (*LoadBalancerHashPolicy_QueryParameter) isLoadBalancerHashPolicy_Policy() {}
-
-func (*LoadBalancerHashPolicy_ConnectionProperties) isLoadBalancerHashPolicy_Policy() {}
-
-type CookiePolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name     string               `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Ttl      *durationpb.Duration `protobuf:"bytes,2,opt,name=ttl,proto3" json:"ttl,omitempty"`
-	Path     string               `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"`
-	Terminal bool                 `protobuf:"varint,4,opt,name=terminal,proto3" json:"terminal,omitempty"`
-}
-
-func (x *CookiePolicy) Reset() {
-	*x = CookiePolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CookiePolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CookiePolicy) ProtoMessage() {}
-
-func (x *CookiePolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CookiePolicy.ProtoReflect.Descriptor instead.
-func (*CookiePolicy) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *CookiePolicy) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *CookiePolicy) GetTtl() *durationpb.Duration {
-	if x != nil {
-		return x.Ttl
-	}
-	return nil
-}
-
-func (x *CookiePolicy) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-func (x *CookiePolicy) GetTerminal() bool {
-	if x != nil {
-		return x.Terminal
-	}
-	return false
-}
-
-type HeaderPolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name     string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Terminal bool   `protobuf:"varint,2,opt,name=terminal,proto3" json:"terminal,omitempty"`
-}
-
-func (x *HeaderPolicy) Reset() {
-	*x = HeaderPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HeaderPolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HeaderPolicy) ProtoMessage() {}
-
-func (x *HeaderPolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HeaderPolicy.ProtoReflect.Descriptor instead.
-func (*HeaderPolicy) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{13}
-}
-
-func (x *HeaderPolicy) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *HeaderPolicy) GetTerminal() bool {
-	if x != nil {
-		return x.Terminal
-	}
-	return false
-}
-
-type QueryParameterPolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name     string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Terminal bool   `protobuf:"varint,2,opt,name=terminal,proto3" json:"terminal,omitempty"`
-}
-
-func (x *QueryParameterPolicy) Reset() {
-	*x = QueryParameterPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *QueryParameterPolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*QueryParameterPolicy) ProtoMessage() {}
-
-func (x *QueryParameterPolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use QueryParameterPolicy.ProtoReflect.Descriptor instead.
-func (*QueryParameterPolicy) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{14}
-}
-
-func (x *QueryParameterPolicy) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *QueryParameterPolicy) GetTerminal() bool {
-	if x != nil {
-		return x.Terminal
-	}
-	return false
-}
-
-type ConnectionPropertiesPolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	SourceIp bool `protobuf:"varint,1,opt,name=source_ip,json=sourceIp,proto3" json:"source_ip,omitempty"`
-	Terminal bool `protobuf:"varint,2,opt,name=terminal,proto3" json:"terminal,omitempty"`
-}
-
-func (x *ConnectionPropertiesPolicy) Reset() {
-	*x = ConnectionPropertiesPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ConnectionPropertiesPolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ConnectionPropertiesPolicy) ProtoMessage() {}
-
-func (x *ConnectionPropertiesPolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ConnectionPropertiesPolicy.ProtoReflect.Descriptor instead.
-func (*ConnectionPropertiesPolicy) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP(), []int{15}
-}
-
-func (x *ConnectionPropertiesPolicy) GetSourceIp() bool {
-	if x != nil {
-		return x.SourceIp
-	}
-	return false
-}
-
-func (x *ConnectionPropertiesPolicy) GetTerminal() bool {
-	if x != nil {
-		return x.Terminal
-	}
-	return false
-}
-
-var File_pbmesh_v2beta1_pbproxystate_route_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_pbproxystate_route_proto_rawDesc = []byte{
-	0x0a, 0x27, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x72, 0x6f,
-	0x75, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x2a, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x29, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x32, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0x65, 0x0a, 0x05, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x5c, 0x0a,
-	0x0d, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74,
-	0x65, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x52, 0x0c, 0x76,
-	0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x73, 0x22, 0xfa, 0x01, 0x0a, 0x0b,
-	0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
-	0x18, 0x0a, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x12, 0x65, 0x0a, 0x10, 0x68, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x5f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x0f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x12, 0x56, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18,
-	0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0a, 0x72, 0x6f,
-	0x75, 0x74, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x22, 0xa0, 0x02, 0x0a, 0x09, 0x52, 0x6f, 0x75,
-	0x74, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x4c, 0x0a, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x05, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x12, 0x5e, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x44, 0x65, 0x73, 0x74,
-	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x65, 0x0a, 0x10, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d,
-	0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3a,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70,
-	0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xe2, 0x02, 0x0a, 0x0a,
-	0x52, 0x6f, 0x75, 0x74, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x54, 0x0a, 0x0a, 0x70, 0x61,
-	0x74, 0x68, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70,
-	0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x61, 0x74, 0x68,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x09, 0x70, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x12, 0x5e, 0x0a, 0x0e, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x52, 0x0d, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73,
-	0x12, 0x25, 0x0a, 0x0e, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x12, 0x77, 0x0a, 0x17, 0x71, 0x75, 0x65, 0x72, 0x79,
-	0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d,
-	0x65, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x15, 0x71, 0x75, 0x65, 0x72, 0x79,
-	0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73,
-	0x22, 0x63, 0x0a, 0x09, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x16, 0x0a,
-	0x05, 0x65, 0x78, 0x61, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05,
-	0x65, 0x78, 0x61, 0x63, 0x74, 0x12, 0x18, 0x0a, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12,
-	0x16, 0x0a, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00,
-	0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x42, 0x0c, 0x0a, 0x0a, 0x70, 0x61, 0x74, 0x68, 0x5f,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x22, 0x7e, 0x0a, 0x13, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61,
-	0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x12, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x16, 0x0a, 0x05, 0x65, 0x78, 0x61, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48,
-	0x00, 0x52, 0x05, 0x65, 0x78, 0x61, 0x63, 0x74, 0x12, 0x16, 0x0a, 0x05, 0x72, 0x65, 0x67, 0x65,
-	0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78,
-	0x12, 0x1a, 0x0a, 0x07, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x08, 0x48, 0x00, 0x52, 0x07, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x42, 0x07, 0x0a, 0x05,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x22, 0xcd, 0x01, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x05, 0x65, 0x78, 0x61,
-	0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x65, 0x78, 0x61, 0x63,
-	0x74, 0x12, 0x18, 0x0a, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x48, 0x00, 0x52, 0x06, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x18, 0x0a, 0x06, 0x73,
-	0x75, 0x66, 0x66, 0x69, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x73,
-	0x75, 0x66, 0x66, 0x69, 0x78, 0x12, 0x16, 0x0a, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x12, 0x1a, 0x0a,
-	0x07, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00,
-	0x52, 0x07, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x6e, 0x76,
-	0x65, 0x72, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x0b, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x07, 0x0a, 0x05,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x22, 0xf4, 0x02, 0x0a, 0x10, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x44,
-	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5a, 0x0a, 0x07, 0x63, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x48, 0x00, 0x52, 0x07, 0x63,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x71, 0x0a, 0x11, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74,
-	0x65, 0x64, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x42, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c,
-	0x37, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x47, 0x72, 0x6f, 0x75, 0x70, 0x48, 0x00, 0x52, 0x10, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65,
-	0x64, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x81, 0x01, 0x0a, 0x19, 0x64, 0x65,
-	0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x44, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69,
-	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x18, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0d, 0x0a,
-	0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xb0, 0x03, 0x0a,
-	0x18, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x46, 0x0a, 0x11, 0x61, 0x75, 0x74,
-	0x6f, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x52, 0x0f, 0x61, 0x75, 0x74, 0x6f, 0x48, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74,
-	0x65, 0x12, 0x67, 0x0a, 0x0d, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69,
-	0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63,
-	0x65, 0x72, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0c, 0x68, 0x61,
-	0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x12, 0x60, 0x0a, 0x0e, 0x74, 0x69,
-	0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e,
-	0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x74,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x25, 0x0a, 0x0e,
-	0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x72, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x52, 0x65, 0x77, 0x72,
-	0x69, 0x74, 0x65, 0x12, 0x5a, 0x0a, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x52, 0x0b, 0x72, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22,
-	0x9d, 0x01, 0x0a, 0x0b, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12,
-	0x19, 0x0a, 0x08, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x72, 0x65, 0x74, 0x72, 0x79, 0x4f, 0x6e, 0x12, 0x3d, 0x0a, 0x0b, 0x6e, 0x75,
-	0x6d, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0a, 0x6e,
-	0x75, 0x6d, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x16, 0x72, 0x65, 0x74,
-	0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x63, 0x6f,
-	0x64, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x14, 0x72, 0x65, 0x74, 0x72, 0x69,
-	0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x22,
-	0x82, 0x01, 0x0a, 0x0d, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x33, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x74,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x3c, 0x0a, 0x0c, 0x69, 0x64, 0x6c, 0x65, 0x5f, 0x74,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x69, 0x64, 0x6c, 0x65, 0x54, 0x69, 0x6d,
-	0x65, 0x6f, 0x75, 0x74, 0x22, 0xb6, 0x03, 0x0a, 0x16, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c,
-	0x61, 0x6e, 0x63, 0x65, 0x72, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12,
-	0x52, 0x0a, 0x06, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x43, 0x6f, 0x6f,
-	0x6b, 0x69, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x48, 0x00, 0x52, 0x06, 0x63, 0x6f, 0x6f,
-	0x6b, 0x69, 0x65, 0x12, 0x52, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x48, 0x00, 0x52,
-	0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x6b, 0x0a, 0x0f, 0x71, 0x75, 0x65, 0x72, 0x79,
-	0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x40, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x51, 0x75,
-	0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x48, 0x00, 0x52, 0x0e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d,
-	0x65, 0x74, 0x65, 0x72, 0x12, 0x7d, 0x0a, 0x15, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x46, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65,
-	0x72, 0x74, 0x69, 0x65, 0x73, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x48, 0x00, 0x52, 0x14, 0x63,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
-	0x69, 0x65, 0x73, 0x42, 0x08, 0x0a, 0x06, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0x7f, 0x0a,
-	0x0c, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x12, 0x0a,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x2b, 0x0a, 0x03, 0x74, 0x74, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x12,
-	0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61,
-	0x74, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x22, 0x3e,
-	0x0a, 0x0c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x12,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x22, 0x46,
-	0x0a, 0x14, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
-	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x65,
-	0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x74, 0x65,
-	0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x22, 0x55, 0x0a, 0x1a, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x50, 0x6f,
-	0x6c, 0x69, 0x63, 0x79, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69,
-	0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49,
-	0x70, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x42, 0xd0, 0x02,
-	0x0a, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x42, 0x0a, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0xa2, 0x02, 0x05, 0x48, 0x43, 0x4d, 0x56, 0x50, 0xaa, 0x02, 0x2a, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x62, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xca, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73,
-	0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xe2, 0x02, 0x36, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
-	0x02, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x3a, 0x3a, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescData = file_pbmesh_v2beta1_pbproxystate_route_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_pbproxystate_route_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
-var file_pbmesh_v2beta1_pbproxystate_route_proto_goTypes = []interface{}{
-	(*Route)(nil),                      // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.Route
-	(*VirtualHost)(nil),                // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.VirtualHost
-	(*RouteRule)(nil),                  // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.RouteRule
-	(*RouteMatch)(nil),                 // 3: hashicorp.consul.mesh.v2beta1.pbproxystate.RouteMatch
-	(*PathMatch)(nil),                  // 4: hashicorp.consul.mesh.v2beta1.pbproxystate.PathMatch
-	(*QueryParameterMatch)(nil),        // 5: hashicorp.consul.mesh.v2beta1.pbproxystate.QueryParameterMatch
-	(*HeaderMatch)(nil),                // 6: hashicorp.consul.mesh.v2beta1.pbproxystate.HeaderMatch
-	(*RouteDestination)(nil),           // 7: hashicorp.consul.mesh.v2beta1.pbproxystate.RouteDestination
-	(*DestinationConfiguration)(nil),   // 8: hashicorp.consul.mesh.v2beta1.pbproxystate.DestinationConfiguration
-	(*RetryPolicy)(nil),                // 9: hashicorp.consul.mesh.v2beta1.pbproxystate.RetryPolicy
-	(*TimeoutConfig)(nil),              // 10: hashicorp.consul.mesh.v2beta1.pbproxystate.TimeoutConfig
-	(*LoadBalancerHashPolicy)(nil),     // 11: hashicorp.consul.mesh.v2beta1.pbproxystate.LoadBalancerHashPolicy
-	(*CookiePolicy)(nil),               // 12: hashicorp.consul.mesh.v2beta1.pbproxystate.CookiePolicy
-	(*HeaderPolicy)(nil),               // 13: hashicorp.consul.mesh.v2beta1.pbproxystate.HeaderPolicy
-	(*QueryParameterPolicy)(nil),       // 14: hashicorp.consul.mesh.v2beta1.pbproxystate.QueryParameterPolicy
-	(*ConnectionPropertiesPolicy)(nil), // 15: hashicorp.consul.mesh.v2beta1.pbproxystate.ConnectionPropertiesPolicy
-	(*HeaderMutation)(nil),             // 16: hashicorp.consul.mesh.v2beta1.pbproxystate.HeaderMutation
-	(*DestinationCluster)(nil),         // 17: hashicorp.consul.mesh.v2beta1.pbproxystate.DestinationCluster
-	(*L7WeightedClusterGroup)(nil),     // 18: hashicorp.consul.mesh.v2beta1.pbproxystate.L7WeightedClusterGroup
-	(*wrapperspb.BoolValue)(nil),       // 19: google.protobuf.BoolValue
-	(*wrapperspb.UInt32Value)(nil),     // 20: google.protobuf.UInt32Value
-	(*durationpb.Duration)(nil),        // 21: google.protobuf.Duration
-}
-var file_pbmesh_v2beta1_pbproxystate_route_proto_depIdxs = []int32{
-	1,  // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.Route.virtual_hosts:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.VirtualHost
-	16, // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.VirtualHost.header_mutations:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.HeaderMutation
-	2,  // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.VirtualHost.route_rules:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.RouteRule
-	3,  // 3: hashicorp.consul.mesh.v2beta1.pbproxystate.RouteRule.match:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.RouteMatch
-	7,  // 4: hashicorp.consul.mesh.v2beta1.pbproxystate.RouteRule.destination:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.RouteDestination
-	16, // 5: hashicorp.consul.mesh.v2beta1.pbproxystate.RouteRule.header_mutations:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.HeaderMutation
-	4,  // 6: hashicorp.consul.mesh.v2beta1.pbproxystate.RouteMatch.path_match:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.PathMatch
-	6,  // 7: hashicorp.consul.mesh.v2beta1.pbproxystate.RouteMatch.header_matches:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.HeaderMatch
-	5,  // 8: hashicorp.consul.mesh.v2beta1.pbproxystate.RouteMatch.query_parameter_matches:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.QueryParameterMatch
-	17, // 9: hashicorp.consul.mesh.v2beta1.pbproxystate.RouteDestination.cluster:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.DestinationCluster
-	18, // 10: hashicorp.consul.mesh.v2beta1.pbproxystate.RouteDestination.weighted_clusters:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.L7WeightedClusterGroup
-	8,  // 11: hashicorp.consul.mesh.v2beta1.pbproxystate.RouteDestination.destination_configuration:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.DestinationConfiguration
-	19, // 12: hashicorp.consul.mesh.v2beta1.pbproxystate.DestinationConfiguration.auto_host_rewrite:type_name -> google.protobuf.BoolValue
-	11, // 13: hashicorp.consul.mesh.v2beta1.pbproxystate.DestinationConfiguration.hash_policies:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.LoadBalancerHashPolicy
-	10, // 14: hashicorp.consul.mesh.v2beta1.pbproxystate.DestinationConfiguration.timeout_config:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TimeoutConfig
-	9,  // 15: hashicorp.consul.mesh.v2beta1.pbproxystate.DestinationConfiguration.retry_policy:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.RetryPolicy
-	20, // 16: hashicorp.consul.mesh.v2beta1.pbproxystate.RetryPolicy.num_retries:type_name -> google.protobuf.UInt32Value
-	21, // 17: hashicorp.consul.mesh.v2beta1.pbproxystate.TimeoutConfig.timeout:type_name -> google.protobuf.Duration
-	21, // 18: hashicorp.consul.mesh.v2beta1.pbproxystate.TimeoutConfig.idle_timeout:type_name -> google.protobuf.Duration
-	12, // 19: hashicorp.consul.mesh.v2beta1.pbproxystate.LoadBalancerHashPolicy.cookie:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.CookiePolicy
-	13, // 20: hashicorp.consul.mesh.v2beta1.pbproxystate.LoadBalancerHashPolicy.header:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.HeaderPolicy
-	14, // 21: hashicorp.consul.mesh.v2beta1.pbproxystate.LoadBalancerHashPolicy.query_parameter:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.QueryParameterPolicy
-	15, // 22: hashicorp.consul.mesh.v2beta1.pbproxystate.LoadBalancerHashPolicy.connection_properties:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.ConnectionPropertiesPolicy
-	21, // 23: hashicorp.consul.mesh.v2beta1.pbproxystate.CookiePolicy.ttl:type_name -> google.protobuf.Duration
-	24, // [24:24] is the sub-list for method output_type
-	24, // [24:24] is the sub-list for method input_type
-	24, // [24:24] is the sub-list for extension type_name
-	24, // [24:24] is the sub-list for extension extendee
-	0,  // [0:24] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_pbproxystate_route_proto_init() }
-func file_pbmesh_v2beta1_pbproxystate_route_proto_init() {
-	if File_pbmesh_v2beta1_pbproxystate_route_proto != nil {
-		return
-	}
-	file_pbmesh_v2beta1_pbproxystate_cluster_proto_init()
-	file_pbmesh_v2beta1_pbproxystate_header_mutations_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Route); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*VirtualHost); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RouteRule); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RouteMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PathMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*QueryParameterMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HeaderMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RouteDestination); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DestinationConfiguration); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RetryPolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TimeoutConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LoadBalancerHashPolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CookiePolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HeaderPolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*QueryParameterPolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ConnectionPropertiesPolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[4].OneofWrappers = []interface{}{
-		(*PathMatch_Exact)(nil),
-		(*PathMatch_Prefix)(nil),
-		(*PathMatch_Regex)(nil),
-	}
-	file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[5].OneofWrappers = []interface{}{
-		(*QueryParameterMatch_Exact)(nil),
-		(*QueryParameterMatch_Regex)(nil),
-		(*QueryParameterMatch_Present)(nil),
-	}
-	file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[6].OneofWrappers = []interface{}{
-		(*HeaderMatch_Exact)(nil),
-		(*HeaderMatch_Prefix)(nil),
-		(*HeaderMatch_Suffix)(nil),
-		(*HeaderMatch_Regex)(nil),
-		(*HeaderMatch_Present)(nil),
-	}
-	file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[7].OneofWrappers = []interface{}{
-		(*RouteDestination_Cluster)(nil),
-		(*RouteDestination_WeightedClusters)(nil),
-	}
-	file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes[11].OneofWrappers = []interface{}{
-		(*LoadBalancerHashPolicy_Cookie)(nil),
-		(*LoadBalancerHashPolicy_Header)(nil),
-		(*LoadBalancerHashPolicy_QueryParameter)(nil),
-		(*LoadBalancerHashPolicy_ConnectionProperties)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_pbproxystate_route_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   16,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_pbproxystate_route_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_pbproxystate_route_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_pbproxystate_route_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_pbproxystate_route_proto = out.File
-	file_pbmesh_v2beta1_pbproxystate_route_proto_rawDesc = nil
-	file_pbmesh_v2beta1_pbproxystate_route_proto_goTypes = nil
-	file_pbmesh_v2beta1_pbproxystate_route_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/route.proto b/proto-public/pbmesh/v2beta1/pbproxystate/route.proto
deleted file mode 100644
index 37f43067bec2c..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/route.proto
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1.pbproxystate;
-
-import "google/protobuf/duration.proto";
-import "google/protobuf/wrappers.proto";
-import "pbmesh/v2beta1/pbproxystate/cluster.proto";
-import "pbmesh/v2beta1/pbproxystate/header_mutations.proto";
-
-message Route {
-  // virtual_hosts is a list of virtual hosts. A virtual host is selected based on an incoming request's host header.
-  repeated VirtualHost virtual_hosts = 1;
-}
-
-message VirtualHost {
-  string name = 1;
-  // domains are used to match an incoming request's host header and determine which virtual host to use.
-  repeated string domains = 2;
-  // header_mutations to apply to the request when it matches this virtual host. These are applied after any headers in
-  // the RouteRule.
-  repeated HeaderMutation header_mutations = 3;
-  // route_rules are a list of rules to use for what to do next with this request. The first rule with a match will be
-  // used.
-  repeated RouteRule route_rules = 4;
-}
-
-message RouteRule {
-  // match determines how to match the request. The first match determines which destination the request will go to.
-  RouteMatch match = 1;
-  // destination is where to send the request to.
-  RouteDestination destination = 2;
-  // header_mutations to apply to the request. These are applied before the VirtualHost header mutations.
-  repeated HeaderMutation header_mutations = 3;
-}
-
-// RouteMatch has configuration to match a request.
-message RouteMatch {
-  PathMatch path_match = 1;
-  repeated HeaderMatch header_matches = 2;
-  repeated string method_matches = 3;
-  repeated QueryParameterMatch query_parameter_matches = 4;
-}
-
-message PathMatch {
-  oneof path_match {
-    string exact = 1;
-    string prefix = 2;
-    string regex = 3;
-  }
-}
-
-message QueryParameterMatch {
-  string name = 1;
-  oneof match {
-    string exact = 2;
-    string regex = 3;
-    bool present = 4;
-  }
-}
-
-message HeaderMatch {
-  string name = 1;
-  oneof match {
-    string exact = 2;
-    string prefix = 3;
-    string suffix = 4;
-    string regex = 5;
-    bool present = 6;
-  }
-  bool invert_match = 7;
-}
-
-// RouteDestination has configuration for where to send a request.
-message RouteDestination {
-  // destination is one or more clusters to route to.
-  oneof destination {
-    DestinationCluster cluster = 1;
-    L7WeightedClusterGroup weighted_clusters = 2;
-  }
-  DestinationConfiguration destination_configuration = 3;
-}
-
-message DestinationConfiguration {
-  google.protobuf.BoolValue auto_host_rewrite = 1;
-  repeated LoadBalancerHashPolicy hash_policies = 2;
-  TimeoutConfig timeout_config = 3;
-  string prefix_rewrite = 4;
-  RetryPolicy retry_policy = 5;
-}
-
-message RetryPolicy {
-  string retry_on = 1;
-  google.protobuf.UInt32Value num_retries = 2;
-  repeated uint32 retriable_status_codes = 3;
-}
-
-message TimeoutConfig {
-  google.protobuf.Duration timeout = 1;
-  google.protobuf.Duration idle_timeout = 2;
-}
-
-message LoadBalancerHashPolicy {
-  oneof policy {
-    CookiePolicy cookie = 1;
-    HeaderPolicy header = 2;
-    QueryParameterPolicy query_parameter = 3;
-    ConnectionPropertiesPolicy connection_properties = 4;
-  }
-}
-
-message CookiePolicy {
-  string name = 1;
-  google.protobuf.Duration ttl = 2;
-  string path = 3;
-  bool terminal = 4;
-}
-message HeaderPolicy {
-  string name = 1;
-  bool terminal = 2;
-}
-message QueryParameterPolicy {
-  string name = 1;
-  bool terminal = 2;
-}
-message ConnectionPropertiesPolicy {
-  bool source_ip = 1;
-  bool terminal = 2;
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/traffic_permissions.pb.binary.go b/proto-public/pbmesh/v2beta1/pbproxystate/traffic_permissions.pb.binary.go
deleted file mode 100644
index 403b64f4699e0..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/traffic_permissions.pb.binary.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/pbproxystate/traffic_permissions.proto
-
-package pbproxystate
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TrafficPermissions) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TrafficPermissions) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Permission) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Permission) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Principal) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Principal) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Spiffe) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Spiffe) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/traffic_permissions.pb.go b/proto-public/pbmesh/v2beta1/pbproxystate/traffic_permissions.pb.go
deleted file mode 100644
index def42e933f97d..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/traffic_permissions.pb.go
+++ /dev/null
@@ -1,429 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/pbproxystate/traffic_permissions.proto
-
-package pbproxystate
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type TrafficPermissions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	AllowPermissions []*Permission `protobuf:"bytes,1,rep,name=allow_permissions,json=allowPermissions,proto3" json:"allow_permissions,omitempty"`
-	DenyPermissions  []*Permission `protobuf:"bytes,2,rep,name=deny_permissions,json=denyPermissions,proto3" json:"deny_permissions,omitempty"`
-	// default_allow determines if the workload is in default allow mode. This is determined
-	// by combining the cluster's default allow setting with the is_default property on
-	// computed traffic permissions.
-	DefaultAllow bool `protobuf:"varint,4,opt,name=default_allow,json=defaultAllow,proto3" json:"default_allow,omitempty"`
-}
-
-func (x *TrafficPermissions) Reset() {
-	*x = TrafficPermissions{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TrafficPermissions) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TrafficPermissions) ProtoMessage() {}
-
-func (x *TrafficPermissions) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TrafficPermissions.ProtoReflect.Descriptor instead.
-func (*TrafficPermissions) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *TrafficPermissions) GetAllowPermissions() []*Permission {
-	if x != nil {
-		return x.AllowPermissions
-	}
-	return nil
-}
-
-func (x *TrafficPermissions) GetDenyPermissions() []*Permission {
-	if x != nil {
-		return x.DenyPermissions
-	}
-	return nil
-}
-
-func (x *TrafficPermissions) GetDefaultAllow() bool {
-	if x != nil {
-		return x.DefaultAllow
-	}
-	return false
-}
-
-type Permission struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Principals []*Principal `protobuf:"bytes,1,rep,name=principals,proto3" json:"principals,omitempty"`
-}
-
-func (x *Permission) Reset() {
-	*x = Permission{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Permission) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Permission) ProtoMessage() {}
-
-func (x *Permission) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Permission.ProtoReflect.Descriptor instead.
-func (*Permission) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Permission) GetPrincipals() []*Principal {
-	if x != nil {
-		return x.Principals
-	}
-	return nil
-}
-
-type Principal struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Spiffe         *Spiffe   `protobuf:"bytes,1,opt,name=spiffe,proto3" json:"spiffe,omitempty"`
-	ExcludeSpiffes []*Spiffe `protobuf:"bytes,2,rep,name=exclude_spiffes,json=excludeSpiffes,proto3" json:"exclude_spiffes,omitempty"`
-}
-
-func (x *Principal) Reset() {
-	*x = Principal{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Principal) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Principal) ProtoMessage() {}
-
-func (x *Principal) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Principal.ProtoReflect.Descriptor instead.
-func (*Principal) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *Principal) GetSpiffe() *Spiffe {
-	if x != nil {
-		return x.Spiffe
-	}
-	return nil
-}
-
-func (x *Principal) GetExcludeSpiffes() []*Spiffe {
-	if x != nil {
-		return x.ExcludeSpiffes
-	}
-	return nil
-}
-
-type Spiffe struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// regex is the regular expression for matching spiffe ids.
-	Regex string `protobuf:"bytes,1,opt,name=regex,proto3" json:"regex,omitempty"`
-	// xfcc_regex specifies that Envoy needs to find the spiffe id in an xfcc header.
-	// It is currently unused, but considering this is important for to avoid breaking changes.
-	XfccRegex string `protobuf:"bytes,2,opt,name=xfcc_regex,json=xfccRegex,proto3" json:"xfcc_regex,omitempty"`
-}
-
-func (x *Spiffe) Reset() {
-	*x = Spiffe{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Spiffe) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Spiffe) ProtoMessage() {}
-
-func (x *Spiffe) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Spiffe.ProtoReflect.Descriptor instead.
-func (*Spiffe) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *Spiffe) GetRegex() string {
-	if x != nil {
-		return x.Regex
-	}
-	return ""
-}
-
-func (x *Spiffe) GetXfccRegex() string {
-	if x != nil {
-		return x.XfccRegex
-	}
-	return ""
-}
-
-var File_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDesc = []byte{
-	0x0a, 0x35, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x74, 0x72,
-	0x61, 0x66, 0x66, 0x69, 0x63, 0x5f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x2a, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x22, 0x81, 0x02, 0x0a, 0x12, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x50,
-	0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x63, 0x0a, 0x11, 0x61, 0x6c,
-	0x6c, 0x6f, 0x77, 0x5f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x61,
-	0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12,
-	0x61, 0x0a, 0x10, 0x64, 0x65, 0x6e, 0x79, 0x5f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f,
-	0x6e, 0x52, 0x0f, 0x64, 0x65, 0x6e, 0x79, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x61, 0x6c,
-	0x6c, 0x6f, 0x77, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x22, 0x63, 0x0a, 0x0a, 0x50, 0x65, 0x72, 0x6d, 0x69,
-	0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x55, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x6e, 0x63, 0x69, 0x70,
-	0x61, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x72, 0x69, 0x6e, 0x63, 0x69, 0x70, 0x61, 0x6c,
-	0x52, 0x0a, 0x70, 0x72, 0x69, 0x6e, 0x63, 0x69, 0x70, 0x61, 0x6c, 0x73, 0x22, 0xb4, 0x01, 0x0a,
-	0x09, 0x50, 0x72, 0x69, 0x6e, 0x63, 0x69, 0x70, 0x61, 0x6c, 0x12, 0x4a, 0x0a, 0x06, 0x73, 0x70,
-	0x69, 0x66, 0x66, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x70, 0x69, 0x66, 0x66, 0x65, 0x52, 0x06,
-	0x73, 0x70, 0x69, 0x66, 0x66, 0x65, 0x12, 0x5b, 0x0a, 0x0f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64,
-	0x65, 0x5f, 0x73, 0x70, 0x69, 0x66, 0x66, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x70, 0x69,
-	0x66, 0x66, 0x65, 0x52, 0x0e, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x53, 0x70, 0x69, 0x66,
-	0x66, 0x65, 0x73, 0x22, 0x3d, 0x0a, 0x06, 0x53, 0x70, 0x69, 0x66, 0x66, 0x65, 0x12, 0x14, 0x0a,
-	0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x72, 0x65,
-	0x67, 0x65, 0x78, 0x12, 0x1d, 0x0a, 0x0a, 0x78, 0x66, 0x63, 0x63, 0x5f, 0x72, 0x65, 0x67, 0x65,
-	0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x78, 0x66, 0x63, 0x63, 0x52, 0x65, 0x67,
-	0x65, 0x78, 0x42, 0xdd, 0x02, 0x0a, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x42, 0x17, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x50, 0x65,
-	0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73,
-	0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xa2, 0x02, 0x05, 0x48, 0x43, 0x4d, 0x56, 0x50, 0xaa, 0x02,
-	0x2a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50,
-	0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xca, 0x02, 0x2a, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d,
-	0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xe2, 0x02, 0x36, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68,
-	0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-	0x61, 0xea, 0x02, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x3a, 0x3a, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDescData = file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_goTypes = []interface{}{
-	(*TrafficPermissions)(nil), // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.TrafficPermissions
-	(*Permission)(nil),         // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.Permission
-	(*Principal)(nil),          // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.Principal
-	(*Spiffe)(nil),             // 3: hashicorp.consul.mesh.v2beta1.pbproxystate.Spiffe
-}
-var file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.TrafficPermissions.allow_permissions:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Permission
-	1, // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.TrafficPermissions.deny_permissions:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Permission
-	2, // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.Permission.principals:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Principal
-	3, // 3: hashicorp.consul.mesh.v2beta1.pbproxystate.Principal.spiffe:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Spiffe
-	3, // 4: hashicorp.consul.mesh.v2beta1.pbproxystate.Principal.exclude_spiffes:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Spiffe
-	5, // [5:5] is the sub-list for method output_type
-	5, // [5:5] is the sub-list for method input_type
-	5, // [5:5] is the sub-list for extension type_name
-	5, // [5:5] is the sub-list for extension extendee
-	0, // [0:5] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_init() }
-func file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_init() {
-	if File_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TrafficPermissions); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Permission); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Principal); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Spiffe); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   4,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto = out.File
-	file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_rawDesc = nil
-	file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_goTypes = nil
-	file_pbmesh_v2beta1_pbproxystate_traffic_permissions_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/traffic_permissions.proto b/proto-public/pbmesh/v2beta1/pbproxystate/traffic_permissions.proto
deleted file mode 100644
index 918b092c0a36e..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/traffic_permissions.proto
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1.pbproxystate;
-
-message TrafficPermissions {
-  repeated Permission allow_permissions = 1;
-  repeated Permission deny_permissions = 2;
-  // default_allow determines if the workload is in default allow mode. This is determined
-  // by combining the cluster's default allow setting with the is_default property on
-  // computed traffic permissions.
-  bool default_allow = 4;
-}
-
-message Permission {
-  repeated Principal principals = 1;
-
-  // We don't need destination rules here yet because they either apply to L7 features or multi-ports.
-  // In the case of multiple ports, the sidecar proxy controller is responsible for filtering
-  // per-port permissions.
-}
-
-message Principal {
-  Spiffe spiffe = 1;
-  repeated Spiffe exclude_spiffes = 2;
-}
-
-message Spiffe {
-  // regex is the regular expression for matching spiffe ids.
-  string regex = 1;
-
-  // xfcc_regex specifies that Envoy needs to find the spiffe id in an xfcc header.
-  // It is currently unused, but considering this is important for to avoid breaking changes.
-  string xfcc_regex = 2;
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/transport_socket.pb.binary.go b/proto-public/pbmesh/v2beta1/pbproxystate/transport_socket.pb.binary.go
deleted file mode 100644
index 867d974415386..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/transport_socket.pb.binary.go
+++ /dev/null
@@ -1,138 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/pbproxystate/transport_socket.proto
-
-package pbproxystate
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TLS) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TLS) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TransportSocket) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TransportSocket) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *InboundMeshMTLS) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *InboundMeshMTLS) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *OutboundMeshMTLS) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *OutboundMeshMTLS) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *InboundNonMeshTLS) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *InboundNonMeshTLS) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *OutboundNonMeshTLS) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *OutboundNonMeshTLS) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *MeshInboundValidationContext) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *MeshInboundValidationContext) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *MeshOutboundValidationContext) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *MeshOutboundValidationContext) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *NonMeshOutboundValidationContext) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *NonMeshOutboundValidationContext) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *SDSCertificate) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *SDSCertificate) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TLSParameters) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TLSParameters) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LeafCertificate) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LeafCertificate) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TrustBundle) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TrustBundle) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/transport_socket.pb.go b/proto-public/pbmesh/v2beta1/pbproxystate/transport_socket.pb.go
deleted file mode 100644
index 5d926042f862f..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/transport_socket.pb.go
+++ /dev/null
@@ -1,1503 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/pbproxystate/transport_socket.proto
-
-package pbproxystate
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type TLSVersion int32
-
-const (
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	TLSVersion_TLS_VERSION_AUTO        TLSVersion = 0
-	TLSVersion_TLS_VERSION_1_0         TLSVersion = 1
-	TLSVersion_TLS_VERSION_1_1         TLSVersion = 2
-	TLSVersion_TLS_VERSION_1_2         TLSVersion = 3
-	TLSVersion_TLS_VERSION_1_3         TLSVersion = 4
-	TLSVersion_TLS_VERSION_INVALID     TLSVersion = 5
-	TLSVersion_TLS_VERSION_UNSPECIFIED TLSVersion = 6
-)
-
-// Enum value maps for TLSVersion.
-var (
-	TLSVersion_name = map[int32]string{
-		0: "TLS_VERSION_AUTO",
-		1: "TLS_VERSION_1_0",
-		2: "TLS_VERSION_1_1",
-		3: "TLS_VERSION_1_2",
-		4: "TLS_VERSION_1_3",
-		5: "TLS_VERSION_INVALID",
-		6: "TLS_VERSION_UNSPECIFIED",
-	}
-	TLSVersion_value = map[string]int32{
-		"TLS_VERSION_AUTO":        0,
-		"TLS_VERSION_1_0":         1,
-		"TLS_VERSION_1_1":         2,
-		"TLS_VERSION_1_2":         3,
-		"TLS_VERSION_1_3":         4,
-		"TLS_VERSION_INVALID":     5,
-		"TLS_VERSION_UNSPECIFIED": 6,
-	}
-)
-
-func (x TLSVersion) Enum() *TLSVersion {
-	p := new(TLSVersion)
-	*p = x
-	return p
-}
-
-func (x TLSVersion) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (TLSVersion) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_enumTypes[0].Descriptor()
-}
-
-func (TLSVersion) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_enumTypes[0]
-}
-
-func (x TLSVersion) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use TLSVersion.Descriptor instead.
-func (TLSVersion) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{0}
-}
-
-type TLSCipherSuite int32
-
-const (
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_AES128_GCM_SHA256 TLSCipherSuite = 0
-	TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_CHACHA20_POLY1305 TLSCipherSuite = 1
-	TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_AES128_GCM_SHA256   TLSCipherSuite = 2
-	TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_CHACHA20_POLY1305   TLSCipherSuite = 3
-	TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_AES128_SHA        TLSCipherSuite = 4
-	TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_AES128_SHA          TLSCipherSuite = 5
-	TLSCipherSuite_TLS_CIPHER_SUITE_AES128_GCM_SHA256             TLSCipherSuite = 6
-	TLSCipherSuite_TLS_CIPHER_SUITE_AES128_SHA                    TLSCipherSuite = 7
-	TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_AES256_GCM_SHA384 TLSCipherSuite = 8
-	TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_AES256_GCM_SHA384   TLSCipherSuite = 9
-	TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_ECDSA_AES256_SHA        TLSCipherSuite = 10
-	TLSCipherSuite_TLS_CIPHER_SUITE_ECDHE_RSA_AES256_SHA          TLSCipherSuite = 11
-	TLSCipherSuite_TLS_CIPHER_SUITE_AES256_GCM_SHA384             TLSCipherSuite = 12
-	TLSCipherSuite_TLS_CIPHER_SUITE_AES256_SHA                    TLSCipherSuite = 13
-)
-
-// Enum value maps for TLSCipherSuite.
-var (
-	TLSCipherSuite_name = map[int32]string{
-		0:  "TLS_CIPHER_SUITE_ECDHE_ECDSA_AES128_GCM_SHA256",
-		1:  "TLS_CIPHER_SUITE_ECDHE_ECDSA_CHACHA20_POLY1305",
-		2:  "TLS_CIPHER_SUITE_ECDHE_RSA_AES128_GCM_SHA256",
-		3:  "TLS_CIPHER_SUITE_ECDHE_RSA_CHACHA20_POLY1305",
-		4:  "TLS_CIPHER_SUITE_ECDHE_ECDSA_AES128_SHA",
-		5:  "TLS_CIPHER_SUITE_ECDHE_RSA_AES128_SHA",
-		6:  "TLS_CIPHER_SUITE_AES128_GCM_SHA256",
-		7:  "TLS_CIPHER_SUITE_AES128_SHA",
-		8:  "TLS_CIPHER_SUITE_ECDHE_ECDSA_AES256_GCM_SHA384",
-		9:  "TLS_CIPHER_SUITE_ECDHE_RSA_AES256_GCM_SHA384",
-		10: "TLS_CIPHER_SUITE_ECDHE_ECDSA_AES256_SHA",
-		11: "TLS_CIPHER_SUITE_ECDHE_RSA_AES256_SHA",
-		12: "TLS_CIPHER_SUITE_AES256_GCM_SHA384",
-		13: "TLS_CIPHER_SUITE_AES256_SHA",
-	}
-	TLSCipherSuite_value = map[string]int32{
-		"TLS_CIPHER_SUITE_ECDHE_ECDSA_AES128_GCM_SHA256": 0,
-		"TLS_CIPHER_SUITE_ECDHE_ECDSA_CHACHA20_POLY1305": 1,
-		"TLS_CIPHER_SUITE_ECDHE_RSA_AES128_GCM_SHA256":   2,
-		"TLS_CIPHER_SUITE_ECDHE_RSA_CHACHA20_POLY1305":   3,
-		"TLS_CIPHER_SUITE_ECDHE_ECDSA_AES128_SHA":        4,
-		"TLS_CIPHER_SUITE_ECDHE_RSA_AES128_SHA":          5,
-		"TLS_CIPHER_SUITE_AES128_GCM_SHA256":             6,
-		"TLS_CIPHER_SUITE_AES128_SHA":                    7,
-		"TLS_CIPHER_SUITE_ECDHE_ECDSA_AES256_GCM_SHA384": 8,
-		"TLS_CIPHER_SUITE_ECDHE_RSA_AES256_GCM_SHA384":   9,
-		"TLS_CIPHER_SUITE_ECDHE_ECDSA_AES256_SHA":        10,
-		"TLS_CIPHER_SUITE_ECDHE_RSA_AES256_SHA":          11,
-		"TLS_CIPHER_SUITE_AES256_GCM_SHA384":             12,
-		"TLS_CIPHER_SUITE_AES256_SHA":                    13,
-	}
-)
-
-func (x TLSCipherSuite) Enum() *TLSCipherSuite {
-	p := new(TLSCipherSuite)
-	*p = x
-	return p
-}
-
-func (x TLSCipherSuite) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (TLSCipherSuite) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_enumTypes[1].Descriptor()
-}
-
-func (TLSCipherSuite) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_enumTypes[1]
-}
-
-func (x TLSCipherSuite) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use TLSCipherSuite.Descriptor instead.
-func (TLSCipherSuite) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{1}
-}
-
-type TLS struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// inbound_tls_parameters has default TLS parameter configuration for inbound connections. These can be overridden per
-	// transport socket.
-	InboundTlsParameters *TLSParameters `protobuf:"bytes,1,opt,name=inbound_tls_parameters,json=inboundTlsParameters,proto3" json:"inbound_tls_parameters,omitempty"`
-	// outbound_tls_parameters has default TLS parameter configuration for inbound connections. These can be overridden per transport socket.
-	OutboundTlsParameters *TLSParameters `protobuf:"bytes,2,opt,name=outbound_tls_parameters,json=outboundTlsParameters,proto3" json:"outbound_tls_parameters,omitempty"`
-}
-
-func (x *TLS) Reset() {
-	*x = TLS{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TLS) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TLS) ProtoMessage() {}
-
-func (x *TLS) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TLS.ProtoReflect.Descriptor instead.
-func (*TLS) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *TLS) GetInboundTlsParameters() *TLSParameters {
-	if x != nil {
-		return x.InboundTlsParameters
-	}
-	return nil
-}
-
-func (x *TLS) GetOutboundTlsParameters() *TLSParameters {
-	if x != nil {
-		return x.OutboundTlsParameters
-	}
-	return nil
-}
-
-type TransportSocket struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// name of the transport socket
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	// Types that are assignable to ConnectionTls:
-	//
-	//	*TransportSocket_InboundMesh
-	//	*TransportSocket_OutboundMesh
-	//	*TransportSocket_InboundNonMesh
-	//	*TransportSocket_OutboundNonMesh
-	ConnectionTls isTransportSocket_ConnectionTls `protobuf_oneof:"connection_tls"`
-	// tls_parameters can override any top level tls parameters that are configured.
-	TlsParameters *TLSParameters `protobuf:"bytes,6,opt,name=tls_parameters,json=tlsParameters,proto3" json:"tls_parameters,omitempty"`
-	AlpnProtocols []string       `protobuf:"bytes,7,rep,name=alpn_protocols,json=alpnProtocols,proto3" json:"alpn_protocols,omitempty"`
-}
-
-func (x *TransportSocket) Reset() {
-	*x = TransportSocket{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TransportSocket) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TransportSocket) ProtoMessage() {}
-
-func (x *TransportSocket) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TransportSocket.ProtoReflect.Descriptor instead.
-func (*TransportSocket) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *TransportSocket) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (m *TransportSocket) GetConnectionTls() isTransportSocket_ConnectionTls {
-	if m != nil {
-		return m.ConnectionTls
-	}
-	return nil
-}
-
-func (x *TransportSocket) GetInboundMesh() *InboundMeshMTLS {
-	if x, ok := x.GetConnectionTls().(*TransportSocket_InboundMesh); ok {
-		return x.InboundMesh
-	}
-	return nil
-}
-
-func (x *TransportSocket) GetOutboundMesh() *OutboundMeshMTLS {
-	if x, ok := x.GetConnectionTls().(*TransportSocket_OutboundMesh); ok {
-		return x.OutboundMesh
-	}
-	return nil
-}
-
-func (x *TransportSocket) GetInboundNonMesh() *InboundNonMeshTLS {
-	if x, ok := x.GetConnectionTls().(*TransportSocket_InboundNonMesh); ok {
-		return x.InboundNonMesh
-	}
-	return nil
-}
-
-func (x *TransportSocket) GetOutboundNonMesh() *OutboundNonMeshTLS {
-	if x, ok := x.GetConnectionTls().(*TransportSocket_OutboundNonMesh); ok {
-		return x.OutboundNonMesh
-	}
-	return nil
-}
-
-func (x *TransportSocket) GetTlsParameters() *TLSParameters {
-	if x != nil {
-		return x.TlsParameters
-	}
-	return nil
-}
-
-func (x *TransportSocket) GetAlpnProtocols() []string {
-	if x != nil {
-		return x.AlpnProtocols
-	}
-	return nil
-}
-
-type isTransportSocket_ConnectionTls interface {
-	isTransportSocket_ConnectionTls()
-}
-
-type TransportSocket_InboundMesh struct {
-	// inbound_mesh is for incoming connections FROM the mesh.
-	InboundMesh *InboundMeshMTLS `protobuf:"bytes,2,opt,name=inbound_mesh,json=inboundMesh,proto3,oneof"`
-}
-
-type TransportSocket_OutboundMesh struct {
-	// outbound_mesh is for outbound connections TO mesh destinations.
-	OutboundMesh *OutboundMeshMTLS `protobuf:"bytes,3,opt,name=outbound_mesh,json=outboundMesh,proto3,oneof"`
-}
-
-type TransportSocket_InboundNonMesh struct {
-	// inbound_non_mesh is for incoming connections FROM non mesh.
-	InboundNonMesh *InboundNonMeshTLS `protobuf:"bytes,4,opt,name=inbound_non_mesh,json=inboundNonMesh,proto3,oneof"`
-}
-
-type TransportSocket_OutboundNonMesh struct {
-	// outbound_non_mesh is for outbound connections TO non mesh destinations.
-	OutboundNonMesh *OutboundNonMeshTLS `protobuf:"bytes,5,opt,name=outbound_non_mesh,json=outboundNonMesh,proto3,oneof"`
-}
-
-func (*TransportSocket_InboundMesh) isTransportSocket_ConnectionTls() {}
-
-func (*TransportSocket_OutboundMesh) isTransportSocket_ConnectionTls() {}
-
-func (*TransportSocket_InboundNonMesh) isTransportSocket_ConnectionTls() {}
-
-func (*TransportSocket_OutboundNonMesh) isTransportSocket_ConnectionTls() {}
-
-type InboundMeshMTLS struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// identity_key is UUID key to use to look up the leaf certificate in ProxyState to present for incoming connections.
-	IdentityKey string `protobuf:"bytes,1,opt,name=identity_key,json=identityKey,proto3" json:"identity_key,omitempty"`
-	// validation_context has what is needed to validate incoming connections.
-	ValidationContext *MeshInboundValidationContext `protobuf:"bytes,2,opt,name=validation_context,json=validationContext,proto3" json:"validation_context,omitempty"`
-}
-
-func (x *InboundMeshMTLS) Reset() {
-	*x = InboundMeshMTLS{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *InboundMeshMTLS) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*InboundMeshMTLS) ProtoMessage() {}
-
-func (x *InboundMeshMTLS) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use InboundMeshMTLS.ProtoReflect.Descriptor instead.
-func (*InboundMeshMTLS) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *InboundMeshMTLS) GetIdentityKey() string {
-	if x != nil {
-		return x.IdentityKey
-	}
-	return ""
-}
-
-func (x *InboundMeshMTLS) GetValidationContext() *MeshInboundValidationContext {
-	if x != nil {
-		return x.ValidationContext
-	}
-	return nil
-}
-
-type OutboundMeshMTLS struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// identity_key is UUID key to use to look up the leaf certificate in ProxyState when connecting to destinations.
-	IdentityKey string `protobuf:"bytes,1,opt,name=identity_key,json=identityKey,proto3" json:"identity_key,omitempty"`
-	// validation_context has what is needed to validate the destination.
-	ValidationContext *MeshOutboundValidationContext `protobuf:"bytes,2,opt,name=validation_context,json=validationContext,proto3" json:"validation_context,omitempty"`
-	// sni to use when connecting to the destination.
-	Sni string `protobuf:"bytes,3,opt,name=sni,proto3" json:"sni,omitempty"`
-}
-
-func (x *OutboundMeshMTLS) Reset() {
-	*x = OutboundMeshMTLS{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OutboundMeshMTLS) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OutboundMeshMTLS) ProtoMessage() {}
-
-func (x *OutboundMeshMTLS) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OutboundMeshMTLS.ProtoReflect.Descriptor instead.
-func (*OutboundMeshMTLS) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *OutboundMeshMTLS) GetIdentityKey() string {
-	if x != nil {
-		return x.IdentityKey
-	}
-	return ""
-}
-
-func (x *OutboundMeshMTLS) GetValidationContext() *MeshOutboundValidationContext {
-	if x != nil {
-		return x.ValidationContext
-	}
-	return nil
-}
-
-func (x *OutboundMeshMTLS) GetSni() string {
-	if x != nil {
-		return x.Sni
-	}
-	return ""
-}
-
-type InboundNonMeshTLS struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// identity is the reference to the leaf certificate to present for incoming connections.
-	//
-	// Types that are assignable to Identity:
-	//
-	//	*InboundNonMeshTLS_LeafKey
-	//	*InboundNonMeshTLS_Sds
-	Identity isInboundNonMeshTLS_Identity `protobuf_oneof:"identity"`
-}
-
-func (x *InboundNonMeshTLS) Reset() {
-	*x = InboundNonMeshTLS{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *InboundNonMeshTLS) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*InboundNonMeshTLS) ProtoMessage() {}
-
-func (x *InboundNonMeshTLS) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use InboundNonMeshTLS.ProtoReflect.Descriptor instead.
-func (*InboundNonMeshTLS) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{4}
-}
-
-func (m *InboundNonMeshTLS) GetIdentity() isInboundNonMeshTLS_Identity {
-	if m != nil {
-		return m.Identity
-	}
-	return nil
-}
-
-func (x *InboundNonMeshTLS) GetLeafKey() string {
-	if x, ok := x.GetIdentity().(*InboundNonMeshTLS_LeafKey); ok {
-		return x.LeafKey
-	}
-	return ""
-}
-
-func (x *InboundNonMeshTLS) GetSds() *SDSCertificate {
-	if x, ok := x.GetIdentity().(*InboundNonMeshTLS_Sds); ok {
-		return x.Sds
-	}
-	return nil
-}
-
-type isInboundNonMeshTLS_Identity interface {
-	isInboundNonMeshTLS_Identity()
-}
-
-type InboundNonMeshTLS_LeafKey struct {
-	// leaf_key is the UUID key to use to look up the leaf certificate in the ProxyState leaf certificate map.
-	LeafKey string `protobuf:"bytes,1,opt,name=leaf_key,json=leafKey,proto3,oneof"`
-}
-
-type InboundNonMeshTLS_Sds struct {
-	// sds refers to certificates retrieved via Envoy SDS.
-	Sds *SDSCertificate `protobuf:"bytes,2,opt,name=sds,proto3,oneof"`
-}
-
-func (*InboundNonMeshTLS_LeafKey) isInboundNonMeshTLS_Identity() {}
-
-func (*InboundNonMeshTLS_Sds) isInboundNonMeshTLS_Identity() {}
-
-type OutboundNonMeshTLS struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// cert_file is a filename for a certificate to present for outbound connections.
-	CertFile string `protobuf:"bytes,1,opt,name=cert_file,json=certFile,proto3" json:"cert_file,omitempty"`
-	// key_file is a filename for a key for outbound connections.
-	KeyFile string `protobuf:"bytes,2,opt,name=key_file,json=keyFile,proto3" json:"key_file,omitempty"`
-	// validation_context has what is needed to validate the destination.
-	ValidationContext *NonMeshOutboundValidationContext `protobuf:"bytes,3,opt,name=validation_context,json=validationContext,proto3" json:"validation_context,omitempty"`
-}
-
-func (x *OutboundNonMeshTLS) Reset() {
-	*x = OutboundNonMeshTLS{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OutboundNonMeshTLS) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OutboundNonMeshTLS) ProtoMessage() {}
-
-func (x *OutboundNonMeshTLS) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OutboundNonMeshTLS.ProtoReflect.Descriptor instead.
-func (*OutboundNonMeshTLS) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *OutboundNonMeshTLS) GetCertFile() string {
-	if x != nil {
-		return x.CertFile
-	}
-	return ""
-}
-
-func (x *OutboundNonMeshTLS) GetKeyFile() string {
-	if x != nil {
-		return x.KeyFile
-	}
-	return ""
-}
-
-func (x *OutboundNonMeshTLS) GetValidationContext() *NonMeshOutboundValidationContext {
-	if x != nil {
-		return x.ValidationContext
-	}
-	return nil
-}
-
-type MeshInboundValidationContext struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// trust_bundle_peer_name_keys is which trust bundles to use for validating incoming connections. If this workload is exported
-	// to peers, the incoming connection could be from a different peer, requiring that trust bundle to validate the
-	// connection. These could be local or peered trust bundles. This will be a key in the trust bundle map.
-	TrustBundlePeerNameKeys []string `protobuf:"bytes,1,rep,name=trust_bundle_peer_name_keys,json=trustBundlePeerNameKeys,proto3" json:"trust_bundle_peer_name_keys,omitempty"`
-}
-
-func (x *MeshInboundValidationContext) Reset() {
-	*x = MeshInboundValidationContext{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MeshInboundValidationContext) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MeshInboundValidationContext) ProtoMessage() {}
-
-func (x *MeshInboundValidationContext) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MeshInboundValidationContext.ProtoReflect.Descriptor instead.
-func (*MeshInboundValidationContext) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *MeshInboundValidationContext) GetTrustBundlePeerNameKeys() []string {
-	if x != nil {
-		return x.TrustBundlePeerNameKeys
-	}
-	return nil
-}
-
-type MeshOutboundValidationContext struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// trust_bundle_peer_name_key is which trust bundle to use for the destination. It could be the local or a peer's trust bundle.
-	// This will be a key in the trust bundle map.
-	TrustBundlePeerNameKey string `protobuf:"bytes,1,opt,name=trust_bundle_peer_name_key,json=trustBundlePeerNameKey,proto3" json:"trust_bundle_peer_name_key,omitempty"`
-	// spiffe_ids is one or more spiffe IDs to validate.
-	SpiffeIds []string `protobuf:"bytes,2,rep,name=spiffe_ids,json=spiffeIds,proto3" json:"spiffe_ids,omitempty"`
-}
-
-func (x *MeshOutboundValidationContext) Reset() {
-	*x = MeshOutboundValidationContext{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MeshOutboundValidationContext) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MeshOutboundValidationContext) ProtoMessage() {}
-
-func (x *MeshOutboundValidationContext) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MeshOutboundValidationContext.ProtoReflect.Descriptor instead.
-func (*MeshOutboundValidationContext) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *MeshOutboundValidationContext) GetTrustBundlePeerNameKey() string {
-	if x != nil {
-		return x.TrustBundlePeerNameKey
-	}
-	return ""
-}
-
-func (x *MeshOutboundValidationContext) GetSpiffeIds() []string {
-	if x != nil {
-		return x.SpiffeIds
-	}
-	return nil
-}
-
-type NonMeshOutboundValidationContext struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ca_file is a filename for a ca for outbound connections to validate the destination.
-	CaFile string `protobuf:"bytes,1,opt,name=ca_file,json=caFile,proto3" json:"ca_file,omitempty"`
-}
-
-func (x *NonMeshOutboundValidationContext) Reset() {
-	*x = NonMeshOutboundValidationContext{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *NonMeshOutboundValidationContext) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*NonMeshOutboundValidationContext) ProtoMessage() {}
-
-func (x *NonMeshOutboundValidationContext) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use NonMeshOutboundValidationContext.ProtoReflect.Descriptor instead.
-func (*NonMeshOutboundValidationContext) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *NonMeshOutboundValidationContext) GetCaFile() string {
-	if x != nil {
-		return x.CaFile
-	}
-	return ""
-}
-
-type SDSCertificate struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ClusterName  string `protobuf:"bytes,1,opt,name=cluster_name,json=clusterName,proto3" json:"cluster_name,omitempty"`
-	CertResource string `protobuf:"bytes,2,opt,name=cert_resource,json=certResource,proto3" json:"cert_resource,omitempty"`
-}
-
-func (x *SDSCertificate) Reset() {
-	*x = SDSCertificate{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SDSCertificate) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SDSCertificate) ProtoMessage() {}
-
-func (x *SDSCertificate) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SDSCertificate.ProtoReflect.Descriptor instead.
-func (*SDSCertificate) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *SDSCertificate) GetClusterName() string {
-	if x != nil {
-		return x.ClusterName
-	}
-	return ""
-}
-
-func (x *SDSCertificate) GetCertResource() string {
-	if x != nil {
-		return x.CertResource
-	}
-	return ""
-}
-
-type TLSParameters struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	MinVersion   TLSVersion       `protobuf:"varint,1,opt,name=min_version,json=minVersion,proto3,enum=hashicorp.consul.mesh.v2beta1.pbproxystate.TLSVersion" json:"min_version,omitempty"`
-	MaxVersion   TLSVersion       `protobuf:"varint,2,opt,name=max_version,json=maxVersion,proto3,enum=hashicorp.consul.mesh.v2beta1.pbproxystate.TLSVersion" json:"max_version,omitempty"`
-	CipherSuites []TLSCipherSuite `protobuf:"varint,3,rep,packed,name=cipher_suites,json=cipherSuites,proto3,enum=hashicorp.consul.mesh.v2beta1.pbproxystate.TLSCipherSuite" json:"cipher_suites,omitempty"`
-}
-
-func (x *TLSParameters) Reset() {
-	*x = TLSParameters{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TLSParameters) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TLSParameters) ProtoMessage() {}
-
-func (x *TLSParameters) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TLSParameters.ProtoReflect.Descriptor instead.
-func (*TLSParameters) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *TLSParameters) GetMinVersion() TLSVersion {
-	if x != nil {
-		return x.MinVersion
-	}
-	return TLSVersion_TLS_VERSION_AUTO
-}
-
-func (x *TLSParameters) GetMaxVersion() TLSVersion {
-	if x != nil {
-		return x.MaxVersion
-	}
-	return TLSVersion_TLS_VERSION_AUTO
-}
-
-func (x *TLSParameters) GetCipherSuites() []TLSCipherSuite {
-	if x != nil {
-		return x.CipherSuites
-	}
-	return nil
-}
-
-type LeafCertificate struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Cert string `protobuf:"bytes,1,opt,name=cert,proto3" json:"cert,omitempty"`
-	Key  string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`
-}
-
-func (x *LeafCertificate) Reset() {
-	*x = LeafCertificate{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LeafCertificate) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LeafCertificate) ProtoMessage() {}
-
-func (x *LeafCertificate) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LeafCertificate.ProtoReflect.Descriptor instead.
-func (*LeafCertificate) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *LeafCertificate) GetCert() string {
-	if x != nil {
-		return x.Cert
-	}
-	return ""
-}
-
-func (x *LeafCertificate) GetKey() string {
-	if x != nil {
-		return x.Key
-	}
-	return ""
-}
-
-type TrustBundle struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TrustDomain string   `protobuf:"bytes,1,opt,name=trust_domain,json=trustDomain,proto3" json:"trust_domain,omitempty"`
-	Roots       []string `protobuf:"bytes,2,rep,name=roots,proto3" json:"roots,omitempty"`
-}
-
-func (x *TrustBundle) Reset() {
-	*x = TrustBundle{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TrustBundle) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TrustBundle) ProtoMessage() {}
-
-func (x *TrustBundle) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TrustBundle.ProtoReflect.Descriptor instead.
-func (*TrustBundle) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *TrustBundle) GetTrustDomain() string {
-	if x != nil {
-		return x.TrustDomain
-	}
-	return ""
-}
-
-func (x *TrustBundle) GetRoots() []string {
-	if x != nil {
-		return x.Roots
-	}
-	return nil
-}
-
-var File_pbmesh_v2beta1_pbproxystate_transport_socket_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDesc = []byte{
-	0x0a, 0x32, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x74, 0x72,
-	0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x2a, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x22, 0xe9, 0x01, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x12, 0x6f, 0x0a, 0x16, 0x69, 0x6e, 0x62, 0x6f,
-	0x75, 0x6e, 0x64, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
-	0x72, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x4c, 0x53, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
-	0x65, 0x72, 0x73, 0x52, 0x14, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x54, 0x6c, 0x73, 0x50,
-	0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x12, 0x71, 0x0a, 0x17, 0x6f, 0x75, 0x74,
-	0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65,
-	0x74, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x4c, 0x53, 0x50, 0x61, 0x72, 0x61, 0x6d,
-	0x65, 0x74, 0x65, 0x72, 0x73, 0x52, 0x15, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x54,
-	0x6c, 0x73, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x22, 0xe0, 0x04, 0x0a,
-	0x0f, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x60, 0x0a, 0x0c, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f,
-	0x6d, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4d,
-	0x65, 0x73, 0x68, 0x4d, 0x54, 0x4c, 0x53, 0x48, 0x00, 0x52, 0x0b, 0x69, 0x6e, 0x62, 0x6f, 0x75,
-	0x6e, 0x64, 0x4d, 0x65, 0x73, 0x68, 0x12, 0x63, 0x0a, 0x0d, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75,
-	0x6e, 0x64, 0x5f, 0x6d, 0x65, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4f, 0x75, 0x74, 0x62, 0x6f,
-	0x75, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x68, 0x4d, 0x54, 0x4c, 0x53, 0x48, 0x00, 0x52, 0x0c, 0x6f,
-	0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x68, 0x12, 0x69, 0x0a, 0x10, 0x69,
-	0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x6e, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x73, 0x68, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4e, 0x6f, 0x6e, 0x4d, 0x65, 0x73,
-	0x68, 0x54, 0x4c, 0x53, 0x48, 0x00, 0x52, 0x0e, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4e,
-	0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x68, 0x12, 0x6c, 0x0a, 0x11, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75,
-	0x6e, 0x64, 0x5f, 0x6e, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x73, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4f,
-	0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4e, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x68, 0x54, 0x4c,
-	0x53, 0x48, 0x00, 0x52, 0x0f, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4e, 0x6f, 0x6e,
-	0x4d, 0x65, 0x73, 0x68, 0x12, 0x60, 0x0a, 0x0e, 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x61, 0x72, 0x61,
-	0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x4c, 0x53, 0x50, 0x61, 0x72,
-	0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x52, 0x0d, 0x74, 0x6c, 0x73, 0x50, 0x61, 0x72, 0x61,
-	0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x61, 0x6c, 0x70, 0x6e, 0x5f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d,
-	0x61, 0x6c, 0x70, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x73, 0x42, 0x10, 0x0a,
-	0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x6c, 0x73, 0x22,
-	0xad, 0x01, 0x0a, 0x0f, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x68, 0x4d,
-	0x54, 0x4c, 0x53, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x64, 0x65, 0x6e, 0x74,
-	0x69, 0x74, 0x79, 0x4b, 0x65, 0x79, 0x12, 0x77, 0x0a, 0x12, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x48, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e,
-	0x4d, 0x65, 0x73, 0x68, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x56, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x11, 0x76, 0x61,
-	0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22,
-	0xc1, 0x01, 0x0a, 0x10, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x68,
-	0x4d, 0x54, 0x4c, 0x53, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
-	0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x64, 0x65, 0x6e,
-	0x74, 0x69, 0x74, 0x79, 0x4b, 0x65, 0x79, 0x12, 0x78, 0x0a, 0x12, 0x76, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x49, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x2e, 0x4d, 0x65, 0x73, 0x68, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x56, 0x61, 0x6c,
-	0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x11,
-	0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78,
-	0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x6e, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x73, 0x6e, 0x69, 0x22, 0x8c, 0x01, 0x0a, 0x11, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4e,
-	0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x68, 0x54, 0x4c, 0x53, 0x12, 0x1b, 0x0a, 0x08, 0x6c, 0x65, 0x61,
-	0x66, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x6c,
-	0x65, 0x61, 0x66, 0x4b, 0x65, 0x79, 0x12, 0x4e, 0x0a, 0x03, 0x73, 0x64, 0x73, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x2e, 0x53, 0x44, 0x53, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x48,
-	0x00, 0x52, 0x03, 0x73, 0x64, 0x73, 0x42, 0x0a, 0x0a, 0x08, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x22, 0xc9, 0x01, 0x0a, 0x12, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4e,
-	0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x68, 0x54, 0x4c, 0x53, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x65, 0x72,
-	0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x65,
-	0x72, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x5f, 0x66, 0x69,
-	0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x46, 0x69, 0x6c,
-	0x65, 0x12, 0x7b, 0x0a, 0x12, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
-	0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4c, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4e, 0x6f, 0x6e, 0x4d, 0x65,
-	0x73, 0x68, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x11, 0x76, 0x61, 0x6c,
-	0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0x5c,
-	0x0a, 0x1c, 0x4d, 0x65, 0x73, 0x68, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x56, 0x61, 0x6c,
-	0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x3c,
-	0x0a, 0x1b, 0x74, 0x72, 0x75, 0x73, 0x74, 0x5f, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x70,
-	0x65, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x17, 0x74, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65,
-	0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x4b, 0x65, 0x79, 0x73, 0x22, 0x7a, 0x0a, 0x1d,
-	0x4d, 0x65, 0x73, 0x68, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x56, 0x61, 0x6c, 0x69,
-	0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x3a, 0x0a,
-	0x1a, 0x74, 0x72, 0x75, 0x73, 0x74, 0x5f, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x70, 0x65,
-	0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x16, 0x74, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x50, 0x65,
-	0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x70, 0x69,
-	0x66, 0x66, 0x65, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x73,
-	0x70, 0x69, 0x66, 0x66, 0x65, 0x49, 0x64, 0x73, 0x22, 0x3b, 0x0a, 0x20, 0x4e, 0x6f, 0x6e, 0x4d,
-	0x65, 0x73, 0x68, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x56, 0x61, 0x6c, 0x69, 0x64,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x17, 0x0a, 0x07,
-	0x63, 0x61, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63,
-	0x61, 0x46, 0x69, 0x6c, 0x65, 0x22, 0x58, 0x0a, 0x0e, 0x53, 0x44, 0x53, 0x43, 0x65, 0x72, 0x74,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x65,
-	0x72, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0c, 0x63, 0x65, 0x72, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22,
-	0xa2, 0x02, 0x0a, 0x0d, 0x54, 0x4c, 0x53, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
-	0x73, 0x12, 0x57, 0x0a, 0x0b, 0x6d, 0x69, 0x6e, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2e, 0x54, 0x4c, 0x53, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0a,
-	0x6d, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x57, 0x0a, 0x0b, 0x6d, 0x61,
-	0x78, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x4c, 0x53,
-	0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x6d, 0x61, 0x78, 0x56, 0x65, 0x72, 0x73,
-	0x69, 0x6f, 0x6e, 0x12, 0x5f, 0x0a, 0x0d, 0x63, 0x69, 0x70, 0x68, 0x65, 0x72, 0x5f, 0x73, 0x75,
-	0x69, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x4c, 0x53, 0x43, 0x69, 0x70, 0x68, 0x65,
-	0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x52, 0x0c, 0x63, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75,
-	0x69, 0x74, 0x65, 0x73, 0x22, 0x37, 0x0a, 0x0f, 0x4c, 0x65, 0x61, 0x66, 0x43, 0x65, 0x72, 0x74,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x65, 0x72, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x65, 0x72, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x46, 0x0a,
-	0x0b, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x21, 0x0a, 0x0c,
-	0x74, 0x72, 0x75, 0x73, 0x74, 0x5f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0b, 0x74, 0x72, 0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12,
-	0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05,
-	0x72, 0x6f, 0x6f, 0x74, 0x73, 0x2a, 0xac, 0x01, 0x0a, 0x0a, 0x54, 0x4c, 0x53, 0x56, 0x65, 0x72,
-	0x73, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x4c, 0x53, 0x5f, 0x56, 0x45, 0x52, 0x53,
-	0x49, 0x4f, 0x4e, 0x5f, 0x41, 0x55, 0x54, 0x4f, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x54, 0x4c,
-	0x53, 0x5f, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x31, 0x5f, 0x30, 0x10, 0x01, 0x12,
-	0x13, 0x0a, 0x0f, 0x54, 0x4c, 0x53, 0x5f, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x31,
-	0x5f, 0x31, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x54, 0x4c, 0x53, 0x5f, 0x56, 0x45, 0x52, 0x53,
-	0x49, 0x4f, 0x4e, 0x5f, 0x31, 0x5f, 0x32, 0x10, 0x03, 0x12, 0x13, 0x0a, 0x0f, 0x54, 0x4c, 0x53,
-	0x5f, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x31, 0x5f, 0x33, 0x10, 0x04, 0x12, 0x17,
-	0x0a, 0x13, 0x54, 0x4c, 0x53, 0x5f, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x49, 0x4e,
-	0x56, 0x41, 0x4c, 0x49, 0x44, 0x10, 0x05, 0x12, 0x1b, 0x0a, 0x17, 0x54, 0x4c, 0x53, 0x5f, 0x56,
-	0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
-	0x45, 0x44, 0x10, 0x06, 0x2a, 0x84, 0x05, 0x0a, 0x0e, 0x54, 0x4c, 0x53, 0x43, 0x69, 0x70, 0x68,
-	0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x12, 0x32, 0x0a, 0x2e, 0x54, 0x4c, 0x53, 0x5f, 0x43,
-	0x49, 0x50, 0x48, 0x45, 0x52, 0x5f, 0x53, 0x55, 0x49, 0x54, 0x45, 0x5f, 0x45, 0x43, 0x44, 0x48,
-	0x45, 0x5f, 0x45, 0x43, 0x44, 0x53, 0x41, 0x5f, 0x41, 0x45, 0x53, 0x31, 0x32, 0x38, 0x5f, 0x47,
-	0x43, 0x4d, 0x5f, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, 0x00, 0x12, 0x32, 0x0a, 0x2e, 0x54,
-	0x4c, 0x53, 0x5f, 0x43, 0x49, 0x50, 0x48, 0x45, 0x52, 0x5f, 0x53, 0x55, 0x49, 0x54, 0x45, 0x5f,
-	0x45, 0x43, 0x44, 0x48, 0x45, 0x5f, 0x45, 0x43, 0x44, 0x53, 0x41, 0x5f, 0x43, 0x48, 0x41, 0x43,
-	0x48, 0x41, 0x32, 0x30, 0x5f, 0x50, 0x4f, 0x4c, 0x59, 0x31, 0x33, 0x30, 0x35, 0x10, 0x01, 0x12,
-	0x30, 0x0a, 0x2c, 0x54, 0x4c, 0x53, 0x5f, 0x43, 0x49, 0x50, 0x48, 0x45, 0x52, 0x5f, 0x53, 0x55,
-	0x49, 0x54, 0x45, 0x5f, 0x45, 0x43, 0x44, 0x48, 0x45, 0x5f, 0x52, 0x53, 0x41, 0x5f, 0x41, 0x45,
-	0x53, 0x31, 0x32, 0x38, 0x5f, 0x47, 0x43, 0x4d, 0x5f, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10,
-	0x02, 0x12, 0x30, 0x0a, 0x2c, 0x54, 0x4c, 0x53, 0x5f, 0x43, 0x49, 0x50, 0x48, 0x45, 0x52, 0x5f,
-	0x53, 0x55, 0x49, 0x54, 0x45, 0x5f, 0x45, 0x43, 0x44, 0x48, 0x45, 0x5f, 0x52, 0x53, 0x41, 0x5f,
-	0x43, 0x48, 0x41, 0x43, 0x48, 0x41, 0x32, 0x30, 0x5f, 0x50, 0x4f, 0x4c, 0x59, 0x31, 0x33, 0x30,
-	0x35, 0x10, 0x03, 0x12, 0x2b, 0x0a, 0x27, 0x54, 0x4c, 0x53, 0x5f, 0x43, 0x49, 0x50, 0x48, 0x45,
-	0x52, 0x5f, 0x53, 0x55, 0x49, 0x54, 0x45, 0x5f, 0x45, 0x43, 0x44, 0x48, 0x45, 0x5f, 0x45, 0x43,
-	0x44, 0x53, 0x41, 0x5f, 0x41, 0x45, 0x53, 0x31, 0x32, 0x38, 0x5f, 0x53, 0x48, 0x41, 0x10, 0x04,
-	0x12, 0x29, 0x0a, 0x25, 0x54, 0x4c, 0x53, 0x5f, 0x43, 0x49, 0x50, 0x48, 0x45, 0x52, 0x5f, 0x53,
-	0x55, 0x49, 0x54, 0x45, 0x5f, 0x45, 0x43, 0x44, 0x48, 0x45, 0x5f, 0x52, 0x53, 0x41, 0x5f, 0x41,
-	0x45, 0x53, 0x31, 0x32, 0x38, 0x5f, 0x53, 0x48, 0x41, 0x10, 0x05, 0x12, 0x26, 0x0a, 0x22, 0x54,
-	0x4c, 0x53, 0x5f, 0x43, 0x49, 0x50, 0x48, 0x45, 0x52, 0x5f, 0x53, 0x55, 0x49, 0x54, 0x45, 0x5f,
-	0x41, 0x45, 0x53, 0x31, 0x32, 0x38, 0x5f, 0x47, 0x43, 0x4d, 0x5f, 0x53, 0x48, 0x41, 0x32, 0x35,
-	0x36, 0x10, 0x06, 0x12, 0x1f, 0x0a, 0x1b, 0x54, 0x4c, 0x53, 0x5f, 0x43, 0x49, 0x50, 0x48, 0x45,
-	0x52, 0x5f, 0x53, 0x55, 0x49, 0x54, 0x45, 0x5f, 0x41, 0x45, 0x53, 0x31, 0x32, 0x38, 0x5f, 0x53,
-	0x48, 0x41, 0x10, 0x07, 0x12, 0x32, 0x0a, 0x2e, 0x54, 0x4c, 0x53, 0x5f, 0x43, 0x49, 0x50, 0x48,
-	0x45, 0x52, 0x5f, 0x53, 0x55, 0x49, 0x54, 0x45, 0x5f, 0x45, 0x43, 0x44, 0x48, 0x45, 0x5f, 0x45,
-	0x43, 0x44, 0x53, 0x41, 0x5f, 0x41, 0x45, 0x53, 0x32, 0x35, 0x36, 0x5f, 0x47, 0x43, 0x4d, 0x5f,
-	0x53, 0x48, 0x41, 0x33, 0x38, 0x34, 0x10, 0x08, 0x12, 0x30, 0x0a, 0x2c, 0x54, 0x4c, 0x53, 0x5f,
-	0x43, 0x49, 0x50, 0x48, 0x45, 0x52, 0x5f, 0x53, 0x55, 0x49, 0x54, 0x45, 0x5f, 0x45, 0x43, 0x44,
-	0x48, 0x45, 0x5f, 0x52, 0x53, 0x41, 0x5f, 0x41, 0x45, 0x53, 0x32, 0x35, 0x36, 0x5f, 0x47, 0x43,
-	0x4d, 0x5f, 0x53, 0x48, 0x41, 0x33, 0x38, 0x34, 0x10, 0x09, 0x12, 0x2b, 0x0a, 0x27, 0x54, 0x4c,
-	0x53, 0x5f, 0x43, 0x49, 0x50, 0x48, 0x45, 0x52, 0x5f, 0x53, 0x55, 0x49, 0x54, 0x45, 0x5f, 0x45,
-	0x43, 0x44, 0x48, 0x45, 0x5f, 0x45, 0x43, 0x44, 0x53, 0x41, 0x5f, 0x41, 0x45, 0x53, 0x32, 0x35,
-	0x36, 0x5f, 0x53, 0x48, 0x41, 0x10, 0x0a, 0x12, 0x29, 0x0a, 0x25, 0x54, 0x4c, 0x53, 0x5f, 0x43,
-	0x49, 0x50, 0x48, 0x45, 0x52, 0x5f, 0x53, 0x55, 0x49, 0x54, 0x45, 0x5f, 0x45, 0x43, 0x44, 0x48,
-	0x45, 0x5f, 0x52, 0x53, 0x41, 0x5f, 0x41, 0x45, 0x53, 0x32, 0x35, 0x36, 0x5f, 0x53, 0x48, 0x41,
-	0x10, 0x0b, 0x12, 0x26, 0x0a, 0x22, 0x54, 0x4c, 0x53, 0x5f, 0x43, 0x49, 0x50, 0x48, 0x45, 0x52,
-	0x5f, 0x53, 0x55, 0x49, 0x54, 0x45, 0x5f, 0x41, 0x45, 0x53, 0x32, 0x35, 0x36, 0x5f, 0x47, 0x43,
-	0x4d, 0x5f, 0x53, 0x48, 0x41, 0x33, 0x38, 0x34, 0x10, 0x0c, 0x12, 0x1f, 0x0a, 0x1b, 0x54, 0x4c,
-	0x53, 0x5f, 0x43, 0x49, 0x50, 0x48, 0x45, 0x52, 0x5f, 0x53, 0x55, 0x49, 0x54, 0x45, 0x5f, 0x41,
-	0x45, 0x53, 0x32, 0x35, 0x36, 0x5f, 0x53, 0x48, 0x41, 0x10, 0x0d, 0x42, 0xda, 0x02, 0x0a, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x42, 0x14,
-	0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
-	0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f,
-	0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xa2, 0x02, 0x05, 0x48,
-	0x43, 0x4d, 0x56, 0x50, 0xaa, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74,
-	0x65, 0xca, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x5c, 0x50, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0xe2, 0x02,
-	0x36, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x50,
-	0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73,
-	0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3a, 0x3a, 0x50, 0x62, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescData = file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
-var file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_goTypes = []interface{}{
-	(TLSVersion)(0),                          // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.TLSVersion
-	(TLSCipherSuite)(0),                      // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.TLSCipherSuite
-	(*TLS)(nil),                              // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.TLS
-	(*TransportSocket)(nil),                  // 3: hashicorp.consul.mesh.v2beta1.pbproxystate.TransportSocket
-	(*InboundMeshMTLS)(nil),                  // 4: hashicorp.consul.mesh.v2beta1.pbproxystate.InboundMeshMTLS
-	(*OutboundMeshMTLS)(nil),                 // 5: hashicorp.consul.mesh.v2beta1.pbproxystate.OutboundMeshMTLS
-	(*InboundNonMeshTLS)(nil),                // 6: hashicorp.consul.mesh.v2beta1.pbproxystate.InboundNonMeshTLS
-	(*OutboundNonMeshTLS)(nil),               // 7: hashicorp.consul.mesh.v2beta1.pbproxystate.OutboundNonMeshTLS
-	(*MeshInboundValidationContext)(nil),     // 8: hashicorp.consul.mesh.v2beta1.pbproxystate.MeshInboundValidationContext
-	(*MeshOutboundValidationContext)(nil),    // 9: hashicorp.consul.mesh.v2beta1.pbproxystate.MeshOutboundValidationContext
-	(*NonMeshOutboundValidationContext)(nil), // 10: hashicorp.consul.mesh.v2beta1.pbproxystate.NonMeshOutboundValidationContext
-	(*SDSCertificate)(nil),                   // 11: hashicorp.consul.mesh.v2beta1.pbproxystate.SDSCertificate
-	(*TLSParameters)(nil),                    // 12: hashicorp.consul.mesh.v2beta1.pbproxystate.TLSParameters
-	(*LeafCertificate)(nil),                  // 13: hashicorp.consul.mesh.v2beta1.pbproxystate.LeafCertificate
-	(*TrustBundle)(nil),                      // 14: hashicorp.consul.mesh.v2beta1.pbproxystate.TrustBundle
-}
-var file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_depIdxs = []int32{
-	12, // 0: hashicorp.consul.mesh.v2beta1.pbproxystate.TLS.inbound_tls_parameters:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TLSParameters
-	12, // 1: hashicorp.consul.mesh.v2beta1.pbproxystate.TLS.outbound_tls_parameters:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TLSParameters
-	4,  // 2: hashicorp.consul.mesh.v2beta1.pbproxystate.TransportSocket.inbound_mesh:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.InboundMeshMTLS
-	5,  // 3: hashicorp.consul.mesh.v2beta1.pbproxystate.TransportSocket.outbound_mesh:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.OutboundMeshMTLS
-	6,  // 4: hashicorp.consul.mesh.v2beta1.pbproxystate.TransportSocket.inbound_non_mesh:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.InboundNonMeshTLS
-	7,  // 5: hashicorp.consul.mesh.v2beta1.pbproxystate.TransportSocket.outbound_non_mesh:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.OutboundNonMeshTLS
-	12, // 6: hashicorp.consul.mesh.v2beta1.pbproxystate.TransportSocket.tls_parameters:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TLSParameters
-	8,  // 7: hashicorp.consul.mesh.v2beta1.pbproxystate.InboundMeshMTLS.validation_context:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.MeshInboundValidationContext
-	9,  // 8: hashicorp.consul.mesh.v2beta1.pbproxystate.OutboundMeshMTLS.validation_context:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.MeshOutboundValidationContext
-	11, // 9: hashicorp.consul.mesh.v2beta1.pbproxystate.InboundNonMeshTLS.sds:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.SDSCertificate
-	10, // 10: hashicorp.consul.mesh.v2beta1.pbproxystate.OutboundNonMeshTLS.validation_context:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.NonMeshOutboundValidationContext
-	0,  // 11: hashicorp.consul.mesh.v2beta1.pbproxystate.TLSParameters.min_version:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TLSVersion
-	0,  // 12: hashicorp.consul.mesh.v2beta1.pbproxystate.TLSParameters.max_version:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TLSVersion
-	1,  // 13: hashicorp.consul.mesh.v2beta1.pbproxystate.TLSParameters.cipher_suites:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TLSCipherSuite
-	14, // [14:14] is the sub-list for method output_type
-	14, // [14:14] is the sub-list for method input_type
-	14, // [14:14] is the sub-list for extension type_name
-	14, // [14:14] is the sub-list for extension extendee
-	0,  // [0:14] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_init() }
-func file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_init() {
-	if File_pbmesh_v2beta1_pbproxystate_transport_socket_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TLS); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TransportSocket); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InboundMeshMTLS); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OutboundMeshMTLS); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InboundNonMeshTLS); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OutboundNonMeshTLS); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MeshInboundValidationContext); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MeshOutboundValidationContext); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NonMeshOutboundValidationContext); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SDSCertificate); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TLSParameters); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LeafCertificate); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TrustBundle); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[1].OneofWrappers = []interface{}{
-		(*TransportSocket_InboundMesh)(nil),
-		(*TransportSocket_OutboundMesh)(nil),
-		(*TransportSocket_InboundNonMesh)(nil),
-		(*TransportSocket_OutboundNonMesh)(nil),
-	}
-	file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes[4].OneofWrappers = []interface{}{
-		(*InboundNonMeshTLS_LeafKey)(nil),
-		(*InboundNonMeshTLS_Sds)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDesc,
-			NumEnums:      2,
-			NumMessages:   13,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_depIdxs,
-		EnumInfos:         file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_enumTypes,
-		MessageInfos:      file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_pbproxystate_transport_socket_proto = out.File
-	file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_rawDesc = nil
-	file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_goTypes = nil
-	file_pbmesh_v2beta1_pbproxystate_transport_socket_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/pbproxystate/transport_socket.proto b/proto-public/pbmesh/v2beta1/pbproxystate/transport_socket.proto
deleted file mode 100644
index de1f6145befc1..0000000000000
--- a/proto-public/pbmesh/v2beta1/pbproxystate/transport_socket.proto
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1.pbproxystate;
-
-message TLS {
-  // inbound_tls_parameters has default TLS parameter configuration for inbound connections. These can be overridden per
-  // transport socket.
-  TLSParameters inbound_tls_parameters = 1;
-  // outbound_tls_parameters has default TLS parameter configuration for inbound connections. These can be overridden per transport socket.
-  TLSParameters outbound_tls_parameters = 2;
-}
-
-message TransportSocket {
-  // name of the transport socket
-  string name = 1;
-  oneof connection_tls {
-    // inbound_mesh is for incoming connections FROM the mesh.
-    InboundMeshMTLS inbound_mesh = 2;
-    // outbound_mesh is for outbound connections TO mesh destinations.
-    OutboundMeshMTLS outbound_mesh = 3;
-    // inbound_non_mesh is for incoming connections FROM non mesh.
-    InboundNonMeshTLS inbound_non_mesh = 4;
-    // outbound_non_mesh is for outbound connections TO non mesh destinations.
-    OutboundNonMeshTLS outbound_non_mesh = 5;
-  }
-  // tls_parameters can override any top level tls parameters that are configured.
-  TLSParameters tls_parameters = 6;
-  repeated string alpn_protocols = 7;
-}
-
-message InboundMeshMTLS {
-  // identity_key is UUID key to use to look up the leaf certificate in ProxyState to present for incoming connections.
-  string identity_key = 1;
-  // validation_context has what is needed to validate incoming connections.
-  MeshInboundValidationContext validation_context = 2;
-}
-
-message OutboundMeshMTLS {
-  // identity_key is UUID key to use to look up the leaf certificate in ProxyState when connecting to destinations.
-  string identity_key = 1;
-  // validation_context has what is needed to validate the destination.
-  MeshOutboundValidationContext validation_context = 2;
-  // sni to use when connecting to the destination.
-  string sni = 3;
-}
-
-message InboundNonMeshTLS {
-  // identity is the reference to the leaf certificate to present for incoming connections.
-  oneof identity {
-    // leaf_key is the UUID key to use to look up the leaf certificate in the ProxyState leaf certificate map.
-    string leaf_key = 1;
-    // sds refers to certificates retrieved via Envoy SDS.
-    SDSCertificate sds = 2;
-  }
-}
-
-message OutboundNonMeshTLS {
-  // cert_file is a filename for a certificate to present for outbound connections.
-  string cert_file = 1;
-  // key_file is a filename for a key for outbound connections.
-  string key_file = 2;
-  // validation_context has what is needed to validate the destination.
-  NonMeshOutboundValidationContext validation_context = 3;
-}
-
-message MeshInboundValidationContext {
-  // trust_bundle_peer_name_keys is which trust bundles to use for validating incoming connections. If this workload is exported
-  // to peers, the incoming connection could be from a different peer, requiring that trust bundle to validate the
-  // connection. These could be local or peered trust bundles. This will be a key in the trust bundle map.
-  repeated string trust_bundle_peer_name_keys = 1;
-}
-
-message MeshOutboundValidationContext {
-  // trust_bundle_peer_name_key is which trust bundle to use for the destination. It could be the local or a peer's trust bundle.
-  // This will be a key in the trust bundle map.
-  string trust_bundle_peer_name_key = 1;
-  // spiffe_ids is one or more spiffe IDs to validate.
-  repeated string spiffe_ids = 2;
-}
-
-message NonMeshOutboundValidationContext {
-  // ca_file is a filename for a ca for outbound connections to validate the destination.
-  string ca_file = 1;
-}
-
-message SDSCertificate {
-  string cluster_name = 1;
-  string cert_resource = 2;
-}
-
-message TLSParameters {
-  TLSVersion min_version = 1;
-  TLSVersion max_version = 2;
-  repeated TLSCipherSuite cipher_suites = 3;
-}
-
-message LeafCertificate {
-  string cert = 1;
-  string key = 2;
-}
-
-message TrustBundle {
-  string trust_domain = 1;
-  repeated string roots = 2;
-}
-
-enum TLSVersion {
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  TLS_VERSION_AUTO = 0;
-  TLS_VERSION_1_0 = 1;
-  TLS_VERSION_1_1 = 2;
-  TLS_VERSION_1_2 = 3;
-  TLS_VERSION_1_3 = 4;
-  TLS_VERSION_INVALID = 5;
-  TLS_VERSION_UNSPECIFIED = 6;
-}
-
-enum TLSCipherSuite {
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  TLS_CIPHER_SUITE_ECDHE_ECDSA_AES128_GCM_SHA256 = 0;
-  TLS_CIPHER_SUITE_ECDHE_ECDSA_CHACHA20_POLY1305 = 1;
-  TLS_CIPHER_SUITE_ECDHE_RSA_AES128_GCM_SHA256 = 2;
-  TLS_CIPHER_SUITE_ECDHE_RSA_CHACHA20_POLY1305 = 3;
-  TLS_CIPHER_SUITE_ECDHE_ECDSA_AES128_SHA = 4;
-  TLS_CIPHER_SUITE_ECDHE_RSA_AES128_SHA = 5;
-  TLS_CIPHER_SUITE_AES128_GCM_SHA256 = 6;
-  TLS_CIPHER_SUITE_AES128_SHA = 7;
-  TLS_CIPHER_SUITE_ECDHE_ECDSA_AES256_GCM_SHA384 = 8;
-  TLS_CIPHER_SUITE_ECDHE_RSA_AES256_GCM_SHA384 = 9;
-  TLS_CIPHER_SUITE_ECDHE_ECDSA_AES256_SHA = 10;
-  TLS_CIPHER_SUITE_ECDHE_RSA_AES256_SHA = 11;
-  TLS_CIPHER_SUITE_AES256_GCM_SHA384 = 12;
-  TLS_CIPHER_SUITE_AES256_SHA = 13;
-}
diff --git a/proto-public/pbmesh/v2beta1/proxy_configuration.pb.binary.go b/proto-public/pbmesh/v2beta1/proxy_configuration.pb.binary.go
deleted file mode 100644
index cb786967202d5..0000000000000
--- a/proto-public/pbmesh/v2beta1/proxy_configuration.pb.binary.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/proxy_configuration.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ProxyConfiguration) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ProxyConfiguration) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DynamicConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DynamicConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TransparentProxy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TransparentProxy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *BootstrapConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *BootstrapConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *AccessLogsConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *AccessLogsConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *EnvoyExtension) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *EnvoyExtension) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/proxy_configuration.pb.go b/proto-public/pbmesh/v2beta1/proxy_configuration.pb.go
deleted file mode 100644
index 8ad5d7ccbdcd3..0000000000000
--- a/proto-public/pbmesh/v2beta1/proxy_configuration.pb.go
+++ /dev/null
@@ -1,1229 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/proxy_configuration.proto
-
-package meshv2beta1
-
-import (
-	v2beta1 "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	structpb "google.golang.org/protobuf/types/known/structpb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type ProxyMode int32
-
-const (
-	// ProxyModeDefault represents no specific mode and should
-	// be used to indicate that a different layer of the configuration
-	// chain should take precedence
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	ProxyMode_PROXY_MODE_DEFAULT ProxyMode = 0
-	// ProxyModeTransparent represents that inbound and outbound application
-	// traffic is being captured and redirected through the proxy.
-	ProxyMode_PROXY_MODE_TRANSPARENT ProxyMode = 1
-	// ProxyModeDirect represents that the proxy's listeners must be dialed directly
-	// by the local application and other proxies.
-	ProxyMode_PROXY_MODE_DIRECT ProxyMode = 2
-)
-
-// Enum value maps for ProxyMode.
-var (
-	ProxyMode_name = map[int32]string{
-		0: "PROXY_MODE_DEFAULT",
-		1: "PROXY_MODE_TRANSPARENT",
-		2: "PROXY_MODE_DIRECT",
-	}
-	ProxyMode_value = map[string]int32{
-		"PROXY_MODE_DEFAULT":     0,
-		"PROXY_MODE_TRANSPARENT": 1,
-		"PROXY_MODE_DIRECT":      2,
-	}
-)
-
-func (x ProxyMode) Enum() *ProxyMode {
-	p := new(ProxyMode)
-	*p = x
-	return p
-}
-
-func (x ProxyMode) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (ProxyMode) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_proxy_configuration_proto_enumTypes[0].Descriptor()
-}
-
-func (ProxyMode) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_proxy_configuration_proto_enumTypes[0]
-}
-
-func (x ProxyMode) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use ProxyMode.Descriptor instead.
-func (ProxyMode) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_proxy_configuration_proto_rawDescGZIP(), []int{0}
-}
-
-type LogSinkType int32
-
-const (
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	LogSinkType_LOG_SINK_TYPE_DEFAULT LogSinkType = 0
-	LogSinkType_LOG_SINK_TYPE_FILE    LogSinkType = 1
-	LogSinkType_LOG_SINK_TYPE_STDERR  LogSinkType = 2
-	LogSinkType_LOG_SINK_TYPE_STDOUT  LogSinkType = 3
-)
-
-// Enum value maps for LogSinkType.
-var (
-	LogSinkType_name = map[int32]string{
-		0: "LOG_SINK_TYPE_DEFAULT",
-		1: "LOG_SINK_TYPE_FILE",
-		2: "LOG_SINK_TYPE_STDERR",
-		3: "LOG_SINK_TYPE_STDOUT",
-	}
-	LogSinkType_value = map[string]int32{
-		"LOG_SINK_TYPE_DEFAULT": 0,
-		"LOG_SINK_TYPE_FILE":    1,
-		"LOG_SINK_TYPE_STDERR":  2,
-		"LOG_SINK_TYPE_STDOUT":  3,
-	}
-)
-
-func (x LogSinkType) Enum() *LogSinkType {
-	p := new(LogSinkType)
-	*p = x
-	return p
-}
-
-func (x LogSinkType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (LogSinkType) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_proxy_configuration_proto_enumTypes[1].Descriptor()
-}
-
-func (LogSinkType) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_proxy_configuration_proto_enumTypes[1]
-}
-
-func (x LogSinkType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use LogSinkType.Descriptor instead.
-func (LogSinkType) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_proxy_configuration_proto_rawDescGZIP(), []int{1}
-}
-
-type MutualTLSMode int32
-
-const (
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	MutualTLSMode_MUTUAL_TLS_MODE_DEFAULT    MutualTLSMode = 0
-	MutualTLSMode_MUTUAL_TLS_MODE_STRICT     MutualTLSMode = 1
-	MutualTLSMode_MUTUAL_TLS_MODE_PERMISSIVE MutualTLSMode = 2
-)
-
-// Enum value maps for MutualTLSMode.
-var (
-	MutualTLSMode_name = map[int32]string{
-		0: "MUTUAL_TLS_MODE_DEFAULT",
-		1: "MUTUAL_TLS_MODE_STRICT",
-		2: "MUTUAL_TLS_MODE_PERMISSIVE",
-	}
-	MutualTLSMode_value = map[string]int32{
-		"MUTUAL_TLS_MODE_DEFAULT":    0,
-		"MUTUAL_TLS_MODE_STRICT":     1,
-		"MUTUAL_TLS_MODE_PERMISSIVE": 2,
-	}
-)
-
-func (x MutualTLSMode) Enum() *MutualTLSMode {
-	p := new(MutualTLSMode)
-	*p = x
-	return p
-}
-
-func (x MutualTLSMode) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (MutualTLSMode) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_proxy_configuration_proto_enumTypes[2].Descriptor()
-}
-
-func (MutualTLSMode) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_proxy_configuration_proto_enumTypes[2]
-}
-
-func (x MutualTLSMode) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use MutualTLSMode.Descriptor instead.
-func (MutualTLSMode) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_proxy_configuration_proto_rawDescGZIP(), []int{2}
-}
-
-// This is a Resource type.
-type ProxyConfiguration struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Selection of workloads this proxy configuration should apply to.
-	// These can be prefixes or specific workload names.
-	Workloads *v2beta1.WorkloadSelector `protobuf:"bytes,1,opt,name=workloads,proto3" json:"workloads,omitempty"`
-	// dynamic_config is the configuration that could be changed
-	// dynamically (i.e. without needing restart).
-	DynamicConfig *DynamicConfig `protobuf:"bytes,2,opt,name=dynamic_config,json=dynamicConfig,proto3" json:"dynamic_config,omitempty"`
-	// bootstrap_config is the configuration that requires proxies
-	// to be restarted to be applied.
-	BootstrapConfig *BootstrapConfig `protobuf:"bytes,3,opt,name=bootstrap_config,json=bootstrapConfig,proto3" json:"bootstrap_config,omitempty"`
-	// deprecated: prevent usage when using v2 APIs directly.
-	// needed for backwards compatibility
-	//
-	// Deprecated: Marked as deprecated in pbmesh/v2beta1/proxy_configuration.proto.
-	OpaqueConfig *structpb.Struct `protobuf:"bytes,4,opt,name=opaque_config,json=opaqueConfig,proto3" json:"opaque_config,omitempty"`
-}
-
-func (x *ProxyConfiguration) Reset() {
-	*x = ProxyConfiguration{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ProxyConfiguration) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ProxyConfiguration) ProtoMessage() {}
-
-func (x *ProxyConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ProxyConfiguration.ProtoReflect.Descriptor instead.
-func (*ProxyConfiguration) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_proxy_configuration_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ProxyConfiguration) GetWorkloads() *v2beta1.WorkloadSelector {
-	if x != nil {
-		return x.Workloads
-	}
-	return nil
-}
-
-func (x *ProxyConfiguration) GetDynamicConfig() *DynamicConfig {
-	if x != nil {
-		return x.DynamicConfig
-	}
-	return nil
-}
-
-func (x *ProxyConfiguration) GetBootstrapConfig() *BootstrapConfig {
-	if x != nil {
-		return x.BootstrapConfig
-	}
-	return nil
-}
-
-// Deprecated: Marked as deprecated in pbmesh/v2beta1/proxy_configuration.proto.
-func (x *ProxyConfiguration) GetOpaqueConfig() *structpb.Struct {
-	if x != nil {
-		return x.OpaqueConfig
-	}
-	return nil
-}
-
-type DynamicConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mode indicates the proxy's mode. This will default to 'transparent'.
-	Mode             ProxyMode         `protobuf:"varint,1,opt,name=mode,proto3,enum=hashicorp.consul.mesh.v2beta1.ProxyMode" json:"mode,omitempty"`
-	TransparentProxy *TransparentProxy `protobuf:"bytes,2,opt,name=transparent_proxy,json=transparentProxy,proto3" json:"transparent_proxy,omitempty"`
-	MutualTlsMode    MutualTLSMode     `protobuf:"varint,3,opt,name=mutual_tls_mode,json=mutualTlsMode,proto3,enum=hashicorp.consul.mesh.v2beta1.MutualTLSMode" json:"mutual_tls_mode,omitempty"`
-	// local_connection is the configuration that should be used
-	// to connect to the local application provided per-port.
-	// The map keys should correspond to port names on the workload.
-	LocalConnection map[string]*ConnectionConfig `protobuf:"bytes,4,rep,name=local_connection,json=localConnection,proto3" json:"local_connection,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// inbound_connections configures inbound connections to the proxy.
-	InboundConnections *InboundConnectionsConfig `protobuf:"bytes,5,opt,name=inbound_connections,json=inboundConnections,proto3" json:"inbound_connections,omitempty"`
-	MeshGatewayMode    MeshGatewayMode           `protobuf:"varint,6,opt,name=mesh_gateway_mode,json=meshGatewayMode,proto3,enum=hashicorp.consul.mesh.v2beta1.MeshGatewayMode" json:"mesh_gateway_mode,omitempty"`
-	ExposeConfig       *ExposeConfig             `protobuf:"bytes,7,opt,name=expose_config,json=exposeConfig,proto3" json:"expose_config,omitempty"`
-	// AccessLogs configures the output and format of Envoy access logs
-	AccessLogs          *AccessLogsConfig `protobuf:"bytes,8,opt,name=access_logs,json=accessLogs,proto3" json:"access_logs,omitempty"`
-	EnvoyExtensions     []*EnvoyExtension `protobuf:"bytes,9,rep,name=envoy_extensions,json=envoyExtensions,proto3" json:"envoy_extensions,omitempty"`
-	PublicListenerJson  string            `protobuf:"bytes,10,opt,name=public_listener_json,json=publicListenerJson,proto3" json:"public_listener_json,omitempty"`
-	ListenerTracingJson string            `protobuf:"bytes,11,opt,name=listener_tracing_json,json=listenerTracingJson,proto3" json:"listener_tracing_json,omitempty"`
-	LocalClusterJson    string            `protobuf:"bytes,12,opt,name=local_cluster_json,json=localClusterJson,proto3" json:"local_cluster_json,omitempty"`
-	// deprecated:
-	// local_workload_address, local_workload_port, and local_workload_socket_path
-	// are deprecated and are only needed for migration of existing resources.
-	//
-	// Deprecated: Marked as deprecated in pbmesh/v2beta1/proxy_configuration.proto.
-	LocalWorkloadAddress string `protobuf:"bytes,13,opt,name=local_workload_address,json=localWorkloadAddress,proto3" json:"local_workload_address,omitempty"`
-	// Deprecated: Marked as deprecated in pbmesh/v2beta1/proxy_configuration.proto.
-	LocalWorkloadPort uint32 `protobuf:"varint,14,opt,name=local_workload_port,json=localWorkloadPort,proto3" json:"local_workload_port,omitempty"`
-	// Deprecated: Marked as deprecated in pbmesh/v2beta1/proxy_configuration.proto.
-	LocalWorkloadSocketPath string `protobuf:"bytes,15,opt,name=local_workload_socket_path,json=localWorkloadSocketPath,proto3" json:"local_workload_socket_path,omitempty"`
-}
-
-func (x *DynamicConfig) Reset() {
-	*x = DynamicConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DynamicConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DynamicConfig) ProtoMessage() {}
-
-func (x *DynamicConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DynamicConfig.ProtoReflect.Descriptor instead.
-func (*DynamicConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_proxy_configuration_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *DynamicConfig) GetMode() ProxyMode {
-	if x != nil {
-		return x.Mode
-	}
-	return ProxyMode_PROXY_MODE_DEFAULT
-}
-
-func (x *DynamicConfig) GetTransparentProxy() *TransparentProxy {
-	if x != nil {
-		return x.TransparentProxy
-	}
-	return nil
-}
-
-func (x *DynamicConfig) GetMutualTlsMode() MutualTLSMode {
-	if x != nil {
-		return x.MutualTlsMode
-	}
-	return MutualTLSMode_MUTUAL_TLS_MODE_DEFAULT
-}
-
-func (x *DynamicConfig) GetLocalConnection() map[string]*ConnectionConfig {
-	if x != nil {
-		return x.LocalConnection
-	}
-	return nil
-}
-
-func (x *DynamicConfig) GetInboundConnections() *InboundConnectionsConfig {
-	if x != nil {
-		return x.InboundConnections
-	}
-	return nil
-}
-
-func (x *DynamicConfig) GetMeshGatewayMode() MeshGatewayMode {
-	if x != nil {
-		return x.MeshGatewayMode
-	}
-	return MeshGatewayMode_MESH_GATEWAY_MODE_UNSPECIFIED
-}
-
-func (x *DynamicConfig) GetExposeConfig() *ExposeConfig {
-	if x != nil {
-		return x.ExposeConfig
-	}
-	return nil
-}
-
-func (x *DynamicConfig) GetAccessLogs() *AccessLogsConfig {
-	if x != nil {
-		return x.AccessLogs
-	}
-	return nil
-}
-
-func (x *DynamicConfig) GetEnvoyExtensions() []*EnvoyExtension {
-	if x != nil {
-		return x.EnvoyExtensions
-	}
-	return nil
-}
-
-func (x *DynamicConfig) GetPublicListenerJson() string {
-	if x != nil {
-		return x.PublicListenerJson
-	}
-	return ""
-}
-
-func (x *DynamicConfig) GetListenerTracingJson() string {
-	if x != nil {
-		return x.ListenerTracingJson
-	}
-	return ""
-}
-
-func (x *DynamicConfig) GetLocalClusterJson() string {
-	if x != nil {
-		return x.LocalClusterJson
-	}
-	return ""
-}
-
-// Deprecated: Marked as deprecated in pbmesh/v2beta1/proxy_configuration.proto.
-func (x *DynamicConfig) GetLocalWorkloadAddress() string {
-	if x != nil {
-		return x.LocalWorkloadAddress
-	}
-	return ""
-}
-
-// Deprecated: Marked as deprecated in pbmesh/v2beta1/proxy_configuration.proto.
-func (x *DynamicConfig) GetLocalWorkloadPort() uint32 {
-	if x != nil {
-		return x.LocalWorkloadPort
-	}
-	return 0
-}
-
-// Deprecated: Marked as deprecated in pbmesh/v2beta1/proxy_configuration.proto.
-func (x *DynamicConfig) GetLocalWorkloadSocketPath() string {
-	if x != nil {
-		return x.LocalWorkloadSocketPath
-	}
-	return ""
-}
-
-type TransparentProxy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// outbound_listener_port is the port for the proxy's outbound listener.
-	// This defaults to 15001.
-	OutboundListenerPort uint32 `protobuf:"varint,1,opt,name=outbound_listener_port,json=outboundListenerPort,proto3" json:"outbound_listener_port,omitempty"`
-	// dialed_directly indicates whether this proxy should be dialed using original destination IP
-	// in the connection rather than load balance between all endpoints.
-	DialedDirectly bool `protobuf:"varint,2,opt,name=dialed_directly,json=dialedDirectly,proto3" json:"dialed_directly,omitempty"`
-}
-
-func (x *TransparentProxy) Reset() {
-	*x = TransparentProxy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TransparentProxy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TransparentProxy) ProtoMessage() {}
-
-func (x *TransparentProxy) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TransparentProxy.ProtoReflect.Descriptor instead.
-func (*TransparentProxy) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_proxy_configuration_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *TransparentProxy) GetOutboundListenerPort() uint32 {
-	if x != nil {
-		return x.OutboundListenerPort
-	}
-	return 0
-}
-
-func (x *TransparentProxy) GetDialedDirectly() bool {
-	if x != nil {
-		return x.DialedDirectly
-	}
-	return false
-}
-
-// BootstrapConfig is equivalent to configuration defined
-// in our docs.
-type BootstrapConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	StatsdUrl                       string   `protobuf:"bytes,1,opt,name=statsd_url,json=statsdUrl,proto3" json:"statsd_url,omitempty"`
-	DogstatsdUrl                    string   `protobuf:"bytes,2,opt,name=dogstatsd_url,json=dogstatsdUrl,proto3" json:"dogstatsd_url,omitempty"`
-	StatsTags                       []string `protobuf:"bytes,3,rep,name=stats_tags,json=statsTags,proto3" json:"stats_tags,omitempty"`
-	PrometheusBindAddr              string   `protobuf:"bytes,4,opt,name=prometheus_bind_addr,json=prometheusBindAddr,proto3" json:"prometheus_bind_addr,omitempty"`
-	StatsBindAddr                   string   `protobuf:"bytes,5,opt,name=stats_bind_addr,json=statsBindAddr,proto3" json:"stats_bind_addr,omitempty"`
-	ReadyBindAddr                   string   `protobuf:"bytes,6,opt,name=ready_bind_addr,json=readyBindAddr,proto3" json:"ready_bind_addr,omitempty"`
-	OverrideJsonTpl                 string   `protobuf:"bytes,7,opt,name=override_json_tpl,json=overrideJsonTpl,proto3" json:"override_json_tpl,omitempty"`
-	StaticClustersJson              string   `protobuf:"bytes,8,opt,name=static_clusters_json,json=staticClustersJson,proto3" json:"static_clusters_json,omitempty"`
-	StaticListenersJson             string   `protobuf:"bytes,9,opt,name=static_listeners_json,json=staticListenersJson,proto3" json:"static_listeners_json,omitempty"`
-	StatsSinksJson                  string   `protobuf:"bytes,10,opt,name=stats_sinks_json,json=statsSinksJson,proto3" json:"stats_sinks_json,omitempty"`
-	StatsConfigJson                 string   `protobuf:"bytes,11,opt,name=stats_config_json,json=statsConfigJson,proto3" json:"stats_config_json,omitempty"`
-	StatsFlushInterval              string   `protobuf:"bytes,12,opt,name=stats_flush_interval,json=statsFlushInterval,proto3" json:"stats_flush_interval,omitempty"`
-	TracingConfigJson               string   `protobuf:"bytes,13,opt,name=tracing_config_json,json=tracingConfigJson,proto3" json:"tracing_config_json,omitempty"`
-	TelemetryCollectorBindSocketDir string   `protobuf:"bytes,14,opt,name=telemetry_collector_bind_socket_dir,json=telemetryCollectorBindSocketDir,proto3" json:"telemetry_collector_bind_socket_dir,omitempty"`
-}
-
-func (x *BootstrapConfig) Reset() {
-	*x = BootstrapConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *BootstrapConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*BootstrapConfig) ProtoMessage() {}
-
-func (x *BootstrapConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use BootstrapConfig.ProtoReflect.Descriptor instead.
-func (*BootstrapConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_proxy_configuration_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *BootstrapConfig) GetStatsdUrl() string {
-	if x != nil {
-		return x.StatsdUrl
-	}
-	return ""
-}
-
-func (x *BootstrapConfig) GetDogstatsdUrl() string {
-	if x != nil {
-		return x.DogstatsdUrl
-	}
-	return ""
-}
-
-func (x *BootstrapConfig) GetStatsTags() []string {
-	if x != nil {
-		return x.StatsTags
-	}
-	return nil
-}
-
-func (x *BootstrapConfig) GetPrometheusBindAddr() string {
-	if x != nil {
-		return x.PrometheusBindAddr
-	}
-	return ""
-}
-
-func (x *BootstrapConfig) GetStatsBindAddr() string {
-	if x != nil {
-		return x.StatsBindAddr
-	}
-	return ""
-}
-
-func (x *BootstrapConfig) GetReadyBindAddr() string {
-	if x != nil {
-		return x.ReadyBindAddr
-	}
-	return ""
-}
-
-func (x *BootstrapConfig) GetOverrideJsonTpl() string {
-	if x != nil {
-		return x.OverrideJsonTpl
-	}
-	return ""
-}
-
-func (x *BootstrapConfig) GetStaticClustersJson() string {
-	if x != nil {
-		return x.StaticClustersJson
-	}
-	return ""
-}
-
-func (x *BootstrapConfig) GetStaticListenersJson() string {
-	if x != nil {
-		return x.StaticListenersJson
-	}
-	return ""
-}
-
-func (x *BootstrapConfig) GetStatsSinksJson() string {
-	if x != nil {
-		return x.StatsSinksJson
-	}
-	return ""
-}
-
-func (x *BootstrapConfig) GetStatsConfigJson() string {
-	if x != nil {
-		return x.StatsConfigJson
-	}
-	return ""
-}
-
-func (x *BootstrapConfig) GetStatsFlushInterval() string {
-	if x != nil {
-		return x.StatsFlushInterval
-	}
-	return ""
-}
-
-func (x *BootstrapConfig) GetTracingConfigJson() string {
-	if x != nil {
-		return x.TracingConfigJson
-	}
-	return ""
-}
-
-func (x *BootstrapConfig) GetTelemetryCollectorBindSocketDir() string {
-	if x != nil {
-		return x.TelemetryCollectorBindSocketDir
-	}
-	return ""
-}
-
-// AccessLogsConfig contains the associated default settings for all Envoy
-// instances within the datacenter or partition
-type AccessLogsConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Enabled turns off all access logging
-	Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
-	// DisableListenerLogs turns off just listener logs for connections rejected by Envoy because they don't
-	// have a matching listener filter.
-	DisableListenerLogs bool `protobuf:"varint,2,opt,name=disable_listener_logs,json=disableListenerLogs,proto3" json:"disable_listener_logs,omitempty"`
-	// Type selects the output for logs: "file", "stderr". "stdout"
-	Type LogSinkType `protobuf:"varint,3,opt,name=type,proto3,enum=hashicorp.consul.mesh.v2beta1.LogSinkType" json:"type,omitempty"`
-	// Path is the output file to write logs
-	Path string `protobuf:"bytes,4,opt,name=path,proto3" json:"path,omitempty"`
-	// The presence of one format string or the other implies the access log string encoding.
-	// Defining Both is invalid.
-	JsonFormat string `protobuf:"bytes,5,opt,name=json_format,json=jsonFormat,proto3" json:"json_format,omitempty"`
-	TextFormat string `protobuf:"bytes,6,opt,name=text_format,json=textFormat,proto3" json:"text_format,omitempty"`
-}
-
-func (x *AccessLogsConfig) Reset() {
-	*x = AccessLogsConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AccessLogsConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AccessLogsConfig) ProtoMessage() {}
-
-func (x *AccessLogsConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AccessLogsConfig.ProtoReflect.Descriptor instead.
-func (*AccessLogsConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_proxy_configuration_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *AccessLogsConfig) GetEnabled() bool {
-	if x != nil {
-		return x.Enabled
-	}
-	return false
-}
-
-func (x *AccessLogsConfig) GetDisableListenerLogs() bool {
-	if x != nil {
-		return x.DisableListenerLogs
-	}
-	return false
-}
-
-func (x *AccessLogsConfig) GetType() LogSinkType {
-	if x != nil {
-		return x.Type
-	}
-	return LogSinkType_LOG_SINK_TYPE_DEFAULT
-}
-
-func (x *AccessLogsConfig) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-func (x *AccessLogsConfig) GetJsonFormat() string {
-	if x != nil {
-		return x.JsonFormat
-	}
-	return ""
-}
-
-func (x *AccessLogsConfig) GetTextFormat() string {
-	if x != nil {
-		return x.TextFormat
-	}
-	return ""
-}
-
-// EnvoyExtension has configuration for an extension that patches Envoy resources.
-type EnvoyExtension struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name          string           `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Required      bool             `protobuf:"varint,2,opt,name=required,proto3" json:"required,omitempty"`
-	Arguments     *structpb.Struct `protobuf:"bytes,3,opt,name=arguments,proto3" json:"arguments,omitempty"`
-	ConsulVersion string           `protobuf:"bytes,4,opt,name=consul_version,json=consulVersion,proto3" json:"consul_version,omitempty"`
-	EnvoyVersion  string           `protobuf:"bytes,5,opt,name=envoy_version,json=envoyVersion,proto3" json:"envoy_version,omitempty"`
-}
-
-func (x *EnvoyExtension) Reset() {
-	*x = EnvoyExtension{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EnvoyExtension) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EnvoyExtension) ProtoMessage() {}
-
-func (x *EnvoyExtension) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EnvoyExtension.ProtoReflect.Descriptor instead.
-func (*EnvoyExtension) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_proxy_configuration_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *EnvoyExtension) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *EnvoyExtension) GetRequired() bool {
-	if x != nil {
-		return x.Required
-	}
-	return false
-}
-
-func (x *EnvoyExtension) GetArguments() *structpb.Struct {
-	if x != nil {
-		return x.Arguments
-	}
-	return nil
-}
-
-func (x *EnvoyExtension) GetConsulVersion() string {
-	if x != nil {
-		return x.ConsulVersion
-	}
-	return ""
-}
-
-func (x *EnvoyExtension) GetEnvoyVersion() string {
-	if x != nil {
-		return x.EnvoyVersion
-	}
-	return ""
-}
-
-var File_pbmesh_v2beta1_proxy_configuration_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_proxy_configuration_proto_rawDesc = []byte{
-	0x0a, 0x28, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63,
-	0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x70, 0x62, 0x63, 0x61, 0x74, 0x61, 0x6c,
-	0x6f, 0x67, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x73, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x70, 0x62, 0x6d, 0x65, 0x73,
-	0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x70, 0x62, 0x6d, 0x65,
-	0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x65, 0x78, 0x70, 0x6f, 0x73,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x22, 0xe0, 0x02, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x50, 0x0a, 0x09, 0x77, 0x6f,
-	0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x52, 0x09, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x12, 0x53, 0x0a, 0x0e,
-	0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x52, 0x0d, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x59, 0x0a, 0x10, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x42, 0x6f, 0x6f, 0x74,
-	0x73, 0x74, 0x72, 0x61, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0f, 0x62, 0x6f, 0x6f,
-	0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x40, 0x0a, 0x0d,
-	0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x42, 0x02, 0x18, 0x01,
-	0x52, 0x0c, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x06,
-	0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0xeb, 0x09, 0x0a, 0x0d, 0x44, 0x79, 0x6e, 0x61, 0x6d,
-	0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x3c, 0x0a, 0x04, 0x6d, 0x6f, 0x64, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x28, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x4d, 0x6f, 0x64, 0x65,
-	0x52, 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x12, 0x5c, 0x0a, 0x11, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70,
-	0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f,
-	0x78, 0x79, 0x52, 0x10, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50,
-	0x72, 0x6f, 0x78, 0x79, 0x12, 0x54, 0x0a, 0x0f, 0x6d, 0x75, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x74,
-	0x6c, 0x73, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4d, 0x75,
-	0x74, 0x75, 0x61, 0x6c, 0x54, 0x4c, 0x53, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x0d, 0x6d, 0x75, 0x74,
-	0x75, 0x61, 0x6c, 0x54, 0x6c, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x6c, 0x0a, 0x10, 0x6c, 0x6f,
-	0x63, 0x61, 0x6c, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x68, 0x0a, 0x13, 0x69, 0x6e, 0x62, 0x6f,
-	0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x12,
-	0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x12, 0x5a, 0x0a, 0x11, 0x6d, 0x65, 0x73, 0x68, 0x5f, 0x67, 0x61, 0x74, 0x65, 0x77,
-	0x61, 0x79, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4d, 0x65,
-	0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x0f, 0x6d,
-	0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x50,
-	0x0a, 0x0d, 0x65, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x52, 0x0c, 0x65, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x50, 0x0a, 0x0b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x73, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f,
-	0x67, 0x73, 0x12, 0x58, 0x0a, 0x10, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x5f, 0x65, 0x78, 0x74, 0x65,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x45, 0x6e, 0x76,
-	0x6f, 0x79, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x30, 0x0a, 0x14,
-	0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f,
-	0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x70, 0x75, 0x62, 0x6c,
-	0x69, 0x63, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4a, 0x73, 0x6f, 0x6e, 0x12, 0x32,
-	0x0a, 0x15, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x69,
-	0x6e, 0x67, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x6c,
-	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x54, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x4a, 0x73,
-	0x6f, 0x6e, 0x12, 0x2c, 0x0a, 0x12, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x63, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10,
-	0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4a, 0x73, 0x6f, 0x6e,
-	0x12, 0x38, 0x0a, 0x16, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f,
-	0x61, 0x64, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09,
-	0x42, 0x02, 0x18, 0x01, 0x52, 0x14, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x57, 0x6f, 0x72, 0x6b, 0x6c,
-	0x6f, 0x61, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x32, 0x0a, 0x13, 0x6c, 0x6f,
-	0x63, 0x61, 0x6c, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x70, 0x6f, 0x72,
-	0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x02, 0x18, 0x01, 0x52, 0x11, 0x6c, 0x6f, 0x63,
-	0x61, 0x6c, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x3f,
-	0x0a, 0x1a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64,
-	0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x0f, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x17, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x57, 0x6f, 0x72,
-	0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x1a,
-	0x73, 0x0a, 0x14, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x45, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x22, 0x71, 0x0a, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72,
-	0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x34, 0x0a, 0x16, 0x6f, 0x75, 0x74, 0x62,
-	0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x70, 0x6f,
-	0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x14, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75,
-	0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x27,
-	0x0a, 0x0f, 0x64, 0x69, 0x61, 0x6c, 0x65, 0x64, 0x5f, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6c,
-	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x64, 0x69, 0x61, 0x6c, 0x65, 0x64, 0x44,
-	0x69, 0x72, 0x65, 0x63, 0x74, 0x6c, 0x79, 0x22, 0x8e, 0x05, 0x0a, 0x0f, 0x42, 0x6f, 0x6f, 0x74,
-	0x73, 0x74, 0x72, 0x61, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1d, 0x0a, 0x0a, 0x73,
-	0x74, 0x61, 0x74, 0x73, 0x64, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x73, 0x74, 0x61, 0x74, 0x73, 0x64, 0x55, 0x72, 0x6c, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x6f,
-	0x67, 0x73, 0x74, 0x61, 0x74, 0x73, 0x64, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0c, 0x64, 0x6f, 0x67, 0x73, 0x74, 0x61, 0x74, 0x73, 0x64, 0x55, 0x72, 0x6c, 0x12,
-	0x1d, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x73, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x09, 0x73, 0x74, 0x61, 0x74, 0x73, 0x54, 0x61, 0x67, 0x73, 0x12, 0x30,
-	0x0a, 0x14, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x5f, 0x62, 0x69, 0x6e,
-	0x64, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x70, 0x72,
-	0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x42, 0x69, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x72,
-	0x12, 0x26, 0x0a, 0x0f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x5f, 0x62, 0x69, 0x6e, 0x64, 0x5f, 0x61,
-	0x64, 0x64, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x74, 0x73,
-	0x42, 0x69, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x72, 0x12, 0x26, 0x0a, 0x0f, 0x72, 0x65, 0x61, 0x64,
-	0x79, 0x5f, 0x62, 0x69, 0x6e, 0x64, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0d, 0x72, 0x65, 0x61, 0x64, 0x79, 0x42, 0x69, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x72,
-	0x12, 0x2a, 0x0a, 0x11, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x6a, 0x73, 0x6f,
-	0x6e, 0x5f, 0x74, 0x70, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6f, 0x76, 0x65,
-	0x72, 0x72, 0x69, 0x64, 0x65, 0x4a, 0x73, 0x6f, 0x6e, 0x54, 0x70, 0x6c, 0x12, 0x30, 0x0a, 0x14,
-	0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x5f,
-	0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x73, 0x74, 0x61, 0x74,
-	0x69, 0x63, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x4a, 0x73, 0x6f, 0x6e, 0x12, 0x32,
-	0x0a, 0x15, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
-	0x72, 0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x73,
-	0x74, 0x61, 0x74, 0x69, 0x63, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x4a, 0x73,
-	0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x74, 0x73, 0x5f, 0x73, 0x69, 0x6e, 0x6b,
-	0x73, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x74,
-	0x61, 0x74, 0x73, 0x53, 0x69, 0x6e, 0x6b, 0x73, 0x4a, 0x73, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x11,
-	0x73, 0x74, 0x61, 0x74, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x6a, 0x73, 0x6f,
-	0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x4a, 0x73, 0x6f, 0x6e, 0x12, 0x30, 0x0a, 0x14, 0x73, 0x74, 0x61, 0x74,
-	0x73, 0x5f, 0x66, 0x6c, 0x75, 0x73, 0x68, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c,
-	0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x73, 0x74, 0x61, 0x74, 0x73, 0x46, 0x6c, 0x75,
-	0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x2e, 0x0a, 0x13, 0x74, 0x72,
-	0x61, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x6a, 0x73, 0x6f,
-	0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x74, 0x72, 0x61, 0x63, 0x69, 0x6e, 0x67,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4a, 0x73, 0x6f, 0x6e, 0x12, 0x4c, 0x0a, 0x23, 0x74, 0x65,
-	0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x5f, 0x62, 0x69, 0x6e, 0x64, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x64, 0x69,
-	0x72, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1f, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74,
-	0x72, 0x79, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x42, 0x69, 0x6e, 0x64, 0x53,
-	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x44, 0x69, 0x72, 0x22, 0xf6, 0x01, 0x0a, 0x10, 0x41, 0x63, 0x63,
-	0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x18, 0x0a,
-	0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07,
-	0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x32, 0x0a, 0x15, 0x64, 0x69, 0x73, 0x61, 0x62,
-	0x6c, 0x65, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x6c, 0x6f, 0x67, 0x73,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4c,
-	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x3e, 0x0a, 0x04, 0x74,
-	0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4c, 0x6f, 0x67, 0x53, 0x69, 0x6e,
-	0x6b, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x70,
-	0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12,
-	0x1f, 0x0a, 0x0b, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6a, 0x73, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
-	0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18,
-	0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x74, 0x65, 0x78, 0x74, 0x46, 0x6f, 0x72, 0x6d, 0x61,
-	0x74, 0x22, 0xc3, 0x01, 0x0a, 0x0e, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x45, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x71, 0x75,
-	0x69, 0x72, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x71, 0x75,
-	0x69, 0x72, 0x65, 0x64, 0x12, 0x35, 0x0a, 0x09, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74,
-	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74,
-	0x52, 0x09, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x56, 0x65, 0x72, 0x73, 0x69,
-	0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x5f, 0x76, 0x65, 0x72, 0x73,
-	0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x2a, 0x56, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x78, 0x79,
-	0x4d, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x52, 0x4f, 0x58, 0x59, 0x5f, 0x4d, 0x4f,
-	0x44, 0x45, 0x5f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00, 0x12, 0x1a, 0x0a, 0x16,
-	0x50, 0x52, 0x4f, 0x58, 0x59, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53,
-	0x50, 0x41, 0x52, 0x45, 0x4e, 0x54, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x50, 0x52, 0x4f, 0x58,
-	0x59, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x10, 0x02, 0x2a,
-	0x74, 0x0a, 0x0b, 0x4c, 0x6f, 0x67, 0x53, 0x69, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x19,
-	0x0a, 0x15, 0x4c, 0x4f, 0x47, 0x5f, 0x53, 0x49, 0x4e, 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00, 0x12, 0x16, 0x0a, 0x12, 0x4c, 0x4f, 0x47,
-	0x5f, 0x53, 0x49, 0x4e, 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x10,
-	0x01, 0x12, 0x18, 0x0a, 0x14, 0x4c, 0x4f, 0x47, 0x5f, 0x53, 0x49, 0x4e, 0x4b, 0x5f, 0x54, 0x59,
-	0x50, 0x45, 0x5f, 0x53, 0x54, 0x44, 0x45, 0x52, 0x52, 0x10, 0x02, 0x12, 0x18, 0x0a, 0x14, 0x4c,
-	0x4f, 0x47, 0x5f, 0x53, 0x49, 0x4e, 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x54, 0x44,
-	0x4f, 0x55, 0x54, 0x10, 0x03, 0x2a, 0x68, 0x0a, 0x0d, 0x4d, 0x75, 0x74, 0x75, 0x61, 0x6c, 0x54,
-	0x4c, 0x53, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x1b, 0x0a, 0x17, 0x4d, 0x55, 0x54, 0x55, 0x41, 0x4c,
-	0x5f, 0x54, 0x4c, 0x53, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c,
-	0x54, 0x10, 0x00, 0x12, 0x1a, 0x0a, 0x16, 0x4d, 0x55, 0x54, 0x55, 0x41, 0x4c, 0x5f, 0x54, 0x4c,
-	0x53, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x43, 0x54, 0x10, 0x01, 0x12,
-	0x1e, 0x0a, 0x1a, 0x4d, 0x55, 0x54, 0x55, 0x41, 0x4c, 0x5f, 0x54, 0x4c, 0x53, 0x5f, 0x4d, 0x4f,
-	0x44, 0x45, 0x5f, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x56, 0x45, 0x10, 0x02, 0x42,
-	0x98, 0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x17, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73,
-	0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x6d, 0x65, 0x73, 0x68, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x1d, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d,
-	0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x1d, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d,
-	0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x29, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d,
-	0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73,
-	0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_proxy_configuration_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_proxy_configuration_proto_rawDescData = file_pbmesh_v2beta1_proxy_configuration_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_proxy_configuration_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_proxy_configuration_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_proxy_configuration_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_proxy_configuration_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_proxy_configuration_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_proxy_configuration_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
-var file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
-var file_pbmesh_v2beta1_proxy_configuration_proto_goTypes = []interface{}{
-	(ProxyMode)(0),                   // 0: hashicorp.consul.mesh.v2beta1.ProxyMode
-	(LogSinkType)(0),                 // 1: hashicorp.consul.mesh.v2beta1.LogSinkType
-	(MutualTLSMode)(0),               // 2: hashicorp.consul.mesh.v2beta1.MutualTLSMode
-	(*ProxyConfiguration)(nil),       // 3: hashicorp.consul.mesh.v2beta1.ProxyConfiguration
-	(*DynamicConfig)(nil),            // 4: hashicorp.consul.mesh.v2beta1.DynamicConfig
-	(*TransparentProxy)(nil),         // 5: hashicorp.consul.mesh.v2beta1.TransparentProxy
-	(*BootstrapConfig)(nil),          // 6: hashicorp.consul.mesh.v2beta1.BootstrapConfig
-	(*AccessLogsConfig)(nil),         // 7: hashicorp.consul.mesh.v2beta1.AccessLogsConfig
-	(*EnvoyExtension)(nil),           // 8: hashicorp.consul.mesh.v2beta1.EnvoyExtension
-	nil,                              // 9: hashicorp.consul.mesh.v2beta1.DynamicConfig.LocalConnectionEntry
-	(*v2beta1.WorkloadSelector)(nil), // 10: hashicorp.consul.catalog.v2beta1.WorkloadSelector
-	(*structpb.Struct)(nil),          // 11: google.protobuf.Struct
-	(*InboundConnectionsConfig)(nil), // 12: hashicorp.consul.mesh.v2beta1.InboundConnectionsConfig
-	(MeshGatewayMode)(0),             // 13: hashicorp.consul.mesh.v2beta1.MeshGatewayMode
-	(*ExposeConfig)(nil),             // 14: hashicorp.consul.mesh.v2beta1.ExposeConfig
-	(*ConnectionConfig)(nil),         // 15: hashicorp.consul.mesh.v2beta1.ConnectionConfig
-}
-var file_pbmesh_v2beta1_proxy_configuration_proto_depIdxs = []int32{
-	10, // 0: hashicorp.consul.mesh.v2beta1.ProxyConfiguration.workloads:type_name -> hashicorp.consul.catalog.v2beta1.WorkloadSelector
-	4,  // 1: hashicorp.consul.mesh.v2beta1.ProxyConfiguration.dynamic_config:type_name -> hashicorp.consul.mesh.v2beta1.DynamicConfig
-	6,  // 2: hashicorp.consul.mesh.v2beta1.ProxyConfiguration.bootstrap_config:type_name -> hashicorp.consul.mesh.v2beta1.BootstrapConfig
-	11, // 3: hashicorp.consul.mesh.v2beta1.ProxyConfiguration.opaque_config:type_name -> google.protobuf.Struct
-	0,  // 4: hashicorp.consul.mesh.v2beta1.DynamicConfig.mode:type_name -> hashicorp.consul.mesh.v2beta1.ProxyMode
-	5,  // 5: hashicorp.consul.mesh.v2beta1.DynamicConfig.transparent_proxy:type_name -> hashicorp.consul.mesh.v2beta1.TransparentProxy
-	2,  // 6: hashicorp.consul.mesh.v2beta1.DynamicConfig.mutual_tls_mode:type_name -> hashicorp.consul.mesh.v2beta1.MutualTLSMode
-	9,  // 7: hashicorp.consul.mesh.v2beta1.DynamicConfig.local_connection:type_name -> hashicorp.consul.mesh.v2beta1.DynamicConfig.LocalConnectionEntry
-	12, // 8: hashicorp.consul.mesh.v2beta1.DynamicConfig.inbound_connections:type_name -> hashicorp.consul.mesh.v2beta1.InboundConnectionsConfig
-	13, // 9: hashicorp.consul.mesh.v2beta1.DynamicConfig.mesh_gateway_mode:type_name -> hashicorp.consul.mesh.v2beta1.MeshGatewayMode
-	14, // 10: hashicorp.consul.mesh.v2beta1.DynamicConfig.expose_config:type_name -> hashicorp.consul.mesh.v2beta1.ExposeConfig
-	7,  // 11: hashicorp.consul.mesh.v2beta1.DynamicConfig.access_logs:type_name -> hashicorp.consul.mesh.v2beta1.AccessLogsConfig
-	8,  // 12: hashicorp.consul.mesh.v2beta1.DynamicConfig.envoy_extensions:type_name -> hashicorp.consul.mesh.v2beta1.EnvoyExtension
-	1,  // 13: hashicorp.consul.mesh.v2beta1.AccessLogsConfig.type:type_name -> hashicorp.consul.mesh.v2beta1.LogSinkType
-	11, // 14: hashicorp.consul.mesh.v2beta1.EnvoyExtension.arguments:type_name -> google.protobuf.Struct
-	15, // 15: hashicorp.consul.mesh.v2beta1.DynamicConfig.LocalConnectionEntry.value:type_name -> hashicorp.consul.mesh.v2beta1.ConnectionConfig
-	16, // [16:16] is the sub-list for method output_type
-	16, // [16:16] is the sub-list for method input_type
-	16, // [16:16] is the sub-list for extension type_name
-	16, // [16:16] is the sub-list for extension extendee
-	0,  // [0:16] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_proxy_configuration_proto_init() }
-func file_pbmesh_v2beta1_proxy_configuration_proto_init() {
-	if File_pbmesh_v2beta1_proxy_configuration_proto != nil {
-		return
-	}
-	file_pbmesh_v2beta1_connection_proto_init()
-	file_pbmesh_v2beta1_expose_proto_init()
-	file_pbmesh_v2beta1_routing_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ProxyConfiguration); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DynamicConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TransparentProxy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BootstrapConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AccessLogsConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EnvoyExtension); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_proxy_configuration_proto_rawDesc,
-			NumEnums:      3,
-			NumMessages:   7,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_proxy_configuration_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_proxy_configuration_proto_depIdxs,
-		EnumInfos:         file_pbmesh_v2beta1_proxy_configuration_proto_enumTypes,
-		MessageInfos:      file_pbmesh_v2beta1_proxy_configuration_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_proxy_configuration_proto = out.File
-	file_pbmesh_v2beta1_proxy_configuration_proto_rawDesc = nil
-	file_pbmesh_v2beta1_proxy_configuration_proto_goTypes = nil
-	file_pbmesh_v2beta1_proxy_configuration_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/proxy_configuration.proto b/proto-public/pbmesh/v2beta1/proxy_configuration.proto
deleted file mode 100644
index 491a9e3313fa8..0000000000000
--- a/proto-public/pbmesh/v2beta1/proxy_configuration.proto
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "google/protobuf/struct.proto";
-import "pbcatalog/v2beta1/selector.proto";
-import "pbmesh/v2beta1/connection.proto";
-import "pbmesh/v2beta1/expose.proto";
-import "pbmesh/v2beta1/routing.proto";
-import "pbresource/annotations.proto";
-
-// This is a Resource type.
-message ProxyConfiguration {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  // Selection of workloads this proxy configuration should apply to.
-  // These can be prefixes or specific workload names.
-  hashicorp.consul.catalog.v2beta1.WorkloadSelector workloads = 1;
-
-  // dynamic_config is the configuration that could be changed
-  // dynamically (i.e. without needing restart).
-  DynamicConfig dynamic_config = 2;
-
-  // bootstrap_config is the configuration that requires proxies
-  // to be restarted to be applied.
-  BootstrapConfig bootstrap_config = 3;
-
-  // deprecated: prevent usage when using v2 APIs directly.
-  // needed for backwards compatibility
-  google.protobuf.Struct opaque_config = 4 [deprecated = true];
-}
-
-message DynamicConfig {
-  // mode indicates the proxy's mode. This will default to 'transparent'.
-  ProxyMode mode = 1;
-
-  TransparentProxy transparent_proxy = 2;
-
-  MutualTLSMode mutual_tls_mode = 3;
-
-  // local_connection is the configuration that should be used
-  // to connect to the local application provided per-port.
-  // The map keys should correspond to port names on the workload.
-  map<string, ConnectionConfig> local_connection = 4;
-
-  // inbound_connections configures inbound connections to the proxy.
-  InboundConnectionsConfig inbound_connections = 5;
-
-  MeshGatewayMode mesh_gateway_mode = 6;
-
-  ExposeConfig expose_config = 7;
-
-  // AccessLogs configures the output and format of Envoy access logs
-  AccessLogsConfig access_logs = 8;
-
-  repeated EnvoyExtension envoy_extensions = 9;
-
-  string public_listener_json = 10;
-  string listener_tracing_json = 11;
-  string local_cluster_json = 12;
-
-  // deprecated:
-  // local_workload_address, local_workload_port, and local_workload_socket_path
-  // are deprecated and are only needed for migration of existing resources.
-  string local_workload_address = 13 [deprecated = true];
-  uint32 local_workload_port = 14 [deprecated = true];
-  string local_workload_socket_path = 15 [deprecated = true];
-}
-
-message TransparentProxy {
-  // outbound_listener_port is the port for the proxy's outbound listener.
-  // This defaults to 15001.
-  uint32 outbound_listener_port = 1;
-
-  // dialed_directly indicates whether this proxy should be dialed using original destination IP
-  // in the connection rather than load balance between all endpoints.
-  bool dialed_directly = 2;
-}
-
-// BootstrapConfig is equivalent to configuration defined
-// in our docs.
-message BootstrapConfig {
-  string statsd_url = 1;
-  string dogstatsd_url = 2;
-  repeated string stats_tags = 3;
-  string prometheus_bind_addr = 4;
-  string stats_bind_addr = 5;
-  string ready_bind_addr = 6;
-  string override_json_tpl = 7;
-  string static_clusters_json = 8;
-  string static_listeners_json = 9;
-  string stats_sinks_json = 10;
-  string stats_config_json = 11;
-  string stats_flush_interval = 12;
-  string tracing_config_json = 13;
-  string telemetry_collector_bind_socket_dir = 14;
-}
-
-enum ProxyMode {
-  // ProxyModeDefault represents no specific mode and should
-  // be used to indicate that a different layer of the configuration
-  // chain should take precedence
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  PROXY_MODE_DEFAULT = 0;
-
-  // ProxyModeTransparent represents that inbound and outbound application
-  // traffic is being captured and redirected through the proxy.
-  PROXY_MODE_TRANSPARENT = 1;
-
-  // ProxyModeDirect represents that the proxy's listeners must be dialed directly
-  // by the local application and other proxies.
-  PROXY_MODE_DIRECT = 2;
-}
-
-// AccessLogsConfig contains the associated default settings for all Envoy
-// instances within the datacenter or partition
-message AccessLogsConfig {
-  // Enabled turns off all access logging
-  bool enabled = 1;
-
-  // DisableListenerLogs turns off just listener logs for connections rejected by Envoy because they don't
-  // have a matching listener filter.
-  bool disable_listener_logs = 2;
-
-  // Type selects the output for logs: "file", "stderr". "stdout"
-  LogSinkType type = 3;
-
-  // Path is the output file to write logs
-  string path = 4;
-
-  // The presence of one format string or the other implies the access log string encoding.
-  // Defining Both is invalid.
-  string json_format = 5;
-  string text_format = 6;
-}
-
-enum LogSinkType {
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  LOG_SINK_TYPE_DEFAULT = 0;
-  LOG_SINK_TYPE_FILE = 1;
-  LOG_SINK_TYPE_STDERR = 2;
-  LOG_SINK_TYPE_STDOUT = 3;
-}
-
-// EnvoyExtension has configuration for an extension that patches Envoy resources.
-message EnvoyExtension {
-  string name = 1;
-  bool required = 2;
-  google.protobuf.Struct arguments = 3;
-  string consul_version = 4;
-  string envoy_version = 5;
-}
-
-enum MutualTLSMode {
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  MUTUAL_TLS_MODE_DEFAULT = 0;
-  MUTUAL_TLS_MODE_STRICT = 1;
-  MUTUAL_TLS_MODE_PERMISSIVE = 2;
-}
diff --git a/proto-public/pbmesh/v2beta1/proxy_configuration_addon.go b/proto-public/pbmesh/v2beta1/proxy_configuration_addon.go
deleted file mode 100644
index 804c23425bfd9..0000000000000
--- a/proto-public/pbmesh/v2beta1/proxy_configuration_addon.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package meshv2beta1
-
-func (p *ProxyConfiguration) IsTransparentProxy() bool {
-	return p.GetDynamicConfig() != nil &&
-		p.DynamicConfig.Mode == ProxyMode_PROXY_MODE_TRANSPARENT
-}
diff --git a/proto-public/pbmesh/v2beta1/proxy_configuration_addon_test.go b/proto-public/pbmesh/v2beta1/proxy_configuration_addon_test.go
deleted file mode 100644
index e26cd0fe4fa26..0000000000000
--- a/proto-public/pbmesh/v2beta1/proxy_configuration_addon_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package meshv2beta1
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestIsTransprentProxy(t *testing.T) {
-	cases := map[string]struct {
-		proxyCfg *ProxyConfiguration
-		exp      bool
-	}{
-		"nil dynamic config": {
-			proxyCfg: &ProxyConfiguration{},
-			exp:      false,
-		},
-		"default mode": {
-			proxyCfg: &ProxyConfiguration{
-				DynamicConfig: &DynamicConfig{
-					Mode: ProxyMode_PROXY_MODE_DEFAULT,
-				},
-			},
-			exp: false,
-		},
-		"direct mode": {
-			proxyCfg: &ProxyConfiguration{
-				DynamicConfig: &DynamicConfig{
-					Mode: ProxyMode_PROXY_MODE_DEFAULT,
-				},
-			},
-			exp: false,
-		},
-		"transparent mode": {
-			proxyCfg: &ProxyConfiguration{
-				DynamicConfig: &DynamicConfig{
-					Mode: ProxyMode_PROXY_MODE_TRANSPARENT,
-				},
-			},
-			exp: true,
-		},
-	}
-
-	for name, c := range cases {
-		t.Run(name, func(t *testing.T) {
-			require.Equal(t, c.exp, c.proxyCfg.IsTransparentProxy())
-		})
-	}
-}
diff --git a/proto-public/pbmesh/v2beta1/proxy_state.pb.binary.go b/proto-public/pbmesh/v2beta1/proxy_state.pb.binary.go
deleted file mode 100644
index d259ba66fc796..0000000000000
--- a/proto-public/pbmesh/v2beta1/proxy_state.pb.binary.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/proxy_state.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ProxyStateTemplate) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ProxyStateTemplate) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ProxyState) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ProxyState) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/proxy_state.pb.go b/proto-public/pbmesh/v2beta1/proxy_state.pb.go
deleted file mode 100644
index 4f19f7b6af623..0000000000000
--- a/proto-public/pbmesh/v2beta1/proxy_state.pb.go
+++ /dev/null
@@ -1,551 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/proxy_state.proto
-
-package meshv2beta1
-
-import (
-	pbproxystate "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
-	pbresource "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type ProxyStateTemplate struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// proxy_state is the partially filled out ProxyState resource. The Endpoints, LeafCertificates and TrustBundles fields will need filling in after the resource is stored.
-	ProxyState *ProxyState `protobuf:"bytes,1,opt,name=proxy_state,json=proxyState,proto3" json:"proxy_state,omitempty"`
-	// required_endpoints is a map of arbitrary string names to endpoint refs that need fetching by the proxy state controller.
-	RequiredEndpoints map[string]*pbproxystate.EndpointRef `protobuf:"bytes,2,rep,name=required_endpoints,json=requiredEndpoints,proto3" json:"required_endpoints,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// required_leaf_certificates is a map of arbitrary string names to leaf certificates that need fetching/generation by the proxy state controller.
-	RequiredLeafCertificates map[string]*pbproxystate.LeafCertificateRef `protobuf:"bytes,3,rep,name=required_leaf_certificates,json=requiredLeafCertificates,proto3" json:"required_leaf_certificates,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// required_trust_bundles is a map of arbitrary string names to trust bundle refs that need fetching by the proxy state controller.
-	RequiredTrustBundles map[string]*pbproxystate.TrustBundleRef `protobuf:"bytes,4,rep,name=required_trust_bundles,json=requiredTrustBundles,proto3" json:"required_trust_bundles,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (x *ProxyStateTemplate) Reset() {
-	*x = ProxyStateTemplate{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_proxy_state_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ProxyStateTemplate) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ProxyStateTemplate) ProtoMessage() {}
-
-func (x *ProxyStateTemplate) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_proxy_state_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ProxyStateTemplate.ProtoReflect.Descriptor instead.
-func (*ProxyStateTemplate) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_proxy_state_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ProxyStateTemplate) GetProxyState() *ProxyState {
-	if x != nil {
-		return x.ProxyState
-	}
-	return nil
-}
-
-func (x *ProxyStateTemplate) GetRequiredEndpoints() map[string]*pbproxystate.EndpointRef {
-	if x != nil {
-		return x.RequiredEndpoints
-	}
-	return nil
-}
-
-func (x *ProxyStateTemplate) GetRequiredLeafCertificates() map[string]*pbproxystate.LeafCertificateRef {
-	if x != nil {
-		return x.RequiredLeafCertificates
-	}
-	return nil
-}
-
-func (x *ProxyStateTemplate) GetRequiredTrustBundles() map[string]*pbproxystate.TrustBundleRef {
-	if x != nil {
-		return x.RequiredTrustBundles
-	}
-	return nil
-}
-
-type ProxyState struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// identity is a reference to the identity of the workload this proxy is for.
-	Identity *pbresource.Reference `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"`
-	// listeners is a list of listeners for this proxy.
-	Listeners []*pbproxystate.Listener `protobuf:"bytes,2,rep,name=listeners,proto3" json:"listeners,omitempty"`
-	// clusters is a map from cluster name to clusters. The keys are referenced from listeners or routes.
-	Clusters map[string]*pbproxystate.Cluster `protobuf:"bytes,3,rep,name=clusters,proto3" json:"clusters,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// routes is a map from route name to routes. The keys are referenced from listeners.
-	Routes map[string]*pbproxystate.Route `protobuf:"bytes,4,rep,name=routes,proto3" json:"routes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// endpoints is a map from cluster name to endpoints.
-	Endpoints map[string]*pbproxystate.Endpoints `protobuf:"bytes,5,rep,name=endpoints,proto3" json:"endpoints,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// leaf certificates is a map from UUID to leaf certificates.
-	LeafCertificates map[string]*pbproxystate.LeafCertificate `protobuf:"bytes,6,rep,name=leaf_certificates,json=leafCertificates,proto3" json:"leaf_certificates,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// trust bundles is a map from peer name to trust bundles.
-	TrustBundles map[string]*pbproxystate.TrustBundle `protobuf:"bytes,7,rep,name=trust_bundles,json=trustBundles,proto3" json:"trust_bundles,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// tls has TLS configuration for this proxy.
-	Tls *pbproxystate.TLS `protobuf:"bytes,8,opt,name=tls,proto3" json:"tls,omitempty"`
-	// escape defines top level escape hatches. These are user configured json strings that configure an entire piece of listener or cluster Envoy configuration.
-	Escape *pbproxystate.EscapeHatches `protobuf:"bytes,9,opt,name=escape,proto3" json:"escape,omitempty"`
-	// access_logs configures access logging for this proxy.
-	AccessLogs *pbproxystate.AccessLogs `protobuf:"bytes,10,opt,name=access_logs,json=accessLogs,proto3" json:"access_logs,omitempty"`
-}
-
-func (x *ProxyState) Reset() {
-	*x = ProxyState{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_proxy_state_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ProxyState) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ProxyState) ProtoMessage() {}
-
-func (x *ProxyState) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_proxy_state_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ProxyState.ProtoReflect.Descriptor instead.
-func (*ProxyState) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_proxy_state_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *ProxyState) GetIdentity() *pbresource.Reference {
-	if x != nil {
-		return x.Identity
-	}
-	return nil
-}
-
-func (x *ProxyState) GetListeners() []*pbproxystate.Listener {
-	if x != nil {
-		return x.Listeners
-	}
-	return nil
-}
-
-func (x *ProxyState) GetClusters() map[string]*pbproxystate.Cluster {
-	if x != nil {
-		return x.Clusters
-	}
-	return nil
-}
-
-func (x *ProxyState) GetRoutes() map[string]*pbproxystate.Route {
-	if x != nil {
-		return x.Routes
-	}
-	return nil
-}
-
-func (x *ProxyState) GetEndpoints() map[string]*pbproxystate.Endpoints {
-	if x != nil {
-		return x.Endpoints
-	}
-	return nil
-}
-
-func (x *ProxyState) GetLeafCertificates() map[string]*pbproxystate.LeafCertificate {
-	if x != nil {
-		return x.LeafCertificates
-	}
-	return nil
-}
-
-func (x *ProxyState) GetTrustBundles() map[string]*pbproxystate.TrustBundle {
-	if x != nil {
-		return x.TrustBundles
-	}
-	return nil
-}
-
-func (x *ProxyState) GetTls() *pbproxystate.TLS {
-	if x != nil {
-		return x.Tls
-	}
-	return nil
-}
-
-func (x *ProxyState) GetEscape() *pbproxystate.EscapeHatches {
-	if x != nil {
-		return x.Escape
-	}
-	return nil
-}
-
-func (x *ProxyState) GetAccessLogs() *pbproxystate.AccessLogs {
-	if x != nil {
-		return x.AccessLogs
-	}
-	return nil
-}
-
-var File_pbmesh_v2beta1_proxy_state_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_proxy_state_proto_rawDesc = []byte{
-	0x0a, 0x20, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x1a, 0x2d, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x61,
-	0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x29, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x63, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2b, 0x70, 0x62, 0x6d,
-	0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
-	0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x30, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68,
-	0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x5f, 0x68, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2a, 0x70, 0x62, 0x6d, 0x65,
-	0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2c, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x27, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74,
-	0x65, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x32, 0x70,
-	0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x62,
-	0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73,
-	0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e,
-	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x19, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x72, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x88, 0x07, 0x0a, 0x12, 0x50,
-	0x72, 0x6f, 0x78, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74,
-	0x65, 0x12, 0x4a, 0x0a, 0x0b, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x53, 0x74, 0x61, 0x74,
-	0x65, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x77, 0x0a,
-	0x12, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x48, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x53,
-	0x74, 0x61, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x71,
-	0x75, 0x69, 0x72, 0x65, 0x64, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x52, 0x11, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x45, 0x6e, 0x64,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x8d, 0x01, 0x0a, 0x1a, 0x72, 0x65, 0x71, 0x75, 0x69,
-	0x72, 0x65, 0x64, 0x5f, 0x6c, 0x65, 0x61, 0x66, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
-	0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x78,
-	0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x52,
-	0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x65, 0x61, 0x66, 0x43, 0x65, 0x72, 0x74, 0x69,
-	0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x18, 0x72, 0x65,
-	0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x65, 0x61, 0x66, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x12, 0x81, 0x01, 0x0a, 0x16, 0x72, 0x65, 0x71, 0x75, 0x69,
-	0x72, 0x65, 0x64, 0x5f, 0x74, 0x72, 0x75, 0x73, 0x74, 0x5f, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65,
-	0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x4b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x53, 0x74, 0x61,
-	0x74, 0x65, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x69,
-	0x72, 0x65, 0x64, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x73, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x14, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x54, 0x72,
-	0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x73, 0x1a, 0x7d, 0x0a, 0x16, 0x52, 0x65,
-	0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x4d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x65, 0x66, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x8b, 0x01, 0x0a, 0x1d, 0x52, 0x65,
-	0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x4c, 0x65, 0x61, 0x66, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x54, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c, 0x65, 0x61, 0x66, 0x43, 0x65,
-	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x65, 0x66, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x83, 0x01, 0x0a, 0x19, 0x52, 0x65, 0x71, 0x75,
-	0x69, 0x72, 0x65, 0x64, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x50, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52,
-	0x65, 0x66, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x3a, 0x06, 0xa2,
-	0x93, 0x04, 0x02, 0x08, 0x03, 0x22, 0xaf, 0x0b, 0x0a, 0x0a, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x53,
-	0x74, 0x61, 0x74, 0x65, 0x12, 0x40, 0x0a, 0x08, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x69, 0x64,
-	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x52, 0x0a, 0x09, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e,
-	0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x52,
-	0x09, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x12, 0x53, 0x0a, 0x08, 0x63, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x72, 0x6f,
-	0x78, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12,
-	0x4d, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e,
-	0x50, 0x72, 0x6f, 0x78, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65,
-	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x56,
-	0x0a, 0x09, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x45, 0x6e, 0x64,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x65, 0x6e, 0x64,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x6c, 0x0a, 0x11, 0x6c, 0x65, 0x61, 0x66, 0x5f, 0x63,
-	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x3f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c, 0x65, 0x61,
-	0x66, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x10, 0x6c, 0x65, 0x61, 0x66, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
-	0x61, 0x74, 0x65, 0x73, 0x12, 0x60, 0x0a, 0x0d, 0x74, 0x72, 0x75, 0x73, 0x74, 0x5f, 0x62, 0x75,
-	0x6e, 0x64, 0x6c, 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d,
-	0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x78,
-	0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64,
-	0x6c, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x74, 0x72, 0x75, 0x73, 0x74, 0x42,
-	0x75, 0x6e, 0x64, 0x6c, 0x65, 0x73, 0x12, 0x41, 0x0a, 0x03, 0x74, 0x6c, 0x73, 0x18, 0x08, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x2e, 0x54, 0x4c, 0x53, 0x52, 0x03, 0x74, 0x6c, 0x73, 0x12, 0x51, 0x0a, 0x06, 0x65, 0x73, 0x63,
-	0x61, 0x70, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x45, 0x73, 0x63, 0x61, 0x70, 0x65, 0x48, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x73, 0x52, 0x06, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x12, 0x57, 0x0a, 0x0b,
-	0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x41,
-	0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73,
-	0x73, 0x4c, 0x6f, 0x67, 0x73, 0x1a, 0x70, 0x0a, 0x0d, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x49, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x6c, 0x0a, 0x0b, 0x52, 0x6f, 0x75, 0x74, 0x65,
-	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x47, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x73, 0x0a, 0x0e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e,
-	0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x4b, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x80, 0x01, 0x0a, 0x15, 0x4c,
-	0x65, 0x61, 0x66, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x51, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x4c, 0x65, 0x61, 0x66, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x78, 0x0a,
-	0x11, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x73, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x4d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x70, 0x62, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x2e, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x90, 0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x0f, 0x50,
-	0x72, 0x6f, 0x78, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73,
-	0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x6d, 0x65, 0x73, 0x68, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x1d, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d,
-	0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x1d, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d,
-	0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x29, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d,
-	0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73,
-	0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_proxy_state_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_proxy_state_proto_rawDescData = file_pbmesh_v2beta1_proxy_state_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_proxy_state_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_proxy_state_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_proxy_state_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_proxy_state_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_proxy_state_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_proxy_state_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
-var file_pbmesh_v2beta1_proxy_state_proto_goTypes = []interface{}{
-	(*ProxyStateTemplate)(nil),              // 0: hashicorp.consul.mesh.v2beta1.ProxyStateTemplate
-	(*ProxyState)(nil),                      // 1: hashicorp.consul.mesh.v2beta1.ProxyState
-	nil,                                     // 2: hashicorp.consul.mesh.v2beta1.ProxyStateTemplate.RequiredEndpointsEntry
-	nil,                                     // 3: hashicorp.consul.mesh.v2beta1.ProxyStateTemplate.RequiredLeafCertificatesEntry
-	nil,                                     // 4: hashicorp.consul.mesh.v2beta1.ProxyStateTemplate.RequiredTrustBundlesEntry
-	nil,                                     // 5: hashicorp.consul.mesh.v2beta1.ProxyState.ClustersEntry
-	nil,                                     // 6: hashicorp.consul.mesh.v2beta1.ProxyState.RoutesEntry
-	nil,                                     // 7: hashicorp.consul.mesh.v2beta1.ProxyState.EndpointsEntry
-	nil,                                     // 8: hashicorp.consul.mesh.v2beta1.ProxyState.LeafCertificatesEntry
-	nil,                                     // 9: hashicorp.consul.mesh.v2beta1.ProxyState.TrustBundlesEntry
-	(*pbresource.Reference)(nil),            // 10: hashicorp.consul.resource.Reference
-	(*pbproxystate.Listener)(nil),           // 11: hashicorp.consul.mesh.v2beta1.pbproxystate.Listener
-	(*pbproxystate.TLS)(nil),                // 12: hashicorp.consul.mesh.v2beta1.pbproxystate.TLS
-	(*pbproxystate.EscapeHatches)(nil),      // 13: hashicorp.consul.mesh.v2beta1.pbproxystate.EscapeHatches
-	(*pbproxystate.AccessLogs)(nil),         // 14: hashicorp.consul.mesh.v2beta1.pbproxystate.AccessLogs
-	(*pbproxystate.EndpointRef)(nil),        // 15: hashicorp.consul.mesh.v2beta1.pbproxystate.EndpointRef
-	(*pbproxystate.LeafCertificateRef)(nil), // 16: hashicorp.consul.mesh.v2beta1.pbproxystate.LeafCertificateRef
-	(*pbproxystate.TrustBundleRef)(nil),     // 17: hashicorp.consul.mesh.v2beta1.pbproxystate.TrustBundleRef
-	(*pbproxystate.Cluster)(nil),            // 18: hashicorp.consul.mesh.v2beta1.pbproxystate.Cluster
-	(*pbproxystate.Route)(nil),              // 19: hashicorp.consul.mesh.v2beta1.pbproxystate.Route
-	(*pbproxystate.Endpoints)(nil),          // 20: hashicorp.consul.mesh.v2beta1.pbproxystate.Endpoints
-	(*pbproxystate.LeafCertificate)(nil),    // 21: hashicorp.consul.mesh.v2beta1.pbproxystate.LeafCertificate
-	(*pbproxystate.TrustBundle)(nil),        // 22: hashicorp.consul.mesh.v2beta1.pbproxystate.TrustBundle
-}
-var file_pbmesh_v2beta1_proxy_state_proto_depIdxs = []int32{
-	1,  // 0: hashicorp.consul.mesh.v2beta1.ProxyStateTemplate.proxy_state:type_name -> hashicorp.consul.mesh.v2beta1.ProxyState
-	2,  // 1: hashicorp.consul.mesh.v2beta1.ProxyStateTemplate.required_endpoints:type_name -> hashicorp.consul.mesh.v2beta1.ProxyStateTemplate.RequiredEndpointsEntry
-	3,  // 2: hashicorp.consul.mesh.v2beta1.ProxyStateTemplate.required_leaf_certificates:type_name -> hashicorp.consul.mesh.v2beta1.ProxyStateTemplate.RequiredLeafCertificatesEntry
-	4,  // 3: hashicorp.consul.mesh.v2beta1.ProxyStateTemplate.required_trust_bundles:type_name -> hashicorp.consul.mesh.v2beta1.ProxyStateTemplate.RequiredTrustBundlesEntry
-	10, // 4: hashicorp.consul.mesh.v2beta1.ProxyState.identity:type_name -> hashicorp.consul.resource.Reference
-	11, // 5: hashicorp.consul.mesh.v2beta1.ProxyState.listeners:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Listener
-	5,  // 6: hashicorp.consul.mesh.v2beta1.ProxyState.clusters:type_name -> hashicorp.consul.mesh.v2beta1.ProxyState.ClustersEntry
-	6,  // 7: hashicorp.consul.mesh.v2beta1.ProxyState.routes:type_name -> hashicorp.consul.mesh.v2beta1.ProxyState.RoutesEntry
-	7,  // 8: hashicorp.consul.mesh.v2beta1.ProxyState.endpoints:type_name -> hashicorp.consul.mesh.v2beta1.ProxyState.EndpointsEntry
-	8,  // 9: hashicorp.consul.mesh.v2beta1.ProxyState.leaf_certificates:type_name -> hashicorp.consul.mesh.v2beta1.ProxyState.LeafCertificatesEntry
-	9,  // 10: hashicorp.consul.mesh.v2beta1.ProxyState.trust_bundles:type_name -> hashicorp.consul.mesh.v2beta1.ProxyState.TrustBundlesEntry
-	12, // 11: hashicorp.consul.mesh.v2beta1.ProxyState.tls:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TLS
-	13, // 12: hashicorp.consul.mesh.v2beta1.ProxyState.escape:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.EscapeHatches
-	14, // 13: hashicorp.consul.mesh.v2beta1.ProxyState.access_logs:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.AccessLogs
-	15, // 14: hashicorp.consul.mesh.v2beta1.ProxyStateTemplate.RequiredEndpointsEntry.value:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.EndpointRef
-	16, // 15: hashicorp.consul.mesh.v2beta1.ProxyStateTemplate.RequiredLeafCertificatesEntry.value:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.LeafCertificateRef
-	17, // 16: hashicorp.consul.mesh.v2beta1.ProxyStateTemplate.RequiredTrustBundlesEntry.value:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TrustBundleRef
-	18, // 17: hashicorp.consul.mesh.v2beta1.ProxyState.ClustersEntry.value:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Cluster
-	19, // 18: hashicorp.consul.mesh.v2beta1.ProxyState.RoutesEntry.value:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Route
-	20, // 19: hashicorp.consul.mesh.v2beta1.ProxyState.EndpointsEntry.value:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.Endpoints
-	21, // 20: hashicorp.consul.mesh.v2beta1.ProxyState.LeafCertificatesEntry.value:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.LeafCertificate
-	22, // 21: hashicorp.consul.mesh.v2beta1.ProxyState.TrustBundlesEntry.value:type_name -> hashicorp.consul.mesh.v2beta1.pbproxystate.TrustBundle
-	22, // [22:22] is the sub-list for method output_type
-	22, // [22:22] is the sub-list for method input_type
-	22, // [22:22] is the sub-list for extension type_name
-	22, // [22:22] is the sub-list for extension extendee
-	0,  // [0:22] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_proxy_state_proto_init() }
-func file_pbmesh_v2beta1_proxy_state_proto_init() {
-	if File_pbmesh_v2beta1_proxy_state_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_proxy_state_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ProxyStateTemplate); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_proxy_state_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ProxyState); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_proxy_state_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   10,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_proxy_state_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_proxy_state_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_proxy_state_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_proxy_state_proto = out.File
-	file_pbmesh_v2beta1_proxy_state_proto_rawDesc = nil
-	file_pbmesh_v2beta1_proxy_state_proto_goTypes = nil
-	file_pbmesh_v2beta1_proxy_state_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/proxy_state.proto b/proto-public/pbmesh/v2beta1/proxy_state.proto
deleted file mode 100644
index 38debef6f655c..0000000000000
--- a/proto-public/pbmesh/v2beta1/proxy_state.proto
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "pbmesh/v2beta1/pbproxystate/access_logs.proto";
-import "pbmesh/v2beta1/pbproxystate/cluster.proto";
-import "pbmesh/v2beta1/pbproxystate/endpoints.proto";
-import "pbmesh/v2beta1/pbproxystate/escape_hatches.proto";
-import "pbmesh/v2beta1/pbproxystate/listener.proto";
-import "pbmesh/v2beta1/pbproxystate/references.proto";
-import "pbmesh/v2beta1/pbproxystate/route.proto";
-import "pbmesh/v2beta1/pbproxystate/transport_socket.proto";
-import "pbresource/annotations.proto";
-import "pbresource/resource.proto";
-
-message ProxyStateTemplate {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  // proxy_state is the partially filled out ProxyState resource. The Endpoints, LeafCertificates and TrustBundles fields will need filling in after the resource is stored.
-  ProxyState proxy_state = 1;
-
-  // required_endpoints is a map of arbitrary string names to endpoint refs that need fetching by the proxy state controller.
-  map<string, pbproxystate.EndpointRef> required_endpoints = 2;
-
-  // required_leaf_certificates is a map of arbitrary string names to leaf certificates that need fetching/generation by the proxy state controller.
-  map<string, pbproxystate.LeafCertificateRef> required_leaf_certificates = 3;
-
-  // required_trust_bundles is a map of arbitrary string names to trust bundle refs that need fetching by the proxy state controller.
-  map<string, pbproxystate.TrustBundleRef> required_trust_bundles = 4;
-}
-
-message ProxyState {
-  // identity is a reference to the identity of the workload this proxy is for.
-  hashicorp.consul.resource.Reference identity = 1;
-  // listeners is a list of listeners for this proxy.
-  repeated pbproxystate.Listener listeners = 2;
-  // clusters is a map from cluster name to clusters. The keys are referenced from listeners or routes.
-  map<string, pbproxystate.Cluster> clusters = 3;
-  // routes is a map from route name to routes. The keys are referenced from listeners.
-  map<string, pbproxystate.Route> routes = 4;
-  // endpoints is a map from cluster name to endpoints.
-  map<string, pbproxystate.Endpoints> endpoints = 5;
-  // leaf certificates is a map from UUID to leaf certificates.
-  map<string, pbproxystate.LeafCertificate> leaf_certificates = 6;
-  // trust bundles is a map from peer name to trust bundles.
-  map<string, pbproxystate.TrustBundle> trust_bundles = 7;
-  // tls has TLS configuration for this proxy.
-  pbproxystate.TLS tls = 8;
-  // escape defines top level escape hatches. These are user configured json strings that configure an entire piece of listener or cluster Envoy configuration.
-  pbproxystate.EscapeHatches escape = 9;
-  // access_logs configures access logging for this proxy.
-  pbproxystate.AccessLogs access_logs = 10;
-}
diff --git a/proto-public/pbmesh/v2beta1/resource_types.gen.go b/proto-public/pbmesh/v2beta1/resource_types.gen.go
deleted file mode 100644
index a4b4e9048d1f7..0000000000000
--- a/proto-public/pbmesh/v2beta1/resource_types.gen.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Code generated by protoc-gen-resource-types. DO NOT EDIT.
-
-package meshv2beta1
-
-import (
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	GroupName = "mesh"
-	Version   = "v2beta1"
-
-	ComputedProxyConfigurationKind = "ComputedProxyConfiguration"
-	ComputedRoutesKind             = "ComputedRoutes"
-	DestinationPolicyKind          = "DestinationPolicy"
-	DestinationsKind               = "Destinations"
-	DestinationsConfigurationKind  = "DestinationsConfiguration"
-	GRPCRouteKind                  = "GRPCRoute"
-	HTTPRouteKind                  = "HTTPRoute"
-	ProxyConfigurationKind         = "ProxyConfiguration"
-	ProxyStateTemplateKind         = "ProxyStateTemplate"
-	TCPRouteKind                   = "TCPRoute"
-)
-
-var (
-	ComputedProxyConfigurationType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         ComputedProxyConfigurationKind,
-	}
-
-	ComputedRoutesType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         ComputedRoutesKind,
-	}
-
-	DestinationPolicyType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         DestinationPolicyKind,
-	}
-
-	DestinationsType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         DestinationsKind,
-	}
-
-	DestinationsConfigurationType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         DestinationsConfigurationKind,
-	}
-
-	GRPCRouteType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         GRPCRouteKind,
-	}
-
-	HTTPRouteType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         HTTPRouteKind,
-	}
-
-	ProxyConfigurationType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         ProxyConfigurationKind,
-	}
-
-	ProxyStateTemplateType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         ProxyStateTemplateKind,
-	}
-
-	TCPRouteType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         TCPRouteKind,
-	}
-)
diff --git a/proto-public/pbmesh/v2beta1/routing.pb.go b/proto-public/pbmesh/v2beta1/routing.pb.go
deleted file mode 100644
index 465c515783585..0000000000000
--- a/proto-public/pbmesh/v2beta1/routing.pb.go
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/routing.proto
-
-package meshv2beta1
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type MeshGatewayMode int32
-
-const (
-	// MESH_GATEWAY_MODE_UNSPECIFIED represents no specific mode and should be
-	// used to indicate that a the decision on the mode will be made by other
-	// configuration or default settings.
-	MeshGatewayMode_MESH_GATEWAY_MODE_UNSPECIFIED MeshGatewayMode = 0
-	// MESH_GATEWAY_MODE_NONE is the mode to use when traffic should not be
-	// routed through any gateway but instead be routed directly to the
-	// destination.
-	MeshGatewayMode_MESH_GATEWAY_MODE_NONE MeshGatewayMode = 1
-	// MESH_GATEWAY_MODE_LOCAL is the mode to use when traffic should be routed
-	// to the local gateway. The local gateway will then ensure that the
-	// connection is proxied correctly to its final destination. This mode will
-	// most often be needed for workloads that are prevented from making outbound
-	// requests outside of their local network/environment. In this case a
-	// gateway will sit at the edge of sit at the edge of the network and will
-	// proxy outbound connections potentially to other gateways in remote
-	// environments.
-	MeshGatewayMode_MESH_GATEWAY_MODE_LOCAL MeshGatewayMode = 2
-	// MESH_GATEWAY_MODE_REMOTE is the mode to use when traffic should be routed
-	// to a remote mesh gateway. This mode will most often be used when workloads
-	// can make outbound requests destined for a remote network/environment but
-	// where the remote network/environment will not allow direct addressing. The
-	// mesh gateway in the remote environment will sit at the edge and proxy
-	// requests into that environment.
-	MeshGatewayMode_MESH_GATEWAY_MODE_REMOTE MeshGatewayMode = 3
-)
-
-// Enum value maps for MeshGatewayMode.
-var (
-	MeshGatewayMode_name = map[int32]string{
-		0: "MESH_GATEWAY_MODE_UNSPECIFIED",
-		1: "MESH_GATEWAY_MODE_NONE",
-		2: "MESH_GATEWAY_MODE_LOCAL",
-		3: "MESH_GATEWAY_MODE_REMOTE",
-	}
-	MeshGatewayMode_value = map[string]int32{
-		"MESH_GATEWAY_MODE_UNSPECIFIED": 0,
-		"MESH_GATEWAY_MODE_NONE":        1,
-		"MESH_GATEWAY_MODE_LOCAL":       2,
-		"MESH_GATEWAY_MODE_REMOTE":      3,
-	}
-)
-
-func (x MeshGatewayMode) Enum() *MeshGatewayMode {
-	p := new(MeshGatewayMode)
-	*p = x
-	return p
-}
-
-func (x MeshGatewayMode) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (MeshGatewayMode) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbmesh_v2beta1_routing_proto_enumTypes[0].Descriptor()
-}
-
-func (MeshGatewayMode) Type() protoreflect.EnumType {
-	return &file_pbmesh_v2beta1_routing_proto_enumTypes[0]
-}
-
-func (x MeshGatewayMode) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use MeshGatewayMode.Descriptor instead.
-func (MeshGatewayMode) EnumDescriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_routing_proto_rawDescGZIP(), []int{0}
-}
-
-var File_pbmesh_v2beta1_routing_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_routing_proto_rawDesc = []byte{
-	0x0a, 0x1c, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1d,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2a, 0x8b, 0x01,
-	0x0a, 0x0f, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4d, 0x6f, 0x64,
-	0x65, 0x12, 0x21, 0x0a, 0x1d, 0x4d, 0x45, 0x53, 0x48, 0x5f, 0x47, 0x41, 0x54, 0x45, 0x57, 0x41,
-	0x59, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
-	0x45, 0x44, 0x10, 0x00, 0x12, 0x1a, 0x0a, 0x16, 0x4d, 0x45, 0x53, 0x48, 0x5f, 0x47, 0x41, 0x54,
-	0x45, 0x57, 0x41, 0x59, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x01,
-	0x12, 0x1b, 0x0a, 0x17, 0x4d, 0x45, 0x53, 0x48, 0x5f, 0x47, 0x41, 0x54, 0x45, 0x57, 0x41, 0x59,
-	0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x4c, 0x4f, 0x43, 0x41, 0x4c, 0x10, 0x02, 0x12, 0x1c, 0x0a,
-	0x18, 0x4d, 0x45, 0x53, 0x48, 0x5f, 0x47, 0x41, 0x54, 0x45, 0x57, 0x41, 0x59, 0x5f, 0x4d, 0x4f,
-	0x44, 0x45, 0x5f, 0x52, 0x45, 0x4d, 0x4f, 0x54, 0x45, 0x10, 0x03, 0x42, 0x8d, 0x02, 0x0a, 0x21,
-	0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x42, 0x0c, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x65,
-	0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x6d, 0x65, 0x73, 0x68, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x1d, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x1d, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c,
-	0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x29, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c,
-	0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42,
-	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x65,
-	0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_routing_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_routing_proto_rawDescData = file_pbmesh_v2beta1_routing_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_routing_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_routing_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_routing_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_routing_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_routing_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_routing_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbmesh_v2beta1_routing_proto_goTypes = []interface{}{
-	(MeshGatewayMode)(0), // 0: hashicorp.consul.mesh.v2beta1.MeshGatewayMode
-}
-var file_pbmesh_v2beta1_routing_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_routing_proto_init() }
-func file_pbmesh_v2beta1_routing_proto_init() {
-	if File_pbmesh_v2beta1_routing_proto != nil {
-		return
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_routing_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   0,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_routing_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_routing_proto_depIdxs,
-		EnumInfos:         file_pbmesh_v2beta1_routing_proto_enumTypes,
-	}.Build()
-	File_pbmesh_v2beta1_routing_proto = out.File
-	file_pbmesh_v2beta1_routing_proto_rawDesc = nil
-	file_pbmesh_v2beta1_routing_proto_goTypes = nil
-	file_pbmesh_v2beta1_routing_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/routing.proto b/proto-public/pbmesh/v2beta1/routing.proto
deleted file mode 100644
index 356a9a64c8558..0000000000000
--- a/proto-public/pbmesh/v2beta1/routing.proto
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-enum MeshGatewayMode {
-  // MESH_GATEWAY_MODE_UNSPECIFIED represents no specific mode and should be
-  // used to indicate that a the decision on the mode will be made by other
-  // configuration or default settings.
-  MESH_GATEWAY_MODE_UNSPECIFIED = 0;
-
-  // MESH_GATEWAY_MODE_NONE is the mode to use when traffic should not be
-  // routed through any gateway but instead be routed directly to the
-  // destination.
-  MESH_GATEWAY_MODE_NONE = 1;
-
-  // MESH_GATEWAY_MODE_LOCAL is the mode to use when traffic should be routed
-  // to the local gateway. The local gateway will then ensure that the
-  // connection is proxied correctly to its final destination. This mode will
-  // most often be needed for workloads that are prevented from making outbound
-  // requests outside of their local network/environment. In this case a
-  // gateway will sit at the edge of sit at the edge of the network and will
-  // proxy outbound connections potentially to other gateways in remote
-  // environments.
-  MESH_GATEWAY_MODE_LOCAL = 2;
-
-  // MESH_GATEWAY_MODE_REMOTE is the mode to use when traffic should be routed
-  // to a remote mesh gateway. This mode will most often be used when workloads
-  // can make outbound requests destined for a remote network/environment but
-  // where the remote network/environment will not allow direct addressing. The
-  // mesh gateway in the remote environment will sit at the edge and proxy
-  // requests into that environment.
-  MESH_GATEWAY_MODE_REMOTE = 3;
-}
diff --git a/proto-public/pbmesh/v2beta1/tcp_route.pb.binary.go b/proto-public/pbmesh/v2beta1/tcp_route.pb.binary.go
deleted file mode 100644
index 4c10deae5375e..0000000000000
--- a/proto-public/pbmesh/v2beta1/tcp_route.pb.binary.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/tcp_route.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TCPRoute) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TCPRoute) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TCPRouteRule) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TCPRouteRule) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TCPBackendRef) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TCPBackendRef) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/tcp_route.pb.go b/proto-public/pbmesh/v2beta1/tcp_route.pb.go
deleted file mode 100644
index 5a2c401846af5..0000000000000
--- a/proto-public/pbmesh/v2beta1/tcp_route.pb.go
+++ /dev/null
@@ -1,362 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/tcp_route.proto
-
-package meshv2beta1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// NOTE: this should align to the GAMMA/gateway-api version, or at least be
-// easily translatable.
-//
-// https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1alpha2.TCPRoute
-//
-// This is a Resource type.
-type TCPRoute struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ParentRefs references the resources (usually Services) that a Route wants
-	// to be attached to.
-	//
-	// It is invalid to reference an identical parent more than once. It is valid
-	// to reference multiple distinct sections within the same parent resource.
-	ParentRefs []*ParentReference `protobuf:"bytes,1,rep,name=parent_refs,json=parentRefs,proto3" json:"parent_refs,omitempty"`
-	// Rules are a list of TCP matchers and actions.
-	Rules []*TCPRouteRule `protobuf:"bytes,2,rep,name=rules,proto3" json:"rules,omitempty"`
-}
-
-func (x *TCPRoute) Reset() {
-	*x = TCPRoute{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_tcp_route_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TCPRoute) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TCPRoute) ProtoMessage() {}
-
-func (x *TCPRoute) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_tcp_route_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TCPRoute.ProtoReflect.Descriptor instead.
-func (*TCPRoute) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_tcp_route_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *TCPRoute) GetParentRefs() []*ParentReference {
-	if x != nil {
-		return x.ParentRefs
-	}
-	return nil
-}
-
-func (x *TCPRoute) GetRules() []*TCPRouteRule {
-	if x != nil {
-		return x.Rules
-	}
-	return nil
-}
-
-type TCPRouteRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// BackendRefs defines the backend(s) where matching requests should be sent.
-	// If unspecified or invalid (refers to a non-existent resource or a Service
-	// with no endpoints), the underlying implementation MUST actively reject
-	// connection attempts to this backend. Connection rejections must respect
-	// weight; if an invalid backend is requested to have 80% of connections,
-	// then 80% of connections must be rejected instead.
-	BackendRefs []*TCPBackendRef `protobuf:"bytes,1,rep,name=backend_refs,json=backendRefs,proto3" json:"backend_refs,omitempty"`
-}
-
-func (x *TCPRouteRule) Reset() {
-	*x = TCPRouteRule{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_tcp_route_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TCPRouteRule) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TCPRouteRule) ProtoMessage() {}
-
-func (x *TCPRouteRule) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_tcp_route_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TCPRouteRule.ProtoReflect.Descriptor instead.
-func (*TCPRouteRule) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_tcp_route_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *TCPRouteRule) GetBackendRefs() []*TCPBackendRef {
-	if x != nil {
-		return x.BackendRefs
-	}
-	return nil
-}
-
-type TCPBackendRef struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	BackendRef *BackendReference `protobuf:"bytes,1,opt,name=backend_ref,json=backendRef,proto3" json:"backend_ref,omitempty"`
-	// Weight specifies the proportion of requests forwarded to the referenced
-	// backend. This is computed as weight/(sum of all weights in this
-	// BackendRefs list). For non-zero values, there may be some epsilon from the
-	// exact proportion defined here depending on the precision an implementation
-	// supports. Weight is not a percentage and the sum of weights does not need
-	// to equal 100.
-	//
-	// If only one backend is specified and it has a weight greater than 0, 100%
-	// of the traffic is forwarded to that backend. If weight is set to 0, no
-	// traffic should be forwarded for this entry. If unspecified, weight defaults
-	// to 1.
-	Weight uint32 `protobuf:"varint,2,opt,name=weight,proto3" json:"weight,omitempty"`
-}
-
-func (x *TCPBackendRef) Reset() {
-	*x = TCPBackendRef{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_tcp_route_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TCPBackendRef) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TCPBackendRef) ProtoMessage() {}
-
-func (x *TCPBackendRef) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_tcp_route_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TCPBackendRef.ProtoReflect.Descriptor instead.
-func (*TCPBackendRef) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_tcp_route_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *TCPBackendRef) GetBackendRef() *BackendReference {
-	if x != nil {
-		return x.BackendRef
-	}
-	return nil
-}
-
-func (x *TCPBackendRef) GetWeight() uint32 {
-	if x != nil {
-		return x.Weight
-	}
-	return 0
-}
-
-var File_pbmesh_v2beta1_tcp_route_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_tcp_route_proto_rawDesc = []byte{
-	0x0a, 0x1e, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x74, 0x63, 0x70, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a,
-	0x1b, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x70, 0x62,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa6, 0x01, 0x0a, 0x08, 0x54,
-	0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x4f, 0x0a, 0x0b, 0x70, 0x61, 0x72, 0x65, 0x6e,
-	0x74, 0x5f, 0x72, 0x65, 0x66, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x61, 0x72,
-	0x65, 0x6e, 0x74, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x0a, 0x70, 0x61,
-	0x72, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x66, 0x73, 0x12, 0x41, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65,
-	0x52, 0x75, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x3a, 0x06, 0xa2, 0x93, 0x04,
-	0x02, 0x08, 0x03, 0x22, 0x5f, 0x0a, 0x0c, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52,
-	0x75, 0x6c, 0x65, 0x12, 0x4f, 0x0a, 0x0c, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x5f, 0x72,
-	0x65, 0x66, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73,
-	0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x54, 0x43, 0x50, 0x42, 0x61, 0x63,
-	0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x52, 0x0b, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64,
-	0x52, 0x65, 0x66, 0x73, 0x22, 0x79, 0x0a, 0x0d, 0x54, 0x43, 0x50, 0x42, 0x61, 0x63, 0x6b, 0x65,
-	0x6e, 0x64, 0x52, 0x65, 0x66, 0x12, 0x50, 0x0a, 0x0b, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64,
-	0x5f, 0x72, 0x65, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65,
-	0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x42, 0x61, 0x63, 0x6b, 0x65,
-	0x6e, 0x64, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x0a, 0x62, 0x61, 0x63,
-	0x6b, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68,
-	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x42,
-	0x8e, 0x02, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32,
-	0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x0d, 0x54, 0x63, 0x70, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
-	0x2f, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b,
-	0x6d, 0x65, 0x73, 0x68, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43,
-	0x4d, 0xaa, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0xca, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0xe2, 0x02, 0x29, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x65, 0x73, 0x68, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x68, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmesh_v2beta1_tcp_route_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_tcp_route_proto_rawDescData = file_pbmesh_v2beta1_tcp_route_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_tcp_route_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_tcp_route_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_tcp_route_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_tcp_route_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_tcp_route_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_tcp_route_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_pbmesh_v2beta1_tcp_route_proto_goTypes = []interface{}{
-	(*TCPRoute)(nil),         // 0: hashicorp.consul.mesh.v2beta1.TCPRoute
-	(*TCPRouteRule)(nil),     // 1: hashicorp.consul.mesh.v2beta1.TCPRouteRule
-	(*TCPBackendRef)(nil),    // 2: hashicorp.consul.mesh.v2beta1.TCPBackendRef
-	(*ParentReference)(nil),  // 3: hashicorp.consul.mesh.v2beta1.ParentReference
-	(*BackendReference)(nil), // 4: hashicorp.consul.mesh.v2beta1.BackendReference
-}
-var file_pbmesh_v2beta1_tcp_route_proto_depIdxs = []int32{
-	3, // 0: hashicorp.consul.mesh.v2beta1.TCPRoute.parent_refs:type_name -> hashicorp.consul.mesh.v2beta1.ParentReference
-	1, // 1: hashicorp.consul.mesh.v2beta1.TCPRoute.rules:type_name -> hashicorp.consul.mesh.v2beta1.TCPRouteRule
-	2, // 2: hashicorp.consul.mesh.v2beta1.TCPRouteRule.backend_refs:type_name -> hashicorp.consul.mesh.v2beta1.TCPBackendRef
-	4, // 3: hashicorp.consul.mesh.v2beta1.TCPBackendRef.backend_ref:type_name -> hashicorp.consul.mesh.v2beta1.BackendReference
-	4, // [4:4] is the sub-list for method output_type
-	4, // [4:4] is the sub-list for method input_type
-	4, // [4:4] is the sub-list for extension type_name
-	4, // [4:4] is the sub-list for extension extendee
-	0, // [0:4] is the sub-list for field type_name
-}
-
-func init() { file_pbmesh_v2beta1_tcp_route_proto_init() }
-func file_pbmesh_v2beta1_tcp_route_proto_init() {
-	if File_pbmesh_v2beta1_tcp_route_proto != nil {
-		return
-	}
-	file_pbmesh_v2beta1_common_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_tcp_route_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TCPRoute); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_tcp_route_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TCPRouteRule); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_tcp_route_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TCPBackendRef); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_tcp_route_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   3,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_tcp_route_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_tcp_route_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_tcp_route_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_tcp_route_proto = out.File
-	file_pbmesh_v2beta1_tcp_route_proto_rawDesc = nil
-	file_pbmesh_v2beta1_tcp_route_proto_goTypes = nil
-	file_pbmesh_v2beta1_tcp_route_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/tcp_route.proto b/proto-public/pbmesh/v2beta1/tcp_route.proto
deleted file mode 100644
index 1183a95db2c37..0000000000000
--- a/proto-public/pbmesh/v2beta1/tcp_route.proto
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "pbmesh/v2beta1/common.proto";
-import "pbresource/annotations.proto";
-
-// NOTE: this should align to the GAMMA/gateway-api version, or at least be
-// easily translatable.
-//
-// https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/v1alpha2.TCPRoute
-//
-// This is a Resource type.
-message TCPRoute {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  // ParentRefs references the resources (usually Services) that a Route wants
-  // to be attached to.
-  //
-  // It is invalid to reference an identical parent more than once. It is valid
-  // to reference multiple distinct sections within the same parent resource.
-  repeated ParentReference parent_refs = 1;
-
-  // Rules are a list of TCP matchers and actions.
-  repeated TCPRouteRule rules = 2;
-}
-
-message TCPRouteRule {
-  // BackendRefs defines the backend(s) where matching requests should be sent.
-  // If unspecified or invalid (refers to a non-existent resource or a Service
-  // with no endpoints), the underlying implementation MUST actively reject
-  // connection attempts to this backend. Connection rejections must respect
-  // weight; if an invalid backend is requested to have 80% of connections,
-  // then 80% of connections must be rejected instead.
-  repeated TCPBackendRef backend_refs = 1;
-}
-
-message TCPBackendRef {
-  BackendReference backend_ref = 1;
-
-  // Weight specifies the proportion of requests forwarded to the referenced
-  // backend. This is computed as weight/(sum of all weights in this
-  // BackendRefs list). For non-zero values, there may be some epsilon from the
-  // exact proportion defined here depending on the precision an implementation
-  // supports. Weight is not a percentage and the sum of weights does not need
-  // to equal 100.
-  //
-  //If only one backend is specified and it has a weight greater than 0, 100%
-  //of the traffic is forwarded to that backend. If weight is set to 0, no
-  //traffic should be forwarded for this entry. If unspecified, weight defaults
-  //to 1.
-  uint32 weight = 2;
-}
diff --git a/proto-public/pbmesh/v2beta1/xroute_addons.go b/proto-public/pbmesh/v2beta1/xroute_addons.go
deleted file mode 100644
index c060aea6dd33d..0000000000000
--- a/proto-public/pbmesh/v2beta1/xroute_addons.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package meshv2beta1
-
-// GetUnderlyingBackendRefs will collect BackendReferences from all rules and
-// bundle them up in one slice, unwrapping the HTTP-specifics in the process.
-//
-// This implements an XRouteWithRefs interface in the internal/mesh package.
-//
-// NOTE: no deduplication occurs.
-func (x *HTTPRoute) GetUnderlyingBackendRefs() []*BackendReference {
-	if x == nil {
-		return nil
-	}
-
-	estimate := 0
-	for _, rule := range x.Rules {
-		estimate += len(rule.BackendRefs)
-	}
-
-	backendRefs := make([]*BackendReference, 0, estimate)
-	for _, rule := range x.Rules {
-		for _, backendRef := range rule.BackendRefs {
-			backendRefs = append(backendRefs, backendRef.BackendRef)
-		}
-	}
-	return backendRefs
-}
-
-// GetUnderlyingBackendRefs will collect BackendReferences from all rules and
-// bundle them up in one slice, unwrapping the GRPC-specifics in the process.
-//
-// This implements an XRouteWithRefs interface in the internal/mesh package.
-//
-// NOTE: no deduplication occurs.
-func (x *GRPCRoute) GetUnderlyingBackendRefs() []*BackendReference {
-	if x == nil {
-		return nil
-	}
-
-	estimate := 0
-	for _, rule := range x.Rules {
-		estimate += len(rule.BackendRefs)
-	}
-
-	backendRefs := make([]*BackendReference, 0, estimate)
-	for _, rule := range x.Rules {
-		for _, backendRef := range rule.BackendRefs {
-			backendRefs = append(backendRefs, backendRef.BackendRef)
-		}
-	}
-	return backendRefs
-}
-
-// GetUnderlyingBackendRefs will collect BackendReferences from all rules and
-// bundle them up in one slice, unwrapping the TCP-specifics in the process.
-//
-// This implements an XRouteWithRefs interface in the internal/mesh package.
-//
-// NOTE: no deduplication occurs.
-func (x *TCPRoute) GetUnderlyingBackendRefs() []*BackendReference {
-	if x == nil {
-		return nil
-	}
-
-	estimate := 0
-	for _, rule := range x.Rules {
-		estimate += len(rule.BackendRefs)
-	}
-
-	backendRefs := make([]*BackendReference, 0, estimate)
-
-	for _, rule := range x.Rules {
-		for _, backendRef := range rule.BackendRefs {
-			backendRefs = append(backendRefs, backendRef.BackendRef)
-		}
-	}
-	return backendRefs
-}
-
-// IsHashBased returns true if the policy is a hash-based policy such as maglev
-// or ring hash.
-func (p LoadBalancerPolicy) IsHashBased() bool {
-	switch p {
-	case LoadBalancerPolicy_LOAD_BALANCER_POLICY_MAGLEV,
-		LoadBalancerPolicy_LOAD_BALANCER_POLICY_RING_HASH:
-		return true
-	}
-	return false
-}
diff --git a/proto-public/pbmesh/v2beta1/xroute_addons_test.go b/proto-public/pbmesh/v2beta1/xroute_addons_test.go
deleted file mode 100644
index fac04a6014222..0000000000000
--- a/proto-public/pbmesh/v2beta1/xroute_addons_test.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package meshv2beta1
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type routeWithAddons interface {
-	proto.Message
-	GetUnderlyingBackendRefs() []*BackendReference
-}
-
-func TestXRoute_GetUnderlyingBackendRefs(t *testing.T) {
-	type testcase struct {
-		route  routeWithAddons
-		expect []*BackendReference
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		got := tc.route.GetUnderlyingBackendRefs()
-		require.ElementsMatch(t, stringifyList(tc.expect), stringifyList(got))
-	}
-
-	cases := map[string]testcase{
-		"http: nil": {
-			route: (*HTTPRoute)(nil),
-		},
-		"grpc: nil": {
-			route: (*GRPCRoute)(nil),
-		},
-		"tcp: nil": {
-			route: (*TCPRoute)(nil),
-		},
-		"http: kitchen sink": {
-			route: &HTTPRoute{
-				Rules: []*HTTPRouteRule{
-					{BackendRefs: []*HTTPBackendRef{
-						{BackendRef: newBackendRef("aa")},
-					}},
-					{BackendRefs: []*HTTPBackendRef{
-						{BackendRef: newBackendRef("bb")},
-					}},
-					{BackendRefs: []*HTTPBackendRef{
-						{BackendRef: newBackendRef("cc")},
-						{BackendRef: newBackendRef("dd")},
-					}},
-					{BackendRefs: []*HTTPBackendRef{
-						{BackendRef: newBackendRef("ee")},
-						{BackendRef: newBackendRef("ff")},
-					}},
-				},
-			},
-			expect: []*BackendReference{
-				newBackendRef("aa"),
-				newBackendRef("bb"),
-				newBackendRef("cc"),
-				newBackendRef("dd"),
-				newBackendRef("ee"),
-				newBackendRef("ff"),
-			},
-		},
-		"grpc: kitchen sink": {
-			route: &GRPCRoute{
-				Rules: []*GRPCRouteRule{
-					{BackendRefs: []*GRPCBackendRef{
-						{BackendRef: newBackendRef("aa")},
-					}},
-					{BackendRefs: []*GRPCBackendRef{
-						{BackendRef: newBackendRef("bb")},
-					}},
-					{BackendRefs: []*GRPCBackendRef{
-						{BackendRef: newBackendRef("cc")},
-						{BackendRef: newBackendRef("dd")},
-					}},
-					{BackendRefs: []*GRPCBackendRef{
-						{BackendRef: newBackendRef("ee")},
-						{BackendRef: newBackendRef("ff")},
-					}},
-				},
-			},
-			expect: []*BackendReference{
-				newBackendRef("aa"),
-				newBackendRef("bb"),
-				newBackendRef("cc"),
-				newBackendRef("dd"),
-				newBackendRef("ee"),
-				newBackendRef("ff"),
-			},
-		},
-		"tcp: kitchen sink": {
-			route: &TCPRoute{
-				Rules: []*TCPRouteRule{
-					{BackendRefs: []*TCPBackendRef{
-						{BackendRef: newBackendRef("aa")},
-					}},
-					{BackendRefs: []*TCPBackendRef{
-						{BackendRef: newBackendRef("bb")},
-					}},
-					{BackendRefs: []*TCPBackendRef{
-						{BackendRef: newBackendRef("cc")},
-						{BackendRef: newBackendRef("dd")},
-					}},
-					{BackendRefs: []*TCPBackendRef{
-						{BackendRef: newBackendRef("ee")},
-						{BackendRef: newBackendRef("ff")},
-					}},
-				},
-			},
-			expect: []*BackendReference{
-				newBackendRef("aa"),
-				newBackendRef("bb"),
-				newBackendRef("cc"),
-				newBackendRef("dd"),
-				newBackendRef("ee"),
-				newBackendRef("ff"),
-			},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
-
-func protoToString[V proto.Message](pb V) string {
-	m := protojson.MarshalOptions{
-		Indent: "  ",
-	}
-	gotJSON, err := m.Marshal(pb)
-	if err != nil {
-		return "<ERR: " + err.Error() + ">"
-	}
-	return string(gotJSON)
-}
-
-func newRouteRef(name string) *pbresource.Reference {
-	return &pbresource.Reference{
-		Type: &pbresource.Type{
-			Group:        "fake",
-			GroupVersion: "v1alpha1",
-			Kind:         "fake",
-		},
-		Tenancy: &pbresource.Tenancy{
-			Partition: "default",
-			Namespace: "default",
-			PeerName:  "local",
-		},
-		Name: name,
-	}
-}
-
-func newBackendRef(name string) *BackendReference {
-	return &BackendReference{
-		Ref: newRouteRef(name),
-	}
-}
-
-func stringifyList[V proto.Message](list []V) []string {
-	out := make([]string, 0, len(list))
-	for _, item := range list {
-		out = append(out, protoToString(item))
-	}
-	return out
-}
diff --git a/proto-public/pbresource/annotations.pb.binary.go b/proto-public/pbresource/annotations.pb.binary.go
deleted file mode 100644
index 5a2e76e3ad28f..0000000000000
--- a/proto-public/pbresource/annotations.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbresource/annotations.proto
-
-package pbresource
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ResourceTypeSpec) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ResourceTypeSpec) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbresource/annotations.pb.go b/proto-public/pbresource/annotations.pb.go
deleted file mode 100644
index fa01056cf3d92..0000000000000
--- a/proto-public/pbresource/annotations.pb.go
+++ /dev/null
@@ -1,266 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbresource/annotations.proto
-
-package pbresource
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	descriptorpb "google.golang.org/protobuf/types/descriptorpb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Scope int32
-
-const (
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	Scope_SCOPE_UNDEFINED Scope = 0
-	Scope_SCOPE_CLUSTER   Scope = 1
-	Scope_SCOPE_PARTITION Scope = 2
-	Scope_SCOPE_NAMESPACE Scope = 3
-)
-
-// Enum value maps for Scope.
-var (
-	Scope_name = map[int32]string{
-		0: "SCOPE_UNDEFINED",
-		1: "SCOPE_CLUSTER",
-		2: "SCOPE_PARTITION",
-		3: "SCOPE_NAMESPACE",
-	}
-	Scope_value = map[string]int32{
-		"SCOPE_UNDEFINED": 0,
-		"SCOPE_CLUSTER":   1,
-		"SCOPE_PARTITION": 2,
-		"SCOPE_NAMESPACE": 3,
-	}
-)
-
-func (x Scope) Enum() *Scope {
-	p := new(Scope)
-	*p = x
-	return p
-}
-
-func (x Scope) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Scope) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbresource_annotations_proto_enumTypes[0].Descriptor()
-}
-
-func (Scope) Type() protoreflect.EnumType {
-	return &file_pbresource_annotations_proto_enumTypes[0]
-}
-
-func (x Scope) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Scope.Descriptor instead.
-func (Scope) EnumDescriptor() ([]byte, []int) {
-	return file_pbresource_annotations_proto_rawDescGZIP(), []int{0}
-}
-
-type ResourceTypeSpec struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Scope       Scope `protobuf:"varint,1,opt,name=scope,proto3,enum=hashicorp.consul.resource.Scope" json:"scope,omitempty"`
-	DontMapHttp bool  `protobuf:"varint,2,opt,name=dont_map_http,json=dontMapHttp,proto3" json:"dont_map_http,omitempty"`
-}
-
-func (x *ResourceTypeSpec) Reset() {
-	*x = ResourceTypeSpec{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_annotations_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ResourceTypeSpec) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ResourceTypeSpec) ProtoMessage() {}
-
-func (x *ResourceTypeSpec) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_annotations_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ResourceTypeSpec.ProtoReflect.Descriptor instead.
-func (*ResourceTypeSpec) Descriptor() ([]byte, []int) {
-	return file_pbresource_annotations_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ResourceTypeSpec) GetScope() Scope {
-	if x != nil {
-		return x.Scope
-	}
-	return Scope_SCOPE_UNDEFINED
-}
-
-func (x *ResourceTypeSpec) GetDontMapHttp() bool {
-	if x != nil {
-		return x.DontMapHttp
-	}
-	return false
-}
-
-var file_pbresource_annotations_proto_extTypes = []protoimpl.ExtensionInfo{
-	{
-		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
-		ExtensionType: (*ResourceTypeSpec)(nil),
-		Field:         8500,
-		Name:          "hashicorp.consul.resource.spec",
-		Tag:           "bytes,8500,opt,name=spec",
-		Filename:      "pbresource/annotations.proto",
-	},
-}
-
-// Extension fields to descriptorpb.MessageOptions.
-var (
-	// optional hashicorp.consul.resource.ResourceTypeSpec spec = 8500;
-	E_Spec = &file_pbresource_annotations_proto_extTypes[0]
-)
-
-var File_pbresource_annotations_proto protoreflect.FileDescriptor
-
-var file_pbresource_annotations_proto_rawDesc = []byte{
-	0x0a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e,
-	0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x19,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x6e, 0x0a, 0x10, 0x52,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x53, 0x70, 0x65, 0x63, 0x12,
-	0x36, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x20,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x63, 0x6f, 0x70, 0x65,
-	0x52, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0d, 0x64, 0x6f, 0x6e, 0x74, 0x5f,
-	0x6d, 0x61, 0x70, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b,
-	0x64, 0x6f, 0x6e, 0x74, 0x4d, 0x61, 0x70, 0x48, 0x74, 0x74, 0x70, 0x2a, 0x59, 0x0a, 0x05, 0x53,
-	0x63, 0x6f, 0x70, 0x65, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x43, 0x4f, 0x50, 0x45, 0x5f, 0x55, 0x4e,
-	0x44, 0x45, 0x46, 0x49, 0x4e, 0x45, 0x44, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x43, 0x4f,
-	0x50, 0x45, 0x5f, 0x43, 0x4c, 0x55, 0x53, 0x54, 0x45, 0x52, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f,
-	0x53, 0x43, 0x4f, 0x50, 0x45, 0x5f, 0x50, 0x41, 0x52, 0x54, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x10,
-	0x02, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x43, 0x4f, 0x50, 0x45, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x53,
-	0x50, 0x41, 0x43, 0x45, 0x10, 0x03, 0x3a, 0x61, 0x0a, 0x04, 0x73, 0x70, 0x65, 0x63, 0x12, 0x1f,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0xb4, 0x42, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x53,
-	0x70, 0x65, 0x63, 0x52, 0x04, 0x73, 0x70, 0x65, 0x63, 0x42, 0xec, 0x01, 0x0a, 0x1d, 0x63, 0x6f,
-	0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x10, 0x41, 0x6e, 0x6e,
-	0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x52, 0xaa, 0x02, 0x19, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x52, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0xca, 0x02, 0x19, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0xe2, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5c, 0x47,
-	0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1b, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a,
-	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbresource_annotations_proto_rawDescOnce sync.Once
-	file_pbresource_annotations_proto_rawDescData = file_pbresource_annotations_proto_rawDesc
-)
-
-func file_pbresource_annotations_proto_rawDescGZIP() []byte {
-	file_pbresource_annotations_proto_rawDescOnce.Do(func() {
-		file_pbresource_annotations_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbresource_annotations_proto_rawDescData)
-	})
-	return file_pbresource_annotations_proto_rawDescData
-}
-
-var file_pbresource_annotations_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbresource_annotations_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbresource_annotations_proto_goTypes = []interface{}{
-	(Scope)(0),                          // 0: hashicorp.consul.resource.Scope
-	(*ResourceTypeSpec)(nil),            // 1: hashicorp.consul.resource.ResourceTypeSpec
-	(*descriptorpb.MessageOptions)(nil), // 2: google.protobuf.MessageOptions
-}
-var file_pbresource_annotations_proto_depIdxs = []int32{
-	0, // 0: hashicorp.consul.resource.ResourceTypeSpec.scope:type_name -> hashicorp.consul.resource.Scope
-	2, // 1: hashicorp.consul.resource.spec:extendee -> google.protobuf.MessageOptions
-	1, // 2: hashicorp.consul.resource.spec:type_name -> hashicorp.consul.resource.ResourceTypeSpec
-	3, // [3:3] is the sub-list for method output_type
-	3, // [3:3] is the sub-list for method input_type
-	2, // [2:3] is the sub-list for extension type_name
-	1, // [1:2] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
-}
-
-func init() { file_pbresource_annotations_proto_init() }
-func file_pbresource_annotations_proto_init() {
-	if File_pbresource_annotations_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbresource_annotations_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ResourceTypeSpec); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbresource_annotations_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   1,
-			NumExtensions: 1,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbresource_annotations_proto_goTypes,
-		DependencyIndexes: file_pbresource_annotations_proto_depIdxs,
-		EnumInfos:         file_pbresource_annotations_proto_enumTypes,
-		MessageInfos:      file_pbresource_annotations_proto_msgTypes,
-		ExtensionInfos:    file_pbresource_annotations_proto_extTypes,
-	}.Build()
-	File_pbresource_annotations_proto = out.File
-	file_pbresource_annotations_proto_rawDesc = nil
-	file_pbresource_annotations_proto_goTypes = nil
-	file_pbresource_annotations_proto_depIdxs = nil
-}
diff --git a/proto-public/pbresource/annotations.proto b/proto-public/pbresource/annotations.proto
deleted file mode 100644
index 55b2abc8e08fc..0000000000000
--- a/proto-public/pbresource/annotations.proto
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.resource;
-
-import "google/protobuf/descriptor.proto";
-
-enum Scope {
-  // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-  SCOPE_UNDEFINED = 0;
-  SCOPE_CLUSTER = 1;
-  SCOPE_PARTITION = 2;
-  SCOPE_NAMESPACE = 3;
-}
-
-message ResourceTypeSpec {
-  Scope scope = 1;
-  bool dont_map_http = 2;
-}
-
-extend google.protobuf.MessageOptions {
-  ResourceTypeSpec spec = 8500;
-}
diff --git a/proto-public/pbresource/resource.pb.binary.go b/proto-public/pbresource/resource.pb.binary.go
deleted file mode 100644
index 0548452feb759..0000000000000
--- a/proto-public/pbresource/resource.pb.binary.go
+++ /dev/null
@@ -1,228 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbresource/resource.proto
-
-package pbresource
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Type) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Type) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Tenancy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Tenancy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ID) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ID) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Resource) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Resource) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Status) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Status) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Condition) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Condition) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Reference) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Reference) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Tombstone) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Tombstone) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ReadRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ReadRequest) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ReadResponse) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ReadResponse) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ListRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ListRequest) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ListResponse) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ListResponse) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ListByOwnerRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ListByOwnerRequest) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ListByOwnerResponse) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ListByOwnerResponse) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *WriteRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *WriteRequest) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *WriteResponse) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *WriteResponse) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *WriteStatusRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *WriteStatusRequest) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *WriteStatusResponse) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *WriteStatusResponse) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DeleteRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DeleteRequest) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DeleteResponse) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DeleteResponse) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *WatchListRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *WatchListRequest) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *WatchEvent) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *WatchEvent) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbresource/resource.pb.go b/proto-public/pbresource/resource.pb.go
deleted file mode 100644
index 889a0314af312..0000000000000
--- a/proto-public/pbresource/resource.pb.go
+++ /dev/null
@@ -1,2216 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbresource/resource.proto
-
-// For more information, see: https://github.com/hashicorp/consul/tree/main/docs/resources
-
-package pbresource
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/annotations/ratelimit"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	anypb "google.golang.org/protobuf/types/known/anypb"
-	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// State represents the state of the condition (i.e. true/false/unknown).
-type Condition_State int32
-
-const (
-	// STATE_UNKNOWN means that the state of the condition is unknown.
-	//
-	// buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-	Condition_STATE_UNKNOWN Condition_State = 0
-	// STATE_TRUE means that the state of the condition is true.
-	Condition_STATE_TRUE Condition_State = 1
-	// STATE_FALSE means that the state of the condition is false.
-	Condition_STATE_FALSE Condition_State = 2
-)
-
-// Enum value maps for Condition_State.
-var (
-	Condition_State_name = map[int32]string{
-		0: "STATE_UNKNOWN",
-		1: "STATE_TRUE",
-		2: "STATE_FALSE",
-	}
-	Condition_State_value = map[string]int32{
-		"STATE_UNKNOWN": 0,
-		"STATE_TRUE":    1,
-		"STATE_FALSE":   2,
-	}
-)
-
-func (x Condition_State) Enum() *Condition_State {
-	p := new(Condition_State)
-	*p = x
-	return p
-}
-
-func (x Condition_State) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Condition_State) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbresource_resource_proto_enumTypes[0].Descriptor()
-}
-
-func (Condition_State) Type() protoreflect.EnumType {
-	return &file_pbresource_resource_proto_enumTypes[0]
-}
-
-func (x Condition_State) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Condition_State.Descriptor instead.
-func (Condition_State) EnumDescriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{5, 0}
-}
-
-// Operation describes the type of event.
-type WatchEvent_Operation int32
-
-const (
-	// OPERATION_UNSPECIFIED is the default/zero value. You should not see it
-	// in practice.
-	WatchEvent_OPERATION_UNSPECIFIED WatchEvent_Operation = 0
-	// OPERATION_UPSERT indicates that the resource was written (i.e. created or
-	// updated). All events from the initial state-of-the-world will be upsert
-	// events.
-	WatchEvent_OPERATION_UPSERT WatchEvent_Operation = 1
-	// OPERATION_DELETED indicates that the resource was deleted.
-	WatchEvent_OPERATION_DELETE WatchEvent_Operation = 2
-)
-
-// Enum value maps for WatchEvent_Operation.
-var (
-	WatchEvent_Operation_name = map[int32]string{
-		0: "OPERATION_UNSPECIFIED",
-		1: "OPERATION_UPSERT",
-		2: "OPERATION_DELETE",
-	}
-	WatchEvent_Operation_value = map[string]int32{
-		"OPERATION_UNSPECIFIED": 0,
-		"OPERATION_UPSERT":      1,
-		"OPERATION_DELETE":      2,
-	}
-)
-
-func (x WatchEvent_Operation) Enum() *WatchEvent_Operation {
-	p := new(WatchEvent_Operation)
-	*p = x
-	return p
-}
-
-func (x WatchEvent_Operation) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (WatchEvent_Operation) Descriptor() protoreflect.EnumDescriptor {
-	return file_pbresource_resource_proto_enumTypes[1].Descriptor()
-}
-
-func (WatchEvent_Operation) Type() protoreflect.EnumType {
-	return &file_pbresource_resource_proto_enumTypes[1]
-}
-
-func (x WatchEvent_Operation) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use WatchEvent_Operation.Descriptor instead.
-func (WatchEvent_Operation) EnumDescriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{21, 0}
-}
-
-// Type describes a resource's type. It follows the GVK (Group Version Kind)
-// [pattern](https://book.kubebuilder.io/cronjob-tutorial/gvks.html) established
-// by Kubernetes.
-type Type struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Group describes the area of functionality to which this resource type
-	// relates (e.g. "catalog", "authorization").
-	Group string `protobuf:"bytes,1,opt,name=group,proto3" json:"group,omitempty"`
-	// GroupVersion is incremented when sweeping or backward-incompatible changes
-	// are made to the group's resource types.
-	GroupVersion string `protobuf:"bytes,2,opt,name=group_version,json=groupVersion,proto3" json:"group_version,omitempty"`
-	// Kind identifies the specific resource type within the group.
-	Kind string `protobuf:"bytes,3,opt,name=kind,proto3" json:"kind,omitempty"`
-}
-
-func (x *Type) Reset() {
-	*x = Type{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Type) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Type) ProtoMessage() {}
-
-func (x *Type) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Type.ProtoReflect.Descriptor instead.
-func (*Type) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Type) GetGroup() string {
-	if x != nil {
-		return x.Group
-	}
-	return ""
-}
-
-func (x *Type) GetGroupVersion() string {
-	if x != nil {
-		return x.GroupVersion
-	}
-	return ""
-}
-
-func (x *Type) GetKind() string {
-	if x != nil {
-		return x.Kind
-	}
-	return ""
-}
-
-// Tenancy describes the tenancy units in which the resource resides.
-type Tenancy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Partition is the topmost administrative boundary within a cluster.
-	// https://developer.hashicorp.com/consul/docs/enterprise/admin-partitions
-	//
-	// When using the List and WatchList endpoints, provide the wildcard value "*"
-	// to list resources across all partitions.
-	Partition string `protobuf:"bytes,1,opt,name=partition,proto3" json:"partition,omitempty"`
-	// Namespace further isolates resources within a partition.
-	// https://developer.hashicorp.com/consul/docs/enterprise/namespaces
-	//
-	// When using the List and WatchList endpoints, provide the wildcard value "*"
-	// to list resources across all namespaces.
-	Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
-	// PeerName identifies which peer the resource is imported from.
-	// https://developer.hashicorp.com/consul/docs/connect/cluster-peering
-	//
-	// When using the List and WatchList endpoints, provide the wildcard value "*"
-	// to list resources across all peers.
-	PeerName string `protobuf:"bytes,3,opt,name=peer_name,json=peerName,proto3" json:"peer_name,omitempty"`
-}
-
-func (x *Tenancy) Reset() {
-	*x = Tenancy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Tenancy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Tenancy) ProtoMessage() {}
-
-func (x *Tenancy) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Tenancy.ProtoReflect.Descriptor instead.
-func (*Tenancy) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Tenancy) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *Tenancy) GetNamespace() string {
-	if x != nil {
-		return x.Namespace
-	}
-	return ""
-}
-
-func (x *Tenancy) GetPeerName() string {
-	if x != nil {
-		return x.PeerName
-	}
-	return ""
-}
-
-// ID uniquely identifies a resource.
-type ID struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Uid is the unique internal identifier we gave to the resource.
-	//
-	// It is primarily used to tell the difference between the current resource
-	// and previous deleted resources with the same user-given name.
-	//
-	// Concretely, Uid is a [ULID](https://github.com/ulid/spec) and you can treat
-	// its timestamp component as the resource's creation time.
-	Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid,omitempty"`
-	// Name is the user-given name of the resource (e.g. the "billing" service).
-	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	// Type identifies the resource's type.
-	Type *Type `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"`
-	// Tenancy identifies the tenancy units (i.e. partition, namespace) in which
-	// the resource resides.
-	Tenancy *Tenancy `protobuf:"bytes,4,opt,name=tenancy,proto3" json:"tenancy,omitempty"`
-}
-
-func (x *ID) Reset() {
-	*x = ID{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ID) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ID) ProtoMessage() {}
-
-func (x *ID) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ID.ProtoReflect.Descriptor instead.
-func (*ID) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *ID) GetUid() string {
-	if x != nil {
-		return x.Uid
-	}
-	return ""
-}
-
-func (x *ID) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *ID) GetType() *Type {
-	if x != nil {
-		return x.Type
-	}
-	return nil
-}
-
-func (x *ID) GetTenancy() *Tenancy {
-	if x != nil {
-		return x.Tenancy
-	}
-	return nil
-}
-
-// Resource describes a resource of a known type managed by Consul.
-type Resource struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ID uniquely identifies the resource.
-	Id *ID `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	// Owner (optionally) describes which resource "owns" this resource, it is
-	// immutable and can only be set on resource creation. Owned resources will
-	// be automatically deleted when their owner is deleted.
-	Owner *ID `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty"`
-	// Version is the low-level version identifier used by the storage backend
-	// in CAS (Compare-And-Swap) operations. It will change when the resource is
-	// modified in any way, including status updates.
-	//
-	// When calling the Write endpoint, providing a non-blank version will perform
-	// a CAS (Compare-And-Swap) write, which will result in an Aborted error code
-	// if the given version doesn't match what is stored.
-	Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"`
-	// Generation is incremented whenever the resource's content (i.e. not its
-	// status) is modified. You can think of it as being the "user version".
-	//
-	// Concretely, Generation is a [ULID](https://github.com/ulid/spec) and you
-	// can treat its timestamp component as the resource's modification time.
-	Generation string `protobuf:"bytes,4,opt,name=generation,proto3" json:"generation,omitempty"`
-	// Metadata contains key/value pairs of arbitrary metadata about the resource.
-	Metadata map[string]string `protobuf:"bytes,5,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// Status is used by controllers to communicate the result of attempting to
-	// reconcile and apply the resource (e.g. surface semantic validation errors)
-	// with users and other controllers. Each status is identified by a unique key
-	// and should only ever be updated by one controller.
-	//
-	// Status can only be updated via the WriteStatus endpoint. Attempting to do
-	// so via the Write endpoint will result in an InvalidArgument error code.
-	Status map[string]*Status `protobuf:"bytes,6,rep,name=status,proto3" json:"status,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// Data contains the resource's type-specific content.
-	Data *anypb.Any `protobuf:"bytes,7,opt,name=data,proto3" json:"data,omitempty"`
-}
-
-func (x *Resource) Reset() {
-	*x = Resource{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Resource) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Resource) ProtoMessage() {}
-
-func (x *Resource) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Resource.ProtoReflect.Descriptor instead.
-func (*Resource) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *Resource) GetId() *ID {
-	if x != nil {
-		return x.Id
-	}
-	return nil
-}
-
-func (x *Resource) GetOwner() *ID {
-	if x != nil {
-		return x.Owner
-	}
-	return nil
-}
-
-func (x *Resource) GetVersion() string {
-	if x != nil {
-		return x.Version
-	}
-	return ""
-}
-
-func (x *Resource) GetGeneration() string {
-	if x != nil {
-		return x.Generation
-	}
-	return ""
-}
-
-func (x *Resource) GetMetadata() map[string]string {
-	if x != nil {
-		return x.Metadata
-	}
-	return nil
-}
-
-func (x *Resource) GetStatus() map[string]*Status {
-	if x != nil {
-		return x.Status
-	}
-	return nil
-}
-
-func (x *Resource) GetData() *anypb.Any {
-	if x != nil {
-		return x.Data
-	}
-	return nil
-}
-
-// Status is used by controllers to communicate the result of attempting to
-// reconcile and apply a resource (e.g. surface semantic validation errors)
-// with users and other controllers.
-type Status struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ObservedGeneration identifies which generation of a resource this status
-	// related to. It can be used to determine whether the current generation of
-	// a resource has been reconciled.
-	ObservedGeneration string `protobuf:"bytes,1,opt,name=observed_generation,json=observedGeneration,proto3" json:"observed_generation,omitempty"`
-	// Conditions contains a set of discreet observations about the resource in
-	// relation to the current state of the system (e.g. it is semantically valid).
-	Conditions []*Condition `protobuf:"bytes,2,rep,name=conditions,proto3" json:"conditions,omitempty"`
-	// UpdatedAt is the time at which the status was last written.
-	UpdatedAt *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
-}
-
-func (x *Status) Reset() {
-	*x = Status{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Status) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Status) ProtoMessage() {}
-
-func (x *Status) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Status.ProtoReflect.Descriptor instead.
-func (*Status) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *Status) GetObservedGeneration() string {
-	if x != nil {
-		return x.ObservedGeneration
-	}
-	return ""
-}
-
-func (x *Status) GetConditions() []*Condition {
-	if x != nil {
-		return x.Conditions
-	}
-	return nil
-}
-
-func (x *Status) GetUpdatedAt() *timestamppb.Timestamp {
-	if x != nil {
-		return x.UpdatedAt
-	}
-	return nil
-}
-
-// Condition represents a discreet observation about a resource in relation to
-// the current state of the system.
-//
-// It is heavily inspired by Kubernetes' [conditions](https://bit.ly/3H9Y6IK)
-// and the Gateway API [types and reasons](https://bit.ly/3n2PPiP).
-type Condition struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Type identifies the type of condition (e.g. "Invalid", "ResolvedRefs").
-	Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
-	// State represents the state of the condition (i.e. true/false/unknown).
-	State Condition_State `protobuf:"varint,2,opt,name=state,proto3,enum=hashicorp.consul.resource.Condition_State" json:"state,omitempty"`
-	// Reason provides more machine-readable details about the condition (e.g.
-	// "InvalidProtocol").
-	Reason string `protobuf:"bytes,3,opt,name=reason,proto3" json:"reason,omitempty"`
-	// Message contains a human-friendly description of the status.
-	Message string `protobuf:"bytes,4,opt,name=message,proto3" json:"message,omitempty"`
-	// Resource identifies which resource this condition relates to, when it is
-	// not the core resource itself.
-	Resource *Reference `protobuf:"bytes,5,opt,name=resource,proto3" json:"resource,omitempty"`
-}
-
-func (x *Condition) Reset() {
-	*x = Condition{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Condition) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Condition) ProtoMessage() {}
-
-func (x *Condition) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Condition.ProtoReflect.Descriptor instead.
-func (*Condition) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *Condition) GetType() string {
-	if x != nil {
-		return x.Type
-	}
-	return ""
-}
-
-func (x *Condition) GetState() Condition_State {
-	if x != nil {
-		return x.State
-	}
-	return Condition_STATE_UNKNOWN
-}
-
-func (x *Condition) GetReason() string {
-	if x != nil {
-		return x.Reason
-	}
-	return ""
-}
-
-func (x *Condition) GetMessage() string {
-	if x != nil {
-		return x.Message
-	}
-	return ""
-}
-
-func (x *Condition) GetResource() *Reference {
-	if x != nil {
-		return x.Resource
-	}
-	return nil
-}
-
-// Reference identifies which resource a condition relates to, when it is not
-// the core resource itself.
-type Reference struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Type identifies the resource's type.
-	Type *Type `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
-	// Tenancy identifies the tenancy units (i.e. partition, namespace) in which
-	// the resource resides.
-	Tenancy *Tenancy `protobuf:"bytes,2,opt,name=tenancy,proto3" json:"tenancy,omitempty"`
-	// Name is the user-given name of the resource (e.g. the "billing" service).
-	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
-	// Section identifies which part of the resource the condition relates to.
-	Section string `protobuf:"bytes,4,opt,name=section,proto3" json:"section,omitempty"`
-}
-
-func (x *Reference) Reset() {
-	*x = Reference{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Reference) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Reference) ProtoMessage() {}
-
-func (x *Reference) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Reference.ProtoReflect.Descriptor instead.
-func (*Reference) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *Reference) GetType() *Type {
-	if x != nil {
-		return x.Type
-	}
-	return nil
-}
-
-func (x *Reference) GetTenancy() *Tenancy {
-	if x != nil {
-		return x.Tenancy
-	}
-	return nil
-}
-
-func (x *Reference) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *Reference) GetSection() string {
-	if x != nil {
-		return x.Section
-	}
-	return ""
-}
-
-// Tombstone represents a promise to delete all of a resource's immediately
-// owned (child) resources, if any.
-type Tombstone struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Owner resource identifier.
-	Owner *ID `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"`
-}
-
-func (x *Tombstone) Reset() {
-	*x = Tombstone{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Tombstone) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Tombstone) ProtoMessage() {}
-
-func (x *Tombstone) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Tombstone.ProtoReflect.Descriptor instead.
-func (*Tombstone) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *Tombstone) GetOwner() *ID {
-	if x != nil {
-		return x.Owner
-	}
-	return nil
-}
-
-// ReadRequest contains the parameters to the Read endpoint.
-type ReadRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ID of the resource.
-	Id *ID `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-}
-
-func (x *ReadRequest) Reset() {
-	*x = ReadRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ReadRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ReadRequest) ProtoMessage() {}
-
-func (x *ReadRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ReadRequest.ProtoReflect.Descriptor instead.
-func (*ReadRequest) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *ReadRequest) GetId() *ID {
-	if x != nil {
-		return x.Id
-	}
-	return nil
-}
-
-// ReadResponse contains the results of calling the Read endpoint.
-type ReadResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Resource that was read.
-	Resource *Resource `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
-}
-
-func (x *ReadResponse) Reset() {
-	*x = ReadResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ReadResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ReadResponse) ProtoMessage() {}
-
-func (x *ReadResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ReadResponse.ProtoReflect.Descriptor instead.
-func (*ReadResponse) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *ReadResponse) GetResource() *Resource {
-	if x != nil {
-		return x.Resource
-	}
-	return nil
-}
-
-// ListRequest contains the parameters to the List endpoint.
-type ListRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Type of resource to list.
-	Type *Type `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
-	// Tenancy units in which to list resources. To list resources in all units,
-	// provide the wildcard "*" value.
-	Tenancy *Tenancy `protobuf:"bytes,2,opt,name=tenancy,proto3" json:"tenancy,omitempty"`
-	// NamePrefix filters the results to those with a name beginning with the
-	// given prefix.
-	NamePrefix string `protobuf:"bytes,3,opt,name=name_prefix,json=namePrefix,proto3" json:"name_prefix,omitempty"`
-}
-
-func (x *ListRequest) Reset() {
-	*x = ListRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListRequest) ProtoMessage() {}
-
-func (x *ListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListRequest.ProtoReflect.Descriptor instead.
-func (*ListRequest) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *ListRequest) GetType() *Type {
-	if x != nil {
-		return x.Type
-	}
-	return nil
-}
-
-func (x *ListRequest) GetTenancy() *Tenancy {
-	if x != nil {
-		return x.Tenancy
-	}
-	return nil
-}
-
-func (x *ListRequest) GetNamePrefix() string {
-	if x != nil {
-		return x.NamePrefix
-	}
-	return ""
-}
-
-// ListResponse contains the results of calling the List endpoint.
-type ListResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Resources that were listed.
-	Resources []*Resource `protobuf:"bytes,1,rep,name=resources,proto3" json:"resources,omitempty"`
-}
-
-func (x *ListResponse) Reset() {
-	*x = ListResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListResponse) ProtoMessage() {}
-
-func (x *ListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListResponse.ProtoReflect.Descriptor instead.
-func (*ListResponse) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *ListResponse) GetResources() []*Resource {
-	if x != nil {
-		return x.Resources
-	}
-	return nil
-}
-
-// ListByOwnerRequest contains the parameters to the ListByOwner endpoint.
-type ListByOwnerRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Owner *ID `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"`
-}
-
-func (x *ListByOwnerRequest) Reset() {
-	*x = ListByOwnerRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListByOwnerRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListByOwnerRequest) ProtoMessage() {}
-
-func (x *ListByOwnerRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListByOwnerRequest.ProtoReflect.Descriptor instead.
-func (*ListByOwnerRequest) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *ListByOwnerRequest) GetOwner() *ID {
-	if x != nil {
-		return x.Owner
-	}
-	return nil
-}
-
-// ListByOwnerResponse contains the results of calling the ListByOwner endpoint.
-type ListByOwnerResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Resources that were listed.
-	Resources []*Resource `protobuf:"bytes,1,rep,name=resources,proto3" json:"resources,omitempty"`
-}
-
-func (x *ListByOwnerResponse) Reset() {
-	*x = ListByOwnerResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListByOwnerResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListByOwnerResponse) ProtoMessage() {}
-
-func (x *ListByOwnerResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListByOwnerResponse.ProtoReflect.Descriptor instead.
-func (*ListByOwnerResponse) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{13}
-}
-
-func (x *ListByOwnerResponse) GetResources() []*Resource {
-	if x != nil {
-		return x.Resources
-	}
-	return nil
-}
-
-// WriteRequest contains the parameters to the Write endpoint.
-type WriteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Resource to write.
-	Resource *Resource `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
-}
-
-func (x *WriteRequest) Reset() {
-	*x = WriteRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WriteRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WriteRequest) ProtoMessage() {}
-
-func (x *WriteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WriteRequest.ProtoReflect.Descriptor instead.
-func (*WriteRequest) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{14}
-}
-
-func (x *WriteRequest) GetResource() *Resource {
-	if x != nil {
-		return x.Resource
-	}
-	return nil
-}
-
-// WriteResponse contains the results of calling the Write endpoint.
-type WriteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Resource that was written.
-	Resource *Resource `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
-}
-
-func (x *WriteResponse) Reset() {
-	*x = WriteResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WriteResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WriteResponse) ProtoMessage() {}
-
-func (x *WriteResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WriteResponse.ProtoReflect.Descriptor instead.
-func (*WriteResponse) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{15}
-}
-
-func (x *WriteResponse) GetResource() *Resource {
-	if x != nil {
-		return x.Resource
-	}
-	return nil
-}
-
-// WriteStatusRequest contains the parameters to the WriteStatus endpoint.
-type WriteStatusRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ID of the resource to which the status will be written. Must contain a Uid.
-	Id *ID `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	// Version may be provided to perform a CAS (Compare-And-Swap) update of the
-	// status. If the given version doesn't match what is currently stored, an
-	// Aborted error code will be returned.
-	//
-	// Note: in most cases, CAS status updates are not necessary because updates
-	// are scoped to a specific status key and controllers are leader-elected so
-	// there is no chance of a conflict.
-	Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
-	// Key identifies which status will be written. Generally, each controller
-	// should write 1 status which it owns exclusively (i.e. no other controller
-	// updates it).
-	Key string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`
-	// Status that will be written to the resource.
-	Status *Status `protobuf:"bytes,4,opt,name=status,proto3" json:"status,omitempty"`
-}
-
-func (x *WriteStatusRequest) Reset() {
-	*x = WriteStatusRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WriteStatusRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WriteStatusRequest) ProtoMessage() {}
-
-func (x *WriteStatusRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WriteStatusRequest.ProtoReflect.Descriptor instead.
-func (*WriteStatusRequest) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{16}
-}
-
-func (x *WriteStatusRequest) GetId() *ID {
-	if x != nil {
-		return x.Id
-	}
-	return nil
-}
-
-func (x *WriteStatusRequest) GetVersion() string {
-	if x != nil {
-		return x.Version
-	}
-	return ""
-}
-
-func (x *WriteStatusRequest) GetKey() string {
-	if x != nil {
-		return x.Key
-	}
-	return ""
-}
-
-func (x *WriteStatusRequest) GetStatus() *Status {
-	if x != nil {
-		return x.Status
-	}
-	return nil
-}
-
-// WriteStatusResponse contains the results of calling the WriteStatus endpoint.
-type WriteStatusResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Resource to which the status was written.
-	Resource *Resource `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
-}
-
-func (x *WriteStatusResponse) Reset() {
-	*x = WriteStatusResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[17]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WriteStatusResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WriteStatusResponse) ProtoMessage() {}
-
-func (x *WriteStatusResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[17]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WriteStatusResponse.ProtoReflect.Descriptor instead.
-func (*WriteStatusResponse) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{17}
-}
-
-func (x *WriteStatusResponse) GetResource() *Resource {
-	if x != nil {
-		return x.Resource
-	}
-	return nil
-}
-
-// DeleteRequest contains the parameters to the Delete endpoint.
-type DeleteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ID of the resource that will be deleted.
-	Id *ID `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	// Version may be provided to perform a CAS (Compare-And-Swap) deletion of the
-	// resource. If the given version doesn't match what is currently stored, an
-	// Aborted error code will be returned.
-	Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
-}
-
-func (x *DeleteRequest) Reset() {
-	*x = DeleteRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[18]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DeleteRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DeleteRequest) ProtoMessage() {}
-
-func (x *DeleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[18]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DeleteRequest.ProtoReflect.Descriptor instead.
-func (*DeleteRequest) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{18}
-}
-
-func (x *DeleteRequest) GetId() *ID {
-	if x != nil {
-		return x.Id
-	}
-	return nil
-}
-
-func (x *DeleteRequest) GetVersion() string {
-	if x != nil {
-		return x.Version
-	}
-	return ""
-}
-
-// DeleteResponse contains the results of calling the Delete endpoint.
-type DeleteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *DeleteResponse) Reset() {
-	*x = DeleteResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[19]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DeleteResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DeleteResponse) ProtoMessage() {}
-
-func (x *DeleteResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[19]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DeleteResponse.ProtoReflect.Descriptor instead.
-func (*DeleteResponse) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{19}
-}
-
-// WatchListRequest contains the parameters to the WatchList endpoint.
-type WatchListRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Type of resource to watch.
-	Type *Type `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
-	// Tenancy units in which to watch resources. To list resources in all units,
-	// provide the wildcard "*" value.
-	Tenancy *Tenancy `protobuf:"bytes,2,opt,name=tenancy,proto3" json:"tenancy,omitempty"`
-	// NamePrefix filters the results to those with a name beginning with the
-	// given prefix.
-	NamePrefix string `protobuf:"bytes,3,opt,name=name_prefix,json=namePrefix,proto3" json:"name_prefix,omitempty"`
-}
-
-func (x *WatchListRequest) Reset() {
-	*x = WatchListRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[20]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WatchListRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WatchListRequest) ProtoMessage() {}
-
-func (x *WatchListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[20]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WatchListRequest.ProtoReflect.Descriptor instead.
-func (*WatchListRequest) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{20}
-}
-
-func (x *WatchListRequest) GetType() *Type {
-	if x != nil {
-		return x.Type
-	}
-	return nil
-}
-
-func (x *WatchListRequest) GetTenancy() *Tenancy {
-	if x != nil {
-		return x.Tenancy
-	}
-	return nil
-}
-
-func (x *WatchListRequest) GetNamePrefix() string {
-	if x != nil {
-		return x.NamePrefix
-	}
-	return ""
-}
-
-// WatchEvent is emitted on the WatchList stream when a resource changes.
-type WatchEvent struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Operation describes the type of event.
-	Operation WatchEvent_Operation `protobuf:"varint,1,opt,name=operation,proto3,enum=hashicorp.consul.resource.WatchEvent_Operation" json:"operation,omitempty"`
-	// Resource the event relates to.
-	Resource *Resource `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"`
-}
-
-func (x *WatchEvent) Reset() {
-	*x = WatchEvent{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbresource_resource_proto_msgTypes[21]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WatchEvent) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WatchEvent) ProtoMessage() {}
-
-func (x *WatchEvent) ProtoReflect() protoreflect.Message {
-	mi := &file_pbresource_resource_proto_msgTypes[21]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WatchEvent.ProtoReflect.Descriptor instead.
-func (*WatchEvent) Descriptor() ([]byte, []int) {
-	return file_pbresource_resource_proto_rawDescGZIP(), []int{21}
-}
-
-func (x *WatchEvent) GetOperation() WatchEvent_Operation {
-	if x != nil {
-		return x.Operation
-	}
-	return WatchEvent_OPERATION_UNSPECIFIED
-}
-
-func (x *WatchEvent) GetResource() *Resource {
-	if x != nil {
-		return x.Resource
-	}
-	return nil
-}
-
-var File_pbresource_resource_proto protoreflect.FileDescriptor
-
-var file_pbresource_resource_proto_rawDesc = []byte{
-	0x0a, 0x19, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x19, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x1a, 0x25, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61,
-	0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61,
-	0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
-	0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x55, 0x0a, 0x04, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x23, 0x0a, 0x0d, 0x67, 0x72, 0x6f, 0x75, 0x70,
-	0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
-	0x67, 0x72, 0x6f, 0x75, 0x70, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04,
-	0x6b, 0x69, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64,
-	0x22, 0x62, 0x0a, 0x07, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x70,
-	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x61, 0x6d,
-	0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6e, 0x61,
-	0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x65, 0x65, 0x72, 0x5f,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x65, 0x72,
-	0x4e, 0x61, 0x6d, 0x65, 0x22, 0x9d, 0x01, 0x0a, 0x02, 0x49, 0x44, 0x12, 0x10, 0x0a, 0x03, 0x75,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x33, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65,
-	0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x3c, 0x0a, 0x07, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63,
-	0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x52, 0x07, 0x74, 0x65, 0x6e,
-	0x61, 0x6e, 0x63, 0x79, 0x22, 0x85, 0x04, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x12, 0x2d, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x02, 0x69, 0x64,
-	0x12, 0x33, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x05,
-	0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12,
-	0x1e, 0x0a, 0x0a, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x4d, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x47,
-	0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74,
-	0x61, 0x1a, 0x3b, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x5c,
-	0x0a, 0x0b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x37, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xba, 0x01, 0x0a,
-	0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x2f, 0x0a, 0x13, 0x6f, 0x62, 0x73, 0x65, 0x72,
-	0x76, 0x65, 0x64, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x47, 0x65,
-	0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x64,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x39,
-	0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09,
-	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x22, 0x92, 0x02, 0x0a, 0x09, 0x43, 0x6f,
-	0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x40, 0x0a, 0x05, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a,
-	0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72,
-	0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
-	0x40, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x24, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65,
-	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x22, 0x3b, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x54,
-	0x41, 0x54, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0e, 0x0a,
-	0x0a, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x52, 0x55, 0x45, 0x10, 0x01, 0x12, 0x0f, 0x0a,
-	0x0b, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x46, 0x41, 0x4c, 0x53, 0x45, 0x10, 0x02, 0x22, 0xac,
-	0x01, 0x0a, 0x09, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x33, 0x0a, 0x04,
-	0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70,
-	0x65, 0x12, 0x3c, 0x0a, 0x07, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54,
-	0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x52, 0x07, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x12,
-	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x40, 0x0a,
-	0x09, 0x54, 0x6f, 0x6d, 0x62, 0x73, 0x74, 0x6f, 0x6e, 0x65, 0x12, 0x33, 0x0a, 0x05, 0x6f, 0x77,
-	0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x22,
-	0x3c, 0x0a, 0x0b, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2d,
-	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4f, 0x0a,
-	0x0c, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a,
-	0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0xa1,
-	0x01, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x33,
-	0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74,
-	0x79, 0x70, 0x65, 0x12, 0x3c, 0x0a, 0x07, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x52, 0x07, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63,
-	0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6e, 0x61, 0x6d, 0x65, 0x50, 0x72, 0x65, 0x66,
-	0x69, 0x78, 0x22, 0x51, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x41, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x49, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x4f,
-	0x77, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x05, 0x6f,
-	0x77, 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72,
-	0x22, 0x58, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x41, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52,
-	0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x4f, 0x0a, 0x0c, 0x57, 0x72,
-	0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x0d, 0x57,
-	0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x08,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0xaa, 0x01,
-	0x0a, 0x12, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x2d, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52,
-	0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x39, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x21, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x56, 0x0a, 0x13, 0x57, 0x72,
-	0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e,
-	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x22, 0x58, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x2d, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x02,
-	0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x10, 0x0a, 0x0e,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xa6,
-	0x01, 0x0a, 0x10, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x79,
-	0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x3c, 0x0a, 0x07, 0x74, 0x65, 0x6e, 0x61,
-	0x6e, 0x63, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x52, 0x07, 0x74,
-	0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x70,
-	0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6e, 0x61, 0x6d,
-	0x65, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x22, 0xf0, 0x01, 0x0a, 0x0a, 0x57, 0x61, 0x74, 0x63,
-	0x68, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x4d, 0x0a, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x45, 0x76, 0x65, 0x6e, 0x74,
-	0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x6f, 0x70, 0x65, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x52, 0x0a, 0x09, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x15, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e,
-	0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x14,
-	0x0a, 0x10, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x50, 0x53, 0x45,
-	0x52, 0x54, 0x10, 0x01, 0x12, 0x14, 0x0a, 0x10, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f,
-	0x4e, 0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x02, 0x32, 0x83, 0x06, 0x0a, 0x0f, 0x52,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x61,
-	0x0a, 0x04, 0x52, 0x65, 0x61, 0x64, 0x12, 0x26, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10,
-	0x0b, 0x12, 0x64, 0x0a, 0x05, 0x57, 0x72, 0x69, 0x74, 0x65, 0x12, 0x27, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e,
-	0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2,
-	0x86, 0x04, 0x04, 0x08, 0x03, 0x10, 0x0b, 0x12, 0x76, 0x0a, 0x0b, 0x57, 0x72, 0x69, 0x74, 0x65,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x03, 0x10, 0x0b, 0x12,
-	0x61, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x26, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x27, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4c, 0x69, 0x73, 0x74,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02,
-	0x10, 0x0b, 0x12, 0x76, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x4f, 0x77, 0x6e, 0x65,
-	0x72, 0x12, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4c, 0x69,
-	0x73, 0x74, 0x42, 0x79, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4c, 0x69, 0x73,
-	0x74, 0x42, 0x79, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x0b, 0x12, 0x67, 0x0a, 0x06, 0x44, 0x65,
-	0x6c, 0x65, 0x74, 0x65, 0x12, 0x28, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08,
-	0x03, 0x10, 0x0b, 0x12, 0x6b, 0x0a, 0x09, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x69, 0x73, 0x74,
-	0x12, 0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x61, 0x74,
-	0x63, 0x68, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x45,
-	0x76, 0x65, 0x6e, 0x74, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x0b, 0x30, 0x01,
-	0x42, 0xe9, 0x01, 0x0a, 0x1d, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x42, 0x0d, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x52, 0xaa, 0x02,
-	0x19, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0xca, 0x02, 0x19, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x52, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0xe2, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02,
-	0x1b, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x3a, 0x3a, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbresource_resource_proto_rawDescOnce sync.Once
-	file_pbresource_resource_proto_rawDescData = file_pbresource_resource_proto_rawDesc
-)
-
-func file_pbresource_resource_proto_rawDescGZIP() []byte {
-	file_pbresource_resource_proto_rawDescOnce.Do(func() {
-		file_pbresource_resource_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbresource_resource_proto_rawDescData)
-	})
-	return file_pbresource_resource_proto_rawDescData
-}
-
-var file_pbresource_resource_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_pbresource_resource_proto_msgTypes = make([]protoimpl.MessageInfo, 24)
-var file_pbresource_resource_proto_goTypes = []interface{}{
-	(Condition_State)(0),          // 0: hashicorp.consul.resource.Condition.State
-	(WatchEvent_Operation)(0),     // 1: hashicorp.consul.resource.WatchEvent.Operation
-	(*Type)(nil),                  // 2: hashicorp.consul.resource.Type
-	(*Tenancy)(nil),               // 3: hashicorp.consul.resource.Tenancy
-	(*ID)(nil),                    // 4: hashicorp.consul.resource.ID
-	(*Resource)(nil),              // 5: hashicorp.consul.resource.Resource
-	(*Status)(nil),                // 6: hashicorp.consul.resource.Status
-	(*Condition)(nil),             // 7: hashicorp.consul.resource.Condition
-	(*Reference)(nil),             // 8: hashicorp.consul.resource.Reference
-	(*Tombstone)(nil),             // 9: hashicorp.consul.resource.Tombstone
-	(*ReadRequest)(nil),           // 10: hashicorp.consul.resource.ReadRequest
-	(*ReadResponse)(nil),          // 11: hashicorp.consul.resource.ReadResponse
-	(*ListRequest)(nil),           // 12: hashicorp.consul.resource.ListRequest
-	(*ListResponse)(nil),          // 13: hashicorp.consul.resource.ListResponse
-	(*ListByOwnerRequest)(nil),    // 14: hashicorp.consul.resource.ListByOwnerRequest
-	(*ListByOwnerResponse)(nil),   // 15: hashicorp.consul.resource.ListByOwnerResponse
-	(*WriteRequest)(nil),          // 16: hashicorp.consul.resource.WriteRequest
-	(*WriteResponse)(nil),         // 17: hashicorp.consul.resource.WriteResponse
-	(*WriteStatusRequest)(nil),    // 18: hashicorp.consul.resource.WriteStatusRequest
-	(*WriteStatusResponse)(nil),   // 19: hashicorp.consul.resource.WriteStatusResponse
-	(*DeleteRequest)(nil),         // 20: hashicorp.consul.resource.DeleteRequest
-	(*DeleteResponse)(nil),        // 21: hashicorp.consul.resource.DeleteResponse
-	(*WatchListRequest)(nil),      // 22: hashicorp.consul.resource.WatchListRequest
-	(*WatchEvent)(nil),            // 23: hashicorp.consul.resource.WatchEvent
-	nil,                           // 24: hashicorp.consul.resource.Resource.MetadataEntry
-	nil,                           // 25: hashicorp.consul.resource.Resource.StatusEntry
-	(*anypb.Any)(nil),             // 26: google.protobuf.Any
-	(*timestamppb.Timestamp)(nil), // 27: google.protobuf.Timestamp
-}
-var file_pbresource_resource_proto_depIdxs = []int32{
-	2,  // 0: hashicorp.consul.resource.ID.type:type_name -> hashicorp.consul.resource.Type
-	3,  // 1: hashicorp.consul.resource.ID.tenancy:type_name -> hashicorp.consul.resource.Tenancy
-	4,  // 2: hashicorp.consul.resource.Resource.id:type_name -> hashicorp.consul.resource.ID
-	4,  // 3: hashicorp.consul.resource.Resource.owner:type_name -> hashicorp.consul.resource.ID
-	24, // 4: hashicorp.consul.resource.Resource.metadata:type_name -> hashicorp.consul.resource.Resource.MetadataEntry
-	25, // 5: hashicorp.consul.resource.Resource.status:type_name -> hashicorp.consul.resource.Resource.StatusEntry
-	26, // 6: hashicorp.consul.resource.Resource.data:type_name -> google.protobuf.Any
-	7,  // 7: hashicorp.consul.resource.Status.conditions:type_name -> hashicorp.consul.resource.Condition
-	27, // 8: hashicorp.consul.resource.Status.updated_at:type_name -> google.protobuf.Timestamp
-	0,  // 9: hashicorp.consul.resource.Condition.state:type_name -> hashicorp.consul.resource.Condition.State
-	8,  // 10: hashicorp.consul.resource.Condition.resource:type_name -> hashicorp.consul.resource.Reference
-	2,  // 11: hashicorp.consul.resource.Reference.type:type_name -> hashicorp.consul.resource.Type
-	3,  // 12: hashicorp.consul.resource.Reference.tenancy:type_name -> hashicorp.consul.resource.Tenancy
-	4,  // 13: hashicorp.consul.resource.Tombstone.owner:type_name -> hashicorp.consul.resource.ID
-	4,  // 14: hashicorp.consul.resource.ReadRequest.id:type_name -> hashicorp.consul.resource.ID
-	5,  // 15: hashicorp.consul.resource.ReadResponse.resource:type_name -> hashicorp.consul.resource.Resource
-	2,  // 16: hashicorp.consul.resource.ListRequest.type:type_name -> hashicorp.consul.resource.Type
-	3,  // 17: hashicorp.consul.resource.ListRequest.tenancy:type_name -> hashicorp.consul.resource.Tenancy
-	5,  // 18: hashicorp.consul.resource.ListResponse.resources:type_name -> hashicorp.consul.resource.Resource
-	4,  // 19: hashicorp.consul.resource.ListByOwnerRequest.owner:type_name -> hashicorp.consul.resource.ID
-	5,  // 20: hashicorp.consul.resource.ListByOwnerResponse.resources:type_name -> hashicorp.consul.resource.Resource
-	5,  // 21: hashicorp.consul.resource.WriteRequest.resource:type_name -> hashicorp.consul.resource.Resource
-	5,  // 22: hashicorp.consul.resource.WriteResponse.resource:type_name -> hashicorp.consul.resource.Resource
-	4,  // 23: hashicorp.consul.resource.WriteStatusRequest.id:type_name -> hashicorp.consul.resource.ID
-	6,  // 24: hashicorp.consul.resource.WriteStatusRequest.status:type_name -> hashicorp.consul.resource.Status
-	5,  // 25: hashicorp.consul.resource.WriteStatusResponse.resource:type_name -> hashicorp.consul.resource.Resource
-	4,  // 26: hashicorp.consul.resource.DeleteRequest.id:type_name -> hashicorp.consul.resource.ID
-	2,  // 27: hashicorp.consul.resource.WatchListRequest.type:type_name -> hashicorp.consul.resource.Type
-	3,  // 28: hashicorp.consul.resource.WatchListRequest.tenancy:type_name -> hashicorp.consul.resource.Tenancy
-	1,  // 29: hashicorp.consul.resource.WatchEvent.operation:type_name -> hashicorp.consul.resource.WatchEvent.Operation
-	5,  // 30: hashicorp.consul.resource.WatchEvent.resource:type_name -> hashicorp.consul.resource.Resource
-	6,  // 31: hashicorp.consul.resource.Resource.StatusEntry.value:type_name -> hashicorp.consul.resource.Status
-	10, // 32: hashicorp.consul.resource.ResourceService.Read:input_type -> hashicorp.consul.resource.ReadRequest
-	16, // 33: hashicorp.consul.resource.ResourceService.Write:input_type -> hashicorp.consul.resource.WriteRequest
-	18, // 34: hashicorp.consul.resource.ResourceService.WriteStatus:input_type -> hashicorp.consul.resource.WriteStatusRequest
-	12, // 35: hashicorp.consul.resource.ResourceService.List:input_type -> hashicorp.consul.resource.ListRequest
-	14, // 36: hashicorp.consul.resource.ResourceService.ListByOwner:input_type -> hashicorp.consul.resource.ListByOwnerRequest
-	20, // 37: hashicorp.consul.resource.ResourceService.Delete:input_type -> hashicorp.consul.resource.DeleteRequest
-	22, // 38: hashicorp.consul.resource.ResourceService.WatchList:input_type -> hashicorp.consul.resource.WatchListRequest
-	11, // 39: hashicorp.consul.resource.ResourceService.Read:output_type -> hashicorp.consul.resource.ReadResponse
-	17, // 40: hashicorp.consul.resource.ResourceService.Write:output_type -> hashicorp.consul.resource.WriteResponse
-	19, // 41: hashicorp.consul.resource.ResourceService.WriteStatus:output_type -> hashicorp.consul.resource.WriteStatusResponse
-	13, // 42: hashicorp.consul.resource.ResourceService.List:output_type -> hashicorp.consul.resource.ListResponse
-	15, // 43: hashicorp.consul.resource.ResourceService.ListByOwner:output_type -> hashicorp.consul.resource.ListByOwnerResponse
-	21, // 44: hashicorp.consul.resource.ResourceService.Delete:output_type -> hashicorp.consul.resource.DeleteResponse
-	23, // 45: hashicorp.consul.resource.ResourceService.WatchList:output_type -> hashicorp.consul.resource.WatchEvent
-	39, // [39:46] is the sub-list for method output_type
-	32, // [32:39] is the sub-list for method input_type
-	32, // [32:32] is the sub-list for extension type_name
-	32, // [32:32] is the sub-list for extension extendee
-	0,  // [0:32] is the sub-list for field type_name
-}
-
-func init() { file_pbresource_resource_proto_init() }
-func file_pbresource_resource_proto_init() {
-	if File_pbresource_resource_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbresource_resource_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Type); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Tenancy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ID); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Resource); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Status); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Condition); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Reference); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Tombstone); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReadRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReadResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListByOwnerRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListByOwnerResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WriteRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WriteResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WriteStatusRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WriteStatusResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WatchListRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbresource_resource_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WatchEvent); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbresource_resource_proto_rawDesc,
-			NumEnums:      2,
-			NumMessages:   24,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_pbresource_resource_proto_goTypes,
-		DependencyIndexes: file_pbresource_resource_proto_depIdxs,
-		EnumInfos:         file_pbresource_resource_proto_enumTypes,
-		MessageInfos:      file_pbresource_resource_proto_msgTypes,
-	}.Build()
-	File_pbresource_resource_proto = out.File
-	file_pbresource_resource_proto_rawDesc = nil
-	file_pbresource_resource_proto_goTypes = nil
-	file_pbresource_resource_proto_depIdxs = nil
-}
diff --git a/proto-public/pbresource/resource.proto b/proto-public/pbresource/resource.proto
deleted file mode 100644
index 9e65647587b76..0000000000000
--- a/proto-public/pbresource/resource.proto
+++ /dev/null
@@ -1,489 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-// For more information, see: https://github.com/hashicorp/consul/tree/main/docs/resources
-package hashicorp.consul.resource;
-
-import "annotations/ratelimit/ratelimit.proto";
-import "google/protobuf/any.proto";
-import "google/protobuf/timestamp.proto";
-
-// Type describes a resource's type. It follows the GVK (Group Version Kind)
-// [pattern](https://book.kubebuilder.io/cronjob-tutorial/gvks.html) established
-// by Kubernetes.
-message Type {
-  // Group describes the area of functionality to which this resource type
-  // relates (e.g. "catalog", "authorization").
-  string group = 1;
-
-  // GroupVersion is incremented when sweeping or backward-incompatible changes
-  // are made to the group's resource types.
-  string group_version = 2;
-
-  // Kind identifies the specific resource type within the group.
-  string kind = 3;
-}
-
-// Tenancy describes the tenancy units in which the resource resides.
-message Tenancy {
-  // Partition is the topmost administrative boundary within a cluster.
-  // https://developer.hashicorp.com/consul/docs/enterprise/admin-partitions
-  //
-  // When using the List and WatchList endpoints, provide the wildcard value "*"
-  // to list resources across all partitions.
-  string partition = 1;
-
-  // Namespace further isolates resources within a partition.
-  // https://developer.hashicorp.com/consul/docs/enterprise/namespaces
-  //
-  // When using the List and WatchList endpoints, provide the wildcard value "*"
-  // to list resources across all namespaces.
-  string namespace = 2;
-
-  // PeerName identifies which peer the resource is imported from.
-  // https://developer.hashicorp.com/consul/docs/connect/cluster-peering
-  //
-  // When using the List and WatchList endpoints, provide the wildcard value "*"
-  // to list resources across all peers.
-  string peer_name = 3;
-}
-
-// ID uniquely identifies a resource.
-message ID {
-  // Uid is the unique internal identifier we gave to the resource.
-  //
-  // It is primarily used to tell the difference between the current resource
-  // and previous deleted resources with the same user-given name.
-  //
-  // Concretely, Uid is a [ULID](https://github.com/ulid/spec) and you can treat
-  // its timestamp component as the resource's creation time.
-  string uid = 1;
-
-  // Name is the user-given name of the resource (e.g. the "billing" service).
-  string name = 2;
-
-  // Type identifies the resource's type.
-  Type type = 3;
-
-  // Tenancy identifies the tenancy units (i.e. partition, namespace) in which
-  // the resource resides.
-  Tenancy tenancy = 4;
-}
-
-// Resource describes a resource of a known type managed by Consul.
-message Resource {
-  // ID uniquely identifies the resource.
-  ID id = 1;
-
-  // Owner (optionally) describes which resource "owns" this resource, it is
-  // immutable and can only be set on resource creation. Owned resources will
-  // be automatically deleted when their owner is deleted.
-  ID owner = 2;
-
-  // Version is the low-level version identifier used by the storage backend
-  // in CAS (Compare-And-Swap) operations. It will change when the resource is
-  // modified in any way, including status updates.
-  //
-  // When calling the Write endpoint, providing a non-blank version will perform
-  // a CAS (Compare-And-Swap) write, which will result in an Aborted error code
-  // if the given version doesn't match what is stored.
-  string version = 3;
-
-  // Generation is incremented whenever the resource's content (i.e. not its
-  // status) is modified. You can think of it as being the "user version".
-  //
-  // Concretely, Generation is a [ULID](https://github.com/ulid/spec) and you
-  // can treat its timestamp component as the resource's modification time.
-  string generation = 4;
-
-  // Metadata contains key/value pairs of arbitrary metadata about the resource.
-  map<string, string> metadata = 5;
-
-  // Status is used by controllers to communicate the result of attempting to
-  // reconcile and apply the resource (e.g. surface semantic validation errors)
-  // with users and other controllers. Each status is identified by a unique key
-  // and should only ever be updated by one controller.
-  //
-  // Status can only be updated via the WriteStatus endpoint. Attempting to do
-  // so via the Write endpoint will result in an InvalidArgument error code.
-  map<string, Status> status = 6;
-
-  // Data contains the resource's type-specific content.
-  google.protobuf.Any data = 7;
-}
-
-// Status is used by controllers to communicate the result of attempting to
-// reconcile and apply a resource (e.g. surface semantic validation errors)
-// with users and other controllers.
-message Status {
-  // ObservedGeneration identifies which generation of a resource this status
-  // related to. It can be used to determine whether the current generation of
-  // a resource has been reconciled.
-  string observed_generation = 1;
-
-  // Conditions contains a set of discreet observations about the resource in
-  // relation to the current state of the system (e.g. it is semantically valid).
-  repeated Condition conditions = 2;
-
-  // UpdatedAt is the time at which the status was last written.
-  google.protobuf.Timestamp updated_at = 3;
-}
-
-// Condition represents a discreet observation about a resource in relation to
-// the current state of the system.
-//
-// It is heavily inspired by Kubernetes' [conditions](https://bit.ly/3H9Y6IK)
-// and the Gateway API [types and reasons](https://bit.ly/3n2PPiP).
-message Condition {
-  // State represents the state of the condition (i.e. true/false/unknown).
-  enum State {
-    // STATE_UNKNOWN means that the state of the condition is unknown.
-    //
-    // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
-    STATE_UNKNOWN = 0;
-
-    // STATE_TRUE means that the state of the condition is true.
-    STATE_TRUE = 1;
-
-    // STATE_FALSE means that the state of the condition is false.
-    STATE_FALSE = 2;
-  }
-
-  // Type identifies the type of condition (e.g. "Invalid", "ResolvedRefs").
-  string type = 1;
-
-  // State represents the state of the condition (i.e. true/false/unknown).
-  State state = 2;
-
-  // Reason provides more machine-readable details about the condition (e.g.
-  // "InvalidProtocol").
-  string reason = 3;
-
-  // Message contains a human-friendly description of the status.
-  string message = 4;
-
-  // Resource identifies which resource this condition relates to, when it is
-  // not the core resource itself.
-  Reference resource = 5;
-}
-
-// Reference identifies which resource a condition relates to, when it is not
-// the core resource itself.
-message Reference {
-  // Type identifies the resource's type.
-  Type type = 1;
-
-  // Tenancy identifies the tenancy units (i.e. partition, namespace) in which
-  // the resource resides.
-  Tenancy tenancy = 2;
-
-  // Name is the user-given name of the resource (e.g. the "billing" service).
-  string name = 3;
-
-  // Section identifies which part of the resource the condition relates to.
-  string section = 4;
-}
-
-// Tombstone represents a promise to delete all of a resource's immediately
-// owned (child) resources, if any.
-message Tombstone {
-  // Owner resource identifier.
-  ID owner = 1;
-}
-
-// ResourceService provides the shared primitives for storing, querying, and
-// watching resources of different types.
-//
-// It is exposed on our external gRPC port and used internally by controllers.
-//
-// # Consistency Guarentees
-//
-// All reads are eventually consistent by default. Concretely, we guarantee
-// [monotonic reads](https://jepsen.io/consistency/models/monotonic-reads).
-//
-// That is, a read will always return results that are as up-to-date as an
-// earlier read, provided both happen on the same Consul server. But we do
-// not make any such guarantee about writes. In other words, reads won't
-// necessarily reflect earlier writes, even when made against the same server.
-//
-// This guarantee also holds between the Read and WatchList endpoints such that
-// you'll never receive an event about a resource that you cannot immediately
-// read, provided both the Read and WatchList happen on the same server.
-//
-// The Read endpoint also supports a strong consistency mode that guarantees
-// [linearizability](https://jepsen.io/consistency/models/linearizable), such
-// that a read will always return the most up-to-date version of a resource,
-// without caveat.
-//
-// This is much more expensive than eventual consistency and when using the Raft
-// storage backend, will increase load on the cluster leader, so should be used
-// sparingly.
-//
-// To opt-in to strongly consistent reads set the `x-consul-consistency-mode`
-// gRPC metadata field to "consistent".
-service ResourceService {
-  // Read a resource by ID.
-  //
-  // By default, reads are eventually consistent, but you can opt-in to strong
-  // consistency via the x-consul-consistency-mode metadata (see ResourceService
-  // docs for more info).
-  //
-  // Errors with NotFound if the resource is not found.
-  //
-  // Errors with InvalidArgument if the request fails validation or the resource
-  // is stored as a type with a different GroupVersion than was requested.
-  //
-  // Errors with PermissionDenied if the caller is not authorized to read
-  // the resource.
-  rpc Read(ReadRequest) returns (ReadResponse) {
-    option (hashicorp.consul.internal.ratelimit.spec) = {
-      operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_RESOURCE
-    };
-  }
-
-  // Write a resource.
-  //
-  // To perform a CAS (Compare-And-Swap) write, provide the current resource
-  // version in the Resource.Version field. If the given version doesn't match
-  // what is currently stored, an Aborted error code will be returned.
-  //
-  // To perform a blanket write (update regardless of the stored version),
-  // provide an empty Version in the Resource.Version field. Note that the
-  // write may still fail due to not being able to internally do a CAS write
-  // and return an Aborted error code.
-  //
-  // Resource.Id.Uid can (and by controllers, should) be provided to avoid
-  // accidentally modifying a resource if it has been deleted and recreated.
-  // If the given Uid doesn't match what is stored, a FailedPrecondition error
-  // code will be returned.
-  //
-  // It is not possible to modify the resource's status using Write. You must
-  // use WriteStatus instead.
-  rpc Write(WriteRequest) returns (WriteResponse) {
-    option (hashicorp.consul.internal.ratelimit.spec) = {
-      operation_type: OPERATION_TYPE_WRITE,
-      operation_category: OPERATION_CATEGORY_RESOURCE
-    };
-  }
-
-  // WriteStatus updates one of the resource's statuses. It should only be used
-  // by controllers.
-  //
-  // To perform a CAS (Compare-And-Swap) write, provide the current resource
-  // version in the Version field. If the given version doesn't match what is
-  // currently stored, an Aborted error code will be returned.
-  //
-  // Note: in most cases, CAS status updates are not necessary because updates
-  // are scoped to a specific status key and controllers are leader-elected so
-  // there is no chance of a conflict.
-  //
-  // Id.Uid must be provided to avoid accidentally modifying a resource if it has
-  // been deleted and recreated. If the given Uid doesn't match what is stored,
-  // a FailedPrecondition error code will be returned.
-  rpc WriteStatus(WriteStatusRequest) returns (WriteStatusResponse) {
-    option (hashicorp.consul.internal.ratelimit.spec) = {
-      operation_type: OPERATION_TYPE_WRITE,
-      operation_category: OPERATION_CATEGORY_RESOURCE
-    };
-  }
-
-  // List resources of a given type, tenancy, and optionally name prefix.
-  //
-  // To list resources across all tenancy units, provide the wildcard "*" value.
-  //
-  // Results are eventually consistent (see ResourceService docs for more info).
-  rpc List(ListRequest) returns (ListResponse) {
-    option (hashicorp.consul.internal.ratelimit.spec) = {
-      operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_RESOURCE
-    };
-  }
-
-  // List resources of a given owner.
-  //
-  // Results are eventually consistent (see ResourceService docs for more info).
-  rpc ListByOwner(ListByOwnerRequest) returns (ListByOwnerResponse) {
-    option (hashicorp.consul.internal.ratelimit.spec) = {
-      operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_RESOURCE
-    };
-  }
-
-  // Delete a resource by ID.
-  //
-  // Deleting a non-existent resource will return a successful response for
-  // idempotency.
-  //
-  // To perform a CAS (Compare-And-Swap) deletion, provide the current resource
-  // version in the Version field. If the given version doesn't match what is
-  // currently stored, an Aborted error code will be returned.
-  //
-  // Resource.Id.Uid can (and by controllers, should) be provided to avoid
-  // accidentally modifying a resource if it has been deleted and recreated.
-  // If the given Uid doesn't match what is stored, a FailedPrecondition error
-  // code will be returned.
-  rpc Delete(DeleteRequest) returns (DeleteResponse) {
-    option (hashicorp.consul.internal.ratelimit.spec) = {
-      operation_type: OPERATION_TYPE_WRITE,
-      operation_category: OPERATION_CATEGORY_RESOURCE
-    };
-  }
-
-  // WatchList watches resources of the given type, tenancy, and optionally name
-  // prefix. It returns results for the current state-of-the-world at the start
-  // of the stream, and delta events whenever resources are written or deleted.
-  //
-  // To watch resources across all tenancy units, provide the wildcard "*" value.
-  //
-  // WatchList makes no guarantees about event timeliness (e.g. an event for a
-  // write may not be received immediately), but it does guarantee that events
-  // will be emitted in the correct order. See ResourceService docs for more
-  // info about consistency guarentees.
-  //
-  // buf:lint:ignore RPC_RESPONSE_STANDARD_NAME
-  rpc WatchList(WatchListRequest) returns (stream WatchEvent) {
-    option (hashicorp.consul.internal.ratelimit.spec) = {
-      operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_RESOURCE
-    };
-  }
-}
-
-// ReadRequest contains the parameters to the Read endpoint.
-message ReadRequest {
-  // ID of the resource.
-  ID id = 1;
-}
-
-// ReadResponse contains the results of calling the Read endpoint.
-message ReadResponse {
-  // Resource that was read.
-  Resource resource = 1;
-}
-
-// ListRequest contains the parameters to the List endpoint.
-message ListRequest {
-  // Type of resource to list.
-  Type type = 1;
-
-  // Tenancy units in which to list resources. To list resources in all units,
-  // provide the wildcard "*" value.
-  Tenancy tenancy = 2;
-
-  // NamePrefix filters the results to those with a name beginning with the
-  // given prefix.
-  string name_prefix = 3;
-}
-
-// ListResponse contains the results of calling the List endpoint.
-message ListResponse {
-  // Resources that were listed.
-  repeated Resource resources = 1;
-}
-
-// ListByOwnerRequest contains the parameters to the ListByOwner endpoint.
-message ListByOwnerRequest {
-  ID owner = 1;
-}
-
-// ListByOwnerResponse contains the results of calling the ListByOwner endpoint.
-message ListByOwnerResponse {
-  // Resources that were listed.
-  repeated Resource resources = 1;
-}
-
-// WriteRequest contains the parameters to the Write endpoint.
-message WriteRequest {
-  // Resource to write.
-  Resource resource = 1;
-}
-
-// WriteResponse contains the results of calling the Write endpoint.
-message WriteResponse {
-  // Resource that was written.
-  Resource resource = 1;
-}
-
-// WriteStatusRequest contains the parameters to the WriteStatus endpoint.
-message WriteStatusRequest {
-  // ID of the resource to which the status will be written. Must contain a Uid.
-  ID id = 1;
-
-  // Version may be provided to perform a CAS (Compare-And-Swap) update of the
-  // status. If the given version doesn't match what is currently stored, an
-  // Aborted error code will be returned.
-  //
-  // Note: in most cases, CAS status updates are not necessary because updates
-  // are scoped to a specific status key and controllers are leader-elected so
-  // there is no chance of a conflict.
-  string version = 2;
-
-  // Key identifies which status will be written. Generally, each controller
-  // should write 1 status which it owns exclusively (i.e. no other controller
-  // updates it).
-  string key = 3;
-
-  // Status that will be written to the resource.
-  Status status = 4;
-}
-
-// WriteStatusResponse contains the results of calling the WriteStatus endpoint.
-message WriteStatusResponse {
-  // Resource to which the status was written.
-  Resource resource = 1;
-}
-
-// DeleteRequest contains the parameters to the Delete endpoint.
-message DeleteRequest {
-  // ID of the resource that will be deleted.
-  ID id = 1;
-
-  // Version may be provided to perform a CAS (Compare-And-Swap) deletion of the
-  // resource. If the given version doesn't match what is currently stored, an
-  // Aborted error code will be returned.
-  string version = 2;
-}
-
-// DeleteResponse contains the results of calling the Delete endpoint.
-message DeleteResponse {}
-
-// WatchListRequest contains the parameters to the WatchList endpoint.
-message WatchListRequest {
-  // Type of resource to watch.
-  Type type = 1;
-
-  // Tenancy units in which to watch resources. To list resources in all units,
-  // provide the wildcard "*" value.
-  Tenancy tenancy = 2;
-
-  // NamePrefix filters the results to those with a name beginning with the
-  // given prefix.
-  string name_prefix = 3;
-}
-
-// WatchEvent is emitted on the WatchList stream when a resource changes.
-message WatchEvent {
-  // Operation describes the type of event.
-  enum Operation {
-    // OPERATION_UNSPECIFIED is the default/zero value. You should not see it
-    // in practice.
-    OPERATION_UNSPECIFIED = 0;
-
-    // OPERATION_UPSERT indicates that the resource was written (i.e. created or
-    // updated). All events from the initial state-of-the-world will be upsert
-    // events.
-    OPERATION_UPSERT = 1;
-
-    // OPERATION_DELETED indicates that the resource was deleted.
-    OPERATION_DELETE = 2;
-  }
-
-  // Operation describes the type of event.
-  Operation operation = 1;
-
-  // Resource the event relates to.
-  Resource resource = 2;
-}
diff --git a/proto-public/pbresource/resource_grpc.pb.go b/proto-public/pbresource/resource_grpc.pb.go
deleted file mode 100644
index d15b677a270ee..0000000000000
--- a/proto-public/pbresource/resource_grpc.pb.go
+++ /dev/null
@@ -1,503 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.2.0
-// - protoc             (unknown)
-// source: pbresource/resource.proto
-
-package pbresource
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
-
-// ResourceServiceClient is the client API for ResourceService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type ResourceServiceClient interface {
-	// Read a resource by ID.
-	//
-	// By default, reads are eventually consistent, but you can opt-in to strong
-	// consistency via the x-consul-consistency-mode metadata (see ResourceService
-	// docs for more info).
-	//
-	// Errors with NotFound if the resource is not found.
-	//
-	// Errors with InvalidArgument if the request fails validation or the resource
-	// is stored as a type with a different GroupVersion than was requested.
-	//
-	// Errors with PermissionDenied if the caller is not authorized to read
-	// the resource.
-	Read(ctx context.Context, in *ReadRequest, opts ...grpc.CallOption) (*ReadResponse, error)
-	// Write a resource.
-	//
-	// To perform a CAS (Compare-And-Swap) write, provide the current resource
-	// version in the Resource.Version field. If the given version doesn't match
-	// what is currently stored, an Aborted error code will be returned.
-	//
-	// To perform a blanket write (update regardless of the stored version),
-	// provide an empty Version in the Resource.Version field. Note that the
-	// write may still fail due to not being able to internally do a CAS write
-	// and return an Aborted error code.
-	//
-	// Resource.Id.Uid can (and by controllers, should) be provided to avoid
-	// accidentally modifying a resource if it has been deleted and recreated.
-	// If the given Uid doesn't match what is stored, a FailedPrecondition error
-	// code will be returned.
-	//
-	// It is not possible to modify the resource's status using Write. You must
-	// use WriteStatus instead.
-	Write(ctx context.Context, in *WriteRequest, opts ...grpc.CallOption) (*WriteResponse, error)
-	// WriteStatus updates one of the resource's statuses. It should only be used
-	// by controllers.
-	//
-	// To perform a CAS (Compare-And-Swap) write, provide the current resource
-	// version in the Version field. If the given version doesn't match what is
-	// currently stored, an Aborted error code will be returned.
-	//
-	// Note: in most cases, CAS status updates are not necessary because updates
-	// are scoped to a specific status key and controllers are leader-elected so
-	// there is no chance of a conflict.
-	//
-	// Id.Uid must be provided to avoid accidentally modifying a resource if it has
-	// been deleted and recreated. If the given Uid doesn't match what is stored,
-	// a FailedPrecondition error code will be returned.
-	WriteStatus(ctx context.Context, in *WriteStatusRequest, opts ...grpc.CallOption) (*WriteStatusResponse, error)
-	// List resources of a given type, tenancy, and optionally name prefix.
-	//
-	// To list resources across all tenancy units, provide the wildcard "*" value.
-	//
-	// Results are eventually consistent (see ResourceService docs for more info).
-	List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error)
-	// List resources of a given owner.
-	//
-	// Results are eventually consistent (see ResourceService docs for more info).
-	ListByOwner(ctx context.Context, in *ListByOwnerRequest, opts ...grpc.CallOption) (*ListByOwnerResponse, error)
-	// Delete a resource by ID.
-	//
-	// Deleting a non-existent resource will return a successful response for
-	// idempotency.
-	//
-	// To perform a CAS (Compare-And-Swap) deletion, provide the current resource
-	// version in the Version field. If the given version doesn't match what is
-	// currently stored, an Aborted error code will be returned.
-	//
-	// Resource.Id.Uid can (and by controllers, should) be provided to avoid
-	// accidentally modifying a resource if it has been deleted and recreated.
-	// If the given Uid doesn't match what is stored, a FailedPrecondition error
-	// code will be returned.
-	Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error)
-	// WatchList watches resources of the given type, tenancy, and optionally name
-	// prefix. It returns results for the current state-of-the-world at the start
-	// of the stream, and delta events whenever resources are written or deleted.
-	//
-	// To watch resources across all tenancy units, provide the wildcard "*" value.
-	//
-	// WatchList makes no guarantees about event timeliness (e.g. an event for a
-	// write may not be received immediately), but it does guarantee that events
-	// will be emitted in the correct order. See ResourceService docs for more
-	// info about consistency guarentees.
-	//
-	// buf:lint:ignore RPC_RESPONSE_STANDARD_NAME
-	WatchList(ctx context.Context, in *WatchListRequest, opts ...grpc.CallOption) (ResourceService_WatchListClient, error)
-}
-
-type resourceServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewResourceServiceClient(cc grpc.ClientConnInterface) ResourceServiceClient {
-	return &resourceServiceClient{cc}
-}
-
-func (c *resourceServiceClient) Read(ctx context.Context, in *ReadRequest, opts ...grpc.CallOption) (*ReadResponse, error) {
-	out := new(ReadResponse)
-	err := c.cc.Invoke(ctx, "/hashicorp.consul.resource.ResourceService/Read", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *resourceServiceClient) Write(ctx context.Context, in *WriteRequest, opts ...grpc.CallOption) (*WriteResponse, error) {
-	out := new(WriteResponse)
-	err := c.cc.Invoke(ctx, "/hashicorp.consul.resource.ResourceService/Write", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *resourceServiceClient) WriteStatus(ctx context.Context, in *WriteStatusRequest, opts ...grpc.CallOption) (*WriteStatusResponse, error) {
-	out := new(WriteStatusResponse)
-	err := c.cc.Invoke(ctx, "/hashicorp.consul.resource.ResourceService/WriteStatus", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *resourceServiceClient) List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) {
-	out := new(ListResponse)
-	err := c.cc.Invoke(ctx, "/hashicorp.consul.resource.ResourceService/List", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *resourceServiceClient) ListByOwner(ctx context.Context, in *ListByOwnerRequest, opts ...grpc.CallOption) (*ListByOwnerResponse, error) {
-	out := new(ListByOwnerResponse)
-	err := c.cc.Invoke(ctx, "/hashicorp.consul.resource.ResourceService/ListByOwner", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *resourceServiceClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) {
-	out := new(DeleteResponse)
-	err := c.cc.Invoke(ctx, "/hashicorp.consul.resource.ResourceService/Delete", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *resourceServiceClient) WatchList(ctx context.Context, in *WatchListRequest, opts ...grpc.CallOption) (ResourceService_WatchListClient, error) {
-	stream, err := c.cc.NewStream(ctx, &ResourceService_ServiceDesc.Streams[0], "/hashicorp.consul.resource.ResourceService/WatchList", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &resourceServiceWatchListClient{stream}
-	if err := x.ClientStream.SendMsg(in); err != nil {
-		return nil, err
-	}
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	return x, nil
-}
-
-type ResourceService_WatchListClient interface {
-	Recv() (*WatchEvent, error)
-	grpc.ClientStream
-}
-
-type resourceServiceWatchListClient struct {
-	grpc.ClientStream
-}
-
-func (x *resourceServiceWatchListClient) Recv() (*WatchEvent, error) {
-	m := new(WatchEvent)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-// ResourceServiceServer is the server API for ResourceService service.
-// All implementations should embed UnimplementedResourceServiceServer
-// for forward compatibility
-type ResourceServiceServer interface {
-	// Read a resource by ID.
-	//
-	// By default, reads are eventually consistent, but you can opt-in to strong
-	// consistency via the x-consul-consistency-mode metadata (see ResourceService
-	// docs for more info).
-	//
-	// Errors with NotFound if the resource is not found.
-	//
-	// Errors with InvalidArgument if the request fails validation or the resource
-	// is stored as a type with a different GroupVersion than was requested.
-	//
-	// Errors with PermissionDenied if the caller is not authorized to read
-	// the resource.
-	Read(context.Context, *ReadRequest) (*ReadResponse, error)
-	// Write a resource.
-	//
-	// To perform a CAS (Compare-And-Swap) write, provide the current resource
-	// version in the Resource.Version field. If the given version doesn't match
-	// what is currently stored, an Aborted error code will be returned.
-	//
-	// To perform a blanket write (update regardless of the stored version),
-	// provide an empty Version in the Resource.Version field. Note that the
-	// write may still fail due to not being able to internally do a CAS write
-	// and return an Aborted error code.
-	//
-	// Resource.Id.Uid can (and by controllers, should) be provided to avoid
-	// accidentally modifying a resource if it has been deleted and recreated.
-	// If the given Uid doesn't match what is stored, a FailedPrecondition error
-	// code will be returned.
-	//
-	// It is not possible to modify the resource's status using Write. You must
-	// use WriteStatus instead.
-	Write(context.Context, *WriteRequest) (*WriteResponse, error)
-	// WriteStatus updates one of the resource's statuses. It should only be used
-	// by controllers.
-	//
-	// To perform a CAS (Compare-And-Swap) write, provide the current resource
-	// version in the Version field. If the given version doesn't match what is
-	// currently stored, an Aborted error code will be returned.
-	//
-	// Note: in most cases, CAS status updates are not necessary because updates
-	// are scoped to a specific status key and controllers are leader-elected so
-	// there is no chance of a conflict.
-	//
-	// Id.Uid must be provided to avoid accidentally modifying a resource if it has
-	// been deleted and recreated. If the given Uid doesn't match what is stored,
-	// a FailedPrecondition error code will be returned.
-	WriteStatus(context.Context, *WriteStatusRequest) (*WriteStatusResponse, error)
-	// List resources of a given type, tenancy, and optionally name prefix.
-	//
-	// To list resources across all tenancy units, provide the wildcard "*" value.
-	//
-	// Results are eventually consistent (see ResourceService docs for more info).
-	List(context.Context, *ListRequest) (*ListResponse, error)
-	// List resources of a given owner.
-	//
-	// Results are eventually consistent (see ResourceService docs for more info).
-	ListByOwner(context.Context, *ListByOwnerRequest) (*ListByOwnerResponse, error)
-	// Delete a resource by ID.
-	//
-	// Deleting a non-existent resource will return a successful response for
-	// idempotency.
-	//
-	// To perform a CAS (Compare-And-Swap) deletion, provide the current resource
-	// version in the Version field. If the given version doesn't match what is
-	// currently stored, an Aborted error code will be returned.
-	//
-	// Resource.Id.Uid can (and by controllers, should) be provided to avoid
-	// accidentally modifying a resource if it has been deleted and recreated.
-	// If the given Uid doesn't match what is stored, a FailedPrecondition error
-	// code will be returned.
-	Delete(context.Context, *DeleteRequest) (*DeleteResponse, error)
-	// WatchList watches resources of the given type, tenancy, and optionally name
-	// prefix. It returns results for the current state-of-the-world at the start
-	// of the stream, and delta events whenever resources are written or deleted.
-	//
-	// To watch resources across all tenancy units, provide the wildcard "*" value.
-	//
-	// WatchList makes no guarantees about event timeliness (e.g. an event for a
-	// write may not be received immediately), but it does guarantee that events
-	// will be emitted in the correct order. See ResourceService docs for more
-	// info about consistency guarentees.
-	//
-	// buf:lint:ignore RPC_RESPONSE_STANDARD_NAME
-	WatchList(*WatchListRequest, ResourceService_WatchListServer) error
-}
-
-// UnimplementedResourceServiceServer should be embedded to have forward compatible implementations.
-type UnimplementedResourceServiceServer struct {
-}
-
-func (UnimplementedResourceServiceServer) Read(context.Context, *ReadRequest) (*ReadResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Read not implemented")
-}
-func (UnimplementedResourceServiceServer) Write(context.Context, *WriteRequest) (*WriteResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Write not implemented")
-}
-func (UnimplementedResourceServiceServer) WriteStatus(context.Context, *WriteStatusRequest) (*WriteStatusResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method WriteStatus not implemented")
-}
-func (UnimplementedResourceServiceServer) List(context.Context, *ListRequest) (*ListResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method List not implemented")
-}
-func (UnimplementedResourceServiceServer) ListByOwner(context.Context, *ListByOwnerRequest) (*ListByOwnerResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ListByOwner not implemented")
-}
-func (UnimplementedResourceServiceServer) Delete(context.Context, *DeleteRequest) (*DeleteResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented")
-}
-func (UnimplementedResourceServiceServer) WatchList(*WatchListRequest, ResourceService_WatchListServer) error {
-	return status.Errorf(codes.Unimplemented, "method WatchList not implemented")
-}
-
-// UnsafeResourceServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to ResourceServiceServer will
-// result in compilation errors.
-type UnsafeResourceServiceServer interface {
-	mustEmbedUnimplementedResourceServiceServer()
-}
-
-func RegisterResourceServiceServer(s grpc.ServiceRegistrar, srv ResourceServiceServer) {
-	s.RegisterService(&ResourceService_ServiceDesc, srv)
-}
-
-func _ResourceService_Read_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ReadRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ResourceServiceServer).Read(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/hashicorp.consul.resource.ResourceService/Read",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ResourceServiceServer).Read(ctx, req.(*ReadRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ResourceService_Write_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(WriteRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ResourceServiceServer).Write(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/hashicorp.consul.resource.ResourceService/Write",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ResourceServiceServer).Write(ctx, req.(*WriteRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ResourceService_WriteStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(WriteStatusRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ResourceServiceServer).WriteStatus(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/hashicorp.consul.resource.ResourceService/WriteStatus",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ResourceServiceServer).WriteStatus(ctx, req.(*WriteStatusRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ResourceService_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ResourceServiceServer).List(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/hashicorp.consul.resource.ResourceService/List",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ResourceServiceServer).List(ctx, req.(*ListRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ResourceService_ListByOwner_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListByOwnerRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ResourceServiceServer).ListByOwner(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/hashicorp.consul.resource.ResourceService/ListByOwner",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ResourceServiceServer).ListByOwner(ctx, req.(*ListByOwnerRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ResourceService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ResourceServiceServer).Delete(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/hashicorp.consul.resource.ResourceService/Delete",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ResourceServiceServer).Delete(ctx, req.(*DeleteRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ResourceService_WatchList_Handler(srv interface{}, stream grpc.ServerStream) error {
-	m := new(WatchListRequest)
-	if err := stream.RecvMsg(m); err != nil {
-		return err
-	}
-	return srv.(ResourceServiceServer).WatchList(m, &resourceServiceWatchListServer{stream})
-}
-
-type ResourceService_WatchListServer interface {
-	Send(*WatchEvent) error
-	grpc.ServerStream
-}
-
-type resourceServiceWatchListServer struct {
-	grpc.ServerStream
-}
-
-func (x *resourceServiceWatchListServer) Send(m *WatchEvent) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-// ResourceService_ServiceDesc is the grpc.ServiceDesc for ResourceService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var ResourceService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "hashicorp.consul.resource.ResourceService",
-	HandlerType: (*ResourceServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Read",
-			Handler:    _ResourceService_Read_Handler,
-		},
-		{
-			MethodName: "Write",
-			Handler:    _ResourceService_Write_Handler,
-		},
-		{
-			MethodName: "WriteStatus",
-			Handler:    _ResourceService_WriteStatus_Handler,
-		},
-		{
-			MethodName: "List",
-			Handler:    _ResourceService_List_Handler,
-		},
-		{
-			MethodName: "ListByOwner",
-			Handler:    _ResourceService_ListByOwner_Handler,
-		},
-		{
-			MethodName: "Delete",
-			Handler:    _ResourceService_Delete_Handler,
-		},
-	},
-	Streams: []grpc.StreamDesc{
-		{
-			StreamName:    "WatchList",
-			Handler:       _ResourceService_WatchList_Handler,
-			ServerStreams: true,
-		},
-	},
-	Metadata: "pbresource/resource.proto",
-}
diff --git a/proto-public/pbserverdiscovery/serverdiscovery.pb.binary.go b/proto-public/pbserverdiscovery/serverdiscovery.pb.binary.go
index 6eb65295e9297..645d83eed5811 100644
--- a/proto-public/pbserverdiscovery/serverdiscovery.pb.binary.go
+++ b/proto-public/pbserverdiscovery/serverdiscovery.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbserverdiscovery/serverdiscovery.proto
+// source: proto-public/pbserverdiscovery/serverdiscovery.proto
 
 package pbserverdiscovery
 
diff --git a/proto-public/pbserverdiscovery/serverdiscovery.pb.go b/proto-public/pbserverdiscovery/serverdiscovery.pb.go
index 37b3b592e7d8f..47a6d4c8d44f7 100644
--- a/proto-public/pbserverdiscovery/serverdiscovery.pb.go
+++ b/proto-public/pbserverdiscovery/serverdiscovery.pb.go
@@ -1,14 +1,11 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Package serverdiscovery provides a service on Consul servers to discover the set of servers
 // currently able to handle incoming requests.
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
+// 	protoc-gen-go v1.28.1
 // 	protoc        (unknown)
-// source: pbserverdiscovery/serverdiscovery.proto
+// source: proto-public/pbserverdiscovery/serverdiscovery.proto
 
 package pbserverdiscovery
 
@@ -40,7 +37,7 @@ type WatchServersRequest struct {
 func (x *WatchServersRequest) Reset() {
 	*x = WatchServersRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbserverdiscovery_serverdiscovery_proto_msgTypes[0]
+		mi := &file_proto_public_pbserverdiscovery_serverdiscovery_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -53,7 +50,7 @@ func (x *WatchServersRequest) String() string {
 func (*WatchServersRequest) ProtoMessage() {}
 
 func (x *WatchServersRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_pbserverdiscovery_serverdiscovery_proto_msgTypes[0]
+	mi := &file_proto_public_pbserverdiscovery_serverdiscovery_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -66,7 +63,7 @@ func (x *WatchServersRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WatchServersRequest.ProtoReflect.Descriptor instead.
 func (*WatchServersRequest) Descriptor() ([]byte, []int) {
-	return file_pbserverdiscovery_serverdiscovery_proto_rawDescGZIP(), []int{0}
+	return file_proto_public_pbserverdiscovery_serverdiscovery_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *WatchServersRequest) GetWan() bool {
@@ -88,7 +85,7 @@ type WatchServersResponse struct {
 func (x *WatchServersResponse) Reset() {
 	*x = WatchServersResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbserverdiscovery_serverdiscovery_proto_msgTypes[1]
+		mi := &file_proto_public_pbserverdiscovery_serverdiscovery_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -101,7 +98,7 @@ func (x *WatchServersResponse) String() string {
 func (*WatchServersResponse) ProtoMessage() {}
 
 func (x *WatchServersResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_pbserverdiscovery_serverdiscovery_proto_msgTypes[1]
+	mi := &file_proto_public_pbserverdiscovery_serverdiscovery_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -114,7 +111,7 @@ func (x *WatchServersResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WatchServersResponse.ProtoReflect.Descriptor instead.
 func (*WatchServersResponse) Descriptor() ([]byte, []int) {
-	return file_pbserverdiscovery_serverdiscovery_proto_rawDescGZIP(), []int{1}
+	return file_proto_public_pbserverdiscovery_serverdiscovery_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *WatchServersResponse) GetServers() []*Server {
@@ -140,7 +137,7 @@ type Server struct {
 func (x *Server) Reset() {
 	*x = Server{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_pbserverdiscovery_serverdiscovery_proto_msgTypes[2]
+		mi := &file_proto_public_pbserverdiscovery_serverdiscovery_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -153,7 +150,7 @@ func (x *Server) String() string {
 func (*Server) ProtoMessage() {}
 
 func (x *Server) ProtoReflect() protoreflect.Message {
-	mi := &file_pbserverdiscovery_serverdiscovery_proto_msgTypes[2]
+	mi := &file_proto_public_pbserverdiscovery_serverdiscovery_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -166,7 +163,7 @@ func (x *Server) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Server.ProtoReflect.Descriptor instead.
 func (*Server) Descriptor() ([]byte, []int) {
-	return file_pbserverdiscovery_serverdiscovery_proto_rawDescGZIP(), []int{2}
+	return file_proto_public_pbserverdiscovery_serverdiscovery_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *Server) GetId() string {
@@ -190,80 +187,81 @@ func (x *Server) GetVersion() string {
 	return ""
 }
 
-var File_pbserverdiscovery_serverdiscovery_proto protoreflect.FileDescriptor
-
-var file_pbserverdiscovery_serverdiscovery_proto_rawDesc = []byte{
-	0x0a, 0x27, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76,
-	0x65, 0x72, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76,
-	0x65, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x1a, 0x25, 0x61, 0x6e, 0x6e,
-	0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d,
-	0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x22, 0x27, 0x0a, 0x13, 0x57, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x72, 0x76, 0x65,
-	0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x77, 0x61, 0x6e,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x77, 0x61, 0x6e, 0x22, 0x5a, 0x0a, 0x14, 0x57,
-	0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a, 0x07, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69,
-	0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x07,
-	0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x22, 0x4c, 0x0a, 0x06, 0x53, 0x65, 0x72, 0x76, 0x65,
-	0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
-	0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x76,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65,
-	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0xa4, 0x01, 0x0a, 0x16, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x12, 0x89, 0x01, 0x0a, 0x0c, 0x57, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x73, 0x12, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f,
-	0x76, 0x65, 0x72, 0x79, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x57, 0x61, 0x74, 0x63,
-	0x68, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x06, 0x30, 0x01, 0x42, 0x9a, 0x02, 0x0a,
-	0x24, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+var File_proto_public_pbserverdiscovery_serverdiscovery_proto protoreflect.FileDescriptor
+
+var file_proto_public_pbserverdiscovery_serverdiscovery_proto_rawDesc = []byte{
+	0x0a, 0x34, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70,
+	0x62, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
+	0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64,
+	0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x1a, 0x32, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d,
+	0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61, 0x74,
+	0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x13,
+	0x57, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x77, 0x61, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x03, 0x77, 0x61, 0x6e, 0x22, 0x5a, 0x0a, 0x14, 0x57, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a,
+	0x07, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
+	0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x07, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
+	0x73, 0x22, 0x4c, 0x0a, 0x06, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61,
+	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32,
+	0xa2, 0x01, 0x0a, 0x16, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76,
+	0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x87, 0x01, 0x0a, 0x0c, 0x57,
+	0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x12, 0x35, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x57,
+	0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
 	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63,
-	0x6f, 0x76, 0x65, 0x72, 0x79, 0x42, 0x14, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73,
-	0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x53, 0xaa,
-	0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65,
-	0x72, 0x79, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63,
-	0x6f, 0x76, 0x65, 0x72, 0x79, 0xe2, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64,
-	0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x22, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x6f, 0x76, 0x65, 0x72, 0x79, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x72, 0x76, 0x65,
+	0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02,
+	0x08, 0x02, 0x30, 0x01, 0x42, 0x9a, 0x02, 0x0a, 0x24, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x42, 0x14, 0x53,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f,
+	0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
+	0x79, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x53, 0xaa, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65,
+	0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x53, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0xe2, 0x02, 0x2c,
+	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x5c, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79,
+	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x22, 0x48,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72,
+	0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_pbserverdiscovery_serverdiscovery_proto_rawDescOnce sync.Once
-	file_pbserverdiscovery_serverdiscovery_proto_rawDescData = file_pbserverdiscovery_serverdiscovery_proto_rawDesc
+	file_proto_public_pbserverdiscovery_serverdiscovery_proto_rawDescOnce sync.Once
+	file_proto_public_pbserverdiscovery_serverdiscovery_proto_rawDescData = file_proto_public_pbserverdiscovery_serverdiscovery_proto_rawDesc
 )
 
-func file_pbserverdiscovery_serverdiscovery_proto_rawDescGZIP() []byte {
-	file_pbserverdiscovery_serverdiscovery_proto_rawDescOnce.Do(func() {
-		file_pbserverdiscovery_serverdiscovery_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbserverdiscovery_serverdiscovery_proto_rawDescData)
+func file_proto_public_pbserverdiscovery_serverdiscovery_proto_rawDescGZIP() []byte {
+	file_proto_public_pbserverdiscovery_serverdiscovery_proto_rawDescOnce.Do(func() {
+		file_proto_public_pbserverdiscovery_serverdiscovery_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_public_pbserverdiscovery_serverdiscovery_proto_rawDescData)
 	})
-	return file_pbserverdiscovery_serverdiscovery_proto_rawDescData
+	return file_proto_public_pbserverdiscovery_serverdiscovery_proto_rawDescData
 }
 
-var file_pbserverdiscovery_serverdiscovery_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_pbserverdiscovery_serverdiscovery_proto_goTypes = []interface{}{
+var file_proto_public_pbserverdiscovery_serverdiscovery_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_proto_public_pbserverdiscovery_serverdiscovery_proto_goTypes = []interface{}{
 	(*WatchServersRequest)(nil),  // 0: hashicorp.consul.serverdiscovery.WatchServersRequest
 	(*WatchServersResponse)(nil), // 1: hashicorp.consul.serverdiscovery.WatchServersResponse
 	(*Server)(nil),               // 2: hashicorp.consul.serverdiscovery.Server
 }
-var file_pbserverdiscovery_serverdiscovery_proto_depIdxs = []int32{
+var file_proto_public_pbserverdiscovery_serverdiscovery_proto_depIdxs = []int32{
 	2, // 0: hashicorp.consul.serverdiscovery.WatchServersResponse.servers:type_name -> hashicorp.consul.serverdiscovery.Server
 	0, // 1: hashicorp.consul.serverdiscovery.ServerDiscoveryService.WatchServers:input_type -> hashicorp.consul.serverdiscovery.WatchServersRequest
 	1, // 2: hashicorp.consul.serverdiscovery.ServerDiscoveryService.WatchServers:output_type -> hashicorp.consul.serverdiscovery.WatchServersResponse
@@ -274,13 +272,13 @@ var file_pbserverdiscovery_serverdiscovery_proto_depIdxs = []int32{
 	0, // [0:1] is the sub-list for field type_name
 }
 
-func init() { file_pbserverdiscovery_serverdiscovery_proto_init() }
-func file_pbserverdiscovery_serverdiscovery_proto_init() {
-	if File_pbserverdiscovery_serverdiscovery_proto != nil {
+func init() { file_proto_public_pbserverdiscovery_serverdiscovery_proto_init() }
+func file_proto_public_pbserverdiscovery_serverdiscovery_proto_init() {
+	if File_proto_public_pbserverdiscovery_serverdiscovery_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_pbserverdiscovery_serverdiscovery_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbserverdiscovery_serverdiscovery_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*WatchServersRequest); i {
 			case 0:
 				return &v.state
@@ -292,7 +290,7 @@ func file_pbserverdiscovery_serverdiscovery_proto_init() {
 				return nil
 			}
 		}
-		file_pbserverdiscovery_serverdiscovery_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbserverdiscovery_serverdiscovery_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*WatchServersResponse); i {
 			case 0:
 				return &v.state
@@ -304,7 +302,7 @@ func file_pbserverdiscovery_serverdiscovery_proto_init() {
 				return nil
 			}
 		}
-		file_pbserverdiscovery_serverdiscovery_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_proto_public_pbserverdiscovery_serverdiscovery_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Server); i {
 			case 0:
 				return &v.state
@@ -321,18 +319,18 @@ func file_pbserverdiscovery_serverdiscovery_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbserverdiscovery_serverdiscovery_proto_rawDesc,
+			RawDescriptor: file_proto_public_pbserverdiscovery_serverdiscovery_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   3,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_pbserverdiscovery_serverdiscovery_proto_goTypes,
-		DependencyIndexes: file_pbserverdiscovery_serverdiscovery_proto_depIdxs,
-		MessageInfos:      file_pbserverdiscovery_serverdiscovery_proto_msgTypes,
+		GoTypes:           file_proto_public_pbserverdiscovery_serverdiscovery_proto_goTypes,
+		DependencyIndexes: file_proto_public_pbserverdiscovery_serverdiscovery_proto_depIdxs,
+		MessageInfos:      file_proto_public_pbserverdiscovery_serverdiscovery_proto_msgTypes,
 	}.Build()
-	File_pbserverdiscovery_serverdiscovery_proto = out.File
-	file_pbserverdiscovery_serverdiscovery_proto_rawDesc = nil
-	file_pbserverdiscovery_serverdiscovery_proto_goTypes = nil
-	file_pbserverdiscovery_serverdiscovery_proto_depIdxs = nil
+	File_proto_public_pbserverdiscovery_serverdiscovery_proto = out.File
+	file_proto_public_pbserverdiscovery_serverdiscovery_proto_rawDesc = nil
+	file_proto_public_pbserverdiscovery_serverdiscovery_proto_goTypes = nil
+	file_proto_public_pbserverdiscovery_serverdiscovery_proto_depIdxs = nil
 }
diff --git a/proto-public/pbserverdiscovery/serverdiscovery.proto b/proto-public/pbserverdiscovery/serverdiscovery.proto
index c2c06aed7256a..a4a41e9631932 100644
--- a/proto-public/pbserverdiscovery/serverdiscovery.proto
+++ b/proto-public/pbserverdiscovery/serverdiscovery.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Package serverdiscovery provides a service on Consul servers to discover the set of servers
 // currently able to handle incoming requests.
 
@@ -8,7 +5,7 @@ syntax = "proto3";
 
 package hashicorp.consul.serverdiscovery;
 
-import "annotations/ratelimit/ratelimit.proto";
+import "proto-public/annotations/ratelimit/ratelimit.proto";
 
 service ServerDiscoveryService {
   // WatchServers will stream back sets of ready servers as they change such as
@@ -18,7 +15,6 @@ service ServerDiscoveryService {
   rpc WatchServers(WatchServersRequest) returns (stream WatchServersResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_SERVER_DISCOVERY
     };
   }
 }
diff --git a/proto-public/pbserverdiscovery/serverdiscovery_grpc.pb.go b/proto-public/pbserverdiscovery/serverdiscovery_grpc.pb.go
index c690eb37542cc..bb75ee84ee3ef 100644
--- a/proto-public/pbserverdiscovery/serverdiscovery_grpc.pb.go
+++ b/proto-public/pbserverdiscovery/serverdiscovery_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             (unknown)
-// source: pbserverdiscovery/serverdiscovery.proto
+// source: proto-public/pbserverdiscovery/serverdiscovery.proto
 
 package pbserverdiscovery
 
@@ -134,5 +134,5 @@ var ServerDiscoveryService_ServiceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "pbserverdiscovery/serverdiscovery.proto",
+	Metadata: "proto-public/pbserverdiscovery/serverdiscovery.proto",
 }
diff --git a/proto-public/pbtenancy/v1alpha1/namespace.pb.binary.go b/proto-public/pbtenancy/v1alpha1/namespace.pb.binary.go
deleted file mode 100644
index f6097062d32dc..0000000000000
--- a/proto-public/pbtenancy/v1alpha1/namespace.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbtenancy/v1alpha1/namespace.proto
-
-package tenancyv1alpha1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Namespace) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Namespace) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbtenancy/v1alpha1/namespace.pb.go b/proto-public/pbtenancy/v1alpha1/namespace.pb.go
deleted file mode 100644
index e7fec0b5d0086..0000000000000
--- a/proto-public/pbtenancy/v1alpha1/namespace.pb.go
+++ /dev/null
@@ -1,172 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: pbtenancy/v1alpha1/namespace.proto
-
-package tenancyv1alpha1
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// The name of the Namespace is in the outer Resource.ID.Name.
-// It must be unique within a partition and must be a
-// DNS hostname. There are also other reserved names that may not be used.
-type Namespace struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Description is where the user puts any information they want
-	// about the namespace. It is not used internally.
-	Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"`
-}
-
-func (x *Namespace) Reset() {
-	*x = Namespace{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbtenancy_v1alpha1_namespace_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Namespace) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Namespace) ProtoMessage() {}
-
-func (x *Namespace) ProtoReflect() protoreflect.Message {
-	mi := &file_pbtenancy_v1alpha1_namespace_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Namespace.ProtoReflect.Descriptor instead.
-func (*Namespace) Descriptor() ([]byte, []int) {
-	return file_pbtenancy_v1alpha1_namespace_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Namespace) GetDescription() string {
-	if x != nil {
-		return x.Description
-	}
-	return ""
-}
-
-var File_pbtenancy_v1alpha1_namespace_proto protoreflect.FileDescriptor
-
-var file_pbtenancy_v1alpha1_namespace_proto_rawDesc = []byte{
-	0x0a, 0x22, 0x70, 0x62, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2f, 0x76, 0x31, 0x61, 0x6c,
-	0x70, 0x68, 0x61, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2e, 0x76,
-	0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x35, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x02, 0x42, 0xab, 0x02, 0x0a,
-	0x25, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2e, 0x76, 0x31,
-	0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x42, 0x0e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c,
-	0x69, 0x63, 0x2f, 0x70, 0x62, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2f, 0x76, 0x31, 0x61,
-	0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x76, 0x31, 0x61,
-	0x6c, 0x70, 0x68, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x54, 0xaa, 0x02, 0x21, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x54,
-	0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2e, 0x56, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca,
-	0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x5c, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x5c, 0x56, 0x31, 0x61, 0x6c, 0x70,
-	0x68, 0x61, 0x31, 0xe2, 0x02, 0x2d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x5c, 0x56,
-	0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64,
-	0x61, 0x74, 0x61, 0xea, 0x02, 0x24, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a,
-	0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79,
-	0x3a, 0x3a, 0x56, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
-}
-
-var (
-	file_pbtenancy_v1alpha1_namespace_proto_rawDescOnce sync.Once
-	file_pbtenancy_v1alpha1_namespace_proto_rawDescData = file_pbtenancy_v1alpha1_namespace_proto_rawDesc
-)
-
-func file_pbtenancy_v1alpha1_namespace_proto_rawDescGZIP() []byte {
-	file_pbtenancy_v1alpha1_namespace_proto_rawDescOnce.Do(func() {
-		file_pbtenancy_v1alpha1_namespace_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbtenancy_v1alpha1_namespace_proto_rawDescData)
-	})
-	return file_pbtenancy_v1alpha1_namespace_proto_rawDescData
-}
-
-var file_pbtenancy_v1alpha1_namespace_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbtenancy_v1alpha1_namespace_proto_goTypes = []interface{}{
-	(*Namespace)(nil), // 0: hashicorp.consul.tenancy.v1alpha1.Namespace
-}
-var file_pbtenancy_v1alpha1_namespace_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_pbtenancy_v1alpha1_namespace_proto_init() }
-func file_pbtenancy_v1alpha1_namespace_proto_init() {
-	if File_pbtenancy_v1alpha1_namespace_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbtenancy_v1alpha1_namespace_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Namespace); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbtenancy_v1alpha1_namespace_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbtenancy_v1alpha1_namespace_proto_goTypes,
-		DependencyIndexes: file_pbtenancy_v1alpha1_namespace_proto_depIdxs,
-		MessageInfos:      file_pbtenancy_v1alpha1_namespace_proto_msgTypes,
-	}.Build()
-	File_pbtenancy_v1alpha1_namespace_proto = out.File
-	file_pbtenancy_v1alpha1_namespace_proto_rawDesc = nil
-	file_pbtenancy_v1alpha1_namespace_proto_goTypes = nil
-	file_pbtenancy_v1alpha1_namespace_proto_depIdxs = nil
-}
diff --git a/proto-public/pbtenancy/v1alpha1/namespace.proto b/proto-public/pbtenancy/v1alpha1/namespace.proto
deleted file mode 100644
index e90b10c1e573c..0000000000000
--- a/proto-public/pbtenancy/v1alpha1/namespace.proto
+++ /dev/null
@@ -1,16 +0,0 @@
-syntax = "proto3";
-
-package hashicorp.consul.tenancy.v1alpha1;
-
-import "pbresource/annotations.proto";
-
-// The name of the Namespace is in the outer Resource.ID.Name.
-// It must be unique within a partition and must be a
-// DNS hostname. There are also other reserved names that may not be used.
-message Namespace {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_PARTITION};
-
-  // Description is where the user puts any information they want
-  // about the namespace. It is not used internally.
-  string description = 1;
-}
diff --git a/proto-public/pbtenancy/v1alpha1/resource_types.gen.go b/proto-public/pbtenancy/v1alpha1/resource_types.gen.go
deleted file mode 100644
index f1b6f70cf1038..0000000000000
--- a/proto-public/pbtenancy/v1alpha1/resource_types.gen.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Code generated by protoc-gen-resource-types. DO NOT EDIT.
-
-package tenancyv1alpha1
-
-import (
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	GroupName = "tenancy"
-	Version   = "v1alpha1"
-
-	NamespaceKind = "Namespace"
-)
-
-var (
-	NamespaceType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         NamespaceKind,
-	}
-)
diff --git a/proto/buf.gen.yaml b/proto/buf.gen.yaml
index efb9703b10bae..cd296f741a42b 100644
--- a/proto/buf.gen.yaml
+++ b/proto/buf.gen.yaml
@@ -1,13 +1,14 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: github.com/hashicorp/consul/proto
-    override:
-      buf.build/hashicorp/consul: github.com/hashicorp/consul/proto-public
+    # this is not github.com/hashicorp/consul/proto because we are going
+    # to execute buf generate from the top level directory so that the filepaths
+    # contain the full path within the repo. This avoids registration conflicts
+    # in protocolbuffers/protobuf-go when Consul starts. Those conflicts would
+    # have been due to a protobuf file being registered to a global registry
+    # using a relative file name.
+    default: github.com/hashicorp/consul
 plugins:
   - name: go
     out: .
diff --git a/proto/buf.yaml b/proto/buf.yaml
index d367418c824b0..d0218e3f8eadb 100644
--- a/proto/buf.yaml
+++ b/proto/buf.yaml
@@ -1,9 +1,4 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 version: v1
-deps:
-  - buf.build/hashicorp/consul
 lint:
   use:
     - DEFAULT
@@ -23,7 +18,6 @@ lint:
     - ONEOF_LOWER_SNAKE_CASE
     - ENUM_VALUE_PREFIX
   service_suffix: ""
-  rpc_allow_google_protobuf_empty_responses: true
 breaking:
   use:
     - FILE
diff --git a/proto/pbacl/acl.go b/proto/pbacl/acl.go
new file mode 100644
index 0000000000000..ec64d59299013
--- /dev/null
+++ b/proto/pbacl/acl.go
@@ -0,0 +1,19 @@
+package pbacl
+
+import (
+	"github.com/hashicorp/consul/api"
+)
+
+func (a *ACLLink) ToAPI() api.ACLLink {
+	return api.ACLLink{
+		ID:   a.ID,
+		Name: a.Name,
+	}
+}
+
+func ACLLinkFromAPI(a api.ACLLink) *ACLLink {
+	return &ACLLink{
+		ID:   a.ID,
+		Name: a.Name,
+	}
+}
diff --git a/proto/private/pbacl/acl.pb.binary.go b/proto/pbacl/acl.pb.binary.go
similarity index 91%
rename from proto/private/pbacl/acl.pb.binary.go
rename to proto/pbacl/acl.pb.binary.go
index f96b7a115bdfd..9f93a6f174318 100644
--- a/proto/private/pbacl/acl.pb.binary.go
+++ b/proto/pbacl/acl.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbacl/acl.proto
+// source: proto/pbacl/acl.proto
 
 package pbacl
 
diff --git a/proto/pbacl/acl.pb.go b/proto/pbacl/acl.pb.go
new file mode 100644
index 0000000000000..430666921345e
--- /dev/null
+++ b/proto/pbacl/acl.pb.go
@@ -0,0 +1,167 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: proto/pbacl/acl.proto
+
+package pbacl
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type ACLLink struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
+	// @gotags: hash:ignore-"
+	Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
+}
+
+func (x *ACLLink) Reset() {
+	*x = ACLLink{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbacl_acl_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ACLLink) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ACLLink) ProtoMessage() {}
+
+func (x *ACLLink) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbacl_acl_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ACLLink.ProtoReflect.Descriptor instead.
+func (*ACLLink) Descriptor() ([]byte, []int) {
+	return file_proto_pbacl_acl_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *ACLLink) GetID() string {
+	if x != nil {
+		return x.ID
+	}
+	return ""
+}
+
+func (x *ACLLink) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+var File_proto_pbacl_acl_proto protoreflect.FileDescriptor
+
+var file_proto_pbacl_acl_proto_rawDesc = []byte{
+	0x0a, 0x15, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x61, 0x63, 0x6c, 0x2f, 0x61, 0x63,
+	0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x61, 0x63, 0x6c, 0x22, 0x2d, 0x0a, 0x07, 0x41, 0x43, 0x4c, 0x4c, 0x69, 0x6e,
+	0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49,
+	0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0xee, 0x01, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x61, 0x63, 0x6c, 0x42, 0x08, 0x41, 0x63, 0x6c,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x61, 0x63, 0x6c,
+	0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x41, 0xaa, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x2e, 0x41, 0x63, 0x6c, 0xca, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x5c, 0x41, 0x63, 0x6c, 0xe2, 0x02, 0x29, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x5c, 0x41, 0x63, 0x6c, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0xea, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a,
+	0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x3a, 0x3a, 0x41, 0x63, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_pbacl_acl_proto_rawDescOnce sync.Once
+	file_proto_pbacl_acl_proto_rawDescData = file_proto_pbacl_acl_proto_rawDesc
+)
+
+func file_proto_pbacl_acl_proto_rawDescGZIP() []byte {
+	file_proto_pbacl_acl_proto_rawDescOnce.Do(func() {
+		file_proto_pbacl_acl_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbacl_acl_proto_rawDescData)
+	})
+	return file_proto_pbacl_acl_proto_rawDescData
+}
+
+var file_proto_pbacl_acl_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_proto_pbacl_acl_proto_goTypes = []interface{}{
+	(*ACLLink)(nil), // 0: hashicorp.consul.internal.acl.ACLLink
+}
+var file_proto_pbacl_acl_proto_depIdxs = []int32{
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbacl_acl_proto_init() }
+func file_proto_pbacl_acl_proto_init() {
+	if File_proto_pbacl_acl_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbacl_acl_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ACLLink); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbacl_acl_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbacl_acl_proto_goTypes,
+		DependencyIndexes: file_proto_pbacl_acl_proto_depIdxs,
+		MessageInfos:      file_proto_pbacl_acl_proto_msgTypes,
+	}.Build()
+	File_proto_pbacl_acl_proto = out.File
+	file_proto_pbacl_acl_proto_rawDesc = nil
+	file_proto_pbacl_acl_proto_goTypes = nil
+	file_proto_pbacl_acl_proto_depIdxs = nil
+}
diff --git a/proto/pbacl/acl.proto b/proto/pbacl/acl.proto
new file mode 100644
index 0000000000000..299149c2e055f
--- /dev/null
+++ b/proto/pbacl/acl.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package hashicorp.consul.internal.acl;
+
+message ACLLink {
+  string ID = 1;
+  // @gotags: hash:ignore-"
+  string Name = 2;
+}
diff --git a/proto/private/pbautoconf/auto_config.go b/proto/pbautoconf/auto_config.go
similarity index 89%
rename from proto/private/pbautoconf/auto_config.go
rename to proto/pbautoconf/auto_config.go
index 39d37d1dc8b0f..6c14c296f27ac 100644
--- a/proto/private/pbautoconf/auto_config.go
+++ b/proto/pbautoconf/auto_config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pbautoconf
 
 import "time"
diff --git a/proto/private/pbautoconf/auto_config.pb.binary.go b/proto/pbautoconf/auto_config.pb.binary.go
similarity index 93%
rename from proto/private/pbautoconf/auto_config.pb.binary.go
rename to proto/pbautoconf/auto_config.pb.binary.go
index cca257177c8fa..4fc5f7fbe0a58 100644
--- a/proto/private/pbautoconf/auto_config.pb.binary.go
+++ b/proto/pbautoconf/auto_config.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbautoconf/auto_config.proto
+// source: proto/pbautoconf/auto_config.proto
 
 package pbautoconf
 
diff --git a/proto/pbautoconf/auto_config.pb.go b/proto/pbautoconf/auto_config.pb.go
new file mode 100644
index 0000000000000..3af70821fb796
--- /dev/null
+++ b/proto/pbautoconf/auto_config.pb.go
@@ -0,0 +1,354 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: proto/pbautoconf/auto_config.proto
+
+package pbautoconf
+
+import (
+	pbconfig "github.com/hashicorp/consul/proto/pbconfig"
+	pbconnect "github.com/hashicorp/consul/proto/pbconnect"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// AutoConfigRequest is the data structure to be sent along with the
+// AutoConfig.InitialConfiguration RPC
+type AutoConfigRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Datacenter is the local datacenter name. This wont actually be set by clients
+	// but rather will be set by the servers to allow for forwarding to
+	// the leader. If it ever happens to be set and differs from the local datacenters
+	// name then an error should be returned.
+	Datacenter string `protobuf:"bytes,1,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
+	// Node is the node name that the requester would like to assume
+	// the identity of.
+	Node string `protobuf:"bytes,2,opt,name=Node,proto3" json:"Node,omitempty"`
+	// Segment is the network segment that the requester would like to join
+	Segment string `protobuf:"bytes,4,opt,name=Segment,proto3" json:"Segment,omitempty"`
+	// Partition is the partition that the requester would like to join
+	Partition string `protobuf:"bytes,8,opt,name=Partition,proto3" json:"Partition,omitempty"`
+	// JWT is a signed JSON Web Token used to authorize the request
+	JWT string `protobuf:"bytes,5,opt,name=JWT,proto3" json:"JWT,omitempty"`
+	// ConsulToken is a Consul ACL token that the agent requesting the
+	// configuration already has.
+	ConsulToken string `protobuf:"bytes,6,opt,name=ConsulToken,proto3" json:"ConsulToken,omitempty"`
+	// CSR is a certificate signing request to be used when generating the
+	// agents TLS certificate
+	CSR string `protobuf:"bytes,7,opt,name=CSR,proto3" json:"CSR,omitempty"`
+}
+
+func (x *AutoConfigRequest) Reset() {
+	*x = AutoConfigRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbautoconf_auto_config_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AutoConfigRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AutoConfigRequest) ProtoMessage() {}
+
+func (x *AutoConfigRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbautoconf_auto_config_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use AutoConfigRequest.ProtoReflect.Descriptor instead.
+func (*AutoConfigRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbautoconf_auto_config_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *AutoConfigRequest) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
+	}
+	return ""
+}
+
+func (x *AutoConfigRequest) GetNode() string {
+	if x != nil {
+		return x.Node
+	}
+	return ""
+}
+
+func (x *AutoConfigRequest) GetSegment() string {
+	if x != nil {
+		return x.Segment
+	}
+	return ""
+}
+
+func (x *AutoConfigRequest) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+func (x *AutoConfigRequest) GetJWT() string {
+	if x != nil {
+		return x.JWT
+	}
+	return ""
+}
+
+func (x *AutoConfigRequest) GetConsulToken() string {
+	if x != nil {
+		return x.ConsulToken
+	}
+	return ""
+}
+
+func (x *AutoConfigRequest) GetCSR() string {
+	if x != nil {
+		return x.CSR
+	}
+	return ""
+}
+
+// AutoConfigResponse is the data structure sent in response to a AutoConfig.InitialConfiguration request
+type AutoConfigResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Config is the partial Consul configuration to inject into the agents own configuration
+	Config *pbconfig.Config `protobuf:"bytes,1,opt,name=Config,proto3" json:"Config,omitempty"`
+	// CARoots is the current list of Connect CA Roots
+	CARoots *pbconnect.CARoots `protobuf:"bytes,2,opt,name=CARoots,proto3" json:"CARoots,omitempty"`
+	// Certificate is the TLS certificate issued for the agent
+	Certificate *pbconnect.IssuedCert `protobuf:"bytes,3,opt,name=Certificate,proto3" json:"Certificate,omitempty"`
+	// ExtraCACertificates holds non-Connect certificates that may be necessary
+	// to verify TLS connections with the Consul servers
+	ExtraCACertificates []string `protobuf:"bytes,4,rep,name=ExtraCACertificates,proto3" json:"ExtraCACertificates,omitempty"`
+}
+
+func (x *AutoConfigResponse) Reset() {
+	*x = AutoConfigResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbautoconf_auto_config_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AutoConfigResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AutoConfigResponse) ProtoMessage() {}
+
+func (x *AutoConfigResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbautoconf_auto_config_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use AutoConfigResponse.ProtoReflect.Descriptor instead.
+func (*AutoConfigResponse) Descriptor() ([]byte, []int) {
+	return file_proto_pbautoconf_auto_config_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *AutoConfigResponse) GetConfig() *pbconfig.Config {
+	if x != nil {
+		return x.Config
+	}
+	return nil
+}
+
+func (x *AutoConfigResponse) GetCARoots() *pbconnect.CARoots {
+	if x != nil {
+		return x.CARoots
+	}
+	return nil
+}
+
+func (x *AutoConfigResponse) GetCertificate() *pbconnect.IssuedCert {
+	if x != nil {
+		return x.Certificate
+	}
+	return nil
+}
+
+func (x *AutoConfigResponse) GetExtraCACertificates() []string {
+	if x != nil {
+		return x.ExtraCACertificates
+	}
+	return nil
+}
+
+var File_proto_pbautoconf_auto_config_proto protoreflect.FileDescriptor
+
+var file_proto_pbautoconf_auto_config_proto_rawDesc = []byte{
+	0x0a, 0x22, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x61, 0x75, 0x74, 0x6f, 0x63, 0x6f,
+	0x6e, 0x66, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x22, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x61, 0x75, 0x74, 0x6f, 0x63, 0x6f, 0x6e, 0x66, 0x1a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
+	0x70, 0x62, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc5, 0x01, 0x0a, 0x11, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61,
+	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x6f,
+	0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x18,
+	0x0a, 0x07, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72,
+	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x4a, 0x57, 0x54, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x4a, 0x57, 0x54, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x43,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x43, 0x53,
+	0x52, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x43, 0x53, 0x52, 0x22, 0x9f, 0x02, 0x0a,
+	0x12, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x40, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x44, 0x0a, 0x07, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74, 0x73,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2e, 0x43, 0x41, 0x52, 0x6f, 0x6f,
+	0x74, 0x73, 0x52, 0x07, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x12, 0x4f, 0x0a, 0x0b, 0x43,
+	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x2e, 0x49, 0x73, 0x73, 0x75, 0x65, 0x64, 0x43, 0x65, 0x72, 0x74, 0x52,
+	0x0b, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x30, 0x0a, 0x13,
+	0x45, 0x78, 0x74, 0x72, 0x61, 0x43, 0x41, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+	0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x13, 0x45, 0x78, 0x74, 0x72, 0x61,
+	0x43, 0x41, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x42, 0x93,
+	0x02, 0x0a, 0x26, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x2e, 0x61, 0x75, 0x74, 0x6f, 0x63, 0x6f, 0x6e, 0x66, 0x42, 0x0f, 0x41, 0x75, 0x74, 0x6f, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2c, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
+	0x70, 0x62, 0x61, 0x75, 0x74, 0x6f, 0x63, 0x6f, 0x6e, 0x66, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49,
+	0x41, 0xaa, 0x02, 0x22, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x41, 0x75,
+	0x74, 0x6f, 0x63, 0x6f, 0x6e, 0x66, 0xca, 0x02, 0x22, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x5c, 0x41, 0x75, 0x74, 0x6f, 0x63, 0x6f, 0x6e, 0x66, 0xe2, 0x02, 0x2e, 0x48, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x41, 0x75, 0x74, 0x6f, 0x63, 0x6f, 0x6e, 0x66,
+	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x25, 0x48,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x41, 0x75, 0x74, 0x6f,
+	0x63, 0x6f, 0x6e, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_pbautoconf_auto_config_proto_rawDescOnce sync.Once
+	file_proto_pbautoconf_auto_config_proto_rawDescData = file_proto_pbautoconf_auto_config_proto_rawDesc
+)
+
+func file_proto_pbautoconf_auto_config_proto_rawDescGZIP() []byte {
+	file_proto_pbautoconf_auto_config_proto_rawDescOnce.Do(func() {
+		file_proto_pbautoconf_auto_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbautoconf_auto_config_proto_rawDescData)
+	})
+	return file_proto_pbautoconf_auto_config_proto_rawDescData
+}
+
+var file_proto_pbautoconf_auto_config_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_proto_pbautoconf_auto_config_proto_goTypes = []interface{}{
+	(*AutoConfigRequest)(nil),    // 0: hashicorp.consul.internal.autoconf.AutoConfigRequest
+	(*AutoConfigResponse)(nil),   // 1: hashicorp.consul.internal.autoconf.AutoConfigResponse
+	(*pbconfig.Config)(nil),      // 2: hashicorp.consul.internal.config.Config
+	(*pbconnect.CARoots)(nil),    // 3: hashicorp.consul.internal.connect.CARoots
+	(*pbconnect.IssuedCert)(nil), // 4: hashicorp.consul.internal.connect.IssuedCert
+}
+var file_proto_pbautoconf_auto_config_proto_depIdxs = []int32{
+	2, // 0: hashicorp.consul.internal.autoconf.AutoConfigResponse.Config:type_name -> hashicorp.consul.internal.config.Config
+	3, // 1: hashicorp.consul.internal.autoconf.AutoConfigResponse.CARoots:type_name -> hashicorp.consul.internal.connect.CARoots
+	4, // 2: hashicorp.consul.internal.autoconf.AutoConfigResponse.Certificate:type_name -> hashicorp.consul.internal.connect.IssuedCert
+	3, // [3:3] is the sub-list for method output_type
+	3, // [3:3] is the sub-list for method input_type
+	3, // [3:3] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbautoconf_auto_config_proto_init() }
+func file_proto_pbautoconf_auto_config_proto_init() {
+	if File_proto_pbautoconf_auto_config_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbautoconf_auto_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AutoConfigRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbautoconf_auto_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AutoConfigResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbautoconf_auto_config_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   2,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbautoconf_auto_config_proto_goTypes,
+		DependencyIndexes: file_proto_pbautoconf_auto_config_proto_depIdxs,
+		MessageInfos:      file_proto_pbautoconf_auto_config_proto_msgTypes,
+	}.Build()
+	File_proto_pbautoconf_auto_config_proto = out.File
+	file_proto_pbautoconf_auto_config_proto_rawDesc = nil
+	file_proto_pbautoconf_auto_config_proto_goTypes = nil
+	file_proto_pbautoconf_auto_config_proto_depIdxs = nil
+}
diff --git a/proto/private/pbautoconf/auto_config.proto b/proto/pbautoconf/auto_config.proto
similarity index 92%
rename from proto/private/pbautoconf/auto_config.proto
rename to proto/pbautoconf/auto_config.proto
index a0f4440d79047..c43f1c912e2d3 100644
--- a/proto/private/pbautoconf/auto_config.proto
+++ b/proto/pbautoconf/auto_config.proto
@@ -1,12 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 syntax = "proto3";
 
 package hashicorp.consul.internal.autoconf;
 
-import "private/pbconfig/config.proto";
-import "private/pbconnect/connect.proto";
+import "proto/pbconfig/config.proto";
+import "proto/pbconnect/connect.proto";
 
 // AutoConfigRequest is the data structure to be sent along with the
 // AutoConfig.InitialConfiguration RPC
diff --git a/proto/pbautoconf/auto_config_ce.go b/proto/pbautoconf/auto_config_ce.go
new file mode 100644
index 0000000000000..461bfb1a77608
--- /dev/null
+++ b/proto/pbautoconf/auto_config_ce.go
@@ -0,0 +1,8 @@
+//go:build !consulent
+// +build !consulent
+
+package pbautoconf
+
+func (req *AutoConfigRequest) PartitionOrDefault() string {
+	return ""
+}
diff --git a/proto/private/pbcommon/common.gen.go b/proto/pbcommon/common.gen.go
similarity index 87%
rename from proto/private/pbcommon/common.gen.go
rename to proto/pbcommon/common.gen.go
index c29598a2abf70..f5a8f82cab5bb 100644
--- a/proto/private/pbcommon/common.gen.go
+++ b/proto/pbcommon/common.gen.go
@@ -11,8 +11,6 @@ func EnvoyExtensionToStructs(s *EnvoyExtension, t *structs.EnvoyExtension) {
 	t.Name = s.Name
 	t.Required = s.Required
 	t.Arguments = ProtobufTypesStructToMapStringInterface(s.Arguments)
-	t.ConsulVersion = s.ConsulVersion
-	t.EnvoyVersion = s.EnvoyVersion
 }
 func EnvoyExtensionFromStructs(t *structs.EnvoyExtension, s *EnvoyExtension) {
 	if s == nil {
@@ -21,22 +19,6 @@ func EnvoyExtensionFromStructs(t *structs.EnvoyExtension, s *EnvoyExtension) {
 	s.Name = t.Name
 	s.Required = t.Required
 	s.Arguments = MapStringInterfaceToProtobufTypesStruct(t.Arguments)
-	s.ConsulVersion = t.ConsulVersion
-	s.EnvoyVersion = t.EnvoyVersion
-}
-func LocalityToStructs(s *Locality, t *structs.Locality) {
-	if s == nil {
-		return
-	}
-	t.Region = s.Region
-	t.Zone = s.Zone
-}
-func LocalityFromStructs(t *structs.Locality, s *Locality) {
-	if s == nil {
-		return
-	}
-	s.Region = t.Region
-	s.Zone = t.Zone
 }
 func QueryMetaToStructs(s *QueryMeta, t *structs.QueryMeta) {
 	if s == nil {
diff --git a/proto/pbcommon/common.go b/proto/pbcommon/common.go
new file mode 100644
index 0000000000000..892c53887a6f9
--- /dev/null
+++ b/proto/pbcommon/common.go
@@ -0,0 +1,186 @@
+package pbcommon
+
+import (
+	"time"
+
+	"github.com/hashicorp/consul/agent/structs"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+)
+
+// IsRead is always true for QueryOption
+func (q *QueryOptions) IsRead() bool {
+	return true
+}
+
+// AllowStaleRead returns whether a stale read should be allowed
+func (q *QueryOptions) AllowStaleRead() bool {
+	return q.AllowStale
+}
+
+func (q *QueryOptions) TokenSecret() string {
+	return q.Token
+}
+
+func (q *QueryOptions) SetTokenSecret(s string) {
+	q.Token = s
+}
+
+// SetToken is needed to implement the structs.QueryOptionsCompat interface
+func (q *QueryOptions) SetToken(token string) {
+	q.Token = token
+}
+
+// SetMinQueryIndex is needed to implement the structs.QueryOptionsCompat interface
+func (q *QueryOptions) SetMinQueryIndex(minQueryIndex uint64) {
+	q.MinQueryIndex = minQueryIndex
+}
+
+// SetMaxQueryTime is needed to implement the structs.QueryOptionsCompat interface
+func (q *QueryOptions) SetMaxQueryTime(maxQueryTime time.Duration) {
+	q.MaxQueryTime = durationpb.New(maxQueryTime)
+}
+
+// SetAllowStale is needed to implement the structs.QueryOptionsCompat interface
+func (q *QueryOptions) SetAllowStale(allowStale bool) {
+	q.AllowStale = allowStale
+}
+
+// SetRequireConsistent is needed to implement the structs.QueryOptionsCompat interface
+func (q *QueryOptions) SetRequireConsistent(requireConsistent bool) {
+	q.RequireConsistent = requireConsistent
+}
+
+// SetUseCache is needed to implement the structs.QueryOptionsCompat interface
+func (q *QueryOptions) SetUseCache(useCache bool) {
+	q.UseCache = useCache
+}
+
+// SetMaxStaleDuration is needed to implement the structs.QueryOptionsCompat interface
+func (q *QueryOptions) SetMaxStaleDuration(maxStaleDuration time.Duration) {
+	q.MaxStaleDuration = durationpb.New(maxStaleDuration)
+}
+
+// SetMaxAge is needed to implement the structs.QueryOptionsCompat interface
+func (q *QueryOptions) SetMaxAge(maxAge time.Duration) {
+	q.MaxAge = durationpb.New(maxAge)
+}
+
+// SetMustRevalidate is needed to implement the structs.QueryOptionsCompat interface
+func (q *QueryOptions) SetMustRevalidate(mustRevalidate bool) {
+	q.MustRevalidate = mustRevalidate
+}
+
+// SetStaleIfError is needed to implement the structs.QueryOptionsCompat interface
+func (q *QueryOptions) SetStaleIfError(staleIfError time.Duration) {
+	q.StaleIfError = durationpb.New(staleIfError)
+}
+
+func (q *QueryOptions) HasTimedOut(start time.Time, rpcHoldTimeout, maxQueryTime, defaultQueryTime time.Duration) (bool, error) {
+	// In addition to BlockingTimeout, allow for an additional rpcHoldTimeout buffer
+	// in case we need to wait for a leader election.
+	return time.Since(start) > rpcHoldTimeout+q.BlockingTimeout(maxQueryTime, defaultQueryTime), nil
+}
+
+// BlockingTimeout implements pool.BlockableQuery
+func (q *QueryOptions) BlockingTimeout(maxQueryTime, defaultQueryTime time.Duration) time.Duration {
+	maxTime := q.MaxQueryTime.AsDuration()
+	o := structs.QueryOptions{
+		MaxQueryTime:  maxTime,
+		MinQueryIndex: q.MinQueryIndex,
+	}
+	return o.BlockingTimeout(maxQueryTime, defaultQueryTime)
+}
+
+// SetFilter is needed to implement the structs.QueryOptionsCompat interface
+func (q *QueryOptions) SetFilter(filter string) {
+	q.Filter = filter
+}
+
+// WriteRequest only applies to writes, always false
+//
+// IsRead implements structs.RPCInfo
+func (w *WriteRequest) IsRead() bool {
+	return false
+}
+
+// SetTokenSecret implements structs.RPCInfo
+func (w *WriteRequest) TokenSecret() string {
+	return w.Token
+}
+
+// SetTokenSecret implements structs.RPCInfo
+func (w *WriteRequest) SetTokenSecret(s string) {
+	w.Token = s
+}
+
+// AllowStaleRead returns whether a stale read should be allowed
+//
+// AllowStaleRead implements structs.RPCInfo
+func (w *WriteRequest) AllowStaleRead() bool {
+	return false
+}
+
+// HasTimedOut implements structs.RPCInfo
+func (w *WriteRequest) HasTimedOut(start time.Time, rpcHoldTimeout, maxQueryTime, defaultQueryTime time.Duration) (bool, error) {
+	return time.Since(start) > rpcHoldTimeout, nil
+}
+
+// IsRead implements structs.RPCInfo
+func (r *ReadRequest) IsRead() bool {
+	return true
+}
+
+// AllowStaleRead implements structs.RPCInfo
+func (r *ReadRequest) AllowStaleRead() bool {
+	// TODO(partitions): plumb this?
+	return false
+}
+
+// TokenSecret implements structs.RPCInfo
+func (r *ReadRequest) TokenSecret() string {
+	return r.Token
+}
+
+// SetTokenSecret implements structs.RPCInfo
+func (r *ReadRequest) SetTokenSecret(token string) {
+	r.Token = token
+}
+
+// HasTimedOut implements structs.RPCInfo
+func (r *ReadRequest) HasTimedOut(start time.Time, rpcHoldTimeout, _, _ time.Duration) (bool, error) {
+	return time.Since(start) > rpcHoldTimeout, nil
+}
+
+// RequestDatacenter implements structs.RPCInfo
+func (td *TargetDatacenter) RequestDatacenter() string {
+	return td.Datacenter
+}
+
+// SetLastContact is needed to implement the structs.QueryMetaCompat interface
+func (q *QueryMeta) SetLastContact(lastContact time.Duration) {
+	q.LastContact = durationpb.New(lastContact)
+}
+
+// SetKnownLeader is needed to implement the structs.QueryMetaCompat interface
+func (q *QueryMeta) SetKnownLeader(knownLeader bool) {
+	q.KnownLeader = knownLeader
+}
+
+// SetIndex is needed to implement the structs.QueryMetaCompat interface
+func (q *QueryMeta) SetIndex(index uint64) {
+	q.Index = index
+}
+
+// SetConsistencyLevel is needed to implement the structs.QueryMetaCompat interface
+func (q *QueryMeta) SetConsistencyLevel(consistencyLevel string) {
+	q.ConsistencyLevel = consistencyLevel
+}
+
+func (q *QueryMeta) GetBackend() structs.QueryBackend {
+	return structs.QueryBackend(0)
+}
+
+// SetResultsFilteredByACLs is needed to implement the structs.QueryMetaCompat interface
+func (q *QueryMeta) SetResultsFilteredByACLs(v bool) {
+	q.ResultsFilteredByACLs = v
+}
diff --git a/proto/pbcommon/common.pb.binary.go b/proto/pbcommon/common.pb.binary.go
new file mode 100644
index 0000000000000..1ddb20b5111f4
--- /dev/null
+++ b/proto/pbcommon/common.pb.binary.go
@@ -0,0 +1,88 @@
+// Code generated by protoc-gen-go-binary. DO NOT EDIT.
+// source: proto/pbcommon/common.proto
+
+package pbcommon
+
+import (
+	"google.golang.org/protobuf/proto"
+)
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *RaftIndex) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *RaftIndex) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *TargetDatacenter) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *TargetDatacenter) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *WriteRequest) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *WriteRequest) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ReadRequest) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ReadRequest) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *QueryOptions) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *QueryOptions) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *QueryMeta) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *QueryMeta) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *EnterpriseMeta) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *EnterpriseMeta) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *EnvoyExtension) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *EnvoyExtension) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
diff --git a/proto/pbcommon/common.pb.go b/proto/pbcommon/common.pb.go
new file mode 100644
index 0000000000000..2ba5a2fb48b23
--- /dev/null
+++ b/proto/pbcommon/common.pb.go
@@ -0,0 +1,927 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: proto/pbcommon/common.proto
+
+package pbcommon
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// RaftIndex is used to track the index used while creating
+// or modifying a given struct type.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.RaftIndex
+// output=common.gen.go
+// name=Structs
+// ignore-fields=state,sizeCache,unknownFields
+type RaftIndex struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// @gotags: bexpr:"-"
+	CreateIndex uint64 `protobuf:"varint,1,opt,name=CreateIndex,proto3" json:"CreateIndex,omitempty" bexpr:"-"`
+	// @gotags: bexpr:"-"
+	ModifyIndex uint64 `protobuf:"varint,2,opt,name=ModifyIndex,proto3" json:"ModifyIndex,omitempty" bexpr:"-"`
+}
+
+func (x *RaftIndex) Reset() {
+	*x = RaftIndex{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RaftIndex) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RaftIndex) ProtoMessage() {}
+
+func (x *RaftIndex) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RaftIndex.ProtoReflect.Descriptor instead.
+func (*RaftIndex) Descriptor() ([]byte, []int) {
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *RaftIndex) GetCreateIndex() uint64 {
+	if x != nil {
+		return x.CreateIndex
+	}
+	return 0
+}
+
+func (x *RaftIndex) GetModifyIndex() uint64 {
+	if x != nil {
+		return x.ModifyIndex
+	}
+	return 0
+}
+
+// TargetDatacenter is intended to be used within other messages used for RPC routing
+// amongst the various Consul datacenters
+type TargetDatacenter struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Datacenter string `protobuf:"bytes,1,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
+}
+
+func (x *TargetDatacenter) Reset() {
+	*x = TargetDatacenter{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TargetDatacenter) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TargetDatacenter) ProtoMessage() {}
+
+func (x *TargetDatacenter) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TargetDatacenter.ProtoReflect.Descriptor instead.
+func (*TargetDatacenter) Descriptor() ([]byte, []int) {
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *TargetDatacenter) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.WriteRequest
+// output=common.gen.go
+// name=Structs
+// ignore-fields=state,sizeCache,unknownFields
+type WriteRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Token is the ACL token ID. If not provided, the 'anonymous'
+	// token is assumed for backwards compatibility.
+	Token string `protobuf:"bytes,1,opt,name=Token,proto3" json:"Token,omitempty"`
+}
+
+func (x *WriteRequest) Reset() {
+	*x = WriteRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *WriteRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*WriteRequest) ProtoMessage() {}
+
+func (x *WriteRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use WriteRequest.ProtoReflect.Descriptor instead.
+func (*WriteRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *WriteRequest) GetToken() string {
+	if x != nil {
+		return x.Token
+	}
+	return ""
+}
+
+// ReadRequest is a type that may be embedded into any requests for read
+// operations.
+// It is a replacement for QueryOptions now that we no longer need any of those
+// fields because we are moving away from using blocking queries.
+// It is also similar to WriteRequest. It is a separate type so that in the
+// future we can introduce fields that may only be relevant for reads.
+type ReadRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Token is the ACL token ID. If not provided, the 'anonymous'
+	// token is assumed for backwards compatibility.
+	Token string `protobuf:"bytes,1,opt,name=Token,proto3" json:"Token,omitempty"`
+	// RequireConsistent indicates that the request must be sent to the leader.
+	RequireConsistent bool `protobuf:"varint,2,opt,name=RequireConsistent,proto3" json:"RequireConsistent,omitempty"`
+}
+
+func (x *ReadRequest) Reset() {
+	*x = ReadRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ReadRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ReadRequest) ProtoMessage() {}
+
+func (x *ReadRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ReadRequest.ProtoReflect.Descriptor instead.
+func (*ReadRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *ReadRequest) GetToken() string {
+	if x != nil {
+		return x.Token
+	}
+	return ""
+}
+
+func (x *ReadRequest) GetRequireConsistent() bool {
+	if x != nil {
+		return x.RequireConsistent
+	}
+	return false
+}
+
+// QueryOptions is used to specify various flags for read queries
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.QueryOptions
+// output=common.gen.go
+// name=Structs
+// ignore-fields=StaleIfError,AllowNotModifiedResponse,state,sizeCache,unknownFields
+type QueryOptions struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Token is the ACL token ID. If not provided, the 'anonymous'
+	// token is assumed for backwards compatibility.
+	Token string `protobuf:"bytes,1,opt,name=Token,proto3" json:"Token,omitempty"`
+	// If set, wait until query exceeds given index. Must be provided
+	// with MaxQueryTime.
+	MinQueryIndex uint64 `protobuf:"varint,2,opt,name=MinQueryIndex,proto3" json:"MinQueryIndex,omitempty"`
+	// Provided with MinQueryIndex to wait for change.
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	MaxQueryTime *durationpb.Duration `protobuf:"bytes,3,opt,name=MaxQueryTime,proto3" json:"MaxQueryTime,omitempty"`
+	// If set, any follower can service the request. Results
+	// may be arbitrarily stale.
+	AllowStale bool `protobuf:"varint,4,opt,name=AllowStale,proto3" json:"AllowStale,omitempty"`
+	// If set, the leader must verify leadership prior to
+	// servicing the request. Prevents a stale read.
+	RequireConsistent bool `protobuf:"varint,5,opt,name=RequireConsistent,proto3" json:"RequireConsistent,omitempty"`
+	// If set, the local agent may respond with an arbitrarily stale locally
+	// cached response. The semantics differ from AllowStale since the agent may
+	// be entirely partitioned from the servers and still considered "healthy" by
+	// operators. Stale responses from Servers are also arbitrarily stale, but can
+	// provide additional bounds on the last contact time from the leader. It's
+	// expected that servers that are partitioned are noticed and replaced in a
+	// timely way by operators while the same may not be true for client agents.
+	UseCache bool `protobuf:"varint,6,opt,name=UseCache,proto3" json:"UseCache,omitempty"`
+	// If set and AllowStale is true, will try first a stale
+	// read, and then will perform a consistent read if stale
+	// read is older than value.
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	MaxStaleDuration *durationpb.Duration `protobuf:"bytes,7,opt,name=MaxStaleDuration,proto3" json:"MaxStaleDuration,omitempty"`
+	// MaxAge limits how old a cached value will be returned if UseCache is true.
+	// If there is a cached response that is older than the MaxAge, it is treated
+	// as a cache miss and a new fetch invoked. If the fetch fails, the error is
+	// returned. Clients that wish to allow for stale results on error can set
+	// StaleIfError to a longer duration to change this behavior. It is ignored
+	// if the endpoint supports background refresh caching. See
+	// https://www.consul.io/api/index.html#agent-caching for more details.
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	MaxAge *durationpb.Duration `protobuf:"bytes,8,opt,name=MaxAge,proto3" json:"MaxAge,omitempty"`
+	// MustRevalidate forces the agent to fetch a fresh version of a cached
+	// resource or at least validate that the cached version is still fresh. It is
+	// implied by either max-age=0 or must-revalidate Cache-Control headers. It
+	// only makes sense when UseCache is true. We store it since MaxAge = 0 is the
+	// default unset value.
+	MustRevalidate bool `protobuf:"varint,9,opt,name=MustRevalidate,proto3" json:"MustRevalidate,omitempty"`
+	// StaleIfError specifies how stale the client will accept a cached response
+	// if the servers are unavailable to fetch a fresh one. Only makes sense when
+	// UseCache is true and MaxAge is set to a lower, non-zero value. It is
+	// ignored if the endpoint supports background refresh caching. See
+	// https://www.consul.io/api/index.html#agent-caching for more details.
+	StaleIfError *durationpb.Duration `protobuf:"bytes,10,opt,name=StaleIfError,proto3" json:"StaleIfError,omitempty"`
+	// Filter specifies the go-bexpr filter expression to be used for
+	// filtering the data prior to returning a response
+	Filter string `protobuf:"bytes,11,opt,name=Filter,proto3" json:"Filter,omitempty"`
+}
+
+func (x *QueryOptions) Reset() {
+	*x = QueryOptions{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *QueryOptions) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*QueryOptions) ProtoMessage() {}
+
+func (x *QueryOptions) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use QueryOptions.ProtoReflect.Descriptor instead.
+func (*QueryOptions) Descriptor() ([]byte, []int) {
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *QueryOptions) GetToken() string {
+	if x != nil {
+		return x.Token
+	}
+	return ""
+}
+
+func (x *QueryOptions) GetMinQueryIndex() uint64 {
+	if x != nil {
+		return x.MinQueryIndex
+	}
+	return 0
+}
+
+func (x *QueryOptions) GetMaxQueryTime() *durationpb.Duration {
+	if x != nil {
+		return x.MaxQueryTime
+	}
+	return nil
+}
+
+func (x *QueryOptions) GetAllowStale() bool {
+	if x != nil {
+		return x.AllowStale
+	}
+	return false
+}
+
+func (x *QueryOptions) GetRequireConsistent() bool {
+	if x != nil {
+		return x.RequireConsistent
+	}
+	return false
+}
+
+func (x *QueryOptions) GetUseCache() bool {
+	if x != nil {
+		return x.UseCache
+	}
+	return false
+}
+
+func (x *QueryOptions) GetMaxStaleDuration() *durationpb.Duration {
+	if x != nil {
+		return x.MaxStaleDuration
+	}
+	return nil
+}
+
+func (x *QueryOptions) GetMaxAge() *durationpb.Duration {
+	if x != nil {
+		return x.MaxAge
+	}
+	return nil
+}
+
+func (x *QueryOptions) GetMustRevalidate() bool {
+	if x != nil {
+		return x.MustRevalidate
+	}
+	return false
+}
+
+func (x *QueryOptions) GetStaleIfError() *durationpb.Duration {
+	if x != nil {
+		return x.StaleIfError
+	}
+	return nil
+}
+
+func (x *QueryOptions) GetFilter() string {
+	if x != nil {
+		return x.Filter
+	}
+	return ""
+}
+
+// QueryMeta allows a query response to include potentially
+// useful metadata about a query
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.QueryMeta
+// output=common.gen.go
+// name=Structs
+// ignore-fields=NotModified,Backend,state,sizeCache,unknownFields
+type QueryMeta struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// This is the index associated with the read
+	Index uint64 `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
+	// If AllowStale is used, this is time elapsed since
+	// last contact between the follower and leader. This
+	// can be used to gauge staleness.
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	LastContact *durationpb.Duration `protobuf:"bytes,2,opt,name=LastContact,proto3" json:"LastContact,omitempty"`
+	// Used to indicate if there is a known leader node
+	KnownLeader bool `protobuf:"varint,3,opt,name=KnownLeader,proto3" json:"KnownLeader,omitempty"`
+	// Consistencylevel returns the consistency used to serve the query
+	// Having `discovery_max_stale` on the agent can affect whether
+	// the request was served by a leader.
+	ConsistencyLevel string `protobuf:"bytes,4,opt,name=ConsistencyLevel,proto3" json:"ConsistencyLevel,omitempty"`
+	// ResultsFilteredByACLs is true when some of the query's results were
+	// filtered out by enforcing ACLs. It may be false because nothing was
+	// removed, or because the endpoint does not yet support this flag.
+	ResultsFilteredByACLs bool `protobuf:"varint,7,opt,name=ResultsFilteredByACLs,proto3" json:"ResultsFilteredByACLs,omitempty"`
+}
+
+func (x *QueryMeta) Reset() {
+	*x = QueryMeta{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *QueryMeta) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*QueryMeta) ProtoMessage() {}
+
+func (x *QueryMeta) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use QueryMeta.ProtoReflect.Descriptor instead.
+func (*QueryMeta) Descriptor() ([]byte, []int) {
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *QueryMeta) GetIndex() uint64 {
+	if x != nil {
+		return x.Index
+	}
+	return 0
+}
+
+func (x *QueryMeta) GetLastContact() *durationpb.Duration {
+	if x != nil {
+		return x.LastContact
+	}
+	return nil
+}
+
+func (x *QueryMeta) GetKnownLeader() bool {
+	if x != nil {
+		return x.KnownLeader
+	}
+	return false
+}
+
+func (x *QueryMeta) GetConsistencyLevel() string {
+	if x != nil {
+		return x.ConsistencyLevel
+	}
+	return ""
+}
+
+func (x *QueryMeta) GetResultsFilteredByACLs() bool {
+	if x != nil {
+		return x.ResultsFilteredByACLs
+	}
+	return false
+}
+
+// EnterpriseMeta contains metadata that is only used by the Enterprise version
+// of Consul.
+type EnterpriseMeta struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Namespace in which the entity exists.
+	Namespace string `protobuf:"bytes,1,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
+	// Partition in which the entity exists.
+	Partition string `protobuf:"bytes,2,opt,name=Partition,proto3" json:"Partition,omitempty"`
+}
+
+func (x *EnterpriseMeta) Reset() {
+	*x = EnterpriseMeta{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EnterpriseMeta) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EnterpriseMeta) ProtoMessage() {}
+
+func (x *EnterpriseMeta) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use EnterpriseMeta.ProtoReflect.Descriptor instead.
+func (*EnterpriseMeta) Descriptor() ([]byte, []int) {
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *EnterpriseMeta) GetNamespace() string {
+	if x != nil {
+		return x.Namespace
+	}
+	return ""
+}
+
+func (x *EnterpriseMeta) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.EnvoyExtension
+// output=common.gen.go
+// name=Structs
+type EnvoyExtension struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name     string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	Required bool   `protobuf:"varint,2,opt,name=Required,proto3" json:"Required,omitempty"`
+	// mog: func-to=ProtobufTypesStructToMapStringInterface func-from=MapStringInterfaceToProtobufTypesStruct
+	Arguments *structpb.Struct `protobuf:"bytes,3,opt,name=Arguments,proto3" json:"Arguments,omitempty"`
+}
+
+func (x *EnvoyExtension) Reset() {
+	*x = EnvoyExtension{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EnvoyExtension) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EnvoyExtension) ProtoMessage() {}
+
+func (x *EnvoyExtension) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use EnvoyExtension.ProtoReflect.Descriptor instead.
+func (*EnvoyExtension) Descriptor() ([]byte, []int) {
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *EnvoyExtension) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *EnvoyExtension) GetRequired() bool {
+	if x != nil {
+		return x.Required
+	}
+	return false
+}
+
+func (x *EnvoyExtension) GetArguments() *structpb.Struct {
+	if x != nil {
+		return x.Arguments
+	}
+	return nil
+}
+
+var File_proto_pbcommon_common_proto protoreflect.FileDescriptor
+
+var file_proto_pbcommon_common_proto_rawDesc = []byte{
+	0x0a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x1a,
+	0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
+	0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4f, 0x0a,
+	0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x20, 0x0a, 0x0b,
+	0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x0b, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x32,
+	0x0a, 0x10, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74,
+	0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74,
+	0x65, 0x72, 0x22, 0x24, 0x0a, 0x0c, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x51, 0x0a, 0x0b, 0x52, 0x65, 0x61, 0x64,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x2c, 0x0a,
+	0x11, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65,
+	0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72,
+	0x65, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x22, 0xec, 0x03, 0x0a, 0x0c,
+	0x51, 0x75, 0x65, 0x72, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x14, 0x0a, 0x05,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b,
+	0x65, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x4d, 0x69, 0x6e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e,
+	0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x4d, 0x69, 0x6e, 0x51, 0x75,
+	0x65, 0x72, 0x79, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x3d, 0x0a, 0x0c, 0x4d, 0x61, 0x78, 0x51,
+	0x75, 0x65, 0x72, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x4d, 0x61, 0x78, 0x51, 0x75,
+	0x65, 0x72, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x41, 0x6c, 0x6c, 0x6f, 0x77,
+	0x53, 0x74, 0x61, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x41, 0x6c, 0x6c,
+	0x6f, 0x77, 0x53, 0x74, 0x61, 0x6c, 0x65, 0x12, 0x2c, 0x0a, 0x11, 0x52, 0x65, 0x71, 0x75, 0x69,
+	0x72, 0x65, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x11, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x73, 0x69,
+	0x73, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x43, 0x61, 0x63, 0x68,
+	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x55, 0x73, 0x65, 0x43, 0x61, 0x63, 0x68,
+	0x65, 0x12, 0x45, 0x0a, 0x10, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x6c, 0x65, 0x44, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x6c, 0x65,
+	0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x31, 0x0a, 0x06, 0x4d, 0x61, 0x78, 0x41,
+	0x67, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x06, 0x4d, 0x61, 0x78, 0x41, 0x67, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x4d,
+	0x75, 0x73, 0x74, 0x52, 0x65, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x18, 0x09, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0e, 0x4d, 0x75, 0x73, 0x74, 0x52, 0x65, 0x76, 0x61, 0x6c, 0x69, 0x64,
+	0x61, 0x74, 0x65, 0x12, 0x3d, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x6c, 0x65, 0x49, 0x66, 0x45, 0x72,
+	0x72, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x53, 0x74, 0x61, 0x6c, 0x65, 0x49, 0x66, 0x45, 0x72, 0x72,
+	0x6f, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x0b, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0xee, 0x01, 0x0a, 0x09, 0x51,
+	0x75, 0x65, 0x72, 0x79, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x6e, 0x64, 0x65,
+	0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x3b,
+	0x0a, 0x0b, 0x4c, 0x61, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b,
+	0x4c, 0x61, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x4b,
+	0x6e, 0x6f, 0x77, 0x6e, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0b, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x2a, 0x0a,
+	0x10, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65,
+	0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74,
+	0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x34, 0x0a, 0x15, 0x52, 0x65, 0x73,
+	0x75, 0x6c, 0x74, 0x73, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x65, 0x64, 0x42, 0x79, 0x41, 0x43,
+	0x4c, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
+	0x73, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x65, 0x64, 0x42, 0x79, 0x41, 0x43, 0x4c, 0x73, 0x4a,
+	0x04, 0x08, 0x05, 0x10, 0x06, 0x4a, 0x04, 0x08, 0x06, 0x10, 0x07, 0x22, 0x4c, 0x0a, 0x0e, 0x45,
+	0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x1c, 0x0a,
+	0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50,
+	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x77, 0x0a, 0x0e, 0x45, 0x6e, 0x76,
+	0x6f, 0x79, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x4e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+	0x1a, 0x0a, 0x08, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x08, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x12, 0x35, 0x0a, 0x09, 0x41,
+	0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x09, 0x41, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e,
+	0x74, 0x73, 0x42, 0x83, 0x02, 0x0a, 0x24, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x42, 0x0b, 0x43, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x43, 0xaa, 0x02, 0x20,
+	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0xca, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x43, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0xe2, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c,
+	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c,
+	0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
+	0x74, 0x61, 0xea, 0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a,
+	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x3a, 0x3a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_pbcommon_common_proto_rawDescOnce sync.Once
+	file_proto_pbcommon_common_proto_rawDescData = file_proto_pbcommon_common_proto_rawDesc
+)
+
+func file_proto_pbcommon_common_proto_rawDescGZIP() []byte {
+	file_proto_pbcommon_common_proto_rawDescOnce.Do(func() {
+		file_proto_pbcommon_common_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbcommon_common_proto_rawDescData)
+	})
+	return file_proto_pbcommon_common_proto_rawDescData
+}
+
+var file_proto_pbcommon_common_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_proto_pbcommon_common_proto_goTypes = []interface{}{
+	(*RaftIndex)(nil),           // 0: hashicorp.consul.internal.common.RaftIndex
+	(*TargetDatacenter)(nil),    // 1: hashicorp.consul.internal.common.TargetDatacenter
+	(*WriteRequest)(nil),        // 2: hashicorp.consul.internal.common.WriteRequest
+	(*ReadRequest)(nil),         // 3: hashicorp.consul.internal.common.ReadRequest
+	(*QueryOptions)(nil),        // 4: hashicorp.consul.internal.common.QueryOptions
+	(*QueryMeta)(nil),           // 5: hashicorp.consul.internal.common.QueryMeta
+	(*EnterpriseMeta)(nil),      // 6: hashicorp.consul.internal.common.EnterpriseMeta
+	(*EnvoyExtension)(nil),      // 7: hashicorp.consul.internal.common.EnvoyExtension
+	(*durationpb.Duration)(nil), // 8: google.protobuf.Duration
+	(*structpb.Struct)(nil),     // 9: google.protobuf.Struct
+}
+var file_proto_pbcommon_common_proto_depIdxs = []int32{
+	8, // 0: hashicorp.consul.internal.common.QueryOptions.MaxQueryTime:type_name -> google.protobuf.Duration
+	8, // 1: hashicorp.consul.internal.common.QueryOptions.MaxStaleDuration:type_name -> google.protobuf.Duration
+	8, // 2: hashicorp.consul.internal.common.QueryOptions.MaxAge:type_name -> google.protobuf.Duration
+	8, // 3: hashicorp.consul.internal.common.QueryOptions.StaleIfError:type_name -> google.protobuf.Duration
+	8, // 4: hashicorp.consul.internal.common.QueryMeta.LastContact:type_name -> google.protobuf.Duration
+	9, // 5: hashicorp.consul.internal.common.EnvoyExtension.Arguments:type_name -> google.protobuf.Struct
+	6, // [6:6] is the sub-list for method output_type
+	6, // [6:6] is the sub-list for method input_type
+	6, // [6:6] is the sub-list for extension type_name
+	6, // [6:6] is the sub-list for extension extendee
+	0, // [0:6] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbcommon_common_proto_init() }
+func file_proto_pbcommon_common_proto_init() {
+	if File_proto_pbcommon_common_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbcommon_common_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RaftIndex); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbcommon_common_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TargetDatacenter); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbcommon_common_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*WriteRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbcommon_common_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ReadRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbcommon_common_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*QueryOptions); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbcommon_common_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*QueryMeta); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbcommon_common_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EnterpriseMeta); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbcommon_common_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EnvoyExtension); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbcommon_common_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   8,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbcommon_common_proto_goTypes,
+		DependencyIndexes: file_proto_pbcommon_common_proto_depIdxs,
+		MessageInfos:      file_proto_pbcommon_common_proto_msgTypes,
+	}.Build()
+	File_proto_pbcommon_common_proto = out.File
+	file_proto_pbcommon_common_proto_rawDesc = nil
+	file_proto_pbcommon_common_proto_goTypes = nil
+	file_proto_pbcommon_common_proto_depIdxs = nil
+}
diff --git a/proto/pbcommon/common.proto b/proto/pbcommon/common.proto
new file mode 100644
index 0000000000000..35a891c459b17
--- /dev/null
+++ b/proto/pbcommon/common.proto
@@ -0,0 +1,185 @@
+syntax = "proto3";
+
+package hashicorp.consul.internal.common;
+
+import "google/protobuf/duration.proto";
+import "google/protobuf/struct.proto";
+
+// RaftIndex is used to track the index used while creating
+// or modifying a given struct type.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.RaftIndex
+// output=common.gen.go
+// name=Structs
+// ignore-fields=state,sizeCache,unknownFields
+message RaftIndex {
+  // @gotags: bexpr:"-"
+  uint64 CreateIndex = 1;
+  // @gotags: bexpr:"-"
+  uint64 ModifyIndex = 2;
+}
+
+// TargetDatacenter is intended to be used within other messages used for RPC routing
+// amongst the various Consul datacenters
+message TargetDatacenter {
+  string Datacenter = 1;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.WriteRequest
+// output=common.gen.go
+// name=Structs
+// ignore-fields=state,sizeCache,unknownFields
+message WriteRequest {
+  // Token is the ACL token ID. If not provided, the 'anonymous'
+  // token is assumed for backwards compatibility.
+  string Token = 1;
+}
+
+// ReadRequest is a type that may be embedded into any requests for read
+// operations.
+// It is a replacement for QueryOptions now that we no longer need any of those
+// fields because we are moving away from using blocking queries.
+// It is also similar to WriteRequest. It is a separate type so that in the
+// future we can introduce fields that may only be relevant for reads.
+message ReadRequest {
+  // Token is the ACL token ID. If not provided, the 'anonymous'
+  // token is assumed for backwards compatibility.
+  string Token = 1;
+
+  // RequireConsistent indicates that the request must be sent to the leader.
+  bool RequireConsistent = 2;
+}
+
+// QueryOptions is used to specify various flags for read queries
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.QueryOptions
+// output=common.gen.go
+// name=Structs
+// ignore-fields=StaleIfError,AllowNotModifiedResponse,state,sizeCache,unknownFields
+message QueryOptions {
+  // Token is the ACL token ID. If not provided, the 'anonymous'
+  // token is assumed for backwards compatibility.
+  string Token = 1;
+
+  // If set, wait until query exceeds given index. Must be provided
+  // with MaxQueryTime.
+  uint64 MinQueryIndex = 2;
+
+  // Provided with MinQueryIndex to wait for change.
+  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+  google.protobuf.Duration MaxQueryTime = 3;
+
+  // If set, any follower can service the request. Results
+  // may be arbitrarily stale.
+  bool AllowStale = 4;
+
+  // If set, the leader must verify leadership prior to
+  // servicing the request. Prevents a stale read.
+  bool RequireConsistent = 5;
+
+  // If set, the local agent may respond with an arbitrarily stale locally
+  // cached response. The semantics differ from AllowStale since the agent may
+  // be entirely partitioned from the servers and still considered "healthy" by
+  // operators. Stale responses from Servers are also arbitrarily stale, but can
+  // provide additional bounds on the last contact time from the leader. It's
+  // expected that servers that are partitioned are noticed and replaced in a
+  // timely way by operators while the same may not be true for client agents.
+  bool UseCache = 6;
+
+  // If set and AllowStale is true, will try first a stale
+  // read, and then will perform a consistent read if stale
+  // read is older than value.
+  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+  google.protobuf.Duration MaxStaleDuration = 7;
+
+  // MaxAge limits how old a cached value will be returned if UseCache is true.
+  // If there is a cached response that is older than the MaxAge, it is treated
+  // as a cache miss and a new fetch invoked. If the fetch fails, the error is
+  // returned. Clients that wish to allow for stale results on error can set
+  // StaleIfError to a longer duration to change this behavior. It is ignored
+  // if the endpoint supports background refresh caching. See
+  // https://www.consul.io/api/index.html#agent-caching for more details.
+  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+  google.protobuf.Duration MaxAge = 8;
+
+  // MustRevalidate forces the agent to fetch a fresh version of a cached
+  // resource or at least validate that the cached version is still fresh. It is
+  // implied by either max-age=0 or must-revalidate Cache-Control headers. It
+  // only makes sense when UseCache is true. We store it since MaxAge = 0 is the
+  // default unset value.
+  bool MustRevalidate = 9;
+
+  // StaleIfError specifies how stale the client will accept a cached response
+  // if the servers are unavailable to fetch a fresh one. Only makes sense when
+  // UseCache is true and MaxAge is set to a lower, non-zero value. It is
+  // ignored if the endpoint supports background refresh caching. See
+  // https://www.consul.io/api/index.html#agent-caching for more details.
+  google.protobuf.Duration StaleIfError = 10;
+
+  // Filter specifies the go-bexpr filter expression to be used for
+  // filtering the data prior to returning a response
+  string Filter = 11;
+}
+
+// QueryMeta allows a query response to include potentially
+// useful metadata about a query
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.QueryMeta
+// output=common.gen.go
+// name=Structs
+// ignore-fields=NotModified,Backend,state,sizeCache,unknownFields
+message QueryMeta {
+  // This is the index associated with the read
+  uint64 Index = 1;
+
+  // If AllowStale is used, this is time elapsed since
+  // last contact between the follower and leader. This
+  // can be used to gauge staleness.
+  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+  google.protobuf.Duration LastContact = 2;
+
+  // Used to indicate if there is a known leader node
+  bool KnownLeader = 3;
+
+  // Consistencylevel returns the consistency used to serve the query
+  // Having `discovery_max_stale` on the agent can affect whether
+  // the request was served by a leader.
+  string ConsistencyLevel = 4;
+
+  // Reserved for NotModified and Backend.
+  reserved 5, 6;
+
+  // ResultsFilteredByACLs is true when some of the query's results were
+  // filtered out by enforcing ACLs. It may be false because nothing was
+  // removed, or because the endpoint does not yet support this flag.
+  bool ResultsFilteredByACLs = 7;
+}
+
+// EnterpriseMeta contains metadata that is only used by the Enterprise version
+// of Consul.
+message EnterpriseMeta {
+  // Namespace in which the entity exists.
+  string Namespace = 1;
+  // Partition in which the entity exists.
+  string Partition = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.EnvoyExtension
+// output=common.gen.go
+// name=Structs
+message EnvoyExtension {
+  string Name = 1;
+  bool Required = 2;
+  // mog: func-to=ProtobufTypesStructToMapStringInterface func-from=MapStringInterfaceToProtobufTypesStruct
+  google.protobuf.Struct Arguments = 3;
+}
diff --git a/proto/private/pbcommon/common_ce.go b/proto/pbcommon/common_ce.go
similarity index 86%
rename from proto/private/pbcommon/common_ce.go
rename to proto/pbcommon/common_ce.go
index c464211110baf..0df88ec20bf50 100644
--- a/proto/private/pbcommon/common_ce.go
+++ b/proto/pbcommon/common_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package pbcommon
 
diff --git a/proto/private/pbcommon/convert_pbstruct.go b/proto/pbcommon/convert_pbstruct.go
similarity index 79%
rename from proto/private/pbcommon/convert_pbstruct.go
rename to proto/pbcommon/convert_pbstruct.go
index f21d9a40ed49d..d4ede0a0d910b 100644
--- a/proto/private/pbcommon/convert_pbstruct.go
+++ b/proto/pbcommon/convert_pbstruct.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pbcommon
 
 import (
@@ -47,11 +44,9 @@ func EnvoyExtensionsToStructs(args []*EnvoyExtension) []structs.EnvoyExtension {
 		var e structs.EnvoyExtension
 		if args[i] != nil {
 			e = structs.EnvoyExtension{
-				Name:          args[i].Name,
-				Required:      args[i].Required,
-				ConsulVersion: args[i].ConsulVersion,
-				EnvoyVersion:  args[i].EnvoyVersion,
-				Arguments:     ProtobufTypesStructToMapStringInterface(args[i].Arguments),
+				Name:      args[i].Name,
+				Required:  args[i].Required,
+				Arguments: ProtobufTypesStructToMapStringInterface(args[i].Arguments),
 			}
 		}
 
@@ -67,11 +62,9 @@ func EnvoyExtensionsFromStructs(args []structs.EnvoyExtension) []*EnvoyExtension
 	o := make([]*EnvoyExtension, len(args))
 	for i, e := range args {
 		o[i] = &EnvoyExtension{
-			Name:          e.Name,
-			Required:      e.Required,
-			ConsulVersion: e.ConsulVersion,
-			EnvoyVersion:  e.EnvoyVersion,
-			Arguments:     MapStringInterfaceToProtobufTypesStruct(e.Arguments),
+			Name:      e.Name,
+			Required:  e.Required,
+			Arguments: MapStringInterfaceToProtobufTypesStruct(e.Arguments),
 		}
 	}
 
diff --git a/proto/private/pbcommon/convert_pbstruct_test.go b/proto/pbcommon/convert_pbstruct_test.go
similarity index 97%
rename from proto/private/pbcommon/convert_pbstruct_test.go
rename to proto/pbcommon/convert_pbstruct_test.go
index 82f52c6992884..2ff956da4a458 100644
--- a/proto/private/pbcommon/convert_pbstruct_test.go
+++ b/proto/pbcommon/convert_pbstruct_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pbcommon
 
 import (
diff --git a/proto/private/pbconfig/config.pb.binary.go b/proto/pbconfig/config.pb.binary.go
similarity index 98%
rename from proto/private/pbconfig/config.pb.binary.go
rename to proto/pbconfig/config.pb.binary.go
index d599791b950e4..a978adc8a696c 100644
--- a/proto/private/pbconfig/config.pb.binary.go
+++ b/proto/pbconfig/config.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbconfig/config.proto
+// source: proto/pbconfig/config.proto
 
 package pbconfig
 
diff --git a/proto/pbconfig/config.pb.go b/proto/pbconfig/config.pb.go
new file mode 100644
index 0000000000000..589985d171e64
--- /dev/null
+++ b/proto/pbconfig/config.pb.go
@@ -0,0 +1,985 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: proto/pbconfig/config.proto
+
+package pbconfig
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type Config struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Datacenter        string       `protobuf:"bytes,1,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
+	PrimaryDatacenter string       `protobuf:"bytes,2,opt,name=PrimaryDatacenter,proto3" json:"PrimaryDatacenter,omitempty"`
+	NodeName          string       `protobuf:"bytes,3,opt,name=NodeName,proto3" json:"NodeName,omitempty"`
+	SegmentName       string       `protobuf:"bytes,4,opt,name=SegmentName,proto3" json:"SegmentName,omitempty"`
+	Partition         string       `protobuf:"bytes,9,opt,name=Partition,proto3" json:"Partition,omitempty"`
+	ACL               *ACL         `protobuf:"bytes,5,opt,name=ACL,proto3" json:"ACL,omitempty"`
+	AutoEncrypt       *AutoEncrypt `protobuf:"bytes,6,opt,name=AutoEncrypt,proto3" json:"AutoEncrypt,omitempty"`
+	Gossip            *Gossip      `protobuf:"bytes,7,opt,name=Gossip,proto3" json:"Gossip,omitempty"`
+	TLS               *TLS         `protobuf:"bytes,8,opt,name=TLS,proto3" json:"TLS,omitempty"`
+}
+
+func (x *Config) Reset() {
+	*x = Config{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Config) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Config) ProtoMessage() {}
+
+func (x *Config) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Config.ProtoReflect.Descriptor instead.
+func (*Config) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *Config) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
+	}
+	return ""
+}
+
+func (x *Config) GetPrimaryDatacenter() string {
+	if x != nil {
+		return x.PrimaryDatacenter
+	}
+	return ""
+}
+
+func (x *Config) GetNodeName() string {
+	if x != nil {
+		return x.NodeName
+	}
+	return ""
+}
+
+func (x *Config) GetSegmentName() string {
+	if x != nil {
+		return x.SegmentName
+	}
+	return ""
+}
+
+func (x *Config) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+func (x *Config) GetACL() *ACL {
+	if x != nil {
+		return x.ACL
+	}
+	return nil
+}
+
+func (x *Config) GetAutoEncrypt() *AutoEncrypt {
+	if x != nil {
+		return x.AutoEncrypt
+	}
+	return nil
+}
+
+func (x *Config) GetGossip() *Gossip {
+	if x != nil {
+		return x.Gossip
+	}
+	return nil
+}
+
+func (x *Config) GetTLS() *TLS {
+	if x != nil {
+		return x.TLS
+	}
+	return nil
+}
+
+type Gossip struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Encryption   *GossipEncryption `protobuf:"bytes,1,opt,name=Encryption,proto3" json:"Encryption,omitempty"`
+	RetryJoinLAN []string          `protobuf:"bytes,2,rep,name=RetryJoinLAN,proto3" json:"RetryJoinLAN,omitempty"`
+}
+
+func (x *Gossip) Reset() {
+	*x = Gossip{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Gossip) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Gossip) ProtoMessage() {}
+
+func (x *Gossip) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Gossip.ProtoReflect.Descriptor instead.
+func (*Gossip) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *Gossip) GetEncryption() *GossipEncryption {
+	if x != nil {
+		return x.Encryption
+	}
+	return nil
+}
+
+func (x *Gossip) GetRetryJoinLAN() []string {
+	if x != nil {
+		return x.RetryJoinLAN
+	}
+	return nil
+}
+
+type GossipEncryption struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Key            string `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key,omitempty"`
+	VerifyIncoming bool   `protobuf:"varint,2,opt,name=VerifyIncoming,proto3" json:"VerifyIncoming,omitempty"`
+	VerifyOutgoing bool   `protobuf:"varint,3,opt,name=VerifyOutgoing,proto3" json:"VerifyOutgoing,omitempty"`
+}
+
+func (x *GossipEncryption) Reset() {
+	*x = GossipEncryption{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GossipEncryption) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GossipEncryption) ProtoMessage() {}
+
+func (x *GossipEncryption) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GossipEncryption.ProtoReflect.Descriptor instead.
+func (*GossipEncryption) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *GossipEncryption) GetKey() string {
+	if x != nil {
+		return x.Key
+	}
+	return ""
+}
+
+func (x *GossipEncryption) GetVerifyIncoming() bool {
+	if x != nil {
+		return x.VerifyIncoming
+	}
+	return false
+}
+
+func (x *GossipEncryption) GetVerifyOutgoing() bool {
+	if x != nil {
+		return x.VerifyOutgoing
+	}
+	return false
+}
+
+type TLS struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	VerifyOutgoing       bool   `protobuf:"varint,1,opt,name=VerifyOutgoing,proto3" json:"VerifyOutgoing,omitempty"`
+	VerifyServerHostname bool   `protobuf:"varint,2,opt,name=VerifyServerHostname,proto3" json:"VerifyServerHostname,omitempty"`
+	CipherSuites         string `protobuf:"bytes,3,opt,name=CipherSuites,proto3" json:"CipherSuites,omitempty"`
+	MinVersion           string `protobuf:"bytes,4,opt,name=MinVersion,proto3" json:"MinVersion,omitempty"`
+	// Deprecated_PreferServerCipherSuites is deprecated. It is no longer
+	// populated and should be ignored by clients.
+	//
+	// Deprecated: Do not use.
+	Deprecated_PreferServerCipherSuites bool `protobuf:"varint,5,opt,name=Deprecated_PreferServerCipherSuites,json=DeprecatedPreferServerCipherSuites,proto3" json:"Deprecated_PreferServerCipherSuites,omitempty"`
+}
+
+func (x *TLS) Reset() {
+	*x = TLS{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TLS) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TLS) ProtoMessage() {}
+
+func (x *TLS) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TLS.ProtoReflect.Descriptor instead.
+func (*TLS) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *TLS) GetVerifyOutgoing() bool {
+	if x != nil {
+		return x.VerifyOutgoing
+	}
+	return false
+}
+
+func (x *TLS) GetVerifyServerHostname() bool {
+	if x != nil {
+		return x.VerifyServerHostname
+	}
+	return false
+}
+
+func (x *TLS) GetCipherSuites() string {
+	if x != nil {
+		return x.CipherSuites
+	}
+	return ""
+}
+
+func (x *TLS) GetMinVersion() string {
+	if x != nil {
+		return x.MinVersion
+	}
+	return ""
+}
+
+// Deprecated: Do not use.
+func (x *TLS) GetDeprecated_PreferServerCipherSuites() bool {
+	if x != nil {
+		return x.Deprecated_PreferServerCipherSuites
+	}
+	return false
+}
+
+type ACL struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Enabled             bool       `protobuf:"varint,1,opt,name=Enabled,proto3" json:"Enabled,omitempty"`
+	PolicyTTL           string     `protobuf:"bytes,2,opt,name=PolicyTTL,proto3" json:"PolicyTTL,omitempty"`
+	RoleTTL             string     `protobuf:"bytes,3,opt,name=RoleTTL,proto3" json:"RoleTTL,omitempty"`
+	TokenTTL            string     `protobuf:"bytes,4,opt,name=TokenTTL,proto3" json:"TokenTTL,omitempty"`
+	DownPolicy          string     `protobuf:"bytes,5,opt,name=DownPolicy,proto3" json:"DownPolicy,omitempty"`
+	DefaultPolicy       string     `protobuf:"bytes,6,opt,name=DefaultPolicy,proto3" json:"DefaultPolicy,omitempty"`
+	EnableKeyListPolicy bool       `protobuf:"varint,7,opt,name=EnableKeyListPolicy,proto3" json:"EnableKeyListPolicy,omitempty"`
+	Tokens              *ACLTokens `protobuf:"bytes,8,opt,name=Tokens,proto3" json:"Tokens,omitempty"`
+	// Deprecated_DisabledTTL is deprecated. It is no longer populated and should
+	// be ignored by clients.
+	//
+	// Deprecated: Do not use.
+	Deprecated_DisabledTTL string `protobuf:"bytes,9,opt,name=Deprecated_DisabledTTL,json=DeprecatedDisabledTTL,proto3" json:"Deprecated_DisabledTTL,omitempty"`
+	EnableTokenPersistence bool   `protobuf:"varint,10,opt,name=EnableTokenPersistence,proto3" json:"EnableTokenPersistence,omitempty"`
+	MSPDisableBootstrap    bool   `protobuf:"varint,11,opt,name=MSPDisableBootstrap,proto3" json:"MSPDisableBootstrap,omitempty"`
+}
+
+func (x *ACL) Reset() {
+	*x = ACL{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ACL) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ACL) ProtoMessage() {}
+
+func (x *ACL) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ACL.ProtoReflect.Descriptor instead.
+func (*ACL) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *ACL) GetEnabled() bool {
+	if x != nil {
+		return x.Enabled
+	}
+	return false
+}
+
+func (x *ACL) GetPolicyTTL() string {
+	if x != nil {
+		return x.PolicyTTL
+	}
+	return ""
+}
+
+func (x *ACL) GetRoleTTL() string {
+	if x != nil {
+		return x.RoleTTL
+	}
+	return ""
+}
+
+func (x *ACL) GetTokenTTL() string {
+	if x != nil {
+		return x.TokenTTL
+	}
+	return ""
+}
+
+func (x *ACL) GetDownPolicy() string {
+	if x != nil {
+		return x.DownPolicy
+	}
+	return ""
+}
+
+func (x *ACL) GetDefaultPolicy() string {
+	if x != nil {
+		return x.DefaultPolicy
+	}
+	return ""
+}
+
+func (x *ACL) GetEnableKeyListPolicy() bool {
+	if x != nil {
+		return x.EnableKeyListPolicy
+	}
+	return false
+}
+
+func (x *ACL) GetTokens() *ACLTokens {
+	if x != nil {
+		return x.Tokens
+	}
+	return nil
+}
+
+// Deprecated: Do not use.
+func (x *ACL) GetDeprecated_DisabledTTL() string {
+	if x != nil {
+		return x.Deprecated_DisabledTTL
+	}
+	return ""
+}
+
+func (x *ACL) GetEnableTokenPersistence() bool {
+	if x != nil {
+		return x.EnableTokenPersistence
+	}
+	return false
+}
+
+func (x *ACL) GetMSPDisableBootstrap() bool {
+	if x != nil {
+		return x.MSPDisableBootstrap
+	}
+	return false
+}
+
+type ACLTokens struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	InitialManagement      string                     `protobuf:"bytes,1,opt,name=InitialManagement,proto3" json:"InitialManagement,omitempty"`
+	Replication            string                     `protobuf:"bytes,2,opt,name=Replication,proto3" json:"Replication,omitempty"`
+	AgentRecovery          string                     `protobuf:"bytes,3,opt,name=AgentRecovery,proto3" json:"AgentRecovery,omitempty"`
+	Default                string                     `protobuf:"bytes,4,opt,name=Default,proto3" json:"Default,omitempty"`
+	Agent                  string                     `protobuf:"bytes,5,opt,name=Agent,proto3" json:"Agent,omitempty"`
+	ManagedServiceProvider []*ACLServiceProviderToken `protobuf:"bytes,6,rep,name=ManagedServiceProvider,proto3" json:"ManagedServiceProvider,omitempty"`
+}
+
+func (x *ACLTokens) Reset() {
+	*x = ACLTokens{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ACLTokens) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ACLTokens) ProtoMessage() {}
+
+func (x *ACLTokens) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ACLTokens.ProtoReflect.Descriptor instead.
+func (*ACLTokens) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *ACLTokens) GetInitialManagement() string {
+	if x != nil {
+		return x.InitialManagement
+	}
+	return ""
+}
+
+func (x *ACLTokens) GetReplication() string {
+	if x != nil {
+		return x.Replication
+	}
+	return ""
+}
+
+func (x *ACLTokens) GetAgentRecovery() string {
+	if x != nil {
+		return x.AgentRecovery
+	}
+	return ""
+}
+
+func (x *ACLTokens) GetDefault() string {
+	if x != nil {
+		return x.Default
+	}
+	return ""
+}
+
+func (x *ACLTokens) GetAgent() string {
+	if x != nil {
+		return x.Agent
+	}
+	return ""
+}
+
+func (x *ACLTokens) GetManagedServiceProvider() []*ACLServiceProviderToken {
+	if x != nil {
+		return x.ManagedServiceProvider
+	}
+	return nil
+}
+
+type ACLServiceProviderToken struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	AccessorID string `protobuf:"bytes,1,opt,name=AccessorID,proto3" json:"AccessorID,omitempty"`
+	SecretID   string `protobuf:"bytes,2,opt,name=SecretID,proto3" json:"SecretID,omitempty"`
+}
+
+func (x *ACLServiceProviderToken) Reset() {
+	*x = ACLServiceProviderToken{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ACLServiceProviderToken) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ACLServiceProviderToken) ProtoMessage() {}
+
+func (x *ACLServiceProviderToken) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ACLServiceProviderToken.ProtoReflect.Descriptor instead.
+func (*ACLServiceProviderToken) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *ACLServiceProviderToken) GetAccessorID() string {
+	if x != nil {
+		return x.AccessorID
+	}
+	return ""
+}
+
+func (x *ACLServiceProviderToken) GetSecretID() string {
+	if x != nil {
+		return x.SecretID
+	}
+	return ""
+}
+
+type AutoEncrypt struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	TLS      bool     `protobuf:"varint,1,opt,name=TLS,proto3" json:"TLS,omitempty"`
+	DNSSAN   []string `protobuf:"bytes,2,rep,name=DNSSAN,proto3" json:"DNSSAN,omitempty"`
+	IPSAN    []string `protobuf:"bytes,3,rep,name=IPSAN,proto3" json:"IPSAN,omitempty"`
+	AllowTLS bool     `protobuf:"varint,4,opt,name=AllowTLS,proto3" json:"AllowTLS,omitempty"`
+}
+
+func (x *AutoEncrypt) Reset() {
+	*x = AutoEncrypt{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AutoEncrypt) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AutoEncrypt) ProtoMessage() {}
+
+func (x *AutoEncrypt) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use AutoEncrypt.ProtoReflect.Descriptor instead.
+func (*AutoEncrypt) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *AutoEncrypt) GetTLS() bool {
+	if x != nil {
+		return x.TLS
+	}
+	return false
+}
+
+func (x *AutoEncrypt) GetDNSSAN() []string {
+	if x != nil {
+		return x.DNSSAN
+	}
+	return nil
+}
+
+func (x *AutoEncrypt) GetIPSAN() []string {
+	if x != nil {
+		return x.IPSAN
+	}
+	return nil
+}
+
+func (x *AutoEncrypt) GetAllowTLS() bool {
+	if x != nil {
+		return x.AllowTLS
+	}
+	return false
+}
+
+var File_proto_pbconfig_config_proto protoreflect.FileDescriptor
+
+var file_proto_pbconfig_config_proto_rawDesc = []byte{
+	0x0a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22,
+	0xb7, 0x03, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61,
+	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x2c, 0x0a, 0x11, 0x50, 0x72,
+	0x69, 0x6d, 0x61, 0x72, 0x79, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x44, 0x61,
+	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x6f, 0x64, 0x65,
+	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x6f, 0x64, 0x65,
+	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x4e,
+	0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x53, 0x65, 0x67, 0x6d, 0x65,
+	0x6e, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x37, 0x0a, 0x03, 0x41, 0x43, 0x4c, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x25, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x41, 0x43, 0x4c, 0x52, 0x03, 0x41, 0x43, 0x4c, 0x12, 0x4f, 0x0a,
+	0x0b, 0x41, 0x75, 0x74, 0x6f, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x41, 0x75, 0x74, 0x6f, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70,
+	0x74, 0x52, 0x0b, 0x41, 0x75, 0x74, 0x6f, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x12, 0x40,
+	0x0a, 0x06, 0x47, 0x6f, 0x73, 0x73, 0x69, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x47, 0x6f, 0x73, 0x73, 0x69, 0x70, 0x52, 0x06, 0x47, 0x6f, 0x73, 0x73, 0x69, 0x70,
+	0x12, 0x37, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x54, 0x4c, 0x53, 0x52, 0x03, 0x54, 0x4c, 0x53, 0x22, 0x80, 0x01, 0x0a, 0x06, 0x47, 0x6f,
+	0x73, 0x73, 0x69, 0x70, 0x12, 0x52, 0x0a, 0x0a, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x47, 0x6f, 0x73, 0x73,
+	0x69, 0x70, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x45, 0x6e,
+	0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x52, 0x65, 0x74, 0x72,
+	0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x4c, 0x41, 0x4e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c,
+	0x52, 0x65, 0x74, 0x72, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x4c, 0x41, 0x4e, 0x22, 0x74, 0x0a, 0x10,
+	0x47, 0x6f, 0x73, 0x73, 0x69, 0x70, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x10, 0x0a, 0x03, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4b,
+	0x65, 0x79, 0x12, 0x26, 0x0a, 0x0e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x63, 0x6f,
+	0x6d, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x56, 0x65, 0x72, 0x69,
+	0x66, 0x79, 0x49, 0x6e, 0x63, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x12, 0x26, 0x0a, 0x0e, 0x56, 0x65,
+	0x72, 0x69, 0x66, 0x79, 0x4f, 0x75, 0x74, 0x67, 0x6f, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x4f, 0x75, 0x74, 0x67, 0x6f, 0x69,
+	0x6e, 0x67, 0x22, 0xfa, 0x01, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x12, 0x26, 0x0a, 0x0e, 0x56, 0x65,
+	0x72, 0x69, 0x66, 0x79, 0x4f, 0x75, 0x74, 0x67, 0x6f, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x4f, 0x75, 0x74, 0x67, 0x6f, 0x69,
+	0x6e, 0x67, 0x12, 0x32, 0x0a, 0x14, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x53, 0x65, 0x72, 0x76,
+	0x65, 0x72, 0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x14, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x48, 0x6f,
+	0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72,
+	0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x43, 0x69,
+	0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x69,
+	0x6e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x4d, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x53, 0x0a, 0x23, 0x44, 0x65,
+	0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x53,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65,
+	0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x22, 0x44, 0x65, 0x70,
+	0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x53, 0x65, 0x72,
+	0x76, 0x65, 0x72, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x22,
+	0xd5, 0x03, 0x0a, 0x03, 0x41, 0x43, 0x4c, 0x12, 0x18, 0x0a, 0x07, 0x45, 0x6e, 0x61, 0x62, 0x6c,
+	0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65,
+	0x64, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x54, 0x4c, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x54, 0x4c, 0x12,
+	0x18, 0x0a, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x54, 0x54, 0x4c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x54, 0x54, 0x4c, 0x12, 0x1a, 0x0a, 0x08, 0x54, 0x6f, 0x6b,
+	0x65, 0x6e, 0x54, 0x54, 0x4c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x54, 0x6f, 0x6b,
+	0x65, 0x6e, 0x54, 0x54, 0x4c, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x6f, 0x77, 0x6e, 0x50, 0x6f, 0x6c,
+	0x69, 0x63, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x6f, 0x77, 0x6e, 0x50,
+	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x44, 0x65,
+	0x66, 0x61, 0x75, 0x6c, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x30, 0x0a, 0x13, 0x45,
+	0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x6c, 0x69,
+	0x63, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65,
+	0x4b, 0x65, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x43, 0x0a,
+	0x06, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x41, 0x43, 0x4c, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x52, 0x06, 0x54, 0x6f, 0x6b, 0x65,
+	0x6e, 0x73, 0x12, 0x39, 0x0a, 0x16, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64,
+	0x5f, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x54, 0x54, 0x4c, 0x18, 0x09, 0x20, 0x01,
+	0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x15, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74,
+	0x65, 0x64, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x54, 0x54, 0x4c, 0x12, 0x36, 0x0a,
+	0x16, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x50, 0x65, 0x72, 0x73,
+	0x69, 0x73, 0x74, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x16, 0x45,
+	0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x50, 0x65, 0x72, 0x73, 0x69, 0x73,
+	0x74, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x30, 0x0a, 0x13, 0x4d, 0x53, 0x50, 0x44, 0x69, 0x73, 0x61,
+	0x62, 0x6c, 0x65, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x18, 0x0b, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x13, 0x4d, 0x53, 0x50, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x6f,
+	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x22, 0xa4, 0x02, 0x0a, 0x09, 0x41, 0x43, 0x4c, 0x54,
+	0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x2c, 0x0a, 0x11, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c,
+	0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x11, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d,
+	0x65, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x65,
+	0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x41, 0x67,
+	0x65, 0x6e, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x44,
+	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x44, 0x65,
+	0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x71, 0x0a, 0x16, 0x4d,
+	0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f,
+	0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x41,
+	0x43, 0x4c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
+	0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x16, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x22, 0x55,
+	0x0a, 0x17, 0x41, 0x43, 0x4c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x76,
+	0x69, 0x64, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x41, 0x63, 0x63,
+	0x65, 0x73, 0x73, 0x6f, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x41,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x65, 0x63,
+	0x72, 0x65, 0x74, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x53, 0x65, 0x63,
+	0x72, 0x65, 0x74, 0x49, 0x44, 0x22, 0x69, 0x0a, 0x0b, 0x41, 0x75, 0x74, 0x6f, 0x45, 0x6e, 0x63,
+	0x72, 0x79, 0x70, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x03, 0x54, 0x4c, 0x53, 0x12, 0x16, 0x0a, 0x06, 0x44, 0x4e, 0x53, 0x53, 0x41, 0x4e,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x44, 0x4e, 0x53, 0x53, 0x41, 0x4e, 0x12, 0x14,
+	0x0a, 0x05, 0x49, 0x50, 0x53, 0x41, 0x4e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x49,
+	0x50, 0x53, 0x41, 0x4e, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x54, 0x4c, 0x53,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x54, 0x4c, 0x53,
+	0x42, 0x83, 0x02, 0x0a, 0x24, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x43, 0xaa, 0x02, 0x20, 0x48, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0xca, 0x02,
+	0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0xe2, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
+	0xea, 0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_pbconfig_config_proto_rawDescOnce sync.Once
+	file_proto_pbconfig_config_proto_rawDescData = file_proto_pbconfig_config_proto_rawDesc
+)
+
+func file_proto_pbconfig_config_proto_rawDescGZIP() []byte {
+	file_proto_pbconfig_config_proto_rawDescOnce.Do(func() {
+		file_proto_pbconfig_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbconfig_config_proto_rawDescData)
+	})
+	return file_proto_pbconfig_config_proto_rawDescData
+}
+
+var file_proto_pbconfig_config_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_proto_pbconfig_config_proto_goTypes = []interface{}{
+	(*Config)(nil),                  // 0: hashicorp.consul.internal.config.Config
+	(*Gossip)(nil),                  // 1: hashicorp.consul.internal.config.Gossip
+	(*GossipEncryption)(nil),        // 2: hashicorp.consul.internal.config.GossipEncryption
+	(*TLS)(nil),                     // 3: hashicorp.consul.internal.config.TLS
+	(*ACL)(nil),                     // 4: hashicorp.consul.internal.config.ACL
+	(*ACLTokens)(nil),               // 5: hashicorp.consul.internal.config.ACLTokens
+	(*ACLServiceProviderToken)(nil), // 6: hashicorp.consul.internal.config.ACLServiceProviderToken
+	(*AutoEncrypt)(nil),             // 7: hashicorp.consul.internal.config.AutoEncrypt
+}
+var file_proto_pbconfig_config_proto_depIdxs = []int32{
+	4, // 0: hashicorp.consul.internal.config.Config.ACL:type_name -> hashicorp.consul.internal.config.ACL
+	7, // 1: hashicorp.consul.internal.config.Config.AutoEncrypt:type_name -> hashicorp.consul.internal.config.AutoEncrypt
+	1, // 2: hashicorp.consul.internal.config.Config.Gossip:type_name -> hashicorp.consul.internal.config.Gossip
+	3, // 3: hashicorp.consul.internal.config.Config.TLS:type_name -> hashicorp.consul.internal.config.TLS
+	2, // 4: hashicorp.consul.internal.config.Gossip.Encryption:type_name -> hashicorp.consul.internal.config.GossipEncryption
+	5, // 5: hashicorp.consul.internal.config.ACL.Tokens:type_name -> hashicorp.consul.internal.config.ACLTokens
+	6, // 6: hashicorp.consul.internal.config.ACLTokens.ManagedServiceProvider:type_name -> hashicorp.consul.internal.config.ACLServiceProviderToken
+	7, // [7:7] is the sub-list for method output_type
+	7, // [7:7] is the sub-list for method input_type
+	7, // [7:7] is the sub-list for extension type_name
+	7, // [7:7] is the sub-list for extension extendee
+	0, // [0:7] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbconfig_config_proto_init() }
+func file_proto_pbconfig_config_proto_init() {
+	if File_proto_pbconfig_config_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbconfig_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Config); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfig_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Gossip); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfig_config_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GossipEncryption); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfig_config_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TLS); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfig_config_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ACL); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfig_config_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ACLTokens); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfig_config_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ACLServiceProviderToken); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfig_config_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AutoEncrypt); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbconfig_config_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   8,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbconfig_config_proto_goTypes,
+		DependencyIndexes: file_proto_pbconfig_config_proto_depIdxs,
+		MessageInfos:      file_proto_pbconfig_config_proto_msgTypes,
+	}.Build()
+	File_proto_pbconfig_config_proto = out.File
+	file_proto_pbconfig_config_proto_rawDesc = nil
+	file_proto_pbconfig_config_proto_goTypes = nil
+	file_proto_pbconfig_config_proto_depIdxs = nil
+}
diff --git a/proto/private/pbconfig/config.proto b/proto/pbconfig/config.proto
similarity index 95%
rename from proto/private/pbconfig/config.proto
rename to proto/pbconfig/config.proto
index 96a0f1cae04e5..749bc65e5cfef 100644
--- a/proto/private/pbconfig/config.proto
+++ b/proto/pbconfig/config.proto
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 syntax = "proto3";
 
 package hashicorp.consul.internal.config;
diff --git a/proto/pbconfigentry/config_entry.gen.go b/proto/pbconfigentry/config_entry.gen.go
new file mode 100644
index 0000000000000..5b6bf636508b9
--- /dev/null
+++ b/proto/pbconfigentry/config_entry.gen.go
@@ -0,0 +1,1792 @@
+// Code generated by mog. DO NOT EDIT.
+
+package pbconfigentry
+
+import "github.com/hashicorp/consul/agent/structs"
+
+func APIGatewayToStructs(s *APIGateway, t *structs.APIGatewayConfigEntry) {
+	if s == nil {
+		return
+	}
+	{
+		t.Listeners = make([]structs.APIGatewayListener, len(s.Listeners))
+		for i := range s.Listeners {
+			if s.Listeners[i] != nil {
+				APIGatewayListenerToStructs(s.Listeners[i], &t.Listeners[i])
+			}
+		}
+	}
+	if s.Status != nil {
+		StatusToStructs(s.Status, &t.Status)
+	}
+	t.Meta = s.Meta
+}
+func APIGatewayFromStructs(t *structs.APIGatewayConfigEntry, s *APIGateway) {
+	if s == nil {
+		return
+	}
+	{
+		s.Listeners = make([]*APIGatewayListener, len(t.Listeners))
+		for i := range t.Listeners {
+			{
+				var x APIGatewayListener
+				APIGatewayListenerFromStructs(&t.Listeners[i], &x)
+				s.Listeners[i] = &x
+			}
+		}
+	}
+	{
+		var x Status
+		StatusFromStructs(&t.Status, &x)
+		s.Status = &x
+	}
+	s.Meta = t.Meta
+}
+func APIGatewayListenerToStructs(s *APIGatewayListener, t *structs.APIGatewayListener) {
+	if s == nil {
+		return
+	}
+	t.Name = s.Name
+	t.Hostname = s.Hostname
+	t.Port = int(s.Port)
+	t.Protocol = apiGatewayProtocolToStructs(s.Protocol)
+	if s.TLS != nil {
+		APIGatewayTLSConfigurationToStructs(s.TLS, &t.TLS)
+	}
+}
+func APIGatewayListenerFromStructs(t *structs.APIGatewayListener, s *APIGatewayListener) {
+	if s == nil {
+		return
+	}
+	s.Name = t.Name
+	s.Hostname = t.Hostname
+	s.Port = int32(t.Port)
+	s.Protocol = apiGatewayProtocolFromStructs(t.Protocol)
+	{
+		var x APIGatewayTLSConfiguration
+		APIGatewayTLSConfigurationFromStructs(&t.TLS, &x)
+		s.TLS = &x
+	}
+}
+func APIGatewayTLSConfigurationToStructs(s *APIGatewayTLSConfiguration, t *structs.APIGatewayTLSConfiguration) {
+	if s == nil {
+		return
+	}
+	{
+		t.Certificates = make([]structs.ResourceReference, len(s.Certificates))
+		for i := range s.Certificates {
+			if s.Certificates[i] != nil {
+				ResourceReferenceToStructs(s.Certificates[i], &t.Certificates[i])
+			}
+		}
+	}
+	t.MaxVersion = tlsVersionToStructs(s.MaxVersion)
+	t.MinVersion = tlsVersionToStructs(s.MinVersion)
+	t.CipherSuites = cipherSuitesToStructs(s.CipherSuites)
+}
+func APIGatewayTLSConfigurationFromStructs(t *structs.APIGatewayTLSConfiguration, s *APIGatewayTLSConfiguration) {
+	if s == nil {
+		return
+	}
+	{
+		s.Certificates = make([]*ResourceReference, len(t.Certificates))
+		for i := range t.Certificates {
+			{
+				var x ResourceReference
+				ResourceReferenceFromStructs(&t.Certificates[i], &x)
+				s.Certificates[i] = &x
+			}
+		}
+	}
+	s.MaxVersion = tlsVersionFromStructs(t.MaxVersion)
+	s.MinVersion = tlsVersionFromStructs(t.MinVersion)
+	s.CipherSuites = cipherSuitesFromStructs(t.CipherSuites)
+}
+func BoundAPIGatewayToStructs(s *BoundAPIGateway, t *structs.BoundAPIGatewayConfigEntry) {
+	if s == nil {
+		return
+	}
+	{
+		t.Listeners = make([]structs.BoundAPIGatewayListener, len(s.Listeners))
+		for i := range s.Listeners {
+			if s.Listeners[i] != nil {
+				BoundAPIGatewayListenerToStructs(s.Listeners[i], &t.Listeners[i])
+			}
+		}
+	}
+	t.Meta = s.Meta
+}
+func BoundAPIGatewayFromStructs(t *structs.BoundAPIGatewayConfigEntry, s *BoundAPIGateway) {
+	if s == nil {
+		return
+	}
+	{
+		s.Listeners = make([]*BoundAPIGatewayListener, len(t.Listeners))
+		for i := range t.Listeners {
+			{
+				var x BoundAPIGatewayListener
+				BoundAPIGatewayListenerFromStructs(&t.Listeners[i], &x)
+				s.Listeners[i] = &x
+			}
+		}
+	}
+	s.Meta = t.Meta
+}
+func BoundAPIGatewayListenerToStructs(s *BoundAPIGatewayListener, t *structs.BoundAPIGatewayListener) {
+	if s == nil {
+		return
+	}
+	t.Name = s.Name
+	{
+		t.Routes = make([]structs.ResourceReference, len(s.Routes))
+		for i := range s.Routes {
+			if s.Routes[i] != nil {
+				ResourceReferenceToStructs(s.Routes[i], &t.Routes[i])
+			}
+		}
+	}
+	{
+		t.Certificates = make([]structs.ResourceReference, len(s.Certificates))
+		for i := range s.Certificates {
+			if s.Certificates[i] != nil {
+				ResourceReferenceToStructs(s.Certificates[i], &t.Certificates[i])
+			}
+		}
+	}
+}
+func BoundAPIGatewayListenerFromStructs(t *structs.BoundAPIGatewayListener, s *BoundAPIGatewayListener) {
+	if s == nil {
+		return
+	}
+	s.Name = t.Name
+	{
+		s.Routes = make([]*ResourceReference, len(t.Routes))
+		for i := range t.Routes {
+			{
+				var x ResourceReference
+				ResourceReferenceFromStructs(&t.Routes[i], &x)
+				s.Routes[i] = &x
+			}
+		}
+	}
+	{
+		s.Certificates = make([]*ResourceReference, len(t.Certificates))
+		for i := range t.Certificates {
+			{
+				var x ResourceReference
+				ResourceReferenceFromStructs(&t.Certificates[i], &x)
+				s.Certificates[i] = &x
+			}
+		}
+	}
+}
+func ConditionToStructs(s *Condition, t *structs.Condition) {
+	if s == nil {
+		return
+	}
+	t.Type = s.Type
+	t.Status = s.Status
+	t.Reason = s.Reason
+	t.Message = s.Message
+	if s.Resource != nil {
+		var x structs.ResourceReference
+		ResourceReferenceToStructs(s.Resource, &x)
+		t.Resource = &x
+	}
+	t.LastTransitionTime = timeToStructs(s.LastTransitionTime)
+}
+func ConditionFromStructs(t *structs.Condition, s *Condition) {
+	if s == nil {
+		return
+	}
+	s.Type = t.Type
+	s.Status = t.Status
+	s.Reason = t.Reason
+	s.Message = t.Message
+	if t.Resource != nil {
+		var x ResourceReference
+		ResourceReferenceFromStructs(t.Resource, &x)
+		s.Resource = &x
+	}
+	s.LastTransitionTime = timeFromStructs(t.LastTransitionTime)
+}
+func CookieConfigToStructs(s *CookieConfig, t *structs.CookieConfig) {
+	if s == nil {
+		return
+	}
+	t.Session = s.Session
+	t.TTL = structs.DurationFromProto(s.TTL)
+	t.Path = s.Path
+}
+func CookieConfigFromStructs(t *structs.CookieConfig, s *CookieConfig) {
+	if s == nil {
+		return
+	}
+	s.Session = t.Session
+	s.TTL = structs.DurationToProto(t.TTL)
+	s.Path = t.Path
+}
+func DestinationConfigToStructs(s *DestinationConfig, t *structs.DestinationConfig) {
+	if s == nil {
+		return
+	}
+	t.Addresses = s.Addresses
+	t.Port = int(s.Port)
+}
+func DestinationConfigFromStructs(t *structs.DestinationConfig, s *DestinationConfig) {
+	if s == nil {
+		return
+	}
+	s.Addresses = t.Addresses
+	s.Port = int32(t.Port)
+}
+func ExposeConfigToStructs(s *ExposeConfig, t *structs.ExposeConfig) {
+	if s == nil {
+		return
+	}
+	t.Checks = s.Checks
+	{
+		t.Paths = make([]structs.ExposePath, len(s.Paths))
+		for i := range s.Paths {
+			if s.Paths[i] != nil {
+				ExposePathToStructs(s.Paths[i], &t.Paths[i])
+			}
+		}
+	}
+}
+func ExposeConfigFromStructs(t *structs.ExposeConfig, s *ExposeConfig) {
+	if s == nil {
+		return
+	}
+	s.Checks = t.Checks
+	{
+		s.Paths = make([]*ExposePath, len(t.Paths))
+		for i := range t.Paths {
+			{
+				var x ExposePath
+				ExposePathFromStructs(&t.Paths[i], &x)
+				s.Paths[i] = &x
+			}
+		}
+	}
+}
+func ExposePathToStructs(s *ExposePath, t *structs.ExposePath) {
+	if s == nil {
+		return
+	}
+	t.ListenerPort = int(s.ListenerPort)
+	t.Path = s.Path
+	t.LocalPathPort = int(s.LocalPathPort)
+	t.Protocol = s.Protocol
+	t.ParsedFromCheck = s.ParsedFromCheck
+}
+func ExposePathFromStructs(t *structs.ExposePath, s *ExposePath) {
+	if s == nil {
+		return
+	}
+	s.ListenerPort = int32(t.ListenerPort)
+	s.Path = t.Path
+	s.LocalPathPort = int32(t.LocalPathPort)
+	s.Protocol = t.Protocol
+	s.ParsedFromCheck = t.ParsedFromCheck
+}
+func GatewayServiceTLSConfigToStructs(s *GatewayServiceTLSConfig, t *structs.GatewayServiceTLSConfig) {
+	if s == nil {
+		return
+	}
+	if s.SDS != nil {
+		var x structs.GatewayTLSSDSConfig
+		GatewayTLSSDSConfigToStructs(s.SDS, &x)
+		t.SDS = &x
+	}
+}
+func GatewayServiceTLSConfigFromStructs(t *structs.GatewayServiceTLSConfig, s *GatewayServiceTLSConfig) {
+	if s == nil {
+		return
+	}
+	if t.SDS != nil {
+		var x GatewayTLSSDSConfig
+		GatewayTLSSDSConfigFromStructs(t.SDS, &x)
+		s.SDS = &x
+	}
+}
+func GatewayTLSConfigToStructs(s *GatewayTLSConfig, t *structs.GatewayTLSConfig) {
+	if s == nil {
+		return
+	}
+	t.Enabled = s.Enabled
+	if s.SDS != nil {
+		var x structs.GatewayTLSSDSConfig
+		GatewayTLSSDSConfigToStructs(s.SDS, &x)
+		t.SDS = &x
+	}
+	t.TLSMinVersion = tlsVersionToStructs(s.TLSMinVersion)
+	t.TLSMaxVersion = tlsVersionToStructs(s.TLSMaxVersion)
+	t.CipherSuites = cipherSuitesToStructs(s.CipherSuites)
+}
+func GatewayTLSConfigFromStructs(t *structs.GatewayTLSConfig, s *GatewayTLSConfig) {
+	if s == nil {
+		return
+	}
+	s.Enabled = t.Enabled
+	if t.SDS != nil {
+		var x GatewayTLSSDSConfig
+		GatewayTLSSDSConfigFromStructs(t.SDS, &x)
+		s.SDS = &x
+	}
+	s.TLSMinVersion = tlsVersionFromStructs(t.TLSMinVersion)
+	s.TLSMaxVersion = tlsVersionFromStructs(t.TLSMaxVersion)
+	s.CipherSuites = cipherSuitesFromStructs(t.CipherSuites)
+}
+func GatewayTLSSDSConfigToStructs(s *GatewayTLSSDSConfig, t *structs.GatewayTLSSDSConfig) {
+	if s == nil {
+		return
+	}
+	t.ClusterName = s.ClusterName
+	t.CertResource = s.CertResource
+}
+func GatewayTLSSDSConfigFromStructs(t *structs.GatewayTLSSDSConfig, s *GatewayTLSSDSConfig) {
+	if s == nil {
+		return
+	}
+	s.ClusterName = t.ClusterName
+	s.CertResource = t.CertResource
+}
+func HTTPFiltersToStructs(s *HTTPFilters, t *structs.HTTPFilters) {
+	if s == nil {
+		return
+	}
+	{
+		t.Headers = make([]structs.HTTPHeaderFilter, len(s.Headers))
+		for i := range s.Headers {
+			if s.Headers[i] != nil {
+				HTTPHeaderFilterToStructs(s.Headers[i], &t.Headers[i])
+			}
+		}
+	}
+	if s.URLRewrite != nil {
+		var x structs.URLRewrite
+		URLRewriteToStructs(s.URLRewrite, &x)
+		t.URLRewrite = &x
+	}
+}
+func HTTPFiltersFromStructs(t *structs.HTTPFilters, s *HTTPFilters) {
+	if s == nil {
+		return
+	}
+	{
+		s.Headers = make([]*HTTPHeaderFilter, len(t.Headers))
+		for i := range t.Headers {
+			{
+				var x HTTPHeaderFilter
+				HTTPHeaderFilterFromStructs(&t.Headers[i], &x)
+				s.Headers[i] = &x
+			}
+		}
+	}
+	if t.URLRewrite != nil {
+		var x URLRewrite
+		URLRewriteFromStructs(t.URLRewrite, &x)
+		s.URLRewrite = &x
+	}
+}
+func HTTPHeaderFilterToStructs(s *HTTPHeaderFilter, t *structs.HTTPHeaderFilter) {
+	if s == nil {
+		return
+	}
+	t.Add = s.Add
+	t.Remove = s.Remove
+	t.Set = s.Set
+}
+func HTTPHeaderFilterFromStructs(t *structs.HTTPHeaderFilter, s *HTTPHeaderFilter) {
+	if s == nil {
+		return
+	}
+	s.Add = t.Add
+	s.Remove = t.Remove
+	s.Set = t.Set
+}
+func HTTPHeaderMatchToStructs(s *HTTPHeaderMatch, t *structs.HTTPHeaderMatch) {
+	if s == nil {
+		return
+	}
+	t.Match = httpHeaderMatchToStructs(s.Match)
+	t.Name = s.Name
+	t.Value = s.Value
+}
+func HTTPHeaderMatchFromStructs(t *structs.HTTPHeaderMatch, s *HTTPHeaderMatch) {
+	if s == nil {
+		return
+	}
+	s.Match = httpHeaderMatchFromStructs(t.Match)
+	s.Name = t.Name
+	s.Value = t.Value
+}
+func HTTPHeaderModifiersToStructs(s *HTTPHeaderModifiers, t *structs.HTTPHeaderModifiers) {
+	if s == nil {
+		return
+	}
+	t.Add = s.Add
+	t.Set = s.Set
+	t.Remove = s.Remove
+}
+func HTTPHeaderModifiersFromStructs(t *structs.HTTPHeaderModifiers, s *HTTPHeaderModifiers) {
+	if s == nil {
+		return
+	}
+	s.Add = t.Add
+	s.Set = t.Set
+	s.Remove = t.Remove
+}
+func HTTPMatchToStructs(s *HTTPMatch, t *structs.HTTPMatch) {
+	if s == nil {
+		return
+	}
+	{
+		t.Headers = make([]structs.HTTPHeaderMatch, len(s.Headers))
+		for i := range s.Headers {
+			if s.Headers[i] != nil {
+				HTTPHeaderMatchToStructs(s.Headers[i], &t.Headers[i])
+			}
+		}
+	}
+	t.Method = httpMatchMethodToStructs(s.Method)
+	if s.Path != nil {
+		HTTPPathMatchToStructs(s.Path, &t.Path)
+	}
+	{
+		t.Query = make([]structs.HTTPQueryMatch, len(s.Query))
+		for i := range s.Query {
+			if s.Query[i] != nil {
+				HTTPQueryMatchToStructs(s.Query[i], &t.Query[i])
+			}
+		}
+	}
+}
+func HTTPMatchFromStructs(t *structs.HTTPMatch, s *HTTPMatch) {
+	if s == nil {
+		return
+	}
+	{
+		s.Headers = make([]*HTTPHeaderMatch, len(t.Headers))
+		for i := range t.Headers {
+			{
+				var x HTTPHeaderMatch
+				HTTPHeaderMatchFromStructs(&t.Headers[i], &x)
+				s.Headers[i] = &x
+			}
+		}
+	}
+	s.Method = httpMatchMethodFromStructs(t.Method)
+	{
+		var x HTTPPathMatch
+		HTTPPathMatchFromStructs(&t.Path, &x)
+		s.Path = &x
+	}
+	{
+		s.Query = make([]*HTTPQueryMatch, len(t.Query))
+		for i := range t.Query {
+			{
+				var x HTTPQueryMatch
+				HTTPQueryMatchFromStructs(&t.Query[i], &x)
+				s.Query[i] = &x
+			}
+		}
+	}
+}
+func HTTPPathMatchToStructs(s *HTTPPathMatch, t *structs.HTTPPathMatch) {
+	if s == nil {
+		return
+	}
+	t.Match = httpPathMatchToStructs(s.Match)
+	t.Value = s.Value
+}
+func HTTPPathMatchFromStructs(t *structs.HTTPPathMatch, s *HTTPPathMatch) {
+	if s == nil {
+		return
+	}
+	s.Match = httpPathMatchFromStructs(t.Match)
+	s.Value = t.Value
+}
+func HTTPQueryMatchToStructs(s *HTTPQueryMatch, t *structs.HTTPQueryMatch) {
+	if s == nil {
+		return
+	}
+	t.Match = httpQueryMatchToStructs(s.Match)
+	t.Name = s.Name
+	t.Value = s.Value
+}
+func HTTPQueryMatchFromStructs(t *structs.HTTPQueryMatch, s *HTTPQueryMatch) {
+	if s == nil {
+		return
+	}
+	s.Match = httpQueryMatchFromStructs(t.Match)
+	s.Name = t.Name
+	s.Value = t.Value
+}
+func HTTPRouteToStructs(s *HTTPRoute, t *structs.HTTPRouteConfigEntry) {
+	if s == nil {
+		return
+	}
+	{
+		t.Parents = make([]structs.ResourceReference, len(s.Parents))
+		for i := range s.Parents {
+			if s.Parents[i] != nil {
+				ResourceReferenceToStructs(s.Parents[i], &t.Parents[i])
+			}
+		}
+	}
+	{
+		t.Rules = make([]structs.HTTPRouteRule, len(s.Rules))
+		for i := range s.Rules {
+			if s.Rules[i] != nil {
+				HTTPRouteRuleToStructs(s.Rules[i], &t.Rules[i])
+			}
+		}
+	}
+	t.Hostnames = s.Hostnames
+	t.Meta = s.Meta
+	if s.Status != nil {
+		StatusToStructs(s.Status, &t.Status)
+	}
+}
+func HTTPRouteFromStructs(t *structs.HTTPRouteConfigEntry, s *HTTPRoute) {
+	if s == nil {
+		return
+	}
+	{
+		s.Parents = make([]*ResourceReference, len(t.Parents))
+		for i := range t.Parents {
+			{
+				var x ResourceReference
+				ResourceReferenceFromStructs(&t.Parents[i], &x)
+				s.Parents[i] = &x
+			}
+		}
+	}
+	{
+		s.Rules = make([]*HTTPRouteRule, len(t.Rules))
+		for i := range t.Rules {
+			{
+				var x HTTPRouteRule
+				HTTPRouteRuleFromStructs(&t.Rules[i], &x)
+				s.Rules[i] = &x
+			}
+		}
+	}
+	s.Hostnames = t.Hostnames
+	s.Meta = t.Meta
+	{
+		var x Status
+		StatusFromStructs(&t.Status, &x)
+		s.Status = &x
+	}
+}
+func HTTPRouteRuleToStructs(s *HTTPRouteRule, t *structs.HTTPRouteRule) {
+	if s == nil {
+		return
+	}
+	if s.Filters != nil {
+		HTTPFiltersToStructs(s.Filters, &t.Filters)
+	}
+	{
+		t.Matches = make([]structs.HTTPMatch, len(s.Matches))
+		for i := range s.Matches {
+			if s.Matches[i] != nil {
+				HTTPMatchToStructs(s.Matches[i], &t.Matches[i])
+			}
+		}
+	}
+	{
+		t.Services = make([]structs.HTTPService, len(s.Services))
+		for i := range s.Services {
+			if s.Services[i] != nil {
+				HTTPServiceToStructs(s.Services[i], &t.Services[i])
+			}
+		}
+	}
+}
+func HTTPRouteRuleFromStructs(t *structs.HTTPRouteRule, s *HTTPRouteRule) {
+	if s == nil {
+		return
+	}
+	{
+		var x HTTPFilters
+		HTTPFiltersFromStructs(&t.Filters, &x)
+		s.Filters = &x
+	}
+	{
+		s.Matches = make([]*HTTPMatch, len(t.Matches))
+		for i := range t.Matches {
+			{
+				var x HTTPMatch
+				HTTPMatchFromStructs(&t.Matches[i], &x)
+				s.Matches[i] = &x
+			}
+		}
+	}
+	{
+		s.Services = make([]*HTTPService, len(t.Services))
+		for i := range t.Services {
+			{
+				var x HTTPService
+				HTTPServiceFromStructs(&t.Services[i], &x)
+				s.Services[i] = &x
+			}
+		}
+	}
+}
+func HTTPServiceToStructs(s *HTTPService, t *structs.HTTPService) {
+	if s == nil {
+		return
+	}
+	t.Name = s.Name
+	t.Weight = int(s.Weight)
+	if s.Filters != nil {
+		HTTPFiltersToStructs(s.Filters, &t.Filters)
+	}
+	t.EnterpriseMeta = enterpriseMetaToStructs(s.EnterpriseMeta)
+}
+func HTTPServiceFromStructs(t *structs.HTTPService, s *HTTPService) {
+	if s == nil {
+		return
+	}
+	s.Name = t.Name
+	s.Weight = int32(t.Weight)
+	{
+		var x HTTPFilters
+		HTTPFiltersFromStructs(&t.Filters, &x)
+		s.Filters = &x
+	}
+	s.EnterpriseMeta = enterpriseMetaFromStructs(t.EnterpriseMeta)
+}
+func HashPolicyToStructs(s *HashPolicy, t *structs.HashPolicy) {
+	if s == nil {
+		return
+	}
+	t.Field = s.Field
+	t.FieldValue = s.FieldValue
+	if s.CookieConfig != nil {
+		var x structs.CookieConfig
+		CookieConfigToStructs(s.CookieConfig, &x)
+		t.CookieConfig = &x
+	}
+	t.SourceIP = s.SourceIP
+	t.Terminal = s.Terminal
+}
+func HashPolicyFromStructs(t *structs.HashPolicy, s *HashPolicy) {
+	if s == nil {
+		return
+	}
+	s.Field = t.Field
+	s.FieldValue = t.FieldValue
+	if t.CookieConfig != nil {
+		var x CookieConfig
+		CookieConfigFromStructs(t.CookieConfig, &x)
+		s.CookieConfig = &x
+	}
+	s.SourceIP = t.SourceIP
+	s.Terminal = t.Terminal
+}
+func IngressGatewayToStructs(s *IngressGateway, t *structs.IngressGatewayConfigEntry) {
+	if s == nil {
+		return
+	}
+	if s.TLS != nil {
+		GatewayTLSConfigToStructs(s.TLS, &t.TLS)
+	}
+	{
+		t.Listeners = make([]structs.IngressListener, len(s.Listeners))
+		for i := range s.Listeners {
+			if s.Listeners[i] != nil {
+				IngressListenerToStructs(s.Listeners[i], &t.Listeners[i])
+			}
+		}
+	}
+	if s.Defaults != nil {
+		var x structs.IngressServiceConfig
+		IngressServiceConfigToStructs(s.Defaults, &x)
+		t.Defaults = &x
+	}
+	t.Meta = s.Meta
+}
+func IngressGatewayFromStructs(t *structs.IngressGatewayConfigEntry, s *IngressGateway) {
+	if s == nil {
+		return
+	}
+	{
+		var x GatewayTLSConfig
+		GatewayTLSConfigFromStructs(&t.TLS, &x)
+		s.TLS = &x
+	}
+	{
+		s.Listeners = make([]*IngressListener, len(t.Listeners))
+		for i := range t.Listeners {
+			{
+				var x IngressListener
+				IngressListenerFromStructs(&t.Listeners[i], &x)
+				s.Listeners[i] = &x
+			}
+		}
+	}
+	if t.Defaults != nil {
+		var x IngressServiceConfig
+		IngressServiceConfigFromStructs(t.Defaults, &x)
+		s.Defaults = &x
+	}
+	s.Meta = t.Meta
+}
+func IngressListenerToStructs(s *IngressListener, t *structs.IngressListener) {
+	if s == nil {
+		return
+	}
+	t.Port = int(s.Port)
+	t.Protocol = s.Protocol
+	if s.TLS != nil {
+		var x structs.GatewayTLSConfig
+		GatewayTLSConfigToStructs(s.TLS, &x)
+		t.TLS = &x
+	}
+	{
+		t.Services = make([]structs.IngressService, len(s.Services))
+		for i := range s.Services {
+			if s.Services[i] != nil {
+				IngressServiceToStructs(s.Services[i], &t.Services[i])
+			}
+		}
+	}
+}
+func IngressListenerFromStructs(t *structs.IngressListener, s *IngressListener) {
+	if s == nil {
+		return
+	}
+	s.Port = int32(t.Port)
+	s.Protocol = t.Protocol
+	if t.TLS != nil {
+		var x GatewayTLSConfig
+		GatewayTLSConfigFromStructs(t.TLS, &x)
+		s.TLS = &x
+	}
+	{
+		s.Services = make([]*IngressService, len(t.Services))
+		for i := range t.Services {
+			{
+				var x IngressService
+				IngressServiceFromStructs(&t.Services[i], &x)
+				s.Services[i] = &x
+			}
+		}
+	}
+}
+func IngressServiceToStructs(s *IngressService, t *structs.IngressService) {
+	if s == nil {
+		return
+	}
+	t.Name = s.Name
+	t.Hosts = s.Hosts
+	if s.TLS != nil {
+		var x structs.GatewayServiceTLSConfig
+		GatewayServiceTLSConfigToStructs(s.TLS, &x)
+		t.TLS = &x
+	}
+	if s.RequestHeaders != nil {
+		var x structs.HTTPHeaderModifiers
+		HTTPHeaderModifiersToStructs(s.RequestHeaders, &x)
+		t.RequestHeaders = &x
+	}
+	if s.ResponseHeaders != nil {
+		var x structs.HTTPHeaderModifiers
+		HTTPHeaderModifiersToStructs(s.ResponseHeaders, &x)
+		t.ResponseHeaders = &x
+	}
+	t.MaxConnections = s.MaxConnections
+	t.MaxPendingRequests = s.MaxPendingRequests
+	t.MaxConcurrentRequests = s.MaxConcurrentRequests
+	if s.PassiveHealthCheck != nil {
+		var x structs.PassiveHealthCheck
+		PassiveHealthCheckToStructs(s.PassiveHealthCheck, &x)
+		t.PassiveHealthCheck = &x
+	}
+	t.Meta = s.Meta
+	t.EnterpriseMeta = enterpriseMetaToStructs(s.EnterpriseMeta)
+}
+func IngressServiceFromStructs(t *structs.IngressService, s *IngressService) {
+	if s == nil {
+		return
+	}
+	s.Name = t.Name
+	s.Hosts = t.Hosts
+	if t.TLS != nil {
+		var x GatewayServiceTLSConfig
+		GatewayServiceTLSConfigFromStructs(t.TLS, &x)
+		s.TLS = &x
+	}
+	if t.RequestHeaders != nil {
+		var x HTTPHeaderModifiers
+		HTTPHeaderModifiersFromStructs(t.RequestHeaders, &x)
+		s.RequestHeaders = &x
+	}
+	if t.ResponseHeaders != nil {
+		var x HTTPHeaderModifiers
+		HTTPHeaderModifiersFromStructs(t.ResponseHeaders, &x)
+		s.ResponseHeaders = &x
+	}
+	s.MaxConnections = t.MaxConnections
+	s.MaxPendingRequests = t.MaxPendingRequests
+	s.MaxConcurrentRequests = t.MaxConcurrentRequests
+	if t.PassiveHealthCheck != nil {
+		var x PassiveHealthCheck
+		PassiveHealthCheckFromStructs(t.PassiveHealthCheck, &x)
+		s.PassiveHealthCheck = &x
+	}
+	s.Meta = t.Meta
+	s.EnterpriseMeta = enterpriseMetaFromStructs(t.EnterpriseMeta)
+}
+func IngressServiceConfigToStructs(s *IngressServiceConfig, t *structs.IngressServiceConfig) {
+	if s == nil {
+		return
+	}
+	t.MaxConnections = s.MaxConnections
+	t.MaxPendingRequests = s.MaxPendingRequests
+	t.MaxConcurrentRequests = s.MaxConcurrentRequests
+	if s.PassiveHealthCheck != nil {
+		var x structs.PassiveHealthCheck
+		PassiveHealthCheckToStructs(s.PassiveHealthCheck, &x)
+		t.PassiveHealthCheck = &x
+	}
+}
+func IngressServiceConfigFromStructs(t *structs.IngressServiceConfig, s *IngressServiceConfig) {
+	if s == nil {
+		return
+	}
+	s.MaxConnections = t.MaxConnections
+	s.MaxPendingRequests = t.MaxPendingRequests
+	s.MaxConcurrentRequests = t.MaxConcurrentRequests
+	if t.PassiveHealthCheck != nil {
+		var x PassiveHealthCheck
+		PassiveHealthCheckFromStructs(t.PassiveHealthCheck, &x)
+		s.PassiveHealthCheck = &x
+	}
+}
+func InlineCertificateToStructs(s *InlineCertificate, t *structs.InlineCertificateConfigEntry) {
+	if s == nil {
+		return
+	}
+	t.Certificate = s.Certificate
+	t.PrivateKey = s.PrivateKey
+	t.Meta = s.Meta
+}
+func InlineCertificateFromStructs(t *structs.InlineCertificateConfigEntry, s *InlineCertificate) {
+	if s == nil {
+		return
+	}
+	s.Certificate = t.Certificate
+	s.PrivateKey = t.PrivateKey
+	s.Meta = t.Meta
+}
+func IntentionHTTPHeaderPermissionToStructs(s *IntentionHTTPHeaderPermission, t *structs.IntentionHTTPHeaderPermission) {
+	if s == nil {
+		return
+	}
+	t.Name = s.Name
+	t.Present = s.Present
+	t.Exact = s.Exact
+	t.Prefix = s.Prefix
+	t.Suffix = s.Suffix
+	t.Regex = s.Regex
+	t.Invert = s.Invert
+}
+func IntentionHTTPHeaderPermissionFromStructs(t *structs.IntentionHTTPHeaderPermission, s *IntentionHTTPHeaderPermission) {
+	if s == nil {
+		return
+	}
+	s.Name = t.Name
+	s.Present = t.Present
+	s.Exact = t.Exact
+	s.Prefix = t.Prefix
+	s.Suffix = t.Suffix
+	s.Regex = t.Regex
+	s.Invert = t.Invert
+}
+func IntentionHTTPPermissionToStructs(s *IntentionHTTPPermission, t *structs.IntentionHTTPPermission) {
+	if s == nil {
+		return
+	}
+	t.PathExact = s.PathExact
+	t.PathPrefix = s.PathPrefix
+	t.PathRegex = s.PathRegex
+	{
+		t.Header = make([]structs.IntentionHTTPHeaderPermission, len(s.Header))
+		for i := range s.Header {
+			if s.Header[i] != nil {
+				IntentionHTTPHeaderPermissionToStructs(s.Header[i], &t.Header[i])
+			}
+		}
+	}
+	t.Methods = s.Methods
+}
+func IntentionHTTPPermissionFromStructs(t *structs.IntentionHTTPPermission, s *IntentionHTTPPermission) {
+	if s == nil {
+		return
+	}
+	s.PathExact = t.PathExact
+	s.PathPrefix = t.PathPrefix
+	s.PathRegex = t.PathRegex
+	{
+		s.Header = make([]*IntentionHTTPHeaderPermission, len(t.Header))
+		for i := range t.Header {
+			{
+				var x IntentionHTTPHeaderPermission
+				IntentionHTTPHeaderPermissionFromStructs(&t.Header[i], &x)
+				s.Header[i] = &x
+			}
+		}
+	}
+	s.Methods = t.Methods
+}
+func IntentionPermissionToStructs(s *IntentionPermission, t *structs.IntentionPermission) {
+	if s == nil {
+		return
+	}
+	t.Action = intentionActionToStructs(s.Action)
+	if s.HTTP != nil {
+		var x structs.IntentionHTTPPermission
+		IntentionHTTPPermissionToStructs(s.HTTP, &x)
+		t.HTTP = &x
+	}
+}
+func IntentionPermissionFromStructs(t *structs.IntentionPermission, s *IntentionPermission) {
+	if s == nil {
+		return
+	}
+	s.Action = intentionActionFromStructs(t.Action)
+	if t.HTTP != nil {
+		var x IntentionHTTPPermission
+		IntentionHTTPPermissionFromStructs(t.HTTP, &x)
+		s.HTTP = &x
+	}
+}
+func LeastRequestConfigToStructs(s *LeastRequestConfig, t *structs.LeastRequestConfig) {
+	if s == nil {
+		return
+	}
+	t.ChoiceCount = s.ChoiceCount
+}
+func LeastRequestConfigFromStructs(t *structs.LeastRequestConfig, s *LeastRequestConfig) {
+	if s == nil {
+		return
+	}
+	s.ChoiceCount = t.ChoiceCount
+}
+func LoadBalancerToStructs(s *LoadBalancer, t *structs.LoadBalancer) {
+	if s == nil {
+		return
+	}
+	t.Policy = s.Policy
+	if s.RingHashConfig != nil {
+		var x structs.RingHashConfig
+		RingHashConfigToStructs(s.RingHashConfig, &x)
+		t.RingHashConfig = &x
+	}
+	if s.LeastRequestConfig != nil {
+		var x structs.LeastRequestConfig
+		LeastRequestConfigToStructs(s.LeastRequestConfig, &x)
+		t.LeastRequestConfig = &x
+	}
+	{
+		t.HashPolicies = make([]structs.HashPolicy, len(s.HashPolicies))
+		for i := range s.HashPolicies {
+			if s.HashPolicies[i] != nil {
+				HashPolicyToStructs(s.HashPolicies[i], &t.HashPolicies[i])
+			}
+		}
+	}
+}
+func LoadBalancerFromStructs(t *structs.LoadBalancer, s *LoadBalancer) {
+	if s == nil {
+		return
+	}
+	s.Policy = t.Policy
+	if t.RingHashConfig != nil {
+		var x RingHashConfig
+		RingHashConfigFromStructs(t.RingHashConfig, &x)
+		s.RingHashConfig = &x
+	}
+	if t.LeastRequestConfig != nil {
+		var x LeastRequestConfig
+		LeastRequestConfigFromStructs(t.LeastRequestConfig, &x)
+		s.LeastRequestConfig = &x
+	}
+	{
+		s.HashPolicies = make([]*HashPolicy, len(t.HashPolicies))
+		for i := range t.HashPolicies {
+			{
+				var x HashPolicy
+				HashPolicyFromStructs(&t.HashPolicies[i], &x)
+				s.HashPolicies[i] = &x
+			}
+		}
+	}
+}
+func MeshConfigToStructs(s *MeshConfig, t *structs.MeshConfigEntry) {
+	if s == nil {
+		return
+	}
+	if s.TransparentProxy != nil {
+		TransparentProxyMeshConfigToStructs(s.TransparentProxy, &t.TransparentProxy)
+	}
+	if s.TLS != nil {
+		var x structs.MeshTLSConfig
+		MeshTLSConfigToStructs(s.TLS, &x)
+		t.TLS = &x
+	}
+	if s.HTTP != nil {
+		var x structs.MeshHTTPConfig
+		MeshHTTPConfigToStructs(s.HTTP, &x)
+		t.HTTP = &x
+	}
+	if s.Peering != nil {
+		var x structs.PeeringMeshConfig
+		PeeringMeshConfigToStructs(s.Peering, &x)
+		t.Peering = &x
+	}
+	t.Meta = s.Meta
+}
+func MeshConfigFromStructs(t *structs.MeshConfigEntry, s *MeshConfig) {
+	if s == nil {
+		return
+	}
+	{
+		var x TransparentProxyMeshConfig
+		TransparentProxyMeshConfigFromStructs(&t.TransparentProxy, &x)
+		s.TransparentProxy = &x
+	}
+	if t.TLS != nil {
+		var x MeshTLSConfig
+		MeshTLSConfigFromStructs(t.TLS, &x)
+		s.TLS = &x
+	}
+	if t.HTTP != nil {
+		var x MeshHTTPConfig
+		MeshHTTPConfigFromStructs(t.HTTP, &x)
+		s.HTTP = &x
+	}
+	if t.Peering != nil {
+		var x PeeringMeshConfig
+		PeeringMeshConfigFromStructs(t.Peering, &x)
+		s.Peering = &x
+	}
+	s.Meta = t.Meta
+}
+func MeshDirectionalTLSConfigToStructs(s *MeshDirectionalTLSConfig, t *structs.MeshDirectionalTLSConfig) {
+	if s == nil {
+		return
+	}
+	t.TLSMinVersion = tlsVersionToStructs(s.TLSMinVersion)
+	t.TLSMaxVersion = tlsVersionToStructs(s.TLSMaxVersion)
+	t.CipherSuites = cipherSuitesToStructs(s.CipherSuites)
+}
+func MeshDirectionalTLSConfigFromStructs(t *structs.MeshDirectionalTLSConfig, s *MeshDirectionalTLSConfig) {
+	if s == nil {
+		return
+	}
+	s.TLSMinVersion = tlsVersionFromStructs(t.TLSMinVersion)
+	s.TLSMaxVersion = tlsVersionFromStructs(t.TLSMaxVersion)
+	s.CipherSuites = cipherSuitesFromStructs(t.CipherSuites)
+}
+func MeshGatewayConfigToStructs(s *MeshGatewayConfig, t *structs.MeshGatewayConfig) {
+	if s == nil {
+		return
+	}
+	t.Mode = meshGatewayModeToStructs(s.Mode)
+}
+func MeshGatewayConfigFromStructs(t *structs.MeshGatewayConfig, s *MeshGatewayConfig) {
+	if s == nil {
+		return
+	}
+	s.Mode = meshGatewayModeFromStructs(t.Mode)
+}
+func MeshHTTPConfigToStructs(s *MeshHTTPConfig, t *structs.MeshHTTPConfig) {
+	if s == nil {
+		return
+	}
+	t.SanitizeXForwardedClientCert = s.SanitizeXForwardedClientCert
+}
+func MeshHTTPConfigFromStructs(t *structs.MeshHTTPConfig, s *MeshHTTPConfig) {
+	if s == nil {
+		return
+	}
+	s.SanitizeXForwardedClientCert = t.SanitizeXForwardedClientCert
+}
+func MeshTLSConfigToStructs(s *MeshTLSConfig, t *structs.MeshTLSConfig) {
+	if s == nil {
+		return
+	}
+	if s.Incoming != nil {
+		var x structs.MeshDirectionalTLSConfig
+		MeshDirectionalTLSConfigToStructs(s.Incoming, &x)
+		t.Incoming = &x
+	}
+	if s.Outgoing != nil {
+		var x structs.MeshDirectionalTLSConfig
+		MeshDirectionalTLSConfigToStructs(s.Outgoing, &x)
+		t.Outgoing = &x
+	}
+}
+func MeshTLSConfigFromStructs(t *structs.MeshTLSConfig, s *MeshTLSConfig) {
+	if s == nil {
+		return
+	}
+	if t.Incoming != nil {
+		var x MeshDirectionalTLSConfig
+		MeshDirectionalTLSConfigFromStructs(t.Incoming, &x)
+		s.Incoming = &x
+	}
+	if t.Outgoing != nil {
+		var x MeshDirectionalTLSConfig
+		MeshDirectionalTLSConfigFromStructs(t.Outgoing, &x)
+		s.Outgoing = &x
+	}
+}
+func PassiveHealthCheckToStructs(s *PassiveHealthCheck, t *structs.PassiveHealthCheck) {
+	if s == nil {
+		return
+	}
+	t.Interval = structs.DurationFromProto(s.Interval)
+	t.MaxFailures = s.MaxFailures
+	t.EnforcingConsecutive5xx = pointerToUint32FromUint32(s.EnforcingConsecutive5Xx)
+	t.MaxEjectionPercent = pointerToUint32FromUint32(s.MaxEjectionPercent)
+	t.BaseEjectionTime = structs.DurationPointerFromProto(s.BaseEjectionTime)
+}
+func PassiveHealthCheckFromStructs(t *structs.PassiveHealthCheck, s *PassiveHealthCheck) {
+	if s == nil {
+		return
+	}
+	s.Interval = structs.DurationToProto(t.Interval)
+	s.MaxFailures = t.MaxFailures
+	s.EnforcingConsecutive5Xx = uint32FromPointerToUint32(t.EnforcingConsecutive5xx)
+	s.MaxEjectionPercent = uint32FromPointerToUint32(t.MaxEjectionPercent)
+	s.BaseEjectionTime = structs.DurationPointerToProto(t.BaseEjectionTime)
+}
+func PeeringMeshConfigToStructs(s *PeeringMeshConfig, t *structs.PeeringMeshConfig) {
+	if s == nil {
+		return
+	}
+	t.PeerThroughMeshGateways = s.PeerThroughMeshGateways
+}
+func PeeringMeshConfigFromStructs(t *structs.PeeringMeshConfig, s *PeeringMeshConfig) {
+	if s == nil {
+		return
+	}
+	s.PeerThroughMeshGateways = t.PeerThroughMeshGateways
+}
+func ResourceReferenceToStructs(s *ResourceReference, t *structs.ResourceReference) {
+	if s == nil {
+		return
+	}
+	t.Kind = s.Kind
+	t.Name = s.Name
+	t.SectionName = s.SectionName
+	t.EnterpriseMeta = enterpriseMetaToStructs(s.EnterpriseMeta)
+}
+func ResourceReferenceFromStructs(t *structs.ResourceReference, s *ResourceReference) {
+	if s == nil {
+		return
+	}
+	s.Kind = t.Kind
+	s.Name = t.Name
+	s.SectionName = t.SectionName
+	s.EnterpriseMeta = enterpriseMetaFromStructs(t.EnterpriseMeta)
+}
+func RingHashConfigToStructs(s *RingHashConfig, t *structs.RingHashConfig) {
+	if s == nil {
+		return
+	}
+	t.MinimumRingSize = s.MinimumRingSize
+	t.MaximumRingSize = s.MaximumRingSize
+}
+func RingHashConfigFromStructs(t *structs.RingHashConfig, s *RingHashConfig) {
+	if s == nil {
+		return
+	}
+	s.MinimumRingSize = t.MinimumRingSize
+	s.MaximumRingSize = t.MaximumRingSize
+}
+func ServiceDefaultsToStructs(s *ServiceDefaults, t *structs.ServiceConfigEntry) {
+	if s == nil {
+		return
+	}
+	t.Protocol = s.Protocol
+	t.Mode = proxyModeToStructs(s.Mode)
+	if s.TransparentProxy != nil {
+		TransparentProxyConfigToStructs(s.TransparentProxy, &t.TransparentProxy)
+	}
+	if s.MeshGateway != nil {
+		MeshGatewayConfigToStructs(s.MeshGateway, &t.MeshGateway)
+	}
+	if s.Expose != nil {
+		ExposeConfigToStructs(s.Expose, &t.Expose)
+	}
+	t.ExternalSNI = s.ExternalSNI
+	if s.UpstreamConfig != nil {
+		var x structs.UpstreamConfiguration
+		UpstreamConfigurationToStructs(s.UpstreamConfig, &x)
+		t.UpstreamConfig = &x
+	}
+	if s.Destination != nil {
+		var x structs.DestinationConfig
+		DestinationConfigToStructs(s.Destination, &x)
+		t.Destination = &x
+	}
+	t.MaxInboundConnections = int(s.MaxInboundConnections)
+	t.LocalConnectTimeoutMs = int(s.LocalConnectTimeoutMs)
+	t.LocalRequestTimeoutMs = int(s.LocalRequestTimeoutMs)
+	t.BalanceInboundConnections = s.BalanceInboundConnections
+	t.EnvoyExtensions = EnvoyExtensionsToStructs(s.EnvoyExtensions)
+	t.Meta = s.Meta
+}
+func ServiceDefaultsFromStructs(t *structs.ServiceConfigEntry, s *ServiceDefaults) {
+	if s == nil {
+		return
+	}
+	s.Protocol = t.Protocol
+	s.Mode = proxyModeFromStructs(t.Mode)
+	{
+		var x TransparentProxyConfig
+		TransparentProxyConfigFromStructs(&t.TransparentProxy, &x)
+		s.TransparentProxy = &x
+	}
+	{
+		var x MeshGatewayConfig
+		MeshGatewayConfigFromStructs(&t.MeshGateway, &x)
+		s.MeshGateway = &x
+	}
+	{
+		var x ExposeConfig
+		ExposeConfigFromStructs(&t.Expose, &x)
+		s.Expose = &x
+	}
+	s.ExternalSNI = t.ExternalSNI
+	if t.UpstreamConfig != nil {
+		var x UpstreamConfiguration
+		UpstreamConfigurationFromStructs(t.UpstreamConfig, &x)
+		s.UpstreamConfig = &x
+	}
+	if t.Destination != nil {
+		var x DestinationConfig
+		DestinationConfigFromStructs(t.Destination, &x)
+		s.Destination = &x
+	}
+	s.MaxInboundConnections = int32(t.MaxInboundConnections)
+	s.LocalConnectTimeoutMs = int32(t.LocalConnectTimeoutMs)
+	s.LocalRequestTimeoutMs = int32(t.LocalRequestTimeoutMs)
+	s.BalanceInboundConnections = t.BalanceInboundConnections
+	s.EnvoyExtensions = EnvoyExtensionsFromStructs(t.EnvoyExtensions)
+	s.Meta = t.Meta
+}
+func ServiceIntentionsToStructs(s *ServiceIntentions, t *structs.ServiceIntentionsConfigEntry) {
+	if s == nil {
+		return
+	}
+	{
+		t.Sources = make([]*structs.SourceIntention, len(s.Sources))
+		for i := range s.Sources {
+			if s.Sources[i] != nil {
+				var x structs.SourceIntention
+				SourceIntentionToStructs(s.Sources[i], &x)
+				t.Sources[i] = &x
+			}
+		}
+	}
+	t.Meta = s.Meta
+}
+func ServiceIntentionsFromStructs(t *structs.ServiceIntentionsConfigEntry, s *ServiceIntentions) {
+	if s == nil {
+		return
+	}
+	{
+		s.Sources = make([]*SourceIntention, len(t.Sources))
+		for i := range t.Sources {
+			if t.Sources[i] != nil {
+				var x SourceIntention
+				SourceIntentionFromStructs(t.Sources[i], &x)
+				s.Sources[i] = &x
+			}
+		}
+	}
+	s.Meta = t.Meta
+}
+func ServiceResolverToStructs(s *ServiceResolver, t *structs.ServiceResolverConfigEntry) {
+	if s == nil {
+		return
+	}
+	t.DefaultSubset = s.DefaultSubset
+	{
+		t.Subsets = make(map[string]structs.ServiceResolverSubset, len(s.Subsets))
+		for k, v := range s.Subsets {
+			var y structs.ServiceResolverSubset
+			if v != nil {
+				ServiceResolverSubsetToStructs(v, &y)
+			}
+			t.Subsets[k] = y
+		}
+	}
+	if s.Redirect != nil {
+		var x structs.ServiceResolverRedirect
+		ServiceResolverRedirectToStructs(s.Redirect, &x)
+		t.Redirect = &x
+	}
+	{
+		t.Failover = make(map[string]structs.ServiceResolverFailover, len(s.Failover))
+		for k, v := range s.Failover {
+			var y structs.ServiceResolverFailover
+			if v != nil {
+				ServiceResolverFailoverToStructs(v, &y)
+			}
+			t.Failover[k] = y
+		}
+	}
+	t.ConnectTimeout = structs.DurationFromProto(s.ConnectTimeout)
+	t.RequestTimeout = structs.DurationFromProto(s.RequestTimeout)
+	if s.LoadBalancer != nil {
+		var x structs.LoadBalancer
+		LoadBalancerToStructs(s.LoadBalancer, &x)
+		t.LoadBalancer = &x
+	}
+	t.Meta = s.Meta
+}
+func ServiceResolverFromStructs(t *structs.ServiceResolverConfigEntry, s *ServiceResolver) {
+	if s == nil {
+		return
+	}
+	s.DefaultSubset = t.DefaultSubset
+	{
+		s.Subsets = make(map[string]*ServiceResolverSubset, len(t.Subsets))
+		for k, v := range t.Subsets {
+			var y *ServiceResolverSubset
+			{
+				var x ServiceResolverSubset
+				ServiceResolverSubsetFromStructs(&v, &x)
+				y = &x
+			}
+			s.Subsets[k] = y
+		}
+	}
+	if t.Redirect != nil {
+		var x ServiceResolverRedirect
+		ServiceResolverRedirectFromStructs(t.Redirect, &x)
+		s.Redirect = &x
+	}
+	{
+		s.Failover = make(map[string]*ServiceResolverFailover, len(t.Failover))
+		for k, v := range t.Failover {
+			var y *ServiceResolverFailover
+			{
+				var x ServiceResolverFailover
+				ServiceResolverFailoverFromStructs(&v, &x)
+				y = &x
+			}
+			s.Failover[k] = y
+		}
+	}
+	s.ConnectTimeout = structs.DurationToProto(t.ConnectTimeout)
+	s.RequestTimeout = structs.DurationToProto(t.RequestTimeout)
+	if t.LoadBalancer != nil {
+		var x LoadBalancer
+		LoadBalancerFromStructs(t.LoadBalancer, &x)
+		s.LoadBalancer = &x
+	}
+	s.Meta = t.Meta
+}
+func ServiceResolverFailoverToStructs(s *ServiceResolverFailover, t *structs.ServiceResolverFailover) {
+	if s == nil {
+		return
+	}
+	t.Service = s.Service
+	t.ServiceSubset = s.ServiceSubset
+	t.Namespace = s.Namespace
+	t.Datacenters = s.Datacenters
+	{
+		t.Targets = make([]structs.ServiceResolverFailoverTarget, len(s.Targets))
+		for i := range s.Targets {
+			if s.Targets[i] != nil {
+				ServiceResolverFailoverTargetToStructs(s.Targets[i], &t.Targets[i])
+			}
+		}
+	}
+}
+func ServiceResolverFailoverFromStructs(t *structs.ServiceResolverFailover, s *ServiceResolverFailover) {
+	if s == nil {
+		return
+	}
+	s.Service = t.Service
+	s.ServiceSubset = t.ServiceSubset
+	s.Namespace = t.Namespace
+	s.Datacenters = t.Datacenters
+	{
+		s.Targets = make([]*ServiceResolverFailoverTarget, len(t.Targets))
+		for i := range t.Targets {
+			{
+				var x ServiceResolverFailoverTarget
+				ServiceResolverFailoverTargetFromStructs(&t.Targets[i], &x)
+				s.Targets[i] = &x
+			}
+		}
+	}
+}
+func ServiceResolverFailoverTargetToStructs(s *ServiceResolverFailoverTarget, t *structs.ServiceResolverFailoverTarget) {
+	if s == nil {
+		return
+	}
+	t.Service = s.Service
+	t.ServiceSubset = s.ServiceSubset
+	t.Partition = s.Partition
+	t.Namespace = s.Namespace
+	t.Datacenter = s.Datacenter
+	t.Peer = s.Peer
+}
+func ServiceResolverFailoverTargetFromStructs(t *structs.ServiceResolverFailoverTarget, s *ServiceResolverFailoverTarget) {
+	if s == nil {
+		return
+	}
+	s.Service = t.Service
+	s.ServiceSubset = t.ServiceSubset
+	s.Partition = t.Partition
+	s.Namespace = t.Namespace
+	s.Datacenter = t.Datacenter
+	s.Peer = t.Peer
+}
+func ServiceResolverRedirectToStructs(s *ServiceResolverRedirect, t *structs.ServiceResolverRedirect) {
+	if s == nil {
+		return
+	}
+	t.Service = s.Service
+	t.ServiceSubset = s.ServiceSubset
+	t.Namespace = s.Namespace
+	t.Partition = s.Partition
+	t.Datacenter = s.Datacenter
+	t.Peer = s.Peer
+}
+func ServiceResolverRedirectFromStructs(t *structs.ServiceResolverRedirect, s *ServiceResolverRedirect) {
+	if s == nil {
+		return
+	}
+	s.Service = t.Service
+	s.ServiceSubset = t.ServiceSubset
+	s.Namespace = t.Namespace
+	s.Partition = t.Partition
+	s.Datacenter = t.Datacenter
+	s.Peer = t.Peer
+}
+func ServiceResolverSubsetToStructs(s *ServiceResolverSubset, t *structs.ServiceResolverSubset) {
+	if s == nil {
+		return
+	}
+	t.Filter = s.Filter
+	t.OnlyPassing = s.OnlyPassing
+}
+func ServiceResolverSubsetFromStructs(t *structs.ServiceResolverSubset, s *ServiceResolverSubset) {
+	if s == nil {
+		return
+	}
+	s.Filter = t.Filter
+	s.OnlyPassing = t.OnlyPassing
+}
+func SourceIntentionToStructs(s *SourceIntention, t *structs.SourceIntention) {
+	if s == nil {
+		return
+	}
+	t.Name = s.Name
+	t.Action = intentionActionToStructs(s.Action)
+	{
+		t.Permissions = make([]*structs.IntentionPermission, len(s.Permissions))
+		for i := range s.Permissions {
+			if s.Permissions[i] != nil {
+				var x structs.IntentionPermission
+				IntentionPermissionToStructs(s.Permissions[i], &x)
+				t.Permissions[i] = &x
+			}
+		}
+	}
+	t.Precedence = int(s.Precedence)
+	t.LegacyID = s.LegacyID
+	t.Type = intentionSourceTypeToStructs(s.Type)
+	t.Description = s.Description
+	t.LegacyMeta = s.LegacyMeta
+	t.LegacyCreateTime = timeToStructs(s.LegacyCreateTime)
+	t.LegacyUpdateTime = timeToStructs(s.LegacyUpdateTime)
+	t.EnterpriseMeta = enterpriseMetaToStructs(s.EnterpriseMeta)
+	t.Peer = s.Peer
+}
+func SourceIntentionFromStructs(t *structs.SourceIntention, s *SourceIntention) {
+	if s == nil {
+		return
+	}
+	s.Name = t.Name
+	s.Action = intentionActionFromStructs(t.Action)
+	{
+		s.Permissions = make([]*IntentionPermission, len(t.Permissions))
+		for i := range t.Permissions {
+			if t.Permissions[i] != nil {
+				var x IntentionPermission
+				IntentionPermissionFromStructs(t.Permissions[i], &x)
+				s.Permissions[i] = &x
+			}
+		}
+	}
+	s.Precedence = int32(t.Precedence)
+	s.LegacyID = t.LegacyID
+	s.Type = intentionSourceTypeFromStructs(t.Type)
+	s.Description = t.Description
+	s.LegacyMeta = t.LegacyMeta
+	s.LegacyCreateTime = timeFromStructs(t.LegacyCreateTime)
+	s.LegacyUpdateTime = timeFromStructs(t.LegacyUpdateTime)
+	s.EnterpriseMeta = enterpriseMetaFromStructs(t.EnterpriseMeta)
+	s.Peer = t.Peer
+}
+func StatusToStructs(s *Status, t *structs.Status) {
+	if s == nil {
+		return
+	}
+	{
+		t.Conditions = make([]structs.Condition, len(s.Conditions))
+		for i := range s.Conditions {
+			if s.Conditions[i] != nil {
+				ConditionToStructs(s.Conditions[i], &t.Conditions[i])
+			}
+		}
+	}
+}
+func StatusFromStructs(t *structs.Status, s *Status) {
+	if s == nil {
+		return
+	}
+	{
+		s.Conditions = make([]*Condition, len(t.Conditions))
+		for i := range t.Conditions {
+			{
+				var x Condition
+				ConditionFromStructs(&t.Conditions[i], &x)
+				s.Conditions[i] = &x
+			}
+		}
+	}
+}
+func TCPRouteToStructs(s *TCPRoute, t *structs.TCPRouteConfigEntry) {
+	if s == nil {
+		return
+	}
+	{
+		t.Parents = make([]structs.ResourceReference, len(s.Parents))
+		for i := range s.Parents {
+			if s.Parents[i] != nil {
+				ResourceReferenceToStructs(s.Parents[i], &t.Parents[i])
+			}
+		}
+	}
+	{
+		t.Services = make([]structs.TCPService, len(s.Services))
+		for i := range s.Services {
+			if s.Services[i] != nil {
+				TCPServiceToStructs(s.Services[i], &t.Services[i])
+			}
+		}
+	}
+	t.Meta = s.Meta
+	if s.Status != nil {
+		StatusToStructs(s.Status, &t.Status)
+	}
+}
+func TCPRouteFromStructs(t *structs.TCPRouteConfigEntry, s *TCPRoute) {
+	if s == nil {
+		return
+	}
+	{
+		s.Parents = make([]*ResourceReference, len(t.Parents))
+		for i := range t.Parents {
+			{
+				var x ResourceReference
+				ResourceReferenceFromStructs(&t.Parents[i], &x)
+				s.Parents[i] = &x
+			}
+		}
+	}
+	{
+		s.Services = make([]*TCPService, len(t.Services))
+		for i := range t.Services {
+			{
+				var x TCPService
+				TCPServiceFromStructs(&t.Services[i], &x)
+				s.Services[i] = &x
+			}
+		}
+	}
+	s.Meta = t.Meta
+	{
+		var x Status
+		StatusFromStructs(&t.Status, &x)
+		s.Status = &x
+	}
+}
+func TCPServiceToStructs(s *TCPService, t *structs.TCPService) {
+	if s == nil {
+		return
+	}
+	t.Name = s.Name
+	t.EnterpriseMeta = enterpriseMetaToStructs(s.EnterpriseMeta)
+}
+func TCPServiceFromStructs(t *structs.TCPService, s *TCPService) {
+	if s == nil {
+		return
+	}
+	s.Name = t.Name
+	s.EnterpriseMeta = enterpriseMetaFromStructs(t.EnterpriseMeta)
+}
+func TransparentProxyConfigToStructs(s *TransparentProxyConfig, t *structs.TransparentProxyConfig) {
+	if s == nil {
+		return
+	}
+	t.OutboundListenerPort = int(s.OutboundListenerPort)
+	t.DialedDirectly = s.DialedDirectly
+}
+func TransparentProxyConfigFromStructs(t *structs.TransparentProxyConfig, s *TransparentProxyConfig) {
+	if s == nil {
+		return
+	}
+	s.OutboundListenerPort = int32(t.OutboundListenerPort)
+	s.DialedDirectly = t.DialedDirectly
+}
+func TransparentProxyMeshConfigToStructs(s *TransparentProxyMeshConfig, t *structs.TransparentProxyMeshConfig) {
+	if s == nil {
+		return
+	}
+	t.MeshDestinationsOnly = s.MeshDestinationsOnly
+}
+func TransparentProxyMeshConfigFromStructs(t *structs.TransparentProxyMeshConfig, s *TransparentProxyMeshConfig) {
+	if s == nil {
+		return
+	}
+	s.MeshDestinationsOnly = t.MeshDestinationsOnly
+}
+func URLRewriteToStructs(s *URLRewrite, t *structs.URLRewrite) {
+	if s == nil {
+		return
+	}
+	t.Path = s.Path
+}
+func URLRewriteFromStructs(t *structs.URLRewrite, s *URLRewrite) {
+	if s == nil {
+		return
+	}
+	s.Path = t.Path
+}
+func UpstreamConfigToStructs(s *UpstreamConfig, t *structs.UpstreamConfig) {
+	if s == nil {
+		return
+	}
+	t.Name = s.Name
+	t.EnterpriseMeta = enterpriseMetaToStructs(s.EnterpriseMeta)
+	t.Peer = s.Peer
+	t.EnvoyListenerJSON = s.EnvoyListenerJSON
+	t.EnvoyClusterJSON = s.EnvoyClusterJSON
+	t.Protocol = s.Protocol
+	t.ConnectTimeoutMs = int(s.ConnectTimeoutMs)
+	if s.Limits != nil {
+		var x structs.UpstreamLimits
+		UpstreamLimitsToStructs(s.Limits, &x)
+		t.Limits = &x
+	}
+	if s.PassiveHealthCheck != nil {
+		var x structs.PassiveHealthCheck
+		PassiveHealthCheckToStructs(s.PassiveHealthCheck, &x)
+		t.PassiveHealthCheck = &x
+	}
+	if s.MeshGateway != nil {
+		MeshGatewayConfigToStructs(s.MeshGateway, &t.MeshGateway)
+	}
+	t.BalanceOutboundConnections = s.BalanceOutboundConnections
+}
+func UpstreamConfigFromStructs(t *structs.UpstreamConfig, s *UpstreamConfig) {
+	if s == nil {
+		return
+	}
+	s.Name = t.Name
+	s.EnterpriseMeta = enterpriseMetaFromStructs(t.EnterpriseMeta)
+	s.Peer = t.Peer
+	s.EnvoyListenerJSON = t.EnvoyListenerJSON
+	s.EnvoyClusterJSON = t.EnvoyClusterJSON
+	s.Protocol = t.Protocol
+	s.ConnectTimeoutMs = int32(t.ConnectTimeoutMs)
+	if t.Limits != nil {
+		var x UpstreamLimits
+		UpstreamLimitsFromStructs(t.Limits, &x)
+		s.Limits = &x
+	}
+	if t.PassiveHealthCheck != nil {
+		var x PassiveHealthCheck
+		PassiveHealthCheckFromStructs(t.PassiveHealthCheck, &x)
+		s.PassiveHealthCheck = &x
+	}
+	{
+		var x MeshGatewayConfig
+		MeshGatewayConfigFromStructs(&t.MeshGateway, &x)
+		s.MeshGateway = &x
+	}
+	s.BalanceOutboundConnections = t.BalanceOutboundConnections
+}
+func UpstreamConfigurationToStructs(s *UpstreamConfiguration, t *structs.UpstreamConfiguration) {
+	if s == nil {
+		return
+	}
+	{
+		t.Overrides = make([]*structs.UpstreamConfig, len(s.Overrides))
+		for i := range s.Overrides {
+			if s.Overrides[i] != nil {
+				var x structs.UpstreamConfig
+				UpstreamConfigToStructs(s.Overrides[i], &x)
+				t.Overrides[i] = &x
+			}
+		}
+	}
+	if s.Defaults != nil {
+		var x structs.UpstreamConfig
+		UpstreamConfigToStructs(s.Defaults, &x)
+		t.Defaults = &x
+	}
+}
+func UpstreamConfigurationFromStructs(t *structs.UpstreamConfiguration, s *UpstreamConfiguration) {
+	if s == nil {
+		return
+	}
+	{
+		s.Overrides = make([]*UpstreamConfig, len(t.Overrides))
+		for i := range t.Overrides {
+			if t.Overrides[i] != nil {
+				var x UpstreamConfig
+				UpstreamConfigFromStructs(t.Overrides[i], &x)
+				s.Overrides[i] = &x
+			}
+		}
+	}
+	if t.Defaults != nil {
+		var x UpstreamConfig
+		UpstreamConfigFromStructs(t.Defaults, &x)
+		s.Defaults = &x
+	}
+}
+func UpstreamLimitsToStructs(s *UpstreamLimits, t *structs.UpstreamLimits) {
+	if s == nil {
+		return
+	}
+	t.MaxConnections = pointerToIntFromInt32(s.MaxConnections)
+	t.MaxPendingRequests = pointerToIntFromInt32(s.MaxPendingRequests)
+	t.MaxConcurrentRequests = pointerToIntFromInt32(s.MaxConcurrentRequests)
+}
+func UpstreamLimitsFromStructs(t *structs.UpstreamLimits, s *UpstreamLimits) {
+	if s == nil {
+		return
+	}
+	s.MaxConnections = int32FromPointerToInt(t.MaxConnections)
+	s.MaxPendingRequests = int32FromPointerToInt(t.MaxPendingRequests)
+	s.MaxConcurrentRequests = int32FromPointerToInt(t.MaxConcurrentRequests)
+}
diff --git a/proto/private/pbconfigentry/config_entry.go b/proto/pbconfigentry/config_entry.go
similarity index 89%
rename from proto/private/pbconfigentry/config_entry.go
rename to proto/pbconfigentry/config_entry.go
index 8ddfde8cccfb9..4b36134794d83 100644
--- a/proto/private/pbconfigentry/config_entry.go
+++ b/proto/pbconfigentry/config_entry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pbconfigentry
 
 import (
@@ -11,7 +8,7 @@ import (
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
+	"github.com/hashicorp/consul/proto/pbcommon"
 	"github.com/hashicorp/consul/types"
 )
 
@@ -100,22 +97,6 @@ func ConfigEntryToStructs(s *ConfigEntry) structs.ConfigEntry {
 		pbcommon.RaftIndexToStructs(s.RaftIndex, &target.RaftIndex)
 		pbcommon.EnterpriseMetaToStructs(s.EnterpriseMeta, &target.EnterpriseMeta)
 		return &target
-	case Kind_KindSamenessGroup:
-		var target structs.SamenessGroupConfigEntry
-		target.Name = s.Name
-
-		SamenessGroupToStructs(s.GetSamenessGroup(), &target)
-		pbcommon.RaftIndexToStructs(s.RaftIndex, &target.RaftIndex)
-		pbcommon.EnterpriseMetaToStructs(s.EnterpriseMeta, &target.EnterpriseMeta)
-		return &target
-	case Kind_KindJWTProvider:
-		var target structs.JWTProviderConfigEntry
-		target.Name = s.Name
-
-		JWTProviderToStructs(s.GetJWTProvider(), &target)
-		pbcommon.RaftIndexToStructs(s.RaftIndex, &target.RaftIndex)
-		pbcommon.EnterpriseMetaToStructs(s.EnterpriseMeta, &target.EnterpriseMeta)
-		return &target
 	default:
 		panic(fmt.Sprintf("unable to convert ConfigEntry of kind %s to structs", s.Kind))
 	}
@@ -212,21 +193,6 @@ func ConfigEntryFromStructs(s structs.ConfigEntry) *ConfigEntry {
 		configEntry.Entry = &ConfigEntry_InlineCertificate{
 			InlineCertificate: &cert,
 		}
-	case *structs.SamenessGroupConfigEntry:
-		var sg SamenessGroup
-		SamenessGroupFromStructs(v, &sg)
-		configEntry.Kind = Kind_KindSamenessGroup
-		configEntry.Entry = &ConfigEntry_SamenessGroup{
-			SamenessGroup: &sg,
-		}
-	case *structs.JWTProviderConfigEntry:
-		var jwtProvider JWTProvider
-		JWTProviderFromStructs(v, &jwtProvider)
-
-		configEntry.Kind = Kind_KindJWTProvider
-		configEntry.Entry = &ConfigEntry_JWTProvider{
-			JWTProvider: &jwtProvider,
-		}
 	default:
 		panic(fmt.Sprintf("unable to convert %T to proto", s))
 	}
@@ -355,32 +321,6 @@ func proxyModeToStructs(a ProxyMode) structs.ProxyMode {
 	}
 }
 
-func mutualTLSModeFromStructs(a structs.MutualTLSMode) MutualTLSMode {
-	switch a {
-	case structs.MutualTLSModeDefault:
-		return MutualTLSMode_MutualTLSModeDefault
-	case structs.MutualTLSModeStrict:
-		return MutualTLSMode_MutualTLSModeStrict
-	case structs.MutualTLSModePermissive:
-		return MutualTLSMode_MutualTLSModePermissive
-	default:
-		return MutualTLSMode_MutualTLSModeDefault
-	}
-}
-
-func mutualTLSModeToStructs(a MutualTLSMode) structs.MutualTLSMode {
-	switch a {
-	case MutualTLSMode_MutualTLSModeDefault:
-		return structs.MutualTLSModeDefault
-	case MutualTLSMode_MutualTLSModeStrict:
-		return structs.MutualTLSModeStrict
-	case MutualTLSMode_MutualTLSModePermissive:
-		return structs.MutualTLSModePermissive
-	default:
-		return structs.MutualTLSModeDefault
-	}
-}
-
 func meshGatewayModeFromStructs(a structs.MeshGatewayMode) MeshGatewayMode {
 	switch a {
 	case structs.MeshGatewayModeDefault:
diff --git a/proto/pbconfigentry/config_entry.pb.binary.go b/proto/pbconfigentry/config_entry.pb.binary.go
new file mode 100644
index 0000000000000..81370bcb0aec0
--- /dev/null
+++ b/proto/pbconfigentry/config_entry.pb.binary.go
@@ -0,0 +1,618 @@
+// Code generated by protoc-gen-go-binary. DO NOT EDIT.
+// source: proto/pbconfigentry/config_entry.proto
+
+package pbconfigentry
+
+import (
+	"google.golang.org/protobuf/proto"
+)
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ConfigEntry) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ConfigEntry) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *MeshConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *MeshConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *TransparentProxyMeshConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *TransparentProxyMeshConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *MeshTLSConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *MeshTLSConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *MeshDirectionalTLSConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *MeshDirectionalTLSConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *MeshHTTPConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *MeshHTTPConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *PeeringMeshConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *PeeringMeshConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ServiceResolver) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ServiceResolver) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ServiceResolverSubset) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ServiceResolverSubset) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ServiceResolverRedirect) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ServiceResolverRedirect) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ServiceResolverFailover) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ServiceResolverFailover) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ServiceResolverFailoverTarget) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ServiceResolverFailoverTarget) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *LoadBalancer) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *LoadBalancer) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *RingHashConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *RingHashConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *LeastRequestConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *LeastRequestConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *HashPolicy) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *HashPolicy) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *CookieConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *CookieConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *IngressGateway) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *IngressGateway) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *IngressServiceConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *IngressServiceConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *GatewayTLSConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *GatewayTLSConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *GatewayTLSSDSConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *GatewayTLSSDSConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *IngressListener) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *IngressListener) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *IngressService) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *IngressService) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *GatewayServiceTLSConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *GatewayServiceTLSConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *HTTPHeaderModifiers) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *HTTPHeaderModifiers) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ServiceIntentions) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ServiceIntentions) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *SourceIntention) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *SourceIntention) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *IntentionPermission) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *IntentionPermission) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *IntentionHTTPPermission) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *IntentionHTTPPermission) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *IntentionHTTPHeaderPermission) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *IntentionHTTPHeaderPermission) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ServiceDefaults) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ServiceDefaults) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *TransparentProxyConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *TransparentProxyConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *MeshGatewayConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *MeshGatewayConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ExposeConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ExposeConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ExposePath) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ExposePath) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *UpstreamConfiguration) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *UpstreamConfiguration) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *UpstreamConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *UpstreamConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *UpstreamLimits) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *UpstreamLimits) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *PassiveHealthCheck) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *PassiveHealthCheck) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *DestinationConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *DestinationConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *APIGateway) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *APIGateway) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *Status) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *Status) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *Condition) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *Condition) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *APIGatewayListener) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *APIGatewayListener) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *APIGatewayTLSConfiguration) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *APIGatewayTLSConfiguration) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ResourceReference) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ResourceReference) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *BoundAPIGateway) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *BoundAPIGateway) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *BoundAPIGatewayListener) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *BoundAPIGatewayListener) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *InlineCertificate) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *InlineCertificate) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *HTTPRoute) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *HTTPRoute) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *HTTPRouteRule) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *HTTPRouteRule) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *HTTPMatch) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *HTTPMatch) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *HTTPHeaderMatch) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *HTTPHeaderMatch) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *HTTPPathMatch) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *HTTPPathMatch) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *HTTPQueryMatch) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *HTTPQueryMatch) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *HTTPFilters) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *HTTPFilters) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *URLRewrite) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *URLRewrite) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *HTTPHeaderFilter) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *HTTPHeaderFilter) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *HTTPService) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *HTTPService) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *TCPRoute) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *TCPRoute) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *TCPService) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *TCPService) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
diff --git a/proto/pbconfigentry/config_entry.pb.go b/proto/pbconfigentry/config_entry.pb.go
new file mode 100644
index 0000000000000..f82801750d155
--- /dev/null
+++ b/proto/pbconfigentry/config_entry.pb.go
@@ -0,0 +1,7501 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: proto/pbconfigentry/config_entry.proto
+
+package pbconfigentry
+
+import (
+	pbcommon "github.com/hashicorp/consul/proto/pbcommon"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type Kind int32
+
+const (
+	Kind_KindUnknown           Kind = 0
+	Kind_KindMeshConfig        Kind = 1
+	Kind_KindServiceResolver   Kind = 2
+	Kind_KindIngressGateway    Kind = 3
+	Kind_KindServiceIntentions Kind = 4
+	Kind_KindServiceDefaults   Kind = 5
+	Kind_KindInlineCertificate Kind = 6
+	Kind_KindAPIGateway        Kind = 7
+	Kind_KindBoundAPIGateway   Kind = 8
+	Kind_KindHTTPRoute         Kind = 9
+	Kind_KindTCPRoute          Kind = 10
+)
+
+// Enum value maps for Kind.
+var (
+	Kind_name = map[int32]string{
+		0:  "KindUnknown",
+		1:  "KindMeshConfig",
+		2:  "KindServiceResolver",
+		3:  "KindIngressGateway",
+		4:  "KindServiceIntentions",
+		5:  "KindServiceDefaults",
+		6:  "KindInlineCertificate",
+		7:  "KindAPIGateway",
+		8:  "KindBoundAPIGateway",
+		9:  "KindHTTPRoute",
+		10: "KindTCPRoute",
+	}
+	Kind_value = map[string]int32{
+		"KindUnknown":           0,
+		"KindMeshConfig":        1,
+		"KindServiceResolver":   2,
+		"KindIngressGateway":    3,
+		"KindServiceIntentions": 4,
+		"KindServiceDefaults":   5,
+		"KindInlineCertificate": 6,
+		"KindAPIGateway":        7,
+		"KindBoundAPIGateway":   8,
+		"KindHTTPRoute":         9,
+		"KindTCPRoute":          10,
+	}
+)
+
+func (x Kind) Enum() *Kind {
+	p := new(Kind)
+	*p = x
+	return p
+}
+
+func (x Kind) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (Kind) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbconfigentry_config_entry_proto_enumTypes[0].Descriptor()
+}
+
+func (Kind) Type() protoreflect.EnumType {
+	return &file_proto_pbconfigentry_config_entry_proto_enumTypes[0]
+}
+
+func (x Kind) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use Kind.Descriptor instead.
+func (Kind) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{0}
+}
+
+type IntentionAction int32
+
+const (
+	IntentionAction_Deny  IntentionAction = 0
+	IntentionAction_Allow IntentionAction = 1
+)
+
+// Enum value maps for IntentionAction.
+var (
+	IntentionAction_name = map[int32]string{
+		0: "Deny",
+		1: "Allow",
+	}
+	IntentionAction_value = map[string]int32{
+		"Deny":  0,
+		"Allow": 1,
+	}
+)
+
+func (x IntentionAction) Enum() *IntentionAction {
+	p := new(IntentionAction)
+	*p = x
+	return p
+}
+
+func (x IntentionAction) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (IntentionAction) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbconfigentry_config_entry_proto_enumTypes[1].Descriptor()
+}
+
+func (IntentionAction) Type() protoreflect.EnumType {
+	return &file_proto_pbconfigentry_config_entry_proto_enumTypes[1]
+}
+
+func (x IntentionAction) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use IntentionAction.Descriptor instead.
+func (IntentionAction) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{1}
+}
+
+type IntentionSourceType int32
+
+const (
+	IntentionSourceType_Consul IntentionSourceType = 0
+)
+
+// Enum value maps for IntentionSourceType.
+var (
+	IntentionSourceType_name = map[int32]string{
+		0: "Consul",
+	}
+	IntentionSourceType_value = map[string]int32{
+		"Consul": 0,
+	}
+)
+
+func (x IntentionSourceType) Enum() *IntentionSourceType {
+	p := new(IntentionSourceType)
+	*p = x
+	return p
+}
+
+func (x IntentionSourceType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (IntentionSourceType) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbconfigentry_config_entry_proto_enumTypes[2].Descriptor()
+}
+
+func (IntentionSourceType) Type() protoreflect.EnumType {
+	return &file_proto_pbconfigentry_config_entry_proto_enumTypes[2]
+}
+
+func (x IntentionSourceType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use IntentionSourceType.Descriptor instead.
+func (IntentionSourceType) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{2}
+}
+
+type ProxyMode int32
+
+const (
+	ProxyMode_ProxyModeDefault     ProxyMode = 0
+	ProxyMode_ProxyModeTransparent ProxyMode = 1
+	ProxyMode_ProxyModeDirect      ProxyMode = 2
+)
+
+// Enum value maps for ProxyMode.
+var (
+	ProxyMode_name = map[int32]string{
+		0: "ProxyModeDefault",
+		1: "ProxyModeTransparent",
+		2: "ProxyModeDirect",
+	}
+	ProxyMode_value = map[string]int32{
+		"ProxyModeDefault":     0,
+		"ProxyModeTransparent": 1,
+		"ProxyModeDirect":      2,
+	}
+)
+
+func (x ProxyMode) Enum() *ProxyMode {
+	p := new(ProxyMode)
+	*p = x
+	return p
+}
+
+func (x ProxyMode) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (ProxyMode) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbconfigentry_config_entry_proto_enumTypes[3].Descriptor()
+}
+
+func (ProxyMode) Type() protoreflect.EnumType {
+	return &file_proto_pbconfigentry_config_entry_proto_enumTypes[3]
+}
+
+func (x ProxyMode) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use ProxyMode.Descriptor instead.
+func (ProxyMode) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{3}
+}
+
+type MeshGatewayMode int32
+
+const (
+	MeshGatewayMode_MeshGatewayModeDefault MeshGatewayMode = 0
+	MeshGatewayMode_MeshGatewayModeNone    MeshGatewayMode = 1
+	MeshGatewayMode_MeshGatewayModeLocal   MeshGatewayMode = 2
+	MeshGatewayMode_MeshGatewayModeRemote  MeshGatewayMode = 3
+)
+
+// Enum value maps for MeshGatewayMode.
+var (
+	MeshGatewayMode_name = map[int32]string{
+		0: "MeshGatewayModeDefault",
+		1: "MeshGatewayModeNone",
+		2: "MeshGatewayModeLocal",
+		3: "MeshGatewayModeRemote",
+	}
+	MeshGatewayMode_value = map[string]int32{
+		"MeshGatewayModeDefault": 0,
+		"MeshGatewayModeNone":    1,
+		"MeshGatewayModeLocal":   2,
+		"MeshGatewayModeRemote":  3,
+	}
+)
+
+func (x MeshGatewayMode) Enum() *MeshGatewayMode {
+	p := new(MeshGatewayMode)
+	*p = x
+	return p
+}
+
+func (x MeshGatewayMode) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (MeshGatewayMode) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbconfigentry_config_entry_proto_enumTypes[4].Descriptor()
+}
+
+func (MeshGatewayMode) Type() protoreflect.EnumType {
+	return &file_proto_pbconfigentry_config_entry_proto_enumTypes[4]
+}
+
+func (x MeshGatewayMode) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use MeshGatewayMode.Descriptor instead.
+func (MeshGatewayMode) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{4}
+}
+
+type APIGatewayListenerProtocol int32
+
+const (
+	APIGatewayListenerProtocol_ListenerProtocolHTTP APIGatewayListenerProtocol = 0
+	APIGatewayListenerProtocol_ListenerProtocolTCP  APIGatewayListenerProtocol = 1
+)
+
+// Enum value maps for APIGatewayListenerProtocol.
+var (
+	APIGatewayListenerProtocol_name = map[int32]string{
+		0: "ListenerProtocolHTTP",
+		1: "ListenerProtocolTCP",
+	}
+	APIGatewayListenerProtocol_value = map[string]int32{
+		"ListenerProtocolHTTP": 0,
+		"ListenerProtocolTCP":  1,
+	}
+)
+
+func (x APIGatewayListenerProtocol) Enum() *APIGatewayListenerProtocol {
+	p := new(APIGatewayListenerProtocol)
+	*p = x
+	return p
+}
+
+func (x APIGatewayListenerProtocol) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (APIGatewayListenerProtocol) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbconfigentry_config_entry_proto_enumTypes[5].Descriptor()
+}
+
+func (APIGatewayListenerProtocol) Type() protoreflect.EnumType {
+	return &file_proto_pbconfigentry_config_entry_proto_enumTypes[5]
+}
+
+func (x APIGatewayListenerProtocol) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use APIGatewayListenerProtocol.Descriptor instead.
+func (APIGatewayListenerProtocol) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{5}
+}
+
+type HTTPMatchMethod int32
+
+const (
+	HTTPMatchMethod_HTTPMatchMethodAll     HTTPMatchMethod = 0
+	HTTPMatchMethod_HTTPMatchMethodConnect HTTPMatchMethod = 1
+	HTTPMatchMethod_HTTPMatchMethodDelete  HTTPMatchMethod = 2
+	HTTPMatchMethod_HTTPMatchMethodGet     HTTPMatchMethod = 3
+	HTTPMatchMethod_HTTPMatchMethodHead    HTTPMatchMethod = 4
+	HTTPMatchMethod_HTTPMatchMethodOptions HTTPMatchMethod = 5
+	HTTPMatchMethod_HTTPMatchMethodPatch   HTTPMatchMethod = 6
+	HTTPMatchMethod_HTTPMatchMethodPost    HTTPMatchMethod = 7
+	HTTPMatchMethod_HTTPMatchMethodPut     HTTPMatchMethod = 8
+	HTTPMatchMethod_HTTPMatchMethodTrace   HTTPMatchMethod = 9
+)
+
+// Enum value maps for HTTPMatchMethod.
+var (
+	HTTPMatchMethod_name = map[int32]string{
+		0: "HTTPMatchMethodAll",
+		1: "HTTPMatchMethodConnect",
+		2: "HTTPMatchMethodDelete",
+		3: "HTTPMatchMethodGet",
+		4: "HTTPMatchMethodHead",
+		5: "HTTPMatchMethodOptions",
+		6: "HTTPMatchMethodPatch",
+		7: "HTTPMatchMethodPost",
+		8: "HTTPMatchMethodPut",
+		9: "HTTPMatchMethodTrace",
+	}
+	HTTPMatchMethod_value = map[string]int32{
+		"HTTPMatchMethodAll":     0,
+		"HTTPMatchMethodConnect": 1,
+		"HTTPMatchMethodDelete":  2,
+		"HTTPMatchMethodGet":     3,
+		"HTTPMatchMethodHead":    4,
+		"HTTPMatchMethodOptions": 5,
+		"HTTPMatchMethodPatch":   6,
+		"HTTPMatchMethodPost":    7,
+		"HTTPMatchMethodPut":     8,
+		"HTTPMatchMethodTrace":   9,
+	}
+)
+
+func (x HTTPMatchMethod) Enum() *HTTPMatchMethod {
+	p := new(HTTPMatchMethod)
+	*p = x
+	return p
+}
+
+func (x HTTPMatchMethod) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (HTTPMatchMethod) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbconfigentry_config_entry_proto_enumTypes[6].Descriptor()
+}
+
+func (HTTPMatchMethod) Type() protoreflect.EnumType {
+	return &file_proto_pbconfigentry_config_entry_proto_enumTypes[6]
+}
+
+func (x HTTPMatchMethod) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use HTTPMatchMethod.Descriptor instead.
+func (HTTPMatchMethod) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{6}
+}
+
+type HTTPHeaderMatchType int32
+
+const (
+	HTTPHeaderMatchType_HTTPHeaderMatchExact             HTTPHeaderMatchType = 0
+	HTTPHeaderMatchType_HTTPHeaderMatchPrefix            HTTPHeaderMatchType = 1
+	HTTPHeaderMatchType_HTTPHeaderMatchPresent           HTTPHeaderMatchType = 2
+	HTTPHeaderMatchType_HTTPHeaderMatchRegularExpression HTTPHeaderMatchType = 3
+	HTTPHeaderMatchType_HTTPHeaderMatchSuffix            HTTPHeaderMatchType = 4
+)
+
+// Enum value maps for HTTPHeaderMatchType.
+var (
+	HTTPHeaderMatchType_name = map[int32]string{
+		0: "HTTPHeaderMatchExact",
+		1: "HTTPHeaderMatchPrefix",
+		2: "HTTPHeaderMatchPresent",
+		3: "HTTPHeaderMatchRegularExpression",
+		4: "HTTPHeaderMatchSuffix",
+	}
+	HTTPHeaderMatchType_value = map[string]int32{
+		"HTTPHeaderMatchExact":             0,
+		"HTTPHeaderMatchPrefix":            1,
+		"HTTPHeaderMatchPresent":           2,
+		"HTTPHeaderMatchRegularExpression": 3,
+		"HTTPHeaderMatchSuffix":            4,
+	}
+)
+
+func (x HTTPHeaderMatchType) Enum() *HTTPHeaderMatchType {
+	p := new(HTTPHeaderMatchType)
+	*p = x
+	return p
+}
+
+func (x HTTPHeaderMatchType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (HTTPHeaderMatchType) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbconfigentry_config_entry_proto_enumTypes[7].Descriptor()
+}
+
+func (HTTPHeaderMatchType) Type() protoreflect.EnumType {
+	return &file_proto_pbconfigentry_config_entry_proto_enumTypes[7]
+}
+
+func (x HTTPHeaderMatchType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use HTTPHeaderMatchType.Descriptor instead.
+func (HTTPHeaderMatchType) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{7}
+}
+
+type HTTPPathMatchType int32
+
+const (
+	HTTPPathMatchType_HTTPPathMatchExact             HTTPPathMatchType = 0
+	HTTPPathMatchType_HTTPPathMatchPrefix            HTTPPathMatchType = 1
+	HTTPPathMatchType_HTTPPathMatchRegularExpression HTTPPathMatchType = 3
+)
+
+// Enum value maps for HTTPPathMatchType.
+var (
+	HTTPPathMatchType_name = map[int32]string{
+		0: "HTTPPathMatchExact",
+		1: "HTTPPathMatchPrefix",
+		3: "HTTPPathMatchRegularExpression",
+	}
+	HTTPPathMatchType_value = map[string]int32{
+		"HTTPPathMatchExact":             0,
+		"HTTPPathMatchPrefix":            1,
+		"HTTPPathMatchRegularExpression": 3,
+	}
+)
+
+func (x HTTPPathMatchType) Enum() *HTTPPathMatchType {
+	p := new(HTTPPathMatchType)
+	*p = x
+	return p
+}
+
+func (x HTTPPathMatchType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (HTTPPathMatchType) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbconfigentry_config_entry_proto_enumTypes[8].Descriptor()
+}
+
+func (HTTPPathMatchType) Type() protoreflect.EnumType {
+	return &file_proto_pbconfigentry_config_entry_proto_enumTypes[8]
+}
+
+func (x HTTPPathMatchType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use HTTPPathMatchType.Descriptor instead.
+func (HTTPPathMatchType) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{8}
+}
+
+type HTTPQueryMatchType int32
+
+const (
+	HTTPQueryMatchType_HTTPQueryMatchExact             HTTPQueryMatchType = 0
+	HTTPQueryMatchType_HTTPQueryMatchPresent           HTTPQueryMatchType = 1
+	HTTPQueryMatchType_HTTPQueryMatchRegularExpression HTTPQueryMatchType = 3
+)
+
+// Enum value maps for HTTPQueryMatchType.
+var (
+	HTTPQueryMatchType_name = map[int32]string{
+		0: "HTTPQueryMatchExact",
+		1: "HTTPQueryMatchPresent",
+		3: "HTTPQueryMatchRegularExpression",
+	}
+	HTTPQueryMatchType_value = map[string]int32{
+		"HTTPQueryMatchExact":             0,
+		"HTTPQueryMatchPresent":           1,
+		"HTTPQueryMatchRegularExpression": 3,
+	}
+)
+
+func (x HTTPQueryMatchType) Enum() *HTTPQueryMatchType {
+	p := new(HTTPQueryMatchType)
+	*p = x
+	return p
+}
+
+func (x HTTPQueryMatchType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (HTTPQueryMatchType) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbconfigentry_config_entry_proto_enumTypes[9].Descriptor()
+}
+
+func (HTTPQueryMatchType) Type() protoreflect.EnumType {
+	return &file_proto_pbconfigentry_config_entry_proto_enumTypes[9]
+}
+
+func (x HTTPQueryMatchType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use HTTPQueryMatchType.Descriptor instead.
+func (HTTPQueryMatchType) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{9}
+}
+
+type ConfigEntry struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Kind           Kind                     `protobuf:"varint,1,opt,name=Kind,proto3,enum=hashicorp.consul.internal.configentry.Kind" json:"Kind,omitempty"`
+	Name           string                   `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
+	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,3,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
+	RaftIndex      *pbcommon.RaftIndex      `protobuf:"bytes,4,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
+	// Types that are assignable to Entry:
+	//
+	//	*ConfigEntry_MeshConfig
+	//	*ConfigEntry_ServiceResolver
+	//	*ConfigEntry_IngressGateway
+	//	*ConfigEntry_ServiceIntentions
+	//	*ConfigEntry_ServiceDefaults
+	//	*ConfigEntry_APIGateway
+	//	*ConfigEntry_BoundAPIGateway
+	//	*ConfigEntry_TCPRoute
+	//	*ConfigEntry_HTTPRoute
+	//	*ConfigEntry_InlineCertificate
+	Entry isConfigEntry_Entry `protobuf_oneof:"Entry"`
+}
+
+func (x *ConfigEntry) Reset() {
+	*x = ConfigEntry{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ConfigEntry) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ConfigEntry) ProtoMessage() {}
+
+func (x *ConfigEntry) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ConfigEntry.ProtoReflect.Descriptor instead.
+func (*ConfigEntry) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *ConfigEntry) GetKind() Kind {
+	if x != nil {
+		return x.Kind
+	}
+	return Kind_KindUnknown
+}
+
+func (x *ConfigEntry) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *ConfigEntry) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
+	}
+	return nil
+}
+
+func (x *ConfigEntry) GetRaftIndex() *pbcommon.RaftIndex {
+	if x != nil {
+		return x.RaftIndex
+	}
+	return nil
+}
+
+func (m *ConfigEntry) GetEntry() isConfigEntry_Entry {
+	if m != nil {
+		return m.Entry
+	}
+	return nil
+}
+
+func (x *ConfigEntry) GetMeshConfig() *MeshConfig {
+	if x, ok := x.GetEntry().(*ConfigEntry_MeshConfig); ok {
+		return x.MeshConfig
+	}
+	return nil
+}
+
+func (x *ConfigEntry) GetServiceResolver() *ServiceResolver {
+	if x, ok := x.GetEntry().(*ConfigEntry_ServiceResolver); ok {
+		return x.ServiceResolver
+	}
+	return nil
+}
+
+func (x *ConfigEntry) GetIngressGateway() *IngressGateway {
+	if x, ok := x.GetEntry().(*ConfigEntry_IngressGateway); ok {
+		return x.IngressGateway
+	}
+	return nil
+}
+
+func (x *ConfigEntry) GetServiceIntentions() *ServiceIntentions {
+	if x, ok := x.GetEntry().(*ConfigEntry_ServiceIntentions); ok {
+		return x.ServiceIntentions
+	}
+	return nil
+}
+
+func (x *ConfigEntry) GetServiceDefaults() *ServiceDefaults {
+	if x, ok := x.GetEntry().(*ConfigEntry_ServiceDefaults); ok {
+		return x.ServiceDefaults
+	}
+	return nil
+}
+
+func (x *ConfigEntry) GetAPIGateway() *APIGateway {
+	if x, ok := x.GetEntry().(*ConfigEntry_APIGateway); ok {
+		return x.APIGateway
+	}
+	return nil
+}
+
+func (x *ConfigEntry) GetBoundAPIGateway() *BoundAPIGateway {
+	if x, ok := x.GetEntry().(*ConfigEntry_BoundAPIGateway); ok {
+		return x.BoundAPIGateway
+	}
+	return nil
+}
+
+func (x *ConfigEntry) GetTCPRoute() *TCPRoute {
+	if x, ok := x.GetEntry().(*ConfigEntry_TCPRoute); ok {
+		return x.TCPRoute
+	}
+	return nil
+}
+
+func (x *ConfigEntry) GetHTTPRoute() *HTTPRoute {
+	if x, ok := x.GetEntry().(*ConfigEntry_HTTPRoute); ok {
+		return x.HTTPRoute
+	}
+	return nil
+}
+
+func (x *ConfigEntry) GetInlineCertificate() *InlineCertificate {
+	if x, ok := x.GetEntry().(*ConfigEntry_InlineCertificate); ok {
+		return x.InlineCertificate
+	}
+	return nil
+}
+
+type isConfigEntry_Entry interface {
+	isConfigEntry_Entry()
+}
+
+type ConfigEntry_MeshConfig struct {
+	MeshConfig *MeshConfig `protobuf:"bytes,5,opt,name=MeshConfig,proto3,oneof"`
+}
+
+type ConfigEntry_ServiceResolver struct {
+	ServiceResolver *ServiceResolver `protobuf:"bytes,6,opt,name=ServiceResolver,proto3,oneof"`
+}
+
+type ConfigEntry_IngressGateway struct {
+	IngressGateway *IngressGateway `protobuf:"bytes,7,opt,name=IngressGateway,proto3,oneof"`
+}
+
+type ConfigEntry_ServiceIntentions struct {
+	ServiceIntentions *ServiceIntentions `protobuf:"bytes,8,opt,name=ServiceIntentions,proto3,oneof"`
+}
+
+type ConfigEntry_ServiceDefaults struct {
+	ServiceDefaults *ServiceDefaults `protobuf:"bytes,9,opt,name=ServiceDefaults,proto3,oneof"`
+}
+
+type ConfigEntry_APIGateway struct {
+	APIGateway *APIGateway `protobuf:"bytes,10,opt,name=APIGateway,proto3,oneof"`
+}
+
+type ConfigEntry_BoundAPIGateway struct {
+	BoundAPIGateway *BoundAPIGateway `protobuf:"bytes,11,opt,name=BoundAPIGateway,proto3,oneof"`
+}
+
+type ConfigEntry_TCPRoute struct {
+	TCPRoute *TCPRoute `protobuf:"bytes,12,opt,name=TCPRoute,proto3,oneof"`
+}
+
+type ConfigEntry_HTTPRoute struct {
+	HTTPRoute *HTTPRoute `protobuf:"bytes,13,opt,name=HTTPRoute,proto3,oneof"`
+}
+
+type ConfigEntry_InlineCertificate struct {
+	InlineCertificate *InlineCertificate `protobuf:"bytes,14,opt,name=InlineCertificate,proto3,oneof"`
+}
+
+func (*ConfigEntry_MeshConfig) isConfigEntry_Entry() {}
+
+func (*ConfigEntry_ServiceResolver) isConfigEntry_Entry() {}
+
+func (*ConfigEntry_IngressGateway) isConfigEntry_Entry() {}
+
+func (*ConfigEntry_ServiceIntentions) isConfigEntry_Entry() {}
+
+func (*ConfigEntry_ServiceDefaults) isConfigEntry_Entry() {}
+
+func (*ConfigEntry_APIGateway) isConfigEntry_Entry() {}
+
+func (*ConfigEntry_BoundAPIGateway) isConfigEntry_Entry() {}
+
+func (*ConfigEntry_TCPRoute) isConfigEntry_Entry() {}
+
+func (*ConfigEntry_HTTPRoute) isConfigEntry_Entry() {}
+
+func (*ConfigEntry_InlineCertificate) isConfigEntry_Entry() {}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.MeshConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=RaftIndex,EnterpriseMeta
+type MeshConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	TransparentProxy *TransparentProxyMeshConfig `protobuf:"bytes,1,opt,name=TransparentProxy,proto3" json:"TransparentProxy,omitempty"`
+	TLS              *MeshTLSConfig              `protobuf:"bytes,2,opt,name=TLS,proto3" json:"TLS,omitempty"`
+	HTTP             *MeshHTTPConfig             `protobuf:"bytes,3,opt,name=HTTP,proto3" json:"HTTP,omitempty"`
+	Meta             map[string]string           `protobuf:"bytes,4,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Peering          *PeeringMeshConfig          `protobuf:"bytes,5,opt,name=Peering,proto3" json:"Peering,omitempty"`
+}
+
+func (x *MeshConfig) Reset() {
+	*x = MeshConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MeshConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MeshConfig) ProtoMessage() {}
+
+func (x *MeshConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use MeshConfig.ProtoReflect.Descriptor instead.
+func (*MeshConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *MeshConfig) GetTransparentProxy() *TransparentProxyMeshConfig {
+	if x != nil {
+		return x.TransparentProxy
+	}
+	return nil
+}
+
+func (x *MeshConfig) GetTLS() *MeshTLSConfig {
+	if x != nil {
+		return x.TLS
+	}
+	return nil
+}
+
+func (x *MeshConfig) GetHTTP() *MeshHTTPConfig {
+	if x != nil {
+		return x.HTTP
+	}
+	return nil
+}
+
+func (x *MeshConfig) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *MeshConfig) GetPeering() *PeeringMeshConfig {
+	if x != nil {
+		return x.Peering
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.TransparentProxyMeshConfig
+// output=config_entry.gen.go
+// name=Structs
+type TransparentProxyMeshConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	MeshDestinationsOnly bool `protobuf:"varint,1,opt,name=MeshDestinationsOnly,proto3" json:"MeshDestinationsOnly,omitempty"`
+}
+
+func (x *TransparentProxyMeshConfig) Reset() {
+	*x = TransparentProxyMeshConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TransparentProxyMeshConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TransparentProxyMeshConfig) ProtoMessage() {}
+
+func (x *TransparentProxyMeshConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TransparentProxyMeshConfig.ProtoReflect.Descriptor instead.
+func (*TransparentProxyMeshConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *TransparentProxyMeshConfig) GetMeshDestinationsOnly() bool {
+	if x != nil {
+		return x.MeshDestinationsOnly
+	}
+	return false
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.MeshTLSConfig
+// output=config_entry.gen.go
+// name=Structs
+type MeshTLSConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Incoming *MeshDirectionalTLSConfig `protobuf:"bytes,1,opt,name=Incoming,proto3" json:"Incoming,omitempty"`
+	Outgoing *MeshDirectionalTLSConfig `protobuf:"bytes,2,opt,name=Outgoing,proto3" json:"Outgoing,omitempty"`
+}
+
+func (x *MeshTLSConfig) Reset() {
+	*x = MeshTLSConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MeshTLSConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MeshTLSConfig) ProtoMessage() {}
+
+func (x *MeshTLSConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use MeshTLSConfig.ProtoReflect.Descriptor instead.
+func (*MeshTLSConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *MeshTLSConfig) GetIncoming() *MeshDirectionalTLSConfig {
+	if x != nil {
+		return x.Incoming
+	}
+	return nil
+}
+
+func (x *MeshTLSConfig) GetOutgoing() *MeshDirectionalTLSConfig {
+	if x != nil {
+		return x.Outgoing
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.MeshDirectionalTLSConfig
+// output=config_entry.gen.go
+// name=Structs
+type MeshDirectionalTLSConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
+	TLSMinVersion string `protobuf:"bytes,1,opt,name=TLSMinVersion,proto3" json:"TLSMinVersion,omitempty"`
+	// mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
+	TLSMaxVersion string `protobuf:"bytes,2,opt,name=TLSMaxVersion,proto3" json:"TLSMaxVersion,omitempty"`
+	// mog: func-from=cipherSuitesFromStructs func-to=cipherSuitesToStructs
+	CipherSuites []string `protobuf:"bytes,3,rep,name=CipherSuites,proto3" json:"CipherSuites,omitempty"`
+}
+
+func (x *MeshDirectionalTLSConfig) Reset() {
+	*x = MeshDirectionalTLSConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MeshDirectionalTLSConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MeshDirectionalTLSConfig) ProtoMessage() {}
+
+func (x *MeshDirectionalTLSConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use MeshDirectionalTLSConfig.ProtoReflect.Descriptor instead.
+func (*MeshDirectionalTLSConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *MeshDirectionalTLSConfig) GetTLSMinVersion() string {
+	if x != nil {
+		return x.TLSMinVersion
+	}
+	return ""
+}
+
+func (x *MeshDirectionalTLSConfig) GetTLSMaxVersion() string {
+	if x != nil {
+		return x.TLSMaxVersion
+	}
+	return ""
+}
+
+func (x *MeshDirectionalTLSConfig) GetCipherSuites() []string {
+	if x != nil {
+		return x.CipherSuites
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.MeshHTTPConfig
+// output=config_entry.gen.go
+// name=Structs
+type MeshHTTPConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	SanitizeXForwardedClientCert bool `protobuf:"varint,1,opt,name=SanitizeXForwardedClientCert,proto3" json:"SanitizeXForwardedClientCert,omitempty"`
+}
+
+func (x *MeshHTTPConfig) Reset() {
+	*x = MeshHTTPConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MeshHTTPConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MeshHTTPConfig) ProtoMessage() {}
+
+func (x *MeshHTTPConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use MeshHTTPConfig.ProtoReflect.Descriptor instead.
+func (*MeshHTTPConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *MeshHTTPConfig) GetSanitizeXForwardedClientCert() bool {
+	if x != nil {
+		return x.SanitizeXForwardedClientCert
+	}
+	return false
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.PeeringMeshConfig
+// output=config_entry.gen.go
+// name=Structs
+type PeeringMeshConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	PeerThroughMeshGateways bool `protobuf:"varint,1,opt,name=PeerThroughMeshGateways,proto3" json:"PeerThroughMeshGateways,omitempty"`
+}
+
+func (x *PeeringMeshConfig) Reset() {
+	*x = PeeringMeshConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringMeshConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringMeshConfig) ProtoMessage() {}
+
+func (x *PeeringMeshConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringMeshConfig.ProtoReflect.Descriptor instead.
+func (*PeeringMeshConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *PeeringMeshConfig) GetPeerThroughMeshGateways() bool {
+	if x != nil {
+		return x.PeerThroughMeshGateways
+	}
+	return false
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceResolverConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+type ServiceResolver struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	DefaultSubset string                              `protobuf:"bytes,1,opt,name=DefaultSubset,proto3" json:"DefaultSubset,omitempty"`
+	Subsets       map[string]*ServiceResolverSubset   `protobuf:"bytes,2,rep,name=Subsets,proto3" json:"Subsets,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Redirect      *ServiceResolverRedirect            `protobuf:"bytes,3,opt,name=Redirect,proto3" json:"Redirect,omitempty"`
+	Failover      map[string]*ServiceResolverFailover `protobuf:"bytes,4,rep,name=Failover,proto3" json:"Failover,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	ConnectTimeout *durationpb.Duration `protobuf:"bytes,5,opt,name=ConnectTimeout,proto3" json:"ConnectTimeout,omitempty"`
+	LoadBalancer   *LoadBalancer        `protobuf:"bytes,6,opt,name=LoadBalancer,proto3" json:"LoadBalancer,omitempty"`
+	Meta           map[string]string    `protobuf:"bytes,7,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	RequestTimeout *durationpb.Duration `protobuf:"bytes,8,opt,name=RequestTimeout,proto3" json:"RequestTimeout,omitempty"`
+}
+
+func (x *ServiceResolver) Reset() {
+	*x = ServiceResolver{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceResolver) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceResolver) ProtoMessage() {}
+
+func (x *ServiceResolver) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceResolver.ProtoReflect.Descriptor instead.
+func (*ServiceResolver) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *ServiceResolver) GetDefaultSubset() string {
+	if x != nil {
+		return x.DefaultSubset
+	}
+	return ""
+}
+
+func (x *ServiceResolver) GetSubsets() map[string]*ServiceResolverSubset {
+	if x != nil {
+		return x.Subsets
+	}
+	return nil
+}
+
+func (x *ServiceResolver) GetRedirect() *ServiceResolverRedirect {
+	if x != nil {
+		return x.Redirect
+	}
+	return nil
+}
+
+func (x *ServiceResolver) GetFailover() map[string]*ServiceResolverFailover {
+	if x != nil {
+		return x.Failover
+	}
+	return nil
+}
+
+func (x *ServiceResolver) GetConnectTimeout() *durationpb.Duration {
+	if x != nil {
+		return x.ConnectTimeout
+	}
+	return nil
+}
+
+func (x *ServiceResolver) GetLoadBalancer() *LoadBalancer {
+	if x != nil {
+		return x.LoadBalancer
+	}
+	return nil
+}
+
+func (x *ServiceResolver) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *ServiceResolver) GetRequestTimeout() *durationpb.Duration {
+	if x != nil {
+		return x.RequestTimeout
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceResolverSubset
+// output=config_entry.gen.go
+// name=Structs
+type ServiceResolverSubset struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Filter      string `protobuf:"bytes,1,opt,name=Filter,proto3" json:"Filter,omitempty"`
+	OnlyPassing bool   `protobuf:"varint,2,opt,name=OnlyPassing,proto3" json:"OnlyPassing,omitempty"`
+}
+
+func (x *ServiceResolverSubset) Reset() {
+	*x = ServiceResolverSubset{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceResolverSubset) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceResolverSubset) ProtoMessage() {}
+
+func (x *ServiceResolverSubset) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[8]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceResolverSubset.ProtoReflect.Descriptor instead.
+func (*ServiceResolverSubset) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *ServiceResolverSubset) GetFilter() string {
+	if x != nil {
+		return x.Filter
+	}
+	return ""
+}
+
+func (x *ServiceResolverSubset) GetOnlyPassing() bool {
+	if x != nil {
+		return x.OnlyPassing
+	}
+	return false
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceResolverRedirect
+// output=config_entry.gen.go
+// name=Structs
+type ServiceResolverRedirect struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Service       string `protobuf:"bytes,1,opt,name=Service,proto3" json:"Service,omitempty"`
+	ServiceSubset string `protobuf:"bytes,2,opt,name=ServiceSubset,proto3" json:"ServiceSubset,omitempty"`
+	Namespace     string `protobuf:"bytes,3,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
+	Partition     string `protobuf:"bytes,4,opt,name=Partition,proto3" json:"Partition,omitempty"`
+	Datacenter    string `protobuf:"bytes,5,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
+	Peer          string `protobuf:"bytes,6,opt,name=Peer,proto3" json:"Peer,omitempty"`
+}
+
+func (x *ServiceResolverRedirect) Reset() {
+	*x = ServiceResolverRedirect{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceResolverRedirect) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceResolverRedirect) ProtoMessage() {}
+
+func (x *ServiceResolverRedirect) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[9]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceResolverRedirect.ProtoReflect.Descriptor instead.
+func (*ServiceResolverRedirect) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{9}
+}
+
+func (x *ServiceResolverRedirect) GetService() string {
+	if x != nil {
+		return x.Service
+	}
+	return ""
+}
+
+func (x *ServiceResolverRedirect) GetServiceSubset() string {
+	if x != nil {
+		return x.ServiceSubset
+	}
+	return ""
+}
+
+func (x *ServiceResolverRedirect) GetNamespace() string {
+	if x != nil {
+		return x.Namespace
+	}
+	return ""
+}
+
+func (x *ServiceResolverRedirect) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+func (x *ServiceResolverRedirect) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
+	}
+	return ""
+}
+
+func (x *ServiceResolverRedirect) GetPeer() string {
+	if x != nil {
+		return x.Peer
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceResolverFailover
+// output=config_entry.gen.go
+// name=Structs
+type ServiceResolverFailover struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Service       string                           `protobuf:"bytes,1,opt,name=Service,proto3" json:"Service,omitempty"`
+	ServiceSubset string                           `protobuf:"bytes,2,opt,name=ServiceSubset,proto3" json:"ServiceSubset,omitempty"`
+	Namespace     string                           `protobuf:"bytes,3,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
+	Datacenters   []string                         `protobuf:"bytes,4,rep,name=Datacenters,proto3" json:"Datacenters,omitempty"`
+	Targets       []*ServiceResolverFailoverTarget `protobuf:"bytes,5,rep,name=Targets,proto3" json:"Targets,omitempty"`
+}
+
+func (x *ServiceResolverFailover) Reset() {
+	*x = ServiceResolverFailover{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[10]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceResolverFailover) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceResolverFailover) ProtoMessage() {}
+
+func (x *ServiceResolverFailover) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[10]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceResolverFailover.ProtoReflect.Descriptor instead.
+func (*ServiceResolverFailover) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{10}
+}
+
+func (x *ServiceResolverFailover) GetService() string {
+	if x != nil {
+		return x.Service
+	}
+	return ""
+}
+
+func (x *ServiceResolverFailover) GetServiceSubset() string {
+	if x != nil {
+		return x.ServiceSubset
+	}
+	return ""
+}
+
+func (x *ServiceResolverFailover) GetNamespace() string {
+	if x != nil {
+		return x.Namespace
+	}
+	return ""
+}
+
+func (x *ServiceResolverFailover) GetDatacenters() []string {
+	if x != nil {
+		return x.Datacenters
+	}
+	return nil
+}
+
+func (x *ServiceResolverFailover) GetTargets() []*ServiceResolverFailoverTarget {
+	if x != nil {
+		return x.Targets
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceResolverFailoverTarget
+// output=config_entry.gen.go
+// name=Structs
+type ServiceResolverFailoverTarget struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Service       string `protobuf:"bytes,1,opt,name=Service,proto3" json:"Service,omitempty"`
+	ServiceSubset string `protobuf:"bytes,2,opt,name=ServiceSubset,proto3" json:"ServiceSubset,omitempty"`
+	Partition     string `protobuf:"bytes,3,opt,name=Partition,proto3" json:"Partition,omitempty"`
+	Namespace     string `protobuf:"bytes,4,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
+	Datacenter    string `protobuf:"bytes,5,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
+	Peer          string `protobuf:"bytes,6,opt,name=Peer,proto3" json:"Peer,omitempty"`
+}
+
+func (x *ServiceResolverFailoverTarget) Reset() {
+	*x = ServiceResolverFailoverTarget{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[11]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceResolverFailoverTarget) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceResolverFailoverTarget) ProtoMessage() {}
+
+func (x *ServiceResolverFailoverTarget) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[11]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceResolverFailoverTarget.ProtoReflect.Descriptor instead.
+func (*ServiceResolverFailoverTarget) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{11}
+}
+
+func (x *ServiceResolverFailoverTarget) GetService() string {
+	if x != nil {
+		return x.Service
+	}
+	return ""
+}
+
+func (x *ServiceResolverFailoverTarget) GetServiceSubset() string {
+	if x != nil {
+		return x.ServiceSubset
+	}
+	return ""
+}
+
+func (x *ServiceResolverFailoverTarget) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+func (x *ServiceResolverFailoverTarget) GetNamespace() string {
+	if x != nil {
+		return x.Namespace
+	}
+	return ""
+}
+
+func (x *ServiceResolverFailoverTarget) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
+	}
+	return ""
+}
+
+func (x *ServiceResolverFailoverTarget) GetPeer() string {
+	if x != nil {
+		return x.Peer
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.LoadBalancer
+// output=config_entry.gen.go
+// name=Structs
+type LoadBalancer struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Policy             string              `protobuf:"bytes,1,opt,name=Policy,proto3" json:"Policy,omitempty"`
+	RingHashConfig     *RingHashConfig     `protobuf:"bytes,2,opt,name=RingHashConfig,proto3" json:"RingHashConfig,omitempty"`
+	LeastRequestConfig *LeastRequestConfig `protobuf:"bytes,3,opt,name=LeastRequestConfig,proto3" json:"LeastRequestConfig,omitempty"`
+	HashPolicies       []*HashPolicy       `protobuf:"bytes,4,rep,name=HashPolicies,proto3" json:"HashPolicies,omitempty"`
+}
+
+func (x *LoadBalancer) Reset() {
+	*x = LoadBalancer{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[12]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *LoadBalancer) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*LoadBalancer) ProtoMessage() {}
+
+func (x *LoadBalancer) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[12]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use LoadBalancer.ProtoReflect.Descriptor instead.
+func (*LoadBalancer) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{12}
+}
+
+func (x *LoadBalancer) GetPolicy() string {
+	if x != nil {
+		return x.Policy
+	}
+	return ""
+}
+
+func (x *LoadBalancer) GetRingHashConfig() *RingHashConfig {
+	if x != nil {
+		return x.RingHashConfig
+	}
+	return nil
+}
+
+func (x *LoadBalancer) GetLeastRequestConfig() *LeastRequestConfig {
+	if x != nil {
+		return x.LeastRequestConfig
+	}
+	return nil
+}
+
+func (x *LoadBalancer) GetHashPolicies() []*HashPolicy {
+	if x != nil {
+		return x.HashPolicies
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.RingHashConfig
+// output=config_entry.gen.go
+// name=Structs
+type RingHashConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	MinimumRingSize uint64 `protobuf:"varint,1,opt,name=MinimumRingSize,proto3" json:"MinimumRingSize,omitempty"`
+	MaximumRingSize uint64 `protobuf:"varint,2,opt,name=MaximumRingSize,proto3" json:"MaximumRingSize,omitempty"`
+}
+
+func (x *RingHashConfig) Reset() {
+	*x = RingHashConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[13]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RingHashConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RingHashConfig) ProtoMessage() {}
+
+func (x *RingHashConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[13]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RingHashConfig.ProtoReflect.Descriptor instead.
+func (*RingHashConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{13}
+}
+
+func (x *RingHashConfig) GetMinimumRingSize() uint64 {
+	if x != nil {
+		return x.MinimumRingSize
+	}
+	return 0
+}
+
+func (x *RingHashConfig) GetMaximumRingSize() uint64 {
+	if x != nil {
+		return x.MaximumRingSize
+	}
+	return 0
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.LeastRequestConfig
+// output=config_entry.gen.go
+// name=Structs
+type LeastRequestConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ChoiceCount uint32 `protobuf:"varint,1,opt,name=ChoiceCount,proto3" json:"ChoiceCount,omitempty"`
+}
+
+func (x *LeastRequestConfig) Reset() {
+	*x = LeastRequestConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[14]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *LeastRequestConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*LeastRequestConfig) ProtoMessage() {}
+
+func (x *LeastRequestConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[14]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use LeastRequestConfig.ProtoReflect.Descriptor instead.
+func (*LeastRequestConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{14}
+}
+
+func (x *LeastRequestConfig) GetChoiceCount() uint32 {
+	if x != nil {
+		return x.ChoiceCount
+	}
+	return 0
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HashPolicy
+// output=config_entry.gen.go
+// name=Structs
+type HashPolicy struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Field        string        `protobuf:"bytes,1,opt,name=Field,proto3" json:"Field,omitempty"`
+	FieldValue   string        `protobuf:"bytes,2,opt,name=FieldValue,proto3" json:"FieldValue,omitempty"`
+	CookieConfig *CookieConfig `protobuf:"bytes,3,opt,name=CookieConfig,proto3" json:"CookieConfig,omitempty"`
+	SourceIP     bool          `protobuf:"varint,4,opt,name=SourceIP,proto3" json:"SourceIP,omitempty"`
+	Terminal     bool          `protobuf:"varint,5,opt,name=Terminal,proto3" json:"Terminal,omitempty"`
+}
+
+func (x *HashPolicy) Reset() {
+	*x = HashPolicy{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[15]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HashPolicy) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HashPolicy) ProtoMessage() {}
+
+func (x *HashPolicy) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[15]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HashPolicy.ProtoReflect.Descriptor instead.
+func (*HashPolicy) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{15}
+}
+
+func (x *HashPolicy) GetField() string {
+	if x != nil {
+		return x.Field
+	}
+	return ""
+}
+
+func (x *HashPolicy) GetFieldValue() string {
+	if x != nil {
+		return x.FieldValue
+	}
+	return ""
+}
+
+func (x *HashPolicy) GetCookieConfig() *CookieConfig {
+	if x != nil {
+		return x.CookieConfig
+	}
+	return nil
+}
+
+func (x *HashPolicy) GetSourceIP() bool {
+	if x != nil {
+		return x.SourceIP
+	}
+	return false
+}
+
+func (x *HashPolicy) GetTerminal() bool {
+	if x != nil {
+		return x.Terminal
+	}
+	return false
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.CookieConfig
+// output=config_entry.gen.go
+// name=Structs
+type CookieConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Session bool `protobuf:"varint,1,opt,name=Session,proto3" json:"Session,omitempty"`
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	TTL  *durationpb.Duration `protobuf:"bytes,2,opt,name=TTL,proto3" json:"TTL,omitempty"`
+	Path string               `protobuf:"bytes,3,opt,name=Path,proto3" json:"Path,omitempty"`
+}
+
+func (x *CookieConfig) Reset() {
+	*x = CookieConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[16]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CookieConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CookieConfig) ProtoMessage() {}
+
+func (x *CookieConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[16]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CookieConfig.ProtoReflect.Descriptor instead.
+func (*CookieConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{16}
+}
+
+func (x *CookieConfig) GetSession() bool {
+	if x != nil {
+		return x.Session
+	}
+	return false
+}
+
+func (x *CookieConfig) GetTTL() *durationpb.Duration {
+	if x != nil {
+		return x.TTL
+	}
+	return nil
+}
+
+func (x *CookieConfig) GetPath() string {
+	if x != nil {
+		return x.Path
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IngressGatewayConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+type IngressGateway struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	TLS       *GatewayTLSConfig     `protobuf:"bytes,1,opt,name=TLS,proto3" json:"TLS,omitempty"`
+	Listeners []*IngressListener    `protobuf:"bytes,2,rep,name=Listeners,proto3" json:"Listeners,omitempty"`
+	Meta      map[string]string     `protobuf:"bytes,3,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Defaults  *IngressServiceConfig `protobuf:"bytes,4,opt,name=Defaults,proto3" json:"Defaults,omitempty"`
+}
+
+func (x *IngressGateway) Reset() {
+	*x = IngressGateway{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[17]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *IngressGateway) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IngressGateway) ProtoMessage() {}
+
+func (x *IngressGateway) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[17]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use IngressGateway.ProtoReflect.Descriptor instead.
+func (*IngressGateway) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{17}
+}
+
+func (x *IngressGateway) GetTLS() *GatewayTLSConfig {
+	if x != nil {
+		return x.TLS
+	}
+	return nil
+}
+
+func (x *IngressGateway) GetListeners() []*IngressListener {
+	if x != nil {
+		return x.Listeners
+	}
+	return nil
+}
+
+func (x *IngressGateway) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *IngressGateway) GetDefaults() *IngressServiceConfig {
+	if x != nil {
+		return x.Defaults
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IngressServiceConfig
+// output=config_entry.gen.go
+// name=Structs
+type IngressServiceConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	MaxConnections        uint32              `protobuf:"varint,1,opt,name=MaxConnections,proto3" json:"MaxConnections,omitempty"`
+	MaxPendingRequests    uint32              `protobuf:"varint,2,opt,name=MaxPendingRequests,proto3" json:"MaxPendingRequests,omitempty"`
+	MaxConcurrentRequests uint32              `protobuf:"varint,3,opt,name=MaxConcurrentRequests,proto3" json:"MaxConcurrentRequests,omitempty"`
+	PassiveHealthCheck    *PassiveHealthCheck `protobuf:"bytes,4,opt,name=PassiveHealthCheck,proto3" json:"PassiveHealthCheck,omitempty"`
+}
+
+func (x *IngressServiceConfig) Reset() {
+	*x = IngressServiceConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[18]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *IngressServiceConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IngressServiceConfig) ProtoMessage() {}
+
+func (x *IngressServiceConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[18]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use IngressServiceConfig.ProtoReflect.Descriptor instead.
+func (*IngressServiceConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{18}
+}
+
+func (x *IngressServiceConfig) GetMaxConnections() uint32 {
+	if x != nil {
+		return x.MaxConnections
+	}
+	return 0
+}
+
+func (x *IngressServiceConfig) GetMaxPendingRequests() uint32 {
+	if x != nil {
+		return x.MaxPendingRequests
+	}
+	return 0
+}
+
+func (x *IngressServiceConfig) GetMaxConcurrentRequests() uint32 {
+	if x != nil {
+		return x.MaxConcurrentRequests
+	}
+	return 0
+}
+
+func (x *IngressServiceConfig) GetPassiveHealthCheck() *PassiveHealthCheck {
+	if x != nil {
+		return x.PassiveHealthCheck
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.GatewayTLSConfig
+// output=config_entry.gen.go
+// name=Structs
+type GatewayTLSConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Enabled bool                 `protobuf:"varint,1,opt,name=Enabled,proto3" json:"Enabled,omitempty"`
+	SDS     *GatewayTLSSDSConfig `protobuf:"bytes,2,opt,name=SDS,proto3" json:"SDS,omitempty"`
+	// mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
+	TLSMinVersion string `protobuf:"bytes,3,opt,name=TLSMinVersion,proto3" json:"TLSMinVersion,omitempty"`
+	// mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
+	TLSMaxVersion string `protobuf:"bytes,4,opt,name=TLSMaxVersion,proto3" json:"TLSMaxVersion,omitempty"`
+	// mog: func-from=cipherSuitesFromStructs func-to=cipherSuitesToStructs
+	CipherSuites []string `protobuf:"bytes,5,rep,name=CipherSuites,proto3" json:"CipherSuites,omitempty"`
+}
+
+func (x *GatewayTLSConfig) Reset() {
+	*x = GatewayTLSConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[19]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GatewayTLSConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GatewayTLSConfig) ProtoMessage() {}
+
+func (x *GatewayTLSConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[19]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GatewayTLSConfig.ProtoReflect.Descriptor instead.
+func (*GatewayTLSConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{19}
+}
+
+func (x *GatewayTLSConfig) GetEnabled() bool {
+	if x != nil {
+		return x.Enabled
+	}
+	return false
+}
+
+func (x *GatewayTLSConfig) GetSDS() *GatewayTLSSDSConfig {
+	if x != nil {
+		return x.SDS
+	}
+	return nil
+}
+
+func (x *GatewayTLSConfig) GetTLSMinVersion() string {
+	if x != nil {
+		return x.TLSMinVersion
+	}
+	return ""
+}
+
+func (x *GatewayTLSConfig) GetTLSMaxVersion() string {
+	if x != nil {
+		return x.TLSMaxVersion
+	}
+	return ""
+}
+
+func (x *GatewayTLSConfig) GetCipherSuites() []string {
+	if x != nil {
+		return x.CipherSuites
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.GatewayTLSSDSConfig
+// output=config_entry.gen.go
+// name=Structs
+type GatewayTLSSDSConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ClusterName  string `protobuf:"bytes,1,opt,name=ClusterName,proto3" json:"ClusterName,omitempty"`
+	CertResource string `protobuf:"bytes,2,opt,name=CertResource,proto3" json:"CertResource,omitempty"`
+}
+
+func (x *GatewayTLSSDSConfig) Reset() {
+	*x = GatewayTLSSDSConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[20]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GatewayTLSSDSConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GatewayTLSSDSConfig) ProtoMessage() {}
+
+func (x *GatewayTLSSDSConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[20]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GatewayTLSSDSConfig.ProtoReflect.Descriptor instead.
+func (*GatewayTLSSDSConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{20}
+}
+
+func (x *GatewayTLSSDSConfig) GetClusterName() string {
+	if x != nil {
+		return x.ClusterName
+	}
+	return ""
+}
+
+func (x *GatewayTLSSDSConfig) GetCertResource() string {
+	if x != nil {
+		return x.CertResource
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IngressListener
+// output=config_entry.gen.go
+// name=Structs
+type IngressListener struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=int func-from=int32
+	Port     int32             `protobuf:"varint,1,opt,name=Port,proto3" json:"Port,omitempty"`
+	Protocol string            `protobuf:"bytes,2,opt,name=Protocol,proto3" json:"Protocol,omitempty"`
+	Services []*IngressService `protobuf:"bytes,3,rep,name=Services,proto3" json:"Services,omitempty"`
+	TLS      *GatewayTLSConfig `protobuf:"bytes,4,opt,name=TLS,proto3" json:"TLS,omitempty"`
+}
+
+func (x *IngressListener) Reset() {
+	*x = IngressListener{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[21]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *IngressListener) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IngressListener) ProtoMessage() {}
+
+func (x *IngressListener) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[21]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use IngressListener.ProtoReflect.Descriptor instead.
+func (*IngressListener) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{21}
+}
+
+func (x *IngressListener) GetPort() int32 {
+	if x != nil {
+		return x.Port
+	}
+	return 0
+}
+
+func (x *IngressListener) GetProtocol() string {
+	if x != nil {
+		return x.Protocol
+	}
+	return ""
+}
+
+func (x *IngressListener) GetServices() []*IngressService {
+	if x != nil {
+		return x.Services
+	}
+	return nil
+}
+
+func (x *IngressListener) GetTLS() *GatewayTLSConfig {
+	if x != nil {
+		return x.TLS
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IngressService
+// output=config_entry.gen.go
+// name=Structs
+type IngressService struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name            string                   `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	Hosts           []string                 `protobuf:"bytes,2,rep,name=Hosts,proto3" json:"Hosts,omitempty"`
+	TLS             *GatewayServiceTLSConfig `protobuf:"bytes,3,opt,name=TLS,proto3" json:"TLS,omitempty"`
+	RequestHeaders  *HTTPHeaderModifiers     `protobuf:"bytes,4,opt,name=RequestHeaders,proto3" json:"RequestHeaders,omitempty"`
+	ResponseHeaders *HTTPHeaderModifiers     `protobuf:"bytes,5,opt,name=ResponseHeaders,proto3" json:"ResponseHeaders,omitempty"`
+	Meta            map[string]string        `protobuf:"bytes,6,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
+	EnterpriseMeta        *pbcommon.EnterpriseMeta `protobuf:"bytes,7,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
+	MaxConnections        uint32                   `protobuf:"varint,8,opt,name=MaxConnections,proto3" json:"MaxConnections,omitempty"`
+	MaxPendingRequests    uint32                   `protobuf:"varint,9,opt,name=MaxPendingRequests,proto3" json:"MaxPendingRequests,omitempty"`
+	MaxConcurrentRequests uint32                   `protobuf:"varint,10,opt,name=MaxConcurrentRequests,proto3" json:"MaxConcurrentRequests,omitempty"`
+	PassiveHealthCheck    *PassiveHealthCheck      `protobuf:"bytes,11,opt,name=PassiveHealthCheck,proto3" json:"PassiveHealthCheck,omitempty"`
+}
+
+func (x *IngressService) Reset() {
+	*x = IngressService{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[22]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *IngressService) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IngressService) ProtoMessage() {}
+
+func (x *IngressService) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[22]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use IngressService.ProtoReflect.Descriptor instead.
+func (*IngressService) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{22}
+}
+
+func (x *IngressService) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *IngressService) GetHosts() []string {
+	if x != nil {
+		return x.Hosts
+	}
+	return nil
+}
+
+func (x *IngressService) GetTLS() *GatewayServiceTLSConfig {
+	if x != nil {
+		return x.TLS
+	}
+	return nil
+}
+
+func (x *IngressService) GetRequestHeaders() *HTTPHeaderModifiers {
+	if x != nil {
+		return x.RequestHeaders
+	}
+	return nil
+}
+
+func (x *IngressService) GetResponseHeaders() *HTTPHeaderModifiers {
+	if x != nil {
+		return x.ResponseHeaders
+	}
+	return nil
+}
+
+func (x *IngressService) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *IngressService) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
+	}
+	return nil
+}
+
+func (x *IngressService) GetMaxConnections() uint32 {
+	if x != nil {
+		return x.MaxConnections
+	}
+	return 0
+}
+
+func (x *IngressService) GetMaxPendingRequests() uint32 {
+	if x != nil {
+		return x.MaxPendingRequests
+	}
+	return 0
+}
+
+func (x *IngressService) GetMaxConcurrentRequests() uint32 {
+	if x != nil {
+		return x.MaxConcurrentRequests
+	}
+	return 0
+}
+
+func (x *IngressService) GetPassiveHealthCheck() *PassiveHealthCheck {
+	if x != nil {
+		return x.PassiveHealthCheck
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.GatewayServiceTLSConfig
+// output=config_entry.gen.go
+// name=Structs
+type GatewayServiceTLSConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	SDS *GatewayTLSSDSConfig `protobuf:"bytes,1,opt,name=SDS,proto3" json:"SDS,omitempty"`
+}
+
+func (x *GatewayServiceTLSConfig) Reset() {
+	*x = GatewayServiceTLSConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[23]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GatewayServiceTLSConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GatewayServiceTLSConfig) ProtoMessage() {}
+
+func (x *GatewayServiceTLSConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[23]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GatewayServiceTLSConfig.ProtoReflect.Descriptor instead.
+func (*GatewayServiceTLSConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{23}
+}
+
+func (x *GatewayServiceTLSConfig) GetSDS() *GatewayTLSSDSConfig {
+	if x != nil {
+		return x.SDS
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPHeaderModifiers
+// output=config_entry.gen.go
+// name=Structs
+type HTTPHeaderModifiers struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Add    map[string]string `protobuf:"bytes,1,rep,name=Add,proto3" json:"Add,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Set    map[string]string `protobuf:"bytes,2,rep,name=Set,proto3" json:"Set,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Remove []string          `protobuf:"bytes,3,rep,name=Remove,proto3" json:"Remove,omitempty"`
+}
+
+func (x *HTTPHeaderModifiers) Reset() {
+	*x = HTTPHeaderModifiers{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[24]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HTTPHeaderModifiers) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HTTPHeaderModifiers) ProtoMessage() {}
+
+func (x *HTTPHeaderModifiers) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[24]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HTTPHeaderModifiers.ProtoReflect.Descriptor instead.
+func (*HTTPHeaderModifiers) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{24}
+}
+
+func (x *HTTPHeaderModifiers) GetAdd() map[string]string {
+	if x != nil {
+		return x.Add
+	}
+	return nil
+}
+
+func (x *HTTPHeaderModifiers) GetSet() map[string]string {
+	if x != nil {
+		return x.Set
+	}
+	return nil
+}
+
+func (x *HTTPHeaderModifiers) GetRemove() []string {
+	if x != nil {
+		return x.Remove
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceIntentionsConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+type ServiceIntentions struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Sources []*SourceIntention `protobuf:"bytes,1,rep,name=Sources,proto3" json:"Sources,omitempty"`
+	Meta    map[string]string  `protobuf:"bytes,2,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+}
+
+func (x *ServiceIntentions) Reset() {
+	*x = ServiceIntentions{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[25]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceIntentions) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceIntentions) ProtoMessage() {}
+
+func (x *ServiceIntentions) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[25]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceIntentions.ProtoReflect.Descriptor instead.
+func (*ServiceIntentions) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{25}
+}
+
+func (x *ServiceIntentions) GetSources() []*SourceIntention {
+	if x != nil {
+		return x.Sources
+	}
+	return nil
+}
+
+func (x *ServiceIntentions) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.SourceIntention
+// output=config_entry.gen.go
+// name=Structs
+type SourceIntention struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	// mog: func-to=intentionActionToStructs func-from=intentionActionFromStructs
+	Action      IntentionAction        `protobuf:"varint,2,opt,name=Action,proto3,enum=hashicorp.consul.internal.configentry.IntentionAction" json:"Action,omitempty"`
+	Permissions []*IntentionPermission `protobuf:"bytes,3,rep,name=Permissions,proto3" json:"Permissions,omitempty"`
+	// mog: func-to=int func-from=int32
+	Precedence int32  `protobuf:"varint,4,opt,name=Precedence,proto3" json:"Precedence,omitempty"`
+	LegacyID   string `protobuf:"bytes,5,opt,name=LegacyID,proto3" json:"LegacyID,omitempty"`
+	// mog: func-to=intentionSourceTypeToStructs func-from=intentionSourceTypeFromStructs
+	Type        IntentionSourceType `protobuf:"varint,6,opt,name=Type,proto3,enum=hashicorp.consul.internal.configentry.IntentionSourceType" json:"Type,omitempty"`
+	Description string              `protobuf:"bytes,7,opt,name=Description,proto3" json:"Description,omitempty"`
+	LegacyMeta  map[string]string   `protobuf:"bytes,8,rep,name=LegacyMeta,proto3" json:"LegacyMeta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// mog: func-to=timeToStructs func-from=timeFromStructs
+	LegacyCreateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=LegacyCreateTime,proto3" json:"LegacyCreateTime,omitempty"`
+	// mog: func-to=timeToStructs func-from=timeFromStructs
+	LegacyUpdateTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=LegacyUpdateTime,proto3" json:"LegacyUpdateTime,omitempty"`
+	// mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
+	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,11,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
+	Peer           string                   `protobuf:"bytes,12,opt,name=Peer,proto3" json:"Peer,omitempty"`
+}
+
+func (x *SourceIntention) Reset() {
+	*x = SourceIntention{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[26]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SourceIntention) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SourceIntention) ProtoMessage() {}
+
+func (x *SourceIntention) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[26]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SourceIntention.ProtoReflect.Descriptor instead.
+func (*SourceIntention) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{26}
+}
+
+func (x *SourceIntention) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *SourceIntention) GetAction() IntentionAction {
+	if x != nil {
+		return x.Action
+	}
+	return IntentionAction_Deny
+}
+
+func (x *SourceIntention) GetPermissions() []*IntentionPermission {
+	if x != nil {
+		return x.Permissions
+	}
+	return nil
+}
+
+func (x *SourceIntention) GetPrecedence() int32 {
+	if x != nil {
+		return x.Precedence
+	}
+	return 0
+}
+
+func (x *SourceIntention) GetLegacyID() string {
+	if x != nil {
+		return x.LegacyID
+	}
+	return ""
+}
+
+func (x *SourceIntention) GetType() IntentionSourceType {
+	if x != nil {
+		return x.Type
+	}
+	return IntentionSourceType_Consul
+}
+
+func (x *SourceIntention) GetDescription() string {
+	if x != nil {
+		return x.Description
+	}
+	return ""
+}
+
+func (x *SourceIntention) GetLegacyMeta() map[string]string {
+	if x != nil {
+		return x.LegacyMeta
+	}
+	return nil
+}
+
+func (x *SourceIntention) GetLegacyCreateTime() *timestamppb.Timestamp {
+	if x != nil {
+		return x.LegacyCreateTime
+	}
+	return nil
+}
+
+func (x *SourceIntention) GetLegacyUpdateTime() *timestamppb.Timestamp {
+	if x != nil {
+		return x.LegacyUpdateTime
+	}
+	return nil
+}
+
+func (x *SourceIntention) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
+	}
+	return nil
+}
+
+func (x *SourceIntention) GetPeer() string {
+	if x != nil {
+		return x.Peer
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IntentionPermission
+// output=config_entry.gen.go
+// name=Structs
+type IntentionPermission struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=intentionActionToStructs func-from=intentionActionFromStructs
+	Action IntentionAction          `protobuf:"varint,1,opt,name=Action,proto3,enum=hashicorp.consul.internal.configentry.IntentionAction" json:"Action,omitempty"`
+	HTTP   *IntentionHTTPPermission `protobuf:"bytes,2,opt,name=HTTP,proto3" json:"HTTP,omitempty"`
+}
+
+func (x *IntentionPermission) Reset() {
+	*x = IntentionPermission{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[27]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *IntentionPermission) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IntentionPermission) ProtoMessage() {}
+
+func (x *IntentionPermission) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[27]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use IntentionPermission.ProtoReflect.Descriptor instead.
+func (*IntentionPermission) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{27}
+}
+
+func (x *IntentionPermission) GetAction() IntentionAction {
+	if x != nil {
+		return x.Action
+	}
+	return IntentionAction_Deny
+}
+
+func (x *IntentionPermission) GetHTTP() *IntentionHTTPPermission {
+	if x != nil {
+		return x.HTTP
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IntentionHTTPPermission
+// output=config_entry.gen.go
+// name=Structs
+type IntentionHTTPPermission struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	PathExact  string                           `protobuf:"bytes,1,opt,name=PathExact,proto3" json:"PathExact,omitempty"`
+	PathPrefix string                           `protobuf:"bytes,2,opt,name=PathPrefix,proto3" json:"PathPrefix,omitempty"`
+	PathRegex  string                           `protobuf:"bytes,3,opt,name=PathRegex,proto3" json:"PathRegex,omitempty"`
+	Header     []*IntentionHTTPHeaderPermission `protobuf:"bytes,4,rep,name=Header,proto3" json:"Header,omitempty"`
+	Methods    []string                         `protobuf:"bytes,5,rep,name=Methods,proto3" json:"Methods,omitempty"`
+}
+
+func (x *IntentionHTTPPermission) Reset() {
+	*x = IntentionHTTPPermission{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[28]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *IntentionHTTPPermission) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IntentionHTTPPermission) ProtoMessage() {}
+
+func (x *IntentionHTTPPermission) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[28]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use IntentionHTTPPermission.ProtoReflect.Descriptor instead.
+func (*IntentionHTTPPermission) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{28}
+}
+
+func (x *IntentionHTTPPermission) GetPathExact() string {
+	if x != nil {
+		return x.PathExact
+	}
+	return ""
+}
+
+func (x *IntentionHTTPPermission) GetPathPrefix() string {
+	if x != nil {
+		return x.PathPrefix
+	}
+	return ""
+}
+
+func (x *IntentionHTTPPermission) GetPathRegex() string {
+	if x != nil {
+		return x.PathRegex
+	}
+	return ""
+}
+
+func (x *IntentionHTTPPermission) GetHeader() []*IntentionHTTPHeaderPermission {
+	if x != nil {
+		return x.Header
+	}
+	return nil
+}
+
+func (x *IntentionHTTPPermission) GetMethods() []string {
+	if x != nil {
+		return x.Methods
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IntentionHTTPHeaderPermission
+// output=config_entry.gen.go
+// name=Structs
+type IntentionHTTPHeaderPermission struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name    string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	Present bool   `protobuf:"varint,2,opt,name=Present,proto3" json:"Present,omitempty"`
+	Exact   string `protobuf:"bytes,3,opt,name=Exact,proto3" json:"Exact,omitempty"`
+	Prefix  string `protobuf:"bytes,4,opt,name=Prefix,proto3" json:"Prefix,omitempty"`
+	Suffix  string `protobuf:"bytes,5,opt,name=Suffix,proto3" json:"Suffix,omitempty"`
+	Regex   string `protobuf:"bytes,6,opt,name=Regex,proto3" json:"Regex,omitempty"`
+	Invert  bool   `protobuf:"varint,7,opt,name=Invert,proto3" json:"Invert,omitempty"`
+}
+
+func (x *IntentionHTTPHeaderPermission) Reset() {
+	*x = IntentionHTTPHeaderPermission{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[29]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *IntentionHTTPHeaderPermission) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IntentionHTTPHeaderPermission) ProtoMessage() {}
+
+func (x *IntentionHTTPHeaderPermission) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[29]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use IntentionHTTPHeaderPermission.ProtoReflect.Descriptor instead.
+func (*IntentionHTTPHeaderPermission) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{29}
+}
+
+func (x *IntentionHTTPHeaderPermission) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *IntentionHTTPHeaderPermission) GetPresent() bool {
+	if x != nil {
+		return x.Present
+	}
+	return false
+}
+
+func (x *IntentionHTTPHeaderPermission) GetExact() string {
+	if x != nil {
+		return x.Exact
+	}
+	return ""
+}
+
+func (x *IntentionHTTPHeaderPermission) GetPrefix() string {
+	if x != nil {
+		return x.Prefix
+	}
+	return ""
+}
+
+func (x *IntentionHTTPHeaderPermission) GetSuffix() string {
+	if x != nil {
+		return x.Suffix
+	}
+	return ""
+}
+
+func (x *IntentionHTTPHeaderPermission) GetRegex() string {
+	if x != nil {
+		return x.Regex
+	}
+	return ""
+}
+
+func (x *IntentionHTTPHeaderPermission) GetInvert() bool {
+	if x != nil {
+		return x.Invert
+	}
+	return false
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+type ServiceDefaults struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Protocol string `protobuf:"bytes,1,opt,name=Protocol,proto3" json:"Protocol,omitempty"`
+	// mog: func-to=proxyModeToStructs func-from=proxyModeFromStructs
+	Mode             ProxyMode               `protobuf:"varint,2,opt,name=Mode,proto3,enum=hashicorp.consul.internal.configentry.ProxyMode" json:"Mode,omitempty"`
+	TransparentProxy *TransparentProxyConfig `protobuf:"bytes,3,opt,name=TransparentProxy,proto3" json:"TransparentProxy,omitempty"`
+	MeshGateway      *MeshGatewayConfig      `protobuf:"bytes,4,opt,name=MeshGateway,proto3" json:"MeshGateway,omitempty"`
+	Expose           *ExposeConfig           `protobuf:"bytes,5,opt,name=Expose,proto3" json:"Expose,omitempty"`
+	ExternalSNI      string                  `protobuf:"bytes,6,opt,name=ExternalSNI,proto3" json:"ExternalSNI,omitempty"`
+	UpstreamConfig   *UpstreamConfiguration  `protobuf:"bytes,7,opt,name=UpstreamConfig,proto3" json:"UpstreamConfig,omitempty"`
+	Destination      *DestinationConfig      `protobuf:"bytes,8,opt,name=Destination,proto3" json:"Destination,omitempty"`
+	// mog: func-to=int func-from=int32
+	MaxInboundConnections int32 `protobuf:"varint,9,opt,name=MaxInboundConnections,proto3" json:"MaxInboundConnections,omitempty"`
+	// mog: func-to=int func-from=int32
+	LocalConnectTimeoutMs int32 `protobuf:"varint,10,opt,name=LocalConnectTimeoutMs,proto3" json:"LocalConnectTimeoutMs,omitempty"`
+	// mog: func-to=int func-from=int32
+	LocalRequestTimeoutMs     int32             `protobuf:"varint,11,opt,name=LocalRequestTimeoutMs,proto3" json:"LocalRequestTimeoutMs,omitempty"`
+	BalanceInboundConnections string            `protobuf:"bytes,12,opt,name=BalanceInboundConnections,proto3" json:"BalanceInboundConnections,omitempty"`
+	Meta                      map[string]string `protobuf:"bytes,13,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// mog: func-to=EnvoyExtensionsToStructs func-from=EnvoyExtensionsFromStructs
+	EnvoyExtensions []*pbcommon.EnvoyExtension `protobuf:"bytes,14,rep,name=EnvoyExtensions,proto3" json:"EnvoyExtensions,omitempty"`
+}
+
+func (x *ServiceDefaults) Reset() {
+	*x = ServiceDefaults{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[30]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceDefaults) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceDefaults) ProtoMessage() {}
+
+func (x *ServiceDefaults) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[30]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceDefaults.ProtoReflect.Descriptor instead.
+func (*ServiceDefaults) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{30}
+}
+
+func (x *ServiceDefaults) GetProtocol() string {
+	if x != nil {
+		return x.Protocol
+	}
+	return ""
+}
+
+func (x *ServiceDefaults) GetMode() ProxyMode {
+	if x != nil {
+		return x.Mode
+	}
+	return ProxyMode_ProxyModeDefault
+}
+
+func (x *ServiceDefaults) GetTransparentProxy() *TransparentProxyConfig {
+	if x != nil {
+		return x.TransparentProxy
+	}
+	return nil
+}
+
+func (x *ServiceDefaults) GetMeshGateway() *MeshGatewayConfig {
+	if x != nil {
+		return x.MeshGateway
+	}
+	return nil
+}
+
+func (x *ServiceDefaults) GetExpose() *ExposeConfig {
+	if x != nil {
+		return x.Expose
+	}
+	return nil
+}
+
+func (x *ServiceDefaults) GetExternalSNI() string {
+	if x != nil {
+		return x.ExternalSNI
+	}
+	return ""
+}
+
+func (x *ServiceDefaults) GetUpstreamConfig() *UpstreamConfiguration {
+	if x != nil {
+		return x.UpstreamConfig
+	}
+	return nil
+}
+
+func (x *ServiceDefaults) GetDestination() *DestinationConfig {
+	if x != nil {
+		return x.Destination
+	}
+	return nil
+}
+
+func (x *ServiceDefaults) GetMaxInboundConnections() int32 {
+	if x != nil {
+		return x.MaxInboundConnections
+	}
+	return 0
+}
+
+func (x *ServiceDefaults) GetLocalConnectTimeoutMs() int32 {
+	if x != nil {
+		return x.LocalConnectTimeoutMs
+	}
+	return 0
+}
+
+func (x *ServiceDefaults) GetLocalRequestTimeoutMs() int32 {
+	if x != nil {
+		return x.LocalRequestTimeoutMs
+	}
+	return 0
+}
+
+func (x *ServiceDefaults) GetBalanceInboundConnections() string {
+	if x != nil {
+		return x.BalanceInboundConnections
+	}
+	return ""
+}
+
+func (x *ServiceDefaults) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *ServiceDefaults) GetEnvoyExtensions() []*pbcommon.EnvoyExtension {
+	if x != nil {
+		return x.EnvoyExtensions
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.TransparentProxyConfig
+// output=config_entry.gen.go
+// name=Structs
+type TransparentProxyConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=int func-from=int32
+	OutboundListenerPort int32 `protobuf:"varint,1,opt,name=OutboundListenerPort,proto3" json:"OutboundListenerPort,omitempty"`
+	DialedDirectly       bool  `protobuf:"varint,2,opt,name=DialedDirectly,proto3" json:"DialedDirectly,omitempty"`
+}
+
+func (x *TransparentProxyConfig) Reset() {
+	*x = TransparentProxyConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[31]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TransparentProxyConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TransparentProxyConfig) ProtoMessage() {}
+
+func (x *TransparentProxyConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[31]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TransparentProxyConfig.ProtoReflect.Descriptor instead.
+func (*TransparentProxyConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{31}
+}
+
+func (x *TransparentProxyConfig) GetOutboundListenerPort() int32 {
+	if x != nil {
+		return x.OutboundListenerPort
+	}
+	return 0
+}
+
+func (x *TransparentProxyConfig) GetDialedDirectly() bool {
+	if x != nil {
+		return x.DialedDirectly
+	}
+	return false
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.MeshGatewayConfig
+// output=config_entry.gen.go
+// name=Structs
+type MeshGatewayConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=meshGatewayModeToStructs func-from=meshGatewayModeFromStructs
+	Mode MeshGatewayMode `protobuf:"varint,1,opt,name=Mode,proto3,enum=hashicorp.consul.internal.configentry.MeshGatewayMode" json:"Mode,omitempty"`
+}
+
+func (x *MeshGatewayConfig) Reset() {
+	*x = MeshGatewayConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[32]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MeshGatewayConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MeshGatewayConfig) ProtoMessage() {}
+
+func (x *MeshGatewayConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[32]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use MeshGatewayConfig.ProtoReflect.Descriptor instead.
+func (*MeshGatewayConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{32}
+}
+
+func (x *MeshGatewayConfig) GetMode() MeshGatewayMode {
+	if x != nil {
+		return x.Mode
+	}
+	return MeshGatewayMode_MeshGatewayModeDefault
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ExposeConfig
+// output=config_entry.gen.go
+// name=Structs
+type ExposeConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Checks bool          `protobuf:"varint,1,opt,name=Checks,proto3" json:"Checks,omitempty"`
+	Paths  []*ExposePath `protobuf:"bytes,2,rep,name=Paths,proto3" json:"Paths,omitempty"`
+}
+
+func (x *ExposeConfig) Reset() {
+	*x = ExposeConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[33]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExposeConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExposeConfig) ProtoMessage() {}
+
+func (x *ExposeConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[33]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ExposeConfig.ProtoReflect.Descriptor instead.
+func (*ExposeConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{33}
+}
+
+func (x *ExposeConfig) GetChecks() bool {
+	if x != nil {
+		return x.Checks
+	}
+	return false
+}
+
+func (x *ExposeConfig) GetPaths() []*ExposePath {
+	if x != nil {
+		return x.Paths
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ExposePath
+// output=config_entry.gen.go
+// name=Structs
+type ExposePath struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=int func-from=int32
+	ListenerPort int32  `protobuf:"varint,1,opt,name=ListenerPort,proto3" json:"ListenerPort,omitempty"`
+	Path         string `protobuf:"bytes,2,opt,name=Path,proto3" json:"Path,omitempty"`
+	// mog: func-to=int func-from=int32
+	LocalPathPort   int32  `protobuf:"varint,3,opt,name=LocalPathPort,proto3" json:"LocalPathPort,omitempty"`
+	Protocol        string `protobuf:"bytes,4,opt,name=Protocol,proto3" json:"Protocol,omitempty"`
+	ParsedFromCheck bool   `protobuf:"varint,5,opt,name=ParsedFromCheck,proto3" json:"ParsedFromCheck,omitempty"`
+}
+
+func (x *ExposePath) Reset() {
+	*x = ExposePath{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[34]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExposePath) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExposePath) ProtoMessage() {}
+
+func (x *ExposePath) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[34]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ExposePath.ProtoReflect.Descriptor instead.
+func (*ExposePath) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{34}
+}
+
+func (x *ExposePath) GetListenerPort() int32 {
+	if x != nil {
+		return x.ListenerPort
+	}
+	return 0
+}
+
+func (x *ExposePath) GetPath() string {
+	if x != nil {
+		return x.Path
+	}
+	return ""
+}
+
+func (x *ExposePath) GetLocalPathPort() int32 {
+	if x != nil {
+		return x.LocalPathPort
+	}
+	return 0
+}
+
+func (x *ExposePath) GetProtocol() string {
+	if x != nil {
+		return x.Protocol
+	}
+	return ""
+}
+
+func (x *ExposePath) GetParsedFromCheck() bool {
+	if x != nil {
+		return x.ParsedFromCheck
+	}
+	return false
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.UpstreamConfiguration
+// output=config_entry.gen.go
+// name=Structs
+type UpstreamConfiguration struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Overrides []*UpstreamConfig `protobuf:"bytes,1,rep,name=Overrides,proto3" json:"Overrides,omitempty"`
+	Defaults  *UpstreamConfig   `protobuf:"bytes,2,opt,name=Defaults,proto3" json:"Defaults,omitempty"`
+}
+
+func (x *UpstreamConfiguration) Reset() {
+	*x = UpstreamConfiguration{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[35]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UpstreamConfiguration) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpstreamConfiguration) ProtoMessage() {}
+
+func (x *UpstreamConfiguration) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[35]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpstreamConfiguration.ProtoReflect.Descriptor instead.
+func (*UpstreamConfiguration) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{35}
+}
+
+func (x *UpstreamConfiguration) GetOverrides() []*UpstreamConfig {
+	if x != nil {
+		return x.Overrides
+	}
+	return nil
+}
+
+func (x *UpstreamConfiguration) GetDefaults() *UpstreamConfig {
+	if x != nil {
+		return x.Defaults
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.UpstreamConfig
+// output=config_entry.gen.go
+// name=Structs
+type UpstreamConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	// mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
+	EnterpriseMeta    *pbcommon.EnterpriseMeta `protobuf:"bytes,2,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
+	EnvoyListenerJSON string                   `protobuf:"bytes,3,opt,name=EnvoyListenerJSON,proto3" json:"EnvoyListenerJSON,omitempty"`
+	EnvoyClusterJSON  string                   `protobuf:"bytes,4,opt,name=EnvoyClusterJSON,proto3" json:"EnvoyClusterJSON,omitempty"`
+	Protocol          string                   `protobuf:"bytes,5,opt,name=Protocol,proto3" json:"Protocol,omitempty"`
+	// mog: func-to=int func-from=int32
+	ConnectTimeoutMs           int32               `protobuf:"varint,6,opt,name=ConnectTimeoutMs,proto3" json:"ConnectTimeoutMs,omitempty"`
+	Limits                     *UpstreamLimits     `protobuf:"bytes,7,opt,name=Limits,proto3" json:"Limits,omitempty"`
+	PassiveHealthCheck         *PassiveHealthCheck `protobuf:"bytes,8,opt,name=PassiveHealthCheck,proto3" json:"PassiveHealthCheck,omitempty"`
+	MeshGateway                *MeshGatewayConfig  `protobuf:"bytes,9,opt,name=MeshGateway,proto3" json:"MeshGateway,omitempty"`
+	BalanceOutboundConnections string              `protobuf:"bytes,10,opt,name=BalanceOutboundConnections,proto3" json:"BalanceOutboundConnections,omitempty"`
+	Peer                       string              `protobuf:"bytes,11,opt,name=Peer,proto3" json:"Peer,omitempty"`
+}
+
+func (x *UpstreamConfig) Reset() {
+	*x = UpstreamConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[36]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UpstreamConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpstreamConfig) ProtoMessage() {}
+
+func (x *UpstreamConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[36]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpstreamConfig.ProtoReflect.Descriptor instead.
+func (*UpstreamConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{36}
+}
+
+func (x *UpstreamConfig) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *UpstreamConfig) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
+	}
+	return nil
+}
+
+func (x *UpstreamConfig) GetEnvoyListenerJSON() string {
+	if x != nil {
+		return x.EnvoyListenerJSON
+	}
+	return ""
+}
+
+func (x *UpstreamConfig) GetEnvoyClusterJSON() string {
+	if x != nil {
+		return x.EnvoyClusterJSON
+	}
+	return ""
+}
+
+func (x *UpstreamConfig) GetProtocol() string {
+	if x != nil {
+		return x.Protocol
+	}
+	return ""
+}
+
+func (x *UpstreamConfig) GetConnectTimeoutMs() int32 {
+	if x != nil {
+		return x.ConnectTimeoutMs
+	}
+	return 0
+}
+
+func (x *UpstreamConfig) GetLimits() *UpstreamLimits {
+	if x != nil {
+		return x.Limits
+	}
+	return nil
+}
+
+func (x *UpstreamConfig) GetPassiveHealthCheck() *PassiveHealthCheck {
+	if x != nil {
+		return x.PassiveHealthCheck
+	}
+	return nil
+}
+
+func (x *UpstreamConfig) GetMeshGateway() *MeshGatewayConfig {
+	if x != nil {
+		return x.MeshGateway
+	}
+	return nil
+}
+
+func (x *UpstreamConfig) GetBalanceOutboundConnections() string {
+	if x != nil {
+		return x.BalanceOutboundConnections
+	}
+	return ""
+}
+
+func (x *UpstreamConfig) GetPeer() string {
+	if x != nil {
+		return x.Peer
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.UpstreamLimits
+// output=config_entry.gen.go
+// name=Structs
+type UpstreamLimits struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=pointerToIntFromInt32 func-from=int32FromPointerToInt
+	MaxConnections int32 `protobuf:"varint,1,opt,name=MaxConnections,proto3" json:"MaxConnections,omitempty"`
+	// mog: func-to=pointerToIntFromInt32 func-from=int32FromPointerToInt
+	MaxPendingRequests int32 `protobuf:"varint,2,opt,name=MaxPendingRequests,proto3" json:"MaxPendingRequests,omitempty"`
+	// mog: func-to=pointerToIntFromInt32 func-from=int32FromPointerToInt
+	MaxConcurrentRequests int32 `protobuf:"varint,3,opt,name=MaxConcurrentRequests,proto3" json:"MaxConcurrentRequests,omitempty"`
+}
+
+func (x *UpstreamLimits) Reset() {
+	*x = UpstreamLimits{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[37]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UpstreamLimits) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpstreamLimits) ProtoMessage() {}
+
+func (x *UpstreamLimits) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[37]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpstreamLimits.ProtoReflect.Descriptor instead.
+func (*UpstreamLimits) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{37}
+}
+
+func (x *UpstreamLimits) GetMaxConnections() int32 {
+	if x != nil {
+		return x.MaxConnections
+	}
+	return 0
+}
+
+func (x *UpstreamLimits) GetMaxPendingRequests() int32 {
+	if x != nil {
+		return x.MaxPendingRequests
+	}
+	return 0
+}
+
+func (x *UpstreamLimits) GetMaxConcurrentRequests() int32 {
+	if x != nil {
+		return x.MaxConcurrentRequests
+	}
+	return 0
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.PassiveHealthCheck
+// output=config_entry.gen.go
+// name=Structs
+type PassiveHealthCheck struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	Interval    *durationpb.Duration `protobuf:"bytes,1,opt,name=Interval,proto3" json:"Interval,omitempty"`
+	MaxFailures uint32               `protobuf:"varint,2,opt,name=MaxFailures,proto3" json:"MaxFailures,omitempty"`
+	// mog: target=EnforcingConsecutive5xx func-to=pointerToUint32FromUint32 func-from=uint32FromPointerToUint32
+	EnforcingConsecutive5Xx uint32 `protobuf:"varint,3,opt,name=EnforcingConsecutive5xx,proto3" json:"EnforcingConsecutive5xx,omitempty"`
+	// mog: func-to=pointerToUint32FromUint32 func-from=uint32FromPointerToUint32
+	MaxEjectionPercent uint32 `protobuf:"varint,4,opt,name=MaxEjectionPercent,proto3" json:"MaxEjectionPercent,omitempty"`
+	// mog: func-to=structs.DurationPointerFromProto func-from=structs.DurationPointerToProto
+	BaseEjectionTime *durationpb.Duration `protobuf:"bytes,5,opt,name=BaseEjectionTime,proto3" json:"BaseEjectionTime,omitempty"`
+}
+
+func (x *PassiveHealthCheck) Reset() {
+	*x = PassiveHealthCheck{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[38]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PassiveHealthCheck) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PassiveHealthCheck) ProtoMessage() {}
+
+func (x *PassiveHealthCheck) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[38]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PassiveHealthCheck.ProtoReflect.Descriptor instead.
+func (*PassiveHealthCheck) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{38}
+}
+
+func (x *PassiveHealthCheck) GetInterval() *durationpb.Duration {
+	if x != nil {
+		return x.Interval
+	}
+	return nil
+}
+
+func (x *PassiveHealthCheck) GetMaxFailures() uint32 {
+	if x != nil {
+		return x.MaxFailures
+	}
+	return 0
+}
+
+func (x *PassiveHealthCheck) GetEnforcingConsecutive5Xx() uint32 {
+	if x != nil {
+		return x.EnforcingConsecutive5Xx
+	}
+	return 0
+}
+
+func (x *PassiveHealthCheck) GetMaxEjectionPercent() uint32 {
+	if x != nil {
+		return x.MaxEjectionPercent
+	}
+	return 0
+}
+
+func (x *PassiveHealthCheck) GetBaseEjectionTime() *durationpb.Duration {
+	if x != nil {
+		return x.BaseEjectionTime
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.DestinationConfig
+// output=config_entry.gen.go
+// name=Structs
+type DestinationConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Addresses []string `protobuf:"bytes,1,rep,name=Addresses,proto3" json:"Addresses,omitempty"`
+	// mog: func-to=int func-from=int32
+	Port int32 `protobuf:"varint,2,opt,name=Port,proto3" json:"Port,omitempty"`
+}
+
+func (x *DestinationConfig) Reset() {
+	*x = DestinationConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[39]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DestinationConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DestinationConfig) ProtoMessage() {}
+
+func (x *DestinationConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[39]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use DestinationConfig.ProtoReflect.Descriptor instead.
+func (*DestinationConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{39}
+}
+
+func (x *DestinationConfig) GetAddresses() []string {
+	if x != nil {
+		return x.Addresses
+	}
+	return nil
+}
+
+func (x *DestinationConfig) GetPort() int32 {
+	if x != nil {
+		return x.Port
+	}
+	return 0
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.APIGatewayConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+type APIGateway struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Meta      map[string]string     `protobuf:"bytes,1,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Listeners []*APIGatewayListener `protobuf:"bytes,2,rep,name=Listeners,proto3" json:"Listeners,omitempty"`
+	Status    *Status               `protobuf:"bytes,3,opt,name=Status,proto3" json:"Status,omitempty"`
+}
+
+func (x *APIGateway) Reset() {
+	*x = APIGateway{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[40]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *APIGateway) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*APIGateway) ProtoMessage() {}
+
+func (x *APIGateway) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[40]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use APIGateway.ProtoReflect.Descriptor instead.
+func (*APIGateway) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{40}
+}
+
+func (x *APIGateway) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *APIGateway) GetListeners() []*APIGatewayListener {
+	if x != nil {
+		return x.Listeners
+	}
+	return nil
+}
+
+func (x *APIGateway) GetStatus() *Status {
+	if x != nil {
+		return x.Status
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.Status
+// output=config_entry.gen.go
+// name=Structs
+type Status struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Conditions []*Condition `protobuf:"bytes,1,rep,name=Conditions,proto3" json:"Conditions,omitempty"`
+}
+
+func (x *Status) Reset() {
+	*x = Status{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[41]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Status) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Status) ProtoMessage() {}
+
+func (x *Status) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[41]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Status.ProtoReflect.Descriptor instead.
+func (*Status) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{41}
+}
+
+func (x *Status) GetConditions() []*Condition {
+	if x != nil {
+		return x.Conditions
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.Condition
+// output=config_entry.gen.go
+// name=Structs
+type Condition struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Type     string             `protobuf:"bytes,1,opt,name=Type,proto3" json:"Type,omitempty"`
+	Status   string             `protobuf:"bytes,2,opt,name=Status,proto3" json:"Status,omitempty"`
+	Reason   string             `protobuf:"bytes,3,opt,name=Reason,proto3" json:"Reason,omitempty"`
+	Message  string             `protobuf:"bytes,4,opt,name=Message,proto3" json:"Message,omitempty"`
+	Resource *ResourceReference `protobuf:"bytes,5,opt,name=Resource,proto3" json:"Resource,omitempty"`
+	// mog: func-to=timeToStructs func-from=timeFromStructs
+	LastTransitionTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=LastTransitionTime,proto3" json:"LastTransitionTime,omitempty"`
+}
+
+func (x *Condition) Reset() {
+	*x = Condition{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[42]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Condition) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Condition) ProtoMessage() {}
+
+func (x *Condition) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[42]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Condition.ProtoReflect.Descriptor instead.
+func (*Condition) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{42}
+}
+
+func (x *Condition) GetType() string {
+	if x != nil {
+		return x.Type
+	}
+	return ""
+}
+
+func (x *Condition) GetStatus() string {
+	if x != nil {
+		return x.Status
+	}
+	return ""
+}
+
+func (x *Condition) GetReason() string {
+	if x != nil {
+		return x.Reason
+	}
+	return ""
+}
+
+func (x *Condition) GetMessage() string {
+	if x != nil {
+		return x.Message
+	}
+	return ""
+}
+
+func (x *Condition) GetResource() *ResourceReference {
+	if x != nil {
+		return x.Resource
+	}
+	return nil
+}
+
+func (x *Condition) GetLastTransitionTime() *timestamppb.Timestamp {
+	if x != nil {
+		return x.LastTransitionTime
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.APIGatewayListener
+// output=config_entry.gen.go
+// name=Structs
+type APIGatewayListener struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name     string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	Hostname string `protobuf:"bytes,2,opt,name=Hostname,proto3" json:"Hostname,omitempty"`
+	// mog: func-to=int func-from=int32
+	Port int32 `protobuf:"varint,3,opt,name=Port,proto3" json:"Port,omitempty"`
+	// mog: func-to=apiGatewayProtocolToStructs func-from=apiGatewayProtocolFromStructs
+	Protocol APIGatewayListenerProtocol  `protobuf:"varint,4,opt,name=Protocol,proto3,enum=hashicorp.consul.internal.configentry.APIGatewayListenerProtocol" json:"Protocol,omitempty"`
+	TLS      *APIGatewayTLSConfiguration `protobuf:"bytes,5,opt,name=TLS,proto3" json:"TLS,omitempty"`
+}
+
+func (x *APIGatewayListener) Reset() {
+	*x = APIGatewayListener{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[43]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *APIGatewayListener) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*APIGatewayListener) ProtoMessage() {}
+
+func (x *APIGatewayListener) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[43]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use APIGatewayListener.ProtoReflect.Descriptor instead.
+func (*APIGatewayListener) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{43}
+}
+
+func (x *APIGatewayListener) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *APIGatewayListener) GetHostname() string {
+	if x != nil {
+		return x.Hostname
+	}
+	return ""
+}
+
+func (x *APIGatewayListener) GetPort() int32 {
+	if x != nil {
+		return x.Port
+	}
+	return 0
+}
+
+func (x *APIGatewayListener) GetProtocol() APIGatewayListenerProtocol {
+	if x != nil {
+		return x.Protocol
+	}
+	return APIGatewayListenerProtocol_ListenerProtocolHTTP
+}
+
+func (x *APIGatewayListener) GetTLS() *APIGatewayTLSConfiguration {
+	if x != nil {
+		return x.TLS
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.APIGatewayTLSConfiguration
+// output=config_entry.gen.go
+// name=Structs
+type APIGatewayTLSConfiguration struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Certificates []*ResourceReference `protobuf:"bytes,1,rep,name=Certificates,proto3" json:"Certificates,omitempty"`
+	// mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
+	MinVersion string `protobuf:"bytes,2,opt,name=MinVersion,proto3" json:"MinVersion,omitempty"`
+	// mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
+	MaxVersion string `protobuf:"bytes,3,opt,name=MaxVersion,proto3" json:"MaxVersion,omitempty"`
+	// mog: func-from=cipherSuitesFromStructs func-to=cipherSuitesToStructs
+	CipherSuites []string `protobuf:"bytes,4,rep,name=CipherSuites,proto3" json:"CipherSuites,omitempty"`
+}
+
+func (x *APIGatewayTLSConfiguration) Reset() {
+	*x = APIGatewayTLSConfiguration{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[44]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *APIGatewayTLSConfiguration) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*APIGatewayTLSConfiguration) ProtoMessage() {}
+
+func (x *APIGatewayTLSConfiguration) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[44]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use APIGatewayTLSConfiguration.ProtoReflect.Descriptor instead.
+func (*APIGatewayTLSConfiguration) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{44}
+}
+
+func (x *APIGatewayTLSConfiguration) GetCertificates() []*ResourceReference {
+	if x != nil {
+		return x.Certificates
+	}
+	return nil
+}
+
+func (x *APIGatewayTLSConfiguration) GetMinVersion() string {
+	if x != nil {
+		return x.MinVersion
+	}
+	return ""
+}
+
+func (x *APIGatewayTLSConfiguration) GetMaxVersion() string {
+	if x != nil {
+		return x.MaxVersion
+	}
+	return ""
+}
+
+func (x *APIGatewayTLSConfiguration) GetCipherSuites() []string {
+	if x != nil {
+		return x.CipherSuites
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ResourceReference
+// output=config_entry.gen.go
+// name=Structs
+type ResourceReference struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Kind        string `protobuf:"bytes,1,opt,name=Kind,proto3" json:"Kind,omitempty"`
+	Name        string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
+	SectionName string `protobuf:"bytes,3,opt,name=SectionName,proto3" json:"SectionName,omitempty"`
+	// mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
+	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,4,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
+}
+
+func (x *ResourceReference) Reset() {
+	*x = ResourceReference{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[45]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ResourceReference) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ResourceReference) ProtoMessage() {}
+
+func (x *ResourceReference) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[45]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ResourceReference.ProtoReflect.Descriptor instead.
+func (*ResourceReference) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{45}
+}
+
+func (x *ResourceReference) GetKind() string {
+	if x != nil {
+		return x.Kind
+	}
+	return ""
+}
+
+func (x *ResourceReference) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *ResourceReference) GetSectionName() string {
+	if x != nil {
+		return x.SectionName
+	}
+	return ""
+}
+
+func (x *ResourceReference) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.BoundAPIGatewayConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+type BoundAPIGateway struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Meta      map[string]string          `protobuf:"bytes,1,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Listeners []*BoundAPIGatewayListener `protobuf:"bytes,2,rep,name=Listeners,proto3" json:"Listeners,omitempty"`
+}
+
+func (x *BoundAPIGateway) Reset() {
+	*x = BoundAPIGateway{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[46]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BoundAPIGateway) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BoundAPIGateway) ProtoMessage() {}
+
+func (x *BoundAPIGateway) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[46]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use BoundAPIGateway.ProtoReflect.Descriptor instead.
+func (*BoundAPIGateway) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{46}
+}
+
+func (x *BoundAPIGateway) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *BoundAPIGateway) GetListeners() []*BoundAPIGatewayListener {
+	if x != nil {
+		return x.Listeners
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.BoundAPIGatewayListener
+// output=config_entry.gen.go
+// name=Structs
+type BoundAPIGatewayListener struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name         string               `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	Certificates []*ResourceReference `protobuf:"bytes,2,rep,name=Certificates,proto3" json:"Certificates,omitempty"`
+	Routes       []*ResourceReference `protobuf:"bytes,3,rep,name=Routes,proto3" json:"Routes,omitempty"`
+}
+
+func (x *BoundAPIGatewayListener) Reset() {
+	*x = BoundAPIGatewayListener{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[47]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BoundAPIGatewayListener) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BoundAPIGatewayListener) ProtoMessage() {}
+
+func (x *BoundAPIGatewayListener) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[47]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use BoundAPIGatewayListener.ProtoReflect.Descriptor instead.
+func (*BoundAPIGatewayListener) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{47}
+}
+
+func (x *BoundAPIGatewayListener) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *BoundAPIGatewayListener) GetCertificates() []*ResourceReference {
+	if x != nil {
+		return x.Certificates
+	}
+	return nil
+}
+
+func (x *BoundAPIGatewayListener) GetRoutes() []*ResourceReference {
+	if x != nil {
+		return x.Routes
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.InlineCertificateConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+type InlineCertificate struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Meta        map[string]string `protobuf:"bytes,1,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Certificate string            `protobuf:"bytes,2,opt,name=Certificate,proto3" json:"Certificate,omitempty"`
+	PrivateKey  string            `protobuf:"bytes,3,opt,name=PrivateKey,proto3" json:"PrivateKey,omitempty"`
+}
+
+func (x *InlineCertificate) Reset() {
+	*x = InlineCertificate{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[48]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *InlineCertificate) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*InlineCertificate) ProtoMessage() {}
+
+func (x *InlineCertificate) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[48]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use InlineCertificate.ProtoReflect.Descriptor instead.
+func (*InlineCertificate) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{48}
+}
+
+func (x *InlineCertificate) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *InlineCertificate) GetCertificate() string {
+	if x != nil {
+		return x.Certificate
+	}
+	return ""
+}
+
+func (x *InlineCertificate) GetPrivateKey() string {
+	if x != nil {
+		return x.PrivateKey
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPRouteConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+type HTTPRoute struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Meta      map[string]string    `protobuf:"bytes,1,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Parents   []*ResourceReference `protobuf:"bytes,2,rep,name=Parents,proto3" json:"Parents,omitempty"`
+	Rules     []*HTTPRouteRule     `protobuf:"bytes,3,rep,name=Rules,proto3" json:"Rules,omitempty"`
+	Hostnames []string             `protobuf:"bytes,4,rep,name=Hostnames,proto3" json:"Hostnames,omitempty"`
+	Status    *Status              `protobuf:"bytes,5,opt,name=Status,proto3" json:"Status,omitempty"`
+}
+
+func (x *HTTPRoute) Reset() {
+	*x = HTTPRoute{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[49]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HTTPRoute) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HTTPRoute) ProtoMessage() {}
+
+func (x *HTTPRoute) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[49]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HTTPRoute.ProtoReflect.Descriptor instead.
+func (*HTTPRoute) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{49}
+}
+
+func (x *HTTPRoute) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *HTTPRoute) GetParents() []*ResourceReference {
+	if x != nil {
+		return x.Parents
+	}
+	return nil
+}
+
+func (x *HTTPRoute) GetRules() []*HTTPRouteRule {
+	if x != nil {
+		return x.Rules
+	}
+	return nil
+}
+
+func (x *HTTPRoute) GetHostnames() []string {
+	if x != nil {
+		return x.Hostnames
+	}
+	return nil
+}
+
+func (x *HTTPRoute) GetStatus() *Status {
+	if x != nil {
+		return x.Status
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPRouteRule
+// output=config_entry.gen.go
+// name=Structs
+type HTTPRouteRule struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Filters  *HTTPFilters   `protobuf:"bytes,1,opt,name=Filters,proto3" json:"Filters,omitempty"`
+	Matches  []*HTTPMatch   `protobuf:"bytes,2,rep,name=Matches,proto3" json:"Matches,omitempty"`
+	Services []*HTTPService `protobuf:"bytes,3,rep,name=Services,proto3" json:"Services,omitempty"`
+}
+
+func (x *HTTPRouteRule) Reset() {
+	*x = HTTPRouteRule{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[50]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HTTPRouteRule) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HTTPRouteRule) ProtoMessage() {}
+
+func (x *HTTPRouteRule) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[50]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HTTPRouteRule.ProtoReflect.Descriptor instead.
+func (*HTTPRouteRule) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{50}
+}
+
+func (x *HTTPRouteRule) GetFilters() *HTTPFilters {
+	if x != nil {
+		return x.Filters
+	}
+	return nil
+}
+
+func (x *HTTPRouteRule) GetMatches() []*HTTPMatch {
+	if x != nil {
+		return x.Matches
+	}
+	return nil
+}
+
+func (x *HTTPRouteRule) GetServices() []*HTTPService {
+	if x != nil {
+		return x.Services
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPMatch
+// output=config_entry.gen.go
+// name=Structs
+type HTTPMatch struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Headers []*HTTPHeaderMatch `protobuf:"bytes,1,rep,name=Headers,proto3" json:"Headers,omitempty"`
+	// mog: func-to=httpMatchMethodToStructs func-from=httpMatchMethodFromStructs
+	Method HTTPMatchMethod   `protobuf:"varint,2,opt,name=Method,proto3,enum=hashicorp.consul.internal.configentry.HTTPMatchMethod" json:"Method,omitempty"`
+	Path   *HTTPPathMatch    `protobuf:"bytes,3,opt,name=Path,proto3" json:"Path,omitempty"`
+	Query  []*HTTPQueryMatch `protobuf:"bytes,4,rep,name=Query,proto3" json:"Query,omitempty"`
+}
+
+func (x *HTTPMatch) Reset() {
+	*x = HTTPMatch{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[51]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HTTPMatch) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HTTPMatch) ProtoMessage() {}
+
+func (x *HTTPMatch) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[51]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HTTPMatch.ProtoReflect.Descriptor instead.
+func (*HTTPMatch) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{51}
+}
+
+func (x *HTTPMatch) GetHeaders() []*HTTPHeaderMatch {
+	if x != nil {
+		return x.Headers
+	}
+	return nil
+}
+
+func (x *HTTPMatch) GetMethod() HTTPMatchMethod {
+	if x != nil {
+		return x.Method
+	}
+	return HTTPMatchMethod_HTTPMatchMethodAll
+}
+
+func (x *HTTPMatch) GetPath() *HTTPPathMatch {
+	if x != nil {
+		return x.Path
+	}
+	return nil
+}
+
+func (x *HTTPMatch) GetQuery() []*HTTPQueryMatch {
+	if x != nil {
+		return x.Query
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPHeaderMatch
+// output=config_entry.gen.go
+// name=Structs
+type HTTPHeaderMatch struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=httpHeaderMatchToStructs func-from=httpHeaderMatchFromStructs
+	Match HTTPHeaderMatchType `protobuf:"varint,1,opt,name=Match,proto3,enum=hashicorp.consul.internal.configentry.HTTPHeaderMatchType" json:"Match,omitempty"`
+	Name  string              `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
+	Value string              `protobuf:"bytes,3,opt,name=Value,proto3" json:"Value,omitempty"`
+}
+
+func (x *HTTPHeaderMatch) Reset() {
+	*x = HTTPHeaderMatch{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[52]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HTTPHeaderMatch) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HTTPHeaderMatch) ProtoMessage() {}
+
+func (x *HTTPHeaderMatch) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[52]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HTTPHeaderMatch.ProtoReflect.Descriptor instead.
+func (*HTTPHeaderMatch) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{52}
+}
+
+func (x *HTTPHeaderMatch) GetMatch() HTTPHeaderMatchType {
+	if x != nil {
+		return x.Match
+	}
+	return HTTPHeaderMatchType_HTTPHeaderMatchExact
+}
+
+func (x *HTTPHeaderMatch) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *HTTPHeaderMatch) GetValue() string {
+	if x != nil {
+		return x.Value
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPPathMatch
+// output=config_entry.gen.go
+// name=Structs
+type HTTPPathMatch struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=httpPathMatchToStructs func-from=httpPathMatchFromStructs
+	Match HTTPPathMatchType `protobuf:"varint,1,opt,name=Match,proto3,enum=hashicorp.consul.internal.configentry.HTTPPathMatchType" json:"Match,omitempty"`
+	Value string            `protobuf:"bytes,2,opt,name=Value,proto3" json:"Value,omitempty"`
+}
+
+func (x *HTTPPathMatch) Reset() {
+	*x = HTTPPathMatch{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[53]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HTTPPathMatch) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HTTPPathMatch) ProtoMessage() {}
+
+func (x *HTTPPathMatch) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[53]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HTTPPathMatch.ProtoReflect.Descriptor instead.
+func (*HTTPPathMatch) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{53}
+}
+
+func (x *HTTPPathMatch) GetMatch() HTTPPathMatchType {
+	if x != nil {
+		return x.Match
+	}
+	return HTTPPathMatchType_HTTPPathMatchExact
+}
+
+func (x *HTTPPathMatch) GetValue() string {
+	if x != nil {
+		return x.Value
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPQueryMatch
+// output=config_entry.gen.go
+// name=Structs
+type HTTPQueryMatch struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=httpQueryMatchToStructs func-from=httpQueryMatchFromStructs
+	Match HTTPQueryMatchType `protobuf:"varint,1,opt,name=Match,proto3,enum=hashicorp.consul.internal.configentry.HTTPQueryMatchType" json:"Match,omitempty"`
+	Name  string             `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
+	Value string             `protobuf:"bytes,3,opt,name=Value,proto3" json:"Value,omitempty"`
+}
+
+func (x *HTTPQueryMatch) Reset() {
+	*x = HTTPQueryMatch{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[54]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HTTPQueryMatch) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HTTPQueryMatch) ProtoMessage() {}
+
+func (x *HTTPQueryMatch) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[54]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HTTPQueryMatch.ProtoReflect.Descriptor instead.
+func (*HTTPQueryMatch) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{54}
+}
+
+func (x *HTTPQueryMatch) GetMatch() HTTPQueryMatchType {
+	if x != nil {
+		return x.Match
+	}
+	return HTTPQueryMatchType_HTTPQueryMatchExact
+}
+
+func (x *HTTPQueryMatch) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *HTTPQueryMatch) GetValue() string {
+	if x != nil {
+		return x.Value
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPFilters
+// output=config_entry.gen.go
+// name=Structs
+type HTTPFilters struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Headers    []*HTTPHeaderFilter `protobuf:"bytes,1,rep,name=Headers,proto3" json:"Headers,omitempty"`
+	URLRewrite *URLRewrite         `protobuf:"bytes,2,opt,name=URLRewrite,proto3" json:"URLRewrite,omitempty"`
+}
+
+func (x *HTTPFilters) Reset() {
+	*x = HTTPFilters{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[55]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HTTPFilters) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HTTPFilters) ProtoMessage() {}
+
+func (x *HTTPFilters) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[55]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HTTPFilters.ProtoReflect.Descriptor instead.
+func (*HTTPFilters) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{55}
+}
+
+func (x *HTTPFilters) GetHeaders() []*HTTPHeaderFilter {
+	if x != nil {
+		return x.Headers
+	}
+	return nil
+}
+
+func (x *HTTPFilters) GetURLRewrite() *URLRewrite {
+	if x != nil {
+		return x.URLRewrite
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.URLRewrite
+// output=config_entry.gen.go
+// name=Structs
+type URLRewrite struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Path string `protobuf:"bytes,1,opt,name=Path,proto3" json:"Path,omitempty"`
+}
+
+func (x *URLRewrite) Reset() {
+	*x = URLRewrite{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[56]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *URLRewrite) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*URLRewrite) ProtoMessage() {}
+
+func (x *URLRewrite) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[56]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use URLRewrite.ProtoReflect.Descriptor instead.
+func (*URLRewrite) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{56}
+}
+
+func (x *URLRewrite) GetPath() string {
+	if x != nil {
+		return x.Path
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPHeaderFilter
+// output=config_entry.gen.go
+// name=Structs
+type HTTPHeaderFilter struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Add    map[string]string `protobuf:"bytes,1,rep,name=Add,proto3" json:"Add,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Remove []string          `protobuf:"bytes,2,rep,name=Remove,proto3" json:"Remove,omitempty"`
+	Set    map[string]string `protobuf:"bytes,3,rep,name=Set,proto3" json:"Set,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+}
+
+func (x *HTTPHeaderFilter) Reset() {
+	*x = HTTPHeaderFilter{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[57]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HTTPHeaderFilter) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HTTPHeaderFilter) ProtoMessage() {}
+
+func (x *HTTPHeaderFilter) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[57]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HTTPHeaderFilter.ProtoReflect.Descriptor instead.
+func (*HTTPHeaderFilter) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{57}
+}
+
+func (x *HTTPHeaderFilter) GetAdd() map[string]string {
+	if x != nil {
+		return x.Add
+	}
+	return nil
+}
+
+func (x *HTTPHeaderFilter) GetRemove() []string {
+	if x != nil {
+		return x.Remove
+	}
+	return nil
+}
+
+func (x *HTTPHeaderFilter) GetSet() map[string]string {
+	if x != nil {
+		return x.Set
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPService
+// output=config_entry.gen.go
+// name=Structs
+type HTTPService struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	// mog: func-to=int func-from=int32
+	Weight  int32        `protobuf:"varint,2,opt,name=Weight,proto3" json:"Weight,omitempty"`
+	Filters *HTTPFilters `protobuf:"bytes,3,opt,name=Filters,proto3" json:"Filters,omitempty"`
+	// mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
+	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,4,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
+}
+
+func (x *HTTPService) Reset() {
+	*x = HTTPService{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[58]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HTTPService) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HTTPService) ProtoMessage() {}
+
+func (x *HTTPService) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[58]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HTTPService.ProtoReflect.Descriptor instead.
+func (*HTTPService) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{58}
+}
+
+func (x *HTTPService) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *HTTPService) GetWeight() int32 {
+	if x != nil {
+		return x.Weight
+	}
+	return 0
+}
+
+func (x *HTTPService) GetFilters() *HTTPFilters {
+	if x != nil {
+		return x.Filters
+	}
+	return nil
+}
+
+func (x *HTTPService) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.TCPRouteConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+type TCPRoute struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Meta     map[string]string    `protobuf:"bytes,1,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Parents  []*ResourceReference `protobuf:"bytes,2,rep,name=Parents,proto3" json:"Parents,omitempty"`
+	Services []*TCPService        `protobuf:"bytes,3,rep,name=Services,proto3" json:"Services,omitempty"`
+	Status   *Status              `protobuf:"bytes,4,opt,name=Status,proto3" json:"Status,omitempty"`
+}
+
+func (x *TCPRoute) Reset() {
+	*x = TCPRoute{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[59]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TCPRoute) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TCPRoute) ProtoMessage() {}
+
+func (x *TCPRoute) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[59]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TCPRoute.ProtoReflect.Descriptor instead.
+func (*TCPRoute) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{59}
+}
+
+func (x *TCPRoute) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *TCPRoute) GetParents() []*ResourceReference {
+	if x != nil {
+		return x.Parents
+	}
+	return nil
+}
+
+func (x *TCPRoute) GetServices() []*TCPService {
+	if x != nil {
+		return x.Services
+	}
+	return nil
+}
+
+func (x *TCPRoute) GetStatus() *Status {
+	if x != nil {
+		return x.Status
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.TCPService
+// output=config_entry.gen.go
+// name=Structs
+type TCPService struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	// mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
+	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,2,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
+}
+
+func (x *TCPService) Reset() {
+	*x = TCPService{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[60]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TCPService) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TCPService) ProtoMessage() {}
+
+func (x *TCPService) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfigentry_config_entry_proto_msgTypes[60]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TCPService.ProtoReflect.Descriptor instead.
+func (*TCPService) Descriptor() ([]byte, []int) {
+	return file_proto_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{60}
+}
+
+func (x *TCPService) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *TCPService) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
+	}
+	return nil
+}
+
+var File_proto_pbconfigentry_config_entry_proto protoreflect.FileDescriptor
+
+var file_proto_pbconfigentry_config_entry_proto_rawDesc = []byte{
+	0x0a, 0x26, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x65, 0x6e, 0x74,
+	0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x25, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x1a,
+	0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
+	0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x1a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbc, 0x09,
+	0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x3f, 0x0a,
+	0x04, 0x4b, 0x69, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
+	0x74, 0x72, 0x79, 0x2e, 0x4b, 0x69, 0x6e, 0x64, 0x52, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x12,
+	0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61,
+	0x6d, 0x65, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65,
+	0x4d, 0x65, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x49, 0x0a, 0x09,
+	0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x09, 0x52, 0x61,
+	0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x53, 0x0a, 0x0a, 0x4d, 0x65, 0x73, 0x68, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
+	0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00,
+	0x52, 0x0a, 0x4d, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x62, 0x0a, 0x0f,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x48, 0x00, 0x52,
+	0x0f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72,
+	0x12, 0x5f, 0x0a, 0x0e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x47, 0x61, 0x74, 0x65, 0x77,
+	0x61, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x2e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x48,
+	0x00, 0x52, 0x0e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61,
+	0x79, 0x12, 0x68, 0x0a, 0x11, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x74, 0x65,
+	0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
+	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x74, 0x65,
+	0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x48, 0x00, 0x52, 0x11, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x62, 0x0a, 0x0f, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x09,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x48, 0x00, 0x52, 0x0f,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x12,
+	0x53, 0x0a, 0x0a, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x18, 0x0a, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x41, 0x50, 0x49, 0x47,
+	0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x48, 0x00, 0x52, 0x0a, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74,
+	0x65, 0x77, 0x61, 0x79, 0x12, 0x62, 0x0a, 0x0f, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x50, 0x49,
+	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x50, 0x49, 0x47, 0x61,
+	0x74, 0x65, 0x77, 0x61, 0x79, 0x48, 0x00, 0x52, 0x0f, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x50,
+	0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x12, 0x4d, 0x0a, 0x08, 0x54, 0x43, 0x50, 0x52,
+	0x6f, 0x75, 0x74, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74,
+	0x72, 0x79, 0x2e, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x48, 0x00, 0x52, 0x08, 0x54,
+	0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x50, 0x0a, 0x09, 0x48, 0x54, 0x54, 0x50, 0x52,
+	0x6f, 0x75, 0x74, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74,
+	0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x48, 0x00, 0x52, 0x09,
+	0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x68, 0x0a, 0x11, 0x49, 0x6e, 0x6c,
+	0x69, 0x6e, 0x65, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x0e,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x6c,
+	0x69, 0x6e, 0x65, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x48, 0x00,
+	0x52, 0x11, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0xec, 0x03, 0x0a,
+	0x0a, 0x4d, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x6d, 0x0a, 0x10, 0x54,
+	0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x54, 0x72,
+	0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x4d, 0x65,
+	0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70,
+	0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x46, 0x0a, 0x03, 0x54, 0x4c,
+	0x53, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
+	0x4d, 0x65, 0x73, 0x68, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x03, 0x54,
+	0x4c, 0x53, 0x12, 0x49, 0x0a, 0x04, 0x48, 0x54, 0x54, 0x50, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x48, 0x54, 0x54,
+	0x50, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x04, 0x48, 0x54, 0x54, 0x50, 0x12, 0x4f, 0x0a,
+	0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
+	0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4d,
+	0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x52,
+	0x0a, 0x07, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x4d,
+	0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x07, 0x50, 0x65, 0x65, 0x72, 0x69,
+	0x6e, 0x67, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
+	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x50, 0x0a, 0x1a, 0x54,
+	0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x4d,
+	0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x32, 0x0a, 0x14, 0x4d, 0x65, 0x73,
+	0x68, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4f, 0x6e, 0x6c,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x4d, 0x65, 0x73, 0x68, 0x44, 0x65, 0x73,
+	0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4f, 0x6e, 0x6c, 0x79, 0x22, 0xc9, 0x01,
+	0x0a, 0x0d, 0x4d, 0x65, 0x73, 0x68, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
+	0x5b, 0x0a, 0x08, 0x49, 0x6e, 0x63, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x3f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x44, 0x69,
+	0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x52, 0x08, 0x49, 0x6e, 0x63, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x12, 0x5b, 0x0a, 0x08,
+	0x4f, 0x75, 0x74, 0x67, 0x6f, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3f,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x44, 0x69, 0x72, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
+	0x08, 0x4f, 0x75, 0x74, 0x67, 0x6f, 0x69, 0x6e, 0x67, 0x22, 0x8a, 0x01, 0x0a, 0x18, 0x4d, 0x65,
+	0x73, 0x68, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x54, 0x4c, 0x53,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x4c, 0x53, 0x4d, 0x69, 0x6e,
+	0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x54,
+	0x4c, 0x53, 0x4d, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0d,
+	0x54, 0x4c, 0x53, 0x4d, 0x61, 0x78, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0d, 0x54, 0x4c, 0x53, 0x4d, 0x61, 0x78, 0x56, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74,
+	0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72,
+	0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x22, 0x54, 0x0a, 0x0e, 0x4d, 0x65, 0x73, 0x68, 0x48, 0x54,
+	0x54, 0x50, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x42, 0x0a, 0x1c, 0x53, 0x61, 0x6e, 0x69,
+	0x74, 0x69, 0x7a, 0x65, 0x58, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x43, 0x6c,
+	0x69, 0x65, 0x6e, 0x74, 0x43, 0x65, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1c,
+	0x53, 0x61, 0x6e, 0x69, 0x74, 0x69, 0x7a, 0x65, 0x58, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64,
+	0x65, 0x64, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x65, 0x72, 0x74, 0x22, 0x4d, 0x0a, 0x11,
+	0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x38, 0x0a, 0x17, 0x50, 0x65, 0x65, 0x72, 0x54, 0x68, 0x72, 0x6f, 0x75, 0x67, 0x68,
+	0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x73, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x17, 0x50, 0x65, 0x65, 0x72, 0x54, 0x68, 0x72, 0x6f, 0x75, 0x67, 0x68, 0x4d,
+	0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x73, 0x22, 0xb9, 0x07, 0x0a, 0x0f,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x12,
+	0x24, 0x0a, 0x0d, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x53,
+	0x75, 0x62, 0x73, 0x65, 0x74, 0x12, 0x5d, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x73,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x2e, 0x53,
+	0x75, 0x62, 0x73, 0x65, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x53, 0x75, 0x62,
+	0x73, 0x65, 0x74, 0x73, 0x12, 0x5a, 0x0a, 0x08, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x52, 0x65,
+	0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x08, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74,
+	0x12, 0x60, 0x0a, 0x08, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x18, 0x04, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x44, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x2e, 0x46, 0x61, 0x69, 0x6c, 0x6f,
+	0x76, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76,
+	0x65, 0x72, 0x12, 0x41, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d,
+	0x65, 0x6f, 0x75, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69,
+	0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x57, 0x0a, 0x0c, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c,
+	0x61, 0x6e, 0x63, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
+	0x74, 0x72, 0x79, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72,
+	0x52, 0x0c, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x12, 0x54,
+	0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
+	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f,
+	0x6c, 0x76, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04,
+	0x4d, 0x65, 0x74, 0x61, 0x12, 0x41, 0x0a, 0x0e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54,
+	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x1a, 0x78, 0x0a, 0x0c, 0x53, 0x75, 0x62, 0x73, 0x65,
+	0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x52, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72,
+	0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+	0x01, 0x1a, 0x7b, 0x0a, 0x0d, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x6b, 0x65, 0x79, 0x12, 0x54, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x46, 0x61, 0x69, 0x6c, 0x6f,
+	0x76, 0x65, 0x72, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37,
+	0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x51, 0x0a, 0x15, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74,
+	0x12, 0x16, 0x0a, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x6e, 0x6c, 0x79,
+	0x50, 0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x4f,
+	0x6e, 0x6c, 0x79, 0x50, 0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x22, 0xc9, 0x01, 0x0a, 0x17, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x52, 0x65,
+	0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x12, 0x24, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x75, 0x62, 0x73, 0x65,
+	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73,
+	0x70, 0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74,
+	0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x65, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x50, 0x65, 0x65, 0x72, 0x22, 0xf9, 0x01, 0x0a, 0x17, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76,
+	0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x24, 0x0a, 0x0d,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x75, 0x62, 0x73,
+	0x65, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x12, 0x20, 0x0a, 0x0b, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x18,
+	0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65,
+	0x72, 0x73, 0x12, 0x5e, 0x0a, 0x07, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x18, 0x05, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x44, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x46, 0x61, 0x69, 0x6c, 0x6f,
+	0x76, 0x65, 0x72, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x07, 0x54, 0x61, 0x72, 0x67, 0x65,
+	0x74, 0x73, 0x22, 0xcf, 0x01, 0x0a, 0x1d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65,
+	0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x54, 0x61,
+	0x72, 0x67, 0x65, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x24,
+	0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x75,
+	0x62, 0x73, 0x65, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
+	0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
+	0x12, 0x12, 0x0a, 0x04, 0x50, 0x65, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x50, 0x65, 0x65, 0x72, 0x22, 0xc7, 0x02, 0x0a, 0x0c, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c,
+	0x61, 0x6e, 0x63, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x5d, 0x0a,
+	0x0e, 0x52, 0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x52, 0x69,
+	0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0e, 0x52, 0x69,
+	0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x69, 0x0a, 0x12,
+	0x4c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x2e, 0x4c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x52, 0x12, 0x4c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x55, 0x0a, 0x0c, 0x48, 0x61, 0x73, 0x68, 0x50,
+	0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
+	0x52, 0x0c, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x22, 0x64,
+	0x0a, 0x0e, 0x52, 0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x12, 0x28, 0x0a, 0x0f, 0x4d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x52, 0x69, 0x6e, 0x67, 0x53,
+	0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0f, 0x4d, 0x69, 0x6e, 0x69, 0x6d,
+	0x75, 0x6d, 0x52, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x4d, 0x61,
+	0x78, 0x69, 0x6d, 0x75, 0x6d, 0x52, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x04, 0x52, 0x0f, 0x4d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x52, 0x69, 0x6e, 0x67,
+	0x53, 0x69, 0x7a, 0x65, 0x22, 0x36, 0x0a, 0x12, 0x4c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x68,
+	0x6f, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
+	0x0b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xd3, 0x01, 0x0a,
+	0x0a, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x46,
+	0x69, 0x65, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x46, 0x69, 0x65, 0x6c,
+	0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x12, 0x57, 0x0a, 0x0c, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
+	0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0c, 0x43, 0x6f,
+	0x6f, 0x6b, 0x69, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x49, 0x50, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x53, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x49, 0x50, 0x12, 0x1a, 0x0a, 0x08, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e,
+	0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e,
+	0x61, 0x6c, 0x22, 0x69, 0x0a, 0x0c, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x07, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x03,
+	0x54, 0x54, 0x4c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x54, 0x54, 0x4c, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x74,
+	0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x50, 0x61, 0x74, 0x68, 0x22, 0x98, 0x03,
+	0x0a, 0x0e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
+	0x12, 0x49, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x54, 0x4c, 0x53,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x03, 0x54, 0x4c, 0x53, 0x12, 0x54, 0x0a, 0x09, 0x4c,
+	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x4c, 0x69,
+	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x52, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
+	0x73, 0x12, 0x53, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x3f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x47,
+	0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x57, 0x0a, 0x08, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c,
+	0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x2e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x08, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x1a,
+	0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
+	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x8f, 0x02, 0x0a, 0x14, 0x49, 0x6e, 0x67,
+	0x72, 0x65, 0x73, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x26, 0x0a, 0x0e, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0e, 0x4d, 0x61, 0x78, 0x43, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2e, 0x0a, 0x12, 0x4d, 0x61, 0x78,
+	0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12, 0x4d, 0x61, 0x78, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e,
+	0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x34, 0x0a, 0x15, 0x4d, 0x61, 0x78,
+	0x43, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x15, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e,
+	0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12,
+	0x69, 0x0a, 0x12, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68,
+	0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
+	0x74, 0x72, 0x79, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74,
+	0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x12, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48,
+	0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x22, 0xea, 0x01, 0x0a, 0x10, 0x47,
+	0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
+	0x18, 0x0a, 0x07, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x07, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x4c, 0x0a, 0x03, 0x53, 0x44, 0x53,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x47,
+	0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x54, 0x4c, 0x53, 0x53, 0x44, 0x53, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x52, 0x03, 0x53, 0x44, 0x53, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x4c, 0x53, 0x4d, 0x69,
+	0x6e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d,
+	0x54, 0x4c, 0x53, 0x4d, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a,
+	0x0d, 0x54, 0x4c, 0x53, 0x4d, 0x61, 0x78, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x54, 0x4c, 0x53, 0x4d, 0x61, 0x78, 0x56, 0x65, 0x72, 0x73,
+	0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69,
+	0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x43, 0x69, 0x70, 0x68, 0x65,
+	0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x22, 0x5b, 0x0a, 0x13, 0x47, 0x61, 0x74, 0x65, 0x77,
+	0x61, 0x79, 0x54, 0x4c, 0x53, 0x53, 0x44, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x20,
+	0x0a, 0x0b, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0b, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65,
+	0x12, 0x22, 0x0a, 0x0c, 0x43, 0x65, 0x72, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x43, 0x65, 0x72, 0x74, 0x52, 0x65, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x22, 0xdf, 0x01, 0x0a, 0x0f, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73,
+	0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x6f, 0x72, 0x74,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x1a, 0x0a, 0x08,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x51, 0x0a, 0x08, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74,
+	0x72, 0x79, 0x2e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x52, 0x08, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x49, 0x0a, 0x03, 0x54,
+	0x4c, 0x53, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x52, 0x03, 0x54, 0x4c, 0x53, 0x22, 0xb7, 0x06, 0x0a, 0x0e, 0x49, 0x6e, 0x67, 0x72, 0x65,
+	0x73, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a,
+	0x05, 0x48, 0x6f, 0x73, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x48, 0x6f,
+	0x73, 0x74, 0x73, 0x12, 0x50, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x52, 0x03, 0x54, 0x4c, 0x53, 0x12, 0x62, 0x0a, 0x0e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x52, 0x0e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x64, 0x0a, 0x0f, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x52, 0x0f,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12,
+	0x53, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3f, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04,
+	0x4d, 0x65, 0x74, 0x61, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69,
+	0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
+	0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e,
+	0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x26,
+	0x0a, 0x0e, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0e, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2e, 0x0a, 0x12, 0x4d, 0x61, 0x78, 0x50, 0x65, 0x6e,
+	0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x09, 0x20, 0x01,
+	0x28, 0x0d, 0x52, 0x12, 0x4d, 0x61, 0x78, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x34, 0x0a, 0x15, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e,
+	0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18,
+	0x0a, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x15, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x63, 0x75, 0x72,
+	0x72, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x69, 0x0a, 0x12,
+	0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65,
+	0x63, 0x6b, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x2e, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68,
+	0x65, 0x63, 0x6b, 0x52, 0x12, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c,
+	0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+	0x22, 0x67, 0x0a, 0x17, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4c, 0x0a, 0x03, 0x53,
+	0x44, 0x53, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x54, 0x4c, 0x53, 0x53, 0x44, 0x53, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x52, 0x03, 0x53, 0x44, 0x53, 0x22, 0xcb, 0x02, 0x0a, 0x13, 0x48, 0x54,
+	0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72,
+	0x73, 0x12, 0x55, 0x0a, 0x03, 0x41, 0x64, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x43,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x52, 0x03, 0x41, 0x64, 0x64, 0x12, 0x55, 0x0a, 0x03, 0x53, 0x65, 0x74, 0x18,
+	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54,
+	0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72,
+	0x73, 0x2e, 0x53, 0x65, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x53, 0x65, 0x74, 0x12,
+	0x16, 0x0a, 0x06, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x06, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x1a, 0x36, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
+	0x36, 0x0a, 0x08, 0x53, 0x65, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xf6, 0x01, 0x0a, 0x11, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x50, 0x0a,
+	0x07, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x74,
+	0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12,
+	0x56, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x42, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x74,
+	0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+	0x22, 0xa6, 0x06, 0x0a, 0x0f, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x6e,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x4e, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x2e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5c, 0x0a, 0x0b, 0x50, 0x65, 0x72, 0x6d,
+	0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x50,
+	0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x50, 0x65, 0x72, 0x6d, 0x69,
+	0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x65, 0x63, 0x65, 0x64,
+	0x65, 0x6e, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x65, 0x63,
+	0x65, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79,
+	0x49, 0x44, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79,
+	0x49, 0x44, 0x12, 0x4e, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e,
+	0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69,
+	0x6f, 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x54, 0x79,
+	0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x66, 0x0a, 0x0a, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x4d, 0x65,
+	0x74, 0x61, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x46, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e,
+	0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x0a, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x46, 0x0a, 0x10,
+	0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65,
+	0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
+	0x6d, 0x70, 0x52, 0x10, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x54, 0x69, 0x6d, 0x65, 0x12, 0x46, 0x0a, 0x10, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x10, 0x4c, 0x65, 0x67, 0x61,
+	0x63, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x58, 0x0a, 0x0e,
+	0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x0b,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69,
+	0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69,
+	0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x65, 0x65, 0x72, 0x18, 0x0c,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x50, 0x65, 0x65, 0x72, 0x1a, 0x3d, 0x0a, 0x0f, 0x4c, 0x65,
+	0x67, 0x61, 0x63, 0x79, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb9, 0x01, 0x0a, 0x13, 0x49, 0x6e,
+	0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f,
+	0x6e, 0x12, 0x4e, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74,
+	0x69, 0x6f, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x52, 0x0a, 0x04, 0x48, 0x54, 0x54, 0x50, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f,
+	0x6e, 0x48, 0x54, 0x54, 0x50, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52,
+	0x04, 0x48, 0x54, 0x54, 0x50, 0x22, 0xed, 0x01, 0x0a, 0x17, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74,
+	0x69, 0x6f, 0x6e, 0x48, 0x54, 0x54, 0x50, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f,
+	0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x74, 0x68, 0x45, 0x78, 0x61, 0x63, 0x74, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x74, 0x68, 0x45, 0x78, 0x61, 0x63, 0x74, 0x12,
+	0x1e, 0x0a, 0x0a, 0x50, 0x61, 0x74, 0x68, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0a, 0x50, 0x61, 0x74, 0x68, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12,
+	0x1c, 0x0a, 0x09, 0x50, 0x61, 0x74, 0x68, 0x52, 0x65, 0x67, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x74, 0x68, 0x52, 0x65, 0x67, 0x65, 0x78, 0x12, 0x5c, 0x0a,
+	0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x44, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x48,
+	0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
+	0x69, 0x6f, 0x6e, 0x52, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x4d,
+	0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x4d, 0x65,
+	0x74, 0x68, 0x6f, 0x64, 0x73, 0x22, 0xc1, 0x01, 0x0a, 0x1d, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74,
+	0x69, 0x6f, 0x6e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x50, 0x65, 0x72,
+	0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x50,
+	0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x50, 0x72,
+	0x65, 0x73, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x45, 0x78, 0x61, 0x63, 0x74, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x45, 0x78, 0x61, 0x63, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x50,
+	0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x50, 0x72, 0x65,
+	0x66, 0x69, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x75, 0x66, 0x66, 0x69, 0x78, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x53, 0x75, 0x66, 0x66, 0x69, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x52,
+	0x65, 0x67, 0x65, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x52, 0x65, 0x67, 0x65,
+	0x78, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x06, 0x49, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x22, 0xb6, 0x08, 0x0a, 0x0f, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x1a, 0x0a,
+	0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x44, 0x0a, 0x04, 0x4d, 0x6f, 0x64,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
+	0x50, 0x72, 0x6f, 0x78, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x12,
+	0x69, 0x0a, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72,
+	0x6f, 0x78, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x68, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
+	0x79, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f,
+	0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70,
+	0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x5a, 0x0a, 0x0b, 0x4d, 0x65,
+	0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65,
+	0x77, 0x61, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47,
+	0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x12, 0x4b, 0x0a, 0x06, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x45,
+	0x78, 0x70, 0x6f, 0x73, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x45, 0x78, 0x70,
+	0x6f, 0x73, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x53,
+	0x4e, 0x49, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x53, 0x4e, 0x49, 0x12, 0x64, 0x0a, 0x0e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61,
+	0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x55, 0x70, 0x73,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5a, 0x0a, 0x0b, 0x44,
+	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b, 0x44, 0x65, 0x73, 0x74,
+	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x34, 0x0a, 0x15, 0x4d, 0x61, 0x78, 0x49, 0x6e,
+	0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x15, 0x4d, 0x61, 0x78, 0x49, 0x6e, 0x62, 0x6f, 0x75,
+	0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x34, 0x0a,
+	0x15, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d,
+	0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x15, 0x4c, 0x6f,
+	0x63, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75,
+	0x74, 0x4d, 0x73, 0x12, 0x34, 0x0a, 0x15, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x18, 0x0b, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x15, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x12, 0x3c, 0x0a, 0x19, 0x42, 0x61, 0x6c,
+	0x61, 0x6e, 0x63, 0x65, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x19, 0x42, 0x61,
+	0x6c, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x54, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18,
+	0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x4d, 0x65,
+	0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x5a, 0x0a,
+	0x0f, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
+	0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x45,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x45,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74,
+	0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+	0x38, 0x01, 0x22, 0x74, 0x0a, 0x16, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e,
+	0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x32, 0x0a, 0x14,
+	0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
+	0x50, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x4f, 0x75, 0x74, 0x62,
+	0x6f, 0x75, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74,
+	0x12, 0x26, 0x0a, 0x0e, 0x44, 0x69, 0x61, 0x6c, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74,
+	0x6c, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x44, 0x69, 0x61, 0x6c, 0x65, 0x64,
+	0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6c, 0x79, 0x22, 0x5f, 0x0a, 0x11, 0x4d, 0x65, 0x73, 0x68,
+	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4a, 0x0a,
+	0x04, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x36, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
+	0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4d,
+	0x6f, 0x64, 0x65, 0x52, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x22, 0x6f, 0x0a, 0x0c, 0x45, 0x78, 0x70,
+	0x6f, 0x73, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x43, 0x68, 0x65,
+	0x63, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x43, 0x68, 0x65, 0x63, 0x6b,
+	0x73, 0x12, 0x47, 0x0a, 0x05, 0x50, 0x61, 0x74, 0x68, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x50,
+	0x61, 0x74, 0x68, 0x52, 0x05, 0x50, 0x61, 0x74, 0x68, 0x73, 0x22, 0xb0, 0x01, 0x0a, 0x0a, 0x45,
+	0x78, 0x70, 0x6f, 0x73, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x22, 0x0a, 0x0c, 0x4c, 0x69, 0x73,
+	0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0c, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x12, 0x0a,
+	0x04, 0x50, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x50, 0x61, 0x74,
+	0x68, 0x12, 0x24, 0x0a, 0x0d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x50, 0x6f,
+	0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x50,
+	0x61, 0x74, 0x68, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x63, 0x6f, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x63, 0x6f, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x50, 0x61, 0x72, 0x73, 0x65, 0x64, 0x46, 0x72, 0x6f,
+	0x6d, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x50, 0x61,
+	0x72, 0x73, 0x65, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x22, 0xbf, 0x01,
+	0x0a, 0x15, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x53, 0x0a, 0x09, 0x4f, 0x76, 0x65, 0x72, 0x72,
+	0x69, 0x64, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74,
+	0x72, 0x79, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x52, 0x09, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x73, 0x12, 0x51, 0x0a, 0x08,
+	0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x08, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x22,
+	0x8a, 0x05, 0x0a, 0x0e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70,
+	0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
+	0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61,
+	0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61,
+	0x12, 0x2c, 0x0a, 0x11, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
+	0x72, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x45, 0x6e, 0x76,
+	0x6f, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x2a,
+	0x0a, 0x10, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4a, 0x53,
+	0x4f, 0x4e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x2a, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x10, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
+	0x4d, 0x73, 0x12, 0x4d, 0x0a, 0x06, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x52, 0x06, 0x4c, 0x69, 0x6d, 0x69, 0x74,
+	0x73, 0x12, 0x69, 0x0a, 0x12, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c,
+	0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61,
+	0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x12, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76,
+	0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x5a, 0x0a, 0x0b,
+	0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61,
+	0x74, 0x65, 0x77, 0x61, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b, 0x4d, 0x65, 0x73,
+	0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x12, 0x3e, 0x0a, 0x1a, 0x42, 0x61, 0x6c, 0x61,
+	0x6e, 0x63, 0x65, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1a, 0x42, 0x61,
+	0x6c, 0x61, 0x6e, 0x63, 0x65, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x65, 0x65, 0x72,
+	0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x50, 0x65, 0x65, 0x72, 0x22, 0x9e, 0x01, 0x0a,
+	0x0e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12,
+	0x26, 0x0a, 0x0e, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2e, 0x0a, 0x12, 0x4d, 0x61, 0x78, 0x50, 0x65,
+	0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x12, 0x4d, 0x61, 0x78, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x34, 0x0a, 0x15, 0x4d, 0x61, 0x78, 0x43, 0x6f,
+	0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x15, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x63, 0x75,
+	0x72, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x22, 0x9e, 0x02,
+	0x0a, 0x12, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43,
+	0x68, 0x65, 0x63, 0x6b, 0x12, 0x35, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x4d,
+	0x61, 0x78, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d,
+	0x52, 0x0b, 0x4d, 0x61, 0x78, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x73, 0x12, 0x38, 0x0a,
+	0x17, 0x45, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x73, 0x65, 0x63,
+	0x75, 0x74, 0x69, 0x76, 0x65, 0x35, 0x78, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x17,
+	0x45, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x73, 0x65, 0x63, 0x75,
+	0x74, 0x69, 0x76, 0x65, 0x35, 0x78, 0x78, 0x12, 0x2e, 0x0a, 0x12, 0x4d, 0x61, 0x78, 0x45, 0x6a,
+	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x0d, 0x52, 0x12, 0x4d, 0x61, 0x78, 0x45, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x12, 0x45, 0x0a, 0x10, 0x42, 0x61, 0x73, 0x65, 0x45,
+	0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x42, 0x61,
+	0x73, 0x65, 0x45, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x45,
+	0x0a, 0x11, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65,
+	0x73, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x04, 0x50, 0x6f, 0x72, 0x74, 0x22, 0xb6, 0x02, 0x0a, 0x0a, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74,
+	0x65, 0x77, 0x61, 0x79, 0x12, 0x4f, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x41, 0x50, 0x49, 0x47, 0x61,
+	0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+	0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x57, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
+	0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x2e, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x65,
+	0x6e, 0x65, 0x72, 0x52, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x12, 0x45,
+	0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x5a,
+	0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x50, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x64,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
+	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a,
+	0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x8b, 0x02, 0x0a, 0x09, 0x43,
+	0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06,
+	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07,
+	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x54, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
+	0x63, 0x65, 0x52, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x4a, 0x0a, 0x12,
+	0x4c, 0x61, 0x73, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69,
+	0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73,
+	0x74, 0x61, 0x6d, 0x70, 0x52, 0x12, 0x4c, 0x61, 0x73, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x8c, 0x02, 0x0a, 0x12, 0x41, 0x50, 0x49,
+	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x12,
+	0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e,
+	0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x12, 0x0a, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x50,
+	0x6f, 0x72, 0x74, 0x12, 0x5d, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x41, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x41, 0x50,
+	0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
+	0x6f, 0x6c, 0x12, 0x53, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x41, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77,
+	0x61, 0x79, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x03, 0x54, 0x4c, 0x53, 0x22, 0xde, 0x01, 0x0a, 0x1a, 0x41, 0x50, 0x49, 0x47,
+	0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5c, 0x0a, 0x0c, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66,
+	0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
+	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x66,
+	0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x0c, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x4d, 0x69, 0x6e, 0x56, 0x65, 0x72,
+	0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x61, 0x78, 0x56, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x4d, 0x61, 0x78, 0x56, 0x65, 0x72,
+	0x73, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75,
+	0x69, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x43, 0x69, 0x70, 0x68,
+	0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x22, 0xb7, 0x01, 0x0a, 0x11, 0x52, 0x65, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x12,
+	0x0a, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4b, 0x69,
+	0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x53, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65,
+	0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65,
+	0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65,
+	0x74, 0x61, 0x22, 0xfe, 0x01, 0x0a, 0x0f, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x50, 0x49, 0x47,
+	0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x12, 0x54, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75,
+	0x6e, 0x64, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x4d, 0x65, 0x74,
+	0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x5c, 0x0a, 0x09,
+	0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x50, 0x49,
+	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x52,
+	0x09, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65,
+	0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x02, 0x38, 0x01, 0x22, 0xdd, 0x01, 0x0a, 0x17, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x50, 0x49,
+	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x12,
+	0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e,
+	0x61, 0x6d, 0x65, 0x12, 0x5c, 0x0a, 0x0c, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+	0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
+	0x79, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65,
+	0x6e, 0x63, 0x65, 0x52, 0x0c, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x73, 0x12, 0x50, 0x0a, 0x06, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x06, 0x52, 0x6f, 0x75,
+	0x74, 0x65, 0x73, 0x22, 0xe6, 0x01, 0x0a, 0x11, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x65,
+	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x56, 0x0a, 0x04, 0x4d, 0x65, 0x74,
+	0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
+	0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74,
+	0x61, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
+	0x61, 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65,
+	0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65,
+	0x4b, 0x65, 0x79, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
+	0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x99, 0x03, 0x0a,
+	0x09, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x4e, 0x0a, 0x04, 0x4d, 0x65,
+	0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x2e, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x52, 0x0a, 0x07, 0x50, 0x61,
+	0x72, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
+	0x74, 0x72, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x66, 0x65,
+	0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x07, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x4a,
+	0x0a, 0x05, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52,
+	0x75, 0x6c, 0x65, 0x52, 0x05, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x48, 0x6f,
+	0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x48,
+	0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x45, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
+	0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x1a,
+	0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
+	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xf9, 0x01, 0x0a, 0x0d, 0x48, 0x54, 0x54,
+	0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x4c, 0x0a, 0x07, 0x46, 0x69,
+	0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
+	0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x52,
+	0x07, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x4a, 0x0a, 0x07, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
+	0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x07, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x73, 0x12, 0x4e, 0x0a, 0x08, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48,
+	0x54, 0x54, 0x50, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x08, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x73, 0x22, 0xc4, 0x02, 0x0a, 0x09, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x12, 0x50, 0x0a, 0x07, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50,
+	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x07, 0x48, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x73, 0x12, 0x4e, 0x0a, 0x06, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54,
+	0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x52, 0x06, 0x4d, 0x65,
+	0x74, 0x68, 0x6f, 0x64, 0x12, 0x48, 0x0a, 0x04, 0x50, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x50,
+	0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x04, 0x50, 0x61, 0x74, 0x68, 0x12, 0x4b,
+	0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x52, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x22, 0x8d, 0x01, 0x0a, 0x0f,
+	0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
+	0x50, 0x0a, 0x05, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3a,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x75, 0x0a, 0x0d, 0x48,
+	0x54, 0x54, 0x50, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x4e, 0x0a, 0x05,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x38, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
+	0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x14, 0x0a, 0x05,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x22, 0x8b, 0x01, 0x0a, 0x0e, 0x48, 0x54, 0x54, 0x50, 0x51, 0x75, 0x65, 0x72, 0x79,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x4f, 0x0a, 0x05, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54,
+	0x50, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x52,
+	0x05, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x22, 0xb3, 0x01, 0x0a, 0x0b, 0x48, 0x54, 0x54, 0x50, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73,
+	0x12, 0x51, 0x0a, 0x07, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x07, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x73, 0x12, 0x51, 0x0a, 0x0a, 0x55, 0x52, 0x4c, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
+	0x55, 0x52, 0x4c, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x52, 0x0a, 0x55, 0x52, 0x4c, 0x52,
+	0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x22, 0x20, 0x0a, 0x0a, 0x55, 0x52, 0x4c, 0x52, 0x65, 0x77,
+	0x72, 0x69, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x50, 0x61, 0x74, 0x68, 0x22, 0xc2, 0x02, 0x0a, 0x10, 0x48, 0x54, 0x54,
+	0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x52, 0x0a,
+	0x03, 0x41, 0x64, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74,
+	0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x2e, 0x41, 0x64, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x41, 0x64,
+	0x64, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x06, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12, 0x52, 0x0a, 0x03, 0x53, 0x65, 0x74,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48,
+	0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e,
+	0x53, 0x65, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x53, 0x65, 0x74, 0x1a, 0x36, 0x0a,
+	0x08, 0x41, 0x64, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x36, 0x0a, 0x08, 0x53, 0x65, 0x74, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xe1, 0x01,
+	0x0a, 0x0b, 0x48, 0x54, 0x54, 0x50, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a,
+	0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d,
+	0x65, 0x12, 0x16, 0x0a, 0x06, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x06, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x4c, 0x0a, 0x07, 0x46, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74,
+	0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x52, 0x07,
+	0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72,
+	0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74,
+	0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74,
+	0x61, 0x22, 0xfc, 0x02, 0x0a, 0x08, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x4d,
+	0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
+	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x4d, 0x65,
+	0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x52, 0x0a,
+	0x07, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52,
+	0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x07, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74,
+	0x73, 0x12, 0x4d, 0x0a, 0x08, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x54, 0x43, 0x50, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x08, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x12, 0x45, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52,
+	0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+	0x22, 0x7a, 0x0a, 0x0a, 0x54, 0x43, 0x50, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12,
+	0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61,
+	0x6d, 0x65, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65,
+	0x4d, 0x65, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x2a, 0xfd, 0x01, 0x0a,
+	0x04, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x0f, 0x0a, 0x0b, 0x4b, 0x69, 0x6e, 0x64, 0x55, 0x6e, 0x6b,
+	0x6e, 0x6f, 0x77, 0x6e, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x4b, 0x69, 0x6e, 0x64, 0x4d, 0x65,
+	0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x4b, 0x69,
+	0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65,
+	0x72, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x4b, 0x69, 0x6e, 0x64, 0x49, 0x6e, 0x67, 0x72, 0x65,
+	0x73, 0x73, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x10, 0x03, 0x12, 0x19, 0x0a, 0x15, 0x4b,
+	0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x10, 0x04, 0x12, 0x17, 0x0a, 0x13, 0x4b, 0x69, 0x6e, 0x64, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x10, 0x05, 0x12,
+	0x19, 0x0a, 0x15, 0x4b, 0x69, 0x6e, 0x64, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x65, 0x72,
+	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x10, 0x06, 0x12, 0x12, 0x0a, 0x0e, 0x4b, 0x69,
+	0x6e, 0x64, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x10, 0x07, 0x12, 0x17,
+	0x0a, 0x13, 0x4b, 0x69, 0x6e, 0x64, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x50, 0x49, 0x47, 0x61,
+	0x74, 0x65, 0x77, 0x61, 0x79, 0x10, 0x08, 0x12, 0x11, 0x0a, 0x0d, 0x4b, 0x69, 0x6e, 0x64, 0x48,
+	0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x10, 0x09, 0x12, 0x10, 0x0a, 0x0c, 0x4b, 0x69,
+	0x6e, 0x64, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x10, 0x0a, 0x2a, 0x26, 0x0a, 0x0f,
+	0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x08, 0x0a, 0x04, 0x44, 0x65, 0x6e, 0x79, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x6c, 0x6c,
+	0x6f, 0x77, 0x10, 0x01, 0x2a, 0x21, 0x0a, 0x13, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f,
+	0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x43,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x10, 0x00, 0x2a, 0x50, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x78, 0x79,
+	0x4d, 0x6f, 0x64, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x4d, 0x6f, 0x64,
+	0x65, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x50, 0x72,
+	0x6f, 0x78, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65,
+	0x6e, 0x74, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x4d, 0x6f, 0x64,
+	0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x10, 0x02, 0x2a, 0x7b, 0x0a, 0x0f, 0x4d, 0x65, 0x73,
+	0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x16,
+	0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x44,
+	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x4d, 0x65, 0x73, 0x68,
+	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x4e, 0x6f, 0x6e, 0x65, 0x10,
+	0x01, 0x12, 0x18, 0x0a, 0x14, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
+	0x4d, 0x6f, 0x64, 0x65, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x10, 0x02, 0x12, 0x19, 0x0a, 0x15, 0x4d,
+	0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x65,
+	0x6d, 0x6f, 0x74, 0x65, 0x10, 0x03, 0x2a, 0x4f, 0x0a, 0x1a, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74,
+	0x65, 0x77, 0x61, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x18, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x48, 0x54, 0x54, 0x50, 0x10, 0x00, 0x12, 0x17,
+	0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
+	0x6f, 0x6c, 0x54, 0x43, 0x50, 0x10, 0x01, 0x2a, 0x92, 0x02, 0x0a, 0x0f, 0x48, 0x54, 0x54, 0x50,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x16, 0x0a, 0x12, 0x48,
+	0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x41, 0x6c,
+	0x6c, 0x10, 0x00, 0x12, 0x1a, 0x0a, 0x16, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x10, 0x01, 0x12,
+	0x19, 0x0a, 0x15, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x68,
+	0x6f, 0x64, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x48, 0x54,
+	0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x47, 0x65, 0x74,
+	0x10, 0x03, 0x12, 0x17, 0x0a, 0x13, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d,
+	0x65, 0x74, 0x68, 0x6f, 0x64, 0x48, 0x65, 0x61, 0x64, 0x10, 0x04, 0x12, 0x1a, 0x0a, 0x16, 0x48,
+	0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x10, 0x05, 0x12, 0x18, 0x0a, 0x14, 0x48, 0x54, 0x54, 0x50, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x50, 0x61, 0x74, 0x63, 0x68, 0x10,
+	0x06, 0x12, 0x17, 0x0a, 0x13, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65,
+	0x74, 0x68, 0x6f, 0x64, 0x50, 0x6f, 0x73, 0x74, 0x10, 0x07, 0x12, 0x16, 0x0a, 0x12, 0x48, 0x54,
+	0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x50, 0x75, 0x74,
+	0x10, 0x08, 0x12, 0x18, 0x0a, 0x14, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d,
+	0x65, 0x74, 0x68, 0x6f, 0x64, 0x54, 0x72, 0x61, 0x63, 0x65, 0x10, 0x09, 0x2a, 0xa7, 0x01, 0x0a,
+	0x13, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x14, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x45, 0x78, 0x61, 0x63, 0x74, 0x10, 0x00, 0x12, 0x19,
+	0x0a, 0x15, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x10, 0x01, 0x12, 0x1a, 0x0a, 0x16, 0x48, 0x54, 0x54,
+	0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x73,
+	0x65, 0x6e, 0x74, 0x10, 0x02, 0x12, 0x24, 0x0a, 0x20, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x45,
+	0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x03, 0x12, 0x19, 0x0a, 0x15, 0x48,
+	0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75,
+	0x66, 0x66, 0x69, 0x78, 0x10, 0x04, 0x2a, 0x68, 0x0a, 0x11, 0x48, 0x54, 0x54, 0x50, 0x50, 0x61,
+	0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x12, 0x48,
+	0x54, 0x54, 0x50, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x45, 0x78, 0x61, 0x63,
+	0x74, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x48, 0x54, 0x54, 0x50, 0x50, 0x61, 0x74, 0x68, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x10, 0x01, 0x12, 0x22, 0x0a, 0x1e,
+	0x48, 0x54, 0x54, 0x50, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x67,
+	0x75, 0x6c, 0x61, 0x72, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x03,
+	0x2a, 0x6d, 0x0a, 0x12, 0x48, 0x54, 0x54, 0x50, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x13, 0x48, 0x54, 0x54, 0x50, 0x51, 0x75,
+	0x65, 0x72, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x45, 0x78, 0x61, 0x63, 0x74, 0x10, 0x00, 0x12,
+	0x19, 0x0a, 0x15, 0x48, 0x54, 0x54, 0x50, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x10, 0x01, 0x12, 0x23, 0x0a, 0x1f, 0x48, 0x54,
+	0x54, 0x50, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x67, 0x75,
+	0x6c, 0x61, 0x72, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x03, 0x42,
+	0xa6, 0x02, 0x0a, 0x29, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x42, 0x10, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74,
+	0x72, 0x79, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x43, 0xaa, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
+	0x79, 0xca, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0xe2, 0x02, 0x31, 0x48, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
+	0x79, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x28,
+	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_pbconfigentry_config_entry_proto_rawDescOnce sync.Once
+	file_proto_pbconfigentry_config_entry_proto_rawDescData = file_proto_pbconfigentry_config_entry_proto_rawDesc
+)
+
+func file_proto_pbconfigentry_config_entry_proto_rawDescGZIP() []byte {
+	file_proto_pbconfigentry_config_entry_proto_rawDescOnce.Do(func() {
+		file_proto_pbconfigentry_config_entry_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbconfigentry_config_entry_proto_rawDescData)
+	})
+	return file_proto_pbconfigentry_config_entry_proto_rawDescData
+}
+
+var file_proto_pbconfigentry_config_entry_proto_enumTypes = make([]protoimpl.EnumInfo, 10)
+var file_proto_pbconfigentry_config_entry_proto_msgTypes = make([]protoimpl.MessageInfo, 79)
+var file_proto_pbconfigentry_config_entry_proto_goTypes = []interface{}{
+	(Kind)(0),                             // 0: hashicorp.consul.internal.configentry.Kind
+	(IntentionAction)(0),                  // 1: hashicorp.consul.internal.configentry.IntentionAction
+	(IntentionSourceType)(0),              // 2: hashicorp.consul.internal.configentry.IntentionSourceType
+	(ProxyMode)(0),                        // 3: hashicorp.consul.internal.configentry.ProxyMode
+	(MeshGatewayMode)(0),                  // 4: hashicorp.consul.internal.configentry.MeshGatewayMode
+	(APIGatewayListenerProtocol)(0),       // 5: hashicorp.consul.internal.configentry.APIGatewayListenerProtocol
+	(HTTPMatchMethod)(0),                  // 6: hashicorp.consul.internal.configentry.HTTPMatchMethod
+	(HTTPHeaderMatchType)(0),              // 7: hashicorp.consul.internal.configentry.HTTPHeaderMatchType
+	(HTTPPathMatchType)(0),                // 8: hashicorp.consul.internal.configentry.HTTPPathMatchType
+	(HTTPQueryMatchType)(0),               // 9: hashicorp.consul.internal.configentry.HTTPQueryMatchType
+	(*ConfigEntry)(nil),                   // 10: hashicorp.consul.internal.configentry.ConfigEntry
+	(*MeshConfig)(nil),                    // 11: hashicorp.consul.internal.configentry.MeshConfig
+	(*TransparentProxyMeshConfig)(nil),    // 12: hashicorp.consul.internal.configentry.TransparentProxyMeshConfig
+	(*MeshTLSConfig)(nil),                 // 13: hashicorp.consul.internal.configentry.MeshTLSConfig
+	(*MeshDirectionalTLSConfig)(nil),      // 14: hashicorp.consul.internal.configentry.MeshDirectionalTLSConfig
+	(*MeshHTTPConfig)(nil),                // 15: hashicorp.consul.internal.configentry.MeshHTTPConfig
+	(*PeeringMeshConfig)(nil),             // 16: hashicorp.consul.internal.configentry.PeeringMeshConfig
+	(*ServiceResolver)(nil),               // 17: hashicorp.consul.internal.configentry.ServiceResolver
+	(*ServiceResolverSubset)(nil),         // 18: hashicorp.consul.internal.configentry.ServiceResolverSubset
+	(*ServiceResolverRedirect)(nil),       // 19: hashicorp.consul.internal.configentry.ServiceResolverRedirect
+	(*ServiceResolverFailover)(nil),       // 20: hashicorp.consul.internal.configentry.ServiceResolverFailover
+	(*ServiceResolverFailoverTarget)(nil), // 21: hashicorp.consul.internal.configentry.ServiceResolverFailoverTarget
+	(*LoadBalancer)(nil),                  // 22: hashicorp.consul.internal.configentry.LoadBalancer
+	(*RingHashConfig)(nil),                // 23: hashicorp.consul.internal.configentry.RingHashConfig
+	(*LeastRequestConfig)(nil),            // 24: hashicorp.consul.internal.configentry.LeastRequestConfig
+	(*HashPolicy)(nil),                    // 25: hashicorp.consul.internal.configentry.HashPolicy
+	(*CookieConfig)(nil),                  // 26: hashicorp.consul.internal.configentry.CookieConfig
+	(*IngressGateway)(nil),                // 27: hashicorp.consul.internal.configentry.IngressGateway
+	(*IngressServiceConfig)(nil),          // 28: hashicorp.consul.internal.configentry.IngressServiceConfig
+	(*GatewayTLSConfig)(nil),              // 29: hashicorp.consul.internal.configentry.GatewayTLSConfig
+	(*GatewayTLSSDSConfig)(nil),           // 30: hashicorp.consul.internal.configentry.GatewayTLSSDSConfig
+	(*IngressListener)(nil),               // 31: hashicorp.consul.internal.configentry.IngressListener
+	(*IngressService)(nil),                // 32: hashicorp.consul.internal.configentry.IngressService
+	(*GatewayServiceTLSConfig)(nil),       // 33: hashicorp.consul.internal.configentry.GatewayServiceTLSConfig
+	(*HTTPHeaderModifiers)(nil),           // 34: hashicorp.consul.internal.configentry.HTTPHeaderModifiers
+	(*ServiceIntentions)(nil),             // 35: hashicorp.consul.internal.configentry.ServiceIntentions
+	(*SourceIntention)(nil),               // 36: hashicorp.consul.internal.configentry.SourceIntention
+	(*IntentionPermission)(nil),           // 37: hashicorp.consul.internal.configentry.IntentionPermission
+	(*IntentionHTTPPermission)(nil),       // 38: hashicorp.consul.internal.configentry.IntentionHTTPPermission
+	(*IntentionHTTPHeaderPermission)(nil), // 39: hashicorp.consul.internal.configentry.IntentionHTTPHeaderPermission
+	(*ServiceDefaults)(nil),               // 40: hashicorp.consul.internal.configentry.ServiceDefaults
+	(*TransparentProxyConfig)(nil),        // 41: hashicorp.consul.internal.configentry.TransparentProxyConfig
+	(*MeshGatewayConfig)(nil),             // 42: hashicorp.consul.internal.configentry.MeshGatewayConfig
+	(*ExposeConfig)(nil),                  // 43: hashicorp.consul.internal.configentry.ExposeConfig
+	(*ExposePath)(nil),                    // 44: hashicorp.consul.internal.configentry.ExposePath
+	(*UpstreamConfiguration)(nil),         // 45: hashicorp.consul.internal.configentry.UpstreamConfiguration
+	(*UpstreamConfig)(nil),                // 46: hashicorp.consul.internal.configentry.UpstreamConfig
+	(*UpstreamLimits)(nil),                // 47: hashicorp.consul.internal.configentry.UpstreamLimits
+	(*PassiveHealthCheck)(nil),            // 48: hashicorp.consul.internal.configentry.PassiveHealthCheck
+	(*DestinationConfig)(nil),             // 49: hashicorp.consul.internal.configentry.DestinationConfig
+	(*APIGateway)(nil),                    // 50: hashicorp.consul.internal.configentry.APIGateway
+	(*Status)(nil),                        // 51: hashicorp.consul.internal.configentry.Status
+	(*Condition)(nil),                     // 52: hashicorp.consul.internal.configentry.Condition
+	(*APIGatewayListener)(nil),            // 53: hashicorp.consul.internal.configentry.APIGatewayListener
+	(*APIGatewayTLSConfiguration)(nil),    // 54: hashicorp.consul.internal.configentry.APIGatewayTLSConfiguration
+	(*ResourceReference)(nil),             // 55: hashicorp.consul.internal.configentry.ResourceReference
+	(*BoundAPIGateway)(nil),               // 56: hashicorp.consul.internal.configentry.BoundAPIGateway
+	(*BoundAPIGatewayListener)(nil),       // 57: hashicorp.consul.internal.configentry.BoundAPIGatewayListener
+	(*InlineCertificate)(nil),             // 58: hashicorp.consul.internal.configentry.InlineCertificate
+	(*HTTPRoute)(nil),                     // 59: hashicorp.consul.internal.configentry.HTTPRoute
+	(*HTTPRouteRule)(nil),                 // 60: hashicorp.consul.internal.configentry.HTTPRouteRule
+	(*HTTPMatch)(nil),                     // 61: hashicorp.consul.internal.configentry.HTTPMatch
+	(*HTTPHeaderMatch)(nil),               // 62: hashicorp.consul.internal.configentry.HTTPHeaderMatch
+	(*HTTPPathMatch)(nil),                 // 63: hashicorp.consul.internal.configentry.HTTPPathMatch
+	(*HTTPQueryMatch)(nil),                // 64: hashicorp.consul.internal.configentry.HTTPQueryMatch
+	(*HTTPFilters)(nil),                   // 65: hashicorp.consul.internal.configentry.HTTPFilters
+	(*URLRewrite)(nil),                    // 66: hashicorp.consul.internal.configentry.URLRewrite
+	(*HTTPHeaderFilter)(nil),              // 67: hashicorp.consul.internal.configentry.HTTPHeaderFilter
+	(*HTTPService)(nil),                   // 68: hashicorp.consul.internal.configentry.HTTPService
+	(*TCPRoute)(nil),                      // 69: hashicorp.consul.internal.configentry.TCPRoute
+	(*TCPService)(nil),                    // 70: hashicorp.consul.internal.configentry.TCPService
+	nil,                                   // 71: hashicorp.consul.internal.configentry.MeshConfig.MetaEntry
+	nil,                                   // 72: hashicorp.consul.internal.configentry.ServiceResolver.SubsetsEntry
+	nil,                                   // 73: hashicorp.consul.internal.configentry.ServiceResolver.FailoverEntry
+	nil,                                   // 74: hashicorp.consul.internal.configentry.ServiceResolver.MetaEntry
+	nil,                                   // 75: hashicorp.consul.internal.configentry.IngressGateway.MetaEntry
+	nil,                                   // 76: hashicorp.consul.internal.configentry.IngressService.MetaEntry
+	nil,                                   // 77: hashicorp.consul.internal.configentry.HTTPHeaderModifiers.AddEntry
+	nil,                                   // 78: hashicorp.consul.internal.configentry.HTTPHeaderModifiers.SetEntry
+	nil,                                   // 79: hashicorp.consul.internal.configentry.ServiceIntentions.MetaEntry
+	nil,                                   // 80: hashicorp.consul.internal.configentry.SourceIntention.LegacyMetaEntry
+	nil,                                   // 81: hashicorp.consul.internal.configentry.ServiceDefaults.MetaEntry
+	nil,                                   // 82: hashicorp.consul.internal.configentry.APIGateway.MetaEntry
+	nil,                                   // 83: hashicorp.consul.internal.configentry.BoundAPIGateway.MetaEntry
+	nil,                                   // 84: hashicorp.consul.internal.configentry.InlineCertificate.MetaEntry
+	nil,                                   // 85: hashicorp.consul.internal.configentry.HTTPRoute.MetaEntry
+	nil,                                   // 86: hashicorp.consul.internal.configentry.HTTPHeaderFilter.AddEntry
+	nil,                                   // 87: hashicorp.consul.internal.configentry.HTTPHeaderFilter.SetEntry
+	nil,                                   // 88: hashicorp.consul.internal.configentry.TCPRoute.MetaEntry
+	(*pbcommon.EnterpriseMeta)(nil),       // 89: hashicorp.consul.internal.common.EnterpriseMeta
+	(*pbcommon.RaftIndex)(nil),            // 90: hashicorp.consul.internal.common.RaftIndex
+	(*durationpb.Duration)(nil),           // 91: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),         // 92: google.protobuf.Timestamp
+	(*pbcommon.EnvoyExtension)(nil),       // 93: hashicorp.consul.internal.common.EnvoyExtension
+}
+var file_proto_pbconfigentry_config_entry_proto_depIdxs = []int32{
+	0,   // 0: hashicorp.consul.internal.configentry.ConfigEntry.Kind:type_name -> hashicorp.consul.internal.configentry.Kind
+	89,  // 1: hashicorp.consul.internal.configentry.ConfigEntry.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
+	90,  // 2: hashicorp.consul.internal.configentry.ConfigEntry.RaftIndex:type_name -> hashicorp.consul.internal.common.RaftIndex
+	11,  // 3: hashicorp.consul.internal.configentry.ConfigEntry.MeshConfig:type_name -> hashicorp.consul.internal.configentry.MeshConfig
+	17,  // 4: hashicorp.consul.internal.configentry.ConfigEntry.ServiceResolver:type_name -> hashicorp.consul.internal.configentry.ServiceResolver
+	27,  // 5: hashicorp.consul.internal.configentry.ConfigEntry.IngressGateway:type_name -> hashicorp.consul.internal.configentry.IngressGateway
+	35,  // 6: hashicorp.consul.internal.configentry.ConfigEntry.ServiceIntentions:type_name -> hashicorp.consul.internal.configentry.ServiceIntentions
+	40,  // 7: hashicorp.consul.internal.configentry.ConfigEntry.ServiceDefaults:type_name -> hashicorp.consul.internal.configentry.ServiceDefaults
+	50,  // 8: hashicorp.consul.internal.configentry.ConfigEntry.APIGateway:type_name -> hashicorp.consul.internal.configentry.APIGateway
+	56,  // 9: hashicorp.consul.internal.configentry.ConfigEntry.BoundAPIGateway:type_name -> hashicorp.consul.internal.configentry.BoundAPIGateway
+	69,  // 10: hashicorp.consul.internal.configentry.ConfigEntry.TCPRoute:type_name -> hashicorp.consul.internal.configentry.TCPRoute
+	59,  // 11: hashicorp.consul.internal.configentry.ConfigEntry.HTTPRoute:type_name -> hashicorp.consul.internal.configentry.HTTPRoute
+	58,  // 12: hashicorp.consul.internal.configentry.ConfigEntry.InlineCertificate:type_name -> hashicorp.consul.internal.configentry.InlineCertificate
+	12,  // 13: hashicorp.consul.internal.configentry.MeshConfig.TransparentProxy:type_name -> hashicorp.consul.internal.configentry.TransparentProxyMeshConfig
+	13,  // 14: hashicorp.consul.internal.configentry.MeshConfig.TLS:type_name -> hashicorp.consul.internal.configentry.MeshTLSConfig
+	15,  // 15: hashicorp.consul.internal.configentry.MeshConfig.HTTP:type_name -> hashicorp.consul.internal.configentry.MeshHTTPConfig
+	71,  // 16: hashicorp.consul.internal.configentry.MeshConfig.Meta:type_name -> hashicorp.consul.internal.configentry.MeshConfig.MetaEntry
+	16,  // 17: hashicorp.consul.internal.configentry.MeshConfig.Peering:type_name -> hashicorp.consul.internal.configentry.PeeringMeshConfig
+	14,  // 18: hashicorp.consul.internal.configentry.MeshTLSConfig.Incoming:type_name -> hashicorp.consul.internal.configentry.MeshDirectionalTLSConfig
+	14,  // 19: hashicorp.consul.internal.configentry.MeshTLSConfig.Outgoing:type_name -> hashicorp.consul.internal.configentry.MeshDirectionalTLSConfig
+	72,  // 20: hashicorp.consul.internal.configentry.ServiceResolver.Subsets:type_name -> hashicorp.consul.internal.configentry.ServiceResolver.SubsetsEntry
+	19,  // 21: hashicorp.consul.internal.configentry.ServiceResolver.Redirect:type_name -> hashicorp.consul.internal.configentry.ServiceResolverRedirect
+	73,  // 22: hashicorp.consul.internal.configentry.ServiceResolver.Failover:type_name -> hashicorp.consul.internal.configentry.ServiceResolver.FailoverEntry
+	91,  // 23: hashicorp.consul.internal.configentry.ServiceResolver.ConnectTimeout:type_name -> google.protobuf.Duration
+	22,  // 24: hashicorp.consul.internal.configentry.ServiceResolver.LoadBalancer:type_name -> hashicorp.consul.internal.configentry.LoadBalancer
+	74,  // 25: hashicorp.consul.internal.configentry.ServiceResolver.Meta:type_name -> hashicorp.consul.internal.configentry.ServiceResolver.MetaEntry
+	91,  // 26: hashicorp.consul.internal.configentry.ServiceResolver.RequestTimeout:type_name -> google.protobuf.Duration
+	21,  // 27: hashicorp.consul.internal.configentry.ServiceResolverFailover.Targets:type_name -> hashicorp.consul.internal.configentry.ServiceResolverFailoverTarget
+	23,  // 28: hashicorp.consul.internal.configentry.LoadBalancer.RingHashConfig:type_name -> hashicorp.consul.internal.configentry.RingHashConfig
+	24,  // 29: hashicorp.consul.internal.configentry.LoadBalancer.LeastRequestConfig:type_name -> hashicorp.consul.internal.configentry.LeastRequestConfig
+	25,  // 30: hashicorp.consul.internal.configentry.LoadBalancer.HashPolicies:type_name -> hashicorp.consul.internal.configentry.HashPolicy
+	26,  // 31: hashicorp.consul.internal.configentry.HashPolicy.CookieConfig:type_name -> hashicorp.consul.internal.configentry.CookieConfig
+	91,  // 32: hashicorp.consul.internal.configentry.CookieConfig.TTL:type_name -> google.protobuf.Duration
+	29,  // 33: hashicorp.consul.internal.configentry.IngressGateway.TLS:type_name -> hashicorp.consul.internal.configentry.GatewayTLSConfig
+	31,  // 34: hashicorp.consul.internal.configentry.IngressGateway.Listeners:type_name -> hashicorp.consul.internal.configentry.IngressListener
+	75,  // 35: hashicorp.consul.internal.configentry.IngressGateway.Meta:type_name -> hashicorp.consul.internal.configentry.IngressGateway.MetaEntry
+	28,  // 36: hashicorp.consul.internal.configentry.IngressGateway.Defaults:type_name -> hashicorp.consul.internal.configentry.IngressServiceConfig
+	48,  // 37: hashicorp.consul.internal.configentry.IngressServiceConfig.PassiveHealthCheck:type_name -> hashicorp.consul.internal.configentry.PassiveHealthCheck
+	30,  // 38: hashicorp.consul.internal.configentry.GatewayTLSConfig.SDS:type_name -> hashicorp.consul.internal.configentry.GatewayTLSSDSConfig
+	32,  // 39: hashicorp.consul.internal.configentry.IngressListener.Services:type_name -> hashicorp.consul.internal.configentry.IngressService
+	29,  // 40: hashicorp.consul.internal.configentry.IngressListener.TLS:type_name -> hashicorp.consul.internal.configentry.GatewayTLSConfig
+	33,  // 41: hashicorp.consul.internal.configentry.IngressService.TLS:type_name -> hashicorp.consul.internal.configentry.GatewayServiceTLSConfig
+	34,  // 42: hashicorp.consul.internal.configentry.IngressService.RequestHeaders:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderModifiers
+	34,  // 43: hashicorp.consul.internal.configentry.IngressService.ResponseHeaders:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderModifiers
+	76,  // 44: hashicorp.consul.internal.configentry.IngressService.Meta:type_name -> hashicorp.consul.internal.configentry.IngressService.MetaEntry
+	89,  // 45: hashicorp.consul.internal.configentry.IngressService.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
+	48,  // 46: hashicorp.consul.internal.configentry.IngressService.PassiveHealthCheck:type_name -> hashicorp.consul.internal.configentry.PassiveHealthCheck
+	30,  // 47: hashicorp.consul.internal.configentry.GatewayServiceTLSConfig.SDS:type_name -> hashicorp.consul.internal.configentry.GatewayTLSSDSConfig
+	77,  // 48: hashicorp.consul.internal.configentry.HTTPHeaderModifiers.Add:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderModifiers.AddEntry
+	78,  // 49: hashicorp.consul.internal.configentry.HTTPHeaderModifiers.Set:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderModifiers.SetEntry
+	36,  // 50: hashicorp.consul.internal.configentry.ServiceIntentions.Sources:type_name -> hashicorp.consul.internal.configentry.SourceIntention
+	79,  // 51: hashicorp.consul.internal.configentry.ServiceIntentions.Meta:type_name -> hashicorp.consul.internal.configentry.ServiceIntentions.MetaEntry
+	1,   // 52: hashicorp.consul.internal.configentry.SourceIntention.Action:type_name -> hashicorp.consul.internal.configentry.IntentionAction
+	37,  // 53: hashicorp.consul.internal.configentry.SourceIntention.Permissions:type_name -> hashicorp.consul.internal.configentry.IntentionPermission
+	2,   // 54: hashicorp.consul.internal.configentry.SourceIntention.Type:type_name -> hashicorp.consul.internal.configentry.IntentionSourceType
+	80,  // 55: hashicorp.consul.internal.configentry.SourceIntention.LegacyMeta:type_name -> hashicorp.consul.internal.configentry.SourceIntention.LegacyMetaEntry
+	92,  // 56: hashicorp.consul.internal.configentry.SourceIntention.LegacyCreateTime:type_name -> google.protobuf.Timestamp
+	92,  // 57: hashicorp.consul.internal.configentry.SourceIntention.LegacyUpdateTime:type_name -> google.protobuf.Timestamp
+	89,  // 58: hashicorp.consul.internal.configentry.SourceIntention.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
+	1,   // 59: hashicorp.consul.internal.configentry.IntentionPermission.Action:type_name -> hashicorp.consul.internal.configentry.IntentionAction
+	38,  // 60: hashicorp.consul.internal.configentry.IntentionPermission.HTTP:type_name -> hashicorp.consul.internal.configentry.IntentionHTTPPermission
+	39,  // 61: hashicorp.consul.internal.configentry.IntentionHTTPPermission.Header:type_name -> hashicorp.consul.internal.configentry.IntentionHTTPHeaderPermission
+	3,   // 62: hashicorp.consul.internal.configentry.ServiceDefaults.Mode:type_name -> hashicorp.consul.internal.configentry.ProxyMode
+	41,  // 63: hashicorp.consul.internal.configentry.ServiceDefaults.TransparentProxy:type_name -> hashicorp.consul.internal.configentry.TransparentProxyConfig
+	42,  // 64: hashicorp.consul.internal.configentry.ServiceDefaults.MeshGateway:type_name -> hashicorp.consul.internal.configentry.MeshGatewayConfig
+	43,  // 65: hashicorp.consul.internal.configentry.ServiceDefaults.Expose:type_name -> hashicorp.consul.internal.configentry.ExposeConfig
+	45,  // 66: hashicorp.consul.internal.configentry.ServiceDefaults.UpstreamConfig:type_name -> hashicorp.consul.internal.configentry.UpstreamConfiguration
+	49,  // 67: hashicorp.consul.internal.configentry.ServiceDefaults.Destination:type_name -> hashicorp.consul.internal.configentry.DestinationConfig
+	81,  // 68: hashicorp.consul.internal.configentry.ServiceDefaults.Meta:type_name -> hashicorp.consul.internal.configentry.ServiceDefaults.MetaEntry
+	93,  // 69: hashicorp.consul.internal.configentry.ServiceDefaults.EnvoyExtensions:type_name -> hashicorp.consul.internal.common.EnvoyExtension
+	4,   // 70: hashicorp.consul.internal.configentry.MeshGatewayConfig.Mode:type_name -> hashicorp.consul.internal.configentry.MeshGatewayMode
+	44,  // 71: hashicorp.consul.internal.configentry.ExposeConfig.Paths:type_name -> hashicorp.consul.internal.configentry.ExposePath
+	46,  // 72: hashicorp.consul.internal.configentry.UpstreamConfiguration.Overrides:type_name -> hashicorp.consul.internal.configentry.UpstreamConfig
+	46,  // 73: hashicorp.consul.internal.configentry.UpstreamConfiguration.Defaults:type_name -> hashicorp.consul.internal.configentry.UpstreamConfig
+	89,  // 74: hashicorp.consul.internal.configentry.UpstreamConfig.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
+	47,  // 75: hashicorp.consul.internal.configentry.UpstreamConfig.Limits:type_name -> hashicorp.consul.internal.configentry.UpstreamLimits
+	48,  // 76: hashicorp.consul.internal.configentry.UpstreamConfig.PassiveHealthCheck:type_name -> hashicorp.consul.internal.configentry.PassiveHealthCheck
+	42,  // 77: hashicorp.consul.internal.configentry.UpstreamConfig.MeshGateway:type_name -> hashicorp.consul.internal.configentry.MeshGatewayConfig
+	91,  // 78: hashicorp.consul.internal.configentry.PassiveHealthCheck.Interval:type_name -> google.protobuf.Duration
+	91,  // 79: hashicorp.consul.internal.configentry.PassiveHealthCheck.BaseEjectionTime:type_name -> google.protobuf.Duration
+	82,  // 80: hashicorp.consul.internal.configentry.APIGateway.Meta:type_name -> hashicorp.consul.internal.configentry.APIGateway.MetaEntry
+	53,  // 81: hashicorp.consul.internal.configentry.APIGateway.Listeners:type_name -> hashicorp.consul.internal.configentry.APIGatewayListener
+	51,  // 82: hashicorp.consul.internal.configentry.APIGateway.Status:type_name -> hashicorp.consul.internal.configentry.Status
+	52,  // 83: hashicorp.consul.internal.configentry.Status.Conditions:type_name -> hashicorp.consul.internal.configentry.Condition
+	55,  // 84: hashicorp.consul.internal.configentry.Condition.Resource:type_name -> hashicorp.consul.internal.configentry.ResourceReference
+	92,  // 85: hashicorp.consul.internal.configentry.Condition.LastTransitionTime:type_name -> google.protobuf.Timestamp
+	5,   // 86: hashicorp.consul.internal.configentry.APIGatewayListener.Protocol:type_name -> hashicorp.consul.internal.configentry.APIGatewayListenerProtocol
+	54,  // 87: hashicorp.consul.internal.configentry.APIGatewayListener.TLS:type_name -> hashicorp.consul.internal.configentry.APIGatewayTLSConfiguration
+	55,  // 88: hashicorp.consul.internal.configentry.APIGatewayTLSConfiguration.Certificates:type_name -> hashicorp.consul.internal.configentry.ResourceReference
+	89,  // 89: hashicorp.consul.internal.configentry.ResourceReference.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
+	83,  // 90: hashicorp.consul.internal.configentry.BoundAPIGateway.Meta:type_name -> hashicorp.consul.internal.configentry.BoundAPIGateway.MetaEntry
+	57,  // 91: hashicorp.consul.internal.configentry.BoundAPIGateway.Listeners:type_name -> hashicorp.consul.internal.configentry.BoundAPIGatewayListener
+	55,  // 92: hashicorp.consul.internal.configentry.BoundAPIGatewayListener.Certificates:type_name -> hashicorp.consul.internal.configentry.ResourceReference
+	55,  // 93: hashicorp.consul.internal.configentry.BoundAPIGatewayListener.Routes:type_name -> hashicorp.consul.internal.configentry.ResourceReference
+	84,  // 94: hashicorp.consul.internal.configentry.InlineCertificate.Meta:type_name -> hashicorp.consul.internal.configentry.InlineCertificate.MetaEntry
+	85,  // 95: hashicorp.consul.internal.configentry.HTTPRoute.Meta:type_name -> hashicorp.consul.internal.configentry.HTTPRoute.MetaEntry
+	55,  // 96: hashicorp.consul.internal.configentry.HTTPRoute.Parents:type_name -> hashicorp.consul.internal.configentry.ResourceReference
+	60,  // 97: hashicorp.consul.internal.configentry.HTTPRoute.Rules:type_name -> hashicorp.consul.internal.configentry.HTTPRouteRule
+	51,  // 98: hashicorp.consul.internal.configentry.HTTPRoute.Status:type_name -> hashicorp.consul.internal.configentry.Status
+	65,  // 99: hashicorp.consul.internal.configentry.HTTPRouteRule.Filters:type_name -> hashicorp.consul.internal.configentry.HTTPFilters
+	61,  // 100: hashicorp.consul.internal.configentry.HTTPRouteRule.Matches:type_name -> hashicorp.consul.internal.configentry.HTTPMatch
+	68,  // 101: hashicorp.consul.internal.configentry.HTTPRouteRule.Services:type_name -> hashicorp.consul.internal.configentry.HTTPService
+	62,  // 102: hashicorp.consul.internal.configentry.HTTPMatch.Headers:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderMatch
+	6,   // 103: hashicorp.consul.internal.configentry.HTTPMatch.Method:type_name -> hashicorp.consul.internal.configentry.HTTPMatchMethod
+	63,  // 104: hashicorp.consul.internal.configentry.HTTPMatch.Path:type_name -> hashicorp.consul.internal.configentry.HTTPPathMatch
+	64,  // 105: hashicorp.consul.internal.configentry.HTTPMatch.Query:type_name -> hashicorp.consul.internal.configentry.HTTPQueryMatch
+	7,   // 106: hashicorp.consul.internal.configentry.HTTPHeaderMatch.Match:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderMatchType
+	8,   // 107: hashicorp.consul.internal.configentry.HTTPPathMatch.Match:type_name -> hashicorp.consul.internal.configentry.HTTPPathMatchType
+	9,   // 108: hashicorp.consul.internal.configentry.HTTPQueryMatch.Match:type_name -> hashicorp.consul.internal.configentry.HTTPQueryMatchType
+	67,  // 109: hashicorp.consul.internal.configentry.HTTPFilters.Headers:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderFilter
+	66,  // 110: hashicorp.consul.internal.configentry.HTTPFilters.URLRewrite:type_name -> hashicorp.consul.internal.configentry.URLRewrite
+	86,  // 111: hashicorp.consul.internal.configentry.HTTPHeaderFilter.Add:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderFilter.AddEntry
+	87,  // 112: hashicorp.consul.internal.configentry.HTTPHeaderFilter.Set:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderFilter.SetEntry
+	65,  // 113: hashicorp.consul.internal.configentry.HTTPService.Filters:type_name -> hashicorp.consul.internal.configentry.HTTPFilters
+	89,  // 114: hashicorp.consul.internal.configentry.HTTPService.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
+	88,  // 115: hashicorp.consul.internal.configentry.TCPRoute.Meta:type_name -> hashicorp.consul.internal.configentry.TCPRoute.MetaEntry
+	55,  // 116: hashicorp.consul.internal.configentry.TCPRoute.Parents:type_name -> hashicorp.consul.internal.configentry.ResourceReference
+	70,  // 117: hashicorp.consul.internal.configentry.TCPRoute.Services:type_name -> hashicorp.consul.internal.configentry.TCPService
+	51,  // 118: hashicorp.consul.internal.configentry.TCPRoute.Status:type_name -> hashicorp.consul.internal.configentry.Status
+	89,  // 119: hashicorp.consul.internal.configentry.TCPService.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
+	18,  // 120: hashicorp.consul.internal.configentry.ServiceResolver.SubsetsEntry.value:type_name -> hashicorp.consul.internal.configentry.ServiceResolverSubset
+	20,  // 121: hashicorp.consul.internal.configentry.ServiceResolver.FailoverEntry.value:type_name -> hashicorp.consul.internal.configentry.ServiceResolverFailover
+	122, // [122:122] is the sub-list for method output_type
+	122, // [122:122] is the sub-list for method input_type
+	122, // [122:122] is the sub-list for extension type_name
+	122, // [122:122] is the sub-list for extension extendee
+	0,   // [0:122] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbconfigentry_config_entry_proto_init() }
+func file_proto_pbconfigentry_config_entry_proto_init() {
+	if File_proto_pbconfigentry_config_entry_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ConfigEntry); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MeshConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TransparentProxyMeshConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MeshTLSConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MeshDirectionalTLSConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MeshHTTPConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringMeshConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceResolver); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceResolverSubset); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceResolverRedirect); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceResolverFailover); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceResolverFailoverTarget); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*LoadBalancer); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RingHashConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*LeastRequestConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HashPolicy); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CookieConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*IngressGateway); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*IngressServiceConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GatewayTLSConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GatewayTLSSDSConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*IngressListener); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*IngressService); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GatewayServiceTLSConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HTTPHeaderModifiers); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceIntentions); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SourceIntention); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*IntentionPermission); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*IntentionHTTPPermission); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*IntentionHTTPHeaderPermission); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceDefaults); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TransparentProxyConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MeshGatewayConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExposeConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExposePath); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UpstreamConfiguration); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UpstreamConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UpstreamLimits); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PassiveHealthCheck); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DestinationConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*APIGateway); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Status); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Condition); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*APIGatewayListener); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*APIGatewayTLSConfiguration); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ResourceReference); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BoundAPIGateway); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BoundAPIGatewayListener); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*InlineCertificate); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HTTPRoute); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HTTPRouteRule); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HTTPMatch); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HTTPHeaderMatch); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HTTPPathMatch); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HTTPQueryMatch); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HTTPFilters); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*URLRewrite); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HTTPHeaderFilter); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HTTPService); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TCPRoute); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfigentry_config_entry_proto_msgTypes[60].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TCPService); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	file_proto_pbconfigentry_config_entry_proto_msgTypes[0].OneofWrappers = []interface{}{
+		(*ConfigEntry_MeshConfig)(nil),
+		(*ConfigEntry_ServiceResolver)(nil),
+		(*ConfigEntry_IngressGateway)(nil),
+		(*ConfigEntry_ServiceIntentions)(nil),
+		(*ConfigEntry_ServiceDefaults)(nil),
+		(*ConfigEntry_APIGateway)(nil),
+		(*ConfigEntry_BoundAPIGateway)(nil),
+		(*ConfigEntry_TCPRoute)(nil),
+		(*ConfigEntry_HTTPRoute)(nil),
+		(*ConfigEntry_InlineCertificate)(nil),
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbconfigentry_config_entry_proto_rawDesc,
+			NumEnums:      10,
+			NumMessages:   79,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbconfigentry_config_entry_proto_goTypes,
+		DependencyIndexes: file_proto_pbconfigentry_config_entry_proto_depIdxs,
+		EnumInfos:         file_proto_pbconfigentry_config_entry_proto_enumTypes,
+		MessageInfos:      file_proto_pbconfigentry_config_entry_proto_msgTypes,
+	}.Build()
+	File_proto_pbconfigentry_config_entry_proto = out.File
+	file_proto_pbconfigentry_config_entry_proto_rawDesc = nil
+	file_proto_pbconfigentry_config_entry_proto_goTypes = nil
+	file_proto_pbconfigentry_config_entry_proto_depIdxs = nil
+}
diff --git a/proto/pbconfigentry/config_entry.proto b/proto/pbconfigentry/config_entry.proto
new file mode 100644
index 0000000000000..7efe38c8bed46
--- /dev/null
+++ b/proto/pbconfigentry/config_entry.proto
@@ -0,0 +1,874 @@
+syntax = "proto3";
+
+package hashicorp.consul.internal.configentry;
+
+import "google/protobuf/duration.proto";
+import "google/protobuf/timestamp.proto";
+import "proto/pbcommon/common.proto";
+
+enum Kind {
+  KindUnknown = 0;
+  KindMeshConfig = 1;
+  KindServiceResolver = 2;
+  KindIngressGateway = 3;
+  KindServiceIntentions = 4;
+  KindServiceDefaults = 5;
+  KindInlineCertificate = 6;
+  KindAPIGateway = 7;
+  KindBoundAPIGateway = 8;
+  KindHTTPRoute = 9;
+  KindTCPRoute = 10;
+}
+
+message ConfigEntry {
+  Kind Kind = 1;
+  string Name = 2;
+
+  common.EnterpriseMeta EnterpriseMeta = 3;
+  common.RaftIndex RaftIndex = 4;
+
+  oneof Entry {
+    MeshConfig MeshConfig = 5;
+    ServiceResolver ServiceResolver = 6;
+    IngressGateway IngressGateway = 7;
+    ServiceIntentions ServiceIntentions = 8;
+    ServiceDefaults ServiceDefaults = 9;
+    APIGateway APIGateway = 10;
+    BoundAPIGateway BoundAPIGateway = 11;
+    TCPRoute TCPRoute = 12;
+    HTTPRoute HTTPRoute = 13;
+    InlineCertificate InlineCertificate = 14;
+  }
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.MeshConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=RaftIndex,EnterpriseMeta
+message MeshConfig {
+  TransparentProxyMeshConfig TransparentProxy = 1;
+  MeshTLSConfig TLS = 2;
+  MeshHTTPConfig HTTP = 3;
+  map<string, string> Meta = 4;
+  PeeringMeshConfig Peering = 5;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.TransparentProxyMeshConfig
+// output=config_entry.gen.go
+// name=Structs
+message TransparentProxyMeshConfig {
+  bool MeshDestinationsOnly = 1;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.MeshTLSConfig
+// output=config_entry.gen.go
+// name=Structs
+message MeshTLSConfig {
+  MeshDirectionalTLSConfig Incoming = 1;
+  MeshDirectionalTLSConfig Outgoing = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.MeshDirectionalTLSConfig
+// output=config_entry.gen.go
+// name=Structs
+message MeshDirectionalTLSConfig {
+  // mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
+  string TLSMinVersion = 1;
+  // mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
+  string TLSMaxVersion = 2;
+  // mog: func-from=cipherSuitesFromStructs func-to=cipherSuitesToStructs
+  repeated string CipherSuites = 3;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.MeshHTTPConfig
+// output=config_entry.gen.go
+// name=Structs
+message MeshHTTPConfig {
+  bool SanitizeXForwardedClientCert = 1;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.PeeringMeshConfig
+// output=config_entry.gen.go
+// name=Structs
+message PeeringMeshConfig {
+  bool PeerThroughMeshGateways = 1;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceResolverConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+message ServiceResolver {
+  string DefaultSubset = 1;
+  map<string, ServiceResolverSubset> Subsets = 2;
+  ServiceResolverRedirect Redirect = 3;
+  map<string, ServiceResolverFailover> Failover = 4;
+  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+  google.protobuf.Duration ConnectTimeout = 5;
+  LoadBalancer LoadBalancer = 6;
+  map<string, string> Meta = 7;
+  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+  google.protobuf.Duration RequestTimeout = 8;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceResolverSubset
+// output=config_entry.gen.go
+// name=Structs
+message ServiceResolverSubset {
+  string Filter = 1;
+  bool OnlyPassing = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceResolverRedirect
+// output=config_entry.gen.go
+// name=Structs
+message ServiceResolverRedirect {
+  string Service = 1;
+  string ServiceSubset = 2;
+  string Namespace = 3;
+  string Partition = 4;
+  string Datacenter = 5;
+  string Peer = 6;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceResolverFailover
+// output=config_entry.gen.go
+// name=Structs
+message ServiceResolverFailover {
+  string Service = 1;
+  string ServiceSubset = 2;
+  string Namespace = 3;
+  repeated string Datacenters = 4;
+  repeated ServiceResolverFailoverTarget Targets = 5;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceResolverFailoverTarget
+// output=config_entry.gen.go
+// name=Structs
+message ServiceResolverFailoverTarget {
+  string Service = 1;
+  string ServiceSubset = 2;
+  string Partition = 3;
+  string Namespace = 4;
+  string Datacenter = 5;
+  string Peer = 6;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.LoadBalancer
+// output=config_entry.gen.go
+// name=Structs
+message LoadBalancer {
+  string Policy = 1;
+  RingHashConfig RingHashConfig = 2;
+  LeastRequestConfig LeastRequestConfig = 3;
+  repeated HashPolicy HashPolicies = 4;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.RingHashConfig
+// output=config_entry.gen.go
+// name=Structs
+message RingHashConfig {
+  uint64 MinimumRingSize = 1;
+  uint64 MaximumRingSize = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.LeastRequestConfig
+// output=config_entry.gen.go
+// name=Structs
+message LeastRequestConfig {
+  uint32 ChoiceCount = 1;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HashPolicy
+// output=config_entry.gen.go
+// name=Structs
+message HashPolicy {
+  string Field = 1;
+  string FieldValue = 2;
+  CookieConfig CookieConfig = 3;
+  bool SourceIP = 4;
+  bool Terminal = 5;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.CookieConfig
+// output=config_entry.gen.go
+// name=Structs
+message CookieConfig {
+  bool Session = 1;
+  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+  google.protobuf.Duration TTL = 2;
+  string Path = 3;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IngressGatewayConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+message IngressGateway {
+  GatewayTLSConfig TLS = 1;
+  repeated IngressListener Listeners = 2;
+  map<string, string> Meta = 3;
+  IngressServiceConfig Defaults = 4;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IngressServiceConfig
+// output=config_entry.gen.go
+// name=Structs
+message IngressServiceConfig {
+  uint32 MaxConnections = 1;
+  uint32 MaxPendingRequests = 2;
+  uint32 MaxConcurrentRequests = 3;
+  PassiveHealthCheck PassiveHealthCheck = 4;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.GatewayTLSConfig
+// output=config_entry.gen.go
+// name=Structs
+message GatewayTLSConfig {
+  bool Enabled = 1;
+  GatewayTLSSDSConfig SDS = 2;
+  // mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
+  string TLSMinVersion = 3;
+  // mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
+  string TLSMaxVersion = 4;
+  // mog: func-from=cipherSuitesFromStructs func-to=cipherSuitesToStructs
+  repeated string CipherSuites = 5;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.GatewayTLSSDSConfig
+// output=config_entry.gen.go
+// name=Structs
+message GatewayTLSSDSConfig {
+  string ClusterName = 1;
+  string CertResource = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IngressListener
+// output=config_entry.gen.go
+// name=Structs
+message IngressListener {
+  // mog: func-to=int func-from=int32
+  int32 Port = 1;
+  string Protocol = 2;
+  repeated IngressService Services = 3;
+  GatewayTLSConfig TLS = 4;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IngressService
+// output=config_entry.gen.go
+// name=Structs
+message IngressService {
+  string Name = 1;
+  repeated string Hosts = 2;
+  GatewayServiceTLSConfig TLS = 3;
+  HTTPHeaderModifiers RequestHeaders = 4;
+  HTTPHeaderModifiers ResponseHeaders = 5;
+  map<string, string> Meta = 6;
+  // mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
+  common.EnterpriseMeta EnterpriseMeta = 7;
+  uint32 MaxConnections = 8;
+  uint32 MaxPendingRequests = 9;
+  uint32 MaxConcurrentRequests = 10;
+  PassiveHealthCheck PassiveHealthCheck = 11;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.GatewayServiceTLSConfig
+// output=config_entry.gen.go
+// name=Structs
+message GatewayServiceTLSConfig {
+  GatewayTLSSDSConfig SDS = 1;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPHeaderModifiers
+// output=config_entry.gen.go
+// name=Structs
+message HTTPHeaderModifiers {
+  map<string, string> Add = 1;
+  map<string, string> Set = 2;
+  repeated string Remove = 3;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceIntentionsConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+message ServiceIntentions {
+  repeated SourceIntention Sources = 1;
+  map<string, string> Meta = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.SourceIntention
+// output=config_entry.gen.go
+// name=Structs
+message SourceIntention {
+  string Name = 1;
+  // mog: func-to=intentionActionToStructs func-from=intentionActionFromStructs
+  IntentionAction Action = 2;
+  repeated IntentionPermission Permissions = 3;
+  // mog: func-to=int func-from=int32
+  int32 Precedence = 4;
+  string LegacyID = 5;
+  // mog: func-to=intentionSourceTypeToStructs func-from=intentionSourceTypeFromStructs
+  IntentionSourceType Type = 6;
+  string Description = 7;
+  map<string, string> LegacyMeta = 8;
+  // mog: func-to=timeToStructs func-from=timeFromStructs
+  google.protobuf.Timestamp LegacyCreateTime = 9;
+  // mog: func-to=timeToStructs func-from=timeFromStructs
+  google.protobuf.Timestamp LegacyUpdateTime = 10;
+  // mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
+  common.EnterpriseMeta EnterpriseMeta = 11;
+  string Peer = 12;
+}
+
+enum IntentionAction {
+  Deny = 0;
+  Allow = 1;
+}
+
+enum IntentionSourceType {
+  Consul = 0;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IntentionPermission
+// output=config_entry.gen.go
+// name=Structs
+message IntentionPermission {
+  // mog: func-to=intentionActionToStructs func-from=intentionActionFromStructs
+  IntentionAction Action = 1;
+  IntentionHTTPPermission HTTP = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IntentionHTTPPermission
+// output=config_entry.gen.go
+// name=Structs
+message IntentionHTTPPermission {
+  string PathExact = 1;
+  string PathPrefix = 2;
+  string PathRegex = 3;
+  repeated IntentionHTTPHeaderPermission Header = 4;
+  repeated string Methods = 5;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IntentionHTTPHeaderPermission
+// output=config_entry.gen.go
+// name=Structs
+message IntentionHTTPHeaderPermission {
+  string Name = 1;
+  bool Present = 2;
+  string Exact = 3;
+  string Prefix = 4;
+  string Suffix = 5;
+  string Regex = 6;
+  bool Invert = 7;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+message ServiceDefaults {
+  string Protocol = 1;
+  // mog: func-to=proxyModeToStructs func-from=proxyModeFromStructs
+  ProxyMode Mode = 2;
+  TransparentProxyConfig TransparentProxy = 3;
+  MeshGatewayConfig MeshGateway = 4;
+  ExposeConfig Expose = 5;
+  string ExternalSNI = 6;
+  UpstreamConfiguration UpstreamConfig = 7;
+  DestinationConfig Destination = 8;
+  // mog: func-to=int func-from=int32
+  int32 MaxInboundConnections = 9;
+  // mog: func-to=int func-from=int32
+  int32 LocalConnectTimeoutMs = 10;
+  // mog: func-to=int func-from=int32
+  int32 LocalRequestTimeoutMs = 11;
+  string BalanceInboundConnections = 12;
+  map<string, string> Meta = 13;
+  // mog: func-to=EnvoyExtensionsToStructs func-from=EnvoyExtensionsFromStructs
+  repeated hashicorp.consul.internal.common.EnvoyExtension EnvoyExtensions = 14;
+}
+
+enum ProxyMode {
+  ProxyModeDefault = 0;
+  ProxyModeTransparent = 1;
+  ProxyModeDirect = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.TransparentProxyConfig
+// output=config_entry.gen.go
+// name=Structs
+message TransparentProxyConfig {
+  // mog: func-to=int func-from=int32
+  int32 OutboundListenerPort = 1;
+  bool DialedDirectly = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.MeshGatewayConfig
+// output=config_entry.gen.go
+// name=Structs
+message MeshGatewayConfig {
+  // mog: func-to=meshGatewayModeToStructs func-from=meshGatewayModeFromStructs
+  MeshGatewayMode Mode = 1;
+}
+
+enum MeshGatewayMode {
+  MeshGatewayModeDefault = 0;
+  MeshGatewayModeNone = 1;
+  MeshGatewayModeLocal = 2;
+  MeshGatewayModeRemote = 3;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ExposeConfig
+// output=config_entry.gen.go
+// name=Structs
+message ExposeConfig {
+  bool Checks = 1;
+  repeated ExposePath Paths = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ExposePath
+// output=config_entry.gen.go
+// name=Structs
+message ExposePath {
+  // mog: func-to=int func-from=int32
+  int32 ListenerPort = 1;
+  string Path = 2;
+  // mog: func-to=int func-from=int32
+  int32 LocalPathPort = 3;
+  string Protocol = 4;
+  bool ParsedFromCheck = 5;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.UpstreamConfiguration
+// output=config_entry.gen.go
+// name=Structs
+message UpstreamConfiguration {
+  repeated UpstreamConfig Overrides = 1;
+  UpstreamConfig Defaults = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.UpstreamConfig
+// output=config_entry.gen.go
+// name=Structs
+message UpstreamConfig {
+  string Name = 1;
+  // mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
+  common.EnterpriseMeta EnterpriseMeta = 2;
+  string EnvoyListenerJSON = 3;
+  string EnvoyClusterJSON = 4;
+  string Protocol = 5;
+  // mog: func-to=int func-from=int32
+  int32 ConnectTimeoutMs = 6;
+  UpstreamLimits Limits = 7;
+  PassiveHealthCheck PassiveHealthCheck = 8;
+  MeshGatewayConfig MeshGateway = 9;
+  string BalanceOutboundConnections = 10;
+  string Peer = 11;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.UpstreamLimits
+// output=config_entry.gen.go
+// name=Structs
+message UpstreamLimits {
+  // mog: func-to=pointerToIntFromInt32 func-from=int32FromPointerToInt
+  int32 MaxConnections = 1;
+  // mog: func-to=pointerToIntFromInt32 func-from=int32FromPointerToInt
+  int32 MaxPendingRequests = 2;
+  // mog: func-to=pointerToIntFromInt32 func-from=int32FromPointerToInt
+  int32 MaxConcurrentRequests = 3;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.PassiveHealthCheck
+// output=config_entry.gen.go
+// name=Structs
+message PassiveHealthCheck {
+  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+  google.protobuf.Duration Interval = 1;
+  uint32 MaxFailures = 2;
+  // mog: target=EnforcingConsecutive5xx func-to=pointerToUint32FromUint32 func-from=uint32FromPointerToUint32
+  uint32 EnforcingConsecutive5xx = 3;
+  // mog: func-to=pointerToUint32FromUint32 func-from=uint32FromPointerToUint32
+  uint32 MaxEjectionPercent = 4;
+  // mog: func-to=structs.DurationPointerFromProto func-from=structs.DurationPointerToProto
+  google.protobuf.Duration BaseEjectionTime = 5;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.DestinationConfig
+// output=config_entry.gen.go
+// name=Structs
+message DestinationConfig {
+  repeated string Addresses = 1;
+  // mog: func-to=int func-from=int32
+  int32 Port = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.APIGatewayConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+message APIGateway {
+  map<string, string> Meta = 1;
+  repeated APIGatewayListener Listeners = 2;
+  Status Status = 3;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.Status
+// output=config_entry.gen.go
+// name=Structs
+message Status {
+  repeated Condition Conditions = 1;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.Condition
+// output=config_entry.gen.go
+// name=Structs
+message Condition {
+  string Type = 1;
+  string Status = 2;
+  string Reason = 3;
+  string Message = 4;
+  ResourceReference Resource = 5;
+  // mog: func-to=timeToStructs func-from=timeFromStructs
+  google.protobuf.Timestamp LastTransitionTime = 6;
+}
+
+enum APIGatewayListenerProtocol {
+  ListenerProtocolHTTP = 0;
+  ListenerProtocolTCP = 1;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.APIGatewayListener
+// output=config_entry.gen.go
+// name=Structs
+message APIGatewayListener {
+  string Name = 1;
+  string Hostname = 2;
+  // mog: func-to=int func-from=int32
+  int32 Port = 3;
+  // mog: func-to=apiGatewayProtocolToStructs func-from=apiGatewayProtocolFromStructs
+  APIGatewayListenerProtocol Protocol = 4;
+  APIGatewayTLSConfiguration TLS = 5;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.APIGatewayTLSConfiguration
+// output=config_entry.gen.go
+// name=Structs
+message APIGatewayTLSConfiguration {
+  repeated ResourceReference Certificates = 1;
+  // mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
+  string MinVersion = 2;
+  // mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
+  string MaxVersion = 3;
+  // mog: func-from=cipherSuitesFromStructs func-to=cipherSuitesToStructs
+  repeated string CipherSuites = 4;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ResourceReference
+// output=config_entry.gen.go
+// name=Structs
+message ResourceReference {
+  string Kind = 1;
+  string Name = 2;
+  string SectionName = 3;
+  // mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
+  common.EnterpriseMeta EnterpriseMeta = 4;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.BoundAPIGatewayConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+message BoundAPIGateway {
+  map<string, string> Meta = 1;
+  repeated BoundAPIGatewayListener Listeners = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.BoundAPIGatewayListener
+// output=config_entry.gen.go
+// name=Structs
+message BoundAPIGatewayListener {
+  string Name = 1;
+  repeated ResourceReference Certificates = 2;
+  repeated ResourceReference Routes = 3;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.InlineCertificateConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+message InlineCertificate {
+  map<string, string> Meta = 1;
+  string Certificate = 2;
+  string PrivateKey = 3;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPRouteConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+message HTTPRoute {
+  map<string, string> Meta = 1;
+  repeated ResourceReference Parents = 2;
+  repeated HTTPRouteRule Rules = 3;
+  repeated string Hostnames = 4;
+  Status Status = 5;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPRouteRule
+// output=config_entry.gen.go
+// name=Structs
+message HTTPRouteRule {
+  HTTPFilters Filters = 1;
+  repeated HTTPMatch Matches = 2;
+  repeated HTTPService Services = 3;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPMatch
+// output=config_entry.gen.go
+// name=Structs
+message HTTPMatch {
+  repeated HTTPHeaderMatch Headers = 1;
+  // mog: func-to=httpMatchMethodToStructs func-from=httpMatchMethodFromStructs
+  HTTPMatchMethod Method = 2;
+  HTTPPathMatch Path = 3;
+  repeated HTTPQueryMatch Query = 4;
+}
+
+enum HTTPMatchMethod {
+  HTTPMatchMethodAll = 0;
+  HTTPMatchMethodConnect = 1;
+  HTTPMatchMethodDelete = 2;
+  HTTPMatchMethodGet = 3;
+  HTTPMatchMethodHead = 4;
+  HTTPMatchMethodOptions = 5;
+  HTTPMatchMethodPatch = 6;
+  HTTPMatchMethodPost = 7;
+  HTTPMatchMethodPut = 8;
+  HTTPMatchMethodTrace = 9;
+}
+
+enum HTTPHeaderMatchType {
+  HTTPHeaderMatchExact = 0;
+  HTTPHeaderMatchPrefix = 1;
+  HTTPHeaderMatchPresent = 2;
+  HTTPHeaderMatchRegularExpression = 3;
+  HTTPHeaderMatchSuffix = 4;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPHeaderMatch
+// output=config_entry.gen.go
+// name=Structs
+message HTTPHeaderMatch {
+  // mog: func-to=httpHeaderMatchToStructs func-from=httpHeaderMatchFromStructs
+  HTTPHeaderMatchType Match = 1;
+  string Name = 2;
+  string Value = 3;
+}
+
+enum HTTPPathMatchType {
+  HTTPPathMatchExact = 0;
+  HTTPPathMatchPrefix = 1;
+  HTTPPathMatchRegularExpression = 3;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPPathMatch
+// output=config_entry.gen.go
+// name=Structs
+message HTTPPathMatch {
+  // mog: func-to=httpPathMatchToStructs func-from=httpPathMatchFromStructs
+  HTTPPathMatchType Match = 1;
+  string Value = 2;
+}
+
+enum HTTPQueryMatchType {
+  HTTPQueryMatchExact = 0;
+  HTTPQueryMatchPresent = 1;
+  HTTPQueryMatchRegularExpression = 3;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPQueryMatch
+// output=config_entry.gen.go
+// name=Structs
+message HTTPQueryMatch {
+  // mog: func-to=httpQueryMatchToStructs func-from=httpQueryMatchFromStructs
+  HTTPQueryMatchType Match = 1;
+  string Name = 2;
+  string Value = 3;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPFilters
+// output=config_entry.gen.go
+// name=Structs
+message HTTPFilters {
+  repeated HTTPHeaderFilter Headers = 1;
+  URLRewrite URLRewrite = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.URLRewrite
+// output=config_entry.gen.go
+// name=Structs
+message URLRewrite {
+  string Path = 1;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPHeaderFilter
+// output=config_entry.gen.go
+// name=Structs
+message HTTPHeaderFilter {
+  map<string, string> Add = 1;
+  repeated string Remove = 2;
+  map<string, string> Set = 3;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HTTPService
+// output=config_entry.gen.go
+// name=Structs
+message HTTPService {
+  string Name = 1;
+  // mog: func-to=int func-from=int32
+  int32 Weight = 2;
+  HTTPFilters Filters = 3;
+  // mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
+  common.EnterpriseMeta EnterpriseMeta = 4;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.TCPRouteConfigEntry
+// output=config_entry.gen.go
+// name=Structs
+// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
+message TCPRoute {
+  map<string, string> Meta = 1;
+  repeated ResourceReference Parents = 2;
+  repeated TCPService Services = 3;
+  Status Status = 4;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.TCPService
+// output=config_entry.gen.go
+// name=Structs
+message TCPService {
+  string Name = 1;
+  // mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
+  common.EnterpriseMeta EnterpriseMeta = 2;
+}
diff --git a/proto/private/pbconnect/connect.gen.go b/proto/pbconnect/connect.gen.go
similarity index 95%
rename from proto/private/pbconnect/connect.gen.go
rename to proto/pbconnect/connect.gen.go
index 5d961d54df082..abecd9b4cf4f4 100644
--- a/proto/private/pbconnect/connect.gen.go
+++ b/proto/pbconnect/connect.gen.go
@@ -89,8 +89,6 @@ func IssuedCertToStructsIssuedCert(s *IssuedCert, t *structs.IssuedCert) {
 	t.SerialNumber = s.SerialNumber
 	t.CertPEM = s.CertPEM
 	t.PrivateKeyPEM = s.PrivateKeyPEM
-	t.WorkloadIdentity = s.WorkloadIdentity
-	t.WorkloadIdentityURI = s.WorkloadIdentityURI
 	t.Service = s.Service
 	t.ServiceURI = s.ServiceURI
 	t.Agent = s.Agent
@@ -110,8 +108,6 @@ func IssuedCertFromStructsIssuedCert(t *structs.IssuedCert, s *IssuedCert) {
 	s.SerialNumber = t.SerialNumber
 	s.CertPEM = t.CertPEM
 	s.PrivateKeyPEM = t.PrivateKeyPEM
-	s.WorkloadIdentity = t.WorkloadIdentity
-	s.WorkloadIdentityURI = t.WorkloadIdentityURI
 	s.Service = t.Service
 	s.ServiceURI = t.ServiceURI
 	s.Agent = t.Agent
diff --git a/proto/private/pbconnect/connect.go b/proto/pbconnect/connect.go
similarity index 93%
rename from proto/private/pbconnect/connect.go
rename to proto/pbconnect/connect.go
index 9c3ed9d7355e0..ae279b31aa2c1 100644
--- a/proto/private/pbconnect/connect.go
+++ b/proto/pbconnect/connect.go
@@ -1,12 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pbconnect
 
 import (
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
+	"github.com/hashicorp/consul/proto/pbcommon"
 )
 
 func QueryMetaFrom(f structs.QueryMeta) *pbcommon.QueryMeta {
diff --git a/proto/private/pbconnect/connect.pb.binary.go b/proto/pbconnect/connect.pb.binary.go
similarity index 95%
rename from proto/private/pbconnect/connect.pb.binary.go
rename to proto/pbconnect/connect.pb.binary.go
index 60f27c9766dff..181211db17fe4 100644
--- a/proto/private/pbconnect/connect.pb.binary.go
+++ b/proto/pbconnect/connect.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbconnect/connect.proto
+// source: proto/pbconnect/connect.proto
 
 package pbconnect
 
diff --git a/proto/pbconnect/connect.pb.go b/proto/pbconnect/connect.pb.go
new file mode 100644
index 0000000000000..4d6ac71f3a91f
--- /dev/null
+++ b/proto/pbconnect/connect.pb.go
@@ -0,0 +1,750 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: proto/pbconnect/connect.proto
+
+package pbconnect
+
+import (
+	pbcommon "github.com/hashicorp/consul/proto/pbcommon"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// CARoots is the list of all currently trusted CA Roots.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IndexedCARoots
+// output=connect.gen.go
+// name=StructsIndexedCARoots
+type CARoots struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// ActiveRootID is the ID of a root in Roots that is the active CA root.
+	// Other roots are still valid if they're in the Roots list but are in
+	// the process of being rotated out.
+	ActiveRootID string `protobuf:"bytes,1,opt,name=ActiveRootID,proto3" json:"ActiveRootID,omitempty"`
+	// TrustDomain is the identification root for this Consul cluster. All
+	// certificates signed by the cluster's CA must have their identifying URI in
+	// this domain.
+	//
+	// This does not include the protocol (currently spiffe://) since we may
+	// implement other protocols in future with equivalent semantics. It should be
+	// compared against the "authority" section of a URI (i.e. host:port).
+	//
+	// We need to support migrating a cluster between trust domains to support
+	// Multi-DC migration in Enterprise. In this case the current trust domain is
+	// here but entries in Roots may also have ExternalTrustDomain set to a
+	// non-empty value implying they were previous roots that are still trusted
+	// but under a different trust domain.
+	//
+	// Note that we DON'T validate trust domain during AuthZ since it causes
+	// issues of loss of connectivity during migration between trust domains. The
+	// only time the additional validation adds value is where the cluster shares
+	// an external root (e.g. organization-wide root) with another distinct Consul
+	// cluster or PKI system. In this case, x509 Name Constraints can be added to
+	// enforce that Consul's CA can only validly sign or trust certs within the
+	// same trust-domain. Name constraints as enforced by TLS handshake also allow
+	// seamless rotation between trust domains thanks to cross-signing.
+	TrustDomain string `protobuf:"bytes,2,opt,name=TrustDomain,proto3" json:"TrustDomain,omitempty"`
+	// Roots is a list of root CA certs to trust.
+	Roots []*CARoot `protobuf:"bytes,3,rep,name=Roots,proto3" json:"Roots,omitempty"`
+	// QueryMeta here is mainly used to contain the latest Raft Index that could
+	// be used to perform a blocking query.
+	// mog: func-to=QueryMetaTo func-from=QueryMetaFrom
+	QueryMeta *pbcommon.QueryMeta `protobuf:"bytes,4,opt,name=QueryMeta,proto3" json:"QueryMeta,omitempty"`
+}
+
+func (x *CARoots) Reset() {
+	*x = CARoots{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconnect_connect_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CARoots) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CARoots) ProtoMessage() {}
+
+func (x *CARoots) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconnect_connect_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CARoots.ProtoReflect.Descriptor instead.
+func (*CARoots) Descriptor() ([]byte, []int) {
+	return file_proto_pbconnect_connect_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *CARoots) GetActiveRootID() string {
+	if x != nil {
+		return x.ActiveRootID
+	}
+	return ""
+}
+
+func (x *CARoots) GetTrustDomain() string {
+	if x != nil {
+		return x.TrustDomain
+	}
+	return ""
+}
+
+func (x *CARoots) GetRoots() []*CARoot {
+	if x != nil {
+		return x.Roots
+	}
+	return nil
+}
+
+func (x *CARoots) GetQueryMeta() *pbcommon.QueryMeta {
+	if x != nil {
+		return x.QueryMeta
+	}
+	return nil
+}
+
+// CARoot is the trusted CA Root.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.CARoot
+// output=connect.gen.go
+// name=StructsCARoot
+type CARoot struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// ID is a globally unique ID (UUID) representing this CA root.
+	ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
+	// Name is a human-friendly name for this CA root. This value is
+	// opaque to Consul and is not used for anything internally.
+	Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
+	// SerialNumber is the x509 serial number of the certificate.
+	SerialNumber uint64 `protobuf:"varint,3,opt,name=SerialNumber,proto3" json:"SerialNumber,omitempty"`
+	// SigningKeyID is the ID of the public key that corresponds to the private
+	// key used to sign leaf certificates. Is is the HexString format of the
+	// raw AuthorityKeyID bytes.
+	SigningKeyID string `protobuf:"bytes,4,opt,name=SigningKeyID,proto3" json:"SigningKeyID,omitempty"`
+	// ExternalTrustDomain is the trust domain this root was generated under. It
+	// is usually empty implying "the current cluster trust-domain". It is set
+	// only in the case that a cluster changes trust domain and then all old roots
+	// that are still trusted have the old trust domain set here.
+	//
+	// We currently DON'T validate these trust domains explicitly anywhere, see
+	// IndexedRoots.TrustDomain doc. We retain this information for debugging and
+	// future flexibility.
+	ExternalTrustDomain string `protobuf:"bytes,5,opt,name=ExternalTrustDomain,proto3" json:"ExternalTrustDomain,omitempty"`
+	// Time validity bounds.
+	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
+	NotBefore *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=NotBefore,proto3" json:"NotBefore,omitempty"`
+	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
+	NotAfter *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=NotAfter,proto3" json:"NotAfter,omitempty"`
+	// RootCert is the PEM-encoded public certificate.
+	RootCert string `protobuf:"bytes,8,opt,name=RootCert,proto3" json:"RootCert,omitempty"`
+	// IntermediateCerts is a list of PEM-encoded intermediate certs to
+	// attach to any leaf certs signed by this CA.
+	IntermediateCerts []string `protobuf:"bytes,9,rep,name=IntermediateCerts,proto3" json:"IntermediateCerts,omitempty"`
+	// SigningCert is the PEM-encoded signing certificate and SigningKey
+	// is the PEM-encoded private key for the signing certificate. These
+	// may actually be empty if the CA plugin in use manages these for us.
+	SigningCert string `protobuf:"bytes,10,opt,name=SigningCert,proto3" json:"SigningCert,omitempty"`
+	SigningKey  string `protobuf:"bytes,11,opt,name=SigningKey,proto3" json:"SigningKey,omitempty"`
+	// Active is true if this is the current active CA. This must only
+	// be true for exactly one CA. For any method that modifies roots in the
+	// state store, tests should be written to verify that multiple roots
+	// cannot be active.
+	Active bool `protobuf:"varint,12,opt,name=Active,proto3" json:"Active,omitempty"`
+	// RotatedOutAt is the time at which this CA was removed from the state.
+	// This will only be set on roots that have been rotated out from being the
+	// active root.
+	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
+	RotatedOutAt *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=RotatedOutAt,proto3" json:"RotatedOutAt,omitempty"`
+	// PrivateKeyType is the type of the private key used to sign certificates. It
+	// may be "rsa" or "ec". This is provided as a convenience to avoid parsing
+	// the public key to from the certificate to infer the type.
+	PrivateKeyType string `protobuf:"bytes,14,opt,name=PrivateKeyType,proto3" json:"PrivateKeyType,omitempty"`
+	// PrivateKeyBits is the length of the private key used to sign certificates.
+	// This is provided as a convenience to avoid parsing the public key from the
+	// certificate to infer the type.
+	// mog: func-to=int func-from=int32
+	PrivateKeyBits int32 `protobuf:"varint,15,opt,name=PrivateKeyBits,proto3" json:"PrivateKeyBits,omitempty"`
+	// mog: func-to=RaftIndexTo func-from=RaftIndexFrom
+	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,16,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
+}
+
+func (x *CARoot) Reset() {
+	*x = CARoot{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconnect_connect_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CARoot) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CARoot) ProtoMessage() {}
+
+func (x *CARoot) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconnect_connect_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CARoot.ProtoReflect.Descriptor instead.
+func (*CARoot) Descriptor() ([]byte, []int) {
+	return file_proto_pbconnect_connect_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *CARoot) GetID() string {
+	if x != nil {
+		return x.ID
+	}
+	return ""
+}
+
+func (x *CARoot) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *CARoot) GetSerialNumber() uint64 {
+	if x != nil {
+		return x.SerialNumber
+	}
+	return 0
+}
+
+func (x *CARoot) GetSigningKeyID() string {
+	if x != nil {
+		return x.SigningKeyID
+	}
+	return ""
+}
+
+func (x *CARoot) GetExternalTrustDomain() string {
+	if x != nil {
+		return x.ExternalTrustDomain
+	}
+	return ""
+}
+
+func (x *CARoot) GetNotBefore() *timestamppb.Timestamp {
+	if x != nil {
+		return x.NotBefore
+	}
+	return nil
+}
+
+func (x *CARoot) GetNotAfter() *timestamppb.Timestamp {
+	if x != nil {
+		return x.NotAfter
+	}
+	return nil
+}
+
+func (x *CARoot) GetRootCert() string {
+	if x != nil {
+		return x.RootCert
+	}
+	return ""
+}
+
+func (x *CARoot) GetIntermediateCerts() []string {
+	if x != nil {
+		return x.IntermediateCerts
+	}
+	return nil
+}
+
+func (x *CARoot) GetSigningCert() string {
+	if x != nil {
+		return x.SigningCert
+	}
+	return ""
+}
+
+func (x *CARoot) GetSigningKey() string {
+	if x != nil {
+		return x.SigningKey
+	}
+	return ""
+}
+
+func (x *CARoot) GetActive() bool {
+	if x != nil {
+		return x.Active
+	}
+	return false
+}
+
+func (x *CARoot) GetRotatedOutAt() *timestamppb.Timestamp {
+	if x != nil {
+		return x.RotatedOutAt
+	}
+	return nil
+}
+
+func (x *CARoot) GetPrivateKeyType() string {
+	if x != nil {
+		return x.PrivateKeyType
+	}
+	return ""
+}
+
+func (x *CARoot) GetPrivateKeyBits() int32 {
+	if x != nil {
+		return x.PrivateKeyBits
+	}
+	return 0
+}
+
+func (x *CARoot) GetRaftIndex() *pbcommon.RaftIndex {
+	if x != nil {
+		return x.RaftIndex
+	}
+	return nil
+}
+
+// RaftIndex is used to track the index used while creating
+// or modifying a given struct type.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.IssuedCert
+// output=connect.gen.go
+// name=StructsIssuedCert
+type IssuedCert struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// SerialNumber is the unique serial number for this certificate.
+	// This is encoded in standard hex separated by :.
+	SerialNumber string `protobuf:"bytes,1,opt,name=SerialNumber,proto3" json:"SerialNumber,omitempty"`
+	// CertPEM and PrivateKeyPEM are the PEM-encoded certificate and private
+	// key for that cert, respectively. This should not be stored in the
+	// state store, but is present in the sign API response.
+	CertPEM       string `protobuf:"bytes,2,opt,name=CertPEM,proto3" json:"CertPEM,omitempty"`
+	PrivateKeyPEM string `protobuf:"bytes,3,opt,name=PrivateKeyPEM,proto3" json:"PrivateKeyPEM,omitempty"`
+	// Service is the name of the service for which the cert was issued.
+	Service string `protobuf:"bytes,4,opt,name=Service,proto3" json:"Service,omitempty"`
+	// ServiceURI is the cert URI value.
+	ServiceURI string `protobuf:"bytes,5,opt,name=ServiceURI,proto3" json:"ServiceURI,omitempty"`
+	// Agent is the name of the node for which the cert was issued.
+	Agent string `protobuf:"bytes,6,opt,name=Agent,proto3" json:"Agent,omitempty"`
+	// AgentURI is the cert URI value.
+	AgentURI string `protobuf:"bytes,7,opt,name=AgentURI,proto3" json:"AgentURI,omitempty"`
+	// Kind is the kind of service for which the cert was issued.
+	// mog: func-to=structs.ServiceKind func-from=string
+	Kind string `protobuf:"bytes,12,opt,name=Kind,proto3" json:"Kind,omitempty"`
+	// KindURI is the cert URI value.
+	KindURI string `protobuf:"bytes,13,opt,name=KindURI,proto3" json:"KindURI,omitempty"`
+	// ServerURI is the URI value of a cert issued for a server agent.
+	// The same URI is shared by all servers in a Consul datacenter.
+	ServerURI string `protobuf:"bytes,14,opt,name=ServerURI,proto3" json:"ServerURI,omitempty"`
+	// ValidAfter and ValidBefore are the validity periods for the
+	// certificate.
+	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
+	ValidAfter *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=ValidAfter,proto3" json:"ValidAfter,omitempty"`
+	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
+	ValidBefore *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=ValidBefore,proto3" json:"ValidBefore,omitempty"`
+	// EnterpriseMeta is the Consul Enterprise specific metadata
+	// mog: func-to=EnterpriseMetaTo func-from=EnterpriseMetaFrom
+	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,10,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
+	// mog: func-to=RaftIndexTo func-from=RaftIndexFrom
+	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,11,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
+}
+
+func (x *IssuedCert) Reset() {
+	*x = IssuedCert{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconnect_connect_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *IssuedCert) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IssuedCert) ProtoMessage() {}
+
+func (x *IssuedCert) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconnect_connect_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use IssuedCert.ProtoReflect.Descriptor instead.
+func (*IssuedCert) Descriptor() ([]byte, []int) {
+	return file_proto_pbconnect_connect_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *IssuedCert) GetSerialNumber() string {
+	if x != nil {
+		return x.SerialNumber
+	}
+	return ""
+}
+
+func (x *IssuedCert) GetCertPEM() string {
+	if x != nil {
+		return x.CertPEM
+	}
+	return ""
+}
+
+func (x *IssuedCert) GetPrivateKeyPEM() string {
+	if x != nil {
+		return x.PrivateKeyPEM
+	}
+	return ""
+}
+
+func (x *IssuedCert) GetService() string {
+	if x != nil {
+		return x.Service
+	}
+	return ""
+}
+
+func (x *IssuedCert) GetServiceURI() string {
+	if x != nil {
+		return x.ServiceURI
+	}
+	return ""
+}
+
+func (x *IssuedCert) GetAgent() string {
+	if x != nil {
+		return x.Agent
+	}
+	return ""
+}
+
+func (x *IssuedCert) GetAgentURI() string {
+	if x != nil {
+		return x.AgentURI
+	}
+	return ""
+}
+
+func (x *IssuedCert) GetKind() string {
+	if x != nil {
+		return x.Kind
+	}
+	return ""
+}
+
+func (x *IssuedCert) GetKindURI() string {
+	if x != nil {
+		return x.KindURI
+	}
+	return ""
+}
+
+func (x *IssuedCert) GetServerURI() string {
+	if x != nil {
+		return x.ServerURI
+	}
+	return ""
+}
+
+func (x *IssuedCert) GetValidAfter() *timestamppb.Timestamp {
+	if x != nil {
+		return x.ValidAfter
+	}
+	return nil
+}
+
+func (x *IssuedCert) GetValidBefore() *timestamppb.Timestamp {
+	if x != nil {
+		return x.ValidBefore
+	}
+	return nil
+}
+
+func (x *IssuedCert) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
+	}
+	return nil
+}
+
+func (x *IssuedCert) GetRaftIndex() *pbcommon.RaftIndex {
+	if x != nil {
+		return x.RaftIndex
+	}
+	return nil
+}
+
+var File_proto_pbconnect_connect_proto protoreflect.FileDescriptor
+
+var file_proto_pbconnect_connect_proto_rawDesc = []byte{
+	0x0a, 0x1d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
+	0x21, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x22, 0xdb, 0x01, 0x0a, 0x07, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x12, 0x22, 0x0a, 0x0c,
+	0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x52, 0x6f, 0x6f, 0x74, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0c, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x52, 0x6f, 0x6f, 0x74, 0x49, 0x44,
+	0x12, 0x20, 0x0a, 0x0b, 0x54, 0x72, 0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x54, 0x72, 0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61,
+	0x69, 0x6e, 0x12, 0x3f, 0x0a, 0x05, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x29, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2e, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74, 0x52, 0x05, 0x52, 0x6f,
+	0x6f, 0x74, 0x73, 0x12, 0x49, 0x0a, 0x09, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x65, 0x74, 0x61,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d,
+	0x65, 0x74, 0x61, 0x52, 0x09, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x65, 0x74, 0x61, 0x22, 0x97,
+	0x05, 0x0a, 0x06, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a,
+	0x0c, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x04, 0x52, 0x0c, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65,
+	0x72, 0x12, 0x22, 0x0a, 0x0c, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x49,
+	0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67,
+	0x4b, 0x65, 0x79, 0x49, 0x44, 0x12, 0x30, 0x0a, 0x13, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x54, 0x72, 0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x13, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x54, 0x72, 0x75, 0x73,
+	0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x38, 0x0a, 0x09, 0x4e, 0x6f, 0x74, 0x42, 0x65,
+	0x66, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d,
+	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x4e, 0x6f, 0x74, 0x42, 0x65, 0x66, 0x6f, 0x72,
+	0x65, 0x12, 0x36, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x41, 0x66, 0x74, 0x65, 0x72, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52,
+	0x08, 0x4e, 0x6f, 0x74, 0x41, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f,
+	0x74, 0x43, 0x65, 0x72, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x52, 0x6f, 0x6f,
+	0x74, 0x43, 0x65, 0x72, 0x74, 0x12, 0x2c, 0x0a, 0x11, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6d, 0x65,
+	0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x65, 0x72, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x11, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x65,
+	0x72, 0x74, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x43, 0x65,
+	0x72, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e,
+	0x67, 0x43, 0x65, 0x72, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67,
+	0x4b, 0x65, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x69, 0x67, 0x6e, 0x69,
+	0x6e, 0x67, 0x4b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x18,
+	0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x12, 0x3e, 0x0a,
+	0x0c, 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x64, 0x4f, 0x75, 0x74, 0x41, 0x74, 0x18, 0x0d, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52,
+	0x0c, 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x64, 0x4f, 0x75, 0x74, 0x41, 0x74, 0x12, 0x26, 0x0a,
+	0x0e, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18,
+	0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65,
+	0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65,
+	0x4b, 0x65, 0x79, 0x42, 0x69, 0x74, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x50,
+	0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x69, 0x74, 0x73, 0x12, 0x49, 0x0a,
+	0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x09, 0x52,
+	0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x22, 0xc7, 0x04, 0x0a, 0x0a, 0x49, 0x73, 0x73,
+	0x75, 0x65, 0x64, 0x43, 0x65, 0x72, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x53, 0x65, 0x72, 0x69, 0x61,
+	0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x53,
+	0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x43,
+	0x65, 0x72, 0x74, 0x50, 0x45, 0x4d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x43, 0x65,
+	0x72, 0x74, 0x50, 0x45, 0x4d, 0x12, 0x24, 0x0a, 0x0d, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65,
+	0x4b, 0x65, 0x79, 0x50, 0x45, 0x4d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x50, 0x72,
+	0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x50, 0x45, 0x4d, 0x12, 0x18, 0x0a, 0x07, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x55, 0x52, 0x49, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x55, 0x52, 0x49, 0x12, 0x14, 0x0a, 0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x06,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x41,
+	0x67, 0x65, 0x6e, 0x74, 0x55, 0x52, 0x49, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x41,
+	0x67, 0x65, 0x6e, 0x74, 0x55, 0x52, 0x49, 0x12, 0x12, 0x0a, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x18,
+	0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x4b,
+	0x69, 0x6e, 0x64, 0x55, 0x52, 0x49, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4b, 0x69,
+	0x6e, 0x64, 0x55, 0x52, 0x49, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x55,
+	0x52, 0x49, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
+	0x55, 0x52, 0x49, 0x12, 0x3a, 0x0a, 0x0a, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x41, 0x66, 0x74, 0x65,
+	0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74,
+	0x61, 0x6d, 0x70, 0x52, 0x0a, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x41, 0x66, 0x74, 0x65, 0x72, 0x12,
+	0x3c, 0x0a, 0x0b, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x09,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
+	0x52, 0x0b, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x58, 0x0a,
+	0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18,
+	0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72,
+	0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72,
+	0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x49, 0x0a, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49,
+	0x6e, 0x64, 0x65, 0x78, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61,
+	0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64,
+	0x65, 0x78, 0x42, 0x8a, 0x02, 0x0a, 0x25, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x42, 0x0c, 0x43, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2b, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
+	0x70, 0x62, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x43,
+	0xaa, 0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x43, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0xca, 0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x5c, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0xe2, 0x02, 0x2d, 0x48, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5c, 0x47, 0x50, 0x42,
+	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x24, 0x48, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_pbconnect_connect_proto_rawDescOnce sync.Once
+	file_proto_pbconnect_connect_proto_rawDescData = file_proto_pbconnect_connect_proto_rawDesc
+)
+
+func file_proto_pbconnect_connect_proto_rawDescGZIP() []byte {
+	file_proto_pbconnect_connect_proto_rawDescOnce.Do(func() {
+		file_proto_pbconnect_connect_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbconnect_connect_proto_rawDescData)
+	})
+	return file_proto_pbconnect_connect_proto_rawDescData
+}
+
+var file_proto_pbconnect_connect_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_proto_pbconnect_connect_proto_goTypes = []interface{}{
+	(*CARoots)(nil),                 // 0: hashicorp.consul.internal.connect.CARoots
+	(*CARoot)(nil),                  // 1: hashicorp.consul.internal.connect.CARoot
+	(*IssuedCert)(nil),              // 2: hashicorp.consul.internal.connect.IssuedCert
+	(*pbcommon.QueryMeta)(nil),      // 3: hashicorp.consul.internal.common.QueryMeta
+	(*timestamppb.Timestamp)(nil),   // 4: google.protobuf.Timestamp
+	(*pbcommon.RaftIndex)(nil),      // 5: hashicorp.consul.internal.common.RaftIndex
+	(*pbcommon.EnterpriseMeta)(nil), // 6: hashicorp.consul.internal.common.EnterpriseMeta
+}
+var file_proto_pbconnect_connect_proto_depIdxs = []int32{
+	1,  // 0: hashicorp.consul.internal.connect.CARoots.Roots:type_name -> hashicorp.consul.internal.connect.CARoot
+	3,  // 1: hashicorp.consul.internal.connect.CARoots.QueryMeta:type_name -> hashicorp.consul.internal.common.QueryMeta
+	4,  // 2: hashicorp.consul.internal.connect.CARoot.NotBefore:type_name -> google.protobuf.Timestamp
+	4,  // 3: hashicorp.consul.internal.connect.CARoot.NotAfter:type_name -> google.protobuf.Timestamp
+	4,  // 4: hashicorp.consul.internal.connect.CARoot.RotatedOutAt:type_name -> google.protobuf.Timestamp
+	5,  // 5: hashicorp.consul.internal.connect.CARoot.RaftIndex:type_name -> hashicorp.consul.internal.common.RaftIndex
+	4,  // 6: hashicorp.consul.internal.connect.IssuedCert.ValidAfter:type_name -> google.protobuf.Timestamp
+	4,  // 7: hashicorp.consul.internal.connect.IssuedCert.ValidBefore:type_name -> google.protobuf.Timestamp
+	6,  // 8: hashicorp.consul.internal.connect.IssuedCert.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
+	5,  // 9: hashicorp.consul.internal.connect.IssuedCert.RaftIndex:type_name -> hashicorp.consul.internal.common.RaftIndex
+	10, // [10:10] is the sub-list for method output_type
+	10, // [10:10] is the sub-list for method input_type
+	10, // [10:10] is the sub-list for extension type_name
+	10, // [10:10] is the sub-list for extension extendee
+	0,  // [0:10] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbconnect_connect_proto_init() }
+func file_proto_pbconnect_connect_proto_init() {
+	if File_proto_pbconnect_connect_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbconnect_connect_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CARoots); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconnect_connect_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CARoot); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconnect_connect_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*IssuedCert); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbconnect_connect_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   3,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbconnect_connect_proto_goTypes,
+		DependencyIndexes: file_proto_pbconnect_connect_proto_depIdxs,
+		MessageInfos:      file_proto_pbconnect_connect_proto_msgTypes,
+	}.Build()
+	File_proto_pbconnect_connect_proto = out.File
+	file_proto_pbconnect_connect_proto_rawDesc = nil
+	file_proto_pbconnect_connect_proto_goTypes = nil
+	file_proto_pbconnect_connect_proto_depIdxs = nil
+}
diff --git a/proto/private/pbconnect/connect.proto b/proto/pbconnect/connect.proto
similarity index 95%
rename from proto/private/pbconnect/connect.proto
rename to proto/pbconnect/connect.proto
index 4a6d08d220fd1..071f76deae35b 100644
--- a/proto/private/pbconnect/connect.proto
+++ b/proto/pbconnect/connect.proto
@@ -1,12 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 syntax = "proto3";
 
 package hashicorp.consul.internal.connect;
 
 import "google/protobuf/timestamp.proto";
-import "private/pbcommon/common.proto";
+import "proto/pbcommon/common.proto";
 
 // CARoots is the list of all currently trusted CA Roots.
 //
@@ -172,11 +169,6 @@ message IssuedCert {
   // The same URI is shared by all servers in a Consul datacenter.
   string ServerURI = 14;
 
-  // WorkloadIdentity is the name of the workload identity for which the cert was issued.
-  string WorkloadIdentity = 15;
-  // WorkloadIdentityURI is the cert URI value.
-  string WorkloadIdentityURI = 16;
-
   // ValidAfter and ValidBefore are the validity periods for the
   // certificate.
   // mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
diff --git a/proto/private/pboperator/operator.gen.go b/proto/pboperator/operator.gen.go
similarity index 100%
rename from proto/private/pboperator/operator.gen.go
rename to proto/pboperator/operator.gen.go
diff --git a/proto/private/pboperator/operator.pb.binary.go b/proto/pboperator/operator.pb.binary.go
similarity index 94%
rename from proto/private/pboperator/operator.pb.binary.go
rename to proto/pboperator/operator.pb.binary.go
index a748b48fcefdc..51f4fa3d81700 100644
--- a/proto/private/pboperator/operator.pb.binary.go
+++ b/proto/pboperator/operator.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pboperator/operator.proto
+// source: proto/pboperator/operator.proto
 
 package pboperator
 
diff --git a/proto/pboperator/operator.pb.go b/proto/pboperator/operator.pb.go
new file mode 100644
index 0000000000000..1b9cd0f5ceb64
--- /dev/null
+++ b/proto/pboperator/operator.pb.go
@@ -0,0 +1,247 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: proto/pboperator/operator.proto
+
+package pboperator
+
+import (
+	_ "github.com/hashicorp/consul/proto-public/annotations/ratelimit"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type TransferLeaderRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
+}
+
+func (x *TransferLeaderRequest) Reset() {
+	*x = TransferLeaderRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pboperator_operator_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TransferLeaderRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TransferLeaderRequest) ProtoMessage() {}
+
+func (x *TransferLeaderRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pboperator_operator_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TransferLeaderRequest.ProtoReflect.Descriptor instead.
+func (*TransferLeaderRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pboperator_operator_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *TransferLeaderRequest) GetID() string {
+	if x != nil {
+		return x.ID
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/api.TransferLeaderResponse
+// output=operator.gen.go
+// name=API
+type TransferLeaderResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// true if the transfer is a success
+	Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"`
+}
+
+func (x *TransferLeaderResponse) Reset() {
+	*x = TransferLeaderResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pboperator_operator_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TransferLeaderResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TransferLeaderResponse) ProtoMessage() {}
+
+func (x *TransferLeaderResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pboperator_operator_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TransferLeaderResponse.ProtoReflect.Descriptor instead.
+func (*TransferLeaderResponse) Descriptor() ([]byte, []int) {
+	return file_proto_pboperator_operator_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *TransferLeaderResponse) GetSuccess() bool {
+	if x != nil {
+		return x.Success
+	}
+	return false
+}
+
+var File_proto_pboperator_operator_proto protoreflect.FileDescriptor
+
+var file_proto_pboperator_operator_proto_rawDesc = []byte{
+	0x0a, 0x1f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74,
+	0x6f, 0x72, 0x2f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x12, 0x22, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x6f, 0x70, 0x65,
+	0x72, 0x61, 0x74, 0x6f, 0x72, 0x1a, 0x32, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62,
+	0x6c, 0x69, 0x63, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
+	0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69,
+	0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x15, 0x54, 0x72, 0x61,
+	0x6e, 0x73, 0x66, 0x65, 0x72, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
+	0x49, 0x44, 0x22, 0x32, 0x0a, 0x16, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x4c, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07,
+	0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73,
+	0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x32, 0xa3, 0x01, 0x0a, 0x0f, 0x4f, 0x70, 0x65, 0x72, 0x61,
+	0x74, 0x6f, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x8f, 0x01, 0x0a, 0x0e, 0x54,
+	0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x39, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74,
+	0x6f, 0x72, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x4c, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x54, 0x72,
+	0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08, 0x01, 0x42, 0x91, 0x02, 0x0a,
+	0x26, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x6f,
+	0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x42, 0x0d, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f,
+	0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x6f, 0x70,
+	0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x4f, 0xaa, 0x02, 0x22,
+	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74,
+	0x6f, 0x72, 0xca, 0x02, 0x22, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x4f,
+	0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0xe2, 0x02, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x5c, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x5c, 0x47, 0x50, 0x42,
+	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_pboperator_operator_proto_rawDescOnce sync.Once
+	file_proto_pboperator_operator_proto_rawDescData = file_proto_pboperator_operator_proto_rawDesc
+)
+
+func file_proto_pboperator_operator_proto_rawDescGZIP() []byte {
+	file_proto_pboperator_operator_proto_rawDescOnce.Do(func() {
+		file_proto_pboperator_operator_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pboperator_operator_proto_rawDescData)
+	})
+	return file_proto_pboperator_operator_proto_rawDescData
+}
+
+var file_proto_pboperator_operator_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_proto_pboperator_operator_proto_goTypes = []interface{}{
+	(*TransferLeaderRequest)(nil),  // 0: hashicorp.consul.internal.operator.TransferLeaderRequest
+	(*TransferLeaderResponse)(nil), // 1: hashicorp.consul.internal.operator.TransferLeaderResponse
+}
+var file_proto_pboperator_operator_proto_depIdxs = []int32{
+	0, // 0: hashicorp.consul.internal.operator.OperatorService.TransferLeader:input_type -> hashicorp.consul.internal.operator.TransferLeaderRequest
+	1, // 1: hashicorp.consul.internal.operator.OperatorService.TransferLeader:output_type -> hashicorp.consul.internal.operator.TransferLeaderResponse
+	1, // [1:2] is the sub-list for method output_type
+	0, // [0:1] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_proto_pboperator_operator_proto_init() }
+func file_proto_pboperator_operator_proto_init() {
+	if File_proto_pboperator_operator_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pboperator_operator_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TransferLeaderRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pboperator_operator_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TransferLeaderResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pboperator_operator_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   2,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_proto_pboperator_operator_proto_goTypes,
+		DependencyIndexes: file_proto_pboperator_operator_proto_depIdxs,
+		MessageInfos:      file_proto_pboperator_operator_proto_msgTypes,
+	}.Build()
+	File_proto_pboperator_operator_proto = out.File
+	file_proto_pboperator_operator_proto_rawDesc = nil
+	file_proto_pboperator_operator_proto_goTypes = nil
+	file_proto_pboperator_operator_proto_depIdxs = nil
+}
diff --git a/proto/private/pboperator/operator.proto b/proto/pboperator/operator.proto
similarity index 79%
rename from proto/private/pboperator/operator.proto
rename to proto/pboperator/operator.proto
index 8669f03041fd9..896c9eb227a86 100644
--- a/proto/private/pboperator/operator.proto
+++ b/proto/pboperator/operator.proto
@@ -1,11 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 syntax = "proto3";
 
 package hashicorp.consul.internal.operator;
 
-import "annotations/ratelimit/ratelimit.proto";
+import "proto-public/annotations/ratelimit/ratelimit.proto";
 
 // Operator defines a set of operators operation applicable to Consul
 service OperatorService {
@@ -13,7 +10,6 @@ service OperatorService {
   rpc TransferLeader(TransferLeaderRequest) returns (TransferLeaderResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_EXEMPT,
-      operation_category: OPERATION_CATEGORY_OPERATOR
     };
   }
 }
diff --git a/proto/private/pboperator/operator_grpc.pb.go b/proto/pboperator/operator_grpc.pb.go
similarity index 97%
rename from proto/private/pboperator/operator_grpc.pb.go
rename to proto/pboperator/operator_grpc.pb.go
index c9af9d083d52c..b8dac9336c429 100644
--- a/proto/private/pboperator/operator_grpc.pb.go
+++ b/proto/pboperator/operator_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             (unknown)
-// source: private/pboperator/operator.proto
+// source: proto/pboperator/operator.proto
 
 package pboperator
 
@@ -101,5 +101,5 @@ var OperatorService_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "private/pboperator/operator.proto",
+	Metadata: "proto/pboperator/operator.proto",
 }
diff --git a/proto/private/pbpeering/peering.gen.go b/proto/pbpeering/peering.gen.go
similarity index 97%
rename from proto/private/pbpeering/peering.gen.go
rename to proto/pbpeering/peering.gen.go
index 1105d8db1803a..b5b3436d4ce04 100644
--- a/proto/private/pbpeering/peering.gen.go
+++ b/proto/pbpeering/peering.gen.go
@@ -112,7 +112,6 @@ func RemoteInfoToAPI(s *RemoteInfo, t *api.PeeringRemoteInfo) {
 	}
 	t.Partition = s.Partition
 	t.Datacenter = s.Datacenter
-	t.Locality = LocalityToAPI(s.Locality)
 }
 func RemoteInfoFromAPI(t *api.PeeringRemoteInfo, s *RemoteInfo) {
 	if s == nil {
@@ -120,5 +119,4 @@ func RemoteInfoFromAPI(t *api.PeeringRemoteInfo, s *RemoteInfo) {
 	}
 	s.Partition = t.Partition
 	s.Datacenter = t.Datacenter
-	s.Locality = LocalityFromAPI(t.Locality)
 }
diff --git a/proto/pbpeering/peering.go b/proto/pbpeering/peering.go
new file mode 100644
index 0000000000000..3481b37a40501
--- /dev/null
+++ b/proto/pbpeering/peering.go
@@ -0,0 +1,326 @@
+package pbpeering
+
+import (
+	"crypto/tls"
+	"crypto/x509"
+	"errors"
+	"fmt"
+	"time"
+
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/types/known/timestamppb"
+
+	"github.com/hashicorp/consul/agent/structs"
+	"github.com/hashicorp/consul/api"
+	"github.com/hashicorp/consul/lib"
+)
+
+// RequestDatacenter implements structs.RPCInfo
+func (req *GenerateTokenRequest) RequestDatacenter() string {
+	// Cross-datacenter requests are not allowed for peering actions because
+	// they rely on WAN-federation.
+	return ""
+}
+
+// RequestDatacenter implements structs.RPCInfo
+func (req *EstablishRequest) RequestDatacenter() string {
+	// Cross-datacenter requests are not allowed for peering actions because
+	// they rely on WAN-federation.
+	return ""
+}
+
+// RequestDatacenter implements structs.RPCInfo
+func (req *PeeringReadRequest) RequestDatacenter() string {
+	// Cross-datacenter requests are not allowed for peering actions because
+	// they rely on WAN-federation.
+	return ""
+}
+
+// RequestDatacenter implements structs.RPCInfo
+func (req *PeeringListRequest) RequestDatacenter() string {
+	// Cross-datacenter requests are not allowed for peering actions because
+	// they rely on WAN-federation.
+	return ""
+}
+
+// RequestDatacenter implements structs.RPCInfo
+func (req *PeeringWriteRequest) RequestDatacenter() string {
+	// Cross-datacenter requests are not allowed for peering actions because
+	// they rely on WAN-federation.
+	return ""
+}
+
+// RequestDatacenter implements structs.RPCInfo
+func (req *PeeringDeleteRequest) RequestDatacenter() string {
+	// Cross-datacenter requests are not allowed for peering actions because
+	// they rely on WAN-federation.
+	return ""
+}
+
+// RequestDatacenter implements structs.RPCInfo
+func (req *TrustBundleReadRequest) RequestDatacenter() string {
+	// Cross-datacenter requests are not allowed for peering actions because
+	// they rely on WAN-federation.
+	return ""
+}
+
+// RequestDatacenter implements structs.RPCInfo
+func (req *TrustBundleListByServiceRequest) RequestDatacenter() string {
+	// Cross-datacenter requests are not allowed for peering actions because
+	// they rely on WAN-federation.
+	return ""
+}
+
+// ShouldDial returns true when the peering was stored via the peering initiation endpoint,
+// AND the peering is not marked as terminated by our peer.
+// If we generated a token for this peer we did not store our server addresses under PeerServerAddresses or ManualServerAddresses.
+// These server addresses are for dialing, and only the peer initiating the peering will do the dialing.
+func (p *Peering) ShouldDial() bool {
+	return len(p.PeerServerAddresses) > 0 || len(p.ManualServerAddresses) > 0
+}
+
+// GetAddressesToDial returns the listing of addresses that should be dialed for the peering.
+// It will ensure that manual addresses take precedence, if any are defined.
+func (p *Peering) GetAddressesToDial() []string {
+	if len(p.ManualServerAddresses) > 0 {
+		return p.ManualServerAddresses
+	}
+	return p.PeerServerAddresses
+}
+
+func (x PeeringState) GoString() string {
+	return x.String()
+}
+
+// ConcatenatedRootPEMs concatenates and returns all PEM-encoded public certificates
+// in a peer's trust bundle.
+func (b *PeeringTrustBundle) ConcatenatedRootPEMs() string {
+	if b == nil {
+		return ""
+	}
+
+	var rootPEMs string
+	for _, pem := range b.RootPEMs {
+		rootPEMs += lib.EnsureTrailingNewline(pem)
+	}
+	return rootPEMs
+}
+
+// enumcover:PeeringState
+func PeeringStateToAPI(s PeeringState) api.PeeringState {
+	switch s {
+	case PeeringState_PENDING:
+		return api.PeeringStatePending
+	case PeeringState_ESTABLISHING:
+		return api.PeeringStateEstablishing
+	case PeeringState_ACTIVE:
+		return api.PeeringStateActive
+	case PeeringState_FAILING:
+		return api.PeeringStateFailing
+	case PeeringState_DELETING:
+		return api.PeeringStateDeleting
+	case PeeringState_TERMINATED:
+		return api.PeeringStateTerminated
+	case PeeringState_UNDEFINED:
+		fallthrough
+	default:
+		return api.PeeringStateUndefined
+	}
+}
+
+// enumcover:api.PeeringState
+func PeeringStateFromAPI(t api.PeeringState) PeeringState {
+	switch t {
+	case api.PeeringStatePending:
+		return PeeringState_PENDING
+	case api.PeeringStateEstablishing:
+		return PeeringState_ESTABLISHING
+	case api.PeeringStateActive:
+		return PeeringState_ACTIVE
+	case api.PeeringStateFailing:
+		return PeeringState_FAILING
+	case api.PeeringStateDeleting:
+		return PeeringState_DELETING
+	case api.PeeringStateTerminated:
+		return PeeringState_TERMINATED
+	case api.PeeringStateUndefined:
+		fallthrough
+	default:
+		return PeeringState_UNDEFINED
+	}
+}
+
+func StreamStatusToAPI(status *StreamStatus) api.PeeringStreamStatus {
+	return api.PeeringStreamStatus{
+		ImportedServices: status.ImportedServices,
+		ExportedServices: status.ExportedServices,
+		LastHeartbeat:    TimePtrFromProto(status.LastHeartbeat),
+		LastReceive:      TimePtrFromProto(status.LastReceive),
+		LastSend:         TimePtrFromProto(status.LastSend),
+	}
+}
+
+func StreamStatusFromAPI(status api.PeeringStreamStatus) *StreamStatus {
+	return &StreamStatus{
+		ImportedServices: status.ImportedServices,
+		ExportedServices: status.ExportedServices,
+		LastHeartbeat:    TimePtrToProto(status.LastHeartbeat),
+		LastReceive:      TimePtrToProto(status.LastReceive),
+		LastSend:         TimePtrToProto(status.LastSend),
+	}
+}
+
+func (p *Peering) IsActive() bool {
+	if p == nil || p.State == PeeringState_TERMINATED {
+		return false
+	}
+	if p.DeletedAt == nil {
+		return true
+	}
+
+	// The minimum protobuf timestamp is the Unix epoch rather than go's zero.
+	return structs.IsZeroProtoTime(p.DeletedAt)
+}
+
+// Validate is a validation helper that checks whether a secret ID is embedded in the container type.
+func (s *SecretsWriteRequest) Validate() error {
+	if s.PeerID == "" {
+		return errors.New("missing peer ID")
+	}
+	switch r := s.Request.(type) {
+	case *SecretsWriteRequest_GenerateToken:
+		if r != nil && r.GenerateToken.GetEstablishmentSecret() != "" {
+			return nil
+		}
+	case *SecretsWriteRequest_Establish:
+		if r != nil && r.Establish.GetActiveStreamSecret() != "" {
+			return nil
+		}
+	case *SecretsWriteRequest_ExchangeSecret:
+		if r != nil && r.ExchangeSecret.GetPendingStreamSecret() != "" {
+			return nil
+		}
+	case *SecretsWriteRequest_PromotePending:
+		if r != nil && r.PromotePending.GetActiveStreamSecret() != "" {
+			return nil
+		}
+	default:
+		return fmt.Errorf("unexpected request type %T", s.Request)
+	}
+
+	return errors.New("missing secret ID")
+}
+
+// TLSDialOption returns the gRPC DialOption to secure the transport if CAPems
+// ara available. If no CAPems were provided in the peering token then the
+// WithInsecure dial option is returned.
+func (p *Peering) TLSDialOption() (grpc.DialOption, error) {
+	//nolint:staticcheck
+	tlsOption := grpc.WithInsecure()
+
+	if len(p.PeerCAPems) > 0 {
+		var haveCerts bool
+		pool := x509.NewCertPool()
+		for _, pem := range p.PeerCAPems {
+			if !pool.AppendCertsFromPEM([]byte(pem)) {
+				return nil, fmt.Errorf("failed to parse PEM %s", pem)
+			}
+			if len(pem) > 0 {
+				haveCerts = true
+			}
+		}
+		if !haveCerts {
+			return nil, fmt.Errorf("failed to build cert pool from peer CA pems")
+		}
+		cfg := tls.Config{
+			ServerName: p.PeerServerName,
+			RootCAs:    pool,
+		}
+		tlsOption = grpc.WithTransportCredentials(credentials.NewTLS(&cfg))
+	}
+	return tlsOption, nil
+}
+
+func (p *Peering) ToAPI() *api.Peering {
+	var t api.Peering
+	PeeringToAPI(p, &t)
+	return &t
+}
+
+// TODO consider using mog for this
+func (resp *PeeringListResponse) ToAPI() []*api.Peering {
+	list := make([]*api.Peering, len(resp.Peerings))
+	for i, p := range resp.Peerings {
+		list[i] = p.ToAPI()
+	}
+	return list
+}
+
+// TODO consider using mog for this
+func (resp *GenerateTokenResponse) ToAPI() *api.PeeringGenerateTokenResponse {
+	var t api.PeeringGenerateTokenResponse
+	GenerateTokenResponseToAPI(resp, &t)
+	return &t
+}
+
+// TODO consider using mog for this
+func (resp *EstablishResponse) ToAPI() *api.PeeringEstablishResponse {
+	var t api.PeeringEstablishResponse
+	EstablishResponseToAPI(resp, &t)
+	return &t
+}
+
+func (r *RemoteInfo) IsEmpty() bool {
+	if r == nil {
+		return true
+	}
+	return r.Partition == "" && r.Datacenter == ""
+}
+
+// convenience
+func NewGenerateTokenRequestFromAPI(req *api.PeeringGenerateTokenRequest) *GenerateTokenRequest {
+	if req == nil {
+		return nil
+	}
+	t := &GenerateTokenRequest{}
+	GenerateTokenRequestFromAPI(req, t)
+	return t
+}
+
+// convenience
+func NewEstablishRequestFromAPI(req *api.PeeringEstablishRequest) *EstablishRequest {
+	if req == nil {
+		return nil
+	}
+	t := &EstablishRequest{}
+	EstablishRequestFromAPI(req, t)
+	return t
+}
+
+func TimePtrFromProto(s *timestamppb.Timestamp) *time.Time {
+	if s == nil {
+		return nil
+	}
+	t := s.AsTime()
+	return &t
+}
+
+func TimePtrToProto(s *time.Time) *timestamppb.Timestamp {
+	if s == nil {
+		return nil
+	}
+	return timestamppb.New(*s)
+}
+
+// DeepCopy returns a copy of the PeeringTrustBundle that can be passed around
+// without worrying about the receiver unsafely modifying it. It is used by the
+// generated DeepCopy methods in proxycfg.
+func (o *PeeringTrustBundle) DeepCopy() *PeeringTrustBundle {
+	cp, ok := proto.Clone(o).(*PeeringTrustBundle)
+	if !ok {
+		panic(fmt.Sprintf("failed to clone *PeeringTrustBundle, got: %T", cp))
+	}
+	return cp
+}
diff --git a/proto/private/pbpeering/peering.pb.binary.go b/proto/pbpeering/peering.pb.binary.go
similarity index 99%
rename from proto/private/pbpeering/peering.pb.binary.go
rename to proto/pbpeering/peering.pb.binary.go
index af74d9a49e6a0..30772dcd6c6f7 100644
--- a/proto/private/pbpeering/peering.pb.binary.go
+++ b/proto/pbpeering/peering.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbpeering/peering.proto
+// source: proto/pbpeering/peering.proto
 
 package pbpeering
 
diff --git a/proto/pbpeering/peering.pb.go b/proto/pbpeering/peering.pb.go
new file mode 100644
index 0000000000000..816100f5eef90
--- /dev/null
+++ b/proto/pbpeering/peering.pb.go
@@ -0,0 +1,3255 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: proto/pbpeering/peering.proto
+
+package pbpeering
+
+import (
+	_ "github.com/hashicorp/consul/proto-public/annotations/ratelimit"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// PeeringState enumerates all the states a peering can be in.
+type PeeringState int32
+
+const (
+	// Undefined represents an unset value for PeeringState during
+	// writes.
+	PeeringState_UNDEFINED PeeringState = 0
+	// Pending means the peering was created by generating a peering token.
+	// Peerings stay in a pending state until the peer uses the token to dial
+	// the local cluster.
+	PeeringState_PENDING PeeringState = 1
+	// Establishing means the peering is being established from a peering token.
+	// This is the initial state for dialing peers.
+	PeeringState_ESTABLISHING PeeringState = 2
+	// Active means that the peering connection is active and healthy.
+	PeeringState_ACTIVE PeeringState = 3
+	// Failing means the peering connection has been interrupted but has not yet
+	// been terminated.
+	PeeringState_FAILING PeeringState = 4
+	// Deleting means a peering was marked for deletion and is in the process
+	// of being deleted.
+	PeeringState_DELETING PeeringState = 5
+	// Terminated means the peering relationship has been removed.
+	PeeringState_TERMINATED PeeringState = 6
+)
+
+// Enum value maps for PeeringState.
+var (
+	PeeringState_name = map[int32]string{
+		0: "UNDEFINED",
+		1: "PENDING",
+		2: "ESTABLISHING",
+		3: "ACTIVE",
+		4: "FAILING",
+		5: "DELETING",
+		6: "TERMINATED",
+	}
+	PeeringState_value = map[string]int32{
+		"UNDEFINED":    0,
+		"PENDING":      1,
+		"ESTABLISHING": 2,
+		"ACTIVE":       3,
+		"FAILING":      4,
+		"DELETING":     5,
+		"TERMINATED":   6,
+	}
+)
+
+func (x PeeringState) Enum() *PeeringState {
+	p := new(PeeringState)
+	*p = x
+	return p
+}
+
+func (x PeeringState) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (PeeringState) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbpeering_peering_proto_enumTypes[0].Descriptor()
+}
+
+func (PeeringState) Type() protoreflect.EnumType {
+	return &file_proto_pbpeering_peering_proto_enumTypes[0]
+}
+
+func (x PeeringState) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use PeeringState.Descriptor instead.
+func (PeeringState) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{0}
+}
+
+// SecretsWriteRequest encodes a request to write a peering secret as the result
+// of some operation. Different operations, such as generating a peering token,
+// lead to modifying the known secrets associated with a peering.
+type SecretsWriteRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// PeerID is the local UUID of the peering this request applies to.
+	PeerID string `protobuf:"bytes,1,opt,name=PeerID,proto3" json:"PeerID,omitempty"`
+	// Types that are assignable to Request:
+	//
+	//	*SecretsWriteRequest_GenerateToken
+	//	*SecretsWriteRequest_ExchangeSecret
+	//	*SecretsWriteRequest_PromotePending
+	//	*SecretsWriteRequest_Establish
+	Request isSecretsWriteRequest_Request `protobuf_oneof:"Request"`
+}
+
+func (x *SecretsWriteRequest) Reset() {
+	*x = SecretsWriteRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SecretsWriteRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SecretsWriteRequest) ProtoMessage() {}
+
+func (x *SecretsWriteRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SecretsWriteRequest.ProtoReflect.Descriptor instead.
+func (*SecretsWriteRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *SecretsWriteRequest) GetPeerID() string {
+	if x != nil {
+		return x.PeerID
+	}
+	return ""
+}
+
+func (m *SecretsWriteRequest) GetRequest() isSecretsWriteRequest_Request {
+	if m != nil {
+		return m.Request
+	}
+	return nil
+}
+
+func (x *SecretsWriteRequest) GetGenerateToken() *SecretsWriteRequest_GenerateTokenRequest {
+	if x, ok := x.GetRequest().(*SecretsWriteRequest_GenerateToken); ok {
+		return x.GenerateToken
+	}
+	return nil
+}
+
+func (x *SecretsWriteRequest) GetExchangeSecret() *SecretsWriteRequest_ExchangeSecretRequest {
+	if x, ok := x.GetRequest().(*SecretsWriteRequest_ExchangeSecret); ok {
+		return x.ExchangeSecret
+	}
+	return nil
+}
+
+func (x *SecretsWriteRequest) GetPromotePending() *SecretsWriteRequest_PromotePendingRequest {
+	if x, ok := x.GetRequest().(*SecretsWriteRequest_PromotePending); ok {
+		return x.PromotePending
+	}
+	return nil
+}
+
+func (x *SecretsWriteRequest) GetEstablish() *SecretsWriteRequest_EstablishRequest {
+	if x, ok := x.GetRequest().(*SecretsWriteRequest_Establish); ok {
+		return x.Establish
+	}
+	return nil
+}
+
+type isSecretsWriteRequest_Request interface {
+	isSecretsWriteRequest_Request()
+}
+
+type SecretsWriteRequest_GenerateToken struct {
+	GenerateToken *SecretsWriteRequest_GenerateTokenRequest `protobuf:"bytes,2,opt,name=generate_token,json=generateToken,proto3,oneof"`
+}
+
+type SecretsWriteRequest_ExchangeSecret struct {
+	ExchangeSecret *SecretsWriteRequest_ExchangeSecretRequest `protobuf:"bytes,3,opt,name=exchange_secret,json=exchangeSecret,proto3,oneof"`
+}
+
+type SecretsWriteRequest_PromotePending struct {
+	PromotePending *SecretsWriteRequest_PromotePendingRequest `protobuf:"bytes,4,opt,name=promote_pending,json=promotePending,proto3,oneof"`
+}
+
+type SecretsWriteRequest_Establish struct {
+	Establish *SecretsWriteRequest_EstablishRequest `protobuf:"bytes,5,opt,name=establish,proto3,oneof"`
+}
+
+func (*SecretsWriteRequest_GenerateToken) isSecretsWriteRequest_Request() {}
+
+func (*SecretsWriteRequest_ExchangeSecret) isSecretsWriteRequest_Request() {}
+
+func (*SecretsWriteRequest_PromotePending) isSecretsWriteRequest_Request() {}
+
+func (*SecretsWriteRequest_Establish) isSecretsWriteRequest_Request() {}
+
+// PeeringSecrets defines a secret used for authenticating/authorizing peer clusters.
+type PeeringSecrets struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// PeerID is the local UUID of the peering this secret was generated for.
+	PeerID        string                        `protobuf:"bytes,1,opt,name=PeerID,proto3" json:"PeerID,omitempty"`
+	Establishment *PeeringSecrets_Establishment `protobuf:"bytes,2,opt,name=establishment,proto3" json:"establishment,omitempty"`
+	Stream        *PeeringSecrets_Stream        `protobuf:"bytes,3,opt,name=stream,proto3" json:"stream,omitempty"`
+}
+
+func (x *PeeringSecrets) Reset() {
+	*x = PeeringSecrets{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringSecrets) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringSecrets) ProtoMessage() {}
+
+func (x *PeeringSecrets) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringSecrets.ProtoReflect.Descriptor instead.
+func (*PeeringSecrets) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *PeeringSecrets) GetPeerID() string {
+	if x != nil {
+		return x.PeerID
+	}
+	return ""
+}
+
+func (x *PeeringSecrets) GetEstablishment() *PeeringSecrets_Establishment {
+	if x != nil {
+		return x.Establishment
+	}
+	return nil
+}
+
+func (x *PeeringSecrets) GetStream() *PeeringSecrets_Stream {
+	if x != nil {
+		return x.Stream
+	}
+	return nil
+}
+
+// Peering defines a peering relationship between two disparate Consul clusters
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/api.Peering
+// output=peering.gen.go
+// name=API
+type Peering struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// ID is a datacenter-scoped UUID for the peering.
+	// The ID is generated when a peering is first written to the state store.
+	ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
+	// Name is the local alias for the peering relationship.
+	Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
+	// Partition is the local partition connecting to the peer.
+	Partition string `protobuf:"bytes,3,opt,name=Partition,proto3" json:"Partition,omitempty"`
+	// DeletedAt is the time when the Peering was marked for deletion
+	// This is nullable so that we can omit if empty when encoding in JSON
+	// mog: func-to=TimePtrFromProto func-from=TimePtrToProto
+	DeletedAt *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=DeletedAt,proto3" json:"DeletedAt,omitempty"`
+	// Meta is a mapping of some string value to any other string value
+	Meta map[string]string `protobuf:"bytes,5,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// State is one of the valid PeeringState values to represent the status of
+	// peering relationship.
+	//
+	// mog: func-to=PeeringStateToAPI func-from=PeeringStateFromAPI
+	State PeeringState `protobuf:"varint,6,opt,name=State,proto3,enum=hashicorp.consul.internal.peering.PeeringState" json:"State,omitempty"`
+	// PeerID is the ID that our peer assigned to this peering.
+	// This ID is to be used when dialing the peer, so that it can know who dialed it.
+	PeerID string `protobuf:"bytes,7,opt,name=PeerID,proto3" json:"PeerID,omitempty"`
+	// PeerCAPems contains all the CA certificates for the remote peer.
+	PeerCAPems []string `protobuf:"bytes,8,rep,name=PeerCAPems,proto3" json:"PeerCAPems,omitempty"`
+	// PeerServerName is the name of the remote server as it relates to TLS.
+	PeerServerName string `protobuf:"bytes,9,opt,name=PeerServerName,proto3" json:"PeerServerName,omitempty"`
+	// PeerServerAddresses contains all the the connection addresses for the remote peer.
+	PeerServerAddresses []string `protobuf:"bytes,10,rep,name=PeerServerAddresses,proto3" json:"PeerServerAddresses,omitempty"`
+	// StreamStatus contains information computed on read based on the state of the stream.
+	//
+	// mog: func-to=StreamStatusToAPI func-from=StreamStatusFromAPI
+	StreamStatus *StreamStatus `protobuf:"bytes,13,opt,name=StreamStatus,proto3" json:"StreamStatus,omitempty"`
+	// CreateIndex is the Raft index at which the Peering was created.
+	// @gotags: bexpr:"-"
+	CreateIndex uint64 `protobuf:"varint,11,opt,name=CreateIndex,proto3" json:"CreateIndex,omitempty" bexpr:"-"`
+	// ModifyIndex is the latest Raft index at which the Peering. was modified.
+	// @gotags: bexpr:"-"
+	ModifyIndex uint64 `protobuf:"varint,12,opt,name=ModifyIndex,proto3" json:"ModifyIndex,omitempty" bexpr:"-"`
+	// Remote contains metadata about the remote peer.
+	Remote *RemoteInfo `protobuf:"bytes,17,opt,name=Remote,proto3" json:"Remote,omitempty"`
+	// ManualServerAddresses provides a list of manually specified server addresses from the
+	// user. If this is defined, then the automatic PeerServerAddresses are ignored.
+	ManualServerAddresses []string `protobuf:"bytes,18,rep,name=ManualServerAddresses,proto3" json:"ManualServerAddresses,omitempty"`
+}
+
+func (x *Peering) Reset() {
+	*x = Peering{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Peering) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Peering) ProtoMessage() {}
+
+func (x *Peering) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Peering.ProtoReflect.Descriptor instead.
+func (*Peering) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *Peering) GetID() string {
+	if x != nil {
+		return x.ID
+	}
+	return ""
+}
+
+func (x *Peering) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *Peering) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+func (x *Peering) GetDeletedAt() *timestamppb.Timestamp {
+	if x != nil {
+		return x.DeletedAt
+	}
+	return nil
+}
+
+func (x *Peering) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *Peering) GetState() PeeringState {
+	if x != nil {
+		return x.State
+	}
+	return PeeringState_UNDEFINED
+}
+
+func (x *Peering) GetPeerID() string {
+	if x != nil {
+		return x.PeerID
+	}
+	return ""
+}
+
+func (x *Peering) GetPeerCAPems() []string {
+	if x != nil {
+		return x.PeerCAPems
+	}
+	return nil
+}
+
+func (x *Peering) GetPeerServerName() string {
+	if x != nil {
+		return x.PeerServerName
+	}
+	return ""
+}
+
+func (x *Peering) GetPeerServerAddresses() []string {
+	if x != nil {
+		return x.PeerServerAddresses
+	}
+	return nil
+}
+
+func (x *Peering) GetStreamStatus() *StreamStatus {
+	if x != nil {
+		return x.StreamStatus
+	}
+	return nil
+}
+
+func (x *Peering) GetCreateIndex() uint64 {
+	if x != nil {
+		return x.CreateIndex
+	}
+	return 0
+}
+
+func (x *Peering) GetModifyIndex() uint64 {
+	if x != nil {
+		return x.ModifyIndex
+	}
+	return 0
+}
+
+func (x *Peering) GetRemote() *RemoteInfo {
+	if x != nil {
+		return x.Remote
+	}
+	return nil
+}
+
+func (x *Peering) GetManualServerAddresses() []string {
+	if x != nil {
+		return x.ManualServerAddresses
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/api.PeeringRemoteInfo
+// output=peering.gen.go
+// name=API
+type RemoteInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Partition is the remote peer's partition.
+	Partition string `protobuf:"bytes,1,opt,name=Partition,proto3" json:"Partition,omitempty"`
+	// Datacenter is the remote peer's datacenter.
+	Datacenter string `protobuf:"bytes,2,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
+}
+
+func (x *RemoteInfo) Reset() {
+	*x = RemoteInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RemoteInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RemoteInfo) ProtoMessage() {}
+
+func (x *RemoteInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RemoteInfo.ProtoReflect.Descriptor instead.
+func (*RemoteInfo) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *RemoteInfo) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+func (x *RemoteInfo) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
+	}
+	return ""
+}
+
+// StreamStatus represents information about an active peering stream.
+type StreamStatus struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// ImportedServices is the list of services imported from this peering.
+	ImportedServices []string `protobuf:"bytes,1,rep,name=ImportedServices,proto3" json:"ImportedServices,omitempty"`
+	// ExportedServices is the list of services exported to this peering.
+	ExportedServices []string `protobuf:"bytes,2,rep,name=ExportedServices,proto3" json:"ExportedServices,omitempty"`
+	// LastHeartbeat represents when the last heartbeat message was received.
+	LastHeartbeat *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=LastHeartbeat,proto3" json:"LastHeartbeat,omitempty"`
+	// LastReceive represents when any message was last received, regardless of success or error.
+	LastReceive *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=LastReceive,proto3" json:"LastReceive,omitempty"`
+	// LastSend represents when any message was last sent, regardless of success or error.
+	LastSend *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=LastSend,proto3" json:"LastSend,omitempty"`
+}
+
+func (x *StreamStatus) Reset() {
+	*x = StreamStatus{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *StreamStatus) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*StreamStatus) ProtoMessage() {}
+
+func (x *StreamStatus) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use StreamStatus.ProtoReflect.Descriptor instead.
+func (*StreamStatus) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *StreamStatus) GetImportedServices() []string {
+	if x != nil {
+		return x.ImportedServices
+	}
+	return nil
+}
+
+func (x *StreamStatus) GetExportedServices() []string {
+	if x != nil {
+		return x.ExportedServices
+	}
+	return nil
+}
+
+func (x *StreamStatus) GetLastHeartbeat() *timestamppb.Timestamp {
+	if x != nil {
+		return x.LastHeartbeat
+	}
+	return nil
+}
+
+func (x *StreamStatus) GetLastReceive() *timestamppb.Timestamp {
+	if x != nil {
+		return x.LastReceive
+	}
+	return nil
+}
+
+func (x *StreamStatus) GetLastSend() *timestamppb.Timestamp {
+	if x != nil {
+		return x.LastSend
+	}
+	return nil
+}
+
+// PeeringTrustBundle holds the trust information for validating requests from a peer.
+type PeeringTrustBundle struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// TrustDomain is the domain for the bundle, example.com, foo.bar.gov for example. Note that this must not have a prefix such as "spiffe://".
+	TrustDomain string `protobuf:"bytes,1,opt,name=TrustDomain,proto3" json:"TrustDomain,omitempty"`
+	// PeerName associates the trust bundle with a peer.
+	PeerName string `protobuf:"bytes,2,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
+	// Partition isolates the bundle from other trust bundles in separate local partitions.
+	Partition string `protobuf:"bytes,3,opt,name=Partition,proto3" json:"Partition,omitempty"`
+	// RootPEMs holds ASN.1 DER encoded X.509 certificate data for the trust bundle.
+	RootPEMs []string `protobuf:"bytes,4,rep,name=RootPEMs,proto3" json:"RootPEMs,omitempty"`
+	// ExportedPartition references the remote partition of the peer
+	// which sent this trust bundle. Used for generating SpiffeIDs.
+	ExportedPartition string `protobuf:"bytes,5,opt,name=ExportedPartition,proto3" json:"ExportedPartition,omitempty"`
+	// CreateIndex is the Raft index at which the trust domain was created.
+	// @gotags: bexpr:"-"
+	CreateIndex uint64 `protobuf:"varint,6,opt,name=CreateIndex,proto3" json:"CreateIndex,omitempty" bexpr:"-"`
+	// ModifyIndex is the latest Raft index at which the trust bundle was modified.
+	// @gotags: bexpr:"-"
+	ModifyIndex uint64 `protobuf:"varint,7,opt,name=ModifyIndex,proto3" json:"ModifyIndex,omitempty" bexpr:"-"`
+}
+
+func (x *PeeringTrustBundle) Reset() {
+	*x = PeeringTrustBundle{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringTrustBundle) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringTrustBundle) ProtoMessage() {}
+
+func (x *PeeringTrustBundle) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringTrustBundle.ProtoReflect.Descriptor instead.
+func (*PeeringTrustBundle) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *PeeringTrustBundle) GetTrustDomain() string {
+	if x != nil {
+		return x.TrustDomain
+	}
+	return ""
+}
+
+func (x *PeeringTrustBundle) GetPeerName() string {
+	if x != nil {
+		return x.PeerName
+	}
+	return ""
+}
+
+func (x *PeeringTrustBundle) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+func (x *PeeringTrustBundle) GetRootPEMs() []string {
+	if x != nil {
+		return x.RootPEMs
+	}
+	return nil
+}
+
+func (x *PeeringTrustBundle) GetExportedPartition() string {
+	if x != nil {
+		return x.ExportedPartition
+	}
+	return ""
+}
+
+func (x *PeeringTrustBundle) GetCreateIndex() uint64 {
+	if x != nil {
+		return x.CreateIndex
+	}
+	return 0
+}
+
+func (x *PeeringTrustBundle) GetModifyIndex() uint64 {
+	if x != nil {
+		return x.ModifyIndex
+	}
+	return 0
+}
+
+// PeeringServerAddresses contains the latest snapshot of all known
+// server addresses for a peer.
+type PeeringServerAddresses struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Addresses []string `protobuf:"bytes,1,rep,name=Addresses,proto3" json:"Addresses,omitempty"`
+}
+
+func (x *PeeringServerAddresses) Reset() {
+	*x = PeeringServerAddresses{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringServerAddresses) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringServerAddresses) ProtoMessage() {}
+
+func (x *PeeringServerAddresses) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringServerAddresses.ProtoReflect.Descriptor instead.
+func (*PeeringServerAddresses) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *PeeringServerAddresses) GetAddresses() []string {
+	if x != nil {
+		return x.Addresses
+	}
+	return nil
+}
+
+type PeeringReadRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name      string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	Partition string `protobuf:"bytes,2,opt,name=Partition,proto3" json:"Partition,omitempty"`
+}
+
+func (x *PeeringReadRequest) Reset() {
+	*x = PeeringReadRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringReadRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringReadRequest) ProtoMessage() {}
+
+func (x *PeeringReadRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringReadRequest.ProtoReflect.Descriptor instead.
+func (*PeeringReadRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *PeeringReadRequest) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *PeeringReadRequest) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+type PeeringReadResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Peering *Peering `protobuf:"bytes,1,opt,name=Peering,proto3" json:"Peering,omitempty"`
+}
+
+func (x *PeeringReadResponse) Reset() {
+	*x = PeeringReadResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringReadResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringReadResponse) ProtoMessage() {}
+
+func (x *PeeringReadResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[8]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringReadResponse.ProtoReflect.Descriptor instead.
+func (*PeeringReadResponse) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *PeeringReadResponse) GetPeering() *Peering {
+	if x != nil {
+		return x.Peering
+	}
+	return nil
+}
+
+type PeeringListRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Partition string `protobuf:"bytes,1,opt,name=Partition,proto3" json:"Partition,omitempty"`
+}
+
+func (x *PeeringListRequest) Reset() {
+	*x = PeeringListRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringListRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringListRequest) ProtoMessage() {}
+
+func (x *PeeringListRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[9]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringListRequest.ProtoReflect.Descriptor instead.
+func (*PeeringListRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{9}
+}
+
+func (x *PeeringListRequest) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+type PeeringListResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Peerings       []*Peering `protobuf:"bytes,1,rep,name=Peerings,proto3" json:"Peerings,omitempty"`
+	OBSOLETE_Index uint64     `protobuf:"varint,2,opt,name=OBSOLETE_Index,json=OBSOLETEIndex,proto3" json:"OBSOLETE_Index,omitempty"` // Deprecated in favor of gRPC metadata
+}
+
+func (x *PeeringListResponse) Reset() {
+	*x = PeeringListResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[10]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringListResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringListResponse) ProtoMessage() {}
+
+func (x *PeeringListResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[10]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringListResponse.ProtoReflect.Descriptor instead.
+func (*PeeringListResponse) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{10}
+}
+
+func (x *PeeringListResponse) GetPeerings() []*Peering {
+	if x != nil {
+		return x.Peerings
+	}
+	return nil
+}
+
+func (x *PeeringListResponse) GetOBSOLETE_Index() uint64 {
+	if x != nil {
+		return x.OBSOLETE_Index
+	}
+	return 0
+}
+
+type PeeringWriteRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Peering is the peering to write with the request.
+	Peering *Peering `protobuf:"bytes,1,opt,name=Peering,proto3" json:"Peering,omitempty"`
+	// SecretsWriteRequest contains the optional peering secrets to persist
+	// with the peering. Peering secrets are not embedded in the peering
+	// object to avoid leaking them.
+	SecretsRequest *SecretsWriteRequest `protobuf:"bytes,2,opt,name=SecretsRequest,proto3" json:"SecretsRequest,omitempty"`
+	Meta           map[string]string    `protobuf:"bytes,3,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+}
+
+func (x *PeeringWriteRequest) Reset() {
+	*x = PeeringWriteRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[11]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringWriteRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringWriteRequest) ProtoMessage() {}
+
+func (x *PeeringWriteRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[11]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringWriteRequest.ProtoReflect.Descriptor instead.
+func (*PeeringWriteRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{11}
+}
+
+func (x *PeeringWriteRequest) GetPeering() *Peering {
+	if x != nil {
+		return x.Peering
+	}
+	return nil
+}
+
+func (x *PeeringWriteRequest) GetSecretsRequest() *SecretsWriteRequest {
+	if x != nil {
+		return x.SecretsRequest
+	}
+	return nil
+}
+
+func (x *PeeringWriteRequest) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+// TODO(peering): Consider returning Peering if we keep this endpoint around
+type PeeringWriteResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *PeeringWriteResponse) Reset() {
+	*x = PeeringWriteResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[12]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringWriteResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringWriteResponse) ProtoMessage() {}
+
+func (x *PeeringWriteResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[12]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringWriteResponse.ProtoReflect.Descriptor instead.
+func (*PeeringWriteResponse) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{12}
+}
+
+type PeeringDeleteRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name      string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	Partition string `protobuf:"bytes,2,opt,name=Partition,proto3" json:"Partition,omitempty"`
+}
+
+func (x *PeeringDeleteRequest) Reset() {
+	*x = PeeringDeleteRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[13]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringDeleteRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringDeleteRequest) ProtoMessage() {}
+
+func (x *PeeringDeleteRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[13]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringDeleteRequest.ProtoReflect.Descriptor instead.
+func (*PeeringDeleteRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{13}
+}
+
+func (x *PeeringDeleteRequest) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *PeeringDeleteRequest) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+type PeeringDeleteResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *PeeringDeleteResponse) Reset() {
+	*x = PeeringDeleteResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[14]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringDeleteResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringDeleteResponse) ProtoMessage() {}
+
+func (x *PeeringDeleteResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[14]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringDeleteResponse.ProtoReflect.Descriptor instead.
+func (*PeeringDeleteResponse) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{14}
+}
+
+type TrustBundleListByServiceRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ServiceName string `protobuf:"bytes,1,opt,name=ServiceName,proto3" json:"ServiceName,omitempty"`
+	Namespace   string `protobuf:"bytes,2,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
+	Partition   string `protobuf:"bytes,3,opt,name=Partition,proto3" json:"Partition,omitempty"`
+	Kind        string `protobuf:"bytes,4,opt,name=Kind,proto3" json:"Kind,omitempty"`
+}
+
+func (x *TrustBundleListByServiceRequest) Reset() {
+	*x = TrustBundleListByServiceRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[15]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TrustBundleListByServiceRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TrustBundleListByServiceRequest) ProtoMessage() {}
+
+func (x *TrustBundleListByServiceRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[15]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TrustBundleListByServiceRequest.ProtoReflect.Descriptor instead.
+func (*TrustBundleListByServiceRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{15}
+}
+
+func (x *TrustBundleListByServiceRequest) GetServiceName() string {
+	if x != nil {
+		return x.ServiceName
+	}
+	return ""
+}
+
+func (x *TrustBundleListByServiceRequest) GetNamespace() string {
+	if x != nil {
+		return x.Namespace
+	}
+	return ""
+}
+
+func (x *TrustBundleListByServiceRequest) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+func (x *TrustBundleListByServiceRequest) GetKind() string {
+	if x != nil {
+		return x.Kind
+	}
+	return ""
+}
+
+type TrustBundleListByServiceResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	OBSOLETE_Index uint64                `protobuf:"varint,1,opt,name=OBSOLETE_Index,json=OBSOLETEIndex,proto3" json:"OBSOLETE_Index,omitempty"` // Deprecated in favor of gRPC metadata
+	Bundles        []*PeeringTrustBundle `protobuf:"bytes,2,rep,name=Bundles,proto3" json:"Bundles,omitempty"`
+}
+
+func (x *TrustBundleListByServiceResponse) Reset() {
+	*x = TrustBundleListByServiceResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[16]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TrustBundleListByServiceResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TrustBundleListByServiceResponse) ProtoMessage() {}
+
+func (x *TrustBundleListByServiceResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[16]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TrustBundleListByServiceResponse.ProtoReflect.Descriptor instead.
+func (*TrustBundleListByServiceResponse) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{16}
+}
+
+func (x *TrustBundleListByServiceResponse) GetOBSOLETE_Index() uint64 {
+	if x != nil {
+		return x.OBSOLETE_Index
+	}
+	return 0
+}
+
+func (x *TrustBundleListByServiceResponse) GetBundles() []*PeeringTrustBundle {
+	if x != nil {
+		return x.Bundles
+	}
+	return nil
+}
+
+type TrustBundleReadRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name      string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	Partition string `protobuf:"bytes,2,opt,name=Partition,proto3" json:"Partition,omitempty"`
+}
+
+func (x *TrustBundleReadRequest) Reset() {
+	*x = TrustBundleReadRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[17]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TrustBundleReadRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TrustBundleReadRequest) ProtoMessage() {}
+
+func (x *TrustBundleReadRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[17]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TrustBundleReadRequest.ProtoReflect.Descriptor instead.
+func (*TrustBundleReadRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{17}
+}
+
+func (x *TrustBundleReadRequest) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *TrustBundleReadRequest) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+type TrustBundleReadResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	OBSOLETE_Index uint64              `protobuf:"varint,1,opt,name=OBSOLETE_Index,json=OBSOLETEIndex,proto3" json:"OBSOLETE_Index,omitempty"` // Deprecated in favor of gRPC metadata
+	Bundle         *PeeringTrustBundle `protobuf:"bytes,2,opt,name=Bundle,proto3" json:"Bundle,omitempty"`
+}
+
+func (x *TrustBundleReadResponse) Reset() {
+	*x = TrustBundleReadResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[18]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TrustBundleReadResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TrustBundleReadResponse) ProtoMessage() {}
+
+func (x *TrustBundleReadResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[18]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TrustBundleReadResponse.ProtoReflect.Descriptor instead.
+func (*TrustBundleReadResponse) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{18}
+}
+
+func (x *TrustBundleReadResponse) GetOBSOLETE_Index() uint64 {
+	if x != nil {
+		return x.OBSOLETE_Index
+	}
+	return 0
+}
+
+func (x *TrustBundleReadResponse) GetBundle() *PeeringTrustBundle {
+	if x != nil {
+		return x.Bundle
+	}
+	return nil
+}
+
+// This is a purely internal type and does not require query metadata.
+type PeeringTerminateByIDRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
+}
+
+func (x *PeeringTerminateByIDRequest) Reset() {
+	*x = PeeringTerminateByIDRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[19]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringTerminateByIDRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringTerminateByIDRequest) ProtoMessage() {}
+
+func (x *PeeringTerminateByIDRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[19]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringTerminateByIDRequest.ProtoReflect.Descriptor instead.
+func (*PeeringTerminateByIDRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{19}
+}
+
+func (x *PeeringTerminateByIDRequest) GetID() string {
+	if x != nil {
+		return x.ID
+	}
+	return ""
+}
+
+type PeeringTerminateByIDResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *PeeringTerminateByIDResponse) Reset() {
+	*x = PeeringTerminateByIDResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[20]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringTerminateByIDResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringTerminateByIDResponse) ProtoMessage() {}
+
+func (x *PeeringTerminateByIDResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[20]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringTerminateByIDResponse.ProtoReflect.Descriptor instead.
+func (*PeeringTerminateByIDResponse) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{20}
+}
+
+type PeeringTrustBundleWriteRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	PeeringTrustBundle *PeeringTrustBundle `protobuf:"bytes,1,opt,name=PeeringTrustBundle,proto3" json:"PeeringTrustBundle,omitempty"`
+}
+
+func (x *PeeringTrustBundleWriteRequest) Reset() {
+	*x = PeeringTrustBundleWriteRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[21]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringTrustBundleWriteRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringTrustBundleWriteRequest) ProtoMessage() {}
+
+func (x *PeeringTrustBundleWriteRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[21]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringTrustBundleWriteRequest.ProtoReflect.Descriptor instead.
+func (*PeeringTrustBundleWriteRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{21}
+}
+
+func (x *PeeringTrustBundleWriteRequest) GetPeeringTrustBundle() *PeeringTrustBundle {
+	if x != nil {
+		return x.PeeringTrustBundle
+	}
+	return nil
+}
+
+type PeeringTrustBundleWriteResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *PeeringTrustBundleWriteResponse) Reset() {
+	*x = PeeringTrustBundleWriteResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[22]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringTrustBundleWriteResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringTrustBundleWriteResponse) ProtoMessage() {}
+
+func (x *PeeringTrustBundleWriteResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[22]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringTrustBundleWriteResponse.ProtoReflect.Descriptor instead.
+func (*PeeringTrustBundleWriteResponse) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{22}
+}
+
+type PeeringTrustBundleDeleteRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name      string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	Partition string `protobuf:"bytes,2,opt,name=Partition,proto3" json:"Partition,omitempty"`
+}
+
+func (x *PeeringTrustBundleDeleteRequest) Reset() {
+	*x = PeeringTrustBundleDeleteRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[23]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringTrustBundleDeleteRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringTrustBundleDeleteRequest) ProtoMessage() {}
+
+func (x *PeeringTrustBundleDeleteRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[23]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringTrustBundleDeleteRequest.ProtoReflect.Descriptor instead.
+func (*PeeringTrustBundleDeleteRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{23}
+}
+
+func (x *PeeringTrustBundleDeleteRequest) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *PeeringTrustBundleDeleteRequest) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+type PeeringTrustBundleDeleteResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *PeeringTrustBundleDeleteResponse) Reset() {
+	*x = PeeringTrustBundleDeleteResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[24]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringTrustBundleDeleteResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringTrustBundleDeleteResponse) ProtoMessage() {}
+
+func (x *PeeringTrustBundleDeleteResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[24]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringTrustBundleDeleteResponse.ProtoReflect.Descriptor instead.
+func (*PeeringTrustBundleDeleteResponse) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{24}
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/api.PeeringGenerateTokenRequest
+// output=peering.gen.go
+// name=API
+type GenerateTokenRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Name of the remote peer.
+	PeerName string `protobuf:"bytes,1,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
+	// Partition is the local partition being peered.
+	Partition string `protobuf:"bytes,2,opt,name=Partition,proto3" json:"Partition,omitempty"`
+	// Meta is a mapping of some string value to any other string value
+	Meta map[string]string `protobuf:"bytes,5,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// ServerExternalAddresses is a list of addresses to put into the generated token. This could be used to specify
+	// load balancer(s) or external IPs to reach the servers from the dialing side, and will override any server
+	// addresses obtained from the "consul" service.
+	ServerExternalAddresses []string `protobuf:"bytes,6,rep,name=ServerExternalAddresses,proto3" json:"ServerExternalAddresses,omitempty"`
+}
+
+func (x *GenerateTokenRequest) Reset() {
+	*x = GenerateTokenRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[25]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GenerateTokenRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GenerateTokenRequest) ProtoMessage() {}
+
+func (x *GenerateTokenRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[25]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GenerateTokenRequest.ProtoReflect.Descriptor instead.
+func (*GenerateTokenRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{25}
+}
+
+func (x *GenerateTokenRequest) GetPeerName() string {
+	if x != nil {
+		return x.PeerName
+	}
+	return ""
+}
+
+func (x *GenerateTokenRequest) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+func (x *GenerateTokenRequest) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *GenerateTokenRequest) GetServerExternalAddresses() []string {
+	if x != nil {
+		return x.ServerExternalAddresses
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/api.PeeringGenerateTokenResponse
+// output=peering.gen.go
+// name=API
+type GenerateTokenResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// PeeringToken is an opaque string provided to the remote peer for it to complete
+	// the peering initialization handshake.
+	PeeringToken string `protobuf:"bytes,1,opt,name=PeeringToken,proto3" json:"PeeringToken,omitempty"`
+}
+
+func (x *GenerateTokenResponse) Reset() {
+	*x = GenerateTokenResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[26]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GenerateTokenResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GenerateTokenResponse) ProtoMessage() {}
+
+func (x *GenerateTokenResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[26]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GenerateTokenResponse.ProtoReflect.Descriptor instead.
+func (*GenerateTokenResponse) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{26}
+}
+
+func (x *GenerateTokenResponse) GetPeeringToken() string {
+	if x != nil {
+		return x.PeeringToken
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/api.PeeringEstablishRequest
+// output=peering.gen.go
+// name=API
+type EstablishRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Name of the remote peer.
+	PeerName string `protobuf:"bytes,1,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
+	// The peering token returned from the peer's GenerateToken endpoint.
+	PeeringToken string `protobuf:"bytes,2,opt,name=PeeringToken,proto3" json:"PeeringToken,omitempty"`
+	// Partition is the local partition being peered.
+	Partition string `protobuf:"bytes,3,opt,name=Partition,proto3" json:"Partition,omitempty"`
+	// Meta is a mapping of some string value to any other string value
+	Meta map[string]string `protobuf:"bytes,4,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+}
+
+func (x *EstablishRequest) Reset() {
+	*x = EstablishRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[27]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EstablishRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EstablishRequest) ProtoMessage() {}
+
+func (x *EstablishRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[27]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use EstablishRequest.ProtoReflect.Descriptor instead.
+func (*EstablishRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{27}
+}
+
+func (x *EstablishRequest) GetPeerName() string {
+	if x != nil {
+		return x.PeerName
+	}
+	return ""
+}
+
+func (x *EstablishRequest) GetPeeringToken() string {
+	if x != nil {
+		return x.PeeringToken
+	}
+	return ""
+}
+
+func (x *EstablishRequest) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+func (x *EstablishRequest) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/api.PeeringEstablishResponse
+// output=peering.gen.go
+// name=API
+type EstablishResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *EstablishResponse) Reset() {
+	*x = EstablishResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[28]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EstablishResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EstablishResponse) ProtoMessage() {}
+
+func (x *EstablishResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[28]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use EstablishResponse.ProtoReflect.Descriptor instead.
+func (*EstablishResponse) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{28}
+}
+
+// GenerateTokenRequest encodes a request to persist a peering establishment
+// secret. It is triggered by generating a new peering token for a peer cluster.
+type SecretsWriteRequest_GenerateTokenRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// establishment_secret is the proposed secret ID to store as the establishment
+	// secret for this peering.
+	EstablishmentSecret string `protobuf:"bytes,1,opt,name=establishment_secret,json=establishmentSecret,proto3" json:"establishment_secret,omitempty"`
+}
+
+func (x *SecretsWriteRequest_GenerateTokenRequest) Reset() {
+	*x = SecretsWriteRequest_GenerateTokenRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[29]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SecretsWriteRequest_GenerateTokenRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SecretsWriteRequest_GenerateTokenRequest) ProtoMessage() {}
+
+func (x *SecretsWriteRequest_GenerateTokenRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[29]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SecretsWriteRequest_GenerateTokenRequest.ProtoReflect.Descriptor instead.
+func (*SecretsWriteRequest_GenerateTokenRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{0, 0}
+}
+
+func (x *SecretsWriteRequest_GenerateTokenRequest) GetEstablishmentSecret() string {
+	if x != nil {
+		return x.EstablishmentSecret
+	}
+	return ""
+}
+
+// ExchangeSecretRequest encodes a request to persist a pending stream secret
+// secret. It is triggered by an acceptor peer generating a long-lived stream secret
+// in exchange for an establishment secret.
+type SecretsWriteRequest_ExchangeSecretRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// establishment_secret is the secret to exchange for the given pending stream secret.
+	EstablishmentSecret string `protobuf:"bytes,1,opt,name=establishment_secret,json=establishmentSecret,proto3" json:"establishment_secret,omitempty"`
+	// pending_stream_secret is the proposed secret ID to store as the pending stream
+	// secret for this peering.
+	PendingStreamSecret string `protobuf:"bytes,2,opt,name=pending_stream_secret,json=pendingStreamSecret,proto3" json:"pending_stream_secret,omitempty"`
+}
+
+func (x *SecretsWriteRequest_ExchangeSecretRequest) Reset() {
+	*x = SecretsWriteRequest_ExchangeSecretRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[30]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SecretsWriteRequest_ExchangeSecretRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SecretsWriteRequest_ExchangeSecretRequest) ProtoMessage() {}
+
+func (x *SecretsWriteRequest_ExchangeSecretRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[30]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SecretsWriteRequest_ExchangeSecretRequest.ProtoReflect.Descriptor instead.
+func (*SecretsWriteRequest_ExchangeSecretRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{0, 1}
+}
+
+func (x *SecretsWriteRequest_ExchangeSecretRequest) GetEstablishmentSecret() string {
+	if x != nil {
+		return x.EstablishmentSecret
+	}
+	return ""
+}
+
+func (x *SecretsWriteRequest_ExchangeSecretRequest) GetPendingStreamSecret() string {
+	if x != nil {
+		return x.PendingStreamSecret
+	}
+	return ""
+}
+
+// PromotePendingRequest encodes a request to promote a pending stream secret
+// to be an active stream secret. It is triggered when the accepting stream handler
+// validates an Open request from a peer with a pending stream secret.
+type SecretsWriteRequest_PromotePendingRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// active_stream_secret is the proposed secret ID to store as the active stream
+	// secret for this peering.
+	ActiveStreamSecret string `protobuf:"bytes,1,opt,name=active_stream_secret,json=activeStreamSecret,proto3" json:"active_stream_secret,omitempty"`
+}
+
+func (x *SecretsWriteRequest_PromotePendingRequest) Reset() {
+	*x = SecretsWriteRequest_PromotePendingRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[31]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SecretsWriteRequest_PromotePendingRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SecretsWriteRequest_PromotePendingRequest) ProtoMessage() {}
+
+func (x *SecretsWriteRequest_PromotePendingRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[31]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SecretsWriteRequest_PromotePendingRequest.ProtoReflect.Descriptor instead.
+func (*SecretsWriteRequest_PromotePendingRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{0, 2}
+}
+
+func (x *SecretsWriteRequest_PromotePendingRequest) GetActiveStreamSecret() string {
+	if x != nil {
+		return x.ActiveStreamSecret
+	}
+	return ""
+}
+
+// EstablishRequest encodes a request to persist an active stream secret.
+// It is triggered after a dialing peer exchanges their establishment secret
+// for a long-lived active stream secret.
+type SecretsWriteRequest_EstablishRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// active_stream_secret is the proposed secret ID to store as the active stream
+	// secret for this peering.
+	ActiveStreamSecret string `protobuf:"bytes,1,opt,name=active_stream_secret,json=activeStreamSecret,proto3" json:"active_stream_secret,omitempty"`
+}
+
+func (x *SecretsWriteRequest_EstablishRequest) Reset() {
+	*x = SecretsWriteRequest_EstablishRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[32]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SecretsWriteRequest_EstablishRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SecretsWriteRequest_EstablishRequest) ProtoMessage() {}
+
+func (x *SecretsWriteRequest_EstablishRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[32]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SecretsWriteRequest_EstablishRequest.ProtoReflect.Descriptor instead.
+func (*SecretsWriteRequest_EstablishRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{0, 3}
+}
+
+func (x *SecretsWriteRequest_EstablishRequest) GetActiveStreamSecret() string {
+	if x != nil {
+		return x.ActiveStreamSecret
+	}
+	return ""
+}
+
+type PeeringSecrets_Establishment struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// SecretID is the one-time-use peering establishment secret.
+	SecretID string `protobuf:"bytes,1,opt,name=SecretID,proto3" json:"SecretID,omitempty"`
+}
+
+func (x *PeeringSecrets_Establishment) Reset() {
+	*x = PeeringSecrets_Establishment{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[33]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringSecrets_Establishment) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringSecrets_Establishment) ProtoMessage() {}
+
+func (x *PeeringSecrets_Establishment) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[33]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringSecrets_Establishment.ProtoReflect.Descriptor instead.
+func (*PeeringSecrets_Establishment) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{1, 0}
+}
+
+func (x *PeeringSecrets_Establishment) GetSecretID() string {
+	if x != nil {
+		return x.SecretID
+	}
+	return ""
+}
+
+type PeeringSecrets_Stream struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// ActiveSecretID is the active UUID-v4 secret being used for authorization at
+	// the peering stream.
+	ActiveSecretID string `protobuf:"bytes,1,opt,name=ActiveSecretID,proto3" json:"ActiveSecretID,omitempty"`
+	// PendingSecretID is a UUID-v4 secret introduced during secret rotation.
+	// When a peering is established or re-established, both the active secret and
+	// pending secret are considered valid. However, once the dialing peer uses
+	// the pending secret then it transitions to active and the previously active
+	// secret is discarded.
+	//
+	// Pending secret IDs are only valid for long-lived stream secrets.
+	// Only one establishment secret can exist for a peer at a time since they
+	// are designed for one-time use.
+	PendingSecretID string `protobuf:"bytes,2,opt,name=PendingSecretID,proto3" json:"PendingSecretID,omitempty"`
+}
+
+func (x *PeeringSecrets_Stream) Reset() {
+	*x = PeeringSecrets_Stream{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeering_peering_proto_msgTypes[34]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringSecrets_Stream) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringSecrets_Stream) ProtoMessage() {}
+
+func (x *PeeringSecrets_Stream) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeering_peering_proto_msgTypes[34]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringSecrets_Stream.ProtoReflect.Descriptor instead.
+func (*PeeringSecrets_Stream) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeering_peering_proto_rawDescGZIP(), []int{1, 1}
+}
+
+func (x *PeeringSecrets_Stream) GetActiveSecretID() string {
+	if x != nil {
+		return x.ActiveSecretID
+	}
+	return ""
+}
+
+func (x *PeeringSecrets_Stream) GetPendingSecretID() string {
+	if x != nil {
+		return x.PendingSecretID
+	}
+	return ""
+}
+
+var File_proto_pbpeering_peering_proto protoreflect.FileDescriptor
+
+var file_proto_pbpeering_peering_proto_rawDesc = []byte{
+	0x0a, 0x1d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e,
+	0x67, 0x2f, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
+	0x21, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69,
+	0x6e, 0x67, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x1a, 0x32, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69,
+	0x63, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61,
+	0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69,
+	0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe5, 0x06, 0x0a, 0x13, 0x53, 0x65, 0x63, 0x72,
+	0x65, 0x74, 0x73, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x16, 0x0a, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x12, 0x74, 0x0a, 0x0e, 0x67, 0x65, 0x6e, 0x65, 0x72,
+	0x61, 0x74, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x4b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72,
+	0x69, 0x6e, 0x67, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x57, 0x72, 0x69, 0x74, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0d,
+	0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x77, 0x0a,
+	0x0f, 0x65, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65,
+	0x74, 0x73, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x45,
+	0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0e, 0x65, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65,
+	0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x77, 0x0a, 0x0f, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74,
+	0x65, 0x5f, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x4c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72,
+	0x69, 0x6e, 0x67, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x57, 0x72, 0x69, 0x74, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x50,
+	0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52,
+	0x0e, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x12,
+	0x67, 0x0a, 0x09, 0x65, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x47, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70,
+	0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x57, 0x72,
+	0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x45, 0x73, 0x74, 0x61, 0x62,
+	0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x65,
+	0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x1a, 0x49, 0x0a, 0x14, 0x47, 0x65, 0x6e, 0x65,
+	0x72, 0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x31, 0x0a, 0x14, 0x65, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65, 0x6e,
+	0x74, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13,
+	0x65, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x63,
+	0x72, 0x65, 0x74, 0x1a, 0x7e, 0x0a, 0x15, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53,
+	0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x31, 0x0a, 0x14,
+	0x65, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x65,
+	0x63, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x65, 0x73, 0x74, 0x61,
+	0x62, 0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12,
+	0x32, 0x0a, 0x15, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61,
+	0x6d, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13,
+	0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x65, 0x63,
+	0x72, 0x65, 0x74, 0x1a, 0x49, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x50, 0x65,
+	0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x30, 0x0a, 0x14,
+	0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x73, 0x65,
+	0x63, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x61, 0x63, 0x74, 0x69,
+	0x76, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x1a, 0x44,
+	0x0a, 0x10, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x30, 0x0a, 0x14, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x73, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x12, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x65,
+	0x63, 0x72, 0x65, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22,
+	0xea, 0x02, 0x0a, 0x0e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x63, 0x72, 0x65,
+	0x74, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x12, 0x65, 0x0a, 0x0d, 0x65, 0x73,
+	0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x3f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65,
+	0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x63,
+	0x72, 0x65, 0x74, 0x73, 0x2e, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65,
+	0x6e, 0x74, 0x52, 0x0d, 0x65, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65, 0x6e,
+	0x74, 0x12, 0x50, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65,
+	0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x63,
+	0x72, 0x65, 0x74, 0x73, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x06, 0x73, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x1a, 0x2b, 0x0a, 0x0d, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68,
+	0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x49, 0x44,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x49, 0x44,
+	0x1a, 0x5a, 0x0a, 0x06, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x41, 0x63,
+	0x74, 0x69, 0x76, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74,
+	0x49, 0x44, 0x12, 0x28, 0x0a, 0x0f, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x63,
+	0x72, 0x65, 0x74, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x50, 0x65, 0x6e,
+	0x64, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x49, 0x44, 0x22, 0xf7, 0x05, 0x0a,
+	0x07, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09,
+	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x09, 0x44, 0x65,
+	0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x64, 0x41, 0x74, 0x12, 0x48, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x05, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70,
+	0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x4d,
+	0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x45,
+	0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2f, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e,
+	0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05,
+	0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x12, 0x1e, 0x0a,
+	0x0a, 0x50, 0x65, 0x65, 0x72, 0x43, 0x41, 0x50, 0x65, 0x6d, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x0a, 0x50, 0x65, 0x65, 0x72, 0x43, 0x41, 0x50, 0x65, 0x6d, 0x73, 0x12, 0x26, 0x0a,
+	0x0e, 0x50, 0x65, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18,
+	0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x50, 0x65, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x65,
+	0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x30, 0x0a, 0x13, 0x50, 0x65, 0x65, 0x72, 0x53, 0x65, 0x72,
+	0x76, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x13, 0x50, 0x65, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x41, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x53, 0x0a, 0x0c, 0x53, 0x74, 0x72, 0x65, 0x61,
+	0x6d, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e,
+	0x67, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x0c,
+	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x20, 0x0a, 0x0b,
+	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x0b, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x20,
+	0x0a, 0x0b, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x0c, 0x20,
+	0x01, 0x28, 0x04, 0x52, 0x0b, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x64, 0x65, 0x78,
+	0x12, 0x45, 0x0a, 0x06, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65,
+	0x72, 0x69, 0x6e, 0x67, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x06, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x12, 0x34, 0x0a, 0x15, 0x4d, 0x61, 0x6e, 0x75, 0x61,
+	0x6c, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73,
+	0x18, 0x12, 0x20, 0x03, 0x28, 0x09, 0x52, 0x15, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x53, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x1a, 0x37, 0x0a,
+	0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x4a, 0x0a, 0x0a, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65,
+	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74,
+	0x65, 0x72, 0x22, 0x9e, 0x02, 0x0a, 0x0c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x49,
+	0x6d, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12,
+	0x2a, 0x0a, 0x10, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x45, 0x78, 0x70, 0x6f, 0x72,
+	0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x40, 0x0a, 0x0d, 0x4c,
+	0x61, 0x73, 0x74, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0d,
+	0x4c, 0x61, 0x73, 0x74, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x12, 0x3c, 0x0a,
+	0x0b, 0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0b,
+	0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x12, 0x36, 0x0a, 0x08, 0x4c,
+	0x61, 0x73, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x08, 0x4c, 0x61, 0x73, 0x74, 0x53,
+	0x65, 0x6e, 0x64, 0x22, 0xfe, 0x01, 0x0a, 0x12, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54,
+	0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x54, 0x72,
+	0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0b, 0x54, 0x72, 0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08,
+	0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72,
+	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x74, 0x50, 0x45,
+	0x4d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x52, 0x6f, 0x6f, 0x74, 0x50, 0x45,
+	0x4d, 0x73, 0x12, 0x2c, 0x0a, 0x11, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x61,
+	0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x45,
+	0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x20, 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x64,
+	0x65, 0x78, 0x12, 0x20, 0x0a, 0x0b, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x64, 0x65,
+	0x78, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49,
+	0x6e, 0x64, 0x65, 0x78, 0x22, 0x36, 0x0a, 0x16, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x53,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x1c,
+	0x0a, 0x09, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x09, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x22, 0x46, 0x0a, 0x12,
+	0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x22, 0x5b, 0x0a, 0x13, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x52,
+	0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44, 0x0a, 0x07, 0x50,
+	0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
+	0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e,
+	0x67, 0x22, 0x32, 0x0a, 0x12, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x73, 0x74,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x84, 0x01, 0x0a, 0x13, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e,
+	0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x46, 0x0a,
+	0x08, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72,
+	0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x08, 0x50, 0x65, 0x65,
+	0x72, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x4f, 0x42, 0x53, 0x4f, 0x4c, 0x45, 0x54,
+	0x45, 0x5f, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x4f,
+	0x42, 0x53, 0x4f, 0x4c, 0x45, 0x54, 0x45, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x22, 0xca, 0x02, 0x0a,
+	0x13, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x44, 0x0a, 0x07, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e,
+	0x67, 0x52, 0x07, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x5e, 0x0a, 0x0e, 0x53, 0x65,
+	0x63, 0x72, 0x65, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70,
+	0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x57, 0x72,
+	0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0e, 0x53, 0x65, 0x63, 0x72,
+	0x65, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x54, 0x0a, 0x04, 0x4d, 0x65,
+	0x74, 0x61, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65,
+	0x72, 0x69, 0x6e, 0x67, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61,
+	0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x65, 0x65,
+	0x72, 0x69, 0x6e, 0x67, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x48, 0x0a, 0x14, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a,
+	0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x17, 0x0a, 0x15, 0x50,
+	0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x93, 0x01, 0x0a, 0x1f, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75,
+	0x6e, 0x64, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x4e, 0x61,
+	0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x4e,
+	0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72,
+	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x22, 0x9a, 0x01, 0x0a, 0x20, 0x54,
+	0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x25, 0x0a, 0x0e, 0x4f, 0x42, 0x53, 0x4f, 0x4c, 0x45, 0x54, 0x45, 0x5f, 0x49, 0x6e, 0x64, 0x65,
+	0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x4f, 0x42, 0x53, 0x4f, 0x4c, 0x45, 0x54,
+	0x45, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x4f, 0x0a, 0x07, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65,
+	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72,
+	0x69, 0x6e, 0x67, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x07,
+	0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x73, 0x22, 0x4a, 0x0a, 0x16, 0x54, 0x72, 0x75, 0x73, 0x74,
+	0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x22, 0x8f, 0x01, 0x0a, 0x17, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e,
+	0x64, 0x6c, 0x65, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x25, 0x0a, 0x0e, 0x4f, 0x42, 0x53, 0x4f, 0x4c, 0x45, 0x54, 0x45, 0x5f, 0x49, 0x6e, 0x64, 0x65,
+	0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x4f, 0x42, 0x53, 0x4f, 0x4c, 0x45, 0x54,
+	0x45, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x4d, 0x0a, 0x06, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69,
+	0x6e, 0x67, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x06, 0x42,
+	0x75, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x2d, 0x0a, 0x1b, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
+	0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x42, 0x79, 0x49, 0x44, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x02, 0x49, 0x44, 0x22, 0x1e, 0x0a, 0x1c, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54,
+	0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x42, 0x79, 0x49, 0x44, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x87, 0x01, 0x0a, 0x1e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
+	0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x57, 0x72, 0x69, 0x74, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x65, 0x0a, 0x12, 0x50, 0x65, 0x65, 0x72, 0x69,
+	0x6e, 0x67, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54,
+	0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x12, 0x50, 0x65, 0x65, 0x72,
+	0x69, 0x6e, 0x67, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x21,
+	0x0a, 0x1f, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75,
+	0x6e, 0x64, 0x6c, 0x65, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x53, 0x0a, 0x1f, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x72, 0x75, 0x73,
+	0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72,
+	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x22, 0x0a, 0x20, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e,
+	0x67, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x9a, 0x02, 0x0a, 0x14, 0x47,
+	0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+	0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x55, 0x0a,
+	0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e,
+	0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04,
+	0x4d, 0x65, 0x74, 0x61, 0x12, 0x38, 0x0a, 0x17, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x45, 0x78,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18,
+	0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x17, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x45, 0x78, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x1a, 0x37,
+	0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3b, 0x0a, 0x15, 0x47, 0x65, 0x6e, 0x65, 0x72,
+	0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x22, 0x0a, 0x0c, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54,
+	0x6f, 0x6b, 0x65, 0x6e, 0x22, 0xfc, 0x01, 0x0a, 0x10, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69,
+	0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x65, 0x65,
+	0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x65, 0x65,
+	0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x50, 0x65, 0x65,
+	0x72, 0x69, 0x6e, 0x67, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72,
+	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61,
+	0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x51, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18,
+	0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c,
+	0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65,
+	0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x02, 0x38, 0x01, 0x22, 0x13, 0x0a, 0x11, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x73, 0x0a, 0x0c, 0x50, 0x65, 0x65, 0x72,
+	0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x55, 0x4e, 0x44, 0x45,
+	0x46, 0x49, 0x4e, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x45, 0x4e, 0x44, 0x49,
+	0x4e, 0x47, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x45, 0x53, 0x54, 0x41, 0x42, 0x4c, 0x49, 0x53,
+	0x48, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x41, 0x43, 0x54, 0x49, 0x56, 0x45,
+	0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x46, 0x41, 0x49, 0x4c, 0x49, 0x4e, 0x47, 0x10, 0x04, 0x12,
+	0x0c, 0x0a, 0x08, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x49, 0x4e, 0x47, 0x10, 0x05, 0x12, 0x0e, 0x0a,
+	0x0a, 0x54, 0x45, 0x52, 0x4d, 0x49, 0x4e, 0x41, 0x54, 0x45, 0x44, 0x10, 0x06, 0x32, 0x83, 0x09,
+	0x0a, 0x0e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x12, 0x8a, 0x01, 0x0a, 0x0d, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b,
+	0x65, 0x6e, 0x12, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70,
+	0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x54,
+	0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x38, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e,
+	0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08, 0x03, 0x12, 0x7e, 0x0a,
+	0x09, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x12, 0x33, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x45,
+	0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72,
+	0x69, 0x6e, 0x67, 0x2e, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08, 0x03, 0x12, 0x84, 0x01,
+	0x0a, 0x0b, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x61, 0x64, 0x12, 0x35, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e,
+	0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
+	0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xe2, 0x86,
+	0x04, 0x02, 0x08, 0x02, 0x12, 0x84, 0x01, 0x0a, 0x0b, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
+	0x4c, 0x69, 0x73, 0x74, 0x12, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
+	0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x36, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e,
+	0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08, 0x02, 0x12, 0x8a, 0x01, 0x0a, 0x0d,
+	0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x37, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e,
+	0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69,
+	0x6e, 0x67, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08, 0x03, 0x12, 0x87, 0x01, 0x0a, 0x0c, 0x50, 0x65, 0x65,
+	0x72, 0x69, 0x6e, 0x67, 0x57, 0x72, 0x69, 0x74, 0x65, 0x12, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65,
+	0x65, 0x72, 0x69, 0x6e, 0x67, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65,
+	0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x57, 0x72, 0x69,
+	0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02,
+	0x08, 0x03, 0x12, 0xab, 0x01, 0x0a, 0x18, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64,
+	0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12,
+	0x42, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72,
+	0x69, 0x6e, 0x67, 0x2e, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x4c,
+	0x69, 0x73, 0x74, 0x42, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x43, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e,
+	0x64, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08, 0x02,
+	0x12, 0x90, 0x01, 0x0a, 0x0f, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65,
+	0x52, 0x65, 0x61, 0x64, 0x12, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75,
+	0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72,
+	0x69, 0x6e, 0x67, 0x2e, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52,
+	0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xe2, 0x86, 0x04,
+	0x02, 0x08, 0x02, 0x42, 0x8a, 0x02, 0x0a, 0x25, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x42, 0x0c, 0x50,
+	0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2b, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2f, 0x70, 0x62, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49,
+	0x50, 0xaa, 0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x50, 0x65,
+	0x65, 0x72, 0x69, 0x6e, 0x67, 0xca, 0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x5c, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0xe2, 0x02, 0x2d, 0x48, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x5c, 0x47, 0x50,
+	0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x24, 0x48, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_pbpeering_peering_proto_rawDescOnce sync.Once
+	file_proto_pbpeering_peering_proto_rawDescData = file_proto_pbpeering_peering_proto_rawDesc
+)
+
+func file_proto_pbpeering_peering_proto_rawDescGZIP() []byte {
+	file_proto_pbpeering_peering_proto_rawDescOnce.Do(func() {
+		file_proto_pbpeering_peering_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbpeering_peering_proto_rawDescData)
+	})
+	return file_proto_pbpeering_peering_proto_rawDescData
+}
+
+var file_proto_pbpeering_peering_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_proto_pbpeering_peering_proto_msgTypes = make([]protoimpl.MessageInfo, 39)
+var file_proto_pbpeering_peering_proto_goTypes = []interface{}{
+	(PeeringState)(0),                                 // 0: hashicorp.consul.internal.peering.PeeringState
+	(*SecretsWriteRequest)(nil),                       // 1: hashicorp.consul.internal.peering.SecretsWriteRequest
+	(*PeeringSecrets)(nil),                            // 2: hashicorp.consul.internal.peering.PeeringSecrets
+	(*Peering)(nil),                                   // 3: hashicorp.consul.internal.peering.Peering
+	(*RemoteInfo)(nil),                                // 4: hashicorp.consul.internal.peering.RemoteInfo
+	(*StreamStatus)(nil),                              // 5: hashicorp.consul.internal.peering.StreamStatus
+	(*PeeringTrustBundle)(nil),                        // 6: hashicorp.consul.internal.peering.PeeringTrustBundle
+	(*PeeringServerAddresses)(nil),                    // 7: hashicorp.consul.internal.peering.PeeringServerAddresses
+	(*PeeringReadRequest)(nil),                        // 8: hashicorp.consul.internal.peering.PeeringReadRequest
+	(*PeeringReadResponse)(nil),                       // 9: hashicorp.consul.internal.peering.PeeringReadResponse
+	(*PeeringListRequest)(nil),                        // 10: hashicorp.consul.internal.peering.PeeringListRequest
+	(*PeeringListResponse)(nil),                       // 11: hashicorp.consul.internal.peering.PeeringListResponse
+	(*PeeringWriteRequest)(nil),                       // 12: hashicorp.consul.internal.peering.PeeringWriteRequest
+	(*PeeringWriteResponse)(nil),                      // 13: hashicorp.consul.internal.peering.PeeringWriteResponse
+	(*PeeringDeleteRequest)(nil),                      // 14: hashicorp.consul.internal.peering.PeeringDeleteRequest
+	(*PeeringDeleteResponse)(nil),                     // 15: hashicorp.consul.internal.peering.PeeringDeleteResponse
+	(*TrustBundleListByServiceRequest)(nil),           // 16: hashicorp.consul.internal.peering.TrustBundleListByServiceRequest
+	(*TrustBundleListByServiceResponse)(nil),          // 17: hashicorp.consul.internal.peering.TrustBundleListByServiceResponse
+	(*TrustBundleReadRequest)(nil),                    // 18: hashicorp.consul.internal.peering.TrustBundleReadRequest
+	(*TrustBundleReadResponse)(nil),                   // 19: hashicorp.consul.internal.peering.TrustBundleReadResponse
+	(*PeeringTerminateByIDRequest)(nil),               // 20: hashicorp.consul.internal.peering.PeeringTerminateByIDRequest
+	(*PeeringTerminateByIDResponse)(nil),              // 21: hashicorp.consul.internal.peering.PeeringTerminateByIDResponse
+	(*PeeringTrustBundleWriteRequest)(nil),            // 22: hashicorp.consul.internal.peering.PeeringTrustBundleWriteRequest
+	(*PeeringTrustBundleWriteResponse)(nil),           // 23: hashicorp.consul.internal.peering.PeeringTrustBundleWriteResponse
+	(*PeeringTrustBundleDeleteRequest)(nil),           // 24: hashicorp.consul.internal.peering.PeeringTrustBundleDeleteRequest
+	(*PeeringTrustBundleDeleteResponse)(nil),          // 25: hashicorp.consul.internal.peering.PeeringTrustBundleDeleteResponse
+	(*GenerateTokenRequest)(nil),                      // 26: hashicorp.consul.internal.peering.GenerateTokenRequest
+	(*GenerateTokenResponse)(nil),                     // 27: hashicorp.consul.internal.peering.GenerateTokenResponse
+	(*EstablishRequest)(nil),                          // 28: hashicorp.consul.internal.peering.EstablishRequest
+	(*EstablishResponse)(nil),                         // 29: hashicorp.consul.internal.peering.EstablishResponse
+	(*SecretsWriteRequest_GenerateTokenRequest)(nil),  // 30: hashicorp.consul.internal.peering.SecretsWriteRequest.GenerateTokenRequest
+	(*SecretsWriteRequest_ExchangeSecretRequest)(nil), // 31: hashicorp.consul.internal.peering.SecretsWriteRequest.ExchangeSecretRequest
+	(*SecretsWriteRequest_PromotePendingRequest)(nil), // 32: hashicorp.consul.internal.peering.SecretsWriteRequest.PromotePendingRequest
+	(*SecretsWriteRequest_EstablishRequest)(nil),      // 33: hashicorp.consul.internal.peering.SecretsWriteRequest.EstablishRequest
+	(*PeeringSecrets_Establishment)(nil),              // 34: hashicorp.consul.internal.peering.PeeringSecrets.Establishment
+	(*PeeringSecrets_Stream)(nil),                     // 35: hashicorp.consul.internal.peering.PeeringSecrets.Stream
+	nil,                                               // 36: hashicorp.consul.internal.peering.Peering.MetaEntry
+	nil,                                               // 37: hashicorp.consul.internal.peering.PeeringWriteRequest.MetaEntry
+	nil,                                               // 38: hashicorp.consul.internal.peering.GenerateTokenRequest.MetaEntry
+	nil,                                               // 39: hashicorp.consul.internal.peering.EstablishRequest.MetaEntry
+	(*timestamppb.Timestamp)(nil),                     // 40: google.protobuf.Timestamp
+}
+var file_proto_pbpeering_peering_proto_depIdxs = []int32{
+	30, // 0: hashicorp.consul.internal.peering.SecretsWriteRequest.generate_token:type_name -> hashicorp.consul.internal.peering.SecretsWriteRequest.GenerateTokenRequest
+	31, // 1: hashicorp.consul.internal.peering.SecretsWriteRequest.exchange_secret:type_name -> hashicorp.consul.internal.peering.SecretsWriteRequest.ExchangeSecretRequest
+	32, // 2: hashicorp.consul.internal.peering.SecretsWriteRequest.promote_pending:type_name -> hashicorp.consul.internal.peering.SecretsWriteRequest.PromotePendingRequest
+	33, // 3: hashicorp.consul.internal.peering.SecretsWriteRequest.establish:type_name -> hashicorp.consul.internal.peering.SecretsWriteRequest.EstablishRequest
+	34, // 4: hashicorp.consul.internal.peering.PeeringSecrets.establishment:type_name -> hashicorp.consul.internal.peering.PeeringSecrets.Establishment
+	35, // 5: hashicorp.consul.internal.peering.PeeringSecrets.stream:type_name -> hashicorp.consul.internal.peering.PeeringSecrets.Stream
+	40, // 6: hashicorp.consul.internal.peering.Peering.DeletedAt:type_name -> google.protobuf.Timestamp
+	36, // 7: hashicorp.consul.internal.peering.Peering.Meta:type_name -> hashicorp.consul.internal.peering.Peering.MetaEntry
+	0,  // 8: hashicorp.consul.internal.peering.Peering.State:type_name -> hashicorp.consul.internal.peering.PeeringState
+	5,  // 9: hashicorp.consul.internal.peering.Peering.StreamStatus:type_name -> hashicorp.consul.internal.peering.StreamStatus
+	4,  // 10: hashicorp.consul.internal.peering.Peering.Remote:type_name -> hashicorp.consul.internal.peering.RemoteInfo
+	40, // 11: hashicorp.consul.internal.peering.StreamStatus.LastHeartbeat:type_name -> google.protobuf.Timestamp
+	40, // 12: hashicorp.consul.internal.peering.StreamStatus.LastReceive:type_name -> google.protobuf.Timestamp
+	40, // 13: hashicorp.consul.internal.peering.StreamStatus.LastSend:type_name -> google.protobuf.Timestamp
+	3,  // 14: hashicorp.consul.internal.peering.PeeringReadResponse.Peering:type_name -> hashicorp.consul.internal.peering.Peering
+	3,  // 15: hashicorp.consul.internal.peering.PeeringListResponse.Peerings:type_name -> hashicorp.consul.internal.peering.Peering
+	3,  // 16: hashicorp.consul.internal.peering.PeeringWriteRequest.Peering:type_name -> hashicorp.consul.internal.peering.Peering
+	1,  // 17: hashicorp.consul.internal.peering.PeeringWriteRequest.SecretsRequest:type_name -> hashicorp.consul.internal.peering.SecretsWriteRequest
+	37, // 18: hashicorp.consul.internal.peering.PeeringWriteRequest.Meta:type_name -> hashicorp.consul.internal.peering.PeeringWriteRequest.MetaEntry
+	6,  // 19: hashicorp.consul.internal.peering.TrustBundleListByServiceResponse.Bundles:type_name -> hashicorp.consul.internal.peering.PeeringTrustBundle
+	6,  // 20: hashicorp.consul.internal.peering.TrustBundleReadResponse.Bundle:type_name -> hashicorp.consul.internal.peering.PeeringTrustBundle
+	6,  // 21: hashicorp.consul.internal.peering.PeeringTrustBundleWriteRequest.PeeringTrustBundle:type_name -> hashicorp.consul.internal.peering.PeeringTrustBundle
+	38, // 22: hashicorp.consul.internal.peering.GenerateTokenRequest.Meta:type_name -> hashicorp.consul.internal.peering.GenerateTokenRequest.MetaEntry
+	39, // 23: hashicorp.consul.internal.peering.EstablishRequest.Meta:type_name -> hashicorp.consul.internal.peering.EstablishRequest.MetaEntry
+	26, // 24: hashicorp.consul.internal.peering.PeeringService.GenerateToken:input_type -> hashicorp.consul.internal.peering.GenerateTokenRequest
+	28, // 25: hashicorp.consul.internal.peering.PeeringService.Establish:input_type -> hashicorp.consul.internal.peering.EstablishRequest
+	8,  // 26: hashicorp.consul.internal.peering.PeeringService.PeeringRead:input_type -> hashicorp.consul.internal.peering.PeeringReadRequest
+	10, // 27: hashicorp.consul.internal.peering.PeeringService.PeeringList:input_type -> hashicorp.consul.internal.peering.PeeringListRequest
+	14, // 28: hashicorp.consul.internal.peering.PeeringService.PeeringDelete:input_type -> hashicorp.consul.internal.peering.PeeringDeleteRequest
+	12, // 29: hashicorp.consul.internal.peering.PeeringService.PeeringWrite:input_type -> hashicorp.consul.internal.peering.PeeringWriteRequest
+	16, // 30: hashicorp.consul.internal.peering.PeeringService.TrustBundleListByService:input_type -> hashicorp.consul.internal.peering.TrustBundleListByServiceRequest
+	18, // 31: hashicorp.consul.internal.peering.PeeringService.TrustBundleRead:input_type -> hashicorp.consul.internal.peering.TrustBundleReadRequest
+	27, // 32: hashicorp.consul.internal.peering.PeeringService.GenerateToken:output_type -> hashicorp.consul.internal.peering.GenerateTokenResponse
+	29, // 33: hashicorp.consul.internal.peering.PeeringService.Establish:output_type -> hashicorp.consul.internal.peering.EstablishResponse
+	9,  // 34: hashicorp.consul.internal.peering.PeeringService.PeeringRead:output_type -> hashicorp.consul.internal.peering.PeeringReadResponse
+	11, // 35: hashicorp.consul.internal.peering.PeeringService.PeeringList:output_type -> hashicorp.consul.internal.peering.PeeringListResponse
+	15, // 36: hashicorp.consul.internal.peering.PeeringService.PeeringDelete:output_type -> hashicorp.consul.internal.peering.PeeringDeleteResponse
+	13, // 37: hashicorp.consul.internal.peering.PeeringService.PeeringWrite:output_type -> hashicorp.consul.internal.peering.PeeringWriteResponse
+	17, // 38: hashicorp.consul.internal.peering.PeeringService.TrustBundleListByService:output_type -> hashicorp.consul.internal.peering.TrustBundleListByServiceResponse
+	19, // 39: hashicorp.consul.internal.peering.PeeringService.TrustBundleRead:output_type -> hashicorp.consul.internal.peering.TrustBundleReadResponse
+	32, // [32:40] is the sub-list for method output_type
+	24, // [24:32] is the sub-list for method input_type
+	24, // [24:24] is the sub-list for extension type_name
+	24, // [24:24] is the sub-list for extension extendee
+	0,  // [0:24] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbpeering_peering_proto_init() }
+func file_proto_pbpeering_peering_proto_init() {
+	if File_proto_pbpeering_peering_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbpeering_peering_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SecretsWriteRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringSecrets); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Peering); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RemoteInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*StreamStatus); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringTrustBundle); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringServerAddresses); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringReadRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringReadResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringListRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringListResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringWriteRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringWriteResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringDeleteRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringDeleteResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TrustBundleListByServiceRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TrustBundleListByServiceResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TrustBundleReadRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TrustBundleReadResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringTerminateByIDRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringTerminateByIDResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringTrustBundleWriteRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringTrustBundleWriteResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringTrustBundleDeleteRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringTrustBundleDeleteResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GenerateTokenRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GenerateTokenResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EstablishRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EstablishResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SecretsWriteRequest_GenerateTokenRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SecretsWriteRequest_ExchangeSecretRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SecretsWriteRequest_PromotePendingRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SecretsWriteRequest_EstablishRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringSecrets_Establishment); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeering_peering_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringSecrets_Stream); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	file_proto_pbpeering_peering_proto_msgTypes[0].OneofWrappers = []interface{}{
+		(*SecretsWriteRequest_GenerateToken)(nil),
+		(*SecretsWriteRequest_ExchangeSecret)(nil),
+		(*SecretsWriteRequest_PromotePending)(nil),
+		(*SecretsWriteRequest_Establish)(nil),
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbpeering_peering_proto_rawDesc,
+			NumEnums:      1,
+			NumMessages:   39,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_proto_pbpeering_peering_proto_goTypes,
+		DependencyIndexes: file_proto_pbpeering_peering_proto_depIdxs,
+		EnumInfos:         file_proto_pbpeering_peering_proto_enumTypes,
+		MessageInfos:      file_proto_pbpeering_peering_proto_msgTypes,
+	}.Build()
+	File_proto_pbpeering_peering_proto = out.File
+	file_proto_pbpeering_peering_proto_rawDesc = nil
+	file_proto_pbpeering_peering_proto_goTypes = nil
+	file_proto_pbpeering_peering_proto_depIdxs = nil
+}
diff --git a/proto/private/pbpeering/peering.proto b/proto/pbpeering/peering.proto
similarity index 94%
rename from proto/private/pbpeering/peering.proto
rename to proto/pbpeering/peering.proto
index 02fddbf17fea4..9df06710e3590 100644
--- a/proto/private/pbpeering/peering.proto
+++ b/proto/pbpeering/peering.proto
@@ -1,13 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 syntax = "proto3";
 
 package hashicorp.consul.internal.peering;
 
-import "annotations/ratelimit/ratelimit.proto";
 import "google/protobuf/timestamp.proto";
-import "private/pbcommon/common.proto";
+import "proto-public/annotations/ratelimit/ratelimit.proto";
 
 // PeeringService handles operations for establishing peering relationships
 // between disparate Consul clusters.
@@ -15,35 +11,30 @@ service PeeringService {
   rpc GenerateToken(GenerateTokenRequest) returns (GenerateTokenResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_WRITE,
-      operation_category: OPERATION_CATEGORY_PEERING
     };
   }
 
   rpc Establish(EstablishRequest) returns (EstablishResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_WRITE,
-      operation_category: OPERATION_CATEGORY_PEERING
     };
   }
 
   rpc PeeringRead(PeeringReadRequest) returns (PeeringReadResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_PEERING
     };
   }
 
   rpc PeeringList(PeeringListRequest) returns (PeeringListResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_PEERING
     };
   }
 
   rpc PeeringDelete(PeeringDeleteRequest) returns (PeeringDeleteResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_WRITE,
-      operation_category: OPERATION_CATEGORY_PEERING
     };
   }
 
@@ -52,7 +43,6 @@ service PeeringService {
   rpc PeeringWrite(PeeringWriteRequest) returns (PeeringWriteResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_WRITE,
-      operation_category: OPERATION_CATEGORY_PEERING
     };
   }
 
@@ -60,14 +50,12 @@ service PeeringService {
   rpc TrustBundleListByService(TrustBundleListByServiceRequest) returns (TrustBundleListByServiceResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_PEERING
     };
   }
 
   rpc TrustBundleRead(TrustBundleReadRequest) returns (TrustBundleReadResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_PEERING
     };
   }
 }
@@ -229,7 +217,7 @@ message Peering {
   // PeerServerName is the name of the remote server as it relates to TLS.
   string PeerServerName = 9;
 
-  // PeerServerAddresses contains all the connection addresses for the remote peer.
+  // PeerServerAddresses contains all the the connection addresses for the remote peer.
   repeated string PeerServerAddresses = 10;
 
   // StreamStatus contains information computed on read based on the state of the stream.
@@ -265,10 +253,6 @@ message RemoteInfo {
   string Partition = 1;
   // Datacenter is the remote peer's datacenter.
   string Datacenter = 2;
-
-  // Locality identifies where the peer is running.
-  // mog: func-to=LocalityToAPI func-from=LocalityFromAPI
-  common.Locality Locality = 3;
 }
 
 // StreamStatus represents information about an active peering stream.
diff --git a/proto/private/pbpeering/peering_ce.go b/proto/pbpeering/peering_ce.go
similarity index 78%
rename from proto/private/pbpeering/peering_ce.go
rename to proto/pbpeering/peering_ce.go
index 30890d859106f..d5e5b4a89613f 100644
--- a/proto/private/pbpeering/peering_ce.go
+++ b/proto/pbpeering/peering_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package pbpeering
 
diff --git a/proto/private/pbpeering/peering_grpc.pb.go b/proto/pbpeering/peering_grpc.pb.go
similarity index 99%
rename from proto/private/pbpeering/peering_grpc.pb.go
rename to proto/pbpeering/peering_grpc.pb.go
index a879f3e00fccc..0eb3c734a82c7 100644
--- a/proto/private/pbpeering/peering_grpc.pb.go
+++ b/proto/pbpeering/peering_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             (unknown)
-// source: private/pbpeering/peering.proto
+// source: proto/pbpeering/peering.proto
 
 package pbpeering
 
@@ -357,5 +357,5 @@ var PeeringService_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "private/pbpeering/peering.proto",
+	Metadata: "proto/pbpeering/peering.proto",
 }
diff --git a/proto/pbpeerstream/convert.go b/proto/pbpeerstream/convert.go
new file mode 100644
index 0000000000000..67ddb636fd922
--- /dev/null
+++ b/proto/pbpeerstream/convert.go
@@ -0,0 +1,37 @@
+package pbpeerstream
+
+import (
+	"fmt"
+
+	"github.com/hashicorp/consul/agent/structs"
+	pbservice "github.com/hashicorp/consul/proto/pbservice"
+)
+
+// CheckServiceNodesToStruct converts the contained CheckServiceNodes to their structs equivalent.
+func (s *ExportedService) CheckServiceNodesToStruct() ([]structs.CheckServiceNode, error) {
+	if s == nil {
+		return nil, nil
+	}
+
+	resp := make([]structs.CheckServiceNode, 0, len(s.Nodes))
+	for _, pb := range s.Nodes {
+		instance, err := pbservice.CheckServiceNodeToStructs(pb)
+		if err != nil {
+			return resp, fmt.Errorf("failed to convert instance: %w", err)
+		}
+		resp = append(resp, *instance)
+	}
+	return resp, nil
+}
+
+func ExportedServiceListFromStruct(e *structs.ExportedServiceList) *ExportedServiceList {
+	services := make([]string, 0, len(e.Services))
+
+	for _, s := range e.Services {
+		services = append(services, s.String())
+	}
+
+	return &ExportedServiceList{
+		Services: services,
+	}
+}
diff --git a/proto/pbpeerstream/peerstream.go b/proto/pbpeerstream/peerstream.go
new file mode 100644
index 0000000000000..00bd690ae19b9
--- /dev/null
+++ b/proto/pbpeerstream/peerstream.go
@@ -0,0 +1,5 @@
+package pbpeerstream
+
+func (x Operation) GoString() string {
+	return x.String()
+}
diff --git a/proto/private/pbpeerstream/peerstream.pb.binary.go b/proto/pbpeerstream/peerstream.pb.binary.go
similarity index 98%
rename from proto/private/pbpeerstream/peerstream.pb.binary.go
rename to proto/pbpeerstream/peerstream.pb.binary.go
index 98ccfee2f92fd..87c4e7bec6f79 100644
--- a/proto/private/pbpeerstream/peerstream.pb.binary.go
+++ b/proto/pbpeerstream/peerstream.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbpeerstream/peerstream.proto
+// source: proto/pbpeerstream/peerstream.proto
 
 package pbpeerstream
 
diff --git a/proto/pbpeerstream/peerstream.pb.go b/proto/pbpeerstream/peerstream.pb.go
new file mode 100644
index 0000000000000..87c79ea343b31
--- /dev/null
+++ b/proto/pbpeerstream/peerstream.pb.go
@@ -0,0 +1,1139 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: proto/pbpeerstream/peerstream.proto
+
+package pbpeerstream
+
+import (
+	_ "github.com/hashicorp/consul/proto-public/annotations/ratelimit"
+	pbpeering "github.com/hashicorp/consul/proto/pbpeering"
+	pbservice "github.com/hashicorp/consul/proto/pbservice"
+	pbstatus "github.com/hashicorp/consul/proto/pbstatus"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	anypb "google.golang.org/protobuf/types/known/anypb"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// Operation enumerates supported operations for replicated resources.
+type Operation int32
+
+const (
+	Operation_OPERATION_UNSPECIFIED Operation = 0
+	// UPSERT represents a create or update event.
+	Operation_OPERATION_UPSERT Operation = 1
+)
+
+// Enum value maps for Operation.
+var (
+	Operation_name = map[int32]string{
+		0: "OPERATION_UNSPECIFIED",
+		1: "OPERATION_UPSERT",
+	}
+	Operation_value = map[string]int32{
+		"OPERATION_UNSPECIFIED": 0,
+		"OPERATION_UPSERT":      1,
+	}
+)
+
+func (x Operation) Enum() *Operation {
+	p := new(Operation)
+	*p = x
+	return p
+}
+
+func (x Operation) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (Operation) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbpeerstream_peerstream_proto_enumTypes[0].Descriptor()
+}
+
+func (Operation) Type() protoreflect.EnumType {
+	return &file_proto_pbpeerstream_peerstream_proto_enumTypes[0]
+}
+
+func (x Operation) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use Operation.Descriptor instead.
+func (Operation) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{0}
+}
+
+type ReplicationMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Types that are assignable to Payload:
+	//
+	//	*ReplicationMessage_Open_
+	//	*ReplicationMessage_Request_
+	//	*ReplicationMessage_Response_
+	//	*ReplicationMessage_Terminated_
+	//	*ReplicationMessage_Heartbeat_
+	Payload isReplicationMessage_Payload `protobuf_oneof:"Payload"`
+}
+
+func (x *ReplicationMessage) Reset() {
+	*x = ReplicationMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ReplicationMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ReplicationMessage) ProtoMessage() {}
+
+func (x *ReplicationMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ReplicationMessage.ProtoReflect.Descriptor instead.
+func (*ReplicationMessage) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{0}
+}
+
+func (m *ReplicationMessage) GetPayload() isReplicationMessage_Payload {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+func (x *ReplicationMessage) GetOpen() *ReplicationMessage_Open {
+	if x, ok := x.GetPayload().(*ReplicationMessage_Open_); ok {
+		return x.Open
+	}
+	return nil
+}
+
+func (x *ReplicationMessage) GetRequest() *ReplicationMessage_Request {
+	if x, ok := x.GetPayload().(*ReplicationMessage_Request_); ok {
+		return x.Request
+	}
+	return nil
+}
+
+func (x *ReplicationMessage) GetResponse() *ReplicationMessage_Response {
+	if x, ok := x.GetPayload().(*ReplicationMessage_Response_); ok {
+		return x.Response
+	}
+	return nil
+}
+
+func (x *ReplicationMessage) GetTerminated() *ReplicationMessage_Terminated {
+	if x, ok := x.GetPayload().(*ReplicationMessage_Terminated_); ok {
+		return x.Terminated
+	}
+	return nil
+}
+
+func (x *ReplicationMessage) GetHeartbeat() *ReplicationMessage_Heartbeat {
+	if x, ok := x.GetPayload().(*ReplicationMessage_Heartbeat_); ok {
+		return x.Heartbeat
+	}
+	return nil
+}
+
+type isReplicationMessage_Payload interface {
+	isReplicationMessage_Payload()
+}
+
+type ReplicationMessage_Open_ struct {
+	Open *ReplicationMessage_Open `protobuf:"bytes,1,opt,name=open,proto3,oneof"`
+}
+
+type ReplicationMessage_Request_ struct {
+	Request *ReplicationMessage_Request `protobuf:"bytes,2,opt,name=request,proto3,oneof"`
+}
+
+type ReplicationMessage_Response_ struct {
+	Response *ReplicationMessage_Response `protobuf:"bytes,3,opt,name=response,proto3,oneof"`
+}
+
+type ReplicationMessage_Terminated_ struct {
+	Terminated *ReplicationMessage_Terminated `protobuf:"bytes,4,opt,name=terminated,proto3,oneof"`
+}
+
+type ReplicationMessage_Heartbeat_ struct {
+	Heartbeat *ReplicationMessage_Heartbeat `protobuf:"bytes,5,opt,name=heartbeat,proto3,oneof"`
+}
+
+func (*ReplicationMessage_Open_) isReplicationMessage_Payload() {}
+
+func (*ReplicationMessage_Request_) isReplicationMessage_Payload() {}
+
+func (*ReplicationMessage_Response_) isReplicationMessage_Payload() {}
+
+func (*ReplicationMessage_Terminated_) isReplicationMessage_Payload() {}
+
+func (*ReplicationMessage_Heartbeat_) isReplicationMessage_Payload() {}
+
+// LeaderAddress is sent when the peering service runs on a consul node
+// that is not a leader. The node either lost leadership, or never was a leader.
+type LeaderAddress struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// address is an ip:port best effort hint at what could be the cluster leader's address
+	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
+}
+
+func (x *LeaderAddress) Reset() {
+	*x = LeaderAddress{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *LeaderAddress) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*LeaderAddress) ProtoMessage() {}
+
+func (x *LeaderAddress) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use LeaderAddress.ProtoReflect.Descriptor instead.
+func (*LeaderAddress) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *LeaderAddress) GetAddress() string {
+	if x != nil {
+		return x.Address
+	}
+	return ""
+}
+
+// ExportedService is one of the types of data returned via peer stream replication.
+type ExportedService struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Nodes []*pbservice.CheckServiceNode `protobuf:"bytes,1,rep,name=Nodes,proto3" json:"Nodes,omitempty"`
+}
+
+func (x *ExportedService) Reset() {
+	*x = ExportedService{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExportedService) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExportedService) ProtoMessage() {}
+
+func (x *ExportedService) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ExportedService.ProtoReflect.Descriptor instead.
+func (*ExportedService) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *ExportedService) GetNodes() []*pbservice.CheckServiceNode {
+	if x != nil {
+		return x.Nodes
+	}
+	return nil
+}
+
+// ExportedServiceList is one of the types of data returned via peer stream replication.
+type ExportedServiceList struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// The identifiers for the services being exported.
+	Services []string `protobuf:"bytes,1,rep,name=Services,proto3" json:"Services,omitempty"`
+}
+
+func (x *ExportedServiceList) Reset() {
+	*x = ExportedServiceList{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExportedServiceList) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExportedServiceList) ProtoMessage() {}
+
+func (x *ExportedServiceList) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ExportedServiceList.ProtoReflect.Descriptor instead.
+func (*ExportedServiceList) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *ExportedServiceList) GetServices() []string {
+	if x != nil {
+		return x.Services
+	}
+	return nil
+}
+
+type ExchangeSecretRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// PeerID is the ID of the peering, as determined by the cluster that generated the
+	// peering token.
+	PeerID string `protobuf:"bytes,1,opt,name=PeerID,proto3" json:"PeerID,omitempty"`
+	// EstablishmentSecret is the one-time-use secret encoded in the received peering token.
+	EstablishmentSecret string `protobuf:"bytes,2,opt,name=EstablishmentSecret,proto3" json:"EstablishmentSecret,omitempty"`
+}
+
+func (x *ExchangeSecretRequest) Reset() {
+	*x = ExchangeSecretRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExchangeSecretRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExchangeSecretRequest) ProtoMessage() {}
+
+func (x *ExchangeSecretRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ExchangeSecretRequest.ProtoReflect.Descriptor instead.
+func (*ExchangeSecretRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *ExchangeSecretRequest) GetPeerID() string {
+	if x != nil {
+		return x.PeerID
+	}
+	return ""
+}
+
+func (x *ExchangeSecretRequest) GetEstablishmentSecret() string {
+	if x != nil {
+		return x.EstablishmentSecret
+	}
+	return ""
+}
+
+type ExchangeSecretResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// StreamSecret is the long-lived secret to be used for authentication with the
+	// peering stream handler.
+	StreamSecret string `protobuf:"bytes,1,opt,name=StreamSecret,proto3" json:"StreamSecret,omitempty"`
+}
+
+func (x *ExchangeSecretResponse) Reset() {
+	*x = ExchangeSecretResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExchangeSecretResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExchangeSecretResponse) ProtoMessage() {}
+
+func (x *ExchangeSecretResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ExchangeSecretResponse.ProtoReflect.Descriptor instead.
+func (*ExchangeSecretResponse) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *ExchangeSecretResponse) GetStreamSecret() string {
+	if x != nil {
+		return x.StreamSecret
+	}
+	return ""
+}
+
+// Open is the initial message send by a dialing peer to establish the peering stream.
+type ReplicationMessage_Open struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// An identifier for the peer making the request.
+	// This identifier is provisioned by the serving peer prior to the request from the dialing peer.
+	PeerID string `protobuf:"bytes,1,opt,name=PeerID,proto3" json:"PeerID,omitempty"`
+	// StreamSecretID contains the long-lived secret from stream authn/authz.
+	StreamSecretID string `protobuf:"bytes,2,opt,name=StreamSecretID,proto3" json:"StreamSecretID,omitempty"`
+	// Remote contains metadata about the remote peer.
+	Remote *pbpeering.RemoteInfo `protobuf:"bytes,3,opt,name=Remote,proto3" json:"Remote,omitempty"`
+}
+
+func (x *ReplicationMessage_Open) Reset() {
+	*x = ReplicationMessage_Open{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ReplicationMessage_Open) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ReplicationMessage_Open) ProtoMessage() {}
+
+func (x *ReplicationMessage_Open) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ReplicationMessage_Open.ProtoReflect.Descriptor instead.
+func (*ReplicationMessage_Open) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{0, 0}
+}
+
+func (x *ReplicationMessage_Open) GetPeerID() string {
+	if x != nil {
+		return x.PeerID
+	}
+	return ""
+}
+
+func (x *ReplicationMessage_Open) GetStreamSecretID() string {
+	if x != nil {
+		return x.StreamSecretID
+	}
+	return ""
+}
+
+func (x *ReplicationMessage_Open) GetRemote() *pbpeering.RemoteInfo {
+	if x != nil {
+		return x.Remote
+	}
+	return nil
+}
+
+// A Request requests to subscribe to a resource of a given type.
+type ReplicationMessage_Request struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// An identifier for the peer making the request.
+	// This identifier is provisioned by the serving peer prior to the request from the dialing peer.
+	PeerID string `protobuf:"bytes,1,opt,name=PeerID,proto3" json:"PeerID,omitempty"`
+	// ResponseNonce corresponding to that of the response being ACKed or NACKed.
+	// Initial subscription requests will have an empty nonce.
+	// The nonce is generated and incremented by the exporting peer.
+	// TODO
+	ResponseNonce string `protobuf:"bytes,2,opt,name=ResponseNonce,proto3" json:"ResponseNonce,omitempty"`
+	// The type URL for the resource being requested or ACK/NACKed.
+	ResourceURL string `protobuf:"bytes,3,opt,name=ResourceURL,proto3" json:"ResourceURL,omitempty"`
+	// The error if the previous response was not applied successfully.
+	// This field is empty in the first subscription request.
+	Error *pbstatus.Status `protobuf:"bytes,5,opt,name=Error,proto3" json:"Error,omitempty"`
+}
+
+func (x *ReplicationMessage_Request) Reset() {
+	*x = ReplicationMessage_Request{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ReplicationMessage_Request) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ReplicationMessage_Request) ProtoMessage() {}
+
+func (x *ReplicationMessage_Request) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ReplicationMessage_Request.ProtoReflect.Descriptor instead.
+func (*ReplicationMessage_Request) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{0, 1}
+}
+
+func (x *ReplicationMessage_Request) GetPeerID() string {
+	if x != nil {
+		return x.PeerID
+	}
+	return ""
+}
+
+func (x *ReplicationMessage_Request) GetResponseNonce() string {
+	if x != nil {
+		return x.ResponseNonce
+	}
+	return ""
+}
+
+func (x *ReplicationMessage_Request) GetResourceURL() string {
+	if x != nil {
+		return x.ResourceURL
+	}
+	return ""
+}
+
+func (x *ReplicationMessage_Request) GetError() *pbstatus.Status {
+	if x != nil {
+		return x.Error
+	}
+	return nil
+}
+
+// A Response contains resources corresponding to a subscription request.
+type ReplicationMessage_Response struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Nonce identifying a response in a stream.
+	Nonce string `protobuf:"bytes,1,opt,name=Nonce,proto3" json:"Nonce,omitempty"`
+	// The type URL of resource being returned.
+	ResourceURL string `protobuf:"bytes,2,opt,name=ResourceURL,proto3" json:"ResourceURL,omitempty"`
+	// An identifier for the resource being returned.
+	// This could be the SPIFFE ID of the service.
+	ResourceID string `protobuf:"bytes,3,opt,name=ResourceID,proto3" json:"ResourceID,omitempty"`
+	// The resource being returned.
+	Resource *anypb.Any `protobuf:"bytes,4,opt,name=Resource,proto3" json:"Resource,omitempty"`
+	// REQUIRED. The operation to be performed in relation to the resource.
+	Operation Operation `protobuf:"varint,5,opt,name=operation,proto3,enum=hashicorp.consul.internal.peerstream.Operation" json:"operation,omitempty"`
+}
+
+func (x *ReplicationMessage_Response) Reset() {
+	*x = ReplicationMessage_Response{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ReplicationMessage_Response) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ReplicationMessage_Response) ProtoMessage() {}
+
+func (x *ReplicationMessage_Response) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[8]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ReplicationMessage_Response.ProtoReflect.Descriptor instead.
+func (*ReplicationMessage_Response) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{0, 2}
+}
+
+func (x *ReplicationMessage_Response) GetNonce() string {
+	if x != nil {
+		return x.Nonce
+	}
+	return ""
+}
+
+func (x *ReplicationMessage_Response) GetResourceURL() string {
+	if x != nil {
+		return x.ResourceURL
+	}
+	return ""
+}
+
+func (x *ReplicationMessage_Response) GetResourceID() string {
+	if x != nil {
+		return x.ResourceID
+	}
+	return ""
+}
+
+func (x *ReplicationMessage_Response) GetResource() *anypb.Any {
+	if x != nil {
+		return x.Resource
+	}
+	return nil
+}
+
+func (x *ReplicationMessage_Response) GetOperation() Operation {
+	if x != nil {
+		return x.Operation
+	}
+	return Operation_OPERATION_UNSPECIFIED
+}
+
+// Terminated is sent when a peering is deleted locally.
+// This message signals to the peer that they should clean up their local state about the peering.
+type ReplicationMessage_Terminated struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *ReplicationMessage_Terminated) Reset() {
+	*x = ReplicationMessage_Terminated{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ReplicationMessage_Terminated) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ReplicationMessage_Terminated) ProtoMessage() {}
+
+func (x *ReplicationMessage_Terminated) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[9]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ReplicationMessage_Terminated.ProtoReflect.Descriptor instead.
+func (*ReplicationMessage_Terminated) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{0, 3}
+}
+
+// Heartbeat is sent to verify that the connection is still active.
+type ReplicationMessage_Heartbeat struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *ReplicationMessage_Heartbeat) Reset() {
+	*x = ReplicationMessage_Heartbeat{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[10]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ReplicationMessage_Heartbeat) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ReplicationMessage_Heartbeat) ProtoMessage() {}
+
+func (x *ReplicationMessage_Heartbeat) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbpeerstream_peerstream_proto_msgTypes[10]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ReplicationMessage_Heartbeat.ProtoReflect.Descriptor instead.
+func (*ReplicationMessage_Heartbeat) Descriptor() ([]byte, []int) {
+	return file_proto_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{0, 4}
+}
+
+var File_proto_pbpeerstream_peerstream_proto protoreflect.FileDescriptor
+
+var file_proto_pbpeerstream_peerstream_proto_rawDesc = []byte{
+	0x0a, 0x23, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74,
+	0x72, 0x65, 0x61, 0x6d, 0x2f, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x24, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x2e, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x1a, 0x19, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x32, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75,
+	0x62, 0x6c, 0x69, 0x63, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c,
+	0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2f, 0x70, 0x62, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2f, 0x70, 0x65, 0x65, 0x72,
+	0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x22, 0xbb, 0x08, 0x0a, 0x12, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x53, 0x0a, 0x04, 0x6f, 0x70, 0x65,
+	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x52,
+	0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x48, 0x00, 0x52, 0x04, 0x6f, 0x70, 0x65, 0x6e, 0x12, 0x5c,
+	0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x40, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72,
+	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x48, 0x00, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5f, 0x0a, 0x08,
+	0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x41,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x73,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x48, 0x00, 0x52, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x65, 0x0a,
+	0x0a, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x43, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65,
+	0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x54, 0x65, 0x72, 0x6d,
+	0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0a, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e,
+	0x61, 0x74, 0x65, 0x64, 0x12, 0x62, 0x0a, 0x09, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61,
+	0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x52,
+	0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x2e, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x48, 0x00, 0x52, 0x09, 0x68,
+	0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x1a, 0x8d, 0x01, 0x0a, 0x04, 0x4f, 0x70, 0x65,
+	0x6e, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x12, 0x26, 0x0a, 0x0e, 0x53, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x49,
+	0x44, 0x12, 0x45, 0x0a, 0x06, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65,
+	0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f,
+	0x52, 0x06, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x1a, 0xa9, 0x01, 0x0a, 0x07, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x12, 0x24, 0x0a, 0x0d,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x4e, 0x6f, 0x6e,
+	0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x55, 0x52,
+	0x4c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x55, 0x52, 0x4c, 0x12, 0x3e, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x05, 0x45,
+	0x72, 0x72, 0x6f, 0x72, 0x1a, 0xe3, 0x01, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x14, 0x0a, 0x05, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x52, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x55, 0x52, 0x4c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x52, 0x65,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x55, 0x52, 0x4c, 0x12, 0x1e, 0x0a, 0x0a, 0x52, 0x65, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x52,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x44, 0x12, 0x30, 0x0a, 0x08, 0x52, 0x65, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e,
+	0x79, 0x52, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x4d, 0x0a, 0x09, 0x6f,
+	0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2f,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x73,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x0c, 0x0a, 0x0a, 0x54, 0x65,
+	0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x1a, 0x0b, 0x0a, 0x09, 0x48, 0x65, 0x61, 0x72,
+	0x74, 0x62, 0x65, 0x61, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64,
+	0x22, 0x29, 0x0a, 0x0d, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
+	0x73, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x5c, 0x0a, 0x0f, 0x45,
+	0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x49,
+	0x0a, 0x05, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f,
+	0x64, 0x65, 0x52, 0x05, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x22, 0x31, 0x0a, 0x13, 0x45, 0x78, 0x70,
+	0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74,
+	0x12, 0x1a, 0x0a, 0x08, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x08, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x22, 0x61, 0x0a, 0x15,
+	0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x12, 0x30, 0x0a,
+	0x13, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65,
+	0x63, 0x72, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x45, 0x73, 0x74, 0x61,
+	0x62, 0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x22,
+	0x3c, 0x0a, 0x16, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65,
+	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x53, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x2a, 0x3c, 0x0a,
+	0x09, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x15, 0x4f, 0x50,
+	0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46,
+	0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49,
+	0x4f, 0x4e, 0x5f, 0x55, 0x50, 0x53, 0x45, 0x52, 0x54, 0x10, 0x01, 0x32, 0xbd, 0x02, 0x0a, 0x11,
+	0x50, 0x65, 0x65, 0x72, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x12, 0x91, 0x01, 0x0a, 0x0f, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x52, 0x65, 0x70,
+	0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a,
+	0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72,
+	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08,
+	0x02, 0x28, 0x01, 0x30, 0x01, 0x12, 0x93, 0x01, 0x0a, 0x0e, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e,
+	0x67, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e,
+	0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x45, 0x78, 0x63,
+	0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08, 0x03, 0x42, 0x9f, 0x02, 0x0a, 0x28,
+	0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65,
+	0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x42, 0x0f, 0x50, 0x65, 0x65, 0x72, 0x73, 0x74,
+	0x72, 0x65, 0x61, 0x6d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70,
+	0x62, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0xa2, 0x02, 0x04, 0x48, 0x43,
+	0x49, 0x50, 0xaa, 0x02, 0x24, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x50,
+	0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0xca, 0x02, 0x24, 0x48, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x50, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
+	0xe2, 0x02, 0x30, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x50, 0x65, 0x65,
+	0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0xea, 0x02, 0x27, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a,
+	0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x3a, 0x3a, 0x50, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_pbpeerstream_peerstream_proto_rawDescOnce sync.Once
+	file_proto_pbpeerstream_peerstream_proto_rawDescData = file_proto_pbpeerstream_peerstream_proto_rawDesc
+)
+
+func file_proto_pbpeerstream_peerstream_proto_rawDescGZIP() []byte {
+	file_proto_pbpeerstream_peerstream_proto_rawDescOnce.Do(func() {
+		file_proto_pbpeerstream_peerstream_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbpeerstream_peerstream_proto_rawDescData)
+	})
+	return file_proto_pbpeerstream_peerstream_proto_rawDescData
+}
+
+var file_proto_pbpeerstream_peerstream_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_proto_pbpeerstream_peerstream_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
+var file_proto_pbpeerstream_peerstream_proto_goTypes = []interface{}{
+	(Operation)(0),                        // 0: hashicorp.consul.internal.peerstream.Operation
+	(*ReplicationMessage)(nil),            // 1: hashicorp.consul.internal.peerstream.ReplicationMessage
+	(*LeaderAddress)(nil),                 // 2: hashicorp.consul.internal.peerstream.LeaderAddress
+	(*ExportedService)(nil),               // 3: hashicorp.consul.internal.peerstream.ExportedService
+	(*ExportedServiceList)(nil),           // 4: hashicorp.consul.internal.peerstream.ExportedServiceList
+	(*ExchangeSecretRequest)(nil),         // 5: hashicorp.consul.internal.peerstream.ExchangeSecretRequest
+	(*ExchangeSecretResponse)(nil),        // 6: hashicorp.consul.internal.peerstream.ExchangeSecretResponse
+	(*ReplicationMessage_Open)(nil),       // 7: hashicorp.consul.internal.peerstream.ReplicationMessage.Open
+	(*ReplicationMessage_Request)(nil),    // 8: hashicorp.consul.internal.peerstream.ReplicationMessage.Request
+	(*ReplicationMessage_Response)(nil),   // 9: hashicorp.consul.internal.peerstream.ReplicationMessage.Response
+	(*ReplicationMessage_Terminated)(nil), // 10: hashicorp.consul.internal.peerstream.ReplicationMessage.Terminated
+	(*ReplicationMessage_Heartbeat)(nil),  // 11: hashicorp.consul.internal.peerstream.ReplicationMessage.Heartbeat
+	(*pbservice.CheckServiceNode)(nil),    // 12: hashicorp.consul.internal.service.CheckServiceNode
+	(*pbpeering.RemoteInfo)(nil),          // 13: hashicorp.consul.internal.peering.RemoteInfo
+	(*pbstatus.Status)(nil),               // 14: hashicorp.consul.internal.status.Status
+	(*anypb.Any)(nil),                     // 15: google.protobuf.Any
+}
+var file_proto_pbpeerstream_peerstream_proto_depIdxs = []int32{
+	7,  // 0: hashicorp.consul.internal.peerstream.ReplicationMessage.open:type_name -> hashicorp.consul.internal.peerstream.ReplicationMessage.Open
+	8,  // 1: hashicorp.consul.internal.peerstream.ReplicationMessage.request:type_name -> hashicorp.consul.internal.peerstream.ReplicationMessage.Request
+	9,  // 2: hashicorp.consul.internal.peerstream.ReplicationMessage.response:type_name -> hashicorp.consul.internal.peerstream.ReplicationMessage.Response
+	10, // 3: hashicorp.consul.internal.peerstream.ReplicationMessage.terminated:type_name -> hashicorp.consul.internal.peerstream.ReplicationMessage.Terminated
+	11, // 4: hashicorp.consul.internal.peerstream.ReplicationMessage.heartbeat:type_name -> hashicorp.consul.internal.peerstream.ReplicationMessage.Heartbeat
+	12, // 5: hashicorp.consul.internal.peerstream.ExportedService.Nodes:type_name -> hashicorp.consul.internal.service.CheckServiceNode
+	13, // 6: hashicorp.consul.internal.peerstream.ReplicationMessage.Open.Remote:type_name -> hashicorp.consul.internal.peering.RemoteInfo
+	14, // 7: hashicorp.consul.internal.peerstream.ReplicationMessage.Request.Error:type_name -> hashicorp.consul.internal.status.Status
+	15, // 8: hashicorp.consul.internal.peerstream.ReplicationMessage.Response.Resource:type_name -> google.protobuf.Any
+	0,  // 9: hashicorp.consul.internal.peerstream.ReplicationMessage.Response.operation:type_name -> hashicorp.consul.internal.peerstream.Operation
+	1,  // 10: hashicorp.consul.internal.peerstream.PeerStreamService.StreamResources:input_type -> hashicorp.consul.internal.peerstream.ReplicationMessage
+	5,  // 11: hashicorp.consul.internal.peerstream.PeerStreamService.ExchangeSecret:input_type -> hashicorp.consul.internal.peerstream.ExchangeSecretRequest
+	1,  // 12: hashicorp.consul.internal.peerstream.PeerStreamService.StreamResources:output_type -> hashicorp.consul.internal.peerstream.ReplicationMessage
+	6,  // 13: hashicorp.consul.internal.peerstream.PeerStreamService.ExchangeSecret:output_type -> hashicorp.consul.internal.peerstream.ExchangeSecretResponse
+	12, // [12:14] is the sub-list for method output_type
+	10, // [10:12] is the sub-list for method input_type
+	10, // [10:10] is the sub-list for extension type_name
+	10, // [10:10] is the sub-list for extension extendee
+	0,  // [0:10] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbpeerstream_peerstream_proto_init() }
+func file_proto_pbpeerstream_peerstream_proto_init() {
+	if File_proto_pbpeerstream_peerstream_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbpeerstream_peerstream_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ReplicationMessage); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeerstream_peerstream_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*LeaderAddress); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeerstream_peerstream_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExportedService); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeerstream_peerstream_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExportedServiceList); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeerstream_peerstream_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExchangeSecretRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeerstream_peerstream_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExchangeSecretResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeerstream_peerstream_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ReplicationMessage_Open); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeerstream_peerstream_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ReplicationMessage_Request); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeerstream_peerstream_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ReplicationMessage_Response); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeerstream_peerstream_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ReplicationMessage_Terminated); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbpeerstream_peerstream_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ReplicationMessage_Heartbeat); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	file_proto_pbpeerstream_peerstream_proto_msgTypes[0].OneofWrappers = []interface{}{
+		(*ReplicationMessage_Open_)(nil),
+		(*ReplicationMessage_Request_)(nil),
+		(*ReplicationMessage_Response_)(nil),
+		(*ReplicationMessage_Terminated_)(nil),
+		(*ReplicationMessage_Heartbeat_)(nil),
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbpeerstream_peerstream_proto_rawDesc,
+			NumEnums:      1,
+			NumMessages:   11,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_proto_pbpeerstream_peerstream_proto_goTypes,
+		DependencyIndexes: file_proto_pbpeerstream_peerstream_proto_depIdxs,
+		EnumInfos:         file_proto_pbpeerstream_peerstream_proto_enumTypes,
+		MessageInfos:      file_proto_pbpeerstream_peerstream_proto_msgTypes,
+	}.Build()
+	File_proto_pbpeerstream_peerstream_proto = out.File
+	file_proto_pbpeerstream_peerstream_proto_rawDesc = nil
+	file_proto_pbpeerstream_peerstream_proto_goTypes = nil
+	file_proto_pbpeerstream_peerstream_proto_depIdxs = nil
+}
diff --git a/proto/private/pbpeerstream/peerstream.proto b/proto/pbpeerstream/peerstream.proto
similarity index 93%
rename from proto/private/pbpeerstream/peerstream.proto
rename to proto/pbpeerstream/peerstream.proto
index b46fcf2270dba..4bdcb27267d1c 100644
--- a/proto/private/pbpeerstream/peerstream.proto
+++ b/proto/pbpeerstream/peerstream.proto
@@ -1,16 +1,13 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 syntax = "proto3";
 
 package hashicorp.consul.internal.peerstream;
 
-import "annotations/ratelimit/ratelimit.proto";
 import "google/protobuf/any.proto";
-import "private/pbpeering/peering.proto";
-import "private/pbservice/node.proto";
+import "proto-public/annotations/ratelimit/ratelimit.proto";
+import "proto/pbpeering/peering.proto";
+import "proto/pbservice/node.proto";
 // TODO(peering): Handle this some other way
-import "private/pbstatus/status.proto";
+import "proto/pbstatus/status.proto";
 
 // TODO(peering): comments
 
@@ -25,7 +22,6 @@ service PeerStreamService {
   rpc StreamResources(stream ReplicationMessage) returns (stream ReplicationMessage) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_PEER_STREAM
     };
   }
 
@@ -34,7 +30,6 @@ service PeerStreamService {
   rpc ExchangeSecret(ExchangeSecretRequest) returns (ExchangeSecretResponse) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_WRITE,
-      operation_category: OPERATION_CATEGORY_PEER_STREAM
     };
   }
 }
diff --git a/proto/private/pbpeerstream/peerstream_grpc.pb.go b/proto/pbpeerstream/peerstream_grpc.pb.go
similarity index 98%
rename from proto/private/pbpeerstream/peerstream_grpc.pb.go
rename to proto/pbpeerstream/peerstream_grpc.pb.go
index cdd3d869414e8..dc513f44b19a3 100644
--- a/proto/private/pbpeerstream/peerstream_grpc.pb.go
+++ b/proto/pbpeerstream/peerstream_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             (unknown)
-// source: private/pbpeerstream/peerstream.proto
+// source: proto/pbpeerstream/peerstream.proto
 
 package pbpeerstream
 
@@ -182,5 +182,5 @@ var PeerStreamService_ServiceDesc = grpc.ServiceDesc{
 			ClientStreams: true,
 		},
 	},
-	Metadata: "private/pbpeerstream/peerstream.proto",
+	Metadata: "proto/pbpeerstream/peerstream.proto",
 }
diff --git a/proto/pbpeerstream/types.go b/proto/pbpeerstream/types.go
new file mode 100644
index 0000000000000..b492caf2b0879
--- /dev/null
+++ b/proto/pbpeerstream/types.go
@@ -0,0 +1,18 @@
+package pbpeerstream
+
+const (
+	apiTypePrefix = "type.googleapis.com/"
+
+	TypeURLExportedService        = apiTypePrefix + "hashicorp.consul.internal.peerstream.ExportedService"
+	TypeURLExportedServiceList    = apiTypePrefix + "hashicorp.consul.internal.peerstream.ExportedServiceList"
+	TypeURLPeeringTrustBundle     = apiTypePrefix + "hashicorp.consul.internal.peering.PeeringTrustBundle"
+	TypeURLPeeringServerAddresses = apiTypePrefix + "hashicorp.consul.internal.peering.PeeringServerAddresses"
+)
+
+func KnownTypeURL(s string) bool {
+	switch s {
+	case TypeURLExportedService, TypeURLExportedServiceList, TypeURLPeeringTrustBundle, TypeURLPeeringServerAddresses:
+		return true
+	}
+	return false
+}
diff --git a/proto/pbservice/convert.go b/proto/pbservice/convert.go
new file mode 100644
index 0000000000000..167a12148cb63
--- /dev/null
+++ b/proto/pbservice/convert.go
@@ -0,0 +1,278 @@
+package pbservice
+
+import (
+	"github.com/hashicorp/consul/agent/structs"
+	"github.com/hashicorp/consul/proto/pbcommon"
+	"github.com/hashicorp/consul/types"
+)
+
+type CheckIDType = types.CheckID
+type NodeIDType = types.NodeID
+
+// Function variables to support proto generation
+// This allows for using functions in the local package without having to generate imports
+var EnvoyExtensionsToStructs = pbcommon.EnvoyExtensionsToStructs
+var EnvoyExtensionsFromStructs = pbcommon.EnvoyExtensionsFromStructs
+var ProtobufTypesStructToMapStringInterface = pbcommon.ProtobufTypesStructToMapStringInterface
+var MapStringInterfaceToProtobufTypesStruct = pbcommon.MapStringInterfaceToProtobufTypesStruct
+
+func RaftIndexToStructs(s *pbcommon.RaftIndex) structs.RaftIndex {
+	if s == nil {
+		return structs.RaftIndex{}
+	}
+	return structs.RaftIndex{
+		CreateIndex: s.CreateIndex,
+		ModifyIndex: s.ModifyIndex,
+	}
+}
+
+func NewRaftIndexFromStructs(s structs.RaftIndex) *pbcommon.RaftIndex {
+	return &pbcommon.RaftIndex{
+		CreateIndex: s.CreateIndex,
+		ModifyIndex: s.ModifyIndex,
+	}
+}
+
+func MapHeadersToStructs(s map[string]*HeaderValue) map[string][]string {
+	t := make(map[string][]string, len(s))
+	for k, v := range s {
+		t[k] = v.Value
+	}
+	return t
+}
+
+func NewMapHeadersFromStructs(t map[string][]string) map[string]*HeaderValue {
+	s := make(map[string]*HeaderValue, len(t))
+	for k, v := range t {
+		s[k] = &HeaderValue{Value: v}
+	}
+	return s
+}
+
+// TODO: use mog once it supports pointers and slices
+func CheckServiceNodeToStructs(s *CheckServiceNode) (*structs.CheckServiceNode, error) {
+	if s == nil {
+		return nil, nil
+	}
+	var t structs.CheckServiceNode
+	if s.Node != nil {
+		n := new(structs.Node)
+		NodeToStructs(s.Node, n)
+		t.Node = n
+	}
+	if s.Service != nil {
+		r := new(structs.NodeService)
+		NodeServiceToStructs(s.Service, r)
+		t.Service = r
+	}
+	t.Checks = make(structs.HealthChecks, len(s.Checks))
+	for i, c := range s.Checks {
+		if c == nil {
+			continue
+		}
+		h := new(structs.HealthCheck)
+		HealthCheckToStructs(c, h)
+		t.Checks[i] = h
+	}
+	return &t, nil
+}
+
+// TODO: use mog once it supports pointers and slices
+func NewCheckServiceNodeFromStructs(t *structs.CheckServiceNode) *CheckServiceNode {
+	if t == nil {
+		return nil
+	}
+	var s CheckServiceNode
+	if t.Node != nil {
+		n := new(Node)
+		NodeFromStructs(t.Node, n)
+		s.Node = n
+	}
+	if t.Service != nil {
+		r := new(NodeService)
+		NodeServiceFromStructs(t.Service, r)
+		s.Service = r
+	}
+	s.Checks = make([]*HealthCheck, len(t.Checks))
+	for i, c := range t.Checks {
+		if c == nil {
+			continue
+		}
+		h := new(HealthCheck)
+		HealthCheckFromStructs(c, h)
+		s.Checks[i] = h
+	}
+	return &s
+}
+
+// TODO: handle this with mog, once mog handles pointers
+func WeightsPtrToStructs(s *Weights) *structs.Weights {
+	if s == nil {
+		return nil
+	}
+	var t structs.Weights
+	t.Passing = int(s.Passing)
+	t.Warning = int(s.Warning)
+	return &t
+}
+
+// TODO: handle this with mog, once mog handles pointers
+func NewWeightsPtrFromStructs(t *structs.Weights) *Weights {
+	if t == nil {
+		return nil
+	}
+	var s Weights
+	s.Passing = int32(t.Passing)
+	s.Warning = int32(t.Warning)
+	return &s
+}
+
+// TODO: handle this with mog
+func MapStringServiceAddressToStructs(s map[string]*ServiceAddress) map[string]structs.ServiceAddress {
+	t := make(map[string]structs.ServiceAddress, len(s))
+	for k, v := range s {
+		t[k] = structs.ServiceAddress{Address: v.Address, Port: int(v.Port)}
+	}
+	return t
+}
+
+// TODO: handle this with mog
+func NewMapStringServiceAddressFromStructs(t map[string]structs.ServiceAddress) map[string]*ServiceAddress {
+	s := make(map[string]*ServiceAddress, len(t))
+	for k, v := range t {
+		s[k] = &ServiceAddress{Address: v.Address, Port: int32(v.Port)}
+	}
+	return s
+}
+
+// TODO: handle this with mog
+func ExposePathSliceToStructs(s []*ExposePath) []structs.ExposePath {
+	t := make([]structs.ExposePath, len(s))
+	for i, v := range s {
+		e := new(structs.ExposePath)
+		ExposePathToStructs(v, e)
+		t[i] = *e
+	}
+	return t
+}
+
+// TODO: handle this with mog
+func NewExposePathSliceFromStructs(t []structs.ExposePath) []*ExposePath {
+	s := make([]*ExposePath, len(t))
+	for i, v := range t {
+		ep := new(ExposePath)
+		ExposePathFromStructs(&v, ep)
+		s[i] = ep
+	}
+	return s
+}
+
+// TODO: handle this with mog
+func UpstreamsToStructs(s []*Upstream) structs.Upstreams {
+	t := make(structs.Upstreams, len(s))
+	for i, v := range s {
+		u := new(structs.Upstream)
+		UpstreamToStructs(v, u)
+		t[i] = *u
+	}
+	return t
+}
+
+// TODO: handle this with mog
+func NewUpstreamsFromStructs(t structs.Upstreams) []*Upstream {
+	s := make([]*Upstream, len(t))
+	for i, v := range t {
+		u := new(Upstream)
+		UpstreamFromStructs(&v, u)
+		s[i] = u
+	}
+	return s
+}
+
+// TODO: handle this with mog
+func CheckTypesToStructs(s []*CheckType) structs.CheckTypes {
+	t := make(structs.CheckTypes, len(s))
+	for i, v := range s {
+		if v == nil {
+			continue
+		}
+		c := new(structs.CheckType)
+		CheckTypeToStructs(v, c)
+		t[i] = c
+	}
+	return t
+}
+
+// TODO: handle this with mog
+func NewCheckTypesFromStructs(t structs.CheckTypes) []*CheckType {
+	s := make([]*CheckType, len(t))
+	for i, v := range t {
+		if v == nil {
+			continue
+		}
+		newV := new(CheckType)
+		CheckTypeFromStructs(v, newV)
+		s[i] = newV
+	}
+	return s
+}
+
+// TODO: handle this with mog
+func ConnectProxyConfigPtrToStructs(s *ConnectProxyConfig) *structs.ConnectProxyConfig {
+	if s == nil {
+		return nil
+	}
+	c := new(structs.ConnectProxyConfig)
+	ConnectProxyConfigToStructs(s, c)
+	return c
+}
+
+// TODO: handle this with mog
+func NewConnectProxyConfigPtrFromStructs(t *structs.ConnectProxyConfig) *ConnectProxyConfig {
+	if t == nil {
+		return nil
+	}
+	cp := new(ConnectProxyConfig)
+	ConnectProxyConfigFromStructs(t, cp)
+	return cp
+}
+
+// TODO: handle this with mog
+func ServiceConnectPtrToStructs(s *ServiceConnect) *structs.ServiceConnect {
+	if s == nil {
+		return nil
+	}
+	sc := new(structs.ServiceConnect)
+	ServiceConnectToStructs(s, sc)
+	return sc
+}
+
+// TODO: handle this with mog
+func NewServiceConnectPtrFromStructs(t *structs.ServiceConnect) *ServiceConnect {
+	if t == nil {
+		return nil
+	}
+	sc := new(ServiceConnect)
+	ServiceConnectFromStructs(t, sc)
+	return sc
+}
+
+// TODO: handle this with mog
+func ServiceDefinitionPtrToStructs(s *ServiceDefinition) *structs.ServiceDefinition {
+	if s == nil {
+		return nil
+	}
+	sd := new(structs.ServiceDefinition)
+	ServiceDefinitionToStructs(s, sd)
+	return sd
+}
+
+// TODO: handle this with mog
+func NewServiceDefinitionPtrFromStructs(t *structs.ServiceDefinition) *ServiceDefinition {
+	if t == nil {
+		return nil
+	}
+	sd := new(ServiceDefinition)
+	ServiceDefinitionFromStructs(t, sd)
+	return sd
+}
diff --git a/proto/pbservice/convert_ce.go b/proto/pbservice/convert_ce.go
new file mode 100644
index 0000000000000..5ecd2f7f455ad
--- /dev/null
+++ b/proto/pbservice/convert_ce.go
@@ -0,0 +1,17 @@
+//go:build !consulent
+// +build !consulent
+
+package pbservice
+
+import (
+	"github.com/hashicorp/consul/acl"
+	"github.com/hashicorp/consul/proto/pbcommon"
+)
+
+func EnterpriseMetaToStructs(_ *pbcommon.EnterpriseMeta) acl.EnterpriseMeta {
+	return acl.EnterpriseMeta{}
+}
+
+func NewEnterpriseMetaFromStructs(_ acl.EnterpriseMeta) *pbcommon.EnterpriseMeta {
+	return &pbcommon.EnterpriseMeta{}
+}
diff --git a/proto/pbservice/convert_ce_test.go b/proto/pbservice/convert_ce_test.go
new file mode 100644
index 0000000000000..253da69e51444
--- /dev/null
+++ b/proto/pbservice/convert_ce_test.go
@@ -0,0 +1,13 @@
+//go:build !consulent
+// +build !consulent
+
+package pbservice
+
+import (
+	fuzz "github.com/google/gofuzz"
+
+	"github.com/hashicorp/consul/acl"
+)
+
+func randEnterpriseMeta(_ *acl.EnterpriseMeta, _ fuzz.Continue) {
+}
diff --git a/proto/private/pbservice/convert_test.go b/proto/pbservice/convert_test.go
similarity index 84%
rename from proto/private/pbservice/convert_test.go
rename to proto/pbservice/convert_test.go
index 5b3c97680ef6d..a6491a2172ca2 100644
--- a/proto/private/pbservice/convert_test.go
+++ b/proto/pbservice/convert_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pbservice
 
 import (
@@ -19,7 +16,7 @@ import (
 
 func TestNewCheckServiceNodeFromStructs_RoundTrip(t *testing.T) {
 	repeat(t, func(t *testing.T, fuzzer *fuzz.Fuzzer) {
-		fuzzer.Funcs(randInt32, randUint32, randInterface, randStructsUpstream, randEnterpriseMeta, randStructsConnectProxyConfig)
+		fuzzer.Funcs(randInt32, randUint32, randInterface, randStructsUpstream, randEnterpriseMeta)
 		var target structs.CheckServiceNode
 		fuzzer.Fuzz(&target)
 
@@ -77,19 +74,6 @@ func randInt32(i *int, c fuzz.Continue) {
 	*i = int(c.Rand.Int31())
 }
 
-// randStructsConnectProxyConfig is a custom fuzzer function which skips
-// generating values for fields enumerated in the ignore-fields annotation.
-func randStructsConnectProxyConfig(p *structs.ConnectProxyConfig, c fuzz.Continue) {
-	v := reflect.ValueOf(p).Elem()
-	for i := 0; i < v.NumField(); i++ {
-		switch v.Type().Field(i).Name {
-		case "MutualTLSMode":
-			continue
-		}
-		c.Fuzz(v.Field(i).Addr().Interface())
-	}
-}
-
 // randStructsUpstream is a custom fuzzer function which skips generating values
 // for fields enumerated in the ignore-fields annotation.
 func randStructsUpstream(u *structs.Upstream, c fuzz.Continue) {
diff --git a/proto/private/pbservice/healthcheck.gen.go b/proto/pbservice/healthcheck.gen.go
similarity index 98%
rename from proto/private/pbservice/healthcheck.gen.go
rename to proto/pbservice/healthcheck.gen.go
index 1c608d88c7a72..092a4ded9e82f 100644
--- a/proto/private/pbservice/healthcheck.gen.go
+++ b/proto/pbservice/healthcheck.gen.go
@@ -21,7 +21,6 @@ func CheckTypeToStructs(s *CheckType, t *structs.CheckType) {
 	t.Body = s.Body
 	t.DisableRedirects = s.DisableRedirects
 	t.TCP = s.TCP
-	t.TCPUseTLS = s.TCPUseTLS
 	t.UDP = s.UDP
 	t.Interval = structs.DurationFromProto(s.Interval)
 	t.AliasNode = s.AliasNode
@@ -60,7 +59,6 @@ func CheckTypeFromStructs(t *structs.CheckType, s *CheckType) {
 	s.Body = t.Body
 	s.DisableRedirects = t.DisableRedirects
 	s.TCP = t.TCP
-	s.TCPUseTLS = t.TCPUseTLS
 	s.UDP = t.UDP
 	s.Interval = structs.DurationToProto(t.Interval)
 	s.AliasNode = t.AliasNode
@@ -144,7 +142,6 @@ func HealthCheckDefinitionToStructs(s *HealthCheckDefinition, t *structs.HealthC
 	t.Body = s.Body
 	t.DisableRedirects = s.DisableRedirects
 	t.TCP = s.TCP
-	t.TCPUseTLS = s.TCPUseTLS
 	t.UDP = s.UDP
 	t.H2PING = s.H2PING
 	t.OSService = s.OSService
@@ -174,7 +171,6 @@ func HealthCheckDefinitionFromStructs(t *structs.HealthCheckDefinition, s *Healt
 	s.Body = t.Body
 	s.DisableRedirects = t.DisableRedirects
 	s.TCP = t.TCP
-	s.TCPUseTLS = t.TCPUseTLS
 	s.UDP = t.UDP
 	s.H2PING = t.H2PING
 	s.OSService = t.OSService
diff --git a/proto/private/pbservice/healthcheck.pb.binary.go b/proto/pbservice/healthcheck.pb.binary.go
similarity index 96%
rename from proto/private/pbservice/healthcheck.pb.binary.go
rename to proto/pbservice/healthcheck.pb.binary.go
index b820f1da331c9..6971555ee00f4 100644
--- a/proto/private/pbservice/healthcheck.pb.binary.go
+++ b/proto/pbservice/healthcheck.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbservice/healthcheck.proto
+// source: proto/pbservice/healthcheck.proto
 
 package pbservice
 
diff --git a/proto/pbservice/healthcheck.pb.go b/proto/pbservice/healthcheck.pb.go
new file mode 100644
index 0000000000000..31e082b852799
--- /dev/null
+++ b/proto/pbservice/healthcheck.pb.go
@@ -0,0 +1,1173 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: proto/pbservice/healthcheck.proto
+
+package pbservice
+
+import (
+	pbcommon "github.com/hashicorp/consul/proto/pbcommon"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// HealthCheck represents a single check on a given node
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HealthCheck
+// output=healthcheck.gen.go
+// name=Structs
+type HealthCheck struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Node string `protobuf:"bytes,1,opt,name=Node,proto3" json:"Node,omitempty"`
+	// mog: func-to=CheckIDType func-from=string
+	CheckID     string                 `protobuf:"bytes,2,opt,name=CheckID,proto3" json:"CheckID,omitempty"`
+	Name        string                 `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"`
+	Status      string                 `protobuf:"bytes,4,opt,name=Status,proto3" json:"Status,omitempty"`           // The current check status
+	Notes       string                 `protobuf:"bytes,5,opt,name=Notes,proto3" json:"Notes,omitempty"`             // Additional notes with the status
+	Output      string                 `protobuf:"bytes,6,opt,name=Output,proto3" json:"Output,omitempty"`           // Holds output of script runs
+	ServiceID   string                 `protobuf:"bytes,7,opt,name=ServiceID,proto3" json:"ServiceID,omitempty"`     // optional associated service
+	ServiceName string                 `protobuf:"bytes,8,opt,name=ServiceName,proto3" json:"ServiceName,omitempty"` // optional service name
+	ServiceTags []string               `protobuf:"bytes,9,rep,name=ServiceTags,proto3" json:"ServiceTags,omitempty"` // optional service tags
+	Type        string                 `protobuf:"bytes,12,opt,name=Type,proto3" json:"Type,omitempty"`              // Check type: http/ttl/tcp/etc
+	Definition  *HealthCheckDefinition `protobuf:"bytes,10,opt,name=Definition,proto3" json:"Definition,omitempty"`
+	// mog: func-to=RaftIndexToStructs func-from=NewRaftIndexFromStructs
+	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,11,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
+	// mog: func-to=EnterpriseMetaToStructs func-from=NewEnterpriseMetaFromStructs
+	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,13,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
+	// mog: func-to=int func-from=int32
+	ExposedPort int32  `protobuf:"varint,14,opt,name=ExposedPort,proto3" json:"ExposedPort,omitempty"`
+	Interval    string `protobuf:"bytes,15,opt,name=Interval,proto3" json:"Interval,omitempty"`
+	Timeout     string `protobuf:"bytes,16,opt,name=Timeout,proto3" json:"Timeout,omitempty"`
+	PeerName    string `protobuf:"bytes,17,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
+}
+
+func (x *HealthCheck) Reset() {
+	*x = HealthCheck{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_healthcheck_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HealthCheck) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HealthCheck) ProtoMessage() {}
+
+func (x *HealthCheck) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_healthcheck_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HealthCheck.ProtoReflect.Descriptor instead.
+func (*HealthCheck) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_healthcheck_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *HealthCheck) GetNode() string {
+	if x != nil {
+		return x.Node
+	}
+	return ""
+}
+
+func (x *HealthCheck) GetCheckID() string {
+	if x != nil {
+		return x.CheckID
+	}
+	return ""
+}
+
+func (x *HealthCheck) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *HealthCheck) GetStatus() string {
+	if x != nil {
+		return x.Status
+	}
+	return ""
+}
+
+func (x *HealthCheck) GetNotes() string {
+	if x != nil {
+		return x.Notes
+	}
+	return ""
+}
+
+func (x *HealthCheck) GetOutput() string {
+	if x != nil {
+		return x.Output
+	}
+	return ""
+}
+
+func (x *HealthCheck) GetServiceID() string {
+	if x != nil {
+		return x.ServiceID
+	}
+	return ""
+}
+
+func (x *HealthCheck) GetServiceName() string {
+	if x != nil {
+		return x.ServiceName
+	}
+	return ""
+}
+
+func (x *HealthCheck) GetServiceTags() []string {
+	if x != nil {
+		return x.ServiceTags
+	}
+	return nil
+}
+
+func (x *HealthCheck) GetType() string {
+	if x != nil {
+		return x.Type
+	}
+	return ""
+}
+
+func (x *HealthCheck) GetDefinition() *HealthCheckDefinition {
+	if x != nil {
+		return x.Definition
+	}
+	return nil
+}
+
+func (x *HealthCheck) GetRaftIndex() *pbcommon.RaftIndex {
+	if x != nil {
+		return x.RaftIndex
+	}
+	return nil
+}
+
+func (x *HealthCheck) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
+	}
+	return nil
+}
+
+func (x *HealthCheck) GetExposedPort() int32 {
+	if x != nil {
+		return x.ExposedPort
+	}
+	return 0
+}
+
+func (x *HealthCheck) GetInterval() string {
+	if x != nil {
+		return x.Interval
+	}
+	return ""
+}
+
+func (x *HealthCheck) GetTimeout() string {
+	if x != nil {
+		return x.Timeout
+	}
+	return ""
+}
+
+func (x *HealthCheck) GetPeerName() string {
+	if x != nil {
+		return x.PeerName
+	}
+	return ""
+}
+
+type HeaderValue struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Value []string `protobuf:"bytes,1,rep,name=Value,proto3" json:"Value,omitempty"`
+}
+
+func (x *HeaderValue) Reset() {
+	*x = HeaderValue{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_healthcheck_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HeaderValue) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HeaderValue) ProtoMessage() {}
+
+func (x *HeaderValue) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_healthcheck_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HeaderValue.ProtoReflect.Descriptor instead.
+func (*HeaderValue) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_healthcheck_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *HeaderValue) GetValue() []string {
+	if x != nil {
+		return x.Value
+	}
+	return nil
+}
+
+// HealthCheckDefinition of a single HealthCheck.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.HealthCheckDefinition
+// output=healthcheck.gen.go
+// name=Structs
+type HealthCheckDefinition struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	HTTP          string `protobuf:"bytes,1,opt,name=HTTP,proto3" json:"HTTP,omitempty"`
+	TLSServerName string `protobuf:"bytes,19,opt,name=TLSServerName,proto3" json:"TLSServerName,omitempty"`
+	TLSSkipVerify bool   `protobuf:"varint,2,opt,name=TLSSkipVerify,proto3" json:"TLSSkipVerify,omitempty"`
+	// mog: func-to=MapHeadersToStructs func-from=NewMapHeadersFromStructs
+	Header           map[string]*HeaderValue `protobuf:"bytes,3,rep,name=Header,proto3" json:"Header,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Method           string                  `protobuf:"bytes,4,opt,name=Method,proto3" json:"Method,omitempty"`
+	Body             string                  `protobuf:"bytes,18,opt,name=Body,proto3" json:"Body,omitempty"`
+	DisableRedirects bool                    `protobuf:"varint,22,opt,name=DisableRedirects,proto3" json:"DisableRedirects,omitempty"`
+	TCP              string                  `protobuf:"bytes,5,opt,name=TCP,proto3" json:"TCP,omitempty"`
+	UDP              string                  `protobuf:"bytes,23,opt,name=UDP,proto3" json:"UDP,omitempty"`
+	OSService        string                  `protobuf:"bytes,24,opt,name=OSService,proto3" json:"OSService,omitempty"`
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	Interval *durationpb.Duration `protobuf:"bytes,6,opt,name=Interval,proto3" json:"Interval,omitempty"`
+	// mog: func-to=uint func-from=uint32
+	OutputMaxSize uint32 `protobuf:"varint,9,opt,name=OutputMaxSize,proto3" json:"OutputMaxSize,omitempty"`
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	Timeout *durationpb.Duration `protobuf:"bytes,7,opt,name=Timeout,proto3" json:"Timeout,omitempty"`
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	DeregisterCriticalServiceAfter *durationpb.Duration `protobuf:"bytes,8,opt,name=DeregisterCriticalServiceAfter,proto3" json:"DeregisterCriticalServiceAfter,omitempty"`
+	ScriptArgs                     []string             `protobuf:"bytes,10,rep,name=ScriptArgs,proto3" json:"ScriptArgs,omitempty"`
+	DockerContainerID              string               `protobuf:"bytes,11,opt,name=DockerContainerID,proto3" json:"DockerContainerID,omitempty"`
+	Shell                          string               `protobuf:"bytes,12,opt,name=Shell,proto3" json:"Shell,omitempty"`
+	H2PING                         string               `protobuf:"bytes,20,opt,name=H2PING,proto3" json:"H2PING,omitempty"`
+	H2PingUseTLS                   bool                 `protobuf:"varint,21,opt,name=H2PingUseTLS,proto3" json:"H2PingUseTLS,omitempty"`
+	GRPC                           string               `protobuf:"bytes,13,opt,name=GRPC,proto3" json:"GRPC,omitempty"`
+	GRPCUseTLS                     bool                 `protobuf:"varint,14,opt,name=GRPCUseTLS,proto3" json:"GRPCUseTLS,omitempty"`
+	AliasNode                      string               `protobuf:"bytes,15,opt,name=AliasNode,proto3" json:"AliasNode,omitempty"`
+	AliasService                   string               `protobuf:"bytes,16,opt,name=AliasService,proto3" json:"AliasService,omitempty"`
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	TTL *durationpb.Duration `protobuf:"bytes,17,opt,name=TTL,proto3" json:"TTL,omitempty"`
+}
+
+func (x *HealthCheckDefinition) Reset() {
+	*x = HealthCheckDefinition{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_healthcheck_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HealthCheckDefinition) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HealthCheckDefinition) ProtoMessage() {}
+
+func (x *HealthCheckDefinition) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_healthcheck_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HealthCheckDefinition.ProtoReflect.Descriptor instead.
+func (*HealthCheckDefinition) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_healthcheck_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *HealthCheckDefinition) GetHTTP() string {
+	if x != nil {
+		return x.HTTP
+	}
+	return ""
+}
+
+func (x *HealthCheckDefinition) GetTLSServerName() string {
+	if x != nil {
+		return x.TLSServerName
+	}
+	return ""
+}
+
+func (x *HealthCheckDefinition) GetTLSSkipVerify() bool {
+	if x != nil {
+		return x.TLSSkipVerify
+	}
+	return false
+}
+
+func (x *HealthCheckDefinition) GetHeader() map[string]*HeaderValue {
+	if x != nil {
+		return x.Header
+	}
+	return nil
+}
+
+func (x *HealthCheckDefinition) GetMethod() string {
+	if x != nil {
+		return x.Method
+	}
+	return ""
+}
+
+func (x *HealthCheckDefinition) GetBody() string {
+	if x != nil {
+		return x.Body
+	}
+	return ""
+}
+
+func (x *HealthCheckDefinition) GetDisableRedirects() bool {
+	if x != nil {
+		return x.DisableRedirects
+	}
+	return false
+}
+
+func (x *HealthCheckDefinition) GetTCP() string {
+	if x != nil {
+		return x.TCP
+	}
+	return ""
+}
+
+func (x *HealthCheckDefinition) GetUDP() string {
+	if x != nil {
+		return x.UDP
+	}
+	return ""
+}
+
+func (x *HealthCheckDefinition) GetOSService() string {
+	if x != nil {
+		return x.OSService
+	}
+	return ""
+}
+
+func (x *HealthCheckDefinition) GetInterval() *durationpb.Duration {
+	if x != nil {
+		return x.Interval
+	}
+	return nil
+}
+
+func (x *HealthCheckDefinition) GetOutputMaxSize() uint32 {
+	if x != nil {
+		return x.OutputMaxSize
+	}
+	return 0
+}
+
+func (x *HealthCheckDefinition) GetTimeout() *durationpb.Duration {
+	if x != nil {
+		return x.Timeout
+	}
+	return nil
+}
+
+func (x *HealthCheckDefinition) GetDeregisterCriticalServiceAfter() *durationpb.Duration {
+	if x != nil {
+		return x.DeregisterCriticalServiceAfter
+	}
+	return nil
+}
+
+func (x *HealthCheckDefinition) GetScriptArgs() []string {
+	if x != nil {
+		return x.ScriptArgs
+	}
+	return nil
+}
+
+func (x *HealthCheckDefinition) GetDockerContainerID() string {
+	if x != nil {
+		return x.DockerContainerID
+	}
+	return ""
+}
+
+func (x *HealthCheckDefinition) GetShell() string {
+	if x != nil {
+		return x.Shell
+	}
+	return ""
+}
+
+func (x *HealthCheckDefinition) GetH2PING() string {
+	if x != nil {
+		return x.H2PING
+	}
+	return ""
+}
+
+func (x *HealthCheckDefinition) GetH2PingUseTLS() bool {
+	if x != nil {
+		return x.H2PingUseTLS
+	}
+	return false
+}
+
+func (x *HealthCheckDefinition) GetGRPC() string {
+	if x != nil {
+		return x.GRPC
+	}
+	return ""
+}
+
+func (x *HealthCheckDefinition) GetGRPCUseTLS() bool {
+	if x != nil {
+		return x.GRPCUseTLS
+	}
+	return false
+}
+
+func (x *HealthCheckDefinition) GetAliasNode() string {
+	if x != nil {
+		return x.AliasNode
+	}
+	return ""
+}
+
+func (x *HealthCheckDefinition) GetAliasService() string {
+	if x != nil {
+		return x.AliasService
+	}
+	return ""
+}
+
+func (x *HealthCheckDefinition) GetTTL() *durationpb.Duration {
+	if x != nil {
+		return x.TTL
+	}
+	return nil
+}
+
+// CheckType is used to create either the CheckMonitor or the CheckTTL.
+// The following types are supported: Script, HTTP, TCP, Docker, TTL, GRPC,
+// Alias. Script, H2PING,
+// HTTP, Docker, TCP, H2PING and GRPC all require Interval. Only one of the types may
+// to be provided: TTL or Script/Interval or HTTP/Interval or TCP/Interval or
+// Docker/Interval or GRPC/Interval or H2PING/Interval or AliasService.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.CheckType
+// output=healthcheck.gen.go
+// name=Structs
+type CheckType struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=CheckIDType func-from=string
+	CheckID    string   `protobuf:"bytes,1,opt,name=CheckID,proto3" json:"CheckID,omitempty"`
+	Name       string   `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
+	Status     string   `protobuf:"bytes,3,opt,name=Status,proto3" json:"Status,omitempty"`
+	Notes      string   `protobuf:"bytes,4,opt,name=Notes,proto3" json:"Notes,omitempty"`
+	ScriptArgs []string `protobuf:"bytes,5,rep,name=ScriptArgs,proto3" json:"ScriptArgs,omitempty"`
+	HTTP       string   `protobuf:"bytes,6,opt,name=HTTP,proto3" json:"HTTP,omitempty"`
+	// mog: func-to=MapHeadersToStructs func-from=NewMapHeadersFromStructs
+	Header           map[string]*HeaderValue `protobuf:"bytes,20,rep,name=Header,proto3" json:"Header,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Method           string                  `protobuf:"bytes,7,opt,name=Method,proto3" json:"Method,omitempty"`
+	Body             string                  `protobuf:"bytes,26,opt,name=Body,proto3" json:"Body,omitempty"`
+	DisableRedirects bool                    `protobuf:"varint,31,opt,name=DisableRedirects,proto3" json:"DisableRedirects,omitempty"`
+	TCP              string                  `protobuf:"bytes,8,opt,name=TCP,proto3" json:"TCP,omitempty"`
+	UDP              string                  `protobuf:"bytes,32,opt,name=UDP,proto3" json:"UDP,omitempty"`
+	OSService        string                  `protobuf:"bytes,33,opt,name=OSService,proto3" json:"OSService,omitempty"`
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	Interval          *durationpb.Duration `protobuf:"bytes,9,opt,name=Interval,proto3" json:"Interval,omitempty"`
+	AliasNode         string               `protobuf:"bytes,10,opt,name=AliasNode,proto3" json:"AliasNode,omitempty"`
+	AliasService      string               `protobuf:"bytes,11,opt,name=AliasService,proto3" json:"AliasService,omitempty"`
+	DockerContainerID string               `protobuf:"bytes,12,opt,name=DockerContainerID,proto3" json:"DockerContainerID,omitempty"`
+	Shell             string               `protobuf:"bytes,13,opt,name=Shell,proto3" json:"Shell,omitempty"`
+	H2PING            string               `protobuf:"bytes,28,opt,name=H2PING,proto3" json:"H2PING,omitempty"`
+	H2PingUseTLS      bool                 `protobuf:"varint,30,opt,name=H2PingUseTLS,proto3" json:"H2PingUseTLS,omitempty"`
+	GRPC              string               `protobuf:"bytes,14,opt,name=GRPC,proto3" json:"GRPC,omitempty"`
+	GRPCUseTLS        bool                 `protobuf:"varint,15,opt,name=GRPCUseTLS,proto3" json:"GRPCUseTLS,omitempty"`
+	TLSServerName     string               `protobuf:"bytes,27,opt,name=TLSServerName,proto3" json:"TLSServerName,omitempty"`
+	TLSSkipVerify     bool                 `protobuf:"varint,16,opt,name=TLSSkipVerify,proto3" json:"TLSSkipVerify,omitempty"`
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	Timeout *durationpb.Duration `protobuf:"bytes,17,opt,name=Timeout,proto3" json:"Timeout,omitempty"`
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	TTL *durationpb.Duration `protobuf:"bytes,18,opt,name=TTL,proto3" json:"TTL,omitempty"`
+	// mog: func-to=int func-from=int32
+	SuccessBeforePassing int32 `protobuf:"varint,21,opt,name=SuccessBeforePassing,proto3" json:"SuccessBeforePassing,omitempty"`
+	// mog: func-to=int func-from=int32
+	FailuresBeforeWarning int32 `protobuf:"varint,29,opt,name=FailuresBeforeWarning,proto3" json:"FailuresBeforeWarning,omitempty"`
+	// mog: func-to=int func-from=int32
+	FailuresBeforeCritical int32 `protobuf:"varint,22,opt,name=FailuresBeforeCritical,proto3" json:"FailuresBeforeCritical,omitempty"`
+	// Definition fields used when exposing checks through a proxy
+	ProxyHTTP string `protobuf:"bytes,23,opt,name=ProxyHTTP,proto3" json:"ProxyHTTP,omitempty"`
+	ProxyGRPC string `protobuf:"bytes,24,opt,name=ProxyGRPC,proto3" json:"ProxyGRPC,omitempty"`
+	// DeregisterCriticalServiceAfter, if >0, will cause the associated
+	// service, if any, to be deregistered if this check is critical for
+	// longer than this duration.
+	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
+	DeregisterCriticalServiceAfter *durationpb.Duration `protobuf:"bytes,19,opt,name=DeregisterCriticalServiceAfter,proto3" json:"DeregisterCriticalServiceAfter,omitempty"`
+	// mog: func-to=int func-from=int32
+	OutputMaxSize int32 `protobuf:"varint,25,opt,name=OutputMaxSize,proto3" json:"OutputMaxSize,omitempty"`
+}
+
+func (x *CheckType) Reset() {
+	*x = CheckType{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_healthcheck_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CheckType) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CheckType) ProtoMessage() {}
+
+func (x *CheckType) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_healthcheck_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CheckType.ProtoReflect.Descriptor instead.
+func (*CheckType) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_healthcheck_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *CheckType) GetCheckID() string {
+	if x != nil {
+		return x.CheckID
+	}
+	return ""
+}
+
+func (x *CheckType) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *CheckType) GetStatus() string {
+	if x != nil {
+		return x.Status
+	}
+	return ""
+}
+
+func (x *CheckType) GetNotes() string {
+	if x != nil {
+		return x.Notes
+	}
+	return ""
+}
+
+func (x *CheckType) GetScriptArgs() []string {
+	if x != nil {
+		return x.ScriptArgs
+	}
+	return nil
+}
+
+func (x *CheckType) GetHTTP() string {
+	if x != nil {
+		return x.HTTP
+	}
+	return ""
+}
+
+func (x *CheckType) GetHeader() map[string]*HeaderValue {
+	if x != nil {
+		return x.Header
+	}
+	return nil
+}
+
+func (x *CheckType) GetMethod() string {
+	if x != nil {
+		return x.Method
+	}
+	return ""
+}
+
+func (x *CheckType) GetBody() string {
+	if x != nil {
+		return x.Body
+	}
+	return ""
+}
+
+func (x *CheckType) GetDisableRedirects() bool {
+	if x != nil {
+		return x.DisableRedirects
+	}
+	return false
+}
+
+func (x *CheckType) GetTCP() string {
+	if x != nil {
+		return x.TCP
+	}
+	return ""
+}
+
+func (x *CheckType) GetUDP() string {
+	if x != nil {
+		return x.UDP
+	}
+	return ""
+}
+
+func (x *CheckType) GetOSService() string {
+	if x != nil {
+		return x.OSService
+	}
+	return ""
+}
+
+func (x *CheckType) GetInterval() *durationpb.Duration {
+	if x != nil {
+		return x.Interval
+	}
+	return nil
+}
+
+func (x *CheckType) GetAliasNode() string {
+	if x != nil {
+		return x.AliasNode
+	}
+	return ""
+}
+
+func (x *CheckType) GetAliasService() string {
+	if x != nil {
+		return x.AliasService
+	}
+	return ""
+}
+
+func (x *CheckType) GetDockerContainerID() string {
+	if x != nil {
+		return x.DockerContainerID
+	}
+	return ""
+}
+
+func (x *CheckType) GetShell() string {
+	if x != nil {
+		return x.Shell
+	}
+	return ""
+}
+
+func (x *CheckType) GetH2PING() string {
+	if x != nil {
+		return x.H2PING
+	}
+	return ""
+}
+
+func (x *CheckType) GetH2PingUseTLS() bool {
+	if x != nil {
+		return x.H2PingUseTLS
+	}
+	return false
+}
+
+func (x *CheckType) GetGRPC() string {
+	if x != nil {
+		return x.GRPC
+	}
+	return ""
+}
+
+func (x *CheckType) GetGRPCUseTLS() bool {
+	if x != nil {
+		return x.GRPCUseTLS
+	}
+	return false
+}
+
+func (x *CheckType) GetTLSServerName() string {
+	if x != nil {
+		return x.TLSServerName
+	}
+	return ""
+}
+
+func (x *CheckType) GetTLSSkipVerify() bool {
+	if x != nil {
+		return x.TLSSkipVerify
+	}
+	return false
+}
+
+func (x *CheckType) GetTimeout() *durationpb.Duration {
+	if x != nil {
+		return x.Timeout
+	}
+	return nil
+}
+
+func (x *CheckType) GetTTL() *durationpb.Duration {
+	if x != nil {
+		return x.TTL
+	}
+	return nil
+}
+
+func (x *CheckType) GetSuccessBeforePassing() int32 {
+	if x != nil {
+		return x.SuccessBeforePassing
+	}
+	return 0
+}
+
+func (x *CheckType) GetFailuresBeforeWarning() int32 {
+	if x != nil {
+		return x.FailuresBeforeWarning
+	}
+	return 0
+}
+
+func (x *CheckType) GetFailuresBeforeCritical() int32 {
+	if x != nil {
+		return x.FailuresBeforeCritical
+	}
+	return 0
+}
+
+func (x *CheckType) GetProxyHTTP() string {
+	if x != nil {
+		return x.ProxyHTTP
+	}
+	return ""
+}
+
+func (x *CheckType) GetProxyGRPC() string {
+	if x != nil {
+		return x.ProxyGRPC
+	}
+	return ""
+}
+
+func (x *CheckType) GetDeregisterCriticalServiceAfter() *durationpb.Duration {
+	if x != nil {
+		return x.DeregisterCriticalServiceAfter
+	}
+	return nil
+}
+
+func (x *CheckType) GetOutputMaxSize() int32 {
+	if x != nil {
+		return x.OutputMaxSize
+	}
+	return 0
+}
+
+var File_proto_pbservice_healthcheck_proto protoreflect.FileDescriptor
+
+var file_proto_pbservice_healthcheck_proto_rawDesc = []byte{
+	0x0a, 0x21, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x12, 0x21, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x22, 0xfe, 0x04, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68,
+	0x65, 0x63, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x68, 0x65, 0x63, 0x6b,
+	0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49,
+	0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x14, 0x0a,
+	0x05, 0x4e, 0x6f, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4e, 0x6f,
+	0x74, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x44, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x0b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x73, 0x12, 0x12, 0x0a,
+	0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x79, 0x70,
+	0x65, 0x12, 0x58, 0x0a, 0x0a, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18,
+	0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68,
+	0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x0a, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x49, 0x0a, 0x09, 0x52,
+	0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
+	0x6e, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x09, 0x52, 0x61, 0x66,
+	0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70,
+	0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
+	0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61,
+	0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61,
+	0x12, 0x20, 0x0a, 0x0b, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x18,
+	0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x64, 0x50, 0x6f,
+	0x72, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x0f,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x18,
+	0x0a, 0x07, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x65, 0x65, 0x72,
+	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x65, 0x65, 0x72,
+	0x4e, 0x61, 0x6d, 0x65, 0x22, 0x23, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x92, 0x08, 0x0a, 0x15, 0x48, 0x65,
+	0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x48, 0x54, 0x54, 0x50, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x48, 0x54, 0x54, 0x50, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x4c, 0x53, 0x53, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d,
+	0x54, 0x4c, 0x53, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a,
+	0x0d, 0x54, 0x4c, 0x53, 0x53, 0x6b, 0x69, 0x70, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x54, 0x4c, 0x53, 0x53, 0x6b, 0x69, 0x70, 0x56, 0x65, 0x72,
+	0x69, 0x66, 0x79, 0x12, 0x5c, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x44, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68,
+	0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0x12, 0x16, 0x0a, 0x06, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x06, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x42, 0x6f, 0x64,
+	0x79, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x42, 0x6f, 0x64, 0x79, 0x12, 0x2a, 0x0a,
+	0x10, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74,
+	0x73, 0x18, 0x16, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65,
+	0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x43, 0x50,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x54, 0x43, 0x50, 0x12, 0x10, 0x0a, 0x03, 0x55,
+	0x44, 0x50, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x44, 0x50, 0x12, 0x1c, 0x0a,
+	0x09, 0x4f, 0x53, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x09, 0x4f, 0x53, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x49,
+	0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76,
+	0x61, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x4d, 0x61, 0x78, 0x53,
+	0x69, 0x7a, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x4f, 0x75, 0x74, 0x70, 0x75,
+	0x74, 0x4d, 0x61, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x33, 0x0a, 0x07, 0x54, 0x69, 0x6d, 0x65,
+	0x6f, 0x75, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x61, 0x0a,
+	0x1e, 0x44, 0x65, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x72, 0x69, 0x74, 0x69,
+	0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x66, 0x74, 0x65, 0x72, 0x18,
+	0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x1e, 0x44, 0x65, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x72, 0x69, 0x74,
+	0x69, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x66, 0x74, 0x65, 0x72,
+	0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x41, 0x72, 0x67, 0x73, 0x18, 0x0a,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x41, 0x72, 0x67, 0x73,
+	0x12, 0x2c, 0x0a, 0x11, 0x44, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69,
+	0x6e, 0x65, 0x72, 0x49, 0x44, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x44, 0x6f, 0x63,
+	0x6b, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x12, 0x14,
+	0x0a, 0x05, 0x53, 0x68, 0x65, 0x6c, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x53,
+	0x68, 0x65, 0x6c, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x48, 0x32, 0x50, 0x49, 0x4e, 0x47, 0x18, 0x14,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x48, 0x32, 0x50, 0x49, 0x4e, 0x47, 0x12, 0x22, 0x0a, 0x0c,
+	0x48, 0x32, 0x50, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x54, 0x4c, 0x53, 0x18, 0x15, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0c, 0x48, 0x32, 0x50, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x54, 0x4c, 0x53,
+	0x12, 0x12, 0x0a, 0x04, 0x47, 0x52, 0x50, 0x43, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x47, 0x52, 0x50, 0x43, 0x12, 0x1e, 0x0a, 0x0a, 0x47, 0x52, 0x50, 0x43, 0x55, 0x73, 0x65, 0x54,
+	0x4c, 0x53, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x47, 0x52, 0x50, 0x43, 0x55, 0x73,
+	0x65, 0x54, 0x4c, 0x53, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x4e, 0x6f, 0x64,
+	0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x4e, 0x6f,
+	0x64, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x2b, 0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18, 0x11, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03,
+	0x54, 0x54, 0x4c, 0x1a, 0x69, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x6b, 0x65, 0x79, 0x12, 0x44, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb4,
+	0x0a, 0x0a, 0x09, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07,
+	0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x43,
+	0x68, 0x65, 0x63, 0x6b, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x53, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x4e, 0x6f, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x05, 0x4e, 0x6f, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x41, 0x72, 0x67, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x41, 0x72, 0x67, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x48, 0x54, 0x54, 0x50,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x48, 0x54, 0x54, 0x50, 0x12, 0x50, 0x0a, 0x06,
+	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x16,
+	0x0a, 0x06, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x42, 0x6f, 0x64, 0x79, 0x18, 0x1a,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x42, 0x6f, 0x64, 0x79, 0x12, 0x2a, 0x0a, 0x10, 0x44, 0x69,
+	0x73, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x18, 0x1f,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x64,
+	0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x43, 0x50, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x54, 0x43, 0x50, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x44, 0x50, 0x18,
+	0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x44, 0x50, 0x12, 0x1c, 0x0a, 0x09, 0x4f, 0x53,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x21, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x4f,
+	0x53, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65,
+	0x72, 0x76, 0x61, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12,
+	0x1c, 0x0a, 0x09, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x4e, 0x6f, 0x64, 0x65, 0x18, 0x0a, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x22, 0x0a,
+	0x0c, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x0b, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0c, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x12, 0x2c, 0x0a, 0x11, 0x44, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x61,
+	0x69, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x44, 0x6f,
+	0x63, 0x6b, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x12,
+	0x14, 0x0a, 0x05, 0x53, 0x68, 0x65, 0x6c, 0x6c, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x53, 0x68, 0x65, 0x6c, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x48, 0x32, 0x50, 0x49, 0x4e, 0x47, 0x18,
+	0x1c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x48, 0x32, 0x50, 0x49, 0x4e, 0x47, 0x12, 0x22, 0x0a,
+	0x0c, 0x48, 0x32, 0x50, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x54, 0x4c, 0x53, 0x18, 0x1e, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0c, 0x48, 0x32, 0x50, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x54, 0x4c,
+	0x53, 0x12, 0x12, 0x0a, 0x04, 0x47, 0x52, 0x50, 0x43, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x47, 0x52, 0x50, 0x43, 0x12, 0x1e, 0x0a, 0x0a, 0x47, 0x52, 0x50, 0x43, 0x55, 0x73, 0x65,
+	0x54, 0x4c, 0x53, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x47, 0x52, 0x50, 0x43, 0x55,
+	0x73, 0x65, 0x54, 0x4c, 0x53, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x4c, 0x53, 0x53, 0x65, 0x72, 0x76,
+	0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x54, 0x4c,
+	0x53, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x54,
+	0x4c, 0x53, 0x53, 0x6b, 0x69, 0x70, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x18, 0x10, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0d, 0x54, 0x4c, 0x53, 0x53, 0x6b, 0x69, 0x70, 0x56, 0x65, 0x72, 0x69, 0x66,
+	0x79, 0x12, 0x33, 0x0a, 0x07, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x11, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x54,
+	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x2b, 0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18, 0x12, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03,
+	0x54, 0x54, 0x4c, 0x12, 0x32, 0x0a, 0x14, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x42, 0x65,
+	0x66, 0x6f, 0x72, 0x65, 0x50, 0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x14, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65,
+	0x50, 0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x12, 0x34, 0x0a, 0x15, 0x46, 0x61, 0x69, 0x6c, 0x75,
+	0x72, 0x65, 0x73, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67,
+	0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x15, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x73,
+	0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x12, 0x36, 0x0a,
+	0x16, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x73, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x43,
+	0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x18, 0x16, 0x20, 0x01, 0x28, 0x05, 0x52, 0x16, 0x46,
+	0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x73, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x43, 0x72, 0x69,
+	0x74, 0x69, 0x63, 0x61, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x48, 0x54,
+	0x54, 0x50, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x48,
+	0x54, 0x54, 0x50, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x47, 0x52, 0x50, 0x43,
+	0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x47, 0x52, 0x50,
+	0x43, 0x12, 0x61, 0x0a, 0x1e, 0x44, 0x65, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43,
+	0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x66,
+	0x74, 0x65, 0x72, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x1e, 0x44, 0x65, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72,
+	0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41,
+	0x66, 0x74, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x4d, 0x61,
+	0x78, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x4f, 0x75, 0x74,
+	0x70, 0x75, 0x74, 0x4d, 0x61, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x1a, 0x69, 0x0a, 0x0b, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x44, 0x0a, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x48,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x8e, 0x02, 0x0a, 0x25, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42,
+	0x10, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x53, 0xaa, 0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xca, 0x02, 0x21, 0x48, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xe2,
+	0x02, 0x2d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
+	0x02, 0x24, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_pbservice_healthcheck_proto_rawDescOnce sync.Once
+	file_proto_pbservice_healthcheck_proto_rawDescData = file_proto_pbservice_healthcheck_proto_rawDesc
+)
+
+func file_proto_pbservice_healthcheck_proto_rawDescGZIP() []byte {
+	file_proto_pbservice_healthcheck_proto_rawDescOnce.Do(func() {
+		file_proto_pbservice_healthcheck_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbservice_healthcheck_proto_rawDescData)
+	})
+	return file_proto_pbservice_healthcheck_proto_rawDescData
+}
+
+var file_proto_pbservice_healthcheck_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_proto_pbservice_healthcheck_proto_goTypes = []interface{}{
+	(*HealthCheck)(nil),             // 0: hashicorp.consul.internal.service.HealthCheck
+	(*HeaderValue)(nil),             // 1: hashicorp.consul.internal.service.HeaderValue
+	(*HealthCheckDefinition)(nil),   // 2: hashicorp.consul.internal.service.HealthCheckDefinition
+	(*CheckType)(nil),               // 3: hashicorp.consul.internal.service.CheckType
+	nil,                             // 4: hashicorp.consul.internal.service.HealthCheckDefinition.HeaderEntry
+	nil,                             // 5: hashicorp.consul.internal.service.CheckType.HeaderEntry
+	(*pbcommon.RaftIndex)(nil),      // 6: hashicorp.consul.internal.common.RaftIndex
+	(*pbcommon.EnterpriseMeta)(nil), // 7: hashicorp.consul.internal.common.EnterpriseMeta
+	(*durationpb.Duration)(nil),     // 8: google.protobuf.Duration
+}
+var file_proto_pbservice_healthcheck_proto_depIdxs = []int32{
+	2,  // 0: hashicorp.consul.internal.service.HealthCheck.Definition:type_name -> hashicorp.consul.internal.service.HealthCheckDefinition
+	6,  // 1: hashicorp.consul.internal.service.HealthCheck.RaftIndex:type_name -> hashicorp.consul.internal.common.RaftIndex
+	7,  // 2: hashicorp.consul.internal.service.HealthCheck.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
+	4,  // 3: hashicorp.consul.internal.service.HealthCheckDefinition.Header:type_name -> hashicorp.consul.internal.service.HealthCheckDefinition.HeaderEntry
+	8,  // 4: hashicorp.consul.internal.service.HealthCheckDefinition.Interval:type_name -> google.protobuf.Duration
+	8,  // 5: hashicorp.consul.internal.service.HealthCheckDefinition.Timeout:type_name -> google.protobuf.Duration
+	8,  // 6: hashicorp.consul.internal.service.HealthCheckDefinition.DeregisterCriticalServiceAfter:type_name -> google.protobuf.Duration
+	8,  // 7: hashicorp.consul.internal.service.HealthCheckDefinition.TTL:type_name -> google.protobuf.Duration
+	5,  // 8: hashicorp.consul.internal.service.CheckType.Header:type_name -> hashicorp.consul.internal.service.CheckType.HeaderEntry
+	8,  // 9: hashicorp.consul.internal.service.CheckType.Interval:type_name -> google.protobuf.Duration
+	8,  // 10: hashicorp.consul.internal.service.CheckType.Timeout:type_name -> google.protobuf.Duration
+	8,  // 11: hashicorp.consul.internal.service.CheckType.TTL:type_name -> google.protobuf.Duration
+	8,  // 12: hashicorp.consul.internal.service.CheckType.DeregisterCriticalServiceAfter:type_name -> google.protobuf.Duration
+	1,  // 13: hashicorp.consul.internal.service.HealthCheckDefinition.HeaderEntry.value:type_name -> hashicorp.consul.internal.service.HeaderValue
+	1,  // 14: hashicorp.consul.internal.service.CheckType.HeaderEntry.value:type_name -> hashicorp.consul.internal.service.HeaderValue
+	15, // [15:15] is the sub-list for method output_type
+	15, // [15:15] is the sub-list for method input_type
+	15, // [15:15] is the sub-list for extension type_name
+	15, // [15:15] is the sub-list for extension extendee
+	0,  // [0:15] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbservice_healthcheck_proto_init() }
+func file_proto_pbservice_healthcheck_proto_init() {
+	if File_proto_pbservice_healthcheck_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbservice_healthcheck_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HealthCheck); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_healthcheck_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HeaderValue); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_healthcheck_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HealthCheckDefinition); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_healthcheck_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CheckType); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbservice_healthcheck_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   6,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbservice_healthcheck_proto_goTypes,
+		DependencyIndexes: file_proto_pbservice_healthcheck_proto_depIdxs,
+		MessageInfos:      file_proto_pbservice_healthcheck_proto_msgTypes,
+	}.Build()
+	File_proto_pbservice_healthcheck_proto = out.File
+	file_proto_pbservice_healthcheck_proto_rawDesc = nil
+	file_proto_pbservice_healthcheck_proto_goTypes = nil
+	file_proto_pbservice_healthcheck_proto_depIdxs = nil
+}
diff --git a/proto/private/pbservice/healthcheck.proto b/proto/pbservice/healthcheck.proto
similarity index 96%
rename from proto/private/pbservice/healthcheck.proto
rename to proto/pbservice/healthcheck.proto
index d75a7fc7c71bc..8e6c8766951a1 100644
--- a/proto/private/pbservice/healthcheck.proto
+++ b/proto/pbservice/healthcheck.proto
@@ -1,12 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 syntax = "proto3";
 
 package hashicorp.consul.internal.service;
 
 import "google/protobuf/duration.proto";
-import "private/pbcommon/common.proto";
+import "proto/pbcommon/common.proto";
 
 // HealthCheck represents a single check on a given node
 //
@@ -66,7 +63,6 @@ message HealthCheckDefinition {
   string Body = 18;
   bool DisableRedirects = 22;
   string TCP = 5;
-  bool TCPUseTLS = 25;
   string UDP = 23;
   string OSService = 24;
   // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
@@ -118,7 +114,6 @@ message CheckType {
   string Body = 26;
   bool DisableRedirects = 31;
   string TCP = 8;
-  bool TCPUseTLS = 34;
   string UDP = 32;
   string OSService = 33;
   // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
diff --git a/proto/pbservice/ids.go b/proto/pbservice/ids.go
new file mode 100644
index 0000000000000..d2a85c7fcd202
--- /dev/null
+++ b/proto/pbservice/ids.go
@@ -0,0 +1,47 @@
+package pbservice
+
+import (
+	"strings"
+)
+
+// UniqueID returns a unique identifier for this CheckServiceNode, which includes
+// the node name, service namespace, and service ID.
+//
+// The returned ID uses slashes to separate the identifiers, however the node name
+// may also contain a slash, so it is not possible to parse this identifier to
+// retrieve its constituent parts.
+//
+// This function is similar to structs.UniqueID, however at this time no guarantees
+// are made that it will remain the same.
+func (m *CheckServiceNode) UniqueID() string {
+	if m == nil {
+		return ""
+	}
+	builder := new(strings.Builder)
+
+	switch {
+	case m.Node != nil:
+		builder.WriteString(m.Node.Partition + "/")
+		builder.WriteString(m.Node.PeerName + "/")
+	case m.Service != nil:
+		partition := ""
+		if m.Service.EnterpriseMeta != nil {
+			partition = m.Service.EnterpriseMeta.Partition
+		}
+		builder.WriteString(partition + "/")
+		builder.WriteString(m.Service.PeerName + "/")
+	}
+
+	if m.Node != nil {
+		builder.WriteString(m.Node.Node + "/")
+	}
+	if m.Service != nil {
+		namespace := ""
+		if m.Service.EnterpriseMeta != nil {
+			namespace = m.Service.EnterpriseMeta.Namespace
+		}
+		builder.WriteString(namespace + "/")
+		builder.WriteString(m.Service.ID)
+	}
+	return builder.String()
+}
diff --git a/proto/private/pbservice/ids_test.go b/proto/pbservice/ids_test.go
similarity index 96%
rename from proto/private/pbservice/ids_test.go
rename to proto/pbservice/ids_test.go
index 9477bb8d9bb72..3c933db4b42d9 100644
--- a/proto/private/pbservice/ids_test.go
+++ b/proto/pbservice/ids_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pbservice
 
 import (
@@ -8,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/hashicorp/consul/proto/private/pbcommon"
+	"github.com/hashicorp/consul/proto/pbcommon"
 )
 
 func TestCheckServiceNode_UniqueID(t *testing.T) {
diff --git a/proto/private/pbservice/node.gen.go b/proto/pbservice/node.gen.go
similarity index 92%
rename from proto/private/pbservice/node.gen.go
rename to proto/pbservice/node.gen.go
index fb37e933bef64..f231ea836ab9a 100644
--- a/proto/private/pbservice/node.gen.go
+++ b/proto/pbservice/node.gen.go
@@ -16,7 +16,6 @@ func NodeToStructs(s *Node, t *structs.Node) {
 	t.PeerName = s.PeerName
 	t.TaggedAddresses = s.TaggedAddresses
 	t.Meta = s.Meta
-	t.Locality = LocalityToStructs(s.Locality)
 	t.RaftIndex = RaftIndexToStructs(s.RaftIndex)
 }
 func NodeFromStructs(t *structs.Node, s *Node) {
@@ -31,7 +30,6 @@ func NodeFromStructs(t *structs.Node, s *Node) {
 	s.PeerName = t.PeerName
 	s.TaggedAddresses = t.TaggedAddresses
 	s.Meta = t.Meta
-	s.Locality = LocalityFromStructs(t.Locality)
 	s.RaftIndex = NewRaftIndexFromStructs(t.RaftIndex)
 }
 func NodeServiceToStructs(s *NodeService, t *structs.NodeService) {
@@ -49,7 +47,6 @@ func NodeServiceToStructs(s *NodeService, t *structs.NodeService) {
 	t.SocketPath = s.SocketPath
 	t.Weights = WeightsPtrToStructs(s.Weights)
 	t.EnableTagOverride = s.EnableTagOverride
-	t.Locality = LocalityToStructs(s.Locality)
 	if s.Proxy != nil {
 		ConnectProxyConfigToStructs(s.Proxy, &t.Proxy)
 	}
@@ -76,7 +73,6 @@ func NodeServiceFromStructs(t *structs.NodeService, s *NodeService) {
 	s.SocketPath = t.SocketPath
 	s.Weights = NewWeightsPtrFromStructs(t.Weights)
 	s.EnableTagOverride = t.EnableTagOverride
-	s.Locality = LocalityFromStructs(t.Locality)
 	{
 		var x ConnectProxyConfig
 		ConnectProxyConfigFromStructs(&t.Proxy, &x)
diff --git a/proto/pbservice/node.pb.binary.go b/proto/pbservice/node.pb.binary.go
new file mode 100644
index 0000000000000..feba45a1d9ab9
--- /dev/null
+++ b/proto/pbservice/node.pb.binary.go
@@ -0,0 +1,48 @@
+// Code generated by protoc-gen-go-binary. DO NOT EDIT.
+// source: proto/pbservice/node.proto
+
+package pbservice
+
+import (
+	"google.golang.org/protobuf/proto"
+)
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *IndexedCheckServiceNodes) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *IndexedCheckServiceNodes) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *CheckServiceNode) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *CheckServiceNode) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *Node) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *Node) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *NodeService) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *NodeService) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
diff --git a/proto/pbservice/node.pb.go b/proto/pbservice/node.pb.go
new file mode 100644
index 0000000000000..cebee359f567b
--- /dev/null
+++ b/proto/pbservice/node.pb.go
@@ -0,0 +1,768 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: proto/pbservice/node.proto
+
+package pbservice
+
+import (
+	pbcommon "github.com/hashicorp/consul/proto/pbcommon"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// IndexedCheckServiceNodes is used to return multiple instances for a given service.
+type IndexedCheckServiceNodes struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Index uint64              `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
+	Nodes []*CheckServiceNode `protobuf:"bytes,2,rep,name=Nodes,proto3" json:"Nodes,omitempty"`
+}
+
+func (x *IndexedCheckServiceNodes) Reset() {
+	*x = IndexedCheckServiceNodes{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_node_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *IndexedCheckServiceNodes) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IndexedCheckServiceNodes) ProtoMessage() {}
+
+func (x *IndexedCheckServiceNodes) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_node_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use IndexedCheckServiceNodes.ProtoReflect.Descriptor instead.
+func (*IndexedCheckServiceNodes) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_node_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *IndexedCheckServiceNodes) GetIndex() uint64 {
+	if x != nil {
+		return x.Index
+	}
+	return 0
+}
+
+func (x *IndexedCheckServiceNodes) GetNodes() []*CheckServiceNode {
+	if x != nil {
+		return x.Nodes
+	}
+	return nil
+}
+
+// CheckServiceNode is used to provide the node, its service
+// definition, as well as a HealthCheck that is associated.
+type CheckServiceNode struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Node    *Node          `protobuf:"bytes,1,opt,name=Node,proto3" json:"Node,omitempty"`
+	Service *NodeService   `protobuf:"bytes,2,opt,name=Service,proto3" json:"Service,omitempty"`
+	Checks  []*HealthCheck `protobuf:"bytes,3,rep,name=Checks,proto3" json:"Checks,omitempty"`
+}
+
+func (x *CheckServiceNode) Reset() {
+	*x = CheckServiceNode{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_node_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CheckServiceNode) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CheckServiceNode) ProtoMessage() {}
+
+func (x *CheckServiceNode) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_node_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CheckServiceNode.ProtoReflect.Descriptor instead.
+func (*CheckServiceNode) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_node_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *CheckServiceNode) GetNode() *Node {
+	if x != nil {
+		return x.Node
+	}
+	return nil
+}
+
+func (x *CheckServiceNode) GetService() *NodeService {
+	if x != nil {
+		return x.Service
+	}
+	return nil
+}
+
+func (x *CheckServiceNode) GetChecks() []*HealthCheck {
+	if x != nil {
+		return x.Checks
+	}
+	return nil
+}
+
+// Node contains information about a node.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.Node
+// output=node.gen.go
+// name=Structs
+type Node struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=NodeIDType func-from=string
+	ID              string            `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
+	Node            string            `protobuf:"bytes,2,opt,name=Node,proto3" json:"Node,omitempty"`
+	Partition       string            `protobuf:"bytes,8,opt,name=Partition,proto3" json:"Partition,omitempty"`
+	PeerName        string            `protobuf:"bytes,9,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
+	Address         string            `protobuf:"bytes,3,opt,name=Address,proto3" json:"Address,omitempty"`
+	Datacenter      string            `protobuf:"bytes,4,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
+	TaggedAddresses map[string]string `protobuf:"bytes,5,rep,name=TaggedAddresses,proto3" json:"TaggedAddresses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Meta            map[string]string `protobuf:"bytes,6,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// mog: func-to=RaftIndexToStructs func-from=NewRaftIndexFromStructs
+	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,7,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
+}
+
+func (x *Node) Reset() {
+	*x = Node{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_node_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Node) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Node) ProtoMessage() {}
+
+func (x *Node) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_node_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Node.ProtoReflect.Descriptor instead.
+func (*Node) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_node_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *Node) GetID() string {
+	if x != nil {
+		return x.ID
+	}
+	return ""
+}
+
+func (x *Node) GetNode() string {
+	if x != nil {
+		return x.Node
+	}
+	return ""
+}
+
+func (x *Node) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+func (x *Node) GetPeerName() string {
+	if x != nil {
+		return x.PeerName
+	}
+	return ""
+}
+
+func (x *Node) GetAddress() string {
+	if x != nil {
+		return x.Address
+	}
+	return ""
+}
+
+func (x *Node) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
+	}
+	return ""
+}
+
+func (x *Node) GetTaggedAddresses() map[string]string {
+	if x != nil {
+		return x.TaggedAddresses
+	}
+	return nil
+}
+
+func (x *Node) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *Node) GetRaftIndex() *pbcommon.RaftIndex {
+	if x != nil {
+		return x.RaftIndex
+	}
+	return nil
+}
+
+// NodeService is a service provided by a node
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.NodeService
+// output=node.gen.go
+// name=Structs
+type NodeService struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Kind is the kind of service this is. Different kinds of services may
+	// have differing validation, DNS behavior, etc. An empty kind will default
+	// to the Default kind. See ServiceKind for the full list of kinds.
+	// mog: func-to=structs.ServiceKind func-from=string
+	Kind    string   `protobuf:"bytes,1,opt,name=Kind,proto3" json:"Kind,omitempty"`
+	ID      string   `protobuf:"bytes,2,opt,name=ID,proto3" json:"ID,omitempty"`
+	Service string   `protobuf:"bytes,3,opt,name=Service,proto3" json:"Service,omitempty"`
+	Tags    []string `protobuf:"bytes,4,rep,name=Tags,proto3" json:"Tags,omitempty"`
+	Address string   `protobuf:"bytes,5,opt,name=Address,proto3" json:"Address,omitempty"`
+	// mog: func-to=MapStringServiceAddressToStructs func-from=NewMapStringServiceAddressFromStructs
+	TaggedAddresses map[string]*ServiceAddress `protobuf:"bytes,15,rep,name=TaggedAddresses,proto3" json:"TaggedAddresses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Meta            map[string]string          `protobuf:"bytes,6,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// mog: func-to=int func-from=int32
+	Port       int32  `protobuf:"varint,7,opt,name=Port,proto3" json:"Port,omitempty"`
+	SocketPath string `protobuf:"bytes,17,opt,name=SocketPath,proto3" json:"SocketPath,omitempty"`
+	// mog: func-to=WeightsPtrToStructs func-from=NewWeightsPtrFromStructs
+	Weights           *Weights `protobuf:"bytes,8,opt,name=Weights,proto3" json:"Weights,omitempty"`
+	EnableTagOverride bool     `protobuf:"varint,9,opt,name=EnableTagOverride,proto3" json:"EnableTagOverride,omitempty"`
+	// Proxy is the configuration set for Kind = connect-proxy. It is mandatory in
+	// that case and an error to be set for any other kind. This config is part of
+	// a proxy service definition and is distinct from but shares some fields with
+	// the Connect.Proxy which configures a managed proxy as part of the actual
+	// service's definition. This duplication is ugly but seemed better than the
+	// alternative which was to re-use the same struct fields for both cases even
+	// though the semantics are different and the non-shred fields make no sense
+	// in the other case. ProxyConfig may be a more natural name here, but it's
+	// confusing for the UX because one of the fields in ConnectProxyConfig is
+	// also called just "Config"
+	Proxy *ConnectProxyConfig `protobuf:"bytes,11,opt,name=Proxy,proto3" json:"Proxy,omitempty"`
+	// Connect are the Connect settings for a service. This is purposely NOT
+	// a pointer so that we never have to nil-check this.
+	Connect *ServiceConnect `protobuf:"bytes,12,opt,name=Connect,proto3" json:"Connect,omitempty"`
+	// LocallyRegisteredAsSidecar is private as it is only used by a local agent
+	// state to track if the service was registered from a nested sidecar_service
+	// block. We need to track that so we can know whether we need to deregister
+	// it automatically too if it's removed from the service definition or if the
+	// parent service is deregistered. Relying only on ID would cause us to
+	// deregister regular services if they happen to be registered using the same
+	// ID scheme as our sidecars do by default. We could use meta but that gets
+	// unpleasant because we can't use the consul- prefix from an agent (reserved
+	// for use internally but in practice that means within the state store or in
+	// responses only), and it leaks the detail publicly which people might rely
+	// on which is a bit unpleasant for something that is meant to be config-file
+	// syntax sugar. Note this is not translated to ServiceNode and friends and
+	// may not be set on a NodeService that isn't the one the agent registered and
+	// keeps in it's local state. We never want this rendered in JSON as it's
+	// internal only. Right now our agent endpoints return api structs which don't
+	// include it but this is a safety net incase we change that or there is
+	// somewhere this is used in API output.
+	LocallyRegisteredAsSidecar bool `protobuf:"varint,13,opt,name=LocallyRegisteredAsSidecar,proto3" json:"LocallyRegisteredAsSidecar,omitempty"`
+	// mog: func-to=EnterpriseMetaToStructs func-from=NewEnterpriseMetaFromStructs
+	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,16,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
+	PeerName       string                   `protobuf:"bytes,18,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
+	// mog: func-to=RaftIndexToStructs func-from=NewRaftIndexFromStructs
+	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,14,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
+}
+
+func (x *NodeService) Reset() {
+	*x = NodeService{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_node_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *NodeService) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*NodeService) ProtoMessage() {}
+
+func (x *NodeService) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_node_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use NodeService.ProtoReflect.Descriptor instead.
+func (*NodeService) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_node_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *NodeService) GetKind() string {
+	if x != nil {
+		return x.Kind
+	}
+	return ""
+}
+
+func (x *NodeService) GetID() string {
+	if x != nil {
+		return x.ID
+	}
+	return ""
+}
+
+func (x *NodeService) GetService() string {
+	if x != nil {
+		return x.Service
+	}
+	return ""
+}
+
+func (x *NodeService) GetTags() []string {
+	if x != nil {
+		return x.Tags
+	}
+	return nil
+}
+
+func (x *NodeService) GetAddress() string {
+	if x != nil {
+		return x.Address
+	}
+	return ""
+}
+
+func (x *NodeService) GetTaggedAddresses() map[string]*ServiceAddress {
+	if x != nil {
+		return x.TaggedAddresses
+	}
+	return nil
+}
+
+func (x *NodeService) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *NodeService) GetPort() int32 {
+	if x != nil {
+		return x.Port
+	}
+	return 0
+}
+
+func (x *NodeService) GetSocketPath() string {
+	if x != nil {
+		return x.SocketPath
+	}
+	return ""
+}
+
+func (x *NodeService) GetWeights() *Weights {
+	if x != nil {
+		return x.Weights
+	}
+	return nil
+}
+
+func (x *NodeService) GetEnableTagOverride() bool {
+	if x != nil {
+		return x.EnableTagOverride
+	}
+	return false
+}
+
+func (x *NodeService) GetProxy() *ConnectProxyConfig {
+	if x != nil {
+		return x.Proxy
+	}
+	return nil
+}
+
+func (x *NodeService) GetConnect() *ServiceConnect {
+	if x != nil {
+		return x.Connect
+	}
+	return nil
+}
+
+func (x *NodeService) GetLocallyRegisteredAsSidecar() bool {
+	if x != nil {
+		return x.LocallyRegisteredAsSidecar
+	}
+	return false
+}
+
+func (x *NodeService) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
+	}
+	return nil
+}
+
+func (x *NodeService) GetPeerName() string {
+	if x != nil {
+		return x.PeerName
+	}
+	return ""
+}
+
+func (x *NodeService) GetRaftIndex() *pbcommon.RaftIndex {
+	if x != nil {
+		return x.RaftIndex
+	}
+	return nil
+}
+
+var File_proto_pbservice_node_proto protoreflect.FileDescriptor
+
+var file_proto_pbservice_node_proto_rawDesc = []byte{
+	0x0a, 0x1a, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x1a,
+	0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x68, 0x65,
+	0x61, 0x6c, 0x74, 0x68, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
+	0x1d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x7b,
+	0x0a, 0x18, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x64, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x6e,
+	0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x49, 0x6e, 0x64, 0x65, 0x78,
+	0x12, 0x49, 0x0a, 0x05, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x4e, 0x6f, 0x64, 0x65, 0x52, 0x05, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x22, 0xe1, 0x01, 0x0a, 0x10,
+	0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65,
+	0x12, 0x3b, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x48, 0x0a,
+	0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e,
+	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x07,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x46, 0x0a, 0x06, 0x43, 0x68, 0x65, 0x63, 0x6b,
+	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x6c,
+	0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x06, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x22,
+	0x95, 0x04, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09,
+	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x65,
+	0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x65,
+	0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
+	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
+	0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
+	0x12, 0x66, 0x0a, 0x0f, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
+	0x73, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x68, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4e, 0x6f,
+	0x64, 0x65, 0x2e, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
+	0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41,
+	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x45, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61,
+	0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x2e,
+	0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12,
+	0x49, 0x0a, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52,
+	0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x1a, 0x42, 0x0a, 0x14, 0x54, 0x61,
+	0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37,
+	0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa9, 0x08, 0x0a, 0x0b, 0x4e, 0x6f, 0x64, 0x65,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x49,
+	0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x04, 0x54, 0x61, 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x64, 0x64, 0x72,
+	0x65, 0x73, 0x73, 0x12, 0x6d, 0x0a, 0x0f, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x54, 0x61, 0x67,
+	0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x52, 0x0f, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
+	0x65, 0x73, 0x12, 0x4c, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61,
+	0x12, 0x12, 0x0a, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
+	0x50, 0x6f, 0x72, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61,
+	0x74, 0x68, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74,
+	0x50, 0x61, 0x74, 0x68, 0x12, 0x44, 0x0a, 0x07, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x18,
+	0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74,
+	0x73, 0x52, 0x07, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x12, 0x2c, 0x0a, 0x11, 0x45, 0x6e,
+	0x61, 0x62, 0x6c, 0x65, 0x54, 0x61, 0x67, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x18,
+	0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x61, 0x67,
+	0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x12, 0x4b, 0x0a, 0x05, 0x50, 0x72, 0x6f, 0x78,
+	0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x05,
+	0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x4b, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x07, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x12, 0x3e, 0x0a, 0x1a, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x6c, 0x79, 0x52, 0x65, 0x67,
+	0x69, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x41, 0x73, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72,
+	0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1a, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x6c, 0x79, 0x52,
+	0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x41, 0x73, 0x53, 0x69, 0x64, 0x65, 0x63,
+	0x61, 0x72, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65,
+	0x4d, 0x65, 0x74, 0x61, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08,
+	0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x49, 0x0a, 0x09, 0x52, 0x61, 0x66, 0x74,
+	0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52,
+	0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e,
+	0x64, 0x65, 0x78, 0x1a, 0x75, 0x0a, 0x14, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x47, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65,
+	0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x02, 0x38, 0x01, 0x42, 0x87, 0x02, 0x0a, 0x25, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x09, 0x4e,
+	0x6f, 0x64, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x53, 0xaa, 0x02,
+	0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0xca, 0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xe2, 0x02, 0x2d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x24, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_pbservice_node_proto_rawDescOnce sync.Once
+	file_proto_pbservice_node_proto_rawDescData = file_proto_pbservice_node_proto_rawDesc
+)
+
+func file_proto_pbservice_node_proto_rawDescGZIP() []byte {
+	file_proto_pbservice_node_proto_rawDescOnce.Do(func() {
+		file_proto_pbservice_node_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbservice_node_proto_rawDescData)
+	})
+	return file_proto_pbservice_node_proto_rawDescData
+}
+
+var file_proto_pbservice_node_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_proto_pbservice_node_proto_goTypes = []interface{}{
+	(*IndexedCheckServiceNodes)(nil), // 0: hashicorp.consul.internal.service.IndexedCheckServiceNodes
+	(*CheckServiceNode)(nil),         // 1: hashicorp.consul.internal.service.CheckServiceNode
+	(*Node)(nil),                     // 2: hashicorp.consul.internal.service.Node
+	(*NodeService)(nil),              // 3: hashicorp.consul.internal.service.NodeService
+	nil,                              // 4: hashicorp.consul.internal.service.Node.TaggedAddressesEntry
+	nil,                              // 5: hashicorp.consul.internal.service.Node.MetaEntry
+	nil,                              // 6: hashicorp.consul.internal.service.NodeService.TaggedAddressesEntry
+	nil,                              // 7: hashicorp.consul.internal.service.NodeService.MetaEntry
+	(*HealthCheck)(nil),              // 8: hashicorp.consul.internal.service.HealthCheck
+	(*pbcommon.RaftIndex)(nil),       // 9: hashicorp.consul.internal.common.RaftIndex
+	(*Weights)(nil),                  // 10: hashicorp.consul.internal.service.Weights
+	(*ConnectProxyConfig)(nil),       // 11: hashicorp.consul.internal.service.ConnectProxyConfig
+	(*ServiceConnect)(nil),           // 12: hashicorp.consul.internal.service.ServiceConnect
+	(*pbcommon.EnterpriseMeta)(nil),  // 13: hashicorp.consul.internal.common.EnterpriseMeta
+	(*ServiceAddress)(nil),           // 14: hashicorp.consul.internal.service.ServiceAddress
+}
+var file_proto_pbservice_node_proto_depIdxs = []int32{
+	1,  // 0: hashicorp.consul.internal.service.IndexedCheckServiceNodes.Nodes:type_name -> hashicorp.consul.internal.service.CheckServiceNode
+	2,  // 1: hashicorp.consul.internal.service.CheckServiceNode.Node:type_name -> hashicorp.consul.internal.service.Node
+	3,  // 2: hashicorp.consul.internal.service.CheckServiceNode.Service:type_name -> hashicorp.consul.internal.service.NodeService
+	8,  // 3: hashicorp.consul.internal.service.CheckServiceNode.Checks:type_name -> hashicorp.consul.internal.service.HealthCheck
+	4,  // 4: hashicorp.consul.internal.service.Node.TaggedAddresses:type_name -> hashicorp.consul.internal.service.Node.TaggedAddressesEntry
+	5,  // 5: hashicorp.consul.internal.service.Node.Meta:type_name -> hashicorp.consul.internal.service.Node.MetaEntry
+	9,  // 6: hashicorp.consul.internal.service.Node.RaftIndex:type_name -> hashicorp.consul.internal.common.RaftIndex
+	6,  // 7: hashicorp.consul.internal.service.NodeService.TaggedAddresses:type_name -> hashicorp.consul.internal.service.NodeService.TaggedAddressesEntry
+	7,  // 8: hashicorp.consul.internal.service.NodeService.Meta:type_name -> hashicorp.consul.internal.service.NodeService.MetaEntry
+	10, // 9: hashicorp.consul.internal.service.NodeService.Weights:type_name -> hashicorp.consul.internal.service.Weights
+	11, // 10: hashicorp.consul.internal.service.NodeService.Proxy:type_name -> hashicorp.consul.internal.service.ConnectProxyConfig
+	12, // 11: hashicorp.consul.internal.service.NodeService.Connect:type_name -> hashicorp.consul.internal.service.ServiceConnect
+	13, // 12: hashicorp.consul.internal.service.NodeService.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
+	9,  // 13: hashicorp.consul.internal.service.NodeService.RaftIndex:type_name -> hashicorp.consul.internal.common.RaftIndex
+	14, // 14: hashicorp.consul.internal.service.NodeService.TaggedAddressesEntry.value:type_name -> hashicorp.consul.internal.service.ServiceAddress
+	15, // [15:15] is the sub-list for method output_type
+	15, // [15:15] is the sub-list for method input_type
+	15, // [15:15] is the sub-list for extension type_name
+	15, // [15:15] is the sub-list for extension extendee
+	0,  // [0:15] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbservice_node_proto_init() }
+func file_proto_pbservice_node_proto_init() {
+	if File_proto_pbservice_node_proto != nil {
+		return
+	}
+	file_proto_pbservice_healthcheck_proto_init()
+	file_proto_pbservice_service_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbservice_node_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*IndexedCheckServiceNodes); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_node_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CheckServiceNode); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_node_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Node); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_node_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*NodeService); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbservice_node_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   8,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbservice_node_proto_goTypes,
+		DependencyIndexes: file_proto_pbservice_node_proto_depIdxs,
+		MessageInfos:      file_proto_pbservice_node_proto_msgTypes,
+	}.Build()
+	File_proto_pbservice_node_proto = out.File
+	file_proto_pbservice_node_proto_rawDesc = nil
+	file_proto_pbservice_node_proto_goTypes = nil
+	file_proto_pbservice_node_proto_depIdxs = nil
+}
diff --git a/proto/pbservice/node.proto b/proto/pbservice/node.proto
new file mode 100644
index 0000000000000..7431b836ce097
--- /dev/null
+++ b/proto/pbservice/node.proto
@@ -0,0 +1,117 @@
+syntax = "proto3";
+
+package hashicorp.consul.internal.service;
+
+import "proto/pbcommon/common.proto";
+import "proto/pbservice/healthcheck.proto";
+import "proto/pbservice/service.proto";
+
+// IndexedCheckServiceNodes is used to return multiple instances for a given service.
+message IndexedCheckServiceNodes {
+  uint64 Index = 1;
+  repeated CheckServiceNode Nodes = 2;
+}
+
+// CheckServiceNode is used to provide the node, its service
+// definition, as well as a HealthCheck that is associated.
+message CheckServiceNode {
+  Node Node = 1;
+  NodeService Service = 2;
+  repeated HealthCheck Checks = 3;
+}
+
+// Node contains information about a node.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.Node
+// output=node.gen.go
+// name=Structs
+message Node {
+  // mog: func-to=NodeIDType func-from=string
+  string ID = 1;
+
+  string Node = 2;
+  string Partition = 8;
+  string PeerName = 9;
+  string Address = 3;
+  string Datacenter = 4;
+  map<string, string> TaggedAddresses = 5;
+  map<string, string> Meta = 6;
+
+  // mog: func-to=RaftIndexToStructs func-from=NewRaftIndexFromStructs
+  common.RaftIndex RaftIndex = 7;
+}
+
+// NodeService is a service provided by a node
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.NodeService
+// output=node.gen.go
+// name=Structs
+message NodeService {
+  // Kind is the kind of service this is. Different kinds of services may
+  // have differing validation, DNS behavior, etc. An empty kind will default
+  // to the Default kind. See ServiceKind for the full list of kinds.
+  // mog: func-to=structs.ServiceKind func-from=string
+  string Kind = 1;
+
+  string ID = 2;
+  string Service = 3;
+  repeated string Tags = 4;
+  string Address = 5;
+  // mog: func-to=MapStringServiceAddressToStructs func-from=NewMapStringServiceAddressFromStructs
+  map<string, ServiceAddress> TaggedAddresses = 15;
+  map<string, string> Meta = 6;
+  // mog: func-to=int func-from=int32
+  int32 Port = 7;
+  string SocketPath = 17;
+
+  // mog: func-to=WeightsPtrToStructs func-from=NewWeightsPtrFromStructs
+  Weights Weights = 8;
+  bool EnableTagOverride = 9;
+
+  // Proxy is the configuration set for Kind = connect-proxy. It is mandatory in
+  // that case and an error to be set for any other kind. This config is part of
+  // a proxy service definition and is distinct from but shares some fields with
+  // the Connect.Proxy which configures a managed proxy as part of the actual
+  // service's definition. This duplication is ugly but seemed better than the
+  // alternative which was to re-use the same struct fields for both cases even
+  // though the semantics are different and the non-shred fields make no sense
+  // in the other case. ProxyConfig may be a more natural name here, but it's
+  // confusing for the UX because one of the fields in ConnectProxyConfig is
+  // also called just "Config"
+  ConnectProxyConfig Proxy = 11;
+
+  // Connect are the Connect settings for a service. This is purposely NOT
+  // a pointer so that we never have to nil-check this.
+  ServiceConnect Connect = 12;
+
+  // LocallyRegisteredAsSidecar is private as it is only used by a local agent
+  // state to track if the service was registered from a nested sidecar_service
+  // block. We need to track that so we can know whether we need to deregister
+  // it automatically too if it's removed from the service definition or if the
+  // parent service is deregistered. Relying only on ID would cause us to
+  // deregister regular services if they happen to be registered using the same
+  // ID scheme as our sidecars do by default. We could use meta but that gets
+  // unpleasant because we can't use the consul- prefix from an agent (reserved
+  // for use internally but in practice that means within the state store or in
+  // responses only), and it leaks the detail publicly which people might rely
+  // on which is a bit unpleasant for something that is meant to be config-file
+  // syntax sugar. Note this is not translated to ServiceNode and friends and
+  // may not be set on a NodeService that isn't the one the agent registered and
+  // keeps in it's local state. We never want this rendered in JSON as it's
+  // internal only. Right now our agent endpoints return api structs which don't
+  // include it but this is a safety net incase we change that or there is
+  // somewhere this is used in API output.
+  bool LocallyRegisteredAsSidecar = 13;
+
+  // mog: func-to=EnterpriseMetaToStructs func-from=NewEnterpriseMetaFromStructs
+  common.EnterpriseMeta EnterpriseMeta = 16;
+
+  string PeerName = 18;
+
+  // mog: func-to=RaftIndexToStructs func-from=NewRaftIndexFromStructs
+  common.RaftIndex RaftIndex = 14;
+}
diff --git a/proto/private/pbservice/service.gen.go b/proto/pbservice/service.gen.go
similarity index 98%
rename from proto/private/pbservice/service.gen.go
rename to proto/pbservice/service.gen.go
index f1030cd585411..cca5b995a7c81 100644
--- a/proto/private/pbservice/service.gen.go
+++ b/proto/pbservice/service.gen.go
@@ -192,7 +192,6 @@ func ServiceDefinitionToStructs(s *ServiceDefinition, t *structs.ServiceDefiniti
 	t.Weights = WeightsPtrToStructs(s.Weights)
 	t.Token = s.Token
 	t.EnableTagOverride = s.EnableTagOverride
-	t.Locality = LocalityToStructs(s.Locality)
 	t.Proxy = ConnectProxyConfigPtrToStructs(s.Proxy)
 	t.EnterpriseMeta = EnterpriseMetaToStructs(s.EnterpriseMeta)
 	t.Connect = ServiceConnectPtrToStructs(s.Connect)
@@ -219,7 +218,6 @@ func ServiceDefinitionFromStructs(t *structs.ServiceDefinition, s *ServiceDefini
 	s.Weights = NewWeightsPtrFromStructs(t.Weights)
 	s.Token = t.Token
 	s.EnableTagOverride = t.EnableTagOverride
-	s.Locality = LocalityFromStructs(t.Locality)
 	s.Proxy = NewConnectProxyConfigPtrFromStructs(t.Proxy)
 	s.EnterpriseMeta = NewEnterpriseMetaFromStructs(t.EnterpriseMeta)
 	s.Connect = NewServiceConnectPtrFromStructs(t.Connect)
diff --git a/proto/pbservice/service.pb.binary.go b/proto/pbservice/service.pb.binary.go
new file mode 100644
index 0000000000000..8eab0ff9e750b
--- /dev/null
+++ b/proto/pbservice/service.pb.binary.go
@@ -0,0 +1,128 @@
+// Code generated by protoc-gen-go-binary. DO NOT EDIT.
+// source: proto/pbservice/service.proto
+
+package pbservice
+
+import (
+	"google.golang.org/protobuf/proto"
+)
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ConnectProxyConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ConnectProxyConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *Upstream) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *Upstream) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ServiceConnect) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ServiceConnect) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *PeeringServiceMeta) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *PeeringServiceMeta) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ExposeConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ExposeConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ExposePath) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ExposePath) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *MeshGatewayConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *MeshGatewayConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *TransparentProxyConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *TransparentProxyConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *AccessLogsConfig) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *AccessLogsConfig) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ServiceDefinition) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ServiceDefinition) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *ServiceAddress) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *ServiceAddress) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
+
+// MarshalBinary implements encoding.BinaryMarshaler
+func (msg *Weights) MarshalBinary() ([]byte, error) {
+	return proto.Marshal(msg)
+}
+
+// UnmarshalBinary implements encoding.BinaryUnmarshaler
+func (msg *Weights) UnmarshalBinary(b []byte) error {
+	return proto.Unmarshal(b, msg)
+}
diff --git a/proto/pbservice/service.pb.go b/proto/pbservice/service.pb.go
new file mode 100644
index 0000000000000..b08f7508d1a08
--- /dev/null
+++ b/proto/pbservice/service.pb.go
@@ -0,0 +1,1719 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: proto/pbservice/service.proto
+
+package pbservice
+
+import (
+	pbcommon "github.com/hashicorp/consul/proto/pbcommon"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// ConnectProxyConfig describes the configuration needed for any proxy managed
+// or unmanaged. It describes a single logical service's listener and optionally
+// upstreams and sidecar-related config for a single instance. To describe a
+// centralized proxy that routed traffic for multiple services, a different one
+// of these would be needed for each, sharing the same LogicalProxyID.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ConnectProxyConfig
+// output=service.gen.go
+// name=Structs
+type ConnectProxyConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// DestinationServiceName is required and is the name of the service to accept
+	// traffic for.
+	DestinationServiceName string `protobuf:"bytes,1,opt,name=DestinationServiceName,proto3" json:"DestinationServiceName,omitempty"`
+	// DestinationServiceID is optional and should only be specified for
+	// "side-car" style proxies where the proxy is in front of just a single
+	// instance of the service. It should be set to the service ID of the instance
+	// being represented which must be registered to the same agent. It's valid to
+	// provide a service ID that does not yet exist to avoid timing issues when
+	// bootstrapping a service with a proxy.
+	DestinationServiceID string `protobuf:"bytes,2,opt,name=DestinationServiceID,proto3" json:"DestinationServiceID,omitempty"`
+	// LocalServiceAddress is the address of the local service instance. It is
+	// optional and should only be specified for "side-car" style proxies. It will
+	// default to 127.0.0.1 if the proxy is a "side-car" (DestinationServiceID is
+	// set) but otherwise will be ignored.
+	LocalServiceAddress string `protobuf:"bytes,3,opt,name=LocalServiceAddress,proto3" json:"LocalServiceAddress,omitempty"`
+	// LocalServicePort is the port of the local service instance. It is optional
+	// and should only be specified for "side-car" style proxies. It will default
+	// to the registered port for the instance if the proxy is a "side-car"
+	// (DestinationServiceID is set) but otherwise will be ignored.
+	// mog: func-to=int func-from=int32
+	LocalServicePort int32 `protobuf:"varint,4,opt,name=LocalServicePort,proto3" json:"LocalServicePort,omitempty"`
+	// Config is the arbitrary configuration data provided with the proxy
+	// registration.
+	// mog: func-to=ProtobufTypesStructToMapStringInterface func-from=MapStringInterfaceToProtobufTypesStruct
+	Config *structpb.Struct `protobuf:"bytes,5,opt,name=Config,proto3" json:"Config,omitempty"`
+	// Upstreams describes any upstream dependencies the proxy instance should
+	// setup.
+	// mog: func-to=UpstreamsToStructs func-from=NewUpstreamsFromStructs
+	Upstreams []*Upstream `protobuf:"bytes,6,rep,name=Upstreams,proto3" json:"Upstreams,omitempty"`
+	// MeshGateway defines the mesh gateway configuration for upstreams
+	MeshGateway *MeshGatewayConfig `protobuf:"bytes,7,opt,name=MeshGateway,proto3" json:"MeshGateway,omitempty"`
+	// Expose defines whether checks or paths are exposed through the proxy
+	Expose *ExposeConfig `protobuf:"bytes,8,opt,name=Expose,proto3" json:"Expose,omitempty"`
+	// Mode represents how the proxy's inbound and upstream listeners are dialed.
+	// mog: func-to=structs.ProxyMode func-from=string
+	Mode string `protobuf:"bytes,9,opt,name=Mode,proto3" json:"Mode,omitempty"`
+	// TransparentProxy defines configuration for when the proxy is in
+	// transparent mode.
+	TransparentProxy *TransparentProxyConfig `protobuf:"bytes,10,opt,name=TransparentProxy,proto3" json:"TransparentProxy,omitempty"`
+	// LocalServiceSocketPath is the path to the unix domain socket for the local service instance
+	LocalServiceSocketPath string `protobuf:"bytes,11,opt,name=LocalServiceSocketPath,proto3" json:"LocalServiceSocketPath,omitempty"`
+	// mog: func-to=EnvoyExtensionsToStructs func-from=EnvoyExtensionsFromStructs
+	EnvoyExtensions []*pbcommon.EnvoyExtension `protobuf:"bytes,12,rep,name=EnvoyExtensions,proto3" json:"EnvoyExtensions,omitempty"`
+	// AccessLogsConfig defines envoys access log configuration.
+	AccessLogs *AccessLogsConfig `protobuf:"bytes,13,opt,name=AccessLogs,proto3" json:"AccessLogs,omitempty"`
+}
+
+func (x *ConnectProxyConfig) Reset() {
+	*x = ConnectProxyConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ConnectProxyConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ConnectProxyConfig) ProtoMessage() {}
+
+func (x *ConnectProxyConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ConnectProxyConfig.ProtoReflect.Descriptor instead.
+func (*ConnectProxyConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *ConnectProxyConfig) GetDestinationServiceName() string {
+	if x != nil {
+		return x.DestinationServiceName
+	}
+	return ""
+}
+
+func (x *ConnectProxyConfig) GetDestinationServiceID() string {
+	if x != nil {
+		return x.DestinationServiceID
+	}
+	return ""
+}
+
+func (x *ConnectProxyConfig) GetLocalServiceAddress() string {
+	if x != nil {
+		return x.LocalServiceAddress
+	}
+	return ""
+}
+
+func (x *ConnectProxyConfig) GetLocalServicePort() int32 {
+	if x != nil {
+		return x.LocalServicePort
+	}
+	return 0
+}
+
+func (x *ConnectProxyConfig) GetConfig() *structpb.Struct {
+	if x != nil {
+		return x.Config
+	}
+	return nil
+}
+
+func (x *ConnectProxyConfig) GetUpstreams() []*Upstream {
+	if x != nil {
+		return x.Upstreams
+	}
+	return nil
+}
+
+func (x *ConnectProxyConfig) GetMeshGateway() *MeshGatewayConfig {
+	if x != nil {
+		return x.MeshGateway
+	}
+	return nil
+}
+
+func (x *ConnectProxyConfig) GetExpose() *ExposeConfig {
+	if x != nil {
+		return x.Expose
+	}
+	return nil
+}
+
+func (x *ConnectProxyConfig) GetMode() string {
+	if x != nil {
+		return x.Mode
+	}
+	return ""
+}
+
+func (x *ConnectProxyConfig) GetTransparentProxy() *TransparentProxyConfig {
+	if x != nil {
+		return x.TransparentProxy
+	}
+	return nil
+}
+
+func (x *ConnectProxyConfig) GetLocalServiceSocketPath() string {
+	if x != nil {
+		return x.LocalServiceSocketPath
+	}
+	return ""
+}
+
+func (x *ConnectProxyConfig) GetEnvoyExtensions() []*pbcommon.EnvoyExtension {
+	if x != nil {
+		return x.EnvoyExtensions
+	}
+	return nil
+}
+
+func (x *ConnectProxyConfig) GetAccessLogs() *AccessLogsConfig {
+	if x != nil {
+		return x.AccessLogs
+	}
+	return nil
+}
+
+// Upstream represents a single upstream dependency for a service or proxy. It
+// describes the mechanism used to discover instances to communicate with (the
+// Target) as well as any potential client configuration that may be useful such
+// as load balancer options, timeouts etc.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.Upstream
+// output=service.gen.go
+// name=Structs
+// ignore-fields=IngressHosts
+type Upstream struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Destination fields are the required ones for determining what this upstream
+	// points to. Depending on DestinationType some other fields below might
+	// further restrict the set of instances allowable.
+	//
+	// DestinationType would be better as an int constant but even with custom
+	// JSON marshallers it causes havoc with all the mapstructure mangling we do
+	// on service definitions in various places.
+	DestinationType      string `protobuf:"bytes,1,opt,name=DestinationType,proto3" json:"DestinationType,omitempty"`
+	DestinationNamespace string `protobuf:"bytes,2,opt,name=DestinationNamespace,proto3" json:"DestinationNamespace,omitempty"`
+	DestinationPartition string `protobuf:"bytes,12,opt,name=DestinationPartition,proto3" json:"DestinationPartition,omitempty"`
+	DestinationPeer      string `protobuf:"bytes,13,opt,name=DestinationPeer,proto3" json:"DestinationPeer,omitempty"`
+	DestinationName      string `protobuf:"bytes,3,opt,name=DestinationName,proto3" json:"DestinationName,omitempty"`
+	// Datacenter that the service discovery request should be run against. Note
+	// for prepared queries, the actual results might be from a different
+	// datacenter.
+	Datacenter string `protobuf:"bytes,4,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
+	// LocalBindAddress is the ip address a side-car proxy should listen on for
+	// traffic destined for this upstream service. Default if empty is 127.0.0.1.
+	LocalBindAddress string `protobuf:"bytes,5,opt,name=LocalBindAddress,proto3" json:"LocalBindAddress,omitempty"`
+	// LocalBindPort is the ip address a side-car proxy should listen on for
+	// traffic destined for this upstream service. Required.
+	// mog: func-to=int func-from=int32
+	LocalBindPort int32 `protobuf:"varint,6,opt,name=LocalBindPort,proto3" json:"LocalBindPort,omitempty"`
+	// Config is an opaque config that is specific to the proxy process being run.
+	// It can be used to pass arbitrary configuration for this specific upstream
+	// to the proxy.
+	// mog: func-to=ProtobufTypesStructToMapStringInterface func-from=MapStringInterfaceToProtobufTypesStruct
+	Config *structpb.Struct `protobuf:"bytes,7,opt,name=Config,proto3" json:"Config,omitempty"`
+	// MeshGateway is the configuration for mesh gateway usage of this upstream
+	MeshGateway *MeshGatewayConfig `protobuf:"bytes,8,opt,name=MeshGateway,proto3" json:"MeshGateway,omitempty"`
+	// CentrallyConfigured indicates whether the upstream was defined in a proxy
+	// instance registration or whether it was generated from a config entry.
+	CentrallyConfigured bool `protobuf:"varint,9,opt,name=CentrallyConfigured,proto3" json:"CentrallyConfigured,omitempty"`
+	// LocalBindSocketPath is the socket to create to connect to the upstream service
+	LocalBindSocketPath string `protobuf:"bytes,10,opt,name=LocalBindSocketPath,proto3" json:"LocalBindSocketPath,omitempty"`
+	LocalBindSocketMode string `protobuf:"bytes,11,opt,name=LocalBindSocketMode,proto3" json:"LocalBindSocketMode,omitempty"`
+}
+
+func (x *Upstream) Reset() {
+	*x = Upstream{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Upstream) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Upstream) ProtoMessage() {}
+
+func (x *Upstream) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Upstream.ProtoReflect.Descriptor instead.
+func (*Upstream) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *Upstream) GetDestinationType() string {
+	if x != nil {
+		return x.DestinationType
+	}
+	return ""
+}
+
+func (x *Upstream) GetDestinationNamespace() string {
+	if x != nil {
+		return x.DestinationNamespace
+	}
+	return ""
+}
+
+func (x *Upstream) GetDestinationPartition() string {
+	if x != nil {
+		return x.DestinationPartition
+	}
+	return ""
+}
+
+func (x *Upstream) GetDestinationPeer() string {
+	if x != nil {
+		return x.DestinationPeer
+	}
+	return ""
+}
+
+func (x *Upstream) GetDestinationName() string {
+	if x != nil {
+		return x.DestinationName
+	}
+	return ""
+}
+
+func (x *Upstream) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
+	}
+	return ""
+}
+
+func (x *Upstream) GetLocalBindAddress() string {
+	if x != nil {
+		return x.LocalBindAddress
+	}
+	return ""
+}
+
+func (x *Upstream) GetLocalBindPort() int32 {
+	if x != nil {
+		return x.LocalBindPort
+	}
+	return 0
+}
+
+func (x *Upstream) GetConfig() *structpb.Struct {
+	if x != nil {
+		return x.Config
+	}
+	return nil
+}
+
+func (x *Upstream) GetMeshGateway() *MeshGatewayConfig {
+	if x != nil {
+		return x.MeshGateway
+	}
+	return nil
+}
+
+func (x *Upstream) GetCentrallyConfigured() bool {
+	if x != nil {
+		return x.CentrallyConfigured
+	}
+	return false
+}
+
+func (x *Upstream) GetLocalBindSocketPath() string {
+	if x != nil {
+		return x.LocalBindSocketPath
+	}
+	return ""
+}
+
+func (x *Upstream) GetLocalBindSocketMode() string {
+	if x != nil {
+		return x.LocalBindSocketMode
+	}
+	return ""
+}
+
+// ServiceConnect are the shared Connect settings between all service
+// definitions from the agent to the state store.
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceConnect
+// output=service.gen.go
+// name=Structs
+type ServiceConnect struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Native is true when this service can natively understand Connect.
+	Native bool `protobuf:"varint,1,opt,name=Native,proto3" json:"Native,omitempty"`
+	// SidecarService is a nested Service Definition to register at the same time.
+	// It's purely a convenience mechanism to allow specifying a sidecar service
+	// along with the application service definition. It's nested nature allows
+	// all of the fields to be defaulted which can reduce the amount of
+	// boilerplate needed to register a sidecar service separately, but the end
+	// result is identical to just making a second service registration via any
+	// other means.
+	// mog: func-to=ServiceDefinitionPtrToStructs func-from=NewServiceDefinitionPtrFromStructs
+	SidecarService *ServiceDefinition  `protobuf:"bytes,3,opt,name=SidecarService,proto3" json:"SidecarService,omitempty"`
+	PeerMeta       *PeeringServiceMeta `protobuf:"bytes,4,opt,name=PeerMeta,proto3" json:"PeerMeta,omitempty"`
+}
+
+func (x *ServiceConnect) Reset() {
+	*x = ServiceConnect{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceConnect) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceConnect) ProtoMessage() {}
+
+func (x *ServiceConnect) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceConnect.ProtoReflect.Descriptor instead.
+func (*ServiceConnect) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *ServiceConnect) GetNative() bool {
+	if x != nil {
+		return x.Native
+	}
+	return false
+}
+
+func (x *ServiceConnect) GetSidecarService() *ServiceDefinition {
+	if x != nil {
+		return x.SidecarService
+	}
+	return nil
+}
+
+func (x *ServiceConnect) GetPeerMeta() *PeeringServiceMeta {
+	if x != nil {
+		return x.PeerMeta
+	}
+	return nil
+}
+
+// PeeringServiceMeta is read-only information provided from an exported peer.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.PeeringServiceMeta
+// output=service.gen.go
+// name=Structs
+type PeeringServiceMeta struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	SNI      []string `protobuf:"bytes,1,rep,name=SNI,proto3" json:"SNI,omitempty"`
+	SpiffeID []string `protobuf:"bytes,2,rep,name=SpiffeID,proto3" json:"SpiffeID,omitempty"`
+	Protocol string   `protobuf:"bytes,3,opt,name=Protocol,proto3" json:"Protocol,omitempty"`
+}
+
+func (x *PeeringServiceMeta) Reset() {
+	*x = PeeringServiceMeta{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PeeringServiceMeta) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PeeringServiceMeta) ProtoMessage() {}
+
+func (x *PeeringServiceMeta) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PeeringServiceMeta.ProtoReflect.Descriptor instead.
+func (*PeeringServiceMeta) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *PeeringServiceMeta) GetSNI() []string {
+	if x != nil {
+		return x.SNI
+	}
+	return nil
+}
+
+func (x *PeeringServiceMeta) GetSpiffeID() []string {
+	if x != nil {
+		return x.SpiffeID
+	}
+	return nil
+}
+
+func (x *PeeringServiceMeta) GetProtocol() string {
+	if x != nil {
+		return x.Protocol
+	}
+	return ""
+}
+
+// ExposeConfig describes HTTP paths to expose through Envoy outside of Connect.
+// Users can expose individual paths and/or all HTTP/GRPC paths for checks.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ExposeConfig
+// output=service.gen.go
+// name=Structs
+type ExposeConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Checks defines whether paths associated with Consul checks will be exposed.
+	// This flag triggers exposing all HTTP and GRPC check paths registered for the service.
+	Checks bool `protobuf:"varint,1,opt,name=Checks,proto3" json:"Checks,omitempty"`
+	// Paths is the list of paths exposed through the proxy.
+	// mog: func-to=ExposePathSliceToStructs func-from=NewExposePathSliceFromStructs
+	Paths []*ExposePath `protobuf:"bytes,2,rep,name=Paths,proto3" json:"Paths,omitempty"`
+}
+
+func (x *ExposeConfig) Reset() {
+	*x = ExposeConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExposeConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExposeConfig) ProtoMessage() {}
+
+func (x *ExposeConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ExposeConfig.ProtoReflect.Descriptor instead.
+func (*ExposeConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *ExposeConfig) GetChecks() bool {
+	if x != nil {
+		return x.Checks
+	}
+	return false
+}
+
+func (x *ExposeConfig) GetPaths() []*ExposePath {
+	if x != nil {
+		return x.Paths
+	}
+	return nil
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ExposePath
+// output=service.gen.go
+// name=Structs
+type ExposePath struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// ListenerPort defines the port of the proxy's listener for exposed paths.
+	// mog: func-to=int func-from=int32
+	ListenerPort int32 `protobuf:"varint,1,opt,name=ListenerPort,proto3" json:"ListenerPort,omitempty"`
+	// ExposePath is the path to expose through the proxy, ie. "/metrics."
+	Path string `protobuf:"bytes,2,opt,name=Path,proto3" json:"Path,omitempty"`
+	// LocalPathPort is the port that the service is listening on for the given path.
+	// mog: func-to=int func-from=int32
+	LocalPathPort int32 `protobuf:"varint,3,opt,name=LocalPathPort,proto3" json:"LocalPathPort,omitempty"`
+	// Protocol describes the upstream's service protocol.
+	// Valid values are "http" and "http2", defaults to "http"
+	Protocol string `protobuf:"bytes,4,opt,name=Protocol,proto3" json:"Protocol,omitempty"`
+	// ParsedFromCheck is set if this path was parsed from a registered check
+	ParsedFromCheck bool `protobuf:"varint,5,opt,name=ParsedFromCheck,proto3" json:"ParsedFromCheck,omitempty"`
+}
+
+func (x *ExposePath) Reset() {
+	*x = ExposePath{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExposePath) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExposePath) ProtoMessage() {}
+
+func (x *ExposePath) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ExposePath.ProtoReflect.Descriptor instead.
+func (*ExposePath) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *ExposePath) GetListenerPort() int32 {
+	if x != nil {
+		return x.ListenerPort
+	}
+	return 0
+}
+
+func (x *ExposePath) GetPath() string {
+	if x != nil {
+		return x.Path
+	}
+	return ""
+}
+
+func (x *ExposePath) GetLocalPathPort() int32 {
+	if x != nil {
+		return x.LocalPathPort
+	}
+	return 0
+}
+
+func (x *ExposePath) GetProtocol() string {
+	if x != nil {
+		return x.Protocol
+	}
+	return ""
+}
+
+func (x *ExposePath) GetParsedFromCheck() bool {
+	if x != nil {
+		return x.ParsedFromCheck
+	}
+	return false
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.MeshGatewayConfig
+// output=service.gen.go
+// name=Structs
+type MeshGatewayConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=structs.MeshGatewayMode func-from=string
+	Mode string `protobuf:"bytes,1,opt,name=Mode,proto3" json:"Mode,omitempty"`
+}
+
+func (x *MeshGatewayConfig) Reset() {
+	*x = MeshGatewayConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MeshGatewayConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MeshGatewayConfig) ProtoMessage() {}
+
+func (x *MeshGatewayConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use MeshGatewayConfig.ProtoReflect.Descriptor instead.
+func (*MeshGatewayConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *MeshGatewayConfig) GetMode() string {
+	if x != nil {
+		return x.Mode
+	}
+	return ""
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.TransparentProxyConfig
+// output=service.gen.go
+// name=Structs
+type TransparentProxyConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=int func-from=int32
+	OutboundListenerPort int32 `protobuf:"varint,1,opt,name=OutboundListenerPort,proto3" json:"OutboundListenerPort,omitempty"`
+	// DialedDirectly indicates whether transparent proxies can dial this proxy instance directly.
+	// The discovery chain is not considered when dialing a service instance directly.
+	// This setting is useful when addressing stateful services, such as a database cluster with a leader node.
+	DialedDirectly bool `protobuf:"varint,2,opt,name=DialedDirectly,proto3" json:"DialedDirectly,omitempty"`
+}
+
+func (x *TransparentProxyConfig) Reset() {
+	*x = TransparentProxyConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TransparentProxyConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TransparentProxyConfig) ProtoMessage() {}
+
+func (x *TransparentProxyConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TransparentProxyConfig.ProtoReflect.Descriptor instead.
+func (*TransparentProxyConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *TransparentProxyConfig) GetOutboundListenerPort() int32 {
+	if x != nil {
+		return x.OutboundListenerPort
+	}
+	return 0
+}
+
+func (x *TransparentProxyConfig) GetDialedDirectly() bool {
+	if x != nil {
+		return x.DialedDirectly
+	}
+	return false
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.AccessLogsConfig
+// output=service.gen.go
+// name=Structs
+type AccessLogsConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Enabled             bool `protobuf:"varint,1,opt,name=Enabled,proto3" json:"Enabled,omitempty"`
+	DisableListenerLogs bool `protobuf:"varint,2,opt,name=DisableListenerLogs,proto3" json:"DisableListenerLogs,omitempty"`
+	// Type represents the desired envoy log sink (e.g. stdout, stderr, file ...).
+	// mog: func-to=structs.LogSinkType func-from=string
+	Type       string `protobuf:"bytes,3,opt,name=Type,proto3" json:"Type,omitempty"`
+	Path       string `protobuf:"bytes,4,opt,name=Path,proto3" json:"Path,omitempty"`
+	JSONFormat string `protobuf:"bytes,5,opt,name=JSONFormat,proto3" json:"JSONFormat,omitempty"`
+	TextFormat string `protobuf:"bytes,6,opt,name=TextFormat,proto3" json:"TextFormat,omitempty"`
+}
+
+func (x *AccessLogsConfig) Reset() {
+	*x = AccessLogsConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AccessLogsConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AccessLogsConfig) ProtoMessage() {}
+
+func (x *AccessLogsConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[8]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use AccessLogsConfig.ProtoReflect.Descriptor instead.
+func (*AccessLogsConfig) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *AccessLogsConfig) GetEnabled() bool {
+	if x != nil {
+		return x.Enabled
+	}
+	return false
+}
+
+func (x *AccessLogsConfig) GetDisableListenerLogs() bool {
+	if x != nil {
+		return x.DisableListenerLogs
+	}
+	return false
+}
+
+func (x *AccessLogsConfig) GetType() string {
+	if x != nil {
+		return x.Type
+	}
+	return ""
+}
+
+func (x *AccessLogsConfig) GetPath() string {
+	if x != nil {
+		return x.Path
+	}
+	return ""
+}
+
+func (x *AccessLogsConfig) GetJSONFormat() string {
+	if x != nil {
+		return x.JSONFormat
+	}
+	return ""
+}
+
+func (x *AccessLogsConfig) GetTextFormat() string {
+	if x != nil {
+		return x.TextFormat
+	}
+	return ""
+}
+
+// ServiceDefinition is used to JSON decode the Service definitions. For
+// documentation on specific fields see NodeService which is better documented.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceDefinition
+// output=service.gen.go
+// name=Structs
+type ServiceDefinition struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=structs.ServiceKind func-from=string
+	Kind    string   `protobuf:"bytes,1,opt,name=Kind,proto3" json:"Kind,omitempty"`
+	ID      string   `protobuf:"bytes,2,opt,name=ID,proto3" json:"ID,omitempty"`
+	Name    string   `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"`
+	Tags    []string `protobuf:"bytes,4,rep,name=Tags,proto3" json:"Tags,omitempty"`
+	Address string   `protobuf:"bytes,5,opt,name=Address,proto3" json:"Address,omitempty"`
+	// mog: func-to=MapStringServiceAddressToStructs func-from=NewMapStringServiceAddressFromStructs
+	TaggedAddresses map[string]*ServiceAddress `protobuf:"bytes,16,rep,name=TaggedAddresses,proto3" json:"TaggedAddresses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Meta            map[string]string          `protobuf:"bytes,6,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// mog: func-to=int func-from=int32
+	Port int32 `protobuf:"varint,7,opt,name=Port,proto3" json:"Port,omitempty"`
+	// Path for socket
+	SocketPath string     `protobuf:"bytes,18,opt,name=SocketPath,proto3" json:"SocketPath,omitempty"`
+	Check      *CheckType `protobuf:"bytes,8,opt,name=Check,proto3" json:"Check,omitempty"`
+	// mog: func-to=CheckTypesToStructs func-from=NewCheckTypesFromStructs
+	Checks []*CheckType `protobuf:"bytes,9,rep,name=Checks,proto3" json:"Checks,omitempty"`
+	// mog: func-to=WeightsPtrToStructs func-from=NewWeightsPtrFromStructs
+	Weights           *Weights `protobuf:"bytes,10,opt,name=Weights,proto3" json:"Weights,omitempty"`
+	Token             string   `protobuf:"bytes,11,opt,name=Token,proto3" json:"Token,omitempty"`
+	EnableTagOverride bool     `protobuf:"varint,12,opt,name=EnableTagOverride,proto3" json:"EnableTagOverride,omitempty"`
+	// Proxy is the configuration set for Kind = connect-proxy. It is mandatory in
+	// that case and an error to be set for any other kind. This config is part of
+	// a proxy service definition and is distinct from but shares some fields with
+	// the Connect.Proxy which configures a managed proxy as part of the actual
+	// service's definition. This duplication is ugly but seemed better than the
+	// alternative which was to re-use the same struct fields for both cases even
+	// though the semantics are different and the non-shared fields make no sense
+	// in the other case. ProxyConfig may be a more natural name here, but it's
+	// confusing for the UX because one of the fields in ConnectProxyConfig is
+	// also called just "Config"
+	// mog: func-to=ConnectProxyConfigPtrToStructs func-from=NewConnectProxyConfigPtrFromStructs
+	Proxy *ConnectProxyConfig `protobuf:"bytes,14,opt,name=Proxy,proto3" json:"Proxy,omitempty"`
+	// mog: func-to=EnterpriseMetaToStructs func-from=NewEnterpriseMetaFromStructs
+	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,17,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
+	// mog: func-to=ServiceConnectPtrToStructs func-from=NewServiceConnectPtrFromStructs
+	Connect *ServiceConnect `protobuf:"bytes,15,opt,name=Connect,proto3" json:"Connect,omitempty"`
+}
+
+func (x *ServiceDefinition) Reset() {
+	*x = ServiceDefinition{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceDefinition) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceDefinition) ProtoMessage() {}
+
+func (x *ServiceDefinition) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[9]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceDefinition.ProtoReflect.Descriptor instead.
+func (*ServiceDefinition) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{9}
+}
+
+func (x *ServiceDefinition) GetKind() string {
+	if x != nil {
+		return x.Kind
+	}
+	return ""
+}
+
+func (x *ServiceDefinition) GetID() string {
+	if x != nil {
+		return x.ID
+	}
+	return ""
+}
+
+func (x *ServiceDefinition) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *ServiceDefinition) GetTags() []string {
+	if x != nil {
+		return x.Tags
+	}
+	return nil
+}
+
+func (x *ServiceDefinition) GetAddress() string {
+	if x != nil {
+		return x.Address
+	}
+	return ""
+}
+
+func (x *ServiceDefinition) GetTaggedAddresses() map[string]*ServiceAddress {
+	if x != nil {
+		return x.TaggedAddresses
+	}
+	return nil
+}
+
+func (x *ServiceDefinition) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
+	}
+	return nil
+}
+
+func (x *ServiceDefinition) GetPort() int32 {
+	if x != nil {
+		return x.Port
+	}
+	return 0
+}
+
+func (x *ServiceDefinition) GetSocketPath() string {
+	if x != nil {
+		return x.SocketPath
+	}
+	return ""
+}
+
+func (x *ServiceDefinition) GetCheck() *CheckType {
+	if x != nil {
+		return x.Check
+	}
+	return nil
+}
+
+func (x *ServiceDefinition) GetChecks() []*CheckType {
+	if x != nil {
+		return x.Checks
+	}
+	return nil
+}
+
+func (x *ServiceDefinition) GetWeights() *Weights {
+	if x != nil {
+		return x.Weights
+	}
+	return nil
+}
+
+func (x *ServiceDefinition) GetToken() string {
+	if x != nil {
+		return x.Token
+	}
+	return ""
+}
+
+func (x *ServiceDefinition) GetEnableTagOverride() bool {
+	if x != nil {
+		return x.EnableTagOverride
+	}
+	return false
+}
+
+func (x *ServiceDefinition) GetProxy() *ConnectProxyConfig {
+	if x != nil {
+		return x.Proxy
+	}
+	return nil
+}
+
+func (x *ServiceDefinition) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
+	}
+	return nil
+}
+
+func (x *ServiceDefinition) GetConnect() *ServiceConnect {
+	if x != nil {
+		return x.Connect
+	}
+	return nil
+}
+
+// Type to hold an address and port of a service
+type ServiceAddress struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Address string `protobuf:"bytes,1,opt,name=Address,proto3" json:"Address,omitempty"`
+	// mog: func-to=int func-from=int32
+	Port int32 `protobuf:"varint,2,opt,name=Port,proto3" json:"Port,omitempty"`
+}
+
+func (x *ServiceAddress) Reset() {
+	*x = ServiceAddress{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[10]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceAddress) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceAddress) ProtoMessage() {}
+
+func (x *ServiceAddress) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[10]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceAddress.ProtoReflect.Descriptor instead.
+func (*ServiceAddress) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{10}
+}
+
+func (x *ServiceAddress) GetAddress() string {
+	if x != nil {
+		return x.Address
+	}
+	return ""
+}
+
+func (x *ServiceAddress) GetPort() int32 {
+	if x != nil {
+		return x.Port
+	}
+	return 0
+}
+
+// Weights represent the weight used by DNS for a given status
+type Weights struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// mog: func-to=int func-from=int32
+	Passing int32 `protobuf:"varint,1,opt,name=Passing,proto3" json:"Passing,omitempty"`
+	// mog: func-to=int func-from=int32
+	Warning int32 `protobuf:"varint,2,opt,name=Warning,proto3" json:"Warning,omitempty"`
+}
+
+func (x *Weights) Reset() {
+	*x = Weights{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[11]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Weights) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Weights) ProtoMessage() {}
+
+func (x *Weights) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[11]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Weights.ProtoReflect.Descriptor instead.
+func (*Weights) Descriptor() ([]byte, []int) {
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{11}
+}
+
+func (x *Weights) GetPassing() int32 {
+	if x != nil {
+		return x.Passing
+	}
+	return 0
+}
+
+func (x *Weights) GetWarning() int32 {
+	if x != nil {
+		return x.Warning
+	}
+	return 0
+}
+
+var File_proto_pbservice_service_proto protoreflect.FileDescriptor
+
+var file_proto_pbservice_service_proto_rawDesc = []byte{
+	0x0a, 0x1d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
+	0x21, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x1a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x68,
+	0x65, 0x61, 0x6c, 0x74, 0x68, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x22, 0xdf, 0x06, 0x0a, 0x12, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x72, 0x6f, 0x78,
+	0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x36, 0x0a, 0x16, 0x44, 0x65, 0x73, 0x74, 0x69,
+	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+	0x32, 0x0a, 0x14, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x44,
+	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x49, 0x44, 0x12, 0x30, 0x0a, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x10, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x6f, 0x72,
+	0x74, 0x12, 0x2f, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x06, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x12, 0x49, 0x0a, 0x09, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x18,
+	0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65,
+	0x61, 0x6d, 0x52, 0x09, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x56, 0x0a,
+	0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77,
+	0x61, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61,
+	0x74, 0x65, 0x77, 0x61, 0x79, 0x12, 0x47, 0x0a, 0x06, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x18,
+	0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x12, 0x12,
+	0x0a, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4d, 0x6f,
+	0x64, 0x65, 0x12, 0x65, 0x0a, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e,
+	0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78,
+	0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61,
+	0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x36, 0x0a, 0x16, 0x4c, 0x6f, 0x63,
+	0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50,
+	0x61, 0x74, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x4c, 0x6f, 0x63, 0x61, 0x6c,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74,
+	0x68, 0x12, 0x5a, 0x0a, 0x0f, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
+	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e,
+	0x76, 0x6f, 0x79, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x45, 0x6e,
+	0x76, 0x6f, 0x79, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x53, 0x0a,
+	0x0a, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f,
+	0x67, 0x73, 0x22, 0x81, 0x05, 0x0a, 0x08, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12,
+	0x28, 0x0a, 0x0f, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79,
+	0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x32, 0x0a, 0x14, 0x44, 0x65, 0x73,
+	0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x32, 0x0a,
+	0x14, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x72, 0x74,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x44, 0x65, 0x73,
+	0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x28, 0x0a, 0x0f, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x50, 0x65, 0x65, 0x72, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x44, 0x65, 0x73, 0x74,
+	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x0f, 0x44,
+	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e,
+	0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63,
+	0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x10, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69,
+	0x6e, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x10, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
+	0x73, 0x12, 0x24, 0x0a, 0x0d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64, 0x50, 0x6f,
+	0x72, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42,
+	0x69, 0x6e, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x2f, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74,
+	0x52, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x56, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x68,
+	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x52, 0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
+	0x12, 0x30, 0x0a, 0x13, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x6c, 0x79, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x43,
+	0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x6c, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
+	0x65, 0x64, 0x12, 0x30, 0x0a, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64, 0x53,
+	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74,
+	0x50, 0x61, 0x74, 0x68, 0x12, 0x30, 0x0a, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e,
+	0x64, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64, 0x53, 0x6f, 0x63, 0x6b,
+	0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x22, 0xdf, 0x01, 0x0a, 0x0e, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x4e, 0x61, 0x74,
+	0x69, 0x76, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x4e, 0x61, 0x74, 0x69, 0x76,
+	0x65, 0x12, 0x5c, 0x0a, 0x0e, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x0e, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12,
+	0x51, 0x0a, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
+	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4d, 0x65,
+	0x74, 0x61, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x22, 0x5e, 0x0a, 0x12, 0x50, 0x65, 0x65, 0x72,
+	0x69, 0x6e, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x10,
+	0x0a, 0x03, 0x53, 0x4e, 0x49, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x53, 0x4e, 0x49,
+	0x12, 0x1a, 0x0a, 0x08, 0x53, 0x70, 0x69, 0x66, 0x66, 0x65, 0x49, 0x44, 0x18, 0x02, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x08, 0x53, 0x70, 0x69, 0x66, 0x66, 0x65, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x22, 0x6b, 0x0a, 0x0c, 0x45, 0x78, 0x70, 0x6f,
+	0x73, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x43, 0x68, 0x65, 0x63,
+	0x6b, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73,
+	0x12, 0x43, 0x0a, 0x05, 0x50, 0x61, 0x74, 0x68, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x50, 0x61, 0x74, 0x68, 0x52, 0x05,
+	0x50, 0x61, 0x74, 0x68, 0x73, 0x22, 0xb0, 0x01, 0x0a, 0x0a, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65,
+	0x50, 0x61, 0x74, 0x68, 0x12, 0x22, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
+	0x50, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x4c, 0x69, 0x73, 0x74,
+	0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x74, 0x68,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x50, 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x0d,
+	0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x0d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x50, 0x6f,
+	0x72, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x28,
+	0x0a, 0x0f, 0x50, 0x61, 0x72, 0x73, 0x65, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x43, 0x68, 0x65, 0x63,
+	0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x50, 0x61, 0x72, 0x73, 0x65, 0x64, 0x46,
+	0x72, 0x6f, 0x6d, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x27, 0x0a, 0x11, 0x4d, 0x65, 0x73, 0x68,
+	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x12, 0x0a,
+	0x04, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4d, 0x6f, 0x64,
+	0x65, 0x22, 0x74, 0x0a, 0x16, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74,
+	0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x32, 0x0a, 0x14, 0x4f,
+	0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50,
+	0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x4f, 0x75, 0x74, 0x62, 0x6f,
+	0x75, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x12,
+	0x26, 0x0a, 0x0e, 0x44, 0x69, 0x61, 0x6c, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6c,
+	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x44, 0x69, 0x61, 0x6c, 0x65, 0x64, 0x44,
+	0x69, 0x72, 0x65, 0x63, 0x74, 0x6c, 0x79, 0x22, 0xc6, 0x01, 0x0a, 0x10, 0x41, 0x63, 0x63, 0x65,
+	0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x18, 0x0a, 0x07,
+	0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x45,
+	0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x30, 0x0a, 0x13, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c,
+	0x65, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x73, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x13, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74,
+	0x65, 0x6e, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04,
+	0x50, 0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x50, 0x61, 0x74, 0x68,
+	0x12, 0x1e, 0x0a, 0x0a, 0x4a, 0x53, 0x4f, 0x4e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x4a, 0x53, 0x4f, 0x4e, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
+	0x12, 0x1e, 0x0a, 0x0a, 0x54, 0x65, 0x78, 0x74, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x06,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x54, 0x65, 0x78, 0x74, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
+	0x22, 0xae, 0x08, 0x0a, 0x11, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x69,
+	0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61,
+	0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12,
+	0x0a, 0x04, 0x54, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x54, 0x61,
+	0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x73, 0x0a, 0x0f,
+	0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18,
+	0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x49, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x54, 0x61, 0x67, 0x67,
+	0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x0f, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65,
+	0x73, 0x12, 0x52, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
+	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+	0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x6f, 0x63,
+	0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53,
+	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x12, 0x42, 0x0a, 0x05, 0x43, 0x68, 0x65,
+	0x63, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x43, 0x68, 0x65,
+	0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x44, 0x0a,
+	0x06, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x52, 0x06, 0x43, 0x68, 0x65,
+	0x63, 0x6b, 0x73, 0x12, 0x44, 0x0a, 0x07, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x18, 0x0a,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73,
+	0x52, 0x07, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x6f, 0x6b,
+	0x65, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12,
+	0x2c, 0x0a, 0x11, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x61, 0x67, 0x4f, 0x76, 0x65, 0x72,
+	0x72, 0x69, 0x64, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x45, 0x6e, 0x61, 0x62,
+	0x6c, 0x65, 0x54, 0x61, 0x67, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x12, 0x4b, 0x0a,
+	0x05, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x52, 0x05, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x11, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65,
+	0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65,
+	0x4d, 0x65, 0x74, 0x61, 0x12, 0x4b, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x18,
+	0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
+	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x07, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x1a, 0x75, 0x0a, 0x14, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65,
+	0x73, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x47, 0x0a, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+	0x01, 0x22, 0x3e, 0x0a, 0x0e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72,
+	0x65, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a,
+	0x04, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x50, 0x6f, 0x72,
+	0x74, 0x22, 0x3d, 0x0a, 0x07, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07,
+	0x50, 0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x50,
+	0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e,
+	0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67,
+	0x42, 0x8a, 0x02, 0x0a, 0x25, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x0c, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x53, 0xaa, 0x02,
+	0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0xca, 0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xe2, 0x02, 0x2d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x24, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_pbservice_service_proto_rawDescOnce sync.Once
+	file_proto_pbservice_service_proto_rawDescData = file_proto_pbservice_service_proto_rawDesc
+)
+
+func file_proto_pbservice_service_proto_rawDescGZIP() []byte {
+	file_proto_pbservice_service_proto_rawDescOnce.Do(func() {
+		file_proto_pbservice_service_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbservice_service_proto_rawDescData)
+	})
+	return file_proto_pbservice_service_proto_rawDescData
+}
+
+var file_proto_pbservice_service_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
+var file_proto_pbservice_service_proto_goTypes = []interface{}{
+	(*ConnectProxyConfig)(nil),      // 0: hashicorp.consul.internal.service.ConnectProxyConfig
+	(*Upstream)(nil),                // 1: hashicorp.consul.internal.service.Upstream
+	(*ServiceConnect)(nil),          // 2: hashicorp.consul.internal.service.ServiceConnect
+	(*PeeringServiceMeta)(nil),      // 3: hashicorp.consul.internal.service.PeeringServiceMeta
+	(*ExposeConfig)(nil),            // 4: hashicorp.consul.internal.service.ExposeConfig
+	(*ExposePath)(nil),              // 5: hashicorp.consul.internal.service.ExposePath
+	(*MeshGatewayConfig)(nil),       // 6: hashicorp.consul.internal.service.MeshGatewayConfig
+	(*TransparentProxyConfig)(nil),  // 7: hashicorp.consul.internal.service.TransparentProxyConfig
+	(*AccessLogsConfig)(nil),        // 8: hashicorp.consul.internal.service.AccessLogsConfig
+	(*ServiceDefinition)(nil),       // 9: hashicorp.consul.internal.service.ServiceDefinition
+	(*ServiceAddress)(nil),          // 10: hashicorp.consul.internal.service.ServiceAddress
+	(*Weights)(nil),                 // 11: hashicorp.consul.internal.service.Weights
+	nil,                             // 12: hashicorp.consul.internal.service.ServiceDefinition.TaggedAddressesEntry
+	nil,                             // 13: hashicorp.consul.internal.service.ServiceDefinition.MetaEntry
+	(*structpb.Struct)(nil),         // 14: google.protobuf.Struct
+	(*pbcommon.EnvoyExtension)(nil), // 15: hashicorp.consul.internal.common.EnvoyExtension
+	(*CheckType)(nil),               // 16: hashicorp.consul.internal.service.CheckType
+	(*pbcommon.EnterpriseMeta)(nil), // 17: hashicorp.consul.internal.common.EnterpriseMeta
+}
+var file_proto_pbservice_service_proto_depIdxs = []int32{
+	14, // 0: hashicorp.consul.internal.service.ConnectProxyConfig.Config:type_name -> google.protobuf.Struct
+	1,  // 1: hashicorp.consul.internal.service.ConnectProxyConfig.Upstreams:type_name -> hashicorp.consul.internal.service.Upstream
+	6,  // 2: hashicorp.consul.internal.service.ConnectProxyConfig.MeshGateway:type_name -> hashicorp.consul.internal.service.MeshGatewayConfig
+	4,  // 3: hashicorp.consul.internal.service.ConnectProxyConfig.Expose:type_name -> hashicorp.consul.internal.service.ExposeConfig
+	7,  // 4: hashicorp.consul.internal.service.ConnectProxyConfig.TransparentProxy:type_name -> hashicorp.consul.internal.service.TransparentProxyConfig
+	15, // 5: hashicorp.consul.internal.service.ConnectProxyConfig.EnvoyExtensions:type_name -> hashicorp.consul.internal.common.EnvoyExtension
+	8,  // 6: hashicorp.consul.internal.service.ConnectProxyConfig.AccessLogs:type_name -> hashicorp.consul.internal.service.AccessLogsConfig
+	14, // 7: hashicorp.consul.internal.service.Upstream.Config:type_name -> google.protobuf.Struct
+	6,  // 8: hashicorp.consul.internal.service.Upstream.MeshGateway:type_name -> hashicorp.consul.internal.service.MeshGatewayConfig
+	9,  // 9: hashicorp.consul.internal.service.ServiceConnect.SidecarService:type_name -> hashicorp.consul.internal.service.ServiceDefinition
+	3,  // 10: hashicorp.consul.internal.service.ServiceConnect.PeerMeta:type_name -> hashicorp.consul.internal.service.PeeringServiceMeta
+	5,  // 11: hashicorp.consul.internal.service.ExposeConfig.Paths:type_name -> hashicorp.consul.internal.service.ExposePath
+	12, // 12: hashicorp.consul.internal.service.ServiceDefinition.TaggedAddresses:type_name -> hashicorp.consul.internal.service.ServiceDefinition.TaggedAddressesEntry
+	13, // 13: hashicorp.consul.internal.service.ServiceDefinition.Meta:type_name -> hashicorp.consul.internal.service.ServiceDefinition.MetaEntry
+	16, // 14: hashicorp.consul.internal.service.ServiceDefinition.Check:type_name -> hashicorp.consul.internal.service.CheckType
+	16, // 15: hashicorp.consul.internal.service.ServiceDefinition.Checks:type_name -> hashicorp.consul.internal.service.CheckType
+	11, // 16: hashicorp.consul.internal.service.ServiceDefinition.Weights:type_name -> hashicorp.consul.internal.service.Weights
+	0,  // 17: hashicorp.consul.internal.service.ServiceDefinition.Proxy:type_name -> hashicorp.consul.internal.service.ConnectProxyConfig
+	17, // 18: hashicorp.consul.internal.service.ServiceDefinition.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
+	2,  // 19: hashicorp.consul.internal.service.ServiceDefinition.Connect:type_name -> hashicorp.consul.internal.service.ServiceConnect
+	10, // 20: hashicorp.consul.internal.service.ServiceDefinition.TaggedAddressesEntry.value:type_name -> hashicorp.consul.internal.service.ServiceAddress
+	21, // [21:21] is the sub-list for method output_type
+	21, // [21:21] is the sub-list for method input_type
+	21, // [21:21] is the sub-list for extension type_name
+	21, // [21:21] is the sub-list for extension extendee
+	0,  // [0:21] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbservice_service_proto_init() }
+func file_proto_pbservice_service_proto_init() {
+	if File_proto_pbservice_service_proto != nil {
+		return
+	}
+	file_proto_pbservice_healthcheck_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbservice_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ConnectProxyConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Upstream); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceConnect); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PeeringServiceMeta); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExposeConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExposePath); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MeshGatewayConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TransparentProxyConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AccessLogsConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceDefinition); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceAddress); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Weights); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbservice_service_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   14,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbservice_service_proto_goTypes,
+		DependencyIndexes: file_proto_pbservice_service_proto_depIdxs,
+		MessageInfos:      file_proto_pbservice_service_proto_msgTypes,
+	}.Build()
+	File_proto_pbservice_service_proto = out.File
+	file_proto_pbservice_service_proto_rawDesc = nil
+	file_proto_pbservice_service_proto_goTypes = nil
+	file_proto_pbservice_service_proto_depIdxs = nil
+}
diff --git a/proto/pbservice/service.proto b/proto/pbservice/service.proto
new file mode 100644
index 0000000000000..22c8e2b75d0e7
--- /dev/null
+++ b/proto/pbservice/service.proto
@@ -0,0 +1,325 @@
+syntax = "proto3";
+
+package hashicorp.consul.internal.service;
+
+import "google/protobuf/struct.proto";
+import "proto/pbcommon/common.proto";
+import "proto/pbservice/healthcheck.proto";
+
+// ConnectProxyConfig describes the configuration needed for any proxy managed
+// or unmanaged. It describes a single logical service's listener and optionally
+// upstreams and sidecar-related config for a single instance. To describe a
+// centralized proxy that routed traffic for multiple services, a different one
+// of these would be needed for each, sharing the same LogicalProxyID.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ConnectProxyConfig
+// output=service.gen.go
+// name=Structs
+message ConnectProxyConfig {
+  // DestinationServiceName is required and is the name of the service to accept
+  // traffic for.
+  string DestinationServiceName = 1;
+
+  // DestinationServiceID is optional and should only be specified for
+  // "side-car" style proxies where the proxy is in front of just a single
+  // instance of the service. It should be set to the service ID of the instance
+  // being represented which must be registered to the same agent. It's valid to
+  // provide a service ID that does not yet exist to avoid timing issues when
+  // bootstrapping a service with a proxy.
+  string DestinationServiceID = 2;
+
+  // LocalServiceAddress is the address of the local service instance. It is
+  // optional and should only be specified for "side-car" style proxies. It will
+  // default to 127.0.0.1 if the proxy is a "side-car" (DestinationServiceID is
+  // set) but otherwise will be ignored.
+  string LocalServiceAddress = 3;
+
+  // LocalServicePort is the port of the local service instance. It is optional
+  // and should only be specified for "side-car" style proxies. It will default
+  // to the registered port for the instance if the proxy is a "side-car"
+  // (DestinationServiceID is set) but otherwise will be ignored.
+  // mog: func-to=int func-from=int32
+  int32 LocalServicePort = 4;
+
+  // Config is the arbitrary configuration data provided with the proxy
+  // registration.
+  // mog: func-to=ProtobufTypesStructToMapStringInterface func-from=MapStringInterfaceToProtobufTypesStruct
+  google.protobuf.Struct Config = 5;
+
+  // Upstreams describes any upstream dependencies the proxy instance should
+  // setup.
+  // mog: func-to=UpstreamsToStructs func-from=NewUpstreamsFromStructs
+  repeated Upstream Upstreams = 6;
+
+  // MeshGateway defines the mesh gateway configuration for upstreams
+  MeshGatewayConfig MeshGateway = 7;
+
+  // Expose defines whether checks or paths are exposed through the proxy
+  ExposeConfig Expose = 8;
+
+  // Mode represents how the proxy's inbound and upstream listeners are dialed.
+  // mog: func-to=structs.ProxyMode func-from=string
+  string Mode = 9;
+
+  // TransparentProxy defines configuration for when the proxy is in
+  // transparent mode.
+  TransparentProxyConfig TransparentProxy = 10;
+
+  // LocalServiceSocketPath is the path to the unix domain socket for the local service instance
+  string LocalServiceSocketPath = 11;
+
+  // mog: func-to=EnvoyExtensionsToStructs func-from=EnvoyExtensionsFromStructs
+  repeated hashicorp.consul.internal.common.EnvoyExtension EnvoyExtensions = 12;
+
+  // AccessLogsConfig defines envoys access log configuration.
+  AccessLogsConfig AccessLogs = 13;
+}
+
+// Upstream represents a single upstream dependency for a service or proxy. It
+// describes the mechanism used to discover instances to communicate with (the
+// Target) as well as any potential client configuration that may be useful such
+// as load balancer options, timeouts etc.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.Upstream
+// output=service.gen.go
+// name=Structs
+// ignore-fields=IngressHosts
+message Upstream {
+  // Destination fields are the required ones for determining what this upstream
+  // points to. Depending on DestinationType some other fields below might
+  // further restrict the set of instances allowable.
+  //
+  // DestinationType would be better as an int constant but even with custom
+  // JSON marshallers it causes havoc with all the mapstructure mangling we do
+  // on service definitions in various places.
+  string DestinationType = 1;
+  string DestinationNamespace = 2;
+  string DestinationPartition = 12;
+  string DestinationPeer = 13;
+  string DestinationName = 3;
+
+  // Datacenter that the service discovery request should be run against. Note
+  // for prepared queries, the actual results might be from a different
+  // datacenter.
+  string Datacenter = 4;
+
+  // LocalBindAddress is the ip address a side-car proxy should listen on for
+  // traffic destined for this upstream service. Default if empty is 127.0.0.1.
+  string LocalBindAddress = 5;
+
+  // LocalBindPort is the ip address a side-car proxy should listen on for
+  // traffic destined for this upstream service. Required.
+  // mog: func-to=int func-from=int32
+  int32 LocalBindPort = 6;
+
+  // Config is an opaque config that is specific to the proxy process being run.
+  // It can be used to pass arbitrary configuration for this specific upstream
+  // to the proxy.
+  // mog: func-to=ProtobufTypesStructToMapStringInterface func-from=MapStringInterfaceToProtobufTypesStruct
+  google.protobuf.Struct Config = 7;
+
+  // MeshGateway is the configuration for mesh gateway usage of this upstream
+  MeshGatewayConfig MeshGateway = 8;
+
+  // CentrallyConfigured indicates whether the upstream was defined in a proxy
+  // instance registration or whether it was generated from a config entry.
+  bool CentrallyConfigured = 9;
+
+  // LocalBindSocketPath is the socket to create to connect to the upstream service
+  string LocalBindSocketPath = 10;
+  string LocalBindSocketMode = 11;
+}
+
+// ServiceConnect are the shared Connect settings between all service
+// definitions from the agent to the state store.
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceConnect
+// output=service.gen.go
+// name=Structs
+message ServiceConnect {
+  // Native is true when this service can natively understand Connect.
+  bool Native = 1;
+
+  reserved 2;
+
+  // SidecarService is a nested Service Definition to register at the same time.
+  // It's purely a convenience mechanism to allow specifying a sidecar service
+  // along with the application service definition. It's nested nature allows
+  // all of the fields to be defaulted which can reduce the amount of
+  // boilerplate needed to register a sidecar service separately, but the end
+  // result is identical to just making a second service registration via any
+  // other means.
+  // mog: func-to=ServiceDefinitionPtrToStructs func-from=NewServiceDefinitionPtrFromStructs
+  ServiceDefinition SidecarService = 3;
+
+  PeeringServiceMeta PeerMeta = 4;
+}
+
+// PeeringServiceMeta is read-only information provided from an exported peer.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.PeeringServiceMeta
+// output=service.gen.go
+// name=Structs
+message PeeringServiceMeta {
+  repeated string SNI = 1;
+  repeated string SpiffeID = 2;
+  string Protocol = 3;
+}
+
+// ExposeConfig describes HTTP paths to expose through Envoy outside of Connect.
+// Users can expose individual paths and/or all HTTP/GRPC paths for checks.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ExposeConfig
+// output=service.gen.go
+// name=Structs
+message ExposeConfig {
+  // Checks defines whether paths associated with Consul checks will be exposed.
+  // This flag triggers exposing all HTTP and GRPC check paths registered for the service.
+  bool Checks = 1;
+
+  // Paths is the list of paths exposed through the proxy.
+  // mog: func-to=ExposePathSliceToStructs func-from=NewExposePathSliceFromStructs
+  repeated ExposePath Paths = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ExposePath
+// output=service.gen.go
+// name=Structs
+message ExposePath {
+  // ListenerPort defines the port of the proxy's listener for exposed paths.
+  // mog: func-to=int func-from=int32
+  int32 ListenerPort = 1;
+
+  // ExposePath is the path to expose through the proxy, ie. "/metrics."
+  string Path = 2;
+
+  // LocalPathPort is the port that the service is listening on for the given path.
+  // mog: func-to=int func-from=int32
+  int32 LocalPathPort = 3;
+
+  // Protocol describes the upstream's service protocol.
+  // Valid values are "http" and "http2", defaults to "http"
+  string Protocol = 4;
+
+  // ParsedFromCheck is set if this path was parsed from a registered check
+  bool ParsedFromCheck = 5;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.MeshGatewayConfig
+// output=service.gen.go
+// name=Structs
+message MeshGatewayConfig {
+  // mog: func-to=structs.MeshGatewayMode func-from=string
+  string Mode = 1;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.TransparentProxyConfig
+// output=service.gen.go
+// name=Structs
+message TransparentProxyConfig {
+  // mog: func-to=int func-from=int32
+  int32 OutboundListenerPort = 1;
+
+  // DialedDirectly indicates whether transparent proxies can dial this proxy instance directly.
+  // The discovery chain is not considered when dialing a service instance directly.
+  // This setting is useful when addressing stateful services, such as a database cluster with a leader node.
+  bool DialedDirectly = 2;
+}
+
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.AccessLogsConfig
+// output=service.gen.go
+// name=Structs
+message AccessLogsConfig {
+  bool Enabled = 1;
+  bool DisableListenerLogs = 2;
+
+  // Type represents the desired envoy log sink (e.g. stdout, stderr, file ...).
+  // mog: func-to=structs.LogSinkType func-from=string
+  string Type = 3;
+
+  string Path = 4;
+  string JSONFormat = 5;
+  string TextFormat = 6;
+}
+
+// ServiceDefinition is used to JSON decode the Service definitions. For
+// documentation on specific fields see NodeService which is better documented.
+//
+// mog annotation:
+//
+// target=github.com/hashicorp/consul/agent/structs.ServiceDefinition
+// output=service.gen.go
+// name=Structs
+message ServiceDefinition {
+  // mog: func-to=structs.ServiceKind func-from=string
+  string Kind = 1;
+  string ID = 2;
+  string Name = 3;
+  repeated string Tags = 4;
+  string Address = 5;
+  // mog: func-to=MapStringServiceAddressToStructs func-from=NewMapStringServiceAddressFromStructs
+  map<string, ServiceAddress> TaggedAddresses = 16;
+  map<string, string> Meta = 6;
+  // mog: func-to=int func-from=int32
+  int32 Port = 7;
+  // Path for socket
+  string SocketPath = 18;
+  CheckType Check = 8;
+  // mog: func-to=CheckTypesToStructs func-from=NewCheckTypesFromStructs
+  repeated CheckType Checks = 9;
+  // mog: func-to=WeightsPtrToStructs func-from=NewWeightsPtrFromStructs
+  Weights Weights = 10;
+  string Token = 11;
+  bool EnableTagOverride = 12;
+
+  // Proxy is the configuration set for Kind = connect-proxy. It is mandatory in
+  // that case and an error to be set for any other kind. This config is part of
+  // a proxy service definition and is distinct from but shares some fields with
+  // the Connect.Proxy which configures a managed proxy as part of the actual
+  // service's definition. This duplication is ugly but seemed better than the
+  // alternative which was to re-use the same struct fields for both cases even
+  // though the semantics are different and the non-shared fields make no sense
+  // in the other case. ProxyConfig may be a more natural name here, but it's
+  // confusing for the UX because one of the fields in ConnectProxyConfig is
+  // also called just "Config"
+  // mog: func-to=ConnectProxyConfigPtrToStructs func-from=NewConnectProxyConfigPtrFromStructs
+  ConnectProxyConfig Proxy = 14;
+
+  // mog: func-to=EnterpriseMetaToStructs func-from=NewEnterpriseMetaFromStructs
+  common.EnterpriseMeta EnterpriseMeta = 17;
+
+  // mog: func-to=ServiceConnectPtrToStructs func-from=NewServiceConnectPtrFromStructs
+  ServiceConnect Connect = 15;
+}
+
+// Type to hold an address and port of a service
+message ServiceAddress {
+  string Address = 1;
+  // mog: func-to=int func-from=int32
+  int32 Port = 2;
+}
+
+// Weights represent the weight used by DNS for a given status
+message Weights {
+  // mog: func-to=int func-from=int32
+  int32 Passing = 1;
+  // mog: func-to=int func-from=int32
+  int32 Warning = 2;
+}
diff --git a/proto/private/pbstatus/status.pb.binary.go b/proto/pbstatus/status.pb.binary.go
similarity index 90%
rename from proto/private/pbstatus/status.pb.binary.go
rename to proto/pbstatus/status.pb.binary.go
index f4b4c9e1a7b18..160fad658b780 100644
--- a/proto/private/pbstatus/status.pb.binary.go
+++ b/proto/pbstatus/status.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbstatus/status.proto
+// source: proto/pbstatus/status.proto
 
 package pbstatus
 
diff --git a/proto/pbstatus/status.pb.go b/proto/pbstatus/status.pb.go
new file mode 100644
index 0000000000000..bdc5b70d798e7
--- /dev/null
+++ b/proto/pbstatus/status.pb.go
@@ -0,0 +1,211 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: proto/pbstatus/status.proto
+
+package pbstatus
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	anypb "google.golang.org/protobuf/types/known/anypb"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// The `Status` type defines a logical error model that is suitable for
+// different programming environments, including REST APIs and RPC APIs. It is
+// used by [gRPC](https://github.com/grpc). Each `Status` message contains
+// three pieces of data: error code, error message, and error details.
+//
+// You can find out more about this error model and how to work with it in the
+// [API Design Guide](https://cloud.google.com/apis/design/errors).
+type Status struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code].
+	Code int32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
+	// A developer-facing error message, which should be in English. Any
+	// user-facing error message should be localized and sent in the
+	// [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client.
+	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
+	// A list of messages that carry the error details.  There is a common set of
+	// message types for APIs to use.
+	Details []*anypb.Any `protobuf:"bytes,3,rep,name=details,proto3" json:"details,omitempty"`
+}
+
+func (x *Status) Reset() {
+	*x = Status{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbstatus_status_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Status) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Status) ProtoMessage() {}
+
+func (x *Status) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbstatus_status_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Status.ProtoReflect.Descriptor instead.
+func (*Status) Descriptor() ([]byte, []int) {
+	return file_proto_pbstatus_status_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *Status) GetCode() int32 {
+	if x != nil {
+		return x.Code
+	}
+	return 0
+}
+
+func (x *Status) GetMessage() string {
+	if x != nil {
+		return x.Message
+	}
+	return ""
+}
+
+func (x *Status) GetDetails() []*anypb.Any {
+	if x != nil {
+		return x.Details
+	}
+	return nil
+}
+
+var File_proto_pbstatus_status_proto protoreflect.FileDescriptor
+
+var file_proto_pbstatus_status_proto_rawDesc = []byte{
+	0x0a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x1a,
+	0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x66, 0x0a, 0x06, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x12, 0x2e, 0x0a, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69,
+	0x6c, 0x73, 0x42, 0x83, 0x02, 0x0a, 0x24, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
+	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x0b, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62,
+	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x53, 0xaa, 0x02, 0x20,
+	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0xca, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0xe2, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c,
+	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c,
+	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
+	0x74, 0x61, 0xea, 0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a,
+	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
+	0x3a, 0x3a, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_pbstatus_status_proto_rawDescOnce sync.Once
+	file_proto_pbstatus_status_proto_rawDescData = file_proto_pbstatus_status_proto_rawDesc
+)
+
+func file_proto_pbstatus_status_proto_rawDescGZIP() []byte {
+	file_proto_pbstatus_status_proto_rawDescOnce.Do(func() {
+		file_proto_pbstatus_status_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbstatus_status_proto_rawDescData)
+	})
+	return file_proto_pbstatus_status_proto_rawDescData
+}
+
+var file_proto_pbstatus_status_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_proto_pbstatus_status_proto_goTypes = []interface{}{
+	(*Status)(nil),    // 0: hashicorp.consul.internal.status.Status
+	(*anypb.Any)(nil), // 1: google.protobuf.Any
+}
+var file_proto_pbstatus_status_proto_depIdxs = []int32{
+	1, // 0: hashicorp.consul.internal.status.Status.details:type_name -> google.protobuf.Any
+	1, // [1:1] is the sub-list for method output_type
+	1, // [1:1] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbstatus_status_proto_init() }
+func file_proto_pbstatus_status_proto_init() {
+	if File_proto_pbstatus_status_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbstatus_status_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Status); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbstatus_status_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbstatus_status_proto_goTypes,
+		DependencyIndexes: file_proto_pbstatus_status_proto_depIdxs,
+		MessageInfos:      file_proto_pbstatus_status_proto_msgTypes,
+	}.Build()
+	File_proto_pbstatus_status_proto = out.File
+	file_proto_pbstatus_status_proto_rawDesc = nil
+	file_proto_pbstatus_status_proto_goTypes = nil
+	file_proto_pbstatus_status_proto_depIdxs = nil
+}
diff --git a/proto/private/pbstatus/status.proto b/proto/pbstatus/status.proto
similarity index 100%
rename from proto/private/pbstatus/status.proto
rename to proto/pbstatus/status.proto
diff --git a/proto/private/pbsubscribe/subscribe.go b/proto/pbsubscribe/subscribe.go
similarity index 95%
rename from proto/private/pbsubscribe/subscribe.go
rename to proto/pbsubscribe/subscribe.go
index 918c3d298078b..0b2b21bcffd17 100644
--- a/proto/private/pbsubscribe/subscribe.go
+++ b/proto/pbsubscribe/subscribe.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package pbsubscribe
 
 import (
diff --git a/proto/private/pbsubscribe/subscribe.pb.binary.go b/proto/pbsubscribe/subscribe.pb.binary.go
similarity index 97%
rename from proto/private/pbsubscribe/subscribe.pb.binary.go
rename to proto/pbsubscribe/subscribe.pb.binary.go
index 51e697cc9d75f..188eff1f57f61 100644
--- a/proto/private/pbsubscribe/subscribe.pb.binary.go
+++ b/proto/pbsubscribe/subscribe.pb.binary.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbsubscribe/subscribe.proto
+// source: proto/pbsubscribe/subscribe.proto
 
 package pbsubscribe
 
diff --git a/proto/pbsubscribe/subscribe.pb.go b/proto/pbsubscribe/subscribe.pb.go
new file mode 100644
index 0000000000000..b6f7b4eaec402
--- /dev/null
+++ b/proto/pbsubscribe/subscribe.pb.go
@@ -0,0 +1,1201 @@
+//
+//Package event provides a service for subscribing to state change events.
+
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.1
+// 	protoc        (unknown)
+// source: proto/pbsubscribe/subscribe.proto
+
+// TODO: ideally we would have prefixed this package as
+// "hashicorp.consul.internal.subscribe" before releasing but now correcting this will
+// require a grpc passthrough service shim since the package name is part of
+// the rpc method dispatch and editing it naively would break backwards
+// compatibility.
+
+package pbsubscribe
+
+import (
+	_ "github.com/hashicorp/consul/proto-public/annotations/ratelimit"
+	pbcommon "github.com/hashicorp/consul/proto/pbcommon"
+	pbconfigentry "github.com/hashicorp/consul/proto/pbconfigentry"
+	pbservice "github.com/hashicorp/consul/proto/pbservice"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// Topic enumerates the supported event topics.
+type Topic int32
+
+const (
+	Topic_Unknown Topic = 0
+	// ServiceHealth topic contains events for any changes to service health.
+	Topic_ServiceHealth Topic = 1
+	// ServiceHealthConnect topic contains events for any changes to service
+	// health for connect-enabled services.
+	Topic_ServiceHealthConnect Topic = 2
+	// MeshConfig topic contains events for changes to the global mesh config.
+	Topic_MeshConfig Topic = 3
+	// ServiceResolver topic contains events for changes to a service resolver.
+	Topic_ServiceResolver Topic = 4
+	// IngressGateway topic contains events for changes to an ingress gateway.
+	Topic_IngressGateway Topic = 5
+	// ServiceIntentions topic contains events for changes to service intentions.
+	Topic_ServiceIntentions Topic = 6
+	// ServiceList topic contains events about services (not service instances)
+	// getting registered/deregistered. It can be used to materialize a list of
+	// the services in the given datacenter.
+	//
+	// Note: WildcardSubject is the only supported Subject on this topic.
+	Topic_ServiceList Topic = 7
+	// ServiceDefaults topic contains events for changes to service-defaults.
+	Topic_ServiceDefaults Topic = 8
+	// APIGateway topic contains events for changes to api-gateways.
+	Topic_APIGateway Topic = 9
+	// TCPRoute topic contains events for changes to tcp-routes.
+	Topic_TCPRoute Topic = 10
+	// HTTPRoute topic contains events for changes to http-routes.
+	Topic_HTTPRoute Topic = 11
+	// InlineCertificate topic contains events for changes to inline-certificates.
+	Topic_InlineCertificate Topic = 12
+	// BoundAPIGateway topic contains events for changes to bound-api-gateways.
+	Topic_BoundAPIGateway Topic = 13
+)
+
+// Enum value maps for Topic.
+var (
+	Topic_name = map[int32]string{
+		0:  "Unknown",
+		1:  "ServiceHealth",
+		2:  "ServiceHealthConnect",
+		3:  "MeshConfig",
+		4:  "ServiceResolver",
+		5:  "IngressGateway",
+		6:  "ServiceIntentions",
+		7:  "ServiceList",
+		8:  "ServiceDefaults",
+		9:  "APIGateway",
+		10: "TCPRoute",
+		11: "HTTPRoute",
+		12: "InlineCertificate",
+		13: "BoundAPIGateway",
+	}
+	Topic_value = map[string]int32{
+		"Unknown":              0,
+		"ServiceHealth":        1,
+		"ServiceHealthConnect": 2,
+		"MeshConfig":           3,
+		"ServiceResolver":      4,
+		"IngressGateway":       5,
+		"ServiceIntentions":    6,
+		"ServiceList":          7,
+		"ServiceDefaults":      8,
+		"APIGateway":           9,
+		"TCPRoute":             10,
+		"HTTPRoute":            11,
+		"InlineCertificate":    12,
+		"BoundAPIGateway":      13,
+	}
+)
+
+func (x Topic) Enum() *Topic {
+	p := new(Topic)
+	*p = x
+	return p
+}
+
+func (x Topic) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (Topic) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbsubscribe_subscribe_proto_enumTypes[0].Descriptor()
+}
+
+func (Topic) Type() protoreflect.EnumType {
+	return &file_proto_pbsubscribe_subscribe_proto_enumTypes[0]
+}
+
+func (x Topic) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use Topic.Descriptor instead.
+func (Topic) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{0}
+}
+
+type CatalogOp int32
+
+const (
+	CatalogOp_Register   CatalogOp = 0
+	CatalogOp_Deregister CatalogOp = 1
+)
+
+// Enum value maps for CatalogOp.
+var (
+	CatalogOp_name = map[int32]string{
+		0: "Register",
+		1: "Deregister",
+	}
+	CatalogOp_value = map[string]int32{
+		"Register":   0,
+		"Deregister": 1,
+	}
+)
+
+func (x CatalogOp) Enum() *CatalogOp {
+	p := new(CatalogOp)
+	*p = x
+	return p
+}
+
+func (x CatalogOp) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (CatalogOp) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbsubscribe_subscribe_proto_enumTypes[1].Descriptor()
+}
+
+func (CatalogOp) Type() protoreflect.EnumType {
+	return &file_proto_pbsubscribe_subscribe_proto_enumTypes[1]
+}
+
+func (x CatalogOp) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use CatalogOp.Descriptor instead.
+func (CatalogOp) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{1}
+}
+
+type ConfigEntryUpdate_UpdateOp int32
+
+const (
+	ConfigEntryUpdate_Upsert ConfigEntryUpdate_UpdateOp = 0
+	ConfigEntryUpdate_Delete ConfigEntryUpdate_UpdateOp = 1
+)
+
+// Enum value maps for ConfigEntryUpdate_UpdateOp.
+var (
+	ConfigEntryUpdate_UpdateOp_name = map[int32]string{
+		0: "Upsert",
+		1: "Delete",
+	}
+	ConfigEntryUpdate_UpdateOp_value = map[string]int32{
+		"Upsert": 0,
+		"Delete": 1,
+	}
+)
+
+func (x ConfigEntryUpdate_UpdateOp) Enum() *ConfigEntryUpdate_UpdateOp {
+	p := new(ConfigEntryUpdate_UpdateOp)
+	*p = x
+	return p
+}
+
+func (x ConfigEntryUpdate_UpdateOp) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (ConfigEntryUpdate_UpdateOp) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbsubscribe_subscribe_proto_enumTypes[2].Descriptor()
+}
+
+func (ConfigEntryUpdate_UpdateOp) Type() protoreflect.EnumType {
+	return &file_proto_pbsubscribe_subscribe_proto_enumTypes[2]
+}
+
+func (x ConfigEntryUpdate_UpdateOp) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use ConfigEntryUpdate_UpdateOp.Descriptor instead.
+func (ConfigEntryUpdate_UpdateOp) EnumDescriptor() ([]byte, []int) {
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{5, 0}
+}
+
+type NamedSubject struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Key is a topic-specific identifier that restricts the scope of the
+	// subscription to only events pertaining to that identifier. For example,
+	// to receive events for a single service, the service's name is specified
+	// as the key.
+	Key string `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key,omitempty"`
+	// Namespace which contains the resources. If Namespace is not specified the
+	// default namespace will be used.
+	//
+	// Namespace is an enterprise-only feature.
+	Namespace string `protobuf:"bytes,2,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
+	// Partition which contains the resources. If Partition is not specified the
+	// default partition will be used.
+	//
+	// Partition is an enterprise-only feature.
+	Partition string `protobuf:"bytes,3,opt,name=Partition,proto3" json:"Partition,omitempty"`
+	// PeerName is the name of the peer that the requested service was imported from.
+	PeerName string `protobuf:"bytes,4,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
+}
+
+func (x *NamedSubject) Reset() {
+	*x = NamedSubject{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *NamedSubject) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*NamedSubject) ProtoMessage() {}
+
+func (x *NamedSubject) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use NamedSubject.ProtoReflect.Descriptor instead.
+func (*NamedSubject) Descriptor() ([]byte, []int) {
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *NamedSubject) GetKey() string {
+	if x != nil {
+		return x.Key
+	}
+	return ""
+}
+
+func (x *NamedSubject) GetNamespace() string {
+	if x != nil {
+		return x.Namespace
+	}
+	return ""
+}
+
+func (x *NamedSubject) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+func (x *NamedSubject) GetPeerName() string {
+	if x != nil {
+		return x.PeerName
+	}
+	return ""
+}
+
+// SubscribeRequest used to subscribe to a topic.
+type SubscribeRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Topic identifies the set of events the subscriber is interested in.
+	Topic Topic `protobuf:"varint,1,opt,name=Topic,proto3,enum=subscribe.Topic" json:"Topic,omitempty"`
+	// Deprecated: use NamedSubject.Key instead.
+	Key string `protobuf:"bytes,2,opt,name=Key,proto3" json:"Key,omitempty"`
+	// Token is the ACL token to authenticate the request. The token must have
+	// sufficient privileges to read the requested information otherwise events
+	// will be filtered, possibly resulting in an empty snapshot and no further
+	// updates sent.
+	Token string `protobuf:"bytes,3,opt,name=Token,proto3" json:"Token,omitempty"`
+	// Index is the raft index the subscriber has already observed up to. This
+	// is zero on an initial streaming call, but then can be provided by a
+	// client on subsequent re-connections such that the full snapshot doesn't
+	// need to be resent if the client is up to date.
+	Index uint64 `protobuf:"varint,4,opt,name=Index,proto3" json:"Index,omitempty"`
+	// Datacenter specifies the Consul datacenter the request is targeted at.
+	// If it's not the local DC the server will forward the request to
+	// the remote DC and proxy the results back  to the subscriber. An empty
+	// string defaults to the local datacenter.
+	Datacenter string `protobuf:"bytes,5,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
+	// Deprecated: use NamedSubject.Namespace instead.
+	Namespace string `protobuf:"bytes,6,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
+	// Deprecated: use NamedSubject.Partition instead.
+	Partition string `protobuf:"bytes,7,opt,name=Partition,proto3" json:"Partition,omitempty"`
+	// Deprecated: use NamedSubject.PeerName instead.
+	PeerName string `protobuf:"bytes,8,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
+	// Subject identifies a portion of a topic for which the subscriber wishes to
+	// receive events (e.g. health events for a particular service).
+	//
+	// Types that are assignable to Subject:
+	//
+	//	*SubscribeRequest_WildcardSubject
+	//	*SubscribeRequest_NamedSubject
+	Subject isSubscribeRequest_Subject `protobuf_oneof:"Subject"`
+}
+
+func (x *SubscribeRequest) Reset() {
+	*x = SubscribeRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SubscribeRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SubscribeRequest) ProtoMessage() {}
+
+func (x *SubscribeRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SubscribeRequest.ProtoReflect.Descriptor instead.
+func (*SubscribeRequest) Descriptor() ([]byte, []int) {
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *SubscribeRequest) GetTopic() Topic {
+	if x != nil {
+		return x.Topic
+	}
+	return Topic_Unknown
+}
+
+func (x *SubscribeRequest) GetKey() string {
+	if x != nil {
+		return x.Key
+	}
+	return ""
+}
+
+func (x *SubscribeRequest) GetToken() string {
+	if x != nil {
+		return x.Token
+	}
+	return ""
+}
+
+func (x *SubscribeRequest) GetIndex() uint64 {
+	if x != nil {
+		return x.Index
+	}
+	return 0
+}
+
+func (x *SubscribeRequest) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
+	}
+	return ""
+}
+
+func (x *SubscribeRequest) GetNamespace() string {
+	if x != nil {
+		return x.Namespace
+	}
+	return ""
+}
+
+func (x *SubscribeRequest) GetPartition() string {
+	if x != nil {
+		return x.Partition
+	}
+	return ""
+}
+
+func (x *SubscribeRequest) GetPeerName() string {
+	if x != nil {
+		return x.PeerName
+	}
+	return ""
+}
+
+func (m *SubscribeRequest) GetSubject() isSubscribeRequest_Subject {
+	if m != nil {
+		return m.Subject
+	}
+	return nil
+}
+
+func (x *SubscribeRequest) GetWildcardSubject() bool {
+	if x, ok := x.GetSubject().(*SubscribeRequest_WildcardSubject); ok {
+		return x.WildcardSubject
+	}
+	return false
+}
+
+func (x *SubscribeRequest) GetNamedSubject() *NamedSubject {
+	if x, ok := x.GetSubject().(*SubscribeRequest_NamedSubject); ok {
+		return x.NamedSubject
+	}
+	return nil
+}
+
+type isSubscribeRequest_Subject interface {
+	isSubscribeRequest_Subject()
+}
+
+type SubscribeRequest_WildcardSubject struct {
+	// WildcardSubject is used to subscribe to all events published on the topic
+	// if it is supported.
+	WildcardSubject bool `protobuf:"varint,9,opt,name=WildcardSubject,proto3,oneof"`
+}
+
+type SubscribeRequest_NamedSubject struct {
+	// NamedSubject is used to subscribe to events pertaining to a specific
+	// resource (e.g. a particular service or config entry).
+	NamedSubject *NamedSubject `protobuf:"bytes,10,opt,name=NamedSubject,proto3,oneof"`
+}
+
+func (*SubscribeRequest_WildcardSubject) isSubscribeRequest_Subject() {}
+
+func (*SubscribeRequest_NamedSubject) isSubscribeRequest_Subject() {}
+
+// Event describes a streaming update on a subscription. Events are used both to
+// describe the current "snapshot" of the result as well as ongoing mutations to
+// that snapshot.
+type Event struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Index is the raft index at which the mutation took place. At the top
+	// level of a subscription there will always be at most one Event per index.
+	// If multiple events are published to the same topic in a single raft
+	// transaction then the batch of events will be encoded inside a single
+	// top-level event to ensure they are delivered atomically to clients.
+	Index uint64 `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
+	// Payload is the actual event content.
+	//
+	// Types that are assignable to Payload:
+	//
+	//	*Event_EndOfSnapshot
+	//	*Event_NewSnapshotToFollow
+	//	*Event_EventBatch
+	//	*Event_ServiceHealth
+	//	*Event_ConfigEntry
+	//	*Event_Service
+	Payload isEvent_Payload `protobuf_oneof:"Payload"`
+}
+
+func (x *Event) Reset() {
+	*x = Event{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Event) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Event) ProtoMessage() {}
+
+func (x *Event) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Event.ProtoReflect.Descriptor instead.
+func (*Event) Descriptor() ([]byte, []int) {
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *Event) GetIndex() uint64 {
+	if x != nil {
+		return x.Index
+	}
+	return 0
+}
+
+func (m *Event) GetPayload() isEvent_Payload {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+func (x *Event) GetEndOfSnapshot() bool {
+	if x, ok := x.GetPayload().(*Event_EndOfSnapshot); ok {
+		return x.EndOfSnapshot
+	}
+	return false
+}
+
+func (x *Event) GetNewSnapshotToFollow() bool {
+	if x, ok := x.GetPayload().(*Event_NewSnapshotToFollow); ok {
+		return x.NewSnapshotToFollow
+	}
+	return false
+}
+
+func (x *Event) GetEventBatch() *EventBatch {
+	if x, ok := x.GetPayload().(*Event_EventBatch); ok {
+		return x.EventBatch
+	}
+	return nil
+}
+
+func (x *Event) GetServiceHealth() *ServiceHealthUpdate {
+	if x, ok := x.GetPayload().(*Event_ServiceHealth); ok {
+		return x.ServiceHealth
+	}
+	return nil
+}
+
+func (x *Event) GetConfigEntry() *ConfigEntryUpdate {
+	if x, ok := x.GetPayload().(*Event_ConfigEntry); ok {
+		return x.ConfigEntry
+	}
+	return nil
+}
+
+func (x *Event) GetService() *ServiceListUpdate {
+	if x, ok := x.GetPayload().(*Event_Service); ok {
+		return x.Service
+	}
+	return nil
+}
+
+type isEvent_Payload interface {
+	isEvent_Payload()
+}
+
+type Event_EndOfSnapshot struct {
+	// EndOfSnapshot indicates the event stream for the initial snapshot has
+	// ended. Subsequent Events delivered will be mutations to that result.
+	EndOfSnapshot bool `protobuf:"varint,2,opt,name=EndOfSnapshot,proto3,oneof"`
+}
+
+type Event_NewSnapshotToFollow struct {
+	// NewSnapshotToFollow indicates that the client view is stale. The client
+	// must reset its view before handing any more events. Subsequent events
+	// in the stream will be for a new snapshot until an EndOfSnapshot event
+	// is received.
+	NewSnapshotToFollow bool `protobuf:"varint,3,opt,name=NewSnapshotToFollow,proto3,oneof"`
+}
+
+type Event_EventBatch struct {
+	// EventBatch is a set of events. This is typically used as the payload
+	// type where multiple events are emitted in a single topic and raft
+	// index (e.g. transactional updates). In this case the Topic and Index
+	// values of all events will match and the whole set should be delivered
+	// and consumed atomically.
+	EventBatch *EventBatch `protobuf:"bytes,4,opt,name=EventBatch,proto3,oneof"`
+}
+
+type Event_ServiceHealth struct {
+	// ServiceHealth is used for ServiceHealth and ServiceHealthConnect
+	// topics.
+	ServiceHealth *ServiceHealthUpdate `protobuf:"bytes,10,opt,name=ServiceHealth,proto3,oneof"`
+}
+
+type Event_ConfigEntry struct {
+	// ConfigEntry is used for config entry topics (e.g. MeshConfig).
+	ConfigEntry *ConfigEntryUpdate `protobuf:"bytes,11,opt,name=ConfigEntry,proto3,oneof"`
+}
+
+type Event_Service struct {
+	// Service is used for ServiceList topic.
+	Service *ServiceListUpdate `protobuf:"bytes,12,opt,name=Service,proto3,oneof"`
+}
+
+func (*Event_EndOfSnapshot) isEvent_Payload() {}
+
+func (*Event_NewSnapshotToFollow) isEvent_Payload() {}
+
+func (*Event_EventBatch) isEvent_Payload() {}
+
+func (*Event_ServiceHealth) isEvent_Payload() {}
+
+func (*Event_ConfigEntry) isEvent_Payload() {}
+
+func (*Event_Service) isEvent_Payload() {}
+
+type EventBatch struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Events []*Event `protobuf:"bytes,1,rep,name=Events,proto3" json:"Events,omitempty"`
+}
+
+func (x *EventBatch) Reset() {
+	*x = EventBatch{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EventBatch) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EventBatch) ProtoMessage() {}
+
+func (x *EventBatch) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use EventBatch.ProtoReflect.Descriptor instead.
+func (*EventBatch) Descriptor() ([]byte, []int) {
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *EventBatch) GetEvents() []*Event {
+	if x != nil {
+		return x.Events
+	}
+	return nil
+}
+
+type ServiceHealthUpdate struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Op               CatalogOp                   `protobuf:"varint,1,opt,name=Op,proto3,enum=subscribe.CatalogOp" json:"Op,omitempty"`
+	CheckServiceNode *pbservice.CheckServiceNode `protobuf:"bytes,2,opt,name=CheckServiceNode,proto3" json:"CheckServiceNode,omitempty"`
+}
+
+func (x *ServiceHealthUpdate) Reset() {
+	*x = ServiceHealthUpdate{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceHealthUpdate) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceHealthUpdate) ProtoMessage() {}
+
+func (x *ServiceHealthUpdate) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceHealthUpdate.ProtoReflect.Descriptor instead.
+func (*ServiceHealthUpdate) Descriptor() ([]byte, []int) {
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *ServiceHealthUpdate) GetOp() CatalogOp {
+	if x != nil {
+		return x.Op
+	}
+	return CatalogOp_Register
+}
+
+func (x *ServiceHealthUpdate) GetCheckServiceNode() *pbservice.CheckServiceNode {
+	if x != nil {
+		return x.CheckServiceNode
+	}
+	return nil
+}
+
+type ConfigEntryUpdate struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Op          ConfigEntryUpdate_UpdateOp `protobuf:"varint,1,opt,name=Op,proto3,enum=subscribe.ConfigEntryUpdate_UpdateOp" json:"Op,omitempty"`
+	ConfigEntry *pbconfigentry.ConfigEntry `protobuf:"bytes,2,opt,name=ConfigEntry,proto3" json:"ConfigEntry,omitempty"`
+}
+
+func (x *ConfigEntryUpdate) Reset() {
+	*x = ConfigEntryUpdate{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ConfigEntryUpdate) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ConfigEntryUpdate) ProtoMessage() {}
+
+func (x *ConfigEntryUpdate) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ConfigEntryUpdate.ProtoReflect.Descriptor instead.
+func (*ConfigEntryUpdate) Descriptor() ([]byte, []int) {
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *ConfigEntryUpdate) GetOp() ConfigEntryUpdate_UpdateOp {
+	if x != nil {
+		return x.Op
+	}
+	return ConfigEntryUpdate_Upsert
+}
+
+func (x *ConfigEntryUpdate) GetConfigEntry() *pbconfigentry.ConfigEntry {
+	if x != nil {
+		return x.ConfigEntry
+	}
+	return nil
+}
+
+type ServiceListUpdate struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Op             CatalogOp                `protobuf:"varint,1,opt,name=Op,proto3,enum=subscribe.CatalogOp" json:"Op,omitempty"`
+	Name           string                   `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
+	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,3,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
+	PeerName       string                   `protobuf:"bytes,4,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
+}
+
+func (x *ServiceListUpdate) Reset() {
+	*x = ServiceListUpdate{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceListUpdate) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceListUpdate) ProtoMessage() {}
+
+func (x *ServiceListUpdate) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceListUpdate.ProtoReflect.Descriptor instead.
+func (*ServiceListUpdate) Descriptor() ([]byte, []int) {
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *ServiceListUpdate) GetOp() CatalogOp {
+	if x != nil {
+		return x.Op
+	}
+	return CatalogOp_Register
+}
+
+func (x *ServiceListUpdate) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *ServiceListUpdate) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
+	}
+	return nil
+}
+
+func (x *ServiceListUpdate) GetPeerName() string {
+	if x != nil {
+		return x.PeerName
+	}
+	return ""
+}
+
+var File_proto_pbsubscribe_subscribe_proto protoreflect.FileDescriptor
+
+var file_proto_pbsubscribe_subscribe_proto_rawDesc = []byte{
+	0x0a, 0x21, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72,
+	0x69, 0x62, 0x65, 0x2f, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x12, 0x09, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x1a, 0x32,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x61, 0x6e, 0x6e,
+	0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d,
+	0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x1a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
+	0x26, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
+	0x6e, 0x74, 0x72, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x65, 0x6e, 0x74, 0x72,
+	0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70,
+	0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x22, 0x78, 0x0a, 0x0c, 0x4e, 0x61, 0x6d, 0x65, 0x64, 0x53, 0x75, 0x62, 0x6a,
+	0x65, 0x63, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x4b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xe6, 0x02,
+	0x0a, 0x10, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x26, 0x0a, 0x05, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x10, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x54, 0x6f,
+	0x70, 0x69, 0x63, 0x52, 0x05, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x65,
+	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b,
+	0x65, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61,
+	0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61,
+	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x4e, 0x61, 0x6d,
+	0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65,
+	0x12, 0x2a, 0x0a, 0x0f, 0x57, 0x69, 0x6c, 0x64, 0x63, 0x61, 0x72, 0x64, 0x53, 0x75, 0x62, 0x6a,
+	0x65, 0x63, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0f, 0x57, 0x69, 0x6c,
+	0x64, 0x63, 0x61, 0x72, 0x64, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x3d, 0x0a, 0x0c,
+	0x4e, 0x61, 0x6d, 0x65, 0x64, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x0a, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x17, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x4e,
+	0x61, 0x6d, 0x65, 0x64, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x48, 0x00, 0x52, 0x0c, 0x4e,
+	0x61, 0x6d, 0x65, 0x64, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x53,
+	0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x81, 0x03, 0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74,
+	0x12, 0x14, 0x0a, 0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x26, 0x0a, 0x0d, 0x45, 0x6e, 0x64, 0x4f, 0x66, 0x53,
+	0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52,
+	0x0d, 0x45, 0x6e, 0x64, 0x4f, 0x66, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x12, 0x32,
+	0x0a, 0x13, 0x4e, 0x65, 0x77, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x54, 0x6f, 0x46,
+	0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x13, 0x4e,
+	0x65, 0x77, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x54, 0x6f, 0x46, 0x6f, 0x6c, 0x6c,
+	0x6f, 0x77, 0x12, 0x37, 0x0a, 0x0a, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x74, 0x63, 0x68,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69,
+	0x62, 0x65, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52,
+	0x0a, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12, 0x46, 0x0a, 0x0d, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x18, 0x0a, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x48, 0x00, 0x52, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x48, 0x65, 0x61,
+	0x6c, 0x74, 0x68, 0x12, 0x40, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63,
+	0x72, 0x69, 0x62, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x38, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69,
+	0x62, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42,
+	0x09, 0x0a, 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x36, 0x0a, 0x0a, 0x45, 0x76,
+	0x65, 0x6e, 0x74, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12, 0x28, 0x0a, 0x06, 0x45, 0x76, 0x65, 0x6e,
+	0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63,
+	0x72, 0x69, 0x62, 0x65, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x45, 0x76, 0x65, 0x6e,
+	0x74, 0x73, 0x22, 0x9c, 0x01, 0x0a, 0x13, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x48, 0x65,
+	0x61, 0x6c, 0x74, 0x68, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x24, 0x0a, 0x02, 0x4f, 0x70,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69,
+	0x62, 0x65, 0x2e, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x4f, 0x70, 0x52, 0x02, 0x4f, 0x70,
+	0x12, 0x5f, 0x0a, 0x10, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x4e, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61, 0x73,
+	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x43,
+	0x68, 0x65, 0x63, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x52,
+	0x10, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64,
+	0x65, 0x22, 0xc4, 0x01, 0x0a, 0x11, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x35, 0x0a, 0x02, 0x4f, 0x70, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x70, 0x52, 0x02, 0x4f, 0x70, 0x12, 0x54,
+	0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
+	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x22, 0x22, 0x0a, 0x08, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x70,
+	0x12, 0x0a, 0x0a, 0x06, 0x55, 0x70, 0x73, 0x65, 0x72, 0x74, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06,
+	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x10, 0x01, 0x22, 0xc3, 0x01, 0x0a, 0x11, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x24,
+	0x0a, 0x02, 0x4f, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x73, 0x75, 0x62,
+	0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x4f, 0x70,
+	0x52, 0x02, 0x4f, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65,
+	0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65,
+	0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65,
+	0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x2a, 0x90,
+	0x02, 0x0a, 0x05, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x6e, 0x6b, 0x6e,
+	0x6f, 0x77, 0x6e, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x4d, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x10, 0x03, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73,
+	0x6f, 0x6c, 0x76, 0x65, 0x72, 0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x6e, 0x67, 0x72, 0x65,
+	0x73, 0x73, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x10, 0x05, 0x12, 0x15, 0x0a, 0x11, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x10, 0x06, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4c, 0x69, 0x73,
+	0x74, 0x10, 0x07, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65,
+	0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x41, 0x50, 0x49, 0x47,
+	0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x10, 0x09, 0x12, 0x0c, 0x0a, 0x08, 0x54, 0x43, 0x50, 0x52,
+	0x6f, 0x75, 0x74, 0x65, 0x10, 0x0a, 0x12, 0x0d, 0x0a, 0x09, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f,
+	0x75, 0x74, 0x65, 0x10, 0x0b, 0x12, 0x15, 0x0a, 0x11, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43,
+	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x10, 0x0c, 0x12, 0x13, 0x0a, 0x0f,
+	0x42, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x10,
+	0x0d, 0x2a, 0x29, 0x0a, 0x09, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x4f, 0x70, 0x12, 0x0c,
+	0x0a, 0x08, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a,
+	0x44, 0x65, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x10, 0x01, 0x32, 0x5f, 0x0a, 0x17,
+	0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x75, 0x62, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x09, 0x53, 0x75, 0x62, 0x73, 0x63,
+	0x72, 0x69, 0x62, 0x65, 0x12, 0x1b, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
+	0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x10, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x45, 0x76,
+	0x65, 0x6e, 0x74, 0x22, 0x06, 0xe2, 0x86, 0x04, 0x02, 0x08, 0x02, 0x30, 0x01, 0x42, 0x92, 0x01,
+	0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x42,
+	0x0e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
+	0xa2, 0x02, 0x03, 0x53, 0x58, 0x58, 0xaa, 0x02, 0x09, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69,
+	0x62, 0x65, 0xca, 0x02, 0x09, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0xe2, 0x02,
+	0x15, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x09, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69,
+	0x62, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_pbsubscribe_subscribe_proto_rawDescOnce sync.Once
+	file_proto_pbsubscribe_subscribe_proto_rawDescData = file_proto_pbsubscribe_subscribe_proto_rawDesc
+)
+
+func file_proto_pbsubscribe_subscribe_proto_rawDescGZIP() []byte {
+	file_proto_pbsubscribe_subscribe_proto_rawDescOnce.Do(func() {
+		file_proto_pbsubscribe_subscribe_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbsubscribe_subscribe_proto_rawDescData)
+	})
+	return file_proto_pbsubscribe_subscribe_proto_rawDescData
+}
+
+var file_proto_pbsubscribe_subscribe_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
+var file_proto_pbsubscribe_subscribe_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_proto_pbsubscribe_subscribe_proto_goTypes = []interface{}{
+	(Topic)(0),                         // 0: subscribe.Topic
+	(CatalogOp)(0),                     // 1: subscribe.CatalogOp
+	(ConfigEntryUpdate_UpdateOp)(0),    // 2: subscribe.ConfigEntryUpdate.UpdateOp
+	(*NamedSubject)(nil),               // 3: subscribe.NamedSubject
+	(*SubscribeRequest)(nil),           // 4: subscribe.SubscribeRequest
+	(*Event)(nil),                      // 5: subscribe.Event
+	(*EventBatch)(nil),                 // 6: subscribe.EventBatch
+	(*ServiceHealthUpdate)(nil),        // 7: subscribe.ServiceHealthUpdate
+	(*ConfigEntryUpdate)(nil),          // 8: subscribe.ConfigEntryUpdate
+	(*ServiceListUpdate)(nil),          // 9: subscribe.ServiceListUpdate
+	(*pbservice.CheckServiceNode)(nil), // 10: hashicorp.consul.internal.service.CheckServiceNode
+	(*pbconfigentry.ConfigEntry)(nil),  // 11: hashicorp.consul.internal.configentry.ConfigEntry
+	(*pbcommon.EnterpriseMeta)(nil),    // 12: hashicorp.consul.internal.common.EnterpriseMeta
+}
+var file_proto_pbsubscribe_subscribe_proto_depIdxs = []int32{
+	0,  // 0: subscribe.SubscribeRequest.Topic:type_name -> subscribe.Topic
+	3,  // 1: subscribe.SubscribeRequest.NamedSubject:type_name -> subscribe.NamedSubject
+	6,  // 2: subscribe.Event.EventBatch:type_name -> subscribe.EventBatch
+	7,  // 3: subscribe.Event.ServiceHealth:type_name -> subscribe.ServiceHealthUpdate
+	8,  // 4: subscribe.Event.ConfigEntry:type_name -> subscribe.ConfigEntryUpdate
+	9,  // 5: subscribe.Event.Service:type_name -> subscribe.ServiceListUpdate
+	5,  // 6: subscribe.EventBatch.Events:type_name -> subscribe.Event
+	1,  // 7: subscribe.ServiceHealthUpdate.Op:type_name -> subscribe.CatalogOp
+	10, // 8: subscribe.ServiceHealthUpdate.CheckServiceNode:type_name -> hashicorp.consul.internal.service.CheckServiceNode
+	2,  // 9: subscribe.ConfigEntryUpdate.Op:type_name -> subscribe.ConfigEntryUpdate.UpdateOp
+	11, // 10: subscribe.ConfigEntryUpdate.ConfigEntry:type_name -> hashicorp.consul.internal.configentry.ConfigEntry
+	1,  // 11: subscribe.ServiceListUpdate.Op:type_name -> subscribe.CatalogOp
+	12, // 12: subscribe.ServiceListUpdate.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
+	4,  // 13: subscribe.StateChangeSubscription.Subscribe:input_type -> subscribe.SubscribeRequest
+	5,  // 14: subscribe.StateChangeSubscription.Subscribe:output_type -> subscribe.Event
+	14, // [14:15] is the sub-list for method output_type
+	13, // [13:14] is the sub-list for method input_type
+	13, // [13:13] is the sub-list for extension type_name
+	13, // [13:13] is the sub-list for extension extendee
+	0,  // [0:13] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbsubscribe_subscribe_proto_init() }
+func file_proto_pbsubscribe_subscribe_proto_init() {
+	if File_proto_pbsubscribe_subscribe_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbsubscribe_subscribe_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*NamedSubject); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbsubscribe_subscribe_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SubscribeRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbsubscribe_subscribe_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Event); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbsubscribe_subscribe_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EventBatch); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbsubscribe_subscribe_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceHealthUpdate); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbsubscribe_subscribe_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ConfigEntryUpdate); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbsubscribe_subscribe_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceListUpdate); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	file_proto_pbsubscribe_subscribe_proto_msgTypes[1].OneofWrappers = []interface{}{
+		(*SubscribeRequest_WildcardSubject)(nil),
+		(*SubscribeRequest_NamedSubject)(nil),
+	}
+	file_proto_pbsubscribe_subscribe_proto_msgTypes[2].OneofWrappers = []interface{}{
+		(*Event_EndOfSnapshot)(nil),
+		(*Event_NewSnapshotToFollow)(nil),
+		(*Event_EventBatch)(nil),
+		(*Event_ServiceHealth)(nil),
+		(*Event_ConfigEntry)(nil),
+		(*Event_Service)(nil),
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbsubscribe_subscribe_proto_rawDesc,
+			NumEnums:      3,
+			NumMessages:   7,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_proto_pbsubscribe_subscribe_proto_goTypes,
+		DependencyIndexes: file_proto_pbsubscribe_subscribe_proto_depIdxs,
+		EnumInfos:         file_proto_pbsubscribe_subscribe_proto_enumTypes,
+		MessageInfos:      file_proto_pbsubscribe_subscribe_proto_msgTypes,
+	}.Build()
+	File_proto_pbsubscribe_subscribe_proto = out.File
+	file_proto_pbsubscribe_subscribe_proto_rawDesc = nil
+	file_proto_pbsubscribe_subscribe_proto_goTypes = nil
+	file_proto_pbsubscribe_subscribe_proto_depIdxs = nil
+}
diff --git a/proto/private/pbsubscribe/subscribe.proto b/proto/pbsubscribe/subscribe.proto
similarity index 92%
rename from proto/private/pbsubscribe/subscribe.proto
rename to proto/pbsubscribe/subscribe.proto
index c327c92c7f024..957388f33bc52 100644
--- a/proto/private/pbsubscribe/subscribe.proto
+++ b/proto/pbsubscribe/subscribe.proto
@@ -1,8 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 /*
-   Package event provides a service for subscribing to state change events.
+Package event provides a service for subscribing to state change events.
 */
 syntax = "proto3";
 
@@ -13,10 +10,10 @@ syntax = "proto3";
 // compatibility.
 package subscribe;
 
-import "annotations/ratelimit/ratelimit.proto";
-import "private/pbcommon/common.proto";
-import "private/pbconfigentry/config_entry.proto";
-import "private/pbservice/node.proto";
+import "proto-public/annotations/ratelimit/ratelimit.proto";
+import "proto/pbcommon/common.proto";
+import "proto/pbconfigentry/config_entry.proto";
+import "proto/pbservice/node.proto";
 
 // StateChangeSubscription service allows consumers to subscribe to topics of
 // state change events. Events are streamed as they happen.
@@ -45,7 +42,6 @@ service StateChangeSubscription {
   rpc Subscribe(SubscribeRequest) returns (stream Event) {
     option (hashicorp.consul.internal.ratelimit.spec) = {
       operation_type: OPERATION_TYPE_READ,
-      operation_category: OPERATION_CATEGORY_SUBSCRIBE
     };
   }
 }
@@ -97,15 +93,6 @@ enum Topic {
 
   // BoundAPIGateway topic contains events for changes to bound-api-gateways.
   BoundAPIGateway = 13;
-
-  // IPRateLimit topic contains events for changes to control-plane-request-limit
-  IPRateLimit = 14;
-
-  // SamenessGroup topic contains events for changes to Sameness Groups
-  SamenessGroup = 15;
-
-  // JWTProvider topic contains events for changes to jwt-provider
-  JWTProvider = 16;
 }
 
 message NamedSubject {
diff --git a/proto/private/pbsubscribe/subscribe_grpc.pb.go b/proto/pbsubscribe/subscribe_grpc.pb.go
similarity index 98%
rename from proto/private/pbsubscribe/subscribe_grpc.pb.go
rename to proto/pbsubscribe/subscribe_grpc.pb.go
index aa843928fd3d0..0622729080257 100644
--- a/proto/private/pbsubscribe/subscribe_grpc.pb.go
+++ b/proto/pbsubscribe/subscribe_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             (unknown)
-// source: private/pbsubscribe/subscribe.proto
+// source: proto/pbsubscribe/subscribe.proto
 
 package pbsubscribe
 
@@ -166,5 +166,5 @@ var StateChangeSubscription_ServiceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "private/pbsubscribe/subscribe.proto",
+	Metadata: "proto/pbsubscribe/subscribe.proto",
 }
diff --git a/proto/private/pbacl/acl.go b/proto/private/pbacl/acl.go
deleted file mode 100644
index 5c9cc6285e6c7..0000000000000
--- a/proto/private/pbacl/acl.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package pbacl
-
-import (
-	"github.com/hashicorp/consul/api"
-)
-
-func (a *ACLLink) ToAPI() api.ACLLink {
-	return api.ACLLink{
-		ID:   a.ID,
-		Name: a.Name,
-	}
-}
-
-func ACLLinkFromAPI(a api.ACLLink) *ACLLink {
-	return &ACLLink{
-		ID:   a.ID,
-		Name: a.Name,
-	}
-}
diff --git a/proto/private/pbacl/acl.pb.go b/proto/private/pbacl/acl.pb.go
deleted file mode 100644
index f6aa5c3418cf2..0000000000000
--- a/proto/private/pbacl/acl.pb.go
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbacl/acl.proto
-
-package pbacl
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type ACLLink struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
-	// @gotags: hash:ignore-"
-	Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
-}
-
-func (x *ACLLink) Reset() {
-	*x = ACLLink{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbacl_acl_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ACLLink) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ACLLink) ProtoMessage() {}
-
-func (x *ACLLink) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbacl_acl_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ACLLink.ProtoReflect.Descriptor instead.
-func (*ACLLink) Descriptor() ([]byte, []int) {
-	return file_private_pbacl_acl_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ACLLink) GetID() string {
-	if x != nil {
-		return x.ID
-	}
-	return ""
-}
-
-func (x *ACLLink) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-var File_private_pbacl_acl_proto protoreflect.FileDescriptor
-
-var file_private_pbacl_acl_proto_rawDesc = []byte{
-	0x0a, 0x17, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x61, 0x63, 0x6c, 0x2f,
-	0x61, 0x63, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1d, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x61, 0x63, 0x6c, 0x22, 0x2d, 0x0a, 0x07, 0x41, 0x43, 0x4c, 0x4c,
-	0x69, 0x6e, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x02, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0xf6, 0x01, 0x0a, 0x21, 0x63, 0x6f, 0x6d, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x61, 0x63, 0x6c, 0x42, 0x08, 0x41,
-	0x63, 0x6c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x69,
-	0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x61, 0x63, 0x6c, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49,
-	0x41, 0xaa, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x41, 0x63,
-	0x6c, 0xca, 0x02, 0x1d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x41, 0x63,
-	0x6c, 0xe2, 0x02, 0x29, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x41, 0x63,
-	0x6c, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x20,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x41, 0x63, 0x6c,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pbacl_acl_proto_rawDescOnce sync.Once
-	file_private_pbacl_acl_proto_rawDescData = file_private_pbacl_acl_proto_rawDesc
-)
-
-func file_private_pbacl_acl_proto_rawDescGZIP() []byte {
-	file_private_pbacl_acl_proto_rawDescOnce.Do(func() {
-		file_private_pbacl_acl_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbacl_acl_proto_rawDescData)
-	})
-	return file_private_pbacl_acl_proto_rawDescData
-}
-
-var file_private_pbacl_acl_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_private_pbacl_acl_proto_goTypes = []interface{}{
-	(*ACLLink)(nil), // 0: hashicorp.consul.internal.acl.ACLLink
-}
-var file_private_pbacl_acl_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_private_pbacl_acl_proto_init() }
-func file_private_pbacl_acl_proto_init() {
-	if File_private_pbacl_acl_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbacl_acl_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ACLLink); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbacl_acl_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_private_pbacl_acl_proto_goTypes,
-		DependencyIndexes: file_private_pbacl_acl_proto_depIdxs,
-		MessageInfos:      file_private_pbacl_acl_proto_msgTypes,
-	}.Build()
-	File_private_pbacl_acl_proto = out.File
-	file_private_pbacl_acl_proto_rawDesc = nil
-	file_private_pbacl_acl_proto_goTypes = nil
-	file_private_pbacl_acl_proto_depIdxs = nil
-}
diff --git a/proto/private/pbacl/acl.proto b/proto/private/pbacl/acl.proto
deleted file mode 100644
index 0fa9ecd89dc6a..0000000000000
--- a/proto/private/pbacl/acl.proto
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-package hashicorp.consul.internal.acl;
-
-message ACLLink {
-  string ID = 1;
-  // @gotags: hash:ignore-"
-  string Name = 2;
-}
diff --git a/proto/private/pbautoconf/auto_config.pb.go b/proto/private/pbautoconf/auto_config.pb.go
deleted file mode 100644
index a9b4c2c891682..0000000000000
--- a/proto/private/pbautoconf/auto_config.pb.go
+++ /dev/null
@@ -1,358 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbautoconf/auto_config.proto
-
-package pbautoconf
-
-import (
-	pbconfig "github.com/hashicorp/consul/proto/private/pbconfig"
-	pbconnect "github.com/hashicorp/consul/proto/private/pbconnect"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// AutoConfigRequest is the data structure to be sent along with the
-// AutoConfig.InitialConfiguration RPC
-type AutoConfigRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Datacenter is the local datacenter name. This wont actually be set by clients
-	// but rather will be set by the servers to allow for forwarding to
-	// the leader. If it ever happens to be set and differs from the local datacenters
-	// name then an error should be returned.
-	Datacenter string `protobuf:"bytes,1,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
-	// Node is the node name that the requester would like to assume
-	// the identity of.
-	Node string `protobuf:"bytes,2,opt,name=Node,proto3" json:"Node,omitempty"`
-	// Segment is the network segment that the requester would like to join
-	Segment string `protobuf:"bytes,4,opt,name=Segment,proto3" json:"Segment,omitempty"`
-	// Partition is the partition that the requester would like to join
-	Partition string `protobuf:"bytes,8,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	// JWT is a signed JSON Web Token used to authorize the request
-	JWT string `protobuf:"bytes,5,opt,name=JWT,proto3" json:"JWT,omitempty"`
-	// ConsulToken is a Consul ACL token that the agent requesting the
-	// configuration already has.
-	ConsulToken string `protobuf:"bytes,6,opt,name=ConsulToken,proto3" json:"ConsulToken,omitempty"`
-	// CSR is a certificate signing request to be used when generating the
-	// agents TLS certificate
-	CSR string `protobuf:"bytes,7,opt,name=CSR,proto3" json:"CSR,omitempty"`
-}
-
-func (x *AutoConfigRequest) Reset() {
-	*x = AutoConfigRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbautoconf_auto_config_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AutoConfigRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AutoConfigRequest) ProtoMessage() {}
-
-func (x *AutoConfigRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbautoconf_auto_config_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AutoConfigRequest.ProtoReflect.Descriptor instead.
-func (*AutoConfigRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbautoconf_auto_config_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *AutoConfigRequest) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-func (x *AutoConfigRequest) GetNode() string {
-	if x != nil {
-		return x.Node
-	}
-	return ""
-}
-
-func (x *AutoConfigRequest) GetSegment() string {
-	if x != nil {
-		return x.Segment
-	}
-	return ""
-}
-
-func (x *AutoConfigRequest) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *AutoConfigRequest) GetJWT() string {
-	if x != nil {
-		return x.JWT
-	}
-	return ""
-}
-
-func (x *AutoConfigRequest) GetConsulToken() string {
-	if x != nil {
-		return x.ConsulToken
-	}
-	return ""
-}
-
-func (x *AutoConfigRequest) GetCSR() string {
-	if x != nil {
-		return x.CSR
-	}
-	return ""
-}
-
-// AutoConfigResponse is the data structure sent in response to a AutoConfig.InitialConfiguration request
-type AutoConfigResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Config is the partial Consul configuration to inject into the agents own configuration
-	Config *pbconfig.Config `protobuf:"bytes,1,opt,name=Config,proto3" json:"Config,omitempty"`
-	// CARoots is the current list of Connect CA Roots
-	CARoots *pbconnect.CARoots `protobuf:"bytes,2,opt,name=CARoots,proto3" json:"CARoots,omitempty"`
-	// Certificate is the TLS certificate issued for the agent
-	Certificate *pbconnect.IssuedCert `protobuf:"bytes,3,opt,name=Certificate,proto3" json:"Certificate,omitempty"`
-	// ExtraCACertificates holds non-Connect certificates that may be necessary
-	// to verify TLS connections with the Consul servers
-	ExtraCACertificates []string `protobuf:"bytes,4,rep,name=ExtraCACertificates,proto3" json:"ExtraCACertificates,omitempty"`
-}
-
-func (x *AutoConfigResponse) Reset() {
-	*x = AutoConfigResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbautoconf_auto_config_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AutoConfigResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AutoConfigResponse) ProtoMessage() {}
-
-func (x *AutoConfigResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbautoconf_auto_config_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AutoConfigResponse.ProtoReflect.Descriptor instead.
-func (*AutoConfigResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbautoconf_auto_config_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *AutoConfigResponse) GetConfig() *pbconfig.Config {
-	if x != nil {
-		return x.Config
-	}
-	return nil
-}
-
-func (x *AutoConfigResponse) GetCARoots() *pbconnect.CARoots {
-	if x != nil {
-		return x.CARoots
-	}
-	return nil
-}
-
-func (x *AutoConfigResponse) GetCertificate() *pbconnect.IssuedCert {
-	if x != nil {
-		return x.Certificate
-	}
-	return nil
-}
-
-func (x *AutoConfigResponse) GetExtraCACertificates() []string {
-	if x != nil {
-		return x.ExtraCACertificates
-	}
-	return nil
-}
-
-var File_private_pbautoconf_auto_config_proto protoreflect.FileDescriptor
-
-var file_private_pbautoconf_auto_config_proto_rawDesc = []byte{
-	0x0a, 0x24, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x61, 0x75, 0x74, 0x6f,
-	0x63, 0x6f, 0x6e, 0x66, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x22, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x61, 0x75, 0x74, 0x6f, 0x63, 0x6f, 0x6e, 0x66, 0x1a, 0x1d, 0x70, 0x72, 0x69, 0x76,
-	0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x70, 0x72, 0x69, 0x76, 0x61,
-	0x74, 0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2f, 0x63, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc5, 0x01, 0x0a, 0x11, 0x41,
-	0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
-	0x12, 0x12, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x4e, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1c,
-	0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03,
-	0x4a, 0x57, 0x54, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4a, 0x57, 0x54, 0x12, 0x20,
-	0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0b, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
-	0x12, 0x10, 0x0a, 0x03, 0x43, 0x53, 0x52, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x43,
-	0x53, 0x52, 0x22, 0x9f, 0x02, 0x0a, 0x12, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x40, 0x0a, 0x06, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x52, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x44, 0x0a, 0x07, 0x43,
-	0x41, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x2e, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x52, 0x07, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74,
-	0x73, 0x12, 0x4f, 0x0a, 0x0b, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2e, 0x49, 0x73, 0x73, 0x75, 0x65,
-	0x64, 0x43, 0x65, 0x72, 0x74, 0x52, 0x0b, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x12, 0x30, 0x0a, 0x13, 0x45, 0x78, 0x74, 0x72, 0x61, 0x43, 0x41, 0x43, 0x65, 0x72,
-	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x13, 0x45, 0x78, 0x74, 0x72, 0x61, 0x43, 0x41, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
-	0x61, 0x74, 0x65, 0x73, 0x42, 0x9b, 0x02, 0x0a, 0x26, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x61, 0x75, 0x74, 0x6f, 0x63, 0x6f, 0x6e, 0x66, 0x42,
-	0x0f, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62,
-	0x61, 0x75, 0x74, 0x6f, 0x63, 0x6f, 0x6e, 0x66, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x41, 0xaa,
-	0x02, 0x22, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x41, 0x75, 0x74, 0x6f,
-	0x63, 0x6f, 0x6e, 0x66, 0xca, 0x02, 0x22, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x5c, 0x41, 0x75, 0x74, 0x6f, 0x63, 0x6f, 0x6e, 0x66, 0xe2, 0x02, 0x2e, 0x48, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x41, 0x75, 0x74, 0x6f, 0x63, 0x6f, 0x6e, 0x66, 0x5c, 0x47,
-	0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x25, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a,
-	0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x41, 0x75, 0x74, 0x6f, 0x63, 0x6f,
-	0x6e, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pbautoconf_auto_config_proto_rawDescOnce sync.Once
-	file_private_pbautoconf_auto_config_proto_rawDescData = file_private_pbautoconf_auto_config_proto_rawDesc
-)
-
-func file_private_pbautoconf_auto_config_proto_rawDescGZIP() []byte {
-	file_private_pbautoconf_auto_config_proto_rawDescOnce.Do(func() {
-		file_private_pbautoconf_auto_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbautoconf_auto_config_proto_rawDescData)
-	})
-	return file_private_pbautoconf_auto_config_proto_rawDescData
-}
-
-var file_private_pbautoconf_auto_config_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_private_pbautoconf_auto_config_proto_goTypes = []interface{}{
-	(*AutoConfigRequest)(nil),    // 0: hashicorp.consul.internal.autoconf.AutoConfigRequest
-	(*AutoConfigResponse)(nil),   // 1: hashicorp.consul.internal.autoconf.AutoConfigResponse
-	(*pbconfig.Config)(nil),      // 2: hashicorp.consul.internal.config.Config
-	(*pbconnect.CARoots)(nil),    // 3: hashicorp.consul.internal.connect.CARoots
-	(*pbconnect.IssuedCert)(nil), // 4: hashicorp.consul.internal.connect.IssuedCert
-}
-var file_private_pbautoconf_auto_config_proto_depIdxs = []int32{
-	2, // 0: hashicorp.consul.internal.autoconf.AutoConfigResponse.Config:type_name -> hashicorp.consul.internal.config.Config
-	3, // 1: hashicorp.consul.internal.autoconf.AutoConfigResponse.CARoots:type_name -> hashicorp.consul.internal.connect.CARoots
-	4, // 2: hashicorp.consul.internal.autoconf.AutoConfigResponse.Certificate:type_name -> hashicorp.consul.internal.connect.IssuedCert
-	3, // [3:3] is the sub-list for method output_type
-	3, // [3:3] is the sub-list for method input_type
-	3, // [3:3] is the sub-list for extension type_name
-	3, // [3:3] is the sub-list for extension extendee
-	0, // [0:3] is the sub-list for field type_name
-}
-
-func init() { file_private_pbautoconf_auto_config_proto_init() }
-func file_private_pbautoconf_auto_config_proto_init() {
-	if File_private_pbautoconf_auto_config_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbautoconf_auto_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AutoConfigRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbautoconf_auto_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AutoConfigResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbautoconf_auto_config_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_private_pbautoconf_auto_config_proto_goTypes,
-		DependencyIndexes: file_private_pbautoconf_auto_config_proto_depIdxs,
-		MessageInfos:      file_private_pbautoconf_auto_config_proto_msgTypes,
-	}.Build()
-	File_private_pbautoconf_auto_config_proto = out.File
-	file_private_pbautoconf_auto_config_proto_rawDesc = nil
-	file_private_pbautoconf_auto_config_proto_goTypes = nil
-	file_private_pbautoconf_auto_config_proto_depIdxs = nil
-}
diff --git a/proto/private/pbautoconf/auto_config_ce.go b/proto/private/pbautoconf/auto_config_ce.go
deleted file mode 100644
index f1050dbea87e5..0000000000000
--- a/proto/private/pbautoconf/auto_config_ce.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package pbautoconf
-
-func (req *AutoConfigRequest) PartitionOrDefault() string {
-	return ""
-}
diff --git a/proto/private/pbcommon/common.go b/proto/private/pbcommon/common.go
deleted file mode 100644
index ecf935d75f142..0000000000000
--- a/proto/private/pbcommon/common.go
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package pbcommon
-
-import (
-	"time"
-
-	"github.com/hashicorp/consul/agent/structs"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
-)
-
-// IsRead is always true for QueryOption
-func (q *QueryOptions) IsRead() bool {
-	return true
-}
-
-// AllowStaleRead returns whether a stale read should be allowed
-func (q *QueryOptions) AllowStaleRead() bool {
-	return q.AllowStale
-}
-
-func (q *QueryOptions) TokenSecret() string {
-	return q.Token
-}
-
-func (q *QueryOptions) SetTokenSecret(s string) {
-	q.Token = s
-}
-
-// SetToken is needed to implement the structs.QueryOptionsCompat interface
-func (q *QueryOptions) SetToken(token string) {
-	q.Token = token
-}
-
-// SetMinQueryIndex is needed to implement the structs.QueryOptionsCompat interface
-func (q *QueryOptions) SetMinQueryIndex(minQueryIndex uint64) {
-	q.MinQueryIndex = minQueryIndex
-}
-
-// SetMaxQueryTime is needed to implement the structs.QueryOptionsCompat interface
-func (q *QueryOptions) SetMaxQueryTime(maxQueryTime time.Duration) {
-	q.MaxQueryTime = durationpb.New(maxQueryTime)
-}
-
-// SetAllowStale is needed to implement the structs.QueryOptionsCompat interface
-func (q *QueryOptions) SetAllowStale(allowStale bool) {
-	q.AllowStale = allowStale
-}
-
-// SetRequireConsistent is needed to implement the structs.QueryOptionsCompat interface
-func (q *QueryOptions) SetRequireConsistent(requireConsistent bool) {
-	q.RequireConsistent = requireConsistent
-}
-
-// SetUseCache is needed to implement the structs.QueryOptionsCompat interface
-func (q *QueryOptions) SetUseCache(useCache bool) {
-	q.UseCache = useCache
-}
-
-// SetMaxStaleDuration is needed to implement the structs.QueryOptionsCompat interface
-func (q *QueryOptions) SetMaxStaleDuration(maxStaleDuration time.Duration) {
-	q.MaxStaleDuration = durationpb.New(maxStaleDuration)
-}
-
-// SetMaxAge is needed to implement the structs.QueryOptionsCompat interface
-func (q *QueryOptions) SetMaxAge(maxAge time.Duration) {
-	q.MaxAge = durationpb.New(maxAge)
-}
-
-// SetMustRevalidate is needed to implement the structs.QueryOptionsCompat interface
-func (q *QueryOptions) SetMustRevalidate(mustRevalidate bool) {
-	q.MustRevalidate = mustRevalidate
-}
-
-// SetStaleIfError is needed to implement the structs.QueryOptionsCompat interface
-func (q *QueryOptions) SetStaleIfError(staleIfError time.Duration) {
-	q.StaleIfError = durationpb.New(staleIfError)
-}
-
-func (q *QueryOptions) HasTimedOut(start time.Time, rpcHoldTimeout, maxQueryTime, defaultQueryTime time.Duration) (bool, error) {
-	// In addition to BlockingTimeout, allow for an additional rpcHoldTimeout buffer
-	// in case we need to wait for a leader election.
-	return time.Since(start) > rpcHoldTimeout+q.BlockingTimeout(maxQueryTime, defaultQueryTime), nil
-}
-
-// BlockingTimeout implements pool.BlockableQuery
-func (q *QueryOptions) BlockingTimeout(maxQueryTime, defaultQueryTime time.Duration) time.Duration {
-	maxTime := q.MaxQueryTime.AsDuration()
-	o := structs.QueryOptions{
-		MaxQueryTime:  maxTime,
-		MinQueryIndex: q.MinQueryIndex,
-	}
-	return o.BlockingTimeout(maxQueryTime, defaultQueryTime)
-}
-
-// SetFilter is needed to implement the structs.QueryOptionsCompat interface
-func (q *QueryOptions) SetFilter(filter string) {
-	q.Filter = filter
-}
-
-// WriteRequest only applies to writes, always false
-//
-// IsRead implements structs.RPCInfo
-func (w *WriteRequest) IsRead() bool {
-	return false
-}
-
-// SetTokenSecret implements structs.RPCInfo
-func (w *WriteRequest) TokenSecret() string {
-	return w.Token
-}
-
-// SetTokenSecret implements structs.RPCInfo
-func (w *WriteRequest) SetTokenSecret(s string) {
-	w.Token = s
-}
-
-// AllowStaleRead returns whether a stale read should be allowed
-//
-// AllowStaleRead implements structs.RPCInfo
-func (w *WriteRequest) AllowStaleRead() bool {
-	return false
-}
-
-// HasTimedOut implements structs.RPCInfo
-func (w *WriteRequest) HasTimedOut(start time.Time, rpcHoldTimeout, maxQueryTime, defaultQueryTime time.Duration) (bool, error) {
-	return time.Since(start) > rpcHoldTimeout, nil
-}
-
-// IsRead implements structs.RPCInfo
-func (r *ReadRequest) IsRead() bool {
-	return true
-}
-
-// AllowStaleRead implements structs.RPCInfo
-func (r *ReadRequest) AllowStaleRead() bool {
-	// TODO(partitions): plumb this?
-	return false
-}
-
-// TokenSecret implements structs.RPCInfo
-func (r *ReadRequest) TokenSecret() string {
-	return r.Token
-}
-
-// SetTokenSecret implements structs.RPCInfo
-func (r *ReadRequest) SetTokenSecret(token string) {
-	r.Token = token
-}
-
-// HasTimedOut implements structs.RPCInfo
-func (r *ReadRequest) HasTimedOut(start time.Time, rpcHoldTimeout, _, _ time.Duration) (bool, error) {
-	return time.Since(start) > rpcHoldTimeout, nil
-}
-
-// RequestDatacenter implements structs.RPCInfo
-func (td *TargetDatacenter) RequestDatacenter() string {
-	return td.Datacenter
-}
-
-// SetLastContact is needed to implement the structs.QueryMetaCompat interface
-func (q *QueryMeta) SetLastContact(lastContact time.Duration) {
-	q.LastContact = durationpb.New(lastContact)
-}
-
-// SetKnownLeader is needed to implement the structs.QueryMetaCompat interface
-func (q *QueryMeta) SetKnownLeader(knownLeader bool) {
-	q.KnownLeader = knownLeader
-}
-
-// SetIndex is needed to implement the structs.QueryMetaCompat interface
-func (q *QueryMeta) SetIndex(index uint64) {
-	q.Index = index
-}
-
-// SetConsistencyLevel is needed to implement the structs.QueryMetaCompat interface
-func (q *QueryMeta) SetConsistencyLevel(consistencyLevel string) {
-	q.ConsistencyLevel = consistencyLevel
-}
-
-func (q *QueryMeta) GetBackend() structs.QueryBackend {
-	return structs.QueryBackend(0)
-}
-
-// SetResultsFilteredByACLs is needed to implement the structs.QueryMetaCompat interface
-func (q *QueryMeta) SetResultsFilteredByACLs(v bool) {
-	q.ResultsFilteredByACLs = v
-}
-
-// IsEmpty returns true if the Locality is unset or contains an empty region and zone.
-func (l *Locality) IsEmpty() bool {
-	if l == nil {
-		return true
-	}
-	return l.Region == "" && l.Zone == ""
-}
-
-// LocalityFromProto converts a protobuf Locality to a struct Locality.
-func LocalityFromProto(l *Locality) *structs.Locality {
-	if l == nil {
-		return nil
-	}
-	return &structs.Locality{
-		Region: l.Region,
-		Zone:   l.Zone,
-	}
-}
-
-// LocalityFromProto converts a struct Locality to a protobuf Locality.
-func LocalityToProto(l *structs.Locality) *Locality {
-	if l == nil {
-		return nil
-	}
-	return &Locality{
-		Region: l.Region,
-		Zone:   l.Zone,
-	}
-}
diff --git a/proto/private/pbcommon/common.pb.binary.go b/proto/private/pbcommon/common.pb.binary.go
deleted file mode 100644
index 23716de0b98dc..0000000000000
--- a/proto/private/pbcommon/common.pb.binary.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbcommon/common.proto
-
-package pbcommon
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *RaftIndex) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *RaftIndex) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TargetDatacenter) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TargetDatacenter) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *WriteRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *WriteRequest) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ReadRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ReadRequest) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *QueryOptions) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *QueryOptions) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *QueryMeta) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *QueryMeta) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *EnterpriseMeta) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *EnterpriseMeta) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *EnvoyExtension) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *EnvoyExtension) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Locality) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Locality) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto/private/pbcommon/common.pb.go b/proto/private/pbcommon/common.pb.go
deleted file mode 100644
index fc6928184132d..0000000000000
--- a/proto/private/pbcommon/common.pb.go
+++ /dev/null
@@ -1,1030 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbcommon/common.proto
-
-package pbcommon
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
-	structpb "google.golang.org/protobuf/types/known/structpb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// RaftIndex is used to track the index used while creating
-// or modifying a given struct type.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.RaftIndex
-// output=common.gen.go
-// name=Structs
-// ignore-fields=state,sizeCache,unknownFields
-type RaftIndex struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// @gotags: bexpr:"-"
-	CreateIndex uint64 `protobuf:"varint,1,opt,name=CreateIndex,proto3" json:"CreateIndex,omitempty" bexpr:"-"`
-	// @gotags: bexpr:"-"
-	ModifyIndex uint64 `protobuf:"varint,2,opt,name=ModifyIndex,proto3" json:"ModifyIndex,omitempty" bexpr:"-"`
-}
-
-func (x *RaftIndex) Reset() {
-	*x = RaftIndex{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbcommon_common_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RaftIndex) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RaftIndex) ProtoMessage() {}
-
-func (x *RaftIndex) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbcommon_common_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RaftIndex.ProtoReflect.Descriptor instead.
-func (*RaftIndex) Descriptor() ([]byte, []int) {
-	return file_private_pbcommon_common_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *RaftIndex) GetCreateIndex() uint64 {
-	if x != nil {
-		return x.CreateIndex
-	}
-	return 0
-}
-
-func (x *RaftIndex) GetModifyIndex() uint64 {
-	if x != nil {
-		return x.ModifyIndex
-	}
-	return 0
-}
-
-// TargetDatacenter is intended to be used within other messages used for RPC routing
-// amongst the various Consul datacenters
-type TargetDatacenter struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Datacenter string `protobuf:"bytes,1,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
-}
-
-func (x *TargetDatacenter) Reset() {
-	*x = TargetDatacenter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbcommon_common_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TargetDatacenter) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TargetDatacenter) ProtoMessage() {}
-
-func (x *TargetDatacenter) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbcommon_common_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TargetDatacenter.ProtoReflect.Descriptor instead.
-func (*TargetDatacenter) Descriptor() ([]byte, []int) {
-	return file_private_pbcommon_common_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *TargetDatacenter) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.WriteRequest
-// output=common.gen.go
-// name=Structs
-// ignore-fields=state,sizeCache,unknownFields
-type WriteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Token is the ACL token ID. If not provided, the 'anonymous'
-	// token is assumed for backwards compatibility.
-	Token string `protobuf:"bytes,1,opt,name=Token,proto3" json:"Token,omitempty"`
-}
-
-func (x *WriteRequest) Reset() {
-	*x = WriteRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbcommon_common_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WriteRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WriteRequest) ProtoMessage() {}
-
-func (x *WriteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbcommon_common_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WriteRequest.ProtoReflect.Descriptor instead.
-func (*WriteRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbcommon_common_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *WriteRequest) GetToken() string {
-	if x != nil {
-		return x.Token
-	}
-	return ""
-}
-
-// ReadRequest is a type that may be embedded into any requests for read
-// operations.
-// It is a replacement for QueryOptions now that we no longer need any of those
-// fields because we are moving away from using blocking queries.
-// It is also similar to WriteRequest. It is a separate type so that in the
-// future we can introduce fields that may only be relevant for reads.
-type ReadRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Token is the ACL token ID. If not provided, the 'anonymous'
-	// token is assumed for backwards compatibility.
-	Token string `protobuf:"bytes,1,opt,name=Token,proto3" json:"Token,omitempty"`
-	// RequireConsistent indicates that the request must be sent to the leader.
-	RequireConsistent bool `protobuf:"varint,2,opt,name=RequireConsistent,proto3" json:"RequireConsistent,omitempty"`
-}
-
-func (x *ReadRequest) Reset() {
-	*x = ReadRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbcommon_common_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ReadRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ReadRequest) ProtoMessage() {}
-
-func (x *ReadRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbcommon_common_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ReadRequest.ProtoReflect.Descriptor instead.
-func (*ReadRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbcommon_common_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *ReadRequest) GetToken() string {
-	if x != nil {
-		return x.Token
-	}
-	return ""
-}
-
-func (x *ReadRequest) GetRequireConsistent() bool {
-	if x != nil {
-		return x.RequireConsistent
-	}
-	return false
-}
-
-// QueryOptions is used to specify various flags for read queries
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.QueryOptions
-// output=common.gen.go
-// name=Structs
-// ignore-fields=StaleIfError,AllowNotModifiedResponse,state,sizeCache,unknownFields
-type QueryOptions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Token is the ACL token ID. If not provided, the 'anonymous'
-	// token is assumed for backwards compatibility.
-	Token string `protobuf:"bytes,1,opt,name=Token,proto3" json:"Token,omitempty"`
-	// If set, wait until query exceeds given index. Must be provided
-	// with MaxQueryTime.
-	MinQueryIndex uint64 `protobuf:"varint,2,opt,name=MinQueryIndex,proto3" json:"MinQueryIndex,omitempty"`
-	// Provided with MinQueryIndex to wait for change.
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	MaxQueryTime *durationpb.Duration `protobuf:"bytes,3,opt,name=MaxQueryTime,proto3" json:"MaxQueryTime,omitempty"`
-	// If set, any follower can service the request. Results
-	// may be arbitrarily stale.
-	AllowStale bool `protobuf:"varint,4,opt,name=AllowStale,proto3" json:"AllowStale,omitempty"`
-	// If set, the leader must verify leadership prior to
-	// servicing the request. Prevents a stale read.
-	RequireConsistent bool `protobuf:"varint,5,opt,name=RequireConsistent,proto3" json:"RequireConsistent,omitempty"`
-	// If set, the local agent may respond with an arbitrarily stale locally
-	// cached response. The semantics differ from AllowStale since the agent may
-	// be entirely partitioned from the servers and still considered "healthy" by
-	// operators. Stale responses from Servers are also arbitrarily stale, but can
-	// provide additional bounds on the last contact time from the leader. It's
-	// expected that servers that are partitioned are noticed and replaced in a
-	// timely way by operators while the same may not be true for client agents.
-	UseCache bool `protobuf:"varint,6,opt,name=UseCache,proto3" json:"UseCache,omitempty"`
-	// If set and AllowStale is true, will try first a stale
-	// read, and then will perform a consistent read if stale
-	// read is older than value.
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	MaxStaleDuration *durationpb.Duration `protobuf:"bytes,7,opt,name=MaxStaleDuration,proto3" json:"MaxStaleDuration,omitempty"`
-	// MaxAge limits how old a cached value will be returned if UseCache is true.
-	// If there is a cached response that is older than the MaxAge, it is treated
-	// as a cache miss and a new fetch invoked. If the fetch fails, the error is
-	// returned. Clients that wish to allow for stale results on error can set
-	// StaleIfError to a longer duration to change this behavior. It is ignored
-	// if the endpoint supports background refresh caching. See
-	// https://www.consul.io/api/index.html#agent-caching for more details.
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	MaxAge *durationpb.Duration `protobuf:"bytes,8,opt,name=MaxAge,proto3" json:"MaxAge,omitempty"`
-	// MustRevalidate forces the agent to fetch a fresh version of a cached
-	// resource or at least validate that the cached version is still fresh. It is
-	// implied by either max-age=0 or must-revalidate Cache-Control headers. It
-	// only makes sense when UseCache is true. We store it since MaxAge = 0 is the
-	// default unset value.
-	MustRevalidate bool `protobuf:"varint,9,opt,name=MustRevalidate,proto3" json:"MustRevalidate,omitempty"`
-	// StaleIfError specifies how stale the client will accept a cached response
-	// if the servers are unavailable to fetch a fresh one. Only makes sense when
-	// UseCache is true and MaxAge is set to a lower, non-zero value. It is
-	// ignored if the endpoint supports background refresh caching. See
-	// https://www.consul.io/api/index.html#agent-caching for more details.
-	StaleIfError *durationpb.Duration `protobuf:"bytes,10,opt,name=StaleIfError,proto3" json:"StaleIfError,omitempty"`
-	// Filter specifies the go-bexpr filter expression to be used for
-	// filtering the data prior to returning a response
-	Filter string `protobuf:"bytes,11,opt,name=Filter,proto3" json:"Filter,omitempty"`
-}
-
-func (x *QueryOptions) Reset() {
-	*x = QueryOptions{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbcommon_common_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *QueryOptions) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*QueryOptions) ProtoMessage() {}
-
-func (x *QueryOptions) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbcommon_common_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use QueryOptions.ProtoReflect.Descriptor instead.
-func (*QueryOptions) Descriptor() ([]byte, []int) {
-	return file_private_pbcommon_common_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *QueryOptions) GetToken() string {
-	if x != nil {
-		return x.Token
-	}
-	return ""
-}
-
-func (x *QueryOptions) GetMinQueryIndex() uint64 {
-	if x != nil {
-		return x.MinQueryIndex
-	}
-	return 0
-}
-
-func (x *QueryOptions) GetMaxQueryTime() *durationpb.Duration {
-	if x != nil {
-		return x.MaxQueryTime
-	}
-	return nil
-}
-
-func (x *QueryOptions) GetAllowStale() bool {
-	if x != nil {
-		return x.AllowStale
-	}
-	return false
-}
-
-func (x *QueryOptions) GetRequireConsistent() bool {
-	if x != nil {
-		return x.RequireConsistent
-	}
-	return false
-}
-
-func (x *QueryOptions) GetUseCache() bool {
-	if x != nil {
-		return x.UseCache
-	}
-	return false
-}
-
-func (x *QueryOptions) GetMaxStaleDuration() *durationpb.Duration {
-	if x != nil {
-		return x.MaxStaleDuration
-	}
-	return nil
-}
-
-func (x *QueryOptions) GetMaxAge() *durationpb.Duration {
-	if x != nil {
-		return x.MaxAge
-	}
-	return nil
-}
-
-func (x *QueryOptions) GetMustRevalidate() bool {
-	if x != nil {
-		return x.MustRevalidate
-	}
-	return false
-}
-
-func (x *QueryOptions) GetStaleIfError() *durationpb.Duration {
-	if x != nil {
-		return x.StaleIfError
-	}
-	return nil
-}
-
-func (x *QueryOptions) GetFilter() string {
-	if x != nil {
-		return x.Filter
-	}
-	return ""
-}
-
-// QueryMeta allows a query response to include potentially
-// useful metadata about a query
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.QueryMeta
-// output=common.gen.go
-// name=Structs
-// ignore-fields=NotModified,Backend,state,sizeCache,unknownFields
-type QueryMeta struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// This is the index associated with the read
-	Index uint64 `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
-	// If AllowStale is used, this is time elapsed since
-	// last contact between the follower and leader. This
-	// can be used to gauge staleness.
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	LastContact *durationpb.Duration `protobuf:"bytes,2,opt,name=LastContact,proto3" json:"LastContact,omitempty"`
-	// Used to indicate if there is a known leader node
-	KnownLeader bool `protobuf:"varint,3,opt,name=KnownLeader,proto3" json:"KnownLeader,omitempty"`
-	// Consistencylevel returns the consistency used to serve the query
-	// Having `discovery_max_stale` on the agent can affect whether
-	// the request was served by a leader.
-	ConsistencyLevel string `protobuf:"bytes,4,opt,name=ConsistencyLevel,proto3" json:"ConsistencyLevel,omitempty"`
-	// ResultsFilteredByACLs is true when some of the query's results were
-	// filtered out by enforcing ACLs. It may be false because nothing was
-	// removed, or because the endpoint does not yet support this flag.
-	ResultsFilteredByACLs bool `protobuf:"varint,7,opt,name=ResultsFilteredByACLs,proto3" json:"ResultsFilteredByACLs,omitempty"`
-}
-
-func (x *QueryMeta) Reset() {
-	*x = QueryMeta{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbcommon_common_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *QueryMeta) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*QueryMeta) ProtoMessage() {}
-
-func (x *QueryMeta) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbcommon_common_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use QueryMeta.ProtoReflect.Descriptor instead.
-func (*QueryMeta) Descriptor() ([]byte, []int) {
-	return file_private_pbcommon_common_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *QueryMeta) GetIndex() uint64 {
-	if x != nil {
-		return x.Index
-	}
-	return 0
-}
-
-func (x *QueryMeta) GetLastContact() *durationpb.Duration {
-	if x != nil {
-		return x.LastContact
-	}
-	return nil
-}
-
-func (x *QueryMeta) GetKnownLeader() bool {
-	if x != nil {
-		return x.KnownLeader
-	}
-	return false
-}
-
-func (x *QueryMeta) GetConsistencyLevel() string {
-	if x != nil {
-		return x.ConsistencyLevel
-	}
-	return ""
-}
-
-func (x *QueryMeta) GetResultsFilteredByACLs() bool {
-	if x != nil {
-		return x.ResultsFilteredByACLs
-	}
-	return false
-}
-
-// EnterpriseMeta contains metadata that is only used by the Enterprise version
-// of Consul.
-type EnterpriseMeta struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Namespace in which the entity exists.
-	Namespace string `protobuf:"bytes,1,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
-	// Partition in which the entity exists.
-	Partition string `protobuf:"bytes,2,opt,name=Partition,proto3" json:"Partition,omitempty"`
-}
-
-func (x *EnterpriseMeta) Reset() {
-	*x = EnterpriseMeta{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbcommon_common_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EnterpriseMeta) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EnterpriseMeta) ProtoMessage() {}
-
-func (x *EnterpriseMeta) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbcommon_common_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EnterpriseMeta.ProtoReflect.Descriptor instead.
-func (*EnterpriseMeta) Descriptor() ([]byte, []int) {
-	return file_private_pbcommon_common_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *EnterpriseMeta) GetNamespace() string {
-	if x != nil {
-		return x.Namespace
-	}
-	return ""
-}
-
-func (x *EnterpriseMeta) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.EnvoyExtension
-// output=common.gen.go
-// name=Structs
-type EnvoyExtension struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name     string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	Required bool   `protobuf:"varint,2,opt,name=Required,proto3" json:"Required,omitempty"`
-	// mog: func-to=ProtobufTypesStructToMapStringInterface func-from=MapStringInterfaceToProtobufTypesStruct
-	Arguments     *structpb.Struct `protobuf:"bytes,3,opt,name=Arguments,proto3" json:"Arguments,omitempty"`
-	ConsulVersion string           `protobuf:"bytes,4,opt,name=ConsulVersion,proto3" json:"ConsulVersion,omitempty"`
-	EnvoyVersion  string           `protobuf:"bytes,5,opt,name=EnvoyVersion,proto3" json:"EnvoyVersion,omitempty"`
-}
-
-func (x *EnvoyExtension) Reset() {
-	*x = EnvoyExtension{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbcommon_common_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EnvoyExtension) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EnvoyExtension) ProtoMessage() {}
-
-func (x *EnvoyExtension) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbcommon_common_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EnvoyExtension.ProtoReflect.Descriptor instead.
-func (*EnvoyExtension) Descriptor() ([]byte, []int) {
-	return file_private_pbcommon_common_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *EnvoyExtension) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *EnvoyExtension) GetRequired() bool {
-	if x != nil {
-		return x.Required
-	}
-	return false
-}
-
-func (x *EnvoyExtension) GetArguments() *structpb.Struct {
-	if x != nil {
-		return x.Arguments
-	}
-	return nil
-}
-
-func (x *EnvoyExtension) GetConsulVersion() string {
-	if x != nil {
-		return x.ConsulVersion
-	}
-	return ""
-}
-
-func (x *EnvoyExtension) GetEnvoyVersion() string {
-	if x != nil {
-		return x.EnvoyVersion
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.Locality
-// output=common.gen.go
-// name=Structs
-type Locality struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Region is region the zone belongs to.
-	Region string `protobuf:"bytes,1,opt,name=Region,proto3" json:"Region,omitempty"`
-	// Zone is the zone the entity is running in.
-	Zone string `protobuf:"bytes,2,opt,name=Zone,proto3" json:"Zone,omitempty"`
-}
-
-func (x *Locality) Reset() {
-	*x = Locality{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbcommon_common_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Locality) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Locality) ProtoMessage() {}
-
-func (x *Locality) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbcommon_common_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Locality.ProtoReflect.Descriptor instead.
-func (*Locality) Descriptor() ([]byte, []int) {
-	return file_private_pbcommon_common_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *Locality) GetRegion() string {
-	if x != nil {
-		return x.Region
-	}
-	return ""
-}
-
-func (x *Locality) GetZone() string {
-	if x != nil {
-		return x.Zone
-	}
-	return ""
-}
-
-var File_private_pbcommon_common_proto protoreflect.FileDescriptor
-
-var file_private_pbcommon_common_proto_rawDesc = []byte{
-	0x0a, 0x1d, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x20, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0x4f, 0x0a, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x20, 0x0a, 0x0b,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x04, 0x52, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x20,
-	0x0a, 0x0b, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x04, 0x52, 0x0b, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x64, 0x65, 0x78,
-	0x22, 0x32, 0x0a, 0x10, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65,
-	0x6e, 0x74, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74,
-	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65,
-	0x6e, 0x74, 0x65, 0x72, 0x22, 0x24, 0x0a, 0x0c, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x51, 0x0a, 0x0b, 0x52, 0x65,
-	0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x6f, 0x6b,
-	0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12,
-	0x2c, 0x0a, 0x11, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73,
-	0x74, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x52, 0x65, 0x71, 0x75,
-	0x69, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x22, 0xec, 0x03,
-	0x0a, 0x0c, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x14,
-	0x0a, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x54,
-	0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x4d, 0x69, 0x6e, 0x51, 0x75, 0x65, 0x72, 0x79,
-	0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x4d, 0x69, 0x6e,
-	0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x3d, 0x0a, 0x0c, 0x4d, 0x61,
-	0x78, 0x51, 0x75, 0x65, 0x72, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x4d, 0x61, 0x78,
-	0x51, 0x75, 0x65, 0x72, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x41, 0x6c, 0x6c,
-	0x6f, 0x77, 0x53, 0x74, 0x61, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x41,
-	0x6c, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x6c, 0x65, 0x12, 0x2c, 0x0a, 0x11, 0x52, 0x65, 0x71,
-	0x75, 0x69, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x43, 0x6f, 0x6e,
-	0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x43, 0x61,
-	0x63, 0x68, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x55, 0x73, 0x65, 0x43, 0x61,
-	0x63, 0x68, 0x65, 0x12, 0x45, 0x0a, 0x10, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x6c, 0x65, 0x44,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61,
-	0x6c, 0x65, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x31, 0x0a, 0x06, 0x4d, 0x61,
-	0x78, 0x41, 0x67, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x4d, 0x61, 0x78, 0x41, 0x67, 0x65, 0x12, 0x26, 0x0a,
-	0x0e, 0x4d, 0x75, 0x73, 0x74, 0x52, 0x65, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x18,
-	0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x4d, 0x75, 0x73, 0x74, 0x52, 0x65, 0x76, 0x61, 0x6c,
-	0x69, 0x64, 0x61, 0x74, 0x65, 0x12, 0x3d, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x6c, 0x65, 0x49, 0x66,
-	0x45, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x53, 0x74, 0x61, 0x6c, 0x65, 0x49, 0x66, 0x45,
-	0x72, 0x72, 0x6f, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x0b,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0xee, 0x01, 0x0a,
-	0x09, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x6e,
-	0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x49, 0x6e, 0x64, 0x65, 0x78,
-	0x12, 0x3b, 0x0a, 0x0b, 0x4c, 0x61, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x0b, 0x4c, 0x61, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x12, 0x20, 0x0a,
-	0x0b, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0b, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12,
-	0x2a, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65,
-	0x76, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x43, 0x6f, 0x6e, 0x73, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x34, 0x0a, 0x15, 0x52,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x65, 0x64, 0x42, 0x79,
-	0x41, 0x43, 0x4c, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x52, 0x65, 0x73, 0x75,
-	0x6c, 0x74, 0x73, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x65, 0x64, 0x42, 0x79, 0x41, 0x43, 0x4c,
-	0x73, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x4a, 0x04, 0x08, 0x06, 0x10, 0x07, 0x22, 0x4c, 0x0a,
-	0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12,
-	0x1c, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a,
-	0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xc1, 0x01, 0x0a, 0x0e,
-	0x45, 0x6e, 0x76, 0x6f, 0x79, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12,
-	0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61,
-	0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x12, 0x35,
-	0x0a, 0x09, 0x41, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x09, 0x41, 0x72, 0x67, 0x75,
-	0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x56,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x45,
-	0x6e, 0x76, 0x6f, 0x79, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0c, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22,
-	0x36, 0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x52,
-	0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x52, 0x65, 0x67,
-	0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x5a, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x5a, 0x6f, 0x6e, 0x65, 0x42, 0x8b, 0x02, 0x0a, 0x24, 0x63, 0x6f, 0x6d, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x42, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x43, 0xaa, 0x02, 0x20, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0xca, 0x02, 0x20,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0xe2, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x43, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
-	0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x43,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pbcommon_common_proto_rawDescOnce sync.Once
-	file_private_pbcommon_common_proto_rawDescData = file_private_pbcommon_common_proto_rawDesc
-)
-
-func file_private_pbcommon_common_proto_rawDescGZIP() []byte {
-	file_private_pbcommon_common_proto_rawDescOnce.Do(func() {
-		file_private_pbcommon_common_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbcommon_common_proto_rawDescData)
-	})
-	return file_private_pbcommon_common_proto_rawDescData
-}
-
-var file_private_pbcommon_common_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
-var file_private_pbcommon_common_proto_goTypes = []interface{}{
-	(*RaftIndex)(nil),           // 0: hashicorp.consul.internal.common.RaftIndex
-	(*TargetDatacenter)(nil),    // 1: hashicorp.consul.internal.common.TargetDatacenter
-	(*WriteRequest)(nil),        // 2: hashicorp.consul.internal.common.WriteRequest
-	(*ReadRequest)(nil),         // 3: hashicorp.consul.internal.common.ReadRequest
-	(*QueryOptions)(nil),        // 4: hashicorp.consul.internal.common.QueryOptions
-	(*QueryMeta)(nil),           // 5: hashicorp.consul.internal.common.QueryMeta
-	(*EnterpriseMeta)(nil),      // 6: hashicorp.consul.internal.common.EnterpriseMeta
-	(*EnvoyExtension)(nil),      // 7: hashicorp.consul.internal.common.EnvoyExtension
-	(*Locality)(nil),            // 8: hashicorp.consul.internal.common.Locality
-	(*durationpb.Duration)(nil), // 9: google.protobuf.Duration
-	(*structpb.Struct)(nil),     // 10: google.protobuf.Struct
-}
-var file_private_pbcommon_common_proto_depIdxs = []int32{
-	9,  // 0: hashicorp.consul.internal.common.QueryOptions.MaxQueryTime:type_name -> google.protobuf.Duration
-	9,  // 1: hashicorp.consul.internal.common.QueryOptions.MaxStaleDuration:type_name -> google.protobuf.Duration
-	9,  // 2: hashicorp.consul.internal.common.QueryOptions.MaxAge:type_name -> google.protobuf.Duration
-	9,  // 3: hashicorp.consul.internal.common.QueryOptions.StaleIfError:type_name -> google.protobuf.Duration
-	9,  // 4: hashicorp.consul.internal.common.QueryMeta.LastContact:type_name -> google.protobuf.Duration
-	10, // 5: hashicorp.consul.internal.common.EnvoyExtension.Arguments:type_name -> google.protobuf.Struct
-	6,  // [6:6] is the sub-list for method output_type
-	6,  // [6:6] is the sub-list for method input_type
-	6,  // [6:6] is the sub-list for extension type_name
-	6,  // [6:6] is the sub-list for extension extendee
-	0,  // [0:6] is the sub-list for field type_name
-}
-
-func init() { file_private_pbcommon_common_proto_init() }
-func file_private_pbcommon_common_proto_init() {
-	if File_private_pbcommon_common_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbcommon_common_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RaftIndex); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbcommon_common_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TargetDatacenter); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbcommon_common_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WriteRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbcommon_common_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReadRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbcommon_common_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*QueryOptions); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbcommon_common_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*QueryMeta); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbcommon_common_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EnterpriseMeta); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbcommon_common_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EnvoyExtension); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbcommon_common_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Locality); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbcommon_common_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   9,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_private_pbcommon_common_proto_goTypes,
-		DependencyIndexes: file_private_pbcommon_common_proto_depIdxs,
-		MessageInfos:      file_private_pbcommon_common_proto_msgTypes,
-	}.Build()
-	File_private_pbcommon_common_proto = out.File
-	file_private_pbcommon_common_proto_rawDesc = nil
-	file_private_pbcommon_common_proto_goTypes = nil
-	file_private_pbcommon_common_proto_depIdxs = nil
-}
diff --git a/proto/private/pbcommon/common.proto b/proto/private/pbcommon/common.proto
deleted file mode 100644
index 2296dc69d628a..0000000000000
--- a/proto/private/pbcommon/common.proto
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-package hashicorp.consul.internal.common;
-
-import "google/protobuf/duration.proto";
-import "google/protobuf/struct.proto";
-
-// RaftIndex is used to track the index used while creating
-// or modifying a given struct type.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.RaftIndex
-// output=common.gen.go
-// name=Structs
-// ignore-fields=state,sizeCache,unknownFields
-message RaftIndex {
-  // @gotags: bexpr:"-"
-  uint64 CreateIndex = 1;
-  // @gotags: bexpr:"-"
-  uint64 ModifyIndex = 2;
-}
-
-// TargetDatacenter is intended to be used within other messages used for RPC routing
-// amongst the various Consul datacenters
-message TargetDatacenter {
-  string Datacenter = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.WriteRequest
-// output=common.gen.go
-// name=Structs
-// ignore-fields=state,sizeCache,unknownFields
-message WriteRequest {
-  // Token is the ACL token ID. If not provided, the 'anonymous'
-  // token is assumed for backwards compatibility.
-  string Token = 1;
-}
-
-// ReadRequest is a type that may be embedded into any requests for read
-// operations.
-// It is a replacement for QueryOptions now that we no longer need any of those
-// fields because we are moving away from using blocking queries.
-// It is also similar to WriteRequest. It is a separate type so that in the
-// future we can introduce fields that may only be relevant for reads.
-message ReadRequest {
-  // Token is the ACL token ID. If not provided, the 'anonymous'
-  // token is assumed for backwards compatibility.
-  string Token = 1;
-
-  // RequireConsistent indicates that the request must be sent to the leader.
-  bool RequireConsistent = 2;
-}
-
-// QueryOptions is used to specify various flags for read queries
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.QueryOptions
-// output=common.gen.go
-// name=Structs
-// ignore-fields=StaleIfError,AllowNotModifiedResponse,state,sizeCache,unknownFields
-message QueryOptions {
-  // Token is the ACL token ID. If not provided, the 'anonymous'
-  // token is assumed for backwards compatibility.
-  string Token = 1;
-
-  // If set, wait until query exceeds given index. Must be provided
-  // with MaxQueryTime.
-  uint64 MinQueryIndex = 2;
-
-  // Provided with MinQueryIndex to wait for change.
-  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-  google.protobuf.Duration MaxQueryTime = 3;
-
-  // If set, any follower can service the request. Results
-  // may be arbitrarily stale.
-  bool AllowStale = 4;
-
-  // If set, the leader must verify leadership prior to
-  // servicing the request. Prevents a stale read.
-  bool RequireConsistent = 5;
-
-  // If set, the local agent may respond with an arbitrarily stale locally
-  // cached response. The semantics differ from AllowStale since the agent may
-  // be entirely partitioned from the servers and still considered "healthy" by
-  // operators. Stale responses from Servers are also arbitrarily stale, but can
-  // provide additional bounds on the last contact time from the leader. It's
-  // expected that servers that are partitioned are noticed and replaced in a
-  // timely way by operators while the same may not be true for client agents.
-  bool UseCache = 6;
-
-  // If set and AllowStale is true, will try first a stale
-  // read, and then will perform a consistent read if stale
-  // read is older than value.
-  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-  google.protobuf.Duration MaxStaleDuration = 7;
-
-  // MaxAge limits how old a cached value will be returned if UseCache is true.
-  // If there is a cached response that is older than the MaxAge, it is treated
-  // as a cache miss and a new fetch invoked. If the fetch fails, the error is
-  // returned. Clients that wish to allow for stale results on error can set
-  // StaleIfError to a longer duration to change this behavior. It is ignored
-  // if the endpoint supports background refresh caching. See
-  // https://www.consul.io/api/index.html#agent-caching for more details.
-  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-  google.protobuf.Duration MaxAge = 8;
-
-  // MustRevalidate forces the agent to fetch a fresh version of a cached
-  // resource or at least validate that the cached version is still fresh. It is
-  // implied by either max-age=0 or must-revalidate Cache-Control headers. It
-  // only makes sense when UseCache is true. We store it since MaxAge = 0 is the
-  // default unset value.
-  bool MustRevalidate = 9;
-
-  // StaleIfError specifies how stale the client will accept a cached response
-  // if the servers are unavailable to fetch a fresh one. Only makes sense when
-  // UseCache is true and MaxAge is set to a lower, non-zero value. It is
-  // ignored if the endpoint supports background refresh caching. See
-  // https://www.consul.io/api/index.html#agent-caching for more details.
-  google.protobuf.Duration StaleIfError = 10;
-
-  // Filter specifies the go-bexpr filter expression to be used for
-  // filtering the data prior to returning a response
-  string Filter = 11;
-}
-
-// QueryMeta allows a query response to include potentially
-// useful metadata about a query
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.QueryMeta
-// output=common.gen.go
-// name=Structs
-// ignore-fields=NotModified,Backend,state,sizeCache,unknownFields
-message QueryMeta {
-  // This is the index associated with the read
-  uint64 Index = 1;
-
-  // If AllowStale is used, this is time elapsed since
-  // last contact between the follower and leader. This
-  // can be used to gauge staleness.
-  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-  google.protobuf.Duration LastContact = 2;
-
-  // Used to indicate if there is a known leader node
-  bool KnownLeader = 3;
-
-  // Consistencylevel returns the consistency used to serve the query
-  // Having `discovery_max_stale` on the agent can affect whether
-  // the request was served by a leader.
-  string ConsistencyLevel = 4;
-
-  // Reserved for NotModified and Backend.
-  reserved 5, 6;
-
-  // ResultsFilteredByACLs is true when some of the query's results were
-  // filtered out by enforcing ACLs. It may be false because nothing was
-  // removed, or because the endpoint does not yet support this flag.
-  bool ResultsFilteredByACLs = 7;
-}
-
-// EnterpriseMeta contains metadata that is only used by the Enterprise version
-// of Consul.
-message EnterpriseMeta {
-  // Namespace in which the entity exists.
-  string Namespace = 1;
-  // Partition in which the entity exists.
-  string Partition = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.EnvoyExtension
-// output=common.gen.go
-// name=Structs
-message EnvoyExtension {
-  string Name = 1;
-  bool Required = 2;
-  // mog: func-to=ProtobufTypesStructToMapStringInterface func-from=MapStringInterfaceToProtobufTypesStruct
-  google.protobuf.Struct Arguments = 3;
-  string ConsulVersion = 4;
-  string EnvoyVersion = 5;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.Locality
-// output=common.gen.go
-// name=Structs
-message Locality {
-  // Region is region the zone belongs to.
-  string Region = 1;
-
-  // Zone is the zone the entity is running in.
-  string Zone = 2;
-}
diff --git a/proto/private/pbconfig/config.pb.go b/proto/private/pbconfig/config.pb.go
deleted file mode 100644
index ce8e43c7ce912..0000000000000
--- a/proto/private/pbconfig/config.pb.go
+++ /dev/null
@@ -1,989 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbconfig/config.proto
-
-package pbconfig
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Config struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Datacenter        string       `protobuf:"bytes,1,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
-	PrimaryDatacenter string       `protobuf:"bytes,2,opt,name=PrimaryDatacenter,proto3" json:"PrimaryDatacenter,omitempty"`
-	NodeName          string       `protobuf:"bytes,3,opt,name=NodeName,proto3" json:"NodeName,omitempty"`
-	SegmentName       string       `protobuf:"bytes,4,opt,name=SegmentName,proto3" json:"SegmentName,omitempty"`
-	Partition         string       `protobuf:"bytes,9,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	ACL               *ACL         `protobuf:"bytes,5,opt,name=ACL,proto3" json:"ACL,omitempty"`
-	AutoEncrypt       *AutoEncrypt `protobuf:"bytes,6,opt,name=AutoEncrypt,proto3" json:"AutoEncrypt,omitempty"`
-	Gossip            *Gossip      `protobuf:"bytes,7,opt,name=Gossip,proto3" json:"Gossip,omitempty"`
-	TLS               *TLS         `protobuf:"bytes,8,opt,name=TLS,proto3" json:"TLS,omitempty"`
-}
-
-func (x *Config) Reset() {
-	*x = Config{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfig_config_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Config) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Config) ProtoMessage() {}
-
-func (x *Config) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfig_config_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Config.ProtoReflect.Descriptor instead.
-func (*Config) Descriptor() ([]byte, []int) {
-	return file_private_pbconfig_config_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Config) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-func (x *Config) GetPrimaryDatacenter() string {
-	if x != nil {
-		return x.PrimaryDatacenter
-	}
-	return ""
-}
-
-func (x *Config) GetNodeName() string {
-	if x != nil {
-		return x.NodeName
-	}
-	return ""
-}
-
-func (x *Config) GetSegmentName() string {
-	if x != nil {
-		return x.SegmentName
-	}
-	return ""
-}
-
-func (x *Config) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *Config) GetACL() *ACL {
-	if x != nil {
-		return x.ACL
-	}
-	return nil
-}
-
-func (x *Config) GetAutoEncrypt() *AutoEncrypt {
-	if x != nil {
-		return x.AutoEncrypt
-	}
-	return nil
-}
-
-func (x *Config) GetGossip() *Gossip {
-	if x != nil {
-		return x.Gossip
-	}
-	return nil
-}
-
-func (x *Config) GetTLS() *TLS {
-	if x != nil {
-		return x.TLS
-	}
-	return nil
-}
-
-type Gossip struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Encryption   *GossipEncryption `protobuf:"bytes,1,opt,name=Encryption,proto3" json:"Encryption,omitempty"`
-	RetryJoinLAN []string          `protobuf:"bytes,2,rep,name=RetryJoinLAN,proto3" json:"RetryJoinLAN,omitempty"`
-}
-
-func (x *Gossip) Reset() {
-	*x = Gossip{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfig_config_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Gossip) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Gossip) ProtoMessage() {}
-
-func (x *Gossip) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfig_config_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Gossip.ProtoReflect.Descriptor instead.
-func (*Gossip) Descriptor() ([]byte, []int) {
-	return file_private_pbconfig_config_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Gossip) GetEncryption() *GossipEncryption {
-	if x != nil {
-		return x.Encryption
-	}
-	return nil
-}
-
-func (x *Gossip) GetRetryJoinLAN() []string {
-	if x != nil {
-		return x.RetryJoinLAN
-	}
-	return nil
-}
-
-type GossipEncryption struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Key            string `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key,omitempty"`
-	VerifyIncoming bool   `protobuf:"varint,2,opt,name=VerifyIncoming,proto3" json:"VerifyIncoming,omitempty"`
-	VerifyOutgoing bool   `protobuf:"varint,3,opt,name=VerifyOutgoing,proto3" json:"VerifyOutgoing,omitempty"`
-}
-
-func (x *GossipEncryption) Reset() {
-	*x = GossipEncryption{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfig_config_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GossipEncryption) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GossipEncryption) ProtoMessage() {}
-
-func (x *GossipEncryption) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfig_config_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GossipEncryption.ProtoReflect.Descriptor instead.
-func (*GossipEncryption) Descriptor() ([]byte, []int) {
-	return file_private_pbconfig_config_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *GossipEncryption) GetKey() string {
-	if x != nil {
-		return x.Key
-	}
-	return ""
-}
-
-func (x *GossipEncryption) GetVerifyIncoming() bool {
-	if x != nil {
-		return x.VerifyIncoming
-	}
-	return false
-}
-
-func (x *GossipEncryption) GetVerifyOutgoing() bool {
-	if x != nil {
-		return x.VerifyOutgoing
-	}
-	return false
-}
-
-type TLS struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	VerifyOutgoing       bool   `protobuf:"varint,1,opt,name=VerifyOutgoing,proto3" json:"VerifyOutgoing,omitempty"`
-	VerifyServerHostname bool   `protobuf:"varint,2,opt,name=VerifyServerHostname,proto3" json:"VerifyServerHostname,omitempty"`
-	CipherSuites         string `protobuf:"bytes,3,opt,name=CipherSuites,proto3" json:"CipherSuites,omitempty"`
-	MinVersion           string `protobuf:"bytes,4,opt,name=MinVersion,proto3" json:"MinVersion,omitempty"`
-	// Deprecated_PreferServerCipherSuites is deprecated. It is no longer
-	// populated and should be ignored by clients.
-	//
-	// Deprecated: Marked as deprecated in private/pbconfig/config.proto.
-	Deprecated_PreferServerCipherSuites bool `protobuf:"varint,5,opt,name=Deprecated_PreferServerCipherSuites,json=DeprecatedPreferServerCipherSuites,proto3" json:"Deprecated_PreferServerCipherSuites,omitempty"`
-}
-
-func (x *TLS) Reset() {
-	*x = TLS{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfig_config_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TLS) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TLS) ProtoMessage() {}
-
-func (x *TLS) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfig_config_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TLS.ProtoReflect.Descriptor instead.
-func (*TLS) Descriptor() ([]byte, []int) {
-	return file_private_pbconfig_config_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *TLS) GetVerifyOutgoing() bool {
-	if x != nil {
-		return x.VerifyOutgoing
-	}
-	return false
-}
-
-func (x *TLS) GetVerifyServerHostname() bool {
-	if x != nil {
-		return x.VerifyServerHostname
-	}
-	return false
-}
-
-func (x *TLS) GetCipherSuites() string {
-	if x != nil {
-		return x.CipherSuites
-	}
-	return ""
-}
-
-func (x *TLS) GetMinVersion() string {
-	if x != nil {
-		return x.MinVersion
-	}
-	return ""
-}
-
-// Deprecated: Marked as deprecated in private/pbconfig/config.proto.
-func (x *TLS) GetDeprecated_PreferServerCipherSuites() bool {
-	if x != nil {
-		return x.Deprecated_PreferServerCipherSuites
-	}
-	return false
-}
-
-type ACL struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Enabled             bool       `protobuf:"varint,1,opt,name=Enabled,proto3" json:"Enabled,omitempty"`
-	PolicyTTL           string     `protobuf:"bytes,2,opt,name=PolicyTTL,proto3" json:"PolicyTTL,omitempty"`
-	RoleTTL             string     `protobuf:"bytes,3,opt,name=RoleTTL,proto3" json:"RoleTTL,omitempty"`
-	TokenTTL            string     `protobuf:"bytes,4,opt,name=TokenTTL,proto3" json:"TokenTTL,omitempty"`
-	DownPolicy          string     `protobuf:"bytes,5,opt,name=DownPolicy,proto3" json:"DownPolicy,omitempty"`
-	DefaultPolicy       string     `protobuf:"bytes,6,opt,name=DefaultPolicy,proto3" json:"DefaultPolicy,omitempty"`
-	EnableKeyListPolicy bool       `protobuf:"varint,7,opt,name=EnableKeyListPolicy,proto3" json:"EnableKeyListPolicy,omitempty"`
-	Tokens              *ACLTokens `protobuf:"bytes,8,opt,name=Tokens,proto3" json:"Tokens,omitempty"`
-	// Deprecated_DisabledTTL is deprecated. It is no longer populated and should
-	// be ignored by clients.
-	//
-	// Deprecated: Marked as deprecated in private/pbconfig/config.proto.
-	Deprecated_DisabledTTL string `protobuf:"bytes,9,opt,name=Deprecated_DisabledTTL,json=DeprecatedDisabledTTL,proto3" json:"Deprecated_DisabledTTL,omitempty"`
-	EnableTokenPersistence bool   `protobuf:"varint,10,opt,name=EnableTokenPersistence,proto3" json:"EnableTokenPersistence,omitempty"`
-	MSPDisableBootstrap    bool   `protobuf:"varint,11,opt,name=MSPDisableBootstrap,proto3" json:"MSPDisableBootstrap,omitempty"`
-}
-
-func (x *ACL) Reset() {
-	*x = ACL{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfig_config_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ACL) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ACL) ProtoMessage() {}
-
-func (x *ACL) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfig_config_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ACL.ProtoReflect.Descriptor instead.
-func (*ACL) Descriptor() ([]byte, []int) {
-	return file_private_pbconfig_config_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *ACL) GetEnabled() bool {
-	if x != nil {
-		return x.Enabled
-	}
-	return false
-}
-
-func (x *ACL) GetPolicyTTL() string {
-	if x != nil {
-		return x.PolicyTTL
-	}
-	return ""
-}
-
-func (x *ACL) GetRoleTTL() string {
-	if x != nil {
-		return x.RoleTTL
-	}
-	return ""
-}
-
-func (x *ACL) GetTokenTTL() string {
-	if x != nil {
-		return x.TokenTTL
-	}
-	return ""
-}
-
-func (x *ACL) GetDownPolicy() string {
-	if x != nil {
-		return x.DownPolicy
-	}
-	return ""
-}
-
-func (x *ACL) GetDefaultPolicy() string {
-	if x != nil {
-		return x.DefaultPolicy
-	}
-	return ""
-}
-
-func (x *ACL) GetEnableKeyListPolicy() bool {
-	if x != nil {
-		return x.EnableKeyListPolicy
-	}
-	return false
-}
-
-func (x *ACL) GetTokens() *ACLTokens {
-	if x != nil {
-		return x.Tokens
-	}
-	return nil
-}
-
-// Deprecated: Marked as deprecated in private/pbconfig/config.proto.
-func (x *ACL) GetDeprecated_DisabledTTL() string {
-	if x != nil {
-		return x.Deprecated_DisabledTTL
-	}
-	return ""
-}
-
-func (x *ACL) GetEnableTokenPersistence() bool {
-	if x != nil {
-		return x.EnableTokenPersistence
-	}
-	return false
-}
-
-func (x *ACL) GetMSPDisableBootstrap() bool {
-	if x != nil {
-		return x.MSPDisableBootstrap
-	}
-	return false
-}
-
-type ACLTokens struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	InitialManagement      string                     `protobuf:"bytes,1,opt,name=InitialManagement,proto3" json:"InitialManagement,omitempty"`
-	Replication            string                     `protobuf:"bytes,2,opt,name=Replication,proto3" json:"Replication,omitempty"`
-	AgentRecovery          string                     `protobuf:"bytes,3,opt,name=AgentRecovery,proto3" json:"AgentRecovery,omitempty"`
-	Default                string                     `protobuf:"bytes,4,opt,name=Default,proto3" json:"Default,omitempty"`
-	Agent                  string                     `protobuf:"bytes,5,opt,name=Agent,proto3" json:"Agent,omitempty"`
-	ManagedServiceProvider []*ACLServiceProviderToken `protobuf:"bytes,6,rep,name=ManagedServiceProvider,proto3" json:"ManagedServiceProvider,omitempty"`
-}
-
-func (x *ACLTokens) Reset() {
-	*x = ACLTokens{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfig_config_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ACLTokens) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ACLTokens) ProtoMessage() {}
-
-func (x *ACLTokens) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfig_config_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ACLTokens.ProtoReflect.Descriptor instead.
-func (*ACLTokens) Descriptor() ([]byte, []int) {
-	return file_private_pbconfig_config_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *ACLTokens) GetInitialManagement() string {
-	if x != nil {
-		return x.InitialManagement
-	}
-	return ""
-}
-
-func (x *ACLTokens) GetReplication() string {
-	if x != nil {
-		return x.Replication
-	}
-	return ""
-}
-
-func (x *ACLTokens) GetAgentRecovery() string {
-	if x != nil {
-		return x.AgentRecovery
-	}
-	return ""
-}
-
-func (x *ACLTokens) GetDefault() string {
-	if x != nil {
-		return x.Default
-	}
-	return ""
-}
-
-func (x *ACLTokens) GetAgent() string {
-	if x != nil {
-		return x.Agent
-	}
-	return ""
-}
-
-func (x *ACLTokens) GetManagedServiceProvider() []*ACLServiceProviderToken {
-	if x != nil {
-		return x.ManagedServiceProvider
-	}
-	return nil
-}
-
-type ACLServiceProviderToken struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	AccessorID string `protobuf:"bytes,1,opt,name=AccessorID,proto3" json:"AccessorID,omitempty"`
-	SecretID   string `protobuf:"bytes,2,opt,name=SecretID,proto3" json:"SecretID,omitempty"`
-}
-
-func (x *ACLServiceProviderToken) Reset() {
-	*x = ACLServiceProviderToken{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfig_config_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ACLServiceProviderToken) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ACLServiceProviderToken) ProtoMessage() {}
-
-func (x *ACLServiceProviderToken) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfig_config_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ACLServiceProviderToken.ProtoReflect.Descriptor instead.
-func (*ACLServiceProviderToken) Descriptor() ([]byte, []int) {
-	return file_private_pbconfig_config_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *ACLServiceProviderToken) GetAccessorID() string {
-	if x != nil {
-		return x.AccessorID
-	}
-	return ""
-}
-
-func (x *ACLServiceProviderToken) GetSecretID() string {
-	if x != nil {
-		return x.SecretID
-	}
-	return ""
-}
-
-type AutoEncrypt struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TLS      bool     `protobuf:"varint,1,opt,name=TLS,proto3" json:"TLS,omitempty"`
-	DNSSAN   []string `protobuf:"bytes,2,rep,name=DNSSAN,proto3" json:"DNSSAN,omitempty"`
-	IPSAN    []string `protobuf:"bytes,3,rep,name=IPSAN,proto3" json:"IPSAN,omitempty"`
-	AllowTLS bool     `protobuf:"varint,4,opt,name=AllowTLS,proto3" json:"AllowTLS,omitempty"`
-}
-
-func (x *AutoEncrypt) Reset() {
-	*x = AutoEncrypt{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfig_config_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AutoEncrypt) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AutoEncrypt) ProtoMessage() {}
-
-func (x *AutoEncrypt) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfig_config_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AutoEncrypt.ProtoReflect.Descriptor instead.
-func (*AutoEncrypt) Descriptor() ([]byte, []int) {
-	return file_private_pbconfig_config_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *AutoEncrypt) GetTLS() bool {
-	if x != nil {
-		return x.TLS
-	}
-	return false
-}
-
-func (x *AutoEncrypt) GetDNSSAN() []string {
-	if x != nil {
-		return x.DNSSAN
-	}
-	return nil
-}
-
-func (x *AutoEncrypt) GetIPSAN() []string {
-	if x != nil {
-		return x.IPSAN
-	}
-	return nil
-}
-
-func (x *AutoEncrypt) GetAllowTLS() bool {
-	if x != nil {
-		return x.AllowTLS
-	}
-	return false
-}
-
-var File_private_pbconfig_config_proto protoreflect.FileDescriptor
-
-var file_private_pbconfig_config_proto_rawDesc = []byte{
-	0x0a, 0x1d, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x20, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x22, 0xb7, 0x03, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1e, 0x0a, 0x0a,
-	0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x2c, 0x0a, 0x11,
-	0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65,
-	0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79,
-	0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x6f,
-	0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x6f,
-	0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e,
-	0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x53, 0x65, 0x67,
-	0x6d, 0x65, 0x6e, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72,
-	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x37, 0x0a, 0x03, 0x41, 0x43, 0x4c, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x41, 0x43, 0x4c, 0x52, 0x03, 0x41, 0x43, 0x4c, 0x12,
-	0x4f, 0x0a, 0x0b, 0x41, 0x75, 0x74, 0x6f, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x41, 0x75, 0x74, 0x6f, 0x45, 0x6e, 0x63, 0x72,
-	0x79, 0x70, 0x74, 0x52, 0x0b, 0x41, 0x75, 0x74, 0x6f, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74,
-	0x12, 0x40, 0x0a, 0x06, 0x47, 0x6f, 0x73, 0x73, 0x69, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x28, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x47, 0x6f, 0x73, 0x73, 0x69, 0x70, 0x52, 0x06, 0x47, 0x6f, 0x73, 0x73,
-	0x69, 0x70, 0x12, 0x37, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x25, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x54, 0x4c, 0x53, 0x52, 0x03, 0x54, 0x4c, 0x53, 0x22, 0x80, 0x01, 0x0a, 0x06,
-	0x47, 0x6f, 0x73, 0x73, 0x69, 0x70, 0x12, 0x52, 0x0a, 0x0a, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x47, 0x6f,
-	0x73, 0x73, 0x69, 0x70, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a,
-	0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x52, 0x65,
-	0x74, 0x72, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x4c, 0x41, 0x4e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x0c, 0x52, 0x65, 0x74, 0x72, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x4c, 0x41, 0x4e, 0x22, 0x74,
-	0x0a, 0x10, 0x47, 0x6f, 0x73, 0x73, 0x69, 0x70, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x4b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x0e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x49, 0x6e,
-	0x63, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x56, 0x65,
-	0x72, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x63, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x12, 0x26, 0x0a, 0x0e,
-	0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x4f, 0x75, 0x74, 0x67, 0x6f, 0x69, 0x6e, 0x67, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x4f, 0x75, 0x74, 0x67,
-	0x6f, 0x69, 0x6e, 0x67, 0x22, 0xfa, 0x01, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x12, 0x26, 0x0a, 0x0e,
-	0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x4f, 0x75, 0x74, 0x67, 0x6f, 0x69, 0x6e, 0x67, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x4f, 0x75, 0x74, 0x67,
-	0x6f, 0x69, 0x6e, 0x67, 0x12, 0x32, 0x0a, 0x14, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x53, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x14, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x43, 0x69, 0x70, 0x68,
-	0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
-	0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a,
-	0x4d, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0a, 0x4d, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x53, 0x0a, 0x23,
-	0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x50, 0x72, 0x65, 0x66, 0x65,
-	0x72, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69,
-	0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x22, 0x44,
-	0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x53,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65,
-	0x73, 0x22, 0xd5, 0x03, 0x0a, 0x03, 0x41, 0x43, 0x4c, 0x12, 0x18, 0x0a, 0x07, 0x45, 0x6e, 0x61,
-	0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x45, 0x6e, 0x61, 0x62,
-	0x6c, 0x65, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x54, 0x4c,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x54,
-	0x4c, 0x12, 0x18, 0x0a, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x54, 0x54, 0x4c, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x54, 0x54, 0x4c, 0x12, 0x1a, 0x0a, 0x08, 0x54,
-	0x6f, 0x6b, 0x65, 0x6e, 0x54, 0x54, 0x4c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x54,
-	0x6f, 0x6b, 0x65, 0x6e, 0x54, 0x54, 0x4c, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x6f, 0x77, 0x6e, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x6f, 0x77,
-	0x6e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x44, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d,
-	0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x30, 0x0a,
-	0x13, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f,
-	0x6c, 0x69, 0x63, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x45, 0x6e, 0x61, 0x62,
-	0x6c, 0x65, 0x4b, 0x65, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12,
-	0x43, 0x0a, 0x06, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x41, 0x43, 0x4c, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x52, 0x06, 0x54, 0x6f,
-	0x6b, 0x65, 0x6e, 0x73, 0x12, 0x39, 0x0a, 0x16, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74,
-	0x65, 0x64, 0x5f, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x54, 0x54, 0x4c, 0x18, 0x09,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x15, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63,
-	0x61, 0x74, 0x65, 0x64, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x54, 0x54, 0x4c, 0x12,
-	0x36, 0x0a, 0x16, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x50, 0x65,
-	0x72, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x16, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x50, 0x65, 0x72, 0x73,
-	0x69, 0x73, 0x74, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x30, 0x0a, 0x13, 0x4d, 0x53, 0x50, 0x44, 0x69,
-	0x73, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x18, 0x0b,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x4d, 0x53, 0x50, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65,
-	0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x22, 0xa4, 0x02, 0x0a, 0x09, 0x41, 0x43,
-	0x4c, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x2c, 0x0a, 0x11, 0x49, 0x6e, 0x69, 0x74, 0x69,
-	0x61, 0x6c, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x11, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x4d, 0x61, 0x6e, 0x61, 0x67,
-	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x52, 0x65, 0x70, 0x6c,
-	0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74,
-	0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d,
-	0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x12, 0x18, 0x0a,
-	0x07, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x41, 0x67, 0x65, 0x6e, 0x74,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x71, 0x0a,
-	0x16, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50,
-	0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x41, 0x43, 0x4c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69,
-	0x64, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x16, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65,
-	0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72,
-	0x22, 0x55, 0x0a, 0x17, 0x41, 0x43, 0x4c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72,
-	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x41,
-	0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x53,
-	0x65, 0x63, 0x72, 0x65, 0x74, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x53,
-	0x65, 0x63, 0x72, 0x65, 0x74, 0x49, 0x44, 0x22, 0x69, 0x0a, 0x0b, 0x41, 0x75, 0x74, 0x6f, 0x45,
-	0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x03, 0x54, 0x4c, 0x53, 0x12, 0x16, 0x0a, 0x06, 0x44, 0x4e, 0x53, 0x53,
-	0x41, 0x4e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x44, 0x4e, 0x53, 0x53, 0x41, 0x4e,
-	0x12, 0x14, 0x0a, 0x05, 0x49, 0x50, 0x53, 0x41, 0x4e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x05, 0x49, 0x50, 0x53, 0x41, 0x4e, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x54,
-	0x4c, 0x53, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x54,
-	0x4c, 0x53, 0x42, 0x8b, 0x02, 0x0a, 0x24, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0b, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72,
-	0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0xa2, 0x02,
-	0x04, 0x48, 0x43, 0x49, 0x43, 0xaa, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0xe2, 0x02, 0x2c, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5c, 0x47,
-	0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x23, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a,
-	0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pbconfig_config_proto_rawDescOnce sync.Once
-	file_private_pbconfig_config_proto_rawDescData = file_private_pbconfig_config_proto_rawDesc
-)
-
-func file_private_pbconfig_config_proto_rawDescGZIP() []byte {
-	file_private_pbconfig_config_proto_rawDescOnce.Do(func() {
-		file_private_pbconfig_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbconfig_config_proto_rawDescData)
-	})
-	return file_private_pbconfig_config_proto_rawDescData
-}
-
-var file_private_pbconfig_config_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
-var file_private_pbconfig_config_proto_goTypes = []interface{}{
-	(*Config)(nil),                  // 0: hashicorp.consul.internal.config.Config
-	(*Gossip)(nil),                  // 1: hashicorp.consul.internal.config.Gossip
-	(*GossipEncryption)(nil),        // 2: hashicorp.consul.internal.config.GossipEncryption
-	(*TLS)(nil),                     // 3: hashicorp.consul.internal.config.TLS
-	(*ACL)(nil),                     // 4: hashicorp.consul.internal.config.ACL
-	(*ACLTokens)(nil),               // 5: hashicorp.consul.internal.config.ACLTokens
-	(*ACLServiceProviderToken)(nil), // 6: hashicorp.consul.internal.config.ACLServiceProviderToken
-	(*AutoEncrypt)(nil),             // 7: hashicorp.consul.internal.config.AutoEncrypt
-}
-var file_private_pbconfig_config_proto_depIdxs = []int32{
-	4, // 0: hashicorp.consul.internal.config.Config.ACL:type_name -> hashicorp.consul.internal.config.ACL
-	7, // 1: hashicorp.consul.internal.config.Config.AutoEncrypt:type_name -> hashicorp.consul.internal.config.AutoEncrypt
-	1, // 2: hashicorp.consul.internal.config.Config.Gossip:type_name -> hashicorp.consul.internal.config.Gossip
-	3, // 3: hashicorp.consul.internal.config.Config.TLS:type_name -> hashicorp.consul.internal.config.TLS
-	2, // 4: hashicorp.consul.internal.config.Gossip.Encryption:type_name -> hashicorp.consul.internal.config.GossipEncryption
-	5, // 5: hashicorp.consul.internal.config.ACL.Tokens:type_name -> hashicorp.consul.internal.config.ACLTokens
-	6, // 6: hashicorp.consul.internal.config.ACLTokens.ManagedServiceProvider:type_name -> hashicorp.consul.internal.config.ACLServiceProviderToken
-	7, // [7:7] is the sub-list for method output_type
-	7, // [7:7] is the sub-list for method input_type
-	7, // [7:7] is the sub-list for extension type_name
-	7, // [7:7] is the sub-list for extension extendee
-	0, // [0:7] is the sub-list for field type_name
-}
-
-func init() { file_private_pbconfig_config_proto_init() }
-func file_private_pbconfig_config_proto_init() {
-	if File_private_pbconfig_config_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbconfig_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Config); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfig_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Gossip); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfig_config_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GossipEncryption); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfig_config_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TLS); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfig_config_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ACL); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfig_config_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ACLTokens); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfig_config_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ACLServiceProviderToken); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfig_config_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AutoEncrypt); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbconfig_config_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   8,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_private_pbconfig_config_proto_goTypes,
-		DependencyIndexes: file_private_pbconfig_config_proto_depIdxs,
-		MessageInfos:      file_private_pbconfig_config_proto_msgTypes,
-	}.Build()
-	File_private_pbconfig_config_proto = out.File
-	file_private_pbconfig_config_proto_rawDesc = nil
-	file_private_pbconfig_config_proto_goTypes = nil
-	file_private_pbconfig_config_proto_depIdxs = nil
-}
diff --git a/proto/private/pbconfigentry/config_entry.gen.go b/proto/private/pbconfigentry/config_entry.gen.go
deleted file mode 100644
index 258d8dbb6df68..0000000000000
--- a/proto/private/pbconfigentry/config_entry.gen.go
+++ /dev/null
@@ -1,2584 +0,0 @@
-// Code generated by mog. DO NOT EDIT.
-
-package pbconfigentry
-
-import "github.com/hashicorp/consul/agent/structs"
-
-func APIGatewayToStructs(s *APIGateway, t *structs.APIGatewayConfigEntry) {
-	if s == nil {
-		return
-	}
-	{
-		t.Listeners = make([]structs.APIGatewayListener, len(s.Listeners))
-		for i := range s.Listeners {
-			if s.Listeners[i] != nil {
-				APIGatewayListenerToStructs(s.Listeners[i], &t.Listeners[i])
-			}
-		}
-	}
-	if s.Status != nil {
-		StatusToStructs(s.Status, &t.Status)
-	}
-	t.Meta = s.Meta
-}
-func APIGatewayFromStructs(t *structs.APIGatewayConfigEntry, s *APIGateway) {
-	if s == nil {
-		return
-	}
-	{
-		s.Listeners = make([]*APIGatewayListener, len(t.Listeners))
-		for i := range t.Listeners {
-			{
-				var x APIGatewayListener
-				APIGatewayListenerFromStructs(&t.Listeners[i], &x)
-				s.Listeners[i] = &x
-			}
-		}
-	}
-	{
-		var x Status
-		StatusFromStructs(&t.Status, &x)
-		s.Status = &x
-	}
-	s.Meta = t.Meta
-}
-func APIGatewayListenerToStructs(s *APIGatewayListener, t *structs.APIGatewayListener) {
-	if s == nil {
-		return
-	}
-	t.Name = s.Name
-	t.Hostname = s.Hostname
-	t.Port = int(s.Port)
-	t.Protocol = apiGatewayProtocolToStructs(s.Protocol)
-	if s.TLS != nil {
-		APIGatewayTLSConfigurationToStructs(s.TLS, &t.TLS)
-	}
-	if s.Override != nil {
-		var x structs.APIGatewayPolicy
-		APIGatewayPolicyToStructs(s.Override, &x)
-		t.Override = &x
-	}
-	if s.Default != nil {
-		var x structs.APIGatewayPolicy
-		APIGatewayPolicyToStructs(s.Default, &x)
-		t.Default = &x
-	}
-}
-func APIGatewayListenerFromStructs(t *structs.APIGatewayListener, s *APIGatewayListener) {
-	if s == nil {
-		return
-	}
-	s.Name = t.Name
-	s.Hostname = t.Hostname
-	s.Port = int32(t.Port)
-	s.Protocol = apiGatewayProtocolFromStructs(t.Protocol)
-	{
-		var x APIGatewayTLSConfiguration
-		APIGatewayTLSConfigurationFromStructs(&t.TLS, &x)
-		s.TLS = &x
-	}
-	if t.Override != nil {
-		var x APIGatewayPolicy
-		APIGatewayPolicyFromStructs(t.Override, &x)
-		s.Override = &x
-	}
-	if t.Default != nil {
-		var x APIGatewayPolicy
-		APIGatewayPolicyFromStructs(t.Default, &x)
-		s.Default = &x
-	}
-}
-func APIGatewayPolicyToStructs(s *APIGatewayPolicy, t *structs.APIGatewayPolicy) {
-	if s == nil {
-		return
-	}
-	t.JWT = gwJWTRequirementToStructs(s.JWT)
-}
-func APIGatewayPolicyFromStructs(t *structs.APIGatewayPolicy, s *APIGatewayPolicy) {
-	if s == nil {
-		return
-	}
-	s.JWT = gwJWTRequirementFromStructs(t.JWT)
-}
-func APIGatewayTLSConfigurationToStructs(s *APIGatewayTLSConfiguration, t *structs.APIGatewayTLSConfiguration) {
-	if s == nil {
-		return
-	}
-	{
-		t.Certificates = make([]structs.ResourceReference, len(s.Certificates))
-		for i := range s.Certificates {
-			if s.Certificates[i] != nil {
-				ResourceReferenceToStructs(s.Certificates[i], &t.Certificates[i])
-			}
-		}
-	}
-	t.MaxVersion = tlsVersionToStructs(s.MaxVersion)
-	t.MinVersion = tlsVersionToStructs(s.MinVersion)
-	t.CipherSuites = cipherSuitesToStructs(s.CipherSuites)
-}
-func APIGatewayTLSConfigurationFromStructs(t *structs.APIGatewayTLSConfiguration, s *APIGatewayTLSConfiguration) {
-	if s == nil {
-		return
-	}
-	{
-		s.Certificates = make([]*ResourceReference, len(t.Certificates))
-		for i := range t.Certificates {
-			{
-				var x ResourceReference
-				ResourceReferenceFromStructs(&t.Certificates[i], &x)
-				s.Certificates[i] = &x
-			}
-		}
-	}
-	s.MaxVersion = tlsVersionFromStructs(t.MaxVersion)
-	s.MinVersion = tlsVersionFromStructs(t.MinVersion)
-	s.CipherSuites = cipherSuitesFromStructs(t.CipherSuites)
-}
-func BoundAPIGatewayToStructs(s *BoundAPIGateway, t *structs.BoundAPIGatewayConfigEntry) {
-	if s == nil {
-		return
-	}
-	{
-		t.Listeners = make([]structs.BoundAPIGatewayListener, len(s.Listeners))
-		for i := range s.Listeners {
-			if s.Listeners[i] != nil {
-				BoundAPIGatewayListenerToStructs(s.Listeners[i], &t.Listeners[i])
-			}
-		}
-	}
-	t.Meta = s.Meta
-}
-func BoundAPIGatewayFromStructs(t *structs.BoundAPIGatewayConfigEntry, s *BoundAPIGateway) {
-	if s == nil {
-		return
-	}
-	{
-		s.Listeners = make([]*BoundAPIGatewayListener, len(t.Listeners))
-		for i := range t.Listeners {
-			{
-				var x BoundAPIGatewayListener
-				BoundAPIGatewayListenerFromStructs(&t.Listeners[i], &x)
-				s.Listeners[i] = &x
-			}
-		}
-	}
-	s.Meta = t.Meta
-}
-func BoundAPIGatewayListenerToStructs(s *BoundAPIGatewayListener, t *structs.BoundAPIGatewayListener) {
-	if s == nil {
-		return
-	}
-	t.Name = s.Name
-	{
-		t.Routes = make([]structs.ResourceReference, len(s.Routes))
-		for i := range s.Routes {
-			if s.Routes[i] != nil {
-				ResourceReferenceToStructs(s.Routes[i], &t.Routes[i])
-			}
-		}
-	}
-	{
-		t.Certificates = make([]structs.ResourceReference, len(s.Certificates))
-		for i := range s.Certificates {
-			if s.Certificates[i] != nil {
-				ResourceReferenceToStructs(s.Certificates[i], &t.Certificates[i])
-			}
-		}
-	}
-}
-func BoundAPIGatewayListenerFromStructs(t *structs.BoundAPIGatewayListener, s *BoundAPIGatewayListener) {
-	if s == nil {
-		return
-	}
-	s.Name = t.Name
-	{
-		s.Routes = make([]*ResourceReference, len(t.Routes))
-		for i := range t.Routes {
-			{
-				var x ResourceReference
-				ResourceReferenceFromStructs(&t.Routes[i], &x)
-				s.Routes[i] = &x
-			}
-		}
-	}
-	{
-		s.Certificates = make([]*ResourceReference, len(t.Certificates))
-		for i := range t.Certificates {
-			{
-				var x ResourceReference
-				ResourceReferenceFromStructs(&t.Certificates[i], &x)
-				s.Certificates[i] = &x
-			}
-		}
-	}
-}
-func ConditionToStructs(s *Condition, t *structs.Condition) {
-	if s == nil {
-		return
-	}
-	t.Type = s.Type
-	t.Status = s.Status
-	t.Reason = s.Reason
-	t.Message = s.Message
-	if s.Resource != nil {
-		var x structs.ResourceReference
-		ResourceReferenceToStructs(s.Resource, &x)
-		t.Resource = &x
-	}
-	t.LastTransitionTime = timeToStructs(s.LastTransitionTime)
-}
-func ConditionFromStructs(t *structs.Condition, s *Condition) {
-	if s == nil {
-		return
-	}
-	s.Type = t.Type
-	s.Status = t.Status
-	s.Reason = t.Reason
-	s.Message = t.Message
-	if t.Resource != nil {
-		var x ResourceReference
-		ResourceReferenceFromStructs(t.Resource, &x)
-		s.Resource = &x
-	}
-	s.LastTransitionTime = timeFromStructs(t.LastTransitionTime)
-}
-func CookieConfigToStructs(s *CookieConfig, t *structs.CookieConfig) {
-	if s == nil {
-		return
-	}
-	t.Session = s.Session
-	t.TTL = structs.DurationFromProto(s.TTL)
-	t.Path = s.Path
-}
-func CookieConfigFromStructs(t *structs.CookieConfig, s *CookieConfig) {
-	if s == nil {
-		return
-	}
-	s.Session = t.Session
-	s.TTL = structs.DurationToProto(t.TTL)
-	s.Path = t.Path
-}
-func DestinationConfigToStructs(s *DestinationConfig, t *structs.DestinationConfig) {
-	if s == nil {
-		return
-	}
-	t.Addresses = s.Addresses
-	t.Port = int(s.Port)
-}
-func DestinationConfigFromStructs(t *structs.DestinationConfig, s *DestinationConfig) {
-	if s == nil {
-		return
-	}
-	s.Addresses = t.Addresses
-	s.Port = int32(t.Port)
-}
-func ExposeConfigToStructs(s *ExposeConfig, t *structs.ExposeConfig) {
-	if s == nil {
-		return
-	}
-	t.Checks = s.Checks
-	{
-		t.Paths = make([]structs.ExposePath, len(s.Paths))
-		for i := range s.Paths {
-			if s.Paths[i] != nil {
-				ExposePathToStructs(s.Paths[i], &t.Paths[i])
-			}
-		}
-	}
-}
-func ExposeConfigFromStructs(t *structs.ExposeConfig, s *ExposeConfig) {
-	if s == nil {
-		return
-	}
-	s.Checks = t.Checks
-	{
-		s.Paths = make([]*ExposePath, len(t.Paths))
-		for i := range t.Paths {
-			{
-				var x ExposePath
-				ExposePathFromStructs(&t.Paths[i], &x)
-				s.Paths[i] = &x
-			}
-		}
-	}
-}
-func ExposePathToStructs(s *ExposePath, t *structs.ExposePath) {
-	if s == nil {
-		return
-	}
-	t.ListenerPort = int(s.ListenerPort)
-	t.Path = s.Path
-	t.LocalPathPort = int(s.LocalPathPort)
-	t.Protocol = s.Protocol
-	t.ParsedFromCheck = s.ParsedFromCheck
-}
-func ExposePathFromStructs(t *structs.ExposePath, s *ExposePath) {
-	if s == nil {
-		return
-	}
-	s.ListenerPort = int32(t.ListenerPort)
-	s.Path = t.Path
-	s.LocalPathPort = int32(t.LocalPathPort)
-	s.Protocol = t.Protocol
-	s.ParsedFromCheck = t.ParsedFromCheck
-}
-func GatewayServiceTLSConfigToStructs(s *GatewayServiceTLSConfig, t *structs.GatewayServiceTLSConfig) {
-	if s == nil {
-		return
-	}
-	if s.SDS != nil {
-		var x structs.GatewayTLSSDSConfig
-		GatewayTLSSDSConfigToStructs(s.SDS, &x)
-		t.SDS = &x
-	}
-}
-func GatewayServiceTLSConfigFromStructs(t *structs.GatewayServiceTLSConfig, s *GatewayServiceTLSConfig) {
-	if s == nil {
-		return
-	}
-	if t.SDS != nil {
-		var x GatewayTLSSDSConfig
-		GatewayTLSSDSConfigFromStructs(t.SDS, &x)
-		s.SDS = &x
-	}
-}
-func GatewayTLSConfigToStructs(s *GatewayTLSConfig, t *structs.GatewayTLSConfig) {
-	if s == nil {
-		return
-	}
-	t.Enabled = s.Enabled
-	if s.SDS != nil {
-		var x structs.GatewayTLSSDSConfig
-		GatewayTLSSDSConfigToStructs(s.SDS, &x)
-		t.SDS = &x
-	}
-	t.TLSMinVersion = tlsVersionToStructs(s.TLSMinVersion)
-	t.TLSMaxVersion = tlsVersionToStructs(s.TLSMaxVersion)
-	t.CipherSuites = cipherSuitesToStructs(s.CipherSuites)
-}
-func GatewayTLSConfigFromStructs(t *structs.GatewayTLSConfig, s *GatewayTLSConfig) {
-	if s == nil {
-		return
-	}
-	s.Enabled = t.Enabled
-	if t.SDS != nil {
-		var x GatewayTLSSDSConfig
-		GatewayTLSSDSConfigFromStructs(t.SDS, &x)
-		s.SDS = &x
-	}
-	s.TLSMinVersion = tlsVersionFromStructs(t.TLSMinVersion)
-	s.TLSMaxVersion = tlsVersionFromStructs(t.TLSMaxVersion)
-	s.CipherSuites = cipherSuitesFromStructs(t.CipherSuites)
-}
-func GatewayTLSSDSConfigToStructs(s *GatewayTLSSDSConfig, t *structs.GatewayTLSSDSConfig) {
-	if s == nil {
-		return
-	}
-	t.ClusterName = s.ClusterName
-	t.CertResource = s.CertResource
-}
-func GatewayTLSSDSConfigFromStructs(t *structs.GatewayTLSSDSConfig, s *GatewayTLSSDSConfig) {
-	if s == nil {
-		return
-	}
-	s.ClusterName = t.ClusterName
-	s.CertResource = t.CertResource
-}
-func HTTPFiltersToStructs(s *HTTPFilters, t *structs.HTTPFilters) {
-	if s == nil {
-		return
-	}
-	{
-		t.Headers = make([]structs.HTTPHeaderFilter, len(s.Headers))
-		for i := range s.Headers {
-			if s.Headers[i] != nil {
-				HTTPHeaderFilterToStructs(s.Headers[i], &t.Headers[i])
-			}
-		}
-	}
-	if s.URLRewrite != nil {
-		var x structs.URLRewrite
-		URLRewriteToStructs(s.URLRewrite, &x)
-		t.URLRewrite = &x
-	}
-	if s.RetryFilter != nil {
-		var x structs.RetryFilter
-		RetryFilterToStructs(s.RetryFilter, &x)
-		t.RetryFilter = &x
-	}
-	if s.TimeoutFilter != nil {
-		var x structs.TimeoutFilter
-		TimeoutFilterToStructs(s.TimeoutFilter, &x)
-		t.TimeoutFilter = &x
-	}
-	t.JWT = routeJWTFilterToStructs(s.JWT)
-}
-func HTTPFiltersFromStructs(t *structs.HTTPFilters, s *HTTPFilters) {
-	if s == nil {
-		return
-	}
-	{
-		s.Headers = make([]*HTTPHeaderFilter, len(t.Headers))
-		for i := range t.Headers {
-			{
-				var x HTTPHeaderFilter
-				HTTPHeaderFilterFromStructs(&t.Headers[i], &x)
-				s.Headers[i] = &x
-			}
-		}
-	}
-	if t.URLRewrite != nil {
-		var x URLRewrite
-		URLRewriteFromStructs(t.URLRewrite, &x)
-		s.URLRewrite = &x
-	}
-	if t.RetryFilter != nil {
-		var x RetryFilter
-		RetryFilterFromStructs(t.RetryFilter, &x)
-		s.RetryFilter = &x
-	}
-	if t.TimeoutFilter != nil {
-		var x TimeoutFilter
-		TimeoutFilterFromStructs(t.TimeoutFilter, &x)
-		s.TimeoutFilter = &x
-	}
-	s.JWT = routeJWTFilterFromStructs(t.JWT)
-}
-func HTTPHeaderFilterToStructs(s *HTTPHeaderFilter, t *structs.HTTPHeaderFilter) {
-	if s == nil {
-		return
-	}
-	t.Add = s.Add
-	t.Remove = s.Remove
-	t.Set = s.Set
-}
-func HTTPHeaderFilterFromStructs(t *structs.HTTPHeaderFilter, s *HTTPHeaderFilter) {
-	if s == nil {
-		return
-	}
-	s.Add = t.Add
-	s.Remove = t.Remove
-	s.Set = t.Set
-}
-func HTTPHeaderMatchToStructs(s *HTTPHeaderMatch, t *structs.HTTPHeaderMatch) {
-	if s == nil {
-		return
-	}
-	t.Match = httpHeaderMatchToStructs(s.Match)
-	t.Name = s.Name
-	t.Value = s.Value
-}
-func HTTPHeaderMatchFromStructs(t *structs.HTTPHeaderMatch, s *HTTPHeaderMatch) {
-	if s == nil {
-		return
-	}
-	s.Match = httpHeaderMatchFromStructs(t.Match)
-	s.Name = t.Name
-	s.Value = t.Value
-}
-func HTTPHeaderModifiersToStructs(s *HTTPHeaderModifiers, t *structs.HTTPHeaderModifiers) {
-	if s == nil {
-		return
-	}
-	t.Add = s.Add
-	t.Set = s.Set
-	t.Remove = s.Remove
-}
-func HTTPHeaderModifiersFromStructs(t *structs.HTTPHeaderModifiers, s *HTTPHeaderModifiers) {
-	if s == nil {
-		return
-	}
-	s.Add = t.Add
-	s.Set = t.Set
-	s.Remove = t.Remove
-}
-func HTTPMatchToStructs(s *HTTPMatch, t *structs.HTTPMatch) {
-	if s == nil {
-		return
-	}
-	{
-		t.Headers = make([]structs.HTTPHeaderMatch, len(s.Headers))
-		for i := range s.Headers {
-			if s.Headers[i] != nil {
-				HTTPHeaderMatchToStructs(s.Headers[i], &t.Headers[i])
-			}
-		}
-	}
-	t.Method = httpMatchMethodToStructs(s.Method)
-	if s.Path != nil {
-		HTTPPathMatchToStructs(s.Path, &t.Path)
-	}
-	{
-		t.Query = make([]structs.HTTPQueryMatch, len(s.Query))
-		for i := range s.Query {
-			if s.Query[i] != nil {
-				HTTPQueryMatchToStructs(s.Query[i], &t.Query[i])
-			}
-		}
-	}
-}
-func HTTPMatchFromStructs(t *structs.HTTPMatch, s *HTTPMatch) {
-	if s == nil {
-		return
-	}
-	{
-		s.Headers = make([]*HTTPHeaderMatch, len(t.Headers))
-		for i := range t.Headers {
-			{
-				var x HTTPHeaderMatch
-				HTTPHeaderMatchFromStructs(&t.Headers[i], &x)
-				s.Headers[i] = &x
-			}
-		}
-	}
-	s.Method = httpMatchMethodFromStructs(t.Method)
-	{
-		var x HTTPPathMatch
-		HTTPPathMatchFromStructs(&t.Path, &x)
-		s.Path = &x
-	}
-	{
-		s.Query = make([]*HTTPQueryMatch, len(t.Query))
-		for i := range t.Query {
-			{
-				var x HTTPQueryMatch
-				HTTPQueryMatchFromStructs(&t.Query[i], &x)
-				s.Query[i] = &x
-			}
-		}
-	}
-}
-func HTTPPathMatchToStructs(s *HTTPPathMatch, t *structs.HTTPPathMatch) {
-	if s == nil {
-		return
-	}
-	t.Match = httpPathMatchToStructs(s.Match)
-	t.Value = s.Value
-}
-func HTTPPathMatchFromStructs(t *structs.HTTPPathMatch, s *HTTPPathMatch) {
-	if s == nil {
-		return
-	}
-	s.Match = httpPathMatchFromStructs(t.Match)
-	s.Value = t.Value
-}
-func HTTPQueryMatchToStructs(s *HTTPQueryMatch, t *structs.HTTPQueryMatch) {
-	if s == nil {
-		return
-	}
-	t.Match = httpQueryMatchToStructs(s.Match)
-	t.Name = s.Name
-	t.Value = s.Value
-}
-func HTTPQueryMatchFromStructs(t *structs.HTTPQueryMatch, s *HTTPQueryMatch) {
-	if s == nil {
-		return
-	}
-	s.Match = httpQueryMatchFromStructs(t.Match)
-	s.Name = t.Name
-	s.Value = t.Value
-}
-func HTTPResponseFiltersToStructs(s *HTTPResponseFilters, t *structs.HTTPResponseFilters) {
-	if s == nil {
-		return
-	}
-	{
-		t.Headers = make([]structs.HTTPHeaderFilter, len(s.Headers))
-		for i := range s.Headers {
-			if s.Headers[i] != nil {
-				HTTPHeaderFilterToStructs(s.Headers[i], &t.Headers[i])
-			}
-		}
-	}
-}
-func HTTPResponseFiltersFromStructs(t *structs.HTTPResponseFilters, s *HTTPResponseFilters) {
-	if s == nil {
-		return
-	}
-	{
-		s.Headers = make([]*HTTPHeaderFilter, len(t.Headers))
-		for i := range t.Headers {
-			{
-				var x HTTPHeaderFilter
-				HTTPHeaderFilterFromStructs(&t.Headers[i], &x)
-				s.Headers[i] = &x
-			}
-		}
-	}
-}
-func HTTPRouteToStructs(s *HTTPRoute, t *structs.HTTPRouteConfigEntry) {
-	if s == nil {
-		return
-	}
-	{
-		t.Parents = make([]structs.ResourceReference, len(s.Parents))
-		for i := range s.Parents {
-			if s.Parents[i] != nil {
-				ResourceReferenceToStructs(s.Parents[i], &t.Parents[i])
-			}
-		}
-	}
-	{
-		t.Rules = make([]structs.HTTPRouteRule, len(s.Rules))
-		for i := range s.Rules {
-			if s.Rules[i] != nil {
-				HTTPRouteRuleToStructs(s.Rules[i], &t.Rules[i])
-			}
-		}
-	}
-	t.Hostnames = s.Hostnames
-	t.Meta = s.Meta
-	if s.Status != nil {
-		StatusToStructs(s.Status, &t.Status)
-	}
-}
-func HTTPRouteFromStructs(t *structs.HTTPRouteConfigEntry, s *HTTPRoute) {
-	if s == nil {
-		return
-	}
-	{
-		s.Parents = make([]*ResourceReference, len(t.Parents))
-		for i := range t.Parents {
-			{
-				var x ResourceReference
-				ResourceReferenceFromStructs(&t.Parents[i], &x)
-				s.Parents[i] = &x
-			}
-		}
-	}
-	{
-		s.Rules = make([]*HTTPRouteRule, len(t.Rules))
-		for i := range t.Rules {
-			{
-				var x HTTPRouteRule
-				HTTPRouteRuleFromStructs(&t.Rules[i], &x)
-				s.Rules[i] = &x
-			}
-		}
-	}
-	s.Hostnames = t.Hostnames
-	s.Meta = t.Meta
-	{
-		var x Status
-		StatusFromStructs(&t.Status, &x)
-		s.Status = &x
-	}
-}
-func HTTPRouteRuleToStructs(s *HTTPRouteRule, t *structs.HTTPRouteRule) {
-	if s == nil {
-		return
-	}
-	if s.Filters != nil {
-		HTTPFiltersToStructs(s.Filters, &t.Filters)
-	}
-	if s.ResponseFilters != nil {
-		HTTPResponseFiltersToStructs(s.ResponseFilters, &t.ResponseFilters)
-	}
-	{
-		t.Matches = make([]structs.HTTPMatch, len(s.Matches))
-		for i := range s.Matches {
-			if s.Matches[i] != nil {
-				HTTPMatchToStructs(s.Matches[i], &t.Matches[i])
-			}
-		}
-	}
-	{
-		t.Services = make([]structs.HTTPService, len(s.Services))
-		for i := range s.Services {
-			if s.Services[i] != nil {
-				HTTPServiceToStructs(s.Services[i], &t.Services[i])
-			}
-		}
-	}
-}
-func HTTPRouteRuleFromStructs(t *structs.HTTPRouteRule, s *HTTPRouteRule) {
-	if s == nil {
-		return
-	}
-	{
-		var x HTTPFilters
-		HTTPFiltersFromStructs(&t.Filters, &x)
-		s.Filters = &x
-	}
-	{
-		var x HTTPResponseFilters
-		HTTPResponseFiltersFromStructs(&t.ResponseFilters, &x)
-		s.ResponseFilters = &x
-	}
-	{
-		s.Matches = make([]*HTTPMatch, len(t.Matches))
-		for i := range t.Matches {
-			{
-				var x HTTPMatch
-				HTTPMatchFromStructs(&t.Matches[i], &x)
-				s.Matches[i] = &x
-			}
-		}
-	}
-	{
-		s.Services = make([]*HTTPService, len(t.Services))
-		for i := range t.Services {
-			{
-				var x HTTPService
-				HTTPServiceFromStructs(&t.Services[i], &x)
-				s.Services[i] = &x
-			}
-		}
-	}
-}
-func HTTPServiceToStructs(s *HTTPService, t *structs.HTTPService) {
-	if s == nil {
-		return
-	}
-	t.Name = s.Name
-	t.Weight = int(s.Weight)
-	if s.Filters != nil {
-		HTTPFiltersToStructs(s.Filters, &t.Filters)
-	}
-	if s.ResponseFilters != nil {
-		HTTPResponseFiltersToStructs(s.ResponseFilters, &t.ResponseFilters)
-	}
-	t.EnterpriseMeta = enterpriseMetaToStructs(s.EnterpriseMeta)
-}
-func HTTPServiceFromStructs(t *structs.HTTPService, s *HTTPService) {
-	if s == nil {
-		return
-	}
-	s.Name = t.Name
-	s.Weight = int32(t.Weight)
-	{
-		var x HTTPFilters
-		HTTPFiltersFromStructs(&t.Filters, &x)
-		s.Filters = &x
-	}
-	{
-		var x HTTPResponseFilters
-		HTTPResponseFiltersFromStructs(&t.ResponseFilters, &x)
-		s.ResponseFilters = &x
-	}
-	s.EnterpriseMeta = enterpriseMetaFromStructs(t.EnterpriseMeta)
-}
-func HashPolicyToStructs(s *HashPolicy, t *structs.HashPolicy) {
-	if s == nil {
-		return
-	}
-	t.Field = s.Field
-	t.FieldValue = s.FieldValue
-	if s.CookieConfig != nil {
-		var x structs.CookieConfig
-		CookieConfigToStructs(s.CookieConfig, &x)
-		t.CookieConfig = &x
-	}
-	t.SourceIP = s.SourceIP
-	t.Terminal = s.Terminal
-}
-func HashPolicyFromStructs(t *structs.HashPolicy, s *HashPolicy) {
-	if s == nil {
-		return
-	}
-	s.Field = t.Field
-	s.FieldValue = t.FieldValue
-	if t.CookieConfig != nil {
-		var x CookieConfig
-		CookieConfigFromStructs(t.CookieConfig, &x)
-		s.CookieConfig = &x
-	}
-	s.SourceIP = t.SourceIP
-	s.Terminal = t.Terminal
-}
-func IngressGatewayToStructs(s *IngressGateway, t *structs.IngressGatewayConfigEntry) {
-	if s == nil {
-		return
-	}
-	if s.TLS != nil {
-		GatewayTLSConfigToStructs(s.TLS, &t.TLS)
-	}
-	{
-		t.Listeners = make([]structs.IngressListener, len(s.Listeners))
-		for i := range s.Listeners {
-			if s.Listeners[i] != nil {
-				IngressListenerToStructs(s.Listeners[i], &t.Listeners[i])
-			}
-		}
-	}
-	if s.Defaults != nil {
-		var x structs.IngressServiceConfig
-		IngressServiceConfigToStructs(s.Defaults, &x)
-		t.Defaults = &x
-	}
-	t.Meta = s.Meta
-}
-func IngressGatewayFromStructs(t *structs.IngressGatewayConfigEntry, s *IngressGateway) {
-	if s == nil {
-		return
-	}
-	{
-		var x GatewayTLSConfig
-		GatewayTLSConfigFromStructs(&t.TLS, &x)
-		s.TLS = &x
-	}
-	{
-		s.Listeners = make([]*IngressListener, len(t.Listeners))
-		for i := range t.Listeners {
-			{
-				var x IngressListener
-				IngressListenerFromStructs(&t.Listeners[i], &x)
-				s.Listeners[i] = &x
-			}
-		}
-	}
-	if t.Defaults != nil {
-		var x IngressServiceConfig
-		IngressServiceConfigFromStructs(t.Defaults, &x)
-		s.Defaults = &x
-	}
-	s.Meta = t.Meta
-}
-func IngressListenerToStructs(s *IngressListener, t *structs.IngressListener) {
-	if s == nil {
-		return
-	}
-	t.Port = int(s.Port)
-	t.Protocol = s.Protocol
-	if s.TLS != nil {
-		var x structs.GatewayTLSConfig
-		GatewayTLSConfigToStructs(s.TLS, &x)
-		t.TLS = &x
-	}
-	{
-		t.Services = make([]structs.IngressService, len(s.Services))
-		for i := range s.Services {
-			if s.Services[i] != nil {
-				IngressServiceToStructs(s.Services[i], &t.Services[i])
-			}
-		}
-	}
-}
-func IngressListenerFromStructs(t *structs.IngressListener, s *IngressListener) {
-	if s == nil {
-		return
-	}
-	s.Port = int32(t.Port)
-	s.Protocol = t.Protocol
-	if t.TLS != nil {
-		var x GatewayTLSConfig
-		GatewayTLSConfigFromStructs(t.TLS, &x)
-		s.TLS = &x
-	}
-	{
-		s.Services = make([]*IngressService, len(t.Services))
-		for i := range t.Services {
-			{
-				var x IngressService
-				IngressServiceFromStructs(&t.Services[i], &x)
-				s.Services[i] = &x
-			}
-		}
-	}
-}
-func IngressServiceToStructs(s *IngressService, t *structs.IngressService) {
-	if s == nil {
-		return
-	}
-	t.Name = s.Name
-	t.Hosts = s.Hosts
-	if s.TLS != nil {
-		var x structs.GatewayServiceTLSConfig
-		GatewayServiceTLSConfigToStructs(s.TLS, &x)
-		t.TLS = &x
-	}
-	if s.RequestHeaders != nil {
-		var x structs.HTTPHeaderModifiers
-		HTTPHeaderModifiersToStructs(s.RequestHeaders, &x)
-		t.RequestHeaders = &x
-	}
-	if s.ResponseHeaders != nil {
-		var x structs.HTTPHeaderModifiers
-		HTTPHeaderModifiersToStructs(s.ResponseHeaders, &x)
-		t.ResponseHeaders = &x
-	}
-	t.MaxConnections = s.MaxConnections
-	t.MaxPendingRequests = s.MaxPendingRequests
-	t.MaxConcurrentRequests = s.MaxConcurrentRequests
-	if s.PassiveHealthCheck != nil {
-		var x structs.PassiveHealthCheck
-		PassiveHealthCheckToStructs(s.PassiveHealthCheck, &x)
-		t.PassiveHealthCheck = &x
-	}
-	t.Meta = s.Meta
-	t.EnterpriseMeta = enterpriseMetaToStructs(s.EnterpriseMeta)
-}
-func IngressServiceFromStructs(t *structs.IngressService, s *IngressService) {
-	if s == nil {
-		return
-	}
-	s.Name = t.Name
-	s.Hosts = t.Hosts
-	if t.TLS != nil {
-		var x GatewayServiceTLSConfig
-		GatewayServiceTLSConfigFromStructs(t.TLS, &x)
-		s.TLS = &x
-	}
-	if t.RequestHeaders != nil {
-		var x HTTPHeaderModifiers
-		HTTPHeaderModifiersFromStructs(t.RequestHeaders, &x)
-		s.RequestHeaders = &x
-	}
-	if t.ResponseHeaders != nil {
-		var x HTTPHeaderModifiers
-		HTTPHeaderModifiersFromStructs(t.ResponseHeaders, &x)
-		s.ResponseHeaders = &x
-	}
-	s.MaxConnections = t.MaxConnections
-	s.MaxPendingRequests = t.MaxPendingRequests
-	s.MaxConcurrentRequests = t.MaxConcurrentRequests
-	if t.PassiveHealthCheck != nil {
-		var x PassiveHealthCheck
-		PassiveHealthCheckFromStructs(t.PassiveHealthCheck, &x)
-		s.PassiveHealthCheck = &x
-	}
-	s.Meta = t.Meta
-	s.EnterpriseMeta = enterpriseMetaFromStructs(t.EnterpriseMeta)
-}
-func IngressServiceConfigToStructs(s *IngressServiceConfig, t *structs.IngressServiceConfig) {
-	if s == nil {
-		return
-	}
-	t.MaxConnections = s.MaxConnections
-	t.MaxPendingRequests = s.MaxPendingRequests
-	t.MaxConcurrentRequests = s.MaxConcurrentRequests
-	if s.PassiveHealthCheck != nil {
-		var x structs.PassiveHealthCheck
-		PassiveHealthCheckToStructs(s.PassiveHealthCheck, &x)
-		t.PassiveHealthCheck = &x
-	}
-}
-func IngressServiceConfigFromStructs(t *structs.IngressServiceConfig, s *IngressServiceConfig) {
-	if s == nil {
-		return
-	}
-	s.MaxConnections = t.MaxConnections
-	s.MaxPendingRequests = t.MaxPendingRequests
-	s.MaxConcurrentRequests = t.MaxConcurrentRequests
-	if t.PassiveHealthCheck != nil {
-		var x PassiveHealthCheck
-		PassiveHealthCheckFromStructs(t.PassiveHealthCheck, &x)
-		s.PassiveHealthCheck = &x
-	}
-}
-func InlineCertificateToStructs(s *InlineCertificate, t *structs.InlineCertificateConfigEntry) {
-	if s == nil {
-		return
-	}
-	t.Certificate = s.Certificate
-	t.PrivateKey = s.PrivateKey
-	t.Meta = s.Meta
-}
-func InlineCertificateFromStructs(t *structs.InlineCertificateConfigEntry, s *InlineCertificate) {
-	if s == nil {
-		return
-	}
-	s.Certificate = t.Certificate
-	s.PrivateKey = t.PrivateKey
-	s.Meta = t.Meta
-}
-func InstanceLevelRateLimitsToStructs(s *InstanceLevelRateLimits, t *structs.InstanceLevelRateLimits) {
-	if s == nil {
-		return
-	}
-	t.RequestsPerSecond = int(s.RequestsPerSecond)
-	t.RequestsMaxBurst = int(s.RequestsMaxBurst)
-	{
-		t.Routes = make([]structs.InstanceLevelRouteRateLimits, len(s.Routes))
-		for i := range s.Routes {
-			if s.Routes[i] != nil {
-				InstanceLevelRouteRateLimitsToStructs(s.Routes[i], &t.Routes[i])
-			}
-		}
-	}
-}
-func InstanceLevelRateLimitsFromStructs(t *structs.InstanceLevelRateLimits, s *InstanceLevelRateLimits) {
-	if s == nil {
-		return
-	}
-	s.RequestsPerSecond = uint32(t.RequestsPerSecond)
-	s.RequestsMaxBurst = uint32(t.RequestsMaxBurst)
-	{
-		s.Routes = make([]*InstanceLevelRouteRateLimits, len(t.Routes))
-		for i := range t.Routes {
-			{
-				var x InstanceLevelRouteRateLimits
-				InstanceLevelRouteRateLimitsFromStructs(&t.Routes[i], &x)
-				s.Routes[i] = &x
-			}
-		}
-	}
-}
-func InstanceLevelRouteRateLimitsToStructs(s *InstanceLevelRouteRateLimits, t *structs.InstanceLevelRouteRateLimits) {
-	if s == nil {
-		return
-	}
-	t.PathExact = s.PathExact
-	t.PathPrefix = s.PathPrefix
-	t.PathRegex = s.PathRegex
-	t.RequestsPerSecond = int(s.RequestsPerSecond)
-	t.RequestsMaxBurst = int(s.RequestsMaxBurst)
-}
-func InstanceLevelRouteRateLimitsFromStructs(t *structs.InstanceLevelRouteRateLimits, s *InstanceLevelRouteRateLimits) {
-	if s == nil {
-		return
-	}
-	s.PathExact = t.PathExact
-	s.PathPrefix = t.PathPrefix
-	s.PathRegex = t.PathRegex
-	s.RequestsPerSecond = uint32(t.RequestsPerSecond)
-	s.RequestsMaxBurst = uint32(t.RequestsMaxBurst)
-}
-func IntentionHTTPHeaderPermissionToStructs(s *IntentionHTTPHeaderPermission, t *structs.IntentionHTTPHeaderPermission) {
-	if s == nil {
-		return
-	}
-	t.Name = s.Name
-	t.Present = s.Present
-	t.Exact = s.Exact
-	t.Prefix = s.Prefix
-	t.Suffix = s.Suffix
-	t.Regex = s.Regex
-	t.Invert = s.Invert
-}
-func IntentionHTTPHeaderPermissionFromStructs(t *structs.IntentionHTTPHeaderPermission, s *IntentionHTTPHeaderPermission) {
-	if s == nil {
-		return
-	}
-	s.Name = t.Name
-	s.Present = t.Present
-	s.Exact = t.Exact
-	s.Prefix = t.Prefix
-	s.Suffix = t.Suffix
-	s.Regex = t.Regex
-	s.Invert = t.Invert
-}
-func IntentionHTTPPermissionToStructs(s *IntentionHTTPPermission, t *structs.IntentionHTTPPermission) {
-	if s == nil {
-		return
-	}
-	t.PathExact = s.PathExact
-	t.PathPrefix = s.PathPrefix
-	t.PathRegex = s.PathRegex
-	{
-		t.Header = make([]structs.IntentionHTTPHeaderPermission, len(s.Header))
-		for i := range s.Header {
-			if s.Header[i] != nil {
-				IntentionHTTPHeaderPermissionToStructs(s.Header[i], &t.Header[i])
-			}
-		}
-	}
-	t.Methods = s.Methods
-}
-func IntentionHTTPPermissionFromStructs(t *structs.IntentionHTTPPermission, s *IntentionHTTPPermission) {
-	if s == nil {
-		return
-	}
-	s.PathExact = t.PathExact
-	s.PathPrefix = t.PathPrefix
-	s.PathRegex = t.PathRegex
-	{
-		s.Header = make([]*IntentionHTTPHeaderPermission, len(t.Header))
-		for i := range t.Header {
-			{
-				var x IntentionHTTPHeaderPermission
-				IntentionHTTPHeaderPermissionFromStructs(&t.Header[i], &x)
-				s.Header[i] = &x
-			}
-		}
-	}
-	s.Methods = t.Methods
-}
-func IntentionJWTClaimVerificationToStructs(s *IntentionJWTClaimVerification, t *structs.IntentionJWTClaimVerification) {
-	if s == nil {
-		return
-	}
-	t.Path = s.Path
-	t.Value = s.Value
-}
-func IntentionJWTClaimVerificationFromStructs(t *structs.IntentionJWTClaimVerification, s *IntentionJWTClaimVerification) {
-	if s == nil {
-		return
-	}
-	s.Path = t.Path
-	s.Value = t.Value
-}
-func IntentionJWTProviderToStructs(s *IntentionJWTProvider, t *structs.IntentionJWTProvider) {
-	if s == nil {
-		return
-	}
-	t.Name = s.Name
-	{
-		t.VerifyClaims = make([]*structs.IntentionJWTClaimVerification, len(s.VerifyClaims))
-		for i := range s.VerifyClaims {
-			if s.VerifyClaims[i] != nil {
-				var x structs.IntentionJWTClaimVerification
-				IntentionJWTClaimVerificationToStructs(s.VerifyClaims[i], &x)
-				t.VerifyClaims[i] = &x
-			}
-		}
-	}
-}
-func IntentionJWTProviderFromStructs(t *structs.IntentionJWTProvider, s *IntentionJWTProvider) {
-	if s == nil {
-		return
-	}
-	s.Name = t.Name
-	{
-		s.VerifyClaims = make([]*IntentionJWTClaimVerification, len(t.VerifyClaims))
-		for i := range t.VerifyClaims {
-			if t.VerifyClaims[i] != nil {
-				var x IntentionJWTClaimVerification
-				IntentionJWTClaimVerificationFromStructs(t.VerifyClaims[i], &x)
-				s.VerifyClaims[i] = &x
-			}
-		}
-	}
-}
-func IntentionJWTRequirementToStructs(s *IntentionJWTRequirement, t *structs.IntentionJWTRequirement) {
-	if s == nil {
-		return
-	}
-	{
-		t.Providers = make([]*structs.IntentionJWTProvider, len(s.Providers))
-		for i := range s.Providers {
-			if s.Providers[i] != nil {
-				var x structs.IntentionJWTProvider
-				IntentionJWTProviderToStructs(s.Providers[i], &x)
-				t.Providers[i] = &x
-			}
-		}
-	}
-}
-func IntentionJWTRequirementFromStructs(t *structs.IntentionJWTRequirement, s *IntentionJWTRequirement) {
-	if s == nil {
-		return
-	}
-	{
-		s.Providers = make([]*IntentionJWTProvider, len(t.Providers))
-		for i := range t.Providers {
-			if t.Providers[i] != nil {
-				var x IntentionJWTProvider
-				IntentionJWTProviderFromStructs(t.Providers[i], &x)
-				s.Providers[i] = &x
-			}
-		}
-	}
-}
-func IntentionPermissionToStructs(s *IntentionPermission, t *structs.IntentionPermission) {
-	if s == nil {
-		return
-	}
-	t.Action = intentionActionToStructs(s.Action)
-	if s.HTTP != nil {
-		var x structs.IntentionHTTPPermission
-		IntentionHTTPPermissionToStructs(s.HTTP, &x)
-		t.HTTP = &x
-	}
-	if s.JWT != nil {
-		var x structs.IntentionJWTRequirement
-		IntentionJWTRequirementToStructs(s.JWT, &x)
-		t.JWT = &x
-	}
-}
-func IntentionPermissionFromStructs(t *structs.IntentionPermission, s *IntentionPermission) {
-	if s == nil {
-		return
-	}
-	s.Action = intentionActionFromStructs(t.Action)
-	if t.HTTP != nil {
-		var x IntentionHTTPPermission
-		IntentionHTTPPermissionFromStructs(t.HTTP, &x)
-		s.HTTP = &x
-	}
-	if t.JWT != nil {
-		var x IntentionJWTRequirement
-		IntentionJWTRequirementFromStructs(t.JWT, &x)
-		s.JWT = &x
-	}
-}
-func JSONWebKeySetToStructs(s *JSONWebKeySet, t *structs.JSONWebKeySet) {
-	if s == nil {
-		return
-	}
-	if s.Local != nil {
-		var x structs.LocalJWKS
-		LocalJWKSToStructs(s.Local, &x)
-		t.Local = &x
-	}
-	if s.Remote != nil {
-		var x structs.RemoteJWKS
-		RemoteJWKSToStructs(s.Remote, &x)
-		t.Remote = &x
-	}
-}
-func JSONWebKeySetFromStructs(t *structs.JSONWebKeySet, s *JSONWebKeySet) {
-	if s == nil {
-		return
-	}
-	if t.Local != nil {
-		var x LocalJWKS
-		LocalJWKSFromStructs(t.Local, &x)
-		s.Local = &x
-	}
-	if t.Remote != nil {
-		var x RemoteJWKS
-		RemoteJWKSFromStructs(t.Remote, &x)
-		s.Remote = &x
-	}
-}
-func JWKSClusterToStructs(s *JWKSCluster, t *structs.JWKSCluster) {
-	if s == nil {
-		return
-	}
-	t.DiscoveryType = structs.ClusterDiscoveryType(s.DiscoveryType)
-	if s.TLSCertificates != nil {
-		var x structs.JWKSTLSCertificate
-		JWKSTLSCertificateToStructs(s.TLSCertificates, &x)
-		t.TLSCertificates = &x
-	}
-	t.ConnectTimeout = structs.DurationFromProto(s.ConnectTimeout)
-}
-func JWKSClusterFromStructs(t *structs.JWKSCluster, s *JWKSCluster) {
-	if s == nil {
-		return
-	}
-	s.DiscoveryType = string(t.DiscoveryType)
-	if t.TLSCertificates != nil {
-		var x JWKSTLSCertificate
-		JWKSTLSCertificateFromStructs(t.TLSCertificates, &x)
-		s.TLSCertificates = &x
-	}
-	s.ConnectTimeout = structs.DurationToProto(t.ConnectTimeout)
-}
-func JWKSRetryPolicyToStructs(s *JWKSRetryPolicy, t *structs.JWKSRetryPolicy) {
-	if s == nil {
-		return
-	}
-	t.NumRetries = int(s.NumRetries)
-	if s.RetryPolicyBackOff != nil {
-		var x structs.RetryPolicyBackOff
-		RetryPolicyBackOffToStructs(s.RetryPolicyBackOff, &x)
-		t.RetryPolicyBackOff = &x
-	}
-}
-func JWKSRetryPolicyFromStructs(t *structs.JWKSRetryPolicy, s *JWKSRetryPolicy) {
-	if s == nil {
-		return
-	}
-	s.NumRetries = int32(t.NumRetries)
-	if t.RetryPolicyBackOff != nil {
-		var x RetryPolicyBackOff
-		RetryPolicyBackOffFromStructs(t.RetryPolicyBackOff, &x)
-		s.RetryPolicyBackOff = &x
-	}
-}
-func JWKSTLSCertProviderInstanceToStructs(s *JWKSTLSCertProviderInstance, t *structs.JWKSTLSCertProviderInstance) {
-	if s == nil {
-		return
-	}
-	t.InstanceName = s.InstanceName
-	t.CertificateName = s.CertificateName
-}
-func JWKSTLSCertProviderInstanceFromStructs(t *structs.JWKSTLSCertProviderInstance, s *JWKSTLSCertProviderInstance) {
-	if s == nil {
-		return
-	}
-	s.InstanceName = t.InstanceName
-	s.CertificateName = t.CertificateName
-}
-func JWKSTLSCertTrustedCAToStructs(s *JWKSTLSCertTrustedCA, t *structs.JWKSTLSCertTrustedCA) {
-	if s == nil {
-		return
-	}
-	t.Filename = s.Filename
-	t.EnvironmentVariable = s.EnvironmentVariable
-	t.InlineString = s.InlineString
-	t.InlineBytes = s.InlineBytes
-}
-func JWKSTLSCertTrustedCAFromStructs(t *structs.JWKSTLSCertTrustedCA, s *JWKSTLSCertTrustedCA) {
-	if s == nil {
-		return
-	}
-	s.Filename = t.Filename
-	s.EnvironmentVariable = t.EnvironmentVariable
-	s.InlineString = t.InlineString
-	s.InlineBytes = t.InlineBytes
-}
-func JWKSTLSCertificateToStructs(s *JWKSTLSCertificate, t *structs.JWKSTLSCertificate) {
-	if s == nil {
-		return
-	}
-	if s.CaCertificateProviderInstance != nil {
-		var x structs.JWKSTLSCertProviderInstance
-		JWKSTLSCertProviderInstanceToStructs(s.CaCertificateProviderInstance, &x)
-		t.CaCertificateProviderInstance = &x
-	}
-	if s.TrustedCA != nil {
-		var x structs.JWKSTLSCertTrustedCA
-		JWKSTLSCertTrustedCAToStructs(s.TrustedCA, &x)
-		t.TrustedCA = &x
-	}
-}
-func JWKSTLSCertificateFromStructs(t *structs.JWKSTLSCertificate, s *JWKSTLSCertificate) {
-	if s == nil {
-		return
-	}
-	if t.CaCertificateProviderInstance != nil {
-		var x JWKSTLSCertProviderInstance
-		JWKSTLSCertProviderInstanceFromStructs(t.CaCertificateProviderInstance, &x)
-		s.CaCertificateProviderInstance = &x
-	}
-	if t.TrustedCA != nil {
-		var x JWKSTLSCertTrustedCA
-		JWKSTLSCertTrustedCAFromStructs(t.TrustedCA, &x)
-		s.TrustedCA = &x
-	}
-}
-func JWTCacheConfigToStructs(s *JWTCacheConfig, t *structs.JWTCacheConfig) {
-	if s == nil {
-		return
-	}
-	t.Size = int(s.Size)
-}
-func JWTCacheConfigFromStructs(t *structs.JWTCacheConfig, s *JWTCacheConfig) {
-	if s == nil {
-		return
-	}
-	s.Size = int32(t.Size)
-}
-func JWTForwardingConfigToStructs(s *JWTForwardingConfig, t *structs.JWTForwardingConfig) {
-	if s == nil {
-		return
-	}
-	t.HeaderName = s.HeaderName
-	t.PadForwardPayloadHeader = s.PadForwardPayloadHeader
-}
-func JWTForwardingConfigFromStructs(t *structs.JWTForwardingConfig, s *JWTForwardingConfig) {
-	if s == nil {
-		return
-	}
-	s.HeaderName = t.HeaderName
-	s.PadForwardPayloadHeader = t.PadForwardPayloadHeader
-}
-func JWTLocationToStructs(s *JWTLocation, t *structs.JWTLocation) {
-	if s == nil {
-		return
-	}
-	if s.Header != nil {
-		var x structs.JWTLocationHeader
-		JWTLocationHeaderToStructs(s.Header, &x)
-		t.Header = &x
-	}
-	if s.QueryParam != nil {
-		var x structs.JWTLocationQueryParam
-		JWTLocationQueryParamToStructs(s.QueryParam, &x)
-		t.QueryParam = &x
-	}
-	if s.Cookie != nil {
-		var x structs.JWTLocationCookie
-		JWTLocationCookieToStructs(s.Cookie, &x)
-		t.Cookie = &x
-	}
-}
-func JWTLocationFromStructs(t *structs.JWTLocation, s *JWTLocation) {
-	if s == nil {
-		return
-	}
-	if t.Header != nil {
-		var x JWTLocationHeader
-		JWTLocationHeaderFromStructs(t.Header, &x)
-		s.Header = &x
-	}
-	if t.QueryParam != nil {
-		var x JWTLocationQueryParam
-		JWTLocationQueryParamFromStructs(t.QueryParam, &x)
-		s.QueryParam = &x
-	}
-	if t.Cookie != nil {
-		var x JWTLocationCookie
-		JWTLocationCookieFromStructs(t.Cookie, &x)
-		s.Cookie = &x
-	}
-}
-func JWTLocationCookieToStructs(s *JWTLocationCookie, t *structs.JWTLocationCookie) {
-	if s == nil {
-		return
-	}
-	t.Name = s.Name
-}
-func JWTLocationCookieFromStructs(t *structs.JWTLocationCookie, s *JWTLocationCookie) {
-	if s == nil {
-		return
-	}
-	s.Name = t.Name
-}
-func JWTLocationHeaderToStructs(s *JWTLocationHeader, t *structs.JWTLocationHeader) {
-	if s == nil {
-		return
-	}
-	t.Name = s.Name
-	t.ValuePrefix = s.ValuePrefix
-	t.Forward = s.Forward
-}
-func JWTLocationHeaderFromStructs(t *structs.JWTLocationHeader, s *JWTLocationHeader) {
-	if s == nil {
-		return
-	}
-	s.Name = t.Name
-	s.ValuePrefix = t.ValuePrefix
-	s.Forward = t.Forward
-}
-func JWTLocationQueryParamToStructs(s *JWTLocationQueryParam, t *structs.JWTLocationQueryParam) {
-	if s == nil {
-		return
-	}
-	t.Name = s.Name
-}
-func JWTLocationQueryParamFromStructs(t *structs.JWTLocationQueryParam, s *JWTLocationQueryParam) {
-	if s == nil {
-		return
-	}
-	s.Name = t.Name
-}
-func JWTProviderToStructs(s *JWTProvider, t *structs.JWTProviderConfigEntry) {
-	if s == nil {
-		return
-	}
-	if s.JSONWebKeySet != nil {
-		var x structs.JSONWebKeySet
-		JSONWebKeySetToStructs(s.JSONWebKeySet, &x)
-		t.JSONWebKeySet = &x
-	}
-	t.Issuer = s.Issuer
-	t.Audiences = s.Audiences
-	{
-		t.Locations = make([]*structs.JWTLocation, len(s.Locations))
-		for i := range s.Locations {
-			if s.Locations[i] != nil {
-				var x structs.JWTLocation
-				JWTLocationToStructs(s.Locations[i], &x)
-				t.Locations[i] = &x
-			}
-		}
-	}
-	if s.Forwarding != nil {
-		var x structs.JWTForwardingConfig
-		JWTForwardingConfigToStructs(s.Forwarding, &x)
-		t.Forwarding = &x
-	}
-	t.ClockSkewSeconds = int(s.ClockSkewSeconds)
-	if s.CacheConfig != nil {
-		var x structs.JWTCacheConfig
-		JWTCacheConfigToStructs(s.CacheConfig, &x)
-		t.CacheConfig = &x
-	}
-	t.Meta = s.Meta
-}
-func JWTProviderFromStructs(t *structs.JWTProviderConfigEntry, s *JWTProvider) {
-	if s == nil {
-		return
-	}
-	if t.JSONWebKeySet != nil {
-		var x JSONWebKeySet
-		JSONWebKeySetFromStructs(t.JSONWebKeySet, &x)
-		s.JSONWebKeySet = &x
-	}
-	s.Issuer = t.Issuer
-	s.Audiences = t.Audiences
-	{
-		s.Locations = make([]*JWTLocation, len(t.Locations))
-		for i := range t.Locations {
-			if t.Locations[i] != nil {
-				var x JWTLocation
-				JWTLocationFromStructs(t.Locations[i], &x)
-				s.Locations[i] = &x
-			}
-		}
-	}
-	if t.Forwarding != nil {
-		var x JWTForwardingConfig
-		JWTForwardingConfigFromStructs(t.Forwarding, &x)
-		s.Forwarding = &x
-	}
-	s.ClockSkewSeconds = int32(t.ClockSkewSeconds)
-	if t.CacheConfig != nil {
-		var x JWTCacheConfig
-		JWTCacheConfigFromStructs(t.CacheConfig, &x)
-		s.CacheConfig = &x
-	}
-	s.Meta = t.Meta
-}
-func LeastRequestConfigToStructs(s *LeastRequestConfig, t *structs.LeastRequestConfig) {
-	if s == nil {
-		return
-	}
-	t.ChoiceCount = s.ChoiceCount
-}
-func LeastRequestConfigFromStructs(t *structs.LeastRequestConfig, s *LeastRequestConfig) {
-	if s == nil {
-		return
-	}
-	s.ChoiceCount = t.ChoiceCount
-}
-func LoadBalancerToStructs(s *LoadBalancer, t *structs.LoadBalancer) {
-	if s == nil {
-		return
-	}
-	t.Policy = s.Policy
-	if s.RingHashConfig != nil {
-		var x structs.RingHashConfig
-		RingHashConfigToStructs(s.RingHashConfig, &x)
-		t.RingHashConfig = &x
-	}
-	if s.LeastRequestConfig != nil {
-		var x structs.LeastRequestConfig
-		LeastRequestConfigToStructs(s.LeastRequestConfig, &x)
-		t.LeastRequestConfig = &x
-	}
-	{
-		t.HashPolicies = make([]structs.HashPolicy, len(s.HashPolicies))
-		for i := range s.HashPolicies {
-			if s.HashPolicies[i] != nil {
-				HashPolicyToStructs(s.HashPolicies[i], &t.HashPolicies[i])
-			}
-		}
-	}
-}
-func LoadBalancerFromStructs(t *structs.LoadBalancer, s *LoadBalancer) {
-	if s == nil {
-		return
-	}
-	s.Policy = t.Policy
-	if t.RingHashConfig != nil {
-		var x RingHashConfig
-		RingHashConfigFromStructs(t.RingHashConfig, &x)
-		s.RingHashConfig = &x
-	}
-	if t.LeastRequestConfig != nil {
-		var x LeastRequestConfig
-		LeastRequestConfigFromStructs(t.LeastRequestConfig, &x)
-		s.LeastRequestConfig = &x
-	}
-	{
-		s.HashPolicies = make([]*HashPolicy, len(t.HashPolicies))
-		for i := range t.HashPolicies {
-			{
-				var x HashPolicy
-				HashPolicyFromStructs(&t.HashPolicies[i], &x)
-				s.HashPolicies[i] = &x
-			}
-		}
-	}
-}
-func LocalJWKSToStructs(s *LocalJWKS, t *structs.LocalJWKS) {
-	if s == nil {
-		return
-	}
-	t.JWKS = s.JWKS
-	t.Filename = s.Filename
-}
-func LocalJWKSFromStructs(t *structs.LocalJWKS, s *LocalJWKS) {
-	if s == nil {
-		return
-	}
-	s.JWKS = t.JWKS
-	s.Filename = t.Filename
-}
-func MeshConfigToStructs(s *MeshConfig, t *structs.MeshConfigEntry) {
-	if s == nil {
-		return
-	}
-	if s.TransparentProxy != nil {
-		TransparentProxyMeshConfigToStructs(s.TransparentProxy, &t.TransparentProxy)
-	}
-	t.AllowEnablingPermissiveMutualTLS = s.AllowEnablingPermissiveMutualTLS
-	if s.TLS != nil {
-		var x structs.MeshTLSConfig
-		MeshTLSConfigToStructs(s.TLS, &x)
-		t.TLS = &x
-	}
-	if s.HTTP != nil {
-		var x structs.MeshHTTPConfig
-		MeshHTTPConfigToStructs(s.HTTP, &x)
-		t.HTTP = &x
-	}
-	if s.Peering != nil {
-		var x structs.PeeringMeshConfig
-		PeeringMeshConfigToStructs(s.Peering, &x)
-		t.Peering = &x
-	}
-	t.Meta = s.Meta
-}
-func MeshConfigFromStructs(t *structs.MeshConfigEntry, s *MeshConfig) {
-	if s == nil {
-		return
-	}
-	{
-		var x TransparentProxyMeshConfig
-		TransparentProxyMeshConfigFromStructs(&t.TransparentProxy, &x)
-		s.TransparentProxy = &x
-	}
-	s.AllowEnablingPermissiveMutualTLS = t.AllowEnablingPermissiveMutualTLS
-	if t.TLS != nil {
-		var x MeshTLSConfig
-		MeshTLSConfigFromStructs(t.TLS, &x)
-		s.TLS = &x
-	}
-	if t.HTTP != nil {
-		var x MeshHTTPConfig
-		MeshHTTPConfigFromStructs(t.HTTP, &x)
-		s.HTTP = &x
-	}
-	if t.Peering != nil {
-		var x PeeringMeshConfig
-		PeeringMeshConfigFromStructs(t.Peering, &x)
-		s.Peering = &x
-	}
-	s.Meta = t.Meta
-}
-func MeshDirectionalTLSConfigToStructs(s *MeshDirectionalTLSConfig, t *structs.MeshDirectionalTLSConfig) {
-	if s == nil {
-		return
-	}
-	t.TLSMinVersion = tlsVersionToStructs(s.TLSMinVersion)
-	t.TLSMaxVersion = tlsVersionToStructs(s.TLSMaxVersion)
-	t.CipherSuites = cipherSuitesToStructs(s.CipherSuites)
-}
-func MeshDirectionalTLSConfigFromStructs(t *structs.MeshDirectionalTLSConfig, s *MeshDirectionalTLSConfig) {
-	if s == nil {
-		return
-	}
-	s.TLSMinVersion = tlsVersionFromStructs(t.TLSMinVersion)
-	s.TLSMaxVersion = tlsVersionFromStructs(t.TLSMaxVersion)
-	s.CipherSuites = cipherSuitesFromStructs(t.CipherSuites)
-}
-func MeshGatewayConfigToStructs(s *MeshGatewayConfig, t *structs.MeshGatewayConfig) {
-	if s == nil {
-		return
-	}
-	t.Mode = meshGatewayModeToStructs(s.Mode)
-}
-func MeshGatewayConfigFromStructs(t *structs.MeshGatewayConfig, s *MeshGatewayConfig) {
-	if s == nil {
-		return
-	}
-	s.Mode = meshGatewayModeFromStructs(t.Mode)
-}
-func MeshHTTPConfigToStructs(s *MeshHTTPConfig, t *structs.MeshHTTPConfig) {
-	if s == nil {
-		return
-	}
-	t.SanitizeXForwardedClientCert = s.SanitizeXForwardedClientCert
-}
-func MeshHTTPConfigFromStructs(t *structs.MeshHTTPConfig, s *MeshHTTPConfig) {
-	if s == nil {
-		return
-	}
-	s.SanitizeXForwardedClientCert = t.SanitizeXForwardedClientCert
-}
-func MeshTLSConfigToStructs(s *MeshTLSConfig, t *structs.MeshTLSConfig) {
-	if s == nil {
-		return
-	}
-	if s.Incoming != nil {
-		var x structs.MeshDirectionalTLSConfig
-		MeshDirectionalTLSConfigToStructs(s.Incoming, &x)
-		t.Incoming = &x
-	}
-	if s.Outgoing != nil {
-		var x structs.MeshDirectionalTLSConfig
-		MeshDirectionalTLSConfigToStructs(s.Outgoing, &x)
-		t.Outgoing = &x
-	}
-}
-func MeshTLSConfigFromStructs(t *structs.MeshTLSConfig, s *MeshTLSConfig) {
-	if s == nil {
-		return
-	}
-	if t.Incoming != nil {
-		var x MeshDirectionalTLSConfig
-		MeshDirectionalTLSConfigFromStructs(t.Incoming, &x)
-		s.Incoming = &x
-	}
-	if t.Outgoing != nil {
-		var x MeshDirectionalTLSConfig
-		MeshDirectionalTLSConfigFromStructs(t.Outgoing, &x)
-		s.Outgoing = &x
-	}
-}
-func PassiveHealthCheckToStructs(s *PassiveHealthCheck, t *structs.PassiveHealthCheck) {
-	if s == nil {
-		return
-	}
-	t.Interval = structs.DurationFromProto(s.Interval)
-	t.MaxFailures = s.MaxFailures
-	t.EnforcingConsecutive5xx = pointerToUint32FromUint32(s.EnforcingConsecutive5Xx)
-	t.MaxEjectionPercent = pointerToUint32FromUint32(s.MaxEjectionPercent)
-	t.BaseEjectionTime = structs.DurationPointerFromProto(s.BaseEjectionTime)
-}
-func PassiveHealthCheckFromStructs(t *structs.PassiveHealthCheck, s *PassiveHealthCheck) {
-	if s == nil {
-		return
-	}
-	s.Interval = structs.DurationToProto(t.Interval)
-	s.MaxFailures = t.MaxFailures
-	s.EnforcingConsecutive5Xx = uint32FromPointerToUint32(t.EnforcingConsecutive5xx)
-	s.MaxEjectionPercent = uint32FromPointerToUint32(t.MaxEjectionPercent)
-	s.BaseEjectionTime = structs.DurationPointerToProto(t.BaseEjectionTime)
-}
-func PeeringMeshConfigToStructs(s *PeeringMeshConfig, t *structs.PeeringMeshConfig) {
-	if s == nil {
-		return
-	}
-	t.PeerThroughMeshGateways = s.PeerThroughMeshGateways
-}
-func PeeringMeshConfigFromStructs(t *structs.PeeringMeshConfig, s *PeeringMeshConfig) {
-	if s == nil {
-		return
-	}
-	s.PeerThroughMeshGateways = t.PeerThroughMeshGateways
-}
-func RateLimitsToStructs(s *RateLimits, t *structs.RateLimits) {
-	if s == nil {
-		return
-	}
-	if s.InstanceLevel != nil {
-		InstanceLevelRateLimitsToStructs(s.InstanceLevel, &t.InstanceLevel)
-	}
-}
-func RateLimitsFromStructs(t *structs.RateLimits, s *RateLimits) {
-	if s == nil {
-		return
-	}
-	{
-		var x InstanceLevelRateLimits
-		InstanceLevelRateLimitsFromStructs(&t.InstanceLevel, &x)
-		s.InstanceLevel = &x
-	}
-}
-func RemoteJWKSToStructs(s *RemoteJWKS, t *structs.RemoteJWKS) {
-	if s == nil {
-		return
-	}
-	t.URI = s.URI
-	t.RequestTimeoutMs = int(s.RequestTimeoutMs)
-	t.CacheDuration = structs.DurationFromProto(s.CacheDuration)
-	t.FetchAsynchronously = s.FetchAsynchronously
-	if s.RetryPolicy != nil {
-		var x structs.JWKSRetryPolicy
-		JWKSRetryPolicyToStructs(s.RetryPolicy, &x)
-		t.RetryPolicy = &x
-	}
-	if s.JWKSCluster != nil {
-		var x structs.JWKSCluster
-		JWKSClusterToStructs(s.JWKSCluster, &x)
-		t.JWKSCluster = &x
-	}
-}
-func RemoteJWKSFromStructs(t *structs.RemoteJWKS, s *RemoteJWKS) {
-	if s == nil {
-		return
-	}
-	s.URI = t.URI
-	s.RequestTimeoutMs = int32(t.RequestTimeoutMs)
-	s.CacheDuration = structs.DurationToProto(t.CacheDuration)
-	s.FetchAsynchronously = t.FetchAsynchronously
-	if t.RetryPolicy != nil {
-		var x JWKSRetryPolicy
-		JWKSRetryPolicyFromStructs(t.RetryPolicy, &x)
-		s.RetryPolicy = &x
-	}
-	if t.JWKSCluster != nil {
-		var x JWKSCluster
-		JWKSClusterFromStructs(t.JWKSCluster, &x)
-		s.JWKSCluster = &x
-	}
-}
-func ResourceReferenceToStructs(s *ResourceReference, t *structs.ResourceReference) {
-	if s == nil {
-		return
-	}
-	t.Kind = s.Kind
-	t.Name = s.Name
-	t.SectionName = s.SectionName
-	t.EnterpriseMeta = enterpriseMetaToStructs(s.EnterpriseMeta)
-}
-func ResourceReferenceFromStructs(t *structs.ResourceReference, s *ResourceReference) {
-	if s == nil {
-		return
-	}
-	s.Kind = t.Kind
-	s.Name = t.Name
-	s.SectionName = t.SectionName
-	s.EnterpriseMeta = enterpriseMetaFromStructs(t.EnterpriseMeta)
-}
-func RetryFilterToStructs(s *RetryFilter, t *structs.RetryFilter) {
-	if s == nil {
-		return
-	}
-	t.NumRetries = &s.NumRetries
-	t.RetryOn = s.RetryOn
-	t.RetryOnStatusCodes = s.RetryOnStatusCodes
-	t.RetryOnConnectFailure = &s.RetryOnConnectFailure
-}
-func RetryFilterFromStructs(t *structs.RetryFilter, s *RetryFilter) {
-	if s == nil {
-		return
-	}
-	s.NumRetries = *t.NumRetries
-	s.RetryOn = t.RetryOn
-	s.RetryOnStatusCodes = t.RetryOnStatusCodes
-	s.RetryOnConnectFailure = *t.RetryOnConnectFailure
-}
-func RetryPolicyBackOffToStructs(s *RetryPolicyBackOff, t *structs.RetryPolicyBackOff) {
-	if s == nil {
-		return
-	}
-	t.BaseInterval = structs.DurationFromProto(s.BaseInterval)
-	t.MaxInterval = structs.DurationFromProto(s.MaxInterval)
-}
-func RetryPolicyBackOffFromStructs(t *structs.RetryPolicyBackOff, s *RetryPolicyBackOff) {
-	if s == nil {
-		return
-	}
-	s.BaseInterval = structs.DurationToProto(t.BaseInterval)
-	s.MaxInterval = structs.DurationToProto(t.MaxInterval)
-}
-func RingHashConfigToStructs(s *RingHashConfig, t *structs.RingHashConfig) {
-	if s == nil {
-		return
-	}
-	t.MinimumRingSize = s.MinimumRingSize
-	t.MaximumRingSize = s.MaximumRingSize
-}
-func RingHashConfigFromStructs(t *structs.RingHashConfig, s *RingHashConfig) {
-	if s == nil {
-		return
-	}
-	s.MinimumRingSize = t.MinimumRingSize
-	s.MaximumRingSize = t.MaximumRingSize
-}
-func SamenessGroupToStructs(s *SamenessGroup, t *structs.SamenessGroupConfigEntry) {
-	if s == nil {
-		return
-	}
-	t.Name = s.Name
-	t.DefaultForFailover = s.DefaultForFailover
-	t.IncludeLocal = s.IncludeLocal
-	{
-		t.Members = make([]structs.SamenessGroupMember, len(s.Members))
-		for i := range s.Members {
-			if s.Members[i] != nil {
-				SamenessGroupMemberToStructs(s.Members[i], &t.Members[i])
-			}
-		}
-	}
-	t.Meta = s.Meta
-	t.EnterpriseMeta = enterpriseMetaToStructs(s.EnterpriseMeta)
-}
-func SamenessGroupFromStructs(t *structs.SamenessGroupConfigEntry, s *SamenessGroup) {
-	if s == nil {
-		return
-	}
-	s.Name = t.Name
-	s.DefaultForFailover = t.DefaultForFailover
-	s.IncludeLocal = t.IncludeLocal
-	{
-		s.Members = make([]*SamenessGroupMember, len(t.Members))
-		for i := range t.Members {
-			{
-				var x SamenessGroupMember
-				SamenessGroupMemberFromStructs(&t.Members[i], &x)
-				s.Members[i] = &x
-			}
-		}
-	}
-	s.Meta = t.Meta
-	s.EnterpriseMeta = enterpriseMetaFromStructs(t.EnterpriseMeta)
-}
-func SamenessGroupMemberToStructs(s *SamenessGroupMember, t *structs.SamenessGroupMember) {
-	if s == nil {
-		return
-	}
-	t.Partition = s.Partition
-	t.Peer = s.Peer
-}
-func SamenessGroupMemberFromStructs(t *structs.SamenessGroupMember, s *SamenessGroupMember) {
-	if s == nil {
-		return
-	}
-	s.Partition = t.Partition
-	s.Peer = t.Peer
-}
-func ServiceDefaultsToStructs(s *ServiceDefaults, t *structs.ServiceConfigEntry) {
-	if s == nil {
-		return
-	}
-	t.Protocol = s.Protocol
-	t.Mode = proxyModeToStructs(s.Mode)
-	if s.TransparentProxy != nil {
-		TransparentProxyConfigToStructs(s.TransparentProxy, &t.TransparentProxy)
-	}
-	t.MutualTLSMode = mutualTLSModeToStructs(s.MutualTLSMode)
-	if s.MeshGateway != nil {
-		MeshGatewayConfigToStructs(s.MeshGateway, &t.MeshGateway)
-	}
-	if s.Expose != nil {
-		ExposeConfigToStructs(s.Expose, &t.Expose)
-	}
-	t.ExternalSNI = s.ExternalSNI
-	if s.UpstreamConfig != nil {
-		var x structs.UpstreamConfiguration
-		UpstreamConfigurationToStructs(s.UpstreamConfig, &x)
-		t.UpstreamConfig = &x
-	}
-	if s.Destination != nil {
-		var x structs.DestinationConfig
-		DestinationConfigToStructs(s.Destination, &x)
-		t.Destination = &x
-	}
-	t.MaxInboundConnections = int(s.MaxInboundConnections)
-	t.LocalConnectTimeoutMs = int(s.LocalConnectTimeoutMs)
-	t.LocalRequestTimeoutMs = int(s.LocalRequestTimeoutMs)
-	t.BalanceInboundConnections = s.BalanceInboundConnections
-	if s.RateLimits != nil {
-		var x structs.RateLimits
-		RateLimitsToStructs(s.RateLimits, &x)
-		t.RateLimits = &x
-	}
-	t.EnvoyExtensions = EnvoyExtensionsToStructs(s.EnvoyExtensions)
-	t.Meta = s.Meta
-}
-func ServiceDefaultsFromStructs(t *structs.ServiceConfigEntry, s *ServiceDefaults) {
-	if s == nil {
-		return
-	}
-	s.Protocol = t.Protocol
-	s.Mode = proxyModeFromStructs(t.Mode)
-	{
-		var x TransparentProxyConfig
-		TransparentProxyConfigFromStructs(&t.TransparentProxy, &x)
-		s.TransparentProxy = &x
-	}
-	s.MutualTLSMode = mutualTLSModeFromStructs(t.MutualTLSMode)
-	{
-		var x MeshGatewayConfig
-		MeshGatewayConfigFromStructs(&t.MeshGateway, &x)
-		s.MeshGateway = &x
-	}
-	{
-		var x ExposeConfig
-		ExposeConfigFromStructs(&t.Expose, &x)
-		s.Expose = &x
-	}
-	s.ExternalSNI = t.ExternalSNI
-	if t.UpstreamConfig != nil {
-		var x UpstreamConfiguration
-		UpstreamConfigurationFromStructs(t.UpstreamConfig, &x)
-		s.UpstreamConfig = &x
-	}
-	if t.Destination != nil {
-		var x DestinationConfig
-		DestinationConfigFromStructs(t.Destination, &x)
-		s.Destination = &x
-	}
-	s.MaxInboundConnections = int32(t.MaxInboundConnections)
-	s.LocalConnectTimeoutMs = int32(t.LocalConnectTimeoutMs)
-	s.LocalRequestTimeoutMs = int32(t.LocalRequestTimeoutMs)
-	s.BalanceInboundConnections = t.BalanceInboundConnections
-	if t.RateLimits != nil {
-		var x RateLimits
-		RateLimitsFromStructs(t.RateLimits, &x)
-		s.RateLimits = &x
-	}
-	s.EnvoyExtensions = EnvoyExtensionsFromStructs(t.EnvoyExtensions)
-	s.Meta = t.Meta
-}
-func ServiceIntentionsToStructs(s *ServiceIntentions, t *structs.ServiceIntentionsConfigEntry) {
-	if s == nil {
-		return
-	}
-	{
-		t.Sources = make([]*structs.SourceIntention, len(s.Sources))
-		for i := range s.Sources {
-			if s.Sources[i] != nil {
-				var x structs.SourceIntention
-				SourceIntentionToStructs(s.Sources[i], &x)
-				t.Sources[i] = &x
-			}
-		}
-	}
-	if s.JWT != nil {
-		var x structs.IntentionJWTRequirement
-		IntentionJWTRequirementToStructs(s.JWT, &x)
-		t.JWT = &x
-	}
-	t.Meta = s.Meta
-}
-func ServiceIntentionsFromStructs(t *structs.ServiceIntentionsConfigEntry, s *ServiceIntentions) {
-	if s == nil {
-		return
-	}
-	{
-		s.Sources = make([]*SourceIntention, len(t.Sources))
-		for i := range t.Sources {
-			if t.Sources[i] != nil {
-				var x SourceIntention
-				SourceIntentionFromStructs(t.Sources[i], &x)
-				s.Sources[i] = &x
-			}
-		}
-	}
-	if t.JWT != nil {
-		var x IntentionJWTRequirement
-		IntentionJWTRequirementFromStructs(t.JWT, &x)
-		s.JWT = &x
-	}
-	s.Meta = t.Meta
-}
-func ServiceResolverToStructs(s *ServiceResolver, t *structs.ServiceResolverConfigEntry) {
-	if s == nil {
-		return
-	}
-	t.DefaultSubset = s.DefaultSubset
-	{
-		t.Subsets = make(map[string]structs.ServiceResolverSubset, len(s.Subsets))
-		for k, v := range s.Subsets {
-			var y structs.ServiceResolverSubset
-			if v != nil {
-				ServiceResolverSubsetToStructs(v, &y)
-			}
-			t.Subsets[k] = y
-		}
-	}
-	if s.Redirect != nil {
-		var x structs.ServiceResolverRedirect
-		ServiceResolverRedirectToStructs(s.Redirect, &x)
-		t.Redirect = &x
-	}
-	{
-		t.Failover = make(map[string]structs.ServiceResolverFailover, len(s.Failover))
-		for k, v := range s.Failover {
-			var y structs.ServiceResolverFailover
-			if v != nil {
-				ServiceResolverFailoverToStructs(v, &y)
-			}
-			t.Failover[k] = y
-		}
-	}
-	if s.PrioritizeByLocality != nil {
-		var x structs.ServiceResolverPrioritizeByLocality
-		ServiceResolverPrioritizeByLocalityToStructs(s.PrioritizeByLocality, &x)
-		t.PrioritizeByLocality = &x
-	}
-	t.ConnectTimeout = structs.DurationFromProto(s.ConnectTimeout)
-	t.RequestTimeout = structs.DurationFromProto(s.RequestTimeout)
-	if s.LoadBalancer != nil {
-		var x structs.LoadBalancer
-		LoadBalancerToStructs(s.LoadBalancer, &x)
-		t.LoadBalancer = &x
-	}
-	t.Meta = s.Meta
-}
-func ServiceResolverFromStructs(t *structs.ServiceResolverConfigEntry, s *ServiceResolver) {
-	if s == nil {
-		return
-	}
-	s.DefaultSubset = t.DefaultSubset
-	{
-		s.Subsets = make(map[string]*ServiceResolverSubset, len(t.Subsets))
-		for k, v := range t.Subsets {
-			var y *ServiceResolverSubset
-			{
-				var x ServiceResolverSubset
-				ServiceResolverSubsetFromStructs(&v, &x)
-				y = &x
-			}
-			s.Subsets[k] = y
-		}
-	}
-	if t.Redirect != nil {
-		var x ServiceResolverRedirect
-		ServiceResolverRedirectFromStructs(t.Redirect, &x)
-		s.Redirect = &x
-	}
-	{
-		s.Failover = make(map[string]*ServiceResolverFailover, len(t.Failover))
-		for k, v := range t.Failover {
-			var y *ServiceResolverFailover
-			{
-				var x ServiceResolverFailover
-				ServiceResolverFailoverFromStructs(&v, &x)
-				y = &x
-			}
-			s.Failover[k] = y
-		}
-	}
-	if t.PrioritizeByLocality != nil {
-		var x ServiceResolverPrioritizeByLocality
-		ServiceResolverPrioritizeByLocalityFromStructs(t.PrioritizeByLocality, &x)
-		s.PrioritizeByLocality = &x
-	}
-	s.ConnectTimeout = structs.DurationToProto(t.ConnectTimeout)
-	s.RequestTimeout = structs.DurationToProto(t.RequestTimeout)
-	if t.LoadBalancer != nil {
-		var x LoadBalancer
-		LoadBalancerFromStructs(t.LoadBalancer, &x)
-		s.LoadBalancer = &x
-	}
-	s.Meta = t.Meta
-}
-func ServiceResolverFailoverToStructs(s *ServiceResolverFailover, t *structs.ServiceResolverFailover) {
-	if s == nil {
-		return
-	}
-	t.Service = s.Service
-	t.ServiceSubset = s.ServiceSubset
-	t.Namespace = s.Namespace
-	t.Datacenters = s.Datacenters
-	{
-		t.Targets = make([]structs.ServiceResolverFailoverTarget, len(s.Targets))
-		for i := range s.Targets {
-			if s.Targets[i] != nil {
-				ServiceResolverFailoverTargetToStructs(s.Targets[i], &t.Targets[i])
-			}
-		}
-	}
-	if s.Policy != nil {
-		var x structs.ServiceResolverFailoverPolicy
-		ServiceResolverFailoverPolicyToStructs(s.Policy, &x)
-		t.Policy = &x
-	}
-	t.SamenessGroup = s.SamenessGroup
-}
-func ServiceResolverFailoverFromStructs(t *structs.ServiceResolverFailover, s *ServiceResolverFailover) {
-	if s == nil {
-		return
-	}
-	s.Service = t.Service
-	s.ServiceSubset = t.ServiceSubset
-	s.Namespace = t.Namespace
-	s.Datacenters = t.Datacenters
-	{
-		s.Targets = make([]*ServiceResolverFailoverTarget, len(t.Targets))
-		for i := range t.Targets {
-			{
-				var x ServiceResolverFailoverTarget
-				ServiceResolverFailoverTargetFromStructs(&t.Targets[i], &x)
-				s.Targets[i] = &x
-			}
-		}
-	}
-	if t.Policy != nil {
-		var x ServiceResolverFailoverPolicy
-		ServiceResolverFailoverPolicyFromStructs(t.Policy, &x)
-		s.Policy = &x
-	}
-	s.SamenessGroup = t.SamenessGroup
-}
-func ServiceResolverFailoverPolicyToStructs(s *ServiceResolverFailoverPolicy, t *structs.ServiceResolverFailoverPolicy) {
-	if s == nil {
-		return
-	}
-	t.Mode = s.Mode
-	t.Regions = s.Regions
-}
-func ServiceResolverFailoverPolicyFromStructs(t *structs.ServiceResolverFailoverPolicy, s *ServiceResolverFailoverPolicy) {
-	if s == nil {
-		return
-	}
-	s.Mode = t.Mode
-	s.Regions = t.Regions
-}
-func ServiceResolverFailoverTargetToStructs(s *ServiceResolverFailoverTarget, t *structs.ServiceResolverFailoverTarget) {
-	if s == nil {
-		return
-	}
-	t.Service = s.Service
-	t.ServiceSubset = s.ServiceSubset
-	t.Partition = s.Partition
-	t.Namespace = s.Namespace
-	t.Datacenter = s.Datacenter
-	t.Peer = s.Peer
-}
-func ServiceResolverFailoverTargetFromStructs(t *structs.ServiceResolverFailoverTarget, s *ServiceResolverFailoverTarget) {
-	if s == nil {
-		return
-	}
-	s.Service = t.Service
-	s.ServiceSubset = t.ServiceSubset
-	s.Partition = t.Partition
-	s.Namespace = t.Namespace
-	s.Datacenter = t.Datacenter
-	s.Peer = t.Peer
-}
-func ServiceResolverPrioritizeByLocalityToStructs(s *ServiceResolverPrioritizeByLocality, t *structs.ServiceResolverPrioritizeByLocality) {
-	if s == nil {
-		return
-	}
-	t.Mode = s.Mode
-}
-func ServiceResolverPrioritizeByLocalityFromStructs(t *structs.ServiceResolverPrioritizeByLocality, s *ServiceResolverPrioritizeByLocality) {
-	if s == nil {
-		return
-	}
-	s.Mode = t.Mode
-}
-func ServiceResolverRedirectToStructs(s *ServiceResolverRedirect, t *structs.ServiceResolverRedirect) {
-	if s == nil {
-		return
-	}
-	t.Service = s.Service
-	t.ServiceSubset = s.ServiceSubset
-	t.Namespace = s.Namespace
-	t.Partition = s.Partition
-	t.Datacenter = s.Datacenter
-	t.Peer = s.Peer
-	t.SamenessGroup = s.SamenessGroup
-}
-func ServiceResolverRedirectFromStructs(t *structs.ServiceResolverRedirect, s *ServiceResolverRedirect) {
-	if s == nil {
-		return
-	}
-	s.Service = t.Service
-	s.ServiceSubset = t.ServiceSubset
-	s.Namespace = t.Namespace
-	s.Partition = t.Partition
-	s.Datacenter = t.Datacenter
-	s.Peer = t.Peer
-	s.SamenessGroup = t.SamenessGroup
-}
-func ServiceResolverSubsetToStructs(s *ServiceResolverSubset, t *structs.ServiceResolverSubset) {
-	if s == nil {
-		return
-	}
-	t.Filter = s.Filter
-	t.OnlyPassing = s.OnlyPassing
-}
-func ServiceResolverSubsetFromStructs(t *structs.ServiceResolverSubset, s *ServiceResolverSubset) {
-	if s == nil {
-		return
-	}
-	s.Filter = t.Filter
-	s.OnlyPassing = t.OnlyPassing
-}
-func SourceIntentionToStructs(s *SourceIntention, t *structs.SourceIntention) {
-	if s == nil {
-		return
-	}
-	t.Name = s.Name
-	t.Action = intentionActionToStructs(s.Action)
-	{
-		t.Permissions = make([]*structs.IntentionPermission, len(s.Permissions))
-		for i := range s.Permissions {
-			if s.Permissions[i] != nil {
-				var x structs.IntentionPermission
-				IntentionPermissionToStructs(s.Permissions[i], &x)
-				t.Permissions[i] = &x
-			}
-		}
-	}
-	t.Precedence = int(s.Precedence)
-	t.LegacyID = s.LegacyID
-	t.Type = intentionSourceTypeToStructs(s.Type)
-	t.Description = s.Description
-	t.LegacyMeta = s.LegacyMeta
-	t.LegacyCreateTime = timeToStructs(s.LegacyCreateTime)
-	t.LegacyUpdateTime = timeToStructs(s.LegacyUpdateTime)
-	t.EnterpriseMeta = enterpriseMetaToStructs(s.EnterpriseMeta)
-	t.Peer = s.Peer
-	t.SamenessGroup = s.SamenessGroup
-}
-func SourceIntentionFromStructs(t *structs.SourceIntention, s *SourceIntention) {
-	if s == nil {
-		return
-	}
-	s.Name = t.Name
-	s.Action = intentionActionFromStructs(t.Action)
-	{
-		s.Permissions = make([]*IntentionPermission, len(t.Permissions))
-		for i := range t.Permissions {
-			if t.Permissions[i] != nil {
-				var x IntentionPermission
-				IntentionPermissionFromStructs(t.Permissions[i], &x)
-				s.Permissions[i] = &x
-			}
-		}
-	}
-	s.Precedence = int32(t.Precedence)
-	s.LegacyID = t.LegacyID
-	s.Type = intentionSourceTypeFromStructs(t.Type)
-	s.Description = t.Description
-	s.LegacyMeta = t.LegacyMeta
-	s.LegacyCreateTime = timeFromStructs(t.LegacyCreateTime)
-	s.LegacyUpdateTime = timeFromStructs(t.LegacyUpdateTime)
-	s.EnterpriseMeta = enterpriseMetaFromStructs(t.EnterpriseMeta)
-	s.Peer = t.Peer
-	s.SamenessGroup = t.SamenessGroup
-}
-func StatusToStructs(s *Status, t *structs.Status) {
-	if s == nil {
-		return
-	}
-	{
-		t.Conditions = make([]structs.Condition, len(s.Conditions))
-		for i := range s.Conditions {
-			if s.Conditions[i] != nil {
-				ConditionToStructs(s.Conditions[i], &t.Conditions[i])
-			}
-		}
-	}
-}
-func StatusFromStructs(t *structs.Status, s *Status) {
-	if s == nil {
-		return
-	}
-	{
-		s.Conditions = make([]*Condition, len(t.Conditions))
-		for i := range t.Conditions {
-			{
-				var x Condition
-				ConditionFromStructs(&t.Conditions[i], &x)
-				s.Conditions[i] = &x
-			}
-		}
-	}
-}
-func TCPRouteToStructs(s *TCPRoute, t *structs.TCPRouteConfigEntry) {
-	if s == nil {
-		return
-	}
-	{
-		t.Parents = make([]structs.ResourceReference, len(s.Parents))
-		for i := range s.Parents {
-			if s.Parents[i] != nil {
-				ResourceReferenceToStructs(s.Parents[i], &t.Parents[i])
-			}
-		}
-	}
-	{
-		t.Services = make([]structs.TCPService, len(s.Services))
-		for i := range s.Services {
-			if s.Services[i] != nil {
-				TCPServiceToStructs(s.Services[i], &t.Services[i])
-			}
-		}
-	}
-	t.Meta = s.Meta
-	if s.Status != nil {
-		StatusToStructs(s.Status, &t.Status)
-	}
-}
-func TCPRouteFromStructs(t *structs.TCPRouteConfigEntry, s *TCPRoute) {
-	if s == nil {
-		return
-	}
-	{
-		s.Parents = make([]*ResourceReference, len(t.Parents))
-		for i := range t.Parents {
-			{
-				var x ResourceReference
-				ResourceReferenceFromStructs(&t.Parents[i], &x)
-				s.Parents[i] = &x
-			}
-		}
-	}
-	{
-		s.Services = make([]*TCPService, len(t.Services))
-		for i := range t.Services {
-			{
-				var x TCPService
-				TCPServiceFromStructs(&t.Services[i], &x)
-				s.Services[i] = &x
-			}
-		}
-	}
-	s.Meta = t.Meta
-	{
-		var x Status
-		StatusFromStructs(&t.Status, &x)
-		s.Status = &x
-	}
-}
-func TCPServiceToStructs(s *TCPService, t *structs.TCPService) {
-	if s == nil {
-		return
-	}
-	t.Name = s.Name
-	t.EnterpriseMeta = enterpriseMetaToStructs(s.EnterpriseMeta)
-}
-func TCPServiceFromStructs(t *structs.TCPService, s *TCPService) {
-	if s == nil {
-		return
-	}
-	s.Name = t.Name
-	s.EnterpriseMeta = enterpriseMetaFromStructs(t.EnterpriseMeta)
-}
-func TimeoutFilterToStructs(s *TimeoutFilter, t *structs.TimeoutFilter) {
-	if s == nil {
-		return
-	}
-	t.RequestTimeout = structs.DurationFromProto(s.RequestTimeout)
-	t.IdleTimeout = structs.DurationFromProto(s.IdleTimeout)
-}
-func TimeoutFilterFromStructs(t *structs.TimeoutFilter, s *TimeoutFilter) {
-	if s == nil {
-		return
-	}
-	s.RequestTimeout = structs.DurationToProto(t.RequestTimeout)
-	s.IdleTimeout = structs.DurationToProto(t.IdleTimeout)
-}
-func TransparentProxyConfigToStructs(s *TransparentProxyConfig, t *structs.TransparentProxyConfig) {
-	if s == nil {
-		return
-	}
-	t.OutboundListenerPort = int(s.OutboundListenerPort)
-	t.DialedDirectly = s.DialedDirectly
-}
-func TransparentProxyConfigFromStructs(t *structs.TransparentProxyConfig, s *TransparentProxyConfig) {
-	if s == nil {
-		return
-	}
-	s.OutboundListenerPort = int32(t.OutboundListenerPort)
-	s.DialedDirectly = t.DialedDirectly
-}
-func TransparentProxyMeshConfigToStructs(s *TransparentProxyMeshConfig, t *structs.TransparentProxyMeshConfig) {
-	if s == nil {
-		return
-	}
-	t.MeshDestinationsOnly = s.MeshDestinationsOnly
-}
-func TransparentProxyMeshConfigFromStructs(t *structs.TransparentProxyMeshConfig, s *TransparentProxyMeshConfig) {
-	if s == nil {
-		return
-	}
-	s.MeshDestinationsOnly = t.MeshDestinationsOnly
-}
-func URLRewriteToStructs(s *URLRewrite, t *structs.URLRewrite) {
-	if s == nil {
-		return
-	}
-	t.Path = s.Path
-}
-func URLRewriteFromStructs(t *structs.URLRewrite, s *URLRewrite) {
-	if s == nil {
-		return
-	}
-	s.Path = t.Path
-}
-func UpstreamConfigToStructs(s *UpstreamConfig, t *structs.UpstreamConfig) {
-	if s == nil {
-		return
-	}
-	t.Name = s.Name
-	t.EnterpriseMeta = enterpriseMetaToStructs(s.EnterpriseMeta)
-	t.Peer = s.Peer
-	t.EnvoyListenerJSON = s.EnvoyListenerJSON
-	t.EnvoyClusterJSON = s.EnvoyClusterJSON
-	t.Protocol = s.Protocol
-	t.ConnectTimeoutMs = int(s.ConnectTimeoutMs)
-	if s.Limits != nil {
-		var x structs.UpstreamLimits
-		UpstreamLimitsToStructs(s.Limits, &x)
-		t.Limits = &x
-	}
-	if s.PassiveHealthCheck != nil {
-		var x structs.PassiveHealthCheck
-		PassiveHealthCheckToStructs(s.PassiveHealthCheck, &x)
-		t.PassiveHealthCheck = &x
-	}
-	if s.MeshGateway != nil {
-		MeshGatewayConfigToStructs(s.MeshGateway, &t.MeshGateway)
-	}
-	t.BalanceOutboundConnections = s.BalanceOutboundConnections
-}
-func UpstreamConfigFromStructs(t *structs.UpstreamConfig, s *UpstreamConfig) {
-	if s == nil {
-		return
-	}
-	s.Name = t.Name
-	s.EnterpriseMeta = enterpriseMetaFromStructs(t.EnterpriseMeta)
-	s.Peer = t.Peer
-	s.EnvoyListenerJSON = t.EnvoyListenerJSON
-	s.EnvoyClusterJSON = t.EnvoyClusterJSON
-	s.Protocol = t.Protocol
-	s.ConnectTimeoutMs = int32(t.ConnectTimeoutMs)
-	if t.Limits != nil {
-		var x UpstreamLimits
-		UpstreamLimitsFromStructs(t.Limits, &x)
-		s.Limits = &x
-	}
-	if t.PassiveHealthCheck != nil {
-		var x PassiveHealthCheck
-		PassiveHealthCheckFromStructs(t.PassiveHealthCheck, &x)
-		s.PassiveHealthCheck = &x
-	}
-	{
-		var x MeshGatewayConfig
-		MeshGatewayConfigFromStructs(&t.MeshGateway, &x)
-		s.MeshGateway = &x
-	}
-	s.BalanceOutboundConnections = t.BalanceOutboundConnections
-}
-func UpstreamConfigurationToStructs(s *UpstreamConfiguration, t *structs.UpstreamConfiguration) {
-	if s == nil {
-		return
-	}
-	{
-		t.Overrides = make([]*structs.UpstreamConfig, len(s.Overrides))
-		for i := range s.Overrides {
-			if s.Overrides[i] != nil {
-				var x structs.UpstreamConfig
-				UpstreamConfigToStructs(s.Overrides[i], &x)
-				t.Overrides[i] = &x
-			}
-		}
-	}
-	if s.Defaults != nil {
-		var x structs.UpstreamConfig
-		UpstreamConfigToStructs(s.Defaults, &x)
-		t.Defaults = &x
-	}
-}
-func UpstreamConfigurationFromStructs(t *structs.UpstreamConfiguration, s *UpstreamConfiguration) {
-	if s == nil {
-		return
-	}
-	{
-		s.Overrides = make([]*UpstreamConfig, len(t.Overrides))
-		for i := range t.Overrides {
-			if t.Overrides[i] != nil {
-				var x UpstreamConfig
-				UpstreamConfigFromStructs(t.Overrides[i], &x)
-				s.Overrides[i] = &x
-			}
-		}
-	}
-	if t.Defaults != nil {
-		var x UpstreamConfig
-		UpstreamConfigFromStructs(t.Defaults, &x)
-		s.Defaults = &x
-	}
-}
-func UpstreamLimitsToStructs(s *UpstreamLimits, t *structs.UpstreamLimits) {
-	if s == nil {
-		return
-	}
-	t.MaxConnections = pointerToIntFromInt32(s.MaxConnections)
-	t.MaxPendingRequests = pointerToIntFromInt32(s.MaxPendingRequests)
-	t.MaxConcurrentRequests = pointerToIntFromInt32(s.MaxConcurrentRequests)
-}
-func UpstreamLimitsFromStructs(t *structs.UpstreamLimits, s *UpstreamLimits) {
-	if s == nil {
-		return
-	}
-	s.MaxConnections = int32FromPointerToInt(t.MaxConnections)
-	s.MaxPendingRequests = int32FromPointerToInt(t.MaxPendingRequests)
-	s.MaxConcurrentRequests = int32FromPointerToInt(t.MaxConcurrentRequests)
-}
diff --git a/proto/private/pbconfigentry/config_entry.pb.binary.go b/proto/private/pbconfigentry/config_entry.pb.binary.go
deleted file mode 100644
index a1b70cabcb652..0000000000000
--- a/proto/private/pbconfigentry/config_entry.pb.binary.go
+++ /dev/null
@@ -1,958 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbconfigentry/config_entry.proto
-
-package pbconfigentry
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ConfigEntry) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ConfigEntry) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *MeshConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *MeshConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TransparentProxyMeshConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TransparentProxyMeshConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *MeshTLSConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *MeshTLSConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *MeshDirectionalTLSConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *MeshDirectionalTLSConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *MeshHTTPConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *MeshHTTPConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *PeeringMeshConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *PeeringMeshConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ServiceResolver) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ServiceResolver) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ServiceResolverSubset) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ServiceResolverSubset) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ServiceResolverRedirect) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ServiceResolverRedirect) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ServiceResolverFailover) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ServiceResolverFailover) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ServiceResolverFailoverPolicy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ServiceResolverFailoverPolicy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ServiceResolverPrioritizeByLocality) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ServiceResolverPrioritizeByLocality) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ServiceResolverFailoverTarget) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ServiceResolverFailoverTarget) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LoadBalancer) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LoadBalancer) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *RingHashConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *RingHashConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LeastRequestConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LeastRequestConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HashPolicy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HashPolicy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *CookieConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *CookieConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *IngressGateway) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *IngressGateway) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *IngressServiceConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *IngressServiceConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *GatewayTLSConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *GatewayTLSConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *GatewayTLSSDSConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *GatewayTLSSDSConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *IngressListener) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *IngressListener) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *IngressService) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *IngressService) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *GatewayServiceTLSConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *GatewayServiceTLSConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPHeaderModifiers) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPHeaderModifiers) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ServiceIntentions) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ServiceIntentions) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *IntentionJWTRequirement) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *IntentionJWTRequirement) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *IntentionJWTProvider) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *IntentionJWTProvider) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *IntentionJWTClaimVerification) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *IntentionJWTClaimVerification) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *SourceIntention) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *SourceIntention) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *IntentionPermission) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *IntentionPermission) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *IntentionHTTPPermission) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *IntentionHTTPPermission) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *IntentionHTTPHeaderPermission) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *IntentionHTTPHeaderPermission) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ServiceDefaults) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ServiceDefaults) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TransparentProxyConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TransparentProxyConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *MeshGatewayConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *MeshGatewayConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ExposeConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ExposeConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ExposePath) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ExposePath) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *UpstreamConfiguration) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *UpstreamConfiguration) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *UpstreamConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *UpstreamConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *UpstreamLimits) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *UpstreamLimits) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *PassiveHealthCheck) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *PassiveHealthCheck) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DestinationConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DestinationConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *RateLimits) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *RateLimits) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *InstanceLevelRateLimits) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *InstanceLevelRateLimits) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *InstanceLevelRouteRateLimits) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *InstanceLevelRouteRateLimits) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *APIGateway) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *APIGateway) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Status) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Status) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Condition) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Condition) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *APIGatewayListener) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *APIGatewayListener) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *APIGatewayTLSConfiguration) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *APIGatewayTLSConfiguration) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *APIGatewayPolicy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *APIGatewayPolicy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *APIGatewayJWTRequirement) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *APIGatewayJWTRequirement) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *APIGatewayJWTProvider) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *APIGatewayJWTProvider) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *APIGatewayJWTClaimVerification) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *APIGatewayJWTClaimVerification) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ResourceReference) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ResourceReference) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *BoundAPIGateway) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *BoundAPIGateway) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *BoundAPIGatewayListener) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *BoundAPIGatewayListener) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *InlineCertificate) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *InlineCertificate) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPRoute) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPRoute) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPRouteRule) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPRouteRule) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPHeaderMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPHeaderMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPPathMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPPathMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPQueryMatch) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPQueryMatch) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPFilters) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPFilters) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPResponseFilters) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPResponseFilters) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *URLRewrite) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *URLRewrite) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *RetryFilter) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *RetryFilter) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TimeoutFilter) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TimeoutFilter) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *JWTFilter) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *JWTFilter) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPHeaderFilter) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPHeaderFilter) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *HTTPService) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *HTTPService) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TCPRoute) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TCPRoute) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TCPService) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TCPService) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *SamenessGroup) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *SamenessGroup) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *SamenessGroupMember) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *SamenessGroupMember) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *JWTProvider) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *JWTProvider) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *JSONWebKeySet) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *JSONWebKeySet) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LocalJWKS) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LocalJWKS) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *RemoteJWKS) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *RemoteJWKS) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *JWKSCluster) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *JWKSCluster) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *JWKSTLSCertificate) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *JWKSTLSCertificate) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *JWKSTLSCertProviderInstance) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *JWKSTLSCertProviderInstance) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *JWKSTLSCertTrustedCA) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *JWKSTLSCertTrustedCA) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *JWKSRetryPolicy) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *JWKSRetryPolicy) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *RetryPolicyBackOff) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *RetryPolicyBackOff) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *JWTLocation) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *JWTLocation) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *JWTLocationHeader) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *JWTLocationHeader) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *JWTLocationQueryParam) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *JWTLocationQueryParam) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *JWTLocationCookie) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *JWTLocationCookie) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *JWTForwardingConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *JWTForwardingConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *JWTCacheConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *JWTCacheConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto/private/pbconfigentry/config_entry.pb.go b/proto/private/pbconfigentry/config_entry.pb.go
deleted file mode 100644
index 3d68e73763895..0000000000000
--- a/proto/private/pbconfigentry/config_entry.pb.go
+++ /dev/null
@@ -1,10823 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbconfigentry/config_entry.proto
-
-package pbconfigentry
-
-import (
-	pbcommon "github.com/hashicorp/consul/proto/private/pbcommon"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
-	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Kind int32
-
-const (
-	Kind_KindUnknown           Kind = 0
-	Kind_KindMeshConfig        Kind = 1
-	Kind_KindServiceResolver   Kind = 2
-	Kind_KindIngressGateway    Kind = 3
-	Kind_KindServiceIntentions Kind = 4
-	Kind_KindServiceDefaults   Kind = 5
-	Kind_KindInlineCertificate Kind = 6
-	Kind_KindAPIGateway        Kind = 7
-	Kind_KindBoundAPIGateway   Kind = 8
-	Kind_KindHTTPRoute         Kind = 9
-	Kind_KindTCPRoute          Kind = 10
-	Kind_KindSamenessGroup     Kind = 11
-	Kind_KindJWTProvider       Kind = 12
-)
-
-// Enum value maps for Kind.
-var (
-	Kind_name = map[int32]string{
-		0:  "KindUnknown",
-		1:  "KindMeshConfig",
-		2:  "KindServiceResolver",
-		3:  "KindIngressGateway",
-		4:  "KindServiceIntentions",
-		5:  "KindServiceDefaults",
-		6:  "KindInlineCertificate",
-		7:  "KindAPIGateway",
-		8:  "KindBoundAPIGateway",
-		9:  "KindHTTPRoute",
-		10: "KindTCPRoute",
-		11: "KindSamenessGroup",
-		12: "KindJWTProvider",
-	}
-	Kind_value = map[string]int32{
-		"KindUnknown":           0,
-		"KindMeshConfig":        1,
-		"KindServiceResolver":   2,
-		"KindIngressGateway":    3,
-		"KindServiceIntentions": 4,
-		"KindServiceDefaults":   5,
-		"KindInlineCertificate": 6,
-		"KindAPIGateway":        7,
-		"KindBoundAPIGateway":   8,
-		"KindHTTPRoute":         9,
-		"KindTCPRoute":          10,
-		"KindSamenessGroup":     11,
-		"KindJWTProvider":       12,
-	}
-)
-
-func (x Kind) Enum() *Kind {
-	p := new(Kind)
-	*p = x
-	return p
-}
-
-func (x Kind) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Kind) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbconfigentry_config_entry_proto_enumTypes[0].Descriptor()
-}
-
-func (Kind) Type() protoreflect.EnumType {
-	return &file_private_pbconfigentry_config_entry_proto_enumTypes[0]
-}
-
-func (x Kind) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Kind.Descriptor instead.
-func (Kind) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{0}
-}
-
-type IntentionAction int32
-
-const (
-	IntentionAction_Deny  IntentionAction = 0
-	IntentionAction_Allow IntentionAction = 1
-)
-
-// Enum value maps for IntentionAction.
-var (
-	IntentionAction_name = map[int32]string{
-		0: "Deny",
-		1: "Allow",
-	}
-	IntentionAction_value = map[string]int32{
-		"Deny":  0,
-		"Allow": 1,
-	}
-)
-
-func (x IntentionAction) Enum() *IntentionAction {
-	p := new(IntentionAction)
-	*p = x
-	return p
-}
-
-func (x IntentionAction) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (IntentionAction) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbconfigentry_config_entry_proto_enumTypes[1].Descriptor()
-}
-
-func (IntentionAction) Type() protoreflect.EnumType {
-	return &file_private_pbconfigentry_config_entry_proto_enumTypes[1]
-}
-
-func (x IntentionAction) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use IntentionAction.Descriptor instead.
-func (IntentionAction) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{1}
-}
-
-type IntentionSourceType int32
-
-const (
-	IntentionSourceType_Consul IntentionSourceType = 0
-)
-
-// Enum value maps for IntentionSourceType.
-var (
-	IntentionSourceType_name = map[int32]string{
-		0: "Consul",
-	}
-	IntentionSourceType_value = map[string]int32{
-		"Consul": 0,
-	}
-)
-
-func (x IntentionSourceType) Enum() *IntentionSourceType {
-	p := new(IntentionSourceType)
-	*p = x
-	return p
-}
-
-func (x IntentionSourceType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (IntentionSourceType) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbconfigentry_config_entry_proto_enumTypes[2].Descriptor()
-}
-
-func (IntentionSourceType) Type() protoreflect.EnumType {
-	return &file_private_pbconfigentry_config_entry_proto_enumTypes[2]
-}
-
-func (x IntentionSourceType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use IntentionSourceType.Descriptor instead.
-func (IntentionSourceType) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{2}
-}
-
-type ProxyMode int32
-
-const (
-	ProxyMode_ProxyModeDefault     ProxyMode = 0
-	ProxyMode_ProxyModeTransparent ProxyMode = 1
-	ProxyMode_ProxyModeDirect      ProxyMode = 2
-)
-
-// Enum value maps for ProxyMode.
-var (
-	ProxyMode_name = map[int32]string{
-		0: "ProxyModeDefault",
-		1: "ProxyModeTransparent",
-		2: "ProxyModeDirect",
-	}
-	ProxyMode_value = map[string]int32{
-		"ProxyModeDefault":     0,
-		"ProxyModeTransparent": 1,
-		"ProxyModeDirect":      2,
-	}
-)
-
-func (x ProxyMode) Enum() *ProxyMode {
-	p := new(ProxyMode)
-	*p = x
-	return p
-}
-
-func (x ProxyMode) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (ProxyMode) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbconfigentry_config_entry_proto_enumTypes[3].Descriptor()
-}
-
-func (ProxyMode) Type() protoreflect.EnumType {
-	return &file_private_pbconfigentry_config_entry_proto_enumTypes[3]
-}
-
-func (x ProxyMode) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use ProxyMode.Descriptor instead.
-func (ProxyMode) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{3}
-}
-
-type MutualTLSMode int32
-
-const (
-	MutualTLSMode_MutualTLSModeDefault    MutualTLSMode = 0
-	MutualTLSMode_MutualTLSModeStrict     MutualTLSMode = 1
-	MutualTLSMode_MutualTLSModePermissive MutualTLSMode = 2
-)
-
-// Enum value maps for MutualTLSMode.
-var (
-	MutualTLSMode_name = map[int32]string{
-		0: "MutualTLSModeDefault",
-		1: "MutualTLSModeStrict",
-		2: "MutualTLSModePermissive",
-	}
-	MutualTLSMode_value = map[string]int32{
-		"MutualTLSModeDefault":    0,
-		"MutualTLSModeStrict":     1,
-		"MutualTLSModePermissive": 2,
-	}
-)
-
-func (x MutualTLSMode) Enum() *MutualTLSMode {
-	p := new(MutualTLSMode)
-	*p = x
-	return p
-}
-
-func (x MutualTLSMode) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (MutualTLSMode) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbconfigentry_config_entry_proto_enumTypes[4].Descriptor()
-}
-
-func (MutualTLSMode) Type() protoreflect.EnumType {
-	return &file_private_pbconfigentry_config_entry_proto_enumTypes[4]
-}
-
-func (x MutualTLSMode) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use MutualTLSMode.Descriptor instead.
-func (MutualTLSMode) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{4}
-}
-
-type MeshGatewayMode int32
-
-const (
-	MeshGatewayMode_MeshGatewayModeDefault MeshGatewayMode = 0
-	MeshGatewayMode_MeshGatewayModeNone    MeshGatewayMode = 1
-	MeshGatewayMode_MeshGatewayModeLocal   MeshGatewayMode = 2
-	MeshGatewayMode_MeshGatewayModeRemote  MeshGatewayMode = 3
-)
-
-// Enum value maps for MeshGatewayMode.
-var (
-	MeshGatewayMode_name = map[int32]string{
-		0: "MeshGatewayModeDefault",
-		1: "MeshGatewayModeNone",
-		2: "MeshGatewayModeLocal",
-		3: "MeshGatewayModeRemote",
-	}
-	MeshGatewayMode_value = map[string]int32{
-		"MeshGatewayModeDefault": 0,
-		"MeshGatewayModeNone":    1,
-		"MeshGatewayModeLocal":   2,
-		"MeshGatewayModeRemote":  3,
-	}
-)
-
-func (x MeshGatewayMode) Enum() *MeshGatewayMode {
-	p := new(MeshGatewayMode)
-	*p = x
-	return p
-}
-
-func (x MeshGatewayMode) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (MeshGatewayMode) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbconfigentry_config_entry_proto_enumTypes[5].Descriptor()
-}
-
-func (MeshGatewayMode) Type() protoreflect.EnumType {
-	return &file_private_pbconfigentry_config_entry_proto_enumTypes[5]
-}
-
-func (x MeshGatewayMode) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use MeshGatewayMode.Descriptor instead.
-func (MeshGatewayMode) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{5}
-}
-
-type APIGatewayListenerProtocol int32
-
-const (
-	APIGatewayListenerProtocol_ListenerProtocolHTTP APIGatewayListenerProtocol = 0
-	APIGatewayListenerProtocol_ListenerProtocolTCP  APIGatewayListenerProtocol = 1
-)
-
-// Enum value maps for APIGatewayListenerProtocol.
-var (
-	APIGatewayListenerProtocol_name = map[int32]string{
-		0: "ListenerProtocolHTTP",
-		1: "ListenerProtocolTCP",
-	}
-	APIGatewayListenerProtocol_value = map[string]int32{
-		"ListenerProtocolHTTP": 0,
-		"ListenerProtocolTCP":  1,
-	}
-)
-
-func (x APIGatewayListenerProtocol) Enum() *APIGatewayListenerProtocol {
-	p := new(APIGatewayListenerProtocol)
-	*p = x
-	return p
-}
-
-func (x APIGatewayListenerProtocol) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (APIGatewayListenerProtocol) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbconfigentry_config_entry_proto_enumTypes[6].Descriptor()
-}
-
-func (APIGatewayListenerProtocol) Type() protoreflect.EnumType {
-	return &file_private_pbconfigentry_config_entry_proto_enumTypes[6]
-}
-
-func (x APIGatewayListenerProtocol) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use APIGatewayListenerProtocol.Descriptor instead.
-func (APIGatewayListenerProtocol) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{6}
-}
-
-type HTTPMatchMethod int32
-
-const (
-	HTTPMatchMethod_HTTPMatchMethodAll     HTTPMatchMethod = 0
-	HTTPMatchMethod_HTTPMatchMethodConnect HTTPMatchMethod = 1
-	HTTPMatchMethod_HTTPMatchMethodDelete  HTTPMatchMethod = 2
-	HTTPMatchMethod_HTTPMatchMethodGet     HTTPMatchMethod = 3
-	HTTPMatchMethod_HTTPMatchMethodHead    HTTPMatchMethod = 4
-	HTTPMatchMethod_HTTPMatchMethodOptions HTTPMatchMethod = 5
-	HTTPMatchMethod_HTTPMatchMethodPatch   HTTPMatchMethod = 6
-	HTTPMatchMethod_HTTPMatchMethodPost    HTTPMatchMethod = 7
-	HTTPMatchMethod_HTTPMatchMethodPut     HTTPMatchMethod = 8
-	HTTPMatchMethod_HTTPMatchMethodTrace   HTTPMatchMethod = 9
-)
-
-// Enum value maps for HTTPMatchMethod.
-var (
-	HTTPMatchMethod_name = map[int32]string{
-		0: "HTTPMatchMethodAll",
-		1: "HTTPMatchMethodConnect",
-		2: "HTTPMatchMethodDelete",
-		3: "HTTPMatchMethodGet",
-		4: "HTTPMatchMethodHead",
-		5: "HTTPMatchMethodOptions",
-		6: "HTTPMatchMethodPatch",
-		7: "HTTPMatchMethodPost",
-		8: "HTTPMatchMethodPut",
-		9: "HTTPMatchMethodTrace",
-	}
-	HTTPMatchMethod_value = map[string]int32{
-		"HTTPMatchMethodAll":     0,
-		"HTTPMatchMethodConnect": 1,
-		"HTTPMatchMethodDelete":  2,
-		"HTTPMatchMethodGet":     3,
-		"HTTPMatchMethodHead":    4,
-		"HTTPMatchMethodOptions": 5,
-		"HTTPMatchMethodPatch":   6,
-		"HTTPMatchMethodPost":    7,
-		"HTTPMatchMethodPut":     8,
-		"HTTPMatchMethodTrace":   9,
-	}
-)
-
-func (x HTTPMatchMethod) Enum() *HTTPMatchMethod {
-	p := new(HTTPMatchMethod)
-	*p = x
-	return p
-}
-
-func (x HTTPMatchMethod) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (HTTPMatchMethod) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbconfigentry_config_entry_proto_enumTypes[7].Descriptor()
-}
-
-func (HTTPMatchMethod) Type() protoreflect.EnumType {
-	return &file_private_pbconfigentry_config_entry_proto_enumTypes[7]
-}
-
-func (x HTTPMatchMethod) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use HTTPMatchMethod.Descriptor instead.
-func (HTTPMatchMethod) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{7}
-}
-
-type HTTPHeaderMatchType int32
-
-const (
-	HTTPHeaderMatchType_HTTPHeaderMatchExact             HTTPHeaderMatchType = 0
-	HTTPHeaderMatchType_HTTPHeaderMatchPrefix            HTTPHeaderMatchType = 1
-	HTTPHeaderMatchType_HTTPHeaderMatchPresent           HTTPHeaderMatchType = 2
-	HTTPHeaderMatchType_HTTPHeaderMatchRegularExpression HTTPHeaderMatchType = 3
-	HTTPHeaderMatchType_HTTPHeaderMatchSuffix            HTTPHeaderMatchType = 4
-)
-
-// Enum value maps for HTTPHeaderMatchType.
-var (
-	HTTPHeaderMatchType_name = map[int32]string{
-		0: "HTTPHeaderMatchExact",
-		1: "HTTPHeaderMatchPrefix",
-		2: "HTTPHeaderMatchPresent",
-		3: "HTTPHeaderMatchRegularExpression",
-		4: "HTTPHeaderMatchSuffix",
-	}
-	HTTPHeaderMatchType_value = map[string]int32{
-		"HTTPHeaderMatchExact":             0,
-		"HTTPHeaderMatchPrefix":            1,
-		"HTTPHeaderMatchPresent":           2,
-		"HTTPHeaderMatchRegularExpression": 3,
-		"HTTPHeaderMatchSuffix":            4,
-	}
-)
-
-func (x HTTPHeaderMatchType) Enum() *HTTPHeaderMatchType {
-	p := new(HTTPHeaderMatchType)
-	*p = x
-	return p
-}
-
-func (x HTTPHeaderMatchType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (HTTPHeaderMatchType) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbconfigentry_config_entry_proto_enumTypes[8].Descriptor()
-}
-
-func (HTTPHeaderMatchType) Type() protoreflect.EnumType {
-	return &file_private_pbconfigentry_config_entry_proto_enumTypes[8]
-}
-
-func (x HTTPHeaderMatchType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use HTTPHeaderMatchType.Descriptor instead.
-func (HTTPHeaderMatchType) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{8}
-}
-
-type HTTPPathMatchType int32
-
-const (
-	HTTPPathMatchType_HTTPPathMatchExact             HTTPPathMatchType = 0
-	HTTPPathMatchType_HTTPPathMatchPrefix            HTTPPathMatchType = 1
-	HTTPPathMatchType_HTTPPathMatchRegularExpression HTTPPathMatchType = 3
-)
-
-// Enum value maps for HTTPPathMatchType.
-var (
-	HTTPPathMatchType_name = map[int32]string{
-		0: "HTTPPathMatchExact",
-		1: "HTTPPathMatchPrefix",
-		3: "HTTPPathMatchRegularExpression",
-	}
-	HTTPPathMatchType_value = map[string]int32{
-		"HTTPPathMatchExact":             0,
-		"HTTPPathMatchPrefix":            1,
-		"HTTPPathMatchRegularExpression": 3,
-	}
-)
-
-func (x HTTPPathMatchType) Enum() *HTTPPathMatchType {
-	p := new(HTTPPathMatchType)
-	*p = x
-	return p
-}
-
-func (x HTTPPathMatchType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (HTTPPathMatchType) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbconfigentry_config_entry_proto_enumTypes[9].Descriptor()
-}
-
-func (HTTPPathMatchType) Type() protoreflect.EnumType {
-	return &file_private_pbconfigentry_config_entry_proto_enumTypes[9]
-}
-
-func (x HTTPPathMatchType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use HTTPPathMatchType.Descriptor instead.
-func (HTTPPathMatchType) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{9}
-}
-
-type HTTPQueryMatchType int32
-
-const (
-	HTTPQueryMatchType_HTTPQueryMatchExact             HTTPQueryMatchType = 0
-	HTTPQueryMatchType_HTTPQueryMatchPresent           HTTPQueryMatchType = 1
-	HTTPQueryMatchType_HTTPQueryMatchRegularExpression HTTPQueryMatchType = 3
-)
-
-// Enum value maps for HTTPQueryMatchType.
-var (
-	HTTPQueryMatchType_name = map[int32]string{
-		0: "HTTPQueryMatchExact",
-		1: "HTTPQueryMatchPresent",
-		3: "HTTPQueryMatchRegularExpression",
-	}
-	HTTPQueryMatchType_value = map[string]int32{
-		"HTTPQueryMatchExact":             0,
-		"HTTPQueryMatchPresent":           1,
-		"HTTPQueryMatchRegularExpression": 3,
-	}
-)
-
-func (x HTTPQueryMatchType) Enum() *HTTPQueryMatchType {
-	p := new(HTTPQueryMatchType)
-	*p = x
-	return p
-}
-
-func (x HTTPQueryMatchType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (HTTPQueryMatchType) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbconfigentry_config_entry_proto_enumTypes[10].Descriptor()
-}
-
-func (HTTPQueryMatchType) Type() protoreflect.EnumType {
-	return &file_private_pbconfigentry_config_entry_proto_enumTypes[10]
-}
-
-func (x HTTPQueryMatchType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use HTTPQueryMatchType.Descriptor instead.
-func (HTTPQueryMatchType) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{10}
-}
-
-type ConfigEntry struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Kind           Kind                     `protobuf:"varint,1,opt,name=Kind,proto3,enum=hashicorp.consul.internal.configentry.Kind" json:"Kind,omitempty"`
-	Name           string                   `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
-	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,3,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
-	RaftIndex      *pbcommon.RaftIndex      `protobuf:"bytes,4,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
-	// Types that are assignable to Entry:
-	//
-	//	*ConfigEntry_MeshConfig
-	//	*ConfigEntry_ServiceResolver
-	//	*ConfigEntry_IngressGateway
-	//	*ConfigEntry_ServiceIntentions
-	//	*ConfigEntry_ServiceDefaults
-	//	*ConfigEntry_APIGateway
-	//	*ConfigEntry_BoundAPIGateway
-	//	*ConfigEntry_TCPRoute
-	//	*ConfigEntry_HTTPRoute
-	//	*ConfigEntry_InlineCertificate
-	//	*ConfigEntry_SamenessGroup
-	//	*ConfigEntry_JWTProvider
-	Entry isConfigEntry_Entry `protobuf_oneof:"Entry"`
-}
-
-func (x *ConfigEntry) Reset() {
-	*x = ConfigEntry{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ConfigEntry) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ConfigEntry) ProtoMessage() {}
-
-func (x *ConfigEntry) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ConfigEntry.ProtoReflect.Descriptor instead.
-func (*ConfigEntry) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ConfigEntry) GetKind() Kind {
-	if x != nil {
-		return x.Kind
-	}
-	return Kind_KindUnknown
-}
-
-func (x *ConfigEntry) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *ConfigEntry) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if x != nil {
-		return x.EnterpriseMeta
-	}
-	return nil
-}
-
-func (x *ConfigEntry) GetRaftIndex() *pbcommon.RaftIndex {
-	if x != nil {
-		return x.RaftIndex
-	}
-	return nil
-}
-
-func (m *ConfigEntry) GetEntry() isConfigEntry_Entry {
-	if m != nil {
-		return m.Entry
-	}
-	return nil
-}
-
-func (x *ConfigEntry) GetMeshConfig() *MeshConfig {
-	if x, ok := x.GetEntry().(*ConfigEntry_MeshConfig); ok {
-		return x.MeshConfig
-	}
-	return nil
-}
-
-func (x *ConfigEntry) GetServiceResolver() *ServiceResolver {
-	if x, ok := x.GetEntry().(*ConfigEntry_ServiceResolver); ok {
-		return x.ServiceResolver
-	}
-	return nil
-}
-
-func (x *ConfigEntry) GetIngressGateway() *IngressGateway {
-	if x, ok := x.GetEntry().(*ConfigEntry_IngressGateway); ok {
-		return x.IngressGateway
-	}
-	return nil
-}
-
-func (x *ConfigEntry) GetServiceIntentions() *ServiceIntentions {
-	if x, ok := x.GetEntry().(*ConfigEntry_ServiceIntentions); ok {
-		return x.ServiceIntentions
-	}
-	return nil
-}
-
-func (x *ConfigEntry) GetServiceDefaults() *ServiceDefaults {
-	if x, ok := x.GetEntry().(*ConfigEntry_ServiceDefaults); ok {
-		return x.ServiceDefaults
-	}
-	return nil
-}
-
-func (x *ConfigEntry) GetAPIGateway() *APIGateway {
-	if x, ok := x.GetEntry().(*ConfigEntry_APIGateway); ok {
-		return x.APIGateway
-	}
-	return nil
-}
-
-func (x *ConfigEntry) GetBoundAPIGateway() *BoundAPIGateway {
-	if x, ok := x.GetEntry().(*ConfigEntry_BoundAPIGateway); ok {
-		return x.BoundAPIGateway
-	}
-	return nil
-}
-
-func (x *ConfigEntry) GetTCPRoute() *TCPRoute {
-	if x, ok := x.GetEntry().(*ConfigEntry_TCPRoute); ok {
-		return x.TCPRoute
-	}
-	return nil
-}
-
-func (x *ConfigEntry) GetHTTPRoute() *HTTPRoute {
-	if x, ok := x.GetEntry().(*ConfigEntry_HTTPRoute); ok {
-		return x.HTTPRoute
-	}
-	return nil
-}
-
-func (x *ConfigEntry) GetInlineCertificate() *InlineCertificate {
-	if x, ok := x.GetEntry().(*ConfigEntry_InlineCertificate); ok {
-		return x.InlineCertificate
-	}
-	return nil
-}
-
-func (x *ConfigEntry) GetSamenessGroup() *SamenessGroup {
-	if x, ok := x.GetEntry().(*ConfigEntry_SamenessGroup); ok {
-		return x.SamenessGroup
-	}
-	return nil
-}
-
-func (x *ConfigEntry) GetJWTProvider() *JWTProvider {
-	if x, ok := x.GetEntry().(*ConfigEntry_JWTProvider); ok {
-		return x.JWTProvider
-	}
-	return nil
-}
-
-type isConfigEntry_Entry interface {
-	isConfigEntry_Entry()
-}
-
-type ConfigEntry_MeshConfig struct {
-	MeshConfig *MeshConfig `protobuf:"bytes,5,opt,name=MeshConfig,proto3,oneof"`
-}
-
-type ConfigEntry_ServiceResolver struct {
-	ServiceResolver *ServiceResolver `protobuf:"bytes,6,opt,name=ServiceResolver,proto3,oneof"`
-}
-
-type ConfigEntry_IngressGateway struct {
-	IngressGateway *IngressGateway `protobuf:"bytes,7,opt,name=IngressGateway,proto3,oneof"`
-}
-
-type ConfigEntry_ServiceIntentions struct {
-	ServiceIntentions *ServiceIntentions `protobuf:"bytes,8,opt,name=ServiceIntentions,proto3,oneof"`
-}
-
-type ConfigEntry_ServiceDefaults struct {
-	ServiceDefaults *ServiceDefaults `protobuf:"bytes,9,opt,name=ServiceDefaults,proto3,oneof"`
-}
-
-type ConfigEntry_APIGateway struct {
-	APIGateway *APIGateway `protobuf:"bytes,10,opt,name=APIGateway,proto3,oneof"`
-}
-
-type ConfigEntry_BoundAPIGateway struct {
-	BoundAPIGateway *BoundAPIGateway `protobuf:"bytes,11,opt,name=BoundAPIGateway,proto3,oneof"`
-}
-
-type ConfigEntry_TCPRoute struct {
-	TCPRoute *TCPRoute `protobuf:"bytes,12,opt,name=TCPRoute,proto3,oneof"`
-}
-
-type ConfigEntry_HTTPRoute struct {
-	HTTPRoute *HTTPRoute `protobuf:"bytes,13,opt,name=HTTPRoute,proto3,oneof"`
-}
-
-type ConfigEntry_InlineCertificate struct {
-	InlineCertificate *InlineCertificate `protobuf:"bytes,14,opt,name=InlineCertificate,proto3,oneof"`
-}
-
-type ConfigEntry_SamenessGroup struct {
-	SamenessGroup *SamenessGroup `protobuf:"bytes,15,opt,name=SamenessGroup,proto3,oneof"`
-}
-
-type ConfigEntry_JWTProvider struct {
-	JWTProvider *JWTProvider `protobuf:"bytes,16,opt,name=JWTProvider,proto3,oneof"`
-}
-
-func (*ConfigEntry_MeshConfig) isConfigEntry_Entry() {}
-
-func (*ConfigEntry_ServiceResolver) isConfigEntry_Entry() {}
-
-func (*ConfigEntry_IngressGateway) isConfigEntry_Entry() {}
-
-func (*ConfigEntry_ServiceIntentions) isConfigEntry_Entry() {}
-
-func (*ConfigEntry_ServiceDefaults) isConfigEntry_Entry() {}
-
-func (*ConfigEntry_APIGateway) isConfigEntry_Entry() {}
-
-func (*ConfigEntry_BoundAPIGateway) isConfigEntry_Entry() {}
-
-func (*ConfigEntry_TCPRoute) isConfigEntry_Entry() {}
-
-func (*ConfigEntry_HTTPRoute) isConfigEntry_Entry() {}
-
-func (*ConfigEntry_InlineCertificate) isConfigEntry_Entry() {}
-
-func (*ConfigEntry_SamenessGroup) isConfigEntry_Entry() {}
-
-func (*ConfigEntry_JWTProvider) isConfigEntry_Entry() {}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.MeshConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=RaftIndex,EnterpriseMeta
-type MeshConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TransparentProxy                 *TransparentProxyMeshConfig `protobuf:"bytes,1,opt,name=TransparentProxy,proto3" json:"TransparentProxy,omitempty"`
-	TLS                              *MeshTLSConfig              `protobuf:"bytes,2,opt,name=TLS,proto3" json:"TLS,omitempty"`
-	HTTP                             *MeshHTTPConfig             `protobuf:"bytes,3,opt,name=HTTP,proto3" json:"HTTP,omitempty"`
-	Meta                             map[string]string           `protobuf:"bytes,4,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Peering                          *PeeringMeshConfig          `protobuf:"bytes,5,opt,name=Peering,proto3" json:"Peering,omitempty"`
-	AllowEnablingPermissiveMutualTLS bool                        `protobuf:"varint,6,opt,name=AllowEnablingPermissiveMutualTLS,proto3" json:"AllowEnablingPermissiveMutualTLS,omitempty"`
-}
-
-func (x *MeshConfig) Reset() {
-	*x = MeshConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MeshConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MeshConfig) ProtoMessage() {}
-
-func (x *MeshConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MeshConfig.ProtoReflect.Descriptor instead.
-func (*MeshConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *MeshConfig) GetTransparentProxy() *TransparentProxyMeshConfig {
-	if x != nil {
-		return x.TransparentProxy
-	}
-	return nil
-}
-
-func (x *MeshConfig) GetTLS() *MeshTLSConfig {
-	if x != nil {
-		return x.TLS
-	}
-	return nil
-}
-
-func (x *MeshConfig) GetHTTP() *MeshHTTPConfig {
-	if x != nil {
-		return x.HTTP
-	}
-	return nil
-}
-
-func (x *MeshConfig) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *MeshConfig) GetPeering() *PeeringMeshConfig {
-	if x != nil {
-		return x.Peering
-	}
-	return nil
-}
-
-func (x *MeshConfig) GetAllowEnablingPermissiveMutualTLS() bool {
-	if x != nil {
-		return x.AllowEnablingPermissiveMutualTLS
-	}
-	return false
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.TransparentProxyMeshConfig
-// output=config_entry.gen.go
-// name=Structs
-type TransparentProxyMeshConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	MeshDestinationsOnly bool `protobuf:"varint,1,opt,name=MeshDestinationsOnly,proto3" json:"MeshDestinationsOnly,omitempty"`
-}
-
-func (x *TransparentProxyMeshConfig) Reset() {
-	*x = TransparentProxyMeshConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TransparentProxyMeshConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TransparentProxyMeshConfig) ProtoMessage() {}
-
-func (x *TransparentProxyMeshConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TransparentProxyMeshConfig.ProtoReflect.Descriptor instead.
-func (*TransparentProxyMeshConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *TransparentProxyMeshConfig) GetMeshDestinationsOnly() bool {
-	if x != nil {
-		return x.MeshDestinationsOnly
-	}
-	return false
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.MeshTLSConfig
-// output=config_entry.gen.go
-// name=Structs
-type MeshTLSConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Incoming *MeshDirectionalTLSConfig `protobuf:"bytes,1,opt,name=Incoming,proto3" json:"Incoming,omitempty"`
-	Outgoing *MeshDirectionalTLSConfig `protobuf:"bytes,2,opt,name=Outgoing,proto3" json:"Outgoing,omitempty"`
-}
-
-func (x *MeshTLSConfig) Reset() {
-	*x = MeshTLSConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MeshTLSConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MeshTLSConfig) ProtoMessage() {}
-
-func (x *MeshTLSConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MeshTLSConfig.ProtoReflect.Descriptor instead.
-func (*MeshTLSConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *MeshTLSConfig) GetIncoming() *MeshDirectionalTLSConfig {
-	if x != nil {
-		return x.Incoming
-	}
-	return nil
-}
-
-func (x *MeshTLSConfig) GetOutgoing() *MeshDirectionalTLSConfig {
-	if x != nil {
-		return x.Outgoing
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.MeshDirectionalTLSConfig
-// output=config_entry.gen.go
-// name=Structs
-type MeshDirectionalTLSConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
-	TLSMinVersion string `protobuf:"bytes,1,opt,name=TLSMinVersion,proto3" json:"TLSMinVersion,omitempty"`
-	// mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
-	TLSMaxVersion string `protobuf:"bytes,2,opt,name=TLSMaxVersion,proto3" json:"TLSMaxVersion,omitempty"`
-	// mog: func-from=cipherSuitesFromStructs func-to=cipherSuitesToStructs
-	CipherSuites []string `protobuf:"bytes,3,rep,name=CipherSuites,proto3" json:"CipherSuites,omitempty"`
-}
-
-func (x *MeshDirectionalTLSConfig) Reset() {
-	*x = MeshDirectionalTLSConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MeshDirectionalTLSConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MeshDirectionalTLSConfig) ProtoMessage() {}
-
-func (x *MeshDirectionalTLSConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MeshDirectionalTLSConfig.ProtoReflect.Descriptor instead.
-func (*MeshDirectionalTLSConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *MeshDirectionalTLSConfig) GetTLSMinVersion() string {
-	if x != nil {
-		return x.TLSMinVersion
-	}
-	return ""
-}
-
-func (x *MeshDirectionalTLSConfig) GetTLSMaxVersion() string {
-	if x != nil {
-		return x.TLSMaxVersion
-	}
-	return ""
-}
-
-func (x *MeshDirectionalTLSConfig) GetCipherSuites() []string {
-	if x != nil {
-		return x.CipherSuites
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.MeshHTTPConfig
-// output=config_entry.gen.go
-// name=Structs
-type MeshHTTPConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	SanitizeXForwardedClientCert bool `protobuf:"varint,1,opt,name=SanitizeXForwardedClientCert,proto3" json:"SanitizeXForwardedClientCert,omitempty"`
-}
-
-func (x *MeshHTTPConfig) Reset() {
-	*x = MeshHTTPConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MeshHTTPConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MeshHTTPConfig) ProtoMessage() {}
-
-func (x *MeshHTTPConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MeshHTTPConfig.ProtoReflect.Descriptor instead.
-func (*MeshHTTPConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *MeshHTTPConfig) GetSanitizeXForwardedClientCert() bool {
-	if x != nil {
-		return x.SanitizeXForwardedClientCert
-	}
-	return false
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.PeeringMeshConfig
-// output=config_entry.gen.go
-// name=Structs
-type PeeringMeshConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PeerThroughMeshGateways bool `protobuf:"varint,1,opt,name=PeerThroughMeshGateways,proto3" json:"PeerThroughMeshGateways,omitempty"`
-}
-
-func (x *PeeringMeshConfig) Reset() {
-	*x = PeeringMeshConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringMeshConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringMeshConfig) ProtoMessage() {}
-
-func (x *PeeringMeshConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringMeshConfig.ProtoReflect.Descriptor instead.
-func (*PeeringMeshConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *PeeringMeshConfig) GetPeerThroughMeshGateways() bool {
-	if x != nil {
-		return x.PeerThroughMeshGateways
-	}
-	return false
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceResolverConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-type ServiceResolver struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	DefaultSubset string                              `protobuf:"bytes,1,opt,name=DefaultSubset,proto3" json:"DefaultSubset,omitempty"`
-	Subsets       map[string]*ServiceResolverSubset   `protobuf:"bytes,2,rep,name=Subsets,proto3" json:"Subsets,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Redirect      *ServiceResolverRedirect            `protobuf:"bytes,3,opt,name=Redirect,proto3" json:"Redirect,omitempty"`
-	Failover      map[string]*ServiceResolverFailover `protobuf:"bytes,4,rep,name=Failover,proto3" json:"Failover,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	ConnectTimeout *durationpb.Duration `protobuf:"bytes,5,opt,name=ConnectTimeout,proto3" json:"ConnectTimeout,omitempty"`
-	LoadBalancer   *LoadBalancer        `protobuf:"bytes,6,opt,name=LoadBalancer,proto3" json:"LoadBalancer,omitempty"`
-	Meta           map[string]string    `protobuf:"bytes,7,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	RequestTimeout       *durationpb.Duration                 `protobuf:"bytes,8,opt,name=RequestTimeout,proto3" json:"RequestTimeout,omitempty"`
-	PrioritizeByLocality *ServiceResolverPrioritizeByLocality `protobuf:"bytes,9,opt,name=PrioritizeByLocality,proto3" json:"PrioritizeByLocality,omitempty"`
-}
-
-func (x *ServiceResolver) Reset() {
-	*x = ServiceResolver{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceResolver) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceResolver) ProtoMessage() {}
-
-func (x *ServiceResolver) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceResolver.ProtoReflect.Descriptor instead.
-func (*ServiceResolver) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *ServiceResolver) GetDefaultSubset() string {
-	if x != nil {
-		return x.DefaultSubset
-	}
-	return ""
-}
-
-func (x *ServiceResolver) GetSubsets() map[string]*ServiceResolverSubset {
-	if x != nil {
-		return x.Subsets
-	}
-	return nil
-}
-
-func (x *ServiceResolver) GetRedirect() *ServiceResolverRedirect {
-	if x != nil {
-		return x.Redirect
-	}
-	return nil
-}
-
-func (x *ServiceResolver) GetFailover() map[string]*ServiceResolverFailover {
-	if x != nil {
-		return x.Failover
-	}
-	return nil
-}
-
-func (x *ServiceResolver) GetConnectTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.ConnectTimeout
-	}
-	return nil
-}
-
-func (x *ServiceResolver) GetLoadBalancer() *LoadBalancer {
-	if x != nil {
-		return x.LoadBalancer
-	}
-	return nil
-}
-
-func (x *ServiceResolver) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *ServiceResolver) GetRequestTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.RequestTimeout
-	}
-	return nil
-}
-
-func (x *ServiceResolver) GetPrioritizeByLocality() *ServiceResolverPrioritizeByLocality {
-	if x != nil {
-		return x.PrioritizeByLocality
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceResolverSubset
-// output=config_entry.gen.go
-// name=Structs
-type ServiceResolverSubset struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Filter      string `protobuf:"bytes,1,opt,name=Filter,proto3" json:"Filter,omitempty"`
-	OnlyPassing bool   `protobuf:"varint,2,opt,name=OnlyPassing,proto3" json:"OnlyPassing,omitempty"`
-}
-
-func (x *ServiceResolverSubset) Reset() {
-	*x = ServiceResolverSubset{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceResolverSubset) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceResolverSubset) ProtoMessage() {}
-
-func (x *ServiceResolverSubset) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceResolverSubset.ProtoReflect.Descriptor instead.
-func (*ServiceResolverSubset) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *ServiceResolverSubset) GetFilter() string {
-	if x != nil {
-		return x.Filter
-	}
-	return ""
-}
-
-func (x *ServiceResolverSubset) GetOnlyPassing() bool {
-	if x != nil {
-		return x.OnlyPassing
-	}
-	return false
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceResolverRedirect
-// output=config_entry.gen.go
-// name=Structs
-type ServiceResolverRedirect struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Service       string `protobuf:"bytes,1,opt,name=Service,proto3" json:"Service,omitempty"`
-	ServiceSubset string `protobuf:"bytes,2,opt,name=ServiceSubset,proto3" json:"ServiceSubset,omitempty"`
-	Namespace     string `protobuf:"bytes,3,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
-	Partition     string `protobuf:"bytes,4,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	Datacenter    string `protobuf:"bytes,5,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
-	Peer          string `protobuf:"bytes,6,opt,name=Peer,proto3" json:"Peer,omitempty"`
-	SamenessGroup string `protobuf:"bytes,7,opt,name=SamenessGroup,proto3" json:"SamenessGroup,omitempty"`
-}
-
-func (x *ServiceResolverRedirect) Reset() {
-	*x = ServiceResolverRedirect{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceResolverRedirect) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceResolverRedirect) ProtoMessage() {}
-
-func (x *ServiceResolverRedirect) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceResolverRedirect.ProtoReflect.Descriptor instead.
-func (*ServiceResolverRedirect) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *ServiceResolverRedirect) GetService() string {
-	if x != nil {
-		return x.Service
-	}
-	return ""
-}
-
-func (x *ServiceResolverRedirect) GetServiceSubset() string {
-	if x != nil {
-		return x.ServiceSubset
-	}
-	return ""
-}
-
-func (x *ServiceResolverRedirect) GetNamespace() string {
-	if x != nil {
-		return x.Namespace
-	}
-	return ""
-}
-
-func (x *ServiceResolverRedirect) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *ServiceResolverRedirect) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-func (x *ServiceResolverRedirect) GetPeer() string {
-	if x != nil {
-		return x.Peer
-	}
-	return ""
-}
-
-func (x *ServiceResolverRedirect) GetSamenessGroup() string {
-	if x != nil {
-		return x.SamenessGroup
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceResolverFailover
-// output=config_entry.gen.go
-// name=Structs
-type ServiceResolverFailover struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Service       string                           `protobuf:"bytes,1,opt,name=Service,proto3" json:"Service,omitempty"`
-	ServiceSubset string                           `protobuf:"bytes,2,opt,name=ServiceSubset,proto3" json:"ServiceSubset,omitempty"`
-	Namespace     string                           `protobuf:"bytes,3,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
-	Datacenters   []string                         `protobuf:"bytes,4,rep,name=Datacenters,proto3" json:"Datacenters,omitempty"`
-	Targets       []*ServiceResolverFailoverTarget `protobuf:"bytes,5,rep,name=Targets,proto3" json:"Targets,omitempty"`
-	Policy        *ServiceResolverFailoverPolicy   `protobuf:"bytes,6,opt,name=Policy,proto3" json:"Policy,omitempty"`
-	SamenessGroup string                           `protobuf:"bytes,7,opt,name=SamenessGroup,proto3" json:"SamenessGroup,omitempty"`
-}
-
-func (x *ServiceResolverFailover) Reset() {
-	*x = ServiceResolverFailover{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceResolverFailover) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceResolverFailover) ProtoMessage() {}
-
-func (x *ServiceResolverFailover) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceResolverFailover.ProtoReflect.Descriptor instead.
-func (*ServiceResolverFailover) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *ServiceResolverFailover) GetService() string {
-	if x != nil {
-		return x.Service
-	}
-	return ""
-}
-
-func (x *ServiceResolverFailover) GetServiceSubset() string {
-	if x != nil {
-		return x.ServiceSubset
-	}
-	return ""
-}
-
-func (x *ServiceResolverFailover) GetNamespace() string {
-	if x != nil {
-		return x.Namespace
-	}
-	return ""
-}
-
-func (x *ServiceResolverFailover) GetDatacenters() []string {
-	if x != nil {
-		return x.Datacenters
-	}
-	return nil
-}
-
-func (x *ServiceResolverFailover) GetTargets() []*ServiceResolverFailoverTarget {
-	if x != nil {
-		return x.Targets
-	}
-	return nil
-}
-
-func (x *ServiceResolverFailover) GetPolicy() *ServiceResolverFailoverPolicy {
-	if x != nil {
-		return x.Policy
-	}
-	return nil
-}
-
-func (x *ServiceResolverFailover) GetSamenessGroup() string {
-	if x != nil {
-		return x.SamenessGroup
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceResolverFailoverPolicy
-// output=config_entry.gen.go
-// name=Structs
-type ServiceResolverFailoverPolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Mode    string   `protobuf:"bytes,1,opt,name=Mode,proto3" json:"Mode,omitempty"`
-	Regions []string `protobuf:"bytes,2,rep,name=Regions,proto3" json:"Regions,omitempty"`
-}
-
-func (x *ServiceResolverFailoverPolicy) Reset() {
-	*x = ServiceResolverFailoverPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceResolverFailoverPolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceResolverFailoverPolicy) ProtoMessage() {}
-
-func (x *ServiceResolverFailoverPolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceResolverFailoverPolicy.ProtoReflect.Descriptor instead.
-func (*ServiceResolverFailoverPolicy) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *ServiceResolverFailoverPolicy) GetMode() string {
-	if x != nil {
-		return x.Mode
-	}
-	return ""
-}
-
-func (x *ServiceResolverFailoverPolicy) GetRegions() []string {
-	if x != nil {
-		return x.Regions
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceResolverPrioritizeByLocality
-// output=config_entry.gen.go
-// name=Structs
-type ServiceResolverPrioritizeByLocality struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Mode string `protobuf:"bytes,1,opt,name=Mode,proto3" json:"Mode,omitempty"`
-}
-
-func (x *ServiceResolverPrioritizeByLocality) Reset() {
-	*x = ServiceResolverPrioritizeByLocality{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceResolverPrioritizeByLocality) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceResolverPrioritizeByLocality) ProtoMessage() {}
-
-func (x *ServiceResolverPrioritizeByLocality) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceResolverPrioritizeByLocality.ProtoReflect.Descriptor instead.
-func (*ServiceResolverPrioritizeByLocality) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *ServiceResolverPrioritizeByLocality) GetMode() string {
-	if x != nil {
-		return x.Mode
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceResolverFailoverTarget
-// output=config_entry.gen.go
-// name=Structs
-type ServiceResolverFailoverTarget struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Service       string `protobuf:"bytes,1,opt,name=Service,proto3" json:"Service,omitempty"`
-	ServiceSubset string `protobuf:"bytes,2,opt,name=ServiceSubset,proto3" json:"ServiceSubset,omitempty"`
-	Partition     string `protobuf:"bytes,3,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	Namespace     string `protobuf:"bytes,4,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
-	Datacenter    string `protobuf:"bytes,5,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
-	Peer          string `protobuf:"bytes,6,opt,name=Peer,proto3" json:"Peer,omitempty"`
-}
-
-func (x *ServiceResolverFailoverTarget) Reset() {
-	*x = ServiceResolverFailoverTarget{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceResolverFailoverTarget) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceResolverFailoverTarget) ProtoMessage() {}
-
-func (x *ServiceResolverFailoverTarget) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceResolverFailoverTarget.ProtoReflect.Descriptor instead.
-func (*ServiceResolverFailoverTarget) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{13}
-}
-
-func (x *ServiceResolverFailoverTarget) GetService() string {
-	if x != nil {
-		return x.Service
-	}
-	return ""
-}
-
-func (x *ServiceResolverFailoverTarget) GetServiceSubset() string {
-	if x != nil {
-		return x.ServiceSubset
-	}
-	return ""
-}
-
-func (x *ServiceResolverFailoverTarget) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *ServiceResolverFailoverTarget) GetNamespace() string {
-	if x != nil {
-		return x.Namespace
-	}
-	return ""
-}
-
-func (x *ServiceResolverFailoverTarget) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-func (x *ServiceResolverFailoverTarget) GetPeer() string {
-	if x != nil {
-		return x.Peer
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.LoadBalancer
-// output=config_entry.gen.go
-// name=Structs
-type LoadBalancer struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Policy             string              `protobuf:"bytes,1,opt,name=Policy,proto3" json:"Policy,omitempty"`
-	RingHashConfig     *RingHashConfig     `protobuf:"bytes,2,opt,name=RingHashConfig,proto3" json:"RingHashConfig,omitempty"`
-	LeastRequestConfig *LeastRequestConfig `protobuf:"bytes,3,opt,name=LeastRequestConfig,proto3" json:"LeastRequestConfig,omitempty"`
-	HashPolicies       []*HashPolicy       `protobuf:"bytes,4,rep,name=HashPolicies,proto3" json:"HashPolicies,omitempty"`
-}
-
-func (x *LoadBalancer) Reset() {
-	*x = LoadBalancer{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LoadBalancer) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LoadBalancer) ProtoMessage() {}
-
-func (x *LoadBalancer) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LoadBalancer.ProtoReflect.Descriptor instead.
-func (*LoadBalancer) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{14}
-}
-
-func (x *LoadBalancer) GetPolicy() string {
-	if x != nil {
-		return x.Policy
-	}
-	return ""
-}
-
-func (x *LoadBalancer) GetRingHashConfig() *RingHashConfig {
-	if x != nil {
-		return x.RingHashConfig
-	}
-	return nil
-}
-
-func (x *LoadBalancer) GetLeastRequestConfig() *LeastRequestConfig {
-	if x != nil {
-		return x.LeastRequestConfig
-	}
-	return nil
-}
-
-func (x *LoadBalancer) GetHashPolicies() []*HashPolicy {
-	if x != nil {
-		return x.HashPolicies
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.RingHashConfig
-// output=config_entry.gen.go
-// name=Structs
-type RingHashConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	MinimumRingSize uint64 `protobuf:"varint,1,opt,name=MinimumRingSize,proto3" json:"MinimumRingSize,omitempty"`
-	MaximumRingSize uint64 `protobuf:"varint,2,opt,name=MaximumRingSize,proto3" json:"MaximumRingSize,omitempty"`
-}
-
-func (x *RingHashConfig) Reset() {
-	*x = RingHashConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RingHashConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RingHashConfig) ProtoMessage() {}
-
-func (x *RingHashConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RingHashConfig.ProtoReflect.Descriptor instead.
-func (*RingHashConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{15}
-}
-
-func (x *RingHashConfig) GetMinimumRingSize() uint64 {
-	if x != nil {
-		return x.MinimumRingSize
-	}
-	return 0
-}
-
-func (x *RingHashConfig) GetMaximumRingSize() uint64 {
-	if x != nil {
-		return x.MaximumRingSize
-	}
-	return 0
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.LeastRequestConfig
-// output=config_entry.gen.go
-// name=Structs
-type LeastRequestConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ChoiceCount uint32 `protobuf:"varint,1,opt,name=ChoiceCount,proto3" json:"ChoiceCount,omitempty"`
-}
-
-func (x *LeastRequestConfig) Reset() {
-	*x = LeastRequestConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LeastRequestConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LeastRequestConfig) ProtoMessage() {}
-
-func (x *LeastRequestConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LeastRequestConfig.ProtoReflect.Descriptor instead.
-func (*LeastRequestConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{16}
-}
-
-func (x *LeastRequestConfig) GetChoiceCount() uint32 {
-	if x != nil {
-		return x.ChoiceCount
-	}
-	return 0
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HashPolicy
-// output=config_entry.gen.go
-// name=Structs
-type HashPolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Field        string        `protobuf:"bytes,1,opt,name=Field,proto3" json:"Field,omitempty"`
-	FieldValue   string        `protobuf:"bytes,2,opt,name=FieldValue,proto3" json:"FieldValue,omitempty"`
-	CookieConfig *CookieConfig `protobuf:"bytes,3,opt,name=CookieConfig,proto3" json:"CookieConfig,omitempty"`
-	SourceIP     bool          `protobuf:"varint,4,opt,name=SourceIP,proto3" json:"SourceIP,omitempty"`
-	Terminal     bool          `protobuf:"varint,5,opt,name=Terminal,proto3" json:"Terminal,omitempty"`
-}
-
-func (x *HashPolicy) Reset() {
-	*x = HashPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[17]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HashPolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HashPolicy) ProtoMessage() {}
-
-func (x *HashPolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[17]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HashPolicy.ProtoReflect.Descriptor instead.
-func (*HashPolicy) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{17}
-}
-
-func (x *HashPolicy) GetField() string {
-	if x != nil {
-		return x.Field
-	}
-	return ""
-}
-
-func (x *HashPolicy) GetFieldValue() string {
-	if x != nil {
-		return x.FieldValue
-	}
-	return ""
-}
-
-func (x *HashPolicy) GetCookieConfig() *CookieConfig {
-	if x != nil {
-		return x.CookieConfig
-	}
-	return nil
-}
-
-func (x *HashPolicy) GetSourceIP() bool {
-	if x != nil {
-		return x.SourceIP
-	}
-	return false
-}
-
-func (x *HashPolicy) GetTerminal() bool {
-	if x != nil {
-		return x.Terminal
-	}
-	return false
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.CookieConfig
-// output=config_entry.gen.go
-// name=Structs
-type CookieConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Session bool `protobuf:"varint,1,opt,name=Session,proto3" json:"Session,omitempty"`
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	TTL  *durationpb.Duration `protobuf:"bytes,2,opt,name=TTL,proto3" json:"TTL,omitempty"`
-	Path string               `protobuf:"bytes,3,opt,name=Path,proto3" json:"Path,omitempty"`
-}
-
-func (x *CookieConfig) Reset() {
-	*x = CookieConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[18]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CookieConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CookieConfig) ProtoMessage() {}
-
-func (x *CookieConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[18]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CookieConfig.ProtoReflect.Descriptor instead.
-func (*CookieConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{18}
-}
-
-func (x *CookieConfig) GetSession() bool {
-	if x != nil {
-		return x.Session
-	}
-	return false
-}
-
-func (x *CookieConfig) GetTTL() *durationpb.Duration {
-	if x != nil {
-		return x.TTL
-	}
-	return nil
-}
-
-func (x *CookieConfig) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IngressGatewayConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-type IngressGateway struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TLS       *GatewayTLSConfig     `protobuf:"bytes,1,opt,name=TLS,proto3" json:"TLS,omitempty"`
-	Listeners []*IngressListener    `protobuf:"bytes,2,rep,name=Listeners,proto3" json:"Listeners,omitempty"`
-	Meta      map[string]string     `protobuf:"bytes,3,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Defaults  *IngressServiceConfig `protobuf:"bytes,4,opt,name=Defaults,proto3" json:"Defaults,omitempty"`
-}
-
-func (x *IngressGateway) Reset() {
-	*x = IngressGateway{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[19]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IngressGateway) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IngressGateway) ProtoMessage() {}
-
-func (x *IngressGateway) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[19]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IngressGateway.ProtoReflect.Descriptor instead.
-func (*IngressGateway) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{19}
-}
-
-func (x *IngressGateway) GetTLS() *GatewayTLSConfig {
-	if x != nil {
-		return x.TLS
-	}
-	return nil
-}
-
-func (x *IngressGateway) GetListeners() []*IngressListener {
-	if x != nil {
-		return x.Listeners
-	}
-	return nil
-}
-
-func (x *IngressGateway) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *IngressGateway) GetDefaults() *IngressServiceConfig {
-	if x != nil {
-		return x.Defaults
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IngressServiceConfig
-// output=config_entry.gen.go
-// name=Structs
-type IngressServiceConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	MaxConnections        uint32              `protobuf:"varint,1,opt,name=MaxConnections,proto3" json:"MaxConnections,omitempty"`
-	MaxPendingRequests    uint32              `protobuf:"varint,2,opt,name=MaxPendingRequests,proto3" json:"MaxPendingRequests,omitempty"`
-	MaxConcurrentRequests uint32              `protobuf:"varint,3,opt,name=MaxConcurrentRequests,proto3" json:"MaxConcurrentRequests,omitempty"`
-	PassiveHealthCheck    *PassiveHealthCheck `protobuf:"bytes,4,opt,name=PassiveHealthCheck,proto3" json:"PassiveHealthCheck,omitempty"`
-}
-
-func (x *IngressServiceConfig) Reset() {
-	*x = IngressServiceConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[20]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IngressServiceConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IngressServiceConfig) ProtoMessage() {}
-
-func (x *IngressServiceConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[20]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IngressServiceConfig.ProtoReflect.Descriptor instead.
-func (*IngressServiceConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{20}
-}
-
-func (x *IngressServiceConfig) GetMaxConnections() uint32 {
-	if x != nil {
-		return x.MaxConnections
-	}
-	return 0
-}
-
-func (x *IngressServiceConfig) GetMaxPendingRequests() uint32 {
-	if x != nil {
-		return x.MaxPendingRequests
-	}
-	return 0
-}
-
-func (x *IngressServiceConfig) GetMaxConcurrentRequests() uint32 {
-	if x != nil {
-		return x.MaxConcurrentRequests
-	}
-	return 0
-}
-
-func (x *IngressServiceConfig) GetPassiveHealthCheck() *PassiveHealthCheck {
-	if x != nil {
-		return x.PassiveHealthCheck
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.GatewayTLSConfig
-// output=config_entry.gen.go
-// name=Structs
-type GatewayTLSConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Enabled bool                 `protobuf:"varint,1,opt,name=Enabled,proto3" json:"Enabled,omitempty"`
-	SDS     *GatewayTLSSDSConfig `protobuf:"bytes,2,opt,name=SDS,proto3" json:"SDS,omitempty"`
-	// mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
-	TLSMinVersion string `protobuf:"bytes,3,opt,name=TLSMinVersion,proto3" json:"TLSMinVersion,omitempty"`
-	// mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
-	TLSMaxVersion string `protobuf:"bytes,4,opt,name=TLSMaxVersion,proto3" json:"TLSMaxVersion,omitempty"`
-	// mog: func-from=cipherSuitesFromStructs func-to=cipherSuitesToStructs
-	CipherSuites []string `protobuf:"bytes,5,rep,name=CipherSuites,proto3" json:"CipherSuites,omitempty"`
-}
-
-func (x *GatewayTLSConfig) Reset() {
-	*x = GatewayTLSConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[21]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GatewayTLSConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GatewayTLSConfig) ProtoMessage() {}
-
-func (x *GatewayTLSConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[21]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GatewayTLSConfig.ProtoReflect.Descriptor instead.
-func (*GatewayTLSConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{21}
-}
-
-func (x *GatewayTLSConfig) GetEnabled() bool {
-	if x != nil {
-		return x.Enabled
-	}
-	return false
-}
-
-func (x *GatewayTLSConfig) GetSDS() *GatewayTLSSDSConfig {
-	if x != nil {
-		return x.SDS
-	}
-	return nil
-}
-
-func (x *GatewayTLSConfig) GetTLSMinVersion() string {
-	if x != nil {
-		return x.TLSMinVersion
-	}
-	return ""
-}
-
-func (x *GatewayTLSConfig) GetTLSMaxVersion() string {
-	if x != nil {
-		return x.TLSMaxVersion
-	}
-	return ""
-}
-
-func (x *GatewayTLSConfig) GetCipherSuites() []string {
-	if x != nil {
-		return x.CipherSuites
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.GatewayTLSSDSConfig
-// output=config_entry.gen.go
-// name=Structs
-type GatewayTLSSDSConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ClusterName  string `protobuf:"bytes,1,opt,name=ClusterName,proto3" json:"ClusterName,omitempty"`
-	CertResource string `protobuf:"bytes,2,opt,name=CertResource,proto3" json:"CertResource,omitempty"`
-}
-
-func (x *GatewayTLSSDSConfig) Reset() {
-	*x = GatewayTLSSDSConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[22]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GatewayTLSSDSConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GatewayTLSSDSConfig) ProtoMessage() {}
-
-func (x *GatewayTLSSDSConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[22]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GatewayTLSSDSConfig.ProtoReflect.Descriptor instead.
-func (*GatewayTLSSDSConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{22}
-}
-
-func (x *GatewayTLSSDSConfig) GetClusterName() string {
-	if x != nil {
-		return x.ClusterName
-	}
-	return ""
-}
-
-func (x *GatewayTLSSDSConfig) GetCertResource() string {
-	if x != nil {
-		return x.CertResource
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IngressListener
-// output=config_entry.gen.go
-// name=Structs
-type IngressListener struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=int func-from=int32
-	Port     int32             `protobuf:"varint,1,opt,name=Port,proto3" json:"Port,omitempty"`
-	Protocol string            `protobuf:"bytes,2,opt,name=Protocol,proto3" json:"Protocol,omitempty"`
-	Services []*IngressService `protobuf:"bytes,3,rep,name=Services,proto3" json:"Services,omitempty"`
-	TLS      *GatewayTLSConfig `protobuf:"bytes,4,opt,name=TLS,proto3" json:"TLS,omitempty"`
-}
-
-func (x *IngressListener) Reset() {
-	*x = IngressListener{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[23]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IngressListener) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IngressListener) ProtoMessage() {}
-
-func (x *IngressListener) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[23]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IngressListener.ProtoReflect.Descriptor instead.
-func (*IngressListener) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{23}
-}
-
-func (x *IngressListener) GetPort() int32 {
-	if x != nil {
-		return x.Port
-	}
-	return 0
-}
-
-func (x *IngressListener) GetProtocol() string {
-	if x != nil {
-		return x.Protocol
-	}
-	return ""
-}
-
-func (x *IngressListener) GetServices() []*IngressService {
-	if x != nil {
-		return x.Services
-	}
-	return nil
-}
-
-func (x *IngressListener) GetTLS() *GatewayTLSConfig {
-	if x != nil {
-		return x.TLS
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IngressService
-// output=config_entry.gen.go
-// name=Structs
-type IngressService struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name            string                   `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	Hosts           []string                 `protobuf:"bytes,2,rep,name=Hosts,proto3" json:"Hosts,omitempty"`
-	TLS             *GatewayServiceTLSConfig `protobuf:"bytes,3,opt,name=TLS,proto3" json:"TLS,omitempty"`
-	RequestHeaders  *HTTPHeaderModifiers     `protobuf:"bytes,4,opt,name=RequestHeaders,proto3" json:"RequestHeaders,omitempty"`
-	ResponseHeaders *HTTPHeaderModifiers     `protobuf:"bytes,5,opt,name=ResponseHeaders,proto3" json:"ResponseHeaders,omitempty"`
-	Meta            map[string]string        `protobuf:"bytes,6,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
-	EnterpriseMeta        *pbcommon.EnterpriseMeta `protobuf:"bytes,7,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
-	MaxConnections        uint32                   `protobuf:"varint,8,opt,name=MaxConnections,proto3" json:"MaxConnections,omitempty"`
-	MaxPendingRequests    uint32                   `protobuf:"varint,9,opt,name=MaxPendingRequests,proto3" json:"MaxPendingRequests,omitempty"`
-	MaxConcurrentRequests uint32                   `protobuf:"varint,10,opt,name=MaxConcurrentRequests,proto3" json:"MaxConcurrentRequests,omitempty"`
-	PassiveHealthCheck    *PassiveHealthCheck      `protobuf:"bytes,11,opt,name=PassiveHealthCheck,proto3" json:"PassiveHealthCheck,omitempty"`
-}
-
-func (x *IngressService) Reset() {
-	*x = IngressService{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[24]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IngressService) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IngressService) ProtoMessage() {}
-
-func (x *IngressService) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[24]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IngressService.ProtoReflect.Descriptor instead.
-func (*IngressService) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{24}
-}
-
-func (x *IngressService) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *IngressService) GetHosts() []string {
-	if x != nil {
-		return x.Hosts
-	}
-	return nil
-}
-
-func (x *IngressService) GetTLS() *GatewayServiceTLSConfig {
-	if x != nil {
-		return x.TLS
-	}
-	return nil
-}
-
-func (x *IngressService) GetRequestHeaders() *HTTPHeaderModifiers {
-	if x != nil {
-		return x.RequestHeaders
-	}
-	return nil
-}
-
-func (x *IngressService) GetResponseHeaders() *HTTPHeaderModifiers {
-	if x != nil {
-		return x.ResponseHeaders
-	}
-	return nil
-}
-
-func (x *IngressService) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *IngressService) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if x != nil {
-		return x.EnterpriseMeta
-	}
-	return nil
-}
-
-func (x *IngressService) GetMaxConnections() uint32 {
-	if x != nil {
-		return x.MaxConnections
-	}
-	return 0
-}
-
-func (x *IngressService) GetMaxPendingRequests() uint32 {
-	if x != nil {
-		return x.MaxPendingRequests
-	}
-	return 0
-}
-
-func (x *IngressService) GetMaxConcurrentRequests() uint32 {
-	if x != nil {
-		return x.MaxConcurrentRequests
-	}
-	return 0
-}
-
-func (x *IngressService) GetPassiveHealthCheck() *PassiveHealthCheck {
-	if x != nil {
-		return x.PassiveHealthCheck
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.GatewayServiceTLSConfig
-// output=config_entry.gen.go
-// name=Structs
-type GatewayServiceTLSConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	SDS *GatewayTLSSDSConfig `protobuf:"bytes,1,opt,name=SDS,proto3" json:"SDS,omitempty"`
-}
-
-func (x *GatewayServiceTLSConfig) Reset() {
-	*x = GatewayServiceTLSConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[25]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GatewayServiceTLSConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GatewayServiceTLSConfig) ProtoMessage() {}
-
-func (x *GatewayServiceTLSConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[25]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GatewayServiceTLSConfig.ProtoReflect.Descriptor instead.
-func (*GatewayServiceTLSConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{25}
-}
-
-func (x *GatewayServiceTLSConfig) GetSDS() *GatewayTLSSDSConfig {
-	if x != nil {
-		return x.SDS
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPHeaderModifiers
-// output=config_entry.gen.go
-// name=Structs
-type HTTPHeaderModifiers struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Add    map[string]string `protobuf:"bytes,1,rep,name=Add,proto3" json:"Add,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Set    map[string]string `protobuf:"bytes,2,rep,name=Set,proto3" json:"Set,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Remove []string          `protobuf:"bytes,3,rep,name=Remove,proto3" json:"Remove,omitempty"`
-}
-
-func (x *HTTPHeaderModifiers) Reset() {
-	*x = HTTPHeaderModifiers{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[26]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPHeaderModifiers) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPHeaderModifiers) ProtoMessage() {}
-
-func (x *HTTPHeaderModifiers) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[26]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPHeaderModifiers.ProtoReflect.Descriptor instead.
-func (*HTTPHeaderModifiers) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{26}
-}
-
-func (x *HTTPHeaderModifiers) GetAdd() map[string]string {
-	if x != nil {
-		return x.Add
-	}
-	return nil
-}
-
-func (x *HTTPHeaderModifiers) GetSet() map[string]string {
-	if x != nil {
-		return x.Set
-	}
-	return nil
-}
-
-func (x *HTTPHeaderModifiers) GetRemove() []string {
-	if x != nil {
-		return x.Remove
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceIntentionsConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-type ServiceIntentions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Sources []*SourceIntention       `protobuf:"bytes,1,rep,name=Sources,proto3" json:"Sources,omitempty"`
-	Meta    map[string]string        `protobuf:"bytes,2,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	JWT     *IntentionJWTRequirement `protobuf:"bytes,3,opt,name=JWT,proto3" json:"JWT,omitempty"`
-}
-
-func (x *ServiceIntentions) Reset() {
-	*x = ServiceIntentions{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[27]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceIntentions) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceIntentions) ProtoMessage() {}
-
-func (x *ServiceIntentions) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[27]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceIntentions.ProtoReflect.Descriptor instead.
-func (*ServiceIntentions) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{27}
-}
-
-func (x *ServiceIntentions) GetSources() []*SourceIntention {
-	if x != nil {
-		return x.Sources
-	}
-	return nil
-}
-
-func (x *ServiceIntentions) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *ServiceIntentions) GetJWT() *IntentionJWTRequirement {
-	if x != nil {
-		return x.JWT
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IntentionJWTRequirement
-// output=config_entry.gen.go
-// name=Structs
-type IntentionJWTRequirement struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Providers []*IntentionJWTProvider `protobuf:"bytes,1,rep,name=Providers,proto3" json:"Providers,omitempty"`
-}
-
-func (x *IntentionJWTRequirement) Reset() {
-	*x = IntentionJWTRequirement{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[28]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IntentionJWTRequirement) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IntentionJWTRequirement) ProtoMessage() {}
-
-func (x *IntentionJWTRequirement) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[28]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IntentionJWTRequirement.ProtoReflect.Descriptor instead.
-func (*IntentionJWTRequirement) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{28}
-}
-
-func (x *IntentionJWTRequirement) GetProviders() []*IntentionJWTProvider {
-	if x != nil {
-		return x.Providers
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IntentionJWTProvider
-// output=config_entry.gen.go
-// name=Structs
-type IntentionJWTProvider struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name         string                           `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	VerifyClaims []*IntentionJWTClaimVerification `protobuf:"bytes,2,rep,name=VerifyClaims,proto3" json:"VerifyClaims,omitempty"`
-}
-
-func (x *IntentionJWTProvider) Reset() {
-	*x = IntentionJWTProvider{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[29]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IntentionJWTProvider) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IntentionJWTProvider) ProtoMessage() {}
-
-func (x *IntentionJWTProvider) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[29]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IntentionJWTProvider.ProtoReflect.Descriptor instead.
-func (*IntentionJWTProvider) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{29}
-}
-
-func (x *IntentionJWTProvider) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *IntentionJWTProvider) GetVerifyClaims() []*IntentionJWTClaimVerification {
-	if x != nil {
-		return x.VerifyClaims
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IntentionJWTClaimVerification
-// output=config_entry.gen.go
-// name=Structs
-type IntentionJWTClaimVerification struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Path  []string `protobuf:"bytes,1,rep,name=Path,proto3" json:"Path,omitempty"`
-	Value string   `protobuf:"bytes,2,opt,name=Value,proto3" json:"Value,omitempty"`
-}
-
-func (x *IntentionJWTClaimVerification) Reset() {
-	*x = IntentionJWTClaimVerification{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[30]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IntentionJWTClaimVerification) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IntentionJWTClaimVerification) ProtoMessage() {}
-
-func (x *IntentionJWTClaimVerification) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[30]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IntentionJWTClaimVerification.ProtoReflect.Descriptor instead.
-func (*IntentionJWTClaimVerification) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{30}
-}
-
-func (x *IntentionJWTClaimVerification) GetPath() []string {
-	if x != nil {
-		return x.Path
-	}
-	return nil
-}
-
-func (x *IntentionJWTClaimVerification) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.SourceIntention
-// output=config_entry.gen.go
-// name=Structs
-type SourceIntention struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	// mog: func-to=intentionActionToStructs func-from=intentionActionFromStructs
-	Action      IntentionAction        `protobuf:"varint,2,opt,name=Action,proto3,enum=hashicorp.consul.internal.configentry.IntentionAction" json:"Action,omitempty"`
-	Permissions []*IntentionPermission `protobuf:"bytes,3,rep,name=Permissions,proto3" json:"Permissions,omitempty"`
-	// mog: func-to=int func-from=int32
-	Precedence int32  `protobuf:"varint,4,opt,name=Precedence,proto3" json:"Precedence,omitempty"`
-	LegacyID   string `protobuf:"bytes,5,opt,name=LegacyID,proto3" json:"LegacyID,omitempty"`
-	// mog: func-to=intentionSourceTypeToStructs func-from=intentionSourceTypeFromStructs
-	Type        IntentionSourceType `protobuf:"varint,6,opt,name=Type,proto3,enum=hashicorp.consul.internal.configentry.IntentionSourceType" json:"Type,omitempty"`
-	Description string              `protobuf:"bytes,7,opt,name=Description,proto3" json:"Description,omitempty"`
-	LegacyMeta  map[string]string   `protobuf:"bytes,8,rep,name=LegacyMeta,proto3" json:"LegacyMeta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// mog: func-to=timeToStructs func-from=timeFromStructs
-	LegacyCreateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=LegacyCreateTime,proto3" json:"LegacyCreateTime,omitempty"`
-	// mog: func-to=timeToStructs func-from=timeFromStructs
-	LegacyUpdateTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=LegacyUpdateTime,proto3" json:"LegacyUpdateTime,omitempty"`
-	// mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
-	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,11,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
-	Peer           string                   `protobuf:"bytes,12,opt,name=Peer,proto3" json:"Peer,omitempty"`
-	SamenessGroup  string                   `protobuf:"bytes,13,opt,name=SamenessGroup,proto3" json:"SamenessGroup,omitempty"`
-}
-
-func (x *SourceIntention) Reset() {
-	*x = SourceIntention{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[31]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SourceIntention) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SourceIntention) ProtoMessage() {}
-
-func (x *SourceIntention) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[31]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SourceIntention.ProtoReflect.Descriptor instead.
-func (*SourceIntention) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{31}
-}
-
-func (x *SourceIntention) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *SourceIntention) GetAction() IntentionAction {
-	if x != nil {
-		return x.Action
-	}
-	return IntentionAction_Deny
-}
-
-func (x *SourceIntention) GetPermissions() []*IntentionPermission {
-	if x != nil {
-		return x.Permissions
-	}
-	return nil
-}
-
-func (x *SourceIntention) GetPrecedence() int32 {
-	if x != nil {
-		return x.Precedence
-	}
-	return 0
-}
-
-func (x *SourceIntention) GetLegacyID() string {
-	if x != nil {
-		return x.LegacyID
-	}
-	return ""
-}
-
-func (x *SourceIntention) GetType() IntentionSourceType {
-	if x != nil {
-		return x.Type
-	}
-	return IntentionSourceType_Consul
-}
-
-func (x *SourceIntention) GetDescription() string {
-	if x != nil {
-		return x.Description
-	}
-	return ""
-}
-
-func (x *SourceIntention) GetLegacyMeta() map[string]string {
-	if x != nil {
-		return x.LegacyMeta
-	}
-	return nil
-}
-
-func (x *SourceIntention) GetLegacyCreateTime() *timestamppb.Timestamp {
-	if x != nil {
-		return x.LegacyCreateTime
-	}
-	return nil
-}
-
-func (x *SourceIntention) GetLegacyUpdateTime() *timestamppb.Timestamp {
-	if x != nil {
-		return x.LegacyUpdateTime
-	}
-	return nil
-}
-
-func (x *SourceIntention) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if x != nil {
-		return x.EnterpriseMeta
-	}
-	return nil
-}
-
-func (x *SourceIntention) GetPeer() string {
-	if x != nil {
-		return x.Peer
-	}
-	return ""
-}
-
-func (x *SourceIntention) GetSamenessGroup() string {
-	if x != nil {
-		return x.SamenessGroup
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IntentionPermission
-// output=config_entry.gen.go
-// name=Structs
-type IntentionPermission struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=intentionActionToStructs func-from=intentionActionFromStructs
-	Action IntentionAction          `protobuf:"varint,1,opt,name=Action,proto3,enum=hashicorp.consul.internal.configentry.IntentionAction" json:"Action,omitempty"`
-	HTTP   *IntentionHTTPPermission `protobuf:"bytes,2,opt,name=HTTP,proto3" json:"HTTP,omitempty"`
-	JWT    *IntentionJWTRequirement `protobuf:"bytes,3,opt,name=JWT,proto3" json:"JWT,omitempty"`
-}
-
-func (x *IntentionPermission) Reset() {
-	*x = IntentionPermission{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[32]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IntentionPermission) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IntentionPermission) ProtoMessage() {}
-
-func (x *IntentionPermission) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[32]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IntentionPermission.ProtoReflect.Descriptor instead.
-func (*IntentionPermission) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{32}
-}
-
-func (x *IntentionPermission) GetAction() IntentionAction {
-	if x != nil {
-		return x.Action
-	}
-	return IntentionAction_Deny
-}
-
-func (x *IntentionPermission) GetHTTP() *IntentionHTTPPermission {
-	if x != nil {
-		return x.HTTP
-	}
-	return nil
-}
-
-func (x *IntentionPermission) GetJWT() *IntentionJWTRequirement {
-	if x != nil {
-		return x.JWT
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IntentionHTTPPermission
-// output=config_entry.gen.go
-// name=Structs
-type IntentionHTTPPermission struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PathExact  string                           `protobuf:"bytes,1,opt,name=PathExact,proto3" json:"PathExact,omitempty"`
-	PathPrefix string                           `protobuf:"bytes,2,opt,name=PathPrefix,proto3" json:"PathPrefix,omitempty"`
-	PathRegex  string                           `protobuf:"bytes,3,opt,name=PathRegex,proto3" json:"PathRegex,omitempty"`
-	Header     []*IntentionHTTPHeaderPermission `protobuf:"bytes,4,rep,name=Header,proto3" json:"Header,omitempty"`
-	Methods    []string                         `protobuf:"bytes,5,rep,name=Methods,proto3" json:"Methods,omitempty"`
-}
-
-func (x *IntentionHTTPPermission) Reset() {
-	*x = IntentionHTTPPermission{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[33]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IntentionHTTPPermission) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IntentionHTTPPermission) ProtoMessage() {}
-
-func (x *IntentionHTTPPermission) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[33]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IntentionHTTPPermission.ProtoReflect.Descriptor instead.
-func (*IntentionHTTPPermission) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{33}
-}
-
-func (x *IntentionHTTPPermission) GetPathExact() string {
-	if x != nil {
-		return x.PathExact
-	}
-	return ""
-}
-
-func (x *IntentionHTTPPermission) GetPathPrefix() string {
-	if x != nil {
-		return x.PathPrefix
-	}
-	return ""
-}
-
-func (x *IntentionHTTPPermission) GetPathRegex() string {
-	if x != nil {
-		return x.PathRegex
-	}
-	return ""
-}
-
-func (x *IntentionHTTPPermission) GetHeader() []*IntentionHTTPHeaderPermission {
-	if x != nil {
-		return x.Header
-	}
-	return nil
-}
-
-func (x *IntentionHTTPPermission) GetMethods() []string {
-	if x != nil {
-		return x.Methods
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IntentionHTTPHeaderPermission
-// output=config_entry.gen.go
-// name=Structs
-type IntentionHTTPHeaderPermission struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name    string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	Present bool   `protobuf:"varint,2,opt,name=Present,proto3" json:"Present,omitempty"`
-	Exact   string `protobuf:"bytes,3,opt,name=Exact,proto3" json:"Exact,omitempty"`
-	Prefix  string `protobuf:"bytes,4,opt,name=Prefix,proto3" json:"Prefix,omitempty"`
-	Suffix  string `protobuf:"bytes,5,opt,name=Suffix,proto3" json:"Suffix,omitempty"`
-	Regex   string `protobuf:"bytes,6,opt,name=Regex,proto3" json:"Regex,omitempty"`
-	Invert  bool   `protobuf:"varint,7,opt,name=Invert,proto3" json:"Invert,omitempty"`
-}
-
-func (x *IntentionHTTPHeaderPermission) Reset() {
-	*x = IntentionHTTPHeaderPermission{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[34]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IntentionHTTPHeaderPermission) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IntentionHTTPHeaderPermission) ProtoMessage() {}
-
-func (x *IntentionHTTPHeaderPermission) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[34]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IntentionHTTPHeaderPermission.ProtoReflect.Descriptor instead.
-func (*IntentionHTTPHeaderPermission) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{34}
-}
-
-func (x *IntentionHTTPHeaderPermission) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *IntentionHTTPHeaderPermission) GetPresent() bool {
-	if x != nil {
-		return x.Present
-	}
-	return false
-}
-
-func (x *IntentionHTTPHeaderPermission) GetExact() string {
-	if x != nil {
-		return x.Exact
-	}
-	return ""
-}
-
-func (x *IntentionHTTPHeaderPermission) GetPrefix() string {
-	if x != nil {
-		return x.Prefix
-	}
-	return ""
-}
-
-func (x *IntentionHTTPHeaderPermission) GetSuffix() string {
-	if x != nil {
-		return x.Suffix
-	}
-	return ""
-}
-
-func (x *IntentionHTTPHeaderPermission) GetRegex() string {
-	if x != nil {
-		return x.Regex
-	}
-	return ""
-}
-
-func (x *IntentionHTTPHeaderPermission) GetInvert() bool {
-	if x != nil {
-		return x.Invert
-	}
-	return false
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-type ServiceDefaults struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Protocol string `protobuf:"bytes,1,opt,name=Protocol,proto3" json:"Protocol,omitempty"`
-	// mog: func-to=proxyModeToStructs func-from=proxyModeFromStructs
-	Mode             ProxyMode               `protobuf:"varint,2,opt,name=Mode,proto3,enum=hashicorp.consul.internal.configentry.ProxyMode" json:"Mode,omitempty"`
-	TransparentProxy *TransparentProxyConfig `protobuf:"bytes,3,opt,name=TransparentProxy,proto3" json:"TransparentProxy,omitempty"`
-	MeshGateway      *MeshGatewayConfig      `protobuf:"bytes,4,opt,name=MeshGateway,proto3" json:"MeshGateway,omitempty"`
-	Expose           *ExposeConfig           `protobuf:"bytes,5,opt,name=Expose,proto3" json:"Expose,omitempty"`
-	ExternalSNI      string                  `protobuf:"bytes,6,opt,name=ExternalSNI,proto3" json:"ExternalSNI,omitempty"`
-	UpstreamConfig   *UpstreamConfiguration  `protobuf:"bytes,7,opt,name=UpstreamConfig,proto3" json:"UpstreamConfig,omitempty"`
-	Destination      *DestinationConfig      `protobuf:"bytes,8,opt,name=Destination,proto3" json:"Destination,omitempty"`
-	// mog: func-to=int func-from=int32
-	MaxInboundConnections int32 `protobuf:"varint,9,opt,name=MaxInboundConnections,proto3" json:"MaxInboundConnections,omitempty"`
-	// mog: func-to=int func-from=int32
-	LocalConnectTimeoutMs int32 `protobuf:"varint,10,opt,name=LocalConnectTimeoutMs,proto3" json:"LocalConnectTimeoutMs,omitempty"`
-	// mog: func-to=int func-from=int32
-	LocalRequestTimeoutMs     int32             `protobuf:"varint,11,opt,name=LocalRequestTimeoutMs,proto3" json:"LocalRequestTimeoutMs,omitempty"`
-	BalanceInboundConnections string            `protobuf:"bytes,12,opt,name=BalanceInboundConnections,proto3" json:"BalanceInboundConnections,omitempty"`
-	RateLimits                *RateLimits       `protobuf:"bytes,16,opt,name=RateLimits,proto3" json:"RateLimits,omitempty"`
-	Meta                      map[string]string `protobuf:"bytes,13,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// mog: func-to=EnvoyExtensionsToStructs func-from=EnvoyExtensionsFromStructs
-	EnvoyExtensions []*pbcommon.EnvoyExtension `protobuf:"bytes,14,rep,name=EnvoyExtensions,proto3" json:"EnvoyExtensions,omitempty"`
-	// mog: func-to=mutualTLSModeToStructs func-from=mutualTLSModeFromStructs
-	MutualTLSMode MutualTLSMode `protobuf:"varint,15,opt,name=MutualTLSMode,proto3,enum=hashicorp.consul.internal.configentry.MutualTLSMode" json:"MutualTLSMode,omitempty"`
-}
-
-func (x *ServiceDefaults) Reset() {
-	*x = ServiceDefaults{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[35]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceDefaults) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceDefaults) ProtoMessage() {}
-
-func (x *ServiceDefaults) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[35]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceDefaults.ProtoReflect.Descriptor instead.
-func (*ServiceDefaults) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{35}
-}
-
-func (x *ServiceDefaults) GetProtocol() string {
-	if x != nil {
-		return x.Protocol
-	}
-	return ""
-}
-
-func (x *ServiceDefaults) GetMode() ProxyMode {
-	if x != nil {
-		return x.Mode
-	}
-	return ProxyMode_ProxyModeDefault
-}
-
-func (x *ServiceDefaults) GetTransparentProxy() *TransparentProxyConfig {
-	if x != nil {
-		return x.TransparentProxy
-	}
-	return nil
-}
-
-func (x *ServiceDefaults) GetMeshGateway() *MeshGatewayConfig {
-	if x != nil {
-		return x.MeshGateway
-	}
-	return nil
-}
-
-func (x *ServiceDefaults) GetExpose() *ExposeConfig {
-	if x != nil {
-		return x.Expose
-	}
-	return nil
-}
-
-func (x *ServiceDefaults) GetExternalSNI() string {
-	if x != nil {
-		return x.ExternalSNI
-	}
-	return ""
-}
-
-func (x *ServiceDefaults) GetUpstreamConfig() *UpstreamConfiguration {
-	if x != nil {
-		return x.UpstreamConfig
-	}
-	return nil
-}
-
-func (x *ServiceDefaults) GetDestination() *DestinationConfig {
-	if x != nil {
-		return x.Destination
-	}
-	return nil
-}
-
-func (x *ServiceDefaults) GetMaxInboundConnections() int32 {
-	if x != nil {
-		return x.MaxInboundConnections
-	}
-	return 0
-}
-
-func (x *ServiceDefaults) GetLocalConnectTimeoutMs() int32 {
-	if x != nil {
-		return x.LocalConnectTimeoutMs
-	}
-	return 0
-}
-
-func (x *ServiceDefaults) GetLocalRequestTimeoutMs() int32 {
-	if x != nil {
-		return x.LocalRequestTimeoutMs
-	}
-	return 0
-}
-
-func (x *ServiceDefaults) GetBalanceInboundConnections() string {
-	if x != nil {
-		return x.BalanceInboundConnections
-	}
-	return ""
-}
-
-func (x *ServiceDefaults) GetRateLimits() *RateLimits {
-	if x != nil {
-		return x.RateLimits
-	}
-	return nil
-}
-
-func (x *ServiceDefaults) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *ServiceDefaults) GetEnvoyExtensions() []*pbcommon.EnvoyExtension {
-	if x != nil {
-		return x.EnvoyExtensions
-	}
-	return nil
-}
-
-func (x *ServiceDefaults) GetMutualTLSMode() MutualTLSMode {
-	if x != nil {
-		return x.MutualTLSMode
-	}
-	return MutualTLSMode_MutualTLSModeDefault
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.TransparentProxyConfig
-// output=config_entry.gen.go
-// name=Structs
-type TransparentProxyConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=int func-from=int32
-	OutboundListenerPort int32 `protobuf:"varint,1,opt,name=OutboundListenerPort,proto3" json:"OutboundListenerPort,omitempty"`
-	DialedDirectly       bool  `protobuf:"varint,2,opt,name=DialedDirectly,proto3" json:"DialedDirectly,omitempty"`
-}
-
-func (x *TransparentProxyConfig) Reset() {
-	*x = TransparentProxyConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[36]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TransparentProxyConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TransparentProxyConfig) ProtoMessage() {}
-
-func (x *TransparentProxyConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[36]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TransparentProxyConfig.ProtoReflect.Descriptor instead.
-func (*TransparentProxyConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{36}
-}
-
-func (x *TransparentProxyConfig) GetOutboundListenerPort() int32 {
-	if x != nil {
-		return x.OutboundListenerPort
-	}
-	return 0
-}
-
-func (x *TransparentProxyConfig) GetDialedDirectly() bool {
-	if x != nil {
-		return x.DialedDirectly
-	}
-	return false
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.MeshGatewayConfig
-// output=config_entry.gen.go
-// name=Structs
-type MeshGatewayConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=meshGatewayModeToStructs func-from=meshGatewayModeFromStructs
-	Mode MeshGatewayMode `protobuf:"varint,1,opt,name=Mode,proto3,enum=hashicorp.consul.internal.configentry.MeshGatewayMode" json:"Mode,omitempty"`
-}
-
-func (x *MeshGatewayConfig) Reset() {
-	*x = MeshGatewayConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[37]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MeshGatewayConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MeshGatewayConfig) ProtoMessage() {}
-
-func (x *MeshGatewayConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[37]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MeshGatewayConfig.ProtoReflect.Descriptor instead.
-func (*MeshGatewayConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{37}
-}
-
-func (x *MeshGatewayConfig) GetMode() MeshGatewayMode {
-	if x != nil {
-		return x.Mode
-	}
-	return MeshGatewayMode_MeshGatewayModeDefault
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ExposeConfig
-// output=config_entry.gen.go
-// name=Structs
-type ExposeConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Checks bool          `protobuf:"varint,1,opt,name=Checks,proto3" json:"Checks,omitempty"`
-	Paths  []*ExposePath `protobuf:"bytes,2,rep,name=Paths,proto3" json:"Paths,omitempty"`
-}
-
-func (x *ExposeConfig) Reset() {
-	*x = ExposeConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[38]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExposeConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExposeConfig) ProtoMessage() {}
-
-func (x *ExposeConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[38]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExposeConfig.ProtoReflect.Descriptor instead.
-func (*ExposeConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{38}
-}
-
-func (x *ExposeConfig) GetChecks() bool {
-	if x != nil {
-		return x.Checks
-	}
-	return false
-}
-
-func (x *ExposeConfig) GetPaths() []*ExposePath {
-	if x != nil {
-		return x.Paths
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ExposePath
-// output=config_entry.gen.go
-// name=Structs
-type ExposePath struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=int func-from=int32
-	ListenerPort int32  `protobuf:"varint,1,opt,name=ListenerPort,proto3" json:"ListenerPort,omitempty"`
-	Path         string `protobuf:"bytes,2,opt,name=Path,proto3" json:"Path,omitempty"`
-	// mog: func-to=int func-from=int32
-	LocalPathPort   int32  `protobuf:"varint,3,opt,name=LocalPathPort,proto3" json:"LocalPathPort,omitempty"`
-	Protocol        string `protobuf:"bytes,4,opt,name=Protocol,proto3" json:"Protocol,omitempty"`
-	ParsedFromCheck bool   `protobuf:"varint,5,opt,name=ParsedFromCheck,proto3" json:"ParsedFromCheck,omitempty"`
-}
-
-func (x *ExposePath) Reset() {
-	*x = ExposePath{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[39]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExposePath) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExposePath) ProtoMessage() {}
-
-func (x *ExposePath) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[39]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExposePath.ProtoReflect.Descriptor instead.
-func (*ExposePath) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{39}
-}
-
-func (x *ExposePath) GetListenerPort() int32 {
-	if x != nil {
-		return x.ListenerPort
-	}
-	return 0
-}
-
-func (x *ExposePath) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-func (x *ExposePath) GetLocalPathPort() int32 {
-	if x != nil {
-		return x.LocalPathPort
-	}
-	return 0
-}
-
-func (x *ExposePath) GetProtocol() string {
-	if x != nil {
-		return x.Protocol
-	}
-	return ""
-}
-
-func (x *ExposePath) GetParsedFromCheck() bool {
-	if x != nil {
-		return x.ParsedFromCheck
-	}
-	return false
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.UpstreamConfiguration
-// output=config_entry.gen.go
-// name=Structs
-type UpstreamConfiguration struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Overrides []*UpstreamConfig `protobuf:"bytes,1,rep,name=Overrides,proto3" json:"Overrides,omitempty"`
-	Defaults  *UpstreamConfig   `protobuf:"bytes,2,opt,name=Defaults,proto3" json:"Defaults,omitempty"`
-}
-
-func (x *UpstreamConfiguration) Reset() {
-	*x = UpstreamConfiguration{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[40]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UpstreamConfiguration) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UpstreamConfiguration) ProtoMessage() {}
-
-func (x *UpstreamConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[40]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UpstreamConfiguration.ProtoReflect.Descriptor instead.
-func (*UpstreamConfiguration) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{40}
-}
-
-func (x *UpstreamConfiguration) GetOverrides() []*UpstreamConfig {
-	if x != nil {
-		return x.Overrides
-	}
-	return nil
-}
-
-func (x *UpstreamConfiguration) GetDefaults() *UpstreamConfig {
-	if x != nil {
-		return x.Defaults
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.UpstreamConfig
-// output=config_entry.gen.go
-// name=Structs
-type UpstreamConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	// mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
-	EnterpriseMeta    *pbcommon.EnterpriseMeta `protobuf:"bytes,2,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
-	EnvoyListenerJSON string                   `protobuf:"bytes,3,opt,name=EnvoyListenerJSON,proto3" json:"EnvoyListenerJSON,omitempty"`
-	EnvoyClusterJSON  string                   `protobuf:"bytes,4,opt,name=EnvoyClusterJSON,proto3" json:"EnvoyClusterJSON,omitempty"`
-	Protocol          string                   `protobuf:"bytes,5,opt,name=Protocol,proto3" json:"Protocol,omitempty"`
-	// mog: func-to=int func-from=int32
-	ConnectTimeoutMs           int32               `protobuf:"varint,6,opt,name=ConnectTimeoutMs,proto3" json:"ConnectTimeoutMs,omitempty"`
-	Limits                     *UpstreamLimits     `protobuf:"bytes,7,opt,name=Limits,proto3" json:"Limits,omitempty"`
-	PassiveHealthCheck         *PassiveHealthCheck `protobuf:"bytes,8,opt,name=PassiveHealthCheck,proto3" json:"PassiveHealthCheck,omitempty"`
-	MeshGateway                *MeshGatewayConfig  `protobuf:"bytes,9,opt,name=MeshGateway,proto3" json:"MeshGateway,omitempty"`
-	BalanceOutboundConnections string              `protobuf:"bytes,10,opt,name=BalanceOutboundConnections,proto3" json:"BalanceOutboundConnections,omitempty"`
-	Peer                       string              `protobuf:"bytes,11,opt,name=Peer,proto3" json:"Peer,omitempty"`
-}
-
-func (x *UpstreamConfig) Reset() {
-	*x = UpstreamConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[41]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UpstreamConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UpstreamConfig) ProtoMessage() {}
-
-func (x *UpstreamConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[41]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UpstreamConfig.ProtoReflect.Descriptor instead.
-func (*UpstreamConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{41}
-}
-
-func (x *UpstreamConfig) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *UpstreamConfig) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if x != nil {
-		return x.EnterpriseMeta
-	}
-	return nil
-}
-
-func (x *UpstreamConfig) GetEnvoyListenerJSON() string {
-	if x != nil {
-		return x.EnvoyListenerJSON
-	}
-	return ""
-}
-
-func (x *UpstreamConfig) GetEnvoyClusterJSON() string {
-	if x != nil {
-		return x.EnvoyClusterJSON
-	}
-	return ""
-}
-
-func (x *UpstreamConfig) GetProtocol() string {
-	if x != nil {
-		return x.Protocol
-	}
-	return ""
-}
-
-func (x *UpstreamConfig) GetConnectTimeoutMs() int32 {
-	if x != nil {
-		return x.ConnectTimeoutMs
-	}
-	return 0
-}
-
-func (x *UpstreamConfig) GetLimits() *UpstreamLimits {
-	if x != nil {
-		return x.Limits
-	}
-	return nil
-}
-
-func (x *UpstreamConfig) GetPassiveHealthCheck() *PassiveHealthCheck {
-	if x != nil {
-		return x.PassiveHealthCheck
-	}
-	return nil
-}
-
-func (x *UpstreamConfig) GetMeshGateway() *MeshGatewayConfig {
-	if x != nil {
-		return x.MeshGateway
-	}
-	return nil
-}
-
-func (x *UpstreamConfig) GetBalanceOutboundConnections() string {
-	if x != nil {
-		return x.BalanceOutboundConnections
-	}
-	return ""
-}
-
-func (x *UpstreamConfig) GetPeer() string {
-	if x != nil {
-		return x.Peer
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.UpstreamLimits
-// output=config_entry.gen.go
-// name=Structs
-type UpstreamLimits struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=pointerToIntFromInt32 func-from=int32FromPointerToInt
-	MaxConnections int32 `protobuf:"varint,1,opt,name=MaxConnections,proto3" json:"MaxConnections,omitempty"`
-	// mog: func-to=pointerToIntFromInt32 func-from=int32FromPointerToInt
-	MaxPendingRequests int32 `protobuf:"varint,2,opt,name=MaxPendingRequests,proto3" json:"MaxPendingRequests,omitempty"`
-	// mog: func-to=pointerToIntFromInt32 func-from=int32FromPointerToInt
-	MaxConcurrentRequests int32 `protobuf:"varint,3,opt,name=MaxConcurrentRequests,proto3" json:"MaxConcurrentRequests,omitempty"`
-}
-
-func (x *UpstreamLimits) Reset() {
-	*x = UpstreamLimits{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[42]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UpstreamLimits) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UpstreamLimits) ProtoMessage() {}
-
-func (x *UpstreamLimits) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[42]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use UpstreamLimits.ProtoReflect.Descriptor instead.
-func (*UpstreamLimits) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{42}
-}
-
-func (x *UpstreamLimits) GetMaxConnections() int32 {
-	if x != nil {
-		return x.MaxConnections
-	}
-	return 0
-}
-
-func (x *UpstreamLimits) GetMaxPendingRequests() int32 {
-	if x != nil {
-		return x.MaxPendingRequests
-	}
-	return 0
-}
-
-func (x *UpstreamLimits) GetMaxConcurrentRequests() int32 {
-	if x != nil {
-		return x.MaxConcurrentRequests
-	}
-	return 0
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.PassiveHealthCheck
-// output=config_entry.gen.go
-// name=Structs
-type PassiveHealthCheck struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	Interval    *durationpb.Duration `protobuf:"bytes,1,opt,name=Interval,proto3" json:"Interval,omitempty"`
-	MaxFailures uint32               `protobuf:"varint,2,opt,name=MaxFailures,proto3" json:"MaxFailures,omitempty"`
-	// mog: target=EnforcingConsecutive5xx func-to=pointerToUint32FromUint32 func-from=uint32FromPointerToUint32
-	EnforcingConsecutive5Xx uint32 `protobuf:"varint,3,opt,name=EnforcingConsecutive5xx,proto3" json:"EnforcingConsecutive5xx,omitempty"`
-	// mog: func-to=pointerToUint32FromUint32 func-from=uint32FromPointerToUint32
-	MaxEjectionPercent uint32 `protobuf:"varint,4,opt,name=MaxEjectionPercent,proto3" json:"MaxEjectionPercent,omitempty"`
-	// mog: func-to=structs.DurationPointerFromProto func-from=structs.DurationPointerToProto
-	BaseEjectionTime *durationpb.Duration `protobuf:"bytes,5,opt,name=BaseEjectionTime,proto3" json:"BaseEjectionTime,omitempty"`
-}
-
-func (x *PassiveHealthCheck) Reset() {
-	*x = PassiveHealthCheck{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[43]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PassiveHealthCheck) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PassiveHealthCheck) ProtoMessage() {}
-
-func (x *PassiveHealthCheck) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[43]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PassiveHealthCheck.ProtoReflect.Descriptor instead.
-func (*PassiveHealthCheck) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{43}
-}
-
-func (x *PassiveHealthCheck) GetInterval() *durationpb.Duration {
-	if x != nil {
-		return x.Interval
-	}
-	return nil
-}
-
-func (x *PassiveHealthCheck) GetMaxFailures() uint32 {
-	if x != nil {
-		return x.MaxFailures
-	}
-	return 0
-}
-
-func (x *PassiveHealthCheck) GetEnforcingConsecutive5Xx() uint32 {
-	if x != nil {
-		return x.EnforcingConsecutive5Xx
-	}
-	return 0
-}
-
-func (x *PassiveHealthCheck) GetMaxEjectionPercent() uint32 {
-	if x != nil {
-		return x.MaxEjectionPercent
-	}
-	return 0
-}
-
-func (x *PassiveHealthCheck) GetBaseEjectionTime() *durationpb.Duration {
-	if x != nil {
-		return x.BaseEjectionTime
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.DestinationConfig
-// output=config_entry.gen.go
-// name=Structs
-type DestinationConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Addresses []string `protobuf:"bytes,1,rep,name=Addresses,proto3" json:"Addresses,omitempty"`
-	// mog: func-to=int func-from=int32
-	Port int32 `protobuf:"varint,2,opt,name=Port,proto3" json:"Port,omitempty"`
-}
-
-func (x *DestinationConfig) Reset() {
-	*x = DestinationConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[44]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DestinationConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DestinationConfig) ProtoMessage() {}
-
-func (x *DestinationConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[44]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DestinationConfig.ProtoReflect.Descriptor instead.
-func (*DestinationConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{44}
-}
-
-func (x *DestinationConfig) GetAddresses() []string {
-	if x != nil {
-		return x.Addresses
-	}
-	return nil
-}
-
-func (x *DestinationConfig) GetPort() int32 {
-	if x != nil {
-		return x.Port
-	}
-	return 0
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.RateLimits
-// output=config_entry.gen.go
-// name=Structs
-type RateLimits struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	InstanceLevel *InstanceLevelRateLimits `protobuf:"bytes,1,opt,name=InstanceLevel,proto3" json:"InstanceLevel,omitempty"`
-}
-
-func (x *RateLimits) Reset() {
-	*x = RateLimits{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[45]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RateLimits) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RateLimits) ProtoMessage() {}
-
-func (x *RateLimits) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[45]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RateLimits.ProtoReflect.Descriptor instead.
-func (*RateLimits) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{45}
-}
-
-func (x *RateLimits) GetInstanceLevel() *InstanceLevelRateLimits {
-	if x != nil {
-		return x.InstanceLevel
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.InstanceLevelRateLimits
-// output=config_entry.gen.go
-// name=Structs
-type InstanceLevelRateLimits struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=int func-from=uint32
-	RequestsPerSecond uint32 `protobuf:"varint,1,opt,name=RequestsPerSecond,proto3" json:"RequestsPerSecond,omitempty"`
-	// mog: func-to=int func-from=uint32
-	RequestsMaxBurst uint32                          `protobuf:"varint,2,opt,name=RequestsMaxBurst,proto3" json:"RequestsMaxBurst,omitempty"`
-	Routes           []*InstanceLevelRouteRateLimits `protobuf:"bytes,3,rep,name=Routes,proto3" json:"Routes,omitempty"`
-}
-
-func (x *InstanceLevelRateLimits) Reset() {
-	*x = InstanceLevelRateLimits{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[46]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *InstanceLevelRateLimits) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*InstanceLevelRateLimits) ProtoMessage() {}
-
-func (x *InstanceLevelRateLimits) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[46]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use InstanceLevelRateLimits.ProtoReflect.Descriptor instead.
-func (*InstanceLevelRateLimits) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{46}
-}
-
-func (x *InstanceLevelRateLimits) GetRequestsPerSecond() uint32 {
-	if x != nil {
-		return x.RequestsPerSecond
-	}
-	return 0
-}
-
-func (x *InstanceLevelRateLimits) GetRequestsMaxBurst() uint32 {
-	if x != nil {
-		return x.RequestsMaxBurst
-	}
-	return 0
-}
-
-func (x *InstanceLevelRateLimits) GetRoutes() []*InstanceLevelRouteRateLimits {
-	if x != nil {
-		return x.Routes
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.InstanceLevelRouteRateLimits
-// output=config_entry.gen.go
-// name=Structs
-type InstanceLevelRouteRateLimits struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PathExact  string `protobuf:"bytes,1,opt,name=PathExact,proto3" json:"PathExact,omitempty"`
-	PathPrefix string `protobuf:"bytes,2,opt,name=PathPrefix,proto3" json:"PathPrefix,omitempty"`
-	PathRegex  string `protobuf:"bytes,3,opt,name=PathRegex,proto3" json:"PathRegex,omitempty"`
-	// mog: func-to=int func-from=uint32
-	RequestsPerSecond uint32 `protobuf:"varint,4,opt,name=RequestsPerSecond,proto3" json:"RequestsPerSecond,omitempty"`
-	// mog: func-to=int func-from=uint32
-	RequestsMaxBurst uint32 `protobuf:"varint,5,opt,name=RequestsMaxBurst,proto3" json:"RequestsMaxBurst,omitempty"`
-}
-
-func (x *InstanceLevelRouteRateLimits) Reset() {
-	*x = InstanceLevelRouteRateLimits{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[47]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *InstanceLevelRouteRateLimits) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*InstanceLevelRouteRateLimits) ProtoMessage() {}
-
-func (x *InstanceLevelRouteRateLimits) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[47]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use InstanceLevelRouteRateLimits.ProtoReflect.Descriptor instead.
-func (*InstanceLevelRouteRateLimits) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{47}
-}
-
-func (x *InstanceLevelRouteRateLimits) GetPathExact() string {
-	if x != nil {
-		return x.PathExact
-	}
-	return ""
-}
-
-func (x *InstanceLevelRouteRateLimits) GetPathPrefix() string {
-	if x != nil {
-		return x.PathPrefix
-	}
-	return ""
-}
-
-func (x *InstanceLevelRouteRateLimits) GetPathRegex() string {
-	if x != nil {
-		return x.PathRegex
-	}
-	return ""
-}
-
-func (x *InstanceLevelRouteRateLimits) GetRequestsPerSecond() uint32 {
-	if x != nil {
-		return x.RequestsPerSecond
-	}
-	return 0
-}
-
-func (x *InstanceLevelRouteRateLimits) GetRequestsMaxBurst() uint32 {
-	if x != nil {
-		return x.RequestsMaxBurst
-	}
-	return 0
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.APIGatewayConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-type APIGateway struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Meta      map[string]string     `protobuf:"bytes,1,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Listeners []*APIGatewayListener `protobuf:"bytes,2,rep,name=Listeners,proto3" json:"Listeners,omitempty"`
-	Status    *Status               `protobuf:"bytes,3,opt,name=Status,proto3" json:"Status,omitempty"`
-}
-
-func (x *APIGateway) Reset() {
-	*x = APIGateway{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[48]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *APIGateway) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*APIGateway) ProtoMessage() {}
-
-func (x *APIGateway) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[48]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use APIGateway.ProtoReflect.Descriptor instead.
-func (*APIGateway) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{48}
-}
-
-func (x *APIGateway) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *APIGateway) GetListeners() []*APIGatewayListener {
-	if x != nil {
-		return x.Listeners
-	}
-	return nil
-}
-
-func (x *APIGateway) GetStatus() *Status {
-	if x != nil {
-		return x.Status
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.Status
-// output=config_entry.gen.go
-// name=Structs
-type Status struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Conditions []*Condition `protobuf:"bytes,1,rep,name=Conditions,proto3" json:"Conditions,omitempty"`
-}
-
-func (x *Status) Reset() {
-	*x = Status{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[49]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Status) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Status) ProtoMessage() {}
-
-func (x *Status) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[49]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Status.ProtoReflect.Descriptor instead.
-func (*Status) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{49}
-}
-
-func (x *Status) GetConditions() []*Condition {
-	if x != nil {
-		return x.Conditions
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.Condition
-// output=config_entry.gen.go
-// name=Structs
-type Condition struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Type     string             `protobuf:"bytes,1,opt,name=Type,proto3" json:"Type,omitempty"`
-	Status   string             `protobuf:"bytes,2,opt,name=Status,proto3" json:"Status,omitempty"`
-	Reason   string             `protobuf:"bytes,3,opt,name=Reason,proto3" json:"Reason,omitempty"`
-	Message  string             `protobuf:"bytes,4,opt,name=Message,proto3" json:"Message,omitempty"`
-	Resource *ResourceReference `protobuf:"bytes,5,opt,name=Resource,proto3" json:"Resource,omitempty"`
-	// mog: func-to=timeToStructs func-from=timeFromStructs
-	LastTransitionTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=LastTransitionTime,proto3" json:"LastTransitionTime,omitempty"`
-}
-
-func (x *Condition) Reset() {
-	*x = Condition{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[50]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Condition) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Condition) ProtoMessage() {}
-
-func (x *Condition) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[50]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Condition.ProtoReflect.Descriptor instead.
-func (*Condition) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{50}
-}
-
-func (x *Condition) GetType() string {
-	if x != nil {
-		return x.Type
-	}
-	return ""
-}
-
-func (x *Condition) GetStatus() string {
-	if x != nil {
-		return x.Status
-	}
-	return ""
-}
-
-func (x *Condition) GetReason() string {
-	if x != nil {
-		return x.Reason
-	}
-	return ""
-}
-
-func (x *Condition) GetMessage() string {
-	if x != nil {
-		return x.Message
-	}
-	return ""
-}
-
-func (x *Condition) GetResource() *ResourceReference {
-	if x != nil {
-		return x.Resource
-	}
-	return nil
-}
-
-func (x *Condition) GetLastTransitionTime() *timestamppb.Timestamp {
-	if x != nil {
-		return x.LastTransitionTime
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.APIGatewayListener
-// output=config_entry.gen.go
-// name=Structs
-type APIGatewayListener struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name     string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	Hostname string `protobuf:"bytes,2,opt,name=Hostname,proto3" json:"Hostname,omitempty"`
-	// mog: func-to=int func-from=int32
-	Port int32 `protobuf:"varint,3,opt,name=Port,proto3" json:"Port,omitempty"`
-	// mog: func-to=apiGatewayProtocolToStructs func-from=apiGatewayProtocolFromStructs
-	Protocol APIGatewayListenerProtocol  `protobuf:"varint,4,opt,name=Protocol,proto3,enum=hashicorp.consul.internal.configentry.APIGatewayListenerProtocol" json:"Protocol,omitempty"`
-	TLS      *APIGatewayTLSConfiguration `protobuf:"bytes,5,opt,name=TLS,proto3" json:"TLS,omitempty"`
-	Override *APIGatewayPolicy           `protobuf:"bytes,6,opt,name=Override,proto3" json:"Override,omitempty"`
-	Default  *APIGatewayPolicy           `protobuf:"bytes,7,opt,name=Default,proto3" json:"Default,omitempty"`
-}
-
-func (x *APIGatewayListener) Reset() {
-	*x = APIGatewayListener{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[51]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *APIGatewayListener) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*APIGatewayListener) ProtoMessage() {}
-
-func (x *APIGatewayListener) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[51]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use APIGatewayListener.ProtoReflect.Descriptor instead.
-func (*APIGatewayListener) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{51}
-}
-
-func (x *APIGatewayListener) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *APIGatewayListener) GetHostname() string {
-	if x != nil {
-		return x.Hostname
-	}
-	return ""
-}
-
-func (x *APIGatewayListener) GetPort() int32 {
-	if x != nil {
-		return x.Port
-	}
-	return 0
-}
-
-func (x *APIGatewayListener) GetProtocol() APIGatewayListenerProtocol {
-	if x != nil {
-		return x.Protocol
-	}
-	return APIGatewayListenerProtocol_ListenerProtocolHTTP
-}
-
-func (x *APIGatewayListener) GetTLS() *APIGatewayTLSConfiguration {
-	if x != nil {
-		return x.TLS
-	}
-	return nil
-}
-
-func (x *APIGatewayListener) GetOverride() *APIGatewayPolicy {
-	if x != nil {
-		return x.Override
-	}
-	return nil
-}
-
-func (x *APIGatewayListener) GetDefault() *APIGatewayPolicy {
-	if x != nil {
-		return x.Default
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.APIGatewayTLSConfiguration
-// output=config_entry.gen.go
-// name=Structs
-type APIGatewayTLSConfiguration struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Certificates []*ResourceReference `protobuf:"bytes,1,rep,name=Certificates,proto3" json:"Certificates,omitempty"`
-	// mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
-	MinVersion string `protobuf:"bytes,2,opt,name=MinVersion,proto3" json:"MinVersion,omitempty"`
-	// mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
-	MaxVersion string `protobuf:"bytes,3,opt,name=MaxVersion,proto3" json:"MaxVersion,omitempty"`
-	// mog: func-from=cipherSuitesFromStructs func-to=cipherSuitesToStructs
-	CipherSuites []string `protobuf:"bytes,4,rep,name=CipherSuites,proto3" json:"CipherSuites,omitempty"`
-}
-
-func (x *APIGatewayTLSConfiguration) Reset() {
-	*x = APIGatewayTLSConfiguration{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[52]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *APIGatewayTLSConfiguration) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*APIGatewayTLSConfiguration) ProtoMessage() {}
-
-func (x *APIGatewayTLSConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[52]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use APIGatewayTLSConfiguration.ProtoReflect.Descriptor instead.
-func (*APIGatewayTLSConfiguration) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{52}
-}
-
-func (x *APIGatewayTLSConfiguration) GetCertificates() []*ResourceReference {
-	if x != nil {
-		return x.Certificates
-	}
-	return nil
-}
-
-func (x *APIGatewayTLSConfiguration) GetMinVersion() string {
-	if x != nil {
-		return x.MinVersion
-	}
-	return ""
-}
-
-func (x *APIGatewayTLSConfiguration) GetMaxVersion() string {
-	if x != nil {
-		return x.MaxVersion
-	}
-	return ""
-}
-
-func (x *APIGatewayTLSConfiguration) GetCipherSuites() []string {
-	if x != nil {
-		return x.CipherSuites
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.APIGatewayPolicy
-// output=config_entry.gen.go
-// name=Structs
-type APIGatewayPolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=gwJWTRequirementToStructs func-from=gwJWTRequirementFromStructs
-	JWT *APIGatewayJWTRequirement `protobuf:"bytes,1,opt,name=JWT,proto3" json:"JWT,omitempty"`
-}
-
-func (x *APIGatewayPolicy) Reset() {
-	*x = APIGatewayPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[53]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *APIGatewayPolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*APIGatewayPolicy) ProtoMessage() {}
-
-func (x *APIGatewayPolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[53]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use APIGatewayPolicy.ProtoReflect.Descriptor instead.
-func (*APIGatewayPolicy) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{53}
-}
-
-func (x *APIGatewayPolicy) GetJWT() *APIGatewayJWTRequirement {
-	if x != nil {
-		return x.JWT
-	}
-	return nil
-}
-
-type APIGatewayJWTRequirement struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Providers []*APIGatewayJWTProvider `protobuf:"bytes,1,rep,name=Providers,proto3" json:"Providers,omitempty"`
-}
-
-func (x *APIGatewayJWTRequirement) Reset() {
-	*x = APIGatewayJWTRequirement{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[54]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *APIGatewayJWTRequirement) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*APIGatewayJWTRequirement) ProtoMessage() {}
-
-func (x *APIGatewayJWTRequirement) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[54]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use APIGatewayJWTRequirement.ProtoReflect.Descriptor instead.
-func (*APIGatewayJWTRequirement) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{54}
-}
-
-func (x *APIGatewayJWTRequirement) GetProviders() []*APIGatewayJWTProvider {
-	if x != nil {
-		return x.Providers
-	}
-	return nil
-}
-
-type APIGatewayJWTProvider struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name         string                            `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	VerifyClaims []*APIGatewayJWTClaimVerification `protobuf:"bytes,2,rep,name=VerifyClaims,proto3" json:"VerifyClaims,omitempty"`
-}
-
-func (x *APIGatewayJWTProvider) Reset() {
-	*x = APIGatewayJWTProvider{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[55]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *APIGatewayJWTProvider) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*APIGatewayJWTProvider) ProtoMessage() {}
-
-func (x *APIGatewayJWTProvider) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[55]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use APIGatewayJWTProvider.ProtoReflect.Descriptor instead.
-func (*APIGatewayJWTProvider) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{55}
-}
-
-func (x *APIGatewayJWTProvider) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *APIGatewayJWTProvider) GetVerifyClaims() []*APIGatewayJWTClaimVerification {
-	if x != nil {
-		return x.VerifyClaims
-	}
-	return nil
-}
-
-type APIGatewayJWTClaimVerification struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Path  []string `protobuf:"bytes,1,rep,name=Path,proto3" json:"Path,omitempty"`
-	Value string   `protobuf:"bytes,2,opt,name=Value,proto3" json:"Value,omitempty"`
-}
-
-func (x *APIGatewayJWTClaimVerification) Reset() {
-	*x = APIGatewayJWTClaimVerification{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[56]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *APIGatewayJWTClaimVerification) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*APIGatewayJWTClaimVerification) ProtoMessage() {}
-
-func (x *APIGatewayJWTClaimVerification) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[56]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use APIGatewayJWTClaimVerification.ProtoReflect.Descriptor instead.
-func (*APIGatewayJWTClaimVerification) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{56}
-}
-
-func (x *APIGatewayJWTClaimVerification) GetPath() []string {
-	if x != nil {
-		return x.Path
-	}
-	return nil
-}
-
-func (x *APIGatewayJWTClaimVerification) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ResourceReference
-// output=config_entry.gen.go
-// name=Structs
-type ResourceReference struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Kind        string `protobuf:"bytes,1,opt,name=Kind,proto3" json:"Kind,omitempty"`
-	Name        string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
-	SectionName string `protobuf:"bytes,3,opt,name=SectionName,proto3" json:"SectionName,omitempty"`
-	// mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
-	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,4,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
-}
-
-func (x *ResourceReference) Reset() {
-	*x = ResourceReference{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[57]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ResourceReference) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ResourceReference) ProtoMessage() {}
-
-func (x *ResourceReference) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[57]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ResourceReference.ProtoReflect.Descriptor instead.
-func (*ResourceReference) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{57}
-}
-
-func (x *ResourceReference) GetKind() string {
-	if x != nil {
-		return x.Kind
-	}
-	return ""
-}
-
-func (x *ResourceReference) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *ResourceReference) GetSectionName() string {
-	if x != nil {
-		return x.SectionName
-	}
-	return ""
-}
-
-func (x *ResourceReference) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if x != nil {
-		return x.EnterpriseMeta
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.BoundAPIGatewayConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-type BoundAPIGateway struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Meta      map[string]string          `protobuf:"bytes,1,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Listeners []*BoundAPIGatewayListener `protobuf:"bytes,2,rep,name=Listeners,proto3" json:"Listeners,omitempty"`
-}
-
-func (x *BoundAPIGateway) Reset() {
-	*x = BoundAPIGateway{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[58]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *BoundAPIGateway) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*BoundAPIGateway) ProtoMessage() {}
-
-func (x *BoundAPIGateway) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[58]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use BoundAPIGateway.ProtoReflect.Descriptor instead.
-func (*BoundAPIGateway) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{58}
-}
-
-func (x *BoundAPIGateway) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *BoundAPIGateway) GetListeners() []*BoundAPIGatewayListener {
-	if x != nil {
-		return x.Listeners
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.BoundAPIGatewayListener
-// output=config_entry.gen.go
-// name=Structs
-type BoundAPIGatewayListener struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name         string               `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	Certificates []*ResourceReference `protobuf:"bytes,2,rep,name=Certificates,proto3" json:"Certificates,omitempty"`
-	Routes       []*ResourceReference `protobuf:"bytes,3,rep,name=Routes,proto3" json:"Routes,omitempty"`
-}
-
-func (x *BoundAPIGatewayListener) Reset() {
-	*x = BoundAPIGatewayListener{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[59]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *BoundAPIGatewayListener) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*BoundAPIGatewayListener) ProtoMessage() {}
-
-func (x *BoundAPIGatewayListener) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[59]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use BoundAPIGatewayListener.ProtoReflect.Descriptor instead.
-func (*BoundAPIGatewayListener) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{59}
-}
-
-func (x *BoundAPIGatewayListener) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *BoundAPIGatewayListener) GetCertificates() []*ResourceReference {
-	if x != nil {
-		return x.Certificates
-	}
-	return nil
-}
-
-func (x *BoundAPIGatewayListener) GetRoutes() []*ResourceReference {
-	if x != nil {
-		return x.Routes
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.InlineCertificateConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-type InlineCertificate struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Meta        map[string]string `protobuf:"bytes,1,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Certificate string            `protobuf:"bytes,2,opt,name=Certificate,proto3" json:"Certificate,omitempty"`
-	PrivateKey  string            `protobuf:"bytes,3,opt,name=PrivateKey,proto3" json:"PrivateKey,omitempty"`
-}
-
-func (x *InlineCertificate) Reset() {
-	*x = InlineCertificate{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[60]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *InlineCertificate) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*InlineCertificate) ProtoMessage() {}
-
-func (x *InlineCertificate) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[60]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use InlineCertificate.ProtoReflect.Descriptor instead.
-func (*InlineCertificate) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{60}
-}
-
-func (x *InlineCertificate) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *InlineCertificate) GetCertificate() string {
-	if x != nil {
-		return x.Certificate
-	}
-	return ""
-}
-
-func (x *InlineCertificate) GetPrivateKey() string {
-	if x != nil {
-		return x.PrivateKey
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPRouteConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-type HTTPRoute struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Meta      map[string]string    `protobuf:"bytes,1,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Parents   []*ResourceReference `protobuf:"bytes,2,rep,name=Parents,proto3" json:"Parents,omitempty"`
-	Rules     []*HTTPRouteRule     `protobuf:"bytes,3,rep,name=Rules,proto3" json:"Rules,omitempty"`
-	Hostnames []string             `protobuf:"bytes,4,rep,name=Hostnames,proto3" json:"Hostnames,omitempty"`
-	Status    *Status              `protobuf:"bytes,5,opt,name=Status,proto3" json:"Status,omitempty"`
-}
-
-func (x *HTTPRoute) Reset() {
-	*x = HTTPRoute{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[61]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPRoute) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPRoute) ProtoMessage() {}
-
-func (x *HTTPRoute) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[61]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPRoute.ProtoReflect.Descriptor instead.
-func (*HTTPRoute) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{61}
-}
-
-func (x *HTTPRoute) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *HTTPRoute) GetParents() []*ResourceReference {
-	if x != nil {
-		return x.Parents
-	}
-	return nil
-}
-
-func (x *HTTPRoute) GetRules() []*HTTPRouteRule {
-	if x != nil {
-		return x.Rules
-	}
-	return nil
-}
-
-func (x *HTTPRoute) GetHostnames() []string {
-	if x != nil {
-		return x.Hostnames
-	}
-	return nil
-}
-
-func (x *HTTPRoute) GetStatus() *Status {
-	if x != nil {
-		return x.Status
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPRouteRule
-// output=config_entry.gen.go
-// name=Structs
-type HTTPRouteRule struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Filters         *HTTPFilters         `protobuf:"bytes,1,opt,name=Filters,proto3" json:"Filters,omitempty"`
-	Matches         []*HTTPMatch         `protobuf:"bytes,2,rep,name=Matches,proto3" json:"Matches,omitempty"`
-	Services        []*HTTPService       `protobuf:"bytes,3,rep,name=Services,proto3" json:"Services,omitempty"`
-	ResponseFilters *HTTPResponseFilters `protobuf:"bytes,4,opt,name=ResponseFilters,proto3" json:"ResponseFilters,omitempty"`
-}
-
-func (x *HTTPRouteRule) Reset() {
-	*x = HTTPRouteRule{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[62]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPRouteRule) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPRouteRule) ProtoMessage() {}
-
-func (x *HTTPRouteRule) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[62]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPRouteRule.ProtoReflect.Descriptor instead.
-func (*HTTPRouteRule) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{62}
-}
-
-func (x *HTTPRouteRule) GetFilters() *HTTPFilters {
-	if x != nil {
-		return x.Filters
-	}
-	return nil
-}
-
-func (x *HTTPRouteRule) GetMatches() []*HTTPMatch {
-	if x != nil {
-		return x.Matches
-	}
-	return nil
-}
-
-func (x *HTTPRouteRule) GetServices() []*HTTPService {
-	if x != nil {
-		return x.Services
-	}
-	return nil
-}
-
-func (x *HTTPRouteRule) GetResponseFilters() *HTTPResponseFilters {
-	if x != nil {
-		return x.ResponseFilters
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPMatch
-// output=config_entry.gen.go
-// name=Structs
-type HTTPMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Headers []*HTTPHeaderMatch `protobuf:"bytes,1,rep,name=Headers,proto3" json:"Headers,omitempty"`
-	// mog: func-to=httpMatchMethodToStructs func-from=httpMatchMethodFromStructs
-	Method HTTPMatchMethod   `protobuf:"varint,2,opt,name=Method,proto3,enum=hashicorp.consul.internal.configentry.HTTPMatchMethod" json:"Method,omitempty"`
-	Path   *HTTPPathMatch    `protobuf:"bytes,3,opt,name=Path,proto3" json:"Path,omitempty"`
-	Query  []*HTTPQueryMatch `protobuf:"bytes,4,rep,name=Query,proto3" json:"Query,omitempty"`
-}
-
-func (x *HTTPMatch) Reset() {
-	*x = HTTPMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[63]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPMatch) ProtoMessage() {}
-
-func (x *HTTPMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[63]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPMatch.ProtoReflect.Descriptor instead.
-func (*HTTPMatch) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{63}
-}
-
-func (x *HTTPMatch) GetHeaders() []*HTTPHeaderMatch {
-	if x != nil {
-		return x.Headers
-	}
-	return nil
-}
-
-func (x *HTTPMatch) GetMethod() HTTPMatchMethod {
-	if x != nil {
-		return x.Method
-	}
-	return HTTPMatchMethod_HTTPMatchMethodAll
-}
-
-func (x *HTTPMatch) GetPath() *HTTPPathMatch {
-	if x != nil {
-		return x.Path
-	}
-	return nil
-}
-
-func (x *HTTPMatch) GetQuery() []*HTTPQueryMatch {
-	if x != nil {
-		return x.Query
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPHeaderMatch
-// output=config_entry.gen.go
-// name=Structs
-type HTTPHeaderMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=httpHeaderMatchToStructs func-from=httpHeaderMatchFromStructs
-	Match HTTPHeaderMatchType `protobuf:"varint,1,opt,name=Match,proto3,enum=hashicorp.consul.internal.configentry.HTTPHeaderMatchType" json:"Match,omitempty"`
-	Name  string              `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
-	Value string              `protobuf:"bytes,3,opt,name=Value,proto3" json:"Value,omitempty"`
-}
-
-func (x *HTTPHeaderMatch) Reset() {
-	*x = HTTPHeaderMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[64]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPHeaderMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPHeaderMatch) ProtoMessage() {}
-
-func (x *HTTPHeaderMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[64]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPHeaderMatch.ProtoReflect.Descriptor instead.
-func (*HTTPHeaderMatch) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{64}
-}
-
-func (x *HTTPHeaderMatch) GetMatch() HTTPHeaderMatchType {
-	if x != nil {
-		return x.Match
-	}
-	return HTTPHeaderMatchType_HTTPHeaderMatchExact
-}
-
-func (x *HTTPHeaderMatch) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *HTTPHeaderMatch) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPPathMatch
-// output=config_entry.gen.go
-// name=Structs
-type HTTPPathMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=httpPathMatchToStructs func-from=httpPathMatchFromStructs
-	Match HTTPPathMatchType `protobuf:"varint,1,opt,name=Match,proto3,enum=hashicorp.consul.internal.configentry.HTTPPathMatchType" json:"Match,omitempty"`
-	Value string            `protobuf:"bytes,2,opt,name=Value,proto3" json:"Value,omitempty"`
-}
-
-func (x *HTTPPathMatch) Reset() {
-	*x = HTTPPathMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[65]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPPathMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPPathMatch) ProtoMessage() {}
-
-func (x *HTTPPathMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[65]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPPathMatch.ProtoReflect.Descriptor instead.
-func (*HTTPPathMatch) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{65}
-}
-
-func (x *HTTPPathMatch) GetMatch() HTTPPathMatchType {
-	if x != nil {
-		return x.Match
-	}
-	return HTTPPathMatchType_HTTPPathMatchExact
-}
-
-func (x *HTTPPathMatch) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPQueryMatch
-// output=config_entry.gen.go
-// name=Structs
-type HTTPQueryMatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=httpQueryMatchToStructs func-from=httpQueryMatchFromStructs
-	Match HTTPQueryMatchType `protobuf:"varint,1,opt,name=Match,proto3,enum=hashicorp.consul.internal.configentry.HTTPQueryMatchType" json:"Match,omitempty"`
-	Name  string             `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
-	Value string             `protobuf:"bytes,3,opt,name=Value,proto3" json:"Value,omitempty"`
-}
-
-func (x *HTTPQueryMatch) Reset() {
-	*x = HTTPQueryMatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[66]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPQueryMatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPQueryMatch) ProtoMessage() {}
-
-func (x *HTTPQueryMatch) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[66]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPQueryMatch.ProtoReflect.Descriptor instead.
-func (*HTTPQueryMatch) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{66}
-}
-
-func (x *HTTPQueryMatch) GetMatch() HTTPQueryMatchType {
-	if x != nil {
-		return x.Match
-	}
-	return HTTPQueryMatchType_HTTPQueryMatchExact
-}
-
-func (x *HTTPQueryMatch) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *HTTPQueryMatch) GetValue() string {
-	if x != nil {
-		return x.Value
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPFilters
-// output=config_entry.gen.go
-// name=Structs
-type HTTPFilters struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Headers       []*HTTPHeaderFilter `protobuf:"bytes,1,rep,name=Headers,proto3" json:"Headers,omitempty"`
-	URLRewrite    *URLRewrite         `protobuf:"bytes,2,opt,name=URLRewrite,proto3" json:"URLRewrite,omitempty"`
-	RetryFilter   *RetryFilter        `protobuf:"bytes,3,opt,name=RetryFilter,proto3" json:"RetryFilter,omitempty"`
-	TimeoutFilter *TimeoutFilter      `protobuf:"bytes,4,opt,name=TimeoutFilter,proto3" json:"TimeoutFilter,omitempty"`
-	// mog: func-to=routeJWTFilterToStructs func-from=routeJWTFilterFromStructs
-	JWT *JWTFilter `protobuf:"bytes,5,opt,name=JWT,proto3" json:"JWT,omitempty"`
-}
-
-func (x *HTTPFilters) Reset() {
-	*x = HTTPFilters{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[67]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPFilters) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPFilters) ProtoMessage() {}
-
-func (x *HTTPFilters) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[67]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPFilters.ProtoReflect.Descriptor instead.
-func (*HTTPFilters) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{67}
-}
-
-func (x *HTTPFilters) GetHeaders() []*HTTPHeaderFilter {
-	if x != nil {
-		return x.Headers
-	}
-	return nil
-}
-
-func (x *HTTPFilters) GetURLRewrite() *URLRewrite {
-	if x != nil {
-		return x.URLRewrite
-	}
-	return nil
-}
-
-func (x *HTTPFilters) GetRetryFilter() *RetryFilter {
-	if x != nil {
-		return x.RetryFilter
-	}
-	return nil
-}
-
-func (x *HTTPFilters) GetTimeoutFilter() *TimeoutFilter {
-	if x != nil {
-		return x.TimeoutFilter
-	}
-	return nil
-}
-
-func (x *HTTPFilters) GetJWT() *JWTFilter {
-	if x != nil {
-		return x.JWT
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPResponseFilters
-// output=config_entry.gen.go
-// name=Structs
-type HTTPResponseFilters struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Headers []*HTTPHeaderFilter `protobuf:"bytes,1,rep,name=Headers,proto3" json:"Headers,omitempty"`
-}
-
-func (x *HTTPResponseFilters) Reset() {
-	*x = HTTPResponseFilters{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[68]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPResponseFilters) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPResponseFilters) ProtoMessage() {}
-
-func (x *HTTPResponseFilters) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[68]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPResponseFilters.ProtoReflect.Descriptor instead.
-func (*HTTPResponseFilters) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{68}
-}
-
-func (x *HTTPResponseFilters) GetHeaders() []*HTTPHeaderFilter {
-	if x != nil {
-		return x.Headers
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.URLRewrite
-// output=config_entry.gen.go
-// name=Structs
-type URLRewrite struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Path string `protobuf:"bytes,1,opt,name=Path,proto3" json:"Path,omitempty"`
-}
-
-func (x *URLRewrite) Reset() {
-	*x = URLRewrite{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[69]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *URLRewrite) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*URLRewrite) ProtoMessage() {}
-
-func (x *URLRewrite) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[69]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use URLRewrite.ProtoReflect.Descriptor instead.
-func (*URLRewrite) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{69}
-}
-
-func (x *URLRewrite) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.RetryFilter
-// output=config_entry.gen.go
-// name=Structs
-type RetryFilter struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	NumRetries            uint32   `protobuf:"varint,1,opt,name=NumRetries,proto3" json:"NumRetries,omitempty"`
-	RetryOn               []string `protobuf:"bytes,2,rep,name=RetryOn,proto3" json:"RetryOn,omitempty"`
-	RetryOnStatusCodes    []uint32 `protobuf:"varint,3,rep,packed,name=RetryOnStatusCodes,proto3" json:"RetryOnStatusCodes,omitempty"`
-	RetryOnConnectFailure bool     `protobuf:"varint,4,opt,name=RetryOnConnectFailure,proto3" json:"RetryOnConnectFailure,omitempty"`
-}
-
-func (x *RetryFilter) Reset() {
-	*x = RetryFilter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[70]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RetryFilter) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RetryFilter) ProtoMessage() {}
-
-func (x *RetryFilter) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[70]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RetryFilter.ProtoReflect.Descriptor instead.
-func (*RetryFilter) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{70}
-}
-
-func (x *RetryFilter) GetNumRetries() uint32 {
-	if x != nil {
-		return x.NumRetries
-	}
-	return 0
-}
-
-func (x *RetryFilter) GetRetryOn() []string {
-	if x != nil {
-		return x.RetryOn
-	}
-	return nil
-}
-
-func (x *RetryFilter) GetRetryOnStatusCodes() []uint32 {
-	if x != nil {
-		return x.RetryOnStatusCodes
-	}
-	return nil
-}
-
-func (x *RetryFilter) GetRetryOnConnectFailure() bool {
-	if x != nil {
-		return x.RetryOnConnectFailure
-	}
-	return false
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.TimeoutFilter
-// output=config_entry.gen.go
-// name=Structs
-type TimeoutFilter struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	RequestTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=RequestTimeout,proto3" json:"RequestTimeout,omitempty"`
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	IdleTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=IdleTimeout,proto3" json:"IdleTimeout,omitempty"`
-}
-
-func (x *TimeoutFilter) Reset() {
-	*x = TimeoutFilter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[71]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TimeoutFilter) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TimeoutFilter) ProtoMessage() {}
-
-func (x *TimeoutFilter) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[71]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TimeoutFilter.ProtoReflect.Descriptor instead.
-func (*TimeoutFilter) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{71}
-}
-
-func (x *TimeoutFilter) GetRequestTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.RequestTimeout
-	}
-	return nil
-}
-
-func (x *TimeoutFilter) GetIdleTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.IdleTimeout
-	}
-	return nil
-}
-
-type JWTFilter struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Providers []*APIGatewayJWTProvider `protobuf:"bytes,1,rep,name=Providers,proto3" json:"Providers,omitempty"`
-}
-
-func (x *JWTFilter) Reset() {
-	*x = JWTFilter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[72]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JWTFilter) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JWTFilter) ProtoMessage() {}
-
-func (x *JWTFilter) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[72]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JWTFilter.ProtoReflect.Descriptor instead.
-func (*JWTFilter) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{72}
-}
-
-func (x *JWTFilter) GetProviders() []*APIGatewayJWTProvider {
-	if x != nil {
-		return x.Providers
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPHeaderFilter
-// output=config_entry.gen.go
-// name=Structs
-type HTTPHeaderFilter struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Add    map[string]string `protobuf:"bytes,1,rep,name=Add,proto3" json:"Add,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Remove []string          `protobuf:"bytes,2,rep,name=Remove,proto3" json:"Remove,omitempty"`
-	Set    map[string]string `protobuf:"bytes,3,rep,name=Set,proto3" json:"Set,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (x *HTTPHeaderFilter) Reset() {
-	*x = HTTPHeaderFilter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[73]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPHeaderFilter) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPHeaderFilter) ProtoMessage() {}
-
-func (x *HTTPHeaderFilter) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[73]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPHeaderFilter.ProtoReflect.Descriptor instead.
-func (*HTTPHeaderFilter) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{73}
-}
-
-func (x *HTTPHeaderFilter) GetAdd() map[string]string {
-	if x != nil {
-		return x.Add
-	}
-	return nil
-}
-
-func (x *HTTPHeaderFilter) GetRemove() []string {
-	if x != nil {
-		return x.Remove
-	}
-	return nil
-}
-
-func (x *HTTPHeaderFilter) GetSet() map[string]string {
-	if x != nil {
-		return x.Set
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPService
-// output=config_entry.gen.go
-// name=Structs
-type HTTPService struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	// mog: func-to=int func-from=int32
-	Weight  int32        `protobuf:"varint,2,opt,name=Weight,proto3" json:"Weight,omitempty"`
-	Filters *HTTPFilters `protobuf:"bytes,3,opt,name=Filters,proto3" json:"Filters,omitempty"`
-	// mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
-	EnterpriseMeta  *pbcommon.EnterpriseMeta `protobuf:"bytes,4,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
-	ResponseFilters *HTTPResponseFilters     `protobuf:"bytes,5,opt,name=ResponseFilters,proto3" json:"ResponseFilters,omitempty"`
-}
-
-func (x *HTTPService) Reset() {
-	*x = HTTPService{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[74]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HTTPService) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HTTPService) ProtoMessage() {}
-
-func (x *HTTPService) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[74]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HTTPService.ProtoReflect.Descriptor instead.
-func (*HTTPService) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{74}
-}
-
-func (x *HTTPService) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *HTTPService) GetWeight() int32 {
-	if x != nil {
-		return x.Weight
-	}
-	return 0
-}
-
-func (x *HTTPService) GetFilters() *HTTPFilters {
-	if x != nil {
-		return x.Filters
-	}
-	return nil
-}
-
-func (x *HTTPService) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if x != nil {
-		return x.EnterpriseMeta
-	}
-	return nil
-}
-
-func (x *HTTPService) GetResponseFilters() *HTTPResponseFilters {
-	if x != nil {
-		return x.ResponseFilters
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.TCPRouteConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-type TCPRoute struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Meta     map[string]string    `protobuf:"bytes,1,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Parents  []*ResourceReference `protobuf:"bytes,2,rep,name=Parents,proto3" json:"Parents,omitempty"`
-	Services []*TCPService        `protobuf:"bytes,3,rep,name=Services,proto3" json:"Services,omitempty"`
-	Status   *Status              `protobuf:"bytes,4,opt,name=Status,proto3" json:"Status,omitempty"`
-}
-
-func (x *TCPRoute) Reset() {
-	*x = TCPRoute{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[75]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TCPRoute) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TCPRoute) ProtoMessage() {}
-
-func (x *TCPRoute) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[75]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TCPRoute.ProtoReflect.Descriptor instead.
-func (*TCPRoute) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{75}
-}
-
-func (x *TCPRoute) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *TCPRoute) GetParents() []*ResourceReference {
-	if x != nil {
-		return x.Parents
-	}
-	return nil
-}
-
-func (x *TCPRoute) GetServices() []*TCPService {
-	if x != nil {
-		return x.Services
-	}
-	return nil
-}
-
-func (x *TCPRoute) GetStatus() *Status {
-	if x != nil {
-		return x.Status
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.TCPService
-// output=config_entry.gen.go
-// name=Structs
-type TCPService struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	// mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
-	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,2,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
-}
-
-func (x *TCPService) Reset() {
-	*x = TCPService{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[76]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TCPService) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TCPService) ProtoMessage() {}
-
-func (x *TCPService) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[76]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TCPService.ProtoReflect.Descriptor instead.
-func (*TCPService) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{76}
-}
-
-func (x *TCPService) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *TCPService) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if x != nil {
-		return x.EnterpriseMeta
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.SamenessGroupConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=RaftIndex
-type SamenessGroup struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name               string                 `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	DefaultForFailover bool                   `protobuf:"varint,2,opt,name=DefaultForFailover,proto3" json:"DefaultForFailover,omitempty"`
-	IncludeLocal       bool                   `protobuf:"varint,3,opt,name=IncludeLocal,proto3" json:"IncludeLocal,omitempty"`
-	Members            []*SamenessGroupMember `protobuf:"bytes,4,rep,name=Members,proto3" json:"Members,omitempty"`
-	Meta               map[string]string      `protobuf:"bytes,5,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
-	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,6,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
-}
-
-func (x *SamenessGroup) Reset() {
-	*x = SamenessGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[77]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SamenessGroup) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SamenessGroup) ProtoMessage() {}
-
-func (x *SamenessGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[77]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SamenessGroup.ProtoReflect.Descriptor instead.
-func (*SamenessGroup) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{77}
-}
-
-func (x *SamenessGroup) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *SamenessGroup) GetDefaultForFailover() bool {
-	if x != nil {
-		return x.DefaultForFailover
-	}
-	return false
-}
-
-func (x *SamenessGroup) GetIncludeLocal() bool {
-	if x != nil {
-		return x.IncludeLocal
-	}
-	return false
-}
-
-func (x *SamenessGroup) GetMembers() []*SamenessGroupMember {
-	if x != nil {
-		return x.Members
-	}
-	return nil
-}
-
-func (x *SamenessGroup) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *SamenessGroup) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if x != nil {
-		return x.EnterpriseMeta
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.SamenessGroupMember
-// output=config_entry.gen.go
-// name=Structs
-type SamenessGroupMember struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Partition string `protobuf:"bytes,1,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	Peer      string `protobuf:"bytes,2,opt,name=Peer,proto3" json:"Peer,omitempty"`
-}
-
-func (x *SamenessGroupMember) Reset() {
-	*x = SamenessGroupMember{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[78]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SamenessGroupMember) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SamenessGroupMember) ProtoMessage() {}
-
-func (x *SamenessGroupMember) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[78]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SamenessGroupMember.ProtoReflect.Descriptor instead.
-func (*SamenessGroupMember) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{78}
-}
-
-func (x *SamenessGroupMember) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *SamenessGroupMember) GetPeer() string {
-	if x != nil {
-		return x.Peer
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWTProviderConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Name,Kind,RaftIndex,EnterpriseMeta
-type JWTProvider struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	JSONWebKeySet *JSONWebKeySet       `protobuf:"bytes,1,opt,name=JSONWebKeySet,proto3" json:"JSONWebKeySet,omitempty"`
-	Issuer        string               `protobuf:"bytes,2,opt,name=Issuer,proto3" json:"Issuer,omitempty"`
-	Audiences     []string             `protobuf:"bytes,3,rep,name=Audiences,proto3" json:"Audiences,omitempty"`
-	Locations     []*JWTLocation       `protobuf:"bytes,4,rep,name=Locations,proto3" json:"Locations,omitempty"`
-	Forwarding    *JWTForwardingConfig `protobuf:"bytes,5,opt,name=Forwarding,proto3" json:"Forwarding,omitempty"`
-	CacheConfig   *JWTCacheConfig      `protobuf:"bytes,6,opt,name=CacheConfig,proto3" json:"CacheConfig,omitempty"`
-	Meta          map[string]string    `protobuf:"bytes,7,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// mog: func-to=int func-from=int32
-	ClockSkewSeconds int32 `protobuf:"varint,8,opt,name=ClockSkewSeconds,proto3" json:"ClockSkewSeconds,omitempty"`
-}
-
-func (x *JWTProvider) Reset() {
-	*x = JWTProvider{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[79]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JWTProvider) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JWTProvider) ProtoMessage() {}
-
-func (x *JWTProvider) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[79]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JWTProvider.ProtoReflect.Descriptor instead.
-func (*JWTProvider) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{79}
-}
-
-func (x *JWTProvider) GetJSONWebKeySet() *JSONWebKeySet {
-	if x != nil {
-		return x.JSONWebKeySet
-	}
-	return nil
-}
-
-func (x *JWTProvider) GetIssuer() string {
-	if x != nil {
-		return x.Issuer
-	}
-	return ""
-}
-
-func (x *JWTProvider) GetAudiences() []string {
-	if x != nil {
-		return x.Audiences
-	}
-	return nil
-}
-
-func (x *JWTProvider) GetLocations() []*JWTLocation {
-	if x != nil {
-		return x.Locations
-	}
-	return nil
-}
-
-func (x *JWTProvider) GetForwarding() *JWTForwardingConfig {
-	if x != nil {
-		return x.Forwarding
-	}
-	return nil
-}
-
-func (x *JWTProvider) GetCacheConfig() *JWTCacheConfig {
-	if x != nil {
-		return x.CacheConfig
-	}
-	return nil
-}
-
-func (x *JWTProvider) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *JWTProvider) GetClockSkewSeconds() int32 {
-	if x != nil {
-		return x.ClockSkewSeconds
-	}
-	return 0
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JSONWebKeySet
-// output=config_entry.gen.go
-// name=Structs
-type JSONWebKeySet struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Local  *LocalJWKS  `protobuf:"bytes,1,opt,name=Local,proto3" json:"Local,omitempty"`
-	Remote *RemoteJWKS `protobuf:"bytes,2,opt,name=Remote,proto3" json:"Remote,omitempty"`
-}
-
-func (x *JSONWebKeySet) Reset() {
-	*x = JSONWebKeySet{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[80]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JSONWebKeySet) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JSONWebKeySet) ProtoMessage() {}
-
-func (x *JSONWebKeySet) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[80]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JSONWebKeySet.ProtoReflect.Descriptor instead.
-func (*JSONWebKeySet) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{80}
-}
-
-func (x *JSONWebKeySet) GetLocal() *LocalJWKS {
-	if x != nil {
-		return x.Local
-	}
-	return nil
-}
-
-func (x *JSONWebKeySet) GetRemote() *RemoteJWKS {
-	if x != nil {
-		return x.Remote
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.LocalJWKS
-// output=config_entry.gen.go
-// name=Structs
-type LocalJWKS struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	JWKS     string `protobuf:"bytes,1,opt,name=JWKS,proto3" json:"JWKS,omitempty"`
-	Filename string `protobuf:"bytes,2,opt,name=Filename,proto3" json:"Filename,omitempty"`
-}
-
-func (x *LocalJWKS) Reset() {
-	*x = LocalJWKS{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[81]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LocalJWKS) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LocalJWKS) ProtoMessage() {}
-
-func (x *LocalJWKS) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[81]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LocalJWKS.ProtoReflect.Descriptor instead.
-func (*LocalJWKS) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{81}
-}
-
-func (x *LocalJWKS) GetJWKS() string {
-	if x != nil {
-		return x.JWKS
-	}
-	return ""
-}
-
-func (x *LocalJWKS) GetFilename() string {
-	if x != nil {
-		return x.Filename
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.RemoteJWKS
-// output=config_entry.gen.go
-// name=Structs
-type RemoteJWKS struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	URI string `protobuf:"bytes,1,opt,name=URI,proto3" json:"URI,omitempty"`
-	// mog: func-to=int func-from=int32
-	RequestTimeoutMs int32 `protobuf:"varint,2,opt,name=RequestTimeoutMs,proto3" json:"RequestTimeoutMs,omitempty"`
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	CacheDuration       *durationpb.Duration `protobuf:"bytes,3,opt,name=CacheDuration,proto3" json:"CacheDuration,omitempty"`
-	FetchAsynchronously bool                 `protobuf:"varint,4,opt,name=FetchAsynchronously,proto3" json:"FetchAsynchronously,omitempty"`
-	RetryPolicy         *JWKSRetryPolicy     `protobuf:"bytes,5,opt,name=RetryPolicy,proto3" json:"RetryPolicy,omitempty"`
-	JWKSCluster         *JWKSCluster         `protobuf:"bytes,6,opt,name=JWKSCluster,proto3" json:"JWKSCluster,omitempty"`
-}
-
-func (x *RemoteJWKS) Reset() {
-	*x = RemoteJWKS{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[82]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RemoteJWKS) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RemoteJWKS) ProtoMessage() {}
-
-func (x *RemoteJWKS) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[82]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RemoteJWKS.ProtoReflect.Descriptor instead.
-func (*RemoteJWKS) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{82}
-}
-
-func (x *RemoteJWKS) GetURI() string {
-	if x != nil {
-		return x.URI
-	}
-	return ""
-}
-
-func (x *RemoteJWKS) GetRequestTimeoutMs() int32 {
-	if x != nil {
-		return x.RequestTimeoutMs
-	}
-	return 0
-}
-
-func (x *RemoteJWKS) GetCacheDuration() *durationpb.Duration {
-	if x != nil {
-		return x.CacheDuration
-	}
-	return nil
-}
-
-func (x *RemoteJWKS) GetFetchAsynchronously() bool {
-	if x != nil {
-		return x.FetchAsynchronously
-	}
-	return false
-}
-
-func (x *RemoteJWKS) GetRetryPolicy() *JWKSRetryPolicy {
-	if x != nil {
-		return x.RetryPolicy
-	}
-	return nil
-}
-
-func (x *RemoteJWKS) GetJWKSCluster() *JWKSCluster {
-	if x != nil {
-		return x.JWKSCluster
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWKSCluster
-// output=config_entry.gen.go
-// name=Structs
-type JWKSCluster struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	DiscoveryType   string              `protobuf:"bytes,1,opt,name=DiscoveryType,proto3" json:"DiscoveryType,omitempty"`
-	TLSCertificates *JWKSTLSCertificate `protobuf:"bytes,2,opt,name=TLSCertificates,proto3" json:"TLSCertificates,omitempty"`
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	ConnectTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=ConnectTimeout,proto3" json:"ConnectTimeout,omitempty"`
-}
-
-func (x *JWKSCluster) Reset() {
-	*x = JWKSCluster{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[83]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JWKSCluster) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JWKSCluster) ProtoMessage() {}
-
-func (x *JWKSCluster) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[83]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JWKSCluster.ProtoReflect.Descriptor instead.
-func (*JWKSCluster) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{83}
-}
-
-func (x *JWKSCluster) GetDiscoveryType() string {
-	if x != nil {
-		return x.DiscoveryType
-	}
-	return ""
-}
-
-func (x *JWKSCluster) GetTLSCertificates() *JWKSTLSCertificate {
-	if x != nil {
-		return x.TLSCertificates
-	}
-	return nil
-}
-
-func (x *JWKSCluster) GetConnectTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.ConnectTimeout
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWKSTLSCertificate
-// output=config_entry.gen.go
-// name=Structs
-type JWKSTLSCertificate struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	CaCertificateProviderInstance *JWKSTLSCertProviderInstance `protobuf:"bytes,1,opt,name=CaCertificateProviderInstance,proto3" json:"CaCertificateProviderInstance,omitempty"`
-	TrustedCA                     *JWKSTLSCertTrustedCA        `protobuf:"bytes,2,opt,name=TrustedCA,proto3" json:"TrustedCA,omitempty"`
-}
-
-func (x *JWKSTLSCertificate) Reset() {
-	*x = JWKSTLSCertificate{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[84]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JWKSTLSCertificate) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JWKSTLSCertificate) ProtoMessage() {}
-
-func (x *JWKSTLSCertificate) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[84]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JWKSTLSCertificate.ProtoReflect.Descriptor instead.
-func (*JWKSTLSCertificate) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{84}
-}
-
-func (x *JWKSTLSCertificate) GetCaCertificateProviderInstance() *JWKSTLSCertProviderInstance {
-	if x != nil {
-		return x.CaCertificateProviderInstance
-	}
-	return nil
-}
-
-func (x *JWKSTLSCertificate) GetTrustedCA() *JWKSTLSCertTrustedCA {
-	if x != nil {
-		return x.TrustedCA
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWKSTLSCertProviderInstance
-// output=config_entry.gen.go
-// name=Structs
-type JWKSTLSCertProviderInstance struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	InstanceName    string `protobuf:"bytes,1,opt,name=InstanceName,proto3" json:"InstanceName,omitempty"`
-	CertificateName string `protobuf:"bytes,2,opt,name=CertificateName,proto3" json:"CertificateName,omitempty"`
-}
-
-func (x *JWKSTLSCertProviderInstance) Reset() {
-	*x = JWKSTLSCertProviderInstance{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[85]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JWKSTLSCertProviderInstance) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JWKSTLSCertProviderInstance) ProtoMessage() {}
-
-func (x *JWKSTLSCertProviderInstance) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[85]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JWKSTLSCertProviderInstance.ProtoReflect.Descriptor instead.
-func (*JWKSTLSCertProviderInstance) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{85}
-}
-
-func (x *JWKSTLSCertProviderInstance) GetInstanceName() string {
-	if x != nil {
-		return x.InstanceName
-	}
-	return ""
-}
-
-func (x *JWKSTLSCertProviderInstance) GetCertificateName() string {
-	if x != nil {
-		return x.CertificateName
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWKSTLSCertTrustedCA
-// output=config_entry.gen.go
-// name=Structs
-type JWKSTLSCertTrustedCA struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Filename            string `protobuf:"bytes,1,opt,name=Filename,proto3" json:"Filename,omitempty"`
-	EnvironmentVariable string `protobuf:"bytes,2,opt,name=EnvironmentVariable,proto3" json:"EnvironmentVariable,omitempty"`
-	InlineString        string `protobuf:"bytes,3,opt,name=InlineString,proto3" json:"InlineString,omitempty"`
-	InlineBytes         []byte `protobuf:"bytes,4,opt,name=InlineBytes,proto3" json:"InlineBytes,omitempty"`
-}
-
-func (x *JWKSTLSCertTrustedCA) Reset() {
-	*x = JWKSTLSCertTrustedCA{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[86]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JWKSTLSCertTrustedCA) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JWKSTLSCertTrustedCA) ProtoMessage() {}
-
-func (x *JWKSTLSCertTrustedCA) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[86]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JWKSTLSCertTrustedCA.ProtoReflect.Descriptor instead.
-func (*JWKSTLSCertTrustedCA) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{86}
-}
-
-func (x *JWKSTLSCertTrustedCA) GetFilename() string {
-	if x != nil {
-		return x.Filename
-	}
-	return ""
-}
-
-func (x *JWKSTLSCertTrustedCA) GetEnvironmentVariable() string {
-	if x != nil {
-		return x.EnvironmentVariable
-	}
-	return ""
-}
-
-func (x *JWKSTLSCertTrustedCA) GetInlineString() string {
-	if x != nil {
-		return x.InlineString
-	}
-	return ""
-}
-
-func (x *JWKSTLSCertTrustedCA) GetInlineBytes() []byte {
-	if x != nil {
-		return x.InlineBytes
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWKSRetryPolicy
-// output=config_entry.gen.go
-// name=Structs
-type JWKSRetryPolicy struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=int func-from=int32
-	NumRetries         int32               `protobuf:"varint,1,opt,name=NumRetries,proto3" json:"NumRetries,omitempty"`
-	RetryPolicyBackOff *RetryPolicyBackOff `protobuf:"bytes,2,opt,name=RetryPolicyBackOff,proto3" json:"RetryPolicyBackOff,omitempty"`
-}
-
-func (x *JWKSRetryPolicy) Reset() {
-	*x = JWKSRetryPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[87]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JWKSRetryPolicy) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JWKSRetryPolicy) ProtoMessage() {}
-
-func (x *JWKSRetryPolicy) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[87]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JWKSRetryPolicy.ProtoReflect.Descriptor instead.
-func (*JWKSRetryPolicy) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{87}
-}
-
-func (x *JWKSRetryPolicy) GetNumRetries() int32 {
-	if x != nil {
-		return x.NumRetries
-	}
-	return 0
-}
-
-func (x *JWKSRetryPolicy) GetRetryPolicyBackOff() *RetryPolicyBackOff {
-	if x != nil {
-		return x.RetryPolicyBackOff
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.RetryPolicyBackOff
-// output=config_entry.gen.go
-// name=Structs
-type RetryPolicyBackOff struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	BaseInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=BaseInterval,proto3" json:"BaseInterval,omitempty"`
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	MaxInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=MaxInterval,proto3" json:"MaxInterval,omitempty"`
-}
-
-func (x *RetryPolicyBackOff) Reset() {
-	*x = RetryPolicyBackOff{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[88]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RetryPolicyBackOff) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RetryPolicyBackOff) ProtoMessage() {}
-
-func (x *RetryPolicyBackOff) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[88]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RetryPolicyBackOff.ProtoReflect.Descriptor instead.
-func (*RetryPolicyBackOff) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{88}
-}
-
-func (x *RetryPolicyBackOff) GetBaseInterval() *durationpb.Duration {
-	if x != nil {
-		return x.BaseInterval
-	}
-	return nil
-}
-
-func (x *RetryPolicyBackOff) GetMaxInterval() *durationpb.Duration {
-	if x != nil {
-		return x.MaxInterval
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWTLocation
-// output=config_entry.gen.go
-// name=Structs
-type JWTLocation struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Header     *JWTLocationHeader     `protobuf:"bytes,1,opt,name=Header,proto3" json:"Header,omitempty"`
-	QueryParam *JWTLocationQueryParam `protobuf:"bytes,2,opt,name=QueryParam,proto3" json:"QueryParam,omitempty"`
-	Cookie     *JWTLocationCookie     `protobuf:"bytes,3,opt,name=Cookie,proto3" json:"Cookie,omitempty"`
-}
-
-func (x *JWTLocation) Reset() {
-	*x = JWTLocation{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[89]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JWTLocation) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JWTLocation) ProtoMessage() {}
-
-func (x *JWTLocation) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[89]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JWTLocation.ProtoReflect.Descriptor instead.
-func (*JWTLocation) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{89}
-}
-
-func (x *JWTLocation) GetHeader() *JWTLocationHeader {
-	if x != nil {
-		return x.Header
-	}
-	return nil
-}
-
-func (x *JWTLocation) GetQueryParam() *JWTLocationQueryParam {
-	if x != nil {
-		return x.QueryParam
-	}
-	return nil
-}
-
-func (x *JWTLocation) GetCookie() *JWTLocationCookie {
-	if x != nil {
-		return x.Cookie
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWTLocationHeader
-// output=config_entry.gen.go
-// name=Structs
-type JWTLocationHeader struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name        string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	ValuePrefix string `protobuf:"bytes,2,opt,name=ValuePrefix,proto3" json:"ValuePrefix,omitempty"`
-	Forward     bool   `protobuf:"varint,3,opt,name=Forward,proto3" json:"Forward,omitempty"`
-}
-
-func (x *JWTLocationHeader) Reset() {
-	*x = JWTLocationHeader{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[90]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JWTLocationHeader) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JWTLocationHeader) ProtoMessage() {}
-
-func (x *JWTLocationHeader) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[90]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JWTLocationHeader.ProtoReflect.Descriptor instead.
-func (*JWTLocationHeader) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{90}
-}
-
-func (x *JWTLocationHeader) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *JWTLocationHeader) GetValuePrefix() string {
-	if x != nil {
-		return x.ValuePrefix
-	}
-	return ""
-}
-
-func (x *JWTLocationHeader) GetForward() bool {
-	if x != nil {
-		return x.Forward
-	}
-	return false
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWTLocationQueryParam
-// output=config_entry.gen.go
-// name=Structs
-type JWTLocationQueryParam struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-}
-
-func (x *JWTLocationQueryParam) Reset() {
-	*x = JWTLocationQueryParam{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[91]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JWTLocationQueryParam) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JWTLocationQueryParam) ProtoMessage() {}
-
-func (x *JWTLocationQueryParam) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[91]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JWTLocationQueryParam.ProtoReflect.Descriptor instead.
-func (*JWTLocationQueryParam) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{91}
-}
-
-func (x *JWTLocationQueryParam) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWTLocationCookie
-// output=config_entry.gen.go
-// name=Structs
-type JWTLocationCookie struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-}
-
-func (x *JWTLocationCookie) Reset() {
-	*x = JWTLocationCookie{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[92]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JWTLocationCookie) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JWTLocationCookie) ProtoMessage() {}
-
-func (x *JWTLocationCookie) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[92]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JWTLocationCookie.ProtoReflect.Descriptor instead.
-func (*JWTLocationCookie) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{92}
-}
-
-func (x *JWTLocationCookie) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWTForwardingConfig
-// output=config_entry.gen.go
-// name=Structs
-type JWTForwardingConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	HeaderName              string `protobuf:"bytes,1,opt,name=HeaderName,proto3" json:"HeaderName,omitempty"`
-	PadForwardPayloadHeader bool   `protobuf:"varint,2,opt,name=PadForwardPayloadHeader,proto3" json:"PadForwardPayloadHeader,omitempty"`
-}
-
-func (x *JWTForwardingConfig) Reset() {
-	*x = JWTForwardingConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[93]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JWTForwardingConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JWTForwardingConfig) ProtoMessage() {}
-
-func (x *JWTForwardingConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[93]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JWTForwardingConfig.ProtoReflect.Descriptor instead.
-func (*JWTForwardingConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{93}
-}
-
-func (x *JWTForwardingConfig) GetHeaderName() string {
-	if x != nil {
-		return x.HeaderName
-	}
-	return ""
-}
-
-func (x *JWTForwardingConfig) GetPadForwardPayloadHeader() bool {
-	if x != nil {
-		return x.PadForwardPayloadHeader
-	}
-	return false
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWTCacheConfig
-// output=config_entry.gen.go
-// name=Structs
-type JWTCacheConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=int func-from=int32
-	Size int32 `protobuf:"varint,1,opt,name=Size,proto3" json:"Size,omitempty"`
-}
-
-func (x *JWTCacheConfig) Reset() {
-	*x = JWTCacheConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[94]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *JWTCacheConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*JWTCacheConfig) ProtoMessage() {}
-
-func (x *JWTCacheConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconfigentry_config_entry_proto_msgTypes[94]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use JWTCacheConfig.ProtoReflect.Descriptor instead.
-func (*JWTCacheConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbconfigentry_config_entry_proto_rawDescGZIP(), []int{94}
-}
-
-func (x *JWTCacheConfig) GetSize() int32 {
-	if x != nil {
-		return x.Size
-	}
-	return 0
-}
-
-var File_private_pbconfigentry_config_entry_proto protoreflect.FileDescriptor
-
-var file_private_pbconfigentry_config_entry_proto_rawDesc = []byte{
-	0x0a, 0x28, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x25, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x1d, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x22, 0xf2, 0x0a, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x3f, 0x0a, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4b, 0x69, 0x6e, 0x64, 0x52, 0x04, 0x4b, 0x69,
-	0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70,
-	0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61,
-	0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61,
-	0x12, 0x49, 0x0a, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78,
-	0x52, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x53, 0x0a, 0x0a, 0x4d,
-	0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x48, 0x00, 0x52, 0x0a, 0x4d, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x62, 0x0a, 0x0f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c,
-	0x76, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65,
-	0x72, 0x48, 0x00, 0x52, 0x0f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f,
-	0x6c, 0x76, 0x65, 0x72, 0x12, 0x5f, 0x0a, 0x0e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x47,
-	0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x47, 0x61, 0x74, 0x65,
-	0x77, 0x61, 0x79, 0x48, 0x00, 0x52, 0x0e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x47, 0x61,
-	0x74, 0x65, 0x77, 0x61, 0x79, 0x12, 0x68, 0x0a, 0x11, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x48, 0x00, 0x52, 0x11, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
-	0x62, 0x0a, 0x0f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
-	0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73,
-	0x48, 0x00, 0x52, 0x0f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x73, 0x12, 0x53, 0x0a, 0x0a, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61,
-	0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
-	0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x48, 0x00, 0x52, 0x0a, 0x41, 0x50,
-	0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x12, 0x62, 0x0a, 0x0f, 0x42, 0x6f, 0x75, 0x6e,
-	0x64, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x41,
-	0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x48, 0x00, 0x52, 0x0f, 0x42, 0x6f, 0x75,
-	0x6e, 0x64, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x12, 0x4d, 0x0a, 0x08,
-	0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x48,
-	0x00, 0x52, 0x08, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x50, 0x0a, 0x09, 0x48,
-	0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65,
-	0x48, 0x00, 0x52, 0x09, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x68, 0x0a,
-	0x11, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
-	0x2e, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x48, 0x00, 0x52, 0x11, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x65, 0x72, 0x74,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x5c, 0x0a, 0x0d, 0x53, 0x61, 0x6d, 0x65, 0x6e,
-	0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47,
-	0x72, 0x6f, 0x75, 0x70, 0x48, 0x00, 0x52, 0x0d, 0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73,
-	0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x56, 0x0a, 0x0b, 0x4a, 0x57, 0x54, 0x50, 0x72, 0x6f, 0x76,
-	0x69, 0x64, 0x65, 0x72, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74,
-	0x72, 0x79, 0x2e, 0x4a, 0x57, 0x54, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x48, 0x00,
-	0x52, 0x0b, 0x4a, 0x57, 0x54, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x42, 0x07, 0x0a,
-	0x05, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0xb8, 0x04, 0x0a, 0x0a, 0x4d, 0x65, 0x73, 0x68, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x6d, 0x0a, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61,
-	0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x41, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72,
-	0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x4d, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x52, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50,
-	0x72, 0x6f, 0x78, 0x79, 0x12, 0x46, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x54, 0x4c,
-	0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x03, 0x54, 0x4c, 0x53, 0x12, 0x49, 0x0a, 0x04,
-	0x48, 0x54, 0x54, 0x50, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74,
-	0x72, 0x79, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x48, 0x54, 0x54, 0x50, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x52, 0x04, 0x48, 0x54, 0x54, 0x50, 0x12, 0x4f, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18,
-	0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65,
-	0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x52, 0x0a, 0x07, 0x50, 0x65, 0x65, 0x72,
-	0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x52, 0x07, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x4a, 0x0a, 0x20,
-	0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x69, 0x6e, 0x67, 0x50, 0x65, 0x72,
-	0x6d, 0x69, 0x73, 0x73, 0x69, 0x76, 0x65, 0x4d, 0x75, 0x74, 0x75, 0x61, 0x6c, 0x54, 0x4c, 0x53,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x20, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x45, 0x6e, 0x61,
-	0x62, 0x6c, 0x69, 0x6e, 0x67, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x76, 0x65, 0x4d,
-	0x75, 0x74, 0x75, 0x61, 0x6c, 0x54, 0x4c, 0x53, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x22, 0x50, 0x0a, 0x1a, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74,
-	0x50, 0x72, 0x6f, 0x78, 0x79, 0x4d, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x32, 0x0a, 0x14, 0x4d, 0x65, 0x73, 0x68, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x4f, 0x6e, 0x6c, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x4d,
-	0x65, 0x73, 0x68, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4f,
-	0x6e, 0x6c, 0x79, 0x22, 0xc9, 0x01, 0x0a, 0x0d, 0x4d, 0x65, 0x73, 0x68, 0x54, 0x4c, 0x53, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5b, 0x0a, 0x08, 0x49, 0x6e, 0x63, 0x6f, 0x6d, 0x69, 0x6e,
-	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
-	0x4d, 0x65, 0x73, 0x68, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x54,
-	0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x08, 0x49, 0x6e, 0x63, 0x6f, 0x6d, 0x69,
-	0x6e, 0x67, 0x12, 0x5b, 0x0a, 0x08, 0x4f, 0x75, 0x74, 0x67, 0x6f, 0x69, 0x6e, 0x67, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x73,
-	0x68, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x54, 0x4c, 0x53, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x08, 0x4f, 0x75, 0x74, 0x67, 0x6f, 0x69, 0x6e, 0x67, 0x22,
-	0x8a, 0x01, 0x0a, 0x18, 0x4d, 0x65, 0x73, 0x68, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x61, 0x6c, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x24, 0x0a, 0x0d,
-	0x54, 0x4c, 0x53, 0x4d, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0d, 0x54, 0x4c, 0x53, 0x4d, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x73, 0x69,
-	0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x4c, 0x53, 0x4d, 0x61, 0x78, 0x56, 0x65, 0x72, 0x73,
-	0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x54, 0x4c, 0x53, 0x4d, 0x61,
-	0x78, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x43, 0x69, 0x70, 0x68,
-	0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c,
-	0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x22, 0x54, 0x0a, 0x0e,
-	0x4d, 0x65, 0x73, 0x68, 0x48, 0x54, 0x54, 0x50, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x42,
-	0x0a, 0x1c, 0x53, 0x61, 0x6e, 0x69, 0x74, 0x69, 0x7a, 0x65, 0x58, 0x46, 0x6f, 0x72, 0x77, 0x61,
-	0x72, 0x64, 0x65, 0x64, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x65, 0x72, 0x74, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x1c, 0x53, 0x61, 0x6e, 0x69, 0x74, 0x69, 0x7a, 0x65, 0x58, 0x46,
-	0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x65,
-	0x72, 0x74, 0x22, 0x4d, 0x0a, 0x11, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x65, 0x73,
-	0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x38, 0x0a, 0x17, 0x50, 0x65, 0x65, 0x72, 0x54,
-	0x68, 0x72, 0x6f, 0x75, 0x67, 0x68, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61,
-	0x79, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x50, 0x65, 0x65, 0x72, 0x54, 0x68,
-	0x72, 0x6f, 0x75, 0x67, 0x68, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
-	0x73, 0x22, 0xb9, 0x08, 0x0a, 0x0f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73,
-	0x6f, 0x6c, 0x76, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x44, 0x65,
-	0x66, 0x61, 0x75, 0x6c, 0x74, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x12, 0x5d, 0x0a, 0x07, 0x53,
-	0x75, 0x62, 0x73, 0x65, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f,
-	0x6c, 0x76, 0x65, 0x72, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x07, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x73, 0x12, 0x5a, 0x0a, 0x08, 0x52, 0x65,
-	0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f,
-	0x6c, 0x76, 0x65, 0x72, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x08, 0x52, 0x65,
-	0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x60, 0x0a, 0x08, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76,
-	0x65, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x44, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
-	0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72,
-	0x2e, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08,
-	0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x12, 0x41, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x43, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x57, 0x0a, 0x0c, 0x4c,
-	0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61,
-	0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x52, 0x0c, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61,
-	0x6e, 0x63, 0x65, 0x72, 0x12, 0x54, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x07, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x41, 0x0a, 0x0e, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x08, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x7e, 0x0a,
-	0x14, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x69, 0x7a, 0x65, 0x42, 0x79, 0x4c, 0x6f, 0x63,
-	0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4a, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
-	0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c,
-	0x76, 0x65, 0x72, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x69, 0x7a, 0x65, 0x42, 0x79, 0x4c,
-	0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x14, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74,
-	0x69, 0x7a, 0x65, 0x42, 0x79, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x1a, 0x78, 0x0a,
-	0x0c, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x52, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65,
-	0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x7b, 0x0a, 0x0d, 0x46, 0x61, 0x69, 0x6c, 0x6f,
-	0x76, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x54, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65,
-	0x72, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x51, 0x0a,
-	0x15, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72,
-	0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x20,
-	0x0a, 0x0b, 0x4f, 0x6e, 0x6c, 0x79, 0x50, 0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0b, 0x4f, 0x6e, 0x6c, 0x79, 0x50, 0x61, 0x73, 0x73, 0x69, 0x6e, 0x67,
-	0x22, 0xef, 0x01, 0x0a, 0x17, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f,
-	0x6c, 0x76, 0x65, 0x72, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x18, 0x0a, 0x07,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x12, 0x1c, 0x0a, 0x09,
-	0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61,
-	0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50,
-	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61,
-	0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61,
-	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x65, 0x65, 0x72,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x50, 0x65, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x0d,
-	0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x07, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0d, 0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f,
-	0x75, 0x70, 0x22, 0xfd, 0x02, 0x0a, 0x17, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65,
-	0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x12, 0x18,
-	0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x12, 0x1c,
-	0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b,
-	0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x0b, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x12, 0x5e,
-	0x0a, 0x07, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x44, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52,
-	0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x54,
-	0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x07, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x12, 0x5c,
-	0x0a, 0x06, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x44,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65,
-	0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x50, 0x6f,
-	0x6c, 0x69, 0x63, 0x79, 0x52, 0x06, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x24, 0x0a, 0x0d,
-	0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x07, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0d, 0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f,
-	0x75, 0x70, 0x22, 0x4d, 0x0a, 0x1d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73,
-	0x6f, 0x6c, 0x76, 0x65, 0x72, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x50, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x52, 0x65, 0x67, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e,
-	0x73, 0x22, 0x39, 0x0a, 0x23, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f,
-	0x6c, 0x76, 0x65, 0x72, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x69, 0x7a, 0x65, 0x42, 0x79,
-	0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x4d, 0x6f, 0x64, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x22, 0xcf, 0x01, 0x0a,
-	0x1d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72,
-	0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x18,
-	0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x75, 0x62, 0x73, 0x65, 0x74, 0x12, 0x1c,
-	0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09,
-	0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61,
-	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
-	0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x65,
-	0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x50, 0x65, 0x65, 0x72, 0x22, 0xc7,
-	0x02, 0x0a, 0x0c, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x12,
-	0x16, 0x0a, 0x06, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x5d, 0x0a, 0x0e, 0x52, 0x69, 0x6e, 0x67, 0x48,
-	0x61, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x52, 0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0e, 0x52, 0x69, 0x6e, 0x67, 0x48, 0x61, 0x73, 0x68,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x69, 0x0a, 0x12, 0x4c, 0x65, 0x61, 0x73, 0x74, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4c, 0x65, 0x61, 0x73, 0x74,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x12, 0x4c,
-	0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x55, 0x0a, 0x0c, 0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65,
-	0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
-	0x48, 0x61, 0x73, 0x68, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0c, 0x48, 0x61, 0x73, 0x68,
-	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x22, 0x64, 0x0a, 0x0e, 0x52, 0x69, 0x6e, 0x67,
-	0x48, 0x61, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x28, 0x0a, 0x0f, 0x4d, 0x69,
-	0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x52, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x04, 0x52, 0x0f, 0x4d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x52, 0x69, 0x6e, 0x67,
-	0x53, 0x69, 0x7a, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x4d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x52,
-	0x69, 0x6e, 0x67, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0f, 0x4d,
-	0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x52, 0x69, 0x6e, 0x67, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x36,
-	0x0a, 0x12, 0x4c, 0x65, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x43, 0x6f,
-	0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x43, 0x68, 0x6f, 0x69, 0x63,
-	0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xd3, 0x01, 0x0a, 0x0a, 0x48, 0x61, 0x73, 0x68, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x46,
-	0x69, 0x65, 0x6c, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x57, 0x0a, 0x0c, 0x43,
-	0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0c, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x50,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x50,
-	0x12, 0x1a, 0x0a, 0x08, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x08, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x22, 0x69, 0x0a, 0x0c,
-	0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x18, 0x0a, 0x07,
-	0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x53,
-	0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03,
-	0x54, 0x54, 0x4c, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x50, 0x61, 0x74, 0x68, 0x22, 0x98, 0x03, 0x0a, 0x0e, 0x49, 0x6e, 0x67, 0x72,
-	0x65, 0x73, 0x73, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x12, 0x49, 0x0a, 0x03, 0x54, 0x4c,
-	0x53, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
-	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x52, 0x03, 0x54, 0x4c, 0x53, 0x12, 0x54, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
-	0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
-	0x2e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
-	0x52, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x12, 0x53, 0x0a, 0x04, 0x4d,
-	0x65, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x2e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
-	0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61,
-	0x12, 0x57, 0x0a, 0x08, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x67, 0x72, 0x65,
-	0x73, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
-	0x08, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74,
-	0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x38, 0x01, 0x22, 0x8f, 0x02, 0x0a, 0x14, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x26, 0x0a, 0x0e, 0x4d,
-	0x61, 0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0d, 0x52, 0x0e, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x12, 0x2e, 0x0a, 0x12, 0x4d, 0x61, 0x78, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e,
-	0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x12, 0x4d, 0x61, 0x78, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x73, 0x12, 0x34, 0x0a, 0x15, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x63, 0x75, 0x72,
-	0x72, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0d, 0x52, 0x15, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e,
-	0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x69, 0x0a, 0x12, 0x50, 0x61, 0x73,
-	0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x50, 0x61,
-	0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b,
-	0x52, 0x12, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43,
-	0x68, 0x65, 0x63, 0x6b, 0x22, 0xea, 0x01, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
-	0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x45, 0x6e, 0x61,
-	0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x45, 0x6e, 0x61, 0x62,
-	0x6c, 0x65, 0x64, 0x12, 0x4c, 0x0a, 0x03, 0x53, 0x44, 0x53, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
-	0x54, 0x4c, 0x53, 0x53, 0x44, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x03, 0x53, 0x44,
-	0x53, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x4c, 0x53, 0x4d, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x73, 0x69,
-	0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x54, 0x4c, 0x53, 0x4d, 0x69, 0x6e,
-	0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x4c, 0x53, 0x4d, 0x61,
-	0x78, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d,
-	0x54, 0x4c, 0x53, 0x4d, 0x61, 0x78, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a,
-	0x0c, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x0c, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65,
-	0x73, 0x22, 0x5b, 0x0a, 0x13, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x54, 0x4c, 0x53, 0x53,
-	0x44, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x43,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x43, 0x65,
-	0x72, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0c, 0x43, 0x65, 0x72, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0xdf,
-	0x01, 0x0a, 0x0f, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e,
-	0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x6f, 0x6c, 0x12, 0x51, 0x0a, 0x08, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x03,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x67,
-	0x72, 0x65, 0x73, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x08, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x49, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77,
-	0x61, 0x79, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x03, 0x54, 0x4c, 0x53,
-	0x22, 0xb7, 0x06, 0x0a, 0x0e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x48, 0x6f, 0x73, 0x74, 0x73,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x48, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x50, 0x0a,
-	0x03, 0x54, 0x4c, 0x53, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74,
-	0x72, 0x79, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x03, 0x54, 0x4c, 0x53, 0x12,
-	0x62, 0x0a, 0x0e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
-	0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69,
-	0x65, 0x72, 0x73, 0x52, 0x0e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x73, 0x12, 0x64, 0x0a, 0x0f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d,
-	0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x52, 0x0f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x53, 0x0a, 0x04, 0x4d, 0x65, 0x74,
-	0x61, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
-	0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4d,
-	0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x58,
-	0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61,
-	0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70,
-	0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70,
-	0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x26, 0x0a, 0x0e, 0x4d, 0x61, 0x78, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d,
-	0x52, 0x0e, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x12, 0x2e, 0x0a, 0x12, 0x4d, 0x61, 0x78, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12, 0x4d, 0x61,
-	0x78, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73,
-	0x12, 0x34, 0x0a, 0x15, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e,
-	0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x15, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x69, 0x0a, 0x12, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76,
-	0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x0b, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x69,
-	0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x12, 0x50,
-	0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63,
-	0x6b, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
-	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
-	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x67, 0x0a, 0x17, 0x47, 0x61,
-	0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x4c, 0x53, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4c, 0x0a, 0x03, 0x53, 0x44, 0x53, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77,
-	0x61, 0x79, 0x54, 0x4c, 0x53, 0x53, 0x44, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x03,
-	0x53, 0x44, 0x53, 0x22, 0xcb, 0x02, 0x0a, 0x13, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x12, 0x55, 0x0a, 0x03, 0x41,
-	0x64, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
-	0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66,
-	0x69, 0x65, 0x72, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x41,
-	0x64, 0x64, 0x12, 0x55, 0x0a, 0x03, 0x53, 0x65, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x43, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x2e, 0x53, 0x65, 0x74, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x53, 0x65, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x65, 0x6d,
-	0x6f, 0x76, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x52, 0x65, 0x6d, 0x6f, 0x76,
-	0x65, 0x1a, 0x36, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x36, 0x0a, 0x08, 0x53, 0x65, 0x74,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x22, 0xc8, 0x02, 0x0a, 0x11, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x74,
-	0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x50, 0x0a, 0x07, 0x53, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
-	0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x07, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x56, 0x0a, 0x04, 0x4d, 0x65, 0x74,
-	0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74,
-	0x61, 0x12, 0x50, 0x0a, 0x03, 0x4a, 0x57, 0x54, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e,
-	0x4a, 0x57, 0x54, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x03,
-	0x4a, 0x57, 0x54, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x74, 0x0a, 0x17,
-	0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x4a, 0x57, 0x54, 0x52, 0x65, 0x71, 0x75,
-	0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x59, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x76, 0x69,
-	0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74,
-	0x72, 0x79, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x4a, 0x57, 0x54, 0x50,
-	0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x09, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
-	0x72, 0x73, 0x22, 0x94, 0x01, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e,
-	0x4a, 0x57, 0x54, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x4e,
-	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12,
-	0x68, 0x0a, 0x0c, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x73, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x44, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e,
-	0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x4a, 0x57, 0x54, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x56,
-	0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x56, 0x65, 0x72,
-	0x69, 0x66, 0x79, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x73, 0x22, 0x49, 0x0a, 0x1d, 0x49, 0x6e, 0x74,
-	0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x4a, 0x57, 0x54, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x56, 0x65,
-	0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61,
-	0x74, 0x68, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x50, 0x61, 0x74, 0x68, 0x12, 0x14,
-	0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x22, 0xcc, 0x06, 0x0a, 0x0f, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49,
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x4e, 0x0a, 0x06,
-	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x36, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5c, 0x0a, 0x0b,
-	0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74,
-	0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x50,
-	0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72,
-	0x65, 0x63, 0x65, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
-	0x50, 0x72, 0x65, 0x63, 0x65, 0x64, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x4c, 0x65,
-	0x67, 0x61, 0x63, 0x79, 0x49, 0x44, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4c, 0x65,
-	0x67, 0x61, 0x63, 0x79, 0x49, 0x44, 0x12, 0x4e, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x74,
-	0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65,
-	0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x44, 0x65, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x66, 0x0a, 0x0a, 0x4c, 0x65, 0x67, 0x61,
-	0x63, 0x79, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x46, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x6e,
-	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x4d, 0x65, 0x74, 0x61, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x4d, 0x65, 0x74, 0x61,
-	0x12, 0x46, 0x0a, 0x10, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-	0x54, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d,
-	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x10, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x43, 0x72,
-	0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x46, 0x0a, 0x10, 0x4c, 0x65, 0x67, 0x61,
-	0x63, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x10,
-	0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65,
-	0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65,
-	0x74, 0x61, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65,
-	0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65,
-	0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x65,
-	0x65, 0x72, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x50, 0x65, 0x65, 0x72, 0x12, 0x24,
-	0x0a, 0x0d, 0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18,
-	0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47,
-	0x72, 0x6f, 0x75, 0x70, 0x1a, 0x3d, 0x0a, 0x0f, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x4d, 0x65,
-	0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x22, 0x8b, 0x02, 0x0a, 0x13, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f,
-	0x6e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x4e, 0x0a, 0x06, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x36, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
-	0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x52, 0x0a, 0x04, 0x48,
-	0x54, 0x54, 0x50, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x54, 0x54, 0x50, 0x50,
-	0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x48, 0x54, 0x54, 0x50, 0x12,
-	0x50, 0x0a, 0x03, 0x4a, 0x57, 0x54, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x4a, 0x57,
-	0x54, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x03, 0x4a, 0x57,
-	0x54, 0x22, 0xed, 0x01, 0x0a, 0x17, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x48,
-	0x54, 0x54, 0x50, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a,
-	0x09, 0x50, 0x61, 0x74, 0x68, 0x45, 0x78, 0x61, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x50, 0x61, 0x74, 0x68, 0x45, 0x78, 0x61, 0x63, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x50,
-	0x61, 0x74, 0x68, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x50, 0x61, 0x74, 0x68, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x1c, 0x0a, 0x09, 0x50,
-	0x61, 0x74, 0x68, 0x52, 0x65, 0x67, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x50, 0x61, 0x74, 0x68, 0x52, 0x65, 0x67, 0x65, 0x78, 0x12, 0x5c, 0x0a, 0x06, 0x48, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x44, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x54, 0x54, 0x50, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52,
-	0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x4d, 0x65, 0x74, 0x68, 0x6f,
-	0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64,
-	0x73, 0x22, 0xc1, 0x01, 0x0a, 0x1d, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x48,
-	0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
-	0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x50, 0x72, 0x65, 0x73, 0x65,
-	0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e,
-	0x74, 0x12, 0x14, 0x0a, 0x05, 0x45, 0x78, 0x61, 0x63, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x45, 0x78, 0x61, 0x63, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x72, 0x65, 0x66, 0x69,
-	0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12,
-	0x16, 0x0a, 0x06, 0x53, 0x75, 0x66, 0x66, 0x69, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x53, 0x75, 0x66, 0x66, 0x69, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x52, 0x65, 0x67, 0x65, 0x78,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x52, 0x65, 0x67, 0x65, 0x78, 0x12, 0x16, 0x0a,
-	0x06, 0x49, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49,
-	0x6e, 0x76, 0x65, 0x72, 0x74, 0x22, 0xe5, 0x09, 0x0a, 0x0f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x44, 0x0a, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x50, 0x72, 0x6f, 0x78,
-	0x79, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x69, 0x0a, 0x10, 0x54,
-	0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x54, 0x72,
-	0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x52, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e,
-	0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x5a, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61,
-	0x74, 0x65, 0x77, 0x61, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
-	0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77,
-	0x61, 0x79, 0x12, 0x4b, 0x0a, 0x06, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x73,
-	0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x12,
-	0x20, 0x0a, 0x0b, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x53, 0x4e, 0x49, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x53, 0x4e,
-	0x49, 0x12, 0x64, 0x0a, 0x0e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5a, 0x0a, 0x0b, 0x44, 0x65, 0x73, 0x74, 0x69,
-	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x34, 0x0a, 0x15, 0x4d, 0x61, 0x78, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e,
-	0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x09, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x15, 0x4d, 0x61, 0x78, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x34, 0x0a, 0x15, 0x4c, 0x6f, 0x63,
-	0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
-	0x4d, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x15, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x12,
-	0x34, 0x0a, 0x15, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x15,
-	0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65,
-	0x6f, 0x75, 0x74, 0x4d, 0x73, 0x12, 0x3c, 0x0a, 0x19, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65,
-	0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x19, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63,
-	0x65, 0x49, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x12, 0x51, 0x0a, 0x0a, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74,
-	0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
-	0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x52, 0x0a, 0x52, 0x61, 0x74, 0x65,
-	0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x54, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x0d,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x4d, 0x65, 0x74,
-	0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x5a, 0x0a, 0x0f,
-	0x45, 0x6e, 0x76, 0x6f, 0x79, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x5a, 0x0a, 0x0d, 0x4d, 0x75, 0x74, 0x75,
-	0x61, 0x6c, 0x54, 0x4c, 0x53, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4d, 0x75, 0x74, 0x75, 0x61, 0x6c, 0x54, 0x4c,
-	0x53, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x0d, 0x4d, 0x75, 0x74, 0x75, 0x61, 0x6c, 0x54, 0x4c, 0x53,
-	0x4d, 0x6f, 0x64, 0x65, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x74, 0x0a,
-	0x16, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78,
-	0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x32, 0x0a, 0x14, 0x4f, 0x75, 0x74, 0x62, 0x6f,
-	0x75, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4c,
-	0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x44,
-	0x69, 0x61, 0x6c, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6c, 0x79, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0e, 0x44, 0x69, 0x61, 0x6c, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65, 0x63,
-	0x74, 0x6c, 0x79, 0x22, 0x5f, 0x0a, 0x11, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77,
-	0x61, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4a, 0x0a, 0x04, 0x4d, 0x6f, 0x64, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4d,
-	0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x04,
-	0x4d, 0x6f, 0x64, 0x65, 0x22, 0x6f, 0x0a, 0x0c, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x12, 0x47, 0x0a, 0x05,
-	0x50, 0x61, 0x74, 0x68, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
-	0x74, 0x72, 0x79, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x50, 0x61, 0x74, 0x68, 0x52, 0x05,
-	0x50, 0x61, 0x74, 0x68, 0x73, 0x22, 0xb0, 0x01, 0x0a, 0x0a, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65,
-	0x50, 0x61, 0x74, 0x68, 0x12, 0x22, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
-	0x50, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x4c, 0x69, 0x73, 0x74,
-	0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x74, 0x68,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x50, 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x0d,
-	0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x0d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x50, 0x6f,
-	0x72, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x28,
-	0x0a, 0x0f, 0x50, 0x61, 0x72, 0x73, 0x65, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x43, 0x68, 0x65, 0x63,
-	0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x50, 0x61, 0x72, 0x73, 0x65, 0x64, 0x46,
-	0x72, 0x6f, 0x6d, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x22, 0xbf, 0x01, 0x0a, 0x15, 0x55, 0x70, 0x73,
-	0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x53, 0x0a, 0x09, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x55, 0x70,
-	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x09, 0x4f, 0x76,
-	0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x73, 0x12, 0x51, 0x0a, 0x08, 0x44, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x52, 0x08, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x22, 0x8a, 0x05, 0x0a, 0x0e, 0x55,
-	0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x12, 0x0a,
-	0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d,
-	0x65, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d,
-	0x65, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74,
-	0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74,
-	0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x2c, 0x0a, 0x11, 0x45,
-	0x6e, 0x76, 0x6f, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4a, 0x53, 0x4f, 0x4e,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x4c, 0x69, 0x73,
-	0x74, 0x65, 0x6e, 0x65, 0x72, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x2a, 0x0a, 0x10, 0x45, 0x6e, 0x76,
-	0x6f, 0x79, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x10, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
-	0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
-	0x6c, 0x12, 0x2a, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65,
-	0x6f, 0x75, 0x74, 0x4d, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x43, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x12, 0x4d, 0x0a,
-	0x06, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4c, 0x69,
-	0x6d, 0x69, 0x74, 0x73, 0x52, 0x06, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x69, 0x0a, 0x12,
-	0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65,
-	0x63, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
-	0x2e, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68,
-	0x65, 0x63, 0x6b, 0x52, 0x12, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c,
-	0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x5a, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47,
-	0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65,
-	0x77, 0x61, 0x79, 0x12, 0x3e, 0x0a, 0x1a, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x4f, 0x75,
-	0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1a, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65,
-	0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x65, 0x65, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x50, 0x65, 0x65, 0x72, 0x22, 0x9e, 0x01, 0x0a, 0x0e, 0x55, 0x70, 0x73, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x26, 0x0a, 0x0e, 0x4d, 0x61,
-	0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x0e, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x12, 0x2e, 0x0a, 0x12, 0x4d, 0x61, 0x78, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12,
-	0x4d, 0x61, 0x78, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x73, 0x12, 0x34, 0x0a, 0x15, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72,
-	0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x15, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x22, 0x9e, 0x02, 0x0a, 0x12, 0x50, 0x61, 0x73,
-	0x73, 0x69, 0x76, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12,
-	0x35, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x49, 0x6e,
-	0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x4d, 0x61, 0x78, 0x46, 0x61, 0x69,
-	0x6c, 0x75, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x4d, 0x61, 0x78,
-	0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x73, 0x12, 0x38, 0x0a, 0x17, 0x45, 0x6e, 0x66, 0x6f,
-	0x72, 0x63, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x74, 0x69, 0x76, 0x65,
-	0x35, 0x78, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x17, 0x45, 0x6e, 0x66, 0x6f, 0x72,
-	0x63, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x73, 0x65, 0x63, 0x75, 0x74, 0x69, 0x76, 0x65, 0x35,
-	0x78, 0x78, 0x12, 0x2e, 0x0a, 0x12, 0x4d, 0x61, 0x78, 0x45, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12,
-	0x4d, 0x61, 0x78, 0x45, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x63, 0x65,
-	0x6e, 0x74, 0x12, 0x45, 0x0a, 0x10, 0x42, 0x61, 0x73, 0x65, 0x45, 0x6a, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10, 0x42, 0x61, 0x73, 0x65, 0x45, 0x6a, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x45, 0x0a, 0x11, 0x44, 0x65, 0x73,
-	0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1c,
-	0x0a, 0x09, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x09, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04,
-	0x50, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x50, 0x6f, 0x72, 0x74,
-	0x22, 0x72, 0x0a, 0x0a, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x64,
-	0x0a, 0x0d, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x61, 0x74, 0x65, 0x4c,
-	0x69, 0x6d, 0x69, 0x74, 0x73, 0x52, 0x0d, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4c,
-	0x65, 0x76, 0x65, 0x6c, 0x22, 0xd0, 0x01, 0x0a, 0x17, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73,
-	0x12, 0x2c, 0x0a, 0x11, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x50, 0x65, 0x72, 0x53,
-	0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x11, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x73, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x12, 0x2a,
-	0x0a, 0x10, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x4d, 0x61, 0x78, 0x42, 0x75, 0x72,
-	0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x10, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x73, 0x4d, 0x61, 0x78, 0x42, 0x75, 0x72, 0x73, 0x74, 0x12, 0x5b, 0x0a, 0x06, 0x52, 0x6f,
-	0x75, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74,
-	0x72, 0x79, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c,
-	0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x52,
-	0x06, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x22, 0xd4, 0x01, 0x0a, 0x1c, 0x49, 0x6e, 0x73, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x61,
-	0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x74, 0x68,
-	0x45, 0x78, 0x61, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x74,
-	0x68, 0x45, 0x78, 0x61, 0x63, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x61, 0x74, 0x68, 0x50, 0x72,
-	0x65, 0x66, 0x69, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x50, 0x61, 0x74, 0x68,
-	0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x74, 0x68, 0x52, 0x65,
-	0x67, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x74, 0x68, 0x52,
-	0x65, 0x67, 0x65, 0x78, 0x12, 0x2c, 0x0a, 0x11, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73,
-	0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x11, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x50, 0x65, 0x72, 0x53, 0x65, 0x63, 0x6f,
-	0x6e, 0x64, 0x12, 0x2a, 0x0a, 0x10, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x4d, 0x61,
-	0x78, 0x42, 0x75, 0x72, 0x73, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x10, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x4d, 0x61, 0x78, 0x42, 0x75, 0x72, 0x73, 0x74, 0x22, 0xb6,
-	0x02, 0x0a, 0x0a, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x12, 0x4f, 0x0a,
-	0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
-	0x74, 0x72, 0x79, 0x2e, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2e, 0x4d,
-	0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x57,
-	0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74,
-	0x65, 0x77, 0x61, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x52, 0x09, 0x4c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x12, 0x45, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x1a, 0x37,
-	0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x5a, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x12, 0x50, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x43, 0x6f,
-	0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x22, 0x8b, 0x02, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x16, 0x0a,
-	0x06, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x52,
-	0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
-	0x54, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x52, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x4a, 0x0a, 0x12, 0x4c, 0x61, 0x73, 0x74, 0x54, 0x72, 0x61,
-	0x6e, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x12, 0x4c,
-	0x61, 0x73, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d,
-	0x65, 0x22, 0xb4, 0x03, 0x0a, 0x12, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
-	0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08,
-	0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-	0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x6f, 0x72, 0x74,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x5d, 0x0a, 0x08,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x41,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61,
-	0x79, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
-	0x6c, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x53, 0x0a, 0x03, 0x54,
-	0x4c, 0x53, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
-	0x2e, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x54, 0x4c, 0x53, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x54, 0x4c, 0x53,
-	0x12, 0x53, 0x0a, 0x08, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x18, 0x06, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x41, 0x50, 0x49, 0x47, 0x61,
-	0x74, 0x65, 0x77, 0x61, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x08, 0x4f, 0x76, 0x65,
-	0x72, 0x72, 0x69, 0x64, 0x65, 0x12, 0x51, 0x0a, 0x07, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x41,
-	0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52,
-	0x07, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0xde, 0x01, 0x0a, 0x1a, 0x41, 0x50, 0x49,
-	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x54, 0x4c, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5c, 0x0a, 0x0c, 0x43, 0x65, 0x72, 0x74, 0x69,
-	0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65,
-	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x0c, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
-	0x63, 0x61, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x73,
-	0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x4d, 0x69, 0x6e, 0x56, 0x65,
-	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x61, 0x78, 0x56, 0x65, 0x72, 0x73,
-	0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x4d, 0x61, 0x78, 0x56, 0x65,
-	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53,
-	0x75, 0x69, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x43, 0x69, 0x70,
-	0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x22, 0x65, 0x0a, 0x10, 0x41, 0x50, 0x49,
-	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x51, 0x0a,
-	0x03, 0x4a, 0x57, 0x54, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74,
-	0x72, 0x79, 0x2e, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4a, 0x57, 0x54,
-	0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x03, 0x4a, 0x57, 0x54,
-	0x22, 0x76, 0x0a, 0x18, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4a, 0x57,
-	0x54, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x5a, 0x0a, 0x09,
-	0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x3c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77,
-	0x61, 0x79, 0x4a, 0x57, 0x54, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x09, 0x50,
-	0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, 0x22, 0x96, 0x01, 0x0a, 0x15, 0x41, 0x50, 0x49,
-	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4a, 0x57, 0x54, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64,
-	0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x69, 0x0a, 0x0c, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79,
-	0x43, 0x6c, 0x61, 0x69, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x45, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4a,
-	0x57, 0x54, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x43, 0x6c, 0x61, 0x69, 0x6d,
-	0x73, 0x22, 0x4a, 0x0a, 0x1e, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4a,
-	0x57, 0x54, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x04, 0x50, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xb7, 0x01,
-	0x0a, 0x11, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65,
-	0x6e, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x53,
-	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0b, 0x53, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x58, 0x0a,
-	0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72,
-	0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72,
-	0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x22, 0xfe, 0x01, 0x0a, 0x0f, 0x42, 0x6f, 0x75, 0x6e,
-	0x64, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x12, 0x54, 0x0a, 0x04, 0x4d,
-	0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x2e, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61,
-	0x79, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74,
-	0x61, 0x12, 0x5c, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x42, 0x6f, 0x75,
-	0x6e, 0x64, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4c, 0x69, 0x73, 0x74,
-	0x65, 0x6e, 0x65, 0x72, 0x52, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x73, 0x1a,
-	0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xdd, 0x01, 0x0a, 0x17, 0x42, 0x6f, 0x75,
-	0x6e, 0x64, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4c, 0x69, 0x73, 0x74,
-	0x65, 0x6e, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x5c, 0x0a, 0x0c, 0x43, 0x65, 0x72, 0x74,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52,
-	0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x0c, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x12, 0x50, 0x0a, 0x06, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x52,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65,
-	0x52, 0x06, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x22, 0xe6, 0x01, 0x0a, 0x11, 0x49, 0x6e, 0x6c,
-	0x69, 0x6e, 0x65, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x56,
-	0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x65, 0x72, 0x74, 0x69,
-	0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x43, 0x65, 0x72,
-	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76,
-	0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x50, 0x72,
-	0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x22, 0x99, 0x03, 0x0a, 0x09, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12,
-	0x4e, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x2e,
-	0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12,
-	0x52, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x07, 0x50, 0x61, 0x72, 0x65,
-	0x6e, 0x74, 0x73, 0x12, 0x4a, 0x0a, 0x05, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52,
-	0x6f, 0x75, 0x74, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x05, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12,
-	0x1c, 0x0a, 0x09, 0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x09, 0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x45, 0x0a,
-	0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x53, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xdf, 0x02,
-	0x0a, 0x0d, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x12,
-	0x4c, 0x0a, 0x07, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x46, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x73, 0x52, 0x07, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x4a, 0x0a,
-	0x07, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x52, 0x07, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x12, 0x4e, 0x0a, 0x08, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
-	0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52,
-	0x08, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x64, 0x0a, 0x0f, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x52, 0x0f,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x22,
-	0xc4, 0x02, 0x0a, 0x09, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x50, 0x0a,
-	0x07, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x36,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x07, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12,
-	0x4e, 0x0a, 0x06, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x52, 0x06, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12,
-	0x48, 0x0a, 0x04, 0x50, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x52, 0x04, 0x50, 0x61, 0x74, 0x68, 0x12, 0x4b, 0x0a, 0x05, 0x51, 0x75, 0x65,
-	0x72, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
-	0x2e, 0x48, 0x54, 0x54, 0x50, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52,
-	0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x22, 0x8d, 0x01, 0x0a, 0x0f, 0x48, 0x54, 0x54, 0x50, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x50, 0x0a, 0x05, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x12, 0x0a, 0x04,
-	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65,
-	0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x75, 0x0a, 0x0d, 0x48, 0x54, 0x54, 0x50, 0x50, 0x61,
-	0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x4e, 0x0a, 0x05, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48,
-	0x54, 0x54, 0x50, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65,
-	0x52, 0x05, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x8b, 0x01,
-	0x0a, 0x0e, 0x48, 0x54, 0x54, 0x50, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x12, 0x4f, 0x0a, 0x05, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x51, 0x75, 0x65, 0x72,
-	0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xa9, 0x03, 0x0a, 0x0b,
-	0x48, 0x54, 0x54, 0x50, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x51, 0x0a, 0x07, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x07, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x51,
-	0x0a, 0x0a, 0x55, 0x52, 0x4c, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x55, 0x52, 0x4c, 0x52, 0x65,
-	0x77, 0x72, 0x69, 0x74, 0x65, 0x52, 0x0a, 0x55, 0x52, 0x4c, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74,
-	0x65, 0x12, 0x54, 0x0a, 0x0b, 0x52, 0x65, 0x74, 0x72, 0x79, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x52,
-	0x65, 0x74, 0x72, 0x79, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x0b, 0x52, 0x65, 0x74, 0x72,
-	0x79, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x5a, 0x0a, 0x0d, 0x54, 0x69, 0x6d, 0x65, 0x6f,
-	0x75, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x46, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x52, 0x0d, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x46, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x12, 0x42, 0x0a, 0x03, 0x4a, 0x57, 0x54, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4a, 0x57, 0x54, 0x46, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x52, 0x03, 0x4a, 0x57, 0x54, 0x22, 0x68, 0x0a, 0x13, 0x48, 0x54, 0x54, 0x50, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x51,
-	0x0a, 0x07, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x07, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x73, 0x22, 0x20, 0x0a, 0x0a, 0x55, 0x52, 0x4c, 0x52, 0x65, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12,
-	0x12, 0x0a, 0x04, 0x50, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x50,
-	0x61, 0x74, 0x68, 0x22, 0xad, 0x01, 0x0a, 0x0b, 0x52, 0x65, 0x74, 0x72, 0x79, 0x46, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x4e, 0x75, 0x6d, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65,
-	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x4e, 0x75, 0x6d, 0x52, 0x65, 0x74, 0x72,
-	0x69, 0x65, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x52, 0x65, 0x74, 0x72, 0x79, 0x4f, 0x6e, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x52, 0x65, 0x74, 0x72, 0x79, 0x4f, 0x6e, 0x12, 0x2e, 0x0a,
-	0x12, 0x52, 0x65, 0x74, 0x72, 0x79, 0x4f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f,
-	0x64, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x12, 0x52, 0x65, 0x74, 0x72, 0x79,
-	0x4f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x34, 0x0a,
-	0x15, 0x52, 0x65, 0x74, 0x72, 0x79, 0x4f, 0x6e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x46,
-	0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x52, 0x65,
-	0x74, 0x72, 0x79, 0x4f, 0x6e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x46, 0x61, 0x69, 0x6c,
-	0x75, 0x72, 0x65, 0x22, 0x8f, 0x01, 0x0a, 0x0d, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x46,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x41, 0x0a, 0x0e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x3b, 0x0a, 0x0b, 0x49, 0x64, 0x6c, 0x65,
-	0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x49, 0x64, 0x6c, 0x65, 0x54, 0x69,
-	0x6d, 0x65, 0x6f, 0x75, 0x74, 0x22, 0x67, 0x0a, 0x09, 0x4a, 0x57, 0x54, 0x46, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x12, 0x5a, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x41, 0x50,
-	0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4a, 0x57, 0x54, 0x50, 0x72, 0x6f, 0x76, 0x69,
-	0x64, 0x65, 0x72, 0x52, 0x09, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, 0x22, 0xc2,
-	0x02, 0x0a, 0x10, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x12, 0x52, 0x0a, 0x03, 0x41, 0x64, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x40, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x41, 0x64, 0x64, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x03, 0x41, 0x64, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x65, 0x6d, 0x6f, 0x76,
-	0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x12,
-	0x52, 0x0a, 0x03, 0x53, 0x65, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x46,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x53, 0x65, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03,
-	0x53, 0x65, 0x74, 0x1a, 0x36, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x36, 0x0a, 0x08, 0x53,
-	0x65, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x22, 0xc7, 0x02, 0x0a, 0x0b, 0x48, 0x54, 0x54, 0x50, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x57, 0x65, 0x69, 0x67, 0x68,
-	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12,
-	0x4c, 0x0a, 0x07, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x32, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x46, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x73, 0x52, 0x07, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x58, 0x0a,
-	0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72,
-	0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72,
-	0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x64, 0x0a, 0x0f, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x52, 0x0f, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x22, 0xfc, 0x02,
-	0x0a, 0x08, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x4d, 0x0a, 0x04, 0x4d, 0x65,
-	0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
-	0x2e, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x52, 0x0a, 0x07, 0x50, 0x61, 0x72,
-	0x65, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74,
-	0x72, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72,
-	0x65, 0x6e, 0x63, 0x65, 0x52, 0x07, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x4d, 0x0a,
-	0x08, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x54, 0x43, 0x50, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x52, 0x08, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x45, 0x0a, 0x06,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65,
-	0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x53, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x7a, 0x0a, 0x0a,
-	0x54, 0x43, 0x50, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x58,
-	0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70,
-	0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70,
-	0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x22, 0xb4, 0x03, 0x0a, 0x0d, 0x53, 0x61, 0x6d,
-	0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2e,
-	0x0a, 0x12, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x46, 0x6f, 0x72, 0x46, 0x61, 0x69, 0x6c,
-	0x6f, 0x76, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x44, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x46, 0x6f, 0x72, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x12, 0x22,
-	0x0a, 0x0c, 0x49, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x49, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x4c, 0x6f, 0x63,
-	0x61, 0x6c, 0x12, 0x54, 0x0a, 0x07, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x61, 0x6d, 0x65,
-	0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52,
-	0x07, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12, 0x52, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61,
-	0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x53,
-	0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x4d, 0x65, 0x74,
-	0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x58, 0x0a, 0x0e,
-	0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69,
-	0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69,
-	0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
-	0x47, 0x0a, 0x13, 0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70,
-	0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x65, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x50, 0x65, 0x65, 0x72, 0x22, 0xdd, 0x04, 0x0a, 0x0b, 0x4a, 0x57, 0x54,
-	0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x5a, 0x0a, 0x0d, 0x4a, 0x53, 0x4f, 0x4e,
-	0x57, 0x65, 0x62, 0x4b, 0x65, 0x79, 0x53, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4a, 0x53, 0x4f, 0x4e, 0x57, 0x65, 0x62, 0x4b,
-	0x65, 0x79, 0x53, 0x65, 0x74, 0x52, 0x0d, 0x4a, 0x53, 0x4f, 0x4e, 0x57, 0x65, 0x62, 0x4b, 0x65,
-	0x79, 0x53, 0x65, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x73, 0x75, 0x65, 0x72, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x49, 0x73, 0x73, 0x75, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09,
-	0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x09, 0x41, 0x75, 0x64, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x50, 0x0a, 0x09, 0x4c, 0x6f,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4a, 0x57, 0x54, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x09, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x5a, 0x0a, 0x0a,
-	0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4a, 0x57, 0x54, 0x46, 0x6f, 0x72, 0x77,
-	0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a, 0x46, 0x6f,
-	0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x57, 0x0a, 0x0b, 0x43, 0x61, 0x63, 0x68,
-	0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4a, 0x57, 0x54, 0x43, 0x61, 0x63, 0x68, 0x65, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b, 0x43, 0x61, 0x63, 0x68, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x50, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x3c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4a, 0x57, 0x54, 0x50, 0x72, 0x6f, 0x76, 0x69,
-	0x64, 0x65, 0x72, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d,
-	0x65, 0x74, 0x61, 0x12, 0x2a, 0x0a, 0x10, 0x43, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x6b, 0x65, 0x77,
-	0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x43,
-	0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x6b, 0x65, 0x77, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x1a,
-	0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa2, 0x01, 0x0a, 0x0d, 0x4a, 0x53, 0x4f,
-	0x4e, 0x57, 0x65, 0x62, 0x4b, 0x65, 0x79, 0x53, 0x65, 0x74, 0x12, 0x46, 0x0a, 0x05, 0x4c, 0x6f,
-	0x63, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x4a, 0x57, 0x4b, 0x53, 0x52, 0x05, 0x4c, 0x6f, 0x63,
-	0x61, 0x6c, 0x12, 0x49, 0x0a, 0x06, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74,
-	0x65, 0x4a, 0x57, 0x4b, 0x53, 0x52, 0x06, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x22, 0x3b, 0x0a,
-	0x09, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x4a, 0x57, 0x4b, 0x53, 0x12, 0x12, 0x0a, 0x04, 0x4a, 0x57,
-	0x4b, 0x53, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4a, 0x57, 0x4b, 0x53, 0x12, 0x1a,
-	0x0a, 0x08, 0x46, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x46, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xed, 0x02, 0x0a, 0x0a, 0x52,
-	0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4a, 0x57, 0x4b, 0x53, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x52, 0x49,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x52, 0x49, 0x12, 0x2a, 0x0a, 0x10, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x69,
-	0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4d, 0x73, 0x12, 0x3f, 0x0a, 0x0d, 0x43, 0x61, 0x63, 0x68, 0x65,
-	0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x43, 0x61, 0x63, 0x68, 0x65,
-	0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x30, 0x0a, 0x13, 0x46, 0x65, 0x74, 0x63,
-	0x68, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x68, 0x72, 0x6f, 0x6e, 0x6f, 0x75, 0x73, 0x6c, 0x79, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x46, 0x65, 0x74, 0x63, 0x68, 0x41, 0x73, 0x79, 0x6e,
-	0x63, 0x68, 0x72, 0x6f, 0x6e, 0x6f, 0x75, 0x73, 0x6c, 0x79, 0x12, 0x58, 0x0a, 0x0b, 0x52, 0x65,
-	0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4a, 0x57, 0x4b, 0x53, 0x52, 0x65, 0x74, 0x72,
-	0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0b, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f,
-	0x6c, 0x69, 0x63, 0x79, 0x12, 0x54, 0x0a, 0x0b, 0x4a, 0x57, 0x4b, 0x53, 0x43, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x2e, 0x4a, 0x57, 0x4b, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x0b, 0x4a,
-	0x57, 0x4b, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x22, 0xdb, 0x01, 0x0a, 0x0b, 0x4a,
-	0x57, 0x4b, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x44, 0x69,
-	0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0d, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x63, 0x0a, 0x0f, 0x54, 0x4c, 0x53, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x2e, 0x4a, 0x57, 0x4b, 0x53, 0x54, 0x4c, 0x53, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
-	0x63, 0x61, 0x74, 0x65, 0x52, 0x0f, 0x54, 0x4c, 0x53, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
-	0x63, 0x61, 0x74, 0x65, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-	0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x22, 0xfa, 0x01, 0x0a, 0x12, 0x4a, 0x57, 0x4b,
-	0x53, 0x54, 0x4c, 0x53, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12,
-	0x88, 0x01, 0x0a, 0x1d, 0x43, 0x61, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
-	0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
-	0x4a, 0x57, 0x4b, 0x53, 0x54, 0x4c, 0x53, 0x43, 0x65, 0x72, 0x74, 0x50, 0x72, 0x6f, 0x76, 0x69,
-	0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x1d, 0x43, 0x61, 0x43,
-	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64,
-	0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x59, 0x0a, 0x09, 0x54, 0x72,
-	0x75, 0x73, 0x74, 0x65, 0x64, 0x43, 0x41, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4a, 0x57, 0x4b, 0x53, 0x54, 0x4c, 0x53, 0x43, 0x65, 0x72,
-	0x74, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x43, 0x41, 0x52, 0x09, 0x54, 0x72, 0x75, 0x73,
-	0x74, 0x65, 0x64, 0x43, 0x41, 0x22, 0x6b, 0x0a, 0x1b, 0x4a, 0x57, 0x4b, 0x53, 0x54, 0x4c, 0x53,
-	0x43, 0x65, 0x72, 0x74, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x49, 0x6e, 0x73, 0x74,
-	0x61, 0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x43, 0x65, 0x72, 0x74,
-	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0f, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4e, 0x61,
-	0x6d, 0x65, 0x22, 0xaa, 0x01, 0x0a, 0x14, 0x4a, 0x57, 0x4b, 0x53, 0x54, 0x4c, 0x53, 0x43, 0x65,
-	0x72, 0x74, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x43, 0x41, 0x12, 0x1a, 0x0a, 0x08, 0x46,
-	0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x46,
-	0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x30, 0x0a, 0x13, 0x45, 0x6e, 0x76, 0x69, 0x72,
-	0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e,
-	0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x49, 0x6e, 0x6c,
-	0x69, 0x6e, 0x65, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0c, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x20, 0x0a,
-	0x0b, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x79, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x0c, 0x52, 0x0b, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x79, 0x74, 0x65, 0x73, 0x22,
-	0x9c, 0x01, 0x0a, 0x0f, 0x4a, 0x57, 0x4b, 0x53, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x4e, 0x75, 0x6d, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65,
-	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x4e, 0x75, 0x6d, 0x52, 0x65, 0x74, 0x72,
-	0x69, 0x65, 0x73, 0x12, 0x69, 0x0a, 0x12, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x52, 0x12, 0x52, 0x65, 0x74, 0x72,
-	0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x22, 0x90,
-	0x01, 0x0a, 0x12, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x61,
-	0x63, 0x6b, 0x4f, 0x66, 0x66, 0x12, 0x3d, 0x0a, 0x0c, 0x42, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x74,
-	0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x42, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x74, 0x65,
-	0x72, 0x76, 0x61, 0x6c, 0x12, 0x3b, 0x0a, 0x0b, 0x4d, 0x61, 0x78, 0x49, 0x6e, 0x74, 0x65, 0x72,
-	0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x4d, 0x61, 0x78, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61,
-	0x6c, 0x22, 0x8f, 0x02, 0x0a, 0x0b, 0x4a, 0x57, 0x54, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x50, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4a, 0x57, 0x54, 0x4c, 0x6f, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x06, 0x48, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x12, 0x5c, 0x0a, 0x0a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61,
-	0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e,
-	0x4a, 0x57, 0x54, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x51, 0x75, 0x65, 0x72, 0x79,
-	0x50, 0x61, 0x72, 0x61, 0x6d, 0x52, 0x0a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61,
-	0x6d, 0x12, 0x50, 0x0a, 0x06, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x4a, 0x57, 0x54, 0x4c, 0x6f, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x52, 0x06, 0x43, 0x6f, 0x6f,
-	0x6b, 0x69, 0x65, 0x22, 0x63, 0x0a, 0x11, 0x4a, 0x57, 0x54, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0b, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x18,
-	0x0a, 0x07, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x07, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x22, 0x2b, 0x0a, 0x15, 0x4a, 0x57, 0x54, 0x4c,
-	0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61,
-	0x6d, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x27, 0x0a, 0x11, 0x4a, 0x57, 0x54, 0x4c, 0x6f, 0x63, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x6f,
-	0x0a, 0x13, 0x4a, 0x57, 0x54, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e,
-	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x38, 0x0a, 0x17, 0x50, 0x61, 0x64, 0x46, 0x6f, 0x72, 0x77,
-	0x61, 0x72, 0x64, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x50, 0x61, 0x64, 0x46, 0x6f, 0x72, 0x77, 0x61,
-	0x72, 0x64, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x22,
-	0x24, 0x0a, 0x0e, 0x4a, 0x57, 0x54, 0x43, 0x61, 0x63, 0x68, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x04, 0x53, 0x69, 0x7a, 0x65, 0x2a, 0xa9, 0x02, 0x0a, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x0f,
-	0x0a, 0x0b, 0x4b, 0x69, 0x6e, 0x64, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x10, 0x00, 0x12,
-	0x12, 0x0a, 0x0e, 0x4b, 0x69, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x4b, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12,
-	0x4b, 0x69, 0x6e, 0x64, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x47, 0x61, 0x74, 0x65, 0x77,
-	0x61, 0x79, 0x10, 0x03, 0x12, 0x19, 0x0a, 0x15, 0x4b, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x10, 0x04, 0x12,
-	0x17, 0x0a, 0x13, 0x4b, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65,
-	0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x10, 0x05, 0x12, 0x19, 0x0a, 0x15, 0x4b, 0x69, 0x6e, 0x64,
-	0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
-	0x65, 0x10, 0x06, 0x12, 0x12, 0x0a, 0x0e, 0x4b, 0x69, 0x6e, 0x64, 0x41, 0x50, 0x49, 0x47, 0x61,
-	0x74, 0x65, 0x77, 0x61, 0x79, 0x10, 0x07, 0x12, 0x17, 0x0a, 0x13, 0x4b, 0x69, 0x6e, 0x64, 0x42,
-	0x6f, 0x75, 0x6e, 0x64, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x10, 0x08,
-	0x12, 0x11, 0x0a, 0x0d, 0x4b, 0x69, 0x6e, 0x64, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74,
-	0x65, 0x10, 0x09, 0x12, 0x10, 0x0a, 0x0c, 0x4b, 0x69, 0x6e, 0x64, 0x54, 0x43, 0x50, 0x52, 0x6f,
-	0x75, 0x74, 0x65, 0x10, 0x0a, 0x12, 0x15, 0x0a, 0x11, 0x4b, 0x69, 0x6e, 0x64, 0x53, 0x61, 0x6d,
-	0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x10, 0x0b, 0x12, 0x13, 0x0a, 0x0f,
-	0x4b, 0x69, 0x6e, 0x64, 0x4a, 0x57, 0x54, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x10,
-	0x0c, 0x2a, 0x26, 0x0a, 0x0f, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x08, 0x0a, 0x04, 0x44, 0x65, 0x6e, 0x79, 0x10, 0x00, 0x12, 0x09,
-	0x0a, 0x05, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x10, 0x01, 0x2a, 0x21, 0x0a, 0x13, 0x49, 0x6e, 0x74,
-	0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x0a, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x10, 0x00, 0x2a, 0x50, 0x0a, 0x09,
-	0x50, 0x72, 0x6f, 0x78, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x72, 0x6f,
-	0x78, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x10, 0x00, 0x12,
-	0x18, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x54, 0x72, 0x61, 0x6e,
-	0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x72, 0x6f,
-	0x78, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x10, 0x02, 0x2a, 0x5f,
-	0x0a, 0x0d, 0x4d, 0x75, 0x74, 0x75, 0x61, 0x6c, 0x54, 0x4c, 0x53, 0x4d, 0x6f, 0x64, 0x65, 0x12,
-	0x18, 0x0a, 0x14, 0x4d, 0x75, 0x74, 0x75, 0x61, 0x6c, 0x54, 0x4c, 0x53, 0x4d, 0x6f, 0x64, 0x65,
-	0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x4d, 0x75, 0x74,
-	0x75, 0x61, 0x6c, 0x54, 0x4c, 0x53, 0x4d, 0x6f, 0x64, 0x65, 0x53, 0x74, 0x72, 0x69, 0x63, 0x74,
-	0x10, 0x01, 0x12, 0x1b, 0x0a, 0x17, 0x4d, 0x75, 0x74, 0x75, 0x61, 0x6c, 0x54, 0x4c, 0x53, 0x4d,
-	0x6f, 0x64, 0x65, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x76, 0x65, 0x10, 0x02, 0x2a,
-	0x7b, 0x0a, 0x0f, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4d, 0x6f,
-	0x64, 0x65, 0x12, 0x1a, 0x0a, 0x16, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61,
-	0x79, 0x4d, 0x6f, 0x64, 0x65, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x10, 0x00, 0x12, 0x17,
-	0x0a, 0x13, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4d, 0x6f, 0x64,
-	0x65, 0x4e, 0x6f, 0x6e, 0x65, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x4d, 0x65, 0x73, 0x68, 0x47,
-	0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x10,
-	0x02, 0x12, 0x19, 0x0a, 0x15, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
-	0x4d, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x10, 0x03, 0x2a, 0x4f, 0x0a, 0x1a,
-	0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e,
-	0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x18, 0x0a, 0x14, 0x4c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x48, 0x54,
-	0x54, 0x50, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x54, 0x43, 0x50, 0x10, 0x01, 0x2a, 0x92, 0x02,
-	0x0a, 0x0f, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f,
-	0x64, 0x12, 0x16, 0x0a, 0x12, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65,
-	0x74, 0x68, 0x6f, 0x64, 0x41, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x1a, 0x0a, 0x16, 0x48, 0x54, 0x54,
-	0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x10, 0x02,
-	0x12, 0x16, 0x0a, 0x12, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74,
-	0x68, 0x6f, 0x64, 0x47, 0x65, 0x74, 0x10, 0x03, 0x12, 0x17, 0x0a, 0x13, 0x48, 0x54, 0x54, 0x50,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x48, 0x65, 0x61, 0x64, 0x10,
-	0x04, 0x12, 0x1a, 0x0a, 0x16, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65,
-	0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x10, 0x05, 0x12, 0x18, 0x0a,
-	0x14, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64,
-	0x50, 0x61, 0x74, 0x63, 0x68, 0x10, 0x06, 0x12, 0x17, 0x0a, 0x13, 0x48, 0x54, 0x54, 0x50, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x50, 0x6f, 0x73, 0x74, 0x10, 0x07,
-	0x12, 0x16, 0x0a, 0x12, 0x48, 0x54, 0x54, 0x50, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74,
-	0x68, 0x6f, 0x64, 0x50, 0x75, 0x74, 0x10, 0x08, 0x12, 0x18, 0x0a, 0x14, 0x48, 0x54, 0x54, 0x50,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x54, 0x72, 0x61, 0x63, 0x65,
-	0x10, 0x09, 0x2a, 0xa7, 0x01, 0x0a, 0x13, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x14, 0x48, 0x54,
-	0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x45, 0x78, 0x61,
-	0x63, 0x74, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x10, 0x01, 0x12,
-	0x1a, 0x0a, 0x16, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x10, 0x02, 0x12, 0x24, 0x0a, 0x20, 0x48,
-	0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65,
-	0x67, 0x75, 0x6c, 0x61, 0x72, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x10,
-	0x03, 0x12, 0x19, 0x0a, 0x15, 0x48, 0x54, 0x54, 0x50, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x66, 0x66, 0x69, 0x78, 0x10, 0x04, 0x2a, 0x68, 0x0a, 0x11,
-	0x48, 0x54, 0x54, 0x50, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x16, 0x0a, 0x12, 0x48, 0x54, 0x54, 0x50, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x45, 0x78, 0x61, 0x63, 0x74, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x48, 0x54, 0x54,
-	0x50, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78,
-	0x10, 0x01, 0x12, 0x22, 0x0a, 0x1e, 0x48, 0x54, 0x54, 0x50, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73,
-	0x73, 0x69, 0x6f, 0x6e, 0x10, 0x03, 0x2a, 0x6d, 0x0a, 0x12, 0x48, 0x54, 0x54, 0x50, 0x51, 0x75,
-	0x65, 0x72, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x13,
-	0x48, 0x54, 0x54, 0x50, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x45, 0x78,
-	0x61, 0x63, 0x74, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x48, 0x54, 0x54, 0x50, 0x51, 0x75, 0x65,
-	0x72, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x10, 0x01,
-	0x12, 0x23, 0x0a, 0x1f, 0x48, 0x54, 0x54, 0x50, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73,
-	0x69, 0x6f, 0x6e, 0x10, 0x03, 0x42, 0xae, 0x02, 0x0a, 0x29, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e,
-	0x74, 0x72, 0x79, 0x42, 0x10, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x69, 0x76, 0x61,
-	0x74, 0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79,
-	0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x43, 0xaa, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0xca,
-	0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0xe2, 0x02, 0x31, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x5c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x5c,
-	0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x28, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a,
-	0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pbconfigentry_config_entry_proto_rawDescOnce sync.Once
-	file_private_pbconfigentry_config_entry_proto_rawDescData = file_private_pbconfigentry_config_entry_proto_rawDesc
-)
-
-func file_private_pbconfigentry_config_entry_proto_rawDescGZIP() []byte {
-	file_private_pbconfigentry_config_entry_proto_rawDescOnce.Do(func() {
-		file_private_pbconfigentry_config_entry_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbconfigentry_config_entry_proto_rawDescData)
-	})
-	return file_private_pbconfigentry_config_entry_proto_rawDescData
-}
-
-var file_private_pbconfigentry_config_entry_proto_enumTypes = make([]protoimpl.EnumInfo, 11)
-var file_private_pbconfigentry_config_entry_proto_msgTypes = make([]protoimpl.MessageInfo, 115)
-var file_private_pbconfigentry_config_entry_proto_goTypes = []interface{}{
-	(Kind)(0),                                   // 0: hashicorp.consul.internal.configentry.Kind
-	(IntentionAction)(0),                        // 1: hashicorp.consul.internal.configentry.IntentionAction
-	(IntentionSourceType)(0),                    // 2: hashicorp.consul.internal.configentry.IntentionSourceType
-	(ProxyMode)(0),                              // 3: hashicorp.consul.internal.configentry.ProxyMode
-	(MutualTLSMode)(0),                          // 4: hashicorp.consul.internal.configentry.MutualTLSMode
-	(MeshGatewayMode)(0),                        // 5: hashicorp.consul.internal.configentry.MeshGatewayMode
-	(APIGatewayListenerProtocol)(0),             // 6: hashicorp.consul.internal.configentry.APIGatewayListenerProtocol
-	(HTTPMatchMethod)(0),                        // 7: hashicorp.consul.internal.configentry.HTTPMatchMethod
-	(HTTPHeaderMatchType)(0),                    // 8: hashicorp.consul.internal.configentry.HTTPHeaderMatchType
-	(HTTPPathMatchType)(0),                      // 9: hashicorp.consul.internal.configentry.HTTPPathMatchType
-	(HTTPQueryMatchType)(0),                     // 10: hashicorp.consul.internal.configentry.HTTPQueryMatchType
-	(*ConfigEntry)(nil),                         // 11: hashicorp.consul.internal.configentry.ConfigEntry
-	(*MeshConfig)(nil),                          // 12: hashicorp.consul.internal.configentry.MeshConfig
-	(*TransparentProxyMeshConfig)(nil),          // 13: hashicorp.consul.internal.configentry.TransparentProxyMeshConfig
-	(*MeshTLSConfig)(nil),                       // 14: hashicorp.consul.internal.configentry.MeshTLSConfig
-	(*MeshDirectionalTLSConfig)(nil),            // 15: hashicorp.consul.internal.configentry.MeshDirectionalTLSConfig
-	(*MeshHTTPConfig)(nil),                      // 16: hashicorp.consul.internal.configentry.MeshHTTPConfig
-	(*PeeringMeshConfig)(nil),                   // 17: hashicorp.consul.internal.configentry.PeeringMeshConfig
-	(*ServiceResolver)(nil),                     // 18: hashicorp.consul.internal.configentry.ServiceResolver
-	(*ServiceResolverSubset)(nil),               // 19: hashicorp.consul.internal.configentry.ServiceResolverSubset
-	(*ServiceResolverRedirect)(nil),             // 20: hashicorp.consul.internal.configentry.ServiceResolverRedirect
-	(*ServiceResolverFailover)(nil),             // 21: hashicorp.consul.internal.configentry.ServiceResolverFailover
-	(*ServiceResolverFailoverPolicy)(nil),       // 22: hashicorp.consul.internal.configentry.ServiceResolverFailoverPolicy
-	(*ServiceResolverPrioritizeByLocality)(nil), // 23: hashicorp.consul.internal.configentry.ServiceResolverPrioritizeByLocality
-	(*ServiceResolverFailoverTarget)(nil),       // 24: hashicorp.consul.internal.configentry.ServiceResolverFailoverTarget
-	(*LoadBalancer)(nil),                        // 25: hashicorp.consul.internal.configentry.LoadBalancer
-	(*RingHashConfig)(nil),                      // 26: hashicorp.consul.internal.configentry.RingHashConfig
-	(*LeastRequestConfig)(nil),                  // 27: hashicorp.consul.internal.configentry.LeastRequestConfig
-	(*HashPolicy)(nil),                          // 28: hashicorp.consul.internal.configentry.HashPolicy
-	(*CookieConfig)(nil),                        // 29: hashicorp.consul.internal.configentry.CookieConfig
-	(*IngressGateway)(nil),                      // 30: hashicorp.consul.internal.configentry.IngressGateway
-	(*IngressServiceConfig)(nil),                // 31: hashicorp.consul.internal.configentry.IngressServiceConfig
-	(*GatewayTLSConfig)(nil),                    // 32: hashicorp.consul.internal.configentry.GatewayTLSConfig
-	(*GatewayTLSSDSConfig)(nil),                 // 33: hashicorp.consul.internal.configentry.GatewayTLSSDSConfig
-	(*IngressListener)(nil),                     // 34: hashicorp.consul.internal.configentry.IngressListener
-	(*IngressService)(nil),                      // 35: hashicorp.consul.internal.configentry.IngressService
-	(*GatewayServiceTLSConfig)(nil),             // 36: hashicorp.consul.internal.configentry.GatewayServiceTLSConfig
-	(*HTTPHeaderModifiers)(nil),                 // 37: hashicorp.consul.internal.configentry.HTTPHeaderModifiers
-	(*ServiceIntentions)(nil),                   // 38: hashicorp.consul.internal.configentry.ServiceIntentions
-	(*IntentionJWTRequirement)(nil),             // 39: hashicorp.consul.internal.configentry.IntentionJWTRequirement
-	(*IntentionJWTProvider)(nil),                // 40: hashicorp.consul.internal.configentry.IntentionJWTProvider
-	(*IntentionJWTClaimVerification)(nil),       // 41: hashicorp.consul.internal.configentry.IntentionJWTClaimVerification
-	(*SourceIntention)(nil),                     // 42: hashicorp.consul.internal.configentry.SourceIntention
-	(*IntentionPermission)(nil),                 // 43: hashicorp.consul.internal.configentry.IntentionPermission
-	(*IntentionHTTPPermission)(nil),             // 44: hashicorp.consul.internal.configentry.IntentionHTTPPermission
-	(*IntentionHTTPHeaderPermission)(nil),       // 45: hashicorp.consul.internal.configentry.IntentionHTTPHeaderPermission
-	(*ServiceDefaults)(nil),                     // 46: hashicorp.consul.internal.configentry.ServiceDefaults
-	(*TransparentProxyConfig)(nil),              // 47: hashicorp.consul.internal.configentry.TransparentProxyConfig
-	(*MeshGatewayConfig)(nil),                   // 48: hashicorp.consul.internal.configentry.MeshGatewayConfig
-	(*ExposeConfig)(nil),                        // 49: hashicorp.consul.internal.configentry.ExposeConfig
-	(*ExposePath)(nil),                          // 50: hashicorp.consul.internal.configentry.ExposePath
-	(*UpstreamConfiguration)(nil),               // 51: hashicorp.consul.internal.configentry.UpstreamConfiguration
-	(*UpstreamConfig)(nil),                      // 52: hashicorp.consul.internal.configentry.UpstreamConfig
-	(*UpstreamLimits)(nil),                      // 53: hashicorp.consul.internal.configentry.UpstreamLimits
-	(*PassiveHealthCheck)(nil),                  // 54: hashicorp.consul.internal.configentry.PassiveHealthCheck
-	(*DestinationConfig)(nil),                   // 55: hashicorp.consul.internal.configentry.DestinationConfig
-	(*RateLimits)(nil),                          // 56: hashicorp.consul.internal.configentry.RateLimits
-	(*InstanceLevelRateLimits)(nil),             // 57: hashicorp.consul.internal.configentry.InstanceLevelRateLimits
-	(*InstanceLevelRouteRateLimits)(nil),        // 58: hashicorp.consul.internal.configentry.InstanceLevelRouteRateLimits
-	(*APIGateway)(nil),                          // 59: hashicorp.consul.internal.configentry.APIGateway
-	(*Status)(nil),                              // 60: hashicorp.consul.internal.configentry.Status
-	(*Condition)(nil),                           // 61: hashicorp.consul.internal.configentry.Condition
-	(*APIGatewayListener)(nil),                  // 62: hashicorp.consul.internal.configentry.APIGatewayListener
-	(*APIGatewayTLSConfiguration)(nil),          // 63: hashicorp.consul.internal.configentry.APIGatewayTLSConfiguration
-	(*APIGatewayPolicy)(nil),                    // 64: hashicorp.consul.internal.configentry.APIGatewayPolicy
-	(*APIGatewayJWTRequirement)(nil),            // 65: hashicorp.consul.internal.configentry.APIGatewayJWTRequirement
-	(*APIGatewayJWTProvider)(nil),               // 66: hashicorp.consul.internal.configentry.APIGatewayJWTProvider
-	(*APIGatewayJWTClaimVerification)(nil),      // 67: hashicorp.consul.internal.configentry.APIGatewayJWTClaimVerification
-	(*ResourceReference)(nil),                   // 68: hashicorp.consul.internal.configentry.ResourceReference
-	(*BoundAPIGateway)(nil),                     // 69: hashicorp.consul.internal.configentry.BoundAPIGateway
-	(*BoundAPIGatewayListener)(nil),             // 70: hashicorp.consul.internal.configentry.BoundAPIGatewayListener
-	(*InlineCertificate)(nil),                   // 71: hashicorp.consul.internal.configentry.InlineCertificate
-	(*HTTPRoute)(nil),                           // 72: hashicorp.consul.internal.configentry.HTTPRoute
-	(*HTTPRouteRule)(nil),                       // 73: hashicorp.consul.internal.configentry.HTTPRouteRule
-	(*HTTPMatch)(nil),                           // 74: hashicorp.consul.internal.configentry.HTTPMatch
-	(*HTTPHeaderMatch)(nil),                     // 75: hashicorp.consul.internal.configentry.HTTPHeaderMatch
-	(*HTTPPathMatch)(nil),                       // 76: hashicorp.consul.internal.configentry.HTTPPathMatch
-	(*HTTPQueryMatch)(nil),                      // 77: hashicorp.consul.internal.configentry.HTTPQueryMatch
-	(*HTTPFilters)(nil),                         // 78: hashicorp.consul.internal.configentry.HTTPFilters
-	(*HTTPResponseFilters)(nil),                 // 79: hashicorp.consul.internal.configentry.HTTPResponseFilters
-	(*URLRewrite)(nil),                          // 80: hashicorp.consul.internal.configentry.URLRewrite
-	(*RetryFilter)(nil),                         // 81: hashicorp.consul.internal.configentry.RetryFilter
-	(*TimeoutFilter)(nil),                       // 82: hashicorp.consul.internal.configentry.TimeoutFilter
-	(*JWTFilter)(nil),                           // 83: hashicorp.consul.internal.configentry.JWTFilter
-	(*HTTPHeaderFilter)(nil),                    // 84: hashicorp.consul.internal.configentry.HTTPHeaderFilter
-	(*HTTPService)(nil),                         // 85: hashicorp.consul.internal.configentry.HTTPService
-	(*TCPRoute)(nil),                            // 86: hashicorp.consul.internal.configentry.TCPRoute
-	(*TCPService)(nil),                          // 87: hashicorp.consul.internal.configentry.TCPService
-	(*SamenessGroup)(nil),                       // 88: hashicorp.consul.internal.configentry.SamenessGroup
-	(*SamenessGroupMember)(nil),                 // 89: hashicorp.consul.internal.configentry.SamenessGroupMember
-	(*JWTProvider)(nil),                         // 90: hashicorp.consul.internal.configentry.JWTProvider
-	(*JSONWebKeySet)(nil),                       // 91: hashicorp.consul.internal.configentry.JSONWebKeySet
-	(*LocalJWKS)(nil),                           // 92: hashicorp.consul.internal.configentry.LocalJWKS
-	(*RemoteJWKS)(nil),                          // 93: hashicorp.consul.internal.configentry.RemoteJWKS
-	(*JWKSCluster)(nil),                         // 94: hashicorp.consul.internal.configentry.JWKSCluster
-	(*JWKSTLSCertificate)(nil),                  // 95: hashicorp.consul.internal.configentry.JWKSTLSCertificate
-	(*JWKSTLSCertProviderInstance)(nil),         // 96: hashicorp.consul.internal.configentry.JWKSTLSCertProviderInstance
-	(*JWKSTLSCertTrustedCA)(nil),                // 97: hashicorp.consul.internal.configentry.JWKSTLSCertTrustedCA
-	(*JWKSRetryPolicy)(nil),                     // 98: hashicorp.consul.internal.configentry.JWKSRetryPolicy
-	(*RetryPolicyBackOff)(nil),                  // 99: hashicorp.consul.internal.configentry.RetryPolicyBackOff
-	(*JWTLocation)(nil),                         // 100: hashicorp.consul.internal.configentry.JWTLocation
-	(*JWTLocationHeader)(nil),                   // 101: hashicorp.consul.internal.configentry.JWTLocationHeader
-	(*JWTLocationQueryParam)(nil),               // 102: hashicorp.consul.internal.configentry.JWTLocationQueryParam
-	(*JWTLocationCookie)(nil),                   // 103: hashicorp.consul.internal.configentry.JWTLocationCookie
-	(*JWTForwardingConfig)(nil),                 // 104: hashicorp.consul.internal.configentry.JWTForwardingConfig
-	(*JWTCacheConfig)(nil),                      // 105: hashicorp.consul.internal.configentry.JWTCacheConfig
-	nil,                                         // 106: hashicorp.consul.internal.configentry.MeshConfig.MetaEntry
-	nil,                                         // 107: hashicorp.consul.internal.configentry.ServiceResolver.SubsetsEntry
-	nil,                                         // 108: hashicorp.consul.internal.configentry.ServiceResolver.FailoverEntry
-	nil,                                         // 109: hashicorp.consul.internal.configentry.ServiceResolver.MetaEntry
-	nil,                                         // 110: hashicorp.consul.internal.configentry.IngressGateway.MetaEntry
-	nil,                                         // 111: hashicorp.consul.internal.configentry.IngressService.MetaEntry
-	nil,                                         // 112: hashicorp.consul.internal.configentry.HTTPHeaderModifiers.AddEntry
-	nil,                                         // 113: hashicorp.consul.internal.configentry.HTTPHeaderModifiers.SetEntry
-	nil,                                         // 114: hashicorp.consul.internal.configentry.ServiceIntentions.MetaEntry
-	nil,                                         // 115: hashicorp.consul.internal.configentry.SourceIntention.LegacyMetaEntry
-	nil,                                         // 116: hashicorp.consul.internal.configentry.ServiceDefaults.MetaEntry
-	nil,                                         // 117: hashicorp.consul.internal.configentry.APIGateway.MetaEntry
-	nil,                                         // 118: hashicorp.consul.internal.configentry.BoundAPIGateway.MetaEntry
-	nil,                                         // 119: hashicorp.consul.internal.configentry.InlineCertificate.MetaEntry
-	nil,                                         // 120: hashicorp.consul.internal.configentry.HTTPRoute.MetaEntry
-	nil,                                         // 121: hashicorp.consul.internal.configentry.HTTPHeaderFilter.AddEntry
-	nil,                                         // 122: hashicorp.consul.internal.configentry.HTTPHeaderFilter.SetEntry
-	nil,                                         // 123: hashicorp.consul.internal.configentry.TCPRoute.MetaEntry
-	nil,                                         // 124: hashicorp.consul.internal.configentry.SamenessGroup.MetaEntry
-	nil,                                         // 125: hashicorp.consul.internal.configentry.JWTProvider.MetaEntry
-	(*pbcommon.EnterpriseMeta)(nil),             // 126: hashicorp.consul.internal.common.EnterpriseMeta
-	(*pbcommon.RaftIndex)(nil),                  // 127: hashicorp.consul.internal.common.RaftIndex
-	(*durationpb.Duration)(nil),                 // 128: google.protobuf.Duration
-	(*timestamppb.Timestamp)(nil),               // 129: google.protobuf.Timestamp
-	(*pbcommon.EnvoyExtension)(nil),             // 130: hashicorp.consul.internal.common.EnvoyExtension
-}
-var file_private_pbconfigentry_config_entry_proto_depIdxs = []int32{
-	0,   // 0: hashicorp.consul.internal.configentry.ConfigEntry.Kind:type_name -> hashicorp.consul.internal.configentry.Kind
-	126, // 1: hashicorp.consul.internal.configentry.ConfigEntry.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
-	127, // 2: hashicorp.consul.internal.configentry.ConfigEntry.RaftIndex:type_name -> hashicorp.consul.internal.common.RaftIndex
-	12,  // 3: hashicorp.consul.internal.configentry.ConfigEntry.MeshConfig:type_name -> hashicorp.consul.internal.configentry.MeshConfig
-	18,  // 4: hashicorp.consul.internal.configentry.ConfigEntry.ServiceResolver:type_name -> hashicorp.consul.internal.configentry.ServiceResolver
-	30,  // 5: hashicorp.consul.internal.configentry.ConfigEntry.IngressGateway:type_name -> hashicorp.consul.internal.configentry.IngressGateway
-	38,  // 6: hashicorp.consul.internal.configentry.ConfigEntry.ServiceIntentions:type_name -> hashicorp.consul.internal.configentry.ServiceIntentions
-	46,  // 7: hashicorp.consul.internal.configentry.ConfigEntry.ServiceDefaults:type_name -> hashicorp.consul.internal.configentry.ServiceDefaults
-	59,  // 8: hashicorp.consul.internal.configentry.ConfigEntry.APIGateway:type_name -> hashicorp.consul.internal.configentry.APIGateway
-	69,  // 9: hashicorp.consul.internal.configentry.ConfigEntry.BoundAPIGateway:type_name -> hashicorp.consul.internal.configentry.BoundAPIGateway
-	86,  // 10: hashicorp.consul.internal.configentry.ConfigEntry.TCPRoute:type_name -> hashicorp.consul.internal.configentry.TCPRoute
-	72,  // 11: hashicorp.consul.internal.configentry.ConfigEntry.HTTPRoute:type_name -> hashicorp.consul.internal.configentry.HTTPRoute
-	71,  // 12: hashicorp.consul.internal.configentry.ConfigEntry.InlineCertificate:type_name -> hashicorp.consul.internal.configentry.InlineCertificate
-	88,  // 13: hashicorp.consul.internal.configentry.ConfigEntry.SamenessGroup:type_name -> hashicorp.consul.internal.configentry.SamenessGroup
-	90,  // 14: hashicorp.consul.internal.configentry.ConfigEntry.JWTProvider:type_name -> hashicorp.consul.internal.configentry.JWTProvider
-	13,  // 15: hashicorp.consul.internal.configentry.MeshConfig.TransparentProxy:type_name -> hashicorp.consul.internal.configentry.TransparentProxyMeshConfig
-	14,  // 16: hashicorp.consul.internal.configentry.MeshConfig.TLS:type_name -> hashicorp.consul.internal.configentry.MeshTLSConfig
-	16,  // 17: hashicorp.consul.internal.configentry.MeshConfig.HTTP:type_name -> hashicorp.consul.internal.configentry.MeshHTTPConfig
-	106, // 18: hashicorp.consul.internal.configentry.MeshConfig.Meta:type_name -> hashicorp.consul.internal.configentry.MeshConfig.MetaEntry
-	17,  // 19: hashicorp.consul.internal.configentry.MeshConfig.Peering:type_name -> hashicorp.consul.internal.configentry.PeeringMeshConfig
-	15,  // 20: hashicorp.consul.internal.configentry.MeshTLSConfig.Incoming:type_name -> hashicorp.consul.internal.configentry.MeshDirectionalTLSConfig
-	15,  // 21: hashicorp.consul.internal.configentry.MeshTLSConfig.Outgoing:type_name -> hashicorp.consul.internal.configentry.MeshDirectionalTLSConfig
-	107, // 22: hashicorp.consul.internal.configentry.ServiceResolver.Subsets:type_name -> hashicorp.consul.internal.configentry.ServiceResolver.SubsetsEntry
-	20,  // 23: hashicorp.consul.internal.configentry.ServiceResolver.Redirect:type_name -> hashicorp.consul.internal.configentry.ServiceResolverRedirect
-	108, // 24: hashicorp.consul.internal.configentry.ServiceResolver.Failover:type_name -> hashicorp.consul.internal.configentry.ServiceResolver.FailoverEntry
-	128, // 25: hashicorp.consul.internal.configentry.ServiceResolver.ConnectTimeout:type_name -> google.protobuf.Duration
-	25,  // 26: hashicorp.consul.internal.configentry.ServiceResolver.LoadBalancer:type_name -> hashicorp.consul.internal.configentry.LoadBalancer
-	109, // 27: hashicorp.consul.internal.configentry.ServiceResolver.Meta:type_name -> hashicorp.consul.internal.configentry.ServiceResolver.MetaEntry
-	128, // 28: hashicorp.consul.internal.configentry.ServiceResolver.RequestTimeout:type_name -> google.protobuf.Duration
-	23,  // 29: hashicorp.consul.internal.configentry.ServiceResolver.PrioritizeByLocality:type_name -> hashicorp.consul.internal.configentry.ServiceResolverPrioritizeByLocality
-	24,  // 30: hashicorp.consul.internal.configentry.ServiceResolverFailover.Targets:type_name -> hashicorp.consul.internal.configentry.ServiceResolverFailoverTarget
-	22,  // 31: hashicorp.consul.internal.configentry.ServiceResolverFailover.Policy:type_name -> hashicorp.consul.internal.configentry.ServiceResolverFailoverPolicy
-	26,  // 32: hashicorp.consul.internal.configentry.LoadBalancer.RingHashConfig:type_name -> hashicorp.consul.internal.configentry.RingHashConfig
-	27,  // 33: hashicorp.consul.internal.configentry.LoadBalancer.LeastRequestConfig:type_name -> hashicorp.consul.internal.configentry.LeastRequestConfig
-	28,  // 34: hashicorp.consul.internal.configentry.LoadBalancer.HashPolicies:type_name -> hashicorp.consul.internal.configentry.HashPolicy
-	29,  // 35: hashicorp.consul.internal.configentry.HashPolicy.CookieConfig:type_name -> hashicorp.consul.internal.configentry.CookieConfig
-	128, // 36: hashicorp.consul.internal.configentry.CookieConfig.TTL:type_name -> google.protobuf.Duration
-	32,  // 37: hashicorp.consul.internal.configentry.IngressGateway.TLS:type_name -> hashicorp.consul.internal.configentry.GatewayTLSConfig
-	34,  // 38: hashicorp.consul.internal.configentry.IngressGateway.Listeners:type_name -> hashicorp.consul.internal.configentry.IngressListener
-	110, // 39: hashicorp.consul.internal.configentry.IngressGateway.Meta:type_name -> hashicorp.consul.internal.configentry.IngressGateway.MetaEntry
-	31,  // 40: hashicorp.consul.internal.configentry.IngressGateway.Defaults:type_name -> hashicorp.consul.internal.configentry.IngressServiceConfig
-	54,  // 41: hashicorp.consul.internal.configentry.IngressServiceConfig.PassiveHealthCheck:type_name -> hashicorp.consul.internal.configentry.PassiveHealthCheck
-	33,  // 42: hashicorp.consul.internal.configentry.GatewayTLSConfig.SDS:type_name -> hashicorp.consul.internal.configentry.GatewayTLSSDSConfig
-	35,  // 43: hashicorp.consul.internal.configentry.IngressListener.Services:type_name -> hashicorp.consul.internal.configentry.IngressService
-	32,  // 44: hashicorp.consul.internal.configentry.IngressListener.TLS:type_name -> hashicorp.consul.internal.configentry.GatewayTLSConfig
-	36,  // 45: hashicorp.consul.internal.configentry.IngressService.TLS:type_name -> hashicorp.consul.internal.configentry.GatewayServiceTLSConfig
-	37,  // 46: hashicorp.consul.internal.configentry.IngressService.RequestHeaders:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderModifiers
-	37,  // 47: hashicorp.consul.internal.configentry.IngressService.ResponseHeaders:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderModifiers
-	111, // 48: hashicorp.consul.internal.configentry.IngressService.Meta:type_name -> hashicorp.consul.internal.configentry.IngressService.MetaEntry
-	126, // 49: hashicorp.consul.internal.configentry.IngressService.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
-	54,  // 50: hashicorp.consul.internal.configentry.IngressService.PassiveHealthCheck:type_name -> hashicorp.consul.internal.configentry.PassiveHealthCheck
-	33,  // 51: hashicorp.consul.internal.configentry.GatewayServiceTLSConfig.SDS:type_name -> hashicorp.consul.internal.configentry.GatewayTLSSDSConfig
-	112, // 52: hashicorp.consul.internal.configentry.HTTPHeaderModifiers.Add:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderModifiers.AddEntry
-	113, // 53: hashicorp.consul.internal.configentry.HTTPHeaderModifiers.Set:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderModifiers.SetEntry
-	42,  // 54: hashicorp.consul.internal.configentry.ServiceIntentions.Sources:type_name -> hashicorp.consul.internal.configentry.SourceIntention
-	114, // 55: hashicorp.consul.internal.configentry.ServiceIntentions.Meta:type_name -> hashicorp.consul.internal.configentry.ServiceIntentions.MetaEntry
-	39,  // 56: hashicorp.consul.internal.configentry.ServiceIntentions.JWT:type_name -> hashicorp.consul.internal.configentry.IntentionJWTRequirement
-	40,  // 57: hashicorp.consul.internal.configentry.IntentionJWTRequirement.Providers:type_name -> hashicorp.consul.internal.configentry.IntentionJWTProvider
-	41,  // 58: hashicorp.consul.internal.configentry.IntentionJWTProvider.VerifyClaims:type_name -> hashicorp.consul.internal.configentry.IntentionJWTClaimVerification
-	1,   // 59: hashicorp.consul.internal.configentry.SourceIntention.Action:type_name -> hashicorp.consul.internal.configentry.IntentionAction
-	43,  // 60: hashicorp.consul.internal.configentry.SourceIntention.Permissions:type_name -> hashicorp.consul.internal.configentry.IntentionPermission
-	2,   // 61: hashicorp.consul.internal.configentry.SourceIntention.Type:type_name -> hashicorp.consul.internal.configentry.IntentionSourceType
-	115, // 62: hashicorp.consul.internal.configentry.SourceIntention.LegacyMeta:type_name -> hashicorp.consul.internal.configentry.SourceIntention.LegacyMetaEntry
-	129, // 63: hashicorp.consul.internal.configentry.SourceIntention.LegacyCreateTime:type_name -> google.protobuf.Timestamp
-	129, // 64: hashicorp.consul.internal.configentry.SourceIntention.LegacyUpdateTime:type_name -> google.protobuf.Timestamp
-	126, // 65: hashicorp.consul.internal.configentry.SourceIntention.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
-	1,   // 66: hashicorp.consul.internal.configentry.IntentionPermission.Action:type_name -> hashicorp.consul.internal.configentry.IntentionAction
-	44,  // 67: hashicorp.consul.internal.configentry.IntentionPermission.HTTP:type_name -> hashicorp.consul.internal.configentry.IntentionHTTPPermission
-	39,  // 68: hashicorp.consul.internal.configentry.IntentionPermission.JWT:type_name -> hashicorp.consul.internal.configentry.IntentionJWTRequirement
-	45,  // 69: hashicorp.consul.internal.configentry.IntentionHTTPPermission.Header:type_name -> hashicorp.consul.internal.configentry.IntentionHTTPHeaderPermission
-	3,   // 70: hashicorp.consul.internal.configentry.ServiceDefaults.Mode:type_name -> hashicorp.consul.internal.configentry.ProxyMode
-	47,  // 71: hashicorp.consul.internal.configentry.ServiceDefaults.TransparentProxy:type_name -> hashicorp.consul.internal.configentry.TransparentProxyConfig
-	48,  // 72: hashicorp.consul.internal.configentry.ServiceDefaults.MeshGateway:type_name -> hashicorp.consul.internal.configentry.MeshGatewayConfig
-	49,  // 73: hashicorp.consul.internal.configentry.ServiceDefaults.Expose:type_name -> hashicorp.consul.internal.configentry.ExposeConfig
-	51,  // 74: hashicorp.consul.internal.configentry.ServiceDefaults.UpstreamConfig:type_name -> hashicorp.consul.internal.configentry.UpstreamConfiguration
-	55,  // 75: hashicorp.consul.internal.configentry.ServiceDefaults.Destination:type_name -> hashicorp.consul.internal.configentry.DestinationConfig
-	56,  // 76: hashicorp.consul.internal.configentry.ServiceDefaults.RateLimits:type_name -> hashicorp.consul.internal.configentry.RateLimits
-	116, // 77: hashicorp.consul.internal.configentry.ServiceDefaults.Meta:type_name -> hashicorp.consul.internal.configentry.ServiceDefaults.MetaEntry
-	130, // 78: hashicorp.consul.internal.configentry.ServiceDefaults.EnvoyExtensions:type_name -> hashicorp.consul.internal.common.EnvoyExtension
-	4,   // 79: hashicorp.consul.internal.configentry.ServiceDefaults.MutualTLSMode:type_name -> hashicorp.consul.internal.configentry.MutualTLSMode
-	5,   // 80: hashicorp.consul.internal.configentry.MeshGatewayConfig.Mode:type_name -> hashicorp.consul.internal.configentry.MeshGatewayMode
-	50,  // 81: hashicorp.consul.internal.configentry.ExposeConfig.Paths:type_name -> hashicorp.consul.internal.configentry.ExposePath
-	52,  // 82: hashicorp.consul.internal.configentry.UpstreamConfiguration.Overrides:type_name -> hashicorp.consul.internal.configentry.UpstreamConfig
-	52,  // 83: hashicorp.consul.internal.configentry.UpstreamConfiguration.Defaults:type_name -> hashicorp.consul.internal.configentry.UpstreamConfig
-	126, // 84: hashicorp.consul.internal.configentry.UpstreamConfig.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
-	53,  // 85: hashicorp.consul.internal.configentry.UpstreamConfig.Limits:type_name -> hashicorp.consul.internal.configentry.UpstreamLimits
-	54,  // 86: hashicorp.consul.internal.configentry.UpstreamConfig.PassiveHealthCheck:type_name -> hashicorp.consul.internal.configentry.PassiveHealthCheck
-	48,  // 87: hashicorp.consul.internal.configentry.UpstreamConfig.MeshGateway:type_name -> hashicorp.consul.internal.configentry.MeshGatewayConfig
-	128, // 88: hashicorp.consul.internal.configentry.PassiveHealthCheck.Interval:type_name -> google.protobuf.Duration
-	128, // 89: hashicorp.consul.internal.configentry.PassiveHealthCheck.BaseEjectionTime:type_name -> google.protobuf.Duration
-	57,  // 90: hashicorp.consul.internal.configentry.RateLimits.InstanceLevel:type_name -> hashicorp.consul.internal.configentry.InstanceLevelRateLimits
-	58,  // 91: hashicorp.consul.internal.configentry.InstanceLevelRateLimits.Routes:type_name -> hashicorp.consul.internal.configentry.InstanceLevelRouteRateLimits
-	117, // 92: hashicorp.consul.internal.configentry.APIGateway.Meta:type_name -> hashicorp.consul.internal.configentry.APIGateway.MetaEntry
-	62,  // 93: hashicorp.consul.internal.configentry.APIGateway.Listeners:type_name -> hashicorp.consul.internal.configentry.APIGatewayListener
-	60,  // 94: hashicorp.consul.internal.configentry.APIGateway.Status:type_name -> hashicorp.consul.internal.configentry.Status
-	61,  // 95: hashicorp.consul.internal.configentry.Status.Conditions:type_name -> hashicorp.consul.internal.configentry.Condition
-	68,  // 96: hashicorp.consul.internal.configentry.Condition.Resource:type_name -> hashicorp.consul.internal.configentry.ResourceReference
-	129, // 97: hashicorp.consul.internal.configentry.Condition.LastTransitionTime:type_name -> google.protobuf.Timestamp
-	6,   // 98: hashicorp.consul.internal.configentry.APIGatewayListener.Protocol:type_name -> hashicorp.consul.internal.configentry.APIGatewayListenerProtocol
-	63,  // 99: hashicorp.consul.internal.configentry.APIGatewayListener.TLS:type_name -> hashicorp.consul.internal.configentry.APIGatewayTLSConfiguration
-	64,  // 100: hashicorp.consul.internal.configentry.APIGatewayListener.Override:type_name -> hashicorp.consul.internal.configentry.APIGatewayPolicy
-	64,  // 101: hashicorp.consul.internal.configentry.APIGatewayListener.Default:type_name -> hashicorp.consul.internal.configentry.APIGatewayPolicy
-	68,  // 102: hashicorp.consul.internal.configentry.APIGatewayTLSConfiguration.Certificates:type_name -> hashicorp.consul.internal.configentry.ResourceReference
-	65,  // 103: hashicorp.consul.internal.configentry.APIGatewayPolicy.JWT:type_name -> hashicorp.consul.internal.configentry.APIGatewayJWTRequirement
-	66,  // 104: hashicorp.consul.internal.configentry.APIGatewayJWTRequirement.Providers:type_name -> hashicorp.consul.internal.configentry.APIGatewayJWTProvider
-	67,  // 105: hashicorp.consul.internal.configentry.APIGatewayJWTProvider.VerifyClaims:type_name -> hashicorp.consul.internal.configentry.APIGatewayJWTClaimVerification
-	126, // 106: hashicorp.consul.internal.configentry.ResourceReference.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
-	118, // 107: hashicorp.consul.internal.configentry.BoundAPIGateway.Meta:type_name -> hashicorp.consul.internal.configentry.BoundAPIGateway.MetaEntry
-	70,  // 108: hashicorp.consul.internal.configentry.BoundAPIGateway.Listeners:type_name -> hashicorp.consul.internal.configentry.BoundAPIGatewayListener
-	68,  // 109: hashicorp.consul.internal.configentry.BoundAPIGatewayListener.Certificates:type_name -> hashicorp.consul.internal.configentry.ResourceReference
-	68,  // 110: hashicorp.consul.internal.configentry.BoundAPIGatewayListener.Routes:type_name -> hashicorp.consul.internal.configentry.ResourceReference
-	119, // 111: hashicorp.consul.internal.configentry.InlineCertificate.Meta:type_name -> hashicorp.consul.internal.configentry.InlineCertificate.MetaEntry
-	120, // 112: hashicorp.consul.internal.configentry.HTTPRoute.Meta:type_name -> hashicorp.consul.internal.configentry.HTTPRoute.MetaEntry
-	68,  // 113: hashicorp.consul.internal.configentry.HTTPRoute.Parents:type_name -> hashicorp.consul.internal.configentry.ResourceReference
-	73,  // 114: hashicorp.consul.internal.configentry.HTTPRoute.Rules:type_name -> hashicorp.consul.internal.configentry.HTTPRouteRule
-	60,  // 115: hashicorp.consul.internal.configentry.HTTPRoute.Status:type_name -> hashicorp.consul.internal.configentry.Status
-	78,  // 116: hashicorp.consul.internal.configentry.HTTPRouteRule.Filters:type_name -> hashicorp.consul.internal.configentry.HTTPFilters
-	74,  // 117: hashicorp.consul.internal.configentry.HTTPRouteRule.Matches:type_name -> hashicorp.consul.internal.configentry.HTTPMatch
-	85,  // 118: hashicorp.consul.internal.configentry.HTTPRouteRule.Services:type_name -> hashicorp.consul.internal.configentry.HTTPService
-	79,  // 119: hashicorp.consul.internal.configentry.HTTPRouteRule.ResponseFilters:type_name -> hashicorp.consul.internal.configentry.HTTPResponseFilters
-	75,  // 120: hashicorp.consul.internal.configentry.HTTPMatch.Headers:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderMatch
-	7,   // 121: hashicorp.consul.internal.configentry.HTTPMatch.Method:type_name -> hashicorp.consul.internal.configentry.HTTPMatchMethod
-	76,  // 122: hashicorp.consul.internal.configentry.HTTPMatch.Path:type_name -> hashicorp.consul.internal.configentry.HTTPPathMatch
-	77,  // 123: hashicorp.consul.internal.configentry.HTTPMatch.Query:type_name -> hashicorp.consul.internal.configentry.HTTPQueryMatch
-	8,   // 124: hashicorp.consul.internal.configentry.HTTPHeaderMatch.Match:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderMatchType
-	9,   // 125: hashicorp.consul.internal.configentry.HTTPPathMatch.Match:type_name -> hashicorp.consul.internal.configentry.HTTPPathMatchType
-	10,  // 126: hashicorp.consul.internal.configentry.HTTPQueryMatch.Match:type_name -> hashicorp.consul.internal.configentry.HTTPQueryMatchType
-	84,  // 127: hashicorp.consul.internal.configentry.HTTPFilters.Headers:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderFilter
-	80,  // 128: hashicorp.consul.internal.configentry.HTTPFilters.URLRewrite:type_name -> hashicorp.consul.internal.configentry.URLRewrite
-	81,  // 129: hashicorp.consul.internal.configentry.HTTPFilters.RetryFilter:type_name -> hashicorp.consul.internal.configentry.RetryFilter
-	82,  // 130: hashicorp.consul.internal.configentry.HTTPFilters.TimeoutFilter:type_name -> hashicorp.consul.internal.configentry.TimeoutFilter
-	83,  // 131: hashicorp.consul.internal.configentry.HTTPFilters.JWT:type_name -> hashicorp.consul.internal.configentry.JWTFilter
-	84,  // 132: hashicorp.consul.internal.configentry.HTTPResponseFilters.Headers:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderFilter
-	128, // 133: hashicorp.consul.internal.configentry.TimeoutFilter.RequestTimeout:type_name -> google.protobuf.Duration
-	128, // 134: hashicorp.consul.internal.configentry.TimeoutFilter.IdleTimeout:type_name -> google.protobuf.Duration
-	66,  // 135: hashicorp.consul.internal.configentry.JWTFilter.Providers:type_name -> hashicorp.consul.internal.configentry.APIGatewayJWTProvider
-	121, // 136: hashicorp.consul.internal.configentry.HTTPHeaderFilter.Add:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderFilter.AddEntry
-	122, // 137: hashicorp.consul.internal.configentry.HTTPHeaderFilter.Set:type_name -> hashicorp.consul.internal.configentry.HTTPHeaderFilter.SetEntry
-	78,  // 138: hashicorp.consul.internal.configentry.HTTPService.Filters:type_name -> hashicorp.consul.internal.configentry.HTTPFilters
-	126, // 139: hashicorp.consul.internal.configentry.HTTPService.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
-	79,  // 140: hashicorp.consul.internal.configentry.HTTPService.ResponseFilters:type_name -> hashicorp.consul.internal.configentry.HTTPResponseFilters
-	123, // 141: hashicorp.consul.internal.configentry.TCPRoute.Meta:type_name -> hashicorp.consul.internal.configentry.TCPRoute.MetaEntry
-	68,  // 142: hashicorp.consul.internal.configentry.TCPRoute.Parents:type_name -> hashicorp.consul.internal.configentry.ResourceReference
-	87,  // 143: hashicorp.consul.internal.configentry.TCPRoute.Services:type_name -> hashicorp.consul.internal.configentry.TCPService
-	60,  // 144: hashicorp.consul.internal.configentry.TCPRoute.Status:type_name -> hashicorp.consul.internal.configentry.Status
-	126, // 145: hashicorp.consul.internal.configentry.TCPService.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
-	89,  // 146: hashicorp.consul.internal.configentry.SamenessGroup.Members:type_name -> hashicorp.consul.internal.configentry.SamenessGroupMember
-	124, // 147: hashicorp.consul.internal.configentry.SamenessGroup.Meta:type_name -> hashicorp.consul.internal.configentry.SamenessGroup.MetaEntry
-	126, // 148: hashicorp.consul.internal.configentry.SamenessGroup.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
-	91,  // 149: hashicorp.consul.internal.configentry.JWTProvider.JSONWebKeySet:type_name -> hashicorp.consul.internal.configentry.JSONWebKeySet
-	100, // 150: hashicorp.consul.internal.configentry.JWTProvider.Locations:type_name -> hashicorp.consul.internal.configentry.JWTLocation
-	104, // 151: hashicorp.consul.internal.configentry.JWTProvider.Forwarding:type_name -> hashicorp.consul.internal.configentry.JWTForwardingConfig
-	105, // 152: hashicorp.consul.internal.configentry.JWTProvider.CacheConfig:type_name -> hashicorp.consul.internal.configentry.JWTCacheConfig
-	125, // 153: hashicorp.consul.internal.configentry.JWTProvider.Meta:type_name -> hashicorp.consul.internal.configentry.JWTProvider.MetaEntry
-	92,  // 154: hashicorp.consul.internal.configentry.JSONWebKeySet.Local:type_name -> hashicorp.consul.internal.configentry.LocalJWKS
-	93,  // 155: hashicorp.consul.internal.configentry.JSONWebKeySet.Remote:type_name -> hashicorp.consul.internal.configentry.RemoteJWKS
-	128, // 156: hashicorp.consul.internal.configentry.RemoteJWKS.CacheDuration:type_name -> google.protobuf.Duration
-	98,  // 157: hashicorp.consul.internal.configentry.RemoteJWKS.RetryPolicy:type_name -> hashicorp.consul.internal.configentry.JWKSRetryPolicy
-	94,  // 158: hashicorp.consul.internal.configentry.RemoteJWKS.JWKSCluster:type_name -> hashicorp.consul.internal.configentry.JWKSCluster
-	95,  // 159: hashicorp.consul.internal.configentry.JWKSCluster.TLSCertificates:type_name -> hashicorp.consul.internal.configentry.JWKSTLSCertificate
-	128, // 160: hashicorp.consul.internal.configentry.JWKSCluster.ConnectTimeout:type_name -> google.protobuf.Duration
-	96,  // 161: hashicorp.consul.internal.configentry.JWKSTLSCertificate.CaCertificateProviderInstance:type_name -> hashicorp.consul.internal.configentry.JWKSTLSCertProviderInstance
-	97,  // 162: hashicorp.consul.internal.configentry.JWKSTLSCertificate.TrustedCA:type_name -> hashicorp.consul.internal.configentry.JWKSTLSCertTrustedCA
-	99,  // 163: hashicorp.consul.internal.configentry.JWKSRetryPolicy.RetryPolicyBackOff:type_name -> hashicorp.consul.internal.configentry.RetryPolicyBackOff
-	128, // 164: hashicorp.consul.internal.configentry.RetryPolicyBackOff.BaseInterval:type_name -> google.protobuf.Duration
-	128, // 165: hashicorp.consul.internal.configentry.RetryPolicyBackOff.MaxInterval:type_name -> google.protobuf.Duration
-	101, // 166: hashicorp.consul.internal.configentry.JWTLocation.Header:type_name -> hashicorp.consul.internal.configentry.JWTLocationHeader
-	102, // 167: hashicorp.consul.internal.configentry.JWTLocation.QueryParam:type_name -> hashicorp.consul.internal.configentry.JWTLocationQueryParam
-	103, // 168: hashicorp.consul.internal.configentry.JWTLocation.Cookie:type_name -> hashicorp.consul.internal.configentry.JWTLocationCookie
-	19,  // 169: hashicorp.consul.internal.configentry.ServiceResolver.SubsetsEntry.value:type_name -> hashicorp.consul.internal.configentry.ServiceResolverSubset
-	21,  // 170: hashicorp.consul.internal.configentry.ServiceResolver.FailoverEntry.value:type_name -> hashicorp.consul.internal.configentry.ServiceResolverFailover
-	171, // [171:171] is the sub-list for method output_type
-	171, // [171:171] is the sub-list for method input_type
-	171, // [171:171] is the sub-list for extension type_name
-	171, // [171:171] is the sub-list for extension extendee
-	0,   // [0:171] is the sub-list for field type_name
-}
-
-func init() { file_private_pbconfigentry_config_entry_proto_init() }
-func file_private_pbconfigentry_config_entry_proto_init() {
-	if File_private_pbconfigentry_config_entry_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbconfigentry_config_entry_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ConfigEntry); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MeshConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TransparentProxyMeshConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MeshTLSConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MeshDirectionalTLSConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MeshHTTPConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringMeshConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceResolver); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceResolverSubset); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceResolverRedirect); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceResolverFailover); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceResolverFailoverPolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceResolverPrioritizeByLocality); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceResolverFailoverTarget); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LoadBalancer); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RingHashConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LeastRequestConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HashPolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CookieConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IngressGateway); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IngressServiceConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GatewayTLSConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GatewayTLSSDSConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IngressListener); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IngressService); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GatewayServiceTLSConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPHeaderModifiers); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceIntentions); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IntentionJWTRequirement); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IntentionJWTProvider); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IntentionJWTClaimVerification); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SourceIntention); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IntentionPermission); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IntentionHTTPPermission); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IntentionHTTPHeaderPermission); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceDefaults); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TransparentProxyConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MeshGatewayConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExposeConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExposePath); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UpstreamConfiguration); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UpstreamConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UpstreamLimits); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PassiveHealthCheck); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DestinationConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RateLimits); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InstanceLevelRateLimits); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InstanceLevelRouteRateLimits); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*APIGateway); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Status); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Condition); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*APIGatewayListener); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*APIGatewayTLSConfiguration); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*APIGatewayPolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*APIGatewayJWTRequirement); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*APIGatewayJWTProvider); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*APIGatewayJWTClaimVerification); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ResourceReference); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BoundAPIGateway); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BoundAPIGatewayListener); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[60].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InlineCertificate); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[61].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPRoute); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[62].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPRouteRule); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[63].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[64].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPHeaderMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[65].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPPathMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPQueryMatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[67].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPFilters); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[68].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPResponseFilters); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[69].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*URLRewrite); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[70].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RetryFilter); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[71].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TimeoutFilter); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[72].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JWTFilter); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[73].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPHeaderFilter); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[74].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HTTPService); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[75].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TCPRoute); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[76].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TCPService); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[77].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SamenessGroup); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[78].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SamenessGroupMember); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[79].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JWTProvider); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[80].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JSONWebKeySet); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[81].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LocalJWKS); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[82].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RemoteJWKS); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[83].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JWKSCluster); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[84].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JWKSTLSCertificate); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[85].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JWKSTLSCertProviderInstance); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[86].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JWKSTLSCertTrustedCA); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[87].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JWKSRetryPolicy); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[88].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RetryPolicyBackOff); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[89].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JWTLocation); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[90].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JWTLocationHeader); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[91].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JWTLocationQueryParam); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[92].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JWTLocationCookie); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[93].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JWTForwardingConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconfigentry_config_entry_proto_msgTypes[94].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*JWTCacheConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_private_pbconfigentry_config_entry_proto_msgTypes[0].OneofWrappers = []interface{}{
-		(*ConfigEntry_MeshConfig)(nil),
-		(*ConfigEntry_ServiceResolver)(nil),
-		(*ConfigEntry_IngressGateway)(nil),
-		(*ConfigEntry_ServiceIntentions)(nil),
-		(*ConfigEntry_ServiceDefaults)(nil),
-		(*ConfigEntry_APIGateway)(nil),
-		(*ConfigEntry_BoundAPIGateway)(nil),
-		(*ConfigEntry_TCPRoute)(nil),
-		(*ConfigEntry_HTTPRoute)(nil),
-		(*ConfigEntry_InlineCertificate)(nil),
-		(*ConfigEntry_SamenessGroup)(nil),
-		(*ConfigEntry_JWTProvider)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbconfigentry_config_entry_proto_rawDesc,
-			NumEnums:      11,
-			NumMessages:   115,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_private_pbconfigentry_config_entry_proto_goTypes,
-		DependencyIndexes: file_private_pbconfigentry_config_entry_proto_depIdxs,
-		EnumInfos:         file_private_pbconfigentry_config_entry_proto_enumTypes,
-		MessageInfos:      file_private_pbconfigentry_config_entry_proto_msgTypes,
-	}.Build()
-	File_private_pbconfigentry_config_entry_proto = out.File
-	file_private_pbconfigentry_config_entry_proto_rawDesc = nil
-	file_private_pbconfigentry_config_entry_proto_goTypes = nil
-	file_private_pbconfigentry_config_entry_proto_depIdxs = nil
-}
diff --git a/proto/private/pbconfigentry/config_entry.proto b/proto/private/pbconfigentry/config_entry.proto
deleted file mode 100644
index b5143774eeb6b..0000000000000
--- a/proto/private/pbconfigentry/config_entry.proto
+++ /dev/null
@@ -1,1259 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-package hashicorp.consul.internal.configentry;
-
-import "google/protobuf/duration.proto";
-import "google/protobuf/timestamp.proto";
-import "private/pbcommon/common.proto";
-
-enum Kind {
-  KindUnknown = 0;
-  KindMeshConfig = 1;
-  KindServiceResolver = 2;
-  KindIngressGateway = 3;
-  KindServiceIntentions = 4;
-  KindServiceDefaults = 5;
-  KindInlineCertificate = 6;
-  KindAPIGateway = 7;
-  KindBoundAPIGateway = 8;
-  KindHTTPRoute = 9;
-  KindTCPRoute = 10;
-  KindSamenessGroup = 11;
-  KindJWTProvider = 12;
-}
-
-message ConfigEntry {
-  Kind Kind = 1;
-  string Name = 2;
-
-  common.EnterpriseMeta EnterpriseMeta = 3;
-  common.RaftIndex RaftIndex = 4;
-
-  oneof Entry {
-    MeshConfig MeshConfig = 5;
-    ServiceResolver ServiceResolver = 6;
-    IngressGateway IngressGateway = 7;
-    ServiceIntentions ServiceIntentions = 8;
-    ServiceDefaults ServiceDefaults = 9;
-    APIGateway APIGateway = 10;
-    BoundAPIGateway BoundAPIGateway = 11;
-    TCPRoute TCPRoute = 12;
-    HTTPRoute HTTPRoute = 13;
-    InlineCertificate InlineCertificate = 14;
-    SamenessGroup SamenessGroup = 15;
-    JWTProvider JWTProvider = 16;
-  }
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.MeshConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=RaftIndex,EnterpriseMeta
-message MeshConfig {
-  TransparentProxyMeshConfig TransparentProxy = 1;
-  MeshTLSConfig TLS = 2;
-  MeshHTTPConfig HTTP = 3;
-  map<string, string> Meta = 4;
-  PeeringMeshConfig Peering = 5;
-  bool AllowEnablingPermissiveMutualTLS = 6;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.TransparentProxyMeshConfig
-// output=config_entry.gen.go
-// name=Structs
-message TransparentProxyMeshConfig {
-  bool MeshDestinationsOnly = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.MeshTLSConfig
-// output=config_entry.gen.go
-// name=Structs
-message MeshTLSConfig {
-  MeshDirectionalTLSConfig Incoming = 1;
-  MeshDirectionalTLSConfig Outgoing = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.MeshDirectionalTLSConfig
-// output=config_entry.gen.go
-// name=Structs
-message MeshDirectionalTLSConfig {
-  // mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
-  string TLSMinVersion = 1;
-  // mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
-  string TLSMaxVersion = 2;
-  // mog: func-from=cipherSuitesFromStructs func-to=cipherSuitesToStructs
-  repeated string CipherSuites = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.MeshHTTPConfig
-// output=config_entry.gen.go
-// name=Structs
-message MeshHTTPConfig {
-  bool SanitizeXForwardedClientCert = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.PeeringMeshConfig
-// output=config_entry.gen.go
-// name=Structs
-message PeeringMeshConfig {
-  bool PeerThroughMeshGateways = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceResolverConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-message ServiceResolver {
-  string DefaultSubset = 1;
-  map<string, ServiceResolverSubset> Subsets = 2;
-  ServiceResolverRedirect Redirect = 3;
-  map<string, ServiceResolverFailover> Failover = 4;
-  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-  google.protobuf.Duration ConnectTimeout = 5;
-  LoadBalancer LoadBalancer = 6;
-  map<string, string> Meta = 7;
-  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-  google.protobuf.Duration RequestTimeout = 8;
-  ServiceResolverPrioritizeByLocality PrioritizeByLocality = 9;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceResolverSubset
-// output=config_entry.gen.go
-// name=Structs
-message ServiceResolverSubset {
-  string Filter = 1;
-  bool OnlyPassing = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceResolverRedirect
-// output=config_entry.gen.go
-// name=Structs
-message ServiceResolverRedirect {
-  string Service = 1;
-  string ServiceSubset = 2;
-  string Namespace = 3;
-  string Partition = 4;
-  string Datacenter = 5;
-  string Peer = 6;
-  string SamenessGroup = 7;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceResolverFailover
-// output=config_entry.gen.go
-// name=Structs
-message ServiceResolverFailover {
-  string Service = 1;
-  string ServiceSubset = 2;
-  string Namespace = 3;
-  repeated string Datacenters = 4;
-  repeated ServiceResolverFailoverTarget Targets = 5;
-  ServiceResolverFailoverPolicy Policy = 6;
-  string SamenessGroup = 7;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceResolverFailoverPolicy
-// output=config_entry.gen.go
-// name=Structs
-message ServiceResolverFailoverPolicy {
-  string Mode = 1;
-  repeated string Regions = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceResolverPrioritizeByLocality
-// output=config_entry.gen.go
-// name=Structs
-message ServiceResolverPrioritizeByLocality {
-  string Mode = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceResolverFailoverTarget
-// output=config_entry.gen.go
-// name=Structs
-message ServiceResolverFailoverTarget {
-  string Service = 1;
-  string ServiceSubset = 2;
-  string Partition = 3;
-  string Namespace = 4;
-  string Datacenter = 5;
-  string Peer = 6;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.LoadBalancer
-// output=config_entry.gen.go
-// name=Structs
-message LoadBalancer {
-  string Policy = 1;
-  RingHashConfig RingHashConfig = 2;
-  LeastRequestConfig LeastRequestConfig = 3;
-  repeated HashPolicy HashPolicies = 4;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.RingHashConfig
-// output=config_entry.gen.go
-// name=Structs
-message RingHashConfig {
-  uint64 MinimumRingSize = 1;
-  uint64 MaximumRingSize = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.LeastRequestConfig
-// output=config_entry.gen.go
-// name=Structs
-message LeastRequestConfig {
-  uint32 ChoiceCount = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HashPolicy
-// output=config_entry.gen.go
-// name=Structs
-message HashPolicy {
-  string Field = 1;
-  string FieldValue = 2;
-  CookieConfig CookieConfig = 3;
-  bool SourceIP = 4;
-  bool Terminal = 5;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.CookieConfig
-// output=config_entry.gen.go
-// name=Structs
-message CookieConfig {
-  bool Session = 1;
-  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-  google.protobuf.Duration TTL = 2;
-  string Path = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IngressGatewayConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-message IngressGateway {
-  GatewayTLSConfig TLS = 1;
-  repeated IngressListener Listeners = 2;
-  map<string, string> Meta = 3;
-  IngressServiceConfig Defaults = 4;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IngressServiceConfig
-// output=config_entry.gen.go
-// name=Structs
-message IngressServiceConfig {
-  uint32 MaxConnections = 1;
-  uint32 MaxPendingRequests = 2;
-  uint32 MaxConcurrentRequests = 3;
-  PassiveHealthCheck PassiveHealthCheck = 4;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.GatewayTLSConfig
-// output=config_entry.gen.go
-// name=Structs
-message GatewayTLSConfig {
-  bool Enabled = 1;
-  GatewayTLSSDSConfig SDS = 2;
-  // mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
-  string TLSMinVersion = 3;
-  // mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
-  string TLSMaxVersion = 4;
-  // mog: func-from=cipherSuitesFromStructs func-to=cipherSuitesToStructs
-  repeated string CipherSuites = 5;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.GatewayTLSSDSConfig
-// output=config_entry.gen.go
-// name=Structs
-message GatewayTLSSDSConfig {
-  string ClusterName = 1;
-  string CertResource = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IngressListener
-// output=config_entry.gen.go
-// name=Structs
-message IngressListener {
-  // mog: func-to=int func-from=int32
-  int32 Port = 1;
-  string Protocol = 2;
-  repeated IngressService Services = 3;
-  GatewayTLSConfig TLS = 4;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IngressService
-// output=config_entry.gen.go
-// name=Structs
-message IngressService {
-  string Name = 1;
-  repeated string Hosts = 2;
-  GatewayServiceTLSConfig TLS = 3;
-  HTTPHeaderModifiers RequestHeaders = 4;
-  HTTPHeaderModifiers ResponseHeaders = 5;
-  map<string, string> Meta = 6;
-  // mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
-  common.EnterpriseMeta EnterpriseMeta = 7;
-  uint32 MaxConnections = 8;
-  uint32 MaxPendingRequests = 9;
-  uint32 MaxConcurrentRequests = 10;
-  PassiveHealthCheck PassiveHealthCheck = 11;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.GatewayServiceTLSConfig
-// output=config_entry.gen.go
-// name=Structs
-message GatewayServiceTLSConfig {
-  GatewayTLSSDSConfig SDS = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPHeaderModifiers
-// output=config_entry.gen.go
-// name=Structs
-message HTTPHeaderModifiers {
-  map<string, string> Add = 1;
-  map<string, string> Set = 2;
-  repeated string Remove = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceIntentionsConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-message ServiceIntentions {
-  repeated SourceIntention Sources = 1;
-  map<string, string> Meta = 2;
-  IntentionJWTRequirement JWT = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IntentionJWTRequirement
-// output=config_entry.gen.go
-// name=Structs
-message IntentionJWTRequirement {
-  repeated IntentionJWTProvider Providers = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IntentionJWTProvider
-// output=config_entry.gen.go
-// name=Structs
-message IntentionJWTProvider {
-  string Name = 1;
-  repeated IntentionJWTClaimVerification VerifyClaims = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IntentionJWTClaimVerification
-// output=config_entry.gen.go
-// name=Structs
-message IntentionJWTClaimVerification {
-  repeated string Path = 1;
-  string Value = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.SourceIntention
-// output=config_entry.gen.go
-// name=Structs
-message SourceIntention {
-  string Name = 1;
-  // mog: func-to=intentionActionToStructs func-from=intentionActionFromStructs
-  IntentionAction Action = 2;
-  repeated IntentionPermission Permissions = 3;
-  // mog: func-to=int func-from=int32
-  int32 Precedence = 4;
-  string LegacyID = 5;
-  // mog: func-to=intentionSourceTypeToStructs func-from=intentionSourceTypeFromStructs
-  IntentionSourceType Type = 6;
-  string Description = 7;
-  map<string, string> LegacyMeta = 8;
-  // mog: func-to=timeToStructs func-from=timeFromStructs
-  google.protobuf.Timestamp LegacyCreateTime = 9;
-  // mog: func-to=timeToStructs func-from=timeFromStructs
-  google.protobuf.Timestamp LegacyUpdateTime = 10;
-  // mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
-  common.EnterpriseMeta EnterpriseMeta = 11;
-  string Peer = 12;
-  string SamenessGroup = 13;
-}
-
-enum IntentionAction {
-  Deny = 0;
-  Allow = 1;
-}
-
-enum IntentionSourceType {
-  Consul = 0;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IntentionPermission
-// output=config_entry.gen.go
-// name=Structs
-message IntentionPermission {
-  // mog: func-to=intentionActionToStructs func-from=intentionActionFromStructs
-  IntentionAction Action = 1;
-  IntentionHTTPPermission HTTP = 2;
-  IntentionJWTRequirement JWT = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IntentionHTTPPermission
-// output=config_entry.gen.go
-// name=Structs
-message IntentionHTTPPermission {
-  string PathExact = 1;
-  string PathPrefix = 2;
-  string PathRegex = 3;
-  repeated IntentionHTTPHeaderPermission Header = 4;
-  repeated string Methods = 5;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IntentionHTTPHeaderPermission
-// output=config_entry.gen.go
-// name=Structs
-message IntentionHTTPHeaderPermission {
-  string Name = 1;
-  bool Present = 2;
-  string Exact = 3;
-  string Prefix = 4;
-  string Suffix = 5;
-  string Regex = 6;
-  bool Invert = 7;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-message ServiceDefaults {
-  string Protocol = 1;
-  // mog: func-to=proxyModeToStructs func-from=proxyModeFromStructs
-  ProxyMode Mode = 2;
-  TransparentProxyConfig TransparentProxy = 3;
-  MeshGatewayConfig MeshGateway = 4;
-  ExposeConfig Expose = 5;
-  string ExternalSNI = 6;
-  UpstreamConfiguration UpstreamConfig = 7;
-  DestinationConfig Destination = 8;
-  // mog: func-to=int func-from=int32
-  int32 MaxInboundConnections = 9;
-  // mog: func-to=int func-from=int32
-  int32 LocalConnectTimeoutMs = 10;
-  // mog: func-to=int func-from=int32
-  int32 LocalRequestTimeoutMs = 11;
-  string BalanceInboundConnections = 12;
-  RateLimits RateLimits = 16;
-  map<string, string> Meta = 13;
-  // mog: func-to=EnvoyExtensionsToStructs func-from=EnvoyExtensionsFromStructs
-  repeated hashicorp.consul.internal.common.EnvoyExtension EnvoyExtensions = 14;
-  // mog: func-to=mutualTLSModeToStructs func-from=mutualTLSModeFromStructs
-  MutualTLSMode MutualTLSMode = 15;
-}
-
-enum ProxyMode {
-  ProxyModeDefault = 0;
-  ProxyModeTransparent = 1;
-  ProxyModeDirect = 2;
-}
-
-enum MutualTLSMode {
-  MutualTLSModeDefault = 0;
-  MutualTLSModeStrict = 1;
-  MutualTLSModePermissive = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.TransparentProxyConfig
-// output=config_entry.gen.go
-// name=Structs
-message TransparentProxyConfig {
-  // mog: func-to=int func-from=int32
-  int32 OutboundListenerPort = 1;
-  bool DialedDirectly = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.MeshGatewayConfig
-// output=config_entry.gen.go
-// name=Structs
-message MeshGatewayConfig {
-  // mog: func-to=meshGatewayModeToStructs func-from=meshGatewayModeFromStructs
-  MeshGatewayMode Mode = 1;
-}
-
-enum MeshGatewayMode {
-  MeshGatewayModeDefault = 0;
-  MeshGatewayModeNone = 1;
-  MeshGatewayModeLocal = 2;
-  MeshGatewayModeRemote = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ExposeConfig
-// output=config_entry.gen.go
-// name=Structs
-message ExposeConfig {
-  bool Checks = 1;
-  repeated ExposePath Paths = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ExposePath
-// output=config_entry.gen.go
-// name=Structs
-message ExposePath {
-  // mog: func-to=int func-from=int32
-  int32 ListenerPort = 1;
-  string Path = 2;
-  // mog: func-to=int func-from=int32
-  int32 LocalPathPort = 3;
-  string Protocol = 4;
-  bool ParsedFromCheck = 5;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.UpstreamConfiguration
-// output=config_entry.gen.go
-// name=Structs
-message UpstreamConfiguration {
-  repeated UpstreamConfig Overrides = 1;
-  UpstreamConfig Defaults = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.UpstreamConfig
-// output=config_entry.gen.go
-// name=Structs
-message UpstreamConfig {
-  string Name = 1;
-  // mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
-  common.EnterpriseMeta EnterpriseMeta = 2;
-  string EnvoyListenerJSON = 3;
-  string EnvoyClusterJSON = 4;
-  string Protocol = 5;
-  // mog: func-to=int func-from=int32
-  int32 ConnectTimeoutMs = 6;
-  UpstreamLimits Limits = 7;
-  PassiveHealthCheck PassiveHealthCheck = 8;
-  MeshGatewayConfig MeshGateway = 9;
-  string BalanceOutboundConnections = 10;
-  string Peer = 11;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.UpstreamLimits
-// output=config_entry.gen.go
-// name=Structs
-message UpstreamLimits {
-  // mog: func-to=pointerToIntFromInt32 func-from=int32FromPointerToInt
-  int32 MaxConnections = 1;
-  // mog: func-to=pointerToIntFromInt32 func-from=int32FromPointerToInt
-  int32 MaxPendingRequests = 2;
-  // mog: func-to=pointerToIntFromInt32 func-from=int32FromPointerToInt
-  int32 MaxConcurrentRequests = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.PassiveHealthCheck
-// output=config_entry.gen.go
-// name=Structs
-message PassiveHealthCheck {
-  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-  google.protobuf.Duration Interval = 1;
-  uint32 MaxFailures = 2;
-  // mog: target=EnforcingConsecutive5xx func-to=pointerToUint32FromUint32 func-from=uint32FromPointerToUint32
-  uint32 EnforcingConsecutive5xx = 3;
-  // mog: func-to=pointerToUint32FromUint32 func-from=uint32FromPointerToUint32
-  uint32 MaxEjectionPercent = 4;
-  // mog: func-to=structs.DurationPointerFromProto func-from=structs.DurationPointerToProto
-  google.protobuf.Duration BaseEjectionTime = 5;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.DestinationConfig
-// output=config_entry.gen.go
-// name=Structs
-message DestinationConfig {
-  repeated string Addresses = 1;
-  // mog: func-to=int func-from=int32
-  int32 Port = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.RateLimits
-// output=config_entry.gen.go
-// name=Structs
-message RateLimits {
-  InstanceLevelRateLimits InstanceLevel = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.InstanceLevelRateLimits
-// output=config_entry.gen.go
-// name=Structs
-message InstanceLevelRateLimits {
-  // mog: func-to=int func-from=uint32
-  uint32 RequestsPerSecond = 1;
-  // mog: func-to=int func-from=uint32
-  uint32 RequestsMaxBurst = 2;
-  repeated InstanceLevelRouteRateLimits Routes = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.InstanceLevelRouteRateLimits
-// output=config_entry.gen.go
-// name=Structs
-message InstanceLevelRouteRateLimits {
-  string PathExact = 1;
-  string PathPrefix = 2;
-  string PathRegex = 3;
-  // mog: func-to=int func-from=uint32
-  uint32 RequestsPerSecond = 4;
-  // mog: func-to=int func-from=uint32
-  uint32 RequestsMaxBurst = 5;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.APIGatewayConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-message APIGateway {
-  map<string, string> Meta = 1;
-  repeated APIGatewayListener Listeners = 2;
-  Status Status = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.Status
-// output=config_entry.gen.go
-// name=Structs
-message Status {
-  repeated Condition Conditions = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.Condition
-// output=config_entry.gen.go
-// name=Structs
-message Condition {
-  string Type = 1;
-  string Status = 2;
-  string Reason = 3;
-  string Message = 4;
-  ResourceReference Resource = 5;
-  // mog: func-to=timeToStructs func-from=timeFromStructs
-  google.protobuf.Timestamp LastTransitionTime = 6;
-}
-
-enum APIGatewayListenerProtocol {
-  ListenerProtocolHTTP = 0;
-  ListenerProtocolTCP = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.APIGatewayListener
-// output=config_entry.gen.go
-// name=Structs
-message APIGatewayListener {
-  string Name = 1;
-  string Hostname = 2;
-  // mog: func-to=int func-from=int32
-  int32 Port = 3;
-  // mog: func-to=apiGatewayProtocolToStructs func-from=apiGatewayProtocolFromStructs
-  APIGatewayListenerProtocol Protocol = 4;
-  APIGatewayTLSConfiguration TLS = 5;
-  APIGatewayPolicy Override = 6;
-  APIGatewayPolicy Default = 7;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.APIGatewayTLSConfiguration
-// output=config_entry.gen.go
-// name=Structs
-message APIGatewayTLSConfiguration {
-  repeated ResourceReference Certificates = 1;
-  // mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
-  string MinVersion = 2;
-  // mog: func-from=tlsVersionFromStructs func-to=tlsVersionToStructs
-  string MaxVersion = 3;
-  // mog: func-from=cipherSuitesFromStructs func-to=cipherSuitesToStructs
-  repeated string CipherSuites = 4;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.APIGatewayPolicy
-// output=config_entry.gen.go
-// name=Structs
-message APIGatewayPolicy {
-  // mog: func-to=gwJWTRequirementToStructs func-from=gwJWTRequirementFromStructs
-  APIGatewayJWTRequirement JWT = 1;
-}
-
-message APIGatewayJWTRequirement {
-  repeated APIGatewayJWTProvider Providers = 1;
-}
-
-message APIGatewayJWTProvider {
-  string Name = 1;
-  repeated APIGatewayJWTClaimVerification VerifyClaims = 2;
-}
-
-message APIGatewayJWTClaimVerification {
-  repeated string Path = 1;
-  string Value = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ResourceReference
-// output=config_entry.gen.go
-// name=Structs
-message ResourceReference {
-  string Kind = 1;
-  string Name = 2;
-  string SectionName = 3;
-  // mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
-  common.EnterpriseMeta EnterpriseMeta = 4;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.BoundAPIGatewayConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-message BoundAPIGateway {
-  map<string, string> Meta = 1;
-  repeated BoundAPIGatewayListener Listeners = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.BoundAPIGatewayListener
-// output=config_entry.gen.go
-// name=Structs
-message BoundAPIGatewayListener {
-  string Name = 1;
-  repeated ResourceReference Certificates = 2;
-  repeated ResourceReference Routes = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.InlineCertificateConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-message InlineCertificate {
-  map<string, string> Meta = 1;
-  string Certificate = 2;
-  string PrivateKey = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPRouteConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-message HTTPRoute {
-  map<string, string> Meta = 1;
-  repeated ResourceReference Parents = 2;
-  repeated HTTPRouteRule Rules = 3;
-  repeated string Hostnames = 4;
-  Status Status = 5;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPRouteRule
-// output=config_entry.gen.go
-// name=Structs
-message HTTPRouteRule {
-  HTTPFilters Filters = 1;
-  repeated HTTPMatch Matches = 2;
-  repeated HTTPService Services = 3;
-  HTTPResponseFilters ResponseFilters = 4;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPMatch
-// output=config_entry.gen.go
-// name=Structs
-message HTTPMatch {
-  repeated HTTPHeaderMatch Headers = 1;
-  // mog: func-to=httpMatchMethodToStructs func-from=httpMatchMethodFromStructs
-  HTTPMatchMethod Method = 2;
-  HTTPPathMatch Path = 3;
-  repeated HTTPQueryMatch Query = 4;
-}
-
-enum HTTPMatchMethod {
-  HTTPMatchMethodAll = 0;
-  HTTPMatchMethodConnect = 1;
-  HTTPMatchMethodDelete = 2;
-  HTTPMatchMethodGet = 3;
-  HTTPMatchMethodHead = 4;
-  HTTPMatchMethodOptions = 5;
-  HTTPMatchMethodPatch = 6;
-  HTTPMatchMethodPost = 7;
-  HTTPMatchMethodPut = 8;
-  HTTPMatchMethodTrace = 9;
-}
-
-enum HTTPHeaderMatchType {
-  HTTPHeaderMatchExact = 0;
-  HTTPHeaderMatchPrefix = 1;
-  HTTPHeaderMatchPresent = 2;
-  HTTPHeaderMatchRegularExpression = 3;
-  HTTPHeaderMatchSuffix = 4;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPHeaderMatch
-// output=config_entry.gen.go
-// name=Structs
-message HTTPHeaderMatch {
-  // mog: func-to=httpHeaderMatchToStructs func-from=httpHeaderMatchFromStructs
-  HTTPHeaderMatchType Match = 1;
-  string Name = 2;
-  string Value = 3;
-}
-
-enum HTTPPathMatchType {
-  HTTPPathMatchExact = 0;
-  HTTPPathMatchPrefix = 1;
-  HTTPPathMatchRegularExpression = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPPathMatch
-// output=config_entry.gen.go
-// name=Structs
-message HTTPPathMatch {
-  // mog: func-to=httpPathMatchToStructs func-from=httpPathMatchFromStructs
-  HTTPPathMatchType Match = 1;
-  string Value = 2;
-}
-
-enum HTTPQueryMatchType {
-  HTTPQueryMatchExact = 0;
-  HTTPQueryMatchPresent = 1;
-  HTTPQueryMatchRegularExpression = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPQueryMatch
-// output=config_entry.gen.go
-// name=Structs
-message HTTPQueryMatch {
-  // mog: func-to=httpQueryMatchToStructs func-from=httpQueryMatchFromStructs
-  HTTPQueryMatchType Match = 1;
-  string Name = 2;
-  string Value = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPFilters
-// output=config_entry.gen.go
-// name=Structs
-message HTTPFilters {
-  repeated HTTPHeaderFilter Headers = 1;
-  URLRewrite URLRewrite = 2;
-  RetryFilter RetryFilter = 3;
-  TimeoutFilter TimeoutFilter = 4;
-  // mog: func-to=routeJWTFilterToStructs func-from=routeJWTFilterFromStructs
-  JWTFilter JWT = 5;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPResponseFilters
-// output=config_entry.gen.go
-// name=Structs
-message HTTPResponseFilters {
-  repeated HTTPHeaderFilter Headers = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.URLRewrite
-// output=config_entry.gen.go
-// name=Structs
-message URLRewrite {
-  string Path = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.RetryFilter
-// output=config_entry.gen.go
-// name=Structs
-message RetryFilter {
-  uint32 NumRetries = 1;
-  repeated string RetryOn = 2;
-  repeated uint32 RetryOnStatusCodes = 3;
-  bool RetryOnConnectFailure = 4;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.TimeoutFilter
-// output=config_entry.gen.go
-// name=Structs
-message TimeoutFilter {
-  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-  google.protobuf.Duration RequestTimeout = 1;
-  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-  google.protobuf.Duration IdleTimeout = 2;
-}
-
-message JWTFilter {
-  repeated APIGatewayJWTProvider Providers = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPHeaderFilter
-// output=config_entry.gen.go
-// name=Structs
-message HTTPHeaderFilter {
-  map<string, string> Add = 1;
-  repeated string Remove = 2;
-  map<string, string> Set = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HTTPService
-// output=config_entry.gen.go
-// name=Structs
-message HTTPService {
-  string Name = 1;
-  // mog: func-to=int func-from=int32
-  int32 Weight = 2;
-  HTTPFilters Filters = 3;
-  // mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
-  common.EnterpriseMeta EnterpriseMeta = 4;
-  HTTPResponseFilters ResponseFilters = 5;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.TCPRouteConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Kind,Name,RaftIndex,EnterpriseMeta
-message TCPRoute {
-  map<string, string> Meta = 1;
-  repeated ResourceReference Parents = 2;
-  repeated TCPService Services = 3;
-  Status Status = 4;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.TCPService
-// output=config_entry.gen.go
-// name=Structs
-message TCPService {
-  string Name = 1;
-  // mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
-  common.EnterpriseMeta EnterpriseMeta = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.SamenessGroupConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=RaftIndex
-message SamenessGroup {
-  string Name = 1;
-  bool DefaultForFailover = 2;
-  bool IncludeLocal = 3;
-  repeated SamenessGroupMember Members = 4;
-  map<string, string> Meta = 5;
-  // mog: func-to=enterpriseMetaToStructs func-from=enterpriseMetaFromStructs
-  common.EnterpriseMeta EnterpriseMeta = 6;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.SamenessGroupMember
-// output=config_entry.gen.go
-// name=Structs
-message SamenessGroupMember {
-  string Partition = 1;
-  string Peer = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWTProviderConfigEntry
-// output=config_entry.gen.go
-// name=Structs
-// ignore-fields=Name,Kind,RaftIndex,EnterpriseMeta
-message JWTProvider {
-  JSONWebKeySet JSONWebKeySet = 1;
-  string Issuer = 2;
-  repeated string Audiences = 3;
-  repeated JWTLocation Locations = 4;
-  JWTForwardingConfig Forwarding = 5;
-  JWTCacheConfig CacheConfig = 6;
-  map<string, string> Meta = 7;
-  // mog: func-to=int func-from=int32
-  int32 ClockSkewSeconds = 8;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JSONWebKeySet
-// output=config_entry.gen.go
-// name=Structs
-message JSONWebKeySet {
-  LocalJWKS Local = 1;
-  RemoteJWKS Remote = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.LocalJWKS
-// output=config_entry.gen.go
-// name=Structs
-message LocalJWKS {
-  string JWKS = 1;
-  string Filename = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.RemoteJWKS
-// output=config_entry.gen.go
-// name=Structs
-message RemoteJWKS {
-  string URI = 1;
-  // mog: func-to=int func-from=int32
-  int32 RequestTimeoutMs = 2;
-  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-  google.protobuf.Duration CacheDuration = 3;
-  bool FetchAsynchronously = 4;
-  JWKSRetryPolicy RetryPolicy = 5;
-  JWKSCluster JWKSCluster = 6;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWKSCluster
-// output=config_entry.gen.go
-// name=Structs
-message JWKSCluster {
-  string DiscoveryType = 1;
-  JWKSTLSCertificate TLSCertificates = 2;
-  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-  google.protobuf.Duration ConnectTimeout = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWKSTLSCertificate
-// output=config_entry.gen.go
-// name=Structs
-message JWKSTLSCertificate {
-  JWKSTLSCertProviderInstance CaCertificateProviderInstance = 1;
-  JWKSTLSCertTrustedCA TrustedCA = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWKSTLSCertProviderInstance
-// output=config_entry.gen.go
-// name=Structs
-message JWKSTLSCertProviderInstance {
-  string InstanceName = 1;
-  string CertificateName = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWKSTLSCertTrustedCA
-// output=config_entry.gen.go
-// name=Structs
-message JWKSTLSCertTrustedCA {
-  string Filename = 1;
-  string EnvironmentVariable = 2;
-  string InlineString = 3;
-  bytes InlineBytes = 4;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWKSRetryPolicy
-// output=config_entry.gen.go
-// name=Structs
-message JWKSRetryPolicy {
-  // mog: func-to=int func-from=int32
-  int32 NumRetries = 1;
-  RetryPolicyBackOff RetryPolicyBackOff = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.RetryPolicyBackOff
-// output=config_entry.gen.go
-// name=Structs
-message RetryPolicyBackOff {
-  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-  google.protobuf.Duration BaseInterval = 1;
-  // mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-  google.protobuf.Duration MaxInterval = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWTLocation
-// output=config_entry.gen.go
-// name=Structs
-message JWTLocation {
-  JWTLocationHeader Header = 1;
-  JWTLocationQueryParam QueryParam = 2;
-  JWTLocationCookie Cookie = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWTLocationHeader
-// output=config_entry.gen.go
-// name=Structs
-message JWTLocationHeader {
-  string Name = 1;
-  string ValuePrefix = 2;
-  bool Forward = 3;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWTLocationQueryParam
-// output=config_entry.gen.go
-// name=Structs
-message JWTLocationQueryParam {
-  string Name = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWTLocationCookie
-// output=config_entry.gen.go
-// name=Structs
-message JWTLocationCookie {
-  string Name = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWTForwardingConfig
-// output=config_entry.gen.go
-// name=Structs
-message JWTForwardingConfig {
-  string HeaderName = 1;
-  bool PadForwardPayloadHeader = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.JWTCacheConfig
-// output=config_entry.gen.go
-// name=Structs
-message JWTCacheConfig {
-  // mog: func-to=int func-from=int32
-  int32 Size = 1;
-}
diff --git a/proto/private/pbconfigentry/config_entry_ce.go b/proto/private/pbconfigentry/config_entry_ce.go
deleted file mode 100644
index acc395186c369..0000000000000
--- a/proto/private/pbconfigentry/config_entry_ce.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package pbconfigentry
-
-import "github.com/hashicorp/consul/agent/structs"
-
-func gwJWTRequirementToStructs(m *APIGatewayJWTRequirement) *structs.APIGatewayJWTRequirement {
-	return &structs.APIGatewayJWTRequirement{}
-}
-
-func gwJWTRequirementFromStructs(*structs.APIGatewayJWTRequirement) *APIGatewayJWTRequirement {
-	return &APIGatewayJWTRequirement{}
-}
-
-func routeJWTFilterToStructs(m *JWTFilter) *structs.JWTFilter {
-	return &structs.JWTFilter{}
-}
-
-func routeJWTFilterFromStructs(*structs.JWTFilter) *JWTFilter {
-	return &JWTFilter{}
-}
diff --git a/proto/private/pbconnect/connect.pb.go b/proto/private/pbconnect/connect.pb.go
deleted file mode 100644
index 72fce82238c97..0000000000000
--- a/proto/private/pbconnect/connect.pb.go
+++ /dev/null
@@ -1,778 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbconnect/connect.proto
-
-package pbconnect
-
-import (
-	pbcommon "github.com/hashicorp/consul/proto/private/pbcommon"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// CARoots is the list of all currently trusted CA Roots.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IndexedCARoots
-// output=connect.gen.go
-// name=StructsIndexedCARoots
-type CARoots struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ActiveRootID is the ID of a root in Roots that is the active CA root.
-	// Other roots are still valid if they're in the Roots list but are in
-	// the process of being rotated out.
-	ActiveRootID string `protobuf:"bytes,1,opt,name=ActiveRootID,proto3" json:"ActiveRootID,omitempty"`
-	// TrustDomain is the identification root for this Consul cluster. All
-	// certificates signed by the cluster's CA must have their identifying URI in
-	// this domain.
-	//
-	// This does not include the protocol (currently spiffe://) since we may
-	// implement other protocols in future with equivalent semantics. It should be
-	// compared against the "authority" section of a URI (i.e. host:port).
-	//
-	// We need to support migrating a cluster between trust domains to support
-	// Multi-DC migration in Enterprise. In this case the current trust domain is
-	// here but entries in Roots may also have ExternalTrustDomain set to a
-	// non-empty value implying they were previous roots that are still trusted
-	// but under a different trust domain.
-	//
-	// Note that we DON'T validate trust domain during AuthZ since it causes
-	// issues of loss of connectivity during migration between trust domains. The
-	// only time the additional validation adds value is where the cluster shares
-	// an external root (e.g. organization-wide root) with another distinct Consul
-	// cluster or PKI system. In this case, x509 Name Constraints can be added to
-	// enforce that Consul's CA can only validly sign or trust certs within the
-	// same trust-domain. Name constraints as enforced by TLS handshake also allow
-	// seamless rotation between trust domains thanks to cross-signing.
-	TrustDomain string `protobuf:"bytes,2,opt,name=TrustDomain,proto3" json:"TrustDomain,omitempty"`
-	// Roots is a list of root CA certs to trust.
-	Roots []*CARoot `protobuf:"bytes,3,rep,name=Roots,proto3" json:"Roots,omitempty"`
-	// QueryMeta here is mainly used to contain the latest Raft Index that could
-	// be used to perform a blocking query.
-	// mog: func-to=QueryMetaTo func-from=QueryMetaFrom
-	QueryMeta *pbcommon.QueryMeta `protobuf:"bytes,4,opt,name=QueryMeta,proto3" json:"QueryMeta,omitempty"`
-}
-
-func (x *CARoots) Reset() {
-	*x = CARoots{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconnect_connect_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CARoots) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CARoots) ProtoMessage() {}
-
-func (x *CARoots) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconnect_connect_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CARoots.ProtoReflect.Descriptor instead.
-func (*CARoots) Descriptor() ([]byte, []int) {
-	return file_private_pbconnect_connect_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *CARoots) GetActiveRootID() string {
-	if x != nil {
-		return x.ActiveRootID
-	}
-	return ""
-}
-
-func (x *CARoots) GetTrustDomain() string {
-	if x != nil {
-		return x.TrustDomain
-	}
-	return ""
-}
-
-func (x *CARoots) GetRoots() []*CARoot {
-	if x != nil {
-		return x.Roots
-	}
-	return nil
-}
-
-func (x *CARoots) GetQueryMeta() *pbcommon.QueryMeta {
-	if x != nil {
-		return x.QueryMeta
-	}
-	return nil
-}
-
-// CARoot is the trusted CA Root.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.CARoot
-// output=connect.gen.go
-// name=StructsCARoot
-type CARoot struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ID is a globally unique ID (UUID) representing this CA root.
-	ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
-	// Name is a human-friendly name for this CA root. This value is
-	// opaque to Consul and is not used for anything internally.
-	Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
-	// SerialNumber is the x509 serial number of the certificate.
-	SerialNumber uint64 `protobuf:"varint,3,opt,name=SerialNumber,proto3" json:"SerialNumber,omitempty"`
-	// SigningKeyID is the ID of the public key that corresponds to the private
-	// key used to sign leaf certificates. Is is the HexString format of the
-	// raw AuthorityKeyID bytes.
-	SigningKeyID string `protobuf:"bytes,4,opt,name=SigningKeyID,proto3" json:"SigningKeyID,omitempty"`
-	// ExternalTrustDomain is the trust domain this root was generated under. It
-	// is usually empty implying "the current cluster trust-domain". It is set
-	// only in the case that a cluster changes trust domain and then all old roots
-	// that are still trusted have the old trust domain set here.
-	//
-	// We currently DON'T validate these trust domains explicitly anywhere, see
-	// IndexedRoots.TrustDomain doc. We retain this information for debugging and
-	// future flexibility.
-	ExternalTrustDomain string `protobuf:"bytes,5,opt,name=ExternalTrustDomain,proto3" json:"ExternalTrustDomain,omitempty"`
-	// Time validity bounds.
-	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
-	NotBefore *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=NotBefore,proto3" json:"NotBefore,omitempty"`
-	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
-	NotAfter *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=NotAfter,proto3" json:"NotAfter,omitempty"`
-	// RootCert is the PEM-encoded public certificate.
-	RootCert string `protobuf:"bytes,8,opt,name=RootCert,proto3" json:"RootCert,omitempty"`
-	// IntermediateCerts is a list of PEM-encoded intermediate certs to
-	// attach to any leaf certs signed by this CA.
-	IntermediateCerts []string `protobuf:"bytes,9,rep,name=IntermediateCerts,proto3" json:"IntermediateCerts,omitempty"`
-	// SigningCert is the PEM-encoded signing certificate and SigningKey
-	// is the PEM-encoded private key for the signing certificate. These
-	// may actually be empty if the CA plugin in use manages these for us.
-	SigningCert string `protobuf:"bytes,10,opt,name=SigningCert,proto3" json:"SigningCert,omitempty"`
-	SigningKey  string `protobuf:"bytes,11,opt,name=SigningKey,proto3" json:"SigningKey,omitempty"`
-	// Active is true if this is the current active CA. This must only
-	// be true for exactly one CA. For any method that modifies roots in the
-	// state store, tests should be written to verify that multiple roots
-	// cannot be active.
-	Active bool `protobuf:"varint,12,opt,name=Active,proto3" json:"Active,omitempty"`
-	// RotatedOutAt is the time at which this CA was removed from the state.
-	// This will only be set on roots that have been rotated out from being the
-	// active root.
-	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
-	RotatedOutAt *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=RotatedOutAt,proto3" json:"RotatedOutAt,omitempty"`
-	// PrivateKeyType is the type of the private key used to sign certificates. It
-	// may be "rsa" or "ec". This is provided as a convenience to avoid parsing
-	// the public key to from the certificate to infer the type.
-	PrivateKeyType string `protobuf:"bytes,14,opt,name=PrivateKeyType,proto3" json:"PrivateKeyType,omitempty"`
-	// PrivateKeyBits is the length of the private key used to sign certificates.
-	// This is provided as a convenience to avoid parsing the public key from the
-	// certificate to infer the type.
-	// mog: func-to=int func-from=int32
-	PrivateKeyBits int32 `protobuf:"varint,15,opt,name=PrivateKeyBits,proto3" json:"PrivateKeyBits,omitempty"`
-	// mog: func-to=RaftIndexTo func-from=RaftIndexFrom
-	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,16,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
-}
-
-func (x *CARoot) Reset() {
-	*x = CARoot{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconnect_connect_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CARoot) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CARoot) ProtoMessage() {}
-
-func (x *CARoot) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconnect_connect_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CARoot.ProtoReflect.Descriptor instead.
-func (*CARoot) Descriptor() ([]byte, []int) {
-	return file_private_pbconnect_connect_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *CARoot) GetID() string {
-	if x != nil {
-		return x.ID
-	}
-	return ""
-}
-
-func (x *CARoot) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *CARoot) GetSerialNumber() uint64 {
-	if x != nil {
-		return x.SerialNumber
-	}
-	return 0
-}
-
-func (x *CARoot) GetSigningKeyID() string {
-	if x != nil {
-		return x.SigningKeyID
-	}
-	return ""
-}
-
-func (x *CARoot) GetExternalTrustDomain() string {
-	if x != nil {
-		return x.ExternalTrustDomain
-	}
-	return ""
-}
-
-func (x *CARoot) GetNotBefore() *timestamppb.Timestamp {
-	if x != nil {
-		return x.NotBefore
-	}
-	return nil
-}
-
-func (x *CARoot) GetNotAfter() *timestamppb.Timestamp {
-	if x != nil {
-		return x.NotAfter
-	}
-	return nil
-}
-
-func (x *CARoot) GetRootCert() string {
-	if x != nil {
-		return x.RootCert
-	}
-	return ""
-}
-
-func (x *CARoot) GetIntermediateCerts() []string {
-	if x != nil {
-		return x.IntermediateCerts
-	}
-	return nil
-}
-
-func (x *CARoot) GetSigningCert() string {
-	if x != nil {
-		return x.SigningCert
-	}
-	return ""
-}
-
-func (x *CARoot) GetSigningKey() string {
-	if x != nil {
-		return x.SigningKey
-	}
-	return ""
-}
-
-func (x *CARoot) GetActive() bool {
-	if x != nil {
-		return x.Active
-	}
-	return false
-}
-
-func (x *CARoot) GetRotatedOutAt() *timestamppb.Timestamp {
-	if x != nil {
-		return x.RotatedOutAt
-	}
-	return nil
-}
-
-func (x *CARoot) GetPrivateKeyType() string {
-	if x != nil {
-		return x.PrivateKeyType
-	}
-	return ""
-}
-
-func (x *CARoot) GetPrivateKeyBits() int32 {
-	if x != nil {
-		return x.PrivateKeyBits
-	}
-	return 0
-}
-
-func (x *CARoot) GetRaftIndex() *pbcommon.RaftIndex {
-	if x != nil {
-		return x.RaftIndex
-	}
-	return nil
-}
-
-// RaftIndex is used to track the index used while creating
-// or modifying a given struct type.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.IssuedCert
-// output=connect.gen.go
-// name=StructsIssuedCert
-type IssuedCert struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// SerialNumber is the unique serial number for this certificate.
-	// This is encoded in standard hex separated by :.
-	SerialNumber string `protobuf:"bytes,1,opt,name=SerialNumber,proto3" json:"SerialNumber,omitempty"`
-	// CertPEM and PrivateKeyPEM are the PEM-encoded certificate and private
-	// key for that cert, respectively. This should not be stored in the
-	// state store, but is present in the sign API response.
-	CertPEM       string `protobuf:"bytes,2,opt,name=CertPEM,proto3" json:"CertPEM,omitempty"`
-	PrivateKeyPEM string `protobuf:"bytes,3,opt,name=PrivateKeyPEM,proto3" json:"PrivateKeyPEM,omitempty"`
-	// Service is the name of the service for which the cert was issued.
-	Service string `protobuf:"bytes,4,opt,name=Service,proto3" json:"Service,omitempty"`
-	// ServiceURI is the cert URI value.
-	ServiceURI string `protobuf:"bytes,5,opt,name=ServiceURI,proto3" json:"ServiceURI,omitempty"`
-	// Agent is the name of the node for which the cert was issued.
-	Agent string `protobuf:"bytes,6,opt,name=Agent,proto3" json:"Agent,omitempty"`
-	// AgentURI is the cert URI value.
-	AgentURI string `protobuf:"bytes,7,opt,name=AgentURI,proto3" json:"AgentURI,omitempty"`
-	// Kind is the kind of service for which the cert was issued.
-	// mog: func-to=structs.ServiceKind func-from=string
-	Kind string `protobuf:"bytes,12,opt,name=Kind,proto3" json:"Kind,omitempty"`
-	// KindURI is the cert URI value.
-	KindURI string `protobuf:"bytes,13,opt,name=KindURI,proto3" json:"KindURI,omitempty"`
-	// ServerURI is the URI value of a cert issued for a server agent.
-	// The same URI is shared by all servers in a Consul datacenter.
-	ServerURI string `protobuf:"bytes,14,opt,name=ServerURI,proto3" json:"ServerURI,omitempty"`
-	// WorkloadIdentity is the name of the workload identity for which the cert was issued.
-	WorkloadIdentity string `protobuf:"bytes,15,opt,name=WorkloadIdentity,proto3" json:"WorkloadIdentity,omitempty"`
-	// WorkloadIdentityURI is the cert URI value.
-	WorkloadIdentityURI string `protobuf:"bytes,16,opt,name=WorkloadIdentityURI,proto3" json:"WorkloadIdentityURI,omitempty"`
-	// ValidAfter and ValidBefore are the validity periods for the
-	// certificate.
-	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
-	ValidAfter *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=ValidAfter,proto3" json:"ValidAfter,omitempty"`
-	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
-	ValidBefore *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=ValidBefore,proto3" json:"ValidBefore,omitempty"`
-	// EnterpriseMeta is the Consul Enterprise specific metadata
-	// mog: func-to=EnterpriseMetaTo func-from=EnterpriseMetaFrom
-	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,10,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
-	// mog: func-to=RaftIndexTo func-from=RaftIndexFrom
-	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,11,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
-}
-
-func (x *IssuedCert) Reset() {
-	*x = IssuedCert{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbconnect_connect_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IssuedCert) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IssuedCert) ProtoMessage() {}
-
-func (x *IssuedCert) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbconnect_connect_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IssuedCert.ProtoReflect.Descriptor instead.
-func (*IssuedCert) Descriptor() ([]byte, []int) {
-	return file_private_pbconnect_connect_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *IssuedCert) GetSerialNumber() string {
-	if x != nil {
-		return x.SerialNumber
-	}
-	return ""
-}
-
-func (x *IssuedCert) GetCertPEM() string {
-	if x != nil {
-		return x.CertPEM
-	}
-	return ""
-}
-
-func (x *IssuedCert) GetPrivateKeyPEM() string {
-	if x != nil {
-		return x.PrivateKeyPEM
-	}
-	return ""
-}
-
-func (x *IssuedCert) GetService() string {
-	if x != nil {
-		return x.Service
-	}
-	return ""
-}
-
-func (x *IssuedCert) GetServiceURI() string {
-	if x != nil {
-		return x.ServiceURI
-	}
-	return ""
-}
-
-func (x *IssuedCert) GetAgent() string {
-	if x != nil {
-		return x.Agent
-	}
-	return ""
-}
-
-func (x *IssuedCert) GetAgentURI() string {
-	if x != nil {
-		return x.AgentURI
-	}
-	return ""
-}
-
-func (x *IssuedCert) GetKind() string {
-	if x != nil {
-		return x.Kind
-	}
-	return ""
-}
-
-func (x *IssuedCert) GetKindURI() string {
-	if x != nil {
-		return x.KindURI
-	}
-	return ""
-}
-
-func (x *IssuedCert) GetServerURI() string {
-	if x != nil {
-		return x.ServerURI
-	}
-	return ""
-}
-
-func (x *IssuedCert) GetWorkloadIdentity() string {
-	if x != nil {
-		return x.WorkloadIdentity
-	}
-	return ""
-}
-
-func (x *IssuedCert) GetWorkloadIdentityURI() string {
-	if x != nil {
-		return x.WorkloadIdentityURI
-	}
-	return ""
-}
-
-func (x *IssuedCert) GetValidAfter() *timestamppb.Timestamp {
-	if x != nil {
-		return x.ValidAfter
-	}
-	return nil
-}
-
-func (x *IssuedCert) GetValidBefore() *timestamppb.Timestamp {
-	if x != nil {
-		return x.ValidBefore
-	}
-	return nil
-}
-
-func (x *IssuedCert) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if x != nil {
-		return x.EnterpriseMeta
-	}
-	return nil
-}
-
-func (x *IssuedCert) GetRaftIndex() *pbcommon.RaftIndex {
-	if x != nil {
-		return x.RaftIndex
-	}
-	return nil
-}
-
-var File_private_pbconnect_connect_proto protoreflect.FileDescriptor
-
-var file_private_pbconnect_connect_proto_rawDesc = []byte{
-	0x0a, 0x1f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x21, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70,
-	0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdb, 0x01, 0x0a, 0x07, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74, 0x73,
-	0x12, 0x22, 0x0a, 0x0c, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x52, 0x6f, 0x6f, 0x74, 0x49, 0x44,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x52, 0x6f,
-	0x6f, 0x74, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x54, 0x72, 0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d,
-	0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x54, 0x72, 0x75, 0x73, 0x74,
-	0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x3f, 0x0a, 0x05, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2e, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74,
-	0x52, 0x05, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x12, 0x49, 0x0a, 0x09, 0x51, 0x75, 0x65, 0x72, 0x79,
-	0x4d, 0x65, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x51, 0x75,
-	0x65, 0x72, 0x79, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x09, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x65,
-	0x74, 0x61, 0x22, 0x97, 0x05, 0x0a, 0x06, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x0e, 0x0a,
-	0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x12, 0x12, 0x0a,
-	0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d,
-	0x65, 0x12, 0x22, 0x0a, 0x0c, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65,
-	0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e,
-	0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x22, 0x0a, 0x0c, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67,
-	0x4b, 0x65, 0x79, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x53, 0x69, 0x67,
-	0x6e, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x49, 0x44, 0x12, 0x30, 0x0a, 0x13, 0x45, 0x78, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x54, 0x72, 0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x54, 0x72, 0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x38, 0x0a, 0x09, 0x4e,
-	0x6f, 0x74, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x4e, 0x6f, 0x74, 0x42,
-	0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x36, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x41, 0x66, 0x74, 0x65,
-	0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74,
-	0x61, 0x6d, 0x70, 0x52, 0x08, 0x4e, 0x6f, 0x74, 0x41, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a,
-	0x08, 0x52, 0x6f, 0x6f, 0x74, 0x43, 0x65, 0x72, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x08, 0x52, 0x6f, 0x6f, 0x74, 0x43, 0x65, 0x72, 0x74, 0x12, 0x2c, 0x0a, 0x11, 0x49, 0x6e, 0x74,
-	0x65, 0x72, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x65, 0x72, 0x74, 0x73, 0x18, 0x09,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6d, 0x65, 0x64, 0x69, 0x61,
-	0x74, 0x65, 0x43, 0x65, 0x72, 0x74, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x69, 0x67, 0x6e, 0x69,
-	0x6e, 0x67, 0x43, 0x65, 0x72, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x53, 0x69,
-	0x67, 0x6e, 0x69, 0x6e, 0x67, 0x43, 0x65, 0x72, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x69, 0x67,
-	0x6e, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53,
-	0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x63, 0x74,
-	0x69, 0x76, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x41, 0x63, 0x74, 0x69, 0x76,
-	0x65, 0x12, 0x3e, 0x0a, 0x0c, 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x64, 0x4f, 0x75, 0x74, 0x41,
-	0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74,
-	0x61, 0x6d, 0x70, 0x52, 0x0c, 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x64, 0x4f, 0x75, 0x74, 0x41,
-	0x74, 0x12, 0x26, 0x0a, 0x0e, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x54,
-	0x79, 0x70, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x50, 0x72, 0x69, 0x76, 0x61,
-	0x74, 0x65, 0x4b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x50, 0x72, 0x69,
-	0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x69, 0x74, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0e, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x69, 0x74,
-	0x73, 0x12, 0x49, 0x0a, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x10,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65,
-	0x78, 0x52, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x22, 0xa5, 0x05, 0x0a,
-	0x0a, 0x49, 0x73, 0x73, 0x75, 0x65, 0x64, 0x43, 0x65, 0x72, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x53,
-	0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0c, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12,
-	0x18, 0x0a, 0x07, 0x43, 0x65, 0x72, 0x74, 0x50, 0x45, 0x4d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x07, 0x43, 0x65, 0x72, 0x74, 0x50, 0x45, 0x4d, 0x12, 0x24, 0x0a, 0x0d, 0x50, 0x72, 0x69,
-	0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x50, 0x45, 0x4d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0d, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x50, 0x45, 0x4d, 0x12,
-	0x18, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x55, 0x52, 0x49, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x55, 0x52, 0x49, 0x12, 0x14, 0x0a, 0x05, 0x41, 0x67, 0x65,
-	0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12,
-	0x1a, 0x0a, 0x08, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x55, 0x52, 0x49, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x55, 0x52, 0x49, 0x12, 0x12, 0x0a, 0x04, 0x4b,
-	0x69, 0x6e, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x12,
-	0x18, 0x0a, 0x07, 0x4b, 0x69, 0x6e, 0x64, 0x55, 0x52, 0x49, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x07, 0x4b, 0x69, 0x6e, 0x64, 0x55, 0x52, 0x49, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x55, 0x52, 0x49, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x53, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x55, 0x52, 0x49, 0x12, 0x2a, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6b, 0x6c,
-	0x6f, 0x61, 0x64, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x0f, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x10, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x49, 0x64, 0x65, 0x6e, 0x74,
-	0x69, 0x74, 0x79, 0x12, 0x30, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x49,
-	0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x52, 0x49, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x13, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x55, 0x52, 0x49, 0x12, 0x3a, 0x0a, 0x0a, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x41, 0x66,
-	0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65,
-	0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x41, 0x66, 0x74, 0x65,
-	0x72, 0x12, 0x3c, 0x0a, 0x0b, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65,
-	0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
-	0x6d, 0x70, 0x52, 0x0b, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12,
-	0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74,
-	0x61, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72,
-	0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72,
-	0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x49, 0x0a, 0x09, 0x52, 0x61, 0x66,
-	0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
-	0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49,
-	0x6e, 0x64, 0x65, 0x78, 0x42, 0x92, 0x02, 0x0a, 0x25, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x42, 0x0c,
-	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x43, 0xaa, 0x02, 0x21, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0xca, 0x02,
-	0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0xe2, 0x02, 0x2d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x43,
-	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0xea, 0x02, 0x24, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
-}
-
-var (
-	file_private_pbconnect_connect_proto_rawDescOnce sync.Once
-	file_private_pbconnect_connect_proto_rawDescData = file_private_pbconnect_connect_proto_rawDesc
-)
-
-func file_private_pbconnect_connect_proto_rawDescGZIP() []byte {
-	file_private_pbconnect_connect_proto_rawDescOnce.Do(func() {
-		file_private_pbconnect_connect_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbconnect_connect_proto_rawDescData)
-	})
-	return file_private_pbconnect_connect_proto_rawDescData
-}
-
-var file_private_pbconnect_connect_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_private_pbconnect_connect_proto_goTypes = []interface{}{
-	(*CARoots)(nil),                 // 0: hashicorp.consul.internal.connect.CARoots
-	(*CARoot)(nil),                  // 1: hashicorp.consul.internal.connect.CARoot
-	(*IssuedCert)(nil),              // 2: hashicorp.consul.internal.connect.IssuedCert
-	(*pbcommon.QueryMeta)(nil),      // 3: hashicorp.consul.internal.common.QueryMeta
-	(*timestamppb.Timestamp)(nil),   // 4: google.protobuf.Timestamp
-	(*pbcommon.RaftIndex)(nil),      // 5: hashicorp.consul.internal.common.RaftIndex
-	(*pbcommon.EnterpriseMeta)(nil), // 6: hashicorp.consul.internal.common.EnterpriseMeta
-}
-var file_private_pbconnect_connect_proto_depIdxs = []int32{
-	1,  // 0: hashicorp.consul.internal.connect.CARoots.Roots:type_name -> hashicorp.consul.internal.connect.CARoot
-	3,  // 1: hashicorp.consul.internal.connect.CARoots.QueryMeta:type_name -> hashicorp.consul.internal.common.QueryMeta
-	4,  // 2: hashicorp.consul.internal.connect.CARoot.NotBefore:type_name -> google.protobuf.Timestamp
-	4,  // 3: hashicorp.consul.internal.connect.CARoot.NotAfter:type_name -> google.protobuf.Timestamp
-	4,  // 4: hashicorp.consul.internal.connect.CARoot.RotatedOutAt:type_name -> google.protobuf.Timestamp
-	5,  // 5: hashicorp.consul.internal.connect.CARoot.RaftIndex:type_name -> hashicorp.consul.internal.common.RaftIndex
-	4,  // 6: hashicorp.consul.internal.connect.IssuedCert.ValidAfter:type_name -> google.protobuf.Timestamp
-	4,  // 7: hashicorp.consul.internal.connect.IssuedCert.ValidBefore:type_name -> google.protobuf.Timestamp
-	6,  // 8: hashicorp.consul.internal.connect.IssuedCert.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
-	5,  // 9: hashicorp.consul.internal.connect.IssuedCert.RaftIndex:type_name -> hashicorp.consul.internal.common.RaftIndex
-	10, // [10:10] is the sub-list for method output_type
-	10, // [10:10] is the sub-list for method input_type
-	10, // [10:10] is the sub-list for extension type_name
-	10, // [10:10] is the sub-list for extension extendee
-	0,  // [0:10] is the sub-list for field type_name
-}
-
-func init() { file_private_pbconnect_connect_proto_init() }
-func file_private_pbconnect_connect_proto_init() {
-	if File_private_pbconnect_connect_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbconnect_connect_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CARoots); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconnect_connect_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CARoot); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbconnect_connect_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IssuedCert); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbconnect_connect_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   3,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_private_pbconnect_connect_proto_goTypes,
-		DependencyIndexes: file_private_pbconnect_connect_proto_depIdxs,
-		MessageInfos:      file_private_pbconnect_connect_proto_msgTypes,
-	}.Build()
-	File_private_pbconnect_connect_proto = out.File
-	file_private_pbconnect_connect_proto_rawDesc = nil
-	file_private_pbconnect_connect_proto_goTypes = nil
-	file_private_pbconnect_connect_proto_depIdxs = nil
-}
diff --git a/proto/private/pbdemo/v1/demo.pb.binary.go b/proto/private/pbdemo/v1/demo.pb.binary.go
deleted file mode 100644
index 649e4c5fbb8fc..0000000000000
--- a/proto/private/pbdemo/v1/demo.pb.binary.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbdemo/v1/demo.proto
-
-package demov1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Executive) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Executive) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *RecordLabel) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *RecordLabel) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Artist) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Artist) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Album) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Album) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Concept) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Concept) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto/private/pbdemo/v1/demo.pb.go b/proto/private/pbdemo/v1/demo.pb.go
deleted file mode 100644
index cb3e2b8cd3ff2..0000000000000
--- a/proto/private/pbdemo/v1/demo.pb.go
+++ /dev/null
@@ -1,579 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbdemo/v1/demo.proto
-
-// This package contains fake resource types, which are useful for working on
-// Consul's generic storage APIs.
-
-package demov1
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Genre int32
-
-const (
-	Genre_GENRE_UNSPECIFIED Genre = 0
-	Genre_GENRE_JAZZ        Genre = 1
-	Genre_GENRE_FOLK        Genre = 2
-	Genre_GENRE_POP         Genre = 3
-	Genre_GENRE_METAL       Genre = 4
-	Genre_GENRE_PUNK        Genre = 5
-	Genre_GENRE_BLUES       Genre = 6
-	Genre_GENRE_R_AND_B     Genre = 7
-	Genre_GENRE_COUNTRY     Genre = 8
-	Genre_GENRE_DISCO       Genre = 9
-	Genre_GENRE_SKA         Genre = 10
-	Genre_GENRE_HIP_HOP     Genre = 11
-	Genre_GENRE_INDIE       Genre = 12
-)
-
-// Enum value maps for Genre.
-var (
-	Genre_name = map[int32]string{
-		0:  "GENRE_UNSPECIFIED",
-		1:  "GENRE_JAZZ",
-		2:  "GENRE_FOLK",
-		3:  "GENRE_POP",
-		4:  "GENRE_METAL",
-		5:  "GENRE_PUNK",
-		6:  "GENRE_BLUES",
-		7:  "GENRE_R_AND_B",
-		8:  "GENRE_COUNTRY",
-		9:  "GENRE_DISCO",
-		10: "GENRE_SKA",
-		11: "GENRE_HIP_HOP",
-		12: "GENRE_INDIE",
-	}
-	Genre_value = map[string]int32{
-		"GENRE_UNSPECIFIED": 0,
-		"GENRE_JAZZ":        1,
-		"GENRE_FOLK":        2,
-		"GENRE_POP":         3,
-		"GENRE_METAL":       4,
-		"GENRE_PUNK":        5,
-		"GENRE_BLUES":       6,
-		"GENRE_R_AND_B":     7,
-		"GENRE_COUNTRY":     8,
-		"GENRE_DISCO":       9,
-		"GENRE_SKA":         10,
-		"GENRE_HIP_HOP":     11,
-		"GENRE_INDIE":       12,
-	}
-)
-
-func (x Genre) Enum() *Genre {
-	p := new(Genre)
-	*p = x
-	return p
-}
-
-func (x Genre) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Genre) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbdemo_v1_demo_proto_enumTypes[0].Descriptor()
-}
-
-func (Genre) Type() protoreflect.EnumType {
-	return &file_private_pbdemo_v1_demo_proto_enumTypes[0]
-}
-
-func (x Genre) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Genre.Descriptor instead.
-func (Genre) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbdemo_v1_demo_proto_rawDescGZIP(), []int{0}
-}
-
-// Cluster scoped resource.
-type Executive struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Position string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"`
-}
-
-func (x *Executive) Reset() {
-	*x = Executive{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbdemo_v1_demo_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Executive) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Executive) ProtoMessage() {}
-
-func (x *Executive) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbdemo_v1_demo_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Executive.ProtoReflect.Descriptor instead.
-func (*Executive) Descriptor() ([]byte, []int) {
-	return file_private_pbdemo_v1_demo_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Executive) GetPosition() string {
-	if x != nil {
-		return x.Position
-	}
-	return ""
-}
-
-// Partition scoped resource.
-type RecordLabel struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name        string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
-}
-
-func (x *RecordLabel) Reset() {
-	*x = RecordLabel{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbdemo_v1_demo_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RecordLabel) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RecordLabel) ProtoMessage() {}
-
-func (x *RecordLabel) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbdemo_v1_demo_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RecordLabel.ProtoReflect.Descriptor instead.
-func (*RecordLabel) Descriptor() ([]byte, []int) {
-	return file_private_pbdemo_v1_demo_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *RecordLabel) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *RecordLabel) GetDescription() string {
-	if x != nil {
-		return x.Description
-	}
-	return ""
-}
-
-// Namespace scoped resource.
-type Artist struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name         string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Description  string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
-	Genre        Genre  `protobuf:"varint,3,opt,name=genre,proto3,enum=hashicorp.consul.internal.demo.v1.Genre" json:"genre,omitempty"`
-	GroupMembers int32  `protobuf:"varint,4,opt,name=group_members,json=groupMembers,proto3" json:"group_members,omitempty"`
-}
-
-func (x *Artist) Reset() {
-	*x = Artist{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbdemo_v1_demo_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Artist) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Artist) ProtoMessage() {}
-
-func (x *Artist) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbdemo_v1_demo_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Artist.ProtoReflect.Descriptor instead.
-func (*Artist) Descriptor() ([]byte, []int) {
-	return file_private_pbdemo_v1_demo_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *Artist) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *Artist) GetDescription() string {
-	if x != nil {
-		return x.Description
-	}
-	return ""
-}
-
-func (x *Artist) GetGenre() Genre {
-	if x != nil {
-		return x.Genre
-	}
-	return Genre_GENRE_UNSPECIFIED
-}
-
-func (x *Artist) GetGroupMembers() int32 {
-	if x != nil {
-		return x.GroupMembers
-	}
-	return 0
-}
-
-type Album struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name                string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	YearOfRelease       int32    `protobuf:"varint,2,opt,name=year_of_release,json=yearOfRelease,proto3" json:"year_of_release,omitempty"`
-	CriticallyAcclaimed bool     `protobuf:"varint,3,opt,name=critically_acclaimed,json=criticallyAcclaimed,proto3" json:"critically_acclaimed,omitempty"`
-	Tracks              []string `protobuf:"bytes,4,rep,name=tracks,proto3" json:"tracks,omitempty"`
-}
-
-func (x *Album) Reset() {
-	*x = Album{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbdemo_v1_demo_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Album) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Album) ProtoMessage() {}
-
-func (x *Album) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbdemo_v1_demo_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Album.ProtoReflect.Descriptor instead.
-func (*Album) Descriptor() ([]byte, []int) {
-	return file_private_pbdemo_v1_demo_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *Album) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *Album) GetYearOfRelease() int32 {
-	if x != nil {
-		return x.YearOfRelease
-	}
-	return 0
-}
-
-func (x *Album) GetCriticallyAcclaimed() bool {
-	if x != nil {
-		return x.CriticallyAcclaimed
-	}
-	return false
-}
-
-func (x *Album) GetTracks() []string {
-	if x != nil {
-		return x.Tracks
-	}
-	return nil
-}
-
-type Concept struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *Concept) Reset() {
-	*x = Concept{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbdemo_v1_demo_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Concept) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Concept) ProtoMessage() {}
-
-func (x *Concept) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbdemo_v1_demo_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Concept.ProtoReflect.Descriptor instead.
-func (*Concept) Descriptor() ([]byte, []int) {
-	return file_private_pbdemo_v1_demo_proto_rawDescGZIP(), []int{4}
-}
-
-var File_private_pbdemo_v1_demo_proto protoreflect.FileDescriptor
-
-var file_private_pbdemo_v1_demo_proto_rawDesc = []byte{
-	0x0a, 0x1c, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x64, 0x65, 0x6d, 0x6f,
-	0x2f, 0x76, 0x31, 0x2f, 0x64, 0x65, 0x6d, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x64, 0x65, 0x6d, 0x6f, 0x2e, 0x76,
-	0x31, 0x22, 0x27, 0x0a, 0x09, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x76, 0x65, 0x12, 0x1a,
-	0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x43, 0x0a, 0x0b, 0x52, 0x65,
-	0x63, 0x6f, 0x72, 0x64, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a,
-	0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22,
-	0xa3, 0x01, 0x0a, 0x06, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20,
-	0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x3e, 0x0a, 0x05, 0x67, 0x65, 0x6e, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x28, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x64, 0x65, 0x6d, 0x6f,
-	0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x6e, 0x72, 0x65, 0x52, 0x05, 0x67, 0x65, 0x6e, 0x72, 0x65,
-	0x12, 0x23, 0x0a, 0x0d, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72,
-	0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65,
-	0x6d, 0x62, 0x65, 0x72, 0x73, 0x22, 0x8e, 0x01, 0x0a, 0x05, 0x41, 0x6c, 0x62, 0x75, 0x6d, 0x12,
-	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0f, 0x79, 0x65, 0x61, 0x72, 0x5f, 0x6f, 0x66, 0x5f, 0x72,
-	0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x79, 0x65,
-	0x61, 0x72, 0x4f, 0x66, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x31, 0x0a, 0x14, 0x63,
-	0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x6c, 0x79, 0x5f, 0x61, 0x63, 0x63, 0x6c, 0x61, 0x69,
-	0x6d, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x63, 0x72, 0x69, 0x74, 0x69,
-	0x63, 0x61, 0x6c, 0x6c, 0x79, 0x41, 0x63, 0x63, 0x6c, 0x61, 0x69, 0x6d, 0x65, 0x64, 0x12, 0x16,
-	0x0a, 0x06, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06,
-	0x74, 0x72, 0x61, 0x63, 0x6b, 0x73, 0x22, 0x09, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x70,
-	0x74, 0x2a, 0xe9, 0x01, 0x0a, 0x05, 0x47, 0x65, 0x6e, 0x72, 0x65, 0x12, 0x15, 0x0a, 0x11, 0x47,
-	0x45, 0x4e, 0x52, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44,
-	0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x4a, 0x41, 0x5a, 0x5a,
-	0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x46, 0x4f, 0x4c, 0x4b,
-	0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x50, 0x4f, 0x50, 0x10,
-	0x03, 0x12, 0x0f, 0x0a, 0x0b, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x4d, 0x45, 0x54, 0x41, 0x4c,
-	0x10, 0x04, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x50, 0x55, 0x4e, 0x4b,
-	0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x42, 0x4c, 0x55, 0x45,
-	0x53, 0x10, 0x06, 0x12, 0x11, 0x0a, 0x0d, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x52, 0x5f, 0x41,
-	0x4e, 0x44, 0x5f, 0x42, 0x10, 0x07, 0x12, 0x11, 0x0a, 0x0d, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f,
-	0x43, 0x4f, 0x55, 0x4e, 0x54, 0x52, 0x59, 0x10, 0x08, 0x12, 0x0f, 0x0a, 0x0b, 0x47, 0x45, 0x4e,
-	0x52, 0x45, 0x5f, 0x44, 0x49, 0x53, 0x43, 0x4f, 0x10, 0x09, 0x12, 0x0d, 0x0a, 0x09, 0x47, 0x45,
-	0x4e, 0x52, 0x45, 0x5f, 0x53, 0x4b, 0x41, 0x10, 0x0a, 0x12, 0x11, 0x0a, 0x0d, 0x47, 0x45, 0x4e,
-	0x52, 0x45, 0x5f, 0x48, 0x49, 0x50, 0x5f, 0x48, 0x4f, 0x50, 0x10, 0x0b, 0x12, 0x0f, 0x0a, 0x0b,
-	0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x49, 0x4e, 0x44, 0x49, 0x45, 0x10, 0x0c, 0x42, 0x97, 0x02,
-	0x0a, 0x25, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
-	0x64, 0x65, 0x6d, 0x6f, 0x2e, 0x76, 0x31, 0x42, 0x09, 0x44, 0x65, 0x6d, 0x6f, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f,
-	0x70, 0x62, 0x64, 0x65, 0x6d, 0x6f, 0x2f, 0x76, 0x31, 0x3b, 0x64, 0x65, 0x6d, 0x6f, 0x76, 0x31,
-	0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x44, 0xaa, 0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x44, 0x65, 0x6d, 0x6f, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x21, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x44, 0x65, 0x6d, 0x6f, 0x5c, 0x56, 0x31, 0xe2,
-	0x02, 0x2d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x44, 0x65, 0x6d, 0x6f,
-	0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
-	0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x44,
-	0x65, 0x6d, 0x6f, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pbdemo_v1_demo_proto_rawDescOnce sync.Once
-	file_private_pbdemo_v1_demo_proto_rawDescData = file_private_pbdemo_v1_demo_proto_rawDesc
-)
-
-func file_private_pbdemo_v1_demo_proto_rawDescGZIP() []byte {
-	file_private_pbdemo_v1_demo_proto_rawDescOnce.Do(func() {
-		file_private_pbdemo_v1_demo_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbdemo_v1_demo_proto_rawDescData)
-	})
-	return file_private_pbdemo_v1_demo_proto_rawDescData
-}
-
-var file_private_pbdemo_v1_demo_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_private_pbdemo_v1_demo_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_private_pbdemo_v1_demo_proto_goTypes = []interface{}{
-	(Genre)(0),          // 0: hashicorp.consul.internal.demo.v1.Genre
-	(*Executive)(nil),   // 1: hashicorp.consul.internal.demo.v1.Executive
-	(*RecordLabel)(nil), // 2: hashicorp.consul.internal.demo.v1.RecordLabel
-	(*Artist)(nil),      // 3: hashicorp.consul.internal.demo.v1.Artist
-	(*Album)(nil),       // 4: hashicorp.consul.internal.demo.v1.Album
-	(*Concept)(nil),     // 5: hashicorp.consul.internal.demo.v1.Concept
-}
-var file_private_pbdemo_v1_demo_proto_depIdxs = []int32{
-	0, // 0: hashicorp.consul.internal.demo.v1.Artist.genre:type_name -> hashicorp.consul.internal.demo.v1.Genre
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
-}
-
-func init() { file_private_pbdemo_v1_demo_proto_init() }
-func file_private_pbdemo_v1_demo_proto_init() {
-	if File_private_pbdemo_v1_demo_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbdemo_v1_demo_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Executive); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbdemo_v1_demo_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RecordLabel); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbdemo_v1_demo_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Artist); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbdemo_v1_demo_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Album); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbdemo_v1_demo_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Concept); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbdemo_v1_demo_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   5,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_private_pbdemo_v1_demo_proto_goTypes,
-		DependencyIndexes: file_private_pbdemo_v1_demo_proto_depIdxs,
-		EnumInfos:         file_private_pbdemo_v1_demo_proto_enumTypes,
-		MessageInfos:      file_private_pbdemo_v1_demo_proto_msgTypes,
-	}.Build()
-	File_private_pbdemo_v1_demo_proto = out.File
-	file_private_pbdemo_v1_demo_proto_rawDesc = nil
-	file_private_pbdemo_v1_demo_proto_goTypes = nil
-	file_private_pbdemo_v1_demo_proto_depIdxs = nil
-}
diff --git a/proto/private/pbdemo/v1/demo.proto b/proto/private/pbdemo/v1/demo.proto
deleted file mode 100644
index be2f393aafde3..0000000000000
--- a/proto/private/pbdemo/v1/demo.proto
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-// This package contains fake resource types, which are useful for working on
-// Consul's generic storage APIs.
-package hashicorp.consul.internal.demo.v1;
-
-// Cluster scoped resource.
-message Executive {
-  string position = 1;
-}
-
-// Partition scoped resource.
-message RecordLabel {
-  string name = 1;
-  string description = 2;
-}
-
-// Namespace scoped resource.
-message Artist {
-  string name = 1;
-  string description = 2;
-  Genre genre = 3;
-  int32 group_members = 4;
-}
-
-enum Genre {
-  GENRE_UNSPECIFIED = 0;
-  GENRE_JAZZ = 1;
-  GENRE_FOLK = 2;
-  GENRE_POP = 3;
-  GENRE_METAL = 4;
-  GENRE_PUNK = 5;
-  GENRE_BLUES = 6;
-  GENRE_R_AND_B = 7;
-  GENRE_COUNTRY = 8;
-  GENRE_DISCO = 9;
-  GENRE_SKA = 10;
-  GENRE_HIP_HOP = 11;
-  GENRE_INDIE = 12;
-}
-
-message Album {
-  string name = 1;
-  int32 year_of_release = 2;
-  bool critically_acclaimed = 3;
-  repeated string tracks = 4;
-}
-
-message Concept {}
diff --git a/proto/private/pbdemo/v2/demo.pb.binary.go b/proto/private/pbdemo/v2/demo.pb.binary.go
deleted file mode 100644
index 084f70d5b7c21..0000000000000
--- a/proto/private/pbdemo/v2/demo.pb.binary.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbdemo/v2/demo.proto
-
-package demov2
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Artist) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Artist) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Album) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Album) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto/private/pbdemo/v2/demo.pb.go b/proto/private/pbdemo/v2/demo.pb.go
deleted file mode 100644
index a4c52a99d6a6c..0000000000000
--- a/proto/private/pbdemo/v2/demo.pb.go
+++ /dev/null
@@ -1,390 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbdemo/v2/demo.proto
-
-// This package contains fake resource types, which are useful for working on
-// Consul's generic storage APIs.
-
-package demov2
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type Genre int32
-
-const (
-	Genre_GENRE_UNSPECIFIED Genre = 0
-	Genre_GENRE_JAZZ        Genre = 1
-	Genre_GENRE_FOLK        Genre = 2
-	Genre_GENRE_POP         Genre = 3
-	Genre_GENRE_METAL       Genre = 4
-	Genre_GENRE_PUNK        Genre = 5
-	Genre_GENRE_BLUES       Genre = 6
-	Genre_GENRE_R_AND_B     Genre = 7
-	Genre_GENRE_COUNTRY     Genre = 8
-	Genre_GENRE_DISCO       Genre = 9
-	Genre_GENRE_SKA         Genre = 10
-	Genre_GENRE_HIP_HOP     Genre = 11
-	Genre_GENRE_INDIE       Genre = 12
-)
-
-// Enum value maps for Genre.
-var (
-	Genre_name = map[int32]string{
-		0:  "GENRE_UNSPECIFIED",
-		1:  "GENRE_JAZZ",
-		2:  "GENRE_FOLK",
-		3:  "GENRE_POP",
-		4:  "GENRE_METAL",
-		5:  "GENRE_PUNK",
-		6:  "GENRE_BLUES",
-		7:  "GENRE_R_AND_B",
-		8:  "GENRE_COUNTRY",
-		9:  "GENRE_DISCO",
-		10: "GENRE_SKA",
-		11: "GENRE_HIP_HOP",
-		12: "GENRE_INDIE",
-	}
-	Genre_value = map[string]int32{
-		"GENRE_UNSPECIFIED": 0,
-		"GENRE_JAZZ":        1,
-		"GENRE_FOLK":        2,
-		"GENRE_POP":         3,
-		"GENRE_METAL":       4,
-		"GENRE_PUNK":        5,
-		"GENRE_BLUES":       6,
-		"GENRE_R_AND_B":     7,
-		"GENRE_COUNTRY":     8,
-		"GENRE_DISCO":       9,
-		"GENRE_SKA":         10,
-		"GENRE_HIP_HOP":     11,
-		"GENRE_INDIE":       12,
-	}
-)
-
-func (x Genre) Enum() *Genre {
-	p := new(Genre)
-	*p = x
-	return p
-}
-
-func (x Genre) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Genre) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbdemo_v2_demo_proto_enumTypes[0].Descriptor()
-}
-
-func (Genre) Type() protoreflect.EnumType {
-	return &file_private_pbdemo_v2_demo_proto_enumTypes[0]
-}
-
-func (x Genre) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Genre.Descriptor instead.
-func (Genre) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbdemo_v2_demo_proto_rawDescGZIP(), []int{0}
-}
-
-type Artist struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name         string            `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Genre        Genre             `protobuf:"varint,2,opt,name=genre,proto3,enum=hashicorp.consul.internal.demo.v2.Genre" json:"genre,omitempty"`
-	GroupMembers map[string]string `protobuf:"bytes,3,rep,name=group_members,json=groupMembers,proto3" json:"group_members,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (x *Artist) Reset() {
-	*x = Artist{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbdemo_v2_demo_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Artist) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Artist) ProtoMessage() {}
-
-func (x *Artist) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbdemo_v2_demo_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Artist.ProtoReflect.Descriptor instead.
-func (*Artist) Descriptor() ([]byte, []int) {
-	return file_private_pbdemo_v2_demo_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Artist) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *Artist) GetGenre() Genre {
-	if x != nil {
-		return x.Genre
-	}
-	return Genre_GENRE_UNSPECIFIED
-}
-
-func (x *Artist) GetGroupMembers() map[string]string {
-	if x != nil {
-		return x.GroupMembers
-	}
-	return nil
-}
-
-type Album struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Title              string   `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
-	YearOfRelease      int32    `protobuf:"varint,2,opt,name=year_of_release,json=yearOfRelease,proto3" json:"year_of_release,omitempty"`
-	CriticallyAclaimed bool     `protobuf:"varint,3,opt,name=critically_aclaimed,json=criticallyAclaimed,proto3" json:"critically_aclaimed,omitempty"`
-	Tracks             []string `protobuf:"bytes,4,rep,name=tracks,proto3" json:"tracks,omitempty"`
-}
-
-func (x *Album) Reset() {
-	*x = Album{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbdemo_v2_demo_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Album) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Album) ProtoMessage() {}
-
-func (x *Album) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbdemo_v2_demo_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Album.ProtoReflect.Descriptor instead.
-func (*Album) Descriptor() ([]byte, []int) {
-	return file_private_pbdemo_v2_demo_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Album) GetTitle() string {
-	if x != nil {
-		return x.Title
-	}
-	return ""
-}
-
-func (x *Album) GetYearOfRelease() int32 {
-	if x != nil {
-		return x.YearOfRelease
-	}
-	return 0
-}
-
-func (x *Album) GetCriticallyAclaimed() bool {
-	if x != nil {
-		return x.CriticallyAclaimed
-	}
-	return false
-}
-
-func (x *Album) GetTracks() []string {
-	if x != nil {
-		return x.Tracks
-	}
-	return nil
-}
-
-var File_private_pbdemo_v2_demo_proto protoreflect.FileDescriptor
-
-var file_private_pbdemo_v2_demo_proto_rawDesc = []byte{
-	0x0a, 0x1c, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x64, 0x65, 0x6d, 0x6f,
-	0x2f, 0x76, 0x32, 0x2f, 0x64, 0x65, 0x6d, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x64, 0x65, 0x6d, 0x6f, 0x2e, 0x76,
-	0x32, 0x22, 0xff, 0x01, 0x0a, 0x06, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x12, 0x3e, 0x0a, 0x05, 0x67, 0x65, 0x6e, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x28, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x64, 0x65, 0x6d, 0x6f,
-	0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x6e, 0x72, 0x65, 0x52, 0x05, 0x67, 0x65, 0x6e, 0x72, 0x65,
-	0x12, 0x60, 0x0a, 0x0d, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72,
-	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x64, 0x65, 0x6d, 0x6f, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x72, 0x74, 0x69,
-	0x73, 0x74, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65,
-	0x72, 0x73, 0x1a, 0x3f, 0x0a, 0x11, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65,
-	0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x22, 0x8e, 0x01, 0x0a, 0x05, 0x41, 0x6c, 0x62, 0x75, 0x6d, 0x12, 0x14, 0x0a,
-	0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69,
-	0x74, 0x6c, 0x65, 0x12, 0x26, 0x0a, 0x0f, 0x79, 0x65, 0x61, 0x72, 0x5f, 0x6f, 0x66, 0x5f, 0x72,
-	0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x79, 0x65,
-	0x61, 0x72, 0x4f, 0x66, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x13, 0x63,
-	0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x6c, 0x79, 0x5f, 0x61, 0x63, 0x6c, 0x61, 0x69, 0x6d,
-	0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x63, 0x72, 0x69, 0x74, 0x69, 0x63,
-	0x61, 0x6c, 0x6c, 0x79, 0x41, 0x63, 0x6c, 0x61, 0x69, 0x6d, 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06,
-	0x74, 0x72, 0x61, 0x63, 0x6b, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x74, 0x72,
-	0x61, 0x63, 0x6b, 0x73, 0x2a, 0xe9, 0x01, 0x0a, 0x05, 0x47, 0x65, 0x6e, 0x72, 0x65, 0x12, 0x15,
-	0x0a, 0x11, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46,
-	0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x4a,
-	0x41, 0x5a, 0x5a, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x46,
-	0x4f, 0x4c, 0x4b, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x50,
-	0x4f, 0x50, 0x10, 0x03, 0x12, 0x0f, 0x0a, 0x0b, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x4d, 0x45,
-	0x54, 0x41, 0x4c, 0x10, 0x04, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x50,
-	0x55, 0x4e, 0x4b, 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x42,
-	0x4c, 0x55, 0x45, 0x53, 0x10, 0x06, 0x12, 0x11, 0x0a, 0x0d, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f,
-	0x52, 0x5f, 0x41, 0x4e, 0x44, 0x5f, 0x42, 0x10, 0x07, 0x12, 0x11, 0x0a, 0x0d, 0x47, 0x45, 0x4e,
-	0x52, 0x45, 0x5f, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x52, 0x59, 0x10, 0x08, 0x12, 0x0f, 0x0a, 0x0b,
-	0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x44, 0x49, 0x53, 0x43, 0x4f, 0x10, 0x09, 0x12, 0x0d, 0x0a,
-	0x09, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x53, 0x4b, 0x41, 0x10, 0x0a, 0x12, 0x11, 0x0a, 0x0d,
-	0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x48, 0x49, 0x50, 0x5f, 0x48, 0x4f, 0x50, 0x10, 0x0b, 0x12,
-	0x0f, 0x0a, 0x0b, 0x47, 0x45, 0x4e, 0x52, 0x45, 0x5f, 0x49, 0x4e, 0x44, 0x49, 0x45, 0x10, 0x0c,
-	0x42, 0x97, 0x02, 0x0a, 0x25, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x64, 0x65, 0x6d, 0x6f, 0x2e, 0x76, 0x32, 0x42, 0x09, 0x44, 0x65, 0x6d, 0x6f,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x69, 0x76, 0x61,
-	0x74, 0x65, 0x2f, 0x70, 0x62, 0x64, 0x65, 0x6d, 0x6f, 0x2f, 0x76, 0x32, 0x3b, 0x64, 0x65, 0x6d,
-	0x6f, 0x76, 0x32, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x44, 0xaa, 0x02, 0x21, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x44, 0x65, 0x6d, 0x6f, 0x2e, 0x56, 0x32, 0xca, 0x02,
-	0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x44, 0x65, 0x6d, 0x6f, 0x5c,
-	0x56, 0x32, 0xe2, 0x02, 0x2d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x44,
-	0x65, 0x6d, 0x6f, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0xea, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x3a, 0x3a, 0x44, 0x65, 0x6d, 0x6f, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
-}
-
-var (
-	file_private_pbdemo_v2_demo_proto_rawDescOnce sync.Once
-	file_private_pbdemo_v2_demo_proto_rawDescData = file_private_pbdemo_v2_demo_proto_rawDesc
-)
-
-func file_private_pbdemo_v2_demo_proto_rawDescGZIP() []byte {
-	file_private_pbdemo_v2_demo_proto_rawDescOnce.Do(func() {
-		file_private_pbdemo_v2_demo_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbdemo_v2_demo_proto_rawDescData)
-	})
-	return file_private_pbdemo_v2_demo_proto_rawDescData
-}
-
-var file_private_pbdemo_v2_demo_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_private_pbdemo_v2_demo_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_private_pbdemo_v2_demo_proto_goTypes = []interface{}{
-	(Genre)(0),     // 0: hashicorp.consul.internal.demo.v2.Genre
-	(*Artist)(nil), // 1: hashicorp.consul.internal.demo.v2.Artist
-	(*Album)(nil),  // 2: hashicorp.consul.internal.demo.v2.Album
-	nil,            // 3: hashicorp.consul.internal.demo.v2.Artist.GroupMembersEntry
-}
-var file_private_pbdemo_v2_demo_proto_depIdxs = []int32{
-	0, // 0: hashicorp.consul.internal.demo.v2.Artist.genre:type_name -> hashicorp.consul.internal.demo.v2.Genre
-	3, // 1: hashicorp.consul.internal.demo.v2.Artist.group_members:type_name -> hashicorp.consul.internal.demo.v2.Artist.GroupMembersEntry
-	2, // [2:2] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
-}
-
-func init() { file_private_pbdemo_v2_demo_proto_init() }
-func file_private_pbdemo_v2_demo_proto_init() {
-	if File_private_pbdemo_v2_demo_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbdemo_v2_demo_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Artist); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbdemo_v2_demo_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Album); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbdemo_v2_demo_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   3,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_private_pbdemo_v2_demo_proto_goTypes,
-		DependencyIndexes: file_private_pbdemo_v2_demo_proto_depIdxs,
-		EnumInfos:         file_private_pbdemo_v2_demo_proto_enumTypes,
-		MessageInfos:      file_private_pbdemo_v2_demo_proto_msgTypes,
-	}.Build()
-	File_private_pbdemo_v2_demo_proto = out.File
-	file_private_pbdemo_v2_demo_proto_rawDesc = nil
-	file_private_pbdemo_v2_demo_proto_goTypes = nil
-	file_private_pbdemo_v2_demo_proto_depIdxs = nil
-}
diff --git a/proto/private/pbdemo/v2/demo.proto b/proto/private/pbdemo/v2/demo.proto
deleted file mode 100644
index 546cfe6972611..0000000000000
--- a/proto/private/pbdemo/v2/demo.proto
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-// This package contains fake resource types, which are useful for working on
-// Consul's generic storage APIs.
-package hashicorp.consul.internal.demo.v2;
-
-message Artist {
-  string name = 1;
-  Genre genre = 2;
-  map<string, string> group_members = 3;
-}
-
-enum Genre {
-  GENRE_UNSPECIFIED = 0;
-  GENRE_JAZZ = 1;
-  GENRE_FOLK = 2;
-  GENRE_POP = 3;
-  GENRE_METAL = 4;
-  GENRE_PUNK = 5;
-  GENRE_BLUES = 6;
-  GENRE_R_AND_B = 7;
-  GENRE_COUNTRY = 8;
-  GENRE_DISCO = 9;
-  GENRE_SKA = 10;
-  GENRE_HIP_HOP = 11;
-  GENRE_INDIE = 12;
-}
-
-message Album {
-  string title = 1;
-  int32 year_of_release = 2;
-  bool critically_aclaimed = 3;
-  repeated string tracks = 4;
-}
diff --git a/proto/private/pboperator/operator.pb.go b/proto/private/pboperator/operator.pb.go
deleted file mode 100644
index e7e457bc7389e..0000000000000
--- a/proto/private/pboperator/operator.pb.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pboperator/operator.proto
-
-package pboperator
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/annotations/ratelimit"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type TransferLeaderRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
-}
-
-func (x *TransferLeaderRequest) Reset() {
-	*x = TransferLeaderRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pboperator_operator_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TransferLeaderRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TransferLeaderRequest) ProtoMessage() {}
-
-func (x *TransferLeaderRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pboperator_operator_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TransferLeaderRequest.ProtoReflect.Descriptor instead.
-func (*TransferLeaderRequest) Descriptor() ([]byte, []int) {
-	return file_private_pboperator_operator_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *TransferLeaderRequest) GetID() string {
-	if x != nil {
-		return x.ID
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/api.TransferLeaderResponse
-// output=operator.gen.go
-// name=API
-type TransferLeaderResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// true if the transfer is a success
-	Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"`
-}
-
-func (x *TransferLeaderResponse) Reset() {
-	*x = TransferLeaderResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pboperator_operator_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TransferLeaderResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TransferLeaderResponse) ProtoMessage() {}
-
-func (x *TransferLeaderResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pboperator_operator_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TransferLeaderResponse.ProtoReflect.Descriptor instead.
-func (*TransferLeaderResponse) Descriptor() ([]byte, []int) {
-	return file_private_pboperator_operator_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *TransferLeaderResponse) GetSuccess() bool {
-	if x != nil {
-		return x.Success
-	}
-	return false
-}
-
-var File_private_pboperator_operator_proto protoreflect.FileDescriptor
-
-var file_private_pboperator_operator_proto_rawDesc = []byte{
-	0x0a, 0x21, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x6f, 0x70, 0x65, 0x72,
-	0x61, 0x74, 0x6f, 0x72, 0x2f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x12, 0x22, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x6f,
-	0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x1a, 0x25, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72,
-	0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x27,
-	0x0a, 0x15, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x22, 0x32, 0x0a, 0x16, 0x54, 0x72, 0x61, 0x6e, 0x73,
-	0x66, 0x65, 0x72, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x32, 0xa5, 0x01, 0x0a, 0x0f,
-	0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12,
-	0x91, 0x01, 0x0a, 0x0e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x4c, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x12, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x6f,
-	0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72,
-	0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3a, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74,
-	0x6f, 0x72, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x4c, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08,
-	0x01, 0x10, 0x0a, 0x42, 0x99, 0x02, 0x0a, 0x26, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x42, 0x0d,
-	0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x6f, 0x70, 0x65,
-	0x72, 0x61, 0x74, 0x6f, 0x72, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x4f, 0xaa, 0x02, 0x22, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f,
-	0x72, 0xca, 0x02, 0x22, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x4f, 0x70,
-	0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0xe2, 0x02, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x5c, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x5c, 0x47, 0x50, 0x42, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pboperator_operator_proto_rawDescOnce sync.Once
-	file_private_pboperator_operator_proto_rawDescData = file_private_pboperator_operator_proto_rawDesc
-)
-
-func file_private_pboperator_operator_proto_rawDescGZIP() []byte {
-	file_private_pboperator_operator_proto_rawDescOnce.Do(func() {
-		file_private_pboperator_operator_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pboperator_operator_proto_rawDescData)
-	})
-	return file_private_pboperator_operator_proto_rawDescData
-}
-
-var file_private_pboperator_operator_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_private_pboperator_operator_proto_goTypes = []interface{}{
-	(*TransferLeaderRequest)(nil),  // 0: hashicorp.consul.internal.operator.TransferLeaderRequest
-	(*TransferLeaderResponse)(nil), // 1: hashicorp.consul.internal.operator.TransferLeaderResponse
-}
-var file_private_pboperator_operator_proto_depIdxs = []int32{
-	0, // 0: hashicorp.consul.internal.operator.OperatorService.TransferLeader:input_type -> hashicorp.consul.internal.operator.TransferLeaderRequest
-	1, // 1: hashicorp.consul.internal.operator.OperatorService.TransferLeader:output_type -> hashicorp.consul.internal.operator.TransferLeaderResponse
-	1, // [1:2] is the sub-list for method output_type
-	0, // [0:1] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_private_pboperator_operator_proto_init() }
-func file_private_pboperator_operator_proto_init() {
-	if File_private_pboperator_operator_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pboperator_operator_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TransferLeaderRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pboperator_operator_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TransferLeaderResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pboperator_operator_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_private_pboperator_operator_proto_goTypes,
-		DependencyIndexes: file_private_pboperator_operator_proto_depIdxs,
-		MessageInfos:      file_private_pboperator_operator_proto_msgTypes,
-	}.Build()
-	File_private_pboperator_operator_proto = out.File
-	file_private_pboperator_operator_proto_rawDesc = nil
-	file_private_pboperator_operator_proto_goTypes = nil
-	file_private_pboperator_operator_proto_depIdxs = nil
-}
diff --git a/proto/private/pbpeering/peering.go b/proto/private/pbpeering/peering.go
deleted file mode 100644
index 5759061afce24..0000000000000
--- a/proto/private/pbpeering/peering.go
+++ /dev/null
@@ -1,378 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package pbpeering
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"errors"
-	"fmt"
-	"time"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/timestamppb"
-
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/lib"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-)
-
-// RequestDatacenter implements structs.RPCInfo
-func (req *GenerateTokenRequest) RequestDatacenter() string {
-	// Cross-datacenter requests are not allowed for peering actions because
-	// they rely on WAN-federation.
-	return ""
-}
-
-// RequestDatacenter implements structs.RPCInfo
-func (req *EstablishRequest) RequestDatacenter() string {
-	// Cross-datacenter requests are not allowed for peering actions because
-	// they rely on WAN-federation.
-	return ""
-}
-
-// RequestDatacenter implements structs.RPCInfo
-func (req *PeeringReadRequest) RequestDatacenter() string {
-	// Cross-datacenter requests are not allowed for peering actions because
-	// they rely on WAN-federation.
-	return ""
-}
-
-// RequestDatacenter implements structs.RPCInfo
-func (req *PeeringListRequest) RequestDatacenter() string {
-	// Cross-datacenter requests are not allowed for peering actions because
-	// they rely on WAN-federation.
-	return ""
-}
-
-// RequestDatacenter implements structs.RPCInfo
-func (req *PeeringWriteRequest) RequestDatacenter() string {
-	// Cross-datacenter requests are not allowed for peering actions because
-	// they rely on WAN-federation.
-	return ""
-}
-
-// RequestDatacenter implements structs.RPCInfo
-func (req *PeeringDeleteRequest) RequestDatacenter() string {
-	// Cross-datacenter requests are not allowed for peering actions because
-	// they rely on WAN-federation.
-	return ""
-}
-
-// RequestDatacenter implements structs.RPCInfo
-func (req *TrustBundleReadRequest) RequestDatacenter() string {
-	// Cross-datacenter requests are not allowed for peering actions because
-	// they rely on WAN-federation.
-	return ""
-}
-
-// RequestDatacenter implements structs.RPCInfo
-func (req *TrustBundleListByServiceRequest) RequestDatacenter() string {
-	// Cross-datacenter requests are not allowed for peering actions because
-	// they rely on WAN-federation.
-	return ""
-}
-
-// ShouldDial returns true when the peering was stored via the peering initiation endpoint,
-// AND the peering is not marked as terminated by our peer.
-// If we generated a token for this peer we did not store our server addresses under PeerServerAddresses or ManualServerAddresses.
-// These server addresses are for dialing, and only the peer initiating the peering will do the dialing.
-func (p *Peering) ShouldDial() bool {
-	return len(p.PeerServerAddresses) > 0 || len(p.ManualServerAddresses) > 0
-}
-
-// GetAddressesToDial returns the listing of addresses that should be dialed for the peering.
-// It will ensure that manual addresses take precedence, if any are defined.
-func (p *Peering) GetAddressesToDial() []string {
-	if len(p.ManualServerAddresses) > 0 {
-		return p.ManualServerAddresses
-	}
-	return p.PeerServerAddresses
-}
-
-func (x PeeringState) GoString() string {
-	return x.String()
-}
-
-// ConcatenatedRootPEMs concatenates and returns all PEM-encoded public certificates
-// in a peer's trust bundle.
-func (b *PeeringTrustBundle) ConcatenatedRootPEMs() string {
-	if b == nil {
-		return ""
-	}
-
-	var rootPEMs string
-	for _, pem := range b.RootPEMs {
-		rootPEMs += lib.EnsureTrailingNewline(pem)
-	}
-	return rootPEMs
-}
-
-// enumcover:PeeringState
-func PeeringStateToAPI(s PeeringState) api.PeeringState {
-	switch s {
-	case PeeringState_PENDING:
-		return api.PeeringStatePending
-	case PeeringState_ESTABLISHING:
-		return api.PeeringStateEstablishing
-	case PeeringState_ACTIVE:
-		return api.PeeringStateActive
-	case PeeringState_FAILING:
-		return api.PeeringStateFailing
-	case PeeringState_DELETING:
-		return api.PeeringStateDeleting
-	case PeeringState_TERMINATED:
-		return api.PeeringStateTerminated
-	case PeeringState_UNDEFINED:
-		fallthrough
-	default:
-		return api.PeeringStateUndefined
-	}
-}
-
-// enumcover:api.PeeringState
-func PeeringStateFromAPI(t api.PeeringState) PeeringState {
-	switch t {
-	case api.PeeringStatePending:
-		return PeeringState_PENDING
-	case api.PeeringStateEstablishing:
-		return PeeringState_ESTABLISHING
-	case api.PeeringStateActive:
-		return PeeringState_ACTIVE
-	case api.PeeringStateFailing:
-		return PeeringState_FAILING
-	case api.PeeringStateDeleting:
-		return PeeringState_DELETING
-	case api.PeeringStateTerminated:
-		return PeeringState_TERMINATED
-	case api.PeeringStateUndefined:
-		fallthrough
-	default:
-		return PeeringState_UNDEFINED
-	}
-}
-
-func StreamStatusToAPI(status *StreamStatus) api.PeeringStreamStatus {
-	return api.PeeringStreamStatus{
-		ImportedServices: status.ImportedServices,
-		ExportedServices: status.ExportedServices,
-		LastHeartbeat:    TimePtrFromProto(status.LastHeartbeat),
-		LastReceive:      TimePtrFromProto(status.LastReceive),
-		LastSend:         TimePtrFromProto(status.LastSend),
-	}
-}
-
-func StreamStatusFromAPI(status api.PeeringStreamStatus) *StreamStatus {
-	return &StreamStatus{
-		ImportedServices: status.ImportedServices,
-		ExportedServices: status.ExportedServices,
-		LastHeartbeat:    TimePtrToProto(status.LastHeartbeat),
-		LastReceive:      TimePtrToProto(status.LastReceive),
-		LastSend:         TimePtrToProto(status.LastSend),
-	}
-}
-
-func (p *Peering) IsActive() bool {
-	if p == nil || p.State == PeeringState_TERMINATED {
-		return false
-	}
-	if p.DeletedAt == nil {
-		return true
-	}
-
-	// The minimum protobuf timestamp is the Unix epoch rather than go's zero.
-	return structs.IsZeroProtoTime(p.DeletedAt)
-}
-
-// Validate is a validation helper that checks whether a secret ID is embedded in the container type.
-func (s *SecretsWriteRequest) Validate() error {
-	if s.PeerID == "" {
-		return errors.New("missing peer ID")
-	}
-	switch r := s.Request.(type) {
-	case *SecretsWriteRequest_GenerateToken:
-		if r != nil && r.GenerateToken.GetEstablishmentSecret() != "" {
-			return nil
-		}
-	case *SecretsWriteRequest_Establish:
-		if r != nil && r.Establish.GetActiveStreamSecret() != "" {
-			return nil
-		}
-	case *SecretsWriteRequest_ExchangeSecret:
-		if r != nil && r.ExchangeSecret.GetPendingStreamSecret() != "" {
-			return nil
-		}
-	case *SecretsWriteRequest_PromotePending:
-		if r != nil && r.PromotePending.GetActiveStreamSecret() != "" {
-			return nil
-		}
-	default:
-		return fmt.Errorf("unexpected request type %T", s.Request)
-	}
-
-	return errors.New("missing secret ID")
-}
-
-// TLSDialOption returns the gRPC DialOption to secure the transport if CAPems
-// ara available. If no CAPems were provided in the peering token then the
-// WithInsecure dial option is returned.
-func (p *Peering) TLSDialOption() (grpc.DialOption, error) {
-	//nolint:staticcheck
-	tlsOption := grpc.WithInsecure()
-
-	if len(p.PeerCAPems) > 0 {
-		var haveCerts bool
-		pool := x509.NewCertPool()
-		for _, pem := range p.PeerCAPems {
-			if !pool.AppendCertsFromPEM([]byte(pem)) {
-				return nil, fmt.Errorf("failed to parse PEM %s", pem)
-			}
-			if len(pem) > 0 {
-				haveCerts = true
-			}
-		}
-		if !haveCerts {
-			return nil, fmt.Errorf("failed to build cert pool from peer CA pems")
-		}
-		cfg := tls.Config{
-			ServerName: p.PeerServerName,
-			RootCAs:    pool,
-		}
-		tlsOption = grpc.WithTransportCredentials(credentials.NewTLS(&cfg))
-	}
-	return tlsOption, nil
-}
-
-func (p *Peering) ToAPI() *api.Peering {
-	var t api.Peering
-	PeeringToAPI(p, &t)
-	return &t
-}
-
-// TODO consider using mog for this
-func (resp *PeeringListResponse) ToAPI() []*api.Peering {
-	list := make([]*api.Peering, len(resp.Peerings))
-	for i, p := range resp.Peerings {
-		list[i] = p.ToAPI()
-	}
-	return list
-}
-
-// TODO consider using mog for this
-func (resp *GenerateTokenResponse) ToAPI() *api.PeeringGenerateTokenResponse {
-	var t api.PeeringGenerateTokenResponse
-	GenerateTokenResponseToAPI(resp, &t)
-	return &t
-}
-
-// TODO consider using mog for this
-func (resp *EstablishResponse) ToAPI() *api.PeeringEstablishResponse {
-	var t api.PeeringEstablishResponse
-	EstablishResponseToAPI(resp, &t)
-	return &t
-}
-
-func (r *RemoteInfo) IsEmpty() bool {
-	if r == nil {
-		return true
-	}
-	return r.Partition == "" && r.Datacenter == "" && r.Locality.IsEmpty()
-}
-
-// convenience
-func NewGenerateTokenRequestFromAPI(req *api.PeeringGenerateTokenRequest) *GenerateTokenRequest {
-	if req == nil {
-		return nil
-	}
-	t := &GenerateTokenRequest{}
-	GenerateTokenRequestFromAPI(req, t)
-	return t
-}
-
-// convenience
-func NewEstablishRequestFromAPI(req *api.PeeringEstablishRequest) *EstablishRequest {
-	if req == nil {
-		return nil
-	}
-	t := &EstablishRequest{}
-	EstablishRequestFromAPI(req, t)
-	return t
-}
-
-func TimePtrFromProto(s *timestamppb.Timestamp) *time.Time {
-	if s == nil {
-		return nil
-	}
-	t := s.AsTime()
-	return &t
-}
-
-func TimePtrToProto(s *time.Time) *timestamppb.Timestamp {
-	if s == nil {
-		return nil
-	}
-	return timestamppb.New(*s)
-}
-
-// DeepCopy returns a copy of the PeeringTrustBundle that can be passed around
-// without worrying about the receiver unsafely modifying it. It is used by the
-// generated DeepCopy methods in proxycfg.
-func (o *PeeringTrustBundle) DeepCopy() *PeeringTrustBundle {
-	cp, ok := proto.Clone(o).(*PeeringTrustBundle)
-	if !ok {
-		panic(fmt.Sprintf("failed to clone *PeeringTrustBundle, got: %T", cp))
-	}
-	return cp
-}
-
-// TODO: handle this with mog
-// LocalityToStructs converts a protobuf Locality to a struct Locality.
-func LocalityToStructs(l *pbcommon.Locality) *structs.Locality {
-	if l == nil {
-		return nil
-	}
-	return &structs.Locality{
-		Region: l.Region,
-		Zone:   l.Zone,
-	}
-}
-
-// TODO: handle this with mog
-// LocalityFromStructs converts a struct Locality to a protobuf Locality.
-func LocalityFromStructs(l *structs.Locality) *pbcommon.Locality {
-	if l == nil {
-		return nil
-	}
-	return &pbcommon.Locality{
-		Region: l.Region,
-		Zone:   l.Zone,
-	}
-}
-
-// TODO: handle this with mog
-// LocalityToAPI converts a protobuf Locality to an API Locality.
-func LocalityToAPI(l *pbcommon.Locality) *api.Locality {
-	if l == nil {
-		return nil
-	}
-	return &api.Locality{
-		Region: l.Region,
-		Zone:   l.Zone,
-	}
-}
-
-// TODO: handle this with mog
-// LocalityFromProto converts an API Locality to a protobuf Locality.
-func LocalityFromAPI(l *api.Locality) *pbcommon.Locality {
-	if l == nil {
-		return nil
-	}
-	return &pbcommon.Locality{
-		Region: l.Region,
-		Zone:   l.Zone,
-	}
-}
diff --git a/proto/private/pbpeering/peering.pb.go b/proto/private/pbpeering/peering.pb.go
deleted file mode 100644
index a0c7bd21676d2..0000000000000
--- a/proto/private/pbpeering/peering.pb.go
+++ /dev/null
@@ -1,3278 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbpeering/peering.proto
-
-package pbpeering
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/annotations/ratelimit"
-	pbcommon "github.com/hashicorp/consul/proto/private/pbcommon"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// PeeringState enumerates all the states a peering can be in.
-type PeeringState int32
-
-const (
-	// Undefined represents an unset value for PeeringState during
-	// writes.
-	PeeringState_UNDEFINED PeeringState = 0
-	// Pending means the peering was created by generating a peering token.
-	// Peerings stay in a pending state until the peer uses the token to dial
-	// the local cluster.
-	PeeringState_PENDING PeeringState = 1
-	// Establishing means the peering is being established from a peering token.
-	// This is the initial state for dialing peers.
-	PeeringState_ESTABLISHING PeeringState = 2
-	// Active means that the peering connection is active and healthy.
-	PeeringState_ACTIVE PeeringState = 3
-	// Failing means the peering connection has been interrupted but has not yet
-	// been terminated.
-	PeeringState_FAILING PeeringState = 4
-	// Deleting means a peering was marked for deletion and is in the process
-	// of being deleted.
-	PeeringState_DELETING PeeringState = 5
-	// Terminated means the peering relationship has been removed.
-	PeeringState_TERMINATED PeeringState = 6
-)
-
-// Enum value maps for PeeringState.
-var (
-	PeeringState_name = map[int32]string{
-		0: "UNDEFINED",
-		1: "PENDING",
-		2: "ESTABLISHING",
-		3: "ACTIVE",
-		4: "FAILING",
-		5: "DELETING",
-		6: "TERMINATED",
-	}
-	PeeringState_value = map[string]int32{
-		"UNDEFINED":    0,
-		"PENDING":      1,
-		"ESTABLISHING": 2,
-		"ACTIVE":       3,
-		"FAILING":      4,
-		"DELETING":     5,
-		"TERMINATED":   6,
-	}
-)
-
-func (x PeeringState) Enum() *PeeringState {
-	p := new(PeeringState)
-	*p = x
-	return p
-}
-
-func (x PeeringState) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (PeeringState) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbpeering_peering_proto_enumTypes[0].Descriptor()
-}
-
-func (PeeringState) Type() protoreflect.EnumType {
-	return &file_private_pbpeering_peering_proto_enumTypes[0]
-}
-
-func (x PeeringState) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use PeeringState.Descriptor instead.
-func (PeeringState) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{0}
-}
-
-// SecretsWriteRequest encodes a request to write a peering secret as the result
-// of some operation. Different operations, such as generating a peering token,
-// lead to modifying the known secrets associated with a peering.
-type SecretsWriteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// PeerID is the local UUID of the peering this request applies to.
-	PeerID string `protobuf:"bytes,1,opt,name=PeerID,proto3" json:"PeerID,omitempty"`
-	// Types that are assignable to Request:
-	//
-	//	*SecretsWriteRequest_GenerateToken
-	//	*SecretsWriteRequest_ExchangeSecret
-	//	*SecretsWriteRequest_PromotePending
-	//	*SecretsWriteRequest_Establish
-	Request isSecretsWriteRequest_Request `protobuf_oneof:"Request"`
-}
-
-func (x *SecretsWriteRequest) Reset() {
-	*x = SecretsWriteRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SecretsWriteRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SecretsWriteRequest) ProtoMessage() {}
-
-func (x *SecretsWriteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SecretsWriteRequest.ProtoReflect.Descriptor instead.
-func (*SecretsWriteRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *SecretsWriteRequest) GetPeerID() string {
-	if x != nil {
-		return x.PeerID
-	}
-	return ""
-}
-
-func (m *SecretsWriteRequest) GetRequest() isSecretsWriteRequest_Request {
-	if m != nil {
-		return m.Request
-	}
-	return nil
-}
-
-func (x *SecretsWriteRequest) GetGenerateToken() *SecretsWriteRequest_GenerateTokenRequest {
-	if x, ok := x.GetRequest().(*SecretsWriteRequest_GenerateToken); ok {
-		return x.GenerateToken
-	}
-	return nil
-}
-
-func (x *SecretsWriteRequest) GetExchangeSecret() *SecretsWriteRequest_ExchangeSecretRequest {
-	if x, ok := x.GetRequest().(*SecretsWriteRequest_ExchangeSecret); ok {
-		return x.ExchangeSecret
-	}
-	return nil
-}
-
-func (x *SecretsWriteRequest) GetPromotePending() *SecretsWriteRequest_PromotePendingRequest {
-	if x, ok := x.GetRequest().(*SecretsWriteRequest_PromotePending); ok {
-		return x.PromotePending
-	}
-	return nil
-}
-
-func (x *SecretsWriteRequest) GetEstablish() *SecretsWriteRequest_EstablishRequest {
-	if x, ok := x.GetRequest().(*SecretsWriteRequest_Establish); ok {
-		return x.Establish
-	}
-	return nil
-}
-
-type isSecretsWriteRequest_Request interface {
-	isSecretsWriteRequest_Request()
-}
-
-type SecretsWriteRequest_GenerateToken struct {
-	GenerateToken *SecretsWriteRequest_GenerateTokenRequest `protobuf:"bytes,2,opt,name=generate_token,json=generateToken,proto3,oneof"`
-}
-
-type SecretsWriteRequest_ExchangeSecret struct {
-	ExchangeSecret *SecretsWriteRequest_ExchangeSecretRequest `protobuf:"bytes,3,opt,name=exchange_secret,json=exchangeSecret,proto3,oneof"`
-}
-
-type SecretsWriteRequest_PromotePending struct {
-	PromotePending *SecretsWriteRequest_PromotePendingRequest `protobuf:"bytes,4,opt,name=promote_pending,json=promotePending,proto3,oneof"`
-}
-
-type SecretsWriteRequest_Establish struct {
-	Establish *SecretsWriteRequest_EstablishRequest `protobuf:"bytes,5,opt,name=establish,proto3,oneof"`
-}
-
-func (*SecretsWriteRequest_GenerateToken) isSecretsWriteRequest_Request() {}
-
-func (*SecretsWriteRequest_ExchangeSecret) isSecretsWriteRequest_Request() {}
-
-func (*SecretsWriteRequest_PromotePending) isSecretsWriteRequest_Request() {}
-
-func (*SecretsWriteRequest_Establish) isSecretsWriteRequest_Request() {}
-
-// PeeringSecrets defines a secret used for authenticating/authorizing peer clusters.
-type PeeringSecrets struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// PeerID is the local UUID of the peering this secret was generated for.
-	PeerID        string                        `protobuf:"bytes,1,opt,name=PeerID,proto3" json:"PeerID,omitempty"`
-	Establishment *PeeringSecrets_Establishment `protobuf:"bytes,2,opt,name=establishment,proto3" json:"establishment,omitempty"`
-	Stream        *PeeringSecrets_Stream        `protobuf:"bytes,3,opt,name=stream,proto3" json:"stream,omitempty"`
-}
-
-func (x *PeeringSecrets) Reset() {
-	*x = PeeringSecrets{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringSecrets) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringSecrets) ProtoMessage() {}
-
-func (x *PeeringSecrets) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringSecrets.ProtoReflect.Descriptor instead.
-func (*PeeringSecrets) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *PeeringSecrets) GetPeerID() string {
-	if x != nil {
-		return x.PeerID
-	}
-	return ""
-}
-
-func (x *PeeringSecrets) GetEstablishment() *PeeringSecrets_Establishment {
-	if x != nil {
-		return x.Establishment
-	}
-	return nil
-}
-
-func (x *PeeringSecrets) GetStream() *PeeringSecrets_Stream {
-	if x != nil {
-		return x.Stream
-	}
-	return nil
-}
-
-// Peering defines a peering relationship between two disparate Consul clusters
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/api.Peering
-// output=peering.gen.go
-// name=API
-type Peering struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ID is a datacenter-scoped UUID for the peering.
-	// The ID is generated when a peering is first written to the state store.
-	ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
-	// Name is the local alias for the peering relationship.
-	Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
-	// Partition is the local partition connecting to the peer.
-	Partition string `protobuf:"bytes,3,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	// DeletedAt is the time when the Peering was marked for deletion
-	// This is nullable so that we can omit if empty when encoding in JSON
-	// mog: func-to=TimePtrFromProto func-from=TimePtrToProto
-	DeletedAt *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=DeletedAt,proto3" json:"DeletedAt,omitempty"`
-	// Meta is a mapping of some string value to any other string value
-	Meta map[string]string `protobuf:"bytes,5,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// State is one of the valid PeeringState values to represent the status of
-	// peering relationship.
-	//
-	// mog: func-to=PeeringStateToAPI func-from=PeeringStateFromAPI
-	State PeeringState `protobuf:"varint,6,opt,name=State,proto3,enum=hashicorp.consul.internal.peering.PeeringState" json:"State,omitempty"`
-	// PeerID is the ID that our peer assigned to this peering.
-	// This ID is to be used when dialing the peer, so that it can know who dialed it.
-	PeerID string `protobuf:"bytes,7,opt,name=PeerID,proto3" json:"PeerID,omitempty"`
-	// PeerCAPems contains all the CA certificates for the remote peer.
-	PeerCAPems []string `protobuf:"bytes,8,rep,name=PeerCAPems,proto3" json:"PeerCAPems,omitempty"`
-	// PeerServerName is the name of the remote server as it relates to TLS.
-	PeerServerName string `protobuf:"bytes,9,opt,name=PeerServerName,proto3" json:"PeerServerName,omitempty"`
-	// PeerServerAddresses contains all the connection addresses for the remote peer.
-	PeerServerAddresses []string `protobuf:"bytes,10,rep,name=PeerServerAddresses,proto3" json:"PeerServerAddresses,omitempty"`
-	// StreamStatus contains information computed on read based on the state of the stream.
-	//
-	// mog: func-to=StreamStatusToAPI func-from=StreamStatusFromAPI
-	StreamStatus *StreamStatus `protobuf:"bytes,13,opt,name=StreamStatus,proto3" json:"StreamStatus,omitempty"`
-	// CreateIndex is the Raft index at which the Peering was created.
-	// @gotags: bexpr:"-"
-	CreateIndex uint64 `protobuf:"varint,11,opt,name=CreateIndex,proto3" json:"CreateIndex,omitempty" bexpr:"-"`
-	// ModifyIndex is the latest Raft index at which the Peering. was modified.
-	// @gotags: bexpr:"-"
-	ModifyIndex uint64 `protobuf:"varint,12,opt,name=ModifyIndex,proto3" json:"ModifyIndex,omitempty" bexpr:"-"`
-	// Remote contains metadata about the remote peer.
-	Remote *RemoteInfo `protobuf:"bytes,17,opt,name=Remote,proto3" json:"Remote,omitempty"`
-	// ManualServerAddresses provides a list of manually specified server addresses from the
-	// user. If this is defined, then the automatic PeerServerAddresses are ignored.
-	ManualServerAddresses []string `protobuf:"bytes,18,rep,name=ManualServerAddresses,proto3" json:"ManualServerAddresses,omitempty"`
-}
-
-func (x *Peering) Reset() {
-	*x = Peering{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Peering) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Peering) ProtoMessage() {}
-
-func (x *Peering) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Peering.ProtoReflect.Descriptor instead.
-func (*Peering) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *Peering) GetID() string {
-	if x != nil {
-		return x.ID
-	}
-	return ""
-}
-
-func (x *Peering) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *Peering) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *Peering) GetDeletedAt() *timestamppb.Timestamp {
-	if x != nil {
-		return x.DeletedAt
-	}
-	return nil
-}
-
-func (x *Peering) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *Peering) GetState() PeeringState {
-	if x != nil {
-		return x.State
-	}
-	return PeeringState_UNDEFINED
-}
-
-func (x *Peering) GetPeerID() string {
-	if x != nil {
-		return x.PeerID
-	}
-	return ""
-}
-
-func (x *Peering) GetPeerCAPems() []string {
-	if x != nil {
-		return x.PeerCAPems
-	}
-	return nil
-}
-
-func (x *Peering) GetPeerServerName() string {
-	if x != nil {
-		return x.PeerServerName
-	}
-	return ""
-}
-
-func (x *Peering) GetPeerServerAddresses() []string {
-	if x != nil {
-		return x.PeerServerAddresses
-	}
-	return nil
-}
-
-func (x *Peering) GetStreamStatus() *StreamStatus {
-	if x != nil {
-		return x.StreamStatus
-	}
-	return nil
-}
-
-func (x *Peering) GetCreateIndex() uint64 {
-	if x != nil {
-		return x.CreateIndex
-	}
-	return 0
-}
-
-func (x *Peering) GetModifyIndex() uint64 {
-	if x != nil {
-		return x.ModifyIndex
-	}
-	return 0
-}
-
-func (x *Peering) GetRemote() *RemoteInfo {
-	if x != nil {
-		return x.Remote
-	}
-	return nil
-}
-
-func (x *Peering) GetManualServerAddresses() []string {
-	if x != nil {
-		return x.ManualServerAddresses
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/api.PeeringRemoteInfo
-// output=peering.gen.go
-// name=API
-type RemoteInfo struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Partition is the remote peer's partition.
-	Partition string `protobuf:"bytes,1,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	// Datacenter is the remote peer's datacenter.
-	Datacenter string `protobuf:"bytes,2,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
-	// Locality identifies where the peer is running.
-	// mog: func-to=LocalityToAPI func-from=LocalityFromAPI
-	Locality *pbcommon.Locality `protobuf:"bytes,3,opt,name=Locality,proto3" json:"Locality,omitempty"`
-}
-
-func (x *RemoteInfo) Reset() {
-	*x = RemoteInfo{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RemoteInfo) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RemoteInfo) ProtoMessage() {}
-
-func (x *RemoteInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RemoteInfo.ProtoReflect.Descriptor instead.
-func (*RemoteInfo) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *RemoteInfo) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *RemoteInfo) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-func (x *RemoteInfo) GetLocality() *pbcommon.Locality {
-	if x != nil {
-		return x.Locality
-	}
-	return nil
-}
-
-// StreamStatus represents information about an active peering stream.
-type StreamStatus struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ImportedServices is the list of services imported from this peering.
-	ImportedServices []string `protobuf:"bytes,1,rep,name=ImportedServices,proto3" json:"ImportedServices,omitempty"`
-	// ExportedServices is the list of services exported to this peering.
-	ExportedServices []string `protobuf:"bytes,2,rep,name=ExportedServices,proto3" json:"ExportedServices,omitempty"`
-	// LastHeartbeat represents when the last heartbeat message was received.
-	LastHeartbeat *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=LastHeartbeat,proto3" json:"LastHeartbeat,omitempty"`
-	// LastReceive represents when any message was last received, regardless of success or error.
-	LastReceive *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=LastReceive,proto3" json:"LastReceive,omitempty"`
-	// LastSend represents when any message was last sent, regardless of success or error.
-	LastSend *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=LastSend,proto3" json:"LastSend,omitempty"`
-}
-
-func (x *StreamStatus) Reset() {
-	*x = StreamStatus{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *StreamStatus) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*StreamStatus) ProtoMessage() {}
-
-func (x *StreamStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use StreamStatus.ProtoReflect.Descriptor instead.
-func (*StreamStatus) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *StreamStatus) GetImportedServices() []string {
-	if x != nil {
-		return x.ImportedServices
-	}
-	return nil
-}
-
-func (x *StreamStatus) GetExportedServices() []string {
-	if x != nil {
-		return x.ExportedServices
-	}
-	return nil
-}
-
-func (x *StreamStatus) GetLastHeartbeat() *timestamppb.Timestamp {
-	if x != nil {
-		return x.LastHeartbeat
-	}
-	return nil
-}
-
-func (x *StreamStatus) GetLastReceive() *timestamppb.Timestamp {
-	if x != nil {
-		return x.LastReceive
-	}
-	return nil
-}
-
-func (x *StreamStatus) GetLastSend() *timestamppb.Timestamp {
-	if x != nil {
-		return x.LastSend
-	}
-	return nil
-}
-
-// PeeringTrustBundle holds the trust information for validating requests from a peer.
-type PeeringTrustBundle struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// TrustDomain is the domain for the bundle, example.com, foo.bar.gov for example. Note that this must not have a prefix such as "spiffe://".
-	TrustDomain string `protobuf:"bytes,1,opt,name=TrustDomain,proto3" json:"TrustDomain,omitempty"`
-	// PeerName associates the trust bundle with a peer.
-	PeerName string `protobuf:"bytes,2,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
-	// Partition isolates the bundle from other trust bundles in separate local partitions.
-	Partition string `protobuf:"bytes,3,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	// RootPEMs holds ASN.1 DER encoded X.509 certificate data for the trust bundle.
-	RootPEMs []string `protobuf:"bytes,4,rep,name=RootPEMs,proto3" json:"RootPEMs,omitempty"`
-	// ExportedPartition references the remote partition of the peer
-	// which sent this trust bundle. Used for generating SpiffeIDs.
-	ExportedPartition string `protobuf:"bytes,5,opt,name=ExportedPartition,proto3" json:"ExportedPartition,omitempty"`
-	// CreateIndex is the Raft index at which the trust domain was created.
-	// @gotags: bexpr:"-"
-	CreateIndex uint64 `protobuf:"varint,6,opt,name=CreateIndex,proto3" json:"CreateIndex,omitempty" bexpr:"-"`
-	// ModifyIndex is the latest Raft index at which the trust bundle was modified.
-	// @gotags: bexpr:"-"
-	ModifyIndex uint64 `protobuf:"varint,7,opt,name=ModifyIndex,proto3" json:"ModifyIndex,omitempty" bexpr:"-"`
-}
-
-func (x *PeeringTrustBundle) Reset() {
-	*x = PeeringTrustBundle{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringTrustBundle) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringTrustBundle) ProtoMessage() {}
-
-func (x *PeeringTrustBundle) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringTrustBundle.ProtoReflect.Descriptor instead.
-func (*PeeringTrustBundle) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *PeeringTrustBundle) GetTrustDomain() string {
-	if x != nil {
-		return x.TrustDomain
-	}
-	return ""
-}
-
-func (x *PeeringTrustBundle) GetPeerName() string {
-	if x != nil {
-		return x.PeerName
-	}
-	return ""
-}
-
-func (x *PeeringTrustBundle) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *PeeringTrustBundle) GetRootPEMs() []string {
-	if x != nil {
-		return x.RootPEMs
-	}
-	return nil
-}
-
-func (x *PeeringTrustBundle) GetExportedPartition() string {
-	if x != nil {
-		return x.ExportedPartition
-	}
-	return ""
-}
-
-func (x *PeeringTrustBundle) GetCreateIndex() uint64 {
-	if x != nil {
-		return x.CreateIndex
-	}
-	return 0
-}
-
-func (x *PeeringTrustBundle) GetModifyIndex() uint64 {
-	if x != nil {
-		return x.ModifyIndex
-	}
-	return 0
-}
-
-// PeeringServerAddresses contains the latest snapshot of all known
-// server addresses for a peer.
-type PeeringServerAddresses struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Addresses []string `protobuf:"bytes,1,rep,name=Addresses,proto3" json:"Addresses,omitempty"`
-}
-
-func (x *PeeringServerAddresses) Reset() {
-	*x = PeeringServerAddresses{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringServerAddresses) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringServerAddresses) ProtoMessage() {}
-
-func (x *PeeringServerAddresses) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringServerAddresses.ProtoReflect.Descriptor instead.
-func (*PeeringServerAddresses) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *PeeringServerAddresses) GetAddresses() []string {
-	if x != nil {
-		return x.Addresses
-	}
-	return nil
-}
-
-type PeeringReadRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name      string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	Partition string `protobuf:"bytes,2,opt,name=Partition,proto3" json:"Partition,omitempty"`
-}
-
-func (x *PeeringReadRequest) Reset() {
-	*x = PeeringReadRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringReadRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringReadRequest) ProtoMessage() {}
-
-func (x *PeeringReadRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringReadRequest.ProtoReflect.Descriptor instead.
-func (*PeeringReadRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *PeeringReadRequest) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *PeeringReadRequest) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-type PeeringReadResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Peering *Peering `protobuf:"bytes,1,opt,name=Peering,proto3" json:"Peering,omitempty"`
-}
-
-func (x *PeeringReadResponse) Reset() {
-	*x = PeeringReadResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringReadResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringReadResponse) ProtoMessage() {}
-
-func (x *PeeringReadResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringReadResponse.ProtoReflect.Descriptor instead.
-func (*PeeringReadResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *PeeringReadResponse) GetPeering() *Peering {
-	if x != nil {
-		return x.Peering
-	}
-	return nil
-}
-
-type PeeringListRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Partition string `protobuf:"bytes,1,opt,name=Partition,proto3" json:"Partition,omitempty"`
-}
-
-func (x *PeeringListRequest) Reset() {
-	*x = PeeringListRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringListRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringListRequest) ProtoMessage() {}
-
-func (x *PeeringListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringListRequest.ProtoReflect.Descriptor instead.
-func (*PeeringListRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *PeeringListRequest) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-type PeeringListResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Peerings       []*Peering `protobuf:"bytes,1,rep,name=Peerings,proto3" json:"Peerings,omitempty"`
-	OBSOLETE_Index uint64     `protobuf:"varint,2,opt,name=OBSOLETE_Index,json=OBSOLETEIndex,proto3" json:"OBSOLETE_Index,omitempty"` // Deprecated in favor of gRPC metadata
-}
-
-func (x *PeeringListResponse) Reset() {
-	*x = PeeringListResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringListResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringListResponse) ProtoMessage() {}
-
-func (x *PeeringListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringListResponse.ProtoReflect.Descriptor instead.
-func (*PeeringListResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *PeeringListResponse) GetPeerings() []*Peering {
-	if x != nil {
-		return x.Peerings
-	}
-	return nil
-}
-
-func (x *PeeringListResponse) GetOBSOLETE_Index() uint64 {
-	if x != nil {
-		return x.OBSOLETE_Index
-	}
-	return 0
-}
-
-type PeeringWriteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Peering is the peering to write with the request.
-	Peering *Peering `protobuf:"bytes,1,opt,name=Peering,proto3" json:"Peering,omitempty"`
-	// SecretsWriteRequest contains the optional peering secrets to persist
-	// with the peering. Peering secrets are not embedded in the peering
-	// object to avoid leaking them.
-	SecretsRequest *SecretsWriteRequest `protobuf:"bytes,2,opt,name=SecretsRequest,proto3" json:"SecretsRequest,omitempty"`
-	Meta           map[string]string    `protobuf:"bytes,3,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (x *PeeringWriteRequest) Reset() {
-	*x = PeeringWriteRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringWriteRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringWriteRequest) ProtoMessage() {}
-
-func (x *PeeringWriteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringWriteRequest.ProtoReflect.Descriptor instead.
-func (*PeeringWriteRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *PeeringWriteRequest) GetPeering() *Peering {
-	if x != nil {
-		return x.Peering
-	}
-	return nil
-}
-
-func (x *PeeringWriteRequest) GetSecretsRequest() *SecretsWriteRequest {
-	if x != nil {
-		return x.SecretsRequest
-	}
-	return nil
-}
-
-func (x *PeeringWriteRequest) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-// TODO(peering): Consider returning Peering if we keep this endpoint around
-type PeeringWriteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *PeeringWriteResponse) Reset() {
-	*x = PeeringWriteResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringWriteResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringWriteResponse) ProtoMessage() {}
-
-func (x *PeeringWriteResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringWriteResponse.ProtoReflect.Descriptor instead.
-func (*PeeringWriteResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{12}
-}
-
-type PeeringDeleteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name      string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	Partition string `protobuf:"bytes,2,opt,name=Partition,proto3" json:"Partition,omitempty"`
-}
-
-func (x *PeeringDeleteRequest) Reset() {
-	*x = PeeringDeleteRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringDeleteRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringDeleteRequest) ProtoMessage() {}
-
-func (x *PeeringDeleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringDeleteRequest.ProtoReflect.Descriptor instead.
-func (*PeeringDeleteRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{13}
-}
-
-func (x *PeeringDeleteRequest) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *PeeringDeleteRequest) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-type PeeringDeleteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *PeeringDeleteResponse) Reset() {
-	*x = PeeringDeleteResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringDeleteResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringDeleteResponse) ProtoMessage() {}
-
-func (x *PeeringDeleteResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringDeleteResponse.ProtoReflect.Descriptor instead.
-func (*PeeringDeleteResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{14}
-}
-
-type TrustBundleListByServiceRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ServiceName string `protobuf:"bytes,1,opt,name=ServiceName,proto3" json:"ServiceName,omitempty"`
-	Namespace   string `protobuf:"bytes,2,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
-	Partition   string `protobuf:"bytes,3,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	Kind        string `protobuf:"bytes,4,opt,name=Kind,proto3" json:"Kind,omitempty"`
-}
-
-func (x *TrustBundleListByServiceRequest) Reset() {
-	*x = TrustBundleListByServiceRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TrustBundleListByServiceRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TrustBundleListByServiceRequest) ProtoMessage() {}
-
-func (x *TrustBundleListByServiceRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TrustBundleListByServiceRequest.ProtoReflect.Descriptor instead.
-func (*TrustBundleListByServiceRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{15}
-}
-
-func (x *TrustBundleListByServiceRequest) GetServiceName() string {
-	if x != nil {
-		return x.ServiceName
-	}
-	return ""
-}
-
-func (x *TrustBundleListByServiceRequest) GetNamespace() string {
-	if x != nil {
-		return x.Namespace
-	}
-	return ""
-}
-
-func (x *TrustBundleListByServiceRequest) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *TrustBundleListByServiceRequest) GetKind() string {
-	if x != nil {
-		return x.Kind
-	}
-	return ""
-}
-
-type TrustBundleListByServiceResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OBSOLETE_Index uint64                `protobuf:"varint,1,opt,name=OBSOLETE_Index,json=OBSOLETEIndex,proto3" json:"OBSOLETE_Index,omitempty"` // Deprecated in favor of gRPC metadata
-	Bundles        []*PeeringTrustBundle `protobuf:"bytes,2,rep,name=Bundles,proto3" json:"Bundles,omitempty"`
-}
-
-func (x *TrustBundleListByServiceResponse) Reset() {
-	*x = TrustBundleListByServiceResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TrustBundleListByServiceResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TrustBundleListByServiceResponse) ProtoMessage() {}
-
-func (x *TrustBundleListByServiceResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TrustBundleListByServiceResponse.ProtoReflect.Descriptor instead.
-func (*TrustBundleListByServiceResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{16}
-}
-
-func (x *TrustBundleListByServiceResponse) GetOBSOLETE_Index() uint64 {
-	if x != nil {
-		return x.OBSOLETE_Index
-	}
-	return 0
-}
-
-func (x *TrustBundleListByServiceResponse) GetBundles() []*PeeringTrustBundle {
-	if x != nil {
-		return x.Bundles
-	}
-	return nil
-}
-
-type TrustBundleReadRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name      string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	Partition string `protobuf:"bytes,2,opt,name=Partition,proto3" json:"Partition,omitempty"`
-}
-
-func (x *TrustBundleReadRequest) Reset() {
-	*x = TrustBundleReadRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[17]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TrustBundleReadRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TrustBundleReadRequest) ProtoMessage() {}
-
-func (x *TrustBundleReadRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[17]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TrustBundleReadRequest.ProtoReflect.Descriptor instead.
-func (*TrustBundleReadRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{17}
-}
-
-func (x *TrustBundleReadRequest) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *TrustBundleReadRequest) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-type TrustBundleReadResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OBSOLETE_Index uint64              `protobuf:"varint,1,opt,name=OBSOLETE_Index,json=OBSOLETEIndex,proto3" json:"OBSOLETE_Index,omitempty"` // Deprecated in favor of gRPC metadata
-	Bundle         *PeeringTrustBundle `protobuf:"bytes,2,opt,name=Bundle,proto3" json:"Bundle,omitempty"`
-}
-
-func (x *TrustBundleReadResponse) Reset() {
-	*x = TrustBundleReadResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[18]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TrustBundleReadResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TrustBundleReadResponse) ProtoMessage() {}
-
-func (x *TrustBundleReadResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[18]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TrustBundleReadResponse.ProtoReflect.Descriptor instead.
-func (*TrustBundleReadResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{18}
-}
-
-func (x *TrustBundleReadResponse) GetOBSOLETE_Index() uint64 {
-	if x != nil {
-		return x.OBSOLETE_Index
-	}
-	return 0
-}
-
-func (x *TrustBundleReadResponse) GetBundle() *PeeringTrustBundle {
-	if x != nil {
-		return x.Bundle
-	}
-	return nil
-}
-
-// This is a purely internal type and does not require query metadata.
-type PeeringTerminateByIDRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
-}
-
-func (x *PeeringTerminateByIDRequest) Reset() {
-	*x = PeeringTerminateByIDRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[19]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringTerminateByIDRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringTerminateByIDRequest) ProtoMessage() {}
-
-func (x *PeeringTerminateByIDRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[19]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringTerminateByIDRequest.ProtoReflect.Descriptor instead.
-func (*PeeringTerminateByIDRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{19}
-}
-
-func (x *PeeringTerminateByIDRequest) GetID() string {
-	if x != nil {
-		return x.ID
-	}
-	return ""
-}
-
-type PeeringTerminateByIDResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *PeeringTerminateByIDResponse) Reset() {
-	*x = PeeringTerminateByIDResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[20]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringTerminateByIDResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringTerminateByIDResponse) ProtoMessage() {}
-
-func (x *PeeringTerminateByIDResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[20]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringTerminateByIDResponse.ProtoReflect.Descriptor instead.
-func (*PeeringTerminateByIDResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{20}
-}
-
-type PeeringTrustBundleWriteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PeeringTrustBundle *PeeringTrustBundle `protobuf:"bytes,1,opt,name=PeeringTrustBundle,proto3" json:"PeeringTrustBundle,omitempty"`
-}
-
-func (x *PeeringTrustBundleWriteRequest) Reset() {
-	*x = PeeringTrustBundleWriteRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[21]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringTrustBundleWriteRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringTrustBundleWriteRequest) ProtoMessage() {}
-
-func (x *PeeringTrustBundleWriteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[21]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringTrustBundleWriteRequest.ProtoReflect.Descriptor instead.
-func (*PeeringTrustBundleWriteRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{21}
-}
-
-func (x *PeeringTrustBundleWriteRequest) GetPeeringTrustBundle() *PeeringTrustBundle {
-	if x != nil {
-		return x.PeeringTrustBundle
-	}
-	return nil
-}
-
-type PeeringTrustBundleWriteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *PeeringTrustBundleWriteResponse) Reset() {
-	*x = PeeringTrustBundleWriteResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[22]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringTrustBundleWriteResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringTrustBundleWriteResponse) ProtoMessage() {}
-
-func (x *PeeringTrustBundleWriteResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[22]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringTrustBundleWriteResponse.ProtoReflect.Descriptor instead.
-func (*PeeringTrustBundleWriteResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{22}
-}
-
-type PeeringTrustBundleDeleteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name      string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	Partition string `protobuf:"bytes,2,opt,name=Partition,proto3" json:"Partition,omitempty"`
-}
-
-func (x *PeeringTrustBundleDeleteRequest) Reset() {
-	*x = PeeringTrustBundleDeleteRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[23]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringTrustBundleDeleteRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringTrustBundleDeleteRequest) ProtoMessage() {}
-
-func (x *PeeringTrustBundleDeleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[23]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringTrustBundleDeleteRequest.ProtoReflect.Descriptor instead.
-func (*PeeringTrustBundleDeleteRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{23}
-}
-
-func (x *PeeringTrustBundleDeleteRequest) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *PeeringTrustBundleDeleteRequest) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-type PeeringTrustBundleDeleteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *PeeringTrustBundleDeleteResponse) Reset() {
-	*x = PeeringTrustBundleDeleteResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[24]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringTrustBundleDeleteResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringTrustBundleDeleteResponse) ProtoMessage() {}
-
-func (x *PeeringTrustBundleDeleteResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[24]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringTrustBundleDeleteResponse.ProtoReflect.Descriptor instead.
-func (*PeeringTrustBundleDeleteResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{24}
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/api.PeeringGenerateTokenRequest
-// output=peering.gen.go
-// name=API
-type GenerateTokenRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Name of the remote peer.
-	PeerName string `protobuf:"bytes,1,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
-	// Partition is the local partition being peered.
-	Partition string `protobuf:"bytes,2,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	// Meta is a mapping of some string value to any other string value
-	Meta map[string]string `protobuf:"bytes,5,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// ServerExternalAddresses is a list of addresses to put into the generated token. This could be used to specify
-	// load balancer(s) or external IPs to reach the servers from the dialing side, and will override any server
-	// addresses obtained from the "consul" service.
-	ServerExternalAddresses []string `protobuf:"bytes,6,rep,name=ServerExternalAddresses,proto3" json:"ServerExternalAddresses,omitempty"`
-}
-
-func (x *GenerateTokenRequest) Reset() {
-	*x = GenerateTokenRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[25]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GenerateTokenRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GenerateTokenRequest) ProtoMessage() {}
-
-func (x *GenerateTokenRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[25]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GenerateTokenRequest.ProtoReflect.Descriptor instead.
-func (*GenerateTokenRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{25}
-}
-
-func (x *GenerateTokenRequest) GetPeerName() string {
-	if x != nil {
-		return x.PeerName
-	}
-	return ""
-}
-
-func (x *GenerateTokenRequest) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *GenerateTokenRequest) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *GenerateTokenRequest) GetServerExternalAddresses() []string {
-	if x != nil {
-		return x.ServerExternalAddresses
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/api.PeeringGenerateTokenResponse
-// output=peering.gen.go
-// name=API
-type GenerateTokenResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// PeeringToken is an opaque string provided to the remote peer for it to complete
-	// the peering initialization handshake.
-	PeeringToken string `protobuf:"bytes,1,opt,name=PeeringToken,proto3" json:"PeeringToken,omitempty"`
-}
-
-func (x *GenerateTokenResponse) Reset() {
-	*x = GenerateTokenResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[26]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GenerateTokenResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GenerateTokenResponse) ProtoMessage() {}
-
-func (x *GenerateTokenResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[26]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GenerateTokenResponse.ProtoReflect.Descriptor instead.
-func (*GenerateTokenResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{26}
-}
-
-func (x *GenerateTokenResponse) GetPeeringToken() string {
-	if x != nil {
-		return x.PeeringToken
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/api.PeeringEstablishRequest
-// output=peering.gen.go
-// name=API
-type EstablishRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Name of the remote peer.
-	PeerName string `protobuf:"bytes,1,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
-	// The peering token returned from the peer's GenerateToken endpoint.
-	PeeringToken string `protobuf:"bytes,2,opt,name=PeeringToken,proto3" json:"PeeringToken,omitempty"`
-	// Partition is the local partition being peered.
-	Partition string `protobuf:"bytes,3,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	// Meta is a mapping of some string value to any other string value
-	Meta map[string]string `protobuf:"bytes,4,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (x *EstablishRequest) Reset() {
-	*x = EstablishRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[27]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EstablishRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EstablishRequest) ProtoMessage() {}
-
-func (x *EstablishRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[27]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EstablishRequest.ProtoReflect.Descriptor instead.
-func (*EstablishRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{27}
-}
-
-func (x *EstablishRequest) GetPeerName() string {
-	if x != nil {
-		return x.PeerName
-	}
-	return ""
-}
-
-func (x *EstablishRequest) GetPeeringToken() string {
-	if x != nil {
-		return x.PeeringToken
-	}
-	return ""
-}
-
-func (x *EstablishRequest) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *EstablishRequest) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/api.PeeringEstablishResponse
-// output=peering.gen.go
-// name=API
-type EstablishResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *EstablishResponse) Reset() {
-	*x = EstablishResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[28]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EstablishResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EstablishResponse) ProtoMessage() {}
-
-func (x *EstablishResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[28]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EstablishResponse.ProtoReflect.Descriptor instead.
-func (*EstablishResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{28}
-}
-
-// GenerateTokenRequest encodes a request to persist a peering establishment
-// secret. It is triggered by generating a new peering token for a peer cluster.
-type SecretsWriteRequest_GenerateTokenRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// establishment_secret is the proposed secret ID to store as the establishment
-	// secret for this peering.
-	EstablishmentSecret string `protobuf:"bytes,1,opt,name=establishment_secret,json=establishmentSecret,proto3" json:"establishment_secret,omitempty"`
-}
-
-func (x *SecretsWriteRequest_GenerateTokenRequest) Reset() {
-	*x = SecretsWriteRequest_GenerateTokenRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[29]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SecretsWriteRequest_GenerateTokenRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SecretsWriteRequest_GenerateTokenRequest) ProtoMessage() {}
-
-func (x *SecretsWriteRequest_GenerateTokenRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[29]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SecretsWriteRequest_GenerateTokenRequest.ProtoReflect.Descriptor instead.
-func (*SecretsWriteRequest_GenerateTokenRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{0, 0}
-}
-
-func (x *SecretsWriteRequest_GenerateTokenRequest) GetEstablishmentSecret() string {
-	if x != nil {
-		return x.EstablishmentSecret
-	}
-	return ""
-}
-
-// ExchangeSecretRequest encodes a request to persist a pending stream secret
-// secret. It is triggered by an acceptor peer generating a long-lived stream secret
-// in exchange for an establishment secret.
-type SecretsWriteRequest_ExchangeSecretRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// establishment_secret is the secret to exchange for the given pending stream secret.
-	EstablishmentSecret string `protobuf:"bytes,1,opt,name=establishment_secret,json=establishmentSecret,proto3" json:"establishment_secret,omitempty"`
-	// pending_stream_secret is the proposed secret ID to store as the pending stream
-	// secret for this peering.
-	PendingStreamSecret string `protobuf:"bytes,2,opt,name=pending_stream_secret,json=pendingStreamSecret,proto3" json:"pending_stream_secret,omitempty"`
-}
-
-func (x *SecretsWriteRequest_ExchangeSecretRequest) Reset() {
-	*x = SecretsWriteRequest_ExchangeSecretRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[30]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SecretsWriteRequest_ExchangeSecretRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SecretsWriteRequest_ExchangeSecretRequest) ProtoMessage() {}
-
-func (x *SecretsWriteRequest_ExchangeSecretRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[30]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SecretsWriteRequest_ExchangeSecretRequest.ProtoReflect.Descriptor instead.
-func (*SecretsWriteRequest_ExchangeSecretRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{0, 1}
-}
-
-func (x *SecretsWriteRequest_ExchangeSecretRequest) GetEstablishmentSecret() string {
-	if x != nil {
-		return x.EstablishmentSecret
-	}
-	return ""
-}
-
-func (x *SecretsWriteRequest_ExchangeSecretRequest) GetPendingStreamSecret() string {
-	if x != nil {
-		return x.PendingStreamSecret
-	}
-	return ""
-}
-
-// PromotePendingRequest encodes a request to promote a pending stream secret
-// to be an active stream secret. It is triggered when the accepting stream handler
-// validates an Open request from a peer with a pending stream secret.
-type SecretsWriteRequest_PromotePendingRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// active_stream_secret is the proposed secret ID to store as the active stream
-	// secret for this peering.
-	ActiveStreamSecret string `protobuf:"bytes,1,opt,name=active_stream_secret,json=activeStreamSecret,proto3" json:"active_stream_secret,omitempty"`
-}
-
-func (x *SecretsWriteRequest_PromotePendingRequest) Reset() {
-	*x = SecretsWriteRequest_PromotePendingRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[31]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SecretsWriteRequest_PromotePendingRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SecretsWriteRequest_PromotePendingRequest) ProtoMessage() {}
-
-func (x *SecretsWriteRequest_PromotePendingRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[31]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SecretsWriteRequest_PromotePendingRequest.ProtoReflect.Descriptor instead.
-func (*SecretsWriteRequest_PromotePendingRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{0, 2}
-}
-
-func (x *SecretsWriteRequest_PromotePendingRequest) GetActiveStreamSecret() string {
-	if x != nil {
-		return x.ActiveStreamSecret
-	}
-	return ""
-}
-
-// EstablishRequest encodes a request to persist an active stream secret.
-// It is triggered after a dialing peer exchanges their establishment secret
-// for a long-lived active stream secret.
-type SecretsWriteRequest_EstablishRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// active_stream_secret is the proposed secret ID to store as the active stream
-	// secret for this peering.
-	ActiveStreamSecret string `protobuf:"bytes,1,opt,name=active_stream_secret,json=activeStreamSecret,proto3" json:"active_stream_secret,omitempty"`
-}
-
-func (x *SecretsWriteRequest_EstablishRequest) Reset() {
-	*x = SecretsWriteRequest_EstablishRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[32]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SecretsWriteRequest_EstablishRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SecretsWriteRequest_EstablishRequest) ProtoMessage() {}
-
-func (x *SecretsWriteRequest_EstablishRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[32]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SecretsWriteRequest_EstablishRequest.ProtoReflect.Descriptor instead.
-func (*SecretsWriteRequest_EstablishRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{0, 3}
-}
-
-func (x *SecretsWriteRequest_EstablishRequest) GetActiveStreamSecret() string {
-	if x != nil {
-		return x.ActiveStreamSecret
-	}
-	return ""
-}
-
-type PeeringSecrets_Establishment struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// SecretID is the one-time-use peering establishment secret.
-	SecretID string `protobuf:"bytes,1,opt,name=SecretID,proto3" json:"SecretID,omitempty"`
-}
-
-func (x *PeeringSecrets_Establishment) Reset() {
-	*x = PeeringSecrets_Establishment{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[33]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringSecrets_Establishment) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringSecrets_Establishment) ProtoMessage() {}
-
-func (x *PeeringSecrets_Establishment) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[33]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringSecrets_Establishment.ProtoReflect.Descriptor instead.
-func (*PeeringSecrets_Establishment) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{1, 0}
-}
-
-func (x *PeeringSecrets_Establishment) GetSecretID() string {
-	if x != nil {
-		return x.SecretID
-	}
-	return ""
-}
-
-type PeeringSecrets_Stream struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ActiveSecretID is the active UUID-v4 secret being used for authorization at
-	// the peering stream.
-	ActiveSecretID string `protobuf:"bytes,1,opt,name=ActiveSecretID,proto3" json:"ActiveSecretID,omitempty"`
-	// PendingSecretID is a UUID-v4 secret introduced during secret rotation.
-	// When a peering is established or re-established, both the active secret and
-	// pending secret are considered valid. However, once the dialing peer uses
-	// the pending secret then it transitions to active and the previously active
-	// secret is discarded.
-	//
-	// Pending secret IDs are only valid for long-lived stream secrets.
-	// Only one establishment secret can exist for a peer at a time since they
-	// are designed for one-time use.
-	PendingSecretID string `protobuf:"bytes,2,opt,name=PendingSecretID,proto3" json:"PendingSecretID,omitempty"`
-}
-
-func (x *PeeringSecrets_Stream) Reset() {
-	*x = PeeringSecrets_Stream{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeering_peering_proto_msgTypes[34]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringSecrets_Stream) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringSecrets_Stream) ProtoMessage() {}
-
-func (x *PeeringSecrets_Stream) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeering_peering_proto_msgTypes[34]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringSecrets_Stream.ProtoReflect.Descriptor instead.
-func (*PeeringSecrets_Stream) Descriptor() ([]byte, []int) {
-	return file_private_pbpeering_peering_proto_rawDescGZIP(), []int{1, 1}
-}
-
-func (x *PeeringSecrets_Stream) GetActiveSecretID() string {
-	if x != nil {
-		return x.ActiveSecretID
-	}
-	return ""
-}
-
-func (x *PeeringSecrets_Stream) GetPendingSecretID() string {
-	if x != nil {
-		return x.PendingSecretID
-	}
-	return ""
-}
-
-var File_private_pbpeering_peering_proto protoreflect.FileDescriptor
-
-var file_private_pbpeering_peering_proto_rawDesc = []byte{
-	0x0a, 0x1f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x70, 0x65, 0x65, 0x72,
-	0x69, 0x6e, 0x67, 0x2f, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x21, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65,
-	0x72, 0x69, 0x6e, 0x67, 0x1a, 0x25, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65,
-	0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d,
-	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x70, 0x72,
-	0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe5, 0x06, 0x0a, 0x13,
-	0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x12, 0x74, 0x0a, 0x0e, 0x67,
-	0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x4b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
-	0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x57,
-	0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x47, 0x65, 0x6e, 0x65,
-	0x72, 0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x48, 0x00, 0x52, 0x0d, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x12, 0x77, 0x0a, 0x0f, 0x65, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x73, 0x65,
-	0x63, 0x72, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4c, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x53,
-	0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x2e, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65,
-	0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0e, 0x65, 0x78, 0x63, 0x68,
-	0x61, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x77, 0x0a, 0x0f, 0x70, 0x72,
-	0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x5f, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x4c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
-	0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x57,
-	0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x50, 0x72, 0x6f, 0x6d,
-	0x6f, 0x74, 0x65, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x48, 0x00, 0x52, 0x0e, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x50, 0x65, 0x6e, 0x64,
-	0x69, 0x6e, 0x67, 0x12, 0x67, 0x0a, 0x09, 0x65, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x47, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65,
-	0x74, 0x73, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x45,
-	0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48,
-	0x00, 0x52, 0x09, 0x65, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x1a, 0x49, 0x0a, 0x14,
-	0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x31, 0x0a, 0x14, 0x65, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73,
-	0x68, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x13, 0x65, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65, 0x6e,
-	0x74, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x1a, 0x7e, 0x0a, 0x15, 0x45, 0x78, 0x63, 0x68, 0x61,
-	0x6e, 0x67, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x31, 0x0a, 0x14, 0x65, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65, 0x6e,
-	0x74, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13,
-	0x65, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x63,
-	0x72, 0x65, 0x74, 0x12, 0x32, 0x0a, 0x15, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x73,
-	0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x13, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x1a, 0x49, 0x0a, 0x15, 0x50, 0x72, 0x6f, 0x6d, 0x6f,
-	0x74, 0x65, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x30, 0x0a, 0x14, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12,
-	0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x65, 0x63, 0x72,
-	0x65, 0x74, 0x1a, 0x44, 0x0a, 0x10, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x30, 0x0a, 0x14, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65,
-	0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x53, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x22, 0xea, 0x02, 0x0a, 0x0e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x53,
-	0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x12, 0x65,
-	0x0a, 0x0d, 0x65, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e,
-	0x67, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x2e, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69,
-	0x73, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0d, 0x65, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73,
-	0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x50, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e,
-	0x67, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52,
-	0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x1a, 0x2b, 0x0a, 0x0d, 0x45, 0x73, 0x74, 0x61, 0x62,
-	0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x65, 0x63, 0x72,
-	0x65, 0x74, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x53, 0x65, 0x63, 0x72,
-	0x65, 0x74, 0x49, 0x44, 0x1a, 0x5a, 0x0a, 0x06, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x26,
-	0x0a, 0x0e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x49, 0x44,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x53, 0x65,
-	0x63, 0x72, 0x65, 0x74, 0x49, 0x44, 0x12, 0x28, 0x0a, 0x0f, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e,
-	0x67, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0f, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x49, 0x44,
-	0x22, 0xf7, 0x05, 0x0a, 0x07, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x0e, 0x0a, 0x02,
-	0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04,
-	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65,
-	0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38,
-	0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x44,
-	0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x48, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61,
-	0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69,
-	0x6e, 0x67, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65,
-	0x74, 0x61, 0x12, 0x45, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65,
-	0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61,
-	0x74, 0x65, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x65, 0x65,
-	0x72, 0x49, 0x44, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49,
-	0x44, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x65, 0x65, 0x72, 0x43, 0x41, 0x50, 0x65, 0x6d, 0x73, 0x18,
-	0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x50, 0x65, 0x65, 0x72, 0x43, 0x41, 0x50, 0x65, 0x6d,
-	0x73, 0x12, 0x26, 0x0a, 0x0e, 0x50, 0x65, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e,
-	0x61, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x50, 0x65, 0x65, 0x72, 0x53,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x30, 0x0a, 0x13, 0x50, 0x65, 0x65,
-	0x72, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73,
-	0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x13, 0x50, 0x65, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x53, 0x0a, 0x0c, 0x53,
-	0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65,
-	0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x52, 0x0c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x12, 0x20, 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18,
-	0x0b, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x64,
-	0x65, 0x78, 0x12, 0x20, 0x0a, 0x0b, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x64, 0x65,
-	0x78, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49,
-	0x6e, 0x64, 0x65, 0x78, 0x12, 0x45, 0x0a, 0x06, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x18, 0x11,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x49,
-	0x6e, 0x66, 0x6f, 0x52, 0x06, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x12, 0x34, 0x0a, 0x15, 0x4d,
-	0x61, 0x6e, 0x75, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x65, 0x73, 0x18, 0x12, 0x20, 0x03, 0x28, 0x09, 0x52, 0x15, 0x4d, 0x61, 0x6e, 0x75,
-	0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65,
-	0x73, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
-	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
-	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x92, 0x01, 0x0a, 0x0a, 0x52,
-	0x65, 0x6d, 0x6f, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72,
-	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61,
-	0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63,
-	0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74,
-	0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x46, 0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x6c,
-	0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4c, 0x6f, 0x63,
-	0x61, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x22,
-	0x9e, 0x02, 0x0a, 0x0c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x12, 0x2a, 0x0a, 0x10, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x49, 0x6d, 0x70, 0x6f,
-	0x72, 0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x2a, 0x0a, 0x10,
-	0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x40, 0x0a, 0x0d, 0x4c, 0x61, 0x73, 0x74,
-	0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0d, 0x4c, 0x61, 0x73,
-	0x74, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x12, 0x3c, 0x0a, 0x0b, 0x4c, 0x61,
-	0x73, 0x74, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0b, 0x4c, 0x61, 0x73,
-	0x74, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x12, 0x36, 0x0a, 0x08, 0x4c, 0x61, 0x73, 0x74,
-	0x53, 0x65, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d,
-	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x08, 0x4c, 0x61, 0x73, 0x74, 0x53, 0x65, 0x6e, 0x64,
-	0x22, 0xfe, 0x01, 0x0a, 0x12, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x72, 0x75, 0x73,
-	0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x54, 0x72, 0x75, 0x73, 0x74,
-	0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x54, 0x72,
-	0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x65, 0x65,
-	0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x65, 0x65,
-	0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x74, 0x50, 0x45, 0x4d, 0x73, 0x18,
-	0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x52, 0x6f, 0x6f, 0x74, 0x50, 0x45, 0x4d, 0x73, 0x12,
-	0x2c, 0x0a, 0x11, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x61, 0x72, 0x74, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x45, 0x78, 0x70, 0x6f,
-	0x72, 0x74, 0x65, 0x64, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x20, 0x0a,
-	0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x06, 0x20, 0x01,
-	0x28, 0x04, 0x52, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12,
-	0x20, 0x0a, 0x0b, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x64, 0x65,
-	0x78, 0x22, 0x36, 0x0a, 0x16, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x41,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09,
-	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x22, 0x46, 0x0a, 0x12, 0x50, 0x65, 0x65,
-	0x72, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e,
-	0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x22, 0x5b, 0x0a, 0x13, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x61, 0x64,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44, 0x0a, 0x07, 0x50, 0x65, 0x65, 0x72,
-	0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65,
-	0x65, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x32,
-	0x0a, 0x12, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x22, 0x84, 0x01, 0x0a, 0x13, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69,
-	0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x46, 0x0a, 0x08, 0x50, 0x65,
-	0x65, 0x72, 0x69, 0x6e, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
-	0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x08, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e,
-	0x67, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x4f, 0x42, 0x53, 0x4f, 0x4c, 0x45, 0x54, 0x45, 0x5f, 0x49,
-	0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x4f, 0x42, 0x53, 0x4f,
-	0x4c, 0x45, 0x54, 0x45, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x22, 0xca, 0x02, 0x0a, 0x13, 0x50, 0x65,
-	0x65, 0x72, 0x69, 0x6e, 0x67, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x44, 0x0a, 0x07, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70,
-	0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x07,
-	0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x5e, 0x0a, 0x0e, 0x53, 0x65, 0x63, 0x72, 0x65,
-	0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72,
-	0x69, 0x6e, 0x67, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73, 0x57, 0x72, 0x69, 0x74, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x54, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e,
-	0x67, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4d, 0x65,
-	0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x1a, 0x37, 0x0a,
-	0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e,
-	0x67, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x48,
-	0x0a, 0x14, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61,
-	0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50,
-	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x17, 0x0a, 0x15, 0x50, 0x65, 0x65, 0x72,
-	0x69, 0x6e, 0x67, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x93, 0x01, 0x0a, 0x1f, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c,
-	0x65, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x4e, 0x61, 0x6d, 0x65,
-	0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x22, 0x9a, 0x01, 0x0a, 0x20, 0x54, 0x72, 0x75, 0x73,
-	0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x0e,
-	0x4f, 0x42, 0x53, 0x4f, 0x4c, 0x45, 0x54, 0x45, 0x5f, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x4f, 0x42, 0x53, 0x4f, 0x4c, 0x45, 0x54, 0x45, 0x49, 0x6e,
-	0x64, 0x65, 0x78, 0x12, 0x4f, 0x0a, 0x07, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x73, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
-	0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x07, 0x42, 0x75, 0x6e,
-	0x64, 0x6c, 0x65, 0x73, 0x22, 0x4a, 0x0a, 0x16, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e,
-	0x64, 0x6c, 0x65, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12,
-	0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61,
-	0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x22, 0x8f, 0x01, 0x0a, 0x17, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65,
-	0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x0e,
-	0x4f, 0x42, 0x53, 0x4f, 0x4c, 0x45, 0x54, 0x45, 0x5f, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x4f, 0x42, 0x53, 0x4f, 0x4c, 0x45, 0x54, 0x45, 0x49, 0x6e,
-	0x64, 0x65, 0x78, 0x12, 0x4d, 0x0a, 0x06, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
-	0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54,
-	0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x06, 0x42, 0x75, 0x6e, 0x64,
-	0x6c, 0x65, 0x22, 0x2d, 0x0a, 0x1b, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x65, 0x72,
-	0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x42, 0x79, 0x49, 0x44, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49,
-	0x44, 0x22, 0x1e, 0x0a, 0x1c, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x65, 0x72, 0x6d,
-	0x69, 0x6e, 0x61, 0x74, 0x65, 0x42, 0x79, 0x49, 0x44, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x87, 0x01, 0x0a, 0x1e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x72, 0x75,
-	0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x65, 0x0a, 0x12, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54,
-	0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65,
-	0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x72, 0x75, 0x73,
-	0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x12, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
-	0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x21, 0x0a, 0x1f, 0x50,
-	0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c,
-	0x65, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x53,
-	0x0a, 0x1f, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75,
-	0x6e, 0x64, 0x6c, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x22, 0x22, 0x0a, 0x20, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x72,
-	0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x9a, 0x02, 0x0a, 0x14, 0x47, 0x65, 0x6e, 0x65,
-	0x72, 0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x1a, 0x0a, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09,
-	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x55, 0x0a, 0x04, 0x4d, 0x65,
-	0x74, 0x61, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x47, 0x65, 0x6e,
-	0x65, 0x72, 0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74,
-	0x61, 0x12, 0x38, 0x0a, 0x17, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x45, 0x78, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x17, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x4d,
-	0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x22, 0x3b, 0x0a, 0x15, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65,
-	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a,
-	0x0c, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0c, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x22, 0xfc, 0x01, 0x0a, 0x10, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61,
-	0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x54, 0x6f, 0x6b,
-	0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e,
-	0x67, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x51, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x04, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70,
-	0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x22, 0x13, 0x0a, 0x11, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x73, 0x0a, 0x0c, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x55, 0x4e, 0x44, 0x45, 0x46, 0x49, 0x4e,
-	0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10,
-	0x01, 0x12, 0x10, 0x0a, 0x0c, 0x45, 0x53, 0x54, 0x41, 0x42, 0x4c, 0x49, 0x53, 0x48, 0x49, 0x4e,
-	0x47, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x41, 0x43, 0x54, 0x49, 0x56, 0x45, 0x10, 0x03, 0x12,
-	0x0b, 0x0a, 0x07, 0x46, 0x41, 0x49, 0x4c, 0x49, 0x4e, 0x47, 0x10, 0x04, 0x12, 0x0c, 0x0a, 0x08,
-	0x44, 0x45, 0x4c, 0x45, 0x54, 0x49, 0x4e, 0x47, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x45,
-	0x52, 0x4d, 0x49, 0x4e, 0x41, 0x54, 0x45, 0x44, 0x10, 0x06, 0x32, 0x94, 0x09, 0x0a, 0x0e, 0x50,
-	0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x8c, 0x01,
-	0x0a, 0x0d, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12,
-	0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72,
-	0x69, 0x6e, 0x67, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x47, 0x65, 0x6e,
-	0x65, 0x72, 0x61, 0x74, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x03, 0x10, 0x05, 0x12, 0x80, 0x01, 0x0a,
-	0x09, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x12, 0x33, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x45,
-	0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72,
-	0x69, 0x6e, 0x67, 0x2e, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x03, 0x10, 0x05, 0x12,
-	0x86, 0x01, 0x0a, 0x0b, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x61, 0x64, 0x12,
-	0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72,
-	0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x61, 0x64, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69,
-	0x6e, 0x67, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08,
-	0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x05, 0x12, 0x86, 0x01, 0x0a, 0x0b, 0x50, 0x65, 0x65,
-	0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65,
-	0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72,
-	0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10,
-	0x05, 0x12, 0x8c, 0x01, 0x0a, 0x0d, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x6c,
-	0x65, 0x74, 0x65, 0x12, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
-	0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x44,
-	0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x38, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
-	0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x03, 0x10, 0x05,
-	0x12, 0x89, 0x01, 0x0a, 0x0c, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x57, 0x72, 0x69, 0x74,
-	0x65, 0x12, 0x36, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65,
-	0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x57, 0x72, 0x69,
-	0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x37, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x50, 0x65,
-	0x65, 0x72, 0x69, 0x6e, 0x67, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x03, 0x10, 0x05, 0x12, 0xad, 0x01, 0x0a,
-	0x18, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74,
-	0x42, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x42, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x54, 0x72,
-	0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x43, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e,
-	0x67, 0x2e, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x4c, 0x69, 0x73,
-	0x74, 0x42, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x05, 0x12, 0x92, 0x01, 0x0a,
-	0x0f, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x61, 0x64,
-	0x12, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65,
-	0x72, 0x69, 0x6e, 0x67, 0x2e, 0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65,
-	0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3a, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e,
-	0x54, 0x72, 0x75, 0x73, 0x74, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x61, 0x64, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10,
-	0x05, 0x42, 0x92, 0x02, 0x0a, 0x25, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x42, 0x0c, 0x50, 0x65, 0x65,
-	0x72, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70,
-	0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
-	0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x50, 0xaa, 0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0xca, 0x02, 0x21, 0x48, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0xe2,
-	0x02, 0x2d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x50, 0x65, 0x65, 0x72,
-	0x69, 0x6e, 0x67, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
-	0x02, 0x24, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x50,
-	0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pbpeering_peering_proto_rawDescOnce sync.Once
-	file_private_pbpeering_peering_proto_rawDescData = file_private_pbpeering_peering_proto_rawDesc
-)
-
-func file_private_pbpeering_peering_proto_rawDescGZIP() []byte {
-	file_private_pbpeering_peering_proto_rawDescOnce.Do(func() {
-		file_private_pbpeering_peering_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbpeering_peering_proto_rawDescData)
-	})
-	return file_private_pbpeering_peering_proto_rawDescData
-}
-
-var file_private_pbpeering_peering_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_private_pbpeering_peering_proto_msgTypes = make([]protoimpl.MessageInfo, 39)
-var file_private_pbpeering_peering_proto_goTypes = []interface{}{
-	(PeeringState)(0),                                 // 0: hashicorp.consul.internal.peering.PeeringState
-	(*SecretsWriteRequest)(nil),                       // 1: hashicorp.consul.internal.peering.SecretsWriteRequest
-	(*PeeringSecrets)(nil),                            // 2: hashicorp.consul.internal.peering.PeeringSecrets
-	(*Peering)(nil),                                   // 3: hashicorp.consul.internal.peering.Peering
-	(*RemoteInfo)(nil),                                // 4: hashicorp.consul.internal.peering.RemoteInfo
-	(*StreamStatus)(nil),                              // 5: hashicorp.consul.internal.peering.StreamStatus
-	(*PeeringTrustBundle)(nil),                        // 6: hashicorp.consul.internal.peering.PeeringTrustBundle
-	(*PeeringServerAddresses)(nil),                    // 7: hashicorp.consul.internal.peering.PeeringServerAddresses
-	(*PeeringReadRequest)(nil),                        // 8: hashicorp.consul.internal.peering.PeeringReadRequest
-	(*PeeringReadResponse)(nil),                       // 9: hashicorp.consul.internal.peering.PeeringReadResponse
-	(*PeeringListRequest)(nil),                        // 10: hashicorp.consul.internal.peering.PeeringListRequest
-	(*PeeringListResponse)(nil),                       // 11: hashicorp.consul.internal.peering.PeeringListResponse
-	(*PeeringWriteRequest)(nil),                       // 12: hashicorp.consul.internal.peering.PeeringWriteRequest
-	(*PeeringWriteResponse)(nil),                      // 13: hashicorp.consul.internal.peering.PeeringWriteResponse
-	(*PeeringDeleteRequest)(nil),                      // 14: hashicorp.consul.internal.peering.PeeringDeleteRequest
-	(*PeeringDeleteResponse)(nil),                     // 15: hashicorp.consul.internal.peering.PeeringDeleteResponse
-	(*TrustBundleListByServiceRequest)(nil),           // 16: hashicorp.consul.internal.peering.TrustBundleListByServiceRequest
-	(*TrustBundleListByServiceResponse)(nil),          // 17: hashicorp.consul.internal.peering.TrustBundleListByServiceResponse
-	(*TrustBundleReadRequest)(nil),                    // 18: hashicorp.consul.internal.peering.TrustBundleReadRequest
-	(*TrustBundleReadResponse)(nil),                   // 19: hashicorp.consul.internal.peering.TrustBundleReadResponse
-	(*PeeringTerminateByIDRequest)(nil),               // 20: hashicorp.consul.internal.peering.PeeringTerminateByIDRequest
-	(*PeeringTerminateByIDResponse)(nil),              // 21: hashicorp.consul.internal.peering.PeeringTerminateByIDResponse
-	(*PeeringTrustBundleWriteRequest)(nil),            // 22: hashicorp.consul.internal.peering.PeeringTrustBundleWriteRequest
-	(*PeeringTrustBundleWriteResponse)(nil),           // 23: hashicorp.consul.internal.peering.PeeringTrustBundleWriteResponse
-	(*PeeringTrustBundleDeleteRequest)(nil),           // 24: hashicorp.consul.internal.peering.PeeringTrustBundleDeleteRequest
-	(*PeeringTrustBundleDeleteResponse)(nil),          // 25: hashicorp.consul.internal.peering.PeeringTrustBundleDeleteResponse
-	(*GenerateTokenRequest)(nil),                      // 26: hashicorp.consul.internal.peering.GenerateTokenRequest
-	(*GenerateTokenResponse)(nil),                     // 27: hashicorp.consul.internal.peering.GenerateTokenResponse
-	(*EstablishRequest)(nil),                          // 28: hashicorp.consul.internal.peering.EstablishRequest
-	(*EstablishResponse)(nil),                         // 29: hashicorp.consul.internal.peering.EstablishResponse
-	(*SecretsWriteRequest_GenerateTokenRequest)(nil),  // 30: hashicorp.consul.internal.peering.SecretsWriteRequest.GenerateTokenRequest
-	(*SecretsWriteRequest_ExchangeSecretRequest)(nil), // 31: hashicorp.consul.internal.peering.SecretsWriteRequest.ExchangeSecretRequest
-	(*SecretsWriteRequest_PromotePendingRequest)(nil), // 32: hashicorp.consul.internal.peering.SecretsWriteRequest.PromotePendingRequest
-	(*SecretsWriteRequest_EstablishRequest)(nil),      // 33: hashicorp.consul.internal.peering.SecretsWriteRequest.EstablishRequest
-	(*PeeringSecrets_Establishment)(nil),              // 34: hashicorp.consul.internal.peering.PeeringSecrets.Establishment
-	(*PeeringSecrets_Stream)(nil),                     // 35: hashicorp.consul.internal.peering.PeeringSecrets.Stream
-	nil,                                               // 36: hashicorp.consul.internal.peering.Peering.MetaEntry
-	nil,                                               // 37: hashicorp.consul.internal.peering.PeeringWriteRequest.MetaEntry
-	nil,                                               // 38: hashicorp.consul.internal.peering.GenerateTokenRequest.MetaEntry
-	nil,                                               // 39: hashicorp.consul.internal.peering.EstablishRequest.MetaEntry
-	(*timestamppb.Timestamp)(nil),                     // 40: google.protobuf.Timestamp
-	(*pbcommon.Locality)(nil),                         // 41: hashicorp.consul.internal.common.Locality
-}
-var file_private_pbpeering_peering_proto_depIdxs = []int32{
-	30, // 0: hashicorp.consul.internal.peering.SecretsWriteRequest.generate_token:type_name -> hashicorp.consul.internal.peering.SecretsWriteRequest.GenerateTokenRequest
-	31, // 1: hashicorp.consul.internal.peering.SecretsWriteRequest.exchange_secret:type_name -> hashicorp.consul.internal.peering.SecretsWriteRequest.ExchangeSecretRequest
-	32, // 2: hashicorp.consul.internal.peering.SecretsWriteRequest.promote_pending:type_name -> hashicorp.consul.internal.peering.SecretsWriteRequest.PromotePendingRequest
-	33, // 3: hashicorp.consul.internal.peering.SecretsWriteRequest.establish:type_name -> hashicorp.consul.internal.peering.SecretsWriteRequest.EstablishRequest
-	34, // 4: hashicorp.consul.internal.peering.PeeringSecrets.establishment:type_name -> hashicorp.consul.internal.peering.PeeringSecrets.Establishment
-	35, // 5: hashicorp.consul.internal.peering.PeeringSecrets.stream:type_name -> hashicorp.consul.internal.peering.PeeringSecrets.Stream
-	40, // 6: hashicorp.consul.internal.peering.Peering.DeletedAt:type_name -> google.protobuf.Timestamp
-	36, // 7: hashicorp.consul.internal.peering.Peering.Meta:type_name -> hashicorp.consul.internal.peering.Peering.MetaEntry
-	0,  // 8: hashicorp.consul.internal.peering.Peering.State:type_name -> hashicorp.consul.internal.peering.PeeringState
-	5,  // 9: hashicorp.consul.internal.peering.Peering.StreamStatus:type_name -> hashicorp.consul.internal.peering.StreamStatus
-	4,  // 10: hashicorp.consul.internal.peering.Peering.Remote:type_name -> hashicorp.consul.internal.peering.RemoteInfo
-	41, // 11: hashicorp.consul.internal.peering.RemoteInfo.Locality:type_name -> hashicorp.consul.internal.common.Locality
-	40, // 12: hashicorp.consul.internal.peering.StreamStatus.LastHeartbeat:type_name -> google.protobuf.Timestamp
-	40, // 13: hashicorp.consul.internal.peering.StreamStatus.LastReceive:type_name -> google.protobuf.Timestamp
-	40, // 14: hashicorp.consul.internal.peering.StreamStatus.LastSend:type_name -> google.protobuf.Timestamp
-	3,  // 15: hashicorp.consul.internal.peering.PeeringReadResponse.Peering:type_name -> hashicorp.consul.internal.peering.Peering
-	3,  // 16: hashicorp.consul.internal.peering.PeeringListResponse.Peerings:type_name -> hashicorp.consul.internal.peering.Peering
-	3,  // 17: hashicorp.consul.internal.peering.PeeringWriteRequest.Peering:type_name -> hashicorp.consul.internal.peering.Peering
-	1,  // 18: hashicorp.consul.internal.peering.PeeringWriteRequest.SecretsRequest:type_name -> hashicorp.consul.internal.peering.SecretsWriteRequest
-	37, // 19: hashicorp.consul.internal.peering.PeeringWriteRequest.Meta:type_name -> hashicorp.consul.internal.peering.PeeringWriteRequest.MetaEntry
-	6,  // 20: hashicorp.consul.internal.peering.TrustBundleListByServiceResponse.Bundles:type_name -> hashicorp.consul.internal.peering.PeeringTrustBundle
-	6,  // 21: hashicorp.consul.internal.peering.TrustBundleReadResponse.Bundle:type_name -> hashicorp.consul.internal.peering.PeeringTrustBundle
-	6,  // 22: hashicorp.consul.internal.peering.PeeringTrustBundleWriteRequest.PeeringTrustBundle:type_name -> hashicorp.consul.internal.peering.PeeringTrustBundle
-	38, // 23: hashicorp.consul.internal.peering.GenerateTokenRequest.Meta:type_name -> hashicorp.consul.internal.peering.GenerateTokenRequest.MetaEntry
-	39, // 24: hashicorp.consul.internal.peering.EstablishRequest.Meta:type_name -> hashicorp.consul.internal.peering.EstablishRequest.MetaEntry
-	26, // 25: hashicorp.consul.internal.peering.PeeringService.GenerateToken:input_type -> hashicorp.consul.internal.peering.GenerateTokenRequest
-	28, // 26: hashicorp.consul.internal.peering.PeeringService.Establish:input_type -> hashicorp.consul.internal.peering.EstablishRequest
-	8,  // 27: hashicorp.consul.internal.peering.PeeringService.PeeringRead:input_type -> hashicorp.consul.internal.peering.PeeringReadRequest
-	10, // 28: hashicorp.consul.internal.peering.PeeringService.PeeringList:input_type -> hashicorp.consul.internal.peering.PeeringListRequest
-	14, // 29: hashicorp.consul.internal.peering.PeeringService.PeeringDelete:input_type -> hashicorp.consul.internal.peering.PeeringDeleteRequest
-	12, // 30: hashicorp.consul.internal.peering.PeeringService.PeeringWrite:input_type -> hashicorp.consul.internal.peering.PeeringWriteRequest
-	16, // 31: hashicorp.consul.internal.peering.PeeringService.TrustBundleListByService:input_type -> hashicorp.consul.internal.peering.TrustBundleListByServiceRequest
-	18, // 32: hashicorp.consul.internal.peering.PeeringService.TrustBundleRead:input_type -> hashicorp.consul.internal.peering.TrustBundleReadRequest
-	27, // 33: hashicorp.consul.internal.peering.PeeringService.GenerateToken:output_type -> hashicorp.consul.internal.peering.GenerateTokenResponse
-	29, // 34: hashicorp.consul.internal.peering.PeeringService.Establish:output_type -> hashicorp.consul.internal.peering.EstablishResponse
-	9,  // 35: hashicorp.consul.internal.peering.PeeringService.PeeringRead:output_type -> hashicorp.consul.internal.peering.PeeringReadResponse
-	11, // 36: hashicorp.consul.internal.peering.PeeringService.PeeringList:output_type -> hashicorp.consul.internal.peering.PeeringListResponse
-	15, // 37: hashicorp.consul.internal.peering.PeeringService.PeeringDelete:output_type -> hashicorp.consul.internal.peering.PeeringDeleteResponse
-	13, // 38: hashicorp.consul.internal.peering.PeeringService.PeeringWrite:output_type -> hashicorp.consul.internal.peering.PeeringWriteResponse
-	17, // 39: hashicorp.consul.internal.peering.PeeringService.TrustBundleListByService:output_type -> hashicorp.consul.internal.peering.TrustBundleListByServiceResponse
-	19, // 40: hashicorp.consul.internal.peering.PeeringService.TrustBundleRead:output_type -> hashicorp.consul.internal.peering.TrustBundleReadResponse
-	33, // [33:41] is the sub-list for method output_type
-	25, // [25:33] is the sub-list for method input_type
-	25, // [25:25] is the sub-list for extension type_name
-	25, // [25:25] is the sub-list for extension extendee
-	0,  // [0:25] is the sub-list for field type_name
-}
-
-func init() { file_private_pbpeering_peering_proto_init() }
-func file_private_pbpeering_peering_proto_init() {
-	if File_private_pbpeering_peering_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbpeering_peering_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SecretsWriteRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringSecrets); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Peering); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RemoteInfo); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*StreamStatus); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringTrustBundle); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringServerAddresses); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringReadRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringReadResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringListRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringListResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringWriteRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringWriteResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringDeleteRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringDeleteResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TrustBundleListByServiceRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TrustBundleListByServiceResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TrustBundleReadRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TrustBundleReadResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringTerminateByIDRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringTerminateByIDResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringTrustBundleWriteRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringTrustBundleWriteResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringTrustBundleDeleteRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringTrustBundleDeleteResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GenerateTokenRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GenerateTokenResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EstablishRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EstablishResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SecretsWriteRequest_GenerateTokenRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SecretsWriteRequest_ExchangeSecretRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SecretsWriteRequest_PromotePendingRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SecretsWriteRequest_EstablishRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringSecrets_Establishment); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeering_peering_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringSecrets_Stream); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_private_pbpeering_peering_proto_msgTypes[0].OneofWrappers = []interface{}{
-		(*SecretsWriteRequest_GenerateToken)(nil),
-		(*SecretsWriteRequest_ExchangeSecret)(nil),
-		(*SecretsWriteRequest_PromotePending)(nil),
-		(*SecretsWriteRequest_Establish)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbpeering_peering_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   39,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_private_pbpeering_peering_proto_goTypes,
-		DependencyIndexes: file_private_pbpeering_peering_proto_depIdxs,
-		EnumInfos:         file_private_pbpeering_peering_proto_enumTypes,
-		MessageInfos:      file_private_pbpeering_peering_proto_msgTypes,
-	}.Build()
-	File_private_pbpeering_peering_proto = out.File
-	file_private_pbpeering_peering_proto_rawDesc = nil
-	file_private_pbpeering_peering_proto_goTypes = nil
-	file_private_pbpeering_peering_proto_depIdxs = nil
-}
diff --git a/proto/private/pbpeerstream/convert.go b/proto/private/pbpeerstream/convert.go
deleted file mode 100644
index d71dc5d3b15ff..0000000000000
--- a/proto/private/pbpeerstream/convert.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package pbpeerstream
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/agent/structs"
-	pbservice "github.com/hashicorp/consul/proto/private/pbservice"
-)
-
-// CheckServiceNodesToStruct converts the contained CheckServiceNodes to their structs equivalent.
-func (s *ExportedService) CheckServiceNodesToStruct() ([]structs.CheckServiceNode, error) {
-	if s == nil {
-		return nil, nil
-	}
-
-	resp := make([]structs.CheckServiceNode, 0, len(s.Nodes))
-	for _, pb := range s.Nodes {
-		instance, err := pbservice.CheckServiceNodeToStructs(pb)
-		if err != nil {
-			return resp, fmt.Errorf("failed to convert instance: %w", err)
-		}
-		resp = append(resp, *instance)
-	}
-	return resp, nil
-}
-
-func ExportedServiceListFromStruct(e *structs.ExportedServiceList) *ExportedServiceList {
-	services := make([]string, 0, len(e.Services))
-
-	for _, s := range e.Services {
-		services = append(services, s.String())
-	}
-
-	return &ExportedServiceList{
-		Services: services,
-	}
-}
diff --git a/proto/private/pbpeerstream/peerstream.go b/proto/private/pbpeerstream/peerstream.go
deleted file mode 100644
index 3dc6aa6093d83..0000000000000
--- a/proto/private/pbpeerstream/peerstream.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package pbpeerstream
-
-func (x Operation) GoString() string {
-	return x.String()
-}
diff --git a/proto/private/pbpeerstream/peerstream.pb.go b/proto/private/pbpeerstream/peerstream.pb.go
deleted file mode 100644
index aeb1bdb22082f..0000000000000
--- a/proto/private/pbpeerstream/peerstream.pb.go
+++ /dev/null
@@ -1,1142 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbpeerstream/peerstream.proto
-
-package pbpeerstream
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/annotations/ratelimit"
-	pbpeering "github.com/hashicorp/consul/proto/private/pbpeering"
-	pbservice "github.com/hashicorp/consul/proto/private/pbservice"
-	pbstatus "github.com/hashicorp/consul/proto/private/pbstatus"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	anypb "google.golang.org/protobuf/types/known/anypb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// Operation enumerates supported operations for replicated resources.
-type Operation int32
-
-const (
-	Operation_OPERATION_UNSPECIFIED Operation = 0
-	// UPSERT represents a create or update event.
-	Operation_OPERATION_UPSERT Operation = 1
-)
-
-// Enum value maps for Operation.
-var (
-	Operation_name = map[int32]string{
-		0: "OPERATION_UNSPECIFIED",
-		1: "OPERATION_UPSERT",
-	}
-	Operation_value = map[string]int32{
-		"OPERATION_UNSPECIFIED": 0,
-		"OPERATION_UPSERT":      1,
-	}
-)
-
-func (x Operation) Enum() *Operation {
-	p := new(Operation)
-	*p = x
-	return p
-}
-
-func (x Operation) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Operation) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbpeerstream_peerstream_proto_enumTypes[0].Descriptor()
-}
-
-func (Operation) Type() protoreflect.EnumType {
-	return &file_private_pbpeerstream_peerstream_proto_enumTypes[0]
-}
-
-func (x Operation) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Operation.Descriptor instead.
-func (Operation) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{0}
-}
-
-type ReplicationMessage struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to Payload:
-	//
-	//	*ReplicationMessage_Open_
-	//	*ReplicationMessage_Request_
-	//	*ReplicationMessage_Response_
-	//	*ReplicationMessage_Terminated_
-	//	*ReplicationMessage_Heartbeat_
-	Payload isReplicationMessage_Payload `protobuf_oneof:"Payload"`
-}
-
-func (x *ReplicationMessage) Reset() {
-	*x = ReplicationMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ReplicationMessage) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ReplicationMessage) ProtoMessage() {}
-
-func (x *ReplicationMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ReplicationMessage.ProtoReflect.Descriptor instead.
-func (*ReplicationMessage) Descriptor() ([]byte, []int) {
-	return file_private_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{0}
-}
-
-func (m *ReplicationMessage) GetPayload() isReplicationMessage_Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-func (x *ReplicationMessage) GetOpen() *ReplicationMessage_Open {
-	if x, ok := x.GetPayload().(*ReplicationMessage_Open_); ok {
-		return x.Open
-	}
-	return nil
-}
-
-func (x *ReplicationMessage) GetRequest() *ReplicationMessage_Request {
-	if x, ok := x.GetPayload().(*ReplicationMessage_Request_); ok {
-		return x.Request
-	}
-	return nil
-}
-
-func (x *ReplicationMessage) GetResponse() *ReplicationMessage_Response {
-	if x, ok := x.GetPayload().(*ReplicationMessage_Response_); ok {
-		return x.Response
-	}
-	return nil
-}
-
-func (x *ReplicationMessage) GetTerminated() *ReplicationMessage_Terminated {
-	if x, ok := x.GetPayload().(*ReplicationMessage_Terminated_); ok {
-		return x.Terminated
-	}
-	return nil
-}
-
-func (x *ReplicationMessage) GetHeartbeat() *ReplicationMessage_Heartbeat {
-	if x, ok := x.GetPayload().(*ReplicationMessage_Heartbeat_); ok {
-		return x.Heartbeat
-	}
-	return nil
-}
-
-type isReplicationMessage_Payload interface {
-	isReplicationMessage_Payload()
-}
-
-type ReplicationMessage_Open_ struct {
-	Open *ReplicationMessage_Open `protobuf:"bytes,1,opt,name=open,proto3,oneof"`
-}
-
-type ReplicationMessage_Request_ struct {
-	Request *ReplicationMessage_Request `protobuf:"bytes,2,opt,name=request,proto3,oneof"`
-}
-
-type ReplicationMessage_Response_ struct {
-	Response *ReplicationMessage_Response `protobuf:"bytes,3,opt,name=response,proto3,oneof"`
-}
-
-type ReplicationMessage_Terminated_ struct {
-	Terminated *ReplicationMessage_Terminated `protobuf:"bytes,4,opt,name=terminated,proto3,oneof"`
-}
-
-type ReplicationMessage_Heartbeat_ struct {
-	Heartbeat *ReplicationMessage_Heartbeat `protobuf:"bytes,5,opt,name=heartbeat,proto3,oneof"`
-}
-
-func (*ReplicationMessage_Open_) isReplicationMessage_Payload() {}
-
-func (*ReplicationMessage_Request_) isReplicationMessage_Payload() {}
-
-func (*ReplicationMessage_Response_) isReplicationMessage_Payload() {}
-
-func (*ReplicationMessage_Terminated_) isReplicationMessage_Payload() {}
-
-func (*ReplicationMessage_Heartbeat_) isReplicationMessage_Payload() {}
-
-// LeaderAddress is sent when the peering service runs on a consul node
-// that is not a leader. The node either lost leadership, or never was a leader.
-type LeaderAddress struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// address is an ip:port best effort hint at what could be the cluster leader's address
-	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-}
-
-func (x *LeaderAddress) Reset() {
-	*x = LeaderAddress{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LeaderAddress) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LeaderAddress) ProtoMessage() {}
-
-func (x *LeaderAddress) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LeaderAddress.ProtoReflect.Descriptor instead.
-func (*LeaderAddress) Descriptor() ([]byte, []int) {
-	return file_private_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *LeaderAddress) GetAddress() string {
-	if x != nil {
-		return x.Address
-	}
-	return ""
-}
-
-// ExportedService is one of the types of data returned via peer stream replication.
-type ExportedService struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Nodes []*pbservice.CheckServiceNode `protobuf:"bytes,1,rep,name=Nodes,proto3" json:"Nodes,omitempty"`
-}
-
-func (x *ExportedService) Reset() {
-	*x = ExportedService{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExportedService) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExportedService) ProtoMessage() {}
-
-func (x *ExportedService) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExportedService.ProtoReflect.Descriptor instead.
-func (*ExportedService) Descriptor() ([]byte, []int) {
-	return file_private_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *ExportedService) GetNodes() []*pbservice.CheckServiceNode {
-	if x != nil {
-		return x.Nodes
-	}
-	return nil
-}
-
-// ExportedServiceList is one of the types of data returned via peer stream replication.
-type ExportedServiceList struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// The identifiers for the services being exported.
-	Services []string `protobuf:"bytes,1,rep,name=Services,proto3" json:"Services,omitempty"`
-}
-
-func (x *ExportedServiceList) Reset() {
-	*x = ExportedServiceList{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExportedServiceList) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExportedServiceList) ProtoMessage() {}
-
-func (x *ExportedServiceList) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExportedServiceList.ProtoReflect.Descriptor instead.
-func (*ExportedServiceList) Descriptor() ([]byte, []int) {
-	return file_private_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *ExportedServiceList) GetServices() []string {
-	if x != nil {
-		return x.Services
-	}
-	return nil
-}
-
-type ExchangeSecretRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// PeerID is the ID of the peering, as determined by the cluster that generated the
-	// peering token.
-	PeerID string `protobuf:"bytes,1,opt,name=PeerID,proto3" json:"PeerID,omitempty"`
-	// EstablishmentSecret is the one-time-use secret encoded in the received peering token.
-	EstablishmentSecret string `protobuf:"bytes,2,opt,name=EstablishmentSecret,proto3" json:"EstablishmentSecret,omitempty"`
-}
-
-func (x *ExchangeSecretRequest) Reset() {
-	*x = ExchangeSecretRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExchangeSecretRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExchangeSecretRequest) ProtoMessage() {}
-
-func (x *ExchangeSecretRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExchangeSecretRequest.ProtoReflect.Descriptor instead.
-func (*ExchangeSecretRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *ExchangeSecretRequest) GetPeerID() string {
-	if x != nil {
-		return x.PeerID
-	}
-	return ""
-}
-
-func (x *ExchangeSecretRequest) GetEstablishmentSecret() string {
-	if x != nil {
-		return x.EstablishmentSecret
-	}
-	return ""
-}
-
-type ExchangeSecretResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// StreamSecret is the long-lived secret to be used for authentication with the
-	// peering stream handler.
-	StreamSecret string `protobuf:"bytes,1,opt,name=StreamSecret,proto3" json:"StreamSecret,omitempty"`
-}
-
-func (x *ExchangeSecretResponse) Reset() {
-	*x = ExchangeSecretResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExchangeSecretResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExchangeSecretResponse) ProtoMessage() {}
-
-func (x *ExchangeSecretResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExchangeSecretResponse.ProtoReflect.Descriptor instead.
-func (*ExchangeSecretResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *ExchangeSecretResponse) GetStreamSecret() string {
-	if x != nil {
-		return x.StreamSecret
-	}
-	return ""
-}
-
-// Open is the initial message send by a dialing peer to establish the peering stream.
-type ReplicationMessage_Open struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// An identifier for the peer making the request.
-	// This identifier is provisioned by the serving peer prior to the request from the dialing peer.
-	PeerID string `protobuf:"bytes,1,opt,name=PeerID,proto3" json:"PeerID,omitempty"`
-	// StreamSecretID contains the long-lived secret from stream authn/authz.
-	StreamSecretID string `protobuf:"bytes,2,opt,name=StreamSecretID,proto3" json:"StreamSecretID,omitempty"`
-	// Remote contains metadata about the remote peer.
-	Remote *pbpeering.RemoteInfo `protobuf:"bytes,3,opt,name=Remote,proto3" json:"Remote,omitempty"`
-}
-
-func (x *ReplicationMessage_Open) Reset() {
-	*x = ReplicationMessage_Open{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ReplicationMessage_Open) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ReplicationMessage_Open) ProtoMessage() {}
-
-func (x *ReplicationMessage_Open) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ReplicationMessage_Open.ProtoReflect.Descriptor instead.
-func (*ReplicationMessage_Open) Descriptor() ([]byte, []int) {
-	return file_private_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{0, 0}
-}
-
-func (x *ReplicationMessage_Open) GetPeerID() string {
-	if x != nil {
-		return x.PeerID
-	}
-	return ""
-}
-
-func (x *ReplicationMessage_Open) GetStreamSecretID() string {
-	if x != nil {
-		return x.StreamSecretID
-	}
-	return ""
-}
-
-func (x *ReplicationMessage_Open) GetRemote() *pbpeering.RemoteInfo {
-	if x != nil {
-		return x.Remote
-	}
-	return nil
-}
-
-// A Request requests to subscribe to a resource of a given type.
-type ReplicationMessage_Request struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// An identifier for the peer making the request.
-	// This identifier is provisioned by the serving peer prior to the request from the dialing peer.
-	PeerID string `protobuf:"bytes,1,opt,name=PeerID,proto3" json:"PeerID,omitempty"`
-	// ResponseNonce corresponding to that of the response being ACKed or NACKed.
-	// Initial subscription requests will have an empty nonce.
-	// The nonce is generated and incremented by the exporting peer.
-	// TODO
-	ResponseNonce string `protobuf:"bytes,2,opt,name=ResponseNonce,proto3" json:"ResponseNonce,omitempty"`
-	// The type URL for the resource being requested or ACK/NACKed.
-	ResourceURL string `protobuf:"bytes,3,opt,name=ResourceURL,proto3" json:"ResourceURL,omitempty"`
-	// The error if the previous response was not applied successfully.
-	// This field is empty in the first subscription request.
-	Error *pbstatus.Status `protobuf:"bytes,5,opt,name=Error,proto3" json:"Error,omitempty"`
-}
-
-func (x *ReplicationMessage_Request) Reset() {
-	*x = ReplicationMessage_Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ReplicationMessage_Request) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ReplicationMessage_Request) ProtoMessage() {}
-
-func (x *ReplicationMessage_Request) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ReplicationMessage_Request.ProtoReflect.Descriptor instead.
-func (*ReplicationMessage_Request) Descriptor() ([]byte, []int) {
-	return file_private_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{0, 1}
-}
-
-func (x *ReplicationMessage_Request) GetPeerID() string {
-	if x != nil {
-		return x.PeerID
-	}
-	return ""
-}
-
-func (x *ReplicationMessage_Request) GetResponseNonce() string {
-	if x != nil {
-		return x.ResponseNonce
-	}
-	return ""
-}
-
-func (x *ReplicationMessage_Request) GetResourceURL() string {
-	if x != nil {
-		return x.ResourceURL
-	}
-	return ""
-}
-
-func (x *ReplicationMessage_Request) GetError() *pbstatus.Status {
-	if x != nil {
-		return x.Error
-	}
-	return nil
-}
-
-// A Response contains resources corresponding to a subscription request.
-type ReplicationMessage_Response struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Nonce identifying a response in a stream.
-	Nonce string `protobuf:"bytes,1,opt,name=Nonce,proto3" json:"Nonce,omitempty"`
-	// The type URL of resource being returned.
-	ResourceURL string `protobuf:"bytes,2,opt,name=ResourceURL,proto3" json:"ResourceURL,omitempty"`
-	// An identifier for the resource being returned.
-	// This could be the SPIFFE ID of the service.
-	ResourceID string `protobuf:"bytes,3,opt,name=ResourceID,proto3" json:"ResourceID,omitempty"`
-	// The resource being returned.
-	Resource *anypb.Any `protobuf:"bytes,4,opt,name=Resource,proto3" json:"Resource,omitempty"`
-	// REQUIRED. The operation to be performed in relation to the resource.
-	Operation Operation `protobuf:"varint,5,opt,name=operation,proto3,enum=hashicorp.consul.internal.peerstream.Operation" json:"operation,omitempty"`
-}
-
-func (x *ReplicationMessage_Response) Reset() {
-	*x = ReplicationMessage_Response{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ReplicationMessage_Response) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ReplicationMessage_Response) ProtoMessage() {}
-
-func (x *ReplicationMessage_Response) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ReplicationMessage_Response.ProtoReflect.Descriptor instead.
-func (*ReplicationMessage_Response) Descriptor() ([]byte, []int) {
-	return file_private_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{0, 2}
-}
-
-func (x *ReplicationMessage_Response) GetNonce() string {
-	if x != nil {
-		return x.Nonce
-	}
-	return ""
-}
-
-func (x *ReplicationMessage_Response) GetResourceURL() string {
-	if x != nil {
-		return x.ResourceURL
-	}
-	return ""
-}
-
-func (x *ReplicationMessage_Response) GetResourceID() string {
-	if x != nil {
-		return x.ResourceID
-	}
-	return ""
-}
-
-func (x *ReplicationMessage_Response) GetResource() *anypb.Any {
-	if x != nil {
-		return x.Resource
-	}
-	return nil
-}
-
-func (x *ReplicationMessage_Response) GetOperation() Operation {
-	if x != nil {
-		return x.Operation
-	}
-	return Operation_OPERATION_UNSPECIFIED
-}
-
-// Terminated is sent when a peering is deleted locally.
-// This message signals to the peer that they should clean up their local state about the peering.
-type ReplicationMessage_Terminated struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *ReplicationMessage_Terminated) Reset() {
-	*x = ReplicationMessage_Terminated{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ReplicationMessage_Terminated) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ReplicationMessage_Terminated) ProtoMessage() {}
-
-func (x *ReplicationMessage_Terminated) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ReplicationMessage_Terminated.ProtoReflect.Descriptor instead.
-func (*ReplicationMessage_Terminated) Descriptor() ([]byte, []int) {
-	return file_private_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{0, 3}
-}
-
-// Heartbeat is sent to verify that the connection is still active.
-type ReplicationMessage_Heartbeat struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *ReplicationMessage_Heartbeat) Reset() {
-	*x = ReplicationMessage_Heartbeat{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ReplicationMessage_Heartbeat) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ReplicationMessage_Heartbeat) ProtoMessage() {}
-
-func (x *ReplicationMessage_Heartbeat) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbpeerstream_peerstream_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ReplicationMessage_Heartbeat.ProtoReflect.Descriptor instead.
-func (*ReplicationMessage_Heartbeat) Descriptor() ([]byte, []int) {
-	return file_private_pbpeerstream_peerstream_proto_rawDescGZIP(), []int{0, 4}
-}
-
-var File_private_pbpeerstream_peerstream_proto protoreflect.FileDescriptor
-
-var file_private_pbpeerstream_peerstream_proto_rawDesc = []byte{
-	0x0a, 0x25, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x70, 0x65, 0x65, 0x72,
-	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2f, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x24, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x1a, 0x25, 0x61,
-	0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c,
-	0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x1f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x70, 0x65, 0x65, 0x72, 0x69,
-	0x6e, 0x67, 0x2f, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x1c, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d,
-	0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbb, 0x08,
-	0x0a, 0x12, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x12, 0x53, 0x0a, 0x04, 0x6f, 0x70, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70,
-	0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x4f, 0x70, 0x65,
-	0x6e, 0x48, 0x00, 0x52, 0x04, 0x6f, 0x70, 0x65, 0x6e, 0x12, 0x5c, 0x0a, 0x07, 0x72, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x07,
-	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5f, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
-	0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x08,
-	0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x65, 0x0a, 0x0a, 0x74, 0x65, 0x72, 0x6d,
-	0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72,
-	0x65, 0x61, 0x6d, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65,
-	0x64, 0x48, 0x00, 0x52, 0x0a, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x12,
-	0x62, 0x0a, 0x09, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x42, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70,
-	0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x48, 0x65, 0x61,
-	0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x48, 0x00, 0x52, 0x09, 0x68, 0x65, 0x61, 0x72, 0x74, 0x62,
-	0x65, 0x61, 0x74, 0x1a, 0x8d, 0x01, 0x0a, 0x04, 0x4f, 0x70, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06,
-	0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x50, 0x65,
-	0x65, 0x72, 0x49, 0x44, 0x12, 0x26, 0x0a, 0x0e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x65,
-	0x63, 0x72, 0x65, 0x74, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x53, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x49, 0x44, 0x12, 0x45, 0x0a, 0x06,
-	0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67,
-	0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x52, 0x65, 0x6d,
-	0x6f, 0x74, 0x65, 0x1a, 0xa9, 0x01, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x16, 0x0a, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x12, 0x24, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x12, 0x20, 0x0a,
-	0x0b, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x55, 0x52, 0x4c, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0b, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x55, 0x52, 0x4c, 0x12,
-	0x3e, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x1a,
-	0xe3, 0x01, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05,
-	0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4e, 0x6f, 0x6e,
-	0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x55, 0x52,
-	0x4c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x55, 0x52, 0x4c, 0x12, 0x1e, 0x0a, 0x0a, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x49, 0x44, 0x12, 0x30, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x08, 0x52, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x4d, 0x0a, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2f, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
-	0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x6f, 0x70, 0x65, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x0c, 0x0a, 0x0a, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61,
-	0x74, 0x65, 0x64, 0x1a, 0x0b, 0x0a, 0x09, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74,
-	0x42, 0x09, 0x0a, 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x29, 0x0a, 0x0d, 0x4c,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07,
-	0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x5c, 0x0a, 0x0f, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74,
-	0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x49, 0x0a, 0x05, 0x4e, 0x6f, 0x64,
-	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x43, 0x68, 0x65,
-	0x63, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x05, 0x4e,
-	0x6f, 0x64, 0x65, 0x73, 0x22, 0x31, 0x0a, 0x13, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x22, 0x61, 0x0a, 0x15, 0x45, 0x78, 0x63, 0x68, 0x61,
-	0x6e, 0x67, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x16, 0x0a, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x50, 0x65, 0x65, 0x72, 0x49, 0x44, 0x12, 0x30, 0x0a, 0x13, 0x45, 0x73, 0x74, 0x61,
-	0x62, 0x6c, 0x69, 0x73, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68,
-	0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x22, 0x3c, 0x0a, 0x16, 0x45, 0x78,
-	0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x65,
-	0x63, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x53, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x2a, 0x3c, 0x0a, 0x09, 0x4f, 0x70, 0x65, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x15, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49,
-	0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
-	0x12, 0x14, 0x0a, 0x10, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x50,
-	0x53, 0x45, 0x52, 0x54, 0x10, 0x01, 0x32, 0xc1, 0x02, 0x0a, 0x11, 0x50, 0x65, 0x65, 0x72, 0x53,
-	0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x93, 0x01, 0x0a,
-	0x0f, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
-	0x12, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65,
-	0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x38, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x02, 0x28, 0x01,
-	0x30, 0x01, 0x12, 0x95, 0x01, 0x0a, 0x0e, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53,
-	0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x3b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x45, 0x78, 0x63,
-	0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x3c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70,
-	0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e,
-	0x67, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x03, 0x10, 0x02, 0x42, 0xa7, 0x02, 0x0a, 0x28, 0x63,
-	0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x65, 0x65,
-	0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x42, 0x0f, 0x50, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72,
-	0x65, 0x61, 0x6d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72,
-	0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x70, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x50, 0xaa, 0x02, 0x24, 0x48, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d,
-	0xca, 0x02, 0x24, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x50, 0x65, 0x65,
-	0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0xe2, 0x02, 0x30, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x5c, 0x50, 0x65, 0x65, 0x72, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5c, 0x47,
-	0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x27, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a,
-	0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x50, 0x65, 0x65, 0x72, 0x73, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pbpeerstream_peerstream_proto_rawDescOnce sync.Once
-	file_private_pbpeerstream_peerstream_proto_rawDescData = file_private_pbpeerstream_peerstream_proto_rawDesc
-)
-
-func file_private_pbpeerstream_peerstream_proto_rawDescGZIP() []byte {
-	file_private_pbpeerstream_peerstream_proto_rawDescOnce.Do(func() {
-		file_private_pbpeerstream_peerstream_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbpeerstream_peerstream_proto_rawDescData)
-	})
-	return file_private_pbpeerstream_peerstream_proto_rawDescData
-}
-
-var file_private_pbpeerstream_peerstream_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_private_pbpeerstream_peerstream_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
-var file_private_pbpeerstream_peerstream_proto_goTypes = []interface{}{
-	(Operation)(0),                        // 0: hashicorp.consul.internal.peerstream.Operation
-	(*ReplicationMessage)(nil),            // 1: hashicorp.consul.internal.peerstream.ReplicationMessage
-	(*LeaderAddress)(nil),                 // 2: hashicorp.consul.internal.peerstream.LeaderAddress
-	(*ExportedService)(nil),               // 3: hashicorp.consul.internal.peerstream.ExportedService
-	(*ExportedServiceList)(nil),           // 4: hashicorp.consul.internal.peerstream.ExportedServiceList
-	(*ExchangeSecretRequest)(nil),         // 5: hashicorp.consul.internal.peerstream.ExchangeSecretRequest
-	(*ExchangeSecretResponse)(nil),        // 6: hashicorp.consul.internal.peerstream.ExchangeSecretResponse
-	(*ReplicationMessage_Open)(nil),       // 7: hashicorp.consul.internal.peerstream.ReplicationMessage.Open
-	(*ReplicationMessage_Request)(nil),    // 8: hashicorp.consul.internal.peerstream.ReplicationMessage.Request
-	(*ReplicationMessage_Response)(nil),   // 9: hashicorp.consul.internal.peerstream.ReplicationMessage.Response
-	(*ReplicationMessage_Terminated)(nil), // 10: hashicorp.consul.internal.peerstream.ReplicationMessage.Terminated
-	(*ReplicationMessage_Heartbeat)(nil),  // 11: hashicorp.consul.internal.peerstream.ReplicationMessage.Heartbeat
-	(*pbservice.CheckServiceNode)(nil),    // 12: hashicorp.consul.internal.service.CheckServiceNode
-	(*pbpeering.RemoteInfo)(nil),          // 13: hashicorp.consul.internal.peering.RemoteInfo
-	(*pbstatus.Status)(nil),               // 14: hashicorp.consul.internal.status.Status
-	(*anypb.Any)(nil),                     // 15: google.protobuf.Any
-}
-var file_private_pbpeerstream_peerstream_proto_depIdxs = []int32{
-	7,  // 0: hashicorp.consul.internal.peerstream.ReplicationMessage.open:type_name -> hashicorp.consul.internal.peerstream.ReplicationMessage.Open
-	8,  // 1: hashicorp.consul.internal.peerstream.ReplicationMessage.request:type_name -> hashicorp.consul.internal.peerstream.ReplicationMessage.Request
-	9,  // 2: hashicorp.consul.internal.peerstream.ReplicationMessage.response:type_name -> hashicorp.consul.internal.peerstream.ReplicationMessage.Response
-	10, // 3: hashicorp.consul.internal.peerstream.ReplicationMessage.terminated:type_name -> hashicorp.consul.internal.peerstream.ReplicationMessage.Terminated
-	11, // 4: hashicorp.consul.internal.peerstream.ReplicationMessage.heartbeat:type_name -> hashicorp.consul.internal.peerstream.ReplicationMessage.Heartbeat
-	12, // 5: hashicorp.consul.internal.peerstream.ExportedService.Nodes:type_name -> hashicorp.consul.internal.service.CheckServiceNode
-	13, // 6: hashicorp.consul.internal.peerstream.ReplicationMessage.Open.Remote:type_name -> hashicorp.consul.internal.peering.RemoteInfo
-	14, // 7: hashicorp.consul.internal.peerstream.ReplicationMessage.Request.Error:type_name -> hashicorp.consul.internal.status.Status
-	15, // 8: hashicorp.consul.internal.peerstream.ReplicationMessage.Response.Resource:type_name -> google.protobuf.Any
-	0,  // 9: hashicorp.consul.internal.peerstream.ReplicationMessage.Response.operation:type_name -> hashicorp.consul.internal.peerstream.Operation
-	1,  // 10: hashicorp.consul.internal.peerstream.PeerStreamService.StreamResources:input_type -> hashicorp.consul.internal.peerstream.ReplicationMessage
-	5,  // 11: hashicorp.consul.internal.peerstream.PeerStreamService.ExchangeSecret:input_type -> hashicorp.consul.internal.peerstream.ExchangeSecretRequest
-	1,  // 12: hashicorp.consul.internal.peerstream.PeerStreamService.StreamResources:output_type -> hashicorp.consul.internal.peerstream.ReplicationMessage
-	6,  // 13: hashicorp.consul.internal.peerstream.PeerStreamService.ExchangeSecret:output_type -> hashicorp.consul.internal.peerstream.ExchangeSecretResponse
-	12, // [12:14] is the sub-list for method output_type
-	10, // [10:12] is the sub-list for method input_type
-	10, // [10:10] is the sub-list for extension type_name
-	10, // [10:10] is the sub-list for extension extendee
-	0,  // [0:10] is the sub-list for field type_name
-}
-
-func init() { file_private_pbpeerstream_peerstream_proto_init() }
-func file_private_pbpeerstream_peerstream_proto_init() {
-	if File_private_pbpeerstream_peerstream_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbpeerstream_peerstream_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReplicationMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeerstream_peerstream_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LeaderAddress); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeerstream_peerstream_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExportedService); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeerstream_peerstream_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExportedServiceList); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeerstream_peerstream_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExchangeSecretRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeerstream_peerstream_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExchangeSecretResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeerstream_peerstream_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReplicationMessage_Open); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeerstream_peerstream_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReplicationMessage_Request); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeerstream_peerstream_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReplicationMessage_Response); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeerstream_peerstream_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReplicationMessage_Terminated); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbpeerstream_peerstream_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReplicationMessage_Heartbeat); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_private_pbpeerstream_peerstream_proto_msgTypes[0].OneofWrappers = []interface{}{
-		(*ReplicationMessage_Open_)(nil),
-		(*ReplicationMessage_Request_)(nil),
-		(*ReplicationMessage_Response_)(nil),
-		(*ReplicationMessage_Terminated_)(nil),
-		(*ReplicationMessage_Heartbeat_)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbpeerstream_peerstream_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   11,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_private_pbpeerstream_peerstream_proto_goTypes,
-		DependencyIndexes: file_private_pbpeerstream_peerstream_proto_depIdxs,
-		EnumInfos:         file_private_pbpeerstream_peerstream_proto_enumTypes,
-		MessageInfos:      file_private_pbpeerstream_peerstream_proto_msgTypes,
-	}.Build()
-	File_private_pbpeerstream_peerstream_proto = out.File
-	file_private_pbpeerstream_peerstream_proto_rawDesc = nil
-	file_private_pbpeerstream_peerstream_proto_goTypes = nil
-	file_private_pbpeerstream_peerstream_proto_depIdxs = nil
-}
diff --git a/proto/private/pbpeerstream/types.go b/proto/private/pbpeerstream/types.go
deleted file mode 100644
index bf2250c64dd9c..0000000000000
--- a/proto/private/pbpeerstream/types.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package pbpeerstream
-
-const (
-	apiTypePrefix = "type.googleapis.com/"
-
-	TypeURLExportedService        = apiTypePrefix + "hashicorp.consul.internal.peerstream.ExportedService"
-	TypeURLExportedServiceList    = apiTypePrefix + "hashicorp.consul.internal.peerstream.ExportedServiceList"
-	TypeURLPeeringTrustBundle     = apiTypePrefix + "hashicorp.consul.internal.peering.PeeringTrustBundle"
-	TypeURLPeeringServerAddresses = apiTypePrefix + "hashicorp.consul.internal.peering.PeeringServerAddresses"
-)
-
-func KnownTypeURL(s string) bool {
-	switch s {
-	case TypeURLExportedService, TypeURLExportedServiceList, TypeURLPeeringTrustBundle, TypeURLPeeringServerAddresses:
-		return true
-	}
-	return false
-}
diff --git a/proto/private/pbservice/convert.go b/proto/private/pbservice/convert.go
deleted file mode 100644
index 8396ff7c649f2..0000000000000
--- a/proto/private/pbservice/convert.go
+++ /dev/null
@@ -1,303 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package pbservice
-
-import (
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-	"github.com/hashicorp/consul/types"
-)
-
-type CheckIDType = types.CheckID
-type NodeIDType = types.NodeID
-
-// Function variables to support proto generation
-// This allows for using functions in the local package without having to generate imports
-var EnvoyExtensionsToStructs = pbcommon.EnvoyExtensionsToStructs
-var EnvoyExtensionsFromStructs = pbcommon.EnvoyExtensionsFromStructs
-var ProtobufTypesStructToMapStringInterface = pbcommon.ProtobufTypesStructToMapStringInterface
-var MapStringInterfaceToProtobufTypesStruct = pbcommon.MapStringInterfaceToProtobufTypesStruct
-
-func RaftIndexToStructs(s *pbcommon.RaftIndex) structs.RaftIndex {
-	if s == nil {
-		return structs.RaftIndex{}
-	}
-	return structs.RaftIndex{
-		CreateIndex: s.CreateIndex,
-		ModifyIndex: s.ModifyIndex,
-	}
-}
-
-func NewRaftIndexFromStructs(s structs.RaftIndex) *pbcommon.RaftIndex {
-	return &pbcommon.RaftIndex{
-		CreateIndex: s.CreateIndex,
-		ModifyIndex: s.ModifyIndex,
-	}
-}
-
-func MapHeadersToStructs(s map[string]*HeaderValue) map[string][]string {
-	t := make(map[string][]string, len(s))
-	for k, v := range s {
-		t[k] = v.Value
-	}
-	return t
-}
-
-func NewMapHeadersFromStructs(t map[string][]string) map[string]*HeaderValue {
-	s := make(map[string]*HeaderValue, len(t))
-	for k, v := range t {
-		s[k] = &HeaderValue{Value: v}
-	}
-	return s
-}
-
-// TODO: use mog once it supports pointers and slices
-func CheckServiceNodeToStructs(s *CheckServiceNode) (*structs.CheckServiceNode, error) {
-	if s == nil {
-		return nil, nil
-	}
-	var t structs.CheckServiceNode
-	if s.Node != nil {
-		n := new(structs.Node)
-		NodeToStructs(s.Node, n)
-		t.Node = n
-	}
-	if s.Service != nil {
-		r := new(structs.NodeService)
-		NodeServiceToStructs(s.Service, r)
-		t.Service = r
-	}
-	t.Checks = make(structs.HealthChecks, len(s.Checks))
-	for i, c := range s.Checks {
-		if c == nil {
-			continue
-		}
-		h := new(structs.HealthCheck)
-		HealthCheckToStructs(c, h)
-		t.Checks[i] = h
-	}
-	return &t, nil
-}
-
-// TODO: use mog once it supports pointers and slices
-func NewCheckServiceNodeFromStructs(t *structs.CheckServiceNode) *CheckServiceNode {
-	if t == nil {
-		return nil
-	}
-	var s CheckServiceNode
-	if t.Node != nil {
-		n := new(Node)
-		NodeFromStructs(t.Node, n)
-		s.Node = n
-	}
-	if t.Service != nil {
-		r := new(NodeService)
-		NodeServiceFromStructs(t.Service, r)
-		s.Service = r
-	}
-	s.Checks = make([]*HealthCheck, len(t.Checks))
-	for i, c := range t.Checks {
-		if c == nil {
-			continue
-		}
-		h := new(HealthCheck)
-		HealthCheckFromStructs(c, h)
-		s.Checks[i] = h
-	}
-	return &s
-}
-
-// TODO: handle this with mog, once mog handles pointers
-func WeightsPtrToStructs(s *Weights) *structs.Weights {
-	if s == nil {
-		return nil
-	}
-	var t structs.Weights
-	t.Passing = int(s.Passing)
-	t.Warning = int(s.Warning)
-	return &t
-}
-
-// TODO: handle this with mog, once mog handles pointers
-func NewWeightsPtrFromStructs(t *structs.Weights) *Weights {
-	if t == nil {
-		return nil
-	}
-	var s Weights
-	s.Passing = int32(t.Passing)
-	s.Warning = int32(t.Warning)
-	return &s
-}
-
-// TODO: handle this with mog
-func MapStringServiceAddressToStructs(s map[string]*ServiceAddress) map[string]structs.ServiceAddress {
-	t := make(map[string]structs.ServiceAddress, len(s))
-	for k, v := range s {
-		t[k] = structs.ServiceAddress{Address: v.Address, Port: int(v.Port)}
-	}
-	return t
-}
-
-// TODO: handle this with mog
-func NewMapStringServiceAddressFromStructs(t map[string]structs.ServiceAddress) map[string]*ServiceAddress {
-	s := make(map[string]*ServiceAddress, len(t))
-	for k, v := range t {
-		s[k] = &ServiceAddress{Address: v.Address, Port: int32(v.Port)}
-	}
-	return s
-}
-
-// TODO: handle this with mog
-func ExposePathSliceToStructs(s []*ExposePath) []structs.ExposePath {
-	t := make([]structs.ExposePath, len(s))
-	for i, v := range s {
-		e := new(structs.ExposePath)
-		ExposePathToStructs(v, e)
-		t[i] = *e
-	}
-	return t
-}
-
-// TODO: handle this with mog
-func NewExposePathSliceFromStructs(t []structs.ExposePath) []*ExposePath {
-	s := make([]*ExposePath, len(t))
-	for i, v := range t {
-		ep := new(ExposePath)
-		ExposePathFromStructs(&v, ep)
-		s[i] = ep
-	}
-	return s
-}
-
-// TODO: handle this with mog
-func UpstreamsToStructs(s []*Upstream) structs.Upstreams {
-	t := make(structs.Upstreams, len(s))
-	for i, v := range s {
-		u := new(structs.Upstream)
-		UpstreamToStructs(v, u)
-		t[i] = *u
-	}
-	return t
-}
-
-// TODO: handle this with mog
-func NewUpstreamsFromStructs(t structs.Upstreams) []*Upstream {
-	s := make([]*Upstream, len(t))
-	for i, v := range t {
-		u := new(Upstream)
-		UpstreamFromStructs(&v, u)
-		s[i] = u
-	}
-	return s
-}
-
-// TODO: handle this with mog
-func CheckTypesToStructs(s []*CheckType) structs.CheckTypes {
-	t := make(structs.CheckTypes, len(s))
-	for i, v := range s {
-		if v == nil {
-			continue
-		}
-		c := new(structs.CheckType)
-		CheckTypeToStructs(v, c)
-		t[i] = c
-	}
-	return t
-}
-
-// TODO: handle this with mog
-func NewCheckTypesFromStructs(t structs.CheckTypes) []*CheckType {
-	s := make([]*CheckType, len(t))
-	for i, v := range t {
-		if v == nil {
-			continue
-		}
-		newV := new(CheckType)
-		CheckTypeFromStructs(v, newV)
-		s[i] = newV
-	}
-	return s
-}
-
-// TODO: handle this with mog
-func ConnectProxyConfigPtrToStructs(s *ConnectProxyConfig) *structs.ConnectProxyConfig {
-	if s == nil {
-		return nil
-	}
-	c := new(structs.ConnectProxyConfig)
-	ConnectProxyConfigToStructs(s, c)
-	return c
-}
-
-// TODO: handle this with mog
-func NewConnectProxyConfigPtrFromStructs(t *structs.ConnectProxyConfig) *ConnectProxyConfig {
-	if t == nil {
-		return nil
-	}
-	cp := new(ConnectProxyConfig)
-	ConnectProxyConfigFromStructs(t, cp)
-	return cp
-}
-
-// TODO: handle this with mog
-func ServiceConnectPtrToStructs(s *ServiceConnect) *structs.ServiceConnect {
-	if s == nil {
-		return nil
-	}
-	sc := new(structs.ServiceConnect)
-	ServiceConnectToStructs(s, sc)
-	return sc
-}
-
-// TODO: handle this with mog
-func NewServiceConnectPtrFromStructs(t *structs.ServiceConnect) *ServiceConnect {
-	if t == nil {
-		return nil
-	}
-	sc := new(ServiceConnect)
-	ServiceConnectFromStructs(t, sc)
-	return sc
-}
-
-// TODO: handle this with mog
-func ServiceDefinitionPtrToStructs(s *ServiceDefinition) *structs.ServiceDefinition {
-	if s == nil {
-		return nil
-	}
-	sd := new(structs.ServiceDefinition)
-	ServiceDefinitionToStructs(s, sd)
-	return sd
-}
-
-// TODO: handle this with mog
-func NewServiceDefinitionPtrFromStructs(t *structs.ServiceDefinition) *ServiceDefinition {
-	if t == nil {
-		return nil
-	}
-	sd := new(ServiceDefinition)
-	ServiceDefinitionFromStructs(t, sd)
-	return sd
-}
-
-// TODO: handle this with mog
-func LocalityToStructs(l *pbcommon.Locality) *structs.Locality {
-	if l == nil {
-		return nil
-	}
-	return &structs.Locality{
-		Region: l.Region,
-		Zone:   l.Zone,
-	}
-}
-
-// TODO: handle this with mog
-func LocalityFromStructs(l *structs.Locality) *pbcommon.Locality {
-	if l == nil {
-		return nil
-	}
-	return &pbcommon.Locality{
-		Region: l.Region,
-		Zone:   l.Zone,
-	}
-}
diff --git a/proto/private/pbservice/convert_ce.go b/proto/private/pbservice/convert_ce.go
deleted file mode 100644
index 444e06134c501..0000000000000
--- a/proto/private/pbservice/convert_ce.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package pbservice
-
-import (
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/proto/private/pbcommon"
-)
-
-func EnterpriseMetaToStructs(_ *pbcommon.EnterpriseMeta) acl.EnterpriseMeta {
-	return acl.EnterpriseMeta{}
-}
-
-func NewEnterpriseMetaFromStructs(_ acl.EnterpriseMeta) *pbcommon.EnterpriseMeta {
-	return &pbcommon.EnterpriseMeta{}
-}
diff --git a/proto/private/pbservice/convert_ce_test.go b/proto/private/pbservice/convert_ce_test.go
deleted file mode 100644
index 74da8e699b3be..0000000000000
--- a/proto/private/pbservice/convert_ce_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package pbservice
-
-import (
-	fuzz "github.com/google/gofuzz"
-
-	"github.com/hashicorp/consul/acl"
-)
-
-func randEnterpriseMeta(_ *acl.EnterpriseMeta, _ fuzz.Continue) {
-}
diff --git a/proto/private/pbservice/healthcheck.pb.go b/proto/private/pbservice/healthcheck.pb.go
deleted file mode 100644
index 0392fd77455be..0000000000000
--- a/proto/private/pbservice/healthcheck.pb.go
+++ /dev/null
@@ -1,1197 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbservice/healthcheck.proto
-
-package pbservice
-
-import (
-	pbcommon "github.com/hashicorp/consul/proto/private/pbcommon"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// HealthCheck represents a single check on a given node
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HealthCheck
-// output=healthcheck.gen.go
-// name=Structs
-type HealthCheck struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Node string `protobuf:"bytes,1,opt,name=Node,proto3" json:"Node,omitempty"`
-	// mog: func-to=CheckIDType func-from=string
-	CheckID     string                 `protobuf:"bytes,2,opt,name=CheckID,proto3" json:"CheckID,omitempty"`
-	Name        string                 `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"`
-	Status      string                 `protobuf:"bytes,4,opt,name=Status,proto3" json:"Status,omitempty"`           // The current check status
-	Notes       string                 `protobuf:"bytes,5,opt,name=Notes,proto3" json:"Notes,omitempty"`             // Additional notes with the status
-	Output      string                 `protobuf:"bytes,6,opt,name=Output,proto3" json:"Output,omitempty"`           // Holds output of script runs
-	ServiceID   string                 `protobuf:"bytes,7,opt,name=ServiceID,proto3" json:"ServiceID,omitempty"`     // optional associated service
-	ServiceName string                 `protobuf:"bytes,8,opt,name=ServiceName,proto3" json:"ServiceName,omitempty"` // optional service name
-	ServiceTags []string               `protobuf:"bytes,9,rep,name=ServiceTags,proto3" json:"ServiceTags,omitempty"` // optional service tags
-	Type        string                 `protobuf:"bytes,12,opt,name=Type,proto3" json:"Type,omitempty"`              // Check type: http/ttl/tcp/etc
-	Definition  *HealthCheckDefinition `protobuf:"bytes,10,opt,name=Definition,proto3" json:"Definition,omitempty"`
-	// mog: func-to=RaftIndexToStructs func-from=NewRaftIndexFromStructs
-	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,11,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
-	// mog: func-to=EnterpriseMetaToStructs func-from=NewEnterpriseMetaFromStructs
-	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,13,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
-	// mog: func-to=int func-from=int32
-	ExposedPort int32  `protobuf:"varint,14,opt,name=ExposedPort,proto3" json:"ExposedPort,omitempty"`
-	Interval    string `protobuf:"bytes,15,opt,name=Interval,proto3" json:"Interval,omitempty"`
-	Timeout     string `protobuf:"bytes,16,opt,name=Timeout,proto3" json:"Timeout,omitempty"`
-	PeerName    string `protobuf:"bytes,17,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
-}
-
-func (x *HealthCheck) Reset() {
-	*x = HealthCheck{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_healthcheck_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HealthCheck) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HealthCheck) ProtoMessage() {}
-
-func (x *HealthCheck) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_healthcheck_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HealthCheck.ProtoReflect.Descriptor instead.
-func (*HealthCheck) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_healthcheck_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *HealthCheck) GetNode() string {
-	if x != nil {
-		return x.Node
-	}
-	return ""
-}
-
-func (x *HealthCheck) GetCheckID() string {
-	if x != nil {
-		return x.CheckID
-	}
-	return ""
-}
-
-func (x *HealthCheck) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *HealthCheck) GetStatus() string {
-	if x != nil {
-		return x.Status
-	}
-	return ""
-}
-
-func (x *HealthCheck) GetNotes() string {
-	if x != nil {
-		return x.Notes
-	}
-	return ""
-}
-
-func (x *HealthCheck) GetOutput() string {
-	if x != nil {
-		return x.Output
-	}
-	return ""
-}
-
-func (x *HealthCheck) GetServiceID() string {
-	if x != nil {
-		return x.ServiceID
-	}
-	return ""
-}
-
-func (x *HealthCheck) GetServiceName() string {
-	if x != nil {
-		return x.ServiceName
-	}
-	return ""
-}
-
-func (x *HealthCheck) GetServiceTags() []string {
-	if x != nil {
-		return x.ServiceTags
-	}
-	return nil
-}
-
-func (x *HealthCheck) GetType() string {
-	if x != nil {
-		return x.Type
-	}
-	return ""
-}
-
-func (x *HealthCheck) GetDefinition() *HealthCheckDefinition {
-	if x != nil {
-		return x.Definition
-	}
-	return nil
-}
-
-func (x *HealthCheck) GetRaftIndex() *pbcommon.RaftIndex {
-	if x != nil {
-		return x.RaftIndex
-	}
-	return nil
-}
-
-func (x *HealthCheck) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if x != nil {
-		return x.EnterpriseMeta
-	}
-	return nil
-}
-
-func (x *HealthCheck) GetExposedPort() int32 {
-	if x != nil {
-		return x.ExposedPort
-	}
-	return 0
-}
-
-func (x *HealthCheck) GetInterval() string {
-	if x != nil {
-		return x.Interval
-	}
-	return ""
-}
-
-func (x *HealthCheck) GetTimeout() string {
-	if x != nil {
-		return x.Timeout
-	}
-	return ""
-}
-
-func (x *HealthCheck) GetPeerName() string {
-	if x != nil {
-		return x.PeerName
-	}
-	return ""
-}
-
-type HeaderValue struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Value []string `protobuf:"bytes,1,rep,name=Value,proto3" json:"Value,omitempty"`
-}
-
-func (x *HeaderValue) Reset() {
-	*x = HeaderValue{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_healthcheck_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HeaderValue) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HeaderValue) ProtoMessage() {}
-
-func (x *HeaderValue) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_healthcheck_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HeaderValue.ProtoReflect.Descriptor instead.
-func (*HeaderValue) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_healthcheck_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *HeaderValue) GetValue() []string {
-	if x != nil {
-		return x.Value
-	}
-	return nil
-}
-
-// HealthCheckDefinition of a single HealthCheck.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.HealthCheckDefinition
-// output=healthcheck.gen.go
-// name=Structs
-type HealthCheckDefinition struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	HTTP          string `protobuf:"bytes,1,opt,name=HTTP,proto3" json:"HTTP,omitempty"`
-	TLSServerName string `protobuf:"bytes,19,opt,name=TLSServerName,proto3" json:"TLSServerName,omitempty"`
-	TLSSkipVerify bool   `protobuf:"varint,2,opt,name=TLSSkipVerify,proto3" json:"TLSSkipVerify,omitempty"`
-	// mog: func-to=MapHeadersToStructs func-from=NewMapHeadersFromStructs
-	Header           map[string]*HeaderValue `protobuf:"bytes,3,rep,name=Header,proto3" json:"Header,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Method           string                  `protobuf:"bytes,4,opt,name=Method,proto3" json:"Method,omitempty"`
-	Body             string                  `protobuf:"bytes,18,opt,name=Body,proto3" json:"Body,omitempty"`
-	DisableRedirects bool                    `protobuf:"varint,22,opt,name=DisableRedirects,proto3" json:"DisableRedirects,omitempty"`
-	TCP              string                  `protobuf:"bytes,5,opt,name=TCP,proto3" json:"TCP,omitempty"`
-	TCPUseTLS        bool                    `protobuf:"varint,25,opt,name=TCPUseTLS,proto3" json:"TCPUseTLS,omitempty"`
-	UDP              string                  `protobuf:"bytes,23,opt,name=UDP,proto3" json:"UDP,omitempty"`
-	OSService        string                  `protobuf:"bytes,24,opt,name=OSService,proto3" json:"OSService,omitempty"`
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	Interval *durationpb.Duration `protobuf:"bytes,6,opt,name=Interval,proto3" json:"Interval,omitempty"`
-	// mog: func-to=uint func-from=uint32
-	OutputMaxSize uint32 `protobuf:"varint,9,opt,name=OutputMaxSize,proto3" json:"OutputMaxSize,omitempty"`
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	Timeout *durationpb.Duration `protobuf:"bytes,7,opt,name=Timeout,proto3" json:"Timeout,omitempty"`
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	DeregisterCriticalServiceAfter *durationpb.Duration `protobuf:"bytes,8,opt,name=DeregisterCriticalServiceAfter,proto3" json:"DeregisterCriticalServiceAfter,omitempty"`
-	ScriptArgs                     []string             `protobuf:"bytes,10,rep,name=ScriptArgs,proto3" json:"ScriptArgs,omitempty"`
-	DockerContainerID              string               `protobuf:"bytes,11,opt,name=DockerContainerID,proto3" json:"DockerContainerID,omitempty"`
-	Shell                          string               `protobuf:"bytes,12,opt,name=Shell,proto3" json:"Shell,omitempty"`
-	H2PING                         string               `protobuf:"bytes,20,opt,name=H2PING,proto3" json:"H2PING,omitempty"`
-	H2PingUseTLS                   bool                 `protobuf:"varint,21,opt,name=H2PingUseTLS,proto3" json:"H2PingUseTLS,omitempty"`
-	GRPC                           string               `protobuf:"bytes,13,opt,name=GRPC,proto3" json:"GRPC,omitempty"`
-	GRPCUseTLS                     bool                 `protobuf:"varint,14,opt,name=GRPCUseTLS,proto3" json:"GRPCUseTLS,omitempty"`
-	AliasNode                      string               `protobuf:"bytes,15,opt,name=AliasNode,proto3" json:"AliasNode,omitempty"`
-	AliasService                   string               `protobuf:"bytes,16,opt,name=AliasService,proto3" json:"AliasService,omitempty"`
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	TTL *durationpb.Duration `protobuf:"bytes,17,opt,name=TTL,proto3" json:"TTL,omitempty"`
-}
-
-func (x *HealthCheckDefinition) Reset() {
-	*x = HealthCheckDefinition{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_healthcheck_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HealthCheckDefinition) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HealthCheckDefinition) ProtoMessage() {}
-
-func (x *HealthCheckDefinition) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_healthcheck_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HealthCheckDefinition.ProtoReflect.Descriptor instead.
-func (*HealthCheckDefinition) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_healthcheck_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *HealthCheckDefinition) GetHTTP() string {
-	if x != nil {
-		return x.HTTP
-	}
-	return ""
-}
-
-func (x *HealthCheckDefinition) GetTLSServerName() string {
-	if x != nil {
-		return x.TLSServerName
-	}
-	return ""
-}
-
-func (x *HealthCheckDefinition) GetTLSSkipVerify() bool {
-	if x != nil {
-		return x.TLSSkipVerify
-	}
-	return false
-}
-
-func (x *HealthCheckDefinition) GetHeader() map[string]*HeaderValue {
-	if x != nil {
-		return x.Header
-	}
-	return nil
-}
-
-func (x *HealthCheckDefinition) GetMethod() string {
-	if x != nil {
-		return x.Method
-	}
-	return ""
-}
-
-func (x *HealthCheckDefinition) GetBody() string {
-	if x != nil {
-		return x.Body
-	}
-	return ""
-}
-
-func (x *HealthCheckDefinition) GetDisableRedirects() bool {
-	if x != nil {
-		return x.DisableRedirects
-	}
-	return false
-}
-
-func (x *HealthCheckDefinition) GetTCP() string {
-	if x != nil {
-		return x.TCP
-	}
-	return ""
-}
-
-func (x *HealthCheckDefinition) GetTCPUseTLS() bool {
-	if x != nil {
-		return x.TCPUseTLS
-	}
-	return false
-}
-
-func (x *HealthCheckDefinition) GetUDP() string {
-	if x != nil {
-		return x.UDP
-	}
-	return ""
-}
-
-func (x *HealthCheckDefinition) GetOSService() string {
-	if x != nil {
-		return x.OSService
-	}
-	return ""
-}
-
-func (x *HealthCheckDefinition) GetInterval() *durationpb.Duration {
-	if x != nil {
-		return x.Interval
-	}
-	return nil
-}
-
-func (x *HealthCheckDefinition) GetOutputMaxSize() uint32 {
-	if x != nil {
-		return x.OutputMaxSize
-	}
-	return 0
-}
-
-func (x *HealthCheckDefinition) GetTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.Timeout
-	}
-	return nil
-}
-
-func (x *HealthCheckDefinition) GetDeregisterCriticalServiceAfter() *durationpb.Duration {
-	if x != nil {
-		return x.DeregisterCriticalServiceAfter
-	}
-	return nil
-}
-
-func (x *HealthCheckDefinition) GetScriptArgs() []string {
-	if x != nil {
-		return x.ScriptArgs
-	}
-	return nil
-}
-
-func (x *HealthCheckDefinition) GetDockerContainerID() string {
-	if x != nil {
-		return x.DockerContainerID
-	}
-	return ""
-}
-
-func (x *HealthCheckDefinition) GetShell() string {
-	if x != nil {
-		return x.Shell
-	}
-	return ""
-}
-
-func (x *HealthCheckDefinition) GetH2PING() string {
-	if x != nil {
-		return x.H2PING
-	}
-	return ""
-}
-
-func (x *HealthCheckDefinition) GetH2PingUseTLS() bool {
-	if x != nil {
-		return x.H2PingUseTLS
-	}
-	return false
-}
-
-func (x *HealthCheckDefinition) GetGRPC() string {
-	if x != nil {
-		return x.GRPC
-	}
-	return ""
-}
-
-func (x *HealthCheckDefinition) GetGRPCUseTLS() bool {
-	if x != nil {
-		return x.GRPCUseTLS
-	}
-	return false
-}
-
-func (x *HealthCheckDefinition) GetAliasNode() string {
-	if x != nil {
-		return x.AliasNode
-	}
-	return ""
-}
-
-func (x *HealthCheckDefinition) GetAliasService() string {
-	if x != nil {
-		return x.AliasService
-	}
-	return ""
-}
-
-func (x *HealthCheckDefinition) GetTTL() *durationpb.Duration {
-	if x != nil {
-		return x.TTL
-	}
-	return nil
-}
-
-// CheckType is used to create either the CheckMonitor or the CheckTTL.
-// The following types are supported: Script, HTTP, TCP, Docker, TTL, GRPC,
-// Alias. Script, H2PING,
-// HTTP, Docker, TCP, H2PING and GRPC all require Interval. Only one of the types may
-// to be provided: TTL or Script/Interval or HTTP/Interval or TCP/Interval or
-// Docker/Interval or GRPC/Interval or H2PING/Interval or AliasService.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.CheckType
-// output=healthcheck.gen.go
-// name=Structs
-type CheckType struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=CheckIDType func-from=string
-	CheckID    string   `protobuf:"bytes,1,opt,name=CheckID,proto3" json:"CheckID,omitempty"`
-	Name       string   `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
-	Status     string   `protobuf:"bytes,3,opt,name=Status,proto3" json:"Status,omitempty"`
-	Notes      string   `protobuf:"bytes,4,opt,name=Notes,proto3" json:"Notes,omitempty"`
-	ScriptArgs []string `protobuf:"bytes,5,rep,name=ScriptArgs,proto3" json:"ScriptArgs,omitempty"`
-	HTTP       string   `protobuf:"bytes,6,opt,name=HTTP,proto3" json:"HTTP,omitempty"`
-	// mog: func-to=MapHeadersToStructs func-from=NewMapHeadersFromStructs
-	Header           map[string]*HeaderValue `protobuf:"bytes,20,rep,name=Header,proto3" json:"Header,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Method           string                  `protobuf:"bytes,7,opt,name=Method,proto3" json:"Method,omitempty"`
-	Body             string                  `protobuf:"bytes,26,opt,name=Body,proto3" json:"Body,omitempty"`
-	DisableRedirects bool                    `protobuf:"varint,31,opt,name=DisableRedirects,proto3" json:"DisableRedirects,omitempty"`
-	TCP              string                  `protobuf:"bytes,8,opt,name=TCP,proto3" json:"TCP,omitempty"`
-	TCPUseTLS        bool                    `protobuf:"varint,34,opt,name=TCPUseTLS,proto3" json:"TCPUseTLS,omitempty"`
-	UDP              string                  `protobuf:"bytes,32,opt,name=UDP,proto3" json:"UDP,omitempty"`
-	OSService        string                  `protobuf:"bytes,33,opt,name=OSService,proto3" json:"OSService,omitempty"`
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	Interval          *durationpb.Duration `protobuf:"bytes,9,opt,name=Interval,proto3" json:"Interval,omitempty"`
-	AliasNode         string               `protobuf:"bytes,10,opt,name=AliasNode,proto3" json:"AliasNode,omitempty"`
-	AliasService      string               `protobuf:"bytes,11,opt,name=AliasService,proto3" json:"AliasService,omitempty"`
-	DockerContainerID string               `protobuf:"bytes,12,opt,name=DockerContainerID,proto3" json:"DockerContainerID,omitempty"`
-	Shell             string               `protobuf:"bytes,13,opt,name=Shell,proto3" json:"Shell,omitempty"`
-	H2PING            string               `protobuf:"bytes,28,opt,name=H2PING,proto3" json:"H2PING,omitempty"`
-	H2PingUseTLS      bool                 `protobuf:"varint,30,opt,name=H2PingUseTLS,proto3" json:"H2PingUseTLS,omitempty"`
-	GRPC              string               `protobuf:"bytes,14,opt,name=GRPC,proto3" json:"GRPC,omitempty"`
-	GRPCUseTLS        bool                 `protobuf:"varint,15,opt,name=GRPCUseTLS,proto3" json:"GRPCUseTLS,omitempty"`
-	TLSServerName     string               `protobuf:"bytes,27,opt,name=TLSServerName,proto3" json:"TLSServerName,omitempty"`
-	TLSSkipVerify     bool                 `protobuf:"varint,16,opt,name=TLSSkipVerify,proto3" json:"TLSSkipVerify,omitempty"`
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	Timeout *durationpb.Duration `protobuf:"bytes,17,opt,name=Timeout,proto3" json:"Timeout,omitempty"`
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	TTL *durationpb.Duration `protobuf:"bytes,18,opt,name=TTL,proto3" json:"TTL,omitempty"`
-	// mog: func-to=int func-from=int32
-	SuccessBeforePassing int32 `protobuf:"varint,21,opt,name=SuccessBeforePassing,proto3" json:"SuccessBeforePassing,omitempty"`
-	// mog: func-to=int func-from=int32
-	FailuresBeforeWarning int32 `protobuf:"varint,29,opt,name=FailuresBeforeWarning,proto3" json:"FailuresBeforeWarning,omitempty"`
-	// mog: func-to=int func-from=int32
-	FailuresBeforeCritical int32 `protobuf:"varint,22,opt,name=FailuresBeforeCritical,proto3" json:"FailuresBeforeCritical,omitempty"`
-	// Definition fields used when exposing checks through a proxy
-	ProxyHTTP string `protobuf:"bytes,23,opt,name=ProxyHTTP,proto3" json:"ProxyHTTP,omitempty"`
-	ProxyGRPC string `protobuf:"bytes,24,opt,name=ProxyGRPC,proto3" json:"ProxyGRPC,omitempty"`
-	// DeregisterCriticalServiceAfter, if >0, will cause the associated
-	// service, if any, to be deregistered if this check is critical for
-	// longer than this duration.
-	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	DeregisterCriticalServiceAfter *durationpb.Duration `protobuf:"bytes,19,opt,name=DeregisterCriticalServiceAfter,proto3" json:"DeregisterCriticalServiceAfter,omitempty"`
-	// mog: func-to=int func-from=int32
-	OutputMaxSize int32 `protobuf:"varint,25,opt,name=OutputMaxSize,proto3" json:"OutputMaxSize,omitempty"`
-}
-
-func (x *CheckType) Reset() {
-	*x = CheckType{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_healthcheck_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CheckType) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CheckType) ProtoMessage() {}
-
-func (x *CheckType) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_healthcheck_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CheckType.ProtoReflect.Descriptor instead.
-func (*CheckType) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_healthcheck_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *CheckType) GetCheckID() string {
-	if x != nil {
-		return x.CheckID
-	}
-	return ""
-}
-
-func (x *CheckType) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *CheckType) GetStatus() string {
-	if x != nil {
-		return x.Status
-	}
-	return ""
-}
-
-func (x *CheckType) GetNotes() string {
-	if x != nil {
-		return x.Notes
-	}
-	return ""
-}
-
-func (x *CheckType) GetScriptArgs() []string {
-	if x != nil {
-		return x.ScriptArgs
-	}
-	return nil
-}
-
-func (x *CheckType) GetHTTP() string {
-	if x != nil {
-		return x.HTTP
-	}
-	return ""
-}
-
-func (x *CheckType) GetHeader() map[string]*HeaderValue {
-	if x != nil {
-		return x.Header
-	}
-	return nil
-}
-
-func (x *CheckType) GetMethod() string {
-	if x != nil {
-		return x.Method
-	}
-	return ""
-}
-
-func (x *CheckType) GetBody() string {
-	if x != nil {
-		return x.Body
-	}
-	return ""
-}
-
-func (x *CheckType) GetDisableRedirects() bool {
-	if x != nil {
-		return x.DisableRedirects
-	}
-	return false
-}
-
-func (x *CheckType) GetTCP() string {
-	if x != nil {
-		return x.TCP
-	}
-	return ""
-}
-
-func (x *CheckType) GetTCPUseTLS() bool {
-	if x != nil {
-		return x.TCPUseTLS
-	}
-	return false
-}
-
-func (x *CheckType) GetUDP() string {
-	if x != nil {
-		return x.UDP
-	}
-	return ""
-}
-
-func (x *CheckType) GetOSService() string {
-	if x != nil {
-		return x.OSService
-	}
-	return ""
-}
-
-func (x *CheckType) GetInterval() *durationpb.Duration {
-	if x != nil {
-		return x.Interval
-	}
-	return nil
-}
-
-func (x *CheckType) GetAliasNode() string {
-	if x != nil {
-		return x.AliasNode
-	}
-	return ""
-}
-
-func (x *CheckType) GetAliasService() string {
-	if x != nil {
-		return x.AliasService
-	}
-	return ""
-}
-
-func (x *CheckType) GetDockerContainerID() string {
-	if x != nil {
-		return x.DockerContainerID
-	}
-	return ""
-}
-
-func (x *CheckType) GetShell() string {
-	if x != nil {
-		return x.Shell
-	}
-	return ""
-}
-
-func (x *CheckType) GetH2PING() string {
-	if x != nil {
-		return x.H2PING
-	}
-	return ""
-}
-
-func (x *CheckType) GetH2PingUseTLS() bool {
-	if x != nil {
-		return x.H2PingUseTLS
-	}
-	return false
-}
-
-func (x *CheckType) GetGRPC() string {
-	if x != nil {
-		return x.GRPC
-	}
-	return ""
-}
-
-func (x *CheckType) GetGRPCUseTLS() bool {
-	if x != nil {
-		return x.GRPCUseTLS
-	}
-	return false
-}
-
-func (x *CheckType) GetTLSServerName() string {
-	if x != nil {
-		return x.TLSServerName
-	}
-	return ""
-}
-
-func (x *CheckType) GetTLSSkipVerify() bool {
-	if x != nil {
-		return x.TLSSkipVerify
-	}
-	return false
-}
-
-func (x *CheckType) GetTimeout() *durationpb.Duration {
-	if x != nil {
-		return x.Timeout
-	}
-	return nil
-}
-
-func (x *CheckType) GetTTL() *durationpb.Duration {
-	if x != nil {
-		return x.TTL
-	}
-	return nil
-}
-
-func (x *CheckType) GetSuccessBeforePassing() int32 {
-	if x != nil {
-		return x.SuccessBeforePassing
-	}
-	return 0
-}
-
-func (x *CheckType) GetFailuresBeforeWarning() int32 {
-	if x != nil {
-		return x.FailuresBeforeWarning
-	}
-	return 0
-}
-
-func (x *CheckType) GetFailuresBeforeCritical() int32 {
-	if x != nil {
-		return x.FailuresBeforeCritical
-	}
-	return 0
-}
-
-func (x *CheckType) GetProxyHTTP() string {
-	if x != nil {
-		return x.ProxyHTTP
-	}
-	return ""
-}
-
-func (x *CheckType) GetProxyGRPC() string {
-	if x != nil {
-		return x.ProxyGRPC
-	}
-	return ""
-}
-
-func (x *CheckType) GetDeregisterCriticalServiceAfter() *durationpb.Duration {
-	if x != nil {
-		return x.DeregisterCriticalServiceAfter
-	}
-	return nil
-}
-
-func (x *CheckType) GetOutputMaxSize() int32 {
-	if x != nil {
-		return x.OutputMaxSize
-	}
-	return 0
-}
-
-var File_private_pbservice_healthcheck_proto protoreflect.FileDescriptor
-
-var file_private_pbservice_healthcheck_proto_rawDesc = []byte{
-	0x0a, 0x23, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74,
-	0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfe, 0x04, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x6c,
-	0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x43,
-	0x68, 0x65, 0x63, 0x6b, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x43, 0x68,
-	0x65, 0x63, 0x6b, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x12, 0x14, 0x0a, 0x05, 0x4e, 0x6f, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x4e, 0x6f, 0x74, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x75, 0x74, 0x70, 0x75,
-	0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x12,
-	0x1c, 0x0a, 0x09, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x44, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x44, 0x12, 0x20, 0x0a,
-	0x0b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12,
-	0x20, 0x0a, 0x0b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x73, 0x18, 0x09,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67,
-	0x73, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x58, 0x0a, 0x0a, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x48, 0x65,
-	0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x49, 0x0a, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x0b, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52,
-	0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e,
-	0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x0d, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65,
-	0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65,
-	0x4d, 0x65, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0b, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x64, 0x50,
-	0x6f, 0x72, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x45, 0x78, 0x70, 0x6f, 0x73,
-	0x65, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76,
-	0x61, 0x6c, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76,
-	0x61, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x10, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x1a, 0x0a, 0x08,
-	0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-	0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x23, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xb0, 0x08,
-	0x0a, 0x15, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66,
-	0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x48, 0x54, 0x54, 0x50, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x48, 0x54, 0x54, 0x50, 0x12, 0x24, 0x0a, 0x0d, 0x54,
-	0x4c, 0x53, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x13, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0d, 0x54, 0x4c, 0x53, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d,
-	0x65, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x4c, 0x53, 0x53, 0x6b, 0x69, 0x70, 0x56, 0x65, 0x72, 0x69,
-	0x66, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x54, 0x4c, 0x53, 0x53, 0x6b, 0x69,
-	0x70, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x12, 0x5c, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x44, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x6c,
-	0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x12, 0x0a,
-	0x04, 0x42, 0x6f, 0x64, 0x79, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x42, 0x6f, 0x64,
-	0x79, 0x12, 0x2a, 0x0a, 0x10, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x64, 0x69,
-	0x72, 0x65, 0x63, 0x74, 0x73, 0x18, 0x16, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x44, 0x69, 0x73,
-	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x12, 0x10, 0x0a,
-	0x03, 0x54, 0x43, 0x50, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x54, 0x43, 0x50, 0x12,
-	0x1c, 0x0a, 0x09, 0x54, 0x43, 0x50, 0x55, 0x73, 0x65, 0x54, 0x4c, 0x53, 0x18, 0x19, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x09, 0x54, 0x43, 0x50, 0x55, 0x73, 0x65, 0x54, 0x4c, 0x53, 0x12, 0x10, 0x0a,
-	0x03, 0x55, 0x44, 0x50, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x44, 0x50, 0x12,
-	0x1c, 0x0a, 0x09, 0x4f, 0x53, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x18, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x4f, 0x53, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x35, 0x0a,
-	0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x65,
-	0x72, 0x76, 0x61, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x4d, 0x61,
-	0x78, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x4f, 0x75, 0x74,
-	0x70, 0x75, 0x74, 0x4d, 0x61, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x33, 0x0a, 0x07, 0x54, 0x69,
-	0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12,
-	0x61, 0x0a, 0x1e, 0x44, 0x65, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x72, 0x69,
-	0x74, 0x69, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x66, 0x74, 0x65,
-	0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x1e, 0x44, 0x65, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x72,
-	0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x66, 0x74,
-	0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x41, 0x72, 0x67, 0x73,
-	0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x41, 0x72,
-	0x67, 0x73, 0x12, 0x2c, 0x0a, 0x11, 0x44, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74,
-	0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x44,
-	0x6f, 0x63, 0x6b, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x44,
-	0x12, 0x14, 0x0a, 0x05, 0x53, 0x68, 0x65, 0x6c, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x05, 0x53, 0x68, 0x65, 0x6c, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x48, 0x32, 0x50, 0x49, 0x4e, 0x47,
-	0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x48, 0x32, 0x50, 0x49, 0x4e, 0x47, 0x12, 0x22,
-	0x0a, 0x0c, 0x48, 0x32, 0x50, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x54, 0x4c, 0x53, 0x18, 0x15,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x48, 0x32, 0x50, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x54,
-	0x4c, 0x53, 0x12, 0x12, 0x0a, 0x04, 0x47, 0x52, 0x50, 0x43, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x47, 0x52, 0x50, 0x43, 0x12, 0x1e, 0x0a, 0x0a, 0x47, 0x52, 0x50, 0x43, 0x55, 0x73,
-	0x65, 0x54, 0x4c, 0x53, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x47, 0x52, 0x50, 0x43,
-	0x55, 0x73, 0x65, 0x54, 0x4c, 0x53, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x4e,
-	0x6f, 0x64, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x41, 0x6c, 0x69, 0x61, 0x73,
-	0x4e, 0x6f, 0x64, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x41, 0x6c, 0x69, 0x61,
-	0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x2b, 0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18,
-	0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x03, 0x54, 0x54, 0x4c, 0x1a, 0x69, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x44, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x22, 0xd2, 0x0a, 0x0a, 0x09, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18,
-	0x0a, 0x07, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x53, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x4e, 0x6f, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x4e, 0x6f, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x41, 0x72, 0x67, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a,
-	0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x41, 0x72, 0x67, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x48, 0x54,
-	0x54, 0x50, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x48, 0x54, 0x54, 0x50, 0x12, 0x50,
-	0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x48, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x12, 0x16, 0x0a, 0x06, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x42, 0x6f, 0x64, 0x79,
-	0x18, 0x1a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x42, 0x6f, 0x64, 0x79, 0x12, 0x2a, 0x0a, 0x10,
-	0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73,
-	0x18, 0x1f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x52,
-	0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x43, 0x50, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x54, 0x43, 0x50, 0x12, 0x1c, 0x0a, 0x09, 0x54, 0x43,
-	0x50, 0x55, 0x73, 0x65, 0x54, 0x4c, 0x53, 0x18, 0x22, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x54,
-	0x43, 0x50, 0x55, 0x73, 0x65, 0x54, 0x4c, 0x53, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x44, 0x50, 0x18,
-	0x20, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x44, 0x50, 0x12, 0x1c, 0x0a, 0x09, 0x4f, 0x53,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x21, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x4f,
-	0x53, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x35, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65,
-	0x72, 0x76, 0x61, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12,
-	0x1c, 0x0a, 0x09, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x4e, 0x6f, 0x64, 0x65, 0x18, 0x0a, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x22, 0x0a,
-	0x0c, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0c, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x12, 0x2c, 0x0a, 0x11, 0x44, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x61,
-	0x69, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x44, 0x6f,
-	0x63, 0x6b, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x12,
-	0x14, 0x0a, 0x05, 0x53, 0x68, 0x65, 0x6c, 0x6c, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x53, 0x68, 0x65, 0x6c, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x48, 0x32, 0x50, 0x49, 0x4e, 0x47, 0x18,
-	0x1c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x48, 0x32, 0x50, 0x49, 0x4e, 0x47, 0x12, 0x22, 0x0a,
-	0x0c, 0x48, 0x32, 0x50, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x54, 0x4c, 0x53, 0x18, 0x1e, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0c, 0x48, 0x32, 0x50, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x54, 0x4c,
-	0x53, 0x12, 0x12, 0x0a, 0x04, 0x47, 0x52, 0x50, 0x43, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x47, 0x52, 0x50, 0x43, 0x12, 0x1e, 0x0a, 0x0a, 0x47, 0x52, 0x50, 0x43, 0x55, 0x73, 0x65,
-	0x54, 0x4c, 0x53, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x47, 0x52, 0x50, 0x43, 0x55,
-	0x73, 0x65, 0x54, 0x4c, 0x53, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x4c, 0x53, 0x53, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x54, 0x4c,
-	0x53, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x54,
-	0x4c, 0x53, 0x53, 0x6b, 0x69, 0x70, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x18, 0x10, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0d, 0x54, 0x4c, 0x53, 0x53, 0x6b, 0x69, 0x70, 0x56, 0x65, 0x72, 0x69, 0x66,
-	0x79, 0x12, 0x33, 0x0a, 0x07, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x11, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x54,
-	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x2b, 0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18, 0x12, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03,
-	0x54, 0x54, 0x4c, 0x12, 0x32, 0x0a, 0x14, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x42, 0x65,
-	0x66, 0x6f, 0x72, 0x65, 0x50, 0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x14, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65,
-	0x50, 0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x12, 0x34, 0x0a, 0x15, 0x46, 0x61, 0x69, 0x6c, 0x75,
-	0x72, 0x65, 0x73, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67,
-	0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x15, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x73,
-	0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x12, 0x36, 0x0a,
-	0x16, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x73, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x43,
-	0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x18, 0x16, 0x20, 0x01, 0x28, 0x05, 0x52, 0x16, 0x46,
-	0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x73, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x43, 0x72, 0x69,
-	0x74, 0x69, 0x63, 0x61, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x48, 0x54,
-	0x54, 0x50, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x48,
-	0x54, 0x54, 0x50, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x47, 0x52, 0x50, 0x43,
-	0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x47, 0x52, 0x50,
-	0x43, 0x12, 0x61, 0x0a, 0x1e, 0x44, 0x65, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43,
-	0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x66,
-	0x74, 0x65, 0x72, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x1e, 0x44, 0x65, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72,
-	0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41,
-	0x66, 0x74, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x4d, 0x61,
-	0x78, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x4f, 0x75, 0x74,
-	0x70, 0x75, 0x74, 0x4d, 0x61, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x1a, 0x69, 0x0a, 0x0b, 0x48, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x44, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x96, 0x02, 0x0a, 0x25, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42,
-	0x10, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70,
-	0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x53, 0xaa,
-	0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0xca, 0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xe2, 0x02, 0x2d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x24, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pbservice_healthcheck_proto_rawDescOnce sync.Once
-	file_private_pbservice_healthcheck_proto_rawDescData = file_private_pbservice_healthcheck_proto_rawDesc
-)
-
-func file_private_pbservice_healthcheck_proto_rawDescGZIP() []byte {
-	file_private_pbservice_healthcheck_proto_rawDescOnce.Do(func() {
-		file_private_pbservice_healthcheck_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbservice_healthcheck_proto_rawDescData)
-	})
-	return file_private_pbservice_healthcheck_proto_rawDescData
-}
-
-var file_private_pbservice_healthcheck_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
-var file_private_pbservice_healthcheck_proto_goTypes = []interface{}{
-	(*HealthCheck)(nil),             // 0: hashicorp.consul.internal.service.HealthCheck
-	(*HeaderValue)(nil),             // 1: hashicorp.consul.internal.service.HeaderValue
-	(*HealthCheckDefinition)(nil),   // 2: hashicorp.consul.internal.service.HealthCheckDefinition
-	(*CheckType)(nil),               // 3: hashicorp.consul.internal.service.CheckType
-	nil,                             // 4: hashicorp.consul.internal.service.HealthCheckDefinition.HeaderEntry
-	nil,                             // 5: hashicorp.consul.internal.service.CheckType.HeaderEntry
-	(*pbcommon.RaftIndex)(nil),      // 6: hashicorp.consul.internal.common.RaftIndex
-	(*pbcommon.EnterpriseMeta)(nil), // 7: hashicorp.consul.internal.common.EnterpriseMeta
-	(*durationpb.Duration)(nil),     // 8: google.protobuf.Duration
-}
-var file_private_pbservice_healthcheck_proto_depIdxs = []int32{
-	2,  // 0: hashicorp.consul.internal.service.HealthCheck.Definition:type_name -> hashicorp.consul.internal.service.HealthCheckDefinition
-	6,  // 1: hashicorp.consul.internal.service.HealthCheck.RaftIndex:type_name -> hashicorp.consul.internal.common.RaftIndex
-	7,  // 2: hashicorp.consul.internal.service.HealthCheck.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
-	4,  // 3: hashicorp.consul.internal.service.HealthCheckDefinition.Header:type_name -> hashicorp.consul.internal.service.HealthCheckDefinition.HeaderEntry
-	8,  // 4: hashicorp.consul.internal.service.HealthCheckDefinition.Interval:type_name -> google.protobuf.Duration
-	8,  // 5: hashicorp.consul.internal.service.HealthCheckDefinition.Timeout:type_name -> google.protobuf.Duration
-	8,  // 6: hashicorp.consul.internal.service.HealthCheckDefinition.DeregisterCriticalServiceAfter:type_name -> google.protobuf.Duration
-	8,  // 7: hashicorp.consul.internal.service.HealthCheckDefinition.TTL:type_name -> google.protobuf.Duration
-	5,  // 8: hashicorp.consul.internal.service.CheckType.Header:type_name -> hashicorp.consul.internal.service.CheckType.HeaderEntry
-	8,  // 9: hashicorp.consul.internal.service.CheckType.Interval:type_name -> google.protobuf.Duration
-	8,  // 10: hashicorp.consul.internal.service.CheckType.Timeout:type_name -> google.protobuf.Duration
-	8,  // 11: hashicorp.consul.internal.service.CheckType.TTL:type_name -> google.protobuf.Duration
-	8,  // 12: hashicorp.consul.internal.service.CheckType.DeregisterCriticalServiceAfter:type_name -> google.protobuf.Duration
-	1,  // 13: hashicorp.consul.internal.service.HealthCheckDefinition.HeaderEntry.value:type_name -> hashicorp.consul.internal.service.HeaderValue
-	1,  // 14: hashicorp.consul.internal.service.CheckType.HeaderEntry.value:type_name -> hashicorp.consul.internal.service.HeaderValue
-	15, // [15:15] is the sub-list for method output_type
-	15, // [15:15] is the sub-list for method input_type
-	15, // [15:15] is the sub-list for extension type_name
-	15, // [15:15] is the sub-list for extension extendee
-	0,  // [0:15] is the sub-list for field type_name
-}
-
-func init() { file_private_pbservice_healthcheck_proto_init() }
-func file_private_pbservice_healthcheck_proto_init() {
-	if File_private_pbservice_healthcheck_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbservice_healthcheck_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HealthCheck); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_healthcheck_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HeaderValue); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_healthcheck_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HealthCheckDefinition); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_healthcheck_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CheckType); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbservice_healthcheck_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   6,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_private_pbservice_healthcheck_proto_goTypes,
-		DependencyIndexes: file_private_pbservice_healthcheck_proto_depIdxs,
-		MessageInfos:      file_private_pbservice_healthcheck_proto_msgTypes,
-	}.Build()
-	File_private_pbservice_healthcheck_proto = out.File
-	file_private_pbservice_healthcheck_proto_rawDesc = nil
-	file_private_pbservice_healthcheck_proto_goTypes = nil
-	file_private_pbservice_healthcheck_proto_depIdxs = nil
-}
diff --git a/proto/private/pbservice/ids.go b/proto/private/pbservice/ids.go
deleted file mode 100644
index bac74d6f7e805..0000000000000
--- a/proto/private/pbservice/ids.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package pbservice
-
-import (
-	"strings"
-)
-
-// UniqueID returns a unique identifier for this CheckServiceNode, which includes
-// the node name, service namespace, and service ID.
-//
-// The returned ID uses slashes to separate the identifiers, however the node name
-// may also contain a slash, so it is not possible to parse this identifier to
-// retrieve its constituent parts.
-//
-// This function is similar to structs.UniqueID, however at this time no guarantees
-// are made that it will remain the same.
-func (m *CheckServiceNode) UniqueID() string {
-	if m == nil {
-		return ""
-	}
-	builder := new(strings.Builder)
-
-	switch {
-	case m.Node != nil:
-		builder.WriteString(m.Node.Partition + "/")
-		builder.WriteString(m.Node.PeerName + "/")
-	case m.Service != nil:
-		partition := ""
-		if m.Service.EnterpriseMeta != nil {
-			partition = m.Service.EnterpriseMeta.Partition
-		}
-		builder.WriteString(partition + "/")
-		builder.WriteString(m.Service.PeerName + "/")
-	}
-
-	if m.Node != nil {
-		builder.WriteString(m.Node.Node + "/")
-	}
-	if m.Service != nil {
-		namespace := ""
-		if m.Service.EnterpriseMeta != nil {
-			namespace = m.Service.EnterpriseMeta.Namespace
-		}
-		builder.WriteString(namespace + "/")
-		builder.WriteString(m.Service.ID)
-	}
-	return builder.String()
-}
diff --git a/proto/private/pbservice/node.pb.binary.go b/proto/private/pbservice/node.pb.binary.go
deleted file mode 100644
index 0b2c40208799f..0000000000000
--- a/proto/private/pbservice/node.pb.binary.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbservice/node.proto
-
-package pbservice
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *IndexedCheckServiceNodes) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *IndexedCheckServiceNodes) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *CheckServiceNode) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *CheckServiceNode) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Node) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Node) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *NodeService) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *NodeService) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto/private/pbservice/node.pb.go b/proto/private/pbservice/node.pb.go
deleted file mode 100644
index 3d562fe31f716..0000000000000
--- a/proto/private/pbservice/node.pb.go
+++ /dev/null
@@ -1,804 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbservice/node.proto
-
-package pbservice
-
-import (
-	pbcommon "github.com/hashicorp/consul/proto/private/pbcommon"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// IndexedCheckServiceNodes is used to return multiple instances for a given service.
-type IndexedCheckServiceNodes struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Index uint64              `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
-	Nodes []*CheckServiceNode `protobuf:"bytes,2,rep,name=Nodes,proto3" json:"Nodes,omitempty"`
-}
-
-func (x *IndexedCheckServiceNodes) Reset() {
-	*x = IndexedCheckServiceNodes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_node_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IndexedCheckServiceNodes) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IndexedCheckServiceNodes) ProtoMessage() {}
-
-func (x *IndexedCheckServiceNodes) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_node_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IndexedCheckServiceNodes.ProtoReflect.Descriptor instead.
-func (*IndexedCheckServiceNodes) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_node_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *IndexedCheckServiceNodes) GetIndex() uint64 {
-	if x != nil {
-		return x.Index
-	}
-	return 0
-}
-
-func (x *IndexedCheckServiceNodes) GetNodes() []*CheckServiceNode {
-	if x != nil {
-		return x.Nodes
-	}
-	return nil
-}
-
-// CheckServiceNode is used to provide the node, its service
-// definition, as well as a HealthCheck that is associated.
-type CheckServiceNode struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Node    *Node          `protobuf:"bytes,1,opt,name=Node,proto3" json:"Node,omitempty"`
-	Service *NodeService   `protobuf:"bytes,2,opt,name=Service,proto3" json:"Service,omitempty"`
-	Checks  []*HealthCheck `protobuf:"bytes,3,rep,name=Checks,proto3" json:"Checks,omitempty"`
-}
-
-func (x *CheckServiceNode) Reset() {
-	*x = CheckServiceNode{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_node_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CheckServiceNode) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CheckServiceNode) ProtoMessage() {}
-
-func (x *CheckServiceNode) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_node_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CheckServiceNode.ProtoReflect.Descriptor instead.
-func (*CheckServiceNode) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_node_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *CheckServiceNode) GetNode() *Node {
-	if x != nil {
-		return x.Node
-	}
-	return nil
-}
-
-func (x *CheckServiceNode) GetService() *NodeService {
-	if x != nil {
-		return x.Service
-	}
-	return nil
-}
-
-func (x *CheckServiceNode) GetChecks() []*HealthCheck {
-	if x != nil {
-		return x.Checks
-	}
-	return nil
-}
-
-// Node contains information about a node.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.Node
-// output=node.gen.go
-// name=Structs
-type Node struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=NodeIDType func-from=string
-	ID              string            `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
-	Node            string            `protobuf:"bytes,2,opt,name=Node,proto3" json:"Node,omitempty"`
-	Partition       string            `protobuf:"bytes,8,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	PeerName        string            `protobuf:"bytes,9,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
-	Address         string            `protobuf:"bytes,3,opt,name=Address,proto3" json:"Address,omitempty"`
-	Datacenter      string            `protobuf:"bytes,4,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
-	TaggedAddresses map[string]string `protobuf:"bytes,5,rep,name=TaggedAddresses,proto3" json:"TaggedAddresses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Meta            map[string]string `protobuf:"bytes,6,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// mog: func-to=RaftIndexToStructs func-from=NewRaftIndexFromStructs
-	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,7,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
-	// Locality identifies where the node is running.
-	// mog: func-to=LocalityToStructs func-from=LocalityFromStructs
-	Locality *pbcommon.Locality `protobuf:"bytes,10,opt,name=Locality,proto3" json:"Locality,omitempty"`
-}
-
-func (x *Node) Reset() {
-	*x = Node{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_node_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Node) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Node) ProtoMessage() {}
-
-func (x *Node) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_node_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Node.ProtoReflect.Descriptor instead.
-func (*Node) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_node_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *Node) GetID() string {
-	if x != nil {
-		return x.ID
-	}
-	return ""
-}
-
-func (x *Node) GetNode() string {
-	if x != nil {
-		return x.Node
-	}
-	return ""
-}
-
-func (x *Node) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *Node) GetPeerName() string {
-	if x != nil {
-		return x.PeerName
-	}
-	return ""
-}
-
-func (x *Node) GetAddress() string {
-	if x != nil {
-		return x.Address
-	}
-	return ""
-}
-
-func (x *Node) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-func (x *Node) GetTaggedAddresses() map[string]string {
-	if x != nil {
-		return x.TaggedAddresses
-	}
-	return nil
-}
-
-func (x *Node) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *Node) GetRaftIndex() *pbcommon.RaftIndex {
-	if x != nil {
-		return x.RaftIndex
-	}
-	return nil
-}
-
-func (x *Node) GetLocality() *pbcommon.Locality {
-	if x != nil {
-		return x.Locality
-	}
-	return nil
-}
-
-// NodeService is a service provided by a node
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.NodeService
-// output=node.gen.go
-// name=Structs
-type NodeService struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Kind is the kind of service this is. Different kinds of services may
-	// have differing validation, DNS behavior, etc. An empty kind will default
-	// to the Default kind. See ServiceKind for the full list of kinds.
-	// mog: func-to=structs.ServiceKind func-from=string
-	Kind    string   `protobuf:"bytes,1,opt,name=Kind,proto3" json:"Kind,omitempty"`
-	ID      string   `protobuf:"bytes,2,opt,name=ID,proto3" json:"ID,omitempty"`
-	Service string   `protobuf:"bytes,3,opt,name=Service,proto3" json:"Service,omitempty"`
-	Tags    []string `protobuf:"bytes,4,rep,name=Tags,proto3" json:"Tags,omitempty"`
-	Address string   `protobuf:"bytes,5,opt,name=Address,proto3" json:"Address,omitempty"`
-	// mog: func-to=MapStringServiceAddressToStructs func-from=NewMapStringServiceAddressFromStructs
-	TaggedAddresses map[string]*ServiceAddress `protobuf:"bytes,15,rep,name=TaggedAddresses,proto3" json:"TaggedAddresses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Meta            map[string]string          `protobuf:"bytes,6,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// mog: func-to=int func-from=int32
-	Port       int32  `protobuf:"varint,7,opt,name=Port,proto3" json:"Port,omitempty"`
-	SocketPath string `protobuf:"bytes,17,opt,name=SocketPath,proto3" json:"SocketPath,omitempty"`
-	// mog: func-to=WeightsPtrToStructs func-from=NewWeightsPtrFromStructs
-	Weights           *Weights `protobuf:"bytes,8,opt,name=Weights,proto3" json:"Weights,omitempty"`
-	EnableTagOverride bool     `protobuf:"varint,9,opt,name=EnableTagOverride,proto3" json:"EnableTagOverride,omitempty"`
-	// Proxy is the configuration set for Kind = connect-proxy. It is mandatory in
-	// that case and an error to be set for any other kind. This config is part of
-	// a proxy service definition and is distinct from but shares some fields with
-	// the Connect.Proxy which configures a managed proxy as part of the actual
-	// service's definition. This duplication is ugly but seemed better than the
-	// alternative which was to re-use the same struct fields for both cases even
-	// though the semantics are different and the non-shred fields make no sense
-	// in the other case. ProxyConfig may be a more natural name here, but it's
-	// confusing for the UX because one of the fields in ConnectProxyConfig is
-	// also called just "Config"
-	Proxy *ConnectProxyConfig `protobuf:"bytes,11,opt,name=Proxy,proto3" json:"Proxy,omitempty"`
-	// Connect are the Connect settings for a service. This is purposely NOT
-	// a pointer so that we never have to nil-check this.
-	Connect *ServiceConnect `protobuf:"bytes,12,opt,name=Connect,proto3" json:"Connect,omitempty"`
-	// LocallyRegisteredAsSidecar is private as it is only used by a local agent
-	// state to track if the service was registered from a nested sidecar_service
-	// block. We need to track that so we can know whether we need to deregister
-	// it automatically too if it's removed from the service definition or if the
-	// parent service is deregistered. Relying only on ID would cause us to
-	// deregister regular services if they happen to be registered using the same
-	// ID scheme as our sidecars do by default. We could use meta but that gets
-	// unpleasant because we can't use the consul- prefix from an agent (reserved
-	// for use internally but in practice that means within the state store or in
-	// responses only), and it leaks the detail publicly which people might rely
-	// on which is a bit unpleasant for something that is meant to be config-file
-	// syntax sugar. Note this is not translated to ServiceNode and friends and
-	// may not be set on a NodeService that isn't the one the agent registered and
-	// keeps in it's local state. We never want this rendered in JSON as it's
-	// internal only. Right now our agent endpoints return api structs which don't
-	// include it but this is a safety net incase we change that or there is
-	// somewhere this is used in API output.
-	LocallyRegisteredAsSidecar bool `protobuf:"varint,13,opt,name=LocallyRegisteredAsSidecar,proto3" json:"LocallyRegisteredAsSidecar,omitempty"`
-	// mog: func-to=EnterpriseMetaToStructs func-from=NewEnterpriseMetaFromStructs
-	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,16,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
-	PeerName       string                   `protobuf:"bytes,18,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
-	// mog: func-to=RaftIndexToStructs func-from=NewRaftIndexFromStructs
-	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,14,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
-	// Locality identifies where the service is running.
-	// mog: func-to=LocalityToStructs func-from=LocalityFromStructs
-	Locality *pbcommon.Locality `protobuf:"bytes,19,opt,name=Locality,proto3" json:"Locality,omitempty"`
-}
-
-func (x *NodeService) Reset() {
-	*x = NodeService{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_node_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *NodeService) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*NodeService) ProtoMessage() {}
-
-func (x *NodeService) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_node_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use NodeService.ProtoReflect.Descriptor instead.
-func (*NodeService) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_node_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *NodeService) GetKind() string {
-	if x != nil {
-		return x.Kind
-	}
-	return ""
-}
-
-func (x *NodeService) GetID() string {
-	if x != nil {
-		return x.ID
-	}
-	return ""
-}
-
-func (x *NodeService) GetService() string {
-	if x != nil {
-		return x.Service
-	}
-	return ""
-}
-
-func (x *NodeService) GetTags() []string {
-	if x != nil {
-		return x.Tags
-	}
-	return nil
-}
-
-func (x *NodeService) GetAddress() string {
-	if x != nil {
-		return x.Address
-	}
-	return ""
-}
-
-func (x *NodeService) GetTaggedAddresses() map[string]*ServiceAddress {
-	if x != nil {
-		return x.TaggedAddresses
-	}
-	return nil
-}
-
-func (x *NodeService) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *NodeService) GetPort() int32 {
-	if x != nil {
-		return x.Port
-	}
-	return 0
-}
-
-func (x *NodeService) GetSocketPath() string {
-	if x != nil {
-		return x.SocketPath
-	}
-	return ""
-}
-
-func (x *NodeService) GetWeights() *Weights {
-	if x != nil {
-		return x.Weights
-	}
-	return nil
-}
-
-func (x *NodeService) GetEnableTagOverride() bool {
-	if x != nil {
-		return x.EnableTagOverride
-	}
-	return false
-}
-
-func (x *NodeService) GetProxy() *ConnectProxyConfig {
-	if x != nil {
-		return x.Proxy
-	}
-	return nil
-}
-
-func (x *NodeService) GetConnect() *ServiceConnect {
-	if x != nil {
-		return x.Connect
-	}
-	return nil
-}
-
-func (x *NodeService) GetLocallyRegisteredAsSidecar() bool {
-	if x != nil {
-		return x.LocallyRegisteredAsSidecar
-	}
-	return false
-}
-
-func (x *NodeService) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if x != nil {
-		return x.EnterpriseMeta
-	}
-	return nil
-}
-
-func (x *NodeService) GetPeerName() string {
-	if x != nil {
-		return x.PeerName
-	}
-	return ""
-}
-
-func (x *NodeService) GetRaftIndex() *pbcommon.RaftIndex {
-	if x != nil {
-		return x.RaftIndex
-	}
-	return nil
-}
-
-func (x *NodeService) GetLocality() *pbcommon.Locality {
-	if x != nil {
-		return x.Locality
-	}
-	return nil
-}
-
-var File_private_pbservice_node_proto protoreflect.FileDescriptor
-
-var file_private_pbservice_node_proto_rawDesc = []byte{
-	0x0a, 0x1c, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x1a, 0x1d, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x23, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70,
-	0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x7b, 0x0a, 0x18, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65,
-	0x64, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64,
-	0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x04, 0x52, 0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x49, 0x0a, 0x05, 0x4e, 0x6f, 0x64, 0x65,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x43, 0x68, 0x65, 0x63,
-	0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x05, 0x4e, 0x6f,
-	0x64, 0x65, 0x73, 0x22, 0xe1, 0x01, 0x0a, 0x10, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x3b, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x52,
-	0x04, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x48, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12,
-	0x46, 0x0a, 0x06, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x2e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52,
-	0x06, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x22, 0xdd, 0x04, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65,
-	0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44,
-	0x12, 0x12, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x4e, 0x6f, 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x09,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18,
-	0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61,
-	0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61,
-	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x66, 0x0a, 0x0f, 0x54, 0x61, 0x67, 0x67,
-	0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x3c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x2e, 0x54, 0x61, 0x67, 0x67, 0x65,
-	0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x0f, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73,
-	0x12, 0x45, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x49, 0x0a, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49,
-	0x6e, 0x64, 0x65, 0x78, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61,
-	0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64,
-	0x65, 0x78, 0x12, 0x46, 0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x0a,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79,
-	0x52, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x1a, 0x42, 0x0a, 0x14, 0x54, 0x61,
-	0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37,
-	0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xf1, 0x08, 0x0a, 0x0b, 0x4e, 0x6f, 0x64, 0x65,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x49,
-	0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x04, 0x54, 0x61, 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x64, 0x64, 0x72,
-	0x65, 0x73, 0x73, 0x12, 0x6d, 0x0a, 0x0f, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64,
-	0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x54, 0x61, 0x67,
-	0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x0f, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x65, 0x73, 0x12, 0x4c, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x38, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61,
-	0x12, 0x12, 0x0a, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
-	0x50, 0x6f, 0x72, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61,
-	0x74, 0x68, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x50, 0x61, 0x74, 0x68, 0x12, 0x44, 0x0a, 0x07, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74,
-	0x73, 0x52, 0x07, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x12, 0x2c, 0x0a, 0x11, 0x45, 0x6e,
-	0x61, 0x62, 0x6c, 0x65, 0x54, 0x61, 0x67, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x18,
-	0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x61, 0x67,
-	0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x12, 0x4b, 0x0a, 0x05, 0x50, 0x72, 0x6f, 0x78,
-	0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x6e,
-	0x65, 0x63, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x05,
-	0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x4b, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-	0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x07, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x12, 0x3e, 0x0a, 0x1a, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x6c, 0x79, 0x52, 0x65, 0x67,
-	0x69, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x41, 0x73, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72,
-	0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1a, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x6c, 0x79, 0x52,
-	0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x41, 0x73, 0x53, 0x69, 0x64, 0x65, 0x63,
-	0x61, 0x72, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65,
-	0x4d, 0x65, 0x74, 0x61, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e,
-	0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e,
-	0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08,
-	0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-	0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x49, 0x0a, 0x09, 0x52, 0x61, 0x66, 0x74,
-	0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52,
-	0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e,
-	0x64, 0x65, 0x78, 0x12, 0x46, 0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x18,
-	0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74,
-	0x79, 0x52, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x1a, 0x75, 0x0a, 0x14, 0x54,
-	0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x47, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x8f, 0x02, 0x0a, 0x25,
-	0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x09, 0x4e, 0x6f, 0x64, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x53, 0xaa, 0x02,
-	0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0xca, 0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xe2, 0x02, 0x2d, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
-	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x24, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pbservice_node_proto_rawDescOnce sync.Once
-	file_private_pbservice_node_proto_rawDescData = file_private_pbservice_node_proto_rawDesc
-)
-
-func file_private_pbservice_node_proto_rawDescGZIP() []byte {
-	file_private_pbservice_node_proto_rawDescOnce.Do(func() {
-		file_private_pbservice_node_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbservice_node_proto_rawDescData)
-	})
-	return file_private_pbservice_node_proto_rawDescData
-}
-
-var file_private_pbservice_node_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
-var file_private_pbservice_node_proto_goTypes = []interface{}{
-	(*IndexedCheckServiceNodes)(nil), // 0: hashicorp.consul.internal.service.IndexedCheckServiceNodes
-	(*CheckServiceNode)(nil),         // 1: hashicorp.consul.internal.service.CheckServiceNode
-	(*Node)(nil),                     // 2: hashicorp.consul.internal.service.Node
-	(*NodeService)(nil),              // 3: hashicorp.consul.internal.service.NodeService
-	nil,                              // 4: hashicorp.consul.internal.service.Node.TaggedAddressesEntry
-	nil,                              // 5: hashicorp.consul.internal.service.Node.MetaEntry
-	nil,                              // 6: hashicorp.consul.internal.service.NodeService.TaggedAddressesEntry
-	nil,                              // 7: hashicorp.consul.internal.service.NodeService.MetaEntry
-	(*HealthCheck)(nil),              // 8: hashicorp.consul.internal.service.HealthCheck
-	(*pbcommon.RaftIndex)(nil),       // 9: hashicorp.consul.internal.common.RaftIndex
-	(*pbcommon.Locality)(nil),        // 10: hashicorp.consul.internal.common.Locality
-	(*Weights)(nil),                  // 11: hashicorp.consul.internal.service.Weights
-	(*ConnectProxyConfig)(nil),       // 12: hashicorp.consul.internal.service.ConnectProxyConfig
-	(*ServiceConnect)(nil),           // 13: hashicorp.consul.internal.service.ServiceConnect
-	(*pbcommon.EnterpriseMeta)(nil),  // 14: hashicorp.consul.internal.common.EnterpriseMeta
-	(*ServiceAddress)(nil),           // 15: hashicorp.consul.internal.service.ServiceAddress
-}
-var file_private_pbservice_node_proto_depIdxs = []int32{
-	1,  // 0: hashicorp.consul.internal.service.IndexedCheckServiceNodes.Nodes:type_name -> hashicorp.consul.internal.service.CheckServiceNode
-	2,  // 1: hashicorp.consul.internal.service.CheckServiceNode.Node:type_name -> hashicorp.consul.internal.service.Node
-	3,  // 2: hashicorp.consul.internal.service.CheckServiceNode.Service:type_name -> hashicorp.consul.internal.service.NodeService
-	8,  // 3: hashicorp.consul.internal.service.CheckServiceNode.Checks:type_name -> hashicorp.consul.internal.service.HealthCheck
-	4,  // 4: hashicorp.consul.internal.service.Node.TaggedAddresses:type_name -> hashicorp.consul.internal.service.Node.TaggedAddressesEntry
-	5,  // 5: hashicorp.consul.internal.service.Node.Meta:type_name -> hashicorp.consul.internal.service.Node.MetaEntry
-	9,  // 6: hashicorp.consul.internal.service.Node.RaftIndex:type_name -> hashicorp.consul.internal.common.RaftIndex
-	10, // 7: hashicorp.consul.internal.service.Node.Locality:type_name -> hashicorp.consul.internal.common.Locality
-	6,  // 8: hashicorp.consul.internal.service.NodeService.TaggedAddresses:type_name -> hashicorp.consul.internal.service.NodeService.TaggedAddressesEntry
-	7,  // 9: hashicorp.consul.internal.service.NodeService.Meta:type_name -> hashicorp.consul.internal.service.NodeService.MetaEntry
-	11, // 10: hashicorp.consul.internal.service.NodeService.Weights:type_name -> hashicorp.consul.internal.service.Weights
-	12, // 11: hashicorp.consul.internal.service.NodeService.Proxy:type_name -> hashicorp.consul.internal.service.ConnectProxyConfig
-	13, // 12: hashicorp.consul.internal.service.NodeService.Connect:type_name -> hashicorp.consul.internal.service.ServiceConnect
-	14, // 13: hashicorp.consul.internal.service.NodeService.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
-	9,  // 14: hashicorp.consul.internal.service.NodeService.RaftIndex:type_name -> hashicorp.consul.internal.common.RaftIndex
-	10, // 15: hashicorp.consul.internal.service.NodeService.Locality:type_name -> hashicorp.consul.internal.common.Locality
-	15, // 16: hashicorp.consul.internal.service.NodeService.TaggedAddressesEntry.value:type_name -> hashicorp.consul.internal.service.ServiceAddress
-	17, // [17:17] is the sub-list for method output_type
-	17, // [17:17] is the sub-list for method input_type
-	17, // [17:17] is the sub-list for extension type_name
-	17, // [17:17] is the sub-list for extension extendee
-	0,  // [0:17] is the sub-list for field type_name
-}
-
-func init() { file_private_pbservice_node_proto_init() }
-func file_private_pbservice_node_proto_init() {
-	if File_private_pbservice_node_proto != nil {
-		return
-	}
-	file_private_pbservice_healthcheck_proto_init()
-	file_private_pbservice_service_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbservice_node_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IndexedCheckServiceNodes); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_node_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CheckServiceNode); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_node_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Node); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_node_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NodeService); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbservice_node_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   8,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_private_pbservice_node_proto_goTypes,
-		DependencyIndexes: file_private_pbservice_node_proto_depIdxs,
-		MessageInfos:      file_private_pbservice_node_proto_msgTypes,
-	}.Build()
-	File_private_pbservice_node_proto = out.File
-	file_private_pbservice_node_proto_rawDesc = nil
-	file_private_pbservice_node_proto_goTypes = nil
-	file_private_pbservice_node_proto_depIdxs = nil
-}
diff --git a/proto/private/pbservice/node.proto b/proto/private/pbservice/node.proto
deleted file mode 100644
index 6b81f0b6c06d3..0000000000000
--- a/proto/private/pbservice/node.proto
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-package hashicorp.consul.internal.service;
-
-import "private/pbcommon/common.proto";
-import "private/pbservice/healthcheck.proto";
-import "private/pbservice/service.proto";
-
-// IndexedCheckServiceNodes is used to return multiple instances for a given service.
-message IndexedCheckServiceNodes {
-  uint64 Index = 1;
-  repeated CheckServiceNode Nodes = 2;
-}
-
-// CheckServiceNode is used to provide the node, its service
-// definition, as well as a HealthCheck that is associated.
-message CheckServiceNode {
-  Node Node = 1;
-  NodeService Service = 2;
-  repeated HealthCheck Checks = 3;
-}
-
-// Node contains information about a node.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.Node
-// output=node.gen.go
-// name=Structs
-message Node {
-  // mog: func-to=NodeIDType func-from=string
-  string ID = 1;
-
-  string Node = 2;
-  string Partition = 8;
-  string PeerName = 9;
-  string Address = 3;
-  string Datacenter = 4;
-  map<string, string> TaggedAddresses = 5;
-  map<string, string> Meta = 6;
-
-  // mog: func-to=RaftIndexToStructs func-from=NewRaftIndexFromStructs
-  common.RaftIndex RaftIndex = 7;
-  // Locality identifies where the node is running.
-  // mog: func-to=LocalityToStructs func-from=LocalityFromStructs
-  common.Locality Locality = 10;
-}
-
-// NodeService is a service provided by a node
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.NodeService
-// output=node.gen.go
-// name=Structs
-message NodeService {
-  // Kind is the kind of service this is. Different kinds of services may
-  // have differing validation, DNS behavior, etc. An empty kind will default
-  // to the Default kind. See ServiceKind for the full list of kinds.
-  // mog: func-to=structs.ServiceKind func-from=string
-  string Kind = 1;
-
-  string ID = 2;
-  string Service = 3;
-  repeated string Tags = 4;
-  string Address = 5;
-  // mog: func-to=MapStringServiceAddressToStructs func-from=NewMapStringServiceAddressFromStructs
-  map<string, ServiceAddress> TaggedAddresses = 15;
-  map<string, string> Meta = 6;
-  // mog: func-to=int func-from=int32
-  int32 Port = 7;
-  string SocketPath = 17;
-
-  // mog: func-to=WeightsPtrToStructs func-from=NewWeightsPtrFromStructs
-  Weights Weights = 8;
-  bool EnableTagOverride = 9;
-
-  // Proxy is the configuration set for Kind = connect-proxy. It is mandatory in
-  // that case and an error to be set for any other kind. This config is part of
-  // a proxy service definition and is distinct from but shares some fields with
-  // the Connect.Proxy which configures a managed proxy as part of the actual
-  // service's definition. This duplication is ugly but seemed better than the
-  // alternative which was to re-use the same struct fields for both cases even
-  // though the semantics are different and the non-shred fields make no sense
-  // in the other case. ProxyConfig may be a more natural name here, but it's
-  // confusing for the UX because one of the fields in ConnectProxyConfig is
-  // also called just "Config"
-  ConnectProxyConfig Proxy = 11;
-
-  // Connect are the Connect settings for a service. This is purposely NOT
-  // a pointer so that we never have to nil-check this.
-  ServiceConnect Connect = 12;
-
-  // LocallyRegisteredAsSidecar is private as it is only used by a local agent
-  // state to track if the service was registered from a nested sidecar_service
-  // block. We need to track that so we can know whether we need to deregister
-  // it automatically too if it's removed from the service definition or if the
-  // parent service is deregistered. Relying only on ID would cause us to
-  // deregister regular services if they happen to be registered using the same
-  // ID scheme as our sidecars do by default. We could use meta but that gets
-  // unpleasant because we can't use the consul- prefix from an agent (reserved
-  // for use internally but in practice that means within the state store or in
-  // responses only), and it leaks the detail publicly which people might rely
-  // on which is a bit unpleasant for something that is meant to be config-file
-  // syntax sugar. Note this is not translated to ServiceNode and friends and
-  // may not be set on a NodeService that isn't the one the agent registered and
-  // keeps in it's local state. We never want this rendered in JSON as it's
-  // internal only. Right now our agent endpoints return api structs which don't
-  // include it but this is a safety net incase we change that or there is
-  // somewhere this is used in API output.
-  bool LocallyRegisteredAsSidecar = 13;
-
-  // mog: func-to=EnterpriseMetaToStructs func-from=NewEnterpriseMetaFromStructs
-  common.EnterpriseMeta EnterpriseMeta = 16;
-
-  string PeerName = 18;
-
-  // mog: func-to=RaftIndexToStructs func-from=NewRaftIndexFromStructs
-  common.RaftIndex RaftIndex = 14;
-
-  // Locality identifies where the service is running.
-  // mog: func-to=LocalityToStructs func-from=LocalityFromStructs
-  common.Locality Locality = 19;
-}
diff --git a/proto/private/pbservice/service.pb.binary.go b/proto/private/pbservice/service.pb.binary.go
deleted file mode 100644
index bfd490fa811de..0000000000000
--- a/proto/private/pbservice/service.pb.binary.go
+++ /dev/null
@@ -1,128 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbservice/service.proto
-
-package pbservice
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ConnectProxyConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ConnectProxyConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Upstream) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Upstream) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ServiceConnect) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ServiceConnect) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *PeeringServiceMeta) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *PeeringServiceMeta) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ExposeConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ExposeConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ExposePath) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ExposePath) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *MeshGatewayConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *MeshGatewayConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *TransparentProxyConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *TransparentProxyConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *AccessLogsConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *AccessLogsConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ServiceDefinition) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ServiceDefinition) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ServiceAddress) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ServiceAddress) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Weights) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Weights) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto/private/pbservice/service.pb.go b/proto/private/pbservice/service.pb.go
deleted file mode 100644
index 871b6a04118cd..0000000000000
--- a/proto/private/pbservice/service.pb.go
+++ /dev/null
@@ -1,1740 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbservice/service.proto
-
-package pbservice
-
-import (
-	pbcommon "github.com/hashicorp/consul/proto/private/pbcommon"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	structpb "google.golang.org/protobuf/types/known/structpb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// ConnectProxyConfig describes the configuration needed for any proxy managed
-// or unmanaged. It describes a single logical service's listener and optionally
-// upstreams and sidecar-related config for a single instance. To describe a
-// centralized proxy that routed traffic for multiple services, a different one
-// of these would be needed for each, sharing the same LogicalProxyID.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ConnectProxyConfig
-// output=service.gen.go
-// name=Structs
-// ignore-fields=MutualTLSMode
-type ConnectProxyConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// DestinationServiceName is required and is the name of the service to accept
-	// traffic for.
-	DestinationServiceName string `protobuf:"bytes,1,opt,name=DestinationServiceName,proto3" json:"DestinationServiceName,omitempty"`
-	// DestinationServiceID is optional and should only be specified for
-	// "side-car" style proxies where the proxy is in front of just a single
-	// instance of the service. It should be set to the service ID of the instance
-	// being represented which must be registered to the same agent. It's valid to
-	// provide a service ID that does not yet exist to avoid timing issues when
-	// bootstrapping a service with a proxy.
-	DestinationServiceID string `protobuf:"bytes,2,opt,name=DestinationServiceID,proto3" json:"DestinationServiceID,omitempty"`
-	// LocalServiceAddress is the address of the local service instance. It is
-	// optional and should only be specified for "side-car" style proxies. It will
-	// default to 127.0.0.1 if the proxy is a "side-car" (DestinationServiceID is
-	// set) but otherwise will be ignored.
-	LocalServiceAddress string `protobuf:"bytes,3,opt,name=LocalServiceAddress,proto3" json:"LocalServiceAddress,omitempty"`
-	// LocalServicePort is the port of the local service instance. It is optional
-	// and should only be specified for "side-car" style proxies. It will default
-	// to the registered port for the instance if the proxy is a "side-car"
-	// (DestinationServiceID is set) but otherwise will be ignored.
-	// mog: func-to=int func-from=int32
-	LocalServicePort int32 `protobuf:"varint,4,opt,name=LocalServicePort,proto3" json:"LocalServicePort,omitempty"`
-	// Config is the arbitrary configuration data provided with the proxy
-	// registration.
-	// mog: func-to=ProtobufTypesStructToMapStringInterface func-from=MapStringInterfaceToProtobufTypesStruct
-	Config *structpb.Struct `protobuf:"bytes,5,opt,name=Config,proto3" json:"Config,omitempty"`
-	// Upstreams describes any upstream dependencies the proxy instance should
-	// setup.
-	// mog: func-to=UpstreamsToStructs func-from=NewUpstreamsFromStructs
-	Upstreams []*Upstream `protobuf:"bytes,6,rep,name=Upstreams,proto3" json:"Upstreams,omitempty"`
-	// MeshGateway defines the mesh gateway configuration for upstreams
-	MeshGateway *MeshGatewayConfig `protobuf:"bytes,7,opt,name=MeshGateway,proto3" json:"MeshGateway,omitempty"`
-	// Expose defines whether checks or paths are exposed through the proxy
-	Expose *ExposeConfig `protobuf:"bytes,8,opt,name=Expose,proto3" json:"Expose,omitempty"`
-	// Mode represents how the proxy's inbound and upstream listeners are dialed.
-	// mog: func-to=structs.ProxyMode func-from=string
-	Mode string `protobuf:"bytes,9,opt,name=Mode,proto3" json:"Mode,omitempty"`
-	// TransparentProxy defines configuration for when the proxy is in
-	// transparent mode.
-	TransparentProxy *TransparentProxyConfig `protobuf:"bytes,10,opt,name=TransparentProxy,proto3" json:"TransparentProxy,omitempty"`
-	// LocalServiceSocketPath is the path to the unix domain socket for the local service instance
-	LocalServiceSocketPath string `protobuf:"bytes,11,opt,name=LocalServiceSocketPath,proto3" json:"LocalServiceSocketPath,omitempty"`
-	// mog: func-to=EnvoyExtensionsToStructs func-from=EnvoyExtensionsFromStructs
-	EnvoyExtensions []*pbcommon.EnvoyExtension `protobuf:"bytes,12,rep,name=EnvoyExtensions,proto3" json:"EnvoyExtensions,omitempty"`
-	// AccessLogsConfig defines envoys access log configuration.
-	AccessLogs *AccessLogsConfig `protobuf:"bytes,13,opt,name=AccessLogs,proto3" json:"AccessLogs,omitempty"`
-}
-
-func (x *ConnectProxyConfig) Reset() {
-	*x = ConnectProxyConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_service_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ConnectProxyConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ConnectProxyConfig) ProtoMessage() {}
-
-func (x *ConnectProxyConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_service_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ConnectProxyConfig.ProtoReflect.Descriptor instead.
-func (*ConnectProxyConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_service_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ConnectProxyConfig) GetDestinationServiceName() string {
-	if x != nil {
-		return x.DestinationServiceName
-	}
-	return ""
-}
-
-func (x *ConnectProxyConfig) GetDestinationServiceID() string {
-	if x != nil {
-		return x.DestinationServiceID
-	}
-	return ""
-}
-
-func (x *ConnectProxyConfig) GetLocalServiceAddress() string {
-	if x != nil {
-		return x.LocalServiceAddress
-	}
-	return ""
-}
-
-func (x *ConnectProxyConfig) GetLocalServicePort() int32 {
-	if x != nil {
-		return x.LocalServicePort
-	}
-	return 0
-}
-
-func (x *ConnectProxyConfig) GetConfig() *structpb.Struct {
-	if x != nil {
-		return x.Config
-	}
-	return nil
-}
-
-func (x *ConnectProxyConfig) GetUpstreams() []*Upstream {
-	if x != nil {
-		return x.Upstreams
-	}
-	return nil
-}
-
-func (x *ConnectProxyConfig) GetMeshGateway() *MeshGatewayConfig {
-	if x != nil {
-		return x.MeshGateway
-	}
-	return nil
-}
-
-func (x *ConnectProxyConfig) GetExpose() *ExposeConfig {
-	if x != nil {
-		return x.Expose
-	}
-	return nil
-}
-
-func (x *ConnectProxyConfig) GetMode() string {
-	if x != nil {
-		return x.Mode
-	}
-	return ""
-}
-
-func (x *ConnectProxyConfig) GetTransparentProxy() *TransparentProxyConfig {
-	if x != nil {
-		return x.TransparentProxy
-	}
-	return nil
-}
-
-func (x *ConnectProxyConfig) GetLocalServiceSocketPath() string {
-	if x != nil {
-		return x.LocalServiceSocketPath
-	}
-	return ""
-}
-
-func (x *ConnectProxyConfig) GetEnvoyExtensions() []*pbcommon.EnvoyExtension {
-	if x != nil {
-		return x.EnvoyExtensions
-	}
-	return nil
-}
-
-func (x *ConnectProxyConfig) GetAccessLogs() *AccessLogsConfig {
-	if x != nil {
-		return x.AccessLogs
-	}
-	return nil
-}
-
-// Upstream represents a single upstream dependency for a service or proxy. It
-// describes the mechanism used to discover instances to communicate with (the
-// Target) as well as any potential client configuration that may be useful such
-// as load balancer options, timeouts etc.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.Upstream
-// output=service.gen.go
-// name=Structs
-// ignore-fields=IngressHosts
-type Upstream struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Destination fields are the required ones for determining what this upstream
-	// points to. Depending on DestinationType some other fields below might
-	// further restrict the set of instances allowable.
-	//
-	// DestinationType would be better as an int constant but even with custom
-	// JSON marshallers it causes havoc with all the mapstructure mangling we do
-	// on service definitions in various places.
-	DestinationType      string `protobuf:"bytes,1,opt,name=DestinationType,proto3" json:"DestinationType,omitempty"`
-	DestinationNamespace string `protobuf:"bytes,2,opt,name=DestinationNamespace,proto3" json:"DestinationNamespace,omitempty"`
-	DestinationPartition string `protobuf:"bytes,12,opt,name=DestinationPartition,proto3" json:"DestinationPartition,omitempty"`
-	DestinationPeer      string `protobuf:"bytes,13,opt,name=DestinationPeer,proto3" json:"DestinationPeer,omitempty"`
-	DestinationName      string `protobuf:"bytes,3,opt,name=DestinationName,proto3" json:"DestinationName,omitempty"`
-	// Datacenter that the service discovery request should be run against. Note
-	// for prepared queries, the actual results might be from a different
-	// datacenter.
-	Datacenter string `protobuf:"bytes,4,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
-	// LocalBindAddress is the ip address a side-car proxy should listen on for
-	// traffic destined for this upstream service. Default if empty is 127.0.0.1.
-	LocalBindAddress string `protobuf:"bytes,5,opt,name=LocalBindAddress,proto3" json:"LocalBindAddress,omitempty"`
-	// LocalBindPort is the ip address a side-car proxy should listen on for
-	// traffic destined for this upstream service. Required.
-	// mog: func-to=int func-from=int32
-	LocalBindPort int32 `protobuf:"varint,6,opt,name=LocalBindPort,proto3" json:"LocalBindPort,omitempty"`
-	// Config is an opaque config that is specific to the proxy process being run.
-	// It can be used to pass arbitrary configuration for this specific upstream
-	// to the proxy.
-	// mog: func-to=ProtobufTypesStructToMapStringInterface func-from=MapStringInterfaceToProtobufTypesStruct
-	Config *structpb.Struct `protobuf:"bytes,7,opt,name=Config,proto3" json:"Config,omitempty"`
-	// MeshGateway is the configuration for mesh gateway usage of this upstream
-	MeshGateway *MeshGatewayConfig `protobuf:"bytes,8,opt,name=MeshGateway,proto3" json:"MeshGateway,omitempty"`
-	// CentrallyConfigured indicates whether the upstream was defined in a proxy
-	// instance registration or whether it was generated from a config entry.
-	CentrallyConfigured bool `protobuf:"varint,9,opt,name=CentrallyConfigured,proto3" json:"CentrallyConfigured,omitempty"`
-	// LocalBindSocketPath is the socket to create to connect to the upstream service
-	LocalBindSocketPath string `protobuf:"bytes,10,opt,name=LocalBindSocketPath,proto3" json:"LocalBindSocketPath,omitempty"`
-	LocalBindSocketMode string `protobuf:"bytes,11,opt,name=LocalBindSocketMode,proto3" json:"LocalBindSocketMode,omitempty"`
-}
-
-func (x *Upstream) Reset() {
-	*x = Upstream{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_service_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Upstream) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Upstream) ProtoMessage() {}
-
-func (x *Upstream) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_service_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Upstream.ProtoReflect.Descriptor instead.
-func (*Upstream) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_service_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *Upstream) GetDestinationType() string {
-	if x != nil {
-		return x.DestinationType
-	}
-	return ""
-}
-
-func (x *Upstream) GetDestinationNamespace() string {
-	if x != nil {
-		return x.DestinationNamespace
-	}
-	return ""
-}
-
-func (x *Upstream) GetDestinationPartition() string {
-	if x != nil {
-		return x.DestinationPartition
-	}
-	return ""
-}
-
-func (x *Upstream) GetDestinationPeer() string {
-	if x != nil {
-		return x.DestinationPeer
-	}
-	return ""
-}
-
-func (x *Upstream) GetDestinationName() string {
-	if x != nil {
-		return x.DestinationName
-	}
-	return ""
-}
-
-func (x *Upstream) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-func (x *Upstream) GetLocalBindAddress() string {
-	if x != nil {
-		return x.LocalBindAddress
-	}
-	return ""
-}
-
-func (x *Upstream) GetLocalBindPort() int32 {
-	if x != nil {
-		return x.LocalBindPort
-	}
-	return 0
-}
-
-func (x *Upstream) GetConfig() *structpb.Struct {
-	if x != nil {
-		return x.Config
-	}
-	return nil
-}
-
-func (x *Upstream) GetMeshGateway() *MeshGatewayConfig {
-	if x != nil {
-		return x.MeshGateway
-	}
-	return nil
-}
-
-func (x *Upstream) GetCentrallyConfigured() bool {
-	if x != nil {
-		return x.CentrallyConfigured
-	}
-	return false
-}
-
-func (x *Upstream) GetLocalBindSocketPath() string {
-	if x != nil {
-		return x.LocalBindSocketPath
-	}
-	return ""
-}
-
-func (x *Upstream) GetLocalBindSocketMode() string {
-	if x != nil {
-		return x.LocalBindSocketMode
-	}
-	return ""
-}
-
-// ServiceConnect are the shared Connect settings between all service
-// definitions from the agent to the state store.
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceConnect
-// output=service.gen.go
-// name=Structs
-type ServiceConnect struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Native is true when this service can natively understand Connect.
-	Native bool `protobuf:"varint,1,opt,name=Native,proto3" json:"Native,omitempty"`
-	// SidecarService is a nested Service Definition to register at the same time.
-	// It's purely a convenience mechanism to allow specifying a sidecar service
-	// along with the application service definition. It's nested nature allows
-	// all of the fields to be defaulted which can reduce the amount of
-	// boilerplate needed to register a sidecar service separately, but the end
-	// result is identical to just making a second service registration via any
-	// other means.
-	// mog: func-to=ServiceDefinitionPtrToStructs func-from=NewServiceDefinitionPtrFromStructs
-	SidecarService *ServiceDefinition  `protobuf:"bytes,3,opt,name=SidecarService,proto3" json:"SidecarService,omitempty"`
-	PeerMeta       *PeeringServiceMeta `protobuf:"bytes,4,opt,name=PeerMeta,proto3" json:"PeerMeta,omitempty"`
-}
-
-func (x *ServiceConnect) Reset() {
-	*x = ServiceConnect{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_service_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceConnect) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceConnect) ProtoMessage() {}
-
-func (x *ServiceConnect) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_service_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceConnect.ProtoReflect.Descriptor instead.
-func (*ServiceConnect) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_service_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *ServiceConnect) GetNative() bool {
-	if x != nil {
-		return x.Native
-	}
-	return false
-}
-
-func (x *ServiceConnect) GetSidecarService() *ServiceDefinition {
-	if x != nil {
-		return x.SidecarService
-	}
-	return nil
-}
-
-func (x *ServiceConnect) GetPeerMeta() *PeeringServiceMeta {
-	if x != nil {
-		return x.PeerMeta
-	}
-	return nil
-}
-
-// PeeringServiceMeta is read-only information provided from an exported peer.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.PeeringServiceMeta
-// output=service.gen.go
-// name=Structs
-type PeeringServiceMeta struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	SNI      []string `protobuf:"bytes,1,rep,name=SNI,proto3" json:"SNI,omitempty"`
-	SpiffeID []string `protobuf:"bytes,2,rep,name=SpiffeID,proto3" json:"SpiffeID,omitempty"`
-	Protocol string   `protobuf:"bytes,3,opt,name=Protocol,proto3" json:"Protocol,omitempty"`
-}
-
-func (x *PeeringServiceMeta) Reset() {
-	*x = PeeringServiceMeta{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_service_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PeeringServiceMeta) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PeeringServiceMeta) ProtoMessage() {}
-
-func (x *PeeringServiceMeta) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_service_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PeeringServiceMeta.ProtoReflect.Descriptor instead.
-func (*PeeringServiceMeta) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_service_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *PeeringServiceMeta) GetSNI() []string {
-	if x != nil {
-		return x.SNI
-	}
-	return nil
-}
-
-func (x *PeeringServiceMeta) GetSpiffeID() []string {
-	if x != nil {
-		return x.SpiffeID
-	}
-	return nil
-}
-
-func (x *PeeringServiceMeta) GetProtocol() string {
-	if x != nil {
-		return x.Protocol
-	}
-	return ""
-}
-
-// ExposeConfig describes HTTP paths to expose through Envoy outside of Connect.
-// Users can expose individual paths and/or all HTTP/GRPC paths for checks.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ExposeConfig
-// output=service.gen.go
-// name=Structs
-type ExposeConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Checks defines whether paths associated with Consul checks will be exposed.
-	// This flag triggers exposing all HTTP and GRPC check paths registered for the service.
-	Checks bool `protobuf:"varint,1,opt,name=Checks,proto3" json:"Checks,omitempty"`
-	// Paths is the list of paths exposed through the proxy.
-	// mog: func-to=ExposePathSliceToStructs func-from=NewExposePathSliceFromStructs
-	Paths []*ExposePath `protobuf:"bytes,2,rep,name=Paths,proto3" json:"Paths,omitempty"`
-}
-
-func (x *ExposeConfig) Reset() {
-	*x = ExposeConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_service_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExposeConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExposeConfig) ProtoMessage() {}
-
-func (x *ExposeConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_service_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExposeConfig.ProtoReflect.Descriptor instead.
-func (*ExposeConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_service_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *ExposeConfig) GetChecks() bool {
-	if x != nil {
-		return x.Checks
-	}
-	return false
-}
-
-func (x *ExposeConfig) GetPaths() []*ExposePath {
-	if x != nil {
-		return x.Paths
-	}
-	return nil
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ExposePath
-// output=service.gen.go
-// name=Structs
-type ExposePath struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ListenerPort defines the port of the proxy's listener for exposed paths.
-	// mog: func-to=int func-from=int32
-	ListenerPort int32 `protobuf:"varint,1,opt,name=ListenerPort,proto3" json:"ListenerPort,omitempty"`
-	// ExposePath is the path to expose through the proxy, ie. "/metrics."
-	Path string `protobuf:"bytes,2,opt,name=Path,proto3" json:"Path,omitempty"`
-	// LocalPathPort is the port that the service is listening on for the given path.
-	// mog: func-to=int func-from=int32
-	LocalPathPort int32 `protobuf:"varint,3,opt,name=LocalPathPort,proto3" json:"LocalPathPort,omitempty"`
-	// Protocol describes the upstream's service protocol.
-	// Valid values are "http" and "http2", defaults to "http"
-	Protocol string `protobuf:"bytes,4,opt,name=Protocol,proto3" json:"Protocol,omitempty"`
-	// ParsedFromCheck is set if this path was parsed from a registered check
-	ParsedFromCheck bool `protobuf:"varint,5,opt,name=ParsedFromCheck,proto3" json:"ParsedFromCheck,omitempty"`
-}
-
-func (x *ExposePath) Reset() {
-	*x = ExposePath{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_service_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExposePath) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExposePath) ProtoMessage() {}
-
-func (x *ExposePath) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_service_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ExposePath.ProtoReflect.Descriptor instead.
-func (*ExposePath) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_service_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *ExposePath) GetListenerPort() int32 {
-	if x != nil {
-		return x.ListenerPort
-	}
-	return 0
-}
-
-func (x *ExposePath) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-func (x *ExposePath) GetLocalPathPort() int32 {
-	if x != nil {
-		return x.LocalPathPort
-	}
-	return 0
-}
-
-func (x *ExposePath) GetProtocol() string {
-	if x != nil {
-		return x.Protocol
-	}
-	return ""
-}
-
-func (x *ExposePath) GetParsedFromCheck() bool {
-	if x != nil {
-		return x.ParsedFromCheck
-	}
-	return false
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.MeshGatewayConfig
-// output=service.gen.go
-// name=Structs
-type MeshGatewayConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=structs.MeshGatewayMode func-from=string
-	Mode string `protobuf:"bytes,1,opt,name=Mode,proto3" json:"Mode,omitempty"`
-}
-
-func (x *MeshGatewayConfig) Reset() {
-	*x = MeshGatewayConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_service_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MeshGatewayConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MeshGatewayConfig) ProtoMessage() {}
-
-func (x *MeshGatewayConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_service_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MeshGatewayConfig.ProtoReflect.Descriptor instead.
-func (*MeshGatewayConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_service_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *MeshGatewayConfig) GetMode() string {
-	if x != nil {
-		return x.Mode
-	}
-	return ""
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.TransparentProxyConfig
-// output=service.gen.go
-// name=Structs
-type TransparentProxyConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=int func-from=int32
-	OutboundListenerPort int32 `protobuf:"varint,1,opt,name=OutboundListenerPort,proto3" json:"OutboundListenerPort,omitempty"`
-	// DialedDirectly indicates whether transparent proxies can dial this proxy instance directly.
-	// The discovery chain is not considered when dialing a service instance directly.
-	// This setting is useful when addressing stateful services, such as a database cluster with a leader node.
-	DialedDirectly bool `protobuf:"varint,2,opt,name=DialedDirectly,proto3" json:"DialedDirectly,omitempty"`
-}
-
-func (x *TransparentProxyConfig) Reset() {
-	*x = TransparentProxyConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_service_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TransparentProxyConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TransparentProxyConfig) ProtoMessage() {}
-
-func (x *TransparentProxyConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_service_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TransparentProxyConfig.ProtoReflect.Descriptor instead.
-func (*TransparentProxyConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_service_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *TransparentProxyConfig) GetOutboundListenerPort() int32 {
-	if x != nil {
-		return x.OutboundListenerPort
-	}
-	return 0
-}
-
-func (x *TransparentProxyConfig) GetDialedDirectly() bool {
-	if x != nil {
-		return x.DialedDirectly
-	}
-	return false
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.AccessLogsConfig
-// output=service.gen.go
-// name=Structs
-type AccessLogsConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Enabled             bool `protobuf:"varint,1,opt,name=Enabled,proto3" json:"Enabled,omitempty"`
-	DisableListenerLogs bool `protobuf:"varint,2,opt,name=DisableListenerLogs,proto3" json:"DisableListenerLogs,omitempty"`
-	// Type represents the desired envoy log sink (e.g. stdout, stderr, file ...).
-	// mog: func-to=structs.LogSinkType func-from=string
-	Type       string `protobuf:"bytes,3,opt,name=Type,proto3" json:"Type,omitempty"`
-	Path       string `protobuf:"bytes,4,opt,name=Path,proto3" json:"Path,omitempty"`
-	JSONFormat string `protobuf:"bytes,5,opt,name=JSONFormat,proto3" json:"JSONFormat,omitempty"`
-	TextFormat string `protobuf:"bytes,6,opt,name=TextFormat,proto3" json:"TextFormat,omitempty"`
-}
-
-func (x *AccessLogsConfig) Reset() {
-	*x = AccessLogsConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_service_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AccessLogsConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AccessLogsConfig) ProtoMessage() {}
-
-func (x *AccessLogsConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_service_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AccessLogsConfig.ProtoReflect.Descriptor instead.
-func (*AccessLogsConfig) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_service_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *AccessLogsConfig) GetEnabled() bool {
-	if x != nil {
-		return x.Enabled
-	}
-	return false
-}
-
-func (x *AccessLogsConfig) GetDisableListenerLogs() bool {
-	if x != nil {
-		return x.DisableListenerLogs
-	}
-	return false
-}
-
-func (x *AccessLogsConfig) GetType() string {
-	if x != nil {
-		return x.Type
-	}
-	return ""
-}
-
-func (x *AccessLogsConfig) GetPath() string {
-	if x != nil {
-		return x.Path
-	}
-	return ""
-}
-
-func (x *AccessLogsConfig) GetJSONFormat() string {
-	if x != nil {
-		return x.JSONFormat
-	}
-	return ""
-}
-
-func (x *AccessLogsConfig) GetTextFormat() string {
-	if x != nil {
-		return x.TextFormat
-	}
-	return ""
-}
-
-// ServiceDefinition is used to JSON decode the Service definitions. For
-// documentation on specific fields see NodeService which is better documented.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceDefinition
-// output=service.gen.go
-// name=Structs
-type ServiceDefinition struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=structs.ServiceKind func-from=string
-	Kind    string   `protobuf:"bytes,1,opt,name=Kind,proto3" json:"Kind,omitempty"`
-	ID      string   `protobuf:"bytes,2,opt,name=ID,proto3" json:"ID,omitempty"`
-	Name    string   `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"`
-	Tags    []string `protobuf:"bytes,4,rep,name=Tags,proto3" json:"Tags,omitempty"`
-	Address string   `protobuf:"bytes,5,opt,name=Address,proto3" json:"Address,omitempty"`
-	// mog: func-to=MapStringServiceAddressToStructs func-from=NewMapStringServiceAddressFromStructs
-	TaggedAddresses map[string]*ServiceAddress `protobuf:"bytes,16,rep,name=TaggedAddresses,proto3" json:"TaggedAddresses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	Meta            map[string]string          `protobuf:"bytes,6,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// mog: func-to=int func-from=int32
-	Port int32 `protobuf:"varint,7,opt,name=Port,proto3" json:"Port,omitempty"`
-	// Path for socket
-	SocketPath string     `protobuf:"bytes,18,opt,name=SocketPath,proto3" json:"SocketPath,omitempty"`
-	Check      *CheckType `protobuf:"bytes,8,opt,name=Check,proto3" json:"Check,omitempty"`
-	// mog: func-to=CheckTypesToStructs func-from=NewCheckTypesFromStructs
-	Checks []*CheckType `protobuf:"bytes,9,rep,name=Checks,proto3" json:"Checks,omitempty"`
-	// mog: func-to=WeightsPtrToStructs func-from=NewWeightsPtrFromStructs
-	Weights           *Weights `protobuf:"bytes,10,opt,name=Weights,proto3" json:"Weights,omitempty"`
-	Token             string   `protobuf:"bytes,11,opt,name=Token,proto3" json:"Token,omitempty"`
-	EnableTagOverride bool     `protobuf:"varint,12,opt,name=EnableTagOverride,proto3" json:"EnableTagOverride,omitempty"`
-	// Proxy is the configuration set for Kind = connect-proxy. It is mandatory in
-	// that case and an error to be set for any other kind. This config is part of
-	// a proxy service definition and is distinct from but shares some fields with
-	// the Connect.Proxy which configures a managed proxy as part of the actual
-	// service's definition. This duplication is ugly but seemed better than the
-	// alternative which was to re-use the same struct fields for both cases even
-	// though the semantics are different and the non-shared fields make no sense
-	// in the other case. ProxyConfig may be a more natural name here, but it's
-	// confusing for the UX because one of the fields in ConnectProxyConfig is
-	// also called just "Config"
-	// mog: func-to=ConnectProxyConfigPtrToStructs func-from=NewConnectProxyConfigPtrFromStructs
-	Proxy *ConnectProxyConfig `protobuf:"bytes,14,opt,name=Proxy,proto3" json:"Proxy,omitempty"`
-	// mog: func-to=EnterpriseMetaToStructs func-from=NewEnterpriseMetaFromStructs
-	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,17,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
-	// mog: func-to=ServiceConnectPtrToStructs func-from=NewServiceConnectPtrFromStructs
-	Connect *ServiceConnect `protobuf:"bytes,15,opt,name=Connect,proto3" json:"Connect,omitempty"`
-	// Locality identifies where the service is running.
-	// mog: func-to=LocalityToStructs func-from=LocalityFromStructs
-	Locality *pbcommon.Locality `protobuf:"bytes,19,opt,name=Locality,proto3" json:"Locality,omitempty"`
-}
-
-func (x *ServiceDefinition) Reset() {
-	*x = ServiceDefinition{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_service_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceDefinition) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceDefinition) ProtoMessage() {}
-
-func (x *ServiceDefinition) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_service_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceDefinition.ProtoReflect.Descriptor instead.
-func (*ServiceDefinition) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_service_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *ServiceDefinition) GetKind() string {
-	if x != nil {
-		return x.Kind
-	}
-	return ""
-}
-
-func (x *ServiceDefinition) GetID() string {
-	if x != nil {
-		return x.ID
-	}
-	return ""
-}
-
-func (x *ServiceDefinition) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *ServiceDefinition) GetTags() []string {
-	if x != nil {
-		return x.Tags
-	}
-	return nil
-}
-
-func (x *ServiceDefinition) GetAddress() string {
-	if x != nil {
-		return x.Address
-	}
-	return ""
-}
-
-func (x *ServiceDefinition) GetTaggedAddresses() map[string]*ServiceAddress {
-	if x != nil {
-		return x.TaggedAddresses
-	}
-	return nil
-}
-
-func (x *ServiceDefinition) GetMeta() map[string]string {
-	if x != nil {
-		return x.Meta
-	}
-	return nil
-}
-
-func (x *ServiceDefinition) GetPort() int32 {
-	if x != nil {
-		return x.Port
-	}
-	return 0
-}
-
-func (x *ServiceDefinition) GetSocketPath() string {
-	if x != nil {
-		return x.SocketPath
-	}
-	return ""
-}
-
-func (x *ServiceDefinition) GetCheck() *CheckType {
-	if x != nil {
-		return x.Check
-	}
-	return nil
-}
-
-func (x *ServiceDefinition) GetChecks() []*CheckType {
-	if x != nil {
-		return x.Checks
-	}
-	return nil
-}
-
-func (x *ServiceDefinition) GetWeights() *Weights {
-	if x != nil {
-		return x.Weights
-	}
-	return nil
-}
-
-func (x *ServiceDefinition) GetToken() string {
-	if x != nil {
-		return x.Token
-	}
-	return ""
-}
-
-func (x *ServiceDefinition) GetEnableTagOverride() bool {
-	if x != nil {
-		return x.EnableTagOverride
-	}
-	return false
-}
-
-func (x *ServiceDefinition) GetProxy() *ConnectProxyConfig {
-	if x != nil {
-		return x.Proxy
-	}
-	return nil
-}
-
-func (x *ServiceDefinition) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if x != nil {
-		return x.EnterpriseMeta
-	}
-	return nil
-}
-
-func (x *ServiceDefinition) GetConnect() *ServiceConnect {
-	if x != nil {
-		return x.Connect
-	}
-	return nil
-}
-
-func (x *ServiceDefinition) GetLocality() *pbcommon.Locality {
-	if x != nil {
-		return x.Locality
-	}
-	return nil
-}
-
-// Type to hold an address and port of a service
-type ServiceAddress struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Address string `protobuf:"bytes,1,opt,name=Address,proto3" json:"Address,omitempty"`
-	// mog: func-to=int func-from=int32
-	Port int32 `protobuf:"varint,2,opt,name=Port,proto3" json:"Port,omitempty"`
-}
-
-func (x *ServiceAddress) Reset() {
-	*x = ServiceAddress{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_service_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceAddress) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceAddress) ProtoMessage() {}
-
-func (x *ServiceAddress) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_service_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceAddress.ProtoReflect.Descriptor instead.
-func (*ServiceAddress) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_service_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *ServiceAddress) GetAddress() string {
-	if x != nil {
-		return x.Address
-	}
-	return ""
-}
-
-func (x *ServiceAddress) GetPort() int32 {
-	if x != nil {
-		return x.Port
-	}
-	return 0
-}
-
-// Weights represent the weight used by DNS for a given status
-type Weights struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// mog: func-to=int func-from=int32
-	Passing int32 `protobuf:"varint,1,opt,name=Passing,proto3" json:"Passing,omitempty"`
-	// mog: func-to=int func-from=int32
-	Warning int32 `protobuf:"varint,2,opt,name=Warning,proto3" json:"Warning,omitempty"`
-}
-
-func (x *Weights) Reset() {
-	*x = Weights{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbservice_service_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Weights) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Weights) ProtoMessage() {}
-
-func (x *Weights) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbservice_service_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Weights.ProtoReflect.Descriptor instead.
-func (*Weights) Descriptor() ([]byte, []int) {
-	return file_private_pbservice_service_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *Weights) GetPassing() int32 {
-	if x != nil {
-		return x.Passing
-	}
-	return 0
-}
-
-func (x *Weights) GetWarning() int32 {
-	if x != nil {
-		return x.Warning
-	}
-	return 0
-}
-
-var File_private_pbservice_service_proto protoreflect.FileDescriptor
-
-var file_private_pbservice_service_proto_rawDesc = []byte{
-	0x0a, 0x1f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x21, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x1a, 0x1d, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x63, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x23, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x63, 0x68, 0x65, 0x63, 0x6b,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdf, 0x06, 0x0a, 0x12, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
-	0x63, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x36, 0x0a,
-	0x16, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x44,
-	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x32, 0x0a, 0x14, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x44, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x14, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x44, 0x12, 0x30, 0x0a, 0x13, 0x4c, 0x6f, 0x63,
-	0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x4c,
-	0x6f, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x2f, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74,
-	0x52, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x49, 0x0a, 0x09, 0x55, 0x70, 0x73, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
-	0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x09, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x73, 0x12, 0x56, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77,
-	0x61, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4d, 0x65, 0x73,
-	0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b,
-	0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x12, 0x47, 0x0a, 0x06, 0x45,
-	0x78, 0x70, 0x6f, 0x73, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
-	0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x45, 0x78,
-	0x70, 0x6f, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x09, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x65, 0x0a, 0x10, 0x54, 0x72, 0x61, 0x6e,
-	0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x0a, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x39, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65,
-	0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x10, 0x54,
-	0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12,
-	0x36, 0x0a, 0x16, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53,
-	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x16, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x12, 0x5a, 0x0a, 0x0f, 0x45, 0x6e, 0x76, 0x6f, 0x79,
-	0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x52, 0x0f, 0x45, 0x6e, 0x76, 0x6f, 0x79, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x12, 0x53, 0x0a, 0x0a, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67,
-	0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x41, 0x63, 0x63, 0x65,
-	0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a, 0x41, 0x63,
-	0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x22, 0x81, 0x05, 0x0a, 0x08, 0x55, 0x70, 0x73,
-	0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x28, 0x0a, 0x0f, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f,
-	0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12,
-	0x32, 0x0a, 0x14, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61,
-	0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x44,
-	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x12, 0x32, 0x0a, 0x14, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x14, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61,
-	0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x0f, 0x44, 0x65, 0x73, 0x74, 0x69,
-	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x65, 0x72, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0f, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x65,
-	0x72, 0x12, 0x28, 0x0a, 0x0f, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x44, 0x65, 0x73, 0x74,
-	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x44,
-	0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x10, 0x4c,
-	0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64,
-	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x4c, 0x6f, 0x63, 0x61, 0x6c,
-	0x42, 0x69, 0x6e, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d,
-	0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x2f, 0x0a,
-	0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x56,
-	0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x18, 0x08, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65,
-	0x77, 0x61, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47,
-	0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x12, 0x30, 0x0a, 0x13, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61,
-	0x6c, 0x6c, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x18, 0x09, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x13, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x6c, 0x79, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x12, 0x30, 0x0a, 0x13, 0x4c, 0x6f, 0x63, 0x61,
-	0x6c, 0x42, 0x69, 0x6e, 0x64, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x18,
-	0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64,
-	0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x12, 0x30, 0x0a, 0x13, 0x4c, 0x6f,
-	0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4d, 0x6f, 0x64,
-	0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69,
-	0x6e, 0x64, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x22, 0xdf, 0x01, 0x0a,
-	0x0e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12,
-	0x16, 0x0a, 0x06, 0x4e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x06, 0x4e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x12, 0x5c, 0x0a, 0x0e, 0x53, 0x69, 0x64, 0x65, 0x63,
-	0x61, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x51, 0x0a, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4d, 0x65, 0x74,
-	0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x50, 0x65, 0x65, 0x72,
-	0x69, 0x6e, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x08,
-	0x50, 0x65, 0x65, 0x72, 0x4d, 0x65, 0x74, 0x61, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x22, 0x5e,
-	0x0a, 0x12, 0x50, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x4d, 0x65, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x53, 0x4e, 0x49, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x03, 0x53, 0x4e, 0x49, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x70, 0x69, 0x66, 0x66, 0x65,
-	0x49, 0x44, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x53, 0x70, 0x69, 0x66, 0x66, 0x65,
-	0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x22, 0x6b,
-	0x0a, 0x0c, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x16,
-	0x0a, 0x06, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
-	0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x12, 0x43, 0x0a, 0x05, 0x50, 0x61, 0x74, 0x68, 0x73, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65,
-	0x50, 0x61, 0x74, 0x68, 0x52, 0x05, 0x50, 0x61, 0x74, 0x68, 0x73, 0x22, 0xb0, 0x01, 0x0a, 0x0a,
-	0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x22, 0x0a, 0x0c, 0x4c, 0x69,
-	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x12,
-	0x0a, 0x04, 0x50, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x50, 0x61,
-	0x74, 0x68, 0x12, 0x24, 0x0a, 0x0d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x50,
-	0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x4c, 0x6f, 0x63, 0x61, 0x6c,
-	0x50, 0x61, 0x74, 0x68, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x50, 0x61, 0x72, 0x73, 0x65, 0x64, 0x46, 0x72,
-	0x6f, 0x6d, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x50,
-	0x61, 0x72, 0x73, 0x65, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x27,
-	0x0a, 0x11, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x22, 0x74, 0x0a, 0x16, 0x54, 0x72, 0x61, 0x6e, 0x73,
-	0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x32, 0x0a, 0x14, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4c, 0x69, 0x73,
-	0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x14, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65,
-	0x72, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x44, 0x69, 0x61, 0x6c, 0x65, 0x64, 0x44,
-	0x69, 0x72, 0x65, 0x63, 0x74, 0x6c, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x44,
-	0x69, 0x61, 0x6c, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6c, 0x79, 0x22, 0xc6, 0x01,
-	0x0a, 0x10, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x73, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x07, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x30, 0x0a, 0x13,
-	0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4c,
-	0x6f, 0x67, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x44, 0x69, 0x73, 0x61, 0x62,
-	0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x12,
-	0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x79,
-	0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1e, 0x0a, 0x0a, 0x4a, 0x53, 0x4f, 0x4e, 0x46, 0x6f,
-	0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x4a, 0x53, 0x4f, 0x4e,
-	0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x54, 0x65, 0x78, 0x74, 0x46, 0x6f,
-	0x72, 0x6d, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x54, 0x65, 0x78, 0x74,
-	0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xf6, 0x08, 0x0a, 0x11, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04,
-	0x4b, 0x69, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4b, 0x69, 0x6e, 0x64,
-	0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44,
-	0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x04, 0x54, 0x61, 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72,
-	0x65, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x12, 0x73, 0x0a, 0x0f, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72,
-	0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x49, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x2e, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65,
-	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x52, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18,
-	0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x74, 0x61,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x50,
-	0x6f, 0x72, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x12,
-	0x1e, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x18, 0x12, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x12,
-	0x42, 0x0a, 0x05, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x43, 0x68,
-	0x65, 0x63, 0x6b, 0x12, 0x44, 0x0a, 0x06, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x09, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x79, 0x70,
-	0x65, 0x52, 0x06, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x12, 0x44, 0x0a, 0x07, 0x57, 0x65, 0x69,
-	0x67, 0x68, 0x74, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x57,
-	0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x52, 0x07, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x12,
-	0x14, 0x0a, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x2c, 0x0a, 0x11, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54,
-	0x61, 0x67, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x11, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x61, 0x67, 0x4f, 0x76, 0x65, 0x72, 0x72,
-	0x69, 0x64, 0x65, 0x12, 0x4b, 0x0a, 0x05, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x0e, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x72,
-	0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x05, 0x50, 0x72, 0x6f, 0x78, 0x79,
-	0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65,
-	0x74, 0x61, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65,
-	0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65,
-	0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x4b, 0x0a, 0x07, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x07,
-	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12, 0x46, 0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x6c,
-	0x69, 0x74, 0x79, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4c, 0x6f, 0x63,
-	0x61, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x1a,
-	0x75, 0x0a, 0x14, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x47, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
-	0x3e, 0x0a, 0x0e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x50,
-	0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x22,
-	0x3d, 0x0a, 0x07, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x50, 0x61,
-	0x73, 0x73, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x50, 0x61, 0x73,
-	0x73, 0x69, 0x6e, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x42, 0x92,
-	0x02, 0x0a, 0x25, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x0c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x69, 0x76,
-	0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xa2, 0x02, 0x04,
-	0x48, 0x43, 0x49, 0x53, 0xaa, 0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xca, 0x02, 0x21, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0xe2, 0x02, 0x2d, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c,
-	0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x24, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pbservice_service_proto_rawDescOnce sync.Once
-	file_private_pbservice_service_proto_rawDescData = file_private_pbservice_service_proto_rawDesc
-)
-
-func file_private_pbservice_service_proto_rawDescGZIP() []byte {
-	file_private_pbservice_service_proto_rawDescOnce.Do(func() {
-		file_private_pbservice_service_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbservice_service_proto_rawDescData)
-	})
-	return file_private_pbservice_service_proto_rawDescData
-}
-
-var file_private_pbservice_service_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
-var file_private_pbservice_service_proto_goTypes = []interface{}{
-	(*ConnectProxyConfig)(nil),      // 0: hashicorp.consul.internal.service.ConnectProxyConfig
-	(*Upstream)(nil),                // 1: hashicorp.consul.internal.service.Upstream
-	(*ServiceConnect)(nil),          // 2: hashicorp.consul.internal.service.ServiceConnect
-	(*PeeringServiceMeta)(nil),      // 3: hashicorp.consul.internal.service.PeeringServiceMeta
-	(*ExposeConfig)(nil),            // 4: hashicorp.consul.internal.service.ExposeConfig
-	(*ExposePath)(nil),              // 5: hashicorp.consul.internal.service.ExposePath
-	(*MeshGatewayConfig)(nil),       // 6: hashicorp.consul.internal.service.MeshGatewayConfig
-	(*TransparentProxyConfig)(nil),  // 7: hashicorp.consul.internal.service.TransparentProxyConfig
-	(*AccessLogsConfig)(nil),        // 8: hashicorp.consul.internal.service.AccessLogsConfig
-	(*ServiceDefinition)(nil),       // 9: hashicorp.consul.internal.service.ServiceDefinition
-	(*ServiceAddress)(nil),          // 10: hashicorp.consul.internal.service.ServiceAddress
-	(*Weights)(nil),                 // 11: hashicorp.consul.internal.service.Weights
-	nil,                             // 12: hashicorp.consul.internal.service.ServiceDefinition.TaggedAddressesEntry
-	nil,                             // 13: hashicorp.consul.internal.service.ServiceDefinition.MetaEntry
-	(*structpb.Struct)(nil),         // 14: google.protobuf.Struct
-	(*pbcommon.EnvoyExtension)(nil), // 15: hashicorp.consul.internal.common.EnvoyExtension
-	(*CheckType)(nil),               // 16: hashicorp.consul.internal.service.CheckType
-	(*pbcommon.EnterpriseMeta)(nil), // 17: hashicorp.consul.internal.common.EnterpriseMeta
-	(*pbcommon.Locality)(nil),       // 18: hashicorp.consul.internal.common.Locality
-}
-var file_private_pbservice_service_proto_depIdxs = []int32{
-	14, // 0: hashicorp.consul.internal.service.ConnectProxyConfig.Config:type_name -> google.protobuf.Struct
-	1,  // 1: hashicorp.consul.internal.service.ConnectProxyConfig.Upstreams:type_name -> hashicorp.consul.internal.service.Upstream
-	6,  // 2: hashicorp.consul.internal.service.ConnectProxyConfig.MeshGateway:type_name -> hashicorp.consul.internal.service.MeshGatewayConfig
-	4,  // 3: hashicorp.consul.internal.service.ConnectProxyConfig.Expose:type_name -> hashicorp.consul.internal.service.ExposeConfig
-	7,  // 4: hashicorp.consul.internal.service.ConnectProxyConfig.TransparentProxy:type_name -> hashicorp.consul.internal.service.TransparentProxyConfig
-	15, // 5: hashicorp.consul.internal.service.ConnectProxyConfig.EnvoyExtensions:type_name -> hashicorp.consul.internal.common.EnvoyExtension
-	8,  // 6: hashicorp.consul.internal.service.ConnectProxyConfig.AccessLogs:type_name -> hashicorp.consul.internal.service.AccessLogsConfig
-	14, // 7: hashicorp.consul.internal.service.Upstream.Config:type_name -> google.protobuf.Struct
-	6,  // 8: hashicorp.consul.internal.service.Upstream.MeshGateway:type_name -> hashicorp.consul.internal.service.MeshGatewayConfig
-	9,  // 9: hashicorp.consul.internal.service.ServiceConnect.SidecarService:type_name -> hashicorp.consul.internal.service.ServiceDefinition
-	3,  // 10: hashicorp.consul.internal.service.ServiceConnect.PeerMeta:type_name -> hashicorp.consul.internal.service.PeeringServiceMeta
-	5,  // 11: hashicorp.consul.internal.service.ExposeConfig.Paths:type_name -> hashicorp.consul.internal.service.ExposePath
-	12, // 12: hashicorp.consul.internal.service.ServiceDefinition.TaggedAddresses:type_name -> hashicorp.consul.internal.service.ServiceDefinition.TaggedAddressesEntry
-	13, // 13: hashicorp.consul.internal.service.ServiceDefinition.Meta:type_name -> hashicorp.consul.internal.service.ServiceDefinition.MetaEntry
-	16, // 14: hashicorp.consul.internal.service.ServiceDefinition.Check:type_name -> hashicorp.consul.internal.service.CheckType
-	16, // 15: hashicorp.consul.internal.service.ServiceDefinition.Checks:type_name -> hashicorp.consul.internal.service.CheckType
-	11, // 16: hashicorp.consul.internal.service.ServiceDefinition.Weights:type_name -> hashicorp.consul.internal.service.Weights
-	0,  // 17: hashicorp.consul.internal.service.ServiceDefinition.Proxy:type_name -> hashicorp.consul.internal.service.ConnectProxyConfig
-	17, // 18: hashicorp.consul.internal.service.ServiceDefinition.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
-	2,  // 19: hashicorp.consul.internal.service.ServiceDefinition.Connect:type_name -> hashicorp.consul.internal.service.ServiceConnect
-	18, // 20: hashicorp.consul.internal.service.ServiceDefinition.Locality:type_name -> hashicorp.consul.internal.common.Locality
-	10, // 21: hashicorp.consul.internal.service.ServiceDefinition.TaggedAddressesEntry.value:type_name -> hashicorp.consul.internal.service.ServiceAddress
-	22, // [22:22] is the sub-list for method output_type
-	22, // [22:22] is the sub-list for method input_type
-	22, // [22:22] is the sub-list for extension type_name
-	22, // [22:22] is the sub-list for extension extendee
-	0,  // [0:22] is the sub-list for field type_name
-}
-
-func init() { file_private_pbservice_service_proto_init() }
-func file_private_pbservice_service_proto_init() {
-	if File_private_pbservice_service_proto != nil {
-		return
-	}
-	file_private_pbservice_healthcheck_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbservice_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ConnectProxyConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Upstream); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_service_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceConnect); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_service_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PeeringServiceMeta); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_service_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExposeConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_service_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExposePath); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_service_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MeshGatewayConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_service_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TransparentProxyConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_service_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AccessLogsConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_service_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceDefinition); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_service_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceAddress); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbservice_service_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Weights); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbservice_service_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   14,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_private_pbservice_service_proto_goTypes,
-		DependencyIndexes: file_private_pbservice_service_proto_depIdxs,
-		MessageInfos:      file_private_pbservice_service_proto_msgTypes,
-	}.Build()
-	File_private_pbservice_service_proto = out.File
-	file_private_pbservice_service_proto_rawDesc = nil
-	file_private_pbservice_service_proto_goTypes = nil
-	file_private_pbservice_service_proto_depIdxs = nil
-}
diff --git a/proto/private/pbservice/service.proto b/proto/private/pbservice/service.proto
deleted file mode 100644
index b89f1717b17c1..0000000000000
--- a/proto/private/pbservice/service.proto
+++ /dev/null
@@ -1,333 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-package hashicorp.consul.internal.service;
-
-import "google/protobuf/struct.proto";
-import "private/pbcommon/common.proto";
-import "private/pbservice/healthcheck.proto";
-
-// ConnectProxyConfig describes the configuration needed for any proxy managed
-// or unmanaged. It describes a single logical service's listener and optionally
-// upstreams and sidecar-related config for a single instance. To describe a
-// centralized proxy that routed traffic for multiple services, a different one
-// of these would be needed for each, sharing the same LogicalProxyID.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ConnectProxyConfig
-// output=service.gen.go
-// name=Structs
-// ignore-fields=MutualTLSMode
-message ConnectProxyConfig {
-  // DestinationServiceName is required and is the name of the service to accept
-  // traffic for.
-  string DestinationServiceName = 1;
-
-  // DestinationServiceID is optional and should only be specified for
-  // "side-car" style proxies where the proxy is in front of just a single
-  // instance of the service. It should be set to the service ID of the instance
-  // being represented which must be registered to the same agent. It's valid to
-  // provide a service ID that does not yet exist to avoid timing issues when
-  // bootstrapping a service with a proxy.
-  string DestinationServiceID = 2;
-
-  // LocalServiceAddress is the address of the local service instance. It is
-  // optional and should only be specified for "side-car" style proxies. It will
-  // default to 127.0.0.1 if the proxy is a "side-car" (DestinationServiceID is
-  // set) but otherwise will be ignored.
-  string LocalServiceAddress = 3;
-
-  // LocalServicePort is the port of the local service instance. It is optional
-  // and should only be specified for "side-car" style proxies. It will default
-  // to the registered port for the instance if the proxy is a "side-car"
-  // (DestinationServiceID is set) but otherwise will be ignored.
-  // mog: func-to=int func-from=int32
-  int32 LocalServicePort = 4;
-
-  // Config is the arbitrary configuration data provided with the proxy
-  // registration.
-  // mog: func-to=ProtobufTypesStructToMapStringInterface func-from=MapStringInterfaceToProtobufTypesStruct
-  google.protobuf.Struct Config = 5;
-
-  // Upstreams describes any upstream dependencies the proxy instance should
-  // setup.
-  // mog: func-to=UpstreamsToStructs func-from=NewUpstreamsFromStructs
-  repeated Upstream Upstreams = 6;
-
-  // MeshGateway defines the mesh gateway configuration for upstreams
-  MeshGatewayConfig MeshGateway = 7;
-
-  // Expose defines whether checks or paths are exposed through the proxy
-  ExposeConfig Expose = 8;
-
-  // Mode represents how the proxy's inbound and upstream listeners are dialed.
-  // mog: func-to=structs.ProxyMode func-from=string
-  string Mode = 9;
-
-  // TransparentProxy defines configuration for when the proxy is in
-  // transparent mode.
-  TransparentProxyConfig TransparentProxy = 10;
-
-  // LocalServiceSocketPath is the path to the unix domain socket for the local service instance
-  string LocalServiceSocketPath = 11;
-
-  // mog: func-to=EnvoyExtensionsToStructs func-from=EnvoyExtensionsFromStructs
-  repeated hashicorp.consul.internal.common.EnvoyExtension EnvoyExtensions = 12;
-
-  // AccessLogsConfig defines envoys access log configuration.
-  AccessLogsConfig AccessLogs = 13;
-}
-
-// Upstream represents a single upstream dependency for a service or proxy. It
-// describes the mechanism used to discover instances to communicate with (the
-// Target) as well as any potential client configuration that may be useful such
-// as load balancer options, timeouts etc.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.Upstream
-// output=service.gen.go
-// name=Structs
-// ignore-fields=IngressHosts
-message Upstream {
-  // Destination fields are the required ones for determining what this upstream
-  // points to. Depending on DestinationType some other fields below might
-  // further restrict the set of instances allowable.
-  //
-  // DestinationType would be better as an int constant but even with custom
-  // JSON marshallers it causes havoc with all the mapstructure mangling we do
-  // on service definitions in various places.
-  string DestinationType = 1;
-  string DestinationNamespace = 2;
-  string DestinationPartition = 12;
-  string DestinationPeer = 13;
-  string DestinationName = 3;
-
-  // Datacenter that the service discovery request should be run against. Note
-  // for prepared queries, the actual results might be from a different
-  // datacenter.
-  string Datacenter = 4;
-
-  // LocalBindAddress is the ip address a side-car proxy should listen on for
-  // traffic destined for this upstream service. Default if empty is 127.0.0.1.
-  string LocalBindAddress = 5;
-
-  // LocalBindPort is the ip address a side-car proxy should listen on for
-  // traffic destined for this upstream service. Required.
-  // mog: func-to=int func-from=int32
-  int32 LocalBindPort = 6;
-
-  // Config is an opaque config that is specific to the proxy process being run.
-  // It can be used to pass arbitrary configuration for this specific upstream
-  // to the proxy.
-  // mog: func-to=ProtobufTypesStructToMapStringInterface func-from=MapStringInterfaceToProtobufTypesStruct
-  google.protobuf.Struct Config = 7;
-
-  // MeshGateway is the configuration for mesh gateway usage of this upstream
-  MeshGatewayConfig MeshGateway = 8;
-
-  // CentrallyConfigured indicates whether the upstream was defined in a proxy
-  // instance registration or whether it was generated from a config entry.
-  bool CentrallyConfigured = 9;
-
-  // LocalBindSocketPath is the socket to create to connect to the upstream service
-  string LocalBindSocketPath = 10;
-  string LocalBindSocketMode = 11;
-}
-
-// ServiceConnect are the shared Connect settings between all service
-// definitions from the agent to the state store.
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceConnect
-// output=service.gen.go
-// name=Structs
-message ServiceConnect {
-  // Native is true when this service can natively understand Connect.
-  bool Native = 1;
-
-  reserved 2;
-
-  // SidecarService is a nested Service Definition to register at the same time.
-  // It's purely a convenience mechanism to allow specifying a sidecar service
-  // along with the application service definition. It's nested nature allows
-  // all of the fields to be defaulted which can reduce the amount of
-  // boilerplate needed to register a sidecar service separately, but the end
-  // result is identical to just making a second service registration via any
-  // other means.
-  // mog: func-to=ServiceDefinitionPtrToStructs func-from=NewServiceDefinitionPtrFromStructs
-  ServiceDefinition SidecarService = 3;
-
-  PeeringServiceMeta PeerMeta = 4;
-}
-
-// PeeringServiceMeta is read-only information provided from an exported peer.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.PeeringServiceMeta
-// output=service.gen.go
-// name=Structs
-message PeeringServiceMeta {
-  repeated string SNI = 1;
-  repeated string SpiffeID = 2;
-  string Protocol = 3;
-}
-
-// ExposeConfig describes HTTP paths to expose through Envoy outside of Connect.
-// Users can expose individual paths and/or all HTTP/GRPC paths for checks.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ExposeConfig
-// output=service.gen.go
-// name=Structs
-message ExposeConfig {
-  // Checks defines whether paths associated with Consul checks will be exposed.
-  // This flag triggers exposing all HTTP and GRPC check paths registered for the service.
-  bool Checks = 1;
-
-  // Paths is the list of paths exposed through the proxy.
-  // mog: func-to=ExposePathSliceToStructs func-from=NewExposePathSliceFromStructs
-  repeated ExposePath Paths = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ExposePath
-// output=service.gen.go
-// name=Structs
-message ExposePath {
-  // ListenerPort defines the port of the proxy's listener for exposed paths.
-  // mog: func-to=int func-from=int32
-  int32 ListenerPort = 1;
-
-  // ExposePath is the path to expose through the proxy, ie. "/metrics."
-  string Path = 2;
-
-  // LocalPathPort is the port that the service is listening on for the given path.
-  // mog: func-to=int func-from=int32
-  int32 LocalPathPort = 3;
-
-  // Protocol describes the upstream's service protocol.
-  // Valid values are "http" and "http2", defaults to "http"
-  string Protocol = 4;
-
-  // ParsedFromCheck is set if this path was parsed from a registered check
-  bool ParsedFromCheck = 5;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.MeshGatewayConfig
-// output=service.gen.go
-// name=Structs
-message MeshGatewayConfig {
-  // mog: func-to=structs.MeshGatewayMode func-from=string
-  string Mode = 1;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.TransparentProxyConfig
-// output=service.gen.go
-// name=Structs
-message TransparentProxyConfig {
-  // mog: func-to=int func-from=int32
-  int32 OutboundListenerPort = 1;
-
-  // DialedDirectly indicates whether transparent proxies can dial this proxy instance directly.
-  // The discovery chain is not considered when dialing a service instance directly.
-  // This setting is useful when addressing stateful services, such as a database cluster with a leader node.
-  bool DialedDirectly = 2;
-}
-
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.AccessLogsConfig
-// output=service.gen.go
-// name=Structs
-message AccessLogsConfig {
-  bool Enabled = 1;
-  bool DisableListenerLogs = 2;
-
-  // Type represents the desired envoy log sink (e.g. stdout, stderr, file ...).
-  // mog: func-to=structs.LogSinkType func-from=string
-  string Type = 3;
-
-  string Path = 4;
-  string JSONFormat = 5;
-  string TextFormat = 6;
-}
-
-// ServiceDefinition is used to JSON decode the Service definitions. For
-// documentation on specific fields see NodeService which is better documented.
-//
-// mog annotation:
-//
-// target=github.com/hashicorp/consul/agent/structs.ServiceDefinition
-// output=service.gen.go
-// name=Structs
-message ServiceDefinition {
-  // mog: func-to=structs.ServiceKind func-from=string
-  string Kind = 1;
-  string ID = 2;
-  string Name = 3;
-  repeated string Tags = 4;
-  string Address = 5;
-  // mog: func-to=MapStringServiceAddressToStructs func-from=NewMapStringServiceAddressFromStructs
-  map<string, ServiceAddress> TaggedAddresses = 16;
-  map<string, string> Meta = 6;
-  // mog: func-to=int func-from=int32
-  int32 Port = 7;
-  // Path for socket
-  string SocketPath = 18;
-  CheckType Check = 8;
-  // mog: func-to=CheckTypesToStructs func-from=NewCheckTypesFromStructs
-  repeated CheckType Checks = 9;
-  // mog: func-to=WeightsPtrToStructs func-from=NewWeightsPtrFromStructs
-  Weights Weights = 10;
-  string Token = 11;
-  bool EnableTagOverride = 12;
-
-  // Proxy is the configuration set for Kind = connect-proxy. It is mandatory in
-  // that case and an error to be set for any other kind. This config is part of
-  // a proxy service definition and is distinct from but shares some fields with
-  // the Connect.Proxy which configures a managed proxy as part of the actual
-  // service's definition. This duplication is ugly but seemed better than the
-  // alternative which was to re-use the same struct fields for both cases even
-  // though the semantics are different and the non-shared fields make no sense
-  // in the other case. ProxyConfig may be a more natural name here, but it's
-  // confusing for the UX because one of the fields in ConnectProxyConfig is
-  // also called just "Config"
-  // mog: func-to=ConnectProxyConfigPtrToStructs func-from=NewConnectProxyConfigPtrFromStructs
-  ConnectProxyConfig Proxy = 14;
-
-  // mog: func-to=EnterpriseMetaToStructs func-from=NewEnterpriseMetaFromStructs
-  common.EnterpriseMeta EnterpriseMeta = 17;
-
-  // mog: func-to=ServiceConnectPtrToStructs func-from=NewServiceConnectPtrFromStructs
-  ServiceConnect Connect = 15;
-
-  // Locality identifies where the service is running.
-  // mog: func-to=LocalityToStructs func-from=LocalityFromStructs
-  common.Locality Locality = 19;
-}
-
-// Type to hold an address and port of a service
-message ServiceAddress {
-  string Address = 1;
-  // mog: func-to=int func-from=int32
-  int32 Port = 2;
-}
-
-// Weights represent the weight used by DNS for a given status
-message Weights {
-  // mog: func-to=int func-from=int32
-  int32 Passing = 1;
-  // mog: func-to=int func-from=int32
-  int32 Warning = 2;
-}
diff --git a/proto/private/pbstatus/status.pb.go b/proto/private/pbstatus/status.pb.go
deleted file mode 100644
index ce1658b68cc0e..0000000000000
--- a/proto/private/pbstatus/status.pb.go
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbstatus/status.proto
-
-package pbstatus
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	anypb "google.golang.org/protobuf/types/known/anypb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// The `Status` type defines a logical error model that is suitable for
-// different programming environments, including REST APIs and RPC APIs. It is
-// used by [gRPC](https://github.com/grpc). Each `Status` message contains
-// three pieces of data: error code, error message, and error details.
-//
-// You can find out more about this error model and how to work with it in the
-// [API Design Guide](https://cloud.google.com/apis/design/errors).
-type Status struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code].
-	Code int32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
-	// A developer-facing error message, which should be in English. Any
-	// user-facing error message should be localized and sent in the
-	// [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client.
-	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
-	// A list of messages that carry the error details.  There is a common set of
-	// message types for APIs to use.
-	Details []*anypb.Any `protobuf:"bytes,3,rep,name=details,proto3" json:"details,omitempty"`
-}
-
-func (x *Status) Reset() {
-	*x = Status{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbstatus_status_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Status) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Status) ProtoMessage() {}
-
-func (x *Status) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbstatus_status_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Status.ProtoReflect.Descriptor instead.
-func (*Status) Descriptor() ([]byte, []int) {
-	return file_private_pbstatus_status_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Status) GetCode() int32 {
-	if x != nil {
-		return x.Code
-	}
-	return 0
-}
-
-func (x *Status) GetMessage() string {
-	if x != nil {
-		return x.Message
-	}
-	return ""
-}
-
-func (x *Status) GetDetails() []*anypb.Any {
-	if x != nil {
-		return x.Details
-	}
-	return nil
-}
-
-var File_private_pbstatus_status_proto protoreflect.FileDescriptor
-
-var file_private_pbstatus_status_proto_rawDesc = []byte{
-	0x0a, 0x1d, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x73, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x20, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x66, 0x0a, 0x06,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x12, 0x2e, 0x0a, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x07, 0x64, 0x65, 0x74,
-	0x61, 0x69, 0x6c, 0x73, 0x42, 0x8b, 0x02, 0x0a, 0x24, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x0b, 0x53,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
-	0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0xa2, 0x02, 0x04, 0x48, 0x43, 0x49, 0x53, 0xaa, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0xe2, 0x02, 0x2c,
-	0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x23, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x3a, 0x3a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x53, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pbstatus_status_proto_rawDescOnce sync.Once
-	file_private_pbstatus_status_proto_rawDescData = file_private_pbstatus_status_proto_rawDesc
-)
-
-func file_private_pbstatus_status_proto_rawDescGZIP() []byte {
-	file_private_pbstatus_status_proto_rawDescOnce.Do(func() {
-		file_private_pbstatus_status_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbstatus_status_proto_rawDescData)
-	})
-	return file_private_pbstatus_status_proto_rawDescData
-}
-
-var file_private_pbstatus_status_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_private_pbstatus_status_proto_goTypes = []interface{}{
-	(*Status)(nil),    // 0: hashicorp.consul.internal.status.Status
-	(*anypb.Any)(nil), // 1: google.protobuf.Any
-}
-var file_private_pbstatus_status_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.internal.status.Status.details:type_name -> google.protobuf.Any
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
-}
-
-func init() { file_private_pbstatus_status_proto_init() }
-func file_private_pbstatus_status_proto_init() {
-	if File_private_pbstatus_status_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbstatus_status_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Status); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbstatus_status_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_private_pbstatus_status_proto_goTypes,
-		DependencyIndexes: file_private_pbstatus_status_proto_depIdxs,
-		MessageInfos:      file_private_pbstatus_status_proto_msgTypes,
-	}.Build()
-	File_private_pbstatus_status_proto = out.File
-	file_private_pbstatus_status_proto_rawDesc = nil
-	file_private_pbstatus_status_proto_goTypes = nil
-	file_private_pbstatus_status_proto_depIdxs = nil
-}
diff --git a/proto/private/pbstorage/raft.pb.binary.go b/proto/private/pbstorage/raft.pb.binary.go
deleted file mode 100644
index 98e8e25228539..0000000000000
--- a/proto/private/pbstorage/raft.pb.binary.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: private/pbstorage/raft.proto
-
-package pbstorage
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Log) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Log) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *LogResponse) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *LogResponse) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *WriteRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *WriteRequest) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *WriteResponse) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *WriteResponse) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *DeleteRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *DeleteRequest) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ReadRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ReadRequest) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ReadResponse) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ReadResponse) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ListRequest) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ListRequest) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ListResponse) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ListResponse) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *GroupVersionMismatchErrorDetails) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *GroupVersionMismatchErrorDetails) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto/private/pbstorage/raft.pb.go b/proto/private/pbstorage/raft.pb.go
deleted file mode 100644
index 6efa5c8f8fb10..0000000000000
--- a/proto/private/pbstorage/raft.pb.go
+++ /dev/null
@@ -1,1035 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbstorage/raft.proto
-
-// This package contains types used by the Raft storage backend that lives in
-// the internal/storage/raft Go package.
-
-package pbstorage
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/annotations/ratelimit"
-	pbresource "github.com/hashicorp/consul/proto-public/pbresource"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	emptypb "google.golang.org/protobuf/types/known/emptypb"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// LogType describes the type of operation being written to the Raft log.
-type LogType int32
-
-const (
-	LogType_LOG_TYPE_UNSPECIFIED LogType = 0
-	LogType_LOG_TYPE_WRITE       LogType = 1
-	LogType_LOG_TYPE_DELETE      LogType = 2
-)
-
-// Enum value maps for LogType.
-var (
-	LogType_name = map[int32]string{
-		0: "LOG_TYPE_UNSPECIFIED",
-		1: "LOG_TYPE_WRITE",
-		2: "LOG_TYPE_DELETE",
-	}
-	LogType_value = map[string]int32{
-		"LOG_TYPE_UNSPECIFIED": 0,
-		"LOG_TYPE_WRITE":       1,
-		"LOG_TYPE_DELETE":      2,
-	}
-)
-
-func (x LogType) Enum() *LogType {
-	p := new(LogType)
-	*p = x
-	return p
-}
-
-func (x LogType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (LogType) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbstorage_raft_proto_enumTypes[0].Descriptor()
-}
-
-func (LogType) Type() protoreflect.EnumType {
-	return &file_private_pbstorage_raft_proto_enumTypes[0]
-}
-
-func (x LogType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use LogType.Descriptor instead.
-func (LogType) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbstorage_raft_proto_rawDescGZIP(), []int{0}
-}
-
-// Log is protobuf-encoded and written to the Raft log.
-type Log struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Type LogType `protobuf:"varint,1,opt,name=type,proto3,enum=hashicorp.consul.internal.storage.raft.LogType" json:"type,omitempty"`
-	// Types that are assignable to Request:
-	//
-	//	*Log_Write
-	//	*Log_Delete
-	Request isLog_Request `protobuf_oneof:"request"`
-}
-
-func (x *Log) Reset() {
-	*x = Log{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbstorage_raft_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Log) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Log) ProtoMessage() {}
-
-func (x *Log) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbstorage_raft_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Log.ProtoReflect.Descriptor instead.
-func (*Log) Descriptor() ([]byte, []int) {
-	return file_private_pbstorage_raft_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Log) GetType() LogType {
-	if x != nil {
-		return x.Type
-	}
-	return LogType_LOG_TYPE_UNSPECIFIED
-}
-
-func (m *Log) GetRequest() isLog_Request {
-	if m != nil {
-		return m.Request
-	}
-	return nil
-}
-
-func (x *Log) GetWrite() *WriteRequest {
-	if x, ok := x.GetRequest().(*Log_Write); ok {
-		return x.Write
-	}
-	return nil
-}
-
-func (x *Log) GetDelete() *DeleteRequest {
-	if x, ok := x.GetRequest().(*Log_Delete); ok {
-		return x.Delete
-	}
-	return nil
-}
-
-type isLog_Request interface {
-	isLog_Request()
-}
-
-type Log_Write struct {
-	Write *WriteRequest `protobuf:"bytes,2,opt,name=write,proto3,oneof"`
-}
-
-type Log_Delete struct {
-	Delete *DeleteRequest `protobuf:"bytes,3,opt,name=delete,proto3,oneof"`
-}
-
-func (*Log_Write) isLog_Request() {}
-
-func (*Log_Delete) isLog_Request() {}
-
-// LogResponse contains the FSM's response to applying a log.
-type LogResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to Response:
-	//
-	//	*LogResponse_Write
-	//	*LogResponse_Delete
-	Response isLogResponse_Response `protobuf_oneof:"response"`
-}
-
-func (x *LogResponse) Reset() {
-	*x = LogResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbstorage_raft_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LogResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LogResponse) ProtoMessage() {}
-
-func (x *LogResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbstorage_raft_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LogResponse.ProtoReflect.Descriptor instead.
-func (*LogResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbstorage_raft_proto_rawDescGZIP(), []int{1}
-}
-
-func (m *LogResponse) GetResponse() isLogResponse_Response {
-	if m != nil {
-		return m.Response
-	}
-	return nil
-}
-
-func (x *LogResponse) GetWrite() *WriteResponse {
-	if x, ok := x.GetResponse().(*LogResponse_Write); ok {
-		return x.Write
-	}
-	return nil
-}
-
-func (x *LogResponse) GetDelete() *emptypb.Empty {
-	if x, ok := x.GetResponse().(*LogResponse_Delete); ok {
-		return x.Delete
-	}
-	return nil
-}
-
-type isLogResponse_Response interface {
-	isLogResponse_Response()
-}
-
-type LogResponse_Write struct {
-	Write *WriteResponse `protobuf:"bytes,1,opt,name=write,proto3,oneof"`
-}
-
-type LogResponse_Delete struct {
-	Delete *emptypb.Empty `protobuf:"bytes,2,opt,name=delete,proto3,oneof"`
-}
-
-func (*LogResponse_Write) isLogResponse_Response() {}
-
-func (*LogResponse_Delete) isLogResponse_Response() {}
-
-// WriteRequest contains the parameters for a write operation.
-type WriteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Resource *pbresource.Resource `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
-}
-
-func (x *WriteRequest) Reset() {
-	*x = WriteRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbstorage_raft_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WriteRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WriteRequest) ProtoMessage() {}
-
-func (x *WriteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbstorage_raft_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WriteRequest.ProtoReflect.Descriptor instead.
-func (*WriteRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbstorage_raft_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *WriteRequest) GetResource() *pbresource.Resource {
-	if x != nil {
-		return x.Resource
-	}
-	return nil
-}
-
-// WriteResponse contains the results of a write operation.
-type WriteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Resource *pbresource.Resource `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
-}
-
-func (x *WriteResponse) Reset() {
-	*x = WriteResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbstorage_raft_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *WriteResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*WriteResponse) ProtoMessage() {}
-
-func (x *WriteResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbstorage_raft_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use WriteResponse.ProtoReflect.Descriptor instead.
-func (*WriteResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbstorage_raft_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *WriteResponse) GetResource() *pbresource.Resource {
-	if x != nil {
-		return x.Resource
-	}
-	return nil
-}
-
-// DeleteRequest contains the parameters for a write operation.
-type DeleteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id      *pbresource.ID `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Version string         `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
-}
-
-func (x *DeleteRequest) Reset() {
-	*x = DeleteRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbstorage_raft_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DeleteRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DeleteRequest) ProtoMessage() {}
-
-func (x *DeleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbstorage_raft_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DeleteRequest.ProtoReflect.Descriptor instead.
-func (*DeleteRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbstorage_raft_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *DeleteRequest) GetId() *pbresource.ID {
-	if x != nil {
-		return x.Id
-	}
-	return nil
-}
-
-func (x *DeleteRequest) GetVersion() string {
-	if x != nil {
-		return x.Version
-	}
-	return ""
-}
-
-// ReadRequest contains the parameters for a consistent read operation.
-type ReadRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Id *pbresource.ID `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-}
-
-func (x *ReadRequest) Reset() {
-	*x = ReadRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbstorage_raft_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ReadRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ReadRequest) ProtoMessage() {}
-
-func (x *ReadRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbstorage_raft_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ReadRequest.ProtoReflect.Descriptor instead.
-func (*ReadRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbstorage_raft_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *ReadRequest) GetId() *pbresource.ID {
-	if x != nil {
-		return x.Id
-	}
-	return nil
-}
-
-// ReadResponse contains the results of a consistent read operation.
-type ReadResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Resource *pbresource.Resource `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
-}
-
-func (x *ReadResponse) Reset() {
-	*x = ReadResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbstorage_raft_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ReadResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ReadResponse) ProtoMessage() {}
-
-func (x *ReadResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbstorage_raft_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ReadResponse.ProtoReflect.Descriptor instead.
-func (*ReadResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbstorage_raft_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *ReadResponse) GetResource() *pbresource.Resource {
-	if x != nil {
-		return x.Resource
-	}
-	return nil
-}
-
-// ListRequest contains the parameters for a consistent list operation.
-type ListRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Type       *pbresource.Type    `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
-	Tenancy    *pbresource.Tenancy `protobuf:"bytes,2,opt,name=tenancy,proto3" json:"tenancy,omitempty"`
-	NamePrefix string              `protobuf:"bytes,3,opt,name=name_prefix,json=namePrefix,proto3" json:"name_prefix,omitempty"`
-}
-
-func (x *ListRequest) Reset() {
-	*x = ListRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbstorage_raft_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListRequest) ProtoMessage() {}
-
-func (x *ListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbstorage_raft_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListRequest.ProtoReflect.Descriptor instead.
-func (*ListRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbstorage_raft_proto_rawDescGZIP(), []int{7}
-}
-
-func (x *ListRequest) GetType() *pbresource.Type {
-	if x != nil {
-		return x.Type
-	}
-	return nil
-}
-
-func (x *ListRequest) GetTenancy() *pbresource.Tenancy {
-	if x != nil {
-		return x.Tenancy
-	}
-	return nil
-}
-
-func (x *ListRequest) GetNamePrefix() string {
-	if x != nil {
-		return x.NamePrefix
-	}
-	return ""
-}
-
-// ListResponse contains the results of a consistent list operation.
-type ListResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Resources []*pbresource.Resource `protobuf:"bytes,1,rep,name=resources,proto3" json:"resources,omitempty"`
-}
-
-func (x *ListResponse) Reset() {
-	*x = ListResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbstorage_raft_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ListResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ListResponse) ProtoMessage() {}
-
-func (x *ListResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbstorage_raft_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ListResponse.ProtoReflect.Descriptor instead.
-func (*ListResponse) Descriptor() ([]byte, []int) {
-	return file_private_pbstorage_raft_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *ListResponse) GetResources() []*pbresource.Resource {
-	if x != nil {
-		return x.Resources
-	}
-	return nil
-}
-
-// GroupVersionMismatchErrorDetails contains the error details that will be
-// returned when the leader encounters a storage.GroupVersionMismatchError.
-type GroupVersionMismatchErrorDetails struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	RequestedType *pbresource.Type     `protobuf:"bytes,1,opt,name=requested_type,json=requestedType,proto3" json:"requested_type,omitempty"`
-	Stored        *pbresource.Resource `protobuf:"bytes,2,opt,name=stored,proto3" json:"stored,omitempty"`
-}
-
-func (x *GroupVersionMismatchErrorDetails) Reset() {
-	*x = GroupVersionMismatchErrorDetails{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbstorage_raft_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GroupVersionMismatchErrorDetails) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GroupVersionMismatchErrorDetails) ProtoMessage() {}
-
-func (x *GroupVersionMismatchErrorDetails) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbstorage_raft_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GroupVersionMismatchErrorDetails.ProtoReflect.Descriptor instead.
-func (*GroupVersionMismatchErrorDetails) Descriptor() ([]byte, []int) {
-	return file_private_pbstorage_raft_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *GroupVersionMismatchErrorDetails) GetRequestedType() *pbresource.Type {
-	if x != nil {
-		return x.RequestedType
-	}
-	return nil
-}
-
-func (x *GroupVersionMismatchErrorDetails) GetStored() *pbresource.Resource {
-	if x != nil {
-		return x.Stored
-	}
-	return nil
-}
-
-var File_private_pbstorage_raft_proto protoreflect.FileDescriptor
-
-var file_private_pbstorage_raft_proto_rawDesc = []byte{
-	0x0a, 0x1c, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x73, 0x74, 0x6f, 0x72,
-	0x61, 0x67, 0x65, 0x2f, 0x72, 0x61, 0x66, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x26,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67,
-	0x65, 0x2e, 0x72, 0x61, 0x66, 0x74, 0x1a, 0x25, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61,
-	0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65,
-	0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x70, 0x62, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf4, 0x01, 0x0a, 0x03, 0x4c, 0x6f, 0x67, 0x12, 0x43, 0x0a,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2f, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e,
-	0x72, 0x61, 0x66, 0x74, 0x2e, 0x4c, 0x6f, 0x67, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79,
-	0x70, 0x65, 0x12, 0x4c, 0x0a, 0x05, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x74,
-	0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x72, 0x61, 0x66, 0x74, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x05, 0x77, 0x72, 0x69, 0x74, 0x65,
-	0x12, 0x4f, 0x0a, 0x06, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x74, 0x6f,
-	0x72, 0x61, 0x67, 0x65, 0x2e, 0x72, 0x61, 0x66, 0x74, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x06, 0x64, 0x65, 0x6c, 0x65, 0x74,
-	0x65, 0x42, 0x09, 0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x9a, 0x01, 0x0a,
-	0x0b, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4d, 0x0a, 0x05,
-	0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e,
-	0x72, 0x61, 0x66, 0x74, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x48, 0x00, 0x52, 0x05, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x64,
-	0x65, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d,
-	0x70, 0x74, 0x79, 0x48, 0x00, 0x52, 0x06, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x42, 0x0a, 0x0a,
-	0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x4f, 0x0a, 0x0c, 0x57, 0x72, 0x69,
-	0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x0d, 0x57, 0x72,
-	0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x08, 0x72,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x58, 0x0a, 0x0d,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2d, 0x0a,
-	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07,
-	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x3c, 0x0a, 0x0b, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2d, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x49, 0x44,
-	0x52, 0x02, 0x69, 0x64, 0x22, 0x4f, 0x0a, 0x0c, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0xa1, 0x01, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e,
-	0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x3c, 0x0a, 0x07, 0x74, 0x65,
-	0x6e, 0x61, 0x6e, 0x63, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x52,
-	0x07, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x6e, 0x61, 0x6d, 0x65,
-	0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6e,
-	0x61, 0x6d, 0x65, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x22, 0x51, 0x0a, 0x0c, 0x4c, 0x69, 0x73,
-	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x41, 0x0a, 0x09, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0xa7, 0x01, 0x0a,
-	0x20, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x4d, 0x69, 0x73,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c,
-	0x73, 0x12, 0x46, 0x0a, 0x0e, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x74,
-	0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0d, 0x72, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x65, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x3b, 0x0a, 0x06, 0x73, 0x74, 0x6f,
-	0x72, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x06,
-	0x73, 0x74, 0x6f, 0x72, 0x65, 0x64, 0x2a, 0x4c, 0x0a, 0x07, 0x4c, 0x6f, 0x67, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x18, 0x0a, 0x14, 0x4c, 0x4f, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e,
-	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x4c,
-	0x4f, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x10, 0x01, 0x12,
-	0x13, 0x0a, 0x0f, 0x4c, 0x4f, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x45, 0x4c, 0x45,
-	0x54, 0x45, 0x10, 0x02, 0x32, 0xf0, 0x03, 0x0a, 0x11, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64,
-	0x69, 0x6e, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7e, 0x0a, 0x05, 0x57, 0x72,
-	0x69, 0x74, 0x65, 0x12, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e,
-	0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x72, 0x61, 0x66, 0x74, 0x2e, 0x57, 0x72, 0x69,
-	0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x72, 0x61,
-	0x66, 0x74, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x01, 0x10, 0x0b, 0x12, 0x61, 0x0a, 0x06, 0x44, 0x65,
-	0x6c, 0x65, 0x74, 0x65, 0x12, 0x35, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x72, 0x61, 0x66, 0x74, 0x2e, 0x44, 0x65,
-	0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d,
-	0x70, 0x74, 0x79, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x01, 0x10, 0x0b, 0x12, 0x7b, 0x0a,
-	0x04, 0x52, 0x65, 0x61, 0x64, 0x12, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x72, 0x61, 0x66, 0x74, 0x2e, 0x52,
-	0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x68, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x72,
-	0x61, 0x66, 0x74, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x01, 0x10, 0x0b, 0x12, 0x7b, 0x0a, 0x04, 0x4c, 0x69,
-	0x73, 0x74, 0x12, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73,
-	0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x72, 0x61, 0x66, 0x74, 0x2e, 0x4c, 0x69, 0x73, 0x74,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72,
-	0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x72, 0x61, 0x66, 0x74,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xe2,
-	0x86, 0x04, 0x04, 0x08, 0x01, 0x10, 0x0b, 0x42, 0xaa, 0x02, 0x0a, 0x2a, 0x63, 0x6f, 0x6d, 0x2e,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67,
-	0x65, 0x2e, 0x72, 0x61, 0x66, 0x74, 0x42, 0x09, 0x52, 0x61, 0x66, 0x74, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70,
-	0x62, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0xa2, 0x02, 0x05, 0x48, 0x43, 0x49, 0x53, 0x52,
-	0xaa, 0x02, 0x26, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x53, 0x74, 0x6f,
-	0x72, 0x61, 0x67, 0x65, 0x2e, 0x52, 0x61, 0x66, 0x74, 0xca, 0x02, 0x26, 0x48, 0x61, 0x73, 0x68,
-	0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5c, 0x52, 0x61,
-	0x66, 0x74, 0xe2, 0x02, 0x32, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5c, 0x53,
-	0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5c, 0x52, 0x61, 0x66, 0x74, 0x5c, 0x47, 0x50, 0x42, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x2a, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63,
-	0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x49, 0x6e, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x3a, 0x3a, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x3a, 0x3a,
-	0x52, 0x61, 0x66, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pbstorage_raft_proto_rawDescOnce sync.Once
-	file_private_pbstorage_raft_proto_rawDescData = file_private_pbstorage_raft_proto_rawDesc
-)
-
-func file_private_pbstorage_raft_proto_rawDescGZIP() []byte {
-	file_private_pbstorage_raft_proto_rawDescOnce.Do(func() {
-		file_private_pbstorage_raft_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbstorage_raft_proto_rawDescData)
-	})
-	return file_private_pbstorage_raft_proto_rawDescData
-}
-
-var file_private_pbstorage_raft_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_private_pbstorage_raft_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
-var file_private_pbstorage_raft_proto_goTypes = []interface{}{
-	(LogType)(0),                             // 0: hashicorp.consul.internal.storage.raft.LogType
-	(*Log)(nil),                              // 1: hashicorp.consul.internal.storage.raft.Log
-	(*LogResponse)(nil),                      // 2: hashicorp.consul.internal.storage.raft.LogResponse
-	(*WriteRequest)(nil),                     // 3: hashicorp.consul.internal.storage.raft.WriteRequest
-	(*WriteResponse)(nil),                    // 4: hashicorp.consul.internal.storage.raft.WriteResponse
-	(*DeleteRequest)(nil),                    // 5: hashicorp.consul.internal.storage.raft.DeleteRequest
-	(*ReadRequest)(nil),                      // 6: hashicorp.consul.internal.storage.raft.ReadRequest
-	(*ReadResponse)(nil),                     // 7: hashicorp.consul.internal.storage.raft.ReadResponse
-	(*ListRequest)(nil),                      // 8: hashicorp.consul.internal.storage.raft.ListRequest
-	(*ListResponse)(nil),                     // 9: hashicorp.consul.internal.storage.raft.ListResponse
-	(*GroupVersionMismatchErrorDetails)(nil), // 10: hashicorp.consul.internal.storage.raft.GroupVersionMismatchErrorDetails
-	(*emptypb.Empty)(nil),                    // 11: google.protobuf.Empty
-	(*pbresource.Resource)(nil),              // 12: hashicorp.consul.resource.Resource
-	(*pbresource.ID)(nil),                    // 13: hashicorp.consul.resource.ID
-	(*pbresource.Type)(nil),                  // 14: hashicorp.consul.resource.Type
-	(*pbresource.Tenancy)(nil),               // 15: hashicorp.consul.resource.Tenancy
-}
-var file_private_pbstorage_raft_proto_depIdxs = []int32{
-	0,  // 0: hashicorp.consul.internal.storage.raft.Log.type:type_name -> hashicorp.consul.internal.storage.raft.LogType
-	3,  // 1: hashicorp.consul.internal.storage.raft.Log.write:type_name -> hashicorp.consul.internal.storage.raft.WriteRequest
-	5,  // 2: hashicorp.consul.internal.storage.raft.Log.delete:type_name -> hashicorp.consul.internal.storage.raft.DeleteRequest
-	4,  // 3: hashicorp.consul.internal.storage.raft.LogResponse.write:type_name -> hashicorp.consul.internal.storage.raft.WriteResponse
-	11, // 4: hashicorp.consul.internal.storage.raft.LogResponse.delete:type_name -> google.protobuf.Empty
-	12, // 5: hashicorp.consul.internal.storage.raft.WriteRequest.resource:type_name -> hashicorp.consul.resource.Resource
-	12, // 6: hashicorp.consul.internal.storage.raft.WriteResponse.resource:type_name -> hashicorp.consul.resource.Resource
-	13, // 7: hashicorp.consul.internal.storage.raft.DeleteRequest.id:type_name -> hashicorp.consul.resource.ID
-	13, // 8: hashicorp.consul.internal.storage.raft.ReadRequest.id:type_name -> hashicorp.consul.resource.ID
-	12, // 9: hashicorp.consul.internal.storage.raft.ReadResponse.resource:type_name -> hashicorp.consul.resource.Resource
-	14, // 10: hashicorp.consul.internal.storage.raft.ListRequest.type:type_name -> hashicorp.consul.resource.Type
-	15, // 11: hashicorp.consul.internal.storage.raft.ListRequest.tenancy:type_name -> hashicorp.consul.resource.Tenancy
-	12, // 12: hashicorp.consul.internal.storage.raft.ListResponse.resources:type_name -> hashicorp.consul.resource.Resource
-	14, // 13: hashicorp.consul.internal.storage.raft.GroupVersionMismatchErrorDetails.requested_type:type_name -> hashicorp.consul.resource.Type
-	12, // 14: hashicorp.consul.internal.storage.raft.GroupVersionMismatchErrorDetails.stored:type_name -> hashicorp.consul.resource.Resource
-	3,  // 15: hashicorp.consul.internal.storage.raft.ForwardingService.Write:input_type -> hashicorp.consul.internal.storage.raft.WriteRequest
-	5,  // 16: hashicorp.consul.internal.storage.raft.ForwardingService.Delete:input_type -> hashicorp.consul.internal.storage.raft.DeleteRequest
-	6,  // 17: hashicorp.consul.internal.storage.raft.ForwardingService.Read:input_type -> hashicorp.consul.internal.storage.raft.ReadRequest
-	8,  // 18: hashicorp.consul.internal.storage.raft.ForwardingService.List:input_type -> hashicorp.consul.internal.storage.raft.ListRequest
-	4,  // 19: hashicorp.consul.internal.storage.raft.ForwardingService.Write:output_type -> hashicorp.consul.internal.storage.raft.WriteResponse
-	11, // 20: hashicorp.consul.internal.storage.raft.ForwardingService.Delete:output_type -> google.protobuf.Empty
-	7,  // 21: hashicorp.consul.internal.storage.raft.ForwardingService.Read:output_type -> hashicorp.consul.internal.storage.raft.ReadResponse
-	9,  // 22: hashicorp.consul.internal.storage.raft.ForwardingService.List:output_type -> hashicorp.consul.internal.storage.raft.ListResponse
-	19, // [19:23] is the sub-list for method output_type
-	15, // [15:19] is the sub-list for method input_type
-	15, // [15:15] is the sub-list for extension type_name
-	15, // [15:15] is the sub-list for extension extendee
-	0,  // [0:15] is the sub-list for field type_name
-}
-
-func init() { file_private_pbstorage_raft_proto_init() }
-func file_private_pbstorage_raft_proto_init() {
-	if File_private_pbstorage_raft_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbstorage_raft_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Log); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbstorage_raft_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LogResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbstorage_raft_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WriteRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbstorage_raft_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WriteResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbstorage_raft_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DeleteRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbstorage_raft_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReadRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbstorage_raft_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ReadResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbstorage_raft_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbstorage_raft_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ListResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbstorage_raft_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GroupVersionMismatchErrorDetails); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_private_pbstorage_raft_proto_msgTypes[0].OneofWrappers = []interface{}{
-		(*Log_Write)(nil),
-		(*Log_Delete)(nil),
-	}
-	file_private_pbstorage_raft_proto_msgTypes[1].OneofWrappers = []interface{}{
-		(*LogResponse_Write)(nil),
-		(*LogResponse_Delete)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbstorage_raft_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   10,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_private_pbstorage_raft_proto_goTypes,
-		DependencyIndexes: file_private_pbstorage_raft_proto_depIdxs,
-		EnumInfos:         file_private_pbstorage_raft_proto_enumTypes,
-		MessageInfos:      file_private_pbstorage_raft_proto_msgTypes,
-	}.Build()
-	File_private_pbstorage_raft_proto = out.File
-	file_private_pbstorage_raft_proto_rawDesc = nil
-	file_private_pbstorage_raft_proto_goTypes = nil
-	file_private_pbstorage_raft_proto_depIdxs = nil
-}
diff --git a/proto/private/pbstorage/raft.proto b/proto/private/pbstorage/raft.proto
deleted file mode 100644
index ed7954a8690e5..0000000000000
--- a/proto/private/pbstorage/raft.proto
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-// This package contains types used by the Raft storage backend that lives in
-// the internal/storage/raft Go package.
-package hashicorp.consul.internal.storage.raft;
-
-import "annotations/ratelimit/ratelimit.proto";
-import "google/protobuf/empty.proto";
-import "pbresource/resource.proto";
-
-// Forwarding service is used for forwarding write and consistent read
-// operations to the Raft leader. It is served on Consul's multiplexed
-// server port, which is the same port used for regular Raft traffic.
-service ForwardingService {
-  // Write handles a forwarded write operation.
-  rpc Write(WriteRequest) returns (WriteResponse) {
-    option (hashicorp.consul.internal.ratelimit.spec) = {
-      operation_type: OPERATION_TYPE_EXEMPT,
-      operation_category: OPERATION_CATEGORY_RESOURCE
-    };
-  }
-
-  // Delete handles a forwarded delete operation.
-  rpc Delete(DeleteRequest) returns (google.protobuf.Empty) {
-    option (hashicorp.consul.internal.ratelimit.spec) = {
-      operation_type: OPERATION_TYPE_EXEMPT,
-      operation_category: OPERATION_CATEGORY_RESOURCE
-    };
-  }
-
-  // Read handles a forwarded read operation.
-  rpc Read(ReadRequest) returns (ReadResponse) {
-    option (hashicorp.consul.internal.ratelimit.spec) = {
-      operation_type: OPERATION_TYPE_EXEMPT,
-      operation_category: OPERATION_CATEGORY_RESOURCE
-    };
-  }
-
-  // List handles a forwarded list operation.
-  rpc List(ListRequest) returns (ListResponse) {
-    option (hashicorp.consul.internal.ratelimit.spec) = {
-      operation_type: OPERATION_TYPE_EXEMPT,
-      operation_category: OPERATION_CATEGORY_RESOURCE
-    };
-  }
-}
-
-// LogType describes the type of operation being written to the Raft log.
-enum LogType {
-  LOG_TYPE_UNSPECIFIED = 0;
-  LOG_TYPE_WRITE = 1;
-  LOG_TYPE_DELETE = 2;
-}
-
-// Log is protobuf-encoded and written to the Raft log.
-message Log {
-  LogType type = 1;
-
-  oneof request {
-    WriteRequest write = 2;
-    DeleteRequest delete = 3;
-  }
-}
-
-// LogResponse contains the FSM's response to applying a log.
-message LogResponse {
-  oneof response {
-    WriteResponse write = 1;
-    google.protobuf.Empty delete = 2;
-  }
-}
-
-// WriteRequest contains the parameters for a write operation.
-message WriteRequest {
-  hashicorp.consul.resource.Resource resource = 1;
-}
-
-// WriteResponse contains the results of a write operation.
-message WriteResponse {
-  hashicorp.consul.resource.Resource resource = 1;
-}
-
-// DeleteRequest contains the parameters for a write operation.
-message DeleteRequest {
-  hashicorp.consul.resource.ID id = 1;
-  string version = 2;
-}
-
-// ReadRequest contains the parameters for a consistent read operation.
-message ReadRequest {
-  hashicorp.consul.resource.ID id = 1;
-}
-
-// ReadResponse contains the results of a consistent read operation.
-message ReadResponse {
-  hashicorp.consul.resource.Resource resource = 1;
-}
-
-// ListRequest contains the parameters for a consistent list operation.
-message ListRequest {
-  hashicorp.consul.resource.Type type = 1;
-  hashicorp.consul.resource.Tenancy tenancy = 2;
-  string name_prefix = 3;
-}
-
-// ListResponse contains the results of a consistent list operation.
-message ListResponse {
-  repeated hashicorp.consul.resource.Resource resources = 1;
-}
-
-// GroupVersionMismatchErrorDetails contains the error details that will be
-// returned when the leader encounters a storage.GroupVersionMismatchError.
-message GroupVersionMismatchErrorDetails {
-  hashicorp.consul.resource.Type requested_type = 1;
-  hashicorp.consul.resource.Resource stored = 2;
-}
diff --git a/proto/private/pbstorage/raft_grpc.pb.go b/proto/private/pbstorage/raft_grpc.pb.go
deleted file mode 100644
index 28641af82ca78..0000000000000
--- a/proto/private/pbstorage/raft_grpc.pb.go
+++ /dev/null
@@ -1,220 +0,0 @@
-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-grpc v1.2.0
-// - protoc             (unknown)
-// source: private/pbstorage/raft.proto
-
-package pbstorage
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-	emptypb "google.golang.org/protobuf/types/known/emptypb"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
-
-// ForwardingServiceClient is the client API for ForwardingService service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type ForwardingServiceClient interface {
-	// Write handles a forwarded write operation.
-	Write(ctx context.Context, in *WriteRequest, opts ...grpc.CallOption) (*WriteResponse, error)
-	// Delete handles a forwarded delete operation.
-	Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
-	// Read handles a forwarded read operation.
-	Read(ctx context.Context, in *ReadRequest, opts ...grpc.CallOption) (*ReadResponse, error)
-	// List handles a forwarded list operation.
-	List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error)
-}
-
-type forwardingServiceClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewForwardingServiceClient(cc grpc.ClientConnInterface) ForwardingServiceClient {
-	return &forwardingServiceClient{cc}
-}
-
-func (c *forwardingServiceClient) Write(ctx context.Context, in *WriteRequest, opts ...grpc.CallOption) (*WriteResponse, error) {
-	out := new(WriteResponse)
-	err := c.cc.Invoke(ctx, "/hashicorp.consul.internal.storage.raft.ForwardingService/Write", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *forwardingServiceClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
-	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, "/hashicorp.consul.internal.storage.raft.ForwardingService/Delete", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *forwardingServiceClient) Read(ctx context.Context, in *ReadRequest, opts ...grpc.CallOption) (*ReadResponse, error) {
-	out := new(ReadResponse)
-	err := c.cc.Invoke(ctx, "/hashicorp.consul.internal.storage.raft.ForwardingService/Read", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *forwardingServiceClient) List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) {
-	out := new(ListResponse)
-	err := c.cc.Invoke(ctx, "/hashicorp.consul.internal.storage.raft.ForwardingService/List", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// ForwardingServiceServer is the server API for ForwardingService service.
-// All implementations should embed UnimplementedForwardingServiceServer
-// for forward compatibility
-type ForwardingServiceServer interface {
-	// Write handles a forwarded write operation.
-	Write(context.Context, *WriteRequest) (*WriteResponse, error)
-	// Delete handles a forwarded delete operation.
-	Delete(context.Context, *DeleteRequest) (*emptypb.Empty, error)
-	// Read handles a forwarded read operation.
-	Read(context.Context, *ReadRequest) (*ReadResponse, error)
-	// List handles a forwarded list operation.
-	List(context.Context, *ListRequest) (*ListResponse, error)
-}
-
-// UnimplementedForwardingServiceServer should be embedded to have forward compatible implementations.
-type UnimplementedForwardingServiceServer struct {
-}
-
-func (UnimplementedForwardingServiceServer) Write(context.Context, *WriteRequest) (*WriteResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Write not implemented")
-}
-func (UnimplementedForwardingServiceServer) Delete(context.Context, *DeleteRequest) (*emptypb.Empty, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented")
-}
-func (UnimplementedForwardingServiceServer) Read(context.Context, *ReadRequest) (*ReadResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Read not implemented")
-}
-func (UnimplementedForwardingServiceServer) List(context.Context, *ListRequest) (*ListResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method List not implemented")
-}
-
-// UnsafeForwardingServiceServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to ForwardingServiceServer will
-// result in compilation errors.
-type UnsafeForwardingServiceServer interface {
-	mustEmbedUnimplementedForwardingServiceServer()
-}
-
-func RegisterForwardingServiceServer(s grpc.ServiceRegistrar, srv ForwardingServiceServer) {
-	s.RegisterService(&ForwardingService_ServiceDesc, srv)
-}
-
-func _ForwardingService_Write_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(WriteRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ForwardingServiceServer).Write(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/hashicorp.consul.internal.storage.raft.ForwardingService/Write",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ForwardingServiceServer).Write(ctx, req.(*WriteRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ForwardingService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(DeleteRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ForwardingServiceServer).Delete(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/hashicorp.consul.internal.storage.raft.ForwardingService/Delete",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ForwardingServiceServer).Delete(ctx, req.(*DeleteRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ForwardingService_Read_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ReadRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ForwardingServiceServer).Read(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/hashicorp.consul.internal.storage.raft.ForwardingService/Read",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ForwardingServiceServer).Read(ctx, req.(*ReadRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _ForwardingService_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ListRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(ForwardingServiceServer).List(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/hashicorp.consul.internal.storage.raft.ForwardingService/List",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ForwardingServiceServer).List(ctx, req.(*ListRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// ForwardingService_ServiceDesc is the grpc.ServiceDesc for ForwardingService service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var ForwardingService_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "hashicorp.consul.internal.storage.raft.ForwardingService",
-	HandlerType: (*ForwardingServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Write",
-			Handler:    _ForwardingService_Write_Handler,
-		},
-		{
-			MethodName: "Delete",
-			Handler:    _ForwardingService_Delete_Handler,
-		},
-		{
-			MethodName: "Read",
-			Handler:    _ForwardingService_Read_Handler,
-		},
-		{
-			MethodName: "List",
-			Handler:    _ForwardingService_List_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "private/pbstorage/raft.proto",
-}
diff --git a/proto/private/pbsubscribe/subscribe.pb.go b/proto/private/pbsubscribe/subscribe.pb.go
deleted file mode 100644
index 93dcf9c21c230..0000000000000
--- a/proto/private/pbsubscribe/subscribe.pb.go
+++ /dev/null
@@ -1,1220 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//
-//Package event provides a service for subscribing to state change events.
-
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        (unknown)
-// source: private/pbsubscribe/subscribe.proto
-
-// TODO: ideally we would have prefixed this package as
-// "hashicorp.consul.internal.subscribe" before releasing but now correcting this will
-// require a grpc passthrough service shim since the package name is part of
-// the rpc method dispatch and editing it naively would break backwards
-// compatibility.
-
-package pbsubscribe
-
-import (
-	_ "github.com/hashicorp/consul/proto-public/annotations/ratelimit"
-	pbcommon "github.com/hashicorp/consul/proto/private/pbcommon"
-	pbconfigentry "github.com/hashicorp/consul/proto/private/pbconfigentry"
-	pbservice "github.com/hashicorp/consul/proto/private/pbservice"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// Topic enumerates the supported event topics.
-type Topic int32
-
-const (
-	Topic_Unknown Topic = 0
-	// ServiceHealth topic contains events for any changes to service health.
-	Topic_ServiceHealth Topic = 1
-	// ServiceHealthConnect topic contains events for any changes to service
-	// health for connect-enabled services.
-	Topic_ServiceHealthConnect Topic = 2
-	// MeshConfig topic contains events for changes to the global mesh config.
-	Topic_MeshConfig Topic = 3
-	// ServiceResolver topic contains events for changes to a service resolver.
-	Topic_ServiceResolver Topic = 4
-	// IngressGateway topic contains events for changes to an ingress gateway.
-	Topic_IngressGateway Topic = 5
-	// ServiceIntentions topic contains events for changes to service intentions.
-	Topic_ServiceIntentions Topic = 6
-	// ServiceList topic contains events about services (not service instances)
-	// getting registered/deregistered. It can be used to materialize a list of
-	// the services in the given datacenter.
-	//
-	// Note: WildcardSubject is the only supported Subject on this topic.
-	Topic_ServiceList Topic = 7
-	// ServiceDefaults topic contains events for changes to service-defaults.
-	Topic_ServiceDefaults Topic = 8
-	// APIGateway topic contains events for changes to api-gateways.
-	Topic_APIGateway Topic = 9
-	// TCPRoute topic contains events for changes to tcp-routes.
-	Topic_TCPRoute Topic = 10
-	// HTTPRoute topic contains events for changes to http-routes.
-	Topic_HTTPRoute Topic = 11
-	// InlineCertificate topic contains events for changes to inline-certificates.
-	Topic_InlineCertificate Topic = 12
-	// BoundAPIGateway topic contains events for changes to bound-api-gateways.
-	Topic_BoundAPIGateway Topic = 13
-	// IPRateLimit topic contains events for changes to control-plane-request-limit
-	Topic_IPRateLimit Topic = 14
-	// SamenessGroup topic contains events for changes to Sameness Groups
-	Topic_SamenessGroup Topic = 15
-	// JWTProvider topic contains events for changes to jwt-provider
-	Topic_JWTProvider Topic = 16
-)
-
-// Enum value maps for Topic.
-var (
-	Topic_name = map[int32]string{
-		0:  "Unknown",
-		1:  "ServiceHealth",
-		2:  "ServiceHealthConnect",
-		3:  "MeshConfig",
-		4:  "ServiceResolver",
-		5:  "IngressGateway",
-		6:  "ServiceIntentions",
-		7:  "ServiceList",
-		8:  "ServiceDefaults",
-		9:  "APIGateway",
-		10: "TCPRoute",
-		11: "HTTPRoute",
-		12: "InlineCertificate",
-		13: "BoundAPIGateway",
-		14: "IPRateLimit",
-		15: "SamenessGroup",
-		16: "JWTProvider",
-	}
-	Topic_value = map[string]int32{
-		"Unknown":              0,
-		"ServiceHealth":        1,
-		"ServiceHealthConnect": 2,
-		"MeshConfig":           3,
-		"ServiceResolver":      4,
-		"IngressGateway":       5,
-		"ServiceIntentions":    6,
-		"ServiceList":          7,
-		"ServiceDefaults":      8,
-		"APIGateway":           9,
-		"TCPRoute":             10,
-		"HTTPRoute":            11,
-		"InlineCertificate":    12,
-		"BoundAPIGateway":      13,
-		"IPRateLimit":          14,
-		"SamenessGroup":        15,
-		"JWTProvider":          16,
-	}
-)
-
-func (x Topic) Enum() *Topic {
-	p := new(Topic)
-	*p = x
-	return p
-}
-
-func (x Topic) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Topic) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbsubscribe_subscribe_proto_enumTypes[0].Descriptor()
-}
-
-func (Topic) Type() protoreflect.EnumType {
-	return &file_private_pbsubscribe_subscribe_proto_enumTypes[0]
-}
-
-func (x Topic) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Topic.Descriptor instead.
-func (Topic) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{0}
-}
-
-type CatalogOp int32
-
-const (
-	CatalogOp_Register   CatalogOp = 0
-	CatalogOp_Deregister CatalogOp = 1
-)
-
-// Enum value maps for CatalogOp.
-var (
-	CatalogOp_name = map[int32]string{
-		0: "Register",
-		1: "Deregister",
-	}
-	CatalogOp_value = map[string]int32{
-		"Register":   0,
-		"Deregister": 1,
-	}
-)
-
-func (x CatalogOp) Enum() *CatalogOp {
-	p := new(CatalogOp)
-	*p = x
-	return p
-}
-
-func (x CatalogOp) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (CatalogOp) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbsubscribe_subscribe_proto_enumTypes[1].Descriptor()
-}
-
-func (CatalogOp) Type() protoreflect.EnumType {
-	return &file_private_pbsubscribe_subscribe_proto_enumTypes[1]
-}
-
-func (x CatalogOp) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use CatalogOp.Descriptor instead.
-func (CatalogOp) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{1}
-}
-
-type ConfigEntryUpdate_UpdateOp int32
-
-const (
-	ConfigEntryUpdate_Upsert ConfigEntryUpdate_UpdateOp = 0
-	ConfigEntryUpdate_Delete ConfigEntryUpdate_UpdateOp = 1
-)
-
-// Enum value maps for ConfigEntryUpdate_UpdateOp.
-var (
-	ConfigEntryUpdate_UpdateOp_name = map[int32]string{
-		0: "Upsert",
-		1: "Delete",
-	}
-	ConfigEntryUpdate_UpdateOp_value = map[string]int32{
-		"Upsert": 0,
-		"Delete": 1,
-	}
-)
-
-func (x ConfigEntryUpdate_UpdateOp) Enum() *ConfigEntryUpdate_UpdateOp {
-	p := new(ConfigEntryUpdate_UpdateOp)
-	*p = x
-	return p
-}
-
-func (x ConfigEntryUpdate_UpdateOp) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (ConfigEntryUpdate_UpdateOp) Descriptor() protoreflect.EnumDescriptor {
-	return file_private_pbsubscribe_subscribe_proto_enumTypes[2].Descriptor()
-}
-
-func (ConfigEntryUpdate_UpdateOp) Type() protoreflect.EnumType {
-	return &file_private_pbsubscribe_subscribe_proto_enumTypes[2]
-}
-
-func (x ConfigEntryUpdate_UpdateOp) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use ConfigEntryUpdate_UpdateOp.Descriptor instead.
-func (ConfigEntryUpdate_UpdateOp) EnumDescriptor() ([]byte, []int) {
-	return file_private_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{5, 0}
-}
-
-type NamedSubject struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Key is a topic-specific identifier that restricts the scope of the
-	// subscription to only events pertaining to that identifier. For example,
-	// to receive events for a single service, the service's name is specified
-	// as the key.
-	Key string `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key,omitempty"`
-	// Namespace which contains the resources. If Namespace is not specified the
-	// default namespace will be used.
-	//
-	// Namespace is an enterprise-only feature.
-	Namespace string `protobuf:"bytes,2,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
-	// Partition which contains the resources. If Partition is not specified the
-	// default partition will be used.
-	//
-	// Partition is an enterprise-only feature.
-	Partition string `protobuf:"bytes,3,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	// PeerName is the name of the peer that the requested service was imported from.
-	PeerName string `protobuf:"bytes,4,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
-}
-
-func (x *NamedSubject) Reset() {
-	*x = NamedSubject{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbsubscribe_subscribe_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *NamedSubject) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*NamedSubject) ProtoMessage() {}
-
-func (x *NamedSubject) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbsubscribe_subscribe_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use NamedSubject.ProtoReflect.Descriptor instead.
-func (*NamedSubject) Descriptor() ([]byte, []int) {
-	return file_private_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *NamedSubject) GetKey() string {
-	if x != nil {
-		return x.Key
-	}
-	return ""
-}
-
-func (x *NamedSubject) GetNamespace() string {
-	if x != nil {
-		return x.Namespace
-	}
-	return ""
-}
-
-func (x *NamedSubject) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *NamedSubject) GetPeerName() string {
-	if x != nil {
-		return x.PeerName
-	}
-	return ""
-}
-
-// SubscribeRequest used to subscribe to a topic.
-type SubscribeRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Topic identifies the set of events the subscriber is interested in.
-	Topic Topic `protobuf:"varint,1,opt,name=Topic,proto3,enum=subscribe.Topic" json:"Topic,omitempty"`
-	// Deprecated: use NamedSubject.Key instead.
-	Key string `protobuf:"bytes,2,opt,name=Key,proto3" json:"Key,omitempty"`
-	// Token is the ACL token to authenticate the request. The token must have
-	// sufficient privileges to read the requested information otherwise events
-	// will be filtered, possibly resulting in an empty snapshot and no further
-	// updates sent.
-	Token string `protobuf:"bytes,3,opt,name=Token,proto3" json:"Token,omitempty"`
-	// Index is the raft index the subscriber has already observed up to. This
-	// is zero on an initial streaming call, but then can be provided by a
-	// client on subsequent re-connections such that the full snapshot doesn't
-	// need to be resent if the client is up to date.
-	Index uint64 `protobuf:"varint,4,opt,name=Index,proto3" json:"Index,omitempty"`
-	// Datacenter specifies the Consul datacenter the request is targeted at.
-	// If it's not the local DC the server will forward the request to
-	// the remote DC and proxy the results back  to the subscriber. An empty
-	// string defaults to the local datacenter.
-	Datacenter string `protobuf:"bytes,5,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
-	// Deprecated: use NamedSubject.Namespace instead.
-	Namespace string `protobuf:"bytes,6,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
-	// Deprecated: use NamedSubject.Partition instead.
-	Partition string `protobuf:"bytes,7,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	// Deprecated: use NamedSubject.PeerName instead.
-	PeerName string `protobuf:"bytes,8,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
-	// Subject identifies a portion of a topic for which the subscriber wishes to
-	// receive events (e.g. health events for a particular service).
-	//
-	// Types that are assignable to Subject:
-	//
-	//	*SubscribeRequest_WildcardSubject
-	//	*SubscribeRequest_NamedSubject
-	Subject isSubscribeRequest_Subject `protobuf_oneof:"Subject"`
-}
-
-func (x *SubscribeRequest) Reset() {
-	*x = SubscribeRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbsubscribe_subscribe_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SubscribeRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SubscribeRequest) ProtoMessage() {}
-
-func (x *SubscribeRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbsubscribe_subscribe_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SubscribeRequest.ProtoReflect.Descriptor instead.
-func (*SubscribeRequest) Descriptor() ([]byte, []int) {
-	return file_private_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *SubscribeRequest) GetTopic() Topic {
-	if x != nil {
-		return x.Topic
-	}
-	return Topic_Unknown
-}
-
-func (x *SubscribeRequest) GetKey() string {
-	if x != nil {
-		return x.Key
-	}
-	return ""
-}
-
-func (x *SubscribeRequest) GetToken() string {
-	if x != nil {
-		return x.Token
-	}
-	return ""
-}
-
-func (x *SubscribeRequest) GetIndex() uint64 {
-	if x != nil {
-		return x.Index
-	}
-	return 0
-}
-
-func (x *SubscribeRequest) GetDatacenter() string {
-	if x != nil {
-		return x.Datacenter
-	}
-	return ""
-}
-
-func (x *SubscribeRequest) GetNamespace() string {
-	if x != nil {
-		return x.Namespace
-	}
-	return ""
-}
-
-func (x *SubscribeRequest) GetPartition() string {
-	if x != nil {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *SubscribeRequest) GetPeerName() string {
-	if x != nil {
-		return x.PeerName
-	}
-	return ""
-}
-
-func (m *SubscribeRequest) GetSubject() isSubscribeRequest_Subject {
-	if m != nil {
-		return m.Subject
-	}
-	return nil
-}
-
-func (x *SubscribeRequest) GetWildcardSubject() bool {
-	if x, ok := x.GetSubject().(*SubscribeRequest_WildcardSubject); ok {
-		return x.WildcardSubject
-	}
-	return false
-}
-
-func (x *SubscribeRequest) GetNamedSubject() *NamedSubject {
-	if x, ok := x.GetSubject().(*SubscribeRequest_NamedSubject); ok {
-		return x.NamedSubject
-	}
-	return nil
-}
-
-type isSubscribeRequest_Subject interface {
-	isSubscribeRequest_Subject()
-}
-
-type SubscribeRequest_WildcardSubject struct {
-	// WildcardSubject is used to subscribe to all events published on the topic
-	// if it is supported.
-	WildcardSubject bool `protobuf:"varint,9,opt,name=WildcardSubject,proto3,oneof"`
-}
-
-type SubscribeRequest_NamedSubject struct {
-	// NamedSubject is used to subscribe to events pertaining to a specific
-	// resource (e.g. a particular service or config entry).
-	NamedSubject *NamedSubject `protobuf:"bytes,10,opt,name=NamedSubject,proto3,oneof"`
-}
-
-func (*SubscribeRequest_WildcardSubject) isSubscribeRequest_Subject() {}
-
-func (*SubscribeRequest_NamedSubject) isSubscribeRequest_Subject() {}
-
-// Event describes a streaming update on a subscription. Events are used both to
-// describe the current "snapshot" of the result as well as ongoing mutations to
-// that snapshot.
-type Event struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Index is the raft index at which the mutation took place. At the top
-	// level of a subscription there will always be at most one Event per index.
-	// If multiple events are published to the same topic in a single raft
-	// transaction then the batch of events will be encoded inside a single
-	// top-level event to ensure they are delivered atomically to clients.
-	Index uint64 `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
-	// Payload is the actual event content.
-	//
-	// Types that are assignable to Payload:
-	//
-	//	*Event_EndOfSnapshot
-	//	*Event_NewSnapshotToFollow
-	//	*Event_EventBatch
-	//	*Event_ServiceHealth
-	//	*Event_ConfigEntry
-	//	*Event_Service
-	Payload isEvent_Payload `protobuf_oneof:"Payload"`
-}
-
-func (x *Event) Reset() {
-	*x = Event{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbsubscribe_subscribe_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Event) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Event) ProtoMessage() {}
-
-func (x *Event) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbsubscribe_subscribe_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Event.ProtoReflect.Descriptor instead.
-func (*Event) Descriptor() ([]byte, []int) {
-	return file_private_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *Event) GetIndex() uint64 {
-	if x != nil {
-		return x.Index
-	}
-	return 0
-}
-
-func (m *Event) GetPayload() isEvent_Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-func (x *Event) GetEndOfSnapshot() bool {
-	if x, ok := x.GetPayload().(*Event_EndOfSnapshot); ok {
-		return x.EndOfSnapshot
-	}
-	return false
-}
-
-func (x *Event) GetNewSnapshotToFollow() bool {
-	if x, ok := x.GetPayload().(*Event_NewSnapshotToFollow); ok {
-		return x.NewSnapshotToFollow
-	}
-	return false
-}
-
-func (x *Event) GetEventBatch() *EventBatch {
-	if x, ok := x.GetPayload().(*Event_EventBatch); ok {
-		return x.EventBatch
-	}
-	return nil
-}
-
-func (x *Event) GetServiceHealth() *ServiceHealthUpdate {
-	if x, ok := x.GetPayload().(*Event_ServiceHealth); ok {
-		return x.ServiceHealth
-	}
-	return nil
-}
-
-func (x *Event) GetConfigEntry() *ConfigEntryUpdate {
-	if x, ok := x.GetPayload().(*Event_ConfigEntry); ok {
-		return x.ConfigEntry
-	}
-	return nil
-}
-
-func (x *Event) GetService() *ServiceListUpdate {
-	if x, ok := x.GetPayload().(*Event_Service); ok {
-		return x.Service
-	}
-	return nil
-}
-
-type isEvent_Payload interface {
-	isEvent_Payload()
-}
-
-type Event_EndOfSnapshot struct {
-	// EndOfSnapshot indicates the event stream for the initial snapshot has
-	// ended. Subsequent Events delivered will be mutations to that result.
-	EndOfSnapshot bool `protobuf:"varint,2,opt,name=EndOfSnapshot,proto3,oneof"`
-}
-
-type Event_NewSnapshotToFollow struct {
-	// NewSnapshotToFollow indicates that the client view is stale. The client
-	// must reset its view before handing any more events. Subsequent events
-	// in the stream will be for a new snapshot until an EndOfSnapshot event
-	// is received.
-	NewSnapshotToFollow bool `protobuf:"varint,3,opt,name=NewSnapshotToFollow,proto3,oneof"`
-}
-
-type Event_EventBatch struct {
-	// EventBatch is a set of events. This is typically used as the payload
-	// type where multiple events are emitted in a single topic and raft
-	// index (e.g. transactional updates). In this case the Topic and Index
-	// values of all events will match and the whole set should be delivered
-	// and consumed atomically.
-	EventBatch *EventBatch `protobuf:"bytes,4,opt,name=EventBatch,proto3,oneof"`
-}
-
-type Event_ServiceHealth struct {
-	// ServiceHealth is used for ServiceHealth and ServiceHealthConnect
-	// topics.
-	ServiceHealth *ServiceHealthUpdate `protobuf:"bytes,10,opt,name=ServiceHealth,proto3,oneof"`
-}
-
-type Event_ConfigEntry struct {
-	// ConfigEntry is used for config entry topics (e.g. MeshConfig).
-	ConfigEntry *ConfigEntryUpdate `protobuf:"bytes,11,opt,name=ConfigEntry,proto3,oneof"`
-}
-
-type Event_Service struct {
-	// Service is used for ServiceList topic.
-	Service *ServiceListUpdate `protobuf:"bytes,12,opt,name=Service,proto3,oneof"`
-}
-
-func (*Event_EndOfSnapshot) isEvent_Payload() {}
-
-func (*Event_NewSnapshotToFollow) isEvent_Payload() {}
-
-func (*Event_EventBatch) isEvent_Payload() {}
-
-func (*Event_ServiceHealth) isEvent_Payload() {}
-
-func (*Event_ConfigEntry) isEvent_Payload() {}
-
-func (*Event_Service) isEvent_Payload() {}
-
-type EventBatch struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Events []*Event `protobuf:"bytes,1,rep,name=Events,proto3" json:"Events,omitempty"`
-}
-
-func (x *EventBatch) Reset() {
-	*x = EventBatch{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbsubscribe_subscribe_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EventBatch) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EventBatch) ProtoMessage() {}
-
-func (x *EventBatch) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbsubscribe_subscribe_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EventBatch.ProtoReflect.Descriptor instead.
-func (*EventBatch) Descriptor() ([]byte, []int) {
-	return file_private_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *EventBatch) GetEvents() []*Event {
-	if x != nil {
-		return x.Events
-	}
-	return nil
-}
-
-type ServiceHealthUpdate struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Op               CatalogOp                   `protobuf:"varint,1,opt,name=Op,proto3,enum=subscribe.CatalogOp" json:"Op,omitempty"`
-	CheckServiceNode *pbservice.CheckServiceNode `protobuf:"bytes,2,opt,name=CheckServiceNode,proto3" json:"CheckServiceNode,omitempty"`
-}
-
-func (x *ServiceHealthUpdate) Reset() {
-	*x = ServiceHealthUpdate{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbsubscribe_subscribe_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceHealthUpdate) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceHealthUpdate) ProtoMessage() {}
-
-func (x *ServiceHealthUpdate) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbsubscribe_subscribe_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceHealthUpdate.ProtoReflect.Descriptor instead.
-func (*ServiceHealthUpdate) Descriptor() ([]byte, []int) {
-	return file_private_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *ServiceHealthUpdate) GetOp() CatalogOp {
-	if x != nil {
-		return x.Op
-	}
-	return CatalogOp_Register
-}
-
-func (x *ServiceHealthUpdate) GetCheckServiceNode() *pbservice.CheckServiceNode {
-	if x != nil {
-		return x.CheckServiceNode
-	}
-	return nil
-}
-
-type ConfigEntryUpdate struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Op          ConfigEntryUpdate_UpdateOp `protobuf:"varint,1,opt,name=Op,proto3,enum=subscribe.ConfigEntryUpdate_UpdateOp" json:"Op,omitempty"`
-	ConfigEntry *pbconfigentry.ConfigEntry `protobuf:"bytes,2,opt,name=ConfigEntry,proto3" json:"ConfigEntry,omitempty"`
-}
-
-func (x *ConfigEntryUpdate) Reset() {
-	*x = ConfigEntryUpdate{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbsubscribe_subscribe_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ConfigEntryUpdate) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ConfigEntryUpdate) ProtoMessage() {}
-
-func (x *ConfigEntryUpdate) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbsubscribe_subscribe_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ConfigEntryUpdate.ProtoReflect.Descriptor instead.
-func (*ConfigEntryUpdate) Descriptor() ([]byte, []int) {
-	return file_private_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *ConfigEntryUpdate) GetOp() ConfigEntryUpdate_UpdateOp {
-	if x != nil {
-		return x.Op
-	}
-	return ConfigEntryUpdate_Upsert
-}
-
-func (x *ConfigEntryUpdate) GetConfigEntry() *pbconfigentry.ConfigEntry {
-	if x != nil {
-		return x.ConfigEntry
-	}
-	return nil
-}
-
-type ServiceListUpdate struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Op             CatalogOp                `protobuf:"varint,1,opt,name=Op,proto3,enum=subscribe.CatalogOp" json:"Op,omitempty"`
-	Name           string                   `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
-	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,3,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
-	PeerName       string                   `protobuf:"bytes,4,opt,name=PeerName,proto3" json:"PeerName,omitempty"`
-}
-
-func (x *ServiceListUpdate) Reset() {
-	*x = ServiceListUpdate{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_private_pbsubscribe_subscribe_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ServiceListUpdate) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ServiceListUpdate) ProtoMessage() {}
-
-func (x *ServiceListUpdate) ProtoReflect() protoreflect.Message {
-	mi := &file_private_pbsubscribe_subscribe_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ServiceListUpdate.ProtoReflect.Descriptor instead.
-func (*ServiceListUpdate) Descriptor() ([]byte, []int) {
-	return file_private_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *ServiceListUpdate) GetOp() CatalogOp {
-	if x != nil {
-		return x.Op
-	}
-	return CatalogOp_Register
-}
-
-func (x *ServiceListUpdate) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *ServiceListUpdate) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if x != nil {
-		return x.EnterpriseMeta
-	}
-	return nil
-}
-
-func (x *ServiceListUpdate) GetPeerName() string {
-	if x != nil {
-		return x.PeerName
-	}
-	return ""
-}
-
-var File_private_pbsubscribe_subscribe_proto protoreflect.FileDescriptor
-
-var file_private_pbsubscribe_subscribe_proto_rawDesc = []byte{
-	0x0a, 0x23, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x73, 0x75, 0x62, 0x73,
-	0x63, 0x72, 0x69, 0x62, 0x65, 0x2f, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
-	0x1a, 0x25, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x61,
-	0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x2f, 0x72, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6d, 0x69,
-	0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65,
-	0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x28, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f,
-	0x70, 0x62, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2f, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x1c, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x78,
-	0x0a, 0x0c, 0x4e, 0x61, 0x6d, 0x65, 0x64, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x10,
-	0x0a, 0x03, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4b, 0x65, 0x79,
-	0x12, 0x1c, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x1c,
-	0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08,
-	0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-	0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xe6, 0x02, 0x0a, 0x10, 0x53, 0x75, 0x62,
-	0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a,
-	0x05, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x10, 0x2e, 0x73,
-	0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x52, 0x05,
-	0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x4b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x14, 0x0a,
-	0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x49, 0x6e,
-	0x64, 0x65, 0x78, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65,
-	0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e,
-	0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63,
-	0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x1a, 0x0a, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x0f, 0x57,
-	0x69, 0x6c, 0x64, 0x63, 0x61, 0x72, 0x64, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x09,
-	0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0f, 0x57, 0x69, 0x6c, 0x64, 0x63, 0x61, 0x72, 0x64,
-	0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x3d, 0x0a, 0x0c, 0x4e, 0x61, 0x6d, 0x65, 0x64,
-	0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e,
-	0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x64, 0x53,
-	0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x48, 0x00, 0x52, 0x0c, 0x4e, 0x61, 0x6d, 0x65, 0x64, 0x53,
-	0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63,
-	0x74, 0x22, 0x81, 0x03, 0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x49,
-	0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x49, 0x6e, 0x64, 0x65,
-	0x78, 0x12, 0x26, 0x0a, 0x0d, 0x45, 0x6e, 0x64, 0x4f, 0x66, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68,
-	0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0d, 0x45, 0x6e, 0x64, 0x4f,
-	0x66, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x12, 0x32, 0x0a, 0x13, 0x4e, 0x65, 0x77,
-	0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x54, 0x6f, 0x46, 0x6f, 0x6c, 0x6c, 0x6f, 0x77,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x13, 0x4e, 0x65, 0x77, 0x53, 0x6e, 0x61,
-	0x70, 0x73, 0x68, 0x6f, 0x74, 0x54, 0x6f, 0x46, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x12, 0x37, 0x0a,
-	0x0a, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x15, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x45, 0x76,
-	0x65, 0x6e, 0x74, 0x42, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x0a, 0x45, 0x76, 0x65, 0x6e,
-	0x74, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12, 0x46, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e,
-	0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52,
-	0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x40,
-	0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x48, 0x00, 0x52, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x38, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x1c, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x48,
-	0x00, 0x52, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x09, 0x0a, 0x07, 0x50, 0x61,
-	0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x36, 0x0a, 0x0a, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x61,
-	0x74, 0x63, 0x68, 0x12, 0x28, 0x0a, 0x06, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e,
-	0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x9c, 0x01,
-	0x0a, 0x13, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x24, 0x0a, 0x02, 0x4f, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x14, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x43, 0x61,
-	0x74, 0x61, 0x6c, 0x6f, 0x67, 0x4f, 0x70, 0x52, 0x02, 0x4f, 0x70, 0x12, 0x5f, 0x0a, 0x10, 0x43,
-	0x68, 0x65, 0x63, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72,
-	0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x10, 0x43, 0x68, 0x65, 0x63,
-	0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x22, 0xc4, 0x01, 0x0a,
-	0x11, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x12, 0x35, 0x0a, 0x02, 0x4f, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x25,
-	0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x4f, 0x70, 0x52, 0x02, 0x4f, 0x70, 0x12, 0x54, 0x0a, 0x0b, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32,
-	0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6c, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22,
-	0x22, 0x0a, 0x08, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x70, 0x12, 0x0a, 0x0a, 0x06, 0x55,
-	0x70, 0x73, 0x65, 0x72, 0x74, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x44, 0x65, 0x6c, 0x65, 0x74,
-	0x65, 0x10, 0x01, 0x22, 0xc3, 0x01, 0x0a, 0x11, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4c,
-	0x69, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x24, 0x0a, 0x02, 0x4f, 0x70, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62,
-	0x65, 0x2e, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x4f, 0x70, 0x52, 0x02, 0x4f, 0x70, 0x12,
-	0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e,
-	0x61, 0x6d, 0x65, 0x12, 0x58, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73,
-	0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x68, 0x61,
-	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45,
-	0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45,
-	0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x1a, 0x0a,
-	0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x08, 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x2a, 0xc5, 0x02, 0x0a, 0x05, 0x54, 0x6f,
-	0x70, 0x69, 0x63, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x10, 0x00,
-	0x12, 0x11, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74,
-	0x68, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x48, 0x65,
-	0x61, 0x6c, 0x74, 0x68, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x10, 0x02, 0x12, 0x0e, 0x0a,
-	0x0a, 0x4d, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x10, 0x03, 0x12, 0x13, 0x0a,
-	0x0f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72,
-	0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x47, 0x61, 0x74,
-	0x65, 0x77, 0x61, 0x79, 0x10, 0x05, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x10, 0x06, 0x12, 0x0f, 0x0a,
-	0x0b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x07, 0x12, 0x13,
-	0x0a, 0x0f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x73, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61,
-	0x79, 0x10, 0x09, 0x12, 0x0c, 0x0a, 0x08, 0x54, 0x43, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x10,
-	0x0a, 0x12, 0x0d, 0x0a, 0x09, 0x48, 0x54, 0x54, 0x50, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x10, 0x0b,
-	0x12, 0x15, 0x0a, 0x11, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x10, 0x0c, 0x12, 0x13, 0x0a, 0x0f, 0x42, 0x6f, 0x75, 0x6e, 0x64,
-	0x41, 0x50, 0x49, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x10, 0x0d, 0x12, 0x0f, 0x0a, 0x0b,
-	0x49, 0x50, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x0e, 0x12, 0x11, 0x0a,
-	0x0d, 0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x10, 0x0f,
-	0x12, 0x0f, 0x0a, 0x0b, 0x4a, 0x57, 0x54, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x10,
-	0x10, 0x2a, 0x29, 0x0a, 0x09, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x4f, 0x70, 0x12, 0x0c,
-	0x0a, 0x08, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a,
-	0x44, 0x65, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x10, 0x01, 0x32, 0x61, 0x0a, 0x17,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x75, 0x62, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x46, 0x0a, 0x09, 0x53, 0x75, 0x62, 0x73, 0x63,
-	0x72, 0x69, 0x62, 0x65, 0x12, 0x1b, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
-	0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x10, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x45, 0x76,
-	0x65, 0x6e, 0x74, 0x22, 0x08, 0xe2, 0x86, 0x04, 0x04, 0x08, 0x02, 0x10, 0x09, 0x30, 0x01, 0x42,
-	0x9a, 0x01, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62,
-	0x65, 0x42, 0x0e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x2f, 0x70,
-	0x62, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0xa2, 0x02, 0x03, 0x53, 0x58, 0x58,
-	0xaa, 0x02, 0x09, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0xca, 0x02, 0x09, 0x53,
-	0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0xe2, 0x02, 0x15, 0x53, 0x75, 0x62, 0x73, 0x63,
-	0x72, 0x69, 0x62, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0xea, 0x02, 0x09, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_private_pbsubscribe_subscribe_proto_rawDescOnce sync.Once
-	file_private_pbsubscribe_subscribe_proto_rawDescData = file_private_pbsubscribe_subscribe_proto_rawDesc
-)
-
-func file_private_pbsubscribe_subscribe_proto_rawDescGZIP() []byte {
-	file_private_pbsubscribe_subscribe_proto_rawDescOnce.Do(func() {
-		file_private_pbsubscribe_subscribe_proto_rawDescData = protoimpl.X.CompressGZIP(file_private_pbsubscribe_subscribe_proto_rawDescData)
-	})
-	return file_private_pbsubscribe_subscribe_proto_rawDescData
-}
-
-var file_private_pbsubscribe_subscribe_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
-var file_private_pbsubscribe_subscribe_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
-var file_private_pbsubscribe_subscribe_proto_goTypes = []interface{}{
-	(Topic)(0),                         // 0: subscribe.Topic
-	(CatalogOp)(0),                     // 1: subscribe.CatalogOp
-	(ConfigEntryUpdate_UpdateOp)(0),    // 2: subscribe.ConfigEntryUpdate.UpdateOp
-	(*NamedSubject)(nil),               // 3: subscribe.NamedSubject
-	(*SubscribeRequest)(nil),           // 4: subscribe.SubscribeRequest
-	(*Event)(nil),                      // 5: subscribe.Event
-	(*EventBatch)(nil),                 // 6: subscribe.EventBatch
-	(*ServiceHealthUpdate)(nil),        // 7: subscribe.ServiceHealthUpdate
-	(*ConfigEntryUpdate)(nil),          // 8: subscribe.ConfigEntryUpdate
-	(*ServiceListUpdate)(nil),          // 9: subscribe.ServiceListUpdate
-	(*pbservice.CheckServiceNode)(nil), // 10: hashicorp.consul.internal.service.CheckServiceNode
-	(*pbconfigentry.ConfigEntry)(nil),  // 11: hashicorp.consul.internal.configentry.ConfigEntry
-	(*pbcommon.EnterpriseMeta)(nil),    // 12: hashicorp.consul.internal.common.EnterpriseMeta
-}
-var file_private_pbsubscribe_subscribe_proto_depIdxs = []int32{
-	0,  // 0: subscribe.SubscribeRequest.Topic:type_name -> subscribe.Topic
-	3,  // 1: subscribe.SubscribeRequest.NamedSubject:type_name -> subscribe.NamedSubject
-	6,  // 2: subscribe.Event.EventBatch:type_name -> subscribe.EventBatch
-	7,  // 3: subscribe.Event.ServiceHealth:type_name -> subscribe.ServiceHealthUpdate
-	8,  // 4: subscribe.Event.ConfigEntry:type_name -> subscribe.ConfigEntryUpdate
-	9,  // 5: subscribe.Event.Service:type_name -> subscribe.ServiceListUpdate
-	5,  // 6: subscribe.EventBatch.Events:type_name -> subscribe.Event
-	1,  // 7: subscribe.ServiceHealthUpdate.Op:type_name -> subscribe.CatalogOp
-	10, // 8: subscribe.ServiceHealthUpdate.CheckServiceNode:type_name -> hashicorp.consul.internal.service.CheckServiceNode
-	2,  // 9: subscribe.ConfigEntryUpdate.Op:type_name -> subscribe.ConfigEntryUpdate.UpdateOp
-	11, // 10: subscribe.ConfigEntryUpdate.ConfigEntry:type_name -> hashicorp.consul.internal.configentry.ConfigEntry
-	1,  // 11: subscribe.ServiceListUpdate.Op:type_name -> subscribe.CatalogOp
-	12, // 12: subscribe.ServiceListUpdate.EnterpriseMeta:type_name -> hashicorp.consul.internal.common.EnterpriseMeta
-	4,  // 13: subscribe.StateChangeSubscription.Subscribe:input_type -> subscribe.SubscribeRequest
-	5,  // 14: subscribe.StateChangeSubscription.Subscribe:output_type -> subscribe.Event
-	14, // [14:15] is the sub-list for method output_type
-	13, // [13:14] is the sub-list for method input_type
-	13, // [13:13] is the sub-list for extension type_name
-	13, // [13:13] is the sub-list for extension extendee
-	0,  // [0:13] is the sub-list for field type_name
-}
-
-func init() { file_private_pbsubscribe_subscribe_proto_init() }
-func file_private_pbsubscribe_subscribe_proto_init() {
-	if File_private_pbsubscribe_subscribe_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_private_pbsubscribe_subscribe_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NamedSubject); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbsubscribe_subscribe_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SubscribeRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbsubscribe_subscribe_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Event); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbsubscribe_subscribe_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EventBatch); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbsubscribe_subscribe_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceHealthUpdate); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbsubscribe_subscribe_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ConfigEntryUpdate); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_private_pbsubscribe_subscribe_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ServiceListUpdate); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_private_pbsubscribe_subscribe_proto_msgTypes[1].OneofWrappers = []interface{}{
-		(*SubscribeRequest_WildcardSubject)(nil),
-		(*SubscribeRequest_NamedSubject)(nil),
-	}
-	file_private_pbsubscribe_subscribe_proto_msgTypes[2].OneofWrappers = []interface{}{
-		(*Event_EndOfSnapshot)(nil),
-		(*Event_NewSnapshotToFollow)(nil),
-		(*Event_EventBatch)(nil),
-		(*Event_ServiceHealth)(nil),
-		(*Event_ConfigEntry)(nil),
-		(*Event_Service)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_private_pbsubscribe_subscribe_proto_rawDesc,
-			NumEnums:      3,
-			NumMessages:   7,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_private_pbsubscribe_subscribe_proto_goTypes,
-		DependencyIndexes: file_private_pbsubscribe_subscribe_proto_depIdxs,
-		EnumInfos:         file_private_pbsubscribe_subscribe_proto_enumTypes,
-		MessageInfos:      file_private_pbsubscribe_subscribe_proto_msgTypes,
-	}.Build()
-	File_private_pbsubscribe_subscribe_proto = out.File
-	file_private_pbsubscribe_subscribe_proto_rawDesc = nil
-	file_private_pbsubscribe_subscribe_proto_goTypes = nil
-	file_private_pbsubscribe_subscribe_proto_depIdxs = nil
-}
diff --git a/proto/private/prototest/golden_json.go b/proto/private/prototest/golden_json.go
deleted file mode 100644
index d6b68f523d01b..0000000000000
--- a/proto/private/prototest/golden_json.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package prototest
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/proto"
-)
-
-// ProtoToJSON will encode a protobuf into a 2-space indented, deterministic,
-// pretty form of JSON suitable for use in golden file output persistence. It
-// does not aim to be performant.
-func ProtoToJSON(t *testing.T, pb proto.Message) string {
-	t.Helper()
-	m := protojson.MarshalOptions{
-		Indent: "  ",
-	}
-	gotJSON, err := m.Marshal(pb)
-	require.NoError(t, err)
-
-	// protojson format is non-determinstic, so scrub it through the
-	// determinstic json.Marshal so 'git diff' only shows real changes
-	//
-	// https://github.com/golang/protobuf/issues/1269
-	var tmp map[string]any
-	require.NoError(t, json.Unmarshal(gotJSON, &tmp))
-
-	gotJSON, err = json.MarshalIndent(&tmp, "", "  ")
-	require.NoError(t, err)
-
-	return string(gotJSON)
-}
diff --git a/proto/private/prototest/testing.go b/proto/private/prototest/testing.go
deleted file mode 100644
index 32839a78aa809..0000000000000
--- a/proto/private/prototest/testing.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package prototest
-
-import (
-	"github.com/google/go-cmp/cmp"
-	"google.golang.org/protobuf/testing/protocmp"
-)
-
-type TestingT interface {
-	Helper()
-	Fatalf(string, ...any)
-}
-
-func AssertDeepEqual(t TestingT, exp, got interface{}, opts ...cmp.Option) {
-	t.Helper()
-
-	opts = append(opts, protocmp.Transform())
-
-	if diff := cmp.Diff(exp, got, opts...); diff != "" {
-		t.Fatalf("assertion failed: values are not equal\n--- expected\n+++ actual\n%v", diff)
-	}
-}
-
-// AssertElementsMatch asserts that the specified listX(array, slice...) is
-// equal to specified listY(array, slice...) ignoring the order of the
-// elements. If there are duplicate elements, the number of appearances of each
-// of them in both lists should match.
-//
-// prototest.AssertElementsMatch(t, [1, 3, 2, 3], [1, 3, 3, 2])
-func AssertElementsMatch[V any](
-	t TestingT, listX, listY []V, opts ...cmp.Option,
-) {
-	t.Helper()
-	diff := diffElements(listX, listY, opts...)
-	if diff != "" {
-		t.Fatalf("assertion failed: slices do not have matching elements\n--- expected\n+++ actual\n%v", diff)
-	}
-}
-
-func diffElements[V any](
-	listX, listY []V, opts ...cmp.Option,
-) string {
-	if len(listX) == 0 && len(listY) == 0 {
-		return ""
-	}
-
-	opts = append(opts, protocmp.Transform())
-
-	if len(listX) != len(listY) {
-		return cmp.Diff(listX, listY, opts...)
-	}
-
-	// dump into a map keyed by sliceID
-	mapX := make(map[int]V)
-	for i, val := range listX {
-		mapX[i] = val
-	}
-
-	mapY := make(map[int]V)
-	for i, val := range listY {
-		mapY[i] = val
-	}
-
-	var outX, outY []V
-	for i, itemX := range mapX {
-		for j, itemY := range mapY {
-			if diff := cmp.Diff(itemX, itemY, opts...); diff == "" {
-				outX = append(outX, itemX)
-				outY = append(outY, itemY)
-				delete(mapX, i)
-				delete(mapY, j)
-			}
-		}
-	}
-
-	if len(outX) == len(listX) && len(outY) == len(listY) {
-		return "" // matches
-	}
-
-	// dump remainder into the slice so we can generate a useful error
-	for _, itemX := range mapX {
-		outX = append(outX, itemX)
-	}
-	for _, itemY := range mapY {
-		outY = append(outY, itemY)
-	}
-
-	return cmp.Diff(outX, outY, opts...)
-}
-
-func AssertContainsElement[V any](t TestingT, list []V, element V, opts ...cmp.Option) {
-	t.Helper()
-
-	opts = append(opts, protocmp.Transform())
-
-	for _, e := range list {
-		if cmp.Equal(e, element, opts...) {
-			return
-		}
-	}
-
-	t.Fatalf("assertion failed: list does not contain element\n--- list\n%+v\n--- element: %+v", list, element)
-}
diff --git a/proto/prototest/testing.go b/proto/prototest/testing.go
new file mode 100644
index 0000000000000..f128e5074725c
--- /dev/null
+++ b/proto/prototest/testing.go
@@ -0,0 +1,84 @@
+package prototest
+
+import (
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"google.golang.org/protobuf/testing/protocmp"
+)
+
+func AssertDeepEqual(t testing.TB, x, y interface{}, opts ...cmp.Option) {
+	t.Helper()
+
+	opts = append(opts, protocmp.Transform())
+
+	if diff := cmp.Diff(x, y, opts...); diff != "" {
+		t.Fatalf("assertion failed: values are not equal\n--- expected\n+++ actual\n%v", diff)
+	}
+}
+
+// AssertElementsMatch asserts that the specified listX(array, slice...) is
+// equal to specified listY(array, slice...) ignoring the order of the
+// elements. If there are duplicate elements, the number of appearances of each
+// of them in both lists should match.
+//
+// prototest.AssertElementsMatch(t, [1, 3, 2, 3], [1, 3, 3, 2])
+func AssertElementsMatch[V any](
+	t testing.TB, listX, listY []V, opts ...cmp.Option,
+) {
+	diff := diffElements(listX, listY, opts...)
+	if diff != "" {
+		t.Fatalf("assertion failed: slices do not have matching elements\n--- expected\n+++ actual\n%v", diff)
+	}
+}
+
+func diffElements[V any](
+	listX, listY []V, opts ...cmp.Option,
+) string {
+	if len(listX) == 0 && len(listY) == 0 {
+		return ""
+	}
+
+	opts = append(opts, protocmp.Transform())
+
+	if len(listX) != len(listY) {
+		return cmp.Diff(listX, listY, opts...)
+	}
+
+	// dump into a map keyed by sliceID
+	mapX := make(map[int]V)
+	for i, val := range listX {
+		mapX[i] = val
+	}
+
+	mapY := make(map[int]V)
+	for i, val := range listY {
+		mapY[i] = val
+	}
+
+	var outX, outY []V
+	for i, itemX := range mapX {
+		for j, itemY := range mapY {
+			if diff := cmp.Diff(itemX, itemY, opts...); diff == "" {
+				outX = append(outX, itemX)
+				outY = append(outY, itemY)
+				delete(mapX, i)
+				delete(mapY, j)
+			}
+		}
+	}
+
+	if len(outX) == len(listX) && len(outY) == len(listY) {
+		return "" // matches
+	}
+
+	// dump remainder into the slice so we can generate a useful error
+	for _, itemX := range mapX {
+		outX = append(outX, itemX)
+	}
+	for _, itemY := range mapY {
+		outY = append(outY, itemY)
+	}
+
+	return cmp.Diff(outX, outY, opts...)
+}
diff --git a/proto/private/prototest/testing_test.go b/proto/prototest/testing_test.go
similarity index 96%
rename from proto/private/prototest/testing_test.go
rename to proto/prototest/testing_test.go
index 2ee383baa1da3..22c1848821ddc 100644
--- a/proto/private/prototest/testing_test.go
+++ b/proto/prototest/testing_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package prototest
 
 import (
diff --git a/sdk/LICENSE b/sdk/LICENSE
deleted file mode 100644
index 7c5baa45e1c29..0000000000000
--- a/sdk/LICENSE
+++ /dev/null
@@ -1,365 +0,0 @@
-Copyright (c) 2020 HashiCorp, Inc.
-
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. "Contributor"
-
-     means each individual or legal entity that creates, contributes to the
-     creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-
-     means the combination of the Contributions of others (if any) used by a
-     Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-
-     means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-
-     means Source Code Form to which the initial Contributor has attached the
-     notice in Exhibit A, the Executable Form of such Source Code Form, and
-     Modifications of such Source Code Form, in each case including portions
-     thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-     means
-
-     a. that the initial Contributor has attached the notice described in
-        Exhibit B to the Covered Software; or
-
-     b. that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the terms of
-        a Secondary License.
-
-1.6. "Executable Form"
-
-     means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-
-     means a work that combines Covered Software with other material, in a
-     separate file or files, that is not Covered Software.
-
-1.8. "License"
-
-     means this document.
-
-1.9. "Licensable"
-
-     means having the right to grant, to the maximum extent possible, whether
-     at the time of the initial grant or subsequently, any and all of the
-     rights conveyed by this License.
-
-1.10. "Modifications"
-
-     means any of the following:
-
-     a. any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered Software; or
-
-     b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. "Patent Claims" of a Contributor
-
-      means any patent claim(s), including without limitation, method,
-      process, and apparatus claims, in any patent Licensable by such
-      Contributor that would be infringed, but for the grant of the License,
-      by the making, using, selling, offering for sale, having made, import,
-      or transfer of either its Contributions or its Contributor Version.
-
-1.12. "Secondary License"
-
-      means either the GNU General Public License, Version 2.0, the GNU Lesser
-      General Public License, Version 2.1, the GNU Affero General Public
-      License, Version 3.0, or any later versions of those licenses.
-
-1.13. "Source Code Form"
-
-      means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-
-      means an individual or a legal entity exercising rights under this
-      License. For legal entities, "You" includes any entity that controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, "control" means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-     Each Contributor hereby grants You a world-wide, royalty-free,
-     non-exclusive license:
-
-     a. under intellectual property rights (other than patent or trademark)
-        Licensable by such Contributor to use, reproduce, make available,
-        modify, display, perform, distribute, and otherwise exploit its
-        Contributions, either on an unmodified basis, with Modifications, or
-        as part of a Larger Work; and
-
-     b. under Patent Claims of such Contributor to make, use, sell, offer for
-        sale, have made, import, and otherwise transfer either its
-        Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-     The licenses granted in Section 2.1 with respect to any Contribution
-     become effective for each Contribution on the date the Contributor first
-     distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-     The licenses granted in this Section 2 are the only rights granted under
-     this License. No additional rights or licenses will be implied from the
-     distribution or licensing of Covered Software under this License.
-     Notwithstanding Section 2.1(b) above, no patent license is granted by a
-     Contributor:
-
-     a. for any code that a Contributor has removed from Covered Software; or
-
-     b. for infringements caused by: (i) Your and any other third party's
-        modifications of Covered Software, or (ii) the combination of its
-        Contributions with other software (except as part of its Contributor
-        Version); or
-
-     c. under Patent Claims infringed by Covered Software in the absence of
-        its Contributions.
-
-     This License does not grant any rights in the trademarks, service marks,
-     or logos of any Contributor (except as may be necessary to comply with
-     the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-     No Contributor makes additional grants as a result of Your choice to
-     distribute the Covered Software under a subsequent version of this
-     License (see Section 10.2) or under the terms of a Secondary License (if
-     permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-     Each Contributor represents that the Contributor believes its
-     Contributions are its original creation(s) or it has sufficient rights to
-     grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-     This License is not intended to limit any rights You have under
-     applicable copyright doctrines of fair use, fair dealing, or other
-     equivalents.
-
-2.7. Conditions
-
-     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
-     Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-     All distribution of Covered Software in Source Code Form, including any
-     Modifications that You create or to which You contribute, must be under
-     the terms of this License. You must inform recipients that the Source
-     Code Form of the Covered Software is governed by the terms of this
-     License, and how they can obtain a copy of this License. You may not
-     attempt to alter or restrict the recipients' rights in the Source Code
-     Form.
-
-3.2. Distribution of Executable Form
-
-     If You distribute Covered Software in Executable Form then:
-
-     a. such Covered Software must also be made available in Source Code Form,
-        as described in Section 3.1, and You must inform recipients of the
-        Executable Form how they can obtain a copy of such Source Code Form by
-        reasonable means in a timely manner, at a charge no more than the cost
-        of distribution to the recipient; and
-
-     b. You may distribute such Executable Form under the terms of this
-        License, or sublicense it under different terms, provided that the
-        license for the Executable Form does not attempt to limit or alter the
-        recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-     You may create and distribute a Larger Work under terms of Your choice,
-     provided that You also comply with the requirements of this License for
-     the Covered Software. If the Larger Work is a combination of Covered
-     Software with a work governed by one or more Secondary Licenses, and the
-     Covered Software is not Incompatible With Secondary Licenses, this
-     License permits You to additionally distribute such Covered Software
-     under the terms of such Secondary License(s), so that the recipient of
-     the Larger Work may, at their option, further distribute the Covered
-     Software under the terms of either this License or such Secondary
-     License(s).
-
-3.4. Notices
-
-     You may not remove or alter the substance of any license notices
-     (including copyright notices, patent notices, disclaimers of warranty, or
-     limitations of liability) contained within the Source Code Form of the
-     Covered Software, except that You may alter any license notices to the
-     extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-     You may choose to offer, and to charge a fee for, warranty, support,
-     indemnity or liability obligations to one or more recipients of Covered
-     Software. However, You may do so only on Your own behalf, and not on
-     behalf of any Contributor. You must make it absolutely clear that any
-     such warranty, support, indemnity, or liability obligation is offered by
-     You alone, and You hereby agree to indemnify every Contributor for any
-     liability incurred by such Contributor as a result of warranty, support,
-     indemnity or liability terms You offer. You may include additional
-     disclaimers of warranty and limitations of liability specific to any
-     jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-   If it is impossible for You to comply with any of the terms of this License
-   with respect to some or all of the Covered Software due to statute,
-   judicial order, or regulation then You must: (a) comply with the terms of
-   this License to the maximum extent possible; and (b) describe the
-   limitations and the code they affect. Such description must be placed in a
-   text file included with all distributions of the Covered Software under
-   this License. Except to the extent prohibited by statute or regulation,
-   such description must be sufficiently detailed for a recipient of ordinary
-   skill to be able to understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
-     fail to comply with any of its terms. However, if You become compliant,
-     then the rights granted under this License from a particular Contributor
-     are reinstated (a) provisionally, unless and until such Contributor
-     explicitly and finally terminates Your grants, and (b) on an ongoing
-     basis, if such Contributor fails to notify You of the non-compliance by
-     some reasonable means prior to 60 days after You have come back into
-     compliance. Moreover, Your grants from a particular Contributor are
-     reinstated on an ongoing basis if such Contributor notifies You of the
-     non-compliance by some reasonable means, this is the first time You have
-     received notice of non-compliance with this License from such
-     Contributor, and You become compliant prior to 30 days after Your receipt
-     of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-     infringement claim (excluding declaratory judgment actions,
-     counter-claims, and cross-claims) alleging that a Contributor Version
-     directly or indirectly infringes any patent, then the rights granted to
-     You by any and all Contributors for the Covered Software under Section
-     2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
-     license agreements (excluding distributors and resellers) which have been
-     validly granted by You or Your distributors under this License prior to
-     termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-   Covered Software is provided under this License on an "as is" basis,
-   without warranty of any kind, either expressed, implied, or statutory,
-   including, without limitation, warranties that the Covered Software is free
-   of defects, merchantable, fit for a particular purpose or non-infringing.
-   The entire risk as to the quality and performance of the Covered Software
-   is with You. Should any Covered Software prove defective in any respect,
-   You (not any Contributor) assume the cost of any necessary servicing,
-   repair, or correction. This disclaimer of warranty constitutes an essential
-   part of this License. No use of  any Covered Software is authorized under
-   this License except under this disclaimer.
-
-7. Limitation of Liability
-
-   Under no circumstances and under no legal theory, whether tort (including
-   negligence), contract, or otherwise, shall any Contributor, or anyone who
-   distributes Covered Software as permitted above, be liable to You for any
-   direct, indirect, special, incidental, or consequential damages of any
-   character including, without limitation, damages for lost profits, loss of
-   goodwill, work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses, even if such party shall have been
-   informed of the possibility of such damages. This limitation of liability
-   shall not apply to liability for death or personal injury resulting from
-   such party's negligence to the extent applicable law prohibits such
-   limitation. Some jurisdictions do not allow the exclusion or limitation of
-   incidental or consequential damages, so this exclusion and limitation may
-   not apply to You.
-
-8. Litigation
-
-   Any litigation relating to this License may be brought only in the courts
-   of a jurisdiction where the defendant maintains its principal place of
-   business and such litigation shall be governed by laws of that
-   jurisdiction, without reference to its conflict-of-law provisions. Nothing
-   in this Section shall prevent a party's ability to bring cross-claims or
-   counter-claims.
-
-9. Miscellaneous
-
-   This License represents the complete agreement concerning the subject
-   matter hereof. If any provision of this License is held to be
-   unenforceable, such provision shall be reformed only to the extent
-   necessary to make it enforceable. Any law or regulation which provides that
-   the language of a contract shall be construed against the drafter shall not
-   be used to construe this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
-      Mozilla Foundation is the license steward. Except as provided in Section
-      10.3, no one other than the license steward has the right to modify or
-      publish new versions of this License. Each version will be given a
-      distinguishing version number.
-
-10.2. Effect of New Versions
-
-      You may distribute the Covered Software under the terms of the version
-      of the License under which You originally received the Covered Software,
-      or under the terms of any subsequent version published by the license
-      steward.
-
-10.3. Modified Versions
-
-      If you create software not governed by this License, and you want to
-      create a new license for such software, you may create and use a
-      modified version of this License if you rename the license and remove
-      any references to the name of the license steward (except to note that
-      such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-      Licenses If You choose to distribute Source Code Form that is
-      Incompatible With Secondary Licenses under the terms of this version of
-      the License, the notice described in Exhibit B of this License must be
-      attached.
-
-Exhibit A - Source Code Form License Notice
-
-      This Source Code Form is subject to the
-      terms of the Mozilla Public License, v.
-      2.0. If a copy of the MPL was not
-      distributed with this file, You can
-      obtain one at
-      http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file,
-then You may include the notice in a location (such as a LICENSE file in a
-relevant directory) where a recipient would be likely to look for such a
-notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
-
-      This Source Code Form is "Incompatible
-      With Secondary Licenses", as defined by
-      the Mozilla Public License, v. 2.0.
-
diff --git a/sdk/freeport/ephemeral_darwin.go b/sdk/freeport/ephemeral_darwin.go
index 18e6b012f3c7d..13d366af65723 100644
--- a/sdk/freeport/ephemeral_darwin.go
+++ b/sdk/freeport/ephemeral_darwin.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build darwin
+// +build darwin
 
 package freeport
 
diff --git a/sdk/freeport/ephemeral_darwin_test.go b/sdk/freeport/ephemeral_darwin_test.go
index 5f68890d6bb6d..10d0b9bba9f84 100644
--- a/sdk/freeport/ephemeral_darwin_test.go
+++ b/sdk/freeport/ephemeral_darwin_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build darwin
+// +build darwin
 
 package freeport
 
diff --git a/sdk/freeport/ephemeral_fallback.go b/sdk/freeport/ephemeral_fallback.go
index 94ba3fb3c0dfd..d250ce64fa9ee 100644
--- a/sdk/freeport/ephemeral_fallback.go
+++ b/sdk/freeport/ephemeral_fallback.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !linux && !darwin
+// +build !linux,!darwin
 
 package freeport
 
diff --git a/sdk/freeport/ephemeral_linux.go b/sdk/freeport/ephemeral_linux.go
index ea7c133b5d4a0..22cf4caee674d 100644
--- a/sdk/freeport/ephemeral_linux.go
+++ b/sdk/freeport/ephemeral_linux.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build linux
+// +build linux
 
 package freeport
 
diff --git a/sdk/freeport/ephemeral_linux_test.go b/sdk/freeport/ephemeral_linux_test.go
index aa3e2de53a6ee..cd4e9db34281b 100644
--- a/sdk/freeport/ephemeral_linux_test.go
+++ b/sdk/freeport/ephemeral_linux_test.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build linux
+// +build linux
 
 package freeport
 
diff --git a/sdk/freeport/freeport.go b/sdk/freeport/freeport.go
index 8009d4da5690c..c51ef9815395c 100644
--- a/sdk/freeport/freeport.go
+++ b/sdk/freeport/freeport.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Package freeport provides a helper for reserving free TCP ports across multiple
 // processes on the same machine. Each process reserves a block of ports outside
 // the ephemeral port range. Tests can request one of these reserved ports
diff --git a/sdk/freeport/freeport_test.go b/sdk/freeport/freeport_test.go
index f5fd6d23dbecb..58a5024ec4092 100644
--- a/sdk/freeport/freeport_test.go
+++ b/sdk/freeport/freeport_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package freeport
 
 import (
diff --git a/sdk/freeport/systemlimit.go b/sdk/freeport/systemlimit.go
index 8d71aa8acb939..2db29870daf8f 100644
--- a/sdk/freeport/systemlimit.go
+++ b/sdk/freeport/systemlimit.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !windows
+// +build !windows
 
 package freeport
 
diff --git a/sdk/freeport/systemlimit_windows.go b/sdk/freeport/systemlimit_windows.go
index a01041ae3d63d..867c64af3aec0 100644
--- a/sdk/freeport/systemlimit_windows.go
+++ b/sdk/freeport/systemlimit_windows.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build windows
+// +build windows
 
 package freeport
 
diff --git a/sdk/go.mod b/sdk/go.mod
index 9fd95927b0858..7d53203ba38f6 100644
--- a/sdk/go.mod
+++ b/sdk/go.mod
@@ -3,23 +3,22 @@ module github.com/hashicorp/consul/sdk
 go 1.19
 
 require (
-	github.com/hashicorp/go-cleanhttp v0.5.2
-	github.com/hashicorp/go-hclog v1.5.0
-	github.com/hashicorp/go-uuid v1.0.3
+	github.com/hashicorp/go-cleanhttp v0.5.1
+	github.com/hashicorp/go-hclog v0.12.0
+	github.com/hashicorp/go-uuid v1.0.1
 	github.com/hashicorp/go-version v1.2.1
-	github.com/pkg/errors v0.9.1
-	github.com/stretchr/testify v1.8.3
+	github.com/pkg/errors v0.8.1
+	github.com/stretchr/testify v1.4.0
 	golang.org/x/sys v0.10.0
 )
 
 require (
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/fatih/color v1.14.1 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fatih/color v1.9.0 // indirect
+	github.com/kr/pretty v0.2.0 // indirect
+	github.com/mattn/go-colorable v0.1.4 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	gopkg.in/yaml.v2 v2.2.8 // indirect
 )
diff --git a/sdk/go.sum b/sdk/go.sum
index 170d4464fc557..4ae643f2a5867 100644
--- a/sdk/go.sum
+++ b/sdk/go.sum
@@ -1,60 +1,46 @@
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
-github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
-github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
-github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
-github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
-github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
+github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
+github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
+github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-hclog v0.12.0 h1:d4QkX8FRTYaKaCZBoXYY8zJX2BXjWxurN/GA2tkrmZM=
+github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE=
+github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
 github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/sdk/iptables/iptables.go b/sdk/iptables/iptables.go
index 32f089a6c9a82..653fd02b9b54b 100644
--- a/sdk/iptables/iptables.go
+++ b/sdk/iptables/iptables.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package iptables
 
 import (
@@ -149,7 +146,7 @@ func Setup(cfg Config) error {
 		// Redirect remaining outbound traffic to Envoy.
 		cfg.IptablesProvider.AddRule("iptables", "-t", "nat", "-A", ProxyOutputChain, "-j", ProxyOutputRedirectChain)
 
-		// We are using "insert" (-I) instead of "append" (-A) so the provided rules take precedence over default ones.
+		// We are using "insert" (-I) instead of "append" (-A) so the the provided rules take precedence over default ones.
 		for _, outboundPort := range cfg.ExcludeOutboundPorts {
 			cfg.IptablesProvider.AddRule("iptables", "-t", "nat", "-I", ProxyOutputChain, "-p", "tcp", "--dport", outboundPort, "-j", "RETURN")
 		}
diff --git a/sdk/iptables/iptables_executor_linux.go b/sdk/iptables/iptables_executor_linux.go
index ad954e82552c6..5c25d5beae320 100644
--- a/sdk/iptables/iptables_executor_linux.go
+++ b/sdk/iptables/iptables_executor_linux.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build linux
+// +build linux
 
 package iptables
 
diff --git a/sdk/iptables/iptables_executor_unsupported.go b/sdk/iptables/iptables_executor_unsupported.go
index cdf12237011e0..3708328aa6a68 100644
--- a/sdk/iptables/iptables_executor_unsupported.go
+++ b/sdk/iptables/iptables_executor_unsupported.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 //go:build !linux
+// +build !linux
 
 package iptables
 
diff --git a/sdk/iptables/iptables_test.go b/sdk/iptables/iptables_test.go
index 20a3e193523c0..1c79fdf057b8a 100644
--- a/sdk/iptables/iptables_test.go
+++ b/sdk/iptables/iptables_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package iptables
 
 import (
diff --git a/sdk/testutil/assertions.go b/sdk/testutil/assertions.go
index a681c8d02cd5a..4f74daf047454 100644
--- a/sdk/testutil/assertions.go
+++ b/sdk/testutil/assertions.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package testutil
 
 import (
diff --git a/sdk/testutil/context.go b/sdk/testutil/context.go
index 47ff794c96c6d..77fc53c067881 100644
--- a/sdk/testutil/context.go
+++ b/sdk/testutil/context.go
@@ -1,18 +1,11 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package testutil
 
 import (
 	"context"
+	"testing"
 )
 
-type CleanerT interface {
-	Helper()
-	Cleanup(func())
-}
-
-func TestContext(t CleanerT) context.Context {
+func TestContext(t *testing.T) context.Context {
 	t.Helper()
 	ctx, cancel := context.WithCancel(context.Background())
 	t.Cleanup(cancel)
diff --git a/sdk/testutil/io.go b/sdk/testutil/io.go
index 7b446339728b4..fb1a54f8a8471 100644
--- a/sdk/testutil/io.go
+++ b/sdk/testutil/io.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package testutil
 
 import (
@@ -10,7 +7,6 @@ import (
 )
 
 var noCleanup = strings.ToLower(os.Getenv("TEST_NOCLEANUP")) == "true"
-var saveSnapshot = strings.ToLower(os.Getenv("TEST_SAVE_SNAPSHOT")) == "true"
 
 // TempDir creates a temporary directory within tmpdir with the name 'testname-name'.
 // If the directory cannot be created t.Fatal is called.
diff --git a/sdk/testutil/retry/counter.go b/sdk/testutil/retry/counter.go
deleted file mode 100644
index 96a37ab9d2fcf..0000000000000
--- a/sdk/testutil/retry/counter.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package retry
-
-import "time"
-
-// Counter repeats an operation a given number of
-// times and waits between subsequent operations.
-type Counter struct {
-	Count int
-	Wait  time.Duration
-
-	count int
-}
-
-func (r *Counter) Continue() bool {
-	if r.count == r.Count {
-		return false
-	}
-	if r.count > 0 {
-		time.Sleep(r.Wait)
-	}
-	r.count++
-	return true
-}
diff --git a/sdk/testutil/retry/retry.go b/sdk/testutil/retry/retry.go
index af468460d592a..6e3ab3d466e8a 100644
--- a/sdk/testutil/retry/retry.go
+++ b/sdk/testutil/retry/retry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // Package retry provides support for repeating operations in tests.
 //
 // A sample retry operation looks like this:
@@ -8,17 +5,10 @@
 //	func TestX(t *testing.T) {
 //	    retry.Run(t, func(r *retry.R) {
 //	        if err := foo(); err != nil {
-//				r.Errorf("foo: %s", err)
-//				return
+//	            r.Fatal("f: ", err)
 //	        }
 //	    })
 //	}
-//
-// Run uses the DefaultFailer, which is a Timer with a Timeout of 7s,
-// and a Wait of 25ms. To customize, use RunWith.
-//
-// WARNING: unlike *testing.T, *retry.R#Fatal and FailNow *do not*
-// fail the test function entirely, only the current run the retry func
 package retry
 
 import (
@@ -41,116 +31,45 @@ type Failer interface {
 }
 
 // R provides context for the retryer.
-//
-// Logs from Logf, (Error|Fatal)(f) are gathered in an internal buffer
-// and printed only if the retryer fails. Printed logs are deduped and
-// prefixed with source code line numbers
 type R struct {
-	// fail is set by FailNow and (Fatal|Error)(f). It indicates the pass
-	// did not succeed, and should be retried
-	fail bool
-	// done is set by Stop. It indicates the entire run was a failure,
-	// and triggers t.FailNow()
+	fail   bool
 	done   bool
 	output []string
-
-	cleanups []func()
 }
 
 func (r *R) Logf(format string, args ...interface{}) {
 	r.log(fmt.Sprintf(format, args...))
 }
 
-func (r *R) Log(args ...interface{}) {
-	r.log(fmt.Sprintln(args...))
-}
-
 func (r *R) Helper() {}
 
-// Cleanup register a function to be run to cleanup resources that
-// were allocated during the retry attempt. These functions are executed
-// after a retry attempt. If they panic, it will not stop further retry
-// attempts but will be cause for the overall test failure.
-func (r *R) Cleanup(fn func()) {
-	r.cleanups = append(r.cleanups, fn)
-}
-
-func (r *R) runCleanup() {
-
-	// Make sure that if a cleanup function panics,
-	// we still run the remaining cleanup functions.
-	defer func() {
-		err := recover()
-		if err != nil {
-			r.Stop(fmt.Errorf("error when performing test cleanup: %v", err))
-		}
-		if len(r.cleanups) > 0 {
-			r.runCleanup()
-		}
-	}()
-
-	for len(r.cleanups) > 0 {
-		var cleanup func()
-		if len(r.cleanups) > 0 {
-			last := len(r.cleanups) - 1
-			cleanup = r.cleanups[last]
-			r.cleanups = r.cleanups[:last]
-		}
-		if cleanup != nil {
-			cleanup()
-		}
-	}
-}
-
-// runFailed is a sentinel value to indicate that the func itself
-// didn't panic, rather that `FailNow` was called.
-type runFailed struct{}
+var runFailed = struct{}{}
 
-// FailNow stops run execution. It is roughly equivalent to:
-//
-//	r.Error("")
-//	return
-//
-// inside the function being run.
 func (r *R) FailNow() {
 	r.fail = true
-	panic(runFailed{})
+	panic(runFailed)
 }
 
-// Fatal is equivalent to r.Logf(args) followed by r.FailNow(), i.e. the run
-// function should be exited. Retries on the next run are allowed. Fatal is
-// equivalent to
-//
-//	r.Error(args)
-//	return
-//
-// inside the function being run.
 func (r *R) Fatal(args ...interface{}) {
 	r.log(fmt.Sprint(args...))
 	r.FailNow()
 }
 
-// Fatalf is like Fatal but allows a format string
 func (r *R) Fatalf(format string, args ...interface{}) {
 	r.log(fmt.Sprintf(format, args...))
 	r.FailNow()
 }
 
-// Error indicates the current run encountered an error and should be retried.
-// It *does not* stop execution of the rest of the run function.
 func (r *R) Error(args ...interface{}) {
 	r.log(fmt.Sprint(args...))
 	r.fail = true
 }
 
-// Errorf is like Error but allows a format string
 func (r *R) Errorf(format string, args ...interface{}) {
 	r.log(fmt.Sprintf(format, args...))
 	r.fail = true
 }
 
-// If err is non-nil, equivalent to r.Fatal(err.Error()) followed by
-// r.FailNow(). Otherwise a no-op.
 func (r *R) Check(err error) {
 	if err != nil {
 		r.log(err.Error())
@@ -162,8 +81,7 @@ func (r *R) log(s string) {
 	r.output = append(r.output, decorate(s))
 }
 
-// Stop retrying, and fail the test, logging the specified error.
-// Does not stop execution, so return should be called after.
+// Stop retrying, and fail the test with the specified error.
 func (r *R) Stop(err error) {
 	r.log(err.Error())
 	r.done = true
@@ -224,12 +142,9 @@ func run(r Retryer, t Failer, f func(r *R)) {
 	}
 
 	for r.Continue() {
-		// run f(rr), but if recover yields a runFailed value, we know
-		// FailNow was called.
 		func() {
-			defer rr.runCleanup()
 			defer func() {
-				if p := recover(); p != nil && p != (runFailed{}) {
+				if p := recover(); p != nil && p != runFailed {
 					panic(p)
 				}
 			}()
@@ -248,12 +163,21 @@ func run(r Retryer, t Failer, f func(r *R)) {
 	fail()
 }
 
-// DefaultFailer provides default retry.Run() behavior for unit tests, namely
-// 7s timeout with a wait of 25ms
+// DefaultFailer provides default retry.Run() behavior for unit tests.
 func DefaultFailer() *Timer {
 	return &Timer{Timeout: 7 * time.Second, Wait: 25 * time.Millisecond}
 }
 
+// TwoSeconds repeats an operation for two seconds and waits 25ms in between.
+func TwoSeconds() *Timer {
+	return &Timer{Timeout: 2 * time.Second, Wait: 25 * time.Millisecond}
+}
+
+// ThreeTimes repeats an operation three times and waits 25ms in between.
+func ThreeTimes() *Counter {
+	return &Counter{Count: 3, Wait: 25 * time.Millisecond}
+}
+
 // Retryer provides an interface for repeating operations
 // until they succeed or an exit condition is met.
 type Retryer interface {
@@ -261,3 +185,46 @@ type Retryer interface {
 	// returns false to indicate retrying should stop.
 	Continue() bool
 }
+
+// Counter repeats an operation a given number of
+// times and waits between subsequent operations.
+type Counter struct {
+	Count int
+	Wait  time.Duration
+
+	count int
+}
+
+func (r *Counter) Continue() bool {
+	if r.count == r.Count {
+		return false
+	}
+	if r.count > 0 {
+		time.Sleep(r.Wait)
+	}
+	r.count++
+	return true
+}
+
+// Timer repeats an operation for a given amount
+// of time and waits between subsequent operations.
+type Timer struct {
+	Timeout time.Duration
+	Wait    time.Duration
+
+	// stop is the timeout deadline.
+	// Set on the first invocation of Next().
+	stop time.Time
+}
+
+func (r *Timer) Continue() bool {
+	if r.stop.IsZero() {
+		r.stop = time.Now().Add(r.Timeout)
+		return true
+	}
+	if time.Now().After(r.stop) {
+		return false
+	}
+	time.Sleep(r.Wait)
+	return true
+}
diff --git a/sdk/testutil/retry/retry_test.go b/sdk/testutil/retry/retry_test.go
index 77bc2d4d9f96b..31923a0bfb226 100644
--- a/sdk/testutil/retry/retry_test.go
+++ b/sdk/testutil/retry/retry_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package retry
 
 import (
@@ -8,7 +5,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -45,56 +41,6 @@ func TestRetryer(t *testing.T) {
 	}
 }
 
-func TestBasics(t *testing.T) {
-	t.Run("Error allows retry", func(t *testing.T) {
-		i := 0
-		Run(t, func(r *R) {
-			i++
-			t.Logf("i: %d; r: %#v", i, r)
-			if i == 1 {
-				r.Errorf("Errorf, i: %d", i)
-				return
-			}
-		})
-		assert.Equal(t, i, 2)
-	})
-
-	t.Run("Fatal returns from func, but does not fail test", func(t *testing.T) {
-		i := 0
-		gotHere := false
-		ft := &fakeT{}
-		Run(ft, func(r *R) {
-			i++
-			t.Logf("i: %d; r: %#v", i, r)
-			if i == 1 {
-				r.Fatalf("Fatalf, i: %d", i)
-				gotHere = true
-			}
-		})
-
-		assert.False(t, gotHere)
-		assert.Equal(t, i, 2)
-		// surprisingly, r.FailNow() *does not* trigger ft.FailNow()!
-		assert.Equal(t, ft.fails, 0)
-	})
-
-	t.Run("Func being run can panic with struct{}{}", func(t *testing.T) {
-		gotPanic := false
-		func() {
-			defer func() {
-				if p := recover(); p != nil {
-					gotPanic = true
-				}
-			}()
-			Run(t, func(r *R) {
-				panic(struct{}{})
-			})
-		}()
-
-		assert.True(t, gotPanic)
-	})
-}
-
 func TestRunWith(t *testing.T) {
 	t.Run("calls FailNow after exceeding retries", func(t *testing.T) {
 		ft := &fakeT{}
@@ -119,7 +65,6 @@ func TestRunWith(t *testing.T) {
 			r.Fatalf("not yet")
 		})
 
-		// TODO: these should all be assert
 		require.Equal(t, 2, iter)
 		require.Equal(t, 1, ft.fails)
 		require.Len(t, ft.out, 1)
@@ -128,69 +73,6 @@ func TestRunWith(t *testing.T) {
 	})
 }
 
-func TestCleanup(t *testing.T) {
-	t.Run("basic", func(t *testing.T) {
-		ft := &fakeT{}
-		cleanupsExecuted := 0
-		RunWith(&Counter{Count: 2, Wait: time.Millisecond}, ft, func(r *R) {
-			r.Cleanup(func() {
-				cleanupsExecuted += 1
-			})
-		})
-
-		require.Equal(t, 0, ft.fails)
-		require.Equal(t, 1, cleanupsExecuted)
-	})
-	t.Run("cleanup-panic-recovery", func(t *testing.T) {
-		ft := &fakeT{}
-		cleanupsExecuted := 0
-		RunWith(&Counter{Count: 2, Wait: time.Millisecond}, ft, func(r *R) {
-			r.Cleanup(func() {
-				cleanupsExecuted += 1
-			})
-
-			r.Cleanup(func() {
-				cleanupsExecuted += 1
-				panic(fmt.Errorf("fake test error"))
-			})
-
-			r.Cleanup(func() {
-				cleanupsExecuted += 1
-			})
-
-			// test is successful but should fail due to the cleanup panicing
-		})
-
-		require.Equal(t, 3, cleanupsExecuted)
-		require.Equal(t, 1, ft.fails)
-		require.Contains(t, ft.out[0], "fake test error")
-	})
-
-	t.Run("cleanup-per-retry", func(t *testing.T) {
-		ft := &fakeT{}
-		iter := 0
-		cleanupsExecuted := 0
-		RunWith(&Counter{Count: 3, Wait: time.Millisecond}, ft, func(r *R) {
-			if cleanupsExecuted != iter {
-				r.Stop(fmt.Errorf("cleanups not executed between retries"))
-				return
-			}
-			iter += 1
-
-			r.Cleanup(func() {
-				cleanupsExecuted += 1
-			})
-
-			r.FailNow()
-		})
-
-		require.Equal(t, 3, cleanupsExecuted)
-		// ensure that r.Stop hadn't been called. If it was then we would
-		// have log output
-		require.Len(t, ft.out, 0)
-	})
-}
-
 type fakeT struct {
 	fails int
 	out   []string
diff --git a/sdk/testutil/retry/timer.go b/sdk/testutil/retry/timer.go
deleted file mode 100644
index 16433e9ec7b02..0000000000000
--- a/sdk/testutil/retry/timer.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package retry
-
-import "time"
-
-// ThirtySeconds repeats an operation for thirty seconds and waits 500ms in between.
-// Best for known slower operations like waiting on eventually consistent state.
-func ThirtySeconds() *Timer {
-	return &Timer{Timeout: 30 * time.Second, Wait: 500 * time.Millisecond}
-}
-
-// TwoSeconds repeats an operation for two seconds and waits 25ms in between.
-func TwoSeconds() *Timer {
-	return &Timer{Timeout: 2 * time.Second, Wait: 25 * time.Millisecond}
-}
-
-// ThreeTimes repeats an operation three times and waits 25ms in between.
-func ThreeTimes() *Counter {
-	return &Counter{Count: 3, Wait: 25 * time.Millisecond}
-}
-
-// Timer repeats an operation for a given amount
-// of time and waits between subsequent operations.
-type Timer struct {
-	Timeout time.Duration
-	Wait    time.Duration
-
-	// stop is the timeout deadline.
-	// TODO: Next()?
-	// Set on the first invocation of Next().
-	stop time.Time
-}
-
-func (r *Timer) Continue() bool {
-	if r.stop.IsZero() {
-		r.stop = time.Now().Add(r.Timeout)
-		return true
-	}
-	if time.Now().After(r.stop) {
-		return false
-	}
-	time.Sleep(r.Wait)
-	return true
-}
diff --git a/sdk/testutil/server.go b/sdk/testutil/server.go
index a9da8f372725c..362c042ec83c1 100644
--- a/sdk/testutil/server.go
+++ b/sdk/testutil/server.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package testutil
 
 // TestServer is a test helper. It uses a fork/exec model to create
@@ -26,6 +23,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
+	"strconv"
 	"strings"
 	"syscall"
 	"testing"
@@ -74,28 +72,11 @@ type TestNetworkSegment struct {
 	Advertise string `json:"advertise"`
 }
 
-// TestAudigConfig contains the configuration for Audit
-type TestAuditConfig struct {
-	Enabled bool `json:"enabled,omitempty"`
-}
-
-// Locality is used as the TestServerConfig's Locality.
-type Locality struct {
-	Region string `json:"region"`
-	Zone   string `json:"zone"`
-}
-
-// TestAutopilotConfig contains the configuration for autopilot.
-type TestAutopilotConfig struct {
-	ServerStabilizationTime string `json:"server_stabilization_time,omitempty"`
-}
-
 // TestServerConfig is the main server configuration struct.
 type TestServerConfig struct {
 	NodeName            string                 `json:"node_name"`
 	NodeID              string                 `json:"node_id"`
 	NodeMeta            map[string]string      `json:"node_meta,omitempty"`
-	NodeLocality        *Locality              `json:"locality,omitempty"`
 	Performance         *TestPerformanceConfig `json:"performance,omitempty"`
 	Bootstrap           bool                   `json:"bootstrap,omitempty"`
 	Server              bool                   `json:"server,omitempty"`
@@ -127,16 +108,12 @@ type TestServerConfig struct {
 	EnableDebug         bool                   `json:"enable_debug,omitempty"`
 	SkipLeaveOnInt      bool                   `json:"skip_leave_on_interrupt"`
 	Peering             *TestPeeringConfig     `json:"peering,omitempty"`
-	Autopilot           *TestAutopilotConfig   `json:"autopilot,omitempty"`
 	ReadyTimeout        time.Duration          `json:"-"`
 	StopTimeout         time.Duration          `json:"-"`
 	Stdout              io.Writer              `json:"-"`
 	Stderr              io.Writer              `json:"-"`
 	Args                []string               `json:"-"`
 	ReturnPorts         func()                 `json:"-"`
-	Audit               *TestAuditConfig       `json:"audit,omitempty"`
-	Version             string                 `json:"version,omitempty"`
-	Experiments         []string               `json:"experiments,omitempty"`
 }
 
 type TestACLs struct {
@@ -176,16 +153,9 @@ type ServerConfigCallback func(c *TestServerConfig)
 // defaultServerConfig returns a new TestServerConfig struct
 // with all of the listen ports incremented by one.
 func defaultServerConfig(t TestingTB, consulVersion *version.Version) *TestServerConfig {
-	var nodeID string
-	var err error
-
-	if id, ok := os.LookupEnv("TEST_NODE_ID"); ok {
-		nodeID = id
-	} else {
-		nodeID, err = uuid.GenerateUUID()
-		if err != nil {
-			panic(err)
-		}
+	nodeID, err := uuid.GenerateUUID()
+	if err != nil {
+		panic(err)
 	}
 
 	ports := freeport.GetN(t, 7)
@@ -226,7 +196,6 @@ func defaultServerConfig(t TestingTB, consulVersion *version.Version) *TestServe
 		Stdout:  logBuffer,
 		Stderr:  logBuffer,
 		Peering: &TestPeeringConfig{Enabled: true},
-		Version: consulVersion.String(),
 	}
 
 	// Add version-specific tweaks
@@ -272,7 +241,6 @@ type TestServer struct {
 	HTTPSAddr   string
 	LANAddr     string
 	WANAddr     string
-	ServerAddr  string
 	GRPCAddr    string
 	GRPCTLSAddr string
 
@@ -293,29 +261,14 @@ func NewTestServerConfigT(t TestingTB, cb ServerConfigCallback) (*TestServer, er
 			"consul or skip this test")
 	}
 
-	var tmpdir string
-
-	if dir, ok := os.LookupEnv("TEST_TMP_DIR"); ok {
-		// NOTE(CTIA): using TEST_TMP_DIR may cause conflict when NewTestServerConfigT
-		// is called > 1 since two agent will uses the same directory
-		tmpdir = dir
-		if _, err := os.Stat(tmpdir); os.IsNotExist(err) {
-			if err = os.Mkdir(tmpdir, 0750); err != nil {
-				return nil, errors.Wrap(err, "failed to create tempdir from env TEST_TMP_DIR")
-			}
-		} else {
-			t.Logf("WARNING: using tempdir that already exists %s", tmpdir)
-		}
-	} else {
-		prefix := "consul"
-		if t != nil {
-			// Use test name for tmpdir if available
-			prefix = strings.Replace(t.Name(), "/", "_", -1)
-		}
-		tmpdir, err = os.MkdirTemp("", prefix)
-		if err != nil {
-			return nil, errors.Wrap(err, "failed to create tempdir")
-		}
+	prefix := "consul"
+	if t != nil {
+		// Use test name for tmpdir if available
+		prefix = strings.Replace(t.Name(), "/", "_", -1)
+	}
+	tmpdir, err := os.MkdirTemp("", prefix)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to create tempdir")
 	}
 
 	consulVersion, err := findConsulVersion()
@@ -323,12 +276,8 @@ func NewTestServerConfigT(t TestingTB, cb ServerConfigCallback) (*TestServer, er
 		return nil, err
 	}
 
-	datadir := filepath.Join(tmpdir, "data")
-	if _, err := os.Stat(datadir); !os.IsNotExist(err) {
-		t.Logf("WARNING: using a data that already exists %s", datadir)
-	}
 	cfg := defaultServerConfig(t, consulVersion)
-	cfg.DataDir = datadir
+	cfg.DataDir = filepath.Join(tmpdir, "data")
 	if cb != nil {
 		cb(cfg)
 	}
@@ -349,7 +298,6 @@ func NewTestServerConfigT(t TestingTB, cb ServerConfigCallback) (*TestServer, er
 	// Start the server
 	args := []string{"agent", "-config-file", configFile}
 	args = append(args, cfg.Args...)
-	t.Logf("test cmd args: consul args: %s", args)
 	cmd := exec.Command("consul", args...)
 	cmd.Stdout = cfg.Stdout
 	cmd.Stderr = cfg.Stderr
@@ -377,7 +325,6 @@ func NewTestServerConfigT(t TestingTB, cb ServerConfigCallback) (*TestServer, er
 		HTTPSAddr:   fmt.Sprintf("127.0.0.1:%d", cfg.Ports.HTTPS),
 		LANAddr:     fmt.Sprintf("127.0.0.1:%d", cfg.Ports.SerfLan),
 		WANAddr:     fmt.Sprintf("127.0.0.1:%d", cfg.Ports.SerfWan),
-		ServerAddr:  fmt.Sprintf("127.0.0.1:%d", cfg.Ports.Server),
 		GRPCAddr:    fmt.Sprintf("127.0.0.1:%d", cfg.Ports.GRPC),
 		GRPCTLSAddr: fmt.Sprintf("127.0.0.1:%d", cfg.Ports.GRPCTLS),
 
@@ -414,21 +361,6 @@ func (s *TestServer) Stop() error {
 	}
 
 	if s.cmd.Process != nil {
-
-		if saveSnapshot {
-			fmt.Println("Saving snapshot")
-			// create a snapshot prior to upgrade test
-			args := []string{"snapshot", "save", "-http-addr",
-				fmt.Sprintf("http://%s", s.HTTPAddr), filepath.Join(s.tmpdir, "backup.snap")}
-			fmt.Printf("Saving snapshot: consul args: %s\n", args)
-			cmd := exec.Command("consul", args...)
-			cmd.Stdout = s.Config.Stdout
-			cmd.Stderr = s.Config.Stderr
-			if err := cmd.Run(); err != nil {
-				return errors.Wrap(err, "failed to save a snapshot")
-			}
-		}
-
 		if runtime.GOOS == "windows" {
 			if err := s.cmd.Process.Kill(); err != nil {
 				return errors.Wrap(err, "failed to kill consul server")
@@ -491,13 +423,13 @@ func (s *TestServer) waitForAPI() error {
 	return nil
 }
 
-// WaitForLeader waits for the Consul server's HTTP API to become available,
-// and then waits for a known leader to be observed to confirm leader election
-// is done.
+// waitForLeader waits for the Consul server's HTTP API to become
+// available, and then waits for a known leader and an index of
+// 2 or more to be observed to confirm leader election is done.
 func (s *TestServer) WaitForLeader(t testing.TB) {
 	retry.Run(t, func(r *retry.R) {
 		// Query the API and check the status code.
-		url := s.url("/v1/status/leader")
+		url := s.url("/v1/catalog/nodes")
 		resp, err := s.privilegedGet(url)
 		if err != nil {
 			r.Fatalf("failed http get '%s': %v", url, err)
@@ -507,59 +439,17 @@ func (s *TestServer) WaitForLeader(t testing.TB) {
 			r.Fatalf("failed OK response: %v", err)
 		}
 
-		var leader string
-		dec := json.NewDecoder(resp.Body)
-		if err := dec.Decode(&leader); err != nil {
-			r.Fatal(err)
+		// Ensure we have a leader and a node registration.
+		if leader := resp.Header.Get("X-Consul-KnownLeader"); leader != "true" {
+			r.Fatalf("Consul leader status: %#v", leader)
 		}
-
-		// Ensure we have a leader.
-		if leader == "" {
-			r.Fatal("no leader address")
-		}
-	})
-}
-
-// WaitForVoting waits for the Consul server to become a voter in the current raft
-// configuration. You probably want to adjust the ServerStablizationTime autopilot
-// configuration otherwise this could take 10 seconds.
-func (s *TestServer) WaitForVoting(t testing.TB) {
-	// don't need to fully decode the response
-	type raftServer struct {
-		ID    string
-		Voter bool
-	}
-	type raftCfgResponse struct {
-		Servers []raftServer
-	}
-
-	retry.Run(t, func(r *retry.R) {
-		// Query the API and get the current raft configuration.
-		url := s.url("/v1/operator/raft/configuration")
-		resp, err := s.privilegedGet(url)
+		index, err := strconv.ParseInt(resp.Header.Get("X-Consul-Index"), 10, 64)
 		if err != nil {
-			r.Fatalf("failed http get '%s': %v", url, err)
+			r.Fatalf("bad consul index: %v", err)
 		}
-		defer resp.Body.Close()
-		if err := s.requireOK(resp); err != nil {
-			r.Fatalf("failed OK response: %v", err)
-		}
-
-		var cfg raftCfgResponse
-		dec := json.NewDecoder(resp.Body)
-		if err := dec.Decode(&cfg); err != nil {
-			r.Fatal(err)
-		}
-
-		for _, srv := range cfg.Servers {
-			if srv.ID == s.Config.NodeID {
-				if srv.Voter {
-					return
-				}
-				break
-			}
+		if index < 2 {
+			r.Fatal("consul index should be at least 2")
 		}
-		r.Fatalf("Server is not voting: %#v", cfg.Servers)
 	})
 }
 
diff --git a/sdk/testutil/server_methods.go b/sdk/testutil/server_methods.go
index fef4aa30da6f1..d25e66bc8d632 100644
--- a/sdk/testutil/server_methods.go
+++ b/sdk/testutil/server_methods.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package testutil
 
 import (
diff --git a/sdk/testutil/server_wrapper.go b/sdk/testutil/server_wrapper.go
index daf4685457360..6d847f60c1317 100644
--- a/sdk/testutil/server_wrapper.go
+++ b/sdk/testutil/server_wrapper.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package testutil
 
 import "testing"
diff --git a/sdk/testutil/testlog.go b/sdk/testutil/testlog.go
index 1565509aa3d2c..bb41c4b55a5c5 100644
--- a/sdk/testutil/testlog.go
+++ b/sdk/testutil/testlog.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package testutil
 
 import (
@@ -17,14 +14,14 @@ import (
 // be used by tests to set the log level of a hclog.Logger. Defaults to
 // hclog.Warn if the environment variable is unset, or if the value of the
 // environment variable can not be matched to a log level.
-var TestLogLevel = TestLogLevelWithDefault(hclog.Warn)
+var TestLogLevel = testLogLevel()
 
-func TestLogLevelWithDefault(l hclog.Level) hclog.Level {
+func testLogLevel() hclog.Level {
 	level := hclog.LevelFromString(os.Getenv("TEST_LOG_LEVEL"))
 	if level != hclog.NoLevel {
 		return level
 	}
-	return l
+	return hclog.Warn
 }
 
 func Logger(t TestingTB) hclog.InterceptLogger {
diff --git a/sdk/testutil/types.go b/sdk/testutil/types.go
index e5721d3c9647d..1cd018f4da861 100644
--- a/sdk/testutil/types.go
+++ b/sdk/testutil/types.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 package testutil
 
 // TestingTB is an interface that describes the implementation of the testing object.
diff --git a/sentinel/evaluator.go b/sentinel/evaluator.go
index fd609fff90097..0c83eae7dfc4e 100644
--- a/sentinel/evaluator.go
+++ b/sentinel/evaluator.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package sentinel
 
 // Evaluator wraps the Sentinel evaluator from the HashiCorp Sentinel policy
diff --git a/sentinel/scope.go b/sentinel/scope.go
index 4a6a87e146ab3..17af241182712 100644
--- a/sentinel/scope.go
+++ b/sentinel/scope.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package sentinel
 
 import (
diff --git a/sentinel/sentinel_ce.go b/sentinel/sentinel_ce.go
index e2c4d7fcc7bc3..d4323b3abdb19 100644
--- a/sentinel/sentinel_ce.go
+++ b/sentinel/sentinel_ce.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package sentinel
 
diff --git a/service_os/service.go b/service_os/service.go
index 8a23c093475ae..432baaf2ad8ba 100644
--- a/service_os/service.go
+++ b/service_os/service.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package service_os
 
 var chanGraceExit = make(chan int)
diff --git a/service_os/service_windows.go b/service_os/service_windows.go
index 65c84c21ebe34..80d2e9165b622 100644
--- a/service_os/service_windows.go
+++ b/service_os/service_windows.go
@@ -1,7 +1,5 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build windows
+// +build windows
 
 package service_os
 
diff --git a/snapshot/archive.go b/snapshot/archive.go
index 38aad441bf0ab..b0e9ca5211ba5 100644
--- a/snapshot/archive.go
+++ b/snapshot/archive.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // The archive utilities manage the internal format of a snapshot, which is a
 // tar file with the following contents:
 //
diff --git a/snapshot/archive_test.go b/snapshot/archive_test.go
index 74148b84e8f60..6a6e17d37fb44 100644
--- a/snapshot/archive_test.go
+++ b/snapshot/archive_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package snapshot
 
 import (
diff --git a/snapshot/snapshot.go b/snapshot/snapshot.go
index f09f8870e3253..eafe7076b2b87 100644
--- a/snapshot/snapshot.go
+++ b/snapshot/snapshot.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 // snapshot manages the interactions between Consul and Raft in order to take
 // and restore snapshots for disaster recovery. The internal format of a
 // snapshot is simply a tar file, as described in archive.go.
diff --git a/snapshot/snapshot_test.go b/snapshot/snapshot_test.go
index 4e9701360dfa9..4fb570bb7bcd0 100644
--- a/snapshot/snapshot_test.go
+++ b/snapshot/snapshot_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package snapshot
 
 import (
diff --git a/test-integ/README.md b/test-integ/README.md
deleted file mode 100644
index ebc611efa2bc0..0000000000000
--- a/test-integ/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# test-integ
-
-Go integration tests for consul. `/test/integration` also holds integration tests; they need migrating.
\ No newline at end of file
diff --git a/test-integ/go.mod b/test-integ/go.mod
deleted file mode 100644
index f86dfd043330f..0000000000000
--- a/test-integ/go.mod
+++ /dev/null
@@ -1,248 +0,0 @@
-module github.com/hashicorp/consul/test-integ
-
-go 1.20
-
-require (
-	github.com/hashicorp/consul/api v1.24.0
-	github.com/hashicorp/consul/sdk v0.14.1
-	github.com/hashicorp/consul/test/integration/consul-container v0.0.0-20230628201853-bdf4fad7c5a5
-	github.com/hashicorp/consul/testing/deployer v0.0.0-20230811171106-4a0afb5d1373
-	github.com/hashicorp/go-cleanhttp v0.5.2
-	github.com/itchyny/gojq v0.12.13
-	github.com/mitchellh/copystructure v1.2.0
-	github.com/stretchr/testify v1.8.4
-)
-
-require (
-	cloud.google.com/go/compute v1.20.1 // indirect
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/iam v1.1.1 // indirect
-	dario.cat/mergo v1.0.0 // indirect
-	fortio.org/dflag v1.5.2 // indirect
-	fortio.org/fortio v1.54.0 // indirect
-	fortio.org/log v1.3.0 // indirect
-	fortio.org/sets v1.0.2 // indirect
-	fortio.org/version v1.0.2 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
-	github.com/DataDog/datadog-go v4.8.2+incompatible // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/agext/levenshtein v1.2.3 // indirect
-	github.com/aliyun/alibaba-cloud-sdk-go v1.62.156 // indirect
-	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
-	github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e // indirect
-	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/armon/go-radix v1.0.0 // indirect
-	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
-	github.com/avast/retry-go v3.0.0+incompatible // indirect
-	github.com/aws/aws-sdk-go v1.44.289 // indirect
-	github.com/benbjohnson/immutable v0.4.0 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/boltdb/bolt v1.3.1 // indirect
-	github.com/cenkalti/backoff/v3 v3.0.0 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
-	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible // indirect
-	github.com/circonus-labs/circonusllhist v0.1.3 // indirect
-	github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
-	github.com/containerd/containerd v1.7.3 // indirect
-	github.com/coreos/etcd v3.3.27+incompatible // indirect
-	github.com/coreos/go-oidc v2.1.0+incompatible // indirect
-	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
-	github.com/coreos/pkg v0.0.0-20220810130054-c7d1c02cb6cf // indirect
-	github.com/cpuguy83/dockercfg v0.3.1 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/docker/distribution v2.8.2+incompatible // indirect
-	github.com/docker/docker v24.0.5+incompatible // indirect
-	github.com/docker/go-connections v0.4.0 // indirect
-	github.com/docker/go-units v0.5.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
-	github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f // indirect
-	github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
-	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
-	github.com/fatih/color v1.14.1 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-jose/go-jose/v3 v3.0.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/analysis v0.21.4 // indirect
-	github.com/go-openapi/errors v0.20.3 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/loads v0.21.2 // indirect
-	github.com/go-openapi/runtime v0.25.0 // indirect
-	github.com/go-openapi/spec v0.20.8 // indirect
-	github.com/go-openapi/strfmt v0.21.3 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
-	github.com/go-openapi/validate v0.22.1 // indirect
-	github.com/go-ozzo/ozzo-validation v3.6.0+incompatible // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/btree v1.0.1 // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/s2a-go v0.1.4 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
-	github.com/googleapis/gax-go/v2 v2.11.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
-	github.com/hashicorp/consul v1.16.1 // indirect
-	github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706 // indirect
-	github.com/hashicorp/consul-net-rpc v0.0.0-20221205195236-156cfab66a69 // indirect
-	github.com/hashicorp/consul/envoyextensions v0.4.1 // indirect
-	github.com/hashicorp/consul/proto-public v0.4.1 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-bexpr v0.1.2 // indirect
-	github.com/hashicorp/go-connlimit v0.3.0 // indirect
-	github.com/hashicorp/go-hclog v1.5.0 // indirect
-	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/go-memdb v1.3.4 // indirect
-	github.com/hashicorp/go-msgpack v1.1.5 // indirect
-	github.com/hashicorp/go-msgpack/v2 v2.0.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-plugin v1.4.5 // indirect
-	github.com/hashicorp/go-raftchunking v0.7.0 // indirect
-	github.com/hashicorp/go-retryablehttp v0.6.7 // indirect
-	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
-	github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6 // indirect
-	github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 // indirect
-	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
-	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
-	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
-	github.com/hashicorp/go-syslog v1.0.0 // indirect
-	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/hashicorp/go-version v1.2.1 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/hcl/v2 v2.16.2 // indirect
-	github.com/hashicorp/hcp-scada-provider v0.2.3 // indirect
-	github.com/hashicorp/hcp-sdk-go v0.61.0 // indirect
-	github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038 // indirect
-	github.com/hashicorp/memberlist v0.5.0 // indirect
-	github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0 // indirect
-	github.com/hashicorp/raft v1.5.0 // indirect
-	github.com/hashicorp/raft-autopilot v0.1.6 // indirect
-	github.com/hashicorp/raft-boltdb/v2 v2.2.2 // indirect
-	github.com/hashicorp/raft-wal v0.3.0 // indirect
-	github.com/hashicorp/serf v0.10.1 // indirect
-	github.com/hashicorp/vault-plugin-auth-alicloud v0.14.0 // indirect
-	github.com/hashicorp/vault/api v1.8.3 // indirect
-	github.com/hashicorp/vault/api/auth/gcp v0.3.0 // indirect
-	github.com/hashicorp/vault/sdk v0.7.0 // indirect
-	github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
-	github.com/imdario/mergo v0.3.15 // indirect
-	github.com/itchyny/timefmt-go v0.1.5 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.16.7 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/miekg/dns v1.1.50 // indirect
-	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/go-testing-interface v1.14.0 // indirect
-	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
-	github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452 // indirect
-	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/mitchellh/pointerstructure v1.2.1 // indirect
-	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/moby/patternmatcher v0.5.0 // indirect
-	github.com/moby/sys/sequential v0.5.0 // indirect
-	github.com/moby/term v0.5.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/oklog/run v1.0.0 // indirect
-	github.com/oklog/ulid v1.3.1 // indirect
-	github.com/oklog/ulid/v2 v2.1.0 // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
-	github.com/opencontainers/runc v1.1.8 // indirect
-	github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
-	github.com/otiai10/copy v1.10.0 // indirect
-	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
-	github.com/prometheus/client_golang v1.14.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.39.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
-	github.com/rboyer/safeio v0.2.3 // indirect
-	github.com/ryanuber/go-glob v1.0.0 // indirect
-	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
-	github.com/segmentio/fasthash v1.0.3 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
-	github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 // indirect
-	github.com/testcontainers/testcontainers-go v0.22.0 // indirect
-	github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 // indirect
-	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
-	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/zclconf/go-cty v1.12.1 // indirect
-	go.etcd.io/bbolt v1.3.7 // indirect
-	go.mongodb.org/mongo-driver v1.11.0 // indirect
-	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/otel v1.16.0 // indirect
-	go.opentelemetry.io/otel/metric v1.16.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.16.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
-	go.opentelemetry.io/otel/trace v1.16.0 // indirect
-	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	golang.org/x/crypto v0.12.0 // indirect
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/net v0.14.0 // indirect
-	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/term v0.11.0 // indirect
-	golang.org/x/text v0.12.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
-	google.golang.org/api v0.126.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
-	google.golang.org/grpc v1.57.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.66.2 // indirect
-	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.26.2 // indirect
-	k8s.io/apimachinery v0.26.2 // indirect
-	k8s.io/client-go v0.26.2 // indirect
-	k8s.io/klog/v2 v2.90.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
-)
-
-replace (
-	github.com/hashicorp/consul => ../
-	github.com/hashicorp/consul/api => ../api
-	github.com/hashicorp/consul/envoyextensions => ../envoyextensions
-	github.com/hashicorp/consul/proto-public => ../proto-public
-	github.com/hashicorp/consul/sdk => ../sdk
-	github.com/hashicorp/consul/test/integration/consul-container => ../test/integration/consul-container
-	github.com/hashicorp/consul/testing/deployer => ../testing/deployer
-)
diff --git a/test-integ/go.sum b/test-integ/go.sum
deleted file mode 100644
index e5edc4188f32a..0000000000000
--- a/test-integ/go.sum
+++ /dev/null
@@ -1,1343 +0,0 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
-cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
-cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
-cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
-cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
-cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
-cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
-cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
-cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
-cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
-cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute v1.20.1 h1:6aKEtlUiwEpJzM001l0yFkpXmUVXaN8W+fbkb2AZNbg=
-cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
-cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
-cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y=
-cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
-dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-fortio.org/assert v1.1.4 h1:Za1RaG+OjsTMpQS3J3UCvTF6wc4+IOHCz+jAOU37Y4o=
-fortio.org/dflag v1.5.2 h1:F9XVRj4Qr2IbJP7BMj7XZc9wB0Q/RZ61Ool+4YPVad8=
-fortio.org/dflag v1.5.2/go.mod h1:ppb/A8u+KKg+qUUYZNYuvRnXuVb8IsdHb/XGzsmjkN8=
-fortio.org/fortio v1.54.0 h1:2jn8yTd6hcIEoKY4CjI0lI6XxTWVxsMYF2bMiWOmv+Y=
-fortio.org/fortio v1.54.0/go.mod h1:SRaZbikL31UoAkw0On2hwpvHrQ0rRVnsAz3UGVNvMRw=
-fortio.org/log v1.3.0 h1:bESPvuQGKejw7rrx41Sg3GoF+tsrB7oC08PxBs5/AM0=
-fortio.org/log v1.3.0/go.mod h1:u/8/2lyczXq52aT5Nw6reD+3cR6m/EbS2jBiIYhgiTU=
-fortio.org/sets v1.0.2 h1:gSWZFg9rgzl1zJfI/93lDJKBFw8WZ3Uxe3oQ5uDM4T4=
-fortio.org/sets v1.0.2/go.mod h1:xVjulHr0FhlmReSymI+AhDtQ4FgjiazQ3JmuNpYFMs8=
-fortio.org/version v1.0.2 h1:8NwxdX58aoeKx7T5xAPO0xlUu1Hpk42nRz5s6e6eKZ0=
-fortio.org/version v1.0.2/go.mod h1:2JQp9Ax+tm6QKiGuzR5nJY63kFeANcgrZ0osoQFDVm0=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic=
-github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
-github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/DataDog/datadog-go v4.8.2+incompatible h1:qbcKSx29aBLD+5QLvlQZlGmRMF/FfGqFLFev/1TDzRo=
-github.com/DataDog/datadog-go v4.8.2+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
-github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
-github.com/Microsoft/hcsshim v0.10.0-rc.8 h1:YSZVvlIIDD1UxQpJp0h+dnpLUw+TrY0cx8obKsp3bek=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
-github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/aliyun/alibaba-cloud-sdk-go v1.62.156 h1:K4N91T1+RlSlx+t2dujeDviy4ehSGVjEltluDgmeHS4=
-github.com/aliyun/alibaba-cloud-sdk-go v1.62.156/go.mod h1:Api2AkmMgGaSUAhmk76oaFObkoeCPc/bKAqcyplPODs=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
-github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod h1:3AMJUQhVx52RsWOnlkpikZr01T/yAVN2gn0861vByNg=
-github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
-github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
-github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
-github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
-github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
-github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
-github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0=
-github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
-github.com/aws/aws-sdk-go v1.30.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.44.289 h1:5CVEjiHFvdiVlKPBzv0rjG4zH/21W/onT18R5AH/qx0=
-github.com/aws/aws-sdk-go v1.44.289/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
-github.com/benbjohnson/immutable v0.4.0 h1:CTqXbEerYso8YzVPxmWxh2gnoRQbbB9X1quUC8+vGZA=
-github.com/benbjohnson/immutable v0.4.0/go.mod h1:iAr8OjJGLnLmVUr9MZ/rz4PWUy6Ouc2JLYuMArmvAJM=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
-github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
-github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
-github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
-github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
-github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
-github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible h1:C29Ae4G5GtYyYMm1aztcyj/J5ckgJm2zwdDajFbx1NY=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
-github.com/circonus-labs/circonusllhist v0.1.3 h1:TJH+oke8D16535+jHExHj4nQvzlZrj7ug5D7I/orNUA=
-github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
-github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/containerd/containerd v1.7.3 h1:cKwYKkP1eTj54bP3wCdXXBymmKRQMrWjkLSWZZJDa8o=
-github.com/containerd/containerd v1.7.3/go.mod h1:32FOM4/O0RkNg7AjQj3hDzN9cUGtu+HMvaKUNiqCZB8=
-github.com/coreos/etcd v3.3.27+incompatible h1:QIudLb9KeBsE5zyYxd1mjzRSkzLg9Wf9QlRwFgd6oTA=
-github.com/coreos/etcd v3.3.27+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM=
-github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
-github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
-github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/pkg v0.0.0-20220810130054-c7d1c02cb6cf h1:GOPo6vn/vTN+3IwZBvXX0y5doJfSC7My0cdzelyOCsQ=
-github.com/coreos/pkg v0.0.0-20220810130054-c7d1c02cb6cf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/cpuguy83/dockercfg v0.3.1 h1:/FpZ+JaygUR/lZP2NlFI2DVfrOEMAIKP5wWEJdoYe9E=
-github.com/cpuguy83/dockercfg v0.3.1/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
-github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
-github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY=
-github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
-github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
-github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
-github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
-github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
-github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f h1:7T++XKzy4xg7PKy+bM+Sa9/oe1OC88yz2hXQUISoXfA=
-github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f/go.mod h1:sfYdkwUW4BA3PbKjySwjJy+O4Pu0h62rlqCMHNk+K+Q=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.10.1 h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8=
-github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
-github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
-github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
-github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
-github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
-github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
-github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk=
-github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
-github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY=
-github.com/go-openapi/analysis v0.21.4 h1:ZDFLvSNxpDaomuCueM0BlSXxpANBlFYiBvr+GXrvIHc=
-github.com/go-openapi/analysis v0.21.4/go.mod h1:4zQ35W4neeZTqh3ol0rv/O8JBbka9QyAgQRPp9y3pfo=
-github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/errors v0.20.3 h1:rz6kiC84sqNQoqrtulzaL/VERgkoCyB6WdEkc2ujzUc=
-github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk=
-github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
-github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
-github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
-github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g=
-github.com/go-openapi/loads v0.21.2 h1:r2a/xFIYeZ4Qd2TnGpWDIQNcP80dIaZgf704za8enro=
-github.com/go-openapi/loads v0.21.2/go.mod h1:Jq58Os6SSGz0rzh62ptiu8Z31I+OTHqmULx5e/gJbNw=
-github.com/go-openapi/runtime v0.25.0 h1:7yQTCdRbWhX8vnIjdzU8S00tBYf7Sg71EBeorlPHvhc=
-github.com/go-openapi/runtime v0.25.0/go.mod h1:Ux6fikcHXyyob6LNWxtE96hWwjBPYF0DXgVFuMTneOs=
-github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I=
-github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
-github.com/go-openapi/spec v0.20.8 h1:ubHmXNY3FCIOinT8RNrrPfGc9t7I1qhPtdOGoG2AxRU=
-github.com/go-openapi/spec v0.20.8/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
-github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg=
-github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k=
-github.com/go-openapi/strfmt v0.21.3 h1:xwhj5X6CjXEZZHMWy1zKJxvW9AfHC9pkyUjLvHtKG7o=
-github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
-github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-openapi/validate v0.22.1 h1:G+c2ub6q47kfX1sOBLwIQwzBVt8qmOAARyo/9Fqs9NU=
-github.com/go-openapi/validate v0.22.1/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg=
-github.com/go-ozzo/ozzo-validation v3.6.0+incompatible h1:msy24VGS42fKO9K1vLz82/GeYW1cILu7Nuuj1N3BBkE=
-github.com/go-ozzo/ozzo-validation v3.6.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU=
-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
-github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
-github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
-github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
-github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
-github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
-github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
-github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28=
-github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo=
-github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk=
-github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
-github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
-github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg=
-github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE=
-github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
-github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
-github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
-github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
-github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
-github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
-github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
-github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
-github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
-github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2 h1:AtvtonGEH/fZK0XPNNBdB6swgy7Iudfx88wzyIpwqJ8=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
-github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4=
-github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 h1:lLT7ZLSzGLI08vc9cpd+tYmNWjdKDqyr/2L+f6U12Fk=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
-github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706 h1:1ZEjnveDe20yFa6lSkfdQZm5BR/b271n0MsB5R2L3us=
-github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706/go.mod h1:1Cs8FlmD1BfSQXJGcFLSV5FuIx1AbJP+EJGdxosoS2g=
-github.com/hashicorp/consul-net-rpc v0.0.0-20221205195236-156cfab66a69 h1:wzWurXrxfSyG1PHskIZlfuXlTSCj1Tsyatp9DtaasuY=
-github.com/hashicorp/consul-net-rpc v0.0.0-20221205195236-156cfab66a69/go.mod h1:svUZZDvotY8zTODknUePc6mZ9pX8nN0ViGwWcUSOBEA=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-bexpr v0.1.2 h1:ijMXI4qERbzxbCnkxmfUtwMyjrrk3y+Vt0MxojNCbBs=
-github.com/hashicorp/go-bexpr v0.1.2/go.mod h1:ANbpTX1oAql27TZkKVeW8p1w8NTdnyzPe/0qqPCKohU=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-connlimit v0.3.0 h1:oAojHGjFxUTTTA8c5XXnDqWJ2HLuWbDiBPTpWvNzvqM=
-github.com/hashicorp/go-connlimit v0.3.0/go.mod h1:OUj9FGL1tPIhl/2RCfzYHrIiWj+VVPGNyVPnUX8AqS0=
-github.com/hashicorp/go-hclog v0.9.1/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
-github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
-github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
-github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
-github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0/go.mod h1:xvb32K2keAc+R8DSFG2IwDcydK9DBQE+fGA5fsw6hSk=
-github.com/hashicorp/go-memdb v1.3.4 h1:XSL3NR682X/cVk2IeV0d70N4DZ9ljI885xAEU8IoK3c=
-github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-msgpack v1.1.5 h1:9byZdVjKTe5mce63pRVNP1L7UAmdHOTEMGehn6KvJWs=
-github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4=
-github.com/hashicorp/go-msgpack/v2 v2.0.0 h1:c1fiLq1LNghmLOry1ipGhvLDi+/zEoaEP2JrE1oFJ9s=
-github.com/hashicorp/go-msgpack/v2 v2.0.0/go.mod h1:JIxYkkFJRDDRSoWQBSh7s9QAVThq+82iWmUpmE4jKak=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
-github.com/hashicorp/go-plugin v1.4.5 h1:oTE/oQR4eghggRg8VY7PAz3dr++VwDNBGCcOfIvHpBo=
-github.com/hashicorp/go-plugin v1.4.5/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
-github.com/hashicorp/go-raftchunking v0.7.0 h1:APNMnCXmTOhumkFv/GpJIbq7HteWF7EnGZ3875lRN0Y=
-github.com/hashicorp/go-raftchunking v0.7.0/go.mod h1:Dg/eBOaJzE0jYKNwNLs5IA5j0OSmL5HoCUiMy3mDmrI=
-github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
-github.com/hashicorp/go-retryablehttp v0.6.7 h1:8/CAEZt/+F7kR7GevNHulKkUjLht3CPmn7egmhieNKo=
-github.com/hashicorp/go-retryablehttp v0.6.7/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
-github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
-github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6 h1:W9WN8p6moV1fjKLkeqEgkAMu5rauy9QeYDAmIaPuuiA=
-github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6/go.mod h1:MpCPSPGLDILGb4JMm94/mMi3YysIqsXzGCzkEZjcjXg=
-github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
-github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 h1:cCRo8gK7oq6A2L6LICkUZ+/a5rLiRXFMf1Qd4xSwxTc=
-github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
-github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
-github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ=
-github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
-github.com/hashicorp/go-secure-stdlib/password v0.1.1/go.mod h1:9hH302QllNwu1o2TGYtSk8I8kTAN0ca1EHpwhm5Mmzo=
-github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U=
-github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
-github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
-github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.1/go.mod h1:l8slYwnJA26yBz+ErHpp2IRCLr0vuOMGBORIz4rRiAs=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
-github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
-github.com/hashicorp/go-syslog v1.0.0 h1:KaodqZuhUoZereWVIYmpUgZysurB1kBLX2j0MwMrUAE=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
-github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
-github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/hcl/v2 v2.16.2 h1:mpkHZh/Tv+xet3sy3F9Ld4FyI2tUpWe9x3XtPx9f1a0=
-github.com/hashicorp/hcl/v2 v2.16.2/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng=
-github.com/hashicorp/hcp-scada-provider v0.2.3 h1:AarYR+/Pcv+cMvPdAlb92uOBmZfEH6ny4+DT+4NY2VQ=
-github.com/hashicorp/hcp-scada-provider v0.2.3/go.mod h1:ZFTgGwkzNv99PLQjTsulzaCplCzOTBh0IUQsPKzrQFo=
-github.com/hashicorp/hcp-sdk-go v0.61.0 h1:x4hJ8SlLI5WCE8Uzcu4q5jfdOEz/hFxfUkhAdoFdzSg=
-github.com/hashicorp/hcp-sdk-go v0.61.0/go.mod h1:xP7wmWAmdMxs/7+ovH3jZn+MCDhHRj50Rn+m7JIY3Ck=
-github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038 h1:n9J0rwVWXDpNd5iZnwY7w4WZyq53/rROeI7OVvLW8Ok=
-github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038/go.mod h1:n2TSygSNwsLJ76m8qFXTSc7beTb+auJxYdqrnoqwZWE=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
-github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM=
-github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
-github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0 h1:kBpVVl1sl3MaSrs97e0+pDQhSrqJv9gVbSUrPpVfl1w=
-github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0/go.mod h1:6pdNz0vo0mF0GvhwDG56O3N18qBrAz/XRIcfINfTbwo=
-github.com/hashicorp/raft v1.1.0/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM=
-github.com/hashicorp/raft v1.2.0/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8=
-github.com/hashicorp/raft v1.3.11/go.mod h1:J8naEwc6XaaCfts7+28whSeRvCqTd6e20BlCU3LtEO4=
-github.com/hashicorp/raft v1.5.0 h1:uNs9EfJ4FwiArZRxxfd/dQ5d33nV31/CdCHArH89hT8=
-github.com/hashicorp/raft v1.5.0/go.mod h1:pKHB2mf/Y25u3AHNSXVRv+yT+WAnmeTX0BwVppVQV+M=
-github.com/hashicorp/raft-autopilot v0.1.6 h1:C1q3RNF2FfXNZfHWbvVAu0QixaQK8K5pX4O5lh+9z4I=
-github.com/hashicorp/raft-autopilot v0.1.6/go.mod h1:Af4jZBwaNOI+tXfIqIdbcAnh/UyyqIMj/pOISIfhArw=
-github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod h1:pNv7Wc3ycL6F5oOWn+tPGo2gWD4a5X+yp/ntwdKLjRk=
-github.com/hashicorp/raft-boltdb v0.0.0-20210409134258-03c10cc3d4ea/go.mod h1:qRd6nFJYYS6Iqnc/8HcUmko2/2Gw8qTFEmxDLii6W5I=
-github.com/hashicorp/raft-boltdb v0.0.0-20220329195025-15018e9b97e0 h1:CO8dBMLH6dvE1jTn/30ZZw3iuPsNfajshWoJTnVc5cc=
-github.com/hashicorp/raft-boltdb/v2 v2.2.2 h1:rlkPtOllgIcKLxVT4nutqlTH2NRFn+tO1wwZk/4Dxqw=
-github.com/hashicorp/raft-boltdb/v2 v2.2.2/go.mod h1:N8YgaZgNJLpZC+h+by7vDu5rzsRgONThTEeUS3zWbfY=
-github.com/hashicorp/raft-wal v0.3.0 h1:Mi6RPoRbsxIIYZryI+bSTXHD97Ua6rIYO51ibYV9bkY=
-github.com/hashicorp/raft-wal v0.3.0/go.mod h1:A6vP5o8hGOs1LHfC1Okh9xPwWDcmb6Vvuz/QyqUXlOE=
-github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
-github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
-github.com/hashicorp/vault-plugin-auth-alicloud v0.14.0 h1:O6tNk0s/arubLUbLeCyaRs5xGo9VwmbQazISY/BfPK4=
-github.com/hashicorp/vault-plugin-auth-alicloud v0.14.0/go.mod h1:We3fJplmALwK1VpjwrLuXr/4QCQHYMdnXLHmLUU6Ntg=
-github.com/hashicorp/vault/api v1.8.0/go.mod h1:uJrw6D3y9Rv7hhmS17JQC50jbPDAZdjZoTtrCCxxs7E=
-github.com/hashicorp/vault/api v1.8.3 h1:cHQOLcMhBR+aVI0HzhPxO62w2+gJhIrKguQNONPzu6o=
-github.com/hashicorp/vault/api v1.8.3/go.mod h1:4g/9lj9lmuJQMtT6CmVMHC5FW1yENaVv+Nv4ZfG8fAg=
-github.com/hashicorp/vault/api/auth/gcp v0.3.0 h1:taum+3pCmOXnNgEKHlQbmgXmKw5daWHk7YJrLPP/w8g=
-github.com/hashicorp/vault/api/auth/gcp v0.3.0/go.mod h1:gnNBFOASYUaFunedTHOzdir7vKcHL3skWBUzEn263bo=
-github.com/hashicorp/vault/sdk v0.6.0/go.mod h1:+DRpzoXIdMvKc88R4qxr+edwy/RvH5QK8itmxLiDHLc=
-github.com/hashicorp/vault/sdk v0.7.0 h1:2pQRO40R1etpKkia5fb4kjrdYMx3BHklPxl1pxpxDHg=
-github.com/hashicorp/vault/sdk v0.7.0/go.mod h1:KyfArJkhooyba7gYCKSq8v66QdqJmnbAxtV/OX1+JTs=
-github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
-github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 h1:xixZ2bWeofWV68J+x6AzmKuVM/JWCQwkWm6GW/MUR6I=
-github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
-github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/itchyny/gojq v0.12.13 h1:IxyYlHYIlspQHHTE0f3cJF0NKDMfajxViuhBLnHd/QU=
-github.com/itchyny/gojq v0.12.13/go.mod h1:JzwzAqenfhrPUuwbmEz3nu3JQmFLlQTQMUcOdnu/Sf4=
-github.com/itchyny/timefmt-go v0.1.5 h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm6GE=
-github.com/itchyny/timefmt-go v0.1.5/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
-github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
-github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
-github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4=
-github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
-github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
-github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
-github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
-github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
-github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
-github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
-github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
-github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
-github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
-github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
-github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/go-testing-interface v1.14.0 h1:/x0XQ6h+3U3nAyk1yx+bHPURrKa9sVVvYbuqZ7pIAtI=
-github.com/mitchellh/go-testing-interface v1.14.0/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
-github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
-github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
-github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
-github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452 h1:hOY53G+kBFhbYFpRVxHl5eS7laP6B1+Cq+Z9Dry1iMU=
-github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ=
-github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
-github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/pointerstructure v1.2.1 h1:ZhBBeX8tSlRpu/FFhXH4RC4OJzFlqsQhoHZAz4x7TIw=
-github.com/mitchellh/pointerstructure v1.2.1/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4=
-github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
-github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
-github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
-github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
-github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=
-github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
-github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
-github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
-github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
-github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
-github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
-github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/oklog/ulid/v2 v2.1.0 h1:+9lhoxAP56we25tyYETBBY1YLA2SaoLvUFgrP2miPJU=
-github.com/oklog/ulid/v2 v2.1.0/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
-github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
-github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys=
-github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
-github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.0-rc4 h1:oOxKUJWnFC4YGHCCMNql1x4YaDfYBTS5Y4x/Cgeo1E0=
-github.com/opencontainers/image-spec v1.1.0-rc4/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
-github.com/opencontainers/runc v1.1.8 h1:zICRlc+C1XzivLc3nzE+cbJV4LIi8tib6YG0MqC6OqA=
-github.com/opencontainers/runc v1.1.8/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b h1:FfH+VrHHk6Lxt9HdVS0PXzSXFyS2NbZKXv33FYPol0A=
-github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b/go.mod h1:AC62GU6hc0BrNm+9RK9VSiwa/EUe1bkIeFORAMcHvJU=
-github.com/otiai10/copy v1.10.0 h1:znyI7l134wNg/wDktoVQPxPkgvhDfGCYUasey+h0rDQ=
-github.com/otiai10/copy v1.10.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww=
-github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
-github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
-github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
-github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM=
-github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 h1:J9b7z+QKAmPf4YLrFg6oQUotqHQeUNWwkvo7jZp1GLU=
-github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
-github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
-github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
-github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI=
-github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
-github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
-github.com/rboyer/safeio v0.2.3 h1:gUybicx1kp8nuM4vO0GA5xTBX58/OBd8MQuErBfDxP8=
-github.com/rboyer/safeio v0.2.3/go.mod h1:d7RMmt7utQBJZ4B7f0H/cU/EdZibQAU1Y8NWepK2dS8=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
-github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM=
-github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY=
-github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
-github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 h1:xzABM9let0HLLqFypcxvLmlvEciCHL7+Lv+4vwZqecI=
-github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569/go.mod h1:2Ly+NIftZN4de9zRmENdYbvPQeaVIYKWpLFStLFEBgI=
-github.com/testcontainers/testcontainers-go v0.22.0 h1:hOK4NzNu82VZcKEB1aP9LO1xYssVFMvlfeuDW9JMmV0=
-github.com/testcontainers/testcontainers-go v0.22.0/go.mod h1:k0YiPa26xJCRUbUkYqy5rY6NGvSbVCeUBXCvucscBR4=
-github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
-github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 h1:G3dpKMzFDjgEh2q1Z7zUUtKa8ViPtH+ocF0bE0g00O8=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
-github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
-github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
-github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
-github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
-github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
-github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
-github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
-github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
-github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
-github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
-github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
-github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/zclconf/go-cty v1.12.1 h1:PcupnljUm9EIvbgSHQnHhUr3fO6oFmkOrvs2BAFNXXY=
-github.com/zclconf/go-cty v1.12.1/go.mod h1:s9IfD1LK5ccNMSWCVFCE2rJfHiZgi7JijgeWIMfhLvA=
-go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
-go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
-go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
-go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg=
-go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=
-go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8=
-go.mongodb.org/mongo-driver v1.11.0 h1:FZKhBSTydeuffHj9CBjXlR8vQLee1cQyTWYPA6/tqiE=
-go.mongodb.org/mongo-driver v1.11.0/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
-go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s=
-go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4=
-go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo=
-go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4=
-go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE=
-go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4=
-go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI=
-go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI=
-go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs=
-go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw=
-go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
-go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
-go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0=
-go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
-go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
-golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
-golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
-golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
-golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
-golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
-golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=
-golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
-golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 h1:Vve/L0v7CXXuxUmaMGIEK/dEeq7uiqb5qBgQrZzIE7E=
-golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
-google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
-google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
-google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
-google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
-google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
-google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
-google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
-google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
-google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o=
-google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
-google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
-google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
-google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e h1:xIXmWJ303kJCuogpj0bHq+dcjcZHU+XFyc1I0Yl9cRg=
-google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:0ggbjUrZYpy1q+ANUS30SEoGZ53cdfwtbuG7Ptgy108=
-google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 h1:XVeBY8d/FaK4848myy41HBqnDwvxeV3zMZhwN1TvAMU=
-google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:mPBs5jNgx2GuQGvFwUvVKqtn6HsUw9nP64BedgvqEsQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 h1:eSaPbMR4T7WfH9FvABk36NBMacoTUKdWCvV0dx+KfOg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I=
-google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
-google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
-google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw=
-google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
-google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI=
-gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w=
-gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.26.2 h1:dM3cinp3PGB6asOySalOZxEG4CZ0IAdJsrYZXE/ovGQ=
-k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU=
-k8s.io/apimachinery v0.26.2 h1:da1u3D5wfR5u2RpLhE/ZtZS2P7QvDgLZTi9wrNZl/tQ=
-k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
-k8s.io/client-go v0.26.2 h1:s1WkVujHX3kTp4Zn4yGNFK+dlDXy1bAAkIl+cFAiuYI=
-k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU=
-k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
-k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
-k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
-k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 h1:kmDqav+P+/5e1i9tFfHq1qcF3sOrDp+YEkVDAHu7Jwk=
-k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
-sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/test-integ/peering_commontopo/README.md b/test-integ/peering_commontopo/README.md
deleted file mode 100644
index 96466bb29b86f..0000000000000
--- a/test-integ/peering_commontopo/README.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# CONSUL PEERING COMMON TOPOLOGY TESTS
-
-These peering tests all use a `commonTopo` (read: "common topology") to enable sharing a deployment of a Consul. Sharing a deployment of Consul cuts down on setup time.
-
-To run these tests, you will need to have docker installed. Next, make sure that you have all the required consul containers built:
-
-```
-make test-compat-integ-setup
-```
-
-## Non-Shared CommonTopo Tests
-
-The tests in question are designed in a manner that modifies the topology. As a result, it is not possible to share the testing environment across these tests.
-
-## Shared CommonTopo Tests
-
-The tests in question are designed in a manner that does not modify the topology in any way that would interfere with other tests. As a result, it is possible to share the testing environment across these tests.
-
-To run all consul peering tests with no shared topology, run the following command:
-
-```
-cd /path/to/peering_commontopo
-go test -timeout=10m -v -no-share-topo . 
-```
-
-To run all peering tests with shared topology only:
-
-```
-cd /path/to/peering_commontopo
-go test -timeout=10m -run '^TestSuitesOnSharedTopo' -v . 
-```
-
-To run individual peering topology tests:
-
-```
-cd /path/to/peering_commontopo
-go test -timeout=10m -run '^TestSuiteExample' -v -no-share-topo .    
-```
-
-## Local Development and Testing
-
-If writing tests for peering with no shared topology, this recommendation does not apply. The following methods below not necessarily need to be implmented. For shared topology tests, all the methods in the `sharedTopoSuite` interface must be implemented.
-
-- `testName()` prepends the test suite name to each test in the test suite.
-- `setup()` phase must ensure that any resources added to the topology cannot interfere with other tests. Principally by prefixing.
-- `test()` phase must be "passive" and not mutate the topology in any way that would interfere with other tests.
-
-Common topology peering tests are defined in the [test-integ/peering_commontopo/](/test-integ/peering_commontopo/) directory and new peering integration tests should always be added to this location. Adding integration tests that does not modify the topology should always start by invoking
-
-```go
-runShareableSuites(t, testSuiteExample)
-```
-
-else
-
-```go
-func TestSuiteExample(t *testing.T) {
- ct := NewCommonTopo(t)
- s := &testSuiteExample{}
- s.setup(t, ct)
- ct.Launch(t)
- s.test(t, ct)
-}
-```
-
-Some of these tests *do* mutate in their `test()` phase, and while they use `commonTopo` for the purpose of code sharing, they are not included in the "shared topo" tests in `sharedtopology_test.go`.
diff --git a/test-integ/peering_commontopo/ac1_basic_test.go b/test-integ/peering_commontopo/ac1_basic_test.go
deleted file mode 100644
index 85aaee4e6b55b..0000000000000
--- a/test-integ/peering_commontopo/ac1_basic_test.go
+++ /dev/null
@@ -1,275 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package peering
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-
-	"github.com/hashicorp/consul/api"
-)
-
-type ac1BasicSuite struct {
-	// inputs
-	DC   string
-	Peer string
-
-	// test points
-	sidServerHTTP  topology.ServiceID
-	sidServerTCP   topology.ServiceID
-	nodeServerHTTP topology.NodeID
-	nodeServerTCP  topology.NodeID
-
-	// 1.1
-	sidClientTCP  topology.ServiceID
-	nodeClientTCP topology.NodeID
-
-	// 1.2
-	sidClientHTTP  topology.ServiceID
-	nodeClientHTTP topology.NodeID
-
-	upstreamHTTP *topology.Upstream
-	upstreamTCP  *topology.Upstream
-}
-
-var ac1BasicSuites []sharedTopoSuite = []sharedTopoSuite{
-	&ac1BasicSuite{DC: "dc1", Peer: "dc2"},
-	&ac1BasicSuite{DC: "dc2", Peer: "dc1"},
-}
-
-func TestAC1Basic(t *testing.T) {
-	runShareableSuites(t, ac1BasicSuites)
-}
-
-func (s *ac1BasicSuite) testName() string {
-	return fmt.Sprintf("ac1 basic %s->%s", s.DC, s.Peer)
-}
-
-// creates clients in s.DC and servers in s.Peer
-func (s *ac1BasicSuite) setup(t *testing.T, ct *commonTopo) {
-	clu := ct.ClusterByDatacenter(t, s.DC)
-	peerClu := ct.ClusterByDatacenter(t, s.Peer)
-
-	partition := "default"
-	peer := LocalPeerName(peerClu, "default")
-	cluPeerName := LocalPeerName(clu, "default")
-	const prefix = "ac1-"
-
-	tcpServerSID := topology.ServiceID{
-		Name:      prefix + "server-tcp",
-		Partition: partition,
-	}
-	httpServerSID := topology.ServiceID{
-		Name:      prefix + "server-http",
-		Partition: partition,
-	}
-	upstreamHTTP := &topology.Upstream{
-		ID: topology.ServiceID{
-			Name:      httpServerSID.Name,
-			Partition: partition,
-		},
-		LocalPort: 5001,
-		Peer:      peer,
-	}
-	upstreamTCP := &topology.Upstream{
-		ID: topology.ServiceID{
-			Name:      tcpServerSID.Name,
-			Partition: partition,
-		},
-		LocalPort: 5000,
-		Peer:      peer,
-	}
-
-	// Make clients which have server upstreams
-	setupClientServiceAndConfigs := func(protocol string) (serviceExt, *topology.Node) {
-		sid := topology.ServiceID{
-			Name:      prefix + "client-" + protocol,
-			Partition: partition,
-		}
-		svc := serviceExt{
-			Service: NewFortioServiceWithDefaults(
-				clu.Datacenter,
-				sid,
-				func(s *topology.Service) {
-					s.Upstreams = []*topology.Upstream{
-						upstreamTCP,
-						upstreamHTTP,
-					}
-				},
-			),
-			Config: &api.ServiceConfigEntry{
-				Kind:      api.ServiceDefaults,
-				Name:      sid.Name,
-				Partition: ConfigEntryPartition(sid.Partition),
-				Protocol:  protocol,
-				UpstreamConfig: &api.UpstreamConfiguration{
-					Defaults: &api.UpstreamConfig{
-						MeshGateway: api.MeshGatewayConfig{
-							Mode: api.MeshGatewayModeLocal,
-						},
-					},
-				},
-			},
-		}
-
-		node := ct.AddServiceNode(clu, svc)
-
-		return svc, node
-	}
-	tcpClient, tcpClientNode := setupClientServiceAndConfigs("tcp")
-	httpClient, httpClientNode := setupClientServiceAndConfigs("http")
-
-	httpServer := serviceExt{
-		Service: NewFortioServiceWithDefaults(
-			peerClu.Datacenter,
-			httpServerSID,
-			nil,
-		),
-		Config: &api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      httpServerSID.Name,
-			Partition: ConfigEntryPartition(httpServerSID.Partition),
-			Protocol:  "http",
-		},
-		Exports: []api.ServiceConsumer{{Peer: cluPeerName}},
-		Intentions: &api.ServiceIntentionsConfigEntry{
-			Kind:      api.ServiceIntentions,
-			Name:      httpServerSID.Name,
-			Partition: ConfigEntryPartition(httpServerSID.Partition),
-			Sources: []*api.SourceIntention{
-				{
-					Name:   tcpClient.ID.Name,
-					Peer:   cluPeerName,
-					Action: api.IntentionActionAllow,
-				},
-				{
-					Name:   httpClient.ID.Name,
-					Peer:   cluPeerName,
-					Action: api.IntentionActionAllow,
-				},
-			},
-		},
-	}
-	tcpServer := serviceExt{
-		Service: NewFortioServiceWithDefaults(
-			peerClu.Datacenter,
-			tcpServerSID,
-			nil,
-		),
-		Config: &api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      tcpServerSID.Name,
-			Partition: ConfigEntryPartition(tcpServerSID.Partition),
-			Protocol:  "tcp",
-		},
-		Exports: []api.ServiceConsumer{{Peer: cluPeerName}},
-		Intentions: &api.ServiceIntentionsConfigEntry{
-			Kind:      api.ServiceIntentions,
-			Name:      tcpServerSID.Name,
-			Partition: ConfigEntryPartition(tcpServerSID.Partition),
-			Sources: []*api.SourceIntention{
-				{
-					Name:   tcpClient.ID.Name,
-					Peer:   cluPeerName,
-					Action: api.IntentionActionAllow,
-				},
-				{
-					Name:   httpClient.ID.Name,
-					Peer:   cluPeerName,
-					Action: api.IntentionActionAllow,
-				},
-			},
-		},
-	}
-
-	httpServerNode := ct.AddServiceNode(peerClu, httpServer)
-	tcpServerNode := ct.AddServiceNode(peerClu, tcpServer)
-
-	s.sidClientHTTP = httpClient.ID
-	s.nodeClientHTTP = httpClientNode.ID()
-	s.sidClientTCP = tcpClient.ID
-	s.nodeClientTCP = tcpClientNode.ID()
-	s.upstreamHTTP = upstreamHTTP
-	s.upstreamTCP = upstreamTCP
-
-	// these are references in Peer
-	s.sidServerHTTP = httpServerSID
-	s.nodeServerHTTP = httpServerNode.ID()
-	s.sidServerTCP = tcpServerSID
-	s.nodeServerTCP = tcpServerNode.ID()
-}
-
-// implements https://docs.google.com/document/d/1Fs3gNMhCqE4zVNMFcbzf02ZrB0kxxtJpI2h905oKhrs/edit#heading=h.wtzvyryyb56v
-func (s *ac1BasicSuite) test(t *testing.T, ct *commonTopo) {
-	dc := ct.Sprawl.Topology().Clusters[s.DC]
-	peer := ct.Sprawl.Topology().Clusters[s.Peer]
-	ac := s
-
-	// refresh this from Topology
-	svcClientTCP := dc.ServiceByID(
-		ac.nodeClientTCP,
-		ac.sidClientTCP,
-	)
-	svcClientHTTP := dc.ServiceByID(
-		ac.nodeClientHTTP,
-		ac.sidClientHTTP,
-	)
-	// our ac has the node/sid for server in the peer DC
-	svcServerHTTP := peer.ServiceByID(
-		ac.nodeServerHTTP,
-		ac.sidServerHTTP,
-	)
-	svcServerTCP := peer.ServiceByID(
-		ac.nodeServerTCP,
-		ac.sidServerTCP,
-	)
-
-	// preconditions
-	// these could be done parallel with each other, but complexity
-	// probably not worth the speed boost
-	ct.Assert.HealthyWithPeer(t, dc.Name, svcServerHTTP.ID, LocalPeerName(peer, "default"))
-	ct.Assert.HealthyWithPeer(t, dc.Name, svcServerTCP.ID, LocalPeerName(peer, "default"))
-	ct.Assert.UpstreamEndpointHealthy(t, svcClientTCP, ac.upstreamTCP)
-	ct.Assert.UpstreamEndpointHealthy(t, svcClientTCP, ac.upstreamHTTP)
-
-	tcs := []struct {
-		acSub int
-		proto string
-		svc   *topology.Service
-	}{
-		{1, "tcp", svcClientTCP},
-		{2, "http", svcClientHTTP},
-	}
-	for _, tc := range tcs {
-		tc := tc
-		t.Run(fmt.Sprintf("1.%d. %s in A can call HTTP upstream", tc.acSub, tc.proto), func(t *testing.T) {
-			t.Parallel()
-			ct.Assert.FortioFetch2HeaderEcho(t, tc.svc, ac.upstreamHTTP)
-		})
-		t.Run(fmt.Sprintf("1.%d. %s in A can call TCP upstream", tc.acSub, tc.proto), func(t *testing.T) {
-			t.Parallel()
-			ct.Assert.FortioFetch2HeaderEcho(t, tc.svc, ac.upstreamTCP)
-		})
-		t.Run(fmt.Sprintf("1.%d. via %s in A, FORTIO_NAME of HTTP upstream", tc.acSub, tc.proto), func(t *testing.T) {
-			t.Parallel()
-			ct.Assert.FortioFetch2FortioName(t,
-				tc.svc,
-				ac.upstreamHTTP,
-				peer.Name,
-				svcServerHTTP.ID,
-			)
-		})
-		t.Run(fmt.Sprintf("1.%d. via %s in A, FORTIO_NAME of TCP upstream", tc.acSub, tc.proto), func(t *testing.T) {
-			t.Parallel()
-			ct.Assert.FortioFetch2FortioName(t,
-				tc.svc,
-				ac.upstreamTCP,
-				peer.Name,
-				svcServerTCP.ID,
-			)
-		})
-	}
-}
diff --git a/test-integ/peering_commontopo/ac2_disco_chain_test.go b/test-integ/peering_commontopo/ac2_disco_chain_test.go
deleted file mode 100644
index 448ab2840bfea..0000000000000
--- a/test-integ/peering_commontopo/ac2_disco_chain_test.go
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package peering
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/api"
-)
-
-type ac2DiscoChainSuite struct {
-	DC   string
-	Peer string
-
-	clientSID topology.ServiceID
-}
-
-var ac2DiscoChainSuites []sharedTopoSuite = []sharedTopoSuite{
-	&ac2DiscoChainSuite{DC: "dc1", Peer: "dc2"},
-	&ac2DiscoChainSuite{DC: "dc2", Peer: "dc1"},
-}
-
-func TestAC2DiscoChain(t *testing.T) {
-	runShareableSuites(t, ac2DiscoChainSuites)
-}
-
-func (s *ac2DiscoChainSuite) testName() string {
-	return fmt.Sprintf("ac2 disco chain %s->%s", s.DC, s.Peer)
-}
-
-func (s *ac2DiscoChainSuite) setup(t *testing.T, ct *commonTopo) {
-	clu := ct.ClusterByDatacenter(t, s.DC)
-	peerClu := ct.ClusterByDatacenter(t, s.Peer)
-	partition := "default"
-	peer := LocalPeerName(peerClu, "default")
-
-	// Make an HTTP server with discovery chain config entries
-	server := NewFortioServiceWithDefaults(
-		clu.Datacenter,
-		topology.ServiceID{
-			Name:      "ac2-disco-chain-svc",
-			Partition: partition,
-		},
-		nil,
-	)
-	ct.ExportService(clu, partition,
-		api.ExportedService{
-			Name: server.ID.Name,
-			Consumers: []api.ServiceConsumer{
-				{
-					Peer: peer,
-				},
-			},
-		},
-	)
-
-	clu.InitialConfigEntries = append(clu.InitialConfigEntries,
-		&api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      server.ID.Name,
-			Partition: ConfigEntryPartition(partition),
-			Protocol:  "http",
-		},
-		&api.ServiceSplitterConfigEntry{
-			Kind:      api.ServiceSplitter,
-			Name:      server.ID.Name,
-			Partition: ConfigEntryPartition(partition),
-			Splits: []api.ServiceSplit{
-				{
-					Weight: 100.0,
-					ResponseHeaders: &api.HTTPHeaderModifiers{
-						Add: map[string]string{
-							"X-Split": "test",
-						},
-					},
-				},
-			},
-		},
-	)
-	ct.AddServiceNode(clu, serviceExt{Service: server})
-
-	// Define server as upstream for client
-	upstream := &topology.Upstream{
-		ID: topology.ServiceID{
-			Name:      server.ID.Name,
-			Partition: partition, // TODO: iterate over all possible partitions
-		},
-		// TODO: we need to expose this on 0.0.0.0 so we can check it
-		// through our forward proxy. not realistic IMO
-		LocalAddress: "0.0.0.0",
-		LocalPort:    5000,
-		Peer:         peer,
-	}
-
-	// Make client which will dial server
-	clientSID := topology.ServiceID{
-		Name:      "ac2-client",
-		Partition: partition,
-	}
-	client := NewFortioServiceWithDefaults(
-		clu.Datacenter,
-		clientSID,
-		func(s *topology.Service) {
-			s.Upstreams = []*topology.Upstream{
-				upstream,
-			}
-		},
-	)
-	ct.ExportService(clu, partition,
-		api.ExportedService{
-			Name: client.ID.Name,
-			Consumers: []api.ServiceConsumer{
-				{
-					Peer: peer,
-				},
-			},
-		},
-	)
-	ct.AddServiceNode(clu, serviceExt{Service: client})
-
-	clu.InitialConfigEntries = append(clu.InitialConfigEntries,
-		&api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      client.ID.Name,
-			Partition: ConfigEntryPartition(partition),
-			Protocol:  "http",
-			UpstreamConfig: &api.UpstreamConfiguration{
-				Defaults: &api.UpstreamConfig{
-					MeshGateway: api.MeshGatewayConfig{
-						Mode: api.MeshGatewayModeLocal,
-					},
-				},
-			},
-		},
-	)
-
-	// Add intention allowing client to call server
-	clu.InitialConfigEntries = append(clu.InitialConfigEntries,
-		&api.ServiceIntentionsConfigEntry{
-			Kind:      api.ServiceIntentions,
-			Name:      server.ID.Name,
-			Partition: ConfigEntryPartition(partition),
-			Sources: []*api.SourceIntention{
-				{
-					Name:   client.ID.Name,
-					Peer:   peer,
-					Action: api.IntentionActionAllow,
-				},
-			},
-		},
-	)
-
-	s.clientSID = clientSID
-}
-
-func (s *ac2DiscoChainSuite) test(t *testing.T, ct *commonTopo) {
-	dc := ct.Sprawl.Topology().Clusters[s.DC]
-
-	svcs := dc.ServicesByID(s.clientSID)
-	require.Len(t, svcs, 1, "expected exactly one client in datacenter")
-
-	client := svcs[0]
-	require.Len(t, client.Upstreams, 1, "expected exactly one upstream for client")
-	u := client.Upstreams[0]
-
-	t.Run("peered upstream exists in catalog", func(t *testing.T) {
-		t.Parallel()
-		ct.Assert.CatalogServiceExists(t, s.DC, u.ID.Name, &api.QueryOptions{
-			Peer: u.Peer,
-		})
-	})
-
-	t.Run("peered upstream endpoint status is healthy", func(t *testing.T) {
-		t.Parallel()
-		ct.Assert.UpstreamEndpointStatus(t, client, peerClusterPrefix(u), "HEALTHY", 1)
-	})
-
-	t.Run("response contains header injected by splitter", func(t *testing.T) {
-		t.Parallel()
-		// TODO: not sure we should call u.LocalPort? it's not realistic from a security
-		// standpoint. prefer the fortio fetch2 stuff myself
-		ct.Assert.HTTPServiceEchoesResHeader(t, client, u.LocalPort, "",
-			map[string]string{
-				"X-Split": "test",
-			},
-		)
-	})
-}
-
-// For reference see consul/xds/clusters.go:
-//
-//	func (s *ResourceGenerator) getTargetClusterName
-//
-// and connect/sni.go
-func peerClusterPrefix(u *topology.Upstream) string {
-	if u.Peer == "" {
-		panic("upstream is not from a peer")
-	}
-	u.ID.Normalize()
-	return u.ID.Name + "." + u.ID.Namespace + "." + u.Peer + ".external"
-}
diff --git a/test-integ/peering_commontopo/ac3_service_defaults_upstream_test.go b/test-integ/peering_commontopo/ac3_service_defaults_upstream_test.go
deleted file mode 100644
index 586103c111272..0000000000000
--- a/test-integ/peering_commontopo/ac3_service_defaults_upstream_test.go
+++ /dev/null
@@ -1,267 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package peering
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/url"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/hashicorp/go-cleanhttp"
-	"github.com/itchyny/gojq"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
-)
-
-var ac3SvcDefaultsSuites []sharedTopoSuite = []sharedTopoSuite{
-	&ac3SvcDefaultsSuite{DC: "dc1", Peer: "dc2"},
-	&ac3SvcDefaultsSuite{DC: "dc2", Peer: "dc1"},
-}
-
-func TestAC3SvcDefaults(t *testing.T) {
-	runShareableSuites(t, ac3SvcDefaultsSuites)
-}
-
-type ac3SvcDefaultsSuite struct {
-	// inputs
-	DC   string
-	Peer string
-
-	// test points
-	sidServer  topology.ServiceID
-	nodeServer topology.NodeID
-	sidClient  topology.ServiceID
-	nodeClient topology.NodeID
-
-	upstream *topology.Upstream
-}
-
-func (s *ac3SvcDefaultsSuite) testName() string {
-	return fmt.Sprintf("ac3 service defaults upstreams %s->%s", s.DC, s.Peer)
-}
-
-// creates clients in s.DC and servers in s.Peer
-func (s *ac3SvcDefaultsSuite) setup(t *testing.T, ct *commonTopo) {
-	clu := ct.ClusterByDatacenter(t, s.DC)
-	peerClu := ct.ClusterByDatacenter(t, s.Peer)
-
-	partition := "default"
-	peer := LocalPeerName(peerClu, "default")
-	cluPeerName := LocalPeerName(clu, "default")
-
-	serverSID := topology.ServiceID{
-		Name:      "ac3-server",
-		Partition: partition,
-	}
-	upstream := &topology.Upstream{
-		ID: topology.ServiceID{
-			Name:      serverSID.Name,
-			Partition: partition,
-		},
-		LocalPort: 5001,
-		Peer:      peer,
-	}
-
-	sid := topology.ServiceID{
-		Name:      "ac3-client",
-		Partition: partition,
-	}
-	client := serviceExt{
-		Service: NewFortioServiceWithDefaults(
-			clu.Datacenter,
-			sid,
-			func(s *topology.Service) {
-				s.Upstreams = []*topology.Upstream{
-					upstream,
-				}
-			},
-		),
-		Config: &api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      sid.Name,
-			Partition: ConfigEntryPartition(sid.Partition),
-			Protocol:  "http",
-			UpstreamConfig: &api.UpstreamConfiguration{
-				Overrides: []*api.UpstreamConfig{
-					{
-						Name:      upstream.ID.Name,
-						Namespace: upstream.ID.Namespace,
-						Peer:      peer,
-						PassiveHealthCheck: &api.PassiveHealthCheck{
-							MaxFailures: 1,
-							Interval:    10 * time.Minute,
-						},
-					},
-				},
-				Defaults: &api.UpstreamConfig{
-					MeshGateway: api.MeshGatewayConfig{
-						Mode: api.MeshGatewayModeLocal,
-					},
-				},
-			},
-		},
-	}
-
-	clientNode := ct.AddServiceNode(clu, client)
-
-	server := serviceExt{
-		Service: NewFortioServiceWithDefaults(
-			peerClu.Datacenter,
-			serverSID,
-			nil,
-		),
-		Config: &api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      serverSID.Name,
-			Partition: ConfigEntryPartition(serverSID.Partition),
-			Protocol:  "http",
-		},
-		Exports: []api.ServiceConsumer{{Peer: cluPeerName}},
-		Intentions: &api.ServiceIntentionsConfigEntry{
-			Kind:      api.ServiceIntentions,
-			Name:      serverSID.Name,
-			Partition: ConfigEntryPartition(serverSID.Partition),
-			Sources: []*api.SourceIntention{
-				{
-					Name:   client.ID.Name,
-					Peer:   cluPeerName,
-					Action: api.IntentionActionAllow,
-				},
-			},
-		},
-	}
-
-	serverNode := ct.AddServiceNode(peerClu, server)
-
-	s.sidClient = client.ID
-	s.nodeClient = clientNode.ID()
-	s.upstream = upstream
-
-	// these are references in Peer
-	s.sidServer = serverSID
-	s.nodeServer = serverNode.ID()
-}
-
-// make two requests to upstream via client's fetch2 with status=<nonceStatus>
-// the first time, it should return nonceStatus
-// the second time, we expect the upstream to have been removed from the envoy cluster,
-// and thereby get some other 5xx
-func (s *ac3SvcDefaultsSuite) test(t *testing.T, ct *commonTopo) {
-	dc := ct.Sprawl.Topology().Clusters[s.DC]
-	peer := ct.Sprawl.Topology().Clusters[s.Peer]
-
-	// refresh this from Topology
-	svcClient := dc.ServiceByID(
-		s.nodeClient,
-		s.sidClient,
-	)
-	// our ac has the node/sid for server in the peer DC
-	svcServer := peer.ServiceByID(
-		s.nodeServer,
-		s.sidServer,
-	)
-
-	// preconditions
-	// these could be done parallel with each other, but complexity
-	// probably not worth the speed boost
-	ct.Assert.HealthyWithPeer(t, dc.Name, svcServer.ID, LocalPeerName(peer, "default"))
-	ct.Assert.UpstreamEndpointHealthy(t, svcClient, s.upstream)
-	// TODO: we need to let the upstream start serving properly before we do this. if it
-	// isn't ready and returns a 5xx (which it will do if it's not up yet!), it will stick
-	// in a down state for PassiveHealthCheck.Interval
-	time.Sleep(30 * time.Second)
-	ct.Assert.FortioFetch2HeaderEcho(t, svcClient, s.upstream)
-
-	// TODO: use proxied HTTP client
-	client := cleanhttp.DefaultClient()
-	// TODO: what is default? namespace? partition?
-	clusterName := fmt.Sprintf("%s.default.%s.external", s.upstream.ID.Name, s.upstream.Peer)
-	nonceStatus := http.StatusInsufficientStorage
-	url507 := fmt.Sprintf("http://localhost:%d/fortio/fetch2?url=%s", svcClient.ExposedPort,
-		url.QueryEscape(fmt.Sprintf("http://localhost:%d/?status=%d", s.upstream.LocalPort, nonceStatus)),
-	)
-
-	// we only make this call once
-	req, err := http.NewRequest(http.MethodGet, url507, nil)
-	require.NoError(t, err)
-	res, err := client.Do(req)
-	require.NoError(t, err)
-	defer res.Body.Close()
-	require.Equal(t, nonceStatus, res.StatusCode)
-
-	// this is a modified version of assertEnvoyUpstreamHealthy
-	envoyAddr := fmt.Sprintf("localhost:%d", svcClient.ExposedEnvoyAdminPort)
-	retry.RunWith(&retry.Timer{Timeout: 30 * time.Second, Wait: 500 * time.Millisecond}, t, func(r *retry.R) {
-		// BOOKMARK: avoid libassert, but we need to resurrect this method in asserter first
-		clusters, statusCode, err := libassert.GetEnvoyOutputWithClient(client, envoyAddr, "clusters", map[string]string{"format": "json"})
-		if err != nil {
-			r.Fatal("could not fetch envoy clusters")
-		}
-		require.Equal(r, 200, statusCode)
-
-		filter := fmt.Sprintf(
-			`.cluster_statuses[]
-			| select(.name|contains("%s"))
-			| [.host_statuses[].health_status.failed_outlier_check]
-			|.[0]`,
-			clusterName)
-		result, err := jqOne(clusters, filter)
-		require.NoErrorf(r, err, "could not found cluster name %q: %v \n%s", clusterName, err, clusters)
-
-		resultAsBool, ok := result.(bool)
-		require.True(r, ok)
-		require.True(r, resultAsBool)
-	})
-
-	url200 := fmt.Sprintf("http://localhost:%d/fortio/fetch2?url=%s", svcClient.ExposedPort,
-		url.QueryEscape(fmt.Sprintf("http://localhost:%d/", s.upstream.LocalPort)),
-	)
-	retry.RunWith(&retry.Timer{Timeout: time.Minute * 1, Wait: time.Millisecond * 500}, t, func(r *retry.R) {
-		req, err := http.NewRequest(http.MethodGet, url200, nil)
-		require.NoError(r, err)
-		res, err := client.Do(req)
-		require.NoError(r, err)
-		defer res.Body.Close()
-		require.True(r, res.StatusCode >= 500 && res.StatusCode < 600 && res.StatusCode != nonceStatus)
-	})
-}
-
-// Executes the JQ filter against the given JSON string.
-// Iff there is one result, return that.
-func jqOne(config, filter string) (interface{}, error) {
-	query, err := gojq.Parse(filter)
-	if err != nil {
-		return nil, err
-	}
-
-	var m interface{}
-	err = json.Unmarshal([]byte(config), &m)
-	if err != nil {
-		return nil, err
-	}
-
-	iter := query.Run(m)
-	result := []interface{}{}
-	for {
-		v, ok := iter.Next()
-		if !ok {
-			break
-		}
-		if err, ok := v.(error); ok {
-			return nil, err
-		}
-		result = append(result, v)
-	}
-	if len(result) != 1 {
-		return nil, fmt.Errorf("required result of len 1, but is %d: %v", len(result), result)
-	}
-	return result[0], nil
-}
diff --git a/test-integ/peering_commontopo/ac4_proxy_defaults_test.go b/test-integ/peering_commontopo/ac4_proxy_defaults_test.go
deleted file mode 100644
index c413820c6f2b7..0000000000000
--- a/test-integ/peering_commontopo/ac4_proxy_defaults_test.go
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package peering
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-	"testing"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/hashicorp/go-cleanhttp"
-	"github.com/stretchr/testify/require"
-)
-
-type ac4ProxyDefaultsSuite struct {
-	DC   string
-	Peer string
-
-	nodeClient topology.NodeID
-	nodeServer topology.NodeID
-
-	serverSID topology.ServiceID
-	clientSID topology.ServiceID
-	upstream  *topology.Upstream
-}
-
-var ac4ProxyDefaultsSuites []sharedTopoSuite = []sharedTopoSuite{
-	&ac4ProxyDefaultsSuite{DC: "dc1", Peer: "dc2"},
-	&ac4ProxyDefaultsSuite{DC: "dc2", Peer: "dc1"},
-}
-
-func TestAC4ProxyDefaults(t *testing.T) {
-	runShareableSuites(t, ac4ProxyDefaultsSuites)
-}
-
-func (s *ac4ProxyDefaultsSuite) testName() string {
-	return fmt.Sprintf("ac4 proxy defaults %s->%s", s.DC, s.Peer)
-}
-
-// creates clients in s.DC and servers in s.Peer
-func (s *ac4ProxyDefaultsSuite) setup(t *testing.T, ct *commonTopo) {
-	clu := ct.ClusterByDatacenter(t, s.DC)
-	peerClu := ct.ClusterByDatacenter(t, s.Peer)
-
-	partition := "default"
-	peer := LocalPeerName(peerClu, "default")
-	cluPeerName := LocalPeerName(clu, "default")
-
-	serverSID := topology.ServiceID{
-		Name:      "ac4-server-http",
-		Partition: partition,
-	}
-	// Define server as upstream for client
-	upstream := &topology.Upstream{
-		ID:        serverSID,
-		LocalPort: 5000,
-		Peer:      peer,
-	}
-
-	// Make client which will dial server
-	clientSID := topology.ServiceID{
-		Name:      "ac4-http-client",
-		Partition: partition,
-	}
-	client := serviceExt{
-		Service: NewFortioServiceWithDefaults(
-			clu.Datacenter,
-			clientSID,
-			func(s *topology.Service) {
-				s.Upstreams = []*topology.Upstream{
-					upstream,
-				}
-			},
-		),
-		Config: &api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      clientSID.Name,
-			Partition: ConfigEntryPartition(clientSID.Partition),
-			Protocol:  "http",
-			UpstreamConfig: &api.UpstreamConfiguration{
-				Defaults: &api.UpstreamConfig{
-					MeshGateway: api.MeshGatewayConfig{
-						Mode: api.MeshGatewayModeLocal,
-					},
-				},
-			},
-		},
-	}
-	clientNode := ct.AddServiceNode(clu, client)
-
-	server := serviceExt{
-		Service: NewFortioServiceWithDefaults(
-			peerClu.Datacenter,
-			serverSID,
-			nil,
-		),
-		Config: &api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      serverSID.Name,
-			Partition: ConfigEntryPartition(serverSID.Partition),
-			Protocol:  "http",
-		},
-		Exports: []api.ServiceConsumer{{Peer: cluPeerName}},
-		Intentions: &api.ServiceIntentionsConfigEntry{
-			Kind:      api.ServiceIntentions,
-			Name:      serverSID.Name,
-			Partition: ConfigEntryPartition(serverSID.Partition),
-			Sources: []*api.SourceIntention{
-				{
-					Name:   client.ID.Name,
-					Peer:   cluPeerName,
-					Action: api.IntentionActionAllow,
-				},
-			},
-		},
-	}
-
-	peerClu.InitialConfigEntries = append(peerClu.InitialConfigEntries,
-		&api.ProxyConfigEntry{
-			Kind:      api.ProxyDefaults,
-			Name:      api.ProxyConfigGlobal,
-			Partition: ConfigEntryPartition(server.ID.Partition),
-			Config: map[string]interface{}{
-				"protocol":                 "http",
-				"local_request_timeout_ms": 500,
-			},
-			MeshGateway: api.MeshGatewayConfig{
-				Mode: api.MeshGatewayModeLocal,
-			},
-		},
-	)
-
-	serverNode := ct.AddServiceNode(peerClu, server)
-
-	s.clientSID = clientSID
-	s.serverSID = serverSID
-	s.nodeServer = serverNode.ID()
-	s.nodeClient = clientNode.ID()
-	s.upstream = upstream
-}
-
-func (s *ac4ProxyDefaultsSuite) test(t *testing.T, ct *commonTopo) {
-	var client *topology.Service
-
-	dc := ct.Sprawl.Topology().Clusters[s.DC]
-	peer := ct.Sprawl.Topology().Clusters[s.Peer]
-
-	clientSVC := dc.ServiceByID(
-		s.nodeClient,
-		s.clientSID,
-	)
-	serverSVC := peer.ServiceByID(
-		s.nodeServer,
-		s.serverSID,
-	)
-
-	// preconditions check
-	ct.Assert.HealthyWithPeer(t, dc.Name, serverSVC.ID, LocalPeerName(peer, "default"))
-	ct.Assert.UpstreamEndpointHealthy(t, clientSVC, s.upstream)
-	ct.Assert.FortioFetch2HeaderEcho(t, clientSVC, s.upstream)
-
-	t.Run("Validate services exist in catalog", func(t *testing.T) {
-		dcSvcs := dc.ServicesByID(s.clientSID)
-		require.Len(t, dcSvcs, 1, "expected exactly one client")
-		client = dcSvcs[0]
-		require.Len(t, client.Upstreams, 1, "expected exactly one upstream for client")
-
-		server := dc.ServicesByID(s.serverSID)
-		require.Len(t, server, 1, "expected exactly one server")
-		require.Len(t, server[0].Upstreams, 0, "expected no upstream for server")
-	})
-
-	t.Run("peered upstream exists in catalog", func(t *testing.T) {
-		ct.Assert.CatalogServiceExists(t, s.DC, s.upstream.ID.Name, &api.QueryOptions{
-			Peer: s.upstream.Peer,
-		})
-	})
-
-	t.Run("HTTP service fails due to connection timeout", func(t *testing.T) {
-		url504 := fmt.Sprintf("http://localhost:%d/fortio/fetch2?url=%s", client.ExposedPort,
-			url.QueryEscape(fmt.Sprintf("http://localhost:%d/?delay=1000ms", s.upstream.LocalPort)),
-		)
-
-		url200 := fmt.Sprintf("http://localhost:%d/fortio/fetch2?url=%s", client.ExposedPort,
-			url.QueryEscape(fmt.Sprintf("http://localhost:%d/", s.upstream.LocalPort)),
-		)
-
-		// validate request timeout error where service has 1000ms response delay and
-		// proxy default is set to local_request_timeout_ms: 500ms
-		// return 504
-		httpClient := cleanhttp.DefaultClient()
-		req, err := http.NewRequest(http.MethodGet, url504, nil)
-		require.NoError(t, err)
-
-		res, err := httpClient.Do(req)
-		require.NoError(t, err)
-
-		defer res.Body.Close()
-		require.Equal(t, http.StatusGatewayTimeout, res.StatusCode)
-
-		// validate successful GET request where service has no response delay and
-		// proxy default is set to local_request_timeout_ms: 500ms
-		// return 200
-		req, err = http.NewRequest(http.MethodGet, url200, nil)
-		require.NoError(t, err)
-
-		res, err = httpClient.Do(req)
-		require.NoError(t, err)
-
-		defer res.Body.Close()
-		require.Equal(t, http.StatusOK, res.StatusCode)
-	})
-}
diff --git a/test-integ/peering_commontopo/ac5_1_no_svc_mesh_test.go b/test-integ/peering_commontopo/ac5_1_no_svc_mesh_test.go
deleted file mode 100644
index d564261ed878e..0000000000000
--- a/test-integ/peering_commontopo/ac5_1_no_svc_mesh_test.go
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package peering
-
-import (
-	"fmt"
-
-	"testing"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/stretchr/testify/require"
-)
-
-type ac5_1NoSvcMeshSuite struct {
-	DC   string
-	Peer string
-
-	serverSID topology.ServiceID
-	clientSID topology.ServiceID
-}
-
-var (
-	ac5_1NoSvcMeshSuites []sharedTopoSuite = []sharedTopoSuite{
-		&ac5_1NoSvcMeshSuite{DC: "dc1", Peer: "dc2"},
-		&ac5_1NoSvcMeshSuite{DC: "dc2", Peer: "dc1"},
-	}
-)
-
-func TestAC5ServiceMeshDisabledSuite(t *testing.T) {
-	runShareableSuites(t, ac5_1NoSvcMeshSuites)
-}
-
-func (s *ac5_1NoSvcMeshSuite) testName() string {
-	return fmt.Sprintf("ac5.1 no service mesh %s->%s", s.DC, s.Peer)
-}
-
-// creates clients in s.DC and servers in s.Peer
-func (s *ac5_1NoSvcMeshSuite) setup(t *testing.T, ct *commonTopo) {
-	clu := ct.ClusterByDatacenter(t, s.DC)
-	peerClu := ct.ClusterByDatacenter(t, s.Peer)
-
-	// TODO: handle all partitions
-	partition := "default"
-	peer := LocalPeerName(peerClu, partition)
-
-	serverSID := topology.ServiceID{
-		Name:      "ac5-server-http",
-		Partition: partition,
-	}
-
-	// Make client which will dial server
-	clientSID := topology.ServiceID{
-		Name:      "ac5-http-client",
-		Partition: partition,
-	}
-
-	// disable service mesh for client in s.DC
-	client := serviceExt{
-		Service: NewFortioServiceWithDefaults(
-			clu.Datacenter,
-			clientSID,
-			func(s *topology.Service) {
-				s.EnvoyAdminPort = 0
-				s.DisableServiceMesh = true
-			},
-		),
-		Config: &api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      clientSID.Name,
-			Partition: ConfigEntryPartition(clientSID.Partition),
-			Protocol:  "http",
-		},
-		Exports: []api.ServiceConsumer{{Peer: peer}},
-	}
-	ct.AddServiceNode(clu, client)
-
-	server := serviceExt{
-		Service: NewFortioServiceWithDefaults(
-			clu.Datacenter,
-			serverSID,
-			nil,
-		),
-		Exports: []api.ServiceConsumer{{Peer: peer}},
-	}
-
-	ct.AddServiceNode(clu, server)
-
-	s.clientSID = clientSID
-	s.serverSID = serverSID
-}
-
-func (s *ac5_1NoSvcMeshSuite) test(t *testing.T, ct *commonTopo) {
-	dc := ct.Sprawl.Topology().Clusters[s.DC]
-	peer := ct.Sprawl.Topology().Clusters[s.Peer]
-	cl := ct.APIClientForCluster(t, dc)
-	peerName := LocalPeerName(peer, "default")
-
-	s.testServiceHealthInCatalog(t, ct, cl, peerName)
-	s.testProxyDisabledInDC2(t, cl, peerName)
-}
-
-func (s *ac5_1NoSvcMeshSuite) testServiceHealthInCatalog(t *testing.T, _ *commonTopo, cl *api.Client, peer string) {
-	t.Run("validate service health in catalog", func(t *testing.T) {
-		libassert.CatalogServiceExists(t, cl, s.clientSID.Name, &api.QueryOptions{
-			Peer: peer,
-		})
-		require.NotEqual(t, s.serverSID.Name, s.Peer)
-		assertServiceHealth(t, cl, s.serverSID.Name, 1)
-	})
-}
-
-func (s *ac5_1NoSvcMeshSuite) testProxyDisabledInDC2(t *testing.T, cl *api.Client, peer string) {
-	t.Run("service mesh is disabled", func(t *testing.T) {
-		var (
-			services map[string][]string
-			err      error
-			expected = fmt.Sprintf("%s-sidecar-proxy", s.clientSID.Name)
-		)
-		retry.Run(t, func(r *retry.R) {
-			services, _, err = cl.Catalog().Services(&api.QueryOptions{
-				Peer: peer,
-			})
-			require.NoError(r, err, "error reading service data")
-			require.Greater(r, len(services), 0, "did not find service(s) in catalog")
-		})
-		require.NotContains(t, services, expected, fmt.Sprintf("error: should not create proxy for service: %s", services))
-	})
-}
diff --git a/test-integ/peering_commontopo/ac5_2_pq_failover_test.go b/test-integ/peering_commontopo/ac5_2_pq_failover_test.go
deleted file mode 100644
index 3bf8c9be9ac8b..0000000000000
--- a/test-integ/peering_commontopo/ac5_2_pq_failover_test.go
+++ /dev/null
@@ -1,407 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package peering
-
-import (
-	"fmt"
-	"time"
-
-	"testing"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/stretchr/testify/require"
-)
-
-// 1. Setup: put health service instances in each of the 3 clusters and create the PQ in one of them
-// 2. Execute the PQ: Validate that failover count == 0 and that the pq results come from the local cluster
-// 3. Register a failing TTL health check with the agent managing the service instance in the local cluster
-// 4. Execute the PQ: Validate that failover count == 1 and that the pq results come from the first failover target peer
-// 5. Register a failing TTL health check with the agent managing the service instance in the first failover peer
-// 6. Execute the PQ: Validate that failover count == 2 and that the pq results come from the second failover target
-// 7. Delete failing health check from step 5
-// 8. Repeat step 4
-// 9. Delete failing health check from step 3
-// 10. Repeat step 2
-type ac5_2PQFailoverSuite struct {
-	clientSID  topology.ServiceID
-	serverSID  topology.ServiceID
-	nodeServer topology.NodeID
-}
-
-var ac5_2Context = make(map[nodeKey]ac5_2PQFailoverSuite)
-
-func TestAC5PreparedQueryFailover(t *testing.T) {
-	ct := NewCommonTopo(t)
-	s := &ac5_2PQFailoverSuite{}
-	s.setup(t, ct)
-	ct.Launch(t)
-	s.test(t, ct)
-}
-
-func (s *ac5_2PQFailoverSuite) setup(t *testing.T, ct *commonTopo) {
-	s.setupDC(ct, ct.DC1, ct.DC2)
-	s.setupDC(ct, ct.DC2, ct.DC1)
-	s.setupDC3(ct, ct.DC3, ct.DC1, ct.DC2)
-}
-
-func (s *ac5_2PQFailoverSuite) setupDC(ct *commonTopo, clu, peerClu *topology.Cluster) {
-	// TODO: handle all partitions
-	partition := "default"
-	peer := LocalPeerName(peerClu, partition)
-
-	serverSID := topology.ServiceID{
-		Name:      "ac5-server-http",
-		Partition: partition,
-	}
-
-	clientSID := topology.ServiceID{
-		Name:      "ac5-client-http",
-		Partition: partition,
-	}
-
-	client := serviceExt{
-		Service: NewFortioServiceWithDefaults(
-			clu.Datacenter,
-			clientSID,
-			func(s *topology.Service) {
-				s.EnvoyAdminPort = 0
-				s.DisableServiceMesh = true
-			},
-		),
-		Config: &api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      clientSID.Name,
-			Partition: ConfigEntryPartition(clientSID.Partition),
-			Protocol:  "http",
-		},
-		Exports: []api.ServiceConsumer{{Peer: peer}},
-	}
-
-	ct.AddServiceNode(clu, client)
-
-	server := serviceExt{
-		Service: NewFortioServiceWithDefaults(
-			clu.Datacenter,
-			serverSID,
-			func(s *topology.Service) {
-				s.EnvoyAdminPort = 0
-				s.DisableServiceMesh = true
-			},
-		),
-		Exports: []api.ServiceConsumer{{Peer: peer}},
-	}
-	serverNode := ct.AddServiceNode(clu, server)
-
-	ac5_2Context[nodeKey{clu.Datacenter, partition}] = ac5_2PQFailoverSuite{
-		clientSID:  clientSID,
-		serverSID:  serverSID,
-		nodeServer: serverNode.ID(),
-	}
-}
-
-func (s *ac5_2PQFailoverSuite) setupDC3(ct *commonTopo, clu, peer1, peer2 *topology.Cluster) {
-	var (
-		peers     []string
-		partition = "default"
-	)
-	peers = append(peers, LocalPeerName(peer1, partition), LocalPeerName(peer2, partition))
-
-	serverSID := topology.ServiceID{
-		Name:      "ac5-server-http",
-		Partition: partition,
-	}
-
-	clientSID := topology.ServiceID{
-		Name:      "ac5-client-http",
-		Partition: partition,
-	}
-
-	// disable service mesh for client in DC3
-	client := serviceExt{
-		Service: NewFortioServiceWithDefaults(
-			clu.Datacenter,
-			clientSID,
-			func(s *topology.Service) {
-				s.EnvoyAdminPort = 0
-				s.DisableServiceMesh = true
-			},
-		),
-		Config: &api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      clientSID.Name,
-			Partition: ConfigEntryPartition(clientSID.Partition),
-			Protocol:  "http",
-		},
-		Exports: func() []api.ServiceConsumer {
-			var consumers []api.ServiceConsumer
-			for _, peer := range peers {
-				consumers = append(consumers, api.ServiceConsumer{
-					Peer: peer,
-				})
-			}
-			return consumers
-		}(),
-	}
-
-	ct.AddServiceNode(clu, client)
-
-	server := serviceExt{
-		Service: NewFortioServiceWithDefaults(
-			clu.Datacenter,
-			serverSID,
-			func(s *topology.Service) {
-				s.EnvoyAdminPort = 0
-				s.DisableServiceMesh = true
-			},
-		),
-		Exports: func() []api.ServiceConsumer {
-			var consumers []api.ServiceConsumer
-			for _, peer := range peers {
-				consumers = append(consumers, api.ServiceConsumer{
-					Peer: peer,
-				})
-			}
-			return consumers
-		}(),
-	}
-
-	serverNode := ct.AddServiceNode(clu, server)
-
-	ac5_2Context[nodeKey{clu.Datacenter, partition}] = ac5_2PQFailoverSuite{
-		clientSID:  clientSID,
-		serverSID:  serverSID,
-		nodeServer: serverNode.ID(),
-	}
-}
-
-func (s *ac5_2PQFailoverSuite) createPreparedQuery(t *testing.T, ct *commonTopo, c *api.Client, serviceName, partition string) (*api.PreparedQueryDefinition, *api.PreparedQuery) {
-	var (
-		peers []string
-		err   error
-	)
-	peers = append(peers, LocalPeerName(ct.DC2, partition), LocalPeerName(ct.DC3, partition))
-
-	def := &api.PreparedQueryDefinition{
-		Name: "ac5-prepared-query",
-		Service: api.ServiceQuery{
-			Service:     serviceName,
-			Partition:   ConfigEntryPartition(partition),
-			OnlyPassing: true,
-			Failover: api.QueryFailoverOptions{
-				Targets: func() []api.QueryFailoverTarget {
-					var queryFailoverTargets []api.QueryFailoverTarget
-					for _, peer := range peers {
-						queryFailoverTargets = append(queryFailoverTargets, api.QueryFailoverTarget{
-							Peer: peer,
-						})
-					}
-					return queryFailoverTargets
-				}(),
-			},
-		},
-	}
-
-	query := c.PreparedQuery()
-	def.ID, _, err = query.Create(def, nil)
-	require.NoError(t, err, "error creating prepared query in cluster")
-
-	return def, query
-}
-
-func (s *ac5_2PQFailoverSuite) test(t *testing.T, ct *commonTopo) {
-	partition := "default"
-	dc1 := ct.Sprawl.Topology().Clusters[ct.DC1.Name]
-	dc2 := ct.Sprawl.Topology().Clusters[ct.DC2.Name]
-	dc3 := ct.Sprawl.Topology().Clusters[ct.DC3.Name]
-
-	type testcase struct {
-		cluster       *topology.Cluster
-		peer          *topology.Cluster
-		targetCluster *topology.Cluster
-	}
-	tcs := []testcase{
-		{
-			cluster:       dc1,
-			peer:          dc2,
-			targetCluster: dc3,
-		},
-	}
-	for _, tc := range tcs {
-		client := ct.APIClientForCluster(t, tc.cluster)
-
-		t.Run(fmt.Sprintf("%#v", tc), func(t *testing.T) {
-			svc := ac5_2Context[nodeKey{tc.cluster.Name, partition}]
-			require.NotNil(t, svc.serverSID.Name, "expected service name to not be nil")
-			require.NotNil(t, svc.nodeServer, "expected node server to not be nil")
-
-			assertServiceHealth(t, client, svc.serverSID.Name, 1)
-			def, _ := s.createPreparedQuery(t, ct, client, svc.serverSID.Name, partition)
-			s.testPreparedQueryZeroFailover(t, client, def, tc.cluster)
-			s.testPreparedQuerySingleFailover(t, ct, client, def, tc.cluster, tc.peer, partition)
-			s.testPreparedQueryTwoFailovers(t, ct, client, def, tc.cluster, tc.peer, tc.targetCluster, partition)
-
-			// delete failing health check in peer cluster & validate single failover
-			s.testPQSingleFailover(t, ct, client, def, tc.cluster, tc.peer, partition)
-			// delete failing health check in cluster & validate zero failover
-			s.testPQZeroFailover(t, ct, client, def, tc.cluster, tc.peer, partition)
-		})
-	}
-}
-
-func (s *ac5_2PQFailoverSuite) testPreparedQueryZeroFailover(t *testing.T, cl *api.Client, def *api.PreparedQueryDefinition, cluster *topology.Cluster) {
-	t.Run(fmt.Sprintf("prepared query should not failover %s", cluster.Name), func(t *testing.T) {
-
-		// Validate prepared query exists in cluster
-		queryDef, _, err := cl.PreparedQuery().Get(def.ID, nil)
-		require.NoError(t, err)
-		require.Len(t, queryDef, 1, "expected 1 prepared query")
-		require.Equal(t, 2, len(queryDef[0].Service.Failover.Targets), "expected 2 prepared query failover targets to dc2 and dc3")
-
-		retry.RunWith(&retry.Timer{Timeout: 10 * time.Second, Wait: 500 * time.Millisecond}, t, func(r *retry.R) {
-			queryResult, _, err := cl.PreparedQuery().Execute(def.ID, nil)
-			require.NoError(r, err)
-
-			// expected outcome should show 0 failover
-			require.Equal(r, 0, queryResult.Failovers, "expected 0 prepared query failover")
-			require.Equal(r, cluster.Name, queryResult.Nodes[0].Node.Datacenter, "pq results should come from the local cluster")
-		})
-	})
-}
-
-func (s *ac5_2PQFailoverSuite) testPreparedQuerySingleFailover(t *testing.T, ct *commonTopo, cl *api.Client, def *api.PreparedQueryDefinition, cluster, peerClu *topology.Cluster, partition string) {
-	t.Run(fmt.Sprintf("prepared query with single failover %s", cluster.Name), func(t *testing.T) {
-		cfg := ct.Sprawl.Config()
-		svc := ac5_2Context[nodeKey{cluster.Name, partition}]
-
-		nodeCfg := DisableNode(t, cfg, cluster.Name, svc.nodeServer)
-		require.NoError(t, ct.Sprawl.Relaunch(nodeCfg))
-
-		// assert server health status
-		assertServiceHealth(t, cl, svc.serverSID.Name, 0)
-
-		// Validate prepared query exists in cluster
-		queryDef, _, err := cl.PreparedQuery().Get(def.ID, nil)
-		require.NoError(t, err)
-		require.Len(t, queryDef, 1, "expected 1 prepared query")
-
-		pqFailoverTargets := queryDef[0].Service.Failover.Targets
-		require.Len(t, pqFailoverTargets, 2, "expected 2 prepared query failover targets to dc2 and dc3")
-
-		retry.RunWith(&retry.Timer{Timeout: 10 * time.Second, Wait: 500 * time.Millisecond}, t, func(r *retry.R) {
-			queryResult, _, err := cl.PreparedQuery().Execute(def.ID, nil)
-			require.NoError(r, err)
-
-			require.Equal(r, 1, queryResult.Failovers, "expected 1 prepared query failover")
-			require.Equal(r, peerClu.Name, queryResult.Nodes[0].Node.Datacenter, fmt.Sprintf("the pq results should originate from peer clu %s", peerClu.Name))
-			require.Equal(r, pqFailoverTargets[0].Peer, queryResult.Nodes[0].Checks[0].PeerName,
-				fmt.Sprintf("pq results should come from the first failover target peer %s", pqFailoverTargets[0].Peer))
-		})
-	})
-}
-
-func (s *ac5_2PQFailoverSuite) testPreparedQueryTwoFailovers(t *testing.T, ct *commonTopo, cl *api.Client, def *api.PreparedQueryDefinition, cluster, peerClu, targetCluster *topology.Cluster, partition string) {
-	t.Run(fmt.Sprintf("prepared query with two failovers %s", cluster.Name), func(t *testing.T) {
-		cfg := ct.Sprawl.Config()
-
-		svc := ac5_2Context[nodeKey{peerClu.Name, partition}]
-
-		cfg = DisableNode(t, cfg, peerClu.Name, svc.nodeServer)
-		require.NoError(t, ct.Sprawl.Relaunch(cfg))
-
-		// assert server health status
-		assertServiceHealth(t, cl, ac5_2Context[nodeKey{cluster.Name, partition}].serverSID.Name, 0) // cluster: failing
-		assertServiceHealth(t, cl, svc.serverSID.Name, 0)                                            // peer cluster: failing
-
-		queryDef, _, err := cl.PreparedQuery().Get(def.ID, nil)
-		require.NoError(t, err)
-		require.Len(t, queryDef, 1, "expected 1 prepared query")
-
-		pqFailoverTargets := queryDef[0].Service.Failover.Targets
-		require.Len(t, pqFailoverTargets, 2, "expected 2 prepared query failover targets to dc2 and dc3")
-
-		retry.RunWith(&retry.Timer{Timeout: 10 * time.Second, Wait: 500 * time.Millisecond}, t, func(r *retry.R) {
-			queryResult, _, err := cl.PreparedQuery().Execute(def.ID, nil)
-			require.NoError(r, err)
-			require.Equal(r, 2, queryResult.Failovers, "expected 2 prepared query failover")
-
-			require.Equal(r, targetCluster.Name, queryResult.Nodes[0].Node.Datacenter, fmt.Sprintf("the pq results should originate from cluster %s", targetCluster.Name))
-			require.Equal(r, pqFailoverTargets[1].Peer, queryResult.Nodes[0].Checks[0].PeerName,
-				fmt.Sprintf("pq results should come from the second failover target peer %s", pqFailoverTargets[1].Peer))
-		})
-	})
-}
-
-func (s *ac5_2PQFailoverSuite) testPQSingleFailover(t *testing.T, ct *commonTopo, cl *api.Client, def *api.PreparedQueryDefinition, cluster, peerClu *topology.Cluster, partition string) {
-	t.Run(fmt.Sprintf("delete failing health check in %s and validate single failover %s", peerClu.Name, cluster.Name), func(t *testing.T) {
-		cfg := ct.Sprawl.Config()
-
-		svc := ac5_2Context[nodeKey{peerClu.Name, partition}]
-
-		cfg = EnableNode(t, cfg, peerClu.Name, svc.nodeServer)
-		require.NoError(t, ct.Sprawl.Relaunch(cfg))
-
-		queryDef, _, err := cl.PreparedQuery().Get(def.ID, nil)
-		require.NoError(t, err)
-
-		pqFailoverTargets := queryDef[0].Service.Failover.Targets
-		require.Len(t, pqFailoverTargets, 2, "expected 2 prepared query failover targets to dc2 and dc3")
-
-		retry.RunWith(&retry.Timer{Timeout: 10 * time.Second, Wait: 500 * time.Millisecond}, t, func(r *retry.R) {
-			queryResult, _, err := cl.PreparedQuery().Execute(def.ID, nil)
-			require.NoError(r, err)
-			require.Equal(r, 1, queryResult.Failovers, "expected 1 prepared query failover")
-
-			require.Equal(r, peerClu.Name, queryResult.Nodes[0].Node.Datacenter, fmt.Sprintf("the pq results should originate from cluster %s", peerClu.Name))
-			require.Equal(r, pqFailoverTargets[0].Peer, queryResult.Nodes[0].Checks[0].PeerName,
-				fmt.Sprintf("pq results should come from the second failover target peer %s", pqFailoverTargets[0].Peer))
-		})
-	})
-}
-
-func (s *ac5_2PQFailoverSuite) testPQZeroFailover(t *testing.T, ct *commonTopo, cl *api.Client, def *api.PreparedQueryDefinition, cluster, _ *topology.Cluster, partition string) {
-	t.Run(fmt.Sprintf("delete failing health check in %s and validate zero failover %s", cluster.Name, cluster.Name), func(t *testing.T) {
-		cfg := ct.Sprawl.Config()
-
-		svc := ac5_2Context[nodeKey{cluster.Name, partition}]
-
-		cfg = EnableNode(t, cfg, cluster.Name, svc.nodeServer)
-		require.NoError(t, ct.Sprawl.Relaunch(cfg))
-
-		// assert server health status
-		assertServiceHealth(t, cl, ac5_2Context[nodeKey{cluster.Name, partition}].serverSID.Name, 1) // cluster: passing
-		assertServiceHealth(t, cl, svc.serverSID.Name, 1)                                            // peer cluster: passing
-
-		queryDef, _, err := cl.PreparedQuery().Get(def.ID, nil)
-		require.NoError(t, err)
-
-		pqFailoverTargets := queryDef[0].Service.Failover.Targets
-		require.Len(t, pqFailoverTargets, 2, "expected 2 prepared query failover targets to dc2 and dc3")
-
-		retry.RunWith(&retry.Timer{Timeout: 10 * time.Second, Wait: 500 * time.Millisecond}, t, func(r *retry.R) {
-			queryResult, _, err := cl.PreparedQuery().Execute(def.ID, nil)
-			require.NoError(r, err)
-			// expected outcome should show 0 failover
-			require.Equal(r, 0, queryResult.Failovers, "expected 0 prepared query failover")
-			require.Equal(r, cluster.Name, queryResult.Nodes[0].Node.Datacenter, "pq results should come from the local cluster")
-		})
-	})
-}
-
-// assertServiceHealth checks that a service health status before running tests
-func assertServiceHealth(t *testing.T, cl *api.Client, serverSVC string, count int) {
-	t.Helper()
-	t.Log("validate service health in catalog")
-	retry.RunWith(&retry.Timer{Timeout: time.Second * 20, Wait: time.Millisecond * 500}, t, func(r *retry.R) {
-		svcs, _, err := cl.Health().Service(
-			serverSVC,
-			"",
-			true,
-			nil,
-		)
-		require.NoError(r, err)
-		require.Equal(r, count, len(svcs))
-	})
-}
diff --git a/test-integ/peering_commontopo/ac6_failovers_test.go b/test-integ/peering_commontopo/ac6_failovers_test.go
deleted file mode 100644
index fe3cd181b2032..0000000000000
--- a/test-integ/peering_commontopo/ac6_failovers_test.go
+++ /dev/null
@@ -1,432 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package peering
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-)
-
-// note: unlike other *Suite structs that are per-peering direction,
-// this one is special and does all directions itself, because the
-// setup is not exactly symmetrical
-type ac6FailoversSuite struct {
-	ac6 map[nodeKey]ac6FailoversContext
-}
-type ac6FailoversContext struct {
-	clientSID topology.ServiceID
-	serverSID topology.ServiceID
-
-	// used to remove the node and trigger failover
-	serverNode topology.NodeID
-}
-type nodeKey struct {
-	dc        string
-	partition string
-}
-
-// Note: this test cannot share topo
-func TestAC6Failovers(t *testing.T) {
-	ct := NewCommonTopo(t)
-	s := &ac6FailoversSuite{}
-	s.setup(t, ct)
-	ct.Launch(t)
-	s.test(t, ct)
-}
-
-func (s *ac6FailoversSuite) setup(t *testing.T, ct *commonTopo) {
-	// TODO: update setups to loop through a cluster's partitions+namespaces internally
-	s.setupAC6Failovers(ct, ct.DC1, ct.DC2)
-	s.setupAC6Failovers(ct, ct.DC2, ct.DC1)
-	s.setupAC6FailoversDC3(ct, ct.DC3, ct.DC1, ct.DC2)
-}
-
-// dc1 is peered with dc2 and dc3.
-// dc1 has an ac6-client in "default" and "part1" partitions (only default in CE).
-// ac6-client has a single upstream ac6-failover-svc in its respective partition^.
-//
-// ac6-failover-svc has the following failovers:
-//   - peer-dc2-default
-//   - peer-dc2-part1 (not in CE)
-//   - peer-dc3-default
-//
-// This setup is mirrored from dc2->dc1 as well
-// (both dcs have dc3 as the last failover target)
-//
-// ^NOTE: There are no cross-partition upstreams because MeshGatewayMode = local
-// and failover information gets stripped out by the mesh gateways so we
-// can't test failovers.
-func (s *ac6FailoversSuite) setupAC6Failovers(ct *commonTopo, clu, peerClu *topology.Cluster) {
-	for _, part := range clu.Partitions {
-		partition := part.Name
-
-		// There is a peering per partition in the peered cluster
-		var peers []string
-		for _, peerPart := range peerClu.Partitions {
-			peers = append(peers, LocalPeerName(peerClu, peerPart.Name))
-		}
-
-		// Make an HTTP server with various failover targets
-		serverSID := topology.ServiceID{
-			Name:      "ac6-failover-svc",
-			Partition: partition,
-		}
-		server := NewFortioServiceWithDefaults(
-			clu.Datacenter,
-			serverSID,
-			nil,
-		)
-		// Export to all known peers
-		ct.ExportService(clu, partition,
-			api.ExportedService{
-				Name: server.ID.Name,
-				Consumers: func() []api.ServiceConsumer {
-					var consumers []api.ServiceConsumer
-					for _, peer := range peers {
-						consumers = append(consumers, api.ServiceConsumer{
-							Peer: peer,
-						})
-					}
-					return consumers
-				}(),
-			},
-		)
-		serverNode := ct.AddServiceNode(clu, serviceExt{Service: server})
-
-		clu.InitialConfigEntries = append(clu.InitialConfigEntries,
-			&api.ServiceConfigEntry{
-				Kind:      api.ServiceDefaults,
-				Name:      server.ID.Name,
-				Partition: ConfigEntryPartition(partition),
-				Protocol:  "http",
-			},
-			&api.ServiceResolverConfigEntry{
-				Kind:      api.ServiceResolver,
-				Name:      server.ID.Name,
-				Partition: ConfigEntryPartition(partition),
-				Failover: map[string]api.ServiceResolverFailover{
-					"*": {
-						Targets: func() []api.ServiceResolverFailoverTarget {
-							// Make a failover target for every partition in the peer cluster
-							var targets []api.ServiceResolverFailoverTarget
-							for _, peer := range peers {
-								targets = append(targets, api.ServiceResolverFailoverTarget{
-									Peer: peer,
-								})
-							}
-							// Just hard code default partition for dc3, since the exhaustive
-							// testing will be done against dc2.
-							targets = append(targets, api.ServiceResolverFailoverTarget{
-								Peer: "peer-dc3-default",
-							})
-							return targets
-						}(),
-					},
-				},
-			},
-		)
-
-		// Make client which will dial server
-		clientSID := topology.ServiceID{
-			Name:      "ac6-client",
-			Partition: partition,
-		}
-		client := NewFortioServiceWithDefaults(
-			clu.Datacenter,
-			clientSID,
-			func(s *topology.Service) {
-				// Upstream per partition
-				s.Upstreams = []*topology.Upstream{
-					{
-						ID: topology.ServiceID{
-							Name:      server.ID.Name,
-							Partition: part.Name,
-						},
-						LocalPort: 5000,
-						// exposed so we can hit it directly
-						// TODO: we shouldn't do this; it's not realistic
-						LocalAddress: "0.0.0.0",
-					},
-				}
-			},
-		)
-		ct.ExportService(clu, partition,
-			api.ExportedService{
-				Name: client.ID.Name,
-				Consumers: func() []api.ServiceConsumer {
-					var consumers []api.ServiceConsumer
-					// Export to each peer
-					for _, peer := range peers {
-						consumers = append(consumers, api.ServiceConsumer{
-							Peer: peer,
-						})
-					}
-					return consumers
-				}(),
-			},
-		)
-		ct.AddServiceNode(clu, serviceExt{Service: client})
-
-		clu.InitialConfigEntries = append(clu.InitialConfigEntries,
-			&api.ServiceConfigEntry{
-				Kind:      api.ServiceDefaults,
-				Name:      client.ID.Name,
-				Partition: ConfigEntryPartition(partition),
-				Protocol:  "http",
-			},
-		)
-
-		// Add intention allowing local and peered clients to call server
-		clu.InitialConfigEntries = append(clu.InitialConfigEntries,
-			&api.ServiceIntentionsConfigEntry{
-				Kind:      api.ServiceIntentions,
-				Name:      server.ID.Name,
-				Partition: ConfigEntryPartition(partition),
-				// SourceIntention for local client and peered clients
-				Sources: func() []*api.SourceIntention {
-					ixns := []*api.SourceIntention{
-						{
-							Name:      client.ID.Name,
-							Partition: ConfigEntryPartition(part.Name),
-							Action:    api.IntentionActionAllow,
-						},
-					}
-					for _, peer := range peers {
-						ixns = append(ixns, &api.SourceIntention{
-							Name:   client.ID.Name,
-							Peer:   peer,
-							Action: api.IntentionActionAllow,
-						})
-					}
-					return ixns
-				}(),
-			},
-		)
-		if s.ac6 == nil {
-			s.ac6 = map[nodeKey]ac6FailoversContext{}
-		}
-		s.ac6[nodeKey{clu.Datacenter, partition}] = struct {
-			clientSID  topology.ServiceID
-			serverSID  topology.ServiceID
-			serverNode topology.NodeID
-		}{
-			clientSID:  clientSID,
-			serverSID:  serverSID,
-			serverNode: serverNode.ID(),
-		}
-	}
-}
-
-func (s *ac6FailoversSuite) setupAC6FailoversDC3(ct *commonTopo, clu, peer1, peer2 *topology.Cluster) {
-	var peers []string
-	for _, part := range peer1.Partitions {
-		peers = append(peers, LocalPeerName(peer1, part.Name))
-	}
-	for _, part := range peer2.Partitions {
-		peers = append(peers, LocalPeerName(peer2, part.Name))
-	}
-
-	partition := "default"
-
-	// Make an HTTP server
-	server := NewFortioServiceWithDefaults(
-		clu.Datacenter,
-		topology.ServiceID{
-			Name:      "ac6-failover-svc",
-			Partition: partition,
-		},
-		nil,
-	)
-
-	ct.AddServiceNode(clu, serviceExt{
-		Service: server,
-		Config: &api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      server.ID.Name,
-			Partition: ConfigEntryPartition(partition),
-			Protocol:  "http",
-		},
-		Intentions: &api.ServiceIntentionsConfigEntry{
-			Kind:      api.ServiceIntentions,
-			Name:      server.ID.Name,
-			Partition: ConfigEntryPartition(partition),
-			Sources: func() []*api.SourceIntention {
-				var ixns []*api.SourceIntention
-				for _, peer := range peers {
-					ixns = append(ixns, &api.SourceIntention{
-						Name:   "ac6-client",
-						Peer:   peer,
-						Action: api.IntentionActionAllow,
-					})
-				}
-				return ixns
-			}(),
-		},
-		Exports: func() []api.ServiceConsumer {
-			var consumers []api.ServiceConsumer
-			for _, peer := range peers {
-				consumers = append(consumers, api.ServiceConsumer{
-					Peer: peer,
-				})
-			}
-			return consumers
-		}(),
-	})
-}
-
-func (s *ac6FailoversSuite) test(t *testing.T, ct *commonTopo) {
-	dc1 := ct.Sprawl.Topology().Clusters["dc1"]
-	dc2 := ct.Sprawl.Topology().Clusters["dc2"]
-
-	type testcase struct {
-		name      string
-		cluster   *topology.Cluster
-		peer      *topology.Cluster
-		partition string
-	}
-	tcs := []testcase{
-		{
-			name:      "dc1 default partition failovers",
-			cluster:   dc1,
-			peer:      dc2, // dc3 is hardcoded
-			partition: "default",
-		},
-		{
-			name:      "dc1 part1 partition failovers",
-			cluster:   dc1,
-			peer:      dc2, // dc3 is hardcoded
-			partition: "part1",
-		},
-		{
-			name:      "dc2 default partition failovers",
-			cluster:   dc2,
-			peer:      dc1, // dc3 is hardcoded
-			partition: "default",
-		},
-		{
-			name:      "dc2 part1 partition failovers",
-			cluster:   dc2,
-			peer:      dc1, // dc3 is hardcoded
-			partition: "part1",
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.name, func(t *testing.T) {
-			// NOTE: *not parallel* because we mutate resources that are shared
-			// between test cases (disable/enable nodes)
-			if !utils.IsEnterprise() && tc.partition != "default" {
-				t.Skip("skipping enterprise test")
-			}
-			partition := tc.partition
-			clu := tc.cluster
-			peerClu := tc.peer
-
-			svcs := clu.ServicesByID(s.ac6[nodeKey{clu.Datacenter, partition}].clientSID)
-			require.Len(t, svcs, 1, "expected exactly one client in datacenter")
-
-			serverSID := s.ac6[nodeKey{clu.Datacenter, partition}].serverSID
-			serverSID.Normalize()
-
-			client := svcs[0]
-			require.Len(t, client.Upstreams, 1, "expected one upstream for client")
-
-			u := client.Upstreams[0]
-			ct.Assert.CatalogServiceExists(t, clu.Name, u.ID.Name, utils.CompatQueryOpts(&api.QueryOptions{
-				Partition: u.ID.Partition,
-			}))
-
-			t.Cleanup(func() {
-				cfg := ct.Sprawl.Config()
-				for _, part := range clu.Partitions {
-					EnableNode(t, cfg, clu.Name, s.ac6[nodeKey{clu.Datacenter, part.Name}].serverNode)
-				}
-				for _, part := range peerClu.Partitions {
-					EnableNode(t, cfg, peerClu.Name, s.ac6[nodeKey{peerClu.Datacenter, part.Name}].serverNode)
-				}
-				require.NoError(t, ct.Sprawl.Relaunch(cfg))
-			})
-
-			fmt.Println("### preconditions")
-			// TODO: deduce this number, instead of hard-coding
-			nFailoverTargets := 4
-			// in CE, we don't have failover targets for non-default partitions
-			if !utils.IsEnterprise() {
-				nFailoverTargets = 3
-			}
-			for i := 0; i < nFailoverTargets; i++ {
-				ct.Assert.UpstreamEndpointStatus(t, client, fmt.Sprintf("failover-target~%d~%s", i, clusterPrefix(u, clu.Datacenter)), "HEALTHY", 1)
-			}
-
-			ct.Assert.FortioFetch2FortioName(t, client, u, clu.Name, serverSID)
-
-			if t.Failed() {
-				t.Fatalf("failed preconditions")
-			}
-
-			fmt.Println("### Failover to peer target")
-			cfg := ct.Sprawl.Config()
-			DisableNode(t, cfg, clu.Name, s.ac6[nodeKey{clu.Datacenter, partition}].serverNode)
-			require.NoError(t, ct.Sprawl.Relaunch(cfg))
-			// Clusters for imported services rely on outlier detection for
-			// failovers, NOT eds_health_status. This means that killing the
-			// node above does not actually make the envoy cluster UNHEALTHY
-			// so we do not assert for it.
-			expectUID := topology.ServiceID{
-				Name:      u.ID.Name,
-				Partition: "default",
-			}
-			expectUID.Normalize()
-			ct.Assert.FortioFetch2FortioName(t, client, u, peerClu.Name, expectUID)
-
-			if utils.IsEnterprise() {
-				fmt.Println("### Failover to peer target in non-default partition")
-				cfg = ct.Sprawl.Config()
-				DisableNode(t, cfg, clu.Name, s.ac6[nodeKey{clu.Datacenter, partition}].serverNode)
-				DisableNode(t, cfg, peerClu.Name, s.ac6[nodeKey{peerClu.Datacenter, "default"}].serverNode)
-				require.NoError(t, ct.Sprawl.Relaunch(cfg))
-				// Retry until outlier_detection deems the cluster
-				// unhealthy and fails over to peer part1.
-				expectUID = topology.ServiceID{
-					Name:      u.ID.Name,
-					Partition: "part1",
-				}
-				expectUID.Normalize()
-				ct.Assert.FortioFetch2FortioName(t, client, u, peerClu.Name, expectUID)
-			}
-
-			fmt.Println("### Failover to dc3 peer target")
-			cfg = ct.Sprawl.Config()
-			DisableNode(t, cfg, clu.Name, s.ac6[nodeKey{clu.Datacenter, partition}].serverNode)
-			// Disable all partitions for peer
-			for _, part := range peerClu.Partitions {
-				DisableNode(t, cfg, peerClu.Name, s.ac6[nodeKey{peerClu.Datacenter, part.Name}].serverNode)
-			}
-			require.NoError(t, ct.Sprawl.Relaunch(cfg))
-			// This will retry until outlier_detection deems the cluster
-			// unhealthy and fails over to dc3.
-			expectUID = topology.ServiceID{
-				Name:      u.ID.Name,
-				Partition: "default",
-			}
-			expectUID.Normalize()
-			ct.Assert.FortioFetch2FortioName(t, client, u, "dc3", expectUID)
-		})
-	}
-}
-
-func clusterPrefix(u *topology.Upstream, dc string) string {
-	u.ID.Normalize()
-	switch u.ID.Partition {
-	case "default":
-		return fmt.Sprintf("%s.%s.%s.internal", u.ID.Name, u.ID.Namespace, dc)
-	default:
-		return fmt.Sprintf("%s.%s.%s.%s.internal-v1", u.ID.Name, u.ID.Namespace, u.ID.Partition, dc)
-	}
-}
diff --git a/test-integ/peering_commontopo/ac7_1_rotate_gw_test.go b/test-integ/peering_commontopo/ac7_1_rotate_gw_test.go
deleted file mode 100644
index 4973cb6d04877..0000000000000
--- a/test-integ/peering_commontopo/ac7_1_rotate_gw_test.go
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package peering
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/api"
-)
-
-// TestRotateGW ensures that peered services continue to be able to talk to their
-// upstreams during a mesh gateway rotation
-// NOTE: because suiteRotateGW needs to mutate the topo, we actually *DO NOT* share a topo
-
-type suiteRotateGW struct {
-	DC   string
-	Peer string
-
-	sidServer  topology.ServiceID
-	nodeServer topology.NodeID
-
-	sidClient  topology.ServiceID
-	nodeClient topology.NodeID
-
-	upstream *topology.Upstream
-
-	newMGWNodeName string
-}
-
-func TestRotateGW(t *testing.T) {
-	suites := []*suiteRotateGW{
-		{DC: "dc1", Peer: "dc2"},
-		{DC: "dc2", Peer: "dc1"},
-	}
-	ct := NewCommonTopo(t)
-	for _, s := range suites {
-		s.setup(t, ct)
-	}
-	ct.Launch(t)
-	for _, s := range suites {
-		s := s
-		t.Run(fmt.Sprintf("%s->%s", s.DC, s.Peer), func(t *testing.T) {
-			// no t.Parallel() due to Relaunch
-			s.test(t, ct)
-		})
-	}
-}
-
-func (s *suiteRotateGW) setup(t *testing.T, ct *commonTopo) {
-	const prefix = "ac7-1-"
-
-	clu := ct.ClusterByDatacenter(t, s.DC)
-	peerClu := ct.ClusterByDatacenter(t, s.Peer)
-	partition := "default"
-	peer := LocalPeerName(peerClu, "default")
-	cluPeerName := LocalPeerName(clu, "default")
-
-	server := NewFortioServiceWithDefaults(
-		peerClu.Datacenter,
-		topology.ServiceID{
-			Name:      prefix + "server-http",
-			Partition: partition,
-		},
-		nil,
-	)
-
-	// Make clients which have server upstreams
-	upstream := &topology.Upstream{
-		ID: topology.ServiceID{
-			Name:      server.ID.Name,
-			Partition: partition,
-		},
-		// TODO: we shouldn't need this, need to investigate
-		LocalAddress: "0.0.0.0",
-		LocalPort:    5001,
-		Peer:         peer,
-	}
-	// create client in us
-	client := NewFortioServiceWithDefaults(
-		clu.Datacenter,
-		topology.ServiceID{
-			Name:      prefix + "client",
-			Partition: partition,
-		},
-		func(s *topology.Service) {
-			s.Upstreams = []*topology.Upstream{
-				upstream,
-			}
-		},
-	)
-	clientNode := ct.AddServiceNode(clu, serviceExt{Service: client,
-		Config: &api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      client.ID.Name,
-			Partition: ConfigEntryPartition(client.ID.Partition),
-			Protocol:  "http",
-			UpstreamConfig: &api.UpstreamConfiguration{
-				Defaults: &api.UpstreamConfig{
-					MeshGateway: api.MeshGatewayConfig{
-						Mode: api.MeshGatewayModeLocal,
-					},
-				},
-			},
-		},
-	})
-	// actually to be used by the other pairing
-	serverNode := ct.AddServiceNode(peerClu, serviceExt{
-		Service: server,
-		Config: &api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      server.ID.Name,
-			Partition: ConfigEntryPartition(partition),
-			Protocol:  "http",
-		},
-		Exports: []api.ServiceConsumer{{Peer: cluPeerName}},
-		Intentions: &api.ServiceIntentionsConfigEntry{
-			Kind:      api.ServiceIntentions,
-			Name:      server.ID.Name,
-			Partition: ConfigEntryPartition(partition),
-			Sources: []*api.SourceIntention{
-				{
-					Name:   client.ID.Name,
-					Peer:   cluPeerName,
-					Action: api.IntentionActionAllow,
-				},
-			},
-		},
-	})
-
-	s.sidClient = client.ID
-	s.nodeClient = clientNode.ID()
-	s.upstream = upstream
-	s.sidServer = server.ID
-	s.nodeServer = serverNode.ID()
-
-	// add a second mesh gateway "new"
-	s.newMGWNodeName = fmt.Sprintf("new-%s-default-mgw", clu.Name)
-	nodeKind := topology.NodeKindClient
-	if clu.Datacenter == agentlessDC {
-		nodeKind = topology.NodeKindDataplane
-	}
-	clu.Nodes = append(clu.Nodes, newTopologyMeshGatewaySet(
-		nodeKind,
-		"default",
-		s.newMGWNodeName,
-		1,
-		[]string{clu.Datacenter, "wan"},
-		func(i int, node *topology.Node) {
-			node.Disabled = true
-		},
-	)...)
-}
-
-func (s *suiteRotateGW) test(t *testing.T, ct *commonTopo) {
-	dc := ct.Sprawl.Topology().Clusters[s.DC]
-	peer := ct.Sprawl.Topology().Clusters[s.Peer]
-
-	svcHTTPServer := peer.ServiceByID(
-		s.nodeServer,
-		s.sidServer,
-	)
-	svcHTTPClient := dc.ServiceByID(
-		s.nodeClient,
-		s.sidClient,
-	)
-	ct.Assert.HealthyWithPeer(t, dc.Name, svcHTTPServer.ID, LocalPeerName(peer, "default"))
-
-	ct.Assert.FortioFetch2HeaderEcho(t, svcHTTPClient, s.upstream)
-
-	t.Log("relaunching with new gateways")
-	cfg := ct.Sprawl.Config()
-	for _, n := range dc.Nodes {
-		if strings.HasPrefix(n.Name, s.newMGWNodeName) {
-			n.Disabled = false
-		}
-	}
-	require.NoError(t, ct.Sprawl.Relaunch(cfg))
-	ct.Assert.FortioFetch2HeaderEcho(t, svcHTTPClient, s.upstream)
-
-	t.Log("relaunching without old gateways")
-	cfg = ct.Sprawl.Config()
-	for _, n := range dc.Nodes {
-		if strings.HasPrefix(n.Name, fmt.Sprintf("%s-default-mgw", dc.Name)) {
-			n.Disabled = true
-		}
-	}
-	require.NoError(t, ct.Sprawl.Relaunch(cfg))
-	ct.Assert.FortioFetch2HeaderEcho(t, svcHTTPClient, s.upstream)
-}
diff --git a/test-integ/peering_commontopo/ac7_2_rotate_leader_test.go b/test-integ/peering_commontopo/ac7_2_rotate_leader_test.go
deleted file mode 100644
index a5684ebbc0242..0000000000000
--- a/test-integ/peering_commontopo/ac7_2_rotate_leader_test.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package peering
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/mitchellh/copystructure"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-)
-
-// TestAC7_2RotateLeader ensures that after a leader rotation, information continues to replicate to peers
-// NOTE: because suiteRotateLeader needs to mutate the topo, we actually *DO NOT* share a topo
-type ac7_2RotateLeaderSuite struct {
-	DC   string
-	Peer string
-
-	sidServer  topology.ServiceID
-	nodeServer topology.NodeID
-
-	sidClient  topology.ServiceID
-	nodeClient topology.NodeID
-
-	upstream *topology.Upstream
-}
-
-func TestAC7_2RotateLeader(t *testing.T) {
-	suites := []*ac7_2RotateLeaderSuite{
-		{DC: "dc1", Peer: "dc2"},
-		{DC: "dc2", Peer: "dc1"},
-	}
-	ct := NewCommonTopo(t)
-	for _, s := range suites {
-		s.setup(t, ct)
-	}
-	ct.Launch(t)
-	for _, s := range suites {
-		s := s
-		t.Run(fmt.Sprintf("%s->%s", s.DC, s.Peer), func(t *testing.T) {
-			// no t.Parallel() due to Relaunch
-			s.test(t, ct)
-		})
-	}
-}
-
-// makes client in clu, server in peerClu
-func (s *ac7_2RotateLeaderSuite) setup(t *testing.T, ct *commonTopo) {
-	const prefix = "ac7-2-"
-
-	clu := ct.ClusterByDatacenter(t, s.DC)
-	peerClu := ct.ClusterByDatacenter(t, s.Peer)
-	partition := "default"
-	peer := LocalPeerName(peerClu, "default")
-	cluPeerName := LocalPeerName(clu, "default")
-
-	server := NewFortioServiceWithDefaults(
-		peerClu.Datacenter,
-		topology.ServiceID{
-			Name:      prefix + "server-http",
-			Partition: partition,
-		},
-		nil,
-	)
-
-	// Make clients which have server upstreams
-	upstream := &topology.Upstream{
-		ID: topology.ServiceID{
-			Name:      server.ID.Name,
-			Partition: partition,
-		},
-		LocalPort: 5001,
-		Peer:      peer,
-	}
-	// create client in us
-	client := NewFortioServiceWithDefaults(
-		clu.Datacenter,
-		topology.ServiceID{
-			Name:      prefix + "client",
-			Partition: partition,
-		},
-		func(s *topology.Service) {
-			s.Upstreams = []*topology.Upstream{
-				upstream,
-			}
-		},
-	)
-	clientNode := ct.AddServiceNode(clu, serviceExt{Service: client,
-		Config: &api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      client.ID.Name,
-			Partition: ConfigEntryPartition(client.ID.Partition),
-			Protocol:  "http",
-			UpstreamConfig: &api.UpstreamConfiguration{
-				Defaults: &api.UpstreamConfig{
-					MeshGateway: api.MeshGatewayConfig{
-						Mode: api.MeshGatewayModeLocal,
-					},
-				},
-			},
-		},
-	})
-	// actually to be used by the other pairing
-	serverNode := ct.AddServiceNode(peerClu, serviceExt{
-		Service: server,
-		Config: &api.ServiceConfigEntry{
-			Kind:      api.ServiceDefaults,
-			Name:      server.ID.Name,
-			Partition: ConfigEntryPartition(partition),
-			Protocol:  "http",
-		},
-		Exports: []api.ServiceConsumer{{Peer: cluPeerName}},
-		Intentions: &api.ServiceIntentionsConfigEntry{
-			Kind:      api.ServiceIntentions,
-			Name:      server.ID.Name,
-			Partition: ConfigEntryPartition(partition),
-			Sources: []*api.SourceIntention{
-				{
-					Name:   client.ID.Name,
-					Peer:   cluPeerName,
-					Action: api.IntentionActionAllow,
-				},
-			},
-		},
-	})
-
-	s.sidClient = client.ID
-	s.nodeClient = clientNode.ID()
-	s.upstream = upstream
-	s.sidServer = server.ID
-	s.nodeServer = serverNode.ID()
-}
-
-func (s *ac7_2RotateLeaderSuite) test(t *testing.T, ct *commonTopo) {
-	dc := ct.Sprawl.Topology().Clusters[s.DC]
-	peer := ct.Sprawl.Topology().Clusters[s.Peer]
-	clDC := ct.APIClientForCluster(t, dc)
-	clPeer := ct.APIClientForCluster(t, peer)
-
-	svcServer := peer.ServiceByID(s.nodeServer, s.sidServer)
-	svcClient := dc.ServiceByID(s.nodeClient, s.sidClient)
-	ct.Assert.HealthyWithPeer(t, dc.Name, svcServer.ID, LocalPeerName(peer, "default"))
-
-	ct.Assert.FortioFetch2HeaderEcho(t, svcClient, s.upstream)
-
-	// force leader election
-	rotateLeader(t, clDC)
-	rotateLeader(t, clPeer)
-
-	// unexport httpServer
-	ce, _, err := clPeer.ConfigEntries().Get(api.ExportedServices, s.sidServer.Partition, nil)
-	require.NoError(t, err)
-	// ceAsES = config entry as ExportedServicesConfigEntry
-	ceAsES := ce.(*api.ExportedServicesConfigEntry)
-	origCE, err := copystructure.Copy(ceAsES)
-	require.NoError(t, err)
-	found := 0
-	foundI := 0
-	for i, svc := range ceAsES.Services {
-		if svc.Name == s.sidServer.Name && svc.Namespace == utils.DefaultToEmpty(s.sidServer.Namespace) {
-			found += 1
-			foundI = i
-		}
-	}
-	require.Equal(t, found, 1)
-	// remove found entry
-	ceAsES.Services = append(ceAsES.Services[:foundI], ceAsES.Services[foundI+1:]...)
-	_, _, err = clPeer.ConfigEntries().Set(ceAsES, nil)
-	require.NoError(t, err)
-	t.Cleanup(func() {
-		//restore for next pairing
-		_, _, err = clPeer.ConfigEntries().Set(origCE.(*api.ExportedServicesConfigEntry), nil)
-		require.NoError(t, err)
-	})
-
-	// expect health entry in for peer to disappear
-	retry.RunWith(&retry.Timer{Timeout: time.Minute, Wait: time.Millisecond * 500}, t, func(r *retry.R) {
-		svcs, _, err := clDC.Health().Service(s.sidServer.Name, "", true, utils.CompatQueryOpts(&api.QueryOptions{
-			Partition: s.sidServer.Partition,
-			Namespace: s.sidServer.Namespace,
-			Peer:      LocalPeerName(peer, "default"),
-		}))
-		require.NoError(r, err)
-		assert.Equal(r, len(svcs), 0, "health entry for imported service gone")
-	})
-}
-
-func rotateLeader(t *testing.T, cl *api.Client) {
-	t.Helper()
-	oldLeader := findLeader(t, cl)
-	_, err := cl.Operator().RaftLeaderTransfer("", nil)
-	require.NoError(t, err)
-	retry.RunWith(&retry.Timer{Timeout: 30 * time.Second, Wait: time.Second}, t, func(r *retry.R) {
-		newLeader := findLeader(r, cl)
-		require.NotEqual(r, oldLeader.ID, newLeader.ID)
-	})
-}
-
-func findLeader(t require.TestingT, cl *api.Client) *api.RaftServer {
-	raftConfig, err := cl.Operator().RaftGetConfiguration(nil)
-	require.NoError(t, err)
-	var leader *api.RaftServer
-	for _, svr := range raftConfig.Servers {
-		if svr.Leader {
-			leader = svr
-		}
-	}
-	require.NotNil(t, leader)
-	return leader
-}
diff --git a/test-integ/peering_commontopo/asserter.go b/test-integ/peering_commontopo/asserter.go
deleted file mode 100644
index b5aa71ebae45f..0000000000000
--- a/test-integ/peering_commontopo/asserter.go
+++ /dev/null
@@ -1,296 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package peering
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"regexp"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-)
-
-// asserter is a utility to help in reducing boilerplate in invoking test
-// assertions against consul-topology Sprawl components.
-//
-// The methods should largely take in *topology.Service instances in lieu of
-// ip/ports if there is only one port that makes sense for the assertion (such
-// as use of the envoy admin port 19000).
-//
-// If it's up to the test (like picking an upstream) leave port as an argument
-// but still take the service and use that to grab the local ip from the
-// topology.Node.
-type asserter struct {
-	sp sprawlLite
-}
-
-// *sprawl.Sprawl satisfies this. We don't need anything else.
-type sprawlLite interface {
-	HTTPClientForCluster(clusterName string) (*http.Client, error)
-	APIClientForNode(clusterName string, nid topology.NodeID, token string) (*api.Client, error)
-	APIClientForCluster(clusterName string, token string) (*api.Client, error)
-	Topology() *topology.Topology
-}
-
-// newAsserter creates a new assertion helper for the provided sprawl.
-func newAsserter(sp sprawlLite) *asserter {
-	return &asserter{
-		sp: sp,
-	}
-}
-
-func (a *asserter) mustGetHTTPClient(t *testing.T, cluster string) *http.Client {
-	client, err := a.httpClientFor(cluster)
-	require.NoError(t, err)
-	return client
-}
-
-func (a *asserter) mustGetAPIClient(t *testing.T, cluster string) *api.Client {
-	clu := a.sp.Topology().Clusters[cluster]
-	cl, err := a.sp.APIClientForCluster(clu.Name, "")
-	require.NoError(t, err)
-	return cl
-}
-
-// httpClientFor returns a pre-configured http.Client that proxies requests
-// through the embedded squid instance in each LAN.
-//
-// Use this in methods below to magically pick the right proxied http client
-// given the home of each node being checked.
-func (a *asserter) httpClientFor(cluster string) (*http.Client, error) {
-	client, err := a.sp.HTTPClientForCluster(cluster)
-	if err != nil {
-		return nil, err
-	}
-	return client, nil
-}
-
-// UpstreamEndpointStatus validates that proxy was configured with provided clusterName in the healthStatus
-//
-// Exposes libassert.UpstreamEndpointStatus for use against a Sprawl.
-//
-// NOTE: this doesn't take a port b/c you always want to use the envoy admin port.
-func (a *asserter) UpstreamEndpointStatus(
-	t *testing.T,
-	service *topology.Service,
-	clusterName string,
-	healthStatus string,
-	count int,
-) {
-	t.Helper()
-	node := service.Node
-	ip := node.LocalAddress()
-	port := service.EnvoyAdminPort
-	addr := fmt.Sprintf("%s:%d", ip, port)
-
-	client := a.mustGetHTTPClient(t, node.Cluster)
-	libassert.AssertUpstreamEndpointStatusWithClient(t, client, addr, clusterName, healthStatus, count)
-}
-
-// HTTPServiceEchoes verifies that a post to the given ip/port combination
-// returns the data in the response body. Optional path can be provided to
-// differentiate requests.
-//
-// Exposes libassert.HTTPServiceEchoes for use against a Sprawl.
-//
-// NOTE: this takes a port b/c you may want to reach this via your choice of upstream.
-func (a *asserter) HTTPServiceEchoes(
-	t *testing.T,
-	service *topology.Service,
-	port int,
-	path string,
-) {
-	t.Helper()
-	require.True(t, port > 0)
-
-	node := service.Node
-	ip := node.LocalAddress()
-	addr := fmt.Sprintf("%s:%d", ip, port)
-
-	client := a.mustGetHTTPClient(t, node.Cluster)
-	libassert.HTTPServiceEchoesWithClient(t, client, addr, path)
-}
-
-// HTTPServiceEchoesResHeader verifies that a post to the given ip/port combination
-// returns the data in the response body with expected response headers.
-// Optional path can be provided to differentiate requests.
-//
-// Exposes libassert.HTTPServiceEchoes for use against a Sprawl.
-//
-// NOTE: this takes a port b/c you may want to reach this via your choice of upstream.
-func (a *asserter) HTTPServiceEchoesResHeader(
-	t *testing.T,
-	service *topology.Service,
-	port int,
-	path string,
-	expectedResHeader map[string]string,
-) {
-	t.Helper()
-	require.True(t, port > 0)
-
-	node := service.Node
-	ip := node.LocalAddress()
-	addr := fmt.Sprintf("%s:%d", ip, port)
-
-	client := a.mustGetHTTPClient(t, node.Cluster)
-	libassert.HTTPServiceEchoesResHeaderWithClient(t, client, addr, path, expectedResHeader)
-}
-
-func (a *asserter) HTTPStatus(
-	t *testing.T,
-	service *topology.Service,
-	port int,
-	status int,
-) {
-	t.Helper()
-	require.True(t, port > 0)
-
-	node := service.Node
-	ip := node.LocalAddress()
-	addr := fmt.Sprintf("%s:%d", ip, port)
-
-	client := a.mustGetHTTPClient(t, node.Cluster)
-
-	url := "http://" + addr
-
-	retry.RunWith(&retry.Timer{Timeout: 30 * time.Second, Wait: 500 * time.Millisecond}, t, func(r *retry.R) {
-		resp, err := client.Get(url)
-		if err != nil {
-			r.Fatalf("could not make request to %q: %v", url, err)
-		}
-		defer resp.Body.Close()
-		if resp.StatusCode != status {
-			r.Fatalf("expected status %d, got %d", status, resp.StatusCode)
-		}
-	})
-}
-
-// asserts that the service sid in cluster and exported by peer localPeerName is passing health checks,
-func (a *asserter) HealthyWithPeer(t *testing.T, cluster string, sid topology.ServiceID, peerName string) {
-	t.Helper()
-	cl := a.mustGetAPIClient(t, cluster)
-	retry.RunWith(&retry.Timer{Timeout: time.Minute * 1, Wait: time.Millisecond * 500}, t, func(r *retry.R) {
-		svcs, _, err := cl.Health().Service(
-			sid.Name,
-			"",
-			true,
-			utils.CompatQueryOpts(&api.QueryOptions{
-				Partition: sid.Partition,
-				Namespace: sid.Namespace,
-				Peer:      peerName,
-			}),
-		)
-		require.NoError(r, err)
-		assert.GreaterOrEqual(r, len(svcs), 1)
-	})
-}
-
-func (a *asserter) UpstreamEndpointHealthy(t *testing.T, svc *topology.Service, upstream *topology.Upstream) {
-	t.Helper()
-	node := svc.Node
-	ip := node.LocalAddress()
-	port := svc.EnvoyAdminPort
-	addr := fmt.Sprintf("%s:%d", ip, port)
-
-	client := a.mustGetHTTPClient(t, node.Cluster)
-	libassert.AssertUpstreamEndpointStatusWithClient(t,
-		client,
-		addr,
-		// TODO: what is default? namespace? partition?
-		fmt.Sprintf("%s.default.%s.external", upstream.ID.Name, upstream.Peer),
-		"HEALTHY",
-		1,
-	)
-}
-
-// does a fortio /fetch2 to the given fortio service, targetting the given upstream. Returns
-// the body, and response with response.Body already Closed.
-//
-// We treat 400, 503, and 504s as retryable errors
-func (a *asserter) fortioFetch2Upstream(t *testing.T, fortioSvc *topology.Service, upstream *topology.Upstream, path string) (body []byte, res *http.Response) {
-	t.Helper()
-
-	// TODO: fortioSvc.ID.Normalize()? or should that be up to the caller?
-
-	node := fortioSvc.Node
-	client := a.mustGetHTTPClient(t, node.Cluster)
-	urlbase := fmt.Sprintf("%s:%d", node.LocalAddress(), fortioSvc.Port)
-
-	url := fmt.Sprintf("http://%s/fortio/fetch2?url=%s", urlbase,
-		url.QueryEscape(fmt.Sprintf("http://localhost:%d/%s", upstream.LocalPort, path)),
-	)
-
-	req, err := http.NewRequest(http.MethodPost, url, nil)
-	require.NoError(t, err)
-	retry.RunWith(&retry.Timer{Timeout: 60 * time.Second, Wait: time.Millisecond * 500}, t, func(r *retry.R) {
-		res, err = client.Do(req)
-		require.NoError(r, err)
-		defer res.Body.Close()
-		// not sure when these happen, suspect it's when the mesh gateway in the peer is not yet ready
-		require.NotEqual(r, http.StatusServiceUnavailable, res.StatusCode)
-		require.NotEqual(r, http.StatusGatewayTimeout, res.StatusCode)
-		// not sure when this happens, suspect it's when envoy hasn't configured the local upstream yet
-		require.NotEqual(r, http.StatusBadRequest, res.StatusCode)
-		body, err = io.ReadAll(res.Body)
-		require.NoError(r, err)
-	})
-
-	return body, res
-}
-
-// uses the /fortio/fetch2 endpoint to do a header echo check against an
-// upstream fortio
-func (a *asserter) FortioFetch2HeaderEcho(t *testing.T, fortioSvc *topology.Service, upstream *topology.Upstream) {
-	const kPassphrase = "x-passphrase"
-	const passphrase = "hello"
-	path := (fmt.Sprintf("/?header=%s:%s", kPassphrase, passphrase))
-
-	retry.RunWith(&retry.Timer{Timeout: 60 * time.Second, Wait: time.Millisecond * 500}, t, func(r *retry.R) {
-		_, res := a.fortioFetch2Upstream(t, fortioSvc, upstream, path)
-		require.Equal(t, http.StatusOK, res.StatusCode)
-		v := res.Header.Get(kPassphrase)
-		require.Equal(t, passphrase, v)
-	})
-}
-
-// similar to libassert.AssertFortioName,
-// uses the /fortio/fetch2 endpoint to hit the debug endpoint on the upstream,
-// and assert that the FORTIO_NAME == name
-func (a *asserter) FortioFetch2FortioName(t *testing.T, fortioSvc *topology.Service, upstream *topology.Upstream, clusterName string, sid topology.ServiceID) {
-	t.Helper()
-
-	var fortioNameRE = regexp.MustCompile(("\nFORTIO_NAME=(.+)\n"))
-	path := "/debug?env=dump"
-
-	retry.RunWith(&retry.Timer{Timeout: 60 * time.Second, Wait: time.Millisecond * 500}, t, func(r *retry.R) {
-		body, res := a.fortioFetch2Upstream(t, fortioSvc, upstream, path)
-		require.Equal(t, http.StatusOK, res.StatusCode)
-
-		// TODO: not sure we should retry these?
-		m := fortioNameRE.FindStringSubmatch(string(body))
-		require.GreaterOrEqual(r, len(m), 2)
-		// TODO: dedupe from NewFortioService
-		require.Equal(r, fmt.Sprintf("%s::%s", clusterName, sid.String()), m[1])
-	})
-}
-
-// CatalogServiceExists is the same as libassert.CatalogServiceExists, except that it uses
-// a proxied API client
-func (a *asserter) CatalogServiceExists(t *testing.T, cluster string, svc string, opts *api.QueryOptions) {
-	t.Helper()
-	cl := a.mustGetAPIClient(t, cluster)
-	libassert.CatalogServiceExists(t, cl, svc, opts)
-}
diff --git a/test-integ/peering_commontopo/commontopo.go b/test-integ/peering_commontopo/commontopo.go
deleted file mode 100644
index e43456b231bce..0000000000000
--- a/test-integ/peering_commontopo/commontopo.go
+++ /dev/null
@@ -1,625 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package peering
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"strconv"
-	"testing"
-	"text/tabwriter"
-	"time"
-
-	"github.com/hashicorp/consul/testing/deployer/sprawl"
-	"github.com/hashicorp/consul/testing/deployer/sprawl/sprawltest"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-)
-
-// commonTopo helps create a shareable topology configured to represent
-// the common denominator between tests.
-//
-// Use NewCommonTopo to create.
-//
-// Compatible suites should implement sharedTopoSuite.
-//
-// Style:
-//   - avoid referencing components using strings, prefer IDs like Service ID, etc.
-//   - avoid passing addresses and ports, etc. Instead, look up components in sprawl.Topology
-//     by ID to find a concrete type, then pass that to helper functions that know which port to use
-//   - minimize the surface area of information passed between setup and test code (via members)
-//     to those that are strictly necessary
-type commonTopo struct {
-	//
-	Cfg *topology.Config
-	// shortcuts to corresponding entry in Cfg
-	DC1 *topology.Cluster
-	DC2 *topology.Cluster
-	DC3 *topology.Cluster
-
-	// set after Launch. Should be considered read-only
-	Sprawl *sprawl.Sprawl
-	Assert *asserter
-
-	// track per-DC services to prevent duplicates
-	services map[string]map[topology.ServiceID]struct{}
-}
-
-const agentlessDC = "dc2"
-
-func NewCommonTopo(t *testing.T) *commonTopo {
-	t.Helper()
-
-	ct := commonTopo{}
-
-	const nServers = 3
-
-	// Make 3-server clusters in dc1 and dc2
-	// For simplicity, the Name and Datacenter of the clusters are the same.
-	// dc1 and dc2 should be symmetric.
-	dc1 := clusterWithJustServers("dc1", nServers)
-	ct.DC1 = dc1
-	dc2 := clusterWithJustServers("dc2", nServers)
-	ct.DC2 = dc2
-	// dc3 is a failover cluster for both dc1 and dc2
-	dc3 := clusterWithJustServers("dc3", 1)
-	// dc3 is only used for certain failover scenarios and does not need tenancies
-	dc3.Partitions = []*topology.Partition{{Name: "default"}}
-	ct.DC3 = dc3
-
-	injectTenancies(dc1)
-	injectTenancies(dc2)
-	// dc3 is only used for certain failover scenarios and does not need tenancies
-	dc3.Partitions = []*topology.Partition{{Name: "default"}}
-
-	ct.services = map[string]map[topology.ServiceID]struct{}{}
-	for _, dc := range []*topology.Cluster{dc1, dc2, dc3} {
-		ct.services[dc.Datacenter] = map[topology.ServiceID]struct{}{}
-	}
-
-	peerings := addPeerings(dc1, dc2)
-	peerings = append(peerings, addPeerings(dc1, dc3)...)
-	peerings = append(peerings, addPeerings(dc2, dc3)...)
-
-	addMeshGateways(dc1)
-	addMeshGateways(dc2)
-	addMeshGateways(dc3)
-
-	setupGlobals(dc1)
-	setupGlobals(dc2)
-	setupGlobals(dc3)
-
-	// Build final configuration
-	ct.Cfg = &topology.Config{
-		Images: utils.TargetImages(),
-		Networks: []*topology.Network{
-			{Name: dc1.Datacenter}, // "dc1" LAN
-			{Name: dc2.Datacenter}, // "dc2" LAN
-			{Name: dc3.Datacenter}, // "dc3" LAN
-			{Name: "wan", Type: "wan"},
-		},
-		Clusters: []*topology.Cluster{
-			dc1,
-			dc2,
-			dc3,
-		},
-		Peerings: peerings,
-	}
-	return &ct
-}
-
-// calls sprawltest.Launch followed by s.postLaunchChecks
-func (ct *commonTopo) Launch(t *testing.T) {
-	if ct.Sprawl != nil {
-		t.Fatalf("Launch must only be called once")
-	}
-	ct.Sprawl = sprawltest.Launch(t, ct.Cfg)
-
-	ct.Assert = newAsserter(ct.Sprawl)
-	ct.postLaunchChecks(t)
-}
-
-// tests that use Relaunch might want to call this again afterwards
-func (ct *commonTopo) postLaunchChecks(t *testing.T) {
-	t.Logf("TESTING RELATIONSHIPS: \n%s",
-		renderRelationships(computeRelationships(ct.Sprawl.Topology())),
-	)
-
-	// check that exports line up as expected
-	for _, clu := range ct.Sprawl.Topology().Clusters {
-		// expected exports per peer
-		type key struct {
-			peer      string
-			partition string
-			namespace string
-		}
-		eepp := map[key]int{}
-		for _, e := range clu.InitialConfigEntries {
-			if e.GetKind() == api.ExportedServices {
-				asExport := e.(*api.ExportedServicesConfigEntry)
-				// do we care about the partition?
-				for _, svc := range asExport.Services {
-					for _, con := range svc.Consumers {
-						// do we care about con.Partition?
-						// TODO: surely there is code to normalize this
-						partition := asExport.Partition
-						if partition == "" {
-							partition = "default"
-						}
-						namespace := svc.Namespace
-						if namespace == "" {
-							namespace = "default"
-						}
-						eepp[key{peer: con.Peer, partition: partition, namespace: namespace}] += 1
-					}
-				}
-			}
-		}
-		cl := ct.APIClientForCluster(t, clu)
-		// TODO: these could probably be done in parallel
-		for k, v := range eepp {
-			retry.RunWith(&retry.Timer{Timeout: 30 * time.Second, Wait: 500 * time.Millisecond}, t, func(r *retry.R) {
-				peering, _, err := cl.Peerings().Read(context.Background(), k.peer, utils.CompatQueryOpts(&api.QueryOptions{
-					Partition: k.partition,
-					Namespace: k.namespace,
-				}))
-				require.Nil(r, err, "reading peering data")
-				require.NotNilf(r, peering, "peering not found %q", k.peer)
-				assert.Len(r, peering.StreamStatus.ExportedServices, v, "peering exported services")
-			})
-		}
-	}
-
-	if t.Failed() {
-		t.Fatal("failing fast: post-Launch assertions failed")
-	}
-}
-
-// PeerName is how you'd address a remote dc+partition locally
-// as your peer name.
-func LocalPeerName(clu *topology.Cluster, partition string) string {
-	return fmt.Sprintf("peer-%s-%s", clu.Datacenter, partition)
-}
-
-// TODO: move these to topology
-// TODO: alternatively, delete it: we only use it in one place, to bundle up args
-type serviceExt struct {
-	*topology.Service
-
-	Exports    []api.ServiceConsumer
-	Config     *api.ServiceConfigEntry
-	Intentions *api.ServiceIntentionsConfigEntry
-}
-
-func (ct *commonTopo) AddServiceNode(clu *topology.Cluster, svc serviceExt) *topology.Node {
-	clusterName := clu.Name
-	if _, ok := ct.services[clusterName][svc.ID]; ok {
-		panic(fmt.Sprintf("duplicate service %q in cluster %q", svc.ID, clusterName))
-	}
-	ct.services[clusterName][svc.ID] = struct{}{}
-
-	// TODO: inline
-	serviceHostnameString := func(dc string, id topology.ServiceID) string {
-		n := id.Name
-		// prepend <namespace>- and <partition>- if they are not default/empty
-		// avoids hostname limit of 63 chars in most cases
-		// TODO: this obviously isn't scalable
-		if id.Namespace != "default" && id.Namespace != "" {
-			n = id.Namespace + "-" + n
-		}
-		if id.Partition != "default" && id.Partition != "" {
-			n = id.Partition + "-" + n
-		}
-		n = dc + "-" + n
-		// TODO: experimentally, when this is larger than 63, docker can't start
-		// the host. confirmed by internet rumor https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27763
-		if len(n) > 63 {
-			panic(fmt.Sprintf("docker hostname must not be longer than 63 chars: %q", n))
-		}
-		return n
-	}
-
-	nodeKind := topology.NodeKindClient
-	// TODO: bug in deployer somewhere; it should guard against a KindDataplane node with
-	// DisableServiceMesh services on it; dataplane is only for service-mesh
-	if !svc.DisableServiceMesh && clu.Datacenter == agentlessDC {
-		nodeKind = topology.NodeKindDataplane
-	}
-
-	node := &topology.Node{
-		Kind:      nodeKind,
-		Name:      serviceHostnameString(clu.Datacenter, svc.ID),
-		Partition: svc.ID.Partition,
-		Addresses: []*topology.Address{
-			{Network: clu.Datacenter},
-		},
-		Services: []*topology.Service{
-			svc.Service,
-		},
-		Cluster: clusterName,
-	}
-	clu.Nodes = append(clu.Nodes, node)
-
-	// Export if necessary
-	if len(svc.Exports) > 0 {
-		ct.ExportService(clu, svc.ID.Partition, api.ExportedService{
-			Name:      svc.ID.Name,
-			Namespace: svc.ID.Namespace,
-			Consumers: svc.Exports,
-		})
-	}
-
-	// Add any config entries
-	if svc.Config != nil {
-		clu.InitialConfigEntries = append(clu.InitialConfigEntries, svc.Config)
-	}
-	if svc.Intentions != nil {
-		clu.InitialConfigEntries = append(clu.InitialConfigEntries, svc.Intentions)
-	}
-
-	return node
-}
-
-func (ct *commonTopo) APIClientForCluster(t *testing.T, clu *topology.Cluster) *api.Client {
-	cl, err := ct.Sprawl.APIClientForCluster(clu.Name, "")
-	require.NoError(t, err)
-	return cl
-}
-
-// ExportService looks for an existing ExportedServicesConfigEntry for the given partition
-// and inserts svcs. If none is found, it inserts a new ExportedServicesConfigEntry.
-func (ct *commonTopo) ExportService(clu *topology.Cluster, partition string, svcs ...api.ExportedService) {
-	var found bool
-	for _, ce := range clu.InitialConfigEntries {
-		// We check Name because it must be "default" in CE whereas Partition will be "".
-		if ce.GetKind() == api.ExportedServices && ce.GetName() == partition {
-			found = true
-			e := ce.(*api.ExportedServicesConfigEntry)
-			e.Services = append(e.Services, svcs...)
-		}
-	}
-	if !found {
-		clu.InitialConfigEntries = append(clu.InitialConfigEntries,
-			&api.ExportedServicesConfigEntry{
-				Name:      partition, // this NEEDs to be "default" in CE
-				Partition: ConfigEntryPartition(partition),
-				Services:  svcs,
-			},
-		)
-	}
-}
-
-func (ct *commonTopo) ClusterByDatacenter(t *testing.T, name string) *topology.Cluster {
-	t.Helper()
-
-	for _, clu := range ct.Cfg.Clusters {
-		if clu.Datacenter == name {
-			return clu
-		}
-	}
-	t.Fatalf("cluster %q not found", name)
-	return nil
-}
-
-// Since CE config entries do not contain the partition field,
-// this func converts default partition to empty string.
-func ConfigEntryPartition(p string) string {
-	if p == "default" {
-		return "" // make this CE friendly
-	}
-	return p
-}
-
-// disableNode is a no-op if the node is already disabled.
-func DisableNode(t *testing.T, cfg *topology.Config, clusterName string, nid topology.NodeID) *topology.Config {
-	nodes := cfg.Cluster(clusterName).Nodes
-	var found bool
-	for _, n := range nodes {
-		if n.ID() == nid {
-			found = true
-			if n.Disabled {
-				return cfg
-			}
-			t.Logf("disabling node %s in cluster %s", nid.String(), clusterName)
-			n.Disabled = true
-			break
-		}
-	}
-	require.True(t, found, "expected to find nodeID %q in cluster %q", nid.String(), clusterName)
-	return cfg
-}
-
-// enableNode is a no-op if the node is already enabled.
-func EnableNode(t *testing.T, cfg *topology.Config, clusterName string, nid topology.NodeID) *topology.Config {
-	nodes := cfg.Cluster(clusterName).Nodes
-	var found bool
-	for _, n := range nodes {
-		if n.ID() == nid {
-			found = true
-			if !n.Disabled {
-				return cfg
-			}
-			t.Logf("enabling node %s in cluster %s", nid.String(), clusterName)
-			n.Disabled = false
-			break
-		}
-	}
-	require.True(t, found, "expected to find nodeID %q in cluster %q", nid.String(), clusterName)
-	return cfg
-}
-
-func setupGlobals(clu *topology.Cluster) {
-	for _, part := range clu.Partitions {
-		clu.InitialConfigEntries = append(clu.InitialConfigEntries,
-			&api.ProxyConfigEntry{
-				Name:      api.ProxyConfigGlobal,
-				Kind:      api.ProxyDefaults,
-				Partition: ConfigEntryPartition(part.Name),
-				MeshGateway: api.MeshGatewayConfig{
-					// Although we define service-defaults for most upstreams in
-					// this test suite, failover tests require a global mode
-					// because the default for peered targets is MeshGatewayModeRemote.
-					Mode: api.MeshGatewayModeLocal,
-				},
-			},
-			&api.MeshConfigEntry{
-				Peering: &api.PeeringMeshConfig{
-					PeerThroughMeshGateways: true,
-				},
-			},
-		)
-	}
-}
-
-// addMeshGateways adds a mesh gateway for every partition in the cluster.
-// Assumes that the LAN network name is equal to datacenter name.
-func addMeshGateways(c *topology.Cluster) {
-	nodeKind := topology.NodeKindClient
-	if c.Datacenter == agentlessDC {
-		nodeKind = topology.NodeKindDataplane
-	}
-	for _, p := range c.Partitions {
-		c.Nodes = topology.MergeSlices(c.Nodes, newTopologyMeshGatewaySet(
-			nodeKind,
-			p.Name,
-			fmt.Sprintf("%s-%s-mgw", c.Name, p.Name),
-			1,
-			[]string{c.Datacenter, "wan"},
-			nil,
-		))
-	}
-}
-
-func clusterWithJustServers(name string, numServers int) *topology.Cluster {
-	return &topology.Cluster{
-		Enterprise: utils.IsEnterprise(),
-		Name:       name,
-		Datacenter: name,
-		Nodes: newTopologyServerSet(
-			name+"-server",
-			numServers,
-			[]string{name},
-			nil,
-		),
-	}
-}
-
-func addPeerings(acc *topology.Cluster, dial *topology.Cluster) []*topology.Peering {
-	peerings := []*topology.Peering{}
-	for _, accPart := range acc.Partitions {
-		for _, dialPart := range dial.Partitions {
-			peerings = append(peerings, &topology.Peering{
-				Accepting: topology.PeerCluster{
-					Name:      acc.Datacenter,
-					Partition: accPart.Name,
-					PeerName:  LocalPeerName(dial, dialPart.Name),
-				},
-				Dialing: topology.PeerCluster{
-					Name:      dial.Datacenter,
-					Partition: dialPart.Name,
-					PeerName:  LocalPeerName(acc, accPart.Name),
-				},
-			})
-		}
-	}
-	return peerings
-}
-
-func injectTenancies(clu *topology.Cluster) {
-	if !utils.IsEnterprise() {
-		clu.Partitions = []*topology.Partition{
-			{
-				Name: "default",
-				Namespaces: []string{
-					"default",
-				},
-			},
-		}
-		return
-	}
-
-	for _, part := range []string{"default", "part1"} {
-		clu.Partitions = append(clu.Partitions,
-			&topology.Partition{
-				Name: part,
-				Namespaces: []string{
-					"default",
-					"ns1",
-				},
-			},
-		)
-	}
-}
-
-func newTopologyServerSet(
-	namePrefix string,
-	num int,
-	networks []string,
-	mutateFn func(i int, node *topology.Node),
-) []*topology.Node {
-	var out []*topology.Node
-	for i := 1; i <= num; i++ {
-		name := namePrefix + strconv.Itoa(i)
-
-		node := &topology.Node{
-			Kind: topology.NodeKindServer,
-			Name: name,
-		}
-		for _, net := range networks {
-			node.Addresses = append(node.Addresses, &topology.Address{Network: net})
-		}
-
-		if mutateFn != nil {
-			mutateFn(i, node)
-		}
-
-		out = append(out, node)
-	}
-	return out
-}
-
-func newTopologyMeshGatewaySet(
-	nodeKind topology.NodeKind,
-	partition string,
-	namePrefix string,
-	num int,
-	networks []string,
-	mutateFn func(i int, node *topology.Node),
-) []*topology.Node {
-	var out []*topology.Node
-	for i := 1; i <= num; i++ {
-		name := namePrefix + strconv.Itoa(i)
-
-		node := &topology.Node{
-			Kind:      nodeKind,
-			Partition: partition,
-			Name:      name,
-			Services: []*topology.Service{{
-				ID:             topology.ServiceID{Name: "mesh-gateway"},
-				Port:           8443,
-				EnvoyAdminPort: 19000,
-				IsMeshGateway:  true,
-			}},
-		}
-		for _, net := range networks {
-			node.Addresses = append(node.Addresses, &topology.Address{Network: net})
-		}
-
-		if mutateFn != nil {
-			mutateFn(i, node)
-		}
-
-		out = append(out, node)
-	}
-	return out
-}
-
-const HashicorpDockerProxy = "docker.mirror.hashicorp.services"
-
-func NewFortioServiceWithDefaults(
-	cluster string,
-	sid topology.ServiceID,
-	mut func(s *topology.Service),
-) *topology.Service {
-	const (
-		httpPort  = 8080
-		grpcPort  = 8079
-		adminPort = 19000
-	)
-	sid.Normalize()
-
-	svc := &topology.Service{
-		ID:             sid,
-		Image:          HashicorpDockerProxy + "/fortio/fortio",
-		Port:           httpPort,
-		EnvoyAdminPort: adminPort,
-		CheckTCP:       "127.0.0.1:" + strconv.Itoa(httpPort),
-		Env: []string{
-			"FORTIO_NAME=" + cluster + "::" + sid.String(),
-		},
-		Command: []string{
-			"server",
-			"-http-port", strconv.Itoa(httpPort),
-			"-grpc-port", strconv.Itoa(grpcPort),
-			"-redirect-port", "-disabled",
-		},
-	}
-	if mut != nil {
-		mut(svc)
-	}
-	return svc
-}
-
-// computeRelationships will analyze a full topology and generate all of the
-// downstream/upstream information for all of them.
-func computeRelationships(topo *topology.Topology) []Relationship {
-	var out []Relationship
-	for _, cluster := range topo.Clusters {
-		for _, n := range cluster.Nodes {
-			for _, s := range n.Services {
-				for _, u := range s.Upstreams {
-					out = append(out, Relationship{
-						Caller:   s,
-						Upstream: u,
-					})
-				}
-			}
-		}
-	}
-	return out
-}
-
-// renderRelationships will take the output of ComputeRelationships and display
-// it in tabular form.
-func renderRelationships(ships []Relationship) string {
-	var buf bytes.Buffer
-	w := tabwriter.NewWriter(&buf, 0, 0, 3, ' ', tabwriter.Debug)
-	fmt.Fprintf(w, "DOWN\tnode\tservice\tport\tUP\tservice\t\n")
-	for _, r := range ships {
-		fmt.Fprintf(w,
-			"%s\t%s\t%s\t%d\t%s\t%s\t\n",
-			r.downCluster(),
-			r.Caller.Node.ID().String(),
-			r.Caller.ID.String(),
-			r.Upstream.LocalPort,
-			r.upCluster(),
-			r.Upstream.ID.String(),
-		)
-	}
-	fmt.Fprintf(w, "\t\t\t\t\t\t\n")
-
-	w.Flush()
-	return buf.String()
-}
-
-type Relationship struct {
-	Caller   *topology.Service
-	Upstream *topology.Upstream
-}
-
-func (r Relationship) String() string {
-	return fmt.Sprintf(
-		"%s on %s in %s via :%d => %s in %s",
-		r.Caller.ID.String(),
-		r.Caller.Node.ID().String(),
-		r.downCluster(),
-		r.Upstream.LocalPort,
-		r.Upstream.ID.String(),
-		r.upCluster(),
-	)
-}
-
-func (r Relationship) downCluster() string {
-	return r.Caller.Node.Cluster
-}
-
-func (r Relationship) upCluster() string {
-	return r.Upstream.Cluster
-}
diff --git a/test-integ/peering_commontopo/sharedtopology_test.go b/test-integ/peering_commontopo/sharedtopology_test.go
deleted file mode 100644
index f51b05e41ef78..0000000000000
--- a/test-integ/peering_commontopo/sharedtopology_test.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package peering
-
-import (
-	"flag"
-	"testing"
-)
-
-// Tests that use commonTopo should implement sharedTopoSuite.
-//
-// Tests that use commonTopo are either cooperative or non-cooperative. Non-cooperative
-// uses of commonTopo include is anything that may interfere with other tests, namely
-// mutations, such as:
-// - any calls to commonTopo.Relaunch; this is generally disruptive to other tests
-// - stopping or disabling nodes
-// - ...
-//
-// Cooperative tests should just call testFuncMayReuseCommonTopo() to ensure they
-// are run in the correct `sharetopo` mode. They should also ensure they are included
-// in the commonTopoSuites slice in TestSuitesOnSharedTopo.
-type sharedTopoSuite interface {
-	testName() string
-	setup(*testing.T, *commonTopo)
-	test(*testing.T, *commonTopo)
-}
-
-var flagNoShareTopo = flag.Bool("no-share-topo", false, "do not share topology; run each test in its own isolated topology")
-
-func runShareableSuites(t *testing.T, suites []sharedTopoSuite) {
-	t.Helper()
-	if !*flagNoShareTopo {
-		names := []string{}
-		for _, s := range suites {
-			names = append(names, s.testName())
-		}
-		t.Skipf(`Will run as part of "TestSuitesOnSharedTopo": %v`, names)
-	}
-	ct := NewCommonTopo(t)
-	for _, s := range suites {
-		s.setup(t, ct)
-	}
-	ct.Launch(t)
-	for _, s := range suites {
-		s := s
-		t.Run(s.testName(), func(t *testing.T) {
-			t.Parallel()
-			s.test(t, ct)
-		})
-	}
-}
-
-// Tests that can share topo must implement sharedTopoSuite and be appended to the sharedTopoSuites
-// slice inside
-func TestSuitesOnSharedTopo(t *testing.T) {
-	if *flagNoShareTopo {
-		t.Skip(`shared topo suites disabled by -no-share-topo`)
-	}
-	ct := NewCommonTopo(t)
-
-	sharedTopoSuites := []sharedTopoSuite{}
-	sharedTopoSuites = append(sharedTopoSuites, ac1BasicSuites...)
-	sharedTopoSuites = append(sharedTopoSuites, ac2DiscoChainSuites...)
-	sharedTopoSuites = append(sharedTopoSuites, ac3SvcDefaultsSuites...)
-	sharedTopoSuites = append(sharedTopoSuites, ac4ProxyDefaultsSuites...)
-	sharedTopoSuites = append(sharedTopoSuites, ac5_1NoSvcMeshSuites...)
-
-	for _, s := range sharedTopoSuites {
-		s.setup(t, ct)
-	}
-	ct.Launch(t)
-	for _, s := range sharedTopoSuites {
-		s := s
-		t.Run(s.testName(), func(t *testing.T) {
-			t.Parallel()
-			s.test(t, ct)
-		})
-	}
-}
-
-func TestCommonTopologySetup(t *testing.T) {
-	ct := NewCommonTopo(t)
-	ct.Launch(t)
-}
diff --git a/test/bin/cluster.bash b/test/bin/cluster.bash
index a6bc7d336f11f..b776f1a2f1fcc 100755
--- a/test/bin/cluster.bash
+++ b/test/bin/cluster.bash
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 #
 # Script for bringing up an N node consul cluster
 # on the local machine on different ports.
diff --git a/test/ca/generate.sh b/test/ca/generate.sh
index 7159431f4c490..ab6f165031f27 100755
--- a/test/ca/generate.sh
+++ b/test/ca/generate.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 set -e
 
 openssl req -new -sha256 -nodes -out ../key/ourdomain.csr -newkey rsa:2048 -keyout ../key/ourdomain.key -config ../key/ourdomain.cfg
diff --git a/test/client_certs/generate.sh b/test/client_certs/generate.sh
index f5c645d7bbb76..02f697ca5a30a 100755
--- a/test/client_certs/generate.sh
+++ b/test/client_certs/generate.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/hostname/generate.sh b/test/hostname/generate.sh
index 8e43dbee4e8a5..a6c018a8ad67b 100755
--- a/test/hostname/generate.sh
+++ b/test/hostname/generate.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/Dockerfile-consul-envoy-windows b/test/integration/connect/envoy/Dockerfile-consul-envoy-windows
deleted file mode 100644
index b760fd5754f7d..0000000000000
--- a/test/integration/connect/envoy/Dockerfile-consul-envoy-windows
+++ /dev/null
@@ -1,12 +0,0 @@
-# From Consul Version 1.13.3 / 1.12.6 / 1.11.11
-ARG VERSION=1.16.0-dev
-# From Envoy version 1.23.1 / 1.21.5 / 1.20.7
-ARG ENVOY_VERSION
-
-FROM docker.mirror.hashicorp.services/windows/envoy-windows:v${ENVOY_VERSION} as envoy
-FROM windows/consul:${VERSION}
-
-# Copy envoy.exe from FROM windows/envoy-windows:${ENVOY_VERSION}
-COPY --from=envoy ["C:/Program Files/envoy/", "C:/envoy/"]
-
-RUN SETX /M path "%PATH%;C:\envoy;"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/Dockerfile-tcpdump-windows b/test/integration/connect/envoy/Dockerfile-tcpdump-windows
deleted file mode 100644
index cbf5041630b99..0000000000000
--- a/test/integration/connect/envoy/Dockerfile-tcpdump-windows
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM mcr.microsoft.com/windows/servercore:ltsc2019
-
-COPY ["tcpdump.exe", "C:/Program Files/"]
-
-ENTRYPOINT ["C:/Program Files/tcpdump.exe"]
-
-# docker.exe build -t envoy-tcpdump -f Dockerfile-tcpdump-windows .
diff --git a/test/integration/connect/envoy/Dockerfile-test-sds-server b/test/integration/connect/envoy/Dockerfile-test-sds-server
new file mode 100644
index 0000000000000..e2d7fc8ad2595
--- /dev/null
+++ b/test/integration/connect/envoy/Dockerfile-test-sds-server
@@ -0,0 +1,8 @@
+FROM golang:latest
+
+WORKDIR /go/src
+COPY ./ .
+
+RUN go build -v -o test-sds-server sds.go
+
+CMD ["/go/src/test-sds-server"]
diff --git a/test/integration/connect/envoy/Dockerfile-test-sds-server-windows b/test/integration/connect/envoy/Dockerfile-test-sds-server-windows
deleted file mode 100644
index fc5e45b88d355..0000000000000
--- a/test/integration/connect/envoy/Dockerfile-test-sds-server-windows
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM docker.mirror.hashicorp.services/windows/golang:1809
-
-WORKDIR /go/src
-COPY ./ .
-
-RUN go build -v -o test-sds-server.exe sds.go
-
-CMD ["test-sds-server.exe"]
diff --git a/test/integration/connect/envoy/README.md b/test/integration/connect/envoy/README.md
index ef358e7a2b44a..a97acc710a953 100644
--- a/test/integration/connect/envoy/README.md
+++ b/test/integration/connect/envoy/README.md
@@ -52,7 +52,6 @@ Where `case-basic` can be replaced by any directory name from this directory.
 * When tests fail in CI, logs and additional debugging data are available in the artifacts of the test run.
 * You can re-run the tests locally by running `make test-envoy-integ GO_TEST_FLAGS="-run TestEnvoy/<case-directory>"` where `<case-directory>` is
   replaced with the name of the directory, e.g. `case-basic`.
-* You can override the envoy version by specifying `ENVOY_VERSION=<your envoy version>` eg. `ENVOY_VERSION=1.27.0 make test-envoy-integ`.
 * Locally, all the logs of the failed test will be available in `workdir` in this directory.
 * You can run with `DEBUG=1` to print out all the commands being run, e.g. `DEBUG=1 make test-envoy-integ GO_TEST_FLAGS="-run TestEnvoy/case-basic"`.
 * If you want to prevent the Docker containers from being spun down after test failure, add a `sleep 9999` to the `verify.bats` test case that's failing.
diff --git a/test/integration/connect/envoy/WINDOWS-TEST.md b/test/integration/connect/envoy/WINDOWS-TEST.md
deleted file mode 100644
index d9217f7a385a9..0000000000000
--- a/test/integration/connect/envoy/WINDOWS-TEST.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Envoy Integration Tests on Windows
-
-## Index
-
-- [About](#about)
-- [Pre-built core images](#pre-built-core-images)
-- [Test images](#integration-test-images)
-- [Run Tests](#run-tests)
-
-## About
-
-This file is the entrypoint to understand how to execute Envoy integration tests on Windows as well as to understand the differences between Linux tests and Windows tests. Below you can find a list of relevant documentation that has been written while working on supporting the Envoy integration tests on Windows.
-
-- [Windows Testing Architecture](test/integration/connect/envoy/docs/windows-testing-architecture.md): On this file you will find why the testing architecture on Windows differs from Linux's.
-- [Build Images](build-support-windows/BUILD-IMAGES.md): Here you will find how to build the images required for executing the tests.
-- [Windows Troubleshooting](test/integration/connect/envoy/WindowsTroubleshooting.md): This file lists, among other things everything we needed to change/adapt for the existing tests to run in Windows containers.
-
-## Pre-built core images
-
-Before running the integration tests, you must pre-build the core images that the tests require to be ran on the Windows environment. Make sure to check out the `BUILD-IMAGES` file [here](build-support-windows/BUILD-IMAGES.md) for this purpose.
-
-## Integration test images
-
-During the execution of the integration tests, several images are built based-on the pre-built core images. To get more information about these and how to run them independently, please check out the `docker.windows` file [here](test/integration/connect/envoy/docker.windows.md).
-
-## Run tests
-
-To run all the integration tests, you need to execute next command
-
-```shell
-go test -v -timeout=30s -tags integration ./test/integration/connect/envoy -run="TestEnvoy" -win=true
-```
-
-To run a single test case, the name should be specified. For instance, to run the `case-badauthz` test, you need to execute next command
-
-```shell
-go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/case-badauthz" -win=true
-```
-
-> :warning: Note that the flag `-win=true` must be specified as shown in the above commands. This flag is very important because the same allows to indicate that the tests will be executed on the Windows environment. When executing the Envoy integration tests the **End of Line Sequence** of every related file and or script will be automatically changed from **LF to CRLF**.  
diff --git a/test/integration/connect/envoy/case-api-gateway-http-hostnames/capture.sh b/test/integration/connect/envoy/case-api-gateway-http-hostnames/capture.sh
index 92123f3f4c077..8ba0e0ddabc69 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-hostnames/capture.sh
+++ b/test/integration/connect/envoy/case-api-gateway-http-hostnames/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 api-gateway primary || true
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-api-gateway-http-hostnames/service_gateway.hcl b/test/integration/connect/envoy/case-api-gateway-http-hostnames/service_gateway.hcl
index 1d0d5fffe26bf..486c25c59e5f0 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-hostnames/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-api-gateway-http-hostnames/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "api-gateway"
   kind = "api-gateway"
diff --git a/test/integration/connect/envoy/case-api-gateway-http-hostnames/setup.sh b/test/integration/connect/envoy/case-api-gateway-http-hostnames/setup.sh
index 3b3db83268911..f4963a2a24fa1 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-hostnames/setup.sh
+++ b/test/integration/connect/envoy/case-api-gateway-http-hostnames/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-api-gateway-http-hostnames/vars.sh b/test/integration/connect/envoy/case-api-gateway-http-hostnames/vars.sh
index 1456b6a5ad024..38a47d852783d 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-hostnames/vars.sh
+++ b/test/integration/connect/envoy/case-api-gateway-http-hostnames/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES api-gateway-primary"
diff --git a/test/integration/connect/envoy/case-api-gateway-http-hostnames/verify.bats b/test/integration/connect/envoy/case-api-gateway-http-hostnames/verify.bats
index 7aaee6da796fb..ba109ea6f9dd4 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-hostnames/verify.bats
+++ b/test/integration/connect/envoy/case-api-gateway-http-hostnames/verify.bats
@@ -6,7 +6,7 @@ load helpers
   retry_default curl -f -s localhost:20000/stats -o /dev/null
 }
 
-@test "api gateway should have been accepted and not conflicted" {
+@test "api gateway should have be accepted and not conflicted" {
   assert_config_entry_status Accepted True Accepted primary api-gateway api-gateway
   assert_config_entry_status Conflicted False NoConflict primary api-gateway api-gateway
 }
@@ -63,4 +63,4 @@ load helpers
   run retry_long curl -H "Host: foo.bar.baz" -s -f -d hello localhost:9995
   [ "$status" -eq 0 ]
   [[ "$output" == *"hello"* ]]
-}
+}
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-api-gateway-http-simple/capture.sh b/test/integration/connect/envoy/case-api-gateway-http-simple/capture.sh
index 92123f3f4c077..8ba0e0ddabc69 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-simple/capture.sh
+++ b/test/integration/connect/envoy/case-api-gateway-http-simple/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 api-gateway primary || true
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-api-gateway-http-simple/service_gateway.hcl b/test/integration/connect/envoy/case-api-gateway-http-simple/service_gateway.hcl
index 1d0d5fffe26bf..486c25c59e5f0 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-simple/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-api-gateway-http-simple/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "api-gateway"
   kind = "api-gateway"
diff --git a/test/integration/connect/envoy/case-api-gateway-http-simple/setup.sh b/test/integration/connect/envoy/case-api-gateway-http-simple/setup.sh
index e25e92ba0011c..6dab478e203bb 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-simple/setup.sh
+++ b/test/integration/connect/envoy/case-api-gateway-http-simple/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-api-gateway-http-simple/vars.sh b/test/integration/connect/envoy/case-api-gateway-http-simple/vars.sh
index 1456b6a5ad024..38a47d852783d 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-simple/vars.sh
+++ b/test/integration/connect/envoy/case-api-gateway-http-simple/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES api-gateway-primary"
diff --git a/test/integration/connect/envoy/case-api-gateway-http-simple/verify.bats b/test/integration/connect/envoy/case-api-gateway-http-simple/verify.bats
index e62e979bf8b16..72686b3c4f257 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-simple/verify.bats
+++ b/test/integration/connect/envoy/case-api-gateway-http-simple/verify.bats
@@ -6,7 +6,7 @@ load helpers
   retry_default curl -f -s localhost:20000/stats -o /dev/null
 }
 
-@test "api gateway should have been accepted and not conflicted" {
+@test "api gateway should have be accepted and not conflicted" {
   assert_config_entry_status Accepted True Accepted primary api-gateway api-gateway
   assert_config_entry_status Conflicted False NoConflict primary api-gateway api-gateway
 }
@@ -31,4 +31,4 @@ load helpers
   run retry_default sh -c "curl -s localhost:9998 | grep RBAC"
   [ "$status" -eq 0 ]
   [[ "$output" == "RBAC: access denied" ]]
-}
+}
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/capture.sh b/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/capture.sh
index 92123f3f4c077..8ba0e0ddabc69 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/capture.sh
+++ b/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 api-gateway primary || true
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/service_gateway.hcl b/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/service_gateway.hcl
index 1d0d5fffe26bf..486c25c59e5f0 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "api-gateway"
   kind = "api-gateway"
diff --git a/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/service_s3.hcl b/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/service_s3.hcl
index b41ec0349862a..2f6d05e0feb03 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/service_s3.hcl
+++ b/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/service_s3.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s3"
   name = "s3"
diff --git a/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/setup.sh b/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/setup.sh
index 622df90c297a7..47916da173c1f 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/setup.sh
+++ b/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/vars.sh b/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/vars.sh
index 1456b6a5ad024..38a47d852783d 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/vars.sh
+++ b/test/integration/connect/envoy/case-api-gateway-http-splitter-targets/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES api-gateway-primary"
diff --git a/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/capture.sh b/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/capture.sh
index 92123f3f4c077..8ba0e0ddabc69 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/capture.sh
+++ b/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 api-gateway primary || true
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/service_gateway.hcl b/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/service_gateway.hcl
index 1d0d5fffe26bf..486c25c59e5f0 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "api-gateway"
   kind = "api-gateway"
diff --git a/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/setup.sh b/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/setup.sh
index 23076cd00e281..2b2cbd160fa6d 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/setup.sh
+++ b/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/vars.sh b/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/vars.sh
index 1456b6a5ad024..38a47d852783d 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/vars.sh
+++ b/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES api-gateway-primary"
diff --git a/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/verify.bats b/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/verify.bats
index 4d99c49e6951d..aeb0b7fd6cffa 100644
--- a/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/verify.bats
+++ b/test/integration/connect/envoy/case-api-gateway-http-tls-overlapping-hosts/verify.bats
@@ -6,7 +6,7 @@ load helpers
   retry_default curl -f -s localhost:20000/stats -o /dev/null
 }
 
-@test "api gateway should have been accepted and not conflicted" {
+@test "api gateway should have be accepted and not conflicted" {
   assert_config_entry_status Accepted True Accepted primary api-gateway api-gateway
   assert_config_entry_status Conflicted False NoConflict primary api-gateway api-gateway
 }
@@ -45,4 +45,4 @@ load helpers
 
 @test "api gateway should fall back to a connect certificate on conflicted SNI on listener 2" {
   assert_cert_has_cn localhost:9998 pri host.consul.example
-}
+}
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/capture.sh b/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/capture.sh
index 92123f3f4c077..8ba0e0ddabc69 100644
--- a/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/capture.sh
+++ b/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 api-gateway primary || true
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/service_gateway.hcl b/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/service_gateway.hcl
index 1d0d5fffe26bf..486c25c59e5f0 100644
--- a/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "api-gateway"
   kind = "api-gateway"
diff --git a/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/setup.sh b/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/setup.sh
index a4529b6772edc..3a45aab7d0ca2 100644
--- a/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/setup.sh
+++ b/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
@@ -42,7 +39,6 @@ services = [
 ]
 parents = [
   {
-    kind = "api-gateway"
     name = "api-gateway"
   }
 ]
@@ -52,4 +48,4 @@ register_services primary
 
 gen_envoy_bootstrap api-gateway 20000 primary true
 gen_envoy_bootstrap s1 19000
-gen_envoy_bootstrap s2 19001
+gen_envoy_bootstrap s2 19001
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/vars.sh b/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/vars.sh
index 1456b6a5ad024..38a47d852783d 100644
--- a/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/vars.sh
+++ b/test/integration/connect/envoy/case-api-gateway-tcp-conflicted/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES api-gateway-primary"
diff --git a/test/integration/connect/envoy/case-api-gateway-tcp-simple/capture.sh b/test/integration/connect/envoy/case-api-gateway-tcp-simple/capture.sh
index 92123f3f4c077..8ba0e0ddabc69 100644
--- a/test/integration/connect/envoy/case-api-gateway-tcp-simple/capture.sh
+++ b/test/integration/connect/envoy/case-api-gateway-tcp-simple/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 api-gateway primary || true
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-api-gateway-tcp-simple/service_gateway.hcl b/test/integration/connect/envoy/case-api-gateway-tcp-simple/service_gateway.hcl
index 1d0d5fffe26bf..486c25c59e5f0 100644
--- a/test/integration/connect/envoy/case-api-gateway-tcp-simple/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-api-gateway-tcp-simple/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "api-gateway"
   kind = "api-gateway"
diff --git a/test/integration/connect/envoy/case-api-gateway-tcp-simple/setup.sh b/test/integration/connect/envoy/case-api-gateway-tcp-simple/setup.sh
index 152e0772104e5..fd4f474abfdcc 100644
--- a/test/integration/connect/envoy/case-api-gateway-tcp-simple/setup.sh
+++ b/test/integration/connect/envoy/case-api-gateway-tcp-simple/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
@@ -50,7 +47,6 @@ parents = [
   {
     name = "api-gateway"
     sectionName = "listener-two"
-    kind = "api-gateway"
   }
 ]
 '
@@ -77,4 +73,4 @@ register_services primary
 
 gen_envoy_bootstrap api-gateway 20000 primary true
 gen_envoy_bootstrap s1 19000
-gen_envoy_bootstrap s2 19001
+gen_envoy_bootstrap s2 19001
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-api-gateway-tcp-simple/vars.sh b/test/integration/connect/envoy/case-api-gateway-tcp-simple/vars.sh
index 1456b6a5ad024..38a47d852783d 100644
--- a/test/integration/connect/envoy/case-api-gateway-tcp-simple/vars.sh
+++ b/test/integration/connect/envoy/case-api-gateway-tcp-simple/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES api-gateway-primary"
diff --git a/test/integration/connect/envoy/case-api-gateway-tcp-simple/verify.bats b/test/integration/connect/envoy/case-api-gateway-tcp-simple/verify.bats
index 536c99d7c7496..51ed646bd6bca 100644
--- a/test/integration/connect/envoy/case-api-gateway-tcp-simple/verify.bats
+++ b/test/integration/connect/envoy/case-api-gateway-tcp-simple/verify.bats
@@ -6,7 +6,7 @@ load helpers
   retry_default curl -f -s localhost:20000/stats -o /dev/null
 }
 
-@test "api gateway should have been accepted and not conflicted" {
+@test "api gateway should have be accepted and not conflicted" {
   assert_config_entry_status Accepted True Accepted primary api-gateway api-gateway
   assert_config_entry_status Conflicted False NoConflict primary api-gateway api-gateway
 }
@@ -29,4 +29,4 @@ load helpers
 
 @test "api gateway should get an intentions error connecting to s2 via configured port" {
   run retry_default must_fail_tcp_connection localhost:9998
-}
+}
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/capture.sh b/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/capture.sh
index 92123f3f4c077..8ba0e0ddabc69 100644
--- a/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/capture.sh
+++ b/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 api-gateway primary || true
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/service_gateway.hcl b/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/service_gateway.hcl
index 1d0d5fffe26bf..486c25c59e5f0 100644
--- a/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "api-gateway"
   kind = "api-gateway"
diff --git a/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/setup.sh b/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/setup.sh
index ca9568e348846..66dd3fa75e68d 100644
--- a/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/setup.sh
+++ b/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/vars.sh b/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/vars.sh
index 1456b6a5ad024..38a47d852783d 100644
--- a/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/vars.sh
+++ b/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES api-gateway-primary"
diff --git a/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/verify.bats b/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/verify.bats
index 5bdddadd9d26e..5e28909bfa5f8 100644
--- a/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/verify.bats
+++ b/test/integration/connect/envoy/case-api-gateway-tcp-tls-overlapping-hosts/verify.bats
@@ -6,7 +6,7 @@ load helpers
   retry_default curl -f -s localhost:20000/stats -o /dev/null
 }
 
-@test "api gateway should have been accepted and not conflicted" {
+@test "api gateway should have be accepted and not conflicted" {
   assert_config_entry_status Accepted True Accepted primary api-gateway api-gateway
   assert_config_entry_status Conflicted False NoConflict primary api-gateway api-gateway
 }
@@ -40,4 +40,4 @@ load helpers
 
 @test "api gateway should fall back to a connect certificate on conflicted SNI on listener 2" {
   assert_cert_has_cn localhost:9998 pri host.consul.example
-}
+}
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-badauthz/capture.sh b/test/integration/connect/envoy/case-badauthz/capture.sh
index c6b9e36ed1df1..af3245f345ad1 100644
--- a/test/integration/connect/envoy/case-badauthz/capture.sh
+++ b/test/integration/connect/envoy/case-badauthz/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 || true
 snapshot_envoy_admin localhost:19001 s2 || true
diff --git a/test/integration/connect/envoy/case-badauthz/setup.sh b/test/integration/connect/envoy/case-badauthz/setup.sh
index 1aa0962cf6fb1..eb4f3de93b720 100644
--- a/test/integration/connect/envoy/case-badauthz/setup.sh
+++ b/test/integration/connect/envoy/case-badauthz/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-basic/capture.sh b/test/integration/connect/envoy/case-basic/capture.sh
index 14dc00afc65b8..1a11f7d5e0146 100644
--- a/test/integration/connect/envoy/case-basic/capture.sh
+++ b/test/integration/connect/envoy/case-basic/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 s2 primary || true
diff --git a/test/integration/connect/envoy/case-basic/setup.sh b/test/integration/connect/envoy/case-basic/setup.sh
index 3fb3ade6c5fbb..e8321972b34e1 100644
--- a/test/integration/connect/envoy/case-basic/setup.sh
+++ b/test/integration/connect/envoy/case-basic/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-centralconf/capture.sh b/test/integration/connect/envoy/case-centralconf/capture.sh
index 8bc4413d09f9e..7f0c582f8983c 100644
--- a/test/integration/connect/envoy/case-centralconf/capture.sh
+++ b/test/integration/connect/envoy/case-centralconf/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
diff --git a/test/integration/connect/envoy/case-centralconf/service_s1.hcl b/test/integration/connect/envoy/case-centralconf/service_s1.hcl
index 54c6ac6501b40..0d8957c000b51 100644
--- a/test/integration/connect/envoy/case-centralconf/service_s1.hcl
+++ b/test/integration/connect/envoy/case-centralconf/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-centralconf/service_s2.hcl b/test/integration/connect/envoy/case-centralconf/service_s2.hcl
index 1a89f855944da..da36f6d06cc1d 100644
--- a/test/integration/connect/envoy/case-centralconf/service_s2.hcl
+++ b/test/integration/connect/envoy/case-centralconf/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-centralconf/setup.sh b/test/integration/connect/envoy/case-centralconf/setup.sh
index 934ea006fddbb..f0c2593f7d7a8 100644
--- a/test/integration/connect/envoy/case-centralconf/setup.sh
+++ b/test/integration/connect/envoy/case-centralconf/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/base.hcl b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/base.hcl
index 8cd6db14878a7..f81ab0edd6e4c 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/base.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 primary_datacenter = "alpha"
 log_level          = "trace"
 peering {
diff --git a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/service_gateway.hcl b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/service_gateway.hcl
index 640b9b6ce753f..bcdcb2e8b3726 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/service_s1.hcl b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/service_s1.hcl
index b065abc9055e2..e97ec236661b6 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s1 service in this peer
diff --git a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/service_s2.hcl b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/service_s2.hcl
index 90d2315f4d2c9..01d4505c67722 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/setup.sh
index af71eccb8e188..46ec303e2ff7c 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/alpha/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/bind.hcl b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/bind.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/capture.sh b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/capture.sh
index 0921d3c32a0e9..ab90eb425a811 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/capture.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 s2 primary || true
diff --git a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/base.hcl b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/base.hcl
index 55c268b37e784..c1e134d5a25fb 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/base.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 peering {
   enabled = true
 }
diff --git a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/service_s1.hcl b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/service_s1.hcl
index 63dfc2994f3de..d10535324dce2 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/service_s2.hcl b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/service_s2.hcl
index 90d2315f4d2c9..01d4505c67722 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/setup.sh
index d84fe0a869918..db5571d0c7d62 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/verify.bats b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/verify.bats
index 45b4177fdbeae..b673be8cfe2c6 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/verify.bats
+++ b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/primary/verify.bats
@@ -18,6 +18,10 @@ load helpers
   retry_default curl localhost:19000/config_dump
 }
 
+@test "s1 proxy listener should be up and have right cert" {
+  assert_proxy_presents_cert_uri localhost:21000 s1
+}
+
 @test "s2 proxies should be healthy in primary" {
   assert_service_has_healthy_instances s2 1 primary
 }
@@ -30,11 +34,6 @@ load helpers
   retry_long nc -z consul-alpha-client:4432
 }
 
-@test "s1 proxy listener should be up and have right cert" {
-  assert_proxy_presents_cert_uri localhost:21000 s1
-}
-
-
 @test "peer the two clusters together" {
   retry_default create_peering primary alpha
 }
@@ -46,8 +45,8 @@ load helpers
 # Failover
 
 @test "s1 upstream should have healthy endpoints for s2 in both primary and failover" {
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~0~s2.default.primary.internal HEALTHY 1
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~1~s2.default.primary.internal HEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.primary.internal HEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.primary-to-alpha.external HEALTHY 1
 }
 
 @test "s1 upstream should be able to connect to s2" {
@@ -57,7 +56,7 @@ load helpers
 }
 
 @test "s1 upstream made 1 connection" {
-  assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.failover-target~0~s2.default.primary.internal.*cx_total" 1
+  assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.failover-target~s2.default.primary.internal.*cx_total" 1
 }
 
 @test "terminate instance of s2 primary envoy which should trigger failover to s2 alpha when the tcp check fails" {
@@ -69,8 +68,8 @@ load helpers
 }
 
 @test "s1 upstream should have healthy endpoints for s2 in the failover cluster peer" {
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~0~s2.default.primary.internal UNHEALTHY 1
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~1~s2.default.primary.internal HEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.primary.internal UNHEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.primary-to-alpha.external HEALTHY 1
 }
 
 @test "reset envoy statistics for failover" {
@@ -88,7 +87,7 @@ load helpers
 }
 
 @test "s1 upstream made 1 connection to s2 through the cluster peer" {
-  assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.failover-target~1~s2.default.primary.internal.*cx_total" 1
+  assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.failover-target~s2.default.primary-to-alpha.external.*cx_total" 1
 }
 
 # Redirect
diff --git a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/vars.sh b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/vars.sh
index 41b95915331d4..8e9108a340205 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/vars.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-cluster-peering-failover/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="s1 s1-sidecar-proxy s2 s2-sidecar-proxy s2-alpha s2-sidecar-proxy-alpha gateway-alpha tcpdump-primary tcpdump-alpha"
 export REQUIRE_PEERS=1
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/bind.hcl b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/bind.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/capture.sh b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/capture.sh
index 0ee4884a15215..7726004914b95 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/capture.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 s2 primary || true
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/primary/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/primary/setup.sh
index 8b24664564cb7..f5734d4b7c849 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/primary/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/primary/verify.bats b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/primary/verify.bats
index 9556a0658d5fe..a87c31261f978 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/primary/verify.bats
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/primary/verify.bats
@@ -40,8 +40,8 @@ load helpers
 # Note: when failover is configured the cluster is named for the original
 # service not any destination related to failover.
 @test "s1 upstream should have healthy endpoints for s2 in both primary and failover" {
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~0~s2.default.primary HEALTHY 1
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~1~s2.default.primary HEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.primary HEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.secondary HEALTHY 1
 }
 
 @test "s1 upstream should be able to connect to s2 via upstream s2 to start" {
@@ -49,7 +49,7 @@ load helpers
 }
 
 @test "s1 upstream made 1 connection" {
-  assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.failover-target~0~s2.default.primary.*cx_total" 1
+  assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.failover-target~s2.default.primary.*cx_total" 1
 }
 
 ################
@@ -64,8 +64,8 @@ load helpers
 }
 
 @test "s1 upstream should have healthy endpoints for s2 secondary and unhealthy endpoints for s2 primary" {
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~0~s2.default.primary UNHEALTHY 1
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~1~s2.default.primary HEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.primary UNHEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.secondary HEALTHY 1
 }
 
 @test "reset envoy statistics" {
@@ -77,5 +77,5 @@ load helpers
 }
 
 @test "s1 upstream made 1 connection again" {
-  assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.failover-target~1~s2.default.primary.*cx_total" 1
+  assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.failover-target~s2.default.secondary.*cx_total" 1
 }
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/join.hcl b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/join.hcl
index f0bd3fbd4ac7e..32cc24f2ebdd9 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/join.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/join.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 retry_join_wan = ["consul-primary-server"]
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/service_gateway.hcl b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/service_gateway.hcl
index 4f91a740182af..55f03ac0501dc 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/service_s1.hcl b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/service_s1.hcl
index 8b4d4a83a42d4..eff93eb6b5195 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # we don't want an s1 service in the secondary dc
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/setup.sh
index ed13954a1f5e6..2dc07d35940b4 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/vars.sh b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/vars.sh
index 11e14176e3892..1e2ad55da9c8a 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/vars.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="
 s1 s1-sidecar-proxy
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/bind.hcl b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/bind.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/capture.sh b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/capture.sh
index 0ee4884a15215..7726004914b95 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/capture.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 s2 primary || true
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/primary/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/primary/setup.sh
index 25a7c173f08bb..ccd9a81a87f76 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/primary/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/primary/verify.bats b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/primary/verify.bats
index 7fdc8a4a5580e..d46c73640158c 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/primary/verify.bats
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/primary/verify.bats
@@ -41,8 +41,8 @@ load helpers
 # service not any destination related to failover.
 @test "s1 upstream should have healthy endpoints for s2 in both primary and failover" {
   # in mesh gateway remote or local mode only the current leg of failover manifests in the load assignments
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~0~s2.default.primary HEALTHY 1
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~0~s2.default.primary UNHEALTHY 0
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.primary HEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.primary UNHEALTHY 0
 }
 
 @test "s1 upstream should be able to connect to s2 via upstream s2 to start" {
@@ -50,7 +50,7 @@ load helpers
 }
 
 @test "s1 upstream made 1 connection" {
-  assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.failover-target~0~s2.default.primary.*cx_total" 1
+  assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.failover-target~s2.default.primary.*cx_total" 1
 }
 
 ################
@@ -66,9 +66,9 @@ load helpers
 
 @test "s1 upstream should have healthy endpoints for s2 secondary" {
   # in mesh gateway remote or local mode only the current leg of failover manifests in the load assignments
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~0~s2.default.primary HEALTHY 0
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~1~s2.default.primary HEALTHY 1
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~1~s2.default.primary UNHEALTHY 0
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.primary HEALTHY 0
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.secondary HEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.secondary UNHEALTHY 0
 }
 
 @test "reset envoy statistics" {
@@ -80,5 +80,5 @@ load helpers
 }
 
 @test "s1 upstream made 1 connection again" {
-  assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.failover-target~1~s2.default.primary.*cx_total" 1
+  assert_envoy_metric_at_least 127.0.0.1:19000 "cluster.failover-target~s2.default.secondary.*cx_total" 1
 }
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/join.hcl b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/join.hcl
index f0bd3fbd4ac7e..32cc24f2ebdd9 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/join.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/join.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 retry_join_wan = ["consul-primary-server"]
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/service_gateway.hcl b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/service_gateway.hcl
index 4f91a740182af..55f03ac0501dc 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/service_s1.hcl b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/service_s1.hcl
index 8b4d4a83a42d4..eff93eb6b5195 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # we don't want an s1 service in the secondary dc
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/setup.sh
index ed13954a1f5e6..2dc07d35940b4 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/vars.sh b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/vars.sh
index 11e14176e3892..1e2ad55da9c8a 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/vars.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="
 s1 s1-sidecar-proxy
diff --git a/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/service_s2-v1.hcl b/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/service_s2-v1.hcl
index b96b473cf4fbf..dd84f537645e2 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/service_s2-v1.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/service_s2-v1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s2-v1"
   name = "s2"
diff --git a/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/service_s2-v2.hcl b/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/service_s2-v2.hcl
index d642e71fa31b1..b15ca6c4ead23 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/service_s2-v2.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/service_s2-v2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s2-v2"
   name = "s2"
diff --git a/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/setup.sh
index 043dd7f7fc66b..2dfca49e9c392 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/vars.sh b/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/vars.sh
index 358c95541fda3..6527fbf122856 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/vars.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="
 $DEFAULT_REQUIRED_SERVICES
diff --git a/test/integration/connect/envoy/case-cfg-resolver-features/capture.sh b/test/integration/connect/envoy/case-cfg-resolver-features/capture.sh
index b1782df01e27c..5fc32a25a9759 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-features/capture.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-features/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 s2-v1 primary || true
diff --git a/test/integration/connect/envoy/case-cfg-resolver-features/service_s2-v1.hcl b/test/integration/connect/envoy/case-cfg-resolver-features/service_s2-v1.hcl
index b96b473cf4fbf..dd84f537645e2 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-features/service_s2-v1.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-features/service_s2-v1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s2-v1"
   name = "s2"
diff --git a/test/integration/connect/envoy/case-cfg-resolver-features/service_s2-v2.hcl b/test/integration/connect/envoy/case-cfg-resolver-features/service_s2-v2.hcl
index d642e71fa31b1..b15ca6c4ead23 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-features/service_s2-v2.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-features/service_s2-v2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s2-v2"
   name = "s2"
diff --git a/test/integration/connect/envoy/case-cfg-resolver-features/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-features/setup.sh
index 2e3078edc872c..2695c0621f10a 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-features/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-features/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-resolver-features/vars.sh b/test/integration/connect/envoy/case-cfg-resolver-features/vars.sh
index 358c95541fda3..6527fbf122856 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-features/vars.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-features/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="
 $DEFAULT_REQUIRED_SERVICES
diff --git a/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/service_s2-v1.hcl b/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/service_s2-v1.hcl
index d45b1462723f4..a2f6423e00b73 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/service_s2-v1.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/service_s2-v1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s2-v1"
   name = "s2"
diff --git a/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/setup.sh
index 606cadd8f1fb3..902dfeeb6a156 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/vars.sh b/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/vars.sh
index aab3c8c39ea5b..4f6997f27a417 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/vars.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="
 $DEFAULT_REQUIRED_SERVICES
diff --git a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3-v1.hcl b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3-v1.hcl
index d9a050a16f653..5b0b95677aebb 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3-v1.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3-v1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s3-v1"
   name = "s3"
diff --git a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3-v2.hcl b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3-v2.hcl
index 19e2c7cac1506..9a5590736629d 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3-v2.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3-v2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s3-v2"
   name = "s3"
diff --git a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3.hcl b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3.hcl
index 973e69b01c89a..f8f7150ea7831 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s3"
   port = 8282
diff --git a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/setup.sh
index 7d02158a6325c..ba7ee3bb6ed4f 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/vars.sh b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/vars.sh
index a9a2bcd57188d..e8e8533ed7dd3 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/vars.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="
 $DEFAULT_REQUIRED_SERVICES
diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3-v1.hcl b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3-v1.hcl
index d9a050a16f653..5b0b95677aebb 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3-v1.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3-v1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s3-v1"
   name = "s3"
diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3-v2.hcl b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3-v2.hcl
index 19e2c7cac1506..9a5590736629d 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3-v2.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3-v2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s3-v2"
   name = "s3"
diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3.hcl b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3.hcl
index 973e69b01c89a..f8f7150ea7831 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s3"
   port = 8282
diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/setup.sh
index eae9bd4feaf13..953919d108eac 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/vars.sh b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/vars.sh
index a9a2bcd57188d..e8e8533ed7dd3 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/vars.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="
 $DEFAULT_REQUIRED_SERVICES
diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/verify.bats b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/verify.bats
index 89a2c08b8fb08..6f684e71230b8 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/verify.bats
+++ b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/verify.bats
@@ -53,7 +53,7 @@ load helpers
 # Note: when failover is configured the cluster is named for the original
 # service not any destination related to failover.
 @test "s1 upstream should have healthy endpoints for s2 and s3 together" {
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~1~s2.default.primary HEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.primary HEALTHY 1
 }
 
 @test "s1 upstream should be able to connect to s2 via upstream s2 to start" {
@@ -65,8 +65,8 @@ load helpers
 }
 
 @test "s1 upstream should have healthy endpoints for s3-v1 and unhealthy endpoints for s2" {
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~1~s2.default.primary HEALTHY 1
-  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~0~s2.default.primary UNHEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~v1.s3.default.primary HEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:19000 failover-target~s2.default.primary UNHEALTHY 1
 }
 
 @test "s1 upstream should be able to connect to s3-v1 now" {
diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/service_s3.hcl b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/service_s3.hcl
index 94e31c3df895d..c8761365b71bf 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/service_s3.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/service_s3.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s3"
   port = 8282
diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/setup.sh
index 097f1fa756663..87bc93016b8fa 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/vars.sh b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/vars.sh
index 63c854f959c9e..fd3a5ae7db72b 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/vars.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES s3 s3-sidecar-proxy"
diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/service_s3.hcl b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/service_s3.hcl
index 94e31c3df895d..c8761365b71bf 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/service_s3.hcl
+++ b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/service_s3.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s3"
   port = 8282
diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/setup.sh
index fd106032bf2e9..4d13925e2b1ca 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/vars.sh b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/vars.sh
index 63c854f959c9e..fd3a5ae7db72b 100644
--- a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/vars.sh
+++ b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES s3 s3-sidecar-proxy"
diff --git a/test/integration/connect/envoy/case-cfg-router-features/capture.sh b/test/integration/connect/envoy/case-cfg-router-features/capture.sh
index b1782df01e27c..5fc32a25a9759 100644
--- a/test/integration/connect/envoy/case-cfg-router-features/capture.sh
+++ b/test/integration/connect/envoy/case-cfg-router-features/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 s2-v1 primary || true
diff --git a/test/integration/connect/envoy/case-cfg-router-features/service_s2-v1.hcl b/test/integration/connect/envoy/case-cfg-router-features/service_s2-v1.hcl
index b96b473cf4fbf..dd84f537645e2 100644
--- a/test/integration/connect/envoy/case-cfg-router-features/service_s2-v1.hcl
+++ b/test/integration/connect/envoy/case-cfg-router-features/service_s2-v1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s2-v1"
   name = "s2"
diff --git a/test/integration/connect/envoy/case-cfg-router-features/service_s2-v2.hcl b/test/integration/connect/envoy/case-cfg-router-features/service_s2-v2.hcl
index d642e71fa31b1..b15ca6c4ead23 100644
--- a/test/integration/connect/envoy/case-cfg-router-features/service_s2-v2.hcl
+++ b/test/integration/connect/envoy/case-cfg-router-features/service_s2-v2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s2-v2"
   name = "s2"
diff --git a/test/integration/connect/envoy/case-cfg-router-features/setup.sh b/test/integration/connect/envoy/case-cfg-router-features/setup.sh
index 577b3512b4fe3..f4b559c1481ee 100644
--- a/test/integration/connect/envoy/case-cfg-router-features/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-router-features/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-router-features/vars.sh b/test/integration/connect/envoy/case-cfg-router-features/vars.sh
index 358c95541fda3..6527fbf122856 100644
--- a/test/integration/connect/envoy/case-cfg-router-features/vars.sh
+++ b/test/integration/connect/envoy/case-cfg-router-features/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="
 $DEFAULT_REQUIRED_SERVICES
diff --git a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/base.hcl b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/base.hcl
index 8cd6db14878a7..f81ab0edd6e4c 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/base.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 primary_datacenter = "alpha"
 log_level          = "trace"
 peering {
diff --git a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/service_gateway.hcl b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/service_gateway.hcl
index 640b9b6ce753f..bcdcb2e8b3726 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/service_s1.hcl b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/service_s1.hcl
index b065abc9055e2..e97ec236661b6 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s1 service in this peer
diff --git a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/service_s2.hcl b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/service_s2.hcl
index 26b5f481f377a..14bf414fdc0ff 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/setup.sh b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/setup.sh
index 99c4eb46f2186..ff7dcb8114eae 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/alpha/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/bind.hcl b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/bind.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/capture.sh b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/capture.sh
index 0921d3c32a0e9..ab90eb425a811 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/capture.sh
+++ b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 s2 primary || true
diff --git a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/base.hcl b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/base.hcl
index 55c268b37e784..c1e134d5a25fb 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/base.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 peering {
   enabled = true
 }
diff --git a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/service_s1.hcl b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/service_s1.hcl
index d50d8cb04979c..3709b91364d5f 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/service_s2.hcl b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/service_s2.hcl
index 26b5f481f377a..14bf414fdc0ff 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/setup.sh b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/setup.sh
index 9b274b375f874..e59202e811d5e 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/vars.sh b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/vars.sh
index 7c231bcfad68f..6a07e33a4a66b 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/vars.sh
+++ b/test/integration/connect/envoy/case-cfg-splitter-cluster-peering/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="s1 s1-sidecar-proxy s2 s2-sidecar-proxy s2-alpha s2-sidecar-proxy-alpha gateway-alpha"
 export REQUIRE_PEERS=1
diff --git a/test/integration/connect/envoy/case-cfg-splitter-features/capture.sh b/test/integration/connect/envoy/case-cfg-splitter-features/capture.sh
index b1782df01e27c..5fc32a25a9759 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-features/capture.sh
+++ b/test/integration/connect/envoy/case-cfg-splitter-features/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 s2-v1 primary || true
diff --git a/test/integration/connect/envoy/case-cfg-splitter-features/service_s2-v1.hcl b/test/integration/connect/envoy/case-cfg-splitter-features/service_s2-v1.hcl
index b96b473cf4fbf..dd84f537645e2 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-features/service_s2-v1.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-features/service_s2-v1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s2-v1"
   name = "s2"
diff --git a/test/integration/connect/envoy/case-cfg-splitter-features/service_s2-v2.hcl b/test/integration/connect/envoy/case-cfg-splitter-features/service_s2-v2.hcl
index d642e71fa31b1..b15ca6c4ead23 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-features/service_s2-v2.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-features/service_s2-v2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s2-v2"
   name = "s2"
diff --git a/test/integration/connect/envoy/case-cfg-splitter-features/setup.sh b/test/integration/connect/envoy/case-cfg-splitter-features/setup.sh
index 311799fccfbc1..c04afa2b6a21c 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-features/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-splitter-features/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-splitter-features/vars.sh b/test/integration/connect/envoy/case-cfg-splitter-features/vars.sh
index 358c95541fda3..6527fbf122856 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-features/vars.sh
+++ b/test/integration/connect/envoy/case-cfg-splitter-features/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="
 $DEFAULT_REQUIRED_SERVICES
diff --git a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/base.hcl b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/base.hcl
index 8cd6db14878a7..f81ab0edd6e4c 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/base.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 primary_datacenter = "alpha"
 log_level          = "trace"
 peering {
diff --git a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/service_gateway.hcl b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/service_gateway.hcl
index 640b9b6ce753f..bcdcb2e8b3726 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/service_s1.hcl b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/service_s1.hcl
index ca196db64f0f4..99fbc26eedbf9 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/service_s2.hcl b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/service_s2.hcl
index 26b5f481f377a..14bf414fdc0ff 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/setup.sh b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/setup.sh
index 47127ab03d482..42177898e0653 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/alpha/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/bind.hcl b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/bind.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/capture.sh b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/capture.sh
index 965f136de6822..f6b2e2cf12853 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/capture.sh
+++ b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 ingress-gateway primary || true
 snapshot_envoy_admin localhost:19000 s1 primary || true
diff --git a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/primary/base.hcl b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/primary/base.hcl
index 55c268b37e784..c1e134d5a25fb 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/primary/base.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/primary/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 peering {
   enabled = true
 }
diff --git a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/primary/service_ingress.hcl b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/primary/service_ingress.hcl
index a1324f7f83799..781ef1851b274 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/primary/service_ingress.hcl
+++ b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/primary/service_ingress.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "ingress-gateway"
   kind = "ingress-gateway"
diff --git a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/primary/setup.sh b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/primary/setup.sh
index ed0da099d6527..54a201cad0056 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/primary/setup.sh
+++ b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/vars.sh b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/vars.sh
index e5b080741aa26..9f0aefa402ea9 100644
--- a/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/vars.sh
+++ b/test/integration/connect/envoy/case-cfg-splitter-peering-ingress-gateways/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="s1 s1-sidecar-proxy s1-alpha s1-sidecar-proxy-alpha s2-alpha s2-sidecar-proxy-alpha gateway-alpha ingress-gateway-primary"
 export REQUIRE_PEERS=1
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-consul-exec/setup.sh b/test/integration/connect/envoy/case-consul-exec/setup.sh
index 7e869b53f17ad..f7397d5945476 100644
--- a/test/integration/connect/envoy/case-consul-exec/setup.sh
+++ b/test/integration/connect/envoy/case-consul-exec/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-consul-exec/vars.sh b/test/integration/connect/envoy/case-consul-exec/vars.sh
index 81ee777414571..79f66307d6d4c 100644
--- a/test/integration/connect/envoy/case-consul-exec/vars.sh
+++ b/test/integration/connect/envoy/case-consul-exec/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 # Bring up s1 and it's proxy as well because the check that it has a cert causes
 # a proxy connection to be opened and having the backend not be available seems
diff --git a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/base.hcl b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/base.hcl
index 8cd6db14878a7..f81ab0edd6e4c 100644
--- a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/base.hcl
+++ b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 primary_datacenter = "alpha"
 log_level          = "trace"
 peering {
diff --git a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/service_gateway.hcl b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/service_gateway.hcl
index 640b9b6ce753f..bcdcb2e8b3726 100644
--- a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/service_s1.hcl b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/service_s1.hcl
index b065abc9055e2..e97ec236661b6 100644
--- a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s1 service in this peer
diff --git a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/service_s2.hcl b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/service_s2.hcl
index 90d2315f4d2c9..01d4505c67722 100644
--- a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/setup.sh b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/setup.sh
index ca05659843d7c..4c6fa1594e4dc 100644
--- a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/setup.sh
+++ b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/alpha/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/bind.hcl b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/bind.hcl
+++ b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/capture.sh b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/capture.sh
index b4316246f3ab6..f7205ae515341 100644
--- a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/capture.sh
+++ b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19001 mesh-gateway primary || true
 snapshot_envoy_admin localhost:19003 mesh-gateway alpha || true
diff --git a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/base.hcl b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/base.hcl
index 55c268b37e784..c1e134d5a25fb 100644
--- a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/base.hcl
+++ b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 peering {
   enabled = true
 }
diff --git a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/service_gateway.hcl b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/service_gateway.hcl
index a6b33968ad020..831a70ff3293c 100644
--- a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/service_s1.hcl b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/service_s1.hcl
index b3230f6dcfa1f..af0773c29aab5 100644
--- a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/service_s2.hcl b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/service_s2.hcl
index d0f6294f72802..77164e722b6cf 100644
--- a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/service_s2.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s2 service in the primary dc
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/setup.sh b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/setup.sh
index d107c44ea6f39..5b0775f03ae23 100644
--- a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/setup.sh
+++ b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/vars.sh b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/vars.sh
index 93ac3281f1286..c856de1733a67 100644
--- a/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/vars.sh
+++ b/test/integration/connect/envoy/case-cross-peer-control-plane-mgw/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="s1 s1-sidecar-proxy gateway-primary s2-alpha s2-sidecar-proxy-alpha gateway-alpha"
 export REQUIRE_PEERS=1
diff --git a/test/integration/connect/envoy/case-cross-peers-http-router/alpha/base.hcl b/test/integration/connect/envoy/case-cross-peers-http-router/alpha/base.hcl
index 8cd6db14878a7..f81ab0edd6e4c 100644
--- a/test/integration/connect/envoy/case-cross-peers-http-router/alpha/base.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http-router/alpha/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 primary_datacenter = "alpha"
 log_level          = "trace"
 peering {
diff --git a/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_gateway.hcl b/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_gateway.hcl
index 640b9b6ce753f..bcdcb2e8b3726 100644
--- a/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_s1.hcl b/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_s1.hcl
index b065abc9055e2..e97ec236661b6 100644
--- a/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s1 service in this peer
diff --git a/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_s2.hcl b/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_s2.hcl
index 90d2315f4d2c9..01d4505c67722 100644
--- a/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_s3.hcl b/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_s3.hcl
index 94e31c3df895d..c8761365b71bf 100644
--- a/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_s3.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http-router/alpha/service_s3.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s3"
   port = 8282
diff --git a/test/integration/connect/envoy/case-cross-peers-http-router/alpha/setup.sh b/test/integration/connect/envoy/case-cross-peers-http-router/alpha/setup.sh
index 00ab68e36144c..d25c61e21bb7c 100644
--- a/test/integration/connect/envoy/case-cross-peers-http-router/alpha/setup.sh
+++ b/test/integration/connect/envoy/case-cross-peers-http-router/alpha/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cross-peers-http-router/bind.hcl b/test/integration/connect/envoy/case-cross-peers-http-router/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-cross-peers-http-router/bind.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http-router/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cross-peers-http-router/capture.sh b/test/integration/connect/envoy/case-cross-peers-http-router/capture.sh
index be4068fd193b2..65ddf9a0922c7 100644
--- a/test/integration/connect/envoy/case-cross-peers-http-router/capture.sh
+++ b/test/integration/connect/envoy/case-cross-peers-http-router/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 mesh-gateway primary || true
diff --git a/test/integration/connect/envoy/case-cross-peers-http-router/primary/base.hcl b/test/integration/connect/envoy/case-cross-peers-http-router/primary/base.hcl
index 55c268b37e784..c1e134d5a25fb 100644
--- a/test/integration/connect/envoy/case-cross-peers-http-router/primary/base.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http-router/primary/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 peering {
   enabled = true
 }
diff --git a/test/integration/connect/envoy/case-cross-peers-http-router/primary/service_gateway.hcl b/test/integration/connect/envoy/case-cross-peers-http-router/primary/service_gateway.hcl
index a6b33968ad020..831a70ff3293c 100644
--- a/test/integration/connect/envoy/case-cross-peers-http-router/primary/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http-router/primary/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cross-peers-http-router/primary/service_s1.hcl b/test/integration/connect/envoy/case-cross-peers-http-router/primary/service_s1.hcl
index ec6c29b8e158c..0e3dcbc3edc19 100644
--- a/test/integration/connect/envoy/case-cross-peers-http-router/primary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http-router/primary/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-cross-peers-http-router/primary/service_s2.hcl b/test/integration/connect/envoy/case-cross-peers-http-router/primary/service_s2.hcl
index d0f6294f72802..77164e722b6cf 100644
--- a/test/integration/connect/envoy/case-cross-peers-http-router/primary/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http-router/primary/service_s2.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s2 service in the primary dc
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cross-peers-http-router/primary/setup.sh b/test/integration/connect/envoy/case-cross-peers-http-router/primary/setup.sh
index 47c9eff11432a..ad9c9691cc368 100644
--- a/test/integration/connect/envoy/case-cross-peers-http-router/primary/setup.sh
+++ b/test/integration/connect/envoy/case-cross-peers-http-router/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cross-peers-http-router/vars.sh b/test/integration/connect/envoy/case-cross-peers-http-router/vars.sh
index b11c21c524075..e21a3c0d9962c 100644
--- a/test/integration/connect/envoy/case-cross-peers-http-router/vars.sh
+++ b/test/integration/connect/envoy/case-cross-peers-http-router/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="s1 s1-sidecar-proxy gateway-primary s2-alpha s2-sidecar-proxy-alpha s3-alpha s3-sidecar-proxy-alpha gateway-alpha tcpdump-primary tcpdump-alpha"
 export REQUIRE_PEERS=1
diff --git a/test/integration/connect/envoy/case-cross-peers-http/alpha/base.hcl b/test/integration/connect/envoy/case-cross-peers-http/alpha/base.hcl
index 8cd6db14878a7..f81ab0edd6e4c 100644
--- a/test/integration/connect/envoy/case-cross-peers-http/alpha/base.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http/alpha/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 primary_datacenter = "alpha"
 log_level          = "trace"
 peering {
diff --git a/test/integration/connect/envoy/case-cross-peers-http/alpha/service_gateway.hcl b/test/integration/connect/envoy/case-cross-peers-http/alpha/service_gateway.hcl
index 640b9b6ce753f..bcdcb2e8b3726 100644
--- a/test/integration/connect/envoy/case-cross-peers-http/alpha/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http/alpha/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cross-peers-http/alpha/service_s1.hcl b/test/integration/connect/envoy/case-cross-peers-http/alpha/service_s1.hcl
index b065abc9055e2..e97ec236661b6 100644
--- a/test/integration/connect/envoy/case-cross-peers-http/alpha/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http/alpha/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s1 service in this peer
diff --git a/test/integration/connect/envoy/case-cross-peers-http/alpha/service_s2.hcl b/test/integration/connect/envoy/case-cross-peers-http/alpha/service_s2.hcl
index 90d2315f4d2c9..01d4505c67722 100644
--- a/test/integration/connect/envoy/case-cross-peers-http/alpha/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http/alpha/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-cross-peers-http/alpha/setup.sh b/test/integration/connect/envoy/case-cross-peers-http/alpha/setup.sh
index 267d9403dba71..d25840b742f61 100644
--- a/test/integration/connect/envoy/case-cross-peers-http/alpha/setup.sh
+++ b/test/integration/connect/envoy/case-cross-peers-http/alpha/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cross-peers-http/bind.hcl b/test/integration/connect/envoy/case-cross-peers-http/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-cross-peers-http/bind.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cross-peers-http/capture.sh b/test/integration/connect/envoy/case-cross-peers-http/capture.sh
index 3e81bd44657f4..2419a58cdd878 100644
--- a/test/integration/connect/envoy/case-cross-peers-http/capture.sh
+++ b/test/integration/connect/envoy/case-cross-peers-http/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 mesh-gateway primary || true
diff --git a/test/integration/connect/envoy/case-cross-peers-http/primary/base.hcl b/test/integration/connect/envoy/case-cross-peers-http/primary/base.hcl
index 55c268b37e784..c1e134d5a25fb 100644
--- a/test/integration/connect/envoy/case-cross-peers-http/primary/base.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http/primary/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 peering {
   enabled = true
 }
diff --git a/test/integration/connect/envoy/case-cross-peers-http/primary/service_gateway.hcl b/test/integration/connect/envoy/case-cross-peers-http/primary/service_gateway.hcl
index a6b33968ad020..831a70ff3293c 100644
--- a/test/integration/connect/envoy/case-cross-peers-http/primary/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http/primary/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cross-peers-http/primary/service_s1.hcl b/test/integration/connect/envoy/case-cross-peers-http/primary/service_s1.hcl
index ec6c29b8e158c..0e3dcbc3edc19 100644
--- a/test/integration/connect/envoy/case-cross-peers-http/primary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http/primary/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-cross-peers-http/primary/service_s2.hcl b/test/integration/connect/envoy/case-cross-peers-http/primary/service_s2.hcl
index d0f6294f72802..77164e722b6cf 100644
--- a/test/integration/connect/envoy/case-cross-peers-http/primary/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-http/primary/service_s2.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s2 service in the primary dc
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cross-peers-http/primary/setup.sh b/test/integration/connect/envoy/case-cross-peers-http/primary/setup.sh
index 7c5ac5fdb8ba9..7f205c5e6ffb4 100644
--- a/test/integration/connect/envoy/case-cross-peers-http/primary/setup.sh
+++ b/test/integration/connect/envoy/case-cross-peers-http/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cross-peers-http/vars.sh b/test/integration/connect/envoy/case-cross-peers-http/vars.sh
index d999e45dd263e..388d22b8bbd8c 100644
--- a/test/integration/connect/envoy/case-cross-peers-http/vars.sh
+++ b/test/integration/connect/envoy/case-cross-peers-http/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="s1 s1-sidecar-proxy gateway-primary s2-alpha s2-sidecar-proxy-alpha gateway-alpha tcpdump-primary tcpdump-alpha"
 export REQUIRE_PEERS=1
diff --git a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/base.hcl b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/base.hcl
index 8cd6db14878a7..f81ab0edd6e4c 100644
--- a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/base.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 primary_datacenter = "alpha"
 log_level          = "trace"
 peering {
diff --git a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_gateway.hcl b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_gateway.hcl
index 640b9b6ce753f..bcdcb2e8b3726 100644
--- a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_s1.hcl b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_s1.hcl
index b065abc9055e2..e97ec236661b6 100644
--- a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s1 service in this peer
diff --git a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_s2.hcl b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_s2.hcl
index 90d2315f4d2c9..01d4505c67722 100644
--- a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_s3.hcl b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_s3.hcl
index 94e31c3df895d..c8761365b71bf 100644
--- a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_s3.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/service_s3.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s3"
   port = 8282
diff --git a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/setup.sh b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/setup.sh
index 3cc1a2eb2de8d..556d8fa408ca9 100644
--- a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/setup.sh
+++ b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/alpha/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/bind.hcl b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/bind.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/capture.sh b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/capture.sh
index be4068fd193b2..65ddf9a0922c7 100644
--- a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/capture.sh
+++ b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 mesh-gateway primary || true
diff --git a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/base.hcl b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/base.hcl
index 55c268b37e784..c1e134d5a25fb 100644
--- a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/base.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 peering {
   enabled = true
 }
diff --git a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/service_gateway.hcl b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/service_gateway.hcl
index a6b33968ad020..831a70ff3293c 100644
--- a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/service_s1.hcl b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/service_s1.hcl
index ec6c29b8e158c..0e3dcbc3edc19 100644
--- a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/service_s2.hcl b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/service_s2.hcl
index d0f6294f72802..77164e722b6cf 100644
--- a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/service_s2.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s2 service in the primary dc
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/setup.sh b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/setup.sh
index d72b0798f5d8f..8bb0836c71cb9 100644
--- a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/setup.sh
+++ b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/vars.sh b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/vars.sh
index b11c21c524075..e21a3c0d9962c 100644
--- a/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/vars.sh
+++ b/test/integration/connect/envoy/case-cross-peers-resolver-redirect-tcp/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="s1 s1-sidecar-proxy gateway-primary s2-alpha s2-sidecar-proxy-alpha s3-alpha s3-sidecar-proxy-alpha gateway-alpha tcpdump-primary tcpdump-alpha"
 export REQUIRE_PEERS=1
diff --git a/test/integration/connect/envoy/case-cross-peers/alpha/base.hcl b/test/integration/connect/envoy/case-cross-peers/alpha/base.hcl
index 8cd6db14878a7..f81ab0edd6e4c 100644
--- a/test/integration/connect/envoy/case-cross-peers/alpha/base.hcl
+++ b/test/integration/connect/envoy/case-cross-peers/alpha/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 primary_datacenter = "alpha"
 log_level          = "trace"
 peering {
diff --git a/test/integration/connect/envoy/case-cross-peers/alpha/service_gateway.hcl b/test/integration/connect/envoy/case-cross-peers/alpha/service_gateway.hcl
index 640b9b6ce753f..bcdcb2e8b3726 100644
--- a/test/integration/connect/envoy/case-cross-peers/alpha/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cross-peers/alpha/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cross-peers/alpha/service_s1.hcl b/test/integration/connect/envoy/case-cross-peers/alpha/service_s1.hcl
index b065abc9055e2..e97ec236661b6 100644
--- a/test/integration/connect/envoy/case-cross-peers/alpha/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cross-peers/alpha/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s1 service in this peer
diff --git a/test/integration/connect/envoy/case-cross-peers/alpha/service_s2.hcl b/test/integration/connect/envoy/case-cross-peers/alpha/service_s2.hcl
index 90d2315f4d2c9..01d4505c67722 100644
--- a/test/integration/connect/envoy/case-cross-peers/alpha/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cross-peers/alpha/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-cross-peers/alpha/setup.sh b/test/integration/connect/envoy/case-cross-peers/alpha/setup.sh
index f5fd3d003aa68..29e3c01415e13 100644
--- a/test/integration/connect/envoy/case-cross-peers/alpha/setup.sh
+++ b/test/integration/connect/envoy/case-cross-peers/alpha/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cross-peers/bind.hcl b/test/integration/connect/envoy/case-cross-peers/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-cross-peers/bind.hcl
+++ b/test/integration/connect/envoy/case-cross-peers/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cross-peers/capture.sh b/test/integration/connect/envoy/case-cross-peers/capture.sh
index 3e81bd44657f4..2419a58cdd878 100644
--- a/test/integration/connect/envoy/case-cross-peers/capture.sh
+++ b/test/integration/connect/envoy/case-cross-peers/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 mesh-gateway primary || true
diff --git a/test/integration/connect/envoy/case-cross-peers/primary/base.hcl b/test/integration/connect/envoy/case-cross-peers/primary/base.hcl
index 55c268b37e784..c1e134d5a25fb 100644
--- a/test/integration/connect/envoy/case-cross-peers/primary/base.hcl
+++ b/test/integration/connect/envoy/case-cross-peers/primary/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 peering {
   enabled = true
 }
diff --git a/test/integration/connect/envoy/case-cross-peers/primary/service_gateway.hcl b/test/integration/connect/envoy/case-cross-peers/primary/service_gateway.hcl
index a6b33968ad020..831a70ff3293c 100644
--- a/test/integration/connect/envoy/case-cross-peers/primary/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-cross-peers/primary/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-cross-peers/primary/service_s1.hcl b/test/integration/connect/envoy/case-cross-peers/primary/service_s1.hcl
index b3230f6dcfa1f..af0773c29aab5 100644
--- a/test/integration/connect/envoy/case-cross-peers/primary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-cross-peers/primary/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-cross-peers/primary/service_s2.hcl b/test/integration/connect/envoy/case-cross-peers/primary/service_s2.hcl
index d0f6294f72802..77164e722b6cf 100644
--- a/test/integration/connect/envoy/case-cross-peers/primary/service_s2.hcl
+++ b/test/integration/connect/envoy/case-cross-peers/primary/service_s2.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s2 service in the primary dc
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-cross-peers/primary/setup.sh b/test/integration/connect/envoy/case-cross-peers/primary/setup.sh
index d72b0798f5d8f..8bb0836c71cb9 100644
--- a/test/integration/connect/envoy/case-cross-peers/primary/setup.sh
+++ b/test/integration/connect/envoy/case-cross-peers/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-cross-peers/vars.sh b/test/integration/connect/envoy/case-cross-peers/vars.sh
index d999e45dd263e..388d22b8bbd8c 100644
--- a/test/integration/connect/envoy/case-cross-peers/vars.sh
+++ b/test/integration/connect/envoy/case-cross-peers/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="s1 s1-sidecar-proxy gateway-primary s2-alpha s2-sidecar-proxy-alpha gateway-alpha tcpdump-primary tcpdump-alpha"
 export REQUIRE_PEERS=1
diff --git a/test/integration/connect/envoy/case-dogstatsd-udp/service_s1.hcl b/test/integration/connect/envoy/case-dogstatsd-udp/service_s1.hcl
index a4e91f3aa41b4..a170184865ed6 100644
--- a/test/integration/connect/envoy/case-dogstatsd-udp/service_s1.hcl
+++ b/test/integration/connect/envoy/case-dogstatsd-udp/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-dogstatsd-udp/setup.sh b/test/integration/connect/envoy/case-dogstatsd-udp/setup.sh
index 3fb3ade6c5fbb..e8321972b34e1 100644
--- a/test/integration/connect/envoy/case-dogstatsd-udp/setup.sh
+++ b/test/integration/connect/envoy/case-dogstatsd-udp/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-dogstatsd-udp/vars.sh b/test/integration/connect/envoy/case-dogstatsd-udp/vars.sh
index 7fa5a238ce933..783eeaab96102 100644
--- a/test/integration/connect/envoy/case-dogstatsd-udp/vars.sh
+++ b/test/integration/connect/envoy/case-dogstatsd-udp/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES fake-statsd"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-dogstatsd-udp/verify.bats b/test/integration/connect/envoy/case-dogstatsd-udp/verify.bats
index dfc238ad6d9de..55b0ad76849c3 100644
--- a/test/integration/connect/envoy/case-dogstatsd-udp/verify.bats
+++ b/test/integration/connect/envoy/case-dogstatsd-udp/verify.bats
@@ -24,11 +24,14 @@ load helpers
 }
 
 @test "s1 proxy should be sending metrics to statsd" {
-  run retry_default must_match_in_statsd_logs '^envoy\.' primary  
+  run retry_default cat /workdir/primary/statsd/statsd.log
 
-  echo "METRICS: $output"
+  echo "METRICS:"
+  echo "$output"
+  echo "COUNT: $(echo "$output" | grep -Ec '^envoy\.')"
 
-  [ "$status" == 0 ]  
+  [ "$status" == 0 ]
+  [ $(echo $output | grep -Ec '^envoy\.') -gt "0" ]
 }
 
 @test "s1 proxy should be sending dogstatsd tagged metrics" {
diff --git a/test/integration/connect/envoy/case-expose-checks/capture.sh b/test/integration/connect/envoy/case-expose-checks/capture.sh
index c6b9e36ed1df1..af3245f345ad1 100644
--- a/test/integration/connect/envoy/case-expose-checks/capture.sh
+++ b/test/integration/connect/envoy/case-expose-checks/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 || true
 snapshot_envoy_admin localhost:19001 s2 || true
diff --git a/test/integration/connect/envoy/case-expose-checks/service_s1.hcl b/test/integration/connect/envoy/case-expose-checks/service_s1.hcl
index b2b685c08abec..7f48b1c515a1e 100644
--- a/test/integration/connect/envoy/case-expose-checks/service_s1.hcl
+++ b/test/integration/connect/envoy/case-expose-checks/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-expose-checks/service_s2.hcl b/test/integration/connect/envoy/case-expose-checks/service_s2.hcl
index f5cb3fb0374c4..ce2fe46c88edd 100644
--- a/test/integration/connect/envoy/case-expose-checks/service_s2.hcl
+++ b/test/integration/connect/envoy/case-expose-checks/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-expose-checks/setup.sh b/test/integration/connect/envoy/case-expose-checks/setup.sh
index 3fb3ade6c5fbb..e8321972b34e1 100644
--- a/test/integration/connect/envoy/case-expose-checks/setup.sh
+++ b/test/integration/connect/envoy/case-expose-checks/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-gateway-without-services/bind.hcl b/test/integration/connect/envoy/case-gateway-without-services/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-gateway-without-services/bind.hcl
+++ b/test/integration/connect/envoy/case-gateway-without-services/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-gateway-without-services/capture.sh b/test/integration/connect/envoy/case-gateway-without-services/capture.sh
index ad74026c7ace2..6293a4289049a 100644
--- a/test/integration/connect/envoy/case-gateway-without-services/capture.sh
+++ b/test/integration/connect/envoy/case-gateway-without-services/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 mesh-gateway primary || true
diff --git a/test/integration/connect/envoy/case-gateway-without-services/service_gateway.hcl b/test/integration/connect/envoy/case-gateway-without-services/service_gateway.hcl
index 2026fb2a94b84..7bdbfd6dc1b92 100644
--- a/test/integration/connect/envoy/case-gateway-without-services/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-gateway-without-services/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-gateway-without-services/service_s1.hcl b/test/integration/connect/envoy/case-gateway-without-services/service_s1.hcl
index 0891eebceb9c9..f9c223cfec6d1 100644
--- a/test/integration/connect/envoy/case-gateway-without-services/service_s1.hcl
+++ b/test/integration/connect/envoy/case-gateway-without-services/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s1 service
diff --git a/test/integration/connect/envoy/case-gateway-without-services/service_s2.hcl b/test/integration/connect/envoy/case-gateway-without-services/service_s2.hcl
index ca644bb3ffa22..89311191b3113 100644
--- a/test/integration/connect/envoy/case-gateway-without-services/service_s2.hcl
+++ b/test/integration/connect/envoy/case-gateway-without-services/service_s2.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s2 service
diff --git a/test/integration/connect/envoy/case-gateway-without-services/setup.sh b/test/integration/connect/envoy/case-gateway-without-services/setup.sh
index 6e4f5d8ee9bf9..8625e0f3595b4 100644
--- a/test/integration/connect/envoy/case-gateway-without-services/setup.sh
+++ b/test/integration/connect/envoy/case-gateway-without-services/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-gateway-without-services/vars.sh b/test/integration/connect/envoy/case-gateway-without-services/vars.sh
index 21ab024ab5375..b9f520fae3563 100644
--- a/test/integration/connect/envoy/case-gateway-without-services/vars.sh
+++ b/test/integration/connect/envoy/case-gateway-without-services/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="gateway-primary"
diff --git a/test/integration/connect/envoy/case-gateways-local/bind.hcl b/test/integration/connect/envoy/case-gateways-local/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-gateways-local/bind.hcl
+++ b/test/integration/connect/envoy/case-gateways-local/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-gateways-local/capture.sh b/test/integration/connect/envoy/case-gateways-local/capture.sh
index f4727b52c72ad..31b12ff345161 100644
--- a/test/integration/connect/envoy/case-gateways-local/capture.sh
+++ b/test/integration/connect/envoy/case-gateways-local/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 s2 secondary || true
diff --git a/test/integration/connect/envoy/case-gateways-local/primary/service_gateway.hcl b/test/integration/connect/envoy/case-gateways-local/primary/service_gateway.hcl
index 2026fb2a94b84..7bdbfd6dc1b92 100644
--- a/test/integration/connect/envoy/case-gateways-local/primary/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-gateways-local/primary/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-gateways-local/primary/service_s1.hcl b/test/integration/connect/envoy/case-gateways-local/primary/service_s1.hcl
index 75fa1acc0e7e3..7d2657948850c 100644
--- a/test/integration/connect/envoy/case-gateways-local/primary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-gateways-local/primary/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-gateways-local/primary/service_s2.hcl b/test/integration/connect/envoy/case-gateways-local/primary/service_s2.hcl
index d0f6294f72802..77164e722b6cf 100644
--- a/test/integration/connect/envoy/case-gateways-local/primary/service_s2.hcl
+++ b/test/integration/connect/envoy/case-gateways-local/primary/service_s2.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s2 service in the primary dc
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-gateways-local/primary/setup.sh b/test/integration/connect/envoy/case-gateways-local/primary/setup.sh
index 29720753ba515..705d500be2dbd 100644
--- a/test/integration/connect/envoy/case-gateways-local/primary/setup.sh
+++ b/test/integration/connect/envoy/case-gateways-local/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-gateways-local/secondary/join.hcl b/test/integration/connect/envoy/case-gateways-local/secondary/join.hcl
index f0bd3fbd4ac7e..32cc24f2ebdd9 100644
--- a/test/integration/connect/envoy/case-gateways-local/secondary/join.hcl
+++ b/test/integration/connect/envoy/case-gateways-local/secondary/join.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 retry_join_wan = ["consul-primary-server"]
diff --git a/test/integration/connect/envoy/case-gateways-local/secondary/service_gateway.hcl b/test/integration/connect/envoy/case-gateways-local/secondary/service_gateway.hcl
index 4f91a740182af..55f03ac0501dc 100644
--- a/test/integration/connect/envoy/case-gateways-local/secondary/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-gateways-local/secondary/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-gateways-local/secondary/service_s1.hcl b/test/integration/connect/envoy/case-gateways-local/secondary/service_s1.hcl
index 8b4d4a83a42d4..eff93eb6b5195 100644
--- a/test/integration/connect/envoy/case-gateways-local/secondary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-gateways-local/secondary/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # we don't want an s1 service in the secondary dc
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-gateways-local/secondary/setup.sh b/test/integration/connect/envoy/case-gateways-local/secondary/setup.sh
index ede2b4c4b9f70..30b1810b528fe 100644
--- a/test/integration/connect/envoy/case-gateways-local/secondary/setup.sh
+++ b/test/integration/connect/envoy/case-gateways-local/secondary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
@@ -9,4 +6,4 @@ register_services secondary
 
 gen_envoy_bootstrap s2 19001 secondary
 gen_envoy_bootstrap mesh-gateway 19003 secondary true
-retry_default docker_consul secondary curl -s  "http://localhost:8500/v1/catalog/service/consul?dc=primary" > /dev/null
+retry_default docker_consul secondary curl -s  "http://localhost:8500/v1/catalog/service/consul?dc=primary" >/dev/null
diff --git a/test/integration/connect/envoy/case-gateways-local/vars.sh b/test/integration/connect/envoy/case-gateways-local/vars.sh
index d9a319933f8da..29b1528e7bd53 100644
--- a/test/integration/connect/envoy/case-gateways-local/vars.sh
+++ b/test/integration/connect/envoy/case-gateways-local/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="s1 s1-sidecar-proxy gateway-primary s2-secondary s2-sidecar-proxy-secondary gateway-secondary"
 export REQUIRE_SECONDARY=1
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-gateways-remote/bind.hcl b/test/integration/connect/envoy/case-gateways-remote/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-gateways-remote/bind.hcl
+++ b/test/integration/connect/envoy/case-gateways-remote/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-gateways-remote/capture.sh b/test/integration/connect/envoy/case-gateways-remote/capture.sh
index f4727b52c72ad..31b12ff345161 100644
--- a/test/integration/connect/envoy/case-gateways-remote/capture.sh
+++ b/test/integration/connect/envoy/case-gateways-remote/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 s2 secondary || true
diff --git a/test/integration/connect/envoy/case-gateways-remote/primary/service_s1.hcl b/test/integration/connect/envoy/case-gateways-remote/primary/service_s1.hcl
index 4cb4fbc41d1e3..6f0bb1db87f6c 100644
--- a/test/integration/connect/envoy/case-gateways-remote/primary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-gateways-remote/primary/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-gateways-remote/primary/service_s2.hcl b/test/integration/connect/envoy/case-gateways-remote/primary/service_s2.hcl
index d0f6294f72802..77164e722b6cf 100644
--- a/test/integration/connect/envoy/case-gateways-remote/primary/service_s2.hcl
+++ b/test/integration/connect/envoy/case-gateways-remote/primary/service_s2.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s2 service in the primary dc
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-gateways-remote/primary/setup.sh b/test/integration/connect/envoy/case-gateways-remote/primary/setup.sh
index 6dd0f0622bd36..fe0325032d6d7 100644
--- a/test/integration/connect/envoy/case-gateways-remote/primary/setup.sh
+++ b/test/integration/connect/envoy/case-gateways-remote/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-gateways-remote/secondary/join.hcl b/test/integration/connect/envoy/case-gateways-remote/secondary/join.hcl
index f0bd3fbd4ac7e..32cc24f2ebdd9 100644
--- a/test/integration/connect/envoy/case-gateways-remote/secondary/join.hcl
+++ b/test/integration/connect/envoy/case-gateways-remote/secondary/join.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 retry_join_wan = ["consul-primary-server"]
diff --git a/test/integration/connect/envoy/case-gateways-remote/secondary/service_gateway.hcl b/test/integration/connect/envoy/case-gateways-remote/secondary/service_gateway.hcl
index 4f91a740182af..55f03ac0501dc 100644
--- a/test/integration/connect/envoy/case-gateways-remote/secondary/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-gateways-remote/secondary/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-gateways-remote/secondary/service_s1.hcl b/test/integration/connect/envoy/case-gateways-remote/secondary/service_s1.hcl
index 8b4d4a83a42d4..eff93eb6b5195 100644
--- a/test/integration/connect/envoy/case-gateways-remote/secondary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-gateways-remote/secondary/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # we don't want an s1 service in the secondary dc
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-gateways-remote/secondary/setup.sh b/test/integration/connect/envoy/case-gateways-remote/secondary/setup.sh
index 43a4c713cee91..30b1810b528fe 100644
--- a/test/integration/connect/envoy/case-gateways-remote/secondary/setup.sh
+++ b/test/integration/connect/envoy/case-gateways-remote/secondary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-gateways-remote/vars.sh b/test/integration/connect/envoy/case-gateways-remote/vars.sh
index d9a319933f8da..29b1528e7bd53 100644
--- a/test/integration/connect/envoy/case-gateways-remote/vars.sh
+++ b/test/integration/connect/envoy/case-gateways-remote/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="s1 s1-sidecar-proxy gateway-primary s2-secondary s2-sidecar-proxy-secondary gateway-secondary"
 export REQUIRE_SECONDARY=1
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-grpc/service_s1.hcl b/test/integration/connect/envoy/case-grpc/service_s1.hcl
index 7d7814800c4d7..37a514bfe541e 100644
--- a/test/integration/connect/envoy/case-grpc/service_s1.hcl
+++ b/test/integration/connect/envoy/case-grpc/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8079
@@ -20,7 +17,7 @@ services {
           protocol = "grpc"
           envoy_dogstatsd_url = "udp://127.0.0.1:8125"
           envoy_stats_tags = ["foo=bar"]
-          envoy_stats_flush_interval = "5s"
+          envoy_stats_flush_interval = "1s"
         }
       }
     }
diff --git a/test/integration/connect/envoy/case-grpc/service_s2.hcl b/test/integration/connect/envoy/case-grpc/service_s2.hcl
index aaebecf627320..04018bb240702 100644
--- a/test/integration/connect/envoy/case-grpc/service_s2.hcl
+++ b/test/integration/connect/envoy/case-grpc/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   # Advertise gRPC port
diff --git a/test/integration/connect/envoy/case-grpc/setup.sh b/test/integration/connect/envoy/case-grpc/setup.sh
index 3fb3ade6c5fbb..e8321972b34e1 100644
--- a/test/integration/connect/envoy/case-grpc/setup.sh
+++ b/test/integration/connect/envoy/case-grpc/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-grpc/vars.sh b/test/integration/connect/envoy/case-grpc/vars.sh
index 7fa5a238ce933..783eeaab96102 100644
--- a/test/integration/connect/envoy/case-grpc/vars.sh
+++ b/test/integration/connect/envoy/case-grpc/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES fake-statsd"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-grpc/verify.bats b/test/integration/connect/envoy/case-grpc/verify.bats
index fc7ca15b5b94a..422258a0c0ef7 100644
--- a/test/integration/connect/envoy/case-grpc/verify.bats
+++ b/test/integration/connect/envoy/case-grpc/verify.bats
@@ -43,7 +43,7 @@ load helpers
     metrics_query='envoy.cluster.grpc.PingServer.total.*[#,]local_cluster:s1(,|$)'
   fi
 
-  run retry_long must_match_in_statsd_logs "${metrics_query}"
+  run retry_default must_match_in_statsd_logs "${metrics_query}"
   echo "OUTPUT: $output"
 
   [ "$status" == 0 ]
diff --git a/test/integration/connect/envoy/case-http-badauthz/capture.sh b/test/integration/connect/envoy/case-http-badauthz/capture.sh
index c6b9e36ed1df1..af3245f345ad1 100644
--- a/test/integration/connect/envoy/case-http-badauthz/capture.sh
+++ b/test/integration/connect/envoy/case-http-badauthz/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 || true
 snapshot_envoy_admin localhost:19001 s2 || true
diff --git a/test/integration/connect/envoy/case-http-badauthz/service_s1.hcl b/test/integration/connect/envoy/case-http-badauthz/service_s1.hcl
index 25d2c1e380f26..d13820aa3d5aa 100644
--- a/test/integration/connect/envoy/case-http-badauthz/service_s1.hcl
+++ b/test/integration/connect/envoy/case-http-badauthz/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-http-badauthz/service_s2.hcl b/test/integration/connect/envoy/case-http-badauthz/service_s2.hcl
index fb857d005ee91..c215cc23538a8 100644
--- a/test/integration/connect/envoy/case-http-badauthz/service_s2.hcl
+++ b/test/integration/connect/envoy/case-http-badauthz/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-http-badauthz/setup.sh b/test/integration/connect/envoy/case-http-badauthz/setup.sh
index d15f836e65847..eb4f3de93b720 100644
--- a/test/integration/connect/envoy/case-http-badauthz/setup.sh
+++ b/test/integration/connect/envoy/case-http-badauthz/setup.sh
@@ -1,14 +1,11 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
-register_services primary
-
 # Setup deny intention
 setup_upsert_l4_intention s1 s2 deny
 
+register_services primary
+
 gen_envoy_bootstrap s1 19000 primary
 gen_envoy_bootstrap s2 19001 primary
diff --git a/test/integration/connect/envoy/case-http/capture.sh b/test/integration/connect/envoy/case-http/capture.sh
index 14dc00afc65b8..1a11f7d5e0146 100644
--- a/test/integration/connect/envoy/case-http/capture.sh
+++ b/test/integration/connect/envoy/case-http/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 s2 primary || true
diff --git a/test/integration/connect/envoy/case-http/service_s1.hcl b/test/integration/connect/envoy/case-http/service_s1.hcl
index 42a62acfb9f68..3b96bfa5cb058 100644
--- a/test/integration/connect/envoy/case-http/service_s1.hcl
+++ b/test/integration/connect/envoy/case-http/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-http/service_s2.hcl b/test/integration/connect/envoy/case-http/service_s2.hcl
index fb857d005ee91..c215cc23538a8 100644
--- a/test/integration/connect/envoy/case-http/service_s2.hcl
+++ b/test/integration/connect/envoy/case-http/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-http/setup.sh b/test/integration/connect/envoy/case-http/setup.sh
index 3fb3ade6c5fbb..e8321972b34e1 100644
--- a/test/integration/connect/envoy/case-http/setup.sh
+++ b/test/integration/connect/envoy/case-http/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-ingress-gateway-grpc/capture.sh b/test/integration/connect/envoy/case-ingress-gateway-grpc/capture.sh
index 4214ba8274aaa..564b963a164d1 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-grpc/capture.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-grpc/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 ingress-gateway primary || true
diff --git a/test/integration/connect/envoy/case-ingress-gateway-grpc/service_gateway.hcl b/test/integration/connect/envoy/case-ingress-gateway-grpc/service_gateway.hcl
index a1324f7f83799..781ef1851b274 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-grpc/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-grpc/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "ingress-gateway"
   kind = "ingress-gateway"
diff --git a/test/integration/connect/envoy/case-ingress-gateway-grpc/service_s1.hcl b/test/integration/connect/envoy/case-ingress-gateway-grpc/service_s1.hcl
index f525d48868ced..3a3a9f815b816 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-grpc/service_s1.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-grpc/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8079
diff --git a/test/integration/connect/envoy/case-ingress-gateway-grpc/setup.sh b/test/integration/connect/envoy/case-ingress-gateway-grpc/setup.sh
index 387d079e3bd2a..3271072c4cf92 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-grpc/setup.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-grpc/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-ingress-gateway-grpc/vars.sh b/test/integration/connect/envoy/case-ingress-gateway-grpc/vars.sh
index 8b34fe36ef2a3..c97ad2ea5409e 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-grpc/vars.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-grpc/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES ingress-gateway-primary"
diff --git a/test/integration/connect/envoy/case-ingress-gateway-http/capture.sh b/test/integration/connect/envoy/case-ingress-gateway-http/capture.sh
index c2b55d229a591..41ea5cb24fb61 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-http/capture.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-http/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 ingress-gateway primary || true
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-ingress-gateway-http/service_gateway.hcl b/test/integration/connect/envoy/case-ingress-gateway-http/service_gateway.hcl
index a1324f7f83799..781ef1851b274 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-http/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-http/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "ingress-gateway"
   kind = "ingress-gateway"
diff --git a/test/integration/connect/envoy/case-ingress-gateway-http/setup.sh b/test/integration/connect/envoy/case-ingress-gateway-http/setup.sh
index 33d06b516c725..34fa9592d6e0c 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-http/setup.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-http/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-ingress-gateway-http/vars.sh b/test/integration/connect/envoy/case-ingress-gateway-http/vars.sh
index 8b34fe36ef2a3..c97ad2ea5409e 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-http/vars.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-http/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES ingress-gateway-primary"
diff --git a/test/integration/connect/envoy/case-ingress-gateway-multiple-services/capture.sh b/test/integration/connect/envoy/case-ingress-gateway-multiple-services/capture.sh
index c2b55d229a591..41ea5cb24fb61 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-multiple-services/capture.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-multiple-services/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 ingress-gateway primary || true
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-ingress-gateway-multiple-services/service_gateway.hcl b/test/integration/connect/envoy/case-ingress-gateway-multiple-services/service_gateway.hcl
index a1324f7f83799..781ef1851b274 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-multiple-services/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-multiple-services/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "ingress-gateway"
   kind = "ingress-gateway"
diff --git a/test/integration/connect/envoy/case-ingress-gateway-multiple-services/setup.sh b/test/integration/connect/envoy/case-ingress-gateway-multiple-services/setup.sh
index 858d2f9ce53a2..4631b351275ff 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-multiple-services/setup.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-multiple-services/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-ingress-gateway-multiple-services/vars.sh b/test/integration/connect/envoy/case-ingress-gateway-multiple-services/vars.sh
index 8b34fe36ef2a3..c97ad2ea5409e 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-multiple-services/vars.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-multiple-services/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES ingress-gateway-primary"
diff --git a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/base.hcl b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/base.hcl
index 8cd6db14878a7..f81ab0edd6e4c 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/base.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 primary_datacenter = "alpha"
 log_level          = "trace"
 peering {
diff --git a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/service_gateway.hcl b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/service_gateway.hcl
index 640b9b6ce753f..bcdcb2e8b3726 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/service_s1.hcl b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/service_s1.hcl
index b065abc9055e2..e97ec236661b6 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/service_s1.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s1 service in this peer
diff --git a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/service_s2.hcl b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/service_s2.hcl
index 26b5f481f377a..14bf414fdc0ff 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/service_s2.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/setup.sh b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/setup.sh
index 99c4eb46f2186..ff7dcb8114eae 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/setup.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/alpha/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/bind.hcl b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/bind.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/capture.sh b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/capture.sh
index ca10f2773107a..c1376910592cb 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/capture.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 ingress-gateway primary || true
 snapshot_envoy_admin localhost:19001 s2 primary || true
diff --git a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/base.hcl b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/base.hcl
index 55c268b37e784..c1e134d5a25fb 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/base.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/base.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 peering {
   enabled = true
 }
diff --git a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/service_ingress.hcl b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/service_ingress.hcl
index a1324f7f83799..781ef1851b274 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/service_ingress.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/service_ingress.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "ingress-gateway"
   kind = "ingress-gateway"
diff --git a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/service_s1.hcl b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/service_s1.hcl
index 18be60cdbf96a..aca546a5d618d 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't need an s1 because requests go through the gateway and not a sidecar.
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/service_s2.hcl b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/service_s2.hcl
index 26b5f481f377a..14bf414fdc0ff 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/service_s2.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/setup.sh b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/setup.sh
index b4a8dd736feec..327bd980b7849 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/setup.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/verify.bats b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/verify.bats
index d7fb87bb0ee62..630a4d4ec2277 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/verify.bats
+++ b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/primary/verify.bats
@@ -33,8 +33,8 @@ load helpers
 # Failover
 
 @test "s1 upstream should have healthy endpoints for s2 in both primary and failover" {
-  assert_upstream_has_endpoints_in_status 127.0.0.1:20000 failover-target~0~s2.default.primary.internal HEALTHY 1
-  assert_upstream_has_endpoints_in_status 127.0.0.1:20000 failover-target~1~s2.default.primary.internal HEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:20000 failover-target~s2.default.primary.internal HEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:20000 failover-target~s2.default.primary-to-alpha.external HEALTHY 1
 }
 
 @test "ingress-gateway should be able to connect to s2" {
@@ -42,7 +42,7 @@ load helpers
 }
 
 @test "s1 upstream made 1 connection" {
-  assert_envoy_metric_at_least 127.0.0.1:20000 "cluster.failover-target~0~s2.default.primary.internal.*cx_total" 1
+  assert_envoy_metric_at_least 127.0.0.1:20000 "cluster.failover-target~s2.default.primary.internal.*cx_total" 1
 }
 
 @test "terminate instance of s2 primary envoy which should trigger failover to s2 alpha when the tcp check fails" {
@@ -54,8 +54,8 @@ load helpers
 }
 
 @test "s1 upstream should have healthy endpoints for s2 in the failover cluster peer" {
-  assert_upstream_has_endpoints_in_status 127.0.0.1:20000 failover-target~0~s2.default.primary.internal UNHEALTHY 1
-  assert_upstream_has_endpoints_in_status 127.0.0.1:20000 failover-target~1~s2.default.primary.internal HEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:20000 failover-target~s2.default.primary.internal UNHEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:20000 failover-target~s2.default.primary-to-alpha.external HEALTHY 1
 }
 
 @test "reset envoy statistics for failover" {
@@ -71,5 +71,5 @@ load helpers
 }
 
 @test "s1 upstream made 1 connection to s2 through the cluster peer" {
-  assert_envoy_metric_at_least 127.0.0.1:20000 "cluster.failover-target~1~s2.default.primary.internal.*cx_total" 1
+  assert_envoy_metric_at_least 127.0.0.1:20000 "cluster.failover-target~s2.default.primary-to-alpha.external.*cx_total" 1
 }
diff --git a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/vars.sh b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/vars.sh
index 8f9ac12cb1e3d..3c598404d33e1 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-peering-failover/vars.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-peering-failover/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="s2 s2-sidecar-proxy s2-alpha s2-sidecar-proxy-alpha gateway-alpha ingress-gateway-primary"
 export REQUIRE_PEERS=1
diff --git a/test/integration/connect/envoy/case-ingress-gateway-sds/capture.sh b/test/integration/connect/envoy/case-ingress-gateway-sds/capture.sh
index c2b55d229a591..41ea5cb24fb61 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-sds/capture.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-sds/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 ingress-gateway primary || true
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-ingress-gateway-sds/service_gateway.hcl b/test/integration/connect/envoy/case-ingress-gateway-sds/service_gateway.hcl
index 1ffa476e6ff98..2c9f7a3aaf817 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-sds/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-sds/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "ingress-gateway"
   kind = "ingress-gateway"
diff --git a/test/integration/connect/envoy/case-ingress-gateway-sds/setup.sh b/test/integration/connect/envoy/case-ingress-gateway-sds/setup.sh
index fbef09b014cf2..c651fdc2b1f71 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-sds/setup.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-sds/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-ingress-gateway-sds/vars.sh b/test/integration/connect/envoy/case-ingress-gateway-sds/vars.sh
index 6bbbcfd6fe52d..b53032fbe444c 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-sds/vars.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-sds/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES ingress-gateway-primary test-sds-server"
diff --git a/test/integration/connect/envoy/case-ingress-gateway-simple/capture.sh b/test/integration/connect/envoy/case-ingress-gateway-simple/capture.sh
index c2b55d229a591..41ea5cb24fb61 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-simple/capture.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-simple/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 ingress-gateway primary || true
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-ingress-gateway-simple/service_gateway.hcl b/test/integration/connect/envoy/case-ingress-gateway-simple/service_gateway.hcl
index a1324f7f83799..781ef1851b274 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-simple/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-simple/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "ingress-gateway"
   kind = "ingress-gateway"
diff --git a/test/integration/connect/envoy/case-ingress-gateway-simple/setup.sh b/test/integration/connect/envoy/case-ingress-gateway-simple/setup.sh
index aaaa4d91cb4de..d4c73ac842c4b 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-simple/setup.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-simple/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-ingress-gateway-simple/vars.sh b/test/integration/connect/envoy/case-ingress-gateway-simple/vars.sh
index 8b34fe36ef2a3..c97ad2ea5409e 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-simple/vars.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-simple/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES ingress-gateway-primary"
diff --git a/test/integration/connect/envoy/case-ingress-gateway-tls/capture.sh b/test/integration/connect/envoy/case-ingress-gateway-tls/capture.sh
index c2b55d229a591..41ea5cb24fb61 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-tls/capture.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-tls/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 ingress-gateway primary || true
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-ingress-gateway-tls/service_gateway.hcl b/test/integration/connect/envoy/case-ingress-gateway-tls/service_gateway.hcl
index a1324f7f83799..781ef1851b274 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-tls/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-ingress-gateway-tls/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "ingress-gateway"
   kind = "ingress-gateway"
diff --git a/test/integration/connect/envoy/case-ingress-gateway-tls/setup.sh b/test/integration/connect/envoy/case-ingress-gateway-tls/setup.sh
index a485eeaa5b29f..b23971f0bc60b 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-tls/setup.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-tls/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-ingress-gateway-tls/vars.sh b/test/integration/connect/envoy/case-ingress-gateway-tls/vars.sh
index 8b34fe36ef2a3..c97ad2ea5409e 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-tls/vars.sh
+++ b/test/integration/connect/envoy/case-ingress-gateway-tls/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES ingress-gateway-primary"
diff --git a/test/integration/connect/envoy/case-ingress-gateway-tls/verify.bats b/test/integration/connect/envoy/case-ingress-gateway-tls/verify.bats
index 92a158e51b6a5..61eaaf97ccdf8 100644
--- a/test/integration/connect/envoy/case-ingress-gateway-tls/verify.bats
+++ b/test/integration/connect/envoy/case-ingress-gateway-tls/verify.bats
@@ -19,7 +19,7 @@ load helpers
 }
 
 @test "ingress-gateway should have healthy endpoints for s1" {
-   assert_upstream_has_endpoints_in_status 127.0.0.1:20000 s1 HEALTHY 1
+  assert_upstream_has_endpoints_in_status 127.0.0.1:20000 s1 HEALTHY 1
 }
 
 @test "should be able to connect to s1 through the TLS-enabled ingress port" {
@@ -29,8 +29,8 @@ load helpers
   run retry_default curl --cacert <(get_ca_root) -s -f -d hello \
     --resolve s1.ingress.consul:9998:127.0.0.1 \
     https://s1.ingress.consul:9998
-    [ "$status" -eq 0 ]
-    [[ "$output" == *"hello"* ]]
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"hello"* ]]
 }
 
 @test "should be able to connect to s1 through the TLS-enabled ingress port using the custom host" {
@@ -38,6 +38,6 @@ load helpers
   run retry_default curl --cacert <(get_ca_root) -s -f -d hello \
     --resolve test.example.com:9999:127.0.0.1 \
     https://test.example.com:9999
-    [ "$status" -eq 0 ]
-    [[ "$output" == *"hello"* ]]
+  [ "$status" -eq 0 ]
+  [[ "$output" == *"hello"* ]]
 }
diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/bind.hcl b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/bind.hcl
+++ b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/capture.sh b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/capture.sh
index 3bbc13144aa27..8f838e6e3a610 100644
--- a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/capture.sh
+++ b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 ingress-gateway primary || true
 snapshot_envoy_admin localhost:19001 s2 secondary || true
diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_gateway.hcl b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_gateway.hcl
index 2026fb2a94b84..7bdbfd6dc1b92 100644
--- a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_ingress.hcl b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_ingress.hcl
index a1324f7f83799..781ef1851b274 100644
--- a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_ingress.hcl
+++ b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_ingress.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "ingress-gateway"
   kind = "ingress-gateway"
diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_s1.hcl b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_s1.hcl
index e6f778e5c811d..1a239d879f576 100644
--- a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s1 service in the primary dc
diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_s2.hcl b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_s2.hcl
index d0f6294f72802..77164e722b6cf 100644
--- a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_s2.hcl
+++ b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_s2.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s2 service in the primary dc
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/setup.sh b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/setup.sh
index f7e31ac0db5a4..d9c269b790db6 100644
--- a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/setup.sh
+++ b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/join.hcl b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/join.hcl
index f0bd3fbd4ac7e..32cc24f2ebdd9 100644
--- a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/join.hcl
+++ b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/join.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 retry_join_wan = ["consul-primary-server"]
diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/service_gateway.hcl b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/service_gateway.hcl
index 4f91a740182af..55f03ac0501dc 100644
--- a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/setup.sh b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/setup.sh
index 59f303a5eafde..c3ec8b3c6c1ca 100644
--- a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/setup.sh
+++ b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/vars.sh b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/vars.sh
index 85c791704a871..eab6bb3ee029b 100644
--- a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/vars.sh
+++ b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="gateway-primary s1-secondary s1-sidecar-proxy-secondary s2-secondary s2-sidecar-proxy-secondary gateway-secondary ingress-gateway-primary"
 export REQUIRE_SECONDARY=1
diff --git a/test/integration/connect/envoy/case-l7-intentions/acl.hcl b/test/integration/connect/envoy/case-l7-intentions/acl.hcl
index 3d80d4f69420b..5d6141ec7b603 100644
--- a/test/integration/connect/envoy/case-l7-intentions/acl.hcl
+++ b/test/integration/connect/envoy/case-l7-intentions/acl.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 acl {
   default_policy = "deny"
 }
diff --git a/test/integration/connect/envoy/case-l7-intentions/capture.sh b/test/integration/connect/envoy/case-l7-intentions/capture.sh
index d588be9381ea0..ae47152208964 100644
--- a/test/integration/connect/envoy/case-l7-intentions/capture.sh
+++ b/test/integration/connect/envoy/case-l7-intentions/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 s2 || true
diff --git a/test/integration/connect/envoy/case-l7-intentions/setup.sh b/test/integration/connect/envoy/case-l7-intentions/setup.sh
index 6946ce3263a9a..5a2b734394c82 100644
--- a/test/integration/connect/envoy/case-l7-intentions/setup.sh
+++ b/test/integration/connect/envoy/case-l7-intentions/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-lua/capture.sh b/test/integration/connect/envoy/case-lua/capture.sh
index 14dc00afc65b8..1a11f7d5e0146 100644
--- a/test/integration/connect/envoy/case-lua/capture.sh
+++ b/test/integration/connect/envoy/case-lua/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 s2 primary || true
diff --git a/test/integration/connect/envoy/case-lua/service_s1.hcl b/test/integration/connect/envoy/case-lua/service_s1.hcl
index 54c6ac6501b40..0d8957c000b51 100644
--- a/test/integration/connect/envoy/case-lua/service_s1.hcl
+++ b/test/integration/connect/envoy/case-lua/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-lua/service_s2.hcl b/test/integration/connect/envoy/case-lua/service_s2.hcl
index a167379776625..9c23e79c7267a 100644
--- a/test/integration/connect/envoy/case-lua/service_s2.hcl
+++ b/test/integration/connect/envoy/case-lua/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-lua/setup.sh b/test/integration/connect/envoy/case-lua/setup.sh
index 56a668c0ac061..2455758a0b7db 100644
--- a/test/integration/connect/envoy/case-lua/setup.sh
+++ b/test/integration/connect/envoy/case-lua/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-lua/vars.sh b/test/integration/connect/envoy/case-lua/vars.sh
index ac0664606f93b..433e50c1b43dc 100644
--- a/test/integration/connect/envoy/case-lua/vars.sh
+++ b/test/integration/connect/envoy/case-lua/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="s1 s1-sidecar-proxy s2 s2-sidecar-proxy"
diff --git a/test/integration/connect/envoy/case-mesh-to-lambda/capture.sh b/test/integration/connect/envoy/case-mesh-to-lambda/capture.sh
index b64ad4d05a9c1..19ddf49f6b0f3 100644
--- a/test/integration/connect/envoy/case-mesh-to-lambda/capture.sh
+++ b/test/integration/connect/envoy/case-mesh-to-lambda/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:20000 terminating-gateway primary || true
diff --git a/test/integration/connect/envoy/case-mesh-to-lambda/service_gateway.hcl b/test/integration/connect/envoy/case-mesh-to-lambda/service_gateway.hcl
index 63c212da3ace6..0958221ed9248 100644
--- a/test/integration/connect/envoy/case-mesh-to-lambda/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-mesh-to-lambda/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "terminating-gateway"
   kind = "terminating-gateway"
diff --git a/test/integration/connect/envoy/case-mesh-to-lambda/service_s1.hcl b/test/integration/connect/envoy/case-mesh-to-lambda/service_s1.hcl
index 11e8328a82fac..36217f42d5f51 100644
--- a/test/integration/connect/envoy/case-mesh-to-lambda/service_s1.hcl
+++ b/test/integration/connect/envoy/case-mesh-to-lambda/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-mesh-to-lambda/setup.sh b/test/integration/connect/envoy/case-mesh-to-lambda/setup.sh
index 406914e3cf5a9..ee8c69d7c5ddd 100644
--- a/test/integration/connect/envoy/case-mesh-to-lambda/setup.sh
+++ b/test/integration/connect/envoy/case-mesh-to-lambda/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-mesh-to-lambda/vars.sh b/test/integration/connect/envoy/case-mesh-to-lambda/vars.sh
index 8643eead0d266..fa47ec4ae1302 100644
--- a/test/integration/connect/envoy/case-mesh-to-lambda/vars.sh
+++ b/test/integration/connect/envoy/case-mesh-to-lambda/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 # Ensure that the environment variables required to configure and invoke the Lambda function are present, otherwise skip.
 # Note that `set | grep ...` is used here because we cannot check the vars directly. If they are unbound the test will
diff --git a/test/integration/connect/envoy/case-mesh-to-lambda/verify.bats b/test/integration/connect/envoy/case-mesh-to-lambda/verify.bats
index 60363b717fbaf..6a88e83f3b1eb 100644
--- a/test/integration/connect/envoy/case-mesh-to-lambda/verify.bats
+++ b/test/integration/connect/envoy/case-mesh-to-lambda/verify.bats
@@ -7,7 +7,7 @@ load helpers
 }
 
 @test "s1 has lambda http filter for l1" {
-  assert_lambda_envoy_dynamic_http_filter_exists localhost:19000 $AWS_LAMBDA_ARN
+  assert_lambda_envoy_dynamic_http_filter_exists localhost:19000 l1 $AWS_LAMBDA_ARN
 }
 
 @test "terminating gateway has lambda cluster for l2" {
@@ -15,7 +15,7 @@ load helpers
 }
 
 @test "terminating gateway has lambda http filter for l2" {
-  assert_lambda_envoy_dynamic_http_filter_exists localhost:20000 $AWS_LAMBDA_ARN
+  assert_lambda_envoy_dynamic_http_filter_exists localhost:20000 l2 $AWS_LAMBDA_ARN
 }
 
 @test "s1 can call l1 through its sidecar-proxy" {
diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/bind.hcl b/test/integration/connect/envoy/case-multidc-rsa-ca/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-multidc-rsa-ca/bind.hcl
+++ b/test/integration/connect/envoy/case-multidc-rsa-ca/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/ca_config.hcl b/test/integration/connect/envoy/case-multidc-rsa-ca/ca_config.hcl
index 0f8d98ac6be52..a9e59cca48766 100644
--- a/test/integration/connect/envoy/case-multidc-rsa-ca/ca_config.hcl
+++ b/test/integration/connect/envoy/case-multidc-rsa-ca/ca_config.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 connect {
   enabled = true
   ca_config {
diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/capture.sh b/test/integration/connect/envoy/case-multidc-rsa-ca/capture.sh
index daf25ad574959..7c9106ed79f67 100644
--- a/test/integration/connect/envoy/case-multidc-rsa-ca/capture.sh
+++ b/test/integration/connect/envoy/case-multidc-rsa-ca/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
 snapshot_envoy_admin localhost:19001 s2 secondary || true
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/primary/service_s1.hcl b/test/integration/connect/envoy/case-multidc-rsa-ca/primary/service_s1.hcl
index b4eb4b1f04fd7..96682de1a5338 100644
--- a/test/integration/connect/envoy/case-multidc-rsa-ca/primary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-multidc-rsa-ca/primary/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/primary/service_s2.hcl b/test/integration/connect/envoy/case-multidc-rsa-ca/primary/service_s2.hcl
index d0f6294f72802..77164e722b6cf 100644
--- a/test/integration/connect/envoy/case-multidc-rsa-ca/primary/service_s2.hcl
+++ b/test/integration/connect/envoy/case-multidc-rsa-ca/primary/service_s2.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s2 service in the primary dc
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/primary/setup.sh b/test/integration/connect/envoy/case-multidc-rsa-ca/primary/setup.sh
index de07522f12f73..4f99d7244bd9e 100644
--- a/test/integration/connect/envoy/case-multidc-rsa-ca/primary/setup.sh
+++ b/test/integration/connect/envoy/case-multidc-rsa-ca/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/join.hcl b/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/join.hcl
index f0bd3fbd4ac7e..32cc24f2ebdd9 100644
--- a/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/join.hcl
+++ b/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/join.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 retry_join_wan = ["consul-primary-server"]
diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/service_s1.hcl b/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/service_s1.hcl
index 8b4d4a83a42d4..eff93eb6b5195 100644
--- a/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # we don't want an s1 service in the secondary dc
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/setup.sh b/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/setup.sh
index 712cdd5e79456..97b4802236390 100644
--- a/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/setup.sh
+++ b/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/vars.sh b/test/integration/connect/envoy/case-multidc-rsa-ca/vars.sh
index 7bf4a264a204f..742813a1a9cb3 100644
--- a/test/integration/connect/envoy/case-multidc-rsa-ca/vars.sh
+++ b/test/integration/connect/envoy/case-multidc-rsa-ca/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="s1 s1-sidecar-proxy s2-secondary s2-sidecar-proxy-secondary"
 export REQUIRE_SECONDARY=1
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-prometheus/capture.sh b/test/integration/connect/envoy/case-prometheus/capture.sh
index 8bc4413d09f9e..7f0c582f8983c 100644
--- a/test/integration/connect/envoy/case-prometheus/capture.sh
+++ b/test/integration/connect/envoy/case-prometheus/capture.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 s1 primary || true
diff --git a/test/integration/connect/envoy/case-prometheus/service_s1.hcl b/test/integration/connect/envoy/case-prometheus/service_s1.hcl
index 4ac588d9a2a09..c25439e04afee 100644
--- a/test/integration/connect/envoy/case-prometheus/service_s1.hcl
+++ b/test/integration/connect/envoy/case-prometheus/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-prometheus/service_s2.hcl b/test/integration/connect/envoy/case-prometheus/service_s2.hcl
index fb857d005ee91..c215cc23538a8 100644
--- a/test/integration/connect/envoy/case-prometheus/service_s2.hcl
+++ b/test/integration/connect/envoy/case-prometheus/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-prometheus/setup.sh b/test/integration/connect/envoy/case-prometheus/setup.sh
index 3fb3ade6c5fbb..e8321972b34e1 100644
--- a/test/integration/connect/envoy/case-prometheus/setup.sh
+++ b/test/integration/connect/envoy/case-prometheus/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-property-override/capture.sh b/test/integration/connect/envoy/case-property-override/capture.sh
deleted file mode 100644
index bc1ac2dcf172e..0000000000000
--- a/test/integration/connect/envoy/case-property-override/capture.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-
-snapshot_envoy_admin localhost:19000 s1 primary || true
-snapshot_envoy_admin localhost:19001 s2 primary || true
-snapshot_envoy_admin localhost:19002 s3 primary || true
diff --git a/test/integration/connect/envoy/case-property-override/service_s1.hcl b/test/integration/connect/envoy/case-property-override/service_s1.hcl
deleted file mode 100644
index a1f811b527429..0000000000000
--- a/test/integration/connect/envoy/case-property-override/service_s1.hcl
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-services {
-  name = "s1"
-  port = 8080
-  connect {
-    sidecar_service {
-      proxy {
-        upstreams = [
-          {
-            destination_name = "s2"
-            local_bind_port = 5000
-          },
-          {
-            destination_name = "s3"
-            local_bind_port = 5001
-          }
-        ]
-      }
-    }
-  }
-}
diff --git a/test/integration/connect/envoy/case-property-override/service_s2.hcl b/test/integration/connect/envoy/case-property-override/service_s2.hcl
deleted file mode 100644
index a167379776625..0000000000000
--- a/test/integration/connect/envoy/case-property-override/service_s2.hcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-services {
-  name = "s2"
-  port = 8181
-  connect { sidecar_service {} }
-}
diff --git a/test/integration/connect/envoy/case-property-override/service_s3.hcl b/test/integration/connect/envoy/case-property-override/service_s3.hcl
deleted file mode 100644
index 4e5c7cb78e03a..0000000000000
--- a/test/integration/connect/envoy/case-property-override/service_s3.hcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-services {
-  name = "s3"
-  port = 8181
-  connect { sidecar_service {} }
-}
diff --git a/test/integration/connect/envoy/case-property-override/setup.sh b/test/integration/connect/envoy/case-property-override/setup.sh
deleted file mode 100644
index dd82af3487d8e..0000000000000
--- a/test/integration/connect/envoy/case-property-override/setup.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-
-set -eEuo pipefail
-
-upsert_config_entry primary '
-Kind = "service-defaults"
-Name = "s2"
-Protocol = "http"
-EnvoyExtensions = [
-  {
-    Name = "builtin/property-override"
-    Arguments = {
-      ProxyType = "connect-proxy"
-      Patches = [{
-        ResourceFilter = {
-          ResourceType = "listener"
-          TrafficDirection = "inbound"
-        }
-        Op = "add"
-        Path = "/stat_prefix"
-        Value = "custom.stats.s2"
-      }]
-    }
-  }
-]
-'
-
-upsert_config_entry primary '
-Kind = "service-defaults"
-Name = "s3"
-Protocol = "http"
-'
-
-upsert_config_entry primary '
-Kind = "service-defaults"
-Name = "s1"
-Protocol = "http"
-EnvoyExtensions = [
-  {
-    Name = "builtin/property-override"
-    Arguments = {
-      ProxyType = "connect-proxy"
-      Patches = [
-        {
-          ResourceFilter = {
-            ResourceType = "cluster"
-            TrafficDirection = "outbound"
-          }
-          Op = "add"
-          Path = "/upstream_connection_options/tcp_keepalive/keepalive_probes"
-          Value = 1234
-        },
-        {
-          ResourceFilter = {
-            ResourceType = "cluster"
-            TrafficDirection = "outbound"
-          }
-          Op = "add"
-          Path = "/outlier_detection/max_ejection_time/seconds"
-          Value = 120
-        },
-        {
-          ResourceFilter = {
-            ResourceType = "cluster"
-            TrafficDirection = "outbound"
-          }
-          Op = "add"
-          Path = "/outlier_detection/max_ejection_time_jitter/seconds"
-          Value = 1
-        },
-        {
-          ResourceFilter = {
-            ResourceType = "cluster"
-            TrafficDirection = "outbound"
-            Services = [{
-              Name = "s3"
-            }]
-          }
-          Op = "remove"
-          Path = "/outlier_detection"
-        }
-      ]
-    }
-  }
-]
-'
-
-register_services primary
-
-gen_envoy_bootstrap s1 19000 primary
-gen_envoy_bootstrap s2 19001 primary
diff --git a/test/integration/connect/envoy/case-property-override/vars.sh b/test/integration/connect/envoy/case-property-override/vars.sh
deleted file mode 100644
index 172824ba73d10..0000000000000
--- a/test/integration/connect/envoy/case-property-override/vars.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-
-export REQUIRED_SERVICES="s1 s1-sidecar-proxy s2 s2-sidecar-proxy s3 s3-sidecar-proxy"
diff --git a/test/integration/connect/envoy/case-property-override/verify.bats b/test/integration/connect/envoy/case-property-override/verify.bats
deleted file mode 100644
index 446ef061da418..0000000000000
--- a/test/integration/connect/envoy/case-property-override/verify.bats
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bats
-
-load helpers
-
-@test "s1 proxy admin is up on :19000" {
-  retry_default curl -f -s localhost:19000/stats -o /dev/null
-}
-
-@test "s2 proxy admin is up on :19001" {
-  retry_default curl -f -s localhost:19001/stats -o /dev/null
-}
-
-@test "s1 proxy listener should be up and have right cert" {
-  assert_proxy_presents_cert_uri localhost:21000 s1
-}
-
-@test "s1 proxy is configured with the expected envoy patches" {
-  run get_envoy_cluster_config localhost:19000 s2
-  [ "$status" == 0 ]
-
-  [ "$(echo "$output" | jq -r '.upstream_connection_options.tcp_keepalive.keepalive_probes')" == "1234" ]
-  [ "$(echo "$output" | jq -r '.outlier_detection.max_ejection_time')" == "120s" ]
-  [ "$(echo "$output" | jq -r '.outlier_detection.max_ejection_time_jitter')" == "1s" ]
-
-  run get_envoy_cluster_config localhost:19000 s3
-  [ "$status" == 0 ]
-
-  [ "$(echo "$output" | jq -r '.upstream_connection_options.tcp_keepalive.keepalive_probes')" == "1234" ]
-  [ "$(echo "$output" | jq -r '.outlier_detection')" == "null" ]
-}
-
-@test "s2 proxy is configured with the expected envoy patches" {
-  run get_envoy_public_listener_once localhost:19001
-  [ "$status" == 0 ]
-  
-  [ "$(echo "$output" | jq -r '.active_state.listener.stat_prefix')" == "custom.stats.s2" ]
-}
diff --git a/test/integration/connect/envoy/case-stats-proxy/service_s1.hcl b/test/integration/connect/envoy/case-stats-proxy/service_s1.hcl
index 3be3803cb4882..7c12077eae0c7 100644
--- a/test/integration/connect/envoy/case-stats-proxy/service_s1.hcl
+++ b/test/integration/connect/envoy/case-stats-proxy/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-stats-proxy/service_s2.hcl b/test/integration/connect/envoy/case-stats-proxy/service_s2.hcl
index fb857d005ee91..c215cc23538a8 100644
--- a/test/integration/connect/envoy/case-stats-proxy/service_s2.hcl
+++ b/test/integration/connect/envoy/case-stats-proxy/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-stats-proxy/setup.sh b/test/integration/connect/envoy/case-stats-proxy/setup.sh
index 3fb3ade6c5fbb..e8321972b34e1 100644
--- a/test/integration/connect/envoy/case-stats-proxy/setup.sh
+++ b/test/integration/connect/envoy/case-stats-proxy/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-stats-proxy/verify.bats b/test/integration/connect/envoy/case-stats-proxy/verify.bats
index a200a5a313671..2d02010dc1851 100644
--- a/test/integration/connect/envoy/case-stats-proxy/verify.bats
+++ b/test/integration/connect/envoy/case-stats-proxy/verify.bats
@@ -40,7 +40,7 @@ load helpers
     must_match_in_stats_proxy_response localhost:1239 \
     'stats' '^http.envoy_metrics.downstream_rq_active'
 
-  # Response should include the local cluster request.
+  # Response should include the the local cluster request.
   retry_default \
     must_match_in_stats_proxy_response localhost:1239 \
     'stats' 'cluster.local_agent.upstream_rq_active'
diff --git a/test/integration/connect/envoy/case-statsd-udp/service_s1.hcl b/test/integration/connect/envoy/case-statsd-udp/service_s1.hcl
index a416ce25a0ce0..e8e7988c0bd82 100644
--- a/test/integration/connect/envoy/case-statsd-udp/service_s1.hcl
+++ b/test/integration/connect/envoy/case-statsd-udp/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-statsd-udp/setup.sh b/test/integration/connect/envoy/case-statsd-udp/setup.sh
index 883c78e1eb7f5..fe12061e3b5a7 100644
--- a/test/integration/connect/envoy/case-statsd-udp/setup.sh
+++ b/test/integration/connect/envoy/case-statsd-udp/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-statsd-udp/vars.sh b/test/integration/connect/envoy/case-statsd-udp/vars.sh
index 7fa5a238ce933..783eeaab96102 100644
--- a/test/integration/connect/envoy/case-statsd-udp/vars.sh
+++ b/test/integration/connect/envoy/case-statsd-udp/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES fake-statsd"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-terminating-gateway-hostnames/capture.sh b/test/integration/connect/envoy/case-terminating-gateway-hostnames/capture.sh
index f5515165d799d..2ef0c41a215ef 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-hostnames/capture.sh
+++ b/test/integration/connect/envoy/case-terminating-gateway-hostnames/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 terminating-gateway primary || true
 snapshot_envoy_admin localhost:19000 s1 primary || true
diff --git a/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_gateway.hcl b/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_gateway.hcl
index 63c212da3ace6..0958221ed9248 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "terminating-gateway"
   kind = "terminating-gateway"
diff --git a/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_s1.hcl b/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_s1.hcl
index da98b2729cbf1..f95092cd0846e 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_s1.hcl
+++ b/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_s4.hcl b/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_s4.hcl
index 3fba0f792ebd8..0cabbc9307651 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_s4.hcl
+++ b/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_s4.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s4"
 
diff --git a/test/integration/connect/envoy/case-terminating-gateway-hostnames/setup.sh b/test/integration/connect/envoy/case-terminating-gateway-hostnames/setup.sh
index 919f9cfd1e9a2..6b1e41575dff6 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-hostnames/setup.sh
+++ b/test/integration/connect/envoy/case-terminating-gateway-hostnames/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-terminating-gateway-hostnames/vars.sh b/test/integration/connect/envoy/case-terminating-gateway-hostnames/vars.sh
index a86dca2e7e31a..ca739c9f59de7 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-hostnames/vars.sh
+++ b/test/integration/connect/envoy/case-terminating-gateway-hostnames/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 # There is no sidecar proxy for s2, since the terminating gateway acts as the proxy
 export REQUIRED_SERVICES="s1 s1-sidecar-proxy s4 terminating-gateway-primary"
diff --git a/test/integration/connect/envoy/case-terminating-gateway-simple/service_gateway.hcl b/test/integration/connect/envoy/case-terminating-gateway-simple/service_gateway.hcl
index 63c212da3ace6..0958221ed9248 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-simple/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-terminating-gateway-simple/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "terminating-gateway"
   kind = "terminating-gateway"
diff --git a/test/integration/connect/envoy/case-terminating-gateway-simple/setup.sh b/test/integration/connect/envoy/case-terminating-gateway-simple/setup.sh
index f8638925a4a17..11a2b40305a0a 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-simple/setup.sh
+++ b/test/integration/connect/envoy/case-terminating-gateway-simple/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-terminating-gateway-simple/vars.sh b/test/integration/connect/envoy/case-terminating-gateway-simple/vars.sh
index 02ed45703c1e2..da0a6321a05dd 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-simple/vars.sh
+++ b/test/integration/connect/envoy/case-terminating-gateway-simple/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 # There is no sidecar proxy for s2, since the terminating gateway acts as the proxy
 export REQUIRED_SERVICES="s1 s1-sidecar-proxy s2 terminating-gateway-primary"
diff --git a/test/integration/connect/envoy/case-terminating-gateway-subsets/capture.sh b/test/integration/connect/envoy/case-terminating-gateway-subsets/capture.sh
index 8a28a10f3a6df..261bf4e29a6c3 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-subsets/capture.sh
+++ b/test/integration/connect/envoy/case-terminating-gateway-subsets/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:20000 terminating-gateway primary || true
 snapshot_envoy_admin localhost:19000 s1 primary || true
diff --git a/test/integration/connect/envoy/case-terminating-gateway-subsets/service_gateway.hcl b/test/integration/connect/envoy/case-terminating-gateway-subsets/service_gateway.hcl
index f294b64e6966a..fe597c235cf67 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-subsets/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-terminating-gateway-subsets/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "terminating-gateway"
   kind = "terminating-gateway"
diff --git a/test/integration/connect/envoy/case-terminating-gateway-subsets/service_s2-v1.hcl b/test/integration/connect/envoy/case-terminating-gateway-subsets/service_s2-v1.hcl
index 2191385000f66..fb87dc41d5e7e 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-subsets/service_s2-v1.hcl
+++ b/test/integration/connect/envoy/case-terminating-gateway-subsets/service_s2-v1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s2-v1"
   name = "s2"
diff --git a/test/integration/connect/envoy/case-terminating-gateway-subsets/service_s2-v2.hcl b/test/integration/connect/envoy/case-terminating-gateway-subsets/service_s2-v2.hcl
index cc7df98777ebd..52ab0abd684ef 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-subsets/service_s2-v2.hcl
+++ b/test/integration/connect/envoy/case-terminating-gateway-subsets/service_s2-v2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id   = "s2-v2"
   name = "s2"
diff --git a/test/integration/connect/envoy/case-terminating-gateway-subsets/service_s3.hcl b/test/integration/connect/envoy/case-terminating-gateway-subsets/service_s3.hcl
index 3269b33a8117f..eb84c578ee9ea 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-subsets/service_s3.hcl
+++ b/test/integration/connect/envoy/case-terminating-gateway-subsets/service_s3.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   id = "s3"
   name = "s3"
diff --git a/test/integration/connect/envoy/case-terminating-gateway-subsets/setup.sh b/test/integration/connect/envoy/case-terminating-gateway-subsets/setup.sh
index ec38097fd2735..57b85c74a6b23 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-subsets/setup.sh
+++ b/test/integration/connect/envoy/case-terminating-gateway-subsets/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/case-terminating-gateway-subsets/vars.sh b/test/integration/connect/envoy/case-terminating-gateway-subsets/vars.sh
index e6d96721e4c50..d4a4d75bdd88d 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-subsets/vars.sh
+++ b/test/integration/connect/envoy/case-terminating-gateway-subsets/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 # There is no sidecar proxy for s2-v1, since the terminating gateway acts as the proxy
 export REQUIRED_SERVICES="
diff --git a/test/integration/connect/envoy/case-terminating-gateway-without-services/bind.hcl b/test/integration/connect/envoy/case-terminating-gateway-without-services/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-without-services/bind.hcl
+++ b/test/integration/connect/envoy/case-terminating-gateway-without-services/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-terminating-gateway-without-services/service_gateway.hcl b/test/integration/connect/envoy/case-terminating-gateway-without-services/service_gateway.hcl
index fee3bb25b00b0..bf31029c03f22 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-without-services/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-terminating-gateway-without-services/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "terminating-gateway"
   kind = "terminating-gateway"
diff --git a/test/integration/connect/envoy/case-terminating-gateway-without-services/service_s1.hcl b/test/integration/connect/envoy/case-terminating-gateway-without-services/service_s1.hcl
index 0891eebceb9c9..f9c223cfec6d1 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-without-services/service_s1.hcl
+++ b/test/integration/connect/envoy/case-terminating-gateway-without-services/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s1 service
diff --git a/test/integration/connect/envoy/case-terminating-gateway-without-services/service_s2.hcl b/test/integration/connect/envoy/case-terminating-gateway-without-services/service_s2.hcl
index ca644bb3ffa22..89311191b3113 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-without-services/service_s2.hcl
+++ b/test/integration/connect/envoy/case-terminating-gateway-without-services/service_s2.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s2 service
diff --git a/test/integration/connect/envoy/case-terminating-gateway-without-services/setup.sh b/test/integration/connect/envoy/case-terminating-gateway-without-services/setup.sh
index 91f82633b3d51..7a88962526a20 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-without-services/setup.sh
+++ b/test/integration/connect/envoy/case-terminating-gateway-without-services/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-terminating-gateway-without-services/vars.sh b/test/integration/connect/envoy/case-terminating-gateway-without-services/vars.sh
index a8d23fead535d..9e6dd20604698 100644
--- a/test/integration/connect/envoy/case-terminating-gateway-without-services/vars.sh
+++ b/test/integration/connect/envoy/case-terminating-gateway-without-services/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="terminating-gateway-primary"
diff --git a/test/integration/connect/envoy/case-upstream-config/service_s1.hcl b/test/integration/connect/envoy/case-upstream-config/service_s1.hcl
index 3bfcb906db70f..57969842f2849 100644
--- a/test/integration/connect/envoy/case-upstream-config/service_s1.hcl
+++ b/test/integration/connect/envoy/case-upstream-config/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-upstream-config/service_s2.hcl b/test/integration/connect/envoy/case-upstream-config/service_s2.hcl
index a167379776625..9c23e79c7267a 100644
--- a/test/integration/connect/envoy/case-upstream-config/service_s2.hcl
+++ b/test/integration/connect/envoy/case-upstream-config/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-upstream-config/setup.sh b/test/integration/connect/envoy/case-upstream-config/setup.sh
index 3fb3ade6c5fbb..e8321972b34e1 100644
--- a/test/integration/connect/envoy/case-upstream-config/setup.sh
+++ b/test/integration/connect/envoy/case-upstream-config/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-wanfed-gw/bind.hcl b/test/integration/connect/envoy/case-wanfed-gw/bind.hcl
index e54caa47a4922..f54393f03eaad 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/bind.hcl
+++ b/test/integration/connect/envoy/case-wanfed-gw/bind.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 bind_addr = "0.0.0.0"
 advertise_addr = "{{ GetInterfaceIP \"eth0\" }}"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-wanfed-gw/capture.sh b/test/integration/connect/envoy/case-wanfed-gw/capture.sh
index 5c24811d11722..98d409fa6d10e 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/capture.sh
+++ b/test/integration/connect/envoy/case-wanfed-gw/capture.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 snapshot_envoy_admin localhost:19000 mesh-gateway primary || true
 snapshot_envoy_admin localhost:19001 mesh-gateway secondary || true
diff --git a/test/integration/connect/envoy/case-wanfed-gw/global-setup-windows.sh b/test/integration/connect/envoy/case-wanfed-gw/global-setup-windows.sh
deleted file mode 100644
index 080d5abf94f1d..0000000000000
--- a/test/integration/connect/envoy/case-wanfed-gw/global-setup-windows.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-
-# initialize the outputs for each dc
-for dc in primary secondary; do
-    rm -rf "workdir/${dc}/tls"
-    mkdir -p "workdir/${dc}/tls"
-done
-
-container="consul-envoy-integ-tls-init--${CASE_NAME}"
-
-scriptlet="
-mkdir /out ;
-cd /out ;
-consul tls ca create ;
-consul tls cert create -dc=primary -server -node=pri ;
-consul tls cert create -dc=secondary -server -node=sec ;
-"
-
-docker.exe rm -f "$container" &>/dev/null || true
-docker.exe run -i --net=none --name="$container" windows/consul:local bash -c "${scriptlet}"
-
-# primary
-for f in \
-    consul-agent-ca.pem \
-    primary-server-consul-0-key.pem \
-    primary-server-consul-0.pem \
-    ; do
-    docker.exe cp "${container}:C:\\Program Files\\Git\\out\\$f" workdir/primary/tls
-done
-
-# secondary
-for f in \
-    consul-agent-ca.pem \
-    secondary-server-consul-0-key.pem \
-    secondary-server-consul-0.pem \
-    ; do
-    docker.exe cp "${container}:C:\\Program Files\\Git\\out\\$f" workdir/secondary/tls
-done
-
-# Private keys have 600 perms but tests are run as another user
-chmod 666 workdir/primary/tls/primary-server-consul-0-key.pem
-chmod 666 workdir/secondary/tls/secondary-server-consul-0-key.pem
-
-docker.exe rm -f "$container" >/dev/null || true
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-wanfed-gw/global-setup.sh b/test/integration/connect/envoy/case-wanfed-gw/global-setup.sh
index 0e21aef6893ad..3e6120445939a 100755
--- a/test/integration/connect/envoy/case-wanfed-gw/global-setup.sh
+++ b/test/integration/connect/envoy/case-wanfed-gw/global-setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 # initialize the outputs for each dc
 for dc in primary secondary; do
diff --git a/test/integration/connect/envoy/case-wanfed-gw/primary/common.hcl b/test/integration/connect/envoy/case-wanfed-gw/primary/common.hcl
index 06ad70b29aaf7..d586b280bb025 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/primary/common.hcl
+++ b/test/integration/connect/envoy/case-wanfed-gw/primary/common.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 tls {
   internal_rpc {
     ca_file                = "/workdir/primary/tls/consul-agent-ca.pem"
diff --git a/test/integration/connect/envoy/case-wanfed-gw/primary/server.hcl b/test/integration/connect/envoy/case-wanfed-gw/primary/server.hcl
index e694d94c441eb..8dd5b39dc4a44 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/primary/server.hcl
+++ b/test/integration/connect/envoy/case-wanfed-gw/primary/server.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 node_name = "pri"
 connect {
   enabled                            = true
diff --git a/test/integration/connect/envoy/case-wanfed-gw/primary/service_gateway.hcl b/test/integration/connect/envoy/case-wanfed-gw/primary/service_gateway.hcl
index 0a33536b9c8dd..0511c9b26c987 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/primary/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-wanfed-gw/primary/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-wanfed-gw/primary/service_s1.hcl b/test/integration/connect/envoy/case-wanfed-gw/primary/service_s1.hcl
index 0891eebceb9c9..f9c223cfec6d1 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/primary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-wanfed-gw/primary/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s1 service
diff --git a/test/integration/connect/envoy/case-wanfed-gw/primary/service_s2.hcl b/test/integration/connect/envoy/case-wanfed-gw/primary/service_s2.hcl
index ca644bb3ffa22..89311191b3113 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/primary/service_s2.hcl
+++ b/test/integration/connect/envoy/case-wanfed-gw/primary/service_s2.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s2 service
diff --git a/test/integration/connect/envoy/case-wanfed-gw/primary/setup.sh b/test/integration/connect/envoy/case-wanfed-gw/primary/setup.sh
index 11d5abf14d595..9dc09f4b8f75a 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/primary/setup.sh
+++ b/test/integration/connect/envoy/case-wanfed-gw/primary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-wanfed-gw/secondary/common.hcl b/test/integration/connect/envoy/case-wanfed-gw/secondary/common.hcl
index 6b76d377d8210..8e536a87af0b0 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/secondary/common.hcl
+++ b/test/integration/connect/envoy/case-wanfed-gw/secondary/common.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 tls {
   internal_rpc {
     ca_file                = "/workdir/secondary/tls/consul-agent-ca.pem"
diff --git a/test/integration/connect/envoy/case-wanfed-gw/secondary/server.hcl b/test/integration/connect/envoy/case-wanfed-gw/secondary/server.hcl
index 027174bf632d7..4a2cbea5720ba 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/secondary/server.hcl
+++ b/test/integration/connect/envoy/case-wanfed-gw/secondary/server.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 node_name = "sec"
 connect {
   enabled                            = true
diff --git a/test/integration/connect/envoy/case-wanfed-gw/secondary/service_gateway.hcl b/test/integration/connect/envoy/case-wanfed-gw/secondary/service_gateway.hcl
index bba04fd97146f..0c05e483c7588 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/secondary/service_gateway.hcl
+++ b/test/integration/connect/envoy/case-wanfed-gw/secondary/service_gateway.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "mesh-gateway"
   kind = "mesh-gateway"
diff --git a/test/integration/connect/envoy/case-wanfed-gw/secondary/service_s1.hcl b/test/integration/connect/envoy/case-wanfed-gw/secondary/service_s1.hcl
index 0891eebceb9c9..f9c223cfec6d1 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/secondary/service_s1.hcl
+++ b/test/integration/connect/envoy/case-wanfed-gw/secondary/service_s1.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s1 service
diff --git a/test/integration/connect/envoy/case-wanfed-gw/secondary/service_s2.hcl b/test/integration/connect/envoy/case-wanfed-gw/secondary/service_s2.hcl
index ca644bb3ffa22..89311191b3113 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/secondary/service_s2.hcl
+++ b/test/integration/connect/envoy/case-wanfed-gw/secondary/service_s2.hcl
@@ -1,4 +1 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # We don't want an s2 service
diff --git a/test/integration/connect/envoy/case-wanfed-gw/secondary/setup.sh b/test/integration/connect/envoy/case-wanfed-gw/secondary/setup.sh
index 0f4313108c8ce..f9d892c21578f 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/secondary/setup.sh
+++ b/test/integration/connect/envoy/case-wanfed-gw/secondary/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-wanfed-gw/vars.sh b/test/integration/connect/envoy/case-wanfed-gw/vars.sh
index 4de3b552dcf83..31cdd18d78895 100644
--- a/test/integration/connect/envoy/case-wanfed-gw/vars.sh
+++ b/test/integration/connect/envoy/case-wanfed-gw/vars.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="gateway-primary gateway-secondary"
 export REQUIRE_SECONDARY=1
diff --git a/test/integration/connect/envoy/case-wasm/capture.sh b/test/integration/connect/envoy/case-wasm/capture.sh
deleted file mode 100644
index 14dc00afc65b8..0000000000000
--- a/test/integration/connect/envoy/case-wasm/capture.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-
-snapshot_envoy_admin localhost:19000 s1 primary || true
-snapshot_envoy_admin localhost:19001 s2 primary || true
diff --git a/test/integration/connect/envoy/case-wasm/data/dummy.wasm b/test/integration/connect/envoy/case-wasm/data/dummy.wasm
deleted file mode 100644
index c9aab234df82c..0000000000000
Binary files a/test/integration/connect/envoy/case-wasm/data/dummy.wasm and /dev/null differ
diff --git a/test/integration/connect/envoy/case-wasm/service_s1.hcl b/test/integration/connect/envoy/case-wasm/service_s1.hcl
deleted file mode 100644
index 54c6ac6501b40..0000000000000
--- a/test/integration/connect/envoy/case-wasm/service_s1.hcl
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-services {
-  name = "s1"
-  port = 8080
-  connect {
-    sidecar_service {
-      proxy {
-        upstreams = [
-          {
-            destination_name = "s2"
-            local_bind_port = 5000
-          }
-        ]
-      }
-    }
-  }
-}
diff --git a/test/integration/connect/envoy/case-wasm/service_s2.hcl b/test/integration/connect/envoy/case-wasm/service_s2.hcl
deleted file mode 100644
index a167379776625..0000000000000
--- a/test/integration/connect/envoy/case-wasm/service_s2.hcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-services {
-  name = "s2"
-  port = 8181
-  connect { sidecar_service {} }
-}
diff --git a/test/integration/connect/envoy/case-wasm/setup.sh b/test/integration/connect/envoy/case-wasm/setup.sh
deleted file mode 100644
index 54ab4d4c72ce4..0000000000000
--- a/test/integration/connect/envoy/case-wasm/setup.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-
-set -eEuo pipefail
-
-upsert_config_entry primary '
-Kind = "service-defaults"
-Name = "s2"
-Protocol = "http"
-EnvoyExtensions = [
-  {
-    Name = "builtin/wasm"
-    Arguments = {
-      Protocol = "http"
-      ListenerType = "inbound"
-      PluginConfig = {
-        VmConfig = {
-          Code  = {
-            Local = {
-              Filename = "/workdir/primary/data/dummy.wasm"
-            }
-          }
-        }
-        Configuration  = "plugin configuration"
-      }
-    }
-  }
-]
-'
-
-register_services primary
-
-gen_envoy_bootstrap s1 19000 primary
-gen_envoy_bootstrap s2 19001 primary
diff --git a/test/integration/connect/envoy/case-wasm/vars.sh b/test/integration/connect/envoy/case-wasm/vars.sh
deleted file mode 100644
index ac0664606f93b..0000000000000
--- a/test/integration/connect/envoy/case-wasm/vars.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-
-export REQUIRED_SERVICES="s1 s1-sidecar-proxy s2 s2-sidecar-proxy"
diff --git a/test/integration/connect/envoy/case-wasm/verify.bats b/test/integration/connect/envoy/case-wasm/verify.bats
deleted file mode 100644
index 9a9756ec70185..0000000000000
--- a/test/integration/connect/envoy/case-wasm/verify.bats
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bats
-
-load helpers
-
-@test "s1 proxy admin is up on :19000" {
-  retry_default curl -f -s localhost:19000/stats -o /dev/null
-}
-
-@test "s2 proxy admin is up on :19001" {
-  retry_default curl -f -s localhost:19001/stats -o /dev/null
-}
-
-@test "s1 proxy listener should be up and have right cert" {
-  assert_proxy_presents_cert_uri localhost:21000 s1
-}
-
-@test "s2 proxy is configured with a wasm http filter" {
-  run get_envoy_http_filter localhost:19001 envoy.filters.http.wasm
-  [ "$status" == 0 ]
-
-  [ "$(echo "$output" | jq -r '.typed_config.config.vm_config.runtime')" == "envoy.wasm.runtime.v8" ]
-  [ "$(echo "$output" | jq -r '.typed_config.config.vm_config.code.local.filename')" == "/workdir/primary/data/dummy.wasm" ]
-  [ "$(echo "$output" | jq -r '.typed_config.config.configuration.value')" == "plugin configuration" ]
-  [ "$(echo "$output" | jq -r '.typed_config.config.fail_open')" == "true" ]
-}
diff --git a/test/integration/connect/envoy/case-zipkin/service_s1.hcl b/test/integration/connect/envoy/case-zipkin/service_s1.hcl
index 5f6935fedfbfe..ed4d882dd85b1 100644
--- a/test/integration/connect/envoy/case-zipkin/service_s1.hcl
+++ b/test/integration/connect/envoy/case-zipkin/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/case-zipkin/service_s2.hcl b/test/integration/connect/envoy/case-zipkin/service_s2.hcl
index 21b8f859b8f23..f62bd7a7a844c 100644
--- a/test/integration/connect/envoy/case-zipkin/service_s2.hcl
+++ b/test/integration/connect/envoy/case-zipkin/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/case-zipkin/setup.sh b/test/integration/connect/envoy/case-zipkin/setup.sh
index 3fb3ade6c5fbb..e8321972b34e1 100644
--- a/test/integration/connect/envoy/case-zipkin/setup.sh
+++ b/test/integration/connect/envoy/case-zipkin/setup.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
diff --git a/test/integration/connect/envoy/case-zipkin/vars.sh b/test/integration/connect/envoy/case-zipkin/vars.sh
index 7f4fb54ac6d79..9bee3bdd9f269 100644
--- a/test/integration/connect/envoy/case-zipkin/vars.sh
+++ b/test/integration/connect/envoy/case-zipkin/vars.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export REQUIRED_SERVICES="$DEFAULT_REQUIRED_SERVICES jaeger"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/case-zipkin/verify.bats b/test/integration/connect/envoy/case-zipkin/verify.bats
index 509345689069c..d771d523639a4 100644
--- a/test/integration/connect/envoy/case-zipkin/verify.bats
+++ b/test/integration/connect/envoy/case-zipkin/verify.bats
@@ -35,17 +35,14 @@ load helpers
   # Send traced request through upstream. Debug echoes headers back which we can
   # use to get the traceID generated (no way to force one I can find with Envoy
   # currently?)
-  # Fixed from /Debug -> /debug. Reason: /Debug return null
-  run curl -s -f -H 'x-client-trace-id:test-sentinel' localhost:5000/debug -m 5
+  run curl -s -f -H 'x-client-trace-id:test-sentinel' localhost:5000/Debug
 
   echo "OUTPUT $output"
 
   [ "$status" == "0" ]
 
   # Get the traceID from the output
-  # Replaced grep by jq to filter the TraceId.
-  # Reason: Grep did not filter and return the entire raw string and the test was failing
-  TRACEID=$(echo $output | jq -rR 'split("X-B3-Traceid: ") | last' | cut -c -16)
+  TRACEID=$(echo $output | grep 'X-B3-Traceid:' | cut -c 15-)
 
   # Get the trace from Jaeger. Won't bother parsing it just seeing it show up
   # there is enough to know that the tracing config worked.
diff --git a/test/integration/connect/envoy/consul-base-cfg/base.hcl b/test/integration/connect/envoy/consul-base-cfg/base.hcl
index 941f68aa26f6a..884117c5ce402 100644
--- a/test/integration/connect/envoy/consul-base-cfg/base.hcl
+++ b/test/integration/connect/envoy/consul-base-cfg/base.hcl
@@ -1,5 +1,2 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 primary_datacenter = "primary"
 log_level          = "trace"
\ No newline at end of file
diff --git a/test/integration/connect/envoy/consul-base-cfg/service_s1.hcl b/test/integration/connect/envoy/consul-base-cfg/service_s1.hcl
index b2b685c08abec..7f48b1c515a1e 100644
--- a/test/integration/connect/envoy/consul-base-cfg/service_s1.hcl
+++ b/test/integration/connect/envoy/consul-base-cfg/service_s1.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s1"
   port = 8080
diff --git a/test/integration/connect/envoy/consul-base-cfg/service_s2.hcl b/test/integration/connect/envoy/consul-base-cfg/service_s2.hcl
index 73d7798297812..0613e2bbc5224 100644
--- a/test/integration/connect/envoy/consul-base-cfg/service_s2.hcl
+++ b/test/integration/connect/envoy/consul-base-cfg/service_s2.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 services {
   name = "s2"
   port = 8181
diff --git a/test/integration/connect/envoy/defaults.sh b/test/integration/connect/envoy/defaults.sh
index f92c2cfb1fa9f..d6bdc8f456bb9 100644
--- a/test/integration/connect/envoy/defaults.sh
+++ b/test/integration/connect/envoy/defaults.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 export DEFAULT_REQUIRED_SERVICES="s1 s1-sidecar-proxy s2 s2-sidecar-proxy"
 export REQUIRED_SERVICES="${DEFAULT_REQUIRED_SERVICES}"
diff --git a/test/integration/connect/envoy/docker-windows.md b/test/integration/connect/envoy/docker-windows.md
deleted file mode 100644
index a9f2bbcaca1ca..0000000000000
--- a/test/integration/connect/envoy/docker-windows.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Docker Files for Windows Integration Tests
-
-## Index
-
-- [About](#about-this-file)
-- [Pre-requisites](#pre-requisites)
-- [Dockerfile-test-sds-server-windows](#dockerfile-test-sds-server-windows)
-
-## About this File
-
-In this file you will find which Dockerfiles are needed to run the Envoy integration tests on Windows, as well as information on how to run each of these files individually for testing purposes.
-
-## Pre-requisites
-
-After building and running the images and containers, you need to have pre-built the base images used by these Dockerfiles. See [pre-built images required in Windows](../../../../build-support-windows/BUILD-IMAGES.md)
-
-## Dockerfile-test-sds-server-windows
-
-This file sole purpose is to build the test-sds-server executable using Go. To do so, we use an official [golang image](https://hub.docker.com/_/golang/) provided in docker hub with Windows nano server.
-To build this image you need to run the following command on your terminal:
-
-```shell
-docker build -t test-sds-server -f Dockerfile-test-sds-server-windows test-sds-server
-```
-
-This is the same command used in run-tests.sh
-
-You can test the built file by running the following command:
-
-```shell
-docker run --rm -p 1234:1234 --name test-sds-server test-sds-server
-```
-
-If everything works properly you should get the following output:
-
-```shell
-20XX-XX-XXTXX:XX:XX.XXX-XXX [INFO]  Loaded cert from file: name=ca-root
-20XX-XX-XXTXX:XX:XX.XXX-XXX [INFO]  Loaded cert from file: name=foo.example.com
-20XX-XX-XXTXX:XX:XX.XXX-XXX [INFO]  Loaded cert from file: name=wildcard.ingress.consul
-20XX-XX-XXTXX:XX:XX.XXX-XXX [INFO]  Loaded cert from file: name=www.example.com
-20XX-XX-XXTXX:XX:XX.XXX-XXX [INFO]  ==> SDS listening: addr=0.0.0.0:1234
-```
diff --git a/test/integration/connect/envoy/docs/img/linux-arch.png b/test/integration/connect/envoy/docs/img/linux-arch.png
deleted file mode 100644
index 710b83b24570b..0000000000000
Binary files a/test/integration/connect/envoy/docs/img/linux-arch.png and /dev/null differ
diff --git a/test/integration/connect/envoy/docs/img/windows-arch-singlecontainer.png b/test/integration/connect/envoy/docs/img/windows-arch-singlecontainer.png
deleted file mode 100644
index 1ad5f4aabbcaf..0000000000000
Binary files a/test/integration/connect/envoy/docs/img/windows-arch-singlecontainer.png and /dev/null differ
diff --git a/test/integration/connect/envoy/docs/img/windows-linux-arch.png b/test/integration/connect/envoy/docs/img/windows-linux-arch.png
deleted file mode 100644
index d1c05533e51f2..0000000000000
Binary files a/test/integration/connect/envoy/docs/img/windows-linux-arch.png and /dev/null differ
diff --git a/test/integration/connect/envoy/docs/windows-testing-architecture.md b/test/integration/connect/envoy/docs/windows-testing-architecture.md
deleted file mode 100644
index 73a29e4f17bf9..0000000000000
--- a/test/integration/connect/envoy/docs/windows-testing-architecture.md
+++ /dev/null
@@ -1,106 +0,0 @@
-# Windows Testing Architecture
-
-## Index
-
-- [About](#about)
-- [Testing Architectures](#testing-architectures)
-  - [Linux Test Architecture](#linux-test-architecture)
-  - [Replicating the Linux Test Architecture on Windows](#replicating-the-linux-test-architecture-on-windows)
-  - [Single Container Test Architecture](#single-container-test-architecture)
-    - [Docker Image Components](#docker-image-components)
-      - Main Components:
-        - [Bats](#bats)
-        - [Fortio](#fortio)
-        - [Jaegertracing](#jaegertracing)
-        - [Openzipkin](#openzipkin)
-        - [Socat](#socat)
-      - Additional tools:
-        - [Git Bash](#git-bash)
-        - [JQ](#jq)
-        - [Netcat](#netcat)
-        - [Openssl](#openssl)
-
-## About
-
-The purpose of this document is not only to explain why the testing architecture is different on Windows but also to describe how the Single Container test architecture is composed.
-
-## Testing Architectures
-
-### Linux Test Architecture
-
-On Linux, tests take advantage of the Host network feature (only available for Linux containers). This means that every container within the network shares the host’s networking namespace. The network stack for every container that uses this network mode won’t be isolated from the Docker host and won’t get their own IP address.  
-
-![linux-architecture](./img/linux-arch.png)
-
-Every time a test is run, a directory called workdir is created, here all the required files to run the tests are copied. Then this same directory is mounted as a **named volume**, a container with a Kubernetes pause image tagged as *envoy_workdir_1* is run to keep the volume accessible as other containers start while running the tests. Linux containers allow file system operations on runtime unlike Windows containers.  
-
-### Replicating the Linux Test Architecture on Windows
-
-As we previously mentioned, on Windows there is no Host networking feature, so we went with NAT network instead. The main consequences of this is that now each container has their own networking stack (IP address) separated from each other, they can communicate among themselves using Docker's DNS feature (using the containers name) but no longer through localhost.  
-Another problem we are facing while sticking to this architecture, is that configuration files assume that every service (services run by fortio and Envoy's sidecar proxy service) are running in localhost. Though we had some partial success on modifying those files on runtime still we are finding issues related to this.
-Test's assertions are composed of either function calls or curl executions, we managed this by mapping those calls to the corresponding container name.
-
-![windows-linux-architecture](./img/windows-linux-arch.png)
-
-Above, the failing connections are depicted. We kept the same architecture as on Linux and worked around trying to solve those connectivity issues.  
-Finally, after serveral tries, it was decided that instead of replicating the Linux architecture on Windows, it was more straightforward just to have a single container with all the required components to run the tests. This **single container** test architecture is the approach that works best on Windows.
-
-## Single Container Test Architecture
-
-As mentioned above, the single container approach, means building a Windows Docker image not only with Consul and Envoy, but also with all the tools required to execute the existing Envoy integration tests.  
-
-![windows-linux-singlecontainer](./img/windows-singlecontainer.png)
-
-Below you can find a list and a brief description of those components.  
-
-### Docker Image Components
-
-The Docker image used for the Consul - Envoy integration tests has several components needed to run those tests.
-
-- Main Components:
-  - [Bats](#bats)
-  - [Fortio](#fortio)
-  - [Jaegertracing](#jaegertracing)
-  - [Openzipkin](#openzipkin)
-  - [Socat](#socat)
-- Additional tools:
-  - [Git Bash](#git-bash)
-  - [JQ](#jq)
-  - [Netcat](#netcat)
-  - [Openssl](#openssl)
-
-#### Bats
-
-BATS stands for Bash Automated Testing System and is the one in charge of executing the tests.
-
-#### Fortio
-
-Fortio is a microservices (http, grpc) load testing library, command line tool, advanced echo server, and web UI. It is used to run the services registered into Consul during the integration tests.
-
-#### Jaegertracing
-
-Jaeger is open source software for tracing transactions between distributed services. It's used for monitoring and troubleshooting complex microservices environments. It is used along with Openzipkin in some test cases.
-
-#### Openzipkin
-
-Zipkin is also a tracing software.
-
-#### Socat
-
-Socat is a command line based utility that establishes two bidirectional byte streams and transfers data between them. On this integration tests it is used to redirect Envoy's stats. There is no official Windows version. We are using this unofficial release available [here](https://github.com/tech128/socat-1.7.3.0-windows).
-
-#### Git Bash
-
-This tool is only used in Windows tests, it was added to the Docker image to be able to use some Linux commands during test execution.  
-
-#### JQ
-
-Jq is a lightweight and flexible command-line JSON processor. It is used in several tests to modify and filter JSON outputs.
-
-#### Netcat
-
-Netcat is a simple program that reads and writes data across networks, much the same way that cat reads and writes data to files.
-
-#### Openssl
-
-Open SSL is an all-around cryptography library that offers open-source application of the TLS protocol. It is used to verify that the correct tls certificates are being provisioned during tests.
diff --git a/test/integration/connect/envoy/down.sh b/test/integration/connect/envoy/down.sh
index 28b159358d1e4..c56700c2d1625 100755
--- a/test/integration/connect/envoy/down.sh
+++ b/test/integration/connect/envoy/down.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -euo pipefail
 
diff --git a/test/integration/connect/envoy/helpers.bash b/test/integration/connect/envoy/helpers.bash
index 01e59b6c28468..a650f4ee29ce3 100755
--- a/test/integration/connect/envoy/helpers.bash
+++ b/test/integration/connect/envoy/helpers.bash
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 # retry based on
 # https://github.com/fernandoacorreia/azure-docker-registry/blob/master/tools/scripts/create-registry-server
@@ -210,7 +207,7 @@ function assert_envoy_expose_checks_listener_count {
   RANGES=$(echo "$BODY" | jq '.active_state.listener.filter_chains[0].filter_chain_match.source_prefix_ranges | length')
   echo "RANGES = $RANGES (expect 3)"
   # note: if IPv6 is not supported in the kernel per
-  # agent/xds/platform:SupportsIPv6() then this will only be 2
+  # agent/xds:kernelSupportsIPv6() then this will only be 2
   [ "${RANGES:-0}" -eq 3 ]
 
   HCM=$(echo "$BODY" | jq '.active_state.listener.filter_chains[0].filters[0]')
@@ -228,13 +225,6 @@ function get_envoy_expose_checks_listener_once {
   echo "$output" | jq --raw-output '.configs[] | select(.["@type"] == "type.googleapis.com/envoy.admin.v3.ListenersConfigDump") | .dynamic_listeners[] | select(.name | startswith("exposed_path_"))'
 }
 
-function get_envoy_public_listener_once {
-  local HOSTPORT=$1
-  run curl -s -f $HOSTPORT/config_dump
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output '.configs[] | select(.["@type"] == "type.googleapis.com/envoy.admin.v3.ListenersConfigDump") | .dynamic_listeners[] | select(.name | startswith("public_listener:"))'
-}
-
 function assert_envoy_http_rbac_policy_count {
   local HOSTPORT=$1
   local EXPECT_COUNT=$2
@@ -267,14 +257,6 @@ function get_envoy_network_rbac_once {
   echo "$output" | jq --raw-output '.configs[2].dynamic_listeners[].active_state.listener.filter_chains[0].filters[] | select(.name == "envoy.filters.network.rbac") | .typed_config'
 }
 
-function get_envoy_http_filter {
-  local HOSTPORT=$1
-  local FILTER_NAME=$2
-  run retry_default curl -s -f $HOSTPORT/config_dump
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output ".configs[2].dynamic_listeners[] | .active_state.listener.filter_chains[].filters[] | select(.name == \"envoy.filters.network.http_connection_manager\") | .typed_config.http_filters[] | select(.name == \"${FILTER_NAME}\")"
-}
-
 function get_envoy_listener_filters {
   local HOSTPORT=$1
   run retry_default curl -s -f $HOSTPORT/config_dump
@@ -1093,6 +1075,15 @@ function assert_service_has_imported {
   fi
 }
 
+function get_lambda_envoy_http_filter {
+  local HOSTPORT=$1
+  local NAME_PREFIX=$2
+  run retry_default curl -s -f $HOSTPORT/config_dump
+  [ "$status" -eq 0 ]
+  # get the full http filter object so the individual fields can be validated.
+  echo "$output" | jq --raw-output ".configs[2].dynamic_listeners[] | .active_state.listener.filter_chains[].filters[] | select(.name == \"envoy.filters.network.http_connection_manager\") | .typed_config.http_filters[] | select(.name == \"envoy.filters.http.aws_lambda\") | .typed_config"
+}
+
 function register_lambdas {
   local DC=${1:-primary}
   # register lambdas to the catalog
@@ -1120,12 +1111,13 @@ function assert_lambda_envoy_dynamic_cluster_exists {
 
 function assert_lambda_envoy_dynamic_http_filter_exists {
   local HOSTPORT=$1
-  local ARN=$2
+  local NAME_PREFIX=$2
+  local ARN=$3
 
-  local FILTER=$(get_envoy_http_filter $HOSTPORT 'envoy.filters.http.aws_lambda')
+  local FILTER=$(get_lambda_envoy_http_filter $HOSTPORT $NAME_PREFIX)
   [ -n "$FILTER" ]
 
-  [ "$(echo $FILTER | jq -r '.typed_config | .arn')" == "$ARN" ]
+  [ "$(echo $FILTER | jq -r '.arn')" == "$ARN" ]
 }
 
 function varsub {
diff --git a/test/integration/connect/envoy/helpers.windows.bash b/test/integration/connect/envoy/helpers.windows.bash
deleted file mode 100644
index 5b6969ca85577..0000000000000
--- a/test/integration/connect/envoy/helpers.windows.bash
+++ /dev/null
@@ -1,1195 +0,0 @@
-#!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-
-CONSUL_HOSTNAME=""
-MOD_ARG=""
-
-function split_hostport {
-  local HOSTPORT="$@"
-
-  if [[ $HOSTPORT == *":"* ]]; then
-    MOD_ARG=$( <<< $HOSTPORT  sed 's/:/ /' )
-  fi
-}
-
-function get_consul_hostname {
-  local DC=${1:-primary}
-
-  [[ $XDS_TARGET = "client" ]] && CONSUL_HOSTNAME="consul-$DC-client" || CONSUL_HOSTNAME="consul-$DC"
-}
-
-# retry based on
-# https://github.com/fernandoacorreia/azure-docker-registry/blob/master/tools/scripts/create-registry-server
-# under MIT license.
-function retry {
-  local n=1
-  local max=$1
-  shift
-  local delay=$1
-  shift
-
-  local errtrace=0
-  if grep -q "errtrace" <<<"$SHELLOPTS"
-  then
-    errtrace=1
-    set +E
-  fi
-
-  if [[ $1 == "curl" ]]; then
-    set -- "${@}" -m 10
-  elif [[ $1 == "nc" ]]
-  then
-    split_hostport $3
-    set -- "${@:1:2}" $MOD_ARG "${@:4}"
-  fi
-
-  # This if block, was added to check if curl is being executed directly on a test, 
-  # if so, we replace the url parameter with the correct one.
-
-  for ((i=1;i<=$max;i++))
-  do
-    if "$@"
-    then
-      if test $errtrace -eq 1
-      then
-        set -E
-      fi
-      return 0
-    else
-      echo "Command failed. Attempt $i/$max:"
-      sleep $delay
-    fi
-  done
-
-  if test $errtrace -eq 1; then
-    set -E
-  fi
-  return 1
-}
-
-function retry_default {
-  local DEFAULT_TOTAL_RETRIES=5
-  set +E
-  ret=0
-  retry $DEFAULT_TOTAL_RETRIES 1 "$@" || ret=1
-  set -E
-  return $ret
-}
-
-function retry_long {
-  retry 30 1 "$@"
-}
-
-function is_set {
-   # Arguments:
-   #   $1 - string value to check its truthiness
-   #
-   # Return:
-   #   0 - is truthy (backwards I know but allows syntax like `if is_set <var>` to work)
-   #   1 - is not truthy
-
-   local val=$(tr '[:upper:]' '[:lower:]' <<<"$1")
-   case $val in
-      1 | t | true | y | yes)
-         return 0
-         ;;
-      *)
-         return 1
-         ;;
-   esac
-}
-
-function get_cert {
-  local HOSTPORT=$1
-  local SERVER_NAME=$2
-  local CA_FILE=$3
-  local SNI_FLAG=""
-  if [ -n "$SERVER_NAME" ]; then
-    SNI_FLAG="-servername $SERVER_NAME"
-  fi
-  CERT=$(openssl s_client -connect $HOSTPORT $SNI_FLAG -showcerts </dev/null)
-  openssl x509 -noout -text <<<"$CERT"
-}
-
-function assert_proxy_presents_cert_uri {
-  local HOSTPORT=$1
-  local SERVICENAME=$2
-  local DC=${3:-primary}
-  local NS=${4:-default}
-  local PARTITION=${5:default}
-
-  CERT=$(retry_default get_cert $HOSTPORT)
-
-  echo "WANT SERVICE: ${PARTITION}/${NS}/${SERVICENAME}"
-  echo "GOT CERT:"
-  echo "$CERT"
-
-  if [[ -z $PARTITION ]] || [[ $PARTITION = "default" ]]; then
-    echo "$CERT" | grep -Eo "URI:spiffe://([a-zA-Z0-9-]+).consul/ns/${NS}/dc/${DC}/svc/$SERVICENAME"
-  else
-    echo "$CERT" | grep -Eo "URI:spiffe://([a-zA-Z0-9-]+).consul/ap/${PARTITION}/ns/${NS}/dc/${DC}/svc/$SERVICENAME"
-  fi
-}
-
-function assert_dnssan_in_cert {
-  local HOSTPORT=$1
-  local DNSSAN=$2
-  local SERVER_NAME=${3:-$DNSSAN}
-
-  CERT=$(retry_default get_cert $HOSTPORT $SERVER_NAME)
-
-  echo "WANT DNSSAN: ${DNSSAN} (SNI: ${SERVER_NAME})"
-  echo "GOT CERT:"
-  echo "$CERT"
-
-  echo "$CERT" | grep -Eo "DNS:${DNSSAN}"
-}
-
-function assert_cert_signed_by_ca {
-  local CA_FILE=$1
-  local HOSTPORT=$2
-  local DNSSAN=$3
-  local SERVER_NAME=${4:-$DNSSAN}
-  local SNI_FLAG=""
-  if [ -n "$SERVER_NAME" ]; then
-    SNI_FLAG="-servername $SERVER_NAME"
-  fi
-
-  # Fix in the CA_FILE parameter: for Windows environments, the root path starts with "/c"
-  CERT=$(openssl s_client -connect $HOSTPORT $SNI_FLAG -CAfile "/c/$CA_FILE" -showcerts </dev/null)
-
-  echo "GOT CERT:"
-  echo "$CERT"
-
-  echo "$CERT" | grep 'Verify return code: 0 (ok)'
-}
-
-function assert_cert_has_cn {
-  local HOSTPORT=$1
-  local CN=$2
-  local SERVER_NAME=${3:-$CN}
-
-  CERT=$(openssl s_client -connect $HOSTPORT -servername $SERVER_NAME -showcerts </dev/null 2>/dev/null)
-
-  echo "WANT CN: ${CN} (SNI: ${SERVER_NAME})"
-  echo "GOT CERT:"
-  echo "$CERT"
-
-  echo "$CERT" | grep "CN = ${CN}"
-}
-
-function get_upstream_endpoint {
-  local HOSTPORT=$1
-  local CLUSTER_NAME=$2
-  run curl -s -f "http://${HOSTPORT}/clusters?format=json"
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output "
-.cluster_statuses[]
-| select(.name|startswith(\"${CLUSTER_NAME}\"))"
-}
-
-function assert_upstream_missing_once {
-  local HOSTPORT=$1
-  local CLUSTER_NAME=$2
-
-  run get_upstream_endpoint $HOSTPORT $CLUSTER_NAME
-  [ "$status" -eq 0 ]
-  echo "$output"
-  [ "" == "$output" ]
-}
-
-function assert_upstream_missing {
-  local HOSTPORT=$1
-  local CLUSTER_NAME=$2
-  run retry_long assert_upstream_missing_once $HOSTPORT $CLUSTER_NAME
-  echo "OUTPUT: $output $status"
-
-  [ "$status" -eq 0 ]
-}
-
-function assert_envoy_version {
-  local ADMINPORT=$1
-  run retry_default curl -f -s localhost:$ADMINPORT/server_info
-  [ "$status" -eq 0 ]
-  # Envoy 1.8.0 returns a plain text line like
-  # envoy 5d25f466c3410c0dfa735d7d4358beb76b2da507/1.8.0/Clean/DEBUG live 3 3 0
-  # Later versions return JSON.
-  if (echo $output | grep '^envoy'); then
-    VERSION=$(echo $output | cut -d ' ' -f 2)
-  else
-    VERSION=$(echo $output | jq -r '.version')
-  fi
-  echo "Status=$status"
-  echo "Output=$output"
-  echo "---"
-  echo "Got version=$VERSION"
-  echo "Want version=$ENVOY_VERSION"
-
-  # 1.20.2, 1.19.3 and 1.18.6 are special snowflakes in that the version for
-  # the release is reported with a '-dev' suffix (eg 1.20.2-dev).
-  if [ "$ENVOY_VERSION" = "1.20.2" ]; then
-    ENVOY_VERSION="1.20.2-dev"
-  elif [ "$ENVOY_VERSION" = "1.19.3" ]; then
-    ENVOY_VERSION="1.19.3-dev"
-  elif [ "$ENVOY_VERSION" = "1.18.6" ]; then
-    ENVOY_VERSION="1.18.6-dev"
-  fi
-
-  echo $VERSION | grep "/$ENVOY_VERSION/"
-}
-
-function assert_envoy_expose_checks_listener_count {
-  local HOSTPORT=$1
-  local EXPECT_PATH=$2
-
-  # scrape this once
-  BODY=$(get_envoy_expose_checks_listener_once $HOSTPORT)
-  echo "BODY = $BODY"
-
-  CHAINS=$(echo "$BODY" | jq '.active_state.listener.filter_chains | length')
-  echo "CHAINS = $CHAINS (expect 1)"
-  [ "${CHAINS:-0}" -eq 1 ]
-
-  RANGES=$(echo "$BODY" | jq '.active_state.listener.filter_chains[0].filter_chain_match.source_prefix_ranges | length')
-  echo "RANGES = $RANGES (expect 3)"
-  # note: if IPv6 is not supported in the kernel per
-  # agent/xds/platform:SupportsIPv6() then this will only be 2
-  [ "${RANGES:-0}" -eq 3 ]
-
-  HCM=$(echo "$BODY" | jq '.active_state.listener.filter_chains[0].filters[0]')
-  HCM_NAME=$(echo "$HCM" | jq -r '.name')
-  HCM_PATH=$(echo "$HCM" | jq -r '.typed_config.route_config.virtual_hosts[0].routes[0].match.path')
-  echo "HCM = $HCM"
-  [ "${HCM_NAME:-}" == "envoy.filters.network.http_connection_manager" ]
-  [ "${HCM_PATH:-}" == "${EXPECT_PATH}" ]
-}
-
-function get_envoy_expose_checks_listener_once {
-  local HOSTPORT=$1
-  run curl -m 5 -s -f $HOSTPORT/config_dump
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output '.configs[] | select(.["@type"] == "type.googleapis.com/envoy.admin.v3.ListenersConfigDump") | .dynamic_listeners[] | select(.name | startswith("exposed_path_"))'
-}
-
-function get_envoy_public_listener_once {
-  local HOSTPORT=$1
-  run curl -s -f $HOSTPORT/config_dump
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output '.configs[] | select(.["@type"] == "type.googleapis.com/envoy.admin.v3.ListenersConfigDump") | .dynamic_listeners[] | select(.name | startswith("public_listener:"))'
-}
-
-function assert_envoy_http_rbac_policy_count {
-  local HOSTPORT=$1
-  local EXPECT_COUNT=$2
-
-  GOT_COUNT=$(get_envoy_http_rbac_once $HOSTPORT | jq '.rules.policies | length')
-  echo "GOT_COUNT = $GOT_COUNT"
-  [ "${GOT_COUNT:-0}" -eq $EXPECT_COUNT ]
-}
-
-function get_envoy_http_rbac_once {
-  local HOSTPORT=$1
-  run curl -m 5 -s -f $HOSTPORT/config_dump
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output '.configs[2].dynamic_listeners[].active_state.listener.filter_chains[0].filters[0].typed_config.http_filters[] | select(.name == "envoy.filters.http.rbac") | .typed_config'
-}
-
-function assert_envoy_network_rbac_policy_count {
-  local HOSTPORT=$1
-  local EXPECT_COUNT=$2
-
-  GOT_COUNT=$(get_envoy_network_rbac_once $HOSTPORT | jq '.rules.policies | length')
-  echo "GOT_COUNT = $GOT_COUNT"
-  [ "${GOT_COUNT:-0}" -eq $EXPECT_COUNT ]
-}
-
-function get_envoy_network_rbac_once {
-  local HOSTPORT=$1
-  run curl -m 5 -s -f $HOSTPORT/config_dump
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output '.configs[2].dynamic_listeners[].active_state.listener.filter_chains[0].filters[] | select(.name == "envoy.filters.network.rbac") | .typed_config'
-}
-
-function get_envoy_listener_filters {
-  local HOSTPORT=$1
-  run retry_default curl -s -f $HOSTPORT/config_dump
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output '.configs[2].dynamic_listeners[].active_state.listener | "\(.name) \( .filter_chains[0].filters | map(.name) | join(","))"'
-}
-
-function get_envoy_http_filter {
-  local HOSTPORT=$1
-  local FILTER_NAME=$2
-  run retry_default curl -s -f $HOSTPORT/config_dump
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output ".configs[2].dynamic_listeners[] | .active_state.listener.filter_chains[].filters[] | select(.name == \"envoy.filters.network.http_connection_manager\") | .typed_config.http_filters[] | select(.name == \"${FILTER_NAME}\")"
-}
-
-function get_envoy_http_filters {
-  local HOSTPORT=$1
-  run retry_default curl -s -f $HOSTPORT/config_dump
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output '.configs[2].dynamic_listeners[].active_state.listener | "\(.name) \( .filter_chains[0].filters[] | select(.name == "envoy.filters.network.http_connection_manager") | .typed_config.http_filters | map(.name) | join(","))"'
-}
-
-function get_envoy_dynamic_cluster_once {
-  local HOSTPORT=$1
-  local NAME_PREFIX=$2
-  run curl -m 5 -s -f $HOSTPORT/config_dump
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output ".configs[] | select (.[\"@type\"] == \"type.googleapis.com/envoy.admin.v3.ClustersConfigDump\") | .dynamic_active_clusters[] | select(.cluster.name | startswith(\"${NAME_PREFIX}\"))"
-}
-
-function assert_envoy_dynamic_cluster_exists_once {
-  local HOSTPORT=$1
-  local NAME_PREFIX=$2
-  local EXPECT_SNI=$3
-  BODY="$(get_envoy_dynamic_cluster_once $HOSTPORT $NAME_PREFIX)"
-  [ -n "$BODY" ]
-
-  SNI="$(echo "$BODY" | jq --raw-output ".cluster.transport_socket.typed_config.sni | select(. | startswith(\"${EXPECT_SNI}\"))")"
-  [ -n "$SNI" ]
-}
-
-function assert_envoy_dynamic_cluster_exists {
-  local HOSTPORT=$1
-  local NAME_PREFIX=$2
-  local EXPECT_SNI=$3
-  run retry_long assert_envoy_dynamic_cluster_exists_once $HOSTPORT $NAME_PREFIX $EXPECT_SNI
-  [ "$status" -eq 0 ]
-}
-
-function get_envoy_cluster_config {
-  local HOSTPORT=$1
-  local CLUSTER_NAME=$2
-  run retry_default curl -s -f $HOSTPORT/config_dump
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output "
-    .configs[1].dynamic_active_clusters[]
-    | select(.cluster.name|startswith(\"${CLUSTER_NAME}\"))
-    | .cluster
-  "
-}
-
-function get_envoy_stats_flush_interval {
-  local HOSTPORT=$1
-  run retry_default curl -s -f $HOSTPORT/config_dump
-  [ "$status" -eq 0 ]
-  #echo "$output" > /workdir/s1_envoy_dump.json
-  echo "$output" | jq --raw-output '.configs[0].bootstrap.stats_flush_interval'
-}
-
-# snapshot_envoy_admin is meant to be used from a teardown scriptlet from the host.
-function snapshot_envoy_admin {
-  local HOSTPORT=$1
-  local ENVOY_NAME=$2
-  local DC=${3:-primary}
-  local OUTDIR="${LOG_DIR}/envoy-snapshots/${DC}/${ENVOY_NAME}"
-
-  mkdir -p "${OUTDIR}"
-  docker_consul_exec "$DC" bash -c "curl -s http://${HOSTPORT}/config_dump" > "${OUTDIR}/config_dump.json"
-  docker_consul_exec "$DC" bash -c "curl -s http://${HOSTPORT}/clusters?format=json" > "${OUTDIR}/clusters.json"
-  docker_consul_exec "$DC" bash -c "curl -s http://${HOSTPORT}/stats" > "${OUTDIR}/stats.txt"
-  docker_consul_exec "$DC" bash -c "curl -s http://${HOSTPORT}/stats/prometheus"  > "${OUTDIR}/stats_prometheus.txt"
-}
-
-function reset_envoy_metrics {
-  local HOSTPORT=$1
-  curl -m 5 -s -f -XPOST $HOSTPORT/reset_counters
-  return $?
-}
-
-function get_all_envoy_metrics {
-  local HOSTPORT=$1
-  curl -m 5 -s -f $HOSTPORT/stats
-  return $?
-}
-
-function get_envoy_metrics {
-  local HOSTPORT=$1
-  local METRICS=$2
-
-  get_all_envoy_metrics $HOSTPORT | grep "$METRICS"
-}
-
-function assert_upstream_has_endpoint_port {
-  local HOSTPORT=$1
-  local CLUSTER_NAME=$2
-  local PORT_VALUE=$3
-
-  run retry_long assert_upstream_has_endpoint_port_once $HOSTPORT $CLUSTER_NAME $PORT_VALUE
-  [ "$status" -eq 0 ]
-}
-
-function get_upstream_endpoint_in_status_count {
-  local HOSTPORT=$1
-  local CLUSTER_NAME=$2
-  local HEALTH_STATUS=$3
-  run curl -m 5 -s -f "http://${HOSTPORT}/clusters?format=json"
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output "
-.cluster_statuses[]
-| select(.name|startswith(\"${CLUSTER_NAME}\"))
-| [.host_statuses[].health_status.eds_health_status]
-| [select(.[] == \"${HEALTH_STATUS}\")]
-| length"
-}
-
-function assert_upstream_has_endpoints_in_status_once {
-  local HOSTPORT=$1
-  local CLUSTER_NAME=$2
-  local HEALTH_STATUS=$3
-  local EXPECT_COUNT=$4
-
-  GOT_COUNT=$(get_upstream_endpoint_in_status_count $HOSTPORT $CLUSTER_NAME $HEALTH_STATUS)
-
-  [ "$GOT_COUNT" -eq $EXPECT_COUNT ]
-}
-
-function assert_upstream_has_endpoints_in_status {
-  local HOSTPORT=$1
-  local CLUSTER_NAME=$2
-  local HEALTH_STATUS=$3
-  local EXPECT_COUNT=$4
-  run retry_long assert_upstream_has_endpoints_in_status_once $HOSTPORT $CLUSTER_NAME $HEALTH_STATUS $EXPECT_COUNT
-  [ "$status" -eq 0 ]
-}
-
-function assert_envoy_metric {
-  set -eEuo pipefail
-  local HOSTPORT=$1
-  local METRIC=$2
-  local EXPECT_COUNT=$3
-
-  METRICS=$(get_envoy_metrics $HOSTPORT "$METRIC")
-
-  if [ -z "${METRICS}" ]; then
-    echo "Metric not found" 1>&2
-    return 1
-  fi
-
-  GOT_COUNT=$(awk -F: '{print $2}' <<<"$METRICS" | head -n 1 | tr -d ' ')
-
-  if [ -z "$GOT_COUNT" ]; then
-    echo "Couldn't parse metric count" 1>&2
-    return 1
-  fi
-
-  if [ $EXPECT_COUNT -ne $GOT_COUNT ]; then
-    echo "$METRIC - expected count: $EXPECT_COUNT, actual count: $GOT_COUNT" 1>&2
-    return 1
-  fi
-}
-
-function assert_envoy_metric_at_least {
-  set -eEuo pipefail
-  local HOSTPORT=$1
-  local METRIC=$2
-  local EXPECT_COUNT=$3
-
-  METRICS=$(get_envoy_metrics $HOSTPORT "$METRIC")
-
-  if [ -z "${METRICS}" ]; then
-    echo "Metric not found" 1>&2
-    return 1
-  fi
-
-  GOT_COUNT=$(awk -F: '{print $2}' <<<"$METRICS" | head -n 1 | tr -d ' ')
-
-  if [ -z "$GOT_COUNT" ]; then
-    echo "Couldn't parse metric count" 1>&2
-    return 1
-  fi
-
-  if [ $EXPECT_COUNT -gt $GOT_COUNT ]; then
-    echo "$METRIC - expected >= count: $EXPECT_COUNT, actual count: $GOT_COUNT" 1>&2
-    return 1
-  fi
-}
-
-function assert_envoy_aggregate_metric_at_least {
-  set -eEuo pipefail
-  local HOSTPORT=$1
-  local METRIC=$2
-  local EXPECT_COUNT=$3
-
-  METRICS=$(get_envoy_metrics $HOSTPORT "$METRIC")
-
-  if [ -z "${METRICS}" ]; then
-    echo "Metric not found" 1>&2
-    return 1
-  fi
-
-  GOT_COUNT=$(awk '{ sum += $2 } END { print sum }' <<<"$METRICS")
-
-  if [ -z "$GOT_COUNT" ]; then
-    echo "Couldn't parse metric count" 1>&2
-    return 1
-  fi
-
-  if [ $EXPECT_COUNT -gt $GOT_COUNT ]; then
-    echo "$METRIC - expected >= count: $EXPECT_COUNT, actual count: $GOT_COUNT" 1>&2
-    return 1
-  fi
-}
-
-function get_healthy_service_count {
-  local SERVICE_NAME=$1
-  local DC=$2
-  local NS=$3
-  local AP=$4
-  local PEER_NAME=$5
-
-  run curl -m 5 -s -f ${HEADERS} "consul-${DC}-client:8500/v1/health/connect/${SERVICE_NAME}?passing&ns=${NS}&partition=${AP}&peer=${PEER_NAME}"
-
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output '. | length'
-}
-
-function assert_alive_wan_member_count {
-  local DC=$1
-  local EXPECT_COUNT=$2
-  run retry_long assert_alive_wan_member_count_once $DC $EXPECT_COUNT
-  [ "$status" -eq 0 ]
-}
-
-function assert_alive_wan_member_count_once {
-  local DC=$1
-  local EXPECT_COUNT=$2
-
-  GOT_COUNT=$(get_alive_wan_member_count $DC)
-
-  [ "$GOT_COUNT" -eq "$EXPECT_COUNT" ]
-}
-
-function get_alive_wan_member_count {
-  local DC=$1
-  run retry_default curl -sL -f "consul-${DC}-server:8500/v1/agent/members?wan=1"
-  [ "$status" -eq 0 ]
-  # echo "$output" >&3
-  echo "$output" | jq '.[] | select(.Status == 1) | .Name' | wc -l
-}
-
-function assert_service_has_healthy_instances_once {
-  local SERVICE_NAME=$1
-  local EXPECT_COUNT=$2
-  local DC=${3:-primary}
-  local NS=${4:-}
-  local AP=${5:-}
-  local PEER_NAME=${6:-}
-
-  GOT_COUNT=$(get_healthy_service_count "$SERVICE_NAME" "$DC" "$NS" "$AP" "$PEER_NAME")
-
-  [ "$GOT_COUNT" -eq $EXPECT_COUNT ]
-}
-
-function assert_service_has_healthy_instances {
-  local SERVICE_NAME=$1
-  local EXPECT_COUNT=$2
-  local DC=${3:-primary}
-  local NS=${4:-}
-  local AP=${5:-}
-  local PEER_NAME=${6:-}
-
-  run retry_long assert_service_has_healthy_instances_once "$SERVICE_NAME" "$EXPECT_COUNT" "$DC" "$NS" "$AP" "$PEER_NAME"
-  [ "$status" -eq 0 ]
-}
-
-function check_intention {
-  local SOURCE=$1
-  local DESTINATION=$2
-  get_consul_hostname primary
-
-  curl -m 5 -s -f "${CONSUL_HOSTNAME}:8500/v1/connect/intentions/check?source=${SOURCE}&destination=${DESTINATION}" | jq ".Allowed"
-}
-
-function assert_intention_allowed {
-  local SOURCE=$1
-  local DESTINATION=$2
-
-  run check_intention "${SOURCE}" "${DESTINATION}"
-  [ "$status" -eq 0 ]
-  [ "$output" = "true" ]
-}
-
-function assert_intention_denied {
-  local SOURCE=$1
-  local DESTINATION=$2
-
-  run check_intention "${SOURCE}" "${DESTINATION}"
-  [ "$status" -eq 0 ]
-  [ "$output" = "false" ]
-}
-
-function docker_consul {
-  local DC=$1
-  shift 1
-  retry_default docker_exec envoy_consul-${DC}_1 "$@"
-}
-
-function docker_consul_for_proxy_bootstrap {
-  local DC=$1
-  shift 1
-
-  local CONTAINER_NAME="$SINGLE_CONTAINER_BASE_NAME"-"$DC"_1
-
-  docker.exe exec -i $CONTAINER_NAME bash.exe -c "$@"
-}
-
-function docker_exec {
-  if ! docker.exe exec -i "$@"; then
-    echo "Failed to execute: docker exec -i $@" 1>&2
-    return 1
-  fi
-}
-
-function docker_consul_exec {
-  local DC=$1
-  shift 1
-  docker_exec envoy_consul-${DC}_1 "$@"
-}
-
-function kill_envoy {
-  local BOOTSTRAP_NAME=$1
-  local DC=${2:-primary}
-
-  PORT=$( cat /c/workdir/$DC/envoy/${BOOTSTRAP_NAME}-bootstrap.json | jq .admin.address.socket_address.port_value )
-  PID=$( netstat -qo | grep "127.0.0.1:$PORT" | sed -r "s/.* //g" )
-  tskill $PID
-}
-
-function must_match_in_statsd_logs {
-  local DC=${2:-primary}
-  local FILE="/c/workdir/${DC}/statsd/statsd.log"
-  
-  COUNT=$( grep -Ec $1 $FILE )  
-  echo "COUNT of '$1' matches: $COUNT"
- 
-  [ "$COUNT" -gt "0" ]
-}
-
-function must_match_in_prometheus_response {
-  run curl -m 5 -f -s $1/metrics
-  COUNT=$( echo "$output" | grep -Ec $2 )
-
-  echo "OUTPUT head -n 10"
-  echo "$output" | head -n 10
-  echo "COUNT of '$2' matches: $COUNT"
-
-  [ "$status" == 0 ]
-  [ "$COUNT" -gt "0" ]
-}
-
-function must_match_in_stats_proxy_response {
-  run curl -m 5 -f -s $1/$2
-  COUNT=$( echo "$output" | grep -Ec $3 )
-
-  echo "OUTPUT head -n 10"
-  echo "$output" | head -n 10
-  echo "COUNT of '$3' matches: $COUNT"
-
-  [ "$status" == 0 ]
-  [ "$COUNT" -gt "0" ]
-}
-
-# must_fail_tcp_connection checks that a request made through an upstream fails,
-# probably due to authz being denied if all other tests passed already. Although
-# we are using curl, this only works as expected for TCP upstreams as we are
-# checking TCP-level errors. HTTP upstreams will return a valid 503 generated by
-# Envoy rather than a connection-level error.
-function must_fail_tcp_connection {
-  # Attempt to curl through upstream
-  run curl -m 5 --no-keepalive -s -v -f -d hello $1
-
-  echo "OUTPUT $output"
-
-  # Should fail during handshake and return "got nothing" error
-  [ "$status" == "52" ]
-
-  # Verbose output should enclude empty reply
-  echo "$output" | grep 'Empty reply from server'
-}
-
-function must_pass_tcp_connection {
-  run curl -m 5 --no-keepalive -s -f -d hello $1
-
-  echo "OUTPUT $output"
-
-  [ "$status" == "0" ]
-  [ "$output" = "hello" ]
-}
-
-# must_fail_http_connection see must_fail_tcp_connection but this expects Envoy
-# to generate a 503 response since the upstreams have refused connection.
-function must_fail_http_connection {
-  # Attempt to curl through upstream
-  run curl -m 5 --no-keepalive -s -i -d hello "$1"
-
-  echo "OUTPUT $output"
-
-  [ "$status" == "0" ]
-
-  local expect_response="${2:-403 Forbidden}"
-  # Should fail request with 503
-  echo "$output" | grep "${expect_response}"
-}
-
-# must_pass_http_request allows you to craft a specific http request to assert
-# that envoy will NOT reject the request. Primarily of use for testing L7
-# intentions.
-function must_pass_http_request {
-  local METHOD=$1
-  local URL=$2
-  local DEBUG_HEADER_VALUE="${3:-""}"
-
-  local extra_args
-  if [[ -n "${DEBUG_HEADER_VALUE}" ]]; then
-    extra_args="-H x-test-debug:${DEBUG_HEADER_VALUE}"
-  fi
-  case "$METHOD" in
-    GET) ;;
-
-    DELETE)
-      extra_args="$extra_args -X${METHOD}"
-      ;;
-    PUT | POST)
-      extra_args="$extra_args -d'{}' -X${METHOD}"
-      ;;
-    *)
-      return 1
-      ;;
-  esac
-
-  run curl -m 5 --no-keepalive -v -s -f $extra_args "$URL"
-  [ "$status" == 0 ]
-}
-
-# must_fail_http_request allows you to craft a specific http request to assert
-# that envoy will reject the request. Primarily of use for testing L7
-# intentions.
-function must_fail_http_request {
-  local METHOD=$1
-  local URL=$2
-  local DEBUG_HEADER_VALUE="${3:-""}"
-
-  local extra_args
-  if [[ -n "${DEBUG_HEADER_VALUE}" ]]; then
-      extra_args="-H x-test-debug:${DEBUG_HEADER_VALUE}"
-  fi
-  case "$METHOD" in
-    HEAD)
-      extra_args="$extra_args -I"
-      ;;
-    GET) ;;
-
-    DELETE)
-      extra_args="$extra_args -X${METHOD}"
-      ;;
-    PUT | POST)
-      extra_args="$extra_args -d'{}' -X${METHOD}"
-      ;;
-    *)
-      return 1
-      ;;
-  esac
-
-  # Attempt to curl through upstream
-  run curl -m 5 --no-keepalive -s -i $extra_args "$URL"
-
-  echo "OUTPUT $output"
-
-  echo "$output" | grep "403 Forbidden"
-}
-
-function upsert_config_entry {
-  local DC="$1"
-  local BODY="$2"
-
-  echo "$BODY" | docker_consul "$DC" consul config write -
-}
-
-function gen_envoy_bootstrap {
-  SERVICE=$1
-  ADMIN_PORT=$2
-  DC=${3:-primary}
-  IS_GW=${4:-0}
-  EXTRA_ENVOY_BS_ARGS="${5-}"
-  ADMIN_HOST="0.0.0.0"
-
-  PROXY_ID="$SERVICE"
-  if ! is_set "$IS_GW"; then
-    PROXY_ID="$SERVICE-sidecar-proxy"
-    ADMIN_HOST="127.0.0.1"
-  fi
-
-  if output=$(docker_consul_for_proxy_bootstrap $DC "consul connect envoy -bootstrap \
-    -proxy-id $PROXY_ID \
-    -envoy-version "$ENVOY_VERSION" \
-    -http-addr envoy_consul-${DC}_1:8500 \
-    -grpc-addr envoy_consul-${DC}_1:8502 \
-    -admin-access-log-path="C:/envoy/envoy.log" \
-    -admin-bind $ADMIN_HOST:$ADMIN_PORT ${EXTRA_ENVOY_BS_ARGS} \
-    > /c/workdir/${DC}/envoy/${SERVICE}-bootstrap.json"); then
-
-    # All OK, write config to file
-    echo $output
-    #echo "$output" > /c/workdir/${DC}/envoy/$SERVICE-bootstrap.json
-  else
-    status=$?
-    # Command failed, instead of swallowing error (printed on stdout by docker
-    # it seems) by writing it to file, echo it
-    echo "$output"
-    #return $status
-  fi
-
-
-}
-
-function read_config_entry {
-  local KIND=$1
-  local NAME=$2
-  local DC=${3:-primary}
-  get_consul_hostname $DC
-  docker_consul_exec "$DC" bash -c "consul config read -kind $KIND -name $NAME -http-addr=\"$CONSUL_HOSTNAME:8500\""
-}
-
-function wait_for_namespace {
-  local NS="${1}"
-  local DC=${2:-primary}
-  get_consul_hostname $DC
-  retry_default docker_consul_exec "$DC" bash -c "curl -sLf http://${CONSUL_HOSTNAME}:8500/v1/namespace/${NS} >/dev/null"
-}
-
-function wait_for_config_entry {
-  retry_default read_config_entry "$@"
-}
-
-function assert_config_entry_status {
-  local TYPE="$1"
-  local STATUS="$2"
-  local REASON="$3"
-  local DC="$4"
-  local KIND="$5"
-  local NAME="$6"
-  local NS=${7:-}
-  local AP=${8:-}
-  local PEER=${9:-}
-
-  status=$(curl -s -f "consul-${DC}-client:8500/v1/config/${KIND}/${NAME}?passing&ns=${NS}&partition=${AP}&peer=${PEER}" | jq ".Status.Conditions[] | select(.Type == \"$TYPE\" and .Status == \"$STATUS\" and .Reason == \"$REASON\")")
-  [ -n "$status" ]
-}
-
-function delete_config_entry {
-  local KIND=$1
-  local NAME=$2
-  get_consul_hostname primary
-  retry_default curl -sL -XDELETE "http://${CONSUL_HOSTNAME}:8500/v1/config/${KIND}/${NAME}"
-}
-
-function register_services {
-  local DC=${1:-primary}
-  wait_for_leader "$DC"
-  docker_consul_exec ${DC} bash -c "consul services register workdir/${DC}/register/service_*.hcl"
-}
-
-# wait_for_leader waits until a leader is elected.
-# Its first argument must be the datacenter name.
-function wait_for_leader {
-  get_consul_hostname primary
-  retry_default docker_consul_exec "$1" bash -c "[[ $(curl --fail -sS http://${CONSUL_HOSTNAME}:8500/v1/status/leader) ]]"
-}
-
-function setup_upsert_l4_intention {
-  local SOURCE=$1
-  local DESTINATION=$2
-  local ACTION=$3
-  get_consul_hostname primary
-  retry_default docker_consul_exec primary bash -c "curl -sL -X PUT -d '{\"Action\": \"${ACTION}\"}' 'http://${CONSUL_HOSTNAME}:8500/v1/connect/intentions/exact?source=${SOURCE}&destination=${DESTINATION}'"
-}
-
-function upsert_l4_intention {
-  local SOURCE=$1
-  local DESTINATION=$2
-  local ACTION=$3
-  get_consul_hostname primary
-  retry_default curl -sL -XPUT "http://${CONSUL_HOSTNAME}:8500/v1/connect/intentions/exact?source=${SOURCE}&destination=${DESTINATION}" \
-      -d"{\"Action\": \"${ACTION}\"}" >/dev/null
-}
-
-function get_ca_root {
-  get_consul_hostname primary
-  curl -s -f "http://${CONSUL_HOSTNAME}:8500/v1/connect/ca/roots" | jq -r ".Roots[0].RootCert"
-}
-
-function wait_for_agent_service_register {
-  local SERVICE_ID=$1
-  local DC=${2:-primary}
-  get_consul_hostname $DC
-  retry_default docker_consul_exec "$DC" bash -c "curl -sLf 'http://${CONSUL_HOSTNAME}:8500/v1/agent/service/${SERVICE_ID}' >/dev/null"
-}
-
-function set_ttl_check_state {
-  local CHECK_ID=$1
-  local CHECK_STATE=$2
-  local DC=${3:-primary}
-  get_consul_hostname $DC
-
-  case "$CHECK_STATE" in
-    pass) ;;
-
-    warn) ;;
-
-    fail) ;;
-
-    *)
-      echo "invalid ttl check state '${CHECK_STATE}'" >&2
-      return 1
-      ;;
-  esac
-
-  retry_default docker_consul_exec "$DC" bash -c "curl -sL -XPUT 'http://${CONSUL_HOSTNAME}:8500/v1/agent/check/warn/${CHECK_ID}' >/dev/null"
-}
-
-function get_upstream_fortio_name {
-  local HOST=$1
-  local PORT=$2
-  local PREFIX=$3
-  local DEBUG_HEADER_VALUE="${4:-""}"
-  local extra_args
-  if [[ -n "${DEBUG_HEADER_VALUE}" ]]; then
-      extra_args="-H x-test-debug:${DEBUG_HEADER_VALUE}"
-  fi
-  # split proto if https:// is at the front of the host since the --resolve
-  # string needs just a bare host.
-  local PROTO=""
-  local CA_FILE=""
-  if [ "${HOST:0:8}" = "https://" ]; then
-    HOST="${HOST:8}"
-    PROTO="https://"
-    # Fix in the CA_FILE parameter: for Windows environments, the root path starts with "/c"
-    extra_args="${extra_args} --cacert /c/workdir/test-sds-server/certs/ca-root.crt"
-  fi
-  # We use --resolve instead of setting a Host header since we need the right
-  # name to be sent for SNI in some cases too.
-  run retry_default curl --ssl-revoke-best-effort -v -s -f --resolve "${HOST}:${PORT}:127.0.0.1" $extra_args \
-      "${PROTO}${HOST}:${PORT}${PREFIX}/debug?env=dump"
-
-  # Useful Debugging but breaks the expectation that the value output is just
-  # the grep output when things don't fail
-  if [ "$status" != 0 ]; then
-    echo "GOT FORTIO OUTPUT: $output"
-  fi
-  [ "$status" == 0 ]
-  echo "$output" | grep -E "^FORTIO_NAME="
-}
-
-function get_upstream_endpoint_port {
-  local HOSTPORT=$1
-  local CLUSTER_NAME=$2
-  local PORT_VALUE=$3
-  run curl -s -f "http://${HOSTPORT}/clusters?format=json"
-  [ "$status" -eq 0 ]
-  echo "$output" | jq --raw-output "
-.cluster_statuses[]
-| select(.name|startswith(\"${CLUSTER_NAME}\"))
-| [.host_statuses[].address.socket_address.port_value]
-| [select(.[] == ${PORT_VALUE})]
-| length"
-}
-
-function assert_upstream_has_endpoint_port_once {
-  local HOSTPORT=$1
-  local CLUSTER_NAME=$2
-  local PORT_VALUE=$3
-
-  GOT_COUNT=$(get_upstream_endpoint_port $HOSTPORT $CLUSTER_NAME $PORT_VALUE)
-
-  [ "$GOT_COUNT" -eq 1 ]
-}
-
-function assert_expected_fortio_name {
-  local EXPECT_NAME=$1
-  local HOST=${2:-"localhost"}
-  local PORT=${3:-5000}
-  local URL_PREFIX=${4:-""}
-  local DEBUG_HEADER_VALUE="${5:-""}"
-
-  run get_upstream_fortio_name ${HOST} ${PORT} "${URL_PREFIX}" "${DEBUG_HEADER_VALUE}"
-
-  echo "GOT: $output"
-
-  [ "$status" == 0 ]
-  [ "$output" == "FORTIO_NAME=${EXPECT_NAME}" ]
-}
-
-function assert_expected_fortio_name_pattern {
-  local EXPECT_NAME_PATTERN=$1
-  local HOST=${2:-"localhost"}
-  local PORT=${3:-5000}
-  local URL_PREFIX=${4:-""}
-  local DEBUG_HEADER_VALUE="${5:-""}"
-
-  GOT=$(get_upstream_fortio_name ${HOST} ${PORT} "${URL_PREFIX}" "${DEBUG_HEADER_VALUE}")
-
-  if [[ "$GOT" =~ $EXPECT_NAME_PATTERN ]]; then
-      :
-  else
-    echo "expected name pattern: $EXPECT_NAME_PATTERN, actual name: $GOT" 1>&2
-    return 1
-  fi
-}
-
-function get_upstream_fortio_host_header {
-  local HOST=$1
-  local PORT=$2
-  local PREFIX=$3
-  local DEBUG_HEADER_VALUE="${4:-""}"
-  local extra_args
-  if [[ -n "${DEBUG_HEADER_VALUE}" ]]; then
-      extra_args="-H x-test-debug:${DEBUG_HEADER_VALUE}"
-  fi
-  run retry_default curl -v -s -f -H"Host: ${HOST}" $extra_args \
-      "localhost:${PORT}${PREFIX}/debug"
-  [ "$status" == 0 ]
-  echo "$output" | grep -E "^Host: "
-}
-
-function assert_expected_fortio_host_header {
-  local EXPECT_HOST=$1
-  local HOST=${2:-"localhost"}
-  local PORT=${3:-5000}
-  local URL_PREFIX=${4:-""}
-  local DEBUG_HEADER_VALUE="${5:-""}"
-
-  GOT=$(get_upstream_fortio_host_header ${HOST} ${PORT} "${URL_PREFIX}" "${DEBUG_HEADER_VALUE}")
-
-  if [ "$GOT" != "Host: ${EXPECT_HOST}" ]; then
-    echo "expected Host header: $EXPECT_HOST, actual Host header: $GOT" 1>&2
-    return 1
-  fi
-}
-
-function create_peering {
-  local GENERATE_PEER=$1
-  local ESTABLISH_PEER=$2
-  run curl -m 5 -sL -XPOST "http://consul-${GENERATE_PEER}-client:8500/v1/peering/token" -d"{ \"PeerName\" : \"${GENERATE_PEER}-to-${ESTABLISH_PEER}\" }"
-  # echo "$output" >&3
-  [ "$status" == 0 ]
-
-  local token
-  token="$(echo "$output" | jq -r .PeeringToken)"
-  [ -n "$token" ]
-
-  run curl -m 5 -sLv -XPOST "http://consul-${ESTABLISH_PEER}-client:8500/v1/peering/establish" -d"{ \"PeerName\" : \"${ESTABLISH_PEER}-to-${GENERATE_PEER}\", \"PeeringToken\" : \"${token}\" }"
-  # echo "$output" >&3
-  [ "$status" == 0 ]
-}
-
-function assert_service_has_imported {
-  local DC=${1:-primary}
-  local SERVICE_NAME=$2
-  local PEER_NAME=$3
-
-  run curl -s -f "http://consul-${DC}-client:8500/v1/peering/${PEER_NAME}"
-  [ "$status" == 0 ]
-
-  echo "$output" | jq --raw-output '.StreamStatus.ImportedServices' | grep -e "${SERVICE_NAME}"
-  if [ $? -ne 0 ]; then
-    echo "Error finding service: ${SERVICE_NAME}"
-    return 1
-  fi
-}
-
-function get_lambda_envoy_http_filter {
-  local HOSTPORT=$1
-  local NAME_PREFIX=$2
-  run retry_default curl -s -f $HOSTPORT/config_dump
-  [ "$status" -eq 0 ]
-  # get the full http filter object so the individual fields can be validated.
-  echo "$output" | jq --raw-output ".configs[2].dynamic_listeners[] | .active_state.listener.filter_chains[].filters[] | select(.name == \"envoy.filters.network.http_connection_manager\") | .typed_config.http_filters[] | select(.name == \"envoy.filters.http.aws_lambda\") | .typed_config"
-}
-
-function register_lambdas {
-  local DC=${1:-primary}
-  # register lambdas to the catalog
-  for f in $(find workdir/${DC}/register -type f -name 'lambda_*.json'); do
-    retry_default curl -sL -XPUT -d @${f} "http://localhost:8500/v1/catalog/register" >/dev/null && \
-      echo "Registered Lambda: $(jq -r .Service.Service $f)"
-  done
-  # write service-defaults config entries for lambdas
-  for f in $(find workdir/${DC}/register -type f -name 'service_defaults_*.json'); do
-    varsub ${f} AWS_LAMBDA_REGION AWS_LAMBDA_ARN
-    retry_default curl -sL -XPUT -d @${f} "http://localhost:8500/v1/config" >/dev/null && \
-      echo "Wrote config: $(jq -r '.Kind + " / " + .Name' $f)"
-  done
-}
-
-function assert_lambda_envoy_dynamic_cluster_exists {
-  local HOSTPORT=$1
-  local NAME_PREFIX=$2
-
-  local BODY=$(get_envoy_dynamic_cluster_once $HOSTPORT $NAME_PREFIX)
-  [ -n "$BODY" ]
-
-  [ "$(echo $BODY | jq -r '.cluster.transport_socket.typed_config.sni')" == '*.amazonaws.com' ]
-}
-
-function assert_lambda_envoy_dynamic_http_filter_exists {
-  local HOSTPORT=$1
-  local NAME_PREFIX=$2
-  local ARN=$3
-
-  local FILTER=$(get_lambda_envoy_http_filter $HOSTPORT $NAME_PREFIX)
-  [ -n "$FILTER" ]
-
-  [ "$(echo $FILTER | jq -r '.arn')" == "$ARN" ]
-}
-
-function varsub {
-  local file=$1
-  shift
-  for v in "$@"; do
-    sed -i "s/\${$v}/${!v}/g" $file
-  done
-}
-
-function get_url_header {
-  local URL=$1
-  local HEADER=$2
-  run curl -s -f -X GET -I "${URL}"
-  [ "$status" == 0 ]
-  RESP=$(echo "$output" | tr -d '\r')
-  RESP=$(echo "$RESP" | grep -E "^${HEADER}: ")
-  RESP=$(echo "$RESP" | sed "s/^${HEADER}: //g")
-  echo "$RESP"
-}
-
-function assert_url_header {
-  local URL=$1
-  local HEADER=$2
-  local VALUE=$3
-  run get_url_header "$URL" "$HEADER"
-  [ "$status" == 0 ]
-  [ "$VALUE" = "$output" ]
-}
-
-# assert_upstream_message asserts both the returned code
-# and message from upstream service
-function assert_upstream_message {
-  local HOSTPORT=$1
-  run curl -s -d hello localhost:$HOSTPORT
-
-  if [ "$status" -ne 0 ]; then
-    echo "Command failed"
-    return 1
-  fi
-
-  if (echo $output | grep 'hello'); then
-    return 0
-  fi
-
-  echo "expected message not found in $output"
-  return 1
-}
\ No newline at end of file
diff --git a/test/integration/connect/envoy/main_test.go b/test/integration/connect/envoy/main_test.go
index aa83bb6bbec12..ed511d3323560 100644
--- a/test/integration/connect/envoy/main_test.go
+++ b/test/integration/connect/envoy/main_test.go
@@ -1,14 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build integration
+// +build integration
 
 package envoy
 
 import (
-	"flag"
-	"io/ioutil"
-	"log"
 	"os"
 	"os/exec"
 	"sort"
@@ -18,31 +13,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var (
-	flagWin          = flag.Bool("win", false, "Execute tests on windows")
-	flagResourceAPIs = flag.Bool("enable-resource-apis", false, "Execute tests with resource apis enabled.")
-)
-
 func TestEnvoy(t *testing.T) {
-	flag.Parse()
-
-	if *flagWin == true {
-		dir := "../../../"
-		check_dir_files(dir)
-	}
-
-	var testcases []string
-	var err error
-	if *flagResourceAPIs == true {
-		os.Setenv("USE_RESOURCE_APIS", "true")
-		testcases, err = discoverResourceAPICases()
-	} else {
-		testcases, err = discoverCases()
-	}
+	testcases, err := discoverCases()
 	require.NoError(t, err)
 
 	runCmd(t, "suite_setup")
-
 	defer runCmd(t, "suite_teardown")
 
 	for _, tc := range testcases {
@@ -62,7 +37,7 @@ func TestEnvoy(t *testing.T) {
 	}
 }
 
-func runCmdLinux(t *testing.T, c string, env ...string) {
+func runCmd(t *testing.T, c string, env ...string) {
 	t.Helper()
 
 	cmd := exec.Command("./run-tests.sh", c)
@@ -74,35 +49,7 @@ func runCmdLinux(t *testing.T, c string, env ...string) {
 	}
 }
 
-func runCmdWindows(t *testing.T, c string, env ...string) {
-	t.Helper()
-
-	param_5 := "false"
-	if env != nil {
-		param_5 = strings.Join(env, " ")
-	}
-
-	cmd := exec.Command("cmd", "/C", "bash run-tests.windows.sh", c, param_5)
-	cmd.Env = append(os.Environ(), env...)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	if err := cmd.Run(); err != nil {
-		t.Fatalf("command failed: %v", err)
-	}
-}
-
-func runCmd(t *testing.T, c string, env ...string) {
-	t.Helper()
-
-	if *flagWin == true {
-		runCmdWindows(t, c, env...)
-
-	} else {
-		runCmdLinux(t, c, env...)
-	}
-}
-
-// Discover the cases so we pick up both ce and ent copies.
+// Discover the cases so we pick up both oss and ent copies.
 func discoverCases() ([]string, error) {
 	cwd, err := os.Getwd()
 	if err != nil {
@@ -124,84 +71,3 @@ func discoverCases() ([]string, error) {
 	sort.Strings(out)
 	return out, nil
 }
-
-// discoverResourceAPICases will discover the Envoy tests case files but will contain
-// a filter in it to only return those case for which functionality has been added
-// to the V2 catalog resources.
-func discoverResourceAPICases() ([]string, error) {
-	cwd, err := os.Getwd()
-	if err != nil {
-		return nil, err
-	}
-
-	dirs, err := os.ReadDir(cwd)
-	if err != nil {
-		return nil, err
-	}
-
-	var out []string
-	for _, fi := range dirs {
-		// TODO(proxystate): enable this to only include tests cases that are supported.
-		// Currently the work is in progress, so it is wired up in CI, but this excludes any tests from actually running.
-		if fi.IsDir() && strings.HasPrefix(fi.Name(), "case-don-match-me-on-anything-yet-because-i-am-not-ready") {
-			out = append(out, fi.Name())
-		}
-	}
-
-	sort.Strings(out)
-	return out, nil
-}
-
-// CRLF convert functions
-// Recursively iterates through the directory passed by parameter looking for the sh and bash files.
-// Upon finding them, it calls crlf_file_check.
-func check_dir_files(path string) {
-	files, err := ioutil.ReadDir(path)
-	if err != nil {
-		log.Fatal(err)
-	}
-	for _, fil := range files {
-
-		v := strings.Split(fil.Name(), ".")
-		file_extension := v[len(v)-1]
-
-		file_path := path + "/" + fil.Name()
-
-		if fil.IsDir() == true {
-			check_dir_files(file_path)
-		}
-
-		if file_extension == "sh" || file_extension == "bash" {
-			crlf_file_check(file_path)
-		}
-	}
-}
-
-// Check if a file contains CRLF line endings if so call crlf_normalize
-func crlf_file_check(file_name string) {
-
-	file, err := ioutil.ReadFile(file_name)
-	text := string(file)
-
-	if edit := crlf_verify(text); edit != -1 {
-		crlf_normalize(file_name, text)
-	}
-
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-// Checks for the existence of CRLF line endings.
-func crlf_verify(text string) int {
-	position := strings.Index(text, "\r\n")
-	return position
-}
-
-// Replace CRLF line endings with LF.
-func crlf_normalize(filename, text string) {
-	text = strings.Replace(text, "\r\n", "\n", -1)
-	data := []byte(text)
-
-	ioutil.WriteFile(filename, data, 0644)
-}
diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh
index 900d3cbfd33b7..e1cc5f8fe3fb4 100755
--- a/test/integration/connect/envoy/run-tests.sh
+++ b/test/integration/connect/envoy/run-tests.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 
@@ -15,7 +12,7 @@ DEBUG=${DEBUG:-}
 XDS_TARGET=${XDS_TARGET:-server}
 
 # ENVOY_VERSION to run each test against
-ENVOY_VERSION=${ENVOY_VERSION:-"1.27.0"}
+ENVOY_VERSION=${ENVOY_VERSION:-"1.23.1"}
 export ENVOY_VERSION
 
 export DOCKER_BUILDKIT=1
@@ -179,14 +176,6 @@ function start_consul {
     license=$(cat $CONSUL_LICENSE_PATH)
   fi
 
-  USE_RESOURCE_APIS=${USE_RESOURCE_APIS:-false}
-
-  experiments="experiments=[]"
-  # set up consul to run in V1 or V2 catalog mode
-  if [[ "${USE_RESOURCE_APIS}" == true ]]; then
-   experiments="experiments=[\"resource-apis\"]"
-  fi
-
   # We currently run these integration tests in two modes: one in which Envoy's
   # xDS sessions are served directly by a Consul server, and another in which it
   # goes through a client agent.
@@ -270,7 +259,6 @@ function start_consul {
       agent -dev -datacenter "${DC}" \
       -config-dir "/workdir/${DC}/consul" \
       -config-dir "/workdir/${DC}/consul-server" \
-      -hcl=${experiments} \
       -client "0.0.0.0" >/dev/null
   fi
 }
@@ -577,7 +565,7 @@ function suite_setup {
 
     # pre-build the test-sds-server container
     echo "Rebuilding 'test-sds-server' image..."
-    retry_default docker build -t test-sds-server -f test-sds-server/Dockerfile test-sds-server
+    retry_default docker build -t test-sds-server -f Dockerfile-test-sds-server test-sds-server
 }
 
 function suite_teardown {
@@ -798,9 +786,6 @@ function common_run_container_gateway {
 function run_container_gateway-primary {
   common_run_container_gateway mesh-gateway primary
 }
-function run_container_gateway-ap1 {
-  common_run_container_gateway mesh-gateway ap1
-}
 function run_container_gateway-secondary {
   common_run_container_gateway mesh-gateway secondary
 }
diff --git a/test/integration/connect/envoy/run-tests.windows.sh b/test/integration/connect/envoy/run-tests.windows.sh
deleted file mode 100644
index 23a67b76ab6d0..0000000000000
--- a/test/integration/connect/envoy/run-tests.windows.sh
+++ /dev/null
@@ -1,916 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-
-if [ $2 != "false" ]
-then
-  export $2
-fi
-
-readonly self_name="$0"
-
-readonly HASHICORP_DOCKER_PROXY="docker.mirror.hashicorp.services"
-
-readonly SINGLE_CONTAINER_BASE_NAME=envoy_consul
-
-# DEBUG=1 enables set -x for this script so echos every command run
-DEBUG=${DEBUG:-}
-
-XDS_TARGET=${XDS_TARGET:-server}
-
-# ENVOY_VERSION to run each test against
-ENVOY_VERSION=${ENVOY_VERSION:-"1.27.0"}
-export ENVOY_VERSION
-
-export DOCKER_BUILDKIT=0
-
-if [ ! -z "$DEBUG" ] ; then
-  set -x
-fi
-
-source helpers.windows.bash
-
-function command_error {
-  echo "ERR: command exited with status $1" 1>&2
-  echo "     command:   $2" 1>&2
-  echo "     line:      $3" 1>&2
-  echo "     function:  $4" 1>&2
-  echo "     called at: $5" 1>&2
-  # printf '%s\n' "${FUNCNAME[@]}"
-  # printf '%s\n' "${BASH_SOURCE[@]}"
-  # printf '%s\n' "${BASH_LINENO[@]}"
-}
-
-trap 'command_error $? "${BASH_COMMAND}" "${LINENO}" "${FUNCNAME[0]:-main}" "${BASH_SOURCE[0]}:${BASH_LINENO[0]}"' ERR
-
-readonly WORKDIR_SNIPPET="-v envoy_workdir:C:\workdir"
-
-function network_snippet {
-    local DC="$1"
-    echo "--net=envoy-tests"
-}
-
-function aws_snippet {
-  LAMBDA_TESTS_ENABLED=${LAMBDA_TESTS_ENABLED:-false}
-  if [ "$LAMBDA_TESTS_ENABLED" != false ]; then
-    local snippet=""
-
-    # The Lambda integration cases assume that a Lambda function exists in $AWS_REGION with an ARN of $AWS_LAMBDA_ARN.
-    # The AWS credentials must have permission to invoke the Lambda function.
-    [ -n "$(set | grep '^AWS_ACCESS_KEY_ID=')" ] && snippet="${snippet} -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID"
-    [ -n "$(set | grep '^AWS_SECRET_ACCESS_KEY=')" ] && snippet="${snippet} -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY"
-    [ -n "$(set | grep '^AWS_SESSION_TOKEN=')" ] && snippet="${snippet} -e AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN"
-    [ -n "$(set | grep '^AWS_LAMBDA_REGION=')" ] && snippet="${snippet} -e AWS_LAMBDA_REGION=$AWS_LAMBDA_REGION"
-    [ -n "$(set | grep '^AWS_LAMBDA_ARN=')" ] && snippet="${snippet} -e AWS_LAMBDA_ARN=$AWS_LAMBDA_ARN"
-
-    echo "$snippet"
-  fi
-}
-
-function init_workdir {
-  local CLUSTER="$1"
-
-  if test -z "$CLUSTER"
-  then
-    CLUSTER=primary
-  fi
-
-  # Note, we use explicit set of dirs so we don't delete .gitignore. Also,
-  # don't wipe logs between runs as they are already split and we need them to
-  # upload as artifacts later.
-  rm -rf workdir/${CLUSTER}
-  rm -rf workdir/logs
-  mkdir -p workdir/${CLUSTER}/{consul,consul-server,register,envoy,bats,statsd,data}
-
-  # Reload consul config from defaults
-  cp consul-base-cfg/*.hcl workdir/${CLUSTER}/consul/
-
-  # Add any overrides if there are any (no op if not)
-  find ${CASE_DIR} -maxdepth 1 -name '*.hcl' -type f -exec cp -f {} workdir/${CLUSTER}/consul \;
-
-  # Copy all the test files
-  find ${CASE_DIR} -maxdepth 1 -name '*.bats' -type f -exec cp -f {} workdir/${CLUSTER}/bats \;
-  # Copy CLUSTER specific bats
-  cp helpers.windows.bash workdir/${CLUSTER}/bats/helpers.bash
-
-  # Add any CLUSTER overrides
-  if test -d "${CASE_DIR}/${CLUSTER}"
-  then
-    find ${CASE_DIR}/${CLUSTER} -type f -name '*.hcl' -exec cp -f {} workdir/${CLUSTER}/consul \;
-    find ${CASE_DIR}/${CLUSTER} -type f -name '*.bats' -exec cp -f {} workdir/${CLUSTER}/bats \;
-  fi
-
-  # move all of the registration files OUT of the consul config dir now
-  find workdir/${CLUSTER}/consul -type f -name 'service_*.hcl' -exec mv -f {} workdir/${CLUSTER}/register \;
-
-  # move the server.hcl out of the consul dir so that it doesn't get picked up
-  # by the client agent (if we're running with XDS_TARGET=client).
-  if test -f "workdir/${CLUSTER}/consul/server.hcl"
-  then
-    mv workdir/${CLUSTER}/consul/server.hcl workdir/${CLUSTER}/consul-server/server.hcl
-  fi
-
-  # copy the ca-certs for SDS so we can verify the right ones are served
-  mkdir -p workdir/test-sds-server/certs
-  cp test-sds-server/certs/ca-root.crt workdir/test-sds-server/certs/ca-root.crt
-
-  if test -d "${CASE_DIR}/data"
-  then
-    cp -r ${CASE_DIR}/data/* workdir/${CLUSTER}/data
-  fi
-
-  return 0
-}
-
-function docker_kill_rm {
-  local name
-  local todo=()
-  for name in "$@"; do
-    name="envoy_${name}_1"
-    if docker.exe container inspect $name &>/dev/null; then
-      if [[ "$name" == envoy_tcpdump-* ]]; then
-        echo -n "Gracefully stopping $name..."
-        docker.exe stop $name &> /dev/null
-        echo "done"
-      fi
-      todo+=($name)
-    fi
-  done
-
-  if [[ ${#todo[@]} -eq 0 ]]; then
-      return 0
-  fi
-
-  echo -n "Killing and removing: ${todo[@]}..."
-  docker.exe rm -v -f ${todo[@]} &> /dev/null
-  echo "done"
-}
-
-function start_consul {
-  local DC=${1:-primary}
-
-  # 8500/8502 are for consul
-  # 9411 is for zipkin which shares the network with consul
-  # 16686 is for jaeger ui which also shares the network with consul
-  ports=(
-    '-p=8500:8500'
-    '-p=8502:8502'
-    '-p=9411:9411'
-    '-p=16686:16686'
-  )
-  case "$DC" in
-    secondary)
-      ports=(
-        '-p=9500:8500'
-        '-p=9502:8502'
-      )
-      ;;
-    alpha)
-      ports=(
-        '-p=9510:8500'
-        '-p=9512:8502'
-      )
-      ;;
-  esac
-
-  license="${CONSUL_LICENSE:-}"
-  # load the consul license so we can pass it into the consul
-  # containers as an env var in the case that this is a consul
-  # enterprise test
-  if test -z "$license" -a -n "${CONSUL_LICENSE_PATH:-}"
-  then
-    license=$(cat $CONSUL_LICENSE_PATH)
-  fi
-
-  # We currently run these integration tests in two modes: one in which Envoy's
-  # xDS sessions are served directly by a Consul server, and another in which it
-  # goes through a client agent.
-  #
-  # This is necessary because servers and clients source configuration data in
-  # different ways (client agents use an RPC-backed cache and servers use their
-  # own local data) and we want to catch regressions in both.
-  #
-  # In the future we should also expand these tests to register services to the
-  # catalog directly (agentless) rather than relying on the server also being
-  # an agent.
-  #
-  # When XDS_TARGET=client we'll start a Consul server with its gRPC port
-  # disabled (but only if REQUIRE_PEERS is not set), and a client agent with
-  # its gRPC port enabled.
-  #
-  # When XDS_TARGET=server (or anything else) we'll run a single Consul server
-  # with its gRPC port enabled.
-  #
-  # In either case, the hostname `consul-${DC}-server` should be used as a
-  # server address (e.g. for WAN joining) and `consul-${DC}-client` should be
-  # used as a client address (e.g. for interacting with the HTTP API).
-  #
-  # Both hostnames work in both modes because we set network aliases on the
-  # containers such that both hostnames will resolve to the same container when
-  # XDS_TARGET=server.
-  #
-  # We also join containers to the network `container:consul-${DC}_1` in many
-  # places (see: network_snippet) so that we can curl localhost etc. In both
-  # modes, you can assume that this name refers to the client's container.
-  #
-  # Any .hcl files in the case/cluster directory will be given to both clients
-  # and servers (via the -config-dir flag) *except for* server.hcl which will
-  # only be applied to the server (and service registrations which will be made
-  # against the client).
-  if [[ "$XDS_TARGET" == "client" ]]
-  then
-    docker_kill_rm consul-${DC}-server
-    docker_kill_rm consul-${DC}
-
-    server_grpc_port="-1"
-    if is_set $REQUIRE_PEERS; then
-      server_grpc_port="8502"
-    fi
-
-    docker.exe run -d --name envoy_consul-${DC}-server_1 \
-      --net=envoy-tests \
-      $WORKDIR_SNIPPET \
-      --hostname "consul-${DC}-server" \
-      --network-alias "consul-${DC}-server" \
-      -e "CONSUL_LICENSE=$license" \
-      windows/consul:local \
-      agent -dev -datacenter "${DC}" \
-      -config-dir "C:\\workdir\\${DC}\\consul" \
-      -config-dir "C:\\workdir\\${DC}\\consul-server" \
-      -grpc-port $server_grpc_port \
-      -client "0.0.0.0" \
-      -bind "0.0.0.0" >/dev/null
-
-    docker.exe run -d --name envoy_consul-${DC}_1 \
-      --net=envoy-tests \
-      $WORKDIR_SNIPPET \
-      --hostname "consul-${DC}-client" \
-      --network-alias "consul-${DC}-client" \
-      -e "CONSUL_LICENSE=$license" \
-      ${ports[@]} \
-      windows/consul:local \
-      agent -datacenter "${DC}" \
-      -config-dir "C:\\workdir\\${DC}\\consul" \
-      -data-dir "/tmp/consul" \
-      -client "0.0.0.0" \
-      -grpc-port 8502 \
-      -datacenter "${DC}" \
-      -retry-join "consul-${DC}-server" >/dev/null
-  else
-    docker_kill_rm consul-${DC}
-
-    docker.exe run -d --name envoy_consul-${DC}_1 \
-      --net=envoy-tests \
-      $WORKDIR_SNIPPET \
-      --memory 4096m \
-      --cpus 2 \
-      --hostname "consul-${DC}" \
-      --network-alias "consul-${DC}-client" \
-      --network-alias "consul-${DC}-server" \
-      -e "CONSUL_LICENSE=$license" \
-      ${ports[@]} \
-      windows/consul:local \
-      agent -dev -datacenter "${DC}" \
-      -config-dir "C:\\workdir\\${DC}\\consul" \
-      -config-dir "C:\\workdir\\${DC}\\consul-server" \
-      -client "0.0.0.0" >/dev/null
-  fi
-}
-
-function start_partitioned_client {
-  local PARTITION=${1:-ap1}
-
-  # Start consul now as setup script needs it up
-  docker_kill_rm consul-${PARTITION}
-
-  license="${CONSUL_LICENSE:-}"
-  # load the consul license so we can pass it into the consul
-  # containers as an env var in the case that this is a consul
-  # enterprise test
-  if test -z "$license" -a -n "${CONSUL_LICENSE_PATH:-}"
-  then
-    license=$(cat $CONSUL_LICENSE_PATH)
-  fi
-
-  sh -c "rm -rf /workdir/${PARTITION}/data"
-
-  # Run consul and expose some ports to the host to make debugging locally a
-  # bit easier.
-  #
-  docker.exe run -d --name envoy_consul-${PARTITION}_1 \
-    --net=envoy-tests \
-    $WORKDIR_SNIPPET \
-    --hostname "consul-${PARTITION}-client" \
-    --network-alias "consul-${PARTITION}-client" \
-    -e "CONSUL_LICENSE=$license" \
-    windows/consul:local agent \
-    -datacenter "primary" \
-    -retry-join "consul-primary-server" \
-    -grpc-port 8502 \
-    -data-dir "/tmp/consul" \
-    -config-dir "C:\\workdir\\${PARTITION}/consul" \
-    -client "0.0.0.0" >/dev/null
-}
-
-function pre_service_setup {
-  local CLUSTER=${1:-primary}
-
-  # Run test case setup (e.g. generating Envoy bootstrap, starting containers)
-  if [ -f "${CASE_DIR}/${CLUSTER}/setup.sh" ]
-  then
-    source ${CASE_DIR}/${CLUSTER}/setup.sh
-  else
-    source ${CASE_DIR}/setup.sh
-  fi
-}
-
-function start_services {
-  # Start containers required
-  if [ ! -z "$REQUIRED_SERVICES" ] ; then
-    docker_kill_rm $REQUIRED_SERVICES
-    run_containers $REQUIRED_SERVICES
-  fi
-
-  return 0
-}
-
-function verify {
-  local CLUSTER="$1"
-  if test -z "$CLUSTER"; then
-    CLUSTER="primary"
-  fi
-
-  # Execute tests
-  res=0
-
-  # Nuke any previous case's verify container.
-  docker_kill_rm verify-${CLUSTER}
-
-  echo "Running ${CLUSTER} verification step for ${CASE_DIR}..."
-
-  # need to tell the PID 1 inside of the container that it won't be actual PID
-  # 1 because we're using --pid=host so we use TINI_SUBREAPER
-  if docker.exe exec -i ${SINGLE_CONTAINER_BASE_NAME}-${CLUSTER}_1 bash \
-    -c "TINI_SUBREAPER=1 \
-    ENVOY_VERSION=${ENVOY_VERSION} \
-    XDS_TARGET=${XDS_TARGET} \
-    /c/bats/bin/bats \
-    --pretty /c/workdir/${CLUSTER}/bats" ; then
-    echo "✓ PASS"
-  else
-    echo "⨯ FAIL"
-    res=1
-  fi
-
-  return $res
-}
-
-function capture_logs {
-  local LOG_DIR="workdir/logs/${CASE_DIR}/${ENVOY_VERSION}"
-
-  init_vars
-
-  echo "Capturing Logs"
-  mkdir -p "$LOG_DIR"
-
-  services="$REQUIRED_SERVICES consul-primary"
-  if [[ "$XDS_TARGET" == "client" ]]
-  then
-    services="$services consul-primary-server"
-  fi
-
-  if is_set $REQUIRE_SECONDARY
-  then
-    services="$services consul-secondary"
-
-    if [[ "$XDS_TARGET" == "client" ]]
-    then
-      services="$services consul-secondary-server"
-    fi
-  fi
-
-  if is_set $REQUIRE_PARTITIONS
-  then
-    services="$services consul-ap1"
-  fi
-  if is_set $REQUIRE_PEERS
-  then
-    services="$services consul-alpha"
-
-    if [[ "$XDS_TARGET" == "client" ]]
-    then
-      services="$services consul-alpha-server"
-    fi
-  fi
-
-  if [ -f "${CASE_DIR}/capture.sh" ]
-  then
-    echo "Executing ${CASE_DIR}/capture.sh"
-    source ${CASE_DIR}/capture.sh || true
-  fi
-
-  for cont in $services; do
-    echo "Capturing log for $cont"
-    docker.exe logs "envoy_${cont}_1" &> "${LOG_DIR}/${cont}.log" || {
-        echo "EXIT CODE $?" > "${LOG_DIR}/${cont}.log"
-    }
-  done
-}
-
-function stop_services {
-  # Teardown
-  docker_kill_rm $REQUIRED_SERVICES
-
-  docker_kill_rm consul-primary consul-primary-server consul-secondary consul-secondary-server consul-ap1 consul-alpha consul-alpha-server
-}
-
-function init_vars {
-  source "defaults.sh"
-  if [ -f "${CASE_DIR}/vars.sh" ] ; then
-    source "${CASE_DIR}/vars.sh"
-  fi
-}
-
-function global_setup {
-  if [ -f "${CASE_DIR}/global-setup-windows.sh" ] ; then    
-    source "${CASE_DIR}/global-setup-windows.sh"
-  fi
-}
-
-function wipe_volumes {
-  docker.exe exec -w "C:\workdir" envoy_workdir_1 cmd /c "rd /s /q . 2>nul"
-}
-
-# Windows containers does not allow cp command while running.
-function stop_and_copy_files {
-    # Create CMD file to execute within the container
-    echo "icacls C:\workdir /grant:r Everyone:(OI)(CI)F /T" > copy.cmd
-    echo "XCOPY C:\workdir_bak C:\workdir /e /h /c /i /y" > copy.cmd
-    # Stop dummy container to copy local workdir to container's workdir_bak
-    docker.exe stop envoy_workdir_1 > /dev/null
-    docker.exe cp workdir/. envoy_workdir_1:/workdir_bak
-    # Copy CMD file into container
-    docker.exe cp copy.cmd envoy_workdir_1:/
-    # Start dummy container and execute the CMD file
-    docker.exe start envoy_workdir_1 > /dev/null
-    docker.exe exec envoy_workdir_1 copy.cmd
-    # Delete local CMD file after execution
-    rm copy.cmd
-}
-
-function run_tests {
-  CASE_DIR="${CASE_DIR?CASE_DIR must be set to the path of the test case}"
-  CASE_NAME=$( basename $CASE_DIR | cut -c6- )
-  export CASE_NAME
-  export SKIP_CASE=""
-
-  init_vars
-
-  # Initialize the workdir
-  init_workdir primary
-
-  if is_set $REQUIRE_SECONDARY
-  then
-    init_workdir secondary
-  fi
-  if is_set $REQUIRE_PARTITIONS
-  then
-    init_workdir ap1
-  fi
-  if is_set $REQUIRE_PEERS
-  then
-    init_workdir alpha
-  fi
-
-  global_setup
-  
-  # Allow vars.sh to set a reason to skip this test case based on the ENV
-  if [ "$SKIP_CASE" != "" ] ; then
-    echo "SKIPPING CASE: $SKIP_CASE"
-    return 0
-  fi
-
-  # Wipe state
-  wipe_volumes
-
-  # Copying base files to shared volume
-  stop_and_copy_files
-
-  # Starting Consul primary cluster
-  start_consul primary
-
-  if is_set $REQUIRE_SECONDARY; then
-    start_consul secondary
-  fi
-  if is_set $REQUIRE_PARTITIONS; then
-    docker_consul "primary" consul partition create -name ap1 > /dev/null
-    start_partitioned_client ap1
-  fi
-  if is_set $REQUIRE_PEERS; then
-    start_consul alpha
-  fi
-
-  echo "Setting up the primary datacenter"
-  pre_service_setup primary
-
-  if is_set $REQUIRE_SECONDARY; then
-    echo "Setting up the secondary datacenter"
-    pre_service_setup secondary
-  fi
-  if is_set $REQUIRE_PARTITIONS; then
-    echo "Setting up the non-default partition"
-    pre_service_setup ap1
-  fi
-  if is_set $REQUIRE_PEERS; then
-    echo "Setting up the alpha peer"
-    pre_service_setup alpha
-  fi
-
-  echo "Starting services"
-  start_services
-
-  # Run the verify container and report on the output
-  echo "Verifying the primary datacenter"
-  verify primary
-
-  if is_set $REQUIRE_SECONDARY; then
-    echo "Verifying the secondary datacenter"
-    verify secondary
-  fi
-  if is_set $REQUIRE_PEERS; then
-    echo "Verifying the alpha peer"
-    verify alpha
-  fi
-}
-
-function test_teardown {
-    init_vars
-
-    stop_services
-}
-
-function workdir_cleanup {
-  docker_kill_rm workdir
-  docker.exe volume rm -f envoy_workdir &>/dev/null || true
-}
-
-
-function suite_setup {
-  # Cleanup from any previous unclean runs.
-  suite_teardown
-
-  docker.exe network create -d "nat" envoy-tests &>/dev/null
-
-  # Start the volume container
-  #
-  # This is a dummy container that we use to create volume and keep it
-  # accessible while other containers are down.
-  docker.exe volume create envoy_workdir &>/dev/null
-  docker.exe run -d --name envoy_workdir_1 \
-      $WORKDIR_SNIPPET \
-      --user ContainerAdministrator \
-      --net=none \
-      "${HASHICORP_DOCKER_PROXY}/windows/kubernetes/pause" &>/dev/null
-
-  # pre-build the consul+envoy container
-  echo "Rebuilding 'windows/consul:local' image with envoy $ENVOY_VERSION..."
-  retry_default docker.exe build -t windows/consul:local \
-      --build-arg ENVOY_VERSION=${ENVOY_VERSION} \
-      -f Dockerfile-consul-envoy-windows .
-
-
-  local CONSUL_VERSION=$(docker image inspect --format='{{.ContainerConfig.Labels.version}}' \
-                        windows/consul:local)
-  echo "Running Tests with Consul=$CONSUL_VERSION - Envoy=$ENVOY_VERSION - XDS_TARGET=$XDS_TARGET"
-}
-
-function suite_teardown {
-    docker_kill_rm verify-primary verify-secondary verify-alpha
-
-    # this is some hilarious magic
-    docker_kill_rm $(grep "^function run_container_" $self_name | \
-        sed 's/^function run_container_\(.*\) {/\1/g')
-
-    docker_kill_rm consul-primary consul-primary-server consul-secondary consul-secondary-server consul-ap1 consul-alpha consul-alpha-server
-
-    if docker.exe network inspect envoy-tests &>/dev/null ; then
-        echo -n "Deleting network 'envoy-tests'..."
-        docker.exe network rm envoy-tests
-        echo "done"
-    fi
-
-    workdir_cleanup
-}
-
-function run_containers {
-  echo "Starting containers"
-  echo $@
-  for name in $@ ; do
-    echo "Starting container"
-    echo $name
-    run_container $name
-  done
-  echo "Done running containers"
-}
-
-function run_container {
-  docker_kill_rm "$1"
-  "run_container_$1"
-}
-
-function common_run_container_service {
-  local service="$1"
-  local CLUSTER="$2"
-  local httpPort="$3"
-  local grpcPort="$4"
-  local CONTAINER_NAME="$SINGLE_CONTAINER_BASE_NAME"-"$CLUSTER"_1
-
-  docker.exe exec -d $CONTAINER_NAME bash \
-    -c "FORTIO_NAME=${service} \
-    fortio.exe server \
-    -http-port ":$httpPort" \
-    -grpc-port ":$grpcPort" \
-    -redirect-port disabled"
-}
-
-function run_container_s1 {
-  common_run_container_service s1 primary 8080 8079
-}
-
-function run_container_s1-ap1 {
-  common_run_container_service s1 ap1 8080 8079
-}
-
-function run_container_s2 {
-  common_run_container_service s2 primary 8181 8179
-}
-function run_container_s2-v1 {
-  common_run_container_service s2-v1 primary 8182 8178
-}
-function run_container_s2-v2 {
-  common_run_container_service s2-v2 primary 8183 8177
-}
-
-function run_container_s3 {
-  common_run_container_service s3 primary 8282 8279
-}
-function run_container_s3-v1 {
-  common_run_container_service s3-v1 primary 8283 8278
-}
-function run_container_s3-v2 {
-  common_run_container_service s3-v2 primary 8284 8277
-}
-function run_container_s3-alt {
-  common_run_container_service s3-alt primary 8286 8280
-}
-
-function run_container_s4 {
-  common_run_container_service s4 primary 8382 8281
-}
-
-function run_container_s1-secondary {
-  common_run_container_service s1-secondary secondary 8080 8079
-}
-
-function run_container_s2-secondary {
-  common_run_container_service s2-secondary secondary 8181 8179
-}
-
-function run_container_s2-ap1 {
-  common_run_container_service s2 ap1 8480 8479
-}
-
-function run_container_s3-ap1 {
-  common_run_container_service s3 ap1 8580 8579
-}
-
-function run_container_s1-alpha {
-  common_run_container_service s1-alpha alpha 8080 8079
-}
-
-function run_container_s2-alpha {
-  common_run_container_service s2-alpha alpha 8181 8179
-}
-
-function run_container_s3-alpha {
-  common_run_container_service s3-alpha alpha 8282 8279
-}
-
-function common_run_container_sidecar_proxy {
-  local service="$1"
-  local CLUSTER="$2"
-  local CONTAINER_NAME="$SINGLE_CONTAINER_BASE_NAME"-"$CLUSTER"_1
-
-  # Hot restart breaks since both envoys seem to interact with each other
-  # despite separate containers that don't share IPC namespace. Not quite
-  # sure how this happens but may be due to unix socket being in some shared
-  # location?
-  docker.exe exec -d $CONTAINER_NAME bash \
-    -c "envoy.exe \
-    -c /c/workdir/${CLUSTER}/envoy/${service}-bootstrap.json \
-    -l trace \
-    --disable-hot-restart \
-    --drain-time-s 1 >/dev/null"
-}
-
-function run_container_s1-sidecar-proxy {
-  common_run_container_sidecar_proxy s1 primary
-}
-
-function run_container_s1-ap1-sidecar-proxy {
-  common_run_container_sidecar_proxy s1 ap1
-}
-
-function run_container_s1-sidecar-proxy-consul-exec {
-  local CLUSTER="primary"
-  local CONTAINER_NAME="$SINGLE_CONTAINER_BASE_NAME"-"$CLUSTER"_1
-  local ADMIN_HOST="127.0.0.1"
-  local ADMIN_PORT="19000"
-
-  docker.exe exec -d $CONTAINER_NAME bash \
-    -c "consul connect envoy -sidecar-for s1 \
-    -http-addr $CONTAINER_NAME:8500 \
-    -grpc-addr $CONTAINER_NAME:8502 \
-    -admin-bind $ADMIN_HOST:$ADMIN_PORT \
-    -envoy-version ${ENVOY_VERSION} \
-    -- \
-    -l trace >/dev/null"
-}
-
-function run_container_s2-sidecar-proxy {
-  common_run_container_sidecar_proxy s2 primary
-}
-function run_container_s2-v1-sidecar-proxy {
-  common_run_container_sidecar_proxy s2-v1 primary
-}
-function run_container_s2-v2-sidecar-proxy {
-  common_run_container_sidecar_proxy s2-v2 primary
-}
-
-function run_container_s3-sidecar-proxy {
-  common_run_container_sidecar_proxy s3 primary
-}
-function run_container_s3-v1-sidecar-proxy {
-  common_run_container_sidecar_proxy s3-v1 primary
-}
-function run_container_s3-v2-sidecar-proxy {
-  common_run_container_sidecar_proxy s3-v2 primary
-}
-
-function run_container_s3-alt-sidecar-proxy {
-  common_run_container_sidecar_proxy s3-alt primary
-}
-
-function run_container_s1-sidecar-proxy-secondary {
-  common_run_container_sidecar_proxy s1 secondary
-}
-function run_container_s2-sidecar-proxy-secondary {
-  common_run_container_sidecar_proxy s2 secondary
-}
-
-function run_container_s2-ap1-sidecar-proxy {
-  common_run_container_sidecar_proxy s2 ap1
-}
-
-function run_container_s3-ap1-sidecar-proxy {
-  common_run_container_sidecar_proxy s3 ap1
-}
-
-function run_container_s1-sidecar-proxy-alpha {
-  common_run_container_sidecar_proxy s1 alpha
-}
-function run_container_s2-sidecar-proxy-alpha {
-  common_run_container_sidecar_proxy s2 alpha
-}
-function run_container_s3-sidecar-proxy-alpha {
-  common_run_container_sidecar_proxy s3 alpha
-}
-
-function common_run_container_gateway {
-  local name="$1"
-  local DC="$2"
-  local CONTAINER_NAME="$SINGLE_CONTAINER_BASE_NAME"-"$DC"_1
-
-  # Hot restart breaks since both envoys seem to interact with each other
-  # despite separate containers that don't share IPC namespace. Not quite
-  # sure how this happens but may be due to unix socket being in some shared
-  # location?
-  docker.exe exec -d $CONTAINER_NAME bash \
-    -c "envoy.exe \
-    -c /c/workdir/${DC}/envoy/${name}-bootstrap.json \
-    -l trace \
-    --disable-hot-restart \
-    --drain-time-s 1 >/dev/null"
-}
-
-function run_container_gateway-primary {
-  common_run_container_gateway mesh-gateway primary
-}
-function run_container_gateway-secondary {
-  common_run_container_gateway mesh-gateway secondary
-}
-function run_container_gateway-alpha {
-  common_run_container_gateway mesh-gateway alpha
-}
-
-function run_container_ingress-gateway-primary {
-  common_run_container_gateway ingress-gateway primary
-}
-
-function run_container_api-gateway-primary {
-  common_run_container_gateway api-gateway primary
-}
-
-function run_container_terminating-gateway-primary {
-  common_run_container_gateway terminating-gateway primary
-}
-
-function run_container_fake-statsd {
-  local CONTAINER_NAME="$SINGLE_CONTAINER_BASE_NAME"-"primary"_1
-  # This magic SYSTEM incantation is needed since Envoy doesn't add newlines and so
-  # we need each packet to be passed to echo to add a new line before
-  # appending. But it does not work on Windows.   
-  docker.exe exec -d $CONTAINER_NAME bash -c "socat -u UDP-RECVFROM:8125,fork,reuseaddr OPEN:/workdir/primary/statsd/statsd.log,create,append"                                            
-}
-
-function run_container_zipkin {
-  docker.exe run -d --name $(container_name) \
-    $WORKDIR_SNIPPET \
-    $(network_snippet primary) \
-    "${HASHICORP_DOCKER_PROXY}/windows/openzipkin"
-}
-
-function run_container_jaeger {
-  echo "Starting Jaeger service..."
-
-  local DC=${1:-primary}
-  local CONTAINER_NAME="$SINGLE_CONTAINER_BASE_NAME"-"$DC"_1
-
-  docker.exe exec -d $CONTAINER_NAME bash -c "jaeger-all-in-one.exe \
-    --collector.zipkin.http-port=9411"
-}
-
-function run_container_test-sds-server {
-  echo "Starting test-sds-server"
-  
-  local DC=${1:-primary}
-  local CONTAINER_NAME="$SINGLE_CONTAINER_BASE_NAME"-"$DC"_1
-
-  docker.exe exec -d $CONTAINER_NAME bash -c "cd /c/test-sds-server &&
-    ./test-sds-server.exe"
-}
-
-function container_name {
-  echo "envoy_${FUNCNAME[1]/#run_container_/}_1"
-}
-function container_name_prev {
-  echo "envoy_${FUNCNAME[2]/#run_container_/}_1"
-}
-
-# This is a debugging tool. Run via 'bash run-tests.sh debug_dump_volumes' on Powershell
-function debug_dump_volumes {
-  local LINUX_PATH=$(pwd)
-  local WIN_PATH=$( echo "$LINUX_PATH" | sed 's/^\/mnt//' | sed -e 's/^\///' -e 's/\//\\/g' -e 's/^./\0:/' )  
-  docker.exe run -it \
-    $WORKDIR_SNIPPET \
-    -v "$WIN_PATH":"C:\\cwd" \
-    --net=none \
-    "${HASHICORP_DOCKER_PROXY}/windows/nanoserver:1809" \
-    cmd /c "xcopy \workdir \cwd\workdir /E /H /C /I /Y"
-}
-
-function run_container_tcpdump-primary {
-    # To use add "tcpdump-primary" to REQUIRED_SERVICES
-    common_run_container_tcpdump primary
-}
-function run_container_tcpdump-secondary {
-    # To use add "tcpdump-secondary" to REQUIRED_SERVICES
-    common_run_container_tcpdump secondary
-}
-function run_container_tcpdump-alpha {
-    # To use add "tcpdump-alpha" to REQUIRED_SERVICES
-    common_run_container_tcpdump alpha
-}
-
-function common_run_container_tcpdump {
-    local DC="$1"
-
-    # we cant run this in circle but its only here to temporarily enable.
-
-#     docker.exe build --rm=false -t envoy-tcpdump -f Dockerfile-tcpdump-windows .
-
-    docker.exe run -d --name $(container_name_prev) \
-        $(network_snippet $DC) \
-        envoy-tcpdump \
-        -v -i any \
-        -w "/data/${DC}.pcap"
-}
-
-case "${1-}" in
-  "")
-    echo "command required"
-    exit 1 ;;
-  *)
-    "$@" ;;
-esac
diff --git a/test/integration/connect/envoy/test-sds-server/Dockerfile b/test/integration/connect/envoy/test-sds-server/Dockerfile
deleted file mode 100644
index 73f72667b95a0..0000000000000
--- a/test/integration/connect/envoy/test-sds-server/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-FROM golang:latest
-
-WORKDIR /go/src
-COPY ./ .
-
-RUN go build -v -o test-sds-server sds.go
-
-CMD ["/go/src/test-sds-server"]
diff --git a/test/integration/connect/envoy/test-sds-server/certs/gen-certs.sh b/test/integration/connect/envoy/test-sds-server/certs/gen-certs.sh
index 2c416ad146db6..975c9d3d19ec5 100755
--- a/test/integration/connect/envoy/test-sds-server/certs/gen-certs.sh
+++ b/test/integration/connect/envoy/test-sds-server/certs/gen-certs.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 set -eEuo pipefail
 unset CDPATH
diff --git a/test/integration/connect/envoy/test-sds-server/go.mod b/test/integration/connect/envoy/test-sds-server/go.mod
index 916d9b7211ac3..dfca9e528ab01 100644
--- a/test/integration/connect/envoy/test-sds-server/go.mod
+++ b/test/integration/connect/envoy/test-sds-server/go.mod
@@ -3,13 +3,8 @@ module test-sds-server
 go 1.16
 
 require (
-	github.com/envoyproxy/go-control-plane v0.11.0
-	github.com/fatih/color v1.14.1 // indirect
-	github.com/hashicorp/consul v1.15.2
-	github.com/hashicorp/go-hclog v1.5.0
-	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/stretchr/testify v1.8.3 // indirect
+	github.com/envoyproxy/go-control-plane v0.9.9
+	github.com/hashicorp/go-hclog v0.16.2
 	golang.org/x/net v0.13.0 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/grpc v1.55.0
+	google.golang.org/grpc v1.40.0
 )
diff --git a/test/integration/connect/envoy/test-sds-server/go.sum b/test/integration/connect/envoy/test-sds-server/go.sum
index 1a851374f877d..31c77e9c6885a 100644
--- a/test/integration/connect/envoy/test-sds-server/go.sum
+++ b/test/integration/connect/envoy/test-sds-server/go.sum
@@ -1,1046 +1,36 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.41.0/go.mod h1:OauMR7DV8fzvZIl2qg6rkaIhD/vmgk4iwEw/h6ercmg=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
-cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
-cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
-cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
-cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
-cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
-cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
-cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
-cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
-cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
-cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
-cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
-cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
-cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U=
-cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
-cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc=
-cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
-cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
-cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I=
-cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
-cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
-cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
-cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E=
-cloud.google.com/go/accesscontextmanager v1.3.0/go.mod h1:TgCBehyr5gNMz7ZaH9xubp+CE8dkrszb4oK9CWyvD4o=
-cloud.google.com/go/accesscontextmanager v1.4.0/go.mod h1:/Kjh7BBu/Gh83sv+K60vN9QE5NJcd80sU33vIe2IFPE=
-cloud.google.com/go/accesscontextmanager v1.6.0/go.mod h1:8XCvZWfYw3K/ji0iVnp+6pu7huxoQTLmxAbVjbloTtM=
-cloud.google.com/go/accesscontextmanager v1.7.0/go.mod h1:CEGLewx8dwa33aDAZQujl7Dx+uYhS0eay198wB/VumQ=
-cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw=
-cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY=
-cloud.google.com/go/aiplatform v1.27.0/go.mod h1:Bvxqtl40l0WImSb04d0hXFU7gDOiq9jQmorivIiWcKg=
-cloud.google.com/go/aiplatform v1.35.0/go.mod h1:7MFT/vCaOyZT/4IIFfxH4ErVg/4ku6lKv3w0+tFTgXQ=
-cloud.google.com/go/aiplatform v1.36.1/go.mod h1:WTm12vJRPARNvJ+v6P52RDHCNe4AhvjcIZ/9/RRHy/k=
-cloud.google.com/go/aiplatform v1.37.0/go.mod h1:IU2Cv29Lv9oCn/9LkFiiuKfwrRTq+QQMbW+hPCxJGZw=
-cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI=
-cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4=
-cloud.google.com/go/analytics v0.17.0/go.mod h1:WXFa3WSym4IZ+JiKmavYdJwGG/CvpqiqczmL59bTD9M=
-cloud.google.com/go/analytics v0.18.0/go.mod h1:ZkeHGQlcIPkw0R/GW+boWHhCOR43xz9RN/jn7WcqfIE=
-cloud.google.com/go/analytics v0.19.0/go.mod h1:k8liqf5/HCnOUkbawNtrWWc+UAzyDlW89doe8TtoDsE=
-cloud.google.com/go/apigateway v1.3.0/go.mod h1:89Z8Bhpmxu6AmUxuVRg/ECRGReEdiP3vQtk4Z1J9rJk=
-cloud.google.com/go/apigateway v1.4.0/go.mod h1:pHVY9MKGaH9PQ3pJ4YLzoj6U5FUDeDFBllIz7WmzJoc=
-cloud.google.com/go/apigateway v1.5.0/go.mod h1:GpnZR3Q4rR7LVu5951qfXPJCHquZt02jf7xQx7kpqN8=
-cloud.google.com/go/apigeeconnect v1.3.0/go.mod h1:G/AwXFAKo0gIXkPTVfZDd2qA1TxBXJ3MgMRBQkIi9jc=
-cloud.google.com/go/apigeeconnect v1.4.0/go.mod h1:kV4NwOKqjvt2JYR0AoIWo2QGfoRtn/pkS3QlHp0Ni04=
-cloud.google.com/go/apigeeconnect v1.5.0/go.mod h1:KFaCqvBRU6idyhSNyn3vlHXc8VMDJdRmwDF6JyFRqZ8=
-cloud.google.com/go/apigeeregistry v0.4.0/go.mod h1:EUG4PGcsZvxOXAdyEghIdXwAEi/4MEaoqLMLDMIwKXY=
-cloud.google.com/go/apigeeregistry v0.5.0/go.mod h1:YR5+s0BVNZfVOUkMa5pAR2xGd0A473vA5M7j247o1wM=
-cloud.google.com/go/apigeeregistry v0.6.0/go.mod h1:BFNzW7yQVLZ3yj0TKcwzb8n25CFBri51GVGOEUcgQsc=
-cloud.google.com/go/apikeys v0.4.0/go.mod h1:XATS/yqZbaBK0HOssf+ALHp8jAlNHUgyfprvNcBIszU=
-cloud.google.com/go/apikeys v0.5.0/go.mod h1:5aQfwY4D+ewMMWScd3hm2en3hCj+BROlyrt3ytS7KLI=
-cloud.google.com/go/apikeys v0.6.0/go.mod h1:kbpXu5upyiAlGkKrJgQl8A0rKNNJ7dQ377pdroRSSi8=
-cloud.google.com/go/appengine v1.4.0/go.mod h1:CS2NhuBuDXM9f+qscZ6V86m1MIIqPj3WC/UoEuR1Sno=
-cloud.google.com/go/appengine v1.5.0/go.mod h1:TfasSozdkFI0zeoxW3PTBLiNqRmzraodCWatWI9Dmak=
-cloud.google.com/go/appengine v1.6.0/go.mod h1:hg6i0J/BD2cKmDJbaFSYHFyZkgBEfQrDg/X0V5fJn84=
-cloud.google.com/go/appengine v1.7.0/go.mod h1:eZqpbHFCqRGa2aCdope7eC0SWLV1j0neb/QnMJVWx6A=
-cloud.google.com/go/appengine v1.7.1/go.mod h1:IHLToyb/3fKutRysUlFO0BPt5j7RiQ45nrzEJmKTo6E=
-cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4=
-cloud.google.com/go/area120 v0.6.0/go.mod h1:39yFJqWVgm0UZqWTOdqkLhjoC7uFfgXRC8g/ZegeAh0=
-cloud.google.com/go/area120 v0.7.0/go.mod h1:a3+8EUD1SX5RUcCs3MY5YasiO1z6yLiNLRiFrykbynY=
-cloud.google.com/go/area120 v0.7.1/go.mod h1:j84i4E1RboTWjKtZVWXPqvK5VHQFJRF2c1Nm69pWm9k=
-cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ=
-cloud.google.com/go/artifactregistry v1.7.0/go.mod h1:mqTOFOnGZx8EtSqK/ZWcsm/4U8B77rbcLP6ruDU2Ixk=
-cloud.google.com/go/artifactregistry v1.8.0/go.mod h1:w3GQXkJX8hiKN0v+at4b0qotwijQbYUqF2GWkZzAhC0=
-cloud.google.com/go/artifactregistry v1.9.0/go.mod h1:2K2RqvA2CYvAeARHRkLDhMDJ3OXy26h3XW+3/Jh2uYc=
-cloud.google.com/go/artifactregistry v1.11.1/go.mod h1:lLYghw+Itq9SONbCa1YWBoWs1nOucMH0pwXN1rOBZFI=
-cloud.google.com/go/artifactregistry v1.11.2/go.mod h1:nLZns771ZGAwVLzTX/7Al6R9ehma4WUEhZGWV6CeQNQ=
-cloud.google.com/go/artifactregistry v1.12.0/go.mod h1:o6P3MIvtzTOnmvGagO9v/rOjjA0HmhJ+/6KAXrmYDCI=
-cloud.google.com/go/artifactregistry v1.13.0/go.mod h1:uy/LNfoOIivepGhooAUpL1i30Hgee3Cu0l4VTWHUC08=
-cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o=
-cloud.google.com/go/asset v1.7.0/go.mod h1:YbENsRK4+xTiL+Ofoj5Ckf+O17kJtgp3Y3nn4uzZz5s=
-cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjbytpUaW0=
-cloud.google.com/go/asset v1.9.0/go.mod h1:83MOE6jEJBMqFKadM9NLRcs80Gdw76qGuHn8m3h8oHQ=
-cloud.google.com/go/asset v1.10.0/go.mod h1:pLz7uokL80qKhzKr4xXGvBQXnzHn5evJAEAtZiIb0wY=
-cloud.google.com/go/asset v1.11.1/go.mod h1:fSwLhbRvC9p9CXQHJ3BgFeQNM4c9x10lqlrdEUYXlJo=
-cloud.google.com/go/asset v1.12.0/go.mod h1:h9/sFOa4eDIyKmH6QMpm4eUK3pDojWnUhTgJlk762Hg=
-cloud.google.com/go/asset v1.13.0/go.mod h1:WQAMyYek/b7NBpYq/K4KJWcRqzoalEsxz/t/dTk4THw=
-cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY=
-cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw=
-cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI=
-cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo=
-cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0=
-cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E=
-cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0=
-cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8=
-cloud.google.com/go/automl v1.7.0/go.mod h1:RL9MYCCsJEOmt0Wf3z9uzG0a7adTT1fe+aObgSpkCt8=
-cloud.google.com/go/automl v1.8.0/go.mod h1:xWx7G/aPEe/NP+qzYXktoBSDfjO+vnKMGgsApGJJquM=
-cloud.google.com/go/automl v1.12.0/go.mod h1:tWDcHDp86aMIuHmyvjuKeeHEGq76lD7ZqfGLN6B0NuU=
-cloud.google.com/go/baremetalsolution v0.3.0/go.mod h1:XOrocE+pvK1xFfleEnShBlNAXf+j5blPPxrhjKgnIFc=
-cloud.google.com/go/baremetalsolution v0.4.0/go.mod h1:BymplhAadOO/eBa7KewQ0Ppg4A4Wplbn+PsFKRLo0uI=
-cloud.google.com/go/baremetalsolution v0.5.0/go.mod h1:dXGxEkmR9BMwxhzBhV0AioD0ULBmuLZI8CdwalUxuss=
-cloud.google.com/go/batch v0.3.0/go.mod h1:TR18ZoAekj1GuirsUsR1ZTKN3FC/4UDnScjT8NXImFE=
-cloud.google.com/go/batch v0.4.0/go.mod h1:WZkHnP43R/QCGQsZ+0JyG4i79ranE2u8xvjq/9+STPE=
-cloud.google.com/go/batch v0.7.0/go.mod h1:vLZN95s6teRUqRQ4s3RLDsH8PvboqBK+rn1oevL159g=
-cloud.google.com/go/beyondcorp v0.2.0/go.mod h1:TB7Bd+EEtcw9PCPQhCJtJGjk/7TC6ckmnSFS+xwTfm4=
-cloud.google.com/go/beyondcorp v0.3.0/go.mod h1:E5U5lcrcXMsCuoDNyGrpyTm/hn7ne941Jz2vmksAxW8=
-cloud.google.com/go/beyondcorp v0.4.0/go.mod h1:3ApA0mbhHx6YImmuubf5pyW8srKnCEPON32/5hj+RmM=
-cloud.google.com/go/beyondcorp v0.5.0/go.mod h1:uFqj9X+dSfrheVp7ssLTaRHd2EHqSL4QZmH4e8WXGGU=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA=
-cloud.google.com/go/bigquery v1.43.0/go.mod h1:ZMQcXHsl+xmU1z36G2jNGZmKp9zNY5BUua5wDgmNCfw=
-cloud.google.com/go/bigquery v1.44.0/go.mod h1:0Y33VqXTEsbamHJvJHdFmtqHvMIY28aK1+dFsvaChGc=
-cloud.google.com/go/bigquery v1.47.0/go.mod h1:sA9XOgy0A8vQK9+MWhEQTY6Tix87M/ZurWFIxmF9I/E=
-cloud.google.com/go/bigquery v1.48.0/go.mod h1:QAwSz+ipNgfL5jxiaK7weyOhzdoAy1zFm0Nf1fysJac=
-cloud.google.com/go/bigquery v1.49.0/go.mod h1:Sv8hMmTFFYBlt/ftw2uN6dFdQPzBlREY9yBh7Oy7/4Q=
-cloud.google.com/go/bigquery v1.50.0/go.mod h1:YrleYEh2pSEbgTBZYMJ5SuSr0ML3ypjRB1zgf7pvQLU=
-cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY=
-cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s=
-cloud.google.com/go/billing v1.6.0/go.mod h1:WoXzguj+BeHXPbKfNWkqVtDdzORazmCjraY+vrxcyvI=
-cloud.google.com/go/billing v1.7.0/go.mod h1:q457N3Hbj9lYwwRbnlD7vUpyjq6u5U1RAOArInEiD5Y=
-cloud.google.com/go/billing v1.12.0/go.mod h1:yKrZio/eu+okO/2McZEbch17O5CB5NpZhhXG6Z766ss=
-cloud.google.com/go/billing v1.13.0/go.mod h1:7kB2W9Xf98hP9Sr12KfECgfGclsH3CQR0R08tnRlRbc=
-cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM=
-cloud.google.com/go/binaryauthorization v1.2.0/go.mod h1:86WKkJHtRcv5ViNABtYMhhNWRrD1Vpi//uKEy7aYEfI=
-cloud.google.com/go/binaryauthorization v1.3.0/go.mod h1:lRZbKgjDIIQvzYQS1p99A7/U1JqvqeZg0wiI5tp6tg0=
-cloud.google.com/go/binaryauthorization v1.4.0/go.mod h1:tsSPQrBd77VLplV70GUhBf/Zm3FsKmgSqgm4UmiDItk=
-cloud.google.com/go/binaryauthorization v1.5.0/go.mod h1:OSe4OU1nN/VswXKRBmciKpo9LulY41gch5c68htf3/Q=
-cloud.google.com/go/certificatemanager v1.3.0/go.mod h1:n6twGDvcUBFu9uBgt4eYvvf3sQ6My8jADcOVwHmzadg=
-cloud.google.com/go/certificatemanager v1.4.0/go.mod h1:vowpercVFyqs8ABSmrdV+GiFf2H/ch3KyudYQEMM590=
-cloud.google.com/go/certificatemanager v1.6.0/go.mod h1:3Hh64rCKjRAX8dXgRAyOcY5vQ/fE1sh8o+Mdd6KPgY8=
-cloud.google.com/go/channel v1.8.0/go.mod h1:W5SwCXDJsq/rg3tn3oG0LOxpAo6IMxNa09ngphpSlnk=
-cloud.google.com/go/channel v1.9.0/go.mod h1:jcu05W0my9Vx4mt3/rEHpfxc9eKi9XwsdDL8yBMbKUk=
-cloud.google.com/go/channel v1.11.0/go.mod h1:IdtI0uWGqhEeatSB62VOoJ8FSUhJ9/+iGkJVqp74CGE=
-cloud.google.com/go/channel v1.12.0/go.mod h1:VkxCGKASi4Cq7TbXxlaBezonAYpp1GCnKMY6tnMQnLU=
-cloud.google.com/go/cloudbuild v1.3.0/go.mod h1:WequR4ULxlqvMsjDEEEFnOG5ZSRSgWOywXYDb1vPE6U=
-cloud.google.com/go/cloudbuild v1.4.0/go.mod h1:5Qwa40LHiOXmz3386FrjrYM93rM/hdRr7b53sySrTqA=
-cloud.google.com/go/cloudbuild v1.6.0/go.mod h1:UIbc/w9QCbH12xX+ezUsgblrWv+Cv4Tw83GiSMHOn9M=
-cloud.google.com/go/cloudbuild v1.7.0/go.mod h1:zb5tWh2XI6lR9zQmsm1VRA+7OCuve5d8S+zJUul8KTg=
-cloud.google.com/go/cloudbuild v1.9.0/go.mod h1:qK1d7s4QlO0VwfYn5YuClDGg2hfmLZEb4wQGAbIgL1s=
-cloud.google.com/go/clouddms v1.3.0/go.mod h1:oK6XsCDdW4Ib3jCCBugx+gVjevp2TMXFtgxvPSee3OM=
-cloud.google.com/go/clouddms v1.4.0/go.mod h1:Eh7sUGCC+aKry14O1NRljhjyrr0NFC0G2cjwX0cByRk=
-cloud.google.com/go/clouddms v1.5.0/go.mod h1:QSxQnhikCLUw13iAbffF2CZxAER3xDGNHjsTAkQJcQA=
-cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY=
-cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI=
-cloud.google.com/go/cloudtasks v1.7.0/go.mod h1:ImsfdYWwlWNJbdgPIIGJWC+gemEGTBK/SunNQQNCAb4=
-cloud.google.com/go/cloudtasks v1.8.0/go.mod h1:gQXUIwCSOI4yPVK7DgTVFiiP0ZW/eQkydWzwVMdHxrI=
-cloud.google.com/go/cloudtasks v1.9.0/go.mod h1:w+EyLsVkLWHcOaqNEyvcKAsWp9p29dL6uL9Nst1cI7Y=
-cloud.google.com/go/cloudtasks v1.10.0/go.mod h1:NDSoTLkZ3+vExFEWu2UJV1arUyzVDAiZtdWcsUyNwBs=
-cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
-cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM=
-cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M=
-cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s=
-cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
-cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U=
-cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
-cloud.google.com/go/compute v1.12.0/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU=
-cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU=
-cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARyZtRXDJ8GE=
-cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo=
-cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA=
-cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=
-cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU=
-cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU=
-cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
-cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=
-cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
-cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY=
-cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck=
-cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w=
-cloud.google.com/go/container v1.6.0/go.mod h1:Xazp7GjJSeUYo688S+6J5V+n/t+G5sKBTFkKNudGRxg=
-cloud.google.com/go/container v1.7.0/go.mod h1:Dp5AHtmothHGX3DwwIHPgq45Y8KmNsgN3amoYfxVkLo=
-cloud.google.com/go/container v1.13.1/go.mod h1:6wgbMPeQRw9rSnKBCAJXnds3Pzj03C4JHamr8asWKy4=
-cloud.google.com/go/container v1.14.0/go.mod h1:3AoJMPhHfLDxLvrlVWaK57IXzaPnLaZq63WX59aQBfM=
-cloud.google.com/go/container v1.15.0/go.mod h1:ft+9S0WGjAyjDggg5S06DXj+fHJICWg8L7isCQe9pQA=
-cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I=
-cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4=
-cloud.google.com/go/containeranalysis v0.7.0/go.mod h1:9aUL+/vZ55P2CXfuZjS4UjQ9AgXoSw8Ts6lemfmxBxI=
-cloud.google.com/go/containeranalysis v0.9.0/go.mod h1:orbOANbwk5Ejoom+s+DUCTTJ7IBdBQJDcSylAx/on9s=
-cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0=
-cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs=
-cloud.google.com/go/datacatalog v1.6.0/go.mod h1:+aEyF8JKg+uXcIdAmmaMUmZ3q1b/lKLtXCmXdnc0lbc=
-cloud.google.com/go/datacatalog v1.7.0/go.mod h1:9mEl4AuDYWw81UGc41HonIHH7/sn52H0/tc8f8ZbZIE=
-cloud.google.com/go/datacatalog v1.8.0/go.mod h1:KYuoVOv9BM8EYz/4eMFxrr4DUKhGIOXxZoKYF5wdISM=
-cloud.google.com/go/datacatalog v1.8.1/go.mod h1:RJ58z4rMp3gvETA465Vg+ag8BGgBdnRPEMMSTr5Uv+M=
-cloud.google.com/go/datacatalog v1.12.0/go.mod h1:CWae8rFkfp6LzLumKOnmVh4+Zle4A3NXLzVJ1d1mRm0=
-cloud.google.com/go/datacatalog v1.13.0/go.mod h1:E4Rj9a5ZtAxcQJlEBTLgMTphfP11/lNaAshpoBgemX8=
-cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM=
-cloud.google.com/go/dataflow v0.7.0/go.mod h1:PX526vb4ijFMesO1o202EaUmouZKBpjHsTlCtB4parQ=
-cloud.google.com/go/dataflow v0.8.0/go.mod h1:Rcf5YgTKPtQyYz8bLYhFoIV/vP39eL7fWNcSOyFfLJE=
-cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo=
-cloud.google.com/go/dataform v0.4.0/go.mod h1:fwV6Y4Ty2yIFL89huYlEkwUPtS7YZinZbzzj5S9FzCE=
-cloud.google.com/go/dataform v0.5.0/go.mod h1:GFUYRe8IBa2hcomWplodVmUx/iTL0FrsauObOM3Ipr0=
-cloud.google.com/go/dataform v0.6.0/go.mod h1:QPflImQy33e29VuapFdf19oPbE4aYTJxr31OAPV+ulA=
-cloud.google.com/go/dataform v0.7.0/go.mod h1:7NulqnVozfHvWUBpMDfKMUESr+85aJsC/2O0o3jWPDE=
-cloud.google.com/go/datafusion v1.4.0/go.mod h1:1Zb6VN+W6ALo85cXnM1IKiPw+yQMKMhB9TsTSRDo/38=
-cloud.google.com/go/datafusion v1.5.0/go.mod h1:Kz+l1FGHB0J+4XF2fud96WMmRiq/wj8N9u007vyXZ2w=
-cloud.google.com/go/datafusion v1.6.0/go.mod h1:WBsMF8F1RhSXvVM8rCV3AeyWVxcC2xY6vith3iw3S+8=
-cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I=
-cloud.google.com/go/datalabeling v0.6.0/go.mod h1:WqdISuk/+WIGeMkpw/1q7bK/tFEZxsrFJOJdY2bXvTQ=
-cloud.google.com/go/datalabeling v0.7.0/go.mod h1:WPQb1y08RJbmpM3ww0CSUAGweL0SxByuW2E+FU+wXcM=
-cloud.google.com/go/dataplex v1.3.0/go.mod h1:hQuRtDg+fCiFgC8j0zV222HvzFQdRd+SVX8gdmFcZzA=
-cloud.google.com/go/dataplex v1.4.0/go.mod h1:X51GfLXEMVJ6UN47ESVqvlsRplbLhcsAt0kZCCKsU0A=
-cloud.google.com/go/dataplex v1.5.2/go.mod h1:cVMgQHsmfRoI5KFYq4JtIBEUbYwc3c7tXmIDhRmNNVQ=
-cloud.google.com/go/dataplex v1.6.0/go.mod h1:bMsomC/aEJOSpHXdFKFGQ1b0TDPIeL28nJObeO1ppRs=
-cloud.google.com/go/dataproc v1.7.0/go.mod h1:CKAlMjII9H90RXaMpSxQ8EU6dQx6iAYNPcYPOkSbi8s=
-cloud.google.com/go/dataproc v1.8.0/go.mod h1:5OW+zNAH0pMpw14JVrPONsxMQYMBqJuzORhIBfBn9uI=
-cloud.google.com/go/dataproc v1.12.0/go.mod h1:zrF3aX0uV3ikkMz6z4uBbIKyhRITnxvr4i3IjKsKrw4=
-cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo=
-cloud.google.com/go/dataqna v0.6.0/go.mod h1:1lqNpM7rqNLVgWBJyk5NF6Uen2PHym0jtVJonplVsDA=
-cloud.google.com/go/dataqna v0.7.0/go.mod h1:Lx9OcIIeqCrw1a6KdO3/5KMP1wAmTc0slZWwP12Qq3c=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/datastore v1.10.0/go.mod h1:PC5UzAmDEkAmkfaknstTYbNpgE49HAgW2J1gcgUfmdM=
-cloud.google.com/go/datastore v1.11.0/go.mod h1:TvGxBIHCS50u8jzG+AW/ppf87v1of8nwzFNgEZU1D3c=
-cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo=
-cloud.google.com/go/datastream v1.3.0/go.mod h1:cqlOX8xlyYF/uxhiKn6Hbv6WjwPPuI9W2M9SAXwaLLQ=
-cloud.google.com/go/datastream v1.4.0/go.mod h1:h9dpzScPhDTs5noEMQVWP8Wx8AFBRyS0s8KWPx/9r0g=
-cloud.google.com/go/datastream v1.5.0/go.mod h1:6TZMMNPwjUqZHBKPQ1wwXpb0d5VDVPl2/XoS5yi88q4=
-cloud.google.com/go/datastream v1.6.0/go.mod h1:6LQSuswqLa7S4rPAOZFVjHIG3wJIjZcZrw8JDEDJuIs=
-cloud.google.com/go/datastream v1.7.0/go.mod h1:uxVRMm2elUSPuh65IbZpzJNMbuzkcvu5CjMqVIUHrww=
-cloud.google.com/go/deploy v1.4.0/go.mod h1:5Xghikd4VrmMLNaF6FiRFDlHb59VM59YoDQnOUdsH/c=
-cloud.google.com/go/deploy v1.5.0/go.mod h1:ffgdD0B89tToyW/U/D2eL0jN2+IEV/3EMuXHA0l4r+s=
-cloud.google.com/go/deploy v1.6.0/go.mod h1:f9PTHehG/DjCom3QH0cntOVRm93uGBDt2vKzAPwpXQI=
-cloud.google.com/go/deploy v1.8.0/go.mod h1:z3myEJnA/2wnB4sgjqdMfgxCA0EqC3RBTNcVPs93mtQ=
-cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4=
-cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/RcGSS+sh1el0=
-cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8=
-cloud.google.com/go/dialogflow v1.18.0/go.mod h1:trO7Zu5YdyEuR+BhSNOqJezyFQ3aUzz0njv7sMx/iek=
-cloud.google.com/go/dialogflow v1.19.0/go.mod h1:JVmlG1TwykZDtxtTXujec4tQ+D8SBFMoosgy+6Gn0s0=
-cloud.google.com/go/dialogflow v1.29.0/go.mod h1:b+2bzMe+k1s9V+F2jbJwpHPzrnIyHihAdRFMtn2WXuM=
-cloud.google.com/go/dialogflow v1.31.0/go.mod h1:cuoUccuL1Z+HADhyIA7dci3N5zUssgpBJmCzI6fNRB4=
-cloud.google.com/go/dialogflow v1.32.0/go.mod h1:jG9TRJl8CKrDhMEcvfcfFkkpp8ZhgPz3sBGmAUYJ2qE=
-cloud.google.com/go/dlp v1.6.0/go.mod h1:9eyB2xIhpU0sVwUixfBubDoRwP+GjeUoxxeueZmqvmM=
-cloud.google.com/go/dlp v1.7.0/go.mod h1:68ak9vCiMBjbasxeVD17hVPxDEck+ExiHavX8kiHG+Q=
-cloud.google.com/go/dlp v1.9.0/go.mod h1:qdgmqgTyReTz5/YNSSuueR8pl7hO0o9bQ39ZhtgkWp4=
-cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU=
-cloud.google.com/go/documentai v1.8.0/go.mod h1:xGHNEB7CtsnySCNrCFdCyyMz44RhFEEX2Q7UD0c5IhU=
-cloud.google.com/go/documentai v1.9.0/go.mod h1:FS5485S8R00U10GhgBC0aNGrJxBP8ZVpEeJ7PQDZd6k=
-cloud.google.com/go/documentai v1.10.0/go.mod h1:vod47hKQIPeCfN2QS/jULIvQTugbmdc0ZvxxfQY1bg4=
-cloud.google.com/go/documentai v1.16.0/go.mod h1:o0o0DLTEZ+YnJZ+J4wNfTxmDVyrkzFvttBXXtYRMHkM=
-cloud.google.com/go/documentai v1.18.0/go.mod h1:F6CK6iUH8J81FehpskRmhLq/3VlwQvb7TvwOceQ2tbs=
-cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y=
-cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg=
-cloud.google.com/go/domains v0.8.0/go.mod h1:M9i3MMDzGFXsydri9/vW+EWz9sWb4I6WyHqdlAk0idE=
-cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk=
-cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w=
-cloud.google.com/go/edgecontainer v0.3.0/go.mod h1:FLDpP4nykgwwIfcLt6zInhprzw0lEi2P1fjO6Ie0qbc=
-cloud.google.com/go/edgecontainer v1.0.0/go.mod h1:cttArqZpBB2q58W/upSG++ooo6EsblxDIolxa3jSjbY=
-cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU=
-cloud.google.com/go/essentialcontacts v1.3.0/go.mod h1:r+OnHa5jfj90qIfZDO/VztSFqbQan7HV75p8sA+mdGI=
-cloud.google.com/go/essentialcontacts v1.4.0/go.mod h1:8tRldvHYsmnBCHdFpvU+GL75oWiBKl80BiqlFh9tp+8=
-cloud.google.com/go/essentialcontacts v1.5.0/go.mod h1:ay29Z4zODTuwliK7SnX8E86aUF2CTzdNtvv42niCX0M=
-cloud.google.com/go/eventarc v1.7.0/go.mod h1:6ctpF3zTnaQCxUjHUdcfgcA1A2T309+omHZth7gDfmc=
-cloud.google.com/go/eventarc v1.8.0/go.mod h1:imbzxkyAU4ubfsaKYdQg04WS1NvncblHEup4kvF+4gw=
-cloud.google.com/go/eventarc v1.10.0/go.mod h1:u3R35tmZ9HvswGRBnF48IlYgYeBcPUCjkr4BTdem2Kw=
-cloud.google.com/go/eventarc v1.11.0/go.mod h1:PyUjsUKPWoRBCHeOxZd/lbOOjahV41icXyUY5kSTvVY=
-cloud.google.com/go/filestore v1.3.0/go.mod h1:+qbvHGvXU1HaKX2nD0WEPo92TP/8AQuCVEBXNY9z0+w=
-cloud.google.com/go/filestore v1.4.0/go.mod h1:PaG5oDfo9r224f8OYXURtAsY+Fbyq/bLYoINEK8XQAI=
-cloud.google.com/go/filestore v1.5.0/go.mod h1:FqBXDWBp4YLHqRnVGveOkHDf8svj9r5+mUDLupOWEDs=
-cloud.google.com/go/filestore v1.6.0/go.mod h1:di5unNuss/qfZTw2U9nhFqo8/ZDSc466dre85Kydllg=
-cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE=
-cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk=
-cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg=
-cloud.google.com/go/functions v1.8.0/go.mod h1:RTZ4/HsQjIqIYP9a9YPbU+QFoQsAlYgrwOXJWHn1POY=
-cloud.google.com/go/functions v1.9.0/go.mod h1:Y+Dz8yGguzO3PpIjhLTbnqV1CWmgQ5UwtlpzoyquQ08=
-cloud.google.com/go/functions v1.10.0/go.mod h1:0D3hEOe3DbEvCXtYOZHQZmD+SzYsi1YbI7dGvHfldXw=
-cloud.google.com/go/functions v1.12.0/go.mod h1:AXWGrF3e2C/5ehvwYo/GH6O5s09tOPksiKhz+hH8WkA=
-cloud.google.com/go/functions v1.13.0/go.mod h1:EU4O007sQm6Ef/PwRsI8N2umygGqPBS/IZQKBQBcJ3c=
-cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM=
-cloud.google.com/go/gaming v1.6.0/go.mod h1:YMU1GEvA39Qt3zWGyAVA9bpYz/yAhTvaQ1t2sK4KPUA=
-cloud.google.com/go/gaming v1.7.0/go.mod h1:LrB8U7MHdGgFG851iHAfqUdLcKBdQ55hzXy9xBJz0+w=
-cloud.google.com/go/gaming v1.8.0/go.mod h1:xAqjS8b7jAVW0KFYeRUxngo9My3f33kFmua++Pi+ggM=
-cloud.google.com/go/gaming v1.9.0/go.mod h1:Fc7kEmCObylSWLO334NcO+O9QMDyz+TKC4v1D7X+Bc0=
-cloud.google.com/go/gkebackup v0.2.0/go.mod h1:XKvv/4LfG829/B8B7xRkk8zRrOEbKtEam6yNfuQNH60=
-cloud.google.com/go/gkebackup v0.3.0/go.mod h1:n/E671i1aOQvUxT541aTkCwExO/bTer2HDlj4TsBRAo=
-cloud.google.com/go/gkebackup v0.4.0/go.mod h1:byAyBGUwYGEEww7xsbnUTBHIYcOPy/PgUWUtOeRm9Vg=
-cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o=
-cloud.google.com/go/gkeconnect v0.6.0/go.mod h1:Mln67KyU/sHJEBY8kFZ0xTeyPtzbq9StAVvEULYK16A=
-cloud.google.com/go/gkeconnect v0.7.0/go.mod h1:SNfmVqPkaEi3bF/B3CNZOAYPYdg7sU+obZ+QTky2Myw=
-cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0=
-cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y977wO+hBH0=
-cloud.google.com/go/gkehub v0.11.0/go.mod h1:JOWHlmN+GHyIbuWQPl47/C2RFhnFKH38jH9Ascu3n0E=
-cloud.google.com/go/gkehub v0.12.0/go.mod h1:djiIwwzTTBrF5NaXCGv3mf7klpEMcST17VBTVVDcuaw=
-cloud.google.com/go/gkemulticloud v0.3.0/go.mod h1:7orzy7O0S+5kq95e4Hpn7RysVA7dPs8W/GgfUtsPbrA=
-cloud.google.com/go/gkemulticloud v0.4.0/go.mod h1:E9gxVBnseLWCk24ch+P9+B2CoDFJZTyIgLKSalC7tuI=
-cloud.google.com/go/gkemulticloud v0.5.0/go.mod h1:W0JDkiyi3Tqh0TJr//y19wyb1yf8llHVto2Htf2Ja3Y=
-cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc=
-cloud.google.com/go/gsuiteaddons v1.3.0/go.mod h1:EUNK/J1lZEZO8yPtykKxLXI6JSVN2rg9bN8SXOa0bgM=
-cloud.google.com/go/gsuiteaddons v1.4.0/go.mod h1:rZK5I8hht7u7HxFQcFei0+AtfS9uSushomRlg+3ua1o=
-cloud.google.com/go/gsuiteaddons v1.5.0/go.mod h1:TFCClYLd64Eaa12sFVmUyG62tk4mdIsI7pAnSXRkcFo=
-cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c=
-cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
-cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc=
-cloud.google.com/go/iam v0.6.0/go.mod h1:+1AH33ueBne5MzYccyMHtEKqLE4/kJOibtffMHDMFMc=
-cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQEYOeg=
-cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE=
-cloud.google.com/go/iam v0.11.0/go.mod h1:9PiLDanza5D+oWFZiH1uG+RnRCfEGKoyl6yo4cgWZGY=
-cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY=
-cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0=
-cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc=
-cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A=
-cloud.google.com/go/iap v1.6.0/go.mod h1:NSuvI9C/j7UdjGjIde7t7HBz+QTwBcapPE07+sSRcLk=
-cloud.google.com/go/iap v1.7.0/go.mod h1:beqQx56T9O1G1yNPph+spKpNibDlYIiIixiqsQXxLIo=
-cloud.google.com/go/iap v1.7.1/go.mod h1:WapEwPc7ZxGt2jFGB/C/bm+hP0Y6NXzOYGjpPnmMS74=
-cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM=
-cloud.google.com/go/ids v1.2.0/go.mod h1:5WXvp4n25S0rA/mQWAg1YEEBBq6/s+7ml1RDCW1IrcY=
-cloud.google.com/go/ids v1.3.0/go.mod h1:JBdTYwANikFKaDP6LtW5JAi4gubs57SVNQjemdt6xV4=
-cloud.google.com/go/iot v1.3.0/go.mod h1:r7RGh2B61+B8oz0AGE+J72AhA0G7tdXItODWsaA2oLs=
-cloud.google.com/go/iot v1.4.0/go.mod h1:dIDxPOn0UvNDUMD8Ger7FIaTuvMkj+aGk94RPP0iV+g=
-cloud.google.com/go/iot v1.5.0/go.mod h1:mpz5259PDl3XJthEmh9+ap0affn/MqNSP4My77Qql9o=
-cloud.google.com/go/iot v1.6.0/go.mod h1:IqdAsmE2cTYYNO1Fvjfzo9po179rAtJeVGUvkLN3rLE=
-cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA=
-cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg=
-cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0=
-cloud.google.com/go/kms v1.8.0/go.mod h1:4xFEhYFqvW+4VMELtZyxomGSYtSQKzM178ylFW4jMAg=
-cloud.google.com/go/kms v1.9.0/go.mod h1:qb1tPTgfF9RQP8e1wq4cLFErVuTJv7UsSC915J8dh3w=
-cloud.google.com/go/kms v1.10.0/go.mod h1:ng3KTUtQQU9bPX3+QGLsflZIHlkbn8amFAMY63m8d24=
-cloud.google.com/go/kms v1.10.1/go.mod h1:rIWk/TryCkR59GMC3YtHtXeLzd634lBbKenvyySAyYI=
-cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic=
-cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI=
-cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE=
-cloud.google.com/go/language v1.8.0/go.mod h1:qYPVHf7SPoNNiCL2Dr0FfEFNil1qi3pQEyygwpgVKB8=
-cloud.google.com/go/language v1.9.0/go.mod h1:Ns15WooPM5Ad/5no/0n81yUetis74g3zrbeJBE+ptUY=
-cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8=
-cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08=
-cloud.google.com/go/lifesciences v0.8.0/go.mod h1:lFxiEOMqII6XggGbOnKiyZ7IBwoIqA84ClvoezaA/bo=
-cloud.google.com/go/logging v1.6.1/go.mod h1:5ZO0mHHbvm8gEmeEUHrmDlTDSu5imF6MUP9OfilNXBw=
-cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M=
-cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
-cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc=
-cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo=
-cloud.google.com/go/managedidentities v1.3.0/go.mod h1:UzlW3cBOiPrzucO5qWkNkh0w33KFtBJU281hacNvsdE=
-cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM=
-cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA=
-cloud.google.com/go/maps v0.1.0/go.mod h1:BQM97WGyfw9FWEmQMpZ5T6cpovXXSd1cGmFma94eubI=
-cloud.google.com/go/maps v0.6.0/go.mod h1:o6DAMMfb+aINHz/p/jbcY+mYeXBoZoxTfdSQ8VAJaCw=
-cloud.google.com/go/maps v0.7.0/go.mod h1:3GnvVl3cqeSvgMcpRlQidXsPYuDGQ8naBis7MVzpXsY=
-cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4=
-cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w=
-cloud.google.com/go/mediatranslation v0.7.0/go.mod h1:LCnB/gZr90ONOIQLgSXagp8XUW1ODs2UmUMvcgMfI2I=
-cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE=
-cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM=
-cloud.google.com/go/memcache v1.6.0/go.mod h1:XS5xB0eQZdHtTuTF9Hf8eJkKtR3pVRCcvJwtm68T3rA=
-cloud.google.com/go/memcache v1.7.0/go.mod h1:ywMKfjWhNtkQTxrWxCkCFkoPjLHPW6A7WOTVI8xy3LY=
-cloud.google.com/go/memcache v1.9.0/go.mod h1:8oEyzXCu+zo9RzlEaEjHl4KkgjlNDaXbCQeQWlzNFJM=
-cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY=
-cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s=
-cloud.google.com/go/metastore v1.7.0/go.mod h1:s45D0B4IlsINu87/AsWiEVYbLaIMeUSoxlKKDqBGFS8=
-cloud.google.com/go/metastore v1.8.0/go.mod h1:zHiMc4ZUpBiM7twCIFQmJ9JMEkDSyZS9U12uf7wHqSI=
-cloud.google.com/go/metastore v1.10.0/go.mod h1:fPEnH3g4JJAk+gMRnrAnoqyv2lpUCqJPWOodSaf45Eo=
-cloud.google.com/go/monitoring v1.7.0/go.mod h1:HpYse6kkGo//7p6sT0wsIC6IBDET0RhIsnmlA53dvEk=
-cloud.google.com/go/monitoring v1.8.0/go.mod h1:E7PtoMJ1kQXWxPjB6mv2fhC5/15jInuulFdYYtlcvT4=
-cloud.google.com/go/monitoring v1.12.0/go.mod h1:yx8Jj2fZNEkL/GYZyTLS4ZtZEZN8WtDEiEqG4kLK50w=
-cloud.google.com/go/monitoring v1.13.0/go.mod h1:k2yMBAB1H9JT/QETjNkgdCGD9bPF712XiLTVr+cBrpw=
-cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA=
-cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o=
-cloud.google.com/go/networkconnectivity v1.6.0/go.mod h1:OJOoEXW+0LAxHh89nXd64uGG+FbQoeH8DtxCHVOMlaM=
-cloud.google.com/go/networkconnectivity v1.7.0/go.mod h1:RMuSbkdbPwNMQjB5HBWD5MpTBnNm39iAVpC3TmsExt8=
-cloud.google.com/go/networkconnectivity v1.10.0/go.mod h1:UP4O4sWXJG13AqrTdQCD9TnLGEbtNRqjuaaA7bNjF5E=
-cloud.google.com/go/networkconnectivity v1.11.0/go.mod h1:iWmDD4QF16VCDLXUqvyspJjIEtBR/4zq5hwnY2X3scM=
-cloud.google.com/go/networkmanagement v1.4.0/go.mod h1:Q9mdLLRn60AsOrPc8rs8iNV6OHXaGcDdsIQe1ohekq8=
-cloud.google.com/go/networkmanagement v1.5.0/go.mod h1:ZnOeZ/evzUdUsnvRt792H0uYEnHQEMaz+REhhzJRcf4=
-cloud.google.com/go/networkmanagement v1.6.0/go.mod h1:5pKPqyXjB/sgtvB5xqOemumoQNB7y95Q7S+4rjSOPYY=
-cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ=
-cloud.google.com/go/networksecurity v0.6.0/go.mod h1:Q5fjhTr9WMI5mbpRYEbiexTzROf7ZbDzvzCrNl14nyU=
-cloud.google.com/go/networksecurity v0.7.0/go.mod h1:mAnzoxx/8TBSyXEeESMy9OOYwo1v+gZ5eMRnsT5bC8k=
-cloud.google.com/go/networksecurity v0.8.0/go.mod h1:B78DkqsxFG5zRSVuwYFRZ9Xz8IcQ5iECsNrPn74hKHU=
-cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY=
-cloud.google.com/go/notebooks v1.3.0/go.mod h1:bFR5lj07DtCPC7YAAJ//vHskFBxA5JzYlH68kXVdk34=
-cloud.google.com/go/notebooks v1.4.0/go.mod h1:4QPMngcwmgb6uw7Po99B2xv5ufVoIQ7nOGDyL4P8AgA=
-cloud.google.com/go/notebooks v1.5.0/go.mod h1:q8mwhnP9aR8Hpfnrc5iN5IBhrXUy8S2vuYs+kBJ/gu0=
-cloud.google.com/go/notebooks v1.7.0/go.mod h1:PVlaDGfJgj1fl1S3dUwhFMXFgfYGhYQt2164xOMONmE=
-cloud.google.com/go/notebooks v1.8.0/go.mod h1:Lq6dYKOYOWUCTvw5t2q1gp1lAp0zxAxRycayS0iJcqQ=
-cloud.google.com/go/optimization v1.1.0/go.mod h1:5po+wfvX5AQlPznyVEZjGJTMr4+CAkJf2XSTQOOl9l4=
-cloud.google.com/go/optimization v1.2.0/go.mod h1:Lr7SOHdRDENsh+WXVmQhQTrzdu9ybg0NecjHidBq6xs=
-cloud.google.com/go/optimization v1.3.1/go.mod h1:IvUSefKiwd1a5p0RgHDbWCIbDFgKuEdB+fPPuP0IDLI=
-cloud.google.com/go/orchestration v1.3.0/go.mod h1:Sj5tq/JpWiB//X/q3Ngwdl5K7B7Y0KZ7bfv0wL6fqVA=
-cloud.google.com/go/orchestration v1.4.0/go.mod h1:6W5NLFWs2TlniBphAViZEVhrXRSMgUGDfW7vrWKvsBk=
-cloud.google.com/go/orchestration v1.6.0/go.mod h1:M62Bevp7pkxStDfFfTuCOaXgaaqRAga1yKyoMtEoWPQ=
-cloud.google.com/go/orgpolicy v1.4.0/go.mod h1:xrSLIV4RePWmP9P3tBl8S93lTmlAxjm06NSm2UTmKvE=
-cloud.google.com/go/orgpolicy v1.5.0/go.mod h1:hZEc5q3wzwXJaKrsx5+Ewg0u1LxJ51nNFlext7Tanwc=
-cloud.google.com/go/orgpolicy v1.10.0/go.mod h1:w1fo8b7rRqlXlIJbVhOMPrwVljyuW5mqssvBtU18ONc=
-cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs=
-cloud.google.com/go/osconfig v1.8.0/go.mod h1:EQqZLu5w5XA7eKizepumcvWx+m8mJUhEwiPqWiZeEdg=
-cloud.google.com/go/osconfig v1.9.0/go.mod h1:Yx+IeIZJ3bdWmzbQU4fxNl8xsZ4amB+dygAwFPlvnNo=
-cloud.google.com/go/osconfig v1.10.0/go.mod h1:uMhCzqC5I8zfD9zDEAfvgVhDS8oIjySWh+l4WK6GnWw=
-cloud.google.com/go/osconfig v1.11.0/go.mod h1:aDICxrur2ogRd9zY5ytBLV89KEgT2MKB2L/n6x1ooPw=
-cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E=
-cloud.google.com/go/oslogin v1.5.0/go.mod h1:D260Qj11W2qx/HVF29zBg+0fd6YCSjSqLUkY/qEenQU=
-cloud.google.com/go/oslogin v1.6.0/go.mod h1:zOJ1O3+dTU8WPlGEkFSh7qeHPPSoxrcMbbK1Nm2iX70=
-cloud.google.com/go/oslogin v1.7.0/go.mod h1:e04SN0xO1UNJ1M5GP0vzVBFicIe4O53FOfcixIqTyXo=
-cloud.google.com/go/oslogin v1.9.0/go.mod h1:HNavntnH8nzrn8JCTT5fj18FuJLFJc4NaZJtBnQtKFs=
-cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0=
-cloud.google.com/go/phishingprotection v0.6.0/go.mod h1:9Y3LBLgy0kDTcYET8ZH3bq/7qni15yVUoAxiFxnlSUA=
-cloud.google.com/go/phishingprotection v0.7.0/go.mod h1:8qJI4QKHoda/sb/7/YmMQ2omRLSLYSu9bU0EKCNI+Lk=
-cloud.google.com/go/policytroubleshooter v1.3.0/go.mod h1:qy0+VwANja+kKrjlQuOzmlvscn4RNsAc0e15GGqfMxg=
-cloud.google.com/go/policytroubleshooter v1.4.0/go.mod h1:DZT4BcRw3QoO8ota9xw/LKtPa8lKeCByYeKTIf/vxdE=
-cloud.google.com/go/policytroubleshooter v1.5.0/go.mod h1:Rz1WfV+1oIpPdN2VvvuboLVRsB1Hclg3CKQ53j9l8vw=
-cloud.google.com/go/policytroubleshooter v1.6.0/go.mod h1:zYqaPTsmfvpjm5ULxAyD/lINQxJ0DDsnWOP/GZ7xzBc=
-cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0=
-cloud.google.com/go/privatecatalog v0.6.0/go.mod h1:i/fbkZR0hLN29eEWiiwue8Pb+GforiEIBnV9yrRUOKI=
-cloud.google.com/go/privatecatalog v0.7.0/go.mod h1:2s5ssIFO69F5csTXcwBP7NPFTZvps26xGzvQ2PQaBYg=
-cloud.google.com/go/privatecatalog v0.8.0/go.mod h1:nQ6pfaegeDAq/Q5lrfCQzQLhubPiZhSaNhIgfJlnIXs=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/pubsub v1.26.0/go.mod h1:QgBH3U/jdJy/ftjPhTkyXNj543Tin1pRYcdcPRnFIRI=
-cloud.google.com/go/pubsub v1.27.1/go.mod h1:hQN39ymbV9geqBnfQq6Xf63yNhUAhv9CZhzp5O6qsW0=
-cloud.google.com/go/pubsub v1.28.0/go.mod h1:vuXFpwaVoIPQMGXqRyUQigu/AX1S3IWugR9xznmcXX8=
-cloud.google.com/go/pubsub v1.30.0/go.mod h1:qWi1OPS0B+b5L+Sg6Gmc9zD1Y+HaM0MdUr7LsupY1P4=
-cloud.google.com/go/pubsublite v1.5.0/go.mod h1:xapqNQ1CuLfGi23Yda/9l4bBCKz/wC3KIJ5gKcxveZg=
-cloud.google.com/go/pubsublite v1.6.0/go.mod h1:1eFCS0U11xlOuMFV/0iBqw3zP12kddMeCbj/F3FSj9k=
-cloud.google.com/go/pubsublite v1.7.0/go.mod h1:8hVMwRXfDfvGm3fahVbtDbiLePT3gpoiJYJY+vxWxVM=
-cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4=
-cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o=
-cloud.google.com/go/recaptchaenterprise/v2 v2.2.0/go.mod h1:/Zu5jisWGeERrd5HnlS3EUGb/D335f9k51B/FVil0jk=
-cloud.google.com/go/recaptchaenterprise/v2 v2.3.0/go.mod h1:O9LwGCjrhGHBQET5CA7dd5NwwNQUErSgEDit1DLNTdo=
-cloud.google.com/go/recaptchaenterprise/v2 v2.4.0/go.mod h1:Am3LHfOuBstrLrNCBrlI5sbwx9LBg3te2N6hGvHn2mE=
-cloud.google.com/go/recaptchaenterprise/v2 v2.5.0/go.mod h1:O8LzcHXN3rz0j+LBC91jrwI3R+1ZSZEWrfL7XHgNo9U=
-cloud.google.com/go/recaptchaenterprise/v2 v2.6.0/go.mod h1:RPauz9jeLtB3JVzg6nCbe12qNoaa8pXc4d/YukAmcnA=
-cloud.google.com/go/recaptchaenterprise/v2 v2.7.0/go.mod h1:19wVj/fs5RtYtynAPJdDTb69oW0vNHYDBTbB4NvMD9c=
-cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg=
-cloud.google.com/go/recommendationengine v0.6.0/go.mod h1:08mq2umu9oIqc7tDy8sx+MNJdLG0fUi3vaSVbztHgJ4=
-cloud.google.com/go/recommendationengine v0.7.0/go.mod h1:1reUcE3GIu6MeBz/h5xZJqNLuuVjNg1lmWMPyjatzac=
-cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg=
-cloud.google.com/go/recommender v1.6.0/go.mod h1:+yETpm25mcoiECKh9DEScGzIRyDKpZ0cEhWGo+8bo+c=
-cloud.google.com/go/recommender v1.7.0/go.mod h1:XLHs/W+T8olwlGOgfQenXBTbIseGclClff6lhFVe9Bs=
-cloud.google.com/go/recommender v1.8.0/go.mod h1:PkjXrTT05BFKwxaUxQmtIlrtj0kph108r02ZZQ5FE70=
-cloud.google.com/go/recommender v1.9.0/go.mod h1:PnSsnZY7q+VL1uax2JWkt/UegHssxjUVVCrX52CuEmQ=
-cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y=
-cloud.google.com/go/redis v1.8.0/go.mod h1:Fm2szCDavWzBk2cDKxrkmWBqoCiL1+Ctwq7EyqBCA/A=
-cloud.google.com/go/redis v1.9.0/go.mod h1:HMYQuajvb2D0LvMgZmLDZW8V5aOC/WxstZHiy4g8OiA=
-cloud.google.com/go/redis v1.10.0/go.mod h1:ThJf3mMBQtW18JzGgh41/Wld6vnDDc/F/F35UolRZPM=
-cloud.google.com/go/redis v1.11.0/go.mod h1:/X6eicana+BWcUda5PpwZC48o37SiFVTFSs0fWAJ7uQ=
-cloud.google.com/go/resourcemanager v1.3.0/go.mod h1:bAtrTjZQFJkiWTPDb1WBjzvc6/kifjj4QBYuKCCoqKA=
-cloud.google.com/go/resourcemanager v1.4.0/go.mod h1:MwxuzkumyTX7/a3n37gmsT3py7LIXwrShilPh3P1tR0=
-cloud.google.com/go/resourcemanager v1.5.0/go.mod h1:eQoXNAiAvCf5PXxWxXjhKQoTMaUSNrEfg+6qdf/wots=
-cloud.google.com/go/resourcemanager v1.6.0/go.mod h1:YcpXGRs8fDzcUl1Xw8uOVmI8JEadvhRIkoXXUNVYcVo=
-cloud.google.com/go/resourcemanager v1.7.0/go.mod h1:HlD3m6+bwhzj9XCouqmeiGuni95NTrExfhoSrkC/3EI=
-cloud.google.com/go/resourcesettings v1.3.0/go.mod h1:lzew8VfESA5DQ8gdlHwMrqZs1S9V87v3oCnKCWoOuQU=
-cloud.google.com/go/resourcesettings v1.4.0/go.mod h1:ldiH9IJpcrlC3VSuCGvjR5of/ezRrOxFtpJoJo5SmXg=
-cloud.google.com/go/resourcesettings v1.5.0/go.mod h1:+xJF7QSG6undsQDfsCJyqWXyBwUoJLhetkRMDRnIoXA=
-cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4=
-cloud.google.com/go/retail v1.9.0/go.mod h1:g6jb6mKuCS1QKnH/dpu7isX253absFl6iE92nHwlBUY=
-cloud.google.com/go/retail v1.10.0/go.mod h1:2gDk9HsL4HMS4oZwz6daui2/jmKvqShXKQuB2RZ+cCc=
-cloud.google.com/go/retail v1.11.0/go.mod h1:MBLk1NaWPmh6iVFSz9MeKG/Psyd7TAgm6y/9L2B4x9Y=
-cloud.google.com/go/retail v1.12.0/go.mod h1:UMkelN/0Z8XvKymXFbD4EhFJlYKRx1FGhQkVPU5kF14=
-cloud.google.com/go/run v0.2.0/go.mod h1:CNtKsTA1sDcnqqIFR3Pb5Tq0usWxJJvsWOCPldRU3Do=
-cloud.google.com/go/run v0.3.0/go.mod h1:TuyY1+taHxTjrD0ZFk2iAR+xyOXEA0ztb7U3UNA0zBo=
-cloud.google.com/go/run v0.8.0/go.mod h1:VniEnuBwqjigv0A7ONfQUaEItaiCRVujlMqerPPiktM=
-cloud.google.com/go/run v0.9.0/go.mod h1:Wwu+/vvg8Y+JUApMwEDfVfhetv30hCG4ZwDR/IXl2Qg=
-cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s=
-cloud.google.com/go/scheduler v1.5.0/go.mod h1:ri073ym49NW3AfT6DZi21vLZrG07GXr5p3H1KxN5QlI=
-cloud.google.com/go/scheduler v1.6.0/go.mod h1:SgeKVM7MIwPn3BqtcBntpLyrIJftQISRrYB5ZtT+KOk=
-cloud.google.com/go/scheduler v1.7.0/go.mod h1:jyCiBqWW956uBjjPMMuX09n3x37mtyPJegEWKxRsn44=
-cloud.google.com/go/scheduler v1.8.0/go.mod h1:TCET+Y5Gp1YgHT8py4nlg2Sew8nUHMqcpousDgXJVQc=
-cloud.google.com/go/scheduler v1.9.0/go.mod h1:yexg5t+KSmqu+njTIh3b7oYPheFtBWGcbVUYF1GGMIc=
-cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA=
-cloud.google.com/go/secretmanager v1.8.0/go.mod h1:hnVgi/bN5MYHd3Gt0SPuTPPp5ENina1/LxM+2W9U9J4=
-cloud.google.com/go/secretmanager v1.9.0/go.mod h1:b71qH2l1yHmWQHt9LC80akm86mX8AL6X1MA01dW8ht4=
-cloud.google.com/go/secretmanager v1.10.0/go.mod h1:MfnrdvKMPNra9aZtQFvBcvRU54hbPD8/HayQdlUgJpU=
-cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4=
-cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0=
-cloud.google.com/go/security v1.8.0/go.mod h1:hAQOwgmaHhztFhiQ41CjDODdWP0+AE1B3sX4OFlq+GU=
-cloud.google.com/go/security v1.9.0/go.mod h1:6Ta1bO8LXI89nZnmnsZGp9lVoVWXqsVbIq/t9dzI+2Q=
-cloud.google.com/go/security v1.10.0/go.mod h1:QtOMZByJVlibUT2h9afNDWRZ1G96gVywH8T5GUSb9IA=
-cloud.google.com/go/security v1.12.0/go.mod h1:rV6EhrpbNHrrxqlvW0BWAIawFWq3X90SduMJdFwtLB8=
-cloud.google.com/go/security v1.13.0/go.mod h1:Q1Nvxl1PAgmeW0y3HTt54JYIvUdtcpYKVfIB8AOMZ+0=
-cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU=
-cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc=
-cloud.google.com/go/securitycenter v1.15.0/go.mod h1:PeKJ0t8MoFmmXLXWm41JidyzI3PJjd8sXWaVqg43WWk=
-cloud.google.com/go/securitycenter v1.16.0/go.mod h1:Q9GMaLQFUD+5ZTabrbujNWLtSLZIZF7SAR0wWECrjdk=
-cloud.google.com/go/securitycenter v1.18.1/go.mod h1:0/25gAzCM/9OL9vVx4ChPeM/+DlfGQJDwBy/UC8AKK0=
-cloud.google.com/go/securitycenter v1.19.0/go.mod h1:LVLmSg8ZkkyaNy4u7HCIshAngSQ8EcIRREP3xBnyfag=
-cloud.google.com/go/servicecontrol v1.4.0/go.mod h1:o0hUSJ1TXJAmi/7fLJAedOovnujSEvjKCAFNXPQ1RaU=
-cloud.google.com/go/servicecontrol v1.5.0/go.mod h1:qM0CnXHhyqKVuiZnGKrIurvVImCs8gmqWsDoqe9sU1s=
-cloud.google.com/go/servicecontrol v1.10.0/go.mod h1:pQvyvSRh7YzUF2efw7H87V92mxU8FnFDawMClGCNuAA=
-cloud.google.com/go/servicecontrol v1.11.0/go.mod h1:kFmTzYzTUIuZs0ycVqRHNaNhgR+UMUpw9n02l/pY+mc=
-cloud.google.com/go/servicecontrol v1.11.1/go.mod h1:aSnNNlwEFBY+PWGQ2DoM0JJ/QUXqV5/ZD9DOLB7SnUk=
-cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs=
-cloud.google.com/go/servicedirectory v1.5.0/go.mod h1:QMKFL0NUySbpZJ1UZs3oFAmdvVxhhxB6eJ/Vlp73dfg=
-cloud.google.com/go/servicedirectory v1.6.0/go.mod h1:pUlbnWsLH9c13yGkxCmfumWEPjsRs1RlmJ4pqiNjVL4=
-cloud.google.com/go/servicedirectory v1.7.0/go.mod h1:5p/U5oyvgYGYejufvxhgwjL8UVXjkuw7q5XcG10wx1U=
-cloud.google.com/go/servicedirectory v1.8.0/go.mod h1:srXodfhY1GFIPvltunswqXpVxFPpZjf8nkKQT7XcXaY=
-cloud.google.com/go/servicedirectory v1.9.0/go.mod h1:29je5JjiygNYlmsGz8k6o+OZ8vd4f//bQLtvzkPPT/s=
-cloud.google.com/go/servicemanagement v1.4.0/go.mod h1:d8t8MDbezI7Z2R1O/wu8oTggo3BI2GKYbdG4y/SJTco=
-cloud.google.com/go/servicemanagement v1.5.0/go.mod h1:XGaCRe57kfqu4+lRxaFEAuqmjzF0r+gWHjWqKqBvKFo=
-cloud.google.com/go/servicemanagement v1.6.0/go.mod h1:aWns7EeeCOtGEX4OvZUWCCJONRZeFKiptqKf1D0l/Jc=
-cloud.google.com/go/servicemanagement v1.8.0/go.mod h1:MSS2TDlIEQD/fzsSGfCdJItQveu9NXnUniTrq/L8LK4=
-cloud.google.com/go/serviceusage v1.3.0/go.mod h1:Hya1cozXM4SeSKTAgGXgj97GlqUvF5JaoXacR1JTP/E=
-cloud.google.com/go/serviceusage v1.4.0/go.mod h1:SB4yxXSaYVuUBYUml6qklyONXNLt83U0Rb+CXyhjEeU=
-cloud.google.com/go/serviceusage v1.5.0/go.mod h1:w8U1JvqUqwJNPEOTQjrMHkw3IaIFLoLsPLvsE3xueec=
-cloud.google.com/go/serviceusage v1.6.0/go.mod h1:R5wwQcbOWsyuOfbP9tGdAnCAc6B9DRwPG1xtWMDeuPA=
-cloud.google.com/go/shell v1.3.0/go.mod h1:VZ9HmRjZBsjLGXusm7K5Q5lzzByZmJHf1d0IWHEN5X4=
-cloud.google.com/go/shell v1.4.0/go.mod h1:HDxPzZf3GkDdhExzD/gs8Grqk+dmYcEjGShZgYa9URw=
-cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+qE2f9A=
-cloud.google.com/go/spanner v1.41.0/go.mod h1:MLYDBJR/dY4Wt7ZaMIQ7rXOTLjYrmxLE/5ve9vFfWos=
-cloud.google.com/go/spanner v1.44.0/go.mod h1:G8XIgYdOK+Fbcpbs7p2fiprDw4CaZX63whnSMLVBxjk=
-cloud.google.com/go/spanner v1.45.0/go.mod h1:FIws5LowYz8YAE1J8fOS7DJup8ff7xJeetWEo5REA2M=
-cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM=
-cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ=
-cloud.google.com/go/speech v1.8.0/go.mod h1:9bYIl1/tjsAnMgKGHKmBZzXKEkGgtU+MpdDPTE9f7y0=
-cloud.google.com/go/speech v1.9.0/go.mod h1:xQ0jTcmnRFFM2RfX/U+rk6FQNUF6DQlydUSyoooSpco=
-cloud.google.com/go/speech v1.14.1/go.mod h1:gEosVRPJ9waG7zqqnsHpYTOoAS4KouMRLDFMekpJ0J0=
-cloud.google.com/go/speech v1.15.0/go.mod h1:y6oH7GhqCaZANH7+Oe0BhgIogsNInLlz542tg3VqeYI=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y=
-cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc=
-cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s=
-cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
-cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
-cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w=
-cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I=
-cloud.google.com/go/storagetransfer v1.7.0/go.mod h1:8Giuj1QNb1kfLAiWM1bN6dHzfdlDAVC9rv9abHot2W4=
-cloud.google.com/go/storagetransfer v1.8.0/go.mod h1:JpegsHHU1eXg7lMHkvf+KE5XDJ7EQu0GwNJbbVGanEw=
-cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw=
-cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g=
-cloud.google.com/go/talent v1.3.0/go.mod h1:CmcxwJ/PKfRgd1pBjQgU6W3YBwiewmUzQYH5HHmSCmM=
-cloud.google.com/go/talent v1.4.0/go.mod h1:ezFtAgVuRf8jRsvyE6EwmbTK5LKciD4KVnHuDEFmOOA=
-cloud.google.com/go/talent v1.5.0/go.mod h1:G+ODMj9bsasAEJkQSzO2uHQWXHHXUomArjWQQYkqK6c=
-cloud.google.com/go/texttospeech v1.4.0/go.mod h1:FX8HQHA6sEpJ7rCMSfXuzBcysDAuWusNNNvN9FELDd8=
-cloud.google.com/go/texttospeech v1.5.0/go.mod h1:oKPLhR4n4ZdQqWKURdwxMy0uiTS1xU161C8W57Wkea4=
-cloud.google.com/go/texttospeech v1.6.0/go.mod h1:YmwmFT8pj1aBblQOI3TfKmwibnsfvhIBzPXcW4EBovc=
-cloud.google.com/go/tpu v1.3.0/go.mod h1:aJIManG0o20tfDQlRIej44FcwGGl/cD0oiRyMKG19IQ=
-cloud.google.com/go/tpu v1.4.0/go.mod h1:mjZaX8p0VBgllCzF6wcU2ovUXN9TONFLd7iz227X2Xg=
-cloud.google.com/go/tpu v1.5.0/go.mod h1:8zVo1rYDFuW2l4yZVY0R0fb/v44xLh3llq7RuV61fPM=
-cloud.google.com/go/trace v1.3.0/go.mod h1:FFUE83d9Ca57C+K8rDl/Ih8LwOzWIV1krKgxg6N0G28=
-cloud.google.com/go/trace v1.4.0/go.mod h1:UG0v8UBqzusp+z63o7FK74SdFE+AXpCLdFb1rshXG+Y=
-cloud.google.com/go/trace v1.8.0/go.mod h1:zH7vcsbAhklH8hWFig58HvxcxyQbaIqMarMg9hn5ECA=
-cloud.google.com/go/trace v1.9.0/go.mod h1:lOQqpE5IaWY0Ixg7/r2SjixMuc6lfTFeO4QGM4dQWOk=
-cloud.google.com/go/translate v1.3.0/go.mod h1:gzMUwRjvOqj5i69y/LYLd8RrNQk+hOmIXTi9+nb3Djs=
-cloud.google.com/go/translate v1.4.0/go.mod h1:06Dn/ppvLD6WvA5Rhdp029IX2Mi3Mn7fpMRLPvXT5Wg=
-cloud.google.com/go/translate v1.5.0/go.mod h1:29YDSYveqqpA1CQFD7NQuP49xymq17RXNaUDdc0mNu0=
-cloud.google.com/go/translate v1.6.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos=
-cloud.google.com/go/translate v1.7.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos=
-cloud.google.com/go/video v1.8.0/go.mod h1:sTzKFc0bUSByE8Yoh8X0mn8bMymItVGPfTuUBUyRgxk=
-cloud.google.com/go/video v1.9.0/go.mod h1:0RhNKFRF5v92f8dQt0yhaHrEuH95m068JYOvLZYnJSw=
-cloud.google.com/go/video v1.12.0/go.mod h1:MLQew95eTuaNDEGriQdcYn0dTwf9oWiA4uYebxM5kdg=
-cloud.google.com/go/video v1.13.0/go.mod h1:ulzkYlYgCp15N2AokzKjy7MQ9ejuynOJdf1tR5lGthk=
-cloud.google.com/go/video v1.14.0/go.mod h1:SkgaXwT+lIIAKqWAJfktHT/RbgjSuY6DobxEp0C5yTQ=
-cloud.google.com/go/video v1.15.0/go.mod h1:SkgaXwT+lIIAKqWAJfktHT/RbgjSuY6DobxEp0C5yTQ=
-cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU=
-cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4=
-cloud.google.com/go/videointelligence v1.8.0/go.mod h1:dIcCn4gVDdS7yte/w+koiXn5dWVplOZkE+xwG9FgK+M=
-cloud.google.com/go/videointelligence v1.9.0/go.mod h1:29lVRMPDYHikk3v8EdPSaL8Ku+eMzDljjuvRs105XoU=
-cloud.google.com/go/videointelligence v1.10.0/go.mod h1:LHZngX1liVtUhZvi2uNS0VQuOzNi2TkY1OakiuoUOjU=
-cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0=
-cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo=
-cloud.google.com/go/vision/v2 v2.3.0/go.mod h1:UO61abBx9QRMFkNBbf1D8B1LXdS2cGiiCRx0vSpZoUo=
-cloud.google.com/go/vision/v2 v2.4.0/go.mod h1:VtI579ll9RpVTrdKdkMzckdnwMyX2JILb+MhPqRbPsY=
-cloud.google.com/go/vision/v2 v2.5.0/go.mod h1:MmaezXOOE+IWa+cS7OhRRLK2cNv1ZL98zhqFFZaaH2E=
-cloud.google.com/go/vision/v2 v2.6.0/go.mod h1:158Hes0MvOS9Z/bDMSFpjwsUrZ5fPrdwuyyvKSGAGMY=
-cloud.google.com/go/vision/v2 v2.7.0/go.mod h1:H89VysHy21avemp6xcf9b9JvZHVehWbET0uT/bcuY/0=
-cloud.google.com/go/vmmigration v1.2.0/go.mod h1:IRf0o7myyWFSmVR1ItrBSFLFD/rJkfDCUTO4vLlJvsE=
-cloud.google.com/go/vmmigration v1.3.0/go.mod h1:oGJ6ZgGPQOFdjHuocGcLqX4lc98YQ7Ygq8YQwHh9A7g=
-cloud.google.com/go/vmmigration v1.5.0/go.mod h1:E4YQ8q7/4W9gobHjQg4JJSgXXSgY21nA5r8swQV+Xxc=
-cloud.google.com/go/vmmigration v1.6.0/go.mod h1:bopQ/g4z+8qXzichC7GW1w2MjbErL54rk3/C843CjfY=
-cloud.google.com/go/vmwareengine v0.1.0/go.mod h1:RsdNEf/8UDvKllXhMz5J40XxDrNJNN4sagiox+OI208=
-cloud.google.com/go/vmwareengine v0.2.2/go.mod h1:sKdctNJxb3KLZkE/6Oui94iw/xs9PRNC2wnNLXsHvH8=
-cloud.google.com/go/vmwareengine v0.3.0/go.mod h1:wvoyMvNWdIzxMYSpH/R7y2h5h3WFkx6d+1TIsP39WGY=
-cloud.google.com/go/vpcaccess v1.4.0/go.mod h1:aQHVbTWDYUR1EbTApSVvMq1EnT57ppDmQzZ3imqIk4w=
-cloud.google.com/go/vpcaccess v1.5.0/go.mod h1:drmg4HLk9NkZpGfCmZ3Tz0Bwnm2+DKqViEpeEpOq0m8=
-cloud.google.com/go/vpcaccess v1.6.0/go.mod h1:wX2ILaNhe7TlVa4vC5xce1bCnqE3AeH27RV31lnmZes=
-cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE=
-cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg=
-cloud.google.com/go/webrisk v1.6.0/go.mod h1:65sW9V9rOosnc9ZY7A7jsy1zoHS5W9IAXv6dGqhMQMc=
-cloud.google.com/go/webrisk v1.7.0/go.mod h1:mVMHgEYH0r337nmt1JyLthzMr6YxwN1aAIEc2fTcq7A=
-cloud.google.com/go/webrisk v1.8.0/go.mod h1:oJPDuamzHXgUc+b8SiHRcVInZQuybnvEW72PqTc7sSg=
-cloud.google.com/go/websecurityscanner v1.3.0/go.mod h1:uImdKm2wyeXQevQJXeh8Uun/Ym1VqworNDlBXQevGMo=
-cloud.google.com/go/websecurityscanner v1.4.0/go.mod h1:ebit/Fp0a+FWu5j4JOmJEV8S8CzdTkAS77oDsiSqYWQ=
-cloud.google.com/go/websecurityscanner v1.5.0/go.mod h1:Y6xdCPy81yi0SQnDY1xdNTNpfY1oAgXUlcfN3B3eSng=
-cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0=
-cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M=
-cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M=
-cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA=
-cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
-contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
-git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
-github.com/Azure/azure-sdk-for-go v32.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v32.6.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v44.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/go-autorest v11.1.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
-github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
-github.com/Azure/go-autorest/autorest v0.1.0/go.mod h1:AKyIcETwSUFxIcs/Wnq/C+kwCtlEYGUVd7FPNb2slmg=
-github.com/Azure/go-autorest/autorest v0.5.0/go.mod h1:9HLKlQjVBH6U3oDfsXOeVc56THsLPw1L03yban4xThw=
-github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest v0.9.2/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0=
-github.com/Azure/go-autorest/autorest v0.11.0/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
-github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA=
-github.com/Azure/go-autorest/autorest/adal v0.1.0/go.mod h1:MeS4XhScH55IST095THyTxElntu7WqB7pNbZo8Q5G3E=
-github.com/Azure/go-autorest/autorest/adal v0.2.0/go.mod h1:MeS4XhScH55IST095THyTxElntu7WqB7pNbZo8Q5G3E=
-github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
-github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
-github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
-github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M=
-github.com/Azure/go-autorest/autorest/azure/auth v0.1.0/go.mod h1:Gf7/i2FUpyb/sGBLIFxTBzrNzBo7aPXXE3ZVeDRwdpM=
-github.com/Azure/go-autorest/autorest/azure/auth v0.4.1/go.mod h1:5TgH20II424SXIV9YDBsO4rBCKsh39Vbx9DvhJZZ8rU=
-github.com/Azure/go-autorest/autorest/azure/auth v0.5.0/go.mod h1:QRTvSZQpxqm8mSErhnbI+tANIBAKP7B+UIE2z4ypUO0=
-github.com/Azure/go-autorest/autorest/azure/cli v0.1.0/go.mod h1:Dk8CUAt/b/PzkfeRsWzVG9Yj3ps8mS8ECztu43rdU8U=
-github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod h1:ZG5p860J94/0kI9mNJVoIoLgXcirM2gF5i2kWloofxw=
-github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod h1:JljT387FplPzBA31vUcvsetLKF3pec5bdAxjVU4kI2s=
-github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
-github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
-github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
-github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM=
-github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
-github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
-github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc=
-github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE=
-github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8=
-github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E=
-github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
-github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
-github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
-github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88=
-github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
-github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/DataDog/zstd v1.3.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
-github.com/HdrHistogram/hdrhistogram-go v1.0.1/go.mod h1:BWJ+nMSHY3L41Zj7CA3uXnloDp7xxV0YvstAE7nKTaM=
-github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
-github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
-github.com/Microsoft/go-winio v0.4.3/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
-github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
-github.com/NYTimes/gziphandler v1.0.1/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87/go.mod h1:iGLljf5n9GjT6kc0HBvyI1nOKnGQbNB66VzSNbK5iks=
-github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
-github.com/Shopify/sarama v1.21.0/go.mod h1:yuqtN/pe8cXRWG5zPaO7hCfNJp5MwmkoJEoLjkm5tCQ=
-github.com/Shopify/sarama v1.26.1/go.mod h1:NbSGBSSndYaIhRcBtY9V0U7AyH+x71bG668AuWys/yU=
-github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod h1:5Jv4cbFiHJMsVxt52+i0Ha45fjshj6wxYr1r19tB9bw=
-github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
-github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY=
-github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk=
-github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
-github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM=
-github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.0/go.mod h1:zpDJeKyp9ScW4NNrbdr+Eyxvry3ilGPewKoXw3XGN1k=
-github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod h1:uAXEEpARkRhCZfEvy/y0Jcc888f9tHCc1W7/UeEtreE=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190808125512-07798873deee/go.mod h1:myCDvQSzCW+wB1WAlocEru4wMGJxy+vlxHdhegi1CDQ=
-github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
-github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
-github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0=
-github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI=
-github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
-github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
-github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod h1:3AMJUQhVx52RsWOnlkpikZr01T/yAVN2gn0861vByNg=
-github.com/armon/go-metrics v0.3.8/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
-github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
-github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
-github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
-github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
-github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
-github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
-github.com/aws/aws-sdk-go v1.23.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.25.41/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.30.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
-github.com/aws/aws-sdk-go v1.42.34/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc=
-github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
-github.com/benbjohnson/immutable v0.4.0/go.mod h1:iAr8OjJGLnLmVUr9MZ/rz4PWUy6Ouc2JLYuMArmvAJM=
-github.com/benmathews/bench v0.0.0-20210120214102-f7c75b9ef6e7/go.mod h1:peX7BEhSFSvvnxdido50pUMhlFi24dVgtTU1oZkHTUU=
-github.com/benmathews/hdrhistogram-writer v0.0.0-20180430173243-73b8d31ba571/go.mod h1:W24iTD3jetRjSLj2yz0IBNF6wKdbRUvBMG5oaw4ZbzM=
-github.com/benmathews/hdrhistogram-writer v0.0.0-20210120211942-3cb1c7c33f95/go.mod h1:2MBckC8FahPaeLz58Qe6ZyVKm8UU1gHkINEv9Sw7pnI=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
-github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
-github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
-github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/caddyserver/caddy v1.0.4/go.mod h1:uruyfVsyMcDb3IOzSKsi1x0wOjy1my/PxOSTcD+24jM=
-github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
-github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
-github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
-github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/cloudflare-go v0.10.2/go.mod h1:qhVI5MKwBGhdNU89ZRz2plgYutcJ5PCekLxXn56w6SY=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed h1:OZmjad4L3H8ncOIR8rnb5MREYqG8ixi5+WbeUsquF0c=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 h1:58f1tJ1ra+zFINPlwLWvQsR9CzAKt2e+EWV2yX9oXQ4=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
-github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
-github.com/coredns/coredns v1.6.6/go.mod h1:Bdcnka9HmKGYj12ZIDF3lpQSfDHSsMc85Wj9xEyZUts=
-github.com/coredns/federation v0.0.0-20190818181423-e032b096babe/go.mod h1:MoqTEFX8GlnKkyq8eBCF94VzkNAOgjdlCJ+Pz/oCLPk=
-github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
-github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/etcd v3.3.27+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
-github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
-github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/go-systemd v0.0.0-20190212144455-93d5ec2c7f76/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/coreos/pkg v0.0.0-20220810130054-c7d1c02cb6cf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/cpu/goacmedns v0.0.1/go.mod h1:sesf/pNnCYwUevQEQfEwY0Y3DydlQWSGZbaMElOWxok=
-github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/decker502/dnspod-go v0.2.0/go.mod h1:qsurYu1FgxcDwfSwXJdLt4kRsBLZeosEb9uq4Sy+08g=
-github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
-github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/digitalocean/godo v1.7.5/go.mod h1:h6faOIcZ8lWIwNQ+DN7b3CgX4Kwby5T+nbpNqkUIozU=
-github.com/digitalocean/godo v1.10.0/go.mod h1:h6faOIcZ8lWIwNQ+DN7b3CgX4Kwby5T+nbpNqkUIozU=
-github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
-github.com/dnaeon/go-vcr v0.0.0-20180814043457-aafff18a5cc2/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
-github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
-github.com/dnsimple/dnsimple-go v0.30.0/go.mod h1:O5TJ0/U6r7AfT8niYNlmohpLbCSG+c71tQlGr9SeGrg=
-github.com/dnstap/golang-dnstap v0.0.0-20170829151710-2cf77a2b5e11/go.mod h1:s1PfVYYVmTMgCSPtho4LKBDecEHJWtiVDPNv78Z985U=
-github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
-github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
-github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
-github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
-github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
-github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
-github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34=
-github.com/envoyproxy/go-control-plane v0.11.0 h1:jtLewhRR2vMRNnq2ZZUoCjUlgut+Y0+sDDWPOfwOi1o=
-github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI=
+github.com/envoyproxy/go-control-plane v0.9.9 h1:vQLjymTobffN2R0F8eTqw6q7iozfRO5Z0m+/4Vw+/uA=
+github.com/envoyproxy/go-control-plane v0.9.9/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
+github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo=
-github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w=
-github.com/envoyproxy/protoc-gen-validate v0.10.0 h1:oIfnZFdC0YhpNNEX+SuIqko4cqqVZeN9IGTrhZje83Y=
-github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
-github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
-github.com/exoscale/egoscale v0.18.1/go.mod h1:Z7OOdzzTOz1Q1PjQXumlz9Wn/CddH0zSYdCF3rnBKXE=
-github.com/farsightsec/golang-framestream v0.0.0-20181102145529-8a0cb8ba8710/go.mod h1:eNde4IQyEiA5br02AouhEHCu3p3UzrCdFR4LuQHklMI=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
-github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
-github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
-github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
-github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
-github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
-github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
-github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
-github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
-github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-github.com/go-acme/lego/v3 v3.1.0/go.mod h1:074uqt+JS6plx+c9Xaiz6+L+GBb+7itGtzfcDM2AhEE=
-github.com/go-acme/lego/v3 v3.2.0/go.mod h1:074uqt+JS6plx+c9Xaiz6+L+GBb+7itGtzfcDM2AhEE=
-github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-cmd/cmd v1.0.5/go.mod h1:y8q8qlK5wQibcw63djSl/ntiHUHXHGdCkPk0j4QeW4s=
-github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
-github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
-github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
-github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
-github.com/go-fonts/liberation v0.2.0/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
-github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-ini/ini v1.44.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
-github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U=
-github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk=
-github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
-github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
-github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
-github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
-github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
-github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
-github.com/go-openapi/analysis v0.19.4/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
-github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU=
-github.com/go-openapi/analysis v0.19.10/go.mod h1:qmhS3VNFxBlquFJ0RGoDtylO9y4pgTAUNE9AEEMdlJQ=
-github.com/go-openapi/analysis v0.19.16/go.mod h1:GLInF007N83Ad3m8a/CbQ5TPzdnGT7workfHwuVjNVk=
-github.com/go-openapi/analysis v0.20.0/go.mod h1:BMchjvaHDykmRMsK40iPtvyOfFdMMxlOmQr9FBZk+Og=
-github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY=
-github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
-github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
-github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
-github.com/go-openapi/errors v0.19.3/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
-github.com/go-openapi/errors v0.19.6/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/errors v0.19.7/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/errors v0.20.1/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
-github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
-github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
-github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
-github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
-github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
-github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
-github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
-github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
-github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
-github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
-github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
-github.com/go-openapi/loads v0.19.3/go.mod h1:YVfqhUCdahYwR3f3iiwQLhicVRvLlU/WO5WPaZvcvSI=
-github.com/go-openapi/loads v0.19.5/go.mod h1:dswLCAdonkRufe/gSUC3gN8nTSaB9uaS2es0x5/IbjY=
-github.com/go-openapi/loads v0.19.6/go.mod h1:brCsvE6j8mnbmGBh103PT/QLHfbyDxA4hsKvYBNEGVc=
-github.com/go-openapi/loads v0.19.7/go.mod h1:brCsvE6j8mnbmGBh103PT/QLHfbyDxA4hsKvYBNEGVc=
-github.com/go-openapi/loads v0.20.0/go.mod h1:2LhKquiE513rN5xC6Aan6lYOSddlL8Mp20AW9kpviM4=
-github.com/go-openapi/loads v0.20.2/go.mod h1:hTVUotJ+UonAMMZsvakEgmWKgtulweO9vYP2bQYKA/o=
-github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g=
-github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
-github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
-github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4=
-github.com/go-openapi/runtime v0.19.15/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo=
-github.com/go-openapi/runtime v0.19.16/go.mod h1:5P9104EJgYcizotuXhEuUrzVc+j1RiSjahULvYmlv98=
-github.com/go-openapi/runtime v0.19.24/go.mod h1:Lm9YGCeecBnUUkFTxPC4s1+lwrkJ0pthx8YvyjCfkgk=
-github.com/go-openapi/runtime v0.24.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk=
-github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
-github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
-github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
-github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
-github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
-github.com/go-openapi/spec v0.19.6/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
-github.com/go-openapi/spec v0.19.8/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
-github.com/go-openapi/spec v0.19.15/go.mod h1:+81FIL1JwC5P3/Iuuozq3pPE9dXdIEGxFutcFKaVbmU=
-github.com/go-openapi/spec v0.20.0/go.mod h1:+81FIL1JwC5P3/Iuuozq3pPE9dXdIEGxFutcFKaVbmU=
-github.com/go-openapi/spec v0.20.1/go.mod h1:93x7oh+d+FQsmsieroS4cmR3u0p/ywH649a3qwC9OsQ=
-github.com/go-openapi/spec v0.20.3/go.mod h1:gG4F8wdEDN+YPBMVnzE85Rbhf+Th2DTvA9nFPQ5AYEg=
-github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I=
-github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
-github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
-github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
-github.com/go-openapi/strfmt v0.19.2/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
-github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
-github.com/go-openapi/strfmt v0.19.4/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk=
-github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk=
-github.com/go-openapi/strfmt v0.19.11/go.mod h1:UukAYgTaQfqJuAFlNxxMWNvMYiwiXtLsF2VwmoFtbtc=
-github.com/go-openapi/strfmt v0.20.0/go.mod h1:UukAYgTaQfqJuAFlNxxMWNvMYiwiXtLsF2VwmoFtbtc=
-github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg=
-github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k=
-github.com/go-openapi/strfmt v0.21.2/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k=
-github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg=
-github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
-github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
-github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
-github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.7/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY=
-github.com/go-openapi/swag v0.19.9/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY=
-github.com/go-openapi/swag v0.19.12/go.mod h1:eFdyEBkTdoAf/9RXBvj4cr1nH7GD8Kzo5HTt47gr72M=
-github.com/go-openapi/swag v0.19.13/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
-github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
-github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo=
-github.com/go-openapi/validate v0.19.10/go.mod h1:RKEZTUWDkxKQxN2jDT7ZnZi2bhZlbNMAuKvKB+IaGx8=
-github.com/go-openapi/validate v0.19.12/go.mod h1:Rzou8hA/CBw8donlS6WNEUQupNvUZ0waH08tGe6kAQ4=
-github.com/go-openapi/validate v0.19.15/go.mod h1:tbn/fdOwYHgrhPBzidZfJC2MIVvs9GA7monOmWBbeCI=
-github.com/go-openapi/validate v0.20.1/go.mod h1:b60iJT+xNNLfaQJUqLI7946tYiFEOuE9E4k54HpKcJ0=
-github.com/go-openapi/validate v0.20.2/go.mod h1:e7OJoKNgd0twXZwIn0A43tHbvIcr/rZIVCbJBpTUoY0=
-github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg=
-github.com/go-ozzo/ozzo-validation v3.6.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU=
-github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
-github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
-github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
-github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
-github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
-github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
-github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
-github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
-github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28=
-github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo=
-github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk=
-github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
-github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
-github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg=
-github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE=
-github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
-github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
-github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
-github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
-github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/gocql/gocql v0.0.0-20200228163523-cd4b606dd2fb/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY=
-github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
-github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
-github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
-github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
@@ -1048,1393 +38,119 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
-github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
-github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
-github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod h1:DavVbd41y+b7ukKDmlnPR4nGYmkWXR6vHUkjQNiHPBs=
-github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
-github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
-github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
-github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
-github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
-github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
-github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
-github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
-github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo=
-github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY=
-github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
-github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
-github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
-github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4=
-github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
-github.com/gophercloud/gophercloud v0.3.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
-github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
-github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
-github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
-github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw=
-github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
-github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
-github.com/hashicorp/consul v1.15.2 h1:asG6/ZyA1Z5dw0SuhZ5sh/SG9605NI/L/PNJtCnl93M=
-github.com/hashicorp/consul v1.15.2/go.mod h1:1pu3llMOz2pwT+KU3Hxqycm//67l9znFCxyhe2ufRHo=
-github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706/go.mod h1:1Cs8FlmD1BfSQXJGcFLSV5FuIx1AbJP+EJGdxosoS2g=
-github.com/hashicorp/consul-net-rpc v0.0.0-20221205195236-156cfab66a69/go.mod h1:svUZZDvotY8zTODknUePc6mZ9pX8nN0ViGwWcUSOBEA=
-github.com/hashicorp/consul/api v1.20.0/go.mod h1:nR64eD44KQ59Of/ECwt2vUmIK2DKsDzAwTmwmLl8Wpo=
-github.com/hashicorp/consul/envoyextensions v0.1.2/go.mod h1:N94DQQkgITiA40zuTQ/UdPOLAAWobgHfVT5u7wxE/aU=
-github.com/hashicorp/consul/proto-public v0.2.1/go.mod h1:iWNlBDJIZQJC3bBiCThoqg9i7uk/4RQZYkqH1wiQrss=
-github.com/hashicorp/consul/sdk v0.13.1 h1:EygWVWWMczTzXGpO93awkHFzfUka6hLYJ0qhETd+6lY=
-github.com/hashicorp/consul/sdk v0.13.1/go.mod h1:SW/mM4LbKfqmMvcFu8v+eiQQ7oitXEFeiBe9StxERb0=
-github.com/hashicorp/consul/troubleshoot v0.1.2/go.mod h1:q35QOtN7K5kFLPm2SXHBDD+PzsuBekcqTZuuoOTzbWA=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-bexpr v0.1.2/go.mod h1:ANbpTX1oAql27TZkKVeW8p1w8NTdnyzPe/0qqPCKohU=
-github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-connlimit v0.3.0/go.mod h1:OUj9FGL1tPIhl/2RCfzYHrIiWj+VVPGNyVPnUX8AqS0=
-github.com/hashicorp/go-discover v0.0.0-20220714221025-1c234a67149a/go.mod h1:1xfdKvc3pe5WKxfUUHHOGaKMk7NLGhHY1jkyhKo6098=
-github.com/hashicorp/go-hclog v0.9.1/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
-github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
-github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs=
 github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v1.2.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
-github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
-github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0/go.mod h1:xvb32K2keAc+R8DSFG2IwDcydK9DBQE+fGA5fsw6hSk=
-github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4=
-github.com/hashicorp/go-msgpack/v2 v2.0.0/go.mod h1:JIxYkkFJRDDRSoWQBSh7s9QAVThq+82iWmUpmE4jKak=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
-github.com/hashicorp/go-plugin v1.4.5/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
-github.com/hashicorp/go-raftchunking v0.7.0/go.mod h1:Dg/eBOaJzE0jYKNwNLs5IA5j0OSmL5HoCUiMy3mDmrI=
-github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
-github.com/hashicorp/go-retryablehttp v0.6.7/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
-github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6/go.mod h1:MpCPSPGLDILGb4JMm94/mMi3YysIqsXzGCzkEZjcjXg=
-github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
-github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
-github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
-github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
-github.com/hashicorp/go-secure-stdlib/password v0.1.1/go.mod h1:9hH302QllNwu1o2TGYtSk8I8kTAN0ca1EHpwhm5Mmzo=
-github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U=
-github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
-github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.1/go.mod h1:l8slYwnJA26yBz+ErHpp2IRCLr0vuOMGBORIz4rRiAs=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
-github.com/hashicorp/go-syslog v1.0.0 h1:KaodqZuhUoZereWVIYmpUgZysurB1kBLX2j0MwMrUAE=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
-github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
-github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/hcp-scada-provider v0.2.0/go.mod h1:Q0WpS2RyhBKOPD4X/8oW7AJe7jA2HXB09EwDzwRTao0=
-github.com/hashicorp/hcp-sdk-go v0.23.0/go.mod h1:/9UoDY2FYYA8lFaKBb2HmM/jKYZGANmf65q9QRc/cVw=
-github.com/hashicorp/hcp-sdk-go v0.23.1-0.20220921131124-49168300a7dc/go.mod h1:/9UoDY2FYYA8lFaKBb2HmM/jKYZGANmf65q9QRc/cVw=
-github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038/go.mod h1:n2TSygSNwsLJ76m8qFXTSc7beTb+auJxYdqrnoqwZWE=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY=
-github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
-github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
-github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0/go.mod h1:6pdNz0vo0mF0GvhwDG56O3N18qBrAz/XRIcfINfTbwo=
-github.com/hashicorp/raft v1.1.0/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM=
-github.com/hashicorp/raft v1.2.0/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8=
-github.com/hashicorp/raft v1.3.11/go.mod h1:J8naEwc6XaaCfts7+28whSeRvCqTd6e20BlCU3LtEO4=
-github.com/hashicorp/raft v1.4.0/go.mod h1:nz64BIjXphDLATfKGG5RzHtNUPioLeKFsXEm88yTVew=
-github.com/hashicorp/raft-autopilot v0.1.6/go.mod h1:Af4jZBwaNOI+tXfIqIdbcAnh/UyyqIMj/pOISIfhArw=
-github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod h1:pNv7Wc3ycL6F5oOWn+tPGo2gWD4a5X+yp/ntwdKLjRk=
-github.com/hashicorp/raft-boltdb v0.0.0-20210409134258-03c10cc3d4ea/go.mod h1:qRd6nFJYYS6Iqnc/8HcUmko2/2Gw8qTFEmxDLii6W5I=
-github.com/hashicorp/raft-boltdb v0.0.0-20220329195025-15018e9b97e0/go.mod h1:nTakvJ4XYq45UXtn0DbwR4aU9ZdjlnIenpbs6Cd+FM0=
-github.com/hashicorp/raft-boltdb/v2 v2.2.2/go.mod h1:N8YgaZgNJLpZC+h+by7vDu5rzsRgONThTEeUS3zWbfY=
-github.com/hashicorp/raft-wal v0.3.0/go.mod h1:A6vP5o8hGOs1LHfC1Okh9xPwWDcmb6Vvuz/QyqUXlOE=
-github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
-github.com/hashicorp/vault/api v1.8.0/go.mod h1:uJrw6D3y9Rv7hhmS17JQC50jbPDAZdjZoTtrCCxxs7E=
-github.com/hashicorp/vault/api v1.8.2/go.mod h1:ML8aYzBIhY5m1MD1B2Q0JV89cC85YVH4t5kBaZiyVaE=
-github.com/hashicorp/vault/api/auth/gcp v0.3.0/go.mod h1:gnNBFOASYUaFunedTHOzdir7vKcHL3skWBUzEn263bo=
-github.com/hashicorp/vault/sdk v0.6.0/go.mod h1:+DRpzoXIdMvKc88R4qxr+edwy/RvH5QK8itmxLiDHLc=
-github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod h1:bEpDU35nTu0ey1EXjwNwPjI9xErAsoOCmcMb9GKvyxo=
-github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
-github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
-github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df/go.mod h1:QMZY7/J/KSQEhKWFeDesPjMj+wCHReeknARU3wqlyN4=
-github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/infobloxopen/go-trees v0.0.0-20190313150506-2af4e13f9062/go.mod h1:PcNJqIlcX/dj3DTG/+QQnRvSgTMG6CLpRMjWcv4+J6w=
-github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
-github.com/jackc/pgx v3.3.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
-github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4=
-github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
-github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
-github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod h1:U+RSyWxWd04xTqnuOQxnai7XGS2PrPY2cfGoDKtMHjA=
-github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod h1:KDSfL7qe5ZfQqvlDMkVjCztbmcpp/c8M77vhQP8ZPvk=
-github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
-github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
-github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
-github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
-github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
-github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
-github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
-github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.9.8/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
-github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/kolo/xmlrpc v0.0.0-20190717152603-07c4ee3fd181/go.mod h1:o03bZfuBwAXHetKXuInt4S7omeXUu62/A845kiycsSQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
-github.com/labbsr0x/bindman-dns-webhook v1.0.2/go.mod h1:p6b+VCXIR8NYKpDr8/dg1HKfQoRHCdcsROXKvmoehKA=
-github.com/labbsr0x/goh v1.0.1/go.mod h1:8K2UhVoaWXcCU7Lxoa2omWnC8gyW8px7/lmO61c027w=
-github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/linode/linodego v0.7.1/go.mod h1:ga11n3ivecUrPCHN0rANxKmfWBJVkOXfLMZinAbj2sY=
-github.com/linode/linodego v0.10.0/go.mod h1:cziNP7pbvE3mXIPneHj0oRY8L1WtGEIKlZ8LANE4eXA=
-github.com/liquidweb/liquidweb-go v1.6.0/go.mod h1:UDcVnAMDkZxpw4Y7NOHkqoeiGacVLEIG/i5J9cyixzQ=
-github.com/lucas-clemente/quic-go v0.13.1/go.mod h1:Vn3/Fb0/77b02SGhQk36KzOUmXgVpFfizUfW5WMaqyU=
-github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
-github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
-github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
-github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
-github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
-github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
-github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
-github.com/marten-seemann/chacha20 v0.2.0/go.mod h1:HSdjFau7GzYRj+ahFNwsO3ouVJr1HFkWoEwNDb4TMtE=
-github.com/marten-seemann/qpack v0.1.0/go.mod h1:LFt1NU/Ptjip0C2CPkhimBz5CGE3WGDAUWqna+CNTrI=
-github.com/marten-seemann/qtls v0.4.1/go.mod h1:pxVXcHHw1pNIt8Qo0pwSYQEoZ8yYOOPXTCZLQQunvRc=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10=
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/mholt/certmagic v0.8.3/go.mod h1:91uJzK5K8IWtYQqTi5R2tsxV1pCde+wdGfaRaOZi6aQ=
-github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.25/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
-github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
-github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
-github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
-github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
-github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
-github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/go-testing-interface v1.14.0/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
-github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed/go.mod h1:3rdaFaCv4AyBgu5ALFM0+tSuHrBh6v692nyQe3ikrq0=
-github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
-github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ=
-github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.4.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/pointerstructure v1.2.1/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4=
-github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
-github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04/go.mod h1:5sN+Lt1CaY4wsPvgQH/jsuJi4XO2ssZbdsIizr4CVC8=
-github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
-github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
-github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
-github.com/nats-io/jwt v1.1.0/go.mod h1:n3cvmLfBfnpV4JJRN7lRYCyZnw48ksGsbThGXEk4w9M=
-github.com/nats-io/nats-server/v2 v2.1.9/go.mod h1:9qVyoewoYXzG1ME9ox0HwkkzyYvnlBDugfR4Gg/8uHU=
-github.com/nats-io/nats-streaming-server v0.20.0/go.mod h1:yJjUp4TmfYqllCtctAQ6Kz6ZRy5kaLgqHvuU1TGSrCw=
-github.com/nats-io/nats.go v1.10.0/go.mod h1:AjGArbfyR50+afOUotNX2Xs5SYHf+CoOa5HH1eEl2HE=
-github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
-github.com/nats-io/nkeys v0.1.4/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s=
-github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
-github.com/nats-io/stan.go v0.8.1/go.mod h1:Ci6mUIpGQTjl++MqK2XzkWI/0vF+Bl72uScx7ejSYmU=
-github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
-github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod h1:TLb2Sg7HQcgGdloNxkrmtgDNR9uVYF3lfdFIN4Ro6Sk=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/nrdcg/auroradns v1.0.0/go.mod h1:6JPXKzIRzZzMqtTDgueIhTi6rFf1QvYE/HzqidhOhjw=
-github.com/nrdcg/goinwx v0.6.1/go.mod h1:XPiut7enlbEdntAqalBIqcYcTEVhpv/dKWgDCX2SwKQ=
-github.com/nrdcg/namesilo v0.2.1/go.mod h1:lwMvfQTyYq+BbjJd30ylEG4GPSS6PII0Tia4rRpRiyw=
-github.com/nsqio/go-nsq v1.0.8/go.mod h1:vKq36oyeVXgsS5Q8YEO7WghqidAVXQlcFxzQbQTuDEY=
-github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
-github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
-github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
-github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
-github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
-github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
-github.com/openzipkin-contrib/zipkin-go-opentracing v0.3.5/go.mod h1:uVHyebswE1cCXr2A73cRM2frx5ld1RJUCJkFNZ90ZiI=
-github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
-github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
-github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ=
-github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod h1:otzZQXgoO96RTzDB/Hycg0qZcXZsWJGJRSXbmEIJ+4M=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
-github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
-github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
-github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
-github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY=
-github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
-github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
-github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
-github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
-github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
-github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
-github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
-github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
-github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
-github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
-github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
-github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
-github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
-github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod h1:7tZKcyumwBO6qip7RNQ5r77yrssm9bfCowcLEBcU5IA=
-github.com/rboyer/safeio v0.2.1/go.mod h1:Cq/cEPK+YXFn622lsQ0K4KsPZSPtaptHHEldsy7Fmig=
-github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod h1:gRAiPF5C5Nd0eyyRdqIu9qTiFSoZzpTq727b5B8fkkU=
-github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/rs/zerolog v1.4.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
-github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
-github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/ryanuber/columnize v2.1.2+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
-github.com/sacloud/libsacloud v1.26.1/go.mod h1:79ZwATmHLIFZIMd7sxA3LwzVy/B77uj3LDoToVTxDoQ=
-github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod h1:7zjs06qF79/FKAJpBvFx3P8Ww4UTIMAe+lpNXDHziac=
-github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod h1:BeybITEsBEg6qbIiqJ6/Bqeq25bCLbL7YFmpaFfJDuM=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY=
-github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shirou/gopsutil/v3 v3.22.8/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
-github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod h1:Cw4GTlQccdRGSEf6KiMju767x0NEHE0YIVPJSaXjlsw=
-github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-github.com/spf13/afero v1.2.1/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
-github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
-github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
-github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
-github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
-github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
-github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
-github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
-github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tencentcloud/tencentcloud-sdk-go v1.0.162/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
-github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7/go.mod h1:imsgLplxEC/etjIhdr3dNzV3JeT27LbVu5pYWm0JCBY=
-github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
-github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
-github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
-github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/transip/gotransip v0.0.0-20190812104329-6d8d9179b66f/go.mod h1:i0f4R4o2HM0m3DZYQWsj6/MEowD57VzoH0v3d7igeFY=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
-github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
-github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
-github.com/vmware/govmomi v0.18.0/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
-github.com/vultr/govultr v0.1.4/go.mod h1:9H008Uxr/C4vFNGLqKx232C206GL0PBHzOP0809bGNA=
-github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
-github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
-github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
-github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
-github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
-github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
-github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
-github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
-github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
-github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
-go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
-go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
-go.etcd.io/etcd v0.5.0-alpha.5.0.20190917205325-a14579fbfb1a/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
-go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.3.0/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE=
-go.mongodb.org/mongo-driver v1.3.4/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE=
-go.mongodb.org/mongo-driver v1.4.3/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc=
-go.mongodb.org/mongo-driver v1.4.4/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc=
-go.mongodb.org/mongo-driver v1.4.6/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc=
-go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg=
-go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=
-go.mongodb.org/mongo-driver v1.8.3/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY=
-go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8=
-go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
-go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
-go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
-go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y=
-go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
-golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20220518171630-0b5c67f07fdf/go.mod h1:yh0Ynu2b5ZUe3MQfp2nM0ecK7wsgouWTDN0FNeJuIys=
-golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
-golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180611182652-db08ff08e862/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190228165749-92fc7df08ae7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190930134127-c5a3c61f89f3/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
-golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
 golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
-golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
-golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
-golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
-golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
-golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
-golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
-golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180622082034-63fc586f45fe/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
-golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
-golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
-golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
 golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190624190245-7f2218787638/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
-golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
-gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
-gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0=
-gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA=
-gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY=
-gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
-gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
-gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY=
-gonum.org/v1/plot v0.10.1/go.mod h1:VZW5OlhkL1mysU9vaqNHnsy86inf6Ot+jB3r+BczCEo=
-google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
-google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
-google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
-google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
-google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
-google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
-google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
-google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
-google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
-google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
-google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
-google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g=
-google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA=
-google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8=
-google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs=
-google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
-google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
-google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw=
-google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg=
-google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o=
-google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g=
-google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
-google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
-google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI=
-google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
-google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
-google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
-google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
-google.golang.org/api v0.102.0/go.mod h1:3VFl6/fzoA+qNuS1N1/VfXY4LjoXN/wzeIp7TweWwGo=
-google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0=
-google.golang.org/api v0.106.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
-google.golang.org/api v0.107.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
-google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
-google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI=
-google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0=
-google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190626174449-989357319d63/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
-google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
-google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
-google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
-google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE=
-google.golang.org/genproto v0.0.0-20220801145646-83ce21fca29f/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc=
-google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220829144015-23454907ede3/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220913154956-18f8339a66a5/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220914142337-ca0e39ece12f/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw=
-google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737/go.mod h1:2r/26NEF3bFmT3eC3aZreahSal0C3Shl8Gi6vyDYqOQ=
-google.golang.org/genproto v0.0.0-20220926165614-551eb538f295/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI=
-google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
-google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
-google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
-google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
-google.golang.org/genproto v0.0.0-20221109142239-94d6d90a7d66/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221114212237-e4508ebdbee1/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221117204609-8f9c96812029/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221201204527-e3fa12d562f3/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd/go.mod h1:cTsE614GARnxrLsqKREzmNYJACSWWpAWdNMwnD7c2BE=
-google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230112194545-e10362b5ecf9/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230123190316-2c411cf9d197/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230124163310-31e0e69b6fc2/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230125152338-dcaf20b6aeaa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230127162408-596548ed4efa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA=
-google.golang.org/genproto v0.0.0-20230222225845-10f96fb3dbec/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw=
-google.golang.org/genproto v0.0.0-20230223222841-637eb2293923/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw=
-google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA=
-google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
-google.golang.org/genproto v0.0.0-20230320184635-7606e756e683/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
-google.golang.org/genproto v0.0.0-20230323212658-478b75c54725/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
-google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
-google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
-google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
-google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.40.0 h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q=
 google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
-google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
-google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
-google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
-google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
-google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
-google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY=
-google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
-google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
-google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
-google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
-google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -2443,129 +159,11 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/DataDog/dd-trace-go.v1 v1.19.0/go.mod h1:DVp8HmDh8PuTu2Z0fVVlBsyWaC++fzwVCaGWylTe3tg=
-gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
-gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE=
-gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.44.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo=
-gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q=
-gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4=
-gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM=
-gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8=
-gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
-gopkg.in/ns1/ns1-go.v2 v2.0.0-20190730140822-b51389932cbc/go.mod h1:VV+3haRsgDiVLxyifmMBrBIuCWFBPYKbRssXB9z67Hw=
-gopkg.in/resty.v1 v1.9.1/go.mod h1:vo52Hzryw9PnPHcJfPsBiFW62XhNx5OczbV9y+IMpgc=
-gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
-gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
-gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3 h1:fvjTMHxHEw/mxHbtzPi3JCcKXQRAnQTBRo6YCJSVHKI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
-honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
-k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod h1:TBhBqb1AWbBQbW3XRusr7n7E4v2+5ZY8r8sAMnyFC5A=
-k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
-k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA=
-k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
-k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod h1:E95RaSlHr79aHaX0aGSwcPNfygDiPKOVXdmivCIZT0k=
-k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU=
-k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
-k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
-k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
-k8s.io/kube-openapi v0.0.0-20190306001800-15615b16d372/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
-k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
-k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
-k8s.io/utils v0.0.0-20190529001817-6999998975a7/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
-k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
-lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
-modernc.org/cc/v3 v3.36.2/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
-modernc.org/cc/v3 v3.36.3/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
-modernc.org/ccgo/v3 v3.0.0-20220428102840-41399a37e894/go.mod h1:eI31LL8EwEBKPpNpA4bU1/i+sKOwOrQy8D87zWUcRZc=
-modernc.org/ccgo/v3 v3.0.0-20220430103911-bc99d88307be/go.mod h1:bwdAnOoaIt8Ax9YdWGjxWsdkPcZyRPHqrOvJxaKAKGw=
-modernc.org/ccgo/v3 v3.16.4/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ=
-modernc.org/ccgo/v3 v3.16.6/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ=
-modernc.org/ccgo/v3 v3.16.8/go.mod h1:zNjwkizS+fIFDrDjIAgBSCLkWbJuHF+ar3QRn+Z9aws=
-modernc.org/ccgo/v3 v3.16.9/go.mod h1:zNMzC9A9xeNUepy6KuZBbugn3c0Mc9TeiJO4lgvkJDo=
-modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
-modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
-modernc.org/libc v0.0.0-20220428101251-2d5f3daf273b/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA=
-modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A=
-modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU=
-modernc.org/libc v1.16.17/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU=
-modernc.org/libc v1.16.19/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA=
-modernc.org/libc v1.17.0/go.mod h1:XsgLldpP4aWlPlsjqKRdHPqCxCjISdHfM/yeWC5GyW0=
-modernc.org/libc v1.17.1/go.mod h1:FZ23b+8LjxZs7XtFMbSzL/EhPxNbfZbErxEHc7cbD9s=
-modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.1.1/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
-modernc.org/memory v1.2.0/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
-modernc.org/memory v1.2.1/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
-modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.18.1/go.mod h1:6ho+Gow7oX5V+OiOQ6Tr4xeqbx13UZ6t+Fw9IRUG4d4=
-modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
-modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
-modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw=
-modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
-sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
-sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
diff --git a/test/integration/connect/envoy/test-sds-server/sds.go b/test/integration/connect/envoy/test-sds-server/sds.go
index 6223d894449d2..cf878805aadd1 100644
--- a/test/integration/connect/envoy/test-sds-server/sds.go
+++ b/test/integration/connect/envoy/test-sds-server/sds.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package main
 
 import (
@@ -19,7 +16,6 @@ import (
 	"github.com/envoyproxy/go-control-plane/pkg/cache/types"
 	cache "github.com/envoyproxy/go-control-plane/pkg/cache/v3"
 	xds "github.com/envoyproxy/go-control-plane/pkg/server/v3"
-	"github.com/hashicorp/consul/logging"
 	"github.com/hashicorp/go-hclog"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/grpclog"
@@ -68,7 +64,7 @@ func run(log hclog.Logger) error {
 
 	xdsServer := xds.NewServer(ctx, cache, callbacks)
 	grpcServer := grpc.NewServer()
-	grpclog.SetLoggerV2(logging.NewGRPCLogger("DEBUG", log))
+	grpclog.SetLogger(log.StandardLogger(nil))
 
 	secretservice.RegisterSecretDiscoveryServiceServer(grpcServer, xdsServer)
 
@@ -144,7 +140,7 @@ func makeLoggerCallbacks(log hclog.Logger) *xds.CallbackFuncs {
 			log.Trace("gRPC stream opened", "id", id, "addr", addr)
 			return nil
 		},
-		StreamClosedFunc: func(id int64, _ *core.Node) {
+		StreamClosedFunc: func(id int64) {
 			log.Trace("gRPC stream closed", "id", id)
 		},
 		StreamRequestFunc: func(id int64, req *discovery.DiscoveryRequest) error {
@@ -155,7 +151,7 @@ func makeLoggerCallbacks(log hclog.Logger) *xds.CallbackFuncs {
 			)
 			return nil
 		},
-		StreamResponseFunc: func(_ context.Context, id int64, req *discovery.DiscoveryRequest, resp *discovery.DiscoveryResponse) {
+		StreamResponseFunc: func(id int64, req *discovery.DiscoveryRequest, resp *discovery.DiscoveryResponse) {
 			log.Trace("gRPC stream response", "id", id,
 				"resp.typeURL", resp.TypeUrl,
 				"resp.version", resp.VersionInfo,
diff --git a/test/integration/connect/envoy/windows-troubleshooting.md b/test/integration/connect/envoy/windows-troubleshooting.md
deleted file mode 100644
index a3a83e088808a..0000000000000
--- a/test/integration/connect/envoy/windows-troubleshooting.md
+++ /dev/null
@@ -1,90 +0,0 @@
-# Envoy Integration Tests on Windows
-
-## Index
-
-- [About this Guide](#about-this-guide)
-- [Prerequisites](#prerequisites)
-- [Running the Tests](#running-the-tests)
-- [Troubleshooting](#troubleshooting)
-  - [About Envoy Integration Tests on Windows](#about-envoy-integration-tests-on-windows)
-  - [Common Errors](#common-errors)
-- [Windows Scripts Changes](#windows-scripts-changes)
-- [Volume Issues](#volume-issues)  
-
-## About this Guide
-
-On this guide you will find all the information required to run the Envoy integration tests on Windows.
-
-## Prerequisites
-
-To run the integration tests yo will need to have the following installed on your System:
-
-- GO v1.18(or later).
-- Gotestsum library [installation](https://pkg.go.dev/gotest.tools/gotestsum).
-- Docker.
-
-Before running the tests, you will need to build the required Docker images, to do so, you can use the script provided [here](../../../../build-support-windows/build-images.sh):
-
-- Build Images Script Execution
-  - From a Bash console (GitBash or WSL) execute: `./build-images.sh`
-
-## Running the Tests
-
-To execute the tests you need to run the following command depending on the shell you are using:  
-**On Powershell**:  
-`go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/<TEST CASE>" -win=true`  
-Where **TEST CASE** is the individual test case we want to execute (e.g. case-badauthz).  
-
-**On Git Bash**:  
-`ENVOY_VERSION=<ENVOY VERSION> go test -v -timeout=30m -tags integration ./test/integration/connect/envoy -run="TestEnvoy/<TEST CASE>" -win=true`  
-Where **TEST CASE** is the individual test case we want to execute (e.g. case-badauthz), and **ENVOY VERSION** is the version which you are currently testing.
-
-> [!TIP]
-> When executing the integration tests using **Powershell** you may need to set the ENVOY_VERSION value manually in line 20 of the [run-tests.windows.sh](run-tests.windows.sh) file.
-
-> [!WARNING]
-> When executing the integration tests for Windows environments, the **End of Line Sequence** of every related file and/or script will be changed from **LF** to **CRLF**.
-
-### About Envoy Integration Tests on Windows
-
-Integration tests on Linux run a multi-container architecture that take advantage of the Host Network Docker feature, using this feature means that the container's network stack is not isolated from the Docker host (the container shares the host’s networking namespace), and the container does not get its own IP-address allocated (read more about this [here](https://docs.docker.com/network/host/)). This feature is only available for Linux, which made migrating the tests to Windows challenging, since replicating the same architecture created more issues, that's why a **single container** architecture was chosen to run the Envoy integration tests.  
-Using a single container architecture meant that we could use the same tests as on linux, moreover we were able to speed-up their execution by replacing *docker run* commands which started utility containers, for *docker exec* commands.
-
-### Common errors
-
-If the tests are executed without docker running, the following error will be seen:
-
-```powershell
-error during connect: This error may indicate that the docker daemon is not running.: Post "http://%2F%2F.%2Fpipe%2Fdocker_engine/v1.24/build?buildargs=%7B%7D&cachefrom=%5B%5D&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=Dockerfile-bats-windows&labels=%7B%7D&memory=0&memswap=0&networkmode=default&rm=1&shmsize=0&t=bats-verify&target=&ulimits=null&version=1": open //./pipe/docker_engine: The system cannot find the file specified.
-```
-
-If any of the docker images does not exist or is mistagged, an error similar to the following will be displayed:
-
-```powershell
-Error response from daemon: No such container: envoy_workdir_1
-```
-
-If you run the Windows tests from WSL you will get the following error message:
-
-```bash
-main_test.go:34: command failed: exec: "cmd": executable file not found in $PATH
-```
-
-## Windows Scripts Changes
-
-- The  "http-addr", "grpc-addr" and "admin-access-log-path" flags were added to the creation of the Envoy Bootstrap files.
-- To execute commands sh was replaced by bash on our Windows container.
-- All paths were updated to use Windows format.
-- Created *stop_and_copy_files* function to copy files into the shared volume (see [volume issues](#volume-issues)).
-- Changed the *-admin-bind* value from `0.0.0.0` to `127.0.0.1` when generating the Envoy Bootstrap files.
-- Removed the *&&* from the *common_run_container_service's* docker exec command and replaced it with *\*.
-- Removed *docker_wget* and *docker_curl* functions from [helpers.windows.bash](helpers.windows.bash) file and replaced them with **docker_consul_exec**, this way we avoid starting intermediate containers when capturing logs.
-- The function *wipe_volumes* uses a `docker exec` command instead of the original `docker run`, this way we speed up test execution by avoiding to start a new container just to delete volume content before each test run.
-- For **case-grpc** we increased the `envoy_stats_flush_interval` value from 1s to 5s, on Windows, the original value caused the test to pass or fail randomly.
-- For **case-wanfed-gw** a new script was created: **global-setup-windows.sh**, this file replaces global-setup.sh when running this test in Windows. The new script uses the windows/consul:local Docker image to generate the required TLS files and copies them into host's workdir directory.
-- To use the **debug_dump_volumes** function, you need to use it via Powershell and execute the following command: `bash run-tests.windows.sh debug_dump_volumes` Make sure to be positioned with your terminal in the correct directory.
-- For **case-consul-exec** this case can only be run when using the consul-dev Docker image on this repository, since it relies on features implemented only here. These features are: Windows valid default value for "-admin-access-log-path" and `consul connect envoy` command starts Envoy. This features have also been submitted in [PR#15114](https://github.com/hashicorp/consul/pull/15114).  
-
-## Volume Issues
-
-Another difference that arose when migrating the tests from Linux to Windows, is that file system operations can't be executed while Windows containers are running. Currently, when running the tests a **named volume** is created and all of the required files are copied into that volume. Because of the constraint mentioned before, the workaround we implemented was creating a function (**stop_and_copy_files**) that stops the *kubernetes/pause* container and executes a script to copy the required files and finally starts the container again.
diff --git a/test/integration/consul-container/assets/Dockerfile-consul-dataplane b/test/integration/consul-container/assets/Dockerfile-consul-dataplane
deleted file mode 100644
index 7270f5f658aed..0000000000000
--- a/test/integration/consul-container/assets/Dockerfile-consul-dataplane
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-ARG CONSUL_DATAPLANE_IMAGE
-ARG CONSUL_IMAGE
-
-# Docker doesn't support expansion in COPY --copy, so we need to create an intermediate image.
-FROM ${CONSUL_IMAGE} as consul
-
-FROM ${CONSUL_DATAPLANE_IMAGE} as consuldataplane
-
-USER root
-
-# On Mac M1s when TProxy is enabled, consul-dataplane that are spawned from this image
-# (only used in consul-container integration tests) will terminate with the below error.
-# It is related to tproxy-startup.sh calling iptables SDK which then calls the underly
-# iptables. We are investigating how this works on M1s with consul-envoy images which
-# do not have this problem. For the time being tproxy tests on Mac M1s will fail locally
-# but pass in CI.
-#
-# Error setting up traffic redirection rules: failed to run command: /sbin/iptables -t nat -N CONSUL_PROXY_INBOUND, err: exit status 1, output: iptables: Failed to initialize nft: Protocol not supported
-RUN microdnf install -y iptables sudo nc \
- 	&& usermod -a -G wheel consul-dataplane \
- 	&& echo 'consul-dataplane ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-COPY --from=consul /bin/consul /bin/consul
-
-COPY tproxy-startup.sh /bin/tproxy-startup.sh
-RUN chmod +x /bin/tproxy-startup.sh && chown root:root /bin/tproxy-startup.sh
-
-USER 100
diff --git a/test/integration/consul-container/assets/Dockerfile-consul-envoy b/test/integration/consul-container/assets/Dockerfile-consul-envoy
deleted file mode 100644
index 5365ac7bb471d..0000000000000
--- a/test/integration/consul-container/assets/Dockerfile-consul-envoy
+++ /dev/null
@@ -1,21 +0,0 @@
-# Note these args have to be before the first FROM
-ARG CONSUL_IMAGE
-ARG ENVOY_VERSION
-
-FROM ${CONSUL_IMAGE} as consul
-
-FROM docker.mirror.hashicorp.services/envoyproxy/envoy:v${ENVOY_VERSION}
-
-# Install iptables and sudo, needed for tproxy.
-RUN apt update -y \
-	&& apt install -y iptables sudo curl dnsutils \
-	&& adduser envoy sudo \
-	&& echo 'envoy ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-COPY tproxy-startup.sh /bin/tproxy-startup.sh
-RUN chmod +x /bin/tproxy-startup.sh \
-	&& chown envoy:envoy /bin/tproxy-startup.sh
-
-COPY --from=consul /bin/consul /bin/consul
-
-USER envoy
diff --git a/test/integration/consul-container/assets/tproxy-startup.sh b/test/integration/consul-container/assets/tproxy-startup.sh
deleted file mode 100644
index 974d9368cbfdf..0000000000000
--- a/test/integration/consul-container/assets/tproxy-startup.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env sh
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-
-set -ex
-
-# HACK: UID of consul in the consul-client container
-# This is conveniently also the UID of apt in the envoy container
-CONSUL_UID=100
-ENVOY_UID=$(id -u)
-
-sudo consul connect redirect-traffic \
-    -proxy-uid $ENVOY_UID \
-    -exclude-uid $CONSUL_UID \
-    $REDIRECT_TRAFFIC_ARGS
-
-exec "$@"
diff --git a/test/integration/consul-container/go.mod b/test/integration/consul-container/go.mod
index 3bca51fc2193d..51275ecca6bc9 100644
--- a/test/integration/consul-container/go.mod
+++ b/test/integration/consul-container/go.mod
@@ -3,238 +3,88 @@ module github.com/hashicorp/consul/test/integration/consul-container
 go 1.20
 
 require (
-	fortio.org/fortio v1.54.0
 	github.com/avast/retry-go v3.0.0+incompatible
 	github.com/docker/docker v24.0.5+incompatible
 	github.com/docker/go-connections v0.4.0
-	github.com/evanphx/json-patch v4.12.0+incompatible
-	github.com/go-jose/go-jose/v3 v3.0.0
-	github.com/hashicorp/consul v1.16.1
-	github.com/hashicorp/consul/api v1.24.0
-	github.com/hashicorp/consul/envoyextensions v0.4.1
-	github.com/hashicorp/consul/proto-public v0.4.1
-	github.com/hashicorp/consul/sdk v0.14.1
-	github.com/hashicorp/consul/testing/deployer v0.0.0-20230811171106-4a0afb5d1373
+	github.com/hashicorp/consul/api v1.21.0
+	github.com/hashicorp/consul/envoyextensions v0.2.1
+	github.com/hashicorp/consul/sdk v0.13.1
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/hashicorp/go-uuid v1.0.3
+	github.com/hashicorp/go-uuid v1.0.2
 	github.com/hashicorp/go-version v1.2.1
-	github.com/hashicorp/hcl v1.0.0
 	github.com/hashicorp/serf v0.10.1
-	github.com/itchyny/gojq v0.12.12
+	github.com/itchyny/gojq v0.12.9
 	github.com/mitchellh/copystructure v1.2.0
-	github.com/mitchellh/mapstructure v1.5.0
 	github.com/otiai10/copy v1.10.0
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.8.4
 	github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569
 	github.com/testcontainers/testcontainers-go v0.22.0
 	golang.org/x/mod v0.12.0
-	google.golang.org/grpc v1.57.0
-	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
 )
 
 require (
-	cloud.google.com/go/compute v1.20.1 // indirect
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/iam v1.1.1 // indirect
 	dario.cat/mergo v1.0.0 // indirect
-	fortio.org/dflag v1.5.2 // indirect
-	fortio.org/log v1.3.0 // indirect
-	fortio.org/sets v1.0.2 // indirect
-	fortio.org/version v1.0.2 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
-	github.com/DataDog/datadog-go v4.8.2+incompatible // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/aliyun/alibaba-cloud-sdk-go v1.62.156 // indirect
-	github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/armon/go-radix v1.0.0 // indirect
-	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
-	github.com/aws/aws-sdk-go v1.44.289 // indirect
-	github.com/benbjohnson/immutable v0.4.0 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/boltdb/bolt v1.3.1 // indirect
-	github.com/cenkalti/backoff/v3 v3.0.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
-	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible // indirect
-	github.com/circonus-labs/circonusllhist v0.1.3 // indirect
 	github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
 	github.com/containerd/containerd v1.7.3 // indirect
-	github.com/coreos/etcd v3.3.27+incompatible // indirect
-	github.com/coreos/go-oidc v2.1.0+incompatible // indirect
-	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
-	github.com/coreos/pkg v0.0.0-20220810130054-c7d1c02cb6cf // indirect
 	github.com/cpuguy83/dockercfg v0.3.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/docker/distribution v2.8.2+incompatible // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
 	github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f // indirect
 	github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
 	github.com/fatih/color v1.14.1 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/analysis v0.21.4 // indirect
-	github.com/go-openapi/errors v0.20.3 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/loads v0.21.2 // indirect
-	github.com/go-openapi/runtime v0.25.0 // indirect
-	github.com/go-openapi/spec v0.20.8 // indirect
-	github.com/go-openapi/strfmt v0.21.3 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
-	github.com/go-openapi/validate v0.22.1 // indirect
-	github.com/go-ozzo/ozzo-validation v3.6.0+incompatible // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/btree v1.0.1 // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/s2a-go v0.1.4 // indirect
+	github.com/google/btree v1.0.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
-	github.com/googleapis/gax-go/v2 v2.11.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
-	github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706 // indirect
-	github.com/hashicorp/consul-net-rpc v0.0.0-20221205195236-156cfab66a69 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-bexpr v0.1.2 // indirect
-	github.com/hashicorp/go-connlimit v0.3.0 // indirect
-	github.com/hashicorp/go-hclog v1.5.0 // indirect
+	github.com/hashicorp/go-hclog v1.2.1 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/go-memdb v1.3.4 // indirect
 	github.com/hashicorp/go-msgpack v1.1.5 // indirect
-	github.com/hashicorp/go-msgpack/v2 v2.0.0 // indirect
-	github.com/hashicorp/go-plugin v1.4.5 // indirect
-	github.com/hashicorp/go-raftchunking v0.7.0 // indirect
-	github.com/hashicorp/go-retryablehttp v0.6.7 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
-	github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6 // indirect
-	github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 // indirect
-	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
-	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
 	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
-	github.com/hashicorp/go-syslog v1.0.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/hashicorp/hcp-scada-provider v0.2.3 // indirect
-	github.com/hashicorp/hcp-sdk-go v0.61.0 // indirect
-	github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038 // indirect
 	github.com/hashicorp/memberlist v0.5.0 // indirect
-	github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0 // indirect
-	github.com/hashicorp/raft v1.5.0 // indirect
-	github.com/hashicorp/raft-autopilot v0.1.6 // indirect
-	github.com/hashicorp/raft-boltdb/v2 v2.2.2 // indirect
-	github.com/hashicorp/raft-wal v0.3.0 // indirect
-	github.com/hashicorp/vault-plugin-auth-alicloud v0.14.0 // indirect
-	github.com/hashicorp/vault/api v1.8.3 // indirect
-	github.com/hashicorp/vault/api/auth/gcp v0.3.0 // indirect
-	github.com/hashicorp/vault/sdk v0.7.0 // indirect
-	github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
-	github.com/imdario/mergo v0.3.15 // indirect
-	github.com/itchyny/timefmt-go v0.1.5 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/itchyny/timefmt-go v0.1.4 // indirect
 	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/miekg/dns v1.1.50 // indirect
-	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
+	github.com/miekg/dns v1.1.41 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/go-testing-interface v1.14.0 // indirect
-	github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452 // indirect
-	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
-	github.com/mitchellh/pointerstructure v1.2.1 // indirect
+	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/patternmatcher v0.5.0 // indirect
 	github.com/moby/sys/sequential v0.5.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/oklog/run v1.0.0 // indirect
-	github.com/oklog/ulid v1.3.1 // indirect
-	github.com/oklog/ulid/v2 v2.1.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
 	github.com/opencontainers/runc v1.1.8 // indirect
-	github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
-	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
-	github.com/prometheus/client_golang v1.14.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.39.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
-	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
-	github.com/segmentio/fasthash v1.0.3 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
-	github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 // indirect
-	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
-	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	go.etcd.io/bbolt v1.3.7 // indirect
-	go.mongodb.org/mongo-driver v1.11.0 // indirect
-	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/otel v1.16.0 // indirect
-	go.opentelemetry.io/otel/metric v1.16.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.16.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
-	go.opentelemetry.io/otel/trace v1.16.0 // indirect
-	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	golang.org/x/crypto v0.12.0 // indirect
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
+	golang.org/x/exp v0.0.0-20230807204917-050eac23e9de // indirect
 	golang.org/x/net v0.14.0 // indirect
-	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
 	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/term v0.11.0 // indirect
-	golang.org/x/text v0.12.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
-	google.golang.org/api v0.126.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
+	golang.org/x/tools v0.12.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
+	google.golang.org/grpc v1.57.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.66.2 // indirect
-	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.26.2 // indirect
-	k8s.io/apimachinery v0.26.2 // indirect
-	k8s.io/client-go v0.26.2 // indirect
-	k8s.io/klog/v2 v2.90.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
-replace (
-	github.com/hashicorp/consul => ../../..
-	github.com/hashicorp/consul/api => ../../../api
-	github.com/hashicorp/consul/envoyextensions => ../../../envoyextensions
-	github.com/hashicorp/consul/proto-public => ../../../proto-public
-	github.com/hashicorp/consul/sdk => ../../../sdk
-	github.com/hashicorp/consul/testing/deployer => ../../../testing/deployer
-)
+replace github.com/hashicorp/consul/api => ../../../api
+
+replace github.com/hashicorp/consul/sdk => ../../../sdk
+
+replace github.com/hashicorp/consul => ../../..
+
+replace github.com/hashicorp/consul/envoyextensions => ../../../envoyextensions
diff --git a/test/integration/consul-container/go.sum b/test/integration/consul-container/go.sum
index eeb6f251dd036..086725506daf5 100644
--- a/test/integration/consul-container/go.sum
+++ b/test/integration/consul-container/go.sum
@@ -1,158 +1,43 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
-cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
-cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
-cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
-cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
-cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
-cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
-cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
-cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
-cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
-cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute v1.20.1 h1:6aKEtlUiwEpJzM001l0yFkpXmUVXaN8W+fbkb2AZNbg=
-cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
-cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
-cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y=
-cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-fortio.org/assert v1.1.4 h1:Za1RaG+OjsTMpQS3J3UCvTF6wc4+IOHCz+jAOU37Y4o=
-fortio.org/dflag v1.5.2 h1:F9XVRj4Qr2IbJP7BMj7XZc9wB0Q/RZ61Ool+4YPVad8=
-fortio.org/dflag v1.5.2/go.mod h1:ppb/A8u+KKg+qUUYZNYuvRnXuVb8IsdHb/XGzsmjkN8=
-fortio.org/fortio v1.54.0 h1:2jn8yTd6hcIEoKY4CjI0lI6XxTWVxsMYF2bMiWOmv+Y=
-fortio.org/fortio v1.54.0/go.mod h1:SRaZbikL31UoAkw0On2hwpvHrQ0rRVnsAz3UGVNvMRw=
-fortio.org/log v1.3.0 h1:bESPvuQGKejw7rrx41Sg3GoF+tsrB7oC08PxBs5/AM0=
-fortio.org/log v1.3.0/go.mod h1:u/8/2lyczXq52aT5Nw6reD+3cR6m/EbS2jBiIYhgiTU=
-fortio.org/sets v1.0.2 h1:gSWZFg9rgzl1zJfI/93lDJKBFw8WZ3Uxe3oQ5uDM4T4=
-fortio.org/sets v1.0.2/go.mod h1:xVjulHr0FhlmReSymI+AhDtQ4FgjiazQ3JmuNpYFMs8=
-fortio.org/version v1.0.2 h1:8NwxdX58aoeKx7T5xAPO0xlUu1Hpk42nRz5s6e6eKZ0=
-fortio.org/version v1.0.2/go.mod h1:2JQp9Ax+tm6QKiGuzR5nJY63kFeANcgrZ0osoQFDVm0=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/DataDog/datadog-go v4.8.2+incompatible h1:qbcKSx29aBLD+5QLvlQZlGmRMF/FfGqFLFev/1TDzRo=
-github.com/DataDog/datadog-go v4.8.2+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/Microsoft/hcsshim v0.10.0-rc.8 h1:YSZVvlIIDD1UxQpJp0h+dnpLUw+TrY0cx8obKsp3bek=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/aliyun/alibaba-cloud-sdk-go v1.62.156 h1:K4N91T1+RlSlx+t2dujeDviy4ehSGVjEltluDgmeHS4=
-github.com/aliyun/alibaba-cloud-sdk-go v1.62.156/go.mod h1:Api2AkmMgGaSUAhmk76oaFObkoeCPc/bKAqcyplPODs=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod h1:3AMJUQhVx52RsWOnlkpikZr01T/yAVN2gn0861vByNg=
-github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
 github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
-github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
-github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0=
 github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
-github.com/aws/aws-sdk-go v1.30.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.44.289 h1:5CVEjiHFvdiVlKPBzv0rjG4zH/21W/onT18R5AH/qx0=
-github.com/aws/aws-sdk-go v1.44.289/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
-github.com/benbjohnson/immutable v0.4.0 h1:CTqXbEerYso8YzVPxmWxh2gnoRQbbB9X1quUC8+vGZA=
-github.com/benbjohnson/immutable v0.4.0/go.mod h1:iAr8OjJGLnLmVUr9MZ/rz4PWUy6Ouc2JLYuMArmvAJM=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
-github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
-github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
-github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
 github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
-github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible h1:C29Ae4G5GtYyYMm1aztcyj/J5ckgJm2zwdDajFbx1NY=
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
-github.com/circonus-labs/circonusllhist v0.1.3 h1:TJH+oke8D16535+jHExHj4nQvzlZrj7ug5D7I/orNUA=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/containerd/containerd v1.7.3 h1:cKwYKkP1eTj54bP3wCdXXBymmKRQMrWjkLSWZZJDa8o=
 github.com/containerd/containerd v1.7.3/go.mod h1:32FOM4/O0RkNg7AjQj3hDzN9cUGtu+HMvaKUNiqCZB8=
-github.com/coreos/etcd v3.3.27+incompatible h1:QIudLb9KeBsE5zyYxd1mjzRSkzLg9Wf9QlRwFgd6oTA=
-github.com/coreos/etcd v3.3.27+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM=
-github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
-github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
-github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/pkg v0.0.0-20220810130054-c7d1c02cb6cf h1:GOPo6vn/vTN+3IwZBvXX0y5doJfSC7My0cdzelyOCsQ=
-github.com/coreos/pkg v0.0.0-20220810130054-c7d1c02cb6cf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/dockercfg v0.3.1 h1:/FpZ+JaygUR/lZP2NlFI2DVfrOEMAIKP5wWEJdoYe9E=
 github.com/cpuguy83/dockercfg v0.3.1/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
 github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -167,405 +52,104 @@ github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKoh
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
-github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f h1:7T++XKzy4xg7PKy+bM+Sa9/oe1OC88yz2hXQUISoXfA=
 github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f/go.mod h1:sfYdkwUW4BA3PbKjySwjJy+O4Pu0h62rlqCMHNk+K+Q=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v0.10.1 h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8=
 github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
-github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
-github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
 github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
-github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
-github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
-github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk=
-github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
-github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY=
-github.com/go-openapi/analysis v0.21.4 h1:ZDFLvSNxpDaomuCueM0BlSXxpANBlFYiBvr+GXrvIHc=
-github.com/go-openapi/analysis v0.21.4/go.mod h1:4zQ35W4neeZTqh3ol0rv/O8JBbka9QyAgQRPp9y3pfo=
-github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/errors v0.20.3 h1:rz6kiC84sqNQoqrtulzaL/VERgkoCyB6WdEkc2ujzUc=
-github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk=
-github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
-github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
-github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
-github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g=
-github.com/go-openapi/loads v0.21.2 h1:r2a/xFIYeZ4Qd2TnGpWDIQNcP80dIaZgf704za8enro=
-github.com/go-openapi/loads v0.21.2/go.mod h1:Jq58Os6SSGz0rzh62ptiu8Z31I+OTHqmULx5e/gJbNw=
-github.com/go-openapi/runtime v0.25.0 h1:7yQTCdRbWhX8vnIjdzU8S00tBYf7Sg71EBeorlPHvhc=
-github.com/go-openapi/runtime v0.25.0/go.mod h1:Ux6fikcHXyyob6LNWxtE96hWwjBPYF0DXgVFuMTneOs=
-github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I=
-github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
-github.com/go-openapi/spec v0.20.8 h1:ubHmXNY3FCIOinT8RNrrPfGc9t7I1qhPtdOGoG2AxRU=
-github.com/go-openapi/spec v0.20.8/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
-github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg=
-github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k=
-github.com/go-openapi/strfmt v0.21.3 h1:xwhj5X6CjXEZZHMWy1zKJxvW9AfHC9pkyUjLvHtKG7o=
-github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
-github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-openapi/validate v0.22.1 h1:G+c2ub6q47kfX1sOBLwIQwzBVt8qmOAARyo/9Fqs9NU=
-github.com/go-openapi/validate v0.22.1/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg=
-github.com/go-ozzo/ozzo-validation v3.6.0+incompatible h1:msy24VGS42fKO9K1vLz82/GeYW1cILu7Nuuj1N3BBkE=
-github.com/go-ozzo/ozzo-validation v3.6.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU=
-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
-github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
-github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
-github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
-github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
-github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
-github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
-github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28=
-github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo=
-github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk=
-github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
-github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
-github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg=
-github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE=
-github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
-github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
-github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
-github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
-github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
-github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
-github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
-github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
-github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
-github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2 h1:AtvtonGEH/fZK0XPNNBdB6swgy7Iudfx88wzyIpwqJ8=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
-github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4=
-github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 h1:lLT7ZLSzGLI08vc9cpd+tYmNWjdKDqyr/2L+f6U12Fk=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
-github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706 h1:1ZEjnveDe20yFa6lSkfdQZm5BR/b271n0MsB5R2L3us=
-github.com/hashicorp/consul-awsauth v0.0.0-20220713182709-05ac1c5c2706/go.mod h1:1Cs8FlmD1BfSQXJGcFLSV5FuIx1AbJP+EJGdxosoS2g=
-github.com/hashicorp/consul-net-rpc v0.0.0-20221205195236-156cfab66a69 h1:wzWurXrxfSyG1PHskIZlfuXlTSCj1Tsyatp9DtaasuY=
-github.com/hashicorp/consul-net-rpc v0.0.0-20221205195236-156cfab66a69/go.mod h1:svUZZDvotY8zTODknUePc6mZ9pX8nN0ViGwWcUSOBEA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-bexpr v0.1.2 h1:ijMXI4qERbzxbCnkxmfUtwMyjrrk3y+Vt0MxojNCbBs=
-github.com/hashicorp/go-bexpr v0.1.2/go.mod h1:ANbpTX1oAql27TZkKVeW8p1w8NTdnyzPe/0qqPCKohU=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-connlimit v0.3.0 h1:oAojHGjFxUTTTA8c5XXnDqWJ2HLuWbDiBPTpWvNzvqM=
-github.com/hashicorp/go-connlimit v0.3.0/go.mod h1:OUj9FGL1tPIhl/2RCfzYHrIiWj+VVPGNyVPnUX8AqS0=
-github.com/hashicorp/go-hclog v0.9.1/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
-github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
-github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
-github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-hclog v1.2.1 h1:YQsLlGDJgwhXFpucSPyVbCBviQtjlHv3jLTlp8YmtEw=
+github.com/hashicorp/go-hclog v1.2.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
 github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0/go.mod h1:xvb32K2keAc+R8DSFG2IwDcydK9DBQE+fGA5fsw6hSk=
-github.com/hashicorp/go-memdb v1.3.4 h1:XSL3NR682X/cVk2IeV0d70N4DZ9ljI885xAEU8IoK3c=
-github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-msgpack v1.1.5 h1:9byZdVjKTe5mce63pRVNP1L7UAmdHOTEMGehn6KvJWs=
 github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4=
-github.com/hashicorp/go-msgpack/v2 v2.0.0 h1:c1fiLq1LNghmLOry1ipGhvLDi+/zEoaEP2JrE1oFJ9s=
-github.com/hashicorp/go-msgpack/v2 v2.0.0/go.mod h1:JIxYkkFJRDDRSoWQBSh7s9QAVThq+82iWmUpmE4jKak=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
-github.com/hashicorp/go-plugin v1.4.5 h1:oTE/oQR4eghggRg8VY7PAz3dr++VwDNBGCcOfIvHpBo=
-github.com/hashicorp/go-plugin v1.4.5/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
-github.com/hashicorp/go-raftchunking v0.7.0 h1:APNMnCXmTOhumkFv/GpJIbq7HteWF7EnGZ3875lRN0Y=
-github.com/hashicorp/go-raftchunking v0.7.0/go.mod h1:Dg/eBOaJzE0jYKNwNLs5IA5j0OSmL5HoCUiMy3mDmrI=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
-github.com/hashicorp/go-retryablehttp v0.6.7 h1:8/CAEZt/+F7kR7GevNHulKkUjLht3CPmn7egmhieNKo=
-github.com/hashicorp/go-retryablehttp v0.6.7/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6 h1:W9WN8p6moV1fjKLkeqEgkAMu5rauy9QeYDAmIaPuuiA=
-github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6/go.mod h1:MpCPSPGLDILGb4JMm94/mMi3YysIqsXzGCzkEZjcjXg=
-github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
-github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 h1:cCRo8gK7oq6A2L6LICkUZ+/a5rLiRXFMf1Qd4xSwxTc=
-github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
-github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
-github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ=
-github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
-github.com/hashicorp/go-secure-stdlib/password v0.1.1/go.mod h1:9hH302QllNwu1o2TGYtSk8I8kTAN0ca1EHpwhm5Mmzo=
-github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U=
-github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
-github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
-github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.1/go.mod h1:l8slYwnJA26yBz+ErHpp2IRCLr0vuOMGBORIz4rRiAs=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
 github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
-github.com/hashicorp/go-syslog v1.0.0 h1:KaodqZuhUoZereWVIYmpUgZysurB1kBLX2j0MwMrUAE=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
-github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
 github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/hcp-scada-provider v0.2.3 h1:AarYR+/Pcv+cMvPdAlb92uOBmZfEH6ny4+DT+4NY2VQ=
-github.com/hashicorp/hcp-scada-provider v0.2.3/go.mod h1:ZFTgGwkzNv99PLQjTsulzaCplCzOTBh0IUQsPKzrQFo=
-github.com/hashicorp/hcp-sdk-go v0.61.0 h1:x4hJ8SlLI5WCE8Uzcu4q5jfdOEz/hFxfUkhAdoFdzSg=
-github.com/hashicorp/hcp-sdk-go v0.61.0/go.mod h1:xP7wmWAmdMxs/7+ovH3jZn+MCDhHRj50Rn+m7JIY3Ck=
-github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038 h1:n9J0rwVWXDpNd5iZnwY7w4WZyq53/rROeI7OVvLW8Ok=
-github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038/go.mod h1:n2TSygSNwsLJ76m8qFXTSc7beTb+auJxYdqrnoqwZWE=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
 github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM=
 github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
-github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0 h1:kBpVVl1sl3MaSrs97e0+pDQhSrqJv9gVbSUrPpVfl1w=
-github.com/hashicorp/net-rpc-msgpackrpc/v2 v2.0.0/go.mod h1:6pdNz0vo0mF0GvhwDG56O3N18qBrAz/XRIcfINfTbwo=
-github.com/hashicorp/raft v1.1.0/go.mod h1:4Ak7FSPnuvmb0GV6vgIAJ4vYT4bek9bb6Q+7HVbyzqM=
-github.com/hashicorp/raft v1.2.0/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8=
-github.com/hashicorp/raft v1.3.11/go.mod h1:J8naEwc6XaaCfts7+28whSeRvCqTd6e20BlCU3LtEO4=
-github.com/hashicorp/raft v1.5.0 h1:uNs9EfJ4FwiArZRxxfd/dQ5d33nV31/CdCHArH89hT8=
-github.com/hashicorp/raft v1.5.0/go.mod h1:pKHB2mf/Y25u3AHNSXVRv+yT+WAnmeTX0BwVppVQV+M=
-github.com/hashicorp/raft-autopilot v0.1.6 h1:C1q3RNF2FfXNZfHWbvVAu0QixaQK8K5pX4O5lh+9z4I=
-github.com/hashicorp/raft-autopilot v0.1.6/go.mod h1:Af4jZBwaNOI+tXfIqIdbcAnh/UyyqIMj/pOISIfhArw=
-github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod h1:pNv7Wc3ycL6F5oOWn+tPGo2gWD4a5X+yp/ntwdKLjRk=
-github.com/hashicorp/raft-boltdb v0.0.0-20210409134258-03c10cc3d4ea/go.mod h1:qRd6nFJYYS6Iqnc/8HcUmko2/2Gw8qTFEmxDLii6W5I=
-github.com/hashicorp/raft-boltdb v0.0.0-20220329195025-15018e9b97e0 h1:CO8dBMLH6dvE1jTn/30ZZw3iuPsNfajshWoJTnVc5cc=
-github.com/hashicorp/raft-boltdb/v2 v2.2.2 h1:rlkPtOllgIcKLxVT4nutqlTH2NRFn+tO1wwZk/4Dxqw=
-github.com/hashicorp/raft-boltdb/v2 v2.2.2/go.mod h1:N8YgaZgNJLpZC+h+by7vDu5rzsRgONThTEeUS3zWbfY=
-github.com/hashicorp/raft-wal v0.3.0 h1:Mi6RPoRbsxIIYZryI+bSTXHD97Ua6rIYO51ibYV9bkY=
-github.com/hashicorp/raft-wal v0.3.0/go.mod h1:A6vP5o8hGOs1LHfC1Okh9xPwWDcmb6Vvuz/QyqUXlOE=
 github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
 github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
-github.com/hashicorp/vault-plugin-auth-alicloud v0.14.0 h1:O6tNk0s/arubLUbLeCyaRs5xGo9VwmbQazISY/BfPK4=
-github.com/hashicorp/vault-plugin-auth-alicloud v0.14.0/go.mod h1:We3fJplmALwK1VpjwrLuXr/4QCQHYMdnXLHmLUU6Ntg=
-github.com/hashicorp/vault/api v1.8.0/go.mod h1:uJrw6D3y9Rv7hhmS17JQC50jbPDAZdjZoTtrCCxxs7E=
-github.com/hashicorp/vault/api v1.8.3 h1:cHQOLcMhBR+aVI0HzhPxO62w2+gJhIrKguQNONPzu6o=
-github.com/hashicorp/vault/api v1.8.3/go.mod h1:4g/9lj9lmuJQMtT6CmVMHC5FW1yENaVv+Nv4ZfG8fAg=
-github.com/hashicorp/vault/api/auth/gcp v0.3.0 h1:taum+3pCmOXnNgEKHlQbmgXmKw5daWHk7YJrLPP/w8g=
-github.com/hashicorp/vault/api/auth/gcp v0.3.0/go.mod h1:gnNBFOASYUaFunedTHOzdir7vKcHL3skWBUzEn263bo=
-github.com/hashicorp/vault/sdk v0.6.0/go.mod h1:+DRpzoXIdMvKc88R4qxr+edwy/RvH5QK8itmxLiDHLc=
-github.com/hashicorp/vault/sdk v0.7.0 h1:2pQRO40R1etpKkia5fb4kjrdYMx3BHklPxl1pxpxDHg=
-github.com/hashicorp/vault/sdk v0.7.0/go.mod h1:KyfArJkhooyba7gYCKSq8v66QdqJmnbAxtV/OX1+JTs=
-github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
-github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 h1:xixZ2bWeofWV68J+x6AzmKuVM/JWCQwkWm6GW/MUR6I=
-github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
-github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/itchyny/gojq v0.12.12 h1:x+xGI9BXqKoJQZkr95ibpe3cdrTbY8D9lonrK433rcA=
-github.com/itchyny/gojq v0.12.12/go.mod h1:j+3sVkjxwd7A7Z5jrbKibgOLn0ZfLWkV+Awxr/pyzJE=
-github.com/itchyny/timefmt-go v0.1.5 h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm6GE=
-github.com/itchyny/timefmt-go v0.1.5/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
-github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/itchyny/gojq v0.12.9 h1:biKpbKwMxVYhCU1d6mR7qMr3f0Hn9F5k5YykCVb3gmM=
+github.com/itchyny/gojq v0.12.9/go.mod h1:T4Ip7AETUXeGpD+436m+UEl3m3tokRgajd5pRfsR5oE=
+github.com/itchyny/timefmt-go v0.1.4 h1:hFEfWVdwsEi+CY8xY2FtgWHGQaBaC3JeHd+cve0ynVM=
+github.com/itchyny/timefmt-go v0.1.4/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
-github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
 github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
-github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -575,7 +159,6 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
@@ -583,39 +166,19 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
 github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
 github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
+github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
-github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
-github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
-github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
-github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/go-testing-interface v1.14.0 h1:/x0XQ6h+3U3nAyk1yx+bHPURrKa9sVVvYbuqZ7pIAtI=
-github.com/mitchellh/go-testing-interface v1.14.0/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
-github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452 h1:hOY53G+kBFhbYFpRVxHl5eS7laP6B1+Cq+Z9Dry1iMU=
-github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ=
-github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
-github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/pointerstructure v1.2.1 h1:ZhBBeX8tSlRpu/FFhXH4RC4OJzFlqsQhoHZAz4x7TIw=
-github.com/mitchellh/pointerstructure v1.2.1/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4=
-github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
+github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
@@ -625,49 +188,24 @@ github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWK
 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
 github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
-github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
-github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
-github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/oklog/ulid/v2 v2.1.0 h1:+9lhoxAP56we25tyYETBBY1YLA2SaoLvUFgrP2miPJU=
-github.com/oklog/ulid/v2 v2.1.0/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
-github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
-github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0-rc4 h1:oOxKUJWnFC4YGHCCMNql1x4YaDfYBTS5Y4x/Cgeo1E0=
 github.com/opencontainers/image-spec v1.1.0-rc4/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
 github.com/opencontainers/runc v1.1.8 h1:zICRlc+C1XzivLc3nzE+cbJV4LIi8tib6YG0MqC6OqA=
 github.com/opencontainers/runc v1.1.8/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b h1:FfH+VrHHk6Lxt9HdVS0PXzSXFyS2NbZKXv33FYPol0A=
-github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b/go.mod h1:AC62GU6hc0BrNm+9RK9VSiwa/EUe1bkIeFORAMcHvJU=
 github.com/otiai10/copy v1.10.0 h1:znyI7l134wNg/wDktoVQPxPkgvhDfGCYUasey+h0rDQ=
 github.com/otiai10/copy v1.10.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww=
 github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
-github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
-github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM=
-github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -677,652 +215,161 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 h1:J9b7z+QKAmPf4YLrFg6oQUotqHQeUNWwkvo7jZp1GLU=
-github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
-github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
-github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
-github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI=
-github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
-github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
-github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM=
-github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
-github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 h1:xzABM9let0HLLqFypcxvLmlvEciCHL7+Lv+4vwZqecI=
 github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569/go.mod h1:2Ly+NIftZN4de9zRmENdYbvPQeaVIYKWpLFStLFEBgI=
 github.com/testcontainers/testcontainers-go v0.22.0 h1:hOK4NzNu82VZcKEB1aP9LO1xYssVFMvlfeuDW9JMmV0=
 github.com/testcontainers/testcontainers-go v0.22.0/go.mod h1:k0YiPa26xJCRUbUkYqy5rY6NGvSbVCeUBXCvucscBR4=
-github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
-github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 h1:G3dpKMzFDjgEh2q1Z7zUUtKa8ViPtH+ocF0bE0g00O8=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
-github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
-github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
-github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
-github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
-github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
-github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
-github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
-github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
-github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
-github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
-github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
-github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
-go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
-go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
-go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg=
-go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=
-go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8=
-go.mongodb.org/mongo-driver v1.11.0 h1:FZKhBSTydeuffHj9CBjXlR8vQLee1cQyTWYPA6/tqiE=
-go.mongodb.org/mongo-driver v1.11.0/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
-go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s=
-go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4=
-go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo=
-go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4=
-go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE=
-go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4=
-go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI=
-go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI=
-go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs=
-go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw=
-go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
-go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
-go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0=
-go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
-go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
-golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/exp v0.0.0-20230807204917-050eac23e9de h1:l5Za6utMv/HsBWWqzt4S8X17j+kt1uVETUX5UFhn2rE=
+golang.org/x/exp v0.0.0-20230807204917-050eac23e9de/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
-golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
-golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
 golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
-golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=
-golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
-golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 h1:Vve/L0v7CXXuxUmaMGIEK/dEeq7uiqb5qBgQrZzIE7E=
-golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
+golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
+golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
-google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
-google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
-google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
-google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
-google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
-google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
-google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
-google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
-google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o=
-google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
-google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
-google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
-google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e h1:xIXmWJ303kJCuogpj0bHq+dcjcZHU+XFyc1I0Yl9cRg=
-google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:0ggbjUrZYpy1q+ANUS30SEoGZ53cdfwtbuG7Ptgy108=
-google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 h1:XVeBY8d/FaK4848myy41HBqnDwvxeV3zMZhwN1TvAMU=
-google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:mPBs5jNgx2GuQGvFwUvVKqtn6HsUw9nP64BedgvqEsQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 h1:eSaPbMR4T7WfH9FvABk36NBMacoTUKdWCvV0dx+KfOg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I=
-google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e h1:z3vDksarJxsAKM5dmEGv0GHwE2hKJ096wZra71Vs4sw=
+google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 h1:wukfNtZmZUurLN/atp2hiIeTKn7QJWIQdHzqmsOnAOk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
-google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
 google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw=
 google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
-google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI=
-gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w=
-gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.26.2 h1:dM3cinp3PGB6asOySalOZxEG4CZ0IAdJsrYZXE/ovGQ=
-k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU=
-k8s.io/apimachinery v0.26.2 h1:da1u3D5wfR5u2RpLhE/ZtZS2P7QvDgLZTi9wrNZl/tQ=
-k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
-k8s.io/client-go v0.26.2 h1:s1WkVujHX3kTp4Zn4yGNFK+dlDXy1bAAkIl+cFAiuYI=
-k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU=
-k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
-k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
-k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
-k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 h1:kmDqav+P+/5e1i9tFfHq1qcF3sOrDp+YEkVDAHu7Jwk=
-k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
-sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/test/integration/consul-container/libs/assert/common.go b/test/integration/consul-container/libs/assert/common.go
index c10cb7b9b4793..d7b5ef1ae9f43 100644
--- a/test/integration/consul-container/libs/assert/common.go
+++ b/test/integration/consul-container/libs/assert/common.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package assert
 
 import (
diff --git a/test/integration/consul-container/libs/assert/envoy.go b/test/integration/consul-container/libs/assert/envoy.go
index 760b1f87bc5ac..1fdf61feae3c9 100644
--- a/test/integration/consul-container/libs/assert/envoy.go
+++ b/test/integration/consul-container/libs/assert/envoy.go
@@ -1,12 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package assert
 
 import (
 	"fmt"
 	"io"
-	"net/http"
 	"net/url"
 	"regexp"
 	"strconv"
@@ -15,30 +11,15 @@ import (
 	"time"
 
 	"github.com/hashicorp/consul/sdk/testutil/retry"
+	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
+	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 	"github.com/hashicorp/go-cleanhttp"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 )
 
 // GetEnvoyListenerTCPFilters validates that proxy was configured with tcp protocol and one rbac listener filter
 func GetEnvoyListenerTCPFilters(t *testing.T, adminPort int) {
-	require.True(t, adminPort > 0)
-
-	GetEnvoyListenerTCPFiltersWithClient(
-		t,
-		cleanhttp.DefaultClient(),
-		fmt.Sprintf("localhost:%d", adminPort),
-	)
-}
-
-func GetEnvoyListenerTCPFiltersWithClient(
-	t *testing.T,
-	client *http.Client,
-	addr string,
-) {
 	var (
 		dump string
 		err  error
@@ -48,7 +29,7 @@ func GetEnvoyListenerTCPFiltersWithClient(
 	}
 
 	retry.RunWith(failer(), t, func(r *retry.R) {
-		dump, _, err = GetEnvoyOutputWithClient(client, addr, "config_dump", map[string]string{})
+		dump, _, err = GetEnvoyOutput(adminPort, "config_dump", map[string]string{})
 		if err != nil {
 			r.Fatal("could not fetch envoy configuration")
 		}
@@ -71,56 +52,30 @@ func GetEnvoyListenerTCPFiltersWithClient(
 	require.Contains(t, filteredResult, "envoy.filters.network.tcp_proxy")
 }
 
-// func GetEnvoyOutputWithClient(client *http.Client, addr string, path string, query map[string]string) (string, int, error) {
-
 // AssertUpstreamEndpointStatus validates that proxy was configured with provided clusterName in the healthStatus
 func AssertUpstreamEndpointStatus(t *testing.T, adminPort int, clusterName, healthStatus string, count int) {
-	require.True(t, adminPort > 0)
-	AssertUpstreamEndpointStatusWithClient(
-		t,
-		cleanhttp.DefaultClient(),
-		fmt.Sprintf("localhost:%d", adminPort),
-		clusterName,
-		healthStatus,
-		count,
+	var (
+		clusters string
+		err      error
 	)
-}
-
-func AssertUpstreamEndpointStatusWithClient(
-	t *testing.T,
-	client *http.Client,
-	addr string,
-	clusterName string,
-	healthStatus string,
-	count int,
-) {
-	require.NotNil(t, client)
-	require.NotEmpty(t, addr)
 	failer := func() *retry.Timer {
 		return &retry.Timer{Timeout: 30 * time.Second, Wait: 500 * time.Millisecond}
 	}
 
 	retry.RunWith(failer(), t, func(r *retry.R) {
-		clusters, statusCode, err := GetEnvoyOutputWithClient(client, addr, "clusters", map[string]string{"format": "json"})
+		clusters, _, err = GetEnvoyOutput(adminPort, "clusters", map[string]string{"format": "json"})
 		if err != nil {
 			r.Fatal("could not fetch envoy clusters")
 		}
-		require.Equal(r, 200, statusCode)
-
-		filter := fmt.Sprintf(
-			`.cluster_statuses[]
-			| select(.name|contains("%s"))
-			| [.host_statuses[].health_status.eds_health_status]
-			| [select(.[] == "%s")]
-			| length`,
-			clusterName, healthStatus)
+
+		filter := fmt.Sprintf(`.cluster_statuses[] | select(.name|contains("%s")) | [.host_statuses[].health_status.eds_health_status] | [select(.[] == "%s")] | length`, clusterName, healthStatus)
 		results, err := utils.JQFilter(clusters, filter)
-		require.NoErrorf(r, err, "could not find cluster name %q: %v \n%s", clusterName, err, clusters)
-		require.Len(r, results, 1) // the final part of the pipeline is "length" which only ever returns 1 result
+		require.NoErrorf(r, err, "could not found cluster name %s", clusterName)
 
-		result, err := strconv.Atoi(results[0])
+		resultToString := strings.Join(results, " ")
+		result, err := strconv.Atoi(resultToString)
 		assert.NoError(r, err)
-		require.Equal(r, count, result, "original results: %v", clusters)
+		require.Equal(r, count, result)
 	})
 }
 
@@ -282,12 +237,8 @@ func AssertEnvoyRunning(t *testing.T, port int) {
 
 func GetEnvoyOutput(port int, path string, query map[string]string) (string, int, error) {
 	client := cleanhttp.DefaultClient()
-	return GetEnvoyOutputWithClient(client, fmt.Sprintf("localhost:%d", port), path, query)
-}
-
-func GetEnvoyOutputWithClient(client *http.Client, addr string, path string, query map[string]string) (string, int, error) {
 	var u url.URL
-	u.Host = addr
+	u.Host = fmt.Sprintf("localhost:%d", port)
 	u.Scheme = "http"
 	if path != "" {
 		u.Path = path
diff --git a/test/integration/consul-container/libs/assert/grpc.go b/test/integration/consul-container/libs/assert/grpc.go
deleted file mode 100644
index a41ef65af620e..0000000000000
--- a/test/integration/consul-container/libs/assert/grpc.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package assert
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"fortio.org/fortio/fgrpc"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-)
-
-// GRPCPing sends a fgrpc.PingMessage to a fortio server at addr, analogous to
-// the CLI command `fortio grpcping`. It retries for up to 1m, with a 25ms gap.
-func GRPCPing(t *testing.T, addr string) {
-	t.Helper()
-	pingConn, err := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
-	require.NoError(t, err)
-	pingCl := fgrpc.NewPingServerClient(pingConn)
-	var msg *fgrpc.PingMessage
-	retries := 0
-	retry.RunWith(&retry.Timer{Timeout: time.Minute, Wait: 25 * time.Millisecond}, t, func(r *retry.R) {
-		t.Logf("making grpc call to %s", addr)
-		retries += 1
-		msg, err = pingCl.Ping(context.Background(), &fgrpc.PingMessage{
-			// use addr as payload so we have something variable to check against
-			Payload: addr,
-		})
-		if err != nil {
-			r.Error(err)
-		}
-	})
-	assert.Equal(t, addr, msg.Payload)
-}
diff --git a/test/integration/consul-container/libs/assert/peering.go b/test/integration/consul-container/libs/assert/peering.go
index ab000268d7900..7dc970d0bf562 100644
--- a/test/integration/consul-container/libs/assert/peering.go
+++ b/test/integration/consul-container/libs/assert/peering.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package assert
 
 import (
@@ -10,30 +7,19 @@ import (
 
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 // PeeringStatus verifies the peering connection is the specified state with a default retry.
 func PeeringStatus(t *testing.T, client *api.Client, peerName string, status api.PeeringState) {
-	PeeringStatusOpts(t, client, peerName, status, nil)
-}
-
-// PeeringStatusOpts verifies the peering connection is the specified
-// state with a default retry with options.
-func PeeringStatusOpts(t *testing.T, client *api.Client, peerName string, status api.PeeringState, opts *api.QueryOptions) {
 	failer := func() *retry.Timer {
 		return &retry.Timer{Timeout: 180 * time.Second, Wait: defaultWait}
 	}
 
 	retry.RunWith(failer(), t, func(r *retry.R) {
-		peering, _, err := client.Peerings().Read(context.Background(), peerName, opts)
+		peering, _, err := client.Peerings().Read(context.Background(), peerName, &api.QueryOptions{})
 		if err != nil {
 			r.Fatal("error reading peering data")
 		}
-		if peering == nil {
-			r.Fatal("peering not found")
-		}
 		if status != peering.State {
 			r.Fatal("peering state did not match: got ", peering.State, " want ", status)
 		}
@@ -42,20 +28,17 @@ func PeeringStatusOpts(t *testing.T, client *api.Client, peerName string, status
 
 // PeeringExports verifies the correct number of exported services with a default retry.
 func PeeringExports(t *testing.T, client *api.Client, peerName string, exports int) {
-	PeeringExportsOpts(t, client, peerName, exports, nil)
-}
-
-// PeeringExportsOpts verifies the correct number of exported services
-// with a default retry with options.
-func PeeringExportsOpts(t *testing.T, client *api.Client, peerName string, exports int, opts *api.QueryOptions) {
 	failer := func() *retry.Timer {
 		return &retry.Timer{Timeout: defaultTimeout, Wait: defaultWait}
 	}
 
 	retry.RunWith(failer(), t, func(r *retry.R) {
-		peering, _, err := client.Peerings().Read(context.Background(), peerName, opts)
-		require.Nil(r, err, "reading peering data")
-		require.NotNilf(r, peering, "peering not found %q", peerName)
-		assert.Len(r, peering.StreamStatus.ExportedServices, exports, "peering exported services")
+		peering, _, err := client.Peerings().Read(context.Background(), peerName, &api.QueryOptions{})
+		if err != nil {
+			r.Fatal("error reading peering data")
+		}
+		if exports != len(peering.StreamStatus.ExportedServices) {
+			r.Fatal("peering exported services did not match: got ", len(peering.StreamStatus.ExportedServices), " want ", exports)
+		}
 	})
 }
diff --git a/test/integration/consul-container/libs/assert/service.go b/test/integration/consul-container/libs/assert/service.go
index 35fad6bfb15ba..41c9204c2488a 100644
--- a/test/integration/consul-container/libs/assert/service.go
+++ b/test/integration/consul-container/libs/assert/service.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package assert
 
 import (
@@ -34,7 +31,7 @@ func CatalogServiceExists(t *testing.T, c *api.Client, svc string, opts *api.Que
 			r.Fatal("error reading service data")
 		}
 		if len(services) == 0 {
-			r.Fatalf("did not find catalog entry for %q with opts %#v", svc, opts)
+			r.Fatal("did not find catalog entry for ", svc)
 		}
 	})
 }
@@ -98,29 +95,22 @@ func HTTPServiceEchoesWithHeaders(t *testing.T, ip string, port int, path string
 	doHTTPServiceEchoes(t, ip, port, path, headers, nil)
 }
 
-func HTTPServiceEchoesWithClient(t *testing.T, client *http.Client, addr string, path string) {
-	doHTTPServiceEchoesWithClient(t, client, addr, path, nil, nil)
-}
-
 func HTTPServiceEchoesResHeader(t *testing.T, ip string, port int, path string, expectedResHeader map[string]string) {
 	doHTTPServiceEchoes(t, ip, port, path, nil, expectedResHeader)
 }
-func HTTPServiceEchoesResHeaderWithClient(t *testing.T, client *http.Client, addr string, path string, expectedResHeader map[string]string) {
-	doHTTPServiceEchoesWithClient(t, client, addr, path, nil, expectedResHeader)
-}
 
 // HTTPServiceEchoes verifies that a post to the given ip/port combination returns the data
 // in the response body. Optional path can be provided to differentiate requests.
 func doHTTPServiceEchoes(t *testing.T, ip string, port int, path string, requestHeaders map[string]string, expectedResHeader map[string]string) {
 	client := cleanhttp.DefaultClient()
-	addr := fmt.Sprintf("%s:%d", ip, port)
-	doHTTPServiceEchoesWithClient(t, client, addr, path, requestHeaders, expectedResHeader)
+	doHTTPServiceEchoesWithClient(t, client, ip, port, path, requestHeaders, expectedResHeader)
 }
 
 func doHTTPServiceEchoesWithClient(
 	t *testing.T,
 	client *http.Client,
-	addr string,
+	ip string,
+	port int,
 	path string,
 	requestHeaders map[string]string,
 	expectedResHeader map[string]string,
@@ -131,7 +121,7 @@ func doHTTPServiceEchoesWithClient(
 		return &retry.Timer{Timeout: defaultHTTPTimeout, Wait: defaultHTTPWait}
 	}
 
-	url := "http://" + addr
+	url := fmt.Sprintf("http://%s:%d", ip, port)
 
 	if path != "" {
 		url += "/" + path
@@ -158,10 +148,6 @@ func doHTTPServiceEchoesWithClient(
 		}
 		defer res.Body.Close()
 
-		statusCode := res.StatusCode
-		t.Logf("...got response code %d", statusCode)
-		require.Equal(r, 200, statusCode)
-
 		body, err := io.ReadAll(res.Body)
 		if err != nil {
 			r.Fatal("could not read response body ", url)
@@ -198,77 +184,22 @@ func ServiceLogContains(t *testing.T, service libservice.Service, target string)
 	return strings.Contains(logs, target)
 }
 
-// AssertFortioName is a convenience function for [AssertFortioNameWithClient], using a [cleanhttp.DefaultClient()]
-func AssertFortioName(t *testing.T, urlbase string, name string, reqHost string) {
-	t.Helper()
-	client := cleanhttp.DefaultClient()
-	AssertFortioNameWithClient(t, urlbase, name, reqHost, client)
-}
-
-// AssertFortioNameWithClient asserts that the fortio service replying at urlbase/debug
+// AssertFortioName asserts that the fortio service replying at urlbase/debug
 // has a `FORTIO_NAME` env variable set. This validates that the client is sending
 // traffic to the right envoy proxy.
 //
 // If reqHost is set, the Host field of the HTTP request will be set to its value.
 //
 // It retries with timeout defaultHTTPTimeout and wait defaultHTTPWait.
-//
-// client must be a custom http.Client
-func AssertFortioNameWithClient(t *testing.T, urlbase string, name string, reqHost string, client *http.Client) {
-	t.Helper()
-	foundName, err := FortioNameWithClient(t, urlbase, name, reqHost, client)
-	require.NoError(t, err)
-	t.Logf("got response from server name %q expect %q", foundName, name)
-	assert.Equal(t, name, foundName)
-}
-
-// WaitForFortioName is a convenience function for [WaitForFortioNameWithClient], using a [cleanhttp.DefaultClient()]
-func WaitForFortioName(t *testing.T, r retry.Retryer, urlbase string, name string, reqHost string) {
+func AssertFortioName(t *testing.T, urlbase string, name string, reqHost string) {
 	t.Helper()
+	var fortioNameRE = regexp.MustCompile(("\nFORTIO_NAME=(.+)\n"))
 	client := cleanhttp.DefaultClient()
-	WaitForFortioNameWithClient(t, r, urlbase, name, reqHost, client)
-}
-
-// WaitForFortioNameWithClient enables waiting for FortioNameWithClient to return a specific
-// value. It uses the provided Retryer to wait for the expected name and only fails when
-// retries are exhausted.
-//
-// This is useful when performing failovers in tests and in other eventual consistency
-// scenarios that may take multiple seconds to resolve.
-//
-// Note that the underlying FortioNameWithClient has its own retry for successfully making
-// an HTTP request, which will be counted against the timeout of the provided Retryer if it
-// is a Timer, or incorporated into each attempt if it is a Counter.
-func WaitForFortioNameWithClient(t *testing.T, r retry.Retryer, urlbase string, name string, reqHost string, client *http.Client) {
-	t.Helper()
-	retry.RunWith(r, t, func(r *retry.R) {
-		actual, err := FortioNameWithClient(r, urlbase, name, reqHost, client)
-		require.NoError(r, err)
-		if name != actual {
-			r.Errorf("name %s did not match expected %s", name, actual)
-		}
-	})
-}
-
-// FortioNameWithClient returns the `FORTIO_NAME` returned by the fortio service at
-// urlbase/debug. This can be used to validate that the client is sending traffic to
-// the right envoy proxy.
-//
-// If reqHost is set, the Host field of the HTTP request will be set to its value.
-//
-// It retries with timeout defaultHTTPTimeout and wait defaultHTTPWait.
-//
-// client must be a custom http.Client
-func FortioNameWithClient(t retry.Failer, urlbase string, name string, reqHost string, client *http.Client) (string, error) {
-	t.Helper()
-	var fortioNameRE = regexp.MustCompile("\nFORTIO_NAME=(.+)\n")
-	var body []byte
-
 	retry.RunWith(&retry.Timer{Timeout: defaultHTTPTimeout, Wait: defaultHTTPWait}, t, func(r *retry.R) {
 		fullurl := fmt.Sprintf("%s/debug?env=dump", urlbase)
 		req, err := http.NewRequest("GET", fullurl, nil)
 		if err != nil {
-			r.Fatalf("could not build request to %q: %v", fullurl, err)
+			r.Fatal("could not make request to service ", fullurl)
 		}
 		if reqHost != "" {
 			req.Host = reqHost
@@ -276,29 +207,26 @@ func FortioNameWithClient(t retry.Failer, urlbase string, name string, reqHost s
 
 		resp, err := client.Do(req)
 		if err != nil {
-			r.Fatalf("could not make request to %q: %v", fullurl, err)
+			r.Fatal("could not make call to service ", fullurl)
 		}
 		defer resp.Body.Close()
-		if resp.StatusCode != http.StatusOK {
-			r.Fatalf("could not make request to %q: status %d", fullurl, resp.StatusCode)
-		}
 
-		body, err = io.ReadAll(resp.Body)
+		body, err := io.ReadAll(resp.Body)
 		if err != nil {
-			r.Fatalf("failed to read response body from %q: %v", fullurl, err)
+			r.Error(err)
+			return
 		}
-	})
 
-	m := fortioNameRE.FindStringSubmatch(string(body))
-	if len(m) < 2 {
-		return "", fmt.Errorf("fortio name not found %s", name)
-	}
-	return m[1], nil
+		m := fortioNameRE.FindStringSubmatch(string(body))
+		require.GreaterOrEqual(r, len(m), 2)
+		t.Logf("got response from server name %s", m[1])
+		assert.Equal(r, name, m[1])
+	})
 }
 
 // AssertContainerState validates service container status
 func AssertContainerState(t *testing.T, service libservice.Service, state string) {
 	containerStatus, err := service.GetStatus()
 	require.NoError(t, err)
-	require.Equal(t, containerStatus, state, fmt.Sprintf("Expected: %s. Got %s", state, containerStatus))
+	require.Equal(t, containerStatus, state, fmt.Sprintf("Expected: %s. Got %s", containerStatus, state))
 }
diff --git a/test/integration/consul-container/libs/cluster/agent.go b/test/integration/consul-container/libs/cluster/agent.go
index 09568f21c565c..7c89fb92c5264 100644
--- a/test/integration/consul-container/libs/cluster/agent.go
+++ b/test/integration/consul-container/libs/cluster/agent.go
@@ -1,22 +1,12 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cluster
 
 import (
 	"context"
-	"encoding/json"
-	"fmt"
 	"io"
 
-	jsonpatch "github.com/evanphx/json-patch"
-	agentconfig "github.com/hashicorp/consul/agent/config"
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/lib/decode"
-	"github.com/hashicorp/hcl"
-	"github.com/mitchellh/mapstructure"
 	"github.com/testcontainers/testcontainers-go"
-	"google.golang.org/grpc"
+
+	"github.com/hashicorp/consul/api"
 
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 )
@@ -43,8 +33,6 @@ type Agent interface {
 	Upgrade(ctx context.Context, config Config) error
 	Exec(ctx context.Context, cmd []string) (string, error)
 	DataDir() string
-	GetGRPCConn() *grpc.ClientConn
-	GetAPIClientConfig() api.Config
 }
 
 // Config is a set of configurations required to create a Agent
@@ -53,11 +41,11 @@ type Agent interface {
 type Config struct {
 	// NodeName is set for the consul agent name and container name
 	// Equivalent to the -node command-line flag.
-	// If empty, a random name will be generated
+	// If empty, a randam name will be generated
 	NodeName string
 	// NodeID is used to configure node_id in agent config file
 	// Equivalent to the -node-id command-line flag.
-	// If empty, a random name will be generated
+	// If empty, a randam name will be generated
 	NodeID string
 
 	// ExternalDataDir is data directory to copy consul data from, if set.
@@ -78,8 +66,7 @@ type Config struct {
 	UseAPIWithTLS  bool // TODO
 	UseGRPCWithTLS bool
 
-	ACLEnabled     bool
-	TokenBootstrap string
+	ACLEnabled bool
 }
 
 func (c *Config) DockerImage() string {
@@ -91,75 +78,17 @@ func (c *Config) DockerImage() string {
 func (c Config) Clone() Config {
 	c2 := c
 	if c.Cmd != nil {
-		copy(c2.Cmd, c.Cmd)
+		c2.Cmd = make([]string, len(c.Cmd))
+		for i, v := range c.Cmd {
+			c2.Cmd[i] = v
+		}
 	}
 	return c2
 }
 
-type decodeTarget struct {
-	agentconfig.Config `mapstructure:",squash"`
-}
-
-// MutatebyAgentConfig mutates config by applying the fields in the input hclConfig
-// Note that the precedence order is config > hclConfig, because user provider hclConfig
-// may not work with the testing environment, e.g., data dir, agent name, etc.
-// Currently only hcl config is allowed
-func (c *Config) MutatebyAgentConfig(hclConfig string) error {
-	rawConfigJson, err := convertHcl2Json(hclConfig)
-	if err != nil {
-		return fmt.Errorf("error converting to Json: %s", err)
-	}
-
-	// Merge 2 json
-	mergedConfigJosn, err := jsonpatch.MergePatch([]byte(rawConfigJson), []byte(c.JSON))
-	if err != nil {
-		return fmt.Errorf("error merging configurations: %w", err)
-	}
-
-	c.JSON = string(mergedConfigJosn)
-	return nil
-}
-
 // TODO: refactor away
 type AgentInfo struct {
 	CACertFile    string
 	UseTLSForAPI  bool
 	UseTLSForGRPC bool
-	DebugURI      string
-}
-
-func convertHcl2Json(in string) (string, error) {
-	var raw map[string]interface{}
-	err := hcl.Decode(&raw, in)
-	if err != nil {
-		return "", err
-	}
-
-	var target decodeTarget
-	var md mapstructure.Metadata
-	d, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
-		DecodeHook: mapstructure.ComposeDecodeHookFunc(
-			// decode.HookWeakDecodeFromSlice is only necessary when reading from
-			// an HCL config file. In the future we could omit it when reading from
-			// JSON configs. It is left here for now to maintain backwards compat
-			// for the unlikely scenario that someone is using malformed JSON configs
-			// and expecting this behaviour to correct their config.
-			decode.HookWeakDecodeFromSlice,
-			decode.HookTranslateKeys,
-		),
-		Metadata: &md,
-		Result:   &target,
-	})
-	if err != nil {
-		return "", err
-	}
-	if err := d.Decode(raw); err != nil {
-		return "", err
-	}
-
-	rawjson, err := json.MarshalIndent(target, "", "  ")
-	if err != nil {
-		return "", err
-	}
-	return string(rawjson), nil
 }
diff --git a/test/integration/consul-container/libs/cluster/app.go b/test/integration/consul-container/libs/cluster/app.go
index 001880b85f432..cdcb4bcb551a9 100644
--- a/test/integration/consul-container/libs/cluster/app.go
+++ b/test/integration/consul-container/libs/cluster/app.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cluster
 
 import (
@@ -62,9 +59,8 @@ func LaunchContainerOnNode(
 		ContainerRequest: req,
 		Started:          true,
 	})
-	fmt.Printf("creating container with image: %s(%s)\n", req.Name, req.Image)
 	if err != nil {
-		return nil, fmt.Errorf("creating container: %s(%s), %w", req.Name, req.Image, err)
+		return nil, err
 	}
 	deferClean.Add(func() {
 		_ = container.Terminate(ctx)
@@ -72,12 +68,12 @@ func LaunchContainerOnNode(
 
 	ip, err := container.ContainerIP(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("fetching container IP: %w", err)
+		return nil, err
 	}
 
 	if utils.FollowLog {
 		if err := container.StartLogProducer(ctx); err != nil {
-			return nil, fmt.Errorf("starting log producer: %w", err)
+			return nil, err
 		}
 		container.FollowOutput(&LogConsumer{
 			Prefix: req.Name,
@@ -91,7 +87,7 @@ func LaunchContainerOnNode(
 	for _, portStr := range mapPorts {
 		mapped, err := pod.MappedPort(ctx, nat.Port(portStr))
 		if err != nil {
-			return nil, fmt.Errorf("mapping port %s: %w", portStr, err)
+			return nil, err
 		}
 		ports[portStr] = mapped
 	}
diff --git a/test/integration/consul-container/libs/cluster/builder.go b/test/integration/consul-container/libs/cluster/builder.go
index 4169c1a163d9a..9cec08560da15 100644
--- a/test/integration/consul-container/libs/cluster/builder.go
+++ b/test/integration/consul-container/libs/cluster/builder.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cluster
 
 import (
@@ -121,7 +118,7 @@ func NewBuildContext(t *testing.T, opts BuildOptions) *BuildContext {
 	}
 
 	if ctx.consulImageName == "" {
-		ctx.consulImageName = utils.GetTargetImageName()
+		ctx.consulImageName = utils.TargetImageName
 	}
 	if ctx.consulVersion == "" {
 		ctx.consulVersion = utils.TargetVersion
@@ -186,7 +183,6 @@ func NewConfigBuilder(ctx *BuildContext) *Builder {
 	b.conf.Set("connect.enabled", true)
 	b.conf.Set("log_level", "debug")
 	b.conf.Set("server", true)
-	b.conf.Set("ui_config.enabled", true)
 
 	// These are the default ports, disabling plaintext transport
 	b.conf.Set("ports.dns", 8600)
@@ -273,11 +269,6 @@ func (b *Builder) Peering(enable bool) *Builder {
 	return b
 }
 
-func (b *Builder) SetACLToken(token string) *Builder {
-	b.conf.Set("acl.tokens.agent", token)
-	return b
-}
-
 func (b *Builder) NodeID(nodeID string) *Builder {
 	b.conf.Set("node_id", nodeID)
 	return b
@@ -316,15 +307,11 @@ func (b *Builder) ToAgentConfig(t *testing.T) *Config {
 	confCopy, err := b.conf.Clone()
 	require.NoError(t, err)
 
-	cmd := []string{"agent"}
-	if utils.Debug {
-		cmd = []string{"/root/go/bin/dlv", "exec", "/bin/consul", "--listen=:4000", "--headless=true", "", "--accept-multiclient", "--continue", "--api-version=2", "--", "agent", "--config-file=/consul/config/config.json"}
-	}
 	return &Config{
 		JSON:          string(out),
 		ConfigBuilder: confCopy,
 
-		Cmd: cmd,
+		Cmd: []string{"agent"},
 
 		Image:   b.context.consulImageName,
 		Version: b.context.consulVersion,
diff --git a/test/integration/consul-container/libs/cluster/cluster.go b/test/integration/consul-container/libs/cluster/cluster.go
index fbee48333eb1b..727fbb7944ee2 100644
--- a/test/integration/consul-container/libs/cluster/cluster.go
+++ b/test/integration/consul-container/libs/cluster/cluster.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cluster
 
 import (
@@ -15,15 +12,14 @@ import (
 	"testing"
 	"time"
 
-	goretry "github.com/avast/retry-go"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/serf/serf"
+
+	goretry "github.com/avast/retry-go"
 	"github.com/stretchr/testify/require"
 	"github.com/teris-io/shortid"
 	"github.com/testcontainers/testcontainers-go"
-
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 )
 
 // Cluster provides an interface for creating and controlling a Consul cluster
@@ -93,12 +89,11 @@ func New(t TestingT, configs []Config, ports ...int) (*Cluster, error) {
 	}
 
 	cluster := &Cluster{
-		ID:             id,
-		Network:        network,
-		NetworkName:    name,
-		ScratchDir:     scratchDir,
-		ACLEnabled:     configs[0].ACLEnabled,
-		TokenBootstrap: configs[0].TokenBootstrap,
+		ID:          id,
+		Network:     network,
+		NetworkName: name,
+		ScratchDir:  scratchDir,
+		ACLEnabled:  configs[0].ACLEnabled,
 	}
 	t.Cleanup(func() {
 		_ = cluster.Terminate()
@@ -130,34 +125,21 @@ func (c *Cluster) Add(configs []Config, serfJoin bool, ports ...int) (xe error)
 		// Each agent gets it's own area in the cluster scratch.
 		conf.ScratchDir = filepath.Join(c.ScratchDir, strconv.Itoa(c.Index))
 		if err := os.MkdirAll(conf.ScratchDir, 0777); err != nil {
-			return fmt.Errorf("container %d making scratchDir: %w", idx, err)
+			return fmt.Errorf("container %d: %w", idx, err)
 		}
 		if err := os.Chmod(conf.ScratchDir, 0777); err != nil {
-			return fmt.Errorf("container %d perms on scratchDir: %w", idx, err)
+			return fmt.Errorf("container %d: %w", idx, err)
 		}
 
-		var n Agent
-
-		// retry creating client every ten seconds. with local development, we've found
-		// that this "port not found" error occurs when runs happen too close together
-		if err := goretry.Do(
-			func() (err error) {
-				n, err = NewConsulContainer(
-					context.Background(),
-					conf,
-					c,
-					ports...,
-				)
-				return err
-			},
-			goretry.Delay(10*time.Second),
-			goretry.RetryIf(func(err error) bool {
-				return strings.Contains(err.Error(), "port not found")
-			}),
-		); err != nil {
-			return fmt.Errorf("container %d creating: %s", idx, err)
+		n, err := NewConsulContainer(
+			context.Background(),
+			conf,
+			c,
+			ports...,
+		)
+		if err != nil {
+			return fmt.Errorf("container %d: %w", idx, err)
 		}
-
 		agents = append(agents, n)
 		c.Index++
 	}
@@ -172,10 +154,6 @@ func (c *Cluster) Add(configs []Config, serfJoin bool, ports ...int) (xe error)
 		}
 	}
 
-	if utils.Debug {
-		c.PrintDebugInfo(agents)
-	}
-
 	return nil
 }
 
@@ -194,8 +172,8 @@ func (c *Cluster) join(agents []Agent, skipSerfJoin bool) error {
 	}
 
 	if len(c.Agents) == 0 {
-		// if acl enabled and bootstrap token is null, generate the bootstrap tokens at the first agent
-		if c.ACLEnabled && c.TokenBootstrap == "" {
+		// if acl enabled, generate the bootstrap tokens at the first agent
+		if c.ACLEnabled {
 			var (
 				output string
 				err    error
@@ -599,7 +577,6 @@ func (c *Cluster) PeerWithCluster(acceptingClient *api.Client, acceptingPeerName
 }
 
 const retryTimeout = 90 * time.Second
-
 const retryFrequency = 500 * time.Millisecond
 
 func LongFailer() *retry.Timer {
@@ -669,26 +646,6 @@ func (c *Cluster) ConfigEntryDelete(entry api.ConfigEntry) error {
 	return err
 }
 
-func (c *Cluster) PrintDebugInfo(agents []Agent) {
-	for _, a := range agents {
-		uri := a.GetInfo().DebugURI
-		n := a.GetAgentName()
-		s := a.IsServer()
-		l := "NA"
-		if s {
-			leader, err := c.Leader()
-			if err == nil {
-				if leader == a {
-					l = "true"
-				} else {
-					l = "false"
-				}
-			}
-		}
-		fmt.Printf("\ndebug info:: n=%s,s=%t,l=%s,uri=%s\n\n", n, s, l, uri)
-	}
-}
-
 func extractSecretIDFrom(tokenOutput string) (string, error) {
 	lines := strings.Split(tokenOutput, "\n")
 	for _, line := range lines {
diff --git a/test/integration/consul-container/libs/cluster/config.go b/test/integration/consul-container/libs/cluster/config.go
index f46be0429541e..fec5ffacbeba2 100644
--- a/test/integration/consul-container/libs/cluster/config.go
+++ b/test/integration/consul-container/libs/cluster/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cluster
 
 import (
diff --git a/test/integration/consul-container/libs/cluster/container.go b/test/integration/consul-container/libs/cluster/container.go
index 0ff9038c0e5df..bd56ac4e800d2 100644
--- a/test/integration/consul-container/libs/cluster/container.go
+++ b/test/integration/consul-container/libs/cluster/container.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cluster
 
 import (
@@ -8,37 +5,31 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"net/url"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strconv"
 	"time"
 
 	goretry "github.com/avast/retry-go"
 	dockercontainer "github.com/docker/docker/api/types/container"
-	"github.com/docker/go-connections/nat"
-	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/go-multierror"
 	"github.com/otiai10/copy"
 	"github.com/pkg/errors"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
+
+	"github.com/hashicorp/consul/api"
 
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 )
 
 const bootLogLine = "Consul agent running"
-
 const disableRYUKEnv = "TESTCONTAINERS_RYUK_DISABLED"
 
 // Exposed ports info
 const MaxEnvoyOnNode = 10                  // the max number of Envoy sidecar can run along with the agent, base is 19000
 const ServiceUpstreamLocalBindPort = 5000  // local bind Port of service's upstream
 const ServiceUpstreamLocalBindPort2 = 5001 // local bind Port of service's upstream, for services with 2 upstreams
-const debugPort = "4000/tcp"
 
 // consulContainerNode implements the Agent interface by running a Consul agent
 // in a container.
@@ -63,14 +54,10 @@ type consulContainerNode struct {
 	clientCACertFile string
 	ip               string
 
-	grpcConn *grpc.ClientConn
-
 	nextAdminPortOffset   int
 	nextConnectPortOffset int
 
 	info AgentInfo
-
-	apiClientConfig api.Config
 }
 
 func (c *consulContainerNode) GetPod() testcontainers.Container {
@@ -136,13 +123,6 @@ func NewConsulContainer(ctx context.Context, config Config, cluster *Cluster, po
 		if err != nil {
 			return nil, fmt.Errorf("error copying persistent data from %s: %w", config.ExternalDataDir, err)
 		}
-		// NOTE: make sure the new version can access the persistent data
-		// This is necessary for running on Linux
-		cmd := exec.Command("chmod", "-R", "777", tmpDirData)
-		err = cmd.Run()
-		if err != nil {
-			return nil, fmt.Errorf("error changing ownership of persistent data: %w", err)
-		}
 	}
 
 	var caCertFileForAPI string
@@ -188,25 +168,8 @@ func NewConsulContainer(ctx context.Context, config Config, cluster *Cluster, po
 		clientAddr       string
 		clientCACertFile string
 
-		info     AgentInfo
-		grpcConn *grpc.ClientConn
+		info AgentInfo
 	)
-	debugURI := ""
-	if utils.Debug {
-		if err := goretry.Do(
-			func() (err error) {
-				debugURI, err = podContainer.PortEndpoint(ctx, "4000", "tcp")
-				return err
-			},
-			goretry.Delay(10*time.Second),
-			goretry.RetryIf(func(err error) bool {
-				return err != nil
-			}),
-		); err != nil {
-			return nil, fmt.Errorf("container creating: %s", err)
-		}
-		info.DebugURI = debugURI
-	}
 	if httpPort > 0 {
 		for i := 0; i < 10; i++ {
 			uri, err := podContainer.PortEndpoint(ctx, "8500", "http")
@@ -253,28 +216,6 @@ func NewConsulContainer(ctx context.Context, config Config, cluster *Cluster, po
 		info.CACertFile = clientCACertFile
 	}
 
-	// TODO: Support gRPC+TLS port.
-	if pc.Ports.GRPC > 0 {
-		port, err := nat.NewPort("tcp", strconv.Itoa(pc.Ports.GRPC))
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse gRPC TLS port: %w", err)
-		}
-		endpoint, err := podContainer.PortEndpoint(ctx, port, "tcp")
-		if err != nil {
-			return nil, fmt.Errorf("failed to get gRPC TLS endpoint: %w", err)
-		}
-		url, err := url.Parse(endpoint)
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse gRPC endpoint URL: %w", err)
-		}
-		conn, err := grpc.Dial(url.Host, grpc.WithTransportCredentials(insecure.NewCredentials()))
-		if err != nil {
-			return nil, fmt.Errorf("failed to dial gRPC connection: %w", err)
-		}
-		deferClean.Add(func() { _ = conn.Close() })
-		grpcConn = conn
-	}
-
 	ip, err := podContainer.ContainerIP(ctx)
 	if err != nil {
 		return nil, err
@@ -321,7 +262,6 @@ func NewConsulContainer(ctx context.Context, config Config, cluster *Cluster, po
 		name:       name,
 		ip:         ip,
 		info:       info,
-		grpcConn:   grpcConn,
 	}
 
 	if httpPort > 0 || httpsPort > 0 {
@@ -340,14 +280,12 @@ func NewConsulContainer(ctx context.Context, config Config, cluster *Cluster, po
 		}
 
 		node.client = apiClient
-		node.apiClientConfig = *apiConfig
 		node.clientAddr = clientAddr
 		node.clientCACertFile = clientCACertFile
 	}
 
-	// Inject node token if ACL is enabled, the bootstrap token not null, and cluster
-	// has at least one agent
-	if cluster.TokenBootstrap != "" && cluster.ACLEnabled && len(cluster.Agents) > 0 {
+	// Inject node token if ACL is enabled and the bootstrap token is generated
+	if cluster.TokenBootstrap != "" && cluster.ACLEnabled {
 		agentToken, err := cluster.CreateAgentToken(pc.Datacenter, name)
 		if err != nil {
 			return nil, err
@@ -418,10 +356,6 @@ func (c *consulContainerNode) GetClient() *api.Client {
 	return c.client
 }
 
-func (c *consulContainerNode) GetGRPCConn() *grpc.ClientConn {
-	return c.grpcConn
-}
-
 // NewClient returns an API client by making a new one based on the provided token
 // - updateDefault: if true update the default client
 func (c *consulContainerNode) NewClient(token string, updateDefault bool) (*api.Client, error) {
@@ -457,10 +391,6 @@ func (c *consulContainerNode) GetIP() string {
 	return c.ip
 }
 
-func (c *consulContainerNode) GetAPIClientConfig() api.Config {
-	return c.apiClientConfig
-}
-
 func (c *consulContainerNode) RegisterTermination(f func() error) {
 	c.terminateFuncs = append(c.terminateFuncs, f)
 }
@@ -543,11 +473,9 @@ func (c *consulContainerNode) Upgrade(ctx context.Context, config Config) error
 func (c *consulContainerNode) Terminate() error {
 	return c.terminate(false, false)
 }
-
 func (c *consulContainerNode) TerminateAndRetainPod(skipFuncs bool) error {
 	return c.terminate(true, skipFuncs)
 }
-
 func (c *consulContainerNode) terminate(retainPod bool, skipFuncs bool) error {
 	// Services might register a termination function that should also fire
 	// when the "agent" is cleaned up.
@@ -560,10 +488,6 @@ func (c *consulContainerNode) terminate(retainPod bool, skipFuncs bool) error {
 				continue
 			}
 		}
-
-		// if the pod is retained and therefore the IP then the grpc conn
-		// should handle reconnecting so there is no reason to close it.
-		c.closeGRPC()
 	}
 
 	var merr error
@@ -585,16 +509,6 @@ func (c *consulContainerNode) terminate(retainPod bool, skipFuncs bool) error {
 	return merr
 }
 
-func (c *consulContainerNode) closeGRPC() error {
-	if c.grpcConn != nil {
-		if err := c.grpcConn.Close(); err != nil {
-			return err
-		}
-		c.grpcConn = nil
-	}
-	return nil
-}
-
 func (c *consulContainerNode) DataDir() string {
 	return c.dataDir
 }
@@ -631,8 +545,6 @@ func newContainerRequest(config Config, opts containerOpts, ports ...int) (podRe
 		ExposedPorts: []string{
 			"8500/tcp", // Consul HTTP API
 			"8501/tcp", // Consul HTTPs API
-			"8502/tcp", // Consul gRPC API
-			"8600/udp", // Consul DNS API
 
 			"8443/tcp", // Envoy Gateway Listener
 
@@ -645,12 +557,8 @@ func newContainerRequest(config Config, opts containerOpts, ports ...int) (podRe
 			"8081/tcp", // Envoy App Listener - http port used by static-server-v1
 			"8082/tcp", // Envoy App Listener - http port used by static-server-v2
 			"8083/tcp", // Envoy App Listener - http port used by static-server-v3
-
-			"9997/tcp", // Envoy App Listener
 			"9998/tcp", // Envoy App Listener
 			"9999/tcp", // Envoy App Listener
-
-			"80/tcp", // Nginx - http port used in wasm tests
 		},
 		Hostname: opts.hostname,
 		Networks: opts.addtionalNetworks,
@@ -669,9 +577,6 @@ func newContainerRequest(config Config, opts containerOpts, ports ...int) (podRe
 	for _, port := range ports {
 		pod.ExposedPorts = append(pod.ExposedPorts, fmt.Sprintf("%d/tcp", port))
 	}
-	if utils.Debug {
-		pod.ExposedPorts = append(pod.ExposedPorts, debugPort)
-	}
 
 	// For handshakes like auto-encrypt, it can take 10's of seconds for the agent to become "ready".
 	// If we only wait until the log stream starts, subsequent commands to agents will fail.
diff --git a/test/integration/consul-container/libs/cluster/dataplane.go b/test/integration/consul-container/libs/cluster/dataplane.go
deleted file mode 100644
index a9f8498acebf0..0000000000000
--- a/test/integration/consul-container/libs/cluster/dataplane.go
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package cluster
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-	"github.com/testcontainers/testcontainers-go"
-	"github.com/testcontainers/testcontainers-go/wait"
-)
-
-type ConsulDataplaneContainer struct {
-	ctx               context.Context
-	container         testcontainers.Container
-	ip                string
-	appPort           []int
-	serviceName       string
-	externalAdminPort int
-	internalAdminPort int
-}
-
-func (g ConsulDataplaneContainer) GetAddr() (string, int) {
-	return g.ip, g.appPort[0]
-}
-
-func (g ConsulDataplaneContainer) GetServiceName() string {
-	return g.serviceName
-}
-
-// GetAdminAddr returns the external admin port
-func (g ConsulDataplaneContainer) GetAdminAddr() (string, int) {
-	return "localhost", g.externalAdminPort
-}
-
-func (c ConsulDataplaneContainer) Terminate() error {
-	return TerminateContainer(c.ctx, c.container, true)
-}
-
-func (g ConsulDataplaneContainer) Exec(ctx context.Context, cmd []string) (string, error) {
-	exitCode, reader, err := g.container.Exec(ctx, cmd)
-	if err != nil {
-		return "", fmt.Errorf("exec with error %s", err)
-	}
-	if exitCode != 0 {
-		return "", fmt.Errorf("exec with exit code %d", exitCode)
-	}
-	buf, err := io.ReadAll(reader)
-	if err != nil {
-		return "", fmt.Errorf("error reading from exec output: %w", err)
-	}
-	return string(buf), nil
-}
-
-func (g ConsulDataplaneContainer) GetStatus() (string, error) {
-	state, err := g.container.State(g.ctx)
-	return state.Status, err
-}
-
-func NewConsulDataplane(ctx context.Context, proxyID string, serverAddresses string, grpcPort int, serviceBindPorts []int,
-	node Agent, tproxy bool, bootstrapToken string, containerArgs ...string) (*ConsulDataplaneContainer, error) {
-	namePrefix := fmt.Sprintf("%s-consul-dataplane-%s", node.GetDatacenter(), proxyID)
-	containerName := utils.RandName(namePrefix)
-
-	internalAdminPort, err := node.ClaimAdminPort()
-	if err != nil {
-		return nil, err
-	}
-
-	pod := node.GetPod()
-	if pod == nil {
-		return nil, fmt.Errorf("node Pod is required")
-	}
-
-	var (
-		appPortStrs  []string
-		adminPortStr = strconv.Itoa(internalAdminPort)
-	)
-
-	for _, port := range serviceBindPorts {
-		appPortStrs = append(appPortStrs, strconv.Itoa(port))
-	}
-
-	// expose the app ports and the envoy adminPortStr on the agent container
-	exposedPorts := make([]string, len(appPortStrs))
-	copy(exposedPorts, appPortStrs)
-	exposedPorts = append(exposedPorts, adminPortStr)
-
-	req := testcontainers.ContainerRequest{
-		Image:      "consul-dataplane:local",
-		WaitingFor: wait.ForLog("").WithStartupTimeout(60 * time.Second),
-		AutoRemove: false,
-		Name:       containerName,
-		Env:        map[string]string{},
-	}
-
-	var command []string
-
-	if tproxy {
-		req.Entrypoint = []string{"sh", "/bin/tproxy-startup.sh"}
-		req.Env["REDIRECT_TRAFFIC_ARGS"] = strings.Join(
-			[]string{
-				// TODO once we run this on a different pod from Consul agents, we can eliminate most of this.
-				"-exclude-inbound-port", fmt.Sprint(internalAdminPort),
-				"-exclude-inbound-port", "8300",
-				"-exclude-inbound-port", "8301",
-				"-exclude-inbound-port", "8302",
-				"-exclude-inbound-port", "8500",
-				"-exclude-inbound-port", "8502",
-				"-exclude-inbound-port", "8600",
-				"-proxy-inbound-port", "20000",
-				"-consul-dns-ip", "127.0.0.1",
-				"-consul-dns-port", "8600",
-			},
-			" ",
-		)
-		req.CapAdd = append(req.CapAdd, "NET_ADMIN")
-		command = append(command, "consul-dataplane")
-	}
-
-	command = append(command,
-		"-addresses", serverAddresses,
-		fmt.Sprintf("-grpc-port=%d", grpcPort),
-		fmt.Sprintf("-proxy-id=%s", proxyID),
-		"-proxy-namespace=default",
-		"-proxy-partition=default",
-		"-log-level=info",
-		"-log-json=false",
-		"-envoy-concurrency=2",
-		"-tls-disabled",
-		fmt.Sprintf("-envoy-admin-bind-port=%d", internalAdminPort),
-	)
-
-	if bootstrapToken != "" {
-		command = append(command,
-			"-credential-type=static",
-			fmt.Sprintf("-static-token=%s", bootstrapToken))
-	}
-
-	req.Cmd = append(command, containerArgs...)
-
-	info, err := LaunchContainerOnNode(ctx, node, req, exposedPorts)
-	if err != nil {
-		return nil, err
-	}
-	out := &ConsulDataplaneContainer{
-		ctx:               ctx,
-		container:         info.Container,
-		ip:                info.IP,
-		serviceName:       containerName,
-		externalAdminPort: info.MappedPorts[adminPortStr].Int(),
-		internalAdminPort: internalAdminPort,
-	}
-
-	for _, port := range appPortStrs {
-		out.appPort = append(out.appPort, info.MappedPorts[port].Int())
-	}
-
-	fmt.Printf("NewConsulDataplane: proxyID %s, mapped App Port %d, service bind port %v\n",
-		proxyID, out.appPort, serviceBindPorts)
-	fmt.Printf("NewConsulDataplane: proxyID %s, , mapped admin port %d, admin port %d\n",
-		proxyID, out.externalAdminPort, internalAdminPort)
-
-	return out, nil
-}
diff --git a/test/integration/consul-container/libs/cluster/encryption.go b/test/integration/consul-container/libs/cluster/encryption.go
index 1d7ae072bf568..58ccd7e04090f 100644
--- a/test/integration/consul-container/libs/cluster/encryption.go
+++ b/test/integration/consul-container/libs/cluster/encryption.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cluster
 
 import (
@@ -8,7 +5,6 @@ import (
 	"crypto/rand"
 	"encoding/base64"
 	"fmt"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"io"
 	"path/filepath"
 	"testing"
@@ -48,98 +44,89 @@ func (c *BuildContext) createTLSCAFiles(t *testing.T) {
 
 	// TODO: cleanup anything with the prefix?
 
-	retry.Run(t, func(r *retry.R) {
-		// Create a volume to hold the data.
-		err = utils.DockerExec([]string{"volume", "create", c.certVolume}, io.Discard)
-		require.NoError(r, err, "could not create docker volume to hold cert data: %s", c.certVolume)
-	})
+	// Create a volume to hold the data.
+	err = utils.DockerExec([]string{"volume", "create", c.certVolume}, io.Discard)
+	require.NoError(t, err, "could not create docker volume to hold cert data: %s", c.certVolume)
 	t.Cleanup(func() {
 		_ = utils.DockerExec([]string{"volume", "rm", c.certVolume}, io.Discard)
 	})
 
-	retry.Run(t, func(r *retry.R) {
-		err := utils.DockerExec([]string{"run",
-			"--rm",
-			"-i",
-			"--net=none",
-			"-v", c.certVolume + ":/data",
-			"busybox:latest",
-			"sh", "-c",
-			// Need this so the permissions stick; docker seems to treat unused volumes differently.
-			`touch /data/VOLUME_PLACEHOLDER && chown -R ` + consulUserArg + ` /data`,
-		}, io.Discard)
-		require.NoError(r, err, "could not initialize docker volume for cert data: %s", c.certVolume)
-	})
-	retry.Run(t, func(r *retry.R) {
-		err = utils.DockerExec([]string{"run",
-			"--rm",
-			"-i",
-			"--net=none",
-			"-u", consulUserArg,
-			"-v", c.certVolume + ":/data",
-			"-w", "/data",
-			"--entrypoint", "",
-			c.DockerImage(),
-			"consul", "tls", "ca", "create",
-		}, io.Discard)
-		require.NoError(r, err, "could not create TLS certificate authority in docker volume: %s", c.certVolume)
-	})
+	err = utils.DockerExec([]string{"run",
+		"--rm",
+		"-i",
+		"--net=none",
+		"-v", c.certVolume + ":/data",
+		"busybox:latest",
+		"sh", "-c",
+		// Need this so the permissions stick; docker seems to treat unused volumes differently.
+		`touch /data/VOLUME_PLACEHOLDER && chown -R ` + consulUserArg + ` /data`,
+	}, io.Discard)
+	require.NoError(t, err, "could not initialize docker volume for cert data: %s", c.certVolume)
+
+	err = utils.DockerExec([]string{"run",
+		"--rm",
+		"-i",
+		"--net=none",
+		"-u", consulUserArg,
+		"-v", c.certVolume + ":/data",
+		"-w", "/data",
+		"--entrypoint", "",
+		c.DockerImage(),
+		"consul", "tls", "ca", "create",
+	}, io.Discard)
+	require.NoError(t, err, "could not create TLS certificate authority in docker volume: %s", c.certVolume)
+
 	var w bytes.Buffer
-	retry.Run(t, func(r *retry.R) {
-		err = utils.DockerExec([]string{"run",
-			"--rm",
-			"-i",
-			"--net=none",
-			"-u", consulUserArg,
-			"-v", c.certVolume + ":/data",
-			"-w", "/data",
-			"--entrypoint", "",
-			c.DockerImage(),
-			"cat", filepath.Join("/data", ConsulCACertPEM),
-		}, &w)
-		require.NoError(r, err, "could not extract TLS CA certificate authority public key from docker volume: %s", c.certVolume)
-	})
+	err = utils.DockerExec([]string{"run",
+		"--rm",
+		"-i",
+		"--net=none",
+		"-u", consulUserArg,
+		"-v", c.certVolume + ":/data",
+		"-w", "/data",
+		"--entrypoint", "",
+		c.DockerImage(),
+		"cat", filepath.Join("/data", ConsulCACertPEM),
+	}, &w)
+	require.NoError(t, err, "could not extract TLS CA certificate authority public key from docker volume: %s", c.certVolume)
 
 	c.caCert = w.String()
 }
 
 func (c *BuildContext) createTLSCertFiles(t *testing.T, dc string) (keyFileName, certFileName string) {
 	require.NotEmpty(t, "the CA has not been initialized yet")
-	retry.Run(t, func(r *retry.R) {
-		err := utils.DockerExec([]string{"run",
+
+	err := utils.DockerExec([]string{"run",
+		"--rm",
+		"-i",
+		"--net=none",
+		"-u", consulUserArg,
+		"-v", c.certVolume + ":/data",
+		"-w", "/data",
+		"--entrypoint", "",
+		c.DockerImage(),
+		"consul", "tls", "cert", "create", "-server", "-dc", dc,
+	}, io.Discard)
+	require.NoError(t, err, "could not create TLS server certificate dc=%q in docker volume: %s", dc, c.certVolume)
+
+	prefix := fmt.Sprintf("%s-server-%s", dc, "consul")
+	certFileName = fmt.Sprintf("%s-%d.pem", prefix, c.tlsCertIndex)
+	keyFileName = fmt.Sprintf("%s-%d-key.pem", prefix, c.tlsCertIndex)
+
+	for _, fn := range []string{certFileName, keyFileName} {
+		err = utils.DockerExec([]string{"run",
 			"--rm",
 			"-i",
 			"--net=none",
 			"-u", consulUserArg,
-			"-v", c.certVolume + ":/data",
+			"-v", c.certVolume + ":/data:ro",
 			"-w", "/data",
 			"--entrypoint", "",
 			c.DockerImage(),
-			"consul", "tls", "cert", "create", "-server", "-dc", dc,
+			"stat", filepath.Join("/data", fn),
 		}, io.Discard)
-		require.NoError(r, err, "could not create TLS server certificate dc=%q in docker volume: %s", dc, c.certVolume)
-	})
-
-	prefix := fmt.Sprintf("%s-server-%s", dc, "consul")
-	certFileName = fmt.Sprintf("%s-%d.pem", prefix, c.tlsCertIndex)
-	keyFileName = fmt.Sprintf("%s-%d-key.pem", prefix, c.tlsCertIndex)
-
-	retry.Run(t, func(r *retry.R) {
-		for _, fn := range []string{certFileName, keyFileName} {
-			err := utils.DockerExec([]string{"run",
-				"--rm",
-				"-i",
-				"--net=none",
-				"-u", consulUserArg,
-				"-v", c.certVolume + ":/data:ro",
-				"-w", "/data",
-				"--entrypoint", "",
-				c.DockerImage(),
-				"stat", filepath.Join("/data", fn),
-			}, io.Discard)
-			require.NoError(r, err, "Generated TLS cert file %q does not exist in volume", fn)
-		}
-	})
+		require.NoError(t, err, "Generated TLS cert file %q does not exist in volume", fn)
+	}
 
 	return keyFileName, certFileName
 }
diff --git a/test/integration/consul-container/libs/cluster/log.go b/test/integration/consul-container/libs/cluster/log.go
index 59e69a64efdaf..721b248808c8a 100644
--- a/test/integration/consul-container/libs/cluster/log.go
+++ b/test/integration/consul-container/libs/cluster/log.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cluster
 
 import (
diff --git a/test/integration/consul-container/libs/cluster/network.go b/test/integration/consul-container/libs/cluster/network.go
index be6f34c77983e..c7db86c189218 100644
--- a/test/integration/consul-container/libs/cluster/network.go
+++ b/test/integration/consul-container/libs/cluster/network.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package cluster
 
 import (
@@ -20,7 +17,6 @@ func createNetwork(t TestingT, name string) (testcontainers.Network, error) {
 			Name:           name,
 			Attachable:     true,
 			CheckDuplicate: true,
-			SkipReaper:     isRYUKDisabled(),
 		},
 	}
 	first := true
diff --git a/test/integration/consul-container/libs/service/assets/Dockerfile-consul-envoy b/test/integration/consul-container/libs/service/assets/Dockerfile-consul-envoy
new file mode 100644
index 0000000000000..72b5802d27bbd
--- /dev/null
+++ b/test/integration/consul-container/libs/service/assets/Dockerfile-consul-envoy
@@ -0,0 +1,8 @@
+# Note these args have to be before the first FROM
+ARG CONSUL_IMAGE
+ARG ENVOY_VERSION
+
+FROM ${CONSUL_IMAGE} as consul
+
+FROM docker.mirror.hashicorp.services/envoyproxy/envoy:v${ENVOY_VERSION}
+COPY --from=consul /bin/consul /bin/consul
diff --git a/test/integration/consul-container/libs/service/common.go b/test/integration/consul-container/libs/service/common.go
index 775113a580278..ef114f58a68a1 100644
--- a/test/integration/consul-container/libs/service/common.go
+++ b/test/integration/consul-container/libs/service/common.go
@@ -1,13 +1,60 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package service
 
 import (
+	"archive/tar"
+	"bytes"
 	_ "embed"
+	"os"
+
+	"github.com/testcontainers/testcontainers-go"
 )
 
 const (
-	envoyLogLevel        = "debug"
-	HashicorpDockerProxy = "docker.mirror.hashicorp.services"
+	envoyEnvKey   = "ENVOY_VERSION"
+	envoyLogLevel = "debug"
+	envoyVersion  = "1.23.1"
+
+	hashicorpDockerProxy = "docker.mirror.hashicorp.services"
 )
+
+//go:embed assets/Dockerfile-consul-envoy
+var consulEnvoyDockerfile string
+
+// getDevContainerDockerfile returns the necessary context to build a combined consul and
+// envoy image for running "consul connect envoy ..."
+func getDevContainerDockerfile() (testcontainers.FromDockerfile, error) {
+	var buf bytes.Buffer
+	tw := tar.NewWriter(&buf)
+
+	dockerfileBytes := []byte(consulEnvoyDockerfile)
+
+	hdr := &tar.Header{
+		Name: "Dockerfile",
+		Mode: 0600,
+		Size: int64(len(dockerfileBytes)),
+	}
+	if err := tw.WriteHeader(hdr); err != nil {
+		return testcontainers.FromDockerfile{}, err
+	}
+
+	if _, err := tw.Write(dockerfileBytes); err != nil {
+		return testcontainers.FromDockerfile{}, err
+	}
+
+	if err := tw.Close(); err != nil {
+		return testcontainers.FromDockerfile{}, err
+	}
+	reader := bytes.NewReader(buf.Bytes())
+	fromDockerfile := testcontainers.FromDockerfile{
+		ContextArchive: reader,
+	}
+
+	return fromDockerfile, nil
+}
+
+func getEnvoyVersion() string {
+	if version, ok := os.LookupEnv(envoyEnvKey); ok && version != "" {
+		return version
+	}
+	return envoyVersion
+}
diff --git a/test/integration/consul-container/libs/service/connect.go b/test/integration/consul-container/libs/service/connect.go
index 4b9998a779c5f..cf8b897162ad3 100644
--- a/test/integration/consul-container/libs/service/connect.go
+++ b/test/integration/consul-container/libs/service/connect.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package service
 
 import (
@@ -10,13 +7,13 @@ import (
 	"io"
 	"path/filepath"
 	"strconv"
-	"strings"
 	"time"
 
-	"github.com/hashicorp/consul/api"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
 
+	"github.com/hashicorp/consul/api"
+
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 )
@@ -160,26 +157,17 @@ func (g ConnectContainer) GetStatus() (string, error) {
 }
 
 type SidecarConfig struct {
-	Name         string
-	ServiceID    string
-	EnableTProxy bool
-	Namespace    string
-	Partition    string
+	Name      string
+	ServiceID string
+	Namespace string
 }
 
 // NewConnectService returns a container that runs envoy sidecar, launched by
 // "consul connect envoy", for service name (serviceName) on the specified
 // node. The container exposes port serviceBindPort and envoy admin port
 // (19000) by mapping them onto host ports. The container's name has a prefix
-// combining datacenter and name. The customContainerConf parameter can be used
-// to mutate the testcontainers.ContainerRequest used to create the sidecar proxy.
-func NewConnectService(
-	ctx context.Context,
-	sidecarCfg SidecarConfig,
-	serviceBindPorts []int,
-	node cluster.Agent,
-	customContainerConf func(request testcontainers.ContainerRequest) testcontainers.ContainerRequest,
-) (*ConnectContainer, error) {
+// combining datacenter and name.
+func NewConnectService(ctx context.Context, sidecarCfg SidecarConfig, serviceBindPorts []int, node cluster.Agent) (*ConnectContainer, error) {
 	nodeConfig := node.GetConfig()
 	if nodeConfig.ScratchDir == "" {
 		return nil, fmt.Errorf("node ScratchDir is required")
@@ -188,50 +176,40 @@ func NewConnectService(
 	namePrefix := fmt.Sprintf("%s-service-connect-%s", node.GetDatacenter(), sidecarCfg.Name)
 	containerName := utils.RandName(namePrefix)
 
+	envoyVersion := getEnvoyVersion()
+	agentConfig := node.GetConfig()
+	buildargs := map[string]*string{
+		"ENVOY_VERSION": utils.StringToPointer(envoyVersion),
+		"CONSUL_IMAGE":  utils.StringToPointer(agentConfig.DockerImage()),
+	}
+
+	dockerfileCtx, err := getDevContainerDockerfile()
+	if err != nil {
+		return nil, err
+	}
+	dockerfileCtx.BuildArgs = buildargs
+
 	internalAdminPort, err := node.ClaimAdminPort()
 	if err != nil {
 		return nil, err
 	}
 
-	fmt.Println("agent image name", nodeConfig.DockerImage())
-	imageVersion := utils.SideCarVersion(nodeConfig.DockerImage())
 	req := testcontainers.ContainerRequest{
-		Image:      fmt.Sprintf("consul-envoy:%s", imageVersion),
-		WaitingFor: wait.ForLog("").WithStartupTimeout(100 * time.Second),
-		AutoRemove: false,
-		Name:       containerName,
+		FromDockerfile: dockerfileCtx,
+		WaitingFor:     wait.ForLog("").WithStartupTimeout(100 * time.Second),
+		AutoRemove:     false,
+		Name:           containerName,
 		Cmd: []string{
 			"consul", "connect", "envoy",
 			"-sidecar-for", sidecarCfg.ServiceID,
 			"-admin-bind", fmt.Sprintf("0.0.0.0:%d", internalAdminPort),
 			"-namespace", sidecarCfg.Namespace,
-			"-partition", sidecarCfg.Partition,
 			"--",
 			"--log-level", envoyLogLevel,
 		},
 		Env: make(map[string]string),
 	}
 
-	if sidecarCfg.EnableTProxy {
-		req.Entrypoint = []string{"/bin/tproxy-startup.sh"}
-		req.Env["REDIRECT_TRAFFIC_ARGS"] = strings.Join(
-			[]string{
-				"-exclude-inbound-port", fmt.Sprint(internalAdminPort),
-				"-exclude-inbound-port", "8300",
-				"-exclude-inbound-port", "8301",
-				"-exclude-inbound-port", "8302",
-				"-exclude-inbound-port", "8500",
-				"-exclude-inbound-port", "8502",
-				"-exclude-inbound-port", "8600",
-				"-consul-dns-ip", "127.0.0.1",
-				"-consul-dns-port", "8600",
-				"-proxy-id", fmt.Sprintf("%s-sidecar-proxy", sidecarCfg.ServiceID),
-			},
-			" ",
-		)
-		req.CapAdd = append(req.CapAdd, "NET_ADMIN")
-	}
-
 	nodeInfo := node.GetInfo()
 	if nodeInfo.UseTLSForAPI || nodeInfo.UseTLSForGRPC {
 		req.Mounts = append(req.Mounts, testcontainers.ContainerMount{
@@ -259,21 +237,6 @@ func NewConnectService(
 		req.Env["CONSUL_GRPC_ADDR"] = fmt.Sprintf("http://127.0.0.1:%d", 8502)
 	}
 
-	if nodeConfig.ACLEnabled {
-		client := node.GetClient()
-		token, _, err := client.ACL().TokenCreate(&api.ACLToken{
-			ServiceIdentities: []*api.ACLServiceIdentity{
-				{ServiceName: sidecarCfg.ServiceID},
-			},
-		}, nil)
-
-		if err != nil {
-			return nil, err
-		}
-
-		req.Env["CONSUL_HTTP_TOKEN"] = token.SecretID
-	}
-
 	var (
 		appPortStrs  []string
 		adminPortStr = strconv.Itoa(internalAdminPort)
@@ -287,11 +250,6 @@ func NewConnectService(
 	exposedPorts := make([]string, len(appPortStrs))
 	copy(exposedPorts, appPortStrs)
 	exposedPorts = append(exposedPorts, adminPortStr)
-
-	if customContainerConf != nil {
-		req = customContainerConf(req)
-	}
-
 	info, err := cluster.LaunchContainerOnNode(ctx, node, req, exposedPorts)
 	if err != nil {
 		return nil, err
diff --git a/test/integration/consul-container/libs/service/examples.go b/test/integration/consul-container/libs/service/examples.go
index bfcaf22b2d5be..6a0dd9af85e46 100644
--- a/test/integration/consul-container/libs/service/examples.go
+++ b/test/integration/consul-container/libs/service/examples.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package service
 
 import (
@@ -15,6 +12,7 @@ import (
 
 	"github.com/hashicorp/consul/api"
 
+	"github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
 	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 )
@@ -119,7 +117,7 @@ func (g exampleContainer) Stop() error {
 }
 
 func (c exampleContainer) Terminate() error {
-	return libcluster.TerminateContainer(c.ctx, c.container, true)
+	return cluster.TerminateContainer(c.ctx, c.container, true)
 }
 
 func (c exampleContainer) GetStatus() (string, error) {
@@ -127,42 +125,6 @@ func (c exampleContainer) GetStatus() (string, error) {
 	return state.Status, err
 }
 
-// NewCustomService creates a new test service from a custom testcontainers.ContainerRequest.
-func NewCustomService(ctx context.Context, name string, httpPort int, grpcPort int, node libcluster.Agent, request testcontainers.ContainerRequest) (Service, error) {
-	namePrefix := fmt.Sprintf("%s-service-example-%s", node.GetDatacenter(), name)
-	containerName := utils.RandName(namePrefix)
-
-	pod := node.GetPod()
-	if pod == nil {
-		return nil, fmt.Errorf("node Pod is required")
-	}
-
-	var (
-		httpPortStr = strconv.Itoa(httpPort)
-		grpcPortStr = strconv.Itoa(grpcPort)
-	)
-
-	request.Name = containerName
-
-	info, err := libcluster.LaunchContainerOnNode(ctx, node, request, []string{httpPortStr, grpcPortStr})
-	if err != nil {
-		return nil, err
-	}
-
-	out := &exampleContainer{
-		ctx:         ctx,
-		container:   info.Container,
-		ip:          info.IP,
-		httpPort:    info.MappedPorts[httpPortStr].Int(),
-		grpcPort:    info.MappedPorts[grpcPortStr].Int(),
-		serviceName: name,
-	}
-
-	fmt.Printf("Custom service exposed http port %d, gRPC port %d\n", out.httpPort, out.grpcPort)
-
-	return out, nil
-}
-
 func NewExampleService(ctx context.Context, name string, httpPort int, grpcPort int, node libcluster.Agent, containerArgs ...string) (Service, error) {
 	namePrefix := fmt.Sprintf("%s-service-example-%s", node.GetDatacenter(), name)
 	containerName := utils.RandName(namePrefix)
@@ -187,15 +149,15 @@ func NewExampleService(ctx context.Context, name string, httpPort int, grpcPort
 	command = append(command, containerArgs...)
 
 	req := testcontainers.ContainerRequest{
-		Image:      HashicorpDockerProxy + "/fortio/fortio",
-		WaitingFor: wait.ForLog("").WithStartupTimeout(60 * time.Second),
+		Image:      hashicorpDockerProxy + "/fortio/fortio",
+		WaitingFor: wait.ForLog("").WithStartupTimeout(100 * time.Second),
 		AutoRemove: false,
 		Name:       containerName,
 		Cmd:        command,
 		Env:        map[string]string{"FORTIO_NAME": name},
 	}
 
-	info, err := libcluster.LaunchContainerOnNode(ctx, node, req, []string{httpPortStr, grpcPortStr})
+	info, err := cluster.LaunchContainerOnNode(ctx, node, req, []string{httpPortStr, grpcPortStr})
 	if err != nil {
 		return nil, err
 	}
diff --git a/test/integration/consul-container/libs/service/gateway.go b/test/integration/consul-container/libs/service/gateway.go
index b468d9ecf1a6a..dd078ba2f7d73 100644
--- a/test/integration/consul-container/libs/service/gateway.go
+++ b/test/integration/consul-container/libs/service/gateway.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package service
 
 import (
@@ -11,10 +8,12 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/hashicorp/consul/api"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
 
+	"github.com/hashicorp/consul/api"
+
+	"github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
 	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 )
@@ -100,7 +99,7 @@ func (g gatewayContainer) Stop() error {
 }
 
 func (c gatewayContainer) Terminate() error {
-	return libcluster.TerminateContainer(c.ctx, c.container, true)
+	return cluster.TerminateContainer(c.ctx, c.container, true)
 }
 
 func (g gatewayContainer) GetAdminAddr() (string, int) {
@@ -144,14 +143,9 @@ type GatewayConfig struct {
 	Name      string
 	Kind      string
 	Namespace string
-	Partition string
 }
 
 func NewGatewayService(ctx context.Context, gwCfg GatewayConfig, node libcluster.Agent, ports ...int) (Service, error) {
-	return NewGatewayServiceReg(ctx, gwCfg, node, true, ports...)
-}
-
-func NewGatewayServiceReg(ctx context.Context, gwCfg GatewayConfig, node libcluster.Agent, doRegister bool, ports ...int) (Service, error) {
 	nodeConfig := node.GetConfig()
 	if nodeConfig.ScratchDir == "" {
 		return nil, fmt.Errorf("node ScratchDir is required")
@@ -160,37 +154,41 @@ func NewGatewayServiceReg(ctx context.Context, gwCfg GatewayConfig, node libclus
 	namePrefix := fmt.Sprintf("%s-service-gateway-%s", node.GetDatacenter(), gwCfg.Name)
 	containerName := utils.RandName(namePrefix)
 
+	envoyVersion := getEnvoyVersion()
 	agentConfig := node.GetConfig()
-	adminPort, err := node.ClaimAdminPort()
+	buildargs := map[string]*string{
+		"ENVOY_VERSION": utils.StringToPointer(envoyVersion),
+		"CONSUL_IMAGE":  utils.StringToPointer(agentConfig.DockerImage()),
+	}
+
+	dockerfileCtx, err := getDevContainerDockerfile()
 	if err != nil {
 		return nil, err
 	}
-	cmd := []string{
-		"consul", "connect", "envoy",
-		fmt.Sprintf("-gateway=%s", gwCfg.Kind),
-		"-service", gwCfg.Name,
-		"-namespace", gwCfg.Namespace,
-		"-partition", gwCfg.Partition,
-		"-address", "{{ GetInterfaceIP \"eth0\" }}:8443",
-		"-admin-bind", fmt.Sprintf("0.0.0.0:%d", adminPort),
-	}
-	if doRegister {
-		cmd = append(cmd, "-register")
-	}
-	cmd = append(cmd, "--")
-	envoyArgs := []string{
-		"--log-level", envoyLogLevel,
+	dockerfileCtx.BuildArgs = buildargs
+
+	adminPort, err := node.ClaimAdminPort()
+	if err != nil {
+		return nil, err
 	}
 
-	fmt.Println("agent image name", agentConfig.DockerImage())
-	imageVersion := utils.SideCarVersion(agentConfig.DockerImage())
 	req := testcontainers.ContainerRequest{
-		Image:      fmt.Sprintf("consul-envoy:%s", imageVersion),
-		WaitingFor: wait.ForLog("").WithStartupTimeout(100 * time.Second),
-		AutoRemove: false,
-		Name:       containerName,
-		Env:        make(map[string]string),
-		Cmd:        append(cmd, envoyArgs...),
+		FromDockerfile: dockerfileCtx,
+		WaitingFor:     wait.ForLog("").WithStartupTimeout(100 * time.Second),
+		AutoRemove:     false,
+		Name:           containerName,
+		Cmd: []string{
+			"consul", "connect", "envoy",
+			fmt.Sprintf("-gateway=%s", gwCfg.Kind),
+			"-register",
+			"-namespace", gwCfg.Namespace,
+			"-service", gwCfg.Name,
+			"-address", "{{ GetInterfaceIP \"eth0\" }}:8443",
+			"-admin-bind", fmt.Sprintf("0.0.0.0:%d", adminPort),
+			"--",
+			"--log-level", envoyLogLevel,
+		},
+		Env: make(map[string]string),
 	}
 
 	nodeInfo := node.GetInfo()
@@ -230,7 +228,7 @@ func NewGatewayServiceReg(ctx context.Context, gwCfg GatewayConfig, node libclus
 		extraPorts = append(extraPorts, strconv.Itoa(port))
 	}
 
-	info, err := libcluster.LaunchContainerOnNode(ctx, node, req, append(
+	info, err := cluster.LaunchContainerOnNode(ctx, node, req, append(
 		extraPorts,
 		portStr,
 		adminPortStr,
diff --git a/test/integration/consul-container/libs/service/helpers.go b/test/integration/consul-container/libs/service/helpers.go
index eb4cb2d19f742..3c678f768aef7 100644
--- a/test/integration/consul-container/libs/service/helpers.go
+++ b/test/integration/consul-container/libs/service/helpers.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package service
 
 import (
@@ -8,10 +5,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/consul/api"
 	"github.com/stretchr/testify/require"
-	"github.com/testcontainers/testcontainers-go"
 
+	"github.com/hashicorp/consul/api"
 	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 )
@@ -28,32 +24,22 @@ type Checks struct {
 }
 
 type SidecarService struct {
-	Port  int
-	Proxy ConnectProxy
-}
-
-type ConnectProxy struct {
-	Mode string
+	Port int
 }
 
 type ServiceOpts struct {
-	Name     string
-	ID       string
-	Meta     map[string]string
-	HTTPPort int
-	GRPCPort int
-	// if true, register GRPC port instead of HTTP (default)
-	RegisterGRPC bool
-	Checks       Checks
-	Connect      SidecarService
-	Namespace    string
-	Partition    string
-	Locality     *api.Locality
-	Upstreams    []api.Upstream
+	Name      string
+	ID        string
+	Meta      map[string]string
+	HTTPPort  int
+	GRPCPort  int
+	Checks    Checks
+	Connect   SidecarService
+	Namespace string
 }
 
 // createAndRegisterStaticServerAndSidecar register the services and launch static-server containers
-func createAndRegisterStaticServerAndSidecar(node libcluster.Agent, httpPort int, grpcPort int, svc *api.AgentServiceRegistration, customContainerCfg func(testcontainers.ContainerRequest) testcontainers.ContainerRequest, containerArgs ...string) (Service, Service, error) {
+func createAndRegisterStaticServerAndSidecar(node libcluster.Agent, grpcPort int, svc *api.AgentServiceRegistration, containerArgs ...string) (Service, Service, error) {
 	// Do some trickery to ensure that partial completion is correctly torn
 	// down, but successful execution is not.
 	var deferClean utils.ResettableDefer
@@ -64,7 +50,7 @@ func createAndRegisterStaticServerAndSidecar(node libcluster.Agent, httpPort int
 	}
 
 	// Create a service and proxy instance
-	serverService, err := NewExampleService(context.Background(), svc.ID, httpPort, grpcPort, node, containerArgs...)
+	serverService, err := NewExampleService(context.Background(), svc.ID, svc.Port, grpcPort, node, containerArgs...)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -75,68 +61,11 @@ func createAndRegisterStaticServerAndSidecar(node libcluster.Agent, httpPort int
 		Name:      fmt.Sprintf("%s-sidecar", svc.ID),
 		ServiceID: svc.ID,
 		Namespace: svc.Namespace,
-		Partition: svc.Partition,
-		EnableTProxy: svc.Connect != nil &&
-			svc.Connect.SidecarService != nil &&
-			svc.Connect.SidecarService.Proxy != nil &&
-			svc.Connect.SidecarService.Proxy.Mode == api.ProxyModeTransparent,
 	}
-	serverConnectProxy, err := NewConnectService(context.Background(), sidecarCfg, []int{svc.Port}, node, customContainerCfg) // bindPort not used
+	serverConnectProxy, err := NewConnectService(context.Background(), sidecarCfg, []int{svc.Port}, node) // bindPort not used
 	if err != nil {
 		return nil, nil, err
 	}
-
-	deferClean.Add(func() {
-		_ = serverConnectProxy.Terminate()
-	})
-
-	// disable cleanup functions now that we have an object with a Terminate() function
-	deferClean.Reset()
-
-	return serverService, serverConnectProxy, nil
-}
-
-// createAndRegisterCustomServiceAndSidecar creates a custom service from the given testcontainers.ContainerRequest
-// and a sidecar proxy for the service. The customContainerCfg parameter is used to mutate the
-// testcontainers.ContainerRequest for the sidecar proxy.
-func createAndRegisterCustomServiceAndSidecar(node libcluster.Agent,
-	httpPort int,
-	grpcPort int,
-	svc *api.AgentServiceRegistration,
-	request testcontainers.ContainerRequest,
-	customContainerCfg func(testcontainers.ContainerRequest) testcontainers.ContainerRequest,
-) (Service, Service, error) {
-	// Do some trickery to ensure that partial completion is correctly torn
-	// down, but successful execution is not.
-	var deferClean utils.ResettableDefer
-	defer deferClean.Execute()
-
-	if err := node.GetClient().Agent().ServiceRegister(svc); err != nil {
-		return nil, nil, err
-	}
-
-	// Create a service and proxy instance
-	serverService, err := NewCustomService(context.Background(), svc.ID, httpPort, grpcPort, node, request)
-	if err != nil {
-		return nil, nil, err
-	}
-	deferClean.Add(func() {
-		_ = serverService.Terminate()
-	})
-	sidecarCfg := SidecarConfig{
-		Name:      fmt.Sprintf("%s-sidecar", svc.ID),
-		ServiceID: svc.ID,
-		Namespace: svc.Namespace,
-		EnableTProxy: svc.Connect != nil &&
-			svc.Connect.SidecarService != nil &&
-			svc.Connect.SidecarService.Proxy != nil &&
-			svc.Connect.SidecarService.Proxy.Mode == api.ProxyModeTransparent,
-	}
-	serverConnectProxy, err := NewConnectService(context.Background(), sidecarCfg, []int{svc.Port}, node, customContainerCfg) // bindPort not used
-	if err != nil {
-		return nil, nil, err
-	}
-
 	deferClean.Add(func() {
 		_ = serverConnectProxy.Terminate()
 	})
@@ -147,88 +76,28 @@ func createAndRegisterCustomServiceAndSidecar(node libcluster.Agent,
 	return serverService, serverConnectProxy, nil
 }
 
-func CreateAndRegisterCustomServiceAndSidecar(node libcluster.Agent,
-	serviceOpts *ServiceOpts,
-	request testcontainers.ContainerRequest,
-	customContainerCfg func(testcontainers.ContainerRequest) testcontainers.ContainerRequest) (Service, Service, error) {
+func CreateAndRegisterStaticServerAndSidecar(node libcluster.Agent, serviceOpts *ServiceOpts, containerArgs ...string) (Service, Service, error) {
 	// Register the static-server service and sidecar first to prevent race with sidecar
 	// trying to get xDS before it's ready
-	p := serviceOpts.HTTPPort
-	agentCheck := api.AgentServiceCheck{
-		Name:     "Static Server Listening",
-		TCP:      fmt.Sprintf("127.0.0.1:%d", p),
-		Interval: "10s",
-		Status:   api.HealthPassing,
-	}
-	if serviceOpts.RegisterGRPC {
-		p = serviceOpts.GRPCPort
-		agentCheck.TCP = ""
-		agentCheck.GRPC = fmt.Sprintf("127.0.0.1:%d", p)
-	}
 	req := &api.AgentServiceRegistration{
 		Name: serviceOpts.Name,
 		ID:   serviceOpts.ID,
-		Port: p,
+		Port: serviceOpts.HTTPPort,
 		Connect: &api.AgentServiceConnect{
 			SidecarService: &api.AgentServiceRegistration{
-				Proxy: &api.AgentServiceConnectProxyConfig{
-					Mode: api.ProxyMode(serviceOpts.Connect.Proxy.Mode),
-				},
+				Proxy: &api.AgentServiceConnectProxyConfig{},
 			},
 		},
 		Namespace: serviceOpts.Namespace,
-		Partition: serviceOpts.Partition,
-		Locality:  serviceOpts.Locality,
-		Meta:      serviceOpts.Meta,
-		Check:     &agentCheck,
-	}
-	return createAndRegisterCustomServiceAndSidecar(node, serviceOpts.HTTPPort, serviceOpts.GRPCPort, req, request, customContainerCfg)
-}
-
-// CreateAndRegisterStaticServerAndSidecarWithCustomContainerConfig creates an example static server and a sidecar for
-// the service. The customContainerCfg parameter is a function of testcontainers.ContainerRequest to
-// testcontainers.ContainerRequest which can be used to mutate the container request for the sidecar proxy and inject
-// custom configuration and lifecycle hooks.
-func CreateAndRegisterStaticServerAndSidecarWithCustomContainerConfig(node libcluster.Agent,
-	serviceOpts *ServiceOpts,
-	customContainerCfg func(testcontainers.ContainerRequest) testcontainers.ContainerRequest,
-	containerArgs ...string) (Service, Service, error) {
-	// Register the static-server service and sidecar first to prevent race with sidecar
-	// trying to get xDS before it's ready
-	p := serviceOpts.HTTPPort
-	agentCheck := api.AgentServiceCheck{
-		Name:     "Static Server Listening",
-		TCP:      fmt.Sprintf("127.0.0.1:%d", p),
-		Interval: "10s",
-		Status:   api.HealthPassing,
-	}
-	if serviceOpts.RegisterGRPC {
-		p = serviceOpts.GRPCPort
-		agentCheck.TCP = ""
-		agentCheck.GRPC = fmt.Sprintf("127.0.0.1:%d", p)
-	}
-	req := &api.AgentServiceRegistration{
-		Name: serviceOpts.Name,
-		ID:   serviceOpts.ID,
-		Port: p,
-		Connect: &api.AgentServiceConnect{
-			SidecarService: &api.AgentServiceRegistration{
-				Proxy: &api.AgentServiceConnectProxyConfig{
-					Mode: api.ProxyMode(serviceOpts.Connect.Proxy.Mode),
-				},
-			},
+		Check: &api.AgentServiceCheck{
+			Name:     "Static Server Listening",
+			TCP:      fmt.Sprintf("127.0.0.1:%d", serviceOpts.HTTPPort),
+			Interval: "10s",
+			Status:   api.HealthPassing,
 		},
-		Namespace: serviceOpts.Namespace,
-		Partition: serviceOpts.Partition,
-		Locality:  serviceOpts.Locality,
-		Meta:      serviceOpts.Meta,
-		Check:     &agentCheck,
+		Meta: serviceOpts.Meta,
 	}
-	return createAndRegisterStaticServerAndSidecar(node, serviceOpts.HTTPPort, serviceOpts.GRPCPort, req, customContainerCfg, containerArgs...)
-}
-
-func CreateAndRegisterStaticServerAndSidecar(node libcluster.Agent, serviceOpts *ServiceOpts, containerArgs ...string) (Service, Service, error) {
-	return CreateAndRegisterStaticServerAndSidecarWithCustomContainerConfig(node, serviceOpts, nil, containerArgs...)
+	return createAndRegisterStaticServerAndSidecar(node, serviceOpts.GRPCPort, req, containerArgs...)
 }
 
 func CreateAndRegisterStaticServerAndSidecarWithChecks(node libcluster.Agent, serviceOpts *ServiceOpts) (Service, Service, error) {
@@ -240,10 +109,8 @@ func CreateAndRegisterStaticServerAndSidecarWithChecks(node libcluster.Agent, se
 		Port: serviceOpts.HTTPPort,
 		Connect: &api.AgentServiceConnect{
 			SidecarService: &api.AgentServiceRegistration{
-				Proxy: &api.AgentServiceConnectProxyConfig{
-					Mode: api.ProxyMode(serviceOpts.Connect.Proxy.Mode),
-				},
-				Port: serviceOpts.Connect.Port,
+				Proxy: &api.AgentServiceConnectProxyConfig{},
+				Port:  serviceOpts.Connect.Port,
 			},
 		},
 		Checks: api.AgentServiceChecks{
@@ -252,48 +119,25 @@ func CreateAndRegisterStaticServerAndSidecarWithChecks(node libcluster.Agent, se
 				TTL:  serviceOpts.Checks.TTL,
 			},
 		},
-		Meta:      serviceOpts.Meta,
-		Namespace: serviceOpts.Namespace,
-		Partition: serviceOpts.Partition,
-		Locality:  serviceOpts.Locality,
+		Meta: serviceOpts.Meta,
 	}
 
-	return createAndRegisterStaticServerAndSidecar(node, serviceOpts.HTTPPort, serviceOpts.GRPCPort, req, nil)
+	return createAndRegisterStaticServerAndSidecar(node, serviceOpts.GRPCPort, req)
 }
 
 func CreateAndRegisterStaticClientSidecar(
 	node libcluster.Agent,
 	peerName string,
 	localMeshGateway bool,
-	enableTProxy bool,
-	serviceOpts *ServiceOpts,
 ) (*ConnectContainer, error) {
 	// Do some trickery to ensure that partial completion is correctly torn
 	// down, but successful execution is not.
 	var deferClean utils.ResettableDefer
 	defer deferClean.Execute()
 
-	var proxy *api.AgentServiceConnectProxyConfig
-	if enableTProxy {
-		proxy = &api.AgentServiceConnectProxyConfig{
-			Mode: "transparent",
-		}
-	} else {
-		mgwMode := api.MeshGatewayModeRemote
-		if localMeshGateway {
-			mgwMode = api.MeshGatewayModeLocal
-		}
-		proxy = &api.AgentServiceConnectProxyConfig{
-			Upstreams: []api.Upstream{{
-				DestinationName:  StaticServerServiceName,
-				DestinationPeer:  peerName,
-				LocalBindAddress: "0.0.0.0",
-				LocalBindPort:    libcluster.ServiceUpstreamLocalBindPort,
-				MeshGateway: api.MeshGatewayConfig{
-					Mode: mgwMode,
-				},
-			}},
-		}
+	mgwMode := api.MeshGatewayModeRemote
+	if localMeshGateway {
+		mgwMode = api.MeshGatewayModeLocal
 	}
 
 	// Register the static-client service and sidecar first to prevent race with sidecar
@@ -303,47 +147,32 @@ func CreateAndRegisterStaticClientSidecar(
 		Port: 8080,
 		Connect: &api.AgentServiceConnect{
 			SidecarService: &api.AgentServiceRegistration{
-				Proxy: proxy,
+				Proxy: &api.AgentServiceConnectProxyConfig{
+					Upstreams: []api.Upstream{{
+						DestinationName:  StaticServerServiceName,
+						DestinationPeer:  peerName,
+						LocalBindAddress: "0.0.0.0",
+						LocalBindPort:    libcluster.ServiceUpstreamLocalBindPort,
+						MeshGateway: api.MeshGatewayConfig{
+							Mode: mgwMode,
+						},
+					}},
+				},
 			},
 		},
 	}
 
-	// Set relevant fields for static client if opts are provided
-	if serviceOpts != nil {
-		if serviceOpts.Connect.Proxy.Mode != "" {
-			return nil, fmt.Errorf("this helper does not support directly setting connect proxy mode; use enableTProxy and/or localMeshGateway instead")
-		}
-		// These options are defaulted above, so only set them as overrides
-		if serviceOpts.Name != "" {
-			req.Name = serviceOpts.Name
-		}
-		if serviceOpts.HTTPPort != 0 {
-			req.Port = serviceOpts.HTTPPort
-		}
-		if serviceOpts.Connect.Port != 0 {
-			req.Connect.SidecarService.Port = serviceOpts.Connect.Port
-		}
-		if len(serviceOpts.Upstreams) > 0 {
-			req.Connect.SidecarService.Proxy.Upstreams = serviceOpts.Upstreams
-		}
-		req.Meta = serviceOpts.Meta
-		req.Namespace = serviceOpts.Namespace
-		req.Partition = serviceOpts.Partition
-		req.Locality = serviceOpts.Locality
-	}
-
 	if err := node.GetClient().Agent().ServiceRegister(req); err != nil {
 		return nil, err
 	}
 
 	// Create a service and proxy instance
 	sidecarCfg := SidecarConfig{
-		Name:         fmt.Sprintf("%s-sidecar", StaticClientServiceName),
-		ServiceID:    StaticClientServiceName,
-		EnableTProxy: enableTProxy,
+		Name:      fmt.Sprintf("%s-sidecar", StaticClientServiceName),
+		ServiceID: StaticClientServiceName,
 	}
 
-	clientConnectProxy, err := NewConnectService(context.Background(), sidecarCfg, []int{libcluster.ServiceUpstreamLocalBindPort}, node, nil)
+	clientConnectProxy, err := NewConnectService(context.Background(), sidecarCfg, []int{libcluster.ServiceUpstreamLocalBindPort}, node)
 	if err != nil {
 		return nil, err
 	}
diff --git a/test/integration/consul-container/libs/service/log.go b/test/integration/consul-container/libs/service/log.go
index 4e64bb7e54bbf..d210f35c8a5bb 100644
--- a/test/integration/consul-container/libs/service/log.go
+++ b/test/integration/consul-container/libs/service/log.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package service
 
 import (
diff --git a/test/integration/consul-container/libs/service/service.go b/test/integration/consul-container/libs/service/service.go
index ca186849728c6..f4efa4f909c46 100644
--- a/test/integration/consul-container/libs/service/service.go
+++ b/test/integration/consul-container/libs/service/service.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package service
 
 import (
diff --git a/test/integration/consul-container/libs/topology/peering_topology.go b/test/integration/consul-container/libs/topology/peering_topology.go
index 74424388b75cf..99a9e1a2c9b06 100644
--- a/test/integration/consul-container/libs/topology/peering_topology.go
+++ b/test/integration/consul-container/libs/topology/peering_topology.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package topology
 
 import (
@@ -43,7 +40,7 @@ type PeeringClusterSize struct {
 //
 //   - an accepting cluster with 3 servers and 1 client agent. The client should be used to
 //     host a service for export: staticServerSvc.
-//   - a dialing cluster with 1 server and 1 client. The client should be used to host a
+//   - an dialing cluster with 1 server and 1 client. The client should be used to host a
 //     service connecting to staticServerSvc.
 //   - Create the peering, export the service from accepting cluster, and verify service
 //     connectivity.
@@ -120,7 +117,7 @@ func BasicPeeringTwoClustersSetup(
 	libassert.PeeringStatus(t, acceptingClient, AcceptingPeerName, api.PeeringStateActive)
 	// libassert.PeeringExports(t, acceptingClient, acceptingPeerName, 1)
 
-	// Register a static-server service in acceptingCluster and export to dialing cluster
+	// Register an static-server service in acceptingCluster and export to dialing cluster
 	var serverService, serverSidecarService libservice.Service
 	{
 		clientNode := acceptingCluster.Clients()[0]
@@ -144,14 +141,14 @@ func BasicPeeringTwoClustersSetup(
 		require.NoError(t, serverService.Export("default", AcceptingPeerName, acceptingClient))
 	}
 
-	// Register a static-client service in dialing cluster and set upstream to static-server service
+	// Register an static-client service in dialing cluster and set upstream to static-server service
 	var clientSidecarService *libservice.ConnectContainer
 	{
 		clientNode := dialingCluster.Clients()[0]
 
 		// Create a service and proxy instance
 		var err error
-		clientSidecarService, err = libservice.CreateAndRegisterStaticClientSidecar(clientNode, DialingPeerName, true, false, nil)
+		clientSidecarService, err = libservice.CreateAndRegisterStaticClientSidecar(clientNode, DialingPeerName, true)
 		require.NoError(t, err)
 
 		libassert.CatalogServiceExists(t, dialingClient, "static-client-sidecar-proxy", nil)
@@ -194,22 +191,13 @@ type ClusterConfig struct {
 	ExposedPorts []int
 }
 
-func NewCluster(
-	t *testing.T,
-	config *ClusterConfig,
-) (*libcluster.Cluster, *libcluster.BuildContext, *api.Client) {
-	return NewClusterWithConfig(t, config, "", "")
-}
-
 // NewCluster creates a cluster with peering enabled. It also creates
 // and registers a mesh-gateway at the client agent. The API client returned is
 // pointed at the client agent.
 // - proxy-defaults.protocol = tcp
-func NewClusterWithConfig(
+func NewCluster(
 	t *testing.T,
 	config *ClusterConfig,
-	serverHclConfig string,
-	clientHclConfig string,
 ) (*libcluster.Cluster, *libcluster.BuildContext, *api.Client) {
 	var (
 		cluster *libcluster.Cluster
@@ -247,20 +235,12 @@ func NewClusterWithConfig(
 		serverConf.Cmd = append(serverConf.Cmd, config.Cmd)
 	}
 
-	if serverHclConfig != "" {
-		serverConf.MutatebyAgentConfig(serverHclConfig)
-	}
-
 	if config.ExposedPorts != nil {
 		cluster, err = libcluster.New(t, []libcluster.Config{*serverConf}, config.ExposedPorts...)
 	} else {
 		cluster, err = libcluster.NewN(t, *serverConf, config.NumServers)
 	}
 	require.NoError(t, err)
-	// builder generates certs for us, so copy them back
-	if opts.InjectAutoEncryption {
-		cluster.CACert = serverConf.CACert
-	}
 
 	var retryJoin []string
 	for i := 0; i < config.NumServers; i++ {
@@ -268,18 +248,12 @@ func NewClusterWithConfig(
 	}
 
 	// Add numClients static clients to register the service
-	configBuilder := libcluster.NewConfigBuilder(ctx).
+	configbuiilder := libcluster.NewConfigBuilder(ctx).
 		Client().
 		Peering(true).
 		RetryJoin(retryJoin...)
-	if cluster.TokenBootstrap != "" {
-		configBuilder.SetACLToken(cluster.TokenBootstrap)
-	}
-	clientConf := configBuilder.ToAgentConfig(t)
+	clientConf := configbuiilder.ToAgentConfig(t)
 	t.Logf("%s client config: \n%s", opts.Datacenter, clientConf.JSON)
-	if clientHclConfig != "" {
-		clientConf.MutatebyAgentConfig(clientHclConfig)
-	}
 
 	require.NoError(t, cluster.AddN(*clientConf, config.NumClients, true))
 
diff --git a/test/integration/consul-container/libs/topology/service_topology.go b/test/integration/consul-container/libs/topology/service_topology.go
index be0af12cf086e..25ef6179ec7b6 100644
--- a/test/integration/consul-container/libs/topology/service_topology.go
+++ b/test/integration/consul-container/libs/topology/service_topology.go
@@ -1,22 +1,17 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package topology
 
 import (
 	"fmt"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/hashicorp/consul/api"
 	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
 	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
 	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
+	"github.com/stretchr/testify/require"
 )
 
-// CreateServices
-func CreateServices(t *testing.T, cluster *libcluster.Cluster, protocol string) (libservice.Service, libservice.Service) {
+func CreateServices(t *testing.T, cluster *libcluster.Cluster) (libservice.Service, libservice.Service) {
 	node := cluster.Agents[0]
 	client := node.GetClient()
 
@@ -24,7 +19,7 @@ func CreateServices(t *testing.T, cluster *libcluster.Cluster, protocol string)
 	serviceDefault := &api.ServiceConfigEntry{
 		Kind:     api.ServiceDefaults,
 		Name:     libservice.StaticServerServiceName,
-		Protocol: protocol,
+		Protocol: "http",
 	}
 
 	ok, _, err := client.ConfigEntries().Set(serviceDefault, nil)
@@ -39,10 +34,6 @@ func CreateServices(t *testing.T, cluster *libcluster.Cluster, protocol string)
 		GRPCPort: 8079,
 	}
 
-	if protocol == "grpc" {
-		serviceOpts.RegisterGRPC = true
-	}
-
 	// Create a service and proxy instance
 	_, serverConnectProxy, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOpts)
 	require.NoError(t, err)
@@ -51,7 +42,7 @@ func CreateServices(t *testing.T, cluster *libcluster.Cluster, protocol string)
 	libassert.CatalogServiceExists(t, client, libservice.StaticServerServiceName, nil)
 
 	// Create a client proxy instance with the server as an upstream
-	clientConnectProxy, err := libservice.CreateAndRegisterStaticClientSidecar(node, "", false, false, nil)
+	clientConnectProxy, err := libservice.CreateAndRegisterStaticClientSidecar(node, "", false)
 	require.NoError(t, err)
 
 	libassert.CatalogServiceExists(t, client, fmt.Sprintf("%s-sidecar-proxy", libservice.StaticClientServiceName), nil)
diff --git a/test/integration/consul-container/libs/utils/debug.go b/test/integration/consul-container/libs/utils/debug.go
index fac44c4e2e002..809d2205f3c2f 100644
--- a/test/integration/consul-container/libs/utils/debug.go
+++ b/test/integration/consul-container/libs/utils/debug.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package utils
 
 import "encoding/json"
diff --git a/test/integration/consul-container/libs/utils/defer.go b/test/integration/consul-container/libs/utils/defer.go
index 85d913c7dba24..a1b011abf730b 100644
--- a/test/integration/consul-container/libs/utils/defer.go
+++ b/test/integration/consul-container/libs/utils/defer.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package utils
 
 // ResettableDefer is a way to capture a series of cleanup functions and
diff --git a/test/integration/consul-container/libs/utils/docker.go b/test/integration/consul-container/libs/utils/docker.go
index b807cf66fae26..da6b4b79a4e4d 100644
--- a/test/integration/consul-container/libs/utils/docker.go
+++ b/test/integration/consul-container/libs/utils/docker.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package utils
 
 import (
@@ -9,9 +6,6 @@ import (
 	"io"
 	"os"
 	"os/exec"
-	"strings"
-
-	"github.com/hashicorp/go-version"
 )
 
 // DockerExec simply shell out to the docker CLI binary on your host.
@@ -19,18 +13,6 @@ func DockerExec(args []string, stdout io.Writer) error {
 	return cmdExec("docker", "docker", args, stdout, "")
 }
 
-// DockerImageVersion retrieves the value of the org.opencontainers.image.version label from the specified image.
-func DockerImageVersion(imageName string) (*version.Version, error) {
-	var b strings.Builder
-	err := cmdExec("docker", "docker", []string{"image", "inspect", "--format", `{{index .Config.Labels "org.opencontainers.image.version"}}`, imageName}, &b, "")
-	if err != nil {
-		return nil, err
-	}
-	output := b.String()
-
-	return version.NewVersion(strings.TrimSpace(output))
-}
-
 func cmdExec(name, binary string, args []string, stdout io.Writer, dir string) error {
 	if binary == "" {
 		panic("binary named " + name + " was not detected")
diff --git a/test/integration/consul-container/libs/utils/helpers.go b/test/integration/consul-container/libs/utils/helpers.go
index 7f08b27b9ffe8..6dace27b27b63 100644
--- a/test/integration/consul-container/libs/utils/helpers.go
+++ b/test/integration/consul-container/libs/utils/helpers.go
@@ -1,18 +1,6 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package utils
 
 import (
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/x509"
-	"encoding/pem"
-	"fmt"
-
-	"github.com/go-jose/go-jose/v3"
-	"github.com/go-jose/go-jose/v3/jwt"
 	"github.com/hashicorp/consul/api"
 )
 
@@ -27,98 +15,3 @@ func ApplyDefaultProxySettings(c *api.Client) (bool, error) {
 	ok, _, err := c.ConfigEntries().Set(req, &api.WriteOptions{})
 	return ok, err
 }
-
-// Generates a private and public key pair that is for signing
-// JWT.
-func GenerateKey() (pub, priv string, err error) {
-	privateKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-
-	if err != nil {
-		return "", "", fmt.Errorf("error generating private key: %w", err)
-	}
-
-	{
-		derBytes, err := x509.MarshalECPrivateKey(privateKey)
-		if err != nil {
-			return "", "", fmt.Errorf("error marshaling private key: %w", err)
-		}
-		priv = string(pem.EncodeToMemory(&pem.Block{
-			Type:  "EC PRIVATE KEY",
-			Bytes: derBytes,
-		}))
-	}
-	{
-		derBytes, err := x509.MarshalPKIXPublicKey(privateKey.Public())
-		if err != nil {
-			return "", "", fmt.Errorf("error marshaling public key: %w", err)
-		}
-		pub = string(pem.EncodeToMemory(&pem.Block{
-			Type:  "PUBLIC KEY",
-			Bytes: derBytes,
-		}))
-	}
-
-	return pub, priv, nil
-}
-
-// SignJWT will bundle the provided claims into a signed JWT. The provided key
-// is assumed to be ECDSA.
-//
-// If no private key is provided, it will generate a private key. These can
-// be retrieved via the SigningKeys() method.
-func SignJWT(privKey string, claims jwt.Claims, privateClaims interface{}) (string, error) {
-	var err error
-	if privKey == "" {
-		_, privKey, err = GenerateKey()
-		if err != nil {
-			return "", err
-		}
-	}
-	var key *ecdsa.PrivateKey
-	block, _ := pem.Decode([]byte(privKey))
-	if block != nil {
-		key, err = x509.ParseECPrivateKey(block.Bytes)
-		if err != nil {
-			return "", err
-		}
-	}
-
-	sig, err := jose.NewSigner(
-		jose.SigningKey{Algorithm: jose.ES256, Key: key},
-		(&jose.SignerOptions{}).WithType("JWT"),
-	)
-	if err != nil {
-		return "", err
-	}
-
-	raw, err := jwt.Signed(sig).
-		Claims(claims).
-		Claims(privateClaims).
-		CompactSerialize()
-	if err != nil {
-		return "", err
-	}
-
-	return raw, nil
-}
-
-// newJWKS converts a pem-encoded public key into JWKS data suitable for a
-// verification endpoint response
-func NewJWKS(pubKey string) (*jose.JSONWebKeySet, error) {
-	block, _ := pem.Decode([]byte(pubKey))
-	if block == nil || block.Type != "PUBLIC KEY" {
-		return nil, fmt.Errorf("unable to decode public key")
-	}
-
-	pub, err := x509.ParsePKIXPublicKey(block.Bytes)
-	if err != nil {
-		return nil, err
-	}
-	return &jose.JSONWebKeySet{
-		Keys: []jose.JSONWebKey{
-			{
-				Key: pub,
-			},
-		},
-	}, nil
-}
diff --git a/test/integration/consul-container/libs/utils/retry.go b/test/integration/consul-container/libs/utils/retry.go
index cfe5ade347cd7..7cb47bac03c30 100644
--- a/test/integration/consul-container/libs/utils/retry.go
+++ b/test/integration/consul-container/libs/utils/retry.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package utils
 
 import (
diff --git a/test/integration/consul-container/libs/utils/tenancy.go b/test/integration/consul-container/libs/utils/tenancy.go
deleted file mode 100644
index 058f9cee0147a..0000000000000
--- a/test/integration/consul-container/libs/utils/tenancy.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package utils
-
-import "github.com/hashicorp/consul/api"
-
-func PartitionOrDefault(name string) string {
-	if name == "" {
-		return "default"
-	}
-	return name
-}
-func NamespaceOrDefault(name string) string {
-	if name == "" {
-		return "default"
-	}
-	return name
-}
-
-func DefaultToEmpty(name string) string {
-	if name == "default" {
-		return ""
-	}
-	return name
-}
-
-// CompatQueryOpts cleans a QueryOptions so that Partition and Namespace fields
-// are compatible with CE or ENT
-// TODO: not sure why we can't do this server-side
-func CompatQueryOpts(opts *api.QueryOptions) *api.QueryOptions {
-	opts.Partition = DefaultToEmpty(opts.Partition)
-	opts.Namespace = DefaultToEmpty(opts.Namespace)
-	return opts
-}
diff --git a/test/integration/consul-container/libs/utils/utils.go b/test/integration/consul-container/libs/utils/utils.go
index b3d8382ed45a7..f105d35cf2166 100644
--- a/test/integration/consul-container/libs/utils/utils.go
+++ b/test/integration/consul-container/libs/utils/utils.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package utils
 
 import (
diff --git a/test/integration/consul-container/libs/utils/version.go b/test/integration/consul-container/libs/utils/version.go
index 24e66a8698145..bcee84191cb9c 100644
--- a/test/integration/consul-container/libs/utils/version.go
+++ b/test/integration/consul-container/libs/utils/version.go
@@ -1,26 +1,20 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package utils
 
 import (
 	"flag"
 	"strings"
 
-	"github.com/hashicorp/consul/testing/deployer/topology"
 	"github.com/hashicorp/go-version"
 )
 
 var (
-	targetImageName string
+	TargetImageName string
 	TargetVersion   string
 
 	LatestImageName string
 	LatestVersion   string
 
-	FollowLog bool
-
-	Debug           bool
+	FollowLog       bool
 	Version_1_14, _ = version.NewVersion("1.14")
 )
 
@@ -31,47 +25,23 @@ const (
 )
 
 func init() {
-	flag.BoolVar(&Debug, "debug", false, "run consul with dlv to enable live debugging")
-	flag.StringVar(&targetImageName, "target-image", defaultImageName, "docker image name to be used under test (Default: "+defaultImageName+")")
+	flag.StringVar(&TargetImageName, "target-image", defaultImageName, "docker image name to be used under test (Default: "+defaultImageName+")")
 	flag.StringVar(&TargetVersion, "target-version", "local", "docker image version to be used as UUT (unit under test)")
 
 	flag.StringVar(&LatestImageName, "latest-image", defaultImageName, "docker image name to be used under test (Default: "+defaultImageName+")")
 	flag.StringVar(&LatestVersion, "latest-version", "latest", "docker image to be used as latest")
 
 	flag.BoolVar(&FollowLog, "follow-log", true, "follow container log in output (Default: true)")
-
 }
 
 func GetTargetImageName() string {
-	if Debug {
-		return targetImageName + "-dbg"
-	}
-	return targetImageName
+	return TargetImageName
 }
 
 func GetLatestImageName() string {
-	if Debug {
-		return LatestImageName + "-dbg"
-	}
 	return LatestImageName
 }
 
-func TargetImages() topology.Images {
-	img := DockerImage(targetImageName, TargetVersion)
-
-	if IsEnterprise() {
-		return topology.Images{
-			ConsulEnterprise: img,
-		}
-	} else {
-		return topology.Images{
-			ConsulCE: img,
-		}
-	}
-}
-
-func IsEnterprise() bool { return isInEnterpriseRepo }
-
 func DockerImage(image, version string) string {
 	v := image + ":" + version
 	if strings.Contains(image, DefaultImageNameENT) && isSemVer(version) {
@@ -85,31 +55,3 @@ func isSemVer(ver string) bool {
 	_, err := version.NewVersion(ver)
 	return err == nil
 }
-
-// ensure version a >= b
-func VersionGTE(a, b string) bool {
-	av := version.Must(version.NewVersion(a))
-	bv := version.Must(version.NewVersion(b))
-	return av.GreaterThanOrEqual(bv)
-}
-
-// ensure version a < b
-func VersionLT(a, b string) bool {
-	av := version.Must(version.NewVersion(a))
-	bv := version.Must(version.NewVersion(b))
-	return av.LessThan(bv)
-}
-
-// SideCarVersion returns version based on the agent
-// version in the test: if agent has local, the sidecar
-// version is target-version; otherwise use "latest-version"
-func SideCarVersion(agentVersion string) string {
-	imageVersion := ""
-	if strings.Contains(agentVersion, "local") {
-		imageVersion = "target-version"
-	} else {
-		imageVersion = "latest-version"
-	}
-
-	return imageVersion
-}
diff --git a/test/integration/consul-container/libs/utils/version_ce.go b/test/integration/consul-container/libs/utils/version_ce.go
index f7f602ade895c..d8f366e1dfc7d 100644
--- a/test/integration/consul-container/libs/utils/version_ce.go
+++ b/test/integration/consul-container/libs/utils/version_ce.go
@@ -1,12 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 //go:build !consulent
+// +build !consulent
 
 package utils
 
 const (
 	defaultImageName   = DefaultImageNameCE
 	ImageVersionSuffix = ""
-	isInEnterpriseRepo = false
 )
diff --git a/test/integration/consul-container/test/basic/connect_service_test.go b/test/integration/consul-container/test/basic/connect_service_test.go
index ee045f1286d38..34c49957d44fb 100644
--- a/test/integration/consul-container/test/basic/connect_service_test.go
+++ b/test/integration/consul-container/test/basic/connect_service_test.go
@@ -1,14 +1,9 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package basic
 
 import (
 	"fmt"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
 	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
@@ -25,7 +20,6 @@ import (
 //   - Make sure a call to the client sidecar local bind port returns a response from the upstream, static-server
 func TestBasicConnectService(t *testing.T) {
 	t.Parallel()
-
 	cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{
 		NumServers:                1,
 		NumClients:                1,
@@ -39,7 +33,7 @@ func TestBasicConnectService(t *testing.T) {
 		},
 	})
 
-	_, clientService := topology.CreateServices(t, cluster, "http")
+	_, clientService := topology.CreateServices(t, cluster)
 	_, port := clientService.GetAddr()
 	_, adminPort := clientService.GetAdminAddr()
 
@@ -50,54 +44,3 @@ func TestBasicConnectService(t *testing.T) {
 	libassert.HTTPServiceEchoes(t, "localhost", port, "")
 	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
 }
-
-func TestConnectGRPCService_WithInputConfig(t *testing.T) {
-	serverHclConfig := `
-datacenter = "dc2"
-data_dir = "/non-existent/conssul-data-dir"
-node_name = "server-1"
-
-bind_addr = "0.0.0.0"
-max_query_time = "800s"
-	`
-
-	clientHclConfig := `
-datacenter = "dc2"
-data_dir = "/non-existent/conssul-data-dir"
-node_name = "client-1"
-
-bind_addr = "0.0.0.0"
-max_query_time = "900s"
-	`
-
-	cluster, _, _ := topology.NewClusterWithConfig(t, &topology.ClusterConfig{
-		NumServers:                1,
-		NumClients:                1,
-		ApplyDefaultProxySettings: true,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:             "dc1",
-			InjectAutoEncryption:   true,
-			InjectGossipEncryption: true,
-			AllowHTTPAnyway:        true,
-		},
-	},
-		serverHclConfig,
-		clientHclConfig,
-	)
-
-	// Verify the provided server config is merged to agent config
-	serverConfig := cluster.Agents[0].GetConfig()
-	require.Contains(t, serverConfig.JSON, "\"max_query_time\":\"800s\"")
-
-	clientConfig := cluster.Agents[1].GetConfig()
-	require.Contains(t, clientConfig.JSON, "\"max_query_time\":\"900s\"")
-
-	_, clientService := topology.CreateServices(t, cluster, "grpc")
-	_, port := clientService.GetAddr()
-	_, adminPort := clientService.GetAdminAddr()
-
-	libassert.AssertUpstreamEndpointStatus(t, adminPort, "static-server.default", "HEALTHY", 1)
-	libassert.GRPCPing(t, fmt.Sprintf("localhost:%d", port))
-
-	// time.Sleep(9999 * time.Second)
-}
diff --git a/test/integration/consul-container/test/catalog/catalog_test.go b/test/integration/consul-container/test/catalog/catalog_test.go
deleted file mode 100644
index b6e821e1f1f7f..0000000000000
--- a/test/integration/consul-container/test/catalog/catalog_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package catalog
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libtopology "github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-
-	"github.com/hashicorp/consul/internal/catalog/catalogtest"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func TestCatalog(t *testing.T) {
-	t.Parallel()
-
-	cluster, _, _ := libtopology.NewCluster(t, &libtopology.ClusterConfig{
-		NumServers: 3,
-		BuildOpts:  &libcluster.BuildOptions{Datacenter: "dc1"},
-		Cmd:        `-hcl=experiments=["resource-apis"]`,
-	})
-
-	followers, err := cluster.Followers()
-	require.NoError(t, err)
-	client := pbresource.NewResourceServiceClient(followers[0].GetGRPCConn())
-
-	t.Run("one-shot", func(t *testing.T) {
-		catalogtest.RunCatalogV1Alpha1IntegrationTest(t, client)
-	})
-
-	t.Run("lifecycle", func(t *testing.T) {
-		catalogtest.RunCatalogV2Beta1LifecycleIntegrationTest(t, client)
-	})
-}
diff --git a/test/integration/consul-container/test/consul_envoy_version/consul_envoy_version.go b/test/integration/consul-container/test/consul_envoy_version/consul_envoy_version.go
index c37dfc8116640..72c4964ffbf4d 100644
--- a/test/integration/consul-container/test/consul_envoy_version/consul_envoy_version.go
+++ b/test/integration/consul-container/test/consul_envoy_version/consul_envoy_version.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MPL-2.0
 
 package main
 
diff --git a/test/integration/consul-container/test/debugging.md b/test/integration/consul-container/test/debugging.md
deleted file mode 100644
index 2957b520ac074..0000000000000
--- a/test/integration/consul-container/test/debugging.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# Remote Debugging Integration Tests
-
-- [Introduction](#introduction)
-	- [How it works](#how-it-works)
-- [Getting Started](#getting-started)
-	- [Prerequisites](#prerequisites)
-	- [Running Upgrade integration tests](#debugging-integration-tests)
-      -  [Building images](#building-images)
-	  -  [Remote debugging using GoLand](#remote-debugging-using-goland)
-
-
-## Introduction
-
-Remote debugging integration tests allows you to attach your debugger to the consul container and debug go code running on that container. 
-
-### How it works
-The `dev-docker-dbg` Make target will build consul docker container that has the following:
-- [delve (dlv) debugger](https://github.com/go-delve/delve) installed.
-- a port exposed on the container that allows a debugger from your development environment to connect and attach to the consul process and debug it remotely.
-- logs out the host and port information so that you have the information needed to connect to the port.
-
-The integration tests have been modified to expose the `--debug` flag that will switch the test from using a `consul:local` image that can be built using `make dev-docker` to using the `consul-dbg:local` image that was built from `make dev-docker-dbg`.
-
-The test is run in debug mode with a breakpoint set to just after the cluster is created and you can retrieve the port information.  From there, you can set up a remote debugging session that connects to this port.
-
-## Getting Started
-### Prerequisites
-To run/debug integration tests locally, the following tools are required on your machine:
-- Install [Go](https://go.dev/) (the version should match that of our CI config's Go image).
-- Install [`Makefile`](https://www.gnu.org/software/make/manual/make.html).
-- Install [`Docker`](https://docs.docker.com/get-docker/) required to run tests locally.
-
-### Debugging integration tests
-#### Building images
-- Build a consul image with dlv installed and a port exposed that the debugger can attach to.
-  ```
-  make dev-docker-dbg
-  ```
-- Build a consul-envoy container image from the consul root directory that is required for testing but not for debugging. 
-  ```
-  docker build -t consul-envoy:target-version --build-arg CONSUL_IMAGE=consul:local --build-arg ENVOY_VERSION=1.24.6 -f ./test/integration/consul-container/assets/Dockerfile-consul-envoy ./test/integration/consul-container/assets
-  ```
-
-#### Remote debugging using GoLand
-(For additional information, see [GoLand's documentation on remote debugging](https://www.jetbrains.com/help/go/attach-to-running-go-processes-with-debugger.html#attach-to-a-process-on-a-remote-machine).)
-##### Set up the Debug Configuration for your test
-- Create the configuration for debugging the test. (You may have to debug the test once so GoLand creates the configuration for you.)
-- Go to `Run > Edit Configurations` and select the appropriate configuration.
-- Add `--debug` to `Program arguments` and click OK.
-
-  <img src="./util/test_debug_configuration.png" alt="isolated" width="550"/>
-##### Obtain the debug port of your container
-(This is required every time a test is debugged.)
-
-- Put a breakpoint in the test that you are running right after the cluster has been created. This should be on the line after the call to `topology.NewCluster()`.
-- Debug the test and wait for the debug session to stop on the breakpoint in the test.
-- In the Debug window, search for `debug info` on the Console tab and note the host and port.
-
-  <img src="./util/test_debug_info.png" alt="isolated" width="550"/>
-- Go to `Run > Edit Configurations` and add a `Go Remote` configuration with the host and port that your test has exposed.  Click OK.
-  
-  <img src="./util/test_debug_remote_configuration.png" alt="isolated" width="550"/>
-- Debug the configuration that you just created.  Verify that it shows as connected in the `Debugger` of this configuration in the `Debug` window.
-  
-  <img src="./util/test_debug_remote_connected.png" alt="isolated" width="550"/>
-##### Debug the consul backend
-- Set an appropriate breakpoint in the backend code of the endpoint that your test will call and that you wish to debug.
-- Go to the test debugging tab for the integration test in the `Debug` window and `Resume Program`.
-  
-  <img src="./util/test_debug_resume_program.png" alt="isolated" width="350"/>
-- The remote debugging session should stop on the breakpoint, and you can freely debug the code path.
-
-  <img src="./util/test_debug_breakpoint_hit.png" alt="isolated" width="550"/>
-
-#### Remote debugging using VSCode
-(For additional information, see [VSCode's documentation on remote debugging](https://github.com/golang/vscode-go/blob/master/docs/debugging.md#remote-debugging).)
-
-[comment]: <> (TODO: Openly looking for someone to add VSCode specific instructions.)
diff --git a/test/integration/consul-container/test/envoy_extensions/ext_authz_test.go b/test/integration/consul-container/test/envoy_extensions/ext_authz_test.go
deleted file mode 100644
index cf00105345fa4..0000000000000
--- a/test/integration/consul-container/test/envoy_extensions/ext_authz_test.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package envoyextensions
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"github.com/testcontainers/testcontainers-go"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-	"github.com/hashicorp/go-cleanhttp"
-)
-
-// TestExtAuthzLocal Summary
-// This test makes sure two services in the same datacenter have connectivity.
-// A simulated client (a direct HTTP call) talks to it's upstream proxy through the mesh.
-// The upstream (static-server) is configured with a `builtin/ext-authz` extension that
-// calls an OPA external authorization service to authorize incoming HTTP requests.
-// The external authorization service is deployed as a container on the local network.
-//
-// Steps:
-// - Create a single agent cluster.
-// - Create the example static-server and sidecar containers, then register them both with Consul
-// - Create an example static-client sidecar, then register both the service and sidecar with Consul
-// - Create an OPA external authorization container on the local network, this doesn't need to be registered with Consul.
-// - Configure the static-server service with a `builtin/ext-authz` EnvoyExtension targeting the OPA ext-authz service.
-// - Make sure a call to the client sidecar local bind port returns the expected response from the upstream static-server:
-//   - A call to `/allow` returns 200 OK.
-//   - A call to any other endpoint returns 403 Forbidden.
-func TestExtAuthzLocal(t *testing.T) {
-	t.Parallel()
-
-	cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{
-		NumServers:                1,
-		NumClients:                1,
-		ApplyDefaultProxySettings: true,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:             "dc1",
-			InjectAutoEncryption:   true,
-			InjectGossipEncryption: true,
-		},
-	})
-
-	createLocalAuthzService(t, cluster)
-
-	clientService := createServices(t, cluster)
-	_, port := clientService.GetAddr()
-	_, adminPort := clientService.GetAdminAddr()
-
-	libassert.AssertUpstreamEndpointStatus(t, adminPort, "static-server.default", "HEALTHY", 1)
-	libassert.GetEnvoyListenerTCPFilters(t, adminPort)
-
-	libassert.AssertContainerState(t, clientService, "running")
-	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
-
-	// Wire up the ext-authz envoy extension for the static-server
-	consul := cluster.APIClient(0)
-	defaults := api.ServiceConfigEntry{
-		Kind:     api.ServiceDefaults,
-		Name:     "static-server",
-		Protocol: "http",
-		EnvoyExtensions: []api.EnvoyExtension{{
-			Name: "builtin/ext-authz",
-			Arguments: map[string]any{
-				"Config": map[string]any{
-					"GrpcService": map[string]any{
-						"Target": map[string]any{"URI": "127.0.0.1:9191"},
-					},
-				},
-			},
-		}},
-	}
-	consul.ConfigEntries().Set(&defaults, nil)
-
-	// Make requests to the static-server. We expect that all requests are rejected with 403 Forbidden
-	// unless they are to the /allow path.
-	baseURL := fmt.Sprintf("http://localhost:%d", port)
-	doRequest(t, baseURL, http.StatusForbidden)
-	doRequest(t, baseURL+"/allow", http.StatusOK)
-}
-
-func createServices(t *testing.T, cluster *libcluster.Cluster) libservice.Service {
-	node := cluster.Agents[0]
-	client := node.GetClient()
-	// Create a service and proxy instance
-	serviceOpts := &libservice.ServiceOpts{
-		Name:     libservice.StaticServerServiceName,
-		ID:       "static-server",
-		HTTPPort: 8080,
-		GRPCPort: 8079,
-	}
-
-	// Create a service and proxy instance
-	_, _, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOpts)
-	require.NoError(t, err)
-
-	libassert.CatalogServiceExists(t, client, "static-server-sidecar-proxy", nil)
-	libassert.CatalogServiceExists(t, client, libservice.StaticServerServiceName, nil)
-
-	// Create a client proxy instance with the server as an upstream
-	clientConnectProxy, err := libservice.CreateAndRegisterStaticClientSidecar(node, "", false, false, nil)
-	require.NoError(t, err)
-
-	libassert.CatalogServiceExists(t, client, "static-client-sidecar-proxy", nil)
-
-	return clientConnectProxy
-}
-
-func createLocalAuthzService(t *testing.T, cluster *libcluster.Cluster) {
-	node := cluster.Agents[0]
-
-	cwd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	req := testcontainers.ContainerRequest{
-		Image:      "openpolicyagent/opa:0.53.0-envoy-3",
-		AutoRemove: true,
-		Name:       "ext-authz",
-		Env:        make(map[string]string),
-		Cmd: []string{
-			"run",
-			"--server",
-			"--addr=localhost:8181",
-			"--diagnostic-addr=0.0.0.0:8282",
-			"--set=plugins.envoy_ext_authz_grpc.addr=:9191",
-			"--set=plugins.envoy_ext_authz_grpc.path=envoy/authz/allow",
-			"--set=decision_logs.console=true",
-			"--set=status.console=true",
-			"--ignore=.*",
-			"/testdata/policies/policy.rego",
-		},
-		Mounts: []testcontainers.ContainerMount{{
-			Source: testcontainers.DockerBindMountSource{
-				HostPath: fmt.Sprintf("%s/testdata", cwd),
-			},
-			Target:   "/testdata",
-			ReadOnly: true,
-		}},
-	}
-
-	ctx := context.Background()
-
-	exposedPorts := []string{}
-	_, err = libcluster.LaunchContainerOnNode(ctx, node, req, exposedPorts)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func doRequest(t *testing.T, url string, expStatus int) {
-	retry.RunWith(&retry.Timer{Timeout: 5 * time.Second, Wait: time.Second}, t, func(r *retry.R) {
-		resp, err := cleanhttp.DefaultClient().Get(url)
-		require.NoError(r, err)
-		require.Equal(r, expStatus, resp.StatusCode)
-	})
-}
diff --git a/test/integration/consul-container/test/envoy_extensions/otel_access_logging_test.go b/test/integration/consul-container/test/envoy_extensions/otel_access_logging_test.go
deleted file mode 100644
index 87bb7b4d6165f..0000000000000
--- a/test/integration/consul-container/test/envoy_extensions/otel_access_logging_test.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package envoyextensions
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"github.com/testcontainers/testcontainers-go"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-)
-
-// TestOTELAccessLogging Summary
-// This verifies that the OpenTelemetry access logging Envoy extension works as expected.
-// A simulated client (a direct HTTP call) talks to its upstream proxy through the mesh.
-// The upstream (static-server) is configured with a `builtin/otel-access-logging` extension that
-// sends Envoy access logs to an OpenTelemetry collector for incoming HTTP requests.
-// The OpenTelemetry collector is deployed as a container named `otel-collector` on the local network,
-// and configured to write Envoy access logs to its stdout log stream.
-//
-// Steps:
-//   - Create a single agent cluster.
-//   - Create the example static-server and sidecar containers, then register them both with Consul
-//   - Create an example static-client sidecar, then register both the service and sidecar with Consul
-//   - Create an OpenTelemetry collector container on the local network, this doesn't need to be registered with Consul.
-//   - Configure the static-server service with a `builtin/otel-access-logging` EnvoyExtension targeting the
-//     otel-collector service.
-//   - Make sure a call to the client sidecar local bind port results in Envoy access logs being sent to the
-//     otel-collector.
-func TestOTELAccessLogging(t *testing.T) {
-	t.Parallel()
-
-	cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{
-		NumServers:                1,
-		NumClients:                1,
-		ApplyDefaultProxySettings: true,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:             "dc1",
-			InjectAutoEncryption:   true,
-			InjectGossipEncryption: true,
-		},
-	})
-
-	launchInfo := createLocalOTELService(t, cluster)
-
-	clientService := createServices(t, cluster)
-	_, port := clientService.GetAddr()
-	_, adminPort := clientService.GetAdminAddr()
-
-	libassert.AssertUpstreamEndpointStatus(t, adminPort, "static-server.default", "HEALTHY", 1)
-	libassert.GetEnvoyListenerTCPFilters(t, adminPort)
-
-	libassert.AssertContainerState(t, clientService, "running")
-	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
-
-	// Apply the OpenTelemetry Access Logging Envoy extension to the static-server
-	consul := cluster.APIClient(0)
-	defaults := api.ServiceConfigEntry{
-		Kind:     api.ServiceDefaults,
-		Name:     "static-server",
-		Protocol: "http",
-		EnvoyExtensions: []api.EnvoyExtension{{
-			Name: "builtin/otel-access-logging",
-			Arguments: map[string]any{
-				"Config": map[string]any{
-					"LogName": "otel-integration-test",
-					"GrpcService": map[string]any{
-						"Target": map[string]any{"URI": "127.0.0.1:4317"},
-					},
-				},
-			},
-		}},
-	}
-	consul.ConfigEntries().Set(&defaults, nil)
-
-	// Make requests from the static-client to the static-server and look for the access logs
-	// to show up in the `otel-collector` container logs.
-	retry.RunWith(&retry.Timer{Timeout: 60 * time.Second, Wait: time.Second}, t, func(r *retry.R) {
-		doRequest(t, fmt.Sprintf("http://localhost:%d", port), http.StatusOK)
-		reader, err := launchInfo.Container.Logs(context.Background())
-		require.NoError(r, err)
-		log, err := io.ReadAll(reader)
-		require.NoError(r, err)
-		require.Contains(r, string(log), `log_name: Str(otel-integration-test)`)
-		require.Contains(r, string(log), `cluster_name: Str(static-server)`)
-		require.Contains(r, string(log), `node_name: Str(static-server-sidecar-proxy)`)
-	})
-}
-
-func createLocalOTELService(t *testing.T, cluster *libcluster.Cluster) *libcluster.LaunchInfo {
-	node := cluster.Agents[0]
-
-	cwd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	req := testcontainers.ContainerRequest{
-		Image:      "otel/opentelemetry-collector@sha256:7df7482ca6f2f3523cd389ac62c2851a652c67ac3b25fc67cd9248966aa706c1",
-		AutoRemove: true,
-		Name:       "otel-collector",
-		Env:        make(map[string]string),
-		Cmd:        []string{"--config", "/testdata/otel/config.yaml"},
-		Mounts: []testcontainers.ContainerMount{{
-			Source: testcontainers.DockerBindMountSource{
-				HostPath: fmt.Sprintf("%s/testdata", cwd),
-			},
-			Target:   "/testdata",
-			ReadOnly: true,
-		}},
-	}
-
-	ctx := context.Background()
-
-	exposedPorts := []string{}
-	li, err := libcluster.LaunchContainerOnNode(ctx, node, req, exposedPorts)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return li
-}
diff --git a/test/integration/consul-container/test/envoy_extensions/testdata/otel/config.yaml b/test/integration/consul-container/test/envoy_extensions/testdata/otel/config.yaml
deleted file mode 100644
index ae2ba85f4fe73..0000000000000
--- a/test/integration/consul-container/test/envoy_extensions/testdata/otel/config.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-receivers:
-  otlp:
-    protocols:
-      grpc:
-      http:
-
-processors:
-  batch:
-
-exporters:
-  logging:
-    verbosity: Detailed
-
-service:
-  pipelines:
-    traces:
-      receivers: [otlp]
-      processors: [batch]
-      exporters: [logging]
-    metrics:
-      receivers: [otlp]
-      processors: [batch]
-      exporters: [logging]
-    logs:
-      receivers: [otlp]
-      processors: [batch]
-      exporters: [logging]
diff --git a/test/integration/consul-container/test/envoy_extensions/testdata/policies/policy.rego b/test/integration/consul-container/test/envoy_extensions/testdata/policies/policy.rego
deleted file mode 100644
index 2e5ead6cd29af..0000000000000
--- a/test/integration/consul-container/test/envoy_extensions/testdata/policies/policy.rego
+++ /dev/null
@@ -1,12 +0,0 @@
-package envoy.authz
-
-import future.keywords
-
-import input.attributes.request.http as http_request
-
-default allow := false
-
-allow if {
-	http_request.method == "GET"
-	glob.match("/allow", ["/"], http_request.path)
-}
diff --git a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/Dockerfile b/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/Dockerfile
deleted file mode 100644
index 31e2dd93d0428..0000000000000
--- a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-FROM tinygo/tinygo:sha-598cb1e4ddce53d85600a1b7724ed39eea80e119
-COPY ./build.sh /
-ENTRYPOINT ["/build.sh"]
diff --git a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/README.md b/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/README.md
deleted file mode 100644
index 173e27bf3709e..0000000000000
--- a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Building WASM test files
-
-We have seen some issues with building the wasm test files on the build runners for the integration test. Currently,
-the theory is that there may be some differences in the clang toolchain on different runners which cause panics in
-tinygo if the job is scheduled on particular runners but not others.
-
-In order to get around this, we are just building the wasm test file and checking it into the repo.
-
-To build the wasm test file, 
-
-```bash
-~/consul/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files
-> docker run -v ./:/wasm --rm $(docker build -q .)
-```
\ No newline at end of file
diff --git a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/build.sh b/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/build.sh
deleted file mode 100755
index 6affddf298eb1..0000000000000
--- a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/build.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-cd /wasm
-tinygo build -o /wasm/wasm_add_header.wasm -scheduler=none -target=wasi /wasm/wasm_add_header.go
\ No newline at end of file
diff --git a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/go.mod b/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/go.mod
deleted file mode 100644
index 703b71414fae0..0000000000000
--- a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/go.mod
+++ /dev/null
@@ -1,5 +0,0 @@
-module main
-
-go 1.20
-
-require github.com/tetratelabs/proxy-wasm-go-sdk v0.21.0
diff --git a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/go.sum b/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/go.sum
deleted file mode 100644
index e09133fbccbf5..0000000000000
--- a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/go.sum
+++ /dev/null
@@ -1,6 +0,0 @@
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
-github.com/tetratelabs/proxy-wasm-go-sdk v0.21.0 h1:sxuh1wxy/zz4vXwMEC+ESVpwJmej1f22eYsrJlgVn7c=
-github.com/tetratelabs/proxy-wasm-go-sdk v0.21.0/go.mod h1:jqQTUvJBI6WJ+sVCZON3A4GwmUfBDuiNnZ4kuxsvLCo=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/nginx.conf b/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/nginx.conf
deleted file mode 100644
index 06533f75ac1a7..0000000000000
--- a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/nginx.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-server {
-    # send wasm files as download rather than render as html
-    location ~ ^.*/(?P<request_basename>[^/]+\.(wasm))$  {
-        root /www/downloads;
-
-       add_header Content-disposition 'attachment; filename="$request_basename"';
-       types {
-        application/octet-stream .wasm;
-       }
-       default_type application/octet-stream;
-    }
-}
-
diff --git a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/wasm_add_header.go b/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/wasm_add_header.go
deleted file mode 100644
index 91aeae6956764..0000000000000
--- a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/wasm_add_header.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package main
-
-import (
-	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm"
-	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm/types"
-)
-
-func main() {
-	proxywasm.SetVMContext(&vmContext{})
-}
-
-type vmContext struct {
-	// Embed the default VM context here,
-	// so that we don't need to reimplement all the methods.
-	types.DefaultVMContext
-}
-
-func (*vmContext) NewPluginContext(contextID uint32) types.PluginContext {
-	return &pluginContext{}
-}
-
-type pluginContext struct {
-	// Embed the default plugin context here,
-	// so that we don't need to reimplement all the methods.
-	types.DefaultPluginContext
-}
-
-func (p *pluginContext) NewHttpContext(contextID uint32) types.HttpContext {
-	return &httpHeaders{}
-}
-
-type httpHeaders struct {
-	// Embed the default http context here,
-	// so that we don't need to reimplement all the methods.
-	types.DefaultHttpContext
-}
-
-func (ctx *httpHeaders) OnHttpResponseHeaders(int, bool) types.Action {
-	proxywasm.LogDebug("adding header: x-test:true")
-
-	err := proxywasm.AddHttpResponseHeader("x-test", "true")
-	if err != nil {
-		proxywasm.LogCriticalf("failed to add test header to response: %v", err)
-	}
-
-	return types.ActionContinue
-}
diff --git a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/wasm_add_header.wasm b/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/wasm_add_header.wasm
deleted file mode 100755
index 520e7e144ada5..0000000000000
Binary files a/test/integration/consul-container/test/envoy_extensions/testdata/wasm_test_files/wasm_add_header.wasm and /dev/null differ
diff --git a/test/integration/consul-container/test/envoy_extensions/wasm_test.go b/test/integration/consul-container/test/envoy_extensions/wasm_test.go
deleted file mode 100644
index ae5cf3b3d5b76..0000000000000
--- a/test/integration/consul-container/test/envoy_extensions/wasm_test.go
+++ /dev/null
@@ -1,464 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package envoyextensions
-
-import (
-	"context"
-	"crypto/sha256"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/go-cleanhttp"
-	"github.com/stretchr/testify/require"
-	"github.com/testcontainers/testcontainers-go"
-	"github.com/testcontainers/testcontainers-go/wait"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-)
-
-// TestWASMRemote Summary
-// This test ensures that a WASM extension can be loaded from a remote file server then executed.
-// It uses the same basic WASM extension as the TestWASMLocal test which adds the header
-// "x-test:true" to the response.
-// This test configures a static server and proxy, a client proxy, as well as an Nginx file server to
-// serve the compiled wasm extension. The static proxy is configured to apply the wasm filter
-// and pointed at the remote file server. When the filter is added with the remote wasm file configured
-// envoy calls out to the nginx file server to download it.
-func TestWASMRemote(t *testing.T) {
-	t.Parallel()
-
-	// build all the file paths we will need for the test
-	cwd, err := os.Getwd()
-	require.NoError(t, err, "could not get current working directory")
-	hostWASMDir := fmt.Sprintf("%s/testdata/wasm_test_files", cwd)
-
-	cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{
-		NumServers:                1,
-		NumClients:                1,
-		ApplyDefaultProxySettings: true,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:             "dc1",
-			InjectAutoEncryption:   true,
-			InjectGossipEncryption: true,
-		},
-	})
-
-	clientService, staticProxy := createTestServices(t, cluster)
-	_, port := clientService.GetAddr()
-	_, adminPort := clientService.GetAdminAddr()
-
-	libassert.AssertUpstreamEndpointStatus(t, adminPort, "static-server.default", "HEALTHY", 1)
-	libassert.GetEnvoyListenerTCPFilters(t, adminPort)
-
-	libassert.AssertContainerState(t, clientService, "running")
-	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
-
-	// Check header not present
-	c1 := cleanhttp.DefaultClient()
-	res, err := c1.Get(fmt.Sprintf("http://localhost:%d", port))
-	require.NoError(t, err)
-
-	// check that header DOES NOT exist before wasm applied
-	if value := res.Header.Get(http.CanonicalHeaderKey("x-test")); value != "" {
-		t.Fatal("unexpected test header present before WASM applied")
-	}
-
-	// Create Nginx file server
-	uri, nginxService, nginxProxy := createNginxFileServer(t, cluster,
-		// conf file
-		testcontainers.ContainerFile{
-			HostFilePath:      fmt.Sprintf("%s/nginx.conf", hostWASMDir),
-			ContainerFilePath: "/etc/nginx/conf.d/wasm.conf",
-			FileMode:          777,
-		},
-		// extra files loaded after startup
-		testcontainers.ContainerFile{
-			HostFilePath:      fmt.Sprintf("%s/wasm_add_header.wasm", hostWASMDir),
-			ContainerFilePath: "/usr/share/nginx/html/wasm_add_header.wasm",
-			FileMode:          777,
-		})
-
-	defer nginxService.Terminate()
-	defer nginxProxy.Terminate()
-
-	// wire up the wasm filter
-	node := cluster.Agents[0]
-	client := node.GetClient()
-
-	agentService, _, err := client.Agent().Service(libservice.StaticServerServiceName, nil)
-	require.NoError(t, err)
-
-	agentService.Connect = &api.AgentServiceConnect{
-		SidecarService: &api.AgentServiceRegistration{
-			Kind: api.ServiceKindConnectProxy,
-			Proxy: &api.AgentServiceConnectProxyConfig{
-				Upstreams: []api.Upstream{
-					{
-						DestinationName:  "nginx-fileserver",
-						DestinationPeer:  "",
-						LocalBindAddress: "0.0.0.0",
-						LocalBindPort:    9595,
-					},
-				},
-			},
-		},
-	}
-
-	// Upsert the service registration to add the nginx file server as an
-	// upstream so that the static server proxy can retrieve the wasm plugin.
-	err = client.Agent().ServiceRegister(&api.AgentServiceRegistration{
-		Kind:              agentService.Kind,
-		ID:                agentService.ID,
-		Name:              agentService.Service,
-		Tags:              agentService.Tags,
-		Port:              agentService.Port,
-		Address:           agentService.Address,
-		SocketPath:        agentService.SocketPath,
-		TaggedAddresses:   agentService.TaggedAddresses,
-		EnableTagOverride: agentService.EnableTagOverride,
-		Meta:              agentService.Meta,
-		Weights:           &agentService.Weights,
-		Check:             nil,
-		Checks:            nil,
-		Proxy:             agentService.Proxy,
-		Connect:           agentService.Connect,
-		Namespace:         agentService.Namespace,
-		Partition:         agentService.Partition,
-		Locality:          agentService.Locality,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// wait until the nginx-fileserver is reachable from the static proxy
-	t.Log("Attempting wait until nginx-fileserver-sidecar-proxy is available")
-	bashScript := "for i in {1..10}; do echo Attempt $1: contacting nginx; if curl -I localhost:9595; then break; fi;" +
-		"if [[ $i -ge 10 ]]; then echo Unable to connect to nginx; exit 1; fi; sleep 3; done; echo nginx available"
-	_, err = staticProxy.Exec(context.Background(), []string{"/bin/bash", "-c", bashScript})
-	require.NoError(t, err)
-
-	consul := cluster.APIClient(0)
-	defaults := api.ServiceConfigEntry{
-		Kind:     api.ServiceDefaults,
-		Name:     "static-server",
-		Protocol: "http",
-		EnvoyExtensions: []api.EnvoyExtension{{
-			Name: "builtin/wasm",
-			Arguments: map[string]any{
-				"Protocol":     "http",
-				"ListenerType": "inbound",
-				"PluginConfig": map[string]any{
-					"VmConfig": map[string]any{
-						"Code": map[string]any{
-							"Remote": map[string]any{
-								"HttpURI": map[string]any{
-									"Service": map[string]any{
-										"Name": "nginx-fileserver",
-									},
-									"URI": fmt.Sprintf("%s/wasm_add_header.wasm", uri),
-								},
-								"SHA256": sha256FromFile(t, fmt.Sprintf("%s/wasm_add_header.wasm", hostWASMDir)),
-							},
-						},
-					},
-				},
-			},
-		}},
-	}
-
-	_, _, err = consul.ConfigEntries().Set(&defaults, nil)
-	require.NoError(t, err, "could not set config entries")
-
-	// Check that header is present after wasm applied
-	c2 := cleanhttp.DefaultClient()
-
-	// The wasm plugin is not always applied on the first call. Retry and see if it is loaded.
-	retryStrategy := func() *retry.Timer {
-		return &retry.Timer{Timeout: 5 * time.Second, Wait: time.Second}
-	}
-	retry.RunWith(retryStrategy(), t, func(r *retry.R) {
-		res2, err := c2.Get(fmt.Sprintf("http://localhost:%d", port))
-		require.NoError(r, err)
-
-		if value := res2.Header.Get(http.CanonicalHeaderKey("x-test")); value == "" {
-			r.Fatal("test header missing after WASM applied")
-		}
-	})
-}
-
-// TestWASMLocal Summary
-// This test ensures that a WASM extension with basic functionality is executed correctly.
-// The extension takes an incoming request and adds the header "x-test:true"
-func TestWASMLocal(t *testing.T) {
-	t.Parallel()
-
-	cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{
-		NumServers:                1,
-		NumClients:                1,
-		ApplyDefaultProxySettings: true,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:             "dc1",
-			InjectAutoEncryption:   true,
-			InjectGossipEncryption: true,
-		},
-	})
-
-	clientService, _ := createTestServices(t, cluster)
-	_, port := clientService.GetAddr()
-	_, adminPort := clientService.GetAdminAddr()
-
-	libassert.AssertUpstreamEndpointStatus(t, adminPort, "static-server.default", "HEALTHY", 1)
-	libassert.GetEnvoyListenerTCPFilters(t, adminPort)
-
-	libassert.AssertContainerState(t, clientService, "running")
-	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
-
-	// Check header not present
-	c1 := cleanhttp.DefaultClient()
-	res, err := c1.Get(fmt.Sprintf("http://localhost:%d", port))
-	require.NoError(t, err)
-
-	// check that header DOES NOT exist before wasm applied
-	if value := res.Header.Get(http.CanonicalHeaderKey("x-test")); value != "" {
-		t.Fatal("unexpected test header present before WASM applied")
-	}
-
-	// wire up the wasm filter
-	consul := cluster.APIClient(0)
-	defaults := api.ServiceConfigEntry{
-		Kind:     api.ServiceDefaults,
-		Name:     "static-server",
-		Protocol: "http",
-		EnvoyExtensions: []api.EnvoyExtension{{
-			Name: "builtin/wasm",
-			Arguments: map[string]any{
-				"Protocol":     "http",
-				"ListenerType": "inbound",
-				"PluginConfig": map[string]any{
-					"VmConfig": map[string]any{
-						"Code": map[string]any{
-							"Local": map[string]any{
-								"Filename": "/wasm_add_header.wasm",
-							},
-						},
-					},
-				},
-			},
-		}},
-	}
-
-	_, _, err = consul.ConfigEntries().Set(&defaults, nil)
-	require.NoError(t, err, "could not set config entries")
-
-	// Check that header is present after wasm applied
-	c2 := cleanhttp.DefaultClient()
-
-	// The wasm plugin is not always applied on the first call. Retry and see if it is loaded.
-	retryStrategy := func() *retry.Timer {
-		return &retry.Timer{Timeout: 5 * time.Second, Wait: time.Second}
-	}
-	retry.RunWith(retryStrategy(), t, func(r *retry.R) {
-		res2, err := c2.Get(fmt.Sprintf("http://localhost:%d", port))
-		require.NoError(r, err)
-
-		if value := res2.Header.Get(http.CanonicalHeaderKey("x-test")); value == "" {
-			r.Fatal("test header missing after WASM applied")
-		}
-	})
-}
-
-func createTestServices(t *testing.T, cluster *libcluster.Cluster) (libservice.Service, libservice.Service) {
-	node := cluster.Agents[0]
-	client := node.GetClient()
-	// Create a service and proxy instance
-	serviceOpts := &libservice.ServiceOpts{
-		Name:     libservice.StaticServerServiceName,
-		ID:       libservice.StaticServerServiceName,
-		HTTPPort: 8080,
-		GRPCPort: 8079,
-	}
-	cwd, err := os.Getwd()
-	require.NoError(t, err, "could not get current working directory")
-	hostWASMDir := fmt.Sprintf("%s/testdata/wasm_test_files", cwd)
-
-	wasmFile := testcontainers.ContainerFile{
-		HostFilePath:      fmt.Sprintf("%s/wasm_add_header.wasm", hostWASMDir),
-		ContainerFilePath: "/wasm_add_header.wasm",
-		FileMode:          777,
-	}
-
-	customFn := chain(
-		copyFilesToContainer([]testcontainers.ContainerFile{wasmFile}),
-		chownFiles([]testcontainers.ContainerFile{wasmFile}, "envoy", true),
-	)
-
-	// Create a service and proxy instance
-	_, staticProxy, err := libservice.CreateAndRegisterStaticServerAndSidecarWithCustomContainerConfig(node, serviceOpts, customFn)
-	require.NoError(t, err)
-
-	libassert.CatalogServiceExists(t, client, "static-server-sidecar-proxy", nil)
-	libassert.CatalogServiceExists(t, client, libservice.StaticServerServiceName, nil)
-
-	// Create a client proxy instance with the server as an upstream
-
-	clientConnectProxy, err := libservice.CreateAndRegisterStaticClientSidecar(node, "", false, false, nil)
-	require.NoError(t, err)
-
-	libassert.CatalogServiceExists(t, client, "static-client-sidecar-proxy", nil)
-
-	return clientConnectProxy, staticProxy
-}
-
-// createNginxFileServer creates an nginx container configured to serve a wasm file for download, as well as a sidecar
-// registered for the service.
-func createNginxFileServer(t *testing.T,
-	cluster *libcluster.Cluster,
-	conf testcontainers.ContainerFile,
-	files ...testcontainers.ContainerFile) (string, libservice.Service, libservice.Service) {
-
-	nginxName := "nginx-fileserver"
-	nginxPort := 80
-	svc := &libservice.ServiceOpts{
-		Name:     nginxName,
-		ID:       nginxName,
-		HTTPPort: nginxPort,
-		GRPCPort: 9999,
-	}
-
-	node := cluster.Agents[0]
-
-	req := testcontainers.ContainerRequest{
-		// nginx:stable
-		Image:      "nginx@sha256:b07a5ab5292bd90c4271a55a44761899cc1b14814172cf7f186e3afb8bdbec28",
-		Name:       nginxName,
-		WaitingFor: wait.ForLog("").WithStartupTimeout(time.Second * 30),
-		LifecycleHooks: []testcontainers.ContainerLifecycleHooks{
-			{
-				PostStarts: []testcontainers.ContainerHook{
-					func(ctx context.Context, c testcontainers.Container) error {
-						_, _, err := c.Exec(ctx, []string{"mkdir", "-p", "/www/downloads"})
-						if err != nil {
-							return err
-						}
-
-						for _, f := range files {
-							fBytes, err := os.ReadFile(f.HostFilePath)
-							if err != nil {
-								return err
-							}
-							err = c.CopyToContainer(ctx, fBytes, f.ContainerFilePath, f.FileMode)
-							if err != nil {
-								return err
-							}
-
-							_, _, err = c.Exec(ctx, []string{"chmod", "+r", f.ContainerFilePath})
-							if err != nil {
-								return err
-							}
-						}
-
-						return err
-					},
-				},
-			},
-		},
-		Files: []testcontainers.ContainerFile{conf},
-	}
-
-	nginxService, nginxProxy, err := libservice.CreateAndRegisterCustomServiceAndSidecar(node, svc, req, nil)
-	require.NoError(t, err, "could not create custom server and sidecar")
-
-	_, port := nginxService.GetAddr()
-
-	client := node.GetClient()
-	libassert.CatalogServiceExists(t, client, nginxName, nil)
-	libassert.CatalogServiceExists(t, client, fmt.Sprintf("%s-sidecar-proxy", nginxName), nil)
-
-	return fmt.Sprintf("http://nginx-fileserver:%d", port), nginxService, nginxProxy
-}
-
-// chain takes multiple setup functions for testcontainers.ContainerRequest and chains them together into a single function
-// of testcontainers.ContainerRequest to testcontainers.ContainerRequest.
-func chain(fns ...func(testcontainers.ContainerRequest) testcontainers.ContainerRequest) func(testcontainers.ContainerRequest) testcontainers.ContainerRequest {
-	return func(req testcontainers.ContainerRequest) testcontainers.ContainerRequest {
-		for _, fn := range fns {
-			req = fn(req)
-		}
-
-		return req
-	}
-}
-
-// copyFilesToContainer is a convenience function to build custom testcontainers.ContainerRequest. It takes a list of files
-// which need to be copied to the container. It returns a function which updates a given testcontainers.ContainerRequest
-// to include the files which need to be copied to the container on startup.
-func copyFilesToContainer(files []testcontainers.ContainerFile) func(testcontainers.ContainerRequest) testcontainers.ContainerRequest {
-	return func(req testcontainers.ContainerRequest) testcontainers.ContainerRequest {
-		req.Files = files
-		return req
-	}
-}
-
-// chownFiles is a convenience function to build custom testcontainers.ContainerRequest. It takes a list of files,
-// a user to make the owner, and whether the command requires sudo. It then returns a function which updates
-// a testcontainers.ContainerRequest with a lifecycle hook which will chown the files to the user after container startup.
-func chownFiles(files []testcontainers.ContainerFile, user string, sudo bool) func(request testcontainers.ContainerRequest) testcontainers.ContainerRequest {
-	return func(req testcontainers.ContainerRequest) testcontainers.ContainerRequest {
-		req.LifecycleHooks = append(req.LifecycleHooks, testcontainers.ContainerLifecycleHooks{
-			PostStarts: []testcontainers.ContainerHook{
-				func(ctx context.Context, c testcontainers.Container) error {
-					cmd := []string{}
-					if sudo {
-						cmd = append(cmd, "sudo")
-					}
-
-					cmd = append(cmd, "chown", user)
-
-					for _, f := range files {
-						cmd = append(cmd, f.ContainerFilePath)
-					}
-
-					_, _, err := c.Exec(ctx, cmd)
-					return err
-				},
-			},
-		})
-
-		return req
-	}
-}
-
-// sha256FromFile reads in the file from filepath and computes a sha256 of its contents.
-func sha256FromFile(t *testing.T, filepath string) string {
-	f, err := os.Open(filepath)
-	require.NoError(t, err, "could not open file for sha")
-	defer f.Close()
-
-	h := sha256.New()
-	_, err = io.Copy(h, f)
-	require.NoError(t, err, "could not copy file to sha")
-
-	return fmt.Sprintf("%x", h.Sum(nil))
-}
-
-// safeDelete removes a given file if it exists.
-func safeDelete(t *testing.T, filePath string) {
-	t.Logf("cleaning up stale build file: %s", filePath)
-	if _, err := os.Stat(filePath); err != nil {
-		return
-	}
-
-	// build is out of date, wipe compiled wasm
-	err := os.Remove(filePath)
-	require.NoError(t, err, "could not remove file")
-}
diff --git a/test/integration/consul-container/test/gateways/gateway_endpoint_test.go b/test/integration/consul-container/test/gateways/gateway_endpoint_test.go
index 76d233051d364..1ae2f467e3363 100644
--- a/test/integration/consul-container/test/gateways/gateway_endpoint_test.go
+++ b/test/integration/consul-container/test/gateways/gateway_endpoint_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package gateways
 
 import (
@@ -56,7 +53,12 @@ func TestAPIGatewayCreate(t *testing.T) {
 	cluster, _, _ := libtopology.NewCluster(t, clusterConfig)
 	client := cluster.APIClient(0)
 
-	namespace := getOrCreateNamespace(t, client)
+	namespace := getNamespace()
+	if namespace != "" {
+		ns := &api.Namespace{Name: namespace}
+		_, _, err := client.Namespaces().Create(ns, nil)
+		require.NoError(t, err)
+	}
 
 	// Create a gateway
 	// We intentionally do this before creating the config entries
@@ -121,7 +123,7 @@ func TestAPIGatewayCreate(t *testing.T) {
 
 	// make sure the gateway/route come online
 	// make sure config entries have been properly created
-	checkGatewayConfigEntry(t, client, gatewayName, &api.QueryOptions{Namespace: namespace})
+	checkGatewayConfigEntry(t, client, gatewayName, namespace)
 	checkTCPRouteConfigEntry(t, client, routeName, namespace)
 
 	port, err := gatewayService.GetPort(listenerPortOne)
@@ -146,11 +148,11 @@ func conditionStatusIsValue(typeName string, statusValue string, conditions []ap
 	return false
 }
 
-func checkGatewayConfigEntry(t *testing.T, client *api.Client, gatewayName string, opts *api.QueryOptions) {
+func checkGatewayConfigEntry(t *testing.T, client *api.Client, gatewayName string, namespace string) {
 	t.Helper()
 
 	require.Eventually(t, func() bool {
-		entry, _, err := client.ConfigEntries().Get(api.APIGateway, gatewayName, opts)
+		entry, _, err := client.ConfigEntries().Get(api.APIGateway, gatewayName, &api.QueryOptions{Namespace: namespace})
 		if err != nil {
 			t.Log("error constructing request", err)
 			return false
@@ -165,11 +167,11 @@ func checkGatewayConfigEntry(t *testing.T, client *api.Client, gatewayName strin
 	}, time.Second*10, time.Second*1)
 }
 
-func checkHTTPRouteConfigEntry(t *testing.T, client *api.Client, routeName string, opts *api.QueryOptions) {
+func checkHTTPRouteConfigEntry(t *testing.T, client *api.Client, routeName string, namespace string) {
 	t.Helper()
 
 	require.Eventually(t, func() bool {
-		entry, _, err := client.ConfigEntries().Get(api.HTTPRoute, routeName, opts)
+		entry, _, err := client.ConfigEntries().Get(api.HTTPRoute, routeName, &api.QueryOptions{Namespace: namespace})
 		if err != nil {
 			t.Log("error constructing request", err)
 			return false
@@ -184,25 +186,6 @@ func checkHTTPRouteConfigEntry(t *testing.T, client *api.Client, routeName strin
 	}, time.Second*10, time.Second*1)
 }
 
-func checkHTTPRouteConfigEntryExists(t *testing.T, client *api.Client, routeName string, namespace string) {
-	t.Helper()
-
-	require.Eventually(t, func() bool {
-		entry, _, err := client.ConfigEntries().Get(api.HTTPRoute, routeName, &api.QueryOptions{Namespace: namespace})
-		if err != nil {
-			t.Log("error constructing request", err)
-			return false
-		}
-		if entry == nil {
-			t.Log("returned entry is nil")
-			return false
-		}
-
-		_ = entry.(*api.HTTPRouteConfigEntry)
-		return true
-	}, time.Second*10, time.Second*1)
-}
-
 func checkTCPRouteConfigEntry(t *testing.T, client *api.Client, routeName string, namespace string) {
 	t.Helper()
 
@@ -223,11 +206,9 @@ func checkTCPRouteConfigEntry(t *testing.T, client *api.Client, routeName string
 }
 
 type checkOptions struct {
-	debug           bool
-	responseHeaders map[string]string
-	statusCode      int
-	testName        string
-	expectedBody    string
+	debug      bool
+	statusCode int
+	testName   string
 }
 
 // checkRoute, customized version of libassert.RouteEchos to allow for headers/distinguishing between the server instances
@@ -276,27 +257,14 @@ func checkRoute(t *testing.T, port int, path string, headers map[string]string,
 			t.Logf("bad status code - expected: %d, actual: %d", expected.statusCode, res.StatusCode)
 			return false
 		}
-
-		for name, value := range expected.responseHeaders {
-			if res.Header.Get(name) != value {
-				t.Logf("response missing header - expected: %s=%s, actual: %s=%s", name, value, name, res.Header.Get(name))
-				return false
-			}
-		}
-
 		if expected.debug {
 			if !strings.Contains(string(body), "debug") {
 				t.Log("body does not contain 'debug'")
 				return false
 			}
 		}
-		expectedBody := expected.expectedBody
-		if expectedBody == "" {
-			expectedBody = "hello"
-		}
-		if !strings.Contains(string(body), expectedBody) {
-			t.Log(string(body))
-			t.Log("body does not contain " + expectedBody)
+		if !strings.Contains(string(body), "hello") {
+			t.Log("body does not contain 'hello'")
 			return false
 		}
 
diff --git a/test/integration/consul-container/test/gateways/http_route_test.go b/test/integration/consul-container/test/gateways/http_route_test.go
index 96c93da955a49..8f0e940bf8c43 100644
--- a/test/integration/consul-container/test/gateways/http_route_test.go
+++ b/test/integration/consul-container/test/gateways/http_route_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package gateways
 
 import (
@@ -8,8 +5,6 @@ import (
 	"crypto/rand"
 	"encoding/hex"
 	"fmt"
-	"github.com/testcontainers/testcontainers-go"
-	"k8s.io/utils/pointer"
 	"testing"
 	"time"
 
@@ -17,7 +12,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/hashicorp/consul/api"
-
 	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
 	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
 	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
@@ -42,6 +36,7 @@ func TestHTTPRouteFlattening(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
 	}
+
 	t.Parallel()
 
 	// infrastructure set up
@@ -58,8 +53,6 @@ func TestHTTPRouteFlattening(t *testing.T) {
 	gatewayName := randomName("gw", 16)
 	routeOneName := randomName("route", 16)
 	routeTwoName := randomName("route", 16)
-	fooHostName := "test.foo"
-	exampleHostName := "test.example"
 	path1 := "/"
 	path2 := "/v2"
 
@@ -85,40 +78,41 @@ func TestHTTPRouteFlattening(t *testing.T) {
 	cluster, _, _ := libtopology.NewCluster(t, clusterConfig)
 	client := cluster.Agents[0].GetClient()
 
-	gwNamespace := getOrCreateNamespace(t, client)
-	serviceOneNamespace := getOrCreateNamespace(t, client)
-	serviceTwoNamespace := getOrCreateNamespace(t, client)
+	namespace := getNamespace()
+	if namespace != "" {
+		ns := &api.Namespace{Name: namespace}
+		_, _, err := client.Namespaces().Create(ns, nil)
+		require.NoError(t, err)
+	}
 
 	_, _, err := libservice.CreateAndRegisterStaticServerAndSidecar(cluster.Agents[0], &libservice.ServiceOpts{
-		Name:      serviceOneName,
 		ID:        serviceOneName,
+		Name:      serviceOneName,
+		Namespace: namespace,
 		HTTPPort:  serviceOneHTTPPort,
 		GRPCPort:  serviceOneGRPCPort,
-		Namespace: serviceOneNamespace,
 	},
 		// customizes response code so we can distinguish between which service is responding
 		"-echo-server-default-params", fmt.Sprintf("status=%d", serviceOneResponseCode),
 	)
-
 	require.NoError(t, err)
 
 	_, _, err = libservice.CreateAndRegisterStaticServerAndSidecar(cluster.Agents[0], &libservice.ServiceOpts{
-		Name:      serviceTwoName,
 		ID:        serviceTwoName,
+		Name:      serviceTwoName,
+		Namespace: namespace,
 		HTTPPort:  serviceTwoHTTPPort,
 		GRPCPort:  serviceTwoGRPCPort,
-		Namespace: serviceTwoNamespace,
 	},
+		// customizes response code so we can distinguish between which service is responding
 		"-echo-server-default-params", fmt.Sprintf("status=%d", serviceTwoResponseCode),
 	)
-
 	require.NoError(t, err)
 
 	// write config entries
 	proxyDefaults := &api.ProxyConfigEntry{
-		Kind:      api.ProxyDefaults,
-		Name:      api.ProxyConfigGlobal,
-		Namespace: "", // proxy-defaults can only be set in the default namespace
+		Kind: api.ProxyDefaults,
+		Name: api.ProxyConfigGlobal,
 		Config: map[string]interface{}{
 			"protocol": "http",
 		},
@@ -136,30 +130,30 @@ func TestHTTPRouteFlattening(t *testing.T) {
 				Protocol: "http",
 			},
 		},
-		Namespace: gwNamespace,
+		Namespace: namespace,
 	}
 
 	routeOne := &api.HTTPRouteConfigEntry{
-		Kind: api.HTTPRoute,
-		Name: routeOneName,
+		Kind:      api.HTTPRoute,
+		Name:      routeOneName,
+		Namespace: namespace,
 		Parents: []api.ResourceReference{
 			{
 				Kind:      api.APIGateway,
 				Name:      gatewayName,
-				Namespace: gwNamespace,
+				Namespace: namespace,
 			},
 		},
 		Hostnames: []string{
-			fooHostName,
-			exampleHostName,
+			"test.foo",
+			"test.example",
 		},
-		Namespace: gwNamespace,
 		Rules: []api.HTTPRouteRule{
 			{
 				Services: []api.HTTPService{
 					{
 						Name:      serviceOneName,
-						Namespace: serviceOneNamespace,
+						Namespace: namespace,
 					},
 				},
 				Matches: []api.HTTPMatch{
@@ -175,25 +169,25 @@ func TestHTTPRouteFlattening(t *testing.T) {
 	}
 
 	routeTwo := &api.HTTPRouteConfigEntry{
-		Kind: api.HTTPRoute,
-		Name: routeTwoName,
+		Kind:      api.HTTPRoute,
+		Name:      routeTwoName,
+		Namespace: namespace,
 		Parents: []api.ResourceReference{
 			{
 				Kind:      api.APIGateway,
 				Name:      gatewayName,
-				Namespace: gwNamespace,
+				Namespace: namespace,
 			},
 		},
 		Hostnames: []string{
-			fooHostName,
+			"test.foo",
 		},
-		Namespace: gwNamespace,
 		Rules: []api.HTTPRouteRule{
 			{
 				Services: []api.HTTPService{
 					{
 						Name:      serviceTwoName,
-						Namespace: serviceTwoNamespace,
+						Namespace: namespace,
 					},
 				},
 				Matches: []api.HTTPMatch{
@@ -223,54 +217,55 @@ func TestHTTPRouteFlattening(t *testing.T) {
 	gwCfg := libservice.GatewayConfig{
 		Name:      gatewayName,
 		Kind:      "api",
-		Namespace: gwNamespace,
+		Namespace: namespace,
 	}
 	gatewayService, err := libservice.NewGatewayService(context.Background(), gwCfg, cluster.Agents[0], listenerPort)
 	require.NoError(t, err)
-	libassert.CatalogServiceExists(t, client, gatewayName, &api.QueryOptions{Namespace: gwNamespace})
+	libassert.CatalogServiceExists(t, client, gatewayName, &api.QueryOptions{Namespace: namespace})
 
 	// make sure config entries have been properly created
-	checkGatewayConfigEntry(t, client, gatewayName, &api.QueryOptions{Namespace: gwNamespace})
-	checkHTTPRouteConfigEntry(t, client, routeOneName, &api.QueryOptions{Namespace: gwNamespace})
-	checkHTTPRouteConfigEntry(t, client, routeTwoName, &api.QueryOptions{Namespace: gwNamespace})
+	checkGatewayConfigEntry(t, client, gatewayName, namespace)
+	t.Log("checking route one")
+	checkHTTPRouteConfigEntry(t, client, routeOneName, namespace)
+	checkHTTPRouteConfigEntry(t, client, routeTwoName, namespace)
 
 	// gateway resolves routes
 	gatewayPort, err := gatewayService.GetPort(listenerPort)
 	require.NoError(t, err)
+	fmt.Println("Gateway Port: ", gatewayPort)
 
 	// Same v2 path with and without header
 	checkRoute(t, gatewayPort, "/v2", map[string]string{
-		"Host": fooHostName,
+		"Host": "test.foo",
 		"x-v2": "v2",
 	}, checkOptions{statusCode: serviceTwoResponseCode, testName: "service2 header and path"})
-
 	checkRoute(t, gatewayPort, "/v2", map[string]string{
-		"Host": fooHostName,
+		"Host": "test.foo",
 	}, checkOptions{statusCode: serviceTwoResponseCode, testName: "service2 just path match"})
 
 	// //v1 path with the header
 	checkRoute(t, gatewayPort, "/check", map[string]string{
-		"Host": fooHostName,
+		"Host": "test.foo",
 		"x-v2": "v2",
 	}, checkOptions{statusCode: serviceTwoResponseCode, testName: "service2 just header match"})
 
 	checkRoute(t, gatewayPort, "/v2/path/value", map[string]string{
-		"Host": fooHostName,
+		"Host": "test.foo",
 		"x-v2": "v2",
 	}, checkOptions{statusCode: serviceTwoResponseCode, testName: "service2 v2 with path"})
 
 	// hit service 1 by hitting root path
 	checkRoute(t, gatewayPort, "", map[string]string{
-		"Host": fooHostName,
+		"Host": "test.foo",
 	}, checkOptions{debug: false, statusCode: serviceOneResponseCode, testName: "service1 root prefix"})
 
 	// hit service 1 by hitting v2 path with v1 hostname
 	checkRoute(t, gatewayPort, "/v2", map[string]string{
-		"Host": exampleHostName,
+		"Host": "test.example",
 	}, checkOptions{debug: false, statusCode: serviceOneResponseCode, testName: "service1, v2 path with v2 hostname"})
 }
 
-func TestHTTPRouteFilters(t *testing.T) {
+func TestHTTPRoutePathRewrite(t *testing.T) {
 	if testing.Short() {
 		t.Skip("too slow for testing.Short")
 	}
@@ -318,7 +313,12 @@ func TestHTTPRouteFilters(t *testing.T) {
 	fooPath := "/v1/foo"
 	barPath := "/v1/bar"
 
-	namespace := getOrCreateNamespace(t, client)
+	namespace := getNamespace()
+	if namespace != "" {
+		ns := &api.Namespace{Name: namespace}
+		_, _, err := client.Namespaces().Create(ns, nil)
+		require.NoError(t, err)
+	}
 
 	_, _, err := libservice.CreateAndRegisterStaticServerAndSidecar(cluster.Agents[0], &libservice.ServiceOpts{
 		ID:        fooName,
@@ -395,12 +395,6 @@ func TestHTTPRouteFilters(t *testing.T) {
 						Path: fooPath,
 					},
 				},
-				ResponseFilters: api.HTTPResponseFilters{
-					Headers: []api.HTTPHeaderFilter{{
-						Add: map[string]string{"response-filters-add": "present"},
-						Set: map[string]string{"response-filters-set": "present"},
-					}},
-				},
 				Services: []api.HTTPService{
 					{
 						Name:      fooName,
@@ -473,9 +467,9 @@ func TestHTTPRouteFilters(t *testing.T) {
 	libassert.CatalogServiceExists(t, client, gatewayName, &api.QueryOptions{Namespace: namespace})
 
 	// make sure config entries have been properly created
-	checkGatewayConfigEntry(t, client, gatewayName, &api.QueryOptions{Namespace: namespace})
-	checkHTTPRouteConfigEntry(t, client, invalidRouteName, &api.QueryOptions{Namespace: namespace})
-	checkHTTPRouteConfigEntry(t, client, validRouteName, &api.QueryOptions{Namespace: namespace})
+	checkGatewayConfigEntry(t, client, gatewayName, namespace)
+	checkHTTPRouteConfigEntry(t, client, invalidRouteName, namespace)
+	checkHTTPRouteConfigEntry(t, client, validRouteName, namespace)
 
 	gatewayPort, err := gatewayService.GetPort(listenerPort)
 	require.NoError(t, err)
@@ -486,23 +480,13 @@ func TestHTTPRouteFilters(t *testing.T) {
 	debugExpectedStatusCode := 200
 
 	// hit foo, making sure path is being rewritten by hitting the debug page
-	// and that we get the expected response headers that we added modifiers for
-	checkRoute(
-		t, gatewayPort, fooUnrewritten, map[string]string{"Host": "test.foo"},
-		checkOptions{
-			debug:           true,
-			responseHeaders: map[string]string{"response-filters-add": "present", "response-filters-set": "present"},
-			statusCode:      debugExpectedStatusCode,
-			testName:        "foo service"})
+	checkRoute(t, gatewayPort, fooUnrewritten, map[string]string{
+		"Host": "test.foo",
+	}, checkOptions{debug: true, statusCode: debugExpectedStatusCode, testName: "foo service"})
 	// make sure foo is being sent to proper service
-	// and that we get the expected response headers that we added modifiers for
-	checkRoute(
-		t, gatewayPort, fooUnrewritten+"/foo", map[string]string{"Host": "test.foo"},
-		checkOptions{
-			debug:           false,
-			responseHeaders: map[string]string{"response-filters-add": "present", "response-filters-set": "present"},
-			statusCode:      fooStatusCode,
-			testName:        "foo service 2"})
+	checkRoute(t, gatewayPort, fooUnrewritten+"/foo", map[string]string{
+		"Host": "test.foo",
+	}, checkOptions{debug: false, statusCode: fooStatusCode, testName: "foo service 2"})
 
 	// hit bar, making sure its been rewritten
 	checkRoute(t, gatewayPort, barUnrewritten, map[string]string{
@@ -555,7 +539,13 @@ func TestHTTPRouteParentRefChange(t *testing.T) {
 	cluster, _, _ := libtopology.NewCluster(t, clusterConfig)
 	client := cluster.APIClient(0)
 
-	namespace := getOrCreateNamespace(t, client)
+	// getNamespace() should always return an empty string in Consul OSS
+	namespace := getNamespace()
+	if namespace != "" {
+		ns := &api.Namespace{Name: namespace}
+		_, _, err := client.Namespaces().Create(ns, nil)
+		require.NoError(t, err)
+	}
 
 	_, _, err := libservice.CreateAndRegisterStaticServerAndSidecar(cluster.Agents[0], &libservice.ServiceOpts{
 		ID:        serviceName,
@@ -592,7 +582,7 @@ func TestHTTPRouteParentRefChange(t *testing.T) {
 		Namespace: namespace,
 	}
 	require.NoError(t, cluster.ConfigEntryWrite(gatewayOne))
-	checkGatewayConfigEntry(t, client, gatewayOneName, &api.QueryOptions{Namespace: namespace})
+	checkGatewayConfigEntry(t, client, gatewayOneName, namespace)
 
 	// create gateway service
 	gwOneCfg := libservice.GatewayConfig{
@@ -619,7 +609,7 @@ func TestHTTPRouteParentRefChange(t *testing.T) {
 		Namespace: namespace,
 	}
 	require.NoError(t, cluster.ConfigEntryWrite(gatewayTwo))
-	checkGatewayConfigEntry(t, client, gatewayTwoName, &api.QueryOptions{Namespace: namespace})
+	checkGatewayConfigEntry(t, client, gatewayTwoName, namespace)
 
 	// create gateway service
 	gwTwoCfg := libservice.GatewayConfig{
@@ -739,233 +729,3 @@ func TestHTTPRouteParentRefChange(t *testing.T) {
 		"Host": "test.foo",
 	}, "")
 }
-
-func TestHTTPRouteRetryAndTimeout(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
-
-	t.Parallel()
-
-	// infrastructure set up
-	listenerPort := 6018
-	retryServiceHTTPPort := 6019
-	retryServiceGRPCPort := 6020
-	timeoutServiceHTTPPort := 6021
-	timeoutServiceGRPCPort := 6022
-
-	retryServiceName := randomName("service", 16)
-	gatewayName := randomName("gw", 16)
-	retryRouteName := randomName("route", 16)
-	timeoutServiceName := randomName("service", 16)
-	timeoutRouteName := randomName("route", 16)
-	retryPath := "/retry"
-	timeoutPath := "/timeout"
-
-	clusterConfig := &libtopology.ClusterConfig{
-		NumServers: 1,
-		NumClients: 1,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:             "dc1",
-			InjectAutoEncryption:   true,
-			InjectGossipEncryption: true,
-			AllowHTTPAnyway:        true,
-		},
-		ExposedPorts: []int{
-			listenerPort,
-			retryServiceGRPCPort,
-			retryServiceHTTPPort,
-			timeoutServiceGRPCPort,
-			timeoutServiceHTTPPort,
-		},
-		ApplyDefaultProxySettings: true,
-	}
-
-	cluster, _, _ := libtopology.NewCluster(t, clusterConfig)
-	client := cluster.Agents[0].GetClient()
-
-	namespace := getOrCreateNamespace(t, client)
-
-	_, _, err := libservice.CreateAndRegisterCustomServiceAndSidecar(
-		cluster.Agents[0], &libservice.ServiceOpts{
-			ID:        retryServiceName,
-			Name:      retryServiceName,
-			Namespace: namespace,
-			HTTPPort:  retryServiceHTTPPort,
-			GRPCPort:  retryServiceGRPCPort,
-		},
-		testcontainers.ContainerRequest{
-			Image: libservice.HashicorpDockerProxy + "/nicholasjackson/fake-service:v0.26.0",
-			Env: map[string]string{
-				"LISTEN_ADDR": fmt.Sprintf("0.0.0.0:%d", retryServiceHTTPPort),
-				"ERROR_RATE":  "0.5",
-			},
-		},
-		nil,
-	)
-	require.NoError(t, err)
-
-	_, _, err = libservice.CreateAndRegisterCustomServiceAndSidecar(
-		cluster.Agents[0], &libservice.ServiceOpts{
-			ID:        timeoutServiceName,
-			Name:      timeoutServiceName,
-			Namespace: namespace,
-			HTTPPort:  timeoutServiceHTTPPort,
-			GRPCPort:  timeoutServiceGRPCPort,
-		},
-		testcontainers.ContainerRequest{
-			Image: libservice.HashicorpDockerProxy + "/nicholasjackson/fake-service:v0.26.0",
-			Env: map[string]string{
-				"LISTEN_ADDR": fmt.Sprintf("0.0.0.0:%d", timeoutServiceHTTPPort),
-				"ERROR_RATE":  "1.0",
-				"ERROR_DELAY": "1m",
-			},
-		},
-		nil,
-	)
-
-	require.NoError(t, err)
-
-	// write config entries
-	proxyDefaults := &api.ProxyConfigEntry{
-		Kind: api.ProxyDefaults,
-		Name: api.ProxyConfigGlobal,
-		Config: map[string]interface{}{
-			"protocol": "http",
-		},
-	}
-
-	require.NoError(t, cluster.ConfigEntryWrite(proxyDefaults))
-
-	apiGateway := &api.APIGatewayConfigEntry{
-		Kind: "api-gateway",
-		Name: gatewayName,
-		Listeners: []api.APIGatewayListener{
-			{
-				Name:     "listener",
-				Port:     listenerPort,
-				Protocol: "http",
-			},
-		},
-		Namespace: namespace,
-	}
-
-	retryRoute := &api.HTTPRouteConfigEntry{
-		Kind:      api.HTTPRoute,
-		Name:      retryRouteName,
-		Namespace: namespace,
-		Parents: []api.ResourceReference{
-			{
-				Kind:      api.APIGateway,
-				Name:      gatewayName,
-				Namespace: namespace,
-			},
-		},
-		Hostnames: []string{
-			"test.foo",
-			"test.example",
-		},
-		Rules: []api.HTTPRouteRule{
-			{
-				Filters: api.HTTPFilters{
-					RetryFilter: &api.RetryFilter{
-						NumRetries:         pointer.Uint32(10),
-						RetryOnStatusCodes: []uint32{500},
-					},
-				},
-				Services: []api.HTTPService{
-					{
-						Name:      retryServiceName,
-						Namespace: namespace,
-					},
-				},
-				Matches: []api.HTTPMatch{
-					{
-						Path: api.HTTPPathMatch{
-							Match: api.HTTPPathMatchPrefix,
-							Value: retryPath,
-						},
-					},
-				},
-			},
-		},
-	}
-
-	timeoutRoute := &api.HTTPRouteConfigEntry{
-		Kind:      api.HTTPRoute,
-		Name:      timeoutRouteName,
-		Namespace: namespace,
-		Parents: []api.ResourceReference{
-			{
-				Kind:      api.APIGateway,
-				Name:      gatewayName,
-				Namespace: namespace,
-			},
-		},
-		Hostnames: []string{
-			"test.foo",
-			"test.example",
-		},
-		Rules: []api.HTTPRouteRule{
-			{
-				Filters: api.HTTPFilters{
-					TimeoutFilter: &api.TimeoutFilter{
-						RequestTimeout: 1,
-						IdleTimeout:    1,
-					},
-				},
-				Services: []api.HTTPService{
-					{
-						Name:      timeoutServiceName,
-						Namespace: namespace,
-					},
-				},
-				Matches: []api.HTTPMatch{
-					{
-						Path: api.HTTPPathMatch{
-							Match: api.HTTPPathMatchPrefix,
-							Value: timeoutPath,
-						},
-					},
-				},
-			},
-		},
-	}
-
-	require.NoError(t, cluster.ConfigEntryWrite(apiGateway))
-	require.NoError(t, cluster.ConfigEntryWrite(timeoutRoute))
-	require.NoError(t, cluster.ConfigEntryWrite(retryRoute))
-
-	// create gateway service
-	gwCfg := libservice.GatewayConfig{
-		Name:      gatewayName,
-		Kind:      "api",
-		Namespace: namespace,
-	}
-	gatewayService, err := libservice.NewGatewayService(context.Background(), gwCfg, cluster.Agents[0], listenerPort)
-	require.NoError(t, err)
-	libassert.CatalogServiceExists(t, client, gatewayName, &api.QueryOptions{Namespace: namespace})
-
-	// make sure config entries have been properly created
-	checkGatewayConfigEntry(t, client, gatewayName, &api.QueryOptions{Namespace: namespace})
-	t.Log("checking retry route")
-	checkHTTPRouteConfigEntry(t, client, retryRouteName, &api.QueryOptions{Namespace: namespace})
-
-	t.Log("checking timeout route")
-	checkHTTPRouteConfigEntry(t, client, timeoutRouteName, &api.QueryOptions{Namespace: namespace})
-
-	// gateway resolves routes
-	gatewayPort, err := gatewayService.GetPort(listenerPort)
-	require.NoError(t, err)
-	fmt.Println("Gateway Port: ", gatewayPort)
-
-	// hit service 1 by hitting root path
-	checkRoute(t, gatewayPort, retryPath, map[string]string{
-		"Host": "test.foo",
-	}, checkOptions{debug: false, statusCode: 200, testName: "retry should succeed cleanly", expectedBody: "Hello World"})
-
-	checkRoute(t, gatewayPort, timeoutPath, map[string]string{
-		"Host": "test.foo",
-	}, checkOptions{debug: false, statusCode: 500, testName: "timeout should timeout", expectedBody: "timeout"})
-
-}
diff --git a/test/integration/consul-container/test/gateways/ingress_gateway_test.go b/test/integration/consul-container/test/gateways/ingress_gateway_test.go
index fb616232995f5..fcadd3a0fae62 100644
--- a/test/integration/consul-container/test/gateways/ingress_gateway_test.go
+++ b/test/integration/consul-container/test/gateways/ingress_gateway_test.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MPL-2.0
 
 package gateways
 
@@ -51,7 +51,7 @@ func TestIngressGateway(t *testing.T) {
 	clientNode := cluster.Clients()[0]
 
 	// Set up the "static-server" backend
-	serverService, _ := topology.CreateServices(t, cluster, "http")
+	serverService, _ := topology.CreateServices(t, cluster)
 
 	// Create the ingress gateway service
 	// We expose this on the client node, which already has port 9999 exposed as part of it's pause "pod"
diff --git a/test/integration/consul-container/test/gateways/namespace_ce.go b/test/integration/consul-container/test/gateways/namespace_ce.go
new file mode 100644
index 0000000000000..3867e72987bc7
--- /dev/null
+++ b/test/integration/consul-container/test/gateways/namespace_ce.go
@@ -0,0 +1,8 @@
+//go:build !consulent
+// +build !consulent
+
+package gateways
+
+func getNamespace() string {
+	return ""
+}
diff --git a/test/integration/consul-container/test/gateways/tenancy_ce.go b/test/integration/consul-container/test/gateways/tenancy_ce.go
deleted file mode 100644
index 57d17b8587a06..0000000000000
--- a/test/integration/consul-container/test/gateways/tenancy_ce.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package gateways
-
-import (
-	"testing"
-
-	"github.com/hashicorp/consul/api"
-)
-
-func getOrCreateNamespace(_ *testing.T, _ *api.Client) string {
-	return ""
-}
diff --git a/test/integration/consul-container/test/gateways/terminating_gateway_test.go b/test/integration/consul-container/test/gateways/terminating_gateway_test.go
deleted file mode 100644
index ef8f95ab82920..0000000000000
--- a/test/integration/consul-container/test/gateways/terminating_gateway_test.go
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package gateways
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-	"github.com/stretchr/testify/require"
-
-	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
-	libtopology "github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-)
-
-const externalServerName = libservice.StaticServerServiceName
-
-var requestRetryTimer = &retry.Timer{Timeout: 120 * time.Second, Wait: 500 * time.Millisecond}
-
-// TestTerminatingGateway Summary
-// This test makes sure an external service can be reached via and terminating gateway. External server
-// refers to being outside of the consul service mesh but it runs under the same docker network.
-//
-// Steps:
-//   - Create a cluster (1 server and 1 client).
-//   - Create the external service static-server (a single container, no proxy).
-//   - Register an external node and the external service on that node in Consul.
-//   - Create a terminating gateway config entry that includes an entry for the "external" static-server.
-//   - Create the terminating gateway and register it with Consul.
-//   - Create a static-client proxy (no need for a service container).
-//   - Verify that the static-client can communicate with the external static-server through the terminating gateway
-func TestTerminatingGatewayBasic(t *testing.T) {
-	t.Parallel()
-	var deferClean utils.ResettableDefer
-	defer deferClean.Execute()
-
-	t.Logf("creating consul cluster")
-	cluster, _, client := libtopology.NewCluster(t, &libtopology.ClusterConfig{
-		NumServers: 1,
-		NumClients: 1,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter: "dc1",
-		},
-		ApplyDefaultProxySettings: true,
-	})
-	node := cluster.Clients()[0]
-
-	// Creates an external server that is not part of consul (no proxy)
-	t.Logf("creating external server: %s", externalServerName)
-	externalServerPort := 8083
-	externalServerGRPCPort := 8079
-	externalServer, err := libservice.NewExampleService(context.Background(), externalServerName, externalServerPort, externalServerGRPCPort, node)
-	require.NoError(t, err)
-	deferClean.Add(func() {
-		_ = externalServer.Terminate()
-	})
-
-	// Register the external service in the default namespace. Tell consul it is located on an 'external node' and
-	// not part of the service mesh. Because of the way that containers are created, the terminating gateway can
-	// make a call to the address `localhost:<externalServerPort` and reach the external service.
-	registerExternalService(t, client, externalServerName, "", "", "localhost", externalServerPort)
-
-	// Create the config entry for the external service that associates it with the terminating gateway
-	createTerminatingGatewayConfigEntry(t, client, "", "", externalServerName)
-
-	// Create the terminating gateway in the default namespace.
-	gwCfg := libservice.GatewayConfig{
-		Name: api.TerminatingGateway,
-		Kind: "terminating",
-	}
-	gatewayService, err := libservice.NewGatewayService(context.Background(), gwCfg, node)
-	require.NoError(t, err)
-	libassert.AssertContainerState(t, gatewayService, "running")
-	libassert.CatalogServiceExists(t, client, gwCfg.Name, nil)
-
-	// Creates a static client that is part of the mesh
-	t.Logf("creating static client proxy")
-	staticClient, err := libservice.CreateAndRegisterStaticClientSidecar(node, "", false, false, nil)
-	require.NoError(t, err)
-	libassert.CatalogServiceExists(t, client, "static-client-sidecar-proxy", nil)
-
-	// Verify that the static client can reach the external service by going through the terminating gateway
-	// The `static-server` upstream is listening on port 5000 by default.
-	assertHTTPRequestToServiceAddress(t, staticClient, externalServerName, libcluster.ServiceUpstreamLocalBindPort, true)
-}
-
-// registerExternalService registers a service on an external node so that Consul knows
-// that the service is not being managed by an agent.
-func registerExternalService(t *testing.T, consulClient *api.Client, name, namespace, partition, address string, port int) {
-	t.Helper()
-
-	service := &api.AgentService{
-		ID:      name,
-		Service: name,
-		Port:    port,
-	}
-
-	part := "default"
-	if partition != "" {
-		part = partition
-	}
-
-	if namespace != "" {
-		service.Namespace = namespace
-
-		t.Logf("creating the %s namespace in Consul", namespace)
-		_, _, err := consulClient.Namespaces().Create(&api.Namespace{
-			Name:      namespace,
-			Partition: part,
-		}, nil)
-		require.NoError(t, err)
-	}
-
-	t.Logf("registering the external service")
-	_, err := consulClient.Catalog().Register(&api.CatalogRegistration{
-		Node:     "legacy_node",
-		Address:  address,
-		NodeMeta: map[string]string{"external-node": "true", "external-probe": "true"},
-		Service:  service,
-	}, nil)
-	require.NoError(t, err)
-}
-
-// createTerminatingGatewayConfigEntry creates and sets a config entry that binds the
-// services to the gateway.
-func createTerminatingGatewayConfigEntry(t *testing.T, consulClient *api.Client, gwNamespace, serviceNamespace string, serviceNames ...string) {
-	t.Helper()
-
-	t.Logf("creating terminating gateway config entry")
-
-	if serviceNamespace != "" {
-		t.Logf("creating the %s namespace in Consul", serviceNamespace)
-		_, _, err := consulClient.Namespaces().Create(&api.Namespace{
-			Name: serviceNamespace,
-		}, nil)
-		require.NoError(t, err)
-	}
-
-	var gatewayServices []api.LinkedService
-	for _, serviceName := range serviceNames {
-		linkedService := api.LinkedService{Name: serviceName, Namespace: serviceNamespace}
-		gatewayServices = append(gatewayServices, linkedService)
-	}
-
-	configEntry := &api.TerminatingGatewayConfigEntry{
-		Kind:      api.TerminatingGateway,
-		Name:      "terminating-gateway",
-		Namespace: gwNamespace,
-		Services:  gatewayServices,
-	}
-
-	created, _, err := consulClient.ConfigEntries().Set(configEntry, nil)
-	require.NoError(t, err)
-	require.True(t, created, "failed to create terminating gateway config entry")
-}
-
-// assertHTTPRequestToServiceAddress checks the result of a request from the
-// given `client` container to the given `server` container. If expSuccess is
-// true, this checks for a successful request and otherwise it checks for the
-// error we expect when traffic is rejected by mTLS.
-//
-// This assumes the destination service is running Fortio. It makes the request
-// to `<serverIP>:8080/debug?env=dump` and checks for `FORTIO_NAME=<expServiceName>`
-// in the response.
-func assertHTTPRequestToServiceAddress(t *testing.T, client *libservice.ConnectContainer, serviceName string, port int, expSuccess bool) {
-	upstreamURL := fmt.Sprintf("http://localhost:%d/debug?env=dump", port)
-	retry.RunWith(requestRetryTimer, t, func(r *retry.R) {
-		out, err := client.Exec(context.Background(), []string{"curl", "-s", upstreamURL})
-		t.Logf("curl request to upstream service address: url=%s\nerr = %v\nout = %s", upstreamURL, err, out)
-
-		if expSuccess {
-			require.NoError(r, err)
-			require.Contains(r, out, fmt.Sprintf("FORTIO_NAME=%s", serviceName))
-			t.Logf("successfuly messaged %s", serviceName)
-		} else {
-			require.Error(r, err)
-			require.Contains(r, err.Error(), "exit code 52")
-		}
-	})
-}
diff --git a/test/integration/consul-container/test/jwtauth/jwt_auth_test.go b/test/integration/consul-container/test/jwtauth/jwt_auth_test.go
deleted file mode 100644
index 939dec13882bf..0000000000000
--- a/test/integration/consul-container/test/jwtauth/jwt_auth_test.go
+++ /dev/null
@@ -1,286 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package jwtauth
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"net/http"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-	"github.com/stretchr/testify/require"
-
-	"github.com/go-jose/go-jose/v3/jwt"
-	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
-	libtopology "github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-	libutils "github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-	"github.com/hashicorp/go-cleanhttp"
-	"testing"
-	"time"
-)
-
-// TestJWTAuthConnectService summary:
-// This test ensures that when we have an intention referencing a JWT, requests
-// without JWT authorization headers are denied and requests with the correct JWT
-// Authorization header are successful.
-//
-// Steps:
-// - Creates a single agent cluster
-// - Generates a JWKS and 2 JWTs with different claims
-// - Generates another JWKS with a single JWT
-// - Configures proxy defaults, providers and intentions
-// - Creates a static-server and sidecar containers
-// - Registers the created static-server and sidecar with consul
-// - Create a static-client and sidecar containers
-// - Registers the static-client and sidecar with consul
-// - Ensure client sidecar is running as expected
-// - Runs a couple of scenarios to ensure jwt validation works as expected
-func TestJWTAuthConnectService(t *testing.T) {
-	t.Parallel()
-
-	cluster, _, _ := libtopology.NewCluster(t, &libtopology.ClusterConfig{
-		NumServers:                1,
-		NumClients:                1,
-		ApplyDefaultProxySettings: true,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:             "dc1",
-			InjectCerts:            true,
-			InjectGossipEncryption: false,
-			AllowHTTPAnyway:        true,
-			ACLEnabled:             true,
-		},
-	})
-
-	// generate jwks and 2 jwts with different claims for provider 1
-	jwksOne, privOne := makeJWKS(t)
-	claimsOne := makeTestClaims("https://legit.issuer.internal/", "https://consul.test")
-	jwtOne := makeJWT(t, privOne, claimsOne, testClaimPayload{UserType: "admin", FirstName: "admin"})
-	jwtOneAdmin := makeJWT(t, privOne, claimsOne, testClaimPayload{UserType: "client", FirstName: "non-admin"})
-	provider1 := makeTestJWTProvider("okta", jwksOne, claimsOne)
-
-	// generate another jwks and jwt for provider 2
-	jwksTwo, privTwo := makeJWKS(t)
-	claimsTwo := makeTestClaims("https://another.issuer.internal/", "https://consul.test")
-	jwtTwo := makeJWT(t, privTwo, claimsTwo, testClaimPayload{})
-	provider2 := makeTestJWTProvider("auth0", jwksTwo, claimsTwo)
-
-	// configure proxy-defaults, jwt providers and intentions
-	configureProxyDefaults(t, cluster)
-	configureJWTProviders(t, cluster, provider1, provider2)
-	configureIntentions(t, cluster, provider1, provider2)
-
-	clientService := createServices(t, cluster)
-	_, clientPort := clientService.GetAddr()
-	_, adminPort := clientService.GetAdminAddr()
-
-	libassert.AssertContainerState(t, clientService, "running")
-	libassert.AssertUpstreamEndpointStatus(t, adminPort, "static-server.default", "HEALTHY", 1)
-
-	// request to restricted endpoint with no jwt should be denied
-	doRequest(t, fmt.Sprintf("http://localhost:%d/restricted/foo", clientPort), http.StatusForbidden, "")
-
-	// request with jwt 1 /restricted/foo should be disallowed
-	doRequest(t, fmt.Sprintf("http://localhost:%d/restricted/foo", clientPort), http.StatusForbidden, jwtOne)
-
-	// request with jwt 1 /other/foo should be allowed
-	libassert.HTTPServiceEchoesWithHeaders(t, "localhost", clientPort, "other/foo", makeAuthHeaders(jwtOne))
-
-	// request with jwt 1 /other/foo with mismatched claims should be disallowed
-	doRequest(t, fmt.Sprintf("http://localhost:%d/other/foo", clientPort), http.StatusForbidden, jwtOneAdmin)
-
-	// request with provider 1 /foo should be allowed
-	libassert.HTTPServiceEchoesWithHeaders(t, "localhost", clientPort, "foo", makeAuthHeaders(jwtOne))
-
-	// request with jwt 2 to /foo should be denied
-	doRequest(t, fmt.Sprintf("http://localhost:%d/foo", clientPort), http.StatusForbidden, jwtTwo)
-
-	// request with jwt 2 to /restricted/foo should be allowed
-	libassert.HTTPServiceEchoesWithHeaders(t, "localhost", clientPort, "restricted/foo", makeAuthHeaders(jwtTwo))
-
-	// request with jwt 2 to /other/foo should be denied
-	doRequest(t, fmt.Sprintf("http://localhost:%d/other/foo", clientPort), http.StatusForbidden, jwtTwo)
-}
-
-func makeAuthHeaders(jwt string) map[string]string {
-	return map[string]string{"Authorization": fmt.Sprintf("Bearer %s", jwt)}
-}
-
-func createServices(t *testing.T, cluster *libcluster.Cluster) libservice.Service {
-	node := cluster.Agents[0]
-	client := node.GetClient()
-	// Create a service and proxy instance
-	serviceOpts := &libservice.ServiceOpts{
-		Name:     libservice.StaticServerServiceName,
-		ID:       "static-server",
-		HTTPPort: 8080,
-		GRPCPort: 8079,
-	}
-	apiOpts := &api.QueryOptions{Token: cluster.TokenBootstrap}
-
-	// Create a service and proxy instance
-	_, _, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOpts)
-	require.NoError(t, err)
-
-	libassert.CatalogServiceExists(t, client, "static-server-sidecar-proxy", apiOpts)
-	libassert.CatalogServiceExists(t, client, libservice.StaticServerServiceName, apiOpts)
-
-	// Create a client proxy instance with the server as an upstream
-	clientConnectProxy, err := libservice.CreateAndRegisterStaticClientSidecar(node, "", false, false, nil)
-	require.NoError(t, err)
-
-	libassert.CatalogServiceExists(t, client, "static-client-sidecar-proxy", apiOpts)
-
-	return clientConnectProxy
-}
-
-func makeJWKS(t *testing.T) (string, string) {
-	pub, priv, err := libutils.GenerateKey()
-	require.NoError(t, err)
-
-	jwks, err := libutils.NewJWKS(pub)
-	require.NoError(t, err)
-
-	jwksJson, err := json.Marshal(jwks)
-	require.NoError(t, err)
-
-	return string(jwksJson), priv
-}
-
-type testClaimPayload struct {
-	UserType  string
-	FirstName string
-}
-
-func makeJWT(t *testing.T, priv string, claims jwt.Claims, payload testClaimPayload) string {
-	jwt, err := libutils.SignJWT(priv, claims, payload)
-	require.NoError(t, err)
-
-	return jwt
-}
-
-// configures the protocol to http as this is needed for jwt-auth
-func configureProxyDefaults(t *testing.T, cluster *libcluster.Cluster) {
-	require.NoError(t, cluster.ConfigEntryWrite(&api.ProxyConfigEntry{
-		Kind: api.ProxyDefaults,
-		Name: api.ProxyConfigGlobal,
-		Config: map[string]interface{}{
-			"protocol": "http",
-		},
-	}))
-}
-
-func makeTestJWTProvider(name string, jwks string, claims jwt.Claims) *api.JWTProviderConfigEntry {
-	return &api.JWTProviderConfigEntry{
-		Kind: api.JWTProvider,
-		Name: name,
-		JSONWebKeySet: &api.JSONWebKeySet{
-			Local: &api.LocalJWKS{
-				JWKS: base64.StdEncoding.EncodeToString([]byte(jwks)),
-			},
-		},
-		Issuer:    claims.Issuer,
-		Audiences: claims.Audience,
-	}
-}
-
-// creates a JWT local provider
-func configureJWTProviders(t *testing.T, cluster *libcluster.Cluster, providers ...*api.JWTProviderConfigEntry) {
-	for _, prov := range providers {
-		require.NoError(t, cluster.ConfigEntryWrite(prov))
-	}
-}
-
-// creates an intention referencing the jwt provider
-func configureIntentions(t *testing.T, cluster *libcluster.Cluster, provider1, provider2 *api.JWTProviderConfigEntry) {
-	intention := api.ServiceIntentionsConfigEntry{
-		Kind: "service-intentions",
-		Name: libservice.StaticServerServiceName,
-		Sources: []*api.SourceIntention{
-			{
-				Name: libservice.StaticClientServiceName,
-				Permissions: []*api.IntentionPermission{
-					{
-						Action: api.IntentionActionAllow,
-						HTTP: &api.IntentionHTTPPermission{
-							PathPrefix: "/restricted/",
-						},
-						JWT: &api.IntentionJWTRequirement{
-							Providers: []*api.IntentionJWTProvider{
-								{
-									Name: provider2.Name,
-								},
-							},
-						},
-					},
-					{
-						Action: api.IntentionActionAllow,
-						HTTP: &api.IntentionHTTPPermission{
-							PathPrefix: "/",
-						},
-						JWT: &api.IntentionJWTRequirement{
-							Providers: []*api.IntentionJWTProvider{
-								{
-									Name: provider1.Name,
-									VerifyClaims: []*api.IntentionJWTClaimVerification{
-										{
-											Path:  []string{"UserType"},
-											Value: "admin",
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			{
-				Name: "other-client",
-				Permissions: []*api.IntentionPermission{
-					{
-						Action: api.IntentionActionAllow,
-						HTTP: &api.IntentionHTTPPermission{
-							PathPrefix: "/other/",
-						},
-						JWT: &api.IntentionJWTRequirement{
-							Providers: []*api.IntentionJWTProvider{
-								{
-									Name: provider2.Name,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-	require.NoError(t, cluster.ConfigEntryWrite(&intention))
-}
-
-func doRequest(t *testing.T, url string, expStatus int, jwt string) {
-	retry.RunWith(&retry.Timer{Timeout: 5 * time.Second, Wait: time.Second}, t, func(r *retry.R) {
-		client := cleanhttp.DefaultClient()
-		req, err := http.NewRequest("GET", url, nil)
-		require.NoError(r, err)
-		if jwt != "" {
-			req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", jwt))
-		}
-		resp, err := client.Do(req)
-		require.NoError(r, err)
-		require.Equal(r, expStatus, resp.StatusCode)
-	})
-}
-
-func makeTestClaims(issuer, audience string) jwt.Claims {
-	return jwt.Claims{
-		Subject:   "r3qXcK2bix9eFECzsU3Sbmh0K16fatW6@clients",
-		Audience:  jwt.Audience{audience},
-		Issuer:    issuer,
-		NotBefore: jwt.NewNumericDate(time.Now().Add(-5 * time.Second)),
-		Expiry:    jwt.NewNumericDate(time.Now().Add(60 * time.Minute)),
-	}
-}
diff --git a/test/integration/consul-container/test/multiport/explicit_destination_test.go b/test/integration/consul-container/test/multiport/explicit_destination_test.go
deleted file mode 100644
index a65ff2095dbcd..0000000000000
--- a/test/integration/consul-container/test/multiport/explicit_destination_test.go
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package multiport
-
-import (
-	"context"
-	"fmt"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
-	"github.com/stretchr/testify/require"
-	"testing"
-
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-)
-
-// TestMultiportService_Explicit makes sure two services in the same datacenter have connectivity
-// with transparent proxy enabled.
-//
-// Steps:
-//   - Create a single server cluster.
-//   - Create the example static-server and sidecar containers, then register them both with Consul
-//   - Create an example static-client sidecar, then register both the service and sidecar with Consul
-//   - Make sure a request from static-client to the virtual address (<svc>.virtual.consul) returns a
-//     response from the upstream.
-func TestMultiportService_Explicit(t *testing.T) {
-	t.Parallel()
-
-	cluster := createCluster(t)
-	followers, err := cluster.Followers()
-	require.NoError(t, err)
-	client := pbresource.NewResourceServiceClient(followers[0].GetGRPCConn())
-	resourceClient := rtest.NewClient(client)
-
-	serverIP := cluster.Agents[1].GetIP()
-	clientIP := cluster.Agents[2].GetIP()
-
-	serverService := createServerServicesAndWorkloads(t, resourceClient, serverIP)
-	createClientResources(t, resourceClient, serverService, clientIP)
-
-	_, clientDataplane := createServices(t, cluster)
-
-	_, port := clientDataplane.GetAddr()
-
-	assertDataplaneContainerState(t, clientDataplane, "running")
-	libassert.HTTPServiceEchoes(t, "localhost", port, "")
-	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
-}
-
-// createServices creates the static-client and static-server services with
-// transparent proxy enabled. It returns a Service for the static-client.
-func createServices(t *testing.T, cluster *libcluster.Cluster) (*libcluster.ConsulDataplaneContainer, *libcluster.ConsulDataplaneContainer) {
-	n1 := cluster.Agents[1]
-
-	// Create a service and dataplane
-	serverDataplane, err := createServiceAndDataplane(t, n1, "static-server-workload", "static-server", 8080, 8079, []int{})
-	require.NoError(t, err)
-
-	n2 := cluster.Agents[2]
-	// Create a service and dataplane
-	clientDataplane, err := createServiceAndDataplane(t, n2, "static-client-workload", "static-client", 8080, 8079, []int{libcluster.ServiceUpstreamLocalBindPort})
-	require.NoError(t, err)
-
-	return serverDataplane, clientDataplane
-}
-
-func createServiceAndDataplane(t *testing.T, node libcluster.Agent, proxyID, serviceName string, httpPort, grpcPort int, serviceBindPorts []int) (*libcluster.ConsulDataplaneContainer, error) {
-	// Do some trickery to ensure that partial completion is correctly torn
-	// down, but successful execution is not.
-	var deferClean utils.ResettableDefer
-	defer deferClean.Execute()
-
-	// Create a service and proxy instance
-	svc, err := libservice.NewExampleService(context.Background(), serviceName, httpPort, grpcPort, node)
-	if err != nil {
-		return nil, err
-	}
-	deferClean.Add(func() {
-		_ = svc.Terminate()
-	})
-
-	// Create Consul Dataplane
-	dp, err := libcluster.NewConsulDataplane(context.Background(), proxyID, "0.0.0.0", 8502, serviceBindPorts, node, false, "")
-	require.NoError(t, err)
-	deferClean.Add(func() {
-		_ = dp.Terminate()
-	})
-
-	// disable cleanup functions now that we have an object with a Terminate() function
-	deferClean.Reset()
-
-	return dp, nil
-}
-
-func createServerServicesAndWorkloads(t *testing.T, resourceClient *rtest.Client, ipAddress string) *pbresource.Resource {
-	serverService := rtest.ResourceID(&pbresource.ID{
-		Name: "static-server-service",
-		Type: pbcatalog.ServiceType,
-	}).WithData(t, &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"static-server"}},
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-		},
-	}).Write(t, resourceClient)
-
-	workloadPortMap := map[string]*pbcatalog.WorkloadPort{
-		"tcp": {
-			Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP,
-		},
-		"mesh": {
-			Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-		},
-	}
-
-	rtest.ResourceID(&pbresource.ID{
-		Name: "static-server-identity",
-		Type: pbauth.WorkloadIdentityType,
-	}).Write(t, resourceClient)
-
-	rtest.ResourceID(&pbresource.ID{
-		Name: "static-server-workload",
-		Type: pbcatalog.WorkloadType,
-	}).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: ipAddress},
-			},
-			Ports:    workloadPortMap,
-			Identity: "static-server-identity",
-		}).
-		Write(t, resourceClient)
-	return serverService
-}
-
-func createClientResources(t *testing.T, resourceClient *rtest.Client, staticServerResource *pbresource.Resource, ipAddress string) {
-	rtest.ResourceID(&pbresource.ID{
-		Name: "static-client-service",
-		Type: pbcatalog.ServiceType,
-	}).WithData(t, &pbcatalog.Service{
-		Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"static-client"}},
-		Ports: []*pbcatalog.ServicePort{
-			{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-			{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-		},
-	}).Write(t, resourceClient)
-
-	workloadPortMap := map[string]*pbcatalog.WorkloadPort{
-		"tcp": {
-			Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP,
-		},
-		"mesh": {
-			Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-		},
-	}
-
-	rtest.ResourceID(&pbresource.ID{
-		Name: "static-client-workload",
-		Type: pbcatalog.WorkloadType,
-	}).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: ipAddress},
-			},
-			Ports:    workloadPortMap,
-			Identity: "static-client-identity",
-		}).
-		Write(t, resourceClient)
-
-	destId := staticServerResource.GetId()
-	destRef := &pbresource.Reference{
-		Type:    destId.Type,
-		Tenancy: destId.Tenancy,
-		Name:    destId.Name,
-		Section: "",
-	}
-	rtest.ResourceID(&pbresource.ID{
-		Name: "static-client-upstreams",
-		Type: pbmesh.DestinationsType,
-	}).
-		WithData(t, &pbmesh.Destinations{
-			Destinations: []*pbmesh.Destination{
-				{
-					DestinationRef:  destRef,
-					DestinationPort: "tcp",
-					ListenAddr: &pbmesh.Destination_IpPort{
-						IpPort: &pbmesh.IPPortAddress{
-							Ip:   "0.0.0.0",
-							Port: libcluster.ServiceUpstreamLocalBindPort,
-						},
-					},
-				},
-			},
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"static-client"},
-			},
-		}).
-		Write(t, resourceClient)
-}
-
-func createCluster(t *testing.T) *libcluster.Cluster {
-	cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{
-		NumServers: 3,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:             "dc1",
-			InjectAutoEncryption:   true,
-			InjectGossipEncryption: true,
-			AllowHTTPAnyway:        true,
-		},
-		Cmd: `-hcl=experiments=["resource-apis"] log_level="TRACE"`,
-	})
-
-	return cluster
-}
-
-// assertDataplaneContainerState validates service container status
-func assertDataplaneContainerState(t *testing.T, dataplane *libcluster.ConsulDataplaneContainer, state string) {
-	containerStatus, err := dataplane.GetStatus()
-	require.NoError(t, err)
-	require.Equal(t, containerStatus, state, fmt.Sprintf("Expected: %s. Got %s", state, containerStatus))
-}
diff --git a/test/integration/consul-container/test/observability/access_logs_test.go b/test/integration/consul-container/test/observability/access_logs_test.go
index e48b05a1254d4..37a80c3563e03 100644
--- a/test/integration/consul-container/test/observability/access_logs_test.go
+++ b/test/integration/consul-container/test/observability/access_logs_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package observability
 
 import (
@@ -72,13 +69,13 @@ func TestAccessLogs(t *testing.T) {
 	require.NoError(t, err)
 	require.True(t, set)
 
-	serverService, clientService := topology.CreateServices(t, cluster, "http")
+	serverService, clientService := topology.CreateServices(t, cluster)
 	_, port := clientService.GetAddr()
 
 	// Validate Custom JSON
 	require.Eventually(t, func() bool {
 		libassert.HTTPServiceEchoes(t, "localhost", port, "banana")
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), libservice.StaticServerServiceName, "")
+		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
 		client := libassert.ServiceLogContains(t, clientService, "\"banana_path\":\"/banana\"")
 		server := libassert.ServiceLogContains(t, serverService, "\"banana_path\":\"/banana\"")
 		return client && server
@@ -120,7 +117,7 @@ func TestAccessLogs(t *testing.T) {
 	_, port = clientService.GetAddr()
 	require.Eventually(t, func() bool {
 		libassert.HTTPServiceEchoes(t, "localhost", port, "orange")
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), libservice.StaticServerServiceName, "")
+		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
 		client := libassert.ServiceLogContains(t, clientService, "Orange you glad I didn't say banana: /orange, -")
 		server := libassert.ServiceLogContains(t, serverService, "Orange you glad I didn't say banana: /orange, -")
 		return client && server
diff --git a/test/integration/consul-container/test/observability/metrics_leader_test.go b/test/integration/consul-container/test/observability/metrics_leader_test.go
index 781e657a9f35a..f96eb43a21770 100644
--- a/test/integration/consul-container/test/observability/metrics_leader_test.go
+++ b/test/integration/consul-container/test/observability/metrics_leader_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package observability
 
 import (
diff --git a/test/integration/consul-container/test/peering/rotate_server_and_ca_then_fail_test.go b/test/integration/consul-container/test/peering/rotate_server_and_ca_then_fail_test.go
index 77639b78d1a71..829a81c8a8fb1 100644
--- a/test/integration/consul-container/test/peering/rotate_server_and_ca_then_fail_test.go
+++ b/test/integration/consul-container/test/peering/rotate_server_and_ca_then_fail_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package peering
 
 import (
@@ -59,8 +56,7 @@ func TestPeering_RotateServerAndCAThenFail_(t *testing.T) {
 			AcceptingNumClients: 1,
 			DialingNumServers:   1,
 			DialingNumClients:   1,
-		},
-		false)
+		}, false)
 	var (
 		acceptingCluster     = accepting.Cluster
 		dialingCluster       = dialing.Cluster
@@ -104,7 +100,7 @@ func TestPeering_RotateServerAndCAThenFail_(t *testing.T) {
 
 		_, port := clientSidecarService.GetAddr()
 		libassert.HTTPServiceEchoes(t, "localhost", port, "")
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), libservice.StaticServerServiceName, "")
+		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
 	}
 
 	testutil.RunStep(t, "rotate exporting cluster's root CA", func(t *testing.T) {
@@ -154,7 +150,7 @@ func TestPeering_RotateServerAndCAThenFail_(t *testing.T) {
 		// Connectivity should still be contained
 		_, port := clientSidecarService.GetAddr()
 		libassert.HTTPServiceEchoes(t, "localhost", port, "")
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), libservice.StaticServerServiceName, "")
+		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
 
 		verifySidecarHasTwoRootCAs(t, clientSidecarService)
 	})
@@ -176,7 +172,7 @@ func TestPeering_RotateServerAndCAThenFail_(t *testing.T) {
 
 		_, port := clientSidecarService.GetAddr()
 		libassert.HTTPServiceEchoes(t, "localhost", port, "")
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), libservice.StaticServerServiceName, "")
+		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
 	})
 }
 
diff --git a/test/integration/consul-container/test/ratelimit/ratelimit_test.go b/test/integration/consul-container/test/ratelimit/ratelimit_test.go
index e598e0ceb8ad6..cb5c259eefe34 100644
--- a/test/integration/consul-container/test/ratelimit/ratelimit_test.go
+++ b/test/integration/consul-container/test/ratelimit/ratelimit_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package ratelimit
 
 import (
@@ -10,11 +7,11 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"github.com/testcontainers/testcontainers-go"
 
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libtopology "github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
 )
 
 const (
@@ -28,10 +25,11 @@ const (
 //   - read_rate - returns 429 - was blocked and returns retryable error
 //   - write_rate - returns 503 - was blocked and is not retryable
 //   - on each
-//     - fires metrics for exceeding
+//     - fires metrics forexceeding
 //     - logs for exceeding
 
 func TestServerRequestRateLimit(t *testing.T) {
+	t.Parallel()
 
 	type action struct {
 		function           func(client *api.Client) error
@@ -51,7 +49,6 @@ func TestServerRequestRateLimit(t *testing.T) {
 		mode        string
 	}
 
-	// getKV and putKV are net/RPC calls
 	getKV := action{
 		function: func(client *api.Client) error {
 			_, _, err := client.KV().Get("foo", &api.QueryOptions{})
@@ -72,7 +69,7 @@ func TestServerRequestRateLimit(t *testing.T) {
 	testCases := []testCase{
 		// HTTP & net/RPC
 		{
-			description: "HTTP & net-RPC | Mode: disabled - errors: no | exceeded logs: no | metrics: no",
+			description: "HTTP & net/RPC / Mode: disabled - errors: no / exceeded logs: no / metrics: no",
 			cmd:         `-hcl=limits { request_limits { mode = "disabled" read_rate = 0 write_rate = 0 }}`,
 			mode:        "disabled",
 			operations: []operation{
@@ -91,7 +88,7 @@ func TestServerRequestRateLimit(t *testing.T) {
 			},
 		},
 		{
-			description: "HTTP & net-RPC | Mode: permissive - errors: no | exceeded logs: yes | metrics: yes",
+			description: "HTTP & net/RPC / Mode: permissive - errors: no / exceeded logs: yes / metrics: yes",
 			cmd:         `-hcl=limits { request_limits { mode = "permissive" read_rate = 0 write_rate = 0 }}`,
 			mode:        "permissive",
 			operations: []operation{
@@ -99,18 +96,18 @@ func TestServerRequestRateLimit(t *testing.T) {
 					action:            putKV,
 					expectedErrorMsg:  "",
 					expectExceededLog: true,
-					expectMetric:      true,
+					expectMetric:      false,
 				},
 				{
 					action:            getKV,
 					expectedErrorMsg:  "",
 					expectExceededLog: true,
-					expectMetric:      true,
+					expectMetric:      false,
 				},
 			},
 		},
 		{
-			description: "HTTP & net-RPC | Mode: enforcing - errors: yes | exceeded logs: yes | metrics: yes",
+			description: "HTTP & net/RPC / Mode: enforcing - errors: yes / exceeded logs: yes / metrics: yes",
 			cmd:         `-hcl=limits { request_limits { mode = "enforcing" read_rate = 0 write_rate = 0 }}`,
 			mode:        "enforcing",
 			operations: []operation{
@@ -127,32 +124,20 @@ func TestServerRequestRateLimit(t *testing.T) {
 					expectMetric:      true,
 				},
 			},
-		},
-	}
+		}}
 
 	for _, tc := range testCases {
-		tc := tc
 		t.Run(tc.description, func(t *testing.T) {
-			t.Parallel()
-			clusterConfig := &libtopology.ClusterConfig{
-				NumServers:  1,
-				NumClients:  0,
-				Cmd:         tc.cmd,
-				LogConsumer: &libtopology.TestLogConsumer{},
-				BuildOpts: &libcluster.BuildOptions{
-					Datacenter:             "dc1",
-					InjectAutoEncryption:   true,
-					InjectGossipEncryption: true,
-				},
-				ApplyDefaultProxySettings: false,
-			}
-
-			cluster, client := setupClusterAndClient(t, clusterConfig, true)
+			logConsumer := &TestLogConsumer{}
+			cluster := createCluster(t, tc.cmd, logConsumer)
 			defer terminate(t, cluster)
 
+			client, err := cluster.GetClient(nil, true)
+			require.NoError(t, err)
+
 			// perform actions and validate returned errors to client
 			for _, op := range tc.operations {
-				err := op.action.function(client)
+				err = op.action.function(client)
 				if len(op.expectedErrorMsg) > 0 {
 					require.Error(t, err)
 					require.Equal(t, op.expectedErrorMsg, err.Error())
@@ -165,14 +150,22 @@ func TestServerRequestRateLimit(t *testing.T) {
 			// doing this in a separate loop so we can perform actions, allow metrics
 			// and logs to collect and then assert on each.
 			for _, op := range tc.operations {
-				timer := &retry.Timer{Timeout: 15 * time.Second, Wait: 500 * time.Millisecond}
+				timer := &retry.Timer{Timeout: 10 * time.Second, Wait: 500 * time.Millisecond}
 				retry.RunWith(timer, t, func(r *retry.R) {
-					checkForMetric(r, cluster, op.action.rateLimitOperation, op.action.rateLimitType, tc.mode, op.expectMetric)
+					// validate metrics
+					metricsInfo, err := client.Agent().Metrics()
+					// TODO(NET-1978): currently returns NaN error
+					//			require.NoError(t, err)
+					if metricsInfo != nil && err == nil {
+						if op.expectMetric {
+							checkForMetric(r, metricsInfo, op.action.rateLimitOperation, op.action.rateLimitType, tc.mode)
+						}
+					}
 
 					// validate logs
 					// putting this last as there are cases where logs
 					// were not present in consumer when assertion was made.
-					checkLogsForMessage(r, clusterConfig.LogConsumer.Msgs,
+					checkLogsForMessage(r, logConsumer.Msgs,
 						fmt.Sprintf("[DEBUG] agent.server.rpc-rate-limit: RPC exceeded allowed rate limit: rpc=%s", op.action.rateLimitOperation),
 						op.action.rateLimitOperation, "exceeded", op.expectExceededLog)
 
@@ -182,68 +175,87 @@ func TestServerRequestRateLimit(t *testing.T) {
 	}
 }
 
-func setupClusterAndClient(t *testing.T, config *libtopology.ClusterConfig, isServer bool) (*libcluster.Cluster, *api.Client) {
-	cluster, _, _ := libtopology.NewCluster(t, config)
-
-	client, err := cluster.GetClient(nil, isServer)
-	require.NoError(t, err)
-
-	return cluster, client
-}
+func checkForMetric(t *retry.R, metricsInfo *api.MetricsInfo, operationName string, expectedLimitType string, expectedMode string) {
+	const counterName = "consul.rpc.rate_limit.exceeded"
 
-func checkForMetric(t require.TestingT, cluster *libcluster.Cluster, operationName string, expectedLimitType string, expectedMode string, expectMetric bool) {
-	// validate metrics
-	server, err := cluster.GetClient(nil, true)
-	require.NoError(t, err)
-	metricsInfo, err := server.Agent().Metrics()
-	// TODO(NET-1978): currently returns NaN error
-	//			require.NoError(t, err)
-	if metricsInfo != nil && err == nil {
-		if expectMetric {
-			const counterName = "consul.rpc.rate_limit.exceeded"
-
-			var counter api.SampledValue
-			for _, c := range metricsInfo.Counters {
-				if c.Name == counterName {
-					counter = c
-					break
-				}
-			}
-			require.NotEmptyf(t, counter.Name, "counter not found: %s", counterName)
+	var counter api.SampledValue
+	for _, c := range metricsInfo.Counters {
+		if c.Name == counterName {
+			counter = c
+			break
+		}
+	}
+	require.NotEmptyf(t, counter.Name, "counter not found: %s", counterName)
 
-			operation, ok := counter.Labels["op"]
-			require.True(t, ok)
+	operation, ok := counter.Labels["op"]
+	require.True(t, ok)
 
-			limitType, ok := counter.Labels["limit_type"]
-			require.True(t, ok)
+	limitType, ok := counter.Labels["limit_type"]
+	require.True(t, ok)
 
-			mode, ok := counter.Labels["mode"]
-			require.True(t, ok)
+	mode, ok := counter.Labels["mode"]
+	require.True(t, ok)
 
-			if operation == operationName {
-				require.GreaterOrEqual(t, counter.Count, 1)
-				require.Equal(t, expectedLimitType, limitType)
-				require.Equal(t, expectedMode, mode)
-			}
-		}
+	if operation == operationName {
+		require.GreaterOrEqual(t, counter.Count, 1)
+		require.Equal(t, expectedLimitType, limitType)
+		require.Equal(t, expectedMode, mode)
 	}
 }
 
-func checkLogsForMessage(t require.TestingT, logs []string, msg string, operationName string, logType string, logShouldExist bool) {
-	if logShouldExist {
-		found := false
-		for _, log := range logs {
-			if strings.Contains(log, msg) {
-				found = true
-				break
-			}
+func checkLogsForMessage(t *retry.R, logs []string, msg string, operationName string, logType string, logShouldExist bool) {
+	found := false
+	for _, log := range logs {
+		if strings.Contains(log, msg) {
+			found = true
+			break
 		}
-		expectedLog := fmt.Sprintf("%s log check failed for: %s. Log expected: %t", logType, operationName, logShouldExist)
-		require.Equal(t, logShouldExist, found, expectedLog)
 	}
+	require.Equal(t, logShouldExist, found, fmt.Sprintf("%s log check failed for: %s. Log expected: %t", logType, operationName, logShouldExist))
 }
 
 func terminate(t *testing.T, cluster *libcluster.Cluster) {
 	err := cluster.Terminate()
 	require.NoError(t, err)
 }
+
+type TestLogConsumer struct {
+	Msgs []string
+}
+
+func (g *TestLogConsumer) Accept(l testcontainers.Log) {
+	g.Msgs = append(g.Msgs, string(l.Content))
+}
+
+// createCluster
+func createCluster(t *testing.T, cmd string, logConsumer *TestLogConsumer) *libcluster.Cluster {
+	opts := libcluster.BuildOptions{
+		InjectAutoEncryption:   true,
+		InjectGossipEncryption: true,
+	}
+	ctx := libcluster.NewBuildContext(t, opts)
+
+	conf := libcluster.NewConfigBuilder(ctx).ToAgentConfig(t)
+	conf.LogConsumer = logConsumer
+
+	t.Logf("Cluster config:\n%s", conf.JSON)
+
+	parsedConfigs := []libcluster.Config{*conf}
+
+	cfgs := []libcluster.Config{}
+	for _, cfg := range parsedConfigs {
+		// add command
+		cfg.Cmd = append(cfg.Cmd, cmd)
+		cfgs = append(cfgs, cfg)
+	}
+	cluster, err := libcluster.New(t, cfgs)
+	require.NoError(t, err)
+
+	client, err := cluster.GetClient(nil, true)
+
+	require.NoError(t, err)
+	libcluster.WaitForLeader(t, cluster, client)
+	libcluster.WaitForMembers(t, client, 1)
+
+	return cluster
+}
diff --git a/test/integration/consul-container/test/resource/http_api/acl_enabled_test.go b/test/integration/consul-container/test/resource/http_api/acl_enabled_test.go
deleted file mode 100644
index f2615a891e7d8..0000000000000
--- a/test/integration/consul-container/test/resource/http_api/acl_enabled_test.go
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func Test_ServerAgent_Endpoints(t *testing.T) {
-	t.Parallel()
-
-	numOfServers := 1
-	numOfClients := 0
-	cluster, resourceClient := SetupClusterAndClient(t, makeClusterConfig(numOfServers, numOfClients, true), true)
-
-	resource := Resource{
-		HttpClient: resourceClient,
-	}
-
-	defer Terminate(t, cluster)
-
-	testCases := []testCase{
-		{
-			description: "should write resource successfully when token is provided",
-			operations: []operation{
-				{
-					action:           applyResource,
-					expectedErrorMsg: "",
-					includeToken:     true,
-				},
-				{
-					action:           readResource,
-					expectedErrorMsg: "",
-					includeToken:     true,
-				},
-				{
-					action:           listResource,
-					expectedErrorMsg: "",
-					includeToken:     true,
-				},
-				{
-					action:           deleteResource,
-					expectedErrorMsg: "",
-					includeToken:     true,
-				},
-			},
-			config: []config{
-				{
-					gvk:          demoGVK,
-					resourceName: "korn",
-					queryOptions: defaultTenancyQueryOptions,
-					payload:      demoPayload,
-				},
-				{
-					gvk:          demoGVK,
-					resourceName: "korn",
-					queryOptions: defaultTenancyQueryOptions,
-				},
-				{
-					gvk:          demoGVK,
-					queryOptions: defaultTenancyQueryOptions,
-				},
-				{
-					gvk:          demoGVK,
-					resourceName: "korn",
-					queryOptions: defaultTenancyQueryOptions,
-				},
-			},
-		},
-		{
-			description: "should return permission denied",
-			operations: []operation{
-				{
-					action:           applyResource,
-					expectedErrorMsg: "Unexpected response code: 403 (rpc error: code = PermissionDenied desc = Permission denied",
-					includeToken:     false,
-				},
-				{
-					action:           applyResource,
-					expectedErrorMsg: "",
-					includeToken:     true,
-				},
-				{
-					action:           readResource,
-					expectedErrorMsg: "Unexpected response code: 403 (rpc error: code = PermissionDenied desc = Permission denied",
-					includeToken:     false,
-				},
-				{
-					action:           listResource,
-					expectedErrorMsg: "Unexpected response code: 403 (rpc error: code = PermissionDenied desc = Permission denied",
-					includeToken:     false,
-				},
-				{
-					action:           deleteResource,
-					expectedErrorMsg: "Unexpected response code: 403 (rpc error: code = PermissionDenied desc = Permission denied",
-					includeToken:     false,
-				},
-			},
-			config: []config{
-				{
-					gvk:          demoGVK,
-					resourceName: "prince",
-					queryOptions: defaultTenancyQueryOptions,
-					payload:      demoPayload,
-				},
-				{
-					gvk:          demoGVK,
-					resourceName: "deleteme",
-					queryOptions: defaultTenancyQueryOptions,
-					payload:      demoPayload,
-				},
-				{
-					gvk:          demoGVK,
-					resourceName: "keith",
-					queryOptions: defaultTenancyQueryOptions,
-				},
-				{
-					gvk:          demoGVK,
-					queryOptions: defaultTenancyQueryOptions,
-				},
-				{
-					gvk:          demoGVK,
-					resourceName: "deleteme",
-					queryOptions: defaultTenancyQueryOptions,
-				},
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		tc := tc
-		t.Run(tc.description, func(t *testing.T) {
-			for i, op := range tc.operations {
-				if op.includeToken {
-					tc.config[i].queryOptions.Token = cluster.TokenBootstrap
-				}
-
-				err := op.action(&resource, tc.config[i])
-				if len(op.expectedErrorMsg) > 0 {
-					require.Error(t, err)
-					require.Contains(t, err.Error(), op.expectedErrorMsg)
-				} else {
-					require.NoError(t, err)
-				}
-			}
-		})
-	}
-}
-
-func Test_ClientAgent(t *testing.T) {
-	t.Parallel()
-
-	numOfServers := 1
-	numOfClients := 1
-	cluster, resourceClient := SetupClusterAndClient(t, makeClusterConfig(numOfServers, numOfClients, true), false)
-
-	resource := Resource{
-		HttpClient: resourceClient,
-	}
-
-	defer Terminate(t, cluster)
-
-	testCases := []testCase{
-		{
-			description: "should write resource successfully when token is provided",
-			operations: []operation{
-				{
-					action:           applyResource,
-					expectedErrorMsg: "",
-					includeToken:     true,
-				},
-			},
-			config: []config{
-				{
-					gvk:          demoGVK,
-					resourceName: "test",
-					queryOptions: defaultTenancyQueryOptions,
-					payload:      demoPayload,
-				},
-			},
-		},
-		{
-			description: "should return unauthorized when token is bad",
-			operations: []operation{
-				{
-					action:           applyResource,
-					expectedErrorMsg: "Unexpected response code: 403 (rpc error: code = PermissionDenied desc = Permission denied",
-					includeToken:     false,
-				},
-			},
-			config: []config{
-				{
-					gvk:          demoGVK,
-					resourceName: "test2",
-					queryOptions: defaultTenancyQueryOptions,
-					payload:      demoPayload,
-				},
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		tc := tc
-		t.Run(tc.description, func(t *testing.T) {
-			for i, op := range tc.operations {
-				if op.includeToken {
-					tc.config[i].queryOptions.Token = cluster.TokenBootstrap
-				}
-
-				err := op.action(&resource, tc.config[i])
-				if len(op.expectedErrorMsg) > 0 {
-					require.Error(t, err)
-					require.Contains(t, err.Error(), op.expectedErrorMsg)
-				} else {
-					require.NoError(t, err)
-				}
-			}
-		})
-	}
-}
diff --git a/test/integration/consul-container/test/resource/http_api/client/client.go b/test/integration/consul-container/test/resource/http_api/client/client.go
deleted file mode 100644
index bdd9d70cd17c0..0000000000000
--- a/test/integration/consul-container/test/resource/http_api/client/client.go
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package client
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/hashicorp/consul/api"
-)
-
-// QueryOptions are used to parameterize a query
-type QueryOptions struct {
-	// Namespace overrides the `default` namespace
-	// Note: Namespaces are available only in Consul Enterprise
-	Namespace string
-
-	// Partition overrides the `default` partition
-	// Note: Partitions are available only in Consul Enterprise
-	Partition string
-
-	// Providing a peer name in the query option
-	Peer string
-
-	// RequireConsistent forces the read to be fully consistent.
-	// This is more expensive but prevents ever performing a stale
-	// read.
-	RequireConsistent bool
-
-	// ctx is an optional context pass through to the underlying HTTP
-	// request layer. Use Context() and WithContext() to manage this.
-	ctx context.Context
-
-	// Token is used to provide a per-request ACL token
-	// which overrides the agent's default token.
-	Token string
-}
-
-// Client provides a client to the Consul API
-type HttpClient struct {
-	modifyLock sync.RWMutex
-	headers    http.Header
-
-	config api.Config
-}
-
-// Headers gets the current set of headers used for requests. This returns a
-// copy; to modify it call AddHeader or SetHeaders.
-func (c *HttpClient) Headers() http.Header {
-	c.modifyLock.RLock()
-	defer c.modifyLock.RUnlock()
-
-	if c.headers == nil {
-		return nil
-	}
-
-	ret := make(http.Header)
-	for k, v := range c.headers {
-		ret[k] = append(ret[k], v...)
-	}
-
-	return ret
-}
-
-// NewClient returns a new client
-func NewClient(config *api.Config) (*HttpClient, error) {
-	// bootstrap the config
-	defConfig := api.DefaultConfig()
-
-	if config.Address == "" {
-		config.Address = defConfig.Address
-	}
-
-	if config.Scheme == "" {
-		config.Scheme = defConfig.Scheme
-	}
-
-	if config.Transport == nil {
-		config.Transport = defConfig.Transport
-	}
-
-	if config.HttpClient == nil {
-		var err error
-		config.HttpClient, err = NewHttpClient(config.Transport)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return &HttpClient{config: *config, headers: make(http.Header)}, nil
-}
-
-// NewHttpClient returns an http client configured with the given Transport and TLS
-// config.
-func NewHttpClient(transport *http.Transport) (*http.Client, error) {
-	client := &http.Client{
-		Transport: transport,
-	}
-
-	return client, nil
-}
-
-// request is used to help build up a request
-type request struct {
-	config *api.Config
-	method string
-	url    *url.URL
-	params url.Values
-	body   io.Reader
-	header http.Header
-	Obj    interface{}
-	ctx    context.Context
-}
-
-// setQueryOptions is used to annotate the request with
-// additional query options
-func (r *request) SetQueryOptions(q *QueryOptions) {
-	if q == nil {
-		return
-	}
-	if q.Namespace != "" {
-		// For backwards-compatibility with existing tests,
-		// use the short-hand query param name "ns"
-		// rather than the alternative long-hand "namespace"
-		r.params.Set("ns", q.Namespace)
-	}
-	if q.Partition != "" {
-		// For backwards-compatibility with existing tests,
-		// use the long-hand query param name "partition"
-		// rather than the alternative short-hand "ap"
-		r.params.Set("partition", q.Partition)
-	}
-	if q.Peer != "" {
-		r.params.Set("peer", q.Peer)
-	}
-
-	if q.RequireConsistent {
-		r.params.Set("consistent", "")
-	}
-
-	if q.Token != "" {
-		r.header.Set("X-Consul-Token", q.Token)
-	}
-
-	r.ctx = q.ctx
-}
-
-// toHTTP converts the request to an HTTP request
-func (r *request) toHTTP() (*http.Request, error) {
-	// Encode the query parameters
-	r.url.RawQuery = r.params.Encode()
-
-	// Check if we should encode the body
-	if r.body == nil && r.Obj != nil {
-		b, err := encodeBody(r.Obj)
-		if err != nil {
-			return nil, err
-		}
-		r.body = b
-	}
-
-	// Create the HTTP request
-	req, err := http.NewRequest(r.method, r.url.RequestURI(), r.body)
-	if err != nil {
-		return nil, err
-	}
-
-	// validate that socket communications that do not use the host, detect
-	// slashes in the host name and replace it with local host.
-	// this is required since go started validating req.host in 1.20.6 and 1.19.11.
-	// prior to that they would strip out the slashes for you.  They removed that
-	// behavior and added more strict validation as part of a CVE.
-	// This issue is being tracked by the Go team:
-	// https://github.com/golang/go/issues/61431
-	// If there is a resolution in this issue, we will remove this code.
-	// In the time being, this is the accepted workaround.
-	if strings.HasPrefix(r.url.Host, "/") {
-		r.url.Host = "localhost"
-	}
-
-	req.URL.Host = r.url.Host
-	req.URL.Scheme = r.url.Scheme
-	req.Host = r.url.Host
-	req.Header = r.header
-
-	// Content-Type must always be set when a body is present
-	// See https://github.com/hashicorp/consul/issues/10011
-	if req.Body != nil && req.Header.Get("Content-Type") == "" {
-		req.Header.Set("Content-Type", "application/json")
-	}
-
-	// Setup auth
-	if r.config.HttpAuth != nil {
-		req.SetBasicAuth(r.config.HttpAuth.Username, r.config.HttpAuth.Password)
-	}
-	if r.ctx != nil {
-		return req.WithContext(r.ctx), nil
-	}
-
-	return req, nil
-}
-
-// newRequest is used to create a new request
-func (c *HttpClient) NewRequest(method, path string) *request {
-	r := &request{
-		config: &c.config,
-		method: method,
-		url: &url.URL{
-			Scheme: c.config.Scheme,
-			Host:   c.config.Address,
-			Path:   c.config.PathPrefix + path,
-		},
-		params: make(map[string][]string),
-		header: c.Headers(),
-	}
-
-	if c.config.Namespace != "" {
-		r.params.Set("ns", c.config.Namespace)
-	}
-	if c.config.Partition != "" {
-		r.params.Set("partition", c.config.Partition)
-	}
-	if c.config.Token != "" {
-		r.header.Set("X-Consul-Token", r.config.Token)
-	}
-	return r
-}
-
-// doRequest runs a request with our client
-func (c *HttpClient) DoRequest(r *request) (time.Duration, *http.Response, error) {
-	req, err := r.toHTTP()
-	if err != nil {
-		return 0, nil, err
-	}
-	start := time.Now()
-	resp, err := c.config.HttpClient.Do(req)
-	diff := time.Since(start)
-	return diff, resp, err
-}
-
-// DecodeBody is used to JSON decode a body
-func DecodeBody(resp *http.Response, out interface{}) error {
-	dec := json.NewDecoder(resp.Body)
-	return dec.Decode(out)
-}
-
-// encodeBody is used to encode a request body
-func encodeBody(obj interface{}) (io.Reader, error) {
-	buf := bytes.NewBuffer(nil)
-	enc := json.NewEncoder(buf)
-	if err := enc.Encode(obj); err != nil {
-		return nil, err
-	}
-	return buf, nil
-}
-
-// requireOK is used to wrap doRequest and check for a 200
-func RequireOK(resp *http.Response) error {
-	return RequireHttpCodes(resp, 200)
-}
-
-// requireHttpCodes checks for the "allowable" http codes for a response
-func RequireHttpCodes(resp *http.Response, httpCodes ...int) error {
-	// if there is an http code that we require, return w no error
-	for _, httpCode := range httpCodes {
-		if resp.StatusCode == httpCode {
-			return nil
-		}
-	}
-
-	// if we reached here, then none of the http codes in resp matched any that we expected
-	// so err out
-	return generateUnexpectedResponseCodeError(resp)
-}
-
-// closeResponseBody reads resp.Body until EOF, and then closes it. The read
-// is necessary to ensure that the http.Client's underlying RoundTripper is able
-// to re-use the TCP connection. See godoc on net/http.Client.Do.
-func CloseResponseBody(resp *http.Response) error {
-	_, _ = io.Copy(io.Discard, resp.Body)
-	return resp.Body.Close()
-}
-
-type StatusError struct {
-	Code int
-	Body string
-}
-
-func (e StatusError) Error() string {
-	return fmt.Sprintf("Unexpected response code: %d (%s)", e.Code, e.Body)
-}
-
-// generateUnexpectedResponseCodeError consumes the rest of the body, closes
-// the body stream and generates an error indicating the status code was
-// unexpected.
-func generateUnexpectedResponseCodeError(resp *http.Response) error {
-	var buf bytes.Buffer
-	io.Copy(&buf, resp.Body)
-	CloseResponseBody(resp)
-
-	trimmed := strings.TrimSpace(buf.String())
-	return StatusError{Code: resp.StatusCode, Body: trimmed}
-}
diff --git a/test/integration/consul-container/test/resource/http_api/helper.go b/test/integration/consul-container/test/resource/http_api/helper.go
deleted file mode 100644
index cb70b6606021f..0000000000000
--- a/test/integration/consul-container/test/resource/http_api/helper.go
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"fmt"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libtopology "github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-	client "github.com/hashicorp/consul/test/integration/consul-container/test/resource/http_api/client"
-)
-
-func makeClusterConfig(numOfServers int, numOfClients int, aclEnabled bool) *libtopology.ClusterConfig {
-	return &libtopology.ClusterConfig{
-		NumServers:  numOfServers,
-		NumClients:  numOfClients,
-		LogConsumer: &libtopology.TestLogConsumer{},
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter: "dc1",
-			ACLEnabled: aclEnabled,
-		},
-		ApplyDefaultProxySettings: false,
-	}
-}
-
-type Resource struct {
-	HttpClient *client.HttpClient
-}
-
-type GVK struct {
-	Group   string
-	Version string
-	Kind    string
-}
-
-var demoGVK = GVK{
-	Group:   "demo",
-	Version: "v2",
-	Kind:    "Artist",
-}
-
-var defaultTenancyQueryOptions = client.QueryOptions{
-	Namespace: "default",
-	Partition: "default",
-	Peer:      "local",
-}
-
-type WriteRequest struct {
-	Metadata map[string]string
-	Data     map[string]any
-}
-
-var demoPayload = WriteRequest{
-	Metadata: map[string]string{
-		"foo": "bar",
-	},
-	Data: map[string]any{
-		"name": "cool",
-	},
-}
-
-type config struct {
-	gvk          GVK
-	resourceName string
-	queryOptions client.QueryOptions
-	payload      WriteRequest
-}
-
-type operation struct {
-	action           func(client *Resource, config config) error
-	expectedErrorMsg string
-	includeToken     bool
-}
-
-type testCase struct {
-	description string
-	operations  []operation
-	config      []config
-}
-
-var applyResource = func(resource *Resource, config config) error {
-	_, err := resource.Apply(&config.gvk, config.resourceName, &config.queryOptions, &config.payload)
-	return err
-}
-var readResource = func(resource *Resource, config config) error {
-	_, err := resource.Read(&config.gvk, config.resourceName, &config.queryOptions)
-	return err
-}
-var deleteResource = func(resource *Resource, config config) error {
-	err := resource.Delete(&config.gvk, config.resourceName, &config.queryOptions)
-	return err
-}
-var listResource = func(resource *Resource, config config) error {
-	_, err := resource.List(&config.gvk, &config.queryOptions)
-	return err
-}
-
-func (resource *Resource) Read(gvk *GVK, resourceName string, q *client.QueryOptions) (map[string]interface{}, error) {
-	r := resource.HttpClient.NewRequest("GET", strings.ToLower(fmt.Sprintf("/api/%s/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind, resourceName)))
-	r.SetQueryOptions(q)
-	_, resp, err := resource.HttpClient.DoRequest(r)
-	if err != nil {
-		return nil, err
-	}
-	defer client.CloseResponseBody(resp)
-	if err := client.RequireOK(resp); err != nil {
-		return nil, err
-	}
-
-	var out map[string]interface{}
-	if err := client.DecodeBody(resp, &out); err != nil {
-		return nil, err
-	}
-
-	return out, nil
-}
-
-func (resource *Resource) Delete(gvk *GVK, resourceName string, q *client.QueryOptions) error {
-	r := resource.HttpClient.NewRequest("DELETE", strings.ToLower(fmt.Sprintf("/api/%s/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind, resourceName)))
-	r.SetQueryOptions(q)
-	_, resp, err := resource.HttpClient.DoRequest(r)
-	if err != nil {
-		return err
-	}
-	defer client.CloseResponseBody(resp)
-	if err := client.RequireHttpCodes(resp, http.StatusNoContent); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (resource *Resource) Apply(gvk *GVK, resourceName string, q *client.QueryOptions, payload *WriteRequest) (*map[string]interface{}, error) {
-	url := strings.ToLower(fmt.Sprintf("/api/%s/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind, resourceName))
-
-	r := resource.HttpClient.NewRequest("PUT", url)
-	r.SetQueryOptions(q)
-	r.Obj = payload
-	_, resp, err := resource.HttpClient.DoRequest(r)
-	if err != nil {
-		return nil, err
-	}
-	defer client.CloseResponseBody(resp)
-	if err := client.RequireOK(resp); err != nil {
-		return nil, err
-	}
-
-	var out map[string]interface{}
-
-	if err := client.DecodeBody(resp, &out); err != nil {
-		return nil, err
-	}
-
-	return &out, nil
-}
-
-type ListResponse struct {
-	Resources []map[string]interface{} `json:"resources"`
-}
-
-func (resource *Resource) List(gvk *GVK, q *client.QueryOptions) (*ListResponse, error) {
-	r := resource.HttpClient.NewRequest("GET", strings.ToLower(fmt.Sprintf("/api/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind)))
-	r.SetQueryOptions(q)
-	_, resp, err := resource.HttpClient.DoRequest(r)
-	if err != nil {
-		return nil, err
-	}
-	defer client.CloseResponseBody(resp)
-	if err := client.RequireOK(resp); err != nil {
-		return nil, err
-	}
-
-	var out *ListResponse
-	if err := client.DecodeBody(resp, &out); err != nil {
-		return nil, err
-	}
-
-	return out, nil
-}
-
-func SetupClusterAndClient(t *testing.T, clusterConfig *libtopology.ClusterConfig, getServerHttpClient bool) (*libcluster.Cluster, *client.HttpClient) {
-	cluster, _, _ := libtopology.NewCluster(t, clusterConfig)
-
-	// create a http api client for resource service
-	var resourceHttpClient *client.HttpClient
-	if getServerHttpClient {
-		apiClientConfig := cluster.Servers()[0].GetAPIClientConfig()
-		apiClientConfig.Token = ""
-		resourceClient, err := client.NewClient(&apiClientConfig)
-		require.NoError(t, err)
-
-		resourceHttpClient = resourceClient
-	} else {
-		apiClientConfig := cluster.Clients()[0].GetAPIClientConfig()
-		apiClientConfig.Token = ""
-		resourceClient, err := client.NewClient(&apiClientConfig)
-		require.NoError(t, err)
-
-		resourceHttpClient = resourceClient
-	}
-
-	return cluster, resourceHttpClient
-}
-
-func Terminate(t *testing.T, cluster *libcluster.Cluster) {
-	err := cluster.Terminate()
-	require.NoError(t, err)
-}
diff --git a/test/integration/consul-container/test/snapshot/snapshot_restore_test.go b/test/integration/consul-container/test/snapshot/snapshot_restore_test.go
index 91fcec05bb026..f2c5cefc3cf65 100644
--- a/test/integration/consul-container/test/snapshot/snapshot_restore_test.go
+++ b/test/integration/consul-container/test/snapshot/snapshot_restore_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package snapshot
 
 import (
@@ -41,7 +38,7 @@ func testSnapShotRestoreForLogStore(t *testing.T, logStore libcluster.LogStore)
 		NumClients: 0,
 		BuildOpts: &libcluster.BuildOptions{
 			Datacenter:      "dc1",
-			ConsulImageName: utils.GetTargetImageName(),
+			ConsulImageName: utils.TargetImageName,
 			ConsulVersion:   utils.TargetVersion,
 			LogStore:        logStore,
 		},
@@ -70,7 +67,7 @@ func testSnapShotRestoreForLogStore(t *testing.T, logStore libcluster.LogStore)
 		NumClients: 0,
 		BuildOpts: &libcluster.BuildOptions{
 			Datacenter:      "dc1",
-			ConsulImageName: utils.GetTargetImageName(),
+			ConsulImageName: utils.TargetImageName,
 			ConsulVersion:   utils.TargetVersion,
 			LogStore:        logStore,
 		},
@@ -82,15 +79,10 @@ func testSnapShotRestoreForLogStore(t *testing.T, logStore libcluster.LogStore)
 	libcluster.WaitForMembers(t, client2, 3)
 
 	// Restore the saved snapshot
-	retry.RunWith(libcluster.LongFailer(), t, func(r *retry.R) {
-		require.NoError(r, client2.Snapshot().Restore(nil, snapshot))
-	})
+	require.NoError(t, client2.Snapshot().Restore(nil, snapshot))
 
 	libcluster.WaitForLeader(t, cluster2, client2)
 
-	leader, err := cluster2.Leader()
-	require.NoError(t, err)
-
 	followers, err := cluster2.Followers()
 	require.NoError(t, err)
 	require.Len(t, followers, 2)
@@ -98,17 +90,6 @@ func testSnapShotRestoreForLogStore(t *testing.T, logStore libcluster.LogStore)
 	// use a follower api client and set `AllowStale` to true
 	// to test the follower snapshot install code path as well.
 	fc := followers[0].GetClient()
-	lc := leader.GetClient()
-
-	retry.Run(t, func(r *retry.R) {
-		self, err := lc.Agent().Self()
-		require.NoError(r, err)
-		LeaderLogIndex := self["Stats"]["raft"].(map[string]interface{})["last_log_index"].(string)
-		self, err = fc.Agent().Self()
-		require.NoError(r, err)
-		followerLogIndex := self["Stats"]["raft"].(map[string]interface{})["last_log_index"].(string)
-		require.Equal(r, LeaderLogIndex, followerLogIndex)
-	})
 
 	// Follower might not have finished loading snapshot yet which means attempts
 	// could return nil or "key not found" for a while.
diff --git a/test/integration/consul-container/test/tproxy/tproxy_test.go b/test/integration/consul-container/test/tproxy/tproxy_test.go
deleted file mode 100644
index 15eae0c210906..0000000000000
--- a/test/integration/consul-container/test/tproxy/tproxy_test.go
+++ /dev/null
@@ -1,224 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tproxy
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-)
-
-var requestRetryTimer = &retry.Timer{Timeout: 120 * time.Second, Wait: 500 * time.Millisecond}
-
-// TestTProxyService makes sure two services in the same datacenter have connectivity
-// with transparent proxy enabled.
-//
-// Steps:
-//   - Create a single server cluster.
-//   - Create the example static-server and sidecar containers, then register them both with Consul
-//   - Create an example static-client sidecar, then register both the service and sidecar with Consul
-//   - Make sure a request from static-client to the virtual address (<svc>.virtual.consul) returns a
-//     response from the upstream.
-func TestTProxyService(t *testing.T) {
-	t.Parallel()
-
-	cluster := createCluster(t, 2) // 2 client agent pods
-
-	clientService := createServices(t, cluster)
-	_, adminPort := clientService.GetAdminAddr()
-
-	libassert.AssertUpstreamEndpointStatus(t, adminPort, "static-server.default", "HEALTHY", 1)
-	libassert.AssertContainerState(t, clientService, "running")
-	assertHTTPRequestToVirtualAddress(t, clientService, "static-server")
-}
-
-// TestTProxyPermissiveMTLS makes sure that a service in permissive mTLS mode accepts
-// non-mesh traffic on the upstream service's port.
-//
-// Steps:
-//   - Create a single server cluster
-//   - Create the static-server and static-client services in the mesh
-//   - In default/strict mTLS mode, check that requests to static-server's
-//     virtual address succeed, but requests from outside the mesh fail.
-//   - In permissive mTLS mode, check that both requests to static-server's
-//     virtual addresss succeed and that requests from outside the mesh to
-//     the static-server's regular address/port succeed.
-func TestTProxyPermissiveMTLS(t *testing.T) {
-	t.Parallel()
-
-	// Create three client "pods" each running a client agent and (optionally) a service:
-	//   cluster.Agents[0] - consul server
-	//   cluster.Agents[1] - static-client
-	//   cluster.Agents[2] - static-server
-	//   cluster.Agents[3] - (no service)
-	// We run curl requests from cluster.Agents[3] to simulate requests from outside the mesh.
-	cluster := createCluster(t, 3)
-
-	staticServerPod := cluster.Agents[1]
-	nonMeshPod := cluster.Agents[3]
-
-	clientService := createServices(t, cluster)
-	_, adminPort := clientService.GetAdminAddr()
-
-	libassert.AssertUpstreamEndpointStatus(t, adminPort, "static-server.default", "HEALTHY", 1)
-	libassert.AssertContainerState(t, clientService, "running")
-
-	// Validate mesh traffic to the virtual address succeeds in strict/default mTLS mode.
-	assertHTTPRequestToVirtualAddress(t, clientService, "static-server")
-	// Validate non-mesh is blocked in strict/default mTLS mode.
-	assertHTTPRequestToServiceAddress(t, nonMeshPod, staticServerPod, "static-server", false)
-
-	// Put the service in permissive mTLS mode
-	require.NoError(t, cluster.ConfigEntryWrite(&api.MeshConfigEntry{
-		AllowEnablingPermissiveMutualTLS: true,
-	}))
-	require.NoError(t, cluster.ConfigEntryWrite(&api.ServiceConfigEntry{
-		Kind:          api.ServiceDefaults,
-		Name:          libservice.StaticServerServiceName,
-		MutualTLSMode: api.MutualTLSModePermissive,
-	}))
-
-	// Validate mesh traffic to the virtual address succeeds in permissive mTLS mode.
-	assertHTTPRequestToVirtualAddress(t, clientService, "static-server")
-	// Validate non-mesh traffic succeeds in permissive mode.
-	assertHTTPRequestToServiceAddress(t, nonMeshPod, staticServerPod, "static-server", true)
-}
-
-// assertHTTPRequestToVirtualAddress checks that a request to the
-// static-server's virtual address succeeds by running curl in the given
-// `clientService` container.
-//
-// This assumes the destination service is running Fortio. The request is made
-// to `<serverName>.virtual.consul/debug?env=dump` and this checks that
-// `FORTIO_NAME=<serverName>` is contained in the response.
-func assertHTTPRequestToVirtualAddress(t *testing.T, clientService libservice.Service, serverName string) {
-	virtualHostname := fmt.Sprintf("%s.virtual.consul", serverName)
-
-	retry.RunWith(requestRetryTimer, t, func(r *retry.R) {
-		// Test that we can make a request to the virtual ip to reach the upstream.
-		//
-		// NOTE(pglass): This uses a workaround for DNS because I had trouble modifying
-		// /etc/resolv.conf. There is a --dns option to docker run, but it
-		// didn't seem to be exposed via testcontainers. I'm not sure if it would
-		// do what I want. In any case, Docker sets up /etc/resolv.conf for certain
-		// functionality so it seems better to leave DNS alone.
-		//
-		// But, that means DNS queries aren't redirected to Consul out of the box.
-		// As a workaround, we `dig @localhost:53` which is iptables-redirected to
-		// localhost:8600 where the Consul client responds with the virtual ip.
-		//
-		// In tproxy tests, Envoy is not configured with a unique listener for each
-		// upstream. This means the usual approach for non-tproxy tests doesn't
-		// work - where we send the request to a host address mapped in to Envoy's
-		// upstream listener. Instead, we exec into the container and run curl.
-		//
-		// We must make this request with a non-envoy user. The envoy and consul
-		// users are excluded from traffic redirection rules, so instead we
-		// make the request as root.
-		out, err := clientService.Exec(
-			context.Background(),
-			[]string{"sudo", "sh", "-c", fmt.Sprintf(`
-			set -e
-			VIRTUAL=$(dig @localhost +short %[1]s)
-			echo "Virtual IP: $VIRTUAL"
-			curl -s "$VIRTUAL/debug?env=dump"
-			`, virtualHostname),
-			},
-		)
-		t.Logf("curl request to upstream virtual address\nerr = %v\nout = %s", err, out)
-		require.NoError(r, err)
-		require.Regexp(r, `Virtual IP: 240.0.0.\d+`, out)
-		require.Contains(r, out, fmt.Sprintf("FORTIO_NAME=%s", serverName))
-	})
-}
-
-// assertHTTPRequestToServiceAddress checks the result of a request from the
-// given `client` container to the given `server` container. If expSuccess is
-// true, this checks for a successful request and otherwise it checks for the
-// error we expect when traffic is rejected by mTLS.
-//
-// This assumes the destination service is running Fortio. It makes the request
-// to `<serverIP>:8080/debug?env=dump` and checks for `FORTIO_NAME=<expServiceName>`
-// in the response.
-func assertHTTPRequestToServiceAddress(t *testing.T, client, server libcluster.Agent, expServiceName string, expSuccess bool) {
-	upstreamURL := fmt.Sprintf("http://%s:8080/debug?env=dump", server.GetIP())
-	retry.RunWith(requestRetryTimer, t, func(r *retry.R) {
-		out, err := client.Exec(context.Background(), []string{"curl", "-s", upstreamURL})
-		t.Logf("curl request to upstream service address: url=%s\nerr = %v\nout = %s", upstreamURL, err, out)
-
-		if expSuccess {
-			require.NoError(r, err)
-			require.Contains(r, out, fmt.Sprintf("FORTIO_NAME=%s", expServiceName))
-		} else {
-			require.Error(r, err)
-			require.Contains(r, err.Error(), "exit code 52")
-		}
-	})
-}
-
-func createCluster(t *testing.T, numClients int) *libcluster.Cluster {
-	cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{
-		NumServers:                1,
-		NumClients:                numClients,
-		ApplyDefaultProxySettings: true,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:             "dc1",
-			InjectAutoEncryption:   true,
-			InjectGossipEncryption: true,
-			// TODO(rb): fix the test to not need the service/envoy stack to use :8500
-			AllowHTTPAnyway: true,
-		},
-	})
-	return cluster
-}
-
-// createServices creates the static-client and static-server services with
-// transparent proxy enabled. It returns a Service for the static-client.
-func createServices(t *testing.T, cluster *libcluster.Cluster) libservice.Service {
-	{
-		node := cluster.Agents[1]
-		client := node.GetClient()
-		// Create a service and proxy instance
-		serviceOpts := &libservice.ServiceOpts{
-			Name:     libservice.StaticServerServiceName,
-			ID:       "static-server",
-			HTTPPort: 8080,
-			GRPCPort: 8079,
-			Connect: libservice.SidecarService{
-				Proxy: libservice.ConnectProxy{
-					Mode: "transparent",
-				},
-			},
-		}
-
-		// Create a service and proxy instance
-		_, _, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOpts)
-		require.NoError(t, err)
-
-		libassert.CatalogServiceExists(t, client, "static-server-sidecar-proxy", nil)
-		libassert.CatalogServiceExists(t, client, libservice.StaticServerServiceName, nil)
-	}
-
-	{
-		node := cluster.Agents[2]
-		client := node.GetClient()
-
-		// Create a client proxy instance with the server as an upstream
-		clientConnectProxy, err := libservice.CreateAndRegisterStaticClientSidecar(node, "", false, true, nil)
-		require.NoError(t, err)
-
-		libassert.CatalogServiceExists(t, client, "static-client-sidecar-proxy", nil)
-		return clientConnectProxy
-	}
-}
diff --git a/test/integration/consul-container/test/trafficpermissions/tcp_test.go b/test/integration/consul-container/test/trafficpermissions/tcp_test.go
deleted file mode 100644
index 6175acdd5ac93..0000000000000
--- a/test/integration/consul-container/test/trafficpermissions/tcp_test.go
+++ /dev/null
@@ -1,657 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package trafficpermissions
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-	"github.com/stretchr/testify/require"
-)
-
-const (
-	echoPort                = 9999
-	tcpPort                 = 8888
-	staticServerVIP         = "240.0.0.1"
-	staticServerReturnValue = "static-server"
-	staticServerIdentity    = "static-server-identity"
-)
-
-type trafficPermissionsCase struct {
-	tp1                *pbauth.TrafficPermissions
-	tp2                *pbauth.TrafficPermissions
-	client1TCPSuccess  bool
-	client1EchoSuccess bool
-	client2TCPSuccess  bool
-	client2EchoSuccess bool
-}
-
-// We are using tproxy to test traffic permissions now because explicitly specifying destinations
-// doesn't work when multiple downstreams specify the same destination yet. In the future, we will need
-// to update this to use explicit destinations once we infer tproxy destinations from traffic permissions.
-//
-// This also explicitly uses virtual IPs and virtual ports because Consul DNS doesn't support v2 resources yet.
-// We should update this to use Consul DNS when it is working.
-func runTrafficPermissionsTests(t *testing.T, aclsEnabled bool, cases map[string]trafficPermissionsCase) {
-	t.Parallel()
-	cluster, resourceClient := createCluster(t, aclsEnabled)
-
-	serverDataplane := createServerResources(t, resourceClient, cluster, cluster.Agents[1])
-	client1Dataplane := createClientResources(t, resourceClient, cluster, cluster.Agents[2], 1)
-	client2Dataplane := createClientResources(t, resourceClient, cluster, cluster.Agents[3], 2)
-
-	assertDataplaneContainerState(t, client1Dataplane, "running")
-	assertDataplaneContainerState(t, client2Dataplane, "running")
-	assertDataplaneContainerState(t, serverDataplane, "running")
-
-	for n, tc := range cases {
-		t.Run(n, func(t *testing.T) {
-			storeStaticServerTrafficPermissions(t, resourceClient, tc.tp1, 1)
-			storeStaticServerTrafficPermissions(t, resourceClient, tc.tp2, 2)
-
-			// We must establish a new TCP connection each time because TCP traffic permissions are
-			// enforced at the connection level.
-			retry.Run(t, func(r *retry.R) {
-				assertPassing(r, httpRequestToVirtualAddress, client1Dataplane, tc.client1TCPSuccess)
-				assertPassing(r, echoToVirtualAddress, client1Dataplane, tc.client1EchoSuccess)
-				assertPassing(r, httpRequestToVirtualAddress, client2Dataplane, tc.client2TCPSuccess)
-				assertPassing(r, echoToVirtualAddress, client2Dataplane, tc.client2EchoSuccess)
-			})
-		})
-	}
-}
-
-func TestTrafficPermission_TCP_DefaultDeny(t *testing.T) {
-	cases := map[string]trafficPermissionsCase{
-		"default deny": {
-			tp1:                nil,
-			client1TCPSuccess:  false,
-			client1EchoSuccess: false,
-			client2TCPSuccess:  false,
-			client2EchoSuccess: false,
-		},
-		"allow everything": {
-			tp1: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: staticServerIdentity,
-				},
-				Action: pbauth.Action_ACTION_ALLOW,
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								// IdentityName: "static-client-1-identity",
-								Namespace: "default",
-								Partition: "default",
-								Peer:      "local",
-							},
-						},
-					},
-				},
-			},
-			client1TCPSuccess:  true,
-			client1EchoSuccess: true,
-			client2TCPSuccess:  true,
-			client2EchoSuccess: true,
-		},
-		"allow tcp": {
-			tp1: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: staticServerIdentity,
-				},
-				Action: pbauth.Action_ACTION_ALLOW,
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								// IdentityName: "static-client-1-identity",
-								Namespace: "default",
-								Partition: "default",
-								Peer:      "local",
-							},
-						},
-						DestinationRules: []*pbauth.DestinationRule{
-							{
-								PortNames: []string{"tcp"},
-							},
-						},
-					},
-				},
-			},
-			client1TCPSuccess:  true,
-			client1EchoSuccess: false,
-			client2TCPSuccess:  true,
-			client2EchoSuccess: false,
-		},
-		"client 1 only": {
-			tp1: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: staticServerIdentity,
-				},
-				Action: pbauth.Action_ACTION_ALLOW,
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								IdentityName: "static-client-1-identity",
-								Namespace:    "default",
-								Partition:    "default",
-								Peer:         "local",
-							},
-						},
-					},
-				},
-			},
-			client1TCPSuccess:  true,
-			client1EchoSuccess: true,
-			client2TCPSuccess:  false,
-			client2EchoSuccess: false,
-		},
-		"allow all exclude client 1": {
-			tp1: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: staticServerIdentity,
-				},
-				Action: pbauth.Action_ACTION_ALLOW,
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								Namespace: "default",
-								Partition: "default",
-								Peer:      "local",
-								Exclude: []*pbauth.ExcludeSource{
-									{
-										IdentityName: "static-client-1-identity",
-										Namespace:    "default",
-										Partition:    "default",
-										Peer:         "local",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			client1TCPSuccess:  false,
-			client1EchoSuccess: false,
-			client2TCPSuccess:  true,
-			client2EchoSuccess: true,
-		},
-		"deny takes precedence over allow": {
-			tp1: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: staticServerIdentity,
-				},
-				Action: pbauth.Action_ACTION_DENY,
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								IdentityName: "static-client-1-identity",
-								Namespace:    "default",
-								Partition:    "default",
-								Peer:         "local",
-							},
-						},
-					},
-				},
-			},
-			tp2: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: staticServerIdentity,
-				},
-				Action: pbauth.Action_ACTION_ALLOW,
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								IdentityName: "static-client-1-identity",
-								Namespace:    "default",
-								Partition:    "default",
-								Peer:         "local",
-							},
-						},
-					},
-				},
-			},
-			client1TCPSuccess:  false,
-			client1EchoSuccess: false,
-			client2TCPSuccess:  false,
-			client2EchoSuccess: false,
-		},
-		"deny all exclude service + allow on that service": {
-			tp1: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: staticServerIdentity,
-				},
-				Action: pbauth.Action_ACTION_DENY,
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								Namespace: "default",
-								Partition: "default",
-								Peer:      "local",
-								Exclude: []*pbauth.ExcludeSource{
-									{
-										IdentityName: "static-client-1-identity",
-										Namespace:    "default",
-										Partition:    "default",
-										Peer:         "local",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			tp2: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: staticServerIdentity,
-				},
-				Action: pbauth.Action_ACTION_ALLOW,
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								IdentityName: "static-client-1-identity",
-								Namespace:    "default",
-								Partition:    "default",
-								Peer:         "local",
-							},
-						},
-					},
-				},
-			},
-			client1TCPSuccess:  true,
-			client1EchoSuccess: true,
-			client2TCPSuccess:  false,
-			client2EchoSuccess: false,
-		},
-	}
-
-	runTrafficPermissionsTests(t, true, cases)
-}
-
-func TestTrafficPermission_TCP_DefaultAllow(t *testing.T) {
-	cases := map[string]trafficPermissionsCase{
-		"default allow": {
-			tp1:                nil,
-			client1TCPSuccess:  true,
-			client1EchoSuccess: true,
-			client2TCPSuccess:  true,
-			client2EchoSuccess: true,
-		},
-		"empty allow denies everything": {
-			tp1: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: staticServerIdentity,
-				},
-				Action: pbauth.Action_ACTION_ALLOW,
-			},
-			client1TCPSuccess:  false,
-			client1EchoSuccess: false,
-			client2TCPSuccess:  false,
-			client2EchoSuccess: false,
-		},
-		"empty deny denies everything": {
-			tp1: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: staticServerIdentity,
-				},
-				Action: pbauth.Action_ACTION_DENY,
-			},
-			client1TCPSuccess:  false,
-			client1EchoSuccess: false,
-			client2TCPSuccess:  false,
-			client2EchoSuccess: false,
-		},
-		"allow everything": {
-			tp1: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: staticServerIdentity,
-				},
-				Action: pbauth.Action_ACTION_ALLOW,
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								Namespace: "default",
-								Partition: "default",
-								Peer:      "local",
-							},
-						},
-					},
-				},
-			},
-			client1TCPSuccess:  true,
-			client1EchoSuccess: true,
-			client2TCPSuccess:  true,
-			client2EchoSuccess: true,
-		},
-		"allow one protocol denies the other protocol": {
-			tp1: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: staticServerIdentity,
-				},
-				Action: pbauth.Action_ACTION_ALLOW,
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								Namespace: "default",
-								Partition: "default",
-								Peer:      "local",
-							},
-						},
-						DestinationRules: []*pbauth.DestinationRule{
-							{
-								PortNames: []string{"tcp"},
-							},
-						},
-					},
-				},
-			},
-			client1TCPSuccess:  true,
-			client1EchoSuccess: false,
-			client2TCPSuccess:  true,
-			client2EchoSuccess: false,
-		},
-		"allow something unrelated": {
-			tp1: &pbauth.TrafficPermissions{
-				Destination: &pbauth.Destination{
-					IdentityName: staticServerIdentity,
-				},
-				Action: pbauth.Action_ACTION_ALLOW,
-				Permissions: []*pbauth.Permission{
-					{
-						Sources: []*pbauth.Source{
-							{
-								IdentityName: "something-else",
-								Namespace:    "default",
-								Partition:    "default",
-								Peer:         "local",
-							},
-						},
-					},
-				},
-			},
-			client1TCPSuccess:  false,
-			client1EchoSuccess: false,
-			client2TCPSuccess:  false,
-			client2EchoSuccess: false,
-		},
-	}
-
-	runTrafficPermissionsTests(t, false, cases)
-}
-
-func createServiceAndDataplane(t *testing.T, node libcluster.Agent, cluster *libcluster.Cluster, proxyID, serviceName string, httpPort, grpcPort int, serviceBindPorts []int) (*libcluster.ConsulDataplaneContainer, error) {
-	leader, err := cluster.Leader()
-	require.NoError(t, err)
-	leaderIP := leader.GetIP()
-
-	token := cluster.TokenBootstrap
-
-	// Do some trickery to ensure that partial completion is correctly torn
-	// down, but successful execution is not.
-	var deferClean utils.ResettableDefer
-	defer deferClean.Execute()
-
-	// Create a service and proxy instance
-	svc, err := libservice.NewExampleService(context.Background(), serviceName, httpPort, grpcPort, node)
-	if err != nil {
-		return nil, err
-	}
-	deferClean.Add(func() {
-		_ = svc.Terminate()
-	})
-
-	// Create Consul Dataplane
-	dp, err := libcluster.NewConsulDataplane(context.Background(), proxyID, leaderIP, 8502, serviceBindPorts, node, true, token)
-	require.NoError(t, err)
-	deferClean.Add(func() {
-		_ = dp.Terminate()
-	})
-
-	// disable cleanup functions now that we have an object with a Terminate() function
-	deferClean.Reset()
-
-	return dp, nil
-}
-
-func storeStaticServerTrafficPermissions(t *testing.T, resourceClient *rtest.Client, tp *pbauth.TrafficPermissions, i int) {
-	id := &pbresource.ID{
-		Name: fmt.Sprintf("static-server-tp-%d", i),
-		Type: pbauth.TrafficPermissionsType,
-	}
-	if tp == nil {
-		resourceClient.Delete(resourceClient.Context(t), &pbresource.DeleteRequest{
-			Id: id,
-		})
-	} else {
-		rtest.ResourceID(id).
-			WithData(t, tp).
-			Write(t, resourceClient)
-	}
-}
-
-func createServerResources(t *testing.T, resourceClient *rtest.Client, cluster *libcluster.Cluster, node libcluster.Agent) *libcluster.ConsulDataplaneContainer {
-	rtest.ResourceID(&pbresource.ID{
-		Name: "static-server-service",
-		Type: pbcatalog.ServiceType,
-	}).
-		WithData(t, &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"static-server"}},
-			Ports: []*pbcatalog.ServicePort{
-				{
-					TargetPort:  "tcp",
-					Protocol:    pbcatalog.Protocol_PROTOCOL_TCP,
-					VirtualPort: 8888,
-				},
-				{
-					TargetPort:  "echo",
-					Protocol:    pbcatalog.Protocol_PROTOCOL_TCP,
-					VirtualPort: 9999,
-				},
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			},
-			VirtualIps: []string{"240.0.0.1"},
-		}).Write(t, resourceClient)
-
-	workloadPortMap := map[string]*pbcatalog.WorkloadPort{
-		"tcp": {
-			Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP,
-		},
-		"echo": {
-			Port: 8078, Protocol: pbcatalog.Protocol_PROTOCOL_TCP,
-		},
-		"mesh": {
-			Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-		},
-	}
-
-	rtest.ResourceID(&pbresource.ID{
-		Name: "static-server-workload",
-		Type: pbcatalog.WorkloadType,
-	}).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: node.GetIP()},
-			},
-			Ports:    workloadPortMap,
-			Identity: staticServerIdentity,
-		}).
-		Write(t, resourceClient)
-
-	rtest.ResourceID(&pbresource.ID{
-		Name: staticServerIdentity,
-		Type: pbauth.WorkloadIdentityType,
-	}).
-		Write(t, resourceClient)
-
-	serverDataplane, err := createServiceAndDataplane(t, node, cluster, "static-server-workload", "static-server", 8080, 8079, []int{})
-	require.NoError(t, err)
-
-	return serverDataplane
-}
-
-func createClientResources(t *testing.T, resourceClient *rtest.Client, cluster *libcluster.Cluster, node libcluster.Agent, idx int) *libcluster.ConsulDataplaneContainer {
-	prefix := fmt.Sprintf("static-client-%d", idx)
-	rtest.ResourceID(&pbresource.ID{
-		Name: prefix + "-service",
-		Type: pbcatalog.ServiceType,
-	}).
-		WithData(t, &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{prefix}},
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-				{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			},
-		}).Write(t, resourceClient)
-
-	workloadPortMap := map[string]*pbcatalog.WorkloadPort{
-		"tcp": {
-			Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP,
-		},
-		"mesh": {
-			Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH,
-		},
-	}
-
-	rtest.ResourceID(&pbresource.ID{
-		Name: prefix + "-workload",
-		Type: pbcatalog.WorkloadType,
-	}).
-		WithData(t, &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: node.GetIP()},
-			},
-			Ports:    workloadPortMap,
-			Identity: prefix + "-identity",
-		}).
-		Write(t, resourceClient)
-
-	rtest.ResourceID(&pbresource.ID{
-		Name: prefix + "-identity",
-		Type: pbauth.WorkloadIdentityType,
-	}).
-		Write(t, resourceClient)
-
-	rtest.ResourceID(&pbresource.ID{
-		Name: prefix + "-proxy-configuration",
-		Type: pbmesh.ProxyConfigurationType,
-	}).
-		WithData(t, &pbmesh.ProxyConfiguration{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"static-client"},
-			},
-			DynamicConfig: &pbmesh.DynamicConfig{
-				Mode: pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
-			},
-		}).
-		Write(t, resourceClient)
-
-	dp, err := createServiceAndDataplane(t, node, cluster, fmt.Sprintf("static-client-%d-workload", idx), "static-client", 8080, 8079, []int{})
-	require.NoError(t, err)
-
-	return dp
-}
-
-func createCluster(t *testing.T, aclsEnabled bool) (*libcluster.Cluster, *rtest.Client) {
-	cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{
-		NumServers: 1,
-		NumClients: 3,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:             "dc1",
-			InjectAutoEncryption:   true,
-			InjectGossipEncryption: true,
-			AllowHTTPAnyway:        true,
-			ACLEnabled:             aclsEnabled,
-		},
-		Cmd: `-hcl=experiments=["resource-apis"] log_level="TRACE"`,
-	})
-
-	leader, err := cluster.Leader()
-	require.NoError(t, err)
-	client := pbresource.NewResourceServiceClient(leader.GetGRPCConn())
-	resourceClient := rtest.NewClientWithACLToken(client, cluster.TokenBootstrap)
-
-	return cluster, resourceClient
-}
-
-// assertDataplaneContainerState validates service container status
-func assertDataplaneContainerState(t *testing.T, dataplane *libcluster.ConsulDataplaneContainer, state string) {
-	containerStatus, err := dataplane.GetStatus()
-	require.NoError(t, err)
-	require.Equal(t, containerStatus, state, fmt.Sprintf("Expected: %s. Got %s", state, containerStatus))
-}
-
-func httpRequestToVirtualAddress(dp *libcluster.ConsulDataplaneContainer) (string, error) {
-	addr := fmt.Sprintf("%s:%d", staticServerVIP, tcpPort)
-
-	out, err := dp.Exec(
-		context.Background(),
-		[]string{"sudo", "sh", "-c", fmt.Sprintf(`
-			set -e
-			curl -s "%s/debug?env=dump"
-			`, addr),
-		},
-	)
-
-	if err != nil {
-		return out, fmt.Errorf("curl request to upstream virtual address %q\nerr = %v\nout = %s\nservice=%s", addr, err, out, dp.GetServiceName())
-	}
-
-	expected := fmt.Sprintf("FORTIO_NAME=%s", staticServerReturnValue)
-	if !strings.Contains(out, expected) {
-		return out, fmt.Errorf("expected %q to contain %q", out, expected)
-	}
-
-	return out, nil
-}
-
-func echoToVirtualAddress(dp *libcluster.ConsulDataplaneContainer) (string, error) {
-	out, err := dp.Exec(
-		context.Background(),
-		[]string{"sudo", "sh", "-c", fmt.Sprintf(`
-			set -e
-			echo foo | nc %s %d
-			`, staticServerVIP, echoPort),
-		},
-	)
-
-	if err != nil {
-		return out, fmt.Errorf("nc request to upstream virtual address %s:%d\nerr = %v\nout = %s\nservice=%s", staticServerVIP, echoPort, err, out, dp.GetServiceName())
-	}
-
-	if !strings.Contains(out, "foo") {
-		return out, fmt.Errorf("expected %q to contain 'foo'", out)
-	}
-
-	return out, err
-}
-
-func assertPassing(t *retry.R, fn func(*libcluster.ConsulDataplaneContainer) (string, error), dp *libcluster.ConsulDataplaneContainer, success bool) {
-	_, err := fn(dp)
-	if success {
-		require.NoError(t, err)
-	} else {
-		require.Error(t, err)
-	}
-}
diff --git a/test/integration/consul-container/test/troubleshoot/troubleshoot_test.go b/test/integration/consul-container/test/troubleshoot/troubleshoot_test.go
deleted file mode 100644
index 538f4f2c27796..0000000000000
--- a/test/integration/consul-container/test/troubleshoot/troubleshoot_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package troubleshoot
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/stretchr/testify/require"
-
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-)
-
-func TestTroubleshootProxy(t *testing.T) {
-	t.Parallel()
-	cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{
-		NumServers: 1,
-		NumClients: 1,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:           "dc1",
-			InjectAutoEncryption: true,
-		},
-		ApplyDefaultProxySettings: true,
-	})
-
-	serverService, clientService := topology.CreateServices(t, cluster, "http")
-
-	clientSidecar, ok := clientService.(*libservice.ConnectContainer)
-	require.True(t, ok)
-	_, clientAdminPort := clientSidecar.GetInternalAdminAddr()
-
-	t.Run("upstream exists and is healthy", func(t *testing.T) {
-		require.Eventually(t, func() bool {
-			output, err := clientSidecar.Exec(context.Background(),
-				[]string{"consul", "troubleshoot", "upstreams",
-					"-envoy-admin-endpoint", fmt.Sprintf("localhost:%v", clientAdminPort)})
-			require.NoError(t, err)
-			upstreamExists := assert.Contains(t, output, libservice.StaticServerServiceName)
-
-			output, err = clientSidecar.Exec(context.Background(), []string{"consul", "troubleshoot", "proxy",
-				"-envoy-admin-endpoint", fmt.Sprintf("localhost:%v", clientAdminPort),
-				"-upstream-envoy-id", libservice.StaticServerServiceName})
-			require.NoError(t, err)
-			certsValid := strings.Contains(output, "Certificates are valid")
-			noRejectedConfig := strings.Contains(output, "Envoy has 0 rejected configurations")
-			noConnFailure := strings.Contains(output, "Envoy has detected 0 connection failure(s)")
-			listenersExist := strings.Contains(output, fmt.Sprintf("Listener for upstream \"%s\" found", libservice.StaticServerServiceName))
-			healthyEndpoints := strings.Contains(output, "Healthy endpoints for cluster")
-			return upstreamExists && certsValid && listenersExist && noRejectedConfig && noConnFailure && healthyEndpoints
-		}, 60*time.Second, 10*time.Second)
-	})
-
-	t.Run("terminate upstream and check if client sees it as unhealthy", func(t *testing.T) {
-		err := serverService.Terminate()
-		require.NoError(t, err)
-
-		require.Eventually(t, func() bool {
-			output, err := clientSidecar.Exec(context.Background(), []string{"consul", "troubleshoot", "proxy",
-				"-envoy-admin-endpoint", fmt.Sprintf("localhost:%v", clientAdminPort),
-				"-upstream-envoy-id", libservice.StaticServerServiceName})
-			require.NoError(t, err)
-
-			certsValid := strings.Contains(output, "Certificates are valid")
-			noRejectedConfig := strings.Contains(output, "Envoy has 0 rejected configurations")
-			noConnFailure := strings.Contains(output, "Envoy has detected 0 connection failure(s)")
-			listenersExist := strings.Contains(output, fmt.Sprintf("Listener for upstream \"%s\" found", libservice.StaticServerServiceName))
-			endpointUnhealthy := strings.Contains(output, "No healthy endpoints for cluster")
-			return certsValid && listenersExist && noRejectedConfig && noConnFailure && endpointUnhealthy
-		}, 60*time.Second, 10*time.Second)
-	})
-}
diff --git a/test/integration/consul-container/test/troubleshoot/troubleshoot_upstream_test.go b/test/integration/consul-container/test/troubleshoot/troubleshoot_upstream_test.go
new file mode 100644
index 0000000000000..92f5583381ffb
--- /dev/null
+++ b/test/integration/consul-container/test/troubleshoot/troubleshoot_upstream_test.go
@@ -0,0 +1,76 @@
+package troubleshoot
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/stretchr/testify/require"
+
+	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
+	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
+	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
+)
+
+func TestTroubleshootProxy(t *testing.T) {
+	t.Parallel()
+	cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{
+		NumServers: 1,
+		NumClients: 1,
+		BuildOpts: &libcluster.BuildOptions{
+			Datacenter:           "dc1",
+			InjectAutoEncryption: true,
+		},
+		ApplyDefaultProxySettings: true,
+	})
+
+	serverService, clientService := topology.CreateServices(t, cluster)
+
+	clientSidecar, ok := clientService.(*libservice.ConnectContainer)
+	require.True(t, ok)
+	_, clientAdminPort := clientSidecar.GetInternalAdminAddr()
+
+	t.Run("upstream exists and is healthy", func(t *testing.T) {
+		require.Eventually(t, func() bool {
+			output, err := clientSidecar.Exec(context.Background(),
+				[]string{"consul", "troubleshoot", "upstreams",
+					"-envoy-admin-endpoint", fmt.Sprintf("localhost:%v", clientAdminPort)})
+			require.NoError(t, err)
+			upstreamExists := assert.Contains(t, output, libservice.StaticServerServiceName)
+
+			output, err = clientSidecar.Exec(context.Background(), []string{"consul", "troubleshoot", "proxy",
+				"-envoy-admin-endpoint", fmt.Sprintf("localhost:%v", clientAdminPort),
+				"-upstream-envoy-id", libservice.StaticServerServiceName})
+			require.NoError(t, err)
+			certsValid := strings.Contains(output, "Certificates are valid")
+			noRejectedConfig := strings.Contains(output, "Envoy has 0 rejected configurations")
+			noConnFailure := strings.Contains(output, "Envoy has detected 0 connection failure(s)")
+			listenersExist := strings.Contains(output, fmt.Sprintf("Listener for upstream \"%s\" found", libservice.StaticServerServiceName))
+			healthyEndpoints := strings.Contains(output, "Healthy endpoints for cluster")
+			return upstreamExists && certsValid && listenersExist && noRejectedConfig && noConnFailure && healthyEndpoints
+		}, 60*time.Second, 10*time.Second)
+	})
+
+	t.Run("terminate upstream and check if client sees it as unhealthy", func(t *testing.T) {
+		err := serverService.Terminate()
+		require.NoError(t, err)
+
+		require.Eventually(t, func() bool {
+			output, err := clientSidecar.Exec(context.Background(), []string{"consul", "troubleshoot", "proxy",
+				"-envoy-admin-endpoint", fmt.Sprintf("localhost:%v", clientAdminPort),
+				"-upstream-envoy-id", libservice.StaticServerServiceName})
+			require.NoError(t, err)
+
+			certsValid := strings.Contains(output, "Certificates are valid")
+			noRejectedConfig := strings.Contains(output, "Envoy has 0 rejected configurations")
+			noConnFailure := strings.Contains(output, "Envoy has detected 0 connection failure(s)")
+			listenersExist := strings.Contains(output, fmt.Sprintf("Listener for upstream \"%s\" found", libservice.StaticServerServiceName))
+			endpointUnhealthy := strings.Contains(output, "No healthy endpoints for cluster")
+			return certsValid && listenersExist && noRejectedConfig && noConnFailure && endpointUnhealthy
+		}, 60*time.Second, 10*time.Second)
+	})
+}
diff --git a/test/integration/consul-container/test/upgrade/README.md b/test/integration/consul-container/test/upgrade/README.md
index 598bdfab34809..0a4698323fccd 100644
--- a/test/integration/consul-container/test/upgrade/README.md
+++ b/test/integration/consul-container/test/upgrade/README.md
@@ -26,7 +26,7 @@ and envoy sidecars are deployed.
 
 > Note that all consul agents and user workloads such as application services, mesh-gateway are running in docker containers.
 
-In general, each upgrade test has the following steps:
+In general, each upgrade test has following steps:
 1. Create a cluster with a specified number of server and client agents, then enable the feature to be tested. 
 2. Create some workload in the cluster, e.g., registering 2 services: static-server, static-client.
 Static-server is a simple http application and the upstream service of static-client.
@@ -35,7 +35,7 @@ connection between static client and server. Ensure that a connection cannot be
 4. Upgrade Consul cluster to the `target-version` and restart the Envoy sidecars
 (we restart Envoy sidecar to ensure the upgraded Consul binary can read the state from
 the previous version and generate the correct Envoy configurations)
-5. Re-validate the client, server and sidecars to ensure the persisted data from the previous
+5. Re-validate the client, server and sidecars to ensure the persisted data from the pervious
 version can be accessed in the target version. Verify connection / disconnection
 (e.g., deny Action)  
 
@@ -49,7 +49,6 @@ To run the upgrade test, the following tools are required:
 
 ### Running Upgrade integration tests
 - run `make dev-docker`
-- build a consul-envoy container image `cd test/integration/consul-container docker build -t consul-envoy:latest-version --build-arg CONSUL_IMAGE=docker.mirror.hashicorp.services/consul:1.15  --build-arg ENVOY_VERSION=1.24.6  -f ./assets/Dockerfile-consul-envoy ./assets`
 - run the single test `go test -v -timeout 30m -run ^TestACL_Upgrade_Node_Token$ ./.../upgrade/`
 - run all upgrade tests `go test -v -timeout 30m -run ./.../upgrade`
 
@@ -77,7 +76,9 @@ Below are the supported CLI options
 
 ## Adding a new upgrade integration test
 
-All upgrade tests are defined in [test/integration/consul-container/test/upgrade](/test/integration/consul-container/test/upgrade) subdirectory.
+All upgrade tests are defined in [test/integration/consul-container/test/upgrade](/test/integration/consul-container/test/upgrade) subdirectory. The test framework uses
+[functional table-driven tests in Go](https://yourbasic.org/golang/table-driven-unit-test/) and
+using function types to modify the basic configuration for each test case.
 
 Following is a guide for adding a new upgrade test case.
 1. Create consul cluster(s) with a specified version. Some utility functions are provided to make
@@ -90,65 +91,63 @@ a single cluster or two peered clusters:
 		NumClients: 1,
 		BuildOpts: &libcluster.BuildOptions{
 			Datacenter:           "dc1",
-			ConsulVersion:        utils.LatestVersion,
+			ConsulVersion:        oldVersion,
 		},
 	})
-```
-
-Or
 
-```go
 	// BasicPeeringTwoClustersSetup creates two peered clusters, named accpeting and dialing
-	accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.LatestVersion, false)
+	accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, oldVersion, false)
 ```
 
-Some workloads may require extra resources. They should be created in this setup section. For example,
-[https://github.com/hashicorp/consul-enterprise/blob/19e515db29541132dbbda73efb7a458cd29d705f/test/integration/consul-container/test/upgrade/peering_http_test.go#L30-L41](this peering test creates a second static-server).
-
-2. Verify the workload
-
+2. For tests with multiple test cases, it should always start by invoking 
 ```go
-	libassert.HTTPServiceEchoes(t, "localhost", port, "")
-	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", appPort), "static-server-2-v2", "")
+	type testcase struct {
+		name string
+		create func()
+		extraAssertion func()
+	}
 ```
+see example [here](./l7_traffic_management/resolver_default_subset_test.go). For upgrade tests with a single test case, they can be written like
+```go
+	run := func(t *testing.T, oldVersion, targetVersion string) {
+        // insert test
+    }
+	t.Run(fmt.Sprintf("Upgrade from %s to %s", utils.LatestVersion, utils.TargetVersion),
+		func(t *testing.T) {
+			run(t, utils.LatestVersion, utils.TargetVersion)
+		})
+```
+see example [here](./acl_node_test.go)
+
+Addtitional configurations or user-workload can be created with a customized [`create` function](./l7_traffic_management/resolver_default_subset_test.go).
 
-3. Call the `StandardUpgrade` method and check that the upgrade succeeded.
-We also restart the Envoy proxy to make sure the upgraded agent can generate
-the correct Envoy configurations.
+3. Call the upgrade method and assert the upgrading cluster succeeds.
+We also restart the envoy proxy to make sure the upgraded agent can generate
+the correct envoy configurations.
 
 ```go
-	require.NoError(t, 
-		cluster.StandardUpgrade(t, context.Background(), utils.TargetVersion))
+	err = cluster.StandardUpgrade(t, context.Background(), targetVersion)
+	require.NoError(t, err)
 	require.NoError(t, staticServerConnectProxy.Restart())
 	require.NoError(t, staticClientConnectProxy.Restart())
 ```
-4. Verify the workload from step 3 again
+
+4. Verify the user workload after upgrade, e.g.,
 
 ```go
 	libassert.HTTPServiceEchoes(t, "localhost", port, "")
 	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", appPort), "static-server-2-v2", "")
 ```
 
-For longer verifications, it can be nice to make a local function instead:
-```go
-	tests := func() {
-		libassert.HTTPServiceEchoes(t, "localhost", port, "")
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", appPort), "static-server-2-v2", "")
-	}
-	tests()
-	// ... do upgrade
-	tests()
-```
-
 ### Errors Test Cases
 There are some caveats for special error handling of versions prior to `1.14`.   
-Upgrade tests for features such as peering had API changes that return an error if an upgrade is attempted, and should be accounted for in upgrade tests. If running upgrade tests for any version before `1.14`, the following lines of code need to be added to skip it or it will not pass.  
+Upgrade tests for features such peering, had API changes that returns an error if attempt to upgrade, and should be accounted for in upgrade tests. If running upgrade tests for any version before `1.14`, the following lines of code needs to be added to skip test or it will not pass.  
 
 ```go
 	fromVersion, err := version.NewVersion(utils.LatestVersion)
 	require.NoError(t, err)
 	if fromVersion.LessThan(utils.Version_1_14) {
-		t.Skip("...")
+		continue
 	}
 ```
 See example [here](https://github.com/hashicorp/consul-enterprise/blob/005a0a92c5f39804cef4ad5c4cd6fd3334b95aa2/test/integration/consul-container/test/upgrade/peering_control_plane_mgw_test.go#L92-L96)
diff --git a/test/integration/consul-container/test/upgrade/acl_node_test.go b/test/integration/consul-container/test/upgrade/acl_node_test.go
index 67b5fa12ad171..e6134de80f6c1 100644
--- a/test/integration/consul-container/test/upgrade/acl_node_test.go
+++ b/test/integration/consul-container/test/upgrade/acl_node_test.go
@@ -1,10 +1,8 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package upgrade
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -15,36 +13,60 @@ import (
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 )
 
-// TestACL_NodeToken test verifies the following after upgrade
+// TestACL_Upgrade_Node_Token test verifies the following after upgrade
 // 1. Upgraded agent can inherit the persistend token and join the cluster
 // 2. Agent token prior to upgrade is still valid after upgrade
-func TestACL_NodeToken(t *testing.T) {
+func TestACL_Upgrade_Node_Token(t *testing.T) {
 	t.Parallel()
 
-	// NOTE: Disable auto.encrypt due to its conflict with ACL token during bootstrap
-	cluster, _, _ := libtopology.NewCluster(t, &libtopology.ClusterConfig{
-		NumServers: 1,
-		NumClients: 1,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:           "dc1",
-			ConsulImageName:      utils.GetLatestImageName(),
-			ConsulVersion:        utils.LatestVersion,
-			InjectAutoEncryption: false,
-			ACLEnabled:           true,
+	type testcase struct {
+		oldversion    string
+		targetVersion string
+	}
+	tcs := []testcase{
+		{
+			oldversion:    "1.13",
+			targetVersion: utils.TargetVersion,
+		},
+		{
+			oldversion:    "1.14",
+			targetVersion: utils.TargetVersion,
 		},
-		ApplyDefaultProxySettings: true,
-	})
+	}
+
+	run := func(t *testing.T, tc testcase) {
+		// NOTE: Disable auto.encrypt due to its conflict with ACL token during bootstrap
+		cluster, _, _ := libtopology.NewCluster(t, &libtopology.ClusterConfig{
+			NumServers: 1,
+			NumClients: 1,
+			BuildOpts: &libcluster.BuildOptions{
+				Datacenter:           "dc1",
+				ConsulImageName:      utils.GetLatestImageName(),
+				ConsulVersion:        tc.oldversion,
+				InjectAutoEncryption: false,
+				ACLEnabled:           true,
+			},
+			ApplyDefaultProxySettings: true,
+		})
+
+		agentToken, err := cluster.CreateAgentToken("dc1",
+			cluster.Agents[1].GetAgentName())
+		require.NoError(t, err)
 
-	agentToken, err := cluster.CreateAgentToken("dc1",
-		cluster.Agents[1].GetAgentName())
-	require.NoError(t, err)
+		err = cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), tc.targetVersion)
+		require.NoError(t, err)
 
-	err = cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), utils.TargetVersion)
-	require.NoError(t, err)
+		// Post upgrade validation: agent token can be used to query the node
+		// Assert consul catalog nodes  -token e3dc19d9-658d-a430-bcf4-7302efa397fc
+		client, err := cluster.Agents[1].NewClient(agentToken, false)
+		require.NoError(t, err)
+		libassert.CatalogNodeExists(t, client, cluster.Agents[1].GetAgentName())
+	}
 
-	// Post upgrade validation: agent token can be used to query the node
-	// Assert consul catalog nodes  -token e3dc19d9-658d-a430-bcf4-7302efa397fc
-	client, err := cluster.Agents[1].NewClient(agentToken, false)
-	require.NoError(t, err)
-	libassert.CatalogNodeExists(t, client, cluster.Agents[1].GetAgentName())
+	for _, tc := range tcs {
+		t.Run(fmt.Sprintf("upgrade from %s to %s", tc.oldversion, tc.targetVersion),
+			func(t *testing.T) {
+				run(t, tc)
+			})
+	}
 }
diff --git a/test/integration/consul-container/test/upgrade/basic/basic_test.go b/test/integration/consul-container/test/upgrade/basic/basic_test.go
deleted file mode 100644
index fe9f28fa2240e..0000000000000
--- a/test/integration/consul-container/test/upgrade/basic/basic_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package upgrade
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-)
-
-// Test upgrade a cluster of latest version to the target version
-func TestBasic(t *testing.T) {
-	t.Parallel()
-
-	const numServers = 1
-	buildOpts := &libcluster.BuildOptions{
-		ConsulImageName:      utils.GetLatestImageName(),
-		ConsulVersion:        utils.LatestVersion,
-		Datacenter:           "dc1",
-		InjectAutoEncryption: true,
-	}
-
-	cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{
-		NumServers:                1,
-		BuildOpts:                 buildOpts,
-		ApplyDefaultProxySettings: true,
-	})
-
-	client := cluster.APIClient(0)
-
-	libcluster.WaitForLeader(t, cluster, client)
-	libcluster.WaitForMembers(t, client, numServers)
-
-	// Create a service to be stored in the snapshot
-	const serviceName = "api"
-	index := libservice.ServiceCreate(t, client, serviceName)
-
-	require.NoError(t, client.Agent().ServiceRegister(
-		&api.AgentServiceRegistration{Name: serviceName, Port: 9998},
-	))
-	checkServiceHealth(t, client, "api", index)
-
-	// upgrade the cluster to the Target version
-	t.Logf("initiating standard upgrade to version=%q", utils.TargetVersion)
-	err := cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), utils.TargetVersion)
-
-	require.NoError(t, err)
-	libcluster.WaitForLeader(t, cluster, client)
-	libcluster.WaitForMembers(t, client, numServers)
-
-	// Verify service is restored from the snapshot
-	retry.RunWith(&retry.Timer{Timeout: 5 * time.Second, Wait: 500 * time.Microsecond}, t, func(r *retry.R) {
-		service, _, err := client.Catalog().Service(serviceName, "", &api.QueryOptions{})
-		require.NoError(r, err)
-		require.Len(r, service, 1)
-		require.Equal(r, serviceName, service[0].ServiceName)
-	})
-}
-
-func checkServiceHealth(t *testing.T, client *api.Client, serviceName string, index uint64) {
-	failer := func() *retry.Timer {
-		return &retry.Timer{Timeout: time.Second * 10, Wait: time.Second}
-	}
-	retry.RunWith(failer(), t, func(r *retry.R) {
-		ch, errCh := libservice.ServiceHealthBlockingQuery(client, serviceName, index)
-		select {
-		case err := <-errCh:
-			require.NoError(r, err)
-		case service := <-ch:
-			require.Equal(r, 1, len(service))
-
-			index = service[0].Service.ModifyIndex
-			require.Equal(r, serviceName, service[0].Service.Service)
-			require.Equal(r, 9998, service[0].Service.Port)
-		}
-	})
-}
diff --git a/test/integration/consul-container/test/upgrade/basic/fullstopupgrade_test.go b/test/integration/consul-container/test/upgrade/basic/fullstopupgrade_test.go
index 75ae754fd5b90..6823dfd547bb0 100644
--- a/test/integration/consul-container/test/upgrade/basic/fullstopupgrade_test.go
+++ b/test/integration/consul-container/test/upgrade/basic/fullstopupgrade_test.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MPL-2.0
 
 package upgrade
 
@@ -20,16 +20,6 @@ import (
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 )
 
-type testcase struct {
-	oldVersion    string
-	targetVersion string
-	expectErr     bool
-}
-
-var (
-	tcs []testcase
-)
-
 // Test upgrade a cluster of latest version to the target version
 func TestStandardUpgradeToTarget_fromLatest(t *testing.T) {
 	const numServers = 1
diff --git a/test/integration/consul-container/test/upgrade/basic/healthcheck_test.go b/test/integration/consul-container/test/upgrade/basic/healthcheck_test.go
deleted file mode 100644
index b0988cd280c29..0000000000000
--- a/test/integration/consul-container/test/upgrade/basic/healthcheck_test.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package upgrade
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/go-version"
-
-	"github.com/hashicorp/consul/api"
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
-	libtopology "github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-)
-
-// Test health check GRPC call using Target Servers and Latest GA Clients
-// Note: this upgrade test doesn't use StandardUpgrade since it requires
-// a cluster with clients and servers with mixed versions
-func TestTargetServersWithLatestGAClients(t *testing.T) {
-	t.Parallel()
-
-	fromVersion, err := version.NewVersion(utils.LatestVersion)
-	require.NoError(t, err)
-	if fromVersion.LessThan(utils.Version_1_14) {
-		t.Skip("TODO: why are we skipping this?")
-	}
-
-	const (
-		numServers = 3
-		numClients = 1
-	)
-
-	clusterConfig := &libtopology.ClusterConfig{
-		NumServers: numServers,
-		NumClients: numClients,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:    "dc1",
-			ConsulVersion: utils.TargetVersion,
-		},
-		ApplyDefaultProxySettings: true,
-	}
-
-	cluster, _, _ := libtopology.NewCluster(t, clusterConfig)
-
-	// change the version of Client agent to latest version
-	config := cluster.Agents[3].GetConfig()
-	config.Version = utils.LatestVersion
-	cluster.Agents[3].Upgrade(context.Background(), config)
-
-	client := cluster.APIClient(0)
-
-	libcluster.WaitForLeader(t, cluster, client)
-	libcluster.WaitForMembers(t, client, 4)
-
-	const serviceName = "api"
-	index := libservice.ServiceCreate(t, client, serviceName)
-
-	require.NoError(t, client.Agent().ServiceRegister(
-		&api.AgentServiceRegistration{Name: serviceName, Port: 9998},
-	))
-
-	checkServiceHealth(t, client, "api", index)
-}
-
-// Test health check GRPC call using Mixed (majority latest) Servers and Latest GA Clients
-func TestMixedServersMajorityLatestGAClient(t *testing.T) {
-	t.Parallel()
-
-	testMixedServersGAClient(t, false)
-}
-
-// Test health check GRPC call using Mixed (majority target) Servers and Latest GA Clients
-func TestMixedServersMajorityTargetGAClient(t *testing.T) {
-	t.Parallel()
-
-	testMixedServersGAClient(t, true)
-}
-
-// Test health check GRPC call using Mixed (majority conditional) Servers and Latest GA Clients
-func testMixedServersGAClient(t *testing.T, majorityIsTarget bool) {
-	var (
-		latestOpts = libcluster.BuildOptions{
-			ConsulImageName: utils.GetLatestImageName(),
-			ConsulVersion:   utils.LatestVersion,
-		}
-		targetOpts = libcluster.BuildOptions{
-			ConsulImageName: utils.GetTargetImageName(),
-			ConsulVersion:   utils.TargetVersion,
-		}
-
-		majorityOpts libcluster.BuildOptions
-		minorityOpts libcluster.BuildOptions
-	)
-
-	if majorityIsTarget {
-		majorityOpts = targetOpts
-		minorityOpts = latestOpts
-	} else {
-		majorityOpts = latestOpts
-		minorityOpts = targetOpts
-	}
-
-	const (
-		numServers = 3
-		numClients = 1
-	)
-
-	var configs []libcluster.Config
-	{
-		ctx := libcluster.NewBuildContext(t, minorityOpts)
-
-		conf := libcluster.NewConfigBuilder(ctx).
-			ToAgentConfig(t)
-		t.Logf("Cluster server (leader) config:\n%s", conf.JSON)
-
-		configs = append(configs, *conf)
-	}
-
-	{
-		ctx := libcluster.NewBuildContext(t, majorityOpts)
-
-		conf := libcluster.NewConfigBuilder(ctx).
-			Bootstrap(numServers).
-			ToAgentConfig(t)
-		t.Logf("Cluster server config:\n%s", conf.JSON)
-
-		for i := 1; i < numServers; i++ {
-			configs = append(configs, *conf)
-		}
-	}
-
-	cluster, err := libcluster.New(t, configs)
-	require.NoError(t, err)
-
-	libservice.ClientsCreate(t, numClients, utils.GetLatestImageName(), utils.LatestVersion, cluster)
-
-	client := cluster.APIClient(0)
-
-	libcluster.WaitForLeader(t, cluster, client)
-	libcluster.WaitForMembers(t, client, 4) // TODO(rb): why 4?
-
-	const serviceName = "api"
-	index := libservice.ServiceCreate(t, client, serviceName)
-	require.NoError(t, client.Agent().ServiceRegister(
-		&api.AgentServiceRegistration{Name: serviceName, Port: 9998},
-	))
-	checkServiceHealth(t, client, "api", index)
-}
diff --git a/test/integration/consul-container/test/upgrade/catalog/catalog_test.go b/test/integration/consul-container/test/upgrade/catalog/catalog_test.go
deleted file mode 100644
index 61c479c989d4b..0000000000000
--- a/test/integration/consul-container/test/upgrade/catalog/catalog_test.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package catalog
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/go-version"
-
-	"github.com/hashicorp/consul/internal/catalog/catalogtest"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-)
-
-var minCatalogResourceVersion = version.Must(version.NewVersion("v1.17.0"))
-
-const (
-	versionUndetermined = `
-Cannot determine the actual version the starting image represents.
-Scrutinze test failures to ensure that the starting version should
-actually be able to be used for creating the initial data set.
-	`
-)
-
-func maybeSkipUpgradeTest(t *testing.T, minVersion *version.Version) {
-	t.Helper()
-
-	image := utils.DockerImage(utils.GetLatestImageName(), utils.LatestVersion)
-	latestVersion, err := utils.DockerImageVersion(image)
-
-	if latestVersion != nil && latestVersion.LessThan(minVersion) {
-		t.Skipf("Upgrade test isn't applicable with version %q as the starting version", latestVersion.String())
-	}
-
-	if err != nil || latestVersion == nil {
-		t.Log(versionUndetermined)
-	}
-}
-
-// Test upgrade a cluster of latest version to the target version and ensure that the catalog still
-// functions properly. Note
-func TestCatalogUpgrade(t *testing.T) {
-	maybeSkipUpgradeTest(t, minCatalogResourceVersion)
-	t.Parallel()
-
-	const numServers = 1
-	buildOpts := &libcluster.BuildOptions{
-		ConsulImageName:      utils.GetLatestImageName(),
-		ConsulVersion:        utils.LatestVersion,
-		Datacenter:           "dc1",
-		InjectAutoEncryption: true,
-	}
-
-	cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{
-		NumServers:                1,
-		BuildOpts:                 buildOpts,
-		ApplyDefaultProxySettings: true,
-		Cmd:                       `-hcl=experiments=["resource-apis"]`,
-	})
-
-	client := cluster.APIClient(0)
-
-	libcluster.WaitForLeader(t, cluster, client)
-	libcluster.WaitForMembers(t, client, numServers)
-
-	leader, err := cluster.Leader()
-	require.NoError(t, err)
-	rscClient := pbresource.NewResourceServiceClient(leader.GetGRPCConn())
-
-	// Initialize some data
-	catalogtest.PublishCatalogV2Beta1IntegrationTestData(t, rscClient)
-
-	// upgrade the cluster to the Target version
-	t.Logf("initiating standard upgrade to version=%q", utils.TargetVersion)
-	err = cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), utils.TargetVersion)
-
-	require.NoError(t, err)
-	libcluster.WaitForLeader(t, cluster, client)
-	libcluster.WaitForMembers(t, client, numServers)
-
-	catalogtest.VerifyCatalogV2Beta1IntegrationTestResults(t, rscClient)
-}
diff --git a/test/integration/consul-container/test/upgrade/common.go b/test/integration/consul-container/test/upgrade/common.go
index cbbf9aea35af3..44bdcca25180a 100644
--- a/test/integration/consul-container/test/upgrade/common.go
+++ b/test/integration/consul-container/test/upgrade/common.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package upgrade
 
 import (
@@ -69,7 +66,7 @@ func CreateAndRegisterStaticClientSidecarWith2Upstreams(c *cluster.Cluster, dest
 		ServiceID: libservice.StaticClientServiceName,
 	}
 
-	clientConnectProxy, err := libservice.NewConnectService(context.Background(), sidecarCfg, []int{cluster.ServiceUpstreamLocalBindPort, cluster.ServiceUpstreamLocalBindPort2}, node, nil)
+	clientConnectProxy, err := libservice.NewConnectService(context.Background(), sidecarCfg, []int{cluster.ServiceUpstreamLocalBindPort, cluster.ServiceUpstreamLocalBindPort2}, node)
 	if err != nil {
 		return nil, err
 	}
diff --git a/test/integration/consul-container/test/upgrade/healthcheck_test.go b/test/integration/consul-container/test/upgrade/healthcheck_test.go
new file mode 100644
index 0000000000000..ac6da2dbb558d
--- /dev/null
+++ b/test/integration/consul-container/test/upgrade/healthcheck_test.go
@@ -0,0 +1,149 @@
+package upgrade
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/hashicorp/consul/api"
+	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
+	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
+)
+
+// Test health check GRPC call using Target Servers and Latest GA Clients
+func TestTargetServersWithLatestGAClients(t *testing.T) {
+	t.Parallel()
+
+	const (
+		numServers = 3
+		numClients = 1
+	)
+
+	cluster := serversCluster(t, numServers, utils.TargetImageName, utils.TargetVersion)
+
+	clientsCreate(t, numClients, utils.LatestImageName, utils.LatestVersion, cluster)
+
+	client := cluster.APIClient(0)
+
+	libcluster.WaitForLeader(t, cluster, client)
+	libcluster.WaitForMembers(t, client, 4)
+
+	const serviceName = "api"
+	index := serviceCreate(t, client, serviceName)
+
+	ch, errCh := serviceHealthBlockingQuery(client, serviceName, index)
+	require.NoError(t, client.Agent().ServiceRegister(
+		&api.AgentServiceRegistration{Name: serviceName, Port: 9998},
+	))
+
+	timer := time.NewTimer(3 * time.Second)
+	select {
+	case err := <-errCh:
+		require.NoError(t, err)
+	case service := <-ch:
+		require.Len(t, service, 1)
+		require.Equal(t, serviceName, service[0].Service.Service)
+		require.Equal(t, 9998, service[0].Service.Port)
+	case <-timer.C:
+		t.Fatalf("test timeout")
+	}
+}
+
+// Test health check GRPC call using Mixed (majority latest) Servers and Latest GA Clients
+func TestMixedServersMajorityLatestGAClient(t *testing.T) {
+	t.Parallel()
+
+	testMixedServersGAClient(t, false)
+}
+
+// Test health check GRPC call using Mixed (majority target) Servers and Latest GA Clients
+func TestMixedServersMajorityTargetGAClient(t *testing.T) {
+	t.Parallel()
+
+	testMixedServersGAClient(t, true)
+}
+
+// Test health check GRPC call using Mixed (majority conditional) Servers and Latest GA Clients
+func testMixedServersGAClient(t *testing.T, majorityIsTarget bool) {
+	var (
+		latestOpts = libcluster.BuildOptions{
+			ConsulImageName: utils.LatestImageName,
+			ConsulVersion:   utils.LatestVersion,
+		}
+		targetOpts = libcluster.BuildOptions{
+			ConsulImageName: utils.TargetImageName,
+			ConsulVersion:   utils.TargetVersion,
+		}
+
+		majorityOpts libcluster.BuildOptions
+		minorityOpts libcluster.BuildOptions
+	)
+
+	if majorityIsTarget {
+		majorityOpts = targetOpts
+		minorityOpts = latestOpts
+	} else {
+		majorityOpts = latestOpts
+		minorityOpts = targetOpts
+	}
+
+	const (
+		numServers = 3
+		numClients = 1
+	)
+
+	var configs []libcluster.Config
+	{
+		ctx := libcluster.NewBuildContext(t, minorityOpts)
+
+		conf := libcluster.NewConfigBuilder(ctx).
+			ToAgentConfig(t)
+		t.Logf("Cluster server (leader) config:\n%s", conf.JSON)
+
+		configs = append(configs, *conf)
+	}
+
+	{
+		ctx := libcluster.NewBuildContext(t, majorityOpts)
+
+		conf := libcluster.NewConfigBuilder(ctx).
+			Bootstrap(numServers).
+			ToAgentConfig(t)
+		t.Logf("Cluster server config:\n%s", conf.JSON)
+
+		for i := 1; i < numServers; i++ {
+			configs = append(configs, *conf)
+		}
+	}
+
+	cluster, err := libcluster.New(t, configs)
+	require.NoError(t, err)
+
+	clientsCreate(t, numClients, utils.LatestImageName, utils.LatestVersion, cluster)
+
+	client := cluster.APIClient(0)
+
+	libcluster.WaitForLeader(t, cluster, client)
+	libcluster.WaitForMembers(t, client, 4) // TODO(rb): why 4?
+
+	const serviceName = "api"
+	index := serviceCreate(t, client, serviceName)
+
+	ch, errCh := serviceHealthBlockingQuery(client, serviceName, index)
+	require.NoError(t, client.Agent().ServiceRegister(
+		&api.AgentServiceRegistration{Name: serviceName, Port: 9998},
+	))
+
+	timer := time.NewTimer(3 * time.Second)
+	select {
+	case err := <-errCh:
+		require.NoError(t, err)
+	case service := <-ch:
+		require.Len(t, service, 1)
+		require.Equal(t, serviceName, service[0].Service.Service)
+		require.Equal(t, 9998, service[0].Service.Port)
+	case <-timer.C:
+		t.Fatalf("test timeout")
+	}
+}
diff --git a/test/integration/consul-container/test/upgrade/helper_test.go b/test/integration/consul-container/test/upgrade/helper_test.go
new file mode 100644
index 0000000000000..c8627f374771f
--- /dev/null
+++ b/test/integration/consul-container/test/upgrade/helper_test.go
@@ -0,0 +1,92 @@
+package upgrade
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/consul/api"
+	"github.com/stretchr/testify/require"
+
+	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
+)
+
+func serversCluster(t *testing.T, numServers int, image, version string) *libcluster.Cluster {
+	t.Helper()
+
+	opts := libcluster.BuildOptions{
+		ConsulImageName: image,
+		ConsulVersion:   version,
+	}
+	ctx := libcluster.NewBuildContext(t, opts)
+
+	conf := libcluster.NewConfigBuilder(ctx).
+		Bootstrap(numServers).
+		ToAgentConfig(t)
+	t.Logf("Cluster server config:\n%s", conf.JSON)
+
+	cluster, err := libcluster.NewN(t, *conf, numServers)
+	require.NoError(t, err)
+
+	libcluster.WaitForLeader(t, cluster, nil)
+	libcluster.WaitForMembers(t, cluster.APIClient(0), numServers)
+
+	return cluster
+}
+
+func clientsCreate(t *testing.T, numClients int, image, version string, cluster *libcluster.Cluster) {
+	t.Helper()
+
+	opts := libcluster.BuildOptions{
+		ConsulImageName: image,
+		ConsulVersion:   version,
+	}
+	ctx := libcluster.NewBuildContext(t, opts)
+
+	conf := libcluster.NewConfigBuilder(ctx).
+		Client().
+		ToAgentConfig(t)
+	t.Logf("Cluster client config:\n%s", conf.JSON)
+
+	require.NoError(t, cluster.AddN(*conf, numClients, true))
+}
+
+func serviceCreate(t *testing.T, client *api.Client, serviceName string) uint64 {
+	require.NoError(t, client.Agent().ServiceRegister(&api.AgentServiceRegistration{
+		Name: serviceName,
+		Port: 9999,
+		Connect: &api.AgentServiceConnect{
+			SidecarService: &api.AgentServiceRegistration{
+				Port: 22005,
+			},
+		},
+	}))
+
+	service, meta, err := client.Catalog().Service(serviceName, "", &api.QueryOptions{})
+	require.NoError(t, err)
+	require.Len(t, service, 1)
+	require.Equal(t, serviceName, service[0].ServiceName)
+	require.Equal(t, 9999, service[0].ServicePort)
+
+	return meta.LastIndex
+}
+
+func serviceHealthBlockingQuery(client *api.Client, serviceName string, waitIndex uint64) (chan []*api.ServiceEntry, chan error) {
+	var (
+		ch    = make(chan []*api.ServiceEntry, 1)
+		errCh = make(chan error, 1)
+	)
+	go func() {
+		opts := &api.QueryOptions{WaitIndex: waitIndex}
+		service, q, err := client.Health().Service(serviceName, "", false, opts)
+		if err == nil && q.QueryBackend != api.QueryBackendStreaming {
+			err = fmt.Errorf("invalid backend for this test %s", q.QueryBackend)
+		}
+		if err != nil {
+			errCh <- err
+		} else {
+			ch <- service
+		}
+	}()
+
+	return ch, errCh
+}
diff --git a/test/integration/consul-container/test/upgrade/ingress_gateway_grpc_test.go b/test/integration/consul-container/test/upgrade/ingress_gateway_grpc_test.go
deleted file mode 100644
index 174769d53170f..0000000000000
--- a/test/integration/consul-container/test/upgrade/ingress_gateway_grpc_test.go
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package upgrade
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/docker/go-connections/nat"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/api"
-	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-)
-
-func TestIngressGateway_GRPC_UpgradeToTarget_fromLatest(t *testing.T) {
-	t.Parallel()
-	cluster, _, client := topology.NewCluster(t, &topology.ClusterConfig{
-		NumServers: 1,
-		NumClients: 1,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:      "dc1",
-			ConsulImageName: utils.GetLatestImageName(),
-			ConsulVersion:   utils.LatestVersion,
-		},
-		ApplyDefaultProxySettings: true,
-	})
-
-	require.NoError(t, cluster.ConfigEntryWrite(&api.ServiceConfigEntry{
-		Name:     libservice.StaticServerServiceName,
-		Kind:     api.ServiceDefaults,
-		Protocol: "grpc",
-	}))
-
-	const (
-		nameIG = "ingress-gateway"
-	)
-
-	const nameS1 = libservice.StaticServerServiceName
-
-	igw, err := libservice.NewGatewayService(
-		context.Background(),
-		libservice.GatewayConfig{
-			Name: nameIG,
-			Kind: "ingress",
-		},
-		cluster.Servers()[0],
-	)
-	require.NoError(t, err)
-
-	// these must be one of the externally-mapped ports from
-	// https://github.com/hashicorp/consul/blob/c5e729e86576771c4c22c6da1e57aaa377319323/test/integration/consul-container/libs/cluster/container.go#L521-L525
-	const portS1DirectNoTLS = 8080
-	require.NoError(t, cluster.ConfigEntryWrite(&api.IngressGatewayConfigEntry{
-		Kind: api.IngressGateway,
-		Name: nameIG,
-		Listeners: []api.IngressListener{
-			{
-				Port:     portS1DirectNoTLS,
-				Protocol: "grpc",
-				Services: []api.IngressService{
-					{
-						Name:  libservice.StaticServerServiceName,
-						Hosts: []string{"*"},
-					},
-				},
-			},
-		},
-	}))
-
-	// register static-server service
-	_, _, err = libservice.CreateAndRegisterStaticServerAndSidecar(
-		cluster.Clients()[0],
-		&libservice.ServiceOpts{
-			Name:         nameS1,
-			ID:           nameS1,
-			HTTPPort:     8080,
-			GRPCPort:     8079,
-			RegisterGRPC: true,
-		},
-	)
-	require.NoError(t, err)
-	libassert.CatalogServiceExists(t, client, nameS1, nil)
-
-	// Register an static-client service
-	serverNodes := cluster.Servers()
-	require.NoError(t, err)
-	require.True(t, len(serverNodes) > 0)
-	staticClientSvcSidecar, err := libservice.CreateAndRegisterStaticClientSidecar(serverNodes[0], "", true, false, nil)
-	require.NoError(t, err)
-
-	tests := func(t *testing.T) {
-		t.Run("grpc directly", func(t *testing.T) {
-			_, p := staticClientSvcSidecar.GetAddr()
-			libassert.GRPCPing(t, fmt.Sprintf("localhost:%d", p))
-		})
-		t.Run("grpc via igw", func(t *testing.T) {
-			pm, _ := cluster.Servers()[0].GetPod().MappedPort(
-				context.Background(),
-				nat.Port(fmt.Sprintf("%d/tcp", portS1DirectNoTLS)),
-			)
-			libassert.GRPCPing(t, fmt.Sprintf("localhost:%d", pm.Int()))
-		})
-	}
-
-	t.Run("pre-upgrade", func(t *testing.T) {
-		tests(t)
-	})
-
-	if t.Failed() {
-		t.Fatal("failing fast: failed assertions pre-upgrade")
-	}
-
-	t.Logf("Upgrade to version %s", utils.TargetVersion)
-	err = cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), utils.TargetVersion)
-	require.NoError(t, err)
-	require.NoError(t, igw.Restart())
-
-	t.Run("post-upgrade", func(t *testing.T) {
-		tests(t)
-	})
-}
diff --git a/test/integration/consul-container/test/upgrade/ingress_gateway_sds_test.go b/test/integration/consul-container/test/upgrade/ingress_gateway_sds_test.go
deleted file mode 100644
index a237bd98b2300..0000000000000
--- a/test/integration/consul-container/test/upgrade/ingress_gateway_sds_test.go
+++ /dev/null
@@ -1,339 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package upgrade
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/docker/go-connections/nat"
-	"github.com/hashicorp/consul/api"
-	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"github.com/testcontainers/testcontainers-go"
-	"github.com/testcontainers/testcontainers-go/wait"
-)
-
-const sdsServerPort = 1234
-
-// This upgrade test tests Ingress Gateway functionality when using an external
-// SDS server for certs, as described in https://developer.hashicorp.com/consul/docs/connect/gateways/ingress-gateway#custom-tls-certificates-via-secret-discovery-service-sds
-// It:
-//  1. starts a consul cluster
-//  2. builds and starts a test SDS server from .../test-sds-server
-//  3. configures an ingress gateway pointed at this SDS server
-//  4. does HTTPS calls against the gateway and checks that the certs returned
-//     are from the SDS server as expected
-func TestIngressGateway_SDS_UpgradeToTarget_fromLatest(t *testing.T) {
-	t.Parallel()
-
-	cluster, _, client := topology.NewCluster(t, &topology.ClusterConfig{
-		NumServers: 1,
-		NumClients: 2,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:      "dc1",
-			ConsulImageName: utils.GetLatestImageName(),
-			ConsulVersion:   utils.LatestVersion,
-		},
-		ApplyDefaultProxySettings: true,
-	})
-
-	sdsServerContainerName, rootPEM := createSDSServer(t, cluster)
-
-	require.NoError(t, cluster.ConfigEntryWrite(&api.ServiceConfigEntry{
-		Name:     libservice.StaticServerServiceName,
-		Kind:     api.ServiceDefaults,
-		Protocol: "http",
-	}))
-	require.NoError(t, cluster.ConfigEntryWrite(&api.ServiceConfigEntry{
-		Name:     libservice.StaticServer2ServiceName,
-		Kind:     api.ServiceDefaults,
-		Protocol: "http",
-	}))
-
-	const (
-		nameIG = "ingress-gateway"
-	)
-
-	const nameS1 = libservice.StaticServerServiceName
-	const nameS2 = libservice.StaticServer2ServiceName
-
-	// this must be one of the externally-mapped ports from
-	// https://github.com/hashicorp/consul/blob/c5e729e86576771c4c22c6da1e57aaa377319323/test/integration/consul-container/libs/cluster/container.go#L521-L525
-	const (
-		portWildcard   = 8080
-		portOther      = 9999
-		nameSDSCluster = "sds-cluster"
-		// these are in our pre-created certs in .../test-sds-server
-		hostnameWWW          = "www.example.com"
-		hostnameFoo          = "foo.example.com"
-		certResourceWildcard = "wildcard.ingress.consul"
-	)
-	require.NoError(t, cluster.ConfigEntryWrite(&api.IngressGatewayConfigEntry{
-		Kind: api.IngressGateway,
-		Name: nameIG,
-
-		Listeners: []api.IngressListener{
-			{
-				Port:     portWildcard,
-				Protocol: "http",
-				Services: []api.IngressService{
-					{
-						Name: "*",
-					},
-				},
-				TLS: &api.GatewayTLSConfig{
-					Enabled:       true,
-					TLSMinVersion: "TLSv1_2",
-					SDS: &api.GatewayTLSSDSConfig{
-						ClusterName:  nameSDSCluster,
-						CertResource: certResourceWildcard,
-					},
-				},
-			},
-			{
-				Port:     portOther,
-				Protocol: "http",
-				Services: []api.IngressService{
-					{
-						Name:  libservice.StaticServerServiceName,
-						Hosts: []string{hostnameWWW},
-						TLS: &api.GatewayServiceTLSConfig{
-							SDS: &api.GatewayTLSSDSConfig{
-								ClusterName:  nameSDSCluster,
-								CertResource: hostnameWWW,
-							},
-						},
-					},
-					{
-						Name:  libservice.StaticServer2ServiceName,
-						Hosts: []string{hostnameFoo},
-						TLS: &api.GatewayServiceTLSConfig{
-							SDS: &api.GatewayTLSSDSConfig{
-								ClusterName:  nameSDSCluster,
-								CertResource: hostnameFoo,
-							},
-						},
-					},
-				},
-				TLS: &api.GatewayTLSConfig{
-					Enabled:       true,
-					TLSMinVersion: "TLSv1_2",
-				},
-			},
-		},
-	}))
-
-	const staticClusterJSONKey = "envoy_extra_static_clusters_json"
-
-	// register sds cluster as per https://developer.hashicorp.com/consul/docs/connect/gateways/ingress-gateway#configure-static-sds-cluster-s
-	require.NoError(t, cluster.Servers()[0].GetClient().Agent().ServiceRegister(
-		&api.AgentServiceRegistration{
-			Kind: api.ServiceKindIngressGateway,
-			Name: nameIG,
-			Proxy: &api.AgentServiceConnectProxyConfig{
-				Config: map[string]interface{}{
-					// LOGICAL_DNS because we need to use a hostname
-					// WARNING: this JSON is *very* sensitive and not well-checked.
-					// bad values can lead to envoy not bootstrapping properly
-					staticClusterJSONKey: fmt.Sprintf(`
-{
-  "name": "%s",
-  "connect_timeout": "5s",
-  "http2_protocol_options": {},
-  "type": "LOGICAL_DNS",
-  "load_assignment": {
-    "cluster_name": "%s",
-    "endpoints": [
-      {
-        "lb_endpoints": [
-          {
-            "endpoint": {
-              "address": {
-                "socket_address": {
-                  "address": "%s",
-                  "port_value": %d
-                }
-              }
-            }
-          }
-        ]
-      }
-    ]
-  }
-}`, nameSDSCluster, nameSDSCluster, sdsServerContainerName, sdsServerPort),
-				},
-			},
-		},
-	))
-
-	igw, err := libservice.NewGatewayServiceReg(context.Background(), libservice.GatewayConfig{
-		Name: nameIG,
-		Kind: "ingress",
-	}, cluster.Servers()[0], false)
-	require.NoError(t, err)
-
-	// create s1
-	_, _, err = libservice.CreateAndRegisterStaticServerAndSidecar(
-		cluster.Clients()[0],
-		&libservice.ServiceOpts{
-			Name:     nameS1,
-			ID:       nameS1,
-			HTTPPort: 8080,
-			GRPCPort: 8079,
-		},
-	)
-	require.NoError(t, err)
-	libassert.CatalogServiceExists(t, client, nameS1, nil)
-
-	// create s2
-	_, _, err = libservice.CreateAndRegisterStaticServerAndSidecar(
-		cluster.Clients()[1],
-		&libservice.ServiceOpts{
-			Name:     nameS2,
-			ID:       nameS2,
-			HTTPPort: 8080,
-			GRPCPort: 8079,
-		},
-	)
-	require.NoError(t, err)
-	libassert.CatalogServiceExists(t, client, nameS2, nil)
-
-	tests := func(t *testing.T) {
-		t.Run("ensure HTTP response with cert *.ingress.consul", func(t *testing.T) {
-			port := portWildcard
-			reqHost := fmt.Sprintf("%s.ingress.consul:%d", libservice.StaticServerServiceName, port)
-			portMapped, _ := cluster.Servers()[0].GetPod().MappedPort(
-				context.Background(),
-				nat.Port(fmt.Sprintf("%d/tcp", port)),
-			)
-
-			httpClient := httpClientWithCA(t, reqHost, string(rootPEM))
-			urlbase := fmt.Sprintf("https://%s", reqHost)
-			resp := mappedHTTPGET(t, urlbase, portMapped.Int(), nil, nil, httpClient)
-			defer resp.Body.Close()
-
-			require.Equal(t, 1, len(resp.TLS.PeerCertificates))
-			require.Equal(t, 1, len(resp.TLS.PeerCertificates[0].DNSNames))
-			assert.Equal(t, "*.ingress.consul", resp.TLS.PeerCertificates[0].DNSNames[0])
-		})
-
-		t.Run("listener 2: ensure HTTP response with cert www.example.com", func(t *testing.T) {
-			port := portOther
-			reqHost := fmt.Sprintf("%s:%d", hostnameWWW, port)
-			portMapped, _ := cluster.Servers()[0].GetPod().MappedPort(
-				context.Background(),
-				nat.Port(fmt.Sprintf("%d/tcp", port)),
-			)
-
-			httpClient := httpClientWithCA(t, reqHost, string(rootPEM))
-			urlbase := fmt.Sprintf("https://%s", reqHost)
-			resp := mappedHTTPGET(t, urlbase, portMapped.Int(), nil, nil, httpClient)
-			defer resp.Body.Close()
-
-			require.Equal(t, 1, len(resp.TLS.PeerCertificates))
-			require.Equal(t, 1, len(resp.TLS.PeerCertificates[0].DNSNames))
-			assert.Equal(t, hostnameWWW, resp.TLS.PeerCertificates[0].DNSNames[0])
-		})
-
-		t.Run("listener 2: ensure HTTP response with cert foo.example.com", func(t *testing.T) {
-			port := portOther
-			reqHost := fmt.Sprintf("%s:%d", hostnameFoo, port)
-			portMapped, _ := cluster.Servers()[0].GetPod().MappedPort(
-				context.Background(),
-				nat.Port(fmt.Sprintf("%d/tcp", port)),
-			)
-
-			httpClient := httpClientWithCA(t, reqHost, string(rootPEM))
-			urlbase := fmt.Sprintf("https://%s", reqHost)
-			resp := mappedHTTPGET(t, urlbase, portMapped.Int(), nil, nil, httpClient)
-			defer resp.Body.Close()
-
-			require.Equal(t, 1, len(resp.TLS.PeerCertificates))
-			require.Equal(t, 1, len(resp.TLS.PeerCertificates[0].DNSNames))
-			assert.Equal(t, hostnameFoo, resp.TLS.PeerCertificates[0].DNSNames[0])
-		})
-	}
-
-	t.Run("pre-upgrade", func(t *testing.T) {
-		tests(t)
-	})
-
-	if t.Failed() {
-		t.Fatal("failing fast: failed assertions pre-upgrade")
-	}
-
-	// Upgrade the cluster to utils.TargetVersion
-	t.Logf("Upgrade to version %s", utils.TargetVersion)
-	err = cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), utils.TargetVersion)
-	require.NoError(t, err)
-	require.NoError(t, igw.Restart())
-
-	t.Run("post-upgrade", func(t *testing.T) {
-		tests(t)
-	})
-}
-
-// createSDSServer builds and runs a test SDS server in the given cluster.
-// It is built from files in .../test-sds-server, shared with the BATS tests.
-// This includes some pre-generated certs for various scenarios.
-//
-// It returns the name of the container (which will also be the hostname), and
-// the root CA's cert in PEM encoding
-func createSDSServer(t *testing.T, cluster *libcluster.Cluster) (containerName string, rootPEM []byte) {
-	t.Helper()
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*40)
-	defer cancel()
-
-	sdsServerFilesPath, err := filepath.Abs("../../../connect/envoy/test-sds-server/")
-	require.NoError(t, err)
-
-	// TODO: we should probably just generate these certs on every boot
-	certPath := filepath.Join(sdsServerFilesPath, "/certs")
-
-	rootPEMf, err := os.Open(filepath.Join(certPath, "ca-root.crt"))
-	require.NoError(t, err)
-
-	rootPEM, err = io.ReadAll(rootPEMf)
-	require.NoError(t, err)
-
-	containerName = utils.RandName(fmt.Sprintf("%s-test-sds-server", cluster.Servers()[0].GetDatacenter()))
-
-	_, err = testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
-		Started: true,
-		ContainerRequest: testcontainers.ContainerRequest{
-			Image: "consul-sds-server",
-			Name:  containerName,
-			Networks: []string{
-				cluster.NetworkName,
-			},
-			ExposedPorts: []string{
-				fmt.Sprintf("%d/tcp", sdsServerPort),
-			},
-			Mounts: []testcontainers.ContainerMount{
-				{
-					Source: testcontainers.DockerBindMountSource{
-						HostPath: certPath,
-					},
-					Target:   "/certs",
-					ReadOnly: true,
-				},
-			},
-			WaitingFor: wait.ForLog("").WithStartupTimeout(60 * time.Second),
-		},
-	})
-	require.NoError(t, err, "create SDS server container")
-	return containerName, rootPEM
-}
diff --git a/test/integration/consul-container/test/upgrade/ingress_gateway_test.go b/test/integration/consul-container/test/upgrade/ingress_gateway_test.go
deleted file mode 100644
index e4bc12629fe5e..0000000000000
--- a/test/integration/consul-container/test/upgrade/ingress_gateway_test.go
+++ /dev/null
@@ -1,572 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package upgrade
-
-import (
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/docker/go-connections/nat"
-	"github.com/itchyny/gojq"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
-	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
-	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-)
-
-// These tests adapt BATS-based tests from test/integration/connect/case-ingress-gateway*
-
-// TestIngressGateway_UpgradeToTarget_fromLatest:
-// - starts a cluster with 2 static services,
-// - configures an ingress gateway + router with TLS
-// - performs tests:
-//   - envoy is configured with thresholds (e.g max connections) and health checks
-//   - HTTP header manipulation
-//   - per-service and wildcard and custom hostnames work
-//
-// - upgrades the cluster
-// - performs these tests again
-func TestIngressGateway_UpgradeToTarget_fromLatest(t *testing.T) {
-	t.Parallel()
-
-	cluster, _, client := topology.NewCluster(t, &topology.ClusterConfig{
-		NumServers: 1,
-		NumClients: 2,
-		BuildOpts: &libcluster.BuildOptions{
-			Datacenter:      "dc1",
-			ConsulImageName: utils.GetLatestImageName(),
-			ConsulVersion:   utils.LatestVersion,
-		},
-		ApplyDefaultProxySettings: true,
-	})
-
-	require.NoError(t, cluster.ConfigEntryWrite(&api.ProxyConfigEntry{
-		Name: api.ProxyConfigGlobal,
-		Kind: api.ProxyDefaults,
-		Config: map[string]interface{}{
-			"protocol": "http",
-		},
-	}))
-
-	const (
-		nameIG     = "ingress-gateway"
-		nameRouter = "router"
-	)
-
-	const nameS1 = libservice.StaticServerServiceName
-	const nameS2 = libservice.StaticServer2ServiceName
-	require.NoError(t, cluster.ConfigEntryWrite(&api.ServiceRouterConfigEntry{
-		Kind: api.ServiceRouter,
-		// This is a "virtual" service name and will not have a backing
-		// service definition. It must match the name defined in the ingress
-		// configuration.
-		Name: nameRouter,
-		Routes: []api.ServiceRoute{
-			{
-				Match: &api.ServiceRouteMatch{
-					HTTP: &api.ServiceRouteHTTPMatch{
-						PathPrefix: fmt.Sprintf("/%s/", nameS1),
-					},
-				},
-				Destination: &api.ServiceRouteDestination{
-					Service:       nameS1,
-					PrefixRewrite: "/",
-				},
-			},
-			{
-				Match: &api.ServiceRouteMatch{
-					HTTP: &api.ServiceRouteHTTPMatch{
-						PathPrefix: fmt.Sprintf("/%s/", nameS2),
-					},
-				},
-				Destination: &api.ServiceRouteDestination{
-					Service:       nameS2,
-					PrefixRewrite: "/",
-				},
-			},
-		},
-	}))
-
-	gwCfg := libservice.GatewayConfig{
-		Name: nameIG,
-		Kind: "ingress",
-	}
-	igw, err := libservice.NewGatewayService(context.Background(), gwCfg, cluster.Servers()[0])
-	require.NoError(t, err)
-
-	// these must be one of the externally-mapped ports from
-	// https://github.com/hashicorp/consul/blob/c5e729e86576771c4c22c6da1e57aaa377319323/test/integration/consul-container/libs/cluster/container.go#L521-L525
-	const portRouter = 8080
-	const portWildcard = 9997
-	const portS1Direct = 9998
-	const portS1DirectCustomHostname = 9999
-	const hostnameS1DirectCustom = "test.example.com"
-	// arbitrary numbers
-	var (
-		overrideOffset              = uint32(10000)
-		igwDefaultMaxConns          = uint32(3572)
-		igwDefaultMaxPendingReqs    = uint32(7644)
-		igwDefaultMaxConcurrentReqs = uint32(7637)
-		// PHC = PassiveHealthCheck
-		igwDefaultPHCMaxFailures = uint32(7382)
-		s1MaxConns               = igwDefaultMaxConns + overrideOffset
-		s1MaxPendingReqs         = igwDefaultMaxConcurrentReqs + overrideOffset
-	)
-	const (
-		igwDefaultPHCIntervalS = 7820
-	)
-	igwDefaults := api.IngressServiceConfig{
-		MaxConnections:        &igwDefaultMaxConns,
-		MaxPendingRequests:    &igwDefaultMaxPendingReqs,
-		MaxConcurrentRequests: &igwDefaultMaxConcurrentReqs,
-	}
-	// passive health checks were introduced in 1.15
-	if utils.VersionGTE(utils.LatestVersion, "1.15") {
-		igwDefaults.PassiveHealthCheck = &api.PassiveHealthCheck{
-			Interval:    igwDefaultPHCIntervalS * time.Second,
-			MaxFailures: igwDefaultPHCMaxFailures,
-		}
-	}
-	require.NoError(t, cluster.ConfigEntryWrite(&api.IngressGatewayConfigEntry{
-		Kind:     api.IngressGateway,
-		Name:     nameIG,
-		Defaults: &igwDefaults,
-		TLS: api.GatewayTLSConfig{
-			Enabled:       true,
-			TLSMinVersion: "TLSv1_2",
-		},
-		Listeners: []api.IngressListener{
-			{
-				Port:     portRouter,
-				Protocol: "http",
-				Services: []api.IngressService{
-					{
-						Name: nameRouter,
-						// for "request header manipulation" subtest
-						RequestHeaders: &api.HTTPHeaderModifiers{
-							Add: map[string]string{
-								"x-foo":        "bar-req",
-								"x-existing-1": "appended-req",
-							},
-							Set: map[string]string{
-								"x-existing-2": "replaced-req",
-								"x-client-ip":  "%DOWNSTREAM_REMOTE_ADDRESS_WITHOUT_PORT%",
-							},
-							Remove: []string{"x-bad-req"},
-						},
-						// for "response header manipulation" subtest
-						ResponseHeaders: &api.HTTPHeaderModifiers{
-							Add: map[string]string{
-								"x-foo":        "bar-resp",
-								"x-existing-1": "appended-resp",
-							},
-							Set: map[string]string{
-								"x-existing-2": "replaced-resp",
-							},
-							Remove: []string{"x-bad-resp"},
-						},
-					},
-				},
-			},
-			// for "envoy config/thresholds" subtest
-			{
-				Port:     portS1Direct,
-				Protocol: "http",
-				Services: []api.IngressService{
-					{
-						Name:               libservice.StaticServerServiceName,
-						MaxConnections:     &s1MaxConns,
-						MaxPendingRequests: &s1MaxPendingReqs,
-					},
-				},
-			},
-			// for "hostname=custom" subtest
-			{
-				Port:     portS1DirectCustomHostname,
-				Protocol: "http",
-				Services: []api.IngressService{
-					{
-						Name:  libservice.StaticServerServiceName,
-						Hosts: []string{hostnameS1DirectCustom},
-					},
-				},
-			},
-			// for "hostname=*" subtest
-			{
-				Port:     portWildcard,
-				Protocol: "http",
-				Services: []api.IngressService{
-					{
-						Name: "*",
-					},
-				},
-			},
-		},
-	}))
-
-	// create s1
-	_, _, err = libservice.CreateAndRegisterStaticServerAndSidecar(
-		cluster.Clients()[0],
-		&libservice.ServiceOpts{
-			Name:     nameS1,
-			ID:       nameS1,
-			HTTPPort: 8080,
-			GRPCPort: 8079,
-		},
-	)
-	require.NoError(t, err)
-	libassert.CatalogServiceExists(t, client, nameS1, nil)
-
-	// create s2
-	_, _, err = libservice.CreateAndRegisterStaticServerAndSidecar(
-		cluster.Clients()[1],
-		&libservice.ServiceOpts{
-			Name:     nameS2,
-			ID:       nameS2,
-			HTTPPort: 8080,
-			GRPCPort: 8079,
-		},
-	)
-	require.NoError(t, err)
-	libassert.CatalogServiceExists(t, client, nameS2, nil)
-
-	// checks
-	// TODO: other checks from verify.bats
-	// ingress-gateway proxy admin up
-	// s1 proxy admin up
-	// s2 proxy admin up
-	// s1 proxy listener has right cert
-	// s2 proxy listener has right cert
-	// ig1 has healthy endpoints for s1
-	// ig1 has healthy endpoints for s2
-	// TODO ^ ??? s1 and s2 aren't direct listeners, only in `router`, so why are they endpoints?
-
-	roots, _, err := client.Connect().CARoots(&api.QueryOptions{})
-	var root *api.CARoot
-	for _, r := range roots.Roots {
-		if r.Active {
-			root = r
-			break
-		}
-	}
-	require.NotNil(t, root, "no active CA root found")
-
-	// tests
-	tests := func(t *testing.T) {
-		// fortio name should be $nameS<X> for /$nameS<X> prefix on router
-		portRouterMapped, _ := cluster.Servers()[0].GetPod().MappedPort(
-			context.Background(),
-			nat.Port(fmt.Sprintf("%d/tcp", portRouter)),
-		)
-		reqHost := fmt.Sprintf("router.ingress.consul:%d", portRouter)
-
-		httpClient := httpClientWithCA(t, reqHost, root.RootCertPEM)
-
-		t.Run("fortio name", func(t *testing.T) {
-			// TODO: occasionally (1 in 5 or so), service 1 gets stuck throwing 503s
-			// - direct connection works fine
-			// - its envoy has some 503s in stats, and some 200s
-			// - igw envoy says all 503s in stats
-			libassert.AssertFortioNameWithClient(t,
-				fmt.Sprintf("https://localhost:%d/%s", portRouterMapped.Int(), nameS1), nameS1, reqHost, httpClient)
-			libassert.AssertFortioNameWithClient(t,
-				fmt.Sprintf("https://localhost:%d/%s", portRouterMapped.Int(), nameS2), nameS2, reqHost, httpClient)
-		})
-		urlbaseS2 := fmt.Sprintf("https://%s/%s", reqHost, nameS2)
-
-		t.Run("envoy config", func(t *testing.T) {
-			var dump string
-			_, adminPort := igw.GetAdminAddr()
-			retry.RunWith(&retry.Timer{Timeout: 30 * time.Second, Wait: 1 * time.Second}, t, func(r *retry.R) {
-				dump, _, err = libassert.GetEnvoyOutput(adminPort, "config_dump", map[string]string{})
-				if err != nil {
-					r.Fatal("could not fetch envoy configuration")
-				}
-			})
-			var m interface{}
-			err = json.Unmarshal([]byte(dump), &m)
-			require.NoError(t, err)
-
-			q, err := gojq.Parse(fmt.Sprintf(`.configs[1].dynamic_active_clusters[]
-				| select(.cluster.name|startswith("%s."))
-				| .cluster`, nameS1))
-			require.NoError(t, err)
-			it := q.Run(m)
-			v, ok := it.Next()
-			require.True(t, ok)
-			t.Run("thresholds", func(t *testing.T) {
-				// TODO: these fail about 10% of the time on my machine, giving me only the defaults, not the override
-				// writing the config again (with a different value) usually works
-				// https://hashicorp.slack.com/archives/C03UNBBDELS/p1677621125567219
-				t.Skip("BUG? thresholds not set about 10% of the time")
-				thresholds := v.(map[string]any)["circuit_breakers"].(map[string]any)["thresholds"].([]map[string]any)[0]
-				assert.Equal(t, float64(s1MaxConns), thresholds["max_connections"].(float64), "max conns from override")
-				assert.Equal(t, float64(s1MaxPendingReqs), thresholds["max_pending_requests"].(float64), "max pending conns from override")
-				assert.Equal(t, float64(*igwDefaults.MaxConcurrentRequests), thresholds["max_requests"].(float64), "max requests from defaults")
-			})
-			t.Run("outlier detection", func(t *testing.T) {
-				if utils.VersionLT(utils.LatestVersion, "1.15") {
-					t.Skipf("version %s (< 1.15) IGW doesn't support Defaults.PassiveHealthCheck", utils.LatestVersion)
-				}
-				// BATS checks against S2, but we're doing S1 just to avoid more jq
-				o := v.(map[string]any)["outlier_detection"].(map[string]any)
-				assert.Equal(t,
-					fmt.Sprintf("%ds", igwDefaultPHCIntervalS),
-					o["interval"].(string),
-					"interval: s1 == default",
-				)
-				assert.Equal(t, float64(igwDefaultPHCMaxFailures), o["consecutive_5xx"].(float64), "s1 max failures == default")
-				_, ec5xx_ok := o["enforcing_consecutive_5xx"]
-				assert.False(t, ec5xx_ok, "s1 enforcing_consective_5xx: unset")
-			})
-		})
-
-		t.Run("request header manipulation", func(t *testing.T) {
-			resp := mappedHTTPGET(t, fmt.Sprintf("%s/debug?env=dump", urlbaseS2), portRouterMapped.Int(), http.Header(map[string][]string{
-				"X-Existing-1": {"original"},
-				"X-Existing-2": {"original"},
-				"X-Bad-Req":    {"true"},
-			}), nil, httpClient)
-			defer resp.Body.Close()
-			body, err := io.ReadAll(resp.Body)
-			require.NoError(t, err)
-
-			// The following check the body, which should echo the headers received
-			// by the fortio container
-			assert.Contains(t, string(body), "X-Foo: bar-req",
-				"Ingress should have added the new request header")
-			assert.Contains(t, string(body), "X-Existing-1: original,appended-req",
-				"Ingress should have appended the first existing header - both should be present")
-			assert.Contains(t, string(body), "X-Existing-2: replaced-req",
-				"Ingress should have replaced the second existing header")
-			// This 172. is the prefix of the IP for the gateway for our docker network.
-			// Perhaps there's some way to look this up.
-			// This is a deviation from BATS, because their tests run inside Docker, and ours run outside.
-			assert.Contains(t, string(body), "X-Client-Ip: 172.",
-				"Ingress should have set the client ip from dynamic Envoy variable")
-			assert.NotContains(t, string(body), "X-Bad-Req: true",
-				"Ingress should have removed the bad request header")
-
-		})
-
-		t.Run("response header manipulation", func(t *testing.T) {
-			const params = "?header=x-bad-resp:true&header=x-existing-1:original&header=x-existing-2:original"
-			resp := mappedHTTPGET(t,
-				fmt.Sprintf("%s/echo%s", urlbaseS2, params),
-				portRouterMapped.Int(),
-				nil,
-				nil,
-				httpClient,
-			)
-			defer resp.Body.Close()
-
-			assert.Contains(t, resp.Header.Values("x-foo"), "bar-resp",
-				"Ingress should have added the new response header")
-			assert.Contains(t, resp.Header.Values("x-existing-1"), "original",
-				"Ingress should have appended the first existing header - both should be present")
-			assert.Contains(t, resp.Header.Values("x-existing-1"), "appended-resp",
-				"Ingress should have appended the first existing header - both should be present")
-			assert.Contains(t, resp.Header.Values("x-existing-2"), "replaced-resp",
-				"Ingress should have replaced the second existing header")
-			assert.NotContains(t, resp.Header.Values("x-existing-2"), "original",
-				"x-existing-2 response header should have been overridden")
-			assert.NotContains(t, resp.Header.Values("x-bad-resp"), "true",
-				"X-Bad-Resp response header should have been stripped")
-		})
-
-		t.Run("hostname=custom", func(t *testing.T) {
-			pm, _ := cluster.Servers()[0].GetPod().MappedPort(
-				context.Background(),
-				nat.Port(fmt.Sprintf("%d/tcp", portS1DirectCustomHostname)),
-			)
-			h := fmt.Sprintf("%s:%d", hostnameS1DirectCustom, portS1DirectCustomHostname)
-			clS1Direct := httpClientWithCA(t, h, root.RootCertPEM)
-			const data = "secret password"
-			resp := mappedHTTPGET(t,
-				"https://"+h,
-				pm.Int(),
-				nil,
-				strings.NewReader(data),
-				clS1Direct,
-			)
-			defer resp.Body.Close()
-			body, err := io.ReadAll(resp.Body)
-			require.NoError(t, err)
-			assert.Equal(t, []byte(data), body)
-		})
-
-		t.Run("hostname=<service>.ingress.consul", func(t *testing.T) {
-			pm, _ := cluster.Servers()[0].GetPod().MappedPort(
-				context.Background(),
-				nat.Port(fmt.Sprintf("%d/tcp", portS1Direct)),
-			)
-			h := fmt.Sprintf("%s.ingress.consul:%d", libservice.StaticServerServiceName, portS1Direct)
-			clS1Direct := httpClientWithCA(t, h, root.RootCertPEM)
-			const data = "secret password"
-			resp := mappedHTTPGET(t,
-				"https://"+h,
-				pm.Int(),
-				nil,
-				strings.NewReader(data),
-				clS1Direct,
-			)
-			defer resp.Body.Close()
-			body, err := io.ReadAll(resp.Body)
-			require.NoError(t, err)
-			assert.Equal(t, []byte(data), body)
-		})
-		t.Run("hostname=*", func(t *testing.T) {
-			pm, _ := cluster.Servers()[0].GetPod().MappedPort(
-				context.Background(),
-				nat.Port(fmt.Sprintf("%d/tcp", portWildcard)),
-			)
-
-			t.Run("s1 HTTPS echo validates against our CA", func(t *testing.T) {
-				h := fmt.Sprintf("%s.ingress.consul:%d", libservice.StaticServerServiceName, portWildcard)
-				cl := httpClientWithCA(t, h, root.RootCertPEM)
-				data := fmt.Sprintf("secret-%s", libservice.StaticClientServiceName)
-				resp := mappedHTTPGET(t,
-					"https://"+h,
-					pm.Int(),
-					nil,
-					strings.NewReader(data),
-					cl,
-				)
-				defer resp.Body.Close()
-				body, err := io.ReadAll(resp.Body)
-				require.NoError(t, err)
-				assert.Equal(t, []byte(data), body)
-			})
-
-			t.Run("s2 HTTPS echo validates against our CA", func(t *testing.T) {
-				h := fmt.Sprintf("%s.ingress.consul:%d", libservice.StaticServer2ServiceName, portWildcard)
-				cl := httpClientWithCA(t, h, root.RootCertPEM)
-				data := fmt.Sprintf("secret-%s", libservice.StaticClientServiceName)
-				resp := mappedHTTPGET(t,
-					"https://"+h,
-					pm.Int(),
-					nil,
-					strings.NewReader(data),
-					cl,
-				)
-				defer resp.Body.Close()
-				body, err := io.ReadAll(resp.Body)
-				require.NoError(t, err)
-				assert.Equal(t, []byte(data), body)
-			})
-		})
-	}
-	t.Run("pre-upgrade", func(t *testing.T) {
-		tests(t)
-	})
-
-	if t.Failed() {
-		t.Fatal("failing fast: failed assertions pre-upgrade")
-	}
-
-	// Upgrade the cluster to utils.utils.TargetVersion
-	t.Logf("Upgrade to version %s", utils.TargetVersion)
-	err = cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), utils.TargetVersion)
-	require.NoError(t, err)
-	require.NoError(t, igw.Restart())
-
-	t.Run("post-upgrade", func(t *testing.T) {
-		tests(t)
-	})
-}
-
-// mappedHTTPGET performs an HTTP GET to the given uri, but actually uses
-// "localhost:<mappedPort>" to connect the host, and sends the host from uri
-// in the [http.Request.Host] field.
-//
-// Extra headers may be specified in header. body is the request body.
-//
-// client is used as the [http.Client], for example, one returned by
-// [httpClientWithCA].
-//
-// It retries for up to 1 minute, with a 50ms wait.
-func mappedHTTPGET(t *testing.T, uri string, mappedPort int, header http.Header, body io.Reader, client *http.Client) *http.Response {
-	t.Helper()
-	var hostHdr string
-	u, _ := url.Parse(uri)
-	hostHdr = u.Host
-	u.Host = fmt.Sprintf("localhost:%d", mappedPort)
-	uri = u.String()
-	var resp *http.Response
-	retry.RunWith(&retry.Timer{Timeout: 1 * time.Minute, Wait: 50 * time.Millisecond}, t, func(r *retry.R) {
-		req, err := http.NewRequest("GET", uri, body)
-		if header != nil {
-			req.Header = header
-		}
-		if err != nil {
-			r.Fatalf("could not make call to service %q: %s", uri, err)
-		}
-		if hostHdr != "" {
-			req.Host = hostHdr
-		}
-
-		resp, err = client.Do(req)
-		if err != nil {
-			r.Fatalf("could not make call to service %q: %s", uri, err)
-		}
-	})
-	return resp
-}
-
-// httpClientWithCA returns an [http.Client] configured to trust cacertPEM
-// as a CA, and with reqHost set as the [http.Transport.TLSClientConfig.ServerName].
-func httpClientWithCA(t *testing.T, reqHost string, cacertPEM string) *http.Client {
-	t.Helper()
-	pool := x509.NewCertPool()
-	ok := pool.AppendCertsFromPEM([]byte(cacertPEM))
-	require.True(t, ok)
-
-	tr := http.Transport{
-		DisableKeepAlives: true,
-		// BUG: our *.ingress.consul certs have a SNI name of `*.ingress.consul.`. Note the trailing
-		// dot. Go's [crypto/x509.Certificate.VerifyHostname] doesn't like the trailing dot, and
-		// so won't evaluate the wildcard. As a workaround, we disable Go's builtin verification and do it
-		// ourselves
-		// https://groups.google.com/g/golang-checkins/c/K510gi92v8M explains the rationale for not
-		// treating names with trailing dots as hostnames
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: true,
-			RootCAs:            pool,
-			VerifyPeerCertificate: func(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error {
-				require.Equal(t, 1, len(rawCerts), "expected 1 cert")
-				cert, err := x509.ParseCertificate(rawCerts[0])
-				require.NoError(t, err)
-				for i, s := range cert.DNSNames {
-					cert.DNSNames[i] = strings.TrimSuffix(s, ".")
-				}
-				_, err = cert.Verify(x509.VerifyOptions{Roots: pool})
-				require.NoError(t, err, "cert validation")
-				return nil
-			},
-		},
-	}
-	reqHostNoPort, _, _ := strings.Cut(reqHost, ":")
-	if reqHost != "" {
-		tr.TLSClientConfig.ServerName = reqHostNoPort
-	}
-	client := http.Client{
-		Transport: &tr,
-	}
-	return &client
-}
diff --git a/test/integration/consul-container/test/upgrade/l7_traffic_management/resolver_default_subset_test.go b/test/integration/consul-container/test/upgrade/l7_traffic_management/resolver_default_subset_test.go
index 9feb9d82092a1..ee71802d65d23 100644
--- a/test/integration/consul-container/test/upgrade/l7_traffic_management/resolver_default_subset_test.go
+++ b/test/integration/consul-container/test/upgrade/l7_traffic_management/resolver_default_subset_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package upgrade
 
 import (
@@ -15,368 +12,416 @@ import (
 	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
+	libutils "github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
+	upgrade "github.com/hashicorp/consul/test/integration/consul-container/test/upgrade"
+	"github.com/hashicorp/go-version"
 	"github.com/stretchr/testify/require"
 )
 
-// Test resolver directs traffic to default subset
-// - Create 2 additional static-server instances: one in V1 subset and the other in V2 subset
-// - resolver directs traffic to the default subset, which is V2.
-func TestTrafficManagement_ResolverDefaultSubset(t *testing.T) {
+// TestTrafficManagement_ServiceResolver tests that upgraded cluster inherits and interpret
+// the resolver config entry correctly.
+//
+// The basic topology is a cluster with one static-client and one static-server. Addtional
+// services and resolver can be added to the create func() for each test cases.
+func TestTrafficManagement_ServiceResolver(t *testing.T) {
 	t.Parallel()
 
-	cluster, staticServerProxy, staticClientProxy := setup(t)
-
-	node := cluster.Agents[0]
-	client := node.GetClient()
-
-	// Create static-server-v1 and static-server-v2
-	serviceOptsV1 := &libservice.ServiceOpts{
-		Name:     libservice.StaticServerServiceName,
-		ID:       "static-server-v1",
-		Meta:     map[string]string{"version": "v1"},
-		HTTPPort: 8081,
-		GRPCPort: 8078,
-	}
-	_, serverConnectProxyV1, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOptsV1)
-	require.NoError(t, err)
-
-	serviceOptsV2 := &libservice.ServiceOpts{
-		Name:     libservice.StaticServerServiceName,
-		ID:       "static-server-v2",
-		Meta:     map[string]string{"version": "v2"},
-		HTTPPort: 8082,
-		GRPCPort: 8077,
+	type testcase struct {
+		name string
+		// create creates addtional resources in the cluster depending on cases, e.g., static-client,
+		// static server, and config-entries. It returns the proxy services of the client, an assertation
+		// function to be called to verify the resources, and a restartFn to be called after upgrade.
+		create func(*libcluster.Cluster, libservice.Service) (libservice.Service, func(), func(), error)
+		// extraAssertion adds additional assertion function to the common resources across cases.
+		// common resources includes static-client in dialing cluster, and static-server in accepting cluster.
+		//
+		// extraAssertion needs to be run before and after upgrade
+		extraAssertion func(libservice.Service)
 	}
-	_, serverConnectProxyV2, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOptsV2)
-	require.NoError(t, err)
-	libassert.CatalogServiceExists(t, client, libservice.StaticServerServiceName, nil)
-
-	// TODO: verify the number of instance of static-server is 3
-	libassert.AssertServiceHasHealthyInstances(t, node, libservice.StaticServerServiceName, true, 3)
-
-	// Register service resolver
-	serviceResolver := &api.ServiceResolverConfigEntry{
-		Kind:          api.ServiceResolver,
-		Name:          libservice.StaticServerServiceName,
-		DefaultSubset: "v2",
-		Subsets: map[string]api.ServiceResolverSubset{
-			"v1": {
-				Filter: "Service.Meta.version == v1",
+	tcs := []testcase{
+		{
+			// Test resolver directs traffic to default subset
+			// - Create 2 additional static-server instances: one in V1 subset and the other in V2 subset
+			// - resolver directs traffic to the default subset, which is V2.
+			name: "resolver default subset",
+			create: func(cluster *libcluster.Cluster, clientConnectProxy libservice.Service) (libservice.Service, func(), func(), error) {
+				node := cluster.Agents[0]
+				client := node.GetClient()
+
+				// Create static-server-v1 and static-server-v2
+				serviceOptsV1 := &libservice.ServiceOpts{
+					Name:     libservice.StaticServerServiceName,
+					ID:       "static-server-v1",
+					Meta:     map[string]string{"version": "v1"},
+					HTTPPort: 8081,
+					GRPCPort: 8078,
+				}
+				_, serverConnectProxyV1, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOptsV1)
+				require.NoError(t, err)
+
+				serviceOptsV2 := &libservice.ServiceOpts{
+					Name:     libservice.StaticServerServiceName,
+					ID:       "static-server-v2",
+					Meta:     map[string]string{"version": "v2"},
+					HTTPPort: 8082,
+					GRPCPort: 8077,
+				}
+				_, serverConnectProxyV2, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOptsV2)
+				require.NoError(t, err)
+				libassert.CatalogServiceExists(t, client, "static-server", nil)
+
+				// TODO: verify the number of instance of static-server is 3
+				libassert.AssertServiceHasHealthyInstances(t, node, libservice.StaticServerServiceName, true, 3)
+
+				// Register service resolver
+				serviceResolver := &api.ServiceResolverConfigEntry{
+					Kind:          api.ServiceResolver,
+					Name:          libservice.StaticServerServiceName,
+					DefaultSubset: "v2",
+					Subsets: map[string]api.ServiceResolverSubset{
+						"v1": {
+							Filter: "Service.Meta.version == v1",
+						},
+						"v2": {
+							Filter: "Service.Meta.version == v2",
+						},
+					},
+				}
+				err = cluster.ConfigEntryWrite(serviceResolver)
+				if err != nil {
+					return nil, nil, nil, fmt.Errorf("error writing config entry %s", err)
+				}
+
+				_, serverAdminPortV1 := serverConnectProxyV1.GetAdminAddr()
+				_, serverAdminPortV2 := serverConnectProxyV2.GetAdminAddr()
+
+				restartFn := func() {
+					require.NoError(t, serverConnectProxyV1.Restart())
+					require.NoError(t, serverConnectProxyV2.Restart())
+				}
+
+				_, adminPort := clientConnectProxy.GetAdminAddr()
+				assertionFn := func() {
+					libassert.AssertEnvoyRunning(t, serverAdminPortV1)
+					libassert.AssertEnvoyRunning(t, serverAdminPortV2)
+
+					libassert.AssertEnvoyPresentsCertURI(t, serverAdminPortV1, "static-server")
+					libassert.AssertEnvoyPresentsCertURI(t, serverAdminPortV2, "static-server")
+
+					libassert.AssertUpstreamEndpointStatus(t, adminPort, "v2.static-server.default", "HEALTHY", 1)
+
+					// assert static-server proxies should be healthy
+					libassert.AssertServiceHasHealthyInstances(t, node, libservice.StaticServerServiceName, true, 3)
+				}
+				return nil, assertionFn, restartFn, nil
 			},
-			"v2": {
-				Filter: "Service.Meta.version == v2",
-			},
-		},
-	}
-	require.NoError(t, cluster.ConfigEntryWrite(serviceResolver))
-
-	assertionFn := func() {
-		_, serverAdminPortV1 := serverConnectProxyV1.GetAdminAddr()
-		_, serverAdminPortV2 := serverConnectProxyV2.GetAdminAddr()
-		_, adminPort := staticClientProxy.GetAdminAddr() // httpPort
-		_, port := staticClientProxy.GetAddr()           // EnvoyAdminPort
-
-		libassert.AssertEnvoyRunning(t, serverAdminPortV1)
-		libassert.AssertEnvoyRunning(t, serverAdminPortV2)
-
-		libassert.AssertEnvoyPresentsCertURI(t, serverAdminPortV1, libservice.StaticServerServiceName)
-		libassert.AssertEnvoyPresentsCertURI(t, serverAdminPortV2, libservice.StaticServerServiceName)
-
-		libassert.AssertUpstreamEndpointStatus(t, adminPort, "v2.static-server.default", "HEALTHY", 1)
-
-		// assert static-server proxies should be healthy
-		libassert.AssertServiceHasHealthyInstances(t, node, libservice.StaticServerServiceName, true, 3)
-
-		libassert.AssertUpstreamEndpointStatus(t, adminPort, "v2.static-server.default", "HEALTHY", 1)
-
-		// static-client upstream should connect to static-server-v2 because the default subset value is to v2 set in the service resolver
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server-v2", "")
-	}
-
-	// validate client and proxy is up and running
-	libassert.AssertContainerState(t, staticClientProxy, "running")
-	validate(t, staticServerProxy, staticClientProxy)
-	assertionFn()
+			extraAssertion: func(clientConnectProxy libservice.Service) {
+				_, port := clientConnectProxy.GetAddr()
+				_, adminPort := clientConnectProxy.GetAdminAddr()
 
-	// Upgrade cluster, restart sidecars then begin service traffic validation
-	require.NoError(t, cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), utils.TargetVersion))
-	require.NoError(t, staticClientProxy.Restart())
-	require.NoError(t, staticServerProxy.Restart())
-	require.NoError(t, serverConnectProxyV1.Restart())
-	require.NoError(t, serverConnectProxyV2.Restart())
+				libassert.AssertUpstreamEndpointStatus(t, adminPort, "v2.static-server.default", "HEALTHY", 1)
 
-	validate(t, staticServerProxy, staticClientProxy)
-	assertionFn()
-}
-
-// Test resolver resolves service instance based on their check status
-// - Create one addtional static-server with checks and V1 subset
-// - resolver directs traffic to "test" service
-func TestTrafficManagement_ResolverDefaultOnlyPassing(t *testing.T) {
-	t.Parallel()
-
-	cluster, staticServerProxy, staticClientProxy := setup(t)
-	node := cluster.Agents[0]
-
-	serviceOptsV1 := &libservice.ServiceOpts{
-		Name:     libservice.StaticServerServiceName,
-		ID:       "static-server-v1",
-		Meta:     map[string]string{"version": "v1"},
-		HTTPPort: 8081,
-		GRPCPort: 8078,
-		Checks: libservice.Checks{
-			Name: "main",
-			TTL:  "30m",
+				// static-client upstream should connect to static-server-v2 because the default subset value is to v2 set in the service resolver
+				libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server-v2", "")
+			},
 		},
-		Connect: libservice.SidecarService{
-			Port: 21011,
+		{
+			// Test resolver resolves service instance based on their check status
+			// - Create one addtional static-server with checks and V1 subset
+			// - resolver directs traffic to "test" service
+			name: "resolver default onlypassing",
+			create: func(cluster *libcluster.Cluster, clientConnectProxy libservice.Service) (libservice.Service, func(), func(), error) {
+				node := cluster.Agents[0]
+
+				serviceOptsV1 := &libservice.ServiceOpts{
+					Name:     libservice.StaticServerServiceName,
+					ID:       "static-server-v1",
+					Meta:     map[string]string{"version": "v1"},
+					HTTPPort: 8081,
+					GRPCPort: 8078,
+					Checks: libservice.Checks{
+						Name: "main",
+						TTL:  "30m",
+					},
+					Connect: libservice.SidecarService{
+						Port: 21011,
+					},
+				}
+				_, serverConnectProxyV1, err := libservice.CreateAndRegisterStaticServerAndSidecarWithChecks(node, serviceOptsV1)
+				require.NoError(t, err)
+
+				// Register service resolver
+				serviceResolver := &api.ServiceResolverConfigEntry{
+					Kind:          api.ServiceResolver,
+					Name:          libservice.StaticServerServiceName,
+					DefaultSubset: "test",
+					Subsets: map[string]api.ServiceResolverSubset{
+						"test": {
+							OnlyPassing: true,
+						},
+					},
+					ConnectTimeout: 120 * time.Second,
+				}
+				_, serverAdminPortV1 := serverConnectProxyV1.GetAdminAddr()
+
+				restartFn := func() {
+					require.NoError(t, serverConnectProxyV1.Restart())
+				}
+
+				_, port := clientConnectProxy.GetAddr()
+				_, adminPort := clientConnectProxy.GetAdminAddr()
+				assertionFn := func() {
+					// force static-server-v1 into a warning state
+					err = node.GetClient().Agent().UpdateTTL("service:static-server-v1", "", "warn")
+					require.NoError(t, err)
+
+					// ###########################
+					// ## with onlypassing=true
+					// assert only one static-server proxy is healthy
+					err = cluster.ConfigEntryWrite(serviceResolver)
+					require.NoError(t, err)
+					libassert.AssertServiceHasHealthyInstances(t, node, libservice.StaticServerServiceName, true, 1)
+
+					libassert.AssertEnvoyRunning(t, serverAdminPortV1)
+					libassert.AssertEnvoyPresentsCertURI(t, serverAdminPortV1, "static-server")
+
+					// assert static-server proxies should be healthy
+					libassert.AssertServiceHasHealthyInstances(t, node, libservice.StaticServerServiceName, true, 1)
+
+					// static-client upstream should have 1 healthy endpoint for test.static-server
+					libassert.AssertUpstreamEndpointStatus(t, adminPort, "test.static-server.default", "HEALTHY", 1)
+
+					// static-client upstream should have 1 unhealthy endpoint for test.static-server
+					libassert.AssertUpstreamEndpointStatus(t, adminPort, "test.static-server.default", "UNHEALTHY", 1)
+
+					// static-client upstream should connect to static-server since it is passing
+					libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), libservice.StaticServerServiceName, "")
+
+					// ###########################
+					// ## with onlypassing=false
+					// revert to OnlyPassing=false by deleting the config
+					err = cluster.ConfigEntryDelete(serviceResolver)
+					require.NoError(t, err)
+
+					// Consul health check assert only one static-server proxy is healthy when onlyPassing is false
+					libassert.AssertServiceHasHealthyInstances(t, node, libservice.StaticServerServiceName, false, 2)
+
+					// Although the service status is in warning state, when onlypassing is set to false Envoy
+					// health check returns all service instances with "warning" or "passing" state as Healthy enpoints
+					libassert.AssertUpstreamEndpointStatus(t, adminPort, "static-server.default", "HEALTHY", 2)
+
+					// static-client upstream should have 0 unhealthy endpoint for static-server
+					libassert.AssertUpstreamEndpointStatus(t, adminPort, "static-server.default", "UNHEALTHY", 0)
+
+				}
+				return nil, assertionFn, restartFn, nil
+			},
+			extraAssertion: func(clientConnectProxy libservice.Service) {
+			},
 		},
-	}
-	_, serverConnectProxyV1, err := libservice.CreateAndRegisterStaticServerAndSidecarWithChecks(node, serviceOptsV1)
-	require.NoError(t, err)
-
-	// Register service resolver
-	serviceResolver := &api.ServiceResolverConfigEntry{
-		Kind:          api.ServiceResolver,
-		Name:          libservice.StaticServerServiceName,
-		DefaultSubset: "test",
-		Subsets: map[string]api.ServiceResolverSubset{
-			"test": {
-				OnlyPassing: true,
+		{
+			// Test resolver directs traffic to default subset
+			// - Create 3 static-server-2 server instances: one in V1, one in V2, one without any version
+			// - service2Resolver directs traffic to static-server-2-v2
+			name: "resolver subset redirect",
+			create: func(cluster *libcluster.Cluster, clientConnectProxy libservice.Service) (libservice.Service, func(), func(), error) {
+				node := cluster.Agents[0]
+				client := node.GetClient()
+
+				serviceOpts2 := &libservice.ServiceOpts{
+					Name:     libservice.StaticServer2ServiceName,
+					ID:       "static-server-2",
+					HTTPPort: 8081,
+					GRPCPort: 8078,
+				}
+				_, server2ConnectProxy, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOpts2)
+				require.NoError(t, err)
+				libassert.CatalogServiceExists(t, client, libservice.StaticServer2ServiceName, nil)
+
+				serviceOptsV1 := &libservice.ServiceOpts{
+					Name:     libservice.StaticServer2ServiceName,
+					ID:       "static-server-2-v1",
+					Meta:     map[string]string{"version": "v1"},
+					HTTPPort: 8082,
+					GRPCPort: 8077,
+				}
+				_, server2ConnectProxyV1, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOptsV1)
+				require.NoError(t, err)
+
+				serviceOptsV2 := &libservice.ServiceOpts{
+					Name:     libservice.StaticServer2ServiceName,
+					ID:       "static-server-2-v2",
+					Meta:     map[string]string{"version": "v2"},
+					HTTPPort: 8083,
+					GRPCPort: 8076,
+				}
+				_, server2ConnectProxyV2, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOptsV2)
+				require.NoError(t, err)
+				libassert.CatalogServiceExists(t, client, libservice.StaticServer2ServiceName, nil)
+
+				// Register static-server service resolver
+				serviceResolver := &api.ServiceResolverConfigEntry{
+					Kind: api.ServiceResolver,
+					Name: libservice.StaticServer2ServiceName,
+					Subsets: map[string]api.ServiceResolverSubset{
+						"v1": {
+							Filter: "Service.Meta.version == v1",
+						},
+						"v2": {
+							Filter: "Service.Meta.version == v2",
+						},
+					},
+				}
+				err = cluster.ConfigEntryWrite(serviceResolver)
+				require.NoError(t, err)
+
+				// Register static-server-2 service resolver to redirect traffic
+				// from static-server to static-server-2-v2
+				service2Resolver := &api.ServiceResolverConfigEntry{
+					Kind: api.ServiceResolver,
+					Name: libservice.StaticServerServiceName,
+					Redirect: &api.ServiceResolverRedirect{
+						Service:       libservice.StaticServer2ServiceName,
+						ServiceSubset: "v2",
+					},
+				}
+				err = cluster.ConfigEntryWrite(service2Resolver)
+				require.NoError(t, err)
+
+				_, server2AdminPort := server2ConnectProxy.GetAdminAddr()
+				_, server2AdminPortV1 := server2ConnectProxyV1.GetAdminAddr()
+				_, server2AdminPortV2 := server2ConnectProxyV2.GetAdminAddr()
+
+				restartFn := func() {
+					require.NoErrorf(t, server2ConnectProxy.Restart(), "%s", server2ConnectProxy.GetName())
+					require.NoErrorf(t, server2ConnectProxyV1.Restart(), "%s", server2ConnectProxyV1.GetName())
+					require.NoErrorf(t, server2ConnectProxyV2.Restart(), "%s", server2ConnectProxyV2.GetName())
+				}
+
+				assertionFn := func() {
+					// assert 3 static-server-2 instances are healthy
+					libassert.AssertServiceHasHealthyInstances(t, node, libservice.StaticServer2ServiceName, false, 3)
+
+					libassert.AssertEnvoyRunning(t, server2AdminPort)
+					libassert.AssertEnvoyRunning(t, server2AdminPortV1)
+					libassert.AssertEnvoyRunning(t, server2AdminPortV2)
+
+					libassert.AssertEnvoyPresentsCertURI(t, server2AdminPort, libservice.StaticServer2ServiceName)
+					libassert.AssertEnvoyPresentsCertURI(t, server2AdminPortV1, libservice.StaticServer2ServiceName)
+					libassert.AssertEnvoyPresentsCertURI(t, server2AdminPortV2, libservice.StaticServer2ServiceName)
+
+					// assert static-server proxies should be healthy
+					libassert.AssertServiceHasHealthyInstances(t, node, libservice.StaticServer2ServiceName, true, 3)
+				}
+				return nil, assertionFn, restartFn, nil
+			},
+			extraAssertion: func(clientConnectProxy libservice.Service) {
+				_, appPort := clientConnectProxy.GetAddr()
+				_, adminPort := clientConnectProxy.GetAdminAddr()
+
+				libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", appPort), "static-server-2-v2", "")
+				libassert.AssertUpstreamEndpointStatus(t, adminPort, "v2.static-server-2.default", "HEALTHY", 1)
 			},
 		},
-		ConnectTimeout: 120 * time.Second,
 	}
-	_, serverAdminPortV1 := serverConnectProxyV1.GetAdminAddr()
 
-	assertionFn := func() {
-		_, port := staticClientProxy.GetAddr()
-		_, adminPort := staticClientProxy.GetAdminAddr()
-		// force static-server-v1 into a warning state
-		err = node.GetClient().Agent().UpdateTTL("service:static-server-v1", "", "warn")
+	run := func(t *testing.T, tc testcase, oldVersion, targetVersion string) {
+		buildOpts := &libcluster.BuildOptions{
+			ConsulVersion:        oldVersion,
+			Datacenter:           "dc1",
+			InjectAutoEncryption: true,
+		}
+		// If version < 1.14 disable AutoEncryption
+		oldVersionTmp, _ := version.NewVersion(oldVersion)
+		if oldVersionTmp.LessThan(libutils.Version_1_14) {
+			buildOpts.InjectAutoEncryption = false
+		}
+		cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{
+			NumServers:                1,
+			NumClients:                1,
+			BuildOpts:                 buildOpts,
+			ApplyDefaultProxySettings: true,
+		})
+		node := cluster.Agents[0]
+		client := node.GetClient()
+
+		staticClientProxy, staticServerProxy, err := createStaticClientAndServer(cluster)
 		require.NoError(t, err)
-
-		// ###########################
-		// ## with onlypassing=true
-		// assert only one static-server proxy is healthy
-		err = cluster.ConfigEntryWrite(serviceResolver)
+		libassert.CatalogServiceExists(t, client, libservice.StaticServerServiceName, nil)
+		libassert.CatalogServiceExists(t, client, fmt.Sprintf("%s-sidecar-proxy", libservice.StaticClientServiceName), nil)
+
+		err = cluster.ConfigEntryWrite(&api.ProxyConfigEntry{
+			Kind: api.ProxyDefaults,
+			Name: "global",
+			Config: map[string]interface{}{
+				"protocol": "http",
+			},
+		})
 		require.NoError(t, err)
-		libassert.AssertServiceHasHealthyInstances(t, node, libservice.StaticServerServiceName, true, 1)
-
-		libassert.AssertEnvoyRunning(t, serverAdminPortV1)
-		libassert.AssertEnvoyPresentsCertURI(t, serverAdminPortV1, libservice.StaticServerServiceName)
-
-		// assert static-server proxies should be healthy
-		libassert.AssertServiceHasHealthyInstances(t, node, libservice.StaticServerServiceName, true, 1)
-
-		// static-client upstream should have 1 healthy endpoint for test.static-server
-		libassert.AssertUpstreamEndpointStatus(t, adminPort, "test.static-server.default", "HEALTHY", 1)
 
-		// static-client upstream should have 1 unhealthy endpoint for test.static-server
-		libassert.AssertUpstreamEndpointStatus(t, adminPort, "test.static-server.default", "UNHEALTHY", 1)
-
-		// static-client upstream should connect to static-server since it is passing
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), libservice.StaticServerServiceName, "")
+		_, port := staticClientProxy.GetAddr()
+		_, adminPort := staticClientProxy.GetAdminAddr()
+		_, serverAdminPort := staticServerProxy.GetAdminAddr()
+		libassert.HTTPServiceEchoes(t, "localhost", port, "")
+		libassert.AssertEnvoyPresentsCertURI(t, adminPort, libservice.StaticClientServiceName)
+		libassert.AssertEnvoyPresentsCertURI(t, serverAdminPort, libservice.StaticServerServiceName)
 
-		// ###########################
-		// ## with onlypassing=false
-		// revert to OnlyPassing=false by deleting the config
-		err = cluster.ConfigEntryDelete(serviceResolver)
+		_, assertionAdditionalResources, restartFn, err := tc.create(cluster, staticClientProxy)
 		require.NoError(t, err)
-
-		// Consul health check assert only one static-server proxy is healthy when onlyPassing is false
-		libassert.AssertServiceHasHealthyInstances(t, node, libservice.StaticServerServiceName, false, 2)
-
-		// Although the service status is in warning state, when onlypassing is set to false Envoy
-		// health check returns all service instances with "warning" or "passing" state as Healthy enpoints
-		libassert.AssertUpstreamEndpointStatus(t, adminPort, "static-server.default", "HEALTHY", 2)
-
-		// static-client upstream should have 0 unhealthy endpoint for static-server
-		libassert.AssertUpstreamEndpointStatus(t, adminPort, "static-server.default", "UNHEALTHY", 0)
+		// validate client and proxy is up and running
+		libassert.AssertContainerState(t, staticClientProxy, "running")
+		assertionAdditionalResources()
+		tc.extraAssertion(staticClientProxy)
+
+		// Upgrade cluster, restart sidecars then begin service traffic validation
+		require.NoError(t, cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), targetVersion))
+		require.NoError(t, staticClientProxy.Restart())
+		require.NoError(t, staticServerProxy.Restart())
+		restartFn()
+
+		// POST upgrade validation; repeat client & proxy validation
+		libassert.HTTPServiceEchoes(t, "localhost", port, "")
+		libassert.AssertEnvoyRunning(t, adminPort)
+		libassert.AssertEnvoyRunning(t, serverAdminPort)
+
+		// certs are valid
+		libassert.AssertEnvoyPresentsCertURI(t, adminPort, libservice.StaticClientServiceName)
+		libassert.AssertEnvoyPresentsCertURI(t, serverAdminPort, libservice.StaticServerServiceName)
+
+		assertionAdditionalResources()
+		tc.extraAssertion(staticClientProxy)
 	}
-	// validate client and proxy is up and running
-	libassert.AssertContainerState(t, staticClientProxy, "running")
-	validate(t, staticServerProxy, staticClientProxy)
-	assertionFn()
-
-	// Upgrade cluster, restart sidecars then begin service traffic validation
-	require.NoError(t, cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), utils.TargetVersion))
-	require.NoError(t, staticClientProxy.Restart())
-	require.NoError(t, staticServerProxy.Restart())
-	require.NoError(t, serverConnectProxyV1.Restart())
-
-	validate(t, staticServerProxy, staticClientProxy)
-	assertionFn()
-}
-
-// Test resolver directs traffic to default subset
-// - Create 3 static-server-2 server instances: one in V1, one in V2, one without any version
-// - service2Resolver directs traffic to static-server-2-v2V
-func TestTrafficManagement_ResolverSubsetRedirect(t *testing.T) {
-	t.Parallel()
-
-	cluster, staticServerProxy, staticClientProxy := setup(t)
 
-	node := cluster.Agents[0]
-	client := node.GetClient()
-
-	serviceOpts2 := &libservice.ServiceOpts{
-		Name:     libservice.StaticServer2ServiceName,
-		ID:       "static-server-2",
-		HTTPPort: 8081,
-		GRPCPort: 8078,
-	}
-	_, server2ConnectProxy, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOpts2)
-	require.NoError(t, err)
-	libassert.CatalogServiceExists(t, client, libservice.StaticServer2ServiceName, nil)
-
-	serviceOptsV1 := &libservice.ServiceOpts{
-		Name:     libservice.StaticServer2ServiceName,
-		ID:       "static-server-2-v1",
-		Meta:     map[string]string{"version": "v1"},
-		HTTPPort: 8082,
-		GRPCPort: 8077,
-	}
-	_, server2ConnectProxyV1, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOptsV1)
-	require.NoError(t, err)
-
-	serviceOptsV2 := &libservice.ServiceOpts{
-		Name:     libservice.StaticServer2ServiceName,
-		ID:       "static-server-2-v2",
-		Meta:     map[string]string{"version": "v2"},
-		HTTPPort: 8083,
-		GRPCPort: 8076,
-	}
-	_, server2ConnectProxyV2, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOptsV2)
-	require.NoError(t, err)
-	libassert.CatalogServiceExists(t, client, libservice.StaticServer2ServiceName, nil)
-
-	// Register static-server service resolver
-	serviceResolver := &api.ServiceResolverConfigEntry{
-		Kind: api.ServiceResolver,
-		Name: libservice.StaticServer2ServiceName,
-		Subsets: map[string]api.ServiceResolverSubset{
-			"v1": {
-				Filter: "Service.Meta.version == v1",
-			},
-			"v2": {
-				Filter: "Service.Meta.version == v2",
-			},
-		},
-	}
-	require.NoError(t, cluster.ConfigEntryWrite(serviceResolver))
-
-	// Register static-server-2 service resolver to redirect traffic
-	// from static-server to static-server-2-v2
-	server2Resolver := &api.ServiceResolverConfigEntry{
-		Kind: api.ServiceResolver,
-		Name: libservice.StaticServerServiceName,
-		Redirect: &api.ServiceResolverRedirect{
-			Service:       libservice.StaticServer2ServiceName,
-			ServiceSubset: "v2",
-		},
+	targetVersion := libutils.TargetVersion
+	for _, oldVersion := range upgrade.UpgradeFromVersions {
+		for _, tc := range tcs {
+			t.Run(fmt.Sprintf("%s upgrade from %s to %s", tc.name, oldVersion, targetVersion),
+				func(t *testing.T) {
+					run(t, tc, oldVersion, targetVersion)
+				})
+		}
 	}
-	require.NoError(t, cluster.ConfigEntryWrite(server2Resolver))
-
-	assertionFn := func() {
-		_, server2AdminPort := server2ConnectProxy.GetAdminAddr()
-		_, server2AdminPortV1 := server2ConnectProxyV1.GetAdminAddr()
-		_, server2AdminPortV2 := server2ConnectProxyV2.GetAdminAddr()
-
-		// assert 3 static-server-2 instances are healthy
-		libassert.AssertServiceHasHealthyInstances(t, node, libservice.StaticServer2ServiceName, false, 3)
-
-		libassert.AssertEnvoyRunning(t, server2AdminPort)
-		libassert.AssertEnvoyRunning(t, server2AdminPortV1)
-		libassert.AssertEnvoyRunning(t, server2AdminPortV2)
-
-		libassert.AssertEnvoyPresentsCertURI(t, server2AdminPort, libservice.StaticServer2ServiceName)
-		libassert.AssertEnvoyPresentsCertURI(t, server2AdminPortV1, libservice.StaticServer2ServiceName)
-		libassert.AssertEnvoyPresentsCertURI(t, server2AdminPortV2, libservice.StaticServer2ServiceName)
-
-		// assert static-server proxies should be healthy
-		libassert.AssertServiceHasHealthyInstances(t, node, libservice.StaticServer2ServiceName, true, 3)
-
-		_, appPort := staticClientProxy.GetAddr()
-		_, adminPort := staticClientProxy.GetAdminAddr()
-
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", appPort), "static-server-2-v2", "")
-		libassert.AssertUpstreamEndpointStatus(t, adminPort, "v2.static-server-2.default", "HEALTHY", 1)
-
-	}
-	require.NoError(t, err)
-	// validate client and proxy is up and running
-	libassert.AssertContainerState(t, staticClientProxy, "running")
-	validate(t, staticServerProxy, staticClientProxy)
-	assertionFn()
-
-	// Upgrade cluster, restart sidecars then begin service traffic validation
-	require.NoError(t, cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), utils.TargetVersion))
-	require.NoError(t, staticClientProxy.Restart())
-	require.NoError(t, staticServerProxy.Restart())
-	require.NoErrorf(t, server2ConnectProxy.Restart(), "%s", server2ConnectProxy.GetName())
-	require.NoErrorf(t, server2ConnectProxyV1.Restart(), "%s", server2ConnectProxyV1.GetName())
-	require.NoErrorf(t, server2ConnectProxyV2.Restart(), "%s", server2ConnectProxyV2.GetName())
-
-	validate(t, staticServerProxy, staticClientProxy)
-	assertionFn()
 }
 
-func setup(t *testing.T) (*libcluster.Cluster, libservice.Service, libservice.Service) {
-	buildOpts := &libcluster.BuildOptions{
-		ConsulImageName:      utils.GetLatestImageName(),
-		ConsulVersion:        utils.LatestVersion,
-		Datacenter:           "dc1",
-		InjectAutoEncryption: true,
-	}
-
-	cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{
-		NumServers:                1,
-		NumClients:                1,
-		BuildOpts:                 buildOpts,
-		ApplyDefaultProxySettings: true,
-	})
+// createStaticClientAndServer creates a static-client and a static-server in the cluster
+func createStaticClientAndServer(cluster *libcluster.Cluster) (libservice.Service, libservice.Service, error) {
 	node := cluster.Agents[0]
-	client := node.GetClient()
-
 	serviceOpts := &libservice.ServiceOpts{
 		Name:     libservice.StaticServerServiceName,
 		ID:       "static-server",
 		HTTPPort: 8080,
 		GRPCPort: 8079,
 	}
-	_, staticServerProxy, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOpts)
-	require.NoError(t, err)
+	_, serverConnectProxy, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, serviceOpts)
+	if err != nil {
+		return nil, nil, err
+	}
 
 	// Create a client proxy instance with the server as an upstream
-	staticClientProxy, err := libservice.CreateAndRegisterStaticClientSidecar(node, "", false, false, nil)
-	require.NoError(t, err)
-
-	require.NoError(t, err)
-	libassert.CatalogServiceExists(t, client, libservice.StaticServerServiceName, nil)
-	libassert.CatalogServiceExists(t, client, fmt.Sprintf("%s-sidecar-proxy", libservice.StaticClientServiceName), nil)
-
-	err = cluster.ConfigEntryWrite(&api.ProxyConfigEntry{
-		Kind: api.ProxyDefaults,
-		Name: "global",
-		Config: map[string]interface{}{
-			"protocol": "http",
-		},
-	})
-	require.NoError(t, err)
-
-	validate(t, staticServerProxy, staticClientProxy)
-
-	return cluster, staticServerProxy, staticClientProxy
-}
+	clientConnectProxy, err := libservice.CreateAndRegisterStaticClientSidecar(node, "", false)
+	if err != nil {
+		return nil, nil, err
+	}
 
-func validate(t *testing.T, staticServerProxy, staticClientProxy libservice.Service) {
-	_, port := staticClientProxy.GetAddr()
-	_, adminPort := staticClientProxy.GetAdminAddr()
-	_, serverAdminPort := staticServerProxy.GetAdminAddr()
-	libassert.HTTPServiceEchoes(t, "localhost", port, "")
-	libassert.AssertEnvoyRunning(t, adminPort)
-	libassert.AssertEnvoyRunning(t, serverAdminPort)
-	libassert.AssertEnvoyPresentsCertURI(t, adminPort, libservice.StaticClientServiceName)
-	libassert.AssertEnvoyPresentsCertURI(t, serverAdminPort, libservice.StaticServerServiceName)
+	return clientConnectProxy, serverConnectProxy, nil
 }
diff --git a/test/integration/consul-container/test/upgrade/peering/peering_control_plane_mgw_test.go b/test/integration/consul-container/test/upgrade/peering/peering_control_plane_mgw_test.go
index b88781bd790af..6cdba0014de3e 100644
--- a/test/integration/consul-container/test/upgrade/peering/peering_control_plane_mgw_test.go
+++ b/test/integration/consul-container/test/upgrade/peering/peering_control_plane_mgw_test.go
@@ -1,7 +1,4 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package upgrade
+package peering
 
 import (
 	"context"
@@ -17,82 +14,109 @@ import (
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 )
 
-// TestPeering_ControlPlaneMGW verifies the peering control plane traffic go through the mesh gateway
+// TestPeering_Upgrade_ControlPlane_MGW verifies the peering control plane traffic go through the mesh gateway
 // PeerThroughMeshGateways can be inheritted by the upgraded cluster.
 //
 // 1. Create the basic peering topology of one dialing cluster and one accepting cluster
 // 2. Set PeerThroughMeshGateways = true
 // 3. Upgrade both clusters
 // 4. Verify the peering is re-established through mesh gateway
-func TestPeering_ControlPlaneMGW(t *testing.T) {
+func TestPeering_Upgrade_ControlPlane_MGW(t *testing.T) {
 	t.Parallel()
 
-	accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetLatestImageName(), utils.LatestVersion,
-		libtopology.PeeringClusterSize{
-			AcceptingNumServers: 1,
-			AcceptingNumClients: 1,
-			DialingNumServers:   1,
-			DialingNumClients:   1,
+	type testcase struct {
+		oldversion    string
+		targetVersion string
+	}
+	tcs := []testcase{
+		// {
+		//  TODO: API changed from 1.13 to 1.14 in , PeerName to Peer
+		//  exportConfigEntry
+		// 	oldversion:    "1.13",
+		// 	targetVersion: *utils.TargetVersion,
+		// },
+		{
+			oldversion:    "1.14",
+			targetVersion: utils.TargetVersion,
 		},
-		true)
-	var (
-		acceptingCluster = accepting.Cluster
-		dialingCluster   = dialing.Cluster
-	)
-
-	dialingClient, err := dialingCluster.GetClient(nil, false)
-	require.NoError(t, err)
-
-	acceptingClient, err := acceptingCluster.GetClient(nil, false)
-	require.NoError(t, err)
-
-	// Verify control plane endpoints and traffic in gateway
-	_, gatewayAdminPort := dialing.Gateway.GetAdminAddr()
-	libassert.AssertUpstreamEndpointStatus(t, gatewayAdminPort, "server.dc1.peering", "HEALTHY", 1)
-	libassert.AssertUpstreamEndpointStatus(t, gatewayAdminPort, "server.dc2.peering", "HEALTHY", 1)
-	libassert.AssertEnvoyMetricAtLeast(t, gatewayAdminPort,
-		"cluster.static-server.default.default.accepting-to-dialer.external",
-		"upstream_cx_total", 1)
-	libassert.AssertEnvoyMetricAtLeast(t, gatewayAdminPort,
-		"cluster.server.dc1.peering",
-		"upstream_cx_total", 1)
-
-	// Upgrade the accepting cluster and assert peering is still ACTIVE
-	require.NoError(t, acceptingCluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), utils.TargetVersion))
-	libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive)
-	libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive)
-
-	require.NoError(t, dialingCluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), utils.TargetVersion))
-	libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive)
-	libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive)
-
-	// POST upgrade validation
-	//  - Restarted mesh gateway can receive consul generated configuration
-	//  - control plane traffic is through mesh gateway
-	//  - Register a new static-client service in dialing cluster and
-	//  - set upstream to static-server service in peered cluster
-
-	// Stop the accepting gateway and restart dialing gateway
-	// to force peering control plane traffic through dialing mesh gateway
-	require.NoError(t, accepting.Gateway.Stop())
-	require.NoError(t, dialing.Gateway.Restart())
-
-	// Restarted dialing gateway should not have any measurement on data plane traffic
-	libassert.AssertEnvoyMetricAtMost(t, gatewayAdminPort,
-		"cluster.static-server.default.default.accepting-to-dialer.external",
-		"upstream_cx_total", 0)
-	// control plane metrics should be observed
-	libassert.AssertEnvoyMetricAtLeast(t, gatewayAdminPort,
-		"cluster.server.dc1.peering",
-		"upstream_cx_total", 1)
-	require.NoError(t, accepting.Gateway.Start())
-
-	clientSidecarService, err := libservice.CreateAndRegisterStaticClientSidecar(dialingCluster.Servers()[0], libtopology.DialingPeerName, true, false, nil)
-	require.NoError(t, err)
-	_, port := clientSidecarService.GetAddr()
-	_, adminPort := clientSidecarService.GetAdminAddr()
-	require.NoError(t, clientSidecarService.Restart())
-	libassert.AssertUpstreamEndpointStatus(t, adminPort, fmt.Sprintf("static-server.default.%s.external", libtopology.DialingPeerName), "HEALTHY", 1)
-	libassert.HTTPServiceEchoes(t, "localhost", port, "")
-	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), libservice.StaticServerServiceName, "")
+	}
+
+	run := func(t *testing.T, tc testcase) {
+		accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetLatestImageName(), utils.LatestVersion,
+			libtopology.PeeringClusterSize{
+				AcceptingNumServers: 1,
+				AcceptingNumClients: 1,
+				DialingNumServers:   1,
+				DialingNumClients:   1,
+			},
+			true)
+		var (
+			acceptingCluster = accepting.Cluster
+			dialingCluster   = dialing.Cluster
+		)
+
+		dialingClient, err := dialingCluster.GetClient(nil, false)
+		require.NoError(t, err)
+
+		acceptingClient, err := acceptingCluster.GetClient(nil, false)
+		require.NoError(t, err)
+
+		// Verify control plane endpoints and traffic in gateway
+		_, gatewayAdminPort := dialing.Gateway.GetAdminAddr()
+		libassert.AssertUpstreamEndpointStatus(t, gatewayAdminPort, "server.dc1.peering", "HEALTHY", 1)
+		libassert.AssertUpstreamEndpointStatus(t, gatewayAdminPort, "server.dc2.peering", "HEALTHY", 1)
+		libassert.AssertEnvoyMetricAtLeast(t, gatewayAdminPort,
+			"cluster.static-server.default.default.accepting-to-dialer.external",
+			"upstream_cx_total", 1)
+		libassert.AssertEnvoyMetricAtLeast(t, gatewayAdminPort,
+			"cluster.server.dc1.peering",
+			"upstream_cx_total", 1)
+
+		// Upgrade the accepting cluster and assert peering is still ACTIVE
+		require.NoError(t, acceptingCluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), tc.targetVersion))
+		libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive)
+		libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive)
+
+		require.NoError(t, dialingCluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), tc.targetVersion))
+		libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive)
+		libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive)
+
+		// POST upgrade validation
+		//  - Restarted mesh gateway can receive consul generated configuration
+		//  - control plane traffic is through mesh gateway
+		//  - Register a new static-client service in dialing cluster and
+		//  - set upstream to static-server service in peered cluster
+
+		// Stop the accepting gateway and restart dialing gateway
+		// to force peering control plane traffic through dialing mesh gateway
+		require.NoError(t, accepting.Gateway.Stop())
+		require.NoError(t, dialing.Gateway.Restart())
+
+		// Restarted dialing gateway should not have any measurement on data plane traffic
+		libassert.AssertEnvoyMetricAtMost(t, gatewayAdminPort,
+			"cluster.static-server.default.default.accepting-to-dialer.external",
+			"upstream_cx_total", 0)
+		// control plane metrics should be observed
+		libassert.AssertEnvoyMetricAtLeast(t, gatewayAdminPort,
+			"cluster.server.dc1.peering",
+			"upstream_cx_total", 1)
+		require.NoError(t, accepting.Gateway.Start())
+
+		clientSidecarService, err := libservice.CreateAndRegisterStaticClientSidecar(dialingCluster.Servers()[0], libtopology.DialingPeerName, true)
+		require.NoError(t, err)
+		_, port := clientSidecarService.GetAddr()
+		_, adminPort := clientSidecarService.GetAdminAddr()
+		require.NoError(t, clientSidecarService.Restart())
+		libassert.AssertUpstreamEndpointStatus(t, adminPort, fmt.Sprintf("static-server.default.%s.external", libtopology.DialingPeerName), "HEALTHY", 1)
+		libassert.HTTPServiceEchoes(t, "localhost", port, "")
+		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
+	}
+
+	for _, tc := range tcs {
+		t.Run(fmt.Sprintf("upgrade from %s to %s", tc.oldversion, tc.targetVersion),
+			func(t *testing.T) {
+				run(t, tc)
+			})
+		// time.Sleep(3 * time.Second)
+	}
 }
diff --git a/test/integration/consul-container/test/upgrade/peering/peering_http_test.go b/test/integration/consul-container/test/upgrade/peering/peering_http_test.go
index 9c48727d83a64..84cb129d0b7b7 100644
--- a/test/integration/consul-container/test/upgrade/peering/peering_http_test.go
+++ b/test/integration/consul-container/test/upgrade/peering/peering_http_test.go
@@ -1,365 +1,401 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package upgrade
+package peering
 
 import (
 	"context"
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/require"
 
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
 	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
+	"github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
 	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
 	libtopology "github.com/hashicorp/consul/test/integration/consul-container/libs/topology"
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 	"github.com/hashicorp/consul/test/integration/consul-container/test/upgrade"
 )
 
-func TestPeering_Basic(t *testing.T) {
+// TestPeering_UpgradeToTarget_fromLatest checks peering status after dialing cluster
+// and accepting cluster upgrade
+func TestPeering_UpgradeToTarget_fromLatest(t *testing.T) {
 	t.Parallel()
-	accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetLatestImageName(), utils.LatestVersion,
-		libtopology.PeeringClusterSize{
-			AcceptingNumServers: 1,
-			AcceptingNumClients: 1,
-			DialingNumServers:   1,
-			DialingNumClients:   1,
-		},
-		false)
-	peeringUpgrade(t, accepting, dialing, utils.TargetVersion)
-	peeringPostUpgradeValidation(t, dialing)
-}
 
-func TestPeering_HTTPRouter(t *testing.T) {
-	t.Parallel()
-	accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetLatestImageName(), utils.LatestVersion,
-		libtopology.PeeringClusterSize{
-			AcceptingNumServers: 1,
-			AcceptingNumClients: 1,
-			DialingNumServers:   1,
-			DialingNumClients:   1,
-		},
-		false)
-	acceptingCluster := accepting.Cluster
-
-	// Create a second static-server at the client agent of accepting cluster and
-	// a service-router that routes /static-server-2 to static-server-2
-	serviceOpts := &libservice.ServiceOpts{
-		Name:     libservice.StaticServer2ServiceName,
-		ID:       "static-server-2",
-		Meta:     map[string]string{"version": "v2"},
-		HTTPPort: 8081,
-		GRPCPort: 8078,
+	type testcase struct {
+		oldversion    string
+		targetVersion string
+		name          string
+		// create creates addtional resources in peered clusters depending on cases, e.g., static-client,
+		// static server, and config-entries. It returns the proxy services, an assertation function to
+		// be called to verify the resources.
+		create func(*cluster.Cluster, *cluster.Cluster) (libservice.Service, libservice.Service, func(), error)
+		// extraAssertion adds additional assertion function to the common resources across cases.
+		// common resources includes static-client in dialing cluster, and static-server in accepting cluster.
+		extraAssertion func(int)
 	}
-	_, _, err := libservice.CreateAndRegisterStaticServerAndSidecar(acceptingCluster.Clients()[0], serviceOpts)
-	require.NoError(t, err, "creating static-server-2")
-	libassert.CatalogServiceExists(t, acceptingCluster.Clients()[0].GetClient(), libservice.StaticServer2ServiceName, nil)
-
-	require.NoError(t, acceptingCluster.ConfigEntryWrite(&api.ProxyConfigEntry{
-		Kind: api.ProxyDefaults,
-		Name: "global",
-		Config: map[string]interface{}{
-			"protocol": "http",
+	tcs := []testcase{
+		// {
+		//  TODO: API changed from 1.13 to 1.14 in , PeerName to Peer
+		//  exportConfigEntry
+		// 	oldversion:    "1.13",
+		// 	targetVersion: *utils.TargetVersion,
+		// },
+		{
+			oldversion:    "1.14",
+			targetVersion: utils.TargetVersion,
+			name:          "basic",
+			create: func(accepting *cluster.Cluster, dialing *cluster.Cluster) (libservice.Service, libservice.Service, func(), error) {
+				return nil, nil, func() {}, nil
+			},
+			extraAssertion: func(clientUpstreamPort int) {},
 		},
-	}))
-	routerConfigEntry := &api.ServiceRouterConfigEntry{
-		Kind: api.ServiceRouter,
-		Name: libservice.StaticServerServiceName,
-		Routes: []api.ServiceRoute{
-			{
-				Match: &api.ServiceRouteMatch{
-					HTTP: &api.ServiceRouteHTTPMatch{
-						PathPrefix: "/" + libservice.StaticServer2ServiceName + "/",
+		{
+			oldversion:    "1.14",
+			targetVersion: utils.TargetVersion,
+			name:          "http_router",
+			// Create a second static-service at the client agent of accepting cluster and
+			// a service-router that routes /static-server-2 to static-server-2
+			create: func(accepting *cluster.Cluster, dialing *cluster.Cluster) (libservice.Service, libservice.Service, func(), error) {
+				c := accepting
+				serviceOpts := &libservice.ServiceOpts{
+					Name:     libservice.StaticServer2ServiceName,
+					ID:       "static-server-2",
+					Meta:     map[string]string{"version": "v2"},
+					HTTPPort: 8081,
+					GRPCPort: 8078,
+				}
+				_, serverConnectProxy, err := libservice.CreateAndRegisterStaticServerAndSidecar(c.Clients()[0], serviceOpts)
+				if err != nil {
+					return nil, nil, nil, err
+				}
+				libassert.CatalogServiceExists(t, c.Clients()[0].GetClient(), libservice.StaticServer2ServiceName, nil)
+
+				err = c.ConfigEntryWrite(&api.ProxyConfigEntry{
+					Kind: api.ProxyDefaults,
+					Name: "global",
+					Config: map[string]interface{}{
+						"protocol": "http",
 					},
-				},
-				Destination: &api.ServiceRouteDestination{
-					Service:       libservice.StaticServer2ServiceName,
-					PrefixRewrite: "/",
-				},
+				})
+				if err != nil {
+					return nil, nil, nil, err
+				}
+				routerConfigEntry := &api.ServiceRouterConfigEntry{
+					Kind: api.ServiceRouter,
+					Name: libservice.StaticServerServiceName,
+					Routes: []api.ServiceRoute{
+						{
+							Match: &api.ServiceRouteMatch{
+								HTTP: &api.ServiceRouteHTTPMatch{
+									PathPrefix: "/" + libservice.StaticServer2ServiceName + "/",
+								},
+							},
+							Destination: &api.ServiceRouteDestination{
+								Service:       libservice.StaticServer2ServiceName,
+								PrefixRewrite: "/",
+							},
+						},
+					},
+				}
+				err = c.ConfigEntryWrite(routerConfigEntry)
+				return serverConnectProxy, nil, func() {}, err
+			},
+			extraAssertion: func(clientUpstreamPort int) {
+				libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d/static-server-2", clientUpstreamPort), "static-server-2", "")
 			},
 		},
-	}
-	require.NoError(t, acceptingCluster.ConfigEntryWrite(routerConfigEntry))
-	_, appPort := dialing.Container.GetAddr()
-	libassert.WaitForFortioName(t, retry.ThirtySeconds(), fmt.Sprintf("http://localhost:%d/static-server-2", appPort), "static-server-2", "")
-
-	peeringUpgrade(t, accepting, dialing, utils.TargetVersion)
-
-	peeringPostUpgradeValidation(t, dialing)
-	// TODO: restart static-server-2's sidecar
-	libassert.WaitForFortioName(t, retry.ThirtySeconds(), fmt.Sprintf("http://localhost:%d/static-server-2", appPort), "static-server-2", "")
-}
-
-// Verify resolver and failover can direct traffic to server in peered cluster
-// In addtional to the basic topology, this case provisions the following
-// services in the dialing cluster:
-//
-//   - a new static-client at server_0 that has two upstreams: static-server (5000)
-//     and peer-static-server (5001)
-//   - a local static-server service at client_0
-//   - service-resolved named static-server with failover to static-server in accepting cluster
-//   - service-resolved named peer-static-server to static-server in accepting cluster
-func TestPeering_HTTPResolverAndFailover(t *testing.T) {
-	t.Parallel()
-
-	accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetLatestImageName(), utils.LatestVersion,
-		libtopology.PeeringClusterSize{
-			AcceptingNumServers: 1,
-			AcceptingNumClients: 1,
-			DialingNumServers:   1,
-			DialingNumClients:   1,
-		},
-		false)
-	dialingCluster := dialing.Cluster
-
-	require.NoError(t, dialingCluster.ConfigEntryWrite(&api.ProxyConfigEntry{
-		Kind: api.ProxyDefaults,
-		Name: "global",
-		Config: map[string]interface{}{
-			"protocol": "http",
-		},
-	}))
-
-	clientConnectProxy, err := upgrade.CreateAndRegisterStaticClientSidecarWith2Upstreams(dialingCluster,
-		[]string{libservice.StaticServerServiceName, "peer-static-server"}, true,
-	)
-	require.NoErrorf(t, err, "error creating client connect proxy in cluster %s", dialingCluster.NetworkName)
-
-	// make a resolver for service peer-static-server
-	resolverConfigEntry := &api.ServiceResolverConfigEntry{
-		Kind: api.ServiceResolver,
-		Name: "peer-static-server",
-		Redirect: &api.ServiceResolverRedirect{
-			Service: libservice.StaticServerServiceName,
-			Peer:    libtopology.DialingPeerName,
-		},
-	}
-	require.NoErrorf(t, dialingCluster.ConfigEntryWrite(resolverConfigEntry),
-		"error writing resolver config entry for %s", resolverConfigEntry.Name)
-
-	// make a resolver for service static-server
-	resolverConfigEntry = &api.ServiceResolverConfigEntry{
-		Kind: api.ServiceResolver,
-		Name: libservice.StaticServerServiceName,
-		Failover: map[string]api.ServiceResolverFailover{
-			"*": {
-				Targets: []api.ServiceResolverFailoverTarget{
-					{
-						Peer: libtopology.DialingPeerName,
+		{
+			oldversion:    "1.14",
+			targetVersion: utils.TargetVersion,
+			name:          "http splitter and resolver",
+			// In addtional to the basic topology, this case provisions the following
+			// services in the dialing cluster:
+			//
+			// - a new static-client at server_0 that has two upstreams: split-static-server (5000)
+			//   and peer-static-server (5001)
+			// - a local static-server service at client_0
+			// - service-splitter named split-static-server w/ 2 services: "local-static-server" and
+			//   "peer-static-server".
+			// - service-resolved named local-static-server
+			// - service-resolved named peer-static-server
+			create: func(accepting *cluster.Cluster, dialing *cluster.Cluster) (libservice.Service, libservice.Service, func(), error) {
+				err := dialing.ConfigEntryWrite(&api.ProxyConfigEntry{
+					Kind: api.ProxyDefaults,
+					Name: "global",
+					Config: map[string]interface{}{
+						"protocol": "http",
 					},
-				},
+				})
+				if err != nil {
+					return nil, nil, nil, err
+				}
+
+				clientConnectProxy, err := upgrade.CreateAndRegisterStaticClientSidecarWith2Upstreams(dialing,
+					[]string{"split-static-server", "peer-static-server"},
+					true,
+				)
+				if err != nil {
+					return nil, nil, nil, fmt.Errorf("error creating client connect proxy in cluster %s", dialing.NetworkName)
+				}
+
+				// make a resolver for service peer-static-server
+				resolverConfigEntry := &api.ServiceResolverConfigEntry{
+					Kind: api.ServiceResolver,
+					Name: "peer-static-server",
+					Redirect: &api.ServiceResolverRedirect{
+						Service: libservice.StaticServerServiceName,
+						Peer:    libtopology.DialingPeerName,
+					},
+				}
+				err = dialing.ConfigEntryWrite(resolverConfigEntry)
+				if err != nil {
+					return nil, nil, nil, fmt.Errorf("error writing resolver config entry for %s", resolverConfigEntry.Name)
+				}
+
+				// make a splitter for service split-static-server
+				splitter := &api.ServiceSplitterConfigEntry{
+					Kind: api.ServiceSplitter,
+					Name: "split-static-server",
+					Splits: []api.ServiceSplit{
+						{
+							Weight:  50,
+							Service: "local-static-server",
+							ResponseHeaders: &api.HTTPHeaderModifiers{
+								Set: map[string]string{
+									"x-test-split": "local",
+								},
+							},
+						},
+						{
+							Weight:  50,
+							Service: "peer-static-server",
+							ResponseHeaders: &api.HTTPHeaderModifiers{
+								Set: map[string]string{
+									"x-test-split": "peer",
+								},
+							},
+						},
+					},
+				}
+				err = dialing.ConfigEntryWrite(splitter)
+				if err != nil {
+					return nil, nil, nil, fmt.Errorf("error writing splitter config entry for %s", splitter.Name)
+				}
+
+				// make a resolver for service local-static-server
+				resolverConfigEntry = &api.ServiceResolverConfigEntry{
+					Kind: api.ServiceResolver,
+					Name: "local-static-server",
+					Redirect: &api.ServiceResolverRedirect{
+						Service: libservice.StaticServerServiceName,
+					},
+				}
+				err = dialing.ConfigEntryWrite(resolverConfigEntry)
+				if err != nil {
+					return nil, nil, nil, fmt.Errorf("error writing resolver config entry for %s", resolverConfigEntry.Name)
+				}
+
+				// Make a static-server in dialing cluster
+				serviceOpts := &libservice.ServiceOpts{
+					Name:     libservice.StaticServerServiceName,
+					ID:       "static-server",
+					HTTPPort: 8081,
+					GRPCPort: 8078,
+				}
+				_, serverConnectProxy, err := libservice.CreateAndRegisterStaticServerAndSidecar(dialing.Clients()[0], serviceOpts)
+				libassert.CatalogServiceExists(t, dialing.Clients()[0].GetClient(), libservice.StaticServerServiceName, nil)
+				if err != nil {
+					return nil, nil, nil, err
+				}
+
+				_, appPorts := clientConnectProxy.GetAddrs()
+				assertionFn := func() {
+					libassert.HTTPServiceEchoesResHeader(t, "localhost", appPorts[0], "", map[string]string{
+						"X-Test-Split": "local",
+					})
+					libassert.HTTPServiceEchoesResHeader(t, "localhost", appPorts[0], "", map[string]string{
+						"X-Test-Split": "peer",
+					})
+					libassert.HTTPServiceEchoes(t, "localhost", appPorts[0], "")
+				}
+				return serverConnectProxy, clientConnectProxy, assertionFn, nil
 			},
+			extraAssertion: func(clientUpstreamPort int) {},
 		},
-	}
-	require.NoErrorf(t, dialingCluster.ConfigEntryWrite(resolverConfigEntry),
-		"error writing resolver config entry for %s", resolverConfigEntry.Name)
-
-	// Make a static-server in dialing cluster
-	serviceOpts := &libservice.ServiceOpts{
-		Name:     libservice.StaticServerServiceName,
-		ID:       "static-server-dialing",
-		HTTPPort: 8081,
-		GRPCPort: 8078,
-	}
-	_, serverConnectProxy, err := libservice.CreateAndRegisterStaticServerAndSidecar(dialingCluster.Clients()[0], serviceOpts)
-	require.NoError(t, err)
-	libassert.CatalogServiceExists(t, dialingCluster.Clients()[0].GetClient(), libservice.StaticServerServiceName, nil)
-
-	_, appPorts := clientConnectProxy.GetAddrs()
-
-	assertionAdditionalResources := func() {
-		// assert traffic can fail-over to static-server in peered cluster and restor to local static-server
-		// timeouts in this segment of the test reflect previously implicit retries in fortio name assertions for parity
-		libassert.WaitForFortioName(t, &retry.Timer{Timeout: 2 * time.Minute, Wait: 500 * time.Millisecond}, fmt.Sprintf("http://localhost:%d", appPorts[0]), "static-server-dialing", "")
-		require.NoError(t, serverConnectProxy.Stop())
-		libassert.WaitForFortioName(t, &retry.Timer{Timeout: 2 * time.Minute, Wait: 500 * time.Millisecond}, fmt.Sprintf("http://localhost:%d", appPorts[0]), libservice.StaticServerServiceName, "")
-		require.NoError(t, serverConnectProxy.Start())
-		libassert.WaitForFortioName(t, &retry.Timer{Timeout: 2 * time.Minute, Wait: 500 * time.Millisecond}, fmt.Sprintf("http://localhost:%d", appPorts[0]), "static-server-dialing", "")
-
-		// assert peer-static-server resolves to static-server in peered cluster
-		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", appPorts[1]), libservice.StaticServerServiceName, "")
-	}
-	assertionAdditionalResources()
-
-	peeringUpgrade(t, accepting, dialing, utils.TargetVersion)
-
-	require.NoError(t, clientConnectProxy.Restart())
-	assertionAdditionalResources()
-
-	peeringPostUpgradeValidation(t, dialing)
-	// TODO: restart static-server-2's sidecar
-}
-
-// In addtional to the basic topology, this case provisions the following
-// services in the dialing cluster:
-//
-//   - a new static-client at server_0 that has two upstreams: split-static-server (5000)
-//     and peer-static-server (5001)
-//   - a local static-server service at client_0
-//   - service-splitter named split-static-server w/ 2 services: "local-static-server" and
-//     "peer-static-server".
-//   - service-resolved named local-static-server
-//   - service-resolved named peer-static-server
-func TestPeering_HTTPResolverAndSplitter(t *testing.T) {
-	t.Parallel()
-
-	accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetLatestImageName(), utils.LatestVersion,
-		libtopology.PeeringClusterSize{
-			AcceptingNumServers: 1,
-			AcceptingNumClients: 1,
-			DialingNumServers:   1,
-			DialingNumClients:   1,
-		},
-		false)
-	dialingCluster := dialing.Cluster
-
-	require.NoError(t, dialingCluster.ConfigEntryWrite(&api.ProxyConfigEntry{
-		Kind: api.ProxyDefaults,
-		Name: "global",
-		Config: map[string]interface{}{
-			"protocol": "http",
-		},
-	}))
-
-	clientConnectProxy, err := upgrade.CreateAndRegisterStaticClientSidecarWith2Upstreams(dialingCluster,
-		[]string{"split-static-server", "peer-static-server"}, true,
-	)
-	require.NoErrorf(t, err, "creating client connect proxy in cluster %s", dialingCluster.NetworkName)
-
-	// make a resolver for service peer-static-server
-	resolverConfigEntry := &api.ServiceResolverConfigEntry{
-		Kind: api.ServiceResolver,
-		Name: "peer-static-server",
-		Redirect: &api.ServiceResolverRedirect{
-			Service: libservice.StaticServerServiceName,
-			Peer:    libtopology.DialingPeerName,
-		},
-	}
-	require.NoErrorf(t, dialingCluster.ConfigEntryWrite(resolverConfigEntry),
-		"writing resolver config entry for %s", resolverConfigEntry.Name)
-
-	// make a splitter for service split-static-server
-	splitter := &api.ServiceSplitterConfigEntry{
-		Kind: api.ServiceSplitter,
-		Name: "split-static-server",
-		Splits: []api.ServiceSplit{
-			{
-				Weight:  50,
-				Service: "local-static-server",
-				ResponseHeaders: &api.HTTPHeaderModifiers{
-					Set: map[string]string{
-						"x-test-split": "local",
+		{
+			oldversion:    "1.14",
+			targetVersion: utils.TargetVersion,
+			name:          "http resolver and failover",
+			// Verify resolver and failover can direct traffic to server in peered cluster
+			// In addtional to the basic topology, this case provisions the following
+			// services in the dialing cluster:
+			//
+			// - a new static-client at server_0 that has two upstreams: static-server (5000)
+			//   and peer-static-server (5001)
+			// - a local static-server service at client_0
+			// - service-resolved named static-server with failover to static-server in accepting cluster
+			// - service-resolved named peer-static-server to static-server in accepting cluster
+			create: func(accepting *cluster.Cluster, dialing *cluster.Cluster) (libservice.Service, libservice.Service, func(), error) {
+				err := dialing.ConfigEntryWrite(&api.ProxyConfigEntry{
+					Kind: api.ProxyDefaults,
+					Name: "global",
+					Config: map[string]interface{}{
+						"protocol": "http",
 					},
-				},
-			},
-			{
-				Weight:  50,
-				Service: "peer-static-server",
-				ResponseHeaders: &api.HTTPHeaderModifiers{
-					Set: map[string]string{
-						"x-test-split": "peer",
+				})
+				if err != nil {
+					return nil, nil, nil, err
+				}
+
+				clientConnectProxy, err := upgrade.CreateAndRegisterStaticClientSidecarWith2Upstreams(dialing,
+					[]string{"static-server", "peer-static-server"}, true,
+				)
+				if err != nil {
+					return nil, nil, nil, fmt.Errorf("error creating client connect proxy in cluster %s", dialing.NetworkName)
+				}
+
+				// make a resolver for service peer-static-server
+				resolverConfigEntry := &api.ServiceResolverConfigEntry{
+					Kind: api.ServiceResolver,
+					Name: "peer-static-server",
+					Redirect: &api.ServiceResolverRedirect{
+						Service: libservice.StaticServerServiceName,
+						Peer:    libtopology.DialingPeerName,
+					},
+				}
+				err = dialing.ConfigEntryWrite(resolverConfigEntry)
+				if err != nil {
+					return nil, nil, nil, fmt.Errorf("error writing resolver config entry for %s", resolverConfigEntry.Name)
+				}
+
+				// make a resolver for service static-server
+				resolverConfigEntry = &api.ServiceResolverConfigEntry{
+					Kind: api.ServiceResolver,
+					Name: "static-server",
+					Failover: map[string]api.ServiceResolverFailover{
+						"*": {
+							Targets: []api.ServiceResolverFailoverTarget{
+								{
+									Peer: libtopology.DialingPeerName,
+								},
+							},
+						},
 					},
-				},
+				}
+				err = dialing.ConfigEntryWrite(resolverConfigEntry)
+				if err != nil {
+					return nil, nil, nil, fmt.Errorf("error writing resolver config entry for %s", resolverConfigEntry.Name)
+				}
+
+				// Make a static-server in dialing cluster
+				serviceOpts := &libservice.ServiceOpts{
+					Name:     libservice.StaticServerServiceName,
+					ID:       "static-server-dialing",
+					HTTPPort: 8081,
+					GRPCPort: 8078,
+				}
+				_, serverConnectProxy, err := libservice.CreateAndRegisterStaticServerAndSidecar(dialing.Clients()[0], serviceOpts)
+				libassert.CatalogServiceExists(t, dialing.Clients()[0].GetClient(), libservice.StaticServerServiceName, nil)
+				if err != nil {
+					return nil, nil, nil, err
+				}
+
+				_, appPorts := clientConnectProxy.GetAddrs()
+				assertionFn := func() {
+					// assert traffic can fail-over to static-server in peered cluster and restor to local static-server
+					libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", appPorts[0]), "static-server-dialing", "")
+					require.NoError(t, serverConnectProxy.Stop())
+					libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", appPorts[0]), "static-server", "")
+					require.NoError(t, serverConnectProxy.Start())
+					libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", appPorts[0]), "static-server-dialing", "")
+
+					// assert peer-static-server resolves to static-server in peered cluster
+					libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", appPorts[1]), "static-server", "")
+				}
+				return serverConnectProxy, clientConnectProxy, assertionFn, nil
 			},
+			extraAssertion: func(clientUpstreamPort int) {},
 		},
 	}
-	require.NoErrorf(t, dialingCluster.ConfigEntryWrite(splitter),
-		"error writing splitter config entry for %s", splitter.Name)
-
-	// make a resolver for service local-static-server
-	resolverConfigEntry = &api.ServiceResolverConfigEntry{
-		Kind: api.ServiceResolver,
-		Name: "local-static-server",
-		Redirect: &api.ServiceResolverRedirect{
-			Service: libservice.StaticServerServiceName,
-		},
-	}
-	require.NoErrorf(t, dialingCluster.ConfigEntryWrite(resolverConfigEntry),
-		"error writing resolver config entry for %s", resolverConfigEntry.Name)
-
-	// Make a static-server in dialing cluster
-	serviceOpts := &libservice.ServiceOpts{
-		Name:     libservice.StaticServerServiceName,
-		ID:       "static-server",
-		HTTPPort: 8081,
-		GRPCPort: 8078,
-	}
-	_, _, err = libservice.CreateAndRegisterStaticServerAndSidecar(dialingCluster.Clients()[0], serviceOpts)
-	require.NoError(t, err)
-	libassert.CatalogServiceExists(t, dialingCluster.Clients()[0].GetClient(), libservice.StaticServerServiceName, nil)
-
-	_, appPorts := clientConnectProxy.GetAddrs()
-	assertionAdditionalResources := func() {
-		libassert.HTTPServiceEchoesResHeader(t, "localhost", appPorts[0], "", map[string]string{
-			"X-Test-Split": "local",
-		})
-		libassert.HTTPServiceEchoesResHeader(t, "localhost", appPorts[0], "", map[string]string{
-			"X-Test-Split": "peer",
-		})
-		libassert.HTTPServiceEchoes(t, "localhost", appPorts[0], "")
-	}
-	assertionAdditionalResources()
 
-	peeringUpgrade(t, accepting, dialing, utils.TargetVersion)
-
-	require.NoError(t, clientConnectProxy.Restart())
-	assertionAdditionalResources()
-
-	peeringPostUpgradeValidation(t, dialing)
-	// TODO: restart static-server-2's sidecar
-}
-
-func peeringUpgrade(t *testing.T, accepting, dialing *libtopology.BuiltCluster, targetVersion string) {
-	t.Helper()
-
-	dialingClient, err := dialing.Cluster.GetClient(nil, false)
-	require.NoError(t, err)
-
-	acceptingClient, err := accepting.Cluster.GetClient(nil, false)
-	require.NoError(t, err)
-
-	_, gatewayAdminPort := dialing.Gateway.GetAdminAddr()
-	_, staticClientPort := dialing.Container.GetAddr()
-
-	// Upgrade the accepting cluster and assert peering is still ACTIVE
-	require.NoError(t, accepting.Cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), targetVersion))
-	libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive)
-	libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive)
-
-	require.NoError(t, dialing.Cluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), targetVersion))
-	libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive)
-	libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive)
-
-	// POST upgrade validation
-	//  - Register a new static-client service in dialing cluster and
-	//  - set upstream to static-server service in peered cluster
-
-	// Restart the gateway & proxy sidecar, and verify existing connection
-	require.NoError(t, dialing.Gateway.Restart())
-	// Restarted gateway should not have any measurement on data plane traffic
-	libassert.AssertEnvoyMetricAtMost(t, gatewayAdminPort,
-		"cluster.static-server.default.default.accepting-to-dialer.external",
-		"upstream_cx_total", 0)
-	libassert.HTTPServiceEchoes(t, "localhost", staticClientPort, "")
-
-	require.NoError(t, dialing.Container.Restart())
-	libassert.HTTPServiceEchoes(t, "localhost", staticClientPort, "")
-	require.NoError(t, accepting.Container.Restart())
-	libassert.HTTPServiceEchoes(t, "localhost", staticClientPort, "")
-}
-
-func peeringPostUpgradeValidation(t *testing.T, dialing *libtopology.BuiltCluster) {
-	t.Helper()
+	run := func(t *testing.T, tc testcase) {
+		accepting, dialing := libtopology.BasicPeeringTwoClustersSetup(t, utils.GetLatestImageName(), tc.oldversion,
+			libtopology.PeeringClusterSize{
+				AcceptingNumServers: 1,
+				AcceptingNumClients: 1,
+				DialingNumServers:   1,
+				DialingNumClients:   1,
+			},
+			false)
+		var (
+			acceptingCluster = accepting.Cluster
+			dialingCluster   = dialing.Cluster
+		)
+
+		dialingClient, err := dialingCluster.GetClient(nil, false)
+		require.NoError(t, err)
+
+		acceptingClient, err := acceptingCluster.GetClient(nil, false)
+		require.NoError(t, err)
+
+		_, gatewayAdminPort := dialing.Gateway.GetAdminAddr()
+		_, staticClientPort := dialing.Container.GetAddr()
+
+		_, appPort := dialing.Container.GetAddr()
+		_, secondClientProxy, assertionAdditionalResources, err := tc.create(acceptingCluster, dialingCluster)
+		require.NoError(t, err)
+		assertionAdditionalResources()
+		tc.extraAssertion(appPort)
+
+		// Upgrade the accepting cluster and assert peering is still ACTIVE
+		require.NoError(t, acceptingCluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), tc.targetVersion))
+		libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive)
+		libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive)
+
+		require.NoError(t, dialingCluster.StandardUpgrade(t, context.Background(), utils.GetTargetImageName(), tc.targetVersion))
+		libassert.PeeringStatus(t, acceptingClient, libtopology.AcceptingPeerName, api.PeeringStateActive)
+		libassert.PeeringStatus(t, dialingClient, libtopology.DialingPeerName, api.PeeringStateActive)
+
+		// POST upgrade validation
+		//  - Register a new static-client service in dialing cluster and
+		//  - set upstream to static-server service in peered cluster
+
+		// Restart the gateway & proxy sidecar, and verify existing connection
+		require.NoError(t, dialing.Gateway.Restart())
+		// Restarted gateway should not have any measurement on data plane traffic
+		libassert.AssertEnvoyMetricAtMost(t, gatewayAdminPort,
+			"cluster.static-server.default.default.accepting-to-dialer.external",
+			"upstream_cx_total", 0)
+		libassert.HTTPServiceEchoes(t, "localhost", staticClientPort, "")
+
+		require.NoError(t, dialing.Container.Restart())
+		libassert.HTTPServiceEchoes(t, "localhost", staticClientPort, "")
+		require.NoError(t, accepting.Container.Restart())
+		libassert.HTTPServiceEchoes(t, "localhost", staticClientPort, "")
+
+		// restart the secondClientProxy if exist
+		if secondClientProxy != nil {
+			require.NoError(t, secondClientProxy.Restart())
+		}
+		assertionAdditionalResources()
+
+		clientSidecarService, err := libservice.CreateAndRegisterStaticClientSidecar(dialingCluster.Servers()[0], libtopology.DialingPeerName, true)
+		require.NoError(t, err)
+		_, port := clientSidecarService.GetAddr()
+		_, adminPort := clientSidecarService.GetAdminAddr()
+		libassert.AssertUpstreamEndpointStatus(t, adminPort, fmt.Sprintf("static-server.default.%s.external", libtopology.DialingPeerName), "HEALTHY", 1)
+		libassert.HTTPServiceEchoes(t, "localhost", port, "")
+		libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), "static-server", "")
+
+		// TODO: restart static-server-2's sidecar
+		tc.extraAssertion(appPort)
+	}
 
-	clientSidecarService, err := libservice.CreateAndRegisterStaticClientSidecar(dialing.Cluster.Servers()[0], libtopology.DialingPeerName, true, false, nil)
-	require.NoError(t, err)
-	_, port := clientSidecarService.GetAddr()
-	_, adminPort := clientSidecarService.GetAdminAddr()
-	libassert.AssertUpstreamEndpointStatus(t, adminPort, fmt.Sprintf("static-server.default.%s.external", libtopology.DialingPeerName), "HEALTHY", 1)
-	libassert.HTTPServiceEchoes(t, "localhost", port, "")
-	libassert.AssertFortioName(t, fmt.Sprintf("http://localhost:%d", port), libservice.StaticServerServiceName, "")
+	for _, tc := range tcs {
+		t.Run(fmt.Sprintf("%s upgrade from %s to %s", tc.name, tc.oldversion, tc.targetVersion),
+			func(t *testing.T) {
+				run(t, tc)
+			})
+		// time.Sleep(3 * time.Second)
+	}
 }
diff --git a/test/integration/consul-container/test/upgrade/upgrade.go b/test/integration/consul-container/test/upgrade/upgrade.go
new file mode 100644
index 0000000000000..30bbdcc627c46
--- /dev/null
+++ b/test/integration/consul-container/test/upgrade/upgrade.go
@@ -0,0 +1,3 @@
+package upgrade
+
+var UpgradeFromVersions = []string{"1.13", "1.14"}
diff --git a/test/integration/consul-container/test/util/test_debug_breakpoint_hit.png b/test/integration/consul-container/test/util/test_debug_breakpoint_hit.png
deleted file mode 100644
index 2eae03da3b905..0000000000000
Binary files a/test/integration/consul-container/test/util/test_debug_breakpoint_hit.png and /dev/null differ
diff --git a/test/integration/consul-container/test/util/test_debug_configuration.png b/test/integration/consul-container/test/util/test_debug_configuration.png
deleted file mode 100644
index 8fa19ba939985..0000000000000
Binary files a/test/integration/consul-container/test/util/test_debug_configuration.png and /dev/null differ
diff --git a/test/integration/consul-container/test/util/test_debug_info.png b/test/integration/consul-container/test/util/test_debug_info.png
deleted file mode 100644
index a177999c0d95a..0000000000000
Binary files a/test/integration/consul-container/test/util/test_debug_info.png and /dev/null differ
diff --git a/test/integration/consul-container/test/util/test_debug_remote_configuration.png b/test/integration/consul-container/test/util/test_debug_remote_configuration.png
deleted file mode 100644
index 01b14eada6d9a..0000000000000
Binary files a/test/integration/consul-container/test/util/test_debug_remote_configuration.png and /dev/null differ
diff --git a/test/integration/consul-container/test/util/test_debug_remote_connected.png b/test/integration/consul-container/test/util/test_debug_remote_connected.png
deleted file mode 100644
index 52fc905ef29af..0000000000000
Binary files a/test/integration/consul-container/test/util/test_debug_remote_connected.png and /dev/null differ
diff --git a/test/integration/consul-container/test/util/test_debug_resume_program.png b/test/integration/consul-container/test/util/test_debug_resume_program.png
deleted file mode 100644
index 99c2899019bb5..0000000000000
Binary files a/test/integration/consul-container/test/util/test_debug_resume_program.png and /dev/null differ
diff --git a/test/integration/consul-container/test/wanfed/acl_bootstrap_replication_test.go b/test/integration/consul-container/test/wanfed/acl_bootstrap_replication_test.go
index 7eedc158d133a..0caddbc302e3e 100644
--- a/test/integration/consul-container/test/wanfed/acl_bootstrap_replication_test.go
+++ b/test/integration/consul-container/test/wanfed/acl_bootstrap_replication_test.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MPL-2.0
 
 package wanfed
 
diff --git a/test/integration/consul-container/test/wanfed/wanfed_peering_test.go b/test/integration/consul-container/test/wanfed/wanfed_peering_test.go
index 41d6854e2832a..576172230f639 100644
--- a/test/integration/consul-container/test/wanfed/wanfed_peering_test.go
+++ b/test/integration/consul-container/test/wanfed/wanfed_peering_test.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
+// SPDX-License-Identifier: MPL-2.0
 
 package wanfed
 
@@ -7,12 +7,12 @@ import (
 	"context"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/hashicorp/consul/api"
+	"github.com/hashicorp/consul/sdk/testutil/retry"
 	libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
 	libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster"
 	libservice "github.com/hashicorp/consul/test/integration/consul-container/libs/service"
+	"github.com/stretchr/testify/require"
 )
 
 func TestPeering_WanFedSecondaryDC(t *testing.T) {
@@ -35,7 +35,7 @@ func TestPeering_WanFedSecondaryDC(t *testing.T) {
 
 	t.Run("secondary dc services are visible in primary dc", func(t *testing.T) {
 		createConnectService(t, c2)
-		libassert.CatalogServiceExists(t, c1Agent.GetClient(), libservice.StaticServerServiceName, &api.QueryOptions{Datacenter: "secondary"})
+		assertCatalogService(t, c1Agent.GetClient(), "static-server", &api.QueryOptions{Datacenter: "secondary"})
 	})
 
 	t.Run("secondary dc can peer to alpha dc", func(t *testing.T) {
@@ -57,9 +57,9 @@ func TestPeering_WanFedSecondaryDC(t *testing.T) {
 		require.NoError(t, service.Export("default", "alpha-to-secondary", c3Agent.GetClient()))
 
 		// Create a testing sidecar to proxy requests through
-		clientConnectProxy, err := libservice.CreateAndRegisterStaticClientSidecar(c2Agent, "secondary-to-alpha", false, false, nil)
+		clientConnectProxy, err := libservice.CreateAndRegisterStaticClientSidecar(c2Agent, "secondary-to-alpha", false)
 		require.NoError(t, err)
-		libassert.CatalogServiceExists(t, c2Agent.GetClient(), "static-client-sidecar-proxy", nil)
+		assertCatalogService(t, c2Agent.GetClient(), "static-client-sidecar-proxy", nil)
 
 		// Ensure envoy is configured for the peer service and healthy.
 		_, adminPort := clientConnectProxy.GetAdminAddr()
@@ -75,6 +75,18 @@ func TestPeering_WanFedSecondaryDC(t *testing.T) {
 	})
 }
 
+func assertCatalogService(t *testing.T, c *api.Client, svc string, opts *api.QueryOptions) {
+	retry.Run(t, func(r *retry.R) {
+		services, _, err := c.Catalog().Service(svc, "", opts)
+		if err != nil {
+			r.Fatal("error reading catalog data", err)
+		}
+		if len(services) == 0 {
+			r.Fatal("did not find catalog entry for ", svc)
+		}
+	})
+}
+
 func createCluster(t *testing.T, dc string, f func(c *libcluster.ConfigBuilder)) (*libcluster.Cluster, libcluster.Agent) {
 	ctx := libcluster.NewBuildContext(t, libcluster.BuildOptions{Datacenter: dc})
 	conf := libcluster.NewConfigBuilder(ctx).Advanced(f)
@@ -106,8 +118,8 @@ func createConnectService(t *testing.T, cluster *libcluster.Cluster) libservice.
 	serverConnectProxy, _, err := libservice.CreateAndRegisterStaticServerAndSidecar(node, &opts)
 	require.NoError(t, err)
 
-	libassert.CatalogServiceExists(t, client, libservice.StaticServerServiceName, nil)
-	libassert.CatalogServiceExists(t, client, "static-server-sidecar-proxy", nil)
+	assertCatalogService(t, client, "static-server-sidecar-proxy", nil)
+	assertCatalogService(t, client, "static-server", nil)
 
 	return serverConnectProxy
 }
diff --git a/test/load/packer/consul-ami/consul.pkr.hcl b/test/load/packer/consul-ami/consul.pkr.hcl
index d24ef7b9cbc6d..cb136e73ca405 100644
--- a/test/load/packer/consul-ami/consul.pkr.hcl
+++ b/test/load/packer/consul-ami/consul.pkr.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 packer {
   required_version = ">= 1.5.4"
 }
diff --git a/test/load/packer/consul-ami/scripts/conf.yaml b/test/load/packer/consul-ami/scripts/conf.yaml
index e61a9b94ef1d6..e42704343cb06 100755
--- a/test/load/packer/consul-ami/scripts/conf.yaml
+++ b/test/load/packer/consul-ami/scripts/conf.yaml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 init_config:
 
 instances:
diff --git a/test/load/packer/consul-ami/scripts/datadog.yaml b/test/load/packer/consul-ami/scripts/datadog.yaml
index bfe671563d96b..1e3aa1a058023 100755
--- a/test/load/packer/consul-ami/scripts/datadog.yaml
+++ b/test/load/packer/consul-ami/scripts/datadog.yaml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 #########################
 ## Basic Configuration ##
 #########################
diff --git a/test/load/packer/consul-ami/scripts/move-files.sh b/test/load/packer/consul-ami/scripts/move-files.sh
index 8b695ac83c6f1..c0d81de642e3c 100644
--- a/test/load/packer/consul-ami/scripts/move-files.sh
+++ b/test/load/packer/consul-ami/scripts/move-files.sh
@@ -1,7 +1,4 @@
 #!/bin/bash -e
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 ##Move datadog files
 mv /home/ubuntu/scripts/conf.yaml /etc/datadog-agent/conf.d/consul.d/
diff --git a/test/load/packer/loadtest-ami/loadtest.pkr.hcl b/test/load/packer/loadtest-ami/loadtest.pkr.hcl
index e7deb402e3ef9..03987a7cf095f 100644
--- a/test/load/packer/loadtest-ami/loadtest.pkr.hcl
+++ b/test/load/packer/loadtest-ami/loadtest.pkr.hcl
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 packer {
   required_version = ">= 1.5.4"
 }
diff --git a/test/load/packer/loadtest-ami/scripts/install-k6.sh b/test/load/packer/loadtest-ami/scripts/install-k6.sh
index fce98cea62542..2163f2de4a05d 100644
--- a/test/load/packer/loadtest-ami/scripts/install-k6.sh
+++ b/test/load/packer/loadtest-ami/scripts/install-k6.sh
@@ -1,7 +1,4 @@
 #!/bin/bash -e
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 # set new limit
 echo "fs.file-max = 2097152" >> /etc/sysctl.conf
diff --git a/test/load/packer/loadtest-ami/scripts/loadtest.js b/test/load/packer/loadtest-ami/scripts/loadtest.js
index e048b0e307fc6..2de390c2847e9 100644
--- a/test/load/packer/loadtest-ami/scripts/loadtest.js
+++ b/test/load/packer/loadtest-ami/scripts/loadtest.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import http from 'k6/http';
 import { uuidv4 } from "https://jslib.k6.io/k6-utils/1.0.0/index.js";
 import { check, fail } from 'k6';
diff --git a/test/load/terraform/consul.tf b/test/load/terraform/consul.tf
index 969ccd58fc4a4..bc30bf6f4d46b 100644
--- a/test/load/terraform/consul.tf
+++ b/test/load/terraform/consul.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 data "aws_ami" "consul" {
   most_recent = true
 
diff --git a/test/load/terraform/main.tf b/test/load/terraform/main.tf
index 76f0c81286ff6..06a1478dc6dd8 100644
--- a/test/load/terraform/main.tf
+++ b/test/load/terraform/main.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 terraform {
   required_version = ">= 0.13"
 }
diff --git a/test/load/terraform/outputs.tf b/test/load/terraform/outputs.tf
index 80e213f4282e3..e69de29bb2d1d 100644
--- a/test/load/terraform/outputs.tf
+++ b/test/load/terraform/outputs.tf
@@ -1,3 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
diff --git a/test/load/terraform/providers.tf b/test/load/terraform/providers.tf
index 87b6bf51e97de..ed4a9b204d12b 100644
--- a/test/load/terraform/providers.tf
+++ b/test/load/terraform/providers.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 terraform {
   required_providers {
     aws = {
diff --git a/test/load/terraform/test-servers.tf b/test/load/terraform/test-servers.tf
index 4d4b0a6acc3fd..157843751e1c6 100644
--- a/test/load/terraform/test-servers.tf
+++ b/test/load/terraform/test-servers.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 data "aws_ami" "test" {
   most_recent = true
 
diff --git a/test/load/terraform/user-data-client.sh b/test/load/terraform/user-data-client.sh
index 27a14004a54d3..510e9fd1dfc88 100644
--- a/test/load/terraform/user-data-client.sh
+++ b/test/load/terraform/user-data-client.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # SOURCE: GRUNTWORKS
 # This script is meant to be run in the User Data of each EC2 Instance while it's booting. The script uses the
 # run-consul script to configure and start Consul in client mode. Note that this script assumes it's running in an AMI
diff --git a/test/load/terraform/user-data-server.sh b/test/load/terraform/user-data-server.sh
index 0d743f57ab687..acebeca7a7a33 100755
--- a/test/load/terraform/user-data-server.sh
+++ b/test/load/terraform/user-data-server.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # SOURCE: GRUNTWORKS
 # This script is meant to be run in the User Data of each EC2 Instance while it's booting. The script uses the
 # run-consul script to configure and start Consul in server mode. Note that this script assumes it's running in an AMI
diff --git a/test/load/terraform/variables.tf b/test/load/terraform/variables.tf
index 8d5d82e1ca02f..2cec534b8d5d8 100644
--- a/test/load/terraform/variables.tf
+++ b/test/load/terraform/variables.tf
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 # ---------------------------------------------------------------------------------------------------------------------
 # ENVIRONMENT VARIABLES
 # Define these secrets as environment variables
diff --git a/testing/deployer/.gitignore b/testing/deployer/.gitignore
deleted file mode 100644
index 5d18603464e65..0000000000000
--- a/testing/deployer/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/terraform
-/workdir
-/sample-cli
-workdir
diff --git a/testing/deployer/README.md b/testing/deployer/README.md
deleted file mode 100644
index 604bbdb08781c..0000000000000
--- a/testing/deployer/README.md
+++ /dev/null
@@ -1,179 +0,0 @@
-[![GoDoc](https://pkg.go.dev/badge/github.com/hashicorp/consul/testing/deployer)](https://pkg.go.dev/github.com/hashicorp/consul/testing/deployer)
-
-## Summary
-
-This is a Go library used to launch one or more Consul clusters that can be
-peered using the cluster peering feature. Under the covers `terraform` is used
-in conjunction with the
-[`kreuzwerker/docker`](https://registry.terraform.io/providers/kreuzwerker/docker/latest)
-provider to manage a fleet of local docker containers and networks.
-
-### Configuration
-
-The complete topology of Consul clusters is defined using a topology.Config
-which allows you to define a set of networks and reference those networks when
-assigning nodes and services to clusters. Both Consul clients and
-`consul-dataplane` instances are supported.
-
-Here is an example configuration with two peered clusters:
-
-```
-cfg := &topology.Config{
-    Networks: []*topology.Network{
-        {Name: "dc1"},
-        {Name: "dc2"},
-        {Name: "wan", Type: "wan"},
-    },
-    Clusters: []*topology.Cluster{
-        {
-            Name: "dc1",
-            Nodes: []*topology.Node{
-                {
-                    Kind: topology.NodeKindServer,
-                    Name: "dc1-server1",
-                    Addresses: []*topology.Address{
-                        {Network: "dc1"},
-                        {Network: "wan"},
-                    },
-                },
-                {
-                    Kind: topology.NodeKindClient,
-                    Name: "dc1-client1",
-                    Services: []*topology.Service{
-                        {
-                            ID:             topology.ServiceID{Name: "mesh-gateway"},
-                            Port:           8443,
-                            EnvoyAdminPort: 19000,
-                            IsMeshGateway:  true,
-                        },
-                    },
-                },
-                {
-                    Kind: topology.NodeKindClient,
-                    Name: "dc1-client2",
-                    Services: []*topology.Service{
-                        {
-                            ID:             topology.ServiceID{Name: "ping"},
-                            Image:          "rboyer/pingpong:latest",
-                            Port:           8080,
-                            EnvoyAdminPort: 19000,
-                            Command: []string{
-                                "-bind", "0.0.0.0:8080",
-                                "-dial", "127.0.0.1:9090",
-                                "-pong-chaos",
-                                "-dialfreq", "250ms",
-                                "-name", "ping",
-                            },
-                            Upstreams: []*topology.Upstream{{
-                                ID:        topology.ServiceID{Name: "pong"},
-                                LocalPort: 9090,
-                                Peer:      "peer-dc2-default",
-                            }},
-                        },
-                    },
-                },
-            },
-            InitialConfigEntries: []api.ConfigEntry{
-                &api.ExportedServicesConfigEntry{
-                    Name: "default",
-                    Services: []api.ExportedService{{
-                        Name: "ping",
-                        Consumers: []api.ServiceConsumer{{
-                            Peer: "peer-dc2-default",
-                        }},
-                    }},
-                },
-            },
-        },
-        {
-            Name: "dc2",
-            Nodes: []*topology.Node{
-                {
-                    Kind: topology.NodeKindServer,
-                    Name: "dc2-server1",
-                    Addresses: []*topology.Address{
-                        {Network: "dc2"},
-                        {Network: "wan"},
-                    },
-                },
-                {
-                    Kind: topology.NodeKindClient,
-                    Name: "dc2-client1",
-                    Services: []*topology.Service{
-                        {
-                            ID:             topology.ServiceID{Name: "mesh-gateway"},
-                            Port:           8443,
-                            EnvoyAdminPort: 19000,
-                            IsMeshGateway:  true,
-                        },
-                    },
-                },
-                {
-                    Kind: topology.NodeKindDataplane,
-                    Name: "dc2-client2",
-                    Services: []*topology.Service{
-                        {
-                            ID:             topology.ServiceID{Name: "pong"},
-                            Image:          "rboyer/pingpong:latest",
-                            Port:           8080,
-                            EnvoyAdminPort: 19000,
-                            Command: []string{
-                                "-bind", "0.0.0.0:8080",
-                                "-dial", "127.0.0.1:9090",
-                                "-pong-chaos",
-                                "-dialfreq", "250ms",
-                                "-name", "pong",
-                            },
-                            Upstreams: []*topology.Upstream{{
-                                ID:        topology.ServiceID{Name: "ping"},
-                                LocalPort: 9090,
-                                Peer:      "peer-dc1-default",
-                            }},
-                        },
-                    },
-                },
-            },
-            InitialConfigEntries: []api.ConfigEntry{
-                &api.ExportedServicesConfigEntry{
-                    Name: "default",
-                    Services: []api.ExportedService{{
-                        Name: "ping",
-                        Consumers: []api.ServiceConsumer{{
-                            Peer: "peer-dc2-default",
-                        }},
-                    }},
-                },
-            },
-        },
-    },
-    Peerings: []*topology.Peering{{
-        Dialing: topology.PeerCluster{
-            Name: "dc1",
-        },
-        Accepting: topology.PeerCluster{
-            Name: "dc2",
-        },
-    }},
-}
-```
-
-Once you have a topology configuration, you simply call the appropriate
-`Launch` function to validate and boot the cluster.
-
-You may also modify your original configuration (in some allowed ways) and call
-`Relaunch` on an existing topology which will differentially adjust the running
-infrastructure. This can be useful to do things like upgrade instances in place
-or subly reconfigure them.
-
-### For Testing
-
-It is meant to be consumed primarily by unit tests desiring a complex
-reasonably realistic Consul setup. For that use case use the `sprawl/sprawltest` wrapper:
-
-```
-func TestSomething(t *testing.T) {
-    cfg := &topology.Config{...}
-    sp := sprawltest.Launch(t, cfg)
-    // do stuff with 'sp'
-}
-```
\ No newline at end of file
diff --git a/testing/deployer/TODO.md b/testing/deployer/TODO.md
deleted file mode 100644
index 2d651cd162950..0000000000000
--- a/testing/deployer/TODO.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Missing things that should probably be added;
-
-- consul-dataplane support for running mesh gateways
-- consul-dataplane health check updates (automatic; manual)
-- ServerExternalAddresses in a peering; possibly rig up a DNS name for this.
-- after creating a token, verify it exists on all servers before proceding (rather than sleep looping on not-founds)
-- investigate strange gRPC bug that is currently papered over
-- allow services to override their mesh gateway modes
-- remove some of the debug prints of various things
diff --git a/testing/deployer/go.mod b/testing/deployer/go.mod
deleted file mode 100644
index df6cb924f0873..0000000000000
--- a/testing/deployer/go.mod
+++ /dev/null
@@ -1,47 +0,0 @@
-module github.com/hashicorp/consul/testing/deployer
-
-go 1.20
-
-require (
-	github.com/google/go-cmp v0.5.9
-	github.com/hashicorp/consul/api v1.24.0
-	github.com/hashicorp/consul/sdk v0.14.1
-	github.com/hashicorp/go-cleanhttp v0.5.2
-	github.com/hashicorp/go-hclog v1.5.0
-	github.com/hashicorp/go-multierror v1.1.1
-	github.com/hashicorp/hcl/v2 v2.16.2
-	github.com/mitchellh/copystructure v1.2.0
-	github.com/rboyer/safeio v0.2.2
-	github.com/stretchr/testify v1.8.3
-	golang.org/x/crypto v0.11.0
-)
-
-require (
-	github.com/agext/levenshtein v1.2.1 // indirect
-	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
-	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/fatih/color v1.14.1 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
-	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/hashicorp/go-version v1.2.1 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/hashicorp/serf v0.10.1 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/zclconf/go-cty v1.12.1 // indirect
-	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)
-
-replace github.com/hashicorp/consul/sdk => ../../sdk
diff --git a/testing/deployer/go.sum b/testing/deployer/go.sum
deleted file mode 100644
index fb90eb4a6a338..0000000000000
--- a/testing/deployer/go.sum
+++ /dev/null
@@ -1,244 +0,0 @@
-github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8=
-github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
-github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
-github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
-github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
-github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/hashicorp/consul/api v1.24.0 h1:u2XyStA2j0jnCiVUU7Qyrt8idjRn4ORhK6DlvZ3bWhA=
-github.com/hashicorp/consul/api v1.24.0/go.mod h1:NZJGRFYruc/80wYowkPFCp1LbGmJC9L8izrwfyVx/Wg=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
-github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
-github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
-github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
-github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
-github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/hcl/v2 v2.16.2 h1:mpkHZh/Tv+xet3sy3F9Ld4FyI2tUpWe9x3XtPx9f1a0=
-github.com/hashicorp/hcl/v2 v2.16.2/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
-github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM=
-github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
-github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
-github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
-github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
-github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
-github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
-github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
-github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
-github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/rboyer/safeio v0.2.2 h1:XhtqyUTRleMYGyBt3ni4j2BtEh669U2ry2INnnd+B4k=
-github.com/rboyer/safeio v0.2.2/go.mod h1:pSnr2LFXyn/c/fotxotyOdYy7pP/XSh6MpBmzXPjiNc=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/zclconf/go-cty v1.12.1 h1:PcupnljUm9EIvbgSHQnHhUr3fO6oFmkOrvs2BAFNXXY=
-github.com/zclconf/go-cty v1.12.1/go.mod h1:s9IfD1LK5ccNMSWCVFCE2rJfHiZgi7JijgeWIMfhLvA=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
-golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
-golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
-golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/testing/deployer/sprawl/acl.go b/testing/deployer/sprawl/acl.go
deleted file mode 100644
index 6196d94d46f9f..0000000000000
--- a/testing/deployer/sprawl/acl.go
+++ /dev/null
@@ -1,335 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawl
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/consul/api"
-
-	"github.com/hashicorp/consul/testing/deployer/sprawl/internal/secrets"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-)
-
-// TODO: fix this by checking that a token/policy works on ALL servers before
-// returning from create.
-func isACLNotFound(err error) bool {
-	if err == nil {
-		return false
-	}
-	return strings.Contains(err.Error(), `ACL not found`)
-}
-
-func (s *Sprawl) bootstrapACLs(cluster string) error {
-	var (
-		client    = s.clients[cluster]
-		logger    = s.logger.With("cluster", cluster)
-		mgmtToken = s.secrets.ReadGeneric(cluster, secrets.BootstrapToken)
-	)
-
-	ac := client.ACL()
-
-	if mgmtToken != "" {
-	NOT_BOOTED:
-		ready, err := s.isACLBootstrapped(cluster, client)
-		if err != nil {
-			return fmt.Errorf("error checking if the acl system is bootstrapped: %w", err)
-		} else if !ready {
-			logger.Warn("ACL system is not ready yet")
-			time.Sleep(250 * time.Millisecond)
-			goto NOT_BOOTED
-		}
-
-	TRYAGAIN:
-		// check to see if it works
-		_, _, err = ac.TokenReadSelf(&api.QueryOptions{Token: mgmtToken})
-		if err != nil {
-			if isACLNotBootstrapped(err) {
-				logger.Warn("system is rebooting", "error", err)
-				time.Sleep(250 * time.Millisecond)
-				goto TRYAGAIN
-			}
-
-			return fmt.Errorf("management token no longer works: %w", err)
-		}
-
-		logger.Debug("current management token", "token", mgmtToken)
-		return nil
-	}
-
-TRYAGAIN2:
-	logger.Info("bootstrapping ACLs")
-	tok, _, err := ac.Bootstrap()
-	if err != nil {
-		if isACLNotBootstrapped(err) {
-			logger.Debug("system is rebooting", "error", err)
-			time.Sleep(250 * time.Millisecond)
-			goto TRYAGAIN2
-		}
-		return err
-	}
-	mgmtToken = tok.SecretID
-	s.secrets.SaveGeneric(cluster, secrets.BootstrapToken, mgmtToken)
-
-	logger.Debug("current management token", "token", mgmtToken)
-
-	return nil
-
-}
-
-func isACLNotBootstrapped(err error) bool {
-	switch {
-	case strings.Contains(err.Error(), "ACL system must be bootstrapped before making any requests that require authorization"):
-		return true
-	case strings.Contains(err.Error(), "The ACL system is currently in legacy mode"):
-		return true
-	}
-	return false
-}
-
-func (s *Sprawl) isACLBootstrapped(cluster string, client *api.Client) (bool, error) {
-	policy, _, err := client.ACL().PolicyReadByName("global-management", &api.QueryOptions{
-		Token: s.secrets.ReadGeneric(cluster, secrets.BootstrapToken),
-	})
-	if err != nil {
-		if strings.Contains(err.Error(), "Unexpected response code: 403 (ACL not found)") {
-			return false, nil
-		} else if isACLNotBootstrapped(err) {
-			return false, nil
-		}
-		return false, err
-	}
-	return policy != nil, nil
-}
-
-func (s *Sprawl) createAnonymousToken(cluster *topology.Cluster) error {
-	var (
-		client = s.clients[cluster.Name]
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	if err := s.createAnonymousPolicy(cluster); err != nil {
-		return err
-	}
-
-	token, err := CreateOrUpdateToken(client, anonymousToken())
-	if err != nil {
-		return err
-	}
-
-	logger.Debug("created anonymous token",
-		"token", token.SecretID,
-	)
-
-	return nil
-}
-
-func (s *Sprawl) createAnonymousPolicy(cluster *topology.Cluster) error {
-	var (
-		client = s.clients[cluster.Name]
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	op, err := CreateOrUpdatePolicy(client, anonymousPolicy(cluster.Enterprise))
-	if err != nil {
-		return err
-	}
-
-	logger.Debug("created anonymous policy",
-		"policy-name", op.Name,
-		"policy-id", op.ID,
-	)
-
-	return nil
-}
-
-func (s *Sprawl) createAgentTokens(cluster *topology.Cluster) error {
-	var (
-		client = s.clients[cluster.Name]
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	for _, node := range cluster.Nodes {
-		// NOTE: always create tokens even for disabled nodes.
-		if !node.IsAgent() {
-			continue
-		}
-
-		if tok := s.secrets.ReadAgentToken(cluster.Name, node.ID()); tok == "" {
-			token, err := CreateOrUpdateToken(client, tokenForNode(node, cluster.Enterprise))
-			if err != nil {
-				return err
-			}
-
-			logger.Debug("created agent token",
-				"node", node.ID(),
-				"token", token.SecretID,
-			)
-
-			s.secrets.SaveAgentToken(cluster.Name, node.ID(), token.SecretID)
-		}
-	}
-
-	return nil
-}
-
-// Create a policy to allow super permissive catalog reads across namespace
-// boundaries.
-func (s *Sprawl) createCrossNamespaceCatalogReadPolicies(cluster *topology.Cluster, partition string) error {
-	if !cluster.Enterprise {
-		return nil
-	}
-
-	var (
-		client = s.clients[cluster.Name]
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	op, err := CreateOrUpdatePolicy(client, policyForCrossNamespaceRead(partition))
-	if err != nil {
-		return err
-	}
-
-	logger.Debug("created cross-ns-catalog-read policy",
-		"policy-name", op.Name,
-		"policy-id", op.ID,
-		"partition", partition,
-	)
-
-	return nil
-}
-
-func (s *Sprawl) createAllServiceTokens() error {
-	for _, cluster := range s.topology.Clusters {
-		if err := s.createServiceTokens(cluster); err != nil {
-			return fmt.Errorf("createServiceTokens[%s]: %w", cluster.Name, err)
-		}
-	}
-	return nil
-}
-
-func (s *Sprawl) createServiceTokens(cluster *topology.Cluster) error {
-	var (
-		client = s.clients[cluster.Name]
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	sids := make(map[topology.ServiceID]struct{})
-	for _, node := range cluster.Nodes {
-		if !node.RunsWorkloads() || len(node.Services) == 0 || node.Disabled {
-			continue
-		}
-
-		for _, svc := range node.Services {
-			sid := svc.ID
-
-			if _, done := sids[sid]; done {
-				continue
-			}
-
-			var overridePolicy *api.ACLPolicy
-			if svc.IsMeshGateway {
-				var err error
-				overridePolicy, err = CreateOrUpdatePolicy(client, policyForMeshGateway(svc, cluster.Enterprise))
-				if err != nil {
-					return fmt.Errorf("could not create policy: %w", err)
-				}
-			}
-
-			token, err := CreateOrUpdateToken(client, tokenForService(svc, overridePolicy, cluster.Enterprise))
-			if err != nil {
-				return fmt.Errorf("could not create token: %w", err)
-			}
-
-			logger.Debug("created service token",
-				"service", svc.ID.Name,
-				"namespace", svc.ID.Namespace,
-				"partition", svc.ID.Partition,
-				"token", token.SecretID,
-			)
-
-			s.secrets.SaveServiceToken(cluster.Name, sid, token.SecretID)
-
-			sids[sid] = struct{}{}
-		}
-	}
-
-	return nil
-}
-
-func CreateOrUpdateToken(client *api.Client, t *api.ACLToken) (*api.ACLToken, error) {
-	ac := client.ACL()
-
-	currentToken, err := getTokenByDescription(client, t.Description, &api.QueryOptions{
-		Partition: t.Partition,
-		Namespace: t.Namespace,
-	})
-	if err != nil {
-		return nil, err
-	} else if currentToken != nil {
-		t.AccessorID = currentToken.AccessorID
-		t.SecretID = currentToken.SecretID
-	}
-
-	if t.AccessorID != "" {
-		t, _, err = ac.TokenUpdate(t, nil)
-	} else {
-		t, _, err = ac.TokenCreate(t, nil)
-	}
-	if err != nil {
-		return nil, err
-	}
-	return t, nil
-}
-
-func getTokenByDescription(client *api.Client, description string, opts *api.QueryOptions) (*api.ACLToken, error) {
-	ac := client.ACL()
-	tokens, _, err := ac.TokenList(opts)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, tokenEntry := range tokens {
-		if tokenEntry.Description == description {
-			token, _, err := ac.TokenRead(tokenEntry.AccessorID, opts)
-			if err != nil {
-				return nil, err
-			}
-
-			return token, nil
-		}
-	}
-	return nil, nil
-}
-
-func CreateOrUpdatePolicy(client *api.Client, p *api.ACLPolicy) (*api.ACLPolicy, error) {
-	ac := client.ACL()
-
-	currentPolicy, _, err := ac.PolicyReadByName(p.Name, &api.QueryOptions{
-		Partition: p.Partition,
-		Namespace: p.Namespace,
-	})
-
-	// There is a quirk about Consul 1.14.x, where: if reading a policy yields
-	// an empty result, we return "ACL not found". It's safe to ignore this here,
-	// because if the Client's ACL token truly doesn't exist, then the create fails below.
-	if err != nil && !strings.Contains(err.Error(), "ACL not found") {
-		return nil, err
-	} else if currentPolicy != nil {
-		p.ID = currentPolicy.ID
-	}
-
-	if p.ID != "" {
-		p, _, err = ac.PolicyUpdate(p, nil)
-	} else {
-		p, _, err = ac.PolicyCreate(p, nil)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-	return p, nil
-}
diff --git a/testing/deployer/sprawl/acl_rules.go b/testing/deployer/sprawl/acl_rules.go
deleted file mode 100644
index 7c360d85f6103..0000000000000
--- a/testing/deployer/sprawl/acl_rules.go
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawl
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/api"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-)
-
-func policyForCrossNamespaceRead(partition string) *api.ACLPolicy {
-	return &api.ACLPolicy{
-		Name:        "cross-ns-catalog-read",
-		Description: "cross-ns-catalog-read",
-		Partition:   partition,
-		Rules: fmt.Sprintf(`
-partition %[1]q {
-  namespace_prefix "" {
-    node_prefix ""    { policy = "read" }
-    service_prefix "" { policy = "read" }
-  }
-}
-`, partition),
-	}
-}
-
-const anonymousTokenAccessorID = "00000000-0000-0000-0000-000000000002"
-
-func anonymousToken() *api.ACLToken {
-	return &api.ACLToken{
-		AccessorID: anonymousTokenAccessorID,
-		// SecretID: "anonymous",
-		Description: "anonymous",
-		Local:       false,
-		Policies: []*api.ACLTokenPolicyLink{
-			{
-				Name: "anonymous",
-			},
-		},
-	}
-}
-
-func anonymousPolicy(enterprise bool) *api.ACLPolicy {
-	p := &api.ACLPolicy{
-		Name:        "anonymous",
-		Description: "anonymous",
-	}
-	if enterprise {
-		p.Rules = `
-partition_prefix "" {
-  namespace_prefix "" {
-    node_prefix "" { policy = "read" }
-    service_prefix "" { policy = "read" }
-  }
-}
-`
-	} else {
-		p.Rules = `
-node_prefix "" { policy = "read" }
-service_prefix "" { policy = "read" }
-`
-	}
-	return p
-}
-
-func tokenForNode(node *topology.Node, enterprise bool) *api.ACLToken {
-	nid := node.ID()
-
-	tokenName := "agent--" + nid.ACLString()
-
-	token := &api.ACLToken{
-		Description: tokenName,
-		Local:       false,
-		NodeIdentities: []*api.ACLNodeIdentity{{
-			NodeName:   node.PodName(),
-			Datacenter: node.Datacenter,
-		}},
-	}
-	if enterprise {
-		token.Partition = node.Partition
-		token.Namespace = "default"
-	}
-	return token
-}
-
-func tokenForService(svc *topology.Service, overridePolicy *api.ACLPolicy, enterprise bool) *api.ACLToken {
-	token := &api.ACLToken{
-		Description: "service--" + svc.ID.ACLString(),
-		Local:       false,
-	}
-	if overridePolicy != nil {
-		token.Policies = []*api.ACLTokenPolicyLink{{ID: overridePolicy.ID}}
-	} else {
-		token.ServiceIdentities = []*api.ACLServiceIdentity{{
-			ServiceName: svc.ID.Name,
-		}}
-	}
-
-	if enterprise {
-		token.Namespace = svc.ID.Namespace
-		token.Partition = svc.ID.Partition
-	}
-
-	return token
-}
-
-const (
-	meshGatewayCommunityRules = `
-service "mesh-gateway" {
-  policy = "write"
-}
-service_prefix "" {
-  policy = "read"
-}
-node_prefix "" {
-  policy = "read"
-}
-agent_prefix "" {
-  policy = "read"
-}
-# for peering
-mesh = "write"
-peering = "read"
-`
-
-	meshGatewayEntDefaultRules = `
-namespace_prefix "" {
-  service "mesh-gateway" {
-    policy = "write"
-  }
-  service_prefix "" {
-    policy = "read"
-  }
-  node_prefix "" {
-    policy = "read"
-  }
-}
-agent_prefix "" {
-  policy = "read"
-}
-# for peering
-mesh = "write"
-
-partition_prefix "" {
-  peering = "read"
-}
-`
-
-	meshGatewayEntNonDefaultRules = `
-namespace_prefix "" {
-  service "mesh-gateway" {
-    policy = "write"
-  }
-  service_prefix "" {
-    policy = "read"
-  }
-  node_prefix "" {
-    policy = "read"
-  }
-}
-agent_prefix "" {
-  policy = "read"
-}
-# for peering
-mesh = "write"
-`
-)
-
-func policyForMeshGateway(svc *topology.Service, enterprise bool) *api.ACLPolicy {
-	policyName := "mesh-gateway--" + svc.ID.ACLString()
-
-	policy := &api.ACLPolicy{
-		Name:        policyName,
-		Description: policyName,
-	}
-	if enterprise {
-		policy.Partition = svc.ID.Partition
-		policy.Namespace = "default"
-	}
-
-	if enterprise {
-		if svc.ID.Partition == "default" {
-			policy.Rules = meshGatewayEntDefaultRules
-		} else {
-			policy.Rules = meshGatewayEntNonDefaultRules
-		}
-	} else {
-		policy.Rules = meshGatewayCommunityRules
-	}
-
-	return policy
-}
diff --git a/testing/deployer/sprawl/boot.go b/testing/deployer/sprawl/boot.go
deleted file mode 100644
index 89c887c7574ee..0000000000000
--- a/testing/deployer/sprawl/boot.go
+++ /dev/null
@@ -1,523 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawl
-
-import (
-	"context"
-	"crypto/rand"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/testing/deployer/sprawl/internal/build"
-	"github.com/hashicorp/consul/testing/deployer/sprawl/internal/secrets"
-	"github.com/hashicorp/consul/testing/deployer/sprawl/internal/tfgen"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/hashicorp/consul/testing/deployer/util"
-)
-
-const (
-	sharedBootstrapToken = "root"
-	// sharedBootstrapToken = "ec59aa56-1996-4ff1-911a-f5d782552a13"
-
-	sharedAgentRecoveryToken = "22082b05-05c9-4a0a-b3da-b9685ac1d688"
-)
-
-func (s *Sprawl) launch() error {
-	return s.launchType(true)
-}
-func (s *Sprawl) relaunch() error {
-	return s.launchType(false)
-}
-func (s *Sprawl) launchType(firstTime bool) (launchErr error) {
-	if err := build.DockerImages(s.logger, s.runner, s.topology); err != nil {
-		return fmt.Errorf("build.DockerImages: %w", err)
-	}
-
-	if firstTime {
-		// Initialize secrets the easy way for now (same in all clusters).
-		gossipKey, err := newGossipKey()
-		if err != nil {
-			return fmt.Errorf("newGossipKey: %w", err)
-		}
-		for _, cluster := range s.topology.Clusters {
-			s.secrets.SaveGeneric(cluster.Name, secrets.BootstrapToken, sharedBootstrapToken)
-			s.secrets.SaveGeneric(cluster.Name, secrets.AgentRecovery, sharedAgentRecoveryToken)
-			s.secrets.SaveGeneric(cluster.Name, secrets.GossipKey, gossipKey)
-
-			// Give servers a copy of the bootstrap token for use as their agent tokens
-			// to avoid complicating the chicken/egg situation for startup.
-			for _, node := range cluster.Nodes {
-				if node.IsServer() { // include disabled
-					s.secrets.SaveAgentToken(cluster.Name, node.ID(), sharedBootstrapToken)
-				}
-			}
-		}
-	}
-
-	var cleanupFuncs []func()
-	defer func() {
-		for i := len(cleanupFuncs) - 1; i >= 0; i-- {
-			cleanupFuncs[i]()
-		}
-	}()
-
-	if firstTime {
-		var err error
-		s.generator, err = tfgen.NewGenerator(
-			s.logger.Named("tfgen"),
-			s.runner,
-			s.topology,
-			&s.secrets,
-			s.workdir,
-			s.license,
-		)
-		if err != nil {
-			return err
-		}
-	} else {
-		s.generator.SetTopology(s.topology)
-	}
-	cleanupFuncs = append(cleanupFuncs, func() {
-		// Log the error before the cleanup so you don't have to wait to see
-		// the cause.
-		if launchErr != nil {
-			s.logger.Error("fatal error during launch", "error", launchErr)
-		}
-
-		_ = s.generator.DestroyAllQuietly()
-	})
-
-	if firstTime {
-		// The networking phase is special. We have to pick a random subnet and
-		// hope. Once we have this established once it is immutable for future
-		// runs.
-		if err := s.initNetworkingAndVolumes(); err != nil {
-			return fmt.Errorf("initNetworkingAndVolumes: %w", err)
-		}
-	}
-
-	if err := s.assignIPAddresses(); err != nil {
-		return fmt.Errorf("assignIPAddresses: %w", err)
-	}
-
-	// The previous terraform run should have made the special volume for us.
-	if err := s.initTLS(context.TODO()); err != nil {
-		return fmt.Errorf("initTLS: %w", err)
-	}
-
-	if firstTime {
-		if err := s.createFirstTime(); err != nil {
-			return err
-		}
-
-		s.generator.MarkLaunched()
-	} else {
-		if err := s.updateExisting(); err != nil {
-			return err
-		}
-	}
-
-	if err := s.waitForPeeringEstablishment(); err != nil {
-		return fmt.Errorf("waitForPeeringEstablishment: %w", err)
-	}
-
-	cleanupFuncs = nil // reset
-
-	return nil
-}
-
-func (s *Sprawl) Stop() error {
-	var merr error
-	if s.generator != nil {
-		if err := s.generator.DestroyAllQuietly(); err != nil {
-			merr = multierror.Append(merr, err)
-		}
-	}
-	return merr
-}
-
-const dockerOutOfNetworksErrorMessage = `Unable to create network: Error response from daemon: Pool overlaps with other one on this address space`
-
-var ErrDockerNetworkCollision = errors.New("could not create one or more docker networks for use due to subnet collision")
-
-func (s *Sprawl) initNetworkingAndVolumes() error {
-	var lastErr error
-	for attempts := 0; attempts < 5; attempts++ {
-		err := s.generator.Generate(tfgen.StepNetworks)
-		if err != nil && strings.Contains(err.Error(), dockerOutOfNetworksErrorMessage) {
-			lastErr = ErrDockerNetworkCollision
-			s.logger.Warn(ErrDockerNetworkCollision.Error()+"; retrying", "attempt", attempts+1)
-			time.Sleep(1 * time.Second)
-			continue
-		} else if err != nil {
-			return fmt.Errorf("generator[networks]: %w", err)
-		}
-		return nil
-	}
-
-	return lastErr
-}
-
-func (s *Sprawl) assignIPAddresses() error {
-	// assign ips now that we have network ips known to us
-	for _, net := range s.topology.Networks {
-		if len(net.IPPool) == 0 {
-			return fmt.Errorf("network %q does not have any ip assignments", net.Name)
-		}
-	}
-	for _, cluster := range s.topology.Clusters {
-		for _, node := range cluster.Nodes {
-			for _, addr := range node.Addresses {
-				net, ok := s.topology.Networks[addr.Network]
-				if !ok {
-					return fmt.Errorf("unknown network %q", addr.Network)
-				}
-				addr.IPAddress = net.IPByIndex(node.Index)
-			}
-		}
-	}
-
-	return nil
-}
-
-func (s *Sprawl) initConsulServers() error {
-	if err := s.generator.Generate(tfgen.StepServers); err != nil {
-		return fmt.Errorf("generator[servers]: %w", err)
-	}
-
-	// s.logger.Info("ALL", "t", jd(s.topology)) // TODO
-
-	// Create token-less api clients first.
-	for _, cluster := range s.topology.Clusters {
-		node := cluster.FirstServer()
-
-		var err error
-		s.clients[cluster.Name], err = util.ProxyAPIClient(
-			node.LocalProxyPort(),
-			node.LocalAddress(),
-			8500,
-			"", /*no token yet*/
-		)
-		if err != nil {
-			return fmt.Errorf("error creating initial bootstrap client for cluster=%s: %w", cluster.Name, err)
-		}
-	}
-
-	if err := s.rejoinAllConsulServers(); err != nil {
-		return err
-	}
-
-	for _, cluster := range s.topology.Clusters {
-		err := s.bootstrapACLs(cluster.Name)
-		if err != nil {
-			return fmt.Errorf("bootstrap[%s]: %w", cluster.Name, err)
-		}
-
-		mgmtToken := s.secrets.ReadGeneric(cluster.Name, secrets.BootstrapToken)
-
-		// Reconfigure the clients to use a management token.
-		node := cluster.FirstServer()
-		s.clients[cluster.Name], err = util.ProxyAPIClient(
-			node.LocalProxyPort(),
-			node.LocalAddress(),
-			8500,
-			mgmtToken,
-		)
-		if err != nil {
-			return fmt.Errorf("error creating final client for cluster=%s: %v", cluster.Name, err)
-		}
-
-		// For some reason the grpc resolver stuff for partitions takes some
-		// time to get ready.
-		s.waitForLocalWrites(cluster, mgmtToken)
-
-		// Create tenancies so that the ACL tokens and clients have somewhere to go.
-		if cluster.Enterprise {
-			if err := s.initTenancies(cluster); err != nil {
-				return fmt.Errorf("initTenancies[%s]: %w", cluster.Name, err)
-			}
-		}
-
-		if err := s.populateInitialConfigEntries(cluster); err != nil {
-			return fmt.Errorf("populateInitialConfigEntries[%s]: %w", cluster.Name, err)
-		}
-
-		if err := s.createAnonymousToken(cluster); err != nil {
-			return fmt.Errorf("createAnonymousToken[%s]: %w", cluster.Name, err)
-		}
-
-		// Create tokens for all of the agents to use for anti-entropy.
-		//
-		// NOTE: this will cause the servers to roll to pick up the change to
-		// the acl{tokens{agent=XXX}}} section.
-		if err := s.createAgentTokens(cluster); err != nil {
-			return fmt.Errorf("createAgentTokens[%s]: %w", cluster.Name, err)
-		}
-	}
-
-	return nil
-}
-
-func (s *Sprawl) createFirstTime() error {
-	if err := s.initConsulServers(); err != nil {
-		return fmt.Errorf("initConsulServers: %w", err)
-	}
-
-	if err := s.generator.Generate(tfgen.StepAgents); err != nil {
-		return fmt.Errorf("generator[agents]: %w", err)
-	}
-	for _, cluster := range s.topology.Clusters {
-		if err := s.waitForClientAntiEntropyOnce(cluster); err != nil {
-			return fmt.Errorf("waitForClientAntiEntropyOnce[%s]: %w", cluster.Name, err)
-		}
-	}
-
-	// Ideally we start services WITH a token initially, so we pre-create them
-	// before running terraform for them.
-	if err := s.createAllServiceTokens(); err != nil {
-		return fmt.Errorf("createAllServiceTokens: %w", err)
-	}
-
-	if err := s.registerAllServicesForDataplaneInstances(); err != nil {
-		return fmt.Errorf("registerAllServicesForDataplaneInstances: %w", err)
-	}
-
-	// We can do this ahead, because we've incrementally run terraform as
-	// we went.
-	if err := s.registerAllServicesToAgents(); err != nil {
-		return fmt.Errorf("registerAllServicesToAgents: %w", err)
-	}
-
-	// NOTE: start services WITH token initially
-	if err := s.generator.Generate(tfgen.StepServices); err != nil {
-		return fmt.Errorf("generator[services]: %w", err)
-	}
-
-	if err := s.initPeerings(); err != nil {
-		return fmt.Errorf("initPeerings: %w", err)
-	}
-	return nil
-}
-
-func (s *Sprawl) updateExisting() error {
-	if err := s.preRegenTasks(); err != nil {
-		return fmt.Errorf("preRegenTasks: %w", err)
-	}
-
-	// We save all of the terraform to the end. Some of the containers will
-	// be a little broken until we can do stuff like register services to
-	// new agents, which we cannot do until they come up.
-	if err := s.generator.Generate(tfgen.StepRelaunch); err != nil {
-		return fmt.Errorf("generator[relaunch]: %w", err)
-	}
-
-	if err := s.postRegenTasks(); err != nil {
-		return fmt.Errorf("postRegenTasks: %w", err)
-	}
-
-	// TODO: enforce that peering relationships cannot change
-	// TODO: include a fixup version of new peerings?
-
-	return nil
-}
-
-func (s *Sprawl) preRegenTasks() error {
-	for _, cluster := range s.topology.Clusters {
-		// Create tenancies so that the ACL tokens and clients have somewhere to go.
-		if cluster.Enterprise {
-			if err := s.initTenancies(cluster); err != nil {
-				return fmt.Errorf("initTenancies[%s]: %w", cluster.Name, err)
-			}
-		}
-
-		if err := s.populateInitialConfigEntries(cluster); err != nil {
-			return fmt.Errorf("populateInitialConfigEntries[%s]: %w", cluster.Name, err)
-		}
-
-		// Create tokens for all of the agents to use for anti-entropy.
-		if err := s.createAgentTokens(cluster); err != nil {
-			return fmt.Errorf("createAgentTokens[%s]: %w", cluster.Name, err)
-		}
-	}
-
-	// Ideally we start services WITH a token initially, so we pre-create them
-	// before running terraform for them.
-	if err := s.createAllServiceTokens(); err != nil {
-		return fmt.Errorf("createAllServiceTokens: %w", err)
-	}
-
-	if err := s.registerAllServicesForDataplaneInstances(); err != nil {
-		return fmt.Errorf("registerAllServicesForDataplaneInstances: %w", err)
-	}
-
-	return nil
-}
-
-func (s *Sprawl) postRegenTasks() error {
-	if err := s.rejoinAllConsulServers(); err != nil {
-		return err
-	}
-
-	for _, cluster := range s.topology.Clusters {
-		var err error
-
-		mgmtToken := s.secrets.ReadGeneric(cluster.Name, secrets.BootstrapToken)
-
-		// Reconfigure the clients to use a management token.
-		node := cluster.FirstServer()
-		s.clients[cluster.Name], err = util.ProxyAPIClient(
-			node.LocalProxyPort(),
-			node.LocalAddress(),
-			8500,
-			mgmtToken,
-		)
-		if err != nil {
-			return fmt.Errorf("error creating final client for cluster=%s: %v", cluster.Name, err)
-		}
-
-		s.waitForLeader(cluster)
-
-		// For some reason the grpc resolver stuff for partitions takes some
-		// time to get ready.
-		s.waitForLocalWrites(cluster, mgmtToken)
-	}
-
-	for _, cluster := range s.topology.Clusters {
-		if err := s.waitForClientAntiEntropyOnce(cluster); err != nil {
-			return fmt.Errorf("waitForClientAntiEntropyOnce[%s]: %w", cluster.Name, err)
-		}
-	}
-
-	if err := s.registerAllServicesToAgents(); err != nil {
-		return fmt.Errorf("registerAllServicesToAgents: %w", err)
-	}
-
-	return nil
-}
-
-func (s *Sprawl) waitForLocalWrites(cluster *topology.Cluster, token string) {
-	var (
-		client = s.clients[cluster.Name]
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-	tryKV := func() error {
-		_, err := client.KV().Put(&api.KVPair{
-			Key:   "local-test",
-			Value: []byte("payload-for-local-test-in-" + cluster.Name),
-		}, nil)
-		return err
-	}
-	tryAP := func() error {
-		if !cluster.Enterprise {
-			return nil
-		}
-		_, _, err := client.Partitions().Create(context.Background(), &api.Partition{
-			Name: "placeholder",
-		}, &api.WriteOptions{Token: token})
-		return err
-	}
-
-	start := time.Now()
-	for attempts := 0; ; attempts++ {
-		if err := tryKV(); err != nil {
-			logger.Debug("local kv write failed; something is not ready yet", "error", err)
-			time.Sleep(500 * time.Millisecond)
-			continue
-		} else {
-			dur := time.Since(start)
-			logger.Debug("local kv write success", "elapsed", dur, "retries", attempts)
-		}
-
-		break
-	}
-
-	if cluster.Enterprise {
-		start = time.Now()
-		for attempts := 0; ; attempts++ {
-			if err := tryAP(); err != nil {
-				logger.Debug("local partition write failed; something is not ready yet", "error", err)
-				time.Sleep(500 * time.Millisecond)
-				continue
-			} else {
-				dur := time.Since(start)
-				logger.Debug("local partition write success", "elapsed", dur, "retries", attempts)
-			}
-
-			break
-		}
-	}
-}
-
-func (s *Sprawl) waitForClientAntiEntropyOnce(cluster *topology.Cluster) error {
-	var (
-		client = s.clients[cluster.Name]
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	var (
-		queryOptionList = cluster.PartitionQueryOptionsList()
-		start           = time.Now()
-		cc              = client.Catalog()
-	)
-	for {
-		// Enumerate all of the nodes that are currently in the catalog. This
-		// will overmatch including things like fake nodes for agentless but
-		// that's ok.
-		current := make(map[topology.NodeID]*api.Node)
-		for _, queryOpts := range queryOptionList {
-			nodes, _, err := cc.Nodes(queryOpts)
-			if err != nil {
-				return err
-			}
-			for _, node := range nodes {
-				nid := topology.NewNodeID(node.Node, node.Partition)
-				current[nid] = node
-			}
-		}
-
-		// See if we have them all.
-		var stragglers []topology.NodeID
-		for _, node := range cluster.Nodes {
-			if !node.IsAgent() || node.Disabled {
-				continue
-			}
-			nid := node.CatalogID()
-
-			got, ok := current[nid]
-			if ok && len(got.TaggedAddresses) > 0 {
-				// this is a field that is not updated just due to serf reconcile
-				continue
-			}
-
-			stragglers = append(stragglers, nid)
-		}
-
-		if len(stragglers) == 0 {
-			dur := time.Since(start)
-			logger.Debug("all nodes have posted node updates, so first anti-entropy has happened", "elapsed", dur)
-			return nil
-		}
-		logger.Debug("not all client nodes have posted node updates yet", "nodes", stragglers)
-
-		time.Sleep(1 * time.Second)
-	}
-}
-
-func newGossipKey() (string, error) {
-	key := make([]byte, 16)
-	n, err := rand.Reader.Read(key)
-	if err != nil {
-		return "", fmt.Errorf("Error reading random data: %s", err)
-	}
-	if n != 16 {
-		return "", fmt.Errorf("Couldn't read enough entropy. Generate more entropy!")
-	}
-	return base64.StdEncoding.EncodeToString(key), nil
-}
diff --git a/testing/deployer/sprawl/catalog.go b/testing/deployer/sprawl/catalog.go
deleted file mode 100644
index fc5d2dbc399d5..0000000000000
--- a/testing/deployer/sprawl/catalog.go
+++ /dev/null
@@ -1,460 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawl
-
-import (
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/hashicorp/consul/api"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/hashicorp/consul/testing/deployer/util"
-)
-
-func (s *Sprawl) registerAllServicesToAgents() error {
-	for _, cluster := range s.topology.Clusters {
-		if err := s.registerServicesToAgents(cluster); err != nil {
-			return fmt.Errorf("registerServicesToAgents[%s]: %w", cluster.Name, err)
-		}
-	}
-	return nil
-}
-
-func (s *Sprawl) registerAllServicesForDataplaneInstances() error {
-	for _, cluster := range s.topology.Clusters {
-		if err := s.registerServicesForDataplaneInstances(cluster); err != nil {
-			return fmt.Errorf("registerServicesForDataplaneInstances[%s]: %w", cluster.Name, err)
-		}
-	}
-	return nil
-}
-
-func (s *Sprawl) registerServicesToAgents(cluster *topology.Cluster) error {
-	for _, node := range cluster.Nodes {
-		if !node.RunsWorkloads() || len(node.Services) == 0 || node.Disabled {
-			continue
-		}
-
-		if !node.IsAgent() {
-			continue
-		}
-
-		agentClient, err := util.ProxyAPIClient(
-			node.LocalProxyPort(),
-			node.LocalAddress(),
-			8500,
-			"", /*token will be in request*/
-		)
-		if err != nil {
-			return err
-		}
-
-		for _, svc := range node.Services {
-			if err := s.registerAgentService(agentClient, cluster, node, svc); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func (s *Sprawl) registerAgentService(
-	agentClient *api.Client,
-	cluster *topology.Cluster,
-	node *topology.Node,
-	svc *topology.Service,
-) error {
-	if !node.IsAgent() {
-		panic("called wrong method type")
-	}
-
-	if svc.IsMeshGateway {
-		return nil // handled at startup time for agent-full, but won't be for agent-less
-	}
-
-	var (
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	reg := &api.AgentServiceRegistration{
-		ID:   svc.ID.Name,
-		Name: svc.ID.Name,
-		Port: svc.Port,
-		Meta: svc.Meta,
-	}
-	if cluster.Enterprise {
-		reg.Namespace = svc.ID.Namespace
-		reg.Partition = svc.ID.Partition
-	}
-
-	if !svc.DisableServiceMesh {
-		var upstreams []api.Upstream
-		for _, u := range svc.Upstreams {
-			uAPI := api.Upstream{
-				DestinationPeer:  u.Peer,
-				DestinationName:  u.ID.Name,
-				LocalBindAddress: u.LocalAddress,
-				LocalBindPort:    u.LocalPort,
-				// Config               map[string]interface{} `json:",omitempty" bexpr:"-"`
-				// MeshGateway          MeshGatewayConfig      `json:",omitempty"`
-			}
-			if cluster.Enterprise {
-				uAPI.DestinationNamespace = u.ID.Namespace
-				if u.Peer == "" {
-					uAPI.DestinationPartition = u.ID.Partition
-				}
-			}
-			upstreams = append(upstreams, uAPI)
-		}
-		reg.Connect = &api.AgentServiceConnect{
-			SidecarService: &api.AgentServiceRegistration{
-				Proxy: &api.AgentServiceConnectProxyConfig{
-					Upstreams: upstreams,
-				},
-			},
-		}
-	}
-
-	switch {
-	case svc.CheckTCP != "":
-		chk := &api.AgentServiceCheck{
-			Name:     "up",
-			TCP:      svc.CheckTCP,
-			Interval: "5s",
-			Timeout:  "1s",
-		}
-		reg.Checks = append(reg.Checks, chk)
-	case svc.CheckHTTP != "":
-		chk := &api.AgentServiceCheck{
-			Name:     "up",
-			HTTP:     svc.CheckHTTP,
-			Method:   "GET",
-			Interval: "5s",
-			Timeout:  "1s",
-		}
-		reg.Checks = append(reg.Checks, chk)
-	}
-
-	// Switch token for every request.
-	hdr := make(http.Header)
-	hdr.Set("X-Consul-Token", s.secrets.ReadServiceToken(cluster.Name, svc.ID))
-	agentClient.SetHeaders(hdr)
-
-RETRY:
-	if err := agentClient.Agent().ServiceRegister(reg); err != nil {
-		if isACLNotFound(err) {
-			time.Sleep(50 * time.Millisecond)
-			goto RETRY
-		}
-		return fmt.Errorf("failed to register service %q to node %q: %w", svc.ID, node.ID(), err)
-	}
-
-	logger.Debug("registered service to client agent",
-		"service", svc.ID.Name,
-		"node", node.Name,
-		"namespace", svc.ID.Namespace,
-		"partition", svc.ID.Partition,
-	)
-
-	return nil
-}
-
-func (s *Sprawl) registerServicesForDataplaneInstances(cluster *topology.Cluster) error {
-	for _, node := range cluster.Nodes {
-		if !node.RunsWorkloads() || len(node.Services) == 0 || node.Disabled {
-			continue
-		}
-
-		if !node.IsDataplane() {
-			continue
-		}
-
-		if err := s.registerCatalogNode(cluster, node); err != nil {
-			return fmt.Errorf("error registering virtual node: %w", err)
-		}
-
-		for _, svc := range node.Services {
-			if err := s.registerCatalogService(cluster, node, svc); err != nil {
-				return fmt.Errorf("error registering service: %w", err)
-			}
-			if !svc.DisableServiceMesh {
-				if err := s.registerCatalogSidecarService(cluster, node, svc); err != nil {
-					return fmt.Errorf("error registering sidecar service: %w", err)
-				}
-			}
-		}
-	}
-
-	return nil
-}
-
-func (s *Sprawl) registerCatalogNode(
-	cluster *topology.Cluster,
-	node *topology.Node,
-) error {
-	if !node.IsDataplane() {
-		panic("called wrong method type")
-	}
-
-	var (
-		client = s.clients[cluster.Name]
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	reg := &api.CatalogRegistration{
-		Node:    node.PodName(),
-		Address: node.LocalAddress(),
-		NodeMeta: map[string]string{
-			"dataplane-faux": "1",
-		},
-	}
-	if cluster.Enterprise {
-		reg.Partition = node.Partition
-	}
-
-	// register synthetic node
-RETRY:
-	if _, err := client.Catalog().Register(reg, nil); err != nil {
-		if isACLNotFound(err) {
-			time.Sleep(50 * time.Millisecond)
-			goto RETRY
-		}
-		return fmt.Errorf("error registering virtual node %s: %w", node.ID(), err)
-	}
-
-	logger.Debug("virtual node created",
-		"node", node.ID(),
-	)
-
-	return nil
-}
-
-func (s *Sprawl) registerCatalogService(
-	cluster *topology.Cluster,
-	node *topology.Node,
-	svc *topology.Service,
-) error {
-	if !node.IsDataplane() {
-		panic("called wrong method type")
-	}
-
-	var (
-		client = s.clients[cluster.Name]
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	reg := serviceToCatalogRegistration(cluster, node, svc)
-
-RETRY:
-	if _, err := client.Catalog().Register(reg, nil); err != nil {
-		if isACLNotFound(err) {
-			time.Sleep(50 * time.Millisecond)
-			goto RETRY
-		}
-		return fmt.Errorf("error registering service %s to node %s: %w", svc.ID, node.ID(), err)
-	}
-
-	logger.Debug("dataplane service created",
-		"service", svc.ID,
-		"node", node.ID(),
-	)
-
-	return nil
-}
-
-func (s *Sprawl) registerCatalogSidecarService(
-	cluster *topology.Cluster,
-	node *topology.Node,
-	svc *topology.Service,
-) error {
-	if !node.IsDataplane() {
-		panic("called wrong method type")
-	}
-	if svc.DisableServiceMesh {
-		panic("not valid")
-	}
-
-	var (
-		client = s.clients[cluster.Name]
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	pid, reg := serviceToSidecarCatalogRegistration(cluster, node, svc)
-RETRY:
-	if _, err := client.Catalog().Register(reg, nil); err != nil {
-		if isACLNotFound(err) {
-			time.Sleep(50 * time.Millisecond)
-			goto RETRY
-		}
-		return fmt.Errorf("error registering service %s to node %s: %w", svc.ID, node.ID(), err)
-	}
-
-	logger.Debug("dataplane sidecar service created",
-		"service", pid,
-		"node", node.ID(),
-	)
-
-	return nil
-}
-
-func serviceToCatalogRegistration(
-	cluster *topology.Cluster,
-	node *topology.Node,
-	svc *topology.Service,
-) *api.CatalogRegistration {
-	reg := &api.CatalogRegistration{
-		Node:           node.PodName(),
-		SkipNodeUpdate: true,
-		Service: &api.AgentService{
-			Kind:    api.ServiceKindTypical,
-			ID:      svc.ID.Name,
-			Service: svc.ID.Name,
-			Meta:    svc.Meta,
-			Port:    svc.Port,
-			Address: node.LocalAddress(),
-		},
-	}
-	if svc.IsMeshGateway {
-		reg.Service.Kind = api.ServiceKindMeshGateway
-		reg.Service.Proxy = &api.AgentServiceConnectProxyConfig{
-			Config: map[string]interface{}{
-				"envoy_gateway_no_default_bind":       true,
-				"envoy_gateway_bind_tagged_addresses": true,
-			},
-			MeshGateway: api.MeshGatewayConfig{
-				Mode: api.MeshGatewayModeLocal,
-			},
-		}
-	}
-	if node.HasPublicAddress() {
-		reg.TaggedAddresses = map[string]string{
-			"lan":      node.LocalAddress(),
-			"lan_ipv4": node.LocalAddress(),
-			"wan":      node.PublicAddress(),
-			"wan_ipv4": node.PublicAddress(),
-		}
-		// TODO: not sure what the difference is between these, but with just the
-		// top-level set, it appeared to not get set in either :/
-		reg.Service.TaggedAddresses = map[string]api.ServiceAddress{
-			"lan": {
-				Address: node.LocalAddress(),
-				Port:    svc.Port,
-			},
-			"lan_ipv4": {
-				Address: node.LocalAddress(),
-				Port:    svc.Port,
-			},
-			"wan": {
-				Address: node.PublicAddress(),
-				Port:    svc.Port,
-			},
-			"wan_ipv4": {
-				Address: node.PublicAddress(),
-				Port:    svc.Port,
-			},
-		}
-	}
-	if cluster.Enterprise {
-		reg.Partition = svc.ID.Partition
-		reg.Service.Namespace = svc.ID.Namespace
-		reg.Service.Partition = svc.ID.Partition
-	}
-
-	if svc.HasCheck() {
-		chk := &api.HealthCheck{
-			Name: "external sync",
-			// Type:      "external-sync",
-			Status:      "passing", //  TODO
-			ServiceID:   svc.ID.Name,
-			ServiceName: svc.ID.Name,
-			Output:      "",
-		}
-		if cluster.Enterprise {
-			chk.Namespace = svc.ID.Namespace
-			chk.Partition = svc.ID.Partition
-		}
-		switch {
-		case svc.CheckTCP != "":
-			chk.Definition.TCP = svc.CheckTCP
-		case svc.CheckHTTP != "":
-			chk.Definition.HTTP = svc.CheckHTTP
-			chk.Definition.Method = "GET"
-		}
-		reg.Checks = append(reg.Checks, chk)
-	}
-	return reg
-}
-
-func serviceToSidecarCatalogRegistration(
-	cluster *topology.Cluster,
-	node *topology.Node,
-	svc *topology.Service,
-) (topology.ServiceID, *api.CatalogRegistration) {
-	pid := svc.ID
-	pid.Name += "-sidecar-proxy"
-	reg := &api.CatalogRegistration{
-		Node:           node.PodName(),
-		SkipNodeUpdate: true,
-		Service: &api.AgentService{
-			Kind:    api.ServiceKindConnectProxy,
-			ID:      pid.Name,
-			Service: pid.Name,
-			Meta:    svc.Meta,
-			Port:    svc.EnvoyPublicListenerPort,
-			Address: node.LocalAddress(),
-			Proxy: &api.AgentServiceConnectProxyConfig{
-				DestinationServiceName: svc.ID.Name,
-				DestinationServiceID:   svc.ID.Name,
-				LocalServicePort:       svc.Port,
-			},
-		},
-		Checks: []*api.HealthCheck{{
-			Name: "external sync",
-			// Type:      "external-sync",
-			Status:      "passing", //  TODO
-			ServiceID:   pid.Name,
-			ServiceName: pid.Name,
-			Definition: api.HealthCheckDefinition{
-				TCP: fmt.Sprintf("%s:%d", node.LocalAddress(), svc.EnvoyPublicListenerPort),
-			},
-			Output: "",
-		}},
-	}
-	if node.HasPublicAddress() {
-		reg.TaggedAddresses = map[string]string{
-			"lan":      node.LocalAddress(),
-			"lan_ipv4": node.LocalAddress(),
-			"wan":      node.PublicAddress(),
-			"wan_ipv4": node.PublicAddress(),
-		}
-	}
-	if cluster.Enterprise {
-		reg.Partition = pid.Partition
-		reg.Service.Namespace = pid.Namespace
-		reg.Service.Partition = pid.Partition
-		reg.Checks[0].Namespace = pid.Namespace
-		reg.Checks[0].Partition = pid.Partition
-	}
-
-	for _, u := range svc.Upstreams {
-		pu := api.Upstream{
-			DestinationName:  u.ID.Name,
-			DestinationPeer:  u.Peer,
-			LocalBindAddress: u.LocalAddress,
-			LocalBindPort:    u.LocalPort,
-		}
-		if cluster.Enterprise {
-			pu.DestinationNamespace = u.ID.Namespace
-			if u.Peer == "" {
-				pu.DestinationPartition = u.ID.Partition
-			}
-		}
-		reg.Service.Proxy.Upstreams = append(reg.Service.Proxy.Upstreams, pu)
-	}
-
-	return pid, reg
-}
diff --git a/testing/deployer/sprawl/configentries.go b/testing/deployer/sprawl/configentries.go
deleted file mode 100644
index b22a22aeaecf9..0000000000000
--- a/testing/deployer/sprawl/configentries.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawl
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/consul/api"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-)
-
-func (s *Sprawl) populateInitialConfigEntries(cluster *topology.Cluster) error {
-	if len(cluster.InitialConfigEntries) == 0 {
-		return nil
-	}
-
-	var (
-		client = s.clients[cluster.Name]
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	for _, ce := range cluster.InitialConfigEntries {
-		_, _, err := client.ConfigEntries().Set(ce, nil)
-		if err != nil {
-			if ce.GetKind() == api.ServiceIntentions && strings.Contains(err.Error(), intentionsMigrationError) {
-				logger.Warn("known error writing initial config entry; trying again",
-					"kind", ce.GetKind(),
-					"name", ce.GetName(),
-					"namespace", ce.GetNamespace(),
-					"partition", ce.GetPartition(),
-					"error", err,
-				)
-
-				time.Sleep(500 * time.Millisecond)
-				continue
-			}
-			return fmt.Errorf(
-				"error persisting config entry kind=%q name=%q namespace=%q partition=%q: %w",
-				ce.GetKind(),
-				ce.GetName(),
-				ce.GetNamespace(),
-				ce.GetPartition(),
-				err,
-			)
-		}
-		logger.Debug("wrote initial config entry",
-			"kind", ce.GetKind(),
-			"name", ce.GetName(),
-			"namespace", ce.GetNamespace(),
-			"partition", ce.GetPartition(),
-		)
-	}
-
-	return nil
-}
-
-const intentionsMigrationError = `Intentions are read only while being upgraded to config entries`
diff --git a/testing/deployer/sprawl/consul.go b/testing/deployer/sprawl/consul.go
deleted file mode 100644
index 2693135784153..0000000000000
--- a/testing/deployer/sprawl/consul.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawl
-
-import (
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/hashicorp/consul/api"
-
-	"github.com/hashicorp/consul/testing/deployer/sprawl/internal/secrets"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/hashicorp/consul/testing/deployer/util"
-)
-
-func getLeader(client *api.Client) (string, error) {
-	leaderAdd, err := client.Status().Leader()
-	if err != nil {
-		return "", fmt.Errorf("could not query leader: %w", err)
-	}
-	if leaderAdd == "" {
-		return "", errors.New("no leader available")
-	}
-	return leaderAdd, nil
-}
-
-func (s *Sprawl) waitForLeader(cluster *topology.Cluster) {
-	var (
-		client = s.clients[cluster.Name]
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-	logger.Info("waiting for cluster to elect leader")
-	for {
-		leader, err := client.Status().Leader()
-		if leader != "" && err == nil {
-			logger.Info("cluster has leader", "leader_addr", leader)
-			return
-		}
-		logger.Debug("cluster has no leader yet", "error", err)
-		time.Sleep(500 * time.Millisecond)
-	}
-}
-
-func (s *Sprawl) rejoinAllConsulServers() error {
-	// Join the servers together.
-	for _, cluster := range s.topology.Clusters {
-		if err := s.rejoinServers(cluster); err != nil {
-			return fmt.Errorf("rejoinServers[%s]: %w", cluster.Name, err)
-		}
-		s.waitForLeader(cluster)
-	}
-	return nil
-}
-
-func (s *Sprawl) rejoinServers(cluster *topology.Cluster) error {
-	var (
-		// client = s.clients[cluster.Name]
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	servers := cluster.ServerNodes()
-
-	recoveryToken := s.secrets.ReadGeneric(cluster.Name, secrets.AgentRecovery)
-
-	node0, rest := servers[0], servers[1:]
-	client, err := util.ProxyNotPooledAPIClient(
-		node0.LocalProxyPort(),
-		node0.LocalAddress(),
-		8500,
-		recoveryToken,
-	)
-	if err != nil {
-		return fmt.Errorf("could not get client for %q: %w", node0.ID(), err)
-	}
-
-	logger.Info("joining servers together",
-		"from", node0.ID(),
-		"rest", nodeSliceToNodeIDSlice(rest),
-	)
-	for _, node := range rest {
-		for {
-			err = client.Agent().Join(node.LocalAddress(), false)
-			if err == nil {
-				break
-			}
-			logger.Warn("could not join", "from", node0.ID(), "to", node.ID(), "error", err)
-			time.Sleep(500 * time.Millisecond)
-		}
-	}
-
-	return nil
-}
-
-func nodeSliceToNodeIDSlice(nodes []*topology.Node) []topology.NodeID {
-	var out []topology.NodeID
-	for _, node := range nodes {
-		out = append(out, node.ID())
-	}
-	return out
-}
diff --git a/testing/deployer/sprawl/debug.go b/testing/deployer/sprawl/debug.go
deleted file mode 100644
index df11f96c3c8b6..0000000000000
--- a/testing/deployer/sprawl/debug.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawl
-
-import "encoding/json"
-
-func jd(v any) string {
-	b, _ := json.MarshalIndent(v, "", "  ")
-	return string(b)
-}
diff --git a/testing/deployer/sprawl/details.go b/testing/deployer/sprawl/details.go
deleted file mode 100644
index c463d310d873c..0000000000000
--- a/testing/deployer/sprawl/details.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawl
-
-import (
-	"bytes"
-	"fmt"
-	"sort"
-	"strconv"
-	"strings"
-	"text/tabwriter"
-)
-
-// PrintDetails will dump relevant addressing and naming data to the logger for
-// human interaction purposes.
-func (s *Sprawl) PrintDetails() error {
-	det := logDetails{
-		TopologyID: s.topology.ID,
-	}
-
-	for _, cluster := range s.topology.Clusters {
-		client := s.clients[cluster.Name]
-
-		cfg, err := client.Operator().RaftGetConfiguration(nil)
-		if err != nil {
-			return fmt.Errorf("could not get raft config for cluster %q: %w", cluster.Name, err)
-		}
-
-		var leaderNode string
-		for _, svr := range cfg.Servers {
-			if svr.Leader {
-				leaderNode = strings.TrimSuffix(svr.Node, "-pod")
-			}
-		}
-
-		cd := clusterDetails{
-			Name:   cluster.Name,
-			Leader: leaderNode,
-		}
-
-		for _, node := range cluster.Nodes {
-			if node.Disabled {
-				continue
-			}
-
-			var addrs []string
-			for _, addr := range node.Addresses {
-				addrs = append(addrs, addr.Network+"="+addr.IPAddress)
-			}
-			sort.Strings(addrs)
-
-			if node.IsServer() {
-				cd.Apps = append(cd.Apps, appDetail{
-					Type:        "server",
-					Container:   node.DockerName(),
-					Addresses:   addrs,
-					ExposedPort: node.ExposedPort(8500),
-				})
-			}
-
-			for _, svc := range node.Services {
-				if svc.IsMeshGateway {
-					cd.Apps = append(cd.Apps, appDetail{
-						Type:                  "mesh-gateway",
-						Container:             node.DockerName(),
-						ExposedPort:           node.ExposedPort(svc.Port),
-						ExposedEnvoyAdminPort: node.ExposedPort(svc.EnvoyAdminPort),
-						Addresses:             addrs,
-						Service:               svc.ID.String(),
-					})
-				} else {
-					cd.Apps = append(cd.Apps, appDetail{
-						Type:                  "app",
-						Container:             node.DockerName(),
-						ExposedPort:           node.ExposedPort(svc.Port),
-						ExposedEnvoyAdminPort: node.ExposedPort(svc.EnvoyAdminPort),
-						Addresses:             addrs,
-						Service:               svc.ID.String(),
-					})
-				}
-			}
-		}
-
-		det.Clusters = append(det.Clusters, cd)
-	}
-
-	var buf bytes.Buffer
-	w := tabwriter.NewWriter(&buf, 0, 0, 3, ' ', tabwriter.Debug)
-
-	score := map[string]int{
-		"server":       0,
-		"mesh-gateway": 1,
-		"app":          2,
-	}
-
-	for _, cluster := range det.Clusters {
-		fmt.Fprintf(w, "CLUSTER\tTYPE\tCONTAINER\tNAME\tADDRS\tPORTS\t\n")
-		sort.Slice(cluster.Apps, func(i, j int) bool {
-			a := cluster.Apps[i]
-			b := cluster.Apps[j]
-
-			asc := score[a.Type]
-			bsc := score[b.Type]
-
-			if asc < bsc {
-				return true
-			} else if asc > bsc {
-				return false
-			}
-
-			if a.Container < b.Container {
-				return true
-			} else if a.Container > b.Container {
-				return false
-			}
-
-			if a.Service < b.Service {
-				return true
-			} else if a.Service > b.Service {
-				return false
-			}
-
-			return a.ExposedPort < b.ExposedPort
-		})
-		for _, d := range cluster.Apps {
-			if d.Type == "server" && d.Container == cluster.Leader {
-				d.Type = "leader"
-			}
-			portStr := "app=" + strconv.Itoa(d.ExposedPort)
-			if d.ExposedEnvoyAdminPort > 0 {
-				portStr += " envoy=" + strconv.Itoa(d.ExposedEnvoyAdminPort)
-			}
-			fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%s\t\n",
-				cluster.Name,
-				d.Type,
-				d.Container,
-				d.Service,
-				strings.Join(d.Addresses, ", "),
-				portStr,
-			)
-		}
-		fmt.Fprintf(w, "\t\t\t\t\t\n")
-	}
-
-	w.Flush()
-
-	s.logger.Debug("CURRENT SPRAWL DETAILS", "details", buf.String())
-
-	return nil
-}
-
-type logDetails struct {
-	TopologyID string
-	Clusters   []clusterDetails
-}
-
-type clusterDetails struct {
-	Name string
-
-	Leader string
-	Apps   []appDetail
-}
-
-type appDetail struct {
-	Type                  string // server|mesh-gateway|app
-	Container             string
-	Addresses             []string
-	ExposedPort           int `json:",omitempty"`
-	ExposedEnvoyAdminPort int `json:",omitempty"`
-	// just services
-	Service string `json:",omitempty"`
-}
diff --git a/testing/deployer/sprawl/ent.go b/testing/deployer/sprawl/ent.go
deleted file mode 100644
index fcff5fa7a0049..0000000000000
--- a/testing/deployer/sprawl/ent.go
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawl
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/consul/api"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-)
-
-func (s *Sprawl) ensureLicense() error {
-	if s.license != "" {
-		return nil
-	}
-	v, err := readLicense()
-	if err != nil {
-		return err
-	}
-	s.license = v
-	return nil
-}
-
-func readLicense() (string, error) {
-	if license := os.Getenv("CONSUL_LICENSE"); license != "" {
-		return license, nil
-	}
-
-	licensePath := os.Getenv("CONSUL_LICENSE_PATH")
-	if licensePath == "" {
-		return "", nil
-	}
-
-	licenseBytes, err := os.ReadFile(licensePath)
-	if err != nil {
-		return "", err
-	}
-	return strings.TrimSpace(string(licenseBytes)), nil
-}
-
-func (s *Sprawl) initTenancies(cluster *topology.Cluster) error {
-	var (
-		client = s.clients[cluster.Name]
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	// TODO: change this to UPSERT
-
-	var (
-		partClient = client.Partitions()
-		nsClient   = client.Namespaces()
-
-		partitionNameList []string
-	)
-	for _, ap := range cluster.Partitions {
-		if ap.Name != "default" {
-			old, _, err := partClient.Read(context.Background(), ap.Name, nil)
-			if err != nil {
-				return fmt.Errorf("error reading partition %q: %w", ap.Name, err)
-			}
-			if old == nil {
-				obj := &api.Partition{
-					Name: ap.Name,
-				}
-
-				_, _, err := partClient.Create(context.Background(), obj, nil)
-				if err != nil {
-					return fmt.Errorf("error creating partition %q: %w", ap.Name, err)
-				}
-				logger.Debug("created partition", "partition", ap.Name)
-			}
-
-			partitionNameList = append(partitionNameList, ap.Name)
-		}
-
-		if err := s.createCrossNamespaceCatalogReadPolicies(cluster, ap.Name); err != nil {
-			return fmt.Errorf("createCrossNamespaceCatalogReadPolicies[%s]: %w", ap.Name, err)
-		}
-
-		for _, ns := range ap.Namespaces {
-			old, _, err := nsClient.Read(ns, &api.QueryOptions{Partition: ap.Name})
-			if err != nil {
-				return err
-			}
-
-			if old == nil {
-				obj := &api.Namespace{
-					Partition: ap.Name,
-					Name:      ns,
-					ACLs: &api.NamespaceACLConfig{
-						PolicyDefaults: []api.ACLLink{
-							{Name: "cross-ns-catalog-read"},
-						},
-					},
-				}
-				if ns == "default" {
-					_, _, err := nsClient.Update(obj, nil)
-					if err != nil {
-						return err
-					}
-					logger.Debug("updated namespace", "namespace", ns, "partition", ap.Name)
-				} else {
-					_, _, err := nsClient.Create(obj, nil)
-					if err != nil {
-						return err
-					}
-					logger.Debug("created namespace", "namespace", ns, "partition", ap.Name)
-				}
-			}
-		}
-	}
-
-	if err := s.waitUntilPartitionedSerfIsReady(context.TODO(), cluster, partitionNameList); err != nil {
-		return fmt.Errorf("waitUntilPartitionedSerfIsReady: %w", err)
-	}
-
-	return nil
-}
-
-func (s *Sprawl) waitUntilPartitionedSerfIsReady(ctx context.Context, cluster *topology.Cluster, partitions []string) error {
-	var (
-		logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	readyLogs := make(map[string]string)
-	for _, partition := range partitions {
-		readyLogs[partition] = `agent.server: Added serf partition to gossip network: partition=` + partition
-	}
-
-	start := time.Now()
-	logger.Info("waiting for partitioned serf to be ready on all servers", "partitions", partitions)
-	for _, node := range cluster.Nodes {
-		if !node.IsServer() || node.Disabled {
-			continue
-		}
-
-		var buf bytes.Buffer
-		for {
-			buf.Reset()
-
-			err := s.runner.DockerExec(ctx, []string{
-				"logs", node.DockerName(),
-			}, &buf, nil)
-			if err != nil {
-				return fmt.Errorf("could not fetch docker logs from node %q: %w", node.ID(), err)
-			}
-
-			var (
-				body  = buf.String()
-				found []string
-			)
-
-			for partition, readyLog := range readyLogs {
-				if strings.Contains(body, readyLog) {
-					found = append(found, partition)
-				}
-			}
-
-			if len(found) == len(readyLogs) {
-				break
-			}
-		}
-
-		time.Sleep(500 * time.Millisecond)
-	}
-
-	logger.Info("partitioned serf is ready on all servers", "partitions", partitions, "elapsed", time.Since(start))
-
-	return nil
-}
diff --git a/testing/deployer/sprawl/helpers.go b/testing/deployer/sprawl/helpers.go
deleted file mode 100644
index 941311a1c1183..0000000000000
--- a/testing/deployer/sprawl/helpers.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawl
-
-// Deprecated: remove
-func TruncateSquidError(err error) error {
-	return err
-}
-
-// Deprecated: remove
-func IsSquid503(err error) bool {
-	return false
-}
diff --git a/testing/deployer/sprawl/internal/build/docker.go b/testing/deployer/sprawl/internal/build/docker.go
deleted file mode 100644
index ac1976dad4eec..0000000000000
--- a/testing/deployer/sprawl/internal/build/docker.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package build
-
-import (
-	"context"
-	"strings"
-
-	"github.com/hashicorp/go-hclog"
-
-	"github.com/hashicorp/consul/testing/deployer/sprawl/internal/runner"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-)
-
-const dockerfileEnvoy = `
-ARG CONSUL_IMAGE
-ARG ENVOY_IMAGE
-FROM ${CONSUL_IMAGE}
-FROM ${ENVOY_IMAGE}
-COPY --from=0 /bin/consul /bin/consul
-`
-
-// FROM hashicorp/consul-dataplane:latest
-// COPY --from=busybox:uclibc /bin/sh /bin/sh
-// TODO: busybox:latest doesn't work, see https://hashicorp.slack.com/archives/C03EUN3QF1C/p1691784078972959
-const dockerfileDataplane = `
-ARG DATAPLANE_IMAGE
-FROM busybox:1.34
-FROM ${DATAPLANE_IMAGE}
-COPY --from=0 /bin/busybox /bin/busybox
-USER 0:0
-RUN ["busybox", "--install", "/bin", "-s"]
-USER 100:0
-ENTRYPOINT []
-`
-
-func DockerImages(
-	logger hclog.Logger,
-	run *runner.Runner,
-	t *topology.Topology,
-) error {
-	logw := logger.Named("docker").StandardWriter(&hclog.StandardLoggerOptions{ForceLevel: hclog.Debug})
-
-	built := make(map[string]struct{})
-	for _, c := range t.Clusters {
-		for _, n := range c.Nodes {
-			joint := n.Images.EnvoyConsulImage()
-			if _, ok := built[joint]; joint != "" && !ok {
-				logger.Info("building image", "image", joint)
-				err := run.DockerExec(context.TODO(), []string{
-					"build",
-					"--build-arg",
-					"CONSUL_IMAGE=" + n.Images.Consul,
-					"--build-arg",
-					"ENVOY_IMAGE=" + n.Images.Envoy,
-					"-t", joint,
-					"-",
-				}, logw, strings.NewReader(dockerfileEnvoy))
-				if err != nil {
-					return err
-				}
-
-				built[joint] = struct{}{}
-			}
-
-			cdp := n.Images.LocalDataplaneImage()
-			if _, ok := built[cdp]; cdp != "" && !ok {
-				logger.Info("building image", "image", cdp)
-				err := run.DockerExec(context.TODO(), []string{
-					"build",
-					"--build-arg",
-					"DATAPLANE_IMAGE=" + n.Images.Dataplane,
-					"-t", cdp,
-					"-",
-				}, logw, strings.NewReader(dockerfileDataplane))
-				if err != nil {
-					return err
-				}
-
-				built[cdp] = struct{}{}
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/testing/deployer/sprawl/internal/runner/exec.go b/testing/deployer/sprawl/internal/runner/exec.go
deleted file mode 100644
index 1c2a8a1d311b4..0000000000000
--- a/testing/deployer/sprawl/internal/runner/exec.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package runner
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-
-	"github.com/hashicorp/go-hclog"
-)
-
-type Runner struct {
-	logger hclog.Logger
-
-	tfBin     string
-	dockerBin string
-}
-
-func Load(logger hclog.Logger) (*Runner, error) {
-	r := &Runner{
-		logger: logger,
-	}
-
-	type item struct {
-		name string
-		dest *string
-		warn string // optional
-	}
-	lookup := []item{
-		{"docker", &r.dockerBin, ""},
-		{"terraform", &r.tfBin, ""},
-	}
-
-	var (
-		bins []string
-		err  error
-	)
-	for _, i := range lookup {
-		*i.dest, err = exec.LookPath(i.name)
-		if err != nil {
-			if errors.Is(err, exec.ErrNotFound) {
-				if i.warn != "" {
-					return nil, fmt.Errorf("Could not find %q on path (%s): %w", i.name, i.warn, err)
-				} else {
-					return nil, fmt.Errorf("Could not find %q on path: %w", i.name, err)
-				}
-			}
-			return nil, fmt.Errorf("Unexpected failure looking for %q on path: %w", i.name, err)
-		}
-		bins = append(bins, *i.dest)
-	}
-	r.logger.Trace("using binaries", "paths", bins)
-
-	return r, nil
-}
-
-func (r *Runner) DockerExec(ctx context.Context, args []string, stdout io.Writer, stdin io.Reader) error {
-	return cmdExec(ctx, "docker", r.dockerBin, args, stdout, nil, stdin, "")
-}
-
-func (r *Runner) DockerExecWithStderr(ctx context.Context, args []string, stdout, stderr io.Writer, stdin io.Reader) error {
-	return cmdExec(ctx, "docker", r.dockerBin, args, stdout, stderr, stdin, "")
-}
-
-func (r *Runner) TerraformExec(ctx context.Context, args []string, stdout io.Writer, workdir string) error {
-	return cmdExec(ctx, "terraform", r.tfBin, args, stdout, nil, nil, workdir)
-}
-
-func cmdExec(ctx context.Context, name, binary string, args []string, stdout, stderr io.Writer, stdin io.Reader, dir string) error {
-	if binary == "" {
-		panic("binary named " + name + " was not detected")
-	}
-	var errWriter bytes.Buffer
-
-	if stdout == nil {
-		stdout = os.Stdout // TODO: wrap logs
-	}
-
-	cmd := exec.CommandContext(ctx, binary, args...)
-	if dir != "" {
-		cmd.Dir = dir
-	}
-	cmd.Stdout = stdout
-	cmd.Stderr = &errWriter
-	if stderr != nil {
-		cmd.Stderr = io.MultiWriter(stderr, cmd.Stderr)
-	}
-	cmd.Stdin = stdin
-	if err := cmd.Run(); err != nil {
-		return &ExecError{
-			BinaryName:  name,
-			Err:         err,
-			ErrorOutput: errWriter.String(),
-		}
-	}
-
-	return nil
-}
-
-type ExecError struct {
-	BinaryName  string
-	ErrorOutput string
-	Err         error
-}
-
-func (e *ExecError) Unwrap() error {
-	return e.Err
-}
-
-func (e *ExecError) Error() string {
-	return fmt.Sprintf(
-		"could not invoke %q: %v : %s",
-		e.BinaryName,
-		e.Err,
-		e.ErrorOutput,
-	)
-}
diff --git a/testing/deployer/sprawl/internal/secrets/store.go b/testing/deployer/sprawl/internal/secrets/store.go
deleted file mode 100644
index 0cacf88b256eb..0000000000000
--- a/testing/deployer/sprawl/internal/secrets/store.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package secrets
-
-import (
-	"net/url"
-	"strings"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-)
-
-type Store struct {
-	m map[string]string
-}
-
-const (
-	GossipKey      = "gossip"
-	BootstrapToken = "bootstrap-token"
-	AgentRecovery  = "agent-recovery"
-)
-
-func (s *Store) SaveGeneric(cluster, name, value string) {
-	s.save(encode(cluster, "generic", name), value)
-}
-
-func (s *Store) ReadGeneric(cluster, name string) string {
-	return s.read(encode(cluster, "generic", name))
-}
-
-func (s *Store) SaveAgentToken(cluster string, nid topology.NodeID, value string) {
-	s.save(encode(cluster, "agent", nid.String()), value)
-}
-
-func (s *Store) ReadAgentToken(cluster string, nid topology.NodeID) string {
-	return s.read(encode(cluster, "agent", nid.String()))
-}
-
-func (s *Store) SaveServiceToken(cluster string, sid topology.ServiceID, value string) {
-	s.save(encode(cluster, "service", sid.String()), value)
-}
-
-func (s *Store) ReadServiceToken(cluster string, sid topology.ServiceID) string {
-	return s.read(encode(cluster, "service", sid.String()))
-}
-
-func (s *Store) save(key, value string) {
-	if s.m == nil {
-		s.m = make(map[string]string)
-	}
-
-	s.m[key] = value
-}
-
-func (s *Store) read(key string) string {
-	if s.m == nil {
-		return ""
-	}
-
-	v, ok := s.m[key]
-	if !ok {
-		return ""
-	}
-	return v
-}
-
-func encode(parts ...string) string {
-	var out []string
-	for _, p := range parts {
-		out = append(out, url.QueryEscape(p))
-	}
-	return strings.Join(out, "/")
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/agent.go b/testing/deployer/sprawl/internal/tfgen/agent.go
deleted file mode 100644
index 00e7276783538..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/agent.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tfgen
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/hashicorp/hcl/v2/hclwrite"
-
-	"github.com/hashicorp/consul/testing/deployer/sprawl/internal/secrets"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-)
-
-func (g *Generator) generateAgentHCL(node *topology.Node) string {
-	if !node.IsAgent() {
-		panic("generateAgentHCL only applies to agents")
-	}
-
-	cluster, ok := g.topology.Clusters[node.Cluster]
-	if !ok {
-		panic(fmt.Sprintf("no such cluster: %s", node.Cluster))
-	}
-
-	var b HCLBuilder
-
-	b.add("server", node.IsServer())
-	b.add("bind_addr", "0.0.0.0")
-	b.add("client_addr", "0.0.0.0")
-	b.add("advertise_addr", `{{ GetInterfaceIP "eth0" }}`)
-	b.add("datacenter", node.Datacenter)
-	b.add("disable_update_check", true)
-	b.add("log_level", "trace")
-	b.add("enable_debug", true)
-	b.add("use_streaming_backend", true)
-
-	// speed up leaves
-	b.addBlock("performance", func() {
-		b.add("leave_drain_time", "50ms")
-	})
-
-	b.add("primary_datacenter", node.Datacenter)
-
-	// Using retry_join here is bad because changing server membership will
-	// destroy and recreate all of the servers
-	// if !node.IsServer() {
-	b.addSlice("retry_join", []string{"server." + node.Cluster + "-consulcluster.lan"})
-	b.add("retry_interval", "1s")
-	// }
-
-	if node.IsServer() {
-		b.addBlock("peering", func() {
-			b.add("enabled", true)
-		})
-	}
-
-	b.addBlock("ui_config", func() {
-		b.add("enabled", true)
-	})
-
-	b.addBlock("telemetry", func() {
-		b.add("disable_hostname", true)
-		b.add("prometheus_retention_time", "168h")
-	})
-
-	b.add("encrypt", g.sec.ReadGeneric(node.Cluster, secrets.GossipKey))
-
-	{
-		var (
-			root     = "/consul/config/certs"
-			caFile   = root + "/consul-agent-ca.pem"
-			certFile = root + "/" + node.TLSCertPrefix + ".pem"
-			certKey  = root + "/" + node.TLSCertPrefix + "-key.pem"
-		)
-
-		b.addBlock("tls", func() {
-			b.addBlock("internal_rpc", func() {
-				b.add("ca_file", caFile)
-				b.add("cert_file", certFile)
-				b.add("key_file", certKey)
-				b.add("verify_incoming", true)
-				b.add("verify_server_hostname", true)
-				b.add("verify_outgoing", true)
-			})
-			// if cfg.EncryptionTLSAPI {
-			// 	b.addBlock("https", func() {
-			// 		b.add("ca_file", caFile)
-			// 		b.add("cert_file", certFile)
-			// 		b.add("key_file", certKey)
-			// 		// b.add("verify_incoming", true)
-			// 	})
-			// }
-			if node.IsServer() {
-				b.addBlock("grpc", func() {
-					b.add("ca_file", caFile)
-					b.add("cert_file", certFile)
-					b.add("key_file", certKey)
-					// b.add("verify_incoming", true)
-				})
-			}
-		})
-	}
-
-	b.addBlock("ports", func() {
-		if node.IsServer() {
-			b.add("grpc_tls", 8503)
-			b.add("grpc", -1)
-		} else {
-			b.add("grpc", 8502)
-			b.add("grpc_tls", -1)
-		}
-		b.add("http", 8500)
-		b.add("dns", 8600)
-	})
-
-	b.addSlice("recursors", []string{"8.8.8.8"})
-
-	b.addBlock("acl", func() {
-		b.add("enabled", true)
-		b.add("default_policy", "deny")
-		b.add("down_policy", "extend-cache")
-		b.add("enable_token_persistence", true)
-		b.addBlock("tokens", func() {
-			if node.IsServer() {
-				b.add("initial_management", g.sec.ReadGeneric(node.Cluster, secrets.BootstrapToken))
-			}
-			b.add("agent_recovery", g.sec.ReadGeneric(node.Cluster, secrets.AgentRecovery))
-			b.add("agent", g.sec.ReadAgentToken(node.Cluster, node.ID()))
-		})
-	})
-
-	if node.IsServer() {
-		b.add("bootstrap_expect", len(cluster.ServerNodes()))
-		// b.add("translate_wan_addrs", true)
-		b.addBlock("rpc", func() {
-			b.add("enable_streaming", true)
-		})
-		if node.HasPublicAddress() {
-			b.add("advertise_addr_wan", `{{ GetInterfaceIP "eth1" }}`) // note: can't use 'node.PublicAddress()' b/c we don't know that yet
-		}
-
-		// Exercise config entry bootstrap
-		// b.addBlock("config_entries", func() {
-		// 	b.addBlock("bootstrap", func() {
-		// 		b.add("kind", "service-defaults")
-		// 		b.add("name", "placeholder")
-		// 		b.add("protocol", "grpc")
-		// 	})
-		// 	b.addBlock("bootstrap", func() {
-		// 		b.add("kind", "service-intentions")
-		// 		b.add("name", "placeholder")
-		// 		b.addBlock("sources", func() {
-		// 			b.add("name", "placeholder-client")
-		// 			b.add("action", "allow")
-		// 		})
-		// 	})
-		// })
-
-		b.addBlock("connect", func() {
-			b.add("enabled", true)
-		})
-
-	} else {
-		if cluster.Enterprise {
-			b.add("partition", node.Partition)
-		}
-	}
-
-	return b.String()
-}
-
-type HCLBuilder struct {
-	parts []string
-}
-
-func (b *HCLBuilder) format(s string, a ...any) {
-	if len(a) == 0 {
-		b.parts = append(b.parts, s)
-	} else {
-		b.parts = append(b.parts, fmt.Sprintf(s, a...))
-	}
-}
-
-func (b *HCLBuilder) add(k string, v any) {
-	switch x := v.(type) {
-	case string:
-		if x != "" {
-			b.format("%s = %q", k, x)
-		}
-	case int:
-		b.format("%s = %d", k, x)
-	case bool:
-		b.format("%s = %v", k, x)
-	default:
-		panic(fmt.Sprintf("unexpected type %T", v))
-	}
-}
-
-func (b *HCLBuilder) addBlock(block string, fn func()) {
-	b.format(block + "{")
-	fn()
-	b.format("}")
-}
-
-func (b *HCLBuilder) addSlice(name string, vals []string) {
-	b.format(name + " = [")
-	for _, v := range vals {
-		b.format("%q,", v)
-	}
-	b.format("]")
-}
-
-func (b *HCLBuilder) String() string {
-	joined := strings.Join(b.parts, "\n")
-	// Ensure it looks tidy
-	return string(hclwrite.Format([]byte(joined)))
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/digest.go b/testing/deployer/sprawl/internal/tfgen/digest.go
deleted file mode 100644
index 297def0fae81d..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/digest.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tfgen
-
-import (
-	"fmt"
-)
-
-// digestOutputs takes the data extracted from terraform output variables and
-// updates various fields on the topology.Topology with that data.
-func (g *Generator) digestOutputs(out *Outputs) error {
-	for clusterName, nodeMap := range out.Nodes {
-		cluster, ok := g.topology.Clusters[clusterName]
-		if !ok {
-			return fmt.Errorf("found output cluster that does not exist: %s", clusterName)
-		}
-		for nid, nodeOut := range nodeMap {
-			node := cluster.NodeByID(nid)
-			if node == nil {
-				return fmt.Errorf("found output node that does not exist in cluster %q: %s", nid, clusterName)
-			}
-
-			if node.DigestExposedPorts(nodeOut.Ports) {
-				g.logger.Debug("discovered exposed port mappings",
-					"cluster", clusterName,
-					"node", nid.String(),
-					"ports", nodeOut.Ports,
-				)
-			}
-		}
-	}
-
-	for netName, proxyPort := range out.ProxyPorts {
-		changed, err := g.topology.DigestExposedProxyPort(netName, proxyPort)
-		if err != nil {
-			return err
-		}
-		if changed {
-			g.logger.Debug("discovered exposed forward proxy port",
-				"network", netName,
-				"port", proxyPort,
-			)
-		}
-	}
-
-	return nil
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/dns.go b/testing/deployer/sprawl/internal/tfgen/dns.go
deleted file mode 100644
index 20dca878ebf39..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/dns.go
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tfgen
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/hashicorp/consul/testing/deployer/util"
-)
-
-func (g *Generator) getCoreDNSContainer(
-	net *topology.Network,
-	ipAddress string,
-	hashes []string,
-) Resource {
-	var env []string
-	for i, hv := range hashes {
-		env = append(env, fmt.Sprintf("HASH_FILE_%d_VALUE=%s", i, hv))
-	}
-	coredns := struct {
-		Name              string
-		DockerNetworkName string
-		IPAddress         string
-		HashValues        string
-		Env               []string
-	}{
-		Name:              net.Name,
-		DockerNetworkName: net.DockerName,
-		IPAddress:         ipAddress,
-		Env:               env,
-	}
-	return Eval(tfCorednsT, &coredns)
-}
-
-func (g *Generator) writeCoreDNSFiles(net *topology.Network, dnsIPAddress string) (bool, []string, error) {
-	if net.IsPublic() {
-		return false, nil, fmt.Errorf("coredns only runs on local networks")
-	}
-
-	rootdir := filepath.Join(g.workdir, "terraform", "coredns-config-"+net.Name)
-	if err := os.MkdirAll(rootdir, 0755); err != nil {
-		return false, nil, err
-	}
-
-	for _, cluster := range g.topology.Clusters {
-		if cluster.NetworkName != net.Name {
-			continue
-		}
-		var addrs []string
-		for _, node := range cluster.SortedNodes() {
-			if node.Kind != topology.NodeKindServer || node.Disabled {
-				continue
-			}
-			addr := node.AddressByNetwork(net.Name)
-			if addr.IPAddress != "" {
-				addrs = append(addrs, addr.IPAddress)
-			}
-		}
-
-		var (
-			clusterDNSName = cluster.Name + "-consulcluster.lan"
-		)
-
-		corefilePath := filepath.Join(rootdir, "Corefile")
-		zonefilePath := filepath.Join(rootdir, "servers")
-
-		_, err := UpdateFileIfDifferent(
-			g.logger,
-			generateCoreDNSConfigFile(
-				clusterDNSName,
-				addrs,
-			),
-			corefilePath,
-			0644,
-		)
-		if err != nil {
-			return false, nil, fmt.Errorf("error writing %q: %w", corefilePath, err)
-		}
-		corefileHash, err := util.HashFile(corefilePath)
-		if err != nil {
-			return false, nil, fmt.Errorf("error hashing %q: %w", corefilePath, err)
-		}
-
-		_, err = UpdateFileIfDifferent(
-			g.logger,
-			generateCoreDNSZoneFile(
-				dnsIPAddress,
-				clusterDNSName,
-				addrs,
-			),
-			zonefilePath,
-			0644,
-		)
-		if err != nil {
-			return false, nil, fmt.Errorf("error writing %q: %w", zonefilePath, err)
-		}
-		zonefileHash, err := util.HashFile(zonefilePath)
-		if err != nil {
-			return false, nil, fmt.Errorf("error hashing %q: %w", zonefilePath, err)
-		}
-
-		return true, []string{corefileHash, zonefileHash}, nil
-	}
-
-	return false, nil, nil
-}
-
-func generateCoreDNSConfigFile(
-	clusterDNSName string,
-	addrs []string,
-) []byte {
-	serverPart := ""
-	if len(addrs) > 0 {
-		var servers []string
-		for _, addr := range addrs {
-			servers = append(servers, addr+":8600")
-		}
-		serverPart = fmt.Sprintf(`
-consul:53 {
-  forward . %s
-  log
-  errors
-  whoami
-}
-`, strings.Join(servers, " "))
-	}
-
-	return []byte(fmt.Sprintf(`
-%[1]s:53 {
-  file /config/servers %[1]s
-  log
-  errors
-  whoami
-}
-
-%[2]s
-
-.:53 {
-  forward . 8.8.8.8:53
-  log
-  errors
-  whoami
-}
-`, clusterDNSName, serverPart))
-}
-
-func generateCoreDNSZoneFile(
-	dnsIPAddress string,
-	clusterDNSName string,
-	addrs []string,
-) []byte {
-	var buf bytes.Buffer
-	buf.WriteString(fmt.Sprintf(`
-$TTL 60
-$ORIGIN %[1]s.
-@                   IN	SOA ns.%[1]s. webmaster.%[1]s. (
-          2017042745 ; serial
-          7200       ; refresh (2 hours)				
-          3600       ; retry (1 hour)			
-          1209600    ; expire (2 weeks)				
-          3600       ; minimum (1 hour)				
-          )
-@  IN NS ns.%[1]s. ; Name server
-ns IN A  %[2]s     ; self
-`, clusterDNSName, dnsIPAddress))
-
-	for _, addr := range addrs {
-		buf.WriteString(fmt.Sprintf(`
-server IN A %s ; Consul server
-`, addr))
-	}
-
-	return buf.Bytes()
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/docker.go b/testing/deployer/sprawl/internal/tfgen/docker.go
deleted file mode 100644
index 63f628c15a330..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/docker.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tfgen
-
-import (
-	"fmt"
-	"regexp"
-)
-
-var invalidResourceName = regexp.MustCompile(`[^a-z0-9-]+`)
-
-func DockerImageResourceName(image string) string {
-	if image == "" {
-		panic(`image must not be ""`)
-	}
-	return invalidResourceName.ReplaceAllLiteralString(image, "-")
-}
-
-func DockerNetwork(name, subnet string) Resource {
-	return Text(fmt.Sprintf(`
-resource "docker_network" %[1]q {
-  name       = %[1]q
-  attachable = true
-  ipam_config {
-    subnet = %[2]q
-  }
-}
-`, name, subnet))
-}
-
-func DockerVolume(name string) Resource {
-	return Text(fmt.Sprintf(`
-resource "docker_volume" %[1]q {
-  name       = %[1]q
-}`, name))
-}
-
-func DockerImage(name, image string) Resource {
-	return Text(fmt.Sprintf(`
-resource "docker_image" %[1]q {
-  name = %[2]q
-  keep_locally = true
-}`, name, image))
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/docker_test.go b/testing/deployer/sprawl/internal/tfgen/docker_test.go
deleted file mode 100644
index 942b87189fca5..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/docker_test.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tfgen
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestDockerImageResourceName(t *testing.T) {
-	fn := DockerImageResourceName
-
-	assert.Equal(t, "", fn(""))
-	assert.Equal(t, "abcdefghijklmnopqrstuvwxyz0123456789-", fn("abcdefghijklmnopqrstuvwxyz0123456789-"))
-	assert.Equal(t, "hashicorp-consul-1-15-0", fn("hashicorp/consul:1.15.0"))
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/gen.go b/testing/deployer/sprawl/internal/tfgen/gen.go
deleted file mode 100644
index f64d7b6a254b0..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/gen.go
+++ /dev/null
@@ -1,476 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tfgen
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/hashicorp/go-hclog"
-
-	"github.com/hashicorp/consul/testing/deployer/sprawl/internal/runner"
-	"github.com/hashicorp/consul/testing/deployer/sprawl/internal/secrets"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/hashicorp/consul/testing/deployer/util"
-)
-
-type Generator struct {
-	logger   hclog.Logger
-	runner   *runner.Runner
-	topology *topology.Topology
-	sec      *secrets.Store
-	workdir  string
-	license  string
-
-	tfLogger io.Writer
-
-	// set during network phase
-	remainingSubnets map[string]struct{}
-
-	launched bool
-}
-
-func NewGenerator(
-	logger hclog.Logger,
-	runner *runner.Runner,
-	topo *topology.Topology,
-	sec *secrets.Store,
-	workdir string,
-	license string,
-) (*Generator, error) {
-	if logger == nil {
-		panic("logger is required")
-	}
-	if runner == nil {
-		panic("runner is required")
-	}
-	if topo == nil {
-		panic("topology is required")
-	}
-	if sec == nil {
-		panic("secrets store is required")
-	}
-	if workdir == "" {
-		panic("workdir is required")
-	}
-
-	g := &Generator{
-		logger:  logger,
-		runner:  runner,
-		sec:     sec,
-		workdir: workdir,
-		license: license,
-
-		tfLogger: logger.Named("terraform").StandardWriter(&hclog.StandardLoggerOptions{ForceLevel: hclog.Debug}),
-	}
-	g.SetTopology(topo)
-
-	_ = g.terraformDestroy(context.Background(), true) // cleanup prior run
-
-	return g, nil
-}
-
-func (g *Generator) MarkLaunched() {
-	g.launched = true
-}
-
-func (g *Generator) SetTopology(topo *topology.Topology) {
-	if topo == nil {
-		panic("topology is required")
-	}
-	g.topology = topo
-}
-
-type Step int
-
-const (
-	StepAll      Step = 0
-	StepNetworks Step = 1
-	StepServers  Step = 2
-	StepAgents   Step = 3
-	StepServices Step = 4
-	// StepPeering  Step = XXX5
-	StepRelaunch Step = 5
-)
-
-func (s Step) String() string {
-	switch s {
-	case StepAll:
-		return "all"
-	case StepNetworks:
-		return "networks"
-	case StepServers:
-		return "servers"
-	case StepAgents:
-		return "agents"
-	case StepServices:
-		return "services"
-	case StepRelaunch:
-		return "relaunch"
-	// case StepPeering:
-	// 	return "peering"
-	default:
-		return "UNKNOWN--" + strconv.Itoa(int(s))
-	}
-}
-
-func (s Step) StartServers() bool  { return s >= StepServers }
-func (s Step) StartAgents() bool   { return s >= StepAgents }
-func (s Step) StartServices() bool { return s >= StepServices }
-
-// func (s Step) InitiatePeering() bool { return s >= StepPeering }
-
-func (g *Generator) Regenerate() error {
-	return g.Generate(StepRelaunch)
-}
-
-func (g *Generator) Generate(step Step) error {
-	if g.launched && step != StepRelaunch {
-		return fmt.Errorf("cannot use step %q after successful launch; see Regenerate()", step)
-	}
-
-	g.logger.Info("generating and creating resources", "step", step.String())
-	var (
-		networks   []Resource
-		volumes    []Resource
-		images     []Resource
-		containers []Resource
-
-		imageNames = make(map[string]string)
-	)
-
-	addVolume := func(name string) {
-		volumes = append(volumes, DockerVolume(name))
-	}
-	addImage := func(name, image string) {
-		if image == "" {
-			return
-		}
-		if _, ok := imageNames[image]; ok {
-			return
-		}
-
-		if name == "" {
-			name = DockerImageResourceName(image)
-		}
-
-		imageNames[image] = name
-
-		g.logger.Debug("registering image", "resource", name, "image", image)
-
-		images = append(images, DockerImage(name, image))
-	}
-
-	if g.remainingSubnets == nil {
-		g.remainingSubnets = util.GetPossibleDockerNetworkSubnets()
-	}
-	if len(g.remainingSubnets) == 0 {
-		return fmt.Errorf("exhausted all docker networks")
-	}
-
-	addImage("nginx", "nginx:latest")
-	addImage("coredns", "coredns/coredns:latest")
-	for _, net := range g.topology.SortedNetworks() {
-		if net.Subnet == "" {
-			// Because this harness runs on a linux or macos host, we can't
-			// directly invoke the moby libnetwork calls to check for free
-			// subnets as it would have to cross into the docker desktop vm on
-			// mac.
-			//
-			// Instead rely on map iteration order being random to avoid
-			// collisions, but detect the terraform failure and retry until
-			// success.
-
-			var ipnet string
-			for ipnet = range g.remainingSubnets {
-			}
-			if ipnet == "" {
-				return fmt.Errorf("could not get a free docker network")
-			}
-			delete(g.remainingSubnets, ipnet)
-
-			if _, err := net.SetSubnet(ipnet); err != nil {
-				return fmt.Errorf("assigned subnet is invalid %q: %w", ipnet, err)
-			}
-		}
-		networks = append(networks, DockerNetwork(net.DockerName, net.Subnet))
-
-		var (
-			// We always ask for a /24, so just blindly pick x.x.x.252 as our
-			// proxy address. There's an offset of 2 in the list of available
-			// addresses here because we removed x.x.x.0 and x.x.x.1 from the
-			// pool.
-			proxyIPAddress = net.IPByIndex(250)
-			// Grab x.x.x.253 for the dns server
-			dnsIPAddress = net.IPByIndex(251)
-		)
-
-		{
-			// wrote, hashes, err := g.write
-		}
-
-		{ // nginx forward proxy
-			_, hash, err := g.writeNginxConfig(net)
-			if err != nil {
-				return fmt.Errorf("writeNginxConfig[%s]: %w", net.Name, err)
-			}
-
-			containers = append(containers, g.getForwardProxyContainer(net, proxyIPAddress, hash))
-
-		}
-
-		net.ProxyAddress = proxyIPAddress
-		net.DNSAddress = ""
-
-		if net.IsLocal() {
-			wrote, hashes, err := g.writeCoreDNSFiles(net, dnsIPAddress)
-			if err != nil {
-				return fmt.Errorf("writeCoreDNSFiles[%s]: %w", net.Name, err)
-			}
-			if wrote {
-				net.DNSAddress = dnsIPAddress
-				containers = append(containers, g.getCoreDNSContainer(net, dnsIPAddress, hashes))
-			}
-		}
-	}
-
-	for _, c := range g.topology.SortedClusters() {
-		if c.TLSVolumeName == "" {
-			c.TLSVolumeName = c.Name + "-tls-material-" + g.topology.ID
-		}
-		addVolume(c.TLSVolumeName)
-	}
-
-	addImage("pause", "registry.k8s.io/pause:3.3")
-
-	if step.StartServers() {
-		for _, c := range g.topology.SortedClusters() {
-			for _, node := range c.SortedNodes() {
-				if node.Disabled {
-					continue
-				}
-				addImage("", node.Images.Consul)
-				addImage("", node.Images.EnvoyConsulImage())
-				addImage("", node.Images.LocalDataplaneImage())
-
-				if node.IsAgent() {
-					addVolume(node.DockerName())
-				}
-
-				for _, svc := range node.Services {
-					addImage("", svc.Image)
-				}
-
-				myContainers, err := g.generateNodeContainers(step, c, node)
-				if err != nil {
-					return err
-				}
-
-				containers = append(containers, myContainers...)
-			}
-		}
-	}
-
-	tfpath := func(p string) string {
-		return filepath.Join(g.workdir, "terraform", p)
-	}
-
-	if _, err := WriteHCLResourceFile(g.logger, []Resource{Text(terraformPrelude)}, tfpath("init.tf"), 0644); err != nil {
-		return err
-	}
-	if netResult, err := WriteHCLResourceFile(g.logger, networks, tfpath("networks.tf"), 0644); err != nil {
-		return err
-	} else if netResult == UpdateResultModified {
-		if step != StepNetworks {
-			return fmt.Errorf("cannot change networking details after they are established")
-		}
-	}
-	if _, err := WriteHCLResourceFile(g.logger, volumes, tfpath("volumes.tf"), 0644); err != nil {
-		return err
-	}
-	if _, err := WriteHCLResourceFile(g.logger, images, tfpath("images.tf"), 0644); err != nil {
-		return err
-	}
-	if _, err := WriteHCLResourceFile(g.logger, containers, tfpath("containers.tf"), 0644); err != nil {
-		return err
-	}
-
-	if err := g.terraformApply(context.TODO()); err != nil {
-		return err
-	}
-
-	out, err := g.terraformOutputs(context.TODO())
-	if err != nil {
-		return err
-	}
-
-	return g.digestOutputs(out)
-}
-
-func (g *Generator) DestroyAll() error {
-	return g.terraformDestroy(context.TODO(), false)
-}
-
-func (g *Generator) DestroyAllQuietly() error {
-	return g.terraformDestroy(context.TODO(), true)
-}
-
-func (g *Generator) terraformApply(ctx context.Context) error {
-	tfdir := filepath.Join(g.workdir, "terraform")
-
-	if _, err := os.Stat(filepath.Join(tfdir, ".terraform")); err != nil {
-		if !os.IsNotExist(err) {
-			return err
-		}
-
-		// On the fly init
-		g.logger.Info("Running 'terraform init'...")
-		if err := g.runner.TerraformExec(ctx, []string{"init", "-input=false"}, g.tfLogger, tfdir); err != nil {
-			return err
-		}
-	}
-
-	g.logger.Info("Running 'terraform apply'...")
-	return g.runner.TerraformExec(ctx, []string{"apply", "-input=false", "-auto-approve"}, g.tfLogger, tfdir)
-}
-
-func (g *Generator) terraformDestroy(ctx context.Context, quiet bool) error {
-	g.logger.Info("Running 'terraform destroy'...")
-
-	var out io.Writer
-	if quiet {
-		out = io.Discard
-	} else {
-		out = g.tfLogger
-	}
-
-	tfdir := filepath.Join(g.workdir, "terraform")
-	return g.runner.TerraformExec(ctx, []string{
-		"destroy", "-input=false", "-auto-approve", "-refresh=false",
-	}, out, tfdir)
-}
-
-func (g *Generator) terraformOutputs(ctx context.Context) (*Outputs, error) {
-	tfdir := filepath.Join(g.workdir, "terraform")
-
-	var buf bytes.Buffer
-	err := g.runner.TerraformExec(ctx, []string{
-		"output", "-json",
-	}, &buf, tfdir)
-	if err != nil {
-		return nil, err
-	}
-
-	type outputVar struct {
-		// may be map[string]any
-		Value any `json:"value"`
-	}
-
-	raw := make(map[string]*outputVar)
-	dec := json.NewDecoder(&buf)
-	if err := dec.Decode(&raw); err != nil {
-		return nil, err
-	}
-
-	out := &Outputs{}
-
-	for key, rv := range raw {
-		switch {
-		case strings.HasPrefix(key, "ports_"):
-			cluster, nid, ok := extractNodeOutputKey("ports_", key)
-			if !ok {
-				return nil, fmt.Errorf("unexpected output var: %s", key)
-			}
-
-			ports := make(map[int]int)
-			for k, v := range rv.Value.(map[string]any) {
-				ki, err := strconv.Atoi(k)
-				if err != nil {
-					return nil, fmt.Errorf("unexpected port value %q: %w", k, err)
-				}
-				ports[ki] = int(v.(float64))
-			}
-			out.SetNodePorts(cluster, nid, ports)
-		case strings.HasPrefix(key, "forwardproxyport_"):
-			netname := strings.TrimPrefix(key, "forwardproxyport_")
-
-			found := rv.Value.(map[string]any)
-			if len(found) != 1 {
-				return nil, fmt.Errorf("found unexpected ports: %v", found)
-			}
-			got, ok := found[strconv.Itoa(proxyInternalPort)]
-			if !ok {
-				return nil, fmt.Errorf("found unexpected ports: %v", found)
-			}
-
-			out.SetProxyPort(netname, int(got.(float64)))
-		}
-	}
-
-	return out, nil
-}
-
-func extractNodeOutputKey(prefix, key string) (string, topology.NodeID, bool) {
-	clusterNode := strings.TrimPrefix(key, prefix)
-
-	cluster, nodeid, ok := strings.Cut(clusterNode, "_")
-	if !ok {
-		return "", topology.NodeID{}, false
-	}
-
-	partition, node, ok := strings.Cut(nodeid, "_")
-	if !ok {
-		return "", topology.NodeID{}, false
-	}
-
-	nid := topology.NewNodeID(node, partition)
-	return cluster, nid, true
-}
-
-type Outputs struct {
-	ProxyPorts map[string]int                             // net -> exposed port
-	Nodes      map[string]map[topology.NodeID]*NodeOutput // clusterID -> node -> stuff
-}
-
-func (o *Outputs) SetNodePorts(cluster string, nid topology.NodeID, ports map[int]int) {
-	nodeOut := o.getNode(cluster, nid)
-	nodeOut.Ports = ports
-}
-
-func (o *Outputs) SetProxyPort(net string, port int) {
-	if o.ProxyPorts == nil {
-		o.ProxyPorts = make(map[string]int)
-	}
-	o.ProxyPorts[net] = port
-}
-
-func (o *Outputs) getNode(cluster string, nid topology.NodeID) *NodeOutput {
-	if o.Nodes == nil {
-		o.Nodes = make(map[string]map[topology.NodeID]*NodeOutput)
-	}
-	cnodes, ok := o.Nodes[cluster]
-	if !ok {
-		cnodes = make(map[topology.NodeID]*NodeOutput)
-		o.Nodes[cluster] = cnodes
-	}
-
-	nodeOut, ok := cnodes[nid]
-	if !ok {
-		nodeOut = &NodeOutput{}
-		cnodes[nid] = nodeOut
-	}
-
-	return nodeOut
-}
-
-type NodeOutput struct {
-	Ports map[int]int `json:",omitempty"`
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/io.go b/testing/deployer/sprawl/internal/tfgen/io.go
deleted file mode 100644
index a64d6918efaa8..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/io.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tfgen
-
-import (
-	"bytes"
-	"os"
-	"strings"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/hcl/v2/hclwrite"
-	"github.com/rboyer/safeio"
-)
-
-func WriteHCLResourceFile(
-	logger hclog.Logger,
-	res []Resource,
-	path string,
-	perm os.FileMode,
-) (UpdateResult, error) {
-	var text []string
-	for _, r := range res {
-		val, err := r.Render()
-		if err != nil {
-			return UpdateResultNone, err
-		}
-		text = append(text, strings.TrimSpace(val))
-	}
-
-	body := strings.Join(text, "\n\n")
-
-	// Ensure it looks tidy
-	out := hclwrite.Format(bytes.TrimSpace([]byte(body)))
-
-	return UpdateFileIfDifferent(logger, out, path, perm)
-}
-
-type UpdateResult int
-
-const (
-	UpdateResultNone UpdateResult = iota
-	UpdateResultCreated
-	UpdateResultModified
-)
-
-func UpdateFileIfDifferent(
-	logger hclog.Logger,
-	body []byte,
-	path string,
-	perm os.FileMode,
-) (UpdateResult, error) {
-	prev, err := os.ReadFile(path)
-
-	result := UpdateResultNone
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return result, err
-		}
-		logger.Debug("writing new file", "path", path)
-		result = UpdateResultCreated
-	} else {
-		// loaded
-		if bytes.Equal(body, prev) {
-			return result, nil
-		}
-		logger.Debug("file has changed", "path", path)
-		result = UpdateResultModified
-	}
-
-	_, err = safeio.WriteToFile(bytes.NewReader(body), path, perm)
-	return result, err
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/nodes.go b/testing/deployer/sprawl/internal/tfgen/nodes.go
deleted file mode 100644
index 33a820a3e32e7..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/nodes.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tfgen
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-)
-
-type terraformPod struct {
-	PodName           string
-	Node              *topology.Node
-	Ports             []int
-	Labels            map[string]string
-	TLSVolumeName     string
-	DNSAddress        string
-	DockerNetworkName string
-}
-
-func (g *Generator) generateNodeContainers(
-	step Step,
-	cluster *topology.Cluster,
-	node *topology.Node,
-) ([]Resource, error) {
-	if node.Disabled {
-		return nil, fmt.Errorf("cannot generate containers for a disabled node")
-	}
-
-	pod := terraformPod{
-		PodName: node.PodName(),
-		Node:    node,
-		Labels: map[string]string{
-			"consulcluster-topology-id":  g.topology.ID,
-			"consulcluster-cluster-name": node.Cluster,
-		},
-		TLSVolumeName: cluster.TLSVolumeName,
-		DNSAddress:    "8.8.8.8",
-	}
-
-	cluster, ok := g.topology.Clusters[node.Cluster]
-	if !ok {
-		return nil, fmt.Errorf("no such cluster: %s", node.Cluster)
-	}
-
-	net, ok := g.topology.Networks[cluster.NetworkName]
-	if !ok {
-		return nil, fmt.Errorf("no local network: %s", cluster.NetworkName)
-	}
-	if net.DNSAddress != "" {
-		pod.DNSAddress = net.DNSAddress
-	}
-	pod.DockerNetworkName = net.DockerName
-
-	containers := []Resource{}
-
-	if node.IsAgent() {
-		switch {
-		case node.IsServer() && step.StartServers(),
-			!node.IsServer() && step.StartAgents():
-			containers = append(containers, Eval(tfConsulT, struct {
-				terraformPod
-				ImageResource     string
-				HCL               string
-				EnterpriseLicense string
-			}{
-				terraformPod:      pod,
-				ImageResource:     DockerImageResourceName(node.Images.Consul),
-				HCL:               g.generateAgentHCL(node),
-				EnterpriseLicense: g.license,
-			}))
-		}
-	}
-
-	svcContainers := []Resource{}
-	for _, svc := range node.SortedServices() {
-		token := g.sec.ReadServiceToken(node.Cluster, svc.ID)
-		switch {
-		case svc.IsMeshGateway && !node.IsDataplane():
-			svcContainers = append(svcContainers, Eval(tfMeshGatewayT, struct {
-				terraformPod
-				ImageResource string
-				Enterprise    bool
-				Service       *topology.Service
-				Token         string
-			}{
-				terraformPod:  pod,
-				ImageResource: DockerImageResourceName(node.Images.EnvoyConsulImage()),
-				Enterprise:    cluster.Enterprise,
-				Service:       svc,
-				Token:         token,
-			}))
-		case svc.IsMeshGateway && node.IsDataplane():
-			svcContainers = append(svcContainers, Eval(tfMeshGatewayDataplaneT, &struct {
-				terraformPod
-				ImageResource string
-				Enterprise    bool
-				Service       *topology.Service
-				Token         string
-			}{
-				terraformPod:  pod,
-				ImageResource: DockerImageResourceName(node.Images.LocalDataplaneImage()),
-				Enterprise:    cluster.Enterprise,
-				Service:       svc,
-				Token:         token,
-			}))
-
-		case !svc.IsMeshGateway:
-			svcContainers = append(svcContainers, Eval(tfAppT, struct {
-				terraformPod
-				ImageResource string
-				Service       *topology.Service
-			}{
-				terraformPod:  pod,
-				ImageResource: DockerImageResourceName(svc.Image),
-				Service:       svc,
-			}))
-
-			if svc.DisableServiceMesh {
-				break
-			}
-
-			tmpl := tfAppSidecarT
-			var img string
-			if node.IsDataplane() {
-				tmpl = tfAppDataplaneT
-				img = DockerImageResourceName(node.Images.LocalDataplaneImage())
-			} else {
-				img = DockerImageResourceName(node.Images.EnvoyConsulImage())
-			}
-			svcContainers = append(svcContainers, Eval(tmpl, struct {
-				terraformPod
-				ImageResource string
-				Service       *topology.Service
-				Token         string
-				Enterprise    bool
-			}{
-				terraformPod:  pod,
-				ImageResource: img,
-				Service:       svc,
-				Token:         token,
-				Enterprise:    cluster.Enterprise,
-			}))
-		}
-
-		if step.StartServices() {
-			containers = append(containers, svcContainers...)
-		}
-	}
-
-	// Wait until the very end to render the pod so we know all of the ports.
-	pod.Ports = node.SortedPorts()
-
-	// pod placeholder container
-	containers = append(containers, Eval(tfPauseT, &pod))
-
-	return containers, nil
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/prelude.go b/testing/deployer/sprawl/internal/tfgen/prelude.go
deleted file mode 100644
index 2e9a01cb08058..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/prelude.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tfgen
-
-const terraformPrelude = `provider "docker" {
-  host = "unix:///var/run/docker.sock"
-}
-
-terraform {
-  required_providers {
-    docker = {
-      source  = "kreuzwerker/docker"
-      version = "~> 2.0"
-    }
-  }
-  required_version = ">= 0.13"
-}
-`
diff --git a/testing/deployer/sprawl/internal/tfgen/proxy.go b/testing/deployer/sprawl/internal/tfgen/proxy.go
deleted file mode 100644
index 0fcaf841ee27c..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/proxy.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tfgen
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/hashicorp/consul/testing/deployer/util"
-)
-
-const proxyInternalPort = 80
-
-func (g *Generator) writeNginxConfig(net *topology.Network) (bool, string, error) {
-	rootdir := filepath.Join(g.workdir, "terraform", "nginx-config-"+net.Name)
-	if err := os.MkdirAll(rootdir, 0755); err != nil {
-		return false, "", err
-	}
-
-	configFile := filepath.Join(rootdir, "nginx.conf")
-
-	body := fmt.Sprintf(`
-server {
-    listen       %d;
-
-    location / {
-        resolver 8.8.8.8;
-        ##############
-        # Relevant config knobs are here: https://nginx.org/en/docs/http/ngx_http_proxy_module.html
-        ##############
-        proxy_pass http://$http_host$uri$is_args$args;
-        proxy_cache off;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_connect_timeout 5s;
-        proxy_read_timeout 5s;
-        proxy_send_timeout 5s;
-        proxy_request_buffering off;
-        proxy_buffering off;
-    }
-}
-`, proxyInternalPort)
-
-	_, err := UpdateFileIfDifferent(
-		g.logger,
-		[]byte(body),
-		configFile,
-		0644,
-	)
-	if err != nil {
-		return false, "", fmt.Errorf("error writing %q: %w", configFile, err)
-	}
-
-	hash, err := util.HashFile(configFile)
-	if err != nil {
-		return false, "", fmt.Errorf("error hashing %q: %w", configFile, err)
-	}
-
-	return true, hash, err
-}
-
-func (g *Generator) getForwardProxyContainer(
-	net *topology.Network,
-	ipAddress string,
-	hash string,
-) Resource {
-	env := []string{"HASH_FILE_VALUE=" + hash}
-	proxy := struct {
-		Name              string
-		DockerNetworkName string
-		InternalPort      int
-		IPAddress         string
-		Env               []string
-	}{
-		Name:              net.Name,
-		DockerNetworkName: net.DockerName,
-		InternalPort:      proxyInternalPort,
-		IPAddress:         ipAddress,
-		Env:               env,
-	}
-
-	return Eval(tfForwardProxyT, &proxy)
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/res.go b/testing/deployer/sprawl/internal/tfgen/res.go
deleted file mode 100644
index a45c460793d22..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/res.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tfgen
-
-import (
-	"bytes"
-	"text/template"
-
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/hcl/v2/hclwrite"
-)
-
-type FileResource struct {
-	name string
-	res  Resource
-}
-
-func (r *FileResource) Name() string { return r.name }
-
-func (r *FileResource) Commit(logger hclog.Logger) error {
-	val, err := r.res.Render()
-	if err != nil {
-		return err
-	}
-	_, err = UpdateFileIfDifferent(logger, []byte(val), r.name, 0644)
-	return err
-}
-
-func File(name string, res Resource) *FileResource {
-	return &FileResource{name: name, res: res}
-}
-
-func Text(s string) Resource {
-	return &textResource{text: s}
-}
-
-func Embed(name string) Resource {
-	return &embedResource{name: name}
-}
-
-func Eval(t *template.Template, data any) Resource {
-	return &evalResource{template: t, data: data, hcl: false}
-}
-
-func HCL(t *template.Template, data any) Resource {
-	return &evalResource{template: t, data: data, hcl: true}
-}
-
-type Resource interface {
-	Render() (string, error)
-}
-
-type embedResource struct {
-	name string
-}
-
-func (r *embedResource) Render() (string, error) {
-	val, err := content.ReadFile(r.name)
-	if err != nil {
-		return "", err
-	}
-	return string(val), nil
-}
-
-type textResource struct {
-	text string
-}
-
-func (r *textResource) Render() (string, error) {
-	return r.text, nil
-}
-
-type evalResource struct {
-	template *template.Template
-	data     any
-	hcl      bool
-}
-
-func (r *evalResource) Render() (string, error) {
-	out, err := StringTemplate(r.template, r.data)
-	if err != nil {
-		return "", err
-	}
-
-	if r.hcl {
-		return string(hclwrite.Format([]byte(out))), nil
-	}
-	return out, nil
-}
-
-func StringTemplate(t *template.Template, data any) (string, error) {
-	var res bytes.Buffer
-	if err := t.Execute(&res, data); err != nil {
-		return "", err
-	}
-	return res.String(), nil
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/templates/container-app-dataplane.tf.tmpl b/testing/deployer/sprawl/internal/tfgen/templates/container-app-dataplane.tf.tmpl
deleted file mode 100644
index 040cabbf11601..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/templates/container-app-dataplane.tf.tmpl
+++ /dev/null
@@ -1,44 +0,0 @@
-resource "docker_container" "{{.Node.DockerName}}-{{.Service.ID.TFString}}-sidecar" {
-	name = "{{.Node.DockerName}}-{{.Service.ID.TFString}}-sidecar"
-    network_mode = "container:${docker_container.{{.PodName}}.id}"
-    image        = docker_image.{{.ImageResource}}.latest
-    restart      = "on-failure"
-
-{{- range $k, $v := .Labels }}
-  labels {
-    label = "{{ $k }}"
-    value = "{{ $v }}"
-  }
-{{- end }}
-
-  volumes {
-    volume_name    = "{{.TLSVolumeName}}"
-    container_path = "/consul/config/certs"
-    read_only      = true
-  }
-
-  env = [
-			"DP_CONSUL_ADDRESSES=server.{{.Node.Cluster}}-consulcluster.lan",
-			"DP_SERVICE_NODE_NAME={{.Node.PodName}}",
-			"DP_PROXY_SERVICE_ID={{.Service.ID.Name}}-sidecar-proxy",
-    {{ if .Enterprise }}
-      "DP_SERVICE_NAMESPACE={{.Service.ID.Namespace}}",
-      "DP_SERVICE_PARTITION={{.Service.ID.Partition}}",
-    {{ end }}
-    {{ if .Token }}
-      "DP_CREDENTIAL_TYPE=static",
-      "DP_CREDENTIAL_STATIC_TOKEN={{.Token}}",
-    {{ end }}
-      // for demo purposes
-			"DP_ENVOY_ADMIN_BIND_ADDRESS=0.0.0.0",
-			"DP_ENVOY_ADMIN_BIND_PORT=19000",
-			"DP_LOG_LEVEL=trace",
-			"DP_CA_CERTS=/consul/config/certs/consul-agent-ca.pem",
-			"DP_CONSUL_GRPC_PORT=8503",
-			"DP_TLS_SERVER_NAME=server.{{.Node.Datacenter}}.consul",
-  ]
-
-  command = [
-    "/usr/local/bin/consul-dataplane",
-  ]
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/templates/container-app-sidecar.tf.tmpl b/testing/deployer/sprawl/internal/tfgen/templates/container-app-sidecar.tf.tmpl
deleted file mode 100644
index 15a5f6922691f..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/templates/container-app-sidecar.tf.tmpl
+++ /dev/null
@@ -1,37 +0,0 @@
-resource "docker_container" "{{.Node.DockerName}}-{{.Service.ID.TFString}}-sidecar" {
-	name = "{{.Node.DockerName}}-{{.Service.ID.TFString}}-sidecar"
-    network_mode = "container:${docker_container.{{.PodName}}.id}"
-    image        = docker_image.{{.ImageResource}}.latest
-    restart  = "on-failure"
-
-{{- range $k, $v := .Labels }}
-  labels {
-    label = "{{ $k }}"
-    value = "{{ $v }}"
-  }
-{{- end }}
-
-  volumes {
-    volume_name    = "{{.TLSVolumeName}}"
-    container_path = "/consul/config/certs"
-    read_only      = true
-  }
-
-  command = [
-    "consul", "connect", "envoy",
-    "-sidecar-for={{.Service.ID.Name}}",
-    "-grpc-addr=http://127.0.0.1:8502",
-    // for demo purposes (TODO: huh?)
-    "-admin-bind=0.0.0.0:{{.Service.EnvoyAdminPort}}",
-  {{if .Enterprise}} 
-    "-partition={{.Service.ID.Partition}}",
-    "-namespace={{.Service.ID.Namespace}}",
-  {{end}}
-  {{if .Token }}
-    "-token={{.Token}}",
-  {{end}}
-    "--",
-    "-l",
-    "trace",
-  ]
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/templates/container-app.tf.tmpl b/testing/deployer/sprawl/internal/tfgen/templates/container-app.tf.tmpl
deleted file mode 100644
index d6033587b1ead..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/templates/container-app.tf.tmpl
+++ /dev/null
@@ -1,25 +0,0 @@
-resource "docker_container" "{{.Node.DockerName}}-{{.Service.ID.TFString}}" {
-	name = "{{.Node.DockerName}}-{{.Service.ID.TFString}}"
-    network_mode = "container:${docker_container.{{.PodName}}.id}"
-    image        = docker_image.{{.ImageResource}}.latest
-    restart  = "on-failure"
-
-{{- range $k, $v := .Labels }}
-  labels {
-    label = "{{ $k }}"
-    value = "{{ $v }}"
-  }
-{{- end }}
-
-  env = [
-{{- range .Service.Env }}
-      "{{.}}",
-{{- end}}
-  ]
-
-  command = [
-{{- range .Service.Command }}
-    "{{.}}",
-{{- end }}
-  ]
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/templates/container-consul.tf.tmpl b/testing/deployer/sprawl/internal/tfgen/templates/container-consul.tf.tmpl
deleted file mode 100644
index fac148f29c2b6..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/templates/container-consul.tf.tmpl
+++ /dev/null
@@ -1,37 +0,0 @@
-resource "docker_container" "{{.Node.DockerName}}" {
-  name         = "{{.Node.DockerName}}"
-  network_mode = "container:${docker_container.{{.PodName}}.id}"
-  image        = docker_image.{{.ImageResource}}.latest
-  restart      = "always"
-
-  env = [
-      "CONSUL_UID=0",
-      "CONSUL_GID=0",
-      "CONSUL_LICENSE={{.EnterpriseLicense}}",
-  ]
-
-{{- range $k, $v := .Labels }}
-  labels {
-    label = "{{ $k }}"
-    value = "{{ $v }}"
-  }
-{{- end }}
-
-  command = [
-    "agent",
-    "-hcl",
-	<<-EOT
-{{ .HCL }}
-EOT
-  ]
-
-  volumes {
-    volume_name    = "{{.Node.DockerName}}"
-    container_path = "/consul/data"
-  }
-
-  volumes {
-    volume_name = "{{.TLSVolumeName}}"
-    container_path = "/consul/config/certs"
-  }
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/templates/container-coredns.tf.tmpl b/testing/deployer/sprawl/internal/tfgen/templates/container-coredns.tf.tmpl
deleted file mode 100644
index 7789376a98f10..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/templates/container-coredns.tf.tmpl
+++ /dev/null
@@ -1,28 +0,0 @@
-resource "docker_container" "{{.DockerNetworkName}}-coredns" {
-  name     = "{{.DockerNetworkName}}-coredns"
-  image = docker_image.coredns.latest
-  restart  = "always"
-  dns      = ["8.8.8.8"]
-
-  networks_advanced {
-    name         = docker_network.{{.DockerNetworkName}}.name
-    ipv4_address = "{{.IPAddress}}"
-  }
-
-  env = [
-{{- range .Env }}
-      "{{.}}",
-{{- end}}
-  ]
-
-  volumes {
-    host_path      = abspath("coredns-config-{{.Name}}")
-    container_path = "/config"
-    read_only      = true
-  }
-
-  command = [
-    "-conf",
-    "/config/Corefile",
-  ]
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/templates/container-mgw-dataplane.tf.tmpl b/testing/deployer/sprawl/internal/tfgen/templates/container-mgw-dataplane.tf.tmpl
deleted file mode 100644
index 18152e68eb6d6..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/templates/container-mgw-dataplane.tf.tmpl
+++ /dev/null
@@ -1,45 +0,0 @@
-resource "docker_container" "{{.Node.DockerName}}-{{.Service.ID.TFString}}" {
-	name = "{{.Node.DockerName}}-{{.Service.ID.TFString}}"
-    network_mode = "container:${docker_container.{{.PodName}}.id}"
-    image        = docker_image.{{.ImageResource}}.latest
-    restart      = "on-failure"
-
-{{- range $k, $v := .Labels }}
-  labels {
-    label = "{{ $k }}"
-    value = "{{ $v }}"
-  }
-{{- end }}
-
-  volumes {
-    volume_name    = "{{.TLSVolumeName}}"
-    container_path = "/consul/config/certs"
-    read_only      = true
-  }
-
-  env = [
-			"DP_CONSUL_ADDRESSES=server.{{.Node.Cluster}}-consulcluster.lan",
-			"DP_SERVICE_NODE_NAME={{.Node.PodName}}",
-			"DP_PROXY_SERVICE_ID={{.Service.ID.Name}}",
-    {{ if .Enterprise }}
-      "DP_SERVICE_NAMESPACE={{.Service.ID.Namespace}}",
-      "DP_SERVICE_PARTITION={{.Service.ID.Partition}}",
-    {{ end }}
-    {{ if .Token }}
-      "DP_CREDENTIAL_TYPE=static",
-      "DP_CREDENTIAL_STATIC_TOKEN={{.Token}}",
-    {{ end }}
-      // for demo purposes
-			"DP_ENVOY_ADMIN_BIND_ADDRESS=0.0.0.0",
-			"DP_ENVOY_ADMIN_BIND_PORT=19000",
-			"DP_LOG_LEVEL=trace",
-			"DP_CA_CERTS=/consul/config/certs/consul-agent-ca.pem",
-			"DP_CONSUL_GRPC_PORT=8503",
-			"DP_TLS_SERVER_NAME=server.{{.Node.Datacenter}}.consul",
-  ]
-
-  command = [
-    "/usr/local/bin/consul-dataplane",
-  ]
-}
-
diff --git a/testing/deployer/sprawl/internal/tfgen/templates/container-mgw.tf.tmpl b/testing/deployer/sprawl/internal/tfgen/templates/container-mgw.tf.tmpl
deleted file mode 100644
index 78c4abe8dfa42..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/templates/container-mgw.tf.tmpl
+++ /dev/null
@@ -1,39 +0,0 @@
-resource "docker_container" "{{.Node.DockerName}}-{{.Service.ID.TFString}}" {
-    name = "{{.Node.DockerName}}-{{.Service.ID.TFString}}"
-    network_mode = "container:${docker_container.{{.PodName}}.id}"
-    image        = docker_image.{{.ImageResource}}.latest
-    restart  = "on-failure"
-
-{{- range $k, $v := .Labels }}
-  labels {
-    label = "{{ $k }}"
-    value = "{{ $v }}"
-  }
-{{- end }}
-
-  volumes {
-    volume_name    = "{{.TLSVolumeName}}"
-    container_path = "/consul/config/certs"
-    read_only      = true
-  }
-
-  command = [
-    "consul", "connect", "envoy",
-    "-register",
-    "-mesh-gateway",
-    "-address={{`{{ GetInterfaceIP \"eth0\" }}`}}:{{.Service.Port}}",
-    "-wan-address={{`{{ GetInterfaceIP \"eth1\" }}`}}:{{.Service.Port}}",
-    "-grpc-addr=http://127.0.0.1:8502",
-    // for demo purposes (TODO: huh?)
-    "-admin-bind=0.0.0.0:{{.Service.EnvoyAdminPort}}",
-  {{ if .Enterprise }} 
-    "-partition={{.Service.ID.Partition}}",
-  {{end}}
-  {{ if .Token }}
-    "-token={{.Token}}",
-  {{end}}
-    "--",
-    "-l",
-    "trace",
-  ]
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/templates/container-pause.tf.tmpl b/testing/deployer/sprawl/internal/tfgen/templates/container-pause.tf.tmpl
deleted file mode 100644
index 1f1627b0719bd..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/templates/container-pause.tf.tmpl
+++ /dev/null
@@ -1,38 +0,0 @@
-resource "docker_container" "{{.PodName}}" {
-  name     = "{{.PodName}}"
-  image = docker_image.pause.latest
-  hostname = "{{.PodName}}"
-  restart  = "always"
-  dns      = ["{{.DNSAddress}}"]
-
-{{- range $k, $v := .Labels }}
-  labels {
-    label = "{{ $k }}"
-    value = "{{ $v }}"
-  }
-{{- end }}
-
-depends_on = [
-  docker_container.{{.DockerNetworkName}}-coredns,
-  docker_container.{{.DockerNetworkName}}-forwardproxy,
-]
-
-{{- range .Ports }}
-ports {
-  internal = {{.}}
-}
-{{- end }}
-
-{{- range .Node.Addresses }}
-networks_advanced {
-  name         = docker_network.{{.DockerNetworkName}}.name
-  ipv4_address = "{{.IPAddress}}"
-}
-{{- end }}
-}
-
-output "ports_{{.Node.Cluster}}_{{.Node.Partition}}_{{.Node.Name}}" {
-  value = {
-    for port in docker_container.{{.PodName}}.ports : port.internal => port.external
-  }
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/templates/container-proxy.tf.tmpl b/testing/deployer/sprawl/internal/tfgen/templates/container-proxy.tf.tmpl
deleted file mode 100644
index ed44d8343fe8b..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/templates/container-proxy.tf.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-resource "docker_container" "{{.DockerNetworkName}}-forwardproxy" {
-  name     = "{{.DockerNetworkName}}-forwardproxy"
-  image = docker_image.nginx.latest
-  restart  = "always"
-  dns      = ["8.8.8.8"]
-
-  ports {
-    internal = {{.InternalPort}}
-  }
-
-  networks_advanced {
-    name         = docker_network.{{.DockerNetworkName}}.name
-    ipv4_address = "{{.IPAddress}}"
-  }
-
-  env = [
-{{- range .Env }}
-      "{{.}}",
-{{- end}}
-  ]
-
-  volumes {
-    host_path      = abspath("nginx-config-{{.Name}}/nginx.conf")
-    container_path = "/etc/nginx/conf.d/default.conf"
-    read_only      = true
-  }
-}
-
-output "forwardproxyport_{{.Name}}" {
-  value = {
-    for port in docker_container.{{.DockerNetworkName}}-forwardproxy.ports : port.internal => port.external
-  }
-}
diff --git a/testing/deployer/sprawl/internal/tfgen/tfgen.go b/testing/deployer/sprawl/internal/tfgen/tfgen.go
deleted file mode 100644
index 6df36dcb2d6d2..0000000000000
--- a/testing/deployer/sprawl/internal/tfgen/tfgen.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tfgen
-
-import (
-	"embed"
-	"text/template"
-)
-
-//go:embed templates/container-app-dataplane.tf.tmpl
-//go:embed templates/container-app-sidecar.tf.tmpl
-//go:embed templates/container-app.tf.tmpl
-//go:embed templates/container-consul.tf.tmpl
-//go:embed templates/container-mgw.tf.tmpl
-//go:embed templates/container-mgw-dataplane.tf.tmpl
-//go:embed templates/container-pause.tf.tmpl
-//go:embed templates/container-proxy.tf.tmpl
-//go:embed templates/container-coredns.tf.tmpl
-var content embed.FS
-
-var (
-	tfAppDataplaneT         = template.Must(template.ParseFS(content, "templates/container-app-dataplane.tf.tmpl"))
-	tfAppSidecarT           = template.Must(template.ParseFS(content, "templates/container-app-sidecar.tf.tmpl"))
-	tfAppT                  = template.Must(template.ParseFS(content, "templates/container-app.tf.tmpl"))
-	tfConsulT               = template.Must(template.ParseFS(content, "templates/container-consul.tf.tmpl"))
-	tfMeshGatewayT          = template.Must(template.ParseFS(content, "templates/container-mgw.tf.tmpl"))
-	tfMeshGatewayDataplaneT = template.Must(template.ParseFS(content, "templates/container-mgw-dataplane.tf.tmpl"))
-	tfPauseT                = template.Must(template.ParseFS(content, "templates/container-pause.tf.tmpl"))
-	tfForwardProxyT         = template.Must(template.ParseFS(content, "templates/container-proxy.tf.tmpl"))
-	tfCorednsT              = template.Must(template.ParseFS(content, "templates/container-coredns.tf.tmpl"))
-)
diff --git a/testing/deployer/sprawl/peering.go b/testing/deployer/sprawl/peering.go
deleted file mode 100644
index dd280cc49a295..0000000000000
--- a/testing/deployer/sprawl/peering.go
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawl
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/go-hclog"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-)
-
-// TODO: this is definitely a grpc resolver/balancer issue to look into
-const grpcWeirdError = `transport: Error while dialing failed to find Consul server for global address`
-
-func isWeirdGRPCError(err error) bool {
-	if err == nil {
-		return false
-	}
-	return strings.Contains(err.Error(), grpcWeirdError)
-}
-
-func (s *Sprawl) initPeerings() error {
-	// TODO: wait until services are healthy? wait until mesh gateways work?
-	// if err := s.generator.Generate(tfgen.StepPeering); err != nil {
-	// 	return fmt.Errorf("generator[peering]: %w", err)
-	// }
-
-	var (
-		logger = s.logger.Named("peering")
-		_      = logger
-	)
-
-	for _, peering := range s.topology.Peerings {
-		dialingCluster, ok := s.topology.Clusters[peering.Dialing.Name]
-		if !ok {
-			return fmt.Errorf("peering references dialing cluster that does not exist: %s", peering.String())
-		}
-		acceptingCluster, ok := s.topology.Clusters[peering.Accepting.Name]
-		if !ok {
-			return fmt.Errorf("peering references accepting cluster that does not exist: %s", peering.String())
-		}
-
-		var (
-			dialingClient   = s.clients[dialingCluster.Name]
-			acceptingClient = s.clients[acceptingCluster.Name]
-		)
-
-		// TODO: allow for use of ServerExternalAddresses
-
-		req1 := api.PeeringGenerateTokenRequest{
-			PeerName: peering.Accepting.PeerName,
-		}
-		if acceptingCluster.Enterprise {
-			req1.Partition = peering.Accepting.Partition
-		}
-
-	GENTOKEN:
-		resp, _, err := acceptingClient.Peerings().GenerateToken(context.Background(), req1, nil)
-		if err != nil {
-			if isWeirdGRPCError(err) {
-				time.Sleep(50 * time.Millisecond)
-				goto GENTOKEN
-			}
-			return fmt.Errorf("error generating peering token for %q: %w", peering.String(), err)
-		}
-
-		peeringToken := resp.PeeringToken
-		logger.Debug("generated peering token", "peering", peering.String())
-
-		req2 := api.PeeringEstablishRequest{
-			PeerName:     peering.Dialing.PeerName,
-			PeeringToken: peeringToken,
-		}
-		if dialingCluster.Enterprise {
-			req2.Partition = peering.Dialing.Partition
-		}
-
-		logger.Info("registering peering with token", "peering", peering.String())
-	ESTABLISH:
-		_, _, err = dialingClient.Peerings().Establish(context.Background(), req2, nil)
-		if err != nil {
-			if isWeirdGRPCError(err) {
-				time.Sleep(50 * time.Millisecond)
-				goto ESTABLISH
-			}
-			// Establish and friends return an api.StatusError value, not pointer
-			// not sure if this is weird
-			var asStatusError api.StatusError
-			if errors.As(err, &asStatusError) && asStatusError.Code == http.StatusGatewayTimeout {
-				time.Sleep(50 * time.Millisecond)
-				goto ESTABLISH
-			}
-			return fmt.Errorf("error establishing peering with token for %q: %#v", peering.String(), err)
-		}
-
-		logger.Info("peering registered", "peering", peering.String())
-	}
-
-	return nil
-}
-
-func (s *Sprawl) waitForPeeringEstablishment() error {
-	var (
-		logger = s.logger.Named("peering")
-	)
-	logger.Info("awaiting peering establishment")
-	startTimeTotal := time.Now()
-
-	for _, peering := range s.topology.Peerings {
-		dialingCluster, ok := s.topology.Clusters[peering.Dialing.Name]
-		if !ok {
-			return fmt.Errorf("peering references dialing cluster that does not exist: %s", peering.String())
-		}
-		acceptingCluster, ok := s.topology.Clusters[peering.Accepting.Name]
-		if !ok {
-			return fmt.Errorf("peering references accepting cluster that does not exist: %s", peering.String())
-		}
-
-		var (
-			dialingClient   = s.clients[dialingCluster.Name]
-			acceptingClient = s.clients[acceptingCluster.Name]
-
-			dialingLogger = logger.With(
-				"cluster", dialingCluster.Name,
-				"peering", peering.String(),
-			)
-			acceptingLogger = logger.With(
-				"cluster", acceptingCluster.Name,
-				"peering", peering.String(),
-			)
-		)
-
-		s.checkPeeringDirection(dialingLogger, dialingClient, peering.Dialing, dialingCluster.Enterprise)
-		s.checkPeeringDirection(acceptingLogger, acceptingClient, peering.Accepting, acceptingCluster.Enterprise)
-	}
-	logger.Info("peering established", "dur", time.Since(startTimeTotal).Round(time.Second))
-	return nil
-}
-
-func (s *Sprawl) checkPeeringDirection(logger hclog.Logger, client *api.Client, pc topology.PeerCluster, enterprise bool) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	startTime := time.Now()
-
-	for {
-		opts := &api.QueryOptions{}
-		logger2 := logger.With("dur", time.Since(startTime).Round(time.Second))
-		if enterprise {
-			opts.Partition = pc.Partition
-		}
-		res, _, err := client.Peerings().Read(ctx, pc.PeerName, opts)
-		if isWeirdGRPCError(err) {
-			time.Sleep(50 * time.Millisecond)
-			continue
-		}
-		if err != nil {
-			logger2.Debug("error looking up peering", "error", err)
-			time.Sleep(100 * time.Millisecond)
-			continue
-		}
-		if res == nil {
-			logger2.Debug("peering not found")
-			time.Sleep(100 * time.Millisecond)
-			continue
-		}
-
-		if res.State == api.PeeringStateActive {
-			break
-		}
-		logger2.Debug("peering not active yet", "state", res.State)
-		time.Sleep(500 * time.Millisecond)
-	}
-	logger.Debug("peering is active", "dur", time.Since(startTime).Round(time.Second))
-}
diff --git a/testing/deployer/sprawl/sprawl.go b/testing/deployer/sprawl/sprawl.go
deleted file mode 100644
index 3433e1b3dc0ae..0000000000000
--- a/testing/deployer/sprawl/sprawl.go
+++ /dev/null
@@ -1,482 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawl
-
-import (
-	"bufio"
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-multierror"
-	"github.com/mitchellh/copystructure"
-
-	"github.com/hashicorp/consul/testing/deployer/sprawl/internal/runner"
-	"github.com/hashicorp/consul/testing/deployer/sprawl/internal/secrets"
-	"github.com/hashicorp/consul/testing/deployer/sprawl/internal/tfgen"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-	"github.com/hashicorp/consul/testing/deployer/util"
-)
-
-// TODO: manage workdir externally without chdir
-
-// Sprawl is the definition of a complete running Consul deployment topology.
-type Sprawl struct {
-	logger  hclog.Logger
-	runner  *runner.Runner
-	license string
-	secrets secrets.Store
-
-	workdir string
-
-	// set during Run
-	config    *topology.Config
-	topology  *topology.Topology
-	generator *tfgen.Generator
-
-	clients map[string]*api.Client // one per cluster
-}
-
-// Topology allows access to the topology that defines the resources. Do not
-// write to any of these fields.
-func (s *Sprawl) Topology() *topology.Topology {
-	return s.topology
-}
-
-func (s *Sprawl) Config() *topology.Config {
-	c2, err := copyConfig(s.config)
-	if err != nil {
-		panic(err)
-	}
-	return c2
-}
-
-func (s *Sprawl) HTTPClientForCluster(clusterName string) (*http.Client, error) {
-	cluster, ok := s.topology.Clusters[clusterName]
-	if !ok {
-		return nil, fmt.Errorf("no such cluster: %s", clusterName)
-	}
-
-	// grab the local network for the cluster
-	network, ok := s.topology.Networks[cluster.NetworkName]
-	if !ok {
-		return nil, fmt.Errorf("no such network: %s", cluster.NetworkName)
-	}
-
-	transport, err := util.ProxyHTTPTransport(network.ProxyPort)
-	if err != nil {
-		return nil, err
-	}
-
-	return &http.Client{Transport: transport}, nil
-}
-
-// APIClientForNode gets a pooled api.Client connected to the agent running on
-// the provided node.
-//
-// Passing an empty token will assume the bootstrap token. If you want to
-// actually use the anonymous token say "-".
-func (s *Sprawl) APIClientForNode(clusterName string, nid topology.NodeID, token string) (*api.Client, error) {
-	cluster, ok := s.topology.Clusters[clusterName]
-	if !ok {
-		return nil, fmt.Errorf("no such cluster: %s", clusterName)
-	}
-
-	nid.Normalize()
-
-	node := cluster.NodeByID(nid)
-	if !node.IsAgent() {
-		return nil, fmt.Errorf("node is not an agent")
-	}
-
-	switch token {
-	case "":
-		token = s.secrets.ReadGeneric(clusterName, secrets.BootstrapToken)
-	case "-":
-		token = ""
-	}
-
-	return util.ProxyAPIClient(
-		node.LocalProxyPort(),
-		node.LocalAddress(),
-		8500,
-		token,
-	)
-}
-
-// APIClientForCluster is a convenience wrapper for APIClientForNode that returns
-// an API client for an agent node in the cluster, preferring clients, then servers
-func (s *Sprawl) APIClientForCluster(clusterName, token string) (*api.Client, error) {
-	clu := s.topology.Clusters[clusterName]
-	// TODO: this always goes to the first client, but we might want to balance this
-	firstAgent := clu.FirstClient()
-	if firstAgent == nil {
-		firstAgent = clu.FirstServer()
-	}
-	if firstAgent == nil {
-		return nil, fmt.Errorf("failed to find agent in cluster %s", clusterName)
-	}
-	return s.APIClientForNode(clusterName, firstAgent.ID(), token)
-}
-
-func copyConfig(cfg *topology.Config) (*topology.Config, error) {
-	dup, err := copystructure.Copy(cfg)
-	if err != nil {
-		return nil, err
-	}
-	return dup.(*topology.Config), nil
-}
-
-// Launch will create the topology defined by the provided configuration and
-// bring up all of the relevant clusters. Once created the Stop method must be
-// called to destroy everything.
-func Launch(
-	logger hclog.Logger,
-	workdir string,
-	cfg *topology.Config,
-) (*Sprawl, error) {
-	if logger == nil {
-		panic("logger is required")
-	}
-	if workdir == "" {
-		panic("workdir is required")
-	}
-
-	if err := os.MkdirAll(filepath.Join(workdir, "terraform"), 0755); err != nil {
-		return nil, err
-	}
-
-	runner, err := runner.Load(logger)
-	if err != nil {
-		return nil, err
-	}
-
-	// Copy this to avoid leakage.
-	cfg, err = copyConfig(cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	s := &Sprawl{
-		logger:  logger,
-		runner:  runner,
-		workdir: workdir,
-		clients: make(map[string]*api.Client),
-	}
-
-	if err := s.ensureLicense(); err != nil {
-		return nil, err
-	}
-
-	// Copy this AGAIN, BEFORE compiling so we capture the original definition, without denorms.
-	s.config, err = copyConfig(cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	s.topology, err = topology.Compile(logger.Named("compile"), cfg)
-	if err != nil {
-		return nil, fmt.Errorf("topology.Compile: %w", err)
-	}
-
-	s.logger.Debug("compiled topology", "ct", jd(s.topology)) // TODO
-
-	start := time.Now()
-	if err := s.launch(); err != nil {
-		return nil, err
-	}
-	s.logger.Info("topology is ready for use", "elapsed", time.Since(start))
-
-	if err := s.PrintDetails(); err != nil {
-		return nil, fmt.Errorf("error gathering diagnostic details: %w", err)
-	}
-
-	return s, nil
-}
-
-func (s *Sprawl) Relaunch(
-	cfg *topology.Config,
-) error {
-	// Copy this BEFORE compiling so we capture the original definition, without denorms.
-	var err error
-	s.config, err = copyConfig(cfg)
-	if err != nil {
-		return err
-	}
-
-	newTopology, err := topology.Recompile(s.logger.Named("recompile"), cfg, s.topology)
-	if err != nil {
-		return fmt.Errorf("topology.Compile: %w", err)
-	}
-
-	s.topology = newTopology
-
-	s.logger.Debug("compiled replacement topology", "ct", jd(s.topology)) // TODO
-
-	start := time.Now()
-	if err := s.relaunch(); err != nil {
-		return err
-	}
-	s.logger.Info("topology is ready for use", "elapsed", time.Since(start))
-
-	if err := s.PrintDetails(); err != nil {
-		return fmt.Errorf("error gathering diagnostic details: %w", err)
-	}
-
-	return nil
-}
-
-// Leader returns the cluster leader agent, or an error if no leader is
-// available.
-func (s *Sprawl) Leader(clusterName string) (*topology.Node, error) {
-	cluster, ok := s.topology.Clusters[clusterName]
-	if !ok {
-		return nil, fmt.Errorf("no such cluster: %s", clusterName)
-	}
-
-	var (
-		client = s.clients[cluster.Name]
-		// logger = s.logger.With("cluster", cluster.Name)
-	)
-
-	leaderAddr, err := getLeader(client)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, node := range cluster.Nodes {
-		if !node.IsServer() || node.Disabled {
-			continue
-		}
-		if strings.HasPrefix(leaderAddr, node.LocalAddress()+":") {
-			return node, nil
-		}
-	}
-
-	return nil, fmt.Errorf("leader not found")
-}
-
-// Followers returns the cluster following servers.
-func (s *Sprawl) Followers(clusterName string) ([]*topology.Node, error) {
-	cluster, ok := s.topology.Clusters[clusterName]
-	if !ok {
-		return nil, fmt.Errorf("no such cluster: %s", clusterName)
-	}
-
-	leaderNode, err := s.Leader(clusterName)
-	if err != nil {
-		return nil, fmt.Errorf("could not determine leader: %w", err)
-	}
-
-	var followers []*topology.Node
-
-	for _, node := range cluster.Nodes {
-		if !node.IsServer() || node.Disabled {
-			continue
-		}
-		if node.ID() != leaderNode.ID() {
-			followers = append(followers, node)
-		}
-	}
-
-	return followers, nil
-}
-
-func (s *Sprawl) DisabledServers(clusterName string) ([]*topology.Node, error) {
-	cluster, ok := s.topology.Clusters[clusterName]
-	if !ok {
-		return nil, fmt.Errorf("no such cluster: %s", clusterName)
-	}
-
-	var servers []*topology.Node
-
-	for _, node := range cluster.Nodes {
-		if !node.IsServer() || !node.Disabled {
-			continue
-		}
-		servers = append(servers, node)
-	}
-
-	return servers, nil
-}
-
-func (s *Sprawl) StopContainer(ctx context.Context, containerName string) error {
-	return s.runner.DockerExec(ctx, []string{"stop", containerName}, nil, nil)
-}
-
-func (s *Sprawl) SnapshotEnvoy(ctx context.Context) error {
-	snapDir := filepath.Join(s.workdir, "envoy-snapshots")
-	if err := os.MkdirAll(snapDir, 0755); err != nil {
-		return fmt.Errorf("could not create envoy snapshot output dir %s: %w", snapDir, err)
-	}
-
-	targets := map[string]string{
-		"config_dump.json":     "config_dump",
-		"clusters.json":        "clusters?format=json",
-		"stats.txt":            "stats",
-		"stats_prometheus.txt": "stats/prometheus",
-	}
-
-	var merr error
-	for _, c := range s.topology.Clusters {
-		client, err := s.HTTPClientForCluster(c.Name)
-		if err != nil {
-			return fmt.Errorf("could not get http client for cluster %q: %w", c.Name, err)
-		}
-
-		for _, n := range c.Nodes {
-			if n.Disabled {
-				continue
-			}
-			for _, s := range n.Services {
-				if s.Disabled || s.EnvoyAdminPort <= 0 {
-					continue
-				}
-				prefix := fmt.Sprintf("http://%s:%d", n.LocalAddress(), s.EnvoyAdminPort)
-
-				for fn, target := range targets {
-					u := prefix + "/" + target
-
-					body, err := scrapeURL(client, u)
-					if err != nil {
-						merr = multierror.Append(merr, fmt.Errorf("could not scrape %q for %s on %s: %w",
-							target, s.ID.String(), n.ID().String(), err,
-						))
-						continue
-					}
-
-					outFn := filepath.Join(snapDir, n.DockerName()+"--"+s.ID.TFString()+"."+fn)
-
-					if err := os.WriteFile(outFn+".tmp", body, 0644); err != nil {
-						merr = multierror.Append(merr, fmt.Errorf("could not write output %q for %s on %s: %w",
-							target, s.ID.String(), n.ID().String(), err,
-						))
-						continue
-					}
-
-					if err := os.Rename(outFn+".tmp", outFn); err != nil {
-						merr = multierror.Append(merr, fmt.Errorf("could not write output %q for %s on %s: %w",
-							target, s.ID.String(), n.ID().String(), err,
-						))
-						continue
-					}
-				}
-			}
-		}
-	}
-	return merr
-}
-
-func scrapeURL(client *http.Client, url string) ([]byte, error) {
-	res, err := client.Get(url)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-
-	body, err := io.ReadAll(res.Body)
-	if err != nil {
-		return nil, err
-	}
-	return body, nil
-}
-
-func (s *Sprawl) CaptureLogs(ctx context.Context) error {
-	logDir := filepath.Join(s.workdir, "logs")
-	if err := os.MkdirAll(logDir, 0755); err != nil {
-		return fmt.Errorf("could not create log output dir %s: %w", logDir, err)
-	}
-
-	containers, err := s.listContainers(ctx)
-	if err != nil {
-		return err
-	}
-
-	s.logger.Debug("Capturing logs")
-
-	var merr error
-	for _, container := range containers {
-		if err := s.dumpContainerLogs(ctx, container, logDir); err != nil {
-			merr = multierror.Append(merr, fmt.Errorf("could not dump logs for container %s: %w", container, err))
-		}
-	}
-
-	return merr
-}
-
-// Dump known containers out of terraform state file.
-func (s *Sprawl) listContainers(ctx context.Context) ([]string, error) {
-	tfdir := filepath.Join(s.workdir, "terraform")
-
-	var buf bytes.Buffer
-	if err := s.runner.TerraformExec(ctx, []string{"state", "list"}, &buf, tfdir); err != nil {
-		return nil, fmt.Errorf("error listing containers in terraform state file: %w", err)
-	}
-
-	var (
-		scan       = bufio.NewScanner(&buf)
-		containers []string
-	)
-	for scan.Scan() {
-		line := strings.TrimSpace(scan.Text())
-
-		name := strings.TrimPrefix(line, "docker_container.")
-		if name != line {
-			containers = append(containers, name)
-			continue
-		}
-	}
-	if err := scan.Err(); err != nil {
-		return nil, err
-	}
-
-	return containers, nil
-}
-
-func (s *Sprawl) dumpContainerLogs(ctx context.Context, containerName, outputRoot string) error {
-	path := filepath.Join(outputRoot, containerName+".log")
-
-	f, err := os.Create(path + ".tmp")
-	if err != nil {
-		return err
-	}
-	keep := false
-	defer func() {
-		_ = f.Close()
-		if !keep {
-			_ = os.Remove(path + ".tmp")
-			_ = os.Remove(path)
-		}
-	}()
-
-	err = s.runner.DockerExecWithStderr(
-		ctx,
-		[]string{"logs", containerName},
-		f,
-		f,
-		nil,
-	)
-	if err != nil {
-		return err
-	}
-
-	if err := f.Close(); err != nil {
-		return err
-	}
-
-	if err := os.Rename(path+".tmp", path); err != nil {
-		return err
-	}
-
-	keep = true
-	return nil
-}
diff --git a/testing/deployer/sprawl/sprawltest/sprawltest.go b/testing/deployer/sprawl/sprawltest/sprawltest.go
deleted file mode 100644
index 7b1e0493d751e..0000000000000
--- a/testing/deployer/sprawl/sprawltest/sprawltest.go
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawltest
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"sync"
-	"testing"
-
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-multierror"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/testing/deployer/sprawl"
-	"github.com/hashicorp/consul/testing/deployer/sprawl/internal/runner"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-)
-
-// TODO(rb): move comments to doc.go
-
-var (
-	// set SPRAWL_WORKDIR_ROOT in the environment to have the test output
-	// coalesced in here. By default it uses a directory called "workdir" in
-	// each package.
-	workdirRoot string
-
-	// set SPRAWL_KEEP_WORKDIR=1 in the environment to keep the workdir output
-	// intact. Files are all destroyed by default.
-	keepWorkdirOnFail bool
-
-	// set SPRAWL_KEEP_RUNNING=1 in the environment to keep the workdir output
-	// intact and also refrain from tearing anything down. Things are all
-	// destroyed by default.
-	//
-	// SPRAWL_KEEP_RUNNING=1 implies SPRAWL_KEEP_WORKDIR=1
-	keepRunningOnFail bool
-
-	// set SPRAWL_SKIP_OLD_CLEANUP to prevent the library from tearing down and
-	// removing anything found in the working directory at init time. The
-	// default behavior is to do this.
-	skipOldCleanup bool
-)
-
-var cleanupPriorRunOnce sync.Once
-
-func init() {
-	if root := os.Getenv("SPRAWL_WORKDIR_ROOT"); root != "" {
-		fmt.Fprintf(os.Stdout, "INFO: sprawltest: SPRAWL_WORKDIR_ROOT set; using %q as output root\n", root)
-		workdirRoot = root
-	} else {
-		workdirRoot = "workdir"
-	}
-
-	if os.Getenv("SPRAWL_KEEP_WORKDIR") == "1" {
-		keepWorkdirOnFail = true
-		fmt.Fprintf(os.Stdout, "INFO: sprawltest: SPRAWL_KEEP_WORKDIR set; not destroying workdir on failure\n")
-	}
-
-	if os.Getenv("SPRAWL_KEEP_RUNNING") == "1" {
-		keepRunningOnFail = true
-		keepWorkdirOnFail = true
-		fmt.Fprintf(os.Stdout, "INFO: sprawltest: SPRAWL_KEEP_RUNNING set; not tearing down resources on failure\n")
-	}
-
-	if os.Getenv("SPRAWL_SKIP_OLD_CLEANUP") == "1" {
-		skipOldCleanup = true
-		fmt.Fprintf(os.Stdout, "INFO: sprawltest: SPRAWL_SKIP_OLD_CLEANUP set; not cleaning up anything found in %q\n", workdirRoot)
-	}
-
-	if !skipOldCleanup {
-		cleanupPriorRunOnce.Do(func() {
-			fmt.Fprintf(os.Stdout, "INFO: sprawltest: triggering cleanup of any prior test runs\n")
-			CleanupWorkingDirectories()
-		})
-	}
-}
-
-// Launch will create the topology defined by the provided configuration and
-// bring up all of the relevant clusters.
-//
-// - Logs will be routed to (*testing.T).Logf.
-//
-//   - By default everything will be stopped and removed via
-//     (*testing.T).Cleanup. For failed tests, this can be skipped by setting the
-//     environment variable SKIP_TEARDOWN=1.
-func Launch(t *testing.T, cfg *topology.Config) *sprawl.Sprawl {
-	SkipIfTerraformNotPresent(t)
-	logger := testutil.Logger(t)
-	// IMO default level for tests should be info, not warn
-	logger.SetLevel(testutil.TestLogLevelWithDefault(hclog.Info))
-	sp, err := sprawl.Launch(
-		logger,
-		initWorkingDirectory(t),
-		cfg,
-	)
-	require.NoError(t, err)
-	stopOnCleanup(t, sp)
-	return sp
-}
-
-func initWorkingDirectory(t *testing.T) string {
-	// TODO(rb): figure out how to get the calling package which we can put in
-	// the middle here, which is likely 2 call frames away so maybe
-	// runtime.Callers can help
-	scratchDir := filepath.Join(workdirRoot, t.Name())
-	_ = os.RemoveAll(scratchDir) // cleanup prior runs
-	if err := os.MkdirAll(scratchDir, 0755); err != nil {
-		t.Fatalf("error: %v", err)
-	}
-
-	t.Cleanup(func() {
-		if t.Failed() && keepWorkdirOnFail {
-			t.Logf("test failed; leaving sprawl terraform definitions in: %s", scratchDir)
-		} else {
-			_ = os.RemoveAll(scratchDir)
-		}
-	})
-
-	return scratchDir
-}
-
-func stopOnCleanup(t *testing.T, sp *sprawl.Sprawl) {
-	t.Cleanup(func() {
-		if t.Failed() && keepWorkdirOnFail {
-			// It's only worth it to capture the logs if we aren't going to
-			// immediately discard them.
-			if err := sp.CaptureLogs(context.Background()); err != nil {
-				t.Logf("log capture encountered failures: %v", err)
-			}
-			if err := sp.SnapshotEnvoy(context.Background()); err != nil {
-				t.Logf("envoy snapshot capture encountered failures: %v", err)
-			}
-		}
-
-		if t.Failed() && keepRunningOnFail {
-			t.Log("test failed; leaving sprawl running")
-		} else {
-			//nolint:errcheck
-			sp.Stop()
-		}
-	})
-}
-
-// CleanupWorkingDirectories is meant to run in an init() once at the start of
-// any tests.
-func CleanupWorkingDirectories() {
-	fi, err := os.ReadDir(workdirRoot)
-	if os.IsNotExist(err) {
-		return
-	} else if err != nil {
-		fmt.Fprintf(os.Stderr, "WARN: sprawltest: unable to scan 'workdir' for prior runs to cleanup\n")
-		return
-	} else if len(fi) == 0 {
-		fmt.Fprintf(os.Stdout, "INFO: sprawltest: no prior tests to clean up\n")
-		return
-	}
-
-	r, err := runner.Load(hclog.NewNullLogger())
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "WARN: sprawltest: unable to look for 'terraform' and 'docker' binaries\n")
-		return
-	}
-
-	ctx := context.Background()
-
-	for _, d := range fi {
-		if !d.IsDir() {
-			continue
-		}
-		path := filepath.Join(workdirRoot, d.Name(), "terraform")
-
-		fmt.Fprintf(os.Stdout, "INFO: sprawltest: cleaning up failed prior run in: %s\n", path)
-
-		err := r.TerraformExec(ctx, []string{
-			"init", "-input=false",
-		}, io.Discard, path)
-
-		err2 := r.TerraformExec(ctx, []string{
-			"destroy", "-input=false", "-auto-approve", "-refresh=false",
-		}, io.Discard, path)
-
-		if err2 != nil {
-			err = multierror.Append(err, err2)
-		}
-
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "WARN: sprawltest: could not clean up failed prior run in: %s: %v\n", path, err)
-		} else {
-			_ = os.RemoveAll(path)
-		}
-	}
-}
-
-func SkipIfTerraformNotPresent(t *testing.T) {
-	const terraformBinaryName = "terraform"
-
-	path, err := exec.LookPath(terraformBinaryName)
-	if err != nil || path == "" {
-		t.Skipf("%q not found on $PATH - download and install to run this test", terraformBinaryName)
-	}
-}
diff --git a/testing/deployer/sprawl/sprawltest/test_test.go b/testing/deployer/sprawl/sprawltest/test_test.go
deleted file mode 100644
index 1bb69ea77efee..0000000000000
--- a/testing/deployer/sprawl/sprawltest/test_test.go
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawltest_test
-
-import (
-	"strconv"
-	"testing"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/testing/deployer/sprawl/sprawltest"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-)
-
-func TestSprawl(t *testing.T) {
-	serversDC1 := newTopologyServerSet("dc1-server", 3, []string{"dc1", "wan"}, nil)
-	serversDC2 := newTopologyServerSet("dc2-server", 3, []string{"dc2", "wan"}, nil)
-
-	cfg := &topology.Config{
-		Networks: []*topology.Network{
-			{Name: "dc1"},
-			{Name: "dc2"},
-			{Name: "wan", Type: "wan"},
-		},
-		Clusters: []*topology.Cluster{
-			{
-				Name: "dc1",
-				Nodes: topology.MergeSlices(serversDC1, []*topology.Node{
-					{
-						Kind: topology.NodeKindClient,
-						Name: "dc1-client1",
-						Services: []*topology.Service{
-							{
-								ID:             topology.ServiceID{Name: "mesh-gateway"},
-								Port:           8443,
-								EnvoyAdminPort: 19000,
-								IsMeshGateway:  true,
-							},
-						},
-					},
-					{
-						Kind: topology.NodeKindClient,
-						Name: "dc1-client2",
-						Services: []*topology.Service{
-							{
-								ID:             topology.ServiceID{Name: "ping"},
-								Image:          "rboyer/pingpong:latest",
-								Port:           8080,
-								EnvoyAdminPort: 19000,
-								Command: []string{
-									"-bind", "0.0.0.0:8080",
-									"-dial", "127.0.0.1:9090",
-									"-pong-chaos",
-									"-dialfreq", "250ms",
-									"-name", "ping",
-								},
-								Upstreams: []*topology.Upstream{{
-									ID:        topology.ServiceID{Name: "pong"},
-									LocalPort: 9090,
-									Peer:      "peer-dc2-default",
-								}},
-							},
-						},
-					},
-				}),
-				InitialConfigEntries: []api.ConfigEntry{
-					&api.ExportedServicesConfigEntry{
-						Name: "default",
-						Services: []api.ExportedService{{
-							Name: "ping",
-							Consumers: []api.ServiceConsumer{{
-								Peer: "peer-dc2-default",
-							}},
-						}},
-					},
-				},
-			},
-			{
-				Name: "dc2",
-				Nodes: topology.MergeSlices(serversDC2, []*topology.Node{
-					{
-						Kind: topology.NodeKindClient,
-						Name: "dc2-client1",
-						Services: []*topology.Service{
-							{
-								ID:             topology.ServiceID{Name: "mesh-gateway"},
-								Port:           8443,
-								EnvoyAdminPort: 19000,
-								IsMeshGateway:  true,
-							},
-						},
-					},
-					{
-						Kind: topology.NodeKindDataplane,
-						Name: "dc2-client2",
-						Services: []*topology.Service{
-							{
-								ID:             topology.ServiceID{Name: "pong"},
-								Image:          "rboyer/pingpong:latest",
-								Port:           8080,
-								EnvoyAdminPort: 19000,
-								Command: []string{
-									"-bind", "0.0.0.0:8080",
-									"-dial", "127.0.0.1:9090",
-									"-pong-chaos",
-									"-dialfreq", "250ms",
-									"-name", "pong",
-								},
-								Upstreams: []*topology.Upstream{{
-									ID:        topology.ServiceID{Name: "ping"},
-									LocalPort: 9090,
-									Peer:      "peer-dc1-default",
-								}},
-							},
-						},
-					},
-				}),
-				InitialConfigEntries: []api.ConfigEntry{
-					&api.ExportedServicesConfigEntry{
-						Name: "default",
-						Services: []api.ExportedService{{
-							Name: "ping",
-							Consumers: []api.ServiceConsumer{{
-								Peer: "peer-dc2-default",
-							}},
-						}},
-					},
-				},
-			},
-		},
-		Peerings: []*topology.Peering{{
-			Dialing: topology.PeerCluster{
-				Name: "dc1",
-			},
-			Accepting: topology.PeerCluster{
-				Name: "dc2",
-			},
-		}},
-	}
-
-	sp := sprawltest.Launch(t, cfg)
-
-	for _, cluster := range sp.Topology().Clusters {
-		leader, err := sp.Leader(cluster.Name)
-		require.NoError(t, err)
-		t.Logf("%s: leader = %s", cluster.Name, leader.ID())
-
-		followers, err := sp.Followers(cluster.Name)
-		require.NoError(t, err)
-		for _, f := range followers {
-			t.Logf("%s: follower = %s", cluster.Name, f.ID())
-		}
-	}
-}
-
-func newTopologyServerSet(
-	namePrefix string,
-	num int,
-	networks []string,
-	mutateFn func(i int, node *topology.Node),
-) []*topology.Node {
-	var out []*topology.Node
-	for i := 1; i <= num; i++ {
-		name := namePrefix + strconv.Itoa(i)
-
-		node := &topology.Node{
-			Kind: topology.NodeKindServer,
-			Name: name,
-		}
-		for _, net := range networks {
-			node.Addresses = append(node.Addresses, &topology.Address{Network: net})
-		}
-
-		if mutateFn != nil {
-			mutateFn(i, node)
-		}
-
-		out = append(out, node)
-	}
-	return out
-}
diff --git a/testing/deployer/sprawl/tls.go b/testing/deployer/sprawl/tls.go
deleted file mode 100644
index bc5489206c7be..0000000000000
--- a/testing/deployer/sprawl/tls.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package sprawl
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-
-	"github.com/hashicorp/consul/testing/deployer/topology"
-)
-
-const (
-	consulUID     = "100"
-	consulGID     = "1000"
-	consulUserArg = consulUID + ":" + consulGID
-)
-
-func tlsPrefixFromNode(node *topology.Node) string {
-	switch node.Kind {
-	case topology.NodeKindServer:
-		return node.Partition + "." + node.Name + ".server"
-	case topology.NodeKindClient:
-		return node.Partition + "." + node.Name + ".client"
-	default:
-		return ""
-	}
-}
-
-func tlsCertCreateCommand(node *topology.Node) string {
-	if node.IsServer() {
-		return fmt.Sprintf(`consul tls cert create -server -dc=%s -node=%s`, node.Datacenter, node.PodName())
-	} else {
-		return fmt.Sprintf(`consul tls cert create -client -dc=%s`, node.Datacenter)
-	}
-}
-
-func (s *Sprawl) initTLS(ctx context.Context) error {
-	for _, cluster := range s.topology.Clusters {
-
-		var buf bytes.Buffer
-
-		// Create the CA if not already done, and proceed to do all of the
-		// consul CLI calls inside of a throwaway temp directory.
-		buf.WriteString(`
-if [[ ! -f consul-agent-ca-key.pem || ! -f consul-agent-ca.pem ]]; then
-	consul tls ca create
-fi
-rm -rf tmp
-mkdir -p tmp
-cp -a consul-agent-ca-key.pem consul-agent-ca.pem tmp
-cd tmp
-`)
-
-		for _, node := range cluster.Nodes {
-			if !node.IsAgent() || node.Disabled {
-				continue
-			}
-
-			node.TLSCertPrefix = tlsPrefixFromNode(node)
-			if node.TLSCertPrefix == "" {
-				continue
-			}
-
-			expectPrefix := cluster.Datacenter + "-" + string(node.Kind) + "-consul-0"
-
-			// Conditionally generate these in isolation and rename them to
-			// not rely upon the numerical indexing.
-			buf.WriteString(fmt.Sprintf(`
-if [[ ! -f %[1]s || ! -f %[2]s ]]; then
-	rm -f %[3]s %[4]s
-	%[5]s
-	mv -f %[3]s %[1]s
-	mv -f %[4]s %[2]s
-fi
-`,
-				"../"+node.TLSCertPrefix+"-key.pem", "../"+node.TLSCertPrefix+".pem",
-				expectPrefix+"-key.pem", expectPrefix+".pem",
-				tlsCertCreateCommand(node),
-			))
-		}
-
-		err := s.runner.DockerExec(ctx, []string{
-			"run",
-			"--rm",
-			"-i",
-			"--net=none",
-			"-v", cluster.TLSVolumeName + ":/data",
-			// TODO: latest busted?
-			// https://hashicorp.slack.com/archives/C03EUN3QF1C/p1691784078972959
-			"busybox:1.34",
-			"sh", "-c",
-			// Need this so the permissions stick; docker seems to treat unused volumes differently.
-			`touch /data/VOLUME_PLACEHOLDER && chown -R ` + consulUserArg + ` /data`,
-		}, io.Discard, nil)
-		if err != nil {
-			return fmt.Errorf("could not initialize docker volume for cert data %q: %w", cluster.TLSVolumeName, err)
-		}
-
-		err = s.runner.DockerExec(ctx, []string{"run",
-			"--rm",
-			"-i",
-			"--net=none",
-			"-u", consulUserArg,
-			"-v", cluster.TLSVolumeName + ":/data",
-			"-w", "/data",
-			"--entrypoint", "",
-			cluster.Images.Consul,
-			"/bin/sh", "-ec", buf.String(),
-		}, io.Discard, nil)
-		if err != nil {
-			return fmt.Errorf("could not create all necessary TLS certificates in docker volume: %v", err)
-		}
-	}
-
-	return nil
-}
diff --git a/testing/deployer/topology/compile.go b/testing/deployer/topology/compile.go
deleted file mode 100644
index 98f1c1e917e8c..0000000000000
--- a/testing/deployer/topology/compile.go
+++ /dev/null
@@ -1,678 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package topology
-
-import (
-	crand "crypto/rand"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"reflect"
-	"regexp"
-	"sort"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/go-hclog"
-)
-
-const DockerPrefix = "consulcluster"
-
-func Compile(logger hclog.Logger, raw *Config) (*Topology, error) {
-	return compile(logger, raw, nil)
-}
-
-func Recompile(logger hclog.Logger, raw *Config, prev *Topology) (*Topology, error) {
-	if prev == nil {
-		return nil, errors.New("missing previous topology")
-	}
-	return compile(logger, raw, prev)
-}
-
-func compile(logger hclog.Logger, raw *Config, prev *Topology) (*Topology, error) {
-	var id string
-	if prev == nil {
-		var err error
-		id, err = newTopologyID()
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		id = prev.ID
-	}
-
-	images := DefaultImages().OverrideWith(raw.Images)
-	if images.Consul != "" {
-		return nil, fmt.Errorf("topology.images.consul cannot be set at this level")
-	}
-
-	if len(raw.Networks) == 0 {
-		return nil, fmt.Errorf("topology.networks is empty")
-	}
-
-	networks := make(map[string]*Network)
-	for _, net := range raw.Networks {
-		if net.DockerName != "" {
-			return nil, fmt.Errorf("network %q should not specify DockerName", net.Name)
-		}
-		if !IsValidLabel(net.Name) {
-			return nil, fmt.Errorf("network name is not valid: %s", net.Name)
-		}
-		if _, exists := networks[net.Name]; exists {
-			return nil, fmt.Errorf("cannot have two networks with the same name %q", net.Name)
-		}
-
-		switch net.Type {
-		case "":
-			net.Type = "lan"
-		case "wan", "lan":
-		default:
-			return nil, fmt.Errorf("network %q has unknown type %q", net.Name, net.Type)
-		}
-
-		networks[net.Name] = net
-		net.DockerName = DockerPrefix + "-" + net.Name + "-" + id
-	}
-
-	if len(raw.Clusters) == 0 {
-		return nil, fmt.Errorf("topology.clusters is empty")
-	}
-
-	var (
-		clusters  = make(map[string]*Cluster)
-		nextIndex int // use a global index so any shared networks work properly with assignments
-	)
-
-	foundPeerNames := make(map[string]map[string]struct{})
-	for _, c := range raw.Clusters {
-		if c.Name == "" {
-			return nil, fmt.Errorf("cluster has no name")
-		}
-
-		foundPeerNames[c.Name] = make(map[string]struct{})
-
-		if !IsValidLabel(c.Name) {
-			return nil, fmt.Errorf("cluster name is not valid: %s", c.Name)
-		}
-
-		if _, exists := clusters[c.Name]; exists {
-			return nil, fmt.Errorf("cannot have two clusters with the same name %q; use unique names and override the Datacenter field if that's what you want", c.Name)
-		}
-
-		if c.Datacenter == "" {
-			c.Datacenter = c.Name
-		} else {
-			if !IsValidLabel(c.Datacenter) {
-				return nil, fmt.Errorf("datacenter name is not valid: %s", c.Datacenter)
-			}
-		}
-
-		clusters[c.Name] = c
-		if c.NetworkName == "" {
-			c.NetworkName = c.Name
-		}
-
-		c.Images = images.OverrideWith(c.Images).ChooseConsul(c.Enterprise)
-
-		if _, ok := networks[c.NetworkName]; !ok {
-			return nil, fmt.Errorf("cluster %q uses network name %q that does not exist", c.Name, c.NetworkName)
-		}
-
-		if len(c.Nodes) == 0 {
-			return nil, fmt.Errorf("cluster %q has no nodes", c.Name)
-		}
-
-		if c.TLSVolumeName != "" {
-			return nil, fmt.Errorf("user cannot specify the TLSVolumeName field")
-		}
-
-		tenancies := make(map[string]map[string]struct{})
-		addTenancy := func(partition, namespace string) {
-			partition = PartitionOrDefault(partition)
-			namespace = NamespaceOrDefault(namespace)
-			m, ok := tenancies[partition]
-			if !ok {
-				m = make(map[string]struct{})
-				tenancies[partition] = m
-			}
-			m[namespace] = struct{}{}
-		}
-
-		for _, ap := range c.Partitions {
-			addTenancy(ap.Name, "default")
-			for _, ns := range ap.Namespaces {
-				addTenancy(ap.Name, ns)
-			}
-		}
-
-		for _, ce := range c.InitialConfigEntries {
-			addTenancy(ce.GetPartition(), ce.GetNamespace())
-		}
-
-		seenNodes := make(map[NodeID]struct{})
-		for _, n := range c.Nodes {
-			if n.Name == "" {
-				return nil, fmt.Errorf("cluster %q node has no name", c.Name)
-			}
-			if !IsValidLabel(n.Name) {
-				return nil, fmt.Errorf("node name is not valid: %s", n.Name)
-			}
-
-			switch n.Kind {
-			case NodeKindServer, NodeKindClient, NodeKindDataplane:
-			default:
-				return nil, fmt.Errorf("cluster %q node %q has invalid kind: %s", c.Name, n.Name, n.Kind)
-			}
-
-			n.Partition = PartitionOrDefault(n.Partition)
-			if !IsValidLabel(n.Partition) {
-				return nil, fmt.Errorf("node partition is not valid: %s", n.Partition)
-			}
-			addTenancy(n.Partition, "default")
-
-			if _, exists := seenNodes[n.ID()]; exists {
-				return nil, fmt.Errorf("cannot have two nodes in the same cluster %q with the same name %q", c.Name, n.ID())
-			}
-			seenNodes[n.ID()] = struct{}{}
-
-			if len(n.usedPorts) != 0 {
-				return nil, fmt.Errorf("user cannot specify the usedPorts field")
-			}
-			n.usedPorts = make(map[int]int)
-			exposePort := func(v int) bool {
-				if _, ok := n.usedPorts[v]; ok {
-					return false
-				}
-				n.usedPorts[v] = 0
-				return true
-			}
-
-			if n.IsAgent() {
-				// TODO: the ux  here is awful; we should be able to examine the topology to guess properly
-				exposePort(8500)
-				if n.IsServer() {
-					exposePort(8503)
-				} else {
-					exposePort(8502)
-				}
-			}
-
-			if n.Index != 0 {
-				return nil, fmt.Errorf("user cannot specify the node index")
-			}
-			n.Index = nextIndex
-			nextIndex++
-
-			n.Images = c.Images.OverrideWith(n.Images).ChooseNode(n.Kind)
-
-			n.Cluster = c.Name
-			n.Datacenter = c.Datacenter
-			n.dockerName = DockerPrefix + "-" + n.Name + "-" + id
-
-			if len(n.Addresses) == 0 {
-				n.Addresses = append(n.Addresses, &Address{Network: c.NetworkName})
-			}
-			var (
-				numPublic int
-				numLocal  int
-			)
-			for _, addr := range n.Addresses {
-				if addr.Network == "" {
-					return nil, fmt.Errorf("cluster %q node %q has invalid address", c.Name, n.Name)
-				}
-
-				if addr.Type != "" {
-					return nil, fmt.Errorf("user cannot specify the address type directly")
-				}
-
-				net, ok := networks[addr.Network]
-				if !ok {
-					return nil, fmt.Errorf("cluster %q node %q uses network name %q that does not exist", c.Name, n.Name, addr.Network)
-				}
-
-				if net.IsPublic() {
-					numPublic++
-				} else if net.IsLocal() {
-					numLocal++
-				}
-				addr.Type = net.Type
-
-				addr.DockerNetworkName = net.DockerName
-			}
-
-			if numLocal == 0 {
-				return nil, fmt.Errorf("cluster %q node %q has no local addresses", c.Name, n.Name)
-			}
-			if numPublic > 1 {
-				return nil, fmt.Errorf("cluster %q node %q has more than one public address", c.Name, n.Name)
-			}
-
-			seenServices := make(map[ServiceID]struct{})
-			for _, svc := range n.Services {
-				if n.IsAgent() {
-					// Default to that of the enclosing node.
-					svc.ID.Partition = n.Partition
-				}
-				svc.ID.Normalize()
-
-				// Denormalize
-				svc.Node = n
-
-				if !IsValidLabel(svc.ID.Partition) {
-					return nil, fmt.Errorf("service partition is not valid: %s", svc.ID.Partition)
-				}
-				if !IsValidLabel(svc.ID.Namespace) {
-					return nil, fmt.Errorf("service namespace is not valid: %s", svc.ID.Namespace)
-				}
-				if !IsValidLabel(svc.ID.Name) {
-					return nil, fmt.Errorf("service name is not valid: %s", svc.ID.Name)
-				}
-				if svc.ID.Partition != n.Partition {
-					return nil, fmt.Errorf("service %s on node %s has mismatched partitions: %s != %s",
-						svc.ID.Name, n.Name, svc.ID.Partition, n.Partition)
-				}
-				addTenancy(svc.ID.Partition, svc.ID.Namespace)
-
-				if _, exists := seenServices[svc.ID]; exists {
-					return nil, fmt.Errorf("cannot have two services on the same node %q in the same cluster %q with the same name %q", n.ID(), c.Name, svc.ID)
-				}
-				seenServices[svc.ID] = struct{}{}
-
-				if !svc.DisableServiceMesh && n.IsDataplane() {
-					if svc.EnvoyPublicListenerPort <= 0 {
-						if _, ok := n.usedPorts[20000]; !ok {
-							// For convenience the FIRST service on a node can get 20000 for free.
-							svc.EnvoyPublicListenerPort = 20000
-						} else {
-							return nil, fmt.Errorf("envoy public listener port is required")
-						}
-					}
-				}
-
-				// add all of the service ports
-				for _, port := range svc.ports() {
-					if ok := exposePort(port); !ok {
-						return nil, fmt.Errorf("port used more than once on cluster %q node %q: %d", c.Name, n.ID(), port)
-					}
-				}
-
-				// TODO(rb): re-expose?
-				// switch svc.Protocol {
-				// case "":
-				// 	svc.Protocol = "tcp"
-				// 	fallthrough
-				// case "tcp":
-				// 	if svc.CheckHTTP != "" {
-				// 		return nil, fmt.Errorf("cannot set CheckHTTP for tcp service")
-				// 	}
-				// case "http":
-				// 	if svc.CheckTCP != "" {
-				// 		return nil, fmt.Errorf("cannot set CheckTCP for tcp service")
-				// 	}
-				// default:
-				// 	return nil, fmt.Errorf("service has invalid protocol: %s", svc.Protocol)
-				// }
-
-				for _, u := range svc.Upstreams {
-					// Default to that of the enclosing service.
-					if u.Peer == "" {
-						if u.ID.Partition == "" {
-							u.ID.Partition = svc.ID.Partition
-						}
-						if u.ID.Namespace == "" {
-							u.ID.Namespace = svc.ID.Namespace
-						}
-					} else {
-						if u.ID.Partition != "" {
-							u.ID.Partition = "" // irrelevant here; we'll set it to the value of the OTHER side for plumbing purposes in tests
-						}
-						u.ID.Namespace = NamespaceOrDefault(u.ID.Namespace)
-						foundPeerNames[c.Name][u.Peer] = struct{}{}
-					}
-
-					if u.ID.Name == "" {
-						return nil, fmt.Errorf("upstream service name is required")
-					}
-					addTenancy(u.ID.Partition, u.ID.Namespace)
-				}
-
-				if err := svc.Validate(); err != nil {
-					return nil, fmt.Errorf("cluster %q node %q service %q is not valid: %w", c.Name, n.Name, svc.ID.String(), err)
-				}
-			}
-		}
-
-		// Explode this into the explicit list based on stray references made.
-		c.Partitions = nil
-		for ap, nsMap := range tenancies {
-			p := &Partition{
-				Name: ap,
-			}
-			for ns := range nsMap {
-				p.Namespaces = append(p.Namespaces, ns)
-			}
-			sort.Strings(p.Namespaces)
-			c.Partitions = append(c.Partitions, p)
-		}
-		sort.Slice(c.Partitions, func(i, j int) bool {
-			return c.Partitions[i].Name < c.Partitions[j].Name
-		})
-
-		if !c.Enterprise {
-			expect := []*Partition{{Name: "default", Namespaces: []string{"default"}}}
-			if !reflect.DeepEqual(c.Partitions, expect) {
-				return nil, fmt.Errorf("cluster %q references non-default partitions or namespaces but is CE", c.Name)
-			}
-		}
-	}
-
-	clusteredPeerings := make(map[string]map[string]*PeerCluster) // local-cluster -> local-peer -> info
-	addPeerMapEntry := func(pc PeerCluster) {
-		pm, ok := clusteredPeerings[pc.Name]
-		if !ok {
-			pm = make(map[string]*PeerCluster)
-			clusteredPeerings[pc.Name] = pm
-		}
-		pm[pc.PeerName] = &pc
-	}
-	for _, p := range raw.Peerings {
-		dialingCluster, ok := clusters[p.Dialing.Name]
-		if !ok {
-			return nil, fmt.Errorf("peering references a dialing cluster that does not exist: %s", p.Dialing.Name)
-		}
-		acceptingCluster, ok := clusters[p.Accepting.Name]
-		if !ok {
-			return nil, fmt.Errorf("peering references an accepting cluster that does not exist: %s", p.Accepting.Name)
-		}
-		if p.Dialing.Name == p.Accepting.Name {
-			return nil, fmt.Errorf("self peerings are not allowed: %s", p.Dialing.Name)
-		}
-
-		p.Dialing.Partition = PartitionOrDefault(p.Dialing.Partition)
-		p.Accepting.Partition = PartitionOrDefault(p.Accepting.Partition)
-
-		if dialingCluster.Enterprise {
-			if !dialingCluster.hasPartition(p.Dialing.Partition) {
-				return nil, fmt.Errorf("dialing side of peering cannot reference a partition that does not exist: %s", p.Dialing.Partition)
-			}
-		} else {
-			if p.Dialing.Partition != "default" {
-				return nil, fmt.Errorf("dialing side of peering cannot reference a partition when CE")
-			}
-		}
-		if acceptingCluster.Enterprise {
-			if !acceptingCluster.hasPartition(p.Accepting.Partition) {
-				return nil, fmt.Errorf("accepting side of peering cannot reference a partition that does not exist: %s", p.Accepting.Partition)
-			}
-		} else {
-			if p.Accepting.Partition != "default" {
-				return nil, fmt.Errorf("accepting side of peering cannot reference a partition when CE")
-			}
-		}
-
-		if p.Dialing.PeerName == "" {
-			p.Dialing.PeerName = "peer-" + p.Accepting.Name + "-" + p.Accepting.Partition
-		}
-		if p.Accepting.PeerName == "" {
-			p.Accepting.PeerName = "peer-" + p.Dialing.Name + "-" + p.Dialing.Partition
-		}
-
-		{ // Ensure the link fields do not have recursive links.
-			p.Dialing.Link = nil
-			p.Accepting.Link = nil
-
-			// Copy the un-linked data before setting the link
-			pa := p.Accepting
-			pd := p.Dialing
-
-			p.Accepting.Link = &pd
-			p.Dialing.Link = &pa
-		}
-
-		addPeerMapEntry(p.Accepting)
-		addPeerMapEntry(p.Dialing)
-
-		delete(foundPeerNames[p.Accepting.Name], p.Accepting.PeerName)
-		delete(foundPeerNames[p.Dialing.Name], p.Dialing.PeerName)
-	}
-
-	for cluster, peers := range foundPeerNames {
-		if len(peers) > 0 {
-			var pretty []string
-			for name := range peers {
-				pretty = append(pretty, name)
-			}
-			sort.Strings(pretty)
-			return nil, fmt.Errorf("cluster[%s] found topology references to peerings that do not exist: %v", cluster, pretty)
-		}
-	}
-
-	// after we decoded the peering stuff, we can fill in some computed data in the upstreams
-	for _, c := range clusters {
-		c.Peerings = clusteredPeerings[c.Name]
-		for _, n := range c.Nodes {
-			for _, svc := range n.Services {
-				for _, u := range svc.Upstreams {
-					if u.Peer == "" {
-						u.Cluster = c.Name
-						u.Peering = nil
-						continue
-					}
-					remotePeer, ok := c.Peerings[u.Peer]
-					if !ok {
-						return nil, fmt.Errorf("not possible")
-					}
-					u.Cluster = remotePeer.Link.Name
-					u.Peering = remotePeer.Link
-					// this helps in generating fortio assertions; otherwise field is ignored
-					u.ID.Partition = remotePeer.Link.Partition
-				}
-			}
-		}
-	}
-
-	t := &Topology{
-		ID:       id,
-		Networks: networks,
-		Clusters: clusters,
-		Images:   images,
-		Peerings: raw.Peerings,
-	}
-
-	if prev != nil {
-		// networks cannot change
-		if !sameKeys(prev.Networks, t.Networks) {
-			return nil, fmt.Errorf("cannot create or destroy networks")
-		}
-
-		for _, newNetwork := range t.Networks {
-			oldNetwork := prev.Networks[newNetwork.Name]
-
-			// Carryover
-			newNetwork.inheritFromExisting(oldNetwork)
-
-			if err := isSame(oldNetwork, newNetwork); err != nil {
-				return nil, fmt.Errorf("networks cannot change: %w", err)
-			}
-
-		}
-
-		// cannot add or remove an entire cluster
-		if !sameKeys(prev.Clusters, t.Clusters) {
-			return nil, fmt.Errorf("cannot create or destroy clusters")
-		}
-
-		for _, newCluster := range t.Clusters {
-			oldCluster := prev.Clusters[newCluster.Name]
-
-			// Carryover
-			newCluster.inheritFromExisting(oldCluster)
-
-			if newCluster.Name != oldCluster.Name ||
-				newCluster.NetworkName != oldCluster.NetworkName ||
-				newCluster.Datacenter != oldCluster.Datacenter ||
-				newCluster.Enterprise != oldCluster.Enterprise {
-				return nil, fmt.Errorf("cannot edit some cluster fields for %q", newCluster.Name)
-			}
-
-			// WARN on presence of some things.
-			if len(newCluster.InitialConfigEntries) > 0 {
-				logger.Warn("initial config entries were provided, but are skipped on recompile")
-			}
-
-			// Check NODES
-			if err := inheritAndValidateNodes(oldCluster.Nodes, newCluster.Nodes); err != nil {
-				return nil, fmt.Errorf("some immutable aspects of nodes were changed in cluster %q: %w", newCluster.Name, err)
-			}
-		}
-	}
-
-	return t, nil
-}
-
-const permutedWarning = "use the disabled node kind if you want to ignore a node"
-
-func inheritAndValidateNodes(
-	prev, curr []*Node,
-) error {
-	nodeMap := mapifyNodes(curr)
-
-	for prevIdx, node := range prev {
-		currNode, ok := nodeMap[node.ID()]
-		if !ok {
-			return fmt.Errorf("node %q has vanished; "+permutedWarning, node.ID())
-		}
-		// Ensure it hasn't been permuted.
-		if currNode.Pos != prevIdx {
-			return fmt.Errorf(
-				"node %q has been shuffled %d -> %d; "+permutedWarning,
-				node.ID(),
-				prevIdx,
-				currNode.Pos,
-			)
-		}
-
-		if currNode.Node.Kind != node.Kind ||
-			currNode.Node.Partition != node.Partition ||
-			currNode.Node.Name != node.Name ||
-			currNode.Node.Index != node.Index ||
-			len(currNode.Node.Addresses) != len(node.Addresses) ||
-			!sameKeys(currNode.Node.usedPorts, node.usedPorts) {
-			return fmt.Errorf("cannot edit some node fields for %q", node.ID())
-		}
-
-		currNode.Node.inheritFromExisting(node)
-
-		for i := 0; i < len(currNode.Node.Addresses); i++ {
-			prevAddr := node.Addresses[i]
-			currAddr := currNode.Node.Addresses[i]
-
-			if prevAddr.Network != currAddr.Network {
-				return fmt.Errorf("addresses were shuffled for node %q", node.ID())
-			}
-
-			if prevAddr.Type != currAddr.Type {
-				return fmt.Errorf("cannot edit some address fields for %q", node.ID())
-			}
-
-			currAddr.inheritFromExisting(prevAddr)
-		}
-
-		svcMap := mapifyServices(currNode.Node.Services)
-
-		for _, svc := range node.Services {
-			currSvc, ok := svcMap[svc.ID]
-			if !ok {
-				continue // service has vanished, this is ok
-			}
-			// don't care about index permutation
-
-			if currSvc.ID != svc.ID ||
-				currSvc.Port != svc.Port ||
-				currSvc.EnvoyAdminPort != svc.EnvoyAdminPort ||
-				currSvc.EnvoyPublicListenerPort != svc.EnvoyPublicListenerPort ||
-				isSame(currSvc.Command, svc.Command) != nil ||
-				isSame(currSvc.Env, svc.Env) != nil {
-				return fmt.Errorf("cannot edit some address fields for %q", svc.ID)
-			}
-
-			currSvc.inheritFromExisting(svc)
-		}
-	}
-	return nil
-}
-
-func newTopologyID() (string, error) {
-	const n = 16
-	id := make([]byte, n)
-	if _, err := crand.Read(id[:]); err != nil {
-		return "", err
-	}
-	return hex.EncodeToString(id)[:n], nil
-}
-
-// matches valid DNS labels according to RFC 1123, should be at most 63
-// characters according to the RFC
-var validLabel = regexp.MustCompile(`^[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?$`)
-
-// IsValidLabel returns true if the string given is a valid DNS label (RFC 1123).
-// Note: the only difference between RFC 1035 and RFC 1123 labels is that in
-// RFC 1123 labels can begin with a number.
-func IsValidLabel(name string) bool {
-	return validLabel.MatchString(name)
-}
-
-// ValidateLabel is similar to IsValidLabel except it returns an error
-// instead of false when name is not a valid DNS label. The error will contain
-// reference to what constitutes a valid DNS label.
-func ValidateLabel(name string) error {
-	if !IsValidLabel(name) {
-		return errors.New("a valid DNS label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character")
-	}
-	return nil
-}
-
-func isSame(x, y any) error {
-	diff := cmp.Diff(x, y)
-	if diff != "" {
-		return fmt.Errorf("values are not equal\n--- expected\n+++ actual\n%v", diff)
-	}
-	return nil
-}
-
-func sameKeys[K comparable, V any](x, y map[K]V) bool {
-	if len(x) != len(y) {
-		return false
-	}
-
-	for kx := range x {
-		if _, ok := y[kx]; !ok {
-			return false
-		}
-	}
-	return true
-}
-
-func mapifyNodes(nodes []*Node) map[NodeID]nodeWithPosition {
-	m := make(map[NodeID]nodeWithPosition)
-	for i, node := range nodes {
-		m[node.ID()] = nodeWithPosition{
-			Pos:  i,
-			Node: node,
-		}
-	}
-	return m
-}
-
-type nodeWithPosition struct {
-	Pos  int
-	Node *Node
-}
-
-func mapifyServices(services []*Service) map[ServiceID]*Service {
-	m := make(map[ServiceID]*Service)
-	for _, svc := range services {
-		m[svc.ID] = svc
-	}
-	return m
-}
diff --git a/testing/deployer/topology/default_cdp.go b/testing/deployer/topology/default_cdp.go
deleted file mode 100644
index f20df3d1a9ccb..0000000000000
--- a/testing/deployer/topology/default_cdp.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package topology
-
-const DefaultDataplaneImage = "hashicorp/consul-dataplane:1.2.1"
diff --git a/testing/deployer/topology/default_consul.go b/testing/deployer/topology/default_consul.go
deleted file mode 100644
index f9542f16643d6..0000000000000
--- a/testing/deployer/topology/default_consul.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package topology
-
-const DefaultConsulImage = "hashicorp/consul:1.15.2"
-const DefaultConsulEnterpriseImage = "hashicorp/consul-enterprise:1.15.2-ent"
diff --git a/testing/deployer/topology/default_envoy.go b/testing/deployer/topology/default_envoy.go
deleted file mode 100644
index c557a318a17fd..0000000000000
--- a/testing/deployer/topology/default_envoy.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package topology
-
-const DefaultEnvoyImage = "envoyproxy/envoy:v1.25.1"
diff --git a/testing/deployer/topology/ids.go b/testing/deployer/topology/ids.go
deleted file mode 100644
index 3f964b12548e6..0000000000000
--- a/testing/deployer/topology/ids.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package topology
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/consul/api"
-)
-
-type NodeServiceID struct {
-	Node      string
-	Service   string `json:",omitempty"`
-	Namespace string `json:",omitempty"`
-	Partition string `json:",omitempty"`
-}
-
-func NewNodeServiceID(node, service, namespace, partition string) NodeServiceID {
-	id := NodeServiceID{
-		Node:      node,
-		Service:   service,
-		Namespace: namespace,
-		Partition: partition,
-	}
-	id.Normalize()
-	return id
-}
-
-func (id NodeServiceID) NodeID() NodeID {
-	return NewNodeID(id.Node, id.Partition)
-}
-
-func (id NodeServiceID) ServiceID() ServiceID {
-	return NewServiceID(id.Service, id.Namespace, id.Partition)
-}
-
-func (id *NodeServiceID) Normalize() {
-	id.Namespace = NamespaceOrDefault(id.Namespace)
-	id.Partition = PartitionOrDefault(id.Partition)
-}
-
-func (id NodeServiceID) String() string {
-	return fmt.Sprintf("%s/%s/%s/%s", id.Partition, id.Node, id.Namespace, id.Service)
-}
-
-type NodeID struct {
-	Name      string `json:",omitempty"`
-	Partition string `json:",omitempty"`
-}
-
-func NewNodeID(name, partition string) NodeID {
-	id := NodeID{
-		Name:      name,
-		Partition: partition,
-	}
-	id.Normalize()
-	return id
-}
-
-func (id *NodeID) Normalize() {
-	id.Partition = PartitionOrDefault(id.Partition)
-}
-
-func (id NodeID) String() string {
-	return fmt.Sprintf("%s/%s", id.Partition, id.Name)
-}
-
-func (id NodeID) ACLString() string {
-	return fmt.Sprintf("%s--%s", id.Partition, id.Name)
-}
-func (id NodeID) TFString() string {
-	return id.ACLString()
-}
-
-type ServiceID struct {
-	Name      string `json:",omitempty"`
-	Namespace string `json:",omitempty"`
-	Partition string `json:",omitempty"`
-}
-
-func NewServiceID(name, namespace, partition string) ServiceID {
-	id := ServiceID{
-		Name:      name,
-		Namespace: namespace,
-		Partition: partition,
-	}
-	id.Normalize()
-	return id
-}
-
-func (id ServiceID) Less(other ServiceID) bool {
-	if id.Partition != other.Partition {
-		return id.Partition < other.Partition
-	}
-	if id.Namespace != other.Namespace {
-		return id.Namespace < other.Namespace
-	}
-	return id.Name < other.Name
-}
-
-func (id *ServiceID) Normalize() {
-	id.Namespace = NamespaceOrDefault(id.Namespace)
-	id.Partition = PartitionOrDefault(id.Partition)
-}
-
-func (id ServiceID) String() string {
-	return fmt.Sprintf("%s/%s/%s", id.Partition, id.Namespace, id.Name)
-}
-
-func (id ServiceID) ACLString() string {
-	return fmt.Sprintf("%s--%s--%s", id.Partition, id.Namespace, id.Name)
-}
-func (id ServiceID) TFString() string {
-	return id.ACLString()
-}
-
-func PartitionOrDefault(name string) string {
-	if name == "" {
-		return "default"
-	}
-	return name
-}
-func NamespaceOrDefault(name string) string {
-	if name == "" {
-		return "default"
-	}
-	return name
-}
-
-func DefaultToEmpty(name string) string {
-	if name == "default" {
-		return ""
-	}
-	return name
-}
-
-// PartitionQueryOptions returns an *api.QueryOptions with the given partition
-// field set only if the partition is non-default. This helps when writing
-// tests for joint use in CE and ENT.
-func PartitionQueryOptions(partition string) *api.QueryOptions {
-	return &api.QueryOptions{
-		Partition: DefaultToEmpty(partition),
-	}
-}
diff --git a/testing/deployer/topology/images.go b/testing/deployer/topology/images.go
deleted file mode 100644
index 836ddb091c915..0000000000000
--- a/testing/deployer/topology/images.go
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package topology
-
-import (
-	"strings"
-)
-
-type Images struct {
-	Consul           string `json:",omitempty"`
-	ConsulCE         string `json:",omitempty"`
-	ConsulEnterprise string `json:",omitempty"`
-	Envoy            string
-	Dataplane        string
-}
-
-func (i Images) LocalDataplaneImage() string {
-	if i.Dataplane == "" {
-		return ""
-	}
-
-	img, tag, ok := strings.Cut(i.Dataplane, ":")
-	if !ok {
-		tag = "latest"
-	}
-
-	repo, name, ok := strings.Cut(img, "/")
-	if ok {
-		name = repo + "-" + name
-	}
-
-	// ex: local/hashicorp-consul-dataplane:1.1.0
-	return "local/" + name + ":" + tag
-}
-
-func (i Images) EnvoyConsulImage() string {
-	if i.Consul == "" || i.Envoy == "" {
-		return ""
-	}
-
-	img1, tag1, ok1 := strings.Cut(i.Consul, ":")
-	img2, tag2, ok2 := strings.Cut(i.Envoy, ":")
-	if !ok1 {
-		tag1 = "latest"
-	}
-	if !ok2 {
-		tag2 = "latest"
-	}
-
-	repo1, name1, ok1 := strings.Cut(img1, "/")
-	repo2, name2, ok2 := strings.Cut(img2, "/")
-
-	if ok1 {
-		name1 = repo1 + "-" + name1
-	} else {
-		name1 = repo1
-	}
-	if ok2 {
-		name2 = repo2 + "-" + name2
-	} else {
-		name2 = repo2
-	}
-
-	// ex: local/hashicorp-consul-and-envoyproxy-envoy:1.15.0-with-v1.26.2
-	return "local/" + name1 + "-and-" + name2 + ":" + tag1 + "-with-" + tag2
-}
-
-// TODO: what is this for and why do we need to do this and why is it named this?
-func (i Images) ChooseNode(kind NodeKind) Images {
-	switch kind {
-	case NodeKindServer:
-		i.Envoy = ""
-		i.Dataplane = ""
-	case NodeKindClient:
-		i.Dataplane = ""
-	case NodeKindDataplane:
-		i.Envoy = ""
-	default:
-		// do nothing
-	}
-	return i
-}
-
-func (i Images) ChooseConsul(enterprise bool) Images {
-	if enterprise {
-		i.Consul = i.ConsulEnterprise
-	} else {
-		i.Consul = i.ConsulCE
-	}
-	i.ConsulEnterprise = ""
-	i.ConsulCE = ""
-	return i
-}
-
-func (i Images) OverrideWith(i2 Images) Images {
-	if i2.Consul != "" {
-		i.Consul = i2.Consul
-	}
-	if i2.ConsulCE != "" {
-		i.ConsulCE = i2.ConsulCE
-	}
-	if i2.ConsulEnterprise != "" {
-		i.ConsulEnterprise = i2.ConsulEnterprise
-	}
-	if i2.Envoy != "" {
-		i.Envoy = i2.Envoy
-	}
-	if i2.Dataplane != "" {
-		i.Dataplane = i2.Dataplane
-	}
-	return i
-}
-
-// DefaultImages controls which specific docker images are used as default
-// values for topology components that do not specify values.
-//
-// These can be bulk-updated using the make target 'make update-defaults'
-func DefaultImages() Images {
-	return Images{
-		Consul:           "",
-		ConsulCE:         DefaultConsulImage,
-		ConsulEnterprise: DefaultConsulEnterpriseImage,
-		Envoy:            DefaultEnvoyImage,
-		Dataplane:        DefaultDataplaneImage,
-	}
-}
diff --git a/testing/deployer/topology/images_test.go b/testing/deployer/topology/images_test.go
deleted file mode 100644
index d3ea2136e260c..0000000000000
--- a/testing/deployer/topology/images_test.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package topology
-
-import (
-	"strconv"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestImages_EnvoyConsulImage(t *testing.T) {
-	type testcase struct {
-		consul, envoy string
-		expect        string
-	}
-
-	run := func(t *testing.T, tc testcase) {
-		i := Images{Consul: tc.consul, Envoy: tc.envoy}
-		j := i.EnvoyConsulImage()
-		require.Equal(t, tc.expect, j)
-	}
-
-	cases := []testcase{
-		{
-			consul: "",
-			envoy:  "",
-			expect: "",
-		},
-		{
-			consul: "consul",
-			envoy:  "",
-			expect: "",
-		},
-		{
-			consul: "",
-			envoy:  "envoy",
-			expect: "",
-		},
-		{
-			consul: "consul",
-			envoy:  "envoy",
-			expect: "local/consul-and-envoy:latest-with-latest",
-		},
-		// repos
-		{
-			consul: "hashicorp/consul",
-			envoy:  "envoy",
-			expect: "local/hashicorp-consul-and-envoy:latest-with-latest",
-		},
-		{
-			consul: "consul",
-			envoy:  "envoyproxy/envoy",
-			expect: "local/consul-and-envoyproxy-envoy:latest-with-latest",
-		},
-		{
-			consul: "hashicorp/consul",
-			envoy:  "envoyproxy/envoy",
-			expect: "local/hashicorp-consul-and-envoyproxy-envoy:latest-with-latest",
-		},
-		// tags
-		{
-			consul: "consul:1.15.0",
-			envoy:  "envoy",
-			expect: "local/consul-and-envoy:1.15.0-with-latest",
-		},
-		{
-			consul: "consul",
-			envoy:  "envoy:v1.26.1",
-			expect: "local/consul-and-envoy:latest-with-v1.26.1",
-		},
-		{
-			consul: "consul:1.15.0",
-			envoy:  "envoy:v1.26.1",
-			expect: "local/consul-and-envoy:1.15.0-with-v1.26.1",
-		},
-		// repos+tags
-		{
-			consul: "hashicorp/consul:1.15.0",
-			envoy:  "envoy:v1.26.1",
-			expect: "local/hashicorp-consul-and-envoy:1.15.0-with-v1.26.1",
-		},
-		{
-			consul: "consul:1.15.0",
-			envoy:  "envoyproxy/envoy:v1.26.1",
-			expect: "local/consul-and-envoyproxy-envoy:1.15.0-with-v1.26.1",
-		},
-		{
-			consul: "hashicorp/consul:1.15.0",
-			envoy:  "envoyproxy/envoy:v1.26.1",
-			expect: "local/hashicorp-consul-and-envoyproxy-envoy:1.15.0-with-v1.26.1",
-		},
-	}
-
-	for i, tc := range cases {
-		t.Run(strconv.Itoa(i), func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
diff --git a/testing/deployer/topology/topology.go b/testing/deployer/topology/topology.go
deleted file mode 100644
index a71dbaa4514ff..0000000000000
--- a/testing/deployer/topology/topology.go
+++ /dev/null
@@ -1,788 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package topology
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"net/netip"
-	"reflect"
-	"sort"
-
-	"github.com/hashicorp/consul/api"
-)
-
-type Topology struct {
-	ID string
-
-	// Images controls which specific docker images are used when running this
-	// node. Non-empty fields here override non-empty fields inherited from the
-	// general default values from DefaultImages().
-	Images Images
-
-	// Networks is the list of networks to create for this set of clusters.
-	Networks map[string]*Network
-
-	// Clusters defines the list of Consul clusters that should be created, and
-	// their associated workloads.
-	Clusters map[string]*Cluster
-
-	// Peerings defines the list of pairwise peerings that should be established
-	// between clusters.
-	Peerings []*Peering `json:",omitempty"`
-}
-
-func (t *Topology) DigestExposedProxyPort(netName string, proxyPort int) (bool, error) {
-	net, ok := t.Networks[netName]
-	if !ok {
-		return false, fmt.Errorf("found output network that does not exist: %s", netName)
-	}
-	if net.ProxyPort == proxyPort {
-		return false, nil
-	}
-
-	net.ProxyPort = proxyPort
-
-	// Denormalize for UX.
-	for _, cluster := range t.Clusters {
-		for _, node := range cluster.Nodes {
-			for _, addr := range node.Addresses {
-				if addr.Network == netName {
-					addr.ProxyPort = proxyPort
-				}
-			}
-		}
-	}
-
-	return true, nil
-}
-
-func (t *Topology) SortedNetworks() []*Network {
-	var out []*Network
-	for _, n := range t.Networks {
-		out = append(out, n)
-	}
-	sort.Slice(out, func(i, j int) bool {
-		return out[i].Name < out[j].Name
-	})
-	return out
-}
-
-func (t *Topology) SortedClusters() []*Cluster {
-	var out []*Cluster
-	for _, c := range t.Clusters {
-		out = append(out, c)
-	}
-	sort.Slice(out, func(i, j int) bool {
-		return out[i].Name < out[j].Name
-	})
-	return out
-}
-
-type Config struct {
-	// Images controls which specific docker images are used when running this
-	// node. Non-empty fields here override non-empty fields inherited from the
-	// general default values from DefaultImages().
-	Images Images
-
-	// Networks is the list of networks to create for this set of clusters.
-	Networks []*Network
-
-	// Clusters defines the list of Consul clusters that should be created, and
-	// their associated workloads.
-	Clusters []*Cluster
-
-	// Peerings defines the list of pairwise peerings that should be established
-	// between clusters.
-	Peerings []*Peering
-}
-
-func (c *Config) Cluster(name string) *Cluster {
-	for _, cluster := range c.Clusters {
-		if cluster.Name == name {
-			return cluster
-		}
-	}
-	return nil
-}
-
-type Network struct {
-	Type string // lan/wan ; empty means lan
-	Name string // logical name
-
-	// computed at topology compile
-	DockerName string
-	// generated during network-and-tls
-	Subnet string
-	IPPool []string `json:"-"`
-	// generated during network-and-tls
-	ProxyAddress string `json:",omitempty"`
-	DNSAddress   string `json:",omitempty"`
-	// filled in from terraform outputs after network-and-tls
-	ProxyPort int `json:",omitempty"`
-}
-
-func (n *Network) IsLocal() bool {
-	return n.Type == "" || n.Type == "lan"
-}
-
-func (n *Network) IsPublic() bool {
-	return n.Type == "wan"
-}
-
-func (n *Network) inheritFromExisting(existing *Network) {
-	n.Subnet = existing.Subnet
-	n.IPPool = existing.IPPool
-	n.ProxyAddress = existing.ProxyAddress
-	n.DNSAddress = existing.DNSAddress
-	n.ProxyPort = existing.ProxyPort
-}
-
-func (n *Network) IPByIndex(index int) string {
-	if index >= len(n.IPPool) {
-		panic(fmt.Sprintf(
-			"not enough ips on this network to assign index %d: %d",
-			len(n.IPPool), index,
-		))
-	}
-	return n.IPPool[index]
-}
-
-func (n *Network) SetSubnet(subnet string) (bool, error) {
-	if n.Subnet == subnet {
-		return false, nil
-	}
-
-	p, err := netip.ParsePrefix(subnet)
-	if err != nil {
-		return false, err
-	}
-	if !p.IsValid() {
-		return false, errors.New("not valid")
-	}
-	p = p.Masked()
-
-	var ipPool []string
-
-	addr := p.Addr()
-	for {
-		if !p.Contains(addr) {
-			break
-		}
-		ipPool = append(ipPool, addr.String())
-		addr = addr.Next()
-	}
-
-	ipPool = ipPool[2:] // skip the x.x.x.{0,1}
-
-	n.Subnet = subnet
-	n.IPPool = ipPool
-	return true, nil
-}
-
-// Cluster represents a single standalone install of Consul. This is the unit
-// of what is peered when using cluster peering. Older consul installs would
-// call this a datacenter.
-type Cluster struct {
-	Name        string
-	NetworkName string // empty assumes same as Name
-
-	// Images controls which specific docker images are used when running this
-	// cluster. Non-empty fields here override non-empty fields inherited from
-	// the enclosing Topology.
-	Images Images
-
-	// Enterprise marks this cluster as desiring to run Consul Enterprise
-	// components.
-	Enterprise bool `json:",omitempty"`
-
-	// Nodes is the definition of the nodes (agent-less and agent-ful).
-	Nodes []*Node
-
-	// Partitions is a list of tenancy configurations that should be created
-	// after the servers come up but before the clients and the rest of the
-	// topology starts.
-	//
-	// Enterprise Only.
-	Partitions []*Partition `json:",omitempty"`
-
-	// Datacenter defaults to "Name" if left unspecified. It lets you possibly
-	// create multiple peer clusters with identical datacenter names.
-	Datacenter string
-
-	// InitialConfigEntries is a convenience function to have some config
-	// entries created after the servers start up but before the rest of the
-	// topology comes up.
-	InitialConfigEntries []api.ConfigEntry `json:",omitempty"`
-
-	// TLSVolumeName is the docker volume name containing the various certs
-	// generated by 'consul tls cert create'
-	//
-	// This is generated during the networking phase and is not user specified.
-	TLSVolumeName string `json:",omitempty"`
-
-	// Peerings is a map of peering names to information about that peering in this cluster
-	//
-	// Denormalized during compile.
-	Peerings map[string]*PeerCluster `json:",omitempty"`
-}
-
-func (c *Cluster) inheritFromExisting(existing *Cluster) {
-	c.TLSVolumeName = existing.TLSVolumeName
-}
-
-type Partition struct {
-	Name       string
-	Namespaces []string
-}
-
-func (c *Cluster) hasPartition(p string) bool {
-	for _, partition := range c.Partitions {
-		if partition.Name == p {
-			return true
-		}
-	}
-	return false
-}
-
-func (c *Cluster) PartitionQueryOptionsList() []*api.QueryOptions {
-	if !c.Enterprise {
-		return []*api.QueryOptions{{}}
-	}
-
-	var out []*api.QueryOptions
-	for _, p := range c.Partitions {
-		out = append(out, &api.QueryOptions{Partition: p.Name})
-	}
-	return out
-}
-
-func (c *Cluster) ServerNodes() []*Node {
-	var out []*Node
-	for _, node := range c.SortedNodes() {
-		if node.Kind != NodeKindServer || node.Disabled {
-			continue
-		}
-		out = append(out, node)
-	}
-	return out
-}
-
-func (c *Cluster) ServerByAddr(addr string) *Node {
-	expect, _, err := net.SplitHostPort(addr)
-	if err != nil {
-		return nil
-	}
-
-	for _, node := range c.Nodes {
-		if node.Kind != NodeKindServer || node.Disabled {
-			continue
-		}
-		if node.LocalAddress() == expect {
-			return node
-		}
-	}
-
-	return nil
-}
-
-func (c *Cluster) FirstServer() *Node {
-	for _, node := range c.Nodes {
-		// TODO: not sure why we check that it has 8500 exposed?
-		if node.IsServer() && !node.Disabled && node.ExposedPort(8500) > 0 {
-			return node
-		}
-	}
-	return nil
-}
-
-func (c *Cluster) FirstClient() *Node {
-	for _, node := range c.Nodes {
-		if node.Kind != NodeKindClient || node.Disabled {
-			continue
-		}
-		return node
-	}
-	return nil
-}
-
-func (c *Cluster) ActiveNodes() []*Node {
-	var out []*Node
-	for _, node := range c.Nodes {
-		if !node.Disabled {
-			out = append(out, node)
-		}
-	}
-	return out
-}
-
-func (c *Cluster) SortedNodes() []*Node {
-	var out []*Node
-	out = append(out, c.Nodes...)
-
-	kindOrder := map[NodeKind]int{
-		NodeKindServer:    1,
-		NodeKindClient:    2,
-		NodeKindDataplane: 2,
-	}
-	sort.Slice(out, func(i, j int) bool {
-		ni, nj := out[i], out[j]
-
-		// servers before clients/dataplanes
-		ki, kj := kindOrder[ni.Kind], kindOrder[nj.Kind]
-		if ki < kj {
-			return true
-		} else if ki > kj {
-			return false
-		}
-
-		// lex sort by partition
-		if ni.Partition < nj.Partition {
-			return true
-		} else if ni.Partition > nj.Partition {
-			return false
-		}
-
-		// lex sort by name
-		return ni.Name < nj.Name
-	})
-	return out
-}
-
-func (c *Cluster) FindService(id NodeServiceID) *Service {
-	id.Normalize()
-
-	nid := id.NodeID()
-	sid := id.ServiceID()
-	return c.ServiceByID(nid, sid)
-}
-
-func (c *Cluster) ServiceByID(nid NodeID, sid ServiceID) *Service {
-	return c.NodeByID(nid).ServiceByID(sid)
-}
-
-func (c *Cluster) ServicesByID(sid ServiceID) []*Service {
-	sid.Normalize()
-
-	var out []*Service
-	for _, n := range c.Nodes {
-		for _, svc := range n.Services {
-			if svc.ID == sid {
-				out = append(out, svc)
-			}
-		}
-	}
-	return out
-}
-
-func (c *Cluster) NodeByID(nid NodeID) *Node {
-	nid.Normalize()
-	for _, n := range c.Nodes {
-		if n.ID() == nid {
-			return n
-		}
-	}
-	panic("node not found: " + nid.String())
-}
-
-type Address struct {
-	Network string
-
-	// denormalized at topology compile
-	Type string
-	// denormalized at topology compile
-	DockerNetworkName string
-	// generated after network-and-tls
-	IPAddress string
-	// denormalized from terraform outputs stored in the Network
-	ProxyPort int `json:",omitempty"`
-}
-
-func (a *Address) inheritFromExisting(existing *Address) {
-	a.IPAddress = existing.IPAddress
-	a.ProxyPort = existing.ProxyPort
-}
-
-func (a Address) IsLocal() bool {
-	return a.Type == "" || a.Type == "lan"
-}
-
-func (a Address) IsPublic() bool {
-	return a.Type == "wan"
-}
-
-type NodeKind string
-
-const (
-	NodeKindUnknown   NodeKind = ""
-	NodeKindServer    NodeKind = "server"
-	NodeKindClient    NodeKind = "client"
-	NodeKindDataplane NodeKind = "dataplane"
-)
-
-// TODO: rename pod
-type Node struct {
-	Kind      NodeKind
-	Partition string // will be not empty
-	Name      string // logical name
-
-	// Images controls which specific docker images are used when running this
-	// node. Non-empty fields here override non-empty fields inherited from
-	// the enclosing Cluster.
-	Images Images
-
-	Disabled bool `json:",omitempty"`
-
-	Addresses []*Address
-	Services  []*Service
-
-	// denormalized at topology compile
-	Cluster    string
-	Datacenter string
-
-	// computed at topology compile
-	Index int
-
-	// generated during network-and-tls
-	TLSCertPrefix string `json:",omitempty"`
-
-	// dockerName is computed at topology compile
-	dockerName string
-
-	// usedPorts has keys that are computed at topology compile (internal
-	// ports) and values initialized to zero until terraform creates the pods
-	// and extracts the exposed port values from output variables.
-	usedPorts map[int]int // keys are from compile / values are from terraform output vars
-}
-
-func (n *Node) DockerName() string {
-	return n.dockerName
-}
-
-func (n *Node) ExposedPort(internalPort int) int {
-	return n.usedPorts[internalPort]
-}
-
-func (n *Node) SortedPorts() []int {
-	var out []int
-	for internalPort := range n.usedPorts {
-		out = append(out, internalPort)
-	}
-	sort.Ints(out)
-	return out
-}
-
-func (n *Node) inheritFromExisting(existing *Node) {
-	n.TLSCertPrefix = existing.TLSCertPrefix
-
-	merged := existing.usedPorts
-	for k, vNew := range n.usedPorts {
-		if _, present := merged[k]; !present {
-			merged[k] = vNew
-		}
-	}
-	n.usedPorts = merged
-}
-
-func (n *Node) String() string {
-	return n.ID().String()
-}
-
-func (n *Node) ID() NodeID {
-	return NewNodeID(n.Name, n.Partition)
-}
-
-func (n *Node) CatalogID() NodeID {
-	return NewNodeID(n.PodName(), n.Partition)
-}
-
-func (n *Node) PodName() string {
-	return n.dockerName + "-pod"
-}
-
-func (n *Node) AddressByNetwork(name string) *Address {
-	for _, a := range n.Addresses {
-		if a.Network == name {
-			return a
-		}
-	}
-	return nil
-}
-
-func (n *Node) LocalAddress() string {
-	for _, a := range n.Addresses {
-		if a.IsLocal() {
-			if a.IPAddress == "" {
-				panic("node has no assigned local address")
-			}
-			return a.IPAddress
-		}
-	}
-	panic("node has no local network")
-}
-
-func (n *Node) HasPublicAddress() bool {
-	for _, a := range n.Addresses {
-		if a.IsPublic() {
-			return true
-		}
-	}
-	return false
-}
-
-func (n *Node) LocalProxyPort() int {
-	for _, a := range n.Addresses {
-		if a.IsLocal() {
-			if a.ProxyPort > 0 {
-				return a.ProxyPort
-			}
-			panic("node has no assigned local address")
-		}
-	}
-	panic("node has no local network")
-}
-
-func (n *Node) PublicAddress() string {
-	for _, a := range n.Addresses {
-		if a.IsPublic() {
-			if a.IPAddress == "" {
-				panic("node has no assigned public address")
-			}
-			return a.IPAddress
-		}
-	}
-	panic("node has no public network")
-}
-
-func (n *Node) PublicProxyPort() int {
-	for _, a := range n.Addresses {
-		if a.IsPublic() {
-			if a.ProxyPort > 0 {
-				return a.ProxyPort
-			}
-			panic("node has no assigned public address")
-		}
-	}
-	panic("node has no public network")
-}
-
-func (n *Node) IsServer() bool {
-	return n.Kind == NodeKindServer
-}
-
-func (n *Node) IsAgent() bool {
-	return n.Kind == NodeKindServer || n.Kind == NodeKindClient
-}
-
-func (n *Node) RunsWorkloads() bool {
-	return n.IsAgent() || n.IsDataplane()
-}
-
-func (n *Node) IsDataplane() bool {
-	return n.Kind == NodeKindDataplane
-}
-
-func (n *Node) SortedServices() []*Service {
-	var out []*Service
-	out = append(out, n.Services...)
-	sort.Slice(out, func(i, j int) bool {
-		mi := out[i].IsMeshGateway
-		mj := out[j].IsMeshGateway
-		if mi && !mi {
-			return false
-		} else if !mi && mj {
-			return true
-		}
-		return out[i].ID.Less(out[j].ID)
-	})
-	return out
-}
-
-// DigestExposedPorts returns true if it was changed.
-func (n *Node) DigestExposedPorts(ports map[int]int) bool {
-	if reflect.DeepEqual(n.usedPorts, ports) {
-		return false
-	}
-	for internalPort := range n.usedPorts {
-		if v, ok := ports[internalPort]; ok {
-			n.usedPorts[internalPort] = v
-		} else {
-			panic(fmt.Sprintf(
-				"cluster %q node %q port %d not found in exposed list",
-				n.Cluster,
-				n.ID(),
-				internalPort,
-			))
-		}
-	}
-	for _, svc := range n.Services {
-		svc.DigestExposedPorts(ports)
-	}
-
-	return true
-}
-
-func (n *Node) ServiceByID(sid ServiceID) *Service {
-	sid.Normalize()
-	for _, svc := range n.Services {
-		if svc.ID == sid {
-			return svc
-		}
-	}
-	panic("service not found: " + sid.String())
-}
-
-type ServiceAndNode struct {
-	Service *Service
-	Node    *Node
-}
-
-type Service struct {
-	ID          ServiceID
-	Image       string
-	Port        int
-	ExposedPort int `json:",omitempty"`
-
-	Disabled bool `json:",omitempty"` // TODO
-
-	// TODO: expose extra port here?
-
-	Meta map[string]string `json:",omitempty"`
-
-	// TODO(rb): re-expose this perhaps? Protocol  string `json:",omitempty"` // tcp|http (empty == tcp)
-	CheckHTTP string `json:",omitempty"` // url; will do a GET
-	CheckTCP  string `json:",omitempty"` // addr; will do a socket open/close
-
-	EnvoyAdminPort          int
-	ExposedEnvoyAdminPort   int `json:",omitempty"`
-	EnvoyPublicListenerPort int `json:",omitempty"` // agentless
-
-	Command []string `json:",omitempty"` // optional
-	Env     []string `json:",omitempty"` // optional
-
-	DisableServiceMesh bool `json:",omitempty"`
-	IsMeshGateway      bool `json:",omitempty"`
-	Upstreams          []*Upstream
-
-	// denormalized at topology compile
-	Node *Node `json:"-"`
-}
-
-func (s *Service) inheritFromExisting(existing *Service) {
-	s.ExposedPort = existing.ExposedPort
-	s.ExposedEnvoyAdminPort = existing.ExposedEnvoyAdminPort
-}
-
-func (s *Service) ports() []int {
-	var out []int
-	if s.Port > 0 {
-		out = append(out, s.Port)
-	}
-	if s.EnvoyAdminPort > 0 {
-		out = append(out, s.EnvoyAdminPort)
-	}
-	if s.EnvoyPublicListenerPort > 0 {
-		out = append(out, s.EnvoyPublicListenerPort)
-	}
-	for _, u := range s.Upstreams {
-		if u.LocalPort > 0 {
-			out = append(out, u.LocalPort)
-		}
-	}
-	return out
-}
-
-func (s *Service) HasCheck() bool {
-	return s.CheckTCP != "" || s.CheckHTTP != ""
-}
-
-func (s *Service) DigestExposedPorts(ports map[int]int) {
-	s.ExposedPort = ports[s.Port]
-	if s.EnvoyAdminPort > 0 {
-		s.ExposedEnvoyAdminPort = ports[s.EnvoyAdminPort]
-	} else {
-		s.ExposedEnvoyAdminPort = 0
-	}
-}
-
-func (s *Service) Validate() error {
-	if s.ID.Name == "" {
-		return fmt.Errorf("service name is required")
-	}
-	if s.Image == "" && !s.IsMeshGateway {
-		return fmt.Errorf("service image is required")
-	}
-	if s.Port <= 0 {
-		return fmt.Errorf("service has invalid port")
-	}
-	if s.DisableServiceMesh && s.IsMeshGateway {
-		return fmt.Errorf("cannot disable service mesh and still run a mesh gateway")
-	}
-	if s.DisableServiceMesh && len(s.Upstreams) > 0 {
-		return fmt.Errorf("cannot disable service mesh and configure upstreams")
-	}
-
-	if s.DisableServiceMesh {
-		if s.EnvoyAdminPort != 0 {
-			return fmt.Errorf("cannot use envoy admin port without a service mesh")
-		}
-	} else {
-		if s.EnvoyAdminPort <= 0 {
-			return fmt.Errorf("envoy admin port is required")
-		}
-	}
-
-	for _, u := range s.Upstreams {
-		if u.ID.Name == "" {
-			return fmt.Errorf("upstream service name is required")
-		}
-		if u.LocalPort <= 0 {
-			return fmt.Errorf("upstream local port is required")
-		}
-
-		if u.LocalAddress != "" {
-			ip := net.ParseIP(u.LocalAddress)
-			if ip == nil {
-				return fmt.Errorf("upstream local address is invalid: %s", u.LocalAddress)
-			}
-		}
-	}
-
-	return nil
-}
-
-type Upstream struct {
-	ID           ServiceID
-	LocalAddress string `json:",omitempty"` // defaults to 127.0.0.1
-	LocalPort    int
-	Peer         string `json:",omitempty"`
-	// TODO: what about mesh gateway mode overrides?
-
-	// computed at topology compile
-	Cluster string       `json:",omitempty"`
-	Peering *PeerCluster `json:",omitempty"` // this will have Link!=nil
-}
-
-type Peering struct {
-	Dialing   PeerCluster
-	Accepting PeerCluster
-}
-
-type PeerCluster struct {
-	Name      string
-	Partition string
-	PeerName  string // name to call it on this side; defaults if not specified
-
-	// computed at topology compile (pointer so it can be empty in json)
-	Link *PeerCluster `json:",omitempty"`
-}
-
-func (c PeerCluster) String() string {
-	return c.Name + ":" + c.Partition
-}
-
-func (p *Peering) String() string {
-	return "(" + p.Dialing.String() + ")->(" + p.Accepting.String() + ")"
-}
diff --git a/testing/deployer/topology/util.go b/testing/deployer/topology/util.go
deleted file mode 100644
index a6d6670c2655c..0000000000000
--- a/testing/deployer/topology/util.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package topology
-
-func MergeSlices[V any](x, y []V) []V {
-	switch {
-	case len(x) == 0 && len(y) == 0:
-		return nil
-	case len(x) == 0:
-		return y
-	case len(y) == 0:
-		return x
-	}
-
-	out := make([]V, 0, len(x)+len(y))
-	out = append(out, x...)
-	out = append(out, y...)
-	return out
-}
diff --git a/testing/deployer/topology/util_test.go b/testing/deployer/topology/util_test.go
deleted file mode 100644
index a858a4e698149..0000000000000
--- a/testing/deployer/topology/util_test.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package topology
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestMergeSlices(t *testing.T) {
-	require.Nil(t, MergeSlices[int](nil, nil))
-}
diff --git a/testing/deployer/util/consul.go b/testing/deployer/util/consul.go
deleted file mode 100644
index d3ebc037a9fed..0000000000000
--- a/testing/deployer/util/consul.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package util
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-	"strconv"
-
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/go-cleanhttp"
-)
-
-func ProxyNotPooledAPIClient(proxyPort int, containerIP string, containerPort int, token string) (*api.Client, error) {
-	return proxyAPIClient(cleanhttp.DefaultTransport(), proxyPort, containerIP, containerPort, token)
-}
-
-func ProxyAPIClient(proxyPort int, containerIP string, containerPort int, token string) (*api.Client, error) {
-	return proxyAPIClient(cleanhttp.DefaultPooledTransport(), proxyPort, containerIP, containerPort, token)
-}
-
-func proxyAPIClient(baseTransport *http.Transport, proxyPort int, containerIP string, containerPort int, token string) (*api.Client, error) {
-	if proxyPort <= 0 {
-		return nil, fmt.Errorf("cannot use an http proxy on port %d", proxyPort)
-	}
-	if containerIP == "" {
-		return nil, fmt.Errorf("container IP is required")
-	}
-	if containerPort <= 0 {
-		return nil, fmt.Errorf("cannot dial api client on port %d", containerPort)
-	}
-
-	proxyURL, err := url.Parse("http://127.0.0.1:" + strconv.Itoa(proxyPort))
-	if err != nil {
-		return nil, err
-	}
-
-	cfg := api.DefaultConfig()
-	cfg.Transport = baseTransport
-	cfg.Transport.Proxy = http.ProxyURL(proxyURL)
-	cfg.Address = fmt.Sprintf("http://%s:%d", containerIP, containerPort)
-	cfg.Token = token
-	return api.NewClient(cfg)
-}
-
-func ProxyNotPooledHTTPTransport(proxyPort int) (*http.Transport, error) {
-	return proxyHTTPTransport(cleanhttp.DefaultTransport(), proxyPort)
-}
-
-func ProxyHTTPTransport(proxyPort int) (*http.Transport, error) {
-	return proxyHTTPTransport(cleanhttp.DefaultPooledTransport(), proxyPort)
-}
-
-func proxyHTTPTransport(baseTransport *http.Transport, proxyPort int) (*http.Transport, error) {
-	if proxyPort <= 0 {
-		return nil, fmt.Errorf("cannot use an http proxy on port %d", proxyPort)
-	}
-	proxyURL, err := url.Parse("http://127.0.0.1:" + strconv.Itoa(proxyPort))
-	if err != nil {
-		return nil, err
-	}
-	baseTransport.Proxy = http.ProxyURL(proxyURL)
-	return baseTransport, nil
-}
diff --git a/testing/deployer/util/files.go b/testing/deployer/util/files.go
deleted file mode 100644
index 5929f227e501a..0000000000000
--- a/testing/deployer/util/files.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package util
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-
-	"golang.org/x/crypto/blake2b"
-)
-
-func FilesExist(parent string, paths ...string) (bool, error) {
-	for _, p := range paths {
-		ok, err := FileExists(filepath.Join(parent, p))
-		if err != nil {
-			return false, err
-		}
-		if !ok {
-			return false, nil
-		}
-	}
-	return true, nil
-}
-
-func FileExists(path string) (bool, error) {
-	_, err := os.Stat(path)
-	if os.IsNotExist(err) {
-		return false, nil
-	} else if err != nil {
-		return false, err
-	} else {
-		return true, nil
-	}
-}
-
-func HashFile(path string) (string, error) {
-	hash, err := blake2b.New256(nil)
-	if err != nil {
-		return "", err
-	}
-
-	if err := AddFileToHash(path, hash); err != nil {
-		return "", err
-	}
-
-	return fmt.Sprintf("%x", hash.Sum(nil)), nil
-}
-
-func AddFileToHash(path string, w io.Writer) error {
-	f, err := os.Open(path)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	_, err = io.Copy(w, f)
-	return err
-}
diff --git a/testing/deployer/util/internal/ipamutils/doc.go b/testing/deployer/util/internal/ipamutils/doc.go
deleted file mode 100644
index 7820e3776201b..0000000000000
--- a/testing/deployer/util/internal/ipamutils/doc.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015 Docker Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Originally from:
-// https://github.com/moby/moby/blob/7489b51f610104ab5acc43f4e77142927e7b522e/libnetwork/ipamutils
-//
-// The only changes were to remove dead code from the package that we did not
-// need, and to edit the tests to use github.com/stretchr/testify to avoid an
-// extra dependency.
-package ipamutils
diff --git a/testing/deployer/util/internal/ipamutils/utils.go b/testing/deployer/util/internal/ipamutils/utils.go
deleted file mode 100644
index 11367cc176bbf..0000000000000
--- a/testing/deployer/util/internal/ipamutils/utils.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Package ipamutils provides utility functions for ipam management
-package ipamutils
-
-import (
-	"fmt"
-	"net"
-	"sync"
-)
-
-var (
-	// predefinedLocalScopeDefaultNetworks contains a list of 31 IPv4 private networks with host size 16 and 12
-	// (172.17-31.x.x/16, 192.168.x.x/20) which do not overlap with the networks in `PredefinedGlobalScopeDefaultNetworks`
-	predefinedLocalScopeDefaultNetworks []*net.IPNet
-	// predefinedGlobalScopeDefaultNetworks contains a list of 64K IPv4 private networks with host size 8
-	// (10.x.x.x/24) which do not overlap with the networks in `PredefinedLocalScopeDefaultNetworks`
-	predefinedGlobalScopeDefaultNetworks []*net.IPNet
-	mutex                                sync.Mutex
-	localScopeDefaultNetworks            = []*NetworkToSplit{{"172.17.0.0/16", 16}, {"172.18.0.0/16", 16}, {"172.19.0.0/16", 16},
-		{"172.20.0.0/14", 16}, {"172.24.0.0/14", 16}, {"172.28.0.0/14", 16},
-		{"192.168.0.0/16", 20}}
-	globalScopeDefaultNetworks = []*NetworkToSplit{{"10.0.0.0/8", 24}}
-)
-
-// NetworkToSplit represent a network that has to be split in chunks with mask length Size.
-// Each subnet in the set is derived from the Base pool. Base is to be passed
-// in CIDR format.
-// Example: a Base "10.10.0.0/16 with Size 24 will define the set of 256
-// 10.10.[0-255].0/24 address pools
-type NetworkToSplit struct {
-	Base string `json:"base"`
-	Size int    `json:"size"`
-}
-
-func init() {
-	var err error
-	if predefinedGlobalScopeDefaultNetworks, err = SplitNetworks(globalScopeDefaultNetworks); err != nil {
-		panic("failed to initialize the global scope default address pool: " + err.Error())
-	}
-
-	if predefinedLocalScopeDefaultNetworks, err = SplitNetworks(localScopeDefaultNetworks); err != nil {
-		panic("failed to initialize the local scope default address pool: " + err.Error())
-	}
-}
-
-// ConfigGlobalScopeDefaultNetworks configures global default pool.
-// Ideally this will be called from SwarmKit as part of swarm init
-func ConfigGlobalScopeDefaultNetworks(defaultAddressPool []*NetworkToSplit) error {
-	if defaultAddressPool == nil {
-		return nil
-	}
-	mutex.Lock()
-	defer mutex.Unlock()
-	defaultNetworks, err := SplitNetworks(defaultAddressPool)
-	if err != nil {
-		return err
-	}
-	predefinedGlobalScopeDefaultNetworks = defaultNetworks
-	return nil
-}
-
-// GetGlobalScopeDefaultNetworks returns a copy of the global-sopce network list.
-func GetGlobalScopeDefaultNetworks() []*net.IPNet {
-	mutex.Lock()
-	defer mutex.Unlock()
-	return append([]*net.IPNet(nil), predefinedGlobalScopeDefaultNetworks...)
-}
-
-// GetLocalScopeDefaultNetworks returns a copy of the default local-scope network list.
-func GetLocalScopeDefaultNetworks() []*net.IPNet {
-	return append([]*net.IPNet(nil), predefinedLocalScopeDefaultNetworks...)
-}
-
-// SplitNetworks takes a slice of networks, split them accordingly and returns them
-func SplitNetworks(list []*NetworkToSplit) ([]*net.IPNet, error) {
-	localPools := make([]*net.IPNet, 0, len(list))
-
-	for _, p := range list {
-		_, b, err := net.ParseCIDR(p.Base)
-		if err != nil {
-			return nil, fmt.Errorf("invalid base pool %q: %v", p.Base, err)
-		}
-		ones, _ := b.Mask.Size()
-		if p.Size <= 0 || p.Size < ones {
-			return nil, fmt.Errorf("invalid pools size: %d", p.Size)
-		}
-		localPools = append(localPools, splitNetwork(p.Size, b)...)
-	}
-	return localPools, nil
-}
-
-func splitNetwork(size int, base *net.IPNet) []*net.IPNet {
-	one, bits := base.Mask.Size()
-	mask := net.CIDRMask(size, bits)
-	n := 1 << uint(size-one)
-	s := uint(bits - size)
-	list := make([]*net.IPNet, 0, n)
-
-	for i := 0; i < n; i++ {
-		ip := copyIP(base.IP)
-		addIntToIP(ip, uint(i<<s))
-		list = append(list, &net.IPNet{IP: ip, Mask: mask})
-	}
-	return list
-}
-
-func copyIP(from net.IP) net.IP {
-	ip := make([]byte, len(from))
-	copy(ip, from)
-	return ip
-}
-
-func addIntToIP(array net.IP, ordinal uint) {
-	for i := len(array) - 1; i >= 0; i-- {
-		array[i] |= (byte)(ordinal & 0xff)
-		ordinal >>= 8
-	}
-}
diff --git a/testing/deployer/util/internal/ipamutils/utils_test.go b/testing/deployer/util/internal/ipamutils/utils_test.go
deleted file mode 100644
index e91ae258cb913..0000000000000
--- a/testing/deployer/util/internal/ipamutils/utils_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package ipamutils
-
-import (
-	"net"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func initBroadPredefinedNetworks() []*net.IPNet {
-	pl := make([]*net.IPNet, 0, 31)
-	mask := []byte{255, 255, 0, 0}
-	for i := 17; i < 32; i++ {
-		pl = append(pl, &net.IPNet{IP: []byte{172, byte(i), 0, 0}, Mask: mask})
-	}
-	mask20 := []byte{255, 255, 240, 0}
-	for i := 0; i < 16; i++ {
-		pl = append(pl, &net.IPNet{IP: []byte{192, 168, byte(i << 4), 0}, Mask: mask20})
-	}
-	return pl
-}
-
-func initGranularPredefinedNetworks() []*net.IPNet {
-	pl := make([]*net.IPNet, 0, 256*256)
-	mask := []byte{255, 255, 255, 0}
-	for i := 0; i < 256; i++ {
-		for j := 0; j < 256; j++ {
-			pl = append(pl, &net.IPNet{IP: []byte{10, byte(i), byte(j), 0}, Mask: mask})
-		}
-	}
-	return pl
-}
-
-func initGlobalScopeNetworks() []*net.IPNet {
-	pl := make([]*net.IPNet, 0, 256*256)
-	mask := []byte{255, 255, 255, 0}
-	for i := 0; i < 256; i++ {
-		for j := 0; j < 256; j++ {
-			pl = append(pl, &net.IPNet{IP: []byte{30, byte(i), byte(j), 0}, Mask: mask})
-		}
-	}
-	return pl
-}
-
-func TestDefaultNetwork(t *testing.T) {
-	for _, nw := range GetGlobalScopeDefaultNetworks() {
-		if ones, bits := nw.Mask.Size(); bits != 32 || ones != 24 {
-			t.Fatalf("Unexpected size for network in granular list: %v", nw)
-		}
-	}
-
-	for _, nw := range GetLocalScopeDefaultNetworks() {
-		if ones, bits := nw.Mask.Size(); bits != 32 || (ones != 20 && ones != 16) {
-			t.Fatalf("Unexpected size for network in broad list: %v", nw)
-		}
-	}
-
-	originalBroadNets := initBroadPredefinedNetworks()
-	m := make(map[string]bool)
-	for _, v := range originalBroadNets {
-		m[v.String()] = true
-	}
-	for _, nw := range GetLocalScopeDefaultNetworks() {
-		_, ok := m[nw.String()]
-		assert.True(t, ok)
-		delete(m, nw.String())
-	}
-
-	assert.Empty(t, m)
-
-	originalGranularNets := initGranularPredefinedNetworks()
-
-	m = make(map[string]bool)
-	for _, v := range originalGranularNets {
-		m[v.String()] = true
-	}
-	for _, nw := range GetGlobalScopeDefaultNetworks() {
-		_, ok := m[nw.String()]
-		assert.True(t, ok)
-		delete(m, nw.String())
-	}
-
-	assert.Empty(t, m)
-}
-
-func TestConfigGlobalScopeDefaultNetworks(t *testing.T) {
-	err := ConfigGlobalScopeDefaultNetworks([]*NetworkToSplit{{"30.0.0.0/8", 24}})
-	assert.NoError(t, err)
-
-	originalGlobalScopeNetworks := initGlobalScopeNetworks()
-	m := make(map[string]bool)
-	for _, v := range originalGlobalScopeNetworks {
-		m[v.String()] = true
-	}
-	for _, nw := range GetGlobalScopeDefaultNetworks() {
-		_, ok := m[nw.String()]
-		assert.True(t, ok)
-		delete(m, nw.String())
-	}
-
-	assert.Empty(t, m)
-}
diff --git a/testing/deployer/util/net.go b/testing/deployer/util/net.go
deleted file mode 100644
index 83ca01761b48c..0000000000000
--- a/testing/deployer/util/net.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package util
-
-import (
-	"github.com/hashicorp/consul/testing/deployer/util/internal/ipamutils"
-)
-
-// GetPossibleDockerNetworkSubnets returns a copy of the global-scope network list.
-func GetPossibleDockerNetworkSubnets() map[string]struct{} {
-	list := ipamutils.GetGlobalScopeDefaultNetworks()
-
-	out := make(map[string]struct{})
-	for _, ipnet := range list {
-		subnet := ipnet.String()
-		out[subnet] = struct{}{}
-	}
-	return out
-}
diff --git a/testrpc/wait.go b/testrpc/wait.go
index ca315d28539e4..31208c0c486c0 100644
--- a/testrpc/wait.go
+++ b/testrpc/wait.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package testrpc
 
 import (
diff --git a/tlsutil/config.go b/tlsutil/config.go
index 5cba2597f19d7..e67b70d1b9cb4 100644
--- a/tlsutil/config.go
+++ b/tlsutil/config.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tlsutil
 
 import (
@@ -19,7 +16,7 @@ import (
 	"github.com/hashicorp/go-multierror"
 
 	"github.com/hashicorp/consul/logging"
-	"github.com/hashicorp/consul/proto/private/pbconfig"
+	"github.com/hashicorp/consul/proto/pbconfig"
 	"github.com/hashicorp/consul/types"
 )
 
@@ -857,23 +854,10 @@ func (c *Configurator) IncomingHTTPSConfig() *tls.Config {
 	return config
 }
 
-// OutgoingTLSConfigForCheck creates a client *tls.Config for executing checks.
-// It is RECOMMENDED that the serverName be left unspecified. The crypto/tls
-// client will deduce the ServerName (for SNI) from the check address unless
-// it's an IP (RFC 6066, Section 3). However, there are two instances where
-// supplying a serverName is useful:
-//
-//  1. When the check address is an IP, a serverName can be supplied for SNI.
-//     Note: setting serverName will also override the hostname used to verify
-//     the certificate presented by the server being checked.
-//
-//  2. When the hostname in the check address won't be present in the SAN
-//     (Subject Alternative Name) field of the certificate presented by the
-//     server being checked. Note: setting serverName will also override the
-//     ServerName used for SNI.
-//
-// Setting skipVerify will disable verification of the server's certificate
-// chain and hostname, which is generally not suitable for production use.
+// OutgoingTLSConfigForCheck generates a *tls.Config for outgoing TLS connections
+// for checks. This function is separated because there is an extra flag to
+// consider for checks. EnableAgentTLSForChecks and InsecureSkipVerify has to
+// be checked for checks.
 func (c *Configurator) OutgoingTLSConfigForCheck(skipVerify bool, serverName string) *tls.Config {
 	c.log("OutgoingTLSConfigForCheck")
 
@@ -888,9 +872,13 @@ func (c *Configurator) OutgoingTLSConfigForCheck(skipVerify bool, serverName str
 		}
 	}
 
+	if serverName == "" {
+		serverName = c.serverNameOrNodeName()
+	}
 	config := c.internalRPCTLSConfig(false)
 	config.InsecureSkipVerify = skipVerify
 	config.ServerName = serverName
+
 	return config
 }
 
diff --git a/tlsutil/config_test.go b/tlsutil/config_test.go
index bc2ee36068a41..388b4934ed4de 100644
--- a/tlsutil/config_test.go
+++ b/tlsutil/config_test.go
@@ -1,7 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-//go:build !fips
-
 package tlsutil
 
 import (
@@ -1375,7 +1371,7 @@ func TestConfigurator_OutgoingTLSConfigForCheck(t *testing.T) {
 			},
 		},
 		{
-			name: "agent tls, default consul server name, no override",
+			name: "agent tls, default server name",
 			conf: func() (*Configurator, error) {
 				return NewConfigurator(Config{
 					InternalRPC: ProtocolConfig{
@@ -1388,11 +1384,11 @@ func TestConfigurator_OutgoingTLSConfigForCheck(t *testing.T) {
 			},
 			expected: &tls.Config{
 				MinVersion: tls.VersionTLS12,
-				ServerName: "",
+				ServerName: "servername",
 			},
 		},
 		{
-			name: "agent tls, skip verify, consul node name for server name, no override",
+			name: "agent tls, skip verify, node name for server name",
 			conf: func() (*Configurator, error) {
 				return NewConfigurator(Config{
 					InternalRPC: ProtocolConfig{
@@ -1406,7 +1402,7 @@ func TestConfigurator_OutgoingTLSConfigForCheck(t *testing.T) {
 			expected: &tls.Config{
 				InsecureSkipVerify: true,
 				MinVersion:         tls.VersionTLS12,
-				ServerName:         "",
+				ServerName:         "nodename",
 			},
 		},
 		{
diff --git a/tlsutil/generate.go b/tlsutil/generate.go
index 907d7ba99694f..04628ce4fb0a9 100644
--- a/tlsutil/generate.go
+++ b/tlsutil/generate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tlsutil
 
 import (
diff --git a/tlsutil/generate_test.go b/tlsutil/generate_test.go
index da3fd29af1f9c..5be9f7e2b5fe1 100644
--- a/tlsutil/generate_test.go
+++ b/tlsutil/generate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package tlsutil
 
 import (
diff --git a/tools/internal-grpc-proxy/main.go b/tools/internal-grpc-proxy/main.go
index 5a4218e8fa466..f134bfc50cbaa 100644
--- a/tools/internal-grpc-proxy/main.go
+++ b/tools/internal-grpc-proxy/main.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package main
 
 import (
diff --git a/troubleshoot/go.mod b/troubleshoot/go.mod
index a12fbde8a1fa1..87e91979c033f 100644
--- a/troubleshoot/go.mod
+++ b/troubleshoot/go.mod
@@ -6,54 +6,52 @@ replace github.com/hashicorp/consul/api => ../api
 
 replace github.com/hashicorp/consul/envoyextensions => ../envoyextensions
 
-replace github.com/hashicorp/consul/proto-public => ../proto-public
-
 exclude (
 	github.com/hashicorp/go-msgpack v1.1.5 // has breaking changes and must be avoided
 	github.com/hashicorp/go-msgpack v1.1.6 // contains retractions but same as v1.1.5
 )
 
 require (
-	github.com/envoyproxy/go-control-plane v0.11.0
-	github.com/envoyproxy/go-control-plane/xdsmatcher v0.0.0-20230524161521-aaaacbfbe53e
-	github.com/hashicorp/consul/api v1.24.0
-	github.com/hashicorp/consul/envoyextensions v0.4.1
-	github.com/stretchr/testify v1.8.3
-	google.golang.org/protobuf v1.30.0
+	github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1
+	github.com/hashicorp/consul/api v1.21.0
+	github.com/hashicorp/consul/envoyextensions v0.2.1
+	github.com/stretchr/testify v1.8.0
+	google.golang.org/protobuf v1.28.1
 )
 
 require (
-	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 // indirect
+	github.com/armon/go-metrics v0.3.10 // indirect
+	github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect
+	github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/envoyproxy/protoc-gen-validate v0.10.0 // indirect
-	github.com/fatih/color v1.14.1 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/envoyproxy/protoc-gen-validate v0.1.0 // indirect
+	github.com/fatih/color v1.13.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/btree v1.0.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-hclog v1.5.0 // indirect
+	github.com/hashicorp/go-hclog v1.2.1 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
+	github.com/hashicorp/go-msgpack v0.5.5 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/hashicorp/go-version v1.2.1 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/serf v0.10.1 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
-	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	go.opentelemetry.io/proto/otlp v0.7.0 // indirect
+	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
 	golang.org/x/net v0.13.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
 	golang.org/x/text v0.11.0 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/grpc v1.55.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737 // indirect
+	google.golang.org/grpc v1.49.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/troubleshoot/go.sum b/troubleshoot/go.sum
index b5f44a5e8f16c..c3ff903380058 100644
--- a/troubleshoot/go.sum
+++ b/troubleshoot/go.sum
@@ -1,40 +1,7 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -42,35 +9,25 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
-github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
+github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8Uo=
+github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
-github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 h1:zH8ljVhhq7yC0MIeUL/IviMtY8hx2mK8cN9wEYb8ggw=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 h1:58f1tJ1ra+zFINPlwLWvQsR9CzAKt2e+EWV2yX9oXQ4=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -79,24 +36,15 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
-github.com/envoyproxy/go-control-plane v0.11.0 h1:jtLewhRR2vMRNnq2ZZUoCjUlgut+Y0+sDDWPOfwOi1o=
-github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI=
-github.com/envoyproxy/go-control-plane/xdsmatcher v0.0.0-20230524161521-aaaacbfbe53e h1:g8euodkL4GdSpVAjfzhssb07KgVmOUqyF4QOmwFumTs=
-github.com/envoyproxy/go-control-plane/xdsmatcher v0.0.0-20230524161521-aaaacbfbe53e/go.mod h1:/NGEcKqwNq3HAS2vCqHfsPx9sJZbkiNQ6dGx9gTE/NA=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 h1:xvqufLtNVwAhN8NMyWklVgxnWohi+wtMGQMhtxexlm0=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
+github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.10.0 h1:oIfnZFdC0YhpNNEX+SuIqko4cqqVZeN9IGTrhZje83Y=
-github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
+github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
-github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -104,23 +52,11 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
@@ -130,52 +66,37 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
-github.com/hashicorp/consul/sdk v0.14.1 h1:ZiwE2bKb+zro68sWzZ1SgHF3kRMBZ94TwOCFRF4ylPs=
+github.com/hashicorp/consul/sdk v0.13.1 h1:EygWVWWMczTzXGpO93awkHFzfUka6hLYJ0qhETd+6lY=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
-github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-hclog v1.2.1 h1:YQsLlGDJgwhXFpucSPyVbCBviQtjlHv3jLTlp8YmtEw=
+github.com/hashicorp/go-hclog v1.2.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
 github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI=
+github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
@@ -188,11 +109,10 @@ github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0S
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
+github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
 github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
 github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
@@ -201,38 +121,27 @@ github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR
 github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
 github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
 github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
@@ -248,6 +157,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -265,87 +176,45 @@ github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3O
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
-github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
+github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw=
-go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -353,47 +222,22 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
 golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -401,176 +245,58 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
 golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
+google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737 h1:K1zaaMdYBXRyX+cwFnxj7M6zwDyumLQMZ5xqwGvjreQ=
+google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737/go.mod h1:2r/26NEF3bFmT3eC3aZreahSal0C3Shl8Gi6vyDYqOQ=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
-google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
+google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw=
+google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -579,20 +305,17 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -602,12 +325,4 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/troubleshoot/proxy/certs.go b/troubleshoot/proxy/certs.go
index 8f0c09b0293e9..ec4b2bc703d2f 100644
--- a/troubleshoot/proxy/certs.go
+++ b/troubleshoot/proxy/certs.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package troubleshoot
 
 import (
diff --git a/troubleshoot/proxy/certs_test.go b/troubleshoot/proxy/certs_test.go
index e3db4dc009c5a..fc03cb062ff25 100644
--- a/troubleshoot/proxy/certs_test.go
+++ b/troubleshoot/proxy/certs_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package troubleshoot
 
 import (
diff --git a/troubleshoot/proxy/stats.go b/troubleshoot/proxy/stats.go
index 249dce07db040..a2ab88ffa6bac 100644
--- a/troubleshoot/proxy/stats.go
+++ b/troubleshoot/proxy/stats.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package troubleshoot
 
 import (
diff --git a/troubleshoot/proxy/troubleshoot_proxy.go b/troubleshoot/proxy/troubleshoot_proxy.go
index 4cd422b0d4b89..8d1bfdc0bf178 100644
--- a/troubleshoot/proxy/troubleshoot_proxy.go
+++ b/troubleshoot/proxy/troubleshoot_proxy.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package troubleshoot
 
 import (
diff --git a/troubleshoot/proxy/upstreams.go b/troubleshoot/proxy/upstreams.go
index 62f08572059a3..2ac7c8e953daa 100644
--- a/troubleshoot/proxy/upstreams.go
+++ b/troubleshoot/proxy/upstreams.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package troubleshoot
 
 import (
diff --git a/troubleshoot/proxy/upstreams_test.go b/troubleshoot/proxy/upstreams_test.go
index a2f0bf60b08e0..e1d6ff90753a3 100644
--- a/troubleshoot/proxy/upstreams_test.go
+++ b/troubleshoot/proxy/upstreams_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package troubleshoot
 
 import (
diff --git a/troubleshoot/proxy/utils.go b/troubleshoot/proxy/utils.go
index 78fadaed119e2..ab907c74e39d6 100644
--- a/troubleshoot/proxy/utils.go
+++ b/troubleshoot/proxy/utils.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package troubleshoot
 
 import (
diff --git a/troubleshoot/proxy/validateupstream.go b/troubleshoot/proxy/validateupstream.go
index 02c355f40e705..162608bf96f04 100644
--- a/troubleshoot/proxy/validateupstream.go
+++ b/troubleshoot/proxy/validateupstream.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package troubleshoot
 
 import (
@@ -87,7 +84,7 @@ func Validate(indexedResources *xdscommon.IndexedResources, envoyID string, vip
 				// the cluster SNIs configured on this proxy, not just the upstream being validated. This means the
 				// PatchCluster function in the Validate plugin will be run on all clusters, but errors will only
 				// surface for clusters related to the upstream being validated.
-				SNIs:    snis,
+				SNI:     snis,
 				EnvoyID: envoyID,
 			},
 		},
diff --git a/troubleshoot/proxy/validateupstream_test.go b/troubleshoot/proxy/validateupstream_test.go
index ddeca9b1cd72a..8433be51560c1 100644
--- a/troubleshoot/proxy/validateupstream_test.go
+++ b/troubleshoot/proxy/validateupstream_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package troubleshoot
 
 import (
diff --git a/troubleshoot/proxy/z_xds_packages.go b/troubleshoot/proxy/z_xds_packages.go
index 71eb344f65dd5..081f945359d55 100644
--- a/troubleshoot/proxy/z_xds_packages.go
+++ b/troubleshoot/proxy/z_xds_packages.go
@@ -3,31 +3,16 @@
 package troubleshoot
 
 import (
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/config/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/http/dynamo/v3"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/http/golang/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/http/language/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/http/squash/v3"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/http/sxg/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/client_ssl_auth/v3"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/action/v3"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/router/v3"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/kafka_broker/v3"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/mysql_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/matching/input_matchers/hyperscan/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/private_key_providers/qat/v3alpha"
-	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/regex_engines/hyperscan/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/vcl/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/admin/v3"
@@ -51,7 +36,6 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/common/dynamic_forward_proxy/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/common/key_value/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/common/matcher/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/config/common/mutation_rules/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/common/tap/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
@@ -151,16 +135,14 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/data/tap/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/file/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/filters/cel/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/grpc/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/open_telemetry/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/stream/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/wasm/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/bootstrap/internal_listener/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/cache/simple_http_cache/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/aggregate/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/dynamic_forward_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/redis/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/async_files/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/dynamic_forward_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/matching/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/ratelimit/v3"
@@ -169,10 +151,6 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/brotli/decompressor/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/gzip/compressor/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/gzip/decompressor/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/zstd/compressor/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/zstd/decompressor/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/config/validators/minimum_clusters/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/early_data/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/dependency/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/fault/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/matcher/action/v3"
@@ -189,14 +167,12 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/compressor/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/cors/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/csrf/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/custom_response/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/decompressor/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/dynamic_forward_proxy/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/dynamo/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ext_authz/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ext_proc/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/fault/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/file_system_buffer/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/gcp_authn/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_http1_bridge/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_json_transcoder/v3"
@@ -213,20 +189,18 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/oauth2/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/on_demand/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/original_src/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rate_limit_quota/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ratelimit/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rbac/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/set_metadata/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/stateful_session/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/tap/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/upstream_codec/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/wasm/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/http_inspector/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/original_dst/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/original_src/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/proxy_protocol/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/tls_inspector/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/client_ssl_auth/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/connection_limit/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/direct_response/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/dubbo_proxy/router/v3"
@@ -243,7 +217,6 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/filters/header_to_metadata/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/router/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/v3"
@@ -254,49 +227,24 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/formatter/metadata/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/formatter/req_without_query/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/health_checkers/redis/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/health_checkers/thrift/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/cache/file_system_http_cache/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/cache/simple_http_cache/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/custom_response/local_response_policy/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/custom_response/redirect_policy/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/early_header_mutation/header_mutation/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/header_formatters/preserve_case/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/header_validators/envoy_default/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/original_ip_detection/custom_header/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/original_ip_detection/xff/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/stateful_session/cookie/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/stateful_session/header/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/internal_redirect/allow_listed_routes/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/internal_redirect/previous_routes/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/internal_redirect/safe_cross_scheme/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/key_value/file_based/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/common/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/least_request/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/maglev/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/random/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/ring_hash/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/round_robin/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/wrr_locality/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/common_inputs/environment_variable/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/common_inputs/network/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/common_inputs/ssl/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/input_matchers/consistent_hashing/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/input_matchers/ip/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/network/dns_resolver/apple/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/network/dns_resolver/cares/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/network/dns_resolver/getaddrinfo/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/network/socket_interface/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/path/match/uri_template/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/path/rewrite/uri_template/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/connection_id_generator/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/crypto_stream/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/quic/proof_source/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/rate_limit_descriptors/expr/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/rbac/matchers/upstream_ip_port/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/regex_engines/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/request_id/uuid/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/downstream_connections/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/fixed_heap/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/injected_resource/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/retry/host/omit_canary_hosts/v3"
@@ -306,8 +254,6 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/stat_sinks/graphite_statsd/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/stat_sinks/wasm/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/alts/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/http_11_proxy/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/internal_upstream/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/proxy_protocol/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/quic/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/raw_buffer/v3"
@@ -316,13 +262,11 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tap/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tcp_stats/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/udp_packet_writer/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/generic/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/http/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/tcp/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/tcp/generic/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/tcp/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/wasm/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/watchdog/profile_action/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/accesslog/v2"
@@ -344,7 +288,6 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/metrics/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/metrics/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/service/rate_limit_quota/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/route/v3"
@@ -366,7 +309,4 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/type/tracing/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/type/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/watchdog/v3"
-	_ "github.com/envoyproxy/go-control-plane/ratelimit/config/ratelimit/v3"
-	_ "github.com/envoyproxy/go-control-plane/ratelimit/service/ratelimit/v3"
-	_ "github.com/envoyproxy/go-control-plane/xdsmatcher/test/proto"
 )
diff --git a/troubleshoot/validate/validate.go b/troubleshoot/validate/validate.go
index 93d26bb42ed12..97bef18de80f5 100644
--- a/troubleshoot/validate/validate.go
+++ b/troubleshoot/validate/validate.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package validate
 
 import (
@@ -24,8 +21,6 @@ import (
 // Validate contains input information about which proxy resources to validate and output information about resources it
 // has validated.
 type Validate struct {
-	extensioncommon.BasicExtensionAdapter
-
 	// envoyID is an argument to the Validate plugin and identifies which listener to begin the validation with.
 	envoyID string
 
@@ -92,10 +87,10 @@ func MakeValidate(ext extensioncommon.RuntimeConfig) (extensioncommon.BasicExten
 	upstream, ok := ext.Upstreams[ext.ServiceName]
 	if ok {
 		vip = upstream.VIP
-		if upstream.SNIs == nil || len(upstream.SNIs) == 0 {
+		if upstream.SNI == nil || len(upstream.SNI) == 0 {
 			return nil, fmt.Errorf("no SNIs were set, unable to validate Envoy clusters")
 		}
-		snis = upstream.SNIs
+		snis = upstream.SNI
 	}
 	if mainEnvoyID == "" && vip == "" {
 		return nil, fmt.Errorf("envoyID or virtual IP is required")
@@ -306,87 +301,84 @@ func (p *Validate) CanApply(config *extensioncommon.RuntimeConfig) bool {
 	return true
 }
 
-func (v *Validate) PatchRoute(p extensioncommon.RoutePayload) (*envoy_route_v3.RouteConfiguration, bool, error) {
-	route := p.Message
+func (p *Validate) PatchRoute(config *extensioncommon.RuntimeConfig, route *envoy_route_v3.RouteConfiguration) (*envoy_route_v3.RouteConfiguration, bool, error) {
 	// Route name on connect proxies will be the envoy ID. We are only validating routes for the specific upstream with
 	// the envoyID configured.
-	if route.Name != p.Upstream.EnvoyID {
+	if route.Name != p.envoyID {
 		return route, false, nil
 	}
-	v.route = true
+	p.route = true
 	for sni := range extensioncommon.RouteClusterNames(route) {
-		if _, ok := v.resources[sni]; ok {
+		if _, ok := p.resources[sni]; ok {
 			continue
 		}
-		v.resources[sni] = &resource{required: true}
+		p.resources[sni] = &resource{required: true}
 	}
 	return route, false, nil
 }
 
-func (v *Validate) PatchCluster(p extensioncommon.ClusterPayload) (*envoy_cluster_v3.Cluster, bool, error) {
-	c := p.Message
-	val, ok := v.resources[c.Name]
+func (p *Validate) PatchCluster(config *extensioncommon.RuntimeConfig, c *envoy_cluster_v3.Cluster) (*envoy_cluster_v3.Cluster, bool, error) {
+	v, ok := p.resources[c.Name]
 	if !ok {
-		val = &resource{}
-		v.resources[c.Name] = val
+		v = &resource{}
+		p.resources[c.Name] = v
 	}
-	val.cluster = true
+	v.cluster = true
 
 	// If it's an aggregate cluster, add the child clusters to p.resources if they are not already there.
 	aggregateCluster, ok := isAggregateCluster(c)
 	if ok {
 		// Mark this as an aggregate cluster, so we know we do not need to validate its endpoints directly.
-		val.aggregateCluster = true
+		v.aggregateCluster = true
 		for _, clusterName := range aggregateCluster.Clusters {
-			r, ok := v.resources[clusterName]
+			r, ok := p.resources[clusterName]
 			if !ok {
 				r = &resource{}
-				v.resources[clusterName] = r
+				p.resources[clusterName] = r
 			}
-			if val.aggregateClusterChildren == nil {
-				val.aggregateClusterChildren = []string{}
+			if v.aggregateClusterChildren == nil {
+				v.aggregateClusterChildren = []string{}
 			}
 			// On the parent cluster, add the children.
-			val.aggregateClusterChildren = append(val.aggregateClusterChildren, clusterName)
+			v.aggregateClusterChildren = append(v.aggregateClusterChildren, clusterName)
 			// On the child cluster, set the parent.
 			r.parentCluster = c.Name
 			// The child clusters of an aggregate cluster will be required if the parent cluster is.
-			r.required = val.required
+			r.required = v.required
 		}
 		return c, false, nil
 	}
 
 	if c.EdsClusterConfig != nil {
-		val.usesEDS = true
+		v.usesEDS = true
 	} else {
 		la := c.LoadAssignment
 		if la == nil {
 			return c, false, nil
 		}
-		val.endpoints = len(la.Endpoints) + len(la.NamedEndpoints)
+		v.endpoints = len(la.Endpoints) + len(la.NamedEndpoints)
 	}
 	return c, false, nil
 }
 
-func (v *Validate) PatchFilter(p extensioncommon.FilterPayload) (*envoy_listener_v3.Filter, bool, error) {
-	filter := p.Message
+func (p *Validate) PatchFilter(config *extensioncommon.RuntimeConfig, filter *envoy_listener_v3.Filter, _ bool) (*envoy_listener_v3.Filter, bool, error) {
 	// If a single filter exists for a listener we say it exists.
-	v.listener = true
+	p.listener = true
 
 	if httpConfig := envoy_resource_v3.GetHTTPConnectionManager(filter); httpConfig != nil {
 		// If the http filter uses RDS, then the clusters we need to validate exist in the route, and there's nothing
 		// else we need to do with the filter.
 		if httpConfig.GetRds() != nil {
-			v.usesRDS = true
+			p.usesRDS = true
 
 			// Edit the runtime configuration to add an envoy ID based on the route name in the filter. This is because
 			// routes are matched by envoyID and in the transparent proxy case, we only have the VIP set in the
 			// RuntimeConfig.
-			v.envoyID = httpConfig.GetRds().RouteConfigName
+			p.envoyID = httpConfig.GetRds().RouteConfigName
 			emptyServiceKey := api.CompoundServiceName{}
-			upstream, ok := p.RuntimeConfig.Upstreams[emptyServiceKey]
+			upstream, ok := config.Upstreams[emptyServiceKey]
 			if ok {
-				upstream.EnvoyID = v.envoyID
+				upstream.EnvoyID = p.envoyID
 			}
 			return filter, true, nil
 		}
@@ -395,10 +387,10 @@ func (v *Validate) PatchFilter(p extensioncommon.FilterPayload) (*envoy_listener
 	// FilterClusterNames handles the filter being an http or tcp filter.
 	for sni := range extensioncommon.FilterClusterNames(filter) {
 		// Mark any clusters we see as required resources.
-		if r, ok := v.resources[sni]; ok {
+		if r, ok := p.resources[sni]; ok {
 			r.required = true
 		} else {
-			v.resources[sni] = &resource{required: true}
+			p.resources[sni] = &resource{required: true}
 		}
 	}
 
diff --git a/troubleshoot/validate/validate_test.go b/troubleshoot/validate/validate_test.go
index b9e2aeed611f5..62ab217902300 100644
--- a/troubleshoot/validate/validate_test.go
+++ b/troubleshoot/validate/validate_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package validate
 
 import (
@@ -349,7 +346,7 @@ func TestMakeValidate(t *testing.T) {
 				},
 				Upstreams: map[api.CompoundServiceName]*extensioncommon.UpstreamData{
 					svc: {
-						SNIs: tc.snis,
+						SNI: tc.snis,
 					},
 				},
 			}
diff --git a/types/area.go b/types/area.go
index 7cd0af35fb5c0..612f1d5ebe5a3 100644
--- a/types/area.go
+++ b/types/area.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package types
 
 // AreaID is a strongly-typed string used to uniquely represent a network area,
diff --git a/types/checks.go b/types/checks.go
index d119319f413e7..25a136b4f4b55 100644
--- a/types/checks.go
+++ b/types/checks.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package types
 
 // CheckID is a strongly typed string used to uniquely represent a Consul
diff --git a/types/node_id.go b/types/node_id.go
index 868dbf52a9a0d..c0588ed4213a0 100644
--- a/types/node_id.go
+++ b/types/node_id.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package types
 
 // NodeID is a unique identifier for a node across space and time.
diff --git a/types/tls.go b/types/tls.go
index e4788819b8c3a..198d4052d11ca 100644
--- a/types/tls.go
+++ b/types/tls.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package types
 
 import (
diff --git a/types/tls_test.go b/types/tls_test.go
index a988cfbc9fb7c..5c1c1f6457bbe 100644
--- a/types/tls_test.go
+++ b/types/tls_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package types
 
 import (
diff --git a/ui/.nvmrc b/ui/.nvmrc
index b6a7d89c68e0c..8351c19397f4f 100644
--- a/ui/.nvmrc
+++ b/ui/.nvmrc
@@ -1 +1 @@
-16
+14
diff --git a/ui/GNUmakefile b/ui/GNUmakefile
index da9652584f8ed..ab70bbc61b89b 100644
--- a/ui/GNUmakefile
+++ b/ui/GNUmakefile
@@ -25,6 +25,7 @@ deps: clean
 	cd packages/consul-ui && \
 		$(MAKE) deps
 
+
 # Build a distribution of the UI for Vercel previews.
 # The distribution must be copied into the ui/ subfolder
 # in order to mirror the go binary
diff --git a/ui/package.json b/ui/package.json
index 5a161e4e691bb..b7b44961c17f4 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -24,6 +24,6 @@
     "ember-basic-dropdown": "3.0.21"
   },
   "engines": {
-    "node": ">=14 <=16"
+    "node": ">=10 <=14"
   }
 }
diff --git a/ui/packages/consul-acls/app/components/consul/acl/selector/index.hbs b/ui/packages/consul-acls/app/components/consul/acl/selector/index.hbs
index a13efa37c19d4..f5e6bae3481aa 100644
--- a/ui/packages/consul-acls/app/components/consul/acl/selector/index.hbs
+++ b/ui/packages/consul-acls/app/components/consul/acl/selector/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <li 
   class="acls-separator"
   role="separator"
diff --git a/ui/packages/consul-acls/app/components/consul/token/selector/index.hbs b/ui/packages/consul-acls/app/components/consul/token/selector/index.hbs
index 1ded54b9434d0..599aeae6cb602 100644
--- a/ui/packages/consul-acls/app/components/consul/token/selector/index.hbs
+++ b/ui/packages/consul-acls/app/components/consul/token/selector/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (can 'use acls')}}
   <li data-test-main-nav-auth>
 
@@ -69,11 +64,11 @@
             </AuthForm>
           </BlockSlot>
           <BlockSlot @name="actions">
-            <Hds::Button
-              @color='secondary'
-              @text='Continue without logging in'
-              {{on 'click' modal.close}}
-            />
+            <Action
+              {{on "click" modal.close}}
+            >
+              Continue without logging in
+            </Action>
           </BlockSlot>
         </ModalDialog>
       </:unauthorized>
@@ -111,11 +106,11 @@
             </AuthForm>
           </BlockSlot>
           <BlockSlot @name="actions">
-            <Hds::Button
-              @color='secondary'
-              @text='Continue without logging in'
+            <Action
               {{on 'click' modal.close}}
-            />
+            >
+              Continue without logging in
+            </Action>
           </BlockSlot>
         </ModalDialog>
         <Portal @target="app-before-skip-links">
diff --git a/ui/packages/consul-acls/app/components/consul/token/selector/index.js b/ui/packages/consul-acls/app/components/consul/token/selector/index.js
index 3fa73eac0ee95..bfdcaaae6632c 100644
--- a/ui/packages/consul-acls/app/components/consul/token/selector/index.js
+++ b/ui/packages/consul-acls/app/components/consul/token/selector/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
diff --git a/ui/packages/consul-acls/vendor/consul-acls/routes.js b/ui/packages/consul-acls/vendor/consul-acls/routes.js
index ff26d766d7bf7..bfd045da7b47e 100644
--- a/ui/packages/consul-acls/vendor/consul-acls/routes.js
+++ b/ui/packages/consul-acls/vendor/consul-acls/routes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (routes => routes({
   dc: {
     acls: {
diff --git a/ui/packages/consul-acls/vendor/consul-acls/services.js b/ui/packages/consul-acls/vendor/consul-acls/services.js
index 1654b41eeea71..159a7a96ecc56 100644
--- a/ui/packages/consul-acls/vendor/consul-acls/services.js
+++ b/ui/packages/consul-acls/vendor/consul-acls/services.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (services => services({
 
 }))(
diff --git a/ui/packages/consul-hcp/app/components/consul/hcp/home/index.hbs b/ui/packages/consul-hcp/app/components/consul/hcp/home/index.hbs
index bb5a1fc32a983..1ab14457dfd40 100644
--- a/ui/packages/consul-hcp/app/components/consul/hcp/home/index.hbs
+++ b/ui/packages/consul-hcp/app/components/consul/hcp/home/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="consul-hcp-home"
   ...attributes
diff --git a/ui/packages/consul-hcp/app/components/consul/hcp/home/index.scss b/ui/packages/consul-hcp/app/components/consul/hcp/home/index.scss
index 5d268de6dd6d6..7ae65f2416521 100644
--- a/ui/packages/consul-hcp/app/components/consul/hcp/home/index.scss
+++ b/ui/packages/consul-hcp/app/components/consul/hcp/home/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-hcp-home {
   position: relative;
   top: -22px;
diff --git a/ui/packages/consul-hcp/app/components/consul/hcp/home/index.test.js b/ui/packages/consul-hcp/app/components/consul/hcp/home/index.test.js
index 962a7c7c4a8a4..84779d82506d2 100644
--- a/ui/packages/consul-hcp/app/components/consul/hcp/home/index.test.js
+++ b/ui/packages/consul-hcp/app/components/consul/hcp/home/index.test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-hcp/vendor/consul-hcp/routes.js b/ui/packages/consul-hcp/vendor/consul-hcp/routes.js
index ab573dea56ad4..01fd247129c4e 100644
--- a/ui/packages/consul-hcp/vendor/consul-hcp/routes.js
+++ b/ui/packages/consul-hcp/vendor/consul-hcp/routes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (routes => routes({
   dc: {
     show: null
diff --git a/ui/packages/consul-hcp/vendor/consul-hcp/services.js b/ui/packages/consul-hcp/vendor/consul-hcp/services.js
index d1c7820f7da51..27f9d4a742ae9 100644
--- a/ui/packages/consul-hcp/vendor/consul-hcp/services.js
+++ b/ui/packages/consul-hcp/vendor/consul-hcp/services.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (services => services({
   'component:consul/hcp/home': {
     class: 'consul-ui/components/consul/hcp/home',
diff --git a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/form/index.hbs b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/form/index.hbs
index d84292c72fba9..ddb5a5b1a458d 100644
--- a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/form/index.hbs
+++ b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/form/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="consul-lock-session-form"
   data-test-session={{@item.ID}}
@@ -52,14 +47,11 @@
             <dd>{{@item.ID}}</dd>
             <dt>Node</dt>
             <dd>
-              <Hds::Button
-                @text={{@item.Node}}
-                @icon='git-commit'
-                @href={{href-to 'dc.nodes.show' @item.Node}}
-                @isHrefExternal={{false}}
-                @size='small'
-                @color='tertiary'
-              />
+                <a
+                  href={{href-to 'dc.nodes.show' @item.Node}}
+                >
+                  {{@item.Node}}
+                </a>
             </dd>
             <dt>Delay</dt>
             <dd>{{duration-from @item.LockDelay}}</dd>
@@ -82,30 +74,30 @@
   {{#if (can 'delete session' item=@item)}}
         <ConfirmationDialog @message="Are you sure you want to invalidate this Lock Session?">
           <BlockSlot @name="action" as |confirm|>
-            <Hds::Button
-              @text='Invalidate Session'
-              @color='critical'
+            <Action
               data-test-delete
+              class="type-delete"
               {{on 'click' (fn confirm (fn writer.delete @item))}}
-            />
+            >
+              Invalidate Session
+            </Action>
           </BlockSlot>
           <BlockSlot @name="dialog" as |execute cancel message|>
             <p>
               {{message}}
             </p>
-            <Hds::ButtonSet>
-              <Hds::Button
-                @text='Confirm Invalidation'
-                @color='critical'
-                data-test-delete
-                {{on 'click' (fn execute)}}
-              />
-              <Hds::Button
-                @text='Cancel'
-                @color='secondary'
-                {{on 'click' (fn cancel)}}
-              />
-            </Hds::ButtonSet>
+            <Action
+              class="type-delete"
+              {{on 'click' (fn execute)}}
+            >
+              Confirm Invalidation
+            </Action>
+            <Action
+              class="type-cancel"
+              {{on 'click' (fn cancel)}}
+            >
+              Cancel
+            </Action>
           </BlockSlot>
         </ConfirmationDialog>
   {{/if}}
diff --git a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/form/index.scss b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/form/index.scss
index b34e73f03db23..acb23ebdd1c14 100644
--- a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/form/index.scss
+++ b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/form/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-lock-session-form {
   overflow: hidden;
 }
diff --git a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/list/index.hbs b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/list/index.hbs
index 247b0dd8fc9dc..cf7f826901c14 100644
--- a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/list/index.hbs
+++ b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <ListCollection
   class="consul-lock-session-list"
   ...attributes
@@ -86,30 +81,30 @@ as |item index|>
       @message="Are you sure you want to invalidate this session?"
     >
       <BlockSlot @name="action" as |confirm|>
-        <Hds::Button
-          @text='Invalidate'
-          @color='critical'
+        <Action
           data-test-delete
+          class="type-delete"
           {{on 'click' (fn confirm (fn @ondelete item))}}
-        />
+        >
+          Invalidate
+        </Action>
       </BlockSlot>
       <BlockSlot @name="dialog" as |execute cancel message|>
         <p>
           {{message}}
         </p>
-        <Hds::ButtonSet>
-          <Hds::Button
-            @text='Confirm Invalidate'
-            @color='critical'
-            data-test-delete
-            {{on 'click' (fn execute)}}
-          />
-          <Hds::Button
-            @text='Cancel'
-            @color='secondary'
-            {{on 'click' (fn cancel)}}
-          />
-        </Hds::ButtonSet>
+        <Action
+          class="type-delete"
+          {{on 'click' (fn execute)}}
+        >
+          Confirm Invalidate
+        </Action>
+        <Action
+          class="type-cancel"
+          {{on 'click' (fn cancel)}}
+        >
+          Cancel
+        </Action>
       </BlockSlot>
     </ConfirmationDialog>
   </BlockSlot>
diff --git a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/list/index.scss b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/list/index.scss
index 503e5192f4730..79327901d186c 100644
--- a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/list/index.scss
+++ b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/list/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-lock-session-list ul > li:not(:first-child) {
   @extend %composite-row;
 }
diff --git a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/notifications/index.hbs b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/notifications/index.hbs
index 12c1391161b92..8cf81c45e2adb 100644
--- a/ui/packages/consul-lock-sessions/app/components/consul/lock-session/notifications/index.hbs
+++ b/ui/packages/consul-lock-sessions/app/components/consul/lock-session/notifications/index.hbs
@@ -1,40 +1,47 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (eq @type 'remove')}}
   {{#if @error}}
-    <Hds::Toast
-      @color='critical'
+    <Notice
+      class="notification-delete"
+      @type="error"
       ...attributes
-      as |T|>
-      <T.Title>Error!</T.Title>
-      <T.Description>
-        There was an error invalidating the Lock Session.
-        {{#if (and @error.status @error.detail)}}
+    as |notice|>
+      <notice.Header>
+        <strong>Error!</strong>
+      </notice.Header>
+      <notice.Body>
+        <p>
+          There was an error invalidating the Lock Session.
+      {{#if (and @error.status @error.detail)}}
           <br />{{@error.status}}: {{@error.detail}}
-        {{/if}}
-      </T.Description>
-    </Hds::Toast>
+      {{/if}}
+        </p>
+      </notice.Body>
+    </Notice>
   {{else}}
-    <Hds::Toast
-      @color='success'
+    <Notice
+      class="notification-delete"
+      @type="success"
       ...attributes
-      as |T|>
-      <T.Title>Success!</T.Title>
-      <T.Description>
-        Your Lock Session has been invalidated.
-      </T.Description>
-    </Hds::Toast>
+    as |notice|>
+      <notice.Header>
+        <strong>Success!</strong>
+      </notice.Header>
+      <notice.Body>
+        <p>
+          Your Lock Session has been invalidated.
+        </p>
+      </notice.Body>
+    </Notice>
   {{/if}}
 {{else if (eq @type 'kv')}}
-  <Hds::Alert @type='inline' @color='warning' class='mb-3' data-test-session-warning as |A|>
-    <A.Title>Warning</A.Title>
-    <A.Description>This KV has a lock session. You can edit KV's with lock sessions, but we recommend doing so with care, or not doing so at all. It may negatively impact the active node it's associated with. See below for more details on the Lock Session.</A.Description>
-    <A.Link::Standalone @text='Learn more'
-                        @href="{{env 'CONSUL_DOCS_URL'}}/internals/sessions.html"
-                        @icon='docs-link'
-                        @iconPosition='trailing' />
-  </Hds::Alert>
+  <Notice
+    @type="warning"
+    data-test-session-warning
+  as |notice|>
+    <notice.Body>
+      <p>
+        <strong>Warning.</strong> This KV has a lock session. You can edit KV's with lock sessions, but we recommend doing so with care, or not doing so at all. It may negatively impact the active node it's associated with. See below for more details on the Lock Session and see <a href="{{env 'CONSUL_DOCS_URL'}}/internals/sessions.html" target="_blank" rel="noopener noreferrer">our documentation</a> for more information.
+      </p>
+    </notice.Body>
+  </Notice>
 {{/if}}
diff --git a/ui/packages/consul-lock-sessions/app/templates/dc/nodes/show/sessions.hbs b/ui/packages/consul-lock-sessions/app/templates/dc/nodes/show/sessions.hbs
index 61c679aa2f1f9..cdb31f6c65d4c 100644
--- a/ui/packages/consul-lock-sessions/app/templates/dc/nodes/show/sessions.hbs
+++ b/ui/packages/consul-lock-sessions/app/templates/dc/nodes/show/sessions.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -90,23 +85,21 @@ as |route|>
               </BlockSlot>
 
                 <BlockSlot @name="actions">
-                  <li>
-                    <Hds::Link::Standalone
-                      @text='Documentation on Lock Sessions'
+                  <li class="docs-link">
+                    <Action
                       @href="{{env 'CONSUL_DOCS_URL'}}/internals/sessions.html"
-                      @icon='docs-link'
-                      @iconPosition='trailing'
-                      @size='small'
-                    />
+                      @external={{true}}
+                    >
+                      Documentation on Lock Sessions
+                    </Action>
                   </li>
-                  <li>
-                    <Hds::Link::Standalone
-                      @text='Take the tutorial'
-                      @href='{{env 'CONSUL_DOCS_LEARN_URL'}}/tutorials/consul/distributed-semaphore'
-                      @icon='learn-link'
-                      @iconPosition='trailing'
-                      @size='small'
-                    />
+                  <li class="learn-link">
+                    <Action
+                      @href="{{env 'CONSUL_DOCS_LEARN_URL'}}/tutorials/consul/distributed-semaphore"
+                      @external={{true}}
+                    >
+                      Take the tutorial
+                    </Action>
                   </li>
                 </BlockSlot>
 
diff --git a/ui/packages/consul-lock-sessions/vendor/consul-lock-sessions/routes.js b/ui/packages/consul-lock-sessions/vendor/consul-lock-sessions/routes.js
index 102e9ffe0736a..6b7cb8a583ec7 100644
--- a/ui/packages/consul-lock-sessions/vendor/consul-lock-sessions/routes.js
+++ b/ui/packages/consul-lock-sessions/vendor/consul-lock-sessions/routes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (routes => routes({
   dc: {
     nodes: {
diff --git a/ui/packages/consul-lock-sessions/vendor/consul-lock-sessions/services.js b/ui/packages/consul-lock-sessions/vendor/consul-lock-sessions/services.js
index 1654b41eeea71..159a7a96ecc56 100644
--- a/ui/packages/consul-lock-sessions/vendor/consul-lock-sessions/services.js
+++ b/ui/packages/consul-lock-sessions/vendor/consul-lock-sessions/services.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (services => services({
 
 }))(
diff --git a/ui/packages/consul-nspaces/app/components/consul/nspace/form/index.hbs b/ui/packages/consul-nspaces/app/components/consul/nspace/form/index.hbs
index 52b39bd9df59f..cacb0758e30de 100644
--- a/ui/packages/consul-nspaces/app/components/consul/nspace/form/index.hbs
+++ b/ui/packages/consul-nspaces/app/components/consul/nspace/form/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div class="consul-nspace-form" ...attributes>
   <DataWriter
     @sink={{uri
@@ -107,29 +102,25 @@
               </fieldset>
             {{/if}}
             <div>
-              <Hds::ButtonSet>
               {{#if (and (is "new nspace" item=item) (can "create nspaces"))}}
-                <Hds::Button
-                  type="submit"
-                  disabled={{or
+                <Action
+                  @type="submit"
+                  {{disabled
+                    (or
                       (is "pristine nspace" item=item)
                       (state-matches state "error")
+                    )
                   }}
-                  @text='Save'
-                />
+                >
+                  Save
+                </Action>
               {{else if (can "write nspace" item=item)}}
-                <Hds::Button
-                  type='submit'
-                  @text='Save'
-                />
+                <Action @type="submit">Save</Action>
               {{/if}}
 
-                <Hds::Button
-                  type='reset'
-                  @color='secondary'
-                  @text='Cancel'
-                  {{on 'click' (fn this.onCancel item)}}
-                />
+              <Action @type="reset" {{on "click" (fn this.onCancel item)}}>
+                Cancel
+              </Action>
 
               {{#if
                 (and
@@ -141,12 +132,13 @@
                   @message="Are you sure you want to delete this Namespace?"
                 >
                   <BlockSlot @name="action" as |confirm|>
-                    <Hds::Button
+                    <Action
                       data-test-delete
-                      @color='critical'
-                      @text='Delete'
+                      class="type-delete"
                       {{on "click" (fn confirm (fn writer.delete item))}}
-                    />
+                    >
+                      Delete
+                    </Action>
                   </BlockSlot>
                   <BlockSlot @name="dialog" as |execute cancel message|>
                     <DeleteConfirmation
@@ -157,7 +149,7 @@
                   </BlockSlot>
                 </ConfirmationDialog>
               {{/if}}
-              </Hds::ButtonSet>
+
             </div>
           </StateChart>
         </form>
diff --git a/ui/packages/consul-nspaces/app/components/consul/nspace/form/index.js b/ui/packages/consul-nspaces/app/components/consul/nspace/form/index.js
index df8978572e59b..4c2882cde50d3 100644
--- a/ui/packages/consul-nspaces/app/components/consul/nspace/form/index.js
+++ b/ui/packages/consul-nspaces/app/components/consul/nspace/form/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from "@glimmer/component";
 import { action } from "@ember/object";
 
diff --git a/ui/packages/consul-nspaces/app/components/consul/nspace/list/index.hbs b/ui/packages/consul-nspaces/app/components/consul/nspace/list/index.hbs
index b503aefa0efd3..8221de2311556 100644
--- a/ui/packages/consul-nspaces/app/components/consul/nspace/list/index.hbs
+++ b/ui/packages/consul-nspaces/app/components/consul/nspace/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <ListCollection
   class="consul-nspace-list"
   ...attributes
diff --git a/ui/packages/consul-nspaces/app/components/consul/nspace/list/pageobject.js b/ui/packages/consul-nspaces/app/components/consul/nspace/list/pageobject.js
index b46f42af8a437..752dc6809ba6f 100644
--- a/ui/packages/consul-nspaces/app/components/consul/nspace/list/pageobject.js
+++ b/ui/packages/consul-nspaces/app/components/consul/nspace/list/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (collection, clickable, attribute, text, actions) => () => {
   return collection('.consul-nspace-list [data-test-list-row]', {
     nspace: clickable('a'),
diff --git a/ui/packages/consul-nspaces/app/components/consul/nspace/notifications/index.hbs b/ui/packages/consul-nspaces/app/components/consul/nspace/notifications/index.hbs
index 67d44210f2073..c373a535b31aa 100644
--- a/ui/packages/consul-nspaces/app/components/consul/nspace/notifications/index.hbs
+++ b/ui/packages/consul-nspaces/app/components/consul/nspace/notifications/index.hbs
@@ -1,13 +1,16 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (eq @type 'remove')}}
-  <Hds::Toast @color='success'
-              ...attributes
-              as |T|>
-    <T.Title>Success!</T.Title>
-    <T.Description>Your Namespace has been marked for deletion.</T.Description>
-  </Hds::Toast>
+  <Notice
+    class="notification-delete"
+    @type="success"
+    ...attributes
+  as |notice|>
+    <notice.Header>
+      <strong>Success!</strong>
+    </notice.Header>
+    <notice.Body>
+      <p>
+        Your Namespace has been marked for deletion.
+      </p>
+    </notice.Body>
+  </Notice>
 {{/if}}
diff --git a/ui/packages/consul-nspaces/app/components/consul/nspace/search-bar/index.hbs b/ui/packages/consul-nspaces/app/components/consul/nspace/search-bar/index.hbs
index f438d18dce2a2..fc6e5c282de66 100644
--- a/ui/packages/consul-nspaces/app/components/consul/nspace/search-bar/index.hbs
+++ b/ui/packages/consul-nspaces/app/components/consul/nspace/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar
   class="consul-nspace-search-bar"
   ...attributes
diff --git a/ui/packages/consul-nspaces/app/components/consul/nspace/selector/index.hbs b/ui/packages/consul-nspaces/app/components/consul/nspace/selector/index.hbs
index 8ddb666e13c56..421d23dc08c19 100644
--- a/ui/packages/consul-nspaces/app/components/consul/nspace/selector/index.hbs
+++ b/ui/packages/consul-nspaces/app/components/consul/nspace/selector/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (can "use nspaces")}}
   {{#if (can "choose nspaces")}}
     {{#let
diff --git a/ui/packages/consul-nspaces/app/templates/dc/nspaces/edit.hbs b/ui/packages/consul-nspaces/app/templates/dc/nspaces/edit.hbs
index cae8066f0ec62..3fef753e8b4c5 100644
--- a/ui/packages/consul-nspaces/app/templates/dc/nspaces/edit.hbs
+++ b/ui/packages/consul-nspaces/app/templates/dc/nspaces/edit.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-nspaces/app/templates/dc/nspaces/index.hbs b/ui/packages/consul-nspaces/app/templates/dc/nspaces/index.hbs
index 00a0ccc978185..e9c636064379a 100644
--- a/ui/packages/consul-nspaces/app/templates/dc/nspaces/index.hbs
+++ b/ui/packages/consul-nspaces/app/templates/dc/nspaces/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -54,11 +49,7 @@ as |route|>
       </BlockSlot>
       <BlockSlot @name="actions">
   {{#if (can "create nspaces")}}
-    <Hds::Button
-      @text='Create'
-      @route='dc.nspaces.create'
-      data-test-create
-    />
+          <a data-test-create href="{{href-to 'dc.nspaces.create'}}" class="type-create">Create</a>
   {{/if}}
       </BlockSlot>
       <BlockSlot @name="toolbar">
@@ -126,23 +117,11 @@ as |route|>
                 </p>
               </BlockSlot>
               <BlockSlot @name="actions">
-                <li>
-                  <Hds::Link::Standalone
-                    @text='Documentation on namespaces'
-                    @href="{{env 'CONSUL_DOCS_URL'}}/commands/namespace"
-                    @icon='docs-link'
-                    @iconPosition='trailing'
-                    @size='small'
-                  />
+                <li class="docs-link">
+                  <a href="{{env 'CONSUL_DOCS_URL'}}/commands/namespace" rel="noopener noreferrer" target="_blank">Documentation on namespaces</a>
                 </li>
-                <li>
-                  <Hds::Link::Standalone
-                    @text='Read the guide'
-                    @href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/namespaces/secure-namespaces"
-                    @icon='learn-link'
-                    @iconPosition='trailing'
-                    @size='small'
-                  />
+                <li class="learn-link">
+                  <a href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/namespaces/secure-namespaces" rel="noopener noreferrer" target="_blank">Read the guide</a>
                 </li>
               </BlockSlot>
             </EmptyState>
diff --git a/ui/packages/consul-nspaces/vendor/consul-nspaces/routes.js b/ui/packages/consul-nspaces/vendor/consul-nspaces/routes.js
index 5c43e6f6a431e..a3537ac7114e3 100644
--- a/ui/packages/consul-nspaces/vendor/consul-nspaces/routes.js
+++ b/ui/packages/consul-nspaces/vendor/consul-nspaces/routes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (routes => routes({
   dc: {
     nspaces: {
diff --git a/ui/packages/consul-nspaces/vendor/consul-nspaces/services.js b/ui/packages/consul-nspaces/vendor/consul-nspaces/services.js
index 1654b41eeea71..159a7a96ecc56 100644
--- a/ui/packages/consul-nspaces/vendor/consul-nspaces/services.js
+++ b/ui/packages/consul-nspaces/vendor/consul-nspaces/services.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (services => services({
 
 }))(
diff --git a/ui/packages/consul-partitions/app/components/consul/partition/form/index.hbs b/ui/packages/consul-partitions/app/components/consul/partition/form/index.hbs
index 03119b64106dd..7b5d0858dd718 100644
--- a/ui/packages/consul-partitions/app/components/consul/partition/form/index.hbs
+++ b/ui/packages/consul-partitions/app/components/consul/partition/form/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="consul-partition-form"
   ...attributes
@@ -89,37 +84,34 @@ as |State Guard ChartAction dispatch state|>
   </fieldset>
 
   <div>
-    <Hds::ButtonSet>
-
-
 {{#if (and (is "new partition" item=item) (can "create partitions")) }}
-  <Hds::Button
-    @text='Save'
-    type='submit'
-    disabled={{or (is "pristine partition" item=item) (state-matches state "error")}}
-  />
+      <Action
+        @type="submit"
+        {{disabled (or (is "pristine partition" item=item) (state-matches state "error"))}}
+      >
+        Save
+      </Action>
 {{else if (not readOnly)}}
-  <Hds::Button
-    @text='Save'
-    type='submit'
-  />
+      <Action @type="submit">Save</Action>
 {{/if}}
-      <Hds::Button
-        @text='Cancel'
-        type='reset'
-        @color='secondary'
-        {{on 'click' (if @oncancel (fn (optional @oncancel item)) (fn (optional @onsubmit item)))}}
-      />
+
+      <Action
+        @type="reset"
+        {{on 'click' (if @oncancel (fn @oncancel item) (fn @onsubmit item))}}
+      >
+        Cancel
+      </Action>
 
 {{#if (and (not (is "new partition" item=item)) (can "delete partition" item=item))}}
       <ConfirmationDialog @message="Are you sure you want to delete this Partition?">
         <BlockSlot @name="action" as |confirm|>
-          <Hds::Button
-            @text='Delete'
+          <Action
             data-test-delete
-            @color='critical'
+            class="type-delete"
             {{on 'click' (fn confirm (fn writer.delete item))}}
-          />
+          >
+            Delete
+          </Action>
         </BlockSlot>
         <BlockSlot @name="dialog" as |execute cancel message|>
           <DeleteConfirmation
@@ -130,7 +122,7 @@ as |State Guard ChartAction dispatch state|>
         </BlockSlot>
       </ConfirmationDialog>
 {{/if}}
-    </Hds::ButtonSet>
+
   </div>
 
 </StateChart>
diff --git a/ui/packages/consul-partitions/app/components/consul/partition/list/index.hbs b/ui/packages/consul-partitions/app/components/consul/partition/list/index.hbs
index 47f3707b63129..1dcd6023e439a 100644
--- a/ui/packages/consul-partitions/app/components/consul/partition/list/index.hbs
+++ b/ui/packages/consul-partitions/app/components/consul/partition/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <ListCollection
   class="consul-partition-list"
   ...attributes
diff --git a/ui/packages/consul-partitions/app/components/consul/partition/list/test-support.js b/ui/packages/consul-partitions/app/components/consul/partition/list/test-support.js
index 2524ce36c5796..c6ec1c45214a6 100644
--- a/ui/packages/consul-partitions/app/components/consul/partition/list/test-support.js
+++ b/ui/packages/consul-partitions/app/components/consul/partition/list/test-support.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export const selectors = () => ({
   ['.consul-partition-list']: {
     row: {
diff --git a/ui/packages/consul-partitions/app/components/consul/partition/notifications/index.hbs b/ui/packages/consul-partitions/app/components/consul/partition/notifications/index.hbs
index d97ff184f965e..5b50a2f6614b7 100644
--- a/ui/packages/consul-partitions/app/components/consul/partition/notifications/index.hbs
+++ b/ui/packages/consul-partitions/app/components/consul/partition/notifications/index.hbs
@@ -1,16 +1,16 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (eq @type 'remove')}}
-  <Hds::Toast
-    @color='success'
+  <Notice
+    class="notification-delete"
+    @type="success"
     ...attributes
-    as |T|>
-    <T.Title>Success!</T.Title>
-    <T.Description>
-      Your Partition has been marked for deletion.
-    </T.Description>
-  </Hds::Toast>
+  as |notice|>
+    <notice.Header>
+      <strong>Success!</strong>
+    </notice.Header>
+    <notice.Body>
+      <p>
+        Your Partition has been marked for deletion.
+      </p>
+    </notice.Body>
+  </Notice>
 {{/if}}
diff --git a/ui/packages/consul-partitions/app/components/consul/partition/search-bar/index.hbs b/ui/packages/consul-partitions/app/components/consul/partition/search-bar/index.hbs
index 56fa44084a7b8..b0f15ec3061d4 100644
--- a/ui/packages/consul-partitions/app/components/consul/partition/search-bar/index.hbs
+++ b/ui/packages/consul-partitions/app/components/consul/partition/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar
   class="consul-partition-search-bar"
   ...attributes
diff --git a/ui/packages/consul-partitions/app/components/consul/partition/selector/index.hbs b/ui/packages/consul-partitions/app/components/consul/partition/selector/index.hbs
index b9727a9de96e4..eae8faf0f2a23 100644
--- a/ui/packages/consul-partitions/app/components/consul/partition/selector/index.hbs
+++ b/ui/packages/consul-partitions/app/components/consul/partition/selector/index.hbs
@@ -1,74 +1,79 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#let
-  (or @partition "default")
-  (is-href "dc.partitions" @dc.Name)
-  as |partition isManaging|
-}}
+  (or @partition 'default')
+  (is-href 'dc.partitions' @dc.Name)
+as |partition isManaging|}}
   {{#if (can "choose partitions" dc=@dc)}}
-    <li class="partitions" data-test-partition-menu>
-      <DisclosureMenu
-        aria-label="Admin Partition"
-        @items={{append
-          (hash
-            Name="Manage Partitions" href=(href-to "dc.partitions" @dc.Name)
-          )
-          (reject-by "DeletedAt" @partitions)
-        }}
-        as |disclosure|
+      <li
+        class="partitions"
+        data-test-partition-menu
       >
-        <disclosure.Action {{on "click" disclosure.toggle}}>
-          {{if isManaging "Manage Partition" partition}}
-        </disclosure.Action>
-        <disclosure.Menu as |panel|>
-          <DataSource
-            @src={{uri "/*/*/${dc}/partitions" (hash dc=@dc.Name)}}
-            @onchange={{fn (optional @onchange)}}
-          />
-          <panel.Menu as |menu|>
-            {{#each menu.items as |item|}}
-              <menu.Item
-                aria-current={{if
-                  (or
-                    (and isManaging item.href)
-                    (and (not isManaging) (eq partition item.Name))
-                  )
-                  "true"
-                }}
-              >
-                <menu.Action
-                  {{on "click" disclosure.close}}
-                  @href={{if
-                    item.href
-                    item.href
-                    (if
-                      isManaging
-                      (href-to
-                        "dc.services.index"
-                        params=(hash
-                          partition=item.Name nspace=undefined dc=@dc.Name
-                        )
-                      )
-                      (href-to
-                        "." params=(hash partition=item.Name nspace=undefined)
-                      )
+        <DisclosureMenu
+          aria-label="Admin Partition"
+          @items={{append 
+            (hash 
+              Name="Manage Partitions"
+              href=(href-to 'dc.partitions' @dc.Name)
+            ) 
+            (reject-by 'DeletedAt' @partitions)
+          }}
+        as |disclosure|>
+          <disclosure.Action
+            {{on 'click' disclosure.toggle}}
+          >
+            {{if isManaging 'Manage Partition' partition}}
+          </disclosure.Action>
+          <disclosure.Menu as |panel|>
+            <DataSource
+              @src={{uri
+                '/*/*/${dc}/partitions'
+                (hash
+                  dc=@dc.Name
+                )
+              }}
+              @onchange={{fn (optional @onchange)}}
+            />
+            <panel.Menu as |menu|>
+              {{#each menu.items as |item|}}
+                <menu.Item
+                  aria-current={{if 
+                    (or 
+                      (and isManaging item.href)
+                      (and (not isManaging) (eq partition item.Name))
                     )
+                    'true'
                   }}
                 >
-                  {{item.Name}}
-                </menu.Action>
-              </menu.Item>
-            {{/each}}
-          </panel.Menu>
-        </disclosure.Menu>
-      </DisclosureMenu>
-    </li>
+                  <menu.Action
+                    {{on 'click' disclosure.close}}
+                    @href={{if item.href 
+                      item.href 
+                      (if isManaging 
+                        (href-to 'dc.services.index' params=(hash
+                          partition=item.Name
+                          nspace=undefined
+                          dc=@dc.Name
+                        ))
+                        (href-to '.' params=(hash
+                          partition=item.Name
+                          nspace=undefined
+                        ))
+                      )
+                    }}
+                  >
+                    {{item.Name}}
+                  </menu.Action>
+                </menu.Item>
+              {{/each}}
+            </panel.Menu>
+          </disclosure.Menu>
+        </DisclosureMenu>
+      </li>
   {{else}}
-    <li class="partition" aria-label="Admin Partition">
-      {{"default"}}
+    <li 
+      class="partition"
+      aria-label="Admin Partition"
+    >
+      {{'default'}}
     </li>
   {{/if}}
 {{/let}}
diff --git a/ui/packages/consul-partitions/app/templates/dc/partitions/edit.hbs b/ui/packages/consul-partitions/app/templates/dc/partitions/edit.hbs
index d08246cd8fc0a..327bc32da1da1 100644
--- a/ui/packages/consul-partitions/app/templates/dc/partitions/edit.hbs
+++ b/ui/packages/consul-partitions/app/templates/dc/partitions/edit.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-partitions/app/templates/dc/partitions/index.hbs b/ui/packages/consul-partitions/app/templates/dc/partitions/index.hbs
index ed9c8a521d334..5b589c27672b8 100644
--- a/ui/packages/consul-partitions/app/templates/dc/partitions/index.hbs
+++ b/ui/packages/consul-partitions/app/templates/dc/partitions/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -54,11 +49,13 @@ as |route|>
       </BlockSlot>
       <BlockSlot @name="actions">
 {{#if (can 'create partitions')}}
-  <Hds::Button
-    @text='Create'
-    @route='dc.partitions.create'
-    data-test-create
-  />
+        <a 
+          data-test-create 
+          class="type-create"
+          href="{{href-to 'dc.partitions.create'}}"
+        >
+          Create
+        </a>
 {{/if}}
       </BlockSlot>
       <BlockSlot @name="toolbar">
diff --git a/ui/packages/consul-partitions/vendor/consul-partitions/routes.js b/ui/packages/consul-partitions/vendor/consul-partitions/routes.js
index a373e914e541c..0ecba8ef26d75 100644
--- a/ui/packages/consul-partitions/vendor/consul-partitions/routes.js
+++ b/ui/packages/consul-partitions/vendor/consul-partitions/routes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (routes => routes({
   dc: {
     partitions: {
diff --git a/ui/packages/consul-partitions/vendor/consul-partitions/services.js b/ui/packages/consul-partitions/vendor/consul-partitions/services.js
index 1cf59ee066ca7..550211f9d97a4 100644
--- a/ui/packages/consul-partitions/vendor/consul-partitions/services.js
+++ b/ui/packages/consul-partitions/vendor/consul-partitions/services.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (services => services({
   "component:consul/partition/selector": {
     "class": "consul-ui/components/consul/partition/selector"
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/address/list/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/address/list/index.hbs
index bc6294e015f0a..727b0e7e7ddbc 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/address/list/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/address/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Providers::Dimension as |p|>
   {{#if p.data.height}}
     <div style={{p.data.fillRemainingHeightStyle}} class="overflow-y-scroll">
@@ -13,7 +8,7 @@
         as |address index|
       >
         <li
-          class="px-3 h-12 border-bottom-primary flex items-center justify-between group"
+          class="px-3 h-12 hds-border-primary border-t-0 border-l-0 border-r-0 flex items-center justify-between group"
         >
           <div
             class="hds-typography-display-300 text-hds-foreground-strong hds-font-weight-semibold"
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/address/list/index.scss b/ui/packages/consul-peerings/app/components/consul/peer/address/list/index.scss
deleted file mode 100644
index 6816f4934f59c..0000000000000
--- a/ui/packages/consul-peerings/app/components/consul/peer/address/list/index.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
-.border-bottom-primary {
-  border-bottom: 1px solid var(--token-color-border-primary);
-}
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/bento-box/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/bento-box/index.hbs
index b0f633718ec23..a4414b3293916 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/bento-box/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/bento-box/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Hds::Card::Container @level="base" @hasBorder={{true}} class="mt-6 mb-3">
   <div class="flex h-24 p-6 overflow-x-auto space-x-12">
     <div class="shrink-0">
@@ -15,7 +10,7 @@
     </div>
     <div class="shrink-0">
       <div
-        class="hds-typography-body-200 mb-2 hds-font-weight-semibold hds-foreground-primary"
+        class="mb-2 hds-typography-body-200 hds-font-weight-semibold hds-foreground-primary"
       >Latest heartbeat</div>
       <div class="flex items-center">
         {{#if @peering.LastHeartbeat}}
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/components.scss b/ui/packages/consul-peerings/app/components/consul/peer/components.scss
index ad5f5cd296917..d4fdbe0813446 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/components.scss
+++ b/ui/packages/consul-peerings/app/components/consul/peer/components.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %pill-pending::before,
 %pill-establishing::before,
 %pill-active::before,
@@ -10,7 +5,7 @@
 %pill-terminated::before,
 %pill-deleting::before {
   --icon-size: icon-000;
-  content: "";
+  content: '';
 }
 %pill-pending,
 %pill-establishing,
@@ -18,60 +13,64 @@
 %pill-failing,
 %pill-terminated,
 %pill-deleting {
-  @extend .hds-font-weight-medium;
-  font-size: var(--token-typography-body-200-font-size);
+  font-weight: var(--typo-weight-medium);
+  font-size: var(--typo-size-700);
 }
 
 %pill-pending::before {
   --icon-name: icon-running;
-  --icon-color: var(--token-color-palette-neutral-600);
+  --icon-color: rgb(var(--tone-gray-800));
 }
 %pill-pending {
-  background-color: var(--token-color-consul-surface);
-  color: var(--token-color-consul-foreground);
+  background-color: rgb(var(--tone-strawberry-050));
+  color: rgb(var(--tone-strawberry-500));
 }
 
 %pill-establishing::before {
   --icon-name: icon-running;
-  --icon-color: var(--token-color-palette-neutral-600);
+  --icon-color: rgb(var(--tone-gray-800));
 }
 %pill-establishing {
-  background-color: var(--token-color-palette-blue-50);
-  color: var(--token-color-palette-blue-200);
+  background-color: rgb(var(--tone-blue-050));
+  color: rgb(var(--tone-blue-500));
 }
 
 %pill-active::before {
   --icon-name: icon-check;
-  --icon-color: var(--token-color-palette-green-400);
+  --icon-color: rgb(var(--tone-green-800));
 }
 %pill-active {
-  background-color: var(--token-color-palette-green-50);
-  color: var(--token-color-palette-green-200);
+  background-color: rgb(var(--tone-green-050));
+  color: rgb(var(--tone-green-600));
 }
 
 %pill-failing::before {
   --icon-name: icon-x;
-  --icon-color: var(--token-color-palette-red-200);
+  --icon-color: rgb(var(--tone-red-500));
 }
 %pill-failing {
-  background-color: var(--token-color-palette-red-50);
-  color: var(--token-color-palette-red-200);
+  background-color: rgb(var(--tone-red-050));
+  color: rgb(var(--tone-red-500));
 }
 
 %pill-terminated::before {
   --icon-name: icon-x-square;
-  --icon-color: var(--token-color-palette-neutral-600);
+  --icon-color: rgb(var(--tone-gray-800));
 }
 %pill-terminated {
-  background-color: var(--token-color-palette-neutral-200);
-  color: var(--token-color-palette-neutral-600);
+  background-color: rgb(var(--tone-gray-150));
+  color: rgb(var(--tone-gray-800));
 }
 
+
 %pill-deleting::before {
   --icon-name: icon-loading;
-  --icon-color: var(--token-color-foreground-warning-on-surface);
+  --icon-color: rgb(var(--tone-green-800));
 }
 %pill-deleting {
-  background-color: var(--token-color-surface-warning);
-  color: var(--token-color-foreground-warning-on-surface);
+  background-color: rgb(var(--tone-yellow-050));
+  color: rgb(var(--tone-yellow-800));
 }
+
+
+
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/chart.xstate.js b/ui/packages/consul-peerings/app/components/consul/peer/form/chart.xstate.js
index 2380c523b4cee..7f611fd328f0c 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/form/chart.xstate.js
+++ b/ui/packages/consul-peerings/app/components/consul/peer/form/chart.xstate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   id: 'consul-peer-form',
   initial: 'generate',
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/generate/actions/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/form/generate/actions/index.hbs
index 1c16d1d533dc3..5c7513233ca41 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/form/generate/actions/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/form/generate/actions/index.hbs
@@ -1,12 +1,10 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
-<Hds::Button
-  @text='Generate token'
+<Action
   form={{@id}}
-  type='submit'
-  disabled={{or (eq @item.Name.length 0)}}
+  @type="submit"
+  {{disabled (or
+    (eq @item.Name.length 0)
+  )}}
   ...attributes
-/>
\ No newline at end of file
+>
+  Generate token
+</Action>
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/generate/chart.xstate.js b/ui/packages/consul-peerings/app/components/consul/peer/form/generate/chart.xstate.js
index 504b2c5a7ea5f..7ae1bbf988ec1 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/form/generate/chart.xstate.js
+++ b/ui/packages/consul-peerings/app/components/consul/peer/form/generate/chart.xstate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   id: 'consul-peer-generate-form',
   initial: 'idle',
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/generate/fieldsets/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/form/generate/fieldsets/index.hbs
index d17bc34a72799..e9ba548c939aa 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/form/generate/fieldsets/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/form/generate/fieldsets/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div class={{class-map "consul-peer-form-generate-fieldsets"}} ...attributes>
   <StateMachine
     @src={{require
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/generate/fieldsets/index.js b/ui/packages/consul-peerings/app/components/consul/peer/form/generate/fieldsets/index.js
index a037015d1d85d..ea90d94060908 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/form/generate/fieldsets/index.js
+++ b/ui/packages/consul-peerings/app/components/consul/peer/form/generate/fieldsets/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/generate/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/form/generate/index.hbs
index d6493c895c6d0..de818b1b5fe27 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/form/generate/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/form/generate/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div class={{class-map "consul-peer-form-generate"}} ...attributes>
   <StateMachine
     @src={{require
@@ -18,10 +13,14 @@
 
         <fsm.State @matches={{array "idle" "error"}}>
           <fsm.State @matches={{"error"}}>
-            <Hds::Alert @color='critical' class='mb-3 mt-2' as |A|>
-              <A.Title>Error</A.Title>
-              <A.Description>{{fsm.state.context.error.message}}</A.Description>
-            </Hds::Alert>
+            <Notice @type="error" role="alert" as |notice|>
+              <notice.Body>
+                <p>
+                  <strong>Error</strong><br />
+                  {{fsm.state.context.error.message}}
+                </p>
+              </notice.Body>
+            </Notice>
           </fsm.State>
           {{yield
             (hash
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/form/index.hbs
index 031ffead3ccca..8f56517f9cfd2 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/form/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/form/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div class={{class-map "consul-peer-form"}} ...attributes>
   <StateMachine
     @src={{require "./chart.xstate" from="/components/consul/peer/form"}}
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/index.scss b/ui/packages/consul-peerings/app/components/consul/peer/form/index.scss
index 830cced098ae0..e4b96b4618818 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/form/index.scss
+++ b/ui/packages/consul-peerings/app/components/consul/peer/form/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-peer-form {
   & {
     width: 416px;
@@ -12,6 +7,15 @@
   }
 }
 
+.consul-peer-form-token-actions {
+  button:first-of-type {
+    @extend %primary-button;
+  }
+  button:last-of-type {
+    @extend %secondary-button;
+  }
+}
+
 .consul-peer-form-generate {
   & {
     width: 416px;
@@ -24,9 +28,9 @@
     position: relative;
   }
   ol::before {
-    content: "";
+    content: '';
     border-left: var(--decor-border-100);
-    border-color: var(--token-color-palette-neutral-300);
+    border-color: rgb(var(--tone-gray-300));
     height: 100%;
     position: absolute;
     left: 2rem;
@@ -43,16 +47,17 @@
   li::before {
     --icon-name: icon-hexagon;
     --icon-size: icon-600;
-    content: "";
+    content: '';
     position: absolute;
     z-index: 2;
   }
   li::after {
-    @extend %body-200-semibold;
     content: counter(hexagonal-counter);
     position: absolute;
     top: 0px;
-    background-color: var(--token-color-palette-neutral-0);
+    font-size: 14px;
+    font-weight: var(--typo-weight-bold);
+    background-color: rgb(var(--tone-gray-000));
     z-index: 1;
     text-align: center;
   }
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/initiate/actions/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/form/initiate/actions/index.hbs
index f5f4c4864f4b4..555ddf3b03aa9 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/form/initiate/actions/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/form/initiate/actions/index.hbs
@@ -1,11 +1,7 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
-<Hds::Button
-  @text='Add peer'
+<Action
   form={{@id}}
-  type='submit'
+  @type="submit"
   ...attributes
-/>
\ No newline at end of file
+>
+  Add peer
+</Action>
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/initiate/fieldsets/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/form/initiate/fieldsets/index.hbs
index 28228a8c8d0d4..f0f2fd5eb6553 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/form/initiate/fieldsets/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/form/initiate/fieldsets/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class={{class-map
     'consul-peer-form-initiate-fieldsets'
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/initiate/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/form/initiate/index.hbs
index c26d91956c1c4..f7daf88cf407e 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/form/initiate/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/form/initiate/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div class={{class-map "consul-peer-form-initiate"}} ...attributes>
   <DataWriter
     @sink={{uri
@@ -19,10 +14,14 @@
     as |writer|
   >
     <BlockSlot @name="error" as |after error|>
-      <Hds::Alert @color='critical' class='mb-3 mt-2' as |A|>
-        <A.Title>Error</A.Title>
-        <A.Description>{{error.message}}</A.Description>
-      </Hds::Alert>
+      <Notice @type="error" role="alert" as |notice|>
+        <notice.Body>
+          <p>
+            <strong>Error</strong><br />
+            {{error.message}}
+          </p>
+        </notice.Body>
+      </Notice>
     </BlockSlot>
     <BlockSlot @name="content">
       {{#let (unique-id) as |id|}}
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/token/actions/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/form/token/actions/index.hbs
index feb85bf4a25ea..70cdb6d1d2f45 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/form/token/actions/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/form/token/actions/index.hbs
@@ -1,23 +1,18 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
+  class={{class-map
+    'consul-peer-form-token-actions'
+  }}
   ...attributes
 >
-  <Hds::ButtonSet>
-    <Hds::Button
-      @text='Copy token'
-      @color='primary'
-      ...attributes
-      {{with-copyable @token}}
-    />
-    <Hds::Button
-      @text='Close'
-      type='reset'
-      @color='secondary'
-      {{on 'click' @onclose}}
-    />
-  </Hds::ButtonSet>
+  <Action
+    ...attributes
+    {{with-copyable @token}}
+  >
+    Copy token
+  </Action>
+  <Action
+    {{on 'click' @onclose}}
+  >
+    Close
+  </Action>
 </div>
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/form/token/fieldsets/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/form/token/fieldsets/index.hbs
index ca4b98d1687a7..ba1cf4ddda58e 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/form/token/fieldsets/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/form/token/fieldsets/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if @regenerate}}
         <p>
           Token regenerated! Here’s what’s next:
@@ -24,7 +19,7 @@
           </li>
           <li>
             <strong>Switch to the peer</strong><br />
-            Someone on your team should log into the Datacenter (Community) or Admin Partition (Enterprise) that you want this one to connect with.
+            Someone on your team should log into the Datacenter (CE) or Admin Partition (Enterprise) that you want this one to connect with.
           </li>
           <li>
             <strong>Initiate the peering</strong><br />
@@ -32,11 +27,11 @@
           </li>
         </ol>
 {{#if (not @regenerate)}}
-  <Hds::Button
-    @text='Generate another token'
-    type='reset'
-    @color='secondary'
-    {{on "click" @onclick}}
-  />
+        <Action
+          @type="reset"
+          {{on "click" @onclick}}
+        >
+          Generate another token
+        </Action>
 {{/if}}
 
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/index.scss b/ui/packages/consul-peerings/app/components/consul/peer/index.scss
index c7e6b20eaf06e..8b1be7ce8df7f 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/index.scss
+++ b/ui/packages/consul-peerings/app/components/consul/peer/index.scss
@@ -1,12 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './components';
 
 @import './list';
 @import './search-bar';
 @import './form';
-@import './address/list';
 
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/list/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/list/index.hbs
index b0d10e1f8a741..b743baee6d5f9 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/list/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <ListCollection
   class="consul-peer-list"
   ...attributes
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/list/test-support.js b/ui/packages/consul-peerings/app/components/consul/peer/list/test-support.js
index 4edc13caf1768..04507f0943d90 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/list/test-support.js
+++ b/ui/packages/consul-peerings/app/components/consul/peer/list/test-support.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export const selectors = {
   $: ".consul-peer-list",
   collection: {
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/notifications/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/notifications/index.hbs
index 782b755a8075e..972c5c10e8d2b 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/notifications/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/notifications/index.hbs
@@ -1,16 +1,16 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (eq @type 'remove')}}
-  <Hds::Toast
-    @color='success'
+  <Notice
+    class="notification-delete"
+    @type="success"
     ...attributes
-    as |T|>
-    <T.Title>Success!</T.Title>
-    <T.Description>
-      Your Peer has been marked for deletion.
-    </T.Description>
-  </Hds::Toast>
+  as |notice|>
+    <notice.Header>
+      <strong>Success!</strong>
+    </notice.Header>
+    <notice.Body>
+      <p>
+        Your Peer has been marked for deletion.
+      </p>
+    </notice.Body>
+  </Notice>
 {{/if}}
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/search-bar/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/search-bar/index.hbs
index 475c8a2b5a1d0..17e75f5cd14e3 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/search-bar/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar
   class="consul-peer-search-bar"
   ...attributes
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/search-bar/index.scss b/ui/packages/consul-peerings/app/components/consul/peer/search-bar/index.scss
index aa288d06710fb..0e9e3c1ff201a 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/search-bar/index.scss
+++ b/ui/packages/consul-peerings/app/components/consul/peer/search-bar/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-peer-search-bar {
   li button span {
     @extend %pill-500;
diff --git a/ui/packages/consul-peerings/app/components/consul/peer/selector/index.hbs b/ui/packages/consul-peerings/app/components/consul/peer/selector/index.hbs
index 2fe51c760c68e..bccfb683b862e 100644
--- a/ui/packages/consul-peerings/app/components/consul/peer/selector/index.hbs
+++ b/ui/packages/consul-peerings/app/components/consul/peer/selector/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <li 
   class="peers-separator"
   role="separator"
diff --git a/ui/packages/consul-peerings/app/controllers/dc/peers/index.js b/ui/packages/consul-peerings/app/controllers/dc/peers/index.js
index 2cf68beb7cabd..e8812e4861c09 100644
--- a/ui/packages/consul-peerings/app/controllers/dc/peers/index.js
+++ b/ui/packages/consul-peerings/app/controllers/dc/peers/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Controller from "@ember/controller";
 import { inject as service } from "@ember/service";
 
diff --git a/ui/packages/consul-peerings/app/controllers/dc/peers/show/exported.js b/ui/packages/consul-peerings/app/controllers/dc/peers/show/exported.js
index 33b2a8ceb42d2..59e61c489cd7b 100644
--- a/ui/packages/consul-peerings/app/controllers/dc/peers/show/exported.js
+++ b/ui/packages/consul-peerings/app/controllers/dc/peers/show/exported.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Controller from "@ember/controller";
 import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
diff --git a/ui/packages/consul-peerings/app/controllers/dc/peers/show/index.js b/ui/packages/consul-peerings/app/controllers/dc/peers/show/index.js
index ddef44c025a1e..1c63d8407d1a7 100644
--- a/ui/packages/consul-peerings/app/controllers/dc/peers/show/index.js
+++ b/ui/packages/consul-peerings/app/controllers/dc/peers/show/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Controller from "@ember/controller";
 import { inject as service } from "@ember/service";
 import { action } from "@ember/object";
diff --git a/ui/packages/consul-peerings/app/templates/dc/peers/index.hbs b/ui/packages/consul-peerings/app/templates/dc/peers/index.hbs
index 76a2847b38909..2d57dec8d2d59 100644
--- a/ui/packages/consul-peerings/app/templates/dc/peers/index.hbs
+++ b/ui/packages/consul-peerings/app/templates/dc/peers/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route @name={{routeName}} as |route|>
   <DataLoader
     @src={{uri
@@ -95,12 +90,13 @@
                 <this.form.Actions @onclose={{this.create.close}} />
               </BlockSlot>
             </ModalDialog>
-            <Hds::Button
-              @color='primary'
-              @text='Add peer connection'
-              {{on "click" (optional this.create.open)}}
+            <Action
               data-test-create
-              />
+              class="type-create"
+              {{on "click" (optional this.create.open)}}
+            >
+              Add peer connection
+            </Action>
 
           </BlockSlot>
           <BlockSlot @name="content">
@@ -198,28 +194,28 @@
                         </p>
                       </BlockSlot>
                       <BlockSlot @name="actions">
-                        <li>
+                        <li class="docs-link">
                           {{! what's the docs for peering?}}
-                          <Hds::Link::Standalone
-                            @text='Documentation on Peers'
-                            @href="{{env
+                          <a
+                            href="{{env
                               'CONSUL_DOCS_URL'
                             }}/connect/cluster-peering"
-                            @icon='docs-link'
-                            @iconPosition='trailing'
-                            @size='small'
-                          />
+                            rel="noopener noreferrer"
+                            target="_blank"
+                          >
+                            Documentation on Peers
+                          </a>
                         </li>
-                        <li>
-                          <Hds::Link::Standalone
-                            @text='Take the tutorial'
-                            @href="{{env
+                        <li class="learn-link">
+                          <a
+                            href="{{env
                               'CONSUL_DOCS_URL'
                             }}/connect/cluster-peering/create-manage-peering"
-                            @icon='learn-link'
-                            @iconPosition='trailing'
-                            @size='small'
-                          />
+                            rel="noopener noreferrer"
+                            target="_blank"
+                          >
+                            Take the tutorial
+                          </a>
                         </li>
                       </BlockSlot>
                     </EmptyState>
diff --git a/ui/packages/consul-peerings/app/templates/dc/peers/show.hbs b/ui/packages/consul-peerings/app/templates/dc/peers/show.hbs
index 843c54adf8ef4..25177b78e6f83 100644
--- a/ui/packages/consul-peerings/app/templates/dc/peers/show.hbs
+++ b/ui/packages/consul-peerings/app/templates/dc/peers/show.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route @name={{routeName}} as |route|>
   <DataLoader
     @src={{uri
diff --git a/ui/packages/consul-peerings/app/templates/dc/peers/show/addresses.hbs b/ui/packages/consul-peerings/app/templates/dc/peers/show/addresses.hbs
index 5845f97f5456e..4e179dc320b57 100644
--- a/ui/packages/consul-peerings/app/templates/dc/peers/show/addresses.hbs
+++ b/ui/packages/consul-peerings/app/templates/dc/peers/show/addresses.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route @name={{routeName}} as |route|>
   {{#if (gt route.model.items.length 0)}}
     <Consul::Peer::Address::List @items={{route.model.items}} />
@@ -17,27 +12,25 @@
         {{t "routes.dc.peers.show.addresses.empty.body" htmlSafe=true}}
       </BlockSlot>
       <BlockSlot @name="actions">
-        <li>
-          <Hds::Link::Standalone
-            @text='Documentation on Peers'
-            @href="{{env
-              'CONSUL_DOCS_URL'
-            }}/connect/cluster-peering"
-            @icon='docs-link'
-            @iconPosition='trailing'
-            @size='small'
-          />
+        <li class="docs-link">
+          <a
+            href="{{env 'CONSUL_DOCS_URL'}}/connect/cluster-peering"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            Documentation on Peers
+          </a>
         </li>
-        <li>
-          <Hds::Link::Standalone
-            @text='Take the tutorial'
-            @href="{{env
+        <li class="learn-link">
+          <a
+            href="{{env
               'CONSUL_DOCS_URL'
             }}/connect/cluster-peering/create-manage-peering"
-            @icon='learn-link'
-            @iconPosition='trailing'
-            @size='small'
-          />
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            Take the tutorial
+          </a>
         </li>
       </BlockSlot>
     </EmptyState>
diff --git a/ui/packages/consul-peerings/app/templates/dc/peers/show/exported.hbs b/ui/packages/consul-peerings/app/templates/dc/peers/show/exported.hbs
index 35198bfe8df3b..86a020f994b35 100644
--- a/ui/packages/consul-peerings/app/templates/dc/peers/show/exported.hbs
+++ b/ui/packages/consul-peerings/app/templates/dc/peers/show/exported.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route @name={{routeName}} as |route|>
   <DataLoader
     @src={{uri
@@ -59,7 +54,7 @@
                     as |service index|
                   >
                     <li
-                      class="px-3 h-12 border-bottom-primary"
+                      class="px-3 h-12 hds-border-primary border-t-0 border-l-0 border-r-0"
                     >
                       <a
                         data-test-service-name
@@ -104,27 +99,27 @@
                       }}
                     </BlockSlot>
                     <BlockSlot @name="actions">
-                      <li>
-                        <Hds::Link::Standalone
-                          @text='Documentation on Peers'
-                          @href="{{env
+                      <li class="docs-link">
+                        <a
+                          href="{{env
                             'CONSUL_DOCS_URL'
                           }}/connect/cluster-peering"
-                          @icon='docs-link'
-                          @iconPosition='trailing'
-                          @size='small'
-                        />
+                          rel="noopener noreferrer"
+                          target="_blank"
+                        >
+                          Documentation on Peers
+                        </a>
                       </li>
-                      <li>
-                        <Hds::Link::Standalone
-                          @text='Take the tutorial'
-                          @href="{{env
+                      <li class="learn-link">
+                        <a
+                          href="{{env
                             'CONSUL_DOCS_URL'
                           }}/connect/cluster-peering/create-manage-peering"
-                          @icon='learn-link'
-                          @iconPosition='trailing'
-                          @size='small'
-                        />
+                          rel="noopener noreferrer"
+                          target="_blank"
+                        >
+                          Take the tutorial
+                        </a>
                       </li>
                     </BlockSlot>
                   </EmptyState>
diff --git a/ui/packages/consul-peerings/app/templates/dc/peers/show/imported.hbs b/ui/packages/consul-peerings/app/templates/dc/peers/show/imported.hbs
index c7d32b3b16dba..2286f0dc3d7eb 100644
--- a/ui/packages/consul-peerings/app/templates/dc/peers/show/imported.hbs
+++ b/ui/packages/consul-peerings/app/templates/dc/peers/show/imported.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route @name={{routeName}} as |route|>
   <DataLoader
     @src={{uri
@@ -108,28 +103,25 @@
                 }}
               </BlockSlot>
               <BlockSlot @name="actions">
-                <li>
-                  {{! what's the docs for peering?}}
-                  <Hds::Link::Standalone
-                    @text='Documentation on Peers'
-                    @href="{{env
-                      'CONSUL_DOCS_URL'
-                    }}/connect/cluster-peering"
-                    @icon='docs-link'
-                    @iconPosition='trailing'
-                    @size='small'
-                  />
+                <li class="docs-link">
+                  <a
+                    href="{{env 'CONSUL_DOCS_URL'}}/connect/cluster-peering"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Documentation on Peers
+                  </a>
                 </li>
-                <li>
-                  <Hds::Link::Standalone
-                    @text='Take the tutorial'
-                    @href="{{env
+                <li class="learn-link">
+                  <a
+                    href="{{env
                       'CONSUL_DOCS_URL'
                     }}/connect/cluster-peering/create-manage-peering"
-                    @icon='learn-link'
-                    @iconPosition='trailing'
-                    @size='small'
-                  />
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Take the tutorial
+                  </a>
                 </li>
               </BlockSlot>
             </EmptyState>
diff --git a/ui/packages/consul-peerings/app/templates/dc/peers/show/index.hbs b/ui/packages/consul-peerings/app/templates/dc/peers/show/index.hbs
index 9a077304e400a..25acb7e4c2837 100644
--- a/ui/packages/consul-peerings/app/templates/dc/peers/show/index.hbs
+++ b/ui/packages/consul-peerings/app/templates/dc/peers/show/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route @name={{routeName}} as |route|>
   {{did-insert this.transitionToImported}}
 </Route>
\ No newline at end of file
diff --git a/ui/packages/consul-peerings/vendor/consul-peerings/routes.js b/ui/packages/consul-peerings/vendor/consul-peerings/routes.js
index 4ce314ba540db..1f8675c1c3c9a 100644
--- a/ui/packages/consul-peerings/vendor/consul-peerings/routes.js
+++ b/ui/packages/consul-peerings/vendor/consul-peerings/routes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 ((routes) =>
   routes({
     dc: {
diff --git a/ui/packages/consul-peerings/vendor/consul-peerings/services.js b/ui/packages/consul-peerings/vendor/consul-peerings/services.js
index afad1c0e84462..c5e069acca507 100644
--- a/ui/packages/consul-peerings/vendor/consul-peerings/services.js
+++ b/ui/packages/consul-peerings/vendor/consul-peerings/services.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (services => services({
   "component:consul/peer/selector": {
     "class": "consul-ui/components/consul/peer/selector"
diff --git a/ui/packages/consul-ui/.docfy-config.js b/ui/packages/consul-ui/.docfy-config.js
index 65bfd7401ff5d..bb728972bba26 100644
--- a/ui/packages/consul-ui/.docfy-config.js
+++ b/ui/packages/consul-ui/.docfy-config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 const path = require('path');
 
 const autolinkHeadings = require('remark-autolink-headings');
diff --git a/ui/packages/consul-ui/.eslintrc.js b/ui/packages/consul-ui/.eslintrc.js
index 114ea2c2f7d37..755726f50c597 100644
--- a/ui/packages/consul-ui/.eslintrc.js
+++ b/ui/packages/consul-ui/.eslintrc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 module.exports = {
   root: true,
   parser: 'babel-eslint',
@@ -49,17 +44,17 @@ module.exports = {
     // node files
     {
       files: [
-        './tailwind.config.js',
-        './.docfy-config.js',
-        './.eslintrc.js',
-        './.prettierrc.js',
-        './.template-lintrc.js',
-        './ember-cli-build.js',
-        './testem.js',
-        './blueprints/*/index.js',
-        './config/**/*.js',
-        './lib/*/index.js',
-        './server/**/*.js',
+        '.eslintrc.js',
+        'tailwind.config.js',
+        '.docfy-config.js',
+        '.prettierrc.js',
+        '.template-lintrc.js',
+        'ember-cli-build.js',
+        'testem.js',
+        'blueprints/*/index.js',
+        'config/**/*.js',
+        'lib/*/index.js',
+        'server/**/*.js',
       ],
       parserOptions: {
         sourceType: 'script',
diff --git a/ui/packages/consul-ui/.gitignore b/ui/packages/consul-ui/.gitignore
index 88fc1de75dfb1..7e0f7ddce8a87 100644
--- a/ui/packages/consul-ui/.gitignore
+++ b/ui/packages/consul-ui/.gitignore
@@ -19,7 +19,6 @@
 /npm-debug.log*
 /testem.log
 /yarn-error.log
-/yalc.lock
 
 # ember-try
 /.node_modules.ember-try/
diff --git a/ui/packages/consul-ui/.istanbul.yml b/ui/packages/consul-ui/.istanbul.yml
index 636bf0e77b0a6..5485bf6d76b6d 100644
--- a/ui/packages/consul-ui/.istanbul.yml
+++ b/ui/packages/consul-ui/.istanbul.yml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 instrumentation:
   excludes: [
     "!app/+(utils|search)/**/*"
diff --git a/ui/packages/consul-ui/.prettierrc.js b/ui/packages/consul-ui/.prettierrc.js
index 4833e3531de51..534e6d35aab72 100644
--- a/ui/packages/consul-ui/.prettierrc.js
+++ b/ui/packages/consul-ui/.prettierrc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 'use strict';
 
 module.exports = {
diff --git a/ui/packages/consul-ui/.template-lintrc.js b/ui/packages/consul-ui/.template-lintrc.js
index 868e880ed35a8..4daa17b811d5f 100644
--- a/ui/packages/consul-ui/.template-lintrc.js
+++ b/ui/packages/consul-ui/.template-lintrc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 'use strict';
 
 module.exports = {
diff --git a/ui/packages/consul-ui/README.md b/ui/packages/consul-ui/README.md
index a54c4e2603a48..6ee65eeeffd7e 100644
--- a/ui/packages/consul-ui/README.md
+++ b/ui/packages/consul-ui/README.md
@@ -160,13 +160,6 @@ OSS only tests can also be run using:
 
 See `.eslintrc.js` and `.eslintignore` for specific configuration.
 
-### Testing local changes to `@hashicorp/consul-ui-toolkit`
-
-| Command                | Description                                                          |
-|------------------------|----------------------------------------------------------------------|
-| `yarn toolkit:link`    | Similar to `npm link` it adds the dependency locally from yalc store |
-| `yarn toolkit:remove"` | It will remove package info from package.json and yarn.lock file     |
-
 ### Building
 
 * `make build` builds the UI for production usage (env=production)
diff --git a/ui/packages/consul-ui/app/abilities/acl.js b/ui/packages/consul-ui/app/abilities/acl.js
index 32701965184f5..9a411567e87e2 100644
--- a/ui/packages/consul-ui/app/abilities/acl.js
+++ b/ui/packages/consul-ui/app/abilities/acl.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/abilities/auth-method.js b/ui/packages/consul-ui/app/abilities/auth-method.js
index de92c39c259dd..e8b36afc500a3 100644
--- a/ui/packages/consul-ui/app/abilities/auth-method.js
+++ b/ui/packages/consul-ui/app/abilities/auth-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/abilities/base.js b/ui/packages/consul-ui/app/abilities/base.js
index c2f58ab7b4851..323d4cf5cc590 100644
--- a/ui/packages/consul-ui/app/abilities/base.js
+++ b/ui/packages/consul-ui/app/abilities/base.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import { get } from '@ember/object';
 import { Ability } from 'ember-can';
diff --git a/ui/packages/consul-ui/app/abilities/intention.js b/ui/packages/consul-ui/app/abilities/intention.js
index 27c7dc50c3e73..06f6b4004ced8 100644
--- a/ui/packages/consul-ui/app/abilities/intention.js
+++ b/ui/packages/consul-ui/app/abilities/intention.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 
 export default class IntentionAbility extends BaseAbility {
diff --git a/ui/packages/consul-ui/app/abilities/kv.js b/ui/packages/consul-ui/app/abilities/kv.js
index bfcaca43fd9a2..71623519d835a 100644
--- a/ui/packages/consul-ui/app/abilities/kv.js
+++ b/ui/packages/consul-ui/app/abilities/kv.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility, { ACCESS_LIST } from './base';
 
 export default class KVAbility extends BaseAbility {
diff --git a/ui/packages/consul-ui/app/abilities/license.js b/ui/packages/consul-ui/app/abilities/license.js
index 82affe7cff2c5..fb4d425c6a7a5 100644
--- a/ui/packages/consul-ui/app/abilities/license.js
+++ b/ui/packages/consul-ui/app/abilities/license.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/abilities/node.js b/ui/packages/consul-ui/app/abilities/node.js
index 51b92aa131f2c..768ccb5ee8111 100644
--- a/ui/packages/consul-ui/app/abilities/node.js
+++ b/ui/packages/consul-ui/app/abilities/node.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 
 export default class NodeAbility extends BaseAbility {
diff --git a/ui/packages/consul-ui/app/abilities/nspace.js b/ui/packages/consul-ui/app/abilities/nspace.js
index 994b51f41de32..befbefe29281f 100644
--- a/ui/packages/consul-ui/app/abilities/nspace.js
+++ b/ui/packages/consul-ui/app/abilities/nspace.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/abilities/overview.js b/ui/packages/consul-ui/app/abilities/overview.js
index 4381ecf537aef..8c4734ae745aa 100644
--- a/ui/packages/consul-ui/app/abilities/overview.js
+++ b/ui/packages/consul-ui/app/abilities/overview.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/abilities/partition.js b/ui/packages/consul-ui/app/abilities/partition.js
index b884e058498a3..86cc5cefc0ae0 100644
--- a/ui/packages/consul-ui/app/abilities/partition.js
+++ b/ui/packages/consul-ui/app/abilities/partition.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from 'consul-ui/abilities/base';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/abilities/peer.js b/ui/packages/consul-ui/app/abilities/peer.js
index 7a52ed4300919..cfb5ce396d133 100644
--- a/ui/packages/consul-ui/app/abilities/peer.js
+++ b/ui/packages/consul-ui/app/abilities/peer.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from 'consul-ui/abilities/base';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/abilities/permission.js b/ui/packages/consul-ui/app/abilities/permission.js
index 41b2e5a7076ff..bf2e02dc64850 100644
--- a/ui/packages/consul-ui/app/abilities/permission.js
+++ b/ui/packages/consul-ui/app/abilities/permission.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 
 export default class PermissionAbility extends BaseAbility {
diff --git a/ui/packages/consul-ui/app/abilities/policy.js b/ui/packages/consul-ui/app/abilities/policy.js
index b8d274f7b6fa5..26e310dbfb518 100644
--- a/ui/packages/consul-ui/app/abilities/policy.js
+++ b/ui/packages/consul-ui/app/abilities/policy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 import { inject as service } from '@ember/service';
 import { typeOf } from 'consul-ui/helpers/policy/typeof';
@@ -20,8 +15,7 @@ export default class PolicyAbility extends BaseAbility {
   get canWrite() {
     return (
       this.env.var('CONSUL_ACLS_ENABLED') &&
-      (typeof this.item === 'undefined' ||
-        !['policy-management', 'read-only'].includes(typeOf([this.item]))) &&
+      (typeof this.item === 'undefined' || typeOf([this.item]) !== 'policy-management') &&
       super.canWrite
     );
   }
diff --git a/ui/packages/consul-ui/app/abilities/role.js b/ui/packages/consul-ui/app/abilities/role.js
index 457fb1bea9cc5..5c14e58f6ba78 100644
--- a/ui/packages/consul-ui/app/abilities/role.js
+++ b/ui/packages/consul-ui/app/abilities/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/abilities/server.js b/ui/packages/consul-ui/app/abilities/server.js
index b6acef100cc7d..8952fe65fa070 100644
--- a/ui/packages/consul-ui/app/abilities/server.js
+++ b/ui/packages/consul-ui/app/abilities/server.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 
 export default class ServerAbility extends BaseAbility {
diff --git a/ui/packages/consul-ui/app/abilities/service-instance.js b/ui/packages/consul-ui/app/abilities/service-instance.js
index 2f00b9857fcbf..bdce3192e9c4c 100644
--- a/ui/packages/consul-ui/app/abilities/service-instance.js
+++ b/ui/packages/consul-ui/app/abilities/service-instance.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility, { ACCESS_READ, ACCESS_WRITE } from './base';
 
 export default class ServiceInstanceAbility extends BaseAbility {
diff --git a/ui/packages/consul-ui/app/abilities/session.js b/ui/packages/consul-ui/app/abilities/session.js
index dd505eea2d06b..b37b3c5ccc744 100644
--- a/ui/packages/consul-ui/app/abilities/session.js
+++ b/ui/packages/consul-ui/app/abilities/session.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 
 export default class SessionAbility extends BaseAbility {
diff --git a/ui/packages/consul-ui/app/abilities/token.js b/ui/packages/consul-ui/app/abilities/token.js
index e8880daf6c439..a47c392888597 100644
--- a/ui/packages/consul-ui/app/abilities/token.js
+++ b/ui/packages/consul-ui/app/abilities/token.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/abilities/upstream.js b/ui/packages/consul-ui/app/abilities/upstream.js
index 55cf1d0d0ebc8..da1991c8e15c1 100644
--- a/ui/packages/consul-ui/app/abilities/upstream.js
+++ b/ui/packages/consul-ui/app/abilities/upstream.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 
 export default class UpstreamAbility extends BaseAbility {
diff --git a/ui/packages/consul-ui/app/abilities/zervice.js b/ui/packages/consul-ui/app/abilities/zervice.js
index 0fadbcb7c6e7a..c2d01b7f45f0b 100644
--- a/ui/packages/consul-ui/app/abilities/zervice.js
+++ b/ui/packages/consul-ui/app/abilities/zervice.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 
 export default class ZerviceAbility extends BaseAbility {
diff --git a/ui/packages/consul-ui/app/abilities/zone.js b/ui/packages/consul-ui/app/abilities/zone.js
index 3f141319f9117..a976bd9e6dfcb 100644
--- a/ui/packages/consul-ui/app/abilities/zone.js
+++ b/ui/packages/consul-ui/app/abilities/zone.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import BaseAbility from './base';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/adapters/application.js b/ui/packages/consul-ui/app/adapters/application.js
index d0010c784b3aa..a79d64d722e4f 100644
--- a/ui/packages/consul-ui/app/adapters/application.js
+++ b/ui/packages/consul-ui/app/adapters/application.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './http';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/adapters/auth-method.js b/ui/packages/consul-ui/app/adapters/auth-method.js
index 97153a3fcbe8f..6d8bbad5ec87b 100644
--- a/ui/packages/consul-ui/app/adapters/auth-method.js
+++ b/ui/packages/consul-ui/app/adapters/auth-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 
 export default class AuthMethodAdapter extends Adapter {
diff --git a/ui/packages/consul-ui/app/adapters/binding-rule.js b/ui/packages/consul-ui/app/adapters/binding-rule.js
index 49029ce7a7240..b157305e52c2d 100644
--- a/ui/packages/consul-ui/app/adapters/binding-rule.js
+++ b/ui/packages/consul-ui/app/adapters/binding-rule.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 
 export default class BindingRuleAdapter extends Adapter {
diff --git a/ui/packages/consul-ui/app/adapters/coordinate.js b/ui/packages/consul-ui/app/adapters/coordinate.js
index fc5eba788cc73..239abed813d59 100644
--- a/ui/packages/consul-ui/app/adapters/coordinate.js
+++ b/ui/packages/consul-ui/app/adapters/coordinate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 // TODO: Update to use this.formatDatacenter()
 export default class CoordinateAdapter extends Adapter {
diff --git a/ui/packages/consul-ui/app/adapters/discovery-chain.js b/ui/packages/consul-ui/app/adapters/discovery-chain.js
index 6ce0020c6e85a..21b69294ef6e1 100644
--- a/ui/packages/consul-ui/app/adapters/discovery-chain.js
+++ b/ui/packages/consul-ui/app/adapters/discovery-chain.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 
 // TODO: Update to use this.formatDatacenter()
diff --git a/ui/packages/consul-ui/app/adapters/http.js b/ui/packages/consul-ui/app/adapters/http.js
index 5e9acc62fec87..0416f4acad0ee 100644
--- a/ui/packages/consul-ui/app/adapters/http.js
+++ b/ui/packages/consul-ui/app/adapters/http.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import Adapter from '@ember-data/adapter';
 import AdapterError, {
diff --git a/ui/packages/consul-ui/app/adapters/intention.js b/ui/packages/consul-ui/app/adapters/intention.js
index b47d179b84462..c28193d0f4a09 100644
--- a/ui/packages/consul-ui/app/adapters/intention.js
+++ b/ui/packages/consul-ui/app/adapters/intention.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 import { get } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/adapters/kv.js b/ui/packages/consul-ui/app/adapters/kv.js
index bb29fff4d9698..ebd2e30e732b2 100644
--- a/ui/packages/consul-ui/app/adapters/kv.js
+++ b/ui/packages/consul-ui/app/adapters/kv.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 import isFolder from 'consul-ui/utils/isFolder';
 import keyToArray from 'consul-ui/utils/keyToArray';
diff --git a/ui/packages/consul-ui/app/adapters/node.js b/ui/packages/consul-ui/app/adapters/node.js
index 5ac1a936005a6..6a65b6df3073a 100644
--- a/ui/packages/consul-ui/app/adapters/node.js
+++ b/ui/packages/consul-ui/app/adapters/node.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 
 // TODO: Update to use this.formatDatacenter()
diff --git a/ui/packages/consul-ui/app/adapters/nspace.js b/ui/packages/consul-ui/app/adapters/nspace.js
index 6e9f27dde0a72..490cb54ede2d5 100644
--- a/ui/packages/consul-ui/app/adapters/nspace.js
+++ b/ui/packages/consul-ui/app/adapters/nspace.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 import { SLUG_KEY } from 'consul-ui/models/nspace';
 
diff --git a/ui/packages/consul-ui/app/adapters/oidc-provider.js b/ui/packages/consul-ui/app/adapters/oidc-provider.js
index 6fafe51a85695..0bd094cad9372 100644
--- a/ui/packages/consul-ui/app/adapters/oidc-provider.js
+++ b/ui/packages/consul-ui/app/adapters/oidc-provider.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/adapters/partition.js b/ui/packages/consul-ui/app/adapters/partition.js
index b2ec2178de14c..88fc571749a31 100644
--- a/ui/packages/consul-ui/app/adapters/partition.js
+++ b/ui/packages/consul-ui/app/adapters/partition.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 import { SLUG_KEY } from 'consul-ui/models/partition';
 
diff --git a/ui/packages/consul-ui/app/adapters/permission.js b/ui/packages/consul-ui/app/adapters/permission.js
index 806ed5a3c3043..1dd086c9aea45 100644
--- a/ui/packages/consul-ui/app/adapters/permission.js
+++ b/ui/packages/consul-ui/app/adapters/permission.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/adapters/policy.js b/ui/packages/consul-ui/app/adapters/policy.js
index 6c959df2d8a4d..143554ccfcc8c 100644
--- a/ui/packages/consul-ui/app/adapters/policy.js
+++ b/ui/packages/consul-ui/app/adapters/policy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 import { SLUG_KEY } from 'consul-ui/models/policy';
 
diff --git a/ui/packages/consul-ui/app/adapters/proxy.js b/ui/packages/consul-ui/app/adapters/proxy.js
index 6f37be6540119..3da99214a8f30 100644
--- a/ui/packages/consul-ui/app/adapters/proxy.js
+++ b/ui/packages/consul-ui/app/adapters/proxy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 // TODO: Update to use this.formatDatacenter()
 export default class ProxyAdapter extends Adapter {
diff --git a/ui/packages/consul-ui/app/adapters/role.js b/ui/packages/consul-ui/app/adapters/role.js
index 8773fddeac174..fe5f92960d089 100644
--- a/ui/packages/consul-ui/app/adapters/role.js
+++ b/ui/packages/consul-ui/app/adapters/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 import { SLUG_KEY } from 'consul-ui/models/role';
 
diff --git a/ui/packages/consul-ui/app/adapters/service-instance.js b/ui/packages/consul-ui/app/adapters/service-instance.js
index e61efc8188032..6b5a3181a3963 100644
--- a/ui/packages/consul-ui/app/adapters/service-instance.js
+++ b/ui/packages/consul-ui/app/adapters/service-instance.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 
 // TODO: Update to use this.formatDatacenter()
diff --git a/ui/packages/consul-ui/app/adapters/service.js b/ui/packages/consul-ui/app/adapters/service.js
index c8e6adf82698e..c867dff06402b 100644
--- a/ui/packages/consul-ui/app/adapters/service.js
+++ b/ui/packages/consul-ui/app/adapters/service.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 
 export default class ServiceAdapter extends Adapter {
diff --git a/ui/packages/consul-ui/app/adapters/session.js b/ui/packages/consul-ui/app/adapters/session.js
index 3f42ac4bb97c7..42990855aa3b8 100644
--- a/ui/packages/consul-ui/app/adapters/session.js
+++ b/ui/packages/consul-ui/app/adapters/session.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 
 import { SLUG_KEY } from 'consul-ui/models/session';
diff --git a/ui/packages/consul-ui/app/adapters/token.js b/ui/packages/consul-ui/app/adapters/token.js
index 7e8e46dacb1b3..4a9f2fa03958e 100644
--- a/ui/packages/consul-ui/app/adapters/token.js
+++ b/ui/packages/consul-ui/app/adapters/token.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 import { inject as service } from '@ember/service';
 import { SLUG_KEY } from 'consul-ui/models/token';
diff --git a/ui/packages/consul-ui/app/adapters/topology.js b/ui/packages/consul-ui/app/adapters/topology.js
index 8ed49fea40fd7..f19cb373d5f5c 100644
--- a/ui/packages/consul-ui/app/adapters/topology.js
+++ b/ui/packages/consul-ui/app/adapters/topology.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 
 // TODO: Update to use this.formatDatacenter()
diff --git a/ui/packages/consul-ui/app/app.js b/ui/packages/consul-ui/app/app.js
index 43db29bdd35e5..d8e2088b6b0e5 100644
--- a/ui/packages/consul-ui/app/app.js
+++ b/ui/packages/consul-ui/app/app.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
diff --git a/ui/packages/consul-ui/app/components/action/index.hbs b/ui/packages/consul-ui/app/components/action/index.hbs
index ad405278bfc7e..5f165db437191 100644
--- a/ui/packages/consul-ui/app/components/action/index.hbs
+++ b/ui/packages/consul-ui/app/components/action/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if @for~}}
   <label
     for={{@for}}
diff --git a/ui/packages/consul-ui/app/components/anchors/index.scss b/ui/packages/consul-ui/app/components/anchors/index.scss
index 0de89716dbe15..08d06e65ab7ba 100644
--- a/ui/packages/consul-ui/app/components/anchors/index.scss
+++ b/ui/packages/consul-ui/app/components/anchors/index.scss
@@ -1,22 +1,17 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 a[rel*='external']::after {
   @extend %with-exit-icon, %as-pseudo;
   margin-left: 8px;
 }
 %main-content label a[rel*='help'] {
-  color: var(--token-color-foreground-disabled);
+  color: rgb(var(--tone-gray-400));
 }
 %main-content a[rel*='help']::after {
   @extend %with-info-circle-outline-icon, %as-pseudo;
   opacity: 0.4;
 }
 %main-content h2 a {
-  color: var(--token-color-foreground-strong);
+  color: rgb(var(--tone-gray-900));
 }
 %main-content h2 a[rel*='help']::after {
   font-size: 0.65em;
diff --git a/ui/packages/consul-ui/app/components/anchors/skin.scss b/ui/packages/consul-ui/app/components/anchors/skin.scss
index 53fb0d94617ab..1181335335bb7 100644
--- a/ui/packages/consul-ui/app/components/anchors/skin.scss
+++ b/ui/packages/consul-ui/app/components/anchors/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %anchor-decoration,
 %anchor-decoration-active {
   text-decoration: none;
@@ -13,7 +8,7 @@
 %anchor,
 %anchor-intent,
 %anchor-active {
-  color: var(--token-color-foreground-action);
+  color: rgb(var(--color-action));
 }
 %anchor-decoration:hover,
 %anchor-decoration:focus {
@@ -25,7 +20,7 @@
 %anchor {
   @extend %anchor-decoration;
   cursor: pointer;
-  background-color: transparent;
+  background-color: var(--transparent);
 }
 %anchor:hover,
 %anchor:focus {
diff --git a/ui/packages/consul-ui/app/components/anonymous/index.hbs b/ui/packages/consul-ui/app/components/anonymous/index.hbs
index 8709fc4b8b770..fb5c4b157d1c2 100644
--- a/ui/packages/consul-ui/app/components/anonymous/index.hbs
+++ b/ui/packages/consul-ui/app/components/anonymous/index.hbs
@@ -1,6 +1 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/anonymous/index.js b/ui/packages/consul-ui/app/components/anonymous/index.js
index d99599ac30397..4798652642ba8 100644
--- a/ui/packages/consul-ui/app/components/anonymous/index.js
+++ b/ui/packages/consul-ui/app/components/anonymous/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/packages/consul-ui/app/components/app-error/index.hbs b/ui/packages/consul-ui/app/components/app-error/index.hbs
index ca65502f59392..aa243ac485574 100644
--- a/ui/packages/consul-ui/app/components/app-error/index.hbs
+++ b/ui/packages/consul-ui/app/components/app-error/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <AppView>
   <BlockSlot @name="header">
     <h1>
diff --git a/ui/packages/consul-ui/app/components/app-view/index.hbs b/ui/packages/consul-ui/app/components/app-view/index.hbs
index 3b6ebb26e1383..7ce4444549e10 100644
--- a/ui/packages/consul-ui/app/components/app-view/index.hbs
+++ b/ui/packages/consul-ui/app/components/app-view/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="app-view"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/app-view/index.js b/ui/packages/consul-ui/app/components/app-view/index.js
index fad33e6bdfe8a..b868ab70ee5cc 100644
--- a/ui/packages/consul-ui/app/components/app-view/index.js
+++ b/ui/packages/consul-ui/app/components/app-view/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import SlotsMixin from 'block-slots';
 export default Component.extend(SlotsMixin, {
diff --git a/ui/packages/consul-ui/app/components/app-view/index.scss b/ui/packages/consul-ui/app/components/app-view/index.scss
index 434898ade93e3..430d1de0bb87b 100644
--- a/ui/packages/consul-ui/app/components/app-view/index.scss
+++ b/ui/packages/consul-ui/app/components/app-view/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .app-view {
@@ -25,7 +20,8 @@
   @extend %app-view-content;
 }
 
-%app-view-actions a {
+%app-view-actions a,
+%app-view-actions button {
   @extend %button-compact;
 }
 
@@ -37,7 +33,7 @@
   width: 26px;
   height: 26px;
   cursor: pointer;
-  color: var(--token-color-foreground-action);
+  color: rgb(var(--tone-blue-500));
 }
 #toolbar-toggle {
   display: none;
diff --git a/ui/packages/consul-ui/app/components/app-view/layout.scss b/ui/packages/consul-ui/app/components/app-view/layout.scss
index 1e3a95aa0eac5..76e7e4f230be7 100644
--- a/ui/packages/consul-ui/app/components/app-view/layout.scss
+++ b/ui/packages/consul-ui/app/components/app-view/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* layout */
 %app-view-title {
   display: grid;
diff --git a/ui/packages/consul-ui/app/components/app-view/skin.scss b/ui/packages/consul-ui/app/components/app-view/skin.scss
index 937ce012fa79c..d9c4c3d4511b7 100644
--- a/ui/packages/consul-ui/app/components/app-view/skin.scss
+++ b/ui/packages/consul-ui/app/components/app-view/skin.scss
@@ -1,8 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
+%app-view-title-left-container > *:first-child {
+  @extend %h100;
+}
 %app-view-title {
   border-bottom: var(--decor-border-100);
 }
@@ -10,15 +8,15 @@
   border-bottom: var(--decor-border-200);
 }
 %app-view-header h1 > em {
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-600));
 }
 %app-view-header dd > a {
-  color: var(--token-color-hashicorp-brand);
+  color: rgb(var(--tone-gray-999));
 }
 %app-view-content div > dl > dd {
-  color: var(--token-color-foreground-disabled);
+  color: rgb(var(--tone-gray-400));
 }
 %app-view-title,
 %app-view-content form:not(.filter-bar) fieldset {
-  border-color: var(--token-color-surface-interactive-active);
+  border-color: rgb(var(--tone-gray-200));
 }
diff --git a/ui/packages/consul-ui/app/components/app/index.hbs b/ui/packages/consul-ui/app/components/app/index.hbs
index ba7daf4be2324..68498d61f0c34 100644
--- a/ui/packages/consul-ui/app/components/app/index.hbs
+++ b/ui/packages/consul-ui/app/components/app/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#let (hash
   main=(concat guid '-main')
   Notification=(component 'app/notification')
diff --git a/ui/packages/consul-ui/app/components/app/index.js b/ui/packages/consul-ui/app/components/app/index.js
index d5c47a02b3f1c..150f5e89e7400 100644
--- a/ui/packages/consul-ui/app/components/app/index.js
+++ b/ui/packages/consul-ui/app/components/app/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/app/index.scss b/ui/packages/consul-ui/app/components/app/index.scss
index 7de7fa108413b..386687a81cf2b 100644
--- a/ui/packages/consul-ui/app/components/app/index.scss
+++ b/ui/packages/consul-ui/app/components/app/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .app .skip-links {
   @extend %skip-links;
 }
@@ -10,10 +5,14 @@
   @extend %app-notifications;
 }
 %app-notifications {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
   position: fixed;
-  z-index: 100;
-  bottom: 2rem;
-  left: 1.5rem;
+  z-index: 50;
+  top: -45px;
+  left: 0;
 
   pointer-events: none;
 }
@@ -78,11 +77,12 @@ main {
   @extend %transition-pushover;
 }
 %footer {
-  @extend %body-100-regular;
   position: fixed;
   z-index: 50;
 
-  color: var(--token-color-foreground-disabled);
+  color: rgb(var(--tone-gray-400));
+  font-size: var(--typo-size-800);
+
   width: 250px;
   padding-left: 25px;
 }
@@ -125,6 +125,7 @@ main {
   %main-nav-horizontal-toggle:checked + header > div > nav:first-of-type {
     left: calc(var(--chrome-width, 280px) * -1);
   }
+  %main-nav-horizontal-toggle ~ main .notifications,
   %main-nav-horizontal-toggle ~ main {
     margin-left: var(--chrome-width, 280px);
   }
diff --git a/ui/packages/consul-ui/app/components/app/notification/index.hbs b/ui/packages/consul-ui/app/components/app/notification/index.hbs
index f7777b43bca94..e6653d30211d1 100644
--- a/ui/packages/consul-ui/app/components/app/notification/index.hbs
+++ b/ui/packages/consul-ui/app/components/app/notification/index.hbs
@@ -1,10 +1,5 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
-  class='app-notification'
+  class="app-notification"
   ...attributes
   {{style
     (array
diff --git a/ui/packages/consul-ui/app/components/aria-menu/index.hbs b/ui/packages/consul-ui/app/components/aria-menu/index.hbs
index aa942d4accd39..9693a44edc303 100644
--- a/ui/packages/consul-ui/app/components/aria-menu/index.hbs
+++ b/ui/packages/consul-ui/app/components/aria-menu/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield
   (action 'change')
   (action 'keypress')
diff --git a/ui/packages/consul-ui/app/components/aria-menu/index.js b/ui/packages/consul-ui/app/components/aria-menu/index.js
index cd3fe673a8770..de1593263942d 100644
--- a/ui/packages/consul-ui/app/components/aria-menu/index.js
+++ b/ui/packages/consul-ui/app/components/aria-menu/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import { set } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/auth-dialog/chart.xstate.js b/ui/packages/consul-ui/app/components/auth-dialog/chart.xstate.js
index 26cbcb152e1e2..ce47307453933 100644
--- a/ui/packages/consul-ui/app/components/auth-dialog/chart.xstate.js
+++ b/ui/packages/consul-ui/app/components/auth-dialog/chart.xstate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   id: 'auth-dialog',
   initial: 'idle',
diff --git a/ui/packages/consul-ui/app/components/auth-dialog/index.hbs b/ui/packages/consul-ui/app/components/auth-dialog/index.hbs
index b6df0330525f8..1428ec5bb96eb 100644
--- a/ui/packages/consul-ui/app/components/auth-dialog/index.hbs
+++ b/ui/packages/consul-ui/app/components/auth-dialog/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <StateChart
   @src={{chart}}
 as |State Guard Action dispatch state|>
diff --git a/ui/packages/consul-ui/app/components/auth-dialog/index.js b/ui/packages/consul-ui/app/components/auth-dialog/index.js
index fad84e83ac811..fd0120f0c5401 100644
--- a/ui/packages/consul-ui/app/components/auth-dialog/index.js
+++ b/ui/packages/consul-ui/app/components/auth-dialog/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { get, action } from '@ember/object';
@@ -35,7 +30,7 @@ export default class AuthDialog extends Component {
     if (typeof prev !== 'undefined' && prev !== current) {
       type = 'use';
     }
-    this.args.onchange({ data: this.token, type: type });
+    this.args.onchange({ data: get(this, 'token'), type: type });
   }
 
   @action
diff --git a/ui/packages/consul-ui/app/components/auth-form/chart.xstate.js b/ui/packages/consul-ui/app/components/auth-form/chart.xstate.js
index 6f81e382641b0..dfbb1fd42c672 100644
--- a/ui/packages/consul-ui/app/components/auth-form/chart.xstate.js
+++ b/ui/packages/consul-ui/app/components/auth-form/chart.xstate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   id: 'auth-form',
   initial: 'idle',
diff --git a/ui/packages/consul-ui/app/components/auth-form/index.hbs b/ui/packages/consul-ui/app/components/auth-form/index.hbs
index 608709b04890d..869897f3fec57 100644
--- a/ui/packages/consul-ui/app/components/auth-form/index.hbs
+++ b/ui/packages/consul-ui/app/components/auth-form/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <StateChart @src={{this.chart}} as |State Guard ChartAction dispatch state|>
   {{#let
     (hash State=State Guard=Guard Action=ChartAction dispatch=dispatch state=state)
@@ -42,52 +37,40 @@
           {{/if}}
           <State @matches='error'>
             {{#if this.error.status}}
-              <Hds::Alert @type='inline' @color='critical' class='mb-1 mt-2' as |A|>
-                <A.Title>
-                  {{#if this.value.Name}}
-                    {{#if (eq this.error.status '403')}}
-                      Consul login failed
-                    {{else if (eq this.error.status '401')}}
-                      Could not log in to provider
-                    {{else if (eq this.error.status '499')}}
-                      SSO log in window closed
-                    {{else}}
-                      Error
-                    {{/if}}
-                  {{else}}
-                    {{#if (eq this.error.status '403')}}
-                      Invalid token
-                    {{else if (eq this.error.status '404')}}
-                      No providers
-                    {{else}}
-                      Error
-                    {{/if}}
-                  {{/if}}
-                </A.Title>
-                <A.Description>
-                  {{#if this.value.Name}}
-                    {{#if (eq this.error.status '403')}}
-                      We received a token from your OIDC provider but could not log in to Consul
-                      with it.
-                    {{else if (eq this.error.status '401')}}
-                      The OIDC provider has rejected this access token. Please have an
-                      administrator check your auth method configuration.
-                    {{else if (eq this.error.status '499')}}
-                      The OIDC provider window was closed. Please try again.
-                    {{else}}
-                      {{this.error.detail}}
-                    {{/if}}
-                  {{else}}
-                    {{#if (eq this.error.status '403')}}
-                      The token entered does not exist. Please enter a valid token to log in.
-                    {{else if (eq this.error.status '404')}}
-                      No SSO providers are configured for that Partition.
+              <Notice @type='error' role='alert' as |notice|>
+                <notice.Body>
+                  <p>
+                    {{#if this.value.Name}}
+                      {{#if (eq this.error.status '403')}}
+                        <strong>Consul login failed</strong><br />
+                        We received a token from your OIDC provider but could not log in to Consul
+                        with it.
+                      {{else if (eq this.error.status '401')}}
+                        <strong>Could not log in to provider</strong><br />
+                        The OIDC provider has rejected this access token. Please have an
+                        administrator check your auth method configuration.
+                      {{else if (eq this.error.status '499')}}
+                        <strong>SSO log in window closed</strong><br />
+                        The OIDC provider window was closed. Please try again.
+                      {{else}}
+                        <strong>Error</strong><br />
+                        {{this.error.detail}}
+                      {{/if}}
                     {{else}}
-                      {{this.error.detail}}
+                      {{#if (eq this.error.status '403')}}
+                        <strong>Invalid token</strong><br />
+                        The token entered does not exist. Please enter a valid token to log in.
+                      {{else if (eq this.error.status '404')}}
+                        <strong>No providers</strong><br />
+                        No SSO providers are configured for that Partition.
+                      {{else}}
+                        <strong>Error</strong><br />
+                        {{this.error.detail}}
+                      {{/if}}
                     {{/if}}
-                  {{/if}}
-                </A.Description>
-              </Hds::Alert>
+                  </p>
+                </notice.Body>
+              </Notice>
             {{/if}}
           </State>
           <TabState @matches='token'>
@@ -126,11 +109,9 @@
                   </State>
                 </label>
               </fieldset>
-              <Hds::Button
-                type='submit'
-                @text='Log in'
-                disabled={{state-matches state 'loading'}}
-              />
+              <Action @type='submit' disabled={{state-matches state 'loading'}}>
+                Log in
+              </Action>
             </form>
           </TabState>
 
diff --git a/ui/packages/consul-ui/app/components/auth-form/index.js b/ui/packages/consul-ui/app/components/auth-form/index.js
index 0cd05cc4c29b2..23c52e3aa530f 100644
--- a/ui/packages/consul-ui/app/components/auth-form/index.js
+++ b/ui/packages/consul-ui/app/components/auth-form/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/components/auth-form/index.scss b/ui/packages/consul-ui/app/components/auth-form/index.scss
index 1a5c5afff9884..ef92171c6fff7 100644
--- a/ui/packages/consul-ui/app/components/auth-form/index.scss
+++ b/ui/packages/consul-ui/app/components/auth-form/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .auth-form {
diff --git a/ui/packages/consul-ui/app/components/auth-form/layout.scss b/ui/packages/consul-ui/app/components/auth-form/layout.scss
index 60ea16642b5a0..3d9f4a73513b7 100644
--- a/ui/packages/consul-ui/app/components/auth-form/layout.scss
+++ b/ui/packages/consul-ui/app/components/auth-form/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %auth-form {
   width: 320px;
   margin: 0 25px;
diff --git a/ui/packages/consul-ui/app/components/auth-form/pageobject.js b/ui/packages/consul-ui/app/components/auth-form/pageobject.js
index f3812d638f900..b21bfb6ee73df 100644
--- a/ui/packages/consul-ui/app/components/auth-form/pageobject.js
+++ b/ui/packages/consul-ui/app/components/auth-form/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (submitable, clickable, attribute) =>
   (scope = '.auth-form') => {
     return {
diff --git a/ui/packages/consul-ui/app/components/auth-form/skin.scss b/ui/packages/consul-ui/app/components/auth-form/skin.scss
index 341c0928fc8c8..42d6af7f9e04c 100644
--- a/ui/packages/consul-ui/app/components/auth-form/skin.scss
+++ b/ui/packages/consul-ui/app/components/auth-form/skin.scss
@@ -1,10 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %auth-form em {
-  @extend %body-100-regular;
-  color: var(--token-color-foreground-faint);
+  @extend %p3;
+  color: rgb(var(--tone-gray-500));
   font-style: normal;
-}
+}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/auth-form/tabs.xstate.js b/ui/packages/consul-ui/app/components/auth-form/tabs.xstate.js
index e25cc0d3e7196..99428485d0b27 100644
--- a/ui/packages/consul-ui/app/components/auth-form/tabs.xstate.js
+++ b/ui/packages/consul-ui/app/components/auth-form/tabs.xstate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   id: 'auth-form-tabs',
   initial: 'token',
diff --git a/ui/packages/consul-ui/app/components/auth-modal/index.scss b/ui/packages/consul-ui/app/components/auth-modal/index.scss
index 24f3ba363a488..69fa37bbe4837 100644
--- a/ui/packages/consul-ui/app/components/auth-modal/index.scss
+++ b/ui/packages/consul-ui/app/components/auth-modal/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /*TODO: This is a different style of modal dialog */
 /* and should probably be part of that, offering different styles*/
 @import './skin';
diff --git a/ui/packages/consul-ui/app/components/auth-modal/layout.scss b/ui/packages/consul-ui/app/components/auth-modal/layout.scss
index 0f38371bbaa28..6c0d0c137ad78 100644
--- a/ui/packages/consul-ui/app/components/auth-modal/layout.scss
+++ b/ui/packages/consul-ui/app/components/auth-modal/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %auth-modal footer {
   border-top: 0;
   padding-top: 10px;
@@ -11,7 +6,7 @@
   padding-right: 42px;
 }
 %auth-modal footer {
-  background-color: transparent;
+  background-color: var(--transparent);
 }
 %auth-modal > div > div > div {
   padding-bottom: 0;
diff --git a/ui/packages/consul-ui/app/components/auth-modal/skin.scss b/ui/packages/consul-ui/app/components/auth-modal/skin.scss
index ac930a2dd6193..8db4bb91b1072 100644
--- a/ui/packages/consul-ui/app/components/auth-modal/skin.scss
+++ b/ui/packages/consul-ui/app/components/auth-modal/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %auth-modal footer button::after {
   @extend %with-chevron-right-mask, %as-pseudo;
   font-size: 120%;
diff --git a/ui/packages/consul-ui/app/components/auth-profile/index.hbs b/ui/packages/consul-ui/app/components/auth-profile/index.hbs
index 324a657bbe433..0595136e459bd 100644
--- a/ui/packages/consul-ui/app/components/auth-profile/index.hbs
+++ b/ui/packages/consul-ui/app/components/auth-profile/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <dl
   class="auth-profile"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/auth-profile/index.scss b/ui/packages/consul-ui/app/components/auth-profile/index.scss
index 09b154b4a51c9..ebc4837a35fcc 100644
--- a/ui/packages/consul-ui/app/components/auth-profile/index.scss
+++ b/ui/packages/consul-ui/app/components/auth-profile/index.scss
@@ -1,24 +1,19 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .auth-profile {
   padding: 0.9em 1em;
 }
 .auth-profile {
-  @extend %body-100-regular;
+  @extend %p2;
 }
 .auth-profile dt span {
-  font-weight: var(--token-typography-font-weight-regular);
+  font-weight: var(--typo-weight-normal);
 }
 .auth-profile dt {
-  font-weight: var(--token-typography-font-weight-bold);
+  font-weight: var(--typo-weight-bold);
 }
 .auth-profile dt,
 .auth-profile dd {
-  color: var(--token-color-paletter-neutral-300);
+  color: rgb(var(--tone-gray-800));
 }
 .auth-profile dt span {
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-600));
 }
diff --git a/ui/packages/consul-ui/app/components/badge/debug.scss b/ui/packages/consul-ui/app/components/badge/debug.scss
index 08f9cce2507a0..79931b1746ff4 100644
--- a/ui/packages/consul-ui/app/components/badge/debug.scss
+++ b/ui/packages/consul-ui/app/components/badge/debug.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 #docfy-demo-preview-badge {
   /* part of a kv list */
   dl {
diff --git a/ui/packages/consul-ui/app/components/badge/index.scss b/ui/packages/consul-ui/app/components/badge/index.scss
index 513ef1f422371..22c42b3b9e67e 100644
--- a/ui/packages/consul-ui/app/components/badge/index.scss
+++ b/ui/packages/consul-ui/app/components/badge/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %badge {
   @extend %horizontal-kv-list;
   padding-left: 8px;
@@ -13,8 +8,8 @@
 %badge,
 %badge + dd {
   @extend %pill;
-  background-color: var(--token-color-surface-strong);
-  color: var(--token-color-foreground-faint);
+  background-color: rgb(var(--tone-gray-100));
+  color: rgb(var(--tone-gray-500));
 }
 %badge::after,
 %badge-reversed::after,
diff --git a/ui/packages/consul-ui/app/components/brand-loader/index.scss b/ui/packages/consul-ui/app/components/brand-loader/index.scss
index ed46a5cb4c0f8..9c622820f6cce 100644
--- a/ui/packages/consul-ui/app/components/brand-loader/index.scss
+++ b/ui/packages/consul-ui/app/components/brand-loader/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .brand-loader {
diff --git a/ui/packages/consul-ui/app/components/brand-loader/layout.scss b/ui/packages/consul-ui/app/components/brand-loader/layout.scss
index 725fe38be1ce4..b77e439d69115 100644
--- a/ui/packages/consul-ui/app/components/brand-loader/layout.scss
+++ b/ui/packages/consul-ui/app/components/brand-loader/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %brand-loader {
   position: absolute;
   top: 50%;
diff --git a/ui/packages/consul-ui/app/components/brand-loader/skin.scss b/ui/packages/consul-ui/app/components/brand-loader/skin.scss
index f24f44f39bea3..e69de29bb2d1d 100644
--- a/ui/packages/consul-ui/app/components/brand-loader/skin.scss
+++ b/ui/packages/consul-ui/app/components/brand-loader/skin.scss
@@ -1,5 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
diff --git a/ui/packages/consul-ui/app/components/breadcrumbs/index.scss b/ui/packages/consul-ui/app/components/breadcrumbs/index.scss
index 7ffd948f3e98c..74e8b0d386fc8 100644
--- a/ui/packages/consul-ui/app/components/breadcrumbs/index.scss
+++ b/ui/packages/consul-ui/app/components/breadcrumbs/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 main header nav:first-child {
diff --git a/ui/packages/consul-ui/app/components/breadcrumbs/layout.scss b/ui/packages/consul-ui/app/components/breadcrumbs/layout.scss
index 47c08cb7f5bf3..6e17d0cec2af0 100644
--- a/ui/packages/consul-ui/app/components/breadcrumbs/layout.scss
+++ b/ui/packages/consul-ui/app/components/breadcrumbs/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %breadcrumbs {
   display: grid;
   grid-auto-flow: column;
diff --git a/ui/packages/consul-ui/app/components/breadcrumbs/skin.scss b/ui/packages/consul-ui/app/components/breadcrumbs/skin.scss
index 14f6b43f3b03d..966cf886e6f40 100644
--- a/ui/packages/consul-ui/app/components/breadcrumbs/skin.scss
+++ b/ui/packages/consul-ui/app/components/breadcrumbs/skin.scss
@@ -1,14 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %crumbs {
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-500));
   text-decoration: none;
 }
 %crumbs:hover {
-  color: var(--token-color-foreground-action);
+  color: rgb(var(--tone-blue-500));
   text-decoration: underline;
 }
 %crumbs::before {
@@ -16,9 +11,9 @@
 }
 %breadcrumb-milestone::before {
   @extend %with-chevron-left-mask, %as-pseudo;
-  background-color: var(--token-color-foreground-faint);
+  background-color: rgb(var(--tone-gray-500));
 }
 %breadcrumb::before {
   content: '/';
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-500));
 }
diff --git a/ui/packages/consul-ui/app/components/buttons/index.scss b/ui/packages/consul-ui/app/components/buttons/index.scss
index 981c57196e019..f20214400b7e4 100644
--- a/ui/packages/consul-ui/app/components/buttons/index.scss
+++ b/ui/packages/consul-ui/app/components/buttons/index.scss
@@ -1,7 +1,19 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
+button[type='submit'],
+button.type-submit,
+button.type-create,
+a.type-create {
+  @extend %primary-button;
+}
+// TODO: Once we move action-groups to use aria menu we can get rid of
+// some of this and just use not(aria-haspopup)
+button[type='reset'],
+button.type-cancel {
+  @extend %secondary-button;
+}
+.with-confirmation .type-delete,
+.modal-dialog .type-delete,
+%app-view-content form button[type='button'].type-delete {
+  @extend %dangerous-button;
+}
diff --git a/ui/packages/consul-ui/app/components/buttons/layout.scss b/ui/packages/consul-ui/app/components/buttons/layout.scss
index 53abc11475ff6..763e95f7a87d5 100644
--- a/ui/packages/consul-ui/app/components/buttons/layout.scss
+++ b/ui/packages/consul-ui/app/components/buttons/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %button {
   position: relative;
 }
diff --git a/ui/packages/consul-ui/app/components/buttons/skin.scss b/ui/packages/consul-ui/app/components/buttons/skin.scss
index ceb41311bdaa9..facc85a2088c2 100644
--- a/ui/packages/consul-ui/app/components/buttons/skin.scss
+++ b/ui/packages/consul-ui/app/components/buttons/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* decor */
 %button,
 %internal-button {
@@ -16,12 +11,27 @@
   cursor: default;
   box-shadow: none;
 }
+%primary-button,
 %secondary-button,
 %dangerous-button {
   @extend %button;
   border-width: 1px;
   border-radius: var(--decor-radius-100);
-  box-shadow: var(--token-elevation-high-box-shadow);
+  box-shadow: var(--decor-elevation-300);
+}
+/* color */
+%primary-button {
+  @extend %frame-blue-800;
+}
+%primary-button:hover:not(:disabled):not(:active),
+%primary-button:focus {
+  @extend %frame-blue-700;
+}
+%primary-button:disabled {
+  @extend %frame-blue-600;
+}
+%primary-button:hover:active {
+  @extend %frame-blue-900;
 }
 /**/
 %secondary-button:hover:not(:disabled):not(:active),
@@ -32,13 +42,14 @@
   @extend %frame-gray-400;
 }
 %secondary-button:disabled {
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-600));
 }
 %secondary-button:active {
+  /* %frame-gray-something */
   @extend %frame-gray-700;
-  background-color: var(--token-color-surface-interactive-active);
-  color: var(--token-color-foreground-primary);
-  border-color: var(--token-color-foreground-faint);
+  background-color: rgb(var(--tone-gray-200));
+  color: rgb(var(--tone-gray-800));
+  border-color: rgb(var(--tone-gray-700));
 }
 /**/
 %dangerous-button {
@@ -56,8 +67,8 @@
 }
 
 %internal-button {
-  color: var(--token-color-foreground-strong);
-  background-color: var(--token-color-surface-primary);
+  color: rgb(var(--tone-gray-900));
+  background-color: rgb(var(--tone-gray-000));
 }
 %internal-button-dangerous {
   @extend %frame-red-300;
@@ -66,7 +77,7 @@
   @extend %frame-red-700;
 }
 %internal-button-intent {
-  background-color: var(--token-color-surface-strong);
+  background-color: rgb(var(--tone-gray-050));
 }
 %internal-button:focus,
 %internal-button:hover {
@@ -84,7 +95,7 @@
   top: 0;
   height: 100%;
   margin-left: 8px;
-  background-color: var(--token-color-palette-neutral-300);
+  background-color: rgb(var(--tone-gray-300));
 }
 %sort-button::before {
   @extend %with-sort-mask, %as-pseudo;
diff --git a/ui/packages/consul-ui/app/components/card/index.scss b/ui/packages/consul-ui/app/components/card/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/card/index.scss
+++ b/ui/packages/consul-ui/app/components/card/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/card/layout.scss b/ui/packages/consul-ui/app/components/card/layout.scss
index 6a4d18a4da4c8..412c0b2aa0976 100644
--- a/ui/packages/consul-ui/app/components/card/layout.scss
+++ b/ui/packages/consul-ui/app/components/card/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %card {
   display: block;
   position: relative;
diff --git a/ui/packages/consul-ui/app/components/card/skin.scss b/ui/packages/consul-ui/app/components/card/skin.scss
index 3d71ca3bd6079..de730cf5bfc34 100644
--- a/ui/packages/consul-ui/app/components/card/skin.scss
+++ b/ui/packages/consul-ui/app/components/card/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %card:hover,
 %card:focus {
   @extend %card-intent;
@@ -10,7 +5,7 @@
 %card {
   border: var(--decor-border-100);
   border-radius: var(--decor-radius-100);
-  background-color: var(--token-color-surface-faint);
+  background-color: rgb(var(--tone-gray-000) / 90%);
 }
 %card > section,
 %card > ul > li {
@@ -19,12 +14,12 @@
 %card,
 %card > section,
 %card > ul > li {
-  border-color: var(--token-color-surface-interactive-active);
+  border-color: rgb(var(--tone-gray-200));
 }
 %card ul {
   /*TODO: %list-style-none?*/
   list-style-type: none;
 }
 %card-intent {
-  box-shadow: var(--token-surface-mid-box-shadow);
+  box-shadow: var(--decor-elevation-400);
 }
diff --git a/ui/packages/consul-ui/app/components/checkbox-group/index.scss b/ui/packages/consul-ui/app/components/checkbox-group/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/checkbox-group/index.scss
+++ b/ui/packages/consul-ui/app/components/checkbox-group/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/checkbox-group/layout.scss b/ui/packages/consul-ui/app/components/checkbox-group/layout.scss
index 04fcea0a80669..57d8b99efccbc 100644
--- a/ui/packages/consul-ui/app/components/checkbox-group/layout.scss
+++ b/ui/packages/consul-ui/app/components/checkbox-group/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* TODO: This is positioning the group */
 /* probably should be in a special %form class*/
 %checkbox-group {
diff --git a/ui/packages/consul-ui/app/components/checkbox-group/skin.scss b/ui/packages/consul-ui/app/components/checkbox-group/skin.scss
index 02a43a198f411..5ae8b1a222a5e 100644
--- a/ui/packages/consul-ui/app/components/checkbox-group/skin.scss
+++ b/ui/packages/consul-ui/app/components/checkbox-group/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %checkbox-group label {
   cursor: pointer;
 }
diff --git a/ui/packages/consul-ui/app/components/child-selector/index.hbs b/ui/packages/consul-ui/app/components/child-selector/index.hbs
index 9693f9e1a8030..452268de573d2 100644
--- a/ui/packages/consul-ui/app/components/child-selector/index.hbs
+++ b/ui/packages/consul-ui/app/components/child-selector/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="child-selector {{type}}-child-selector"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/child-selector/index.js b/ui/packages/consul-ui/app/components/child-selector/index.js
index 190fda4dd07b7..7f8d895c84e87 100644
--- a/ui/packages/consul-ui/app/components/child-selector/index.js
+++ b/ui/packages/consul-ui/app/components/child-selector/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { get, set, computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
diff --git a/ui/packages/consul-ui/app/components/code-editor/index.hbs b/ui/packages/consul-ui/app/components/code-editor/index.hbs
index 03487d32f0bbf..f5594c3d486a1 100644
--- a/ui/packages/consul-ui/app/components/code-editor/index.hbs
+++ b/ui/packages/consul-ui/app/components/code-editor/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div class="toolbar-container">
   <div class="toolbar">
     <label class="title">
@@ -39,4 +34,4 @@
   @options={{options}}
   @valueUpdated={{action onkeyup}}
 />
-<pre><code>{{#if (has-block 'content')}}{{yield to='content'}}{{else}}{{value}}{{/if}}</code></pre>
+<pre><code>{{#if (has-block "content")}}{{yield to="content"}}{{else}}{{value}}{{/if}}</code></pre>
diff --git a/ui/packages/consul-ui/app/components/code-editor/index.js b/ui/packages/consul-ui/app/components/code-editor/index.js
index 72e3abf8eb8a0..b741f70ebc229 100644
--- a/ui/packages/consul-ui/app/components/code-editor/index.js
+++ b/ui/packages/consul-ui/app/components/code-editor/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { set } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/packages/consul-ui/app/components/code-editor/index.scss b/ui/packages/consul-ui/app/components/code-editor/index.scss
index 58c7c66596cc4..913e2f69037c6 100644
--- a/ui/packages/consul-ui/app/components/code-editor/index.scss
+++ b/ui/packages/consul-ui/app/components/code-editor/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 // yet to pull the CodeMirror skin into the placeholder
diff --git a/ui/packages/consul-ui/app/components/code-editor/layout.scss b/ui/packages/consul-ui/app/components/code-editor/layout.scss
index b8194d850bc94..2200042322ee0 100644
--- a/ui/packages/consul-ui/app/components/code-editor/layout.scss
+++ b/ui/packages/consul-ui/app/components/code-editor/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %code-editor {
   display: block;
   border: 10px;
@@ -16,7 +11,7 @@
   bottom: 0px;
   width: 100%;
   height: 25px;
-  background-color: var(--token-color-hashicorp-brand);
+  background-color: rgb(var(--tone-gray-999));
   content: '';
   display: block;
 }
diff --git a/ui/packages/consul-ui/app/components/code-editor/skin.scss b/ui/packages/consul-ui/app/components/code-editor/skin.scss
index 0a8dafc65dde5..6ba316787a4d0 100644
--- a/ui/packages/consul-ui/app/components/code-editor/skin.scss
+++ b/ui/packages/consul-ui/app/components/code-editor/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 $syntax-consul: #69499a;
 $syntax-dark-gray: #535f73;
 :root {
@@ -26,7 +21,7 @@ $syntax-dark-gray: #535f73;
   --syntax-dark-gray: #{$syntax-dark-gray};
 
   --syntax-gutter-grey: #2a2f36;
-  --syntax-yellow: var(--token-color-vault-brand);
+  --syntax-yellow: rgb(var(--tone-yellow-500));
 }
 .CodeMirror {
   max-width: 1260px;
@@ -39,21 +34,22 @@ $syntax-dark-gray: #535f73;
   overflow-x: hidden !important;
 }
 .CodeMirror-lint-tooltip {
-  @extend %code-100-regular;
   background-color: #f9f9fa;
   border: 1px solid var(--syntax-light-gray);
   border-radius: 0;
   color: lighten(#000, 13%);
+  font-family: var(--typo-family-mono);
+  font-size: 13px;
   padding: 7px 8px 9px;
 }
 
 .cm-s-hashi {
   &.CodeMirror {
     width: 100%;
-    background-color: var(--token-color-hashicorp-brand) !important;
+    background-color: rgb(var(--tone-gray-999)) !important;
     color: #cfd2d1 !important;
     border: none;
-    font-family: var(--token-typography-font-stack-code);
+    font-family: var(--typo-family-mono);
     -webkit-font-smoothing: auto;
     line-height: 1.4;
   }
@@ -85,7 +81,7 @@ $syntax-dark-gray: #535f73;
   .CodeMirror-line::-moz-selection,
   .CodeMirror-line > span::-moz-selection,
   .CodeMirror-line > span > span::-moz-selection {
-    background: var(--token-color-surface-interactive);
+    background: rgb(var(--tone-gray-000) / 10%);
   }
 
   span.cm-comment {
@@ -162,7 +158,7 @@ $syntax-dark-gray: #535f73;
 
   .CodeMirror-matchingbracket {
     text-decoration: underline;
-    color: var(--token-color-surface-primary) !important;
+    color: rgb(var(--tone-gray-000)) !important;
   }
 }
 
@@ -186,7 +182,7 @@ $syntax-dark-gray: #535f73;
     }
 
     span.cm-property {
-      color: var(--token-color-surface-primary);
+      color: rgb(var(--tone-gray-000));
     }
 
     span.cm-variable-2 {
@@ -197,31 +193,32 @@ $syntax-dark-gray: #535f73;
 
 %code-editor {
   .toolbar-container {
-    background: var(--token-color-surface-strong);
+    background: rgb(var(--tone-gray-050));
     background: linear-gradient(
       180deg,
-      var(--token-color-surface-strong) 50%,
-      var(--token-color-surface-interactive-active) 100%
+      rgb(var(--tone-gray-050)) 50%,
+      rgb(var(--tone-gray-150)) 100%
     );
-    border: 1px solid var(--token-color-surface-interactive-active);
-    border-bottom-color: var(--token-color-foreground-faint);
-    border-top-color: var(--token-color-foreground-disabled);
+    border: 1px solid rgb(var(--tone-gray-150));
+    border-bottom-color: rgb(var(--tone-gray-600));
+    border-top-color: rgb(var(--tone-gray-400));
 
     .toolbar {
       .title {
-        @extend %body-200-semibold;
-        color: var(--token-color-foreground-strong);
+        color: rgb(var(--tone-gray-900));
+        font-size: 14px;
+        font-weight: 700;
       }
       .toolbar-separator {
-        border-right: 1px solid var(--token-color-palette-neutral-300);
+        border-right: 1px solid rgb(var(--tone-gray-300));
       }
     }
     .ember-power-select-trigger {
-      background-color: var(--token-color-surface-primary);
-      color: var(--token-color-hashicorp-brand);
+      background-color: rgb(var(--tone-gray-000));
+      color: rgb(var(--tone-gray-999));
       border-radius: var(--decor-radius-100);
       border: var(--decor-border-100);
-      border-color: var(--token-color-foreground-faint);
+      border-color: rgb(var(--tone-gray-700));
     }
   }
 }
diff --git a/ui/packages/consul-ui/app/components/composite-row/index.scss b/ui/packages/consul-ui/app/components/composite-row/index.scss
index e9db145da19d9..1dce70e4bbd2d 100644
--- a/ui/packages/consul-ui/app/components/composite-row/index.scss
+++ b/ui/packages/consul-ui/app/components/composite-row/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './layout';
 %composite-row {
   @extend %list-row;
@@ -61,7 +56,7 @@
   overflow-x: visible !important;
 }
 .consul-intention-permission-list > ul {
-  border-top: 1px solid var(--token-color-surface-interactive-active);
+  border-top: 1px solid rgb(var(--tone-gray-200));
 }
 .consul-service-instance-list .port dt,
 .consul-service-instance-list .port dt::before {
@@ -74,9 +69,6 @@
 %composite-row .copy-button {
   display: inline-flex;
 }
-%composite-row .copy-button button {
-  @extend %body-100-medium;
-}
 %composite-row-header .copy-button {
   margin-left: 4px;
 }
@@ -116,5 +108,5 @@
 %composite-row-header .policy-management dd::before,
 %composite-row-detail .policy-management::before {
   @extend %with-star-fill-mask, %as-pseudo;
-  --icon-color: var(--token-color-consul-brand);
+  --icon-color: rgb(var(--tone-brand-600));
 }
diff --git a/ui/packages/consul-ui/app/components/composite-row/layout.scss b/ui/packages/consul-ui/app/components/composite-row/layout.scss
index 819c41f9504f0..b855ef108e89c 100644
--- a/ui/packages/consul-ui/app/components/composite-row/layout.scss
+++ b/ui/packages/consul-ui/app/components/composite-row/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %composite-row {
   display: grid;
   grid-template-columns: 1fr auto;
diff --git a/ui/packages/consul-ui/app/components/confirmation-alert/index.hbs b/ui/packages/consul-ui/app/components/confirmation-alert/index.hbs
index 95f243a89233e..6df6162068317 100644
--- a/ui/packages/consul-ui/app/components/confirmation-alert/index.hbs
+++ b/ui/packages/consul-ui/app/components/confirmation-alert/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
 <InformedAction
   class="confirmation-alert warning"
diff --git a/ui/packages/consul-ui/app/components/confirmation-alert/index.js b/ui/packages/consul-ui/app/components/confirmation-alert/index.js
index d99599ac30397..4798652642ba8 100644
--- a/ui/packages/consul-ui/app/components/confirmation-alert/index.js
+++ b/ui/packages/consul-ui/app/components/confirmation-alert/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/packages/consul-ui/app/components/confirmation-dialog/index.hbs b/ui/packages/consul-ui/app/components/confirmation-dialog/index.hbs
index da4c7660efbf4..c1fd3180cd4c4 100644
--- a/ui/packages/consul-ui/app/components/confirmation-dialog/index.hbs
+++ b/ui/packages/consul-ui/app/components/confirmation-dialog/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div class={{concat "with-confirmation" (if confirming " confirming" "")}} ...attributes>
 {{yield}}
 <YieldSlot @name="action" @params={{block-params (action "confirm") (action "cancel")}}>
diff --git a/ui/packages/consul-ui/app/components/confirmation-dialog/index.js b/ui/packages/consul-ui/app/components/confirmation-dialog/index.js
index e10782f579d44..951e2e9f52774 100644
--- a/ui/packages/consul-ui/app/components/confirmation-dialog/index.js
+++ b/ui/packages/consul-ui/app/components/confirmation-dialog/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /*eslint ember/closure-actions: "warn"*/
 import Component from '@ember/component';
 
diff --git a/ui/packages/consul-ui/app/components/confirmation-dialog/index.scss b/ui/packages/consul-ui/app/components/confirmation-dialog/index.scss
index 65914fb025766..9bed4a9650811 100644
--- a/ui/packages/consul-ui/app/components/confirmation-dialog/index.scss
+++ b/ui/packages/consul-ui/app/components/confirmation-dialog/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 div.with-confirmation {
diff --git a/ui/packages/consul-ui/app/components/confirmation-dialog/layout.scss b/ui/packages/consul-ui/app/components/confirmation-dialog/layout.scss
index 9538794833b1a..017dfff8951b9 100644
--- a/ui/packages/consul-ui/app/components/confirmation-dialog/layout.scss
+++ b/ui/packages/consul-ui/app/components/confirmation-dialog/layout.scss
@@ -1,11 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %confirmation-dialog {
-  justify-content: end;
-  width: 100%;
+  float: right;
 }
 %confirmation-dialog-inline p {
   margin-right: 12px;
diff --git a/ui/packages/consul-ui/app/components/confirmation-dialog/skin.scss b/ui/packages/consul-ui/app/components/confirmation-dialog/skin.scss
index 4509c4b3fdc52..ded503dcfa760 100644
--- a/ui/packages/consul-ui/app/components/confirmation-dialog/skin.scss
+++ b/ui/packages/consul-ui/app/components/confirmation-dialog/skin.scss
@@ -1,11 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 table div.with-confirmation.confirming {
-  background-color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-gray-000));
 }
 %confirmation-dialog-inline p {
-  color: var(--token-color-foreground-disabled);
+  color: rgb(var(--tone-gray-400));
 }
diff --git a/ui/packages/consul-ui/app/components/consul/acl/disabled/index.hbs b/ui/packages/consul-ui/app/components/consul/acl/disabled/index.hbs
index 23e6271820d2f..5ce0e436cbca9 100644
--- a/ui/packages/consul-ui/app/components/consul/acl/disabled/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/acl/disabled/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <AppView>
   <BlockSlot @name="header">
     <h1>
@@ -20,23 +15,11 @@
         </p>
       </BlockSlot>
       <BlockSlot @name="actions">
-        <li>
-          <Hds::Link::Standalone
-            @text='Read the documentation'
-            @href="{{env 'CONSUL_DOCS_URL'}}/acl/index.html"
-            @icon='docs-link'
-            @iconPosition='trailing'
-            @size='small'
-          />
+        <li class="docs-link">
+          <a href="{{env 'CONSUL_DOCS_URL'}}/acl/index.html" rel="noopener noreferrer" target="_blank">Read the documentation</a>
         </li>
-        <li>
-          <Hds::Link::Standalone
-            @text='Follow the guide'
-            @href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/security-networking/production-acls"
-            @icon='learn-link'
-            @iconPosition='trailing'
-            @size='small'
-          />
+        <li class="learn-link">
+          <a href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/security-networking/production-acls" rel="noopener noreferrer" target="_blank">Follow the guide</a>
         </li>
       </BlockSlot>
     </EmptyState>
diff --git a/ui/packages/consul-ui/app/components/consul/auth-method/binding-list/index.hbs b/ui/packages/consul-ui/app/components/consul/auth-method/binding-list/index.hbs
index 44e351e452844..d0a5189fa2ae4 100644
--- a/ui/packages/consul-ui/app/components/consul/auth-method/binding-list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/auth-method/binding-list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div class="consul-auth-method-binding-list">
   <h2>{{@item.BindName}}</h2>
   <dl>
diff --git a/ui/packages/consul-ui/app/components/consul/auth-method/index.scss b/ui/packages/consul-ui/app/components/consul/auth-method/index.scss
index 7e6ffe2de8c03..beff18a6520ec 100644
--- a/ui/packages/consul-ui/app/components/consul/auth-method/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/auth-method/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // List
 .consul-auth-method-list ul {
   .locality::before {
@@ -15,22 +10,24 @@
 .consul-auth-method-view {
   margin-bottom: 32px;
   section {
-    @extend %body-200-regular;
+    @extend %p1;
     width: 100%;
     position: relative;
     overflow-y: auto;
     h2 {
-      @extend %display-400-semibold;
+      @extend %h200;
       padding-bottom: 12px;
     }
     table {
       thead td {
-        @extend %body-200-semibold;
-        color: var(--token-color-foreground-faint);
+        color: rgb(var(--tone-gray-500));
+        font-weight: var(--typo-weight-semibold);
+        font-size: var(--typo-size-700);
       }
       tbody {
         td {
-          color: var(--token-color-hashicorp-brand);
+          font-size: var(--typo-size-600);
+          color: rgb(var(--tone-gray-999));
         }
         tr {
           cursor: default;
@@ -59,14 +56,14 @@
     margin-bottom: 4px !important;
   }
   h2 {
-    @extend %display-400-semibold;
+    @extend %h200;
     padding-bottom: 12px;
   }
   dl {
     @extend %tabular-dl;
   }
   code {
-    background-color: var(--token-color-surface-strong);
+    background-color: rgb(var(--tone-gray-050));
     padding: 0 12px;
   }
 }
@@ -75,13 +72,15 @@
 .consul-auth-method-nspace-list {
   thead {
     td {
-      @extend %body-200-semibold;
-      color: var(--token-color-foreground-faint) !important;
+      color: rgb(var(--tone-gray-500)) !important;
+      font-weight: var(--typo-weight-semibold) !important;
+      font-size: var(--typo-size-700) !important;
     }
   }
   tbody {
     td {
-      color: var(--token-color-hashicorp-brand);
+      font-size: var(--typo-size-600);
+      color: rgb(var(--tone-gray-999));
     }
     tr {
       cursor: default;
diff --git a/ui/packages/consul-ui/app/components/consul/auth-method/list/index.hbs b/ui/packages/consul-ui/app/components/consul/auth-method/list/index.hbs
index 160e38bd9ce5c..36085a089bc17 100644
--- a/ui/packages/consul-ui/app/components/consul/auth-method/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/auth-method/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <ListCollection
   class="consul-auth-method-list"
   @items={{@items}}
diff --git a/ui/packages/consul-ui/app/components/consul/auth-method/list/pageobject.js b/ui/packages/consul-ui/app/components/consul/auth-method/list/pageobject.js
index 39a94fedd96f9..c74cd9ae937ad 100644
--- a/ui/packages/consul-ui/app/components/consul/auth-method/list/pageobject.js
+++ b/ui/packages/consul-ui/app/components/consul/auth-method/list/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (collection, clickable, text) => () => {
   return collection('.consul-auth-method-list [data-test-list-row]', {
     authMethod: clickable('a'),
diff --git a/ui/packages/consul-ui/app/components/consul/auth-method/nspace-list/index.hbs b/ui/packages/consul-ui/app/components/consul/auth-method/nspace-list/index.hbs
index cb617ad0660f2..841db0093b143 100644
--- a/ui/packages/consul-ui/app/components/consul/auth-method/nspace-list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/auth-method/nspace-list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div class="consul-auth-method-nspace-list">
   <table>
     <thead>
diff --git a/ui/packages/consul-ui/app/components/consul/auth-method/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/auth-method/search-bar/index.hbs
index 63e9f11be2f68..00238194cbf89 100644
--- a/ui/packages/consul-ui/app/components/consul/auth-method/search-bar/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/auth-method/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar class='consul-auth-method-search-bar' ...attributes @filter={{@filter}}>
   <:status as |search|>
 
diff --git a/ui/packages/consul-ui/app/components/consul/auth-method/type/index.hbs b/ui/packages/consul-ui/app/components/consul/auth-method/type/index.hbs
index a21db4f39264a..7d4e4aa87df8b 100644
--- a/ui/packages/consul-ui/app/components/consul/auth-method/type/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/auth-method/type/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#let (icon-mapping @item.Type) as |flightIcon|}}
   <span class="consul-auth-method-type {{unless flightIcon @item.Type}}" data-test-type={{@item.Type}}>
     {{#if flightIcon}}
diff --git a/ui/packages/consul-ui/app/components/consul/auth-method/view/index.hbs b/ui/packages/consul-ui/app/components/consul/auth-method/view/index.hbs
index eab0fa48399c2..6dd57600649ad 100644
--- a/ui/packages/consul-ui/app/components/consul/auth-method/view/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/auth-method/view/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
   <div class="consul-auth-method-view">
   {{#if (eq @item.Type 'kubernetes')}}
     <dl>
diff --git a/ui/packages/consul-ui/app/components/consul/bucket/list/index.hbs b/ui/packages/consul-ui/app/components/consul/bucket/list/index.hbs
index 21d598d64ff5f..12751479ac320 100644
--- a/ui/packages/consul-ui/app/components/consul/bucket/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/bucket/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if this.itemsToDisplay.length}}
   <dl class="consul-bucket-list">
     {{#each this.itemsToDisplay as |item|}}
diff --git a/ui/packages/consul-ui/app/components/consul/bucket/list/index.js b/ui/packages/consul-ui/app/components/consul/bucket/list/index.js
index 0268cb6d22efd..c1aa8afe92d75 100644
--- a/ui/packages/consul-ui/app/components/consul/bucket/list/index.js
+++ b/ui/packages/consul-ui/app/components/consul/bucket/list/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/components/consul/bucket/list/index.scss b/ui/packages/consul-ui/app/components/consul/bucket/list/index.scss
index 996323841f587..c49c5907ba978 100644
--- a/ui/packages/consul-ui/app/components/consul/bucket/list/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/bucket/list/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %consul-bucket-list {
   & {
     @extend %horizontal-kv-list;
@@ -20,7 +15,7 @@
     @extend %with-network-alt-mask, %as-pseudo;
   }
   .service + dd {
-    @extend .hds-font-weight-semibold;
+    font-weight: var(--typo-weight-semibold);
   }
   /* potential for some sort of %composite-kv thing here */
   dd:not(:last-child)::after {
diff --git a/ui/packages/consul-ui/app/components/consul/datacenter/selector/index.hbs b/ui/packages/consul-ui/app/components/consul/datacenter/selector/index.hbs
index 767422e4b9b13..16bc038f652d1 100644
--- a/ui/packages/consul-ui/app/components/consul/datacenter/selector/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/datacenter/selector/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <li class='dcs' data-test-datacenter-menu>
   {{#if (gt @dcs.length 1)}}
     <DisclosureMenu
diff --git a/ui/packages/consul-ui/app/components/consul/discovery-chain/index.hbs b/ui/packages/consul-ui/app/components/consul/discovery-chain/index.hbs
index e25096f849cd2..fca6c4a23e518 100644
--- a/ui/packages/consul-ui/app/components/consul/discovery-chain/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/discovery-chain/index.hbs
@@ -1,87 +1,81 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <style>
-  {{#if selected.nodes}}
-    {{selected.nodes}}
-    { opacity: 1 !important; background-color: var(--token-color-surface-interactive); border:
-    var(--decor-border-100); border-radius: var(--decor-radius-200); border-color:
-    var(--token-color-foreground-faint); box-shadow: var(--token-surface-high-box-shadow); }
+  {{#if selected.nodes }}
+    {{selected.nodes}} {
+      opacity: 1 !important;
+
+      background-color: var(--tone-gray-000);
+      border: var(--decor-border-100);
+      border-radius: var(--decor-radius-200);
+      border-color: rgb(var(--tone-gray-500));
+      box-shadow: var(--decor-elevation-600);
+    }
   {{/if}}
-  {{#if selected.edges}}
-    {{selected.edges}}
-    { opacity: 1; }
+  {{#if selected.edges }}
+    {{selected.edges}} {
+      opacity: 1;
+    }
   {{/if}}
 </style>
 
-<div class='routes'>
+<div class="routes">
   <header>
     <h2>
-      {{chain.ServiceName}}
-      Router
+      {{chain.ServiceName}} Router
       <span
-        {{tooltip
-          'Use routers to intercept traffic using Layer 7 criteria such as path prefixes or http headers.'
-        }}
+        {{tooltip 'Use routers to intercept traffic using Layer 7 criteria such as path prefixes or http headers.'}}
       >
       </span>
     </h2>
   </header>
-  <div role='group'>
+  <div role="group">
     {{#each routes as |item|}}
       <Consul::DiscoveryChain::RouteCard
         {{on-resize (dom-position (set item 'rect') from=this.edges)}}
         @item={{item}}
-        @onclick={{action 'click'}}
+        @onclick={{action "click"}}
       />
     {{/each}}
   </div>
 </div>
 
-<div class='splitters'>
+<div class="splitters">
   <header>
     <h2>
       Splitters
       <span
-        {{tooltip
-          'Splitters are configured to split incoming requests across different services or subsets of a single service.'
-        }}
+        {{tooltip 'Splitters are configured to split incoming requests across different services or subsets of a single service.'}}
       >
       </span>
     </h2>
   </header>
-  <div role='group'>
+  <div role="group">
     {{#each (sort-by 'Name' splitters) as |item|}}
       <Consul::DiscoveryChain::SplitterCard
         {{on-resize (dom-position (set item 'rect') from=this.edges)}}
         @item={{item}}
-        @onclick={{action 'click'}}
+        @onclick={{action "click"}}
       />
     {{/each}}
   </div>
 </div>
 
-<div class='resolvers'>
+<div class="resolvers">
   <header>
     <h2>
       Resolvers
       <span
-        {{tooltip
-          'Resolvers are used to define which instances of a service should satisfy discovery requests.'
-        }}
+        {{tooltip "Resolvers are used to define which instances of a service should satisfy discovery requests."}}
       >
       </span>
     </h2>
   </header>
-  <div role='group'>
+  <div role="group">
     {{#each (sort-by 'Name' resolvers) as |item|}}
       <Consul::DiscoveryChain::ResolverCard
         {{on-resize (dom-position (set item 'rect') from=this.edges)}}
         @item={{item}}
         @edges={{this.edges}}
-        @onclick={{action 'click'}}
+        @onclick={{action "click"}}
       />
     {{/each}}
   </div>
@@ -89,28 +83,31 @@
 
 {{nodes}}
 
-<svg
-  class='edges'
+<svg class="edges"
   {{did-insert (set this 'edges')}}
-  width='100%'
-  height='100%'
-  preserveAspectRatio='none'
+  width="100%"
+  height="100%"
+  preserveAspectRatio="none"
 >
   {{#each routes as |item|}}
     {{#if item.rect}}
       {{#let item.rect item.NextItem.rect as |src destRect|}}
-        {{#let
-          (tween-to (hash x=destRect.x y=(add destRect.y (div destRect.height 2))) (concat item.ID))
-          as |dest|
-        }}
+        {{#let (tween-to (hash
+          x=destRect.x
+          y=(add destRect.y (div destRect.height 2))
+        ) (concat item.ID)) as |dest|}}
 
-          <path
-            id={{concat item.ID '>' item.NextNode}}
-            d={{svg-curve
-              (hash x=dest.x y=(sub dest.y 0))
-              src=(hash x=src.right y=(add src.y (div src.height 2)))
-            }}
-          ></path>
+    <path
+      id={{concat item.ID '>' item.NextNode}}
+      d={{
+        svg-curve (hash
+          x=dest.x
+          y=(sub dest.y 0)
+        ) src=(hash
+          x=src.right
+          y=(add src.y (div src.height 2))
+      )}}
+    />
 
         {{/let}}
       {{/let}}
@@ -122,26 +119,27 @@
       {{#let splitter.rect as |src|}}
         {{#each splitter.Splits as |item index|}}
           {{#let item.NextItem.rect as |destRect|}}
-            {{#let
-              (tween-to
-                (hash x=destRect.x y=(add destRect.y (div destRect.height 2)))
-                (concat splitter.ID '-' index)
-              )
-              as |dest|
-            }}
+            {{#let (tween-to (hash
+              x=destRect.x
+              y=(add destRect.y (div destRect.height 2))
+            ) (concat splitter.ID '-' index)) as |dest|}}
 
-              <path
-                {{tooltip
-                  (concat (round (or item.Weight 0) decimals=2) '%')
-                  options=(hash followCursor=true)
-                }}
-                id={{concat 'splitter:' splitter.Name '>' item.NextNode}}
-                class='split'
-                d={{svg-curve
-                  (hash x=dest.x y=dest.y)
-                  src=(hash x=src.right y=(add src.y (div src.height 2)))
-                }}
-              ></path>
+      <path
+        {{tooltip
+          (concat (round (or item.Weight 0) decimals=2) '%')
+          options=(hash followCursor=true)
+        }}
+        id={{concat 'splitter:' splitter.Name '>' item.NextNode}}
+        class="split"
+        d={{
+          svg-curve (hash
+            x=dest.x
+            y=dest.y
+          ) src=(hash
+            x=src.right
+            y=(add src.y (div src.height 2))
+        )}}
+      />
 
             {{/let}}
           {{/let}}
@@ -152,28 +150,28 @@
 
 </svg>
 
-<svg class='resolver-inlets' height='100%'>
+<svg class="resolver-inlets" height="100%">
   {{#each routes as |item|}}
-    {{#if (string-starts-with item.NextNode 'resolver:')}}
+    {{#if (string-starts-with item.NextNode 'resolver:') }}
       {{#let (or item.NextItem.rect (hash y=0 height=0)) as |dest|}}
-        <circle r='2.5' cx='5' cy={{add dest.y (div dest.height 2)}}></circle>
+        <circle r="2.5" cx="5" cy={{add dest.y (div dest.height 2)}} />
       {{/let}}
     {{/if}}
   {{/each}}
   {{#each splitters as |item|}}
-    {{#each item.Splits as |item|}}
-      {{#let (or item.NextItem.rect (hash y=0 height=0)) as |dest|}}
-        <circle r='2.5' cx='5' cy={{add dest.y (div dest.height 2)}}></circle>
-      {{/let}}
-    {{/each}}
+      {{#each item.Splits as |item|}}
+        {{#let (or item.NextItem.rect (hash y=0 height=0)) as |dest|}}
+          <circle r="2.5" cx="5" cy={{add dest.y (div dest.height 2)}} />
+        {{/let}}
+      {{/each}}
   {{/each}}
 </svg>
 
-<svg class='splitter-inlets' height='100%'>
+<svg class="splitter-inlets" height="100%">
   {{#each routes as |item|}}
-    {{#if (string-starts-with item.NextNode 'splitter:')}}
+    {{#if (string-starts-with item.NextNode 'splitter:') }}
       {{#let (or item.NextItem.rect (hash y=0 height=0)) as |dest|}}
-        <circle r='2.5' cx='5' cy={{add dest.y (div dest.height 2)}}></circle>
+        <circle r="2.5" cx="5" cy={{add dest.y (div dest.height 2)}} />
       {{/let}}
     {{/if}}
   {{/each}}
diff --git a/ui/packages/consul-ui/app/components/consul/discovery-chain/index.js b/ui/packages/consul-ui/app/components/consul/discovery-chain/index.js
index 0abbf310429bc..6d8ffa7f6b5b4 100644
--- a/ui/packages/consul-ui/app/components/consul/discovery-chain/index.js
+++ b/ui/packages/consul-ui/app/components/consul/discovery-chain/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import { set, get, computed } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/consul/discovery-chain/index.scss b/ui/packages/consul-ui/app/components/consul/discovery-chain/index.scss
index e1a4b2a77eda1..787cd7ffc2585 100644
--- a/ui/packages/consul-ui/app/components/consul/discovery-chain/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/discovery-chain/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .discovery-chain {
diff --git a/ui/packages/consul-ui/app/components/consul/discovery-chain/layout.scss b/ui/packages/consul-ui/app/components/consul/discovery-chain/layout.scss
index d21170aefb45a..68124fa327489 100644
--- a/ui/packages/consul-ui/app/components/consul/discovery-chain/layout.scss
+++ b/ui/packages/consul-ui/app/components/consul/discovery-chain/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %discovery-chain .resolvers,
 %discovery-chain .splitters,
 %discovery-chain .routes {
diff --git a/ui/packages/consul-ui/app/components/consul/discovery-chain/resolver-card/index.hbs b/ui/packages/consul-ui/app/components/consul/discovery-chain/resolver-card/index.hbs
index e7d61c03c11ea..99f85e37a09f2 100644
--- a/ui/packages/consul-ui/app/components/consul/discovery-chain/resolver-card/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/discovery-chain/resolver-card/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="resolver-card"
 >
diff --git a/ui/packages/consul-ui/app/components/consul/discovery-chain/route-card/index.hbs b/ui/packages/consul-ui/app/components/consul/discovery-chain/route-card/index.hbs
index 9386201654444..3251cc674a188 100644
--- a/ui/packages/consul-ui/app/components/consul/discovery-chain/route-card/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/discovery-chain/route-card/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <a
   class="route-card"
   onclick={{@onclick}}
diff --git a/ui/packages/consul-ui/app/components/consul/discovery-chain/route-card/index.js b/ui/packages/consul-ui/app/components/consul/discovery-chain/route-card/index.js
index 8000faaac68e9..6d47438ef4b4f 100644
--- a/ui/packages/consul-ui/app/components/consul/discovery-chain/route-card/index.js
+++ b/ui/packages/consul-ui/app/components/consul/discovery-chain/route-card/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { get } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/components/consul/discovery-chain/skin.scss b/ui/packages/consul-ui/app/components/consul/discovery-chain/skin.scss
index 02fd85a89928e..f99e29173fc45 100644
--- a/ui/packages/consul-ui/app/components/consul/discovery-chain/skin.scss
+++ b/ui/packages/consul-ui/app/components/consul/discovery-chain/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* CSS active states are partly added at the top of */
 /* components/templates/discovery-chain.hbs for reasons */
 /* the styling there almost 100% uses our CSS vars */
@@ -24,7 +19,7 @@
   transition-property: stroke;
 
   fill: none;
-  stroke: var(--token-color-foreground-disabled);
+  stroke: rgb(var(--tone-gray-400));
   stroke-width: 2;
   vector-effect: non-scaling-stroke;
 }
@@ -35,18 +30,18 @@
 }
 %chain-node,
 %chain-node a {
-  color: var(--token-color-foreground-strong) !important;
+  color: rgb(var(--tone-gray-900)) !important;
 }
 %discovery-chain-edge-active {
-  stroke: var(--token-color-foreground-strong);
+  stroke: rgb(var(--tone-gray-900));
 }
 %chain-group {
   border-radius: var(--decor-radius-100);
   border: 1px solid;
   /* TODO: If this color is combined with the above */
   /* border property then the compressor removes the color */
-  border-color: var(--token-color-surface-interactive-active);
-  background-color: var(--token-color-surface-strong);
+  border-color: rgb(var(--tone-gray-200));
+  background-color: rgb(var(--tone-gray-100));
 
   pointer-events: none;
 }
@@ -57,7 +52,7 @@
 }
 %chain-group > header > * {
   text-transform: uppercase;
-  @extend %body-100-regular;
+  @extend %p3;
 }
 %chain-group > header span::after {
   @extend %with-info-circle-outline-icon, %as-pseudo;
@@ -71,8 +66,8 @@
 }
 %chain-node-active {
   opacity: 1;
-  background-color: var(--token-color-surface-primary);
-  border-color: var(--token-color-foreground-faint);
+  background-color: rgb(var(--tone-gray-000));
+  border-color: rgb(var(--tone-gray-500));
 }
 /* TODO: More text truncation, centralize */
 %route-card header:not(.short) dd {
@@ -110,16 +105,16 @@
 /**/
 %with-chain-outlet::before {
   @extend %as-pseudo;
-  background-color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-gray-000));
 
   border-radius: var(--decor-radius-full);
   border: 2px solid;
   /* TODO: If this color is combined with the above */
   /* border property then the compressor removes the color */
-  border-color: var(--token-color-foreground-disabled);
+  border-color: rgb(var(--tone-gray-400));
 }
 %discovery-chain circle {
   stroke-width: 2;
-  stroke: var(--token-color-foreground-disabled);
-  fill: var(--token-color-surface-primary);
+  stroke: rgb(var(--tone-gray-400));
+  fill: rgb(var(--tone-gray-000));
 }
diff --git a/ui/packages/consul-ui/app/components/consul/discovery-chain/splitter-card/index.hbs b/ui/packages/consul-ui/app/components/consul/discovery-chain/splitter-card/index.hbs
index 7984f39603625..043374f268a12 100644
--- a/ui/packages/consul-ui/app/components/consul/discovery-chain/splitter-card/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/discovery-chain/splitter-card/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
 >
   <a
diff --git a/ui/packages/consul-ui/app/components/consul/discovery-chain/utils.js b/ui/packages/consul-ui/app/components/consul/discovery-chain/utils.js
index 6976a6a930f51..df20a6086b4d9 100644
--- a/ui/packages/consul-ui/app/components/consul/discovery-chain/utils.js
+++ b/ui/packages/consul-ui/app/components/consul/discovery-chain/utils.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 const getNodesByType = function (nodes = {}, type) {
   return Object.values(nodes).filter((item) => item.Type === type);
 };
diff --git a/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.hbs b/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.hbs
index fa38bcc90e084..47740f4bfa5ff 100644
--- a/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="consul-exposed-path-list"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.scss b/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.scss
index 31d21cfb9614a..15a5f170f1a76 100644
--- a/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.scss
@@ -1,11 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-exposed-path-list {
   > ul {
-    border-top: 1px solid var(--token-color-surface-interactive-active);
+    border-top: 1px solid rgb(var(--tone-gray-200));
   }
   > ul > li {
     @extend %composite-row;
diff --git a/ui/packages/consul-ui/app/components/consul/external-source/index.hbs b/ui/packages/consul-ui/app/components/consul/external-source/index.hbs
index c0a8de9f8bfd7..19d33a8ab6c76 100644
--- a/ui/packages/consul-ui/app/components/consul/external-source/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/external-source/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if @item}}
   {{#let (service/external-source @item) as |externalSource|}}
   {{#if (and @withInfo (eq externalSource 'consul-api-gateway'))}}
@@ -41,7 +36,7 @@
       class="consul-external-source"
       ...attributes
     >
-      <FlightIcon @name={{icon-mapping externalSource}} @color="var(--token-color-hashicorp-brand)" class="mr-1.5 h-4 w-4" />
+      <FlightIcon @name={{icon-mapping externalSource}} @color="rgb(var(--black))" class="mr-1.5 h-4 w-4" />
       {{#if @label}}
         {{@label}}
       {{else}}
diff --git a/ui/packages/consul-ui/app/components/consul/external-source/index.scss b/ui/packages/consul-ui/app/components/consul/external-source/index.scss
index d318d534c6e0f..b79530dfebb7d 100644
--- a/ui/packages/consul-ui/app/components/consul/external-source/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/external-source/index.scss
@@ -1,10 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-external-source {
-  @extend %pill-200, %frame-gray-600, %body-200-regular;
+  @extend %pill-200, %frame-gray-600, %p1;
 }
 
 .consul-external-source::before {
diff --git a/ui/packages/consul-ui/app/components/consul/health-check/list/index.hbs b/ui/packages/consul-ui/app/components/consul/health-check/list/index.hbs
index f5e065cec718f..9a86804a2eace 100644
--- a/ui/packages/consul-ui/app/components/consul/health-check/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/health-check/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="consul-health-check-list"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/health-check/list/index.scss b/ui/packages/consul-ui/app/components/consul/health-check/list/index.scss
index 5995a4ecce86f..9f67dd146c6a7 100644
--- a/ui/packages/consul-ui/app/components/consul/health-check/list/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/health-check/list/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .consul-health-check-list .health-check-output {
diff --git a/ui/packages/consul-ui/app/components/consul/health-check/list/layout.scss b/ui/packages/consul-ui/app/components/consul/health-check/list/layout.scss
index ef5dd6155daca..b617091657199 100644
--- a/ui/packages/consul-ui/app/components/consul/health-check/list/layout.scss
+++ b/ui/packages/consul-ui/app/components/consul/health-check/list/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %healthcheck-output {
   display: flex;
   padding: 20px 16px;
diff --git a/ui/packages/consul-ui/app/components/consul/health-check/list/pageobject.js b/ui/packages/consul-ui/app/components/consul/health-check/list/pageobject.js
index d7040294a0f5d..63d9438a5fec5 100644
--- a/ui/packages/consul-ui/app/components/consul/health-check/list/pageobject.js
+++ b/ui/packages/consul-ui/app/components/consul/health-check/list/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (collection, text) =>
   (scope = '.consul-health-check-list') => {
     return collection({
diff --git a/ui/packages/consul-ui/app/components/consul/health-check/list/skin.scss b/ui/packages/consul-ui/app/components/consul/health-check/list/skin.scss
index 8c493b3c580ec..17b3ad7b0e751 100644
--- a/ui/packages/consul-ui/app/components/consul/health-check/list/skin.scss
+++ b/ui/packages/consul-ui/app/components/consul/health-check/list/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %healthcheck-output {
   border-width: 1px;
 }
@@ -20,11 +15,11 @@
   }
 }
 %healthcheck-output header > * {
-  @extend %display-300-semibold;
+  @extend %h300;
 }
 %healthcheck-output dd em {
   @extend %pill;
-  background-color: var(--token-color-surface-strong);
+  background-color: rgb(var(--tone-gray-100));
   /*TODO: Should this be merged into %pill? */
   cursor: default;
   font-style: normal;
@@ -33,41 +28,41 @@
 }
 %healthcheck-output.passing::before {
   @extend %with-check-circle-fill-mask;
-  color: var(--token-color-foreground-success);
+  color: rgb(var(--tone-green-500));
 }
 %healthcheck-output.warning::before {
   @extend %with-alert-triangle-mask;
-  color: var(--token-color-foreground-warning);
+  color: rgb(var(--tone-orange-500));
 }
 %healthcheck-output.critical::before {
   @extend %with-cancel-square-fill-mask;
-  color: var(--token-color-foreground-critical);
+  color: rgb(var(--tone-red-500));
 }
 %healthcheck-output,
 %healthcheck-output pre {
   border-radius: var(--decor-radius-100);
 }
 %healthcheck-output dd:first-of-type {
-  color: var(--token-color-foreground-disabled);
+  color: rgb(var(--tone-gray-400));
 }
 %healthcheck-output pre {
-  background-color: var(--token-color-surface-strong);
-  color: var(--token-color-foreground-faint);
+  background-color: rgb(var(--tone-gray-050));
+  color: rgb(var(--tone-gray-600));
 }
 %healthcheck-output {
   /* TODO: this should be a frame-gray */
-  color: var(--token-color-foreground-strong);
-  border-color: var(--token-color-surface-interactive-active);
+  color: rgb(var(--tone-gray-900));
+  border-color: rgb(var(--tone-gray-200));
   border-style: solid;
 
   border-left-width: 4px;
 }
 %healthcheck-output.passing {
-  border-left-color: var(--token-color-foreground-success);
+  border-left-color: rgb(var(--tone-green-500));
 }
 %healthcheck-output.warning {
-  border-left-color: var(--token-color-vault-brand);
+  border-left-color: rgb(var(--tone-yellow-500));
 }
 %healthcheck-output.critical {
-  border-left-color: var(--token-color-foreground-critical);
+  border-left-color: rgb(var(--tone-red-500));
 }
diff --git a/ui/packages/consul-ui/app/components/consul/health-check/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/health-check/search-bar/index.hbs
index e24adef165603..9c784527a5ba9 100644
--- a/ui/packages/consul-ui/app/components/consul/health-check/search-bar/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/health-check/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar
   class="consul-healthcheck-search-bar"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/instance-checks/index.hbs b/ui/packages/consul-ui/app/components/consul/instance-checks/index.hbs
index 965425dee8e1a..f1667610c2a19 100644
--- a/ui/packages/consul-ui/app/components/consul/instance-checks/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/instance-checks/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#let
   (group-by "Status" (or @items (array)))
 as |grouped|}}
diff --git a/ui/packages/consul-ui/app/components/consul/instance-checks/index.scss b/ui/packages/consul-ui/app/components/consul/instance-checks/index.scss
index e384f9fe05e2d..d97fe7b1f3e09 100644
--- a/ui/packages/consul-ui/app/components/consul/instance-checks/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/instance-checks/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-instance-checks {
   & {
     @extend %horizontal-kv-list;
@@ -12,18 +7,18 @@
   }
   &.passing dt::before {
     @extend %with-check-circle-fill-mask;
-    color: var(--token-color-foreground-success);
+    color: rgb(var(--tone-green-500));
   }
   &.warning dt::before {
     @extend %with-alert-triangle-mask;
-    color: var(--token-color-foreground-warning);
+    color: rgb(var(--tone-orange-500));
   }
   &.critical dt::before {
     @extend %with-cancel-square-fill-mask;
-    color: var(--token-color-foreground-critical);
+    color: rgb(var(--tone-red-500));
   }
   &.empty dt::before {
     @extend %with-minus-square-fill-mask;
-    color: var(--token-color-foreground-faint);
+    color: rgb(var(--tone-gray-500));
   }
 }
diff --git a/ui/packages/consul-ui/app/components/consul/intention/components.scss b/ui/packages/consul-ui/app/components/consul/intention/components.scss
index 47f1afb66a035..ed98c8499475e 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/components.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/components.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %pill-allow::before,
 %pill-deny::before,
 %pill-l7::before {
@@ -11,17 +6,17 @@
 %pill-allow,
 %pill-deny,
 %pill-l7 {
-  font-weight: var(--token-typography-font-weight-regular);
-  font-size: var(--token-typography-body-200-font-size);
   display: inline-block;
+  font-weight: var(--typo-weight-normal);
+  font-size: var(--typo-size-600);
 }
 %pill-allow {
-  color: var(--token-color-foreground-success-on-surface);
-  background-color: var(--token-color-border-success);
+  color: rgb(var(--tone-green-800));
+  background-color: rgb(var(--tone-green-100));
 }
 %pill-deny {
-  color: var(--token-color-foreground-critical-on-surface);
-  background-color: var(--token-color-border-critical);
+  color: rgb(var(--tone-red-800));
+  background-color: rgb(var(--tone-red-100));
 }
 %pill-l7 {
   @extend %frame-gray-900;
diff --git a/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/index.hbs
index 0aa7f4d02df38..9f9972a392f85 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   ...attributes
   class="consul-intention-fieldsets"
@@ -194,14 +189,13 @@
   </fieldset>
 {{#if (eq (or item.Action '') '')}}
   <fieldset class="permissions">
-    <Hds::Button
-      @text='Add permission'
-      @size='small'
-      @color='tertiary'
-      @icon='plus'
+    <button
       data-test-create-permission
+      type="button"
       {{on "click" (action this.openModal)}}
-    />
+    >
+      Add permission
+    </button>
     <h2>Permissions</h2>
 {{#if (gt item.Permissions.length 0) }}
     <Consul::Intention::Notice::Permissions />
@@ -223,23 +217,11 @@
         </p>
       </BlockSlot>
       <BlockSlot @name="actions">
-        <li>
-          <Hds::Link::Standalone
-            @text='Documentation'
-            @href="{{env 'CONSUL_DOCS_URL'}}/commands/intention"
-            @icon='docs-link'
-            @iconPosition='trailing'
-            @size='small'
-          />
+        <li class="docs-link">
+          <a href="{{env 'CONSUL_DOCS_URL'}}/commands/intention" rel="noopener noreferrer" target="_blank">Documentation</a>
         </li>
-        <li>
-          <Hds::Link::Standalone
-            @text='Read the guide'
-            @href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/getting-started/connect"
-            @icon='learn-link'
-            @iconPosition='trailing'
-            @size='small'
-          />
+        <li class="learn-link">
+          <a href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/getting-started/connect" rel="noopener noreferrer" target="_blank">Read the guide</a>
         </li>
       </BlockSlot>
     </EmptyState>
@@ -267,20 +249,22 @@
       </Consul::Intention::Permission::Form>
     </BlockSlot>
     <BlockSlot @name="actions">
-      <Hds::ButtonSet>
-        <Hds::Button
-          @text='Save'
-          data-test-intention-permission-submit
-          @color='primary'
-          disabled={{if (not this.permissionForm.isDirty) 'disabled'}}
-          onclick={{queue (action this.permissionForm.submit) (action modal.close)}}
-        />
-        <Hds::Button
-          @text='Cancel'
-          @color='secondary'
-          onclick={{queue (action this.permissionForm.reset) (action modal.close)}}
-        />
-      </Hds::ButtonSet>
+      <button
+        type="button"
+        data-test-intention-permission-submit
+        class="type-submit"
+        disabled={{if (not this.permissionForm.isDirty) 'disabled'}}
+        onclick={{queue (action this.permissionForm.submit) (action modal.close)}}
+      >
+        Save
+      </button>
+      <button
+        type="button"
+        class="type-cancel"
+        onclick={{queue (action this.permissionForm.reset) (action modal.close)}}
+      >
+        Cancel
+      </button>
     </BlockSlot>
   </ModalDialog>
 
diff --git a/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/index.js b/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/index.js
index 94c00927c8ec8..9437bb8e7a2e7 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/index.js
+++ b/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
@@ -22,7 +17,7 @@ export default Component.extend({
       return !items.findBy('Name', term);
     },
     add: function (name, changeset, value) {
-      if (!(changeset.get(name) || []).includes(value)) {
+      if (!(changeset.get(name) || []).includes(value) && value.isNew) {
         changeset.pushObject(name, value);
         changeset.validate();
       }
diff --git a/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/index.scss b/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/layout.scss b/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/layout.scss
index 18db183ceeb0a..9a6f1a8d6ef04 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/layout.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-intention-fieldsets {
   [role='radiogroup'] {
     overflow: visible !important;
@@ -17,7 +12,7 @@
     display: inline;
   }
   .permissions > button {
-    @extend %anchor, %body-100-regular;
+    @extend %anchor, %p2;
     float: right;
   }
 }
diff --git a/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/skin.scss b/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/skin.scss
index 9c7d77c36eff8..242b593b0ca1d 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/skin.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/form/fieldsets/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-intention-fieldsets {
   .value-allow > :last-child::before {
     @extend %with-allow-500;
diff --git a/ui/packages/consul-ui/app/components/consul/intention/form/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/form/index.hbs
index cdc983c37b162..e58b1ffb3f4a2 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/form/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/form/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="consul-intention"
   ...attributes
@@ -21,32 +16,42 @@ as |api|>
 
     <BlockSlot @name="error" as |after|>
 {{#if (string-starts-with api.error.detail 'duplicate intention found:')}}
-  <Hds::Toast
-    @color='critical'
-    {{notification
-      after=(action after)
-    }}
-    as |T|>
-    <T.Title>Intention exists!</T.Title>
-    <T.Description>
-      An intention already exists for this Source-Destination pair. Please enter a different combination of Services, or search the intentions to edit an existing intention.
-    </T.Description>
-  </Hds::Toast>
+      <Notice
+        {{notification
+          after=(action after)
+        }}
+        class="notification-update"
+        @type="error"
+      as |notice|>
+        <notice.Header>
+          <strong>Intention exists!</strong>
+        </notice.Header>
+        <notice.Body>
+          <p>
+            An intention already exists for this Source-Destination pair. Please enter a different combination of Services, or search the intentions to edit an existing intention.
+          </p>
+        </notice.Body>
+      </Notice>
 {{else}}
-  <Hds::Toast
-    @color='critical'
-    {{notification
-      after=(action after)
-    }}
-    as |T|>
-    <T.Title>Error!</T.Title>
-    <T.Description>
-      There was an error saving your intention.
-      {{#if (and api.error.status api.error.detail)}}
-        <br />{{api.error.status}}: {{api.error.detail}}
-      {{/if}}
-    </T.Description>
-  </Hds::Toast>
+      <Notice
+        {{notification
+          after=(action after)
+        }}
+        class="notification-update"
+        @type="error"
+      as |notice|>
+        <notice.Header>
+          <strong>Error!</strong>
+        </notice.Header>
+        <notice.Body>
+          <p>
+            There was an error saving your intention.
+          {{#if (and api.error.status api.error.detail)}}
+            <br />{{api.error.status}}: {{api.error.detail}}
+          {{/if}}
+          </p>
+        </notice.Body>
+      </Notice>
   {{/if}}
     </BlockSlot>
 
@@ -75,20 +80,22 @@ as |item readonly|}}
           </p>
         </BlockSlot>
         <BlockSlot @name="actions" as |close|>
-          <Hds::ButtonSet>
-            <Hds::Button
-              data-test-action-warning-confirm
-              @text='Set to {{capitalize newAction}}'
-              @color='critical'
-              {{on 'click' api.submit}}
-            />
-            <Hds::Button
-              data-test-action-warning-cancel
-              @text='No, Cancel'
-              @color='secondary'
-              onclick={{close}}
-            />
-          </Hds::ButtonSet>
+          <button
+            data-test-action-warning-confirm
+            type="button"
+            class="dangerous"
+            {{on 'click' api.submit}}
+          >
+            Set to {{capitalize newAction}}
+          </button>
+          <button
+            data-test-action-warning-cancel
+            type="button"
+            class="type-cancel"
+            onclick={{close}}
+          >
+            No, Cancel
+          </button>
         </BlockSlot>
       </ModalDialog>
   {{/let}}
@@ -128,10 +135,20 @@ as |item readonly|}}
 
     {{#if api.isCreate}}
       {{#if (and (can 'use partitions') (not (can 'choose partitions' dc=@dc)))}}
-        <Hds::Alert @type='inline' class='mb-3 mt-2' as |A|>
-          <A.Title>Cross-partition communication not supported</A.Title>
-          <A.Description>Cross-partition communication is not supported outside of the primary datacenter. You will only be able to select namespaces for source and destination services.</A.Description>
-        </Hds::Alert>
+        <Notice
+          @type="info"
+        as |notice|>
+          <notice.Header>
+            <h3>
+              Cross-partition communication not supported
+            </h3>
+          </notice.Header>
+          <notice.Body>
+            <p>
+              Cross-partition communication is not supported outside of the primary datacenter. You will only be able to select namespaces for source and destination services.
+            </p>
+          </notice.Body>
+        </Notice>
       {{/if}}
       {{#if this.isManagedByCRDs}}
         <Consul::Intention::Notice::CustomResource @type="warning" />
@@ -157,30 +174,32 @@ as |item readonly|}}
           @onchange={{api.change}}
         />
         <div>
-          <Hds::ButtonSet>
-            <Hds::Button
-              @text='Save'
-              type='submit'
-              disabled={{or item.isInvalid api.disabled}}
-            />
-            <Hds::Button
-              @text='Cancel'
-              @color='secondary'
-              type="reset"
-              disabled={{api.disabled}}
-              {{on 'click' (fn this.oncancel item)}}
-            />
+          <button
+            type="submit"
+            disabled={{or item.isInvalid api.disabled}}
+          >
+            Save
+          </button>
+          <button
+            type="reset"
+            disabled={{api.disabled}}
+            {{on 'click' (fn this.oncancel item)}}
+          >
+            Cancel
+          </button>
 {{#if (not api.isCreate)}}
   {{#if (not-eq item.ID 'anonymous') }}
           <ConfirmationDialog @message="Are you sure you want to delete this Intention?">
             <BlockSlot @name="action" as |confirm|>
-              <Hds::Button
-                @text='Delete'
-                @color='critical'
+              <button
+                data-test-delete
+                type="button"
+                class="type-delete"
                 disabled={{api.disabled}}
                 {{on 'click' (fn confirm api.delete)}}
-                data-test-delete
-              />
+              >
+                Delete
+              </button>
             </BlockSlot>
             <BlockSlot @name="dialog" as |execute cancel message|>
               <DeleteConfirmation
@@ -192,20 +211,31 @@ as |item readonly|}}
           </ConfirmationDialog>
   {{/if}}
 {{/if}}
-          </Hds::ButtonSet>
         </div>
       </form>
   {{else}}
 
     {{#if item.IsManagedByCRD}}
-      <Hds::Alert @type="inline" class='mb-3 mt-2' as |A|>
-        <A.Title>Intention Custom Resource</A.Title>
-        <A.Description>This Intention is view only because it is managed through an Intention Custom Resource in your Kubernetes cluster.</A.Description>
-        <A.Link::Standalone @text='Learn more about CRDs'
-                            @href="{{env 'CONSUL_DOCS_URL'}}/k8s/crds"
-                            @icon='docs-link'
-                            @iconPosition='trailing' />
-      </Hds::Alert>
+      <Notice
+        class="crd"
+        @type="warning"
+      as |notice|>
+        <notice.Header>
+          <h3>
+            Intention Custom Resource
+          </h3>
+        </notice.Header>
+        <notice.Body>
+          <p>
+            This Intention is view only because it is managed through an Intention Custom Resource in your Kubernetes cluster.
+          </p>
+        </notice.Body>
+        <notice.Footer>
+          <p>
+            <a href="{{env 'CONSUL_DOCS_URL'}}/k8s/crds" target="_blank" rel="noopener noreferrer">Learn more about CRDs</a>
+          </p>
+        </notice.Footer>
+      </Notice>
     {{/if}}
 
     <Consul::Intention::View
diff --git a/ui/packages/consul-ui/app/components/consul/intention/form/index.js b/ui/packages/consul-ui/app/components/consul/intention/form/index.js
index b794057a4aff7..04615f7c20257 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/form/index.js
+++ b/ui/packages/consul-ui/app/components/consul/intention/form/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/consul/intention/form/index.scss b/ui/packages/consul-ui/app/components/consul/intention/form/index.scss
index bc4bc4bb49175..6f39b1c6c27f0 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/form/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/form/index.scss
@@ -1,12 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-intention-action-warn-modal {
   .modal-dialog-window {
     max-width: 450px;
   }
+  .modal-dialog-body p {
+    font-size: var(--typo-size-600);
+  }
   button.dangerous {
     @extend %dangerous-button;
   }
diff --git a/ui/packages/consul-ui/app/components/consul/intention/index.scss b/ui/packages/consul-ui/app/components/consul/intention/index.scss
index 38d47141e3c9a..47026b68e8fa2 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './components';
 
 @import './search-bar';
diff --git a/ui/packages/consul-ui/app/components/consul/intention/list/check/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/list/check/index.hbs
index aaef28195062a..8a1b39f91c018 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/list/check/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/list/check/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#let
   (from-entries (array
     (array 'allow' 'Allowed')
diff --git a/ui/packages/consul-ui/app/components/consul/intention/list/components.scss b/ui/packages/consul-ui/app/components/consul/intention/list/components.scss
index 7d59af6889a19..b7a0760b8c548 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/list/components.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/list/components.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-intention-list {
   td.source,
   td.destination {
@@ -20,7 +15,13 @@
   td.intent- strong {
     @extend %pill-l7;
   }
-  td.permissions {
-    @extend %body-100-regular;
+  .notice.allow {
+    @extend %notice-success;
+  }
+  .notice.deny {
+    @extend %notice-error;
+  }
+  .notice.permissions {
+    @extend %notice-info;
   }
 }
diff --git a/ui/packages/consul-ui/app/components/consul/intention/list/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/list/index.hbs
index edd21659cc251..9c1606db5fb71 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="consul-intention-list"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/intention/list/index.js b/ui/packages/consul-ui/app/components/consul/intention/list/index.js
index fe7d629ef2e49..4d9917b778f9f 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/list/index.js
+++ b/ui/packages/consul-ui/app/components/consul/intention/list/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/consul/intention/list/index.scss b/ui/packages/consul-ui/app/components/consul/intention/list/index.scss
index 97eba35619fb6..94c3441e6125a 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/list/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/list/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './components';
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/consul/intention/list/layout.scss b/ui/packages/consul-ui/app/components/consul/intention/list/layout.scss
index 22f3921667127..7b7e3338a33d2 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/list/layout.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/list/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-intention-list {
   td {
     height: 59px;
diff --git a/ui/packages/consul-ui/app/components/consul/intention/list/pageobject.js b/ui/packages/consul-ui/app/components/consul/intention/list/pageobject.js
index 815977c7e3c34..ee53cc17ff42d 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/list/pageobject.js
+++ b/ui/packages/consul-ui/app/components/consul/intention/list/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (collection, clickable, attribute, isPresent, deletable) =>
   (scope = '.consul-intention-list') => {
     const row = {
diff --git a/ui/packages/consul-ui/app/components/consul/intention/list/skin.scss b/ui/packages/consul-ui/app/components/consul/intention/list/skin.scss
index 8cdce558c6106..8a66540e89a35 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/list/skin.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/list/skin.scss
@@ -1,10 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %consul-intention-list td.permissions {
-  color: var(--token-color-foreground-action);
+  color: rgb(var(--tone-blue-500));
 }
 %consul-intention-list em {
   --word-spacing: 0.25rem;
diff --git a/ui/packages/consul-ui/app/components/consul/intention/list/table/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/list/table/index.hbs
index 427002d4f747e..9dbd2a8e50930 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/list/table/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/list/table/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <TabularCollection
   class='consul-intention-list-table'
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/intention/list/table/index.scss b/ui/packages/consul-ui/app/components/consul/intention/list/table/index.scss
index 8cfe7da9d6e76..dc1da5692c060 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/list/table/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/list/table/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-intention-list-table__meta-info {
   display: flex;
 
diff --git a/ui/packages/consul-ui/app/components/consul/intention/notice/custom-resource/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/notice/custom-resource/index.hbs
index 7f0e03edff713..0b629d4f58a6a 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/notice/custom-resource/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/notice/custom-resource/index.hbs
@@ -1,14 +1,21 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
-<Hds::Alert @type='inline' @color={{or @type "neutral"}} class='mb-2 mt-2 consul-intention-notice-custom-resource' as |A|>
-  <A.Title>Intention Custom Resource</A.Title>
-  <A.Description>Some of your intentions are being managed through an Intention Custom Resource in your Kubernetes cluster. Those managed intentions will be view only in the UI. Any intentions created in the UI will work but will not be synced to the Custom Resource Definition (CRD) datastore.</A.Description>
-  <A.Link::Standalone @href="{{env 'CONSUL_DOCS_URL'}}/k8s/crds"
-                      @text='Learn more about CRDs'
-                      @icon="docs-link"
-                      @iconPosition="trailing"
-                      @size="small" />
-</Hds::Alert>
\ No newline at end of file
+<Notice
+  class="consul-intention-notice-custom-resource crd"
+  ...attributes
+  @type={{or @type "info"}}
+as |notice|>
+  <notice.Header>
+    <h3>
+      Intention Custom Resource
+    </h3>
+  </notice.Header>
+  <notice.Body>
+    <p>
+      Some of your intentions are being managed through an Intention Custom Resource in your Kubernetes cluster. Those managed intentions will be view only in the UI. Any intentions created in the UI will work but will not be synced to the Custom Resource Definition (CRD) datastore.
+    </p>
+  </notice.Body>
+  <notice.Footer>
+    <p>
+      <a href="{{env 'CONSUL_DOCS_URL'}}/k8s/crds" target="_blank" rel="noopener noreferrer">Learn more about CRDs</a>
+    </p>
+  </notice.Footer>
+</Notice>
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/consul/intention/notice/permissions/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/notice/permissions/index.hbs
index fa6dd5d9da53c..9e42632ba7392 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/notice/permissions/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/notice/permissions/index.hbs
@@ -1,15 +1,17 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
+<Notice
+  @type="info"
+as |notice|>
+  <notice.Body>
+    <p>
+      {{t "components.consul.intention.notice.permissions.body"}}
+    </p>
+  </notice.Body>
+  <notice.Footer>
+    <p>
+      <a href="{{env 'CONSUL_DOCS_URL'}}/connect/intentions" target="_blank" rel="noopener noreferrer">
+        {{t "components.consul.intention.notice.permissions.footer"}}
+      </a>
+    </p>
+  </notice.Footer>
+</Notice>
 
-<Hds::Alert @type="inline" class="mb-3 mt-2" as |A|>
-  <A.Description>{{t "components.consul.intention.notice.permissions.body"}}</A.Description>
-  <A.Link::Standalone
-    @text={{t "components.consul.intention.notice.permissions.footer"}}
-    @href="{{env 'CONSUL_DOCS_URL'}}/connect/intentions"
-    @icon="docs-link"
-    @iconPosition="trailing"
-    @size="small"
-  />
-</Hds::Alert>
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/consul/intention/notifications/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/notifications/index.hbs
index 76cfbf90101d0..b6921fbe7accc 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/notifications/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/notifications/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (eq @type 'create')}}
   {{#if (eq @status 'success') }}
     Your intention has been added.
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.hbs
index ce4621a7aaffa..f2b09732a2934 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   ...attributes
   class="consul-intention-permission-form"
@@ -139,20 +134,23 @@ as |group|>
       <Ref @target={{this}} @name="headerForm" @value={{headerForm}} />
     </Consul::Intention::Permission::Header::Form>
 
-    <Hds::ButtonSet>
-      <Hds::Button
-        data-test-add-header
-        @text='Add{{if (gt (get (changeset-get changeset 'HTTP.Header') 'length') 0) ' another' ''}} header'
-        @color='primary'
-        disabled={{if (not this.headerForm.isDirty) 'disabled'}}
-        onclick={{action this.headerForm.submit}}
-      />
-      <Hds::Button
-        @text='Cancel'
-        @color='secondary'
-        onclick={{action this.headerForm.reset}}
-      />
-    </Hds::ButtonSet>
+    <button
+      data-test-add-header
+      type="button"
+      class="type-submit"
+      disabled={{if (not this.headerForm.isDirty) 'disabled'}}
+      onclick={{action this.headerForm.submit}}
+    >
+      Add{{#if (gt (get (changeset-get changeset 'HTTP.Header') 'length') 0)}} another{{/if}} header
+    </button>
+    <button
+      type="button"
+      class="type-cancel"
+      onclick={{action this.headerForm.reset}}
+    >
+      Cancel
+    </button>
+
   </fieldset>
   </FormGroup>
 </div>
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.js b/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.js
index 30c73f4d4abb6..eb613736169e5 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.js
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { get, set, computed } from '@ember/object';
 import { alias, not, equal } from '@ember/object/computed';
@@ -47,7 +42,7 @@ export default Component.extend({
 
   changeset: computed('item', function () {
     const changeset = this.change.changesetFor(name, this.item || this.repo.create());
-    if (changeset.isPristine) {
+    if (changeset.isNew) {
       changeset.validate();
     }
     return changeset;
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.scss b/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/form/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/form/layout.scss b/ui/packages/consul-ui/app/components/consul/intention/permission/form/layout.scss
index 9d085f5327039..55f7697e8c1ee 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/form/layout.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/form/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-intention-permission-form {
   h2 {
     padding-top: 1.4em;
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/form/pageobject.js b/ui/packages/consul-ui/app/components/consul/intention/permission/form/pageobject.js
index d57ae8855c2ae..7df00932f31f4 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/form/pageobject.js
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/form/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { clickable } from 'ember-cli-page-object';
 import { input, options, click, button } from 'consul-ui/tests/lib/page-object';
 import powerSelect from 'consul-ui/components/power-select/pageobject';
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/form/skin.scss b/ui/packages/consul-ui/app/components/consul/intention/permission/form/skin.scss
index 51135a8de2a5e..1085802d4e918 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/form/skin.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/form/skin.scss
@@ -1,12 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-intention-permission-form {
   h2 {
-    border-top: 1px solid var(--token-color-foreground-action);
-    @extend %display-400-semibold;
+    border-top: 1px solid rgb(var(--tone-blue-500));
+    @extend %h200;
   }
   button.type-submit {
     @extend %frame-blue-300;
@@ -22,6 +17,6 @@
 
 .consul-intention-view {
   h2 {
-    @extend %display-400-semibold;
+    @extend %h200;
   }
 }
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/header/form/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/permission/header/form/index.hbs
index 3ae87f1be1b66..d13323dad85b8 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/header/form/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/header/form/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   ...attributes
   class="consul-intention-permission-header-form"
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/header/form/index.js b/ui/packages/consul-ui/app/components/consul/intention/permission/header/form/index.js
index ddbbc20eb5b04..ce63d2ad32f96 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/header/form/index.js
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/header/form/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { get, set, computed } from '@ember/object';
 import { alias, equal, not } from '@ember/object/computed';
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/header/form/pageobject.js b/ui/packages/consul-ui/app/components/consul/intention/permission/header/form/pageobject.js
index c142a4c8b7d61..3b078aaae9764 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/header/form/pageobject.js
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/header/form/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { input } from 'consul-ui/tests/lib/page-object';
 import powerSelect from 'consul-ui/components/power-select/pageobject';
 
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/index.hbs
index f97a6019dc762..13cf81d59d683 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (gt items.length 0)}}
 <ListCollection
   class="consul-intention-permission-header-list"
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/index.js b/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/index.js
index d99599ac30397..4798652642ba8 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/index.js
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/index.scss b/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/index.scss
index a0eeb03eea687..60592fe9f6338 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .consul-intention-permission-header-list {
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/layout.scss b/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/layout.scss
index 4d1a2b40d2de2..e9a208e8e5603 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/layout.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-intention-permission-header-list {
   max-height: 200px;
   overflow: auto;
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/pageobject.js b/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/pageobject.js
index 4eeaca912bc1e..601082e4a8bf3 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/pageobject.js
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { collection } from 'ember-cli-page-object';
 
 export default (scope = '.consul-intention-permission-header-list') => {
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/skin.scss b/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/skin.scss
index 43430a62dd2b5..3202b22d7a2e2 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/skin.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/header/list/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-intention-permission-header-list {
   dt::before {
     @extend %with-glyph-icon;
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/list/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/permission/list/index.hbs
index e469974b0bddf..3474d6400f979 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (gt items.length 0)}}
 <ListCollection
   class="consul-intention-permission-list{{if (not onclick) ' readonly'}}"
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/list/index.js b/ui/packages/consul-ui/app/components/consul/intention/permission/list/index.js
index d99599ac30397..4798652642ba8 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/list/index.js
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/list/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/list/index.scss b/ui/packages/consul-ui/app/components/consul/intention/permission/list/index.scss
index d5e2d29a110c0..6c91810fa72f6 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/list/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/list/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .consul-intention-permission-list > ul > li {
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/list/layout.scss b/ui/packages/consul-ui/app/components/consul/intention/permission/list/layout.scss
index 770c9a951a7db..902c790f5145e 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/list/layout.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/list/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-intention-permission-list {
   .detail > div {
     display: flex;
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/list/pageobject.js b/ui/packages/consul-ui/app/components/consul/intention/permission/list/pageobject.js
index 0a8bfe0f2c908..f9b79d7c6db35 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/list/pageobject.js
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/list/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { collection } from 'ember-cli-page-object';
 
 export default (scope = '.consul-intention-permission-list') => {
diff --git a/ui/packages/consul-ui/app/components/consul/intention/permission/list/skin.scss b/ui/packages/consul-ui/app/components/consul/intention/permission/list/skin.scss
index 68a73b774551f..d6b2ab23e165f 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/permission/list/skin.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/permission/list/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-intention-permission-list {
   dt::before {
     @extend %with-glyph-icon;
diff --git a/ui/packages/consul-ui/app/components/consul/intention/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/search-bar/index.hbs
index c895212281293..4fa5dc1fe3c27 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/search-bar/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar
   class="consul-intention-search-bar"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/intention/search-bar/index.scss b/ui/packages/consul-ui/app/components/consul/intention/search-bar/index.scss
index 00fa3077a7bcf..684861f4f73f9 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/search-bar/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/intention/search-bar/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-intention-search-bar {
   li button span {
     @extend %pill-700;
diff --git a/ui/packages/consul-ui/app/components/consul/intention/view/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/view/index.hbs
index e171943658005..22b493b0bcbd0 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/view/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/intention/view/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="consul-intention-view"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/intention/view/index.js b/ui/packages/consul-ui/app/components/consul/intention/view/index.js
index d99599ac30397..4798652642ba8 100644
--- a/ui/packages/consul-ui/app/components/consul/intention/view/index.js
+++ b/ui/packages/consul-ui/app/components/consul/intention/view/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/packages/consul-ui/app/components/consul/kind/index.hbs b/ui/packages/consul-ui/app/components/consul/kind/index.hbs
index c5ab5fd1ddb51..58b9815456128 100644
--- a/ui/packages/consul-ui/app/components/consul/kind/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/kind/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if item.Kind}}
   {{#if withInfo}}
     <dl class="tooltip-panel">
diff --git a/ui/packages/consul-ui/app/components/consul/kind/index.js b/ui/packages/consul-ui/app/components/consul/kind/index.js
index 2e9b178151626..63117c19fe411 100644
--- a/ui/packages/consul-ui/app/components/consul/kind/index.js
+++ b/ui/packages/consul-ui/app/components/consul/kind/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 import { titleize } from 'ember-cli-string-helpers/helpers/titleize';
diff --git a/ui/packages/consul-ui/app/components/consul/kind/index.scss b/ui/packages/consul-ui/app/components/consul/kind/index.scss
index 6195c48ba5916..0431ac3068289 100644
--- a/ui/packages/consul-ui/app/components/consul/kind/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/kind/index.scss
@@ -1,10 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-kind {
-  @extend %pill-200, %frame-gray-600, %body-200-regular;
+  @extend %pill-200, %frame-gray-600, %p1;
 }
 .consul-kind::before {
   @extend %with-gateway-mask, %as-pseudo;
diff --git a/ui/packages/consul-ui/app/components/consul/kv/form/index.hbs b/ui/packages/consul-ui/app/components/consul/kv/form/index.hbs
index 5351bd6a4b3f7..8ca9d738a50dd 100644
--- a/ui/packages/consul-ui/app/components/consul/kv/form/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/kv/form/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <DataForm
   @dc={{dc}}
   @nspace={{nspace}}
@@ -65,58 +60,29 @@
             </label>
         </div>
 {{/if}}
-      </fieldset>
-      <Hds::ButtonSet>
-        {{#if api.isCreate}}
-          {{#if (not disabld)}}
-            <Hds::Button
-              @text='Save'
-              type='submit'
-              disabled={{or api.data.isPristine api.data.isInvalid api.disabled}}
-            />
-          {{/if}}
-
-          <Hds::Button
-            @text='Cancel'
-            @color='secondary'
-            type='reset'
-            disabled={{api.disabled}}
-            onclick={{action oncancel api.data}}
-          />
-        {{else}}
-          {{#if (not disabld)}}
-            <Hds::Button
-              @text='Save'
-              type='submit'
-              disabled={{or api.data.isInvalid api.disabled}}
-            />
-          {{/if}}
-          <Hds::Button
-            @text='Cancel'
-            @color='secondary'
-            type='reset'
-            disabled={{api.disabled}}
-            onclick={{action oncancel api.data}}
-          />
-          {{#if (not disabld)}}
-            <ConfirmationDialog @message="Are you sure you want to delete this key?">
-              <BlockSlot @name="action" as |confirm|>
-                <Hds::Button
-                  @text='Delete'
-                  @color='critical'
-                  data-test-delete
-                  disabled={{api.disabled}}
-                  {{on 'click' (action confirm api.delete)}}
-                />
-              </BlockSlot>
-              <BlockSlot @name="dialog" as |execute cancel message|>
-                <DeleteConfirmation @message={{message}} @execute={{execute}} @cancel={{cancel}} />
-              </BlockSlot>
-            </ConfirmationDialog>
-          {{/if}}
-        {{/if}}
-      </Hds::ButtonSet>
-    </form>
+    </fieldset>
+    {{#if api.isCreate}}
+{{#if (not disabld)}}
+        <button type="submit" disabled={{or api.data.isPristine api.data.isInvalid api.disabled}}>Save</button>
+{{/if}}
+        <button type="reset" onclick={{action oncancel api.data}} disabled={{api.disabled}}>Cancel</button>
+    {{else}}
+{{#if (not disabld)}}
+        <button type="submit" disabled={{or api.data.isInvalid api.disabled}}>Save</button>
+{{/if}}
+        <button type="reset" onclick={{action oncancel api.data}} disabled={{api.disabled}}>Cancel</button>
+{{#if (not disabld)}}
+        <ConfirmationDialog @message="Are you sure you want to delete this key?">
+          <BlockSlot @name="action" as |confirm|>
+            <button data-test-delete type="button" class="type-delete" {{action confirm api.delete}} disabled={{api.disabled}}>Delete</button>
+          </BlockSlot>
+          <BlockSlot @name="dialog" as |execute cancel message|>
+            <DeleteConfirmation @message={{message}} @execute={{execute}} @cancel={{cancel}} />
+          </BlockSlot>
+        </ConfirmationDialog>
+    {{/if}}
+{{/if}}
+      </form>
 {{/let}}
     </BlockSlot>
 </DataForm>
diff --git a/ui/packages/consul-ui/app/components/consul/kv/form/index.js b/ui/packages/consul-ui/app/components/consul/kv/form/index.js
index c9348001f8578..baf628a6fa8a6 100644
--- a/ui/packages/consul-ui/app/components/consul/kv/form/index.js
+++ b/ui/packages/consul-ui/app/components/consul/kv/form/index.js
@@ -1,10 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
-import { set } from '@ember/object';
+import { get, set } from '@ember/object';
 import { inject as service } from '@ember/service';
 
 export default Component.extend({
@@ -31,7 +26,7 @@ export default Component.extend({
             set(item, 'Value', this.encoder.execute(target.value));
             break;
           case 'additional':
-            parent = this.parent;
+            parent = get(this, 'parent');
             set(item, 'Key', `${parent !== '/' ? parent : ''}${target.value}`);
             break;
           case 'json':
diff --git a/ui/packages/consul-ui/app/components/consul/kv/list/index.hbs b/ui/packages/consul-ui/app/components/consul/kv/list/index.hbs
index e12b7978b3926..2c78ac1916025 100644
--- a/ui/packages/consul-ui/app/components/consul/kv/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/kv/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <TabularCollection
   class="consul-kv-list"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/kv/list/pageobject.js b/ui/packages/consul-ui/app/components/consul/kv/list/pageobject.js
index 55d52a9114141..be5230e366ffb 100644
--- a/ui/packages/consul-ui/app/components/consul/kv/list/pageobject.js
+++ b/ui/packages/consul-ui/app/components/consul/kv/list/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (collection, clickable, attribute, deletable) => () => {
   return collection('.consul-kv-list [data-test-tabular-row]', {
     name: attribute('data-test-kv', '[data-test-kv]'),
diff --git a/ui/packages/consul-ui/app/components/consul/kv/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/kv/search-bar/index.hbs
index 343cb68f6e7c3..2c2409c132bd7 100644
--- a/ui/packages/consul-ui/app/components/consul/kv/search-bar/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/kv/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar
   class="consul-kv-search-bar"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/loader/index.hbs b/ui/packages/consul-ui/app/components/consul/loader/index.hbs
index 5902d6531d2e9..80b7b38189453 100644
--- a/ui/packages/consul-ui/app/components/consul/loader/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/loader/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="consul-loader"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/loader/index.scss b/ui/packages/consul-ui/app/components/consul/loader/index.scss
index 785f2e742c29f..7cb5f7a28e0df 100644
--- a/ui/packages/consul-ui/app/components/consul/loader/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/loader/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .consul-loader {
diff --git a/ui/packages/consul-ui/app/components/consul/loader/layout.scss b/ui/packages/consul-ui/app/components/consul/loader/layout.scss
index f1c01acf2e830..18d67699b24ed 100644
--- a/ui/packages/consul-ui/app/components/consul/loader/layout.scss
+++ b/ui/packages/consul-ui/app/components/consul/loader/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* blobs / %ui-loader ? */
 %loader {
   display: flex;
diff --git a/ui/packages/consul-ui/app/components/consul/loader/skin.scss b/ui/packages/consul-ui/app/components/consul/loader/skin.scss
index 0a06530fb7d90..a7a7f432201fb 100644
--- a/ui/packages/consul-ui/app/components/consul/loader/skin.scss
+++ b/ui/packages/consul-ui/app/components/consul/loader/skin.scss
@@ -1,10 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %loader circle {
-  fill: var(--token-color-consul-gradient-faint-stop);
+  fill: rgb(var(--tone-brand-100));
 }
 %loader circle {
   animation: loader-animation 1.5s infinite ease-in-out;
diff --git a/ui/packages/consul-ui/app/components/consul/metadata/list/index.hbs b/ui/packages/consul-ui/app/components/consul/metadata/list/index.hbs
index 8bcee62aea2e1..21cc09abf886a 100644
--- a/ui/packages/consul-ui/app/components/consul/metadata/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/metadata/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <TabularCollection
   data-test-metadata
   class="consul-metadata-list"
diff --git a/ui/packages/consul-ui/app/components/consul/metadata/list/index.js b/ui/packages/consul-ui/app/components/consul/metadata/list/index.js
index d99599ac30397..4798652642ba8 100644
--- a/ui/packages/consul-ui/app/components/consul/metadata/list/index.js
+++ b/ui/packages/consul-ui/app/components/consul/metadata/list/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/packages/consul-ui/app/components/consul/node-identity/template/index.hbs b/ui/packages/consul-ui/app/components/consul/node-identity/template/index.hbs
index 301559b31e4b9..41dbefe82e65b 100644
--- a/ui/packages/consul-ui/app/components/consul/node-identity/template/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/node-identity/template/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (can "use partitions")~}}
 partition "{{or @partition 'default'}}" {
   {{#if (can "use nspaces")}}
diff --git a/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.hbs b/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.hbs
index 53679b731f060..6ee6a31777c84 100644
--- a/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.hbs
@@ -1,25 +1,28 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if isVisible}}
-  <Hds::Alert @type="inline" class='mb-3 mt-2 agentless-node-notice' data-test-node-agentless-notice as |A|>
-    <A.Title>
-      <span>{{t 'routes.dc.nodes.index.agentless.notice.header'}}</span>
-      <Hds::Button
-        @color='secondary'
-        @text='Dismiss notice'
-        {{on 'click' this.dismissAgentlessNotice}}
-        @icon='x'
-        @size='small'
-        @isIconOnly={{true}}
-      />
-    </A.Title>
-    <A.Description>{{t 'routes.dc.nodes.index.agentless.notice.body'}}</A.Description>
-    <A.Link::Standalone @href='{{env "CONSUL_DOCS_DEVELOPER_URL"}}/connect/dataplane'
-                        @text={{t 'routes.dc.nodes.index.agentless.notice.footer'}}
-                        @icon='docs-link'
-                        @iconPosition='trailing' />
-  </Hds::Alert>
+  <Notice data-test-node-agentless-notice @type='info' class='agentless-node-notice' as |notice|>
+    <notice.Header>
+      <h3>
+        {{t 'routes.dc.nodes.index.agentless.notice.header'}}
+      </h3>
+      <button type='button' aria-label='Dismiss notice' {{on 'click' this.dismissAgentlessNotice}}>
+        <FlightIcon @name='x' />
+      </button>
+    </notice.Header>
+    <notice.Body>
+      <p>
+        {{t 'routes.dc.nodes.index.agentless.notice.body'}}
+      </p>
+    </notice.Body>
+    <notice.Footer>
+      <p class='docs-link'>
+        <a
+          href='{{env "CONSUL_DOCS_DEVELOPER_URL"}}/connect/dataplane'
+          target='_blank'
+          rel='noopener noreferrer'
+        >
+          {{t 'routes.dc.nodes.index.agentless.notice.footer'}}
+        </a>
+      </p>
+    </notice.Footer>
+  </Notice>
 {{/if}}
diff --git a/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.js b/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.js
index 927ccb1b365e4..7d0850812deda 100644
--- a/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.js
+++ b/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { storageFor } from '../../../../services/local-storage';
diff --git a/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.scss b/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.scss
index dad8702cc28d3..fc4b21ac93b01 100644
--- a/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/node/agentless-notice/index.scss
@@ -1,9 +1,4 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
-.agentless-node-notice .hds-alert__title {
+.agentless-node-notice header {
   display: flex;
   justify-content: space-between;
 }
diff --git a/ui/packages/consul-ui/app/components/consul/node/list/index.hbs b/ui/packages/consul-ui/app/components/consul/node/list/index.hbs
index 86ee73c2c6878..728104814aae1 100644
--- a/ui/packages/consul-ui/app/components/consul/node/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/node/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <ListCollection
   class="consul-node-list"
   @items={{@items}}
@@ -50,17 +45,5 @@ as |item index|>
         {{item.Address}}
       </dd>
     </dl>
-    <dl>
-      <dt>
-        <span>ConsulVersion</span>
-      </dt>
-      <dd>
-          {{!-- Displaying consul version from node meta data --}}
-          {{#if item.Meta.consul-version}}
-            <FlightIcon class='w-4 h-4' @size='24' @name='consul-color' @stretched={{true}} />
-            <span>v{{item.Meta.consul-version}}</span>
-          {{/if}}
-      </dd>
-    </dl>
   </BlockSlot>
 </ListCollection>
diff --git a/ui/packages/consul-ui/app/components/consul/node/peer-info/index.hbs b/ui/packages/consul-ui/app/components/consul/node/peer-info/index.hbs
index 735f4e37a1449..7203142095ea7 100644
--- a/ui/packages/consul-ui/app/components/consul/node/peer-info/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/node/peer-info/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if @item.PeerName}}
   <span class="consul-node-peer-info">
     <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" {{tooltip "Peer" }}>
diff --git a/ui/packages/consul-ui/app/components/consul/node/peer-info/index.scss b/ui/packages/consul-ui/app/components/consul/node/peer-info/index.scss
index 8175ded101c62..b272a20307a2a 100644
--- a/ui/packages/consul-ui/app/components/consul/node/peer-info/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/node/peer-info/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-node-peer-info {
   display: flex;
   align-items: center;
diff --git a/ui/packages/consul-ui/app/components/consul/node/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/node/search-bar/index.hbs
index d7bdde58a5932..bc9669a9f8182 100644
--- a/ui/packages/consul-ui/app/components/consul/node/search-bar/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/node/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar
   class="consul-node-search-bar"
   ...attributes
@@ -19,14 +14,12 @@
       )
   )
 
-  (if search.status.value 
-    search.status.value 
-    (t (concat "components.consul.node.search-bar." search.status.value)
-        default=(array
-          (concat "common.search." search.status.value)
-          (concat "common.consul." search.status.value)
-          (concat "common.brand." search.status.value)
-        ))
+  (t (concat "components.consul.node.search-bar." search.status.value)
+      default=(array
+        (concat "common.search." search.status.value)
+        (concat "common.consul." search.status.value)
+        (concat "common.brand." search.status.value)
+      )
   )
 
 as |key value|}}
@@ -97,27 +90,6 @@ as |key value|}}
   {{/let}}
         </BlockSlot>
       </search.Select>
-      <search.Select
-        class="type-version"
-        @position="left"
-        @onchange={{action @filter.version.change}}
-        @multiple={{true}}
-      as |components|>
-        <BlockSlot @name="selected">
-          <span>
-            {{t "common.consul.version"}}
-          </span>
-        </BlockSlot>
-        <BlockSlot @name="options">
-        {{#let components.Optgroup components.Option as |Optgroup Option|}}
-        {{#each @versions as |version|}}
-          <Option @value={{version}} @selected={{includes version @filter.version.value}}>
-            {{concat version ".x" }}
-          </Option>
-        {{/each}}
-        {{/let}}
-        </BlockSlot>
-      </search.Select>
     </:filter>
     <:sort as |search|>
       <search.Select
@@ -135,8 +107,6 @@ as |key value|}}
                   (array "Node:desc" (t "common.sort.alpha.desc"))
                   (array "Status:asc" (t "common.sort.status.asc"))
                   (array "Status:desc" (t "common.sort.status.desc"))
-                  (array "Version:asc" (t "common.sort.version.asc"))
-                  (array "Version:desc" (t "common.sort.version.desc"))
                 ))
               as |selectable|
             }}
@@ -154,10 +124,6 @@ as |key value|}}
             <Option @value="Node:asc" @selected={{eq "Node:asc" @sort.value}}>{{t "common.sort.alpha.asc"}}</Option>
             <Option @value="Node:desc" @selected={{eq "Node:desc" @sort.value}}>{{t "common.sort.alpha.desc"}}</Option>
           </Optgroup>
-          <Optgroup @label={{t "common.consul.version"}}>
-            <Option @value="Version:asc" @selected={{eq "Version:asc" @sort.value}}>{{t "common.sort.version.asc"}}</Option>
-            <Option @value="Version:desc" @selected={{eq "Version:desc" @sort.value}}>{{t "common.sort.version.desc"}}</Option>
-          </Optgroup>
   {{/let}}
         </BlockSlot>
       </search.Select>
diff --git a/ui/packages/consul-ui/app/components/consul/peer/info/index.hbs b/ui/packages/consul-ui/app/components/consul/peer/info/index.hbs
index a84d698cf1abf..25fbb2180ba13 100644
--- a/ui/packages/consul-ui/app/components/consul/peer/info/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/peer/info/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if @item.PeerName}}
   <div class="consul-peer-info" data-test-peer-info>
 
diff --git a/ui/packages/consul-ui/app/components/consul/peer/info/index.scss b/ui/packages/consul-ui/app/components/consul/peer/info/index.scss
index a33e37bebafbc..a9d57b1635ade 100644
--- a/ui/packages/consul-ui/app/components/consul/peer/info/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/peer/info/index.scss
@@ -1,11 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-peer-info {
-  background: var(--token-color-surface-faint);
-  color: var(--token-color-foreground-faint);
+  background: rgb(var(--gray-100));
+  color: rgb(var(--gray-600));
   padding: 0px 8px;
   border-radius: 2px;
 
diff --git a/ui/packages/consul-ui/app/components/consul/peer/list/index.scss b/ui/packages/consul-ui/app/components/consul/peer/list/index.scss
index ed2d9ffb0194f..a20a2cbcdd811 100644
--- a/ui/packages/consul-ui/app/components/consul/peer/list/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/peer/list/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .peers__list__peer-detail {
   display: flex;
   align-content: center;
diff --git a/ui/packages/consul-ui/app/components/consul/policy/list/index.hbs b/ui/packages/consul-ui/app/components/consul/policy/list/index.hbs
index 3b98501aa2ee2..a518a84e3eb2d 100644
--- a/ui/packages/consul-ui/app/components/consul/policy/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/policy/list/index.hbs
@@ -1,26 +1,15 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <ListCollection
   class="consul-policy-list"
   @items={{@items}}
 as |item|>
     <BlockSlot @name="header">
-{{#if (or (eq (policy/typeof item) 'policy-management') (eq (policy/typeof item) 'read-only'))}}
+{{#if (eq (policy/typeof item) 'policy-management')}}
         <dl class="policy-management">
           <dt>Type</dt>
           <dd>
-            {{#if (eq (policy/typeof item) 'policy-management')}}
-              <Tooltip>
-                Global Management Policy
-              </Tooltip>
-            {{else}}
-              <Tooltip>
-                Global Read-only Policy
-              </Tooltip>
-            {{/if}}
+            <Tooltip>
+              Global Management Policy
+            </Tooltip>
           </dd>
         </dl>
 {{/if}}
diff --git a/ui/packages/consul-ui/app/components/consul/policy/list/pageobject.js b/ui/packages/consul-ui/app/components/consul/policy/list/pageobject.js
index eaaed90a14bac..fa3c0a9a1f517 100644
--- a/ui/packages/consul-ui/app/components/consul/policy/list/pageobject.js
+++ b/ui/packages/consul-ui/app/components/consul/policy/list/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (collection, clickable, attribute, text, actions) => () => {
   return collection('.consul-policy-list [data-test-list-row]', {
     name: attribute('data-test-policy', '[data-test-policy]'),
diff --git a/ui/packages/consul-ui/app/components/consul/policy/notifications/index.hbs b/ui/packages/consul-ui/app/components/consul/policy/notifications/index.hbs
index 89b4bc14b2969..308096c94cb54 100644
--- a/ui/packages/consul-ui/app/components/consul/policy/notifications/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/policy/notifications/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (eq @type 'create')}}
   {{#if (eq @status 'success') }}
     Your policy has been added.
diff --git a/ui/packages/consul-ui/app/components/consul/policy/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/policy/search-bar/index.hbs
index 0563e1f1d237c..a10d6a245dea0 100644
--- a/ui/packages/consul-ui/app/components/consul/policy/search-bar/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/policy/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar
   class="consul-policy-search-bar"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/policy/search-bar/index.js b/ui/packages/consul-ui/app/components/consul/policy/search-bar/index.js
index 6cbf4d52f6bd8..2d96508a2cf51 100644
--- a/ui/packages/consul-ui/app/components/consul/policy/search-bar/index.js
+++ b/ui/packages/consul-ui/app/components/consul/policy/search-bar/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 
 export default class ConsulPolicySearchBarComponent extends Component {}
diff --git a/ui/packages/consul-ui/app/components/consul/role/list/index.hbs b/ui/packages/consul-ui/app/components/consul/role/list/index.hbs
index 5f0474ae40429..9c8254f682ba3 100644
--- a/ui/packages/consul-ui/app/components/consul/role/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/role/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <ListCollection
   class="consul-role-list"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/role/list/pageobject.js b/ui/packages/consul-ui/app/components/consul/role/list/pageobject.js
index f858d1117c724..95dc939ea3f78 100644
--- a/ui/packages/consul-ui/app/components/consul/role/list/pageobject.js
+++ b/ui/packages/consul-ui/app/components/consul/role/list/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (collection, clickable, attribute, text, actions) => () => {
   return collection('.consul-role-list [data-test-list-row]', {
     role: clickable('a'),
diff --git a/ui/packages/consul-ui/app/components/consul/role/notifications/index.hbs b/ui/packages/consul-ui/app/components/consul/role/notifications/index.hbs
index 8335a50b4f40d..1f2ad9ba7522d 100644
--- a/ui/packages/consul-ui/app/components/consul/role/notifications/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/role/notifications/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (eq @type 'create')}}
   {{#if (eq @status 'success') }}
     Your role has been added.
diff --git a/ui/packages/consul-ui/app/components/consul/role/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/role/search-bar/index.hbs
index e58979f54ca5d..e22a8a518f3c1 100644
--- a/ui/packages/consul-ui/app/components/consul/role/search-bar/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/role/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar
   class="consul-role-search-bar"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/server/card/index.hbs b/ui/packages/consul-ui/app/components/consul/server/card/index.hbs
index f3d3254c40a5a..409d5ed1784c8 100644
--- a/ui/packages/consul-ui/app/components/consul/server/card/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/server/card/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class={{class-map
     'consul-server-card'
diff --git a/ui/packages/consul-ui/app/components/consul/server/card/index.scss b/ui/packages/consul-ui/app/components/consul/server/card/index.scss
index 8498e4ce5866f..284860e7010e9 100644
--- a/ui/packages/consul-ui/app/components/consul/server/card/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/server/card/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .consul-server-card {
diff --git a/ui/packages/consul-ui/app/components/consul/server/card/layout.scss b/ui/packages/consul-ui/app/components/consul/server/card/layout.scss
index 5492c8ffe703e..a1c679bd4b1e3 100644
--- a/ui/packages/consul-ui/app/components/consul/server/card/layout.scss
+++ b/ui/packages/consul-ui/app/components/consul/server/card/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %consul-server-card {
   position: relative;
   overflow: hidden;
diff --git a/ui/packages/consul-ui/app/components/consul/server/card/skin.scss b/ui/packages/consul-ui/app/components/consul/server/card/skin.scss
index 5b849fdcf2ced..1478ac3facec0 100644
--- a/ui/packages/consul-ui/app/components/consul/server/card/skin.scss
+++ b/ui/packages/consul-ui/app/components/consul/server/card/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %consul-server-card dt:not(.name) {
   @extend %visually-hidden;
 }
@@ -10,25 +5,25 @@
   @extend %with-leader-tile;
 }
 %consul-server-card .name + dd {
-  @extend %display-200-semibold;
-  color: var(--token-color-hashicorp-brand);
+  @extend %h300;
+  color: rgb(var(--tone-gray-999));
   animation-name: typo-truncate;
 }
 %consul-server-card .health-status + dd {
   @extend %pill-200;
-  @extend %body-100-regular;
+  font-size: var(--typo-size-700);
 }
 %consul-server-card.voting-status-non-voter .health-status + dd {
-  background-color: var(--token-color-surface-strong);
-  color: var(--token-color-foreground-faint);
+  background-color: rgb(var(--tone-gray-100));
+  color: rgb(var(--tone-gray-600));
 }
 %consul-server-card:not(.voting-status-non-voter) .health-status.healthy + dd {
-  background-color: var(--token-color-surface-success);
-  color: var(--token-color-palette-green-400);
+  background-color: rgb(var(--tone-green-050));
+  color: rgb(var(--tone-green-800));
 }
 %consul-server-card:not(.voting-status-non-voter) .health-status:not(.healthy) + dd {
-  background-color: var(--token-color-surface-critical);
-  color: var(--token-color-foreground-critical);
+  background-color: rgb(var(--tone-red-050));
+  color: rgb(var(--tone-red-500));
 }
 %consul-server-card .health-status + dd::before {
   --icon-size: icon-000;
@@ -36,7 +31,10 @@
 }
 %consul-server-card .health-status.healthy + dd::before {
   --icon-name: icon-check;
+  --icon-color: rgb(var(--tone-green-800));
 }
 %consul-server-card .health-status:not(.healthy) + dd::before {
   --icon-name: icon-x;
+  --icon-color: rgb(var(--tone-red-500));
 }
+
diff --git a/ui/packages/consul-ui/app/components/consul/server/list/index.hbs b/ui/packages/consul-ui/app/components/consul/server/list/index.hbs
index 34d9287451de9..2144fdd9f1e66 100644
--- a/ui/packages/consul-ui/app/components/consul/server/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/server/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class={{class-map
     'consul-server-list'
diff --git a/ui/packages/consul-ui/app/components/consul/server/list/index.scss b/ui/packages/consul-ui/app/components/consul/server/list/index.scss
index dc193ee0312e2..0ec7a33ec4c2e 100644
--- a/ui/packages/consul-ui/app/components/consul/server/list/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/server/list/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %consul-server-list ul {
   display: grid;
   grid-template-columns: repeat(4, minmax(215px, 25%));
@@ -14,6 +9,6 @@
 }
 
 %consul-server-list a:hover div {
-  box-shadow: var(--token-elevation-overlay-box-shadow);
-  --tone-border: var(--token-color-foreground-faint);
+  box-shadow: var(--decor-elevation-800);
+  --tone-border: var(--tone-gray-500);
 }
diff --git a/ui/packages/consul-ui/app/components/consul/service-identity/template/index.hbs b/ui/packages/consul-ui/app/components/consul/service-identity/template/index.hbs
index b822316bd5989..2c1de515c8e9f 100644
--- a/ui/packages/consul-ui/app/components/consul/service-identity/template/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/service-identity/template/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (can "use partitions")}}
 partition "{{or @partition 'default'}}" {
   {{#if (can 'use nspaces')}}
diff --git a/ui/packages/consul-ui/app/components/consul/service-instance/list/index.hbs b/ui/packages/consul-ui/app/components/consul/service-instance/list/index.hbs
index e341dcf29edf0..a4e3694a5ec70 100644
--- a/ui/packages/consul-ui/app/components/consul/service-instance/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/service-instance/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#let
 
   (to-hash @proxies "Service.Proxy.DestinationServiceID")
diff --git a/ui/packages/consul-ui/app/components/consul/service-instance/list/index.js b/ui/packages/consul-ui/app/components/consul/service-instance/list/index.js
index 08faa68ebe89a..301db92f8e469 100644
--- a/ui/packages/consul-ui/app/components/consul/service-instance/list/index.js
+++ b/ui/packages/consul-ui/app/components/consul/service-instance/list/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 
 export default class ServiceInstanceList extends Component {
diff --git a/ui/packages/consul-ui/app/components/consul/service-instance/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/service-instance/search-bar/index.hbs
index c01b478f19f66..919926b04f3d9 100644
--- a/ui/packages/consul-ui/app/components/consul/service-instance/search-bar/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/service-instance/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar class='consul-service-instance-search-bar' ...attributes @filter={{@filter}}>
   <:status as |search|>
 
diff --git a/ui/packages/consul-ui/app/components/consul/service/list/index.hbs b/ui/packages/consul-ui/app/components/consul/service/list/index.hbs
index 2dc1b4742b042..7991a1124303d 100644
--- a/ui/packages/consul-ui/app/components/consul/service/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/service/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <ListCollection
   class='consul-service-list'
   ...attributes
@@ -91,4 +86,4 @@
     {{/if}}
     <TagList @item={{item}} />
   </BlockSlot>
-</ListCollection>
+</ListCollection>
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/consul/service/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/service/search-bar/index.hbs
index 339d0264b29d1..bda5097c9c2b2 100644
--- a/ui/packages/consul-ui/app/components/consul/service/search-bar/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/service/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar class='consul-service-search-bar' ...attributes @filter={{@filter}}>
   <:status as |search|>
 
diff --git a/ui/packages/consul-ui/app/components/consul/service/search-bar/index.js b/ui/packages/consul-ui/app/components/consul/service/search-bar/index.js
index 56ba4a02eb214..d4747b1855a2b 100644
--- a/ui/packages/consul-ui/app/components/consul/service/search-bar/index.js
+++ b/ui/packages/consul-ui/app/components/consul/service/search-bar/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 
 export default class ConsulServiceSearchBar extends Component {
diff --git a/ui/packages/consul-ui/app/components/consul/source/index.hbs b/ui/packages/consul-ui/app/components/consul/source/index.hbs
index 64598149dbd7d..3e237b5c5cb93 100644
--- a/ui/packages/consul-ui/app/components/consul/source/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/source/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <dl class="tooltip-panel">
   <dt>
     <span data-test-consul-source class="consul-source">
diff --git a/ui/packages/consul-ui/app/components/consul/source/index.scss b/ui/packages/consul-ui/app/components/consul/source/index.scss
index 87d5e9b0dd9f6..1ae170ae62726 100644
--- a/ui/packages/consul-ui/app/components/consul/source/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/source/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .consul-source {
-  @extend %pill-200, %frame-gray-600, %body-200-regular;
+  @extend %pill-200, %frame-gray-600, %p1;
 }
diff --git a/ui/packages/consul-ui/app/components/consul/sources-select/index.hbs b/ui/packages/consul-ui/app/components/consul/sources-select/index.hbs
index 7ee4aa9261a94..8109ef18e015d 100644
--- a/ui/packages/consul-ui/app/components/consul/sources-select/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/sources-select/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (gt @sources.length 0)}}
   <BlockSlot @name='selected'>
     <span>
diff --git a/ui/packages/consul-ui/app/components/consul/token/list/index.hbs b/ui/packages/consul-ui/app/components/consul/token/list/index.hbs
index fc370bb32c605..e7b71e4bb8065 100644
--- a/ui/packages/consul-ui/app/components/consul/token/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/token/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <ListCollection
   class="consul-token-list"
   @items={{@items}}
diff --git a/ui/packages/consul-ui/app/components/consul/token/list/pageobject.js b/ui/packages/consul-ui/app/components/consul/token/list/pageobject.js
index f6fd0a2b213d5..1068f135d3ee7 100644
--- a/ui/packages/consul-ui/app/components/consul/token/list/pageobject.js
+++ b/ui/packages/consul-ui/app/components/consul/token/list/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (collection, clickable, attribute, text, actions) => () => {
   return collection('.consul-token-list [data-test-list-row]', {
     id: attribute('data-test-token', '[data-test-token]'),
diff --git a/ui/packages/consul-ui/app/components/consul/token/notifications/index.hbs b/ui/packages/consul-ui/app/components/consul/token/notifications/index.hbs
index 2f90f6f66025d..521f5ac367770 100644
--- a/ui/packages/consul-ui/app/components/consul/token/notifications/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/token/notifications/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (eq @type 'create')}}
   {{#if (eq @status 'success') }}
     The token has been added.
diff --git a/ui/packages/consul-ui/app/components/consul/token/ruleset/list/index.hbs b/ui/packages/consul-ui/app/components/consul/token/ruleset/list/index.hbs
index 1015510202511..29ab49b9b492f 100644
--- a/ui/packages/consul-ui/app/components/consul/token/ruleset/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/token/ruleset/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#let (policy/group (or item.Policies item.ACLs.PolicyDefaults (array))) as |policies|}}
   {{#let (get policies 'management') as |management|}}
     {{#if (gt management.length 0)}}
diff --git a/ui/packages/consul-ui/app/components/consul/token/ruleset/list/index.js b/ui/packages/consul-ui/app/components/consul/token/ruleset/list/index.js
index d99599ac30397..4798652642ba8 100644
--- a/ui/packages/consul-ui/app/components/consul/token/ruleset/list/index.js
+++ b/ui/packages/consul-ui/app/components/consul/token/ruleset/list/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/packages/consul-ui/app/components/consul/token/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/token/search-bar/index.hbs
index a55ba4ce69244..633908b660f97 100644
--- a/ui/packages/consul-ui/app/components/consul/token/search-bar/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/token/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar
   class="consul-token-search-bar"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/tomography/graph/index.hbs b/ui/packages/consul-ui/app/components/consul/tomography/graph/index.hbs
index e3876ca4bf028..7856c759f2e05 100644
--- a/ui/packages/consul-ui/app/components/consul/tomography/graph/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/tomography/graph/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="tomography-graph"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/tomography/graph/index.js b/ui/packages/consul-ui/app/components/consul/tomography/graph/index.js
index 598effd0980d6..852a42ecc31e9 100644
--- a/ui/packages/consul-ui/app/components/consul/tomography/graph/index.js
+++ b/ui/packages/consul-ui/app/components/consul/tomography/graph/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 
diff --git a/ui/packages/consul-ui/app/components/consul/tomography/graph/index.scss b/ui/packages/consul-ui/app/components/consul/tomography/graph/index.scss
index e4bb90d77b24c..2cb3745197686 100644
--- a/ui/packages/consul-ui/app/components/consul/tomography/graph/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/tomography/graph/index.scss
@@ -1,40 +1,36 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .tomography-graph {
   .background {
-    fill: var(--token-color-surface-strong);
+    fill: rgb(var(--tone-gray-050));
   }
   .axis {
     fill: none;
-    stroke: var(--token-color-palette-neutral-300);
+    stroke: rgb(var(--tone-gray-300));
     stroke-dasharray: 4 4;
   }
   .border {
     fill: none;
-    stroke: var(--token-color-palette-neutral-300);
+    stroke: rgb(var(--tone-gray-300));
   }
   .point {
-    stroke: var(--token-color-foreground-disabled);
-    fill: var(--token-color-consul-foreground);
+    stroke: rgb(var(--tone-gray-400));
+    fill: rgb(var(--tone-magenta-600));
   }
   .lines rect {
-    fill: var(--token-color-consul-foreground);
+    fill: rgb(var(--tone-magenta-600));
     stroke: transparent;
     stroke-width: 5px;
   }
   .lines rect:hover {
-    fill: var(--token-color-palette-neutral-300);
+    fill: rgb(var(--tone-gray-300));
     height: 3px;
     y: -1px;
   }
   .tick line {
-    stroke: var(--token-color-palette-neutral-300);
+    stroke: rgb(var(--tone-gray-300));
   }
   .tick text {
+    font-size: var(--typo-size-600);
     text-anchor: start;
-    color: var(--token-color-foreground-strong);
+    color: rgb(var(--tone-gray-900));
   }
 }
diff --git a/ui/packages/consul-ui/app/components/consul/transparent-proxy/index.hbs b/ui/packages/consul-ui/app/components/consul/transparent-proxy/index.hbs
index 0f92bfe49436b..0475d964fb168 100644
--- a/ui/packages/consul-ui/app/components/consul/transparent-proxy/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/transparent-proxy/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <span class="consul-transparent-proxy">
   {{t "components.consul.transparent-proxy"}}
 </span>
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.hbs b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.hbs
index cfc61a00d3629..1894bba9ee73c 100644
--- a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="consul-upstream-instance-list"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.scss b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.scss
index b904dddd05b16..714740b6b11e2 100644
--- a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %consul-upstream-instance-list {
   li {
     @extend %composite-row;
@@ -26,7 +21,7 @@
   dl.local-bind-socket-mode dt {
     @extend %horizontal-kv-list-visible-title;
     text-transform: lowercase;
-    font-weight: var(--token-typography-font-weight-semibold);
+    font-weight: var(--typo-weight-semibold);
   }
 }
 .consul-upstream-instance-list {
diff --git a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/pageobject.js b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/pageobject.js
index 274ffda5b5879..b233a60c28f2e 100644
--- a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/pageobject.js
+++ b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (collection, text) =>
   (scope = '.consul-upstream-instance-list') => {
     return {
diff --git a/ui/packages/consul-ui/app/components/consul/upstream-instance/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/upstream-instance/search-bar/index.hbs
index e16b89f81028d..037744a4f6fb6 100644
--- a/ui/packages/consul-ui/app/components/consul/upstream-instance/search-bar/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/upstream-instance/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar
   class="consul-upstream-instance-search-bar"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/upstream/list/index.hbs b/ui/packages/consul-ui/app/components/consul/upstream/list/index.hbs
index fd9e20422ea45..caa2c5ac02dc8 100644
--- a/ui/packages/consul-ui/app/components/consul/upstream/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/upstream/list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <ListCollection
   class="consul-upstream-list"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/consul/upstream/list/index.scss b/ui/packages/consul-ui/app/components/consul/upstream/list/index.scss
index 8a0aafdf99203..31a4e6c3dbfa6 100644
--- a/ui/packages/consul-ui/app/components/consul/upstream/list/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/upstream/list/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %consul-upstream-list {
   dl.partition dt::before {
     @extend %with-user-team-mask, %as-pseudo;
diff --git a/ui/packages/consul-ui/app/components/consul/upstream/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/upstream/search-bar/index.hbs
index 5600efc17264d..05f57a7a721a4 100644
--- a/ui/packages/consul-ui/app/components/consul/upstream/search-bar/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/upstream/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <SearchBar
   class="consul-upstream-search-bar"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/copy-button/chart.xstate.js b/ui/packages/consul-ui/app/components/copy-button/chart.xstate.js
index 2c7e1ecf54eea..2d8d9c594434b 100644
--- a/ui/packages/consul-ui/app/components/copy-button/chart.xstate.js
+++ b/ui/packages/consul-ui/app/components/copy-button/chart.xstate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   id: 'copy-button',
   initial: 'idle',
diff --git a/ui/packages/consul-ui/app/components/copy-button/index.hbs b/ui/packages/consul-ui/app/components/copy-button/index.hbs
index ed3b42388cd35..160e2582c177b 100644
--- a/ui/packages/consul-ui/app/components/copy-button/index.hbs
+++ b/ui/packages/consul-ui/app/components/copy-button/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <StateChart
   @src={{this.chart}}
   as |State Guard Action dispatch state|
diff --git a/ui/packages/consul-ui/app/components/copy-button/index.js b/ui/packages/consul-ui/app/components/copy-button/index.js
index b2663c87fbe3c..d10761917866d 100644
--- a/ui/packages/consul-ui/app/components/copy-button/index.js
+++ b/ui/packages/consul-ui/app/components/copy-button/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import chart from './chart.xstate';
 
diff --git a/ui/packages/consul-ui/app/components/copy-button/index.scss b/ui/packages/consul-ui/app/components/copy-button/index.scss
index f5488aae03126..1971e4ee3e54f 100644
--- a/ui/packages/consul-ui/app/components/copy-button/index.scss
+++ b/ui/packages/consul-ui/app/components/copy-button/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 %copy-button {
diff --git a/ui/packages/consul-ui/app/components/copy-button/layout.scss b/ui/packages/consul-ui/app/components/copy-button/layout.scss
index 310794271d0d0..b2b2c9ee6b8cb 100644
--- a/ui/packages/consul-ui/app/components/copy-button/layout.scss
+++ b/ui/packages/consul-ui/app/components/copy-button/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %copy-button {
   min-height: 17px;
 }
diff --git a/ui/packages/consul-ui/app/components/copy-button/skin.scss b/ui/packages/consul-ui/app/components/copy-button/skin.scss
index ff04a0dbd80a3..89988852c3b7a 100644
--- a/ui/packages/consul-ui/app/components/copy-button/skin.scss
+++ b/ui/packages/consul-ui/app/components/copy-button/skin.scss
@@ -1,27 +1,22 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %copy-button {
-  color: var(--token-color-foreground-action);
-  --icon-color: transparent;
+  color: rgb(var(--tone-blue-500));
+  --icon-color: var(--transparent);
 }
 %copy-button::before {
   @extend %with-copy-action-mask, %as-pseudo;
-  --icon-color: var(--token-color-foreground-faint);
+  --icon-color: rgb(var(--tone-gray-500));
 }
 %copy-button::after {
-  --icon-color: var(--token-color-surface-strong);
+  --icon-color: rgb(var(--tone-gray-050));
 }
 %copy-button:hover:not(:disabled):not(:active),
 %copy-button:focus {
-  color: var(--token-color-foreground-action);
-  --icon-color: var(--token-color-surface-strong);
+  color: rgb(var(--tone-blue-500));
+  --icon-color: rgb(var(--tone-gray-050));
 }
 %copy-button:hover::before {
-  --icon-color: var(--token-color-foreground-action);
+  --icon-color: rgb(var(--tone-blue-500));
 }
 %copy-button:active {
-  --icon-color: var(--token-color-surface-interactive-active);
+  --icon-color: rgb(var(--tone-gray-200));
 }
diff --git a/ui/packages/consul-ui/app/components/copyable-code/index.hbs b/ui/packages/consul-ui/app/components/copyable-code/index.hbs
index 35560c5bc44c5..00ae9ea8c0d5e 100644
--- a/ui/packages/consul-ui/app/components/copyable-code/index.hbs
+++ b/ui/packages/consul-ui/app/components/copyable-code/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class={{class-map
     'copyable-code'
diff --git a/ui/packages/consul-ui/app/components/copyable-code/index.scss b/ui/packages/consul-ui/app/components/copyable-code/index.scss
index c77ab76ff019b..7fcf82119378c 100644
--- a/ui/packages/consul-ui/app/components/copyable-code/index.scss
+++ b/ui/packages/consul-ui/app/components/copyable-code/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .copyable-code {
   & {
     display: flex;
@@ -13,7 +8,7 @@
     padding-bottom: 3px;
 
     border: var(--decor-border-100);
-    border-color: var(--token-color-surface-interactive-active);
+    border-color: rgb(var(--tone-gray-200));
     border-radius: var(--decor-radius-200);
   }
   &.obfuscated {
@@ -27,7 +22,7 @@
     height: 100%;
     display: block;
     content: '';
-    background-color: var(--token-color-surface-strong);
+    background-color: rgb(var(--tone-gray-050));
   }
   .copy-button {
     position: absolute;
@@ -50,12 +45,12 @@
   button[aria-expanded]::before {
     content: '';
     --icon-size: icon-000;
-    --icon-color: var(--token-color-foreground-faint);
+    --icon-color: rgb(var(--tone-gray-500));
   }
-  button[aria-expanded='true']::before {
+  button[aria-expanded=true]::before {
     --icon-name: icon-eye-off;
   }
-  button[aria-expanded='false']::before {
+  button[aria-expanded=false]::before {
     --icon-name: icon-eye;
   }
   pre {
@@ -72,7 +67,7 @@
     margin: 0;
     margin-top: 8px;
     margin-bottom: 13px;
-    border: 3px dashed var(--token-color-palette-neutral-300);
-    background-color: var(--token-color-surface-primary);
+    border: 3px dashed rgb(var(--tone-gray-300));
+    background-color: rgb(var(--tone-gray-000));
   }
 }
diff --git a/ui/packages/consul-ui/app/components/csv-list/debug.scss b/ui/packages/consul-ui/app/components/csv-list/debug.scss
index 1dbb566db9831..eea7038e19120 100644
--- a/ui/packages/consul-ui/app/components/csv-list/debug.scss
+++ b/ui/packages/consul-ui/app/components/csv-list/debug.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 [id^=docfy-demo-preview-csv-list] {
   p, ul {
     @extend %csv-list;
diff --git a/ui/packages/consul-ui/app/components/csv-list/index.scss b/ui/packages/consul-ui/app/components/csv-list/index.scss
index 7d9d2b0ef67aa..4c64a7c876b69 100644
--- a/ui/packages/consul-ui/app/components/csv-list/index.scss
+++ b/ui/packages/consul-ui/app/components/csv-list/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --csv-list-separator: ',';
 }
diff --git a/ui/packages/consul-ui/app/components/data-collection/index.hbs b/ui/packages/consul-ui/app/components/data-collection/index.hbs
index 3c301a49f7f5a..021d36badf370 100644
--- a/ui/packages/consul-ui/app/components/data-collection/index.hbs
+++ b/ui/packages/consul-ui/app/components/data-collection/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{did-update (action (fn (set this 'term') '') @search)}}
 {{yield (hash
   search=(action this.search)
diff --git a/ui/packages/consul-ui/app/components/data-collection/index.js b/ui/packages/consul-ui/app/components/data-collection/index.js
index 152454dffe2d0..cff4bfba9dd92 100644
--- a/ui/packages/consul-ui/app/components/data-collection/index.js
+++ b/ui/packages/consul-ui/app/components/data-collection/index.js
@@ -1,13 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
-import { computed, get, action, defineProperty } from '@ember/object';
-import { alias, sort } from '@ember/object/computed';
+import { computed, get, action } from '@ember/object';
+import { alias } from '@ember/object/computed';
 import { tracked } from '@glimmer/tracking';
+import { sort } from '@ember/object/computed';
+import { defineProperty } from '@ember/object';
 
 export default class DataCollectionComponent extends Component {
   @service('filter') filter;
diff --git a/ui/packages/consul-ui/app/components/data-form/index.hbs b/ui/packages/consul-ui/app/components/data-form/index.hbs
index 7545b2f602caf..c43fc47076f1f 100644
--- a/ui/packages/consul-ui/app/components/data-form/index.hbs
+++ b/ui/packages/consul-ui/app/components/data-form/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <DataLoader
   @items={{item}}
   @src={{uri
diff --git a/ui/packages/consul-ui/app/components/data-form/index.js b/ui/packages/consul-ui/app/components/data-form/index.js
index 191cd1f1919e7..1f6dae1fdfb92 100644
--- a/ui/packages/consul-ui/app/components/data-form/index.js
+++ b/ui/packages/consul-ui/app/components/data-form/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import { set, get } from '@ember/object';
@@ -37,6 +32,12 @@ export default Component.extend(Slotted, {
     this._super(...arguments);
     set(this, 'hasError', this._isRegistered('error'));
   },
+  willDestroyElement: function () {
+    this._super(...arguments);
+    if (get(this, 'data.isNew')) {
+      this.data.rollbackAttributes();
+    }
+  },
   actions: {
     setData: function (data) {
       let changeset = data;
diff --git a/ui/packages/consul-ui/app/components/data-loader/chart.xstate.js b/ui/packages/consul-ui/app/components/data-loader/chart.xstate.js
index ec31f731bfced..94cc961316473 100644
--- a/ui/packages/consul-ui/app/components/data-loader/chart.xstate.js
+++ b/ui/packages/consul-ui/app/components/data-loader/chart.xstate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   id: 'data-loader',
   initial: 'load',
diff --git a/ui/packages/consul-ui/app/components/data-loader/index.hbs b/ui/packages/consul-ui/app/components/data-loader/index.hbs
index 7a894117b94f4..6be3fd61c6aac 100644
--- a/ui/packages/consul-ui/app/components/data-loader/index.hbs
+++ b/ui/packages/consul-ui/app/components/data-loader/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
 <StateChart @src={{chart}} as |State Guard Action dispatch state|>
   <Ref @target={{this}} @name="dispatch" @value={{dispatch}} />
@@ -61,13 +56,22 @@
         {{#yield-slot name="disconnected" params=(block-params (action dispatch "RESET"))}}
             {{yield api}}
         {{else}}
-          <Hds::Toast @color='warning'
+          <Notice
             {{notification
               sticky=true
-            }} as |T|>
-            <T.Title>Warning!</T.Title>
-            <T.Description>An error was returned whilst loading this data, refresh to try again.</T.Description>
-          </Hds::Toast>
+            }}
+            class="notification-update"
+            @type="warning"
+          as |notice|>
+            <notice.Header>
+              <strong>Warning!</strong>
+            </notice.Header>
+            <notice.Body>
+              <p>
+                An error was returned whilst loading this data, refresh to try again.
+              </p>
+            </notice.Body>
+          </Notice>
         {{/yield-slot}}
       {{/if}}
     </State>
diff --git a/ui/packages/consul-ui/app/components/data-loader/index.js b/ui/packages/consul-ui/app/components/data-loader/index.js
index 9db0f6cff31a6..16fc091db1261 100644
--- a/ui/packages/consul-ui/app/components/data-loader/index.js
+++ b/ui/packages/consul-ui/app/components/data-loader/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { set } from '@ember/object';
 import Slotted from 'block-slots';
@@ -18,7 +13,7 @@ export default Component.extend(Slotted, {
   didReceiveAttrs: function () {
     this._super(...arguments);
     if (typeof this.items !== 'undefined') {
-      this.send('change', this.items);
+      this.actions.change.apply(this, [this.items]);
     }
   },
   didInsertElement: function () {
diff --git a/ui/packages/consul-ui/app/components/data-sink/index.hbs b/ui/packages/consul-ui/app/components/data-sink/index.hbs
index 2517542ff9b56..a809747a7c5c9 100644
--- a/ui/packages/consul-ui/app/components/data-sink/index.hbs
+++ b/ui/packages/consul-ui/app/components/data-sink/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield (hash
   open=(action 'open')
   state=state
diff --git a/ui/packages/consul-ui/app/components/data-sink/index.js b/ui/packages/consul-ui/app/components/data-sink/index.js
index 5bc54e0e160fe..4472cf26d9424 100644
--- a/ui/packages/consul-ui/app/components/data-sink/index.js
+++ b/ui/packages/consul-ui/app/components/data-sink/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import { set, get, computed } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/data-source/index.hbs b/ui/packages/consul-ui/app/components/data-source/index.hbs
index 65d006801626f..d4b1e2613ce8c 100644
--- a/ui/packages/consul-ui/app/components/data-source/index.hbs
+++ b/ui/packages/consul-ui/app/components/data-source/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (not this.disabled)}}
   {{#if (eq this.loading "lazy")}}
     {{! in order to use intersection observer we need a DOM element on the page}}
diff --git a/ui/packages/consul-ui/app/components/data-source/index.js b/ui/packages/consul-ui/app/components/data-source/index.js
index cf2894738e7ae..ac0b565061a75 100644
--- a/ui/packages/consul-ui/app/components/data-source/index.js
+++ b/ui/packages/consul-ui/app/components/data-source/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* eslint no-console: ["error", { allow: ["debug"] }] */
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
diff --git a/ui/packages/consul-ui/app/components/data-writer/chart.xstate.js b/ui/packages/consul-ui/app/components/data-writer/chart.xstate.js
index 875456aaad936..5970bc645b06e 100644
--- a/ui/packages/consul-ui/app/components/data-writer/chart.xstate.js
+++ b/ui/packages/consul-ui/app/components/data-writer/chart.xstate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   id: 'data-writer',
   initial: 'idle',
diff --git a/ui/packages/consul-ui/app/components/data-writer/index.hbs b/ui/packages/consul-ui/app/components/data-writer/index.hbs
index 60f1324ea5ebc..36f418459be78 100644
--- a/ui/packages/consul-ui/app/components/data-writer/index.hbs
+++ b/ui/packages/consul-ui/app/components/data-writer/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <StateChart @src={{chart}} as |State Guard Action dispatch state|>
 
   <Ref @target={{this}} @name="dispatch" @value={{dispatch}} />
@@ -44,14 +39,22 @@ as |after|}}
     {{#yield-slot name="removed" params=(block-params after)}}
       {{yield api}}
     {{else}}
-      <Hds::Toast
-        @color='success'
-        {{notification
-          after=(action after)
-        }} as |T|>
-        <T.Title>Success!</T.Title>
-        <T.Description>Your {{or label type}} has been deleted.</T.Description>
-      </Hds::Toast>
+    <Notice
+      {{notification
+        after=(action after)
+      }}
+      class="notification-delete"
+      @type="success"
+    as |notice|>
+      <notice.Header>
+        <strong>Success!</strong>
+      </notice.Header>
+      <notice.Body>
+        <p>
+          Your {{or label type}} has been deleted.
+        </p>
+      </notice.Body>
+    </Notice>
     {{/yield-slot}}
 {{/let}}
   </State>
@@ -63,14 +66,22 @@ as |after|}}
     {{#yield-slot name="persisted" params=(block-params after)}}
       {{yield api}}
     {{else}}
-      <Hds::Toast
-        @color='success'
+      <Notice
         {{notification
           after=(action after)
-        }} as |T|>
-        <T.Title>Success!</T.Title>
-        <T.Description>Your {{or label type}} has been saved.</T.Description>
-      </Hds::Toast>
+        }}
+        class="notification-update"
+        @type="success"
+      as |notice|>
+        <notice.Header>
+          <strong>Success!</strong>
+        </notice.Header>
+        <notice.Body>
+          <p>
+            Your {{or label type}} has been saved.
+          </p>
+        </notice.Body>
+      </Notice>
     {{/yield-slot}}
 {{/let}}
   </State>
@@ -82,20 +93,27 @@ as |after|}}
     {{#yield-slot name="error" params=(block-params after api.error)}}
       {{yield api}}
     {{else}}
-      <Hds::Toast
-        @color='critical'
+      <Notice
         {{notification
           after=(action after)
-        }} as |T|>
-        <T.Title>Error!</T.Title>
-        <T.Description>There was an error saving your {{or label type}}.
-          {{#if (and api.error.status api.error.detail)}}
+        }}
+        class="notification-update"
+        @type="error"
+      as |notice|>
+        <notice.Header>
+          <strong>Error!</strong>
+        </notice.Header>
+        <notice.Body>
+          <p>
+            There was an error saving your {{or label type}}.
+        {{#if (and api.error.status api.error.detail)}}
             <br />{{api.error.status}}: {{api.error.detail}}
-          {{else if api.error.message}}
+        {{else if api.error.message}}
             <br />{{api.error.message}}
-          {{/if}}
-        </T.Description>
-      </Hds::Toast>
+        {{/if}}
+          </p>
+        </notice.Body>
+      </Notice>
     {{/yield-slot}}
 {{/let}}
   </State>
diff --git a/ui/packages/consul-ui/app/components/data-writer/index.js b/ui/packages/consul-ui/app/components/data-writer/index.js
index 173afb6746ce6..af6e7207fdcb8 100644
--- a/ui/packages/consul-ui/app/components/data-writer/index.js
+++ b/ui/packages/consul-ui/app/components/data-writer/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { set } from '@ember/object';
 import Slotted from 'block-slots';
diff --git a/ui/packages/consul-ui/app/components/debug/navigation/index.hbs b/ui/packages/consul-ui/app/components/debug/navigation/index.hbs
index d7373afe9912c..5285648cf7537 100644
--- a/ui/packages/consul-ui/app/components/debug/navigation/index.hbs
+++ b/ui/packages/consul-ui/app/components/debug/navigation/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
   <li>
     <a href={{href-to 'docs'}} target="_blank">Eng Docs</a>
   </li>
diff --git a/ui/packages/consul-ui/app/components/definition-table/debug.scss b/ui/packages/consul-ui/app/components/definition-table/debug.scss
index f9fd2d557d02c..b5b9b8a46cc77 100644
--- a/ui/packages/consul-ui/app/components/definition-table/debug.scss
+++ b/ui/packages/consul-ui/app/components/definition-table/debug.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 [id^='docfy-demo-preview-definition-table'] {
   .definition-table {
     @extend %definition-table;
diff --git a/ui/packages/consul-ui/app/components/definition-table/index.scss b/ui/packages/consul-ui/app/components/definition-table/index.scss
index 7ae5d96ccdd56..e03c5d53079dc 100644
--- a/ui/packages/consul-ui/app/components/definition-table/index.scss
+++ b/ui/packages/consul-ui/app/components/definition-table/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .definition-table {
diff --git a/ui/packages/consul-ui/app/components/definition-table/layout.scss b/ui/packages/consul-ui/app/components/definition-table/layout.scss
index 5a954ee9b7226..db0c27e90b04c 100644
--- a/ui/packages/consul-ui/app/components/definition-table/layout.scss
+++ b/ui/packages/consul-ui/app/components/definition-table/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %definition-table > dl {
   display: grid;
   grid-template-columns: 140px auto;
diff --git a/ui/packages/consul-ui/app/components/definition-table/skin.scss b/ui/packages/consul-ui/app/components/definition-table/skin.scss
index 6a5c2bc446e3c..d96658f736798 100644
--- a/ui/packages/consul-ui/app/components/definition-table/skin.scss
+++ b/ui/packages/consul-ui/app/components/definition-table/skin.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %definition-table {
 }
diff --git a/ui/packages/consul-ui/app/components/delete-confirmation/index.hbs b/ui/packages/consul-ui/app/components/delete-confirmation/index.hbs
index e7a23c39d77d1..df07485948b70 100644
--- a/ui/packages/consul-ui/app/components/delete-confirmation/index.hbs
+++ b/ui/packages/consul-ui/app/components/delete-confirmation/index.hbs
@@ -1,21 +1,7 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <p>
   {{message}}
 </p>
-<Hds::ButtonSet>
-  <Hds::Button
-    @text='Confirm Delete'
-    data-test-delete
-    @color='critical'
-    onclick={{action execute}}
-  />
-  <Hds::Button
-    @text='Cancel'
-    @color='secondary'
-    onclick={{action cancel}}
-  />
-</Hds::ButtonSet>
\ No newline at end of file
+<button type="button" class="type-delete" onclick={{action execute}}>
+  Confirm Delete
+</button>
+<button type="button" class="type-cancel" onclick={{action cancel}}>Cancel</button>
diff --git a/ui/packages/consul-ui/app/components/delete-confirmation/index.js b/ui/packages/consul-ui/app/components/delete-confirmation/index.js
index fa7c112602148..6d5168aa75fe6 100644
--- a/ui/packages/consul-ui/app/components/delete-confirmation/index.js
+++ b/ui/packages/consul-ui/app/components/delete-confirmation/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/packages/consul-ui/app/components/disclosure-menu/README.mdx b/ui/packages/consul-ui/app/components/disclosure-menu/README.mdx
index dc8d9b3e2b134..9817282a8b84d 100644
--- a/ui/packages/consul-ui/app/components/disclosure-menu/README.mdx
+++ b/ui/packages/consul-ui/app/components/disclosure-menu/README.mdx
@@ -44,7 +44,7 @@ common usecase of having a floating menu.
     <disclosure.Menu
       style={{style-map
         (array 'position' 'absolute')
-        (array 'background-color' 'var(--token-color-surface-primary)')
+        (array 'background-color' 'rgb(var(--tone-gray-000))')
       }}
     as |panel|>
       <panel.Menu as |menu|>
diff --git a/ui/packages/consul-ui/app/components/disclosure-menu/action/index.hbs b/ui/packages/consul-ui/app/components/disclosure-menu/action/index.hbs
index fed93c5d94676..71175776d529d 100644
--- a/ui/packages/consul-ui/app/components/disclosure-menu/action/index.hbs
+++ b/ui/packages/consul-ui/app/components/disclosure-menu/action/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <@disclosure.Action
   aria-haspopup="menu"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/disclosure-menu/index.hbs b/ui/packages/consul-ui/app/components/disclosure-menu/index.hbs
index 0e869364e1646..0ebb8f5a6f590 100644
--- a/ui/packages/consul-ui/app/components/disclosure-menu/index.hbs
+++ b/ui/packages/consul-ui/app/components/disclosure-menu/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class={{class-map
     "disclosure-menu"
diff --git a/ui/packages/consul-ui/app/components/disclosure-menu/index.scss b/ui/packages/consul-ui/app/components/disclosure-menu/index.scss
index aaded7b370b84..9769284b974b4 100644
--- a/ui/packages/consul-ui/app/components/disclosure-menu/index.scss
+++ b/ui/packages/consul-ui/app/components/disclosure-menu/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .disclosure-menu {
   position: relative;
 }
diff --git a/ui/packages/consul-ui/app/components/disclosure-menu/menu/index.hbs b/ui/packages/consul-ui/app/components/disclosure-menu/menu/index.hbs
index 8ad9a72ab319e..95a61809c6686 100644
--- a/ui/packages/consul-ui/app/components/disclosure-menu/menu/index.hbs
+++ b/ui/packages/consul-ui/app/components/disclosure-menu/menu/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <@disclosure.Details as |details|>
   <PagedCollection
     @items={{or @items (array)}}
diff --git a/ui/packages/consul-ui/app/components/disclosure/action/index.hbs b/ui/packages/consul-ui/app/components/disclosure/action/index.hbs
index a3d0cf849edb1..d1285db156705 100644
--- a/ui/packages/consul-ui/app/components/disclosure/action/index.hbs
+++ b/ui/packages/consul-ui/app/components/disclosure/action/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Action
   aria-expanded={{if @disclosure.expanded 'true' 'false'}}
   aria-controls={{@disclosure.controls}}
diff --git a/ui/packages/consul-ui/app/components/disclosure/details/index.hbs b/ui/packages/consul-ui/app/components/disclosure/details/index.hbs
index 3ecfdb6ee4ea3..07dc7efe25ff9 100644
--- a/ui/packages/consul-ui/app/components/disclosure/details/index.hbs
+++ b/ui/packages/consul-ui/app/components/disclosure/details/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#let
   (unique-id)
 as |id|}}
diff --git a/ui/packages/consul-ui/app/components/disclosure/index.hbs b/ui/packages/consul-ui/app/components/disclosure/index.hbs
index 5632f83f2f72a..c5c5e2bbfaa7c 100644
--- a/ui/packages/consul-ui/app/components/disclosure/index.hbs
+++ b/ui/packages/consul-ui/app/components/disclosure/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <StateChart
   @src={{state-chart 'boolean'}}
   @initial={{if @expanded 'true' 'false'}}
diff --git a/ui/packages/consul-ui/app/components/disclosure/index.js b/ui/packages/consul-ui/app/components/disclosure/index.js
index dd47bdc76c39a..5750827398f96 100644
--- a/ui/packages/consul-ui/app/components/disclosure/index.js
+++ b/ui/packages/consul-ui/app/components/disclosure/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/display-toggle/index.scss b/ui/packages/consul-ui/app/components/display-toggle/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/display-toggle/index.scss
+++ b/ui/packages/consul-ui/app/components/display-toggle/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/display-toggle/layout.scss b/ui/packages/consul-ui/app/components/display-toggle/layout.scss
index 71c483481ddd2..050c10f5bcb2b 100644
--- a/ui/packages/consul-ui/app/components/display-toggle/layout.scss
+++ b/ui/packages/consul-ui/app/components/display-toggle/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %display-toggle-siblings,
 %display-toggle-siblings ~ *:not(.animating):not(label) {
   display: none;
diff --git a/ui/packages/consul-ui/app/components/display-toggle/skin.scss b/ui/packages/consul-ui/app/components/display-toggle/skin.scss
index 7c52b8373629a..923a9a578c89e 100644
--- a/ui/packages/consul-ui/app/components/display-toggle/skin.scss
+++ b/ui/packages/consul-ui/app/components/display-toggle/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %display-toggle-siblings ~ label {
   cursor: pointer;
 }
diff --git a/ui/packages/consul-ui/app/components/dom-recycling-table/index.scss b/ui/packages/consul-ui/app/components/dom-recycling-table/index.scss
index 65c474196a830..8e800a26bd4be 100644
--- a/ui/packages/consul-ui/app/components/dom-recycling-table/index.scss
+++ b/ui/packages/consul-ui/app/components/dom-recycling-table/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './layout';
 
 %dom-recycling-table {
diff --git a/ui/packages/consul-ui/app/components/dom-recycling-table/layout.scss b/ui/packages/consul-ui/app/components/dom-recycling-table/layout.scss
index 277c49c53e3db..57327bfbd190e 100644
--- a/ui/packages/consul-ui/app/components/dom-recycling-table/layout.scss
+++ b/ui/packages/consul-ui/app/components/dom-recycling-table/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %dom-recycling-table {
   position: relative;
 }
diff --git a/ui/packages/consul-ui/app/components/empty-state/README.mdx b/ui/packages/consul-ui/app/components/empty-state/README.mdx
index ac684fdf99913..2e3d9e466dcaf 100644
--- a/ui/packages/consul-ui/app/components/empty-state/README.mdx
+++ b/ui/packages/consul-ui/app/components/empty-state/README.mdx
@@ -44,23 +44,23 @@ function.
     </p>
   </BlockSlot>
   <BlockSlot @name="actions">
-    <li>
-      <Hds::Link::Standalone
-        @text='Documentation on namespaces'
-        @href="{{env 'CONSUL_DOCS_URL'}}/commands/namespace"
-        @icon='docs-link'
-        @iconPosition='trailing'
-        @size='small'
-      />
+    <li class="docs-link">
+      <a
+        href="{{env 'CONSUL_DOCS_URL'}}/agent/kv"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+          Documentation on K/V
+      </a>
     </li>
-    <li>
-      <Hds::Link::Standalone
-        @text='Read the guide'
-        @href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/namespaces/secure-namespaces"
-        @icon='learn-link'
-        @iconPosition='trailing'
-        @size='small'
-      />
+    <li class="learn-link">
+      <a
+        href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/getting-started/kv"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        Read the guide
+      </a>
     </li>
   </BlockSlot>
 </EmptyState>
diff --git a/ui/packages/consul-ui/app/components/empty-state/index.hbs b/ui/packages/consul-ui/app/components/empty-state/index.hbs
index 8c1a458a05a33..fcbeeaa4f10bf 100644
--- a/ui/packages/consul-ui/app/components/empty-state/index.hbs
+++ b/ui/packages/consul-ui/app/components/empty-state/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
 <div
   class="empty-state"
@@ -22,9 +17,7 @@
     <div>
       {{yield}}
       {{#if login}}
-        <Hds::Button
-          @color='primary'
-          @text={{if token.AccessorID 'Log in with a different token' 'Log in'}}
+        <Action
           data-test-empty-state-login
           {{on "click" login}}
         >
@@ -32,7 +25,12 @@
             @src={{uri 'settings://consul:token'}}
             @onchange={{action (mut token) value="data"}}
           />
-        </Hds::Button>
+          {{#if token.AccessorID}}
+            Log in with a different token
+          {{else}}
+            Log in
+          {{/if}}
+        </Action>
       {{/if}}
     </div>
   {{/yield-slot}}
diff --git a/ui/packages/consul-ui/app/components/empty-state/index.js b/ui/packages/consul-ui/app/components/empty-state/index.js
index f96e9c0722af6..c4682abadcee2 100644
--- a/ui/packages/consul-ui/app/components/empty-state/index.js
+++ b/ui/packages/consul-ui/app/components/empty-state/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { set } from '@ember/object';
 import Slotted from 'block-slots';
diff --git a/ui/packages/consul-ui/app/components/empty-state/index.scss b/ui/packages/consul-ui/app/components/empty-state/index.scss
index a2c0d5ae396ab..72b821403cf29 100644
--- a/ui/packages/consul-ui/app/components/empty-state/index.scss
+++ b/ui/packages/consul-ui/app/components/empty-state/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './layout';
 @import './skin';
 .empty-state {
@@ -21,3 +16,6 @@
 %empty-state > ul > li > label > button {
   @extend %empty-state-anchor;
 }
+%empty-state div > button {
+  @extend %primary-button;
+}
diff --git a/ui/packages/consul-ui/app/components/empty-state/layout.scss b/ui/packages/consul-ui/app/components/empty-state/layout.scss
index 39ccf36504193..60a8f7f543aa5 100644
--- a/ui/packages/consul-ui/app/components/empty-state/layout.scss
+++ b/ui/packages/consul-ui/app/components/empty-state/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %empty-state,
 %empty-state > div {
   display: flex;
diff --git a/ui/packages/consul-ui/app/components/empty-state/pageobject.js b/ui/packages/consul-ui/app/components/empty-state/pageobject.js
index 220c7f9e83e19..e995697f96b97 100644
--- a/ui/packages/consul-ui/app/components/empty-state/pageobject.js
+++ b/ui/packages/consul-ui/app/components/empty-state/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (present) =>
   (scope = '.empty-state') => {
     return {
diff --git a/ui/packages/consul-ui/app/components/empty-state/skin.scss b/ui/packages/consul-ui/app/components/empty-state/skin.scss
index b953ee9678a7c..22d9fcae4c285 100644
--- a/ui/packages/consul-ui/app/components/empty-state/skin.scss
+++ b/ui/packages/consul-ui/app/components/empty-state/skin.scss
@@ -1,17 +1,12 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %empty-state {
-  color: var(--token-color-foreground-faint);
-  background-color: var(--token-color-surface-faint);
+  color: rgb(var(--tone-gray-500));
+  background-color: rgb(var(--tone-gray-010));
 }
 %empty-state-header {
   border-bottom: none;
 }
 %empty-state-header {
-  @extend %display-400-semibold;
+  @extend %h200;
 }
 /* Icons */
 %empty-state header::before {
@@ -22,8 +17,8 @@
   margin-right: 10px;
 }
 %empty-state-anchor::before {
-  @extend %body-200-regular;
   margin-right: 0.5em;
+  font-size: 0.9em;
 }
 %empty-state[class*='status-'] header::before {
   @extend %as-pseudo;
diff --git a/ui/packages/consul-ui/app/components/error-state/index.hbs b/ui/packages/consul-ui/app/components/error-state/index.hbs
index a04e3293a11c6..d05bb30b6fbc3 100644
--- a/ui/packages/consul-ui/app/components/error-state/index.hbs
+++ b/ui/packages/consul-ui/app/components/error-state/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (not-eq @error.status "403")}}
   <EmptyState
     class={{concat "status-" @error.status}}
@@ -32,25 +27,21 @@
       </p>
     </BlockSlot>
     <BlockSlot @name="actions">
-      <li>
-        <Hds::Link::Standalone
+      <li class="back-link">
+        <Action
           data-test-home
-          @route='index'
-          @text='Go back'
-          @icon='chevron-left'
-          @iconPosition='trailing'
-          @size='small'
-        />
+          @href={{href-to 'index'}}
+        >
+          Go back
+        </Action>
       </li>
-      <li>
-        <Hds::Link::Standalone
-          data-test-home
-          @text='Read the documentation'
+      <li class="docs-link">
+        <Action
           @href="{{env 'CONSUL_DOCS_URL'}}"
-          @iconPosition='trailing'
-          @icon='docs-link'
-          @size='small'
-        />
+          @external={{true}}
+        >
+          Read the documentation
+        </Action>
       </li>
     </BlockSlot>
   </EmptyState>
@@ -77,23 +68,21 @@
       </p>
     </BlockSlot>
     <BlockSlot @name="actions">
-      <li>
-        <Hds::Link::Standalone
-          @text='Read the documentation'
+      <li class="docs-link">
+        <Action
           @href="{{env 'CONSUL_DOCS_URL'}}/acl/index.html"
-          @icon='docs-link'
-          @iconPosition='trailing'
-          @size='small'
-        />
+          @external={{true}}
+        >
+          Read the documentation
+        </Action>
       </li>
-      <li>
-        <Hds::Link::Standalone
-          @text='Follow the guide'
+      <li class="learn-link">
+        <Action
           @href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/security-networking/production-acls"
-          @icon='learn-link'
-          @iconPosition='trailing'
-          @size='small'
-        />
+          @external={{true}}
+        >
+          Follow the guide
+        </Action>
       </li>
     </BlockSlot>
   </EmptyState>
diff --git a/ui/packages/consul-ui/app/components/event-source/index.hbs b/ui/packages/consul-ui/app/components/event-source/index.hbs
index c9ca83481674b..c1cec509027ef 100644
--- a/ui/packages/consul-ui/app/components/event-source/index.hbs
+++ b/ui/packages/consul-ui/app/components/event-source/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield (hash
   close=(action "close")
 )}}
diff --git a/ui/packages/consul-ui/app/components/event-source/index.js b/ui/packages/consul-ui/app/components/event-source/index.js
index 20d29fc82be46..f8eb439fb4df9 100644
--- a/ui/packages/consul-ui/app/components/event-source/index.js
+++ b/ui/packages/consul-ui/app/components/event-source/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import { get, set } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/expanded-single-select/index.scss b/ui/packages/consul-ui/app/components/expanded-single-select/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/expanded-single-select/index.scss
+++ b/ui/packages/consul-ui/app/components/expanded-single-select/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/expanded-single-select/layout.scss b/ui/packages/consul-ui/app/components/expanded-single-select/layout.scss
index 428377c3aa49c..8d35e9fba04e5 100644
--- a/ui/packages/consul-ui/app/components/expanded-single-select/layout.scss
+++ b/ui/packages/consul-ui/app/components/expanded-single-select/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @media #{$--horizontal-selects} {
   %expanded-single-select {
     display: flex;
diff --git a/ui/packages/consul-ui/app/components/expanded-single-select/skin.scss b/ui/packages/consul-ui/app/components/expanded-single-select/skin.scss
index ea8ab52e56ed2..76c2f471964eb 100644
--- a/ui/packages/consul-ui/app/components/expanded-single-select/skin.scss
+++ b/ui/packages/consul-ui/app/components/expanded-single-select/skin.scss
@@ -1,11 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %expanded-single-select {
   border: var(--decor-border-100);
-  border-color: var(--token-color-palette-neutral-300);
+  border-color: rgb(var(--tone-gray-300));
   border-radius: var(--decor-radius-100);
 }
 %expanded-single-select label {
@@ -14,10 +9,10 @@
 %expanded-single-select input[type='radio']:checked + *,
 %expanded-single-select input[type='radio']:hover + *,
 %expanded-single-select input[type='radio']:focus + * {
-  box-shadow: var(--token-elevation-high-box-shadow);
+  box-shadow: var(--decor-elevation-300);
 }
 %expanded-single-select input[type='radio']:checked + *,
 %expanded-single-select input[type='radio']:hover + *,
 %expanded-single-select input[type='radio']:focus + * {
-  background-color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-gray-000));
 }
diff --git a/ui/packages/consul-ui/app/components/filter-bar/index.scss b/ui/packages/consul-ui/app/components/filter-bar/index.scss
index 373ae718eba79..1e3f2d0f8897d 100644
--- a/ui/packages/consul-ui/app/components/filter-bar/index.scss
+++ b/ui/packages/consul-ui/app/components/filter-bar/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 %filter-bar-reversed {
diff --git a/ui/packages/consul-ui/app/components/filter-bar/layout.scss b/ui/packages/consul-ui/app/components/filter-bar/layout.scss
index 1ebc5c1605ba3..ade5db27451b5 100644
--- a/ui/packages/consul-ui/app/components/filter-bar/layout.scss
+++ b/ui/packages/consul-ui/app/components/filter-bar/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .filter-bar {
   &,
   > div {
diff --git a/ui/packages/consul-ui/app/components/filter-bar/skin.scss b/ui/packages/consul-ui/app/components/filter-bar/skin.scss
index 37c47b933404e..ba9429903c051 100644
--- a/ui/packages/consul-ui/app/components/filter-bar/skin.scss
+++ b/ui/packages/consul-ui/app/components/filter-bar/skin.scss
@@ -1,19 +1,14 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .filter-bar {
   & {
-    background-color: var(--token-color-foreground-high-contrast);
+    background-color: rgb(var(--tone-gray-010));
     border-bottom: var(--decor-border-100);
-    border-color: var(--token-color-surface-interactive-active);
+    border-color: rgb(var(--tone-gray-200));
   }
   .filters,
   .sort {
     .popover-menu > [type='checkbox']:checked + label button {
-      color: var(--token-color-foreground-action);
-      background-color: var(--token-color-foreground-high-contrast);
+      color: rgb(var(--tone-blue-500));
+      background-color: rgb(var(--tone-gray-100));
     }
   }
 }
diff --git a/ui/packages/consul-ui/app/components/form-component/index.hbs b/ui/packages/consul-ui/app/components/form-component/index.hbs
index 8709fc4b8b770..fb5c4b157d1c2 100644
--- a/ui/packages/consul-ui/app/components/form-component/index.hbs
+++ b/ui/packages/consul-ui/app/components/form-component/index.hbs
@@ -1,6 +1 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/form-component/index.js b/ui/packages/consul-ui/app/components/form-component/index.js
index 39614c54245c7..3976d603aa5d0 100644
--- a/ui/packages/consul-ui/app/components/form-component/index.js
+++ b/ui/packages/consul-ui/app/components/form-component/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import Slotted from 'block-slots';
 import { inject as service } from '@ember/service';
diff --git a/ui/packages/consul-ui/app/components/form-elements/index.scss b/ui/packages/consul-ui/app/components/form-elements/index.scss
index 270cba0709d7c..3ace8435f55c4 100644
--- a/ui/packages/consul-ui/app/components/form-elements/index.scss
+++ b/ui/packages/consul-ui/app/components/form-elements/index.scss
@@ -1,13 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
-%form h2,
-.modal-dialog-body h2 {
-  @extend %display-400-semibold;
+%form h2 {
+  @extend %h200;
 }
 /* TODO: This is positioning the element */
 /* probably should be in a special %form class*/
@@ -47,7 +41,9 @@ label span {
   @extend %form-element-error;
 }
 // TODO: float right here is too specific, this is currently used just for the role/policy selectors
-.type-dialog {
+label.type-dialog {
+  @extend %anchor;
+  cursor: pointer;
   float: right;
 }
 .type-toggle {
@@ -73,11 +69,6 @@ span.label {
 %main-content .type-text {
   @extend %form-element;
 }
-%main-content .type-select > span,
-%main-content .type-password > span,
-%main-content label.type-text > span {
-  line-height: 2.2em;
-}
 %app-view-content form:not(.filter-bar) [role='radiogroup'],
 %modal-window [role='radiogroup'] {
   @extend %radio-group;
diff --git a/ui/packages/consul-ui/app/components/form-elements/layout.scss b/ui/packages/consul-ui/app/components/form-elements/layout.scss
index 3a4f11aa0be68..dbc3e374e38cb 100644
--- a/ui/packages/consul-ui/app/components/form-elements/layout.scss
+++ b/ui/packages/consul-ui/app/components/form-elements/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %form-element,
 %form-element-label,
 %form-element-note,
diff --git a/ui/packages/consul-ui/app/components/form-elements/skin.scss b/ui/packages/consul-ui/app/components/form-elements/skin.scss
index aaebd04597c7c..8528e121d8864 100644
--- a/ui/packages/consul-ui/app/components/form-elements/skin.scss
+++ b/ui/packages/consul-ui/app/components/form-elements/skin.scss
@@ -1,12 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %form-element-text-input {
   -moz-appearance: none;
   -webkit-appearance: none;
-  box-shadow: var(--token-surface-inset-box-shadow);
+  box-shadow: inset var(--decor-elevation-100);
   border-radius: var(--decor-radius-100);
   border: var(--decor-border-100);
   outline: none;
@@ -19,22 +14,22 @@ textarea:disabled + .CodeMirror,
 %form fieldset > p,
 %form-element-note,
 %form-element-text-input::placeholder {
-  color: var(--token-color-foreground-disabled);
+  color: rgb(var(--tone-gray-400));
 }
 %form-element-error > input,
 %form-element-error > textarea {
-  border-color: var(--decor-error, var(--token-color-foreground-critical)) !important;
+  border-color: var(--decor-error-500, rgb(var(--tone-red-500))) !important;
 }
 %form-element-text-input {
-  color: var(--token-color-foreground-faint);
-  border-color: var(--token-color-palette-neutral-300);
+  color: rgb(var(--tone-gray-500));
+  border-color: rgb(var(--tone-gray-300));
 }
 %form-element-text-input-hover {
-  border-color: var(--token-color-foreground-faint);
+  border-color: rgb(var(--tone-gray-500));
 }
 %form-element-text-input-focus {
-  border-color: var(--typo-action, var(--token-color-foreground-action));
+  border-color: var(--typo-action-500, rgb(var(--tone-blue-500)));
 }
 %form-element-label {
-  color: var(--typo-contrast, inherit);
+  color: var(--typo-contrast-999, inherit);
 }
diff --git a/ui/packages/consul-ui/app/components/form-group/element/checkbox/index.hbs b/ui/packages/consul-ui/app/components/form-group/element/checkbox/index.hbs
index 07c9d1c152f01..2145cd5bc1930 100644
--- a/ui/packages/consul-ui/app/components/form-group/element/checkbox/index.hbs
+++ b/ui/packages/consul-ui/app/components/form-group/element/checkbox/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <input
   {{did-insert (optional @didinsert)}}
   {{on 'change' (optional @onchange)}}
diff --git a/ui/packages/consul-ui/app/components/form-group/element/error/index.hbs b/ui/packages/consul-ui/app/components/form-group/element/error/index.hbs
index 38b2913ded7de..33049dbd7778a 100644
--- a/ui/packages/consul-ui/app/components/form-group/element/error/index.hbs
+++ b/ui/packages/consul-ui/app/components/form-group/element/error/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <strong
   role="alert"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/form-group/element/index.hbs b/ui/packages/consul-ui/app/components/form-group/element/index.hbs
index 34f3e40145ab5..7387615d7dcfb 100644
--- a/ui/packages/consul-ui/app/components/form-group/element/index.hbs
+++ b/ui/packages/consul-ui/app/components/form-group/element/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#let (hash
 
   Element=(component 'form-group/element' group=@group name=@name)
diff --git a/ui/packages/consul-ui/app/components/form-group/element/index.js b/ui/packages/consul-ui/app/components/form-group/element/index.js
index 86c2ac8944b70..41306ff734fce 100644
--- a/ui/packages/consul-ui/app/components/form-group/element/index.js
+++ b/ui/packages/consul-ui/app/components/form-group/element/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/form-group/element/label/index.hbs b/ui/packages/consul-ui/app/components/form-group/element/label/index.hbs
index 53db30ab900ba..eaa9339369f59 100644
--- a/ui/packages/consul-ui/app/components/form-group/element/label/index.hbs
+++ b/ui/packages/consul-ui/app/components/form-group/element/label/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <span
   class="form-elements-label label"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/form-group/element/radio/index.hbs b/ui/packages/consul-ui/app/components/form-group/element/radio/index.hbs
index 45db5499d754c..bc124760f03fa 100644
--- a/ui/packages/consul-ui/app/components/form-group/element/radio/index.hbs
+++ b/ui/packages/consul-ui/app/components/form-group/element/radio/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <input
   {{did-insert (optional @didinsert)}}
   {{on 'change' (optional @onchange)}}
diff --git a/ui/packages/consul-ui/app/components/form-group/element/text/index.hbs b/ui/packages/consul-ui/app/components/form-group/element/text/index.hbs
index 2b6335df4bfb3..d43d874685c93 100644
--- a/ui/packages/consul-ui/app/components/form-group/element/text/index.hbs
+++ b/ui/packages/consul-ui/app/components/form-group/element/text/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <input
   {{did-insert (optional @didinsert)}}
   {{on 'input' (optional @oninput)}}
diff --git a/ui/packages/consul-ui/app/components/form-group/index.hbs b/ui/packages/consul-ui/app/components/form-group/index.hbs
index 56db7f48d378c..5001ae85a38fd 100644
--- a/ui/packages/consul-ui/app/components/form-group/index.hbs
+++ b/ui/packages/consul-ui/app/components/form-group/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield (hash
   Element=(component 'form-group/element' group=this)
 )}}
diff --git a/ui/packages/consul-ui/app/components/form-group/index.js b/ui/packages/consul-ui/app/components/form-group/index.js
index 31951309ccd1f..1376809758ee3 100644
--- a/ui/packages/consul-ui/app/components/form-group/index.js
+++ b/ui/packages/consul-ui/app/components/form-group/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 
 export default class FormGroup extends Component {
diff --git a/ui/packages/consul-ui/app/components/form-input/index.hbs b/ui/packages/consul-ui/app/components/form-input/index.hbs
index c9098acba6f89..98df0bd9a6d73 100644
--- a/ui/packages/consul-ui/app/components/form-input/index.hbs
+++ b/ui/packages/consul-ui/app/components/form-input/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <label
   class={{concat 'form-input' (if (get @chart.state.context.errors @name) ' has-error')}}
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/freetext-filter/index.hbs b/ui/packages/consul-ui/app/components/freetext-filter/index.hbs
index e9dd7f4f99625..9fe1ae1146b46 100644
--- a/ui/packages/consul-ui/app/components/freetext-filter/index.hbs
+++ b/ui/packages/consul-ui/app/components/freetext-filter/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="freetext-filter"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/freetext-filter/index.js b/ui/packages/consul-ui/app/components/freetext-filter/index.js
index 92b7d62dec5e6..a8eeda4ae731d 100644
--- a/ui/packages/consul-ui/app/components/freetext-filter/index.js
+++ b/ui/packages/consul-ui/app/components/freetext-filter/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/components/freetext-filter/index.scss b/ui/packages/consul-ui/app/components/freetext-filter/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/freetext-filter/index.scss
+++ b/ui/packages/consul-ui/app/components/freetext-filter/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/freetext-filter/layout.scss b/ui/packages/consul-ui/app/components/freetext-filter/layout.scss
index e2b958836067c..03e1e7d2f5079 100644
--- a/ui/packages/consul-ui/app/components/freetext-filter/layout.scss
+++ b/ui/packages/consul-ui/app/components/freetext-filter/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .freetext-filter {
   --height: 2.2rem;
   & {
diff --git a/ui/packages/consul-ui/app/components/freetext-filter/pageobject.js b/ui/packages/consul-ui/app/components/freetext-filter/pageobject.js
index d362ed2909946..ea1afa92a839b 100644
--- a/ui/packages/consul-ui/app/components/freetext-filter/pageobject.js
+++ b/ui/packages/consul-ui/app/components/freetext-filter/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (triggerable) => () => {
   return {
     ...{
diff --git a/ui/packages/consul-ui/app/components/freetext-filter/skin.scss b/ui/packages/consul-ui/app/components/freetext-filter/skin.scss
index d7f5f63af9df4..c26ea34d9c6ac 100644
--- a/ui/packages/consul-ui/app/components/freetext-filter/skin.scss
+++ b/ui/packages/consul-ui/app/components/freetext-filter/skin.scss
@@ -1,20 +1,15 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .freetext-filter {
   & {
     border: var(--decor-border-100);
     border-radius: var(--decor-radius-100);
 
-    background-color: var(--token-color-surface-primary);
-    border-color: var(--token-color-surface-interactive-active);
-    color: var(--token-color-foreground-disabled);
+    background-color: rgb(var(--tone-gray-000));
+    border-color: rgb(var(--tone-gray-200));
+    color: rgb(var(--tone-gray-400));
   }
   &:hover,
   &:hover * {
-    border-color: var(--token-color-foreground-disabled);
+    border-color: rgb(var(--tone-gray-400));
   }
   & *,
   &_input::placeholder {
@@ -40,14 +35,14 @@
     margin-top: -8px;
   }
   .popover-menu {
-    background-color: var(--token-color-surface-strong);
-    color: var(--token-color-foreground-primary);
+    background-color: rgb(var(--tone-gray-050));
+    color: rgb(var(--tone-gray-800));
   }
   .popover-menu {
     border-left: 1px solid;
     border-color: inherit;
   }
   .popover-menu > [type='checkbox']:checked + label button {
-    background-color: var(--token-color-surface-interactive-active);
+    background-color: rgb(var(--tone-gray-200));
   }
 }
diff --git a/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs b/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
index af5a3d3f6af78..6942abded6b04 100644
--- a/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
+++ b/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <App class='hashicorp-consul' ...attributes>
 
   <:notifications as |app|>
@@ -12,58 +7,66 @@
           {{{flash.dom}}}
         {{else}}
           {{#let (lowercase flash.type) (lowercase flash.action) as |status type|}}
-            <Hds::Toast
-              @color={{if (eq status 'error') 'critical' status}}
+            <Notice
+              role='alert'
+              class={{concat status ' notification-' type}}
               data-notification
-              as |T|>
-              <T.Title>{{capitalize status}}!</T.Title>
-              <T.Description>
-                {{#if (eq type 'logout')}}
-                  {{#if (eq status 'success')}}
-                    You are now logged out.
-                  {{else}}
-                    There was an error logging out.
-                  {{/if}}
-                {{else if (eq type 'authorize')}}
-                  {{#if (eq status 'success')}}
-                    You are now logged in.
+              @type={{status}}
+              as |notice|
+            >
+              <notice.Header>
+                <strong>
+                  {{capitalize status}}!
+                </strong>
+              </notice.Header>
+              <notice.Body>
+                <p>
+                  {{#if (eq type 'logout')}}
+                    {{#if (eq status 'success')}}
+                      You are now logged out.
+                    {{else}}
+                      There was an error logging out.
+                    {{/if}}
+                  {{else if (eq type 'authorize')}}
+                    {{#if (eq status 'success')}}
+                      You are now logged in.
+                    {{else}}
+                      There was an error, please check your SecretID/Token
+                    {{/if}}
                   {{else}}
-                    There was an error, please check your SecretID/Token
+                    {{#if (or (eq type 'use') (eq flash.model 'token'))}}
+                      <Consul::Token::Notifications
+                        @type={{type}}
+                        @status={{status}}
+                        @item={{flash.item}}
+                        @error={{flash.error}}
+                      />
+                    {{else if (eq flash.model 'intention')}}
+                      <Consul::Intention::Notifications
+                        @type={{type}}
+                        @status={{status}}
+                        @item={{flash.item}}
+                        @error={{flash.error}}
+                      />
+                    {{else if (eq flash.model 'role')}}
+                      <Consul::Role::Notifications
+                        @type={{type}}
+                        @status={{status}}
+                        @item={{flash.item}}
+                        @error={{flash.error}}
+                      />
+                    {{else if (eq flash.model 'policy')}}
+                      <Consul::Policy::Notifications
+                        @type={{type}}
+                        @status={{status}}
+                        @item={{flash.item}}
+                        @error={{flash.error}}
+                      />
+                    {{/if}}
                   {{/if}}
-                {{else}}
-                  {{#if (or (eq type 'use') (eq flash.model 'token'))}}
-                    <Consul::Token::Notifications
-                      @type={{type}}
-                      @status={{status}}
-                      @item={{flash.item}}
-                      @error={{flash.error}}
-                    />
-                  {{else if (eq flash.model 'intention')}}
-                    <Consul::Intention::Notifications
-                      @type={{type}}
-                      @status={{status}}
-                      @item={{flash.item}}
-                      @error={{flash.error}}
-                    />
-                  {{else if (eq flash.model 'role')}}
-                    <Consul::Role::Notifications
-                      @type={{type}}
-                      @status={{status}}
-                      @item={{flash.item}}
-                      @error={{flash.error}}
-                    />
-                  {{else if (eq flash.model 'policy')}}
-                    <Consul::Policy::Notifications
-                      @type={{type}}
-                      @status={{status}}
-                      @item={{flash.item}}
-                      @error={{flash.error}}
-                    />
-                  {{/if}}
-                {{/if}}
-              </T.Description>
-            </Hds::Toast>
-
+                </p>
+              </notice.Body>
+            </Notice>
           {{/let}}
         {{/if}}
       </app.Notification>
diff --git a/ui/packages/consul-ui/app/components/hashicorp-consul/index.js b/ui/packages/consul-ui/app/components/hashicorp-consul/index.js
index 6b5135a1bee49..38e7edd518af1 100644
--- a/ui/packages/consul-ui/app/components/hashicorp-consul/index.js
+++ b/ui/packages/consul-ui/app/components/hashicorp-consul/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/components/hashicorp-consul/index.scss b/ui/packages/consul-ui/app/components/hashicorp-consul/index.scss
index c825656d11402..fe989b06ca07c 100644
--- a/ui/packages/consul-ui/app/components/hashicorp-consul/index.scss
+++ b/ui/packages/consul-ui/app/components/hashicorp-consul/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %hashicorp-consul {
   nav .dcs {
     @extend %main-nav-vertical-hoisted;
@@ -10,10 +5,8 @@
 
     .dcs-message {
       padding: 8px 12px;
-      border-bottom: 1px solid var(--token-color-foreground-disabled);
+      border-bottom: 1px solid rgb(var(--tone-gray-400));
       max-width: fit-content;
-      background-color: var(--token-color-hashicorp-brand);
-      color: var(--token-color-palette-neutral-300);
     }
   }
   nav .dcs li.is-primary span,
@@ -21,15 +14,15 @@
     @extend %menu-panel-badge;
   }
   nav .dcs .dc-name {
-    color: var(--token-color-foreground-faint);
+    color: rgb(var(--tone-gray-600));
     padding: 3.25px 0px;
-    font-weight: var(--token-typography-font-weight-semibold);
+    font-weight: var(--typo-weight-semibold)
   }
   nav .dcs .dc-name span {
     @extend %pill-200;
     margin-left: 1rem;
-    background-color: var(--token-color-palette-neutral-300);
-    color: var(--token-color-hashicorp-brand);
+    background-color: rgb(var(--tone-gray-300));
+    color: rgb(var(--tone-gray-999));
   }
   nav li.partitions,
   nav li.nspaces {
@@ -49,7 +42,7 @@
   }
 
   [role='banner'] a svg {
-    fill: var(--token-color-consul-brand);
+    fill: rgb(var(--tone-brand-600));
   }
   .docs-link a::after {
     @extend %with-docs-mask, %as-pseudo;
@@ -62,7 +55,7 @@
   }
   .acls-separator span {
     @extend %led-icon;
-    color: var(--token-color-foreground-critical);
+    color: rgb(var(--tone-red-500));
     display: inline-block;
     position: relative;
     top: 2px;
diff --git a/ui/packages/consul-ui/app/components/horizontal-kv-list/README.mdx b/ui/packages/consul-ui/app/components/horizontal-kv-list/README.mdx
index 1def2a4b51d76..2cf875988d0b4 100644
--- a/ui/packages/consul-ui/app/components/horizontal-kv-list/README.mdx
+++ b/ui/packages/consul-ui/app/components/horizontal-kv-list/README.mdx
@@ -202,11 +202,11 @@ dl {
 }
 .lock-delay::before {
   @extend %with-delay-mask, %as-pseudo;
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-700));
 }
 .ttl::before {
   @extend %with-history-mask, %as-pseudo;
-  color: var(--token-color-foreground-action);
+  color: rgb(var(--tone-blue-500));
 }
 .service-identity {
   @extend %badge;
diff --git a/ui/packages/consul-ui/app/components/horizontal-kv-list/debug.scss b/ui/packages/consul-ui/app/components/horizontal-kv-list/debug.scss
index e36c2aa1fe9a7..22efa4535dce7 100644
--- a/ui/packages/consul-ui/app/components/horizontal-kv-list/debug.scss
+++ b/ui/packages/consul-ui/app/components/horizontal-kv-list/debug.scss
@@ -1,19 +1,14 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
-[id^='docfy-demo-preview-horizontal-kv-list'] {
+[id^=docfy-demo-preview-horizontal-kv-list] {
   dl {
     @extend %horizontal-kv-list;
   }
   .lock-delay::before {
     @extend %with-delay-mask, %as-pseudo;
-    color: var(--token-color-foreground-faint);
+    color: rgb(var(--tone-gray-700));
   }
   .ttl::before {
     @extend %with-history-mask, %as-pseudo;
-    color: var(--token-color-foreground-action);
+    color: rgb(var(--tone-blue-500));
   }
   .service-identity {
     @extend %badge;
diff --git a/ui/packages/consul-ui/app/components/horizontal-kv-list/index.scss b/ui/packages/consul-ui/app/components/horizontal-kv-list/index.scss
index fcc2477cada9c..bcdcb8e17e65b 100644
--- a/ui/packages/consul-ui/app/components/horizontal-kv-list/index.scss
+++ b/ui/packages/consul-ui/app/components/horizontal-kv-list/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 
diff --git a/ui/packages/consul-ui/app/components/horizontal-kv-list/layout.scss b/ui/packages/consul-ui/app/components/horizontal-kv-list/layout.scss
index 59636c58642d0..b561d96c55914 100644
--- a/ui/packages/consul-ui/app/components/horizontal-kv-list/layout.scss
+++ b/ui/packages/consul-ui/app/components/horizontal-kv-list/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %horizontal-kv-list {
   display: inline-flex;
   flex-wrap: nowrap;
diff --git a/ui/packages/consul-ui/app/components/horizontal-kv-list/skin.scss b/ui/packages/consul-ui/app/components/horizontal-kv-list/skin.scss
index 2119a28ce03ca..5c337ae19ec2e 100644
--- a/ui/packages/consul-ui/app/components/horizontal-kv-list/skin.scss
+++ b/ui/packages/consul-ui/app/components/horizontal-kv-list/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %horizontal-kv-list-visible-title::after {
   display: inline;
 }
diff --git a/ui/packages/consul-ui/app/components/icon-definition/debug.scss b/ui/packages/consul-ui/app/components/icon-definition/debug.scss
index 548d7a7026130..4c3c4fb12c7db 100644
--- a/ui/packages/consul-ui/app/components/icon-definition/debug.scss
+++ b/ui/packages/consul-ui/app/components/icon-definition/debug.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 #docfy-demo-preview-icon-definition {
   dl {
     @extend %icon-definition;
diff --git a/ui/packages/consul-ui/app/components/icon-definition/index.scss b/ui/packages/consul-ui/app/components/icon-definition/index.scss
index 93acc97f2e489..262412ef229d2 100644
--- a/ui/packages/consul-ui/app/components/icon-definition/index.scss
+++ b/ui/packages/consul-ui/app/components/icon-definition/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %icon-definition {
   @extend %horizontal-kv-list;
 }
@@ -13,32 +8,32 @@
 %icon-definition.passing dt::before,
 %composite-row-header .passing dd::before {
   @extend %with-check-circle-fill-mask, %as-pseudo;
-  color: var(--token-color-foreground-success);
+  color: rgb(var(--tone-green-500));
 }
 %icon-definition.warning dt::before,
 %composite-row-header .warning dd::before {
   @extend %with-alert-triangle-mask, %as-pseudo;
-  color: var(--token-color-foreground-warning);
+  color: rgb(var(--tone-orange-500));
 }
 %icon-definition.critical dt::before,
 %composite-row-header .critical dd::before {
   @extend %with-cancel-square-fill-mask, %as-pseudo;
-  color: var(--token-color-foreground-critical);
+  color: rgb(var(--tone-red-500));
 }
 %icon-definition.empty dt::before,
 %composite-row-header .empty dd::before {
   @extend %with-minus-square-fill-mask, %as-pseudo;
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-500));
 }
 %icon-definition.unknown dt::before,
 %composite-row-header .unknown dd::before {
   @extend %with-help-circle-outline-mask, %as-pseudo;
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-500));
 }
 
 %composite-row-header [rel='me'] dd::before {
   @extend %with-check-circle-fill-mask, %as-pseudo;
-  color: var(--token-color-foreground-action);
+  color: rgb(var(--tone-blue-500));
 }
 
 %icon-definition.node dt::before {
diff --git a/ui/packages/consul-ui/app/components/informed-action/index.hbs b/ui/packages/consul-ui/app/components/informed-action/index.hbs
index 34aa6bac37e0e..5e0e3d0bd30cd 100644
--- a/ui/packages/consul-ui/app/components/informed-action/index.hbs
+++ b/ui/packages/consul-ui/app/components/informed-action/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="informed-action"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/informed-action/index.scss b/ui/packages/consul-ui/app/components/informed-action/index.scss
index 955b07aef67ee..23d7cd3ea3c81 100644
--- a/ui/packages/consul-ui/app/components/informed-action/index.scss
+++ b/ui/packages/consul-ui/app/components/informed-action/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 
diff --git a/ui/packages/consul-ui/app/components/informed-action/layout.scss b/ui/packages/consul-ui/app/components/informed-action/layout.scss
index 666f84a7ac13c..b90fc61114558 100644
--- a/ui/packages/consul-ui/app/components/informed-action/layout.scss
+++ b/ui/packages/consul-ui/app/components/informed-action/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %informed-action {
   & {
     min-width: 190px;
diff --git a/ui/packages/consul-ui/app/components/informed-action/skin.scss b/ui/packages/consul-ui/app/components/informed-action/skin.scss
index f18e303fcbd6f..25b7fba8d8e73 100644
--- a/ui/packages/consul-ui/app/components/informed-action/skin.scss
+++ b/ui/packages/consul-ui/app/components/informed-action/skin.scss
@@ -1,14 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %informed-action {
   & {
     border-radius: var(--decor-radius-200);
     border: var(--decor-border-100);
-    border-color: var(--token-color-palette-neutral-300);
-    background-color: var(--token-color-surface-primary);
+    border-color: rgb(var(--tone-gray-300));
+    background-color: rgb(var(--tone-gray-000));
   }
   > div {
     border-top-left-radius: var(--decor-radius-200);
@@ -16,64 +11,64 @@
     cursor: default;
   }
   header {
-    @extend %display-100-semibold;
+    @extend %h400;
   }
   header > * {
     @extend %typo-inherit;
   }
   p {
-    @extend %body-100-regular;
-    color: var(--token-color-hashicorp-brand);
+    @extend %p2;
+    color: rgb(var(--tone-gray-999));
   }
   > ul {
     list-style: none;
   }
   > ul > li > *:hover,
   > ul > li > *:focus {
-    background-color: var(--token-color-surface-strong);
+    background-color: rgb(var(--tone-gray-100));
   }
   /* variants */
   &.info {
     header {
-      color: var(--token-color-foreground-action-active);
+      color: rgb(var(--tone-blue-700));
     }
     header::before {
       @extend %with-info-circle-fill-mask, %as-pseudo;
-      background-color: var(--token-color-foreground-action);
+      background-color: rgb(var(--tone-blue-500));
       margin-right: 5px;
     }
     > div {
-      background-color: var(--token-color-surface-action);
+      background-color: rgb(var(--tone-blue-010));
     }
   }
   &.dangerous {
     header {
-      color: var(--token-color-palette-red-400);
+      color: rgb(var(--tone-red-700));
     }
     header::before {
       @extend %with-alert-triangle-mask, %as-pseudo;
-      background-color: var(--token-color-foreground-critical);
+      background-color: rgb(var(--tone-red-500));
     }
     > div {
-      background-color: var(--token-color-surface-critical);
+      background-color: rgb(var(--tone-red-010));
     }
   }
   &.warning {
     header {
-      color: var(--token-color-foreground-warning-on-surface);
+      color: rgb(var(--tone-orange-700));
     }
     header::before {
       @extend %with-alert-triangle-mask, %as-pseudo;
-      background-color: var(--token-color-vault-brand);
+      background-color: rgb(var(--tone-yellow-500));
       margin-right: 5px;
     }
     > div {
-      background-color: var(--token-color-vault-gradient-faint-start);
+      background-color: rgb(var(--tone-yellow-050));
     }
   }
   /**/
   > ul > .action > * {
-    color: var(--token-color-foreground-action);
+    color: rgb(var(--tone-blue-500));
   }
   > ul > .dangerous > * {
     @extend %frame-red-300;
diff --git a/ui/packages/consul-ui/app/components/inline-alert/debug.scss b/ui/packages/consul-ui/app/components/inline-alert/debug.scss
index 62652e1a8da44..e314a50df05fd 100644
--- a/ui/packages/consul-ui/app/components/inline-alert/debug.scss
+++ b/ui/packages/consul-ui/app/components/inline-alert/debug.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 [id^='docfy-demo-preview-inline-alert'] {
   strong.info {
     @extend %inline-alert-info;
diff --git a/ui/packages/consul-ui/app/components/inline-alert/index.scss b/ui/packages/consul-ui/app/components/inline-alert/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/inline-alert/index.scss
+++ b/ui/packages/consul-ui/app/components/inline-alert/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/inline-alert/layout.scss b/ui/packages/consul-ui/app/components/inline-alert/layout.scss
index a9dd6d9c3de13..c222b9f2b3f8f 100644
--- a/ui/packages/consul-ui/app/components/inline-alert/layout.scss
+++ b/ui/packages/consul-ui/app/components/inline-alert/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %inline-alert {
   position: relative;
   padding-left: 20px;
diff --git a/ui/packages/consul-ui/app/components/inline-alert/skin.scss b/ui/packages/consul-ui/app/components/inline-alert/skin.scss
index b6c1ae37f0f0d..a2bf0d9826e63 100644
--- a/ui/packages/consul-ui/app/components/inline-alert/skin.scss
+++ b/ui/packages/consul-ui/app/components/inline-alert/skin.scss
@@ -1,11 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %inline-alert {
   font-style: normal;
-  font-weight: var(--token-typography-font-weight-regular);
+  font-weight: normal;
 }
 %inline-alert-success,
 %inline-alert-info,
@@ -17,25 +12,25 @@
   color: inherit;
 }
 %inline-alert-error {
-  color: var(--token-color-foreground-critical);
+  color: rgb(var(--color-failure));
 }
 %inline-alert::before {
-  @extend %body-200-regular;
+  font-size: 14px;
 }
 %inline-alert::before {
   @extend %as-pseudo;
 }
 %inline-alert-success::before {
   @extend %with-check-circle-fill-mask;
-  color: var(--token-color-foreground-success);
+  color: rgb(var(--tone-green-500));
 }
 %inline-alert-error::before {
   @extend %with-cancel-square-fill-mask;
-  color: var(--token-color-foreground-critical);
+  color: rgb(var(--tone-red-500));
 }
 %inline-alert-warning::before {
   @extend %with-alert-triangle-mask;
-  color: var(--token-color-foreground-warning);
+  color: rgb(var(--tone-orange-500));
   /* the warning triangle always looks */
   /* too low just because its a triangle */
   /* this tweak make it look better */
@@ -43,5 +38,5 @@
 }
 %inline-alert-info::before {
   @extend %with-info-circle-fill-mask;
-  color: var(--token-color-foreground-action);
+  color: rgb(var(--tone-blue-500));
 }
diff --git a/ui/packages/consul-ui/app/components/inline-code/index.scss b/ui/packages/consul-ui/app/components/inline-code/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/inline-code/index.scss
+++ b/ui/packages/consul-ui/app/components/inline-code/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/inline-code/layout.scss b/ui/packages/consul-ui/app/components/inline-code/layout.scss
index 311f6ad902fc9..499d70d31db8b 100644
--- a/ui/packages/consul-ui/app/components/inline-code/layout.scss
+++ b/ui/packages/consul-ui/app/components/inline-code/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %inline-code {
   display: inline-block;
   padding: 0 4px;
diff --git a/ui/packages/consul-ui/app/components/inline-code/skin.scss b/ui/packages/consul-ui/app/components/inline-code/skin.scss
index d1ce59a88e57a..3fb061925aed9 100644
--- a/ui/packages/consul-ui/app/components/inline-code/skin.scss
+++ b/ui/packages/consul-ui/app/components/inline-code/skin.scss
@@ -1,12 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %block-code,
 %inline-code {
   border: 1px solid;
-  color: var(--token-color-consul-brand);
-  background-color: var(--token-color-surface-strong);
-  border-color: var(--token-color-surface-interactive-active);
+  color: rgb(var(--tone-brand-600));
+  background-color: rgb(var(--tone-gray-050));
+  border-color: rgb(var(--tone-gray-200));
 }
diff --git a/ui/packages/consul-ui/app/components/jwt-source/index.js b/ui/packages/consul-ui/app/components/jwt-source/index.js
index a4d91801fb790..346db02991f05 100644
--- a/ui/packages/consul-ui/app/components/jwt-source/index.js
+++ b/ui/packages/consul-ui/app/components/jwt-source/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/components/list-collection/index.hbs b/ui/packages/consul-ui/app/components/list-collection/index.hbs
index 5988cc14986b6..178144444effd 100644
--- a/ui/packages/consul-ui/app/components/list-collection/index.hbs
+++ b/ui/packages/consul-ui/app/components/list-collection/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="list-collection list-collection-scroll-{{scroll}}"
   style={{{concat
diff --git a/ui/packages/consul-ui/app/components/list-collection/index.js b/ui/packages/consul-ui/app/components/list-collection/index.js
index f4391838c45cc..bfafb198d615c 100644
--- a/ui/packages/consul-ui/app/components/list-collection/index.js
+++ b/ui/packages/consul-ui/app/components/list-collection/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import { computed, get, set } from '@ember/object';
 import Component from 'ember-collection/components/ember-collection';
@@ -34,8 +29,8 @@ export default Component.extend(Slotted, {
     this._super(...arguments);
     this._cellLayout = this['cell-layout'] = new PercentageColumns(
       get(this, 'items.length'),
-      this.columns,
-      this.cellHeight
+      get(this, 'columns'),
+      get(this, 'cellHeight')
     );
     const o = this;
     this['cell-layout'].formatItemStyle = function (itemIndex) {
@@ -51,14 +46,14 @@ export default Component.extend(Slotted, {
       return {};
     }
     return {
-      height: this.height,
+      height: get(this, 'height'),
     };
   }),
   actions: {
     resize: function (e) {
       // TODO: This top part is very similar to resize in tabular-collection
       // see if it make sense to DRY out
-      const dom = this.dom;
+      const dom = get(this, 'dom');
       const $footer = dom.element('footer[role="contentinfo"]');
       if ($footer) {
         const border = 1;
@@ -74,7 +69,7 @@ export default Component.extend(Slotted, {
       return this.dom.clickFirstAnchor(e, '.list-collection > ul > li');
     },
     change: function (index, e = {}) {
-      if (e.target.checked && index !== this.checked) {
+      if (e.target.checked && index !== get(this, 'checked')) {
         set(this, 'checked', parseInt(index));
         this.$row = this.dom.closest('li', e.target);
         this.$row.style.zIndex = 1;
diff --git a/ui/packages/consul-ui/app/components/list-collection/index.scss b/ui/packages/consul-ui/app/components/list-collection/index.scss
index f42d68aa95751..b84e8ef7dd7c8 100644
--- a/ui/packages/consul-ui/app/components/list-collection/index.scss
+++ b/ui/packages/consul-ui/app/components/list-collection/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .list-collection {
diff --git a/ui/packages/consul-ui/app/components/list-collection/layout.scss b/ui/packages/consul-ui/app/components/list-collection/layout.scss
index 7b1804b3f760b..55274a5a8062e 100644
--- a/ui/packages/consul-ui/app/components/list-collection/layout.scss
+++ b/ui/packages/consul-ui/app/components/list-collection/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %list-collection > ul > li,
 %list-collection-scroll-virtual {
   position: relative;
diff --git a/ui/packages/consul-ui/app/components/list-collection/skin.scss b/ui/packages/consul-ui/app/components/list-collection/skin.scss
index 48702631bd1d9..e6e1632c492bd 100644
--- a/ui/packages/consul-ui/app/components/list-collection/skin.scss
+++ b/ui/packages/consul-ui/app/components/list-collection/skin.scss
@@ -1,16 +1,11 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %list-collection > ul {
   border-top: 1px solid;
-  border-color: var(--token-color-surface-interactive-active);
+  border-color: rgb(var(--tone-gray-200));
 }
 %list-collection-partial-button {
   cursor: pointer;
-  background-color: var(--token-color-surface-strong);
-  color: var(--token-color-foreground-action);
+  background-color: rgb(var(--tone-gray-050));
+  color: rgb(var(--tone-blue-500));
 }
 %list-collection-partial-button::after {
   @extend %with-chevron-up-mask, %as-pseudo;
diff --git a/ui/packages/consul-ui/app/components/list-row/index.scss b/ui/packages/consul-ui/app/components/list-row/index.scss
index 65968d570f0ff..38d9051491759 100644
--- a/ui/packages/consul-ui/app/components/list-row/index.scss
+++ b/ui/packages/consul-ui/app/components/list-row/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 %list-row-detail dl {
diff --git a/ui/packages/consul-ui/app/components/list-row/layout.scss b/ui/packages/consul-ui/app/components/list-row/layout.scss
index fc4971e21f6fc..e14d32045be28 100644
--- a/ui/packages/consul-ui/app/components/list-row/layout.scss
+++ b/ui/packages/consul-ui/app/components/list-row/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %list-row {
   /* this can be reused by internal components */
   /* for positioning if required */
@@ -60,5 +55,5 @@
   top: 30px;
 }
 %list-row-200 dd {
-  @extend %body-100-regular;
+  @extend %p2;
 }
diff --git a/ui/packages/consul-ui/app/components/list-row/skin.scss b/ui/packages/consul-ui/app/components/list-row/skin.scss
index 9f490d871c8dd..654e6e8947c41 100644
--- a/ui/packages/consul-ui/app/components/list-row/skin.scss
+++ b/ui/packages/consul-ui/app/components/list-row/skin.scss
@@ -1,35 +1,31 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %list-row {
   list-style-type: none;
   border: var(--decor-border-100);
-  border-top-color: transparent;
-  border-bottom-color: var(--token-color-surface-interactive-active);
-  border-right-color: transparent;
-  border-left-color: transparent;
+  border-top-color: var(--transparent);
+  border-bottom-color: rgb(var(--tone-gray-200));
+  border-right-color: var(--transparent);
+  border-left-color: var(--transparent);
 }
 %list-row-intent {
-  border-color: var(--token-color-surface-interactive-active);
-  box-shadow: var(--token-elevation-high-box-shadow);
-  border-top-color: transparent;
+  border-color: rgb(var(--tone-gray-200));
+  /*TODO: This should use a shared/CSS prop shadow*/
+  box-shadow: 0 2px 4px rgb(var(--black) / 10%);
+  border-top-color: var(--transparent);
   cursor: pointer;
 }
 %list-row-header {
-  color: var(--token-color-hashicorp-brand);
+  color: rgb(var(--tone-gray-999));
 }
 %list-row-header * {
   color: inherit;
 }
 %list-row-detail {
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-500));
 }
 %list-row-detail a {
   color: inherit;
 }
 %list-row-detail a:hover {
-  color: var(--token-color-foreground-action);
+  color: rgb(var(--color-action));
   text-decoration: underline;
 }
diff --git a/ui/packages/consul-ui/app/components/main-header-horizontal/index.scss b/ui/packages/consul-ui/app/components/main-header-horizontal/index.scss
index 7b885758df3aa..07dc13fdcbf4e 100644
--- a/ui/packages/consul-ui/app/components/main-header-horizontal/index.scss
+++ b/ui/packages/consul-ui/app/components/main-header-horizontal/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin.scss';
 @import './layout.scss';
diff --git a/ui/packages/consul-ui/app/components/main-header-horizontal/layout.scss b/ui/packages/consul-ui/app/components/main-header-horizontal/layout.scss
index 6e46b9b88c67d..9d774b25e4972 100644
--- a/ui/packages/consul-ui/app/components/main-header-horizontal/layout.scss
+++ b/ui/packages/consul-ui/app/components/main-header-horizontal/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %main-header-horizontal {
   display: flex;
   position: fixed;
diff --git a/ui/packages/consul-ui/app/components/main-header-horizontal/skin.scss b/ui/packages/consul-ui/app/components/main-header-horizontal/skin.scss
index b75cfe98dfd78..2b789d42e34ab 100644
--- a/ui/packages/consul-ui/app/components/main-header-horizontal/skin.scss
+++ b/ui/packages/consul-ui/app/components/main-header-horizontal/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %main-header-horizontal::before {
-  background-color: var(--token-color-hashicorp-brand);
+  background-color: rgb(var(--tone-gray-000));
 }
diff --git a/ui/packages/consul-ui/app/components/main-nav-horizontal/index.scss b/ui/packages/consul-ui/app/components/main-nav-horizontal/index.scss
index 2189356796764..bcc7a01b37212 100644
--- a/ui/packages/consul-ui/app/components/main-nav-horizontal/index.scss
+++ b/ui/packages/consul-ui/app/components/main-nav-horizontal/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 
@@ -31,6 +26,6 @@
 /**/
 
 /* menu-panels in the main navigation are treated slightly differently */
-%main-nav-horizontal .disclosure-menu button + * {
+%main-nav-horizontal label + div {
   @extend %main-nav-horizontal-menu-panel;
 }
diff --git a/ui/packages/consul-ui/app/components/main-nav-horizontal/layout.scss b/ui/packages/consul-ui/app/components/main-nav-horizontal/layout.scss
index 0db5e63ea0e11..ba9a3027fd3cd 100644
--- a/ui/packages/consul-ui/app/components/main-nav-horizontal/layout.scss
+++ b/ui/packages/consul-ui/app/components/main-nav-horizontal/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %main-nav-horizontal > ul,
 %main-nav-horizontal-panel {
   display: flex;
@@ -21,6 +16,8 @@
 %main-nav-horizontal-menu-panel {
   z-index: 400;
   /* TODO: We should probably make menu-panel default to left hand side*/
+  left: 0;
+  right: auto;
   top: 28px !important;
 }
 %main-nav-horizontal-action {
diff --git a/ui/packages/consul-ui/app/components/main-nav-horizontal/skin.scss b/ui/packages/consul-ui/app/components/main-nav-horizontal/skin.scss
index 8cd1c1e646885..ab564cbb0479a 100644
--- a/ui/packages/consul-ui/app/components/main-nav-horizontal/skin.scss
+++ b/ui/packages/consul-ui/app/components/main-nav-horizontal/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %main-nav-horizontal-action {
   border-radius: var(--decor-radius-200);
   cursor: pointer;
@@ -18,28 +13,18 @@
   transform: scaleY(-100%);
 }
 
-%main-nav-horizontal-menu-panel,
-%main-nav-horizontal-menu-panel > ul[role='menu'],
-%main-nav-horizontal-menu-panel > ul[role='menu'] > li > [role='menuitem'] {
-  background-color: var(--token-color-hashicorp-brand);
-  color: var(--token-color-palette-neutral-300);
-}
-
-%main-nav-horizontal-menu-panel > ul[role='menu'] > li > [role='menuitem']:hover {
-  background-color: var(--token-color-palette-neutral-600);
-}
-
 %main-nav-horizontal-toggle {
   display: none;
 }
 %main-nav-horizontal-toggle-button::before {
   --icon-name: icon-menu;
-  --icon-color: var(--token-color-palette-neutral-300);
+  --icon-color: rgb(var(--tone-gray-800));
   content: '';
   cursor: pointer;
 }
 %main-nav-horizontal-action,
 %main-nav-horizontal-action-intent,
 %main-nav-horizontal-action-active {
-  color: var(--token-color-palette-neutral-300);
+  color: rgb(var(--tone-gray-600));
 }
+/**/
diff --git a/ui/packages/consul-ui/app/components/main-nav-vertical/README.mdx b/ui/packages/consul-ui/app/components/main-nav-vertical/README.mdx
index a079e76e41273..12039d3bb45ab 100644
--- a/ui/packages/consul-ui/app/components/main-nav-vertical/README.mdx
+++ b/ui/packages/consul-ui/app/components/main-nav-vertical/README.mdx
@@ -65,7 +65,7 @@ you need to define a different ancestor for a containing block you can use
   /* a transform is required to mark this element as the containing block */
   /* for hoisting, otherwise the viewport is the containing block */
   transform: translate(0, 0);
-  background-color: var(--token-color-foreground-faint);
+  background-color: rgb(var(--tone-gray-600));
   padding-top: 64px;
 }
 ```
diff --git a/ui/packages/consul-ui/app/components/main-nav-vertical/debug.scss b/ui/packages/consul-ui/app/components/main-nav-vertical/debug.scss
index f277042b42d8f..8d8a8e3a348dd 100644
--- a/ui/packages/consul-ui/app/components/main-nav-vertical/debug.scss
+++ b/ui/packages/consul-ui/app/components/main-nav-vertical/debug.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 #docfy-demo-preview-main-nav-vertical {
   .main-nav-vertical {
     @extend %main-nav-vertical;
@@ -20,7 +15,7 @@
     /* a transform is required to mark this element as the containing block */
     /* for hoisting, otherwise the viewport is the containing block */
     transform: translate(0, 0);
-    background-color: var(--token-color-foreground-faint);
+    background-color: rgb(var(--tone-gray-600));
     padding-top: 64px;
   }
   // TODO: Reduce the need for these debug overrides
diff --git a/ui/packages/consul-ui/app/components/main-nav-vertical/index.scss b/ui/packages/consul-ui/app/components/main-nav-vertical/index.scss
index fd8f7cf4b5626..ab9130b93a3b7 100644
--- a/ui/packages/consul-ui/app/components/main-nav-vertical/index.scss
+++ b/ui/packages/consul-ui/app/components/main-nav-vertical/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 /* things that should look like nav buttons */
diff --git a/ui/packages/consul-ui/app/components/main-nav-vertical/layout.scss b/ui/packages/consul-ui/app/components/main-nav-vertical/layout.scss
index a63b82f951c79..5b490bb5e7a33 100644
--- a/ui/packages/consul-ui/app/components/main-nav-vertical/layout.scss
+++ b/ui/packages/consul-ui/app/components/main-nav-vertical/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %main-nav-vertical {
   position: absolute;
   left: 0;
diff --git a/ui/packages/consul-ui/app/components/main-nav-vertical/skin.scss b/ui/packages/consul-ui/app/components/main-nav-vertical/skin.scss
index bda8a21101771..e1930d8bf72ac 100644
--- a/ui/packages/consul-ui/app/components/main-nav-vertical/skin.scss
+++ b/ui/packages/consul-ui/app/components/main-nav-vertical/skin.scss
@@ -1,21 +1,17 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %main-nav-vertical-action {
-  @extend %body-200-medium;
+  @extend %p1;
   cursor: pointer;
   border-right: var(--decor-border-400);
-  border-color: transparent;
+  border-color: var(--transparent);
 }
 %main-nav-vertical-action > a {
   color: inherit;
   font-size: inherit;
 }
 %main-nav-vertical [role='separator'] {
-  @extend %body-100-medium;
+  @extend %p3;
   text-transform: uppercase;
+  font-weight: var(--typo-weight-medium);
 }
 %main-nav-vertical-action-intent {
   text-decoration: underline;
@@ -24,31 +20,29 @@
   text-decoration: none;
 }
 %main-nav-vertical {
-  background-color: var(--token-color-foreground-strong);
-  color: var(--token-color-foreground-faint);
+  background-color: rgb(var(--tone-gray-050));
+  color: rgb(var(--tone-gray-700));
 }
 %main-nav-vertical li:not([role='separator']) > span {
-  color: var(--token-color-palette-neutral-300);
+  color: rgb(var(--tone-gray-300));
 }
-%main-nav-vertical [role='separator'],
-%main-nav-vertical-hoisted [role='separator'] {
-  color: var(--token-color-palette-neutral-400);
-  background-color: var(--token-color-foreground-strong);
+%main-nav-vertical [role='separator'] {
+  color: rgb(var(--tone-gray-600));
 }
 %main-nav-vertical-action {
-  color: var(--token-color-palette-neutral-300);
+  color: rgb(var(--tone-gray-800));
 }
 %main-nav-vertical-item,
 %main-nav-vertical-action-intent,
 %main-nav-vertical-action-active {
-  color: var(--token-color-palette-neutral-0);
+  color: rgb(var(--tone-gray-999));
 }
 %main-nav-vertical-action-active {
-  background-color: var(--token-color-palette-neutral-500);
-  border-color: var(--token-color-palette-neutral-0);
+  background-color: rgb(var(--tone-gray-150));
+  border-color: rgb(var(--tone-gray-999));
 }
 %main-nav-vertical [aria-label]::before {
-  color: var(--token-color-palette-neutral-400);
+  color: rgb(var(--tone-gray-700));
   content: attr(aria-label);
   display: block;
   margin-top: -0.5rem;
@@ -56,42 +50,18 @@
 }
 %main-nav-vertical-popover-menu-trigger {
   border: var(--decor-border-100);
-  border-color: var(--token-color-foreground-faint);
+  border-color: rgb(var(--tone-gray-500));
   border-radius: var(--decor-radius-100);
 
   font-weight: inherit;
 
-  background-color: var(--token-color-foreground-strong);
-  color: var(--token-color-palette-neutral-200);
-}
-
-%main-nav-vertical-popover-menu-trigger:hover,
-%main-nav-vertical-popover-menu-trigger:focus {
-  color: var(--token-color-palette-neutral-300);
-  background-color: var(--token-color-foreground-strong);
-}
-
-%main-nav-vertical ul[role='menu'] li a[role='menuitem'] {
-  color: var(--token-color-palette-neutral-300);
-  background-color: var(--token-color-foreground-strong);
-}
-
-%main-nav-vertical ul[role='menu']li a[role='menuitem']:hover {
-  background-color: var(--token-color-palette-neutral-600);
+  background-color: rgb(var(--tone-gray-050));
+  color: rgb(var(--tone-gray-999));
 }
-
 %main-nav-vertical-popover-menu-trigger[aria-expanded='true'] {
   border-bottom-left-radius: var(--decor-radius-000);
   border-bottom-right-radius: var(--decor-radius-000);
 }
-
-%main-nav-horizontal %panel,
-%main-nav-horizontal %panel-separator,
-%main-nav-vertical %panel,
-%main-nav-vertical %panel-separator {
-  border-color: var(--token-color-foreground-faint);
-}
-
 %main-nav-vertical-popover-menu-trigger::after {
   @extend %with-chevron-down-mask, %as-pseudo;
   width: 16px;
@@ -105,10 +75,4 @@
   border-top-left-radius: var(--decor-radius-000);
   border-top-right-radius: var(--decor-radius-000);
   border-top: var(--decor-border-000);
-  color: var(--token-color-palette-neutral-300);
-  background-color: var(--token-color-foreground-strong);
-}
-
-%main-nav-vertical-hoisted ul[role='menu'] {
-  background-color: var(--token-color-hashicorp-brand);
 }
diff --git a/ui/packages/consul-ui/app/components/menu-panel/deprecated.scss b/ui/packages/consul-ui/app/components/menu-panel/deprecated.scss
index 219f74069df53..c95d6cde50aa5 100644
--- a/ui/packages/consul-ui/app/components/menu-panel/deprecated.scss
+++ b/ui/packages/consul-ui/app/components/menu-panel/deprecated.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* old stuff */
 
 %menu-panel {
diff --git a/ui/packages/consul-ui/app/components/menu-panel/index.hbs b/ui/packages/consul-ui/app/components/menu-panel/index.hbs
index c7582dbd601a8..15b430059a89a 100644
--- a/ui/packages/consul-ui/app/components/menu-panel/index.hbs
+++ b/ui/packages/consul-ui/app/components/menu-panel/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
 {{#let (hash
   change=(action "change")
diff --git a/ui/packages/consul-ui/app/components/menu-panel/index.js b/ui/packages/consul-ui/app/components/menu-panel/index.js
index 4a7833b14f74d..fca3fcb99fb0f 100644
--- a/ui/packages/consul-ui/app/components/menu-panel/index.js
+++ b/ui/packages/consul-ui/app/components/menu-panel/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import { next } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/app/components/menu-panel/index.scss b/ui/packages/consul-ui/app/components/menu-panel/index.scss
index 3e298a143c619..e34a3060c812c 100644
--- a/ui/packages/consul-ui/app/components/menu-panel/index.scss
+++ b/ui/packages/consul-ui/app/components/menu-panel/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 @import './deprecated';
diff --git a/ui/packages/consul-ui/app/components/menu-panel/layout.scss b/ui/packages/consul-ui/app/components/menu-panel/layout.scss
index 870c667d5f804..28737bb577892 100644
--- a/ui/packages/consul-ui/app/components/menu-panel/layout.scss
+++ b/ui/packages/consul-ui/app/components/menu-panel/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %menu-panel-header {
   padding: 0.625rem var(--padding-x); /* 10px */
   white-space: normal;
diff --git a/ui/packages/consul-ui/app/components/menu-panel/skin.scss b/ui/packages/consul-ui/app/components/menu-panel/skin.scss
index b3b55f386398e..e1aa9075131be 100644
--- a/ui/packages/consul-ui/app/components/menu-panel/skin.scss
+++ b/ui/packages/consul-ui/app/components/menu-panel/skin.scss
@@ -1,17 +1,12 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %menu-panel-button-selected::after {
   @extend %with-check-plain-mask, %as-pseudo;
 }
 %menu-panel-header {
-  @extend %body-100-regular;
+  @extend %p2;
 }
 %menu-panel-header + ul {
   border-top: var(--decor-border-100);
-  border-color: var(--token-form--base-border-color-default);
+  border-color: rgb(var(--tone-border, var(--tone-gray-300)));
 }
 /* if the first item is a separator and it */
 /* contains text don't add a line */
@@ -19,17 +14,18 @@
   border: none;
 }
 %menu-panel-separator {
-  @extend %body-100-medium;
+  @extend %p3;
   text-transform: uppercase;
-  color: var(--token-color-foreground-faint);
+  font-weight: var(--typo-weight-medium);
+  color: rgb(var(--tone-gray-600));
 }
 %menu-panel-item {
   list-style-type: none;
 }
 %menu-panel-badge {
   @extend %pill;
-  color: var(--token-color-surface-primary);
-  background-color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-000));
+  background-color: rgb(var(--tone-gray-500));
 }
 %menu-panel-body .informed-action {
   border: 0 !important;
diff --git a/ui/packages/consul-ui/app/components/menu/action/index.hbs b/ui/packages/consul-ui/app/components/menu/action/index.hbs
index 0b76c287d7592..efe6409637c93 100644
--- a/ui/packages/consul-ui/app/components/menu/action/index.hbs
+++ b/ui/packages/consul-ui/app/components/menu/action/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Action
   role="menuitem"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/menu/index.hbs b/ui/packages/consul-ui/app/components/menu/index.hbs
index 34c8b5cc0841c..cd49e1655d815 100644
--- a/ui/packages/consul-ui/app/components/menu/index.hbs
+++ b/ui/packages/consul-ui/app/components/menu/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <ul
   role="menu"
   style={{{style-map
diff --git a/ui/packages/consul-ui/app/components/menu/item/index.hbs b/ui/packages/consul-ui/app/components/menu/item/index.hbs
index a21058e79df3b..6cf4952310007 100644
--- a/ui/packages/consul-ui/app/components/menu/item/index.hbs
+++ b/ui/packages/consul-ui/app/components/menu/item/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <li
   role="none"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/menu/separator/index.hbs b/ui/packages/consul-ui/app/components/menu/separator/index.hbs
index b893690383ff1..af10731af6d31 100644
--- a/ui/packages/consul-ui/app/components/menu/separator/index.hbs
+++ b/ui/packages/consul-ui/app/components/menu/separator/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <li
   role="separator"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/modal-dialog/index.hbs b/ui/packages/consul-ui/app/components/modal-dialog/index.hbs
index 4aed448d5d358..6cb2f944f9ef8 100644
--- a/ui/packages/consul-ui/app/components/modal-dialog/index.hbs
+++ b/ui/packages/consul-ui/app/components/modal-dialog/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#let (hash
   labelledby=(unique-id)
 ) as |aria|}}
@@ -25,14 +20,12 @@
           role="document"
         >
           <header class="modal-dialog-header">
-            <Hds::Button
+            <button
+              type="button"
               data-a11y-dialog-hide
-              @text='Close dialog'
-              @color='secondary'
-              @icon='x'
-              @size='small'
-              @isIconOnly={{true}}
-            />
+              aria-label="Close dialog"
+            >
+            </button>
             <YieldSlot @name="header">
               {{yield (hash
                 open=(action "open")
diff --git a/ui/packages/consul-ui/app/components/modal-dialog/index.js b/ui/packages/consul-ui/app/components/modal-dialog/index.js
index 07002606c1f80..79b68b66772f0 100644
--- a/ui/packages/consul-ui/app/components/modal-dialog/index.js
+++ b/ui/packages/consul-ui/app/components/modal-dialog/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { set } from '@ember/object';
 import Slotted from 'block-slots';
diff --git a/ui/packages/consul-ui/app/components/modal-dialog/index.scss b/ui/packages/consul-ui/app/components/modal-dialog/index.scss
index dc8f0a045a65d..958bd312cf948 100644
--- a/ui/packages/consul-ui/app/components/modal-dialog/index.scss
+++ b/ui/packages/consul-ui/app/components/modal-dialog/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .modal-layer {
diff --git a/ui/packages/consul-ui/app/components/modal-dialog/layout.scss b/ui/packages/consul-ui/app/components/modal-dialog/layout.scss
index 71b46eb903195..f82dd73c23477 100644
--- a/ui/packages/consul-ui/app/components/modal-dialog/layout.scss
+++ b/ui/packages/consul-ui/app/components/modal-dialog/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %modal-layer {
   height: 0;
 }
@@ -68,5 +63,7 @@
 }
 %modal-window > header button {
   float: right;
+  width: 24px;
+  height: 24px;
   margin-top: -3px;
 }
diff --git a/ui/packages/consul-ui/app/components/modal-dialog/skin.scss b/ui/packages/consul-ui/app/components/modal-dialog/skin.scss
index 8524f687739ae..79ca00f18e9ed 100644
--- a/ui/packages/consul-ui/app/components/modal-dialog/skin.scss
+++ b/ui/packages/consul-ui/app/components/modal-dialog/skin.scss
@@ -1,46 +1,41 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %modal-dialog.warning header {
-  background-color: var(--token-color-vault-gradient-faint-start);
-  border-color: var(--token-color-vault-brand);
-  color: var(--token-color-vault-foreground);
+  background-color: rgb(var(--tone-yellow-050));
+  border-color: rgb(var(--tone-yellow-500));
+  color: rgb(var(--tone-yellow-800));
 }
 %modal-dialog.warning header > *:not(label) {
-  @extend %display-300-semibold;
+  font-size: var(--typo-size-500);
+  font-weight: var(--typo-weight-semibold);
 }
 %modal-dialog.warning header::before {
   @extend %with-alert-triangle-mask, %as-pseudo;
-  color: var(--token-color-vault-brand);
+  color: rgb(var(--tone-yellow-500));
   float: left;
   margin-top: 2px;
   margin-right: 3px;
 }
 %modal-dialog-overlay {
-  background-color: var(--token-color-surface-interactive);
-  opacity: 0.9;
+  background-color: rgb(var(--tone-gray-000) / 90%);
 }
 %modal-window {
-  box-shadow: var(--token-elevation-overlay-box-shadow);
+  box-shadow: var(--decor-elevation-800);
 }
 %modal-window {
   /*%frame-gray-000*/
-  background-color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-gray-000));
 }
 %modal-window > footer,
 %modal-window > header {
   @extend %frame-gray-800;
 }
-%modal-window > header > *:not(button) {
-  @extend %display-400-semibold;
+%modal-window > header > * {
+  @extend %h200;
 }
 
 .modal-dialog-body,
 %modal-window > footer,
 %modal-window > header {
-  border-color: var(--token-color-palette-neutral-300);
+  border-color: rgb(var(--tone-gray-300));
 }
 .modal-dialog-body {
   border-style: solid;
@@ -51,3 +46,17 @@
 %modal-window > header {
   border-width: 1px;
 }
+
+%modal-window > header button {
+  cursor: pointer;
+  border: var(--decor-border-100);
+  /*%frame-gray-050??*/
+  background-color: rgb(var(--tone-gray-050));
+  border-color: rgb(var(--tone-gray-300));
+  border-radius: var(--decor-radius-100);
+}
+%modal-window > header button::before {
+  @extend %with-cancel-plain-icon, %as-pseudo;
+  margin-left: -7px;
+  margin-top: -3px;
+}
diff --git a/ui/packages/consul-ui/app/components/modal-layer/index.hbs b/ui/packages/consul-ui/app/components/modal-layer/index.hbs
index a76e270011fe1..20888f6e68075 100644
--- a/ui/packages/consul-ui/app/components/modal-layer/index.hbs
+++ b/ui/packages/consul-ui/app/components/modal-layer/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="modal-layer"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/more-popover-menu/index.hbs b/ui/packages/consul-ui/app/components/more-popover-menu/index.hbs
index 35b2c1524b151..6fd727f1195e1 100644
--- a/ui/packages/consul-ui/app/components/more-popover-menu/index.hbs
+++ b/ui/packages/consul-ui/app/components/more-popover-menu/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="more-popover-menu"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/more-popover-menu/index.js b/ui/packages/consul-ui/app/components/more-popover-menu/index.js
index d99599ac30397..4798652642ba8 100644
--- a/ui/packages/consul-ui/app/components/more-popover-menu/index.js
+++ b/ui/packages/consul-ui/app/components/more-popover-menu/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/packages/consul-ui/app/components/more-popover-menu/index.scss b/ui/packages/consul-ui/app/components/more-popover-menu/index.scss
index 12c640d4b6b36..7b7f419cc4505 100644
--- a/ui/packages/consul-ui/app/components/more-popover-menu/index.scss
+++ b/ui/packages/consul-ui/app/components/more-popover-menu/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .more-popover-menu {
   @extend %more-popover-menu;
 }
@@ -19,7 +14,7 @@
   padding: 7px;
 }
 %more-popover-menu-trigger > * {
-  background-color: transparent;
+  background-color: var(--transparent);
   border-radius: var(--decor-radius-100);
   width: 30px;
   height: 30px;
@@ -27,7 +22,7 @@
 }
 %more-popover-menu-trigger > *::after {
   --icon-name: icon-more-horizontal;
-  --icon-color: var(--token-color-foreground-strong);
+  --icon-color: rgb(var(--tone-gray-900));
   --icon-size: icon-300;
   content: '';
   position: absolute;
@@ -37,9 +32,9 @@
   margin-left: -8px;
 }
 %more-popover-menu-trigger > *:active {
-  background-color: var(--token-color-surface-strong);
+  background-color: rgb(var(--tone-gray-100));
 }
 %more-popover-menu-trigger > *:hover,
 %more-popover-menu-trigger > *:focus {
-  background-color: var(--token-color-surface-strong);
+  background-color: rgb(var(--tone-gray-050));
 }
diff --git a/ui/packages/consul-ui/app/components/more-popover-menu/pageobject.js b/ui/packages/consul-ui/app/components/more-popover-menu/pageobject.js
index 4a0bc35ca3aea..2198b2a7532d3 100644
--- a/ui/packages/consul-ui/app/components/more-popover-menu/pageobject.js
+++ b/ui/packages/consul-ui/app/components/more-popover-menu/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (clickable, confirmation) => (actions, scope) => {
   return actions.reduce(
     (prev, item) => {
diff --git a/ui/packages/consul-ui/app/components/notice/README.mdx b/ui/packages/consul-ui/app/components/notice/README.mdx
new file mode 100644
index 0000000000000..ed05cb8a21928
--- /dev/null
+++ b/ui/packages/consul-ui/app/components/notice/README.mdx
@@ -0,0 +1,50 @@
+# Notice
+
+Presentational component for informational/warning/error banners/notices.
+
+
+```hbs preview-template
+<Notice
+  @type={{this.type}}
+as |notice|>
+  <notice.Header>
+    <h3>Header</h3>
+  </notice.Header>
+  <notice.Body>
+    <p>
+      Body
+    </p>
+  </notice.Body>
+  <notice.Footer>
+    <p>
+      <a href="">Footer link</a>
+    </p>
+  </notice.Footer>
+</Notice>
+
+<figure>
+  <figcaption>Provide a widget to change the <code>@type</code></figcaption>
+
+  <select
+    onchange={{action (mut this.type) value="target.value"}}
+  >
+    <option>info</option>
+    <option>success</option>
+    <option>warning</option>
+    <option>error</option>
+  </select>
+
+</figure>
+```
+
+## Arguments
+
+| Argument/Attribute | Type | Default | Description |
+| --- | --- | --- | --- |
+| `type` | `String` | `info` | Type of notice [info\|warning\|error] |
+
+## See
+
+- [Template Source Code](./index.hbs)
+
+---
diff --git a/ui/packages/consul-ui/app/components/notice/index.hbs b/ui/packages/consul-ui/app/components/notice/index.hbs
new file mode 100644
index 0000000000000..59448aed0d4d7
--- /dev/null
+++ b/ui/packages/consul-ui/app/components/notice/index.hbs
@@ -0,0 +1,10 @@
+<div
+  class="notice {{or @type 'info'}}"
+  ...attributes
+>
+{{yield (hash
+  Header=(component 'anonymous' tagName="header")
+  Body=(component 'anonymous')
+  Footer=(component 'anonymous' tagName="footer")
+)}}
+</div>
diff --git a/ui/packages/consul-ui/app/components/notice/index.scss b/ui/packages/consul-ui/app/components/notice/index.scss
new file mode 100644
index 0000000000000..a965188ec3fc8
--- /dev/null
+++ b/ui/packages/consul-ui/app/components/notice/index.scss
@@ -0,0 +1,31 @@
+@import './skin';
+@import './layout';
+
+%notice {
+  margin: 1em 0;
+}
+/**/
+.notice.success {
+  @extend %notice-success;
+}
+.notice.warning {
+  @extend %notice-warning;
+}
+.notice.error {
+  @extend %notice-error;
+}
+.notice.info {
+  @extend %notice-info;
+}
+.notice.highlight {
+  @extend %notice-highlight;
+}
+.notice.policy-management {
+  @extend %notice-highlight;
+}
+.notice.crd::before {
+  -webkit-mask-image: none;
+  mask-image: none;
+  background-color: transparent;
+  @extend %with-logo-kubernetes-color-icon;
+}
diff --git a/ui/packages/consul-ui/app/components/notice/layout.scss b/ui/packages/consul-ui/app/components/notice/layout.scss
new file mode 100644
index 0000000000000..f7f49a9d430d0
--- /dev/null
+++ b/ui/packages/consul-ui/app/components/notice/layout.scss
@@ -0,0 +1,24 @@
+%notice {
+  position: relative;
+  padding: 0.8rem;
+}
+%notice header {
+  margin-bottom: 0.1rem;
+}
+%notice header > * {
+  margin-bottom: 0;
+}
+%notice p {
+  margin-bottom: 0.3rem;
+  line-height: 1.4;
+}
+/* this is probably skin */
+%notice {
+  padding-left: calc(0.8rem + 1.4rem);
+}
+%notice::before {
+  position: absolute;
+  top: 0.8rem;
+  left: 0.6rem;
+  font-size: 1rem;
+}
diff --git a/ui/packages/consul-ui/app/components/notice/skin.scss b/ui/packages/consul-ui/app/components/notice/skin.scss
new file mode 100644
index 0000000000000..3ecae0e8678ab
--- /dev/null
+++ b/ui/packages/consul-ui/app/components/notice/skin.scss
@@ -0,0 +1,77 @@
+%notice {
+  border-radius: var(--decor-radius-100);
+  border: var(--decor-border-100);
+  color: rgb(var(--tone-gray-999));
+}
+%notice::before {
+  @extend %as-pseudo;
+}
+%notice header > * {
+  @extend %h300;
+}
+%notice footer * {
+  @extend %p3;
+  font-weight: var(--typo-weight-bold);
+}
+%notice-success,
+%notice-info,
+%notice-highlight,
+%notice-error,
+%notice-warning {
+  @extend %notice;
+}
+%notice-success {
+  background-color: rgb(var(--tone-green-050));
+  border-color: rgb(var(--tone-green-500));
+}
+%notice-success header * {
+  color: rgb(var(--tone-green-800));
+}
+%notice-info {
+  border-color: rgb(var(--tone-blue-100));
+  background-color: rgb(var(--tone-blue-010));
+}
+%notice-info header * {
+  color: rgb(var(--tone-blue-700));
+}
+%notice-highlight {
+  background-color: rgb(var(--tone-gray-050));
+  border-color: rgb(var(--tone-gray-300));
+}
+%notice-info header * {
+  color: rgb(var(--tone-blue-700));
+}
+%notice-warning {
+  border-color: rgb(var(--tone-yellow-100));
+  background-color: rgb(var(--tone-yellow-050));
+}
+%notice-warning header * {
+  color: rgb(var(--tone-yellow-800));
+}
+%notice-error {
+  background-color: rgb(var(--tone-red-050));
+  border-color: rgb(var(--tone-red-500));
+}
+%notice-error header * {
+  color: rgb(var(--tone-red-500));
+}
+%notice-success::before {
+  @extend %with-check-circle-fill-mask;
+  color: rgb(var(--tone-green-500));
+}
+%notice-info::before {
+  @extend %with-info-circle-fill-mask;
+  color: rgb(var(--tone-blue-500));
+}
+%notice-highlight::before {
+  @extend %with-star-fill-mask;
+  color: rgb(var(--tone-yellow-500));
+}
+%notice-warning::before {
+  @extend %with-alert-triangle-mask;
+  color: rgb(var(--tone-orange-500));
+}
+%notice-error::before {
+  @extend %with-cancel-square-fill-mask;
+  color: rgb(var(--tone-red-500));
+}
diff --git a/ui/packages/consul-ui/app/components/oidc-select/chart.xstate.js b/ui/packages/consul-ui/app/components/oidc-select/chart.xstate.js
index bd2ee43bd0a26..3d8ef1d6ceb06 100644
--- a/ui/packages/consul-ui/app/components/oidc-select/chart.xstate.js
+++ b/ui/packages/consul-ui/app/components/oidc-select/chart.xstate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   id: 'oidc-select',
   initial: 'idle',
diff --git a/ui/packages/consul-ui/app/components/oidc-select/index.hbs b/ui/packages/consul-ui/app/components/oidc-select/index.hbs
index d5baea36ee527..3c9d4cb876d99 100644
--- a/ui/packages/consul-ui/app/components/oidc-select/index.hbs
+++ b/ui/packages/consul-ui/app/components/oidc-select/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <StateChart @src={{chart}} as |State Guard ChartAction dispatch state|>
   {{#let
     (hash State=State Guard=Guard Action=ChartAction dispatch=dispatch state=state)
@@ -54,12 +49,12 @@
         {{! this belongs to the outer StateChart but we need }}
         {{! to understand validation state }}
         <State @matches='idle'>
-          <Hds::Button
-            type='submit'
-            @text='Choose provider'
-            disabled={{or (lt this.partition.length 1) (state-matches state 'error')}}
+          <Action
+            {{disabled (or (lt this.partition.length 1) (state-matches state 'error'))}}
             {{on 'click' (fn dispatch 'LOAD')}}
-          />
+          >
+            Choose provider
+          </Action>
         </State>
 
       </StateChart>
@@ -110,12 +105,10 @@
               </:option>
             </OptionInput>
 
-          <Hds::Button
-            @color='primary'
-            @text='Log in'
-            disabled={{@disabled}}
-            {{on 'click' (fn @onchange item)}}
-          />
+            <Action @type='button' {{disabled @disabled}} {{on 'click' (fn @onchange item)}}>
+              Log in
+            </Action>
+
           {{/let}}
         {{/if}}
       </State>
diff --git a/ui/packages/consul-ui/app/components/oidc-select/index.js b/ui/packages/consul-ui/app/components/oidc-select/index.js
index 4c55b12967ed2..4fb78062d4d22 100644
--- a/ui/packages/consul-ui/app/components/oidc-select/index.js
+++ b/ui/packages/consul-ui/app/components/oidc-select/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 
diff --git a/ui/packages/consul-ui/app/components/oidc-select/index.scss b/ui/packages/consul-ui/app/components/oidc-select/index.scss
index 23d85f90bf547..203892d9f85d0 100644
--- a/ui/packages/consul-ui/app/components/oidc-select/index.scss
+++ b/ui/packages/consul-ui/app/components/oidc-select/index.scss
@@ -1,17 +1,14 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 %oidc-select label {
   @extend %form-element;
 }
-
+%oidc-select button:not(.reset) {
+  @extend %primary-button;
+}
 %oidc-select button.reset {
   @extend %anchor;
-  @extend %body-100-regular;
+  @extend %p3;
 }
 .oidc-select {
   @extend %oidc-select;
diff --git a/ui/packages/consul-ui/app/components/oidc-select/layout.scss b/ui/packages/consul-ui/app/components/oidc-select/layout.scss
index ab1ccd686c086..2175b4c1bc80c 100644
--- a/ui/packages/consul-ui/app/components/oidc-select/layout.scss
+++ b/ui/packages/consul-ui/app/components/oidc-select/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %oidc-select li,
 %oidc-select .ember-power-select-trigger {
   margin-bottom: 1em;
diff --git a/ui/packages/consul-ui/app/components/oidc-select/skin.scss b/ui/packages/consul-ui/app/components/oidc-select/skin.scss
index c4f548f97ae8f..410527ae2d195 100644
--- a/ui/packages/consul-ui/app/components/oidc-select/skin.scss
+++ b/ui/packages/consul-ui/app/components/oidc-select/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %oidc-select [class$='-oidc-provider']::before {
   width: 22px;
   height: 22px;
diff --git a/ui/packages/consul-ui/app/components/option-input/index.hbs b/ui/packages/consul-ui/app/components/option-input/index.hbs
index f8906f529c91a..fed308947b2b9 100644
--- a/ui/packages/consul-ui/app/components/option-input/index.hbs
+++ b/ui/packages/consul-ui/app/components/option-input/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <FormInput
   class="option-input type-select"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/outlet/index.hbs b/ui/packages/consul-ui/app/components/outlet/index.hbs
index 3217937571503..98d1db1afd63b 100644
--- a/ui/packages/consul-ui/app/components/outlet/index.hbs
+++ b/ui/packages/consul-ui/app/components/outlet/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{did-insert this.connect}}
 {{will-destroy this.disconnect}}
 <section
diff --git a/ui/packages/consul-ui/app/components/outlet/index.js b/ui/packages/consul-ui/app/components/outlet/index.js
index 1ffcb8c4f39d9..693cdbeed6c36 100644
--- a/ui/packages/consul-ui/app/components/outlet/index.js
+++ b/ui/packages/consul-ui/app/components/outlet/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/overlay/index.scss b/ui/packages/consul-ui/app/components/overlay/index.scss
index 99e8dd43df872..899162a84722f 100644
--- a/ui/packages/consul-ui/app/components/overlay/index.scss
+++ b/ui/packages/consul-ui/app/components/overlay/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './none.scss';
 @import './square-tail.scss';
diff --git a/ui/packages/consul-ui/app/components/overlay/none.scss b/ui/packages/consul-ui/app/components/overlay/none.scss
index 60b147c382ba0..951343b7703cd 100644
--- a/ui/packages/consul-ui/app/components/overlay/none.scss
+++ b/ui/packages/consul-ui/app/components/overlay/none.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .tippy-box {
   @extend %overlay;
 }
@@ -31,9 +26,9 @@
     transition-timing-function: cubic-bezier(0.54, 1.5, 0.38, 1.11);
   }
   & {
-    background-color: var(--token-color-surface-primary);
+    background-color: rgb(var(--tone-gray-000));
     border-radius: var(--decor-radius-100);
-    box-shadow: var(--token-surface-mid-box-shadow);
+    box-shadow: var(--decor-elevation-400);
   }
   .tippy-arrow {
     @extend %overlay-tail;
diff --git a/ui/packages/consul-ui/app/components/overlay/square-tail.scss b/ui/packages/consul-ui/app/components/overlay/square-tail.scss
index 1d221851d4920..286ababa3aec4 100644
--- a/ui/packages/consul-ui/app/components/overlay/square-tail.scss
+++ b/ui/packages/consul-ui/app/components/overlay/square-tail.scss
@@ -1,19 +1,14 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 [data-theme~='square-tail'] {
   .tippy-arrow {
     --size: 18px;
     left: calc(0px - (var(--size) / 2)) !important;
   }
   .tippy-arrow::before {
-    background-color: var(--token-color-surface-primary);
+    background-color: rgb(var(--tone-gray-000));
     width: calc(1px + var(--size));
     height: calc(1px + var(--size));
     border: var(--decor-border-100);
-    border-color: var(--token-color-palette-neutral-300);
+    border-color: rgb(var(--tone-gray-300));
   }
   // potential icon
   .tippy-arrow::after {
diff --git a/ui/packages/consul-ui/app/components/paged-collection/README.mdx b/ui/packages/consul-ui/app/components/paged-collection/README.mdx
index 0572b48f8e25c..c50b393b9734f 100644
--- a/ui/packages/consul-ui/app/components/paged-collection/README.mdx
+++ b/ui/packages/consul-ui/app/components/paged-collection/README.mdx
@@ -29,7 +29,7 @@ A renderless component to act as a helper for different types of pagination.
     as |pager|>
       <div
         style={{{style-map
-          (array 'outline' '1px solid var(--token-color-palette-neutral-300)')
+          (array 'outline' '1px solid rgb(var(--tone-gray-300))')
           (array 'max-height' '360' 'px')
           (array '--paged-row-height' (if (not-eq this.type 'index') '43px'))
         }}}
@@ -46,7 +46,7 @@ A renderless component to act as a helper for different types of pagination.
           <li
             style={{{style-map
               (array 'height' '43' 'px')
-              (array 'outline' '1px solid var(--token-color-surface-strong)')
+              (array 'outline' '1px solid rgb(var(--tone-gray-100))')
             }}}
           >
             {{item.Node}}
diff --git a/ui/packages/consul-ui/app/components/paged-collection/index.hbs b/ui/packages/consul-ui/app/components/paged-collection/index.hbs
index c21d9104d63ce..724cb20d75871 100644
--- a/ui/packages/consul-ui/app/components/paged-collection/index.hbs
+++ b/ui/packages/consul-ui/app/components/paged-collection/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield (hash
   items=this.items
   page=@page
diff --git a/ui/packages/consul-ui/app/components/paged-collection/index.js b/ui/packages/consul-ui/app/components/paged-collection/index.js
index 7a9bfbbf2680f..8013aaf0b1dd3 100644
--- a/ui/packages/consul-ui/app/components/paged-collection/index.js
+++ b/ui/packages/consul-ui/app/components/paged-collection/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/packages/consul-ui/app/components/paged-collection/index.scss b/ui/packages/consul-ui/app/components/paged-collection/index.scss
index 5b274087347a3..5a2088a17f293 100644
--- a/ui/packages/consul-ui/app/components/paged-collection/index.scss
+++ b/ui/packages/consul-ui/app/components/paged-collection/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %paged-collection-scroll {
   overflow-y: auto !important;
   will-change: scrollPosition;
diff --git a/ui/packages/consul-ui/app/components/panel/README.mdx b/ui/packages/consul-ui/app/components/panel/README.mdx
index b2d9e9cf92291..21f9590ec354b 100644
--- a/ui/packages/consul-ui/app/components/panel/README.mdx
+++ b/ui/packages/consul-ui/app/components/panel/README.mdx
@@ -12,10 +12,17 @@ properties available to help maintain consistency within the panel.
 below is only for illustrative purposes. Please use this CSS component as a
 building block for other CSS instead.
 
+
 ```hbs preview-template
 <figure>
   <figcaption>Panel with no padding (in dark mode)</figcaption>
-  <div class={{class-map 'panel' 'theme-dark'}} ...attributes>
+  <div
+    class={{class-map
+      "panel"
+      "theme-dark"
+    }}
+    ...attributes
+  >
     <div>
       <p>Some text purposefully with no padding</p>
     </div>
@@ -27,21 +34,34 @@ building block for other CSS instead.
 </figure>
 <figure>
   <figcaption>Panel using inherited padding for consistency</figcaption>
-  <div class={{class-map 'panel'}} ...attributes>
+  <div
+    class={{class-map
+      "panel"
+    }}
+    ...attributes
+  >
     <Action
       style={{style-map
         (array 'width' '100%')
-        (array 'border-bottom' '1px solid var(--tone-border)')
+        (array 'border-bottom' '1px solid rgb(var(--tone-border))')
         (array 'padding' 'var(--padding-x) var(--padding-y)')
       }}
     >
       Full Width Button
     </Action>
-    <div style={{style-map (array 'padding' 'var(--padding-x) var(--padding-y)')}}>
+    <div
+      style={{style-map
+        (array 'padding' 'var(--padding-x) var(--padding-y)')
+      }}
+    >
       <p>Some text with padding</p>
     </div>
     <hr />
-    <div style={{style-map (array 'padding' 'var(--padding-x) var(--padding-y)')}}>
+    <div
+      style={{style-map
+        (array 'padding' 'var(--padding-x) var(--padding-y)')
+      }}
+    >
       <p>Along with a separator ^ again with padding</p>
     </div>
   </div>
@@ -49,34 +69,45 @@ building block for other CSS instead.
 <figure>
   <figcaption>Panel using larger padding and different color borders</figcaption>
   <div
-    class={{class-map 'panel'}}
-    style={{style-map
-      (array '--padding-x' '24px')
-      (array '--padding-y' '24px')
-      (array '--tone-border' 'var(--token-color-consul-foreground)')
+    class={{class-map
+      "panel"
     }}
+      style={{style-map
+        (array '--padding-x' '24px')
+        (array '--padding-y' '24px')
+        (array '--tone-border' 'var(--tone-strawberry-500)')
+      }}
     ...attributes
   >
     <Action
       style={{style-map
         (array 'width' '100%')
-        (array 'border-bottom' '1px solid var(--tone-border)')
+        (array 'border-bottom' '1px solid rgb(var(--tone-border))')
         (array 'padding' 'var(--padding-x) var(--padding-y)')
       }}
     >
       Full Width Button
     </Action>
-    <div style={{style-map (array 'padding' 'var(--padding-x) var(--padding-y)')}}>
+    <div
+      style={{style-map
+        (array 'padding' 'var(--padding-x) var(--padding-y)')
+      }}
+    >
       <p>Some text with padding</p>
     </div>
     <hr />
-    <div style={{style-map (array 'padding' 'var(--padding-x) var(--padding-y)')}}>
+    <div
+      style={{style-map
+        (array 'padding' 'var(--padding-x) var(--padding-y)')
+      }}
+    >
       <p>Along with a separator ^ again with padding</p>
     </div>
   </div>
 </figure>
 ```
 
+
 ```css
 .panel {
   @extend %panel;
@@ -88,8 +119,8 @@ building block for other CSS instead.
 
 ## CSS Properties
 
-| Property        | Type     | Default                           | Description                                                          |
-| --------------- | -------- | --------------------------------- | -------------------------------------------------------------------- |
-| `--tone-border` | `color`  | --token-color-palette-neutral-300 | Default color for all borders                                        |
-| `--padding-x`   | `length` | 14px                              | Default x padding to be used for padding values within the component |
-| `--padding-y`   | `length` | 14px                              | Default y padding to be used for padding values within the component |
+| Property | Type | Default | Description |
+| --- | --- | --- | --- |
+| `--tone-border` | `color` | --tone-gray-300 | Default color for all borders |
+| `--padding-x` | `length` | 14px | Default x padding to be used for padding values within the component |
+| `--padding-y` | `length` | 14px | Default y padding to be used for padding values within the component |
diff --git a/ui/packages/consul-ui/app/components/panel/debug.scss b/ui/packages/consul-ui/app/components/panel/debug.scss
index b193883ad9b40..091a52eb59133 100644
--- a/ui/packages/consul-ui/app/components/panel/debug.scss
+++ b/ui/packages/consul-ui/app/components/panel/debug.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 #docfy-demo-preview-panel {
   .panel {
     @extend %panel;
diff --git a/ui/packages/consul-ui/app/components/panel/index.css.js b/ui/packages/consul-ui/app/components/panel/index.css.js
index c3f86fb942a48..68179f056c403 100644
--- a/ui/packages/consul-ui/app/components/panel/index.css.js
+++ b/ui/packages/consul-ui/app/components/panel/index.css.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (css) => css`
   .panel {
     --padding-x: 14px;
@@ -16,21 +11,21 @@ export default (css) => css`
   }
 
   .panel {
-    --tone-border: var(--token-color-palette-neutral-300);
+    --tone-border: var(--tone-gray-300);
     border: var(--decor-border-100);
     border-radius: var(--decor-radius-200);
-    box-shadow: var(--token-surface-high-box-shadow);
+    box-shadow: var(--decor-elevation-600);
   }
   .panel-separator {
     border: 0;
     border-top: var(--decor-border-100);
   }
   .panel {
-    color: var(--token-color-foreground-strong);
-    background-color: var(--token-color-surface-primary);
+    color: rgb(var(--tone-gray-900));
+    background-color: rgb(var(--tone-gray-000));
   }
   .panel,
   .panel-separator {
-    border-color: var(--tone-border);
+    border-color: rgb(var(--tone-border));
   }
 `;
diff --git a/ui/packages/consul-ui/app/components/panel/index.scss b/ui/packages/consul-ui/app/components/panel/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/panel/index.scss
+++ b/ui/packages/consul-ui/app/components/panel/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/panel/layout.scss b/ui/packages/consul-ui/app/components/panel/layout.scss
index a8ec607b1ce9e..bc739de1bb3bd 100644
--- a/ui/packages/consul-ui/app/components/panel/layout.scss
+++ b/ui/packages/consul-ui/app/components/panel/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %panel {
   --padding-x: 14px;
   --padding-y: 14px;
diff --git a/ui/packages/consul-ui/app/components/panel/skin.scss b/ui/packages/consul-ui/app/components/panel/skin.scss
index 68d92e2866e6b..30d859a97e916 100644
--- a/ui/packages/consul-ui/app/components/panel/skin.scss
+++ b/ui/packages/consul-ui/app/components/panel/skin.scss
@@ -1,22 +1,17 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %panel {
-  --tone-border: var(--token-color-palette-neutral-300);
+  --tone-border: var(--tone-gray-300);
   border: var(--decor-border-100);
   border-radius: var(--decor-radius-200);
-  box-shadow: var(--token-surface-high-box-shadow);
+  box-shadow: var(--decor-elevation-600);
 }
 %panel-separator {
   border-top: var(--decor-border-100);
 }
 %panel {
-  color: var(--token-color-foreground-strong);
-  background-color: var(--token-color-surface-primary);
+  color: rgb(var(--tone-gray-900));
+  background-color: rgb(var(--tone-gray-000));
 }
 %panel,
 %panel-separator {
-  border-color: var(--tone-border);
+  border-color: rgb(var(--tone-border));
 }
diff --git a/ui/packages/consul-ui/app/components/peerings/badge/icon/index.hbs b/ui/packages/consul-ui/app/components/peerings/badge/icon/index.hbs
index a856fd8069ee1..16153d91f4d1e 100644
--- a/ui/packages/consul-ui/app/components/peerings/badge/icon/index.hbs
+++ b/ui/packages/consul-ui/app/components/peerings/badge/icon/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (or (eq @state "PENDING") (eq @state "ESTABLISHING"))}}
 <svg
   width="16"
diff --git a/ui/packages/consul-ui/app/components/peerings/badge/index.hbs b/ui/packages/consul-ui/app/components/peerings/badge/index.hbs
index 437b0f4162730..f8d398dfd5905 100644
--- a/ui/packages/consul-ui/app/components/peerings/badge/index.hbs
+++ b/ui/packages/consul-ui/app/components/peerings/badge/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if @peering.State}}
   <div class="peerings-badge {{lowercase @peering.State}}" {{tooltip this.tooltip}}>
     <Peerings::Badge::Icon @state="{{@peering.State}}" />
diff --git a/ui/packages/consul-ui/app/components/peerings/badge/index.js b/ui/packages/consul-ui/app/components/peerings/badge/index.js
index dad8bfba791a8..c9aa9468d4954 100644
--- a/ui/packages/consul-ui/app/components/peerings/badge/index.js
+++ b/ui/packages/consul-ui/app/components/peerings/badge/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 
 const BADGE_LOOKUP = {
diff --git a/ui/packages/consul-ui/app/components/peerings/badge/index.scss b/ui/packages/consul-ui/app/components/peerings/badge/index.scss
index 40874651ea508..e61a222229bab 100644
--- a/ui/packages/consul-ui/app/components/peerings/badge/index.scss
+++ b/ui/packages/consul-ui/app/components/peerings/badge/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .peerings-badge {
   display: flex;
   align-items: center;
@@ -12,35 +7,36 @@
   gap: 4px;
 
   &.active {
-    background: var(--token-color-surface-success);
-    color: var(--token-color-foreground-success);
+    background: rgb(var(--tone-green-050));
+    color: rgb(var(--tone-green-600));
   }
   &.pending {
-    background: var(--token-color-consul-surface);
-    color: var(--token-color-consul-brand);
+    background: rgb(var(--tone-strawberry-050));
+    color: rgb(var(--tone-strawberry-500));
   }
   &.establishing {
-    background: var(--token-color-surface-action);
-    color: var(--token-color-foreground-action);
+    background: rgb(var(--tone-blue-050));
+    color: rgb(var(--tone-blue-500));
   }
   &.failing {
-    background: var(--token-color-surface-critical);
-    color: var(--token-color-foreground-critical);
+    background: rgb(var(--tone-red-050));
+    color: rgb(var(--tone-red-500));
   }
   &.deleting {
-    background: var(--token-color-surface-warning);
-    color: var(--token-color-foreground-warning-on-surface);
+    background: rgb(var(--tone-yellow-050));
+    color: rgb(var(--tone-yellow-800));
   }
   &.terminated {
-    background: var(--token-color-surface-interactive-active);
-    color: var(--token-color-foreground-primary);
+    background: rgb(var(--tone-gray-150));
+    color: rgb(var(--tone-gray-800));
   }
   &.undefined {
-    background: var(--token-color-surface-interactive-active);
-    color: var(--token-color-foreground-primary);
+    background: rgb(var(--tone-gray-150));
+    color: rgb(var(--tone-gray-800));
   }
 
   .peerings-badge__text {
-    @extend %body-100-medium;
+    font-weight: 500;
+    font-size: 13px;
   }
 }
diff --git a/ui/packages/consul-ui/app/components/peerings/provider/index.hbs b/ui/packages/consul-ui/app/components/peerings/provider/index.hbs
index 070c4ab2630d0..c55695d4dbc5c 100644
--- a/ui/packages/consul-ui/app/components/peerings/provider/index.hbs
+++ b/ui/packages/consul-ui/app/components/peerings/provider/index.hbs
@@ -1,6 +1 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield (hash data=this.data)}}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/peerings/provider/index.js b/ui/packages/consul-ui/app/components/peerings/provider/index.js
index 5bc42c1e74a61..b6f281cda937b 100644
--- a/ui/packages/consul-ui/app/components/peerings/provider/index.js
+++ b/ui/packages/consul-ui/app/components/peerings/provider/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { getOwner } from '@ember/application';
diff --git a/ui/packages/consul-ui/app/components/pill/index.scss b/ui/packages/consul-ui/app/components/pill/index.scss
index de699508c30bf..242924aa59dff 100644
--- a/ui/packages/consul-ui/app/components/pill/index.scss
+++ b/ui/packages/consul-ui/app/components/pill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 span.policy-service-identity,
diff --git a/ui/packages/consul-ui/app/components/pill/layout.scss b/ui/packages/consul-ui/app/components/pill/layout.scss
index 3dc7ed6a30d1e..11830acd667ec 100644
--- a/ui/packages/consul-ui/app/components/pill/layout.scss
+++ b/ui/packages/consul-ui/app/components/pill/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %pill {
   display: inline-flex;
   position: relative;
diff --git a/ui/packages/consul-ui/app/components/pill/skin.scss b/ui/packages/consul-ui/app/components/pill/skin.scss
index c6a92c00bab29..f58e599705b49 100644
--- a/ui/packages/consul-ui/app/components/pill/skin.scss
+++ b/ui/packages/consul-ui/app/components/pill/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %pill {
   border-radius: var(--decor-radius-100);
 }
diff --git a/ui/packages/consul-ui/app/components/policy-form/index.hbs b/ui/packages/consul-ui/app/components/policy-form/index.hbs
index 98f85069be4e3..467624ed48474 100644
--- a/ui/packages/consul-ui/app/components/policy-form/index.hbs
+++ b/ui/packages/consul-ui/app/components/policy-form/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
 <fieldset
   class="policy-form"
diff --git a/ui/packages/consul-ui/app/components/policy-form/index.js b/ui/packages/consul-ui/app/components/policy-form/index.js
index 116aae6724508..7843184f8f9f9 100644
--- a/ui/packages/consul-ui/app/components/policy-form/index.js
+++ b/ui/packages/consul-ui/app/components/policy-form/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import FormComponent from '../form-component/index';
 import { get, set } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/components/policy-form/pageobject.js b/ui/packages/consul-ui/app/components/policy-form/pageobject.js
index 5ac782b11605b..12f7977e41cbd 100644
--- a/ui/packages/consul-ui/app/components/policy-form/pageobject.js
+++ b/ui/packages/consul-ui/app/components/policy-form/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (submitable, cancelable, radiogroup, text) =>
   (scope = '[data-test-policy-form]') => {
     return {
diff --git a/ui/packages/consul-ui/app/components/policy-selector/index.hbs b/ui/packages/consul-ui/app/components/policy-selector/index.hbs
index 286f6bc4f7c2a..5ca0d27a6ae2e 100644
--- a/ui/packages/consul-ui/app/components/policy-selector/index.hbs
+++ b/ui/packages/consul-ui/app/components/policy-selector/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <ChildSelector
   @disabled={{disabled}}
   @repo={{repo}}
@@ -15,22 +10,20 @@
   ...attributes
 >
   {{yield}}
-  <BlockSlot @name="label" data-test-apply-policy>
+  <BlockSlot @name="label">
     Apply an existing policy
   </BlockSlot>
   <BlockSlot @name="create">
     {{#yield-slot name='trigger'}}
       {{yield}}
     {{else}}
-      <Hds::Button
-        @text='Create new policy'
-        @size='small'
-        @color='tertiary'
-        @icon='plus'
-        class='type-dialog'
+      <label
+        class="type-dialog"
         data-test-policy-create
         {{on "click" (action this.openModal)}}
-      />
+      >
+        <span>Create new policy</span>
+      </label>
       {{!TODO: potentially call trigger something else}}
       {{!the modal has to go here so that if you provide a slot to trigger it doesn't get rendered}}
       <ModalDialog
@@ -55,22 +48,16 @@
           />
         </BlockSlot>
         <BlockSlot @name="actions" as |close|>
-          <Hds::ButtonSet>
-            <Hds::Button
-              type="submit"
-              @isLoading={{item.isSaving}}
-              onclick={{perform this.save item items (queue (action close) (action 'reset'))}}
-              disabled={{if (or item.isSaving item.isPristine item.isInvalid) 'disabled'}}
-              @text='Create and apply'
-            />
-            <Hds::Button
-              type="reset"
-              @color="secondary"
-              disabled={{if item.isSaving 'disabled'}}
-              {{on 'click' (action (queue (action close) (action 'reset')))}}
-              @text='Cancel'
-            />
-          </Hds::ButtonSet>
+          <button type="submit"
+            onclick={{perform this.save item items (queue (action close) (action 'reset'))}}
+            disabled={{if (or item.isSaving item.isPristine item.isInvalid) 'disabled'}}
+          >
+            {{#if item.isSaving }}
+              <div class="progress indeterminate"></div>
+            {{/if}}
+            <span>Create and apply</span>
+          </button>
+          <button type="reset" disabled={{if item.isSaving 'disabled'}} {{action (queue (action close) (action 'reset'))}}>Cancel</button>
         </BlockSlot>
       </ModalDialog>
     {{/yield-slot}}
@@ -174,34 +161,15 @@
           <div>
             <ConfirmationDialog @message="Are you sure you want to remove this policy from this token?">
               <BlockSlot @name="action" as |confirm|>
-                <Hds::Button
-                  @text='Remove'
-                  @color='critical'
-                  @size='small'
-                  {{action confirm 'remove' item items}}
-                  data-test-delete
-                />
+                <button data-test-delete type="button" class="type-delete" {{action confirm 'remove' item items}}>Remove</button>
               </BlockSlot>
               <BlockSlot @name="dialog" as |execute cancel message|>
                 <p>
                   {{message}}
                 </p>
-                <Hds::ButtonSet>
-                  <Hds::Button
-                    @text='Confirm remove'
-                    @color='critical'
-                    @size='small'
-                    {{action execute}}
-                    data-test-delete
-                  />
-                  <Hds::Button
-                    @text='Cancel'
-                    @color='secondary'
-                    @size='small'
-                    {{action cancel}}
-                    data-test-delete
-                  />
-                </Hds::ButtonSet>
+
+                <button type="button" class="type-delete" {{action execute}}>Confirm remove</button>
+                <button type="button" class="type-cancel" {{action cancel}}>Cancel</button>
               </BlockSlot>
             </ConfirmationDialog>
           </div>
diff --git a/ui/packages/consul-ui/app/components/policy-selector/index.js b/ui/packages/consul-ui/app/components/policy-selector/index.js
index 3a8d14fdeeace..e7aaad491baa3 100644
--- a/ui/packages/consul-ui/app/components/policy-selector/index.js
+++ b/ui/packages/consul-ui/app/components/policy-selector/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import ChildSelectorComponent from '../child-selector/index';
 import { set } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/packages/consul-ui/app/components/policy-selector/pageobject.js b/ui/packages/consul-ui/app/components/policy-selector/pageobject.js
index b6471faea0ef8..55f4a19d8fa74 100644
--- a/ui/packages/consul-ui/app/components/policy-selector/pageobject.js
+++ b/ui/packages/consul-ui/app/components/policy-selector/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (clickable, deletable, collection, alias, policyForm) =>
   (scope = '#policies', createSelector = '[data-test-policy-create]') => {
     return {
diff --git a/ui/packages/consul-ui/app/components/popover-menu/index.hbs b/ui/packages/consul-ui/app/components/popover-menu/index.hbs
index 166536a55b501..a894f2d5f6d88 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/index.hbs
+++ b/ui/packages/consul-ui/app/components/popover-menu/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
 <div
   class="popover-menu"
diff --git a/ui/packages/consul-ui/app/components/popover-menu/index.js b/ui/packages/consul-ui/app/components/popover-menu/index.js
index f37321af97c5e..f38eac4f1c298 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/index.js
+++ b/ui/packages/consul-ui/app/components/popover-menu/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /*eslint ember/closure-actions: "warn"*/
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
diff --git a/ui/packages/consul-ui/app/components/popover-menu/index.scss b/ui/packages/consul-ui/app/components/popover-menu/index.scss
index 29070a0155a85..3cccae538bcac 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/index.scss
+++ b/ui/packages/consul-ui/app/components/popover-menu/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .popover-menu {
diff --git a/ui/packages/consul-ui/app/components/popover-menu/layout.scss b/ui/packages/consul-ui/app/components/popover-menu/layout.scss
index daccc1e8a1258..c63fcc87a3a15 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/layout.scss
+++ b/ui/packages/consul-ui/app/components/popover-menu/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %popover-menu {
   position: relative;
 }
diff --git a/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.hbs b/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.hbs
index aa6649c7d003a..3470979693d36 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.hbs
+++ b/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
 <li role="none" ...attributes>
 {{#if hasConfirmation}}
diff --git a/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.js b/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.js
index 7762956fe7bf7..69f46191acb5b 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.js
+++ b/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import { set } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.hbs b/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.hbs
index b3ec79aed5b28..b42e786ba9902 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.hbs
+++ b/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
 <li role="separator">
   <YieldSlot @name="label">{{yield}}</YieldSlot>
diff --git a/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.js b/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.js
index 2e3ae5dc90ccc..3d0b05e3bf19e 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.js
+++ b/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 
 import Slotted from 'block-slots';
diff --git a/ui/packages/consul-ui/app/components/popover-menu/skin.scss b/ui/packages/consul-ui/app/components/popover-menu/skin.scss
index 0fb07b441da1b..8dc9f6d15c9bf 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/skin.scss
+++ b/ui/packages/consul-ui/app/components/popover-menu/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %popover-menu-trigger > * {
   cursor: pointer;
 }
diff --git a/ui/packages/consul-ui/app/components/popover-select/index.hbs b/ui/packages/consul-ui/app/components/popover-select/index.hbs
index 313d720bf62e6..527505654e140 100644
--- a/ui/packages/consul-ui/app/components/popover-select/index.hbs
+++ b/ui/packages/consul-ui/app/components/popover-select/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <PopoverMenu
   class="popover-select"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/popover-select/index.js b/ui/packages/consul-ui/app/components/popover-select/index.js
index 97a24805ac5ad..4a18ea824b765 100644
--- a/ui/packages/consul-ui/app/components/popover-select/index.js
+++ b/ui/packages/consul-ui/app/components/popover-select/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import Slotted from 'block-slots';
diff --git a/ui/packages/consul-ui/app/components/popover-select/index.scss b/ui/packages/consul-ui/app/components/popover-select/index.scss
index 3e997ee2aeedb..ac45555434021 100644
--- a/ui/packages/consul-ui/app/components/popover-select/index.scss
+++ b/ui/packages/consul-ui/app/components/popover-select/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .popover-select {
   @extend %popover-select;
 }
@@ -33,23 +28,23 @@
 /* even their own search bar sub menu components */
 %popover-select .value-passing button::before {
   @extend %with-check-circle-fill-mask, %as-pseudo;
-  color: var(--token-color-foreground-success);
+  color: rgb(var(--tone-green-500));
 }
 %popover-select .value-warning button::before {
   @extend %with-alert-triangle-mask, %as-pseudo;
-  color: var(--token-color-foreground-warning);
+  color: rgb(var(--tone-orange-500));
 }
 %popover-select .value-critical button::before {
   @extend %with-cancel-square-fill-mask, %as-pseudo;
-  color: var(--token-color-foreground-critical);
+  color: rgb(var(--tone-red-500));
 }
 %popover-select .value-empty button::before {
   @extend %with-minus-square-fill-mask, %as-pseudo;
-  color: var(--token-color-foreground-disabled);
+  color: rgb(var(--tone-gray-400));
 }
 %popover-select .value-unknown button::before {
   @extend %with-help-circle-outline-mask, %as-pseudo;
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-500));
 }
 %popover-select.type-source li:not(.partition) button {
   text-transform: capitalize;
@@ -59,7 +54,7 @@
 }
 %popover-select.type-source li.partition button::before {
   @extend %with-user-team-mask, %as-pseudo;
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-500));
 }
 %popover-select .jwt button::before {
   @extend %with-logo-jwt-color-icon, %as-pseudo;
diff --git a/ui/packages/consul-ui/app/components/popover-select/optgroup/index.hbs b/ui/packages/consul-ui/app/components/popover-select/optgroup/index.hbs
index 772294c9fa916..c26431e2c16e2 100644
--- a/ui/packages/consul-ui/app/components/popover-select/optgroup/index.hbs
+++ b/ui/packages/consul-ui/app/components/popover-select/optgroup/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#let @components.MenuSeparator as |MenuSeparator|}}
 <MenuSeparator>
   <BlockSlot @name="label">
diff --git a/ui/packages/consul-ui/app/components/popover-select/option/index.hbs b/ui/packages/consul-ui/app/components/popover-select/option/index.hbs
index 66f4875c979cf..8c7274494bf88 100644
--- a/ui/packages/consul-ui/app/components/popover-select/option/index.hbs
+++ b/ui/packages/consul-ui/app/components/popover-select/option/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#let @components.MenuItem as |MenuItem|}}
   <MenuItem
     class={{if this.selected 'is-active'}}
diff --git a/ui/packages/consul-ui/app/components/popover-select/option/index.js b/ui/packages/consul-ui/app/components/popover-select/option/index.js
index f32de8c100add..dea8a82c099ed 100644
--- a/ui/packages/consul-ui/app/components/popover-select/option/index.js
+++ b/ui/packages/consul-ui/app/components/popover-select/option/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/popover-select/pageobject.js b/ui/packages/consul-ui/app/components/popover-select/pageobject.js
index 66a8f554fc3da..8caced1589fdc 100644
--- a/ui/packages/consul-ui/app/components/popover-select/pageobject.js
+++ b/ui/packages/consul-ui/app/components/popover-select/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (clickable, collection) =>
   (scope = '.popover-select') => {
     return {
diff --git a/ui/packages/consul-ui/app/components/power-select/pageobject.js b/ui/packages/consul-ui/app/components/power-select/pageobject.js
index 380dd849cc35e..5af0fecb4c29a 100644
--- a/ui/packages/consul-ui/app/components/power-select/pageobject.js
+++ b/ui/packages/consul-ui/app/components/power-select/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { clickable, isPresent } from 'ember-cli-page-object';
 
 export default (options) => {
diff --git a/ui/packages/consul-ui/app/components/progress/index.hbs b/ui/packages/consul-ui/app/components/progress/index.hbs
index b424417b90849..a8c373aae5ad3 100644
--- a/ui/packages/consul-ui/app/components/progress/index.hbs
+++ b/ui/packages/consul-ui/app/components/progress/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="progress indeterminate"
   role="progressbar"
diff --git a/ui/packages/consul-ui/app/components/progress/index.scss b/ui/packages/consul-ui/app/components/progress/index.scss
index 7ede4f18c89e6..8586adb61870c 100644
--- a/ui/packages/consul-ui/app/components/progress/index.scss
+++ b/ui/packages/consul-ui/app/components/progress/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .progress.indeterminate {
diff --git a/ui/packages/consul-ui/app/components/progress/layout.scss b/ui/packages/consul-ui/app/components/progress/layout.scss
index 9ba54527c3853..dc2c252718b4c 100644
--- a/ui/packages/consul-ui/app/components/progress/layout.scss
+++ b/ui/packages/consul-ui/app/components/progress/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %progress-native {
   -webkit-appearance: none;
   -moz-appearance: none;
diff --git a/ui/packages/consul-ui/app/components/progress/skin.scss b/ui/packages/consul-ui/app/components/progress/skin.scss
index d5ea5f1da11d3..fb9f433d0bc65 100644
--- a/ui/packages/consul-ui/app/components/progress/skin.scss
+++ b/ui/packages/consul-ui/app/components/progress/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %progress-indeterminate {
   width: 100%;
   display: flex;
@@ -10,7 +5,7 @@
   justify-content: center;
   --icon-size: icon-700; /* 24px */
   --icon-name: var(--icon-loading);
-  --icon-color: var(--token-color-foreground-faint);
+  --icon-color: rgb(var(--tone-gray-500));
 }
 %progress-indeterminate::before {
   content: '';
diff --git a/ui/packages/consul-ui/app/components/providers/dimension/index.hbs b/ui/packages/consul-ui/app/components/providers/dimension/index.hbs
index 195001597748b..4d363229657f0 100644
--- a/ui/packages/consul-ui/app/components/providers/dimension/index.hbs
+++ b/ui/packages/consul-ui/app/components/providers/dimension/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div {{create-ref 'element'}} {{did-insert this.measureDimensions}}>
   {{on-window 'resize' this.handleWindowResize}}
   {{yield (hash data=this.data)}}
diff --git a/ui/packages/consul-ui/app/components/providers/dimension/index.js b/ui/packages/consul-ui/app/components/providers/dimension/index.js
index 838dde1a43617..7a27eb37c81cf 100644
--- a/ui/packages/consul-ui/app/components/providers/dimension/index.js
+++ b/ui/packages/consul-ui/app/components/providers/dimension/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/providers/search/index.hbs b/ui/packages/consul-ui/app/components/providers/search/index.hbs
index 070c4ab2630d0..c55695d4dbc5c 100644
--- a/ui/packages/consul-ui/app/components/providers/search/index.hbs
+++ b/ui/packages/consul-ui/app/components/providers/search/index.hbs
@@ -1,6 +1 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield (hash data=this.data)}}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/providers/search/index.js b/ui/packages/consul-ui/app/components/providers/search/index.js
index b711d88db0607..3cf9449198d8d 100644
--- a/ui/packages/consul-ui/app/components/providers/search/index.js
+++ b/ui/packages/consul-ui/app/components/providers/search/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 
 export default class SearchProvider extends Component {
diff --git a/ui/packages/consul-ui/app/components/radio-card/index.hbs b/ui/packages/consul-ui/app/components/radio-card/index.hbs
index 2d5ca49caae87..0cab5cca07a23 100644
--- a/ui/packages/consul-ui/app/components/radio-card/index.hbs
+++ b/ui/packages/consul-ui/app/components/radio-card/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <label
   ...attributes
   class="radio-card{{if checked ' checked'}}"
diff --git a/ui/packages/consul-ui/app/components/radio-card/index.js b/ui/packages/consul-ui/app/components/radio-card/index.js
index d99599ac30397..4798652642ba8 100644
--- a/ui/packages/consul-ui/app/components/radio-card/index.js
+++ b/ui/packages/consul-ui/app/components/radio-card/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/packages/consul-ui/app/components/radio-card/index.scss b/ui/packages/consul-ui/app/components/radio-card/index.scss
index ab559ed572474..8675a12b6af48 100644
--- a/ui/packages/consul-ui/app/components/radio-card/index.scss
+++ b/ui/packages/consul-ui/app/components/radio-card/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .radio-card {
diff --git a/ui/packages/consul-ui/app/components/radio-card/layout.scss b/ui/packages/consul-ui/app/components/radio-card/layout.scss
index 8bceb70aa431d..1c9b4a64f5f85 100644
--- a/ui/packages/consul-ui/app/components/radio-card/layout.scss
+++ b/ui/packages/consul-ui/app/components/radio-card/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %radio-card {
   float: none !important;
   margin-right: 0 !important;
diff --git a/ui/packages/consul-ui/app/components/radio-card/skin.scss b/ui/packages/consul-ui/app/components/radio-card/skin.scss
index 687009c37f660..03320aa5e697e 100644
--- a/ui/packages/consul-ui/app/components/radio-card/skin.scss
+++ b/ui/packages/consul-ui/app/components/radio-card/skin.scss
@@ -1,30 +1,25 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %radio-card {
   border: var(--decor-border-100);
   border-radius: var(--decor-radius-100);
-  border-color: var(--token-color-surface-interactive-active);
-  box-shadow: var(--token-surface-mid-box-shadow);
-  color: var(--token-color-foreground-faint);
+  border-color: rgb(var(--tone-gray-200));
+  box-shadow: var(--decor-elevation-400);
+  color: rgb(var(--tone-gray-500));
   cursor: pointer;
 }
 %radio-card.checked {
-  border-color: var(--token-color-foreground-action);
+  border-color: rgb(var(--tone-blue-500));
 }
 %radio-card > :first-child {
-  background-color: var(--token-color-surface-strong);
+  background-color: rgb(var(--tone-gray-050));
 }
 %radio-card.checked > :first-child {
-  background-color: var(--token-color-surface-action);
+  background-color: rgb(var(--tone-blue-050));
 }
 %radio-card header {
   margin-bottom: 0.5em;
 }
 %radio-card header {
-  color: var(--token-color-hashicorp-brand);
+  color: rgb(var(--tone-gray-999));
 }
 %radio-card-with-icon > :last-child {
   padding-left: 47px;
diff --git a/ui/packages/consul-ui/app/components/radio-group/index.hbs b/ui/packages/consul-ui/app/components/radio-group/index.hbs
index 897d2966eb061..70394c9ff8c09 100644
--- a/ui/packages/consul-ui/app/components/radio-group/index.hbs
+++ b/ui/packages/consul-ui/app/components/radio-group/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <fieldset>
   <div role="radiogroup" id="radiogroup_{{name}}" data-test-radiogroup={{name}}>{{! menu?}}
 {{#each items as |item|}}
diff --git a/ui/packages/consul-ui/app/components/radio-group/index.js b/ui/packages/consul-ui/app/components/radio-group/index.js
index d6722204007b7..cb246eed0a37a 100644
--- a/ui/packages/consul-ui/app/components/radio-group/index.js
+++ b/ui/packages/consul-ui/app/components/radio-group/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/components/radio-group/index.scss b/ui/packages/consul-ui/app/components/radio-group/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/radio-group/index.scss
+++ b/ui/packages/consul-ui/app/components/radio-group/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/radio-group/layout.scss b/ui/packages/consul-ui/app/components/radio-group/layout.scss
index ad7486e7975b5..78bf890acf278 100644
--- a/ui/packages/consul-ui/app/components/radio-group/layout.scss
+++ b/ui/packages/consul-ui/app/components/radio-group/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %radio-group {
   overflow: hidden;
 }
diff --git a/ui/packages/consul-ui/app/components/radio-group/pageobject.js b/ui/packages/consul-ui/app/components/radio-group/pageobject.js
index 398711a4bd259..34ac48bfb36bf 100644
--- a/ui/packages/consul-ui/app/components/radio-group/pageobject.js
+++ b/ui/packages/consul-ui/app/components/radio-group/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { is, clickable } from 'ember-cli-page-object';
 import ucfirst from 'consul-ui/utils/ucfirst';
 // TODO: We no longer need to use name here
diff --git a/ui/packages/consul-ui/app/components/radio-group/skin.scss b/ui/packages/consul-ui/app/components/radio-group/skin.scss
index f24f44f39bea3..e69de29bb2d1d 100644
--- a/ui/packages/consul-ui/app/components/radio-group/skin.scss
+++ b/ui/packages/consul-ui/app/components/radio-group/skin.scss
@@ -1,5 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
diff --git a/ui/packages/consul-ui/app/components/ref/index.js b/ui/packages/consul-ui/app/components/ref/index.js
index 795cfcb57afa9..b68a024f6206c 100644
--- a/ui/packages/consul-ui/app/components/ref/index.js
+++ b/ui/packages/consul-ui/app/components/ref/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { set } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/components/role-form/index.hbs b/ui/packages/consul-ui/app/components/role-form/index.hbs
index fbae60a3dd8f1..5a2bb41e6e318 100644
--- a/ui/packages/consul-ui/app/components/role-form/index.hbs
+++ b/ui/packages/consul-ui/app/components/role-form/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
 <fieldset
   class="role-form"
diff --git a/ui/packages/consul-ui/app/components/role-form/index.js b/ui/packages/consul-ui/app/components/role-form/index.js
index 365d219fa9b1c..3b8a80279dd5f 100644
--- a/ui/packages/consul-ui/app/components/role-form/index.js
+++ b/ui/packages/consul-ui/app/components/role-form/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import FormComponent from '../form-component/index';
 export default FormComponent.extend({
   type: 'role',
diff --git a/ui/packages/consul-ui/app/components/role-form/pageobject.js b/ui/packages/consul-ui/app/components/role-form/pageobject.js
index 71392a0116076..e45baedcdd899 100644
--- a/ui/packages/consul-ui/app/components/role-form/pageobject.js
+++ b/ui/packages/consul-ui/app/components/role-form/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (submitable, cancelable, policySelector) => () => {
   return {
     // this should probably be settable
diff --git a/ui/packages/consul-ui/app/components/role-selector/index.hbs b/ui/packages/consul-ui/app/components/role-selector/index.hbs
index beba5ebb4c8d4..1054af55257d6 100644
--- a/ui/packages/consul-ui/app/components/role-selector/index.hbs
+++ b/ui/packages/consul-ui/app/components/role-selector/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <ModalDialog
   class="role-selector"
   data-test-role-form
@@ -39,15 +34,9 @@ as |modal|>
           @items={{item.Policies}}
         >
           <BlockSlot @name="trigger">
-            <Hds::Button
-              @text='Create new policy'
-              @size='small'
-              @color='tertiary'
-              @icon='plus'
-              class='type-dialog'
-              data-test-create-policy
-              {{action 'triggerStateCheckboxChange'}}
-            />
+            <label for="{{name}}_state_policy" data-test-create-policy class="type-dialog">
+              <span>Create new policy</span>
+            </label>
           </BlockSlot>
         </PolicySelector>
 
@@ -67,40 +56,27 @@ as |modal|>
   </BlockSlot>
   <BlockSlot @name="actions" as |close|>
 
-    <Hds::ButtonSet>
-      {{#if (eq state 'role')}}
-        <Hds::Button
-          type='submit'
-          @text='Create and apply'
-          @isLoading={{item.isSaving}}
-          onclick={{perform this.save item items (queue (action close) (action 'reset'))}}
-          disabled={{if (or item.isSaving item.isPristine item.isInvalid) 'disabled'}}
-        />
-        <Hds::Button
-          @text='Cancel'
-          type='reset'
-          @color='secondary'
-          disabled={{if item.isSaving 'disabled'}}
-          {{on 'click' (action (queue (action close) (action 'reset')))}}
-        />
-
-      {{else}}
-        <Hds::Button
-          type='submit'
-          @text='Create and apply'
-          @isLoading={{policy.isSaving}}
-          {{action 'dispatch' 'save' (array policy item.Policies (action (mut state) 'role'))}}
-          disabled={{if (or policy.isSaving policy.isPristine policy.isInvalid) 'disabled'}}
-        />
-        <Hds::Button
-          @text='Cancel'
-          type='reset'
-          @color='secondary'
-          disabled={{if policy.isSaving 'disabled'}}
-          {{on 'click' (action (mut state) 'role')}}
-        />
+{{#if (eq state 'role')}}
+    <button type="submit"
+      onclick={{perform this.save item items (queue (action close) (action 'reset'))}}
+      disabled={{if (or item.isSaving item.isPristine item.isInvalid) 'disabled'}}
+    >
+      {{#if item.isSaving }}
+        <div class="progress indeterminate"></div>
+      {{/if}}
+      <span>Create and apply</span>
+    </button>
+    <button type="reset" disabled={{if item.isSaving 'disabled'}} {{action (queue (action close) (action 'reset'))}}>Cancel</button>
+{{else}}
+    <button type="submit" {{action 'dispatch' 'save' (array policy item.Policies (action (mut state) 'role'))}} disabled={{if (or policy.isSaving policy.isPristine policy.isInvalid) 'disabled'}}>
+      {{#if policy.isSaving }}
+        <div class="progress indeterminate"></div>
       {{/if}}
-    </Hds::ButtonSet>
+      <span>Create and apply</span>
+    </button>
+    <button type="reset" disabled={{if policy.isSaving 'disabled'}} {{action (mut state) 'role'}}>Cancel</button>
+{{/if}}
+
   </BlockSlot>
 </ModalDialog>
 
@@ -118,15 +94,12 @@ as |modal|>
     Apply an existing role
   </BlockSlot>
   <BlockSlot @name="create">
-    <Hds::Button
-      @text='Create new role'
-      @size='small'
-      @color='tertiary'
-      @icon='plus'
-      class='type-dialog'
+    <label class="type-dialog"
       data-test-role-create
       {{on "click" (optional this.modal.open)}}
-    />
+    >
+      <span>Create new role</span>
+    </label>
   </BlockSlot>
   <BlockSlot @name="option" as |option|>
     {{option.Name}}
diff --git a/ui/packages/consul-ui/app/components/role-selector/index.js b/ui/packages/consul-ui/app/components/role-selector/index.js
index ac9e5f7140b75..2034acf5fa259 100644
--- a/ui/packages/consul-ui/app/components/role-selector/index.js
+++ b/ui/packages/consul-ui/app/components/role-selector/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import ChildSelectorComponent from '../child-selector/index';
 import { inject as service } from '@ember/service';
 import { set } from '@ember/object';
@@ -47,11 +42,5 @@ export default ChildSelectorComponent.extend({
           this._super(...arguments);
       }
     },
-    triggerStateCheckboxChange() {
-      //Triggers click event on checkbox
-      //The function has to be added to change the logic from <label for=''> to Hds::Button
-      let element = document.getElementById(`${this.name}_state_policy`);
-      element && element.dispatchEvent(new Event('change'));
-    },
   },
 });
diff --git a/ui/packages/consul-ui/app/components/role-selector/index.scss b/ui/packages/consul-ui/app/components/role-selector/index.scss
index 05bf5c20f42c9..c29629830d83d 100644
--- a/ui/packages/consul-ui/app/components/role-selector/index.scss
+++ b/ui/packages/consul-ui/app/components/role-selector/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .role-selector {
   [name='role[state]'],
   [name='role[state]'] + * {
diff --git a/ui/packages/consul-ui/app/components/role-selector/pageobject.js b/ui/packages/consul-ui/app/components/role-selector/pageobject.js
index b6749a3693afe..9fa3cd3ef0330 100644
--- a/ui/packages/consul-ui/app/components/role-selector/pageobject.js
+++ b/ui/packages/consul-ui/app/components/role-selector/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (clickable, deletable, collection, alias, roleForm) =>
   (scope = '#roles') => {
     return {
diff --git a/ui/packages/consul-ui/app/components/route/announcer/index.hbs b/ui/packages/consul-ui/app/components/route/announcer/index.hbs
index 04df63b8d7970..a6ce3dd21b364 100644
--- a/ui/packages/consul-ui/app/components/route/announcer/index.hbs
+++ b/ui/packages/consul-ui/app/components/route/announcer/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{page-title @title separator=(or @separator ' - ')}}
 <PortalTarget @name="route-announcer" />
 
diff --git a/ui/packages/consul-ui/app/components/route/index.hbs b/ui/packages/consul-ui/app/components/route/index.hbs
index 6745d7d55d2e0..4e8f485e7f7fb 100644
--- a/ui/packages/consul-ui/app/components/route/index.hbs
+++ b/ui/packages/consul-ui/app/components/route/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{did-insert this.connect}}
 {{will-destroy this.disconnect}}
 {{yield (hash
diff --git a/ui/packages/consul-ui/app/components/route/index.js b/ui/packages/consul-ui/app/components/route/index.js
index ef7865688aa37..8951764f8549d 100644
--- a/ui/packages/consul-ui/app/components/route/index.js
+++ b/ui/packages/consul-ui/app/components/route/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/route/title/index.hbs b/ui/packages/consul-ui/app/components/route/title/index.hbs
index 5b64397a4ba8b..9c50f1fdaee95 100644
--- a/ui/packages/consul-ui/app/components/route/title/index.hbs
+++ b/ui/packages/consul-ui/app/components/route/title/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{page-title @title separator=@separator}}
 {{#if (not-eq @render false)}}
 {{@title}}
diff --git a/ui/packages/consul-ui/app/components/route/title/index.scss b/ui/packages/consul-ui/app/components/route/title/index.scss
index 62e3a148d0baa..d3743f21f9ea6 100644
--- a/ui/packages/consul-ui/app/components/route/title/index.scss
+++ b/ui/packages/consul-ui/app/components/route/title/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %route-title {
   @extend %visually-hidden;
 }
diff --git a/ui/packages/consul-ui/app/components/search-bar/index.hbs b/ui/packages/consul-ui/app/components/search-bar/index.hbs
index 1dc265d86a0cf..f42e9cca7fbb4 100644
--- a/ui/packages/consul-ui/app/components/search-bar/index.hbs
+++ b/ui/packages/consul-ui/app/components/search-bar/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="search-bar"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/search-bar/index.js b/ui/packages/consul-ui/app/components/search-bar/index.js
index a3164cf3176d0..7fefbe8ef9bf2 100644
--- a/ui/packages/consul-ui/app/components/search-bar/index.js
+++ b/ui/packages/consul-ui/app/components/search-bar/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { diff, filters } from './utils';
diff --git a/ui/packages/consul-ui/app/components/search-bar/index.scss b/ui/packages/consul-ui/app/components/search-bar/index.scss
index 9d135c967f3ad..99ec3cff0f8e6 100644
--- a/ui/packages/consul-ui/app/components/search-bar/index.scss
+++ b/ui/packages/consul-ui/app/components/search-bar/index.scss
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .search-bar {
   &-status {
     & {
       border-bottom: var(--decor-border-100);
-      border-bottom-color: var(--token-color-surface-interactive-active);
+      border-bottom-color: rgb(var(--tone-gray-200));
     }
     .remove-all button {
       @extend %anchor;
@@ -16,15 +11,15 @@
       & {
         @extend %pill-200;
         border: var(--decor-border-100);
-        border-color: var(--token-color-surface-interactive-active);
-        color: var(--token-color-foreground-faint);
+        border-color: rgb(var(--tone-gray-200));
+        color: rgb(var(--tone-gray-600));
       }
       button {
         cursor: pointer;
       }
       button::before {
         @extend %with-cancel-plain-mask, %as-pseudo;
-        color: var(--token-color-foreground-faint);
+        color: rgb(var(--tone-gray-600));
         margin-top: 1px;
         margin-right: 0.2rem;
       }
diff --git a/ui/packages/consul-ui/app/components/search-bar/remove-filter/index.hbs b/ui/packages/consul-ui/app/components/search-bar/remove-filter/index.hbs
index 616dc2c5b5783..78e9975d5293f 100644
--- a/ui/packages/consul-ui/app/components/search-bar/remove-filter/index.hbs
+++ b/ui/packages/consul-ui/app/components/search-bar/remove-filter/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <li>
   <Action
     ...attributes
diff --git a/ui/packages/consul-ui/app/components/search-bar/utils.js b/ui/packages/consul-ui/app/components/search-bar/utils.js
index 3027e02ba399f..75a14a31810e9 100644
--- a/ui/packages/consul-ui/app/components/search-bar/utils.js
+++ b/ui/packages/consul-ui/app/components/search-bar/utils.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export const diff = (a, b) => {
   return a.filter((item) => !b.includes(item));
 };
diff --git a/ui/packages/consul-ui/app/components/skip-links/index.scss b/ui/packages/consul-ui/app/components/skip-links/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/skip-links/index.scss
+++ b/ui/packages/consul-ui/app/components/skip-links/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/skip-links/layout.scss b/ui/packages/consul-ui/app/components/skip-links/layout.scss
index a1ce1bfddaadf..4dcce7415594f 100644
--- a/ui/packages/consul-ui/app/components/skip-links/layout.scss
+++ b/ui/packages/consul-ui/app/components/skip-links/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %skip-links {
   display: flex;
   flex-direction: column;
diff --git a/ui/packages/consul-ui/app/components/skip-links/skin.scss b/ui/packages/consul-ui/app/components/skip-links/skin.scss
index 6d1f759a38d24..808731d8d54d7 100644
--- a/ui/packages/consul-ui/app/components/skip-links/skin.scss
+++ b/ui/packages/consul-ui/app/components/skip-links/skin.scss
@@ -1,12 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %skip-links {
-  outline: 1px solid var(--token-color-surface-primary);
-  color: var(--token-color-surface-primary);
-  background-color: var(--token-color-foreground-action);
+  outline: 1px solid rgb(var(--tone-gray-000));
+  color: rgb(var(--tone-gray-000));
+  background-color: rgb(var(--tone-blue-500));
 }
 %skip-links button,
 %skip-links a {
diff --git a/ui/packages/consul-ui/app/components/sliding-toggle/index.scss b/ui/packages/consul-ui/app/components/sliding-toggle/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/sliding-toggle/index.scss
+++ b/ui/packages/consul-ui/app/components/sliding-toggle/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/sliding-toggle/layout.scss b/ui/packages/consul-ui/app/components/sliding-toggle/layout.scss
index f5db6d4f5714c..da34b0654228f 100644
--- a/ui/packages/consul-ui/app/components/sliding-toggle/layout.scss
+++ b/ui/packages/consul-ui/app/components/sliding-toggle/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %sliding-toggle label {
   position: relative;
 }
diff --git a/ui/packages/consul-ui/app/components/sliding-toggle/skin.scss b/ui/packages/consul-ui/app/components/sliding-toggle/skin.scss
index bf34ca335c1e6..6a3e38cf773e6 100644
--- a/ui/packages/consul-ui/app/components/sliding-toggle/skin.scss
+++ b/ui/packages/consul-ui/app/components/sliding-toggle/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* TODO: Maybe move this to reset? */
 %sliding-toggle label span {
   cursor: pointer;
@@ -20,16 +15,16 @@
   @extend %sliding-toggle-negative;
 }
 %sliding-toggle label span {
-  color: var(--token-color-foreground-strong);
+  color: rgb(var(--tone-gray-900));
 }
 %sliding-toggle label span::after {
-  background-color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-gray-000));
 }
 %sliding-toggle label input:checked + span::before,
 %sliding-toggle-negative label input + span::before {
-  background-color: var(--token-color-foreground-action);
+  background-color: rgb(var(--tone-blue-500));
 }
 %sliding-toggle label span::before,
 %sliding-toggle-negative label input:checked + span::before {
-  background-color: var(--token-color-palette-neutral-300);
+  background-color: rgb(var(--tone-gray-300));
 }
diff --git a/ui/packages/consul-ui/app/components/state-chart/action/index.hbs b/ui/packages/consul-ui/app/components/state-chart/action/index.hbs
index 8709fc4b8b770..fb5c4b157d1c2 100644
--- a/ui/packages/consul-ui/app/components/state-chart/action/index.hbs
+++ b/ui/packages/consul-ui/app/components/state-chart/action/index.hbs
@@ -1,6 +1 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/state-chart/action/index.js b/ui/packages/consul-ui/app/components/state-chart/action/index.js
index 5c026134271e2..c416586bc4955 100644
--- a/ui/packages/consul-ui/app/components/state-chart/action/index.js
+++ b/ui/packages/consul-ui/app/components/state-chart/action/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/packages/consul-ui/app/components/state-chart/guard/index.hbs b/ui/packages/consul-ui/app/components/state-chart/guard/index.hbs
index 8709fc4b8b770..fb5c4b157d1c2 100644
--- a/ui/packages/consul-ui/app/components/state-chart/guard/index.hbs
+++ b/ui/packages/consul-ui/app/components/state-chart/guard/index.hbs
@@ -1,6 +1 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/state-chart/guard/index.js b/ui/packages/consul-ui/app/components/state-chart/guard/index.js
index d304691ac85f1..b4c27b845c1c6 100644
--- a/ui/packages/consul-ui/app/components/state-chart/guard/index.js
+++ b/ui/packages/consul-ui/app/components/state-chart/guard/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/ui/packages/consul-ui/app/components/state-chart/index.hbs b/ui/packages/consul-ui/app/components/state-chart/index.hbs
index 4c31d338fcbb3..2095cac61808c 100644
--- a/ui/packages/consul-ui/app/components/state-chart/index.hbs
+++ b/ui/packages/consul-ui/app/components/state-chart/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield
   (component 'state' state=state)
   (component 'state-chart/guard' chart=this)
diff --git a/ui/packages/consul-ui/app/components/state-chart/index.js b/ui/packages/consul-ui/app/components/state-chart/index.js
index 7fc138315749d..f14cdb67bf20a 100644
--- a/ui/packages/consul-ui/app/components/state-chart/index.js
+++ b/ui/packages/consul-ui/app/components/state-chart/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import { set } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/state-machine/index.hbs b/ui/packages/consul-ui/app/components/state-machine/index.hbs
index b48102117b6be..82e792e669a85 100644
--- a/ui/packages/consul-ui/app/components/state-machine/index.hbs
+++ b/ui/packages/consul-ui/app/components/state-machine/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield
   (hash
     State=(component 'state' state=this.state)
diff --git a/ui/packages/consul-ui/app/components/state-machine/index.js b/ui/packages/consul-ui/app/components/state-machine/index.js
index 578519ed381bd..721b54286a32f 100644
--- a/ui/packages/consul-ui/app/components/state-machine/index.js
+++ b/ui/packages/consul-ui/app/components/state-machine/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '../state-chart/index';
 
 export default Component.extend({});
diff --git a/ui/packages/consul-ui/app/components/state/index.hbs b/ui/packages/consul-ui/app/components/state/index.hbs
index 7ae0359d90b16..e717334e1c2d1 100644
--- a/ui/packages/consul-ui/app/components/state/index.hbs
+++ b/ui/packages/consul-ui/app/components/state/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{did-insert this.attributeChanged @state @matches @notMatches}}
 {{did-update this.attributeChanged @state @matches @notMatches}}
 {{#if render}}
diff --git a/ui/packages/consul-ui/app/components/state/index.js b/ui/packages/consul-ui/app/components/state/index.js
index 2a0b92c3b5dfb..c21d3eec68de2 100644
--- a/ui/packages/consul-ui/app/components/state/index.js
+++ b/ui/packages/consul-ui/app/components/state/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/tab-nav/index.hbs b/ui/packages/consul-ui/app/components/tab-nav/index.hbs
index c77284a213f9d..236f692f7fade 100644
--- a/ui/packages/consul-ui/app/components/tab-nav/index.hbs
+++ b/ui/packages/consul-ui/app/components/tab-nav/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#let (dom-position (set this 'style') offset=true) 'tab' as |select name|}}
   <nav
     style={{{if
diff --git a/ui/packages/consul-ui/app/components/tab-nav/index.js b/ui/packages/consul-ui/app/components/tab-nav/index.js
index 305589924e31a..ac66f5ae45d05 100644
--- a/ui/packages/consul-ui/app/components/tab-nav/index.js
+++ b/ui/packages/consul-ui/app/components/tab-nav/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { hrefTo } from 'consul-ui/helpers/href-to';
diff --git a/ui/packages/consul-ui/app/components/tab-nav/index.scss b/ui/packages/consul-ui/app/components/tab-nav/index.scss
index b41787d26e0a3..f7db21ec3293f 100644
--- a/ui/packages/consul-ui/app/components/tab-nav/index.scss
+++ b/ui/packages/consul-ui/app/components/tab-nav/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .tab-nav {
diff --git a/ui/packages/consul-ui/app/components/tab-nav/layout.scss b/ui/packages/consul-ui/app/components/tab-nav/layout.scss
index 624b39efd4fb9..0ea0f89090d39 100644
--- a/ui/packages/consul-ui/app/components/tab-nav/layout.scss
+++ b/ui/packages/consul-ui/app/components/tab-nav/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %tab-nav {
   clear: both;
   overflow: auto;
diff --git a/ui/packages/consul-ui/app/components/tab-nav/pageobject.js b/ui/packages/consul-ui/app/components/tab-nav/pageobject.js
index 4f4f26e00e9d5..03b40c8826fd4 100644
--- a/ui/packages/consul-ui/app/components/tab-nav/pageobject.js
+++ b/ui/packages/consul-ui/app/components/tab-nav/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { is, clickable, attribute, isVisible } from 'ember-cli-page-object';
 import ucfirst from 'consul-ui/utils/ucfirst';
 export default function (name, items, blankKey = 'all') {
diff --git a/ui/packages/consul-ui/app/components/tab-nav/skin.scss b/ui/packages/consul-ui/app/components/tab-nav/skin.scss
index bb45eb78485b2..19561a54a9e4f 100644
--- a/ui/packages/consul-ui/app/components/tab-nav/skin.scss
+++ b/ui/packages/consul-ui/app/components/tab-nav/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %tab-nav ul {
   list-style-type: none;
 }
@@ -23,22 +18,22 @@
 }
 %tab-nav {
   /* %frame-transparent-something */
-  border-color: var(--token-color-surface-interactive-active);
+  border-color: rgb(var(--tone-gray-200));
 }
 %tab-button {
   @extend %with-transition-500;
   transition-property: background-color, border-color;
-  border-color: transparent;
-  color: var(--token-color-foreground-faint);
+  border-color: var(--transparent);
+  color: rgb(var(--tone-gray-500));
 }
 %tab-button-intent,
 %tab-button-active {
   /* %frame-gray-something */
-  background-color: var(--token-color-surface-strong);
+  background-color: rgb(var(--tone-gray-100));
 }
 %tab-button-intent {
-  border-color: var(--token-color-palette-neutral-300);
+  border-color: rgb(var(--tone-gray-300));
 }
 %tab-nav.animatable .selected a {
-  border-color: transparent !important;
+  border-color: var(--transparent) !important;
 }
diff --git a/ui/packages/consul-ui/app/components/table/index.scss b/ui/packages/consul-ui/app/components/table/index.scss
index 11e5928e17045..23a57f0a1985f 100644
--- a/ui/packages/consul-ui/app/components/table/index.scss
+++ b/ui/packages/consul-ui/app/components/table/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 %main-content table {
@@ -26,7 +21,7 @@ table.consul-metadata-list tbody tr:hover {
 
 %table th span::after {
   @extend %with-info-circle-outline-mask, %as-pseudo;
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-500));
   margin-left: 4px;
 }
 %table tbody tr {
@@ -36,12 +31,12 @@ table.consul-metadata-list tbody tr:hover {
   padding: 0;
 }
 %table tbody tr:hover {
-  box-shadow: var(--token-elevation-high-box-shadow);
+  box-shadow: var(--decor-elevation-300);
 }
 
 %table td.folder::before {
   @extend %with-folder-outline-mask, %as-pseudo;
-  background-color: var(--token-color-palette-neutral-300);
+  background-color: rgb(var(--tone-gray-300));
   margin-top: 1px;
   margin-right: 5px;
 }
diff --git a/ui/packages/consul-ui/app/components/table/layout.scss b/ui/packages/consul-ui/app/components/table/layout.scss
index a896818315735..4858bce801a7f 100644
--- a/ui/packages/consul-ui/app/components/table/layout.scss
+++ b/ui/packages/consul-ui/app/components/table/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %table {
   width: 100%;
   border-collapse: collapse;
@@ -61,8 +56,8 @@
 %table tbody td em {
   display: block;
   font-style: normal;
-  font-weight: var(--token-typography-font-weight-regular);
+  font-weight: normal;
 }
 %table tbody td em {
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-500));
 }
diff --git a/ui/packages/consul-ui/app/components/table/skin.scss b/ui/packages/consul-ui/app/components/table/skin.scss
index 0169990a556b8..6e8ff93d7ab16 100644
--- a/ui/packages/consul-ui/app/components/table/skin.scss
+++ b/ui/packages/consul-ui/app/components/table/skin.scss
@@ -1,31 +1,26 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %table th,
 %table td {
   border-bottom: var(--decor-border-100);
 }
-%table th,
-%tbody-th {
-  border-color: var(--token-color-palette-neutral-300);
+%table th {
+  border-color: rgb(var(--tone-gray-300));
 }
 %table td {
-  border-color: var(--token-color-palette-neutral-300);
-  color: var(--token-color-foreground-faint);
+  border-color: rgb(var(--tone-gray-200));
+  color: rgb(var(--tone-gray-500));
 }
 %table th,
 %table td strong {
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-600));
 }
 /* TODO: Add to native selector `tbody th` - will involve moving all
  * current th's to `thead th` and changing the templates
  * at whichpoint we can probably remove the %table a selector from here
  */
-%table a {
-  color: var(--token-color-foreground-strong);
+%table a,
+%tbody-th {
+  color: rgb(var(--tone-gray-900));
 }
-%table th {
+%table td:first-child {
   @extend %tbody-th;
 }
diff --git a/ui/packages/consul-ui/app/components/tabular-collection/index.hbs b/ui/packages/consul-ui/app/components/tabular-collection/index.hbs
index 8b25e831a1631..09943dc775325 100644
--- a/ui/packages/consul-ui/app/components/tabular-collection/index.hbs
+++ b/ui/packages/consul-ui/app/components/tabular-collection/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <table
   class="tabular-collection dom-recycling {{if hasActions 'has-actions' ''}}"
   id={{guid}}
diff --git a/ui/packages/consul-ui/app/components/tabular-collection/index.js b/ui/packages/consul-ui/app/components/tabular-collection/index.js
index 63ef74c5c284b..5bb3ff7f2940a 100644
--- a/ui/packages/consul-ui/app/components/tabular-collection/index.js
+++ b/ui/packages/consul-ui/app/components/tabular-collection/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import { computed, get, set } from '@ember/object';
 import CollectionComponent from 'ember-collection/components/ember-collection';
@@ -25,7 +20,7 @@ export default CollectionComponent.extend(Slotted, {
     this.guid = this.dom.guid(this);
     // TODO: The row height should auto calculate properly from the CSS
     const o = this;
-    this['cell-layout'] = new Grid(this.width, this.rowHeight);
+    this['cell-layout'] = new Grid(get(this, 'width'), get(this, 'rowHeight'));
     this['cell-layout'].formatItemStyle = function (itemIndex) {
       let style = formatItemStyle.apply(this, arguments);
       if (o.checked === itemIndex) {
@@ -40,12 +35,12 @@ export default CollectionComponent.extend(Slotted, {
     this.actions.resize.apply(this, [{ target: this.dom.viewport() }]);
   },
   style: computed('rowHeight', '_items', 'maxRows', 'maxHeight', function () {
-    const maxRows = this.rows;
-    let height = this.maxHeight;
+    const maxRows = get(this, 'rows');
+    let height = get(this, 'maxHeight');
     if (maxRows) {
       let rows = Math.max(3, get(this._items || [], 'length'));
       rows = Math.min(maxRows, rows);
-      height = this.rowHeight * rows + 29;
+      height = get(this, 'rowHeight') * rows + 29;
     }
     return {
       height: height,
@@ -80,7 +75,7 @@ export default CollectionComponent.extend(Slotted, {
         const height = e.target.innerHeight - space;
         this.set('maxHeight', Math.max(0, height));
         // TODO: The row height should auto calculate properly from the CSS
-        this['cell-layout'] = new Grid($appContent.clientWidth, this.rowHeight);
+        this['cell-layout'] = new Grid($appContent.clientWidth, get(this, 'rowHeight'));
         const o = this;
         this['cell-layout'].formatItemStyle = function (itemIndex) {
           let style = formatItemStyle.apply(this, arguments);
@@ -100,7 +95,7 @@ export default CollectionComponent.extend(Slotted, {
       if (this.$tr) {
         this.$tr.style.zIndex = null;
       }
-      if (e.target && e.target.checked && index !== this.checked) {
+      if (e.target && e.target.checked && index !== get(this, 'checked')) {
         set(this, 'checked', parseInt(index));
         const target = e.target;
         const $tr = this.dom.closest('tr', target);
diff --git a/ui/packages/consul-ui/app/components/tabular-collection/index.scss b/ui/packages/consul-ui/app/components/tabular-collection/index.scss
index 5ce730997621f..c46301cc58805 100644
--- a/ui/packages/consul-ui/app/components/tabular-collection/index.scss
+++ b/ui/packages/consul-ui/app/components/tabular-collection/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 table.dom-recycling {
   @extend %dom-recycling-table;
 }
diff --git a/ui/packages/consul-ui/app/components/tabular-details/index.hbs b/ui/packages/consul-ui/app/components/tabular-details/index.hbs
index 293787f0bf4f3..dfa52cdd78b37 100644
--- a/ui/packages/consul-ui/app/components/tabular-details/index.hbs
+++ b/ui/packages/consul-ui/app/components/tabular-details/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
 <table class="with-details has-actions">
   <thead>
diff --git a/ui/packages/consul-ui/app/components/tabular-details/index.js b/ui/packages/consul-ui/app/components/tabular-details/index.js
index 5611235f53a30..1b2a5aeb9df55 100644
--- a/ui/packages/consul-ui/app/components/tabular-details/index.js
+++ b/ui/packages/consul-ui/app/components/tabular-details/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import Slotted from 'block-slots';
diff --git a/ui/packages/consul-ui/app/components/tabular-details/index.scss b/ui/packages/consul-ui/app/components/tabular-details/index.scss
index b0bc79ba5510a..0798f902a0b27 100644
--- a/ui/packages/consul-ui/app/components/tabular-details/index.scss
+++ b/ui/packages/consul-ui/app/components/tabular-details/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 table.with-details {
diff --git a/ui/packages/consul-ui/app/components/tabular-details/layout.scss b/ui/packages/consul-ui/app/components/tabular-details/layout.scss
index 911a7e1db2c6a..cb9f0669c61f4 100644
--- a/ui/packages/consul-ui/app/components/tabular-details/layout.scss
+++ b/ui/packages/consul-ui/app/components/tabular-details/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* TODO: rename: %details-table */
 %tabular-details tr > .actions {
   @extend %table-actions;
diff --git a/ui/packages/consul-ui/app/components/tabular-details/skin.scss b/ui/packages/consul-ui/app/components/tabular-details/skin.scss
index 80d6d292a06d7..0bd53b99ada7a 100644
--- a/ui/packages/consul-ui/app/components/tabular-details/skin.scss
+++ b/ui/packages/consul-ui/app/components/tabular-details/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %tabular-details-toggle-button::before {
   @extend %with-chevron-down-icon, %as-pseudo;
 }
@@ -11,22 +6,22 @@
   border: 0;
 }
 %tabular-detail {
-  border: 1px solid var(--token-color-palette-neutral-300);
+  border: 1px solid rgb(var(--tone-gray-300));
   border-radius: var(--decor-radius-100);
-  box-shadow: var(--token-surface-high-box-shadow);
+  box-shadow: var(--decor-elevation-600);
   margin-bottom: 20px;
 }
 %tabular-detail::before,
 %tabular-detail > div,
 %tabular-detail > label {
-  background-color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-gray-000));
 }
 %tabular-detail > label::before {
   transform: rotate(180deg);
 }
 // this is here as its a fake border
 %tabular-detail::before {
-  background: var(--token-color-surface-interactive-active);
+  background: rgb(var(--tone-gray-200));
   content: '';
   display: block;
   height: 1px;
diff --git a/ui/packages/consul-ui/app/components/tabular-dl/index.scss b/ui/packages/consul-ui/app/components/tabular-dl/index.scss
index be2b3f025ff3b..62cfad5c01886 100644
--- a/ui/packages/consul-ui/app/components/tabular-dl/index.scss
+++ b/ui/packages/consul-ui/app/components/tabular-dl/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './layout';
 @import './skin';
diff --git a/ui/packages/consul-ui/app/components/tabular-dl/layout.scss b/ui/packages/consul-ui/app/components/tabular-dl/layout.scss
index c8e6bbd98bfea..3e8d6b4223dc3 100644
--- a/ui/packages/consul-ui/app/components/tabular-dl/layout.scss
+++ b/ui/packages/consul-ui/app/components/tabular-dl/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %tabular-dl {
   display: flex;
   flex-wrap: wrap;
diff --git a/ui/packages/consul-ui/app/components/tabular-dl/skin.scss b/ui/packages/consul-ui/app/components/tabular-dl/skin.scss
index 9829eb517b546..a48931cb3c5dc 100644
--- a/ui/packages/consul-ui/app/components/tabular-dl/skin.scss
+++ b/ui/packages/consul-ui/app/components/tabular-dl/skin.scss
@@ -1,26 +1,21 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %tabular-dl {
   > dt:last-of-type,
   > dd:last-of-type {
-    border-color: var(--token-color-palette-neutral-300) !important;
+    border-color: rgb(var(--tone-gray-300)) !important;
   }
   dt,
   dd {
-    border-color: var(--token-color-palette-neutral-300) !important;
-    color: var(--token-color-hashicorp-brand) !important;
+    border-color: rgb(var(--tone-gray-300)) !important;
+    color: rgb(var(--tone-gray-999)) !important;
   }
   dt {
-    font-weight: var(--token-typography-font-weight-bold);
+    font-weight: var(--typo-weight-bold);
   }
   dd .copy-button button::before {
-    background-color: var(--token-color-hashicorp-brand);
+    background-color: rgb(var(--tone-gray-999));
   }
   dt.type + dd span::before {
     @extend %with-info-circle-outline-mask, %as-pseudo;
-    background-color: var(--token-color-foreground-faint);
+    background-color: rgb(var(--tone-gray-500));
   }
 }
diff --git a/ui/packages/consul-ui/app/components/tag-list/index.hbs b/ui/packages/consul-ui/app/components/tag-list/index.hbs
index a52376cfb1f09..9927c13174009 100644
--- a/ui/packages/consul-ui/app/components/tag-list/index.hbs
+++ b/ui/packages/consul-ui/app/components/tag-list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#let (union (or @item.Tags (array)) (or @tags (array))) as |tags|}}
   {{#if (gt tags.length 0)}}
     {{#if (has-block)}}
diff --git a/ui/packages/consul-ui/app/components/tag-list/index.scss b/ui/packages/consul-ui/app/components/tag-list/index.scss
index 14b0231d84967..6ded1d9a3bfbc 100644
--- a/ui/packages/consul-ui/app/components/tag-list/index.scss
+++ b/ui/packages/consul-ui/app/components/tag-list/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .tag-list,
 td.tags {
   @extend %tag-list;
@@ -13,7 +8,7 @@ td.tags {
 %tag-list dt::before {
   @extend %with-tag-mask, %as-pseudo;
   color: inherit;
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-500));
 }
 %tag-list dd {
   @extend %csv-list;
diff --git a/ui/packages/consul-ui/app/components/text-input/index.hbs b/ui/packages/consul-ui/app/components/text-input/index.hbs
index 89ba7826f5b2e..79d7a578d69c2 100644
--- a/ui/packages/consul-ui/app/components/text-input/index.hbs
+++ b/ui/packages/consul-ui/app/components/text-input/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <FormInput
   class={{concat 'text-input' ' type-text'}}
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/tile/debug.scss b/ui/packages/consul-ui/app/components/tile/debug.scss
index 02f417455ad7a..8b3e0797de4ac 100644
--- a/ui/packages/consul-ui/app/components/tile/debug.scss
+++ b/ui/packages/consul-ui/app/components/tile/debug.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 #docfy-demo-preview-tile {
   .tile {
     @extend %with-tile, %with-leader-tile;
diff --git a/ui/packages/consul-ui/app/components/tile/index.scss b/ui/packages/consul-ui/app/components/tile/index.scss
index 2bef99777d76a..55ceb7b400418 100644
--- a/ui/packages/consul-ui/app/components/tile/index.scss
+++ b/ui/packages/consul-ui/app/components/tile/index.scss
@@ -1,7 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
 
 %with-tile {
   position: relative;
@@ -27,15 +23,15 @@
   @extend %with-tile;
 }
 %with-leader-tile::before {
-  background-image: linear-gradient(
-    135deg,
-    var(--token-color-consul-surface) 0%,
-    var(--token-color-consul-border) 100%
+  background-image: linear-gradient(135deg,
+    rgb(var(--strawberry-010)) 0%,
+    rgb(var(--strawberry-200)) 100%
   );
-  border-color: var(--token-color-border-faint);
+  border-color: rgb(var(--tone-gray-999) / 10%);
 }
 %with-leader-tile::after {
   --icon-name: icon-star-fill;
   --icon-size: icon-700;
-  color: var(--token-color-consul-brand);
+  color: rgb(var(--strawberry-500));
 }
+
diff --git a/ui/packages/consul-ui/app/components/toggle-button/index.hbs b/ui/packages/consul-ui/app/components/toggle-button/index.hbs
index e19120529553c..0f497bdb18cb3 100644
--- a/ui/packages/consul-ui/app/components/toggle-button/index.hbs
+++ b/ui/packages/consul-ui/app/components/toggle-button/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <input
   ...attributes
   {{did-insert (set this 'input')}}
diff --git a/ui/packages/consul-ui/app/components/toggle-button/index.js b/ui/packages/consul-ui/app/components/toggle-button/index.js
index 3902709e7bb44..73de491a03d5f 100644
--- a/ui/packages/consul-ui/app/components/toggle-button/index.js
+++ b/ui/packages/consul-ui/app/components/toggle-button/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/components/toggle-button/index.scss b/ui/packages/consul-ui/app/components/toggle-button/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/toggle-button/index.scss
+++ b/ui/packages/consul-ui/app/components/toggle-button/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/toggle-button/layout.scss b/ui/packages/consul-ui/app/components/toggle-button/layout.scss
index 1004fbbe37f12..6e36aa2b3defb 100644
--- a/ui/packages/consul-ui/app/components/toggle-button/layout.scss
+++ b/ui/packages/consul-ui/app/components/toggle-button/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* TODO: This should be merged with ghost-button*/
 %toggle-button {
   min-width: 30px;
diff --git a/ui/packages/consul-ui/app/components/toggle-button/skin.scss b/ui/packages/consul-ui/app/components/toggle-button/skin.scss
index 3f34040e06378..7a05618ed3b9f 100644
--- a/ui/packages/consul-ui/app/components/toggle-button/skin.scss
+++ b/ui/packages/consul-ui/app/components/toggle-button/skin.scss
@@ -1,17 +1,12 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %toggle-button {
   border-radius: var(--decor-radius-100);
   cursor: pointer;
 }
 %toggle-button-intent {
-  background-color: var(--token-color-surface-strong);
+  background-color: rgb(var(--tone-gray-050));
 }
 %toggle-button-active {
-  background-color: var(--token-color-surface-strong);
+  background-color: rgb(var(--tone-gray-100));
 }
 %toggle-button:hover,
 %toggle-button:focus {
diff --git a/ui/packages/consul-ui/app/components/token-list/index.hbs b/ui/packages/consul-ui/app/components/token-list/index.hbs
index 556b93efdc383..8b7dc9df37075 100644
--- a/ui/packages/consul-ui/app/components/token-list/index.hbs
+++ b/ui/packages/consul-ui/app/components/token-list/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
 {{#if (gt items.length 0)}}
   <TabularCollection
diff --git a/ui/packages/consul-ui/app/components/token-list/index.js b/ui/packages/consul-ui/app/components/token-list/index.js
index 363946d6d405f..c84883ea5f0bf 100644
--- a/ui/packages/consul-ui/app/components/token-list/index.js
+++ b/ui/packages/consul-ui/app/components/token-list/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import SlotsMixin from 'block-slots';
 
diff --git a/ui/packages/consul-ui/app/components/token-list/pageobject.js b/ui/packages/consul-ui/app/components/token-list/pageobject.js
index 9c79de4e977eb..a941c0b2d7a68 100644
--- a/ui/packages/consul-ui/app/components/token-list/pageobject.js
+++ b/ui/packages/consul-ui/app/components/token-list/pageobject.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (clickable, attribute, collection, deletable) => () => {
   return collection('[data-test-tokens] [data-test-tabular-row]', {
     id: attribute('data-test-token', '[data-test-token]'),
diff --git a/ui/packages/consul-ui/app/components/token-source/chart.xstate.js b/ui/packages/consul-ui/app/components/token-source/chart.xstate.js
index af193cd80fa10..6629a68befc9e 100644
--- a/ui/packages/consul-ui/app/components/token-source/chart.xstate.js
+++ b/ui/packages/consul-ui/app/components/token-source/chart.xstate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   id: 'token-source',
   initial: 'idle',
diff --git a/ui/packages/consul-ui/app/components/token-source/index.hbs b/ui/packages/consul-ui/app/components/token-source/index.hbs
index 626dd7ab05483..962fc7774ad09 100644
--- a/ui/packages/consul-ui/app/components/token-source/index.hbs
+++ b/ui/packages/consul-ui/app/components/token-source/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <StateChart
   @src={{this.chart}}
   @initial={{if (eq @type 'oidc') 'provider' 'secret'}}
diff --git a/ui/packages/consul-ui/app/components/token-source/index.js b/ui/packages/consul-ui/app/components/token-source/index.js
index d4e3c79f1dd27..6b88952b061a3 100644
--- a/ui/packages/consul-ui/app/components/token-source/index.js
+++ b/ui/packages/consul-ui/app/components/token-source/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/packages/consul-ui/app/components/tooltip-panel/index.scss b/ui/packages/consul-ui/app/components/tooltip-panel/index.scss
index 59a040e93bee0..870575eaa4abd 100644
--- a/ui/packages/consul-ui/app/components/tooltip-panel/index.scss
+++ b/ui/packages/consul-ui/app/components/tooltip-panel/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
 .tooltip-panel {
diff --git a/ui/packages/consul-ui/app/components/tooltip-panel/layout.scss b/ui/packages/consul-ui/app/components/tooltip-panel/layout.scss
index dd681dddbf464..4fe7f6d77add1 100644
--- a/ui/packages/consul-ui/app/components/tooltip-panel/layout.scss
+++ b/ui/packages/consul-ui/app/components/tooltip-panel/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %tooltip-panel,
 %tooltip-panel dt {
   display: flex;
diff --git a/ui/packages/consul-ui/app/components/tooltip-panel/skin.scss b/ui/packages/consul-ui/app/components/tooltip-panel/skin.scss
index 1e5ba6bab170f..7e65c62926ba7 100644
--- a/ui/packages/consul-ui/app/components/tooltip-panel/skin.scss
+++ b/ui/packages/consul-ui/app/components/tooltip-panel/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %tooltip-panel dt {
   cursor: pointer;
 }
@@ -11,9 +6,9 @@
   @extend %as-pseudo;
   width: 12px;
   height: 12px;
-  background-color: var(--token-color-surface-primary);
-  border-top: 1px solid var(--token-color-palette-neutral-300);
-  border-right: 1px solid var(--token-color-palette-neutral-300);
+  background-color: rgb(var(--tone-gray-000));
+  border-top: 1px solid rgb(var(--tone-gray-300));
+  border-right: 1px solid rgb(var(--tone-gray-300));
   transform: rotate(-45deg);
   position: absolute;
   left: 16px;
diff --git a/ui/packages/consul-ui/app/components/tooltip/index.hbs b/ui/packages/consul-ui/app/components/tooltip/index.hbs
index 9af44ec479e50..7e286e8c293f2 100644
--- a/ui/packages/consul-ui/app/components/tooltip/index.hbs
+++ b/ui/packages/consul-ui/app/components/tooltip/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="tooltip"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/tooltip/index.scss b/ui/packages/consul-ui/app/components/tooltip/index.scss
index 2b06799535867..333faed35fe08 100644
--- a/ui/packages/consul-ui/app/components/tooltip/index.scss
+++ b/ui/packages/consul-ui/app/components/tooltip/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .tippy-box[data-theme~='tooltip'] {
   & {
     @extend %tooltip-bubble;
@@ -27,7 +22,7 @@
   }
 }
 %tooltip-content {
-  @extend %body-100-regular;
+  @extend %p3;
   padding: 12px;
   max-width: 224px;
   position: relative;
@@ -36,19 +31,19 @@
 
 %tooltip-bubble {
   & {
-    background-color: var(--token-color-foreground-faint);
-    color: var(--token-color-surface-primary);
+    background-color: rgb(var(--tone-gray-700));
+    color: rgb(var(--tone-gray-000));
   }
 }
 %tooltip-tail {
   --size: 5px;
   & {
-    color: var(--token-color-foreground-faint);
+    color: rgb(var(--tone-gray-700));
     width: calc(var(--size) * 2);
     height: calc(var(--size) * 2);
   }
   &::before {
-    border-color: transparent;
+    border-color: var(--transparent);
     border-style: solid;
   }
 }
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/card/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/card/index.hbs
index 0dba1c016aa81..a4f064b254748 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/card/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/card/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (eq @item.Datacenter '')}}
 <a
   class="topology-metrics-card"
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/card/index.js b/ui/packages/consul-ui/app/components/topology-metrics/card/index.js
index 9b115e8371137..9821dcc92d611 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/card/index.js
+++ b/ui/packages/consul-ui/app/components/topology-metrics/card/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { get } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/card/index.scss b/ui/packages/consul-ui/app/components/topology-metrics/card/index.scss
index 42e05f8332178..6148f41a75d13 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/card/index.scss
+++ b/ui/packages/consul-ui/app/components/topology-metrics/card/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 #upstream-container .topology-metrics-card:not(:last-child),
 #downstream-container .topology-metrics-card:not(:last-child) {
   margin-bottom: 8px;
@@ -10,17 +5,18 @@
 #upstream-container .topology-metrics-card,
 #downstream-container .topology-metrics-card {
   display: block;
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-700));
   overflow: hidden;
-  background-color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-gray-000));
   border-radius: var(--decor-radius-100);
   border: 1px solid;
   /* TODO: If this color is combined with the above */
   /* border property then the compressor removes the color */
-  border-color: var(--token-color-surface-interactive-active);
+  border-color: rgb(var(--tone-gray-200));
   p {
-    @extend %display-300-semibold;
     padding: 12px 12px 0 12px;
+    font-size: var(--typo-size-500);
+    font-weight: var(--typo-weight-semibold);
     margin-bottom: 0 !important;
   }
   p.empty {
@@ -32,7 +28,7 @@
       margin-right: 8px;
     }
     dd {
-      color: var(--token-color-foreground-faint);
+      color: rgb(var(--tone-gray-700));
     }
     span {
       margin-right: 8px;
@@ -60,23 +56,23 @@
     .partition dt::before,
     .nspace dt::before,
     .health dt::before {
-      --icon-color: var(--token-color-foreground-faint);
+      --icon-color: rgb(var(--tone-gray-500));
     }
     .passing::before {
       @extend %with-check-circle-fill-mask, %as-pseudo;
-      --icon-color: var(--token-color-foreground-success);
+      --icon-color: rgb(var(--tone-green-500));
     }
     .warning::before {
       @extend %with-alert-triangle-mask, %as-pseudo;
-      --icon-color: var(--token-color-foreground-warning);
+      --icon-color: rgb(var(--tone-orange-500));
     }
     .critical::before {
       @extend %with-cancel-square-fill-mask, %as-pseudo;
-      --icon-color: var(--token-color-foreground-critical);
+      --icon-color: rgb(var(--tone-red-500));
     }
     .empty::before {
       @extend %with-minus-square-fill-mask, %as-pseudo;
-      --icon-color: var(--token-color-foreground-faint);
+      --icon-color: rgb(var(--tone-gray-500));
     }
   }
   .details {
@@ -100,7 +96,7 @@
       span::before {
         margin-right: 0px;
         @extend %with-union-mask, %as-pseudo;
-        --icon-color: var(--token-color-foreground-faint);
+        --icon-color: rgb(var(--tone-gray-500));
       }
       dl:first-child {
         grid-area: partition;
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.hbs
index a073ec424d971..6f140d348de51 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (gt @lines.length 0)}}
   <svg
     {{did-insert this.getIconPositions}}
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.js b/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.js
index afcf62def644d..d0fe1088d6a06 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.js
+++ b/ui/packages/consul-ui/app/components/topology-metrics/down-lines/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/index.hbs
index 46f8dc9e01d07..23dcce62c72f0 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   {{on-resize this.calculate}}
   class="topology-container consul-topology-metrics"
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/index.js b/ui/packages/consul-ui/app/components/topology-metrics/index.js
index 587668c6df1f9..a5696c1ce817a 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/index.js
+++ b/ui/packages/consul-ui/app/components/topology-metrics/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action, get } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/index.scss b/ui/packages/consul-ui/app/components/topology-metrics/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/index.scss
+++ b/ui/packages/consul-ui/app/components/topology-metrics/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/layout.scss b/ui/packages/consul-ui/app/components/topology-metrics/layout.scss
index b6500fe800457..e62a58884b9db 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/layout.scss
+++ b/ui/packages/consul-ui/app/components/topology-metrics/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .topology-notices {
   display: flow-root;
   button {
@@ -61,9 +56,10 @@
   grid-area: metrics;
 
   div:first-child {
-    @extend %body-300-semibold;
     padding: 12px;
     border: none;
+    font-size: 16px;
+    font-weight: bold;
   }
   .link {
     padding: 18px;
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/notifications/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/notifications/index.hbs
index ee763cb609903..7ef4000c5d5c6 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/notifications/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/notifications/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (eq @type 'create')}}
   {{#if (eq @status 'success') }}
     Your intention has been added.
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/popover/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/popover/index.hbs
index 244e3a36180b9..96f237cba4827 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/popover/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/popover/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <div
   class="topology-metrics-popover {{@type}}"
   ...attributes
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/popover/index.js b/ui/packages/consul-ui/app/components/topology-metrics/popover/index.js
index ef14df32b4d9e..68138d503a194 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/popover/index.js
+++ b/ui/packages/consul-ui/app/components/topology-metrics/popover/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 
 export default class TopologyMetricsButton extends Component {}
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/popover/index.scss b/ui/packages/consul-ui/app/components/topology-metrics/popover/index.scss
index c0724c23b1d0f..230bfa1144823 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/popover/index.scss
+++ b/ui/packages/consul-ui/app/components/topology-metrics/popover/index.scss
@@ -1,13 +1,8 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .topology-metrics-popover {
   > button {
     position: absolute;
     transform: translate(-50%, -50%);
-    background-color: var(--token-color-surface-primary);
+    background-color: rgb(var(--tone-gray-000));
     padding: 1px 1px;
     &:hover {
       cursor: pointer;
@@ -26,16 +21,16 @@
   &.deny > button::before,
   &.deny .tippy-arrow::after {
     @extend %with-cancel-square-fill-mask, %as-pseudo;
-    --icon-color: var(--token-color-foreground-critical);
+    --icon-color: rgb(var(--tone-red-500));
   }
   &.l7 > button::before,
   &.l7 .tippy-arrow::after {
     @extend %with-layers-mask, %as-pseudo;
-    --icon-color: var(--token-color-palette-neutral-300);
+    --icon-color: rgb(var(--tone-gray-300));
   }
   &.not-defined > button::before,
   &.not-defined .tippy-arrow::after {
     @extend %with-alert-triangle-mask, %as-pseudo;
-    --icon-color: var(--token-color-vault-brand);
+    --icon-color: rgb(var(--tone-yellow-500));
   }
 }
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/series/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/series/index.hbs
index a48b3a260cd36..7ff4128fad652 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/series/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/series/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (not @noMetricsReason)}}
   <DataSource
     @src={{uri '/${partition}/${nspace}/${dc}/metrics/summary-for-service/${service}/${protocol}'
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/series/index.js b/ui/packages/consul-ui/app/components/topology-metrics/series/index.js
index 696f074e46b50..18141adde2915 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/series/index.js
+++ b/ui/packages/consul-ui/app/components/topology-metrics/series/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@ember/component';
 import dayjs from 'dayjs';
 import Calendar from 'dayjs/plugin/calendar';
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/series/index.scss b/ui/packages/consul-ui/app/components/topology-metrics/series/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/series/index.scss
+++ b/ui/packages/consul-ui/app/components/topology-metrics/series/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/series/layout.scss b/ui/packages/consul-ui/app/components/topology-metrics/series/layout.scss
index 1900cdcc29019..154b05fe18252 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/series/layout.scss
+++ b/ui/packages/consul-ui/app/components/topology-metrics/series/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 #metrics-container div .sparkline-wrapper {
   position: relative;
   width: 100%;
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/series/skin.scss b/ui/packages/consul-ui/app/components/topology-metrics/series/skin.scss
index 85db80be0b4d8..abd3ed5f2e9ce 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/series/skin.scss
+++ b/ui/packages/consul-ui/app/components/topology-metrics/series/skin.scss
@@ -1,27 +1,25 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 #metrics-container .sparkline-wrapper {
   svg path {
     stroke-width: 0;
   }
 
   .tooltip {
-    @extend %body-200-regular;
     padding: 0 0 10px;
-    border: 1px solid var(--token-color-palette-neutral-300);
+    font-size: 0.875em;
+    line-height: 1.5em;
+    font-weight: normal;
+    border: 1px solid rgb(var(--tone-gray-300));
     background: #fff;
     border-radius: 2px;
     box-sizing: border-box;
-    box-shadow: var(--token-elevation-higher-box-shadow);
+    box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.05), 0px 4px 4px rgba(0, 0, 0, 0.1);
 
     .sparkline-time {
-      @extend %body-200-semibold;
       padding: 8px 10px;
+      font-weight: bold;
+      font-size: 14px;
       color: #000;
-      border-bottom: 1px solid var(--token-color-surface-interactive-active);
+      border-bottom: 1px solid rgb(var(--tone-gray-200));
       margin-bottom: 4px;
       text-align: center;
     }
@@ -33,7 +31,7 @@
     }
 
     .sparkline-tt-sum {
-      border-top: 1px solid var(--token-color-surface-interactive-active);
+      border-top: 1px solid rgb(var(--tone-gray-200));
       margin-top: 4px;
       padding: 8px 10px 0 10px;
     }
@@ -60,7 +58,7 @@
     height: 12px;
     left: 15px;
     bottom: -7px;
-    border: 1px solid var(--token-color-palette-neutral-300);
+    border: 1px solid rgb(var(--tone-gray-300));
     border-top: 0;
     border-left: 0;
     background: #fff;
@@ -73,29 +71,29 @@
   h3::before {
     @extend %with-info-circle-fill-mask, %as-pseudo;
     margin: 2px 3px 0 0;
-    font-size: var(--token-typography-body-200-font-size);
+    font-size: 14px;
   }
 
   h3 {
-    @extend %display-300-semibold;
-    color: var(--token-color-foreground-strong);
+    color: rgb(var(--tone-gray-900));
+    font-size: 16px;
   }
 
   .sparkline-key-content {
     dt {
-      font-weight: var(--token-typography-font-weight-semibold);
+      font-weight: 600;
     }
     dd {
-      color: var(--token-color-foreground-faint);
+      color: rgb(var(--tone-gray-500));
     }
   }
 }
 
 .sparkline-key-link {
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-500));
 }
 .sparkline-key-link:hover {
-  color: var(--token-color-foreground-action);
+  color: rgb(var(--tone-blue-500));
 }
 #metrics-container:hover .sparkline-key-link::before {
   @extend %with-info-circle-fill-mask, %as-pseudo;
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/skin.scss b/ui/packages/consul-ui/app/components/topology-metrics/skin.scss
index 9a04815e4467e..fc819a6300f6f 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/skin.scss
+++ b/ui/packages/consul-ui/app/components/topology-metrics/skin.scss
@@ -1,12 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .topology-notices {
   button {
     @extend %button;
-    color: var(--token-color-foreground-action);
+    color: rgb(var(--tone-blue-500));
   }
   button::before {
     @extend %as-pseudo;
@@ -17,7 +12,7 @@
   }
 }
 .topology-container {
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-700));
 }
 
 // Columns/Containers & Lines
@@ -28,35 +23,35 @@
   border: 1px solid;
   /* TODO: If this color is combined with the above */
   /* border property then the compressor removes the color */
-  border-color: var(--token-color-surface-interactive-active);
+  border-color: rgb(var(--tone-gray-200));
 }
 #downstream-container,
 #upstream-container {
-  background-color: var(--token-color-surface-strong);
+  background-color: rgb(var(--tone-gray-100));
 }
 #downstream-container > div:first-child {
   display: inline-flex;
   span::before {
     @extend %with-info-circle-outline-mask, %as-pseudo;
-    background-color: var(--token-color-foreground-faint);
+    background-color: rgb(var(--tone-gray-500));
   }
 }
 
 // Metrics Container
 #metrics-container {
   div:first-child {
-    background-color: var(--token-color-surface-primary);
+    background-color: rgb(var(--tone-gray-000));
   }
   .link {
-    background-color: var(--token-color-surface-strong);
+    background-color: rgb(var(--tone-gray-100));
     a {
-      color: var(--token-color-foreground-faint);
+      color: rgb(var(--tone-gray-700));
     }
     a::before {
-      background-color: var(--token-color-foreground-faint);
+      background-color: rgb(var(--tone-gray-500));
     }
     a:hover {
-      color: var(--token-color-foreground-action);
+      color: rgb(var(--color-action));
     }
     .metrics-link::before {
       @extend %with-exit-mask, %as-pseudo;
@@ -71,19 +66,19 @@
 #downstream-lines svg,
 #upstream-lines svg {
   path {
-    fill: transparent;
+    fill: var(--transparent);
   }
   circle {
-    fill: var(--token-color-surface-primary);
+    fill: rgb(var(--tone-gray-000));
   }
   .allow-arrow {
-    fill: var(--token-color-palette-neutral-300);
+    fill: rgb(var(--tone-gray-300));
     stroke-linejoin: round;
   }
   path,
   .allow-dot,
   .allow-arrow {
-    stroke: var(--token-color-palette-neutral-300);
+    stroke: rgb(var(--tone-gray-300));
     stroke-width: 2;
   }
   path[data-permission='not-defined'],
@@ -91,15 +86,15 @@
     stroke-dasharray: 4;
   }
   path[data-permission='deny'] {
-    stroke: var(--token-color-foreground-critical);
+    stroke: rgb(var(--tone-red-500));
   }
   .deny-dot {
-    stroke: var(--token-color-foreground-critical);
+    stroke: rgb(var(--tone-red-500));
     stroke-width: 2;
   }
   .deny-arrow {
-    fill: var(--token-color-foreground-critical);
-    stroke: var(--token-color-foreground-critical);
+    fill: rgb(var(--tone-red-500));
+    stroke: rgb(var(--tone-red-500));
     stroke-linejoin: round;
   }
 }
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/source-type/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/source-type/index.hbs
index 56a118e4f4588..84b8d4457a982 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/source-type/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/source-type/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <span
   data-test-topology-metrics-source-type
   class="topology-metrics-source-type"
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/source-type/index.scss b/ui/packages/consul-ui/app/components/topology-metrics/source-type/index.scss
index 7c27347db7357..e0a781c09cd3b 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/source-type/index.scss
+++ b/ui/packages/consul-ui/app/components/topology-metrics/source-type/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .topology-metrics-source-type {
   margin: 6px 0 6px 12px;
   display: table;
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/stats/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/stats/index.hbs
index 7309e8eca0883..ca0c812a41904 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/stats/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/stats/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (not @noMetricsReason)}}
   <DataSource
     @src={{uri
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/stats/index.js b/ui/packages/consul-ui/app/components/topology-metrics/stats/index.js
index ab547f7fd4fe2..cacaf60017f96 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/stats/index.js
+++ b/ui/packages/consul-ui/app/components/topology-metrics/stats/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/stats/index.scss b/ui/packages/consul-ui/app/components/topology-metrics/stats/index.scss
index d3836797113ba..58943e192700a 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/stats/index.scss
+++ b/ui/packages/consul-ui/app/components/topology-metrics/stats/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .topology-metrics-stats {
   padding: 12px 12px 0 12px;
   display: flex;
@@ -10,7 +5,7 @@
   justify-content: space-between;
   align-items: stretch;
   width: 100%;
-  border-top: 1px solid var(--token-color-surface-interactive-active);
+  border-top: 1px solid rgb(var(--tone-gray-200));
   dl {
     display: flex;
     padding-bottom: 12px;
@@ -20,7 +15,7 @@
     line-height: 1.5em !important;
   }
   dd {
-    color: var(--token-color-foreground-disabled) !important;
+    color: rgb(var(--tone-gray-400)) !important;
   }
   span {
     padding-bottom: 12px;
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/status/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/status/index.hbs
index f147c8ee5210f..4617ef8571b2d 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/status/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/status/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (or @noMetricsReason @error)}}
   <span data-test-topology-metrics-status class="topology-metrics-status-error">
     {{#if (eq @noMetricsReason 'ingress-gateway')}}
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/status/index.scss b/ui/packages/consul-ui/app/components/topology-metrics/status/index.scss
index 21be3b6f6ebcf..fdf7f23fbf0d7 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/status/index.scss
+++ b/ui/packages/consul-ui/app/components/topology-metrics/status/index.scss
@@ -1,19 +1,15 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .topology-metrics-status-error,
 .topology-metrics-status-loader {
-  @extend %body-200-regular;
-  color: var(--token-color-foreground-faint);
+  font-weight: normal;
+  font-size: 0.875rem;
+  color: rgb(var(--tone-gray-500));
   text-align: center;
   margin: 0 auto !important;
   display: block;
 
   span::before {
     @extend %with-info-circle-outline-mask, %as-pseudo;
-    background-color: var(--token-color-foreground-faint);
+    background-color: rgb(var(--tone-gray-500));
   }
 }
 
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.hbs
index c2d6de1975df2..2f3748280f1f3 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if (gt @lines.length 0)}}
   <svg
     {{did-insert this.getIconPositions}}
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.js b/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.js
index 1cd610a4e41ec..62073c3fbb71d 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.js
+++ b/ui/packages/consul-ui/app/components/topology-metrics/up-lines/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/components/watcher/index.hbs b/ui/packages/consul-ui/app/components/watcher/index.hbs
index 43bc6c3ae4507..f8ec72bb1cc92 100644
--- a/ui/packages/consul-ui/app/components/watcher/index.hbs
+++ b/ui/packages/consul-ui/app/components/watcher/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield (hash
   fns=(hash
     start=this.start
diff --git a/ui/packages/consul-ui/app/components/watcher/index.js b/ui/packages/consul-ui/app/components/watcher/index.js
index 868d59f7e663f..bcb8a2d48f4db 100644
--- a/ui/packages/consul-ui/app/components/watcher/index.js
+++ b/ui/packages/consul-ui/app/components/watcher/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/packages/consul-ui/app/components/yield/index.hbs b/ui/packages/consul-ui/app/components/yield/index.hbs
index 4c7b4919504ac..889d9eeadc101 100644
--- a/ui/packages/consul-ui/app/components/yield/index.hbs
+++ b/ui/packages/consul-ui/app/components/yield/index.hbs
@@ -1,6 +1 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
diff --git a/ui/packages/consul-ui/app/controllers/_peered-resource.js b/ui/packages/consul-ui/app/controllers/_peered-resource.js
index e0b588a360405..edcf50605fd89 100644
--- a/ui/packages/consul-ui/app/controllers/_peered-resource.js
+++ b/ui/packages/consul-ui/app/controllers/_peered-resource.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/controllers/application.js b/ui/packages/consul-ui/app/controllers/application.js
index 9180761dcd996..4247d6cc8e53a 100644
--- a/ui/packages/consul-ui/app/controllers/application.js
+++ b/ui/packages/consul-ui/app/controllers/application.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 import { getOwner } from '@ember/application';
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/policies/create.js b/ui/packages/consul-ui/app/controllers/dc/acls/policies/create.js
index 2ff44f72fe856..f4c701cbb3fda 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/policies/create.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/policies/create.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Controller from './edit';
 export default class CreateController extends Controller {}
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/policies/edit.js b/ui/packages/consul-ui/app/controllers/dc/acls/policies/edit.js
index 8aa847e202196..6288962de41a6 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/policies/edit.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/policies/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 export default class EditController extends Controller {
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/roles/create.js b/ui/packages/consul-ui/app/controllers/dc/acls/roles/create.js
index 2ff44f72fe856..f4c701cbb3fda 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/roles/create.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/roles/create.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Controller from './edit';
 export default class CreateController extends Controller {}
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/roles/edit.js b/ui/packages/consul-ui/app/controllers/dc/acls/roles/edit.js
index 04778c6f34ccd..17d870ddc036e 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/roles/edit.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/roles/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 export default class EditController extends Controller {
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/tokens/create.js b/ui/packages/consul-ui/app/controllers/dc/acls/tokens/create.js
index 2ff44f72fe856..f4c701cbb3fda 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/tokens/create.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/tokens/create.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Controller from './edit';
 export default class CreateController extends Controller {}
diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/tokens/edit.js b/ui/packages/consul-ui/app/controllers/dc/acls/tokens/edit.js
index 81628de627b19..32f929cb943ed 100644
--- a/ui/packages/consul-ui/app/controllers/dc/acls/tokens/edit.js
+++ b/ui/packages/consul-ui/app/controllers/dc/acls/tokens/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 export default Controller.extend({
diff --git a/ui/packages/consul-ui/app/controllers/dc/nodes/index.js b/ui/packages/consul-ui/app/controllers/dc/nodes/index.js
index fe5889e4792ad..56c35902b7351 100644
--- a/ui/packages/consul-ui/app/controllers/dc/nodes/index.js
+++ b/ui/packages/consul-ui/app/controllers/dc/nodes/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import PeeredResourceController from 'consul-ui/controllers/_peered-resource';
 
 export default class DcNodesController extends PeeredResourceController {}
diff --git a/ui/packages/consul-ui/app/controllers/dc/services/index.js b/ui/packages/consul-ui/app/controllers/dc/services/index.js
index 2d98940be9255..f112725630ed5 100644
--- a/ui/packages/consul-ui/app/controllers/dc/services/index.js
+++ b/ui/packages/consul-ui/app/controllers/dc/services/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import PeeredResourceController from 'consul-ui/controllers/_peered-resource';
 
 export default class DcServicesController extends PeeredResourceController {}
diff --git a/ui/packages/consul-ui/app/controllers/dc/services/instance/healthchecks.js b/ui/packages/consul-ui/app/controllers/dc/services/instance/healthchecks.js
index 1e274ba3d47d8..3e80cc0cee2b1 100644
--- a/ui/packages/consul-ui/app/controllers/dc/services/instance/healthchecks.js
+++ b/ui/packages/consul-ui/app/controllers/dc/services/instance/healthchecks.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Controller from '@ember/controller';
 import { action } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/decorators/data-source.js b/ui/packages/consul-ui/app/decorators/data-source.js
index 228f62991745f..62893731085ee 100644
--- a/ui/packages/consul-ui/app/decorators/data-source.js
+++ b/ui/packages/consul-ui/app/decorators/data-source.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { runInDebug } from '@ember/debug';
 import wayfarer from 'wayfarer';
 
diff --git a/ui/packages/consul-ui/app/decorators/replace.js b/ui/packages/consul-ui/app/decorators/replace.js
index 1521b24a0d339..72703b18c4902 100644
--- a/ui/packages/consul-ui/app/decorators/replace.js
+++ b/ui/packages/consul-ui/app/decorators/replace.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /**
  * Simple replacing decorator, with the primary usecase for avoiding null API
  * errors by decorating model attributes: @replace(null, []) @attr() Tags;
diff --git a/ui/packages/consul-ui/app/env.js b/ui/packages/consul-ui/app/env.js
index 7a832d320f73e..c26c39fcebb77 100644
--- a/ui/packages/consul-ui/app/env.js
+++ b/ui/packages/consul-ui/app/env.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import config from './config/environment';
 import getEnvironment from './utils/get-environment';
 export const env = getEnvironment(config, window, document);
diff --git a/ui/packages/consul-ui/app/filter/predicates/auth-method.js b/ui/packages/consul-ui/app/filter/predicates/auth-method.js
index e2d4b5598d25c..796cd23c6d47b 100644
--- a/ui/packages/consul-ui/app/filter/predicates/auth-method.js
+++ b/ui/packages/consul-ui/app/filter/predicates/auth-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   kind: {
     kubernetes: (item, value) => item.Type === value,
diff --git a/ui/packages/consul-ui/app/filter/predicates/health-check.js b/ui/packages/consul-ui/app/filter/predicates/health-check.js
index 7cb0ed7d5d06b..197d187b3d221 100644
--- a/ui/packages/consul-ui/app/filter/predicates/health-check.js
+++ b/ui/packages/consul-ui/app/filter/predicates/health-check.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   status: {
     passing: (item, value) => item.Status === value,
diff --git a/ui/packages/consul-ui/app/filter/predicates/intention.js b/ui/packages/consul-ui/app/filter/predicates/intention.js
index a3f37c04b79bd..30646b8dd8322 100644
--- a/ui/packages/consul-ui/app/filter/predicates/intention.js
+++ b/ui/packages/consul-ui/app/filter/predicates/intention.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   access: {
     allow: (item, value) => item.Action === value,
diff --git a/ui/packages/consul-ui/app/filter/predicates/kv.js b/ui/packages/consul-ui/app/filter/predicates/kv.js
index eab8616fed193..8df7da9f75d62 100644
--- a/ui/packages/consul-ui/app/filter/predicates/kv.js
+++ b/ui/packages/consul-ui/app/filter/predicates/kv.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   kind: {
     folder: (item, value) => item.isFolder,
diff --git a/ui/packages/consul-ui/app/filter/predicates/node.js b/ui/packages/consul-ui/app/filter/predicates/node.js
index 99d22784d27ae..dc8e641c0182e 100644
--- a/ui/packages/consul-ui/app/filter/predicates/node.js
+++ b/ui/packages/consul-ui/app/filter/predicates/node.js
@@ -1,20 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   status: {
     passing: (item, value) => item.Status === value,
     warning: (item, value) => item.Status === value,
     critical: (item, value) => item.Status === value,
   },
-  version: (item, value) => {
-    for (const element of value) {
-      if (item.Version.includes(element + '.')) {
-        return true;
-      }
-    }
-    return false;
-  },
 };
diff --git a/ui/packages/consul-ui/app/filter/predicates/peer.js b/ui/packages/consul-ui/app/filter/predicates/peer.js
index c2686e934cd8a..7bafa7fa2c7dd 100644
--- a/ui/packages/consul-ui/app/filter/predicates/peer.js
+++ b/ui/packages/consul-ui/app/filter/predicates/peer.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   state: {
     pending: (item, value) => item.State.toLowerCase() === value,
diff --git a/ui/packages/consul-ui/app/filter/predicates/policy.js b/ui/packages/consul-ui/app/filter/predicates/policy.js
index 78c47b8b0af6c..c5308357a8a37 100644
--- a/ui/packages/consul-ui/app/filter/predicates/policy.js
+++ b/ui/packages/consul-ui/app/filter/predicates/policy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import setHelpers from 'mnemonist/set';
 
 export default {
diff --git a/ui/packages/consul-ui/app/filter/predicates/service-instance.js b/ui/packages/consul-ui/app/filter/predicates/service-instance.js
index 1b75a845d916e..c55f9e79e3ca3 100644
--- a/ui/packages/consul-ui/app/filter/predicates/service-instance.js
+++ b/ui/packages/consul-ui/app/filter/predicates/service-instance.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import setHelpers from 'mnemonist/set';
 
 export default {
diff --git a/ui/packages/consul-ui/app/filter/predicates/service.js b/ui/packages/consul-ui/app/filter/predicates/service.js
index 220a6ca358cbd..a5030e34ed250 100644
--- a/ui/packages/consul-ui/app/filter/predicates/service.js
+++ b/ui/packages/consul-ui/app/filter/predicates/service.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import setHelpers from 'mnemonist/set';
 
 export default {
diff --git a/ui/packages/consul-ui/app/filter/predicates/token.js b/ui/packages/consul-ui/app/filter/predicates/token.js
index fab338739092e..31dd06ea521cf 100644
--- a/ui/packages/consul-ui/app/filter/predicates/token.js
+++ b/ui/packages/consul-ui/app/filter/predicates/token.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   kind: {
     'global-management': (item, value) => item.isGlobalManagement,
diff --git a/ui/packages/consul-ui/app/formats.js b/ui/packages/consul-ui/app/formats.js
index e791c1efc9729..f5d1f15024f2b 100644
--- a/ui/packages/consul-ui/app/formats.js
+++ b/ui/packages/consul-ui/app/formats.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   time: {
     hhmmss: {
diff --git a/ui/packages/consul-ui/app/forms/intention.js b/ui/packages/consul-ui/app/forms/intention.js
index ee665bc77b35f..dbcba347474cc 100644
--- a/ui/packages/consul-ui/app/forms/intention.js
+++ b/ui/packages/consul-ui/app/forms/intention.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import validations from 'consul-ui/validations/intention';
 import builderFactory from 'consul-ui/utils/form/builder';
 const builder = builderFactory();
diff --git a/ui/packages/consul-ui/app/forms/kv.js b/ui/packages/consul-ui/app/forms/kv.js
index 3f15fec0f9022..729dfd4b7be96 100644
--- a/ui/packages/consul-ui/app/forms/kv.js
+++ b/ui/packages/consul-ui/app/forms/kv.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import validations from 'consul-ui/validations/kv';
 import builderFactory from 'consul-ui/utils/form/builder';
 const builder = builderFactory();
diff --git a/ui/packages/consul-ui/app/forms/policy.js b/ui/packages/consul-ui/app/forms/policy.js
index ef48fcf891cc5..5023b7d59577a 100644
--- a/ui/packages/consul-ui/app/forms/policy.js
+++ b/ui/packages/consul-ui/app/forms/policy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import validations from 'consul-ui/validations/policy';
 import builderFactory from 'consul-ui/utils/form/builder';
 const builder = builderFactory();
diff --git a/ui/packages/consul-ui/app/forms/role.js b/ui/packages/consul-ui/app/forms/role.js
index 3116cbe57f671..0550c04c7a6bd 100644
--- a/ui/packages/consul-ui/app/forms/role.js
+++ b/ui/packages/consul-ui/app/forms/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import validations from 'consul-ui/validations/role';
 import builderFactory from 'consul-ui/utils/form/builder';
 const builder = builderFactory();
diff --git a/ui/packages/consul-ui/app/forms/token.js b/ui/packages/consul-ui/app/forms/token.js
index 59932a765cd2b..2994a397c941b 100644
--- a/ui/packages/consul-ui/app/forms/token.js
+++ b/ui/packages/consul-ui/app/forms/token.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import validations from 'consul-ui/validations/token';
 import builderFactory from 'consul-ui/utils/form/builder';
 const builder = builderFactory();
diff --git a/ui/packages/consul-ui/app/helpers/adopt-styles.js b/ui/packages/consul-ui/app/helpers/adopt-styles.js
index 4dc31bce25b0b..959558dca17d1 100644
--- a/ui/packages/consul-ui/app/helpers/adopt-styles.js
+++ b/ui/packages/consul-ui/app/helpers/adopt-styles.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { assert } from '@ember/debug';
 import { adoptStyles } from '@lit/reactive-element';
diff --git a/ui/packages/consul-ui/app/helpers/atob.js b/ui/packages/consul-ui/app/helpers/atob.js
index 988ba8ae0a97f..76b49122f3002 100644
--- a/ui/packages/consul-ui/app/helpers/atob.js
+++ b/ui/packages/consul-ui/app/helpers/atob.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 import atob from 'consul-ui/utils/atob';
 export default helper(function ([str = '']) {
diff --git a/ui/packages/consul-ui/app/helpers/cached-model.js b/ui/packages/consul-ui/app/helpers/cached-model.js
index cd2d8785e5b4a..903a524657ea0 100644
--- a/ui/packages/consul-ui/app/helpers/cached-model.js
+++ b/ui/packages/consul-ui/app/helpers/cached-model.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { getOwner } from '@ember/application';
 
diff --git a/ui/packages/consul-ui/app/helpers/class-map.js b/ui/packages/consul-ui/app/helpers/class-map.js
index a38cc2d8f09d7..a3034a06eb9bd 100644
--- a/ui/packages/consul-ui/app/helpers/class-map.js
+++ b/ui/packages/consul-ui/app/helpers/class-map.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 /**
diff --git a/ui/packages/consul-ui/app/helpers/collection.js b/ui/packages/consul-ui/app/helpers/collection.js
index 18b08dd202d7f..5cef73b93ad80 100644
--- a/ui/packages/consul-ui/app/helpers/collection.js
+++ b/ui/packages/consul-ui/app/helpers/collection.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { get } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/helpers/css-map.js b/ui/packages/consul-ui/app/helpers/css-map.js
index 1a098f078f7d4..da4f89ef7d976 100644
--- a/ui/packages/consul-ui/app/helpers/css-map.js
+++ b/ui/packages/consul-ui/app/helpers/css-map.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 import { CSSResult } from '@lit/reactive-element';
 
diff --git a/ui/packages/consul-ui/app/helpers/css.js b/ui/packages/consul-ui/app/helpers/css.js
index de2dc35d154b5..35bb4aabad30b 100644
--- a/ui/packages/consul-ui/app/helpers/css.js
+++ b/ui/packages/consul-ui/app/helpers/css.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { css } from '@lit/reactive-element';
 
diff --git a/ui/packages/consul-ui/app/helpers/document-attrs.js b/ui/packages/consul-ui/app/helpers/document-attrs.js
index 7b62abbb91396..a1ccfc1ace7f5 100644
--- a/ui/packages/consul-ui/app/helpers/document-attrs.js
+++ b/ui/packages/consul-ui/app/helpers/document-attrs.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 import { runInDebug } from '@ember/debug';
diff --git a/ui/packages/consul-ui/app/helpers/dom-position.js b/ui/packages/consul-ui/app/helpers/dom-position.js
index 6398edcf3cf86..39caafc3e22f0 100644
--- a/ui/packages/consul-ui/app/helpers/dom-position.js
+++ b/ui/packages/consul-ui/app/helpers/dom-position.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 
 export default class DomPosition extends Helper {
diff --git a/ui/packages/consul-ui/app/helpers/duration-from.js b/ui/packages/consul-ui/app/helpers/duration-from.js
index 0a5e349feade5..63f2e62572702 100644
--- a/ui/packages/consul-ui/app/helpers/duration-from.js
+++ b/ui/packages/consul-ui/app/helpers/duration-from.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/helpers/env.js b/ui/packages/consul-ui/app/helpers/env.js
index c963941526938..8da0ffbc40eae 100644
--- a/ui/packages/consul-ui/app/helpers/env.js
+++ b/ui/packages/consul-ui/app/helpers/env.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/helpers/flatten-property.js b/ui/packages/consul-ui/app/helpers/flatten-property.js
index d738fa73c8a89..9790dc9120619 100644
--- a/ui/packages/consul-ui/app/helpers/flatten-property.js
+++ b/ui/packages/consul-ui/app/helpers/flatten-property.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 export default helper(function flattenProperty([obj, prop], hash) {
diff --git a/ui/packages/consul-ui/app/helpers/format-short-time.js b/ui/packages/consul-ui/app/helpers/format-short-time.js
index ad3d87c5459c1..5f0fa8ddb100c 100644
--- a/ui/packages/consul-ui/app/helpers/format-short-time.js
+++ b/ui/packages/consul-ui/app/helpers/format-short-time.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 export default helper(function formatTime([params], hash) {
diff --git a/ui/packages/consul-ui/app/helpers/href-to.js b/ui/packages/consul-ui/app/helpers/href-to.js
index 4bc91c8a61837..9c428b82775ab 100644
--- a/ui/packages/consul-ui/app/helpers/href-to.js
+++ b/ui/packages/consul-ui/app/helpers/href-to.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // This helper requires `ember-href-to` for the moment at least
 // It's similar code but allows us to check on the type of route
 // (dynamic or wildcard) and encode or not depending on the type
diff --git a/ui/packages/consul-ui/app/helpers/icon-mapping.js b/ui/packages/consul-ui/app/helpers/icon-mapping.js
index c0fce79bc22a9..9f561836e599e 100644
--- a/ui/packages/consul-ui/app/helpers/icon-mapping.js
+++ b/ui/packages/consul-ui/app/helpers/icon-mapping.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 const ICON_MAPPING = {
diff --git a/ui/packages/consul-ui/app/helpers/icons-debug.js b/ui/packages/consul-ui/app/helpers/icons-debug.js
index 8cbd5484cb4d4..019356717917d 100644
--- a/ui/packages/consul-ui/app/helpers/icons-debug.js
+++ b/ui/packages/consul-ui/app/helpers/icons-debug.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 export default helper(function ([lib], hash) {
diff --git a/ui/packages/consul-ui/app/helpers/is-href.js b/ui/packages/consul-ui/app/helpers/is-href.js
index 2080185f2c045..1faf1a0dc07ab 100644
--- a/ui/packages/consul-ui/app/helpers/is-href.js
+++ b/ui/packages/consul-ui/app/helpers/is-href.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/helpers/is.js b/ui/packages/consul-ui/app/helpers/is.js
index 2fd830ca071bb..2b7fee2194e5e 100644
--- a/ui/packages/consul-ui/app/helpers/is.js
+++ b/ui/packages/consul-ui/app/helpers/is.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from 'ember-can/helpers/can';
 import { get } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/helpers/json-stringify.js b/ui/packages/consul-ui/app/helpers/json-stringify.js
index 5e00326803f56..f60c61ddb2bb0 100644
--- a/ui/packages/consul-ui/app/helpers/json-stringify.js
+++ b/ui/packages/consul-ui/app/helpers/json-stringify.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 export default helper(function (args, hash) {
diff --git a/ui/packages/consul-ui/app/helpers/last.js b/ui/packages/consul-ui/app/helpers/last.js
index 533432eabb404..d595365791494 100644
--- a/ui/packages/consul-ui/app/helpers/last.js
+++ b/ui/packages/consul-ui/app/helpers/last.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 export function last([obj = ''], hash) {
diff --git a/ui/packages/consul-ui/app/helpers/left-trim.js b/ui/packages/consul-ui/app/helpers/left-trim.js
index 870eab3074b53..893e7e2b4a177 100644
--- a/ui/packages/consul-ui/app/helpers/left-trim.js
+++ b/ui/packages/consul-ui/app/helpers/left-trim.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 import leftTrim from 'consul-ui/utils/left-trim';
 
diff --git a/ui/packages/consul-ui/app/helpers/merge-checks.js b/ui/packages/consul-ui/app/helpers/merge-checks.js
index 5edd0a7f3bf78..6944dc9108726 100644
--- a/ui/packages/consul-ui/app/helpers/merge-checks.js
+++ b/ui/packages/consul-ui/app/helpers/merge-checks.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 import mergeChecks from 'consul-ui/utils/merge-checks';
 
diff --git a/ui/packages/consul-ui/app/helpers/percentage-of.js b/ui/packages/consul-ui/app/helpers/percentage-of.js
index 72a7e114d58a8..5c5b2182acfbf 100644
--- a/ui/packages/consul-ui/app/helpers/percentage-of.js
+++ b/ui/packages/consul-ui/app/helpers/percentage-of.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 export default helper(function ([of, num], hash) {
diff --git a/ui/packages/consul-ui/app/helpers/policy/datacenters.js b/ui/packages/consul-ui/app/helpers/policy/datacenters.js
index 576e79b94a9c4..f9e149870f468 100644
--- a/ui/packages/consul-ui/app/helpers/policy/datacenters.js
+++ b/ui/packages/consul-ui/app/helpers/policy/datacenters.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 import { get } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/helpers/policy/group.js b/ui/packages/consul-ui/app/helpers/policy/group.js
index 0e53863ded00c..5802f31bc335b 100644
--- a/ui/packages/consul-ui/app/helpers/policy/group.js
+++ b/ui/packages/consul-ui/app/helpers/policy/group.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 import { get } from '@ember/object';
 import { MANAGEMENT_ID } from 'consul-ui/models/policy';
diff --git a/ui/packages/consul-ui/app/helpers/policy/typeof.js b/ui/packages/consul-ui/app/helpers/policy/typeof.js
index b2de3db52fd8b..87c0591e3dec2 100644
--- a/ui/packages/consul-ui/app/helpers/policy/typeof.js
+++ b/ui/packages/consul-ui/app/helpers/policy/typeof.js
@@ -1,12 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 import { get } from '@ember/object';
 const MANAGEMENT_ID = '00000000-0000-0000-0000-000000000001';
-const READ_ONLY_ID = '00000000-0000-0000-0000-000000000002';
 export function typeOf(params, hash) {
   const item = params[0];
   const template = get(item, 'template');
@@ -19,8 +13,6 @@ export function typeOf(params, hash) {
       return 'policy-node-identity';
     case get(item, 'ID') === MANAGEMENT_ID:
       return 'policy-management';
-    case get(item, 'ID') === READ_ONLY_ID:
-      return 'read-only';
     default:
       return 'policy';
   }
diff --git a/ui/packages/consul-ui/app/helpers/refresh-route.js b/ui/packages/consul-ui/app/helpers/refresh-route.js
index 4a703ee05dd34..367b2b940c964 100644
--- a/ui/packages/consul-ui/app/helpers/refresh-route.js
+++ b/ui/packages/consul-ui/app/helpers/refresh-route.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 import { getOwner } from '@ember/application';
diff --git a/ui/packages/consul-ui/app/helpers/render-template.js b/ui/packages/consul-ui/app/helpers/render-template.js
index 6ea4e065aa03b..57c006b84c835 100644
--- a/ui/packages/consul-ui/app/helpers/render-template.js
+++ b/ui/packages/consul-ui/app/helpers/render-template.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/helpers/require.js b/ui/packages/consul-ui/app/helpers/require.js
index 86b2d08393412..d62481eac969a 100644
--- a/ui/packages/consul-ui/app/helpers/require.js
+++ b/ui/packages/consul-ui/app/helpers/require.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 import require from 'require';
 
diff --git a/ui/packages/consul-ui/app/helpers/right-trim.js b/ui/packages/consul-ui/app/helpers/right-trim.js
index fbc0585cb3936..823e6ad132742 100644
--- a/ui/packages/consul-ui/app/helpers/right-trim.js
+++ b/ui/packages/consul-ui/app/helpers/right-trim.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 import rightTrim from 'consul-ui/utils/right-trim';
diff --git a/ui/packages/consul-ui/app/helpers/route-match.js b/ui/packages/consul-ui/app/helpers/route-match.js
index 479a3832778b4..665db1e959c8f 100644
--- a/ui/packages/consul-ui/app/helpers/route-match.js
+++ b/ui/packages/consul-ui/app/helpers/route-match.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 export default helper(function routeMatch([item], hash) {
diff --git a/ui/packages/consul-ui/app/helpers/service/card-permissions.js b/ui/packages/consul-ui/app/helpers/service/card-permissions.js
index 15a2abae1504e..aa067e83c57d7 100644
--- a/ui/packages/consul-ui/app/helpers/service/card-permissions.js
+++ b/ui/packages/consul-ui/app/helpers/service/card-permissions.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 export default helper(function serviceCardPermissions([params] /*, hash*/) {
diff --git a/ui/packages/consul-ui/app/helpers/service/external-source.js b/ui/packages/consul-ui/app/helpers/service/external-source.js
index 1fd88f8ea6a9d..7881145a63551 100644
--- a/ui/packages/consul-ui/app/helpers/service/external-source.js
+++ b/ui/packages/consul-ui/app/helpers/service/external-source.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 import { get } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/helpers/service/health-percentage.js b/ui/packages/consul-ui/app/helpers/service/health-percentage.js
index 2a9d2cda06804..98163d0501f61 100644
--- a/ui/packages/consul-ui/app/helpers/service/health-percentage.js
+++ b/ui/packages/consul-ui/app/helpers/service/health-percentage.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 export default helper(function serviceHealthPercentage([params] /*, hash*/) {
diff --git a/ui/packages/consul-ui/app/helpers/slugify.js b/ui/packages/consul-ui/app/helpers/slugify.js
index 455c609318626..0775a01e85802 100644
--- a/ui/packages/consul-ui/app/helpers/slugify.js
+++ b/ui/packages/consul-ui/app/helpers/slugify.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 // TODO: Currently I'm only using this for hardcoded values
diff --git a/ui/packages/consul-ui/app/helpers/smart-date-format.js b/ui/packages/consul-ui/app/helpers/smart-date-format.js
index 5473d13bdcd93..45dce293c5032 100644
--- a/ui/packages/consul-ui/app/helpers/smart-date-format.js
+++ b/ui/packages/consul-ui/app/helpers/smart-date-format.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/helpers/split.js b/ui/packages/consul-ui/app/helpers/split.js
index d44a335bdc95e..04b451bc4eb59 100644
--- a/ui/packages/consul-ui/app/helpers/split.js
+++ b/ui/packages/consul-ui/app/helpers/split.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 export function split([str = '', separator = ','], hash) {
diff --git a/ui/packages/consul-ui/app/helpers/state-chart.js b/ui/packages/consul-ui/app/helpers/state-chart.js
index 5a94bae1aa2ae..f89c01b44d057 100644
--- a/ui/packages/consul-ui/app/helpers/state-chart.js
+++ b/ui/packages/consul-ui/app/helpers/state-chart.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/helpers/state-matches.js b/ui/packages/consul-ui/app/helpers/state-matches.js
index 8f0d21e99bb02..27dadc81cd7c2 100644
--- a/ui/packages/consul-ui/app/helpers/state-matches.js
+++ b/ui/packages/consul-ui/app/helpers/state-matches.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/helpers/style-map.js b/ui/packages/consul-ui/app/helpers/style-map.js
index b85aa30c92574..259effd1e12bd 100644
--- a/ui/packages/consul-ui/app/helpers/style-map.js
+++ b/ui/packages/consul-ui/app/helpers/style-map.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 /**
diff --git a/ui/packages/consul-ui/app/helpers/substr.js b/ui/packages/consul-ui/app/helpers/substr.js
index b5dc785dd9f1d..926ecbcfb13b3 100644
--- a/ui/packages/consul-ui/app/helpers/substr.js
+++ b/ui/packages/consul-ui/app/helpers/substr.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 
 export default helper(function substr([str = '', start = 0, length], hash) {
diff --git a/ui/packages/consul-ui/app/helpers/svg-curve.js b/ui/packages/consul-ui/app/helpers/svg-curve.js
index a1715331a9750..a9a9a2c87f129 100644
--- a/ui/packages/consul-ui/app/helpers/svg-curve.js
+++ b/ui/packages/consul-ui/app/helpers/svg-curve.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 // arguments should be a list of {x: numLike, y: numLike} points
 // numLike meaning they should be numbers (or numberlike strings i.e. "1" vs 1)
diff --git a/ui/packages/consul-ui/app/helpers/temporal-format.js b/ui/packages/consul-ui/app/helpers/temporal-format.js
index 35d42495b1039..17e7dd2f9f920 100644
--- a/ui/packages/consul-ui/app/helpers/temporal-format.js
+++ b/ui/packages/consul-ui/app/helpers/temporal-format.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/helpers/temporal-within.js b/ui/packages/consul-ui/app/helpers/temporal-within.js
index 28ee4a18962bd..a1f328ca81981 100644
--- a/ui/packages/consul-ui/app/helpers/temporal-within.js
+++ b/ui/packages/consul-ui/app/helpers/temporal-within.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/helpers/test.js b/ui/packages/consul-ui/app/helpers/test.js
index d95fac5efa6ab..a57f137a837e7 100644
--- a/ui/packages/consul-ui/app/helpers/test.js
+++ b/ui/packages/consul-ui/app/helpers/test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from './can';
 import { is } from './is';
 
diff --git a/ui/packages/consul-ui/app/helpers/to-hash.js b/ui/packages/consul-ui/app/helpers/to-hash.js
index 62c526ed2607b..60d60e4ce081d 100644
--- a/ui/packages/consul-ui/app/helpers/to-hash.js
+++ b/ui/packages/consul-ui/app/helpers/to-hash.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 import { get } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/helpers/to-route.js b/ui/packages/consul-ui/app/helpers/to-route.js
index 1fb16cc545c69..7f3a6d4f5f004 100644
--- a/ui/packages/consul-ui/app/helpers/to-route.js
+++ b/ui/packages/consul-ui/app/helpers/to-route.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/helpers/token/is-anonymous.js b/ui/packages/consul-ui/app/helpers/token/is-anonymous.js
index 601917b0f1807..ffa8329a4cfa7 100644
--- a/ui/packages/consul-ui/app/helpers/token/is-anonymous.js
+++ b/ui/packages/consul-ui/app/helpers/token/is-anonymous.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 import { get } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/helpers/token/is-legacy.js b/ui/packages/consul-ui/app/helpers/token/is-legacy.js
index 530c4b96bc9c8..c66bbd7a152f2 100644
--- a/ui/packages/consul-ui/app/helpers/token/is-legacy.js
+++ b/ui/packages/consul-ui/app/helpers/token/is-legacy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 import { get } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/helpers/tween-to.js b/ui/packages/consul-ui/app/helpers/tween-to.js
index b1a9f56d2a507..e679d3b92af23 100644
--- a/ui/packages/consul-ui/app/helpers/tween-to.js
+++ b/ui/packages/consul-ui/app/helpers/tween-to.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/helpers/uniq-by.js b/ui/packages/consul-ui/app/helpers/uniq-by.js
index d348eaad5cb9d..c8c46ee0271d4 100644
--- a/ui/packages/consul-ui/app/helpers/uniq-by.js
+++ b/ui/packages/consul-ui/app/helpers/uniq-by.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { helper } from '@ember/component/helper';
 import { isEmpty } from '@ember/utils';
 import { A as emberArray } from '@ember/array';
diff --git a/ui/packages/consul-ui/app/helpers/unique-id.js b/ui/packages/consul-ui/app/helpers/unique-id.js
index 180dc188d5a93..93b16b49c5631 100644
--- a/ui/packages/consul-ui/app/helpers/unique-id.js
+++ b/ui/packages/consul-ui/app/helpers/unique-id.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/helpers/uri.js b/ui/packages/consul-ui/app/helpers/uri.js
index ff133c630cd1a..7c0692c1c8478 100644
--- a/ui/packages/consul-ui/app/helpers/uri.js
+++ b/ui/packages/consul-ui/app/helpers/uri.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Helper from '@ember/component/helper';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/index.html b/ui/packages/consul-ui/app/index.html
index 77b9ca89095d1..475cc5ab0adb6 100644
--- a/ui/packages/consul-ui/app/index.html
+++ b/ui/packages/consul-ui/app/index.html
@@ -1,9 +1,4 @@
 <!DOCTYPE html>
-<!--
- Copyright (c) HashiCorp, Inc.
- SPDX-License-Identifier: BUSL-1.1
--->
-
 <html lang="en" class="{{content-for "root-class"}}">
   <head>
     <meta charset="utf-8">
diff --git a/ui/packages/consul-ui/app/instance-initializers/container.js b/ui/packages/consul-ui/app/instance-initializers/container.js
index ced0fd4d7e190..c35af601e729c 100644
--- a/ui/packages/consul-ui/app/instance-initializers/container.js
+++ b/ui/packages/consul-ui/app/instance-initializers/container.js
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { runInDebug } from '@ember/debug';
 import require from 'require';
-import assign from 'deepmerge';
+import merge from 'deepmerge';
 
 const doc = document;
 
-export const services = assign.all(
+export const services = merge.all(
   [...doc.querySelectorAll(`script[data-services]`)].map(($item) =>
     JSON.parse($item.dataset[`services`])
   )
diff --git a/ui/packages/consul-ui/app/instance-initializers/href-to.js b/ui/packages/consul-ui/app/instance-initializers/href-to.js
index 2e15b7fd22d89..dbccbe1638d4b 100644
--- a/ui/packages/consul-ui/app/instance-initializers/href-to.js
+++ b/ui/packages/consul-ui/app/instance-initializers/href-to.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import LinkComponent from '@ember/routing/link-component';
 
 export class HrefTo {
diff --git a/ui/packages/consul-ui/app/instance-initializers/ivy-codemirror.js b/ui/packages/consul-ui/app/instance-initializers/ivy-codemirror.js
index 43ab725091060..719a23c64ec43 100644
--- a/ui/packages/consul-ui/app/instance-initializers/ivy-codemirror.js
+++ b/ui/packages/consul-ui/app/instance-initializers/ivy-codemirror.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* globals CodeMirror */
 export function initialize(application) {
   const appName = application.application.name;
diff --git a/ui/packages/consul-ui/app/instance-initializers/selection.js b/ui/packages/consul-ui/app/instance-initializers/selection.js
index 9d9106a69e53d..2cf6413443eea 100644
--- a/ui/packages/consul-ui/app/instance-initializers/selection.js
+++ b/ui/packages/consul-ui/app/instance-initializers/selection.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { env } from 'consul-ui/env';
 
 const SECONDARY_BUTTON = 2;
diff --git a/ui/packages/consul-ui/app/locations/fsm-with-optional-test.js b/ui/packages/consul-ui/app/locations/fsm-with-optional-test.js
index 15af5434ff6c6..b2c3e6157b167 100644
--- a/ui/packages/consul-ui/app/locations/fsm-with-optional-test.js
+++ b/ui/packages/consul-ui/app/locations/fsm-with-optional-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import FSMWithOptionalLocation from './fsm-with-optional';
 import { FSM, Location } from './fsm';
 
diff --git a/ui/packages/consul-ui/app/locations/fsm-with-optional.js b/ui/packages/consul-ui/app/locations/fsm-with-optional.js
index 68a57b66e563a..370ca47e0f01e 100644
--- a/ui/packages/consul-ui/app/locations/fsm-with-optional.js
+++ b/ui/packages/consul-ui/app/locations/fsm-with-optional.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { env } from 'consul-ui/env';
 const OPTIONAL = {};
 if (env('CONSUL_PARTITIONS_ENABLED')) {
diff --git a/ui/packages/consul-ui/app/locations/fsm.js b/ui/packages/consul-ui/app/locations/fsm.js
index 9296e03f8f405..4f09e69803d6f 100644
--- a/ui/packages/consul-ui/app/locations/fsm.js
+++ b/ui/packages/consul-ui/app/locations/fsm.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // a simple state machine that the History API happens to more or less implement
 // it should really be an EventTarget but what we need here is simple enough
 export class FSM {
diff --git a/ui/packages/consul-ui/app/machines/boolean.xstate.js b/ui/packages/consul-ui/app/machines/boolean.xstate.js
index 8d11cba1a543c..758914f775a44 100644
--- a/ui/packages/consul-ui/app/machines/boolean.xstate.js
+++ b/ui/packages/consul-ui/app/machines/boolean.xstate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   id: 'boolean',
   initial: 'false',
diff --git a/ui/packages/consul-ui/app/machines/validate.xstate.js b/ui/packages/consul-ui/app/machines/validate.xstate.js
index 542720beccc6e..d4452d07d1edd 100644
--- a/ui/packages/consul-ui/app/machines/validate.xstate.js
+++ b/ui/packages/consul-ui/app/machines/validate.xstate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   id: 'form',
   initial: 'idle',
diff --git a/ui/packages/consul-ui/app/mixins/policy/as-many.js b/ui/packages/consul-ui/app/mixins/policy/as-many.js
index 714c20e7758ae..b5620298db680 100644
--- a/ui/packages/consul-ui/app/mixins/policy/as-many.js
+++ b/ui/packages/consul-ui/app/mixins/policy/as-many.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Mixin from '@ember/object/mixin';
 import { get } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/mixins/role/as-many.js b/ui/packages/consul-ui/app/mixins/role/as-many.js
index 2aed7fd47d6a7..97b71594290ba 100644
--- a/ui/packages/consul-ui/app/mixins/role/as-many.js
+++ b/ui/packages/consul-ui/app/mixins/role/as-many.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Mixin from '@ember/object/mixin';
 
 import minimizeModel from 'consul-ui/utils/minimizeModel';
diff --git a/ui/packages/consul-ui/app/mixins/with-blocking-actions.js b/ui/packages/consul-ui/app/mixins/with-blocking-actions.js
index 1e034addac872..9f48a3a8ab909 100644
--- a/ui/packages/consul-ui/app/mixins/with-blocking-actions.js
+++ b/ui/packages/consul-ui/app/mixins/with-blocking-actions.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Mixin from '@ember/object/mixin';
 import { inject as service } from '@ember/service';
 import { set, get } from '@ember/object';
@@ -80,9 +75,7 @@ export default Mixin.create({
       // do the same as an update, or override
       return this.afterUpdate(...arguments);
     },
-    create: function (item, event) {
-      event.preventDefault();
-
+    create: function (item) {
       return this.feedback.execute(
         () => {
           return this.repo.persist(item).then((item) => {
@@ -95,9 +88,7 @@ export default Mixin.create({
         }
       );
     },
-    update: function (item, event) {
-      event.preventDefault();
-
+    update: function (item) {
       return this.feedback.execute(
         () => {
           return this.repo.persist(item).then(() => {
diff --git a/ui/packages/consul-ui/app/models/auth-method.js b/ui/packages/consul-ui/app/models/auth-method.js
index 852a08f0fc628..0f7a792c9382b 100644
--- a/ui/packages/consul-ui/app/models/auth-method.js
+++ b/ui/packages/consul-ui/app/models/auth-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 import { or } from '@ember/object/computed';
 import parse from 'parse-duration';
diff --git a/ui/packages/consul-ui/app/models/binding-rule.js b/ui/packages/consul-ui/app/models/binding-rule.js
index 004b3ce22ad2f..e949342fd0d76 100644
--- a/ui/packages/consul-ui/app/models/binding-rule.js
+++ b/ui/packages/consul-ui/app/models/binding-rule.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 
 export const PRIMARY_KEY = 'uid';
diff --git a/ui/packages/consul-ui/app/models/coordinate.js b/ui/packages/consul-ui/app/models/coordinate.js
index 10de884913a07..016486e22d652 100644
--- a/ui/packages/consul-ui/app/models/coordinate.js
+++ b/ui/packages/consul-ui/app/models/coordinate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 
 export const PRIMARY_KEY = 'uid';
diff --git a/ui/packages/consul-ui/app/models/dc.js b/ui/packages/consul-ui/app/models/dc.js
index b0a41f8f5f7ae..48250722b60c4 100644
--- a/ui/packages/consul-ui/app/models/dc.js
+++ b/ui/packages/consul-ui/app/models/dc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 
 export const PRIMARY_KEY = 'uid';
diff --git a/ui/packages/consul-ui/app/models/discovery-chain.js b/ui/packages/consul-ui/app/models/discovery-chain.js
index 1fbda2837266d..f0b302e987af8 100644
--- a/ui/packages/consul-ui/app/models/discovery-chain.js
+++ b/ui/packages/consul-ui/app/models/discovery-chain.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 
 export const PRIMARY_KEY = 'uid';
diff --git a/ui/packages/consul-ui/app/models/gateway-config.js b/ui/packages/consul-ui/app/models/gateway-config.js
index e102e0ef084e9..ffe234019e065 100644
--- a/ui/packages/consul-ui/app/models/gateway-config.js
+++ b/ui/packages/consul-ui/app/models/gateway-config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Fragment from 'ember-data-model-fragments/fragment';
 import { array } from 'ember-data-model-fragments/attributes';
 import { attr } from '@ember-data/model';
diff --git a/ui/packages/consul-ui/app/models/health-check.js b/ui/packages/consul-ui/app/models/health-check.js
index 8a639025b6da9..7f9c2637db304 100644
--- a/ui/packages/consul-ui/app/models/health-check.js
+++ b/ui/packages/consul-ui/app/models/health-check.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Fragment from 'ember-data-model-fragments/fragment';
 import { array } from 'ember-data-model-fragments/attributes';
 import { attr } from '@ember-data/model';
diff --git a/ui/packages/consul-ui/app/models/intention-permission-http-header.js b/ui/packages/consul-ui/app/models/intention-permission-http-header.js
index b327ff91ab1e9..f98a1b4e39766 100644
--- a/ui/packages/consul-ui/app/models/intention-permission-http-header.js
+++ b/ui/packages/consul-ui/app/models/intention-permission-http-header.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Fragment from 'ember-data-model-fragments/fragment';
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/models/intention-permission-http.js b/ui/packages/consul-ui/app/models/intention-permission-http.js
index 715bc00cdebc7..21728878b97e9 100644
--- a/ui/packages/consul-ui/app/models/intention-permission-http.js
+++ b/ui/packages/consul-ui/app/models/intention-permission-http.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Fragment from 'ember-data-model-fragments/fragment';
 import { fragmentArray, array } from 'ember-data-model-fragments/attributes';
 import { attr } from '@ember-data/model';
diff --git a/ui/packages/consul-ui/app/models/intention-permission.js b/ui/packages/consul-ui/app/models/intention-permission.js
index ded3dcb7434b0..56a3223f07faa 100644
--- a/ui/packages/consul-ui/app/models/intention-permission.js
+++ b/ui/packages/consul-ui/app/models/intention-permission.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Fragment from 'ember-data-model-fragments/fragment';
 import { fragment } from 'ember-data-model-fragments/attributes';
 import { attr } from '@ember-data/model';
diff --git a/ui/packages/consul-ui/app/models/intention.js b/ui/packages/consul-ui/app/models/intention.js
index e186178ab2995..f7fa85a4750b5 100644
--- a/ui/packages/consul-ui/app/models/intention.js
+++ b/ui/packages/consul-ui/app/models/intention.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { fragmentArray } from 'ember-data-model-fragments/attributes';
diff --git a/ui/packages/consul-ui/app/models/kv.js b/ui/packages/consul-ui/app/models/kv.js
index 7270bfa5ef982..91e3d0a5d3dbc 100644
--- a/ui/packages/consul-ui/app/models/kv.js
+++ b/ui/packages/consul-ui/app/models/kv.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import isFolder from 'consul-ui/utils/isFolder';
diff --git a/ui/packages/consul-ui/app/models/license.js b/ui/packages/consul-ui/app/models/license.js
index 9a95f307f8945..4873942eefc81 100644
--- a/ui/packages/consul-ui/app/models/license.js
+++ b/ui/packages/consul-ui/app/models/license.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 
 export const PRIMARY_KEY = 'uri';
diff --git a/ui/packages/consul-ui/app/models/node.js b/ui/packages/consul-ui/app/models/node.js
index 798c2a810cfcd..157a2833b0d49 100644
--- a/ui/packages/consul-ui/app/models/node.js
+++ b/ui/packages/consul-ui/app/models/node.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr, hasMany } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { filter } from '@ember/object/computed';
@@ -67,9 +62,4 @@ export default class Node extends Model {
   get ChecksWarning() {
     return this.NodeChecks.filter((item) => item.Status === 'warning').length;
   }
-
-  @computed('Meta')
-  get Version() {
-    return this.Meta?.['consul-version'] ?? '';
-  }
 }
diff --git a/ui/packages/consul-ui/app/models/nspace.js b/ui/packages/consul-ui/app/models/nspace.js
index b4d14a5341b0c..f8669e19a80e6 100644
--- a/ui/packages/consul-ui/app/models/nspace.js
+++ b/ui/packages/consul-ui/app/models/nspace.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 
 export const PRIMARY_KEY = 'uid';
diff --git a/ui/packages/consul-ui/app/models/oidc-provider.js b/ui/packages/consul-ui/app/models/oidc-provider.js
index 97529b370544d..702fe32781b45 100644
--- a/ui/packages/consul-ui/app/models/oidc-provider.js
+++ b/ui/packages/consul-ui/app/models/oidc-provider.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 
 export const PRIMARY_KEY = 'uid';
diff --git a/ui/packages/consul-ui/app/models/partition.js b/ui/packages/consul-ui/app/models/partition.js
index 98c80f5adaf60..6e2ac8533576a 100644
--- a/ui/packages/consul-ui/app/models/partition.js
+++ b/ui/packages/consul-ui/app/models/partition.js
@@ -1,9 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
-import Model, { attr } from '@ember-data/model';
+import Model from 'ember-data/model';
+import attr from 'ember-data/attr';
 
 export const PRIMARY_KEY = 'uid';
 export const SLUG_KEY = 'Name';
diff --git a/ui/packages/consul-ui/app/models/peer.js b/ui/packages/consul-ui/app/models/peer.js
index 128945a932b09..0e03544b95e37 100644
--- a/ui/packages/consul-ui/app/models/peer.js
+++ b/ui/packages/consul-ui/app/models/peer.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 import { nullValue } from 'consul-ui/decorators/replace';
 
diff --git a/ui/packages/consul-ui/app/models/permission.js b/ui/packages/consul-ui/app/models/permission.js
index 8d8fab36be479..4deb0a50f77db 100644
--- a/ui/packages/consul-ui/app/models/permission.js
+++ b/ui/packages/consul-ui/app/models/permission.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 
 export default class Permission extends Model {
diff --git a/ui/packages/consul-ui/app/models/policy.js b/ui/packages/consul-ui/app/models/policy.js
index 68357dcfa4a37..446703de7ebf3 100644
--- a/ui/packages/consul-ui/app/models/policy.js
+++ b/ui/packages/consul-ui/app/models/policy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/models/proxy.js b/ui/packages/consul-ui/app/models/proxy.js
index c18a08803fdc5..2e0ae12d28765 100644
--- a/ui/packages/consul-ui/app/models/proxy.js
+++ b/ui/packages/consul-ui/app/models/proxy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { attr } from '@ember-data/model';
 import ServiceInstanceModel from './service-instance';
 
diff --git a/ui/packages/consul-ui/app/models/role.js b/ui/packages/consul-ui/app/models/role.js
index 861512c67dd43..2084b2c65daa2 100644
--- a/ui/packages/consul-ui/app/models/role.js
+++ b/ui/packages/consul-ui/app/models/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 
 export const PRIMARY_KEY = 'uid';
diff --git a/ui/packages/consul-ui/app/models/service-instance.js b/ui/packages/consul-ui/app/models/service-instance.js
index a991be63dbea0..51f98e25b53d4 100644
--- a/ui/packages/consul-ui/app/models/service-instance.js
+++ b/ui/packages/consul-ui/app/models/service-instance.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 import { fragmentArray } from 'ember-data-model-fragments/attributes';
 import { computed } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/models/service.js b/ui/packages/consul-ui/app/models/service.js
index 61e38d6b86b85..0e06f81a8ebdb 100644
--- a/ui/packages/consul-ui/app/models/service.js
+++ b/ui/packages/consul-ui/app/models/service.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr, belongsTo } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/packages/consul-ui/app/models/session.js b/ui/packages/consul-ui/app/models/session.js
index 7d846790cc45e..1aa45f4ec971c 100644
--- a/ui/packages/consul-ui/app/models/session.js
+++ b/ui/packages/consul-ui/app/models/session.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { nullValue } from 'consul-ui/decorators/replace';
diff --git a/ui/packages/consul-ui/app/models/token.js b/ui/packages/consul-ui/app/models/token.js
index 4301510f0d169..c2b31a339ce4d 100644
--- a/ui/packages/consul-ui/app/models/token.js
+++ b/ui/packages/consul-ui/app/models/token.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { MANAGEMENT_ID } from 'consul-ui/models/policy';
diff --git a/ui/packages/consul-ui/app/models/topology.js b/ui/packages/consul-ui/app/models/topology.js
index 9eeee0c603457..7a4e165cced9b 100644
--- a/ui/packages/consul-ui/app/models/topology.js
+++ b/ui/packages/consul-ui/app/models/topology.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model, { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/modifiers/aria-menu.js b/ui/packages/consul-ui/app/modifiers/aria-menu.js
index cc9f0dec6a19b..61c1c1751b912 100644
--- a/ui/packages/consul-ui/app/modifiers/aria-menu.js
+++ b/ui/packages/consul-ui/app/modifiers/aria-menu.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Modifier from 'ember-modifier';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/modifiers/aria-menu.mdx b/ui/packages/consul-ui/app/modifiers/aria-menu.mdx
index 167e71cf6b956..753922f7f58ec 100644
--- a/ui/packages/consul-ui/app/modifiers/aria-menu.mdx
+++ b/ui/packages/consul-ui/app/modifiers/aria-menu.mdx
@@ -56,9 +56,9 @@ In the example below, the Before Trigger and After Trigger don't do anything, th
       style={{style-map
         (array 'position' 'absolute')
         (array 'padding' '1rem')
-        (array 'border' '1px solid var(--token-color-foreground-faint)')
+        (array 'border' '1px solid rgb(var(--tone-gray-500))')
         (array 'top' '2rem')
-        (array 'background-color' 'var(--token-color-surface-primary)')
+        (array 'background-color' 'rgb(var(--tone-gray-000))')
       }}
       role="menu"
       aria-labelledby="trigger"
diff --git a/ui/packages/consul-ui/app/modifiers/css-prop.js b/ui/packages/consul-ui/app/modifiers/css-prop.js
index b986cd2452b27..2b836acd119b1 100644
--- a/ui/packages/consul-ui/app/modifiers/css-prop.js
+++ b/ui/packages/consul-ui/app/modifiers/css-prop.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Modifier from 'ember-modifier';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/modifiers/css-prop.mdx b/ui/packages/consul-ui/app/modifiers/css-prop.mdx
index f638fb6e1e461..2ddf1bead5262 100644
--- a/ui/packages/consul-ui/app/modifiers/css-prop.mdx
+++ b/ui/packages/consul-ui/app/modifiers/css-prop.mdx
@@ -5,9 +5,9 @@ Get the value for a single specific CSS Property from the modified element.
 
 ```hbs preview-template
 <div
-  {{css-prop '--token-color-foreground-critical' returns=(set this 'red')}}
+  {{css-prop '--red-500' returns=(set this 'red')}}
 >
-  <code>--token-color-foreground-critical: {{this.red}}</code>
+  <code>--red-500: {{this.red}}</code>
 </div>
 ```
 
diff --git a/ui/packages/consul-ui/app/modifiers/css-props.js b/ui/packages/consul-ui/app/modifiers/css-props.js
index 6b94cce487f34..a1826a7bbf695 100644
--- a/ui/packages/consul-ui/app/modifiers/css-props.js
+++ b/ui/packages/consul-ui/app/modifiers/css-props.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { modifier } from 'ember-modifier';
 const STYLE_RULE = 1;
 const getCustomProperties = function () {
diff --git a/ui/packages/consul-ui/app/modifiers/did-upsert.js b/ui/packages/consul-ui/app/modifiers/did-upsert.js
index 7a3330497f35e..7dcbf640ff873 100644
--- a/ui/packages/consul-ui/app/modifiers/did-upsert.js
+++ b/ui/packages/consul-ui/app/modifiers/did-upsert.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { setModifierManager, capabilities } from '@ember/modifier';
 import { gte } from 'ember-compatibility-helpers';
 
diff --git a/ui/packages/consul-ui/app/modifiers/disabled.js b/ui/packages/consul-ui/app/modifiers/disabled.js
index 2d95295aa05b7..18d12449cc51f 100644
--- a/ui/packages/consul-ui/app/modifiers/disabled.js
+++ b/ui/packages/consul-ui/app/modifiers/disabled.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { modifier } from 'ember-modifier';
 
 export default modifier(function enabled($element, [bool = true], hash) {
diff --git a/ui/packages/consul-ui/app/modifiers/notification.js b/ui/packages/consul-ui/app/modifiers/notification.js
index 1da17f4fb4477..9645246bca45c 100644
--- a/ui/packages/consul-ui/app/modifiers/notification.js
+++ b/ui/packages/consul-ui/app/modifiers/notification.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Modifier from 'ember-modifier';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/modifiers/notification.mdx b/ui/packages/consul-ui/app/modifiers/notification.mdx
index 3b16c826b97d6..c888c096fbeaf 100644
--- a/ui/packages/consul-ui/app/modifiers/notification.mdx
+++ b/ui/packages/consul-ui/app/modifiers/notification.mdx
@@ -7,17 +7,24 @@ like the below:
 ```hbs preview-template
 <figure>
   <figcaption>Attach a Warning notice to the top of the app ^^^</figcaption>
-  <Hds::Toast
-      @color='warning'
-      {{notification
-         sticky=true
-      }}
-      as |T|>
-      <T.Title>Warning!</T.Title>
-      <T.Description>
+
+  <Notice
+    class="notification-update"
+    @type="warning"
+    {{notification
+      sticky=true
+    }}
+  as |notice|>
+    <notice.Header>
+      <strong>Warning!</strong>
+    </notice.Header>
+    <notice.Body>
+      <p>
         This service has been deregistered and no longer exists in the catalog.
-      </T.Description>
-    </Hds::Toast>
+      </p>
+    </notice.Body>
+  </Notice>
+
 </figure>
 ```
 
diff --git a/ui/packages/consul-ui/app/modifiers/on-outside.js b/ui/packages/consul-ui/app/modifiers/on-outside.js
index 56095b385e0fb..614eb93bfbaea 100644
--- a/ui/packages/consul-ui/app/modifiers/on-outside.js
+++ b/ui/packages/consul-ui/app/modifiers/on-outside.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Modifier from 'ember-modifier';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/packages/consul-ui/app/modifiers/style.js b/ui/packages/consul-ui/app/modifiers/style.js
index 337b56dc5bc88..8089743b26603 100644
--- a/ui/packages/consul-ui/app/modifiers/style.js
+++ b/ui/packages/consul-ui/app/modifiers/style.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Modifier from 'ember-modifier';
 import { assert } from '@ember/debug';
 
diff --git a/ui/packages/consul-ui/app/modifiers/tooltip.js b/ui/packages/consul-ui/app/modifiers/tooltip.js
index 6731829d148f3..c2127da543ed4 100644
--- a/ui/packages/consul-ui/app/modifiers/tooltip.js
+++ b/ui/packages/consul-ui/app/modifiers/tooltip.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { modifier } from 'ember-modifier';
 import tippy, { followCursor } from 'tippy.js';
 
diff --git a/ui/packages/consul-ui/app/modifiers/validate.js b/ui/packages/consul-ui/app/modifiers/validate.js
index a840ba8cba011..9bf996cb0bfbb 100644
--- a/ui/packages/consul-ui/app/modifiers/validate.js
+++ b/ui/packages/consul-ui/app/modifiers/validate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Modifier from 'ember-modifier';
 import { action } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/modifiers/with-copyable.js b/ui/packages/consul-ui/app/modifiers/with-copyable.js
index 6ffc49187e96f..fc41a60e3185a 100644
--- a/ui/packages/consul-ui/app/modifiers/with-copyable.js
+++ b/ui/packages/consul-ui/app/modifiers/with-copyable.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Modifier from 'ember-modifier';
 import { inject as service } from '@ember/service';
 import { runInDebug } from '@ember/debug';
@@ -31,7 +26,6 @@ export default class WithCopyableModifier extends Modifier {
     this.source = this.clipboard
       .execute(this.element, {
         text: (_) => value,
-        container: this.element,
         ...hash.options,
       })
       .on('success', hash.success)
diff --git a/ui/packages/consul-ui/app/modifiers/with-overlay.js b/ui/packages/consul-ui/app/modifiers/with-overlay.js
index a5007fe4427dd..1248ef0c70cb2 100644
--- a/ui/packages/consul-ui/app/modifiers/with-overlay.js
+++ b/ui/packages/consul-ui/app/modifiers/with-overlay.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { modifier } from 'ember-modifier';
 import tippy, { followCursor } from 'tippy.js';
 
diff --git a/ui/packages/consul-ui/app/router.js b/ui/packages/consul-ui/app/router.js
index 8ff1fe0c23f19..f4b1f49c89379 100644
--- a/ui/packages/consul-ui/app/router.js
+++ b/ui/packages/consul-ui/app/router.js
@@ -1,20 +1,15 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* globals requirejs */
 import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 import { runInDebug } from '@ember/debug';
-import assign from 'deepmerge';
+import merge from 'deepmerge';
 import { env } from 'consul-ui/env';
 import walk, { dump } from 'consul-ui/utils/routing/walk';
 
 const doc = document;
 const appName = config.modulePrefix;
 
-export const routes = assign.all(
+export const routes = merge.all(
   [...doc.querySelectorAll(`script[data-routes]`)].map(($item) =>
     JSON.parse($item.dataset[`routes`])
   )
diff --git a/ui/packages/consul-ui/app/routes/application.js b/ui/packages/consul-ui/app/routes/application.js
index 40dce7153366f..e15642ef168ca 100644
--- a/ui/packages/consul-ui/app/routes/application.js
+++ b/ui/packages/consul-ui/app/routes/application.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from 'consul-ui/routing/route';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/packages/consul-ui/app/routes/dc.js b/ui/packages/consul-ui/app/routes/dc.js
index 6525d4551bc01..022f13dc37d24 100644
--- a/ui/packages/consul-ui/app/routes/dc.js
+++ b/ui/packages/consul-ui/app/routes/dc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import Route from 'consul-ui/routing/route';
 
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/auth-methods/index.js b/ui/packages/consul-ui/app/routes/dc/acls/auth-methods/index.js
index d05214477dcd8..56843ceb1009d 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/auth-methods/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/auth-methods/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from 'consul-ui/routing/route';
 
 export default class IndexRoute extends Route {
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/auth-methods/show/index.js b/ui/packages/consul-ui/app/routes/dc/acls/auth-methods/show/index.js
index 8b2449096df20..2157358a5c6f6 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/auth-methods/show/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/auth-methods/show/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from 'consul-ui/routing/route';
 import to from 'consul-ui/utils/routing/redirect-to';
 
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/policies/create.js b/ui/packages/consul-ui/app/routes/dc/acls/policies/create.js
index a4b56634e4b09..1407b61189755 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/policies/create.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/policies/create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from './edit';
 
 export default class CreateRoute extends Route {
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/policies/edit.js b/ui/packages/consul-ui/app/routes/dc/acls/policies/edit.js
index 23568af0c7cb9..223a11e61150c 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/policies/edit.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/policies/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import Route from 'consul-ui/routing/route';
 
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/policies/index.js b/ui/packages/consul-ui/app/routes/dc/acls/policies/index.js
index 0047876fd4d93..aa18f87a900ff 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/policies/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/policies/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/roles/create.js b/ui/packages/consul-ui/app/routes/dc/acls/roles/create.js
index fae9874e15385..2ea9b40f65a8b 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/roles/create.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/roles/create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from './edit';
 
 export default class CreateRoute extends Route {
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/roles/edit.js b/ui/packages/consul-ui/app/routes/dc/acls/roles/edit.js
index d9be734a2aa5a..f318f02be4cb9 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/roles/edit.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/roles/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import Route from 'consul-ui/routing/route';
 
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/roles/index.js b/ui/packages/consul-ui/app/routes/dc/acls/roles/index.js
index e2b76ba0892d6..8aeb03931c3f0 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/roles/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/roles/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/tokens/create.js b/ui/packages/consul-ui/app/routes/dc/acls/tokens/create.js
index 34c9e0eff78c8..bd6842c7c6cef 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/tokens/create.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/tokens/create.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from './edit';
 
 export default class CreateRoute extends Route {
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/tokens/edit.js b/ui/packages/consul-ui/app/routes/dc/acls/tokens/edit.js
index 45303da97b8f2..0aa247b391c5d 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/tokens/edit.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/tokens/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import Route from 'consul-ui/routing/route';
 
diff --git a/ui/packages/consul-ui/app/routes/dc/acls/tokens/index.js b/ui/packages/consul-ui/app/routes/dc/acls/tokens/index.js
index e2285d02584ad..e1422dd3283aa 100644
--- a/ui/packages/consul-ui/app/routes/dc/acls/tokens/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/acls/tokens/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
 
diff --git a/ui/packages/consul-ui/app/routes/dc/kv/folder.js b/ui/packages/consul-ui/app/routes/dc/kv/folder.js
index 319ca2480b890..bc38291c1ede2 100644
--- a/ui/packages/consul-ui/app/routes/dc/kv/folder.js
+++ b/ui/packages/consul-ui/app/routes/dc/kv/folder.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from './index';
 
 export default class FolderRoute extends Route {
diff --git a/ui/packages/consul-ui/app/routes/dc/kv/index.js b/ui/packages/consul-ui/app/routes/dc/kv/index.js
index 86b703e65c2e5..8c3999b21914a 100644
--- a/ui/packages/consul-ui/app/routes/dc/kv/index.js
+++ b/ui/packages/consul-ui/app/routes/dc/kv/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from 'consul-ui/routing/route';
 import { action } from '@ember/object';
 import isFolder from 'consul-ui/utils/isFolder';
diff --git a/ui/packages/consul-ui/app/routes/dc/services/notfound.js b/ui/packages/consul-ui/app/routes/dc/services/notfound.js
index 81794f99ddbcc..d58d8fa61d332 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/notfound.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/notfound.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from 'consul-ui/routing/route';
 
 export default class NotfoundRoute extends Route {
diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/topology.js b/ui/packages/consul-ui/app/routes/dc/services/show/topology.js
index 89b0603df0089..a90477a633f20 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/show/topology.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/show/topology.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from 'consul-ui/routing/route';
 import { inject as service } from '@ember/service';
 import { set, action } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/routing/application-debug.js b/ui/packages/consul-ui/app/routing/application-debug.js
index f37b9b8b68e39..fb4d86de7c048 100644
--- a/ui/packages/consul-ui/app/routing/application-debug.js
+++ b/ui/packages/consul-ui/app/routing/application-debug.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import ApplicationRoute from '../routes/application';
 
 let isDebugRoute = false;
diff --git a/ui/packages/consul-ui/app/routing/route.js b/ui/packages/consul-ui/app/routing/route.js
index 2e340bd7b20f6..25d3dcdd43bdb 100644
--- a/ui/packages/consul-ui/app/routing/route.js
+++ b/ui/packages/consul-ui/app/routing/route.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from '@ember/routing/route';
 import { get, setProperties, action } from '@ember/object';
 import { inject as service } from '@ember/service';
@@ -143,6 +138,6 @@ export default class BaseRoute extends Route {
     if (typeof obj !== 'undefined' && !Array.isArray(obj) && typeof obj !== 'string') {
       params = Object.values(obj);
     }
-    return this.router.transitionTo(routeName, ...params);
+    return super.transitionTo(routeName, ...params);
   }
 }
diff --git a/ui/packages/consul-ui/app/routing/single.js b/ui/packages/consul-ui/app/routing/single.js
index 2809de3414ad8..ce38ddeb4b0eb 100644
--- a/ui/packages/consul-ui/app/routing/single.js
+++ b/ui/packages/consul-ui/app/routing/single.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Route from 'consul-ui/routing/route';
 import { assert } from '@ember/debug';
 import { Promise, hash } from 'rsvp';
diff --git a/ui/packages/consul-ui/app/search/predicates/acl.js b/ui/packages/consul-ui/app/search/predicates/acl.js
index 54d0f07b962fe..97450a10babeb 100644
--- a/ui/packages/consul-ui/app/search/predicates/acl.js
+++ b/ui/packages/consul-ui/app/search/predicates/acl.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   ID: (item) => item.ID,
   Name: (item) => item.Name,
diff --git a/ui/packages/consul-ui/app/search/predicates/auth-method.js b/ui/packages/consul-ui/app/search/predicates/auth-method.js
index bd3e02a0123c5..514a421e7320c 100644
--- a/ui/packages/consul-ui/app/search/predicates/auth-method.js
+++ b/ui/packages/consul-ui/app/search/predicates/auth-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   Name: (item) => item.Name,
   DisplayName: (item) => item.DisplayName,
diff --git a/ui/packages/consul-ui/app/search/predicates/health-check.js b/ui/packages/consul-ui/app/search/predicates/health-check.js
index 46805d89fde11..f1146c37720ff 100644
--- a/ui/packages/consul-ui/app/search/predicates/health-check.js
+++ b/ui/packages/consul-ui/app/search/predicates/health-check.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 const asArray = function (arr) {
   return Array.isArray(arr) ? arr : arr.toArray();
 };
diff --git a/ui/packages/consul-ui/app/search/predicates/intention.js b/ui/packages/consul-ui/app/search/predicates/intention.js
index 486344383696e..dffd51438ce5b 100644
--- a/ui/packages/consul-ui/app/search/predicates/intention.js
+++ b/ui/packages/consul-ui/app/search/predicates/intention.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 const allLabel = 'All Services (*)';
 export default {
   SourceName: (item) =>
diff --git a/ui/packages/consul-ui/app/search/predicates/kv.js b/ui/packages/consul-ui/app/search/predicates/kv.js
index 4818ae4ba0714..ffdc035e1da8d 100644
--- a/ui/packages/consul-ui/app/search/predicates/kv.js
+++ b/ui/packages/consul-ui/app/search/predicates/kv.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import rightTrim from 'consul-ui/utils/right-trim';
 export default {
   Key: (item) =>
diff --git a/ui/packages/consul-ui/app/search/predicates/node.js b/ui/packages/consul-ui/app/search/predicates/node.js
index 2e76a75a4efa4..8db2ff828f417 100644
--- a/ui/packages/consul-ui/app/search/predicates/node.js
+++ b/ui/packages/consul-ui/app/search/predicates/node.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   Node: (item) => item.Node,
   Address: (item) => item.Address,
diff --git a/ui/packages/consul-ui/app/search/predicates/nspace.js b/ui/packages/consul-ui/app/search/predicates/nspace.js
index f72eddbe11939..cccbe018b4383 100644
--- a/ui/packages/consul-ui/app/search/predicates/nspace.js
+++ b/ui/packages/consul-ui/app/search/predicates/nspace.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   Name: (item) => item.Name,
   Description: (item) => item.Description,
diff --git a/ui/packages/consul-ui/app/search/predicates/peer.js b/ui/packages/consul-ui/app/search/predicates/peer.js
index 42aa0b593ad9f..745efbaeb6268 100644
--- a/ui/packages/consul-ui/app/search/predicates/peer.js
+++ b/ui/packages/consul-ui/app/search/predicates/peer.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   Name: (item) => item.Name,
   ID: (item) => item.ID,
diff --git a/ui/packages/consul-ui/app/search/predicates/policy.js b/ui/packages/consul-ui/app/search/predicates/policy.js
index 37a1d2ce45134..f4f9cd641444f 100644
--- a/ui/packages/consul-ui/app/search/predicates/policy.js
+++ b/ui/packages/consul-ui/app/search/predicates/policy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   Name: (item) => item.Name,
   Description: (item) => item.Description,
diff --git a/ui/packages/consul-ui/app/search/predicates/role.js b/ui/packages/consul-ui/app/search/predicates/role.js
index 2872827d325be..21fd3ec3d7673 100644
--- a/ui/packages/consul-ui/app/search/predicates/role.js
+++ b/ui/packages/consul-ui/app/search/predicates/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   Name: (item) => item.Name,
   Description: (item) => item.Description,
diff --git a/ui/packages/consul-ui/app/search/predicates/service-instance.js b/ui/packages/consul-ui/app/search/predicates/service-instance.js
index a92d029dcb31f..7dbc5bad8cff8 100644
--- a/ui/packages/consul-ui/app/search/predicates/service-instance.js
+++ b/ui/packages/consul-ui/app/search/predicates/service-instance.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   Name: (item) => item.Name,
   Node: (item) => item.Node.Node,
diff --git a/ui/packages/consul-ui/app/search/predicates/service.js b/ui/packages/consul-ui/app/search/predicates/service.js
index 15d7bc3f1d0db..d67e8a8d9aecd 100644
--- a/ui/packages/consul-ui/app/search/predicates/service.js
+++ b/ui/packages/consul-ui/app/search/predicates/service.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   Name: (item) => item.Name,
   Tags: (item) => item.Tags || [],
diff --git a/ui/packages/consul-ui/app/search/predicates/token.js b/ui/packages/consul-ui/app/search/predicates/token.js
index 5765bc0af3da2..027722906f809 100644
--- a/ui/packages/consul-ui/app/search/predicates/token.js
+++ b/ui/packages/consul-ui/app/search/predicates/token.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   Name: (item) => item.Name,
   Description: (item) => item.Description,
diff --git a/ui/packages/consul-ui/app/search/predicates/upstream-instance.js b/ui/packages/consul-ui/app/search/predicates/upstream-instance.js
index 43b6ceb484873..8af1dd5e2fd6f 100644
--- a/ui/packages/consul-ui/app/search/predicates/upstream-instance.js
+++ b/ui/packages/consul-ui/app/search/predicates/upstream-instance.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {
   DestinationName: (item, value) => item.DestinationName,
   LocalBindAddress: (item, value) => item.LocalBindAddress,
diff --git a/ui/packages/consul-ui/app/serializers/application.js b/ui/packages/consul-ui/app/serializers/application.js
index b7b1fa4847fe2..9bc5ef5062741 100644
--- a/ui/packages/consul-ui/app/serializers/application.js
+++ b/ui/packages/consul-ui/app/serializers/application.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './http';
 import { set } from '@ember/object';
 
@@ -156,10 +151,6 @@ export default class ApplicationSerializer extends Serializer {
     // ember-data methods so we have the opportunity to do this on a per-model
     // level
     const meta = this.normalizeMeta(store, modelClass, normalizedPayload, id, requestType);
-    // get distinct consul versions from list and add it as meta
-    if (modelClass.modelName === 'node' && requestType === 'query') {
-      meta.versions = this.getDistinctConsulVersions(normalizedPayload);
-    }
     if (requestType !== 'query') {
       normalizedPayload.meta = meta;
     }
@@ -219,45 +210,4 @@ export default class ApplicationSerializer extends Serializer {
   normalizePayload(payload, id, requestType) {
     return payload;
   }
-
-  // getDistinctConsulVersions will be called only for nodes and query request type
-  // the list of versions is to be added as meta to resp, without changing original response structure
-  // hence this function is added in application.js
-  getDistinctConsulVersions(payload) {
-    // create a Set and add version with only major.minor : ex-1.24.6 as 1.24
-    let versionSet = new Set();
-    payload.forEach(function (item) {
-      if (item.Meta && item.Meta['consul-version']) {
-        const split = item.Meta['consul-version'].split('.');
-        versionSet.add(split[0] + '.' + split[1]);
-      }
-    });
-
-    const versionArray = Array.from(versionSet);
-
-    // Sort the array in descending order using a custom comparison function
-    versionArray.sort((a, b) => {
-      // Split the versions into arrays of numbers
-      const versionA = a.split('.').map((part) => {
-        const number = Number(part);
-        return isNaN(number) ? 0 : number;
-      });
-      const versionB = b.split('.').map((part) => {
-        const number = Number(part);
-        return isNaN(number) ? 0 : number;
-      });
-
-      const minLength = Math.min(versionA.length, versionB.length);
-
-      // start with comparing major version num, if equal then compare minor
-      for (let i = 0; i < minLength; i++) {
-        if (versionA[i] !== versionB[i]) {
-          return versionB[i] - versionA[i];
-        }
-      }
-      return versionB.length - versionA.length;
-    });
-
-    return versionArray; //sorted array
-  }
 }
diff --git a/ui/packages/consul-ui/app/serializers/auth-method.js b/ui/packages/consul-ui/app/serializers/auth-method.js
index 6fc0ec6b67914..435382c684875 100644
--- a/ui/packages/consul-ui/app/serializers/auth-method.js
+++ b/ui/packages/consul-ui/app/serializers/auth-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/auth-method';
 
diff --git a/ui/packages/consul-ui/app/serializers/binding-rule.js b/ui/packages/consul-ui/app/serializers/binding-rule.js
index 961c958b8c4bb..fce8507153056 100644
--- a/ui/packages/consul-ui/app/serializers/binding-rule.js
+++ b/ui/packages/consul-ui/app/serializers/binding-rule.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/binding-rule';
 
diff --git a/ui/packages/consul-ui/app/serializers/coordinate.js b/ui/packages/consul-ui/app/serializers/coordinate.js
index 60065fc298a51..2882ec2655bd8 100644
--- a/ui/packages/consul-ui/app/serializers/coordinate.js
+++ b/ui/packages/consul-ui/app/serializers/coordinate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/coordinate';
 
diff --git a/ui/packages/consul-ui/app/serializers/discovery-chain.js b/ui/packages/consul-ui/app/serializers/discovery-chain.js
index 26b5d6c80c487..f3a9783ec37d2 100644
--- a/ui/packages/consul-ui/app/serializers/discovery-chain.js
+++ b/ui/packages/consul-ui/app/serializers/discovery-chain.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/discovery-chain';
 
diff --git a/ui/packages/consul-ui/app/serializers/http.js b/ui/packages/consul-ui/app/serializers/http.js
index 103e30378f02c..831aeb1ce5f65 100644
--- a/ui/packages/consul-ui/app/serializers/http.js
+++ b/ui/packages/consul-ui/app/serializers/http.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from '@ember-data/serializer/rest';
 
 export default class HttpSerializer extends Serializer {
diff --git a/ui/packages/consul-ui/app/serializers/intention.js b/ui/packages/consul-ui/app/serializers/intention.js
index b1c15d9666451..5102ec341e71d 100644
--- a/ui/packages/consul-ui/app/serializers/intention.js
+++ b/ui/packages/consul-ui/app/serializers/intention.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { inject as service } from '@ember/service';
 import { get } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/serializers/kv.js b/ui/packages/consul-ui/app/serializers/kv.js
index c610728d45fa2..b3c711b8d3400 100644
--- a/ui/packages/consul-ui/app/serializers/kv.js
+++ b/ui/packages/consul-ui/app/serializers/kv.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { inject as service } from '@ember/service';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/kv';
diff --git a/ui/packages/consul-ui/app/serializers/node.js b/ui/packages/consul-ui/app/serializers/node.js
index 0236a2b0059b9..1394458848197 100644
--- a/ui/packages/consul-ui/app/serializers/node.js
+++ b/ui/packages/consul-ui/app/serializers/node.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/node';
diff --git a/ui/packages/consul-ui/app/serializers/nspace.js b/ui/packages/consul-ui/app/serializers/nspace.js
index b066305688d35..f30fd469d3ab2 100644
--- a/ui/packages/consul-ui/app/serializers/nspace.js
+++ b/ui/packages/consul-ui/app/serializers/nspace.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { get } from '@ember/object';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/nspace';
diff --git a/ui/packages/consul-ui/app/serializers/oidc-provider.js b/ui/packages/consul-ui/app/serializers/oidc-provider.js
index 54f078f36767f..406c9ae4d6299 100644
--- a/ui/packages/consul-ui/app/serializers/oidc-provider.js
+++ b/ui/packages/consul-ui/app/serializers/oidc-provider.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/oidc-provider';
 
diff --git a/ui/packages/consul-ui/app/serializers/partition.js b/ui/packages/consul-ui/app/serializers/partition.js
index 866165332db56..32671a6718f87 100644
--- a/ui/packages/consul-ui/app/serializers/partition.js
+++ b/ui/packages/consul-ui/app/serializers/partition.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/partition';
 
diff --git a/ui/packages/consul-ui/app/serializers/permission.js b/ui/packages/consul-ui/app/serializers/permission.js
index e900e037c10e7..6fe9223821f2a 100644
--- a/ui/packages/consul-ui/app/serializers/permission.js
+++ b/ui/packages/consul-ui/app/serializers/permission.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 
 export default class PermissionSerializer extends Serializer {}
diff --git a/ui/packages/consul-ui/app/serializers/policy.js b/ui/packages/consul-ui/app/serializers/policy.js
index aa9c26ae4f07b..a2e8fb941a975 100644
--- a/ui/packages/consul-ui/app/serializers/policy.js
+++ b/ui/packages/consul-ui/app/serializers/policy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/policy';
 
diff --git a/ui/packages/consul-ui/app/serializers/proxy.js b/ui/packages/consul-ui/app/serializers/proxy.js
index d5b033e2e411e..6ac6c1786edb9 100644
--- a/ui/packages/consul-ui/app/serializers/proxy.js
+++ b/ui/packages/consul-ui/app/serializers/proxy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/proxy';
 
diff --git a/ui/packages/consul-ui/app/serializers/role.js b/ui/packages/consul-ui/app/serializers/role.js
index a717030bd2d18..7f734c8a5101f 100644
--- a/ui/packages/consul-ui/app/serializers/role.js
+++ b/ui/packages/consul-ui/app/serializers/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/role';
 import WithPolicies from 'consul-ui/mixins/policy/as-many';
diff --git a/ui/packages/consul-ui/app/serializers/service-instance.js b/ui/packages/consul-ui/app/serializers/service-instance.js
index 6d4e4911df91d..f0835064ad46d 100644
--- a/ui/packages/consul-ui/app/serializers/service-instance.js
+++ b/ui/packages/consul-ui/app/serializers/service-instance.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/service-instance';
 
diff --git a/ui/packages/consul-ui/app/serializers/service.js b/ui/packages/consul-ui/app/serializers/service.js
index 06befdbbbaaa3..f8871fb1897bf 100644
--- a/ui/packages/consul-ui/app/serializers/service.js
+++ b/ui/packages/consul-ui/app/serializers/service.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/service';
 import { get } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/serializers/session.js b/ui/packages/consul-ui/app/serializers/session.js
index 0a21aa65de323..65a8d1995cb15 100644
--- a/ui/packages/consul-ui/app/serializers/session.js
+++ b/ui/packages/consul-ui/app/serializers/session.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/session';
 
diff --git a/ui/packages/consul-ui/app/serializers/token.js b/ui/packages/consul-ui/app/serializers/token.js
index af70b3d5033a9..ee57cf00bb100 100644
--- a/ui/packages/consul-ui/app/serializers/token.js
+++ b/ui/packages/consul-ui/app/serializers/token.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { get } from '@ember/object';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/token';
diff --git a/ui/packages/consul-ui/app/serializers/topology.js b/ui/packages/consul-ui/app/serializers/topology.js
index 6e049264ae060..cb7274fa7f708 100644
--- a/ui/packages/consul-ui/app/serializers/topology.js
+++ b/ui/packages/consul-ui/app/serializers/topology.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/topology';
 import { inject as service } from '@ember/service';
diff --git a/ui/packages/consul-ui/app/services/abilities.js b/ui/packages/consul-ui/app/services/abilities.js
index 75c22ce6d79c4..2ee725412ab17 100644
--- a/ui/packages/consul-ui/app/services/abilities.js
+++ b/ui/packages/consul-ui/app/services/abilities.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from 'ember-can/services/can';
 
 export default class AbilitiesService extends Service {
diff --git a/ui/packages/consul-ui/app/services/atob.js b/ui/packages/consul-ui/app/services/atob.js
index df96d5c566aac..7126504369742 100644
--- a/ui/packages/consul-ui/app/services/atob.js
+++ b/ui/packages/consul-ui/app/services/atob.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 import atob from 'consul-ui/utils/atob';
 export default class AtobService extends Service {
diff --git a/ui/packages/consul-ui/app/services/auth-providers/oauth2-code-with-url-provider.js b/ui/packages/consul-ui/app/services/auth-providers/oauth2-code-with-url-provider.js
index b0266ece06930..fca77fe4b2467 100644
--- a/ui/packages/consul-ui/app/services/auth-providers/oauth2-code-with-url-provider.js
+++ b/ui/packages/consul-ui/app/services/auth-providers/oauth2-code-with-url-provider.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import OAuth2CodeProvider from 'torii/providers/oauth2-code';
 import { runInDebug } from '@ember/debug';
 
@@ -14,22 +9,24 @@ export default class OAuth2CodeWithURLProvider extends OAuth2CodeProvider {
   }
 
   open(options) {
-    const name = this.name,
+    const name = this.get('name'),
       url = this.buildUrl(),
       responseParams = ['state', 'code'],
       responseType = 'code';
-    return this.popup.open(url, responseParams, options).then(function (authData) {
-      // the same as the parent class but with an authorizationState added
-      const creds = {
-        authorizationState: authData.state,
-        authorizationCode: decodeURIComponent(authData[responseType]),
-        provider: name,
-      };
-      runInDebug((_) =>
-        console.info('Retrieved the following creds from the OAuth Provider', creds)
-      );
-      return creds;
-    });
+    return this.get('popup')
+      .open(url, responseParams, options)
+      .then(function (authData) {
+        // the same as the parent class but with an authorizationState added
+        const creds = {
+          authorizationState: authData.state,
+          authorizationCode: decodeURIComponent(authData[responseType]),
+          provider: name,
+        };
+        runInDebug((_) =>
+          console.info('Retrieved the following creds from the OAuth Provider', creds)
+        );
+        return creds;
+      });
   }
 
   close() {
diff --git a/ui/packages/consul-ui/app/services/btoa.js b/ui/packages/consul-ui/app/services/btoa.js
index edd31abeedb4b..32d5a1eeddd12 100644
--- a/ui/packages/consul-ui/app/services/btoa.js
+++ b/ui/packages/consul-ui/app/services/btoa.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 import btoa from 'consul-ui/utils/btoa';
 export default class BtoaService extends Service {
diff --git a/ui/packages/consul-ui/app/services/change.js b/ui/packages/consul-ui/app/services/change.js
index 9115909c82472..a4b22f095d096 100644
--- a/ui/packages/consul-ui/app/services/change.js
+++ b/ui/packages/consul-ui/app/services/change.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 
 import lookupValidator from 'ember-changeset-validations';
diff --git a/ui/packages/consul-ui/app/services/client/connections.js b/ui/packages/consul-ui/app/services/client/connections.js
index 36ff2ac7e4fd8..2b4b3e546b75d 100644
--- a/ui/packages/consul-ui/app/services/client/connections.js
+++ b/ui/packages/consul-ui/app/services/client/connections.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 
 export default class ConnectionsService extends Service {
diff --git a/ui/packages/consul-ui/app/services/client/http.js b/ui/packages/consul-ui/app/services/client/http.js
index 3fe145ef58ef6..49c095bb36992 100644
--- a/ui/packages/consul-ui/app/services/client/http.js
+++ b/ui/packages/consul-ui/app/services/client/http.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import { get } from '@ember/object';
 import { next } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/app/services/client/transports/xhr.js b/ui/packages/consul-ui/app/services/client/transports/xhr.js
index c64bb5c6a4d28..3c09e955f99db 100644
--- a/ui/packages/consul-ui/app/services/client/transports/xhr.js
+++ b/ui/packages/consul-ui/app/services/client/transports/xhr.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 
 import createHeaders from 'consul-ui/utils/http/create-headers';
diff --git a/ui/packages/consul-ui/app/services/clipboard/local-storage.js b/ui/packages/consul-ui/app/services/clipboard/local-storage.js
index 23515938be0ce..7e431c19bd078 100644
--- a/ui/packages/consul-ui/app/services/clipboard/local-storage.js
+++ b/ui/packages/consul-ui/app/services/clipboard/local-storage.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import Clipboard from 'clipboard';
 
diff --git a/ui/packages/consul-ui/app/services/clipboard/os.js b/ui/packages/consul-ui/app/services/clipboard/os.js
index 5a1790724b792..99dc5cd41c6a5 100644
--- a/ui/packages/consul-ui/app/services/clipboard/os.js
+++ b/ui/packages/consul-ui/app/services/clipboard/os.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 
 import Clipboard from 'clipboard';
diff --git a/ui/packages/consul-ui/app/services/code-mirror/linter.js b/ui/packages/consul-ui/app/services/code-mirror/linter.js
index 66b4a3dc4d363..1e8a4f6b908b4 100644
--- a/ui/packages/consul-ui/app/services/code-mirror/linter.js
+++ b/ui/packages/consul-ui/app/services/code-mirror/linter.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import lint from 'consul-ui/utils/editor/lint';
 const MODES = [
diff --git a/ui/packages/consul-ui/app/services/container.js b/ui/packages/consul-ui/app/services/container.js
index ca5152cfc8537..bdd4d6fd2c417 100644
--- a/ui/packages/consul-ui/app/services/container.js
+++ b/ui/packages/consul-ui/app/services/container.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 
 export default class ContainerService extends Service {
diff --git a/ui/packages/consul-ui/app/services/data-sink/protocols/http.js b/ui/packages/consul-ui/app/services/data-sink/protocols/http.js
index c89a655780f00..ed32a17626c3e 100644
--- a/ui/packages/consul-ui/app/services/data-sink/protocols/http.js
+++ b/ui/packages/consul-ui/app/services/data-sink/protocols/http.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import { setProperties } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/services/data-sink/protocols/local-storage.js b/ui/packages/consul-ui/app/services/data-sink/protocols/local-storage.js
index f2d727f8cb3fc..5f26157c1fd48 100644
--- a/ui/packages/consul-ui/app/services/data-sink/protocols/local-storage.js
+++ b/ui/packages/consul-ui/app/services/data-sink/protocols/local-storage.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import { setProperties } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/services/data-sink/service.js b/ui/packages/consul-ui/app/services/data-sink/service.js
index 928ccc9c56d62..007a55a104277 100644
--- a/ui/packages/consul-ui/app/services/data-sink/service.js
+++ b/ui/packages/consul-ui/app/services/data-sink/service.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 
 const parts = function (uri) {
diff --git a/ui/packages/consul-ui/app/services/data-source/protocols/http.js b/ui/packages/consul-ui/app/services/data-source/protocols/http.js
index 91b09d9428ecb..9d01ce297569f 100644
--- a/ui/packages/consul-ui/app/services/data-source/protocols/http.js
+++ b/ui/packages/consul-ui/app/services/data-source/protocols/http.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import { getOwner } from '@ember/application';
 import { match } from 'consul-ui/decorators/data-source';
diff --git a/ui/packages/consul-ui/app/services/data-source/protocols/http/blocking.js b/ui/packages/consul-ui/app/services/data-source/protocols/http/blocking.js
index 9f733af3c7ca5..f329d770dbb10 100644
--- a/ui/packages/consul-ui/app/services/data-source/protocols/http/blocking.js
+++ b/ui/packages/consul-ui/app/services/data-source/protocols/http/blocking.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import { get } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/services/data-source/protocols/http/promise.js b/ui/packages/consul-ui/app/services/data-source/protocols/http/promise.js
index e48ab5d32cc70..53a21b7daab9a 100644
--- a/ui/packages/consul-ui/app/services/data-source/protocols/http/promise.js
+++ b/ui/packages/consul-ui/app/services/data-source/protocols/http/promise.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 import { once } from 'consul-ui/utils/dom/event-source';
 
diff --git a/ui/packages/consul-ui/app/services/data-source/protocols/local-storage.js b/ui/packages/consul-ui/app/services/data-source/protocols/local-storage.js
index aa95b3f906c89..0c2b0a62f4c9f 100644
--- a/ui/packages/consul-ui/app/services/data-source/protocols/local-storage.js
+++ b/ui/packages/consul-ui/app/services/data-source/protocols/local-storage.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import { StorageEventSource } from 'consul-ui/utils/dom/event-source';
 
diff --git a/ui/packages/consul-ui/app/services/data-source/service.js b/ui/packages/consul-ui/app/services/data-source/service.js
index af737bb0eedc8..c07ae97495c26 100644
--- a/ui/packages/consul-ui/app/services/data-source/service.js
+++ b/ui/packages/consul-ui/app/services/data-source/service.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import { runInDebug } from '@ember/debug';
 import { proxy } from 'consul-ui/utils/dom/event-source';
diff --git a/ui/packages/consul-ui/app/services/data-structs.js b/ui/packages/consul-ui/app/services/data-structs.js
index 5ae21c28b84cf..663c30fea8035 100644
--- a/ui/packages/consul-ui/app/services/data-structs.js
+++ b/ui/packages/consul-ui/app/services/data-structs.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 
 import createGraph from 'ngraph.graph';
diff --git a/ui/packages/consul-ui/app/services/dom.js b/ui/packages/consul-ui/app/services/dom.js
index 6d69898f577cb..26d5a66137959 100644
--- a/ui/packages/consul-ui/app/services/dom.js
+++ b/ui/packages/consul-ui/app/services/dom.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import { guidFor } from '@ember/object/internals';
 
diff --git a/ui/packages/consul-ui/app/services/encoder.js b/ui/packages/consul-ui/app/services/encoder.js
index 4f26dac33907e..95ec5904235b4 100644
--- a/ui/packages/consul-ui/app/services/encoder.js
+++ b/ui/packages/consul-ui/app/services/encoder.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 import { get } from '@ember/object';
 import { runInDebug } from '@ember/debug';
diff --git a/ui/packages/consul-ui/app/services/env.js b/ui/packages/consul-ui/app/services/env.js
index 450206b15fed4..97b54c94cd530 100644
--- a/ui/packages/consul-ui/app/services/env.js
+++ b/ui/packages/consul-ui/app/services/env.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 import { env } from 'consul-ui/env';
 
diff --git a/ui/packages/consul-ui/app/services/feedback.js b/ui/packages/consul-ui/app/services/feedback.js
index e2781e1ea3ca8..06e9cdcf9e72b 100644
--- a/ui/packages/consul-ui/app/services/feedback.js
+++ b/ui/packages/consul-ui/app/services/feedback.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import callableType from 'consul-ui/utils/callable-type';
 
diff --git a/ui/packages/consul-ui/app/services/filter.js b/ui/packages/consul-ui/app/services/filter.js
index 13ec90085f97f..bf78151a7edb7 100644
--- a/ui/packages/consul-ui/app/services/filter.js
+++ b/ui/packages/consul-ui/app/services/filter.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 import { andOr } from 'consul-ui/utils/filter';
 
diff --git a/ui/packages/consul-ui/app/services/form.js b/ui/packages/consul-ui/app/services/form.js
index b8a649b5aa9a5..86de153c98f10 100644
--- a/ui/packages/consul-ui/app/services/form.js
+++ b/ui/packages/consul-ui/app/services/form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import builderFactory from 'consul-ui/utils/form/builder';
 
diff --git a/ui/packages/consul-ui/app/services/hcp.js b/ui/packages/consul-ui/app/services/hcp.js
index 33a6650f15eff..f0168254d5162 100644
--- a/ui/packages/consul-ui/app/services/hcp.js
+++ b/ui/packages/consul-ui/app/services/hcp.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import { runInDebug } from '@ember/debug';
 
diff --git a/ui/packages/consul-ui/app/services/i18n-debug.js b/ui/packages/consul-ui/app/services/i18n-debug.js
index 5521bdd2bb9dc..8b9dbe921af00 100644
--- a/ui/packages/consul-ui/app/services/i18n-debug.js
+++ b/ui/packages/consul-ui/app/services/i18n-debug.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import I18nService, { formatOptionsSymbol } from 'consul-ui/services/i18n';
 import ucfirst from 'consul-ui/utils/ucfirst';
 
diff --git a/ui/packages/consul-ui/app/services/local-storage.js b/ui/packages/consul-ui/app/services/local-storage.js
index 384efa701522a..b882855702f5f 100644
--- a/ui/packages/consul-ui/app/services/local-storage.js
+++ b/ui/packages/consul-ui/app/services/local-storage.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 import { getOwner } from '@ember/application';
 import ENV from 'consul-ui/config/environment';
diff --git a/ui/packages/consul-ui/app/services/logger.js b/ui/packages/consul-ui/app/services/logger.js
index 990059ec449ab..8b4a73c24632e 100644
--- a/ui/packages/consul-ui/app/services/logger.js
+++ b/ui/packages/consul-ui/app/services/logger.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 import { runInDebug } from '@ember/debug';
 
diff --git a/ui/packages/consul-ui/app/services/repository.js b/ui/packages/consul-ui/app/services/repository.js
index 52180ce56a11c..44d33ed5c29a2 100644
--- a/ui/packages/consul-ui/app/services/repository.js
+++ b/ui/packages/consul-ui/app/services/repository.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import { assert } from '@ember/debug';
 import { typeOf } from '@ember/utils';
diff --git a/ui/packages/consul-ui/app/services/repository/auth-method.js b/ui/packages/consul-ui/app/services/repository/auth-method.js
index cd5154d8428e9..fb48755510960 100644
--- a/ui/packages/consul-ui/app/services/repository/auth-method.js
+++ b/ui/packages/consul-ui/app/services/repository/auth-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/auth-method';
 import dataSource from 'consul-ui/decorators/data-source';
diff --git a/ui/packages/consul-ui/app/services/repository/binding-rule.js b/ui/packages/consul-ui/app/services/repository/binding-rule.js
index a0baaabbc4f91..ba130538580a8 100644
--- a/ui/packages/consul-ui/app/services/repository/binding-rule.js
+++ b/ui/packages/consul-ui/app/services/repository/binding-rule.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/binding-rule';
 import dataSource from 'consul-ui/decorators/data-source';
diff --git a/ui/packages/consul-ui/app/services/repository/coordinate.js b/ui/packages/consul-ui/app/services/repository/coordinate.js
index 5d6eaceab82f1..a5b9e8598b7b6 100644
--- a/ui/packages/consul-ui/app/services/repository/coordinate.js
+++ b/ui/packages/consul-ui/app/services/repository/coordinate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 
 import dataSource from 'consul-ui/decorators/data-source';
diff --git a/ui/packages/consul-ui/app/services/repository/dc.js b/ui/packages/consul-ui/app/services/repository/dc.js
index a757af0411282..fa896c6279332 100644
--- a/ui/packages/consul-ui/app/services/repository/dc.js
+++ b/ui/packages/consul-ui/app/services/repository/dc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Error from '@ember/error';
 import { inject as service } from '@ember/service';
 import RepositoryService from 'consul-ui/services/repository';
diff --git a/ui/packages/consul-ui/app/services/repository/discovery-chain.js b/ui/packages/consul-ui/app/services/repository/discovery-chain.js
index d4d1036d35197..dd8e6267b9725 100644
--- a/ui/packages/consul-ui/app/services/repository/discovery-chain.js
+++ b/ui/packages/consul-ui/app/services/repository/discovery-chain.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import { get, set } from '@ember/object';
 import RepositoryService from 'consul-ui/services/repository';
diff --git a/ui/packages/consul-ui/app/services/repository/intention-permission-http-header.js b/ui/packages/consul-ui/app/services/repository/intention-permission-http-header.js
index 4a66d0235fc84..d3a8aecc74352 100644
--- a/ui/packages/consul-ui/app/services/repository/intention-permission-http-header.js
+++ b/ui/packages/consul-ui/app/services/repository/intention-permission-http-header.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 
 const modelName = 'intention-permission-http-header';
diff --git a/ui/packages/consul-ui/app/services/repository/intention-permission.js b/ui/packages/consul-ui/app/services/repository/intention-permission.js
index b707af220b4b3..aa4cbdda551ea 100644
--- a/ui/packages/consul-ui/app/services/repository/intention-permission.js
+++ b/ui/packages/consul-ui/app/services/repository/intention-permission.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 const modelName = 'intention-permission';
 export default class IntentionPermissionService extends RepositoryService {
diff --git a/ui/packages/consul-ui/app/services/repository/intention.js b/ui/packages/consul-ui/app/services/repository/intention.js
index affeb21a0d538..012c4c448c0a5 100644
--- a/ui/packages/consul-ui/app/services/repository/intention.js
+++ b/ui/packages/consul-ui/app/services/repository/intention.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { set, get } from '@ember/object';
 import { inject as service } from '@ember/service';
 import RepositoryService from 'consul-ui/services/repository';
diff --git a/ui/packages/consul-ui/app/services/repository/kv.js b/ui/packages/consul-ui/app/services/repository/kv.js
index c618cff5f2ca6..68bb6ec52a859 100644
--- a/ui/packages/consul-ui/app/services/repository/kv.js
+++ b/ui/packages/consul-ui/app/services/repository/kv.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 import isFolder from 'consul-ui/utils/isFolder';
 import { get } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/services/repository/license.js b/ui/packages/consul-ui/app/services/repository/license.js
index 6f711fb906048..d53f008884995 100644
--- a/ui/packages/consul-ui/app/services/repository/license.js
+++ b/ui/packages/consul-ui/app/services/repository/license.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 import dataSource from 'consul-ui/decorators/data-source';
 
diff --git a/ui/packages/consul-ui/app/services/repository/metrics.js b/ui/packages/consul-ui/app/services/repository/metrics.js
index e3c9d835e5489..1252098211b3e 100644
--- a/ui/packages/consul-ui/app/services/repository/metrics.js
+++ b/ui/packages/consul-ui/app/services/repository/metrics.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import RepositoryService from 'consul-ui/services/repository';
 import dataSource from 'consul-ui/decorators/data-source';
diff --git a/ui/packages/consul-ui/app/services/repository/node.js b/ui/packages/consul-ui/app/services/repository/node.js
index 7b389842888d0..9b2cb0d7b3ea0 100644
--- a/ui/packages/consul-ui/app/services/repository/node.js
+++ b/ui/packages/consul-ui/app/services/repository/node.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 import dataSource from 'consul-ui/decorators/data-source';
 
diff --git a/ui/packages/consul-ui/app/services/repository/nspace.js b/ui/packages/consul-ui/app/services/repository/nspace.js
index e7130be09c9db..4bb266ba3de3d 100644
--- a/ui/packages/consul-ui/app/services/repository/nspace.js
+++ b/ui/packages/consul-ui/app/services/repository/nspace.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import { runInDebug } from '@ember/debug';
 import RepositoryService, { softDelete } from 'consul-ui/services/repository';
diff --git a/ui/packages/consul-ui/app/services/repository/oidc-provider.js b/ui/packages/consul-ui/app/services/repository/oidc-provider.js
index 3d18c8d838506..c44960564e333 100644
--- a/ui/packages/consul-ui/app/services/repository/oidc-provider.js
+++ b/ui/packages/consul-ui/app/services/repository/oidc-provider.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import RepositoryService from 'consul-ui/services/repository';
 import { getOwner } from '@ember/application';
diff --git a/ui/packages/consul-ui/app/services/repository/partition.js b/ui/packages/consul-ui/app/services/repository/partition.js
index 75098cb5d0048..53fb6d66507e8 100644
--- a/ui/packages/consul-ui/app/services/repository/partition.js
+++ b/ui/packages/consul-ui/app/services/repository/partition.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import { runInDebug } from '@ember/debug';
 import RepositoryService, { softDelete } from 'consul-ui/services/repository';
diff --git a/ui/packages/consul-ui/app/services/repository/peer.js b/ui/packages/consul-ui/app/services/repository/peer.js
index 23ecbaee925db..63f65e38ad051 100644
--- a/ui/packages/consul-ui/app/services/repository/peer.js
+++ b/ui/packages/consul-ui/app/services/repository/peer.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 import dataSource from 'consul-ui/decorators/data-source';
 import { inject as service } from '@ember/service';
diff --git a/ui/packages/consul-ui/app/services/repository/permission.js b/ui/packages/consul-ui/app/services/repository/permission.js
index 3f9b259846117..8a99ad0c341c5 100644
--- a/ui/packages/consul-ui/app/services/repository/permission.js
+++ b/ui/packages/consul-ui/app/services/repository/permission.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/packages/consul-ui/app/services/repository/policy.js b/ui/packages/consul-ui/app/services/repository/policy.js
index db499fbde514a..a14b8a71f0dda 100644
--- a/ui/packages/consul-ui/app/services/repository/policy.js
+++ b/ui/packages/consul-ui/app/services/repository/policy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 import { get } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/packages/consul-ui/app/services/repository/proxy.js b/ui/packages/consul-ui/app/services/repository/proxy.js
index f70bae5b2eb50..3c91e1a375962 100644
--- a/ui/packages/consul-ui/app/services/repository/proxy.js
+++ b/ui/packages/consul-ui/app/services/repository/proxy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 import { PRIMARY_KEY } from 'consul-ui/models/proxy';
 import { get, set } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/services/repository/role.js b/ui/packages/consul-ui/app/services/repository/role.js
index 1750f886ce47f..792ca80dbe2bd 100644
--- a/ui/packages/consul-ui/app/services/repository/role.js
+++ b/ui/packages/consul-ui/app/services/repository/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 import { inject as service } from '@ember/service';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/role';
diff --git a/ui/packages/consul-ui/app/services/repository/service-instance.js b/ui/packages/consul-ui/app/services/repository/service-instance.js
index 4d256cd66ac11..8680e62a758e2 100644
--- a/ui/packages/consul-ui/app/services/repository/service-instance.js
+++ b/ui/packages/consul-ui/app/services/repository/service-instance.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 import { set } from '@ember/object';
 import { ACCESS_READ } from 'consul-ui/abilities/base';
diff --git a/ui/packages/consul-ui/app/services/repository/service.js b/ui/packages/consul-ui/app/services/repository/service.js
index 34388a4d4eb91..72199833294aa 100644
--- a/ui/packages/consul-ui/app/services/repository/service.js
+++ b/ui/packages/consul-ui/app/services/repository/service.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 import dataSource from 'consul-ui/decorators/data-source';
 import { inject as service } from '@ember/service';
diff --git a/ui/packages/consul-ui/app/services/repository/session.js b/ui/packages/consul-ui/app/services/repository/session.js
index 08b5f15ce02a4..778e8c3520f61 100644
--- a/ui/packages/consul-ui/app/services/repository/session.js
+++ b/ui/packages/consul-ui/app/services/repository/session.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import RepositoryService from 'consul-ui/services/repository';
 import dataSource from 'consul-ui/decorators/data-source';
diff --git a/ui/packages/consul-ui/app/services/repository/token.js b/ui/packages/consul-ui/app/services/repository/token.js
index dc4f83f827012..eb6d670f4570c 100644
--- a/ui/packages/consul-ui/app/services/repository/token.js
+++ b/ui/packages/consul-ui/app/services/repository/token.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 import { get } from '@ember/object';
 import { inject as service } from '@ember/service';
diff --git a/ui/packages/consul-ui/app/services/repository/topology.js b/ui/packages/consul-ui/app/services/repository/topology.js
index b7835f95942ed..17dfd704f25cb 100644
--- a/ui/packages/consul-ui/app/services/repository/topology.js
+++ b/ui/packages/consul-ui/app/services/repository/topology.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import RepositoryService from 'consul-ui/services/repository';
 import { get, set } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/services/routlet.js b/ui/packages/consul-ui/app/services/routlet.js
index 5c37bc30a1e70..adec9bed8384b 100644
--- a/ui/packages/consul-ui/app/services/routlet.js
+++ b/ui/packages/consul-ui/app/services/routlet.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import { schedule } from '@ember/runloop';
 import { get } from '@ember/object';
diff --git a/ui/packages/consul-ui/app/services/schema.js b/ui/packages/consul-ui/app/services/schema.js
index d8b73133ea151..7874ce824a9b3 100644
--- a/ui/packages/consul-ui/app/services/schema.js
+++ b/ui/packages/consul-ui/app/services/schema.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 import { schema as intentionPermissionSchema } from 'consul-ui/models/intention-permission';
 import { schema as intentionPermissionHttpSchema } from 'consul-ui/models/intention-permission-http';
diff --git a/ui/packages/consul-ui/app/services/search.js b/ui/packages/consul-ui/app/services/search.js
index ccb39447b8f02..522a9a7863899 100644
--- a/ui/packages/consul-ui/app/services/search.js
+++ b/ui/packages/consul-ui/app/services/search.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 
 import ExactSearch from 'consul-ui/utils/search/exact';
diff --git a/ui/packages/consul-ui/app/services/settings.js b/ui/packages/consul-ui/app/services/settings.js
index 22146df593b76..c4b7c0b193ba2 100644
--- a/ui/packages/consul-ui/app/services/settings.js
+++ b/ui/packages/consul-ui/app/services/settings.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 import getStorage from 'consul-ui/utils/storage/local-storage';
 const SCHEME = 'consul';
diff --git a/ui/packages/consul-ui/app/services/sort.js b/ui/packages/consul-ui/app/services/sort.js
index fe03b457c6a8b..96c6884b33db7 100644
--- a/ui/packages/consul-ui/app/services/sort.js
+++ b/ui/packages/consul-ui/app/services/sort.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 import service from 'consul-ui/sort/comparators/service';
 import serviceInstance from 'consul-ui/sort/comparators/service-instance';
diff --git a/ui/packages/consul-ui/app/services/state-with-charts.js b/ui/packages/consul-ui/app/services/state-with-charts.js
index e58d84f385bee..f19a40d2d0e88 100644
--- a/ui/packages/consul-ui/app/services/state-with-charts.js
+++ b/ui/packages/consul-ui/app/services/state-with-charts.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import StateService from 'consul-ui/services/state';
 
 import validate from 'consul-ui/machines/validate.xstate';
diff --git a/ui/packages/consul-ui/app/services/state.js b/ui/packages/consul-ui/app/services/state.js
index 5b4ddc627985f..98b9f69dd5608 100644
--- a/ui/packages/consul-ui/app/services/state.js
+++ b/ui/packages/consul-ui/app/services/state.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import { set } from '@ember/object';
 import flat from 'flat';
diff --git a/ui/packages/consul-ui/app/services/store.js b/ui/packages/consul-ui/app/services/store.js
index 326c392177bc8..2bf971f6eb778 100644
--- a/ui/packages/consul-ui/app/services/store.js
+++ b/ui/packages/consul-ui/app/services/store.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { inject as service } from '@ember/service';
 import Store from '@ember-data/store';
 
diff --git a/ui/packages/consul-ui/app/services/temporal.js b/ui/packages/consul-ui/app/services/temporal.js
index 661ff547d0afc..23ee5b1038d57 100644
--- a/ui/packages/consul-ui/app/services/temporal.js
+++ b/ui/packages/consul-ui/app/services/temporal.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import format from 'pretty-ms';
 import parse from 'parse-duration';
 import { assert } from '@ember/debug';
diff --git a/ui/packages/consul-ui/app/services/ticker.js b/ui/packages/consul-ui/app/services/ticker.js
index 6a0ad1de089e1..81b406779b951 100644
--- a/ui/packages/consul-ui/app/services/ticker.js
+++ b/ui/packages/consul-ui/app/services/ticker.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 import { Tween } from 'consul-ui/utils/ticker';
 
diff --git a/ui/packages/consul-ui/app/services/timeout.js b/ui/packages/consul-ui/app/services/timeout.js
index 60eaa3e2d409a..f54ff9189562e 100644
--- a/ui/packages/consul-ui/app/services/timeout.js
+++ b/ui/packages/consul-ui/app/services/timeout.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service from '@ember/service';
 import promisedTimeoutFactory from 'consul-ui/utils/promisedTimeout';
 import { next } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/app/services/ui-config.js b/ui/packages/consul-ui/app/services/ui-config.js
index f5ec6aaf6a116..cb039bc589e9f 100644
--- a/ui/packages/consul-ui/app/services/ui-config.js
+++ b/ui/packages/consul-ui/app/services/ui-config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Service, { inject as service } from '@ember/service';
 import { get } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/sort/comparators/auth-method.js b/ui/packages/consul-ui/app/sort/comparators/auth-method.js
index 6a3889573a587..957a876796f27 100644
--- a/ui/packages/consul-ui/app/sort/comparators/auth-method.js
+++ b/ui/packages/consul-ui/app/sort/comparators/auth-method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default ({ properties }) =>
   (key = 'MethodName:asc') => {
     return properties(['MethodName', 'TokenTTL'])(key);
diff --git a/ui/packages/consul-ui/app/sort/comparators/health-check.js b/ui/packages/consul-ui/app/sort/comparators/health-check.js
index f921b52740b60..5f5345c3b1197 100644
--- a/ui/packages/consul-ui/app/sort/comparators/health-check.js
+++ b/ui/packages/consul-ui/app/sort/comparators/health-check.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default ({ properties }) =>
   (key = 'Status:asc') => {
     if (key.startsWith('Status:')) {
diff --git a/ui/packages/consul-ui/app/sort/comparators/intention.js b/ui/packages/consul-ui/app/sort/comparators/intention.js
index d36f65275b92b..54329e940498f 100644
--- a/ui/packages/consul-ui/app/sort/comparators/intention.js
+++ b/ui/packages/consul-ui/app/sort/comparators/intention.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default () => (key) => {
   return [key];
 };
diff --git a/ui/packages/consul-ui/app/sort/comparators/kv.js b/ui/packages/consul-ui/app/sort/comparators/kv.js
index 3b479a60625fc..f7df782552300 100644
--- a/ui/packages/consul-ui/app/sort/comparators/kv.js
+++ b/ui/packages/consul-ui/app/sort/comparators/kv.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default ({ properties }) =>
   (key) => {
     return properties(['Key', 'Kind'])(key);
diff --git a/ui/packages/consul-ui/app/sort/comparators/node.js b/ui/packages/consul-ui/app/sort/comparators/node.js
index 291259068097c..1bac46e1c98ff 100644
--- a/ui/packages/consul-ui/app/sort/comparators/node.js
+++ b/ui/packages/consul-ui/app/sort/comparators/node.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default ({ properties }) =>
   (key = 'Name:asc') => {
     if (key.startsWith('Status:')) {
@@ -38,43 +33,6 @@ export default ({ properties }) =>
             return 0;
         }
       };
-    } else if (key.startsWith('Version:')) {
-      return function (itemA, itemB) {
-        const [, dir] = key.split(':');
-        let a, b;
-        if (dir === 'asc') {
-          a = itemA;
-          b = itemB;
-        } else {
-          b = itemA;
-          a = itemB;
-        }
-
-        // Split the versions into arrays of numbers
-        const versionA = a.Version.split('.').map((part) => {
-          const number = Number(part);
-          return isNaN(number) ? 0 : number;
-        });
-        const versionB = b.Version.split('.').map((part) => {
-          const number = Number(part);
-          return isNaN(number) ? 0 : number;
-        });
-
-        const minLength = Math.min(versionA.length, versionB.length);
-
-        for (let i = 0; i < minLength; i++) {
-          const diff = versionA[i] - versionB[i];
-          switch (true) {
-            case diff > 0:
-              return 1;
-            case diff < 0:
-              return -1;
-          }
-        }
-
-        return versionA.length - versionB.length;
-      };
     }
-
     return properties(['Node'])(key);
   };
diff --git a/ui/packages/consul-ui/app/sort/comparators/nspace.js b/ui/packages/consul-ui/app/sort/comparators/nspace.js
index 5cfcec52de317..fbbdbb1eb6292 100644
--- a/ui/packages/consul-ui/app/sort/comparators/nspace.js
+++ b/ui/packages/consul-ui/app/sort/comparators/nspace.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default ({ properties }) =>
   (key) => {
     return properties(['Name'])(key);
diff --git a/ui/packages/consul-ui/app/sort/comparators/partition.js b/ui/packages/consul-ui/app/sort/comparators/partition.js
index 5cfcec52de317..fbbdbb1eb6292 100644
--- a/ui/packages/consul-ui/app/sort/comparators/partition.js
+++ b/ui/packages/consul-ui/app/sort/comparators/partition.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default ({ properties }) =>
   (key) => {
     return properties(['Name'])(key);
diff --git a/ui/packages/consul-ui/app/sort/comparators/peer.js b/ui/packages/consul-ui/app/sort/comparators/peer.js
index a8f067f4bd827..b91da9d0b6aa8 100644
--- a/ui/packages/consul-ui/app/sort/comparators/peer.js
+++ b/ui/packages/consul-ui/app/sort/comparators/peer.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { schema } from 'consul-ui/models/peer';
 
 export default ({ properties }) =>
diff --git a/ui/packages/consul-ui/app/sort/comparators/policy.js b/ui/packages/consul-ui/app/sort/comparators/policy.js
index f6bf39a991d87..d4dc641164ef4 100644
--- a/ui/packages/consul-ui/app/sort/comparators/policy.js
+++ b/ui/packages/consul-ui/app/sort/comparators/policy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default ({ properties }) =>
   (key = 'Name:asc') => {
     return properties(['Name'])(key);
diff --git a/ui/packages/consul-ui/app/sort/comparators/role.js b/ui/packages/consul-ui/app/sort/comparators/role.js
index 392ca2b5e8cb6..89307fb5ce5b2 100644
--- a/ui/packages/consul-ui/app/sort/comparators/role.js
+++ b/ui/packages/consul-ui/app/sort/comparators/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default ({ properties }) =>
   (key = 'Name:asc') => {
     return properties(['Name', 'CreateIndex'])(key);
diff --git a/ui/packages/consul-ui/app/sort/comparators/service-instance.js b/ui/packages/consul-ui/app/sort/comparators/service-instance.js
index 3a7c5addf1d17..23ffec0cadcfd 100644
--- a/ui/packages/consul-ui/app/sort/comparators/service-instance.js
+++ b/ui/packages/consul-ui/app/sort/comparators/service-instance.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default ({ properties }) =>
   (key) => {
     if (key.startsWith('Status:')) {
diff --git a/ui/packages/consul-ui/app/sort/comparators/service.js b/ui/packages/consul-ui/app/sort/comparators/service.js
index 1ac95e927cd38..90d7d36eaf169 100644
--- a/ui/packages/consul-ui/app/sort/comparators/service.js
+++ b/ui/packages/consul-ui/app/sort/comparators/service.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default ({ properties }) =>
   (key = 'Status:asc') => {
     if (key.startsWith('Status:')) {
diff --git a/ui/packages/consul-ui/app/sort/comparators/token.js b/ui/packages/consul-ui/app/sort/comparators/token.js
index ec2638a5e7890..04fc174f8df50 100644
--- a/ui/packages/consul-ui/app/sort/comparators/token.js
+++ b/ui/packages/consul-ui/app/sort/comparators/token.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default ({ properties }) =>
   (key) => {
     return properties(['CreateTime'])(key);
diff --git a/ui/packages/consul-ui/app/sort/comparators/upstream-instance.js b/ui/packages/consul-ui/app/sort/comparators/upstream-instance.js
index 8bedc8a0944f6..3037de848e40c 100644
--- a/ui/packages/consul-ui/app/sort/comparators/upstream-instance.js
+++ b/ui/packages/consul-ui/app/sort/comparators/upstream-instance.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default ({ properties }) =>
   (key = 'DestinationName:asc') => {
     return properties(['DestinationName'])(key);
diff --git a/ui/packages/consul-ui/app/storages/base.js b/ui/packages/consul-ui/app/storages/base.js
index c4bd743205b98..50a26fa669488 100644
--- a/ui/packages/consul-ui/app/storages/base.js
+++ b/ui/packages/consul-ui/app/storages/base.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default class Storage {
   constructor(key, storage) {
     this.key = key;
diff --git a/ui/packages/consul-ui/app/storages/notices.js b/ui/packages/consul-ui/app/storages/notices.js
index db0f2b6c4124e..549219764c9ed 100644
--- a/ui/packages/consul-ui/app/storages/notices.js
+++ b/ui/packages/consul-ui/app/storages/notices.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { TrackedArray } from 'tracked-built-ins';
 import Storage from './base';
 
diff --git a/ui/packages/consul-ui/app/styles/app.scss b/ui/packages/consul-ui/app/styles/app.scss
index f51022ed3ddbb..78af922efcfe0 100644
--- a/ui/packages/consul-ui/app/styles/app.scss
+++ b/ui/packages/consul-ui/app/styles/app.scss
@@ -1,16 +1,11 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @charset 'utf-8';
 
-/* tailwind before all the customizations */
-@import 'tailwind';
-
 /* css for hds */
 @import '@hashicorp/design-system-components';
 
+/* tailwind before all the customizations */
+@import 'tailwind';
+
 /* all variables and custom queries including generic base variables */
 @import 'variables';
 
diff --git a/ui/packages/consul-ui/app/styles/base/animation/index.scss b/ui/packages/consul-ui/app/styles/base/animation/index.scss
index 0c0114cbb7c26..7f0d2a4762bcd 100644
--- a/ui/packages/consul-ui/app/styles/base/animation/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/animation/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %with-transition-500 {
   transition-duration: 0.15s;
   transition-timing-function: ease-out;
diff --git a/ui/packages/consul-ui/app/styles/base/color/README.mdx b/ui/packages/consul-ui/app/styles/base/color/README.mdx
new file mode 100644
index 0000000000000..414514316d8fa
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/README.mdx
@@ -0,0 +1,81 @@
+# Colors
+
+All colors for the immediate future should _mostly_ use the following `tone`
+CSS properties, unless:
+
+1. We get around to eventually adding semantic colors names (or adding something else) in which case these docs should be updated.
+2. You are absolutely sure the color you want should never be changed by a theme. These should be very very few and far between so even if we get that wrong it should be easy to update.
+
+`tones` should always using the following form:
+
+```css
+property: rgb(var(--tone-gray-500));
+```
+
+In other words always use `rgb` this gives us the flexibility to easily use these variables with alpha if we ever need to.
+
+```css
+property: rgb(var(--tone-gray-500) / 50);
+```
+
+Currently, alphas are mainly used for shadows. Please avoid the use of alphas for adjusting hues as they can produce unpredictable results. We should be utilizing our pre-defined color palette or adding new colors to it with proper RGB values. If you do need to add a color with alpha, please include a code comment or a self-comment explaining the use case.
+
+Lastly, there is currently one non-color alias group which is `--tone-brand` which is a group of our current brand colors.
+
+
+## %theme-light (default)
+
+```hbs preview-template
+<ul
+  {{css-props (set this 'tones')
+    prefix='tone-'
+    group='[a-z\-]'
+  }}
+>
+{{#each-in this.tones as |prop value|}}
+  <li>
+    {{#each-in value as |prop value|}}
+    <figure
+      {{with-copyable (concat "rgb(var(" prop "));")}}
+      style={{concat "background-color: rgb(var(" prop "))"}}
+    >
+      <figcaption>{{prop}}</figcaption>
+    </figure>
+    {{/each-in}}
+  </li>
+{{/each-in}}
+</ul>
+```
+
+## %theme-dark
+
+If you need to build something (like a component or view) which begins in 'dark mode', you will need to switch your coloring and use
+
+```css
+%component-name {
+  @extend %theme-dark;
+}
+```
+
+```hbs preview-template
+<ul
+  {{css-props (set this 'tones')
+    prefix='tone-'
+    group='[a-z\-]'
+  }}
+>
+{{#each-in this.tones as |prop value|}}
+  <li>
+    {{#each-in value as |prop value|}}
+    <figure
+      {{with-copyable (concat "rgb(var(" prop "));")}}
+      style={{concat "background-color: rgb(var(" prop "))"}}
+    >
+      <figcaption>{{prop}}</figcaption>
+    </figure>
+    {{/each-in}}
+  </li>
+{{/each-in}}
+</ul>
+```
+
diff --git a/ui/packages/consul-ui/app/styles/base/color/base-variables.scss b/ui/packages/consul-ui/app/styles/base/color/base-variables.scss
new file mode 100644
index 0000000000000..e88817cda7cc2
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/base-variables.scss
@@ -0,0 +1,190 @@
+:root {
+  /* vault */
+  --steel-050: 245 246 247;
+  --steel-100: 225 228 231;
+  --steel-200: 205 211 215;
+  --steel-300: 185 193 199;
+  --steel-400: 165 176 183;
+  --steel-500: 145 159 168;
+  --steel-600: 119 131 138;
+  --steel-700: 93 102 107;
+  --steel-800: 66 73 77;
+  --steel-900: 40 44 46;
+
+  /* vault refresh */
+  --lemon-050: 255 216 20;
+  --lemon-100: 255 216 20;
+  --lemon-200: 255 216 20;
+  --lemon-300: 255 216 20;
+  --lemon-400: 255 216 20;
+  --lemon-500: 255 216 20;
+  --lemon-600: 255 216 20;
+  --lemon-700: 255 216 20;
+  --lemon-800: 255 216 20;
+  --lemon-900: 255 216 20;
+
+  /* consul */
+  --magenta-050: 249 235 242;
+  --magenta-100: 239 196 216;
+  --magenta-200: 229 158 190;
+  --magenta-300: 218 119 164;
+  --magenta-400: 208 80 138;
+  --magenta-500: 198 42 113;
+  --magenta-600: 158 33 89;
+  --magenta-700: 125 26 71;
+  --magenta-800: 90 20 52;
+  --magenta-900: 54 12 31;
+
+  /* consul refresh */
+  --strawberry-010: 255 242 248;
+  --strawberry-050: 255 242 248;
+  --strawberry-100: 248 217 231;
+  --strawberry-200: 248 217 231;
+  --strawberry-300: 224 126 172;
+  --strawberry-400: 224 126 172;
+  --strawberry-500: 202 33 113;
+  --strawberry-600: 142 19 74;
+  --strawberry-700: 142 19 74;
+  --strawberry-800: 101 13 52;
+  --strawberry-900: 101 13 52;
+
+  /* vagrant */
+  --cobalt-050: 240 245 255;
+  --cobalt-100: 191 212 255;
+  --cobalt-200: 138 177 255;
+  --cobalt-300: 91 146 255;
+  --cobalt-400: 56 122 255;
+  --cobalt-500: 21 99 255;
+  --cobalt-600: 15 79 209;
+  --cobalt-700: 14 64 163;
+  --cobalt-800: 10 45 116;
+  --cobalt-900: 6 27 70;
+
+  /* terraform */
+  --indigo-050: 238 237 252;
+  --indigo-100: 213 210 247;
+  --indigo-200: 174 167 242;
+  --indigo-300: 141 131 237;
+  --indigo-400: 117 104 232;
+  --indigo-500: 92 78 229;
+  --indigo-600: 76 64 188;
+  --indigo-700: 59 50 146;
+  --indigo-800: 42 36 105;
+  --indigo-900: 26 22 63;
+
+  /* nomad */
+  --teal-050: 235 248 243; /*#c3ecdc*/
+  --teal-100: 195 236 220; /*#e1e4e7*/
+  --teal-200: 155 223 197;
+  --teal-300: 116 211 174;
+  --teal-400: 76 198 151;
+  --teal-500: 37 186 129;
+  --teal-600: 31 153 106;
+  --teal-700: 24 119 83;
+  --teal-800: 17 85 59;
+  --teal-900: 11 51 36;
+
+  /* packer */
+  --cyan-050: 231 248 255;
+  --cyan-100: 185 236 255;
+  --cyan-200: 139 224 255;
+  --cyan-300: 92 211 255;
+  --cyan-400: 46 199 255;
+  --cyan-500: 0 187 255;
+  --cyan-600: 0 159 217;
+  --cyan-700: 0 119 163;
+  --cyan-800: 0 85 116;
+  --cyan-900: 0 51 70;
+
+  /* ui */
+
+  /* removed to prevent confusion
+  --gray-1: #191a1c;
+  --gray-2: #323538;
+  --gray-3: #4c4f54;
+  --gray-4: #656a70;
+  --gray-5: #7f858d;
+  --gray-6: #9a9ea5;
+  --gray-7: #b4b8bc;
+  --gray-8: #d0d2d5;
+  --gray-9: #ebecee;
+  --gray-10: #f3f4f6;
+*/
+
+  --gray-010: 251 251 252;
+  --gray-050: 247 248 250;
+  --gray-100: 235 238 242;
+  --gray-150: 235 238 242;
+  --gray-200: 220 224 230;
+  --gray-300: 186 193 204;
+  --gray-400: 142 150 163;
+  --gray-500: 111 118 130;
+  --gray-600: 98 104 115;
+  --gray-700: 82 87 97;
+  --gray-800: 55 58 66;
+  --gray-850: 44 46 51;
+  --gray-900: 31 33 36;
+  --gray-950: 21 23 28;
+
+  /* status */
+  --green-050: 236 247 237;
+  --green-100: 198 233 201;
+  --green-200: 160 219 165;
+  --green-300: 122 204 129;
+  --green-400: 84 190 93;
+  --green-500: 46 176 57;
+  --green-600: 38 145 47;
+  --green-700: 30 113 37;
+  --green-800: 21 80 26;
+  --green-900: 13 48 16;
+
+  --blue-010: 251 252 255;
+  --blue-050: 240 245 255;
+  --blue-100: 191 212 255;
+  --blue-200: 138 177 255;
+  --blue-300: 91 146 255;
+  --blue-400: 56 122 255;
+  --blue-500: 21 99 255;
+  --blue-600: 15 79 209;
+  --blue-700: 14 64 163;
+  --blue-800: 10 45 116;
+  --blue-900: 6 27 70;
+
+  --red-010: 253 250 251;
+  --red-050: 249 236 238;
+  --red-100: 239 199 204;
+  --red-200: 229 162 170;
+  --red-300: 219 125 136;
+  --red-400: 209 88 102;
+  --red-500: 199 52 69;
+  --red-600: 163 43 57;
+  --red-700: 127 34 44;
+  --red-800: 91 24 32;
+  --red-900: 55 15 19;
+
+  --orange-050: 254 244 236; /*#fa8f37*/
+  --orange-100: 253 224 200;
+  --orange-200: 252 204 164;
+  --orange-300: 251 183 127;
+  --orange-400: 250 163 91;
+  --orange-500: 250 143 55;
+  --orange-600: 205 118 46;
+  --orange-700: 160 92 35;
+  --orange-800: 114 65 25;
+  --orange-900: 69 39 15;
+
+  --yellow-050: 255 251 237; /*#fa8f37;*/
+  --yellow-100: 253 238 186;
+  --yellow-200: 252 228 140;
+  --yellow-300: 251 217 94;
+  --yellow-400: 250 206 48;
+  --yellow-500: 250 196 2;
+  --yellow-600: 205 161 2;
+  --yellow-700: 160 125 2;
+  --yellow-800: 114 90 1;
+  --yellow-900: 69 54 1;
+
+  --transparent: transparent;
+  --white: 255 255 255;
+  --black: 0 0 0;
+}
diff --git a/ui/packages/consul-ui/app/styles/base/color/hex-variables.scss b/ui/packages/consul-ui/app/styles/base/color/hex-variables.scss
new file mode 100644
index 0000000000000..d2f7659e10f83
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/hex-variables.scss
@@ -0,0 +1,178 @@
+:root {
+  /* vault */
+  --steel-050: #f5f6f7;
+  --steel-100: #e1e4e7;
+  --steel-200: #cdd3d7;
+  --steel-300: #b9c1c7;
+  --steel-400: #a5b0b7;
+  --steel-500: #919fa8;
+  --steel-600: #77838a;
+  --steel-700: #5d666b;
+  --steel-800: #42494d;
+  --steel-900: #282c2e;
+
+  /* consul */
+  --magenta-050: #f9ebf2;
+  --magenta-100: #efc4d8;
+  --magenta-200: #e59ebe;
+  --magenta-300: #da77a4;
+  --magenta-400: #d0508a;
+  --magenta-500: #c62a71;
+  --magenta-600: #9e2159;
+  --magenta-700: #7d1a47;
+  --magenta-800: #5a1434;
+  --magenta-900: #360c1f;
+
+  /* consul refresh */
+  --strawberry-010: #fff2f8;
+  --strawberry-050: #fff2f8;
+  --strawberry-100: #f8d9e7;
+  --strawberry-200: #f8d9e7;
+  --strawberry-300: #e07eac;
+  --strawberry-400: #e07eac;
+  --strawberry-500: #ca2171;
+  --strawberry-600: #8e134a;
+  --strawberry-700: #8e134a;
+  --strawberry-800: #650d34;
+  --strawberry-900: #650d34;
+
+  /* vagrant */
+  --cobalt-050: #f0f5ff;
+  --cobalt-100: #bfd4ff;
+  --cobalt-200: #8ab1ff;
+  --cobalt-300: #5b92ff;
+  --cobalt-400: #387aff;
+  --cobalt-500: #1563ff;
+  --cobalt-600: #0f4fd1;
+  --cobalt-700: #0e40a3;
+  --cobalt-800: #0a2d74;
+  --cobalt-900: #061b46;
+
+  /* terraform */
+  --indigo-050: #eeedfc;
+  --indigo-100: #d5d2f7;
+  --indigo-200: #aea7f2;
+  --indigo-300: #8d83ed;
+  --indigo-400: #7568e8;
+  --indigo-500: #5c4ee5;
+  --indigo-600: #4c40bc;
+  --indigo-700: #3b3292;
+  --indigo-800: #2a2469;
+  --indigo-900: #1a163f;
+
+  /* nomad */
+  --teal-050: #ebf8f3;/*#c3ecdc*/;
+  --teal-100: #c3ecdc;/*#e1e4e7*/;
+  --teal-200: #9bdfc5;
+  --teal-300: #74d3ae;
+  --teal-400: #4cc697;
+  --teal-500: #25ba81;
+  --teal-600: #1f996a;
+  --teal-700: #187753;
+  --teal-800: #11553b;
+  --teal-900: #0b3324;
+
+  /* packer */
+  --cyan-050: #e7f8ff;
+  --cyan-100: #b9ecff;
+  --cyan-200: #8be0ff;
+  --cyan-300: #5cd3ff;
+  --cyan-400: #2ec7ff;
+  --cyan-500: #00bbff;
+  --cyan-600: #009fd9;
+  --cyan-700: #0077a3;
+  --cyan-800: #005574;
+  --cyan-900: #003346;
+
+/* ui */
+
+/* removed to prevent confusion
+  --gray-1: #191a1c;
+  --gray-2: #323538;
+  --gray-3: #4c4f54;
+  --gray-4: #656a70;
+  --gray-5: #7f858d;
+  --gray-6: #9a9ea5;
+  --gray-7: #b4b8bc;
+  --gray-8: #d0d2d5;
+  --gray-9: #ebecee;
+  --gray-10: #f3f4f6;
+*/
+
+  --gray-010: #fbfbfc;
+  --gray-050: #f7f8fa;
+  --gray-100: #ebeef2;
+  --gray-150: #ebeef2;
+  --gray-200: #dce0e6;
+  --gray-300: #bac1cc;
+  --gray-400: #8e96a3;
+  --gray-500: #6f7682;
+  --gray-600: #626873;
+  --gray-700: #525761;
+  --gray-800: #373a42;
+  --gray-850: #2c2e33;
+  --gray-900: #1f2124;
+  --gray-950: #15171c;
+
+/* status */
+  --green-050: #ecf7ed;
+  --green-100: #c6e9c9;
+  --green-200: #a0dba5;
+  --green-300: #7acc81;
+  --green-400: #54be5d;
+  --green-500: #2eb039;
+  --green-600: #26912f;
+  --green-700: #1e7125;
+  --green-800: #15501a;
+  --green-900: #0d3010;
+
+  --blue-010: #fbfcff;
+  --blue-050: #f0f5ff;
+  --blue-100: #bfd4ff;
+  --blue-200: #8ab1ff;
+  --blue-300: #5b92ff;
+  --blue-400: #387aff;
+  --blue-500: #1563ff;
+  --blue-600: #0f4fd1;
+  --blue-700: #0e40a3;
+  --blue-800: #0a2d74;
+  --blue-900: #061b46;
+
+  --red-010: #fdfafb;
+  --red-050: #f9ecee;
+  --red-100: #efc7cc;
+  --red-200: #e5a2aa;
+  --red-300: #db7d88;
+  --red-400: #d15866;
+  --red-500: #c73445;
+  --red-600: #a32b39;
+  --red-700: #7f222c;
+  --red-800: #5b1820;
+  --red-900: #370f13;
+
+  --orange-050: #fef4ec;/*#fa8f37*/;
+  --orange-100: #fde0c8;
+  --orange-200: #fccca4;
+  --orange-300: #fbb77f;
+  --orange-400: #faa35b;
+  --orange-500: #fa8f37;
+  --orange-600: #cd762e;
+  --orange-700: #a05c23;
+  --orange-800: #724119;
+  --orange-900: #45270f;
+
+  --yellow-050: #fffbed;/*#fa8f37;*/
+  --yellow-100: #fdeeba;
+  --yellow-200: #fce48c;
+  --yellow-300: #fbd95e;
+  --yellow-400: #face30;
+  --yellow-500: #fac402;
+  --yellow-600: #cda102;
+  --yellow-700: #a07d02;
+  --yellow-800: #725a01;
+  --yellow-900: #453601;
+
+  --transparent: transparent;
+  --white: #fff;
+  --black: #000;
+}
diff --git a/ui/packages/consul-ui/app/styles/base/color/index.scss b/ui/packages/consul-ui/app/styles/base/color/index.scss
index 9b15c0b3187a8..decc200b41beb 100644
--- a/ui/packages/consul-ui/app/styles/base/color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/color/index.scss
@@ -1,7 +1,7 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
+/*@import './hex-variables';*/
+@import './base-variables';
+/* load in the ui theme */
 @import './ui/index';
+/* other themes should be added at a project level */
 @import './semantic-variables';
+/*@import './theme-placeholders';*/
diff --git a/ui/packages/consul-ui/app/styles/base/color/lemon/frame-placeholders.scss b/ui/packages/consul-ui/app/styles/base/color/lemon/frame-placeholders.scss
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/ui/packages/consul-ui/app/styles/base/color/lemon/index.scss b/ui/packages/consul-ui/app/styles/base/color/lemon/index.scss
new file mode 100644
index 0000000000000..e62440c7cbbb3
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/lemon/index.scss
@@ -0,0 +1,5 @@
+@import './themes/light';
+@import './themes/dark';
+@import './themes/light-high-contrast';
+@import './themes/dark-high-contrast';
+@import './frame-placeholders';
diff --git a/ui/packages/consul-ui/app/styles/base/color/lemon/themes/dark-high-contrast.scss b/ui/packages/consul-ui/app/styles/base/color/lemon/themes/dark-high-contrast.scss
new file mode 100644
index 0000000000000..d57568f4a9fbb
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/lemon/themes/dark-high-contrast.scss
@@ -0,0 +1,17 @@
+%theme-dark-high-contrast {
+  --tone-lemon-000: var(--white);
+  --tone-lemon-050: var(--lemon-050);
+  --tone-lemon-100: var(--lemon-100);
+  --tone-lemon-150: var(--lemon-150);
+  --tone-lemon-200: var(--lemon-200);
+  --tone-lemon-300: var(--lemon-300);
+  --tone-lemon-400: var(--lemon-400);
+  --tone-lemon-500: var(--lemon-500);
+  --tone-lemon-600: var(--lemon-600);
+  --tone-lemon-700: var(--lemon-700);
+  --tone-lemon-800: var(--lemon-800);
+  --tone-lemon-850: var(--lemon-850);
+  --tone-lemon-900: var(--lemon-900);
+  --tone-lemon-950: var(--lemon-950);
+  --tone-lemon-999: var(--black);
+}
diff --git a/ui/packages/consul-ui/app/styles/base/color/lemon/themes/dark.scss b/ui/packages/consul-ui/app/styles/base/color/lemon/themes/dark.scss
new file mode 100644
index 0000000000000..be9f8551e5171
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/lemon/themes/dark.scss
@@ -0,0 +1,17 @@
+%theme-dark {
+  --tone-lemon-000: var(--white);
+  --tone-lemon-050: var(--lemon-050);
+  --tone-lemon-100: var(--lemon-100);
+  --tone-lemon-150: var(--lemon-150);
+  --tone-lemon-200: var(--lemon-200);
+  --tone-lemon-300: var(--lemon-300);
+  --tone-lemon-400: var(--lemon-400);
+  --tone-lemon-500: var(--lemon-500);
+  --tone-lemon-600: var(--lemon-600);
+  --tone-lemon-700: var(--lemon-700);
+  --tone-lemon-800: var(--lemon-800);
+  --tone-lemon-850: var(--lemon-850);
+  --tone-lemon-900: var(--lemon-900);
+  --tone-lemon-950: var(--lemon-950);
+  --tone-lemon-999: var(--black);
+}
diff --git a/ui/packages/consul-ui/app/styles/base/color/lemon/themes/light-high-contrast.scss b/ui/packages/consul-ui/app/styles/base/color/lemon/themes/light-high-contrast.scss
new file mode 100644
index 0000000000000..5a7fac0f04649
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/lemon/themes/light-high-contrast.scss
@@ -0,0 +1,17 @@
+%theme-light-high-contrast {
+  --tone-lemon-000: var(--white);
+  --tone-lemon-050: var(--lemon-050);
+  --tone-lemon-100: var(--lemon-100);
+  --tone-lemon-150: var(--lemon-150);
+  --tone-lemon-200: var(--lemon-200);
+  --tone-lemon-300: var(--lemon-300);
+  --tone-lemon-400: var(--lemon-400);
+  --tone-lemon-500: var(--lemon-500);
+  --tone-lemon-600: var(--lemon-600);
+  --tone-lemon-700: var(--lemon-700);
+  --tone-lemon-800: var(--lemon-800);
+  --tone-lemon-850: var(--lemon-850);
+  --tone-lemon-900: var(--lemon-900);
+  --tone-lemon-950: var(--lemon-950);
+  --tone-lemon-999: var(--black);
+}
diff --git a/ui/packages/consul-ui/app/styles/base/color/lemon/themes/light.scss b/ui/packages/consul-ui/app/styles/base/color/lemon/themes/light.scss
new file mode 100644
index 0000000000000..4e937d5cf5ce7
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/lemon/themes/light.scss
@@ -0,0 +1,17 @@
+%theme-light {
+  --tone-lemon-000: var(--white);
+  --tone-lemon-050: var(--lemon-050);
+  --tone-lemon-100: var(--lemon-100);
+  --tone-lemon-150: var(--lemon-150);
+  --tone-lemon-200: var(--lemon-200);
+  --tone-lemon-300: var(--lemon-300);
+  --tone-lemon-400: var(--lemon-400);
+  --tone-lemon-500: var(--lemon-500);
+  --tone-lemon-600: var(--lemon-600);
+  --tone-lemon-700: var(--lemon-700);
+  --tone-lemon-800: var(--lemon-800);
+  --tone-lemon-850: var(--lemon-850);
+  --tone-lemon-900: var(--lemon-900);
+  --tone-lemon-950: var(--lemon-950);
+  --tone-lemon-999: var(--black);
+}
diff --git a/ui/packages/consul-ui/app/styles/base/color/magenta/frame-placeholders.scss b/ui/packages/consul-ui/app/styles/base/color/magenta/frame-placeholders.scss
new file mode 100644
index 0000000000000..9e380b4b325bc
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/magenta/frame-placeholders.scss
@@ -0,0 +1,13 @@
+%frame-magenta-300 {
+  @extend %frame-border-000;
+  background-color: rgb(var(--tone-gray-000));
+  border-color: rgb(var(--tone-magenta-600));
+  color: rgb(var(--tone-magenta-600));
+}
+%frame-magenta-800 {
+  @extend %frame-border-000;
+  background-color: rgb(var(--tone-magenta-500));
+  border-color: rgb(var(--tone-magenta-800));
+  color: rgb(var(--tone-gray-000));
+}
+
diff --git a/ui/packages/consul-ui/app/styles/base/color/magenta/index.scss b/ui/packages/consul-ui/app/styles/base/color/magenta/index.scss
new file mode 100644
index 0000000000000..3948997e771d2
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/magenta/index.scss
@@ -0,0 +1,6 @@
+@import './themes/light';
+@import './themes/dark';
+@import './themes/light-high-contrast';
+@import './themes/dark-high-contrast';
+@import './frame-placeholders';
+
diff --git a/ui/packages/consul-ui/app/styles/base/color/magenta/themes/dark-high-contrast.scss b/ui/packages/consul-ui/app/styles/base/color/magenta/themes/dark-high-contrast.scss
new file mode 100644
index 0000000000000..53a1d2077f69c
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/magenta/themes/dark-high-contrast.scss
@@ -0,0 +1,18 @@
+%theme-dark-low-contrast {
+  --tone-magenta-000: var(--white);
+  --tone-magenta-050: var(--magenta-050);
+  --tone-magenta-100: var(--magenta-100);
+  --tone-magenta-150: var(--magenta-150);
+  --tone-magenta-200: var(--magenta-200);
+  --tone-magenta-300: var(--magenta-300);
+  --tone-magenta-400: var(--magenta-400);
+  --tone-magenta-500: var(--magenta-500);
+  --tone-magenta-600: var(--magenta-600);
+  --tone-magenta-700: var(--magenta-700);
+  --tone-magenta-800: var(--magenta-800);
+  --tone-magenta-850: var(--magenta-850);
+  --tone-magenta-900: var(--magenta-900);
+  --tone-magenta-950: var(--magenta-950);
+  --tone-magenta-999: var(--black);
+}
+
diff --git a/ui/packages/consul-ui/app/styles/base/color/magenta/themes/dark.scss b/ui/packages/consul-ui/app/styles/base/color/magenta/themes/dark.scss
new file mode 100644
index 0000000000000..85a300e4a9354
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/magenta/themes/dark.scss
@@ -0,0 +1,18 @@
+%theme-dark {
+  --tone-magenta-000: var(--white);
+  --tone-magenta-050: var(--magenta-050);
+  --tone-magenta-100: var(--magenta-100);
+  --tone-magenta-150: var(--magenta-150);
+  --tone-magenta-200: var(--magenta-200);
+  --tone-magenta-300: var(--magenta-300);
+  --tone-magenta-400: var(--magenta-400);
+  --tone-magenta-500: var(--magenta-500);
+  --tone-magenta-600: var(--magenta-600);
+  --tone-magenta-700: var(--magenta-700);
+  --tone-magenta-800: var(--magenta-800);
+  --tone-magenta-850: var(--magenta-850);
+  --tone-magenta-900: var(--magenta-900);
+  --tone-magenta-950: var(--magenta-950);
+  --tone-magenta-999: var(--black);
+}
+
diff --git a/ui/packages/consul-ui/app/styles/base/color/magenta/themes/light-high-contrast.scss b/ui/packages/consul-ui/app/styles/base/color/magenta/themes/light-high-contrast.scss
new file mode 100644
index 0000000000000..bc0d03a80c4de
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/magenta/themes/light-high-contrast.scss
@@ -0,0 +1,18 @@
+%theme-light {
+  --tone-magenta-000: var(--white);
+  --tone-magenta-050: var(--magenta-050);
+  --tone-magenta-100: var(--magenta-100);
+  --tone-magenta-150: var(--magenta-150);
+  --tone-magenta-200: var(--magenta-200);
+  --tone-magenta-300: var(--magenta-300);
+  --tone-magenta-400: var(--magenta-400);
+  --tone-magenta-500: var(--magenta-500);
+  --tone-magenta-600: var(--magenta-600);
+  --tone-magenta-700: var(--magenta-700);
+  --tone-magenta-800: var(--magenta-800);
+  --tone-magenta-850: var(--magenta-850);
+  --tone-magenta-900: var(--magenta-900);
+  --tone-magenta-950: var(--magenta-950);
+  --tone-magenta-999: var(--black);
+}
+
diff --git a/ui/packages/consul-ui/app/styles/base/color/magenta/themes/light.scss b/ui/packages/consul-ui/app/styles/base/color/magenta/themes/light.scss
new file mode 100644
index 0000000000000..9c589e09ed058
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/magenta/themes/light.scss
@@ -0,0 +1,18 @@
+%theme-light-high-contrast {
+  --tone-magenta-000: var(--white);
+  --tone-magenta-050: var(--magenta-050);
+  --tone-magenta-100: var(--magenta-100);
+  --tone-magenta-150: var(--magenta-150);
+  --tone-magenta-200: var(--magenta-200);
+  --tone-magenta-300: var(--magenta-300);
+  --tone-magenta-400: var(--magenta-400);
+  --tone-magenta-500: var(--magenta-500);
+  --tone-magenta-600: var(--magenta-600);
+  --tone-magenta-700: var(--magenta-700);
+  --tone-magenta-800: var(--magenta-800);
+  --tone-magenta-850: var(--magenta-850);
+  --tone-magenta-900: var(--magenta-900);
+  --tone-magenta-950: var(--magenta-950);
+  --tone-magenta-999: var(--black);
+}
+
diff --git a/ui/packages/consul-ui/app/styles/base/color/semantic-variables.scss b/ui/packages/consul-ui/app/styles/base/color/semantic-variables.scss
index 80b8d21826eef..0681962e451e2 100644
--- a/ui/packages/consul-ui/app/styles/base/color/semantic-variables.scss
+++ b/ui/packages/consul-ui/app/styles/base/color/semantic-variables.scss
@@ -1,9 +1,27 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
-  --color-info: var(--token-color-foreground-action);
-  --color-alert: var(--token-color-palette-amber-200);
+  --color-primary: var(--tone-blue-500);
+  --color-dangerous: var(--tone-red-500);
+  --color-primary-disabled: var(--tone-blue-500);
+
+  --color-neutral: var(--tone-gray-500);
+  --color-action: var(--tone-blue-500);
+  --color-info: var(--tone-blue-500);
+  /*--color-active: var(--tone-blue-500); ?? form pre-focus*/
+  --color-success: var(--tone-green-500);
+  --color-failure: var(--tone-red-500);
+  --color-danger: var(--tone-red-500);
+  --color-warning: var(--tone-yellow-500);
+  --color-alert: var(--tone-orange-500);
+
+  /* --color-keyline-000: var(--white); */
+  /* --color-keyline-050: var(); */
+  /* --color-keyline-100: var(--gray-100); */
+  /* --color-keyline-200: var(--gray-200); */
+  /* --color-keyline-300: var(--gray-300); */
+  /* --color-keyline-400: var(--gray-400); */
+  /* --color-keyline-500: var(--gray-500); */
+  /* --color-keyline-600: var(--gray-600); */
+  /* --color-keyline-700: var(); */
+  /* --color-keyline-800: var(); */
+  /* --color-keyline-900: var(--black); */
 }
diff --git a/ui/packages/consul-ui/app/styles/base/color/strawberry/frame-placeholders.scss b/ui/packages/consul-ui/app/styles/base/color/strawberry/frame-placeholders.scss
new file mode 100644
index 0000000000000..589850244c7eb
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/strawberry/frame-placeholders.scss
@@ -0,0 +1,13 @@
+%frame-strawberry-300 {
+  @extend %frame-border-000;
+  background-color: rgb(var(--tone-gray-000));
+  border-color: rgb(var(--tone-strawberry-600));
+  color: rgb(var(--tone-strawberry-600));
+}
+%frame-strawberry-800 {
+  @extend %frame-border-000;
+  background-color: rgb(var(--tone-strawberry-500));
+  border-color: rgb(var(--tone-strawberry-800));
+  color: rgb(var(--tone-gray-000));
+}
+
diff --git a/ui/packages/consul-ui/app/styles/base/color/strawberry/index.scss b/ui/packages/consul-ui/app/styles/base/color/strawberry/index.scss
new file mode 100644
index 0000000000000..3948997e771d2
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/strawberry/index.scss
@@ -0,0 +1,6 @@
+@import './themes/light';
+@import './themes/dark';
+@import './themes/light-high-contrast';
+@import './themes/dark-high-contrast';
+@import './frame-placeholders';
+
diff --git a/ui/packages/consul-ui/app/styles/base/color/strawberry/themes/dark-high-contrast.scss b/ui/packages/consul-ui/app/styles/base/color/strawberry/themes/dark-high-contrast.scss
new file mode 100644
index 0000000000000..8a86b9d9c52e2
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/strawberry/themes/dark-high-contrast.scss
@@ -0,0 +1,18 @@
+%theme-dark-high-contrast {
+  --tone-strawberry-000: var(--white);
+  --tone-strawberry-050: var(--strawberry-050);
+  --tone-strawberry-100: var(--strawberry-100);
+  --tone-strawberry-150: var(--strawberry-150);
+  --tone-strawberry-200: var(--strawberry-200);
+  --tone-strawberry-300: var(--strawberry-300);
+  --tone-strawberry-400: var(--strawberry-400);
+  --tone-strawberry-500: var(--strawberry-500);
+  --tone-strawberry-600: var(--strawberry-600);
+  --tone-strawberry-700: var(--strawberry-700);
+  --tone-strawberry-800: var(--strawberry-800);
+  --tone-strawberry-850: var(--strawberry-850);
+  --tone-strawberry-900: var(--strawberry-900);
+  --tone-strawberry-950: var(--strawberry-950);
+  --tone-strawberry-999: var(--black);
+}
+
diff --git a/ui/packages/consul-ui/app/styles/base/color/strawberry/themes/dark.scss b/ui/packages/consul-ui/app/styles/base/color/strawberry/themes/dark.scss
new file mode 100644
index 0000000000000..ff204b2adca84
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/strawberry/themes/dark.scss
@@ -0,0 +1,18 @@
+%theme-dark {
+  --tone-strawberry-000: var(--white);
+  --tone-strawberry-050: var(--strawberry-050);
+  --tone-strawberry-100: var(--strawberry-100);
+  --tone-strawberry-150: var(--strawberry-150);
+  --tone-strawberry-200: var(--strawberry-200);
+  --tone-strawberry-300: var(--strawberry-300);
+  --tone-strawberry-400: var(--strawberry-400);
+  --tone-strawberry-500: var(--strawberry-500);
+  --tone-strawberry-600: var(--strawberry-600);
+  --tone-strawberry-700: var(--strawberry-700);
+  --tone-strawberry-800: var(--strawberry-800);
+  --tone-strawberry-850: var(--strawberry-850);
+  --tone-strawberry-900: var(--strawberry-900);
+  --tone-strawberry-950: var(--strawberry-950);
+  --tone-strawberry-999: var(--black);
+}
+
diff --git a/ui/packages/consul-ui/app/styles/base/color/strawberry/themes/light-high-contrast.scss b/ui/packages/consul-ui/app/styles/base/color/strawberry/themes/light-high-contrast.scss
new file mode 100644
index 0000000000000..ccd2b783b5ef8
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/strawberry/themes/light-high-contrast.scss
@@ -0,0 +1,18 @@
+%theme-light-high-contrast {
+  --tone-strawberry-000: var(--white);
+  --tone-strawberry-050: var(--strawberry-050);
+  --tone-strawberry-100: var(--strawberry-100);
+  --tone-strawberry-150: var(--strawberry-150);
+  --tone-strawberry-200: var(--strawberry-200);
+  --tone-strawberry-300: var(--strawberry-300);
+  --tone-strawberry-400: var(--strawberry-400);
+  --tone-strawberry-500: var(--strawberry-500);
+  --tone-strawberry-600: var(--strawberry-600);
+  --tone-strawberry-700: var(--strawberry-700);
+  --tone-strawberry-800: var(--strawberry-800);
+  --tone-strawberry-850: var(--strawberry-850);
+  --tone-strawberry-900: var(--strawberry-900);
+  --tone-strawberry-950: var(--strawberry-950);
+  --tone-strawberry-999: var(--black);
+}
+
diff --git a/ui/packages/consul-ui/app/styles/base/color/strawberry/themes/light.scss b/ui/packages/consul-ui/app/styles/base/color/strawberry/themes/light.scss
new file mode 100644
index 0000000000000..4efb00acd9b53
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/strawberry/themes/light.scss
@@ -0,0 +1,18 @@
+%theme-light {
+  --tone-strawberry-000: var(--white);
+  --tone-strawberry-050: var(--strawberry-050);
+  --tone-strawberry-100: var(--strawberry-100);
+  --tone-strawberry-150: var(--strawberry-150);
+  --tone-strawberry-200: var(--strawberry-200);
+  --tone-strawberry-300: var(--strawberry-300);
+  --tone-strawberry-400: var(--strawberry-400);
+  --tone-strawberry-500: var(--strawberry-500);
+  --tone-strawberry-600: var(--strawberry-600);
+  --tone-strawberry-700: var(--strawberry-700);
+  --tone-strawberry-800: var(--strawberry-800);
+  --tone-strawberry-850: var(--strawberry-850);
+  --tone-strawberry-900: var(--strawberry-900);
+  --tone-strawberry-950: var(--strawberry-950);
+  --tone-strawberry-999: var(--black);
+}
+
diff --git a/ui/packages/consul-ui/app/styles/base/color/theme-placeholders.scss b/ui/packages/consul-ui/app/styles/base/color/theme-placeholders.scss
new file mode 100644
index 0000000000000..6dfb551affad4
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/theme-placeholders.scss
@@ -0,0 +1,91 @@
+%theme-light {
+  --tone-gray-000: var(--white);
+  --tone-gray-050: var(--gray-050);
+  --tone-gray-100: var(--gray-100);
+  --tone-gray-150: var(--gray-150);
+  --tone-gray-200: var(--gray-200);
+  --tone-gray-300: var(--gray-300);
+  --tone-gray-400: var(--gray-400);
+  --tone-gray-500: var(--gray-500);
+  --tone-gray-600: var(--gray-600);
+  --tone-gray-700: var(--gray-700);
+  --tone-gray-800: var(--gray-800);
+  --tone-gray-850: var(--gray-850);
+  --tone-gray-900: var(--gray-900);
+  --tone-gray-950: var(--gray-950);
+  --tone-gray-999: var(--black);
+
+  --tone-blue-500: var(--blue-500);
+
+  --tone-transparent: var(--transparent);
+}
+
+%theme-high-contrast {
+  --tone-transparent: var(--transparent);
+}
+%theme-low-contrast {
+  --tone-transparent: var(--transparent);
+}
+%theme-light-low-contrast {
+  --tone-transparent: var(--transparent);
+}
+%theme-dark-low-contrast {
+  --tone-transparent: var(--transparent);
+}
+%theme-light-high-contrast {
+  --tone-gray-000: var(--white);
+  --tone-gray-050: var(--white);
+  --tone-gray-100: var(--white);
+  --tone-gray-150: var(--white);
+  --tone-gray-200: var(--white);
+  --tone-gray-300: var(--white);
+  --tone-gray-400: var(--white);
+  --tone-gray-500: var(--gray-500);
+  --tone-gray-600: var(--black);
+  --tone-gray-700: var(--black);
+  --tone-gray-800: var(--black);
+  --tone-gray-850: var(--black);
+  --tone-gray-900: var(--black);
+  --tone-gray-950: var(--black);
+  --tone-gray-999: var(--black);
+
+  --tone-transparent: var(--transparent);
+}
+%theme-dark-high-contrast {
+  --tone-gray-000: var(--black);
+  --tone-gray-050: var(--black);
+  --tone-gray-100: var(--black);
+  --tone-gray-150: var(--black);
+  --tone-gray-200: var(--black);
+  --tone-gray-300: var(--black);
+  --tone-gray-400: var(--black);
+  --tone-gray-500: var(--gray-500);
+  --tone-gray-600: var(--white);
+  --tone-gray-700: var(--white);
+  --tone-gray-800: var(--white);
+  --tone-gray-850: var(--white);
+  --tone-gray-900: var(--white);
+  --tone-gray-950: var(--white);
+  --tone-gray-999: var(--white);
+
+  --tone-transparent: var(--transparent);
+}
+%theme-dark {
+  --tone-gray-000: var(--$black);
+  --tone-gray-050: var(--$gray-950);
+  --tone-gray-100: var(--$gray-900);
+  --tone-gray-150: var(--$gray-850);
+  --tone-gray-200: var(--$gray-800);
+  --tone-gray-300: var(--$gray-700);
+  --tone-gray-400: var(--$gray-600);
+  --tone-gray-500: var(--$gray-500);
+  --tone-gray-600: var(--$gray-400);
+  --tone-gray-700: var(--$gray-300);
+  --tone-gray-800: var(--$gray-200);
+  --tone-gray-850: var(--$gray-150);
+  --tone-gray-900: var(--$gray-100);
+  --tone-gray-950: var(--$gray-050);
+  --tone-gray-999: var(--$white);
+
+  --tone-transparent: var(--transparent);
+}
diff --git a/ui/packages/consul-ui/app/styles/base/color/ui/frame-placeholders.scss b/ui/packages/consul-ui/app/styles/base/color/ui/frame-placeholders.scss
index 9b368f76c9fe1..4f0cf22e0fbe7 100644
--- a/ui/packages/consul-ui/app/styles/base/color/ui/frame-placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/color/ui/frame-placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /*TODO: Move this to the reset */
 * {
   border-width: 0;
@@ -11,156 +6,182 @@
   /* same as decor-border-000 - but need to think about being able to import color on its own*/
   border-style: solid;
 }
+%frame-brand-300 {
+  @extend %frame-border-000;
+  background-color: var(--transparent);
+  border-color: rgb(var(--decor-brand-600));
+  color: rgb(var(--typo-brand-600));
+}
 
 /* possibly filter bar */
 /* modal close button */
 %frame-gray-050 {
   @extend %frame-border-000;
-  background-color: var(--token-color-surface-strong);
-  border-color: var(--token-color-palette-neutral-300);
-  color: var(--token-color-foreground-disabled);
+  background-color: rgb(var(--tone-gray-050));
+  border-color: rgb(var(--tone-gray-300));
+  color: rgb(var(--tone-gray-400));
+}
+/* modal main content */
+%frame-gray-100 {
+  @extend %frame-border-000;
+  background-color: rgb(var(--tone-gray-000));
+  border-color: rgb(var(--tone-gray-300));
+  color: rgb(var(--tone-gray-600)); /*  wasn't set */
+}
+/* hover */
+%frame-gray-200 {
+  @extend %frame-border-000;
+  background-color: var(--transparent);
+  border-color: rgb(var(--tone-gray-700));
+  color: rgb(var(--tone-gray-800));
 }
-/* button focus */
 %frame-gray-300 {
   @extend %frame-border-000;
-  background-color: var(--token-color-surface-primary);
-  border-color: var(--token-color-foreground-faint);
-  color: var(--token-color-foreground-primary);
+  background-color: rgb(var(--tone-gray-000));
+  border-color: rgb(var(--tone-gray-700));
+  color: rgb(var(--tone-gray-800));
 }
-/* button secondary*/
+/* button */
+/**/
 %frame-gray-400 {
   @extend %frame-border-000;
-  background-color: var(--token-color-surface-strong);
-  border-color: var(--token-color-palette-neutral-300);
-  color: var(--token-color-foreground-primary);
+  background-color: rgb(var(--tone-gray-050));
+  border-color: rgb(var(--tone-gray-300));
+  color: rgb(var(--tone-gray-800));
+}
+%frame-gray-500 {
+  @extend %frame-border-000;
+  background-color: rgb(var(--tone-gray-050));
+  border-color: rgb(var(--tone-gray-300));
+  color: rgb(var(--tone-gray-400));
 }
 
 /* tabs */
 %frame-gray-600 {
   @extend %frame-border-000;
-  background-color: var(--token-color-surface-strong);
-  border-color: var(--token-color-foreground-faint);
-  color: var(--token-color-foreground-primary);
+  background-color: rgb(var(--tone-gray-100));
+  border-color: rgb(var(--tone-gray-500));
+  color: rgb(var(--tone-gray-500));
 }
-/* button active */
+/* active */
 %frame-gray-700 {
   @extend %frame-border-000;
-  background-color: var(--token-color-surface-interactive-active);
-  border-color: var(--token-color-foreground-faint);
-  color: var(--token-color-foreground-primary);
+  background-color: rgb(var(--tone-gray-200));
+  border-color: rgb(var(--tone-gray-700));
+  color: rgb(var(--tone-gray-800));
 }
 /* modal bars */
 %frame-gray-800 {
   @extend %frame-border-000;
-  background-color: var(--token-color-surface-strong);
-  border-color: var(--token-color-palette-neutral-300);
-  color: var(--token-color-foreground-strong);
+  background-color: rgb(var(--tone-gray-050));
+  border-color: rgb(var(--tone-gray-300));
+  color: rgb(var(--tone-gray-900));
 }
 %frame-gray-900 {
   @extend %frame-border-000;
-  background-color: var(--token-color-surface-strong);
-  border-color: var(--token-color-palette-neutral-300);
-  color: var(--token-color-foreground-strong);
+  background-color: rgb(var(--tone-gray-100));
+  border-color: rgb(var(--tone-gray-300));
+  color: rgb(var(--tone-gray-900));
 }
 
 %frame-yellow-500 {
   @extend %frame-border-000;
-  background-color: var(--token-color-vault-gradient-faint-start);
-  border-color: var(--token-color-vault-brand);
+  background-color: rgb(var(--tone-yellow-050));
+  border-color: rgb(var(--tone-yellow-500));
 }
 %frame-yellow-800 {
   @extend %frame-border-000;
-  background-color: var(--token-color-vault-brand);
-  border-color: var(--token-color-vault-foreground);
-  color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-yellow-500));
+  border-color: rgb(var(--tone-yellow-800));
+  color: rgb(var(--tone-gray-000));
 }
 %frame-green-500 {
   @extend %frame-border-000;
-  background-color: var(--token-color-surface-success);
-  border-color: var(--token-color-foreground-success);
-  color: var(--token-color-foreground-success);
+  background-color: rgb(var(--tone-green-050));
+  border-color: rgb(var(--tone-green-500));
+  color: rgb(var(--tone-green-500));
 }
 %frame-green-800 {
   @extend %frame-border-000;
-  background-color: var(--token-color-foreground-success);
-  border-color: var(--token-color-palette-green-400);
-  color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-green-500));
+  border-color: rgb(var(--tone-green-800));
+  color: rgb(var(--tone-gray-000));
 }
 %frame-blue-200 {
   @extend %frame-border-000;
-  background-color: var(--token-color-surface-primary);
-  border-color: var(--token-color-foreground-action);
-  color: var(--token-color-foreground-action);
+  background-color: rgb(var(--tone-gray-000));
+  border-color: rgb(var(--tone-blue-300));
+  color: rgb(var(--tone-blue-300));
 }
 %frame-blue-300 {
   @extend %frame-border-000;
-  background-color: var(--token-color-surface-primary);
-  border-color: var(--token-color-foreground-action);
-  color: var(--token-color-foreground-action);
+  background-color: rgb(var(--tone-gray-000));
+  border-color: rgb(var(--tone-blue-500));
+  color: rgb(var(--tone-blue-500));
 }
 %frame-blue-500 {
   @extend %frame-border-000;
-  background-color: var(--token-color-surface-action);
-  border-color: var(--token-color-foreground-action);
-  color: var(--token-color-palette-blue-500);
+  background-color: rgb(var(--tone-blue-050));
+  border-color: rgb(var(--tone-blue-500));
+  color: rgb(var(--tone-blue-800));
 }
 %frame-blue-600 {
   @extend %frame-border-000;
-  background-color: var(--token-color-border-action);
-  border-color: var(--token-color-foreground-disabled);
-  color: var(--token-color-surface-action);
+  background-color: rgb(var(--tone-blue-200));
+  border-color: rgb(var(--tone-gray-400));
+  color: rgb(var(--tone-blue-050));
 }
 %frame-blue-700 {
   @extend %frame-border-000;
-  background-color: var(--token-color-foreground-action);
-  border-color: var(--token-color-palette-blue-500);
-  color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-blue-400));
+  border-color: rgb(var(--tone-blue-800));
+  color: rgb(var(--tone-gray-000));
 }
 %frame-blue-800 {
   @extend %frame-border-000;
-  background-color: var(--token-color-foreground-action);
-  border-color: var(--token-color-palette-blue-500);
-  color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-blue-500));
+  border-color: rgb(var(--tone-blue-800));
+  color: rgb(var(--tone-gray-000));
 }
 %frame-blue-900 {
   @extend %frame-border-000;
-  background-color: var(--token-color-foreground-action-active);
-  border-color: var(--token-color-palette-blue-500);
-  color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-blue-700));
+  border-color: rgb(var(--tone-blue-800));
+  color: rgb(var(--tone-gray-000));
 }
 %frame-red-300 {
   @extend %frame-border-000;
-  background-color: transparent;
-  border-color: var(--token-color-foreground-critical);
-  color: var(--token-color-foreground-critical);
+  background-color: var(--transparent);
+  border-color: rgb(var(--tone-red-500));
+  color: rgb(var(--tone-red-500));
 }
 %frame-red-500 {
   @extend %frame-border-000;
-  background-color: var(--token-color-surface-critical);
-  border-color: var(--token-color-foreground-critical);
-  color: var(--token-color-foreground-critical-high-contrast);
+  background-color: rgb(var(--tone-red-050));
+  border-color: rgb(var(--tone-red-500));
+  color: rgb(var(--tone-red-800));
 }
 %frame-red-600 {
   @extend %frame-border-000;
-  background-color: var(--token-color-border-critical);
-  border-color: var(--token-color-foreground-disabled);
-  color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-red-200));
+  border-color: rgb(var(--tone-gray-400));
+  color: rgb(var(--tone-gray-000));
 }
 %frame-red-700 {
   @extend %frame-border-000;
-  background-color: var(--token-color-foreground-critical);
-  border-color: var(--token-color-foreground-critical-high-contrast);
-  color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-red-500));
+  border-color: rgb(var(--tone-red-800));
+  color: rgb(var(--tone-gray-000));
 }
 %frame-red-800 {
   @extend %frame-border-000;
-  background-color: var(--token-color-foreground-critical);
-  border-color: var(--token-color-foreground-critical-high-contrast);
-  color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-red-500));
+  border-color: rgb(var(--tone-red-800));
+  color: rgb(var(--tone-gray-000));
 }
 %frame-red-900 {
   @extend %frame-border-000;
-  background-color: var(--token-color-palette-red-400);
-  border-color: var(--token-color-foreground-critical-high-contrast);
-  color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-red-700));
+  border-color: rgb(var(--tone-red-800));
+  color: rgb(var(--tone-gray-000));
 }
diff --git a/ui/packages/consul-ui/app/styles/base/color/ui/index.scss b/ui/packages/consul-ui/app/styles/base/color/ui/index.scss
index 9d300033e4e24..3948997e771d2 100644
--- a/ui/packages/consul-ui/app/styles/base/color/ui/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/color/ui/index.scss
@@ -1,6 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
+@import './themes/light';
+@import './themes/dark';
+@import './themes/light-high-contrast';
+@import './themes/dark-high-contrast';
 @import './frame-placeholders';
+
diff --git a/ui/packages/consul-ui/app/styles/base/color/ui/themes/dark-high-contrast.scss b/ui/packages/consul-ui/app/styles/base/color/ui/themes/dark-high-contrast.scss
new file mode 100644
index 0000000000000..0c815c10f7c37
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/ui/themes/dark-high-contrast.scss
@@ -0,0 +1,99 @@
+%theme-dark-high-contrast {
+  --tone-gray-000: var(--black);
+  --tone-gray-050: var(--black);
+  --tone-gray-100: var(--black);
+  --tone-gray-150: var(--black);
+  --tone-gray-200: var(--black);
+  --tone-gray-300: var(--black);
+  --tone-gray-400: var(--black);
+  --tone-gray-500: var(--gray-500);
+  --tone-gray-600: var(--white);
+  --tone-gray-700: var(--white);
+  --tone-gray-800: var(--white);
+  --tone-gray-850: var(--white);
+  --tone-gray-900: var(--white);
+  --tone-gray-950: var(--white);
+  --tone-gray-999: var(--white);
+
+  --tone-green-000: var(--white);
+  --tone-green-050: var(--green-050);
+  --tone-green-100: var(--green-100);
+  --tone-green-150: var(--green-150);
+  --tone-green-200: var(--green-200);
+  --tone-green-300: var(--green-300);
+  --tone-green-400: var(--green-400);
+  --tone-green-500: var(--green-500);
+  --tone-green-600: var(--green-600);
+  --tone-green-700: var(--green-700);
+  --tone-green-800: var(--green-800);
+  --tone-green-850: var(--green-850);
+  --tone-green-900: var(--green-900);
+  --tone-green-950: var(--green-950);
+  --tone-green-999: var(--black);
+
+  --tone-blue-000: var(--white);
+  --tone-blue-050: var(--blue-050);
+  --tone-blue-100: var(--blue-100);
+  --tone-blue-150: var(--blue-150);
+  --tone-blue-200: var(--blue-200);
+  --tone-blue-300: var(--blue-300);
+  --tone-blue-400: var(--blue-400);
+  --tone-blue-500: var(--blue-500);
+  --tone-blue-600: var(--blue-600);
+  --tone-blue-700: var(--blue-700);
+  --tone-blue-800: var(--blue-800);
+  --tone-blue-850: var(--blue-850);
+  --tone-blue-900: var(--blue-900);
+  --tone-blue-950: var(--blue-950);
+  --tone-blue-999: var(--black);
+
+  --tone-red-000: var(--white);
+  --tone-red-050: var(--red-050);
+  --tone-red-100: var(--red-100);
+  --tone-red-150: var(--red-150);
+  --tone-red-200: var(--red-200);
+  --tone-red-300: var(--red-300);
+  --tone-red-400: var(--red-400);
+  --tone-red-500: var(--red-500);
+  --tone-red-600: var(--red-600);
+  --tone-red-700: var(--red-700);
+  --tone-red-800: var(--red-800);
+  --tone-red-850: var(--red-850);
+  --tone-red-900: var(--red-900);
+  --tone-red-950: var(--red-950);
+  --tone-red-999: var(--black);
+
+  --tone-orange-000: var(--white);
+  --tone-orange-050: var(--orange-050);
+  --tone-orange-100: var(--orange-100);
+  --tone-orange-150: var(--orange-150);
+  --tone-orange-200: var(--orange-200);
+  --tone-orange-300: var(--orange-300);
+  --tone-orange-400: var(--orange-400);
+  --tone-orange-500: var(--orange-500);
+  --tone-orange-600: var(--orange-600);
+  --tone-orange-700: var(--orange-700);
+  --tone-orange-800: var(--orange-800);
+  --tone-orange-850: var(--orange-850);
+  --tone-orange-900: var(--orange-900);
+  --tone-orange-950: var(--orange-950);
+  --tone-orange-999: var(--black);
+
+  --tone-yellow-000: var(--white);
+  --tone-yellow-050: var(--yellow-050);
+  --tone-yellow-100: var(--yellow-100);
+  --tone-yellow-150: var(--yellow-150);
+  --tone-yellow-200: var(--yellow-200);
+  --tone-yellow-300: var(--yellow-300);
+  --tone-yellow-400: var(--yellow-400);
+  --tone-yellow-500: var(--yellow-500);
+  --tone-yellow-600: var(--yellow-600);
+  --tone-yellow-700: var(--yellow-700);
+  --tone-yellow-800: var(--yellow-800);
+  --tone-yellow-850: var(--yellow-850);
+  --tone-yellow-900: var(--yellow-900);
+  --tone-yellow-950: var(--yellow-950);
+  --tone-yellow-999: var(--black);
+
+  --tone-transparent: var(--transparent);
+}
diff --git a/ui/packages/consul-ui/app/styles/base/color/ui/themes/dark.scss b/ui/packages/consul-ui/app/styles/base/color/ui/themes/dark.scss
new file mode 100644
index 0000000000000..27f809fc1bfbd
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/ui/themes/dark.scss
@@ -0,0 +1,99 @@
+%theme-dark {
+  --tone-gray-000: var(--black);
+  --tone-gray-050: var(--gray-950);
+  --tone-gray-100: var(--gray-900);
+  --tone-gray-150: var(--gray-850);
+  --tone-gray-200: var(--gray-800);
+  --tone-gray-300: var(--gray-700);
+  --tone-gray-400: var(--gray-600);
+  --tone-gray-500: var(--gray-500);
+  --tone-gray-600: var(--gray-400);
+  --tone-gray-700: var(--gray-300);
+  --tone-gray-800: var(--gray-200);
+  --tone-gray-850: var(--gray-250);
+  --tone-gray-900: var(--gray-100);
+  --tone-gray-950: var(--gray-050);
+  --tone-gray-999: var(--white);
+
+  --tone-green-000: var(--white);
+  --tone-green-050: var(--green-050);
+  --tone-green-100: var(--green-100);
+  --tone-green-150: var(--green-150);
+  --tone-green-200: var(--green-200);
+  --tone-green-300: var(--green-300);
+  --tone-green-400: var(--green-400);
+  --tone-green-500: var(--green-500);
+  --tone-green-600: var(--green-600);
+  --tone-green-700: var(--green-700);
+  --tone-green-800: var(--green-800);
+  --tone-green-850: var(--green-850);
+  --tone-green-900: var(--green-900);
+  --tone-green-950: var(--green-950);
+  --tone-green-999: var(--black);
+
+  --tone-blue-000: var(--white);
+  --tone-blue-050: var(--blue-050);
+  --tone-blue-100: var(--blue-100);
+  --tone-blue-150: var(--blue-150);
+  --tone-blue-200: var(--blue-200);
+  --tone-blue-300: var(--blue-300);
+  --tone-blue-400: var(--blue-400);
+  --tone-blue-500: var(--blue-500);
+  --tone-blue-600: var(--blue-600);
+  --tone-blue-700: var(--blue-700);
+  --tone-blue-800: var(--blue-800);
+  --tone-blue-850: var(--blue-850);
+  --tone-blue-900: var(--blue-900);
+  --tone-blue-950: var(--blue-950);
+  --tone-blue-999: var(--black);
+
+  --tone-red-000: var(--white);
+  --tone-red-050: var(--red-050);
+  --tone-red-100: var(--red-100);
+  --tone-red-150: var(--red-150);
+  --tone-red-200: var(--red-200);
+  --tone-red-300: var(--red-300);
+  --tone-red-400: var(--red-400);
+  --tone-red-500: var(--red-500);
+  --tone-red-600: var(--red-600);
+  --tone-red-700: var(--red-700);
+  --tone-red-800: var(--red-800);
+  --tone-red-850: var(--red-850);
+  --tone-red-900: var(--red-900);
+  --tone-red-950: var(--red-950);
+  --tone-red-999: var(--black);
+
+  --tone-orange-000: var(--white);
+  --tone-orange-050: var(--orange-050);
+  --tone-orange-100: var(--orange-100);
+  --tone-orange-150: var(--orange-150);
+  --tone-orange-200: var(--orange-200);
+  --tone-orange-300: var(--orange-300);
+  --tone-orange-400: var(--orange-400);
+  --tone-orange-500: var(--orange-500);
+  --tone-orange-600: var(--orange-600);
+  --tone-orange-700: var(--orange-700);
+  --tone-orange-800: var(--orange-800);
+  --tone-orange-850: var(--orange-850);
+  --tone-orange-900: var(--orange-900);
+  --tone-orange-950: var(--orange-950);
+  --tone-orange-999: var(--black);
+
+  --tone-yellow-000: var(--black);
+  --tone-yellow-050: var(--blue-950);
+  --tone-yellow-100: var(--yellow-900);
+  --tone-yellow-150: var(--yellow-850);
+  --tone-yellow-200: var(--yellow-800);
+  --tone-yellow-300: var(--yellow-700);
+  --tone-yellow-400: var(--yellow-600);
+  --tone-yellow-500: var(--yellow-500);
+  --tone-yellow-600: var(--yellow-400);
+  --tone-yellow-700: var(--yellow-300);
+  --tone-yellow-800: var(--yellow-200);
+  --tone-yellow-850: var(--yellow-250);
+  --tone-yellow-900: var(--yellow-100);
+  --tone-yellow-950: var(--yellow-050);
+  --tone-yellow-999: var(--white);
+
+  --tone-transparent: var(--transparent);
+}
diff --git a/ui/packages/consul-ui/app/styles/base/color/ui/themes/light-high-contrast.scss b/ui/packages/consul-ui/app/styles/base/color/ui/themes/light-high-contrast.scss
new file mode 100644
index 0000000000000..676de6b15f29a
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/ui/themes/light-high-contrast.scss
@@ -0,0 +1,99 @@
+%theme-light-high-contrast {
+  --tone-gray-000: var(--white);
+  --tone-gray-050: var(--white);
+  --tone-gray-100: var(--white);
+  --tone-gray-150: var(--white);
+  --tone-gray-200: var(--white);
+  --tone-gray-300: var(--white);
+  --tone-gray-400: var(--white);
+  --tone-gray-500: var(--gray-500);
+  --tone-gray-600: var(--black);
+  --tone-gray-700: var(--black);
+  --tone-gray-800: var(--black);
+  --tone-gray-850: var(--black);
+  --tone-gray-900: var(--black);
+  --tone-gray-950: var(--black);
+  --tone-gray-999: var(--black);
+
+  --tone-green-000: var(--white);
+  --tone-green-050: var(--green-050);
+  --tone-green-100: var(--green-100);
+  --tone-green-150: var(--green-150);
+  --tone-green-200: var(--green-200);
+  --tone-green-300: var(--green-300);
+  --tone-green-400: var(--green-400);
+  --tone-green-500: var(--green-500);
+  --tone-green-600: var(--green-600);
+  --tone-green-700: var(--green-700);
+  --tone-green-800: var(--green-800);
+  --tone-green-850: var(--green-850);
+  --tone-green-900: var(--green-900);
+  --tone-green-950: var(--green-950);
+  --tone-green-999: var(--black);
+
+  --tone-blue-000: var(--white);
+  --tone-blue-050: var(--blue-050);
+  --tone-blue-100: var(--blue-100);
+  --tone-blue-150: var(--blue-150);
+  --tone-blue-200: var(--blue-200);
+  --tone-blue-300: var(--blue-300);
+  --tone-blue-400: var(--blue-400);
+  --tone-blue-500: var(--blue-500);
+  --tone-blue-600: var(--blue-600);
+  --tone-blue-700: var(--blue-700);
+  --tone-blue-800: var(--blue-800);
+  --tone-blue-850: var(--blue-850);
+  --tone-blue-900: var(--blue-900);
+  --tone-blue-950: var(--blue-950);
+  --tone-blue-999: var(--black);
+
+  --tone-red-000: var(--white);
+  --tone-red-050: var(--red-050);
+  --tone-red-100: var(--red-100);
+  --tone-red-150: var(--red-150);
+  --tone-red-200: var(--red-200);
+  --tone-red-300: var(--red-300);
+  --tone-red-400: var(--red-400);
+  --tone-red-500: var(--red-500);
+  --tone-red-600: var(--red-600);
+  --tone-red-700: var(--red-700);
+  --tone-red-800: var(--red-800);
+  --tone-red-850: var(--red-850);
+  --tone-red-900: var(--red-900);
+  --tone-red-950: var(--red-950);
+  --tone-red-999: var(--black);
+
+  --tone-orange-000: var(--white);
+  --tone-orange-050: var(--orange-050);
+  --tone-orange-100: var(--orange-100);
+  --tone-orange-150: var(--orange-150);
+  --tone-orange-200: var(--orange-200);
+  --tone-orange-300: var(--orange-300);
+  --tone-orange-400: var(--orange-400);
+  --tone-orange-500: var(--orange-500);
+  --tone-orange-600: var(--orange-600);
+  --tone-orange-700: var(--orange-700);
+  --tone-orange-800: var(--orange-800);
+  --tone-orange-850: var(--orange-850);
+  --tone-orange-900: var(--orange-900);
+  --tone-orange-950: var(--orange-950);
+  --tone-orange-999: var(--black);
+
+  --tone-yellow-000: var(--white);
+  --tone-yellow-050: var(--yellow-050);
+  --tone-yellow-100: var(--yellow-100);
+  --tone-yellow-150: var(--yellow-150);
+  --tone-yellow-200: var(--yellow-200);
+  --tone-yellow-300: var(--yellow-300);
+  --tone-yellow-400: var(--yellow-400);
+  --tone-yellow-500: var(--yellow-500);
+  --tone-yellow-600: var(--yellow-600);
+  --tone-yellow-700: var(--yellow-700);
+  --tone-yellow-800: var(--yellow-800);
+  --tone-yellow-850: var(--yellow-850);
+  --tone-yellow-900: var(--yellow-900);
+  --tone-yellow-950: var(--yellow-950);
+  --tone-yellow-999: var(--black);
+
+  --tone-transparent: var(--transparent);
+}
diff --git a/ui/packages/consul-ui/app/styles/base/color/ui/themes/light.scss b/ui/packages/consul-ui/app/styles/base/color/ui/themes/light.scss
new file mode 100644
index 0000000000000..7497280ba09ae
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/ui/themes/light.scss
@@ -0,0 +1,99 @@
+%theme-light {
+  --tone-gray-000: var(--white);
+  --tone-gray-050: var(--gray-050);
+  --tone-gray-100: var(--gray-100);
+  --tone-gray-150: var(--gray-150);
+  --tone-gray-200: var(--gray-200);
+  --tone-gray-300: var(--gray-300);
+  --tone-gray-400: var(--gray-400);
+  --tone-gray-500: var(--gray-500);
+  --tone-gray-600: var(--gray-600);
+  --tone-gray-700: var(--gray-700);
+  --tone-gray-800: var(--gray-800);
+  --tone-gray-850: var(--gray-850);
+  --tone-gray-900: var(--gray-900);
+  --tone-gray-950: var(--gray-950);
+  --tone-gray-999: var(--black);
+
+  --tone-green-000: var(--white);
+  --tone-green-050: var(--green-050);
+  --tone-green-100: var(--green-100);
+  --tone-green-150: var(--green-150);
+  --tone-green-200: var(--green-200);
+  --tone-green-300: var(--green-300);
+  --tone-green-400: var(--green-400);
+  --tone-green-500: var(--green-500);
+  --tone-green-600: var(--green-600);
+  --tone-green-700: var(--green-700);
+  --tone-green-800: var(--green-800);
+  --tone-green-850: var(--green-850);
+  --tone-green-900: var(--green-900);
+  --tone-green-950: var(--green-950);
+  --tone-green-999: var(--black);
+
+  --tone-blue-000: var(--white);
+  --tone-blue-050: var(--blue-050);
+  --tone-blue-100: var(--blue-100);
+  --tone-blue-150: var(--blue-150);
+  --tone-blue-200: var(--blue-200);
+  --tone-blue-300: var(--blue-300);
+  --tone-blue-400: var(--blue-400);
+  --tone-blue-500: var(--blue-500);
+  --tone-blue-600: var(--blue-600);
+  --tone-blue-700: var(--blue-700);
+  --tone-blue-800: var(--blue-800);
+  --tone-blue-850: var(--blue-850);
+  --tone-blue-900: var(--blue-900);
+  --tone-blue-950: var(--blue-950);
+  --tone-blue-999: var(--black);
+
+  --tone-red-000: var(--white);
+  --tone-red-050: var(--red-050);
+  --tone-red-100: var(--red-100);
+  --tone-red-150: var(--red-150);
+  --tone-red-200: var(--red-200);
+  --tone-red-300: var(--red-300);
+  --tone-red-400: var(--red-400);
+  --tone-red-500: var(--red-500);
+  --tone-red-600: var(--red-600);
+  --tone-red-700: var(--red-700);
+  --tone-red-800: var(--red-800);
+  --tone-red-850: var(--red-850);
+  --tone-red-900: var(--red-900);
+  --tone-red-950: var(--red-950);
+  --tone-red-999: var(--black);
+
+  --tone-orange-000: var(--white);
+  --tone-orange-050: var(--orange-050);
+  --tone-orange-100: var(--orange-100);
+  --tone-orange-150: var(--orange-150);
+  --tone-orange-200: var(--orange-200);
+  --tone-orange-300: var(--orange-300);
+  --tone-orange-400: var(--orange-400);
+  --tone-orange-500: var(--orange-500);
+  --tone-orange-600: var(--orange-600);
+  --tone-orange-700: var(--orange-700);
+  --tone-orange-800: var(--orange-800);
+  --tone-orange-850: var(--orange-850);
+  --tone-orange-900: var(--orange-900);
+  --tone-orange-950: var(--orange-950);
+  --tone-orange-999: var(--black);
+
+  --tone-yellow-000: var(--white);
+  --tone-yellow-050: var(--yellow-050);
+  --tone-yellow-100: var(--yellow-100);
+  --tone-yellow-150: var(--yellow-150);
+  --tone-yellow-200: var(--yellow-200);
+  --tone-yellow-300: var(--yellow-300);
+  --tone-yellow-400: var(--yellow-400);
+  --tone-yellow-500: var(--yellow-500);
+  --tone-yellow-600: var(--yellow-600);
+  --tone-yellow-700: var(--yellow-700);
+  --tone-yellow-800: var(--yellow-800);
+  --tone-yellow-850: var(--yellow-850);
+  --tone-yellow-900: var(--yellow-900);
+  --tone-yellow-950: var(--yellow-950);
+  --tone-yellow-999: var(--black);
+
+  --tone-transparent: var(--transparent);
+}
diff --git a/ui/packages/consul-ui/app/styles/base/color/vault/frame-placeholders.scss b/ui/packages/consul-ui/app/styles/base/color/vault/frame-placeholders.scss
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/ui/packages/consul-ui/app/styles/base/color/vault/index.scss b/ui/packages/consul-ui/app/styles/base/color/vault/index.scss
new file mode 100644
index 0000000000000..74aa4c7b113da
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/vault/index.scss
@@ -0,0 +1,6 @@
+@import '../lemon';
+@import './themes/light';
+@import './themes/dark';
+@import './themes/light-high-contrast';
+@import './themes/dark-high-contrast';
+@import './frame-placeholders';
diff --git a/ui/packages/consul-ui/app/styles/base/color/vault/themes/dark-high-contrast.scss b/ui/packages/consul-ui/app/styles/base/color/vault/themes/dark-high-contrast.scss
new file mode 100644
index 0000000000000..00bcce3c6cefb
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/vault/themes/dark-high-contrast.scss
@@ -0,0 +1,3 @@
+%theme-dark-high-contrast {
+  --tone-vault-500: var(--lemon-500);
+}
diff --git a/ui/packages/consul-ui/app/styles/base/color/vault/themes/dark.scss b/ui/packages/consul-ui/app/styles/base/color/vault/themes/dark.scss
new file mode 100644
index 0000000000000..d873db1590393
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/vault/themes/dark.scss
@@ -0,0 +1,3 @@
+%theme-dark {
+  --tone-vault-500: var(--lemon-500);
+}
diff --git a/ui/packages/consul-ui/app/styles/base/color/vault/themes/light-high-contrast.scss b/ui/packages/consul-ui/app/styles/base/color/vault/themes/light-high-contrast.scss
new file mode 100644
index 0000000000000..cac38c06a0492
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/vault/themes/light-high-contrast.scss
@@ -0,0 +1,3 @@
+%theme-light-high-contrast {
+  --tone-vault-500: var(--black);
+}
diff --git a/ui/packages/consul-ui/app/styles/base/color/vault/themes/light.scss b/ui/packages/consul-ui/app/styles/base/color/vault/themes/light.scss
new file mode 100644
index 0000000000000..669ed33f7e55a
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/color/vault/themes/light.scss
@@ -0,0 +1,3 @@
+%theme-light {
+  --tone-vault-500: var(--black);
+}
diff --git a/ui/packages/consul-ui/app/styles/base/component/index.scss b/ui/packages/consul-ui/app/styles/base/component/index.scss
index 3077240e435bd..821ce98dafad2 100644
--- a/ui/packages/consul-ui/app/styles/base/component/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/component/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* allows easy application of animation-name based composition */
 *, *::before, *::after {
   animation-play-state: paused;
diff --git a/ui/packages/consul-ui/app/styles/base/decoration/base-placeholders.scss b/ui/packages/consul-ui/app/styles/base/decoration/base-placeholders.scss
index 484c32fd368d3..8e64f496bdfc3 100644
--- a/ui/packages/consul-ui/app/styles/base/decoration/base-placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/decoration/base-placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %visually-hidden {
   position: absolute;
   overflow: hidden;
diff --git a/ui/packages/consul-ui/app/styles/base/decoration/base-variables.scss b/ui/packages/consul-ui/app/styles/base/decoration/base-variables.scss
index f8e942df358f6..d2ee83711ce5f 100644
--- a/ui/packages/consul-ui/app/styles/base/decoration/base-variables.scss
+++ b/ui/packages/consul-ui/app/styles/base/decoration/base-variables.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   /* worthwhile, or confusing ? */
   --decor-radius-000: 0;
@@ -18,4 +13,13 @@
   --decor-border-200: 2px solid;
   --decor-border-300: 3px solid;
   --decor-border-400: 4px solid;
+
+  /* box-shadowing*/
+  --decor-elevation-000: none;
+  --decor-elevation-100: 0 3px 2px rgb(var(--black) / 6%);
+  --decor-elevation-200: 0 2px 4px rgb(var(--black) / 10%);
+  --decor-elevation-300: 0 5px 1px -2px rgb(var(--black) / 12%);
+  --decor-elevation-400: 0 6px 8px -2px rgb(var(--black) / 5%), 0 8px 4px -4px rgb(var(--black) / 10%);
+  --decor-elevation-600: 0 12px 5px -7px rgb(var(--black) / 8%), 0 11px 10px -3px rgb(var(--black) / 10%);
+  --decor-elevation-800: 0 16px 6px -10px rgb(var(--black) / 6%), 0 16px 16px -4px rgb(var(--black) / 20%);
 }
diff --git a/ui/packages/consul-ui/app/styles/base/decoration/index.scss b/ui/packages/consul-ui/app/styles/base/decoration/index.scss
index 646b4f597b906..3fe0d277f01bf 100644
--- a/ui/packages/consul-ui/app/styles/base/decoration/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/decoration/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './base-variables';
 @import './base-placeholders';
diff --git a/ui/packages/consul-ui/app/styles/base/decoration/visually-hidden.css.js b/ui/packages/consul-ui/app/styles/base/decoration/visually-hidden.css.js
index 9e95bfa190dd7..7c0a511c396de 100644
--- a/ui/packages/consul-ui/app/styles/base/decoration/visually-hidden.css.js
+++ b/ui/packages/consul-ui/app/styles/base/decoration/visually-hidden.css.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (css) => {
   /*%visually-hidden {*/
   return css`
diff --git a/ui/packages/consul-ui/app/styles/base/icons/README.mdx b/ui/packages/consul-ui/app/styles/base/icons/README.mdx
index 9b7681b747f3f..4193e40fc3098 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/README.mdx
+++ b/ui/packages/consul-ui/app/styles/base/icons/README.mdx
@@ -44,7 +44,7 @@ selectors.
 ```css
 .selector::after {
   --icon-name: icon-alert-circle;
-  --icon-color: var(--token-color-surface-primary);
+  --icon-color: rgb(var(---white));
   content: '';
 }
 ```
@@ -56,9 +56,9 @@ icons in HTML using these CSS properties.
 <h2
   style={{style-map
     (array '--icon-name-start' 'icon-alert-circle')
-    (array '--icon-color-start' 'var(--token-color-consul-brand)')
+    (array '--icon-color-start' 'rgb(var(--tone-strawberry-500))')
     (array '--icon-name-end' 'icon-vault')
-    (array '--icon-color-end' 'var(--color-vault)')
+    (array '--icon-color-end' 'var(--color-vault-500)')
   }}
 >
   Header Name
@@ -105,7 +105,7 @@ also use `background-color`.
 ```css
 .selector::before {
   @extend %with-alert-circle-fill-mask, %as-pseudo;
-  color: var(--token-color-consul-brand);
+  color: rgb(var(--tone-strawberry-500));
 }
 ```
 
@@ -141,7 +141,7 @@ use `-mask`, use `-icon` instead:
   {{css-props (set this 'icons') prefix='icon-'}}
   class={{class-map (concat 'theme-' (or this.theme 'light'))}}
   style={{style-map
-    (array '--icon-color' (if (eq this.type 'monochrome') 'var(--token-color-hashicorp-brand)'))
+    (array '--icon-color' (if (eq this.type 'monochrome') 'rgb(var(--black))'))
     (array '--icon-size' (concat 'icon-' (or this.size '500')))
     (array '--icon-resolution' (if (gt this.size 500) '.5' '1'))
   }}
diff --git a/ui/packages/consul-ui/app/styles/base/icons/base-keyframes.css.js b/ui/packages/consul-ui/app/styles/base/icons/base-keyframes.css.js
index 3ee12dbddd9a4..20f61c4ca599b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/base-keyframes.css.js
+++ b/ui/packages/consul-ui/app/styles/base/icons/base-keyframes.css.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default (css) => css`
   *::before,
   *::after {
diff --git a/ui/packages/consul-ui/app/styles/base/icons/base-keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/base-keyframes.scss
index 00bc8b1c632ba..7827bb0d8207e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/base-keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/base-keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 *::before, *::after {
   display: inline-block;
   vertical-align: text-top;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/base-placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/base-placeholders.scss
index 5d01d2d8e110a..2e101b44a4819 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/base-placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/base-placeholders.scss
@@ -1,11 +1,14 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
+%theme-light {
+  --theme-dark-none: ;
+  --theme-light-none: initial;
+}
+%theme-dark {
+  --theme-dark-none: initial;
+  --theme-light-none: ;
+}
 %with-glyph-icon {
-  font-weight: var(--token-typography-font-weight-regular);
-  background-color: var(--token-color-surface-strong);
+  font-weight: var(--typo-weight-normal);
+  background-color: rgb(var(--tone-gray-100));
   visibility: visible;
   padding: 0 4px;
 }
diff --git a/ui/packages/consul-ui/app/styles/base/icons/debug.scss b/ui/packages/consul-ui/app/styles/base/icons/debug.scss
index 2e2833ddc3f19..5842a9bebf306 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/debug.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/debug.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 .debug-with-activity-16-mask-before::before,
 .debug-with-activity-16-icon-before::before,
 .debug-with-activity-16-mask-after::after,
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/activity/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/activity/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/activity/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/activity/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/activity/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/activity/keyframes.scss
index 074925d3a1c79..4a3c131b29eee 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/activity/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/activity/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-activity {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/activity/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/activity/placeholders.scss
index 353d2b53fb420..22d918ee1ac9e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/activity/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/activity/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-activity-icon {
   --icon-name: icon-activity;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/activity/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/activity/property-16.scss
index dce1097b80f32..1f689c9b4cf64 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/activity/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/activity/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-activity-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M6.016 1a.75.75 0 01.698.521l3.306 10.33 1.47-4.341A.75.75 0 0112.2 7H15a.75.75 0 010 1.5h-2.262l-2.028 5.99a.75.75 0 01-1.424-.011L5.952 4.06 4.504 8.008A.75.75 0 013.8 8.5H1A.75.75 0 111 7h2.276l2.02-5.508c.11-.301.4-.499.72-.492z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/activity/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/activity/property-24.scss
index 6f638c62f545a..b1f5745b832f1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/activity/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/activity/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-activity-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M9.003 2a.75.75 0 01.71.519l5.278 16.27 2.294-7.265A.75.75 0 0118 11h4a.75.75 0 010 1.5h-3.45l-2.835 8.976a.75.75 0 01-1.428.005L8.99 5.151l-2.278 6.836A.75.75 0 016 12.5H2A.75.75 0 012 11h3.46l2.828-8.487A.75.75 0 019.003 2z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/keyframes.scss
index 7df06b493020a..a56bf613e05db 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-alert-circle-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/placeholders.scss
index dd2358cb4436d..7e2dee74767a5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-alert-circle-fill-icon {
   --icon-name: icon-alert-circle-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/property-16.scss
index 8dbda2cc38136..c31082f2a42d4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alert-circle-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-4a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 018 4zm0 6a1 1 0 100 2h.007a1 1 0 100-2H8z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/property-24.scss
index 731ced512d114..9580d5ef58f0a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alert-circle-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm-.75 6.75a.75.75 0 011.5 0v4.5a.75.75 0 01-1.5 0v-4.5zM11 16a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-outline/index.scss
index af5c4324542b4..a963b0b952421 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../alert-circle/property-16';
         @import '../alert-circle/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-outline/keyframes.scss
index 03f54bfc67ac6..9dcc1b3debdd6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-alert-circle-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-outline/placeholders.scss
index 5f5e18a08b523..488160184c7f6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-alert-circle-outline-icon {
   --icon-name: icon-alert-circle-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/keyframes.scss
index 37de8fbcd1277..4b470d9fc73b5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-alert-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/placeholders.scss
index 1931b4b78234d..cff186261403a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-alert-circle-icon {
   --icon-name: icon-alert-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/property-16.scss
index a2c76cf4f912b..b0bf7ac0285c7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alert-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 4a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 018 4zM8 10a1 1 0 100 2h.007a1 1 0 100-2H8z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/property-24.scss
index 62c36b49f742c..e2698487aa482 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alert-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 7a.75.75 0 01.75.75v4.5a.75.75 0 01-1.5 0v-4.5A.75.75 0 0112 7zM12 15a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/keyframes.scss
index 79bbdb1a568ac..d0815f3961bea 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-alert-octagon-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/placeholders.scss
index 8e3908508b2f2..985987361f4e0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-alert-octagon-fill-icon {
   --icon-name: icon-alert-octagon-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/property-16.scss
index 10efe0035e384..c9f09fb6b7563 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alert-octagon-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.882.805A2.75 2.75 0 015.827 0h4.346c.73 0 1.429.29 1.945.805l3.076 3.077A2.75 2.75 0 0116 5.827v4.346c0 .73-.29 1.429-.806 1.945l-3.076 3.076a2.75 2.75 0 01-1.945.806H5.827a2.75 2.75 0 01-1.945-.806L.805 12.118A2.75 2.75 0 010 10.173V5.827c0-.73.29-1.429.805-1.945L3.882.805zM7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zm1.75-6.25a.75.75 0 00-1.5 0v3.5a.75.75 0 001.5 0v-3.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/property-24.scss
index 57fb6c803ce62..a75f4f74d8ab6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alert-octagon-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M8.585 1c-.73 0-1.429.29-1.945.805L1.805 6.64A2.75 2.75 0 001 8.585v6.83c0 .73.29 1.429.805 1.945l4.835 4.835A2.75 2.75 0 008.585 23h6.83c.73 0 1.429-.29 1.945-.805l4.835-4.835A2.75 2.75 0 0023 15.415v-6.83c0-.73-.29-1.429-.805-1.945L17.36 1.805A2.75 2.75 0 0015.415 1h-6.83zm2.665 6.75a.75.75 0 011.5 0v4.5a.75.75 0 01-1.5 0v-4.5zM11 16a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/keyframes.scss
index d83d3ffbf58ad..d4ff699907bb1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-alert-octagon {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/placeholders.scss
index 11096098fb8f2..63250a3c8269f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-alert-octagon-icon {
   --icon-name: icon-alert-octagon;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/property-16.scss
index 1a1dd2c665005..1ccfea0a49a33 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alert-octagon-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zM8.75 4.75a.75.75 0 00-1.5 0v3.5a.75.75 0 001.5 0v-3.5z"/><path fill-rule="evenodd" d="M3.882.805A2.75 2.75 0 015.827 0h4.346c.73 0 1.429.29 1.945.805l3.076 3.077A2.75 2.75 0 0116 5.827v4.346c0 .73-.29 1.429-.806 1.945l-3.076 3.076a2.75 2.75 0 01-1.945.806H5.827a2.75 2.75 0 01-1.945-.806L.805 12.118A2.75 2.75 0 010 10.173V5.827c0-.73.29-1.429.805-1.945L3.882.805zm1.945.695c-.332 0-.65.132-.884.366L1.866 4.943a1.25 1.25 0 00-.366.884v4.346c0 .332.132.65.366.884l3.077 3.077c.234.234.552.366.884.366h4.346c.332 0 .65-.132.884-.366l3.077-3.077a1.25 1.25 0 00.366-.884V5.827c0-.332-.132-.65-.366-.884l-3.077-3.077a1.25 1.25 0 00-.884-.366H5.827z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/property-24.scss
index 255763984f191..62e55da9cab13 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-octagon/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alert-octagon-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11 16a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1zM12.75 7.75a.75.75 0 00-1.5 0v4.5a.75.75 0 001.5 0v-4.5z"/><path fill-rule="evenodd" d="M6.64 1.805A2.75 2.75 0 018.585 1h6.83c.73 0 1.429.29 1.945.805l4.835 4.835A2.75 2.75 0 0123 8.585v6.83c0 .73-.29 1.429-.805 1.945l-4.835 4.835a2.75 2.75 0 01-1.945.805h-6.83a2.75 2.75 0 01-1.945-.805L1.805 17.36A2.75 2.75 0 011 15.415v-6.83c0-.73.29-1.429.805-1.945L6.64 1.805zm1.945.695c-.332 0-.65.132-.884.366L2.866 7.701a1.25 1.25 0 00-.366.884v6.83c0 .332.132.65.366.884l4.835 4.835c.234.234.552.366.884.366h6.83c.332 0 .65-.132.884-.366l4.835-4.835a1.25 1.25 0 00.366-.884v-6.83c0-.332-.132-.65-.366-.884l-4.835-4.835a1.25 1.25 0 00-.884-.366h-6.83z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/keyframes.scss
index f905f1de78991..0481cff19f8c9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-alert-triangle-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/placeholders.scss
index 4c1999b027a44..d930c7c936978 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-alert-triangle-fill-icon {
   --icon-name: icon-alert-triangle-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/property-16.scss
index 2728564929838..279744f713ade 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alert-triangle-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 1a2.143 2.143 0 00-1.827 1.024l-5.88 9.768a2.125 2.125 0 00.762 2.915c.322.188.687.289 1.06.293h11.77a2.143 2.143 0 001.834-1.074 2.126 2.126 0 00-.006-2.124L9.829 2.028A2.149 2.149 0 008 1zM7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zm1.75-5.25a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/property-24.scss
index 5df243045bd88..027ef17bc54ef 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alert-triangle-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 2c-.472 0-.934.127-1.342.366a2.75 2.75 0 00-.984.99L1.363 17.81l-.006.01a2.86 2.86 0 00-.007 2.758c.23.423.566.778.975 1.03.41.25.877.386 1.357.392h16.637c.479-.006.947-.142 1.356-.393.41-.25.744-.606.976-1.029a2.86 2.86 0 00-.008-2.758L14.328 3.36l-.002-.004a2.75 2.75 0 00-.984-.99A2.651 2.651 0 0012 2zm-.75 6.75a.75.75 0 011.5 0v4.5a.75.75 0 01-1.5 0v-4.5zM11 17a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/keyframes.scss
index ba6b56df51085..25ae4855330d3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-alert-triangle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/placeholders.scss
index effdaa4aa79fd..b4672e87eb2c5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-alert-triangle-icon {
   --icon-name: icon-alert-triangle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/property-16.scss
index 6f9133117b676..10b72c4082c70 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alert-triangle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zM8.75 5.75a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z"/><path fill-rule="evenodd" d="M6.953 1.273a2.143 2.143 0 012.874.751l.002.004 5.884 9.774a2.126 2.126 0 01-.768 2.905c-.322.188-.687.289-1.06.293H2.115a2.143 2.143 0 01-1.833-1.074 2.125 2.125 0 01.006-2.124l.006-.01 5.878-9.764.002-.004c.191-.313.46-.571.78-.75zm.502 1.53l-.001.002-5.872 9.754a.626.626 0 00.231.853.644.644 0 00.314.088h11.746a.643.643 0 00.544-.32.626.626 0 000-.62l-5.87-9.755-.002-.001A.635.635 0 008 2.5a.643.643 0 00-.545.304z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/property-24.scss
index 1823b18480a81..9ff79e1002c27 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alert-triangle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alert-triangle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11 17a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1zM12.75 8.75a.75.75 0 00-1.5 0v4.5a.75.75 0 001.5 0v-4.5z"/><path fill-rule="evenodd" d="M10.658 2.366a2.651 2.651 0 012.684 0c.407.239.745.581.984.99l.002.004 8.315 14.46a2.86 2.86 0 01.008 2.758 2.757 2.757 0 01-.976 1.03c-.41.25-.877.386-1.357.392H3.682a2.653 2.653 0 01-1.357-.393 2.757 2.757 0 01-.975-1.029 2.86 2.86 0 01.007-2.758l.006-.01 8.31-14.45.001-.004a2.75 2.75 0 01.984-.99zm.313 1.744v.001L2.665 18.552a1.36 1.36 0 000 1.306c.108.198.262.36.443.47.18.11.382.169.586.172h16.61c.204-.003.406-.061.586-.172.181-.11.335-.272.444-.47a1.361 1.361 0 00-.001-1.306L13.03 4.112l-.001-.002a1.25 1.25 0 00-.446-.45 1.151 1.151 0 00-1.166 0 1.25 1.25 0 00-.446.45z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/keyframes.scss
index 8bc2692b71224..d6806b557b8b3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-alibaba-color {
   100% {
     background-image: var(--icon-alibaba-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/placeholders.scss
index 3d1c44740a240..a17b1457404a4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-alibaba-color-icon {
   --icon-name: icon-alibaba-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/property-16.scss
index aea61c94d75fc..20dfffbf2cd95 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alibaba-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23ED6B1E"><path d="M10.676 7.373H5.338v1.2h5.338v-1.2z"/><path d="M13.338 3H9.81l.852 1.213L13.244 5c.48.147.786.6.773 1.067v3.866c0 .48-.307.92-.772 1.067l-2.57.787L9.81 13h3.528C14.815 13 16 11.8 16 10.333V5.667C16.013 4.2 14.815 3 13.338 3zM2.662 3H6.19l-.852 1.213L2.768 5c-.478.147-.785.6-.771 1.067v3.866c0 .48.306.92.772 1.067l2.569.787L6.19 13H2.662A2.672 2.672 0 010 10.333V5.667A2.672 2.672 0 012.662 3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/property-24.scss
index 5d5ef033a3fa9..e960532eb91d9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alibaba-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23ED6B1E"><path d="M15.21 11.248H8.805v1.44h6.405v-1.44z"/><path d="M18.405 6h-4.233l1.022 1.456 3.1.944c.574.176.942.72.926 1.28v4.64a1.34 1.34 0 01-.927 1.28l-3.082.944L14.171 18h4.233a3.196 3.196 0 003.195-3.2V9.2c.016-1.76-1.422-3.2-3.195-3.2zM5.595 6h4.232L8.805 7.456 5.722 8.4c-.575.176-.942.72-.926 1.28v4.64c0 .576.367 1.104.926 1.28l3.083.944L9.827 18H5.595A3.207 3.207 0 012.4 14.8V9.2C2.4 7.44 3.838 6 5.595 6z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/index.scss
index 2051613154e67..273941a41a56a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../alibaba-color/property-16';
         @import '../alibaba-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/keyframes.scss
index 68525c080d2dd..3da0985c4842d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-alibaba {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/placeholders.scss
index 65007a25e70fd..e5ee4e0beed6e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-alibaba-icon {
   --icon-name: icon-alibaba;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/property-16.scss
index 895dd9dc835b5..44de5affac308 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alibaba-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M10.676 7.373H5.338v1.2h5.338v-1.2z"/><path d="M13.338 3H9.81l.852 1.213L13.244 5c.48.147.786.6.773 1.067v3.866c0 .48-.307.92-.772 1.067l-2.57.787L9.81 13h3.528C14.815 13 16 11.8 16 10.333V5.667C16.013 4.2 14.815 3 13.338 3zM2.662 3H6.19l-.852 1.213L2.768 5c-.478.147-.785.6-.771 1.067v3.866c0 .48.306.92.772 1.067l2.569.787L6.19 13H2.662A2.672 2.672 0 010 10.333V5.667A2.672 2.672 0 012.662 3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/property-24.scss
index 3173067c11c36..7234eb99bdeb0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/alibaba/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-alibaba-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M10.676 7.373H5.338v1.2h5.338v-1.2z"/><path d="M13.338 3H9.81l.852 1.213L13.244 5c.48.147.786.6.773 1.067v3.866c0 .48-.307.92-.772 1.067l-2.57.787L9.81 13h3.528C14.815 13 16 11.8 16 10.333V5.667C16.013 4.2 14.815 3 13.338 3zM2.662 3H6.19l-.852 1.213L2.768 5c-.478.147-.785.6-.771 1.067v3.866c0 .48.306.92.772 1.067l2.569.787L6.19 13H2.662A2.672 2.672 0 010 10.333V5.667A2.672 2.672 0 012.662 3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/keyframes.scss
index edc7d9618a02c..141af67756287 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-align-center {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/placeholders.scss
index b38872d54289c..8a76bfb670bb9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-align-center-icon {
   --icon-name: icon-align-center;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/property-16.scss
index 1e24871c26495..0a574f2c1ee79 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-align-center-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.75 3a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75zM3.75 6a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5zM1 9.75A.75.75 0 011.75 9h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 9.75zM3.75 12a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/property-24.scss
index 9ead0327c9730..b86305eac661a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-center/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-align-center-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M2.75 5a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75zM5.75 9a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H5.75zM2 13.75a.75.75 0 01.75-.75h18.5a.75.75 0 010 1.5H2.75a.75.75 0 01-.75-.75zM5.75 17a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H5.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/keyframes.scss
index a5977db7a0859..ab218bd6713cd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-align-justify {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/placeholders.scss
index a7dea6c414b12..f8ba5d41fe07c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-align-justify-icon {
   --icon-name: icon-align-justify;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/property-16.scss
index b89a196023f7e..7d89e8d890ba9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-align-justify-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.75 3a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75zM1.75 6a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75zM1 9.75A.75.75 0 011.75 9h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 9.75zM1.75 12a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/property-24.scss
index adfb20f2a12c9..181c47211b345 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-justify/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-align-justify-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M2.75 5a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75zM2.75 9a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75zM2 13.75a.75.75 0 01.75-.75h18.5a.75.75 0 010 1.5H2.75a.75.75 0 01-.75-.75zM2.75 17a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/keyframes.scss
index 777c8c5e1b8fa..6242c03bace27 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-align-left {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/placeholders.scss
index 482de99da5005..207209857ab4d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-align-left-icon {
   --icon-name: icon-align-left;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/property-16.scss
index 7f53fb6a68822..0f53c2474c383 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-align-left-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.75 3a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75zM1.75 6a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5zM1 9.75A.75.75 0 011.75 9h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 9.75zM1.75 12a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/property-24.scss
index ea94ac1dff3ae..2038936a92f4a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-left/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-align-left-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M2.75 5a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75zM2.75 9a.75.75 0 000 1.5h14.5a.75.75 0 000-1.5H2.75zM2 13.75a.75.75 0 01.75-.75h18.5a.75.75 0 010 1.5H2.75a.75.75 0 01-.75-.75zM2.75 17a.75.75 0 000 1.5h14.5a.75.75 0 000-1.5H2.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/keyframes.scss
index d51ac3b282344..cce21f97b3bcf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-align-right {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/placeholders.scss
index 7fa5b875f6936..20491a9b21a54 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-align-right-icon {
   --icon-name: icon-align-right;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/property-16.scss
index 9ace1f2418a2a..4982305a13269 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-align-right-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.75 3a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75zM4.75 6a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5zM1 9.75A.75.75 0 011.75 9h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 9.75zM4.75 12a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/property-24.scss
index 4de0b2468e46f..e122ceaeedad7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/align-right/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-align-right-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M2.75 5a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75zM6.75 9a.75.75 0 000 1.5h14.5a.75.75 0 000-1.5H6.75zM2 13.75a.75.75 0 01.75-.75h18.5a.75.75 0 010 1.5H2.75a.75.75 0 01-.75-.75zM6.75 17a.75.75 0 000 1.5h14.5a.75.75 0 000-1.5H6.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/keyframes.scss
index 91c9b2851b227..acdd2fc1cfec6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-amazon-eks-color {
   100% {
     background-image: var(--icon-amazon-eks-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/placeholders.scss
index bd9915d1c85bb..0519daccfeb27 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-amazon-eks-color-icon {
   --icon-name: icon-amazon-eks-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/property-16.scss
index 17ff1beb921eb..180700adda061 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-amazon-eks-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="url(%23amazon-eks-color-16__paint0_linear_879_141)" fill-rule="evenodd" d="M6.381 10.148h.897V8.121l1.837 2.027h1.164L7.997 7.642l2.169-2.195H8.963L7.278 7.146V5.447h-.897v4.701z" clip-rule="evenodd"/><path fill="url(%23amazon-eks-color-16__paint1_linear_879_141)" d="M8.532 3.803l3.186 1.81a.173.173 0 01.088.149v3.62c0 .06.033.118.088.149l2.842 1.615a.176.176 0 00.264-.15V3.947a.173.173 0 00-.088-.15L8.708.274a.176.176 0 00-.264.15v3.23c0 .062.034.119.088.15z"/><path fill="url(%23amazon-eks-color-16__paint2_linear_879_141)" d="M11.273 10.288l-3.185 1.81a.178.178 0 01-.176 0l-3.63-2.062a.173.173 0 01-.088-.15V5.762c0-.062.034-.119.088-.15l3.186-1.81a.172.172 0 00.088-.15V.424a.176.176 0 00-.264-.15L1.088 3.798a.173.173 0 00-.088.15V11.7c0 .061.033.118.088.15l6.824 3.876c.054.03.122.03.176 0l6.204-3.524a.172.172 0 000-.3l-2.843-1.615a.178.178 0 00-.176 0z"/><defs><linearGradient id="amazon-eks-color-16__paint0_linear_879_141" x1="10.691" x2="8.521" y1="9.879" y2="4.634" gradientUnits="userSpaceOnUse"><stop stop-color="%23426DDB"/><stop offset="1" stop-color="%233B4BDB"/></linearGradient><linearGradient id="amazon-eks-color-16__paint1_linear_879_141" x1="15.693" x2="9.546" y1="10.544" y2="-.213" gradientUnits="userSpaceOnUse"><stop stop-color="%23426DDB"/><stop offset="1" stop-color="%233B4BDB"/></linearGradient><linearGradient id="amazon-eks-color-16__paint2_linear_879_141" x1="9.433" x2="2.732" y1="14.904" y2="2.88" gradientUnits="userSpaceOnUse"><stop stop-color="%232775FF"/><stop offset="1" stop-color="%23188DFF"/></linearGradient></defs></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/property-24.scss
index dde776e554843..7a5030427a5b7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-amazon-eks-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="url(%23amazon-eks-color-24__paint0_linear_879_136)" d="M9.866 8.473h.924v2.725l2.661-2.725h1.22l-2.92 3.002 3.105 3.465h-1.183l-2.883-3.233v3.233h-.924V8.473z"/><path fill="url(%23amazon-eks-color-24__paint1_linear_879_136)" d="M12.76 5.907l4.551 2.627a.252.252 0 01.126.217v5.254c0 .09.048.172.125.217l4.061 2.344A.251.251 0 0022 16.35V6.117a.251.251 0 00-.125-.217L13.012.784a.251.251 0 00-.377.217V5.69c0 .09.048.172.126.217z"/><path fill="url(%23amazon-eks-color-24__paint2_linear_879_136)" d="M16.676 15.322l-4.55 2.626a.25.25 0 01-.252 0L6.69 14.955a.252.252 0 01-.126-.217V8.75c0-.09.048-.172.126-.217l4.55-2.627a.25.25 0 00.126-.217V1a.251.251 0 00-.377-.217L2.125 5.9A.251.251 0 002 6.117v11.255c0 .09.048.172.125.217l9.75 5.627a.25.25 0 00.25 0l8.863-5.115a.251.251 0 000-.435l-4.06-2.344a.25.25 0 00-.252 0z"/><defs><linearGradient id="amazon-eks-color-24__paint0_linear_879_136" x1="15.383" x2="12.246" y1="14.57" y2="7.514" gradientUnits="userSpaceOnUse"><stop stop-color="%23426DDB"/><stop offset="1" stop-color="%233B4BDB"/></linearGradient><linearGradient id="amazon-eks-color-24__paint1_linear_879_136" x1="22.99" x2="13.995" y1="15.694" y2=".202" gradientUnits="userSpaceOnUse"><stop stop-color="%23426DDB"/><stop offset="1" stop-color="%233B4BDB"/></linearGradient><linearGradient id="amazon-eks-color-24__paint2_linear_879_136" x1="14.046" x2="4.239" y1="22.021" y2="4.702" gradientUnits="userSpaceOnUse"><stop stop-color="%232775FF"/><stop offset="1" stop-color="%23188DFF"/></linearGradient></defs></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/index.scss
index 92dad310a6e84..6e79aade9a2c0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../amazon-eks-color/property-16';
         @import '../amazon-eks-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/keyframes.scss
index 1ee88e61dc0e1..f7d1d597bf4d6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-amazon-eks {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/placeholders.scss
index 0858d1d4e2027..3e75be00b0e16 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-amazon-eks-icon {
   --icon-name: icon-amazon-eks;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/property-16.scss
index 5dc2502d09b9c..769cdd3af80fa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-amazon-eks-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8.088 12.098l3.185-1.81a.178.178 0 01.176 0l2.843 1.615a.172.172 0 010 .3l-6.204 3.524a.178.178 0 01-.176 0L1.088 11.85A.173.173 0 011 11.7V3.947c0-.061.033-.118.088-.15L7.292.274a.176.176 0 01.264.15v3.23a.172.172 0 01-.088.15l-3.186 1.81a.173.173 0 00-.088.149v4.124c0 .062.034.119.088.15l3.63 2.062c.054.03.122.03.176 0z"/><path d="M8.532 3.803l3.186 1.81a.173.173 0 01.088.149v3.62c0 .06.033.118.088.149l2.842 1.615a.176.176 0 00.264-.15V3.947a.173.173 0 00-.088-.15L8.708.274a.176.176 0 00-.264.15v3.23c0 .062.034.119.088.15z"/><path d="M6.381 10.148h.897V8.121l1.837 2.027h1.164L7.997 7.642l2.168-2.195H8.963L7.278 7.146V5.447h-.897v4.701z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/property-24.scss
index e418a9fc0a323..03ffc21b816ef 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/amazon-eks/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-amazon-eks-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8.088 12.098l3.185-1.81a.178.178 0 01.176 0l2.843 1.615a.172.172 0 010 .3l-6.204 3.524a.178.178 0 01-.176 0L1.088 11.85A.173.173 0 011 11.7V3.947c0-.061.033-.118.088-.15L7.292.274a.176.176 0 01.264.15v3.23a.172.172 0 01-.088.15l-3.186 1.81a.173.173 0 00-.088.149v4.124c0 .062.034.119.088.15l3.63 2.062c.054.03.122.03.176 0z"/><path d="M8.532 3.803l3.186 1.81a.173.173 0 01.088.149v3.62c0 .06.033.118.088.149l2.842 1.615a.176.176 0 00.264-.15V3.947a.173.173 0 00-.088-.15L8.708.274a.176.176 0 00-.264.15v3.23c0 .062.034.119.088.15z"/><path d="M6.381 10.148h.897V8.121l1.837 2.027h1.164L7.997 7.642l2.168-2.195H8.963L7.278 7.146V5.447h-.897v4.701z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/keyframes.scss
index c79789effac66..97bcfe8b0d43e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-apple-color {
   100% {
     background-image: var(--icon-apple-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/placeholders.scss
index 0ae9f94359562..5571b8471a1c8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-apple-color-icon {
   --icon-name: icon-apple-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/property-16.scss
index 524052bd7dc87..877e851c290b3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-apple-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M10.167 3.242c.435-.523.742-1.24.742-1.958 0-.105-.008-.202-.03-.284-.704.03-1.55.47-2.06 1.069-.397.448-.772 1.173-.772 1.891 0 .112.023.217.03.254.045.008.12.015.188.015.636 0 1.43-.419 1.902-.987zm.495 1.144c-1.057 0-1.918.643-2.465.643-.591 0-1.355-.606-2.284-.606C4.168 4.423 2.4 5.866 2.4 8.58c0 1.697.652 3.49 1.46 4.642C4.557 14.193 5.164 15 6.04 15c.869 0 1.251-.575 2.33-.575 1.093 0 1.333.56 2.292.56.95 0 1.587-.867 2.18-1.727.673-.986.95-1.943.958-1.988-.053-.015-1.873-.755-1.873-2.833 0-1.794 1.431-2.6 1.513-2.66-.943-1.354-2.381-1.391-2.778-1.391z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/property-24.scss
index 944b67bdcbd8c..37436ded7a7e2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/apple-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-apple-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M15.073 5.203c.62-.747 1.057-1.772 1.057-2.797 0-.15-.01-.289-.042-.406-1.004.043-2.21.673-2.937 1.527-.566.64-1.1 1.676-1.1 2.702 0 .16.032.31.043.363.064.01.17.02.267.02.908 0 2.04-.597 2.712-1.409zm.705 1.634c-1.506 0-2.734.918-3.513.918-.844 0-1.933-.864-3.257-.864C6.52 6.89 4 8.95 4 12.828c0 2.424.929 4.986 2.082 6.63C7.075 20.848 7.94 22 9.19 22c1.238 0 1.783-.822 3.32-.822 1.56 0 1.901.8 3.268.8 1.356 0 2.264-1.238 3.107-2.466.961-1.41 1.356-2.776 1.367-2.84-.075-.022-2.67-1.079-2.67-4.047 0-2.563 2.04-3.716 2.157-3.802-1.345-1.932-3.395-1.986-3.961-1.986z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/apple/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/apple/index.scss
index e55c818644a0a..44e742484413d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/apple/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/apple/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../apple-color/property-16';
         @import '../apple-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/apple/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/apple/keyframes.scss
index 94f7cd9dd9385..21c929f01d7c7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/apple/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/apple/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-apple {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/apple/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/apple/placeholders.scss
index 996fdebe1cc83..f20003f851666 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/apple/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/apple/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-apple-icon {
   --icon-name: icon-apple;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/apple/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/apple/property-16.scss
index 993d6ed379069..2972ce9ca0e93 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/apple/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/apple/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-apple-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M10.167 3.242c.435-.523.742-1.24.742-1.958 0-.105-.008-.202-.03-.284-.704.03-1.55.47-2.06 1.069-.397.448-.772 1.173-.772 1.891 0 .112.023.217.03.254.045.008.12.015.188.015.636 0 1.43-.419 1.902-.987zm.495 1.144c-1.057 0-1.918.643-2.465.643-.591 0-1.355-.606-2.284-.606C4.168 4.423 2.4 5.866 2.4 8.58c0 1.697.652 3.491 1.46 4.642C4.557 14.193 5.164 15 6.04 15c.869 0 1.251-.575 2.33-.575 1.093 0 1.333.56 2.292.56.95 0 1.587-.867 2.18-1.727.673-.986.95-1.943.958-1.988-.053-.015-1.873-.755-1.873-2.833 0-1.794 1.431-2.6 1.513-2.66-.943-1.354-2.381-1.391-2.778-1.391z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/apple/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/apple/property-24.scss
index 8c8141c22e72b..43d83405b4f11 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/apple/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/apple/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-apple-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M10.167 3.242c.435-.523.742-1.24.742-1.958 0-.105-.008-.202-.03-.284-.704.03-1.55.47-2.06 1.069-.397.448-.772 1.173-.772 1.891 0 .112.023.217.03.254.045.008.12.015.188.015.636 0 1.43-.419 1.902-.987zm.495 1.144c-1.057 0-1.918.643-2.465.643-.591 0-1.355-.606-2.284-.606C4.168 4.423 2.4 5.866 2.4 8.58c0 1.697.652 3.491 1.46 4.642C4.557 14.193 5.164 15 6.04 15c.869 0 1.251-.575 2.33-.575 1.093 0 1.333.56 2.292.56.95 0 1.587-.867 2.18-1.727.673-.986.95-1.943.958-1.988-.053-.015-1.873-.755-1.873-2.833 0-1.794 1.431-2.6 1.513-2.66-.943-1.354-2.381-1.391-2.778-1.391z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/archive/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/archive/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/archive/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/archive/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/archive/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/archive/keyframes.scss
index 95098f8503cd7..7d9a5dd057856 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/archive/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/archive/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-archive {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/archive/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/archive/placeholders.scss
index 0c834ef06833e..369b753d4a939 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/archive/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/archive/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-archive-icon {
   --icon-name: icon-archive;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/archive/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/archive/property-16.scss
index 06a1ce159f3be..2ff75b256da43 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/archive/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/archive/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-archive-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.75 8a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5z"/><path fill-rule="evenodd" d="M0 2.75C0 1.784.784 1 1.75 1h12.5c.966 0 1.75.784 1.75 1.75v1.5c0 .698-.409 1.3-1 1.582v6.918A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75V5.832A1.75 1.75 0 010 4.25v-1.5zm13.5 10V6h-11v6.75c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75zm1-8.5a.25.25 0 01-.25.25H1.75a.25.25 0 01-.25-.25v-1.5a.25.25 0 01.25-.25h12.5a.25.25 0 01.25.25v1.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/archive/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/archive/property-24.scss
index 35675791ffa6e..5bc3aa6c23ab1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/archive/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/archive/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-archive-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M9.75 11a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5z"/><path fill-rule="evenodd" d="M1 4.25A2.25 2.25 0 013.25 2h17.5A2.25 2.25 0 0123 4.25v1.5c0 .78-.397 1.467-1 1.871V19.25A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V7.621A2.248 2.248 0 011 5.75v-1.5zM3.5 8h17v11.25c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25V8zm-.25-4.5a.75.75 0 00-.75.75v1.5c0 .414.336.75.75.75h17.5a.75.75 0 00.75-.75v-1.5a.75.75 0 00-.75-.75H3.25z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/keyframes.scss
index 4d5495cb0b111..276325e0b595c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-arrow-down-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/placeholders.scss
index 680342cd98dc3..f15373c44d93f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-arrow-down-circle-icon {
   --icon-name: icon-arrow-down-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/property-16.scss
index f36a7adf07436..495522b58ecd4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-down-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/><path d="M5.755 8.195a.75.75 0 00-1.01 1.11l2.75 2.5a.748.748 0 001.01 0l2.75-2.5a.75.75 0 10-1.01-1.11L8.75 9.555V4.75a.75.75 0 00-1.5 0v4.805l-1.495-1.36z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/property-24.scss
index 15164b0140571..28ae582660210 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-down-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 6a.75.75 0 01.75.75v8.614l2.955-3.129a.75.75 0 011.09 1.03l-4.25 4.5a.541.541 0 01-.068.064.747.747 0 01-.465.17L12 18h-.012a.748.748 0 01-.535-.237l-4.248-4.498a.75.75 0 011.09-1.03l2.955 3.129V6.75A.75.75 0 0112 6z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/keyframes.scss
index 010b3d572ff95..627d4a8b40afd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-arrow-down-left {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/placeholders.scss
index f16d564e0346b..e9e2c73fcc657 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-arrow-down-left-icon {
   --icon-name: icon-arrow-down-left;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/property-16.scss
index 57cb58bd63ca8..0c18ddd2c90bd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-down-left-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M12.78 4.28a.75.75 0 00-1.06-1.06L4.5 10.44V6.75a.75.75 0 00-1.5 0v5.5a.748.748 0 00.75.75h5.5a.75.75 0 000-1.5H5.56l7.22-7.22z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/property-24.scss
index 08dfc0fa99280..22ea7f7c5b220 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-left/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-down-left-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M18.78 6.28a.75.75 0 00-1.06-1.06L6.5 16.44V8.75a.75.75 0 00-1.5 0v9.5a.748.748 0 00.218.529l.002.001.001.002A.748.748 0 005.75 19h9.5a.75.75 0 000-1.5H7.56L18.78 6.28z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/keyframes.scss
index ad42f83c97f8b..8813ba3b577a4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-arrow-down-right {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/placeholders.scss
index cd5b824e97ae2..1d3b5dd7cc9c5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-arrow-down-right-icon {
   --icon-name: icon-arrow-down-right;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/property-16.scss
index 805f53e04858b..099d6a7fd8cc1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-down-right-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M3.22 4.28a.75.75 0 011.06-1.06l7.22 7.22V6.75a.75.75 0 011.5 0v5.5a.747.747 0 01-.75.75h-5.5a.75.75 0 010-1.5h3.69L3.22 4.28z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/property-24.scss
index 51336e9e8df22..5acf913ac447b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down-right/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-down-right-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M5.22 7.28a.75.75 0 011.06-1.06L17.5 17.44V9.75a.75.75 0 011.5 0v9.5a.747.747 0 01-.75.75h-9.5a.75.75 0 010-1.5h7.69L5.22 7.28z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/keyframes.scss
index 1e25289d07e17..315dd4ae1f67b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-arrow-down {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/placeholders.scss
index d2b8aa62a9c2a..18c88f7209fac 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-arrow-down-icon {
   --icon-name: icon-arrow-down;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/property-16.scss
index 2e71c1bb295d8..88097c7cd3837 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-down-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8.5 2.75a.75.75 0 00-1.5 0v8.614L4.045 8.235a.75.75 0 00-1.09 1.03l4.248 4.498a.862.862 0 00.025.026.747.747 0 00.51.21L7.75 14h.012a.747.747 0 00.533-.235l4.25-4.5a.75.75 0 00-1.09-1.03L8.5 11.364V2.75z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/property-24.scss
index 4429d66fb30bd..3055692ce0bca 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-down/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-down-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M12.5 3.75a.75.75 0 00-1.5 0v14.645l-5.96-6.166a.75.75 0 00-1.08 1.042l7.25 7.5a.75.75 0 001.08 0l7.25-7.5a.75.75 0 10-1.08-1.042l-5.96 6.166V3.75z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/keyframes.scss
index f6361c4e96a6c..1737b01964e61 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-arrow-left-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/placeholders.scss
index f5b6ca5d02723..669ec363c4603 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-arrow-left-circle-icon {
   --icon-name: icon-arrow-left-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/property-16.scss
index b5d08eb3ecf7b..79146ff1f99ab 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-left-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.755 4.695a.75.75 0 01.05 1.06L6.445 7.25h4.805a.75.75 0 010 1.5H6.445l1.36 1.495a.75.75 0 01-1.11 1.01l-2.499-2.75A.747.747 0 014 8.003v-.004c0-.195.075-.372.197-.505l2.498-2.748a.75.75 0 011.06-.05z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/property-24.scss
index 9d4c4b16ae8b5..a86e4a4685e64 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-left-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.636 11.25l3.129-2.955a.75.75 0 00-1.03-1.09l-4.498 4.248a.748.748 0 00-.007 1.088M6.236 12.546l4.499 4.25a.75.75 0 001.03-1.091L8.636 12.75h8.614a.75.75 0 000-1.5H8.636"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/keyframes.scss
index 902828c38d735..f1e214b33cea6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-arrow-left {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/placeholders.scss
index 2b0cf709d4753..3d0050397f058 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-arrow-left-icon {
   --icon-name: icon-arrow-left;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/property-16.scss
index fcd0cb23a8b95..2deb9ffc803e2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-left-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M7.765 4.045a.75.75 0 10-1.03-1.09L2.237 7.203a.748.748 0 00-.001 1.093l4.499 4.25a.75.75 0 001.03-1.091L4.636 8.5h8.614a.75.75 0 000-1.5H4.636l3.129-2.955z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/property-24.scss
index 1b9b7c0d09879..9c8953d8039b9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-left/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-left-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M11.771 5.04a.75.75 0 00-1.042-1.08l-7.5 7.25a.75.75 0 000 1.08l7.5 7.25a.75.75 0 101.042-1.08L5.605 12.5H20.25a.75.75 0 000-1.5H5.605l6.166-5.96z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/keyframes.scss
index fb6d8b938dc45..07598740a55a1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-arrow-right-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/placeholders.scss
index 510f507f7a4d9..fa174ffa6f62f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-arrow-right-circle-icon {
   --icon-name: icon-arrow-right-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/property-16.scss
index 6d20469ee4594..46fa970b4d49b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-right-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8.245 4.695a.75.75 0 00-.05 1.06l1.36 1.495H4.75a.75.75 0 000 1.5h4.805l-1.36 1.495a.75.75 0 001.11 1.01l2.5-2.75a.75.75 0 000-1.01l-2.5-2.75a.75.75 0 00-1.06-.05z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/property-24.scss
index bebc2f5e85359..8ff08392f34c0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-right-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M6 12a.75.75 0 01.75-.75h8.614l-3.129-2.955a.75.75 0 011.03-1.09l4.5 4.25a.75.75 0 010 1.09l-4.5 4.25a.75.75 0 01-1.03-1.09l3.129-2.955H6.75A.75.75 0 016 12z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/keyframes.scss
index bbc7a11c134ce..cf9ca1ef50a7a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-arrow-right {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/placeholders.scss
index 88adae8043353..6acc5f41a9350 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-arrow-right-icon {
   --icon-name: icon-arrow-right;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/property-16.scss
index 8ef46620930fd..566239898a889 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-right-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8.235 4.045a.75.75 0 111.03-1.09l4.5 4.25a.75.75 0 010 1.09l-4.5 4.25a.75.75 0 01-1.03-1.09L11.364 8.5H2.75a.75.75 0 010-1.5h8.614L8.235 4.045z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/property-24.scss
index d9b9335b9e09a..064daa1a90908 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-right/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-right-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M12.229 5.04a.75.75 0 011.042-1.08l7.5 7.25a.75.75 0 010 1.08l-7.5 7.25a.75.75 0 11-1.042-1.08l6.166-5.96H3.75a.75.75 0 010-1.5h14.645l-6.166-5.96z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/keyframes.scss
index 6d84ba1670247..1a69c754a1cde 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-arrow-up-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/placeholders.scss
index b4f5359ccf95a..2f01389520d88 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-arrow-up-circle-icon {
   --icon-name: icon-arrow-up-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/property-16.scss
index 9fd862889387a..f1976b8251843 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-up-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.695 7.755a.75.75 0 001.06.05l1.495-1.36v4.805a.75.75 0 001.5 0V6.445l1.495 1.36a.75.75 0 001.01-1.11l-2.75-2.5a.75.75 0 00-1.01 0l-2.75 2.5a.75.75 0 00-.05 1.06z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/property-24.scss
index f5aed4d76d830..b44ffd22087df 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-up-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12.75 8.636l2.955 3.129a.75.75 0 001.09-1.03l-4.25-4.5a.75.75 0 00-1.09 0l-4.25 4.5a.75.75 0 001.09 1.03l2.955-3.129v8.614a.75.75 0 001.5 0V8.636z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/keyframes.scss
index 8f93cbe52b87c..bfd608bb21892 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-arrow-up-left {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/placeholders.scss
index a22d049e1f312..0573bc8e8d098 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-arrow-up-left-icon {
   --icon-name: icon-arrow-up-left;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/property-16.scss
index 67e30b276fa97..f579464accf33 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-up-left-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M3.057 3.463A.748.748 0 013.75 3h5.5a.75.75 0 010 1.5H5.56l7.22 7.22a.75.75 0 11-1.06 1.06L4.5 5.56v3.69a.75.75 0 01-1.5 0v-5.5c0-.102.02-.199.057-.287z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/property-24.scss
index ea769da9c7200..e10c56c06606a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-left/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-up-left-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M6.5 15.25a.75.75 0 01-1.5 0v-9.5c0-.206.083-.393.218-.529l.002-.001.001-.002A.748.748 0 015.75 5h9.5a.75.75 0 010 1.5H7.56l11.22 11.22a.75.75 0 11-1.06 1.06L6.5 7.56v7.69z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/keyframes.scss
index 17d3439af3a09..9465de0bcd5bb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-arrow-up-right {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/placeholders.scss
index c9102a076caec..1c7af1b1219e9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-arrow-up-right-icon {
   --icon-name: icon-arrow-up-right;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/property-16.scss
index ee72eed7f5b38..77d57b411ac21 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-up-right-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M12.943 3.463A.748.748 0 0012.25 3h-5.5a.75.75 0 000 1.5h3.69l-7.22 7.22a.75.75 0 101.06 1.06l7.22-7.22v3.69a.75.75 0 001.5 0v-5.5a.747.747 0 00-.057-.287z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/property-24.scss
index 2748d0ba5daab..632486722e080 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up-right/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-up-right-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M18.943 5.463a.748.748 0 00-.161-.242l-.002-.001-.001-.002A.748.748 0 0018.25 5h-9.5a.75.75 0 000 1.5h7.69L5.22 17.72a.75.75 0 101.06 1.06L17.5 7.56v7.69a.75.75 0 001.5 0v-9.5a.747.747 0 00-.057-.287z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/keyframes.scss
index 3f939b96d38c3..08e5ca5cbfdc1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-arrow-up {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/placeholders.scss
index d6337f564dc6d..3b4a24e209229 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-arrow-up-icon {
   --icon-name: icon-arrow-up;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/property-16.scss
index 7698ca7a5f862..c9eeaa208a989 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-up-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M4.045 7.765a.75.75 0 11-1.09-1.03l4.25-4.5a.75.75 0 011.09 0l4.25 4.5a.75.75 0 01-1.09 1.03L8.5 4.636v8.614a.75.75 0 01-1.5 0V4.636L4.045 7.765z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/property-24.scss
index 004aadb9b58b0..7e7240b420054 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/arrow-up/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-arrow-up-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M5.04 10.771A.75.75 0 013.96 9.73l7.25-7.5a.75.75 0 011.08 0l7.25 7.5a.75.75 0 11-1.08 1.042L12.5 4.605V20.25a.75.75 0 01-1.5 0V4.605l-5.96 6.166z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/keyframes.scss
index af0cc5a2d0bcf..70d131b8a00ce 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-at-sign {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/placeholders.scss
index 4b6e792f8b4f6..93ebf35b67945 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-at-sign-icon {
   --icon-name: icon-at-sign;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/property-16.scss
index 35ca543c0717e..27c8a77986e72 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-at-sign-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M9.818.21a8 8 0 103.046 14.141.75.75 0 10-.912-1.19A6.5 6.5 0 1114.5 8v1c0 .908-.54 1.5-1.25 1.5-.4 0-.691-.157-.894-.399C12.142 9.847 12 9.463 12 9V4.75a.75.75 0 00-1.5 0v.127a4 4 0 10.449 5.825c.076.128.162.25.258.364.484.577 1.194.934 2.043.934C15.04 12 16 10.461 16 9V8A8 8 0 009.818.21zM10.5 8a2.5 2.5 0 10-5 0 2.5 2.5 0 005 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/property-24.scss
index a80a2e275d4df..b7d543c215ef6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/at-sign/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-at-sign-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M14.5 1.288a11 11 0 104.188 19.445.75.75 0 10-.912-1.19 9.5 9.5 0 113.724-7.544v1.025c0 1.258-.995 2.476-2.325 2.476-1.288 0-2.175-1.142-2.175-2.476V7.75a.75.75 0 00-1.5 0v.68a5 5 0 10.488 6.587c.58 1.12 1.666 1.983 3.187 1.983C21.495 17 23 14.94 23 13.024V12a11 11 0 00-8.5-10.711zM15.5 12a3.5 3.5 0 10-7 0 3.5 3.5 0 007 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/keyframes.scss
index f61a9ec361d52..67243a207d0f6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-auth0-color {
   100% {
     background-image: var(--icon-auth0-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/placeholders.scss
index d33b504c31aee..f7d2ad3b928cb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-auth0-color-icon {
   --icon-name: icon-auth0-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/property-16.scss
index ba821cc98806c..a12861d500bb5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-auth0-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M12.549 1h-4.55l1.407 4.38h4.548l-3.68 2.61 1.406 4.405c2.37-1.725 3.143-4.336 2.274-7.016L12.55 1zM2.045 5.38h4.55L8 1H3.45L2.045 5.38c-.868 2.68-.094 5.29 2.275 7.015L5.725 7.99l-3.68-2.612zm2.275 7.015L8 15l3.68-2.605L8 9.745l-3.68 2.65z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/property-24.scss
index ce38c8a2d648b..32e38d89812a2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-auth0-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M17.848 3H12l1.807 5.63h5.849l-4.732 3.358 1.807 5.663c3.046-2.218 4.042-5.575 2.925-9.02L17.848 3zM4.344 8.63h5.848L12 3H6.15L4.344 8.63c-1.117 3.446-.122 6.802 2.924 9.02l1.808-5.662-4.732-3.357zm2.924 9.02L12 21l4.731-3.35L12 14.244 7.268 17.65z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/index.scss
index 60fbff8e53ef0..83889c28e8175 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../auth0-color/property-16';
         @import '../auth0-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/keyframes.scss
index dac71af5818f2..ac2e3fd1336d4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-auth0 {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/placeholders.scss
index d91cea78255f9..2a67e3aa7165d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-auth0-icon {
   --icon-name: icon-auth0;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/property-16.scss
index ba821cc98806c..a12861d500bb5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-auth0-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M12.549 1h-4.55l1.407 4.38h4.548l-3.68 2.61 1.406 4.405c2.37-1.725 3.143-4.336 2.274-7.016L12.55 1zM2.045 5.38h4.55L8 1H3.45L2.045 5.38c-.868 2.68-.094 5.29 2.275 7.015L5.725 7.99l-3.68-2.612zm2.275 7.015L8 15l3.68-2.605L8 9.745l-3.68 2.65z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/property-24.scss
index 469bcc8786fce..5b19c691ac942 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auth0/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-auth0-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M12.549 1h-4.55l1.407 4.38h4.548l-3.68 2.61 1.406 4.405c2.37-1.725 3.143-4.336 2.274-7.016L12.55 1zM2.045 5.38h4.55L8 1H3.45L2.045 5.38c-.868 2.68-.094 5.29 2.275 7.015L5.725 7.99l-3.68-2.612zm2.275 7.015L8 15l3.68-2.605L8 9.745l-3.68 2.65z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/keyframes.scss
index 4e3f9eed858b6..9603cbde54ddd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-auto-apply {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/placeholders.scss
index 2096dbb22ad9e..070667829840f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-auto-apply-icon {
   --icon-name: icon-auto-apply;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/property-16.scss
index 93fcb9ffd223a..77fe3b9e28ccc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-auto-apply-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M7.734 4.192C6.572 3.402 5 4.234 5 5.64v4.722c0 1.405 1.572 2.237 2.734 1.447l3.472-2.36a1.75 1.75 0 000-2.895l-3.472-2.36zM6.5 5.64c0-.2.225-.32.39-.206l3.472 2.36a.25.25 0 010 .414l-3.471 2.36a.25.25 0 01-.391-.206V5.639z"/><path d="M7.25 0A1.75 1.75 0 005.5 1.728a6.715 6.715 0 00-.167.07 1.75 1.75 0 00-2.46.015l-1.06 1.06a1.75 1.75 0 00-.015 2.46 6.712 6.712 0 00-.07.167A1.75 1.75 0 000 7.25v1.5c0 .96.772 1.738 1.728 1.75l.07.167a1.75 1.75 0 00.015 2.46l1.06 1.06a1.75 1.75 0 002.46.015l.167.07A1.75 1.75 0 007.25 16h1.5a1.75 1.75 0 001.75-1.728l.167-.07a1.75 1.75 0 002.46-.015l1.06-1.06a1.75 1.75 0 00.015-2.46l.07-.167A1.75 1.75 0 0016 8.75v-1.5a1.75 1.75 0 00-1.728-1.75 6.185 6.185 0 00-.07-.167 1.75 1.75 0 00-.015-2.46l-1.06-1.06a1.75 1.75 0 00-2.46-.015 6.794 6.794 0 00-.167-.07A1.75 1.75 0 008.75 0h-1.5zM7 1.75a.25.25 0 01.25-.25h1.5a.25.25 0 01.25.25v.51c0 .33.216.62.532.717.326.1.64.23.936.388a.75.75 0 00.884-.131l.36-.36a.25.25 0 01.354 0l1.06 1.06a.25.25 0 010 .354l-.36.36a.75.75 0 00-.131.884c.158.296.289.61.388.936a.75.75 0 00.718.532h.509a.25.25 0 01.25.25v1.5a.25.25 0 01-.25.25h-.51a.75.75 0 00-.717.532c-.1.326-.23.64-.388.936a.75.75 0 00.131.884l.36.36a.25.25 0 010 .354l-1.06 1.06a.25.25 0 01-.354 0l-.36-.36a.75.75 0 00-.884-.131c-.296.158-.61.289-.936.388a.75.75 0 00-.532.718v.509a.25.25 0 01-.25.25h-1.5a.25.25 0 01-.25-.25v-.51a.75.75 0 00-.532-.717c-.326-.1-.64-.23-.936-.388a.75.75 0 00-.884.131l-.36.36a.25.25 0 01-.354 0l-1.06-1.06a.25.25 0 010-.354l.36-.36a.75.75 0 00.131-.884 5.213 5.213 0 01-.388-.936A.75.75 0 002.259 9H1.75a.25.25 0 01-.25-.25v-1.5A.25.25 0 011.75 7h.51a.75.75 0 00.717-.532c.1-.326.23-.64.388-.936a.75.75 0 00-.131-.884l-.36-.36a.25.25 0 010-.354l1.06-1.06a.25.25 0 01.354 0l.36.36a.75.75 0 00.884.131c.296-.158.61-.289.936-.388A.75.75 0 007 2.259V1.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/property-24.scss
index 39c3f4e3afaf4..5746ddfff79e3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/auto-apply/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-auto-apply-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M11.23 6.684c-1.162-.786-2.73.047-2.73 1.45v7.732c0 1.403 1.568 2.236 2.73 1.45l5.716-3.866a1.75 1.75 0 000-2.9L11.23 6.684zM10 8.134c0-.2.224-.32.39-.207l5.715 3.866a.25.25 0 010 .414l-5.715 3.866a.25.25 0 01-.39-.207V8.134z"/><path d="M11.305 0a2.25 2.25 0 00-2.25 2.25v.395a9.747 9.747 0 00-1.587.658l-.28-.28a2.25 2.25 0 00-3.182 0l-.983.983a2.25 2.25 0 000 3.182l.28.28a9.748 9.748 0 00-.658 1.587H2.25A2.25 2.25 0 000 11.305v1.39a2.25 2.25 0 002.25 2.25h.395c.174.552.395 1.082.658 1.587l-.28.28a2.25 2.25 0 000 3.182l.983.983a2.25 2.25 0 003.182 0l.28-.28a9.744 9.744 0 001.587.658v.395a2.25 2.25 0 002.25 2.25h1.39a2.25 2.25 0 002.25-2.25v-.395a9.743 9.743 0 001.587-.658l.28.28a2.25 2.25 0 003.182 0l.983-.983a2.25 2.25 0 000-3.182l-.28-.28a9.742 9.742 0 00.658-1.587h.395a2.25 2.25 0 002.25-2.25v-1.39a2.25 2.25 0 00-2.25-2.25h-.395a9.744 9.744 0 00-.658-1.587l.28-.28a2.25 2.25 0 000-3.182l-.983-.983a2.25 2.25 0 00-3.182 0l-.28.28a9.748 9.748 0 00-1.587-.658V2.25A2.25 2.25 0 0012.695 0h-1.39zm-.75 2.25a.75.75 0 01.75-.75h1.39a.75.75 0 01.75.75v.963a.75.75 0 00.569.728c.806.2 1.566.52 2.26.937a.75.75 0 00.917-.113l.681-.681a.75.75 0 011.061 0l.983.983a.75.75 0 010 1.06l-.681.682a.75.75 0 00-.113.917c.418.694.736 1.454.937 2.26a.75.75 0 00.728.569h.963a.75.75 0 01.75.75v1.39a.75.75 0 01-.75.75h-.963a.75.75 0 00-.728.569 8.25 8.25 0 01-.937 2.26.75.75 0 00.113.917l.681.681a.75.75 0 010 1.061l-.983.983a.75.75 0 01-1.06 0l-.682-.681a.75.75 0 00-.917-.113 8.253 8.253 0 01-2.26.937.75.75 0 00-.569.728v.963a.75.75 0 01-.75.75h-1.39a.75.75 0 01-.75-.75v-.963a.75.75 0 00-.569-.728 8.253 8.253 0 01-2.26-.937.75.75 0 00-.917.113l-.681.681a.75.75 0 01-1.061 0l-.983-.983a.75.75 0 010-1.06l.681-.682a.75.75 0 00.113-.917 8.251 8.251 0 01-.937-2.26.75.75 0 00-.728-.569H2.25a.75.75 0 01-.75-.75v-1.39a.75.75 0 01.75-.75h.963a.75.75 0 00.728-.569c.2-.806.52-1.566.937-2.26a.75.75 0 00-.113-.917l-.681-.681a.75.75 0 010-1.061l.983-.983a.75.75 0 011.06 0l.682.681a.75.75 0 00.917.113 8.251 8.251 0 012.26-.937.75.75 0 00.569-.728V2.25z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/award/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/award/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/award/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/award/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/award/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/award/keyframes.scss
index ec6af6883ed00..9b842d30d89f4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/award/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/award/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-award {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/award/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/award/placeholders.scss
index 5a6e3db614f6f..7977e3f37be06 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/award/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/award/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-award-icon {
   --icon-name: icon-award;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/award/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/award/property-16.scss
index c479e6b41cb8f..ae056de674995 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/award/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/award/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-award-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a6 6 0 00-4.214 10.27.756.756 0 00-.027.113l-.75 4.75a.75.75 0 00.99.824L8 14.545l4 1.412a.75.75 0 00.99-.824l-.75-4.75a.764.764 0 00-.026-.112A6 6 0 008 0zM3.5 6a4.5 4.5 0 119 0 4.5 4.5 0 01-9 0zm7.363 5.274A5.974 5.974 0 018 12a5.973 5.973 0 01-2.863-.726l-.45 2.85 3.063-1.081a.75.75 0 01.5 0l3.063 1.08-.45-2.849z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/award/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/award/property-24.scss
index b10d05cf89fbe..d317c69470f0e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/award/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/award/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-award-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1a8 8 0 00-4.751 14.437l-1.236 6.676a.75.75 0 001.004.838L12 21.053l4.983 1.898a.75.75 0 001.005-.838l-1.237-6.676A8 8 0 0012 1zM5.5 9a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0zm9.877 7.254A7.97 7.97 0 0112 17a7.97 7.97 0 01-3.377-.746l-.892 4.82 4.002-1.525a.75.75 0 01.534 0l4.003 1.525-.893-4.82z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/keyframes.scss
index 3e3a3a02fac06..488bea475b5d2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-azure-color {
   100% {
     background-image: var(--icon-azure-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/placeholders.scss
index affacac1a20df..115ce2bf249c8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-azure-color-icon {
   --icon-name: icon-azure-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/property-16.scss
index 4026e8685c494..5bbddccf1bf5c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-azure-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%230089D6"><path d="M7.47 12.412l3.348-.592.031-.007-1.722-2.049a291.474 291.474 0 01-1.723-2.058c0-.01 1.779-4.909 1.789-4.926a788.95 788.95 0 012.934 5.066l2.95 5.115.023.039-10.948-.001 3.317-.587zM.9 11.788c0-.003.811-1.412 1.803-3.131L4.507 5.53l2.102-1.764C7.765 2.797 8.714 2 8.717 2a.37.37 0 01-.033.085L6.4 6.981 4.16 11.789l-1.63.002c-.897.001-1.63 0-1.63-.003z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/property-24.scss
index 62ac5a5c61329..00ac62087e462 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-azure-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%230089D6"><path d="M11.275 18.199l4.575-.808.043-.01-2.353-2.793a400.617 400.617 0 01-2.353-2.808c0-.013 2.43-6.693 2.443-6.717.004-.008 1.658 2.842 4.008 6.908 2.2 3.807 4.015 6.946 4.031 6.976L21.7 19l-14.957-.002 4.532-.8zM2.3 17.347c0-.004 1.109-1.925 2.464-4.27l2.464-4.262 2.871-2.406A1076.68 1076.68 0 0112.98 4a.504.504 0 01-.046.116l-3.118 6.676-3.062 6.557-2.227.002c-1.225.002-2.227 0-2.227-.004z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/keyframes.scss
index 52a9cf76f9623..cc016f23b6ef0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-azure-devops-color {
   100% {
     background-image: var(--icon-azure-devops-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/placeholders.scss
index 70cf0b138a14c..95d07ea7d8368 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-azure-devops-color-icon {
   --icon-name: icon-azure-devops-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/property-16.scss
index 1d340b9e53da0..2090328017ded 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-azure-devops-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="url(%23azure-devops-color-16__paint0_linear_707_116)" d="M15 3.622v8.512L11.5 15l-5.425-1.975v1.958L3.004 10.97l8.951.7V4.005L15 3.622zm-2.984.428L6.994 1v2.001L2.382 4.356 1 6.13v4.029l1.978.873V5.869l9.038-1.818z"/><defs><linearGradient id="azure-devops-color-16__paint0_linear_707_116" x1="8" x2="8" y1="14.956" y2="1.026" gradientUnits="userSpaceOnUse"><stop stop-color="%230078D4"/><stop offset=".16" stop-color="%231380DA"/><stop offset=".53" stop-color="%233C91E5"/><stop offset=".82" stop-color="%23559CEC"/><stop offset="1" stop-color="%235EA0EF"/></linearGradient></defs></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/property-24.scss
index 81ee63569fa1b..6b3f605ef5a0d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-azure-devops-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="url(%23azure-devops-color-24__paint0_linear_707_113)" d="M21 6.37v10.945L16.5 21l-6.975-2.54v2.518L5.576 15.82l11.509.9V6.864L21 6.371zm-3.836.551L10.706 3v2.573L4.778 7.315 3 9.595v5.18L5.543 15.9v-6.64l11.62-2.338z"/><defs><linearGradient id="azure-devops-color-24__paint0_linear_707_113" x1="12" x2="12" y1="20.944" y2="3.034" gradientUnits="userSpaceOnUse"><stop stop-color="%230078D4"/><stop offset=".16" stop-color="%231380DA"/><stop offset=".53" stop-color="%233C91E5"/><stop offset=".82" stop-color="%23559CEC"/><stop offset="1" stop-color="%235EA0EF"/></linearGradient></defs></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/index.scss
index 90d05644b0899..f681224d99e5f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../azure-devops-color/property-16';
         @import '../azure-devops-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/keyframes.scss
index bf4994065c46b..f0352f7e1b479 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-azure-devops {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/placeholders.scss
index df11a00bb39df..55d52c7e2c230 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-azure-devops-icon {
   --icon-name: icon-azure-devops;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/property-16.scss
index c758b8a951ecb..773a2b7f1fab8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-azure-devops-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M15 3.622v8.512L11.5 15l-5.425-1.975v1.958L3.004 10.97l8.951.7V4.005L15 3.622zm-2.984.428L6.994 1v2.001L2.382 4.356 1 6.13v4.029l1.978.873V5.869l9.038-1.818z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/property-24.scss
index ab4b2678eeaa6..0e1738d22444d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure-devops/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-azure-devops-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M15 3.622v8.512L11.5 15l-5.425-1.975v1.958L3.004 10.97l8.951.7V4.005L15 3.622zm-2.984.428L6.994 1v2.001L2.382 4.356 1 6.13v4.029l1.978.873V5.869l9.038-1.818z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure/index.scss
index 57796cbe4d4c6..a37795b7ea850 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../azure-color/property-16';
         @import '../azure-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure/keyframes.scss
index d6b5215fd1cb1..eceedd9a5d9cd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-azure {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure/placeholders.scss
index cf4ce5203e140..a42cbeb243add 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-azure-icon {
   --icon-name: icon-azure;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure/property-16.scss
index 5fb44f6d83ca3..534057616698e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-azure-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.47 12.412l3.348-.592.031-.007-1.722-2.049a291.474 291.474 0 01-1.723-2.058c0-.01 1.779-4.909 1.789-4.926a788.95 788.95 0 012.934 5.066l2.95 5.115.023.039-10.948-.001 3.317-.587zM.9 11.788c0-.003.811-1.412 1.803-3.131L4.507 5.53l2.102-1.764C7.765 2.797 8.714 2 8.717 2a.37.37 0 01-.033.085L6.4 6.981 4.16 11.789l-1.63.002c-.897.001-1.63 0-1.63-.003z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/azure/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/azure/property-24.scss
index 2e9a8bc64649c..0b916118fd342 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/azure/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/azure/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-azure-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.47 12.412l3.348-.592.031-.007-1.722-2.049a291.474 291.474 0 01-1.723-2.058c0-.01 1.779-4.909 1.789-4.926a788.95 788.95 0 012.934 5.066l2.95 5.115.023.039-10.948-.001 3.317-.587zM.9 11.788c0-.003.811-1.412 1.803-3.131L4.507 5.53l2.102-1.764C7.765 2.797 8.714 2 8.717 2a.37.37 0 01-.033.085L6.4 6.981 4.16 11.789l-1.63.002c-.897.001-1.63 0-1.63-.003z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/keyframes.scss
index 1198e82ae9b90..75e8b8b1d91c0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bank-vault {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/placeholders.scss
index f1e01cbc53db1..784c86a5256fc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bank-vault-icon {
   --icon-name: icon-bank-vault;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/property-16.scss
index ec7e4fc6576ea..58025bfd414ae 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bank-vault-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M6.035 3.974A4.978 4.978 0 019 3c1.11 0 2.136.362 2.965.974l.005-.004a.75.75 0 111.06 1.06l-.004.005C13.638 5.865 14 6.89 14 8c0 1.11-.362 2.136-.974 2.965l.004.005a.75.75 0 11-1.06 1.06l-.005-.004A4.978 4.978 0 019 13a4.978 4.978 0 01-2.965-.974l-.005.004a.75.75 0 01-1.06-1.06l.004-.005A4.977 4.977 0 014 8c0-1.11.362-2.136.974-2.965L4.97 5.03a.75.75 0 011.06-1.06l.005.004zm1.078 1.078A3.484 3.484 0 019 4.5c.695 0 1.343.203 1.887.552l-.917.918a.75.75 0 001.06 1.06l.918-.917c.35.544.552 1.192.552 1.887 0 .695-.203 1.343-.552 1.887l-.918-.917a.75.75 0 10-1.06 1.06l.917.918A3.484 3.484 0 019 11.5a3.483 3.483 0 01-1.887-.552l.917-.918a.75.75 0 10-1.06-1.06l-.918.917A3.484 3.484 0 015.5 8c0-.695.203-1.343.552-1.887l.918.917a.75.75 0 001.06-1.06l-.917-.918z" clip-rule="evenodd"/><path d="M2.75 3.25A.75.75 0 013.5 4v1.5a.75.75 0 01-1.5 0V4a.75.75 0 01.75-.75zM3.5 10.5a.75.75 0 00-1.5 0V12a.75.75 0 001.5 0v-1.5z"/><path fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15H3v.25a.75.75 0 001.5 0V15h7v.25a.75.75 0 001.5 0V15h.75A2.25 2.25 0 0016 12.75v-9.5A2.25 2.25 0 0013.75 1H2.25zm11.5 12.5a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75H2.25a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h11.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/property-24.scss
index 175a50ba19a2c..2e12f1842f4f6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bank-vault/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bank-vault-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M8 12a6 6 0 1112 0 6 6 0 01-12 0zm2.332-2.607A4.48 4.48 0 009.5 12c0 .972.308 1.872.832 2.607l1.45-1.45A2.49 2.49 0 0111.5 12c0-.417.102-.81.283-1.156l-1.451-1.451zm1.06-1.061l1.452 1.45A2.49 2.49 0 0114 9.5c.417 0 .81.102 1.156.283l1.451-1.451A4.48 4.48 0 0014 7.5a4.48 4.48 0 00-2.607.832zm1.452 5.885l-1.451 1.451A4.48 4.48 0 0014 16.5a4.48 4.48 0 002.607-.832l-1.45-1.45A2.49 2.49 0 0114 14.5a2.49 2.49 0 01-1.156-.283zM18.5 12a4.48 4.48 0 01-.832 2.607l-1.45-1.45c.18-.346.282-.74.282-1.157 0-.417-.102-.81-.283-1.156l1.451-1.451A4.48 4.48 0 0118.5 12zM13 12a1 1 0 112 0 1 1 0 01-2 0z" clip-rule="evenodd"/><path d="M4.75 5a.75.75 0 01.75.75v2.5a.75.75 0 01-1.5 0v-2.5A.75.75 0 014.75 5zM5.5 15.75a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z"/><path fill-rule="evenodd" d="M1 4.75A2.75 2.75 0 013.75 2h16.5A2.75 2.75 0 0123 4.75v14.5A2.75 2.75 0 0120.25 22h-.125v1a.875.875 0 01-1.75 0v-1H5.625v1a.875.875 0 01-1.75 0v-1H3.75A2.75 2.75 0 011 19.25V4.75zM3.75 3.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h16.5c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H3.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/keyframes.scss
index 3d267e2be42a7..0dd0933d47dfa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bar-chart-alt {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/placeholders.scss
index c6fe294ab63c0..9f538c13d244c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bar-chart-alt-icon {
   --icon-name: icon-bar-chart-alt;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/property-16.scss
index 99047afeb3ffa..1c9938baa2578 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bar-chart-alt-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 2a1 1 0 011 1v10a1 1 0 11-2 0V3a1 1 0 011-1zM12 6a1 1 0 011 1v6a1 1 0 11-2 0V7a1 1 0 011-1zM5 9a1 1 0 00-2 0v4a1 1 0 102 0V9z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/property-24.scss
index b3e0126d5e7a0..afe6c741d2d61 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart-alt/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bar-chart-alt-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 3a1 1 0 011 1v16a1 1 0 11-2 0V4a1 1 0 011-1zM18 9a1 1 0 011 1v10a1 1 0 11-2 0V10a1 1 0 011-1zM7 14a1 1 0 10-2 0v6a1 1 0 102 0v-6z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/keyframes.scss
index 5934a161a9dd2..a89e6ebe664ed 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bar-chart {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/placeholders.scss
index 6dbb0aa1a845b..9398145302041 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bar-chart-icon {
   --icon-name: icon-bar-chart;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/property-16.scss
index 19400e36910c1..b80cc198af848 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bar-chart-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M12 2a1 1 0 011 1v10a1 1 0 11-2 0V3a1 1 0 011-1zM8 6a1 1 0 011 1v6a1 1 0 11-2 0V7a1 1 0 011-1zM5 10a1 1 0 00-2 0v3a1 1 0 102 0v-3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/property-24.scss
index 7520ec5786562..5d09d345063d9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bar-chart/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bar-chart-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M18 3a1 1 0 011 1v16a1 1 0 11-2 0V4a1 1 0 011-1zM12 9a1 1 0 011 1v10a1 1 0 11-2 0V10a1 1 0 011-1zM7 16a1 1 0 10-2 0v4a1 1 0 102 0v-4z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/keyframes.scss
index 2910f6ba28cb2..b4136278dc593 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-battery-charging {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/placeholders.scss
index 169c4b03e85a7..915ab228fd4eb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-battery-charging-icon {
   --icon-name: icon-battery-charging;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/property-16.scss
index c569483aeb5d8..befdf660d497d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-battery-charging-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.605 3.944a.75.75 0 10-1.21-.888l-2.75 3.75a.75.75 0 00.368 1.155l3.524 1.175-2.142 2.92a.75.75 0 101.21.888l2.75-3.75a.75.75 0 00-.368-1.156L5.463 6.864l2.142-2.92z"/><path d="M2.25 4.5a.75.75 0 00-.75.75v5.5c0 .414.336.75.75.75h.5a.75.75 0 010 1.5h-.5A2.25 2.25 0 010 10.75v-5.5A2.25 2.25 0 012.25 3h.5a.75.75 0 010 1.5h-.5zM9.5 3.75a.75.75 0 01.75-.75h.5A2.25 2.25 0 0113 5.25v5.5A2.25 2.25 0 0110.75 13h-.5a.75.75 0 010-1.5h.5a.75.75 0 00.75-.75v-5.5a.75.75 0 00-.75-.75h-.5a.75.75 0 01-.75-.75zM14.75 6a.75.75 0 01.75.75v2.5a.75.75 0 01-1.5 0v-2.5a.75.75 0 01.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/property-24.scss
index 1b8ed8ab1fe89..9f0b3793afbc3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/battery-charging/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-battery-charging-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M13.056 6.003a.75.75 0 10-1.112-1.006l-4.75 5.25a.75.75 0 00.335 1.22l5.428 1.67-4.035 4.885a.75.75 0 001.156.956l4.75-5.75a.75.75 0 00-.357-1.195L9.097 10.38l3.96-4.377z"/><path d="M3.75 6.5c-.69 0-1.25.56-1.25 1.25v8.5c0 .69.56 1.25 1.25 1.25h2.5a.75.75 0 010 1.5h-2.5A2.75 2.75 0 011 16.25v-8.5A2.75 2.75 0 013.75 5h4.5a.75.75 0 010 1.5h-4.5zM15 5.75a.75.75 0 01.75-.75h2.5A2.75 2.75 0 0121 7.75v8.5A2.75 2.75 0 0118.25 19h-4.5a.75.75 0 010-1.5h4.5c.69 0 1.25-.56 1.25-1.25v-8.5c0-.69-.56-1.25-1.25-1.25h-2.5a.75.75 0 01-.75-.75zM22.75 10a.75.75 0 01.75.75v2.5a.75.75 0 01-1.5 0v-2.5a.75.75 0 01.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/battery/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/battery/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/battery/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/battery/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/battery/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/battery/keyframes.scss
index 4f560185c8b65..f2c1be31cc4fd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/battery/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/battery/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-battery {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/battery/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/battery/placeholders.scss
index f4a9d06343e0e..532ca3de1393a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/battery/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/battery/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-battery-icon {
   --icon-name: icon-battery;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/battery/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/battery/property-16.scss
index 5d3fe714935fb..917ba588622b5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/battery/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/battery/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-battery-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M2.25 3A2.25 2.25 0 000 5.25v5.5A2.25 2.25 0 002.25 13h8.5A2.25 2.25 0 0013 10.75v-5.5A2.25 2.25 0 0010.75 3h-8.5zM1.5 5.25a.75.75 0 01.75-.75h8.5a.75.75 0 01.75.75v5.5a.75.75 0 01-.75.75h-8.5a.75.75 0 01-.75-.75v-5.5z" clip-rule="evenodd"/><path d="M15.5 6.75a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/battery/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/battery/property-24.scss
index 90465435e3fad..63e421bcce02e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/battery/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/battery/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-battery-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M3.75 5A2.75 2.75 0 001 7.75v8.5A2.75 2.75 0 003.75 19h14.5A2.75 2.75 0 0021 16.25v-8.5A2.75 2.75 0 0018.25 5H3.75zM2.5 7.75c0-.69.56-1.25 1.25-1.25h14.5c.69 0 1.25.56 1.25 1.25v8.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25v-8.5z" clip-rule="evenodd"/><path d="M23.5 10.75a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/keyframes.scss
index 20b75d92d1fe9..a883fe9181f7b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-beaker {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/placeholders.scss
index 5fcbe9b7af548..9db2d0d59365d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-beaker-icon {
   --icon-name: icon-beaker;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/property-16.scss
index b847897d1d6c0..2e3d25256955c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-beaker-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M4.608 2H3.75a.75.75 0 000 1.5h.394l.987 2.154c.03.065.03.14.001.205l-2.949 6.685A1.75 1.75 0 003.784 15h8.432a1.75 1.75 0 001.6-2.456l-2.948-6.685a.25.25 0 01.001-.205l.987-2.154h.394a.75.75 0 000-1.5h-.858a.76.76 0 00-.033 0H4.64a.76.76 0 00-.033 0zm5.598 1.5H5.794l.7 1.529c.209.455.213.977.01 1.435L5.828 8h4.346l-.678-1.536a1.75 1.75 0 01.01-1.435l.701-1.529zm-6.65 9.65l1.61-3.65h5.669l1.61 3.65a.25.25 0 01-.23.35h-8.43a.25.25 0 01-.23-.35z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/property-24.scss
index 7269f26cb4916..e44a958f66d87 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/beaker/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-beaker-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M6.75 4a.75.75 0 000 1.5h.662l1.441 2.883a.25.25 0 010 .226l-4.657 9.118C3.432 19.224 4.52 21 6.2 21h11.6c1.68 0 2.768-1.776 2.004-3.273l-4.656-9.118a.25.25 0 01-.001-.226L16.588 5.5h.662a.75.75 0 000-1.5H6.75zm8.162 1.5H9.088l1.106 2.213a1.75 1.75 0 01-.007 1.578L8.805 12h6.39l-1.383-2.709a1.75 1.75 0 01-.007-1.578L14.912 5.5zm-9.38 12.909L8.04 13.5h7.922l2.507 4.909A.75.75 0 0117.8 19.5H6.2a.75.75 0 01-.668-1.091z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/keyframes.scss
index 72fabd95531c0..826e47333fcb6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bell-active-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/placeholders.scss
index 0d7bc721a48fd..0f5dcc27d24c5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bell-active-fill-icon {
   --icon-name: icon-bell-active-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/property-16.scss
index 42ee898884860..8e30a3c66f263 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bell-active-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M14.25 10.5c-.462 0-1.25-.386-1.25-1.72V6.742a.75.75 0 00-.8-.749 3 3 0 01-3.037-3.975.75.75 0 00-.63-.99A5.092 5.092 0 008 1C4.907 1 3 3.665 3 6.405V8.78c0 1.334-.788 1.72-1.25 1.72a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5z"/><path d="M12 5a2 2 0 100-4 2 2 0 000 4zM6.898 12.872a.75.75 0 00-1.296.756A2.773 2.773 0 008 15c1.023 0 1.918-.55 2.398-1.372a.75.75 0 00-1.296-.756c-.219.374-.63.628-1.102.628-.473 0-.883-.254-1.102-.628z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/property-24.scss
index 5e2c36ecd05cd..0f0cd3fc01188 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bell-active-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M22.25 16.5c-1.231 0-2.25-1.046-2.25-2.35V8.983a7.54 7.54 0 00-.05-.872.75.75 0 00-.856-.655 4 4 0 01-4.402-5.185.75.75 0 00-.499-.948A7.643 7.643 0 0012 1C7.702 1 4 4.665 4 8.983v5.167c0 1.304-1.019 2.35-2.25 2.35a.75.75 0 000 1.5h20.5a.75.75 0 000-1.5z"/><path d="M18.5 6a2.5 2.5 0 100-5 2.5 2.5 0 000 5zM10.42 20.414a.75.75 0 00-1.34.672C9.63 22.188 10.703 23 12 23c1.296 0 2.369-.812 2.92-1.914a.75.75 0 10-1.34-.672c-.347.691-.953 1.086-1.58 1.086-.627 0-1.233-.395-1.58-1.086z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/keyframes.scss
index 526357d7e742b..6c08e0f9f87e3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bell-active {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/placeholders.scss
index dd612ae22b800..db6673e869ef8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bell-active-icon {
   --icon-name: icon-bell-active;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/property-16.scss
index df673f629149f..9424b3819f92e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bell-active-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 2.5c-2.062 0-3.5 1.776-3.5 3.905V8.78c0 .677-.145 1.252-.387 1.72h7.774c-.242-.468-.387-1.043-.387-1.72V6.781a.75.75 0 011.5 0V8.78c0 1.334.788 1.72 1.25 1.72a.75.75 0 010 1.5H1.75a.75.75 0 010-1.5c.462 0 1.25-.386 1.25-1.72V6.405C3 3.665 4.907 1 8 1c.2 0 .395.011.587.034a.75.75 0 01-.174 1.49A3.578 3.578 0 008 2.5z"/><path d="M14 3a2 2 0 11-4 0 2 2 0 014 0zM6.898 12.872a.75.75 0 00-1.296.756A2.773 2.773 0 008 15c1.023 0 1.918-.55 2.398-1.372a.75.75 0 00-1.296-.756c-.219.374-.63.628-1.102.628-.473 0-.883-.254-1.102-.628z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/property-24.scss
index 60afe0f69e618..a6e9d9097d62e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-active/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bell-active-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 2.5c-3.476 0-6.5 3-6.5 6.483v5.167c0 .873-.29 1.693-.782 2.35h14.564a3.917 3.917 0 01-.782-2.35V8.983c0-.295-.022-.587-.064-.875a.75.75 0 011.485-.216c.052.357.079.722.079 1.091v5.167c0 1.304 1.019 2.35 2.25 2.35a.75.75 0 010 1.5H1.75a.75.75 0 010-1.5C2.981 16.5 4 15.454 4 14.15V8.983C4 4.665 7.702 1 12 1a7.631 7.631 0 012.389.385.75.75 0 11-.468 1.425A6.131 6.131 0 0012 2.5z"/><path d="M21 3.5a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0zM10.42 20.414a.75.75 0 00-1.34.672C9.63 22.188 10.703 23 12 23c1.296 0 2.369-.812 2.92-1.914a.75.75 0 10-1.34-.672c-.347.691-.953 1.086-1.58 1.086-.627 0-1.233-.395-1.58-1.086z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/keyframes.scss
index aeb34d45883fb..355f916220d28 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bell-off {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/placeholders.scss
index b812218eafe0f..a46d120a5b220 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bell-off-icon {
   --icon-name: icon-bell-off;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/property-16.scss
index 524306acee97e..7f4015ed4273a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bell-off-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 2.5c-.546 0-1.033.12-1.457.326a.75.75 0 01-.655-1.35A4.802 4.802 0 018 1c3.093 0 5 2.665 5 5.405v1.78a.75.75 0 01-1.5 0v-1.78C11.5 4.275 10.062 2.5 8 2.5z"/><path fill-rule="evenodd" d="M3.343 4.404L1.22 2.28a.75.75 0 011.06-1.06l12.5 12.5a.75.75 0 11-1.06 1.06L10.94 12H1.75a.75.75 0 010-1.5c.462 0 1.25-.386 1.25-1.72V6.405c0-.691.118-1.37.343-2.001zM9.44 10.5H4.113c.242-.468.387-1.043.387-1.72V6.405c0-.264.023-.524.067-.777L9.439 10.5z" clip-rule="evenodd"/><path d="M5.872 12.602a.75.75 0 011.026.27c.219.374.63.628 1.102.628.473 0 .883-.254 1.102-.628a.75.75 0 011.296.756A2.773 2.773 0 018 15a2.773 2.773 0 01-2.398-1.372.75.75 0 01.27-1.026z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/property-24.scss
index ef2bf9f25fdcf..0819e556315bd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell-off/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bell-off-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 2.5c-1.4 0-2.734.487-3.83 1.31a.75.75 0 01-.9-1.2C8.602 1.609 10.247 1 12 1c4.298 0 8 3.665 8 7.983v5.167c0 .173.018.341.052.504a.75.75 0 11-1.467.31 3.939 3.939 0 01-.085-.814V8.983C18.5 5.5 15.476 2.5 12 2.5z"/><path fill-rule="evenodd" d="M4.71 5.77L1.22 2.28a.75.75 0 011.06-1.06l20.5 20.5a.75.75 0 11-1.06 1.06L16.94 18H1.75a.75.75 0 010-1.5C2.981 16.5 4 15.454 4 14.15V8.983c0-1.136.257-2.225.71-3.212zM15.44 16.5H4.717a3.917 3.917 0 00.782-2.35V8.983c0-.714.127-1.408.36-2.062l9.58 9.579z" clip-rule="evenodd"/><path d="M9.414 20.08a.75.75 0 011.007.334c.346.691.952 1.086 1.579 1.086s1.233-.395 1.58-1.086a.75.75 0 111.34.672C14.37 22.188 13.297 23 12 23c-1.296 0-2.369-.812-2.92-1.914a.75.75 0 01.334-1.007z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell/keyframes.scss
index 65babffb06ab1..3303ccca1da7f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bell {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell/placeholders.scss
index d7ed65bc02d86..4d9289ff36aab 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bell-icon {
   --icon-name: icon-bell;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell/property-16.scss
index 426e72c313ba2..ff365806e7db5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bell-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M13 8.78c0 1.334.788 1.72 1.25 1.72a.75.75 0 010 1.5H1.75a.75.75 0 010-1.5c.462 0 1.25-.386 1.25-1.72V6.405C3 3.665 4.907 1 8 1s5 2.665 5 5.405V8.78zM4.5 6.405C4.5 4.275 5.938 2.5 8 2.5c2.062 0 3.5 1.776 3.5 3.905V8.78c0 .677.145 1.252.387 1.72H4.113c.242-.468.387-1.043.387-1.72V6.405z" clip-rule="evenodd"/><path d="M6.898 12.872a.75.75 0 00-1.296.756A2.773 2.773 0 008 15c1.023 0 1.918-.55 2.398-1.372a.75.75 0 00-1.296-.756c-.219.374-.63.628-1.102.628-.473 0-.883-.254-1.102-.628z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bell/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bell/property-24.scss
index 7401f1a83d0d6..29eb8ebddb3ec 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bell/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bell/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bell-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M20 14.15c0 1.304 1.019 2.35 2.25 2.35a.75.75 0 010 1.5H1.75a.75.75 0 010-1.5C2.981 16.5 4 15.454 4 14.15V8.983C4 4.665 7.702 1 12 1s8 3.665 8 7.983v5.167zM5.5 8.983C5.5 5.5 8.524 2.5 12 2.5s6.5 3 6.5 6.483v5.167c0 .873.29 1.693.782 2.35H4.718a3.917 3.917 0 00.782-2.35V8.983z" clip-rule="evenodd"/><path d="M10.42 20.414a.75.75 0 00-1.34.672C9.63 22.188 10.703 23 12 23c1.296 0 2.369-.812 2.92-1.914a.75.75 0 10-1.34-.672c-.347.691-.953 1.086-1.58 1.086-.627 0-1.233-.395-1.58-1.086z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/keyframes.scss
index a27dd84dee0fb..444699c6eeab0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bitbucket-color {
   100% {
     background-image: var(--icon-bitbucket-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/placeholders.scss
index f95ba8704fc44..2e2a066ca37cf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bitbucket-color-icon {
   --icon-name: icon-bitbucket-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/property-16.scss
index 35f421bb85d64..7ecc1693a9eef 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bitbucket-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%232684FF" fill-rule="evenodd" d="M1.403 2.15A.43.43 0 011.73 2l12.54.002a.43.43 0 01.424.496l-1.81 11.135a.43.43 0 01-.425.36H3.693a.585.585 0 01-.568-.478l-1.82-11.02a.425.425 0 01.098-.345zm5.203 7.814H9.41l.677-3.93H5.859l.747 3.93z" clip-rule="evenodd"/><path fill="url(%23bitbucket-color-16__paint0_linear_707_135)" d="M14.122 6.033H10.1l-.67 3.931H6.604L3.317 13.86c.105.09.238.139.376.14h8.766a.43.43 0 00.425-.36l1.238-7.607z"/><defs><linearGradient id="bitbucket-color-16__paint0_linear_707_135" x1="11.544" x2="6.918" y1="4.676" y2="11.282" gradientUnits="userSpaceOnUse"><stop offset=".18" stop-color="%230052CC"/><stop offset="1" stop-color="%232684FF"/></linearGradient></defs></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/property-24.scss
index 4d9ac52acf16a..addb090b9205b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bitbucket-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%232684FF" fill-rule="evenodd" d="M2.153 3.225A.64.64 0 012.643 3l18.715.003a.64.64 0 01.634.744L19.289 20.45a.644.644 0 01-.634.54H5.572a.874.874 0 01-.847-.717L2.008 3.743a.64.64 0 01.145-.518zm7.765 11.722h4.187l1.011-5.897H8.804l1.114 5.897z" clip-rule="evenodd"/><path fill="url(%23bitbucket-color-24__paint0_linear_707_129)" d="M21.138 9.05h-6.005l-1.001 5.897H9.918L5.011 20.79a.871.871 0 00.56.21h13.085c.315 0 .583-.23.634-.54l1.848-11.41z"/><defs><linearGradient id="bitbucket-color-24__paint0_linear_707_129" x1="17.29" x2="10.339" y1="7.014" y2="16.89" gradientUnits="userSpaceOnUse"><stop offset=".18" stop-color="%230052CC"/><stop offset="1" stop-color="%232684FF"/></linearGradient></defs></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/index.scss
index b2a50e60e596a..1a1c620f33583 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../bitbucket-color/property-16';
         @import '../bitbucket-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/keyframes.scss
index 0ed7d11559f5e..7a89b2b6303da 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bitbucket {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/placeholders.scss
index cf6287cadf7b3..e8dc6842332e0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bitbucket-icon {
   --icon-name: icon-bitbucket;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/property-16.scss
index 2d0a025fedaa4..38f7e42240cb4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bitbucket-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M1.403 2.15A.43.43 0 011.73 2l12.54.002a.43.43 0 01.424.496l-1.81 11.135a.43.43 0 01-.425.36H3.693a.585.585 0 01-.568-.478l-1.82-11.02a.425.425 0 01.098-.345zm5.203 7.814H9.41l.677-3.93H5.859l.747 3.93z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/property-24.scss
index 043b8af3e9802..fc4d650fc42ad 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bitbucket/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bitbucket-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M1.403 2.15A.43.43 0 011.73 2l12.54.002a.43.43 0 01.424.496l-1.81 11.135a.43.43 0 01-.425.36H3.693a.585.585 0 01-.568-.478l-1.82-11.02a.425.425 0 01.098-.345zm5.203 7.814H9.41l.677-3.93H5.859l.747 3.93z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bolt/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bolt/index.scss
index 258ef25a3a536..839de29a14fa5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bolt/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bolt/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../zap/property-16';
         @import '../zap/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bolt/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bolt/keyframes.scss
index 7e71046efd041..b75370fd9670a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bolt/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bolt/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bolt {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bolt/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bolt/placeholders.scss
index a85661559a59c..f8d2399ea5ce4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bolt/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bolt/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bolt-icon {
   --icon-name: icon-bolt;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/keyframes.scss
index 1cc6a76002f1a..94d432dd0170d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bookmark-add-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/placeholders.scss
index f605a1beeb9fc..1992f1300876d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bookmark-add-fill-icon {
   --icon-name: icon-bookmark-add-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/property-16.scss
index fca2fbf0705da..040ebdfd35496 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bookmark-add-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M4.25 1A2.25 2.25 0 002 3.25v10.83a1 1 0 001.478.878l4.403-2.394a.25.25 0 01.238 0l4.403 2.394A1 1 0 0014 14.08V3.25A2.25 2.25 0 0011.75 1h-7.5zM7 4.75a.75.75 0 011.5 0V6h1.25a.75.75 0 010 1.5H8.5v1.25a.75.75 0 01-1.5 0V7.5H5.75a.75.75 0 010-1.5H7V4.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/property-24.scss
index 7eb9073997f84..a4fd1b5b2abfe 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bookmark-add-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M4 4.75A2.75 2.75 0 016.75 2h10.5A2.75 2.75 0 0120 4.75v16.376a1 1 0 01-1.382.924l-6.522-2.699a.25.25 0 00-.192 0L5.382 22.05A1 1 0 014 21.126V4.75zM11.75 7a.75.75 0 00-.75.75V10H8.75a.75.75 0 000 1.5H11v2.25a.75.75 0 001.5 0V11.5h2.25a.75.75 0 000-1.5H12.5V7.75a.75.75 0 00-.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/keyframes.scss
index 072715ec8e20a..afe0e8ead7997 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bookmark-add {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/placeholders.scss
index 9d406d44a942a..ff2424ab9631c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bookmark-add-icon {
   --icon-name: icon-bookmark-add;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/property-16.scss
index 0831acd7eeeb3..e6e71d6f040af 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bookmark-add-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.75 4a.75.75 0 01.75.75V6h1.25a.75.75 0 010 1.5H8.5v1.25a.75.75 0 01-1.5 0V7.5H5.75a.75.75 0 010-1.5H7V4.75A.75.75 0 017.75 4z"/><path fill-rule="evenodd" d="M2 3.25A2.25 2.25 0 014.25 1h7.5A2.25 2.25 0 0114 3.25v10.83a1 1 0 01-1.478.878L8.12 12.564a.25.25 0 00-.238 0l-4.403 2.394A1 1 0 012 14.08V3.25zm2.25-.75a.75.75 0 00-.75.75v9.989l3.664-1.992a1.75 1.75 0 011.672 0l3.664 1.992V3.25a.75.75 0 00-.75-.75h-7.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/property-24.scss
index ee196c218b3d6..982429205acff 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-add/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bookmark-add-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11.75 7a.75.75 0 01.75.75V10h2.25a.75.75 0 010 1.5H12.5v2.25a.75.75 0 01-1.5 0V11.5H8.75a.75.75 0 010-1.5H11V7.75a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M4 4.75A2.75 2.75 0 016.75 2h10.5A2.75 2.75 0 0120 4.75v16.376a1 1 0 01-1.382.924l-6.522-2.699a.25.25 0 00-.192 0L5.382 22.05A1 1 0 014 21.126V4.75zM6.75 3.5c-.69 0-1.25.56-1.25 1.25v15.628l5.83-2.413a1.75 1.75 0 011.34 0l5.83 2.413V4.75c0-.69-.56-1.25-1.25-1.25H6.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/keyframes.scss
index 40a4ca56eb17d..89cd566f2cffb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bookmark-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/placeholders.scss
index 04383c211c560..cbf8bf0ab0821 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bookmark-fill-icon {
   --icon-name: icon-bookmark-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/property-16.scss
index a42b84e81f7dd..dce6e2f8c8314 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bookmark-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M4.25 1A2.25 2.25 0 002 3.25v10.83a1 1 0 001.478.878l4.403-2.394a.25.25 0 01.238 0l4.403 2.394A1 1 0 0014 14.08V3.25A2.25 2.25 0 0011.75 1h-7.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/property-24.scss
index f6543df57dcd6..278b147816855 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bookmark-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M6.75 2A2.75 2.75 0 004 4.75v16.376a1 1 0 001.382.924l6.522-2.699a.25.25 0 01.192 0l6.522 2.699A1 1 0 0020 21.126V4.75A2.75 2.75 0 0017.25 2H6.75z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/keyframes.scss
index 70168716a3644..0477a5b8ba7ca 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bookmark-remove-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/placeholders.scss
index f4112415447ad..faebcfa3af10d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bookmark-remove-fill-icon {
   --icon-name: icon-bookmark-remove-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/property-16.scss
index e4a0bd7259a80..f8f7a2eb4ef4f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bookmark-remove-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M2 3.25A2.25 2.25 0 014.25 1h7.5A2.25 2.25 0 0114 3.25v10.83a1 1 0 01-1.478.878L8.12 12.564a.25.25 0 00-.238 0l-4.403 2.394A1 1 0 012 14.08V3.25zM5.75 6a.75.75 0 000 1.5h4a.75.75 0 000-1.5h-4z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/property-24.scss
index 29a86fb195320..034c0b6aa063a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bookmark-remove-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M4 4.75A2.75 2.75 0 016.75 2h10.5A2.75 2.75 0 0120 4.75v16.376a1 1 0 01-1.382.924l-6.522-2.699a.25.25 0 00-.192 0L5.382 22.05A1 1 0 014 21.126V4.75zM8.75 10a.75.75 0 000 1.5h6a.75.75 0 000-1.5h-6z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/keyframes.scss
index 5a418587969d1..8a0f521b0cfdc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bookmark-remove {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/placeholders.scss
index 28c0e1143f238..2dfa1115668bf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bookmark-remove-icon {
   --icon-name: icon-bookmark-remove;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/property-16.scss
index 2f27a25c08acb..c924f970c9f7b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bookmark-remove-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.75 6a.75.75 0 000 1.5h4a.75.75 0 000-1.5h-4z"/><path fill-rule="evenodd" d="M4.25 1A2.25 2.25 0 002 3.25v10.83a1 1 0 001.478.878l4.403-2.394a.25.25 0 01.238 0l4.403 2.394A1 1 0 0014 14.08V3.25A2.25 2.25 0 0011.75 1h-7.5zM3.5 3.25a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75v9.989l-3.664-1.992a1.75 1.75 0 00-1.672 0L3.5 13.239V3.25z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/property-24.scss
index 7f4f59117bb84..e9fd2ffc296db 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark-remove/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bookmark-remove-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.75 10a.75.75 0 000 1.5h6a.75.75 0 000-1.5h-6z"/><path fill-rule="evenodd" d="M6.75 2A2.75 2.75 0 004 4.75v16.376a1 1 0 001.382.924l6.522-2.699a.25.25 0 01.192 0l6.522 2.699A1 1 0 0020 21.126V4.75A2.75 2.75 0 0017.25 2H6.75zM5.5 4.75c0-.69.56-1.25 1.25-1.25h10.5c.69 0 1.25.56 1.25 1.25v15.628l-5.83-2.413a1.75 1.75 0 00-1.34 0L5.5 20.378V4.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/keyframes.scss
index 49eb3962720cd..9feef2b288d8d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bookmark {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/placeholders.scss
index f64a0b99701a4..a425058f57d55 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bookmark-icon {
   --icon-name: icon-bookmark;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/property-16.scss
index 82b656d31bf04..7b0ece790634f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bookmark-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M2 3.25A2.25 2.25 0 014.25 1h7.5A2.25 2.25 0 0114 3.25v10.83a1 1 0 01-1.478.878L8.12 12.564a.25.25 0 00-.238 0l-4.403 2.394A1 1 0 012 14.08V3.25zm2.25-.75a.75.75 0 00-.75.75v9.989l3.664-1.992a1.75 1.75 0 011.672 0l3.664 1.992V3.25a.75.75 0 00-.75-.75h-7.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/property-24.scss
index c75694b1fae11..388d4fd8b6708 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bookmark/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bookmark-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M4 4.75A2.75 2.75 0 016.75 2h10.5A2.75 2.75 0 0120 4.75v16.376a1 1 0 01-1.382.924l-6.522-2.699a.25.25 0 00-.192 0L5.382 22.05A1 1 0 014 21.126V4.75zM6.75 3.5c-.69 0-1.25.56-1.25 1.25v15.628l5.83-2.413a1.75 1.75 0 011.34 0l5.83 2.413V4.75c0-.69-.56-1.25-1.25-1.25H6.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/keyframes.scss
index 406d0ebd5c5b8..3e30e862a5b67 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bottom {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/placeholders.scss
index a9556e8d38e32..18e0ebd70687b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bottom-icon {
   --icon-name: icon-bottom;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/property-16.scss
index c80674dbd38d6..f5a9af9b25502 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bottom-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.75 1a.75.75 0 01.75.75v7.614l2.955-3.129a.75.75 0 011.09 1.03l-4.25 4.5a.747.747 0 01-.533.235h-.024a.747.747 0 01-.51-.211l-.004-.005a.862.862 0 01-.02-.02l-4.25-4.499a.75.75 0 011.091-1.03L7 9.364V1.75A.75.75 0 017.75 1zM2.5 13.5a.75.75 0 000 1.5H13a.75.75 0 000-1.5H2.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/property-24.scss
index df2c87152d297..c9a24d32d8679 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bottom/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bottom-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11.75 2a.75.75 0 01.75.75v12.638l4.96-5.158a.75.75 0 111.08 1.04l-6.25 6.5a.75.75 0 01-1.08 0l-6.25-6.5a.75.75 0 111.08-1.04L11 15.388V2.75a.75.75 0 01.75-.75zM3.5 20.5a.75.75 0 000 1.5H20a.75.75 0 000-1.5H3.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/keyframes.scss
index 7c3a047780bdb..f242bad61b6f4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-boundary-color {
   100% {
     background-image: var(--icon-boundary-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/placeholders.scss
index 80485e1d107fb..001c5d751becc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-boundary-color-icon {
   --icon-name: icon-boundary-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/property-16.scss
index 3e4159d11a3db..283994f728810 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-boundary-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23F24C53"><path d="M4.81 15v-1.085h2.25v-.67H5.968v-1.093h5.149L8.726 8l2.392-4.154H5.84v5.76H3V1h9.775l1.631 2.832L12.006 8l2.448 4.252L12.872 15H4.81z"/><path d="M5.248 12.152h-1.09v1.092h1.09v-1.092zM4.09 13.907H3v1.092h1.09v-1.092z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/property-24.scss
index da2046ae44fbc..7a06a29209d9b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-boundary-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23F24C53"><path d="M6.586 22v-1.55H9.8v-.958H8.241v-1.56h7.356L12.18 12l3.417-5.934H8.058v8.229H4V2h13.964l2.33 4.046L16.866 12l3.498 6.074L18.103 22H6.586z"/><path d="M7.21 17.932H5.656v1.56H7.21v-1.56zM5.556 20.438H4v1.56h1.556v-1.56z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/index.scss
index bfb0b2d3da5f0..30424e4103aee 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../boundary-color/property-16';
         @import '../boundary-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/keyframes.scss
index 4bc10d76f2f77..987fc71996c40 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-boundary {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/placeholders.scss
index 3cb0d44af0267..11911365c9335 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-boundary-icon {
   --icon-name: icon-boundary;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/property-16.scss
index 2f86f4fdadcc6..019af7bfa1040 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-boundary-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.81 15v-1.085h2.25v-.67H5.968v-1.093h5.149L8.726 8l2.392-4.154H5.84v5.76H3V1h9.775l1.631 2.832L12.006 8l2.448 4.252L12.872 15H4.81z"/><path d="M5.248 12.152h-1.09v1.092h1.09v-1.092zM3 13.907h1.09v1.092H3v-1.092z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/property-24.scss
index 78c984366ac91..c243db4642c95 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/boundary/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-boundary-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.81 15v-1.085h2.25v-.67H5.968v-1.093h5.149L8.726 8l2.392-4.154H5.84v5.76H3V1h9.775l1.631 2.832L12.006 8l2.448 4.252L12.872 15H4.81z"/><path d="M5.248 12.152h-1.09v1.092h1.09v-1.092zM3 13.907h1.09v1.092H3v-1.092z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/box-check-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/box-check-fill/index.scss
index 61a22d9daf6ba..626934f911f73 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/box-check-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/box-check-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../check-square-fill/property-16';
         @import '../check-square-fill/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/box-check-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/box-check-fill/keyframes.scss
index df95628c3676d..e28b87826b5a9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/box-check-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/box-check-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-box-check-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/box-check-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/box-check-fill/placeholders.scss
index 3a0e96eb537ff..8448aedb07fdc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/box-check-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/box-check-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-box-check-fill-icon {
   --icon-name: icon-box-check-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/box-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/box-outline/index.scss
index c236b51d89961..d9656ffd8f5e6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/box-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/box-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../square/property-16';
         @import '../square/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/box-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/box-outline/keyframes.scss
index c15d858d016cf..facb029bba300 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/box-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/box-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-box-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/box-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/box-outline/placeholders.scss
index 5d75afb541f3c..0c20a1270a7fb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/box-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/box-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-box-outline-icon {
   --icon-name: icon-box-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/box/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/box/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/box/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/box/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/box/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/box/keyframes.scss
index e404a9a7e9146..f47c270ae0dfc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/box/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/box/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-box {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/box/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/box/placeholders.scss
index ac00eccd6de23..7ffe2d4e803a8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/box/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/box/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-box-icon {
   --icon-name: icon-box;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/box/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/box/property-16.scss
index b609887261c51..b0e4e00988497 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/box/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/box/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-box-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M6.98.678a2.25 2.25 0 012.04 0l5.297 2.696c.42.214.683.644.683 1.114v6.717c0 .658-.37 1.261-.956 1.56L9.02 15.322a2.25 2.25 0 01-2.042 0l-5.023-2.557A1.75 1.75 0 011 11.205V4.488c0-.47.264-.9.683-1.114L6.979.678zm1.36 1.337a.75.75 0 00-.68 0L3.224 4.273 8 6.661l4.776-2.388L8.34 2.015zm-5.84 9.19V5.588l4.75 2.375v5.814l-4.613-2.35a.25.25 0 01-.137-.222zm6.25 2.572l4.613-2.35a.25.25 0 00.137-.222V5.588L8.75 7.963v5.814z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/box/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/box/property-24.scss
index 451a7c3b15a36..2bc182091b972 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/box/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/box/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-box-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M13.206.754a2.75 2.75 0 00-2.412 0L1.983 5.052A1.75 1.75 0 001 6.625v9.902a2.75 2.75 0 001.496 2.448l8.25 4.226a2.75 2.75 0 002.508 0l8.25-4.226A2.75 2.75 0 0023 16.527V6.625a1.75 1.75 0 00-.983-1.573L13.206.754zm-1.754 1.348a1.25 1.25 0 011.096 0l8.11 3.956L12 10.17 3.343 6.058l8.109-3.956zM2.5 7.318v9.21c0 .468.263.898.68 1.112l8.07 4.133V11.474L2.5 7.318zm10.25 14.455l8.07-4.133a1.25 1.25 0 00.68-1.113v-9.21l-8.75 4.157v10.3z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/keyframes.scss
index b5e2b49f0af40..cb5ce251e161a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-briefcase {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/placeholders.scss
index 147322aef8bd9..373830fb45626 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-briefcase-icon {
   --icon-name: icon-briefcase;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/property-16.scss
index 7698e6d4613eb..6e9408a16b7a5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-briefcase-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M5.75 1A1.75 1.75 0 004 2.75V4H2.25A2.25 2.25 0 000 6.25v6.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-6.5A2.25 2.25 0 0013.75 4H12V2.75A1.75 1.75 0 0010.25 1h-4.5zm6.75 12.5h1.25a.75.75 0 00.75-.75v-6.5a.75.75 0 00-.75-.75H12.5v8zm-1.5-8v8H5v-8h6zm-7.5 8v-8H2.25a.75.75 0 00-.75.75v6.5c0 .414.336.75.75.75H3.5zm7-9.5V2.75a.25.25 0 00-.25-.25h-4.5a.25.25 0 00-.25.25V4h5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/property-24.scss
index b1b080b29f9cc..0b287c0079b0f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/briefcase/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-briefcase-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M9.75 2A2.75 2.75 0 007 4.75V6H3.75A2.75 2.75 0 001 8.75v10.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V8.75A2.75 2.75 0 0020.25 6H17V4.75A2.75 2.75 0 0014.25 2h-4.5zm6.75 5.5h-9v13h9v-13zm1.5 13v-13h2.25c.69 0 1.25.56 1.25 1.25v10.5c0 .69-.56 1.25-1.25 1.25H18zM3.75 7.5H6v13H3.75c-.69 0-1.25-.56-1.25-1.25V8.75c0-.69.56-1.25 1.25-1.25zM15.5 6V4.75c0-.69-.56-1.25-1.25-1.25h-4.5c-.69 0-1.25.56-1.25 1.25V6h7z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/broadcast/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/broadcast/index.scss
index 8f5c8bd547523..23884d4269370 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/broadcast/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/broadcast/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../radio/property-16';
         @import '../radio/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/broadcast/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/broadcast/keyframes.scss
index 62d74700fc3e6..dada076b8eddc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/broadcast/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/broadcast/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-broadcast {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/broadcast/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/broadcast/placeholders.scss
index 9e794c7bd6e0c..85b59489a3ce9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/broadcast/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/broadcast/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-broadcast-icon {
   --icon-name: icon-broadcast;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bug/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bug/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bug/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bug/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bug/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bug/keyframes.scss
index 5bb58e73b9dc3..25cf889f6bc66 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bug/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bug/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bug {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bug/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bug/placeholders.scss
index 850f693711f9f..b71b5792aa202 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bug/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bug/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bug-icon {
   --icon-name: icon-bug;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bug/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bug/property-16.scss
index 193d67da721b5..533374f9aded8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bug/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bug/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bug-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M10.136.803a.75.75 0 011.061 1.06l-.415.416C11.525 2.932 12 3.853 12 4.909c0 .103-.005.205-.014.306.094.016.173.03.238.045a.973.973 0 01.776.951V6.6l1.571-.629a.75.75 0 01.557 1.393L13 8.214v1.13l1.849.246a.75.75 0 11-.198 1.487l-1.659-.221a3.935 3.935 0 01-.426 1.555l2.364.887a.75.75 0 01-.527 1.404l-2.667-1a.752.752 0 01-.12-.058C10.687 14.491 9.384 15 8 15s-2.687-.509-3.616-1.356a.752.752 0 01-.12.058l-2.667 1a.75.75 0 11-.527-1.404l2.364-.887a3.935 3.935 0 01-.426-1.555l-1.659.22a.75.75 0 01-.198-1.486L3 9.343V8.174L.971 7.363a.75.75 0 01.557-1.393L3 6.56V6.21c0-.474.334-.854.776-.95.065-.015.144-.03.238-.046C4.004 5.114 4 5.012 4 4.909c0-1.056.475-1.977 1.218-2.63l-.415-.415A.75.75 0 015.863.803l.695.694a4.318 4.318 0 012.884 0l.694-.694zm-4.63 4.26C6.133 5.026 6.946 5 8 5c1.054 0 1.867.026 2.494.063.004-.051.006-.102.006-.154C10.5 3.793 9.461 2.75 8 2.75S5.5 3.793 5.5 4.91c0 .05.002.102.006.153zM4.5 7.652v-.994C5.043 6.586 6.093 6.5 8 6.5s2.957.086 3.5.158v3.949c0 1.494-1.454 2.893-3.5 2.893-2.046 0-3.5-1.4-3.5-2.893v-.59-2.335-.03z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bug/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bug/property-24.scss
index c499e234655e3..87ed5c294e17e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bug/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bug/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bug-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M15.72 1.22a.75.75 0 111.06 1.06l-1.176 1.177a4.597 4.597 0 011.293 4.256c.612.071 1.008.147 1.258.208.54.133.845.61.845 1.089v1.408l2.987-1.12a.75.75 0 01.526 1.404L19 12.02v2.318l3.343.418a.75.75 0 11-.186 1.488L19 15.85v.4c0 .931-.195 1.816-.545 2.62l3.808 1.428a.75.75 0 01-.526 1.404l-4-1.5a.754.754 0 01-.046-.019C16.415 21.894 14.332 23 12 23s-4.415-1.106-5.69-2.817a.775.775 0 01-.047.02l-4 1.5a.75.75 0 11-.526-1.405l3.808-1.429A6.523 6.523 0 015 16.25v-.4l-3.157.394a.75.75 0 01-.186-1.488L5 14.338V12.02l-3.513-1.318a.75.75 0 01.526-1.404L5 10.418V9.01c0-.479.305-.956.845-1.089.25-.06.646-.137 1.258-.208a4.597 4.597 0 011.293-4.256L7.22 2.28a.75.75 0 011.06-1.06L9.63 2.568A5.196 5.196 0 0112 2c.852 0 1.661.205 2.371.568L15.72 1.22zM8.617 7.586A58.06 58.06 0 0112 7.5c1.4 0 2.508.035 3.383.086.076-.266.117-.547.117-.836 0-1.753-1.524-3.25-3.5-3.25S8.5 4.997 8.5 6.75c0 .29.04.57.117.836zM6.5 11.485v-2.17C7.198 9.188 8.772 9 12 9s4.802.187 5.5.316v6.934c0 2.87-2.433 5.25-5.5 5.25s-5.5-2.38-5.5-5.25v-1.234-3.5-.031z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/build/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/build/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/build/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/build/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/build/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/build/keyframes.scss
index 4acc8d3f40333..0213949110e89 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/build/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/build/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-build {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/build/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/build/placeholders.scss
index 5472b58638299..bdb42198337d3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/build/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/build/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-build-icon {
   --icon-name: icon-build;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/build/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/build/property-16.scss
index cb7e0517d9c53..d934203500006 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/build/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/build/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-build-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8.603 2.549A4.251 4.251 0 005.47 8.696a1.076 1.076 0 01-.255 1.312l-3 2.374a.75.75 0 01-.93-1.176l2.701-2.139A5.75 5.75 0 019.47 1.004c.53.02.924.363 1.066.797.137.42.035.902-.306 1.243L8.75 4.523v1.596l1.13 1.13h1.597l1.48-1.479a1.22 1.22 0 011.241-.306c.435.142.778.537.798 1.066a5.75 5.75 0 01-7.978 5.52l-2.102 2.664a.75.75 0 01-1.177-.928l2.333-2.959a1.076 1.076 0 011.297-.265 4.251 4.251 0 006.082-3.165L12.41 8.438c-.199.2-.47.312-.75.312h-1.96c-.282 0-.552-.112-.751-.312L7.56 7.052c-.2-.2-.311-.47-.311-.751V4.34c0-.281.112-.551.311-.75l1.042-1.042z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/build/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/build/property-24.scss
index c7384bd17e7b6..19875f37d85b0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/build/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/build/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-build-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M14.05 2.5a7.45 7.45 0 00-6.625 10.86 1.284 1.284 0 01-.29 1.556l-4.92 3.894a.75.75 0 01-.93-1.176l4.727-3.743a8.95 8.95 0 019.013-12.839c1.1.12 1.369 1.403.703 2.068L12.75 6.1v3.016l2.135 2.134H17.9l2.979-2.978c.665-.666 1.948-.396 2.067.703a8.95 8.95 0 01-12.704 9.078l-3.677 4.663a.75.75 0 01-1.178-.93l3.827-4.851a.763.763 0 01.059-.066 1.284 1.284 0 011.478-.236 7.45 7.45 0 0010.746-6.859l-2.606 2.607c-.237.236-.558.37-.893.37h-3.212c-.335 0-.657-.133-.893-.37l-2.274-2.274a1.262 1.262 0 01-.37-.893V6c0-.335.133-.656.37-.892l2.605-2.606a7.62 7.62 0 00-.175-.002z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/keyframes.scss
index bbc09aeefcba9..07fd5ef41b4ef 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-bulb {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/placeholders.scss
index 0413ffc331515..80727c6f97477 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-bulb-icon {
   --icon-name: icon-bulb;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/property-16.scss
index bd37e7ceaa0a3..0ba1d124d5502 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bulb-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 0a.75.75 0 01.75.75v1a.75.75 0 01-1.5 0v-1A.75.75 0 018 0zM13.28 2.22a.75.75 0 010 1.06l-.707.707a.75.75 0 11-1.06-1.06l.707-.707a.75.75 0 011.06 0zM2.72 3.28a.75.75 0 011.06-1.06l.707.707a.75.75 0 01-1.06 1.06L2.72 3.28zM15.5 7.5a.75.75 0 01-.75.75h-1a.75.75 0 010-1.5h1a.75.75 0 01.75.75zM2.25 8.25a.75.75 0 000-1.5h-1a.75.75 0 000 1.5h1zM6.25 15.25A.75.75 0 017 14.5h2A.75.75 0 019 16H7a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M8 3.5A4.5 4.5 0 003.5 8c0 1.53.926 2.465 1.718 3.264l.2.203c.05.05.081.124.081.208.001 1.008.818 1.825 1.826 1.825H8.69c1 0 1.811-.81 1.811-1.81 0-.083.033-.159.088-.213l.067-.066C11.492 10.592 12.5 9.605 12.5 8A4.5 4.5 0 008 3.5zM5 8a3 3 0 016 0c0 .928-.54 1.502-1.462 2.406-.347.34-.538.803-.538 1.283a.31.31 0 01-.31.311H7.324A.326.326 0 017 11.674c0-.461-.175-.914-.507-1.255l-.115-.117C5.49 9.397 5 8.894 5 8z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/property-24.scss
index 43c3a4f4c610e..1bf52a5e2b495 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/bulb/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-bulb-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 1a.75.75 0 01.75.75v1.5a.75.75 0 01-1.5 0v-1.5A.75.75 0 0112 1zM22.5 11.75a.75.75 0 01-.75.75h-1.5a.75.75 0 010-1.5h1.5a.75.75 0 01.75.75zM3.75 12.5a.75.75 0 000-1.5h-1.5a.75.75 0 000 1.5h1.5zM19.53 4.22a.75.75 0 010 1.06l-1.06 1.061a.75.75 0 01-1.061-1.06l1.06-1.061a.75.75 0 011.061 0zM4.47 5.28a.75.75 0 011.06-1.06l1.061 1.06a.75.75 0 01-1.06 1.061L4.47 5.281zM9.5 22.25a.75.75 0 01.75-.75h3.5a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M12 5.5a6 6 0 00-6 6c0 1.993 1.186 3.18 2.287 4.281l.316.318a.702.702 0 01.196.494v.658a2.25 2.25 0 002.25 2.249h1.901a2.25 2.25 0 002.25-2.25v-.629c0-.199.08-.386.216-.52l.122-.118C16.704 14.851 18 13.593 18 11.5a6 6 0 00-6-6zm-4.5 6a4.5 4.5 0 019 0c0 1.436-.85 2.28-2.13 3.527-.433.421-.67.998-.67 1.594v.629a.75.75 0 01-.75.75h-1.9a.75.75 0 01-.75-.75l-.001-.658c0-.569-.216-1.127-.626-1.544l-.264-.268C8.239 13.596 7.5 12.848 7.5 11.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/keyframes.scss
index 6014ea73d683b..37e95247f84cb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-calendar {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/placeholders.scss
index b6772f9091aea..574363a670e12 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-calendar-icon {
   --icon-name: icon-calendar;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/property-16.scss
index 78731e521150c..fbcb6f8aed847 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-calendar-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M11.5.75a.75.75 0 00-1.5 0V1H6V.75a.75.75 0 00-1.5 0V1H3.25A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1H11.5V.75zm-7 2.5V2.5H3.25a.75.75 0 00-.75.75V5h11V3.25a.75.75 0 00-.75-.75H11.5v.75a.75.75 0 01-1.5 0V2.5H6v.75a.75.75 0 01-1.5 0zm9 3.25h-11v6.25c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V6.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/property-24.scss
index 7176f024b37b0..c1b0743cc905e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/calendar/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-calendar-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M17 1a.75.75 0 00-1.5 0v1h-7V1A.75.75 0 007 1v1H4.75A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H17V1zm3.5 7V4.75c0-.69-.56-1.25-1.25-1.25H17V5a.75.75 0 01-1.5 0V3.5h-7V5A.75.75 0 017 5V3.5H4.75c-.69 0-1.25.56-1.25 1.25V8h17zm-17 1.5h17v9.75c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25V9.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/keyframes.scss
index 05baf891cb6da..bf76f9be03ca9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-camera-off {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/placeholders.scss
index 053eb0bd2f982..d480378678722 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-camera-off-icon {
   --icon-name: icon-camera-off;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/property-16.scss
index c4f251374936d..16bbbcdeaf9aa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-camera-off-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M1.22 1.22a.75.75 0 011.06 0l12.5 12.5a.75.75 0 11-1.06 1.06l-.78-.78H3.25A2.25 2.25 0 011 11.75V5.155a2.25 2.25 0 011.138-1.957L1.22 2.28a.75.75 0 010-1.06zm8.304 9.364l1.915 1.916H3.25a.75.75 0 01-.75-.75V5.155a.75.75 0 01.686-.748l.148-.012 2.081 2.081a3 3 0 004.108 4.108zM8.389 9.45L6.55 7.611A1.5 1.5 0 008.389 9.45z" clip-rule="evenodd"/><path d="M5.866 1h3.958c.475 0 .91.27 1.12.696l.54 1.093 1.457.124A2.25 2.25 0 0115 5.155v5.595a.75.75 0 01-1.5 0V5.155a.75.75 0 00-.686-.748l-1.878-.16a.75.75 0 01-.608-.414L9.668 2.5H5.866a.75.75 0 010-1.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/property-24.scss
index d058c197b2d9b..9eeeb8beb0848 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/camera-off/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-camera-off-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M5 8a1 1 0 000 2h.01a1 1 0 100-2H5z"/><path fill-rule="evenodd" d="M2.28 1.22a.75.75 0 00-1.06 1.06l2.615 2.616-.221.01A2.75 2.75 0 001 7.654V19.25A2.75 2.75 0 003.75 22h17.19l.78.78a.75.75 0 101.06-1.06L2.28 1.22zM19.44 20.5l-3.935-3.934a5 5 0 01-7.07-7.07l-3.17-3.17-1.577.079A1.25 1.25 0 002.5 7.653V19.25c0 .69.56 1.25 1.25 1.25h15.69zm-9.945-9.944l4.95 4.949a3.5 3.5 0 01-4.95-4.95z" clip-rule="evenodd"/><path d="M9.094 2c-.64 0-1.23.35-1.537.912l-.421.773a.75.75 0 101.317.718l.421-.773a.25.25 0 01.22-.13h5.812a.25.25 0 01.22.13l1.216 2.23a.75.75 0 00.622.39l3.346.158a1.25 1.25 0 011.19 1.249V18.5a.75.75 0 001.5 0V7.657a2.75 2.75 0 00-2.62-2.747l-2.923-.14-1.014-1.858A1.75 1.75 0 0014.906 2H9.094z"/><path d="M12.345 8.698a.75.75 0 01.915-.538 5.007 5.007 0 013.58 3.58.75.75 0 01-1.452.377 3.507 3.507 0 00-2.505-2.505.75.75 0 01-.538-.914z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/camera/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/camera/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/camera/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/camera/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/camera/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/camera/keyframes.scss
index f53f121015f66..f39e90b52abde 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/camera/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/camera/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-camera {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/camera/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/camera/placeholders.scss
index 10c19eb67358e..2fec80d617635 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/camera/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/camera/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-camera-icon {
   --icon-name: icon-camera;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/camera/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/camera/property-16.scss
index 0f37a42b1d2c8..a05d36cebc00b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/camera/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/camera/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-camera-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3 6a1 1 0 011-1h.01a1 1 0 010 2H4a1 1 0 01-1-1z"/><path fill-rule="evenodd" d="M8 5a3 3 0 100 6 3 3 0 000-6zM6.5 8a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M5.056 1.696A1.25 1.25 0 016.176 1h3.648c.475 0 .91.27 1.12.696l.54 1.093 1.457.124A2.25 2.25 0 0115 5.155v6.595A2.25 2.25 0 0112.75 14h-9.5A2.25 2.25 0 011 11.75V5.155a2.25 2.25 0 012.059-2.242l1.456-.124.541-1.093zm1.276.804l-.66 1.333a.75.75 0 01-.608.414l-1.878.16a.75.75 0 00-.686.748v6.595c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V5.155a.75.75 0 00-.686-.748l-1.878-.16a.75.75 0 01-.608-.414L9.668 2.5H6.332z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/camera/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/camera/property-24.scss
index b7f4d719ed18a..7f35d16f03de4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/camera/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/camera/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-camera-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M7 13a5 5 0 1110 0 5 5 0 01-10 0zm5-3.5a3.5 3.5 0 100 7 3.5 3.5 0 000-7z" clip-rule="evenodd"/><path d="M5 8a1 1 0 000 2h.01a1 1 0 000-2H5z"/><path fill-rule="evenodd" d="M7.557 2.912A1.75 1.75 0 019.094 2h5.812c.64 0 1.23.35 1.537.912l1.014 1.859 2.924.14A2.75 2.75 0 0123 7.656V19.25A2.75 2.75 0 0120.25 22H3.75A2.75 2.75 0 011 19.25V7.657A2.75 2.75 0 013.62 4.91l2.923-.14 1.014-1.858zm1.537.588a.25.25 0 00-.22.13L7.658 5.86a.75.75 0 01-.622.39l-3.345.158A1.25 1.25 0 002.5 7.657V19.25c0 .69.56 1.25 1.25 1.25h16.5c.69 0 1.25-.56 1.25-1.25V7.657a1.25 1.25 0 00-1.19-1.249l-3.346-.159a.75.75 0 01-.622-.39L15.126 3.63a.25.25 0 00-.22-.13H9.094z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-fill/index.scss
index a306b7916907d..8e7da4442e7fd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../x-circle-fill/property-16';
         @import '../x-circle-fill/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-fill/keyframes.scss
index 02a363cbf2a3e..b02d96873bea2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cancel-circle-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-fill/placeholders.scss
index c1731f0459d51..136f1a88c3c08 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cancel-circle-fill-icon {
   --icon-name: icon-cancel-circle-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-outline/index.scss
index 943585eade346..b7a1e026d1abb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../x-circle/property-16';
         @import '../x-circle/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-outline/keyframes.scss
index 8870216eb5a4b..e856c65a67446 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cancel-circle-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-outline/placeholders.scss
index a9b3362c578ec..112ff786ff991 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-circle-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cancel-circle-outline-icon {
   --icon-name: icon-cancel-circle-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-plain/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-plain/index.scss
index d6a6d1120e8fc..d6f0d8652b7e0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-plain/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-plain/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../x/property-16';
         @import '../x/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-plain/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-plain/keyframes.scss
index 9410d029bf18a..56d9274839971 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-plain/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-plain/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cancel-plain {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-plain/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-plain/placeholders.scss
index d18d5e629c6b2..a98d4a95b329a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-plain/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-plain/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cancel-plain-icon {
   --icon-name: icon-cancel-plain;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-fill/index.scss
index a40930d8c3850..948f9a6fafa3f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../x-square-fill/property-16';
         @import '../x-square-fill/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-fill/keyframes.scss
index 33e30a5dda886..42c6c915c6a85 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cancel-square-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-fill/placeholders.scss
index fb1c456e56dc5..c71686414c5a4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cancel-square-fill-icon {
   --icon-name: icon-cancel-square-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-outline/index.scss
index 2b7072c6d3831..fb603dfa1ef20 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../x-square/property-16';
         @import '../x-square/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-outline/keyframes.scss
index 6b7e301221673..b53fc5017442f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cancel-square-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-outline/placeholders.scss
index 835f77d367e7c..535051a1b58e5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cancel-square-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cancel-square-outline-icon {
   --icon-name: icon-cancel-square-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/caret-down/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/caret-down/index.scss
index 2613539e2b757..35011c58638b2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/caret-down/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/caret-down/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../caret/property-16';
         @import '../caret/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/caret-down/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/caret-down/keyframes.scss
index 7f0a5e729210c..dd2e144394db0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/caret-down/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/caret-down/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-caret-down {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/caret-down/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/caret-down/placeholders.scss
index 42f57e4ea1396..7ea82a6053fe1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/caret-down/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/caret-down/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-caret-down-icon {
   --icon-name: icon-caret-down;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/caret-up/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/caret-up/index.scss
index 886eaecdea35e..9c7a440a02355 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/caret-up/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/caret-up/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../chevron-up/property-16';
         @import '../chevron-up/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/caret-up/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/caret-up/keyframes.scss
index 45542629ec0bc..389ce1848f02a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/caret-up/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/caret-up/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-caret-up {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/caret-up/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/caret-up/placeholders.scss
index cb2121b7117b1..9d97c84d55abb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/caret-up/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/caret-up/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-caret-up-icon {
   --icon-name: icon-caret-up;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/caret/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/caret/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/caret/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/caret/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/caret/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/caret/keyframes.scss
index 10e1b9f31e4d6..c7ef4694be69f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/caret/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/caret/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-caret {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/caret/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/caret/placeholders.scss
index 0fdd86953cdd8..612d4a5ddf265 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/caret/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/caret/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-caret-icon {
   --icon-name: icon-caret;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/caret/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/caret/property-16.scss
index 3346286691007..436ce0ee53d8c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/caret/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/caret/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-caret-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8.55 2.24a.75.75 0 00-1.1 0L4.2 5.74a.75.75 0 101.1 1.02L8 3.852l2.7 2.908a.75.75 0 101.1-1.02l-3.25-3.5zM7.45 13.76a.75.75 0 001.1 0l3.25-3.5a.75.75 0 10-1.1-1.02L8 12.148 5.3 9.24a.75.75 0 00-1.1 1.02l3.25 3.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/caret/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/caret/property-24.scss
index 11e94eb7391fa..f7dab6ee1554f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/caret/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/caret/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-caret-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12.543 3.232a.75.75 0 00-1.085 0l-5.25 5.5a.75.75 0 101.085 1.036L12 4.836l4.707 4.932a.75.75 0 001.085-1.036l-5.25-5.5zM11.457 20.768a.75.75 0 001.085 0l5.25-5.5a.75.75 0 00-1.085-1.036L12 19.164l-4.707-4.932a.75.75 0 00-1.086 1.036l5.25 5.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cast/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cast/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cast/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cast/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cast/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cast/keyframes.scss
index daeab71f2e303..bb449ae8847a1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cast/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cast/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cast {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cast/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cast/placeholders.scss
index 7ed224f3e3560..88ac6e4bba4c8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cast/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cast/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cast-icon {
   --icon-name: icon-cast;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cast/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cast/property-16.scss
index 2c752b53ba40b..de5c80c7c0eaa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cast/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cast/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cast-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.25 2A2.25 2.25 0 001 4.25v1.23a.75.75 0 001.5 0V4.25a.75.75 0 01.75-.75h9.5a.75.75 0 01.75.75v7.5a.75.75 0 01-.75.75H9.724a.75.75 0 000 1.5h3.026A2.25 2.25 0 0015 11.75v-7.5A2.25 2.25 0 0012.75 2h-9.5z"/><path d="M1.833 7.505a.75.75 0 10-.166 1.49 4.91 4.91 0 014.338 4.338.75.75 0 101.49-.166 6.41 6.41 0 00-5.662-5.662z"/><path d="M1.9 10.062a.75.75 0 00-.3 1.47A2.394 2.394 0 013.468 13.4a.75.75 0 101.47-.3A3.894 3.894 0 001.9 10.062z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cast/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cast/property-24.scss
index 9a9f65f69a17b..190ac80dcde4a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cast/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cast/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cast-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3.75 3A2.75 2.75 0 001 5.75V8a.75.75 0 001.5 0V5.75c0-.69.56-1.25 1.25-1.25h16.5c.69 0 1.25.56 1.25 1.25v12.5c0 .69-.56 1.25-1.25 1.25H14a.75.75 0 000 1.5h6.25A2.75 2.75 0 0023 18.25V5.75A2.75 2.75 0 0020.25 3H3.75z"/><path d="M1.833 11.005a.75.75 0 10-.166 1.49 8.873 8.873 0 017.838 7.838.75.75 0 101.49-.166 10.373 10.373 0 00-9.162-9.162zM1.9 15.345a.75.75 0 00-.3 1.47A4.596 4.596 0 015.185 20.4a.75.75 0 001.47-.3A6.096 6.096 0 001.9 15.345z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/keyframes.scss
index 23531ccc3d2a8..146762d4b38a4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-certificate {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/placeholders.scss
index e232f0da141ae..fe82ffafcd214 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-certificate-icon {
   --icon-name: icon-certificate;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/property-16.scss
index f603611d17c36..3179fd8bef17f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-certificate-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.25 3.25A.75.75 0 017 2.5h2A.75.75 0 019 4H7a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M3.25 0A2.25 2.25 0 001 2.25v9.5A2.25 2.25 0 003.25 14h1.67l-.115.913a.7.7 0 00.955.737L8 14.754l2.24.896a.7.7 0 00.955-.737L11.08 14h1.669A2.25 2.25 0 0015 11.75v-9.5A2.25 2.25 0 0012.75 0h-9.5zm7.643 12.5h1.857a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75h-9.5a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h1.857l.172-1.378a3.45 3.45 0 115.441 0l.173 1.378zm-1.456-.362c-.438.2-.924.312-1.437.312s-1-.112-1.437-.312l-.221 1.771 1.398-.559a.7.7 0 01.52 0l1.398.56-.221-1.772zM5.95 9a2.05 2.05 0 114.1 0 2.05 2.05 0 01-4.1 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/property-24.scss
index 47cbeaf168b95..9e06844133587 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/certificate/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-certificate-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M10 5a.75.75 0 000 1.5h4A.75.75 0 0014 5h-4z"/><path fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v14.5A2.75 2.75 0 005.75 21h1.485l-.22 1.103a.75.75 0 001.054.826L12 21.079l3.93 1.85a.75.75 0 001.055-.826L16.765 21h1.485A2.75 2.75 0 0021 18.25V3.75A2.75 2.75 0 0018.25 1H5.75zm2.438 15.236L7.535 19.5H5.75c-.69 0-1.25-.56-1.25-1.25V3.75c0-.69.56-1.25 1.25-1.25h12.5c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25h-1.785l-.653-3.264a5 5 0 10-7.624 0zm6.219-.695a.75.75 0 01.135-.135 3.5 3.5 0 10-5.084 0c.051.04.096.085.135.135A3.488 3.488 0 0012 16.5c.932 0 1.78-.364 2.407-.959zM12 18a4.977 4.977 0 01-2.501-.67l-.722 3.608 2.904-1.367a.75.75 0 01.638 0l2.904 1.367-.722-3.608c-.736.426-1.59.67-2.501.67z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/keyframes.scss
index 6ef069458128d..ee6b6afda42e5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-change-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/placeholders.scss
index 274604f1c802e..2e72a989bb84f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-change-circle-icon {
   --icon-name: icon-change-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/property-16.scss
index b749a5a4cbf7f..dba072b698aa3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-change-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8.586 7.532c.477.597.864.834 1.135.92a.936.936 0 00.69-.04c.228-.1.442-.27.627-.458.09-.09.168-.18.234-.257l.03-.036c.048-.058.12-.143.17-.193a.75.75 0 011.062 1.06l-.023.026-.025.03-.07.082a5.846 5.846 0 01-.312.344c-.253.256-.623.572-1.095.778a2.434 2.434 0 01-1.743.094c-.64-.204-1.257-.67-1.852-1.414-.477-.597-.864-.834-1.135-.92a.936.936 0 00-.69.04c-.228.1-.442.27-.627.458-.09.09-.168.18-.234.257l-.03.036a3.3 3.3 0 01-.17.193.75.75 0 01-1.063-1.057l.024-.03.025-.028.07-.083c.077-.092.183-.214.312-.344.253-.256.623-.572 1.095-.777a2.434 2.434 0 011.743-.095c.64.204 1.257.67 1.852 1.414z"/><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/property-24.scss
index b465691aa6031..c172a9d37df4b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-change-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M7.071 12.486c.056-.065.116-.143.182-.229.284-.366.677-.874 1.264-1.128a1.5 1.5 0 011.117-.041c.46.152 1.064.539 1.795 1.398.84.988 1.66 1.583 2.465 1.85a2.998 2.998 0 002.185-.089c1.012-.438 1.715-1.388 1.933-1.682.028-.038.048-.066.06-.08a.75.75 0 00-1.143-.97 6.64 6.64 0 00-.182.227c-.284.367-.677.875-1.264 1.129a1.5 1.5 0 01-1.117.041c-.46-.152-1.064-.539-1.795-1.398-.84-.988-1.66-1.584-2.465-1.85a2.998 2.998 0 00-2.185.089c-1.012.438-1.715 1.388-1.933 1.682-.028.038-.048.066-.06.08a.75.75 0 101.143.97z"/><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/keyframes.scss
index 9de36907831da..5df79c0034575 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-change-square {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/placeholders.scss
index 6e34cc11945a9..496b141863640 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-change-square-icon {
   --icon-name: icon-change-square;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/property-16.scss
index 415d77f39d1f4..90bb61899619a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-change-square-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8.586 7.532c.477.597.864.834 1.135.92a.936.936 0 00.69-.04c.228-.1.442-.27.627-.458.09-.09.168-.18.234-.257l.03-.036c.048-.058.12-.143.17-.193a.75.75 0 011.062 1.06l-.023.026-.025.03-.07.082a5.846 5.846 0 01-.312.344c-.253.256-.623.572-1.095.778a2.434 2.434 0 01-1.743.094c-.64-.204-1.257-.67-1.852-1.414-.477-.597-.864-.834-1.135-.92a.936.936 0 00-.69.04c-.228.1-.442.27-.627.458-.09.09-.168.18-.234.257l-.03.036a3.3 3.3 0 01-.17.193.75.75 0 01-1.063-1.057l.001-.002.023-.027.025-.03.07-.082c.077-.092.183-.214.312-.344.253-.256.623-.572 1.095-.777a2.434 2.434 0 011.743-.095c.64.204 1.257.67 1.852 1.414z"/><path fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zM2.5 3.25a.75.75 0 01.75-.75h9.5a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75v-9.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/property-24.scss
index 0066ef3604061..6912e156359cd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change-square/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-change-square-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M7.071 12.486c.056-.065.116-.143.182-.229.284-.366.677-.874 1.264-1.128a1.5 1.5 0 011.117-.041c.46.152 1.064.539 1.795 1.398.84.988 1.66 1.583 2.465 1.85a2.998 2.998 0 002.185-.089c1.012-.438 1.715-1.388 1.933-1.682.028-.038.048-.066.06-.08a.75.75 0 00-1.143-.97 6.64 6.64 0 00-.182.227c-.284.367-.677.875-1.264 1.129a1.5 1.5 0 01-1.117.041c-.46-.152-1.064-.539-1.795-1.398-.84-.988-1.66-1.584-2.465-1.85a2.998 2.998 0 00-2.185.089c-1.012.438-1.715 1.388-1.933 1.682a2.056 2.056 0 01-.06.08.75.75 0 101.143.97z"/><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25h14.5c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25V4.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change/keyframes.scss
index 264f62bafd368..248a4799792ee 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-change {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change/placeholders.scss
index 2838965fd3ed0..530243c4da2f8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-change-icon {
   --icon-name: icon-change;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change/property-16.scss
index d811a2d843ad3..69544fb5c9ca8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-change-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M9.721 8.453c-.27-.087-.658-.324-1.135-.921-.595-.745-1.211-1.21-1.852-1.414a2.434 2.434 0 00-1.743.094c-.472.206-.842.522-1.095.778a5.881 5.881 0 00-.382.427l-.025.029-.024.029a.75.75 0 001.064 1.057 3.3 3.3 0 00.2-.229c.065-.078.143-.166.233-.257.185-.188.399-.359.627-.458a.936.936 0 01.69-.04c.27.086.658.323 1.135.92.595.745 1.211 1.21 1.852 1.414a2.434 2.434 0 001.743-.094c.472-.206.841-.522 1.095-.778.129-.13.235-.252.313-.344l.069-.082a4.562 4.562 0 01.05-.059.75.75 0 00-1.065-1.057 3.292 3.292 0 00-.2.229 4.393 4.393 0 01-.233.257 2.102 2.102 0 01-.627.458.936.936 0 01-.69.04z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/change/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/change/property-24.scss
index 40a98e4852634..a851c186a22c3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/change/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/change/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-change-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.534 12.224c-.082.104-.155.195-.219.269a.75.75 0 11-1.13-.986c.02-.023.053-.066.097-.123.308-.404 1.183-1.548 2.442-2.08a3.783 3.783 0 012.699-.106c1.003.324 2.05 1.056 3.142 2.31.98 1.122 1.81 1.652 2.473 1.866a2.285 2.285 0 001.654-.06c.837-.354 1.402-1.068 1.774-1.538.082-.104.155-.195.219-.269a.75.75 0 011.13.986c-.02.023-.053.066-.097.123-.308.404-1.183 1.548-2.442 2.08a3.783 3.783 0 01-2.699.106c-1.003-.324-2.05-1.056-3.142-2.31-.98-1.122-1.81-1.652-2.473-1.866a2.284 2.284 0 00-1.654.06c-.837.354-1.402 1.068-1.774 1.538z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/keyframes.scss
index 092a990afb3e0..ab490f3448770 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-check-circle-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/placeholders.scss
index 207490ccf4386..1918607508ea6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-check-circle-fill-icon {
   --icon-name: icon-check-circle-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/property-16.scss
index 992644f8d33f1..a0efbf29c5622 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-circle-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zm2.72 5.22a.75.75 0 111.06 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/property-24.scss
index 930e429704cad..b063a5b26409c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-circle-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm4.72 7.22a.75.75 0 111.06 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-outline/index.scss
index 6039ff04ce02a..ba784d5f9b5ff 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../check-circle/property-16';
         @import '../check-circle/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-outline/keyframes.scss
index 2147b60243fdb..4805132744ad9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-check-circle-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-outline/placeholders.scss
index 099aeb1c676fd..869789ae5749b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-check-circle-outline-icon {
   --icon-name: icon-check-circle-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/keyframes.scss
index 78cc472f48293..f25cb9ea8bde9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-check-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/placeholders.scss
index ba97e52aa2ee7..2404521496038 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-check-circle-icon {
   --icon-name: icon-check-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/property-16.scss
index 1b3553f06192d..8497beda681c5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.78 5.22a.75.75 0 010 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/property-24.scss
index 0275305f18f1b..aaa14b749a083 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M17.78 8.22a.75.75 0 010 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/keyframes.scss
index 49cd93a90b351..85d2c25bfec5c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-check-diamond-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/placeholders.scss
index ce0bb69777294..e08ba28ce43c1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-check-diamond-fill-icon {
   --icon-name: icon-check-diamond-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/property-16.scss
index 2e49014a5a2c6..4a32598093d0a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-diamond-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M9.57.752a2.25 2.25 0 00-3.183 0L.73 6.41a2.25 2.25 0 000 3.182l5.657 5.657a2.25 2.25 0 003.182 0l5.657-5.657a2.25 2.25 0 000-3.182L9.569.752zm1.71 6.028l-4 4a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.47-3.47a.75.75 0 011.06 1.06z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/property-24.scss
index 4708f3bbcbd15..0eb1a17f5433a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-diamond-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M13.945 1.884a2.75 2.75 0 00-3.89 0l-8.171 8.172a2.75 2.75 0 000 3.889l8.171 8.171a2.75 2.75 0 003.89 0l8.171-8.171a2.75 2.75 0 000-3.89l-8.171-8.17zM16.28 9.78l-5.5 5.5a.75.75 0 01-1.06 0l-2.5-2.5a.75.75 0 111.06-1.06l1.97 1.97 4.97-4.97a.75.75 0 011.06 1.06z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/keyframes.scss
index a4ad1b13a447f..02ec619abf636 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-check-diamond {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/placeholders.scss
index eb2d1a198d7c3..cacf15ae1c2f1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-check-diamond-icon {
   --icon-name: icon-check-diamond;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/property-16.scss
index 31c9a12c9beb0..04930628ebc76 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-diamond-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.28 5.72a.75.75 0 010 1.06l-4 4a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.47-3.47a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M.75 6.41L6.407.752a2.25 2.25 0 013.182 0l5.657 5.656a2.25 2.25 0 010 3.182l-5.657 5.657a2.25 2.25 0 01-3.182 0L.75 9.591a2.25 2.25 0 010-3.182zm6.718-4.597L1.81 7.47a.75.75 0 000 1.06l5.657 5.657a.75.75 0 001.06 0l5.657-5.656a.75.75 0 000-1.061L8.528 1.813a.75.75 0 00-1.06 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/property-24.scss
index 01cfd56efebc4..cdc0e18683b4b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-diamond/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-diamond-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M16.28 8.72a.75.75 0 010 1.06l-5.5 5.5a.75.75 0 01-1.06 0l-2.5-2.5a.75.75 0 011.06-1.06l1.97 1.97 4.97-4.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M1.884 10.056l8.171-8.172a2.75 2.75 0 013.89 0l8.171 8.172a2.75 2.75 0 010 3.889l-8.171 8.171a2.75 2.75 0 01-3.89 0l-8.171-8.171a2.75 2.75 0 010-3.89zm9.232-7.111l-8.172 8.171a1.25 1.25 0 000 1.768l8.172 8.172a1.25 1.25 0 001.768 0l8.171-8.172a1.25 1.25 0 000-1.768l-8.171-8.171a1.25 1.25 0 00-1.768 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/keyframes.scss
index 1555190c8aff8..59b019b6a2565 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-check-hexagon-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/placeholders.scss
index f0fb86ea91574..a6f858143d2f6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-check-hexagon-fill-icon {
   --icon-name: icon-check-hexagon-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/property-16.scss
index 93ee5fcaa5935..4db6780282177 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-hexagon-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M9.166.33a2.25 2.25 0 00-2.332 0l-5.25 3.182A2.25 2.25 0 00.5 5.436v5.128a2.25 2.25 0 001.084 1.924l5.25 3.182a2.25 2.25 0 002.332 0l5.25-3.182a2.25 2.25 0 001.084-1.924V5.436a2.25 2.25 0 00-1.084-1.924L9.166.33zm1.054 5.39a.75.75 0 111.06 1.06l-4 4a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.47-3.47z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/property-24.scss
index 7b778df31d35c..6137c02b655a6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-hexagon-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M13.441 1.006a2.75 2.75 0 00-2.882 0l-7.75 4.77a2.75 2.75 0 00-1.31 2.342v7.764a2.75 2.75 0 001.31 2.342l7.75 4.77a2.75 2.75 0 002.882 0l7.75-4.77a2.75 2.75 0 001.309-2.342V8.118a2.75 2.75 0 00-1.309-2.342l-7.75-4.77zm2.84 8.774l-5.5 5.5a.75.75 0 01-1.061 0l-2.5-2.5a.75.75 0 111.06-1.06l1.97 1.97 4.97-4.97a.75.75 0 111.06 1.06z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/keyframes.scss
index acc469b09facc..b185820c072e0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-check-hexagon {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/placeholders.scss
index 346df5f51a828..591349e12ecdd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-check-hexagon-icon {
   --icon-name: icon-check-hexagon;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/property-16.scss
index 09198c201e9d2..4ddf2118ef4db 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-hexagon-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.28 5.72a.75.75 0 010 1.06l-4 4a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.47-3.47a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M6.834.33a2.25 2.25 0 012.332 0l5.25 3.182A2.25 2.25 0 0115.5 5.436v5.128a2.25 2.25 0 01-1.084 1.924l-5.25 3.182a2.25 2.25 0 01-2.332 0l-5.25-3.182A2.25 2.25 0 01.5 10.564V5.436a2.25 2.25 0 011.084-1.924L6.834.33zm1.555 1.283a.75.75 0 00-.778 0l-5.25 3.181A.75.75 0 002 5.436v5.128a.75.75 0 00.361.642l5.25 3.181a.75.75 0 00.778 0l5.25-3.181a.75.75 0 00.361-.642V5.436a.75.75 0 00-.361-.642l-5.25-3.181z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/property-24.scss
index d0ebe79bdaf0f..b304a9f6ebecc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-hexagon/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-hexagon-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M16.28 8.72a.75.75 0 010 1.06l-5.5 5.5a.75.75 0 01-1.06 0l-2.5-2.5a.75.75 0 111.06-1.06l1.97 1.97 4.97-4.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M10.559 1.006a2.75 2.75 0 012.882 0l7.75 4.77A2.75 2.75 0 0122.5 8.118v7.764a2.75 2.75 0 01-1.309 2.342l-7.75 4.77a2.75 2.75 0 01-2.882 0l-7.75-4.77A2.75 2.75 0 011.5 15.882V8.118a2.75 2.75 0 011.309-2.342l7.75-4.77zm2.096 1.278a1.25 1.25 0 00-1.31 0l-7.75 4.77A1.25 1.25 0 003 8.117v7.764c0 .435.225.838.595 1.065l7.75 4.77a1.25 1.25 0 001.31 0l7.75-4.77c.37-.227.595-.63.595-1.065V8.118a1.25 1.25 0 00-.595-1.065l-7.75-4.77z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-plain/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-plain/index.scss
index 502a76f09ae2b..0c03b32ddbeb7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-plain/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-plain/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../check/property-16';
         @import '../check/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-plain/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-plain/keyframes.scss
index c05b22a2d5c93..c010e2e244c46 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-plain/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-plain/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-check-plain {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-plain/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-plain/placeholders.scss
index 34209368c7296..2fe07fe481e10 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-plain/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-plain/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-check-plain-icon {
   --icon-name: icon-check-plain;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/keyframes.scss
index e8e9eeb7d2e6b..1dd89d232af5e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-check-square-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/placeholders.scss
index 9a68eead4f958..458917ed37f7d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-check-square-fill-icon {
   --icon-name: icon-check-square-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/property-16.scss
index 6529447dd5cc4..b2086397b8894 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-square-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zm7.47 4.22a.75.75 0 111.06 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/property-24.scss
index 371876a4a9b73..da9843d253b62 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-square-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75zm11.97 6.22a.75.75 0 111.06 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/keyframes.scss
index 37ab1f690606c..bad3d1a0e4a79 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-check-square {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/placeholders.scss
index d4eed4741e121..b200d3f12e103 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-check-square-icon {
   --icon-name: icon-check-square;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/property-16.scss
index 15e5c90df4d85..7a2d54f3190bc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-square-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.78 5.22a.75.75 0 010 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h9.5A2.25 2.25 0 0115 3.25v9.5A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75h-9.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/property-24.scss
index 3bf7b8a602672..5e8dd5224b638 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check-square/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-square-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M17.78 8.22a.75.75 0 010 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h14.5A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V4.75zM4.75 3.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h14.5c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H4.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check/keyframes.scss
index d88d13a6b5342..9eb16f22b740e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-check {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check/placeholders.scss
index dae1f446843b7..5e9e3585b95a8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-check-icon {
   --icon-name: icon-check;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check/property-16.scss
index b3e5c4e1ecec8..9f61f6e453213 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M14.78 4.28a.75.75 0 00-1.06-1.06l-7.97 7.97-3.47-3.47a.75.75 0 00-1.06 1.06l4 4a.75.75 0 001.06 0l8.5-8.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/check/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/check/property-24.scss
index c0a1ec6b1e013..d46f813d1844c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/check/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/check/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-check-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M21.78 6.28a.75.75 0 00-1.06-1.06L8.75 17.19l-5.47-5.47a.75.75 0 00-1.06 1.06l6 6a.75.75 0 001.06 0l12.5-12.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/keyframes.scss
index a95151cab6d8b..45a9df1477c8f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-chevron-down {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/placeholders.scss
index 2da5d4d1e2ff8..849575d44988a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-chevron-down-icon {
   --icon-name: icon-chevron-down;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/property-16.scss
index 013b7b74038d0..a5cc402c5dd52 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevron-down-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.235 5.205a.75.75 0 011.06.03L8 9.158l3.705-3.923a.75.75 0 011.09 1.03l-4.25 4.5a.75.75 0 01-1.09 0l-4.25-4.5a.75.75 0 01.03-1.06z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/property-24.scss
index 2065384b88cb6..9a3e28dfdbeb2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-down/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevron-down-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.23 8.21a.75.75 0 011.06.02L12 14.168l5.71-5.938a.75.75 0 111.08 1.04l-6.25 6.5a.75.75 0 01-1.08 0l-6.25-6.5a.75.75 0 01.02-1.06z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/keyframes.scss
index d0ad75dfba7bb..d3c5ef1d75e95 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-chevron-left {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/placeholders.scss
index e1944b3e1747a..7e47457e65e64 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-chevron-left-icon {
   --icon-name: icon-chevron-left;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/property-16.scss
index c795959890925..b09b7d45d2820 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevron-left-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M10.795 3.235a.75.75 0 01-.03 1.06L6.842 8l3.923 3.705a.75.75 0 01-1.03 1.09l-4.5-4.25a.75.75 0 010-1.09l4.5-4.25a.75.75 0 011.06.03z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/property-24.scss
index 00becb368d965..f887dbf7c13a6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-left/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevron-left-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M15.79 18.77a.75.75 0 00-.02-1.06L9.832 12l5.938-5.71a.75.75 0 10-1.04-1.08l-6.5 6.25a.75.75 0 000 1.08l6.5 6.25a.75.75 0 001.06-.02z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/keyframes.scss
index 3e639e0a87d3c..3394595de1761 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-chevron-right {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/placeholders.scss
index 6228295a8c0b8..d74b695f25cbc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-chevron-right-icon {
   --icon-name: icon-chevron-right;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/property-16.scss
index 0043debb3af49..19209f7a99f7d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevron-right-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M5.205 3.235a.75.75 0 00.03 1.06L9.158 8l-3.923 3.705a.75.75 0 001.03 1.09l4.5-4.25a.75.75 0 000-1.09l-4.5-4.25a.75.75 0 00-1.06.03z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/property-24.scss
index 689d4a06b5c54..c9428036e12c4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-right/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevron-right-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M8.21 18.77a.75.75 0 01.02-1.06L14.168 12 8.23 6.29a.75.75 0 111.04-1.08l6.5 6.25a.75.75 0 010 1.08l-6.5 6.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/keyframes.scss
index cae405e4339ce..a8c38f63f3c30 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-chevron-up {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/placeholders.scss
index 07bae126a6086..33ebec8b3777b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-chevron-up-icon {
   --icon-name: icon-chevron-up;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/property-16.scss
index e31ab6d3cc789..6f078c85fa80c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevron-up-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.235 10.795a.75.75 0 001.06-.03L8 6.842l3.705 3.923a.75.75 0 001.09-1.03l-4.25-4.5a.75.75 0 00-1.09 0l-4.25 4.5a.75.75 0 00.03 1.06z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/property-24.scss
index a64a1049484a6..ebbafb159035b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevron-up/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevron-up-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.23 15.79a.75.75 0 001.06-.02L12 9.832l5.71 5.938a.75.75 0 101.08-1.04l-6.25-6.5a.75.75 0 00-1.08 0l-6.25 6.5a.75.75 0 00.02 1.06z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/keyframes.scss
index e5eb2c2f9ed27..23e30ae6a301f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-chevrons-down {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/placeholders.scss
index 2cc4b5cce08d0..800ccd6149187 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-chevrons-down-icon {
   --icon-name: icon-chevrons-down;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/property-16.scss
index 2e5945cd75449..a980052e8d3c8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevrons-down-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.3 3.24a.75.75 0 00-1.1 1.02l3.25 3.5a.75.75 0 001.1 0l3.25-3.5a.75.75 0 10-1.1-1.02L8 6.148 5.3 3.24z"/><path d="M5.3 8.24a.75.75 0 10-1.1 1.02l3.25 3.5a.75.75 0 001.1 0l3.25-3.5a.75.75 0 10-1.1-1.02L8 11.148 5.3 8.24z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/property-24.scss
index e62b38f7a891d..135ddf3e60632 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-down/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevrons-down-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M7.293 5.232a.75.75 0 00-1.086 1.036l5.25 5.5a.75.75 0 001.085 0l5.25-5.5a.75.75 0 10-1.085-1.036L12 10.164 7.293 5.232z"/><path d="M7.293 12.232a.75.75 0 00-1.086 1.036l5.25 5.5a.75.75 0 001.085 0l5.25-5.5a.75.75 0 00-1.085-1.036L12 17.164l-4.707-4.932z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/keyframes.scss
index 5f419179315da..99012f19aace2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-chevrons-left {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/placeholders.scss
index 5fe31cfe471ac..a607076a04c7f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-chevrons-left-icon {
   --icon-name: icon-chevrons-left;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/property-16.scss
index 503f0ec589544..975c0f2b4d90d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevrons-left-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.76 5.3a.75.75 0 00-1.02-1.1l-3.5 3.25a.75.75 0 000 1.1l3.5 3.25a.75.75 0 101.02-1.1L4.852 8 7.76 5.3z"/><path d="M12.76 5.3a.75.75 0 10-1.02-1.1l-3.5 3.25a.75.75 0 000 1.1l3.5 3.25a.75.75 0 101.02-1.1L9.852 8l2.908-2.7z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/property-24.scss
index f009003e7714d..dbebb11754820 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-left/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevrons-left-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11.768 16.707a.75.75 0 01-1.036 1.085l-5.5-5.25a.75.75 0 010-1.085l5.5-5.25a.75.75 0 011.036 1.086L6.836 12l4.932 4.707z"/><path d="M18.768 16.707a.75.75 0 01-1.036 1.085l-5.5-5.25a.75.75 0 010-1.085l5.5-5.25a.75.75 0 011.036 1.086L13.836 12l4.932 4.707z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/keyframes.scss
index 3a2f91d95fc83..f11a3ab2d93b9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-chevrons-right {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/placeholders.scss
index 5ccfcb9cd29cd..f8b702773c036 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-chevrons-right-icon {
   --icon-name: icon-chevrons-right;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/property-16.scss
index 13048869e2058..5b3af18311549 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevrons-right-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.24 5.3a.75.75 0 011.02-1.1l3.5 3.25a.75.75 0 010 1.1l-3.5 3.25a.75.75 0 11-1.02-1.1L6.148 8 3.24 5.3z"/><path d="M8.24 5.3a.75.75 0 111.02-1.1l3.5 3.25a.75.75 0 010 1.1l-3.5 3.25a.75.75 0 11-1.02-1.1L11.148 8 8.24 5.3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/property-24.scss
index 6f56394bca5bd..f2bd52085dbcf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-right/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevrons-right-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M5.232 16.707a.75.75 0 001.036 1.085l5.5-5.25a.75.75 0 000-1.085l-5.5-5.25a.75.75 0 00-1.036 1.086L10.164 12l-4.932 4.707z"/><path d="M12.232 16.707a.75.75 0 001.036 1.085l5.5-5.25a.75.75 0 000-1.085l-5.5-5.25a.75.75 0 00-1.036 1.086L17.164 12l-4.932 4.707z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/keyframes.scss
index 3b296d85b5e1e..21ede55b167df 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-chevrons-up {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/placeholders.scss
index 7e2911475f95f..a1f7ef062b873 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-chevrons-up-icon {
   --icon-name: icon-chevrons-up;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/property-16.scss
index a9d777f7d1b63..99b8cb0277457 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevrons-up-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.3 7.76a.75.75 0 01-1.1-1.02l3.25-3.5a.75.75 0 011.1 0l3.25 3.5a.75.75 0 11-1.1 1.02L8 4.852 5.3 7.76z"/><path d="M5.3 12.76a.75.75 0 11-1.1-1.02l3.25-3.5a.75.75 0 011.1 0l3.25 3.5a.75.75 0 11-1.1 1.02L8 9.852 5.3 12.76z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/property-24.scss
index 76d5809be6327..bfa514841399a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/chevrons-up/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-chevrons-up-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M7.293 11.768a.75.75 0 01-1.086-1.036l5.25-5.5a.75.75 0 011.085 0l5.25 5.5a.75.75 0 01-1.085 1.036L12 6.836l-4.707 4.932z"/><path d="M7.293 18.768a.75.75 0 01-1.086-1.036l5.25-5.5a.75.75 0 011.085 0l5.25 5.5a.75.75 0 01-1.085 1.036L12 13.836l-4.707 4.932z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/keyframes.scss
index b170f1eadacc3..86ecbe6f9c218 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-circle-dot {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/placeholders.scss
index 4f707b2a46aba..295be013d0fcd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-circle-dot-icon {
   --icon-name: icon-circle-dot;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/property-16.scss
index 290a3b17e9cd8..683411c79b2b6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-circle-dot-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 3a5 5 0 100 10A5 5 0 008 3z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/property-24.scss
index 86a5a6d7edc19..17cf0ca974a13 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-dot/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-circle-dot-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 5a7 7 0 100 14 7 7 0 000-14z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/keyframes.scss
index ed03b157b154d..81c9eddcd26ff 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-circle-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/placeholders.scss
index 9896797133c0c..1267a5e86909a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-circle-fill-icon {
   --icon-name: icon-circle-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/property-16.scss
index ec4450fb9fb8d..76b386e56a526 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-circle-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8 0a8 8 0 100 16A8 8 0 008 0z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/property-24.scss
index 20b62203c94a6..7a2e025e97564 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-circle-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/keyframes.scss
index 05fc2a97d66bc..312f951d07f57 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-circle-half {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/placeholders.scss
index 47aa3ae7fb592..578b1ce6a34bc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-circle-half-icon {
   --icon-name: icon-circle-half;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/property-16.scss
index 5c6acf5f26437..cba2751f13450 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-circle-half-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zm0 1.5v13a6.5 6.5 0 100-13z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/property-24.scss
index 786353a7576ce..dc78c6b920323 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle-half/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-circle-half-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm0 1.5v19a9.5 9.5 0 000-19z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle/keyframes.scss
index 20f40ad7a24d4..6ce52581f3ca5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle/placeholders.scss
index b32f0d456fa2e..6074e76a8cf6f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-circle-icon {
   --icon-name: icon-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle/property-16.scss
index 444e9325038c7..5a8a751d7baa1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/circle/property-24.scss
index 85f173521ea9a..4b8601271264c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 2.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19zM1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/keyframes.scss
index 24e18162537a5..e0333e45f76b5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-clipboard-checked {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/placeholders.scss
index dc006b361e767..9a02f5d5f0855 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-clipboard-checked-icon {
   --icon-name: icon-clipboard-checked;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/property-16.scss
index df29d6faa794c..01fc67781f45e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-clipboard-checked-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M11.975 1h.775A2.25 2.25 0 0115 3.25v10.5A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V3.25A2.25 2.25 0 013.25 1h.775c.116-.57.62-1 1.225-1h5.5c.605 0 1.11.43 1.225 1zM5.5 2.5v-1h5v1h-5zm6.28 3.72a.75.75 0 010 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.97-3.97a.75.75 0 011.06 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/property-24.scss
index a504c5e232f12..b64ec594ffcc0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-checked/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-clipboard-checked-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M8.75 1A1.75 1.75 0 007 2.75V3H5.75A2.75 2.75 0 003 5.75v14.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V5.75A2.75 2.75 0 0018.25 3H17v-.25A1.75 1.75 0 0015.25 1h-6.5zM8.5 2.75a.25.25 0 01.25-.25h6.5a.25.25 0 01.25.25v1.5a.25.25 0 01-.25.25h-6.5a.25.25 0 01-.25-.25v-1.5zm8.28 7.47a.75.75 0 00-1.06 0l-5.47 5.47-1.97-1.97a.75.75 0 00-1.06 1.06l2.5 2.5a.75.75 0 001.06 0l6-6a.75.75 0 000-1.06z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/keyframes.scss
index 503e2ba38bed1..489a484d59242 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-clipboard-copy {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/placeholders.scss
index c6ff8d5379d61..e2981bcd44d4c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-clipboard-copy-icon {
   --icon-name: icon-clipboard-copy;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/property-16.scss
index c8eb7a05f6f40..4d788c795ed0f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-clipboard-copy-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M3.25 2.5H4v.25C4 3.44 4.56 4 5.25 4h5.5C11.44 4 12 3.44 12 2.75V2.5h.75a.75.75 0 01.75.75v3a.75.75 0 001.5 0v-3A2.25 2.25 0 0012.75 1h-.775c-.116-.57-.62-1-1.225-1h-5.5c-.605 0-1.11.43-1.225 1H3.25A2.25 2.25 0 001 3.25v10.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75v-1a.75.75 0 00-1.5 0v1a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V3.25a.75.75 0 01.75-.75zm2.25-1v1h5v-1h-5z" clip-rule="evenodd"/><path d="M4.75 5.5a.75.75 0 000 1.5h3a.75.75 0 000-1.5h-3zM4 12.25a.75.75 0 01.75-.75h3a.75.75 0 010 1.5h-3a.75.75 0 01-.75-.75zM4.75 8.5a.75.75 0 000 1.5h2a.75.75 0 000-1.5h-2zM16 9.25a.75.75 0 01-.75.75h-4.19l1.22 1.22a.75.75 0 11-1.06 1.06l-2.5-2.5a.752.752 0 010-1.06l2.5-2.5a.75.75 0 111.06 1.06L11.06 8.5h4.19a.75.75 0 01.75.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/property-24.scss
index a0402f41f1109..24b816b143065 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard-copy/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-clipboard-copy-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M8.75 1A1.75 1.75 0 007 2.75V3H5.75A2.75 2.75 0 003 5.75v14.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25v-2.5a.75.75 0 00-1.5 0v2.5c0 .69-.56 1.25-1.25 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V5.75c0-.69.56-1.25 1.25-1.25h1.268c.121.848.85 1.5 1.732 1.5h6.5a1.75 1.75 0 001.732-1.5h1.268c.69 0 1.25.56 1.25 1.25v4.5a.75.75 0 001.5 0v-4.5A2.75 2.75 0 0018.25 3H17v-.25A1.75 1.75 0 0015.25 1h-6.5zM8.5 2.75a.25.25 0 01.25-.25h6.5a.25.25 0 01.25.25v1.5a.25.25 0 01-.25.25h-6.5a.25.25 0 01-.25-.25v-1.5z" clip-rule="evenodd"/><path d="M7 9.75A.75.75 0 017.75 9h4.5a.75.75 0 010 1.5h-4.5A.75.75 0 017 9.75zM7 17.75a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5h-4.5a.75.75 0 01-.75-.75zM7.75 13a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5zM22.75 14a.75.75 0 01-.75.75h-6.34l2.1 1.95a.75.75 0 11-1.02 1.1l-3.5-3.25a.747.747 0 01-.24-.533v-.034a.748.748 0 01.227-.521l.014-.013L16.74 10.2a.75.75 0 111.02 1.1l-2.1 1.95H22a.75.75 0 01.75.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/keyframes.scss
index 05c01b9ad99f6..bb7a6ed266325 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-clipboard {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/placeholders.scss
index a61b52ba0d4e2..c9f305a159ec7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-clipboard-icon {
   --icon-name: icon-clipboard;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/property-16.scss
index bec5f233060aa..6b4a241973442 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-clipboard-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M11.975 1h.775A2.25 2.25 0 0115 3.25v10.5A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V3.25A2.25 2.25 0 013.25 1h.775c.116-.57.62-1 1.225-1h5.5c.605 0 1.11.43 1.225 1zM4 2.5h-.75a.75.75 0 00-.75.75v10.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V3.25a.75.75 0 00-.75-.75H12v.25C12 3.44 11.44 4 10.75 4h-5.5C4.56 4 4 3.44 4 2.75V2.5zm1.5 0v-1h5v1h-5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/property-24.scss
index 8a3e33e25d010..cb4a9028b887b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clipboard/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-clipboard-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M8.75 1A1.75 1.75 0 007 2.75V3H5.75A2.75 2.75 0 003 5.75v14.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V5.75A2.75 2.75 0 0018.25 3H17v-.25A1.75 1.75 0 0015.25 1h-6.5zm8.232 3.5A1.75 1.75 0 0115.25 6h-6.5a1.75 1.75 0 01-1.732-1.5H5.75c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25h-1.268zM8.5 2.75a.25.25 0 01.25-.25h6.5a.25.25 0 01.25.25v1.5a.25.25 0 01-.25.25h-6.5a.25.25 0 01-.25-.25v-1.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clock-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clock-fill/index.scss
index d97ec2a16f2f7..a78035ca48306 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clock-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clock-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../clock/property-16';
         @import '../clock/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clock-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clock-fill/keyframes.scss
index 71b5c4ac63175..c785da5ae4285 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clock-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clock-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-clock-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clock-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clock-fill/placeholders.scss
index 24e977e2feffd..2c8a8f2a1080b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clock-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clock-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-clock-fill-icon {
   --icon-name: icon-clock-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clock-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clock-outline/index.scss
index d97ec2a16f2f7..a78035ca48306 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clock-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clock-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../clock/property-16';
         @import '../clock/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clock-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clock-outline/keyframes.scss
index 417eea8bfbc00..8966bc01dbe43 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clock-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clock-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-clock-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clock-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clock-outline/placeholders.scss
index b3fc5057eadb5..33a567bb1829d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clock-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clock-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-clock-outline-icon {
   --icon-name: icon-clock-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clock/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clock/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clock/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clock/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clock/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clock/keyframes.scss
index f8bf669085da4..1855764ee8a2a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clock/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clock/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-clock {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clock/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clock/placeholders.scss
index c88ca54a2e01f..e780415ef736c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clock/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clock/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-clock-icon {
   --icon-name: icon-clock;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clock/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clock/property-16.scss
index 03f7caed237ab..fb0f15d7f2e0f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clock/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clock/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-clock-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8.5 3.75a.75.75 0 00-1.5 0V8c0 .284.16.544.415.67l2.5 1.25a.75.75 0 10.67-1.34L8.5 7.535V3.75z"/><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/clock/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/clock/property-24.scss
index fabfaea6e5e6c..c9999f09f13c6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/clock/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/clock/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-clock-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12.5 5.75a.75.75 0 00-1.5 0V12c0 .284.16.544.415.67l4.5 2.25a.75.75 0 10.67-1.34L12.5 11.536V5.75z"/><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/keyframes.scss
index e8079eb877843..4ada7ec5ae81c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cloud-check {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/placeholders.scss
index 03913343539a5..8ae05f7135755 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cloud-check-icon {
   --icon-name: icon-cloud-check;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/property-16.scss
index e58b60f0aa97f..45754a56ceed1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-check-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.932 1.373a6.041 6.041 0 016.239 1.28 5.998 5.998 0 011.505 2.284h.28c1.071 0 2.1.424 2.858 1.18a4.025 4.025 0 01-.665 6.239.75.75 0 01-.812-1.262 2.524 2.524 0 00.418-3.914 2.551 2.551 0 00-1.8-.742h-.83a.75.75 0 01-.726-.562A4.496 4.496 0 009.14 3.74a4.541 4.541 0 00-4.688-.96 4.52 4.52 0 00-2.006 1.466 4.488 4.488 0 00.386 5.942.75.75 0 01-1.055 1.066 5.982 5.982 0 01-.515-7.928 6.02 6.02 0 012.67-1.954z"/><path d="M11.78 9.22a.75.75 0 010 1.06l-4.5 4.5a.75.75 0 01-1.06 0l-2-2a.75.75 0 111.06-1.06l1.47 1.47 3.97-3.97a.75.75 0 011.06 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/property-24.scss
index d5456e702a222..d6e633e7bc6fb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-check/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-check-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.026 1.046a8.87 8.87 0 014.152.57 8.932 8.932 0 013.436 2.412 9.017 9.017 0 011.802 3.16h.726a5.84 5.84 0 013.698 1.326 5.914 5.914 0 012.037 3.374 5.945 5.945 0 01-.528 3.91 5.882 5.882 0 01-2.858 2.705.75.75 0 01-.606-1.372 4.381 4.381 0 002.129-2.016c.46-.9.599-1.932.394-2.923a4.413 4.413 0 00-1.52-2.518 4.338 4.338 0 00-2.746-.987h-1.288a.75.75 0 01-.727-.564 7.521 7.521 0 00-1.639-3.104 7.431 7.431 0 00-2.859-2.008 7.37 7.37 0 00-6.734.692 7.472 7.472 0 00-2.4 2.549 7.55 7.55 0 00-.338 6.832 7.49 7.49 0 002.138 2.777.75.75 0 01-.941 1.168 8.99 8.99 0 01-2.566-3.333 9.06 9.06 0 01.404-8.189 8.971 8.971 0 012.883-3.06 8.888 8.888 0 013.951-1.4z"/><path d="M17.78 14.22a.75.75 0 010 1.06l-7.5 7.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 6.97-6.97a.75.75 0 011.06 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/index.scss
index 68293edadf9dc..86cee0b297c2b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/keyframes.scss
index 75b06e09bda6f..8ade0d5cd857d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cloud-cross {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/placeholders.scss
index 7366c6894a829..4490fe63e164c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cloud-cross-icon {
   --icon-name: icon-cloud-cross;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/property-16.scss
index 4a693d1416813..2b099ba0ce792 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-cross-16: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 23 20" xmlns="http://www.w3.org/2000/svg"><path d="M12 13.586l3-3L16.414 12l-3 3 3 3L15 19.414l-3-3-3 3L7.586 18l3-3-2.75-2.75 1.414-1.414 2.75 2.75zM13.905.856c2.706.498 4.595 2.544 4.816 5.64l.234.066c2.46.754 3.884 2.79 3.5 5.036-.445 2.592-2.083 4.371-5.876 4.371v-2c5.054 0 4.868-5.46.23-6.152.242-2.277-1.278-4.628-3.267-4.995-1.789-.33-3.757.564-4.572 2.164-1.629-.727-2.605-.345-3.442.362-.836.706-.527 2.194-.225 2.823-1.089.915-1.901 2.013-2.152 2.987-.101.395-.091 1.014 0 1.212.428.928 1.016 1.6 4.403 1.6v2c-4.117 0-5.672-.96-6.448-2.874-.652-1.61.137-3.457 1.882-5.118-.544-1.734.01-3.297 1.391-4.267a4.89 4.89 0 013.689-.77C9.222 1.26 11.603.431 13.905.855z" fill="%236F7682" fill-rule="nonzero"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/property-24.scss
index fe0a427f5a29f..2d398cbf9af73 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-cross/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-cross-24: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 23 20" xmlns="http://www.w3.org/2000/svg"><path d="M12 13.586l3-3L16.414 12l-3 3 3 3L15 19.414l-3-3-3 3L7.586 18l3-3-2.75-2.75 1.414-1.414 2.75 2.75zM13.905.856c2.706.498 4.595 2.544 4.816 5.64l.234.066c2.46.754 3.884 2.79 3.5 5.036-.445 2.592-2.083 4.371-5.876 4.371v-2c5.054 0 4.868-5.46.23-6.152.242-2.277-1.278-4.628-3.267-4.995-1.789-.33-3.757.564-4.572 2.164-1.629-.727-2.605-.345-3.442.362-.836.706-.527 2.194-.225 2.823-1.089.915-1.901 2.013-2.152 2.987-.101.395-.091 1.014 0 1.212.428.928 1.016 1.6 4.403 1.6v2c-4.117 0-5.672-.96-6.448-2.874-.652-1.61.137-3.457 1.882-5.118-.544-1.734.01-3.297 1.391-4.267a4.89 4.89 0 013.689-.77C9.222 1.26 11.603.431 13.905.855z" fill="%236F7682" fill-rule="nonzero"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/keyframes.scss
index 8f09605bb09a3..b70b4a53df7fa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cloud-download {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/placeholders.scss
index f8c20917bec24..5afd91857f8bd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cloud-download-icon {
   --icon-name: icon-cloud-download;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/property-16.scss
index 2f7d4f9b58c06..efb6786a16332 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-download-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.235 1.123a6.041 6.041 0 00-3.303.25A6.02 6.02 0 001.26 3.326a5.988 5.988 0 00.515 7.929.75.75 0 001.055-1.066 4.482 4.482 0 01-.386-5.942A4.52 4.52 0 014.451 2.78a4.541 4.541 0 014.688.961 4.496 4.496 0 011.26 2.135.75.75 0 00.726.561h.83c.676 0 1.324.268 1.8.743a2.524 2.524 0 01-.418 3.914.75.75 0 00.812 1.262 4.024 4.024 0 00.665-6.239 4.051 4.051 0 00-2.859-1.18h-.28a5.998 5.998 0 00-1.504-2.285 6.028 6.028 0 00-2.936-1.529z"/><path d="M8 7.25a.75.75 0 01.75.75v4.44l1.47-1.47a.75.75 0 111.06 1.06l-2.75 2.75a.75.75 0 01-1.06 0l-2.75-2.75a.75.75 0 111.06-1.06l1.47 1.47V8A.75.75 0 018 7.25z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/property-24.scss
index 3d8decc0d7736..22377cc6cda04 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-download/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-download-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12.178 1.615a8.87 8.87 0 00-8.103.832 8.971 8.971 0 00-2.883 3.06 9.05 9.05 0 00-.404 8.189 8.99 8.99 0 002.566 3.333.75.75 0 10.94-1.168 7.49 7.49 0 01-2.137-2.777 7.56 7.56 0 01.338-6.832 7.472 7.472 0 012.4-2.549 7.37 7.37 0 016.734-.692 7.431 7.431 0 012.859 2.008 7.521 7.521 0 011.64 3.104.75.75 0 00.726.564h1.288c1 .001 1.97.35 2.746.987a4.413 4.413 0 011.52 2.518 4.444 4.444 0 01-.394 2.923c-.46.9-1.212 1.61-2.13 2.016a.75.75 0 00.607 1.372 5.882 5.882 0 002.858-2.705 5.945 5.945 0 00.527-3.91 5.914 5.914 0 00-2.036-3.374 5.84 5.84 0 00-3.698-1.327h-.726a9.017 9.017 0 00-1.802-3.159 8.932 8.932 0 00-3.436-2.413z"/><path d="M12 22h.012a.747.747 0 00.533-.235l4.25-4.5a.75.75 0 00-1.09-1.03l-2.955 3.129V12.75a.75.75 0 00-1.5 0v6.614l-2.955-3.129a.75.75 0 00-1.09 1.03l4.248 4.498a.748.748 0 00.535.237H12z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/keyframes.scss
index b115bb955921f..a4a7f3fd18525 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cloud-lightning {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/placeholders.scss
index 7e1065d6619fa..6631855167e78 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cloud-lightning-icon {
   --icon-name: icon-cloud-lightning;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/property-16.scss
index cf7ab446233df..99734fe989880 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-lightning-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.235 1.123a6.041 6.041 0 00-3.303.25A6.02 6.02 0 001.26 3.326a5.988 5.988 0 00.515 7.929.75.75 0 001.055-1.066 4.482 4.482 0 01-.386-5.942A4.52 4.52 0 014.451 2.78a4.541 4.541 0 014.688.961 4.496 4.496 0 011.26 2.135.75.75 0 00.726.561h.83c.676 0 1.324.268 1.8.743a2.524 2.524 0 01-.418 3.914.75.75 0 00.812 1.262 4.024 4.024 0 00.665-6.239 4.051 4.051 0 00-2.859-1.18h-.28a5.998 5.998 0 00-1.504-2.285 6.028 6.028 0 00-2.936-1.529z"/><path d="M9.053 7.257a.75.75 0 00-1.106-1.014l-2.75 3a.75.75 0 00.316 1.218l3.403 1.135-1.969 2.147a.75.75 0 001.106 1.014l2.75-3a.75.75 0 00-.316-1.218L7.084 9.404l1.969-2.147z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/property-24.scss
index 711aa09ebd718..df3f2a373b693 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lightning/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-lightning-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11.819 1.485a8.86 8.86 0 00-4.357-.363 8.892 8.892 0 00-4.004 1.765A8.99 8.99 0 00.766 6.353a9.065 9.065 0 00.649 8.509 8.958 8.958 0 003.187 3.01.75.75 0 00.731-1.309 7.457 7.457 0 01-2.653-2.507 7.565 7.565 0 01-.54-7.1A7.49 7.49 0 014.381 4.07 7.392 7.392 0 017.711 2.6a7.36 7.36 0 013.618.302 7.421 7.421 0 013.046 1.999 7.522 7.522 0 011.744 3.22.75.75 0 00.727.565c1.732 0 3.082.103 4.213 1.134a4.44 4.44 0 01.589 5.888 4.356 4.356 0 01-2.643 1.702.75.75 0 00.302 1.47 5.857 5.857 0 003.553-2.288 5.94 5.94 0 00-.79-7.88c-1.427-1.3-3.094-1.495-4.66-1.522a9.017 9.017 0 00-1.93-3.304 8.92 8.92 0 00-3.662-2.402z"/><path d="M14.031 11.03a.75.75 0 10-1.062-1.06l-4.75 4.77a.75.75 0 00.31 1.246l5.372 1.653-3.956 4.357a.75.75 0 001.11 1.008l4.75-5.23a.75.75 0 00-.334-1.222l-5.313-1.634 3.873-3.889z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/keyframes.scss
index dc6bfde5bbfce..42e7c89ea6c80 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cloud-lock {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/placeholders.scss
index 9c3e8f54fb148..050355fa6ccff 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cloud-lock-icon {
   --icon-name: icon-cloud-lock;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/property-16.scss
index 998d7578507d0..bde4307c305a1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-lock-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.235 1.123a6.041 6.041 0 00-3.303.25A6.02 6.02 0 001.26 3.326a5.988 5.988 0 00-.404 6.76.75.75 0 101.286-.774 4.49 4.49 0 01-.62-2.766 4.488 4.488 0 01.922-2.3A4.52 4.52 0 014.451 2.78a4.541 4.541 0 014.688.961 4.496 4.496 0 011.26 2.135.75.75 0 00.726.561h.83c.676 0 1.324.268 1.8.743a2.524 2.524 0 01.451 2.969.75.75 0 101.326.702 4.02 4.02 0 00-.718-4.734 4.051 4.051 0 00-2.859-1.18h-.28a5.998 5.998 0 00-1.504-2.285 6.028 6.028 0 00-2.936-1.529zM8.75 12.25a.75.75 0 00-1.5 0v.5a.75.75 0 001.5 0v-.5z"/><path fill-rule="evenodd" d="M5.518 9.012c.035-.627.13-1.235.366-1.738.174-.37.435-.704.816-.94C7.08 6.101 7.52 6 8 6c.48 0 .921.1 1.3.334.381.236.642.57.816.94.236.503.331 1.111.366 1.738A2.25 2.25 0 0112.5 11.25v2.5A2.25 2.25 0 0110.25 16h-4.5a2.25 2.25 0 01-2.25-2.25v-2.5a2.25 2.25 0 012.018-2.238zM7.022 9c.032-.481.102-.838.22-1.087a.662.662 0 01.245-.302c.09-.055.243-.111.513-.111s.423.056.513.111c.087.054.17.141.246.302.117.249.187.606.219 1.087H7.022zm3.228 1.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75h-4.5a.75.75 0 01-.75-.75v-2.5a.75.75 0 01.75-.75h4.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/property-24.scss
index 15a03c367e88d..0c8b945b110bf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-lock/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-lock-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12.178 1.615a8.87 8.87 0 00-8.103.832 8.971 8.971 0 00-2.883 3.06 9.05 9.05 0 00-.404 8.189c.386.863 1.302 2.042 1.848 2.665a.75.75 0 101.129-.987c-.533-.609-1.32-1.645-1.608-2.29a7.56 7.56 0 01.338-6.832 7.472 7.472 0 012.4-2.549 7.37 7.37 0 016.734-.692 7.431 7.431 0 012.859 2.008 7.521 7.521 0 011.64 3.104.75.75 0 00.726.564h1.288c1 .001 1.97.35 2.746.987a4.413 4.413 0 011.52 2.518 4.444 4.444 0 01-.394 2.923 4.394 4.394 0 01-1.37 1.585.75.75 0 00.867 1.224 5.895 5.895 0 001.838-2.126 5.945 5.945 0 00.527-3.91 5.914 5.914 0 00-2.036-3.374 5.84 5.84 0 00-3.698-1.327h-.726a9.017 9.017 0 00-1.802-3.159 8.932 8.932 0 00-3.436-2.413zM12.75 18.75a.75.75 0 00-1.5 0v.5a.75.75 0 001.5 0v-.5z"/><path fill-rule="evenodd" d="M8 14.014v-.93c0-1.078.417-2.114 1.165-2.881A3.96 3.96 0 0112 9a3.96 3.96 0 012.835 1.203A4.127 4.127 0 0116 13.083v.93a2.25 2.25 0 012 2.237v4.5A2.25 2.25 0 0115.75 23h-7.5A2.25 2.25 0 016 20.75v-4.5a2.25 2.25 0 012-2.236zM9.5 14v-.917c0-.69.268-1.35.739-1.833A2.46 2.46 0 0112 10.5c.657 0 1.29.267 1.761.75.471.483.739 1.142.739 1.833V14h-5zm6.25 1.5a.75.75 0 01.75.75v4.5a.75.75 0 01-.75.75h-7.5a.75.75 0 01-.75-.75v-4.5a.75.75 0 01.75-.75h7.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/keyframes.scss
index f84372b8cc524..61af81457c117 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cloud-off {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/placeholders.scss
index 028667d9b6d46..b6ec58ecddaf9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cloud-off-icon {
   --icon-name: icon-cloud-off;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/property-16.scss
index 52d3c03165b2b..b100adce83d70 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-off-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M1.22 1.22a.75.75 0 011.06 0l12.5 12.5a.75.75 0 11-1.06 1.06l-1.11-1.11c-.258.053-.523.08-.791.08H6.094a5.907 5.907 0 01-3.085-.865A5.783 5.783 0 01.85 10.539a5.674 5.674 0 01-.57-3.117v-.004a5.701 5.701 0 011.196-2.943c.284-.361.61-.686.97-.968L1.22 2.28a.75.75 0 010-1.06zm2.297 3.357a4.299 4.299 0 00-.863.827 4.201 4.201 0 00-.882 2.165v.003a4.174 4.174 0 00.42 2.296c.356.713.91 1.315 1.6 1.737a4.407 4.407 0 002.298.645h5.099L3.517 4.577z" clip-rule="evenodd"/><path d="M6.38 2.954a.75.75 0 01.884-.586A5.87 5.87 0 0110.11 3.83 5.743 5.743 0 0111.564 6h.255a3.96 3.96 0 012.775 1.13 3.848 3.848 0 011.156 2.745c0 .409-.066.81-.19 1.193a.75.75 0 11-1.426-.468c.076-.232.116-.477.116-.725 0-.626-.253-1.228-.707-1.675a2.46 2.46 0 00-1.724-.7h-.802a.75.75 0 01-.725-.56 4.233 4.233 0 00-1.206-2.014 4.37 4.37 0 00-2.119-1.088.75.75 0 01-.587-.884z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/property-24.scss
index 8b6c0e739fbdb..1fee641181411 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-off/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-off-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M2.28 1.22a.75.75 0 00-1.06 1.06l2.447 2.448a8.96 8.96 0 00-1.801 1.766 9.041 9.041 0 00-1.82 4.598v.003a9.064 9.064 0 00.867 4.87 8.975 8.975 0 003.294 3.674A8.873 8.873 0 008.934 21h9.2c.54 0 1.073-.075 1.585-.22l2 2a.75.75 0 101.061-1.06L2.28 1.22zm16.15 18.27L4.742 5.804c-.639.44-1.209.98-1.687 1.603a7.541 7.541 0 00-1.518 3.832v.003a7.564 7.564 0 00.723 4.066 7.475 7.475 0 002.744 3.06A7.374 7.374 0 008.923 19.5H18.133c.1 0 .198-.003.296-.01z" clip-rule="evenodd"/><path d="M9.702 3.003a.75.75 0 10-.133 1.494 7.394 7.394 0 014.16 1.757 7.51 7.51 0 012.387 3.867.75.75 0 00.727.566h.061c1.304 0 2.327 0 3.292.522.635.343 1.176.84 1.575 1.447a4.436 4.436 0 01.383 4.158.75.75 0 101.383.581 5.946 5.946 0 00-.512-5.563 5.879 5.879 0 00-2.116-1.943c-1.17-.632-2.393-.696-3.5-.701a9.005 9.005 0 00-2.704-4.072 8.894 8.894 0 00-5.003-2.113z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/keyframes.scss
index ca527549abdb0..bc61ad1da9594 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cloud-upload {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/placeholders.scss
index b2c92bfe986fb..69f1a23559527 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cloud-upload-icon {
   --icon-name: icon-cloud-upload;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/property-16.scss
index d349a8c064883..7b08104df1301 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-upload-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.235 1.123a6.041 6.041 0 00-3.303.25A6.02 6.02 0 001.26 3.326a5.988 5.988 0 00.515 7.929.75.75 0 001.055-1.066 4.482 4.482 0 01-.386-5.942A4.52 4.52 0 014.451 2.78a4.541 4.541 0 014.688.961 4.496 4.496 0 011.26 2.135.75.75 0 00.726.561h.83c.676 0 1.324.268 1.8.743a2.524 2.524 0 01-.418 3.914.75.75 0 00.812 1.262 4.024 4.024 0 00.665-6.239 4.051 4.051 0 00-2.859-1.18h-.28a5.998 5.998 0 00-1.504-2.285 6.028 6.028 0 00-2.936-1.529z"/><path d="M4.72 11.28a.75.75 0 001.06 0l1.47-1.47v4.44a.75.75 0 001.5 0V9.81l1.47 1.47a.75.75 0 101.06-1.06L8.53 7.47l-.01-.01a.747.747 0 00-1.05.01l-2.75 2.75a.75.75 0 000 1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/property-24.scss
index 9e5e0421aa05b..48e5a5386e655 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-upload/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-upload-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12.178 1.615a8.87 8.87 0 00-8.103.832 8.971 8.971 0 00-2.883 3.06 9.05 9.05 0 00-.404 8.189 8.99 8.99 0 002.566 3.333.75.75 0 10.94-1.168 7.49 7.49 0 01-2.137-2.777 7.56 7.56 0 01.338-6.832 7.472 7.472 0 012.4-2.549 7.37 7.37 0 016.734-.692 7.431 7.431 0 012.859 2.008 7.521 7.521 0 011.64 3.104.75.75 0 00.726.564h1.288c1 .001 1.97.35 2.746.987a4.413 4.413 0 011.52 2.518 4.444 4.444 0 01-.394 2.923c-.46.9-1.212 1.61-2.13 2.016a.75.75 0 00.607 1.372 5.882 5.882 0 002.858-2.705 5.945 5.945 0 00.527-3.91 5.914 5.914 0 00-2.036-3.374 5.84 5.84 0 00-3.698-1.327h-.726a9.017 9.017 0 00-1.802-3.159 8.932 8.932 0 00-3.436-2.413z"/><path d="M7.235 17.795a.75.75 0 001.06-.03l2.955-3.129v6.614a.75.75 0 001.5 0v-6.614l2.955 3.129a.75.75 0 001.09-1.03l-4.25-4.5a.75.75 0 00-.533-.235h-.024a.748.748 0 00-.535.237l-4.248 4.498a.75.75 0 00.03 1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/keyframes.scss
index bc10ffebde303..03d72d01c71c1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cloud-x {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/placeholders.scss
index 85daed15f23e6..45ef15464de7a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cloud-x-icon {
   --icon-name: icon-cloud-x;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/property-16.scss
index d2491888b2b4d..c1a9ff315d4fc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-x-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.932 1.373a6.041 6.041 0 016.239 1.28 5.998 5.998 0 011.505 2.284h.28c1.071 0 2.1.424 2.858 1.18a4.025 4.025 0 01-.665 6.239.75.75 0 01-.812-1.262 2.524 2.524 0 00.418-3.914 2.551 2.551 0 00-1.8-.742h-.83a.75.75 0 01-.726-.562A4.496 4.496 0 009.14 3.74a4.541 4.541 0 00-4.688-.96 4.52 4.52 0 00-2.006 1.466 4.488 4.488 0 00.386 5.942.75.75 0 01-1.055 1.066 5.982 5.982 0 01-.515-7.928 6.02 6.02 0 012.67-1.954z"/><path d="M10.78 9.22a.75.75 0 010 1.06L9.06 12l1.72 1.72a.75.75 0 11-1.06 1.06L8 13.06l-1.72 1.72a.75.75 0 01-1.06-1.06L6.94 12l-1.72-1.72a.75.75 0 111.06-1.06L8 10.94l1.72-1.72a.75.75 0 011.06 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/property-24.scss
index d8877db457ec0..456f608c33cf4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud-x/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-x-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.026 1.046a8.87 8.87 0 014.152.57 8.932 8.932 0 013.436 2.412 9.017 9.017 0 011.802 3.16h.726a5.84 5.84 0 013.698 1.326 5.914 5.914 0 012.037 3.374 5.945 5.945 0 01-.528 3.91 5.882 5.882 0 01-2.858 2.705.75.75 0 01-.606-1.372 4.381 4.381 0 002.129-2.016c.46-.9.599-1.932.394-2.923a4.413 4.413 0 00-1.52-2.518 4.338 4.338 0 00-2.746-.987h-1.288a.75.75 0 01-.727-.564 7.521 7.521 0 00-1.639-3.104 7.431 7.431 0 00-2.859-2.008 7.37 7.37 0 00-6.734.692 7.472 7.472 0 00-2.4 2.549 7.55 7.55 0 00-.338 6.832 7.49 7.49 0 002.138 2.777.75.75 0 01-.941 1.168 8.99 8.99 0 01-2.566-3.333 9.06 9.06 0 01.404-8.189 8.971 8.971 0 012.883-3.06 8.888 8.888 0 013.951-1.4z"/><path d="M8.22 14.22a.75.75 0 011.06 0L12 16.94l2.72-2.72a.75.75 0 111.06 1.06L13.06 18l2.72 2.72a.75.75 0 11-1.06 1.06L12 19.06l-2.72 2.72a.75.75 0 01-1.06-1.06L10.94 18l-2.72-2.72a.75.75 0 010-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/keyframes.scss
index d9b1f22cc9172..2755963984466 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cloud {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/placeholders.scss
index 36f36fde3b9fa..090680875ed41 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cloud-icon {
   --icon-name: icon-cloud;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/property-16.scss
index e8709ffdd7bf5..43e2250aea891 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.932 2.373a6.041 6.041 0 016.239 1.28 5.998 5.998 0 011.505 2.284h.28c1.071 0 2.1.424 2.858 1.18a4.025 4.025 0 010 5.703A4.051 4.051 0 0111.955 14H6.026a6.037 6.037 0 01-3.186-.906 6.008 6.008 0 01-2.223-2.448 5.982 5.982 0 01.644-6.32 6.02 6.02 0 012.67-1.953zm.526 1.405a4.52 4.52 0 00-2.013 1.47 4.488 4.488 0 001.186 6.572c.716.444 1.542.68 2.386.68h5.938c.676 0 1.324-.268 1.8-.742a2.524 2.524 0 000-3.578 2.551 2.551 0 00-1.8-.743h-.83a.75.75 0 01-.726-.561A4.496 4.496 0 009.14 4.74a4.541 4.541 0 00-4.681-.963z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/property-24.scss
index d55cd0c291fa5..9cd27c4ec0452 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cloud/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cloud-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.836 3.558a8.864 8.864 0 014.895-.373 8.906 8.906 0 014.356 2.297 9.009 9.009 0 012.325 3.705h.726a5.84 5.84 0 014.147 1.733A5.929 5.929 0 0124 15.094a5.929 5.929 0 01-1.715 4.174A5.84 5.84 0 0118.138 21H8.929a8.878 8.878 0 01-4.721-1.361 8.976 8.976 0 01-3.295-3.675 9.062 9.062 0 01.953-9.47 8.934 8.934 0 013.97-2.936zm.509 1.41a7.434 7.434 0 00-3.289 2.439 7.562 7.562 0 00-.795 7.9 7.475 7.475 0 002.745 3.062 7.378 7.378 0 003.93 1.131h9.202a4.34 4.34 0 003.082-1.288 4.429 4.429 0 001.28-3.118c0-1.17-.461-2.292-1.28-3.118a4.34 4.34 0 00-3.082-1.289h-1.289a.75.75 0 01-.726-.563 7.515 7.515 0 00-2.074-3.56 7.407 7.407 0 00-3.623-1.91 7.364 7.364 0 00-4.081.314z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/code/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/code/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/code/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/code/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/code/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/code/keyframes.scss
index 7316a6a4e22ed..dba4dc4d67bee 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/code/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/code/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-code {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/code/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/code/placeholders.scss
index d22bad7eff5dd..ccafa796c6434 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/code/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/code/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-code-icon {
   --icon-name: icon-code;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/code/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/code/property-16.scss
index 01baf8c4551c4..a6149298d2fc7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/code/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/code/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-code-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M9.424 2.02a.75.75 0 00-.904.556l-2.5 10.5a.75.75 0 001.46.348l2.5-10.5a.75.75 0 00-.556-.904zM11.2 4.24a.75.75 0 011.06-.04l3.5 3.25a.75.75 0 010 1.1l-3.5 3.25a.75.75 0 11-1.02-1.1L14.148 8 11.24 5.3a.75.75 0 01-.04-1.06zM4.76 5.3a.75.75 0 00-1.02-1.1L.24 7.45a.75.75 0 000 1.1l3.5 3.25a.75.75 0 101.02-1.1L1.852 8 4.76 5.3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/code/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/code/property-24.scss
index 3b35f27689e64..9fc69f2f536a8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/code/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/code/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-code-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M14.447 3.026a.75.75 0 00-.92.527l-4.5 16.5a.75.75 0 001.447.394l4.5-16.5a.75.75 0 00-.527-.92zM16.207 6.232a.75.75 0 011.06-.025l5.5 5.25a.75.75 0 010 1.085l-5.5 5.25a.75.75 0 01-1.035-1.085L21.164 12l-4.932-4.707a.75.75 0 01-.024-1.06zM7.768 7.293a.75.75 0 00-1.036-1.086l-5.5 5.25a.75.75 0 000 1.085l5.5 5.25a.75.75 0 101.036-1.085L2.836 12l4.932-4.707z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/keyframes.scss
index 07dc4dd5408cd..1ab133fdab729 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-codepen-color {
   100% {
     background-image: var(--icon-codepen-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/placeholders.scss
index 603e44debc8c3..3aa38509a3821 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-codepen-color-icon {
   --icon-name: icon-codepen-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/property-16.scss
index 4d4d00b0535cb..0a6b0640803e5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-codepen-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.416 7.378v1.244L5.346 8l-.93-.622zM7.627 6.473V4.738L4.712 6.683l1.302.87 1.613-1.08zM11.285 6.683L8.37 4.738v1.735l1.613 1.08 1.302-.87zM4.712 9.32l2.915 1.942V9.527l-1.613-1.08-1.302.873zM8.37 9.527v1.735l2.915-1.942-1.302-.873-1.613 1.08zM8 7.12L6.683 8 8 8.879 9.314 8 8 7.12z"/><path d="M8 1a7 7 0 10.001 14.001A7 7 0 008 1zm4.327 8.32c0 .018 0 .033-.003.047 0 .006-.003.012-.003.015l-.006.033c-.002.006-.002.012-.005.018l-.01.026-.008.018c-.003.009-.01.018-.012.024a.06.06 0 01-.012.017l-.015.024a.065.065 0 01-.012.015c-.005.006-.011.015-.017.02l-.015.015c-.006.006-.015.012-.02.018-.007.003-.013.009-.019.012-.003 0-.003.003-.005.006l-3.96 2.64a.377.377 0 01-.414 0L3.832 9.631c-.003 0-.003-.003-.006-.006l-.018-.012c-.006-.006-.015-.012-.02-.018l-.016-.014a.129.129 0 01-.017-.021c-.003-.006-.01-.012-.012-.015a.064.064 0 01-.015-.024.062.062 0 00-.012-.017l-.012-.024-.009-.018-.008-.026-.006-.018a.106.106 0 01-.006-.033c0-.006-.003-.012-.003-.015-.003-.014-.003-.032-.003-.047V6.686c0-.018 0-.033.003-.048 0-.005.003-.011.003-.014l.006-.033.006-.018.008-.026.01-.018c.002-.009.008-.018.011-.024a.062.062 0 01.012-.017l.015-.024a.065.065 0 01.012-.015c.006-.006.011-.015.017-.02l.015-.015c.006-.006.015-.012.02-.018.007-.003.013-.01.019-.012.003 0 .003-.003.006-.006L7.79 3.741a.372.372 0 01.411 0l3.958 2.637c.002 0 .002.003.005.006l.018.012.021.018.015.014c.006.006.012.012.018.021l.011.015a.065.065 0 01.015.024.06.06 0 00.012.017.087.087 0 01.012.024l.009.018.009.026c.003.006.003.012.005.018.004.009.006.02.006.033 0 .006.003.012.003.014a.251.251 0 01.003.048V9.32h.006z"/><path d="M11.584 8.622V7.378L10.652 8l.932.622z"/></g><path fill="%23fff" fill-rule="evenodd" d="M12.327 9.32c0 .018 0 .033-.003.047 0 .004 0 .007-.002.01v.005a.14.14 0 00-.004.017c0 .003 0 .007-.002.011v.005a.044.044 0 00-.004.009c0 .002 0 .004-.002.006v.003l-.01.026-.008.018-.009.018-.003.006a.06.06 0 01-.012.017l-.003.005-.004.007a.322.322 0 01-.02.027.129.129 0 00-.008.01l-.01.01-.014.015a.137.137 0 01-.01.01.118.118 0 00-.01.008l-.01.006-.009.006-.003.003-.003.003-3.96 2.64a.377.377 0 01-.414 0L3.832 9.631l-.003-.003-.002-.003a.062.062 0 01-.01-.006.062.062 0 00-.008-.006.13.13 0 00-.01-.009.127.127 0 01-.01-.009l-.016-.014a.129.129 0 01-.017-.021.065.065 0 00-.012-.015.064.064 0 01-.015-.024c-.003-.006-.006-.011-.012-.017l-.009-.018-.003-.006-.009-.018-.009-.026-.003-.01a.042.042 0 00-.002-.008.106.106 0 01-.006-.033l-.002-.01-.001-.005c-.003-.014-.003-.032-.003-.047V6.686c0-.018 0-.033.003-.048l.001-.01.002-.004a.153.153 0 00.003-.017c0-.003 0-.007.002-.012v-.004l.003-.009.003-.009.01-.026.008-.018a.104.104 0 01.009-.018l.003-.006a.275.275 0 00.02-.03l.007-.011a.065.065 0 01.012-.015l.008-.01a.129.129 0 01.01-.01l.014-.015.01-.01c.004-.002.008-.005.01-.008l.004-.002.006-.004a.06.06 0 01.009-.006l.003-.003.002-.003L7.79 3.741a.371.371 0 01.411 0l3.957 2.637.004.003.002.003.01.006.005.004.003.002a.089.089 0 00.006.005l.005.004.01.009.015.014.017.021.008.01.004.005a.065.065 0 01.015.024.06.06 0 00.012.017.087.087 0 01.012.024l.009.018.008.026c.002.003.003.006.003.01l.003.008c.003.009.006.02.006.033l.002.01.001.004c.003.015.003.033.003.048V9.32h.006zm-7.911-.698V7.378L5.345 8l-.93.622zm3.211-3.884v1.735l-1.613 1.08-1.302-.87 2.915-1.945zm.743 0l2.915 1.945-1.302.87-1.613-1.08V4.738zm-.743 6.524L4.712 9.32l1.302-.873 1.613 1.08v1.735zm.743 0V9.527l1.613-1.08 1.302.873-2.915 1.942zM8 8.879L6.683 8 8 7.12 9.314 8 8 8.879zm3.584-1.5v1.243L10.652 8l.932-.622z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/property-24.scss
index 2502772d2b132..9713bdc71d0d5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-codepen-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M6.368 11.023v1.954L7.828 12l-1.46-.977zM11.414 9.6V6.874L6.833 9.93l2.046 1.368L11.414 9.6zM17.163 9.93L12.58 6.874V9.6l2.535 1.698 2.047-1.368zM6.833 14.074l4.581 3.052V14.4l-2.535-1.698-2.046 1.372zM12.581 14.4v2.726l4.582-3.052-2.047-1.372-2.535 1.698zM12 10.619L9.93 12 12 13.381 14.065 12 12 10.619z"/><path d="M12 1C5.926 1 1 5.926 1 12s4.926 11 11 11 11-4.926 11-11S18.074 1 12 1zm6.8 13.074c0 .028 0 .052-.005.075 0 .01-.004.018-.004.023-.005.019-.005.033-.01.051-.004.01-.004.019-.009.028l-.014.042-.014.028c-.005.014-.014.028-.018.037-.005.01-.01.019-.019.028-.01.014-.014.023-.023.037a.097.097 0 01-.019.024c-.01.009-.018.023-.028.032l-.023.023c-.01.01-.023.019-.033.028-.009.005-.018.014-.027.019-.005 0-.005.005-.01.01l-6.223 4.148a.592.592 0 01-.651 0L5.45 14.563c-.004 0-.004-.005-.01-.01-.008-.004-.018-.014-.027-.018-.01-.01-.023-.019-.033-.028l-.023-.023c-.01-.01-.018-.019-.028-.033-.004-.01-.014-.018-.018-.023a.102.102 0 01-.024-.037.097.097 0 00-.018-.028c-.01-.014-.014-.028-.019-.037l-.014-.028-.014-.042c-.004-.01-.004-.019-.01-.028a.167.167 0 01-.008-.051c0-.01-.005-.019-.005-.024-.005-.023-.005-.05-.005-.074V9.935c0-.028 0-.051.005-.075 0-.009.005-.018.005-.023.004-.018.004-.032.009-.051.005-.01.005-.019.01-.028l.013-.042.014-.028c.005-.014.014-.028.019-.037a.097.097 0 01.018-.028l.024-.037c.004-.01.014-.019.018-.023.01-.01.019-.023.028-.033l.023-.023c.01-.01.024-.019.033-.028.01-.005.019-.014.028-.019.005 0 .005-.004.01-.009l6.218-4.144a.584.584 0 01.646 0l6.219 4.144c.005 0 .005.005.01.01.008.004.018.013.027.018.01.01.023.019.033.028l.023.023c.01.01.018.019.028.033.01.01.014.018.018.023.01.01.019.023.024.037.004.01.009.019.018.028a.14.14 0 01.019.037l.014.028.014.042c.004.01.004.019.01.028.004.014.008.033.008.051 0 .01.005.019.005.023.005.024.005.052.005.075v4.14h.009z"/><path d="M17.633 12.977v-1.954L16.166 12l1.465.977z"/></g><path fill="%23fff" fill-rule="evenodd" d="M18.8 14.074c0 .028 0 .052-.005.075 0 .01-.004.018-.004.023-.005.019-.005.033-.01.051-.004.01-.004.019-.009.028l-.014.042-.014.028c-.005.014-.014.028-.018.037a.096.096 0 01-.02.028l-.022.037c-.005.01-.014.019-.019.024-.01.009-.018.023-.028.032l-.023.023c-.01.01-.023.019-.033.028-.009.005-.018.014-.027.019-.005 0-.005.005-.01.01l-6.223 4.148a.593.593 0 01-.651 0L5.45 14.563c-.005 0-.005-.005-.01-.01-.008-.004-.018-.014-.027-.018-.01-.01-.023-.019-.033-.028l-.023-.023c-.01-.01-.018-.019-.028-.033a.1.1 0 00-.018-.023.102.102 0 01-.024-.037c-.004-.01-.009-.019-.018-.028-.01-.014-.014-.028-.019-.037l-.014-.028-.014-.042c-.004-.01-.004-.019-.01-.028a.168.168 0 01-.008-.051c0-.01-.005-.019-.005-.024-.005-.023-.005-.05-.005-.074V9.935c0-.028 0-.051.005-.075 0-.009.005-.018.005-.023.004-.018.004-.032.009-.051.005-.01.005-.019.01-.028l.013-.042.014-.028c.005-.014.014-.028.019-.037.004-.01.009-.018.018-.028l.024-.037a.101.101 0 01.018-.023c.01-.01.019-.023.028-.033l.023-.023c.01-.01.024-.019.033-.028.01-.005.019-.014.028-.019.004 0 .004-.004.01-.009l6.218-4.144a.584.584 0 01.646 0l6.219 4.144c.005 0 .005.005.01.01.008.004.018.013.027.018.01.01.023.019.033.028l.023.023c.01.01.018.019.028.033.01.01.014.018.018.023a.1.1 0 01.024.037c.004.01.009.019.018.028.01.014.014.023.019.037l.014.028.014.042c.004.01.004.019.01.028.004.014.008.033.008.051 0 .01.005.019.005.023.005.024.005.052.005.075v4.14h.009zM6.367 12.977v-1.954L7.829 12l-1.46.977zm5.047-6.103V9.6l-2.535 1.698L6.833 9.93l4.581-3.056zm1.167 0l4.582 3.056-2.047 1.368L12.581 9.6V6.874zm-1.167 10.252l-4.581-3.052 2.046-1.372 2.535 1.698v2.726zm1.167 0V14.4l2.535-1.698 2.047 1.372-4.582 3.052zM9.931 12L12 10.618 14.065 12 12 13.38 9.93 12zm7.701-.977v1.954L16.167 12l1.465-.977z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/index.scss
index 9c744beec1554..4bdda184bb6c1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../codepen-color/property-16';
         @import '../codepen-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/keyframes.scss
index d169089f6cb61..ccd5bee19f3ad 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-codepen {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/placeholders.scss
index 03698eb044dd2..675a6db470905 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-codepen-icon {
   --icon-name: icon-codepen;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/property-16.scss
index 9af0bcb23e412..9bfbaff65bc75 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-codepen-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.416 7.378v1.244L5.346 8l-.93-.622zM7.627 6.473V4.738L4.712 6.683l1.302.87 1.613-1.08zM11.285 6.683L8.37 4.738v1.735l1.613 1.08 1.302-.87zM4.712 9.32l2.915 1.942V9.527l-1.613-1.08-1.302.873zM8.37 9.527v1.735l2.915-1.942-1.302-.873-1.613 1.08zM8 7.12L6.683 8 8 8.879 9.314 8 8 7.12z"/><path d="M8 1a7 7 0 10.001 14.001A7 7 0 008 1zm4.327 8.32c0 .018 0 .033-.003.047 0 .006-.003.012-.003.015l-.006.033c-.002.006-.002.012-.005.018l-.01.026-.008.018c-.003.009-.01.018-.012.024a.06.06 0 01-.012.017l-.015.024a.065.065 0 01-.012.015c-.005.006-.011.015-.017.02l-.015.015c-.006.006-.015.012-.02.018-.007.003-.013.009-.019.012-.003 0-.003.003-.005.006l-3.96 2.64a.377.377 0 01-.414 0L3.832 9.631c-.003 0-.003-.003-.006-.006l-.018-.012c-.006-.006-.015-.012-.02-.018l-.016-.014a.129.129 0 01-.017-.021c-.003-.006-.01-.012-.012-.015a.064.064 0 01-.015-.024.062.062 0 00-.012-.017l-.012-.024-.009-.018-.008-.026-.006-.018a.106.106 0 01-.006-.033c0-.006-.003-.012-.003-.015-.003-.014-.003-.032-.003-.047V6.686c0-.018 0-.033.003-.048 0-.005.003-.011.003-.014l.006-.033.006-.018.008-.026.01-.018c.002-.009.008-.018.011-.024a.062.062 0 01.012-.017l.015-.024a.065.065 0 01.012-.015c.006-.006.011-.015.017-.02l.015-.015c.006-.006.015-.012.02-.018.007-.003.013-.01.019-.012.003 0 .003-.003.006-.006L7.79 3.741a.372.372 0 01.411 0l3.958 2.637c.002 0 .002.003.005.006l.018.012.021.018.015.014c.006.006.012.012.018.021l.011.015a.065.065 0 01.015.024.06.06 0 00.012.017.087.087 0 01.012.024l.009.018.009.026c.003.006.003.012.005.018.004.009.006.02.006.033 0 .006.003.012.003.014a.251.251 0 01.003.048V9.32h.006z"/><path d="M11.584 8.622V7.378L10.652 8l.932.622z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/property-24.scss
index 8dc4a976ee7c1..be5bd7794c388 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/codepen/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-codepen-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.416 7.378v1.244L5.346 8l-.93-.622zM7.627 6.473V4.738L4.712 6.683l1.302.87 1.613-1.08zM11.285 6.683L8.37 4.738v1.735l1.613 1.08 1.302-.87zM4.712 9.32l2.915 1.942V9.527l-1.613-1.08-1.302.873zM8.37 9.527v1.735l2.915-1.942-1.302-.873-1.613 1.08zM8 7.12L6.683 8 8 8.879 9.314 8 8 7.12z"/><path d="M8 1a7 7 0 10.001 14.001A7 7 0 008 1zm4.327 8.32c0 .018 0 .033-.003.047 0 .006-.003.012-.003.015l-.006.033c-.002.006-.002.012-.005.018l-.01.026-.008.018c-.003.009-.01.018-.012.024a.06.06 0 01-.012.017l-.015.024a.065.065 0 01-.012.015c-.005.006-.011.015-.017.02l-.015.015c-.006.006-.015.012-.02.018-.007.003-.013.009-.019.012-.003 0-.003.003-.005.006l-3.96 2.64a.377.377 0 01-.414 0L3.832 9.631c-.003 0-.003-.003-.006-.006l-.018-.012c-.006-.006-.015-.012-.02-.018l-.016-.014a.129.129 0 01-.017-.021c-.003-.006-.01-.012-.012-.015a.064.064 0 01-.015-.024.062.062 0 00-.012-.017l-.012-.024-.009-.018-.008-.026-.006-.018a.106.106 0 01-.006-.033c0-.006-.003-.012-.003-.015-.003-.014-.003-.032-.003-.047V6.686c0-.018 0-.033.003-.048 0-.005.003-.011.003-.014l.006-.033.006-.018.008-.026.01-.018c.002-.009.008-.018.011-.024a.062.062 0 01.012-.017l.015-.024a.065.065 0 01.012-.015c.006-.006.011-.015.017-.02l.015-.015c.006-.006.015-.012.02-.018.007-.003.013-.01.019-.012.003 0 .003-.003.006-.006L7.79 3.741a.372.372 0 01.411 0l3.958 2.637c.002 0 .002.003.005.006l.018.012.021.018.015.014c.006.006.012.012.018.021l.011.015a.065.065 0 01.015.024.06.06 0 00.012.017.087.087 0 01.012.024l.009.018.009.026c.003.006.003.012.005.018.004.009.006.02.006.033 0 .006.003.012.003.014a.251.251 0 01.003.048V9.32h.006z"/><path d="M11.584 8.622V7.378L10.652 8l.932.622z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/collections/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/collections/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/collections/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/collections/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/collections/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/collections/keyframes.scss
index 27fea855627a8..bb79a8c79c8af 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/collections/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/collections/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-collections {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/collections/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/collections/placeholders.scss
index 38a0a9dbac8d6..12bf68e2e5667 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/collections/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/collections/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-collections-icon {
   --icon-name: icon-collections;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/collections/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/collections/property-16.scss
index 7cd7b02fe9c5f..4be2d4046fc45 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/collections/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/collections/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-collections-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.05 4.75a.7.7 0 01.7-.7h3.5a.7.7 0 110 1.4h-3.5a.7.7 0 01-.7-.7zM3.75 7.05a.7.7 0 100 1.4h2.5a.7.7 0 100-1.4h-2.5z"/><path fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h6.5c.883 0 1.648.51 2.016 1.25h.984c.698 0 1.3.409 1.582 1h.918c.966 0 1.75.784 1.75 1.75v6a1.75 1.75 0 01-1.75 1.75h-.918c-.281.591-.884 1-1.582 1h-.984A2.25 2.25 0 018.75 15h-6.5A2.25 2.25 0 010 12.75v-9.5zm13.5 8h.75a.25.25 0 00.25-.25V5a.25.25 0 00-.25-.25h-.75v6.5zm-2.5 1v-8.5h.75A.25.25 0 0112 4v8a.25.25 0 01-.25.25H11zM2.25 2.5a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h6.5a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75h-6.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/collections/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/collections/property-24.scss
index ee71f7a86b2e7..ebd2a2c936d6a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/collections/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/collections/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-collections-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M5 6.75A.75.75 0 015.75 6h6.5a.75.75 0 010 1.5h-6.5A.75.75 0 015 6.75zM5.75 9a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5z"/><path fill-rule="evenodd" d="M1 4.75A2.75 2.75 0 013.75 2h10.5c.854 0 1.617.39 2.121 1h.879c.854 0 1.617.39 2.121 1h.879A2.75 2.75 0 0123 6.75v10.5A2.75 2.75 0 0120.25 20h-.879c-.504.61-1.267 1-2.121 1h-.879c-.504.61-1.267 1-2.121 1H3.75A2.75 2.75 0 011 19.25V4.75zM19.989 18.5h.261c.69 0 1.25-.56 1.25-1.25V6.75c0-.69-.56-1.25-1.25-1.25h-.261c.007.082.011.166.011.25v12.5c0 .084-.004.168-.011.25zM17 4.75c0-.084-.004-.168-.011-.25h.261c.69 0 1.25.56 1.25 1.25v12.5c0 .69-.56 1.25-1.25 1.25h-.261c.007-.082.011-.166.011-.25V4.75zM3.75 3.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H3.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/command/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/command/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/command/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/command/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/command/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/command/keyframes.scss
index c864cd504a4b0..06954d60f41a8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/command/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/command/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-command {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/command/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/command/placeholders.scss
index 2ffa3f276e1ca..a45486204b74a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/command/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/command/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-command-icon {
   --icon-name: icon-command;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/command/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/command/property-16.scss
index 1b5926c246ed4..65f74cb4897be 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/command/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/command/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-command-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M6.5 3.75V5h3V3.75a2.75 2.75 0 112.75 2.75H11v3h1.25a2.75 2.75 0 11-2.75 2.75V11h-3v1.25A2.75 2.75 0 113.75 9.5H5v-3H3.75A2.75 2.75 0 116.5 3.75zM3.75 2.5a1.25 1.25 0 100 2.5H5V3.75c0-.69-.56-1.25-1.25-1.25zM11 11v1.25A1.25 1.25 0 1012.25 11H11zM9.5 9.5v-3h-3v3h3zM3.75 11H5v1.25A1.25 1.25 0 113.75 11zM11 5h1.25A1.25 1.25 0 1011 3.75V5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/command/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/command/property-24.scss
index 89c9476130b96..dd1911b391c0b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/command/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/command/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-command-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M9.5 5.75V8h5V5.75a3.75 3.75 0 113.75 3.75H16v5h2.25a3.75 3.75 0 11-3.75 3.75V16h-5v2.25a3.75 3.75 0 11-3.75-3.75H8v-5H5.75A3.75 3.75 0 119.5 5.75zM5.75 3.5a2.25 2.25 0 000 4.5H8V5.75A2.25 2.25 0 005.75 3.5zM16 16v2.25A2.25 2.25 0 1018.25 16H16zm-1.5-1.5v-5h-5v5h5zM5.75 16H8v2.25A2.25 2.25 0 115.75 16zM16 8h2.25A2.25 2.25 0 1016 5.75V8z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/compass/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/compass/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/compass/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/compass/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/compass/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/compass/keyframes.scss
index 06a0464264c0c..bc1a22891bdad 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/compass/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/compass/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-compass {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/compass/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/compass/placeholders.scss
index 010f9631456e7..b4a299dc28ab0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/compass/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/compass/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-compass-icon {
   --icon-name: icon-compass;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/compass/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/compass/property-16.scss
index ea8483b1f182b..042898fad1e55 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/compass/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/compass/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-compass-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M11.914 4.971a.7.7 0 00-.885-.885L6.154 5.71a.7.7 0 00-.443.443l-1.625 4.875a.7.7 0 00.885.885l4.875-1.625a.7.7 0 00.443-.443l1.625-4.875zm-6.057 5.172l1.071-3.215 3.215-1.071-1.071 3.215-3.215 1.071z"/><path d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/compass/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/compass/property-24.scss
index 7825860b6c092..4597820d62dfa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/compass/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/compass/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-compass-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M16.951 7.997a.75.75 0 00-.948-.948l-6.36 2.12a.75.75 0 00-.474.474l-2.12 6.36a.75.75 0 00.948.948l6.36-2.12a.75.75 0 00.475-.474l2.12-6.36zm-8.005 7.057l1.527-4.581 4.581-1.527-1.527 4.581-4.581 1.527z"/><path d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/keyframes.scss
index 282565e26d7e7..68dc821aa0326 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-connection-gateway {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/placeholders.scss
index aa9679abff1b5..4b5c4efc46ddb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-connection-gateway-icon {
   --icon-name: icon-connection-gateway;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/property-16.scss
index 804a1c2b8ee92..9c73c65797261 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-connection-gateway-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M13.75.5a2.25 2.25 0 00-1.847 3.536l-.933.934a.752.752 0 00-.11.14c-.19-.071-.396-.11-.61-.11h-2.5A1.75 1.75 0 006 6.75v.5H4.372a2.25 2.25 0 100 1.5H6v.5c0 .966.784 1.75 1.75 1.75h2.5c.214 0 .42-.039.61-.11.03.05.067.097.11.14l.933.934a2.25 2.25 0 101.24-.881L12.03 9.97a.75.75 0 00-.14-.11c.071-.19.11-.396.11-.61v-2.5c0-.214-.039-.42-.11-.61a.75.75 0 00.14-.11l1.113-1.113A2.252 2.252 0 0016 2.75 2.25 2.25 0 0013.75.5zM13 2.75a.75.75 0 111.5 0 .75.75 0 01-1.5 0zM7.75 6.5a.25.25 0 00-.25.25v2.5c0 .138.112.25.25.25h2.5a.25.25 0 00.25-.25v-2.5a.25.25 0 00-.25-.25h-2.5zm6 6a.75.75 0 100 1.5.75.75 0 000-1.5zM1.5 8A.75.75 0 113 8a.75.75 0 01-1.5 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/property-24.scss
index 70d1c1b28c604..a115c81918365 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/connection-gateway/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-connection-gateway-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M20.5 1.75a3 3 0 00-2.665 4.378l-2.441 2.184A2.24 2.24 0 0014.25 8h-3A2.25 2.25 0 009 10.25V11H6.405a3.001 3.001 0 00-5.905.75 3 3 0 005.905.75H9v.75a2.25 2.25 0 002.25 2.25h3a2.24 2.24 0 001.144-.312l2.44 2.184a3 3 0 101-1.118l-2.476-2.216c.092-.245.142-.51.142-.788v-3c0-.277-.05-.543-.142-.788l2.477-2.216A3 3 0 1020.5 1.75zm-1.5 3a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0zM11.25 9.5a.75.75 0 00-.75.75v3c0 .414.336.75.75.75h3a.75.75 0 00.75-.75v-3a.75.75 0 00-.75-.75h-3zm9.25 7.75a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM2 11.75a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/connection/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/connection/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/connection/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/connection/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/connection/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/connection/keyframes.scss
index 125953b3cd8a3..765517630ca6e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/connection/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/connection/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-connection {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/connection/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/connection/placeholders.scss
index 94186586fbc44..8fb574d90b242 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/connection/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/connection/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-connection-icon {
   --icon-name: icon-connection;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/connection/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/connection/property-16.scss
index 657c0727f9bfa..0f95643917461 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/connection/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/connection/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-connection-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M0 7.75A3 3 0 015.905 7h4.19a3.001 3.001 0 110 1.5h-4.19A3.001 3.001 0 010 7.75zm3-1.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zm10 0a1.5 1.5 0 100 3 1.5 1.5 0 000-3z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/connection/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/connection/property-24.scss
index 6154cafce2978..827831b3e41de 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/connection/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/connection/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-connection-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M1 11.75A3.5 3.5 0 017.92 11h8.16a3.501 3.501 0 016.92.75 3.5 3.5 0 01-6.92.75H7.92A3.501 3.501 0 011 11.75zm3.5-2a2 2 0 100 4 2 2 0 000-4zm15 0a2 2 0 100 4 2 2 0 000-4z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/console/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/console/index.scss
index f6ba69102e6fb..ab5e03fee1349 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/console/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/console/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../terminal/property-16';
         @import '../terminal/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/console/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/console/keyframes.scss
index 375899de9afd3..b5a0c52fe41da 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/console/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/console/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-console {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/console/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/console/placeholders.scss
index fc1c3c2c66bc3..2c63ab6bd0659 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/console/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/console/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-console-icon {
   --icon-name: icon-console;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/copy-action/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/copy-action/index.scss
index a4a92af0263e9..2c72293f75255 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/copy-action/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/copy-action/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../clipboard-copy/property-16';
         @import '../clipboard-copy/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/copy-action/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/copy-action/keyframes.scss
index fddf122a5494a..711bd7210eb9a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/copy-action/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/copy-action/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-copy-action {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/copy-action/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/copy-action/placeholders.scss
index 6bbe5845eb2c4..301ca21198d39 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/copy-action/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/copy-action/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-copy-action-icon {
   --icon-name: icon-copy-action;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/copy-success/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/copy-success/index.scss
index 68c80e049cf57..cd1bd1b3ea68f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/copy-success/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/copy-success/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../clipboard-checked/property-16';
         @import '../clipboard-checked/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/copy-success/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/copy-success/keyframes.scss
index ef0e5386841e7..a795809f85784 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/copy-success/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/copy-success/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-copy-success {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/copy-success/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/copy-success/placeholders.scss
index dc73f87381662..0e561fda4b9c3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/copy-success/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/copy-success/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-copy-success-icon {
   --icon-name: icon-copy-success;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/keyframes.scss
index e18860cead890..708803a1f4349 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-corner-down-left {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/placeholders.scss
index 07f80c2e75cac..90dc5797426f8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-corner-down-left-icon {
   --icon-name: icon-corner-down-left;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/property-16.scss
index 0472d584d750e..be94b1e4d5551 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-down-left-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M13.5 2.75a.75.75 0 00-1.5 0v4.5A1.75 1.75 0 0110.25 9H4.56l2.22-2.22a.75.75 0 00-1.06-1.06l-3.5 3.5a.748.748 0 000 1.06l3.5 3.5a.75.75 0 001.06-1.06L4.56 10.5h5.69a3.25 3.25 0 003.25-3.25v-4.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/property-24.scss
index 2e2c8b7abcc6c..cfbfa1082d7f9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-left/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-down-left-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M21.5 3.75a.75.75 0 00-1.5 0v7c0 .847-.357 1.669-1.009 2.282A3.639 3.639 0 0116.5 14H5.622l4.146-3.957a.75.75 0 10-1.036-1.086l-5.498 5.25a.748.748 0 00-.002 1.085l5.5 5.25a.75.75 0 101.036-1.085L5.622 15.5H16.5c1.312 0 2.578-.49 3.52-1.375a4.634 4.634 0 001.48-3.375v-7z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/keyframes.scss
index 88ae1f5f71e56..4019385a5fea7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-corner-down-right {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/placeholders.scss
index 9a3f8ccf7e025..d6d76f2e3372a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-corner-down-right-icon {
   --icon-name: icon-corner-down-right;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/property-16.scss
index 1962ef6c129c4..d95a9bc1923a6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-down-right-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M2.5 2.75a.75.75 0 011.5 0v4.5A1.75 1.75 0 005.75 9h5.69L9.22 6.78a.75.75 0 011.06-1.06l3.5 3.5a.75.75 0 010 1.06l-3.5 3.5a.75.75 0 11-1.06-1.06l2.22-2.22H5.75A3.25 3.25 0 012.5 7.25v-4.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/property-24.scss
index cc97d82de1ad3..efc4c478ecb73 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-down-right/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-down-right-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M2.5 3.75a.75.75 0 011.5 0v7c0 .847.357 1.669 1.009 2.282A3.639 3.639 0 007.5 14h10.878l-4.146-3.957a.75.75 0 011.036-1.086l5.498 5.25a.748.748 0 01.002 1.085l-5.5 5.25a.75.75 0 01-1.036-1.085l4.146-3.957H7.5a5.139 5.139 0 01-3.52-1.375A4.634 4.634 0 012.5 10.75v-7z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/keyframes.scss
index 0da09fe92c7ea..eeef5bf47f213 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-corner-left-down {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/placeholders.scss
index a0aabd008279d..18c8543e886a4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-corner-left-down-icon {
   --icon-name: icon-corner-left-down;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/property-16.scss
index 84829386c4236..08132d9b6a619 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-left-down-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M13.25 2.5a.75.75 0 010 1.5h-4.5A1.75 1.75 0 007 5.75v5.69l2.22-2.22a.75.75 0 111.06 1.06l-3.5 3.5a.75.75 0 01-1.06 0l-3.5-3.5a.75.75 0 111.06-1.06l2.22 2.22V5.75A3.25 3.25 0 018.75 2.5h4.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/property-24.scss
index c6e0d67ddc75d..d729e18e89d89 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-down/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-left-down-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M20.25 2.5a.75.75 0 010 1.5h-7c-.847 0-1.669.357-2.282 1.009A3.639 3.639 0 0010 7.5v10.878l3.957-4.146a.75.75 0 011.085 1.036l-5.25 5.5a.75.75 0 01-1.085 0l-5.25-5.5a.75.75 0 011.086-1.036L8.5 18.378V7.5c0-1.312.49-2.579 1.375-3.52A4.634 4.634 0 0113.25 2.5h7z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/keyframes.scss
index 7cb1cdc097a73..992e5786a14ee 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-corner-left-up {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/placeholders.scss
index 1557c8e78e1b4..8b56c6feaa77c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-corner-left-up-icon {
   --icon-name: icon-corner-left-up;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/property-16.scss
index 4695f58efda92..459f5476cd6c4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-left-up-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M9.22 6.78a.75.75 0 101.06-1.06l-3.5-3.5a.75.75 0 00-1.06 0l-3.5 3.5a.75.75 0 001.06 1.06L5.5 4.56v5.69a3.25 3.25 0 003.25 3.25h4.5a.75.75 0 000-1.5h-4.5A1.75 1.75 0 017 10.25V4.56l2.22 2.22z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/property-24.scss
index a6b37889cd8a5..0d8eb289e9ebb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-left-up/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-left-up-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M13.957 9.768a.75.75 0 001.085-1.036l-5.25-5.5a.75.75 0 00-1.085 0l-5.25 5.5a.75.75 0 001.086 1.036L8.5 5.622V16.5c0 1.312.49 2.578 1.375 3.52.887.942 2.1 1.48 3.375 1.48h7a.75.75 0 000-1.5h-7a3.135 3.135 0 01-2.282-1.009A3.639 3.639 0 0110 16.5V5.622l3.957 4.146z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/keyframes.scss
index 4c85a2870d098..84c7d8ffaeb29 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-corner-right-down {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/placeholders.scss
index 55d075864b86f..99b5cda49a00c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-corner-right-down-icon {
   --icon-name: icon-corner-right-down;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/property-16.scss
index c7201f7f10e77..b527b95d32d51 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-right-down-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M2.75 2.5a.75.75 0 000 1.5h4.5A1.75 1.75 0 019 5.75v5.69L6.78 9.22a.75.75 0 00-1.06 1.06l3.5 3.5a.75.75 0 001.06 0l3.5-3.5a.75.75 0 10-1.06-1.06l-2.22 2.22V5.75A3.25 3.25 0 007.25 2.5h-4.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/property-24.scss
index cb53df88b1593..9ec7622b333fa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-down/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-right-down-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M3.75 2.5a.75.75 0 000 1.5h7c.847 0 1.669.357 2.282 1.009.615.653.968 1.549.968 2.491v10.878l-3.957-4.146a.75.75 0 00-1.086 1.036l5.25 5.5a.75.75 0 001.085 0l5.25-5.5a.75.75 0 00-1.085-1.036L15.5 18.378V7.5c0-1.312-.49-2.579-1.375-3.52A4.634 4.634 0 0010.75 2.5h-7z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/keyframes.scss
index 24f57abdd56c1..6aae59911eeba 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-corner-right-up {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/placeholders.scss
index d425febeb4880..62cdb20d6a457 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-corner-right-up-icon {
   --icon-name: icon-corner-right-up;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/property-16.scss
index 0acc68cc19b92..be32c0f2cb9ea 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-right-up-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M6.78 6.78a.75.75 0 01-1.06-1.06l3.5-3.5a.75.75 0 011.06 0l3.5 3.5a.75.75 0 01-1.06 1.06L10.5 4.56v5.69a3.25 3.25 0 01-3.25 3.25h-4.5a.75.75 0 010-1.5h4.5A1.75 1.75 0 009 10.25V4.56L6.78 6.78z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/property-24.scss
index 5d3dc496ff87b..74fe1881c27aa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-right-up/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-right-up-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M10.043 9.768a.75.75 0 11-1.086-1.036l5.25-5.5a.75.75 0 011.085 0l5.25 5.5a.75.75 0 11-1.085 1.036L15.5 5.622V16.5c0 1.312-.49 2.578-1.375 3.52a4.634 4.634 0 01-3.375 1.48h-7a.75.75 0 010-1.5h7c.847 0 1.669-.357 2.282-1.009A3.639 3.639 0 0014 16.5V5.622l-3.957 4.146z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/keyframes.scss
index 02c83a403a718..02878c151dd57 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-corner-up-left {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/placeholders.scss
index f27be2758dbf3..d45fa29fc3090 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-corner-up-left-icon {
   --icon-name: icon-corner-up-left;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/property-16.scss
index cea15d3680a5f..a2bf638cdab66 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-up-left-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M6.78 9.22a.75.75 0 11-1.06 1.06l-3.5-3.5a.75.75 0 010-1.06l3.5-3.5a.75.75 0 011.06 1.06L4.56 5.5h5.69a3.25 3.25 0 013.25 3.25v4.5a.75.75 0 01-1.5 0v-4.5A1.75 1.75 0 0010.25 7H4.56l2.22 2.22z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/property-24.scss
index 13624e2057a56..bc48909bfce66 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-left/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-up-left-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M9.768 13.957a.75.75 0 01-1.036 1.085l-5.5-5.25a.75.75 0 010-1.085l5.5-5.25a.75.75 0 011.036 1.086L5.622 8.5H16.5c1.312 0 2.578.49 3.52 1.375.942.887 1.48 2.1 1.48 3.375v7a.75.75 0 01-1.5 0v-7c0-.847-.357-1.669-1.009-2.282A3.639 3.639 0 0016.5 10H5.622l4.146 3.957z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/keyframes.scss
index 58aef68d24da3..c9794d182ccea 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-corner-up-right {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/placeholders.scss
index da2ed0022e50c..c2bef0a4473d2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-corner-up-right-icon {
   --icon-name: icon-corner-up-right;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/property-16.scss
index 9497546c202d2..18bc4dcea91b3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-up-right-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M9.22 9.22a.75.75 0 101.06 1.06l3.5-3.5a.75.75 0 000-1.06l-3.5-3.5a.75.75 0 10-1.06 1.06l2.22 2.22H5.75A3.25 3.25 0 002.5 8.75v4.5a.75.75 0 001.5 0v-4.5A1.75 1.75 0 015.75 7h5.69L9.22 9.22z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/property-24.scss
index 4bfecfb0b8d9c..206e022eb6c7a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/corner-up-right/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-corner-up-right-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M14.232 13.957a.75.75 0 001.036 1.085l5.5-5.25a.75.75 0 000-1.085l-5.5-5.25a.75.75 0 00-1.036 1.086L18.378 8.5H7.5c-1.312 0-2.579.49-3.52 1.375A4.634 4.634 0 002.5 13.25v7a.75.75 0 001.5 0v-7c0-.847.357-1.669 1.009-2.282A3.639 3.639 0 017.5 10h10.878l-4.146 3.957z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/keyframes.scss
index 3d23b2b24693e..4ff6e5389b9a6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-cpu {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/placeholders.scss
index 659ad6ca2a30b..9bbf70c5dc99d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-cpu-icon {
   --icon-name: icon-cpu;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/property-16.scss
index fbe5328b8bd7a..c66e4e708f20f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cpu-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M6.25 5C5.56 5 5 5.56 5 6.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5C11 5.56 10.44 5 9.75 5h-3.5zm.25 4.5v-3h3v3h-3z"/><path d="M6.25.05a.7.7 0 01.7.7V2h2.1V.75a.7.7 0 111.4 0V2h1.3A2.25 2.25 0 0114 4.25v1.3h1.25a.7.7 0 110 1.4H14v2.1h1.25a.7.7 0 110 1.4H14v1.3A2.25 2.25 0 0111.75 14h-1.3v1.25a.7.7 0 11-1.4 0V14h-2.1v1.25a.7.7 0 11-1.4 0V14h-1.3A2.25 2.25 0 012 11.75v-1.3H.75a.7.7 0 110-1.4H2v-2.1H.75a.7.7 0 110-1.4H2v-1.3A2.25 2.25 0 014.25 2h1.3V.75a.7.7 0 01.7-.7zM3.5 4.25a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75v7.5a.75.75 0 01-.75.75h-7.5a.75.75 0 01-.75-.75v-7.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/property-24.scss
index 15cb71fe9cde0..85a9a217ea593 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/cpu/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-cpu-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M9.75 8A1.75 1.75 0 008 9.75v4.5c0 .966.784 1.75 1.75 1.75h4.5A1.75 1.75 0 0016 14.25v-4.5A1.75 1.75 0 0014.25 8h-4.5zM9.5 9.75a.25.25 0 01.25-.25h4.5a.25.25 0 01.25.25v4.5a.25.25 0 01-.25.25h-4.5a.25.25 0 01-.25-.25v-4.5z"/><path d="M9.25 0a.75.75 0 01.75.75V3h4V.75a.75.75 0 011.5 0V3h2.75A2.75 2.75 0 0121 5.75V8.5h2.25a.75.75 0 010 1.5H21v3h2.25a.75.75 0 010 1.5H21v3.75A2.75 2.75 0 0118.25 21H15.5v2.25a.75.75 0 01-1.5 0V21h-4v2.25a.75.75 0 01-1.5 0V21H5.75A2.75 2.75 0 013 18.25V14.5H.75a.75.75 0 010-1.5H3v-3H.75a.75.75 0 010-1.5H3V5.75A2.75 2.75 0 015.75 3H8.5V.75A.75.75 0 019.25 0zM4.5 18.25c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25H5.75c-.69 0-1.25.56-1.25 1.25v12.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/keyframes.scss
index 58b44eb4a9f4a..8c916040064b4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-credit-card {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/placeholders.scss
index 03e0af456565d..330b8f323f493 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-credit-card-icon {
   --icon-name: icon-credit-card;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/property-16.scss
index d2a6d4201ebc6..8c576bcb8f344 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-credit-card-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.75 9a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5z"/><path fill-rule="evenodd" d="M0 4.25A2.25 2.25 0 012.25 2h11.5A2.25 2.25 0 0116 4.25v7.5A2.25 2.25 0 0113.75 14H2.25A2.25 2.25 0 010 11.75v-7.5zm14.5 0V5h-13v-.75a.75.75 0 01.75-.75h11.5a.75.75 0 01.75.75zm0 2.75h-13v4.75c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75V7z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/property-24.scss
index 112bfd21a925d..0ab1ba76b4066 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/credit-card/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-credit-card-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M4.75 15a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5z"/><path fill-rule="evenodd" d="M0 5.75A2.75 2.75 0 012.75 3h18.5A2.75 2.75 0 0124 5.75v12.5A2.75 2.75 0 0121.25 21H2.75A2.75 2.75 0 010 18.25V5.75zm22.5 0V8h-21V5.75c0-.69.56-1.25 1.25-1.25h18.5c.69 0 1.25.56 1.25 1.25zm0 5.25h-21v7.25c0 .69.56 1.25 1.25 1.25h18.5c.69 0 1.25-.56 1.25-1.25V11z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/crop/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/crop/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/crop/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/crop/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/crop/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/crop/keyframes.scss
index b5bc24baf616c..2c18040dc68ed 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/crop/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/crop/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-crop {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/crop/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/crop/placeholders.scss
index 7ed6ffa89aff1..1b6863646ba65 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/crop/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/crop/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-crop-icon {
   --icon-name: icon-crop;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/crop/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/crop/property-16.scss
index 93c7ff52b3caf..43da40114452c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/crop/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/crop/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-crop-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M4.5 1.25a.75.75 0 00-1.5 0V3H1.25a.75.75 0 000 1.5H3v6.456A2.044 2.044 0 005.044 13H11.5v1.75a.75.75 0 001.5 0V13h1.75a.75.75 0 000-1.5H13V5.044A2.044 2.044 0 0010.956 3H4.5V1.25zm0 3.25v6.456a.544.544 0 00.544.544H11.5V5.044a.544.544 0 00-.544-.544H4.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/crop/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/crop/property-24.scss
index 5c7048ddfc89d..bef19cd3dc510 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/crop/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/crop/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-crop-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M6.5 1.25a.75.75 0 00-1.5 0V5H1.25a.75.75 0 000 1.5H5v9.75A2.75 2.75 0 007.75 19h9.75v3.75a.75.75 0 001.5 0V19h3.75a.75.75 0 000-1.5H19V7.75A2.75 2.75 0 0016.25 5H6.5V1.25zm0 5.25v9.75a1.25 1.25 0 001.25 1.25h9.75V7.75a1.25 1.25 0 00-1.25-1.25H6.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/keyframes.scss
index 71e03453145dc..7800c9ccd342e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-crosshair {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/placeholders.scss
index 392c4a7b3e521..dc0b27d066164 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-crosshair-icon {
   --icon-name: icon-crosshair;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/property-16.scss
index 03e2ca326eb18..582848c8bfd59 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-crosshair-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8.75 6.457V12.75a.75.75 0 00-1.5 0v1.707A6.503 6.503 0 011.543 8.75H3.25a.75.75 0 000-1.5H1.543A6.503 6.503 0 017.25 1.543V3.25a.75.75 0 001.5 0V1.543a6.503 6.503 0 015.707 5.707H12.75a.75.75 0 000 1.5h1.707a6.503 6.503 0 01-5.707 5.707z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/property-24.scss
index c5ab672210ab4..f1727466dcde5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/crosshair/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-crosshair-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11.75 9.47v-2.72a.75.75 0 00-1.5 0v2.72a9.502 9.502 0 01-8.72-8.72h2.72a.75.75 0 000-1.5H2.53a9.502 9.502 0 018.72-8.72v2.72a.75.75 0 001.5 0V2.53a9.502 9.502 0 018.72 8.72h-2.72a.75.75 0 000 1.5h2.72a9.502 9.502 0 01-8.72 8.72z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/keyframes.scss
index 61587aa9202a0..a5d6e9bc49c8e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-dashboard {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/placeholders.scss
index 5d80eb5f92940..150689340ac3d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-dashboard-icon {
   --icon-name: icon-dashboard;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/property-16.scss
index 2a727b5b465c3..e05a380f8cf71 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-dashboard-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M1 2.25C1 1.56 1.56 1 2.25 1h3.5C6.44 1 7 1.56 7 2.25v11.5C7 14.44 6.44 15 5.75 15h-3.5C1.56 15 1 14.44 1 13.75V2.25zm1.5.25v11h3v-11h-3zM9 2.25C9 1.56 9.56 1 10.25 1h3.5c.69 0 1.25.56 1.25 1.25v3.5C15 6.44 14.44 7 13.75 7h-3.5C9.56 7 9 6.44 9 5.75v-3.5zm1.5.25v3h3v-3h-3zM10.25 9C9.56 9 9 9.56 9 10.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5C15 9.56 14.44 9 13.75 9h-3.5zm.25 4.5v-3h3v3h-3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/property-24.scss
index d718b458c77a2..8f45f0a368b19 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dashboard/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-dashboard-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M2 3.75C2 2.784 2.784 2 3.75 2h5.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 019.25 22h-5.5A1.75 1.75 0 012 20.25V3.75zm1.75-.25a.25.25 0 00-.25.25v16.5c0 .138.112.25.25.25h5.5a.25.25 0 00.25-.25V3.75a.25.25 0 00-.25-.25h-5.5zM13 3.75c0-.966.784-1.75 1.75-1.75h5.5c.966 0 1.75.784 1.75 1.75v5.5A1.75 1.75 0 0120.25 11h-5.5A1.75 1.75 0 0113 9.25v-5.5zm1.75-.25a.25.25 0 00-.25.25v5.5c0 .138.112.25.25.25h5.5a.25.25 0 00.25-.25v-5.5a.25.25 0 00-.25-.25h-5.5zM14.75 13A1.75 1.75 0 0013 14.75v5.5c0 .966.784 1.75 1.75 1.75h5.5A1.75 1.75 0 0022 20.25v-5.5A1.75 1.75 0 0020.25 13h-5.5zm-.25 1.75a.25.25 0 01.25-.25h5.5a.25.25 0 01.25.25v5.5a.25.25 0 01-.25.25h-5.5a.25.25 0 01-.25-.25v-5.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/database/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/database/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/database/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/database/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/database/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/database/keyframes.scss
index 6ac397e34b9eb..b6e7290a3f654 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/database/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/database/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-database {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/database/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/database/placeholders.scss
index 1c09804257bd0..32cf2d958711d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/database/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/database/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-database-icon {
   --icon-name: icon-database;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/database/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/database/property-16.scss
index 0f8451e8dfc25..d30d0f985b4f5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/database/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/database/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-database-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.352 1.621C4.575 1.23 6.218 1 8 1c1.782 0 3.425.23 4.648.621.607.195 1.153.442 1.563.752.398.301.789.76.789 1.377v8.5c0 .616-.386 1.074-.784 1.376-.41.311-.954.559-1.56.753C11.435 14.771 9.791 15 8 15c-1.791 0-3.435-.23-4.656-.62-.606-.195-1.15-.443-1.56-.754-.398-.302-.784-.76-.784-1.376v-8.5c0-.618.39-1.076.789-1.377.41-.31.956-.557 1.563-.752zM2.509 3.75a.738.738 0 01.185-.18c.222-.169.591-.352 1.115-.52C4.848 2.718 6.33 2.5 8 2.5c1.67 0 3.152.218 4.19.55.524.168.894.351 1.116.52a.74.74 0 01.185.18.74.74 0 01-.185.18c-.222.169-.591.352-1.115.52C11.152 4.782 9.67 5 8 5c-1.67 0-3.152-.218-4.19-.55-.525-.168-.894-.351-1.116-.52a.738.738 0 01-.185-.18zM2.5 9.723v2.511c.01.021.049.09.192.198.22.168.588.351 1.11.519 1.035.332 2.517.549 4.198.549 1.681 0 3.162-.217 4.198-.55.522-.166.89-.35 1.11-.518.143-.109.183-.177.192-.198V9.723c-.272.113-.57.21-.88.292-1.215.322-2.848.485-4.62.485-1.772 0-3.405-.163-4.62-.485a6.903 6.903 0 01-.88-.292zm11-1.746a.591.591 0 01-.163.145c-.213.146-.575.303-1.102.443C11.192 8.841 9.7 9 8 9c-1.7 0-3.192-.159-4.235-.435-.527-.14-.889-.297-1.102-.443a.59.59 0 01-.163-.145v-2.43c.263.125.55.235.852.332C4.575 6.27 6.218 6.5 8 6.5c1.782 0 3.425-.23 4.648-.621.302-.097.59-.207.852-.331v2.429z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/database/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/database/property-24.scss
index 91526ee99deda..fb6a75232e65f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/database/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/database/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-database-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M22 5.75c0-.751-.47-1.34-1.02-1.763-.563-.43-1.329-.787-2.208-1.072C17.005 2.342 14.611 2 12 2c-2.61 0-5.005.342-6.772.915-.88.285-1.646.641-2.207 1.072C2.469 4.41 2 5 2 5.75v12.412c0 .752.454 1.352 1.006 1.79.56.445 1.325.812 2.204 1.106 1.766.59 4.163.942 6.79.942s5.024-.352 6.79-.942c.88-.294 1.644-.66 2.204-1.105.552-.439 1.006-1.039 1.006-1.791V5.75zM3.933 5.177c-.385.296-.433.496-.433.573 0 .077.048.277.433.573.374.286.963.577 1.758.835C7.27 7.67 9.502 8 12 8s4.729-.33 6.31-.842c.794-.258 1.383-.549 1.757-.835.385-.296.433-.496.433-.573 0-.077-.048-.277-.433-.573-.375-.286-.963-.577-1.758-.835C16.73 3.83 14.498 3.5 12 3.5s-4.729.33-6.31.842c-.794.258-1.383.549-1.757.835zM20.5 7.835c-.49.29-1.078.539-1.728.75-1.767.573-4.161.915-6.772.915-2.61 0-5.005-.342-6.772-.915-.65-.211-1.238-.46-1.728-.75v3.915c0 .08.05.281.43.575.372.287.957.577 1.75.834C7.256 13.671 9.486 14 12 14c2.514 0 4.744-.329 6.32-.84.793-.258 1.378-.549 1.75-.835.38-.294.43-.495.43-.575V7.835zm0 6.005c-.486.288-1.07.536-1.716.746-1.764.573-4.159.914-6.784.914s-5.02-.341-6.784-.914c-.646-.21-1.23-.458-1.716-.746v4.322c0 .102.06.315.439.616.371.295.956.593 1.747.857 1.574.527 3.802.865 6.314.865s4.74-.338 6.314-.865c.791-.264 1.376-.563 1.747-.857.379-.3.439-.514.439-.616V13.84z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/delay/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/delay/index.scss
index 697dbe244a108..31e524d9fd6ea 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/delay/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/delay/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../delay/property-16';
         @import '../delay/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/delay/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/delay/keyframes.scss
index e8e4f95bf7ad0..6b66b7f44e42a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/delay/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/delay/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-delay {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/delay/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/delay/placeholders.scss
index 97bc08af04cbb..f50a355e6e04b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/delay/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/delay/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-delay-icon {
   --icon-name: icon-delay;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/delay/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/delay/property-16.scss
index d1adb5a82048e..c2f4838e8b473 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/delay/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/delay/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-delay-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.5 8a6.5 6.5 0 016.744-6.496.75.75 0 10.055-1.499 8 8 0 107.036 11.193.75.75 0 00-1.375-.6 6.722 6.722 0 01-.22.453A6.5 6.5 0 011.5 8zM10.726 1.238a.75.75 0 011.013-.312c.177.094.35.194.518.3a.75.75 0 01-.799 1.27 6.512 6.512 0 00-.42-.244.75.75 0 01-.312-1.014zM13.74 3.508a.75.75 0 011.034.235c.106.168.206.34.3.518a.75.75 0 11-1.326.702 6.452 6.452 0 00-.243-.421.75.75 0 01.235-1.034zM15.217 6.979a.75.75 0 01.777.722 8.034 8.034 0 01.002.552.75.75 0 01-1.5-.047 6.713 6.713 0 000-.45.75.75 0 01.721-.777z"/><path d="M7.75 3a.75.75 0 01.75.75v3.786l2.085 1.043a.75.75 0 11-.67 1.342l-2.5-1.25A.75.75 0 017 8V3.75A.75.75 0 017.75 3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/delay/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/delay/property-24.scss
index 33d994421c687..4cae14ce28cb5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/delay/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/delay/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-delay-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 2.5a9.5 9.5 0 100 19 9.5 9.5 0 008.747-5.788.75.75 0 111.382.583c-.072.17-.148.338-.23.506v.002A11 11 0 0112 23C5.925 23 1 18.075 1 12S5.925 1 12 1c.186 0 .371.005.555.014a.75.75 0 01-.079 1.498A9.14 9.14 0 0012 2.5zM14.822 2.136a.75.75 0 01.971-.427c.346.135.683.287 1.01.455a.75.75 0 01-.687 1.334 9.08 9.08 0 00-.866-.39.75.75 0 01-.428-.972zM18.414 4.112a.75.75 0 011.06-.011c.263.257.513.527.749.807a.75.75 0 11-1.147.966 10.025 10.025 0 00-.651-.702.75.75 0 01-.01-1.06zM20.977 7.315a.75.75 0 01.99.381c.149.335.282.677.398 1.026a.75.75 0 11-1.422.476c-.102-.303-.218-.601-.347-.893a.75.75 0 01.38-.99zM22.174 11.239a.75.75 0 01.768.73c.01.368 0 .737-.029 1.107a.75.75 0 01-1.495-.118c.025-.317.033-.634.025-.95a.75.75 0 01.73-.77z"/><path d="M12.5 5.75a.75.75 0 00-1.5 0V12c0 .284.16.544.415.67l4.5 2.25a.75.75 0 10.67-1.34L12.5 11.536V5.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/delete/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/delete/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/delete/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/delete/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/delete/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/delete/keyframes.scss
index 9e797ef6d4c8c..864bbdf2d17b7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/delete/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/delete/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-delete {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/delete/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/delete/placeholders.scss
index 2c91d8064a497..5474c1e65137d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/delete/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/delete/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-delete-icon {
   --icon-name: icon-delete;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/delete/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/delete/property-16.scss
index 1896fdd2a0283..71ea861fe0bfb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/delete/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/delete/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-delete-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.78 5.22a.75.75 0 010 1.06L10.06 8l1.72 1.72a.75.75 0 11-1.06 1.06L9 9.06l-1.72 1.72a.75.75 0 11-1.06-1.06L7.94 8 6.22 6.28a.75.75 0 011.06-1.06L9 6.94l1.72-1.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M4.393 2.61A1.75 1.75 0 015.72 2h8.03A2.25 2.25 0 0116 4.25v7.5A2.25 2.25 0 0113.75 14H5.72a1.75 1.75 0 01-1.327-.61L.181 8.49a.75.75 0 010-.978L4.393 2.61zm1.327.89a.25.25 0 00-.19.087L1.74 8l3.792 4.413a.25.25 0 00.19.087h8.029a.75.75 0 00.75-.75v-7.5a.75.75 0 00-.75-.75H5.72z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/delete/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/delete/property-24.scss
index 23bd4b3aa0580..c878401e7d19f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/delete/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/delete/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-delete-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11.22 8.22a.75.75 0 011.06 0L15 10.94l2.72-2.72a.75.75 0 111.06 1.06L16.06 12l2.72 2.72a.75.75 0 11-1.06 1.06L15 13.06l-2.72 2.72a.75.75 0 11-1.06-1.06L13.94 12l-2.72-2.72a.75.75 0 010-1.06z"/><path fill-rule="evenodd" d="M6.579 3.97A2.75 2.75 0 018.676 3H21.25A2.75 2.75 0 0124 5.75v12.5A2.75 2.75 0 0121.25 21H8.676a2.75 2.75 0 01-2.097-.97l-6.4-7.545a.75.75 0 010-.97l6.4-7.544zm2.097.53a1.25 1.25 0 00-.953.441L1.733 12l5.99 7.059c.237.28.586.441.953.441H21.25c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25H8.676z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-alt/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-alt/index.scss
index be14875b8ccca..fc60a239bd20a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-alt/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-alt/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../skip/property-16';
         @import '../skip/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-alt/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-alt/keyframes.scss
index 6c2dc64457ab6..862dac4b09319 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-alt/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-alt/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-deny-alt {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-alt/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-alt/placeholders.scss
index 56a74ff67ab23..83b73d0ef93aa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-alt/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-alt/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-deny-alt-icon {
   --icon-name: icon-deny-alt;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/index.scss
index 68293edadf9dc..86cee0b297c2b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/keyframes.scss
index 7dab4dd64b50f..44abc05a6298e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-deny-color {
   100% {
     background-image: var(--icon-deny-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/placeholders.scss
index 67077476079e5..5ac7d63b766bd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-deny-color-icon {
   --icon-name: icon-deny-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/property-16.scss
index 151982c72d97d..e804717a3f0f3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-deny-color-16: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 16 16 " xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="%23282C2E" d="M8.79 4l-.737.71L11 7.556H3V8.57h8l-2.947 2.844.736.711L13 8.062z"/><rect stroke="%23C73445" stroke-width="1.5" x=".75" y=".75" width="14.5" height="14.5" rx="7.25"/><path d="M3.5 3.5l9 9" stroke="%23C73445" stroke-width="1.5" stroke-linecap="square"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/property-24.scss
index 02153dd3e8a3b..3f3e9e2b1b194 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-deny-color-24: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 16 16 " xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="%23282C2E" d="M8.79 4l-.737.71L11 7.556H3V8.57h8l-2.947 2.844.736.711L13 8.062z"/><rect stroke="%23C73445" stroke-width="1.5" x=".75" y=".75" width="14.5" height="14.5" rx="7.25"/><path d="M3.5 3.5l9 9" stroke="%23C73445" stroke-width="1.5" stroke-linecap="square"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-default/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-default/index.scss
index be14875b8ccca..fc60a239bd20a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-default/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-default/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../skip/property-16';
         @import '../skip/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-default/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-default/keyframes.scss
index 220017b6d6318..4eb07b47dabf3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-default/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-default/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-deny-default {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-default/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-default/placeholders.scss
index 826d52ad13d3d..2f7f06e707bf8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/deny-default/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/deny-default/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-deny-default-icon {
   --icon-name: icon-deny-default;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/keyframes.scss
index 56ecfee7f29a6..a191e1040224a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-diamond-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/placeholders.scss
index 6700fdd9dbca2..a920d2ffd819e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-diamond-fill-icon {
   --icon-name: icon-diamond-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/property-16.scss
index a5c21434389ff..0a1945fff16a7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-diamond-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M6.407.753L.75 6.409a2.25 2.25 0 000 3.182l5.657 5.657a2.25 2.25 0 003.182 0l5.657-5.657a2.25 2.25 0 000-3.182L9.589.753a2.25 2.25 0 00-3.182 0z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/property-24.scss
index 7cc146fb1f5e3..bceb7a6044637 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-diamond-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M10.056 1.924l-8.132 8.132a2.75 2.75 0 000 3.889l8.132 8.131a2.75 2.75 0 003.889 0l8.131-8.131a2.75 2.75 0 000-3.89l-8.131-8.13a2.75 2.75 0 00-3.89 0z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/keyframes.scss
index f1b31dd153854..8ae5e39d7f3bd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-diamond {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/placeholders.scss
index 401402999a73a..c2640d8a5bdcc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-diamond-icon {
   --icon-name: icon-diamond;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/property-16.scss
index e767f7b4e354a..11525f72bf7a3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-diamond-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M7.468 1.813L1.81 7.47a.75.75 0 000 1.06l5.657 5.657a.75.75 0 001.06 0l5.657-5.656a.75.75 0 000-1.061L8.528 1.813a.75.75 0 00-1.06 0zM.75 6.41L6.407.753a2.25 2.25 0 013.182 0l5.657 5.656a2.25 2.25 0 010 3.182l-5.657 5.657a2.25 2.25 0 01-3.182 0L.75 9.591a2.25 2.25 0 010-3.182z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/property-24.scss
index 5eac31abdfc81..c5baa14045de4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/diamond/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-diamond-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M11.116 2.985l-8.131 8.132a1.25 1.25 0 000 1.767l8.131 8.132a1.25 1.25 0 001.768 0l8.132-8.132a1.25 1.25 0 000-1.768l-8.132-8.131a1.25 1.25 0 00-1.768 0zm-9.192 7.07l8.132-8.13a2.75 2.75 0 013.889 0l8.131 8.13a2.75 2.75 0 010 3.89l-8.131 8.131a2.75 2.75 0 01-3.89 0l-8.131-8.131a2.75 2.75 0 010-3.89z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/disabled/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/disabled/index.scss
index be14875b8ccca..fc60a239bd20a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/disabled/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/disabled/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../skip/property-16';
         @import '../skip/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/disabled/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/disabled/keyframes.scss
index 1c0a37b7f80f9..615f61cf699f8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/disabled/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/disabled/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-disabled {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/disabled/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/disabled/placeholders.scss
index 1296d6741f56e..efce6e128bfc0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/disabled/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/disabled/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-disabled-icon {
   --icon-name: icon-disabled;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/disc/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/disc/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/disc/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/disc/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/disc/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/disc/keyframes.scss
index c03325b9eb0eb..a9f127085407f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/disc/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/disc/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-disc {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/disc/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/disc/placeholders.scss
index c459b169e9d61..622f9fe7caa62 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/disc/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/disc/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-disc-icon {
   --icon-name: icon-disc;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/disc/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/disc/property-16.scss
index 9999cb801d710..22e6d13d62d7c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/disc/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/disc/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-disc-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 5.05a2.95 2.95 0 100 5.9 2.95 2.95 0 000-5.9zM6.45 8a1.55 1.55 0 113.1 0 1.55 1.55 0 01-3.1 0z"/><path d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/disc/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/disc/property-24.scss
index 716d1919e040e..9d4158a52ec68 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/disc/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/disc/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-disc-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 8a4 4 0 100 8 4 4 0 000-8zm-2.5 4a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z"/><path d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/keyframes.scss
index b50087758fd5b..6bd4165b07f2c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-discussion-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/placeholders.scss
index 71652ab0af7a5..a57a697c8cdd0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-discussion-circle-icon {
   --icon-name: icon-discussion-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/property-16.scss
index ef062f2b61c08..6e25b059abda9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-discussion-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8.302 3.288A3.633 3.633 0 002.756 7.76c.124.237.112.49.102.61a2.984 2.984 0 01-.084.468 7.853 7.853 0 01-.2.655c.26-.09.52-.17.75-.223a.7.7 0 11.312 1.365c-.34.078-.837.258-1.278.434a23.211 23.211 0 00-.701.295l-.042.018-.01.005-.003.001a.7.7 0 01-.925-.927v-.001l.002-.004.008-.018.03-.07a21.252 21.252 0 00.43-1.047c.113-.3.211-.592.27-.822.021-.09.034-.157.041-.205a5.033 5.033 0 017.74-6.082.7.7 0 11-.896 1.076zM1.463 8.226v0z"/><path d="M4.75 9.333a5.083 5.083 0 119.657 2.221c.006.033.015.077.03.133.05.197.139.453.247.734.087.223.178.443.262.646l.06.146c.049.118.095.23.131.326.03.082.074.2.097.306a.75.75 0 01-.734.905c-.169 0-.332-.04-.447-.072a4.853 4.853 0 01-.394-.134 21.027 21.027 0 01-.606-.248l-.216-.09a7.645 7.645 0 00-.705-.265 1.763 1.763 0 00-.095-.026A5.083 5.083 0 014.75 9.333zm1.5 0a3.583 3.583 0 116.764 1.654c-.125.239-.12.485-.11.614.01.155.042.313.078.456.055.214.133.448.217.676a7.367 7.367 0 00-.643-.231 2.455 2.455 0 00-.443-.093 1.113 1.113 0 00-.626.104 3.583 3.583 0 01-5.237-3.18zm8.15 2.16v-.012l-.001.004v.009z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/property-24.scss
index 4c313fde16191..587ff4b295030 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-discussion-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M13.02 4.827a5.75 5.75 0 00-8.777 7.077c.144.275.134.58.12.751a4.182 4.182 0 01-.118.655 13.903 13.903 0 01-.512 1.557c.563-.214 1.188-.429 1.694-.545a.75.75 0 11.335 1.463c-.535.122-1.3.401-1.961.666a34.515 34.515 0 00-1.061.445l-.065.029-.016.007-.004.002h-.001a.75.75 0 01-.99-.994v-.002l.003-.006.012-.027a20.233 20.233 0 00.214-.49c.137-.322.316-.755.484-1.204.17-.453.323-.903.413-1.265.046-.183.07-.32.078-.413l.001-.022a7.25 7.25 0 0111.11-8.837.75.75 0 01-.958 1.153z"/><path d="M21.781 20.78a.75.75 0 00.152-.84l-.004-.008-.012-.027a20.257 20.257 0 01-.214-.49 30.272 30.272 0 01-.484-1.204c-.17-.453-.322-.903-.413-1.265a2.76 2.76 0 01-.077-.414l-.002-.021a7.25 7.25 0 10-3.22 3.219h.018c.092.009.23.033.413.08.363.09.814.243 1.268.413a31.27 31.27 0 011.595.649l.106.046.027.012.008.004a.75.75 0 00.84-.155zm-13.28-7.53a5.75 5.75 0 1110.852 2.653c-.144.276-.134.58-.12.752.018.208.063.434.118.655a13.896 13.896 0 00.512 1.557 14.298 14.298 0 00-1.56-.512c-.218-.056-.443-.101-.649-.119-.167-.014-.474-.028-.75.117A5.75 5.75 0 018.5 13.25z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/keyframes.scss
index 94d9c9a960284..c191c0f19b6a5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-discussion-square {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/placeholders.scss
index 7c0da08f71d36..5fc32bcb81c8d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-discussion-square-icon {
   --icon-name: icon-discussion-square;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/property-16.scss
index abc82c5c12630..5ebb509ef69e6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-discussion-square-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.25 1a.75.75 0 010 1.5h-9a.75.75 0 00-.75.75v6.531l.706-.51a.75.75 0 01.88 1.214L1.19 11.858A.75.75 0 010 11.25v-8A2.25 2.25 0 012.25 1h9z"/><path fill-rule="evenodd" d="M6.25 4A2.25 2.25 0 004 6.25v4.534a2.25 2.25 0 002.25 2.25h6.041l2.52 1.824A.75.75 0 0016 14.25v-8A2.25 2.25 0 0013.75 4h-7.5zM5.5 6.25a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75v6.531l-1.526-1.104a.75.75 0 00-.44-.143H6.25a.75.75 0 01-.75-.75V6.25z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/property-24.scss
index 06efed084c651..0ddcaf70a371b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/discussion-square/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-discussion-square-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M14.25 2A2.75 2.75 0 0117 4.75v.5a.75.75 0 01-1.5 0v-.5c0-.69-.56-1.25-1.25-1.25H3.75c-.69 0-1.25.56-1.25 1.25v10.94l2.531-2.026a.75.75 0 01.938 1.172l-3.75 3A.75.75 0 011 17.25V4.75A2.75 2.75 0 013.75 2h10.5z"/><path fill-rule="evenodd" d="M9.75 7A2.75 2.75 0 007 9.75v7.5A2.75 2.75 0 009.75 20h8.048c.284 0 .56.097.781.274l3.203 2.562A.75.75 0 0023 22.25V9.75A2.75 2.75 0 0020.25 7H9.75zM8.5 9.75c0-.69.56-1.25 1.25-1.25h10.5c.69 0 1.25.56 1.25 1.25v10.94l-1.984-1.587a2.75 2.75 0 00-1.718-.603H9.75c-.69 0-1.25-.56-1.25-1.25v-7.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/keyframes.scss
index 293ed3979521c..eed414d392f4d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-docker-color {
   100% {
     background-image: var(--icon-docker-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/placeholders.scss
index ebe0ec009df96..6ca6bf107a0bf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-docker-color-icon {
   --icon-name: icon-docker-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/property-16.scss
index 14b9b608da216..e5983ae013abf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-docker-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%232396ED" d="M12.342 4.536l.15-.227.262.159.116.083c.28.216.869.768.996 1.684.223-.04.448-.06.673-.06.534 0 .893.124 1.097.227l.105.057.068.045.191.156-.066.2a2.044 2.044 0 01-.47.73c-.29.299-.8.652-1.609.698l-.178.005h-.148c-.37.977-.867 2.078-1.702 3.066a7.081 7.081 0 01-1.74 1.488 7.941 7.941 0 01-2.549.968c-.644.125-1.298.187-1.953.185-1.45 0-2.73-.288-3.517-.792-.703-.449-1.243-1.182-1.606-2.177a8.25 8.25 0 01-.461-2.83.516.516 0 01.432-.516l.068-.005h10.54l.092-.007.149-.016c.256-.034.646-.11.92-.27-.328-.543-.421-1.178-.268-1.854a3.3 3.3 0 01.3-.81l.108-.187zM2.89 5.784l.04.007a.127.127 0 01.077.082l.006.04v1.315l-.006.041a.127.127 0 01-.078.082l-.039.006H1.478a.124.124 0 01-.117-.088l-.007-.04V5.912l.007-.04a.127.127 0 01.078-.083l.039-.006H2.89zm1.947 0l.039.007a.127.127 0 01.078.082l.006.04v1.315l-.007.041a.127.127 0 01-.078.082l-.039.006H3.424a.125.125 0 01-.117-.088L3.3 7.23V5.913a.13.13 0 01.085-.123l.039-.007h1.413zm1.976 0l.039.007a.127.127 0 01.077.082l.007.04v1.315l-.007.041a.127.127 0 01-.078.082l-.039.006H5.4a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.039-.006h1.413zm1.952 0l.039.007a.127.127 0 01.078.082l.007.04v1.315a.13.13 0 01-.085.123l-.04.006H7.353a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.04-.006h1.412zm1.97 0l.039.007a.127.127 0 01.078.082l.006.04v1.315a.13.13 0 01-.085.123l-.039.006H9.322a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.04-.006h1.411zM4.835 3.892l.04.007a.127.127 0 01.077.081l.007.041v1.315a.13.13 0 01-.085.123l-.039.007H3.424a.125.125 0 01-.117-.09l-.007-.04V4.021a.13.13 0 01.085-.122l.039-.007h1.412zm1.976 0l.04.007a.127.127 0 01.077.081l.007.041v1.315a.13.13 0 01-.085.123l-.039.007H5.4a.125.125 0 01-.117-.09l-.006-.04V4.021l.006-.04a.127.127 0 01.078-.082l.039-.007h1.412zm1.953 0c.054 0 .1.037.117.088l.007.041v1.315a.13.13 0 01-.085.123l-.04.007H7.353a.125.125 0 01-.117-.09l-.006-.04V4.021l.006-.04a.127.127 0 01.078-.082l.04-.007h1.412zm0-1.892c.054 0 .1.037.117.088l.007.04v1.316a.13.13 0 01-.085.123l-.04.006H7.353a.124.124 0 01-.117-.088l-.006-.04V2.128l.006-.04a.127.127 0 01.078-.082L7.353 2h1.412z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/property-24.scss
index c90f3fbf5376b..042912ee2331f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docker-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-docker-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%232396ED" d="M17.97 7.445l.207-.31.36.217.159.112c.385.294 1.194 1.045 1.37 2.288.306-.053.616-.08.926-.082.734 0 1.227.17 1.508.309l.143.078.094.061.263.212-.09.272a2.775 2.775 0 01-.648.99c-.398.407-1.098.887-2.211.949l-.245.006h-.203c-.509 1.329-1.193 2.823-2.34 4.165a9.708 9.708 0 01-2.393 2.022 11.005 11.005 0 01-3.505 1.314c-.885.17-1.784.255-2.685.252-1.994 0-3.753-.391-4.836-1.076-.966-.61-1.71-1.605-2.208-2.957A11.082 11.082 0 011 12.422a.704.704 0 01.595-.7l.093-.007H16.18l.128-.009.204-.022c.353-.046.889-.15 1.267-.367-.452-.737-.58-1.6-.37-2.519.09-.384.228-.754.413-1.1l.148-.253zM4.974 9.14l.054.01c.05.017.09.058.107.11l.008.056v1.786l-.008.055a.173.173 0 01-.108.111l-.053.009H3.032a.17.17 0 01-.161-.12l-.009-.055V9.315l.009-.055a.173.173 0 01.107-.111l.054-.01h1.942zm2.676 0l.054.01c.05.017.09.058.107.11l.009.056v1.786l-.01.055a.173.173 0 01-.106.111l-.054.009H5.708a.171.171 0 01-.162-.12l-.009-.055V9.316c0-.078.05-.144.117-.167l.054-.01H7.65zm2.717 0l.054.01c.05.017.09.058.107.11l.008.056v1.786l-.008.055a.172.172 0 01-.108.111l-.053.009H8.425a.17.17 0 01-.161-.12l-.009-.055V9.315l.009-.055a.173.173 0 01.107-.111l.054-.01h1.942zm2.684 0l.054.009c.051.017.091.059.108.111l.009.056v1.786c0 .077-.05.143-.117.166l-.053.009H11.11a.17.17 0 01-.161-.12l-.01-.055V9.315l.01-.055a.173.173 0 01.107-.111l.054-.01h1.942zm2.709 0l.054.009c.05.017.09.059.108.111l.008.056v1.786c0 .077-.049.143-.117.166l-.053.009h-1.942a.17.17 0 01-.161-.12l-.009-.055V9.315l.009-.055a.173.173 0 01.107-.111l.054-.01h1.942zM7.65 6.57l.054.01c.05.017.09.058.107.11l.009.055v1.786a.176.176 0 01-.116.167l-.054.01H5.708a.172.172 0 01-.162-.121l-.008-.056V6.745c0-.077.049-.143.116-.166l.054-.009H7.65zm2.717 0l.053.01c.05.017.09.058.108.11l.008.055v1.786a.176.176 0 01-.115.167l-.054.01H8.425a.171.171 0 01-.161-.121l-.009-.056V6.745l.009-.055a.173.173 0 01.107-.11l.054-.01h1.942zm2.684 0c.075 0 .14.05.162.12l.009.055v1.786c0 .078-.05.144-.117.167l-.053.01H11.11a.171.171 0 01-.161-.121l-.01-.056V6.745l.01-.055a.173.173 0 01.107-.11l.054-.01h1.942zm0-2.57c.075 0 .14.05.162.12l.009.055v1.787c0 .078-.05.143-.117.166l-.053.01H11.11a.17.17 0 01-.161-.12l-.01-.056V4.175l.01-.055a.173.173 0 01.107-.111L11.11 4h1.942z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docker/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docker/index.scss
index 376473a4bd13e..d8f20406713a4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docker/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docker/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../docker-color/property-16';
         @import '../docker-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docker/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docker/keyframes.scss
index 36a678d383771..f2296adbd27d3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docker/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docker/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-docker {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docker/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docker/placeholders.scss
index 9e6125cf370f8..350d5b9e114b2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docker/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docker/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-docker-icon {
   --icon-name: icon-docker;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docker/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docker/property-16.scss
index 6c13aa52fff13..2bd44cde96b4e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docker/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docker/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-docker-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M12.342 4.536l.15-.227.262.159.116.083c.28.216.869.768.996 1.684.223-.04.448-.06.673-.06.534 0 .893.124 1.097.227l.105.057.068.045.191.156-.066.2a2.044 2.044 0 01-.47.73c-.29.299-.8.652-1.609.698l-.178.005h-.148c-.37.977-.867 2.078-1.702 3.066a7.081 7.081 0 01-1.74 1.488 7.941 7.941 0 01-2.549.968c-.644.125-1.298.187-1.953.185-1.45 0-2.73-.288-3.517-.792-.703-.449-1.243-1.182-1.606-2.177a8.25 8.25 0 01-.461-2.83.516.516 0 01.432-.516l.068-.005h10.54l.092-.007.149-.016c.256-.034.646-.11.92-.27-.328-.543-.421-1.178-.268-1.854a3.3 3.3 0 01.3-.81l.108-.187zM2.89 5.784l.04.007a.127.127 0 01.077.082l.006.04v1.315l-.006.041a.127.127 0 01-.078.082l-.039.006H1.478a.124.124 0 01-.117-.088l-.007-.04V5.912l.007-.04a.127.127 0 01.078-.083l.039-.006H2.89zm1.947 0l.039.007a.127.127 0 01.078.082l.006.04v1.315l-.007.041a.127.127 0 01-.078.082l-.039.006H3.424a.125.125 0 01-.117-.088L3.3 7.23V5.913a.13.13 0 01.085-.123l.039-.007h1.413zm1.976 0l.039.007a.127.127 0 01.077.082l.007.04v1.315l-.007.041a.127.127 0 01-.078.082l-.039.006H5.4a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.039-.006h1.413zm1.952 0l.039.007a.127.127 0 01.078.082l.007.04v1.315a.13.13 0 01-.085.123l-.04.006H7.353a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.04-.006h1.412zm1.97 0l.039.007a.127.127 0 01.078.082l.006.04v1.315a.13.13 0 01-.085.123l-.039.006H9.322a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.04-.006h1.411zM4.835 3.892l.04.007a.127.127 0 01.077.081l.007.041v1.315a.13.13 0 01-.085.123l-.039.007H3.424a.125.125 0 01-.117-.09l-.007-.04V4.021a.13.13 0 01.085-.122l.039-.007h1.412zm1.976 0l.04.007a.127.127 0 01.077.081l.007.041v1.315a.13.13 0 01-.085.123l-.039.007H5.4a.125.125 0 01-.117-.09l-.006-.04V4.021l.006-.04a.127.127 0 01.078-.082l.039-.007h1.412zm1.953 0c.054 0 .1.037.117.088l.007.041v1.315a.13.13 0 01-.085.123l-.04.007H7.353a.125.125 0 01-.117-.09l-.006-.04V4.021l.006-.04a.127.127 0 01.078-.082l.04-.007h1.412zm0-1.892c.054 0 .1.037.117.088l.007.04v1.316a.13.13 0 01-.085.123l-.04.006H7.353a.124.124 0 01-.117-.088l-.006-.04V2.128l.006-.04a.127.127 0 01.078-.082L7.353 2h1.412z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docker/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docker/property-24.scss
index 8eff80d164613..6e43259125152 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docker/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docker/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-docker-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M12.342 4.536l.15-.227.262.159.116.083c.28.216.869.768.996 1.684.223-.04.448-.06.673-.06.534 0 .893.124 1.097.227l.105.057.068.045.191.156-.066.2a2.044 2.044 0 01-.47.73c-.29.299-.8.652-1.609.698l-.178.005h-.148c-.37.977-.867 2.078-1.702 3.066a7.081 7.081 0 01-1.74 1.488 7.941 7.941 0 01-2.549.968c-.644.125-1.298.187-1.953.185-1.45 0-2.73-.288-3.517-.792-.703-.449-1.243-1.182-1.606-2.177a8.25 8.25 0 01-.461-2.83.516.516 0 01.432-.516l.068-.005h10.54l.092-.007.149-.016c.256-.034.646-.11.92-.27-.328-.543-.421-1.178-.268-1.854a3.3 3.3 0 01.3-.81l.108-.187zM2.89 5.784l.04.007a.127.127 0 01.077.082l.006.04v1.315l-.006.041a.127.127 0 01-.078.082l-.039.006H1.478a.124.124 0 01-.117-.088l-.007-.04V5.912l.007-.04a.127.127 0 01.078-.083l.039-.006H2.89zm1.947 0l.039.007a.127.127 0 01.078.082l.006.04v1.315l-.007.041a.127.127 0 01-.078.082l-.039.006H3.424a.125.125 0 01-.117-.088L3.3 7.23V5.913a.13.13 0 01.085-.123l.039-.007h1.413zm1.976 0l.039.007a.127.127 0 01.077.082l.007.04v1.315l-.007.041a.127.127 0 01-.078.082l-.039.006H5.4a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.039-.006h1.413zm1.952 0l.039.007a.127.127 0 01.078.082l.007.04v1.315a.13.13 0 01-.085.123l-.04.006H7.353a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.04-.006h1.412zm1.97 0l.039.007a.127.127 0 01.078.082l.006.04v1.315a.13.13 0 01-.085.123l-.039.006H9.322a.124.124 0 01-.117-.088l-.006-.04V5.912l.006-.04a.127.127 0 01.078-.083l.04-.006h1.411zM4.835 3.892l.04.007a.127.127 0 01.077.081l.007.041v1.315a.13.13 0 01-.085.123l-.039.007H3.424a.125.125 0 01-.117-.09l-.007-.04V4.021a.13.13 0 01.085-.122l.039-.007h1.412zm1.976 0l.04.007a.127.127 0 01.077.081l.007.041v1.315a.13.13 0 01-.085.123l-.039.007H5.4a.125.125 0 01-.117-.09l-.006-.04V4.021l.006-.04a.127.127 0 01.078-.082l.039-.007h1.412zm1.953 0c.054 0 .1.037.117.088l.007.041v1.315a.13.13 0 01-.085.123l-.04.007H7.353a.125.125 0 01-.117-.09l-.006-.04V4.021l.006-.04a.127.127 0 01.078-.082l.04-.007h1.412zm0-1.892c.054 0 .1.037.117.088l.007.04v1.316a.13.13 0 01-.085.123l-.04.006H7.353a.124.124 0 01-.117-.088l-.006-.04V2.128l.006-.04a.127.127 0 01.078-.082L7.353 2h1.412z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/keyframes.scss
index 9b24d22bab089..11e39ebe46516 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-docs-download {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/placeholders.scss
index 47c5568d3d8d0..f826b5166545f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-docs-download-icon {
   --icon-name: icon-docs-download;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/property-16.scss
index 52e3dbe848265..e318ad98cdb2f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-docs-download-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M2 3.25A2.25 2.25 0 014.25 1h8.5c.69 0 1.25.56 1.25 1.25V4.5a.75.75 0 01-1.5 0v-2H4.25a.75.75 0 00-.75.75v6.878c.235-.083.487-.128.75-.128h.25a.75.75 0 010 1.5h-.25a.75.75 0 00-.75.75v.5c0 .414.336.75.75.75h1a.75.75 0 010 1.5h-1A2.25 2.25 0 012 12.75v-9.5z"/><path d="M8.826 10.826a.6.6 0 01.848 0l.726.725V9a.6.6 0 011.2 0v2.551l.726-.725a.6.6 0 11.848.848l-1.75 1.75a.6.6 0 01-.848 0l-1.75-1.75a.6.6 0 010-.848z"/><path fill-rule="evenodd" d="M11 6.05a4.95 4.95 0 100 9.9 4.95 4.95 0 000-9.9zM7.45 11a3.55 3.55 0 117.1 0 3.55 3.55 0 01-7.1 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/property-24.scss
index 85be282ad2baf..144ea4455b494 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-download/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-docs-download-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3 3.75A2.75 2.75 0 015.75 1h13.5c.966 0 1.75.784 1.75 1.75v6.5a.75.75 0 01-1.5 0v-6.5a.25.25 0 00-.25-.25H5.75c-.69 0-1.25.56-1.25 1.25V17.8c.375-.192.8-.3 1.25-.3h1.5a.75.75 0 010 1.5h-1.5a1.25 1.25 0 100 2.5h3a.75.75 0 010 1.5h-3A2.75 2.75 0 013 20.25V3.75z"/><path d="M12.97 17.22a.75.75 0 011.06 0l1.22 1.22v-4.69a.75.75 0 011.5 0v4.69l1.22-1.22a.75.75 0 111.06 1.06l-2.5 2.5a.747.747 0 01-1.06 0l-2.5-2.5a.75.75 0 010-1.06z"/><path fill-rule="evenodd" d="M16 10a7 7 0 100 14 7 7 0 000-14zm-5.5 7a5.5 5.5 0 1111 0 5.5 5.5 0 01-11 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/keyframes.scss
index 5e0b9126f531b..0a9f7a2090f01 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-docs-link {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/placeholders.scss
index 4ba3180094372..7b8f269f0cd86 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-docs-link-icon {
   --icon-name: icon-docs-link;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/property-16.scss
index 7bad1cccc1a36..4ec1ada2edaa1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-docs-link-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M3.5 3.25a.75.75 0 01.75-.75H8A.75.75 0 008 1H4.25A2.25 2.25 0 002 3.25v9.5A2.25 2.25 0 004.25 15h8.5c.69 0 1.25-.56 1.25-1.25V7a.75.75 0 00-1.5 0v3H4.25c-.263 0-.515.045-.75.128V3.25zm0 9v.5c0 .414.336.75.75.75h8.25v-2H4.25a.75.75 0 00-.75.75z" clip-rule="evenodd"/><path d="M12.5 3.56v.69a.75.75 0 001.5 0v-2.5a.75.75 0 00-.75-.75h-2.5a.75.75 0 000 1.5h.69L9.47 4.47a.75.75 0 001.06 1.06l1.97-1.97z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/property-24.scss
index 8bb235a455830..1a71dcf9f988d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs-link/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-docs-link-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M4.5 3.75c0-.69.56-1.25 1.25-1.25h7.5a.75.75 0 000-1.5h-7.5A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h13.5A1.75 1.75 0 0021 21.25V8.75a.75.75 0 00-1.5 0v8.75H5.75c-.45 0-.875.108-1.25.3V3.75zm0 16.5c0 .69.56 1.25 1.25 1.25h13.5a.25.25 0 00.25-.25V19H5.75c-.69 0-1.25.56-1.25 1.25z" clip-rule="evenodd"/><path d="M19.5 3.56v1.69a.75.75 0 001.5 0v-3.5a.75.75 0 00-.75-.75h-3.5a.75.75 0 000 1.5h1.69l-2.97 2.97a.75.75 0 001.06 1.06l2.97-2.97z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs/keyframes.scss
index 498eb6cbcb27c..121ace224d38f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-docs {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs/placeholders.scss
index 4d44252175851..e4bb113e0aff0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-docs-icon {
   --icon-name: icon-docs;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs/property-16.scss
index e8d19fb6bb32b..c11254968004e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-docs-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M4.25 1A2.25 2.25 0 002 3.25v9.5A2.25 2.25 0 004.25 15h8.5c.69 0 1.25-.56 1.25-1.25V2.25C14 1.56 13.44 1 12.75 1h-8.5zM3.5 12.75c0 .414.336.75.75.75h8.25v-2H4.25a.75.75 0 00-.75.75v.5zm0-2.622c.235-.083.487-.128.75-.128h8.25V2.5H4.25a.75.75 0 00-.75.75v6.878z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/docs/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/docs/property-24.scss
index 2e12846edc268..cd0d292861609 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/docs/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/docs/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-docs-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h13.5A1.75 1.75 0 0021 21.25V2.75A1.75 1.75 0 0019.25 1H5.75zM19.5 17.5V2.75a.25.25 0 00-.25-.25H5.75c-.69 0-1.25.56-1.25 1.25V17.8c.375-.192.8-.3 1.25-.3H19.5zm-15 2.75c0 .69.56 1.25 1.25 1.25h13.5a.25.25 0 00.25-.25V19H5.75c-.69 0-1.25.56-1.25 1.25z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/keyframes.scss
index d1c851821243c..711ab5fd10a50 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-dollar-sign {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/placeholders.scss
index f367d1b4cdfbc..dc3cfe2cfbc60 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-dollar-sign-icon {
   --icon-name: icon-dollar-sign;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/property-16.scss
index bf2a6ec85819c..e59a2ed3b84a0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-dollar-sign-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8.5.75a.75.75 0 00-1.5 0V2h-.594c-.9 0-1.766.353-2.405.985A3.36 3.36 0 003 5.375a3.36 3.36 0 001 2.39c.64.632 1.506.985 2.406.985H7v3.75H4.25a.75.75 0 000 1.5H7v1.25a.75.75 0 001.5 0V14h1.094c.9 0 1.766-.353 2.405-.985A3.36 3.36 0 0013 10.625a3.36 3.36 0 00-1-2.39 3.422 3.422 0 00-2.406-.985H8.5V3.5h3.25a.75.75 0 000-1.5H8.5V.75zM7 3.5h-.594c-.508 0-.994.2-1.35.552A1.86 1.86 0 004.5 5.375c0 .494.199.97.555 1.323.357.352.843.552 1.351.552H7V3.5zm1.5 5.25v3.75h1.094c.508 0 .994-.2 1.35-.552a1.86 1.86 0 00.556-1.323c0-.494-.199-.97-.555-1.323a1.922 1.922 0 00-1.351-.552H8.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/property-24.scss
index ce6b376ca60ee..cf5943fb4eba2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dollar-sign/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-dollar-sign-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12.5 1.75a.75.75 0 00-1.5 0V4H9.396c-1.165 0-2.282.46-3.107 1.28a4.365 4.365 0 000 6.19 4.406 4.406 0 003.107 1.28H11v5.75H5.75a.75.75 0 000 1.5H11v2.25a.75.75 0 001.5 0V20h2.104c1.165 0 2.282-.46 3.107-1.28a4.365 4.365 0 000-6.19 4.407 4.407 0 00-3.107-1.28H12.5V5.5h4.708a.75.75 0 000-1.5H12.5V1.75zM11 5.5H9.396c-.77 0-1.507.304-2.05.844a2.865 2.865 0 000 4.062c.543.54 1.28.844 2.05.844H11V5.5zm1.5 7.25v5.75h2.104c.77 0 1.507-.304 2.05-.844a2.864 2.864 0 000-4.062 2.906 2.906 0 00-2.05-.844H12.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/keyframes.scss
index caed49e2f5faf..0b2e9483159e5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-dot-half {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/placeholders.scss
index 589cb41867879..ed273d0779221 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-dot-half-icon {
   --icon-name: icon-dot-half;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/property-16.scss
index 3677d8dccdea4..b0f912dfe4868 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-dot-half-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 3a5 5 0 100 10A5 5 0 008 3zm0 1.5v7a3.5 3.5 0 100-7z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/property-24.scss
index 9f82e922dc5d3..83c9a0ce22eb9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dot-half/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-dot-half-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 5a7 7 0 100 14 7 7 0 000-14zm0 1.5v11a5.5 5.5 0 100-11z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dot/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dot/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dot/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dot/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dot/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dot/keyframes.scss
index 056ad2907aaa0..619a523d8a0ae 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dot/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dot/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-dot {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dot/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dot/placeholders.scss
index 3dbda34b83233..528b9137ef229 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dot/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dot/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-dot-icon {
   --icon-name: icon-dot;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dot/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dot/property-16.scss
index 5863d2455fae4..db41d6769138f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dot/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dot/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-dot-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8 3a5 5 0 100 10A5 5 0 008 3z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/dot/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/dot/property-24.scss
index 501f7f08202b8..5a5e298b41454 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/dot/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/dot/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-dot-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M12 5a7 7 0 100 14 7 7 0 000-14z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/download/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/download/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/download/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/download/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/download/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/download/keyframes.scss
index 92901acf604bc..f3bd792ec4ff9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/download/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/download/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-download {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/download/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/download/placeholders.scss
index 60a5d8059d5b9..e3896921f0c80 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/download/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/download/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-download-icon {
   --icon-name: icon-download;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/download/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/download/property-16.scss
index f9a073ccef751..714dd1e5274ef 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/download/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/download/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-download-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8.75 1.75a.75.75 0 00-1.5 0v6.59L5.3 6.24a.75.75 0 10-1.1 1.02L7.45 10.76a.78.78 0 00.038.038.748.748 0 001.063-.037l3.25-3.5a.75.75 0 10-1.1-1.02l-1.95 2.1V1.75z"/><path d="M1.75 9a.75.75 0 01.75.75v3c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75v-3a.75.75 0 011.5 0v3A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-3A.75.75 0 011.75 9z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/download/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/download/property-24.scss
index 697f7b9ec065e..ed331b72bb785 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/download/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/download/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-download-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12.75 2.75a.75.75 0 00-1.5 0v10.628L7.293 9.232a.75.75 0 10-1.086 1.036l5.25 5.499A.748.748 0 0012 16h.012a.747.747 0 00.53-.232l5.25-5.5a.75.75 0 00-1.085-1.036l-3.957 4.146V2.75z"/><path d="M2.75 14a.75.75 0 01.75.75v4.5c0 .69.56 1.25 1.25 1.25h14.5c.69 0 1.25-.56 1.25-1.25v-4.5a.75.75 0 011.5 0v4.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25v-4.5a.75.75 0 01.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/keyframes.scss
index 32f4cd8cec693..b86de15035338 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-droplet {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/placeholders.scss
index b7fb3db1655cf..b05a26dd515dc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-droplet-icon {
   --icon-name: icon-droplet;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/property-16.scss
index 6147e8a8e3aa1..2b4e2d16f3148 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-droplet-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M7.477 1.212a.75.75 0 011.046 0l3.813 3.71A5.92 5.92 0 0114 9.04C13.999 12.337 11.307 15 7.999 15c-3.308 0-6-2.663-6-5.96a5.92 5.92 0 011.665-4.118l3.812-3.71zM4.721 5.987A4.42 4.42 0 003.5 9.04C3.5 11.498 5.51 13.5 8 13.5s4.5-2.002 4.5-4.46a4.42 4.42 0 00-1.22-3.053L8 2.797l-3.28 3.19z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/property-24.scss
index 6ca0fc8c0904b..626604b92dc8e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/droplet/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-droplet-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1a.75.75 0 01.544.233l5.997 6.314A9.22 9.22 0 0121 13.84c0 5.045-4.016 9.16-9 9.16s-9-4.115-9-9.16c0-2.435.934-4.651 2.46-6.293l.005-.006 5.991-6.308A.75.75 0 0112 1zM6.556 8.571A7.719 7.719 0 004.5 13.84c0 4.244 3.371 7.66 7.5 7.66s7.5-3.416 7.5-7.66a7.719 7.719 0 00-2.056-5.269L12 2.84 6.556 8.571z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/keyframes.scss
index 4f23fecbd6897..0b997f91f9f04 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-duplicate {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/placeholders.scss
index a6393e3edd2c1..8f090f43883e0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-duplicate-icon {
   --icon-name: icon-duplicate;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/property-16.scss
index 3df2d5f19d35f..187852ccf0ef3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-duplicate-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M2.25 0A2.25 2.25 0 000 2.25v7.5A2.25 2.25 0 002.25 12h.25a.75.75 0 000-1.5h-.25a.75.75 0 01-.75-.75v-7.5a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75v.25a.75.75 0 001.5 0v-.25A2.25 2.25 0 009.75 0h-7.5z"/><path fill-rule="evenodd" d="M6.25 4A2.25 2.25 0 004 6.25v7.5A2.25 2.25 0 006.25 16h7.5A2.25 2.25 0 0016 13.75v-7.5A2.25 2.25 0 0013.75 4h-7.5zM5.5 6.25a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75v7.5a.75.75 0 01-.75.75h-7.5a.75.75 0 01-.75-.75v-7.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/property-24.scss
index 9d56671217723..bc11bf550b0c6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/duplicate/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-duplicate-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3.75 1A2.75 2.75 0 001 3.75v10.5A2.75 2.75 0 003.75 17h1a.75.75 0 000-1.5h-1c-.69 0-1.25-.56-1.25-1.25V3.75c0-.69.56-1.25 1.25-1.25h10.5c.69 0 1.25.56 1.25 1.25v1a.75.75 0 001.5 0v-1A2.75 2.75 0 0014.25 1H3.75z"/><path fill-rule="evenodd" d="M9.75 7A2.75 2.75 0 007 9.75v10.5A2.75 2.75 0 009.75 23h10.5A2.75 2.75 0 0023 20.25V9.75A2.75 2.75 0 0020.25 7H9.75zM8.5 9.75c0-.69.56-1.25 1.25-1.25h10.5c.69 0 1.25.56 1.25 1.25v10.5c0 .69-.56 1.25-1.25 1.25H9.75c-.69 0-1.25-.56-1.25-1.25V9.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/edit/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/edit/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/edit/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/edit/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/edit/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/edit/keyframes.scss
index 88462df166307..9657eb631c7f1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/edit/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/edit/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-edit {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/edit/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/edit/placeholders.scss
index a61da660c94c5..d33d06a239075 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/edit/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/edit/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-edit-icon {
   --icon-name: icon-edit;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/edit/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/edit/property-16.scss
index 5ad3a811b3074..d81255db3f593 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/edit/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/edit/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-edit-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M11.436 1.005A1.75 1.75 0 0113.902.79l.702.589a1.75 1.75 0 01.216 2.465l-5.704 6.798a4.75 4.75 0 01-1.497 1.187l-2.572 1.299a.75.75 0 01-1.056-.886l.833-2.759a4.75 4.75 0 01.908-1.68l5.704-6.798zm1.502.934a.25.25 0 00-.353.03l-.53.633 1.082.914.534-.636a.25.25 0 00-.031-.352l-.703-.59zm-.765 2.726l-1.082-.914-4.21 5.016a3.25 3.25 0 00-.621 1.15L5.933 11l1.01-.51a3.249 3.249 0 001.024-.812l4.206-5.013z" clip-rule="evenodd"/><path d="M3.25 3.5a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V9A.75.75 0 0115 9v4.75A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75v-9.5A2.25 2.25 0 013.25 2H6a.75.75 0 010 1.5H3.25z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/edit/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/edit/property-24.scss
index ea153b4e703f6..d7f9e69ccd7bb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/edit/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/edit/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-edit-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M17.055 2.884a2.75 2.75 0 013.89 0l.171.171a2.75 2.75 0 010 3.89l-9.005 9.005A4.75 4.75 0 0110.516 17L6.28 18.696a.75.75 0 01-.975-.975l1.695-4.237a4.749 4.749 0 011.051-1.595l9.005-9.005zm2.829 1.06a1.25 1.25 0 00-1.768 0l-.555.556L19.5 6.44l.555-.556a1.25 1.25 0 000-1.768l-.171-.172zM18.439 7.5L16.5 5.56l-7.39 7.39a3.25 3.25 0 00-.719 1.09l-1.045 2.614 2.613-1.046a3.25 3.25 0 001.091-.719L18.44 7.5z" clip-rule="evenodd"/><path d="M3.75 4.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h14.5c.69 0 1.25-.56 1.25-1.25V13a.75.75 0 011.5 0v7.25A2.75 2.75 0 0118.25 23H3.75A2.75 2.75 0 011 20.25V5.75A2.75 2.75 0 013.75 3H11a.75.75 0 010 1.5H3.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/keyframes.scss
index 8c0f597ac990e..d4e45df1cf923 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-enterprise {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/placeholders.scss
index f4944575e1fbb..54e2ee1d755e4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-enterprise-icon {
   --icon-name: icon-enterprise;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/property-16.scss
index 478577965df61..5f282f1a4d19e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-enterprise-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M9.872 1.774a6.516 6.516 0 013.693 2.864.75.75 0 101.283-.777 8 8 0 10-9.054 11.83.75.75 0 10.412-1.441A6.505 6.505 0 011.52 8.5h2.503a10.929 10.929 0 001.396 4.619.75.75 0 001.307-.736A9.437 9.437 0 015.527 8.5h.723a.75.75 0 000-1.5h-.67C5.835 5.124 6.667 3.335 8 1.836a10.102 10.102 0 011.736 2.71.75.75 0 101.377-.593 11.442 11.442 0 00-1.241-2.18zm-3.744 0A6.508 6.508 0 001.576 7H4.07a11.095 11.095 0 012.06-5.226z" clip-rule="evenodd"/><path d="M7.5 7.75A2.25 2.25 0 019.75 5.5h4A2.25 2.25 0 0116 7.75v7.5a.75.75 0 01-1.5 0v-7.5a.75.75 0 00-.75-.75h-4a.75.75 0 00-.75.75v7.5a.75.75 0 01-1.5 0v-7.5z"/><path d="M10.25 12a.75.75 0 00-.75.75v2.5a.75.75 0 001.5 0V13.5h1.5v1.75a.75.75 0 001.5 0v-2.5a.75.75 0 00-.75-.75h-3zM9.75 8.5a.75.75 0 01.75-.75h.25a.75.75 0 010 1.5h-.25a.75.75 0 01-.75-.75zM12.75 7.75a.75.75 0 000 1.5H13a.75.75 0 000-1.5h-.25zM9.75 10.5a.75.75 0 01.75-.75h.25a.75.75 0 010 1.5h-.25a.75.75 0 01-.75-.75zM12.75 9.75a.75.75 0 000 1.5H13a.75.75 0 000-1.5h-.25z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/property-24.scss
index 7ede64b8a1d3b..43fe9e42e279c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/enterprise/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-enterprise-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M13.673 2.647a9.462 9.462 0 014.545 2.17.75.75 0 00.983-1.133A10.96 10.96 0 0012 1C5.925 1 1 5.925 1 12c0 5.056 3.41 9.313 8.054 10.601a.75.75 0 10.401-1.445c-3.857-1.07-6.727-4.513-6.942-8.656h4.754c.097 1.97.539 3.892 1.292 5.68a.75.75 0 001.382-.582A15.256 15.256 0 018.769 12.5h.481a.75.75 0 000-1.5h-.446A15.149 15.149 0 0112 2.916c.432.546.824 1.12 1.174 1.718a.75.75 0 101.294-.758 16.46 16.46 0 00-.795-1.23zm-3.346 0A9.506 9.506 0 002.552 11h4.747a16.673 16.673 0 013.028-8.353z" clip-rule="evenodd"/><path d="M11 8.75A2.75 2.75 0 0113.75 6h6.5A2.75 2.75 0 0123 8.75v13.5a.75.75 0 01-1.5 0V8.75c0-.69-.56-1.25-1.25-1.25h-6.5c-.69 0-1.25.56-1.25 1.25v13.5a.75.75 0 01-1.5 0V8.75z"/><path d="M15.75 18c-.69 0-1.25.56-1.25 1.25v3a.75.75 0 001.5 0V19.5h2v2.75a.75.75 0 001.5 0v-3c0-.69-.56-1.25-1.25-1.25h-2.5zM14.5 12.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75zM18.25 12a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM14.5 9.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75zM18.25 9a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM14.5 15.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75zM18.25 15a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/keyframes.scss
index 15f408a1db96e..74bcd47f3bde0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-entry-point {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/placeholders.scss
index beea7812561d2..33529e96f69cd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-entry-point-icon {
   --icon-name: icon-entry-point;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/property-16.scss
index 6f46c7fe00978..3d3b244dc9ffb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-entry-point-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 2.5a5.494 5.494 0 00-4.558 2.42.75.75 0 01-1.242-.84 7 7 0 110 7.841.75.75 0 111.242-.841A5.5 5.5 0 108 2.5z"/><path d="M7.245 4.695a.75.75 0 00-.05 1.06l1.36 1.495H1.75a.75.75 0 000 1.5h6.805l-1.36 1.495a.75.75 0 001.11 1.01l2.5-2.75a.75.75 0 000-1.01l-2.5-2.75a.75.75 0 00-1.06-.05z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/property-24.scss
index 0ab869c3ccae9..06539c2962daf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/entry-point/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-entry-point-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 4.5a7.498 7.498 0 00-6.561 3.864.75.75 0 01-1.312-.728 9 9 0 110 8.728.75.75 0 011.312-.728A7.5 7.5 0 1012 4.5z"/><path d="M3 12a.75.75 0 01.75-.75h9.614l-3.129-2.955a.75.75 0 011.03-1.09l4.5 4.25a.75.75 0 010 1.09l-4.5 4.25a.75.75 0 01-1.03-1.09l3.129-2.955H3.75A.75.75 0 013 12z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-fill/index.scss
index e17674543b738..05ca47565a223 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../mail/property-16';
         @import '../mail/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-fill/keyframes.scss
index 06ba4dd203362..6e808ab7cd451 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-envelope-sealed-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-fill/placeholders.scss
index ab5fb27700b01..7da571284e123 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-envelope-sealed-fill-icon {
   --icon-name: icon-envelope-sealed-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-outline/index.scss
index e17674543b738..05ca47565a223 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../mail/property-16';
         @import '../mail/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-outline/keyframes.scss
index 93a542c1a6c58..1798fad251fe7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-envelope-sealed-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-outline/placeholders.scss
index c1634f7f5f008..27c7eaea3cf7a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-sealed-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-envelope-sealed-outline-icon {
   --icon-name: icon-envelope-sealed-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed--outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed--outline/index.scss
index b8387d4f754d3..d4df26e394eea 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed--outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed--outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../mail-open/property-16';
         @import '../mail-open/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed--outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed--outline/keyframes.scss
index d231c5788d421..bbe13813a72f8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed--outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed--outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-envelope-unsealed--outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed--outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed--outline/placeholders.scss
index 8740d578f8530..ae72b4d0edcce 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed--outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed--outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-envelope-unsealed--outline-icon {
   --icon-name: icon-envelope-unsealed--outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed-fill/index.scss
index b8387d4f754d3..d4df26e394eea 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../mail-open/property-16';
         @import '../mail-open/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed-fill/keyframes.scss
index 599507024c851..8218b6816582a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-envelope-unsealed-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed-fill/placeholders.scss
index 7dd1c9663b252..cc121524803c7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/envelope-unsealed-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-envelope-unsealed-fill-icon {
   --icon-name: icon-envelope-unsealed-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/event/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/event/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/event/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/event/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/event/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/event/keyframes.scss
index 3ddc5c6d5262f..4bef79dbee3fd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/event/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/event/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-event {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/event/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/event/placeholders.scss
index 7b5b94d853a72..a12eb46b93c22 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/event/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/event/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-event-icon {
   --icon-name: icon-event;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/event/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/event/property-16.scss
index 94bab3647a9ff..c2225aa8c204c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/event/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/event/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-event-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8.675 4.173a.75.75 0 00-1.35 0l-1.14 2.359-2.546.38a.75.75 0 00-.418 1.273l1.85 1.84-.437 2.6a.75.75 0 001.094.786L8 12.19l2.272 1.22a.75.75 0 001.094-.785l-.437-2.602 1.85-1.839a.75.75 0 00-.418-1.273l-2.545-.38-1.14-2.359zM7.362 7.542L8 6.222l.638 1.32a.75.75 0 00.565.415l1.459.218-1.066 1.059a.75.75 0 00-.21.656l.247 1.476-1.278-.686a.75.75 0 00-.71 0l-1.278.686.248-1.476a.75.75 0 00-.211-.656l-1.066-1.06 1.46-.217a.75.75 0 00.564-.415z"/><path d="M12 .75a.75.75 0 00-1.5 0V1h-5V.75a.75.75 0 00-1.5 0V1H2.25A2.25 2.25 0 000 3.25v10.5A2.25 2.25 0 002.25 16h11.5A2.25 2.25 0 0016 13.75V3.25A2.25 2.25 0 0013.75 1H12V.75zm-8 2.5V2.5H2.25a.75.75 0 00-.75.75v10.5c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75V3.25a.75.75 0 00-.75-.75H12v.75a.75.75 0 01-1.5 0V2.5h-5v.75a.75.75 0 01-1.5 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/event/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/event/property-24.scss
index a339945d22027..dce8856660dd5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/event/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/event/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-event-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12.673 7.668a.75.75 0 00-1.345 0l-1.526 3.09-3.41.498a.75.75 0 00-.415 1.28l2.467 2.403-.582 3.395a.75.75 0 001.088.79L12 17.522l3.05 1.604a.75.75 0 001.088-.79l-.582-3.396 2.467-2.403a.75.75 0 00-.415-1.28l-3.41-.498-1.525-3.09zm-1.7 4.107L12 9.695l1.027 2.08a.75.75 0 00.564.41l2.298.336-1.662 1.619a.75.75 0 00-.216.664l.392 2.286-2.054-1.08a.75.75 0 00-.698 0l-2.054 1.08.392-2.286a.75.75 0 00-.216-.664L8.111 12.52l2.298-.336a.75.75 0 00.564-.41z"/><path d="M17 2a.75.75 0 00-1.5 0v1h-7V2A.75.75 0 007 2v1H4.75A2.75 2.75 0 002 5.75v14.5A2.75 2.75 0 004.75 23h14.5A2.75 2.75 0 0022 20.25V5.75A2.75 2.75 0 0019.25 3H17V2zM7 6V4.5H4.75c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h14.5c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25H17V6a.75.75 0 01-1.5 0V4.5h-7V6A.75.75 0 017 6z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/keyframes.scss
index c2dba0ef8a133..b8374a26d9ad9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-exit-point {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/placeholders.scss
index 99ba2be5cba6e..d812f09d899a9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-exit-point-icon {
   --icon-name: icon-exit-point;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/property-16.scss
index eb736a351dbb2..d16aa09fbf42b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-exit-point-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1 8a6 6 0 018.514-5.45.75.75 0 01-.629 1.363 4.5 4.5 0 100 8.175.75.75 0 11.63 1.361A6 6 0 011 8z"/><path d="M11.245 4.695a.75.75 0 00-.05 1.06l1.36 1.495H6.75a.75.75 0 000 1.5h5.805l-1.36 1.495a.75.75 0 001.11 1.01l2.5-2.75a.748.748 0 00-.002-1.012l-2.498-2.748a.75.75 0 00-1.06-.05z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/property-24.scss
index 3336e099dd765..eb50ed2edc8c8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/exit-point/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-exit-point-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3 12a7 7 0 0110.707-5.939.75.75 0 01-.795 1.272 5.5 5.5 0 100 9.334.75.75 0 01.795 1.272A7 7 0 013 12z"/><path d="M9 12a.75.75 0 01.75-.75h9.614l-3.129-2.955a.75.75 0 011.03-1.09l4.498 4.248a.748.748 0 010 1.093l-4.498 4.25a.75.75 0 01-1.03-1.091l3.129-2.955H9.75A.75.75 0 019 12z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/exit/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/exit/index.scss
index f17b235aabf61..ea4c49f4b9fdb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/exit/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/exit/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../external-link/property-16';
         @import '../external-link/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/exit/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/exit/keyframes.scss
index 595f7cbcd5694..ed7690388c2fd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/exit/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/exit/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-exit {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/exit/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/exit/placeholders.scss
index 184edbd33d351..6bceaca78f0c9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/exit/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/exit/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-exit-icon {
   --icon-name: icon-exit;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/expand-less/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/expand-less/index.scss
index f17fa1328b50b..1513630fe58db 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/expand-less/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/expand-less/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../minimize/property-16';
         @import '../minimize/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/expand-less/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/expand-less/keyframes.scss
index 0bdbe631888e3..0f80b368ebdd0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/expand-less/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/expand-less/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-expand-less {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/expand-less/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/expand-less/placeholders.scss
index 403f7f1ac1eef..318d7f50bdf42 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/expand-less/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/expand-less/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-expand-less-icon {
   --icon-name: icon-expand-less;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/expand-more/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/expand-more/index.scss
index 8d12c28cdac26..f7f03acf358a3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/expand-more/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/expand-more/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../maximize/property-16';
         @import '../maximize/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/expand-more/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/expand-more/keyframes.scss
index 0b6e8d53a2ee3..06b5e4df59563 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/expand-more/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/expand-more/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-expand-more {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/expand-more/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/expand-more/placeholders.scss
index ab27a12473302..c4eace8789774 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/expand-more/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/expand-more/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-expand-more-icon {
   --icon-name: icon-expand-more;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/keyframes.scss
index f9633da7fc96f..14f0ebc3d1b75 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-external-link {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/placeholders.scss
index 2c5dc26011d56..4d4ad3a38da29 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-external-link-icon {
   --icon-name: icon-external-link;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/property-16.scss
index 4bb26d15ce48d..99fd564a30aac 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-external-link-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M9 .75A.75.75 0 019.75 0h4.5c.206 0 .393.083.529.218l.001.002.002.001A.748.748 0 0115 .75v4.5a.75.75 0 01-1.5 0V2.56L7.28 8.78a.75.75 0 01-1.06-1.06l6.22-6.22H9.75A.75.75 0 019 .75z"/><path d="M3.25 3.5a.75.75 0 00-.75.75v7.5c0 .414.336.75.75.75h7.5a.75.75 0 00.75-.75v-4a.75.75 0 011.5 0v4A2.25 2.25 0 0110.75 14h-7.5A2.25 2.25 0 011 11.75v-7.5A2.25 2.25 0 013.25 2h4a.75.75 0 010 1.5h-4z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/property-24.scss
index b94c4fc3b8d8a..1bb7ef0441d89 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/external-link/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-external-link-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M15 1.75a.75.75 0 01.75-.75h5.5a.748.748 0 01.75.75v5.5a.75.75 0 01-1.5 0V3.56L10.28 13.78a.75.75 0 11-1.06-1.06L19.44 2.5h-3.69a.75.75 0 01-.75-.75z"/><path d="M4.75 5.5c-.69 0-1.25.56-1.25 1.25v11.5c0 .69.56 1.25 1.25 1.25h11.5c.69 0 1.25-.56 1.25-1.25v-6.5a.75.75 0 011.5 0v6.5A2.75 2.75 0 0116.25 21H4.75A2.75 2.75 0 012 18.25V6.75A2.75 2.75 0 014.75 4h6.5a.75.75 0 010 1.5h-6.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/keyframes.scss
index 80f6a15ed2e4a..6fa9be5f59819 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-eye-off {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/placeholders.scss
index e40476cdd4dd2..5da6cb6a148bd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-eye-off-icon {
   --icon-name: icon-eye-off;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/property-16.scss
index 950f9ac4b4621..7909168e42898 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-eye-off-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M2.28 1.22a.75.75 0 00-1.06 1.06l1.664 1.665A10.99 10.99 0 00.977 5.994c-.295.41-.524.791-.683 1.103a4.16 4.16 0 00-.194.431A1.4 1.4 0 000 8c0 .155.041.296.067.375a3 3 0 00.122.31c.097.215.234.471.407.751.346.56.854 1.246 1.516 1.914C3.43 12.68 5.422 14 8 14c1.49 0 2.786-.442 3.868-1.071l1.852 1.851a.75.75 0 101.06-1.06l-4.645-4.646a.383.383 0 00-.008-.007v-.001l-3.19-3.19a.555.555 0 00-.014-.014L2.28 1.22zm3.127 5.248L3.95 5.01a9.444 9.444 0 00-1.754 1.857 7.362 7.362 0 00-.566.911c-.046.09-.08.164-.104.221l.03.067c.065.145.17.344.316.58a9.45 9.45 0 001.306 1.647C4.332 11.458 5.964 12.5 8 12.5c1.028 0 1.95-.264 2.763-.677l-1.23-1.23C9.078 10.858 8.552 11 8 11a3 3 0 01-3-3c0-.553.142-1.079.407-1.532zm2.985 2.985L6.547 7.608A1.62 1.62 0 006.5 8 1.5 1.5 0 008 9.5c.137 0 .269-.016.392-.047zM8 3.5c-.306 0-.602.023-.887.067a.75.75 0 11-.226-1.483C7.247 2.029 7.617 2 8 2c2.578 0 4.57 1.32 5.888 2.65.662.668 1.17 1.354 1.516 1.914.173.28.31.536.407.75.048.107.09.212.122.31.026.08.067.221.067.376 0 .21-.079.42-.126.537a4.99 4.99 0 01-.251.524c-.21.384-.515.857-.909 1.355a.75.75 0 11-1.176-.93c.343-.434.6-.836.768-1.144.078-.143.133-.258.168-.342a5.336 5.336 0 00-.346-.648 9.452 9.452 0 00-1.306-1.646C11.668 4.542 10.036 3.5 8 3.5zm6.511 4.604l-.002-.008.001.005.001.003z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/property-24.scss
index 659746965ca30..f306a3008d824 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/eye-off/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-eye-off-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M2.28 1.22a.75.75 0 00-1.06 1.06l3.468 3.468C3.294 6.87 2.204 8.154 1.437 9.236a15.323 15.323 0 00-1.02 1.635c-.117.22-.21.415-.277.574-.033.08-.063.16-.086.234A1.102 1.102 0 000 12c0 .116.025.216.037.263.017.06.037.12.058.177.042.113.1.245.17.388.138.289.34.657.599 1.074a18.14 18.14 0 002.285 2.936C5.14 18.912 8.135 21 12 21c2.361 0 4.4-.78 6.08-1.86l3.64 3.64a.75.75 0 101.06-1.06L2.28 1.22zm10.88 13l-3.38-3.38c-.18.345-.28.738-.28 1.16a2.5 2.5 0 002.5 2.5c.422 0 .815-.1 1.16-.28zM8.688 9.75A3.976 3.976 0 008 12a4 4 0 004 4c.835 0 1.609-.25 2.251-.688l2.74 2.74c-1.43.863-3.1 1.448-4.991 1.448-3.295 0-5.925-1.78-7.769-3.701a16.641 16.641 0 01-2.093-2.688c-.236-.38-.41-.701-.523-.934a4.225 4.225 0 01-.08-.177 5.8 5.8 0 01.207-.426c.202-.38.51-.893.919-1.47.733-1.036 1.776-2.253 3.094-3.288l2.933 2.933zM12 4.5c-.813 0-1.583.108-2.31.299a.75.75 0 11-.38-1.451A10.568 10.568 0 0112 3c3.864 0 6.86 2.088 8.85 4.162 1.001 1.043 1.767 2.1 2.286 2.936.26.417.46.785.6 1.074.069.143.127.275.169.388.021.056.041.117.058.177.012.047.037.147.037.263 0 .171-.057.332-.08.396-.034.098-.08.208-.134.326-.109.236-.265.535-.465.874-.4.68-.99 1.551-1.759 2.455a.75.75 0 01-1.142-.973 16.232 16.232 0 001.608-2.242 8.709 8.709 0 00.438-.836 4.03 4.03 0 00-.081-.177 10.392 10.392 0 00-.523-.934 16.639 16.639 0 00-2.093-2.688C17.924 6.28 15.294 4.5 12 4.5zm10.516 7.365z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/eye/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/eye/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/eye/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/eye/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/eye/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/eye/keyframes.scss
index 6669d8278212a..69b5bdfd5d4c5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/eye/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/eye/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-eye {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/eye/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/eye/placeholders.scss
index 89488d29b5c01..c320a170ad301 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/eye/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/eye/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-eye-icon {
   --icon-name: icon-eye;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/eye/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/eye/property-16.scss
index f991360579d8c..355d6215bb39f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/eye/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/eye/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-eye-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 5a3 3 0 100 6 3 3 0 000-6zM6.5 8a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z"/><path d="M8 2C5.422 2 3.43 3.32 2.112 4.65A10.948 10.948 0 00.596 6.564c-.173.28-.31.536-.407.75a3 3 0 00-.122.31C.04 7.705 0 7.846 0 8s.041.296.067.375a3 3 0 00.122.31c.097.215.234.471.407.751.346.56.854 1.246 1.516 1.914C3.43 12.68 5.422 14 8 14s4.57-1.32 5.888-2.65a10.952 10.952 0 001.516-1.914c.173-.28.31-.536.407-.75.048-.107.09-.212.122-.31.026-.08.067-.221.067-.376s-.041-.296-.067-.375a2.978 2.978 0 00-.122-.31 6.777 6.777 0 00-.407-.751 10.952 10.952 0 00-1.516-1.914C12.57 3.32 10.578 2 8 2zM1.556 7.933a2.314 2.314 0 00-.03.067l.03.067c.065.145.17.344.316.58a9.45 9.45 0 001.306 1.647C4.332 11.458 5.964 12.5 8 12.5s3.668-1.042 4.822-2.206a9.45 9.45 0 001.306-1.646A5.336 5.336 0 0014.473 8a5.335 5.335 0 00-.346-.648 9.452 9.452 0 00-1.305-1.646C11.668 4.542 10.036 3.5 8 3.5S4.332 4.542 3.178 5.706a9.45 9.45 0 00-1.306 1.646 5.316 5.316 0 00-.316.58z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/eye/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/eye/property-24.scss
index b0061092ca1c6..6fdf05676d645 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/eye/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/eye/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-eye-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 8a4 4 0 100 8 4 4 0 000-8zm-2.5 4a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z"/><path d="M12 3C8.135 3 5.14 5.088 3.15 7.162c-1.001 1.043-1.767 2.1-2.286 2.936-.26.417-.46.785-.6 1.074-.069.143-.127.275-.169.388a1.952 1.952 0 00-.058.177A1.024 1.024 0 000 12c0 .116.025.216.037.263.017.06.037.12.058.177.042.113.1.245.17.388.138.289.34.657.599 1.074a18.14 18.14 0 002.285 2.936C5.14 18.912 8.135 21 12 21c3.864 0 6.86-2.088 8.85-4.162 1.001-1.043 1.767-2.1 2.286-2.936.26-.417.46-.785.6-1.074.069-.143.127-.275.169-.388a1.98 1.98 0 00.058-.177c.012-.047.037-.147.037-.263 0-.116-.025-.216-.037-.263a1.98 1.98 0 00-.058-.177 4.709 4.709 0 00-.17-.388c-.139-.289-.34-.657-.599-1.074a18.146 18.146 0 00-2.285-2.936C18.86 5.088 15.865 3 12 3zM1.615 12.177a4.225 4.225 0 01-.08-.177c.02-.048.047-.107.08-.177.113-.233.287-.554.523-.934a16.641 16.641 0 012.093-2.688C6.076 6.28 8.705 4.5 12 4.5c3.294 0 5.924 1.78 7.768 3.701a16.639 16.639 0 012.094 2.688c.236.38.41.701.523.934.033.07.06.129.08.177a4.03 4.03 0 01-.08.177c-.113.233-.287.554-.523.934a16.639 16.639 0 01-2.093 2.688C17.924 17.72 15.294 19.5 12 19.5s-5.925-1.78-7.769-3.701a16.641 16.641 0 01-2.093-2.688c-.236-.38-.41-.701-.523-.934z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/keyframes.scss
index 77131b7b7d6bf..afbab64a833e9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-f5-color {
   100% {
     background-image: var(--icon-f5-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/placeholders.scss
index cf7d7e7ead2c5..03ef9c7c20dbb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-f5-color-icon {
   --icon-name: icon-f5-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/property-16.scss
index d94a12826828a..20025947e5f97 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-f5-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23E4002B" d="M13.777 4.048c-.086.354-.13.722-.213 1.098a39.715 39.715 0 00-3.668-.285c-.112.351-.217.696-.337 1.071 2.318.143 3.444.754 4.112 1.473.65.728.788 1.533.75 2.28-.084 1.213-.619 1.98-1.353 2.549a4.712 4.712 0 01-2.361.898c-1.061.08-2.48-.173-2.782-.358-.182-.414-.36-.83-.553-1.285-.047-.096-.077-.196.056-.31.206-.199.405-.39.613-.593.093-.09.195-.174.273-.045.285.44.552.844.82 1.246.304.449.768.858 1.78.79.851-.076 1.498-.72 1.567-1.428.075-1.31-1.251-2.24-4.699-2.538.662-1.997 1.306-3.93 1.822-5.466a27.93 27.93 0 012.302.198c.535.068 1.033.193 1.532.25a7 7 0 00-11.076 8.555c.297.002.502-.064.525-.192.027-.133.004-.34-.02-.549a32.121 32.121 0 01-.136-4.343c-.355.015-.674.031-.98.05.013-.276.028-.536.05-.807.302-.029.621-.054.972-.084.015-.237.032-.466.053-.697.157-1.418 1.65-2.285 2.893-2.62.552-.134.89-.176 1.154-.19.096-.003.2-.007.302-.007.258 0 .52.024.685.137.268.2.533.4.815.623.028.038.059.098-.011.201l-.386.452c-.076.092-.201.067-.307.039a32.529 32.529 0 00-.652-.323c-.392-.174-.798-.354-1.25-.336-.281.023-.554.311-.582.706-.04.6-.066 1.215-.088 1.882a100.06 100.06 0 012.389-.04l-.001.552c-.27.12-.523.241-.792.364-.556.006-1.085.01-1.617.02a72.993 72.993 0 00.07 4.627c.014.22.024.444.088.593.076.189.513.334 1.464.387l.014.483c-1.549-.046-3.036-.194-4.228-.408a7 7 0 0010.991-8.62z"/><path fill="%23fff" d="M14.42 9.684c.038-.746-.1-1.55-.75-2.279-.667-.72-1.794-1.33-4.112-1.473.12-.375.226-.72.337-1.071 1.386.049 2.62.149 3.668.285.083-.376.128-.744.214-1.098a6.934 6.934 0 00-.339-.454c-.499-.058-.996-.182-1.532-.251a27.93 27.93 0 00-2.301-.198c-.516 1.536-1.16 3.469-1.822 5.467 3.447.298 4.773 1.227 4.699 2.538-.069.708-.716 1.352-1.567 1.428-1.013.068-1.476-.34-1.78-.79-.268-.402-.535-.806-.82-1.246-.078-.129-.18-.045-.273.045-.209.203-.407.395-.614.592-.132.116-.103.215-.056.312.193.454.373.87.554 1.284.302.185 1.72.438 2.782.358a4.714 4.714 0 002.36-.898c.735-.57 1.27-1.337 1.353-2.55z"/><path fill="%23fff" d="M2.363 12.148c.132.18.273.354.422.52 1.193.215 2.68.363 4.23.408-.006-.16-.01-.317-.015-.483-.951-.053-1.388-.198-1.464-.386-.064-.15-.075-.373-.088-.594a72.784 72.784 0 01-.07-4.627c.532-.01 1.061-.014 1.617-.02.27-.123.523-.244.792-.364v-.551c-.823.003-1.604.017-2.387.039.022-.667.048-1.282.087-1.883.028-.394.301-.683.583-.705.451-.018.857.162 1.25.336.216.105.43.209.651.323.106.028.232.052.307-.04l.386-.451c.07-.104.04-.163.011-.201a39.675 39.675 0 00-.815-.624c-.165-.112-.427-.136-.685-.136-.102 0-.206.004-.301.007-.265.014-.602.056-1.154.19-1.244.335-2.736 1.202-2.894 2.62-.02.231-.037.46-.052.697-.351.03-.671.055-.973.084-.022.271-.037.532-.05.806.306-.018.625-.033.98-.049a32.19 32.19 0 00.137 4.343c.023.209.046.416.019.55-.022.127-.228.193-.524.191z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/property-24.scss
index 508c90ed5e0c9..54b7e0d6c7ca1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/f5-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-f5-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23E4002B" d="M20.253 6.354c-.123.506-.187 1.031-.305 1.568a56.737 56.737 0 00-5.24-.406c-.16.502-.31.993-.482 1.53 3.311.204 4.92 1.076 5.875 2.104.928 1.04 1.125 2.19 1.071 3.256-.12 1.734-.884 2.83-1.933 3.642-1.061.8-2.345 1.197-3.373 1.283-1.515.114-3.542-.247-3.973-.511-.26-.59-.516-1.186-.791-1.835-.067-.138-.11-.28.08-.445.295-.282.578-.556.877-.845.132-.13.278-.25.389-.065.407.629.79 1.206 1.172 1.78.434.641 1.096 1.226 2.543 1.128 1.215-.108 2.14-1.028 2.238-2.04.107-1.872-1.788-3.2-6.713-3.625.945-2.853 1.867-5.614 2.603-7.809 1.17.054 2.253.15 3.288.283.765.097 1.476.276 2.19.358A9.978 9.978 0 0011.998 2C6.477 2 2 6.477 2 12a9.953 9.953 0 001.947 5.926c.423.003.717-.091.749-.274.039-.191.006-.487-.027-.785-.2-1.962-.271-4.081-.196-6.204-.507.022-.962.045-1.399.07.018-.392.04-.764.07-1.152.432-.041.888-.077 1.39-.12.021-.338.046-.665.075-.996.225-2.025 2.357-3.263 4.134-3.741.788-.192 1.27-.253 1.648-.273.137-.004.284-.01.431-.01.368 0 .742.035.979.196.383.287.761.573 1.164.89.04.055.084.14-.016.287-.185.217-.363.423-.551.646-.108.131-.288.096-.44.055a46.47 46.47 0 00-.93-.46c-.56-.25-1.14-.506-1.785-.48-.403.032-.793.444-.833 1.007a84.509 84.509 0 00-.125 2.69 142.94 142.94 0 013.412-.057l-.001.788c-.384.171-.746.345-1.131.52-.794.009-1.55.015-2.31.028-.036 2.266-.002 4.523.1 6.61.02.315.035.634.125.848.109.269.733.476 2.092.553.005.236.012.46.02.689-2.212-.065-4.337-.276-6.04-.583A9.968 9.968 0 0012 22c5.524 0 10-4.477 10-10a9.952 9.952 0 00-1.746-5.646z"/><path fill="%23fff" d="M21.172 14.406c.053-1.067-.144-2.216-1.072-3.256-.954-1.028-2.563-1.9-5.874-2.104.172-.537.322-1.028.481-1.53 1.98.07 3.741.212 5.24.406.118-.537.183-1.062.305-1.568a9.887 9.887 0 00-.483-.649c-.713-.082-1.424-.26-2.19-.358a39.903 39.903 0 00-3.287-.283c-.737 2.195-1.658 4.956-2.603 7.81 4.925.426 6.82 1.753 6.713 3.626-.098 1.011-1.023 1.931-2.239 2.04-1.446.097-2.108-.487-2.542-1.128-.383-.576-.765-1.152-1.173-1.78-.11-.185-.257-.065-.388.064-.299.29-.582.563-.877.846-.19.165-.148.306-.08.444.275.65.532 1.245.79 1.836.432.264 2.459.625 3.974.511 1.028-.086 2.312-.483 3.373-1.283 1.049-.814 1.813-1.91 1.932-3.644z"/><path fill="%23fff" d="M3.946 17.926c.19.257.391.505.604.743 1.704.306 3.829.518 6.041.582l-.02-.689c-1.359-.077-1.983-.284-2.092-.553-.09-.213-.106-.532-.126-.847a103.977 103.977 0 01-.1-6.61c.76-.014 1.517-.02 2.31-.029.386-.175.748-.349 1.132-.52l.002-.788a143.01 143.01 0 00-3.412.056c.031-.952.069-1.832.124-2.69.04-.563.43-.975.833-1.007.645-.025 1.225.231 1.785.48.31.15.615.299.931.461.152.04.331.076.44-.056.187-.222.366-.429.55-.645.1-.148.057-.233.016-.287a56.679 56.679 0 00-1.164-.89c-.237-.16-.61-.196-.979-.196-.146 0-.294.005-.43.01-.379.02-.86.08-1.65.272-1.775.479-3.908 1.717-4.133 3.742-.03.331-.053.658-.075.997-.501.042-.958.078-1.389.12-.031.387-.053.76-.07 1.151.436-.025.891-.048 1.399-.07a45.987 45.987 0 00.195 6.204c.033.299.066.594.027.785-.032.183-.325.277-.749.274z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/f5/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/f5/index.scss
index e6785447b9a5a..f4b28bbd50d8d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/f5/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/f5/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../f5-color/property-16';
         @import '../f5-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/f5/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/f5/keyframes.scss
index 788b0956165e8..dca828d9b4db2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/f5/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/f5/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-f5 {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/f5/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/f5/placeholders.scss
index 42457af5a2f7a..6296b3c43f55b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/f5/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/f5/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-f5-icon {
   --icon-name: icon-f5;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/f5/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/f5/property-16.scss
index f699b1b908cee..a2c1b28f89d04 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/f5/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/f5/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-f5-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M13.777 4.048c-.086.354-.13.722-.213 1.098a39.715 39.715 0 00-3.668-.285c-.112.351-.217.696-.337 1.071 2.318.143 3.444.754 4.112 1.473.65.728.788 1.533.75 2.28-.084 1.213-.619 1.98-1.353 2.549a4.712 4.712 0 01-2.361.898c-1.061.08-2.48-.173-2.782-.358-.182-.414-.36-.83-.553-1.285-.047-.096-.077-.196.056-.31.206-.199.405-.39.613-.593.093-.09.195-.174.273-.045.285.44.552.844.82 1.246.304.449.768.858 1.78.79.851-.076 1.498-.72 1.567-1.428.075-1.31-1.251-2.24-4.699-2.538.662-1.997 1.306-3.93 1.822-5.466a27.93 27.93 0 012.302.198c.535.068 1.033.193 1.532.25a7 7 0 00-11.076 8.555c.297.002.502-.064.525-.192.027-.133.004-.34-.02-.549a32.121 32.121 0 01-.136-4.343c-.355.015-.674.031-.98.05.013-.276.028-.536.05-.807.302-.029.621-.054.972-.084.015-.237.032-.466.053-.697.157-1.418 1.65-2.285 2.893-2.62.552-.134.89-.176 1.154-.19.096-.003.2-.007.302-.007.258 0 .52.024.685.137.268.2.533.4.815.623.028.038.059.098-.011.201l-.386.452c-.076.092-.201.067-.307.039a32.529 32.529 0 00-.652-.323c-.392-.174-.798-.354-1.25-.336-.281.023-.554.311-.582.706-.04.6-.066 1.215-.088 1.882a100.06 100.06 0 012.389-.04l-.001.552c-.27.12-.523.241-.792.364-.556.006-1.085.01-1.617.02a72.993 72.993 0 00.07 4.627c.014.22.024.444.088.593.076.189.513.334 1.464.387l.014.483c-1.549-.046-3.036-.194-4.228-.408a7 7 0 0010.991-8.62z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/f5/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/f5/property-24.scss
index a24f3bbf3fffa..e212181547e72 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/f5/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/f5/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-f5-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M13.777 4.048c-.086.354-.13.722-.213 1.098a39.715 39.715 0 00-3.668-.285c-.112.351-.217.696-.337 1.071 2.318.143 3.444.754 4.112 1.473.65.728.788 1.533.75 2.28-.084 1.213-.619 1.98-1.353 2.549a4.712 4.712 0 01-2.361.898c-1.061.08-2.48-.173-2.782-.358-.182-.414-.36-.83-.553-1.285-.047-.096-.077-.196.056-.31.206-.199.405-.39.613-.593.093-.09.195-.174.273-.045.285.44.552.844.82 1.246.304.449.768.858 1.78.79.851-.076 1.498-.72 1.567-1.428.075-1.31-1.251-2.24-4.699-2.538.662-1.997 1.306-3.93 1.822-5.466a27.93 27.93 0 012.302.198c.535.068 1.033.193 1.532.25a7 7 0 00-11.076 8.555c.297.002.502-.064.525-.192.027-.133.004-.34-.02-.549a32.121 32.121 0 01-.136-4.343c-.355.015-.674.031-.98.05.013-.276.028-.536.05-.807.302-.029.621-.054.972-.084.015-.237.032-.466.053-.697.157-1.418 1.65-2.285 2.893-2.62.552-.134.89-.176 1.154-.19.096-.003.2-.007.302-.007.258 0 .52.024.685.137.268.2.533.4.815.623.028.038.059.098-.011.201l-.386.452c-.076.092-.201.067-.307.039a32.529 32.529 0 00-.652-.323c-.392-.174-.798-.354-1.25-.336-.281.023-.554.311-.582.706-.04.6-.066 1.215-.088 1.882a100.06 100.06 0 012.389-.04l-.001.552c-.27.12-.523.241-.792.364-.556.006-1.085.01-1.617.02a72.993 72.993 0 00.07 4.627c.014.22.024.444.088.593.076.189.513.334 1.464.387l.014.483c-1.549-.046-3.036-.194-4.228-.408a7 7 0 0010.991-8.62z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/keyframes.scss
index 2174e4d9fff7b..10fe22166b9b8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-facebook-color {
   100% {
     background-image: var(--icon-facebook-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/placeholders.scss
index 5bd1fad7e8b9b..b3d9f13e65c85 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-facebook-color-icon {
   --icon-name: icon-facebook-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/property-16.scss
index 7912356ced2fa..830c09ca1009e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-facebook-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%231877F2" d="M15 8a7 7 0 00-7-7 7 7 0 00-1.094 13.915v-4.892H5.13V8h1.777V6.458c0-1.754 1.045-2.724 2.644-2.724.766 0 1.567.137 1.567.137v1.723h-.883c-.87 0-1.14.54-1.14 1.093V8h1.941l-.31 2.023H9.094v4.892A7.001 7.001 0 0015 8z"/><path fill="%23fff" d="M10.725 10.023L11.035 8H9.094V6.687c0-.553.27-1.093 1.14-1.093h.883V3.87s-.801-.137-1.567-.137c-1.6 0-2.644.97-2.644 2.724V8H5.13v2.023h1.777v4.892a7.037 7.037 0 002.188 0v-4.892h1.63z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/property-24.scss
index 267156ca4e080..8447b04e27de2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-facebook-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%231877F2" d="M23 12c0-6.076-4.924-11-11-11S1 5.924 1 12c0 5.491 4.022 10.042 9.281 10.867V15.18H7.488V12h2.793V9.577c0-2.757 1.642-4.28 4.155-4.28 1.204 0 2.462.215 2.462.215v2.707h-1.387c-1.367 0-1.792.848-1.792 1.719V12h3.05l-.487 3.18h-2.563v7.687C18.979 22.042 23 17.49 23 12z"/><path fill="%23fff" d="M16.282 15.18L16.77 12h-3.051V9.937c0-.87.425-1.718 1.792-1.718h1.387V5.512s-1.258-.215-2.462-.215c-2.513 0-4.155 1.523-4.155 4.28V12H7.488v3.18h2.793v7.687a11.065 11.065 0 003.438 0V15.18h2.563z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/index.scss
index a3c2145815292..a4d8186172f6a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../facebook-color/property-16';
         @import '../facebook-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/keyframes.scss
index aec8d48f3dd9a..e0c7f0af443ce 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-facebook {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/placeholders.scss
index 155145534ec63..10d91d2574aad 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-facebook-icon {
   --icon-name: icon-facebook;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/property-16.scss
index e1fa10f2a7537..ef80814564931 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-facebook-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M15 8a7 7 0 00-7-7 7 7 0 00-1.094 13.915v-4.892H5.13V8h1.777V6.458c0-1.754 1.045-2.724 2.644-2.724.766 0 1.567.137 1.567.137v1.723h-.883c-.87 0-1.14.54-1.14 1.093V8h1.941l-.31 2.023H9.094v4.892A7.001 7.001 0 0015 8z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/property-24.scss
index a18511589c8f0..0f233f603b7ae 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/facebook/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-facebook-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M15 8a7 7 0 00-7-7 7 7 0 00-1.094 13.915v-4.892H5.13V8h1.777V6.458c0-1.754 1.045-2.724 2.644-2.724.766 0 1.567.137 1.567.137v1.723h-.883c-.87 0-1.14.54-1.14 1.093V8h1.941l-.31 2.023H9.094v4.892A7.001 7.001 0 0015 8z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/keyframes.scss
index 377b4fb7fb4ee..23f2e4a5742f6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-fast-forward {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/placeholders.scss
index 37cc9d074170f..5f1f29b8adad4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-fast-forward-icon {
   --icon-name: icon-fast-forward;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/property-16.scss
index 55b390f1491c8..b5a9d66616b29 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-fast-forward-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8.926 3.364A1.25 1.25 0 007 4.416v1.806L2.962 3.427A1.25 1.25 0 001 4.454v7.092a1.25 1.25 0 001.962 1.027L7 9.778v1.806a1.25 1.25 0 001.926 1.052L14.5 9.052a1.25 1.25 0 000-2.103L8.926 3.364zM13.363 8L8.5 11.126V4.874L13.363 8zM2.5 11.069V4.93L6.932 8 2.5 11.069z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/property-24.scss
index 6b5946657af58..e2215459a9840 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/fast-forward/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-fast-forward-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M13.812 5.38C12.66 4.5 11 5.322 11 6.77v3.331L4.812 5.38C3.66 4.5 2 5.322 2 6.77v10.458c0 1.449 1.66 2.27 2.812 1.391L11 13.897v3.332c0 1.449 1.66 2.27 2.812 1.391l6.851-5.229a1.75 1.75 0 000-2.782l-6.851-5.23zM12.5 6.77a.25.25 0 01.402-.199l6.851 5.23a.25.25 0 010 .397l-6.851 5.229a.25.25 0 01-.402-.2V6.772zm-9 0a.25.25 0 01.402-.199l7.061 5.39v.077l-7.061 5.389a.25.25 0 01-.402-.2V6.772z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/keyframes.scss
index 3191e4e2d1bb8..4ff02b8926535 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-file-change {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/placeholders.scss
index 19c4f1efd7d50..c2f9862cbe55c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-file-change-icon {
   --icon-name: icon-file-change;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/property-16.scss
index a8f658887abbb..95233f3669551 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-change-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M3.25 0A2.25 2.25 0 001 2.25v11.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75V5.457c0-.331-.132-.65-.366-.884L10.427.366A1.25 1.25 0 009.543 0H3.25zM2.5 2.25a.75.75 0 01.75-.75H9v3.75c0 .414.336.75.75.75h3.75v7.75a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V2.25zm9.94 2.25L10.5 2.56V4.5h1.94zM9.583 9.156z" clip-rule="evenodd"/><path d="M5.5 8.595C5.77 8.325 6.23 8 6.876 8c.904 0 1.44.71 1.7 1.017.37.443.464.483.55.483.194 0 .375-.18.458-.344a.75.75 0 011.338.68 2.222 2.222 0 01-.422.57c-.27.269-.73.594-1.374.594-.904 0-1.44-.71-1.7-1.017-.37-.443-.465-.483-.55-.483-.2 0-.367.181-.458.344a.75.75 0 01-1.338-.68c.107-.212.254-.402.422-.57z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/property-24.scss
index 798d7c0a37d90..4aa6a2f6b5cc9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-change/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-change-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.458 15.328c.218-.26.487-.58.899-.745a1.12 1.12 0 01.778-.026c.324.1.766.356 1.313.95.667.726 1.325 1.17 1.979 1.37.667.204 1.27.135 1.774-.067a3.433 3.433 0 001.127-.768 5.357 5.357 0 00.41-.459l.02-.022.032-.04.012-.013a.75.75 0 10-1.104-1.016c-.05.054-.101.115-.156.18-.218.26-.487.58-.899.745a1.12 1.12 0 01-.778.026c-.324-.1-.766-.356-1.313-.95-.667-.726-1.325-1.17-1.979-1.37a2.619 2.619 0 00-1.774.067 3.433 3.433 0 00-1.127.768 5.4 5.4 0 00-.326.356l-.085.103-.018.022a4.557 4.557 0 01-.045.053.75.75 0 101.104 1.016c.05-.054.101-.115.156-.18z"/><path fill-rule="evenodd" d="M3 3.75A2.75 2.75 0 015.75 1h7.586c.464 0 .909.184 1.237.513l5.914 5.914c.329.328.513.773.513 1.237V20.25A2.75 2.75 0 0118.25 23H5.75A2.75 2.75 0 013 20.25V3.75zM5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V9h-5.75a.75.75 0 01-.75-.75V2.5H5.75zm8.75 1.06l3.94 3.94H14.5V3.56z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/keyframes.scss
index 417881cc2e711..3a64422b932ed 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-file-check {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/placeholders.scss
index e9d396a94d1d8..a5f255445eef5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-file-check-icon {
   --icon-name: icon-file-check;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/property-16.scss
index 32373860fe070..654020f5c54ac 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-check-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M3.25 1.5a.75.75 0 00-.75.75v11.5c0 .414.336.75.75.75h4a.75.75 0 010 1.5h-4A2.25 2.25 0 011 13.75V2.25A2.25 2.25 0 013.25 0h6.293c.331 0 .65.132.884.366l4.207 4.207c.234.235.366.553.366.884V6.75a.75.75 0 01-1.5 0V6H9.75A.75.75 0 019 5.25V1.5H3.25zm7.25 1.06l1.94 1.94H10.5V2.56z"/><path d="M16 12a4 4 0 11-8 0 4 4 0 018 0zm-1.712-1.272a.75.75 0 01-.016 1.06l-2.406 2.334a.75.75 0 01-1.044 0l-1.094-1.06a.75.75 0 011.044-1.078l.572.555 1.884-1.827a.75.75 0 011.06.016z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/property-24.scss
index 2ecb19122adf4..41e8f4aa9c304 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-check/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-check-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25H11a.75.75 0 010 1.5H5.75A2.75 2.75 0 013 20.25V3.75A2.75 2.75 0 015.75 1h7.586c.464 0 .909.184 1.237.513l5.914 5.914c.329.328.513.773.513 1.237V13a.75.75 0 01-1.5 0V9h-5.75a.75.75 0 01-.75-.75V2.5H5.75zm8.75 1.06l3.94 3.94H14.5V3.56z"/><path d="M22 19a5 5 0 11-10 0 5 5 0 0110 0zm-1.879-2.03a.75.75 0 010 1.06l-3.5 3.5a.75.75 0 01-1.06 0l-1.591-1.59a.75.75 0 111.06-1.061l1.06 1.06 2.97-2.97a.75.75 0 011.061 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/keyframes.scss
index 62dd7da767813..6c1a94560bf65 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-file-diff {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/placeholders.scss
index 57250db01502c..434fe1362a545 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-file-diff-icon {
   --icon-name: icon-file-diff;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/property-16.scss
index 351bc0d1ce1c2..fbc3647ccb8bf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-diff-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8.5 6.25a.75.75 0 00-1.5 0V7.5H5.75a.75.75 0 000 1.5H7v1.25a.75.75 0 001.5 0V9h1.25a.75.75 0 000-1.5H8.5V6.25zM5.75 11.5a.75.75 0 000 1.5h4a.75.75 0 000-1.5h-4z"/><path fill-rule="evenodd" d="M1 2.25A2.25 2.25 0 013.25 0h6.293c.331 0 .65.132.884.366l4.207 4.207c.234.235.366.553.366.884v8.293A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V2.25zm2.25-.75a.75.75 0 00-.75.75v11.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V6H9.75A.75.75 0 019 5.25V1.5H3.25zm7.25 1.06l1.94 1.94H10.5V2.56z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/property-24.scss
index 21d795f45823e..22bc171a12244 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-diff/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-diff-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12.5 10.25a.75.75 0 00-1.5 0v2.25H8.75a.75.75 0 000 1.5H11v2.25a.75.75 0 001.5 0V14h2.25a.75.75 0 000-1.5H12.5v-2.25zM8.75 18a.75.75 0 000 1.5h6a.75.75 0 000-1.5h-6z"/><path fill-rule="evenodd" d="M3 3.75A2.75 2.75 0 015.75 1h7.586c.464 0 .909.184 1.237.513l5.914 5.914c.329.328.513.773.513 1.237V20.25A2.75 2.75 0 0118.25 23H5.75A2.75 2.75 0 013 20.25V3.75zM5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V9h-5.75a.75.75 0 01-.75-.75V2.5H5.75zm8.75 1.06l3.94 3.94H14.5V3.56z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-fill/index.scss
index 748b7562e2c73..a00e3b361e83a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../file/property-16';
         @import '../file/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-fill/keyframes.scss
index 90ea1d969b3b1..1d117611595a4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-file-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-fill/placeholders.scss
index 7de1be4f9a7dc..619b0a51796cd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-file-fill-icon {
   --icon-name: icon-file-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/keyframes.scss
index 5772a0ae96f40..ec502684f3095 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-file-minus {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/placeholders.scss
index bc4543b50ccea..a132910f4545f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-file-minus-icon {
   --icon-name: icon-file-minus;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/property-16.scss
index 94e3eeb5d3d69..9280abdd5ef25 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-minus-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.75 9a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5z"/><path fill-rule="evenodd" d="M1 2.25A2.25 2.25 0 013.25 0h6.293c.331 0 .65.132.884.366l4.207 4.207c.234.235.366.553.366.884v8.293A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V2.25zm2.25-.75a.75.75 0 00-.75.75v11.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V6H9.75A.75.75 0 019 5.25V1.5H3.25zm7.25 1.06l1.94 1.94H10.5V2.56z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/property-24.scss
index aad072cdc6312..074564883f2bf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-minus/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-minus-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.75 14a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5z"/><path fill-rule="evenodd" d="M3 3.75A2.75 2.75 0 015.75 1h7.586c.464 0 .909.184 1.237.513l5.914 5.914c.329.328.513.773.513 1.237V20.25A2.75 2.75 0 0118.25 23H5.75A2.75 2.75 0 013 20.25V3.75zM5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V9h-5.75a.75.75 0 01-.75-.75V2.5H5.75zm8.75 1.06l3.94 3.94H14.5V3.56z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-outline/index.scss
index 748b7562e2c73..a00e3b361e83a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../file/property-16';
         @import '../file/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-outline/keyframes.scss
index 7338da7442fa0..370cf494d1061 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-file-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-outline/placeholders.scss
index 1ab2f44bbab2a..c562f0a785df3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-file-outline-icon {
   --icon-name: icon-file-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/keyframes.scss
index 862d3e2a74de6..06f1970b18ffb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-file-plus {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/placeholders.scss
index f8b9552a11058..1dddb21caefdc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-file-plus-icon {
   --icon-name: icon-file-plus;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/property-16.scss
index 6c9f12f0dc0fd..c300763dd6908 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-plus-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.75 7a.75.75 0 01.75.75V9h1.25a.75.75 0 010 1.5H8.5v1.25a.75.75 0 01-1.5 0V10.5H5.75a.75.75 0 010-1.5H7V7.75A.75.75 0 017.75 7z"/><path fill-rule="evenodd" d="M3.25 0A2.25 2.25 0 001 2.25v11.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75V5.457c0-.331-.132-.65-.366-.884L10.427.366A1.25 1.25 0 009.543 0H3.25zM2.5 2.25a.75.75 0 01.75-.75H9v3.75c0 .414.336.75.75.75h3.75v7.75a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V2.25zm9.94 2.25L10.5 2.56V4.5h1.94z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/property-24.scss
index f96cd70a39fbf..5040d93594c78 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-plus/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-plus-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11.75 10.75a.75.75 0 01.75.75V14H15a.75.75 0 010 1.5h-2.5V18a.75.75 0 01-1.5 0v-2.5H8.5a.75.75 0 010-1.5H11v-2.5a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V8.664c0-.464-.184-.909-.513-1.237l-5.914-5.914A1.75 1.75 0 0013.336 1H5.75zM4.5 3.75c0-.69.56-1.25 1.25-1.25H13v5.75c0 .414.336.75.75.75h5.75v11.25c0 .69-.56 1.25-1.25 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V3.75zM18.44 7.5L14.5 3.56V7.5h3.94z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/keyframes.scss
index 4bcc12df5f64b..1657a00d3d49c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-file-source {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/placeholders.scss
index 969ea1ff02dee..a5f22a21b8811 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-file-source-icon {
   --icon-name: icon-file-source;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/property-16.scss
index 48ca6875dce98..9c23896278a54 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-source-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.22 7.838a.625.625 0 01-.058.882L5.699 10l1.463 1.28a.625.625 0 01-.824.94l-2-1.75a.625.625 0 010-.94l2-1.75a.625.625 0 01.882.058zM8.838 8.72a.625.625 0 01.824-.94l2 1.75a.625.625 0 010 .94l-2 1.75a.625.625 0 01-.824-.94L10.301 10 8.838 8.72z"/><path fill-rule="evenodd" d="M3.25 0A2.25 2.25 0 001 2.25v11.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75V5.457c0-.331-.132-.65-.366-.884L10.427.366A1.25 1.25 0 009.543 0H3.25zM2.5 2.25a.75.75 0 01.75-.75H9v3.75c0 .414.336.75.75.75h3.75v7.75a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V2.25zm9.94 2.25L10.5 2.56V4.5h1.94z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/property-24.scss
index 8bbc0401a0784..29e4cbafa276d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-source/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-source-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M13.15 12.3a.75.75 0 011.05-.15l3 2.25a.75.75 0 010 1.2l-3 2.25a.75.75 0 11-.9-1.2L15.5 15l-2.2-1.65a.75.75 0 01-.15-1.05zM10.7 13.35a.75.75 0 10-.9-1.2l-3 2.25a.75.75 0 000 1.2l3 2.25a.75.75 0 10.9-1.2L8.5 15l2.2-1.65z"/><path fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V8.664c0-.464-.184-.909-.513-1.237l-5.914-5.914A1.75 1.75 0 0013.336 1H5.75zM4.5 3.75c0-.69.56-1.25 1.25-1.25H13v5.75c0 .414.336.75.75.75h5.75v11.25c0 .69-.56 1.25-1.25 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V3.75zM18.44 7.5L14.5 3.56V7.5h3.94z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/keyframes.scss
index 4fd8742fc2f08..8f6779fc4f9a0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-file-text {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/placeholders.scss
index dd41281a2bbc4..e6f26263fe2fa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-file-text-icon {
   --icon-name: icon-file-text;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/property-16.scss
index 96cf2b3ef5f41..40d70eea364f2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-text-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.75 8a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5zM4 11.75a.75.75 0 01.75-.75h3.5a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75zM4.75 5a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5z"/><path fill-rule="evenodd" d="M1 2.25A2.25 2.25 0 013.25 0h6.293c.331 0 .65.132.884.366l4.207 4.207c.234.235.366.553.366.884v8.293A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V2.25zm2.25-.75a.75.75 0 00-.75.75v11.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V6H9.75A.75.75 0 019 5.25V1.5H3.25zm7.25 1.06l1.94 1.94H10.5V2.56z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/property-24.scss
index 3deda9e1fc801..1866591c9f792 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-text/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-text-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M7.75 12a.75.75 0 000 1.5h8a.75.75 0 000-1.5h-8zM7 16.75a.75.75 0 01.75-.75h6a.75.75 0 010 1.5h-6a.75.75 0 01-.75-.75zM7.75 8a.75.75 0 000 1.5h2a.75.75 0 000-1.5h-2z"/><path fill-rule="evenodd" d="M3 3.75A2.75 2.75 0 015.75 1h7.586c.464 0 .909.184 1.237.513l5.914 5.914c.329.328.513.773.513 1.237V20.25A2.75 2.75 0 0118.25 23H5.75A2.75 2.75 0 013 20.25V3.75zM5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V9h-5.75a.75.75 0 01-.75-.75V2.5H5.75zm8.75 1.06l3.94 3.94H14.5V3.56z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/keyframes.scss
index 7244e202b4db2..e9ba46edd6706 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-file-x {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/placeholders.scss
index 0d2fbbefc050f..ca72199351b57 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-file-x-icon {
   --icon-name: icon-file-x;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/property-16.scss
index 6c21c3166ecb7..02bf4d469c40b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-x-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M3.25 1.5a.75.75 0 00-.75.75v11.5c0 .414.336.75.75.75h4.5a.75.75 0 010 1.5h-4.5A2.25 2.25 0 011 13.75V2.25A2.25 2.25 0 013.25 0h6.293c.331 0 .65.132.884.366l4.207 4.207c.234.235.366.553.366.884V7.5a.75.75 0 01-1.5 0V6H9.75A.75.75 0 019 5.25V1.5H3.25zm7.25 1.06l1.94 1.94H10.5V2.56z"/><path d="M11 9a2 2 0 00-2 2v3a2 2 0 002 2h3a2 2 0 002-2v-3a2 2 0 00-2-2h-3zm.53 5.53l.97-.97.97.97a.75.75 0 101.06-1.06l-.97-.97.97-.97a.75.75 0 10-1.06-1.06l-.97.97-.97-.97a.75.75 0 10-1.06 1.06l.97.97-.97.97a.75.75 0 101.06 1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/property-24.scss
index f8d7709523b11..7d8ac8b084101 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file-x/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-x-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h4.5a.75.75 0 010 1.5h-4.5A2.75 2.75 0 013 20.25V3.75A2.75 2.75 0 015.75 1h7.586c.464 0 .909.184 1.237.513l5.914 5.914c.329.328.513.773.513 1.237v3.586a.75.75 0 01-1.5 0V9h-5.75a.75.75 0 01-.75-.75V2.5H5.75zm8.75 1.06l3.94 3.94H14.5V3.56z"/><path d="M14 14a2 2 0 00-2 2v6a2 2 0 002 2h6a2 2 0 002-2v-6a2 2 0 00-2-2h-6zm5.78 3.28a.75.75 0 10-1.06-1.06L17 17.94l-1.72-1.72a.75.75 0 10-1.06 1.06L15.94 19l-1.72 1.72a.75.75 0 101.06 1.06L17 20.06l1.72 1.72a.75.75 0 101.06-1.06L18.06 19l1.72-1.72z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file/keyframes.scss
index f67dbc5a45372..863b788bb6fca 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-file {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file/placeholders.scss
index 2c9a4bdba0fdc..1749f38e38737 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-file-icon {
   --icon-name: icon-file;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file/property-16.scss
index 35fd0dde7d5dc..587e0c6b7fdf9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.25 0A2.25 2.25 0 001 2.25v11.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75V5.457c0-.331-.132-.65-.366-.884L10.427.366A1.25 1.25 0 009.543 0H3.25zM2.5 2.25a.75.75 0 01.75-.75H9v3.75c0 .414.336.75.75.75h3.75v7.75a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V2.25zm9.94 2.25L10.5 2.56V4.5h1.94z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/file/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/file/property-24.scss
index 7b1d8c19d4ca9..b0efd7281e01c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/file/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/file/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-file-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V8.664c0-.464-.184-.909-.513-1.237l-5.914-5.914A1.75 1.75 0 0013.336 1H5.75zM4.5 3.75c0-.69.56-1.25 1.25-1.25H13v5.75c0 .414.336.75.75.75h5.75v11.25c0 .69-.56 1.25-1.25 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V3.75zM18.44 7.5L14.5 3.56V7.5h3.94z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/files/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/files/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/files/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/files/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/files/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/files/keyframes.scss
index 13e305b7dfc4d..6900d0d5c2ce9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/files/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/files/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-files {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/files/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/files/placeholders.scss
index 09c139e52e20b..dde3b08a87900 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/files/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/files/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-files-icon {
   --icon-name: icon-files;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/files/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/files/property-16.scss
index 293b9e43d59a1..9d7157adb0102 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/files/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/files/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-files-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M1 2.25A2.25 2.25 0 013.25 0h4.793c.331 0 .65.132.884.366l3.207 3.207c.076.076.141.161.195.253a.75.75 0 01.201.144l2.104 2.103c.234.235.366.553.366.884v6.793A2.25 2.25 0 0112.75 16h-7a2.25 2.25 0 01-2.25-2.25v-.25h-.25A2.25 2.25 0 011 11.25v-9zm2.25-.75a.75.75 0 00-.75.75v9c0 .414.336.75.75.75h7a.75.75 0 00.75-.75V6H7.75A.75.75 0 017 5.25V1.5H3.25zm5.25.56V4.5h2.44L8.5 2.06zm4 9.19V6.06l1 1v6.69a.75.75 0 01-.75.75h-7a.75.75 0 01-.75-.75v-.25h5.25a2.25 2.25 0 002.25-2.25z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/files/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/files/property-24.scss
index b8972ef081157..a3e69e52cff74 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/files/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/files/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-files-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5.25 1A2.25 2.25 0 003 3.25v11.5A2.25 2.25 0 005.25 17H6v.75A2.25 2.25 0 008.25 20H9v.75A2.25 2.25 0 0011.25 23h8.5A2.25 2.25 0 0022 20.75v-7.879a2.25 2.25 0 00-.659-1.59l-2.31-2.311a.746.746 0 00-.312-.187 2.25 2.25 0 00-.378-.503l-2.31-2.31a.746.746 0 00-.312-.187 2.25 2.25 0 00-.378-.503L11.72 1.66A2.25 2.25 0 0010.129 1H5.25zM4.5 3.25a.75.75 0 01.75-.75H10v3.75c0 .414.336.75.75.75h3.75v7.75a.75.75 0 01-.75.75h-8.5a.75.75 0 01-.75-.75V3.25zm8.94 2.25L11.5 3.56V5.5h1.94zM19 11.06v6.69A2.25 2.25 0 0116.75 20H10.5v.75c0 .414.336.75.75.75h8.5a.75.75 0 00.75-.75v-7.879a.75.75 0 00-.22-.53L19 11.061zM7.5 17.75V17h6.25A2.25 2.25 0 0016 14.75V8.06l1.28 1.281c.141.14.22.331.22.53v7.879a.75.75 0 01-.75.75h-8.5a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/film/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/film/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/film/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/film/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/film/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/film/keyframes.scss
index b62d66422c152..a3b15eabcb5a7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/film/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/film/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-film {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/film/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/film/placeholders.scss
index 7d75a4c073b61..2479c28ef332b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/film/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/film/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-film-icon {
   --icon-name: icon-film;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/film/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/film/property-16.scss
index 545e8c07ebd48..1c68b4f0476d2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/film/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/film/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-film-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M2.25 0A2.25 2.25 0 000 2.25v11.5A2.25 2.25 0 002.25 16h11.5A2.25 2.25 0 0016 13.75V2.25A2.25 2.25 0 0013.75 0H2.25zM14.5 3.5V2.25a.75.75 0 00-.75-.75H12.5v2h2zm-2 1.5h2v2h-2V5zM11 1.5H5V7h6V1.5zm3.5 7v2h-2v-2h2zm0 3.5h-2v2.5h1.25a.75.75 0 00.75-.75V12zM11 8.5v6H5v-6h6zM1.5 12v1.75c0 .414.336.75.75.75H3.5V12h-2zm2-1.5h-2v-2h2v2zM1.5 7V5h2v2h-2zm0-3.5h2v-2H2.25a.75.75 0 00-.75.75V3.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/film/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/film/property-24.scss
index 87d567dbc2f4a..09efd20dde9d0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/film/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/film/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-film-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M3.75 1A2.75 2.75 0 001 3.75v16.5A2.75 2.75 0 003.75 23h16.5A2.75 2.75 0 0023 20.25V3.75A2.75 2.75 0 0020.25 1H3.75zM21.5 6V3.75c0-.69-.56-1.25-1.25-1.25H18V6h3.5zM18 7.5h3.5V11H18V7.5zm-1.5-5h-9V11h9V2.5zm5 10V16H18v-3.5h3.5zm0 5H18v4h2.25c.69 0 1.25-.56 1.25-1.25V17.5zm-5-5v9h-9v-9h9zm-14 5v2.75c0 .69.56 1.25 1.25 1.25H6v-4H2.5zM6 16H2.5v-3.5H6V16zm-3.5-5V7.5H6V11H2.5zm0-5H6V2.5H3.75c-.69 0-1.25.56-1.25 1.25V6z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/keyframes.scss
index 3caaa6a840dae..8591a3479127e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-filter-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/placeholders.scss
index 8e85ec440d2c7..26852d3c310b7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-filter-circle-icon {
   --icon-name: icon-filter-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/property-16.scss
index 039d79b5e6636..17a0087a7e261 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-filter-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.75 7.5a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5zM3.5 5.75A.75.75 0 014.25 5h7.5a.75.75 0 010 1.5h-7.5a.75.75 0 01-.75-.75zM7 10a.75.75 0 000 1.5h2A.75.75 0 009 10H7z"/><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/property-24.scss
index 151d74ad97f2f..08f6934cafb02 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-filter-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.25 12a.75.75 0 000 1.5h7.5a.75.75 0 000-1.5h-7.5zM5 8.75A.75.75 0 015.75 8h12.5a.75.75 0 010 1.5H5.75A.75.75 0 015 8.75zM10.75 16a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5z"/><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/keyframes.scss
index 043206acfdedb..1a5ff33354e2e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-filter-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/placeholders.scss
index 88c4c071335fe..c3300c056045f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-filter-fill-icon {
   --icon-name: icon-filter-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/property-16.scss
index caced658cdd00..4b2945e7ab242 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-filter-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM4.25 5a.75.75 0 000 1.5h7.5a.75.75 0 000-1.5h-7.5zm1.5 2.5a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5zm.5 3.25A.75.75 0 017 10h2a.75.75 0 010 1.5H7a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/property-24.scss
index ed97d8a434bff..12d911b7c52eb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-filter-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM5 8.75A.75.75 0 015.75 8h12.5a.75.75 0 010 1.5H5.75A.75.75 0 015 8.75zm2.5 4a.75.75 0 01.75-.75h7.5a.75.75 0 010 1.5h-7.5a.75.75 0 01-.75-.75zm2.5 4a.75.75 0 01.75-.75h2.5a.75.75 0 010 1.5h-2.5a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter/keyframes.scss
index 8d3b9fd9a366b..ccc265cb4c8e6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-filter {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter/placeholders.scss
index ab377d4458b32..371ca7a77b74b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-filter-icon {
   --icon-name: icon-filter;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter/property-16.scss
index 9cb5ede6b5a07..166257ade18b8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-filter-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1 3.75A.75.75 0 011.75 3h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 3.75zM3.5 7.75A.75.75 0 014.25 7h7.5a.75.75 0 010 1.5h-7.5a.75.75 0 01-.75-.75zM6.75 11a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/filter/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/filter/property-24.scss
index 70cc4420453db..5b961e87511e7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/filter/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/filter/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-filter-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3 6.75A.75.75 0 013.75 6h16.5a.75.75 0 010 1.5H3.75A.75.75 0 013 6.75zM6 11.75a.75.75 0 01.75-.75h10.5a.75.75 0 010 1.5H6.75a.75.75 0 01-.75-.75zM9.75 16a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/keyframes.scss
index 3a257aa6790c4..d89f3c981f1a7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-fingerprint {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/placeholders.scss
index d3425e509022d..a0de9961cfdcd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-fingerprint-icon {
   --icon-name: icon-fingerprint;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/property-16.scss
index 38801c1d84094..3e27175951f6d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-fingerprint-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M4.925.827A7.583 7.583 0 0115.66 9.316a.75.75 0 11-1.463-.333 6.083 6.083 0 00-8.61-6.81.75.75 0 01-.662-1.346zM3.278 2.903a.75.75 0 01.143 1.05 6.058 6.058 0 00-1.087 2.332 26.684 26.684 0 01-.811 2.9.75.75 0 11-1.416-.495c.262-.747.514-1.634.765-2.737a7.558 7.558 0 011.355-2.907.75.75 0 011.05-.143zm.259 3.656a4.85 4.85 0 019.176-.859.75.75 0 01-1.375.6A3.35 3.35 0 005 6.891c-.174.766-.354 1.46-.543 2.098a.75.75 0 01-1.438-.426c.179-.603.35-1.265.519-2.005zm3.548-.682a2.117 2.117 0 013.244 2.226 38.526 38.526 0 01-.684 2.614.75.75 0 11-1.436-.434c.235-.777.452-1.608.658-2.512a.617.617 0 00-.945-.649.75.75 0 01-.837-1.245zm5.345 1.935a.75.75 0 01.565.897c-.57 2.505-1.25 4.627-2.178 6.609a.75.75 0 01-1.358-.636c.871-1.86 1.52-3.874 2.073-6.305a.75.75 0 01.898-.565zm-5.768.673a.75.75 0 01.518.926c-.531 1.874-1.146 3.384-1.93 4.794-.057.103-.115.205-.174.307a.75.75 0 01-1.298-.75c.054-.095.108-.19.16-.285.72-1.296 1.295-2.696 1.798-4.475a.75.75 0 01.926-.517zm-3.487 1.998a.75.75 0 01.384.988c-.218.497-.45.96-.698 1.407a.75.75 0 01-1.311-.728c.226-.407.437-.83.637-1.283a.75.75 0 01.988-.385zm11.361.295a.75.75 0 01.516.927 34.364 34.364 0 01-.833 2.556.75.75 0 11-1.406-.522c.291-.785.554-1.596.796-2.445a.75.75 0 01.927-.516zm-6.21 1.53c.381.16.561.6.401.982a22.529 22.529 0 01-1.088 2.243.75.75 0 11-1.31-.729 21.03 21.03 0 001.015-2.094.75.75 0 01.981-.402z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/property-24.scss
index a7a16819906e4..c756b0b5648d9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/fingerprint/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-fingerprint-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M14.802 1.26c-3.792-.863-7.57.48-9.995 3.177A.75.75 0 105.923 5.44a8.841 8.841 0 018.546-2.718A8.8 8.8 0 0119.09 5.44a.75.75 0 001.118-1 10.3 10.3 0 00-5.407-3.18zM4.737 7.118a.75.75 0 00-1.318-.716 10.352 10.352 0 00-.998 2.65c-.466 2.05-.897 3.074-1.327 3.848a.75.75 0 101.312.728c.516-.929.99-2.095 1.478-4.244.185-.812.475-1.57.853-2.266zm16.857-.717a.75.75 0 00-1.317.718 8.807 8.807 0 01.855 6.187c-.385 1.694-.828 3.262-1.374 4.76a.75.75 0 001.409.514c.572-1.57 1.032-3.2 1.428-4.941.58-2.555.16-5.105-1-7.238zm-7.99.185a4.85 4.85 0 00-5.805 3.654 27.905 27.905 0 01-.82 2.94.75.75 0 101.418.49 29.39 29.39 0 00.865-3.097 3.35 3.35 0 016.426-.373.75.75 0 001.414-.502 4.847 4.847 0 00-3.498-3.112zm3.654 5.805a.75.75 0 10-1.463-.333c-.698 3.071-1.55 5.48-2.815 7.756-.383.69-.798 1.356-1.245 2.012a.75.75 0 001.239.845c.47-.69.91-1.394 1.318-2.13 1.35-2.43 2.245-4.98 2.966-8.15zm-10.135 4.17a.75.75 0 00-1.311-.73c-.488.88-1.082 1.754-1.874 2.767a.75.75 0 001.182.924c.826-1.057 1.468-1.997 2.003-2.962zm5.238-12.12a.75.75 0 01-.644.844 6.086 6.086 0 00-5.12 4.682c-.558 2.451-1.143 3.968-1.863 5.266a17.572 17.572 0 01-1.165 1.808.75.75 0 01-1.214-.882c.437-.601.778-1.134 1.067-1.655.635-1.142 1.177-2.517 1.712-4.87A7.586 7.586 0 0111.517 3.8a.75.75 0 01.844.643zm.951.045a.75.75 0 01.898-.565 7.583 7.583 0 015.713 9.076 44.944 44.944 0 01-.677 2.629.75.75 0 11-1.44-.42c.236-.81.453-1.654.654-2.542a6.083 6.083 0 00-4.583-7.28.75.75 0 01-.565-.898zm4.562 12.964a.75.75 0 01.426.972 28.137 28.137 0 01-1.619 3.447.75.75 0 01-1.311-.728 26.645 26.645 0 001.533-3.265.75.75 0 01.971-.426zm-4.876-8.198a2.115 2.115 0 00-1.88.485.75.75 0 10.999 1.12.615.615 0 011.013.595c-.446 1.962-.946 3.58-1.564 5.037a.75.75 0 001.38.586c.663-1.56 1.187-3.267 1.647-5.29a2.117 2.117 0 00-1.595-2.533zm-1.496 3.63a.75.75 0 00-1.447-.4c-.517 1.876-1.107 3.333-1.853 4.677-.563 1.013-1.231 1.993-2.066 3.066a.75.75 0 001.184.921c.868-1.117 1.584-2.162 2.193-3.259.813-1.463 1.444-3.033 1.989-5.005zm.4 6.333a.75.75 0 00-1.311-.729 25.143 25.143 0 01-1.871 2.858.75.75 0 001.201.898 26.641 26.641 0 001.981-3.027z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/flag/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/flag/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/flag/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/flag/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/flag/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/flag/keyframes.scss
index 622516c046f69..3a80b63631442 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/flag/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/flag/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-flag {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/flag/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/flag/placeholders.scss
index ba6a52ec6b37c..a0b376c2035e6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/flag/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/flag/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-flag-icon {
   --icon-name: icon-flag;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/flag/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/flag/property-16.scss
index fb856a64230c0..f10a137e3f16e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/flag/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/flag/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-flag-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M5.375 1c-1.072 0-1.827.185-2.337.396a3.125 3.125 0 00-.58.309 2.006 2.006 0 00-.233.188l-.007.007-.004.004-.002.002s.898.871-.001.001A.75.75 0 002 2.43V14.25a.75.75 0 001.5 0v-3.275c.033-.016.07-.033.11-.05.31-.128.868-.282 1.765-.282.815 0 1.503.276 2.338.621l.043.018c.796.33 1.735.718 2.869.718 1.072 0 1.827-.185 2.337-.396a3.13 3.13 0 00.58-.309 2.03 2.03 0 00.214-.17l.01-.009.009-.009.008-.007.003-.004.002-.002s-.899-.872.001-.001A.75.75 0 0014 10.57V2.43a.75.75 0 00-1.27-.54 1.642 1.642 0 01-.34.186c-.31.128-.868.282-1.765.282-.815 0-1.503-.276-2.338-.621l-.043-.018C7.448 1.388 6.51 1 5.375 1zM3.5 9.379V2.832c.033-.016.07-.033.11-.05.31-.128.868-.282 1.765-.282.815 0 1.503.276 2.338.622l.043.017c.796.33 1.735.718 2.869.718.786 0 1.401-.1 1.875-.236v6.547a2.27 2.27 0 01-.11.05c-.31.128-.868.282-1.765.282-.815 0-1.503-.276-2.338-.622l-.043-.017c-.796-.33-1.735-.718-2.869-.718-.786 0-1.401.1-1.875.236z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/flag/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/flag/property-24.scss
index 7c9c29a2c68c9..1d8e616ade35c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/flag/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/flag/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-flag-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M7.875 1c-1.632 0-2.76.273-3.502.572-.371.149-.643.303-.83.429a2.719 2.719 0 00-.22.162l-.104.094A.75.75 0 003 2.786V22.25a.75.75 0 001.5 0V15.6c.104-.06.246-.133.432-.208.546-.219 1.481-.463 2.943-.463 1.382 0 2.543.458 3.845.981l.044.018c1.264.508 2.669 1.072 4.361 1.072 1.632 0 2.76-.273 3.502-.572.371-.149.643-.303.83-.429 0 0 .184-.115.325-.256a.75.75 0 00.218-.529V2.786a.75.75 0 00-1.27-.541l-.008.007a1.23 1.23 0 01-.099.072 3.038 3.038 0 01-.555.284c-.546.219-1.481.463-2.943.463-1.382 0-2.543-.458-3.845-.981l-.044-.018C10.972 1.564 9.567 1 7.875 1zM4.5 13.951V3.171c.104-.06.246-.133.432-.207.546-.22 1.481-.464 2.943-.464 1.382 0 2.543.458 3.845.982l.044.017c1.264.508 2.669 1.072 4.361 1.072 1.541 0 2.633-.244 3.375-.522v10.78c-.104.06-.246.133-.432.207-.546.22-1.481.464-2.943.464-1.382 0-2.543-.458-3.845-.982l-.044-.017c-1.264-.508-2.669-1.072-4.361-1.072-1.541 0-2.633.243-3.375.522z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/keyframes.scss
index 43e98f61c2a7e..571da7cdcec01 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-folder-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/placeholders.scss
index 5c996188b7625..fbde08b91b4ba 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-folder-fill-icon {
   --icon-name: icon-folder-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/property-16.scss
index 82a5859c805d7..138a908f87c24 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M2.25 1A2.25 2.25 0 000 3.25v1c0 .414.336.75.75.75h12.5a.75.75 0 010 1.5H.75a.75.75 0 00-.75.75v5.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-7.5A2.25 2.25 0 0013.75 3H9.871a.75.75 0 01-.53-.22L8.22 1.66A2.25 2.25 0 006.629 1H2.25z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/property-24.scss
index 7046204cd9f1e..ebc945440a77c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M3.75 2A2.75 2.75 0 001 4.75v1c0 .414.336.75.75.75h18.5a.75.75 0 010 1.5H1.75a.75.75 0 00-.75.75v10.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V6.75A2.75 2.75 0 0020.25 4h-7.172a1.25 1.25 0 01-.883-.366l-.829-.829A2.75 2.75 0 009.422 2H3.75z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/keyframes.scss
index e03901ef9a730..ba39799abe0bd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-folder-minus-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/placeholders.scss
index 1e623b98938d0..a2d84dd927caf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-folder-minus-fill-icon {
   --icon-name: icon-folder-minus-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/property-16.scss
index 4512f7d416cb4..f5d2104a5763f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-minus-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-7.5A2.25 2.25 0 0013.75 3H9.871a.75.75 0 01-.53-.22L8.22 1.66A2.25 2.25 0 006.629 1H2.25zM5 8.253a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5h-4.5a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/property-24.scss
index dc348df5cef4e..6323e3b5af8d5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-minus-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M3.75 2A2.75 2.75 0 001 4.75v1c0 .414.336.75.75.75h18.5a.75.75 0 010 1.5H1.75a.75.75 0 00-.75.75v10.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V6.75A2.75 2.75 0 0020.25 4h-7.172a1.25 1.25 0 01-.883-.366l-.829-.829A2.75 2.75 0 009.422 2H3.75zM8 13.75a.75.75 0 01.75-.75h6.5a.75.75 0 010 1.5h-6.5a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/keyframes.scss
index e0ecfa366df12..8a4cd09135e6f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-folder-minus {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/placeholders.scss
index 653bec9db7587..89a9fb7aa3a6a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-folder-minus-icon {
   --icon-name: icon-folder-minus;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/property-16.scss
index 7821f43f61d1f..8377734822497 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-minus-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.75 7.5a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5z"/><path fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-7.5A2.25 2.25 0 0013.75 3H9.871a.75.75 0 01-.53-.22L8.22 1.66A2.25 2.25 0 006.629 1H2.25zM1.5 3.25a.75.75 0 01.75-.75h4.379a.75.75 0 01.53.22L8.28 3.84a2.25 2.25 0 001.591.659h3.879a.75.75 0 01.75.75v7.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75v-9.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/property-24.scss
index 277c48ef74364..9a5c6a80c037c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-minus/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-minus-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.75 13a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5z"/><path fill-rule="evenodd" d="M1 4.75A2.75 2.75 0 013.75 2h5.672c.729 0 1.428.29 1.944.805l.829.829c.234.234.552.366.883.366h7.172A2.75 2.75 0 0123 6.75v12.5A2.75 2.75 0 0120.25 22H3.75A2.75 2.75 0 011 19.25V4.75zM3.75 3.5c-.69 0-1.25.56-1.25 1.25V7h16.75a.75.75 0 010 1.5H2.5v10.75c0 .69.56 1.25 1.25 1.25h16.5c.69 0 1.25-.56 1.25-1.25V6.75c0-.69-.56-1.25-1.25-1.25h-7.172a2.75 2.75 0 01-1.944-.805l-.829-.829a1.25 1.25 0 00-.883-.366H3.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-outline/index.scss
index 9426da463d588..7e9568b720266 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../folder/property-16';
         @import '../folder/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-outline/keyframes.scss
index f7aee43d22266..4e80ae48946f8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-folder-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-outline/placeholders.scss
index 78b484aa4f645..e7c5c89d832d9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-folder-outline-icon {
   --icon-name: icon-folder-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/keyframes.scss
index f1fb442b576ee..e22a878f8e19a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-folder-plus-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/placeholders.scss
index 7883b05fae11f..7b5d6e9580fdc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-folder-plus-fill-icon {
   --icon-name: icon-folder-plus-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/property-16.scss
index 2a065b1ceca3a..c680fa0063f8c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-plus-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h4.379a2.25 2.25 0 011.59.659L9.342 2.78c.14.141.331.22.53.22h3.879A2.25 2.25 0 0116 5.25v7.5A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75v-9.5zM7.75 6a.75.75 0 01.75.75V8h1.25a.75.75 0 010 1.5H8.5v1.25a.75.75 0 01-1.5 0V9.5H5.75a.75.75 0 010-1.5H7V6.75A.75.75 0 017.75 6z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/property-24.scss
index 41eaf13e82617..da94b90e550c4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-plus-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M1 4.75A2.75 2.75 0 013.75 2h5.672c.729 0 1.428.29 1.944.805l.829.829c.234.234.552.366.883.366h7.172A2.75 2.75 0 0123 6.75v12.5A2.75 2.75 0 0120.25 22H3.75A2.75 2.75 0 011 19.25V8.75A.75.75 0 011.75 8h18.5a.75.75 0 000-1.5H1.75A.75.75 0 011 5.75v-1zm10.75 5.75a.75.75 0 01.75.75v2.25h2.25a.75.75 0 010 1.5H12.5v2.25a.75.75 0 01-1.5 0V15H8.75a.75.75 0 010-1.5H11v-2.25a.75.75 0 01.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/keyframes.scss
index 9f1137336a83d..5db1252abbbeb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-folder-plus {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/placeholders.scss
index 7b8bdd56708b9..81db1786f8a2a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-folder-plus-icon {
   --icon-name: icon-folder-plus;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/property-16.scss
index c8795e3f900f4..208f6176d571b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-plus-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.75 6a.75.75 0 01.75.75V8h1.25a.75.75 0 010 1.5H8.5v1.25a.75.75 0 01-1.5 0V9.5H5.75a.75.75 0 010-1.5H7V6.75A.75.75 0 017.75 6z"/><path fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h4.379a2.25 2.25 0 011.59.659L9.342 2.78c.14.141.331.22.53.22h3.879A2.25 2.25 0 0116 5.25v7.5A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75v-7.5a.75.75 0 00-.75-.75H9.871a2.25 2.25 0 01-1.59-.659L7.158 2.72a.75.75 0 00-.53-.22H2.25z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/property-24.scss
index 8681395ae5ae7..dbc731b05da55 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-plus/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-plus-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11.75 10.5a.75.75 0 01.75.75v2.25h2.25a.75.75 0 010 1.5H12.5v2.25a.75.75 0 01-1.5 0V15H8.75a.75.75 0 010-1.5H11v-2.25a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M3.75 2A2.75 2.75 0 001 4.75v14.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V6.75A2.75 2.75 0 0020.25 4h-7.172a1.25 1.25 0 01-.883-.366l-.829-.829A2.75 2.75 0 009.422 2H3.75zM2.5 4.75c0-.69.56-1.25 1.25-1.25h5.672c.331 0 .649.132.883.366l.829.829a2.75 2.75 0 001.944.805h7.172c.69 0 1.25.56 1.25 1.25v12.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V8.5h16.75a.75.75 0 000-1.5H2.5V4.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/keyframes.scss
index 15c58217d6c4e..cf239ffc4f23a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-folder-star {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/placeholders.scss
index f7fa3ab306721..4b314301fd79e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-folder-star-icon {
   --icon-name: icon-folder-star;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/property-16.scss
index c1119141a454e..2022deac91019 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-star-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.5 3.25a.75.75 0 01.75-.75h4.379a.75.75 0 01.53.22L8.28 3.84a2.25 2.25 0 001.591.659h3.879a.75.75 0 01.75.75V6.5a.75.75 0 001.5 0V5.25A2.25 2.25 0 0013.75 3H9.87a.75.75 0 01-.53-.22L8.22 1.66A2.25 2.25 0 006.629 1H2.25A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h2.5a.75.75 0 100-1.5h-2.5a.75.75 0 01-.75-.75v-9.5z"/><path fill-rule="evenodd" d="M11.179 5.431a.75.75 0 00-1.358 0L8.523 8.196l-2.887.444a.75.75 0 00-.409 1.279l2.201 2.142-.66 3.029a.75.75 0 001.089.82l2.643-1.43 2.643 1.43a.75.75 0 001.09-.82l-.662-3.03 2.202-2.141a.75.75 0 00-.41-1.28l-2.886-.443-1.298-2.765zM9.71 9.195l.789-1.68.789 1.68a.75.75 0 00.565.423l1.794.276-1.421 1.382a.75.75 0 00-.21.697l.402 1.839-1.562-.845a.75.75 0 00-.714 0l-1.562.845.402-1.838a.75.75 0 00-.21-.698l-1.42-1.382 1.793-.276a.75.75 0 00.565-.423z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/property-24.scss
index 4d129091a2fe3..0011701226403 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-star/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-star-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3.75 3.5c-.69 0-1.25.56-1.25 1.25V7h16.75a.75.75 0 010 1.5H2.5v10.75c0 .69.56 1.25 1.25 1.25h6.75a.75.75 0 010 1.5H3.75A2.75 2.75 0 011 19.25V4.75A2.75 2.75 0 013.75 2h5.672c.729 0 1.428.29 1.944.805l.829.829c.234.234.552.366.883.366h7.172A2.75 2.75 0 0123 6.75v5.5a.75.75 0 01-1.5 0v-5.5c0-.69-.56-1.25-1.25-1.25h-7.172a2.75 2.75 0 01-1.944-.805l-.829-.829a1.25 1.25 0 00-.883-.366H3.75z"/><path fill-rule="evenodd" d="M17.674 10.42a.75.75 0 00-1.348 0l-1.68 3.43-3.755.554a.75.75 0 00-.416 1.277l2.72 2.67-.642 3.773a.75.75 0 001.09.789L17 21.133l3.357 1.78a.75.75 0 001.09-.789l-.642-3.773 2.72-2.67a.75.75 0 00-.416-1.277l-3.755-.553-1.68-3.43zm-1.854 4.445l1.18-2.41 1.18 2.41a.75.75 0 00.565.412l2.652.39-1.922 1.888a.75.75 0 00-.214.661l.452 2.658-2.362-1.252a.75.75 0 00-.702 0l-2.362 1.252.452-2.658a.75.75 0 00-.214-.661l-1.922-1.887 2.652-.391a.75.75 0 00.565-.412z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/keyframes.scss
index a9fe6640a9ad8..b5e1ee0283d3b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-folder-users {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/placeholders.scss
index cf1234d678a11..6adce8ae9fa8b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-folder-users-icon {
   --icon-name: icon-folder-users;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/property-16.scss
index b097c57dd8891..a1e575a3b4fd7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-users-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M2.25 2.5a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h.25a.75.75 0 010 1.5h-.25A2.25 2.25 0 010 12.75v-9.5A2.25 2.25 0 012.25 1h4.379a2.25 2.25 0 011.59.659L9.342 2.78c.14.141.331.22.53.22h3.879A2.25 2.25 0 0116 5.25v5.25a.75.75 0 01-1.5 0V5.25a.75.75 0 00-.75-.75H9.871a2.25 2.25 0 01-1.59-.659L7.158 2.72a.75.75 0 00-.53-.22H2.25z"/><path d="M4.574 11.76c.383-.463.936-.76 1.551-.76h2.75c.615 0 1.168.297 1.55.76A2.61 2.61 0 0111 13.418v.833a.75.75 0 01-1.5 0v-.833c0-.285-.095-.536-.231-.702-.134-.161-.28-.215-.394-.215h-2.75c-.114 0-.26.054-.394.215a1.113 1.113 0 00-.231.702v.833a.75.75 0 01-1.5 0v-.833c0-.6.195-1.197.574-1.656z"/><path fill-rule="evenodd" d="M7.5 5.5a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM6.5 8a1 1 0 112 0 1 1 0 01-2 0z" clip-rule="evenodd"/><path d="M11.518 11.589a.75.75 0 01.893-.572c.567.125 1.089.41 1.474.834.388.426.614.969.615 1.546v.853a.75.75 0 01-1.5 0v-.851a.8.8 0 00-.224-.538 1.306 1.306 0 00-.687-.379.75.75 0 01-.572-.893zM11.42 5.52a.75.75 0 10-.34 1.46c.283.066.52.212.682.4A.95.95 0 0112 8a.95.95 0 01-.238.62 1.272 1.272 0 01-.681.4.75.75 0 10.338 1.46 2.77 2.77 0 001.481-.884A2.45 2.45 0 0013.5 8a2.45 2.45 0 00-.6-1.596 2.77 2.77 0 00-1.48-.885z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/property-24.scss
index 79a261a1ef62e..6f1e6394a94ba 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder-users/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-users-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M2.5 4.75c0-.69.56-1.25 1.25-1.25h5.672c.331 0 .649.132.883.366l.829.829a2.75 2.75 0 001.944.805h7.172c.69 0 1.25.56 1.25 1.25v9a.75.75 0 001.5 0v-9A2.75 2.75 0 0020.25 4h-7.172a1.25 1.25 0 01-.883-.366l-.829-.829A2.75 2.75 0 009.422 2H3.75A2.75 2.75 0 001 4.75v14.5A2.75 2.75 0 003.75 22h1.5a.75.75 0 000-1.5h-1.5c-.69 0-1.25-.56-1.25-1.25V8.5h16.75a.75.75 0 000-1.5H2.5V4.75z"/><path d="M8.318 17.928A2.783 2.783 0 0110.375 17h4.25c.786 0 1.524.344 2.057.928.53.583.818 1.359.818 2.155v1.167a.75.75 0 11-1.5 0v-1.167c0-.441-.16-.852-.427-1.145a1.284 1.284 0 00-.948-.438h-4.25c-.34 0-.684.148-.948.438A1.705 1.705 0 009 20.083v1.167a.75.75 0 11-1.5 0v-1.167c0-.796.287-1.572.818-2.155z"/><path fill-rule="evenodd" d="M12.5 10a3 3 0 100 6 3 3 0 000-6zM11 13a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/><path d="M18.275 17.559a.75.75 0 01.916-.534 3.08 3.08 0 011.667 1.12c.417.549.642 1.221.642 1.912v1.193a.75.75 0 11-1.5 0v-1.192c0-.367-.12-.72-.337-1.007a1.58 1.58 0 00-.854-.576.75.75 0 01-.534-.916zM17.186 10.023a.75.75 0 00-.372 1.454A1.578 1.578 0 0118 13a1.57 1.57 0 01-1.186 1.523.75.75 0 10.372 1.454A3.078 3.078 0 0019.5 13a3.07 3.07 0 00-2.314-2.977z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder/keyframes.scss
index 632a1ed26c4e6..82a0228f66523 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-folder {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder/placeholders.scss
index fe85203a59fca..aa8ee6c56917b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-folder-icon {
   --icon-name: icon-folder;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder/property-16.scss
index 4f6774ca8cbde..7c0944438562a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-7.5A2.25 2.25 0 0013.75 3H9.871a.75.75 0 01-.53-.22L8.22 1.66A2.25 2.25 0 006.629 1H2.25zM1.5 3.25a.75.75 0 01.75-.75h4.379a.75.75 0 01.53.22L8.28 3.84a2.25 2.25 0 001.591.659h3.879a.75.75 0 01.75.75v7.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75V7h10.75a.75.75 0 000-1.5H1.5V3.25z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/folder/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/folder/property-24.scss
index c0c17a98b5859..df0799535d4c6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/folder/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/folder/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-folder-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M3.75 2A2.75 2.75 0 001 4.75v14.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V6.75A2.75 2.75 0 0020.25 4h-7.172a1.25 1.25 0 01-.883-.366l-.829-.829A2.75 2.75 0 009.422 2H3.75zM2.5 4.75c0-.69.56-1.25 1.25-1.25h5.672c.331 0 .649.132.883.366l.829.829a2.75 2.75 0 001.944.805h7.172c.69 0 1.25.56 1.25 1.25v12.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V8.5h16.75a.75.75 0 000-1.5H2.5V4.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/frown/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/frown/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/frown/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/frown/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/frown/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/frown/keyframes.scss
index e00b83cf816a8..7fe2291f1e301 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/frown/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/frown/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-frown {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/frown/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/frown/placeholders.scss
index 76759ff9fe13e..03f04533746c2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/frown/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/frown/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-frown-icon {
   --icon-name: icon-frown;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/frown/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/frown/property-16.scss
index b45b02db00fb0..fa2c211c2fedb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/frown/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/frown/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-frown-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5 6a1 1 0 011-1h.007a1 1 0 010 2H6a1 1 0 01-1-1zM10 5a1 1 0 100 2h.007a1 1 0 100-2H10z"/><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/><path d="M5.785 9.777C6.279 9.403 7.035 9 8 9c.965 0 1.721.403 2.215.777.25.189.441.377.573.52.078.085.153.171.22.265a.75.75 0 01-.17 1.047.759.759 0 01-1.046-.17 2.736 2.736 0 00-.482-.466c-.331-.25-.776-.473-1.31-.473-.535 0-.979.222-1.31.473-.177.134-.35.29-.484.469a.75.75 0 01-1.215-.88l.001-.001c.217-.3.5-.562.793-.784z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/frown/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/frown/property-24.scss
index 3af57d574c9b4..ed7a348c323b0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/frown/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/frown/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-frown-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.457 14.424C9.27 13.746 10.5 13 12 13s2.73.746 3.543 1.424c.413.344.738.687.961.944.126.145.25.294.36.451a.75.75 0 01-1.227.862h-.001v-.002a4.882 4.882 0 00-.265-.328 6.91 6.91 0 00-.789-.775C13.895 15.004 13 14.5 12 14.5c-1 0-1.895.504-2.582 1.076a6.21 6.21 0 00-1.054 1.104.75.75 0 01-1.228-.86 5.67 5.67 0 01.36-.452c.223-.257.548-.6.961-.944zM8 9a1 1 0 011-1h.01a1 1 0 110 2H9a1 1 0 01-1-1zM15 8a1 1 0 100 2h.01a1 1 0 100-2H15z"/><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/index.scss
index 07b3d7750dfb5..7b675d48e753b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../gateway/property-16';
         @import '../gateway/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/keyframes.scss
index 60bffa2685b9c..04557fceb99e9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-gateway {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/placeholders.scss
index 1f739550c5496..9af9e113f17fc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-gateway-icon {
   --icon-name: icon-gateway;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/property-16.scss
index 9652d3430aef7..6b429e14a7d24 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-gateway-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.537 5.354c.415-1.153.971-2.12 1.695-2.794C5.938 1.903 6.83 1.5 8 1.5c1.251 0 2.188.46 2.921 1.21.752.768 1.31 1.865 1.71 3.146.802 2.566.901 5.638.862 7.563-.013.594-.508 1.081-1.16 1.081H3.668c-.653 0-1.148-.487-1.16-1.083-.012-.545-.012-1.189.012-1.89a.75.75 0 10-1.499-.053 35.678 35.678 0 00-.013 1.974C1.038 14.916 2.256 16 3.668 16h8.665c1.41 0 2.63-1.082 2.66-2.55.04-1.968-.054-5.238-.93-8.041-.438-1.404-1.09-2.747-2.07-3.749C10.994.64 9.677 0 8 0 6.439 0 5.185.554 4.21 1.462c-.96.893-1.622 2.1-2.084 3.384a.75.75 0 101.411.508z"/><path d="M6.22 4.47a.75.75 0 011.06 0l3.25 3.25.008.008a.75.75 0 01-.008 1.052l-3.25 3.25a.75.75 0 01-1.06-1.06L8.19 9H1a.75.75 0 010-1.5h7.19L6.22 5.53a.75.75 0 010-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/property-24.scss
index f416b83a4483a..3329ae64a2191 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gateway/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-gateway-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M5.052 8.165c.624-1.654 1.469-3.072 2.593-4.071C8.753 3.108 10.164 2.5 12 2.5c2.06 0 3.592.765 4.763 1.987 1.19 1.242 2.03 2.984 2.608 4.946 1.155 3.929 1.19 8.503 1.096 10.985-.023.6-.523 1.082-1.173 1.082H4.706c-.648 0-1.15-.484-1.173-1.086a46.334 46.334 0 01.016-3.879.75.75 0 10-1.498-.07 47.832 47.832 0 00-.017 4.006C2.09 21.924 3.297 23 4.706 23h14.588c1.406 0 2.616-1.07 2.672-2.525.096-2.523.07-7.297-1.156-11.465-.614-2.086-1.545-4.08-2.964-5.561C16.405 1.946 14.488 1 12 1c-2.207 0-3.971.745-5.352 1.973-1.365 1.214-2.324 2.871-3 4.662a.75.75 0 001.404.53z"/><path d="M9.207 6.482a.75.75 0 011.06-.025l5.5 5.25c.14.133.23.322.233.531v.024a.75.75 0 01-.232.53l-5.5 5.25a.75.75 0 01-1.036-1.085L13.378 13H1.75a.75.75 0 010-1.5h11.628L9.232 7.543a.75.75 0 01-.025-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/keyframes.scss
index fb5cd47b21c9f..20e7c83172892 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-gcp-color {
   100% {
     background-image: var(--icon-gcp-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/placeholders.scss
index 54b28f7d2914a..837a72d44673d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-gcp-color-icon {
   --icon-name: icon-gcp-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/property-16.scss
index b9c4ed735b374..ef9564a23ca93 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-gcp-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23EA4335" d="M10.313 5.376l1.887-1.5-.332-.414a5.935 5.935 0 00-5.586-1.217 5.89 5.89 0 00-3.978 4.084c-.03.113.312-.098.463-.056l2.608-.428s.127-.124.201-.205c1.16-1.266 3.126-1.432 4.465-.354l.272.09z"/><path fill="%234285F4" d="M13.637 6.3a5.835 5.835 0 00-1.77-2.838l-1.83 1.819a3.226 3.226 0 011.193 2.565v.323c.9 0 1.63.725 1.63 1.62 0 .893-.73 1.618-1.63 1.618l-3.257-.002-.325.035v2.507l.325.053h3.257a4.234 4.234 0 004.08-2.962A4.2 4.2 0 0013.636 6.3z"/><path fill="%2334A853" d="M4.711 13.999H7.97v-2.594H4.71c-.232 0-.461-.066-.672-.161l-.458.14-1.313 1.297-.114.447a4.254 4.254 0 002.557.87z"/><path fill="%23FBBC05" d="M4.711 5.572A4.234 4.234 0 00.721 8.44a4.206 4.206 0 001.433 4.688l1.89-1.884a1.617 1.617 0 01.44-3.079 1.63 1.63 0 011.714.937l1.89-1.879a4.24 4.24 0 00-3.377-1.65z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/property-24.scss
index ef3387d101ae6..46b74f289c937 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-gcp-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23EA4335" d="M15.084 8.501l2.516-2-.443-.551A7.913 7.913 0 009.71 4.326a7.853 7.853 0 00-5.304 5.446c-.04.15.416-.13.618-.075l3.476-.57s.17-.166.269-.273c1.546-1.689 4.168-1.91 5.954-.473l.362.12z"/><path fill="%234285F4" d="M19.516 9.733a7.78 7.78 0 00-2.361-3.784l-2.44 2.426a4.301 4.301 0 011.592 3.42v.43c1.2 0 2.172.967 2.172 2.16a2.165 2.165 0 01-2.172 2.158l-4.343-.003-.433.046v3.344l.433.07h4.343c2.49.02 4.7-1.585 5.438-3.95a5.599 5.599 0 00-2.23-6.317z"/><path fill="%2334A853" d="M7.615 19.998h4.343V16.54H7.615c-.31 0-.615-.087-.897-.215l-.61.188-1.75 1.728-.153.596c.982.738 2.18 1.167 3.41 1.161z"/><path fill="%23FBBC05" d="M7.615 8.763a5.646 5.646 0 00-5.32 3.823 5.608 5.608 0 001.91 6.252l2.52-2.513a2.156 2.156 0 01-1.256-2.272 2.165 2.165 0 011.843-1.833 2.174 2.174 0 012.285 1.249l2.52-2.505a5.654 5.654 0 00-4.502-2.201z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/index.scss
index 375f6387caa71..56a5eef90af0b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../gcp-color/property-16';
         @import '../gcp-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/keyframes.scss
index a99a1a3d93cc7..55c70a52e17aa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-gcp {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/placeholders.scss
index d4d1886cf0ddb..ba5f4de1957a3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-gcp-icon {
   --icon-name: icon-gcp;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/property-16.scss
index 7f870e04519c6..80c231fdea83e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-gcp-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M11.87 3.465l-.002-.003a5.935 5.935 0 00-5.586-1.217 5.89 5.89 0 00-3.98 4.092 4.206 4.206 0 00-.149 6.792 4.255 4.255 0 002.558.87h6.52a4.234 4.234 0 004.078-2.961A4.2 4.2 0 0013.637 6.3a5.835 5.835 0 00-1.767-2.835zm-7.828 7.78c.21.095.438.16.67.16l6.518.002c.9 0 1.63-.725 1.63-1.619s-.73-1.619-1.63-1.619v-.323a3.226 3.226 0 00-1.187-2.56h-.002c-1.339-1.078-3.305-.912-4.465.354l-.014.015c.996.2 1.897.751 2.525 1.568L6.198 9.101a1.63 1.63 0 00-3.097.439 1.617 1.617 0 00.942 1.704l-.001.001z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/property-24.scss
index 80566744d39ee..26234e9caaa26 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gcp/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-gcp-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M11.87 3.465l-.002-.003a5.935 5.935 0 00-5.586-1.217 5.89 5.89 0 00-3.98 4.092 4.206 4.206 0 00-.149 6.792 4.255 4.255 0 002.558.87h6.52a4.234 4.234 0 004.078-2.961A4.2 4.2 0 0013.637 6.3a5.835 5.835 0 00-1.767-2.835zm-7.828 7.78c.21.095.438.16.67.16l6.518.002c.9 0 1.63-.725 1.63-1.619s-.73-1.619-1.63-1.619v-.323a3.226 3.226 0 00-1.187-2.56h-.002c-1.339-1.078-3.305-.912-4.465.354l-.014.015c.996.2 1.897.751 2.525 1.568L6.198 9.101a1.63 1.63 0 00-3.097.439 1.617 1.617 0 00.942 1.704l-.001.001z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gift-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gift-fill/index.scss
index eda101cbc3433..c516f1ea752a0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gift-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gift-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../gift/property-16';
         @import '../gift/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gift-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gift-fill/keyframes.scss
index 3963775f5400f..e7433437ee286 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gift-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gift-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-gift-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gift-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gift-fill/placeholders.scss
index 9b51cf488b908..3f2e7f6314b44 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gift-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gift-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-gift-fill-icon {
   --icon-name: icon-gift-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gift-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gift-outline/index.scss
index eda101cbc3433..c516f1ea752a0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gift-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gift-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../gift/property-16';
         @import '../gift/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gift-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gift-outline/keyframes.scss
index f8c1ad5323456..ed2e6e7431ae2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gift-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gift-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-gift-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gift-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gift-outline/placeholders.scss
index 30daa8938cafd..b2873879696e1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gift-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gift-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-gift-outline-icon {
   --icon-name: icon-gift-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gift/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gift/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gift/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gift/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gift/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gift/keyframes.scss
index 2fd7966b85a0e..600d188ed4f02 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gift/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gift/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-gift {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gift/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gift/placeholders.scss
index 9504cccc0084e..077df6359d8e8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gift/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gift/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-gift-icon {
   --icon-name: icon-gift;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gift/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gift/property-16.scss
index b0815495e3b6d..ca352673da8eb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gift/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gift/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-gift-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M1.5 2.75c0 .438.103.866.297 1.25H.75a.75.75 0 00-.75.75v3.5c0 .414.336.75.75.75H2v6.25c0 .414.336.75.75.75h10.5a.75.75 0 00.75-.75V9h1.25a.75.75 0 00.75-.75v-3.5a.75.75 0 00-.75-.75h-.547A2.78 2.78 0 0014.21.81 2.697 2.697 0 0012.286 0c-1.8 0-2.878 1.318-3.46 2.394-.262.486-.449.967-.576 1.351a8.466 8.466 0 00-.577-1.351C7.093 1.318 6.013 0 4.214 0 3.49 0 2.798.293 2.29.81a2.769 2.769 0 00-.79 1.94zM4.214 1.5c-.317 0-.625.128-.854.361-.229.234-.36.553-.36.889 0 .336.131.655.36.889.23.233.537.361.854.361h2.537a6.754 6.754 0 00-.397-.894c-.5-.924-1.189-1.606-2.14-1.606zM9.75 4h2.537c.317 0 .625-.128.854-.361.229-.234.36-.553.36-.889 0-.336-.131-.655-.36-.889a1.197 1.197 0 00-.854-.361c-.951 0-1.64.682-2.14 1.606A6.753 6.753 0 009.75 4zM9 5.5v2h5.5v-2H9zm-1.5 0v2h-6v-2h6zm1.5 9h3.5V9H9v5.5zM7.5 9v5.5h-4V9h4z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gift/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gift/property-24.scss
index a87cf47a1fd98..4c267bbfef449 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gift/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gift/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-gift-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M3.5 4.25c0 .63.192 1.235.54 1.75H2.75A1.75 1.75 0 001 7.75v3.5c0 .966.784 1.75 1.75 1.75H3v7.25A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V13h.25A1.75 1.75 0 0023 11.25v-3.5A1.75 1.75 0 0021.25 6h-.79c.348-.515.54-1.12.54-1.75 0-.88-.375-1.711-1.023-2.316A3.529 3.529 0 0017.571 1c-2.266 0-3.67 1.524-4.463 2.87a10.098 10.098 0 00-.842 1.858l-.016.047-.016-.047c-.17-.501-.44-1.177-.842-1.859C10.599 2.524 9.195 1 6.929 1c-.894 0-1.76.33-2.406.934A3.168 3.168 0 003.5 4.25zM6.929 2.5c-.528 0-1.024.196-1.383.53A1.669 1.669 0 005 4.25c0 .447.19.887.546 1.22.359.334.855.53 1.383.53h3.81a8.46 8.46 0 00-.64-1.37C9.42 3.477 8.413 2.5 6.93 2.5zM13.76 6h3.811c.528 0 1.024-.196 1.383-.53.356-.333.546-.773.546-1.22 0-.447-.19-.887-.546-1.22a2.029 2.029 0 00-1.383-.53c-1.484 0-2.49.976-3.17 2.13A8.46 8.46 0 0013.76 6zM13 7.5v4h8.25a.25.25 0 00.25-.25v-3.5a.25.25 0 00-.25-.25H13zm-1.5 0v4H2.75a.25.25 0 01-.25-.25v-3.5a.25.25 0 01.25-.25h8.75zm8 12.75V13H13v8.5h5.25c.69 0 1.25-.56 1.25-1.25zm-8 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V13h7v8.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/keyframes.scss
index ef50cc253c3db..e5ac94c5440ee 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-git-branch {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/placeholders.scss
index d4ec7d033b639..ee7b3c606ab01 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-git-branch-icon {
   --icon-name: icon-git-branch;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/property-16.scss
index a3d15b49ba29f..a082866373730 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-git-branch-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M12.719 6.913A3.001 3.001 0 0012 1a3 3 0 00-.787 5.896c-.282 2.395-2.124 4.164-4.561 4.34A3.005 3.005 0 004.5 9.095V2A.75.75 0 003 2v7.095a3.001 3.001 0 103.658 3.643c3.26-.187 5.758-2.606 6.061-5.825zM10.5 4a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0zm-8.25 8a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/property-24.scss
index 74292b9bcf74d..33c1152a1c949 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-branch/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-git-branch-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M7 3.25a.75.75 0 00-1.5 0v10.83a3.501 3.501 0 104.171 4.162c2.447-.091 4.553-.979 6.073-2.498 1.467-1.468 2.345-3.481 2.486-5.82A3.501 3.501 0 0017.5 3a3.5 3.5 0 00-.773 6.914c-.136 1.976-.88 3.604-2.044 4.769-1.213 1.213-2.929 1.97-5.015 2.058A3.505 3.505 0 007 14.081V3.25zM17.5 8.5a2 2 0 100-4 2 2 0 000 4zm-13.25 9a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/keyframes.scss
index e7e8f0575d225..79196b15761c4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-git-commit {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/placeholders.scss
index bb712d5358bad..9967691de344f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-git-commit-icon {
   --icon-name: icon-git-commit;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/property-16.scss
index de22b059973aa..efec3f02bd1ea 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-git-commit-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M10.905 7a3.001 3.001 0 00-5.81 0H2.75a.75.75 0 000 1.5h2.345a3.001 3.001 0 005.81 0h2.345a.75.75 0 000-1.5h-2.345zM8 6.25a1.5 1.5 0 100 3 1.5 1.5 0 000-3z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/property-24.scss
index d2824e5bc669c..ab2420c44bf61 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-commit/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-git-commit-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M15.93 11a4.001 4.001 0 00-7.86 0H3.75a.75.75 0 000 1.5h4.32a4.001 4.001 0 007.86 0h4.32a.75.75 0 000-1.5h-4.32zM12 9.25a2.5 2.5 0 100 5 2.5 2.5 0 000-5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/keyframes.scss
index 34560bba14e1a..0fffc7c1249df 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-git-merge {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/placeholders.scss
index e631288b24269..76f4c6df7129b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-git-merge-icon {
   --icon-name: icon-git-merge;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/property-16.scss
index 5c2a44d9ee5ff..210bc2c676c6a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-git-merge-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M4.644 6.865A3.001 3.001 0 003.75 1 3 3 0 003 6.905V14a.75.75 0 001.5 0V9.518c.21.266.436.527.675.78C6.21 11.39 7.619 12.432 9.08 12.69a3.001 3.001 0 10.038-1.526c-.92-.237-1.951-.946-2.855-1.899A9.018 9.018 0 014.955 7.52a4.969 4.969 0 01-.311-.655zM3.75 2.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM10.5 12a1.5 1.5 0 103 0 1.5 1.5 0 00-3 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/property-24.scss
index f3345fdb02884..4c5d277bfbc0e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-merge/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-git-merge-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M3.5 6.5a3.5 3.5 0 114.096 3.45c.102.41.284.886.551 1.406a11.743 11.743 0 001.81 2.54c1.35 1.456 3.014 2.56 4.635 2.804a3.502 3.502 0 016.908.8 3.5 3.5 0 01-6.928.71c-2.178-.252-4.217-1.677-5.716-3.294A13.885 13.885 0 017.5 13.202v7.548a.75.75 0 01-1.5 0V9.855A3.502 3.502 0 013.5 6.5zm3.5-2a2 2 0 100 4 2 2 0 000-4zm9 13a2 2 0 104 0 2 2 0 00-4 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/keyframes.scss
index 4d4517bcb66ac..f05fd75232c66 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-git-pull-request {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/placeholders.scss
index 1e59dad58aa39..b1381b6079a76 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-git-pull-request-icon {
   --icon-name: icon-git-pull-request;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/property-16.scss
index 2bf1b56e782e3..9c109ce7adb41 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-git-pull-request-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M5 6.905A3.001 3.001 0 004.25 1a3 3 0 00-.75 5.905V14A.75.75 0 005 14V6.905zM2.75 4a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0zM12.5 5.25v3.595a3.001 3.001 0 01-.75 5.905A3 3 0 0111 8.845V5.25a.75.75 0 00-.75-.75H9A.75.75 0 019 3h1.25a2.25 2.25 0 012.25 2.25zm-2.25 6.5a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/property-24.scss
index cc2c3371ab01c..ab6268231c204 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-pull-request/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-git-pull-request-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M7.5 9.92A3.501 3.501 0 006.75 3 3.5 3.5 0 006 9.92v10.83a.75.75 0 001.5 0V9.92zM4.75 6.5a2 2 0 114 0 2 2 0 01-4 0zM18 8.75v5.58a3.501 3.501 0 01-.75 6.92 3.5 3.5 0 01-.75-6.92V8.75c0-.69-.56-1.25-1.25-1.25H13A.75.75 0 0113 6h2.25A2.75 2.75 0 0118 8.75zm-2.75 9a2 2 0 114 0 2 2 0 01-4 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/keyframes.scss
index bd476d2e9b840..0fd9d85b19698 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-git-repo {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/placeholders.scss
index 3975d93c37174..49e2e61684902 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-git-repo-icon {
   --icon-name: icon-git-repo;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/property-16.scss
index 1025efbce8571..deb4f82641084 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-git-repo-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M3.25 0A2.25 2.25 0 001 2.25v10.5A2.25 2.25 0 003.25 15h.25a.75.75 0 000-1.5h-.25a.75.75 0 01-.75-.75v-1.5a.75.75 0 01.75-.75H13.5v3h-3a.75.75 0 000 1.5h3.25c.69 0 1.25-.56 1.25-1.25V1.25C15 .56 14.44 0 13.75 0H3.25zM13.5 9V1.5H3.25a.75.75 0 00-.75.75v6.878c.235-.083.487-.128.75-.128H13.5z" clip-rule="evenodd"/><path d="M5.5 12a.5.5 0 00-.5.5v3a.5.5 0 00.777.416L7 15.101l1.223.815A.5.5 0 009 15.5v-3a.5.5 0 00-.5-.5h-3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/property-24.scss
index 903948128dac0..9ee15bc68e200 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repo/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-git-repo-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M5.75 1A2.75 2.75 0 003 3.75v14.5A2.75 2.75 0 005.75 21H6a.75.75 0 000-1.5h-.25c-.69 0-1.25-.56-1.25-1.25v-1c0-.69.56-1.25 1.25-1.25H19.5v3.25a.25.25 0 01-.25.25H16a.75.75 0 000 1.5h3.25A1.75 1.75 0 0021 19.25V2.75A1.75 1.75 0 0019.25 1H5.75zM19.5 14.5V2.75a.25.25 0 00-.25-.25H5.75c-.69 0-1.25.56-1.25 1.25V14.8c.375-.192.8-.3 1.25-.3H19.5z" clip-rule="evenodd"/><path d="M8.75 18a.75.75 0 00-.75.75v3.5a.75.75 0 001.128.648L11 21.806l1.872 1.092A.75.75 0 0014 22.25v-3.5a.75.75 0 00-.75-.75h-4.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repository/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repository/index.scss
index 6cb0181d50a32..9762e05863a46 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repository/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repository/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../git-repo/property-16';
         @import '../git-repo/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repository/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repository/keyframes.scss
index 21b819b375aa9..8230cae04db3e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repository/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repository/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-git-repository {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repository/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repository/placeholders.scss
index 13e026e168d44..b530988f1fd7a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/git-repository/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/git-repository/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-git-repository-icon {
   --icon-name: icon-git-repository;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/keyframes.scss
index d2b75fd7adf24..ee58ca653fc9f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-github-color {
   100% {
     background-image: var(--icon-github-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/placeholders.scss
index 6014226c0773d..7f88cbdb0818e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-github-color-icon {
   --icon-name: icon-github-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/property-16.scss
index 8f7aff4653b0a..ed604735fcaac 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-github-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23161514" fill-rule="evenodd" d="M8 1C4.133 1 1 4.13 1 7.993c0 3.09 2.006 5.71 4.787 6.635.35.064.478-.152.478-.337 0-.166-.006-.606-.01-1.19-1.947.423-2.357-.937-2.357-.937-.319-.808-.778-1.023-.778-1.023-.635-.434.048-.425.048-.425.703.05 1.073.72 1.073.72.624 1.07 1.638.76 2.037.582.063-.452.244-.76.444-.935-1.554-.176-3.188-.776-3.188-3.456 0-.763.273-1.388.72-1.876-.072-.177-.312-.888.07-1.85 0 0 .586-.189 1.924.716A6.711 6.711 0 018 4.381c.595.003 1.194.08 1.753.236 1.336-.905 1.923-.717 1.923-.717.382.963.142 1.674.07 1.85.448.49.72 1.114.72 1.877 0 2.686-1.638 3.278-3.197 3.45.251.216.475.643.475 1.296 0 .934-.009 1.688-.009 1.918 0 .187.127.404.482.336A6.996 6.996 0 0015 7.993 6.997 6.997 0 008 1z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/property-24.scss
index 97aeaccbfbbc5..e6ef0257c4ac8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/github-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-github-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23161514" fill-rule="evenodd" d="M12 2C6.477 2 2 6.476 2 11.997c0 4.417 2.865 8.163 6.839 9.485.5.092.682-.216.682-.482 0-.236-.008-.865-.013-1.7-2.782.604-3.369-1.34-3.369-1.34-.454-1.155-1.11-1.462-1.11-1.462-.908-.62.069-.608.069-.608 1.003.07 1.531 1.03 1.531 1.03.892 1.528 2.341 1.087 2.91.831.092-.646.35-1.086.636-1.336-2.22-.252-4.555-1.11-4.555-4.94 0-1.092.39-1.985 1.029-2.683-.103-.253-.446-1.27.098-2.646 0 0 .84-.269 2.75 1.025A9.581 9.581 0 0112 6.834c.85.004 1.705.115 2.504.337 1.909-1.294 2.747-1.025 2.747-1.025.546 1.376.202 2.393.1 2.646.64.698 1.028 1.591 1.028 2.682 0 3.84-2.339 4.686-4.566 4.933.359.309.678.919.678 1.852 0 1.336-.012 2.414-.012 2.741 0 .268.18.58.688.482 3.97-1.325 6.833-5.07 6.833-9.485C22 6.476 17.522 2 12 2z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/github/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/github/index.scss
index 216229d36af05..cbdee8fe7e172 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/github/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/github/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../github-color/property-16';
         @import '../github-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/github/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/github/keyframes.scss
index ccd4bce3f4508..92f869b07769c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/github/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/github/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-github {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/github/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/github/placeholders.scss
index 41a45cf1ff4de..d06db6abc56df 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/github/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/github/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-github-icon {
   --icon-name: icon-github;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/github/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/github/property-16.scss
index 5a71a52801a94..c33d6a37c23d1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/github/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/github/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-github-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 1C4.133 1 1 4.13 1 7.993c0 3.09 2.006 5.71 4.787 6.635.35.064.478-.152.478-.337 0-.166-.006-.606-.01-1.19-1.947.423-2.357-.937-2.357-.937-.319-.808-.778-1.023-.778-1.023-.635-.434.048-.425.048-.425.703.05 1.073.72 1.073.72.624 1.07 1.638.76 2.037.582.063-.452.244-.76.444-.935-1.554-.176-3.188-.776-3.188-3.456 0-.763.273-1.388.72-1.876-.072-.177-.312-.888.07-1.85 0 0 .586-.189 1.924.716A6.711 6.711 0 018 4.381c.595.003 1.194.08 1.753.236 1.336-.905 1.923-.717 1.923-.717.382.963.142 1.674.07 1.85.448.49.72 1.114.72 1.877 0 2.686-1.638 3.278-3.197 3.45.251.216.475.643.475 1.296 0 .934-.009 1.688-.009 1.918 0 .187.127.404.482.336A6.996 6.996 0 0015 7.993 6.997 6.997 0 008 1z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/github/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/github/property-24.scss
index c85a428d1ba03..3852666a75d12 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/github/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/github/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-github-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 1C4.133 1 1 4.13 1 7.993c0 3.09 2.006 5.71 4.787 6.635.35.064.478-.152.478-.337 0-.166-.006-.606-.01-1.19-1.947.423-2.357-.937-2.357-.937-.319-.808-.778-1.023-.778-1.023-.635-.434.048-.425.048-.425.703.05 1.073.72 1.073.72.624 1.07 1.638.76 2.037.582.063-.452.244-.76.444-.935-1.554-.176-3.188-.776-3.188-3.456 0-.763.273-1.388.72-1.876-.072-.177-.312-.888.07-1.85 0 0 .586-.189 1.924.716A6.711 6.711 0 018 4.381c.595.003 1.194.08 1.753.236 1.336-.905 1.923-.717 1.923-.717.382.963.142 1.674.07 1.85.448.49.72 1.114.72 1.877 0 2.686-1.638 3.278-3.197 3.45.251.216.475.643.475 1.296 0 .934-.009 1.688-.009 1.918 0 .187.127.404.482.336A6.996 6.996 0 0015 7.993 6.997 6.997 0 008 1z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/keyframes.scss
index 278549df0b911..0fd6dbe54e44d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-gitlab-color {
   100% {
     background-image: var(--icon-gitlab-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/placeholders.scss
index 9cc178358c787..79d926f88f1af 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-gitlab-color-icon {
   --icon-name: icon-gitlab-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/property-16.scss
index e780477b65b98..cf1c518f32c48 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-gitlab-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23FC6D26" d="M14.975 8.904L14.19 6.55l-1.552-4.67a.268.268 0 00-.255-.18.268.268 0 00-.254.18l-1.552 4.667H5.422L3.87 1.879a.267.267 0 00-.254-.179.267.267 0 00-.254.18l-1.55 4.667-.784 2.357a.515.515 0 00.193.583l6.78 4.812 6.778-4.812a.516.516 0 00.196-.583z"/><path fill="%23E24329" d="M8 14.296l2.578-7.75H5.423L8 14.296z"/><path fill="%23FC6D26" d="M8 14.296l-2.579-7.75H1.813L8 14.296z"/><path fill="%23FCA326" d="M1.81 6.549l-.784 2.354a.515.515 0 00.193.583L8 14.3 1.81 6.55z"/><path fill="%23E24329" d="M1.812 6.549h3.612L3.87 1.882a.268.268 0 00-.254-.18.268.268 0 00-.255.18L1.812 6.549z"/><path fill="%23FC6D26" d="M8 14.296l2.578-7.75h3.614L8 14.296z"/><path fill="%23FCA326" d="M14.19 6.549l.783 2.354a.514.514 0 01-.193.583L8 14.296l6.188-7.747h.001z"/><path fill="%23E24329" d="M14.19 6.549H10.58l1.551-4.667a.267.267 0 01.255-.18c.115 0 .217.073.254.18l1.552 4.667z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/property-24.scss
index 95a52708023fc..a2aa818fcbe77 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-gitlab-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23FC6D26" d="M21.964 13.292l-1.12-3.363-2.218-6.673a.383.383 0 00-.363-.255.383.383 0 00-.364.255l-2.217 6.669H8.316L6.1 3.256A.382.382 0 005.736 3a.382.382 0 00-.363.256L3.16 9.925l-1.12 3.367a.736.736 0 00.275.833L12 21l9.683-6.875a.737.737 0 00.28-.833z"/><path fill="%23E24329" d="M12 20.995l3.683-11.071H8.319L12 20.994z"/><path fill="%23FC6D26" d="M12 20.995L8.316 9.924H3.162L12 20.994z"/><path fill="%23FCA326" d="M3.158 9.927l-1.12 3.364a.736.736 0 00.276.833L12 21 3.158 9.927z"/><path fill="%23E24329" d="M3.16 9.927h5.16L6.1 3.26a.383.383 0 00-.364-.256.383.383 0 00-.364.256L3.16 9.927z"/><path fill="%23FC6D26" d="M12 20.995l3.683-11.071h5.162L12 20.994z"/><path fill="%23FCA326" d="M20.842 9.927l1.12 3.364a.734.734 0 01-.276.833L12 20.994l8.84-11.067h.002z"/><path fill="%23E24329" d="M20.844 9.927h-5.16l2.217-6.667a.382.382 0 01.363-.256c.165 0 .311.103.363.256l2.217 6.667z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/index.scss
index 6bd234749ffbf..9f36415d9d1a9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../gitlab-color/property-16';
         @import '../gitlab-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/keyframes.scss
index 0bfb6daba4022..4e2d87c7e4f54 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-gitlab {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/placeholders.scss
index 5b79ea8a029ed..0d389645e7958 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-gitlab-icon {
   --icon-name: icon-gitlab;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/property-16.scss
index 6d4370784a569..30dc6d8f5682b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-gitlab-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M14.975 8.904L14.19 6.55l-1.552-4.67a.268.268 0 00-.255-.18.268.268 0 00-.254.18l-1.552 4.667H5.422L3.87 1.879a.267.267 0 00-.254-.179.267.267 0 00-.254.18l-1.55 4.667-.784 2.357a.515.515 0 00.193.583l6.78 4.812 6.778-4.812a.516.516 0 00.196-.583z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/property-24.scss
index dcfdaf9048059..ea2a05c641fd5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/gitlab/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-gitlab-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M14.975 8.904L14.19 6.55l-1.552-4.67a.268.268 0 00-.255-.18.268.268 0 00-.254.18l-1.552 4.667H5.422L3.87 1.879a.267.267 0 00-.254-.179.267.267 0 00-.254.18l-1.55 4.667-.784 2.357a.515.515 0 00.193.583l6.78 4.812 6.778-4.812a.516.516 0 00.196-.583z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/keyframes.scss
index a9e1891bcd986..121c8b1cc8a85 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-globe-private {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/placeholders.scss
index 3a8672b0d4e86..54ac96a52b961 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-globe-private-icon {
   --icon-name: icon-globe-private;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/property-16.scss
index a9f1e7db559f2..e6c7cf89d39a0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-globe-private-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M5.58 7C5.835 5.124 6.667 3.335 8 1.836a10.074 10.074 0 011.806 2.878.75.75 0 101.388-.568 11.412 11.412 0 00-1.322-2.372A6.503 6.503 0 0114.5 8 .75.75 0 0016 8a8 8 0 10-11.31 7.285.75.75 0 10.622-1.365A6.504 6.504 0 011.519 8.5h2.503c.04.563.122 1.12.248 1.668a.75.75 0 101.462-.336c-.1-.438-.17-.883-.205-1.332H7A.75.75 0 007 7H5.58zM4.07 7H1.576a6.508 6.508 0 014.552-5.226A11.095 11.095 0 004.068 7z" clip-rule="evenodd"/><path d="M11.75 12.25a.75.75 0 00-1.5 0v.5a.75.75 0 001.5 0v-.5z"/><path fill-rule="evenodd" d="M8.518 9.012c.035-.627.13-1.235.366-1.738.174-.37.435-.704.816-.94C10.08 6.101 10.52 6 11 6c.48 0 .921.1 1.3.334.381.236.642.57.816.94.236.503.331 1.111.366 1.738A2.25 2.25 0 0115.5 11.25v2.5A2.25 2.25 0 0113.25 16h-4.5a2.25 2.25 0 01-2.25-2.25v-2.5a2.25 2.25 0 012.018-2.238zM10.022 9c.032-.481.102-.838.22-1.087a.662.662 0 01.245-.302c.09-.055.243-.111.513-.111s.423.056.513.111c.087.054.17.141.246.302.117.249.187.606.219 1.087h-1.956zm3.228 1.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75h-4.5a.75.75 0 01-.75-.75v-2.5a.75.75 0 01.75-.75h4.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/property-24.scss
index 45adccb89c1b9..674caff94f0ae 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/globe-private/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-globe-private-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M8.804 11A15.149 15.149 0 0112 2.916a15.087 15.087 0 012.813 5.763.75.75 0 001.456-.358 16.614 16.614 0 00-2.596-5.674 9.512 9.512 0 017.542 7.035.75.75 0 101.456-.364C21.473 4.539 17.15 1 12 1 5.925 1 1 5.925 1 12c0 5.243 3.667 9.627 8.575 10.732a.75.75 0 00.33-1.464c-4.082-.918-7.169-4.465-7.392-8.768h4.754c.128 2.606.86 5.13 2.117 7.367a.75.75 0 101.308-.734A15.221 15.221 0 018.77 12.5H12.5a.75.75 0 000-1.5H8.804zM7.3 11H2.552a9.506 9.506 0 017.775-8.353A16.673 16.673 0 007.299 11z" clip-rule="evenodd"/><path d="M18 19a.75.75 0 01.75.75v.5a.75.75 0 01-1.5 0v-.5A.75.75 0 0118 19z"/><path fill-rule="evenodd" d="M14 15.014a2.25 2.25 0 00-2 2.236v4.5A2.25 2.25 0 0014.25 24h7.5A2.25 2.25 0 0024 21.75v-4.5a2.25 2.25 0 00-2-2.236v-.93a4.127 4.127 0 00-1.165-2.881A3.96 3.96 0 0018 10a3.96 3.96 0 00-2.835 1.203A4.127 4.127 0 0014 14.083v.93zM15.5 15v-.917c0-.69.268-1.35.739-1.833A2.46 2.46 0 0118 11.5c.657 0 1.29.267 1.761.75.471.483.739 1.142.739 1.833V15h-5zm-1.25 1.5a.75.75 0 00-.75.75v4.5c0 .414.336.75.75.75h7.5a.75.75 0 00.75-.75v-4.5a.75.75 0 00-.75-.75h-7.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/globe/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/globe/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/globe/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/globe/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/globe/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/globe/keyframes.scss
index 5248093acd5fb..d69ccd7bc5158 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/globe/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/globe/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-globe {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/globe/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/globe/placeholders.scss
index 8108a9a320523..5d10cfb661370 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/globe/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/globe/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-globe-icon {
   --icon-name: icon-globe;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/globe/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/globe/property-16.scss
index cf0713a7a2468..4bd4ee706aad1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/globe/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/globe/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-globe-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM6.128 1.774A6.508 6.508 0 001.576 7H4.07a11.095 11.095 0 012.06-5.226zm3.744 0A11.096 11.096 0 0111.932 7h2.492a6.508 6.508 0 00-4.552-5.226zM10.42 7C10.165 5.124 9.333 3.335 8 1.836 6.667 3.335 5.835 5.124 5.58 7h4.84zM5.527 8.5h4.946C10.31 10.557 9.451 12.533 8 14.164 6.55 12.533 5.691 10.557 5.527 8.5zm-1.505 0H1.52a6.505 6.505 0 004.61 5.726C4.896 12.525 4.163 10.555 4.021 8.5zm5.85 5.726c1.231-1.701 1.964-3.671 2.106-5.726h2.503a6.505 6.505 0 01-4.61 5.726z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/globe/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/globe/property-24.scss
index d421492a1d0d3..618c3118ba354 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/globe/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/globe/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-globe-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm-1.673 1.647A9.506 9.506 0 002.552 11h4.747a16.673 16.673 0 013.028-8.353zm3.346 0A16.673 16.673 0 0116.701 11h4.747a9.506 9.506 0 00-7.775-8.353zM15.196 11A15.149 15.149 0 0012 2.916 15.149 15.149 0 008.804 11h6.392zm-6.427 1.5h6.462A15.16 15.16 0 0112 21.084 15.16 15.16 0 018.769 12.5zm-1.502 0H2.513c.23 4.45 3.525 8.091 7.814 8.853a16.683 16.683 0 01-3.06-8.853zm6.406 8.853a16.683 16.683 0 003.06-8.853h4.754c-.23 4.45-3.525 8.091-7.814 8.853z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/keyframes.scss
index 486ab7e9c82e4..4d484f0996a2e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-google-color {
   100% {
     background-image: var(--icon-google-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/placeholders.scss
index 28d9983a7fed6..b52fab8ee2100 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-google-color-icon {
   --icon-name: icon-google-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/property-16.scss
index 9fd8eaac56204..3eec4f477025e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-google-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%234285F4" d="M14.9 8.161c0-.476-.039-.954-.121-1.422h-6.64v2.695h3.802a3.24 3.24 0 01-1.407 2.127v1.75h2.269c1.332-1.22 2.097-3.02 2.097-5.15z"/><path fill="%2334A853" d="M8.14 15c1.898 0 3.499-.62 4.665-1.69l-2.268-1.749c-.631.427-1.446.669-2.395.669-1.836 0-3.393-1.232-3.952-2.888H1.85v1.803A7.044 7.044 0 008.14 15z"/><path fill="%23FBBC04" d="M4.187 9.341a4.17 4.17 0 010-2.68V4.858H1.849a6.97 6.97 0 000 6.287l2.338-1.803z"/><path fill="%23EA4335" d="M8.14 3.77a3.837 3.837 0 012.7 1.05l2.01-1.999a6.786 6.786 0 00-4.71-1.82 7.042 7.042 0 00-6.29 3.858L4.186 6.66c.556-1.658 2.116-2.89 3.952-2.89z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/property-24.scss
index 060a2ed1e6a48..b6bfacd7c6f95 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/google-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-google-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%234285F4" d="M21.804 12.23c0-.68-.055-1.363-.173-2.032H12.2v3.85h5.4a4.63 4.63 0 01-1.998 3.04v2.498h3.222c1.893-1.742 2.98-4.314 2.98-7.356z"/><path fill="%2334A853" d="M12.2 22c2.697 0 4.971-.886 6.628-2.414l-3.222-2.499c-.897.61-2.054.956-3.402.956-2.61 0-4.821-1.76-5.615-4.127H3.264v2.576A10 10 0 0012.2 22z"/><path fill="%23FBBC04" d="M6.585 13.916a5.99 5.99 0 010-3.828V7.512H3.264a10.008 10.008 0 000 8.98l3.321-2.576z"/><path fill="%23EA4335" d="M12.2 5.958a5.434 5.434 0 013.836 1.499l2.855-2.855A9.61 9.61 0 0012.2 2.001a9.998 9.998 0 00-8.936 5.511l3.321 2.576c.79-2.37 3.006-4.13 5.615-4.13z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/google/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/google/index.scss
index ad75e34e7bbf2..2567178ad9873 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/google/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/google/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../google-color/property-16';
         @import '../google-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/google/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/google/keyframes.scss
index 5653005b83323..c328e671f7950 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/google/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/google/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-google {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/google/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/google/placeholders.scss
index f84ff96fddb30..76e1eda1c1d80 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/google/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/google/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-google-icon {
   --icon-name: icon-google;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/google/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/google/property-16.scss
index 6a66e9e5627d4..e90ede692a00d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/google/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/google/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-google-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M10.84 4.82a3.837 3.837 0 00-2.7-1.05c-1.837 0-3.397 1.233-3.953 2.891a4.17 4.17 0 000 2.68h.003c.558 1.657 2.115 2.889 3.952 2.889.948 0 1.761-.241 2.392-.667v-.002a3.239 3.239 0 001.407-2.127H8.14V6.74h6.64c.082.468.121.946.121 1.422 0 2.129-.765 3.929-2.096 5.148l.001.001C11.64 14.38 10.038 15 8.14 15a7.044 7.044 0 01-6.29-3.855 6.97 6.97 0 010-6.287A7.042 7.042 0 018.139 1a6.786 6.786 0 014.71 1.821L10.84 4.82z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/google/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/google/property-24.scss
index 779132912dd55..adcaae860fd29 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/google/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/google/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-google-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M10.84 4.82a3.837 3.837 0 00-2.7-1.05c-1.837 0-3.397 1.233-3.953 2.891a4.17 4.17 0 000 2.68h.003c.558 1.657 2.115 2.889 3.952 2.889.948 0 1.761-.241 2.392-.667v-.002a3.239 3.239 0 001.407-2.127H8.14V6.74h6.64c.082.468.121.946.121 1.422 0 2.129-.765 3.929-2.096 5.148l.001.001C11.64 14.38 10.038 15 8.14 15a7.044 7.044 0 01-6.29-3.855 6.97 6.97 0 010-6.287A7.042 7.042 0 018.139 1a6.786 6.786 0 014.71 1.821L10.84 4.82z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/keyframes.scss
index 84b3c915b60dc..d8d22f563f86c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-grid-alt {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/placeholders.scss
index 70e12606534a7..744b09009fcf5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-grid-alt-icon {
   --icon-name: icon-grid-alt;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/property-16.scss
index ac43c105c7d6a..77f8b25f75e42 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-grid-alt-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M0 .75A.75.75 0 01.75 0h2.5A.75.75 0 014 .75v2.5a.75.75 0 01-.75.75H.75A.75.75 0 010 3.25V.75zm1.5.75v1h1v-1h-1zM6 .75A.75.75 0 016.75 0h2.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75h-2.5A.75.75 0 016 3.25V.75zm1.5.75v1h1v-1h-1zM12.75 0a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75V.75a.75.75 0 00-.75-.75h-2.5zm.75 2.5v-1h1v1h-1zM0 6.75A.75.75 0 01.75 6h2.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75H.75A.75.75 0 010 9.25v-2.5zm1.5.75v1h1v-1h-1zM6.75 6a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5A.75.75 0 009.25 6h-2.5zm.75 2.5v-1h1v1h-1zM12 6.75a.75.75 0 01.75-.75h2.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75h-2.5a.75.75 0 01-.75-.75v-2.5zm1.5.75v1h1v-1h-1zM.75 12a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5a.75.75 0 00-.75-.75H.75zm.75 2.5v-1h1v1h-1zM6 12.75a.75.75 0 01.75-.75h2.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75h-2.5a.75.75 0 01-.75-.75v-2.5zm1.5.75v1h1v-1h-1zM12.75 12a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5a.75.75 0 00-.75-.75h-2.5zm.75 2.5v-1h1v1h-1z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/property-24.scss
index 7b7fb31fbc2ad..06047c2ef361d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/grid-alt/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-grid-alt-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M1 2.25C1 1.56 1.56 1 2.25 1h3.5C6.44 1 7 1.56 7 2.25v3.5C7 6.44 6.44 7 5.75 7h-3.5C1.56 7 1 6.44 1 5.75v-3.5zm1.5.25v3h3v-3h-3zM9 2.25C9 1.56 9.56 1 10.25 1h3.5c.69 0 1.25.56 1.25 1.25v3.5C15 6.44 14.44 7 13.75 7h-3.5C9.56 7 9 6.44 9 5.75v-3.5zm1.5.25v3h3v-3h-3zM18.25 1C17.56 1 17 1.56 17 2.25v3.5c0 .69.56 1.25 1.25 1.25h3.5C22.44 7 23 6.44 23 5.75v-3.5C23 1.56 22.44 1 21.75 1h-3.5zm.25 4.5v-3h3v3h-3zM1 10.25C1 9.56 1.56 9 2.25 9h3.5C6.44 9 7 9.56 7 10.25v3.5C7 14.44 6.44 15 5.75 15h-3.5C1.56 15 1 14.44 1 13.75v-3.5zm1.5.25v3h3v-3h-3zM10.25 9C9.56 9 9 9.56 9 10.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5C15 9.56 14.44 9 13.75 9h-3.5zm.25 4.5v-3h3v3h-3zM17 10.25c0-.69.56-1.25 1.25-1.25h3.5c.69 0 1.25.56 1.25 1.25v3.5c0 .69-.56 1.25-1.25 1.25h-3.5c-.69 0-1.25-.56-1.25-1.25v-3.5zm1.5.25v3h3v-3h-3zM2.25 17C1.56 17 1 17.56 1 18.25v3.5c0 .69.56 1.25 1.25 1.25h3.5C6.44 23 7 22.44 7 21.75v-3.5C7 17.56 6.44 17 5.75 17h-3.5zm.25 4.5v-3h3v3h-3zM9 18.25c0-.69.56-1.25 1.25-1.25h3.5c.69 0 1.25.56 1.25 1.25v3.5c0 .69-.56 1.25-1.25 1.25h-3.5C9.56 23 9 22.44 9 21.75v-3.5zm1.5.25v3h3v-3h-3zM18.25 17c-.69 0-1.25.56-1.25 1.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5c0-.69-.56-1.25-1.25-1.25h-3.5zm.25 4.5v-3h3v3h-3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/grid/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/grid/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/grid/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/grid/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/grid/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/grid/keyframes.scss
index 945894b90e9b7..815f05e8f3ace 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/grid/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/grid/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-grid {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/grid/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/grid/placeholders.scss
index 5d3bd9ffe3fcb..72cb0453ac006 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/grid/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/grid/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-grid-icon {
   --icon-name: icon-grid;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/grid/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/grid/property-16.scss
index ff933ac52ebc2..da7497e057558 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/grid/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/grid/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-grid-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M2.25 1C1.56 1 1 1.56 1 2.25v3.5C1 6.44 1.56 7 2.25 7h3.5C6.44 7 7 6.44 7 5.75v-3.5C7 1.56 6.44 1 5.75 1h-3.5zm.25 4.5v-3h3v3h-3zM10.25 1C9.56 1 9 1.56 9 2.25v3.5C9 6.44 9.56 7 10.25 7h3.5C14.44 7 15 6.44 15 5.75v-3.5C15 1.56 14.44 1 13.75 1h-3.5zm.25 4.5v-3h3v3h-3zM9 10.25C9 9.56 9.56 9 10.25 9h3.5c.69 0 1.25.56 1.25 1.25v3.5c0 .69-.56 1.25-1.25 1.25h-3.5C9.56 15 9 14.44 9 13.75v-3.5zm1.5.25v3h3v-3h-3zM2.25 9C1.56 9 1 9.56 1 10.25v3.5c0 .69.56 1.25 1.25 1.25h3.5C6.44 15 7 14.44 7 13.75v-3.5C7 9.56 6.44 9 5.75 9h-3.5zm.25 4.5v-3h3v3h-3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/grid/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/grid/property-24.scss
index cd2afcb537362..44c9e31c778e0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/grid/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/grid/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-grid-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M3.75 2A1.75 1.75 0 002 3.75v5.5c0 .966.784 1.75 1.75 1.75h5.5A1.75 1.75 0 0011 9.25v-5.5A1.75 1.75 0 009.25 2h-5.5zM3.5 3.75a.25.25 0 01.25-.25h5.5a.25.25 0 01.25.25v5.5a.25.25 0 01-.25.25h-5.5a.25.25 0 01-.25-.25v-5.5zM14.75 2A1.75 1.75 0 0013 3.75v5.5c0 .966.784 1.75 1.75 1.75h5.5A1.75 1.75 0 0022 9.25v-5.5A1.75 1.75 0 0020.25 2h-5.5zm-.25 1.75a.25.25 0 01.25-.25h5.5a.25.25 0 01.25.25v5.5a.25.25 0 01-.25.25h-5.5a.25.25 0 01-.25-.25v-5.5zM13 14.75c0-.966.784-1.75 1.75-1.75h5.5c.966 0 1.75.784 1.75 1.75v5.5A1.75 1.75 0 0120.25 22h-5.5A1.75 1.75 0 0113 20.25v-5.5zm1.75-.25a.25.25 0 00-.25.25v5.5c0 .138.112.25.25.25h5.5a.25.25 0 00.25-.25v-5.5a.25.25 0 00-.25-.25h-5.5zM3.75 13A1.75 1.75 0 002 14.75v5.5c0 .966.784 1.75 1.75 1.75h5.5A1.75 1.75 0 0011 20.25v-5.5A1.75 1.75 0 009.25 13h-5.5zm-.25 1.75a.25.25 0 01.25-.25h5.5a.25.25 0 01.25.25v5.5a.25.25 0 01-.25.25h-5.5a.25.25 0 01-.25-.25v-5.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/keyframes.scss
index 2d4b97c30b308..037db98953c5b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-guide-link {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/placeholders.scss
index eb717d09ae636..2a67d5ada5e6a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-guide-link-icon {
   --icon-name: icon-guide-link;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/property-16.scss
index 5bdea2eeb32e8..1a40c7d19d4de 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-guide-link-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M12.75 1a.75.75 0 000 1.5h.69l-1.97 1.97a.75.75 0 001.06 1.06l1.97-1.97v.69a.75.75 0 001.5 0v-2.5a.75.75 0 00-.75-.75h-2.5z"/><path fill-rule="evenodd" d="M1.25 2C.56 2 0 2.56 0 3.25v8.5C0 12.44.56 13 1.25 13H5c.896 0 1.475.205 1.809.448.317.23.441.51.441.802a.751.751 0 101.5 0c0-.292.124-.572.441-.802.334-.243.913-.448 1.809-.448h3.75c.69 0 1.25-.56 1.25-1.25v-4.5a.75.75 0 00-1.5 0v4.25H11c-.878 0-1.64.158-2.25.467v-6.55c0-.788.376-1.42 1.12-1.722a.75.75 0 00-.561-1.39 3.27 3.27 0 00-1.31.941A3.13 3.13 0 007.773 3C7.106 2.354 6.154 2 5 2H1.25zm6 3.417c0-.553-.187-1.015-.522-1.34C6.394 3.753 5.846 3.5 5 3.5H1.5v8H5c.878 0 1.64.158 2.25.467v-6.55z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/property-24.scss
index 231d101111fb6..587300b269629 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/guide-link/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-guide-link-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M19.75 2a.75.75 0 000 1.5h1.69l-2.97 2.97a.75.75 0 001.06 1.06l2.97-2.97v1.69a.75.75 0 001.5 0v-3.5a.75.75 0 00-.75-.75h-3.5z"/><path fill-rule="evenodd" d="M2.75 3A1.75 1.75 0 001 4.75v12.5c0 .966.784 1.75 1.75 1.75h5.175c2.342 0 3.325 1.19 3.325 2.25A.749.749 0 0012 22a.75.75 0 00.75-.75c0-1.06.983-2.25 3.325-2.25h5.175A1.75 1.75 0 0023 17.25v-7a.75.75 0 10-1.5 0v7a.25.25 0 01-.25.25h-5.175c-1.329 0-2.48.345-3.325.943V7.75c0-.921.199-1.675.609-2.21.393-.512 1.055-.92 2.204-1.018a.75.75 0 10-.126-1.495c-1.481.126-2.57.689-3.269 1.6-.059.078-.115.158-.168.238a3.789 3.789 0 00-.323-.426C10.858 3.505 9.6 3 7.9 3H2.75zm8.5 4.75c0-.99-.229-1.783-.702-2.323C10.092 4.906 9.3 4.5 7.9 4.5H2.75a.25.25 0 00-.25.25v12.5c0 .138.112.25.25.25h5.175c1.329 0 2.48.345 3.325.943V7.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/guide/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/guide/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/guide/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/guide/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/guide/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/guide/keyframes.scss
index 691c71168975f..a78c5b6b363fa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/guide/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/guide/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-guide {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/guide/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/guide/placeholders.scss
index ac8b54b5a41ce..df69ec2d358cb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/guide/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/guide/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-guide-icon {
   --icon-name: icon-guide;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/guide/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/guide/property-16.scss
index d2848eb7df43b..9fcc4af0457a4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/guide/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/guide/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-guide-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M1.25 2C.56 2 0 2.56 0 3.25v8.5C0 12.44.56 13 1.25 13H5c.896 0 1.475.205 1.809.448.317.23.441.51.441.802a.75.75 0 001.5 0c0-.292.124-.572.441-.802.334-.243.913-.448 1.809-.448h3.75c.69 0 1.25-.56 1.25-1.25v-8.5C16 2.56 15.44 2 14.75 2H11c-1.154 0-2.106.354-2.772 1-.081.08-.157.161-.228.246A3.131 3.131 0 007.772 3C7.106 2.354 6.154 2 5 2H1.25zm7.5 9.967c.61-.309 1.372-.467 2.25-.467h3.5v-8H11c-.846 0-1.394.253-1.728.577-.335.325-.522.787-.522 1.34v6.55zm-1.5 0v-6.55c0-.553-.187-1.015-.522-1.34C6.394 3.753 5.846 3.5 5 3.5H1.5v8H5c.878 0 1.64.158 2.25.467z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/guide/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/guide/property-24.scss
index 8c53acf709601..59be424fcb2f6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/guide/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/guide/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-guide-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M2.75 3A1.75 1.75 0 001 4.75v12.5c0 .966.784 1.75 1.75 1.75h5.175c2.342 0 3.325 1.19 3.325 2.25a.75.75 0 001.5 0c0-1.06.983-2.25 3.325-2.25h5.175A1.75 1.75 0 0023 17.25V4.75A1.75 1.75 0 0021.25 3H16.1c-1.7 0-2.958.505-3.777 1.439-.119.136-.226.278-.323.426a3.789 3.789 0 00-.323-.426C10.858 3.505 9.6 3 7.9 3H2.75zm10 15.443c.845-.598 1.996-.943 3.325-.943h5.175a.25.25 0 00.25-.25V4.75a.25.25 0 00-.25-.25H16.1c-1.4 0-2.192.406-2.648.927-.473.54-.702 1.334-.702 2.323v10.693zm-1.5 0V7.75c0-.99-.229-1.783-.702-2.323C10.092 4.906 9.3 4.5 7.9 4.5H2.75a.25.25 0 00-.25.25v12.5c0 .138.112.25.25.25h5.175c1.329 0 2.48.345 3.325.943z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/keyframes.scss
index a206dd0c84e67..acb3b31e8a4aa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-hammer {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/placeholders.scss
index fb5da4e894a53..bb4f0ed64861b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-hammer-icon {
   --icon-name: icon-hammer;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/property-16.scss
index 621061cbd91bd..4885be694c2de 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hammer-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M5.484 2.917c.817.22 1.612.62 2.509 1.403a.75.75 0 01.085 1.044l-.422.51 1.13.855.62-.802a.75.75 0 011.08-.113c.678.576.906 1.133.959 1.642.011.111.013.21.014.283v.044c.204.187.417.369.635.552l1.784-2.098-.712-.584-.1.018-.021.003a3.018 3.018 0 01-.395.051c-.132.006-.456.009-.736-.217a1.173 1.173 0 01-.388-.646c-.039-.16-.054-.33-.063-.436l-.002-.012a8.261 8.261 0 00-.012-.128c-1.814-1.199-3.99-1.864-5.965-1.37zm7.789 2.723a.113.113 0 01-.002 0h.002zM7.868 7.915l-1.17-.884-3.972 4.804a.25.25 0 00.036.354l.913.73a.25.25 0 00.354-.042l3.84-4.962zM6.433 5a4.168 4.168 0 00-1.352-.638c-.463-.123-.908-.167-1.47-.224a42.642 42.642 0 01-.68-.073.75.75 0 01-.378-1.333c3.21-2.54 7.208-1.427 9.914.432a1.142 1.142 0 01.428.681c.026.112.04.23.05.325a2.32 2.32 0 01.285-.028c.143-.004.46.003.734.227l.148.12c.45.368.773.633 1.31 1.082a.75.75 0 01.09 1.062l-2.757 3.24a.75.75 0 01-1.052.089 71.575 71.575 0 00-.253-.21 23.847 23.847 0 01-1.146-.994 1.128 1.128 0 01-.34-.779 3.738 3.738 0 01-.005-.192v-.03c0-.034 0-.063-.002-.089l-4.742 6.128a1.75 1.75 0 01-2.477.296l-.913-.73a1.75 1.75 0 01-.255-2.482l4.863-5.88zm6.153-.772a.127.127 0 01.002 0h-.002z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/property-24.scss
index de070ad6420e4..4fe9f428fe6c6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hammer/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hammer-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M19.502 5.858C15.71 2.773 10.384.225 5.334 3.59a.75.75 0 00.269 1.36c1.292.258 2.317.466 3.309.888.814.346 1.625.846 2.52 1.67L1.03 17.909a2.25 2.25 0 000 3.182l.879.879a2.25 2.25 0 003.182 0l10.864-10.864c.212.322.24.532.247.66.004.065.002.13-.001.21l-.002.041c-.004.068-.009.16-.008.245.002.243.047.586.328.898.513.571 1.078 1.123 1.607 1.64.124.121.247.24.366.358a.75.75 0 001.06-.008l4.148-4.208a.75.75 0 00-.008-1.061c-.763-.752-1.224-1.196-1.866-1.814l-.21-.203c-.283-.273-.643-.316-.838-.327a4.072 4.072 0 00-.589.026l-.013.001-.209.019a6.363 6.363 0 01-.005-.263v-.031c-.002-.161-.003-.383-.034-.588-.03-.206-.108-.548-.388-.81a.74.74 0 00-.038-.033zM9.499 4.456a11.55 11.55 0 00-1.546-.523c3.597-1.278 7.34.464 10.493 3 .012.092.014.21.016.398v.013c.001.167.003.4.038.62.035.217.12.55.393.81.288.273.654.307.837.314.195.007.407-.013.56-.028l.029-.003c.162-.015.27-.024.35-.023l.117.113c.475.458.848.818 1.318 1.277l-3.095 3.14a32.343 32.343 0 01-1.318-1.343c0-.027.002-.056.004-.099l.004-.077a3.49 3.49 0 000-.363c-.034-.633-.299-1.343-1.169-2.212a.75.75 0 00-1.06 0L14 10.94 12.06 9l.97-.97a.75.75 0 00.007-1.053c-1.233-1.266-2.362-2.02-3.538-2.52zM11 10.061L2.091 18.97a.75.75 0 000 1.06l.879.879a.75.75 0 001.06 0L12.94 12 11 10.06zm9.74-1.021l-.01-.002a.04.04 0 01.01.002zm-.996-1.455l.013.002a.05.05 0 01-.013-.002z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/keyframes.scss
index 67d433da6a57d..fecfbfe70d12f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-handshake {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/placeholders.scss
index 86ffdbb8110df..be00b1af9db2f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-handshake-icon {
   --icon-name: icon-handshake;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/property-16.scss
index 5286e6ce6e2be..1c1d7780595cd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-handshake-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M5 2.75a.75.75 0 00-.53.22l-.78.78H.75a.75.75 0 000 1.5H2v5a.75.75 0 01-.75.75h-.5a.75.75 0 000 1.5h.5a2.25 2.25 0 002.016-1.25h.557l3.063 1.531a2.25 2.25 0 002.254-.14l2.087-1.391h1.507a2.25 2.25 0 002.016 1.25h.5a.75.75 0 000-1.5h-.5a.75.75 0 01-.75-.75v-5h1.25a.75.75 0 000-1.5h-2.94l-.78-.78a.75.75 0 00-.53-.22H5zm-1 2.5h-.5v4.5H4a.75.75 0 01.335.08l3.222 1.61a.75.75 0 00.751-.047l1.652-1.101-.584-.876a.75.75 0 011.248-.832l.777 1.166H12.5v-4.5H12a.75.75 0 01-.53-.22l-.78-.78H8.81L7.065 5.997a.711.711 0 00.971 1.038l.971-.85a.75.75 0 11.988 1.13l-.971.85a2.211 2.211 0 01-3.02-3.229l.686-.686H5.311l-.78.78A.75.75 0 014 5.25z" clip-rule="evenodd"/><path d="M1.25 9.625a.625.625 0 11-1.25 0 .625.625 0 011.25 0zM16 9.625a.625.625 0 11-1.25 0 .625.625 0 011.25 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/property-24.scss
index d30db94bfe5fd..0e9d9a8352f0b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/handshake/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-handshake-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M7.833 4.5a.75.75 0 00-.55.24L6.117 6H1.75a.75.75 0 000 1.5H4v7.458c0 .69-.56 1.25-1.25 1.25h-1a.75.75 0 000 1.5h1A2.75 2.75 0 005.296 16h.999l4.125 2.438a2.75 2.75 0 003.133-.234L16.266 16h2.438a2.751 2.751 0 002.546 1.708h1a.75.75 0 000-1.5h-1c-.69 0-1.25-.56-1.25-1.25V7.5h2.25a.75.75 0 000-1.5h-4.367l-1.166-1.26a.75.75 0 00-.55-.24h-3.473a.75.75 0 00-.533.223l-.524.53-.476-.513a.75.75 0 00-.55-.24H7.833zm-1.389 3H5.5v7h1a.75.75 0 01.382.104l4.301 2.542a1.25 1.25 0 001.424-.106l2.312-1.878-1.48-1.664a.75.75 0 011.122-.996l1.776 1.998H18.5v-7h-.944a.75.75 0 01-.55-.24L15.838 6h-2.831L10.37 8.673a1.25 1.25 0 00-.032 1.723l.119.129a1.25 1.25 0 001.762.08l1.277-1.16a.75.75 0 011.008 1.11l-1.276 1.16a2.75 2.75 0 01-3.877-.176l-.118-.13a2.75 2.75 0 01.07-3.79l1.28-1.296-.3-.323H8.161L6.995 7.26a.75.75 0 01-.55.24z" clip-rule="evenodd"/><path d="M23 13.875a.875.875 0 11-1.75 0 .875.875 0 011.75 0zM2.75 14.014a.875.875 0 11-1.75 0 .875.875 0 011.75 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/keyframes.scss
index f49a7c3f112c0..9275fde2bcf3a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-hard-drive {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/placeholders.scss
index d328b592f4256..d6a628c6dd52c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-hard-drive-icon {
   --icon-name: icon-hard-drive;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/property-16.scss
index be5900d16c022..e7a40512ea6c5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hard-drive-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3 11.25a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M4.748 1a2.25 2.25 0 00-2.07 1.369L.18 8.235a2.25 2.25 0 00-.18.882v3.633A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75V9.117c0-.303-.061-.603-.18-.882L13.322 2.37A2.25 2.25 0 0011.252 1H4.748zm-.69 1.956a.75.75 0 01.69-.456h6.504c.3 0 .572.18.69.456L14.09 8H1.91l2.148-5.044zM1.5 9.5v3.25c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75V9.5h-13z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/property-24.scss
index a4ddb8dab03ad..acaa18880c0e3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hard-drive/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hard-drive-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M4 15.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M7.202 3a2.75 2.75 0 00-2.428 1.46L1.32 10.958A2.75 2.75 0 001 12.248v6.002A2.75 2.75 0 003.75 21h16.5A2.75 2.75 0 0023 18.25v-6.002c0-.45-.11-.893-.321-1.29L19.226 4.46A2.75 2.75 0 0016.798 3H7.202zM6.098 5.164A1.25 1.25 0 017.202 4.5h9.596c.462 0 .887.255 1.104.664l3.366 6.336H2.732l3.366-6.336zM2.5 13v5.25c0 .69.56 1.25 1.25 1.25h16.5c.69 0 1.25-.56 1.25-1.25V13h-19z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hash/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hash/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hash/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hash/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hash/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hash/keyframes.scss
index 165edf21089af..aaa655266e29a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hash/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hash/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-hash {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hash/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hash/placeholders.scss
index 1c6b1b97dbcff..e939fd4313947 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hash/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hash/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-hash-icon {
   --icon-name: icon-hash;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hash/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hash/property-16.scss
index 90b2084969cb0..124521e6f081c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hash/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hash/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hash-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M6.884 1.762a.75.75 0 01.604.872L7.058 5h2.975l.479-2.634a.75.75 0 111.476.268L11.558 5h1.192a.75.75 0 010 1.5h-1.465l-.546 3h2.011a.75.75 0 010 1.5h-2.283l-.48 2.634a.75.75 0 11-1.475-.268L8.942 11H5.967l-.48 2.634a.75.75 0 11-1.475-.268L4.442 11H3.25a.75.75 0 010-1.5h1.465l.545-3H3.25a.75.75 0 010-1.5h2.283l.479-2.634a.75.75 0 01.872-.604zM9.214 9.5l.546-3H6.785l-.546 3h2.976z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hash/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hash/property-24.scss
index af7ef66fc138a..d9e11f51a5405 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hash/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hash/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hash-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M10.363 3.009a.75.75 0 01.629.853L10.365 8h4.483l.66-4.362a.75.75 0 111.484.224L16.365 8h2.885a.75.75 0 010 1.5h-3.113l-.681 4.5h3.794a.75.75 0 010 1.5h-4.022l-.736 4.863a.75.75 0 11-1.483-.225l.702-4.638H9.228l-.736 4.863a.75.75 0 11-1.483-.225L7.71 15.5H4.75a.75.75 0 010-1.5h3.189l.681-4.5H4.75a.75.75 0 010-1.5h4.098l.66-4.362a.75.75 0 01.855-.63zM13.938 14l.682-4.5h-4.482L9.455 14h4.482z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/keyframes.scss
index 3f31cb8616ffb..b6623decb4216 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-hashicorp-color {
   100% {
     background-image: var(--icon-hashicorp-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/placeholders.scss
index d16fb7ba33315..8dccf4d1d749c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-hashicorp-color-icon {
   --icon-name: icon-hashicorp-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/property-16.scss
index 061c97479c1f2..8665fb471c61e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hashicorp-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.835.6L1 3.96v8.074l2.192 1.264V5.224l3.643-2.1V.6z"/><path d="M9.165.6v6.43h-2.33v-2.4L4.642 5.894v8.237l2.193 1.266v-6.41h2.33v2.383l2.192-1.264V1.864L9.165.6z"/><path d="M9.165 15.4L15 12.04V3.966l-2.193-1.264v8.074l-3.642 2.1V15.4z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/property-24.scss
index 2798d255fbb30..29a29eca87710 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hashicorp-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M10.336 1.5L2 6.268v11.456l3.131 1.793V8.061l5.205-2.979V1.5z"/><path d="M13.664 1.5v9.123h-3.328V7.219L7.203 9.012V20.7l3.133 1.796V13.4h3.328v3.381l3.131-1.793V3.293L13.664 1.5z"/><path d="M13.664 22.5L22 17.732V6.276l-3.133-1.793v11.456l-5.203 2.979V22.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/index.scss
index 3e47faf5d2dcd..2e2e8f74d81bc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../hashicorp-color/property-16';
         @import '../hashicorp-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/keyframes.scss
index eae0e6a18c4f8..b08e947b458f5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-hashicorp {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/placeholders.scss
index 18d08c5cd72ed..0c22eca635315 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-hashicorp-icon {
   --icon-name: icon-hashicorp;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/property-16.scss
index 1e67440e3bb19..aad39e8c094e7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hashicorp-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.835.6L1 3.96v8.074l2.192 1.264V5.224l3.643-2.1V.6z"/><path d="M9.165.6v6.43h-2.33v-2.4L4.642 5.894v8.237l2.193 1.266v-6.41h2.33v2.383l2.192-1.264V1.864L9.165.6z"/><path d="M15 12.04L9.165 15.4v-2.525l3.642-2.1V2.703L15 3.966v8.073z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/property-24.scss
index ca09edf8ed986..5ea0302ac5d1f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hashicorp/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hashicorp-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.835.6L1 3.96v8.074l2.192 1.264V5.224l3.643-2.1V.6z"/><path d="M9.165.6v6.43h-2.33v-2.4L4.642 5.894v8.237l2.193 1.266v-6.41h2.33v2.383l2.192-1.264V1.864L9.165.6z"/><path d="M15 12.04L9.165 15.4v-2.525l3.642-2.1V2.703L15 3.966v8.073z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/keyframes.scss
index ed900e8047c59..b0932e2add61b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-hcp-color {
   100% {
     background-image: var(--icon-hcp-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/placeholders.scss
index e10d7099cd968..844e45d0c3701 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-hcp-color-icon {
   --icon-name: icon-hcp-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/property-16.scss
index d8ad5feaa00c7..756acd94a6279 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hcp-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.835.6L1 3.96v8.074l2.192 1.264V5.224l3.643-2.1V.6z"/><path d="M9.165.6v6.43h-2.33v-2.4L4.642 5.894v8.237l2.193 1.266v-6.41h2.33v2.383l2.192-1.264V1.864L9.165.6z"/><path d="M9.165 15.4L15 12.04V3.966l-2.193-1.264v8.074l-3.642 2.1V15.4z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/property-24.scss
index 7ffb0f1118246..16ce2c8037000 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hcp-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M10.336 1.5L2 6.268v11.456l3.131 1.793V8.061l5.205-2.979V1.5z"/><path d="M13.664 1.5v9.123h-3.328V7.219L7.203 9.012V20.7l3.133 1.796V13.4h3.328v3.381l3.131-1.793V3.293L13.664 1.5z"/><path d="M13.664 22.5L22 17.732V6.276l-3.133-1.793v11.456l-5.203 2.979V22.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/index.scss
index 99632f89e04c2..559077434d88b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../hcp-color/property-16';
         @import '../hcp-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/keyframes.scss
index 75c3821a9155e..78cf9acabe7cc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-hcp {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/placeholders.scss
index 8a9100b8c6b47..eae9c36bd9c6c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-hcp-icon {
   --icon-name: icon-hcp;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/property-16.scss
index db4e7f2a9faf8..4d9235fd80971 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hcp-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.835.6L1 3.96v8.074l2.192 1.264V5.224l3.643-2.1V.6z"/><path d="M9.165.6v6.43h-2.33v-2.4L4.642 5.894v8.237l2.193 1.266v-6.41h2.33v2.383l2.192-1.264V1.864L9.165.6z"/><path d="M15 12.04L9.165 15.4v-2.525l3.642-2.1V2.703L15 3.966v8.073z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/property-24.scss
index b9e362b848480..af0e0b9399d09 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hcp/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hcp-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.835.6L1 3.96v8.074l2.192 1.264V5.224l3.643-2.1V.6z"/><path d="M9.165.6v6.43h-2.33v-2.4L4.642 5.894v8.237l2.193 1.266v-6.41h2.33v2.383l2.192-1.264V1.864L9.165.6z"/><path d="M15 12.04L9.165 15.4v-2.525l3.642-2.1V2.703L15 3.966v8.073z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/keyframes.scss
index 12ed387d8e2b5..c73a0c53d4493 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-headphones {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/placeholders.scss
index 7f34831fbda3e..1a47436265081 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-headphones-icon {
   --icon-name: icon-headphones;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/property-16.scss
index 2a23ebe2e4a40..441dc980c123d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-headphones-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 2.5c-1.468 0-2.87.56-3.9 1.548A5.13 5.13 0 002.5 7.75V8h1.25A2.25 2.25 0 016 10.25v2.5A2.25 2.25 0 013.75 15h-.5A2.25 2.25 0 011 12.75v-5c0-1.8.745-3.52 2.061-4.784A7.135 7.135 0 018 1c1.847 0 3.624.704 4.939 1.966A6.63 6.63 0 0115 7.75v5A2.25 2.25 0 0112.75 15h-.5A2.25 2.25 0 0110 12.75v-2.5A2.25 2.25 0 0112.25 8h1.25v-.25a5.13 5.13 0 00-1.6-3.702A5.635 5.635 0 008 2.5zm5.5 7h-1.25a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h.5a.75.75 0 00.75-.75V9.5zm-11 0h1.25a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75h-.5a.75.75 0 01-.75-.75V9.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/property-24.scss
index 01a2766c70947..d1e593c554b23 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/headphones/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-headphones-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 3.5c-2.26 0-4.425.874-6.018 2.424A8.128 8.128 0 003.5 11.75V13h2.75A2.75 2.75 0 019 15.75v3.5A2.75 2.75 0 016.25 22h-1.5A2.75 2.75 0 012 19.25v-7.5a9.628 9.628 0 012.936-6.902A10.132 10.132 0 0112 2c2.646 0 5.187 1.022 7.064 2.848A9.629 9.629 0 0122 11.75v7.5A2.75 2.75 0 0119.25 22h-1.5A2.75 2.75 0 0115 19.25v-3.5A2.75 2.75 0 0117.75 13h2.75v-1.25c0-2.181-.89-4.278-2.482-5.826A8.632 8.632 0 0012 3.5zm8.5 11h-2.75c-.69 0-1.25.56-1.25 1.25v3.5c0 .69.56 1.25 1.25 1.25h1.5c.69 0 1.25-.56 1.25-1.25V14.5zm-17 0h2.75c.69 0 1.25.56 1.25 1.25v3.5c0 .69-.56 1.25-1.25 1.25h-1.5c-.69 0-1.25-.56-1.25-1.25V14.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/health/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/health/index.scss
index 3bf99810ebdb2..2603057880441 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/health/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/health/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../activity/property-16';
         @import '../activity/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/health/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/health/keyframes.scss
index 2b2d02ced5978..c1742b47c3657 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/health/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/health/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-health {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/health/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/health/placeholders.scss
index 09c652661ebb3..cead099fed095 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/health/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/health/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-health-icon {
   --icon-name: icon-health;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/keyframes.scss
index 679ede1fceded..14cbc8f0885e8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-heart-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/placeholders.scss
index 3dec6f6d632e7..2c20c7793eefc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-heart-fill-icon {
   --icon-name: icon-heart-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/property-16.scss
index 0ea88ffc6f783..2ca4f7bf08197 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-heart-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M11.434 1a4.604 4.604 0 00-3.226 1.322L8 2.527l-.208-.205A4.589 4.589 0 004.566 1 4.589 4.589 0 001.34 2.322 4.5 4.5 0 000 5.522a4.5 4.5 0 001.34 3.2l6.133 6.061a.75.75 0 001.054 0l6.132-6.06a4.52 4.52 0 00.992-1.467 4.482 4.482 0 00-.992-4.934A4.604 4.604 0 0011.433 1z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/property-24.scss
index 0b58756cbb8e1..767a0d57cb8d1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-heart-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M16.854 3c-.805 0-1.602.155-2.346.457a6.154 6.154 0 00-1.993 1.304L12 5.265l-.515-.504a6.205 6.205 0 00-4.34-1.76 6.205 6.205 0 00-4.34 1.76A5.974 5.974 0 001 9.031c0 1.605.651 3.14 1.806 4.27l8.67 8.485a.75.75 0 001.048 0l8.67-8.485a6.022 6.022 0 001.336-1.957 5.93 5.93 0 000-4.626 6.024 6.024 0 00-1.336-1.957 6.154 6.154 0 00-1.993-1.304A6.246 6.246 0 0016.854 3z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/keyframes.scss
index f042d4da0efa3..e3435c2ef4236 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-heart-off {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/placeholders.scss
index 7740a8e4f59b0..61f6a2a9ecd22 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-heart-off-icon {
   --icon-name: icon-heart-off;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/property-16.scss
index 05fcbc46b87af..66d9c8124b4fd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-heart-off-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M1.78.72A.75.75 0 00.72 1.78l.58.581A4.5 4.5 0 000 5.522a4.5 4.5 0 001.34 3.2l6.133 6.061a.75.75 0 001.054 0l2.613-2.582 3.08 3.08a.75.75 0 101.06-1.061L1.78.72zm8.3 10.42L2.36 3.422a2.999 2.999 0 00-.861 2.1 3 3 0 00.895 2.134L8 13.196l2.08-2.056z" clip-rule="evenodd"/><path d="M11.434 1a4.604 4.604 0 00-3.226 1.322l-.735.726a.75.75 0 001.054 1.067l.735-.727a3.104 3.104 0 014.342 0 2.981 2.981 0 010 4.267l-.735.727a.75.75 0 101.055 1.067l.735-.726a4.52 4.52 0 00.992-1.467 4.482 4.482 0 00-.992-4.934A4.604 4.604 0 0011.433 1z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/property-24.scss
index 46caedfa60814..e5d9b375537ce 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart-off/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-heart-off-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M2.28 1.22a.75.75 0 00-1.06 1.06L3.28 4.342c-.165.13-.324.27-.475.42A5.974 5.974 0 001 9.03c0 1.605.651 3.14 1.806 4.27l8.67 8.485a.75.75 0 001.048 0l4.145-4.056 5.05 5.05a.75.75 0 101.061-1.06L2.28 1.22zm13.328 15.449L4.351 5.412c-.174.128-.34.269-.496.421A4.474 4.474 0 002.5 9.031c0 1.196.485 2.347 1.355 3.198L12 20.2l3.608-3.532z" clip-rule="evenodd"/><path d="M14.508 3.457a6.246 6.246 0 014.693 0 6.153 6.153 0 011.993 1.304 6.024 6.024 0 011.336 1.957 5.931 5.931 0 010 4.626 6.022 6.022 0 01-1.336 1.957l-1.04 1.017a.75.75 0 01-1.049-1.072l1.04-1.017c.43-.421.771-.921 1.003-1.47a4.431 4.431 0 000-3.456 4.524 4.524 0 00-1.003-1.47 4.653 4.653 0 00-1.508-.986 4.746 4.746 0 00-3.566 0 4.653 4.653 0 00-1.507.986l-1.04 1.018a.75.75 0 01-1.049 0l-1.04-1.018a4.644 4.644 0 00-1.257-.875.75.75 0 11.644-1.356c.61.29 1.173.68 1.663 1.16l.515.503.515-.504a6.154 6.154 0 011.993-1.304z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart/keyframes.scss
index 37bc5f0043959..00fde5f34fc51 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-heart {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart/placeholders.scss
index ec41f80351c49..ae507d33475e4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-heart-icon {
   --icon-name: icon-heart;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart/property-16.scss
index b7300cd114031..1535ecaf7a00d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-heart-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M9.689 1.343a4.604 4.604 0 014.97.979 4.482 4.482 0 010 6.4l-6.132 6.061a.75.75 0 01-1.054 0L1.34 8.723A4.5 4.5 0 010 5.523a4.5 4.5 0 011.34-3.201A4.589 4.589 0 014.566 1c1.208 0 2.369.475 3.226 1.322L8 2.527l.208-.205a4.57 4.57 0 011.48-.979zm3.916 2.045a3.104 3.104 0 00-4.342 0l-.736.727a.75.75 0 01-1.054 0l-.736-.726a3.089 3.089 0 00-2.17-.889c-.817 0-1.598.32-2.172.889A3 3 0 001.5 5.522a3 3 0 00.895 2.134L8 13.196l5.605-5.54c.284-.281.51-.614.663-.98a2.981 2.981 0 00-.663-3.288z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/heart/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/heart/property-24.scss
index d6cbf53f56411..66548846d3e12 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/heart/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/heart/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-heart-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M14.508 3.457a6.246 6.246 0 014.693 0 6.154 6.154 0 011.993 1.304 6.024 6.024 0 011.336 1.957 5.931 5.931 0 010 4.626 6.022 6.022 0 01-1.336 1.957l-8.67 8.485a.75.75 0 01-1.049 0l-8.67-8.485A5.974 5.974 0 011 9.03c0-1.605.651-3.14 1.806-4.27a6.205 6.205 0 014.34-1.76c1.624 0 3.185.631 4.339 1.76l.515.504.515-.504a6.154 6.154 0 011.993-1.304zm5.637 2.376a4.653 4.653 0 00-1.508-.986 4.746 4.746 0 00-3.566 0 4.653 4.653 0 00-1.507.986l-1.04 1.018a.75.75 0 01-1.049 0l-1.04-1.018a4.705 4.705 0 00-3.29-1.332c-1.237 0-2.42.48-3.29 1.332A4.474 4.474 0 002.5 9.031c0 1.196.485 2.347 1.355 3.198L12 20.2l8.145-7.972c.43-.421.771-.921 1.003-1.47a4.431 4.431 0 000-3.456 4.524 4.524 0 00-1.003-1.47z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-fill/index.scss
index 682c384d9e3b2..85b6821c44af4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../help/property-16';
         @import '../help/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-fill/keyframes.scss
index 8ce4e9c2cfc55..0f8633076d545 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-help-circle-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-fill/placeholders.scss
index bb77040d5e28d..25b71721c4656 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-help-circle-fill-icon {
   --icon-name: icon-help-circle-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-outline/index.scss
index 682c384d9e3b2..85b6821c44af4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../help/property-16';
         @import '../help/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-outline/keyframes.scss
index d5ff0a9996d9c..d06174c4af299 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-help-circle-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-outline/placeholders.scss
index 54269d795e4d2..dd0293c605bd4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/help-circle-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-help-circle-outline-icon {
   --icon-name: icon-help-circle-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/help/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/help/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/help/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/help/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/help/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/help/keyframes.scss
index 53149f0df4aa0..2156cf174cbf2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/help/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/help/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-help {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/help/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/help/placeholders.scss
index adabc26b02b2b..a489036267554 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/help/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/help/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-help-icon {
   --icon-name: icon-help;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/help/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/help/property-16.scss
index 376fb89f7e2d8..66888f17b9423 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/help/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/help/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-help-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M8.197 4.523a1.532 1.532 0 00-1.051.196c-.318.19-.563.49-.687.85a.75.75 0 01-1.418-.49c.239-.69.71-1.274 1.335-1.648a3.032 3.032 0 012.079-.386 3.057 3.057 0 011.829 1.065 3.13 3.13 0 01.716 2c0 .487-.092.905-.275 1.266-.182.36-.431.62-.679.817-.194.156-.41.291-.581.398l-.096.06a2.507 2.507 0 00-.452.34.643.643 0 00-.172.292.75.75 0 01-1.499-.033c0-.163.035-.324.086-.479.08-.243.232-.543.515-.832.239-.243.505-.419.72-.554.044-.029.086-.056.126-.08.169-.106.296-.186.415-.282a.976.976 0 00.279-.323c.059-.117.113-.296.113-.59v-.002a1.63 1.63 0 00-.372-1.041c-.24-.29-.57-.481-.931-.544z" clip-rule="evenodd"/><path d="M8 11a1 1 0 100 2h.007a1 1 0 100-2H8z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/help/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/help/property-24.scss
index ac6480aeeeb6b..d851e9c37b1d1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/help/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/help/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-help-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M12.349 7.536c-.612-.1-1.24.01-1.77.31s-.926.765-1.125 1.308a.75.75 0 11-1.408-.516A3.995 3.995 0 019.842 6.54a4.212 4.212 0 012.75-.484c.946.156 1.81.63 2.436 1.343.627.715.973 1.624.972 2.569 0 .636-.127 1.168-.369 1.62-.24.449-.569.77-.9 1.021a8.43 8.43 0 01-.804.519l-.144.085c-.294.177-.526.329-.712.507-.185.178-.264.341-.298.441a.62.62 0 00-.028.107l-.001.007a.75.75 0 01-1.5-.025c0-.198.047-.394.111-.58a2.63 2.63 0 01.677-1.032c.318-.304.675-.529.98-.712l.177-.104a6.68 6.68 0 00.636-.409 1.64 1.64 0 00.484-.533c.107-.2.191-.482.191-.913v-.001c0-.573-.21-1.132-.6-1.578a2.628 2.628 0 00-1.551-.852z" clip-rule="evenodd"/><path d="M12 16a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/keyframes.scss
index 172378cb6d323..279efe350687e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-hexagon-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/placeholders.scss
index 5ae53c824fa33..7bab53c70c758 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-hexagon-fill-icon {
   --icon-name: icon-hexagon-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/property-16.scss
index 6894d3cc2dc4b..fbfaf61d72021 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hexagon-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M9.166.33a2.25 2.25 0 00-2.332 0l-5.25 3.182A2.25 2.25 0 00.5 5.436v5.128a2.25 2.25 0 001.084 1.924l5.25 3.182a2.25 2.25 0 002.332 0l5.25-3.182a2.25 2.25 0 001.084-1.924V5.436a2.25 2.25 0 00-1.084-1.924L9.166.33z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/property-24.scss
index 535dd35beed86..03f5da41327ca 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hexagon-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M13.441 1.006a2.75 2.75 0 00-2.882 0l-7.75 4.77A2.75 2.75 0 001.5 8.118v7.764a2.75 2.75 0 001.309 2.342l7.75 4.77a2.75 2.75 0 002.882 0l7.75-4.77a2.75 2.75 0 001.309-2.342V8.118a2.75 2.75 0 00-1.309-2.342l-7.75-4.77z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/keyframes.scss
index d656dbc26a327..237154f74cd1c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-hexagon {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/placeholders.scss
index 6ce5d7d3499e7..b079f07e42d77 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-hexagon-icon {
   --icon-name: icon-hexagon;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/property-16.scss
index e699113c7c76e..17509f0d89e7c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hexagon-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M6.834.33a2.25 2.25 0 012.332 0l5.25 3.182A2.25 2.25 0 0115.5 5.436v5.128a2.25 2.25 0 01-1.084 1.924l-5.25 3.182a2.25 2.25 0 01-2.332 0l-5.25-3.182A2.25 2.25 0 01.5 10.564V5.436a2.25 2.25 0 011.084-1.924L6.834.33zm1.555 1.283a.75.75 0 00-.778 0l-5.25 3.181A.75.75 0 002 5.436v5.128a.75.75 0 00.361.642l5.25 3.181a.75.75 0 00.778 0l5.25-3.181a.75.75 0 00.361-.642V5.436a.75.75 0 00-.361-.642l-5.25-3.181z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/property-24.scss
index 074f9fa03fb18..412adda8102d7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hexagon/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hexagon-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M10.559 1.006a2.75 2.75 0 012.882 0l7.75 4.77A2.75 2.75 0 0122.5 8.118v7.764a2.75 2.75 0 01-1.309 2.342l-7.75 4.77a2.75 2.75 0 01-2.882 0l-7.75-4.77A2.75 2.75 0 011.5 15.882V8.118a2.75 2.75 0 011.309-2.342l7.75-4.77zm2.096 1.278a1.25 1.25 0 00-1.31 0l-7.75 4.77A1.25 1.25 0 003 8.117v7.764c0 .435.225.838.595 1.065l7.75 4.77a1.25 1.25 0 001.31 0l7.75-4.77c.37-.227.595-.63.595-1.065V8.118a1.25 1.25 0 00-.595-1.065l-7.75-4.77z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/history/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/history/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/history/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/history/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/history/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/history/keyframes.scss
index 26aa7a6acb35e..254e7bb6de6fd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/history/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/history/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-history {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/history/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/history/placeholders.scss
index 2e07b43dd56fc..3ba6689108226 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/history/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/history/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-history-icon {
   --icon-name: icon-history;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/history/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/history/property-16.scss
index 4995274bb0e90..46e1f00386864 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/history/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/history/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-history-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.5 1.25a.75.75 0 011.5 0v1.851A7 7 0 111 8a.75.75 0 011.5 0 5.5 5.5 0 101.725-4H5.75a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75v-3.5z"/><path d="M8.25 4a.75.75 0 01.75.75v3.763l1.805.802a.75.75 0 01-.61 1.37l-2.25-1A.75.75 0 017.5 9V4.75A.75.75 0 018.25 4z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/history/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/history/property-24.scss
index 678bd54027180..8fd659ccf0c11 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/history/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/history/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-history-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 3.5c-2.347 0-4.471.95-6.01 2.49A8.55 8.55 0 005.125 7H8.25a.75.75 0 010 1.5h-4.5A.75.75 0 013 7.75v-4.5a.75.75 0 011.5 0v2.135A9.971 9.971 0 0112 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12a.75.75 0 011.5 0A8.5 8.5 0 1012 3.5z"/><path d="M11.75 6a.75.75 0 01.75.75v5.787l4.085 2.042a.75.75 0 11-.67 1.342l-4.5-2.25A.75.75 0 0111 13V6.75a.75.75 0 01.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/home/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/home/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/home/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/home/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/home/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/home/keyframes.scss
index a8cb08832f8f8..4e7353dba08d4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/home/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/home/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-home {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/home/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/home/placeholders.scss
index 7beb34e2d8a62..a6b1a7bba514e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/home/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/home/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-home-icon {
   --icon-name: icon-home;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/home/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/home/property-16.scss
index fe49abc3a31bc..6b3f573dc2a59 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/home/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/home/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-home-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.846 2.574a.25.25 0 01.308 0l5.25 4.12a.25.25 0 01.096.196v7.36a.75.75 0 001.5 0V6.89a1.75 1.75 0 00-.67-1.377L9.08 1.394a1.75 1.75 0 00-2.16 0l-5.25 4.12A1.75 1.75 0 001 6.89v7.36a.75.75 0 001.5 0V6.89a.25.25 0 01.096-.196l5.25-4.12z"/><path d="M6.5 14.25V10.5h3v3.75a.75.75 0 001.5 0v-4C11 9.56 10.44 9 9.75 9h-3.5C5.56 9 5 9.56 5 10.25v4a.75.75 0 001.5 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/home/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/home/property-24.scss
index 8407424c1d6ae..4f53ac1a5749a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/home/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/home/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-home-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11.847 2.819a.25.25 0 01.306 0l8.25 6.407a.25.25 0 01.097.198V21.25a.75.75 0 001.5 0V9.424c0-.54-.25-1.05-.677-1.382l-8.25-6.408a1.75 1.75 0 00-2.146 0l-8.25 6.408A1.75 1.75 0 002 9.424V21.25a.75.75 0 001.5 0V9.424a.25.25 0 01.097-.198l8.25-6.407z"/><path d="M9.5 15.75a.25.25 0 01.25-.25h4.5a.25.25 0 01.25.25v5.5a.75.75 0 001.5 0v-5.5A1.75 1.75 0 0014.25 14h-4.5A1.75 1.75 0 008 15.75v5.5a.75.75 0 001.5 0v-5.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/keyframes.scss
index 9618b3089c20a..c25da37948f46 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-hourglass {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/placeholders.scss
index f838f33961f5e..37f8832e4e092 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-hourglass-icon {
   --icon-name: icon-hourglass;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/property-16.scss
index dc8447d3b2e2b..64a7f535102e6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hourglass-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.75 12.75A.75.75 0 016.5 12h3a.75.75 0 010 1.5h-3a.75.75 0 01-.75-.75zM7.75 4.5a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/><path fill-rule="evenodd" d="M2.695 2.717A1.5 1.5 0 014.012.5h7.976a1.5 1.5 0 011.317 2.217L10.494 7.88a.25.25 0 000 .24l2.811 5.163a1.5 1.5 0 01-1.317 2.217H4.012a1.5 1.5 0 01-1.317-2.217l2.81-5.163a.25.25 0 000-.24l-2.81-5.163zM11.988 2H4.012l2.811 5.163a1.75 1.75 0 010 1.674L4.013 14h7.975L9.177 8.837a1.75 1.75 0 010-1.674L11.987 2z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/property-24.scss
index d3781e32f3a42..f01397dad9d0b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/hourglass/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-hourglass-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8 19.75a.75.75 0 01.75-.75h6.5a.75.75 0 010 1.5h-6.5a.75.75 0 01-.75-.75zM11.75 8a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/><path fill-rule="evenodd" d="M4.694 4.503C3.69 3.01 4.762 1 6.562 1h10.876c1.8 0 2.871 2.009 1.868 3.503l-4.748 7.08a.75.75 0 000 .835l4.748 7.079C20.31 20.99 19.238 23 17.438 23H6.562c-1.8 0-2.871-2.009-1.868-3.503l4.748-7.08a.75.75 0 000-.835L4.694 4.503zM6.562 2.5a.75.75 0 00-.623 1.168l4.748 7.079a2.25 2.25 0 010 2.506l-4.748 7.08a.75.75 0 00.623 1.167h10.876c.6 0 .957-.67.623-1.168l-4.748-7.079a2.25 2.25 0 010-2.506l4.748-7.08a.75.75 0 00-.623-1.167H6.562z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/keyframes.scss
index 0124a7359ee52..ca513d79c3446 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-identity-service {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/placeholders.scss
index a2fddd4931814..e4bab0af32d74 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-identity-service-icon {
   --icon-name: icon-identity-service;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/property-16.scss
index 93059f88a334e..e90ea04e7fa03 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-identity-service-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 5a4 4 0 100 8 4 4 0 000-8zm-.904 3H5.708a2.504 2.504 0 011.847-1.46A5.94 5.94 0 007.096 8zm-.068 1.5H5.55c.203.998 1 1.78 2.005 1.96a6.01 6.01 0 01-.527-1.96zm2.103 1.73a4.376 4.376 0 01-.594-1.73h1.913a2.504 2.504 0 01-1.319 1.73zM8.628 8c.107-.445.278-.862.503-1.23A2.51 2.51 0 0110.292 8H8.628z"/><path d="M4 1.25C4 .56 4.56 0 5.25 0h5.5C11.44 0 12 .56 12 1.25V2h1.75A2.25 2.25 0 0116 4.25v8.5A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75v-8.5A2.25 2.25 0 012.25 2H4v-.75zM10.75 4c.409 0 .772-.196 1-.5h2a.75.75 0 01.75.75v8.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75v-8.5a.75.75 0 01.75-.75h2c.228.304.591.5 1 .5h5.5zM5.5 2.5h5v-1h-5v1z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/property-24.scss
index f730670c55c85..8055d4cdb45c7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-service/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-identity-service-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 7.25a5.75 5.75 0 100 11.5 5.75 5.75 0 000-11.5zM9.329 12h-1.46a4.26 4.26 0 012.42-2.892A8.401 8.401 0 009.33 12zm-.055 1.5H7.78a4.254 4.254 0 002.51 3.392A8.4 8.4 0 019.275 13.5zm4.436 3.392a4.254 4.254 0 002.51-3.392h-1.494a8.4 8.4 0 01-1.016 3.392zm-.49-3.392A6.9 6.9 0 0112 16.804a6.9 6.9 0 01-1.22-3.304h2.44zm-.066-1.5h-2.308A6.9 6.9 0 0112 9.196 6.9 6.9 0 0113.154 12zm1.517 0h1.46a4.26 4.26 0 00-2.42-2.892c.492.895.819 1.875.96 2.892z"/><path d="M7 2.75C7 1.784 7.784 1 8.75 1h6.5c.966 0 1.75.784 1.75 1.75V3h3.25A2.75 2.75 0 0123 5.75v12.5A2.75 2.75 0 0120.25 21H3.75A2.75 2.75 0 011 18.25V5.75A2.75 2.75 0 013.75 3H7v-.25zM20.25 4.5H17v.25a1.75 1.75 0 01-1.75 1.75h-6.5A1.75 1.75 0 017 4.75V4.5H3.75c-.69 0-1.25.56-1.25 1.25v12.5c0 .69.56 1.25 1.25 1.25h16.5c.69 0 1.25-.56 1.25-1.25V5.75c0-.69-.56-1.25-1.25-1.25zM8.5 4.75v-2a.25.25 0 01.25-.25h6.5a.25.25 0 01.25.25v2a.25.25 0 01-.25.25h-6.5a.25.25 0 01-.25-.25z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/keyframes.scss
index 4829e9fd04ad6..0ace2e18187b9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-identity-user {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/placeholders.scss
index 13b394770b144..db0e907947def 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-identity-user-icon {
   --icon-name: icon-identity-user;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/property-16.scss
index c8651b46d55cf..ea7521357b03a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-identity-user-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.187 10.482A2.324 2.324 0 016.625 10h2.75c.515 0 1.034.16 1.438.482.41.325.687.807.687 1.359v.409a.75.75 0 01-1.5 0v-.41c0-.026-.012-.098-.119-.183a.828.828 0 00-.506-.157h-2.75a.828.828 0 00-.506.157c-.107.085-.119.157-.119.184v.409a.75.75 0 01-1.5 0v-.41c0-.55.277-1.033.687-1.358z"/><path fill-rule="evenodd" d="M8 4.5a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM7 7a1 1 0 112 0 1 1 0 01-2 0z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M5.25 0C4.56 0 4 .56 4 1.25V2H2.25A2.25 2.25 0 000 4.25v8.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-8.5A2.25 2.25 0 0013.75 2H12v-.75C12 .56 11.44 0 10.75 0h-5.5zm6.5 3.5c-.228.304-.591.5-1 .5h-5.5c-.409 0-.772-.196-1-.5h-2a.75.75 0 00-.75.75v8.5c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75v-8.5a.75.75 0 00-.75-.75h-2zm-1.25-1h-5v-1h5v1z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/property-24.scss
index 42ee606def60b..de312ce6dfa60 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/identity-user/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-identity-user-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M7.858 14.79A2.944 2.944 0 019.875 14h4.25c.748 0 1.475.28 2.017.79.543.511.858 1.216.858 1.96v.5a.75.75 0 01-1.5 0v-.5c0-.316-.133-.63-.386-.868a1.445 1.445 0 00-.989-.382h-4.25c-.379 0-.734.142-.989.382a1.193 1.193 0 00-.386.868v.5a.75.75 0 01-1.5 0v-.5c0-.744.315-1.449.858-1.96z"/><path fill-rule="evenodd" d="M12 7.5a3 3 0 100 6 3 3 0 000-6zm-1.5 3a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M8.75 1A1.75 1.75 0 007 2.75V3H3.75A2.75 2.75 0 001 5.75v12.5A2.75 2.75 0 003.75 21h16.5A2.75 2.75 0 0023 18.25V5.75A2.75 2.75 0 0020.25 3H17v-.25A1.75 1.75 0 0015.25 1h-6.5zM17 4.5h3.25c.69 0 1.25.56 1.25 1.25v12.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V5.75c0-.69.56-1.25 1.25-1.25H7v.25c0 .966.784 1.75 1.75 1.75h6.5A1.75 1.75 0 0017 4.75V4.5zm-8.5.25c0 .138.112.25.25.25h6.5a.25.25 0 00.25-.25v-2a.25.25 0 00-.25-.25h-6.5a.25.25 0 00-.25.25v2z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/image/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/image/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/image/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/image/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/image/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/image/keyframes.scss
index a14dcbbe46021..1065cbdb38bdc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/image/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/image/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-image {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/image/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/image/placeholders.scss
index 59dd2316de979..2734a5a5a03ce 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/image/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/image/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-image-icon {
   --icon-name: icon-image;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/image/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/image/property-16.scss
index 8ae7880bcf02b..f97156fcbbaeb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/image/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/image/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-image-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M5.5 3a2.5 2.5 0 100 5 2.5 2.5 0 000-5zm-1 2.5a1 1 0 112 0 1 1 0 01-2 0z"/><path d="M0 2.25A2.25 2.25 0 012.25 0h11.5A2.25 2.25 0 0116 2.25v11.5A2.25 2.25 0 0113.75 16H2.25A2.25 2.25 0 010 13.75V2.25zm14.5 0v5.94l-1.835-1.836a1.75 1.75 0 00-2.335-.125L1.5 13.336V2.25a.75.75 0 01.75-.75h11.5a.75.75 0 01.75.75zm-.75 12.25H2.446l8.825-7.103a.25.25 0 01.333.018l2.896 2.896v3.439a.75.75 0 01-.75.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/image/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/image/property-24.scss
index 906561350db3e..3db82e62860b2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/image/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/image/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-image-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M6 8.5a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0zm2.5-1a1 1 0 100 2 1 1 0 000-2z"/><path d="M2 4.75A2.75 2.75 0 014.75 2h14.5A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V4.75zm18.5 8.5v-8.5c0-.69-.56-1.25-1.25-1.25H4.75c-.69 0-1.25.56-1.25 1.25v14.5c0 .024 0 .047.002.07l10.654-8.773a2.75 2.75 0 013.644.132l2.7 2.571zM4.468 20.468l10.641-8.763a1.25 1.25 0 011.657.06l3.734 3.556v3.929c0 .69-.56 1.25-1.25 1.25H4.75c-.097 0-.191-.011-.282-.032z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/keyframes.scss
index b9f6f23234806..44e4e15a13912 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-inbox {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/placeholders.scss
index 439ecce6acff8..f804ef398a0eb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-inbox-icon {
   --icon-name: icon-inbox;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/property-16.scss
index 7ead23ffb7078..8ab1a245b3748 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-inbox-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M4.748 1a2.25 2.25 0 00-2.07 1.369L.18 8.235a2.25 2.25 0 00-.18.882v3.633A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75V9.117c0-.303-.061-.603-.18-.882L13.322 2.37A2.25 2.25 0 0011.252 1H4.748zm-.69 1.956a.75.75 0 01.69-.456h6.504c.3 0 .572.18.69.456L14.09 8H10.5a.75.75 0 00-.53.22L8.69 9.5H7.31L6.03 8.22A.75.75 0 005.5 8H1.91l2.148-5.044zM1.5 9.5v3.25c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75V9.5h-3.69l-1.28 1.28A.75.75 0 019 11H7a.75.75 0 01-.53-.22L5.19 9.5H1.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/property-24.scss
index 83d8658c3b047..40460d4d19347 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/inbox/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-inbox-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M7.202 3a2.75 2.75 0 00-2.428 1.46L1.32 10.958A2.75 2.75 0 001 12.248v6.002A2.75 2.75 0 003.75 21h16.5A2.75 2.75 0 0023 18.25v-6.002c0-.45-.11-.893-.321-1.29L19.226 4.46A2.75 2.75 0 0016.798 3H7.202zM6.098 5.164A1.25 1.25 0 017.202 4.5h9.596c.462 0 .887.255 1.104.664l3.366 6.336H16a.75.75 0 00-.624.334L13.599 14.5H10.4l-1.777-2.666A.75.75 0 008 11.5H2.732l3.366-6.336zM2.5 13v5.25c0 .69.56 1.25 1.25 1.25h16.5c.69 0 1.25-.56 1.25-1.25V13h-5.099l-1.777 2.666A.75.75 0 0114 16h-4a.75.75 0 01-.624-.334L7.599 13H2.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/index.scss
index 60f9113fe27f1..149e3e7f684d9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // @import './alert-circle-fill/index.scss';
 @import './alert-circle-outline/index.scss';
 @import './alert-triangle/index.scss';
@@ -588,6 +583,7 @@
 // @import './users/index.scss';
 // @import './vagrant/index.scss';
 // @import './vagrant-color/index.scss';
+@import './vault/index.scss';
 // @import './vault-color/index.scss';
 // @import './verified/index.scss';
 // @import './video/index.scss';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-fill/index.scss
index effd7dc669a8f..c870a21ba1d87 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../info/property-16';
         @import '../info/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-fill/keyframes.scss
index bec6bb7c618fb..4e385be01de3d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-info-circle-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-fill/placeholders.scss
index 25d037f4e91f5..865311c15257a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-info-circle-fill-icon {
   --icon-name: icon-info-circle-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-outline/index.scss
index effd7dc669a8f..c870a21ba1d87 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../info/property-16';
         @import '../info/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-outline/keyframes.scss
index 8a97355092e2b..1073762782c2c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-info-circle-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-outline/placeholders.scss
index c22c34f8326a6..14fa7f9111749 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/info-circle-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-info-circle-outline-icon {
   --icon-name: icon-info-circle-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/info/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/info/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/info/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/info/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/info/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/info/keyframes.scss
index 3a44fc11fc4be..d1e1efdf492e8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/info/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/info/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-info {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/info/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/info/placeholders.scss
index 6c295074b8a4f..97bc5a141794a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/info/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/info/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-info-icon {
   --icon-name: icon-info;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/info/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/info/property-16.scss
index 04ad914e781ca..5683b5a303dcc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/info/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/info/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-info-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 7a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 018 7zM8 4a1 1 0 000 2h.007a1 1 0 000-2H8z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/info/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/info/property-24.scss
index 8ca56b4713ee1..351f19e5f7c87 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/info/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/info/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-info-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 10.5a.75.75 0 01.75.75v5.5a.75.75 0 01-1.5 0v-5.5a.75.75 0 01.75-.75zM12 7a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/keyframes.scss
index 96cac19c245ed..1212967bbda4c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-jump-link {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/placeholders.scss
index ae264ca3bd375..b7e943372e8b4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-jump-link-icon {
   --icon-name: icon-jump-link;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/property-16.scss
index 4298c4a5d222f..d43b1773c77a6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-jump-link-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.75 2a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM1 6.25a.75.75 0 01.75-.75h3.5a.75.75 0 010 1.5h-3.5A.75.75 0 011 6.25zM1.75 9a.75.75 0 000 1.5h3.5a.75.75 0 000-1.5h-3.5zM1.75 12.5a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75zM7.49 6.2a.75.75 0 011.06.04l1.95 2.1V5.55c0-.545-.215-1.067-.597-1.451A2.024 2.024 0 008.467 3.5H7.25a.75.75 0 010-1.5h1.217c.939 0 1.838.375 2.5 1.041A3.56 3.56 0 0112 5.55v2.79l1.95-2.1a.75.75 0 111.1 1.02l-3.25 3.5a.75.75 0 01-1.1 0l-3.25-3.5a.75.75 0 01.04-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/property-24.scss
index e41a1e8ff5866..cc934ca700248 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/jump-link/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-jump-link-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3.75 4a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5zM3 9.75A.75.75 0 013.75 9h6.5a.75.75 0 010 1.5h-6.5A.75.75 0 013 9.75zM3.75 14a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5zM3.75 19a.75.75 0 000 1.5H20a.75.75 0 000-1.5H3.75zM12.952 12.238a.75.75 0 011.06-.036l2.488 2.322V8.75a3.25 3.25 0 00-3.25-3.25h-2a.75.75 0 010-1.5h2A4.75 4.75 0 0118 8.75v5.774l2.488-2.322a.75.75 0 011.024 1.096l-3.75 3.5a.75.75 0 01-1.024 0l-3.75-3.5a.75.75 0 01-.036-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/keyframes.scss
index e3bac6c29d976..9689f70e9681d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-key-values {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/placeholders.scss
index 8088cb42aaa5f..a4e40d2ce7637 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-key-values-icon {
   --icon-name: icon-key-values;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/property-16.scss
index 870f397f876a8..960fc78948c30 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-key-values-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.75 2a.75.75 0 000 1.5h1a.75.75 0 000-1.5h-1zM6.75 5.5a.75.75 0 000 1.5h3.5a.75.75 0 000-1.5h-3.5zM1 6.25a.75.75 0 01.75-.75h1.5a.75.75 0 010 1.5h-1.5A.75.75 0 011 6.25zM1.75 9a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM1 13.25a.75.75 0 01.75-.75h1.5a.75.75 0 010 1.5h-1.5a.75.75 0 01-.75-.75zM6.75 2a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5zM6 9.75A.75.75 0 016.75 9h5.5a.75.75 0 010 1.5h-5.5A.75.75 0 016 9.75zM6.75 12.5a.75.75 0 000 1.5h7.5a.75.75 0 000-1.5h-7.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/property-24.scss
index 36c6e6ebbd779..24adabfce93c4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/key-values/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-key-values-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3.75 5a.75.75 0 000 1.5h2.5a.75.75 0 000-1.5h-2.5zM10.75 9a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5zM3 9.75A.75.75 0 013.75 9h3.5a.75.75 0 010 1.5h-3.5A.75.75 0 013 9.75zM3.75 13a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM3 17.75a.75.75 0 01.75-.75h3.5a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75zM10.75 5a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5zM10 13.75a.75.75 0 01.75-.75h7.5a.75.75 0 010 1.5h-7.5a.75.75 0 01-.75-.75zM10.75 17a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/key/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/key/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/key/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/key/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/key/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/key/keyframes.scss
index 7cbe23bb711e5..f869288475d0d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/key/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/key/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-key {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/key/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/key/placeholders.scss
index 75602b6b3e36f..ba5a6f2b6b451 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/key/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/key/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-key-icon {
   --icon-name: icon-key;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/key/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/key/property-16.scss
index 4cdd4be56e6da..38966b31a4269 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/key/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/key/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-key-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M9.16 3.657A2.236 2.236 0 0110.752 3a2.248 2.248 0 11-2.078 3.11l-.001-.002a2.243 2.243 0 01.489-2.451zm1.06 1.061a.737.737 0 01.815-.16.748.748 0 01-.284 1.44.748.748 0 01-.532-1.278l.001-.002z"/><path d="M10.354 0a5.68 5.68 0 00-4.906 2.846 5.68 5.68 0 00-.466 4.555L.22 12.162a.75.75 0 00-.22.53v2.558c0 .414.336.75.75.75h2.547a.75.75 0 00.53-.22l.655-.655a1.072 1.072 0 00.311-.784v-.64h.548c.31 0 .618-.123.843-.355l.008-.008c.204-.216.324-.498.33-.801v-.556h.676c.288 0 .566-.117.767-.327l.638-.637a5.664 5.664 0 004.55-.468 5.683 5.683 0 002.798-4.152v-.001a5.68 5.68 0 00-1.602-4.742A5.619 5.619 0 0010.354 0zm-.548 1.536a4.12 4.12 0 013.482 1.178 4.18 4.18 0 011.176 3.483 4.183 4.183 0 01-2.054 3.05 4.163 4.163 0 01-3.671.221.75.75 0 00-.143-.043l-.023-.005a.806.806 0 00-.714.219l-.842.842H5.973a.951.951 0 00-.95.951v.768h-.779a.951.951 0 00-.95.952v1.04l-.308.308H1.5v-1.497L6.355 8.15c.22-.22.311-.567.174-.888a4.178 4.178 0 01.221-3.67 4.18 4.18 0 013.053-2.054h.003z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/key/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/key/property-24.scss
index 4f84f5bb189ab..1e054688e3e9a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/key/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/key/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-key-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M13.88 5.877A2.978 2.978 0 0116.001 5a2.999 2.999 0 11-2.772 4.148v-.002a2.992 2.992 0 01.651-3.27zm1.06 1.06a1.479 1.479 0 011.062-.437 1.499 1.499 0 11-1.387 2.072 1.492 1.492 0 01.324-1.633l.002-.001z"/><path d="M14.307 1.068c.34-.047.684-.068 1.021-.068 2.049 0 3.98.799 5.429 2.247a7.72 7.72 0 012.176 6.444v.001a7.725 7.725 0 01-3.8 5.642 7.697 7.697 0 01-3.811 1.012 7.653 7.653 0 01-2.553-.437l-1.04 1.04c-.225.236-.54.37-.863.37H9.6v1.089c-.008.35-.146.675-.383.926l-.007.007a1.356 1.356 0 01-.97.408H7.155v1.22c.011.323-.11.63-.331.867l-.011.012-.007.006-.926.926a.75.75 0 01-.53.22H1.75a.75.75 0 01-.75-.75v-3.616a.75.75 0 01.22-.53l6.869-6.868a7.719 7.719 0 01.572-6.369 7.72 7.72 0 015.646-3.799zm.203 1.486c.267-.037.543-.054.818-.054 1.651 0 3.2.641 4.368 1.807a6.22 6.22 0 011.75 5.185 6.225 6.225 0 01-3.057 4.54 6.173 6.173 0 01-5.464.33.833.833 0 00-.904.175l-1.282 1.281H9.135c-.578 0-1.034.47-1.034 1.034v1.397H6.69c-.578 0-1.035.47-1.035 1.034v1.6l-.616.617H2.5v-2.555l6.955-6.954a.831.831 0 00.18-.915 6.217 6.217 0 01.328-5.464 6.22 6.22 0 014.544-3.057h.003z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/keyframes.scss
index 928bf58740232..c29063783a5d0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-keychain {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/placeholders.scss
index 603db4bd157b1..95321665737b0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-keychain-icon {
   --icon-name: icon-keychain;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/property-16.scss
index b008be4fca8e0..092f7f2202ba7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-keychain-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M10.027 1.14a2.708 2.708 0 114.139 3.49l-1.864 2.097a2.125 2.125 0 11-1.074-1.05l.614-.69a3.112 3.112 0 00-4.368 4.18.75.75 0 01-.11.897L4 13.553v.947h1.25v-1a.75.75 0 01.75-.75h.894l1.569-1.918a.75.75 0 01.799-.242 3.112 3.112 0 004.02-2.978.75.75 0 011.5 0 4.612 4.612 0 01-5.457 4.535l-1.494 1.828a.75.75 0 01-.581.275h-.5v1A.75.75 0 016 16H3.25a.75.75 0 01-.75-.75V14H.75a.75.75 0 01-.75-.75v-2a.75.75 0 01.21-.52l3.208-3.328a4.612 4.612 0 016.327-5.91l.282-.352zm-.56 1.913a.755.755 0 01-.118-.062 3.112 3.112 0 00-4.515 3.906c.202.445.165 1.026-.231 1.438L1.5 11.553v.947h1.431l2.987-3.098a4.613 4.613 0 013.549-6.35zm.987-.044c.889.054 1.71.36 2.393.847l.197-.222A1.208 1.208 0 1011.2 2.077l-.745.932zm-.079 3.99a.625.625 0 100 1.25.625.625 0 000-1.25z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/property-24.scss
index 2cb960e4f01f9..82c5323806847 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/keychain/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-keychain-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M20.483 2.485a1.295 1.295 0 00-1.595.188l-.582.581c.787.228 1.514.6 2.147 1.086l.24-.255a1.04 1.04 0 00-.21-1.6zm-1.067 2.953A5 5 0 0011.5 9.5c0 .448.089.865.226 1.312.068.221.145.442.229.682l.005.016c.085.241.175.5.258.772a.75.75 0 01-.188.748l-5.78 5.78v1.69h1.94l.56-.56V18.5a.75.75 0 01.75-.75h1.25V16.5a.75.75 0 01.75-.75h1.69l1.28-1.28a.75.75 0 01.711-.198c.465.116.946.228 1.319.228a5 5 0 005-5 .75.75 0 011.5 0 6.5 6.5 0 01-6.5 6.5c-.422 0-.883-.085-1.267-.172L14.03 17.03a.75.75 0 01-.53.22h-1.25v1.25a.75.75 0 01-.75.75h-1.25v1a.75.75 0 01-.22.53l-1 1a.75.75 0 01-.53.22H1.75a.75.75 0 01-.75-.75v-2.79a.75.75 0 01.218-.529l5.168-5.193a6.887 6.887 0 01-.636-2.901C5.75 6.07 8.762 3 12.5 3h3.941l.029-.03 1.357-1.358a2.795 2.795 0 013.442-.404 2.54 2.54 0 01.515 3.907l-2.727 2.888a2.75 2.75 0 11-1.129-.988.7.7 0 01.027-.03l1.461-1.547zm-7.072-.936c-2.818.084-5.094 2.43-5.094 5.335 0 .975.257 1.887.704 2.672a.75.75 0 01-.12.9L2.5 18.77V20.5h2.25v-2a.75.75 0 01.22-.53l5.675-5.675a45.553 45.553 0 00-.1-.29l-.01-.027c-.08-.232-.166-.477-.243-.726-.16-.523-.292-1.098-.292-1.752 0-2.01.912-3.805 2.344-4.998zM16.75 8.25a1.25 1.25 0 100 2.5 1.25 1.25 0 000-2.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/keyframes.scss
index 91aff0f429e67..03a108f11b6a1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-kubernetes-color {
   100% {
     background-image: var(--icon-kubernetes-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/placeholders.scss
index b539a99d40f89..d0af034ee4494 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-kubernetes-color-icon {
   --icon-name: icon-kubernetes-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/property-16.scss
index 84fd156cac1ce..b01a511c57243 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-kubernetes-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23326DE6" d="M4.5 14.569c.214.278.539.431.874.431h5.251c.335 0 .66-.165.875-.434l3.258-4.178c.214-.278.288-.633.214-.978l-1.165-5.207a1.128 1.128 0 00-.606-.777l-4.714-2.31A1.062 1.062 0 008.002 1c-.168 0-.335.038-.485.115l-4.715 2.32a1.129 1.129 0 00-.605.777L1.032 9.42c-.084.345 0 .7.214.978L4.5 14.568z"/><path fill="%23fff" fill-rule="evenodd" d="M12.741 9.128c.098.003.196.01.293.024l.058.013.031.008a.308.308 0 01.26.371.306.306 0 01-.396.223h-.004l-.003-.001-.003-.001a1.58 1.58 0 00-.08-.017 2.55 2.55 0 01-.274-.106 2.867 2.867 0 00-.533-.156.243.243 0 00-.171.063 4.656 4.656 0 00-.131-.023 3.971 3.971 0 01-1.764 2.212c.015.042.032.083.051.123a.239.239 0 00-.023.18c.074.17.165.332.271.484.06.078.114.16.164.244l.028.057.012.025a.305.305 0 01-.132.434.31.31 0 01-.354-.066.307.307 0 01-.067-.107l-.01-.021a1.57 1.57 0 01-.028-.058 2.553 2.553 0 01-.089-.28 2.834 2.834 0 00-.21-.512.242.242 0 00-.156-.095 6.199 6.199 0 01-.03-.053l-.035-.064a3.97 3.97 0 01-2.823-.007l-.07.125a.249.249 0 00-.132.064 2.13 2.13 0 00-.237.548 2.518 2.518 0 01-.088.28l-.025.05-.013.027v.001a.306.306 0 01-.421.173.307.307 0 01-.132-.434l.014-.03.026-.052c.05-.085.104-.166.164-.244.108-.156.2-.322.277-.496a.302.302 0 00-.028-.173l.056-.133A3.972 3.972 0 014.22 9.532l-.134.023a.34.34 0 00-.176-.062 2.872 2.872 0 00-.533.156c-.09.04-.181.075-.274.105l-.05.011-.03.007H3.02l-.002.002h-.005a.308.308 0 01-.397-.349.306.306 0 01.261-.245l.005-.001h.002l.006-.002c.024-.006.054-.014.076-.018.097-.013.195-.021.293-.023.186-.013.37-.043.549-.09a.422.422 0 00.131-.133l.128-.037a3.938 3.938 0 01.625-2.752l-.098-.087a.338.338 0 00-.062-.176 2.854 2.854 0 00-.455-.319 2.557 2.557 0 01-.254-.148l-.048-.038-.015-.012-.004-.004a.323.323 0 01-.076-.45.295.295 0 01.244-.107.365.365 0 01.213.08l.022.017c.016.013.034.026.046.037.072.067.139.139.202.213.125.137.263.262.412.372.056.03.121.036.182.018l.11.078a3.938 3.938 0 012.552-1.224l.008-.129a.332.332 0 00.099-.157 2.844 2.844 0 00-.034-.554 2.56 2.56 0 01-.042-.29v-.082-.004A.306.306 0 018 2.82a.308.308 0 01.306.337v.087a2.529 2.529 0 01-.041.29 2.85 2.85 0 00-.035.553.242.242 0 00.1.153v.007l.007.13c.967.087 1.87.522 2.54 1.223l.116-.083a.34.34 0 00.186-.02c.149-.11.287-.235.412-.373.063-.074.13-.146.202-.213l.051-.04.017-.014a.307.307 0 11.381.477l-.024.02c-.015.012-.03.025-.043.034a2.537 2.537 0 01-.254.148 2.87 2.87 0 00-.455.32.241.241 0 00-.058.172l-.05.044-.058.053c.542.806.77 1.783.637 2.745l.123.036c.031.056.077.101.133.132.179.048.363.078.548.09zM7.291 5.24c.107-.024.216-.043.326-.056l-.09 1.6-.008.004a.268.268 0 01-.293.256.27.27 0 01-.135-.05l-.002.001-1.316-.93c.419-.41.945-.696 1.518-.825zm1.618 1.75l1.308-.924a3.182 3.182 0 00-1.833-.882l.09 1.598h.002a.268.268 0 00.294.256.27.27 0 00.135-.05l.004.002zm2.248 1.656l-1.548-.445-.002-.006a.27.27 0 01-.185-.343.27.27 0 01.08-.12L9.5 7.73l1.195-1.067c.366.594.527 1.29.46 1.983zM9.096 9.5l.618 1.49a3.148 3.148 0 001.275-1.598l-1.593-.269-.002.004a.26.26 0 00-.166.022.27.27 0 00-.13.348l-.002.003zm-.385 1.905c-.573.13-1.17.1-1.727-.088l.777-1.4h.001a.27.27 0 01.475-.001h.006l.779 1.402a3.286 3.286 0 01-.311.087zm-2.418-.422l.611-1.474-.004-.006a.268.268 0 00-.297-.37L6.6 9.13l-1.579.267a3.16 3.16 0 001.272 1.586zm-.997-4.32l1.201 1.071-.001.007a.269.269 0 01-.106.462l-.001.005-1.54.443a3.134 3.134 0 01.447-1.988zm2.95 1.154h-.492l-.307.38.11.476.443.213.442-.212.11-.476-.306-.381z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/property-24.scss
index 8006da3cab0f5..f82968aded721 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-kubernetes-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23326DE6" d="M7 21.384c.306.397.77.616 1.249.616h7.501c.48 0 .944-.236 1.25-.62l4.654-5.969a1.69 1.69 0 00.306-1.397l-1.664-7.439a1.612 1.612 0 00-.865-1.11l-6.736-3.3A1.517 1.517 0 0012.003 2c-.24 0-.48.055-.692.164L4.575 5.48c-.44.22-.759.617-.865 1.11l-1.664 7.438c-.12.494 0 1 .306 1.398L7 21.384z"/><path fill="%23fff" fill-rule="evenodd" d="M18.773 13.612c.14.003.28.014.419.033a1.424 1.424 0 01.127.03.439.439 0 01.294.695.437.437 0 01-.488.155l-.007-.001-.004-.002-.004-.001-.043-.01-.07-.014a3.664 3.664 0 01-.392-.151 4.094 4.094 0 00-.762-.224.346.346 0 00-.245.09 6.82 6.82 0 00-.187-.032 5.674 5.674 0 01-2.52 3.16c.021.06.046.119.074.176a.342.342 0 00-.034.257c.106.243.236.474.388.692.084.111.162.227.234.347l.04.082.017.036a.437.437 0 01-.545.629.44.44 0 01-.245-.257l-.015-.03-.04-.082a3.625 3.625 0 01-.126-.4 4.058 4.058 0 00-.3-.732.346.346 0 00-.223-.135l-.043-.076-.05-.092c-1.3.491-2.736.488-4.034-.01l-.099.179a.356.356 0 00-.188.091 3.044 3.044 0 00-.339.783 3.6 3.6 0 01-.126.4l-.035.073-.019.037v.002a.437.437 0 01-.602.248.439.439 0 01-.188-.621l.02-.043.036-.075c.072-.12.15-.236.235-.348.154-.223.286-.46.395-.709a.432.432 0 00-.039-.246l.08-.19a5.674 5.674 0 01-2.52-3.138l-.191.033a.485.485 0 00-.251-.088c-.261.05-.516.124-.762.223a3.683 3.683 0 01-.392.15l-.071.016c-.015.003-.03.006-.042.01h-.005l-.004.002h-.006a.44.44 0 01-.568-.498.437.437 0 01.374-.35l.006-.002.004-.001.008-.002c.035-.009.077-.02.108-.025.14-.02.28-.03.42-.034.264-.017.527-.06.783-.129a.603.603 0 00.188-.188l.183-.053a5.626 5.626 0 01.892-3.931l-.14-.125a.483.483 0 00-.088-.251 4.077 4.077 0 00-.65-.456 3.655 3.655 0 01-.363-.212 1.61 1.61 0 01-.069-.055l-.02-.017-.008-.005a.462.462 0 01-.107-.642.42.42 0 01.348-.154.522.522 0 01.305.115l.03.024.067.053c.102.096.198.198.288.305.178.195.376.373.589.53.08.042.173.051.26.026.051.037.104.075.157.111A5.626 5.626 0 0111.52 6.82l.01-.184a.474.474 0 00.142-.225c.01-.265-.007-.53-.049-.79a3.644 3.644 0 01-.06-.415l.001-.076V5.089v-.007a.437.437 0 01.615-.444.44.44 0 01.259.444v.046c.001.027.002.056 0 .078-.011.139-.031.277-.059.414a4.063 4.063 0 00-.05.79.345.345 0 00.143.218v.011l.01.184A5.734 5.734 0 0116.11 8.57l.166-.119c.09.016.181.006.265-.028.213-.158.41-.336.59-.532.09-.107.186-.209.288-.305l.073-.058.024-.019a.44.44 0 11.544.682l-.035.028-.061.05a3.634 3.634 0 01-.363.21c-.231.13-.449.283-.65.456a.344.344 0 00-.082.247 8.03 8.03 0 01-.155.138 5.65 5.65 0 01.91 3.922l.177.051a.49.49 0 00.188.19c.257.068.52.11.784.128zm-7.786-5.554a4.64 4.64 0 01.466-.08l-.13 2.285-.01.005a.383.383 0 01-.419.366.386.386 0 01-.192-.072l-.004.003-1.88-1.33a4.505 4.505 0 012.169-1.177zm2.312 2.5l1.867-1.321a4.546 4.546 0 00-2.618-1.26l.13 2.283h.002a.383.383 0 00.42.366.386.386 0 00.192-.072l.007.003zm3.21 2.365l-2.21-.635-.003-.01a.386.386 0 01-.264-.489.385.385 0 01.113-.17v-.005l1.706-1.523a4.56 4.56 0 01.658 2.832zm-2.944 1.22l.883 2.127a4.497 4.497 0 001.822-2.282l-2.275-.383-.004.004a.37.37 0 00-.236.032.385.385 0 00-.187.498l-.003.004zm-.55 2.721a4.531 4.531 0 01-2.466-.126l1.11-2h.001a.386.386 0 01.679-.001h.008l1.113 2.004c-.145.048-.293.089-.445.123zm-3.454-.602l.874-2.106-.007-.009a.383.383 0 00-.424-.528l-.003-.005-2.256.382c.338.934.977 1.73 1.816 2.266zM8.137 10.09l1.716 1.53-.002.01a.384.384 0 01-.151.66l-.002.007-2.2.633c-.11-.991.115-1.99.639-2.84zm4.214 1.648h-.703l-.438.544.157.68.633.303.631-.302.157-.68-.437-.545z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/index.scss
index 52c6772255054..8e0a44695e941 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../kubernetes-color/property-16';
         @import '../kubernetes-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/keyframes.scss
index c2a9eb5bbfbd8..cf30e7ee4ea93 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-kubernetes {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/placeholders.scss
index 84ed7d5a7e6b2..8877056600114 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-kubernetes-icon {
   --icon-name: icon-kubernetes;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/property-16.scss
index 1c3be7ac886b4..1638cb80ca037 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-kubernetes-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M5.374 15c-.335 0-.66-.153-.874-.431l-3.254-4.172a1.15 1.15 0 01-.214-.978l1.165-5.207c.074-.345.298-.623.605-.776l4.715-2.32c.15-.078.317-.116.485-.116.168 0 .335.038.485.115L13.2 3.426c.308.153.532.432.606.777l1.165 5.207c.074.345 0 .7-.214.978L11.5 14.566c-.214.268-.54.434-.875.434h-5.25zm7.718-5.835l.031.008a.308.308 0 01.26.371.306.306 0 01-.396.223h-.004l-.003-.001-.003-.001-.03-.007-.05-.01a2.548 2.548 0 01-.274-.106 2.87 2.87 0 00-.533-.156.242.242 0 00-.171.063 4.76 4.76 0 00-.131-.023 3.972 3.972 0 01-1.764 2.212c.015.042.032.083.051.123a.239.239 0 00-.023.18c.074.17.165.332.271.484.06.078.114.16.164.244l.028.057.012.025a.306.306 0 01-.381.44.307.307 0 01-.172-.18 2.608 2.608 0 00-.01-.02l-.028-.058a2.545 2.545 0 01-.089-.28 2.835 2.835 0 00-.21-.512.242.242 0 00-.156-.095 5.926 5.926 0 01-.03-.053l-.035-.064a3.97 3.97 0 01-2.824-.007l-.069.125a.249.249 0 00-.132.064c-.104.17-.184.355-.237.548a2.525 2.525 0 01-.088.28l-.025.05-.013.027v.001a.307.307 0 11-.553-.261l.014-.03.026-.052c.05-.085.104-.166.164-.244.108-.156.2-.322.277-.496a.302.302 0 00-.028-.173l.056-.133A3.972 3.972 0 014.22 9.532l-.134.023a.34.34 0 00-.176-.062 2.872 2.872 0 00-.533.156c-.09.04-.181.075-.274.105l-.05.011-.03.007H3.02l-.002.002h-.005a.308.308 0 01-.397-.349.306.306 0 01.261-.245l.004-.001h.003l.006-.002c.024-.006.054-.014.076-.018.097-.013.195-.021.293-.023.186-.013.37-.043.549-.09a.422.422 0 00.131-.133l.128-.037a3.938 3.938 0 01.624-2.752l-.097-.087a.338.338 0 00-.062-.176 2.854 2.854 0 00-.455-.319 2.557 2.557 0 01-.254-.148 1.129 1.129 0 01-.063-.05l-.004-.004a.323.323 0 01-.076-.45.295.295 0 01.244-.107.365.365 0 01.213.08l.022.017c.016.013.034.026.046.037.071.067.139.139.202.213.125.137.263.262.412.372.056.03.121.036.182.018l.11.078a3.938 3.938 0 012.552-1.224l.007-.129a.332.332 0 00.1-.157 2.844 2.844 0 00-.034-.554 2.555 2.555 0 01-.042-.29v-.053-.025-.004-.004A.306.306 0 018 2.82a.308.308 0 01.306.337v.087a2.53 2.53 0 01-.041.29 2.85 2.85 0 00-.035.553.242.242 0 00.1.153v.007l.007.13c.967.087 1.87.522 2.54 1.223l.116-.083a.34.34 0 00.186-.02c.149-.11.287-.235.412-.373a2.53 2.53 0 01.202-.213l.051-.04.017-.014a.308.308 0 01.472.388.307.307 0 01-.09.09c-.008.005-.017.012-.025.02l-.043.033a2.549 2.549 0 01-.254.148 2.865 2.865 0 00-.455.32.24.24 0 00-.058.172 4.458 4.458 0 01-.05.044l-.058.053c.542.806.769 1.783.637 2.745l.123.036c.031.056.077.101.132.132.18.048.364.078.55.09.097.003.195.01.292.024l.058.013zm-2.875-3.1l-1.308.925-.004-.002a.27.27 0 01-.43-.205v-.001l-.091-1.598a3.183 3.183 0 011.833.882zM7.754 7.818h.492l.306.381-.11.476L8 8.886l-.443-.213-.11-.475.307-.381zM7.29 5.24c.107-.024.216-.043.326-.056l-.09 1.6-.008.004a.268.268 0 01-.293.256.27.27 0 01-.135-.05l-.002.001-1.316-.93c.419-.41.945-.696 1.518-.825zM5.296 6.663l1.201 1.071-.001.007a.269.269 0 01-.106.462l-.001.005-1.54.443a3.134 3.134 0 01.447-1.988zm1.608 2.846l-.612 1.474a3.16 3.16 0 01-1.27-1.586L6.6 9.13l.003.003a.265.265 0 01.18.029.27.27 0 01.117.341l.004.006zm1.806 1.896c-.572.13-1.17.1-1.726-.088l.777-1.4h.001a.27.27 0 01.475-.001h.006l.779 1.402a3.286 3.286 0 01-.312.087zm1.004-.416L9.096 9.5l.001-.003a.269.269 0 01.296-.37l.003-.004 1.593.269a3.147 3.147 0 01-1.275 1.597zm1.442-2.343L9.61 8.201l-.002-.006a.27.27 0 01-.185-.343.27.27 0 01.08-.12L9.5 7.73l1.195-1.067c.366.594.527 1.29.46 1.983z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/property-24.scss
index 87edb7b27fa4a..c1cfc2d108d21 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/kubernetes/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-kubernetes-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M5.374 15c-.335 0-.66-.153-.874-.431l-3.254-4.172a1.15 1.15 0 01-.214-.978l1.165-5.207c.074-.345.298-.623.605-.776l4.715-2.32c.15-.078.317-.116.485-.116.168 0 .335.038.485.115L13.2 3.426c.308.153.532.432.606.777l1.165 5.207c.074.345 0 .7-.214.978L11.5 14.566c-.214.268-.54.434-.875.434h-5.25zm7.718-5.835l.031.008a.308.308 0 01.26.371.306.306 0 01-.396.223h-.004l-.003-.001-.003-.001-.03-.007-.05-.01a2.548 2.548 0 01-.274-.106 2.87 2.87 0 00-.533-.156.242.242 0 00-.171.063 4.76 4.76 0 00-.131-.023 3.972 3.972 0 01-1.764 2.212c.015.042.032.083.051.123a.239.239 0 00-.023.18c.074.17.165.332.271.484.06.078.114.16.164.244l.028.057.012.025a.306.306 0 01-.381.44.307.307 0 01-.172-.18 2.608 2.608 0 00-.01-.02l-.028-.058a2.545 2.545 0 01-.089-.28 2.835 2.835 0 00-.21-.512.242.242 0 00-.156-.095 5.926 5.926 0 01-.03-.053l-.035-.064a3.97 3.97 0 01-2.824-.007l-.069.125a.249.249 0 00-.132.064c-.104.17-.184.355-.237.548a2.525 2.525 0 01-.088.28l-.025.05-.013.027v.001a.307.307 0 11-.553-.261l.014-.03.026-.052c.05-.085.104-.166.164-.244.108-.156.2-.322.277-.496a.302.302 0 00-.028-.173l.056-.133A3.972 3.972 0 014.22 9.532l-.134.023a.34.34 0 00-.176-.062 2.872 2.872 0 00-.533.156c-.09.04-.181.075-.274.105l-.05.011-.03.007H3.02l-.002.002h-.005a.308.308 0 01-.397-.349.306.306 0 01.261-.245l.004-.001h.003l.006-.002c.024-.006.054-.014.076-.018.097-.013.195-.021.293-.023.186-.013.37-.043.549-.09a.422.422 0 00.131-.133l.128-.037a3.938 3.938 0 01.624-2.752l-.097-.087a.338.338 0 00-.062-.176 2.854 2.854 0 00-.455-.319 2.557 2.557 0 01-.254-.148 1.129 1.129 0 01-.063-.05l-.004-.004a.323.323 0 01-.076-.45.295.295 0 01.244-.107.365.365 0 01.213.08l.022.017c.016.013.034.026.046.037.071.067.139.139.202.213.125.137.263.262.412.372.056.03.121.036.182.018l.11.078a3.938 3.938 0 012.552-1.224l.007-.129a.332.332 0 00.1-.157 2.844 2.844 0 00-.034-.554 2.555 2.555 0 01-.042-.29v-.053-.025-.004-.004A.306.306 0 018 2.82a.308.308 0 01.306.337v.087a2.53 2.53 0 01-.041.29 2.85 2.85 0 00-.035.553.242.242 0 00.1.153v.007l.007.13c.967.087 1.87.522 2.54 1.223l.116-.083a.34.34 0 00.186-.02c.149-.11.287-.235.412-.373a2.53 2.53 0 01.202-.213l.051-.04.017-.014a.308.308 0 01.472.388.307.307 0 01-.09.09c-.008.005-.017.012-.025.02l-.043.033a2.549 2.549 0 01-.254.148 2.865 2.865 0 00-.455.32.24.24 0 00-.058.172 4.458 4.458 0 01-.05.044l-.058.053c.542.806.769 1.783.637 2.745l.123.036c.031.056.077.101.132.132.18.048.364.078.55.09.097.003.195.01.292.024l.058.013zm-2.875-3.1l-1.308.925-.004-.002a.27.27 0 01-.43-.205v-.001l-.091-1.598a3.183 3.183 0 011.833.882zM7.754 7.818h.492l.306.381-.11.476L8 8.886l-.443-.213-.11-.475.307-.381zM7.29 5.24c.107-.024.216-.043.326-.056l-.09 1.6-.008.004a.268.268 0 01-.293.256.27.27 0 01-.135-.05l-.002.001-1.316-.93c.419-.41.945-.696 1.518-.825zM5.296 6.663l1.201 1.071-.001.007a.269.269 0 01-.106.462l-.001.005-1.54.443a3.134 3.134 0 01.447-1.988zm1.608 2.846l-.612 1.474a3.16 3.16 0 01-1.27-1.586L6.6 9.13l.003.003a.265.265 0 01.18.029.27.27 0 01.117.341l.004.006zm1.806 1.896c-.572.13-1.17.1-1.726-.088l.777-1.4h.001a.27.27 0 01.475-.001h.006l.779 1.402a3.286 3.286 0 01-.312.087zm1.004-.416L9.096 9.5l.001-.003a.269.269 0 01.296-.37l.003-.004 1.593.269a3.147 3.147 0 01-1.275 1.597zm1.442-2.343L9.61 8.201l-.002-.006a.27.27 0 01-.185-.343.27.27 0 01.08-.12L9.5 7.73l1.195-1.067c.366.594.527 1.29.46 1.983z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/keyframes.scss
index c892686888fb5..480d534c21291 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-labyrinth {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/placeholders.scss
index 0112c32ae86a0..2e7df36e5077f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-labyrinth-icon {
   --icon-name: icon-labyrinth;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/property-16.scss
index f023de2b48a05..d784757deb036 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-labyrinth-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8 1.5a6.502 6.502 0 00-6.392 5.317.75.75 0 11-1.476-.27 8 8 0 110 2.907.75.75 0 011.476-.272A6.502 6.502 0 0014.48 8.5h-1.555a4.95 4.95 0 11-6.34-5.231.7.7 0 11.4 1.342A3.558 3.558 0 004.595 7h1.167a2.45 2.45 0 113.87 2.826.7.7 0 01-.933-1.043 1.05 1.05 0 10-1.4 0 .7.7 0 01-.934 1.043A2.45 2.45 0 015.601 8.5H4.483a3.55 3.55 0 104.531-3.89.7.7 0 01.4-1.341 4.958 4.958 0 013.432 3.73h1.578A6.501 6.501 0 008 1.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/property-24.scss
index 2ad7916d01b0d..690ae358f7050 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/labyrinth/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-labyrinth-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M1.694 10.094C2.59 5.216 6.864 1.52 12 1.52c5.45 0 9.929 4.16 10.432 9.479h-2.525a7.977 7.977 0 00-5.63-6.639.75.75 0 10-.428 1.438A6.469 6.469 0 115.55 12.5h2.543c.122.964.593 1.82 1.28 2.435a.75.75 0 101.001-1.118 2.437 2.437 0 113.25 0 .75.75 0 001 1.118A3.938 3.938 0 108.19 11H5.609a6.477 6.477 0 014.543-5.201.75.75 0 10-.427-1.438 7.969 7.969 0 1010.23 8.139h2.513c-.26 5.555-4.847 9.98-10.467 9.98-5.136 0-9.41-3.697-10.306-8.574a.75.75 0 00-1.476.271C1.243 19.754 6.127 23.98 12 23.98c6.616 0 11.98-5.363 11.98-11.98C23.98 5.385 18.615.022 12 .022 6.127.02 1.243 4.246.218 9.823a.75.75 0 101.476.27z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/layers/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/layers/index.scss
index 6978954c45263..d2a936e49215d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/layers/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/layers/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../layers/property-16';
         @import '../layers/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/layers/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/layers/keyframes.scss
index 4a4594b46ebe0..582abb82a64e0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/layers/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/layers/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-layers {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/layers/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/layers/placeholders.scss
index e1f737c26f62a..899a8427031e9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/layers/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/layers/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-layers-icon {
   --icon-name: icon-layers;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/layers/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/layers/property-16.scss
index 314a738700a8d..55a1bb802edda 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/layers/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/layers/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-layers-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M7.656.084a.75.75 0 01.689 0l7.25 3.75a.75.75 0 010 1.332l-7.25 3.75a.75.75 0 01-.69 0l-7.25-3.75a.75.75 0 010-1.332l7.25-3.75zM2.383 4.5L8 7.405 13.617 4.5 8 1.594 2.383 4.5z" clip-rule="evenodd"/><path d="M.093 10.887a.75.75 0 011.02-.294L8 14.393l6.888-3.8a.75.75 0 11.724 1.313l-7.25 4a.75.75 0 01-.724 0l-7.25-4a.75.75 0 01-.295-1.019z"/><path d="M1.112 7.093a.75.75 0 00-.724 1.313l7.25 4a.75.75 0 00.724 0l7.25-4a.75.75 0 00-.724-1.313L8 10.893l-6.888-3.8z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/layers/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/layers/property-24.scss
index 3ca8e7207385f..efbd769902026 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/layers/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/layers/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-layers-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M11.658 1.082a.75.75 0 01.684 0l10.25 5.25a.75.75 0 010 1.336l-10.25 5.25a.75.75 0 01-.684 0l-10.25-5.25a.75.75 0 010-1.336l10.25-5.25zM3.395 7L12 11.407 20.605 7 12 2.593 3.395 7z" clip-rule="evenodd"/><path d="M1.089 16.395a.75.75 0 011.016-.306L12 21.399l9.895-5.31a.75.75 0 01.71 1.322l-10.25 5.5a.75.75 0 01-.71 0l-10.25-5.5a.75.75 0 01-.306-1.016z"/><path d="M2.105 11.089a.75.75 0 00-.71 1.322l10.25 5.5a.75.75 0 00.71 0l10.25-5.5a.75.75 0 00-.71-1.322L12 16.399l-9.895-5.31z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/layout/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/layout/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/layout/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/layout/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/layout/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/layout/keyframes.scss
index 0c4e58e0fbe32..7be86e4d2b22f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/layout/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/layout/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-layout {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/layout/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/layout/placeholders.scss
index 1edf58d8a9cc3..cc6668f596fc1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/layout/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/layout/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-layout-icon {
   --icon-name: icon-layout;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/layout/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/layout/property-16.scss
index 839545bf9fe3c..d21b5786167c0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/layout/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/layout/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-layout-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h9.5A2.25 2.25 0 0115 3.25v9.5A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-9.5zM6.5 13.5h6.25a.75.75 0 00.75-.75V6.5h-7v7zM5 6.5v7H3.25a.75.75 0 01-.75-.75V6.5H5zM13.5 5V3.25a.75.75 0 00-.75-.75h-9.5a.75.75 0 00-.75.75V5h11z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/layout/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/layout/property-24.scss
index 260de64d168b8..7394371287d02 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/layout/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/layout/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-layout-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h14.5A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V4.75zM9 20.5h10.25c.69 0 1.25-.56 1.25-1.25V9.5H9v11zm-1.5-11v11H4.75c-.69 0-1.25-.56-1.25-1.25V9.5h4zm13-1.5V4.75c0-.69-.56-1.25-1.25-1.25H4.75c-.69 0-1.25.56-1.25 1.25V8h17z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/keyframes.scss
index 96fe539b683a9..00fe1c0d8f4a4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-learn-link {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/placeholders.scss
index f4ca3ccacdd8a..037f5bd008d12 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-learn-link-icon {
   --icon-name: icon-learn-link;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/property-16.scss
index 678229de2b3e2..0a92675b5b59c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-learn-link-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M12.75 0a.75.75 0 000 1.5h.69l-1.97 1.97a.75.75 0 001.06 1.06l1.97-1.97v.69a.75.75 0 001.5 0V.75a.75.75 0 00-.75-.75h-2.5z"/><path fill-rule="evenodd" d="M8.075 4.074a.75.75 0 00-.65 0l-6.75 3.25a.75.75 0 000 1.352L2 9.314v3.511a.75.75 0 00.064.302l.686-.302c-.686.302-.686.304-.686.304l.002.004.003.006.006.013a1.268 1.268 0 00.075.139c.047.08.116.184.21.303.19.238.483.533.917.82.871.575 2.265 1.086 4.45 1.086 2.177 0 3.487-.508 4.271-1.122.39-.305.632-.623.78-.884a2.194 2.194 0 00.19-.447l.01-.041.004-.017.001-.007.001-.003v-.001s0-.002-.734-.153l.735.151c.01-.05.015-.1.015-.151v-3.27l1.825-.88a.75.75 0 000-1.35l-6.75-3.25zm3.425 6.203l-3.425 1.649a.75.75 0 01-.65 0L3.5 10.036v2.579l.033.043c.098.123.276.309.57.504.585.386 1.679.838 3.623.838 1.95 0 2.902-.454 3.348-.803.225-.176.34-.34.396-.44a.878.878 0 00.03-.057v-2.423zm-3.75.14L2.729 8 7.75 5.582 12.771 8 7.75 10.418z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/property-24.scss
index f3ab12182d898..58271e1a15970 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/learn-link/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-learn-link-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M18.75 1a.75.75 0 000 1.5h1.69l-2.97 2.97a.75.75 0 001.06 1.06l2.97-2.97v1.69a.75.75 0 001.5 0v-3.5a.75.75 0 00-.75-.75h-3.5z"/><path fill-rule="evenodd" d="M11.856 5.09a.75.75 0 00-.712 0l-9.75 5.25a.75.75 0 000 1.32l2.627 1.415A.752.752 0 004 13.25v5.333a.75.75 0 00.067.31l.683-.31-.683.31v.002l.002.003.003.006.007.016a1.657 1.657 0 00.094.168c.061.101.151.234.277.387.251.308.643.694 1.23 1.072C6.857 21.306 8.772 22 11.82 22c3.043 0 4.827-.692 5.87-1.487.52-.397.838-.806 1.029-1.138a2.714 2.714 0 00.244-.557c.005-.018.01-.034.012-.048l.005-.018.001-.007.001-.004v-.001s0-.002-.733-.157l.734.155a.752.752 0 00.016-.155V13.25c0-.06-.007-.12-.02-.175l2.626-1.415a.75.75 0 000-1.32l-9.75-5.25zM17.5 13.87l-5.644 3.04a.75.75 0 01-.712 0L5.5 13.87v4.508c.028.04.064.09.11.146.158.192.434.472.882.761.892.575 2.513 1.214 5.33 1.214 2.823 0 4.253-.641 4.959-1.18a2.41 2.41 0 00.64-.695c.039-.067.064-.121.079-.159v-4.595zm-6 1.527L3.332 11 11.5 6.602 19.668 11 11.5 15.398z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/learn/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/learn/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/learn/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/learn/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/learn/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/learn/keyframes.scss
index 05f3e40a61e13..7d5dd4c66b432 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/learn/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/learn/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-learn {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/learn/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/learn/placeholders.scss
index 1dccf3b78be51..85c48fd35ded5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/learn/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/learn/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-learn-icon {
   --icon-name: icon-learn;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/learn/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/learn/property-16.scss
index 9e96ca32e7a60..b329cae7ee9cc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/learn/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/learn/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-learn-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8.316 2.07a.75.75 0 00-.632 0l-7 3.25a.75.75 0 000 1.36l1.434.666A.746.746 0 002 7.75V11a.75.75 0 00.158.46L2.75 11l-.592.46.001.002.001.001.003.004.008.01a1.882 1.882 0 00.103.12c.068.076.165.178.292.299.254.24.63.555 1.132.866C4.706 13.388 6.217 14 8.25 14c2.037 0 3.44-.615 4.345-1.266a5.32 5.32 0 00.977-.902 3.916 3.916 0 00.322-.448l.007-.012.003-.004v-.002h.001c0-.001 0-.002-.655-.366l.655.365A.754.754 0 0014 11V7.75a.747.747 0 00-.118-.404l1.434-.666a.75.75 0 000-1.36l-7-3.25zM12.5 7.988L8.316 9.93a.75.75 0 01-.632 0L3.5 7.988v2.723a5.585 5.585 0 00.99.776c.804.5 2.043 1.013 3.76 1.013 1.713 0 2.81-.51 3.468-.984a3.812 3.812 0 00.782-.745V7.988zM8 8.423L2.781 6 8 3.577 13.219 6 8 8.423z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/learn/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/learn/property-24.scss
index 6667656ff5d98..d5e83338a403d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/learn/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/learn/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-learn-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12.367 3.096a.75.75 0 00-.734 0l-10.25 5.75a.75.75 0 000 1.308l2.82 1.582A.747.747 0 004 12.25v5a.75.75 0 00.12.407l.63-.407-.63.408.001.001.002.002.003.005.009.013a2.202 2.202 0 00.118.162c.08.1.194.237.348.397.308.321.774.736 1.427 1.147C7.34 20.21 9.378 21 12.345 21c2.968 0 4.854-.79 6.018-1.646a5.597 5.597 0 001.209-1.193 3.945 3.945 0 00.339-.553 1.8 1.8 0 00.02-.043l.007-.016.002-.006.001-.002v-.001s.001-.002-.691-.29l.692.288A.75.75 0 0020 17.25v-5a.747.747 0 00-.203-.514l2.82-1.582a.75.75 0 000-1.308l-10.25-5.75zm6.133 9.368l-6.133 3.44a.75.75 0 01-.734 0L5.5 12.464v4.533c.047.055.107.124.182.202.233.242.605.577 1.144.916 1.072.675 2.833 1.385 5.52 1.385 2.686 0 4.252-.71 5.128-1.354.442-.325.722-.644.887-.87.061-.084.107-.155.139-.21v-4.602zM12 14.39L3.283 9.5 12 4.61l8.717 4.89L12 14.39z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/keyframes.scss
index 93bed97bfd205..348ce2b842fbe 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-line-chart-up {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/placeholders.scss
index 103f834c73354..4a023afb6da2f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-line-chart-up-icon {
   --icon-name: icon-line-chart-up;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/property-16.scss
index 49f2545decd6e..e99eae583effe 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-line-chart-up-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h11.5A2.25 2.25 0 0116 3.25v9.5A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v7.075L5.61 7.86a.73.73 0 01.278-.101.747.747 0 01.318.02L9.08 8.6l1.328-2.988-.9.405a.75.75 0 01-.615-1.368l2.58-1.16a.75.75 0 01.991.376l1.16 2.58a.75.75 0 01-1.367.615l-.428-.951-1.638 3.686a.75.75 0 01-.908.423L6.107 9.31 1.5 12.075v.675c0 .414.336.75.75.75H5V13a.75.75 0 011.5 0v.5h3V13a.75.75 0 011.5 0v.5h2.75a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75H2.25z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/property-24.scss
index 56380bc8cbab5..fbded664712df 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart-up/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-line-chart-up-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M1 4.75A2.75 2.75 0 013.75 2h16.5A2.75 2.75 0 0123 4.75v14.5A2.75 2.75 0 0120.25 22H3.75A2.75 2.75 0 011 19.25v-2.236V4.75zm1.5 12.644v1.856c0 .69.56 1.25 1.25 1.25H8v-.75a.75.75 0 011.5 0v.75h5v-.75a.75.75 0 011.5 0v.75h4.25c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H3.75c-.69 0-1.25.56-1.25 1.25v10.822l6.074-4.19a.746.746 0 01.721-.072l4.304 1.722 2.163-5.047-1.554.699a.75.75 0 01-.616-1.368l3.192-1.436a.75.75 0 01.992.376l1.436 3.192a.75.75 0 11-1.368.615l-.687-1.526-2.463 5.747a.75.75 0 01-.973.413l-4.626-1.851L2.5 17.394z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/keyframes.scss
index 3a4b0be461989..5dfdf3da0cf24 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-line-chart {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/placeholders.scss
index ddcfe7abfda5d..c8d93541a9c24 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-line-chart-icon {
   --icon-name: icon-line-chart;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/property-16.scss
index fc1e33b14f437..9e8623b79c61d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-line-chart-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-9.5A2.25 2.25 0 0013.75 1H2.25zM1.5 3.25a.75.75 0 01.75-.75h11.5a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75H11V13a.75.75 0 00-1.5 0v.5h-3V13A.75.75 0 005 13v.5H2.25a.75.75 0 01-.75-.75v-1.19l4.636-3.708 3.586 1.345a.752.752 0 00.76-.122l2.487-1.99a.75.75 0 10-.938-1.17L9.864 7.647 6.28 6.303a.754.754 0 00-.754.116L1.5 9.64V3.25z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/property-24.scss
index 0443397ccafeb..cf8a63a28688c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/line-chart/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-line-chart-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M3.75 2A2.75 2.75 0 001 4.75v14.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V4.75A2.75 2.75 0 0020.25 2H3.75zM2.5 16.353v2.897c0 .69.56 1.25 1.25 1.25H8v-.75a.75.75 0 011.5 0v.75h5v-.75a.75.75 0 011.5 0v.75h4.25c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H3.75c-.69 0-1.25.56-1.25 1.25v9.656l6.007-4.971a.748.748 0 01.842-.1l5.572 2.787L18.55 9.4a.75.75 0 11.9 1.2l-3.987 2.99a.754.754 0 01-.812.074l-5.55-2.775L2.5 16.353z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/link/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/link/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/link/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/link/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/link/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/link/keyframes.scss
index eeb7ba240105f..09d7cb29b811b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/link/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/link/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-link {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/link/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/link/placeholders.scss
index 3a234d231f5c1..f08fe363f0c8d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/link/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/link/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-link-icon {
   --icon-name: icon-link;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/link/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/link/property-16.scss
index 32e2fecce43b3..1aab0a084d978 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/link/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/link/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-link-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.141 1a3.893 3.893 0 00-2.738 1.093L7.314 3.175A.75.75 0 008.372 4.24l1.077-1.07a2.393 2.393 0 013.384 3.382l-1.881 1.88a2.393 2.393 0 01-3.608-.258.75.75 0 00-1.202.899 3.893 3.893 0 005.87.42l1.886-1.886.01-.009A3.893 3.893 0 0011.14 1z"/><path d="M7.019 5.365a3.893 3.893 0 00-3.032 1.13L2.102 8.382l-.01.01a3.893 3.893 0 005.505 5.504l1.084-1.084a.75.75 0 00-1.06-1.06l-1.07 1.07a2.393 2.393 0 01-3.384-3.384l1.881-1.88a2.393 2.393 0 013.609.258.75.75 0 101.2-.899A3.893 3.893 0 007.02 5.365z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/link/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/link/property-24.scss
index 6f874595e4d25..dfdbd968cb950 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/link/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/link/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-link-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M16.575 2a5.48 5.48 0 00-3.848 1.531L11.094 5.15a.75.75 0 001.056 1.065l1.62-1.606a3.98 3.98 0 015.567.052 3.951 3.951 0 01.053 5.542l-2.829 2.82a3.974 3.974 0 01-3.094 1.15 3.984 3.984 0 01-2.898-1.577.75.75 0 10-1.2.9 5.47 5.47 0 003.991 2.174 5.486 5.486 0 004.26-1.585l2.834-2.824.009-.01a5.45 5.45 0 00-.067-7.652A5.48 5.48 0 0016.576 2z"/><path d="M10.64 8.33a5.486 5.486 0 00-4.26 1.585L3.545 12.74l-.009.01a5.45 5.45 0 00.067 7.652 5.48 5.48 0 007.67.067l1.624-1.62a.75.75 0 10-1.06-1.062l-1.61 1.605a3.98 3.98 0 01-5.565-.052 3.951 3.951 0 01-.053-5.543l2.829-2.82a3.973 3.973 0 013.094-1.15 3.984 3.984 0 012.898 1.578.75.75 0 001.2-.9A5.468 5.468 0 0010.64 8.33z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/keyframes.scss
index 9908888f8b9bc..9796bca492915 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-linkedin-color {
   100% {
     background-image: var(--icon-linkedin-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/placeholders.scss
index 337d10a63db90..9ec500d5cd007 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-linkedin-color-icon {
   --icon-name: icon-linkedin-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/property-16.scss
index ae0bccb8c3c31..77eb547009e75 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-linkedin-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%230A66C2" d="M12.225 12.225h-1.778V9.44c0-.664-.012-1.519-.925-1.519-.926 0-1.068.724-1.068 1.47v2.834H6.676V6.498h1.707v.783h.024c.348-.594.996-.95 1.684-.925 1.802 0 2.135 1.185 2.135 2.728l-.001 3.14zM4.67 5.715a1.037 1.037 0 01-1.032-1.031c0-.566.466-1.032 1.032-1.032.566 0 1.031.466 1.032 1.032 0 .566-.466 1.032-1.032 1.032zm.889 6.51h-1.78V6.498h1.78v5.727zM13.11 2H2.885A.88.88 0 002 2.866v10.268a.88.88 0 00.885.866h10.226a.882.882 0 00.889-.866V2.865a.88.88 0 00-.889-.864z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/property-24.scss
index 718219d4997ee..8e618d6ab9258 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-linkedin-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%230A66C2" d="M19.041 19.041h-2.963v-4.64c0-1.107-.02-2.532-1.541-2.532-1.544 0-1.78 1.206-1.78 2.45v4.722H9.794V9.497h2.844v1.305h.04a3.121 3.121 0 012.807-1.542c3.004 0 3.558 1.976 3.558 4.546l-.002 5.235zM6.45 8.193c-.944 0-1.72-.776-1.72-1.72 0-.943.776-1.72 1.72-1.72.943 0 1.719.777 1.72 1.72 0 .943-.777 1.72-1.72 1.72zM7.93 19.04H4.965V9.497h2.966v9.544zM20.52 2.001H3.476A1.466 1.466 0 002 3.444v17.114c.01.8.675 1.451 1.476 1.443h17.043A1.47 1.47 0 0022 20.557V3.442A1.469 1.469 0 0020.519 2v.002z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/index.scss
index 2350c257e5510..fbeba26eb1d82 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../linkedin-color/property-16';
         @import '../linkedin-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/keyframes.scss
index 8e23083746b6f..1f80ad7f900ba 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-linkedin {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/placeholders.scss
index 17a84f66e8f98..17361b94960f7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-linkedin-icon {
   --icon-name: icon-linkedin;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/property-16.scss
index 3df10a751af4b..c31be247d360b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-linkedin-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M12.225 12.225h-1.778V9.44c0-.664-.012-1.519-.925-1.519-.926 0-1.068.724-1.068 1.47v2.834H6.676V6.498h1.707v.783h.024c.348-.594.996-.95 1.684-.925 1.802 0 2.135 1.185 2.135 2.728l-.001 3.14zM4.67 5.715a1.037 1.037 0 01-1.032-1.031c0-.566.466-1.032 1.032-1.032.566 0 1.031.466 1.032 1.032 0 .566-.466 1.032-1.032 1.032zm.889 6.51h-1.78V6.498h1.78v5.727zM13.11 2H2.885A.88.88 0 002 2.866v10.268a.88.88 0 00.885.866h10.226a.882.882 0 00.889-.866V2.865a.88.88 0 00-.889-.864z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/property-24.scss
index ad4ad56e1ae60..0069c82dcfdad 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/linkedin/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-linkedin-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M12.225 12.225h-1.778V9.44c0-.664-.012-1.519-.925-1.519-.926 0-1.068.724-1.068 1.47v2.834H6.676V6.498h1.707v.783h.024c.348-.594.996-.95 1.684-.925 1.802 0 2.135 1.185 2.135 2.728l-.001 3.14zM4.67 5.715a1.037 1.037 0 01-1.032-1.031c0-.566.466-1.032 1.032-1.032.566 0 1.031.466 1.032 1.032 0 .566-.466 1.032-1.032 1.032zm.889 6.51h-1.78V6.498h1.78v5.727zM13.11 2H2.885A.88.88 0 002 2.866v10.268a.88.88 0 00.885.866h10.226a.882.882 0 00.889-.866V2.865a.88.88 0 00-.889-.864z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/list/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/list/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/list/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/list/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/list/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/list/keyframes.scss
index e4b56cc50af44..66e7cb41e3bfb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/list/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/list/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-list {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/list/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/list/placeholders.scss
index 1a315226fc56e..820eef527322a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/list/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/list/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-list-icon {
   --icon-name: icon-list;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/list/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/list/property-16.scss
index a35c2685d79e6..10bc79bee1a46 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/list/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/list/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-list-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M2 3.75A.75.75 0 012.75 3h.5a.75.75 0 010 1.5h-.5A.75.75 0 012 3.75zm4 0A.75.75 0 016.75 3h6.5a.75.75 0 010 1.5h-6.5A.75.75 0 016 3.75zm-4 4A.75.75 0 012.75 7h.5a.75.75 0 010 1.5h-.5A.75.75 0 012 7.75zm4 0A.75.75 0 016.75 7h6.5a.75.75 0 010 1.5h-6.5A.75.75 0 016 7.75zm-4 4a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75zm4 0a.75.75 0 01.75-.75h6.5a.75.75 0 010 1.5h-6.5a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/list/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/list/property-24.scss
index 79178a942f2d7..98564be5289c1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/list/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/list/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-list-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M2.5 5.75A.75.75 0 013.25 5h1a.75.75 0 010 1.5h-1a.75.75 0 01-.75-.75zm4.5 0A.75.75 0 017.75 5h13a.75.75 0 010 1.5h-13A.75.75 0 017 5.75zm-4.5 6a.75.75 0 01.75-.75h1a.75.75 0 010 1.5h-1a.75.75 0 01-.75-.75zm4.5 0a.75.75 0 01.75-.75h13a.75.75 0 010 1.5h-13a.75.75 0 01-.75-.75zm-4.5 6a.75.75 0 01.75-.75h1a.75.75 0 010 1.5h-1a.75.75 0 01-.75-.75zm4.5 0a.75.75 0 01.75-.75h13a.75.75 0 010 1.5h-13a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/keyframes.scss
index 5da95fb50864f..1d71eacde3349 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-load-balancer {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/placeholders.scss
index 453ab18d91342..4239792f0c0c7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-load-balancer-icon {
   --icon-name: icon-load-balancer;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/property-16.scss
index 4a05e67e89e9e..0274649ff2833 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-load-balancer-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 1a.75.75 0 01.75.75V7h3.69l-.97-.97a.75.75 0 011.06-1.06l2.25 2.25a.75.75 0 010 1.06l-2.25 2.25a.75.75 0 11-1.06-1.06l.97-.97H8.75v4.08l1.002-.89a.75.75 0 01.996 1.12l-2.25 2a.75.75 0 01-.996 0l-2.25-2a.75.75 0 01.996-1.12l1.002.89V8.5H3.56l.97.97a.75.75 0 11-1.06 1.06L1.22 8.28a.75.75 0 010-1.06l2.25-2.25a.75.75 0 011.06 1.06L3.56 7h3.69V1.75A.75.75 0 018 1z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/property-24.scss
index 52b21e4c71b00..e058e715b2b39 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/load-balancer/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-load-balancer-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 2a.75.75 0 01.75.75V11h6.69l-1.72-1.72a.75.75 0 011.06-1.06l3 3a.75.75 0 010 1.06l-3 3a.75.75 0 11-1.06-1.06l1.72-1.72h-6.69v6.94l1.72-1.72a.75.75 0 111.06 1.06l-3 3a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l1.72 1.72V12.5H4.56l1.72 1.72a.75.75 0 11-1.06 1.06l-3-3a.75.75 0 010-1.06l3-3a.75.75 0 011.06 1.06L4.56 11h6.69V2.75A.75.75 0 0112 2z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/index.scss
index 68293edadf9dc..86cee0b297c2b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/keyframes.scss
index 9f87466a62987..5df3e365e11c6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-loading-motion {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/placeholders.scss
index f38cc7117d52d..9019ac88b59f2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-loading-motion-icon {
   --icon-name: icon-loading-motion;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/property-16.scss
index 4a20bfc12c68d..7efccddc473c8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-loading-motion-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" class="hds-flight-icon--animation-loading"><style>@keyframes hds-flight-icon-animation-rotation {to {transform: rotate(360deg);}}.hds-flight-icon--animation-loading {animation: hds-flight-icon-animation-rotation .7s linear infinite;}.hds-flight-icon--animation-running {animation: hds-flight-icon-animation-rotation .7s linear infinite;}</style><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8z" opacity=".2"/><path d="M7.25.75A.75.75 0 018 0a8 8 0 018 8 .75.75 0 01-1.5 0A6.5 6.5 0 008 1.5a.75.75 0 01-.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/property-24.scss
index 77bf1db49c6c4..b88623c0de401 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/loading-motion/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-loading-motion-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" class="hds-flight-icon--animation-loading"><style>@keyframes hds-flight-icon-animation-rotation {to {transform: rotate(360deg);}}.hds-flight-icon--animation-loading {animation: hds-flight-icon-animation-rotation .7s linear infinite;}.hds-flight-icon--animation-running {animation: hds-flight-icon-animation-rotation .7s linear infinite;}</style><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8z" opacity=".2"/><path d="M7.25.75A.75.75 0 018 0a8 8 0 018 8 .75.75 0 01-1.5 0A6.5 6.5 0 008 1.5a.75.75 0 01-.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/loading/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/loading/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/loading/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/loading/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/loading/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/loading/keyframes.scss
index e8d1ddde7fdb9..8ed8b2b37f60e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/loading/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/loading/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-loading {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/loading/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/loading/placeholders.scss
index e0f5a720eb3d4..da2494934066d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/loading/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/loading/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-loading-icon {
   --icon-name: icon-loading;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/loading/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/loading/property-16.scss
index 9e027c7ab073b..9b3ed0a649bde 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/loading/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/loading/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-loading-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" class="hds-flight-icon--animation-loading"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8z" opacity=".2"/><path d="M7.25.75A.75.75 0 018 0a8 8 0 018 8 .75.75 0 01-1.5 0A6.5 6.5 0 008 1.5a.75.75 0 01-.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/loading/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/loading/property-24.scss
index dc6e6ca49c0a3..3b51ac2d3108b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/loading/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/loading/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-loading-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="hds-flight-icon--animation-loading"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 2.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19zM1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12z" opacity=".2"/><path d="M11.25 1.75A.75.75 0 0112 1c6.075 0 11 4.925 11 11a.75.75 0 01-1.5 0A9.5 9.5 0 0012 2.5a.75.75 0 01-.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-fill/index.scss
index 0051698c04bfb..5d9da88e63555 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../lock-fill/property-16';
         @import '../lock-fill/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-fill/keyframes.scss
index 16e5ac7962e07..ae2e8f9e17e24 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-lock-closed-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-fill/placeholders.scss
index a86e222782c3a..0745b93da2896 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-lock-closed-fill-icon {
   --icon-name: icon-lock-closed-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-outline/index.scss
index 24f22faa5e095..656a4ae55ff15 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../lock/property-16';
         @import '../lock/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-outline/keyframes.scss
index 592ce84adecad..a6ef2be539446 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-lock-closed-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-outline/placeholders.scss
index 30fdcaddc48fe..d400aa5ff9c02 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-lock-closed-outline-icon {
   --icon-name: icon-lock-closed-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed/index.scss
index 0051698c04bfb..5d9da88e63555 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../lock-fill/property-16';
         @import '../lock-fill/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed/keyframes.scss
index 3e34c56c2d73b..72cd360bb0ce1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-lock-closed {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed/placeholders.scss
index 3e891f46fd746..14e79f1f044d9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-closed/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-lock-closed-icon {
   --icon-name: icon-lock-closed;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-disabled/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-disabled/index.scss
index 956a01cb8f9db..f09f097134681 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-disabled/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-disabled/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../lock-off/property-16';
         @import '../lock-off/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-disabled/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-disabled/keyframes.scss
index 4f66c0c1931e0..c9513d4572c8a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-disabled/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-disabled/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-lock-disabled {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-disabled/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-disabled/placeholders.scss
index ab4e5ca5ebdb5..4b699db3623d2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-disabled/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-disabled/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-lock-disabled-icon {
   --icon-name: icon-lock-disabled;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/keyframes.scss
index f71400e3b5ed1..17563a502e9ac 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-lock-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/placeholders.scss
index 8640401e8d1d8..f9df50151110d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-lock-fill-icon {
   --icon-name: icon-lock-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/property-16.scss
index 6761798695e5a..e08ad71c85abf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-lock-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M4 5.014v-.93c0-1.078.417-2.114 1.165-2.881A3.96 3.96 0 018 0a3.96 3.96 0 012.835 1.203A4.127 4.127 0 0112 4.083v.93a2.25 2.25 0 012 2.237v5.5A2.25 2.25 0 0111.75 15h-7.5A2.25 2.25 0 012 12.75v-5.5a2.25 2.25 0 012-2.236zM6.239 2.25A2.46 2.46 0 018 1.5c.657 0 1.29.267 1.761.75.471.483.739 1.142.739 1.833V5h-5v-.917c0-.69.268-1.35.739-1.833zM8 9.25a.75.75 0 00-.75.75v1a.75.75 0 001.5 0v-1A.75.75 0 008 9.25z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/property-24.scss
index de3bbbe54efa8..fd0ab07ae3371 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-lock-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M6 10.104V6.75c0-1.537.641-3.003 1.77-4.079A6.136 6.136 0 0112 1c1.58 0 3.102.597 4.23 1.671A5.632 5.632 0 0118 6.75v3.354c1.154.326 2 1.387 2 2.646v7.5A2.75 2.75 0 0117.25 23H6.75A2.75 2.75 0 014 20.25v-7.5c0-1.259.846-2.32 2-2.646zm2.805-6.346A4.636 4.636 0 0112 2.5c1.205 0 2.354.456 3.195 1.258.84.8 1.305 1.877 1.305 2.992V10h-9V6.75c0-1.115.465-2.192 1.305-2.992zM12 16.25a.75.75 0 00-.75.75v2a.75.75 0 001.5 0v-2a.75.75 0 00-.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/keyframes.scss
index 2672614447777..ae2e2bd5701ae 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-lock-off {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/placeholders.scss
index 731a5576ecdeb..59ac183181e09 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-lock-off-icon {
   --icon-name: icon-lock-off;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/property-16.scss
index cec8252b93d98..7e5dce7f93c56 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-lock-off-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 1.5a2.46 2.46 0 00-1.761.75.75.75 0 01-1.074-1.047A3.96 3.96 0 018 0a3.96 3.96 0 012.835 1.203A4.127 4.127 0 0112 4.083v.93a2.25 2.25 0 012 2.237V9.5a.75.75 0 01-1.5 0V7.25a.75.75 0 00-.75-.75H9.5a.75.75 0 010-1.5h1v-.917c0-.69-.268-1.35-.739-1.833A2.46 2.46 0 008 1.5z"/><path fill-rule="evenodd" d="M3.958 5.019A2.25 2.25 0 002 7.25v5.5A2.25 2.25 0 004.25 15h7.5c.606 0 1.156-.24 1.56-.629l1.16 1.16a.75.75 0 101.06-1.061l-14-14A.75.75 0 00.47 1.53L3.958 5.02zM4.25 6.5a.75.75 0 00-.75.75v5.5c0 .414.336.75.75.75h7.5a.749.749 0 00.5-.19L5.44 6.5H4.25z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/property-24.scss
index 482b9fc53276f..9396c9477cf8f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-off/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-lock-off-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12.75 17a.75.75 0 00-1.5 0v2a.75.75 0 001.5 0v-2z"/><path fill-rule="evenodd" d="M1.53.47A.75.75 0 00.47 1.53L6 7.06v3.044a2.751 2.751 0 00-2 2.646v7.5A2.75 2.75 0 006.75 23h10.5c1.271 0 2.34-.862 2.656-2.034l2.564 2.564a.75.75 0 101.06-1.06l-22-22zM18.5 19.56l-8.06-8.06H6.75c-.69 0-1.25.56-1.25 1.25v7.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25v-.69zM8.94 10L7.5 8.56V10h1.44z" clip-rule="evenodd"/><path d="M12 2.5a4.636 4.636 0 00-3.195 1.258c-.123.117-.238.24-.345.368a.75.75 0 01-1.153-.959c.144-.173.298-.338.463-.496A6.136 6.136 0 0112 1c1.58 0 3.102.597 4.23 1.671A5.632 5.632 0 0118 6.75v3.354c1.154.326 2 1.387 2 2.646v2.75a.75.75 0 01-1.5 0v-2.75c0-.69-.56-1.25-1.25-1.25H14.5a.75.75 0 010-1.5h2V6.75a4.133 4.133 0 00-1.305-2.992A4.636 4.636 0 0012 2.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-open/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-open/index.scss
index 3bcee27f34483..81b71544f3382 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-open/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-open/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../unlock/property-16';
         @import '../unlock/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-open/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-open/keyframes.scss
index 37fbc56af5824..e5ed189d16453 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-open/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-open/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-lock-open {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-open/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-open/placeholders.scss
index 81eb8a7ddc35f..637d9bc56df34 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock-open/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock-open/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-lock-open-icon {
   --icon-name: icon-lock-open;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock/keyframes.scss
index 261a7fe67dcc2..41ddc34a7cb19 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-lock {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock/placeholders.scss
index 167b602b6ab8d..2992bc0b68fdc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-lock-icon {
   --icon-name: icon-lock;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock/property-16.scss
index 732659b142891..3cd8f49ea89f0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-lock-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 9.25a.75.75 0 01.75.75v1a.75.75 0 01-1.5 0v-1A.75.75 0 018 9.25z"/><path fill-rule="evenodd" d="M4 5.014v-.93c0-1.078.417-2.114 1.165-2.881A3.96 3.96 0 018 0a3.96 3.96 0 012.835 1.203A4.127 4.127 0 0112 4.083v.93a2.25 2.25 0 012 2.237v5.5A2.25 2.25 0 0111.75 15h-7.5A2.25 2.25 0 012 12.75v-5.5a2.25 2.25 0 012-2.236zM6.239 2.25A2.46 2.46 0 018 1.5c.657 0 1.29.267 1.761.75.471.483.739 1.142.739 1.833V5h-5v-.917c0-.69.268-1.35.739-1.833zM11.75 6.5a.75.75 0 01.75.75v5.5a.75.75 0 01-.75.75h-7.5a.75.75 0 01-.75-.75v-5.5a.75.75 0 01.75-.75h7.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/lock/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/lock/property-24.scss
index bb3348d8de688..b8584c8fb0720 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/lock/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/lock/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-lock-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 16.25a.75.75 0 01.75.75v2a.75.75 0 01-1.5 0v-2a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M6 10.104V6.75c0-1.537.641-3.003 1.77-4.079A6.136 6.136 0 0112 1c1.58 0 3.102.597 4.23 1.671A5.632 5.632 0 0118 6.75v3.354c1.154.326 2 1.387 2 2.646v7.5A2.75 2.75 0 0117.25 23H6.75A2.75 2.75 0 014 20.25v-7.5c0-1.259.846-2.32 2-2.646zm2.805-6.346A4.636 4.636 0 0112 2.5c1.205 0 2.354.456 3.195 1.258.84.8 1.305 1.877 1.305 2.992V10h-9V6.75c0-1.115.465-2.192 1.305-2.992zM17.25 11.5H6.75c-.69 0-1.25.56-1.25 1.25v7.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25v-7.5c0-.69-.56-1.25-1.25-1.25z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-color/index.scss
index 2051613154e67..273941a41a56a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../alibaba-color/property-16';
         @import '../alibaba-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-color/keyframes.scss
index fa127aedd87b0..d767bebc1467f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-alicloud-color {
   100% {
     background-image: var(--icon-alibaba-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-color/placeholders.scss
index f659c832c867a..034c83b6c8b23 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-alicloud-color-icon {
   --icon-name: icon-logo-alicloud-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-monochrome/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-monochrome/index.scss
index 2051613154e67..273941a41a56a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-monochrome/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-monochrome/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../alibaba-color/property-16';
         @import '../alibaba-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-monochrome/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-monochrome/keyframes.scss
index 764007745e23e..7b7c776eba7fe 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-monochrome/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-monochrome/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-alicloud-monochrome {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-monochrome/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-monochrome/placeholders.scss
index 28290ae519adb..6c6c4af9762d6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-monochrome/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-alicloud-monochrome/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-alicloud-monochrome-icon {
   --icon-name: icon-logo-alicloud-monochrome;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-auth0-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-auth0-color/index.scss
index 60fbff8e53ef0..83889c28e8175 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-auth0-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-auth0-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../auth0-color/property-16';
         @import '../auth0-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-auth0-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-auth0-color/keyframes.scss
index 7fa6ce9d0fe87..d7e25ed9431b5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-auth0-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-auth0-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-auth0-color {
   100% {
     background-image: var(--icon-auth0-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-auth0-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-auth0-color/placeholders.scss
index 46bedea369ab4..a19476cae1916 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-auth0-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-auth0-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-auth0-color-icon {
   --icon-name: icon-logo-auth0-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-color/index.scss
index 3f3329abe1c82..a8b4b9693f42b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../aws-color/property-16';
         @import '../aws-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-color/keyframes.scss
index c231e2561035a..02a2d6efa6d4a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-aws-color {
   100% {
     background-image: var(--icon-aws-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-color/placeholders.scss
index 7fa2df38f7219..fb47d449e58cc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-aws-color-icon {
   --icon-name: icon-logo-aws-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-monochrome/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-monochrome/index.scss
index 3f3329abe1c82..a8b4b9693f42b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-monochrome/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-monochrome/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../aws-color/property-16';
         @import '../aws-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-monochrome/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-monochrome/keyframes.scss
index c47a1c3b590e4..050fdf5ed90c0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-monochrome/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-monochrome/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-aws-monochrome {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-monochrome/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-monochrome/placeholders.scss
index 67f507732b679..4bddc7ba4a699 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-monochrome/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-aws-monochrome/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-aws-monochrome-icon {
   --icon-name: icon-logo-aws-monochrome;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-color/index.scss
index 57796cbe4d4c6..a37795b7ea850 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../azure-color/property-16';
         @import '../azure-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-color/keyframes.scss
index 5ad75e7e99468..b3ca170423fd6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-azure-color {
   100% {
     background-image: var(--icon-azure-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-color/placeholders.scss
index 4241fc9703d31..08f47b36aa612 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-azure-color-icon {
   --icon-name: icon-logo-azure-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-color/index.scss
index 90d05644b0899..f681224d99e5f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../azure-devops-color/property-16';
         @import '../azure-devops-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-color/keyframes.scss
index 70b4a7cbf1706..6740b8619604b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-azure-dev-ops-color {
   100% {
     background-image: var(--icon-azure-devops-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-color/placeholders.scss
index b80e076464b48..918106367709a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-azure-dev-ops-color-icon {
   --icon-name: icon-logo-azure-dev-ops-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-monochrome/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-monochrome/index.scss
index 90d05644b0899..f681224d99e5f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-monochrome/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-monochrome/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../azure-devops-color/property-16';
         @import '../azure-devops-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-monochrome/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-monochrome/keyframes.scss
index 0ce77ebb09189..0c92bc0667ab0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-monochrome/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-monochrome/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-azure-dev-ops-monochrome {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-monochrome/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-monochrome/placeholders.scss
index 400af7d533724..35bcd51886f73 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-monochrome/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-dev-ops-monochrome/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-azure-dev-ops-monochrome-icon {
   --icon-name: icon-logo-azure-dev-ops-monochrome;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-monochrome/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-monochrome/index.scss
index 57796cbe4d4c6..a37795b7ea850 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-monochrome/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-monochrome/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../azure-color/property-16';
         @import '../azure-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-monochrome/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-monochrome/keyframes.scss
index 52f399aee187a..f247b9adeb3a8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-monochrome/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-monochrome/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-azure-monochrome {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-monochrome/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-monochrome/placeholders.scss
index 76d16bebdeb28..bd75781f37cf4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-monochrome/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-azure-monochrome/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-azure-monochrome-icon {
   --icon-name: icon-logo-azure-monochrome;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-color/index.scss
index b2a50e60e596a..1a1c620f33583 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../bitbucket-color/property-16';
         @import '../bitbucket-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-color/keyframes.scss
index b1c1c9651aa4b..67dafb2298da1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-bitbucket-color {
   100% {
     background-image: var(--icon-bitbucket-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-color/placeholders.scss
index 1867c8d88a2d2..756b9e3ddd21b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-bitbucket-color-icon {
   --icon-name: icon-logo-bitbucket-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-monochrome/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-monochrome/index.scss
index b2a50e60e596a..1a1c620f33583 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-monochrome/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-monochrome/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../bitbucket-color/property-16';
         @import '../bitbucket-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-monochrome/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-monochrome/keyframes.scss
index 20eefc84f3c0e..031930bb7f384 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-monochrome/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-monochrome/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-bitbucket-monochrome {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-monochrome/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-monochrome/placeholders.scss
index a193f6c7ab466..dfb98e7a66d3c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-monochrome/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-bitbucket-monochrome/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-bitbucket-monochrome-icon {
   --icon-name: icon-logo-bitbucket-monochrome;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/index.scss
index 68293edadf9dc..86cee0b297c2b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/keyframes.scss
index f3750b48c4e73..148ccbe30111d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-ember-circle-color {
   100% {
     background-image: var(--icon-logo-ember-circle-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/placeholders.scss
index e187d4728c4d2..0578c82f2537f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-ember-circle-color-icon {
   --icon-name: icon-logo-ember-circle-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/property-16.scss
index ae5f5cf6dc718..8f80e3d3460be 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-logo-ember-circle-color-16: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M64 0c35.346 0 64 28.654 64 64 0 35.346-28.654 64-64 64-35.346 0-64-28.654-64-64C0 28.654 28.654 0 64 0z" fill="%23E05C43" fill-rule="nonzero"/><path d="M65.265 24.128c8.246-.163 14.073 2.073 19.087 9.19 10.934 27.109-28.147 41.1-29.714 41.65l-.049.016s-1.18 7.363 10.028 7.08c13.793 0 28.294-10.691 33.81-15.21a3.293 3.293 0 0 1 4.468.265l4.13 4.29a3.291 3.291 0 0 1 .085 4.491c-3.59 3.997-12.014 12.203-24.696 17.504 0 0-21.16 9.798-35.42.52-8.503-5.53-10.842-12.151-11.793-19.038.005 0-10.324-.524-16.957-3.114-6.635-2.592.049-10.411.049-10.411s2.04-3.233 5.92 0c3.883 3.228 11.13 1.772 11.13 1.772.646-5.099 1.72-11.828 4.884-18.93 6.632-14.885 16.789-19.915 25.038-20.075zm4.853 14.915c-4.369-4.21-16.984 4.202-17.471 23.45 0 0 3.724 1.134 11.97-4.53 8.25-5.661 9.87-14.718 5.501-18.92z" fill="%23FFF"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/property-24.scss
index 435882973cc65..cecad776f1ee4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-ember-circle-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-logo-ember-circle-color-24: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M64 0c35.346 0 64 28.654 64 64 0 35.346-28.654 64-64 64-35.346 0-64-28.654-64-64C0 28.654 28.654 0 64 0z" fill="%23E05C43" fill-rule="nonzero"/><path d="M65.265 24.128c8.246-.163 14.073 2.073 19.087 9.19 10.934 27.109-28.147 41.1-29.714 41.65l-.049.016s-1.18 7.363 10.028 7.08c13.793 0 28.294-10.691 33.81-15.21a3.293 3.293 0 0 1 4.468.265l4.13 4.29a3.291 3.291 0 0 1 .085 4.491c-3.59 3.997-12.014 12.203-24.696 17.504 0 0-21.16 9.798-35.42.52-8.503-5.53-10.842-12.151-11.793-19.038.005 0-10.324-.524-16.957-3.114-6.635-2.592.049-10.411.049-10.411s2.04-3.233 5.92 0c3.883 3.228 11.13 1.772 11.13 1.772.646-5.099 1.72-11.828 4.884-18.93 6.632-14.885 16.789-19.915 25.038-20.075zm4.853 14.915c-4.369-4.21-16.984 4.202-17.471 23.45 0 0 3.724 1.134 11.97-4.53 8.25-5.661 9.87-14.718 5.501-18.92z" fill="%23FFF"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-color/index.scss
index 375f6387caa71..56a5eef90af0b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../gcp-color/property-16';
         @import '../gcp-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-color/keyframes.scss
index b69da99c58768..02c83e2ea3722 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-gcp-color {
   100% {
     background-image: var(--icon-gcp-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-color/placeholders.scss
index e0f38ffaab118..ad70a65d4d835 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-gcp-color-icon {
   --icon-name: icon-logo-gcp-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-monochrome/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-monochrome/index.scss
index 375f6387caa71..56a5eef90af0b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-monochrome/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-monochrome/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../gcp-color/property-16';
         @import '../gcp-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-monochrome/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-monochrome/keyframes.scss
index 4a66f2920ebad..6d640e1b01366 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-monochrome/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-monochrome/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-gcp-monochrome {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-monochrome/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-monochrome/placeholders.scss
index 5df72dda7ead3..c2f6c39fba477 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-monochrome/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gcp-monochrome/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-gcp-monochrome-icon {
   --icon-name: icon-logo-gcp-monochrome;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-color/index.scss
index 216229d36af05..cbdee8fe7e172 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../github-color/property-16';
         @import '../github-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-color/keyframes.scss
index a12b86a92ae09..6d3432207c606 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-github-color {
   100% {
     background-image: var(--icon-github-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-color/placeholders.scss
index 1c3054513e0d7..7dd9d46c79adb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-github-color-icon {
   --icon-name: icon-logo-github-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-monochrome/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-monochrome/index.scss
index 216229d36af05..cbdee8fe7e172 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-monochrome/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-monochrome/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../github-color/property-16';
         @import '../github-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-monochrome/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-monochrome/keyframes.scss
index 478ae3f8189e1..06e1c82dc0a0c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-monochrome/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-monochrome/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-github-monochrome {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-monochrome/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-monochrome/placeholders.scss
index a2921acc9e8b8..d0e0df0f17830 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-monochrome/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-github-monochrome/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-github-monochrome-icon {
   --icon-name: icon-logo-github-monochrome;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-color/index.scss
index 6bd234749ffbf..9f36415d9d1a9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../gitlab-color/property-16';
         @import '../gitlab-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-color/keyframes.scss
index 78f7bdd89f71d..ce67631608e1d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-gitlab-color {
   100% {
     background-image: var(--icon-gitlab-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-color/placeholders.scss
index 109c5de93d39b..9f9e3b201341c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-gitlab-color-icon {
   --icon-name: icon-logo-gitlab-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-monochrome/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-monochrome/index.scss
index 6bd234749ffbf..9f36415d9d1a9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-monochrome/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-monochrome/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../gitlab-color/property-16';
         @import '../gitlab-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-monochrome/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-monochrome/keyframes.scss
index 624e0de2c5a74..29f72d6a072b7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-monochrome/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-monochrome/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-gitlab-monochrome {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-monochrome/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-monochrome/placeholders.scss
index 1e91f47d55084..0a36677ac1229 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-monochrome/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-gitlab-monochrome/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-gitlab-monochrome-icon {
   --icon-name: icon-logo-gitlab-monochrome;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/index.scss
index 68293edadf9dc..86cee0b297c2b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/keyframes.scss
index a694ae996af3f..45328b5fc80ca 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-glimmer-color {
   100% {
     background-image: var(--icon-logo-glimmer-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/placeholders.scss
index f4fb8e8f73073..84488f32ba13f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-glimmer-color-icon {
   --icon-name: icon-logo-glimmer-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/property-16.scss
index c6a73418ac604..ad7e9bc977d92 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-logo-glimmer-color-16: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M256 128c0 70.692-57.308 128-128 128C57.307 256 0 198.692 0 128 0 57.308 57.307 0 128 0c70.692 0 128 57.308 128 128" fill="%23F8835A"/><path d="M78.63 140.37a11.39 11.39 0 0 1-7.951-3.222c-4.533-4.392-4.648-11.627-.256-16.16l77.144-79.619c4.39-4.533 11.626-4.648 16.16-.256 4.532 4.392 4.647 11.628.255 16.161l-77.143 79.62a11.397 11.397 0 0 1-8.21 3.475zm50.31 3.036a11.356 11.356 0 0 1-7.926-3.21c-4.52-4.38-4.633-11.592-.254-16.111L181.687 61.2c4.379-4.52 11.59-4.632 16.11-.254s4.634 11.59.256 16.11l-60.928 62.884a11.363 11.363 0 0 1-8.184 3.465zm-24.69 79.286a11.383 11.383 0 0 1-7.951-3.221c-4.533-4.391-4.648-11.627-.256-16.16L202.61 93.322c4.39-4.532 11.627-4.647 16.16-.255 4.534 4.392 4.648 11.627.255 16.161L112.459 219.216a11.397 11.397 0 0 1-8.21 3.476zm-33.44-19.44c-2.865 0-5.73-1.07-7.95-3.222-4.534-4.392-4.649-11.628-.257-16.16l29.053-29.986c4.393-4.533 11.628-4.648 16.161-.256 4.533 4.393 4.647 11.628.255 16.161L79.02 199.775a11.397 11.397 0 0 1-8.209 3.476zm-23.179-86.764a11.39 11.39 0 0 1-7.952-3.221c-4.533-4.392-4.647-11.627-.255-16.16L68.477 67.12c4.393-4.533 11.628-4.647 16.161-.255 4.533 4.392 4.647 11.627.255 16.16L55.84 113.013a11.398 11.398 0 0 1-8.209 3.476zm149.433 65.295a11.39 11.39 0 0 1-7.95-3.221c-4.534-4.392-4.649-11.627-.257-16.16l13.754-14.195c4.391-4.532 11.627-4.65 16.16-.255 4.533 4.392 4.647 11.627.255 16.16l-13.753 14.195a11.397 11.397 0 0 1-8.209 3.476zm-26.78 28.338c0 6.312-5.117 11.428-11.43 11.428-6.31 0-11.428-5.116-11.428-11.428 0-6.312 5.118-11.429 11.429-11.429 6.312 0 11.429 5.117 11.429 11.43zM61.06 158.925c0 6.312-5.117 11.43-11.43 11.43-6.311 0-11.427-5.118-11.427-11.43 0-6.312 5.116-11.428 11.428-11.428 6.312 0 11.429 5.116 11.429 11.428zm54.284-112.142c0 6.312-5.117 11.428-11.428 11.428-6.312 0-11.429-5.116-11.429-11.428 0-6.312 5.117-11.43 11.429-11.43 6.311 0 11.428 5.118 11.428 11.43z" fill="%23FFF"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/property-24.scss
index 4e8a03cb998bf..5171c31065cdc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-glimmer-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-logo-glimmer-color-24: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M256 128c0 70.692-57.308 128-128 128C57.307 256 0 198.692 0 128 0 57.308 57.307 0 128 0c70.692 0 128 57.308 128 128" fill="%23F8835A"/><path d="M78.63 140.37a11.39 11.39 0 0 1-7.951-3.222c-4.533-4.392-4.648-11.627-.256-16.16l77.144-79.619c4.39-4.533 11.626-4.648 16.16-.256 4.532 4.392 4.647 11.628.255 16.161l-77.143 79.62a11.397 11.397 0 0 1-8.21 3.475zm50.31 3.036a11.356 11.356 0 0 1-7.926-3.21c-4.52-4.38-4.633-11.592-.254-16.111L181.687 61.2c4.379-4.52 11.59-4.632 16.11-.254s4.634 11.59.256 16.11l-60.928 62.884a11.363 11.363 0 0 1-8.184 3.465zm-24.69 79.286a11.383 11.383 0 0 1-7.951-3.221c-4.533-4.391-4.648-11.627-.256-16.16L202.61 93.322c4.39-4.532 11.627-4.647 16.16-.255 4.534 4.392 4.648 11.627.255 16.161L112.459 219.216a11.397 11.397 0 0 1-8.21 3.476zm-33.44-19.44c-2.865 0-5.73-1.07-7.95-3.222-4.534-4.392-4.649-11.628-.257-16.16l29.053-29.986c4.393-4.533 11.628-4.648 16.161-.256 4.533 4.393 4.647 11.628.255 16.161L79.02 199.775a11.397 11.397 0 0 1-8.209 3.476zm-23.179-86.764a11.39 11.39 0 0 1-7.952-3.221c-4.533-4.392-4.647-11.627-.255-16.16L68.477 67.12c4.393-4.533 11.628-4.647 16.161-.255 4.533 4.392 4.647 11.627.255 16.16L55.84 113.013a11.398 11.398 0 0 1-8.209 3.476zm149.433 65.295a11.39 11.39 0 0 1-7.95-3.221c-4.534-4.392-4.649-11.627-.257-16.16l13.754-14.195c4.391-4.532 11.627-4.65 16.16-.255 4.533 4.392 4.647 11.627.255 16.16l-13.753 14.195a11.397 11.397 0 0 1-8.209 3.476zm-26.78 28.338c0 6.312-5.117 11.428-11.43 11.428-6.31 0-11.428-5.116-11.428-11.428 0-6.312 5.118-11.429 11.429-11.429 6.312 0 11.429 5.117 11.429 11.43zM61.06 158.925c0 6.312-5.117 11.43-11.43 11.43-6.311 0-11.427-5.118-11.427-11.43 0-6.312 5.116-11.428 11.428-11.428 6.312 0 11.429 5.116 11.429 11.428zm54.284-112.142c0 6.312-5.117 11.428-11.428 11.428-6.312 0-11.429-5.116-11.429-11.428 0-6.312 5.117-11.43 11.429-11.43 6.311 0 11.428 5.118 11.428 11.43z" fill="%23FFF"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-color/index.scss
index ad75e34e7bbf2..2567178ad9873 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../google-color/property-16';
         @import '../google-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-color/keyframes.scss
index 54122607a2ed5..aa621ed7dbd48 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-google-color {
   100% {
     background-image: var(--icon-google-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-color/placeholders.scss
index c388144fe48e9..5d532cb72b2e4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-google-color-icon {
   --icon-name: icon-logo-google-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-monochrome/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-monochrome/index.scss
index ad75e34e7bbf2..2567178ad9873 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-monochrome/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-monochrome/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../google-color/property-16';
         @import '../google-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-monochrome/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-monochrome/keyframes.scss
index 595f69d464fbc..8dbc6e4dcf618 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-monochrome/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-monochrome/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-google-monochrome {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-monochrome/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-monochrome/placeholders.scss
index 8a73dc4ae5800..f5f2398f8c945 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-monochrome/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-google-monochrome/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-google-monochrome-icon {
   --icon-name: icon-logo-google-monochrome;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/index.scss
index 68293edadf9dc..86cee0b297c2b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/keyframes.scss
index afc224a6425c5..b7f1e2b94994b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-hashicorp-color {
   100% {
     background-image: var(--icon-logo-hashicorp-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/placeholders.scss
index 35990ce96cb2c..11917041c614a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-hashicorp-color-icon {
   --icon-name: icon-logo-hashicorp-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/property-16.scss
index 9e9b31bccb741..d8e37060f8ecf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-logo-hashicorp-color-16: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 107 114" xmlns="http://www.w3.org/2000/svg"><path d="M44.54 0L0 25.69V87.41l16.73 9.66V35.35L44.54 19.3z"/><path d="M62.32 0v49.15H44.54V30.81L27.8 40.47v62.97l16.74 9.68V64.11h17.78v18.22l16.73-9.66V9.66z"/><path d="M62.32 113.14l44.54-25.69V25.73l-16.74-9.66v61.72l-27.8 16.05z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/property-24.scss
index be0771afec909..1e6f25ae4a0dc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-hashicorp-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-logo-hashicorp-color-24: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 107 114" xmlns="http://www.w3.org/2000/svg"><path d="M44.54 0L0 25.69V87.41l16.73 9.66V35.35L44.54 19.3z"/><path d="M62.32 0v49.15H44.54V30.81L27.8 40.47v62.97l16.74 9.68V64.11h17.78v18.22l16.73-9.66V9.66z"/><path d="M62.32 113.14l44.54-25.69V25.73l-16.74-9.66v61.72l-27.8 16.05z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/index.scss
index 68293edadf9dc..86cee0b297c2b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/keyframes.scss
index 37a6dc5bcc5a9..81f5d084fd863 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-jwt-color {
   100% {
     background-image: var(--icon-logo-jwt-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/placeholders.scss
index 3f0b946a93bb7..28f5bf34fd2d8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-jwt-color-icon {
   --icon-name: icon-logo-jwt-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/property-16.scss
index 54af7ba9852f8..c63e11681d911 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-logo-jwt-color-16: url('data:image/svg+xml;charset=UTF-8,<svg width="12" height="13" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M6.863 3.805V.667h-1.75v3.138l.875 1.202.875-1.202zM5.113 9.195v3.138h1.75V9.195l-.875-1.202-.875 1.202z" fill="%23fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6.863 9.195l1.844 2.543L10.13 10.7 8.275 8.168l-1.412-.466v1.493zM5.113 3.805L3.27 1.262 1.847 2.3l1.855 2.532 1.411.466V3.805z" fill="%2300F2E6"/><path fill-rule="evenodd" clip-rule="evenodd" d="M3.702 4.832L.715 3.863.167 5.532l2.986.968 1.424-.455-.875-1.213zM7.4 6.955l.875 1.213 2.987.969.548-1.669L8.823 6.5 7.4 6.955z" fill="%2300B9F1"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.823 6.5l2.987-.968-.548-1.669-2.987.969L7.4 6.045l1.423.455zM3.153 6.5l-2.986.968.548 1.669 2.987-.969.875-1.213L3.153 6.5z" fill="%23D63AFF"/><path fill-rule="evenodd" clip-rule="evenodd" d="M3.702 8.168L1.847 10.7l1.423 1.038 1.843-2.543V7.702l-1.411.466zM8.275 4.832L10.13 2.3 8.707 1.262 6.863 3.805v1.493l1.412-.466z" fill="%23FB015B"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/property-24.scss
index 4bb1a49c22aee..1ad55c65f7797 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-jwt-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-logo-jwt-color-24: url('data:image/svg+xml;charset=UTF-8,<svg width="12" height="13" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M6.863 3.805V.667h-1.75v3.138l.875 1.202.875-1.202zM5.113 9.195v3.138h1.75V9.195l-.875-1.202-.875 1.202z" fill="%23fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6.863 9.195l1.844 2.543L10.13 10.7 8.275 8.168l-1.412-.466v1.493zM5.113 3.805L3.27 1.262 1.847 2.3l1.855 2.532 1.411.466V3.805z" fill="%2300F2E6"/><path fill-rule="evenodd" clip-rule="evenodd" d="M3.702 4.832L.715 3.863.167 5.532l2.986.968 1.424-.455-.875-1.213zM7.4 6.955l.875 1.213 2.987.969.548-1.669L8.823 6.5 7.4 6.955z" fill="%2300B9F1"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8.823 6.5l2.987-.968-.548-1.669-2.987.969L7.4 6.045l1.423.455zM3.153 6.5l-2.986.968.548 1.669 2.987-.969.875-1.213L3.153 6.5z" fill="%23D63AFF"/><path fill-rule="evenodd" clip-rule="evenodd" d="M3.702 8.168L1.847 10.7l1.423 1.038 1.843-2.543V7.702l-1.411.466zM8.275 4.832L10.13 2.3 8.707 1.262 6.863 3.805v1.493l1.412-.466z" fill="%23FB015B"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-color/index.scss
index 52c6772255054..8e0a44695e941 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../kubernetes-color/property-16';
         @import '../kubernetes-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-color/keyframes.scss
index c58c487748a0f..3ece2cd4fbf59 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-kubernetes-color {
   100% {
     background-image: var(--icon-kubernetes-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-color/placeholders.scss
index e7b0dd9fa012b..2b4d2369f555a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-kubernetes-color-icon {
   --icon-name: icon-logo-kubernetes-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-monochrome/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-monochrome/index.scss
index 52c6772255054..8e0a44695e941 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-monochrome/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-monochrome/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../kubernetes-color/property-16';
         @import '../kubernetes-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-monochrome/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-monochrome/keyframes.scss
index ac7248d1dbc03..67544d7ac8795 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-monochrome/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-monochrome/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-kubernetes-monochrome {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-monochrome/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-monochrome/placeholders.scss
index 5a1021078d646..56ad05f63de78 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-monochrome/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-kubernetes-monochrome/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-kubernetes-monochrome-icon {
   --icon-name: icon-logo-kubernetes-monochrome;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-microsoft-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-microsoft-color/index.scss
index 1d0f168db8a79..70779bb0b21c6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-microsoft-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-microsoft-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../microsoft-color/property-16';
         @import '../microsoft-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-microsoft-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-microsoft-color/keyframes.scss
index 9d88ac514f791..784ba5c6a4ced 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-microsoft-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-microsoft-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-microsoft-color {
   100% {
     background-image: var(--icon-microsoft-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-microsoft-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-microsoft-color/placeholders.scss
index c1177500cb58c..4b5b0cb363f12 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-microsoft-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-microsoft-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-microsoft-color-icon {
   --icon-name: icon-logo-microsoft-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/index.scss
index 68293edadf9dc..86cee0b297c2b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/keyframes.scss
index 62a5a8e9316e6..cbea68b838c31 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-oidc-color {
   100% {
     background-image: var(--icon-logo-oidc-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/placeholders.scss
index 8e656f676cf49..34e1755a1b8cd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-oidc-color-icon {
   --icon-name: icon-logo-oidc-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/property-16.scss
index 42eb646d92232..5ff661bcd3f06 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-logo-oidc-color-16: url('data:image/svg+xml;charset=UTF-8,<svg viewbox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M12.833 8.375l-.291-2.625-.846.554c-.788-.496-1.78-.846-2.888-1.02 0 0-.554-.117-1.283-.117-.73 0-1.4.087-1.4.087-2.83.35-4.958 1.954-4.958 3.88 0 1.983 2.187 3.616 5.541 3.908v-1.138c-2.304-.32-3.762-1.4-3.762-2.77 0-1.284 1.341-2.363 3.179-2.713 0 0 1.43-.321 2.683.058.613.146 1.167.35 1.634.642l-1.109.67 3.5.584z" fill="%239E9E9E"/><path d="M6.708 2.833v10.209l1.75-.875V1.958l-1.75.875z" fill="%23000"/><path d="M6.708 2.833v10.209l1.75-.875V1.958l-1.75.875z" fill="%23FF9800"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/property-24.scss
index 6100e26358473..7f21aa0ba6b64 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oidc-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-logo-oidc-color-24: url('data:image/svg+xml;charset=UTF-8,<svg viewbox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M12.833 8.375l-.291-2.625-.846.554c-.788-.496-1.78-.846-2.888-1.02 0 0-.554-.117-1.283-.117-.73 0-1.4.087-1.4.087-2.83.35-4.958 1.954-4.958 3.88 0 1.983 2.187 3.616 5.541 3.908v-1.138c-2.304-.32-3.762-1.4-3.762-2.77 0-1.284 1.341-2.363 3.179-2.713 0 0 1.43-.321 2.683.058.613.146 1.167.35 1.634.642l-1.109.67 3.5.584z" fill="%239E9E9E"/><path d="M6.708 2.833v10.209l1.75-.875V1.958l-1.75.875z" fill="%23000"/><path d="M6.708 2.833v10.209l1.75-.875V1.958l-1.75.875z" fill="%23FF9800"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-okta-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-okta-color/index.scss
index b5d6bca7954c3..57209848c23c0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-okta-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-okta-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../okta-color/property-16';
         @import '../okta-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-okta-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-okta-color/keyframes.scss
index 3e43870468613..339b3e21cae7f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-okta-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-okta-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-okta-color {
   100% {
     background-image: var(--icon-okta-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-okta-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-okta-color/placeholders.scss
index 6dbf1a10910d0..c472145b20e3d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-okta-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-okta-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-okta-color-icon {
   --icon-name: icon-logo-okta-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-color/index.scss
index 0456062204061..8cb6b7b062553 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../oracle-color/property-16';
         @import '../oracle-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-color/keyframes.scss
index 2542dec9a3b50..dfb60889e23f6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-oracle-color {
   100% {
     background-image: var(--icon-oracle-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-color/placeholders.scss
index 1a2b6a8d1f75c..b326cf5a55bbb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-oracle-color-icon {
   --icon-name: icon-logo-oracle-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-monochrome/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-monochrome/index.scss
index 0456062204061..8cb6b7b062553 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-monochrome/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-monochrome/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../oracle-color/property-16';
         @import '../oracle-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-monochrome/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-monochrome/keyframes.scss
index 2790c319ff4b0..2382b3917a3bd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-monochrome/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-monochrome/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-oracle-monochrome {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-monochrome/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-monochrome/placeholders.scss
index a8b6c02a23754..ae6394505d66d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-monochrome/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-oracle-monochrome/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-oracle-monochrome-icon {
   --icon-name: icon-logo-oracle-monochrome;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-color/index.scss
index 5f6d67206d99d..5ed6b5863158b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../slack-color/property-16';
         @import '../slack-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-color/keyframes.scss
index e0753a9534413..0f98a973999ca 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-slack-color {
   100% {
     background-image: var(--icon-slack-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-color/placeholders.scss
index 08010c868e845..b191cb3a57be5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-slack-color-icon {
   --icon-name: icon-logo-slack-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-monochrome/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-monochrome/index.scss
index 5f6d67206d99d..5ed6b5863158b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-monochrome/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-monochrome/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../slack-color/property-16';
         @import '../slack-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-monochrome/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-monochrome/keyframes.scss
index e9f39445fc066..890b3afc3d065 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-monochrome/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-monochrome/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-slack-monochrome {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-monochrome/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-monochrome/placeholders.scss
index e3e47ca8b36c3..a9dfbc2f824cd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-monochrome/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-slack-monochrome/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-slack-monochrome-icon {
   --icon-name: icon-logo-slack-monochrome;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-color/index.scss
index 5058ca3046cd1..00f6f1d949b9d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../vmware-color/property-16';
         @import '../vmware-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-color/keyframes.scss
index 120f792853492..04f0eb2436156 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-vmware-color {
   100% {
     background-image: var(--icon-vmware-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-color/placeholders.scss
index 9fa29e061cedd..5f4f646677b6d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-vmware-color-icon {
   --icon-name: icon-logo-vmware-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-monochrome/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-monochrome/index.scss
index 5058ca3046cd1..00f6f1d949b9d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-monochrome/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-monochrome/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../vmware-color/property-16';
         @import '../vmware-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-monochrome/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-monochrome/keyframes.scss
index d8b2aecae4127..d451d866a0997 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-monochrome/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-monochrome/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-logo-vmware-monochrome {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-monochrome/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-monochrome/placeholders.scss
index ca61c03413e3f..b563d41b025cd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-monochrome/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/logo-vmware-monochrome/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-logo-vmware-monochrome-icon {
   --icon-name: icon-logo-vmware-monochrome;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/keyframes.scss
index 5037965f95cbb..35697c500c38a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-mail-open {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/placeholders.scss
index 116bbd539cfe6..6746b12533860 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-mail-open-icon {
   --icon-name: icon-mail-open;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/property-16.scss
index 91e3c72bef658..98aa4b34277e6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-mail-open-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8.803.254a2.25 2.25 0 00-1.606 0L1.447 2.45A2.25 2.25 0 000 4.552v8.198A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75V4.552a2.25 2.25 0 00-1.447-2.102L8.803.254zm-1.07 1.401a.75.75 0 01.535 0l5.75 2.196a.75.75 0 01.302.213L8 8.578 1.68 4.064a.749.749 0 01.302-.213l5.75-2.196zM1.5 5.78v6.6L5.116 8.36 1.5 5.78zM2.509 13.5h10.982L9.656 9.239l-1.22.871a.75.75 0 01-.872 0l-1.22-.871L2.509 13.5zM14.5 12.379v-6.6l-3.616 2.583 3.616 4.017z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/property-24.scss
index 562fd4c12e2c0..bfade807f4ae5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mail-open/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-mail-open-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M13 .335a2.75 2.75 0 00-2 0l-8.25 3.22A2.75 2.75 0 001 6.116V18.25A2.75 2.75 0 003.75 21h16.5A2.75 2.75 0 0023 18.25V6.116a2.75 2.75 0 00-1.75-2.561L13 .335zm-1.454 1.397a1.25 1.25 0 01.908 0l8.25 3.22c.48.187.796.65.796 1.164v.134a.746.746 0 00-.4.116l-9.11 5.753L2.5 6.425v-.309c0-.514.316-.977.796-1.164l8.25-3.22zM2.5 8.175v8.264l5.165-5.165-5.165-3.1zm.031 10.354c.127.556.625.971 1.219.971h16.5a1.25 1.25 0 001.219-.97l-6.51-6.511-2.559 1.615a.75.75 0 01-.786.01l-2.623-1.575-6.46 6.46zM21.5 16.44V7.887l-5.242 3.31L21.5 16.44z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mail/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mail/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mail/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mail/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mail/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mail/keyframes.scss
index 98710b1b03e32..1cc63ed702177 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mail/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mail/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-mail {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mail/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mail/placeholders.scss
index a31012bad8534..ce514f6436648 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mail/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mail/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-mail-icon {
   --icon-name: icon-mail;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mail/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mail/property-16.scss
index 68c23c5b5ae10..df9eea486b98e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mail/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mail/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-mail-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h11.5A2.25 2.25 0 0116 3.25v9.5A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75v-9.5zm2.25-.75a.75.75 0 00-.748.69L8 8.297l6.498-5.105a.75.75 0 00-.748-.691H2.25zm-.75 9.885V5.097l3.865 3.037L1.5 12.385zM2.514 13.5h10.972L9.452 9.063l-.989.777a.75.75 0 01-.926 0l-.99-.777L2.515 13.5zm8.12-5.366l3.866 4.251V5.097l-3.865 3.037z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mail/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mail/property-24.scss
index 166eb9a91a68c..693e19fda5405 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mail/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mail/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-mail-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M1 5.75A2.75 2.75 0 013.75 3h16.5A2.75 2.75 0 0123 5.75v12.5A2.75 2.75 0 0120.25 21H3.75A2.75 2.75 0 011 18.25V5.75zM3.75 4.5a1.25 1.25 0 00-1.057.582L12 12.062l9.307-6.98A1.25 1.25 0 0020.25 4.5H3.75zM2.5 16.44V6.812l5.501 4.125L2.5 16.44zm.031 2.09c.127.555.625.97 1.219.97h16.5a1.25 1.25 0 001.219-.97l-6.682-6.683L12.45 13.6a.75.75 0 01-.9 0l-2.337-1.752-6.682 6.681zM16 10.937L21.5 16.44V6.813l-5.501 4.125z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/keyframes.scss
index 373159cc4b259..3efebaac07ae9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-mainframe {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/placeholders.scss
index 9b52a8d139d78..a5c7a55489928 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-mainframe-icon {
   --icon-name: icon-mainframe;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/property-16.scss
index 27bcdbefb31db..555054ec6c2a6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-mainframe-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3 3.25A2.25 2.25 0 015.25 1h5.5A2.25 2.25 0 0113 3.25v9.5A2.25 2.25 0 0110.75 15h-5.5A2.25 2.25 0 013 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h5.5a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75h-5.5zm.5 2.25A.75.75 0 016.5 4h3a.75.75 0 010 1.5h-3a.75.75 0 01-.75-.75zm0 2.5a.75.75 0 01.75-.75h3a.75.75 0 010 1.5h-3a.75.75 0 01-.75-.75zm0 2.5A.75.75 0 016.5 9h3a.75.75 0 010 1.5h-3a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/property-24.scss
index adce965a0b8ee..4b93b31547e25 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mainframe/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-mainframe-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M4 3.75A2.75 2.75 0 016.75 1h10.5A2.75 2.75 0 0120 3.75v16.5A2.75 2.75 0 0117.25 23H6.75A2.75 2.75 0 014 20.25V3.75zM6.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25V3.75c0-.69-.56-1.25-1.25-1.25H6.75zm1.5 3.75A.75.75 0 019 5.5h6A.75.75 0 0115 7H9a.75.75 0 01-.75-.75zm0 4A.75.75 0 019 9.5h6a.75.75 0 010 1.5H9a.75.75 0 01-.75-.75zm0 4A.75.75 0 019 13.5h6a.75.75 0 010 1.5H9a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/keyframes.scss
index 11cc6ea5d18b5..beb3d790c1064 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-map-pin {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/placeholders.scss
index 38d8db4dea43d..a73dd3e7829d3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-map-pin-icon {
   --icon-name: icon-map-pin;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/property-16.scss
index 6a43a8457d98c..45f973ac6413f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-map-pin-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 4.5a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM7 7a1 1 0 112 0 1 1 0 01-2 0z"/><path d="M8 0C4.138 0 1 3.114 1 6.964a6.927 6.927 0 002.085 4.957l4.42 3.892a.75.75 0 00.99 0l4.42-3.892A6.927 6.927 0 0015 6.964C15 3.114 11.862 0 8 0zM2.5 6.964C2.5 3.95 4.958 1.5 8 1.5s5.5 2.45 5.5 5.464c0 1.5-.607 2.858-1.594 3.847L8 14.251l-3.906-3.44A5.427 5.427 0 012.5 6.964z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/property-24.scss
index 61311f1f16a4e..49b05aad5d6df 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/map-pin/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-map-pin-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11.585 23.875L12 23.25l.415.625a.75.75 0 01-.83 0z"/><path fill-rule="evenodd" d="M12 6a4 4 0 100 8 4 4 0 000-8zm-2.5 4a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M11.585 23.875L12 23.25c.415.625.416.624.416.624l.002-.001.006-.004.023-.015.083-.057c.071-.05.175-.122.305-.216a31.98 31.98 0 004.333-3.777C19.51 17.344 22 13.837 22 9.954a9.932 9.932 0 00-2.93-7.04A10.023 10.023 0 0012 0a10.023 10.023 0 00-7.07 2.914A9.932 9.932 0 002 9.954c0 3.883 2.49 7.39 4.832 9.85a31.978 31.978 0 004.333 3.777c.13.094.234.166.306.216l.082.057.023.015.006.004.003.002zM5.988 3.978A8.523 8.523 0 0112 1.5c2.255 0 4.418.892 6.012 2.478A8.432 8.432 0 0120.5 9.955c0 3.276-2.135 6.417-4.418 8.815A30.46 30.46 0 0112 22.334a30.463 30.463 0 01-4.082-3.564C5.635 16.372 3.5 13.23 3.5 9.955c0-2.242.895-4.392 2.488-5.977z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/map/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/map/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/map/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/map/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/map/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/map/keyframes.scss
index 2a23162471dd2..176013e425af2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/map/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/map/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-map {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/map/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/map/placeholders.scss
index 0f954e6453b87..15c3750c9c433 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/map/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/map/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-map-icon {
   --icon-name: icon-map;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/map/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/map/property-16.scss
index fb4fcd1c20257..ec60b4b6892bf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/map/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/map/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-map-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M5.2 1.187c.34-.17.738-.176 1.083-.016l3.983 1.843 4.003-1.668A1.25 1.25 0 0116 2.5v8.941c0 .473-.268.906-.691 1.118l-4.508 2.254c-.34.17-.74.176-1.085.017l-3.982-1.844-4.003 1.668A1.25 1.25 0 010 13.5V4.56c0-.474.268-.907.691-1.119l4.508-2.254zM1.5 4.714L5 2.964v8.703l-3.5 1.458V4.714zm8 8.362l-3-1.389V2.925l3 1.389v8.763zm1.5-.04l3.5-1.75v-8.41L11 4.332v8.704z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/map/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/map/property-24.scss
index e22fd708184e1..7875ec905a923 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/map/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/map/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-map-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M6.926 1.607a1.75 1.75 0 011.614-.064L16.099 5.1a.25.25 0 00.23-.01l5.053-2.886C22.548 1.537 24 2.379 24 3.724V17.42a1.75 1.75 0 01-.882 1.52l-6.044 3.453a1.75 1.75 0 01-1.614.064L7.901 18.9a.25.25 0 00-.23.01l-5.053 2.886C1.452 22.463 0 21.621 0 20.276V6.58c0-.628.337-1.208.882-1.52l6.044-3.453zm-5.3 4.756L7 3.293v14.274l-.074.04-5.052 2.887a.25.25 0 01-.374-.217V6.58a.25.25 0 01.126-.217zm6.914 11.18a1.557 1.557 0 00-.04-.018V3.182l6.96 3.275.04.018v14.343l-6.96-3.275zM17 20.708l5.374-3.071a.25.25 0 00.126-.217V3.723a.25.25 0 00-.374-.217l-5.052 2.887a1.755 1.755 0 01-.074.04v14.275z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/keyframes.scss
index 7c996508041be..a8a071c688b99 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-maximize-alt {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/placeholders.scss
index 13170571b8a58..a60320daacb6f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-maximize-alt-icon {
   --icon-name: icon-maximize-alt;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/property-16.scss
index d5690a4b7a006..d508e306741fc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-maximize-alt-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h2.047a.75.75 0 010 1.5H3.25a.75.75 0 00-.75.75v2.047a.75.75 0 01-1.5 0V3.25zm8.953-1.5a.75.75 0 01.75-.75h2.047A2.25 2.25 0 0115 3.25v2.047a.75.75 0 01-1.5 0V3.25a.75.75 0 00-.75-.75h-2.047a.75.75 0 01-.75-.75zM1.75 9.953a.75.75 0 01.75.75v2.047c0 .414.336.75.75.75h2.047a.75.75 0 010 1.5H3.25A2.25 2.25 0 011 12.75v-2.047a.75.75 0 01.75-.75zm12.5 0a.75.75 0 01.75.75v2.047A2.25 2.25 0 0112.75 15h-2.047a.75.75 0 010-1.5h2.047a.75.75 0 00.75-.75v-2.047a.75.75 0 01.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/property-24.scss
index 6907b89555d7e..4a9333cec0ddd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize-alt/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-maximize-alt-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2H8a.75.75 0 010 1.5H4.75c-.69 0-1.25.56-1.25 1.25V8A.75.75 0 012 8V4.75zm13.25-2A.75.75 0 0116 2h3.25A2.75 2.75 0 0122 4.75V8a.75.75 0 01-1.5 0V4.75c0-.69-.56-1.25-1.25-1.25H16a.75.75 0 01-.75-.75zm-12.5 12.5a.75.75 0 01.75.75v3.25c0 .69.56 1.25 1.25 1.25H8A.75.75 0 018 22H4.75A2.75 2.75 0 012 19.25V16a.75.75 0 01.75-.75zm18.5 0A.75.75 0 0122 16v3.25A2.75 2.75 0 0119.25 22H16a.75.75 0 010-1.5h3.25c.69 0 1.25-.56 1.25-1.25V16a.75.75 0 01.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/keyframes.scss
index affcffedd4812..6d6ce82a0dc62 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-maximize {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/placeholders.scss
index 34958dc7f91e4..92442dff826e8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-maximize-icon {
   --icon-name: icon-maximize;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/property-16.scss
index 3ee235c0ddbf0..1876908c30176 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-maximize-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M10.25 1a.75.75 0 000 1.5h2.19L9.47 5.47a.75.75 0 001.06 1.06l2.97-2.97v2.19a.75.75 0 001.5 0v-4a.75.75 0 00-.75-.75h-4zM2.5 10.25a.75.75 0 00-1.5 0v4c0 .414.336.75.75.75h4a.75.75 0 000-1.5H3.56l2.97-2.97a.75.75 0 10-1.06-1.06L2.5 12.44v-2.19z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/property-24.scss
index f5c0fad5a7ce2..bbedc9f9b4adf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/maximize/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-maximize-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M15.75 2a.75.75 0 000 1.5h3.69l-5.22 5.22a.75.75 0 001.06 1.06l5.22-5.22v3.69a.75.75 0 001.5 0v-5.5l-.001-.039a.745.745 0 00-.462-.654A.748.748 0 0021.25 2h-5.5zM3.5 15.75a.75.75 0 00-1.5 0v5.5a.748.748 0 00.75.75h5.5a.75.75 0 000-1.5H4.56l5.22-5.22a.75.75 0 10-1.06-1.06L3.5 19.44v-3.69z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/meh/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/meh/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/meh/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/meh/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/meh/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/meh/keyframes.scss
index cc3d4d61a5637..52110b7ba4025 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/meh/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/meh/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-meh {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/meh/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/meh/placeholders.scss
index 40ea7b57f301e..7d44126c180ed 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/meh/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/meh/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-meh-icon {
   --icon-name: icon-meh;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/meh/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/meh/property-16.scss
index d6d7dd256ab86..3e5d8afd5331d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/meh/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/meh/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-meh-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.5 9.5a.75.75 0 000 1.5h5a.75.75 0 000-1.5h-5zM5 6a1 1 0 011-1h.007a1 1 0 010 2H6a1 1 0 01-1-1zM10 5a1 1 0 100 2h.007a1 1 0 100-2H10z"/><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/meh/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/meh/property-24.scss
index 75bce823cdb09..a493af0dd2bee 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/meh/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/meh/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-meh-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8 14.5A.75.75 0 008 16h8a.75.75 0 000-1.5H8zM8 9a1 1 0 011-1h.01a1 1 0 110 2H9a1 1 0 01-1-1zM15 8a1 1 0 100 2h.01a1 1 0 100-2H15z"/><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/menu/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/menu/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/menu/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/menu/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/menu/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/menu/keyframes.scss
index b38e34c75a405..1108e275167a0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/menu/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/menu/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-menu {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/menu/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/menu/placeholders.scss
index 976c99edceb6e..743bdaf8f129c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/menu/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/menu/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-menu-icon {
   --icon-name: icon-menu;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/menu/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/menu/property-16.scss
index 305d61f0b1b62..319bf4b3e3a6d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/menu/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/menu/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-menu-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1 3.75A.75.75 0 011.75 3h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 3.75zM1 7.75A.75.75 0 011.75 7h12.5a.75.75 0 010 1.5H1.75A.75.75 0 011 7.75zM1.75 11a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H1.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/menu/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/menu/property-24.scss
index aff1b4f03ed94..2cfcd64d66035 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/menu/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/menu/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-menu-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M2 5.75A.75.75 0 012.75 5h18.5a.75.75 0 010 1.5H2.75A.75.75 0 012 5.75zM2 11.75a.75.75 0 01.75-.75h18.5a.75.75 0 010 1.5H2.75a.75.75 0 01-.75-.75zM2.75 17a.75.75 0 000 1.5h18.5a.75.75 0 000-1.5H2.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/index.scss
index fe9b53f7a4270..b54b62b5999ce 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../mesh/property-16';
         @import '../mesh/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/keyframes.scss
index 5d653f2748ee9..14e7c82b93cd0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-mesh {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/placeholders.scss
index 4c30f8d64ce7d..29fe0d9457d48 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-mesh-icon {
   --icon-name: icon-mesh;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/property-16.scss
index f917649746129..af89a0c31727a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-mesh-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M15.681 10.243A8.001 8.001 0 0016 8a7.97 7.97 0 00-2.047-5.345A1.752 1.752 0 0012.25.5h-.007c-.321 0-.623.087-.882.238A7.97 7.97 0 008 0a7.963 7.963 0 00-4.321 1.266A1.742 1.742 0 002.75 1h-.007a1.75 1.75 0 00-1.48 2.684A7.963 7.963 0 000 8a7.985 7.985 0 002.994 6.24 1.75 1.75 0 001.75 1.71h.006c.353 0 .681-.104.956-.284A8.004 8.004 0 008 16a7.985 7.985 0 006.245-3h.005a1.75 1.75 0 001.431-2.757zM2.573 4.492a1.758 1.758 0 01-.043-.005A6.47 6.47 0 001.5 8c0 1.918.83 3.642 2.152 4.832.112-.09.234-.165.366-.225-.029-3.003-.435-5.146-1.445-8.115zM6.5 14.2c0 .042-.001.084-.004.125.482.114.986.175 1.504.175a6.484 6.484 0 004.858-2.181 1.742 1.742 0 01-.242-1.713 32.908 32.908 0 00-2.306-2.179c-.067.116-.136.232-.205.347-.942 1.56-2.101 3.078-3.71 4.829.068.186.105.387.105.597zm7.826-4.698a1.776 1.776 0 00-.076-.002h-.007a1.75 1.75 0 00-.53.082 33.906 33.906 0 00-2.675-2.503c.484-.967.918-1.976 1.352-3.085a1.74 1.74 0 00.601-.158 6.518 6.518 0 011.335 5.666zM8 1.5c.89 0 1.738.179 2.51.503a1.755 1.755 0 00.476 1.464c-.379.964-.75 1.836-1.152 2.662C8.338 5.013 6.66 3.984 4.499 2.823a1.784 1.784 0 00-.013-.292A6.47 6.47 0 018 1.5zM4.094 4.309c.957 2.878 1.371 5.082 1.42 8.034 1.44-1.591 2.471-2.96 3.306-4.344.105-.174.208-.348.307-.524-1.41-1.072-2.989-2.056-5.033-3.166z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/property-24.scss
index ff6519be6c88c..30934a990b721 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mesh/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-mesh-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M22.56 15.09c.286-.98.44-2.017.44-3.09 0-3.075-1.262-5.855-3.296-7.851A1.75 1.75 0 0018 2h-.01c-.328 0-.635.09-.897.247A10.953 10.953 0 0012 1c-2.448 0-4.709.8-6.536 2.152A1.744 1.744 0 004.75 3h-.01a1.75 1.75 0 00-1.595 2.472A10.95 10.95 0 001 12a10.99 10.99 0 004.99 9.215v.035c0 .966.784 1.75 1.75 1.75h.01c.445 0 .851-.166 1.16-.44.98.286 2.017.44 3.09.44a10.99 10.99 0 009.221-5H21.25a1.75 1.75 0 001.31-2.91zM4.603 6.495a1.745 1.745 0 01-.309-.052A9.457 9.457 0 002.5 12a9.49 9.49 0 004.17 7.865c.106-.082.222-.152.345-.208-.012-4.964-.626-8.255-2.412-13.162zm4.74 14.03c.09.198.144.414.155.642A9.513 9.513 0 0012 21.5a9.49 9.49 0 007.864-4.169 1.743 1.743 0 01-.262-1.697c-1.477-1.49-2.83-2.747-4.193-3.859-1.514 2.857-3.359 5.497-6.065 8.75zm11.824-6.023c-.17.006-.333.037-.487.09-1.61-1.626-3.083-2.986-4.578-4.186.729-1.509 1.393-3.11 2.064-4.914.212-.02.412-.077.595-.166A9.47 9.47 0 0121.5 12a9.51 9.51 0 01-.333 2.502zM12 2.5a9.46 9.46 0 014.257 1.005 1.745 1.745 0 00.496 1.483 55.99 55.99 0 01-1.866 4.483c-2.418-1.785-5-3.234-8.388-4.768a1.75 1.75 0 00-.059-.407A9.457 9.457 0 0112 2.5zM6.077 6.159c1.737 4.813 2.384 8.186 2.435 13.02 2.538-3.084 4.267-5.6 5.697-8.343-2.352-1.763-4.843-3.177-8.132-4.677z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/keyframes.scss
index 7316bdf5a2cc0..96377aac60118 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-message-circle-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/placeholders.scss
index 21b1db2b6de6e..daea45cf07707 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-message-circle-fill-icon {
   --icon-name: icon-message-circle-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/property-16.scss
index d9899a06029a8..4066570377587 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-message-circle-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5 8.75A.75.75 0 015.75 8h2.5a.75.75 0 010 1.5h-2.5A.75.75 0 015 8.75zM5.75 5.5a.75.75 0 100 1.5h4.5a.75.75 0 000-1.5h-4.5z"/><path fill-rule="evenodd" d="M2.058 14.934l.002-.001.01-.004.037-.017a28.983 28.983 0 01.658-.281 21.485 21.485 0 011.649-.616c.274-.086.506-.147.678-.176.049-.008.086-.012.113-.015a6.768 6.768 0 10-3.028-3.026 1.384 1.384 0 01-.014.119 5.296 5.296 0 01-.176.679c-.172.545-.42 1.17-.618 1.646a31.45 31.45 0 01-.28.65l-.017.036-.004.01v.002a.75.75 0 00.99.994zM8.231 2.5a5.269 5.269 0 11-2.43 9.944 1.18 1.18 0 00-.535-.122 2.432 2.432 0 00-.424.038c-.27.046-.577.13-.879.225-.272.085-.557.186-.834.29.103-.275.203-.557.288-.828.096-.302.18-.612.225-.885.023-.136.04-.283.037-.428a1.193 1.193 0 00-.123-.534 5.269 5.269 0 014.675-7.7z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/property-24.scss
index c14abe2e5c057..03a4b97c99244 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-message-circle-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8 8.75A.75.75 0 018.75 8h7a.75.75 0 010 1.5h-7A.75.75 0 018 8.75zM8 11.75a.75.75 0 01.75-.75h3a.75.75 0 010 1.5h-3a.75.75 0 01-.75-.75zM8 14.75a.75.75 0 01.75-.75h5a.75.75 0 010 1.5h-5a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M7.546 20.304c-.332.064-.757.185-1.228.342-1.113.37-2.194.825-3.27 1.292a.75.75 0 01-.98-.998c.086-.192.17-.384.253-.577.273-.635.704-1.675 1.024-2.628.16-.48.286-.915.352-1.255a2.32 2.32 0 00.048-.42 9.62 9.62 0 01-1.06-4.403C2.685 6.324 7.01 2 12.343 2 17.676 2 22 6.324 22 11.657c0 5.334-4.324 9.658-9.657 9.658a9.619 9.619 0 01-4.4-1.058 2.159 2.159 0 00-.397.047zM20.5 11.657a8.157 8.157 0 10-15.396 3.765c.128.246.144.513.141.7a3.764 3.764 0 01-.075.643 11.85 11.85 0 01-.403 1.447c-.185.55-.402 1.12-.606 1.631a32 32 0 011.684-.62c.495-.165.991-.31 1.417-.392.212-.041.427-.07.627-.074.18-.003.445.012.69.14A8.157 8.157 0 0020.5 11.657z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/keyframes.scss
index c20e9b1cc3e91..e386fdd60be6a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-message-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/placeholders.scss
index 1e0c1b8ae54bb..c6acc54530bb9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-message-circle-icon {
   --icon-name: icon-message-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/property-16.scss
index 94ef541bb23de..7897421ff202a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-message-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8.231 2.5a5.269 5.269 0 11-2.43 9.944 1.18 1.18 0 00-.535-.122 2.432 2.432 0 00-.424.038c-.27.046-.577.13-.879.225-.272.085-.557.186-.834.29.103-.275.203-.557.288-.828.096-.302.18-.612.225-.885.023-.136.04-.283.037-.428a1.193 1.193 0 00-.123-.534 5.269 5.269 0 014.675-7.7zM2.058 14.934l.002-.001.01-.004.037-.017a28.983 28.983 0 01.658-.281 21.485 21.485 0 011.649-.616c.274-.086.506-.147.678-.176.049-.008.086-.012.113-.015a6.768 6.768 0 10-3.028-3.026 1.384 1.384 0 01-.014.119 5.296 5.296 0 01-.176.679c-.172.545-.42 1.17-.618 1.646a31.45 31.45 0 01-.28.65l-.017.036-.004.01v.002a.75.75 0 00.99.994z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/property-24.scss
index fda338d5ee042..acf754d34e325 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-message-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12.343 3.5a8.157 8.157 0 11-3.765 15.396 1.439 1.439 0 00-.688-.139c-.2.003-.416.033-.628.074-.426.082-.922.227-1.417.391-.566.188-1.157.412-1.684.621.204-.51.421-1.081.606-1.63.169-.505.318-1.012.403-1.448.042-.217.072-.438.075-.643a1.466 1.466 0 00-.141-.7A8.157 8.157 0 0112.343 3.5zM3.7 21.655a37.13 37.13 0 012.618-1.01c.47-.156.896-.277 1.228-.341a2.28 2.28 0 01.398-.047A9.657 9.657 0 0022 11.657 9.657 9.657 0 0012.343 2a9.657 9.657 0 00-8.598 14.06v.038a2.32 2.32 0 01-.048.382c-.066.34-.191.776-.352 1.255a36.658 36.658 0 01-1.21 3.052l-.05.114-.014.03-.004.009a.75.75 0 00.982.998l.648-.282.003-.001zm.043-5.621v.002-.002z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/keyframes.scss
index ff80f2fd0ada7..4e88bc7cd8365 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-message-square-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/placeholders.scss
index 26a1687611e13..8afc832af0083 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-message-square-fill-icon {
   --icon-name: icon-message-square-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/property-16.scss
index bc534e9634c87..cc7ac6bcf31d7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-message-square-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4 7.75A.75.75 0 014.75 7h3.5a.75.75 0 010 1.5h-3.5A.75.75 0 014 7.75zM4.75 4.5a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5z"/><path fill-rule="evenodd" d="M15 3.25A2.25 2.25 0 0012.75 1h-9.5A2.25 2.25 0 001 3.25v11a.75.75 0 001.26.55l2.801-2.6a.75.75 0 01.51-.2h7.179A2.25 2.25 0 0015 9.75v-6.5zm-2.25-.75a.75.75 0 01.75.75v6.5a.75.75 0 01-.75.75H5.572a2.25 2.25 0 00-1.531.6L2.5 12.53V3.25a.75.75 0 01.75-.75h9.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/property-24.scss
index 5470d4460447b..24d31c35603f2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-message-square-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M6 6.75A.75.75 0 016.75 6h10a.75.75 0 010 1.5h-10A.75.75 0 016 6.75zM6 9.75A.75.75 0 016.75 9h5a.75.75 0 010 1.5h-5A.75.75 0 016 9.75zM6 12.75a.75.75 0 01.75-.75h7a.75.75 0 010 1.5h-7a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M19.25 2A2.75 2.75 0 0122 4.75v10.5A2.75 2.75 0 0119.25 18H8.26a1.25 1.25 0 00-.801.291L3.23 21.825A.75.75 0 012 21.25V4.75A2.75 2.75 0 014.75 2h14.5zm1.25 2.75c0-.69-.56-1.25-1.25-1.25H4.75c-.69 0-1.25.56-1.25 1.25v14.895l2.997-2.505a2.75 2.75 0 011.763-.64h10.99c.69 0 1.25-.56 1.25-1.25V4.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/keyframes.scss
index 58d6c38a1baf7..3d87020e398c5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-message-square {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/placeholders.scss
index 825519c2b35ed..030d9d79790d2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-message-square-icon {
   --icon-name: icon-message-square;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/property-16.scss
index 449c0974f495b..0a07c5c7fb3d8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-message-square-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M15 3.25A2.25 2.25 0 0012.75 1h-9.5A2.25 2.25 0 001 3.25v11a.75.75 0 001.26.55l2.801-2.6a.75.75 0 01.51-.2h7.179A2.25 2.25 0 0015 9.75v-6.5zm-2.25-.75a.75.75 0 01.75.75v6.5a.75.75 0 01-.75.75H5.572a2.25 2.25 0 00-1.531.6L2.5 12.53V3.25a.75.75 0 01.75-.75h9.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/property-24.scss
index 824e331d44fbd..c1dc0c4bf0cd1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message-square/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-message-square-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M22 4.75A2.75 2.75 0 0019.25 2H4.75A2.75 2.75 0 002 4.75v16.5a.75.75 0 001.231.575l4.228-3.534A1.25 1.25 0 018.26 18h10.99A2.75 2.75 0 0022 15.25V4.75zM19.25 3.5c.69 0 1.25.56 1.25 1.25v10.5c0 .69-.56 1.25-1.25 1.25H8.26a2.75 2.75 0 00-1.763.64L3.5 19.645V4.75c0-.69.56-1.25 1.25-1.25h14.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message/index.scss
index e8eae6da84b4a..351cd9f517147 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../message-square-fill/property-16';
         @import '../message-square-fill/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message/keyframes.scss
index 55eaac733679a..8d0aad899c41c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-message {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/message/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/message/placeholders.scss
index 3a96d9f62199d..4a803fbda9802 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/message/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/message/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-message-icon {
   --icon-name: icon-message;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/keyframes.scss
index 31e269b4da274..f3e6294da1fc1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-mic-off {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/placeholders.scss
index 04075c8320cba..60df2906e65e2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-mic-off-icon {
   --icon-name: icon-mic-off;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/property-16.scss
index d272748bcce29..1c86aa07303d1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-mic-off-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 0c-.78 0-1.538.29-2.104.821a2.862 2.862 0 00-.627.857.75.75 0 001.354.644c.07-.147.17-.286.3-.407A1.578 1.578 0 018 1.5c.413 0 .8.154 1.078.415.276.26.422.601.422.946v3.443a.75.75 0 001.5 0V2.861c0-.775-.329-1.507-.896-2.04A3.077 3.077 0 008 0z"/><path fill-rule="evenodd" d="M5 6.06L1.22 2.28a.75.75 0 011.06-1.06l12.5 12.5a.75.75 0 11-1.06 1.06L11.338 12.4a5.575 5.575 0 01-2.588 1.05V14.5h1.75a.75.75 0 010 1.5h-5a.75.75 0 010-1.5h1.75v-1.05a5.553 5.553 0 01-3.131-1.514A5.3 5.3 0 012.5 8.135V6.75a.75.75 0 011.5 0v1.385a3.8 3.8 0 001.164 2.725A4.071 4.071 0 008 12c.815 0 1.602-.24 2.262-.677l-.726-.726A3.113 3.113 0 018 11c-.78 0-1.538-.29-2.104-.821A2.797 2.797 0 015 8.139V6.06zm1.5 1.5v.579c0 .345.146.686.422.946.278.26.665.415 1.078.415.134 0 .266-.016.392-.047L6.5 7.56z" clip-rule="evenodd"/><path d="M12.03 6.75a.75.75 0 011.5 0v1.385c0 .266-.02.53-.06.79a.75.75 0 11-1.483-.227c.029-.185.043-.374.043-.563V6.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/property-24.scss
index dec38608419e2..8e354e33d940b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mic-off/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-mic-off-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M9.184 1.118A4.077 4.077 0 0112 0c1.05 0 2.064.399 2.816 1.118A3.79 3.79 0 0116 3.858v6.5a.75.75 0 11-1.5 0v-6.5a2.29 2.29 0 00-.72-1.656A2.578 2.578 0 0012 1.5c-.674 0-1.313.256-1.78.702a2.29 2.29 0 00-.72 1.655.75.75 0 11-1.5 0 3.79 3.79 0 011.184-2.739z"/><path fill-rule="evenodd" d="M12 16c.81 0 1.6-.237 2.263-.676l1.66 1.66A6.671 6.671 0 0112 18.25a6.633 6.633 0 01-4.606-1.84A6.13 6.13 0 015.5 12v-2A.75.75 0 004 10v2a7.63 7.63 0 002.353 5.49 8.112 8.112 0 004.897 2.226V22H8a.75.75 0 000 1.5h8a.75.75 0 000-1.5h-3.25v-2.284a8.145 8.145 0 004.244-1.661l4.726 4.725a.75.75 0 101.06-1.06L2.28 1.22a.75.75 0 00-1.06 1.06L8 9.06v3.083a3.79 3.79 0 001.184 2.739A4.077 4.077 0 0012 16zm-2.5-3.857V10.56l3.667 3.666A2.62 2.62 0 0112 14.5a2.578 2.578 0 01-1.78-.702 2.29 2.29 0 01-.72-1.655z" clip-rule="evenodd"/><path d="M20 10a.75.75 0 00-1.5 0v2c0 .552-.076 1.097-.222 1.62a.75.75 0 001.444.404A7.522 7.522 0 0020 12v-2z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mic/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mic/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mic/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mic/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mic/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mic/keyframes.scss
index 132ac5a926d77..266bad129a654 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mic/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mic/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-mic {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mic/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mic/placeholders.scss
index ec31fcebe4cbc..e2008224e8881 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mic/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mic/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-mic-icon {
   --icon-name: icon-mic;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mic/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mic/property-16.scss
index 1b05e1a06edfd..c32cd286ae826 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mic/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mic/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-mic-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M8 0c-.78 0-1.538.29-2.104.821A2.797 2.797 0 005 2.861V8.14c0 .775.328 1.507.896 2.04.566.53 1.323.821 2.104.821.78 0 1.538-.29 2.104-.821A2.797 2.797 0 0011 8.139V2.86c0-.775-.329-1.507-.896-2.04A3.077 3.077 0 008 0zM6.922 1.915A1.578 1.578 0 018 1.5c.413 0 .8.154 1.078.415.276.26.422.601.422.946V8.14c0 .345-.146.686-.422.946A1.578 1.578 0 018 9.5c-.413 0-.8-.154-1.078-.415-.276-.26-.422-.601-.422-.946V2.86c0-.345.146-.686.422-.946z" clip-rule="evenodd"/><path d="M4 6.75a.75.75 0 00-1.5 0v1.385a5.3 5.3 0 001.619 3.801A5.553 5.553 0 007.25 13.45v1.05H5.5a.75.75 0 000 1.5h5a.75.75 0 000-1.5H8.75v-1.05a5.553 5.553 0 003.131-1.514A5.3 5.3 0 0013.5 8.135V6.75a.75.75 0 00-1.5 0v1.385a3.8 3.8 0 01-1.164 2.725A4.071 4.071 0 018 12a4.071 4.071 0 01-2.836-1.14A3.8 3.8 0 014 8.135V6.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mic/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mic/property-24.scss
index 1e458021d3472..addacded1c5f9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mic/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mic/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-mic-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M12 0c-1.05 0-2.064.399-2.816 1.118A3.79 3.79 0 008 3.858v8.285a3.79 3.79 0 001.184 2.739A4.077 4.077 0 0012 16c1.05 0 2.064-.399 2.816-1.118A3.79 3.79 0 0016 12.142V3.858a3.79 3.79 0 00-1.184-2.739A4.077 4.077 0 0012 0zm-1.78 2.202A2.578 2.578 0 0112 1.5c.674 0 1.313.256 1.78.702a2.29 2.29 0 01.72 1.655v8.286a2.29 2.29 0 01-.72 1.655A2.578 2.578 0 0112 14.5a2.578 2.578 0 01-1.78-.702 2.29 2.29 0 01-.72-1.655V3.857c0-.614.255-1.21.72-1.655z" clip-rule="evenodd"/><path d="M5.5 10A.75.75 0 004 10v2a7.63 7.63 0 002.353 5.49 8.112 8.112 0 004.897 2.226V22H8a.75.75 0 000 1.5h8a.75.75 0 000-1.5h-3.25v-2.284a8.112 8.112 0 004.898-2.227A7.63 7.63 0 0020 12v-2a.75.75 0 00-1.5 0v2a6.13 6.13 0 01-1.894 4.41A6.634 6.634 0 0112 18.25a6.633 6.633 0 01-4.606-1.84A6.13 6.13 0 015.5 12v-2z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/keyframes.scss
index f3ef1fe01fd8f..9cd94f2d8a88e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-microsoft-color {
   100% {
     background-image: var(--icon-microsoft-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/placeholders.scss
index f3b3d206a2840..24e3cbb0ea4bb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-microsoft-color-icon {
   --icon-name: icon-microsoft-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/property-16.scss
index e8cbbbc4c5cbf..60fe7249c3f41 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-microsoft-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23F35325" d="M1 1h6.5v6.5H1V1z"/><path fill="%2381BC06" d="M8.5 1H15v6.5H8.5V1z"/><path fill="%2305A6F0" d="M1 8.5h6.5V15H1V8.5z"/><path fill="%23FFBA08" d="M8.5 8.5H15V15H8.5V8.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/property-24.scss
index d077c85903879..79f8af01c49e2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-microsoft-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23F35325" d="M3 3h8.5v8.5H3V3z"/><path fill="%2381BC06" d="M12.5 3H21v8.5h-8.5V3z"/><path fill="%2305A6F0" d="M3 12.5h8.5V21H3v-8.5z"/><path fill="%23FFBA08" d="M12.5 12.5H21V21h-8.5v-8.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/index.scss
index 1d0f168db8a79..70779bb0b21c6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../microsoft-color/property-16';
         @import '../microsoft-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/keyframes.scss
index 01b666d7deee7..91e82b8974682 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-microsoft {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/placeholders.scss
index a03f65f2c9b5f..b51b5036331b5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-microsoft-icon {
   --icon-name: icon-microsoft;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/property-16.scss
index daee1aaebf7ec..5bfd5bc75543a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-microsoft-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1 1h6.5v6.5H1V1zM8.5 1H15v6.5H8.5V1zM1 8.5h6.5V15H1V8.5zM8.5 8.5H15V15H8.5V8.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/property-24.scss
index bd58125734fd1..7bd57ba61e19b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/microsoft/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-microsoft-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1 1h6.5v6.5H1V1zM8.5 1H15v6.5H8.5V1zM1 8.5h6.5V15H1V8.5zM8.5 8.5H15V15H8.5V8.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/keyframes.scss
index 28b5821f83193..f4d5cd3f33de5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-migrate {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/placeholders.scss
index 724b0e06b339b..8bd49e976a7cc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-migrate-icon {
   --icon-name: icon-migrate;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/property-16.scss
index 8d4e5e58e54af..32fb5e6e1e015 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-migrate-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M9.22 3.72a.75.75 0 011.06 0l3.5 3.5a.75.75 0 010 1.06l-3.5 3.5a.75.75 0 11-1.06-1.06l2.97-2.97-2.97-2.97a.75.75 0 010-1.06z"/><path d="M5.22 3.72a.75.75 0 011.06 0l3.5 3.5a.75.75 0 010 1.06l-3.5 3.5a.75.75 0 01-1.06-1.06L7.44 8.5H2A.75.75 0 012 7h5.44L5.22 4.78a.75.75 0 010-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/property-24.scss
index d8d69193599df..3fdc7412855b9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/migrate/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-migrate-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.207 5.982a.75.75 0 011.06-.025l5.5 5.25a.75.75 0 010 1.085l-5.5 5.25a.75.75 0 11-1.035-1.085l4.146-3.957H4A.75.75 0 014 11h8.378L8.232 7.043a.75.75 0 01-.025-1.06z"/><path d="M14.207 5.982a.75.75 0 011.06-.025l5.5 5.25a.75.75 0 010 1.085l-5.5 5.25a.75.75 0 01-1.035-1.085l4.932-4.707-4.932-4.707a.75.75 0 01-.024-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/keyframes.scss
index fb8264386224b..bc7012d936557 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-minimize-alt {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/placeholders.scss
index 476d22e471b14..eea8550e2b751 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-minimize-alt-icon {
   --icon-name: icon-minimize-alt;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/property-16.scss
index 59522e422c233..782169a4d1298 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minimize-alt-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M5.25.953a.75.75 0 01.75.75V3.75A2.25 2.25 0 013.75 6H1.703a.75.75 0 110-1.5H3.75a.75.75 0 00.75-.75V1.703a.75.75 0 01.75-.75zm5.5 0a.75.75 0 01.75.75V3.75c0 .414.336.75.75.75h2.047a.75.75 0 010 1.5H12.25A2.25 2.25 0 0110 3.75V1.703a.75.75 0 01.75-.75zM.953 10.75a.75.75 0 01.75-.75H3.75A2.25 2.25 0 016 12.25v2.047a.75.75 0 01-1.5 0V12.25a.75.75 0 00-.75-.75H1.703a.75.75 0 01-.75-.75zM10 12.25A2.25 2.25 0 0112.25 10h2.047a.75.75 0 110 1.5H12.25a.75.75 0 00-.75.75v2.047a.75.75 0 01-1.5 0V12.25z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/property-24.scss
index a55cae4faba99..09cf65b4c8345 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize-alt/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minimize-alt-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M8.25 2.25A.75.75 0 019 3v3.25A2.75 2.75 0 016.25 9H3a.75.75 0 010-1.5h3.25c.69 0 1.25-.56 1.25-1.25V3a.75.75 0 01.75-.75zm7.5 0a.75.75 0 01.75.75v3.25c0 .69.56 1.25 1.25 1.25H21A.75.75 0 0121 9h-3.25A2.75 2.75 0 0115 6.25V3a.75.75 0 01.75-.75zm-13.5 13.5A.75.75 0 013 15h3.25A2.75 2.75 0 019 17.75V21a.75.75 0 01-1.5 0v-3.25c0-.69-.56-1.25-1.25-1.25H3a.75.75 0 01-.75-.75zm12.75 2A2.75 2.75 0 0117.75 15H21a.75.75 0 010 1.5h-3.25c-.69 0-1.25.56-1.25 1.25V21a.75.75 0 01-1.5 0v-3.25z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/keyframes.scss
index 8a057192ff258..74ae9a57ad632 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-minimize {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/placeholders.scss
index 964125d947f49..380e2e59a7688 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-minimize-icon {
   --icon-name: icon-minimize;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/property-16.scss
index 21a9fc97ad731..4931a29655e9d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minimize-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M10 4.94V2.75a.75.75 0 00-1.5 0v4c0 .414.336.75.75.75h4a.75.75 0 000-1.5h-2.19l2.72-2.72a.75.75 0 00-1.06-1.06L10 4.94zM2.75 8.5a.75.75 0 000 1.5h2.19l-2.72 2.72a.75.75 0 101.06 1.06L6 11.06v2.19a.75.75 0 001.5 0v-4a.75.75 0 00-.75-.75h-4z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/property-24.scss
index 93b2183f08b0e..336ae822b7dd2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minimize/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minimize-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M20.78 4.28a.75.75 0 00-1.06-1.06L14.5 8.44V4.75a.75.75 0 00-1.5 0v5.5a.747.747 0 00.75.75h5.5a.75.75 0 000-1.5h-3.69l5.22-5.22zM4 13.75c0 .414.336.75.75.75h3.69l-5.22 5.22a.75.75 0 101.06 1.06l5.22-5.22v3.69a.75.75 0 001.5 0v-5.5a.747.747 0 00-.215-.525l-.01-.01A.747.747 0 0010.25 13h-5.5a.75.75 0 00-.75.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-fill/index.scss
index 9151048bc109a..95600d08616b1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../minus-circle/property-16';
         @import '../minus-circle/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-fill/keyframes.scss
index 1e59143c7d116..00be8eeb646d4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-minus-circle-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-fill/placeholders.scss
index c7663fd1460e2..6ab1707098fb0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-minus-circle-fill-icon {
   --icon-name: icon-minus-circle-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-outline/index.scss
index 9151048bc109a..95600d08616b1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../minus-circle/property-16';
         @import '../minus-circle/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-outline/keyframes.scss
index 0506ec376ca20..836c360afada9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-minus-circle-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-outline/placeholders.scss
index 49d07ef25a628..07330c7f64219 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-minus-circle-outline-icon {
   --icon-name: icon-minus-circle-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/keyframes.scss
index 8e3466aebd845..cb5a3328e9f36 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-minus-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/placeholders.scss
index 958924b1d4db6..1f7fcc8d5d7b5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-minus-circle-icon {
   --icon-name: icon-minus-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/property-16.scss
index d7d2716fdbe63..898809a798566 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minus-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.75 7a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5z"/><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/property-24.scss
index d4a944760003c..769b9f3fbfc73 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minus-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.25 11a.75.75 0 000 1.5h7.5a.75.75 0 000-1.5h-7.5z"/><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plain/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plain/index.scss
index e5afc3bb11e96..7163787e7bafe 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plain/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plain/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../minus/property-16';
         @import '../minus/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plain/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plain/keyframes.scss
index afd3686ce649f..c76832bf89ad2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plain/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plain/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-minus-plain {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plain/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plain/placeholders.scss
index 5f1350ed00bf1..77792853add44 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plain/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plain/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-minus-plain-icon {
   --icon-name: icon-minus-plain;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/keyframes.scss
index 8968c6a6195c3..b526d8edaa885 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-minus-plus-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/placeholders.scss
index 07121b91d5b74..b06534967f6bc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-minus-plus-circle-icon {
   --icon-name: icon-minus-plus-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/property-16.scss
index 48b3849865b2a..f17efc91bb809 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minus-plus-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.75 4.5a.75.75 0 000 1.5h3a.75.75 0 000-1.5h-3zM10.25 7.5a.75.75 0 01.75.75V9.5h1.25a.75.75 0 010 1.5H11v1.25a.75.75 0 01-1.5 0V11H8.25a.75.75 0 010-1.5H9.5V8.25a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M5.25 0a5.25 5.25 0 015.244 5.006 5.25 5.25 0 11-5.488 5.488A5.25 5.25 0 015.25 0zM1.5 5.25a3.75 3.75 0 017.499-.1A5.258 5.258 0 005.15 8.999 3.75 3.75 0 011.5 5.25zm8.75 1.25a3.75 3.75 0 100 7.5 3.75 3.75 0 000-7.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/property-24.scss
index beaf0f468c041..463704c4b2bf5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minus-plus-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M6 7a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5H6zM15.75 12.25A.75.75 0 0015 13v2h-2a.75.75 0 000 1.5h2v2a.75.75 0 001.5 0v-2h2a.75.75 0 000-1.5h-2v-2a.75.75 0 00-.75-.75z"/><path fill-rule="evenodd" d="M8.25 15.5c.085 0 .17-.002.254-.004a7.25 7.25 0 106.991-6.991A7.25 7.25 0 108.25 15.5zm0-13a5.75 5.75 0 10.467 11.481 7.262 7.262 0 015.264-5.264A5.75 5.75 0 008.25 2.5zM10 15.75a5.75 5.75 0 1111.5 0 5.75 5.75 0 01-11.5 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/keyframes.scss
index 7d190ea55d724..aa7443e8a9907 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-minus-plus-square {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/placeholders.scss
index 7e3866ca3c06e..820b2daf8041b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-minus-plus-square-icon {
   --icon-name: icon-minus-plus-square;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/property-16.scss
index 14009a3c0e9f3..ade6fd924402a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minus-plus-square-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M10.75 8a.75.75 0 01.75.75V10h1.25a.75.75 0 010 1.5H11.5v1.25a.75.75 0 01-1.5 0V11.5H8.75a.75.75 0 010-1.5H10V8.75a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M0 2.25A2.25 2.25 0 012.25 0h6a2.25 2.25 0 012.25 2.25V5.5h3.25A2.25 2.25 0 0116 7.75v6A2.25 2.25 0 0113.75 16h-6a2.25 2.25 0 01-2.25-2.25V10.5H2.25A2.25 2.25 0 010 8.25v-6zm9 0V5.5H7.707A.749.749 0 007 4.5H3.5a.75.75 0 000 1.5h2.836A2.246 2.246 0 005.5 7.75V9H2.25a.75.75 0 01-.75-.75v-6a.75.75 0 01.75-.75h6a.75.75 0 01.75.75zm-2 11.5v-6A.75.75 0 017.75 7h6a.75.75 0 01.75.75v6a.75.75 0 01-.75.75h-6a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/property-24.scss
index 6a01c85c354bf..b3470bc3c7f0d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus-square/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minus-plus-square-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M5.25 7.75A.75.75 0 016 7h4.5a.75.75 0 010 1.5H6a.75.75 0 01-.75-.75zM15.75 12.25A.75.75 0 0015 13v2h-2a.75.75 0 000 1.5h2v2a.75.75 0 001.5 0v-2h2a.75.75 0 000-1.5h-2v-2a.75.75 0 00-.75-.75z"/><path fill-rule="evenodd" d="M4.25 1.5A2.75 2.75 0 001.5 4.25v8A2.75 2.75 0 004.25 15H9v4.75a2.75 2.75 0 002.75 2.75h8a2.75 2.75 0 002.75-2.75v-8A2.75 2.75 0 0019.75 9H15V4.25a2.75 2.75 0 00-2.75-2.75h-8zM13.5 9V4.25c0-.69-.56-1.25-1.25-1.25h-8C3.56 3 3 3.56 3 4.25v8c0 .69.56 1.25 1.25 1.25H9v-1.75A2.75 2.75 0 0111.75 9h1.75zm-3 10.75c0 .69.56 1.25 1.25 1.25h8c.69 0 1.25-.56 1.25-1.25v-8c0-.69-.56-1.25-1.25-1.25h-8c-.69 0-1.25.56-1.25 1.25v8z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/keyframes.scss
index bb583302c0c53..5455e8ca606aa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-minus-plus {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/placeholders.scss
index d4fe5a72e9ed4..eaa626cf6c721 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-minus-plus-icon {
   --icon-name: icon-minus-plus;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/property-16.scss
index 02b9fbb8c21cb..08e9538bd7d1d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minus-plus-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.72 3.22a.75.75 0 111.06 1.06l-8.5 8.5a.75.75 0 01-1.06-1.06l8.5-8.5zM2.25 4a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5zM10 10a.75.75 0 000 1.5h1.5V13a.75.75 0 001.5 0v-1.5h1.5a.75.75 0 000-1.5H13V8.5a.75.75 0 00-1.5 0V10H10z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/property-24.scss
index f2d8e87eb9a6e..787a148ff7de2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-plus/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minus-plus-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M17.72 5.22a.75.75 0 111.06 1.06l-12.5 12.5a.75.75 0 01-1.06-1.06l12.5-12.5zM3.5 6.75A.75.75 0 014.25 6h5.5a.75.75 0 010 1.5h-5.5a.75.75 0 01-.75-.75zM16.5 13.5a.75.75 0 011.5 0V16h2.5a.75.75 0 010 1.5H18V20a.75.75 0 01-1.5 0v-2.5H14a.75.75 0 010-1.5h2.5v-2.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square-fill/index.scss
index 977d381076d1a..be961c283971f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../minus-square/property-16';
         @import '../minus-square/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square-fill/keyframes.scss
index 34dbbb26dab94..0d6bdbc4dc5ea 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-minus-square-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square-fill/placeholders.scss
index 4cad6f4b9bce8..36e6ac31c340f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-minus-square-fill-icon {
   --icon-name: icon-minus-square-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/keyframes.scss
index 637b5fbdb96f5..3958f625e6ec3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-minus-square {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/placeholders.scss
index bd38fd73d4061..ac80f0315e504 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-minus-square-icon {
   --icon-name: icon-minus-square;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/property-16.scss
index ac85321cdf308..9a0916e17ad6f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minus-square-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.25 7a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5z"/><path fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zM2.5 3.25a.75.75 0 01.75-.75h9.5a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75v-9.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/property-24.scss
index e04d4436666af..7448857e744f7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus-square/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minus-square-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.25 11a.75.75 0 000 1.5h7.5a.75.75 0 000-1.5h-7.5z"/><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25h14.5c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25V4.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus/keyframes.scss
index 531e0f6e1a4fa..ed65a366b440f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-minus {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus/placeholders.scss
index 79a79acf63fda..418b1f903acd5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-minus-icon {
   --icon-name: icon-minus;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus/property-16.scss
index 0e3a11e9ddae7..11b4245d88a73 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minus-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.5 7.75A.75.75 0 014.25 7h7.5a.75.75 0 010 1.5h-7.5a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/minus/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/minus/property-24.scss
index d92a0fce760be..91477090869e5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/minus/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/minus/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-minus-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M4.5 11.75a.75.75 0 01.75-.75h13.5a.75.75 0 010 1.5H5.25a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/module/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/module/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/module/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/module/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/module/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/module/keyframes.scss
index 0de28aa0c906c..43e5bad74a9d1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/module/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/module/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-module {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/module/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/module/placeholders.scss
index ad73739cc35e8..6f2fb869453c5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/module/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/module/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-module-icon {
   --icon-name: icon-module;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/module/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/module/property-16.scss
index 452cf4778dc83..b196889749544 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/module/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/module/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-module-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M11.5 4.75a.75.75 0 00-.897-.735l-5.5 1.1a.75.75 0 00-.603.735v5.4a.75.75 0 00.897.735l5.5-1.1a.75.75 0 00.603-.735v-5.4zM6 10.335v-3.87l4-.8v3.87l-4 .8z"/><path d="M15 2.33A2.25 2.25 0 0012.309.123l-9.5 1.9A2.25 2.25 0 001 4.23v9.44a2.25 2.25 0 002.691 2.207l9.5-1.9A2.25 2.25 0 0015 11.77V2.33zm-2.397-.736a.75.75 0 01.897.736v9.44a.75.75 0 01-.603.736l-9.5 1.9a.75.75 0 01-.897-.736V4.23a.75.75 0 01.603-.736l9.5-1.9z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/module/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/module/property-24.scss
index 8cd6abf8bfe73..7e662cfb73c6f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/module/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/module/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-module-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M17 7.866a1.25 1.25 0 00-1.507-1.223l-7.5 1.578A1.25 1.25 0 007 9.444v7.69c0 .794.73 1.387 1.507 1.223l7.5-1.578A1.25 1.25 0 0017 15.556v-7.69zM8.5 9.647l7-1.473v7.179l-7 1.473V9.647z"/><path d="M21 4.719a2.75 2.75 0 00-3.32-2.69L5.18 4.68A2.75 2.75 0 003 7.37v12.911a2.75 2.75 0 003.32 2.69l12.5-2.651A2.75 2.75 0 0021 17.63V4.719zm-3.01-1.223a1.25 1.25 0 011.51 1.223v12.91c0 .591-.413 1.101-.99 1.224l-12.5 2.651a1.25 1.25 0 01-1.51-1.223V7.371c0-.591.413-1.101.99-1.223l12.5-2.652z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/keyframes.scss
index 574e7ad2f0cf7..12947271cc619 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-monitor {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/placeholders.scss
index ca75a82de6151..389cd0d65b0c8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-monitor-icon {
   --icon-name: icon-monitor;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/property-16.scss
index d7c67b896d42b..02de32768dcea 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-monitor-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h11.5A2.25 2.25 0 0116 3.25v6.5A2.25 2.25 0 0113.75 12H8.5v1.5H11a.75.75 0 010 1.5H5a.75.75 0 010-1.5h2V12H2.25A2.25 2.25 0 010 9.75v-6.5zm13.75 7.25a.75.75 0 00.75-.75v-6.5a.75.75 0 00-.75-.75H2.25a.75.75 0 00-.75.75v6.5c0 .414.336.75.75.75h11.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/property-24.scss
index f46c6ea826260..7edfb6cd979ff 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/monitor/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-monitor-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M1 4.75A2.75 2.75 0 013.75 2h16.5A2.75 2.75 0 0123 4.75v10.5A2.75 2.75 0 0120.25 18H12.5v2.5H16a.75.75 0 010 1.5H8a.75.75 0 010-1.5h3V18H3.75A2.75 2.75 0 011 15.25V4.75zM20.25 16.5c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H3.75c-.69 0-1.25.56-1.25 1.25v10.5c0 .69.56 1.25 1.25 1.25h16.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/moon/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/moon/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/moon/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/moon/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/moon/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/moon/keyframes.scss
index cec3ea2235dbd..f0b7caea74e9c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/moon/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/moon/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-moon {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/moon/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/moon/placeholders.scss
index 89e5e9b912e3a..8c7bf314bddc1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/moon/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/moon/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-moon-icon {
   --icon-name: icon-moon;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/moon/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/moon/property-16.scss
index 572d6805337de..79075b6849534 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/moon/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/moon/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-moon-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8.09 1.382a.75.75 0 01-.05.814 4.121 4.121 0 005.764 5.764.75.75 0 011.193.672 7.014 7.014 0 11-7.63-7.629.75.75 0 01.723.379zm-2.06 1.46a5.513 5.513 0 107.128 7.128A5.621 5.621 0 016.03 2.843z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/moon/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/moon/property-24.scss
index 6d889b0b3e422..9fae4359769a6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/moon/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/moon/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-moon-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M11.82 2.382a.75.75 0 01-.05.814 6.46 6.46 0 009.034 9.034.75.75 0 011.193.672 10.02 10.02 0 11-10.9-10.899.75.75 0 01.723.379zm-2.12 1.4A8.52 8.52 0 1020.217 14.3 7.96 7.96 0 019.7 3.783z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/keyframes.scss
index 9dcbc4bfea258..154ac83d08a3a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-more-horizontal {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/placeholders.scss
index 073af72d985f7..2a2e88c21e7a9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-more-horizontal-icon {
   --icon-name: icon-more-horizontal;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/property-16.scss
index 6c3e801d19e17..408bd660b9f4d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-more-horizontal-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.5 6.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM8 6.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM12.5 6.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/property-24.scss
index ab29c8c97c349..2fb5791094922 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/more-horizontal/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-more-horizontal-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M5 10a2 2 0 100 4 2 2 0 000-4zM12 10a2 2 0 100 4 2 2 0 000-4zM19 10a2 2 0 100 4 2 2 0 000-4z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/keyframes.scss
index 8e3d2a9117860..e6a8e331f6ee1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-more-vertical {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/placeholders.scss
index 6c5295e4b4568..5ea969a78c832 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-more-vertical-icon {
   --icon-name: icon-more-vertical;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/property-16.scss
index 2bea9135278f2..814cae206e829 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-more-vertical-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 2a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM8 6.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM8 11a1.5 1.5 0 100 3 1.5 1.5 0 000-3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/property-24.scss
index ace38d60cd877..eb8822c64770f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/more-vertical/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-more-vertical-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 3.5a2 2 0 100 4 2 2 0 000-4zM12 10a2 2 0 100 4 2 2 0 000-4zM12 16.5a2 2 0 100 4 2 2 0 000-4z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/keyframes.scss
index 28bcb094022c6..7e3f06ccc7413 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-mouse-pointer {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/placeholders.scss
index 40fe306ff647a..b8878c945998e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-mouse-pointer-icon {
   --icon-name: icon-mouse-pointer;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/property-16.scss
index 9f7fdae159ed3..e01e1c2ca3b0d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-mouse-pointer-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M2.538 1.558a.75.75 0 00-.98.98l4.79 11.5a.75.75 0 001.403-.047l1.313-3.866 3.656 3.655a.75.75 0 101.06-1.06l-3.655-3.656 3.866-1.313a.75.75 0 00.048-1.402l-11.5-4.791zm4.432 10.07L3.643 3.643l7.985 3.327-3.127 1.062a.75.75 0 00-.47.469L6.97 11.628z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/property-24.scss
index 5b01c65bc015d..4583cfd2e2fbc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/mouse-pointer/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-mouse-pointer-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M3.038 2.058a.75.75 0 00-.98.98l7.29 17.5a.75.75 0 001.403-.047l2.2-6.479 5.769 5.768a.75.75 0 101.06-1.06l-5.768-5.768 6.48-2.201a.75.75 0 00.046-1.402l-17.5-7.291zm6.931 16.07L4.143 4.143l13.985 5.826-5.74 1.95a.75.75 0 00-.469.469l-1.95 5.74z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/move/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/move/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/move/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/move/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/move/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/move/keyframes.scss
index 659a1cf456ee3..b9544dbf54281 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/move/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/move/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-move {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/move/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/move/placeholders.scss
index ad5254364f54f..f7191d284ae2e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/move/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/move/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-move-icon {
   --icon-name: icon-move;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/move/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/move/property-16.scss
index f93ab3e34b50f..d58a3dc70eafa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/move/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/move/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-move-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M7.463.057A.748.748 0 007.22.22l-2 2a.75.75 0 001.06 1.06L7 2.56V7H2.56l.72-.72a.75.75 0 00-1.06-1.06l-2 2a.748.748 0 000 1.06l2 2a.75.75 0 101.06-1.06l-.72-.72H7v4.44l-.72-.72a.75.75 0 00-1.06 1.06l2 2a.748.748 0 001.06 0l2-2a.75.75 0 10-1.06-1.06l-.72.72V8.5h4.44l-.72.72a.75.75 0 101.06 1.06l2-2a.748.748 0 000-1.06l-2-2a.75.75 0 10-1.06 1.06l.72.72H8.5V2.56l.72.72a.75.75 0 101.06-1.06l-2-2a.748.748 0 00-.817-.163z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/move/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/move/property-24.scss
index 5f3d307042434..37ed2173528e7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/move/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/move/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-move-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M11.463 1.057a.748.748 0 00-.243.163l-3 3a.75.75 0 001.06 1.06L11 3.56V11H3.56l1.72-1.72a.75.75 0 00-1.06-1.06l-3 3a.748.748 0 000 1.06l3 3a.75.75 0 001.06-1.06L3.56 12.5H11v7.44l-1.72-1.72a.75.75 0 00-1.06 1.06l3 3a.748.748 0 001.06 0l3-3a.75.75 0 10-1.06-1.06l-1.72 1.72V12.5h7.44l-1.72 1.72a.75.75 0 101.06 1.06l3-3a.748.748 0 000-1.06l-3-3a.75.75 0 10-1.06 1.06L19.94 11H12.5V3.56l1.72 1.72a.75.75 0 101.06-1.06l-3-3a.748.748 0 00-.817-.163z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/music/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/music/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/music/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/music/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/music/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/music/keyframes.scss
index 13eca52ebd4cd..4fd9361cbaa33 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/music/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/music/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-music {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/music/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/music/placeholders.scss
index c567d4d6f5470..e8b917fee5358 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/music/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/music/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-music-icon {
   --icon-name: icon-music;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/music/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/music/property-16.scss
index 592e4e58f9a73..f6ee43d7e9214 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/music/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/music/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-music-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M13.5 3.687a.25.25 0 00-.293-.246l-6.5 1.121a.25.25 0 00-.207.247v7.348a2.75 2.75 0 01-2.318 2.716l-.678.107a2.164 2.164 0 01-.68-4.274L5 10.36V4.809c0-.852.613-1.58 1.452-1.725l6.5-1.121A1.75 1.75 0 0115 3.687v7.47a2.75 2.75 0 01-2.318 2.716l-.678.107a2.164 2.164 0 01-.68-4.274L13.5 9.36V3.687zM5 11.88l-1.94.309a.664.664 0 10.208 1.311l.678-.108A1.25 1.25 0 005 12.157v-.278zm6.56-.691l1.94-.31v.279a1.25 1.25 0 01-1.054 1.234l-.678.108a.664.664 0 11-.208-1.312z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/music/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/music/property-24.scss
index 229d36fe61622..d1074ec422a1e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/music/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/music/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-music-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M20.5 4.27a.75.75 0 00-.873-.74l-9 1.5a.75.75 0 00-.627.74v13.286a2.75 2.75 0 01-2.298 2.712l-2 .334A2.75 2.75 0 012.5 19.389v-.445a2.75 2.75 0 012.298-2.712l3.702-.617V5.77c0-1.1.795-2.039 1.88-2.22l9-1.5A2.25 2.25 0 0122 4.271v12.785a2.75 2.75 0 01-2.298 2.712l-2 .334a2.75 2.75 0 01-3.202-2.713v-.445a2.75 2.75 0 012.298-2.712l3.702-.617V4.27zm0 10.865l-3.456.576A1.25 1.25 0 0016 16.944v.445c0 .773.694 1.36 1.456 1.233l2-.333a1.25 1.25 0 001.044-1.233v-1.92zM5.044 17.711l3.456-.576v1.92a1.25 1.25 0 01-1.045 1.234l-2 .333A1.25 1.25 0 014 19.39v-.445a1.25 1.25 0 011.045-1.233z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/keyframes.scss
index e90a4aceba69f..1da80c5e71394 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-navigation-alt {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/placeholders.scss
index 25d7c0749d219..8d99c2cb8d8b5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-navigation-alt-icon {
   --icon-name: icon-navigation-alt;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/property-16.scss
index dccb5475404f1..2fb1cc778059f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-navigation-alt-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 1a.75.75 0 01.691.46l5.25 12.5a.75.75 0 01-1.027.96L8 12.457 3.086 14.92a.75.75 0 01-1.027-.96l5.25-12.5A.75.75 0 018 1zM4.227 12.67l3.437-1.722a.75.75 0 01.672 0l3.437 1.723L8 3.687 4.227 12.67z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/property-24.scss
index 9ce7bbf310aa0..2283ba19415cf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation-alt/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-navigation-alt-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 2a.75.75 0 01.698.476l7.25 18.5a.75.75 0 01-1.053.935L12 18.207 5.105 21.91a.75.75 0 01-1.053-.935l7.25-18.5A.75.75 0 0112 2zM6.193 19.623l5.452-2.928a.75.75 0 01.71 0l5.452 2.928L12 4.806 6.193 19.623z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/keyframes.scss
index 06b35e37da9ea..74c0907c117eb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-navigation {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/placeholders.scss
index 1cd22eaa35e82..dc9b89c648474 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-navigation-icon {
   --icon-name: icon-navigation;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/property-16.scss
index 19344bfa8962d..d338858e40245 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-navigation-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M14.78 1.22a.75.75 0 01.148.851l-5.921 12.5a.75.75 0 01-1.406-.14L6.395 9.606 1.568 8.4a.75.75 0 01-.14-1.406l12.5-5.92a.75.75 0 01.852.147zM3.965 7.452l3.23.807a.75.75 0 01.546.546l.807 3.23 4.125-8.708-8.708 4.125z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/property-24.scss
index 992a7b451e08d..c6d6bdcad58cc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/navigation/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-navigation-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M21.78 2.22a.75.75 0 01.148.851l-8.763 18.5a.75.75 0 01-1.406-.14L9.921 14.08l-7.353-1.838a.75.75 0 01-.14-1.406l18.5-8.763a.75.75 0 01.852.148zM4.965 11.294l5.756 1.439a.75.75 0 01.546.546l1.44 5.756 6.966-14.708-14.708 6.967z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/keyframes.scss
index 222fc37534dce..7a9c3f1d291ca 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-network-alt {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/placeholders.scss
index 0d90bc8159fcb..881b141f1c91d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-network-alt-icon {
   --icon-name: icon-network-alt;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/property-16.scss
index 988842aad5202..1a1377ea2054a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-network-alt-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M16 8a.75.75 0 00-.22-.53l-3.5-3.5a.75.75 0 10-1.06 1.06L14.19 8l-2.97 2.97a.75.75 0 101.06 1.06l3.5-3.5A.75.75 0 0016 8zM.22 8.53a.75.75 0 010-1.06l3.5-3.5a.75.75 0 011.06 1.06L1.81 8l2.97 2.97a.75.75 0 11-1.06 1.06l-3.5-3.5z"/><path d="M5 7a1 1 0 000 2h.01a1 1 0 100-2H5zM7 8a1 1 0 011-1h.01a1 1 0 010 2H8a1 1 0 01-1-1zM11 7a1 1 0 100 2h.01a1 1 0 100-2H11z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/property-24.scss
index c33617f018d3f..3357d94fb0123 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/network-alt/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-network-alt-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M23 12a.75.75 0 00-.232-.543l-5.5-5.25a.75.75 0 00-1.036 1.086L21.164 12l-4.932 4.707a.75.75 0 001.036 1.085l5.5-5.25A.75.75 0 0023 12zM1 12a.75.75 0 01.232-.543l5.5-5.25a.75.75 0 111.036 1.086L2.836 12l4.932 4.707a.75.75 0 01-1.036 1.085l-5.5-5.25A.75.75 0 011 12z"/><path d="M8 11a1 1 0 100 2h.01a1 1 0 100-2H8zM11 12a1 1 0 011-1h.01a1 1 0 110 2H12a1 1 0 01-1-1zM16 11a1 1 0 100 2h.01a1 1 0 100-2H16z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/network/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/network/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/network/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/network/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/network/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/network/keyframes.scss
index 494a3913b19a3..2140fd36aae92 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/network/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/network/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-network {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/network/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/network/placeholders.scss
index 12ca73332e9e4..9e160054faa42 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/network/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/network/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-network-icon {
   --icon-name: icon-network;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/network/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/network/property-16.scss
index a77ca41f405a7..cb0bf87281321 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/network/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/network/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-network-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M6.25 0C5.56 0 5 .56 5 1.25v3.5C5 5.44 5.56 6 6.25 6H7v1H1a.75.75 0 000 1.5h2.5V10H2.25C1.56 10 1 10.56 1 11.25v3.5c0 .69.56 1.25 1.25 1.25h3.5C6.44 16 7 15.44 7 14.75v-3.5C7 10.56 6.44 10 5.75 10H5V8.5h6V10h-.75C9.56 10 9 10.56 9 11.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5c0-.69-.56-1.25-1.25-1.25H12.5V8.5H15A.75.75 0 0015 7H8.5V6h1.25C10.44 6 11 5.44 11 4.75v-3.5C11 .56 10.44 0 9.75 0h-3.5zm4.25 11.5v3h3v-3h-3zm-8 0v3h3v-3h-3zm7-7v-3h-3v3h3z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/network/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/network/property-24.scss
index ff48ca8e75a15..09b0e21b79641 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/network/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/network/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-network-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M10.25 2.5A1.75 1.75 0 008.5 4.25v3.5c0 .966.784 1.75 1.75 1.75H11V11H3a.75.75 0 000 1.5h3.5v2H5.25a1.75 1.75 0 00-1.75 1.75v3.5c0 .966.784 1.75 1.75 1.75h3.5a1.75 1.75 0 001.75-1.75v-3.5a1.75 1.75 0 00-1.75-1.75H8v-2h8v2h-.75a1.75 1.75 0 00-1.75 1.75v3.5c0 .966.784 1.75 1.75 1.75h3.5a1.75 1.75 0 001.75-1.75v-3.5a1.75 1.75 0 00-1.75-1.75H17.5v-2H21a.75.75 0 000-1.5h-8.5V9.5h1.25a1.75 1.75 0 001.75-1.75v-3.5a1.75 1.75 0 00-1.75-1.75h-3.5zM10 4.25a.25.25 0 01.25-.25h3.5a.25.25 0 01.25.25v3.5a.25.25 0 01-.25.25h-3.5a.25.25 0 01-.25-.25v-3.5zm-5 12a.25.25 0 01.25-.25h3.5a.25.25 0 01.25.25v3.5a.25.25 0 01-.25.25h-3.5a.25.25 0 01-.25-.25v-3.5zM15.25 16a.25.25 0 00-.25.25v3.5c0 .138.112.25.25.25h3.5a.25.25 0 00.25-.25v-3.5a.25.25 0 00-.25-.25h-3.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/keyframes.scss
index 5636f50dfa32d..08c1bfcd37c27 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-newspaper {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/placeholders.scss
index bb633250b9000..d255c49087a5b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-newspaper-icon {
   --icon-name: icon-newspaper;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/property-16.scss
index c0f021dca7202..faf4ee7a28ca7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-newspaper-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.75 9.5a.75.75 0 000 1.5h4.5a.75.75 0 000-1.5h-4.5zM6 12.75a.75.75 0 01.75-.75h2.5a.75.75 0 010 1.5h-2.5a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M7.25 2.5C6.56 2.5 6 3.06 6 3.75v3.5c0 .69.56 1.25 1.25 1.25h4.5c.69 0 1.25-.56 1.25-1.25v-3.5c0-.69-.56-1.25-1.25-1.25h-4.5zM7.5 7V4h4v3h-4z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M2.75 16h10.5a2.25 2.25 0 002.25-2.25V2.25A2.25 2.25 0 0013.25 0h-7.5A2.25 2.25 0 003.5 2.25V3.5h-.75A2.25 2.25 0 00.5 5.75v8A2.25 2.25 0 002.75 16zM14 2.25v11.5a.75.75 0 01-.75.75H4.872c.083-.235.128-.487.128-.75V2.25a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75zM2.75 14.5a.75.75 0 00.75-.75V5h-.75a.75.75 0 00-.75.75v8c0 .414.336.75.75.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/property-24.scss
index 1f44176461228..6a917fe3ba487 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/newspaper/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-newspaper-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M9.75 13a.75.75 0 000 1.5h7a.75.75 0 000-1.5h-7zM9 16.75a.75.75 0 01.75-.75h4a.75.75 0 010 1.5h-4a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M10.75 4.5A1.75 1.75 0 009 6.25v3.5c0 .966.784 1.75 1.75 1.75h6.5A1.75 1.75 0 0019 9.75v-3.5a1.75 1.75 0 00-1.75-1.75h-6.5zm-.25 1.75a.25.25 0 01.25-.25h6.5a.25.25 0 01.25.25v3.5a.25.25 0 01-.25.25h-6.5a.25.25 0 01-.25-.25v-3.5z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M19.75 23H4.25a2.75 2.75 0 01-2.75-2.75v-12A2.75 2.75 0 014.25 5.5H5.5V3.75A2.75 2.75 0 018.25 1h11.5a2.75 2.75 0 012.75 2.75v16.5A2.75 2.75 0 0119.75 23zM21 3.75v16.5c0 .69-.56 1.25-1.25 1.25H6.7c.192-.375.3-.8.3-1.25V3.75c0-.69.56-1.25 1.25-1.25h11.5c.69 0 1.25.56 1.25 1.25zM3 20.25a1.25 1.25 0 102.5 0V7H4.25C3.56 7 3 7.56 3 8.25v12z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/node/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/node/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/node/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/node/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/node/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/node/keyframes.scss
index db81da4252afb..3a2219ea030bc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/node/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/node/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-node {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/node/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/node/placeholders.scss
index 75a4b4a9a05bc..59993bfa2ba74 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/node/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/node/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-node-icon {
   --icon-name: icon-node;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/node/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/node/property-16.scss
index d6bdab2e6f17b..b97d5d4650399 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/node/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/node/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-node-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M4 6.25A2.25 2.25 0 016.25 4h3a2.25 2.25 0 012.25 2.25V7h3.25a.75.75 0 010 1.5H11.5v.75a2.25 2.25 0 01-2.25 2.25h-3A2.25 2.25 0 014 9.25V8.5H.75a.75.75 0 010-1.5H4v-.75zm6 0a.75.75 0 00-.75-.75h-3a.75.75 0 00-.75.75v3c0 .414.336.75.75.75h3a.75.75 0 00.75-.75v-3z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/node/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/node/property-24.scss
index 64772bbc42d5d..facd77e4ddad0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/node/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/node/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-node-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M7 9.25A2.75 2.75 0 019.75 6.5h5a2.75 2.75 0 012.75 2.75V11h4.75a.75.75 0 010 1.5H17.5v1.75A2.75 2.75 0 0114.75 17h-5A2.75 2.75 0 017 14.25V12.5H2.25a.75.75 0 010-1.5H7V9.25zm9 0C16 8.56 15.44 8 14.75 8h-5c-.69 0-1.25.56-1.25 1.25v5c0 .69.56 1.25 1.25 1.25h5c.69 0 1.25-.56 1.25-1.25v-5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/keyframes.scss
index b1e7268ec6b6d..09ffa8739b973 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-nomad-color {
   100% {
     background-image: var(--icon-nomad-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/placeholders.scss
index 9efacab91b948..b7c4f21d05a9c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-nomad-color-icon {
   --icon-name: icon-nomad-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/property-16.scss
index e5444c37c1669..73ebe2a769a64 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-nomad-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%2306D092" d="M8 0L1 4v8l7 4 7-4V4L8 0zm3.119 8.797L9.254 9.863 7.001 8.65v2.549l-2.118 1.33v-5.33l1.68-1.018 2.332 1.216V4.794l2.23-1.322-.006 5.325z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/property-24.scss
index e262a5ca7eb2c..8e32c17be2659 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-nomad-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%2306D092" d="M12 .5L2 6.25v11.5l10 5.75 10-5.75V6.25L12 .5zm4.456 12.646l-2.664 1.533-3.22-1.745v3.664l-3.026 1.911v-7.661l2.401-1.463 3.331 1.748v-3.74l3.185-1.902-.008 7.655z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/index.scss
index bb3c95b80e0a5..fd3f9ca13677b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../nomad-color/property-16';
         @import '../nomad-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/keyframes.scss
index 701eedd62f7de..9a5a02f35c0df 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-nomad {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/placeholders.scss
index 784ce621e0992..7dfea59501855 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-nomad-icon {
   --icon-name: icon-nomad;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/property-16.scss
index acf043e94e23f..96216da14a498 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-nomad-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8 0L1 4v8l7 4 7-4V4L8 0zm3.119 8.797L9.254 9.863 7.001 8.65v2.549l-2.118 1.33v-5.33l1.68-1.018 2.332 1.216V4.794l2.23-1.322-.006 5.325z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/property-24.scss
index 6995cc4fdb4d8..977a0345c6e9b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/nomad/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-nomad-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8 0L1 4v8l7 4 7-4V4L8 0zm3.119 8.797L9.254 9.863 7.001 8.65v2.549l-2.118 1.33v-5.33l1.68-1.018 2.332 1.216V4.794l2.23-1.322-.006 5.325z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-disabled/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-disabled/index.scss
index 6004285342794..dace09ab6ad52 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-disabled/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-disabled/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../bell-off/property-16';
         @import '../bell-off/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-disabled/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-disabled/keyframes.scss
index 71b0396efa4c3..0de6f63da68c3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-disabled/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-disabled/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-notification-disabled {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-disabled/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-disabled/placeholders.scss
index 5604921f5eb64..f8228a1bde172 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-disabled/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-disabled/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-notification-disabled-icon {
   --icon-name: icon-notification-disabled;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-fill/index.scss
index 157b2e18802ad..a32306149d459 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../bell-active-fill/property-16';
         @import '../bell-active-fill/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-fill/keyframes.scss
index 11ff2fb503ab9..e65a875391664 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-notification-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-fill/placeholders.scss
index da460e6a85eed..6cacc38d6b153 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-notification-fill-icon {
   --icon-name: icon-notification-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-outline/index.scss
index 1b63ab5fd2a55..b7b4708db6c08 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../bell/property-16';
         @import '../bell/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-outline/keyframes.scss
index 3470468574589..7002152a9bb9d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-notification-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-outline/placeholders.scss
index adc0495d4befb..3a241ff479648 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/notification-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/notification-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-notification-outline-icon {
   --icon-name: icon-notification-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/keyframes.scss
index 9eb43f6c47ef2..58939c7daae23 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-octagon {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/placeholders.scss
index 490f99bcb5acb..2d6a09048c993 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-octagon-icon {
   --icon-name: icon-octagon;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/property-16.scss
index 9aa4ecfc7530d..94a454f66a8a8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-octagon-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.923.659A2.25 2.25 0 015.514 0h4.972c.597 0 1.169.237 1.59.659l3.265 3.264c.422.422.659.994.659 1.591v4.972a2.25 2.25 0 01-.659 1.59l-3.264 3.265a2.25 2.25 0 01-1.591.659H5.514a2.25 2.25 0 01-1.59-.659L.658 12.077A2.25 2.25 0 010 10.486V5.514c0-.597.237-1.169.659-1.59L3.923.658zm1.591.841a.75.75 0 00-.53.22L1.72 4.984a.75.75 0 00-.22.53v4.972c0 .199.079.39.22.53l3.264 3.264c.14.141.331.22.53.22h4.972a.75.75 0 00.53-.22l3.264-3.264a.75.75 0 00.22-.53V5.514a.75.75 0 00-.22-.53L11.016 1.72a.75.75 0 00-.53-.22H5.514z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/property-24.scss
index 5da705660c584..57606d849ffe4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/octagon/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-octagon-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M6.64 1.805A2.75 2.75 0 018.585 1h6.83c.73 0 1.429.29 1.945.805l4.835 4.835A2.75 2.75 0 0123 8.585v6.83c0 .73-.29 1.429-.805 1.945l-4.835 4.835a2.75 2.75 0 01-1.945.805h-6.83a2.75 2.75 0 01-1.945-.805L1.805 17.36A2.75 2.75 0 011 15.415v-6.83c0-.73.29-1.429.805-1.945L6.64 1.805zm1.945.695c-.332 0-.65.132-.884.366L2.866 7.701a1.25 1.25 0 00-.366.884v6.83c0 .332.132.65.366.884l4.835 4.835c.234.234.552.366.884.366h6.83c.332 0 .65-.132.884-.366l4.835-4.835a1.25 1.25 0 00.366-.884v-6.83c0-.332-.132-.65-.366-.884l-4.835-4.835a1.25 1.25 0 00-.884-.366h-6.83z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/keyframes.scss
index 925d1c9ed5ef8..ea5262a518bec 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-okta-color {
   100% {
     background-image: var(--icon-okta-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/placeholders.scss
index 1249beb09453c..c9b27b78b126b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-okta-color-icon {
   --icon-name: icon-okta-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/property-16.scss
index a8ff6a225572b..cf31c03877735 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-okta-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23007DC1" d="M8 1C4.143 1 1 4.12 1 8s3.121 7 7 7 7-3.121 7-7-3.143-7-7-7zm0 10.5c-1.94 0-3.5-1.56-3.5-3.5S6.06 4.5 8 4.5s3.5 1.56 3.5 3.5-1.56 3.5-3.5 3.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/property-24.scss
index eeb4677de1a1d..686f1937b8f54 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/okta-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-okta-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23007DC1" d="M12 2C6.49 2 2 6.458 2 12s4.459 10 10 10 10-4.459 10-10S17.51 2 12 2zm0 15c-2.77 0-5-2.23-5-5s2.23-5 5-5 5 2.23 5 5-2.23 5-5 5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/okta/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/okta/index.scss
index b5d6bca7954c3..57209848c23c0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/okta/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/okta/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../okta-color/property-16';
         @import '../okta-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/okta/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/okta/keyframes.scss
index 66c72f82e8256..ba9eb4e47b037 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/okta/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/okta/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-okta {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/okta/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/okta/placeholders.scss
index 6eb5adc515be0..eb6445560ca3c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/okta/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/okta/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-okta-icon {
   --icon-name: icon-okta;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/okta/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/okta/property-16.scss
index 96ea736318d08..662cf6d8b37e9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/okta/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/okta/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-okta-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8 1C4.143 1 1 4.12 1 8s3.121 7 7 7 7-3.121 7-7-3.143-7-7-7zm0 10.5c-1.94 0-3.5-1.56-3.5-3.5S6.06 4.5 8 4.5s3.5 1.56 3.5 3.5-1.56 3.5-3.5 3.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/okta/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/okta/property-24.scss
index abecb86ddea73..b3d9d2acf4c7a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/okta/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/okta/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-okta-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8 1C4.143 1 1 4.12 1 8s3.121 7 7 7 7-3.121 7-7-3.143-7-7-7zm0 10.5c-1.94 0-3.5-1.56-3.5-3.5S6.06 4.5 8 4.5s3.5 1.56 3.5 3.5-1.56 3.5-3.5 3.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/keyframes.scss
index 85ef76ba2a7e5..27b3e7b62da29 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-oracle-color {
   100% {
     background-image: var(--icon-oracle-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/placeholders.scss
index daf31ac536421..d54dcabc30e2e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-oracle-color-icon {
   --icon-name: icon-oracle-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/property-16.scss
index c48cbbfe7a4b8..0c00f21bd0b22 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-oracle-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23EA1B22" fill-rule="evenodd" d="M.1 8c0 2.761 2.237 5 4.997 5h5.806A4.999 4.999 0 0015.9 8c0-2.761-2.237-5-4.997-5H5.097A4.999 4.999 0 00.1 8zm13.911 0a3.235 3.235 0 01-3.234 3.237h-5.55A3.235 3.235 0 011.991 8a3.235 3.235 0 013.234-3.236h5.551A3.235 3.235 0 0114.011 8z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/property-24.scss
index 55c12f3cf34a7..60b8b515bf963 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-oracle-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23EA1B22" fill-rule="evenodd" d="M2 12c0 3.48 2.832 6.3 6.326 6.3h7.348C19.168 18.3 22 15.48 22 12s-2.832-6.3-6.326-6.3H8.326C4.832 5.7 2 8.52 2 12zm17.61 0a4.086 4.086 0 01-4.095 4.078H8.489a4.086 4.086 0 01-4.095-4.077A4.086 4.086 0 018.49 7.923h7.026a4.086 4.086 0 014.094 4.078z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/index.scss
index 0456062204061..8cb6b7b062553 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../oracle-color/property-16';
         @import '../oracle-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/keyframes.scss
index e7fd6f57599d3..edb624f9ff79d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-oracle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/placeholders.scss
index 92a732057015d..502828c335639 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-oracle-icon {
   --icon-name: icon-oracle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/property-16.scss
index 1a370a20b4e86..eb7c2bc0e50a8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-oracle-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M.1 8c0 2.761 2.237 5 4.997 5h5.806A4.999 4.999 0 0015.9 8c0-2.761-2.237-5-4.997-5H5.097A4.999 4.999 0 00.1 8zm13.911 0a3.235 3.235 0 01-3.234 3.237h-5.55A3.235 3.235 0 011.991 8a3.235 3.235 0 013.234-3.236h5.551A3.235 3.235 0 0114.011 8z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/property-24.scss
index 9676d531ec60d..8d010bbf80c24 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/oracle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-oracle-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M.1 8c0 2.761 2.237 5 4.997 5h5.806A4.999 4.999 0 0015.9 8c0-2.761-2.237-5-4.997-5H5.097A4.999 4.999 0 00.1 8zm13.911 0a3.235 3.235 0 01-3.234 3.237h-5.55A3.235 3.235 0 011.991 8a3.235 3.235 0 013.234-3.236h5.551A3.235 3.235 0 0114.011 8z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/org/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/org/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/org/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/org/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/org/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/org/keyframes.scss
index 846420a2e94fb..e1f20b4f8e7aa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/org/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/org/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-org {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/org/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/org/placeholders.scss
index ac05dc90b4053..e0d2ce2fc9786 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/org/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/org/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-org-icon {
   --icon-name: icon-org;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/org/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/org/property-16.scss
index 6f852d0b01abb..a3c895b38c84a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/org/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/org/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-org-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h6.5A2.25 2.25 0 0112 3.25v2.112l2.05 1.453A2.25 2.25 0 0115 8.65v5.1c0 .69-.56 1.25-1.25 1.25h-2.5a.748.748 0 01-.75-.751v-11a.75.75 0 00-.75-.75h-6.5a.75.75 0 00-.75.75v11a.75.75 0 01-1.5 0v-11zM12 13.5V7.2l1.184.839a.75.75 0 01.316.612v4.85H12z" clip-rule="evenodd"/><path d="M4.75 10.55a.7.7 0 00-.7.7v3a.7.7 0 101.4 0v-2.3h2.1v2.3a.7.7 0 101.4 0v-3a.7.7 0 00-.7-.7h-3.5zM4.25 4.75A.75.75 0 015 4h.25a.75.75 0 010 1.5H5a.75.75 0 01-.75-.75zM7.75 4a.75.75 0 000 1.5H8A.75.75 0 008 4h-.25zM4.25 6.75A.75.75 0 015 6h.25a.75.75 0 010 1.5H5a.75.75 0 01-.75-.75zM7.75 6a.75.75 0 000 1.5H8A.75.75 0 008 6h-.25zM4.25 8.75A.75.75 0 015 8h.25a.75.75 0 010 1.5H5a.75.75 0 01-.75-.75zM7.75 8a.75.75 0 000 1.5H8A.75.75 0 008 8h-.25z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/org/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/org/property-24.scss
index d25f4b95838dd..984de2a28d3bc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/org/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/org/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-org-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h10.5A2.75 2.75 0 0118 4.75v5.504l2.326.988A2.75 2.75 0 0122 13.773v6.477A1.75 1.75 0 0120.25 22h-3a.746.746 0 01-.622-.33.746.746 0 01-.128-.42V10.769a.81.81 0 010-.039V4.75c0-.69-.56-1.25-1.25-1.25H4.75c-.69 0-1.25.56-1.25 1.25v16.5a.75.75 0 01-1.5 0V4.75zM18 20.5v-8.616l1.739.739c.461.196.76.649.76 1.15v6.477a.25.25 0 01-.25.25H18z" clip-rule="evenodd"/><path d="M8.25 16C7.56 16 7 16.56 7 17.25v4a.75.75 0 001.5 0V17.5h3v3.75a.75.75 0 001.5 0v-4c0-.69-.56-1.25-1.25-1.25h-3.5zM7 6.75A.75.75 0 017.75 6h.5a.75.75 0 010 1.5h-.5A.75.75 0 017 6.75zM11.75 6a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM7 9.75A.75.75 0 017.75 9h.5a.75.75 0 010 1.5h-.5A.75.75 0 017 9.75zM11.75 9a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM7 12.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75zM11.75 12a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/outline/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/outline/keyframes.scss
index e041c1bb5c2de..fedecbff72913 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/outline/placeholders.scss
index 1aa2f1cf66475..acbeaa2e1f238 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-outline-icon {
   --icon-name: icon-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/outline/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/outline/property-16.scss
index 51d25abd02934..e76aa4407295d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/outline/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/outline/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-outline-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.5 7.25a.75.75 0 01.75-.75h4a.75.75 0 010 1.5h-4a.75.75 0 01-.75-.75zM4.75 3.5a.75.75 0 000 1.5h.01a.75.75 0 000-1.5h-.01zM4 7.25a.75.75 0 01.75-.75h.01a.75.75 0 010 1.5h-.01A.75.75 0 014 7.25zM4.75 9.5a.75.75 0 000 1.5h.01a.75.75 0 000-1.5h-.01zM6.5 4.25a.75.75 0 01.75-.75h2.5a.75.75 0 010 1.5h-2.5a.75.75 0 01-.75-.75zM7.25 9.5a.75.75 0 000 1.5h3a.75.75 0 000-1.5h-3z"/><path fill-rule="evenodd" d="M1 2.25A2.25 2.25 0 013.25 0h9.5A2.25 2.25 0 0115 2.25v11.5A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V2.25zm2.25-.75a.75.75 0 00-.75.75v11.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75V2.25a.75.75 0 00-.75-.75h-9.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/outline/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/outline/property-24.scss
index a98c5e55f311e..26d3a533208bb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/outline/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/outline/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-outline-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M6.5 5.75A.75.75 0 017.25 5h.01a.75.75 0 010 1.5h-.01a.75.75 0 01-.75-.75zM7.25 9a.75.75 0 000 1.5h.01a.75.75 0 000-1.5h-.01zM6.5 13.75a.75.75 0 01.75-.75h.01a.75.75 0 010 1.5h-.01a.75.75 0 01-.75-.75zM7.25 17a.75.75 0 000 1.5h.01a.75.75 0 000-1.5h-.01zM9.5 9.75a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5h-4.5a.75.75 0 01-.75-.75zM10.25 5a.75.75 0 000 1.5h6.5a.75.75 0 000-1.5h-6.5zM9.5 13.75a.75.75 0 01.75-.75h6.5a.75.75 0 010 1.5h-6.5a.75.75 0 01-.75-.75zM10.25 17a.75.75 0 000 1.5h3.5a.75.75 0 000-1.5h-3.5z"/><path fill-rule="evenodd" d="M3 3.75A2.75 2.75 0 015.75 1h12.5A2.75 2.75 0 0121 3.75v16.5A2.75 2.75 0 0118.25 23H5.75A2.75 2.75 0 013 20.25V3.75zM5.75 2.5c-.69 0-1.25.56-1.25 1.25v16.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25V3.75c0-.69-.56-1.25-1.25-1.25H5.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/keyframes.scss
index ad23b96700b88..320bf5468d875 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-pack-color {
   100% {
     background-image: var(--icon-pack-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/placeholders.scss
index 10af94bef10e7..95e0d279516cf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-pack-color-icon {
   --icon-name: icon-pack-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/property-16.scss
index 3f4c6c2625060..ac9367ed26b93 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pack-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23252960" d="M4.3 9.866l-2.2-1.31a.392.392 0 00-.55.155.371.371 0 00-.05.206v2.62c0 .145.08.279.2.361l2.6 1.548c.12.072.28.072.4 0l2.6-1.547c.12-.073.2-.207.2-.362v-2.62a.408.408 0 00-.4-.412c-.07 0-.14.02-.2.051l-2.2 1.31a.396.396 0 01-.4 0z"/><path fill="url(%23pack-color-16__paint0_linear_1133_286)" d="M4.5 10.228v2.62c0 .227.18.412.4.412.07 0 .14-.02.2-.051l2.2-1.31c.12-.072.2-.206.2-.361v-2.62a.408.408 0 00-.4-.413c-.07 0-.14.02-.2.051l-2.2 1.31a.432.432 0 00-.2.362z"/><path fill="%23DE156C" d="M11.3 9.866l-2.2-1.31a.392.392 0 00-.55.155.371.371 0 00-.05.206v2.62c0 .145.08.279.2.361l2.6 1.548c.12.072.28.072.4 0l2.6-1.547c.12-.073.2-.207.2-.362v-2.62a.408.408 0 00-.4-.412c-.07 0-.14.02-.2.051l-2.2 1.31a.396.396 0 01-.4 0z"/><path fill="url(%23pack-color-16__paint1_linear_1133_286)" d="M11.5 10.228v2.62c0 .227.18.412.4.412.07 0 .14-.02.2-.051l2.2-1.31c.12-.072.2-.206.2-.361v-2.62a.408.408 0 00-.4-.413c-.07 0-.14.02-.2.051l-2.2 1.31a.432.432 0 00-.2.362z"/><g><path fill="%2347529D" d="M10.4 3.056l-2.2 1.31a.396.396 0 01-.4 0l-2.2-1.31a.392.392 0 00-.55.155.371.371 0 00-.05.206v2.62c0 .145.08.279.2.361l2.6 1.548c.12.072.28.072.4 0l2.6-1.548c.12-.072.2-.206.2-.36v-2.62a.408.408 0 00-.4-.413c-.07 0-.14.02-.2.051z"/><path fill="url(%23pack-color-16__paint2_linear_1133_286)" d="M10.4 3.056l-2.2 1.31a.419.419 0 00-.2.361v2.62c0 .228.18.413.4.413.07 0 .14-.02.2-.051l2.2-1.31c.12-.073.2-.207.2-.362v-2.62a.408.408 0 00-.4-.412c-.07 0-.14.02-.2.051z"/></g><defs><linearGradient id="pack-color-16__paint0_linear_1133_286" x1="6.004" x2="6.004" y1="8.502" y2="13.262" gradientUnits="userSpaceOnUse"><stop stop-color="%23757CBA"/><stop offset="1" stop-color="%23252960"/></linearGradient><linearGradient id="pack-color-16__paint1_linear_1133_286" x1="13.004" x2="13.004" y1="8.503" y2="13.262" gradientUnits="userSpaceOnUse"><stop stop-color="%23FC72C7"/><stop offset="1" stop-color="%23DE156C"/></linearGradient><linearGradient id="pack-color-16__paint2_linear_1133_286" x1="9.504" x2="9.504" y1="3.002" y2="7.762" gradientUnits="userSpaceOnUse"><stop stop-color="%238896DB"/><stop offset="1" stop-color="%2347529D"/></linearGradient></defs></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/property-24.scss
index a4ff385228402..68ebf53a18930 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pack-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pack-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23DE156C" d="M16.933 14.686L13.45 12.59a.617.617 0 00-.87.247.599.599 0 00-.08.33v4.193c0 .231.127.445.317.578l4.116 2.475c.19.116.444.116.634 0l4.116-2.475A.672.672 0 0022 17.36v-4.192c0-.364-.285-.66-.633-.66a.696.696 0 00-.317.082l-3.483 2.096a.622.622 0 01-.634 0z"/><path fill="url(%23pack-color-24__paint0_linear_1133_275)" d="M17.25 15.264v4.192c0 .364.285.66.633.66.111 0 .222-.032.317-.082l3.483-2.096A.671.671 0 0022 17.36v-4.192c0-.363-.285-.66-.633-.66a.697.697 0 00-.317.082l-3.483 2.097a.693.693 0 00-.317.577z"/><path fill="%2347529D" d="M15.8 3.59l-3.483 2.096a.622.622 0 01-.634 0L8.2 3.59a.617.617 0 00-.87.247.6.6 0 00-.08.33V8.36c0 .23.127.446.317.578l4.116 2.475c.19.116.444.116.634 0l4.116-2.475a.672.672 0 00.317-.578V4.168c0-.364-.285-.66-.633-.66a.697.697 0 00-.317.082z"/><path fill="url(%23pack-color-24__paint1_linear_1133_275)" d="M15.8 3.59l-3.483 2.096a.671.671 0 00-.317.578v4.192c0 .363.285.66.633.66.111 0 .222-.033.317-.082l3.483-2.096a.672.672 0 00.317-.578V4.168c0-.364-.285-.66-.633-.66a.697.697 0 00-.317.082z"/><g><path fill="%23252960" d="M6.433 14.686L2.95 12.59a.617.617 0 00-.87.247.6.6 0 00-.08.33v4.193c0 .231.127.445.317.578l4.116 2.475c.19.116.444.116.634 0l4.116-2.475a.672.672 0 00.317-.578v-4.192c0-.364-.285-.66-.633-.66a.696.696 0 00-.317.082l-3.483 2.096a.621.621 0 01-.634 0z"/><path fill="url(%23pack-color-24__paint2_linear_1133_275)" d="M6.75 15.264v4.192c0 .364.285.66.633.66.111 0 .222-.032.317-.082l3.483-2.096a.671.671 0 00.317-.578v-4.192c0-.363-.285-.66-.633-.66a.697.697 0 00-.317.082l-3.483 2.097a.693.693 0 00-.317.577z"/></g><defs><linearGradient id="pack-color-24__paint0_linear_1133_275" x1="19.631" x2="19.631" y1="12.504" y2="20.119" gradientUnits="userSpaceOnUse"><stop stop-color="%23FC72C7"/><stop offset="1" stop-color="%23DE156C"/></linearGradient><linearGradient id="pack-color-24__paint1_linear_1133_275" x1="14.381" x2="14.381" y1="3.504" y2="11.119" gradientUnits="userSpaceOnUse"><stop stop-color="%238896DB"/><stop offset="1" stop-color="%2347529D"/></linearGradient><linearGradient id="pack-color-24__paint2_linear_1133_275" x1="9.131" x2="9.131" y1="12.504" y2="20.119" gradientUnits="userSpaceOnUse"><stop stop-color="%23757CBA"/><stop offset="1" stop-color="%23252960"/></linearGradient></defs></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pack/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pack/index.scss
index 57e84bcfd7cf1..b7c706e29242c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pack/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pack/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../pack-color/property-16';
         @import '../pack-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pack/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pack/keyframes.scss
index d7b0441461b47..e02d649938236 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pack/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pack/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-pack {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pack/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pack/placeholders.scss
index 0fed67727455d..dd831dda8129c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pack/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pack/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-pack-icon {
   --icon-name: icon-pack;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pack/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pack/property-16.scss
index 7848d83a4d495..6d8257f005949 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pack/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pack/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pack-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8.2 4.366l2.2-1.31c.06-.03.13-.051.2-.051.22 0 .4.185.4.412v2.62c0 .154-.08.288-.2.36L8.2 7.944a.396.396 0 01-.4 0L5.2 6.397a.446.446 0 01-.2-.36v-2.62c0-.072.01-.144.05-.206a.392.392 0 01.55-.155l2.2 1.31c.12.072.28.072.4 0zM4.3 9.866l-2.2-1.31a.392.392 0 00-.55.155.371.371 0 00-.05.206v2.62c0 .144.08.278.2.36l2.6 1.547c.12.072.28.072.4 0l2.6-1.547c.12-.072.2-.206.2-.36v-2.62a.408.408 0 00-.4-.412c-.07 0-.14.02-.2.051l-2.2 1.31a.396.396 0 01-.4 0zM11.3 9.866l-2.2-1.31a.392.392 0 00-.55.155.371.371 0 00-.05.206v2.62c0 .144.08.278.2.36l2.6 1.547c.12.072.28.072.4 0l2.6-1.547c.12-.072.2-.206.2-.36v-2.62a.408.408 0 00-.4-.412c-.07 0-.14.02-.2.051l-2.2 1.31a.396.396 0 01-.4 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pack/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pack/property-24.scss
index 781d6e27d6136..f19c09b95d5ad 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pack/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pack/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pack-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8.2 4.366l2.2-1.31c.06-.03.13-.051.2-.051.22 0 .4.185.4.412v2.62c0 .154-.08.288-.2.36L8.2 7.944a.396.396 0 01-.4 0L5.2 6.397a.446.446 0 01-.2-.36v-2.62c0-.072.01-.144.05-.206a.392.392 0 01.55-.155l2.2 1.31c.12.072.28.072.4 0zM4.3 9.866l-2.2-1.31a.392.392 0 00-.55.155.371.371 0 00-.05.206v2.62c0 .144.08.278.2.36l2.6 1.547c.12.072.28.072.4 0l2.6-1.547c.12-.072.2-.206.2-.36v-2.62a.408.408 0 00-.4-.412c-.07 0-.14.02-.2.051l-2.2 1.31a.396.396 0 01-.4 0zM11.3 9.866l-2.2-1.31a.392.392 0 00-.55.155.371.371 0 00-.05.206v2.62c0 .144.08.278.2.36l2.6 1.547c.12.072.28.072.4 0l2.6-1.547c.12-.072.2-.206.2-.36v-2.62a.408.408 0 00-.4-.412c-.07 0-.14.02-.2.051l-2.2 1.31a.396.396 0 01-.4 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/package/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/package/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/package/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/package/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/package/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/package/keyframes.scss
index ae5de5fe96a6e..15d85aff46c68 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/package/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/package/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-package {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/package/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/package/placeholders.scss
index 37db308ddb95c..149ec22a7d4f4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/package/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/package/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-package-icon {
   --icon-name: icon-package;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/package/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/package/property-16.scss
index 7173e48446944..975b42f4549c0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/package/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/package/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-package-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M9.02.678a2.25 2.25 0 00-2.04 0L1.682 3.374A1.25 1.25 0 001 4.488v6.717c0 .658.37 1.26.956 1.56l5.023 2.557a2.25 2.25 0 002.042 0l5.023-2.557a1.75 1.75 0 00.956-1.56V4.488c0-.47-.264-.9-.683-1.114L9.021.678zM7.66 2.015a.75.75 0 01.68 0l4.436 2.258-1.468.734-4.805-2.403 1.157-.59zM4.84 3.45l-1.617.823L8 6.661l1.631-.815-4.79-2.396zM2.5 5.588v5.617c0 .094.053.18.137.223l4.613 2.348V7.964L2.5 5.588zm10.863 5.84L8.75 13.776V7.964l4.75-2.375v5.617a.25.25 0 01-.137.223z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/package/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/package/property-24.scss
index 85db99efdbd88..f5ab258f0d89f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/package/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/package/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-package-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M10.794.754a2.75 2.75 0 012.412 0l8.811 4.298c.602.293.983.904.983 1.573v9.902a2.75 2.75 0 01-1.496 2.448l-8.25 4.226a2.75 2.75 0 01-2.508 0l-8.25-4.226A2.75 2.75 0 011 16.527V6.625c0-.67.381-1.28.983-1.573L10.794.754zm1.754 1.348a1.25 1.25 0 00-1.096 0l-2.82 1.375 8.505 4.253 3.52-1.672-8.109-3.956zm2.869 6.445L6.934 4.306 3.343 6.058 12 10.17l3.417-1.623zM2.5 16.527v-9.21l8.75 4.157v10.3L3.18 17.64a1.25 1.25 0 01-.68-1.113zm18.32 1.113l-8.07 4.133V11.474l8.75-4.156v9.21c0 .469-.263.898-.68 1.112z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/keyframes.scss
index 6795253713151..192d90554f870 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-packer-color {
   100% {
     background-image: var(--icon-packer-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/placeholders.scss
index 456c8a04bb3c1..4b0bb7f0dd2d1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-packer-color-icon {
   --icon-name: icon-packer-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/property-16.scss
index d51763368186a..397af31f768ab 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-packer-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%2302A8EF"><path fill-rule="evenodd" d="M3 1.956l5.3 2.997V16L3 13.003V1.956z" clip-rule="evenodd"/><path d="M10.925 3.247L5.163 0v2.252l3.92 2.216v6.764l1.843 1.036c1.14.644 2.074.265 2.074-.858V6.447c-.001-1.115-.937-2.554-2.075-3.2z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/property-24.scss
index 7ef3092e19840..050fa679e3945 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/packer-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-packer-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%2302A8EF"><path fill-rule="evenodd" d="M5 3.311l7.42 4.308V23.5L5 19.192V3.312z" clip-rule="evenodd"/><path d="M16.095 5.168L8.028.5v3.238l5.488 3.184v9.723l2.58 1.49c1.598.925 2.904.38 2.904-1.233V9.768c-.002-1.604-1.312-3.672-2.905-4.6z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/packer/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/packer/index.scss
index d233de6f112a6..fb726996f5605 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/packer/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/packer/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../packer-color/property-16';
         @import '../packer-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/packer/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/packer/keyframes.scss
index b121ea3fe0559..14bdf41b5da8e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/packer/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/packer/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-packer {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/packer/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/packer/placeholders.scss
index 360da0a01d274..f97ce63064342 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/packer/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/packer/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-packer-icon {
   --icon-name: icon-packer;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/packer/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/packer/property-16.scss
index 63c9df0aad8ef..ffcb4d2bd3797 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/packer/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/packer/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-packer-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.163 0l5.762 3.247c1.138.646 2.074 2.085 2.075 3.2v4.963c0 1.123-.933 1.502-2.074.858L9.083 11.23V4.469l-3.92-2.216V0z"/><path d="M8.3 4.953L3 1.956v11.047L8.3 16V4.953z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/packer/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/packer/property-24.scss
index 23f6223fc6f98..4123190b29bac 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/packer/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/packer/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-packer-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.163 0l5.762 3.247c1.138.646 2.074 2.085 2.075 3.2v4.963c0 1.123-.933 1.502-2.074.858L9.083 11.23V4.469l-3.92-2.216V0z"/><path d="M8.3 4.953L3 1.956v11.047L8.3 16V4.953z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/page-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/page-outline/index.scss
index 62ee44557a532..5126d8e326c51 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/page-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/page-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../outline/property-16';
         @import '../outline/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/page-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/page-outline/keyframes.scss
index e57e96c938271..571281b798a89 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/page-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/page-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-page-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/page-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/page-outline/placeholders.scss
index 18eb382e1f223..27c90464616ff 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/page-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/page-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-page-outline-icon {
   --icon-name: icon-page-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/keyframes.scss
index b5f4ad1c59a62..096d0e8d6a3de 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-paperclip {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/placeholders.scss
index 95138794386fd..40a44a1660d0a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-paperclip-icon {
   --icon-name: icon-paperclip;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/property-16.scss
index 67fed1aa87b02..4411c9014bcb7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-paperclip-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M9.387 2.102a2.034 2.034 0 012.864 0c.776.785.749 2.178 0 2.928-.75.749-6.39 6.465-6.39 6.465a.642.642 0 01-.898 0 .685.685 0 010-.937l5.896-5.966a.75.75 0 10-1.066-1.054L3.896 9.504a2.184 2.184 0 000 3.045 2.142 2.142 0 003.033 0l6.39-6.466c1.36-1.377 1.36-3.658 0-5.035-1.364-1.381-3.636-1.381-5 0L1.938 7.513A5.001 5.001 0 00.5 11.026c0 1.316.516 2.58 1.437 3.514A4.892 4.892 0 005.42 16c1.308 0 2.56-.526 3.482-1.46l6.383-6.466a.75.75 0 10-1.068-1.053l-6.382 6.465A3.392 3.392 0 015.419 14.5a3.392 3.392 0 01-2.414-1.014A3.501 3.501 0 012 11.026c0-.924.363-1.808 1.005-2.46l6.382-6.464z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/property-24.scss
index 2e1112f511220..201d4c17cd200 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/paperclip/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-paperclip-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M16.072 2.5c-.868 0-1.7.342-2.31.949l-9.22 9.14A5.196 5.196 0 003 16.28c0 1.383.554 2.71 1.542 3.69a5.299 5.299 0 003.73 1.531c1.4 0 2.742-.552 3.73-1.532l9.22-9.14a.75.75 0 011.056 1.065l-9.22 9.14A6.799 6.799 0 018.273 23a6.799 6.799 0 01-4.786-1.966A6.696 6.696 0 011.5 16.279c0-1.785.715-3.495 1.986-4.755l9.219-9.14A4.783 4.783 0 0116.072 1c1.262 0 2.473.497 3.367 1.383a4.714 4.714 0 011.398 3.348c0 1.257-.504 2.46-1.398 3.347l-9.23 9.14a2.766 2.766 0 01-3.894 0 2.732 2.732 0 010-3.88l8.517-8.434a.75.75 0 011.055 1.066l-8.516 8.434a1.232 1.232 0 000 1.75 1.266 1.266 0 001.783 0l9.229-9.141a3.214 3.214 0 00.954-2.282c0-.855-.342-1.676-.954-2.282a3.283 3.283 0 00-2.311-.949z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/partner/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/partner/index.scss
index b4f45864ee924..cd697e91e6442 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/partner/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/partner/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../socket/property-16';
         @import '../socket/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/partner/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/partner/keyframes.scss
index 57a9b71308c90..07780c2b1e3a7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/partner/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/partner/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-partner {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/partner/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/partner/placeholders.scss
index 3dbf386c68e53..ab8d88c93a8b0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/partner/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/partner/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-partner-icon {
   --icon-name: icon-partner;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/path/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/path/index.scss
index c3868c817a3f0..322f0e751792e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/path/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/path/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../path/property-16';
         @import '../path/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/path/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/path/keyframes.scss
index e680d1f8e2748..1e3de7aca8d94 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/path/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/path/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-path {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/path/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/path/placeholders.scss
index 07dd69e724ed0..0166bd98956b5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/path/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/path/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-path-icon {
   --icon-name: icon-path;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/path/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/path/property-16.scss
index c9acc9befcc96..2c3e18ae38fdc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/path/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/path/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-path-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M13 0a3 3 0 00-1.65 5.506 7.338 7.338 0 01-.78 1.493c-.22.32-.472.635-.8 1.025a1.509 1.509 0 00-.832.085 12.722 12.722 0 00-1.773-1.124c-.66-.34-1.366-.616-2.215-.871a1.5 1.5 0 10-2.708 1.204c-.9 1.935-1.236 3.607-1.409 5.838a1.5 1.5 0 101.497.095c.162-2.07.464-3.55 1.25-5.253.381-.02.725-.183.979-.435.763.23 1.367.471 1.919.756a11.13 11.13 0 011.536.973 1.5 1.5 0 102.899-.296c.348-.415.64-.779.894-1.148.375-.548.665-1.103.964-1.857A3 3 0 1013 0zm-1.5 3a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/path/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/path/property-24.scss
index 56ce28c4d74c6..0d610b3015ce6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/path/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/path/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-path-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M19.5 1a3.5 3.5 0 00-1.668 6.578c-.665 1.8-1.174 2.997-2.267 4.503a2.001 2.001 0 00-1.605.21c-1.859-1.251-3.599-1.917-5.978-2.56A2 2 0 104.48 11.3c-.616 1.268-1.071 2.439-1.406 3.674-.344 1.267-.556 2.585-.694 4.125a2 2 0 101.497.103c.132-1.465.332-2.682.644-3.835.303-1.115.715-2.186 1.29-3.375a1.997 1.997 0 001.8-.806c2.236.605 3.801 1.208 5.454 2.311A2.002 2.002 0 0015 16a2 2 0 001.74-2.986c1.25-1.71 1.815-3.057 2.537-5.021A3.5 3.5 0 1019.5 1zm-2 3.5a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/keyframes.scss
index b833177b101a9..9c44ee475cef2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-pause-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/placeholders.scss
index 82bd279317699..eb3f876809b17 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-pause-circle-icon {
   --icon-name: icon-pause-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/property-16.scss
index 6acad0df33a9f..e4f0f6b24a819 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pause-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.25 5a.75.75 0 01.75.75v4.5a.75.75 0 01-1.5 0v-4.5A.75.75 0 016.25 5zM10.5 5.75a.75.75 0 00-1.5 0v4.5a.75.75 0 001.5 0v-4.5z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/property-24.scss
index 8b4a4a5a4ddd0..4d5e6d121e3dc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pause-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pause-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M9.25 7a.75.75 0 01.75.75v8.5a.75.75 0 01-1.5 0v-8.5A.75.75 0 019.25 7zM15.5 7.75a.75.75 0 00-1.5 0v8.5a.75.75 0 001.5 0v-8.5z"/><path fill-rule="evenodd" d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pause/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pause/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pause/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pause/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pause/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pause/keyframes.scss
index 92499643c0426..4504223d16e7b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pause/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pause/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-pause {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pause/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pause/placeholders.scss
index f565c5164e914..84d7c69bac6c4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pause/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pause/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-pause-icon {
   --icon-name: icon-pause;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pause/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pause/property-16.scss
index 75e4d5cb7af7a..882d36bf367f7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pause/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pause/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pause-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6 3.75a.75.75 0 00-1.5 0v8.5a.75.75 0 001.5 0v-8.5zM11.5 3.75a.75.75 0 00-1.5 0v8.5a.75.75 0 001.5 0v-8.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pause/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pause/property-24.scss
index 2db3b587602aa..5b6d00cc4f485 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pause/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pause/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pause-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M9 5.25a.75.75 0 00-1.5 0v13.5a.75.75 0 001.5 0V5.25zM16.5 5.25a.75.75 0 00-1.5 0v13.5a.75.75 0 001.5 0V5.25z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/keyframes.scss
index d788e746ced52..f24818d383c84 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-pen-tool {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/placeholders.scss
index 498efc0df247f..7c03b0a9e6174 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-pen-tool-icon {
   --icon-name: icon-pen-tool;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/property-16.scss
index f54ab98087649..52d5641eef675 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pen-tool-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M.923.02A.75.75 0 00.02.923l2.476 10.433a.75.75 0 00.587.563l4.245.822a.75.75 0 00.142.864l2.175 2.175a.75.75 0 001.06 0l5.075-5.075a.75.75 0 000-1.06L13.605 7.47a.75.75 0 00-.864-.142l-.822-4.245a.75.75 0 00-.563-.587L.923.02zm10.529 8.542l-.913-4.718L3.15 2.09l3.08 3.08a2.25 2.25 0 11-1.06 1.06l-3.08-3.08 1.753 7.388 4.718.913 2.89-2.89zM9.06 13.075l4.014-4.014 1.114 1.114-4.014 4.014-1.114-1.114zM6.45 7.201a.75.75 0 111.5 0 .75.75 0 01-1.5 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/property-24.scss
index 837e97b2b1390..fab905b38423b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pen-tool/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pen-tool-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M1.923 1.02a.75.75 0 00-.903.903l3.5 14.75a.75.75 0 00.588.563l6.51 1.26-.148.149a.75.75 0 000 1.06l3.075 3.075a.75.75 0 001.06 0l7.175-7.175a.75.75 0 000-1.06l-3.075-3.075a.75.75 0 00-1.06 0l-.149.148-1.26-6.51a.75.75 0 00-.563-.588l-14.75-3.5zm15.293 11.878l-1.36-7.03L4.15 3.091l5.325 5.324a3 3 0 11-1.06 1.06L3.09 4.152l2.777 11.705 7.03 1.36 4.318-4.318zm-4.155 6.277l6.114-6.114 2.014 2.014-6.114 6.114-2.014-2.014zM9.5 11a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/keyframes.scss
index 646e42eb3175f..7f98a9b9f15b9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-pencil-tool {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/placeholders.scss
index b9d8ba69095a5..2a333db023d13 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-pencil-tool-icon {
   --icon-name: icon-pencil-tool;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/property-16.scss
index d4f73d9539d38..7f6a71cd20938 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pencil-tool-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M12.988 2.177a1.75 1.75 0 00-2.475 0L3.26 9.429a2.75 2.75 0 00-.609.923l-1.347 3.37a.75.75 0 00.975.974l3.368-1.347a2.75 2.75 0 00.924-.61l7.252-7.252a1.75 1.75 0 000-2.475l-.835-.835zm-1.415 1.06a.25.25 0 01.354 0l.836.836a.25.25 0 010 .354l-.638.637-1.19-1.19.638-.637zM9.875 4.936L4.32 10.49a1.25 1.25 0 00-.277.42l-.698 1.744 1.744-.698c.157-.063.3-.157.42-.277l5.554-5.554-1.19-1.19z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/property-24.scss
index 180d19491ef54..f58e0e67f801e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pencil-tool/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pencil-tool-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M18.945 4.884a2.75 2.75 0 00-3.89 0L6.05 13.89A4.75 4.75 0 005 15.484l-1.695 4.238a.75.75 0 00.975.974l4.237-1.695a4.75 4.75 0 001.595-1.051l9.005-9.005a2.75 2.75 0 000-3.89l-.171-.17zm-2.829 1.06a1.25 1.25 0 011.768 0l.171.172a1.25 1.25 0 010 1.768l-.555.555L15.56 6.5l.556-.555zM14.5 7.562L7.11 14.95a3.25 3.25 0 00-.719 1.091l-1.045 2.613 2.613-1.045c.409-.164.78-.409 1.091-.72L16.44 9.5 14.5 7.56z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/keyframes.scss
index 3e038a07d63f8..f0dee1d62b371 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-phone-call {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/placeholders.scss
index 3586373ee3f8a..9f802ec95696f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-phone-call-icon {
   --icon-name: icon-phone-call;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/property-16.scss
index d31275849fe44..ec3eabd18a992 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-phone-call-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M5.847.533A2.21 2.21 0 004.391 0H2.206a2.21 2.21 0 00-2.09 1.501c-.098.29-.135.598-.107.903l.001.012a15.13 15.13 0 002.355 6.637c1.29 1.987 2.615 3.304 4.596 4.587a15.197 15.197 0 006.618 2.35h.014a2.21 2.21 0 002.406-2.204v-.075c-.002-.383-.008-1.771 0-2.087A2.204 2.204 0 0014.1 9.386h-.007a8.626 8.626 0 01-1.884-.47 2.21 2.21 0 00-2.327.497l-.515.513a10.903 10.903 0 01-3.313-3.305l.51-.509.003-.003a2.204 2.204 0 00.498-2.326 8.577 8.577 0 01-.47-1.88v-.007A2.204 2.204 0 005.847.533zM4.401 1.5a.71.71 0 01.708.604c.1.753.285 1.493.55 2.205l.001.001a.703.703 0 01-.157.742l-.924.923a.75.75 0 00-.122.902 12.403 12.403 0 004.655 4.646.75.75 0 00.9-.121l.923-.921.002-.002a.71.71 0 01.746-.157h.002c.713.266 1.454.45 2.209.55a.709.709 0 01.606.715 148.67 148.67 0 000 2.134v.07a.702.702 0 01-.481.671.71.71 0 01-.286.035 13.696 13.696 0 01-5.957-2.117c-1.805-1.168-2.979-2.335-4.153-4.144a13.63 13.63 0 01-2.12-5.972.702.702 0 01.419-.704c.09-.04.187-.06.286-.06H4.4zm2.664 2.283v-.001l-.703.264.703-.263z" clip-rule="evenodd"/><path d="M10.333.005a.75.75 0 10-.166 1.49 4.91 4.91 0 014.338 4.332.75.75 0 001.49-.167A6.41 6.41 0 0010.333.005z"/><path d="M10.394 2.53a.75.75 0 10-.288 1.472 2.395 2.395 0 011.892 1.892.75.75 0 101.472-.288 3.894 3.894 0 00-3.076-3.076z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/property-24.scss
index cdd4017eb74f4..347a207922530 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-call/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-phone-call-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M14.833.005a.75.75 0 00-.166 1.49 8.873 8.873 0 017.838 7.828.75.75 0 101.49-.167A10.373 10.373 0 0014.833.005zM14.894 4.29a.75.75 0 10-.288 1.473 4.596 4.596 0 013.631 3.63.75.75 0 101.472-.287 6.096 6.096 0 00-4.815-4.815z"/><path fill-rule="evenodd" d="M8.755 1.678A2.814 2.814 0 006.898 1h-3.09a2.815 2.815 0 00-2.66 1.911c-.125.37-.172.76-.137 1.15l.002.01a21.082 21.082 0 003.28 9.249c1.8 2.773 3.642 4.604 6.407 6.393a21.173 21.173 0 009.221 3.274l.014.002a2.815 2.815 0 002.829-1.671c.157-.359.237-.746.235-1.137v-.105c-.003-.539-.011-2.508 0-2.96a2.805 2.805 0 00-2.418-2.849h-.007c-.933-.123-1.85-.351-2.732-.68a2.815 2.815 0 00-2.964.632l-.9.899a15.724 15.724 0 01-5.124-5.112l.897-.895.003-.003a2.806 2.806 0 00.633-2.961 12.436 12.436 0 01-.68-2.726l-.001-.007a2.806 2.806 0 00-.951-1.736zM6.909 2.5A1.314 1.314 0 018.22 3.622c.138 1.042.394 2.066.762 3.05v.002a1.304 1.304 0 01-.293 1.377L7.382 9.356a.75.75 0 00-.122.902 17.226 17.226 0 006.466 6.454.75.75 0 00.9-.122l1.306-1.303.001-.002a1.311 1.311 0 011.384-.293h.001c.987.368 2.012.623 3.057.761a1.313 1.313 0 011.124 1.326c-.011.479-.002 2.48 0 3.007v.101a1.305 1.305 0 01-.89 1.244c-.172.058-.353.08-.533.064a19.676 19.676 0 01-8.562-3.041c-2.588-1.676-4.278-3.357-5.962-5.951A19.582 19.582 0 012.505 3.92a1.303 1.303 0 01.776-1.308c.167-.074.347-.112.53-.112h3.098zm3.478 3.647v-.001l-.702.264.702-.263z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/keyframes.scss
index 0e574ca94b426..69ff1dcc7bd05 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-phone-off {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/placeholders.scss
index 9064650294d19..82237022f4380 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-phone-off-icon {
   --icon-name: icon-phone-off;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/property-16.scss
index 225f7e0e85355..ca4cc5e741da2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-phone-off-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M4.401 1.5a.71.71 0 01.708.604c.1.753.285 1.493.55 2.205l.002.001a.703.703 0 01-.158.742l-.924.923a.75.75 0 001.06 1.061l.925-.924.003-.003a2.204 2.204 0 00.498-2.326 8.577 8.577 0 01-.47-1.88v-.007A2.204 2.204 0 004.39 0H2.206a2.21 2.21 0 00-2.09 1.501c-.098.29-.135.598-.107.903l.001.012a15.131 15.131 0 002.355 6.637.75.75 0 101.258-.817 13.631 13.631 0 01-2.12-5.972.702.702 0 01.419-.704c.09-.04.187-.06.286-.06H4.4zM4.91 12.15l-2.63 2.63a.75.75 0 01-1.06-1.06l12.5-12.5a.75.75 0 111.06 1.06L8.05 9.012c.403.334.84.632 1.312.92l.52-.519a2.209 2.209 0 012.327-.496l-.262.703.263-.703c.608.227 1.24.384 1.883.468l.007.001a2.209 2.209 0 011.9 2.239c-.009.315-.002 1.703 0 2.086v.075a2.204 2.204 0 01-2.407 2.205l-.014-.001a15.196 15.196 0 01-6.618-2.35c-.752-.487-1.426-.947-2.05-1.49zm2.075-2.074l-1.01 1.01c.517.44 1.098.84 1.801 1.295a13.696 13.696 0 005.957 2.117l-.005-.001-.068.747.081-.746h-.008a.71.71 0 00.767-.706v-.071c-.002-.372-.009-1.792 0-2.134a.704.704 0 00-.606-.715h.004l.098-.743-.105.743h.003a10.13 10.13 0 01-2.209-.55h-.002a.712.712 0 00-.746.158l.001-.002-.53-.531.527.534-.923.921a.75.75 0 01-.9.121c-.743-.421-1.461-.878-2.127-1.447z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/property-24.scss
index 087a5b98f6ed1..91796160a2cab 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone-off/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-phone-off-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M6.91 2.5a1.314 1.314 0 011.31 1.122c.138 1.042.394 2.066.762 3.05v.002a1.304 1.304 0 01-.293 1.377L7.382 9.356a.75.75 0 101.06 1.062L9.75 9.11l.003-.003a2.807 2.807 0 00.633-2.962 12.438 12.438 0 01-.68-2.725l-.001-.007A2.806 2.806 0 006.898 1h-3.09a2.815 2.815 0 00-2.66 1.911c-.125.37-.172.76-.137 1.15l.002.011a21.081 21.081 0 003.28 9.248.75.75 0 101.259-.817A19.582 19.582 0 012.505 3.92a1.303 1.303 0 01.776-1.308c.167-.074.347-.112.53-.112h3.098zm3.477 3.646l-.702.264.702-.263zM7.666 17.395L2.28 22.78a.75.75 0 01-1.06-1.06l20.5-20.5a.75.75 0 111.06 1.06L11.673 13.388a15.738 15.738 0 002.305 1.73l.9-.899a2.813 2.813 0 012.965-.631c.882.328 1.798.556 2.731.678l.007.001a2.812 2.812 0 012.418 2.85c-.011.451-.002 2.42 0 2.96v.104a2.803 2.803 0 01-1.91 2.671c-.371.125-.764.172-1.154.137l-.013-.002a21.175 21.175 0 01-9.222-3.274c-1.144-.74-2.135-1.49-3.034-2.319zm2.945-2.945l-1.883 1.883c.814.745 1.722 1.432 2.787 2.12a19.673 19.673 0 008.56 3.042 1.315 1.315 0 001.315-.78c.073-.166.11-.346.11-.528l-.001-.1c-.002-.528-.011-2.53 0-3.008a1.305 1.305 0 00-1.124-1.326 14.007 14.007 0 01-3.057-.76h-.001a1.316 1.316 0 00-1.384.292l-.001.002-1.306 1.303a.75.75 0 01-.9.122 17.233 17.233 0 01-3.115-2.262z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone/keyframes.scss
index 9fe4b3c2c9751..80a3ee120aece 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-phone {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone/placeholders.scss
index 243e0a22680b6..f12568f4fbb2d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-phone-icon {
   --icon-name: icon-phone;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone/property-16.scss
index 374fe528662fb..303ed7cf64863 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-phone-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M4.87 1.671a.71.71 0 00-.469-.171H2.208a.712.712 0 00-.671.48.702.702 0 00-.034.284c.227 2.129.954 4.175 2.12 5.972 1.175 1.81 2.348 2.976 4.153 4.145a13.696 13.696 0 005.957 2.117.713.713 0 00.708-.421c.039-.09.059-.187.059-.285v-.071c-.002-.371-.009-1.792 0-2.134a.703.703 0 00-.606-.715c-.755-.1-1.496-.284-2.209-.55h-.002a.71.71 0 00-.746.158h-.002l-.923.922a.75.75 0 01-.9.121 12.403 12.403 0 01-4.655-4.646.75.75 0 01.122-.902l.924-.923a.704.704 0 00.158-.742L5.66 4.31a10.077 10.077 0 01-.55-2.205.704.704 0 00-.24-.433zM4.39.001a2.21 2.21 0 012.205 1.895v.007c.086.643.243 1.273.47 1.88l-.703.263.702-.264a2.203 2.203 0 01-.497 2.327l-.003.003-.51.509a10.904 10.904 0 003.314 3.306l.514-.514a2.21 2.21 0 012.327-.496c.609.227 1.24.384 1.885.468l.006.001a2.209 2.209 0 011.9 2.239c-.008.315-.002 1.703 0 2.086v.075a2.202 2.202 0 01-1.502 2.098c-.29.098-.6.135-.905.107l-.014-.001a15.196 15.196 0 01-6.618-2.35c-1.981-1.282-3.306-2.6-4.596-4.587A15.131 15.131 0 01.01 2.416L.01 2.404A2.202 2.202 0 011.317.188 2.21 2.21 0 012.207 0H4.39z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/phone/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/phone/property-24.scss
index e8344216433a5..3538222b4db30 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/phone/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/phone/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-phone-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M7.778 2.817a1.314 1.314 0 00-.869-.317H3.81a1.316 1.316 0 00-1.241.89c-.058.17-.08.351-.064.53.326 3.06 1.37 6 3.047 8.583 1.684 2.595 3.374 4.276 5.963 5.951a19.676 19.676 0 008.56 3.041 1.316 1.316 0 001.315-.78c.073-.166.11-.346.11-.528l-.001-.1c-.002-.528-.011-2.53 0-3.008a1.304 1.304 0 00-1.124-1.326 14.006 14.006 0 01-3.057-.76h-.001a1.315 1.315 0 00-1.383.292l-.002.002-1.306 1.303a.75.75 0 01-.9.122 17.225 17.225 0 01-6.466-6.454.75.75 0 01.122-.902l1.307-1.305a1.306 1.306 0 00.294-1.377v-.001a13.937 13.937 0 01-.763-3.051 1.306 1.306 0 00-.442-.805zM6.898 1a2.814 2.814 0 012.808 2.414v.007c.124.932.352 1.846.681 2.726l-.702.263.702-.264a2.803 2.803 0 01-.633 2.962l-.003.003-.896.895a15.726 15.726 0 005.123 5.112l.9-.899a2.813 2.813 0 012.965-.632c.882.329 1.798.557 2.731.68h.007A2.813 2.813 0 0123 17.117c-.011.451-.002 2.42 0 2.96v.104a2.803 2.803 0 01-1.91 2.671c-.371.125-.764.172-1.154.137l-.013-.002a21.173 21.173 0 01-9.222-3.274c-2.765-1.79-4.607-3.62-6.406-6.393a21.081 21.081 0 01-3.281-9.248L1.01 4.06a2.803 2.803 0 011.665-2.82A2.815 2.815 0 013.81 1h3.09z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/keyframes.scss
index 712a2e6b548a8..79e9d428edef6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-pie-chart {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/placeholders.scss
index 59a848703d5f6..8daf05a99bddc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-pie-chart-icon {
   --icon-name: icon-pie-chart;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/property-16.scss
index a5f03832ced00..e53b322b9723a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pie-chart-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M7.75.05a.7.7 0 00-.7.7v7.5a.7.7 0 00.7.7h7.5a.7.7 0 00.7-.7 8.2 8.2 0 00-8.2-8.2zm.7 7.5V1.486a6.8 6.8 0 016.064 6.064H8.45z" clip-rule="evenodd"/><path d="M5.118 2.172A.75.75 0 004.452.828a8 8 0 1010.72 10.72.75.75 0 00-1.344-.666 6.5 6.5 0 11-8.71-8.71z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/property-24.scss
index 1c4a629712fed..1b3619fff6d9a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pie-chart/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pie-chart-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M11.75 1a.75.75 0 00-.75.75v10.5c0 .414.336.75.75.75h10.5a.75.75 0 00.75-.75A11.25 11.25 0 0011.75 1zm.75 10.5V2.529a9.751 9.751 0 018.971 8.971H12.5z" clip-rule="evenodd"/><path d="M8.08 3.344a.75.75 0 10-.62-1.366A11.002 11.002 0 001 12c0 6.075 4.925 11 11 11 4.457 0 8.294-2.65 10.022-6.46a.75.75 0 00-1.366-.619A9.502 9.502 0 0112 21.501 9.5 9.5 0 012.5 12a9.502 9.502 0 015.58-8.657z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pin/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pin/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pin/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pin/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pin/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pin/keyframes.scss
index 328e3d8a204f4..7410a60c12b24 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pin/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pin/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-pin {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pin/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pin/placeholders.scss
index 7d908ecad63b7..1641af3e2cff9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pin/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pin/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-pin-icon {
   --icon-name: icon-pin;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pin/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pin/property-16.scss
index 1e9eebd2ac224..d60644d4a5e9b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pin/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pin/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pin-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M9.121 1.4a1.25 1.25 0 011.76.008l3.707 3.708a1.25 1.25 0 010 1.768l-2.014 2.014a.75.75 0 01-.53.22h-1.16L9.452 10.55l-.248 2.231c-.103.924-1.16 1.435-1.945.88-.578-.409-1.458-1.052-2.18-1.68l-2.799 2.8a.75.75 0 01-1.06-1.061l2.799-2.8c-.628-.721-1.271-1.6-1.68-2.18-.555-.784-.044-1.841.88-1.944l2.23-.248 1.387-1.386V3.956a.75.75 0 01.225-.535L9.12 1.4zm.874 1.244L8.335 4.27v1.202a.75.75 0 01-.219.53L6.324 7.795a.75.75 0 01-.447.215l-2.053.228c.516.713 1.202 1.61 1.765 2.173s1.46 1.25 2.173 1.765l.228-2.053a.75.75 0 01.215-.447l1.838-1.839a.75.75 0 01.53-.22h1.16L13.351 6 9.995 2.644z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/pin/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/pin/property-24.scss
index 311f6a4391d7f..83e1fdb08bafc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/pin/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/pin/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-pin-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M13.614 3.482a1.75 1.75 0 012.464.012l4.425 4.425a1.75 1.75 0 010 2.475l-2.612 2.612a.75.75 0 01-.53.22h-1.634l-2.025 2.025-.275 2.48c-.144 1.295-1.622 2.005-2.713 1.218-.773-.559-1.768-1.309-2.573-2.026l-3.86 3.86a.75.75 0 11-1.061-1.06l3.86-3.861c-.717-.805-1.467-1.8-2.025-2.573-.788-1.09-.077-2.568 1.217-2.712l2.48-.276 1.964-1.963V6.643a.75.75 0 01.225-.535l2.673-2.626zm1.403 1.072a.25.25 0 00-.352-.001l-2.449 2.404V8.65a.75.75 0 01-.22.53l-2.369 2.369a.75.75 0 01-.447.215l-2.742.305c-.195.021-.257.218-.167.343.692.959 1.621 2.174 2.384 2.937.763.763 1.979 1.692 2.937 2.385.125.09.322.027.344-.168l.304-2.741a.75.75 0 01.216-.448l2.43-2.43a.75.75 0 01.53-.22h1.634l2.393-2.393a.25.25 0 000-.353l-4.426-4.426z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/keyframes.scss
index 59820a9602632..26648a0831bcb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-play-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/placeholders.scss
index 00d55d5668ef4..6316991642234 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-play-circle-icon {
   --icon-name: icon-play-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/property-16.scss
index 6b9d3602ada94..6fceb29dea9ed 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-play-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M7.421 4.356A1.25 1.25 0 005.5 5.411v5.178a1.25 1.25 0 001.921 1.055l4.069-2.59a1.25 1.25 0 000-2.109L7.42 4.356zM10.353 8L7 10.134V5.866L10.353 8z"/><path d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/property-24.scss
index a4e4850275a57..6331040f4bd1f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-play-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M10.712 6.143C9.548 5.377 8 6.213 8 7.605v8.79c0 1.393 1.548 2.228 2.712 1.462l6.68-4.395a1.75 1.75 0 000-2.924l-6.68-4.395zM9.5 7.605a.25.25 0 01.387-.209l6.681 4.395a.25.25 0 010 .418l-6.68 4.395a.25.25 0 01-.388-.209v-8.79z"/><path d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play-fill/index.scss
index d6584f5fa54d0..2b1b7f2ea3c4c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../play-circle/property-16';
         @import '../play-circle/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play-fill/keyframes.scss
index b7a3b4d05cd56..01321553faf0c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-play-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play-fill/placeholders.scss
index a6ef89b6ac141..eb31d814804e8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-play-fill-icon {
   --icon-name: icon-play-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play-outline/index.scss
index d6584f5fa54d0..2b1b7f2ea3c4c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../play-circle/property-16';
         @import '../play-circle/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play-outline/keyframes.scss
index 73b91bc1fd0f4..7ab2f30da1e40 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-play-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play-outline/placeholders.scss
index ec071673b97ad..6ca2ff6eb289c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-play-outline-icon {
   --icon-name: icon-play-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play-plain/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play-plain/index.scss
index 38fed16d90147..d3835d350dcc3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play-plain/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play-plain/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../play/property-16';
         @import '../play/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play-plain/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play-plain/keyframes.scss
index aebe36d8744eb..03f303acb6d87 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play-plain/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play-plain/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-play-plain {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play-plain/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play-plain/placeholders.scss
index 4486b90d59f71..b904428edd08f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play-plain/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play-plain/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-play-plain-icon {
   --icon-name: icon-play-plain;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play/keyframes.scss
index 0cb95615e41b0..452bba7d3283d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-play {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play/placeholders.scss
index 0ac8c7c3a591f..9943bf0031b95 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-play-icon {
   --icon-name: icon-play;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play/property-16.scss
index be2d0de18d8a1..950a12d9daa31 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-play-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3 3.814C3 2.436 4.52 1.6 5.684 2.334l6.628 4.186a1.75 1.75 0 010 2.96l-6.628 4.185C4.52 14.401 3 13.564 3 12.185v-8.37zm1.883-.211a.25.25 0 00-.383.211v8.372a.25.25 0 00.383.211l6.628-4.186a.25.25 0 000-.422L4.884 3.603z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/play/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/play/property-24.scss
index cb0d57b43e1a2..9e3620dfc72e8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/play/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/play/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-play-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M4 4.814C4 3.436 5.52 2.6 6.684 3.334l11.378 7.186a1.75 1.75 0 010 2.96L6.684 20.665C5.52 21.401 4 20.564 4 19.185V4.816zm1.883-.211a.25.25 0 00-.383.211v14.372a.25.25 0 00.383.211l11.378-7.186a.25.25 0 000-.422L5.884 4.603z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-fill/index.scss
index 8755344932aef..fab24550474d8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../plus-circle/property-16';
         @import '../plus-circle/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-fill/keyframes.scss
index 9353a6590d8c5..3a43a948a5176 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-plus-circle-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-fill/placeholders.scss
index cc6bee24d0cec..c56a73d0c8e0e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-plus-circle-fill-icon {
   --icon-name: icon-plus-circle-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-outline/index.scss
index 8755344932aef..fab24550474d8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../plus-circle/property-16';
         @import '../plus-circle/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-outline/keyframes.scss
index ff509f6b59eb0..98c7eb238ca69 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-plus-circle-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-outline/placeholders.scss
index 1c072165836c2..a2d7dd6fc840c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-plus-circle-outline-icon {
   --icon-name: icon-plus-circle-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/keyframes.scss
index 2dcc99ac8007f..04bf87b220241 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-plus-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/placeholders.scss
index 252075b51c0eb..c1bc2d967cac8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-plus-circle-icon {
   --icon-name: icon-plus-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/property-16.scss
index 64c118000a0d4..52a3ad4c39456 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-plus-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.75 4a.75.75 0 01.75.75V7h2.25a.75.75 0 010 1.5H8.5v2.25a.75.75 0 01-1.5 0V8.5H4.75a.75.75 0 010-1.5H7V4.75A.75.75 0 017.75 4z"/><path fill-rule="evenodd" d="M0 7.75a7.75 7.75 0 1115.5 0 7.75 7.75 0 01-15.5 0zM7.75 1.5a6.25 6.25 0 100 12.5 6.25 6.25 0 000-12.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/property-24.scss
index 6c6b0d2862952..b84b536a8d85d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-plus-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11.75 6.75a.75.75 0 01.75.75V11H16a.75.75 0 010 1.5h-3.5V16a.75.75 0 01-1.5 0v-3.5H7.5a.75.75 0 010-1.5H11V7.5a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M1 11.75C1 5.813 5.813 1 11.75 1S22.5 5.813 22.5 11.75 17.687 22.5 11.75 22.5 1 17.687 1 11.75zM11.75 2.5a9.25 9.25 0 100 18.5 9.25 9.25 0 000-18.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-plain/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-plain/index.scss
index 0f31faf723c78..1614627b19146 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-plain/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-plain/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../plus/property-16';
         @import '../plus/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-plain/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-plain/keyframes.scss
index 0cc7ee720e12f..569f1548b76de 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-plain/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-plain/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-plus-plain {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-plain/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-plain/placeholders.scss
index 38c9218e1118c..454c56d4e8ad3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-plain/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-plain/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-plus-plain-icon {
   --icon-name: icon-plus-plain;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square-fill/index.scss
index 27c62d7ad9b4c..08dddeee5b91d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../plus-square/property-16';
         @import '../plus-square/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square-fill/keyframes.scss
index d70e927c71a02..d1b0e3b8c9c91 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-plus-square-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square-fill/placeholders.scss
index 667dd5fb49af0..b63b043b926cd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-plus-square-fill-icon {
   --icon-name: icon-plus-square-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/keyframes.scss
index 53915f751c57b..9255830f563bb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-plus-square {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/placeholders.scss
index a7a9d197dea7c..6cb5048990e2b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-plus-square-icon {
   --icon-name: icon-plus-square;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/property-16.scss
index 4aa637b799cb4..506134da4365c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-plus-square-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.75 4a.75.75 0 01.75.75V7h2.25a.75.75 0 010 1.5H8.5v2.25a.75.75 0 01-1.5 0V8.5H4.75a.75.75 0 010-1.5H7V4.75A.75.75 0 017.75 4z"/><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h9a2.25 2.25 0 012.25 2.25v9a2.25 2.25 0 01-2.25 2.25h-9A2.25 2.25 0 011 12.25v-9zm2.25-.75a.75.75 0 00-.75.75v9c0 .414.336.75.75.75h9a.75.75 0 00.75-.75v-9a.75.75 0 00-.75-.75h-9z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/property-24.scss
index eca14e99b5e39..aeca2844fd07b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus-square/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-plus-square-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11.75 6.75a.75.75 0 01.75.75V11H16a.75.75 0 010 1.5h-3.5V16a.75.75 0 01-1.5 0v-3.5H7.5a.75.75 0 010-1.5H11V7.5a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h14a2.75 2.75 0 012.75 2.75v14a2.75 2.75 0 01-2.75 2.75h-14A2.75 2.75 0 012 18.75v-14zM4.75 3.5c-.69 0-1.25.56-1.25 1.25v14c0 .69.56 1.25 1.25 1.25h14c.69 0 1.25-.56 1.25-1.25v-14c0-.69-.56-1.25-1.25-1.25h-14z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus/keyframes.scss
index 8a008cd2312a6..bae721d793bf1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-plus {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus/placeholders.scss
index 21700330932cb..1f60f5b38b4bb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-plus-icon {
   --icon-name: icon-plus;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus/property-16.scss
index 9cf4c7e2cc33a..b0229c4afc545 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-plus-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M9 3.5a.75.75 0 00-1.5 0V7H4a.75.75 0 000 1.5h3.5V12A.75.75 0 009 12V8.5h3.5a.75.75 0 000-1.5H9V3.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/plus/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/plus/property-24.scss
index ab03a9db66bd2..22d31cc2eaa8e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/plus/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/plus/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-plus-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M13 5a.75.75 0 00-1.5 0v6.5H5A.75.75 0 005 13h6.5v6.5a.75.75 0 001.5 0V13h6.5a.75.75 0 000-1.5H13V5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/port/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/port/index.scss
index 68293edadf9dc..86cee0b297c2b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/port/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/port/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/port/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/port/keyframes.scss
index 7651c699b9c88..171b29600fbb3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/port/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/port/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-port {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/port/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/port/placeholders.scss
index f1a471012e109..ec41fa6795ebc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/port/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/port/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-port-icon {
   --icon-name: icon-port;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/port/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/port/property-16.scss
index 41c5b8b33e84f..136f2f453d53e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/port/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/port/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-port-16: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M8.35 3.00001C8.35 2.08874 9.08873 1.35001 10 1.35001H14C14.9113 1.35001 15.65 2.08874 15.65 3.00001V7.00001C15.65 7.91128 14.9113 8.65001 14 8.65001H12.5834C12.5836 8.66071 12.5836 8.67147 12.5833 8.68229L12.5329 10.7L21.35 10.7C21.709 10.7 22 10.991 22 11.35C22 11.709 21.709 12 21.35 12H17.5826C17.594 12.0482 17.6 12.0984 17.6 12.15V14.35H19C19.9113 14.35 20.65 15.0887 20.65 16V20C20.65 20.9113 19.9113 21.65 19 21.65H15C14.0887 21.65 13.35 20.9113 13.35 20V16C13.35 15.0887 14.0887 14.35 15 14.35H16.3V12.15C16.3 12.0984 16.306 12.0482 16.3174 12H12.012C11.96 12.012 11.9056 12.0176 11.8498 12.0162C11.8053 12.0151 11.762 12.0096 11.7202 12H7.58261C7.59398 12.0482 7.6 12.0984 7.6 12.15V14.35H9C9.91127 14.35 10.65 15.0887 10.65 16V20C10.65 20.9113 9.91127 21.65 9 21.65H5C4.08873 21.65 3.35 20.9113 3.35 20V16C3.35 15.0887 4.08873 14.35 5 14.35H6.3V12.15C6.3 12.0984 6.30602 12.0482 6.31739 12H2.65C2.29102 12 2 11.709 2 11.35C2 10.991 2.29101 10.7 2.65 10.7L11.2325 10.7L11.2838 8.65001H10C9.08873 8.65001 8.35 7.91128 8.35 7.00001V3.00001ZM10 2.65001C9.8067 2.65001 9.65 2.80671 9.65 3.00001V7.00001C9.65 7.19331 9.8067 7.35001 10 7.35001H14C14.1933 7.35001 14.35 7.19331 14.35 7.00001V3.00001C14.35 2.80671 14.1933 2.65001 14 2.65001H10ZM5 15.65C4.8067 15.65 4.65 15.8067 4.65 16V20C4.65 20.1933 4.8067 20.35 5 20.35H9C9.1933 20.35 9.35 20.1933 9.35 20V16C9.35 15.8067 9.1933 15.65 9 15.65H5ZM14.65 16C14.65 15.8067 14.8067 15.65 15 15.65H19C19.1933 15.65 19.35 15.8067 19.35 16V20C19.35 20.1933 19.1933 20.35 19 20.35H15C14.8067 20.35 14.65 20.1933 14.65 20V16Z" fill="%236F7682"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/port/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/port/property-24.scss
index 15f93e4bb036f..1217bfe31d017 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/port/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/port/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-port-24: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M8.35 3.00001C8.35 2.08874 9.08873 1.35001 10 1.35001H14C14.9113 1.35001 15.65 2.08874 15.65 3.00001V7.00001C15.65 7.91128 14.9113 8.65001 14 8.65001H12.5834C12.5836 8.66071 12.5836 8.67147 12.5833 8.68229L12.5329 10.7L21.35 10.7C21.709 10.7 22 10.991 22 11.35C22 11.709 21.709 12 21.35 12H17.5826C17.594 12.0482 17.6 12.0984 17.6 12.15V14.35H19C19.9113 14.35 20.65 15.0887 20.65 16V20C20.65 20.9113 19.9113 21.65 19 21.65H15C14.0887 21.65 13.35 20.9113 13.35 20V16C13.35 15.0887 14.0887 14.35 15 14.35H16.3V12.15C16.3 12.0984 16.306 12.0482 16.3174 12H12.012C11.96 12.012 11.9056 12.0176 11.8498 12.0162C11.8053 12.0151 11.762 12.0096 11.7202 12H7.58261C7.59398 12.0482 7.6 12.0984 7.6 12.15V14.35H9C9.91127 14.35 10.65 15.0887 10.65 16V20C10.65 20.9113 9.91127 21.65 9 21.65H5C4.08873 21.65 3.35 20.9113 3.35 20V16C3.35 15.0887 4.08873 14.35 5 14.35H6.3V12.15C6.3 12.0984 6.30602 12.0482 6.31739 12H2.65C2.29102 12 2 11.709 2 11.35C2 10.991 2.29101 10.7 2.65 10.7L11.2325 10.7L11.2838 8.65001H10C9.08873 8.65001 8.35 7.91128 8.35 7.00001V3.00001ZM10 2.65001C9.8067 2.65001 9.65 2.80671 9.65 3.00001V7.00001C9.65 7.19331 9.8067 7.35001 10 7.35001H14C14.1933 7.35001 14.35 7.19331 14.35 7.00001V3.00001C14.35 2.80671 14.1933 2.65001 14 2.65001H10ZM5 15.65C4.8067 15.65 4.65 15.8067 4.65 16V20C4.65 20.1933 4.8067 20.35 5 20.35H9C9.1933 20.35 9.35 20.1933 9.35 20V16C9.35 15.8067 9.1933 15.65 9 15.65H5ZM14.65 16C14.65 15.8067 14.8067 15.65 15 15.65H19C19.1933 15.65 19.35 15.8067 19.35 16V20C19.35 20.1933 19.1933 20.35 19 20.35H15C14.8067 20.35 14.65 20.1933 14.65 20V16Z" fill="%236F7682"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/power/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/power/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/power/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/power/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/power/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/power/keyframes.scss
index bd5ac4370710b..e99df5e0553a4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/power/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/power/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-power {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/power/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/power/placeholders.scss
index 4887acf45f270..488d20e05fb0c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/power/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/power/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-power-icon {
   --icon-name: icon-power;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/power/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/power/property-16.scss
index 31634672dbbf0..6563357402e7a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/power/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/power/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-power-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8.5 1.25a.75.75 0 00-1.5 0v5.5a.75.75 0 001.5 0v-5.5z"/><path d="M3.548 3.825a.75.75 0 00-1.096-1.024 7.25 7.25 0 1010.596 0 .75.75 0 00-1.096 1.024 5.75 5.75 0 11-8.404 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/power/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/power/property-24.scss
index 4b1d015c9d0dc..f8285ca5d0ffb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/power/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/power/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-power-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12.5 2A.75.75 0 0011 2v10a.75.75 0 001.5 0V2z"/><path d="M5.562 7.293a.75.75 0 10-1.124-.992A9.716 9.716 0 002 12.75c0 5.385 4.365 9.75 9.75 9.75s9.75-4.365 9.75-9.75a9.716 9.716 0 00-2.438-6.45.75.75 0 10-1.124.993 8.25 8.25 0 11-12.375 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/printer/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/printer/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/printer/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/printer/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/printer/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/printer/keyframes.scss
index 92787c2ad191d..d68f9603bc1be 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/printer/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/printer/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-printer {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/printer/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/printer/placeholders.scss
index c85d1c3d9a1c3..2fa6c349957b2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/printer/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/printer/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-printer-icon {
   --icon-name: icon-printer;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/printer/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/printer/property-16.scss
index dae378a012849..eb16302ed997b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/printer/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/printer/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-printer-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M2.25 5H3V3.25A2.25 2.25 0 015.25 1h5.5A2.25 2.25 0 0113 3.25V5h.75A2.25 2.25 0 0116 7.25v3.5A2.25 2.25 0 0113.75 13H12.5v.25c0 .69-.56 1.25-1.25 1.25h-6.5c-.69 0-1.25-.56-1.25-1.25V13H2.25A2.25 2.25 0 010 10.75v-3.5A2.25 2.25 0 012.25 5zm3-2.5a.75.75 0 00-.75.75V5h7V3.25a.75.75 0 00-.75-.75h-5.5zm-1.75 9V9.75c0-.69.56-1.25 1.25-1.25h6.5c.69 0 1.25.56 1.25 1.25v1.75h1.25a.75.75 0 00.75-.75v-3.5a.75.75 0 00-.75-.75H2.25a.75.75 0 00-.75.75v3.5c0 .414.336.75.75.75H3.5zM11 13H5v-3h6v3z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/printer/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/printer/property-24.scss
index 0265ccdc40805..997051d8511b1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/printer/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/printer/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-printer-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M5 3.75V8H3.75A2.75 2.75 0 001 10.75v5.5A2.75 2.75 0 003.75 19H5v2.25c0 .966.784 1.75 1.75 1.75h10.5A1.75 1.75 0 0019 21.25V19h1.25A2.75 2.75 0 0023 16.25v-5.5A2.75 2.75 0 0020.25 8H19V3.75A2.75 2.75 0 0016.25 1h-8.5A2.75 2.75 0 005 3.75zM7.75 2.5c-.69 0-1.25.56-1.25 1.25V8h11V3.75c0-.69-.56-1.25-1.25-1.25h-8.5zM19 17.5h1.25c.69 0 1.25-.56 1.25-1.25v-5.5c0-.69-.56-1.25-1.25-1.25H3.75c-.69 0-1.25.56-1.25 1.25v5.5c0 .69.56 1.25 1.25 1.25H5v-2.75c0-.966.784-1.75 1.75-1.75h10.5c.966 0 1.75.784 1.75 1.75v2.75zM6.5 14.75a.25.25 0 01.25-.25h10.5a.25.25 0 01.25.25v6.5a.25.25 0 01-.25.25H6.75a.25.25 0 01-.25-.25v-6.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/index.scss
index 68293edadf9dc..86cee0b297c2b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/keyframes.scss
index 102d0fba432dc..2980eb3555438 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-protocol {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/placeholders.scss
index 2665c94fe2fa0..48f441167ffba 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-protocol-icon {
   --icon-name: icon-protocol;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/property-16.scss
index 880318ec93862..ef0a53a857350 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-protocol-16: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12ZM11.8104 19.9978C11.9269 19.8258 12.0639 19.6117 12.212 19.3572C12.5111 18.8431 12.8544 18.1657 13.1663 17.3382C12.9879 17.3233 12.8084 17.3101 12.6278 17.2987C11.9536 17.2562 11.2715 17.2398 10.5929 17.2563C10.8669 18.1335 11.2168 19.0463 11.6554 19.9927C11.7069 19.9949 11.7586 19.9966 11.8104 19.9978ZM9.897 19.7207C9.55842 18.9089 9.28019 18.1195 9.05511 17.354C8.53381 17.4089 8.01993 17.4871 7.51892 17.5915C7.73118 18.0727 7.97418 18.5653 8.25086 19.0689C8.7684 19.344 9.31972 19.5638 9.897 19.7207ZM5.45938 16.6077C5.48104 16.6001 5.50273 16.5925 5.52445 16.585C4.46623 13.3833 4.62347 10.6454 5.21707 8.50224C5.09245 8.46738 4.97167 8.43251 4.85496 8.39777C4.30807 9.4804 4 10.7042 4 12C4 13.7156 4.54003 15.3051 5.45938 16.6077ZM5.69311 7.07772C5.69614 7.07856 5.69918 7.07939 5.70221 7.08023C5.70623 7.07039 5.71025 7.06056 5.71427 7.05076C5.7072 7.05973 5.70015 7.06872 5.69311 7.07772ZM8.96894 4.59417C8.93129 4.63447 8.8765 4.69478 8.80813 4.77455C8.66145 4.94568 8.45292 5.20563 8.21744 5.5491C7.8904 6.02611 7.51351 6.66107 7.17773 7.44022C7.68086 7.54828 8.21954 7.64986 8.78391 7.73875L8.79848 7.68326C9.18148 6.23496 9.70589 5.06597 10.1744 4.20925C9.75921 4.30615 9.35646 4.43539 8.96894 4.59417ZM12.0548 4.00018C11.938 4.17254 11.8005 4.38729 11.6519 4.64277C11.2113 5.40008 10.6747 6.5116 10.2841 7.93527C10.6414 7.97247 11.0048 8.00331 11.3722 8.02649C12.1215 8.07374 12.8805 8.08863 13.6336 8.06207C13.3315 6.79045 12.8705 5.435 12.2062 4.00261C12.1559 4.00133 12.1054 4.00052 12.0548 4.00018ZM15.0311 19.4058C14.5954 19.5843 14.1406 19.7255 13.6705 19.8253C14.0078 19.2125 14.3757 18.4365 14.6998 17.5098C15.227 17.5833 15.7354 17.6688 16.2175 17.7617C16.0682 18.019 15.9209 18.2491 15.7826 18.4509C15.5471 18.7944 15.3386 19.0543 15.1919 19.2255C15.1235 19.3052 15.0687 19.3655 15.0311 19.4058ZM18.4508 16.7325C19.4247 15.4072 20 13.7708 20 12C20 10.7332 19.7056 9.53525 19.1814 8.47072C19.0626 8.52056 18.9428 8.56843 18.8221 8.61438C19.5339 11.495 19.2703 13.9558 18.6676 15.8898C18.5781 16.1768 18.4814 16.4516 18.3797 16.7138C18.4035 16.72 18.4272 16.7262 18.4508 16.7325ZM15.7491 4.93109C16.2637 5.8677 16.6617 6.76614 16.9623 7.6241C16.3749 7.76946 15.7668 7.87585 15.147 7.94868C14.8822 6.77294 14.493 5.53469 13.9502 4.23938C14.5831 4.39792 15.1861 4.63186 15.7491 4.93109ZM6.67301 8.86539C7.23389 8.98964 7.83778 9.10647 8.47251 9.20809C8.16114 11.101 8.13055 13.3457 8.68042 15.8864C8.10403 15.9541 7.53135 16.0491 6.96921 16.176C5.97706 13.2159 6.14482 10.7469 6.67301 8.86539ZM9.9596 9.4091C9.66322 11.1785 9.63171 13.3152 10.1908 15.7687C11.047 15.7336 11.8982 15.7497 12.7222 15.8017C13.0281 15.8209 13.3313 15.8453 13.6308 15.8739C14.0706 14.1822 14.3018 12.0541 13.9234 9.55152C13.0288 9.59288 12.1384 9.57779 11.2778 9.52351C10.8317 9.49538 10.3912 9.45656 9.9596 9.4091ZM16.9025 16.3689C16.3454 16.2539 15.7517 16.1474 15.1319 16.0564C15.5821 14.232 15.7965 12.0001 15.4213 9.42649C16.0858 9.3447 16.7447 9.22621 17.3877 9.06387C18.0053 11.6354 17.7519 13.7864 17.2355 15.4435C17.1337 15.7703 17.0212 16.0789 16.9025 16.3689Z" fill="%236F7682"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/property-24.scss
index d48af2fa5b7f8..1e4a869eef8ef 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/protocol/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-protocol-24: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12ZM11.8104 19.9978C11.9269 19.8258 12.0639 19.6117 12.212 19.3572C12.5111 18.8431 12.8544 18.1657 13.1663 17.3382C12.9879 17.3233 12.8084 17.3101 12.6278 17.2987C11.9536 17.2562 11.2715 17.2398 10.5929 17.2563C10.8669 18.1335 11.2168 19.0463 11.6554 19.9927C11.7069 19.9949 11.7586 19.9966 11.8104 19.9978ZM9.897 19.7207C9.55842 18.9089 9.28019 18.1195 9.05511 17.354C8.53381 17.4089 8.01993 17.4871 7.51892 17.5915C7.73118 18.0727 7.97418 18.5653 8.25086 19.0689C8.7684 19.344 9.31972 19.5638 9.897 19.7207ZM5.45938 16.6077C5.48104 16.6001 5.50273 16.5925 5.52445 16.585C4.46623 13.3833 4.62347 10.6454 5.21707 8.50224C5.09245 8.46738 4.97167 8.43251 4.85496 8.39777C4.30807 9.4804 4 10.7042 4 12C4 13.7156 4.54003 15.3051 5.45938 16.6077ZM5.69311 7.07772C5.69614 7.07856 5.69918 7.07939 5.70221 7.08023C5.70623 7.07039 5.71025 7.06056 5.71427 7.05076C5.7072 7.05973 5.70015 7.06872 5.69311 7.07772ZM8.96894 4.59417C8.93129 4.63447 8.8765 4.69478 8.80813 4.77455C8.66145 4.94568 8.45292 5.20563 8.21744 5.5491C7.8904 6.02611 7.51351 6.66107 7.17773 7.44022C7.68086 7.54828 8.21954 7.64986 8.78391 7.73875L8.79848 7.68326C9.18148 6.23496 9.70589 5.06597 10.1744 4.20925C9.75921 4.30615 9.35646 4.43539 8.96894 4.59417ZM12.0548 4.00018C11.938 4.17254 11.8005 4.38729 11.6519 4.64277C11.2113 5.40008 10.6747 6.5116 10.2841 7.93527C10.6414 7.97247 11.0048 8.00331 11.3722 8.02649C12.1215 8.07374 12.8805 8.08863 13.6336 8.06207C13.3315 6.79045 12.8705 5.435 12.2062 4.00261C12.1559 4.00133 12.1054 4.00052 12.0548 4.00018ZM15.0311 19.4058C14.5954 19.5843 14.1406 19.7255 13.6705 19.8253C14.0078 19.2125 14.3757 18.4365 14.6998 17.5098C15.227 17.5833 15.7354 17.6688 16.2175 17.7617C16.0682 18.019 15.9209 18.2491 15.7826 18.4509C15.5471 18.7944 15.3386 19.0543 15.1919 19.2255C15.1235 19.3052 15.0687 19.3655 15.0311 19.4058ZM18.4508 16.7325C19.4247 15.4072 20 13.7708 20 12C20 10.7332 19.7056 9.53525 19.1814 8.47072C19.0626 8.52056 18.9428 8.56843 18.8221 8.61438C19.5339 11.495 19.2703 13.9558 18.6676 15.8898C18.5781 16.1768 18.4814 16.4516 18.3797 16.7138C18.4035 16.72 18.4272 16.7262 18.4508 16.7325ZM15.7491 4.93109C16.2637 5.8677 16.6617 6.76614 16.9623 7.6241C16.3749 7.76946 15.7668 7.87585 15.147 7.94868C14.8822 6.77294 14.493 5.53469 13.9502 4.23938C14.5831 4.39792 15.1861 4.63186 15.7491 4.93109ZM6.67301 8.86539C7.23389 8.98964 7.83778 9.10647 8.47251 9.20809C8.16114 11.101 8.13055 13.3457 8.68042 15.8864C8.10403 15.9541 7.53135 16.0491 6.96921 16.176C5.97706 13.2159 6.14482 10.7469 6.67301 8.86539ZM9.9596 9.4091C9.66322 11.1785 9.63171 13.3152 10.1908 15.7687C11.047 15.7336 11.8982 15.7497 12.7222 15.8017C13.0281 15.8209 13.3313 15.8453 13.6308 15.8739C14.0706 14.1822 14.3018 12.0541 13.9234 9.55152C13.0288 9.59288 12.1384 9.57779 11.2778 9.52351C10.8317 9.49538 10.3912 9.45656 9.9596 9.4091ZM16.9025 16.3689C16.3454 16.2539 15.7517 16.1474 15.1319 16.0564C15.5821 14.232 15.7965 12.0001 15.4213 9.42649C16.0858 9.3447 16.7447 9.22621 17.3877 9.06387C18.0053 11.6354 17.7519 13.7864 17.2355 15.4435C17.1337 15.7703 17.0212 16.0789 16.9025 16.3689Z" fill="%236F7682"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/provider/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/provider/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/provider/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/provider/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/provider/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/provider/keyframes.scss
index 11dcd294092fc..a7af17348c93d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/provider/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/provider/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-provider {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/provider/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/provider/placeholders.scss
index 37ac3cd37a533..f493eba0a2281 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/provider/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/provider/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-provider-icon {
   --icon-name: icon-provider;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/provider/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/provider/property-16.scss
index 0498acdc529ca..9684039fad66b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/provider/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/provider/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-provider-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zm-.5 1.519a6.464 6.464 0 00-2 .48V5.19l2-1.09V1.518zM1.532 7.356A6.491 6.491 0 014 2.876V6.01L1.532 7.356zm.05 1.68L4 7.719v5.406a6.495 6.495 0 01-2.418-4.087zM7.5 11.423l-2 1.143V6.9l2-1.091v5.613zm1.5-.857V4.991L11 3.9v5.522l-2 1.143zm2 .585l-2 1.143v2.13a6.456 6.456 0 002-.655V11.15zm1.5 1.54v-2.397l1.887-1.079A6.488 6.488 0 0112.5 12.69zm0-4.125V3.31a6.482 6.482 0 011.976 4.126L12.5 8.565zm-5 4.585l-1.697.97a6.47 6.47 0 001.697.361V13.15zM9 3.282V1.576a6.455 6.455 0 011.961.636L9 3.282z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/provider/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/provider/property-24.scss
index c2d7dc8252887..3d55f91f570af 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/provider/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/provider/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-provider-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zm-1 1.552a9.438 9.438 0 00-3.5 1.08v4.085L11 5.85V2.552zm-8.349 7.75A9.493 9.493 0 016 4.635v3.883l-3.349 1.786zm-.15 1.781L6 10.217v9.149a9.481 9.481 0 01-3.5-7.283zM11 17.02l-3.5 2.032V9.417L11 7.55v9.47zm1.5-.871V6.75L16 4.883v9.234l-3.5 2.032zm3.5-.298l-3.5 2.033v3.603a9.449 9.449 0 003.5-.868v-4.768zm1.5 3.896V14.98l3.977-2.309a9.491 9.491 0 01-3.977 7.076zm0-6.501V4.253a9.494 9.494 0 013.943 6.703l-3.943 2.29zM11 18.754l-3.117 1.81c.96.463 2.01.768 3.117.884v-2.694zM12.5 5.05V2.513c1.168.06 2.28.332 3.3.777l-3.3 1.76z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/public-default/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/public-default/index.scss
index 709d7210b62b6..96bd5f825397c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/public-default/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/public-default/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../globe/property-16';
         @import '../globe/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/public-default/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/public-default/keyframes.scss
index 339fa162bf0fe..386d325f73b06 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/public-default/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/public-default/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-public-default {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/public-default/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/public-default/placeholders.scss
index 7a38074d8e2a8..0ea288363057c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/public-default/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/public-default/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-public-default-icon {
   --icon-name: icon-public-default;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/public-locked/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/public-locked/index.scss
index 96b8e3f08ea9f..e616bb4afce3e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/public-locked/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/public-locked/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../globe-private/property-16';
         @import '../globe-private/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/public-locked/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/public-locked/keyframes.scss
index fa64b5ef70b16..996383eaaad2c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/public-locked/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/public-locked/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-public-locked {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/public-locked/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/public-locked/placeholders.scss
index 60933a605ea95..6673f373c8424 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/public-locked/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/public-locked/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-public-locked-icon {
   --icon-name: icon-public-locked;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/queue/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/queue/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/queue/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/queue/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/queue/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/queue/keyframes.scss
index 4a4989c16991f..f6a4d106721be 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/queue/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/queue/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-queue {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/queue/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/queue/placeholders.scss
index 9b7cc48d7b724..3c30bba8799ff 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/queue/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/queue/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-queue-icon {
   --icon-name: icon-queue;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/queue/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/queue/property-16.scss
index 268867f29282e..922cea1aa389b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/queue/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/queue/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-queue-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M2.23 2.674a.75.75 0 00-.96 1.152L3.578 5.75 1.27 7.674a.75.75 0 00.96 1.152l3-2.5a.75.75 0 000-1.152l-3-2.5zM8.25 5a.75.75 0 000 1.5h6a.75.75 0 000-1.5h-6zM5.5 9.25a.75.75 0 01.75-.75h8a.75.75 0 010 1.5h-8a.75.75 0 01-.75-.75zM6.25 12a.75.75 0 000 1.5h8a.75.75 0 000-1.5h-8z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/queue/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/queue/property-24.scss
index 51c62a6f1e6b7..6005b745f5447 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/queue/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/queue/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-queue-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3.19 3.892a.75.75 0 10-.88 1.216L5.97 7.75l-3.66 2.642a.75.75 0 00.88 1.216l4.5-3.25a.75.75 0 000-1.216l-4.5-3.25zM11.75 7a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5zM8 12.75a.75.75 0 01.75-.75h12.5a.75.75 0 010 1.5H8.75a.75.75 0 01-.75-.75zM8.75 17a.75.75 0 000 1.5h12.5a.75.75 0 000-1.5H8.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-checked/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-checked/index.scss
index c65a7d6ba296d..0d50e281f32b1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-checked/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-checked/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../circle-dot/property-16';
         @import '../circle-dot/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-checked/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-checked/keyframes.scss
index 02bf9523c026c..2ce3c8d7b198b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-checked/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-checked/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-radio-button-checked {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-checked/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-checked/placeholders.scss
index eba2bd8d91658..0c0f86b11253d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-checked/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-checked/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-radio-button-checked-icon {
   --icon-name: icon-radio-button-checked;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-unchecked/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-unchecked/index.scss
index fbad05507ede2..da2541dff7a70 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-unchecked/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-unchecked/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../circle/property-16';
         @import '../circle/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-unchecked/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-unchecked/keyframes.scss
index 3e24048aed20c..c66f082d998f3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-unchecked/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-unchecked/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-radio-button-unchecked {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-unchecked/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-unchecked/placeholders.scss
index 24bc67c03a656..9c398711ff4c5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-unchecked/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/radio-button-unchecked/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-radio-button-unchecked-icon {
   --icon-name: icon-radio-button-unchecked;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/radio/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/radio/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/radio/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/radio/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/radio/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/radio/keyframes.scss
index 5d957ea2f4952..5ee40a3116528 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/radio/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/radio/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-radio {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/radio/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/radio/placeholders.scss
index ccbf03e814897..ac968d7555088 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/radio/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/radio/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-radio-icon {
   --icon-name: icon-radio;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/radio/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/radio/property-16.scss
index 3efa46ed569a7..7acc1b0423cea 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/radio/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/radio/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-radio-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.41 2.476a.75.75 0 01-.013 1.06A6.235 6.235 0 001.5 8c0 1.67.68 3.276 1.897 4.463a.75.75 0 01-1.048 1.074A7.735 7.735 0 010 8c0-2.08.847-4.072 2.35-5.537a.75.75 0 011.06.013zM12.59 2.476a.75.75 0 011.06-.013A7.735 7.735 0 0116 8c0 2.08-.847 4.072-2.35 5.537a.75.75 0 01-1.047-1.074A6.234 6.234 0 0014.5 8c0-1.67-.68-3.276-1.897-4.463a.75.75 0 01-.013-1.06zM7 8a1 1 0 011-1h.01a1 1 0 010 2H8a1 1 0 01-1-1z"/><path d="M5.864 6.046a.75.75 0 10-1.028-1.092c-.42.395-.756.867-.987 1.39a4.1 4.1 0 000 3.307c.23.523.567.994.987 1.39a.75.75 0 001.028-1.093 2.774 2.774 0 01-.642-.902 2.6 2.6 0 010-2.098c.147-.334.365-.641.642-.902zM11.164 4.96a.75.75 0 10-1.028 1.092c.277.26.495.567.642.902a2.601 2.601 0 010 2.098 2.775 2.775 0 01-.642.902.75.75 0 101.028 1.092c.42-.395.756-.866.986-1.39a4.1 4.1 0 000-3.307 4.273 4.273 0 00-.986-1.39z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/radio/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/radio/property-24.scss
index 95976f71941b2..772cc10accb55 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/radio/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/radio/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-radio-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M5.282 4.22a.75.75 0 010 1.06 9.502 9.502 0 000 13.436.75.75 0 01-1.06 1.06 11.002 11.002 0 010-15.556.75.75 0 011.06 0zM18.718 4.22a.75.75 0 011.06 0 11.002 11.002 0 010 15.557.75.75 0 11-1.06-1.06 9.502 9.502 0 000-13.437.75.75 0 010-1.06z"/><path fill-rule="evenodd" d="M9 12a3 3 0 116 0 3 3 0 01-6 0zm3-1.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3z" clip-rule="evenodd"/><path d="M8.117 8.026A.75.75 0 107.05 6.974a7.11 7.11 0 00-1.517 2.305 7.194 7.194 0 000 5.432 7.11 7.11 0 001.517 2.305.75.75 0 001.068-1.053 5.611 5.611 0 01-1.196-1.819 5.694 5.694 0 010-4.299 5.61 5.61 0 011.196-1.819zM16.951 6.984a.75.75 0 10-1.069 1.053c.513.52.92 1.138 1.197 1.819a5.693 5.693 0 010 4.299 5.612 5.612 0 01-1.197 1.819.75.75 0 001.07 1.052 7.11 7.11 0 001.516-2.305 7.194 7.194 0 000-5.432 7.11 7.11 0 00-1.517-2.305z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/random/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/random/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/random/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/random/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/random/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/random/keyframes.scss
index 5f53a76648bbe..2859e66d7b901 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/random/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/random/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-random {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/random/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/random/placeholders.scss
index 22cbd39c8121d..4c68fd336f9a4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/random/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/random/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-random-icon {
   --icon-name: icon-random;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/random/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/random/property-16.scss
index 54bdeffa37b77..4f5ce1eaf7eb8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/random/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/random/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-random-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5 4a1 1 0 000 2h.01a1 1 0 000-2H5zM7 8a1 1 0 011-1h.01a1 1 0 010 2H8a1 1 0 01-1-1zM11.01 10a1 1 0 100 2h.01a1 1 0 100-2h-.01z"/><path fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zM2.5 3.25a.75.75 0 01.75-.75h9.5a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75v-9.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/random/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/random/property-24.scss
index 5cb8cb5c6c765..4d67004aee025 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/random/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/random/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-random-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 9.5a2.5 2.5 0 100 5 2.5 2.5 0 000-5zM11 12a1 1 0 112 0 1 1 0 01-2 0zM5 7.5a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0zm2.5-1a1 1 0 100 2 1 1 0 000-2zM16.5 14a2.5 2.5 0 100 5 2.5 2.5 0 000-5zm-1 2.5a1 1 0 112 0 1 1 0 01-2 0z"/><path d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25h14.5c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25V4.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/index.scss
index 06bae6e9c52bb..c0b9218cb2739 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../redirect/property-16';
         @import '../redirect/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/keyframes.scss
index 4ac8f52d1ef0e..51910931e2584 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-redirect {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/placeholders.scss
index f5f79ef820cf7..d8fd49df4551e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-redirect-icon {
   --icon-name: icon-redirect;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/property-16.scss
index 351e3b2936b07..efb0c969cbaa1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-redirect-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 3.517a1 1 0 011.62-.784l5.348 4.233a1 1 0 010 1.568l-5.347 4.233A1 1 0 018 11.983v-1.545c-.76-.043-1.484.003-2.254.218-.994.279-2.118.857-3.506 1.99a.993.993 0 01-1.129.096.962.962 0 01-.445-1.099c.415-1.5 1.425-3.141 2.808-4.412C4.69 6.114 6.244 5.241 8 5.042V3.517zm1.5 1.034v1.2a.75.75 0 01-.75.75c-1.586 0-3.066.738-4.261 1.835a8.996 8.996 0 00-1.635 2.014c.878-.552 1.695-.916 2.488-1.138 1.247-.35 2.377-.33 3.49-.207a.75.75 0 01.668.745v1.2l4.042-3.2L9.5 4.55z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/property-24.scss
index 920dd4f971590..3ea23a6e8e9e3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/redirect/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-redirect-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 5.786c0-1.046 1.209-1.63 2.028-.978l7.45 5.922c.627.498.63 1.45.005 1.952l-7.45 5.997c-.817.659-2.033.077-2.033-.973v-2.754a7.316 7.316 0 00-2.824.427c-1.306.456-2.918 1.342-5.295 2.981-.436.3-.973.287-1.37.029a1.168 1.168 0 01-.479-1.326c.59-2 1.91-4.124 3.743-5.755C7.444 9.824 9.571 8.72 12 8.529V5.786zm1.5.518V9.25a.75.75 0 01-.75.75c-2.296 0-4.35.98-5.978 2.428-1.36 1.21-2.393 2.723-2.994 4.189 2.03-1.357 3.565-2.187 4.903-2.654 1.53-.535 2.769-.584 4.137-.46a.75.75 0 01.682.747v2.933l6.8-5.473-6.8-5.406z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-alert/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-alert/index.scss
index 51302b8df13c7..97efb59fc59bc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-alert/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-alert/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../sync-alert/property-16';
         @import '../sync-alert/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-alert/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-alert/keyframes.scss
index 20934523f1ed0..6d9467ca178d5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-alert/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-alert/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-refresh-alert {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-alert/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-alert/placeholders.scss
index 0721860b34892..87a93c8fa4f47 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-alert/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-alert/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-refresh-alert-icon {
   --icon-name: icon-refresh-alert;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-default/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-default/index.scss
index 74f747e184d2b..3717ed350be1c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-default/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-default/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../sync/property-16';
         @import '../sync/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-default/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-default/keyframes.scss
index bcac7d7332311..797f679d908ef 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-default/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-default/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-refresh-default {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-default/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-default/placeholders.scss
index 1e1db0b6ec1c7..a468dfd2a6e8e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-default/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/refresh-default/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-refresh-default-icon {
   --icon-name: icon-refresh-default;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/reload/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/reload/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/reload/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/reload/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/reload/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/reload/keyframes.scss
index 321237777274a..c92be17f19d0c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/reload/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/reload/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-reload {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/reload/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/reload/placeholders.scss
index b1fa1fbf6c123..96b96a676cf20 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/reload/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/reload/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-reload-icon {
   --icon-name: icon-reload;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/reload/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/reload/property-16.scss
index b9521afb208e8..218b47e2f1d0d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/reload/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/reload/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-reload-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M7.248 1.307A.75.75 0 118.252.193l2.5 2.25a.75.75 0 010 1.114l-2.5 2.25a.75.75 0 01-1.004-1.114l1.29-1.161a4.5 4.5 0 103.655 2.832.75.75 0 111.398-.546A6 6 0 118.018 2l-.77-.693z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/reload/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/reload/property-24.scss
index f29f5de4f484c..79f151e82a1ea 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/reload/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/reload/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-reload-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M11.24 1.3A.75.75 0 1112.26.2l3.5 3.25a.75.75 0 010 1.1l-3.5 3.25a.75.75 0 11-1.02-1.1l2.217-2.059a7.5 7.5 0 105.532 4.632.75.75 0 111.397-.546 9 9 0 11-7.237-5.654L11.24 1.3z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/remix/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/remix/index.scss
index 8a03c3edb4a00..7d066de548d9c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/remix/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/remix/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../shuffle/property-16';
         @import '../shuffle/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/remix/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/remix/keyframes.scss
index 50d9fc06c6933..d5ff8b898bffa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/remix/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/remix/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-remix {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/remix/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/remix/placeholders.scss
index f5f3930e5ab3d..09880188a533f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/remix/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/remix/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-remix-icon {
   --icon-name: icon-remix;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/keyframes.scss
index 9e11b074dccf2..43c673e1a9ec2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-repeat {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/placeholders.scss
index a3cc213f9f068..08692c06f31a0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-repeat-icon {
   --icon-name: icon-repeat;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/property-16.scss
index aa3edd7629e8d..40b03650df455 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-repeat-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.238.68a.75.75 0 10-.976 1.14l1.96 1.68H4.418A3.417 3.417 0 001 6.917v.833a.75.75 0 001.5 0v-.833A1.917 1.917 0 014.417 5h7.806l-1.961 1.68a.75.75 0 00.976 1.14l3.5-3a.75.75 0 000-1.14l-3.5-3z"/><path d="M5.82 8.262a.75.75 0 01-.082 1.057L3.778 11h7.805A1.916 1.916 0 0013.5 9.083V8.25a.75.75 0 011.5 0v.833a3.417 3.417 0 01-3.417 3.417H3.777l1.961 1.68a.75.75 0 11-.976 1.14l-3.5-3a.75.75 0 010-1.14l3.5-3a.75.75 0 011.057.082z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/property-24.scss
index 557199b51f941..33ada148b49c9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/repeat/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-repeat-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M17.515.455a.75.75 0 00-1.03 1.09L19.614 4.5H6.75A4.75 4.75 0 002 9.25v2a.75.75 0 001.5 0v-2A3.25 3.25 0 016.75 6h12.864l-3.129 2.955a.75.75 0 001.03 1.09l4.5-4.25a.75.75 0 000-1.09l-4.5-4.25zM8.045 13.985a.75.75 0 01-.03 1.06L4.886 18H17.25a3.25 3.25 0 003.25-3.25v-2a.75.75 0 011.5 0v2a4.75 4.75 0 01-4.75 4.75H4.886l3.129 2.955a.75.75 0 01-1.03 1.09l-4.5-4.25a.75.75 0 010-1.09l4.5-4.25a.75.75 0 011.06.03z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/keyframes.scss
index a15438d5b164f..2578b38066d1e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-replication-direct {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/placeholders.scss
index 98c56dc34ec8d..724e51366b272 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-replication-direct-icon {
   --icon-name: icon-replication-direct;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/property-16.scss
index f82f48c10cde7..8ad32602e7f35 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-replication-direct-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M0 2.25A2.25 2.25 0 012.25 0h6.5A2.25 2.25 0 0111 2.25v8a.75.75 0 01-.75.75h-8A2.25 2.25 0 010 8.75v-6.5zm2.25-.75a.75.75 0 00-.75.75v6.5c0 .414.336.75.75.75H9.5V2.25a.75.75 0 00-.75-.75h-6.5z" clip-rule="evenodd"/><path d="M12.75 3.55a.7.7 0 01.7.7v8c0 .657-.53 1.2-1.197 1.2H4.25a.7.7 0 110-1.4h7.8v-7.8a.7.7 0 01.7-.7z"/><path d="M15.95 6.75a.7.7 0 00-1.4 0v6.5c0 .718-.581 1.3-1.299 1.3h-6.5a.7.7 0 10-.001 1.4h6.501a2.699 2.699 0 002.699-2.7v-6.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/property-24.scss
index 3f103841fc89f..6a134c591efdb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-direct/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-replication-direct-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M1 3.75A2.75 2.75 0 013.75 1h10.5A2.75 2.75 0 0117 3.75v12.5a.75.75 0 01-.75.75H3.75A2.75 2.75 0 011 14.25V3.75zM3.75 2.5c-.69 0-1.25.56-1.25 1.25v10.5c0 .69.56 1.25 1.25 1.25H15.5V3.75c0-.69-.56-1.25-1.25-1.25H3.75z" clip-rule="evenodd"/><path d="M19.25 6a.75.75 0 01.75.75v11.5c0 .964-.778 1.75-1.747 1.75H6.75a.75.75 0 010-1.5h11.503c.135 0 .247-.11.247-.25V6.75a.75.75 0 01.75-.75z"/><path d="M23 9.75a.75.75 0 00-1.5 0v9.5a2.248 2.248 0 01-2.248 2.25H9.75a.75.75 0 000 1.5h9.502A3.748 3.748 0 0023 19.25v-9.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/keyframes.scss
index 7718af7baacd1..ec0e7b2bb90f9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-replication-perf {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/placeholders.scss
index 49741648a9dce..3fa3dfbe792fe 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-replication-perf-icon {
   --icon-name: icon-replication-perf;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/property-16.scss
index 394e372cfdf01..1312e9ecbe271 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-replication-perf-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h6.5A2.25 2.25 0 0112 3.25v1.104a.71.71 0 01.078.067l.667.667A.7.7 0 0112 6.237v1.45a.71.71 0 01.078.068l1.75 1.75a.7.7 0 01-.99.99L12 9.656v.094c0 .417-.113.807-.31 1.141.142.022.279.088.388.197l2.667 2.667a.7.7 0 11-.99.99l-2.667-2.667a.697.697 0 01-.197-.389c-.334.198-.724.311-1.141.311h-.093l.338.338a.7.7 0 01-.99.99l-1.25-1.25A.71.71 0 017.687 12H6.323l1.755 1.755a.7.7 0 11-.99.99l-2.666-2.667A.71.71 0 014.354 12H3.25A2.25 2.25 0 011 9.75v-6.5zm2.25-.75a.75.75 0 00-.75.75v6.5c0 .414.336.75.75.75h6.5a.75.75 0 00.75-.75v-6.5a.75.75 0 00-.75-.75h-6.5z" clip-rule="evenodd"/><path d="M11.495 13.838a.7.7 0 00-.99.99l.583.584a.7.7 0 00.99-.99l-.583-.584zM15.345 11.021a.7.7 0 00-.99.99l.067.067a.7.7 0 00.99-.99l-.067-.067zM13.375 6.705a.7.7 0 01.99 0l.833.833a.7.7 0 01-.99.99l-.833-.833a.7.7 0 010-.99z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/property-24.scss
index be0f767aa548c..7c536fdadc905 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/replication-perf/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-replication-perf-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h10.5A2.75 2.75 0 0118 4.75v2.19l.78.78A.75.75 0 0118 8.957v2.982l2.78 2.78a.75.75 0 11-1.06 1.061L18 14.06v1.19c0 .495-.13.959-.36 1.36.05.03.097.067.14.11l4 4a.75.75 0 11-1.06 1.06l-4-4a.751.751 0 01-.11-.14c-.401.23-.865.36-1.36.36h-1.19l.72.72a.75.75 0 11-1.06 1.06L11.94 18H9.06l2.72 2.72a.75.75 0 11-1.06 1.06L6.94 18H4.75A2.75 2.75 0 012 15.25V4.75zM4.75 3.5c-.69 0-1.25.56-1.25 1.25v10.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H4.75z" clip-rule="evenodd"/><path d="M16.78 20.72a.75.75 0 10-1.06 1.06l1 1a.75.75 0 101.06-1.06l-1-1zM22.68 16.62a.75.75 0 00-1.06 1.06l.1.1a.75.75 0 001.06-1.06l-.1-.1zM19.72 9.72a.75.75 0 011.06 0l1 1a.75.75 0 11-1.06 1.06l-1-1a.75.75 0 010-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/keyframes.scss
index bbb0c590229fe..b3ed71b7e9e61 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-rewind {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/placeholders.scss
index 098d081d38baa..2c984bed42fdc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-rewind-icon {
   --icon-name: icon-rewind;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/property-16.scss
index 39ee1ded20320..c810909b47c6c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-rewind-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M7.074 3.364A1.25 1.25 0 019 4.416v1.806l4.039-2.795A1.25 1.25 0 0115 4.454v7.092a1.25 1.25 0 01-1.961 1.027L9 9.778v1.806a1.25 1.25 0 01-1.926 1.051L1.499 9.051a1.25 1.25 0 010-2.103l5.575-3.584zM2.637 8L7.5 11.126V4.874L2.637 8zm6.43 0l4.433 3.069V4.93L9.068 8z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/property-24.scss
index 80eb1ff355adf..0768fc0b83728 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rewind/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-rewind-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M10.188 5.38C11.34 4.501 13 5.322 13 6.771v3.332l6.188-4.723C20.34 4.501 22 5.322 22 6.771V17.23c0 1.449-1.66 2.27-2.812 1.391L13 13.898v3.331c0 1.449-1.66 2.27-2.812 1.391l-6.851-5.229a1.75 1.75 0 010-2.782l6.851-5.229zM11.5 6.771a.25.25 0 00-.402-.198L4.247 11.8a.25.25 0 000 .398l6.851 5.229a.25.25 0 00.402-.199V6.771zm9 0a.25.25 0 00-.402-.198l-7.061 5.389v.077l7.061 5.389a.25.25 0 00.402-.199V6.771z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/ribbon/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/ribbon/index.scss
index c9943fe4762c1..53786328b0688 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/ribbon/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/ribbon/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../award/property-16';
         @import '../award/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/ribbon/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/ribbon/keyframes.scss
index 9a7d03cfcbb90..ef1a8373f68e0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/ribbon/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/ribbon/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-ribbon {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/ribbon/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/ribbon/placeholders.scss
index 19b8b4ab27b36..f12afa3ebf51c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/ribbon/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/ribbon/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-ribbon-icon {
   --icon-name: icon-ribbon;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/keyframes.scss
index 2fec5714f5b6a..1c09b8d4d6845 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-rocket {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/placeholders.scss
index 9e0c2128814af..f3b7f6e86583b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-rocket-icon {
   --icon-name: icon-rocket;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/property-16.scss
index 8c05eafa443e7..6acf31f48e434 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-rocket-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M9.78 7.28a.75.75 0 00-1.06-1.06l-.5.5a.75.75 0 001.06 1.06l.5-.5z"/><path fill-rule="evenodd" d="M12.627 1.32a1.731 1.731 0 012.054 2.053c-.27 1.28-.686 3.19-1.103 4.859a3.625 3.625 0 01-.58 1.224c.002.015.002.03.002.044v2.441a1.75 1.75 0 01-.833 1.49l-2.021 1.244a1.75 1.75 0 01-2.284-.397l-1.27-1.587a2.028 2.028 0 01-1.08-.917 3.426 3.426 0 00-.542-.744 3.428 3.428 0 00-.744-.542c-.4-.223-.755-.61-.917-1.08l-1.587-1.27a1.75 1.75 0 01-.398-2.284l1.244-2.021A1.75 1.75 0 014.058 3H6.5l.044.001c.37-.263.777-.467 1.224-.579 1.669-.417 3.58-.833 4.859-1.103zm-5.43 9.956a.754.754 0 00-.167-.025.517.517 0 01-.209-.208 4.913 4.913 0 00-.79-1.073 4.913 4.913 0 00-1.074-.791.516.516 0 01-.208-.21.754.754 0 00-.025-.166l.002-.008c.255-.78.694-1.941 1.307-2.958.634-1.05 1.353-1.773 2.099-1.96 1.641-.41 3.53-.821 4.804-1.09a.231.231 0 01.277.277c-.269 1.274-.68 3.163-1.09 4.804-.187.746-.91 1.465-1.96 2.099-1.017.613-2.177 1.052-2.958 1.307a.173.173 0 01-.008.002zm1.139 1.193l.697.872a.25.25 0 00.327.057l2.021-1.244a.25.25 0 00.119-.213v-1.056c-.186.13-.375.252-.562.366-.88.53-1.832.936-2.602 1.218zM2.659 6.967l.872.697c.282-.77.687-1.722 1.218-2.602.113-.187.235-.376.366-.562H4.059a.25.25 0 00-.213.119L2.602 6.64a.25.25 0 00.057.327z" clip-rule="evenodd"/><path d="M4.442 11.558a.625.625 0 010 .884l-2 2a.625.625 0 11-.884-.884l2-2a.625.625 0 01.884 0zM2.692 10.308a.625.625 0 010 .884l-.75.75a.625.625 0 11-.884-.884l.75-.75a.625.625 0 01.884 0zM5.692 14.192a.625.625 0 10-.884-.884l-.75.75a.625.625 0 10.884.884l.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/property-24.scss
index 0223ff56a0981..ae472cc4f357e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rocket/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-rocket-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M14.78 10.28a.75.75 0 10-1.06-1.06l-.5.5a.75.75 0 101.06 1.06l.5-.5z"/><path fill-rule="evenodd" d="M19.63 2.317a1.733 1.733 0 012.053 2.053c-.38 1.827-1.07 5.047-1.76 7.812-.182.723-.542 1.377-1.012 1.964l-.002.015-.457 3.198a1.75 1.75 0 01-.658 1.133l-3.516 2.736a1.75 1.75 0 01-2.456-.307l-1.783-2.293a1.932 1.932 0 01-1.129-.982c-.24-.486-.59-1.07-1.037-1.518-.448-.448-1.033-.799-1.52-1.038a1.932 1.932 0 01-.98-1.129l-2.294-1.783a1.75 1.75 0 01-.307-2.456l2.735-3.517a1.75 1.75 0 011.134-.658l3.197-.456.016-.002c.587-.47 1.24-.83 1.964-1.011 2.765-.691 5.986-1.381 7.812-1.761zM8.234 6.835l-1.38.197a.25.25 0 00-.163.094l-2.735 3.517a.25.25 0 00.044.35l1.6 1.245c.38-1.121.982-2.674 1.813-4.124.247-.43.52-.863.821-1.279zm7.652 9.752c.43-.247.863-.52 1.279-.821l-.197 1.38a.25.25 0 01-.095.162l-3.516 2.736a.25.25 0 01-.351-.044l-1.245-1.6c1.122-.38 2.675-.982 4.125-1.813zm4.329-12.523a.234.234 0 00-.28-.279c-1.821.38-5.018 1.064-7.753 1.748-1.32.33-2.498 1.636-3.467 3.327-.946 1.65-1.586 3.476-1.911 4.53a.22.22 0 00.02.17c.034.069.1.14.192.184.556.274 1.305.71 1.917 1.323.613.612 1.049 1.36 1.323 1.917a.425.425 0 00.185.192.22.22 0 00.169.02c1.054-.325 2.88-.965 4.53-1.91 1.691-.97 2.997-2.148 3.327-3.468.684-2.735 1.369-5.932 1.748-7.754z" clip-rule="evenodd"/><path d="M4.03 15.97a.75.75 0 010 1.06l-1 1a.75.75 0 01-1.06-1.06l1-1a.75.75 0 011.06 0zM6.53 17.47a.75.75 0 010 1.06l-3 3a.75.75 0 01-1.06-1.06l3-3a.75.75 0 011.06 0zM8.03 21.03a.75.75 0 10-1.06-1.06l-1 1a.75.75 0 101.06 1.06l1-1z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/keyframes.scss
index 4495ab5d8844e..c975a9cb6edf6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-rotate-ccw {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/placeholders.scss
index 68539a4ce65c1..4ee181cb617b2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-rotate-ccw-icon {
   --icon-name: icon-rotate-ccw;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/property-16.scss
index 654a6dd07b861..ebd5d1f1a65ce 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-rotate-ccw-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M2 .75a.75.75 0 011.5 0v1.888A7 7 0 111 8a.75.75 0 011.5 0 5.5 5.5 0 101.725-4H6.75a.75.75 0 010 1.5h-4A.75.75 0 012 4.75v-4z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/property-24.scss
index 79e1f6017bc3a..7b2cd02fcb961 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-ccw/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-rotate-ccw-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M3 1.75a.75.75 0 011.5 0v3.636A9.977 9.977 0 0112 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12a.75.75 0 011.5 0 8.5 8.5 0 102.019-5.5H9.25a.75.75 0 010 1.5h-5.5A.75.75 0 013 7.25v-5.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/keyframes.scss
index c3433e3af418f..8926acb1d6c60 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-rotate-cw {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/placeholders.scss
index 1c6ef6c3c22cb..d48e5271b290a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-rotate-cw-icon {
   --icon-name: icon-rotate-cw;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/property-16.scss
index 42e7b06643037..23441b7072c6b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-rotate-cw-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M14 .75a.75.75 0 00-1.5 0v1.888A7 7 0 1015 8a.75.75 0 00-1.5 0 5.5 5.5 0 11-1.725-4H9.25a.75.75 0 000 1.5h4a.75.75 0 00.75-.75v-4z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/property-24.scss
index 9d660218199a9..b4cbf5720d170 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rotate-cw/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-rotate-cw-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M21 1.75a.75.75 0 00-1.5 0v3.636A9.977 9.977 0 0012 2C6.477 2 2 6.477 2 12s4.477 10 10 10 10-4.477 10-10a.75.75 0 00-1.5 0 8.5 8.5 0 11-2.019-5.5H14.75a.75.75 0 000 1.5h5.5a.75.75 0 00.75-.75v-5.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rss/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rss/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rss/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rss/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rss/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rss/keyframes.scss
index 13e9a4f4fa15b..c0b4532242165 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rss/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rss/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-rss {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rss/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rss/placeholders.scss
index 729fdbc982011..6a9c9c822dd7d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rss/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rss/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-rss-icon {
   --icon-name: icon-rss;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rss/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rss/property-16.scss
index 6af684d8f761a..c66a039764421 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rss/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rss/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-rss-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M2.75 1a.75.75 0 000 1.5A10.75 10.75 0 0113.5 13.25a.75.75 0 001.5 0A12.25 12.25 0 002.75 1z"/><path d="M2.75 6a.75.75 0 000 1.5 5.75 5.75 0 015.75 5.75.75.75 0 001.5 0A7.25 7.25 0 002.75 6zM3.5 11a1.5 1.5 0 100 3 1.5 1.5 0 000-3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/rss/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/rss/property-24.scss
index 1c719c2fc3804..aca319ee9323d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/rss/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/rss/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-rss-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3.75 3a.75.75 0 000 1.5A15.75 15.75 0 0119.5 20.25a.75.75 0 001.5 0A17.25 17.25 0 003.75 3z"/><path d="M3.75 10a.75.75 0 000 1.5 8.75 8.75 0 018.75 8.75.75.75 0 001.5 0A10.25 10.25 0 003.75 10zM5 17a2 2 0 100 4 2 2 0 000-4z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/run/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/run/index.scss
index 68293edadf9dc..86cee0b297c2b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/run/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/run/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/run/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/run/keyframes.scss
index fe9207eaf9eda..a1228da0f9f03 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/run/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/run/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-run {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/run/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/run/placeholders.scss
index fae4ba28c3f28..dbcbcc6e5f3f5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/run/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/run/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-run-icon {
   --icon-name: icon-run;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/run/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/run/property-16.scss
index b9bd1760f944f..b22be33f80038 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/run/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/run/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-run-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" class="structure-icon-run"><style>.structure-icon-run {animation: structure-icon-run-simple-spin 1s infinite linear;}.structure-icon-run-progress {animation: structure-icon-run-fancy-spin 3s infinite linear;fill: transparent;opacity: 0.66;stroke-dasharray: 16 16;transform-origin: 50% 50%;}@keyframes structure-icon-run-fancy-spin {0% {stroke-dasharray: 4 32;}50% {stroke-dasharray: 24 8;}50% {stroke-dasharray: 4 32;}50% {stroke-dasharray: 24 8;}100% {stroke-dasharray: 4 32;}}@keyframes structure-icon-run-simple-spin {0% {transform: rotate(0deg);}100% {transform: rotate(360deg);}}</style><g fill="none" fill-rule="evenodd"><circle cx="12" cy="12" r="8" stroke="%23000" stroke-width="4"/><circle cx="12" cy="12" r="5" stroke="%23000" stroke-width="2" class="structure-icon-run-progress"/><circle cx="12" cy="12" r="4" fill="currentColor"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/run/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/run/property-24.scss
index 05c54a326fd31..19bec2752fd81 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/run/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/run/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-run-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" class="structure-icon-run"><style>.structure-icon-run {animation: structure-icon-run-simple-spin 1s infinite linear;}.structure-icon-run-progress {animation: structure-icon-run-fancy-spin 3s infinite linear;fill: transparent;opacity: 0.66;stroke-dasharray: 16 16;transform-origin: 50% 50%;}@keyframes structure-icon-run-fancy-spin {0% {stroke-dasharray: 4 32;}50% {stroke-dasharray: 24 8;}50% {stroke-dasharray: 4 32;}50% {stroke-dasharray: 24 8;}100% {stroke-dasharray: 4 32;}}@keyframes structure-icon-run-simple-spin {0% {transform: rotate(0deg);}100% {transform: rotate(360deg);}}</style><g fill="none" fill-rule="evenodd"><circle cx="12" cy="12" r="8" stroke="%23000" stroke-width="4"/><circle cx="12" cy="12" r="5" stroke="%23000" stroke-width="2" class="structure-icon-run-progress"/><circle cx="12" cy="12" r="4" fill="currentColor"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/running/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/running/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/running/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/running/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/running/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/running/keyframes.scss
index bb209f31f1462..cf69cb09ff782 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/running/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/running/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-running {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/running/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/running/placeholders.scss
index 47a73f3e99940..954c92ffdf9d7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/running/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/running/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-running-icon {
   --icon-name: icon-running;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/running/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/running/property-16.scss
index e912059a46c31..abd360de7d697 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/running/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/running/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-running-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16" class="hds-flight-icon--animation-running"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 1.5a6.48 6.48 0 00-4.707 2.017.75.75 0 11-1.086-1.034A7.98 7.98 0 018 0a7.98 7.98 0 015.793 2.483.75.75 0 11-1.086 1.034A6.48 6.48 0 008 1.5zM1.236 5.279a.75.75 0 01.514.927 6.503 6.503 0 004.727 8.115.75.75 0 11-.349 1.459 8.003 8.003 0 01-5.82-9.986.75.75 0 01.928-.515zm13.528 0a.75.75 0 01.928.515 8.003 8.003 0 01-5.82 9.986.75.75 0 01-.35-1.459 6.503 6.503 0 004.728-8.115.75.75 0 01.514-.927z"/><path d="M8 4.5a3.5 3.5 0 100 7 3.5 3.5 0 000-7zM3 8a5 5 0 1110 0A5 5 0 013 8z" opacity=".2"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/running/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/running/property-24.scss
index 2b51d63838025..92bccdb265671 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/running/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/running/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-running-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="hds-flight-icon--animation-running"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 2.5a9.47 9.47 0 00-6.88 2.948.75.75 0 01-1.085-1.034A10.97 10.97 0 0112 1a10.97 10.97 0 017.965 3.414.75.75 0 11-1.086 1.034A9.47 9.47 0 0012 2.5zM2.351 8.451a.75.75 0 01.515.928A9.506 9.506 0 002.5 12c0 4.48 3.102 8.237 7.276 9.238a.75.75 0 01-.35 1.459C4.593 21.537 1 17.189 1 12c0-1.051.148-2.07.424-3.034a.75.75 0 01.927-.515zm19.297 0a.75.75 0 01.928.515C22.852 9.93 23 10.949 23 12c0 5.19-3.593 9.538-8.426 10.697a.75.75 0 11-.35-1.459c4.174-1 7.276-4.758 7.276-9.238 0-.91-.128-1.79-.366-2.621a.75.75 0 01.514-.928z"/><path d="M12 5.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM4 12a8 8 0 1116 0 8 8 0 01-16 0z" opacity=".2"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/save/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/save/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/save/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/save/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/save/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/save/keyframes.scss
index 4672c17caab58..9d9e16604593b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/save/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/save/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-save {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/save/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/save/placeholders.scss
index 9b69856c22f77..90d4e36d66208 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/save/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/save/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-save-icon {
   --icon-name: icon-save;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/save/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/save/property-16.scss
index dca1c0d57a463..559e4e465bcbf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/save/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/save/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-save-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h6.879a2.25 2.25 0 011.59.659l2.622 2.621c.422.422.659.995.659 1.591v6.879A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h.8V9.25a1.2 1.2 0 011.2-1.2h5.5a1.2 1.2 0 011.2 1.2v4.25h.8a.75.75 0 00.75-.75V5.871a.75.75 0 00-.22-.53L10.66 2.72a.75.75 0 00-.53-.22H5.45v2.05h3.8a.7.7 0 010 1.4h-4a1.2 1.2 0 01-1.2-1.2V2.5h-.8zm7.3 11h-5.1V9.45h5.1v4.05z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/save/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/save/property-24.scss
index 0396d2eeca6b3..68adfced97f03 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/save/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/save/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-save-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V9.078c0-.729-.29-1.428-.805-1.944l-4.329-4.329A2.75 2.75 0 0014.922 2H4.75zm0 1.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25H6v-6.75c0-.966.784-1.75 1.75-1.75h8.5c.966 0 1.75.784 1.75 1.75v6.75h1.25c.69 0 1.25-.56 1.25-1.25V9.078c0-.331-.132-.649-.366-.883l-4.329-4.329a1.25 1.25 0 00-.883-.366H7.5v3.75c0 .138.112.25.25.25h7.5a.75.75 0 010 1.5h-7.5A1.75 1.75 0 016 7.25V3.5H4.75zM7.5 13.75v6.75h9v-6.75a.25.25 0 00-.25-.25h-8.5a.25.25 0 00-.25.25z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/keyframes.scss
index 052602767382f..805c03ead89a0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-scissors {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/placeholders.scss
index f9d9a254699b9..10e36568abd67 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-scissors-icon {
   --icon-name: icon-scissors;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/property-16.scss
index 07fd93696107c..e6cb0839a3d75 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-scissors-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M1 4a3 3 0 115.585 1.524L8 6.94l4.803-4.803a.75.75 0 011.06 1.06L8.539 8.523a.678.678 0 01-.016.016l-1.937 1.938a3 3 0 11-1.06-1.06L6.938 8 5.524 6.585A3 3 0 011 4zm3-1.5a1.5 1.5 0 100 3 1.5 1.5 0 000-3zm0 8a1.5 1.5 0 100 3 1.5 1.5 0 000-3z" clip-rule="evenodd"/><path d="M9.116 9.123a.75.75 0 011.06 0l3.687 3.68a.75.75 0 11-1.06 1.061l-3.686-3.68a.75.75 0 01-.001-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/property-24.scss
index 1777b49bfefe2..4c1eca10cd739 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/scissors/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-scissors-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M5.5 2a3.5 3.5 0 101.99 6.38l3.346 3.12-3.346 3.12a3.5 3.5 0 101.023 1.097l3.93-3.664.009-.008 8.31-7.746A.75.75 0 0019.739 3.2l-7.803 7.274-3.424-3.192A3.5 3.5 0 005.5 2zm-2 3.5a2 2 0 114 0 2 2 0 01-4 0zm0 12a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/><path d="M20.763 18.703a.75.75 0 01-1.026 1.095l-5.5-5.15a.75.75 0 011.026-1.095l5.5 5.15z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/index.scss
index 68293edadf9dc..86cee0b297c2b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/keyframes.scss
index 9dbb4a4906d5c..ce8fe209f2dce 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-search-color {
   100% {
     background-image: var(--icon-search-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/placeholders.scss
index 2e0ad3ef80d5f..741b0c309547c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-search-color-icon {
   --icon-name: icon-search-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/property-16.scss
index 54dffaefc9796..952d411835171 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-search-color-16: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M15.5 14h-.79l-.28-.27A6.471 6.471 0 0 0 16 9.5 6.5 6.5 0 1 0 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" fill="%231563ff"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/property-24.scss
index e00e993eb2914..455de5d7aa2f6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/search-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-search-color-24: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M15.5 14h-.79l-.28-.27A6.471 6.471 0 0 0 16 9.5 6.5 6.5 0 1 0 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" fill="%231563ff"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/search/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/search/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/search/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/search/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/search/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/search/keyframes.scss
index b485b74f0a12a..94da815eff04b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/search/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/search/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-search {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/search/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/search/placeholders.scss
index c5ecdcf97d0e3..7c6190236f1fa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/search/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/search/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-search-icon {
   --icon-name: icon-search;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/search/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/search/property-16.scss
index 61be5fd80449e..6c2507e3fb41d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/search/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/search/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-search-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M7.25 2a5.25 5.25 0 103.144 9.455l2.326 2.325a.75.75 0 101.06-1.06l-2.325-2.326A5.25 5.25 0 007.25 2zM3.5 7.25a3.75 3.75 0 117.5 0 3.75 3.75 0 01-7.5 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/search/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/search/property-24.scss
index 9deb33a08af3a..1b26405166549 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/search/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/search/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-search-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M10.5 2a8.5 8.5 0 105.457 15.017l4.763 4.763a.75.75 0 101.06-1.06l-4.763-4.763A8.5 8.5 0 0010.5 2zm-7 8.5a7 7 0 1114 0 7 7 0 01-14 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/send/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/send/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/send/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/send/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/send/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/send/keyframes.scss
index dfd9ac76a6fed..950e99831b70f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/send/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/send/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-send {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/send/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/send/placeholders.scss
index 580c920dc3c2a..995c579a1c99c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/send/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/send/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-send-icon {
   --icon-name: icon-send;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/send/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/send/property-16.scss
index 20db356e37c7c..2b008837849ab 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/send/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/send/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-send-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M15.08 2.526c.368-1.001-.605-1.974-1.606-1.605L1.878 5.193a1.25 1.25 0 00-.295 2.19l4.07 2.907a.25.25 0 01.057.058l2.907 4.069a1.25 1.25 0 002.19-.295l4.272-11.596zM2.84 6.437l10.645-3.922L9.563 13.16l-2.39-3.344 3.072-3.071a.7.7 0 10-.99-.99L6.184 8.826 2.84 6.437z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/send/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/send/property-24.scss
index 617aecc4c1044..541d302e8a3c9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/send/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/send/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-send-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M21.205 5.042c.516-1.4-.846-2.763-2.247-2.247L3.264 8.577c-1.318.486-1.555 2.25-.412 3.066l5.51 3.936a.252.252 0 01.059.058l3.936 5.51c.817 1.144 2.58.907 3.066-.411l5.782-15.694zm-1.729-.84a.25.25 0 01.321.322l-5.782 15.693a.25.25 0 01-.438.059l-3.663-5.13L15.53 9.53a.75.75 0 00-1.06-1.06l-5.617 5.616-5.129-3.663a.25.25 0 01.059-.438l15.693-5.782z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/keyframes.scss
index 2feae09ea56ec..f79d01897e068 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-server-cluster {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/placeholders.scss
index efaf63c18f1df..3e4eac34b7de3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-server-cluster-icon {
   --icon-name: icon-server-cluster;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/property-16.scss
index de959d1a85d22..f59b6098ec8f2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-server-cluster-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a2.25 2.25 0 00-.75 4.372v.465a3.25 3.25 0 00-1.797 1.144l-.625-.366a2.25 2.25 0 10-1.038 1.13l1.026.602a3.261 3.261 0 000 1.306l-1.026.601a2.25 2.25 0 101.038 1.13l.625-.366a3.25 3.25 0 001.797 1.145v.465a2.25 2.25 0 101.5 0v-.465a3.25 3.25 0 001.797-1.145l.625.366a2.25 2.25 0 101.038-1.13l-1.026-.6a3.26 3.26 0 000-1.307l1.026-.601a2.25 2.25 0 10-1.038-1.13l-.625.365A3.251 3.251 0 008.75 4.837v-.465A2.25 2.25 0 008 0zm-.75 2.25a.75.75 0 111.5 0 .75.75 0 01-1.5 0zM2.75 4a.75.75 0 100 1.5.75.75 0 000-1.5zm0 6.5a.75.75 0 100 1.5.75.75 0 000-1.5zm4.5 3.25a.75.75 0 111.5 0 .75.75 0 01-1.5 0zm6-3.25a.75.75 0 100 1.5.75.75 0 000-1.5zm0-6.5a.75.75 0 100 1.5.75.75 0 000-1.5zM6.395 7.3a1.75 1.75 0 113.21 1.4 1.75 1.75 0 01-3.21-1.4z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/property-24.scss
index 8e6783b7c4a1b..a0a18b31ee95b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/server-cluster/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-server-cluster-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 .5a2.5 2.5 0 00-.75 4.886v1.67a4.998 4.998 0 00-3.255 1.95l-1.731-.944a2.5 2.5 0 10-1.061 1.13l2.083 1.137A4.993 4.993 0 007 12c0 .615.111 1.206.316 1.752l-1.768 1.285a2.5 2.5 0 10.845 1.24l1.66-1.207a4.996 4.996 0 003.197 1.874v1.67a2.501 2.501 0 101.5 0v-1.67a4.996 4.996 0 003.197-1.874l1.66 1.207a2.5 2.5 0 10.845-1.24l-1.768-1.285A4.991 4.991 0 0017 12c0-.585-.1-1.148-.286-1.671l2.083-1.137a2.5 2.5 0 10-1.06-1.13l-1.732.945a4.998 4.998 0 00-3.255-1.951v-1.67A2.501 2.501 0 0012 .5zM11 3a1 1 0 112 0 1 1 0 01-2 0zM4 6a1 1 0 100 2 1 1 0 000-2zm0 10a1 1 0 100 2 1 1 0 000-2zm7 5a1 1 0 112 0 1 1 0 01-2 0zm9-5a1 1 0 100 2 1 1 0 000-2zm0-10a1 1 0 100 2 1 1 0 000-2zM8.91 10.353a3.5 3.5 0 016.18 0c.261.49.41 1.05.41 1.647s-.149 1.157-.41 1.647a3.5 3.5 0 01-6.18 0A3.482 3.482 0 018.5 12c0-.597.149-1.157.41-1.647z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/server/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/server/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/server/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/server/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/server/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/server/keyframes.scss
index a93df2473bd17..a1b9e04d63e32 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/server/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/server/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-server {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/server/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/server/placeholders.scss
index a329c1de83aaf..36e425a680470 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/server/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/server/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-server-icon {
   --icon-name: icon-server;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/server/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/server/property-16.scss
index 2a94d5ed7efe9..ab4c6aedb92b0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/server/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/server/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-server-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3 3.25a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5A.75.75 0 013 3.25z"/><path fill-rule="evenodd" d="M2.25 0A2.25 2.25 0 000 2.25v2.5A2.25 2.25 0 002.25 7h11.5A2.25 2.25 0 0016 4.75v-2.5A2.25 2.25 0 0013.75 0H2.25zM1.5 2.25a.75.75 0 01.75-.75h11.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75v-2.5z" clip-rule="evenodd"/><path d="M3.75 11.5a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/><path fill-rule="evenodd" d="M2.25 9A2.25 2.25 0 000 11.25v2.5A2.25 2.25 0 002.25 16h11.5A2.25 2.25 0 0016 13.75v-2.5A2.25 2.25 0 0013.75 9H2.25zm-.75 2.25a.75.75 0 01.75-.75h11.5a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75v-2.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/server/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/server/property-24.scss
index 1706b11246133..cadcb35dec07a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/server/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/server/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-server-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M5 5.75A.75.75 0 015.75 5h.5a.75.75 0 010 1.5h-.5A.75.75 0 015 5.75z"/><path fill-rule="evenodd" d="M3.75 1A2.75 2.75 0 001 3.75v4.5A2.75 2.75 0 003.75 11h16.5A2.75 2.75 0 0023 8.25v-4.5A2.75 2.75 0 0020.25 1H3.75zM2.5 3.75c0-.69.56-1.25 1.25-1.25h16.5c.69 0 1.25.56 1.25 1.25v4.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25v-4.5z" clip-rule="evenodd"/><path d="M5.75 17a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/><path fill-rule="evenodd" d="M3.75 13A2.75 2.75 0 001 15.75v4.5A2.75 2.75 0 003.75 23h16.5A2.75 2.75 0 0023 20.25v-4.5A2.75 2.75 0 0020.25 13H3.75zM2.5 15.75c0-.69.56-1.25 1.25-1.25h16.5c.69 0 1.25.56 1.25 1.25v4.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25v-4.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/keyframes.scss
index 105fe87ccbfb6..ccdb814770276 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-serverless {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/placeholders.scss
index 7f41e42ea0f6e..3dc0d8bf98bb9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-serverless-icon {
   --icon-name: icon-serverless;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/property-16.scss
index d390fdbeeba49..9f6abff01d04e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-serverless-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.75 11.5a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5z"/><path fill-rule="evenodd" d="M1.28.22A.75.75 0 00.22 1.28c-.141.294-.22.623-.22.97v2.5A2.25 2.25 0 002.25 7h3.69l2 2H2.25A2.25 2.25 0 000 11.25v2.5A2.25 2.25 0 002.25 16h11.5c.347 0 .676-.079.97-.22a.75.75 0 001.06-1.06L1.28.22zm.97 10.28h7.19l4 4H2.25a.75.75 0 01-.75-.75v-2.5a.75.75 0 01.75-.75zm2.19-5L1.5 2.56v2.19c0 .414.336.75.75.75h2.19z" clip-rule="evenodd"/><path d="M13.75 0H5a.75.75 0 000 1.5h8.75a.75.75 0 01.75.75v2.5a.75.75 0 01-.75.75H10.5a.75.75 0 000 1.5h3.25A2.25 2.25 0 0016 4.75v-2.5A2.25 2.25 0 0013.75 0zM13 9.75a.75.75 0 01.75-.75A2.25 2.25 0 0116 11.25a.75.75 0 01-1.5 0 .75.75 0 00-.75-.75.75.75 0 01-.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/property-24.scss
index 17bf265c0996d..7203d81a9d800 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/serverless/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-serverless-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M5 17.75a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5a.75.75 0 01-.75-.75z"/><path fill-rule="evenodd" d="M1.78.72A.75.75 0 00.72 1.78l.629.63A2.74 2.74 0 001 3.75v4.5A2.75 2.75 0 003.75 11h6.19l2 2H3.75A2.75 2.75 0 001 15.75v4.5A2.75 2.75 0 003.75 23h16.5a2.74 2.74 0 001.34-.349l.63.63a.75.75 0 101.06-1.061L2.866 1.806 1.78.72zm.732 2.853a1.265 1.265 0 00-.012.177v4.5c0 .69.56 1.25 1.25 1.25h4.69L2.511 3.573zm17.915 17.915L13.439 14.5H3.75c-.69 0-1.25.56-1.25 1.25v4.5c0 .69.56 1.25 1.25 1.25h16.5c.06 0 .12-.004.177-.012z" clip-rule="evenodd"/><path d="M6 1a.75.75 0 000 1.5h14.25c.69 0 1.25.56 1.25 1.25v4.5c0 .69-.56 1.25-1.25 1.25H14.5a.75.75 0 000 1.5h5.75A2.75 2.75 0 0023 8.25v-4.5A2.75 2.75 0 0020.25 1H6zM18 13a.75.75 0 000 1.5h2.25c.69 0 1.25.56 1.25 1.25V18a.75.75 0 001.5 0v-2.25A2.75 2.75 0 0020.25 13H18z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/settings/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/settings/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/settings/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/settings/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/settings/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/settings/keyframes.scss
index 7a8ae5850fa2b..0222c02cc7a79 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/settings/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/settings/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-settings {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/settings/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/settings/placeholders.scss
index 8029c31c134f7..10b2ea7c88ff5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/settings/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/settings/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-settings-icon {
   --icon-name: icon-settings;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/settings/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/settings/property-16.scss
index d6bda6b29036d..c9dc580d862da 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/settings/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/settings/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-settings-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 5a3 3 0 100 6 3 3 0 000-6zM6.5 8a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z"/><path d="M7.5 0a1.75 1.75 0 00-1.75 1.75v.15c-.16.06-.318.125-.472.196l-.106-.106a1.75 1.75 0 00-2.475 0l-.707.707a1.75 1.75 0 000 2.475l.106.106a6.46 6.46 0 00-.196.472h-.15A1.75 1.75 0 000 7.5v1c0 .966.784 1.75 1.75 1.75h.15c.06.16.125.318.196.472l-.106.107a1.75 1.75 0 000 2.474l.707.708a1.75 1.75 0 002.475 0l.106-.107c.154.071.312.137.472.196v.15c0 .966.784 1.75 1.75 1.75h1a1.75 1.75 0 001.75-1.75v-.15c.16-.06.318-.125.472-.196l.106.107a1.75 1.75 0 002.475 0l.707-.707a1.75 1.75 0 000-2.475l-.106-.107c.071-.154.137-.311.196-.472h.15A1.75 1.75 0 0016 8.5v-1a1.75 1.75 0 00-1.75-1.75h-.15a6.455 6.455 0 00-.196-.472l.106-.106a1.75 1.75 0 000-2.475l-.707-.707a1.75 1.75 0 00-2.475 0l-.106.106a6.46 6.46 0 00-.472-.196v-.15A1.75 1.75 0 008.5 0h-1zm-.25 1.75a.25.25 0 01.25-.25h1a.25.25 0 01.25.25v.698c0 .339.227.636.555.724.42.113.817.28 1.186.492a.75.75 0 00.905-.12l.493-.494a.25.25 0 01.354 0l.707.708a.25.25 0 010 .353l-.494.494a.75.75 0 00-.12.904c.213.369.38.767.492 1.186a.75.75 0 00.724.555h.698a.25.25 0 01.25.25v1a.25.25 0 01-.25.25h-.698a.75.75 0 00-.724.555c-.113.42-.28.817-.492 1.186a.75.75 0 00.12.905l.494.493a.25.25 0 010 .354l-.707.707a.25.25 0 01-.354 0l-.494-.494a.75.75 0 00-.904-.12 4.966 4.966 0 01-1.186.492.75.75 0 00-.555.724v.698a.25.25 0 01-.25.25h-1a.25.25 0 01-.25-.25v-.698a.75.75 0 00-.555-.724 4.966 4.966 0 01-1.186-.491.75.75 0 00-.904.12l-.494.493a.25.25 0 01-.354 0l-.707-.707a.25.25 0 010-.354l.494-.493a.75.75 0 00.12-.905 4.966 4.966 0 01-.492-1.186.75.75 0 00-.724-.555H1.75a.25.25 0 01-.25-.25v-1a.25.25 0 01.25-.25h.698a.75.75 0 00.724-.555c.113-.42.28-.817.491-1.186a.75.75 0 00-.12-.904L3.05 4.11a.25.25 0 010-.353l.707-.708a.25.25 0 01.354 0l.493.494c.24.24.611.289.905.12a4.965 4.965 0 011.186-.492.75.75 0 00.555-.724V1.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/settings/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/settings/property-24.scss
index f8e0489a77d0d..b9951bf439ef5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/settings/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/settings/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-settings-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 8a4 4 0 100 8 4 4 0 000-8zm-2.5 4a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z"/><path d="M11.5 1a2.25 2.25 0 00-2.25 2.25v.178c-.474.152-.93.342-1.366.567l-.127-.127a2.25 2.25 0 00-3.182 0l-.707.707a2.25 2.25 0 000 3.182l.127.127a8.95 8.95 0 00-.567 1.366H3.25A2.25 2.25 0 001 11.5v1a2.25 2.25 0 002.25 2.25h.178c.152.474.342.93.567 1.366l-.127.127a2.25 2.25 0 000 3.182l.707.707a2.25 2.25 0 003.182 0l.127-.127c.435.225.892.415 1.366.567v.178A2.25 2.25 0 0011.5 23h1a2.25 2.25 0 002.25-2.25v-.178c.474-.152.93-.342 1.366-.567l.127.127a2.25 2.25 0 003.182 0l.707-.707a2.25 2.25 0 000-3.182l-.127-.127a8.94 8.94 0 00.567-1.366h.178A2.25 2.25 0 0023 12.5v-1a2.25 2.25 0 00-2.25-2.25h-.178a8.952 8.952 0 00-.567-1.366l.127-.127a2.25 2.25 0 000-3.182l-.707-.707a2.25 2.25 0 00-3.182 0l-.127.127a8.95 8.95 0 00-1.366-.567V3.25A2.25 2.25 0 0012.5 1h-1zm-.75 2.25a.75.75 0 01.75-.75h1a.75.75 0 01.75.75v.744a.75.75 0 00.569.728 7.45 7.45 0 012.04.846.75.75 0 00.918-.112l.526-.527a.75.75 0 011.06 0l.708.707a.75.75 0 010 1.06l-.527.527a.75.75 0 00-.112.917c.377.627.665 1.313.846 2.041a.75.75 0 00.728.569h.744a.75.75 0 01.75.75v1a.75.75 0 01-.75.75h-.744a.75.75 0 00-.728.569 7.449 7.449 0 01-.846 2.04.75.75 0 00.112.918l.527.526a.75.75 0 010 1.06l-.707.708a.75.75 0 01-1.06 0l-.527-.527a.75.75 0 00-.917-.112 7.446 7.446 0 01-2.041.846.75.75 0 00-.569.728v.744a.75.75 0 01-.75.75h-1a.75.75 0 01-.75-.75v-.744a.75.75 0 00-.569-.728 7.447 7.447 0 01-2.04-.846.75.75 0 00-.918.112l-.526.527a.75.75 0 01-1.061 0l-.707-.707a.75.75 0 010-1.06l.527-.527a.75.75 0 00.112-.917 7.45 7.45 0 01-.846-2.041.75.75 0 00-.728-.569H3.25a.75.75 0 01-.75-.75v-1a.75.75 0 01.75-.75h.744a.75.75 0 00.728-.569c.181-.728.469-1.414.846-2.04a.75.75 0 00-.112-.918l-.527-.526a.75.75 0 010-1.061l.707-.707a.75.75 0 011.06 0l.527.527a.75.75 0 00.917.112 7.451 7.451 0 012.041-.846.75.75 0 00.569-.728V3.25z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/share/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/share/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/share/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/share/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/share/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/share/keyframes.scss
index 69b37af0fce15..49c048e929845 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/share/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/share/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-share {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/share/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/share/placeholders.scss
index 8f73fb22cf59a..31b188b8ab454 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/share/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/share/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-share-icon {
   --icon-name: icon-share;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/share/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/share/property-16.scss
index b84cbac71df3f..63f6c1f4107dc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/share/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/share/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-share-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5.3 5.76a.75.75 0 01-1.1-1.02l3.25-3.5a.75.75 0 011.1 0l3.25 3.5a.75.75 0 11-1.1 1.02l-1.95-2.1v6.59a.75.75 0 01-1.5 0V3.66L5.3 5.76z"/><path d="M2 9.25A2.25 2.25 0 014.25 7H5a.75.75 0 010 1.5h-.75a.75.75 0 00-.75.75v3.5c0 .414.336.75.75.75h7.5a.75.75 0 00.75-.75v-3.5a.75.75 0 00-.75-.75H11A.75.75 0 0111 7h.75A2.25 2.25 0 0114 9.25v3.5A2.25 2.25 0 0111.75 15h-7.5A2.25 2.25 0 012 12.75v-3.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/share/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/share/property-24.scss
index 53f2b63312852..5e4901663bc75 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/share/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/share/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-share-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.295 6.765a.75.75 0 11-1.09-1.03l4.25-4.5a.75.75 0 011.09 0l4.25 4.5a.75.75 0 01-1.09 1.03L12.75 3.636V14.25a.75.75 0 01-1.5 0V3.636L8.295 6.765z"/><path d="M5.75 10.5c-.69 0-1.25.56-1.25 1.25v8.5c0 .69.56 1.25 1.25 1.25h12.5c.69 0 1.25-.56 1.25-1.25v-8.5c0-.69-.56-1.25-1.25-1.25H15.5a.75.75 0 010-1.5h2.75A2.75 2.75 0 0121 11.75v8.5A2.75 2.75 0 0118.25 23H5.75A2.75 2.75 0 013 20.25v-8.5A2.75 2.75 0 015.75 9H8.5a.75.75 0 010 1.5H5.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/keyframes.scss
index 1c14a245d9372..a6fdf70989563 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-shield-alert {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/placeholders.scss
index f31696cbedf03..c0548a509ed92 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-shield-alert-icon {
   --icon-name: icon-shield-alert;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/property-16.scss
index 2373db5f6bb05..6abb45ef09fca 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shield-alert-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zM8.75 4.75a.75.75 0 00-1.5 0v3.5a.75.75 0 001.5 0v-3.5z"/><path fill-rule="evenodd" d="M7.26.213a2.25 2.25 0 011.48 0l4.75 1.653A2.25 2.25 0 0115 3.991v4.01c0 2.048-1.181 3.747-2.45 4.991-1.282 1.255-2.757 2.15-3.573 2.598a2.024 2.024 0 01-1.954 0c-.816-.447-2.291-1.342-3.572-2.598C2.18 11.748 1 10.05 1 8V3.991c0-.957.606-1.81 1.51-2.125L7.26.213zm.986 1.417a.75.75 0 00-.493 0l-4.75 1.653a.75.75 0 00-.503.708v4.01c0 1.455.847 2.79 2 3.92 1.142 1.118 2.483 1.937 3.244 2.353.163.09.35.09.512 0 .761-.416 2.102-1.235 3.244-2.353 1.153-1.13 2-2.465 2-3.92V3.99a.75.75 0 00-.504-.708L8.246 1.63z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/property-24.scss
index 81dabd8e762a7..a6e4d194ed965 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-alert/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shield-alert-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 7a.75.75 0 01.75.75v4.5a.75.75 0 01-1.5 0v-4.5A.75.75 0 0112 7zM12 15a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M11.04 1.307a2.75 2.75 0 011.92 0l6.25 2.33A2.75 2.75 0 0121 6.214V12c0 2.732-1.462 5.038-3.104 6.774-1.65 1.744-3.562 3-4.65 3.642a2.437 2.437 0 01-2.493 0c-1.087-.643-3-1.898-4.65-3.642C4.463 17.038 3 14.732 3 12V6.214a2.75 2.75 0 011.79-2.577l6.25-2.33zm1.397 1.406a1.25 1.25 0 00-.874 0l-6.25 2.33a1.25 1.25 0 00-.813 1.17V12c0 2.182 1.172 4.136 2.693 5.744 1.514 1.6 3.294 2.772 4.323 3.38.304.18.664.18.968 0 1.03-.608 2.809-1.78 4.323-3.38C18.327 16.136 19.5 14.182 19.5 12V6.214a1.25 1.25 0 00-.813-1.171l-6.25-2.33z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/keyframes.scss
index 551cea8e50026..e47ea46f59747 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-shield-check {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/placeholders.scss
index bb61d022dacbe..d6bed2ee644c3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-shield-check-icon {
   --icon-name: icon-shield-check;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/property-16.scss
index 6bcf74f66058b..9b9659801eabc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shield-check-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.28 5.47a.75.75 0 010 1.06l-4 4a.75.75 0 01-1.06 0l-2-2a.75.75 0 011.06-1.06l1.47 1.47 3.47-3.47a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M7.26.213a2.25 2.25 0 011.48 0l4.75 1.653A2.25 2.25 0 0115 3.991v4.01c0 2.048-1.181 3.747-2.45 4.991-1.282 1.255-2.757 2.15-3.573 2.598a2.024 2.024 0 01-1.954 0c-.816-.447-2.291-1.342-3.572-2.598C2.18 11.748 1 10.05 1 8V3.991c0-.957.606-1.81 1.51-2.125L7.26.213zm.986 1.417a.75.75 0 00-.493 0l-4.75 1.653a.75.75 0 00-.503.708v4.01c0 1.455.847 2.79 2 3.92 1.142 1.118 2.483 1.937 3.244 2.353.163.09.35.09.512 0 .761-.416 2.102-1.235 3.244-2.353 1.153-1.13 2-2.465 2-3.92V3.99a.75.75 0 00-.504-.708L8.246 1.63z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/property-24.scss
index 24590bc922ee2..2ec5f1ef8fb60 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-check/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shield-check-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M16.78 8.22a.75.75 0 010 1.06l-5.499 5.5a.75.75 0 01-1.061 0l-2.5-2.5a.75.75 0 111.06-1.06l1.97 1.97 4.97-4.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M11.04 1.307a2.75 2.75 0 011.92 0l6.25 2.33A2.75 2.75 0 0121 6.214V12c0 2.732-1.462 5.038-3.104 6.774-1.65 1.744-3.562 3-4.65 3.642a2.437 2.437 0 01-2.493 0c-1.087-.643-3-1.898-4.65-3.642C4.463 17.038 3 14.732 3 12V6.214a2.75 2.75 0 011.79-2.577l6.25-2.33zm1.397 1.406a1.25 1.25 0 00-.874 0l-6.25 2.33a1.25 1.25 0 00-.813 1.17V12c0 2.182 1.172 4.136 2.693 5.744 1.514 1.6 3.294 2.772 4.323 3.38.304.18.664.18.968 0 1.03-.608 2.809-1.78 4.323-3.38C18.327 16.136 19.5 14.182 19.5 12V6.214a1.25 1.25 0 00-.813-1.171l-6.25-2.33z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/keyframes.scss
index e4ccff6df755f..aaf69289c3e87 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-shield-off {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/placeholders.scss
index c99ed4c3c10f1..e9b189ef69bd3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-shield-off-icon {
   --icon-name: icon-shield-off;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/property-16.scss
index e326dc30b044b..8a4169584785b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shield-off-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8.74.213a2.25 2.25 0 00-1.48 0L6.035.64a.75.75 0 00.493 1.417l1.226-.427a.75.75 0 01.493 0l4.75 1.653a.75.75 0 01.504.708v4.01c0 .334-.044.661-.127.98a.75.75 0 101.453.374C14.938 8.922 15 8.47 15 8V3.991a2.25 2.25 0 00-1.51-2.125L8.74.213z"/><path fill-rule="evenodd" d="M1.447 2.507L.72 1.78A.75.75 0 011.78.72l13.5 13.5a.75.75 0 11-1.06 1.06l-1.988-1.987c-1.2 1.098-2.505 1.886-3.254 2.296a2.026 2.026 0 01-1.955 0c-.816-.446-2.291-1.341-3.572-2.597C2.18 11.748 1 10.05 1 8V3.72c0-.456.165-.882.447-1.213zm1.078 1.079a.366.366 0 00-.025.133V8c0 1.456.847 2.79 2 3.92 1.142 1.12 2.483 1.938 3.244 2.354.162.09.35.09.513 0 .69-.378 1.854-1.084 2.913-2.043L2.525 3.586z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/property-24.scss
index 7a19268ed6386..9ebe9038339aa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-off/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shield-off-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M2.28 1.22a.75.75 0 00-1.06 1.06l2.185 2.185A1.937 1.937 0 003 5.651V12c0 2.732 1.462 5.038 3.104 6.774 1.65 1.744 3.562 3 4.65 3.642a2.442 2.442 0 002.496-.002c1.066-.63 2.928-1.85 4.557-3.546l3.913 3.912a.75.75 0 101.06-1.06L2.28 1.22zm14.466 16.587L4.508 5.568a.44.44 0 00-.008.083V12c0 2.182 1.172 4.136 2.693 5.744 1.514 1.6 3.294 2.772 4.323 3.38a.942.942 0 00.97-.002c1.02-.602 2.763-1.75 4.26-3.315z" clip-rule="evenodd"/><path d="M12.96 1.307a2.75 2.75 0 00-1.92 0l-2.302.858a.75.75 0 10.524 1.406l2.301-.858a1.25 1.25 0 01.874 0l6.25 2.33c.489.182.813.649.813 1.17V12c0 .574-.08 1.13-.227 1.668a.75.75 0 101.448.394c.178-.657.279-1.346.279-2.062V6.214a2.75 2.75 0 00-1.79-2.577l-6.25-2.33z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/keyframes.scss
index d55afb87ab6a5..c9aaf33d7d50d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-shield-x {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/placeholders.scss
index d8e37f6419dec..f04758abd42e0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-shield-x-icon {
   --icon-name: icon-shield-x;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/property-16.scss
index aa11c56650991..28c781c0a6408 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shield-x-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M10.78 4.72a.75.75 0 010 1.06L9.06 7.5l1.72 1.72a.75.75 0 11-1.06 1.06L8 8.56l-1.72 1.72a.75.75 0 11-1.06-1.06L6.94 7.5 5.22 5.78a.75.75 0 011.06-1.06L8 6.44l1.72-1.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M7.26.213a2.25 2.25 0 011.48 0l4.75 1.653A2.25 2.25 0 0115 3.991v4.01c0 2.048-1.181 3.747-2.45 4.991-1.282 1.255-2.757 2.15-3.573 2.598a2.024 2.024 0 01-1.954 0c-.816-.447-2.291-1.342-3.572-2.598C2.18 11.748 1 10.05 1 8V3.991c0-.957.606-1.81 1.51-2.125L7.26.213zm.986 1.417a.75.75 0 00-.493 0l-4.75 1.653a.75.75 0 00-.503.708v4.01c0 1.455.847 2.79 2 3.92 1.142 1.118 2.483 1.937 3.244 2.353.163.09.35.09.512 0 .761-.416 2.102-1.235 3.244-2.353 1.153-1.13 2-2.465 2-3.92V3.99a.75.75 0 00-.504-.708L8.246 1.63z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/property-24.scss
index 0dbf33f64c67c..95b552a8527e5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield-x/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shield-x-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M15.78 7.22a.75.75 0 010 1.06L13.06 11l2.72 2.72a.75.75 0 11-1.06 1.06L12 12.06l-2.72 2.72a.75.75 0 01-1.06-1.06L10.94 11 8.22 8.28a.75.75 0 011.06-1.06L12 9.94l2.72-2.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M11.04 1.307a2.75 2.75 0 011.92 0l6.25 2.33A2.75 2.75 0 0121 6.214V12c0 2.732-1.462 5.038-3.104 6.774-1.65 1.744-3.562 3-4.65 3.642a2.437 2.437 0 01-2.493 0c-1.087-.643-3-1.898-4.65-3.642C4.463 17.038 3 14.732 3 12V6.214a2.75 2.75 0 011.79-2.577l6.25-2.33zm1.397 1.406a1.25 1.25 0 00-.874 0l-6.25 2.33a1.25 1.25 0 00-.813 1.17V12c0 2.182 1.172 4.136 2.693 5.744 1.514 1.6 3.294 2.772 4.323 3.38.304.18.664.18.968 0 1.03-.608 2.809-1.78 4.323-3.38C18.327 16.136 19.5 14.182 19.5 12V6.214a1.25 1.25 0 00-.813-1.171l-6.25-2.33z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield/keyframes.scss
index 2c494f8f37105..5c2bf108f6d3c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-shield {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield/placeholders.scss
index 7ca85bc2ce57c..34597b7b25dcd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-shield-icon {
   --icon-name: icon-shield;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield/property-16.scss
index 5476fa5f4f2dd..378c4883b1e93 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shield-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M7.26.213a2.25 2.25 0 011.48 0l4.75 1.653A2.25 2.25 0 0115 3.991v4.01c0 2.048-1.181 3.747-2.45 4.991-1.282 1.255-2.757 2.15-3.573 2.598a2.024 2.024 0 01-1.954 0c-.816-.447-2.291-1.342-3.572-2.598C2.18 11.748 1 10.05 1 8V3.991c0-.957.606-1.81 1.51-2.125L7.26.213zm.986 1.417a.75.75 0 00-.493 0l-4.75 1.653a.75.75 0 00-.503.708v4.01c0 1.455.847 2.79 2 3.92 1.142 1.118 2.483 1.937 3.244 2.353.163.09.35.09.512 0 .761-.416 2.102-1.235 3.244-2.353 1.153-1.13 2-2.465 2-3.92V3.99a.75.75 0 00-.504-.708L8.246 1.63z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shield/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shield/property-24.scss
index 9aeb6684c60f4..77dca429fd407 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shield/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shield/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shield-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M11.04 1.307a2.75 2.75 0 011.92 0l6.25 2.33A2.75 2.75 0 0121 6.214V12c0 2.732-1.462 5.038-3.104 6.774-1.65 1.744-3.562 3-4.65 3.642a2.437 2.437 0 01-2.493 0c-1.087-.643-3-1.898-4.65-3.642C4.463 17.038 3 14.732 3 12V6.214a2.75 2.75 0 011.79-2.577l6.25-2.33zm1.397 1.406a1.25 1.25 0 00-.874 0l-6.25 2.33a1.25 1.25 0 00-.813 1.17V12c0 2.182 1.172 4.136 2.693 5.744 1.514 1.6 3.294 2.772 4.323 3.38.304.18.664.18.968 0 1.03-.608 2.809-1.78 4.323-3.38C18.327 16.136 19.5 14.182 19.5 12V6.214a1.25 1.25 0 00-.813-1.171l-6.25-2.33z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/keyframes.scss
index 0cb11d01ddddc..68d840e08c1b3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-shopping-bag {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/placeholders.scss
index 0a835bba0b2d6..a1f27526fcb91 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-shopping-bag-icon {
   --icon-name: icon-shopping-bag;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/property-16.scss
index 3ff31dcd8230f..a0dec1a6ea941 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shopping-bag-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.5 7.25a.75.75 0 00-1.5 0c0 .76.34 1.468.91 1.975A3.15 3.15 0 008 10a3.15 3.15 0 002.09-.775c.57-.507.91-1.215.91-1.975a.75.75 0 00-1.5 0c0 .301-.134.61-.407.854A1.651 1.651 0 018 8.5c-.424 0-.816-.15-1.093-.396A1.145 1.145 0 016.5 7.25z"/><path fill-rule="evenodd" d="M3.448.746A2.25 2.25 0 015.121 0h5.758a2.25 2.25 0 011.673.746l1.871 2.081c.371.413.577.949.577 1.504v9.419A2.25 2.25 0 0112.75 16h-9.5A2.25 2.25 0 011 13.75V4.331c0-.555.205-1.091.577-1.504L3.448.746zm1.673.754a.75.75 0 00-.558.249L2.99 3.5H13.01l-1.574-1.751a.75.75 0 00-.558-.249H5.12zM2.5 13.75V5h11v8.75a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/property-24.scss
index ea3654c56bcfb..3bb1690d93fba 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-bag/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shopping-bag-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M9 10.5a.75.75 0 00-1.5 0 4.5 4.5 0 109 0 .75.75 0 00-1.5 0 3 3 0 01-6 0z"/><path fill-rule="evenodd" d="M5.612 1.865A2.75 2.75 0 017.614 1h8.772a2.75 2.75 0 012.002.865l2.865 3.043c.48.51.747 1.185.747 1.885V20.25A2.75 2.75 0 0119.25 23H4.75A2.75 2.75 0 012 20.25V6.793c0-.7.267-1.374.747-1.885l2.865-3.043zm2.002.635a1.25 1.25 0 00-.91.393L4.25 5.5h15.498l-2.453-2.607a1.25 1.25 0 00-.91-.393H7.614zM3.5 20.25V7h17v13.25c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/keyframes.scss
index 5c63bcc4d9faa..9074a6fbfadd6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-shopping-cart {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/placeholders.scss
index 7261b6c41f452..cad2d761f4d28 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-shopping-cart-icon {
   --icon-name: icon-shopping-cart;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/property-16.scss
index ba03c75bafdfb..34cad5333ed88 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shopping-cart-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M1.25 1.5a.75.75 0 000 1.5h1.154a.75.75 0 01.736.604l.874 4.413.405 2.15A2.25 2.25 0 006.63 12h6.095a2.25 2.25 0 002.214-1.848l.727-4A2.25 2.25 0 0013.453 3.5H4.648l-.037-.187A2.25 2.25 0 002.404 1.5H1.25zm4.237 6.236L4.945 5h8.508a.75.75 0 01.738.884l-.728 4a.75.75 0 01-.738.616H6.63a.75.75 0 01-.737-.611l-.406-2.153z" clip-rule="evenodd"/><path d="M7.5 13.75c0 .69-.56 1.25-1.25 1.25h-.01a1.25 1.25 0 110-2.5h.01c.69 0 1.25.56 1.25 1.25zM14 13.75c0 .69-.56 1.25-1.25 1.25h-.01a1.25 1.25 0 110-2.5h.01c.69 0 1.25.56 1.25 1.25z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/property-24.scss
index c0f0169ead163..06408b34d7d84 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shopping-cart/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shopping-cart-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M1.25 1.5a.75.75 0 000 1.5h2.089a1.25 1.25 0 011.229 1.02l1.444 7.74.706 3.971A2.75 2.75 0 009.426 18h10.142a2.75 2.75 0 002.71-2.279l1.303-7.5A2.75 2.75 0 0020.872 5H6.276l-.234-1.255A2.75 2.75 0 003.34 1.5H1.25zm6.238 9.994L6.556 6.5h14.316c.776 0 1.365.7 1.232 1.464l-1.305 7.5a1.25 1.25 0 01-1.231 1.036H9.426a1.25 1.25 0 01-1.23-1.031l-.708-3.975z" clip-rule="evenodd"/><path d="M11.5 20.75a1.75 1.75 0 01-1.75 1.75h-.01a1.75 1.75 0 110-3.5h.01c.966 0 1.75.784 1.75 1.75zM21.5 20.75a1.75 1.75 0 01-1.75 1.75h-.01a1.75 1.75 0 110-3.5h.01c.966 0 1.75.784 1.75 1.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/keyframes.scss
index e158a4db975ed..72c49cdd50f8e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-shuffle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/placeholders.scss
index a498d62aed1de..2219416004bc5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-shuffle-icon {
   --icon-name: icon-shuffle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/property-16.scss
index df29638f2848b..9a75dc0924822 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shuffle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M14.943 1.463a.748.748 0 00-.161-.242l-.002-.001-.001-.002A.748.748 0 0014.25 1h-4a.75.75 0 000 1.5h2.19L1.22 13.72a.75.75 0 101.06 1.06L13.5 3.56v2.19a.75.75 0 001.5 0v-4a.747.747 0 00-.057-.287zM9.5 14.25c0 .414.336.75.75.75h4a.747.747 0 00.75-.75v-4a.75.75 0 00-1.5 0v2.19l-2.47-2.47a.75.75 0 10-1.06 1.06l2.47 2.47h-2.19a.75.75 0 00-.75.75zM6.03 4.97a.75.75 0 01-1.06 1.06L1.22 2.28a.75.75 0 011.06-1.06l3.75 3.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/property-24.scss
index 5a59d34c0daa0..79c0855e9a018 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/shuffle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-shuffle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M21.943 2.463A.748.748 0 0021.25 2h-5.5a.75.75 0 000 1.5h3.69L2.22 20.72a.75.75 0 101.06 1.06L20.5 4.56v3.69a.75.75 0 001.5 0v-5.5a.747.747 0 00-.057-.287zM20.5 19.44v-3.69a.75.75 0 011.5 0v5.5a.747.747 0 01-.75.75h-5.5a.75.75 0 010-1.5h3.69l-4.97-4.97a.75.75 0 111.06-1.06l4.97 4.97zM9.53 9.53a.75.75 0 000-1.06L3.28 2.22a.75.75 0 00-1.06 1.06l6.25 6.25a.75.75 0 001.06 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/keyframes.scss
index 99209d476dab5..824384e1b391c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sidebar-hide {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/placeholders.scss
index 04885874c04b2..fd1a4aa8b012a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sidebar-hide-icon {
   --icon-name: icon-sidebar-hide;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/property-16.scss
index fb8a0645990b8..b620c0e211787 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sidebar-hide-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.726 5.263a.7.7 0 10-.952-1.026l-3.5 3.25a.7.7 0 000 1.026l3.5 3.25a.7.7 0 00.952-1.026L8.78 8l2.947-2.737z"/><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h9.5A2.25 2.25 0 0115 3.25v9.5A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h1.3v-11h-1.3zm9.5 11h-6.8v-11h6.8a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/property-24.scss
index 0e2a900e86ae0..337df01712fcd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-hide/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sidebar-hide-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M16.765 8.295a.75.75 0 00-1.03-1.09l-4.5 4.25a.75.75 0 000 1.09l4.5 4.25a.75.75 0 001.03-1.09L12.842 12l3.923-3.705z"/><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h14.5A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V4.75zM4.75 3.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25H7v-17H4.75zm14.5 17H8.5v-17h10.75c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/keyframes.scss
index 1bd5ff9439667..17c0ac64a846a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sidebar-show {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/placeholders.scss
index 28f6c1ac1975e..5b351b942ba36 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sidebar-show-icon {
   --icon-name: icon-sidebar-show;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/property-16.scss
index fdcdbbff3c29e..86cc379cd4ff5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sidebar-show-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.774 5.263a.7.7 0 11.952-1.026l3.5 3.25a.7.7 0 010 1.026l-3.5 3.25a.7.7 0 01-.952-1.026L10.72 8 7.774 5.263z"/><path fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h9.5A2.25 2.25 0 0115 3.25v9.5A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h1.3v-11h-1.3zm9.5 11h-6.8v-11h6.8a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/property-24.scss
index 747b2b8ded6cf..1fc34e50f3751 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar-show/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sidebar-show-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M11.735 8.295a.75.75 0 011.03-1.09l4.5 4.25a.75.75 0 010 1.09l-4.5 4.25a.75.75 0 01-1.03-1.09L15.658 12l-3.923-3.705z"/><path fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h14.5A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V4.75zM4.75 3.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25H7v-17H4.75zm14.5 17H8.5v-17h10.75c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/keyframes.scss
index 8c781c54e8297..f1b29b44d4933 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sidebar {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/placeholders.scss
index 2987647a9d647..4b2c8eb6ecef2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sidebar-icon {
   --icon-name: icon-sidebar;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/property-16.scss
index 13cfb06c6e387..ee3253f8a9221 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sidebar-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zM2.5 3.25a.75.75 0 01.75-.75h1.8v11h-1.8a.75.75 0 01-.75-.75v-9.5zM6.45 13.5h6.3a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75h-6.3v11z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/property-24.scss
index aaff7ac5696fb..56444fbf9b238 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sidebar/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sidebar-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25H8v17H4.75c-.69 0-1.25-.56-1.25-1.25V4.75zm6 15.75h9.75c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H9.5v17z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/keyframes.scss
index 85c53234fe0e0..b8da14baa9711 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sign-in {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/placeholders.scss
index 520fe5731dcc5..5b9dbdb22e299 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sign-in-icon {
   --icon-name: icon-sign-in;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/property-16.scss
index cb4aa756455fd..dd6d068a6e35a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sign-in-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M9.5 1.75a.75.75 0 01.75-.75h2.5A2.25 2.25 0 0115 3.25v9.5A2.25 2.25 0 0112.75 15h-2.5a.75.75 0 010-1.5h2.5a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75h-2.5a.75.75 0 01-.75-.75z"/><path d="M5.97 3.72a.75.75 0 011.06 0l3.5 3.5a.75.75 0 010 1.06l-3.5 3.5a.75.75 0 01-1.06-1.06L8.19 8.5H2A.75.75 0 012 7h6.19L5.97 4.78a.75.75 0 010-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/property-24.scss
index 87da560f66fe9..569ebfbe3e371 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-in/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sign-in-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M14.5 2.75a.75.75 0 01.75-.75h4A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22h-4a.75.75 0 010-1.5h4c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25h-4a.75.75 0 01-.75-.75z"/><path d="M9.47 6.22a.75.75 0 011.06 0l5 5a.747.747 0 010 1.06l-5 5a.75.75 0 11-1.06-1.06l3.72-3.72H3A.75.75 0 013 11h10.19L9.47 7.28a.75.75 0 010-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/keyframes.scss
index 283c8de338a75..e6ded01838503 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sign-out {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/placeholders.scss
index 6bb347a41bda4..9dd5439b9cc08 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sign-out-icon {
   --icon-name: icon-sign-out;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/property-16.scss
index 65af410656657..4f9e18449d46c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sign-out-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.5 1.75A.75.75 0 005.75 1h-2.5A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h2.5a.75.75 0 000-1.5h-2.5a.75.75 0 01-.75-.75v-9.5a.75.75 0 01.75-.75h2.5a.75.75 0 00.75-.75z"/><path d="M9.97 3.72a.75.75 0 011.06 0l3.5 3.5a.75.75 0 010 1.06l-3.5 3.5a.75.75 0 11-1.06-1.06l2.22-2.22H6A.75.75 0 016 7h6.19L9.97 4.78a.75.75 0 010-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/property-24.scss
index 61f83c3960f03..a7e642121d422 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sign-out/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sign-out-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M9.5 2.75A.75.75 0 008.75 2h-4A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h4a.75.75 0 000-1.5h-4c-.69 0-1.25-.56-1.25-1.25V4.75c0-.69.56-1.25 1.25-1.25h4a.75.75 0 00.75-.75z"/><path d="M15.47 6.22a.75.75 0 011.06 0l5 5a.75.75 0 010 1.06l-5 5a.75.75 0 11-1.06-1.06l3.72-3.72H9A.75.75 0 019 11h10.19l-3.72-3.72a.75.75 0 010-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/keyframes.scss
index 9b02a01fc1362..f59bb33437310 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-skip-back {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/placeholders.scss
index 70c635c3cac7e..3623b106b9bbb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-skip-back-icon {
   --icon-name: icon-skip-back;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/property-16.scss
index d37c2509a3f39..5167e673575ac 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-skip-back-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M11.24 2.5C12.4 1.682 14 2.51 14 3.93v8.14c0 1.419-1.6 2.248-2.76 1.43L5.476 9.43a1.75 1.75 0 010-2.86L11.24 2.5zm1.26 1.43a.25.25 0 00-.394-.204L6.34 7.796a.25.25 0 000 .408l5.766 4.07a.25.25 0 00.394-.204V3.93z" clip-rule="evenodd"/><path d="M3.5 3A.75.75 0 002 3v10a.75.75 0 001.5 0V3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/property-24.scss
index 56950842e354b..9789da76f67bb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-back/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-skip-back-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M17.236 4.512C18.395 3.688 20 4.516 20 5.938v12.124c0 1.421-1.605 2.25-2.764 1.426L8.71 13.426a1.75 1.75 0 010-2.852l8.525-6.062zM18.5 5.938a.25.25 0 00-.395-.204l-8.524 6.062a.25.25 0 000 .408l8.524 6.061a.25.25 0 00.395-.203V5.938z" clip-rule="evenodd"/><path d="M6 5a.75.75 0 00-1.5 0v14A.75.75 0 006 19V5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/keyframes.scss
index 1e3fdce68caf2..4dbdef47b5137 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-skip-forward {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/placeholders.scss
index b0125b36d7f8c..0175acfd15750 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-skip-forward-icon {
   --icon-name: icon-skip-forward;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/property-16.scss
index a7c66d2872179..e5f5ca42f0ba2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-skip-forward-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M4.76 2.5C3.6 1.682 2 2.51 2 3.93v8.14c0 1.419 1.6 2.248 2.76 1.43l5.765-4.07a1.75 1.75 0 000-2.86L4.76 2.5zM3.5 3.93a.25.25 0 01.394-.204l5.766 4.07a.25.25 0 010 .408l-5.766 4.07a.25.25 0 01-.394-.204V3.93z" clip-rule="evenodd"/><path d="M14 3a.75.75 0 00-1.5 0v10a.75.75 0 001.5 0V3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/property-24.scss
index 9d5b2195298fb..704730776adbe 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip-forward/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-skip-forward-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M6.764 4.512C5.606 3.688 4 4.516 4 5.938v12.124c0 1.421 1.606 2.25 2.764 1.426l8.525-6.062a1.75 1.75 0 000-2.852L6.764 4.512zM5.5 5.938a.25.25 0 01.395-.204l8.524 6.062c.14.1.14.308 0 .408l-8.524 6.061a.25.25 0 01-.395-.203V5.938z" clip-rule="evenodd"/><path d="M19.5 5A.75.75 0 0018 5v14a.75.75 0 001.5 0V5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip/keyframes.scss
index 6262aea22dd11..393201c79cd21 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-skip {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip/placeholders.scss
index 696a11ef6382c..3eb544c0e2d14 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-skip-icon {
   --icon-name: icon-skip;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip/property-16.scss
index 3c43d44b125df..52ab4a36cd412 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-skip-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 0110.535-5.096l-9.131 9.131A6.472 6.472 0 011.5 8zm2.465 5.096a6.5 6.5 0 009.131-9.131l-9.131 9.131z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/skip/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/skip/property-24.scss
index fb14507ea84af..d478c166dbaeb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/skip/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/skip/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-skip-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M4.172 19.728a.744.744 0 00.1.1A10.965 10.965 0 0012 23c6.075 0 11-4.925 11-11 0-3.012-1.21-5.742-3.172-7.728a.769.769 0 00-.1-.1A10.965 10.965 0 0012 1C5.925 1 1 5.925 1 12c0 3.012 1.21 5.742 3.172 7.728zM2.5 12A9.5 9.5 0 0112 2.5c2.353 0 4.507.856 6.166 2.273L4.773 18.166A9.462 9.462 0 012.5 12zm16.727-6.166A9.462 9.462 0 0121.5 12a9.5 9.5 0 01-9.5 9.5 9.462 9.462 0 01-6.166-2.273L19.227 5.834z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/keyframes.scss
index bebc5bcc80c4d..aa2976c56f454 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-slack-color {
   100% {
     background-image: var(--icon-slack-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/placeholders.scss
index 1187031d69491..4c74b18a7a8ae 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-slack-color-icon {
   --icon-name: icon-slack-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/property-16.scss
index bbcbac7c831f0..c829ef92c815b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-slack-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path fill="%23E01E5A" d="M2.471 11.318a1.474 1.474 0 001.47-1.471v-1.47h-1.47A1.474 1.474 0 001 9.846c.001.811.659 1.469 1.47 1.47zm3.682-2.942a1.474 1.474 0 00-1.47 1.471v3.683c.002.811.66 1.468 1.47 1.47a1.474 1.474 0 001.47-1.47V9.846a1.474 1.474 0 00-1.47-1.47z"/><path fill="%2336C5F0" d="M4.683 2.471c.001.811.659 1.469 1.47 1.47h1.47v-1.47A1.474 1.474 0 006.154 1a1.474 1.474 0 00-1.47 1.47zm2.94 3.682a1.474 1.474 0 00-1.47-1.47H2.47A1.474 1.474 0 001 6.153c.002.812.66 1.469 1.47 1.47h3.684a1.474 1.474 0 001.47-1.47z"/><path fill="%232EB67D" d="M9.847 7.624a1.474 1.474 0 001.47-1.47V2.47A1.474 1.474 0 009.848 1a1.474 1.474 0 00-1.47 1.47v3.684c.002.81.659 1.468 1.47 1.47zm3.682-2.941a1.474 1.474 0 00-1.47 1.47v1.47h1.47A1.474 1.474 0 0015 6.154a1.474 1.474 0 00-1.47-1.47z"/><path fill="%23ECB22E" d="M8.377 9.847c.002.811.659 1.469 1.47 1.47h3.683A1.474 1.474 0 0015 9.848a1.474 1.474 0 00-1.47-1.47H9.847a1.474 1.474 0 00-1.47 1.47zm2.94 3.682a1.474 1.474 0 00-1.47-1.47h-1.47v1.47c.002.812.659 1.469 1.47 1.47a1.474 1.474 0 001.47-1.47z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/property-24.scss
index 1e33093c4f3f3..6a54c61a2fe14 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slack-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-slack-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path fill="%23E01E5A" d="M4.101 16.74a2.106 2.106 0 002.101-2.101v-2.101H4.101a2.106 2.106 0 00-2.1 2.1 2.106 2.106 0 002.1 2.102zm5.26-4.202a2.106 2.106 0 00-2.1 2.1V19.9A2.106 2.106 0 009.362 22a2.106 2.106 0 002.1-2.1v-5.262a2.106 2.106 0 00-2.1-2.1z"/><path fill="%2336C5F0" d="M7.26 4.101a2.106 2.106 0 002.102 2.101h2.1V4.101a2.106 2.106 0 00-2.1-2.1A2.106 2.106 0 007.26 4.1zm4.203 5.26a2.106 2.106 0 00-2.101-2.1H4.1A2.106 2.106 0 002 9.362a2.106 2.106 0 002.1 2.1h5.262a2.106 2.106 0 002.1-2.1z"/><path fill="%232EB67D" d="M14.639 11.463a2.106 2.106 0 002.1-2.101V4.1a2.106 2.106 0 00-2.1-2.1 2.106 2.106 0 00-2.1 2.1v5.262a2.106 2.106 0 002.1 2.1zm5.26-4.202a2.106 2.106 0 00-2.1 2.1v2.101h2.1A2.106 2.106 0 0022 9.363a2.106 2.106 0 00-2.1-2.101z"/><path fill="%23ECB22E" d="M12.538 14.639a2.106 2.106 0 002.1 2.1H19.9a2.106 2.106 0 002.1-2.1 2.106 2.106 0 00-2.1-2.101h-5.262a2.106 2.106 0 00-2.1 2.1zm4.202 5.26a2.106 2.106 0 00-2.101-2.1h-2.1v2.1a2.106 2.106 0 002.1 2.101 2.106 2.106 0 002.1-2.1z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slack/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slack/index.scss
index 5f6d67206d99d..5ed6b5863158b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slack/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slack/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../slack-color/property-16';
         @import '../slack-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slack/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slack/keyframes.scss
index 7361945509b2d..c247aad6cb1a4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slack/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slack/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-slack {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slack/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slack/placeholders.scss
index 0bef9e9ad2c3a..4f9fff681621a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slack/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slack/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-slack-icon {
   --icon-name: icon-slack;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slack/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slack/property-16.scss
index 7835c5de18c7d..e0738110ec449 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slack/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slack/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-slack-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M2.471 11.318a1.474 1.474 0 001.47-1.471v-1.47h-1.47A1.474 1.474 0 001 9.846c.001.811.659 1.469 1.47 1.47zm3.682-2.942a1.474 1.474 0 00-1.47 1.471v3.683c.002.811.659 1.468 1.47 1.47a1.474 1.474 0 001.47-1.47V9.846a1.474 1.474 0 00-1.47-1.47zM4.683 2.471c.001.811.659 1.469 1.47 1.47h1.47v-1.47A1.474 1.474 0 006.154 1a1.474 1.474 0 00-1.47 1.47zm2.94 3.682a1.474 1.474 0 00-1.47-1.47H2.47A1.474 1.474 0 001 6.153c.002.812.66 1.469 1.47 1.47h3.684a1.474 1.474 0 001.47-1.47zM9.847 7.624a1.474 1.474 0 001.47-1.47V2.47A1.474 1.474 0 009.848 1a1.474 1.474 0 00-1.47 1.47v3.684c.002.81.659 1.468 1.47 1.47zm3.682-2.941a1.474 1.474 0 00-1.47 1.47v1.47h1.47A1.474 1.474 0 0015 6.154a1.474 1.474 0 00-1.47-1.47zM8.377 9.847c.002.811.659 1.469 1.47 1.47h3.683A1.474 1.474 0 0015 9.848a1.474 1.474 0 00-1.47-1.47H9.847a1.474 1.474 0 00-1.47 1.47zm2.94 3.682a1.474 1.474 0 00-1.47-1.47h-1.47v1.47c.002.812.659 1.469 1.47 1.47a1.474 1.474 0 001.47-1.47z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slack/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slack/property-24.scss
index bd80f6313d26e..54617c70b2532 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slack/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slack/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-slack-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M2.471 11.318a1.474 1.474 0 001.47-1.471v-1.47h-1.47A1.474 1.474 0 001 9.846c.001.811.659 1.469 1.47 1.47zm3.682-2.942a1.474 1.474 0 00-1.47 1.471v3.683c.002.811.659 1.468 1.47 1.47a1.474 1.474 0 001.47-1.47V9.846a1.474 1.474 0 00-1.47-1.47zM4.683 2.471c.001.811.659 1.469 1.47 1.47h1.47v-1.47A1.474 1.474 0 006.154 1a1.474 1.474 0 00-1.47 1.47zm2.94 3.682a1.474 1.474 0 00-1.47-1.47H2.47A1.474 1.474 0 001 6.153c.002.812.66 1.469 1.47 1.47h3.684a1.474 1.474 0 001.47-1.47zM9.847 7.624a1.474 1.474 0 001.47-1.47V2.47A1.474 1.474 0 009.848 1a1.474 1.474 0 00-1.47 1.47v3.684c.002.81.659 1.468 1.47 1.47zm3.682-2.941a1.474 1.474 0 00-1.47 1.47v1.47h1.47A1.474 1.474 0 0015 6.154a1.474 1.474 0 00-1.47-1.47zM8.377 9.847c.002.811.659 1.469 1.47 1.47h3.683A1.474 1.474 0 0015 9.848a1.474 1.474 0 00-1.47-1.47H9.847a1.474 1.474 0 00-1.47 1.47zm2.94 3.682a1.474 1.474 0 00-1.47-1.47h-1.47v1.47c.002.812.659 1.469 1.47 1.47a1.474 1.474 0 001.47-1.47z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/keyframes.scss
index fe73ae34ab9be..7832aaf2b22ba 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-slash-square {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/placeholders.scss
index dc4e88ce5f966..96b7280f30712 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-slash-square-icon {
   --icon-name: icon-slash-square;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/property-16.scss
index c78e5d2d2e592..9cd31311c2c24 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-slash-square-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M9.633 4.323a.75.75 0 011.234.854l-4.5 6.5a.75.75 0 01-1.234-.854l4.5-6.5z"/><path fill-rule="evenodd" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5zM2.5 3.25a.75.75 0 01.75-.75h9.5a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75v-9.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/property-24.scss
index 5a7c99559282c..4ff75b7e1a051 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slash-square/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-slash-square-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M14.1 6.874a.75.75 0 011.3.752l-5.5 9.5a.75.75 0 11-1.3-.752l5.5-9.5z"/><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25h14.5c.69 0 1.25.56 1.25 1.25v14.5c0 .69-.56 1.25-1.25 1.25H4.75c-.69 0-1.25-.56-1.25-1.25V4.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slash/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slash/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slash/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slash/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slash/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slash/keyframes.scss
index 568821db6bfe6..a8a69f7a0abc0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slash/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slash/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-slash {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slash/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slash/placeholders.scss
index ef3a47cf2af84..926496b4b8f46 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slash/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slash/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-slash-icon {
   --icon-name: icon-slash;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slash/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slash/property-16.scss
index c2cb53b7695dd..47dd99929864b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slash/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slash/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-slash-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M11.126 2.601a.75.75 0 00-1.025.273l-5.5 9.5a.75.75 0 001.298.752l5.5-9.5a.75.75 0 00-.273-1.025z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/slash/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/slash/property-24.scss
index 3ba9886037edd..0f225c87fd28d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/slash/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/slash/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-slash-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M16.63 4.103a.75.75 0 00-1.027.268l-8.5 14.5a.75.75 0 101.294.758l8.5-14.5a.75.75 0 00-.268-1.026z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/keyframes.scss
index d30295c9584fe..e4086a4e07562 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sliders {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/placeholders.scss
index 7a39f8739adce..837fd5adc86d3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sliders-icon {
   --icon-name: icon-sliders;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/property-16.scss
index 1b118daeb0add..9d065653ac0f9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sliders-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M2.75 1a.75.75 0 01.75.75v5.5a.75.75 0 01-1.5 0v-5.5A.75.75 0 012.75 1zM2 10.5v3.75a.75.75 0 001.5 0V10.5h1a.75.75 0 000-1.5H1a.75.75 0 000 1.5h1zM8.5 7.75a.75.75 0 00-1.5 0v6.5a.75.75 0 001.5 0v-6.5zM7.75 1a.75.75 0 01.75.75V4.5h1a.75.75 0 010 1.5H6a.75.75 0 010-1.5h1V1.75A.75.75 0 017.75 1zM14.5 10a.75.75 0 010 1.5h-1v2.75a.75.75 0 01-1.5 0V11.5h-1a.75.75 0 010-1.5h3.5zM12.75 1a.75.75 0 01.75.75v6.5a.75.75 0 01-1.5 0v-6.5a.75.75 0 01.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/property-24.scss
index 373d691d38acb..010cc02fad222 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sliders/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sliders-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3.75 2.5a.75.75 0 01.75.75v7a.75.75 0 01-1.5 0v-7a.75.75 0 01.75-.75zM3 14.5v6.25a.75.75 0 001.5 0V14.5h2a.75.75 0 000-1.5H1a.75.75 0 000 1.5h2zM12.5 11.75a.75.75 0 00-1.5 0v9a.75.75 0 001.5 0v-9zM11.75 2.5a.75.75 0 01.75.75V7.5h2a.75.75 0 010 1.5H9a.75.75 0 010-1.5h2V3.25a.75.75 0 01.75-.75zM22.5 15a.75.75 0 010 1.5h-2v4.25a.75.75 0 01-1.5 0V16.5h-2a.75.75 0 010-1.5h5.5zM19.75 2.5a.75.75 0 01.75.75v9a.75.75 0 01-1.5 0v-9a.75.75 0 01.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/keyframes.scss
index d887984e4fe3b..cc5546279c3ed 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-smartphone {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/placeholders.scss
index f2f772b975c11..3b9b4cbc10f61 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-smartphone-icon {
   --icon-name: icon-smartphone;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/property-16.scss
index 7dee9c4c33740..482311efe4b82 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-smartphone-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 12a1 1 0 100 2h.007a1 1 0 100-2H8z"/><path fill-rule="evenodd" d="M4.25 0A2.25 2.25 0 002 2.25v11.5A2.25 2.25 0 004.25 16h7.5A2.25 2.25 0 0014 13.75V2.25A2.25 2.25 0 0011.75 0h-7.5zM3.5 2.25a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75v11.5a.75.75 0 01-.75.75h-7.5a.75.75 0 01-.75-.75V2.25z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/property-24.scss
index 3c2764c7d4826..8ba43e5e151c4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/smartphone/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-smartphone-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 19a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M6.75 1A2.75 2.75 0 004 3.75v16.5A2.75 2.75 0 006.75 23h10.5A2.75 2.75 0 0020 20.25V3.75A2.75 2.75 0 0017.25 1H6.75zM5.5 3.75c0-.69.56-1.25 1.25-1.25h10.5c.69 0 1.25.56 1.25 1.25v16.5c0 .69-.56 1.25-1.25 1.25H6.75c-.69 0-1.25-.56-1.25-1.25V3.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/smile/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/smile/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/smile/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/smile/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/smile/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/smile/keyframes.scss
index 719a3d41ac25b..9b7c1ee220f0d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/smile/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/smile/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-smile {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/smile/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/smile/placeholders.scss
index d747c5ff1ebf2..60fda30054867 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/smile/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/smile/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-smile-icon {
   --icon-name: icon-smile;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/smile/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/smile/property-16.scss
index 601090c9ccc1f..d0ca74a770609 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/smile/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/smile/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-smile-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 12c-1.01 0-1.782-.504-2.267-.945a4.72 4.72 0 01-.564-.614 3.31 3.31 0 01-.212-.305.75.75 0 011.284-.775 3.214 3.214 0 00.5.584c.341.31.769.555 1.259.555.49 0 .918-.246 1.258-.555a3.214 3.214 0 00.5-.584.75.75 0 011.285.775l-.212.305c-.128.167-.317.39-.564.614C9.782 11.495 9.01 12 8 12zM5 6a1 1 0 011-1h.007a1 1 0 010 2H6a1 1 0 01-1-1zM10 5a1 1 0 100 2h.007a1 1 0 100-2H10z"/><path fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/smile/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/smile/property-24.scss
index b702195482a9d..6cb075b4c6b7e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/smile/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/smile/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-smile-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M7.362 14.693c.216.265.534.618.948.972.82.7 2.077 1.46 3.69 1.46s2.87-.76 3.69-1.46a7.647 7.647 0 001.199-1.3l.099-.145a.875.875 0 00-1.475-.942c-.071.107-.15.21-.232.31a5.898 5.898 0 01-.729.747c-.641.549-1.509 1.04-2.552 1.04-1.043 0-1.91-.491-2.552-1.04a5.894 5.894 0 01-.73-.747 4.012 4.012 0 01-.232-.31.875.875 0 00-1.474.942c.106.165.227.322.35.473zM8 9a1 1 0 011-1h.01a1 1 0 110 2H9a1 1 0 01-1-1zM15 8a1 1 0 100 2h.01a1 1 0 100-2H15z"/><path fill-rule="evenodd" d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/socket/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/socket/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/socket/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/socket/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/socket/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/socket/keyframes.scss
index 3d433204f108f..0cb014f08c970 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/socket/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/socket/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-socket {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/socket/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/socket/placeholders.scss
index 51db9c4944ebe..03c4fd9bf3b2e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/socket/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/socket/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-socket-icon {
   --icon-name: icon-socket;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/socket/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/socket/property-16.scss
index e4a4c72cfe90e..ed18e359a8513 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/socket/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/socket/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-socket-16: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12 20C16.4183 20 20 16.4183 20 12C20 7.58172 16.4183 4 12 4C7.58172 4 4 7.58172 4 12C4 16.4183 7.58172 20 12 20ZM12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM7 11C7 10.4477 7.44772 10 8 10H10C10.5523 10 11 10.4477 11 11V13C11 13.5523 10.5523 14 10 14H8C7.44772 14 7 13.5523 7 13V11ZM14 10C13.4477 10 13 10.4477 13 11V13C13 13.5523 13.4477 14 14 14H16C16.5523 14 17 13.5523 17 13V11C17 10.4477 16.5523 10 16 10H14Z" fill="%23000"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/socket/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/socket/property-24.scss
index b5cf8e404df8c..e0e7ab26896a7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/socket/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/socket/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-socket-24: url('data:image/svg+xml;charset=UTF-8,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12 20C16.4183 20 20 16.4183 20 12C20 7.58172 16.4183 4 12 4C7.58172 4 4 7.58172 4 12C4 16.4183 7.58172 20 12 20ZM12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM7 11C7 10.4477 7.44772 10 8 10H10C10.5523 10 11 10.4477 11 11V13C11 13.5523 10.5523 14 10 14H8C7.44772 14 7 13.5523 7 13V11ZM14 10C13.4477 10 13 10.4477 13 11V13C13 13.5523 13.4477 14 14 14H16C16.5523 14 17 13.5523 17 13V11C17 10.4477 16.5523 10 16 10H14Z" fill="%23000"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/keyframes.scss
index 832f945bd470a..ed7895e7f2f61 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sort-asc {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/placeholders.scss
index 2477ad9dcd47d..33dbe8f074c22 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sort-asc-icon {
   --icon-name: icon-sort-asc;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/property-16.scss
index 69e668a208419..1b6084decd867 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sort-asc-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M15.78 5.72a.75.75 0 01-1.06 1.06L13 5.06v4.69a.75.75 0 01-1.5 0V5.06L9.78 6.78a.75.75 0 01-1.06-1.06l3-3a.748.748 0 01.528-.22h.004a.748.748 0 01.528.22l3 3zM3 10.5A.75.75 0 013 9h6a.75.75 0 010 1.5H3zM2.25 12.75c0 .414.336.75.75.75h10a.75.75 0 000-1.5H3a.75.75 0 00-.75.75zM3 7.5A.75.75 0 013 6h3a.75.75 0 010 1.5H3zM2.25 3.75c0 .414.336.75.75.75h3A.75.75 0 006 3H3a.75.75 0 00-.75.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/property-24.scss
index f3562470c2062..f9930481d3b68 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-asc/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sort-asc-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M16.963 3.057a.748.748 0 01.817.163l4 4a.75.75 0 01-1.06 1.06L18 5.56v8.19a.75.75 0 01-1.5 0V5.56l-2.72 2.72a.75.75 0 11-1.06-1.06l4-4a.748.748 0 01.243-.163zM3.75 14.5a.75.75 0 010-1.5h9.5a.75.75 0 010 1.5h-9.5zM3 17.75c0 .414.336.75.75.75h16.5a.75.75 0 000-1.5H3.75a.75.75 0 00-.75.75zM3.75 10.5a.75.75 0 010-1.5h5.5a.75.75 0 010 1.5h-5.5zM3 5.75c0 .414.336.75.75.75h3.5a.75.75 0 000-1.5h-3.5a.75.75 0 00-.75.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/keyframes.scss
index 87b9bd61ad743..24781e28d7bf1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sort-desc {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/placeholders.scss
index d9d748be3358f..279a84bd99b28 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sort-desc-icon {
   --icon-name: icon-sort-desc;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/property-16.scss
index d8d6845c22e1b..b4b5222585e9e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sort-desc-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M2.25 3.75A.75.75 0 013 3h10a.75.75 0 010 1.5H3a.75.75 0 01-.75-.75zM3 6a.75.75 0 000 1.5h6A.75.75 0 009 6H3zM11.963 13.943a.747.747 0 00.817-.163l3-3a.75.75 0 10-1.06-1.06L13 11.44V6.75a.75.75 0 00-1.5 0v4.69L9.78 9.72a.75.75 0 00-1.06 1.06l3 3a.748.748 0 00.243.163zM3 9a.75.75 0 000 1.5h3A.75.75 0 006 9H3zM2.25 12.75A.75.75 0 013 12h3a.75.75 0 010 1.5H3a.75.75 0 01-.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/property-24.scss
index 1ba065e499ff6..fe92454ad9276 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sort-desc/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sort-desc-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3 5.75A.75.75 0 013.75 5h16.5a.75.75 0 010 1.5H3.75A.75.75 0 013 5.75zM3.75 9a.75.75 0 000 1.5h9.5a.75.75 0 000-1.5h-9.5zM16.963 20.443a.747.747 0 00.817-.163l4-4a.75.75 0 10-1.06-1.06L18 17.94V9.75a.75.75 0 00-1.5 0v8.19l-2.72-2.72a.75.75 0 10-1.06 1.06l4 4a.748.748 0 00.243.163zM3.75 13a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5zM3 17.75a.75.75 0 01.75-.75h3.5a.75.75 0 010 1.5h-3.5a.75.75 0 01-.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sort/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sort/index.scss
index fd0be5abf58de..8575cbadb0abf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sort/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sort/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../sort-desc/property-16';
         @import '../sort-desc/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sort/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sort/keyframes.scss
index 93dfdc5f0fe2a..335f176ba2463 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sort/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sort/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sort {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sort/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sort/placeholders.scss
index 041b707338d58..5971c5ea77b41 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sort/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sort/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sort-icon {
   --icon-name: icon-sort;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/source-file/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/source-file/index.scss
index 987136c0f9623..6fd6c7b971c45 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/source-file/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/source-file/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../file-source/property-16';
         @import '../file-source/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/source-file/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/source-file/keyframes.scss
index 015a96447e94e..cef55ce3fc31d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/source-file/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/source-file/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-source-file {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/source-file/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/source-file/placeholders.scss
index f846465a18cd6..e3c8eb493ce7c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/source-file/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/source-file/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-source-file-icon {
   --icon-name: icon-source-file;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/keyframes.scss
index bdddd856e1932..f6774a996204a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-speaker {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/placeholders.scss
index eecbc0c14b364..32209b4c2c9d2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-speaker-icon {
   --icon-name: icon-speaker;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/property-16.scss
index 701a8e70e6f09..27a2f0e637297 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-speaker-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 5.55a3.95 3.95 0 100 7.9 3.95 3.95 0 000-7.9zM5.45 9.5a2.55 2.55 0 115.1 0 2.55 2.55 0 01-5.1 0z"/><path d="M3.25 0A2.25 2.25 0 001 2.25v11.5A2.25 2.25 0 003.25 16h9.5A2.25 2.25 0 0015 13.75V2.25A2.25 2.25 0 0012.75 0h-9.5zM2.5 2.25a.75.75 0 01.75-.75h9.5a.75.75 0 01.75.75v11.5a.75.75 0 01-.75.75h-9.5a.75.75 0 01-.75-.75V2.25z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/property-24.scss
index 8a27be4742a2a..f155bb1ec2157 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/speaker/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-speaker-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 9a5 5 0 100 10 5 5 0 000-10zm-3.5 5a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z"/><path d="M5.75 1A2.75 2.75 0 003 3.75v16.5A2.75 2.75 0 005.75 23h12.5A2.75 2.75 0 0021 20.25V3.75A2.75 2.75 0 0018.25 1H5.75zM4.5 3.75c0-.69.56-1.25 1.25-1.25h12.5c.69 0 1.25.56 1.25 1.25v16.5c0 .69-.56 1.25-1.25 1.25H5.75c-.69 0-1.25-.56-1.25-1.25V3.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/keyframes.scss
index 9889014a499b3..7392b60f38950 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-square-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/placeholders.scss
index c4efbc766b1f6..964fb2a5fcce1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-square-fill-icon {
   --icon-name: icon-square-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/property-16.scss
index 842f8d5cbfc85..f8361e71b602d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-square-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M3.25 1A2.25 2.25 0 001 3.25v9.5A2.25 2.25 0 003.25 15h9.5A2.25 2.25 0 0015 12.75v-9.5A2.25 2.25 0 0012.75 1h-9.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/property-24.scss
index 21af2dabf14a4..07024da65bfcf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/square-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-square-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M4.75 2A2.75 2.75 0 002 4.75v14.5A2.75 2.75 0 004.75 22h14.5A2.75 2.75 0 0022 19.25V4.75A2.75 2.75 0 0019.25 2H4.75z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/square/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/square/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/square/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/square/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/square/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/square/keyframes.scss
index 766187730b75d..fe48a264e5eab 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/square/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/square/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-square {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/square/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/square/placeholders.scss
index 66e458af3023d..2b9708740d693 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/square/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/square/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-square-icon {
   --icon-name: icon-square;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/square/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/square/property-16.scss
index cecf89ba1ceaa..4b72e3ffacef3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/square/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/square/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-square-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M1 3.25A2.25 2.25 0 013.25 1h9.5A2.25 2.25 0 0115 3.25v9.5A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75h-9.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/square/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/square/property-24.scss
index b7b610458a624..4b6637192352e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/square/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/square/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-square-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M2 4.75A2.75 2.75 0 014.75 2h14.5A2.75 2.75 0 0122 4.75v14.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25V4.75zM4.75 3.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h14.5c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H4.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/keyframes.scss
index ae280e5b6e6ae..969b1f5216599 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-star-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/placeholders.scss
index 937ac0535992c..1d6b2dce9a4e4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-star-circle-icon {
   --icon-name: icon-star-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/property-16.scss
index 11a2bfb6153bc..2b652f340baf0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-star-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8.679 2.431a.75.75 0 00-1.358 0L6.023 5.196l-2.887.444a.75.75 0 00-.423 1.265l2.11 2.162-.499 3.062a.75.75 0 001.103.777L8 11.484l2.573 1.422a.75.75 0 001.103-.777l-.5-3.062 2.11-2.162a.75.75 0 00-.422-1.265l-2.887-.444-1.298-2.765zM7.21 6.195L8 4.515l.789 1.68a.75.75 0 00.565.423l1.84.283L9.838 8.29a.75.75 0 00-.203.644l.312 1.912-1.584-.876a.75.75 0 00-.726 0l-1.584.876.312-1.912a.75.75 0 00-.203-.644L4.806 6.9l1.84-.282a.75.75 0 00.565-.423z"/><path d="M8 .05a7.95 7.95 0 100 15.9A7.95 7.95 0 008 .05zM1.45 8a6.55 6.55 0 1113.1 0 6.55 6.55 0 01-13.1 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/property-24.scss
index 0284a9426c273..9931303390fc2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-star-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12.669 4.91a.75.75 0 00-1.338 0l-1.91 3.767-4.277.608a.75.75 0 00-.41 1.287l3.082 2.923-.726 4.125a.75.75 0 001.08.798L12 16.457l3.83 1.96a.75.75 0 001.08-.797l-.726-4.125 3.082-2.923a.75.75 0 00-.41-1.287l-4.278-.608L12.67 4.91zm-2.086 4.793L12 6.91l1.417 2.794a.75.75 0 00.563.404l3.128.445-2.25 2.132a.75.75 0 00-.222.675l.535 3.036-2.83-1.448a.75.75 0 00-.683 0l-2.83 1.448.536-3.036a.75.75 0 00-.223-.675l-2.249-2.132 3.128-.445a.75.75 0 00.563-.404z"/><path d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/keyframes.scss
index c057f0160b991..e74eba176e805 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-star-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/placeholders.scss
index 38d5af82b0837..d11fb8cb9d816 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-star-fill-icon {
   --icon-name: icon-star-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/property-16.scss
index dd277638f5115..278071c61fc0b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-star-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8.67.912a.75.75 0 00-1.34 0L5.266 5.006l-4.622.662a.75.75 0 00-.412 1.285l3.335 3.18-.786 4.488a.75.75 0 001.082.796L8 13.287l4.137 2.13a.75.75 0 001.082-.796l-.786-4.488 3.335-3.18a.75.75 0 00-.412-1.285l-4.622-.662L8.67.912z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/property-24.scss
index f26ce7239270b..d993bee610f8d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-star-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M12.673 1.418a.75.75 0 00-1.345 0L8.335 7.483l-6.693.978a.75.75 0 00-.415 1.28l4.842 4.717-1.143 6.665a.75.75 0 001.089.79L12 18.766l5.985 3.149a.75.75 0 001.089-.79l-1.143-6.666 4.842-4.717a.75.75 0 00-.415-1.28l-6.693-.978-2.992-6.065z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/keyframes.scss
index e9ab81d0c474b..0d6199e54f14c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-star-off {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/placeholders.scss
index 5555475eaecb8..c026574632501 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-star-off-icon {
   --icon-name: icon-star-off;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/property-16.scss
index ea74e31d53b9c..87afff5ddd3f0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-star-off-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8.67.912a.75.75 0 00-1.34 0l-.882 1.75a.75.75 0 001.34.676L8 2.916 9.57 6.03c.11.219.321.37.564.405l3.48.498-1.299 1.238a.75.75 0 101.035 1.086l2.418-2.305a.75.75 0 00-.412-1.285l-4.622-.662L8.67.912z"/><path fill-rule="evenodd" d="M13.147 14.207l.072.413a.75.75 0 01-1.082.797L8 13.287l-4.137 2.13a.75.75 0 01-1.082-.796l.786-4.489-3.335-3.18a.75.75 0 01.412-1.284l3.467-.496L1.22 2.28a.75.75 0 111.06-1.06l12.5 12.5a.75.75 0 01-1.06 1.06l-.573-.572zm-7.71-7.71l-3.051.437 2.507 2.39a.75.75 0 01.22.672l-.594 3.396 3.138-1.616a.75.75 0 01.686 0l3.138 1.616-.18-1.03-5.865-5.865z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/property-24.scss
index 45583efc772e0..abecbd8066fef 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-off/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-star-off-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12.673 1.418a.75.75 0 00-1.345 0l-1.584 3.21a.75.75 0 101.345.663L12 3.445 14.495 8.5a.75.75 0 00.564.41l5.58.816-2.756 2.685a.75.75 0 001.046 1.075l3.844-3.745a.75.75 0 00-.415-1.28l-6.693-.978-2.992-6.065z"/><path fill-rule="evenodd" d="M18.87 19.93l.204 1.193a.75.75 0 01-1.089.79L12 18.766l-5.985 3.149a.75.75 0 01-1.089-.79l1.143-6.666-4.842-4.717a.75.75 0 01.415-1.28l5.024-.734L1.22 2.28a.75.75 0 011.06-1.06l20.5 20.5a.75.75 0 11-1.06 1.06l-2.85-2.85zM7.988 9.05l-4.628.676 4.037 3.933a.75.75 0 01.216.664l-.952 5.556 4.989-2.625a.75.75 0 01.698 0l4.99 2.625-.307-1.786L7.99 9.049z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-outline/index.scss
index f8b673f44d7a7..5c0cd92cafdc1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../star/property-16';
         @import '../star/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-outline/keyframes.scss
index 2f4f2d3b2905b..596bf5fa7a8dd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-star-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star-outline/placeholders.scss
index 0dc594ee5410b..58855e4c48e02 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-star-outline-icon {
   --icon-name: icon-star-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star/keyframes.scss
index ba5a726333d93..98204e8e8a2ed 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-star {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star/placeholders.scss
index b3e9c21638a93..59947a06e0bad 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-star-icon {
   --icon-name: icon-star;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star/property-16.scss
index 730e590e5687f..799294d7d30f9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-star-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 .5a.75.75 0 01.67.412l2.064 4.094 4.622.662a.75.75 0 01.412 1.285l-3.335 3.18.786 4.488a.75.75 0 01-1.082.796L8 13.287l-4.137 2.13a.75.75 0 01-1.082-.796l.786-4.489-3.335-3.18a.75.75 0 01.412-1.284l4.622-.662L7.33.912A.75.75 0 018 .5zm0 2.416L6.43 6.03a.75.75 0 01-.564.405l-3.48.498 2.507 2.39a.75.75 0 01.22.672l-.594 3.396 3.138-1.616a.75.75 0 01.686 0l3.138 1.616-.595-3.396a.75.75 0 01.221-.672l2.507-2.39-3.48-.498a.75.75 0 01-.563-.405L8 2.916z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/star/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/star/property-24.scss
index 6d8f629078b59..720693f88aacf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/star/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/star/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-star-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1a.75.75 0 01.673.418l2.992 6.065 6.694.978a.75.75 0 01.414 1.28l-4.842 4.717 1.143 6.665a.75.75 0 01-1.089.79L12 18.766l-5.985 3.149a.75.75 0 01-1.089-.79l1.143-6.666-4.842-4.717a.75.75 0 01.415-1.28l6.693-.978 2.992-6.065A.75.75 0 0112 1zm0 2.445L9.505 8.5a.75.75 0 01-.564.41l-5.58.816 4.037 3.933a.75.75 0 01.216.664l-.952 5.556 4.989-2.625a.75.75 0 01.698 0l4.99 2.625-.953-5.556a.75.75 0 01.216-.664l4.037-3.933-5.58-.816a.75.75 0 01-.564-.41L12 3.445z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/keyframes.scss
index 36ea3801b90d9..0703ea586f0c8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-stop-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/placeholders.scss
index 3ce16e7c7094e..233ad64648966 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-stop-circle-icon {
   --icon-name: icon-stop-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/property-16.scss
index 8e86413b09337..94de51752222c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-stop-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M6.25 5C5.56 5 5 5.56 5 6.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5C11 5.56 10.44 5 9.75 5h-3.5zm.25 4.5v-3h3v3h-3z"/><path d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/property-24.scss
index 3a2cf62ed2c22..d44262381fc4d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/stop-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-stop-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8.75 7A1.75 1.75 0 007 8.75v6.5c0 .966.784 1.75 1.75 1.75h6.5A1.75 1.75 0 0017 15.25v-6.5A1.75 1.75 0 0015.25 7h-6.5zM8.5 8.75a.25.25 0 01.25-.25h6.5a.25.25 0 01.25.25v6.5a.25.25 0 01-.25.25h-6.5a.25.25 0 01-.25-.25v-6.5z"/><path d="M12 1C5.925 1 1 5.925 1 12s4.925 11 11 11 11-4.925 11-11S18.075 1 12 1zM2.5 12a9.5 9.5 0 1119 0 9.5 9.5 0 01-19 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sub-left/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sub-left/index.scss
index e3d0042ae49a2..b9d42576831d5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sub-left/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sub-left/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../corner-down-left/property-16';
         @import '../corner-down-left/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sub-left/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sub-left/keyframes.scss
index 660e3db945aa8..c58fbad215432 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sub-left/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sub-left/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sub-left {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sub-left/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sub-left/placeholders.scss
index 8ddc0a5893e19..91ac4cc0c50a0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sub-left/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sub-left/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sub-left-icon {
   --icon-name: icon-sub-left;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sub-right/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sub-right/index.scss
index e7e87da0c7399..e397409328d34 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sub-right/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sub-right/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../corner-down-right/property-16';
         @import '../corner-down-right/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sub-right/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sub-right/keyframes.scss
index 9d5a1a9fb8859..9303a7eedf7e3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sub-right/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sub-right/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sub-right {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sub-right/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sub-right/placeholders.scss
index 148933991d43b..31c32cc4b2e36 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sub-right/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sub-right/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sub-right-icon {
   --icon-name: icon-sub-right;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sun/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sun/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sun/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sun/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sun/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sun/keyframes.scss
index 5b29f6617acfd..3c8e6ee4d88a1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sun/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sun/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sun {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sun/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sun/placeholders.scss
index 60ec5477c9610..ce9abbb141d5c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sun/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sun/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sun-icon {
   --icon-name: icon-sun;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sun/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sun/property-16.scss
index fb343d86ce79d..9edc596c4e5eb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sun/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sun/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sun-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 .25a.75.75 0 01.75.75v1.273a.75.75 0 01-1.5 0V1A.75.75 0 018 .25z"/><path fill-rule="evenodd" d="M4 8a4 4 0 118 0 4 4 0 01-8 0zm4-2.5a2.5 2.5 0 100 5 2.5 2.5 0 000-5z" clip-rule="evenodd"/><path d="M8.75 13.727a.75.75 0 00-1.5 0V15a.75.75 0 001.5 0v-1.273zM2.519 2.518a.75.75 0 011.06 0l.904.904a.75.75 0 01-1.06 1.06l-.904-.903a.75.75 0 010-1.06zM12.578 11.517a.75.75 0 00-1.061 1.06l.904.904a.75.75 0 101.06-1.06l-.903-.904zM.25 8A.75.75 0 011 7.25h1.273a.75.75 0 010 1.5H1A.75.75 0 01.25 8zM13.727 7.25a.75.75 0 000 1.5H15a.75.75 0 000-1.5h-1.273zM4.483 11.517a.75.75 0 010 1.06l-.904.904a.75.75 0 01-1.06-1.06l.903-.904a.75.75 0 011.061 0zM13.481 3.58a.75.75 0 00-1.06-1.062l-.904.904a.75.75 0 101.06 1.06l.904-.903z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sun/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sun/property-24.scss
index 101a79a148f23..a95d50ef1fbff 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sun/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sun/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sun-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 .25a.75.75 0 01.75.75v2a.75.75 0 01-1.5 0V1A.75.75 0 0112 .25z"/><path fill-rule="evenodd" d="M6 12a6 6 0 1112 0 6 6 0 01-12 0zm6-4.5a4.5 4.5 0 100 9 4.5 4.5 0 000-9z" clip-rule="evenodd"/><path d="M12.75 21a.75.75 0 00-1.5 0v2a.75.75 0 001.5 0v-2zM3.69 3.69a.75.75 0 011.06 0l1.42 1.42a.75.75 0 01-1.06 1.06L3.69 4.75a.75.75 0 010-1.06zM18.89 17.83a.75.75 0 10-1.06 1.06l1.42 1.42a.75.75 0 101.06-1.06l-1.42-1.42zM.25 12a.75.75 0 01.75-.75h2a.75.75 0 010 1.5H1A.75.75 0 01.25 12zM21 11.25a.75.75 0 000 1.5h2a.75.75 0 000-1.5h-2zM6.17 17.83a.75.75 0 010 1.06l-1.42 1.42a.75.75 0 11-1.06-1.06l1.42-1.42a.75.75 0 011.06 0zM20.31 4.75a.75.75 0 00-1.06-1.06l-1.42 1.42a.75.75 0 001.06 1.06l1.42-1.42z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/support/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/support/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/support/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/support/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/support/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/support/keyframes.scss
index b8d01836540c2..feec023ceb165 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/support/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/support/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-support {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/support/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/support/placeholders.scss
index 2f611e5a89faf..bdd928c2d1428 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/support/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/support/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-support-icon {
   --icon-name: icon-support;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/support/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/support/property-16.scss
index ccc8cdf50ca16..028c832e6a9e8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/support/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/support/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-support-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 0a8 8 0 100 16A8 8 0 008 0zM1.5 8c0-1.525.525-2.927 1.404-4.035l1.787 1.787A3.982 3.982 0 004 8c0 .834.255 1.608.691 2.248l-1.787 1.787A6.472 6.472 0 011.5 8zm2.465 5.096l1.787-1.787C6.392 11.745 7.166 12 8 12c.834 0 1.608-.255 2.248-.691l1.787 1.787A6.472 6.472 0 018 14.5a6.473 6.473 0 01-4.035-1.404zm9.131-1.06A6.472 6.472 0 0014.5 8a6.473 6.473 0 00-1.404-4.035l-1.787 1.787C11.745 6.392 12 7.166 12 8c0 .834-.255 1.608-.691 2.248l1.787 1.787zm-1.06-9.132A6.472 6.472 0 008 1.5a6.472 6.472 0 00-4.035 1.404l1.787 1.787A3.982 3.982 0 018 4c.834 0 1.608.255 2.248.691l1.787-1.787zM5.5 8a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/support/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/support/property-24.scss
index 6fc1aa2c68e52..1b0a1bf71dab5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/support/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/support/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-support-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M19.828 19.728A10.965 10.965 0 0023 12c0-3.012-1.21-5.742-3.172-7.728a.77.77 0 00-.1-.1A10.965 10.965 0 0012 1C8.988 1 6.258 2.21 4.272 4.172a.767.767 0 00-.1.1A10.965 10.965 0 001 12c0 3.012 1.21 5.742 3.172 7.728a.77.77 0 00.1.1A10.965 10.965 0 0012 23c3.012 0 5.742-1.21 7.728-3.172a.771.771 0 00.1-.1zM2.5 12c0-2.353.856-4.507 2.273-6.166l3.2 3.2A4.978 4.978 0 007 12c0 1.11.362 2.136.974 2.965l-3.201 3.201A9.462 9.462 0 012.5 12zm7.094 2.542A3.488 3.488 0 0012 15.5c.932 0 1.779-.364 2.406-.958a.769.769 0 01.136-.136A3.488 3.488 0 0015.5 12c0-.932-.364-1.779-.958-2.406a.768.768 0 01-.136-.136A3.488 3.488 0 0012 8.5c-.932 0-1.779.364-2.406.958a.768.768 0 01-.136.136A3.488 3.488 0 008.5 12c0 .932.364 1.779.958 2.406.05.039.097.086.136.136zm5.371 1.484A4.978 4.978 0 0112 17a4.978 4.978 0 01-2.965-.974l-3.201 3.201A9.462 9.462 0 0012 21.5a9.462 9.462 0 006.166-2.273l-3.2-3.2zm4.262 2.14l-3.2-3.2c.611-.83.973-1.856.973-2.966s-.362-2.136-.974-2.965l3.201-3.201A9.462 9.462 0 0121.5 12a9.462 9.462 0 01-2.273 6.166zm-1.06-13.393l-3.202 3.2A4.977 4.977 0 0012 7c-1.11 0-2.136.362-2.965.974L5.834 4.773A9.463 9.463 0 0112 2.5c2.353 0 4.507.856 6.166 2.273z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/keyframes.scss
index 27c0af948ae54..fb356aa424bda 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-swap-horizontal {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/placeholders.scss
index 87c1a4c56556c..156b0067e18d3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-swap-horizontal-icon {
   --icon-name: icon-swap-horizontal;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/property-16.scss
index 569d12fb670ea..83305bc5c15ec 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-swap-horizontal-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M12.26 1.45a.75.75 0 10-1.02 1.1l2.1 1.95H7.75a.75.75 0 000 1.5h5.59l-2.1 1.95a.75.75 0 101.02 1.1l3.5-3.25a.75.75 0 000-1.1l-3.5-3.25zM2.66 10l2.1-1.95a.75.75 0 10-1.02-1.1L.24 10.2a.75.75 0 000 1.1l3.5 3.25a.75.75 0 001.02-1.1l-2.1-1.95h5.59a.75.75 0 000-1.5H2.66z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/property-24.scss
index 838be24c5eaef..6643ea70c9734 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-horizontal/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-swap-horizontal-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M18.265 5.455a.75.75 0 00-1.03 1.09L20.364 9.5H11.75a.75.75 0 000 1.5h8.614l-3.129 2.955a.75.75 0 001.03 1.09l4.5-4.25a.75.75 0 000-1.09l-4.5-4.25zM3.636 13l3.129-2.955a.75.75 0 00-1.03-1.09l-4.5 4.25a.75.75 0 000 1.09l4.5 4.25a.75.75 0 001.03-1.09L3.636 14.5h8.614a.75.75 0 000-1.5H3.636z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/keyframes.scss
index 8162548e9e835..059ae89ef41f3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-swap-vertical {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/placeholders.scss
index 2636992ece961..b24b98266803a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-swap-vertical-icon {
   --icon-name: icon-swap-vertical;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/property-16.scss
index 0e94ad6b5f5e1..6047fbe937957 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-swap-vertical-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.45 3.74a.75.75 0 001.1 1.02l1.95-2.1v5.59a.75.75 0 101.5 0V2.66l1.95 2.1a.75.75 0 101.1-1.02L5.8.24a.75.75 0 00-1.1 0l-3.25 3.5zM10.75 7a.75.75 0 00-.75.75v5.59l-1.95-2.1a.75.75 0 10-1.1 1.02l3.25 3.5a.75.75 0 001.1 0l3.25-3.5a.75.75 0 10-1.1-1.02l-1.95 2.1V7.75a.75.75 0 00-.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/property-24.scss
index ec381d2a37ecb..fa042f05197da 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/swap-vertical/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-swap-vertical-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M4.455 5.735a.75.75 0 001.09 1.03L8.5 3.636v8.614a.75.75 0 001.5 0V3.636l2.955 3.129a.75.75 0 001.09-1.03l-4.25-4.5a.75.75 0 00-1.09 0l-4.25 4.5zM15.5 20.364V11.75a.75.75 0 00-1.5 0v8.614l-2.955-3.129a.75.75 0 00-1.09 1.03l4.25 4.5a.75.75 0 001.09 0l4.25-4.5a.75.75 0 00-1.09-1.03L15.5 20.364z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/keyframes.scss
index 6c409498f5dd5..dc07c049a54a4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-switcher {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/placeholders.scss
index 75e3df32db918..4101d99337fad 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-switcher-icon {
   --icon-name: icon-switcher;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/property-16.scss
index d738219520807..b5e397f8e1f8b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-switcher-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M.75 0A.75.75 0 000 .75v2.5c0 .414.336.75.75.75h2.5A.75.75 0 004 3.25V.75A.75.75 0 003.25 0H.75zM6.75 0A.75.75 0 006 .75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75V.75A.75.75 0 009.25 0h-2.5zM12.75 0a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75V.75a.75.75 0 00-.75-.75h-2.5zM.75 6a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5A.75.75 0 004 9.25v-2.5A.75.75 0 003.25 6H.75zM6.75 6a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5A.75.75 0 009.25 6h-2.5zM12.75 6a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5a.75.75 0 00-.75-.75h-2.5zM.75 12a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5a.75.75 0 00-.75-.75H.75zM6.75 12a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5a.75.75 0 00-.75-.75h-2.5zM12.75 12a.75.75 0 00-.75.75v2.5c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-2.5a.75.75 0 00-.75-.75h-2.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/property-24.scss
index 7b909cd5c66d1..3e41dec579e45 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/switcher/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-switcher-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M2.25 1C1.56 1 1 1.56 1 2.25v3.5C1 6.44 1.56 7 2.25 7h3.5C6.44 7 7 6.44 7 5.75v-3.5C7 1.56 6.44 1 5.75 1h-3.5zM10.25 1C9.56 1 9 1.56 9 2.25v3.5C9 6.44 9.56 7 10.25 7h3.5C14.44 7 15 6.44 15 5.75v-3.5C15 1.56 14.44 1 13.75 1h-3.5zM18.25 1C17.56 1 17 1.56 17 2.25v3.5c0 .69.56 1.25 1.25 1.25h3.5C22.44 7 23 6.44 23 5.75v-3.5C23 1.56 22.44 1 21.75 1h-3.5zM2.25 9C1.56 9 1 9.56 1 10.25v3.5c0 .69.56 1.25 1.25 1.25h3.5C6.44 15 7 14.44 7 13.75v-3.5C7 9.56 6.44 9 5.75 9h-3.5zM10.25 9C9.56 9 9 9.56 9 10.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5C15 9.56 14.44 9 13.75 9h-3.5zM18.25 9c-.69 0-1.25.56-1.25 1.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5C23 9.56 22.44 9 21.75 9h-3.5zM2.25 17C1.56 17 1 17.56 1 18.25v3.5c0 .69.56 1.25 1.25 1.25h3.5C6.44 23 7 22.44 7 21.75v-3.5C7 17.56 6.44 17 5.75 17h-3.5zM10.25 17C9.56 17 9 17.56 9 18.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5c0-.69-.56-1.25-1.25-1.25h-3.5zM18.25 17c-.69 0-1.25.56-1.25 1.25v3.5c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25v-3.5c0-.69-.56-1.25-1.25-1.25h-3.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/keyframes.scss
index 93a9a29bf78c1..993d40da77582 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sync-alert {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/placeholders.scss
index 3a73734aef0e8..871bfcdd66d44 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sync-alert-icon {
   --icon-name: icon-sync-alert;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/property-16.scss
index 4f2c7a9df1d85..27ae10ea49922 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sync-alert-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 1.5A6.5 6.5 0 001.5 8 .75.75 0 010 8a8 8 0 0113.5-5.81v-.94a.75.75 0 011.5 0v3a.75.75 0 01-.75.75h-3a.75.75 0 010-1.5h1.44A6.479 6.479 0 008 1.5zM15.25 7.25A.75.75 0 0116 8a8 8 0 01-13.5 5.81v.94a.75.75 0 01-1.5 0v-3a.75.75 0 01.75-.75h3a.75.75 0 010 1.5H3.31A6.5 6.5 0 0014.5 8a.75.75 0 01.75-.75z"/><path d="M7 11a1 1 0 011-1h.007a1 1 0 110 2H8a1 1 0 01-1-1zM8.75 4.75a.75.75 0 00-1.5 0v3.5a.75.75 0 001.5 0v-3.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/property-24.scss
index 7a866948d653e..befa369e3e157 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-alert/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sync-alert-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 3.5A8.5 8.5 0 003.5 12 .75.75 0 012 12C2 6.477 6.477 2 12 2a9.977 9.977 0 017.5 3.386V2.75a.75.75 0 011.5 0v4.5a.75.75 0 01-.75.75h-4.5a.75.75 0 010-1.5h2.731A8.48 8.48 0 0012 3.5zM21.25 11.25A.75.75 0 0122 12c0 5.523-4.477 10-10 10a9.977 9.977 0 01-7.5-3.386v2.636a.75.75 0 01-1.5 0v-4.5a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5H5.519A8.5 8.5 0 0020.5 12a.75.75 0 01.75-.75z"/><path d="M12 7a.75.75 0 01.75.75v4.5a.75.75 0 01-1.5 0v-4.5A.75.75 0 0112 7zM12 15a1 1 0 100 2h.01a1 1 0 100-2H12z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/keyframes.scss
index 58f8d7a2c3d04..4fcaca03a697b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sync-reverse {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/placeholders.scss
index 841667e815386..08c35b6e97615 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sync-reverse-icon {
   --icon-name: icon-sync-reverse;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/property-16.scss
index 69bed783da0dc..65e125dd71e84 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sync-reverse-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 1.5A6.5 6.5 0 0114.5 8 .75.75 0 0016 8 8 8 0 002.5 2.19v-.94a.75.75 0 00-1.5 0v3c0 .414.336.75.75.75h3a.75.75 0 000-1.5H3.31A6.479 6.479 0 018 1.5zM.75 7.25A.75.75 0 000 8a8 8 0 0013.5 5.81v.94a.75.75 0 001.5 0v-3a.75.75 0 00-.75-.75h-3a.75.75 0 000 1.5h1.44A6.5 6.5 0 011.5 8a.75.75 0 00-.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/property-24.scss
index 139ec5879f906..598ace15d92c0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync-reverse/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sync-reverse-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 3.5a8.5 8.5 0 018.5 8.5.75.75 0 001.5 0c0-5.523-4.477-10-10-10a9.977 9.977 0 00-7.5 3.386V2.75a.75.75 0 00-1.5 0v4.5c0 .414.336.75.75.75h4.5a.75.75 0 000-1.5H5.519A8.48 8.48 0 0112 3.5zM2.75 11.25A.75.75 0 002 12c0 5.523 4.477 10 10 10a9.977 9.977 0 007.5-3.386v2.636a.75.75 0 001.5 0v-4.5a.75.75 0 00-.75-.75h-4.5a.75.75 0 000 1.5h2.731A8.5 8.5 0 013.5 12a.75.75 0 00-.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync/keyframes.scss
index f12bdb52152ad..379438bd58b1d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-sync {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync/placeholders.scss
index 21da24c047994..bd3aaef11da16 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-sync-icon {
   --icon-name: icon-sync;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync/property-16.scss
index 46653b9d06a02..7670cbd58e5fa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sync-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 1.5A6.5 6.5 0 001.5 8 .75.75 0 010 8a8 8 0 0113.5-5.81v-.94a.75.75 0 011.5 0v3a.75.75 0 01-.75.75h-3a.75.75 0 010-1.5h1.44A6.479 6.479 0 008 1.5zM15.25 7.25A.75.75 0 0116 8a8 8 0 01-13.5 5.81v.94a.75.75 0 01-1.5 0v-3a.75.75 0 01.75-.75h3a.75.75 0 010 1.5H3.31A6.5 6.5 0 0014.5 8a.75.75 0 01.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/sync/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/sync/property-24.scss
index b41df2abe8bb9..db9a2a8fed431 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/sync/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/sync/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-sync-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 3.5A8.5 8.5 0 003.5 12 .75.75 0 012 12C2 6.477 6.477 2 12 2a9.977 9.977 0 017.5 3.386V2.75a.75.75 0 011.5 0v4.5a.75.75 0 01-.75.75h-4.5a.75.75 0 010-1.5h2.731A8.48 8.48 0 0012 3.5zM21.25 11.25A.75.75 0 0122 12c0 5.523-4.477 10-10 10a9.977 9.977 0 01-7.5-3.386v2.636a.75.75 0 01-1.5 0v-4.5a.75.75 0 01.75-.75h4.5a.75.75 0 010 1.5H5.519A8.5 8.5 0 0020.5 12a.75.75 0 01.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/keyframes.scss
index 742b407c0cf14..6ebb589f65303 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-tablet {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/placeholders.scss
index 27472f8fe30bb..647f0aa01b41e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-tablet-icon {
   --icon-name: icon-tablet;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/property-16.scss
index 09af9e1ea0366..cca425106306b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-tablet-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 11a1 1 0 100 2h.01a1 1 0 100-2H8z"/><path fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-9.5A2.25 2.25 0 0013.75 1H2.25zM1.5 3.25a.75.75 0 01.75-.75h11.5a.75.75 0 01.75.75v9.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75v-9.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/property-24.scss
index 67a8680901edc..fe45cbad9b103 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tablet/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-tablet-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 17a1 1 0 100 2h.01a1 1 0 100-2H12z"/><path fill-rule="evenodd" d="M3.75 3A2.75 2.75 0 001 5.75v12.5A2.75 2.75 0 003.75 21h16.5A2.75 2.75 0 0023 18.25V5.75A2.75 2.75 0 0020.25 3H3.75zM2.5 5.75c0-.69.56-1.25 1.25-1.25h16.5c.69 0 1.25.56 1.25 1.25v12.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V5.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tag/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tag/index.scss
index 223ad543c7372..39199771fad5b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tag/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tag/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../tag/property-16';
         @import '../tag/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tag/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tag/keyframes.scss
index f5a454099f6ac..0c5a2ddc84b83 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tag/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tag/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-tag {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tag/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tag/placeholders.scss
index f245b557ed481..3ef964d13f588 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tag/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tag/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-tag-icon {
   --icon-name: icon-tag;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tag/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tag/property-16.scss
index fcf4dc90b7b32..3b9abb223e1e3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tag/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tag/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-tag-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M5 4a1 1 0 000 2h.006a1 1 0 000-2H5z"/><path fill-rule="evenodd" d="M2.25 1C1.56 1 1 1.56 1 2.25v5.246c0 .596.237 1.169.659 1.59l5.383 5.384a2.25 2.25 0 003.182 0l4.246-4.246a2.25 2.25 0 000-3.182L9.087 1.66A2.25 2.25 0 007.496 1H2.25zm.25 6.496V2.5h4.996a.75.75 0 01.53.22l5.383 5.383a.75.75 0 010 1.06L9.163 13.41a.75.75 0 01-1.06 0L2.72 8.026a.75.75 0 01-.22-.53z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tag/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tag/property-24.scss
index a86760d5cb84b..9b50876ffd4fd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tag/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tag/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-tag-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M6 5a1 1 0 000 2h.01a1 1 0 000-2H6z"/><path fill-rule="evenodd" d="M4.75 2A2.75 2.75 0 002 4.75v6.422c0 .729.29 1.428.805 1.944l8 8a2.75 2.75 0 003.89 0l6.421-6.421a2.75 2.75 0 000-3.89l-8-8A2.75 2.75 0 0011.172 2H4.75zM3.5 4.75c0-.69.56-1.25 1.25-1.25h6.422c.331 0 .649.132.883.366l8 8a1.25 1.25 0 010 1.768l-6.421 6.421a1.25 1.25 0 01-1.768 0l-8-8a1.25 1.25 0 01-.366-.883V4.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/target/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/target/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/target/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/target/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/target/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/target/keyframes.scss
index 587a4ef618ac0..fa0b7ae82688b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/target/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/target/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-target {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/target/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/target/placeholders.scss
index 1cd9da6e2359f..4beeaf2e5f990 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/target/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/target/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-target-icon {
   --icon-name: icon-target;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/target/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/target/property-16.scss
index 9fb510d5089ad..d5af73408b914 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/target/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/target/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-target-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 6a2 2 0 100 4 2 2 0 000-4zm-.5 2a.5.5 0 111 0 .5.5 0 01-1 0z"/><path d="M3 8a5 5 0 1110 0A5 5 0 013 8zm5-3.5a3.5 3.5 0 100 7 3.5 3.5 0 000-7z"/><path d="M0 8a8 8 0 1116 0A8 8 0 010 8zm8-6.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/target/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/target/property-24.scss
index 605ddeb8b19c0..06fdac8fc9b17 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/target/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/target/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-target-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 9a3 3 0 100 6 3 3 0 000-6zm-1.5 3a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z"/><path d="M5 12a7 7 0 1114 0 7 7 0 01-14 0zm7-5.5a5.5 5.5 0 100 11 5.5 5.5 0 000-11z"/><path d="M1 12C1 5.925 5.925 1 12 1s11 4.925 11 11-4.925 11-11 11S1 18.075 1 12zm11-9.5a9.5 9.5 0 100 19 9.5 9.5 0 000-19z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/keyframes.scss
index 65cb4b25f46ca..fdff1377d7f3b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-terminal-screen {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/placeholders.scss
index 2891d8cdb9fd1..46aa0b91f4487 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-terminal-screen-icon {
   --icon-name: icon-terminal-screen;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/property-16.scss
index d5c20bb29a9bd..7b9016e0be54b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-terminal-screen-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.924 5.02a.75.75 0 011.056-.096l3 2.5a.75.75 0 010 1.152l-3 2.5a.75.75 0 11-.96-1.152L6.328 8 4.02 6.076a.75.75 0 01-.096-1.056zM8.25 10.5a.75.75 0 000 1.5h3a.75.75 0 000-1.5h-3z"/><path fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h11.5A2.25 2.25 0 0116 3.25v9.5A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75v-9.5zm2.25-.75a.75.75 0 00-.75.75v9.5c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75v-9.5a.75.75 0 00-.75-.75H2.25z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/property-24.scss
index eccf647f31e30..b03c8b5eb1ba3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal-screen/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-terminal-screen-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M6.174 7.27a.75.75 0 011.056-.096l4.5 3.75a.75.75 0 010 1.152l-4.5 3.75a.75.75 0 11-.96-1.152l3.809-3.174-3.81-3.174a.75.75 0 01-.095-1.056zM11.75 16a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5z"/><path fill-rule="evenodd" d="M1 4.75A2.75 2.75 0 013.75 2h16.5A2.75 2.75 0 0123 4.75v14.5A2.75 2.75 0 0120.25 22H3.75A2.75 2.75 0 011 19.25V4.75zM3.75 3.5c-.69 0-1.25.56-1.25 1.25v14.5c0 .69.56 1.25 1.25 1.25h16.5c.69 0 1.25-.56 1.25-1.25V4.75c0-.69-.56-1.25-1.25-1.25H3.75z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/keyframes.scss
index 476e78b70205f..60a6961081932 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-terminal {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/placeholders.scss
index 3cb83e26f2c58..76f2e7eee344b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-terminal-icon {
   --icon-name: icon-terminal;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/property-16.scss
index 4c3726f5602af..6c280e94fdd8e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-terminal-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3.23 3.174a.75.75 0 00-.96 1.152L6.078 7.5 2.27 10.674a.75.75 0 10.96 1.152l4.5-3.75a.75.75 0 000-1.152l-4.5-3.75zM7.75 12a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/property-24.scss
index a8e5203ce73b1..ec91d511dc508 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terminal/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-terminal-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M4.23 4.174a.75.75 0 00-.96 1.152L10.078 11 3.27 16.674a.75.75 0 10.96 1.152l7.5-6.25a.75.75 0 000-1.152l-7.5-6.25zM11.75 18a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/keyframes.scss
index f3bfe2c4fbea4..d9a9e61bcb605 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-terraform-color {
   100% {
     background-image: var(--icon-terraform-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/placeholders.scss
index 82e25e953d298..8dc9d06f5eba4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-terraform-color-icon {
   --icon-name: icon-terraform-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/property-16.scss
index 5c4c1c6c2f3cb..711511f247f0c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-terraform-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%237B42BC" fill-rule="evenodd" clip-rule="evenodd"><path d="M5.825 2.82l4.35 2.524v5.052L5.825 7.87V2.82zM10.651 5.344v5.052L15 7.87V2.82l-4.349 2.524zM1 0v5.05l4.349 2.527V2.526L1 0zM5.825 13.474L10.174 16v-5.051L5.825 8.423v5.051z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/property-24.scss
index 074d11eb88cb5..ab1c1ec3dc0df 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-terraform-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%237B42BC" fill-rule="evenodd" clip-rule="evenodd"><path d="M8.893 4.618l6.214 3.597v7.2l-6.214-3.6V4.618zM15.788 8.215v7.2l6.212-3.6V4.618l-6.212 3.597zM2 .6v7.197l6.212 3.6V4.2L2 .6zM8.893 19.8l6.212 3.6v-7.197l-6.212-3.6V19.8z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/index.scss
index d008168794406..c9683ccebed15 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../terraform-color/property-16';
         @import '../terraform-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/keyframes.scss
index fdbc5f2e59be8..e22b862047247 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-terraform {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/placeholders.scss
index 0fe3c6c0f26a4..896a55bd81668 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-terraform-icon {
   --icon-name: icon-terraform;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/property-16.scss
index d6424bb019489..cfd6f4afe2b45 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-terraform-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1 0v5.05l4.349 2.527V2.526L1 0zM10.175 5.344l-4.35-2.525v5.05l4.35 2.527V5.344zM10.651 10.396V5.344L15 2.819v5.05l-4.349 2.527zM10.174 16l-4.349-2.526v-5.05l4.349 2.525V16z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/property-24.scss
index 52f3c951586f2..ec1dcdf26c180 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/terraform/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-terraform-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1 0v5.05l4.349 2.527V2.526L1 0zM10.175 5.344l-4.35-2.525v5.05l4.35 2.527V5.344zM10.651 10.396V5.344L15 2.819v5.05l-4.349 2.527zM10.174 16l-4.349-2.526v-5.05l4.349 2.525V16z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/keyframes.scss
index c20546402d290..9b5e197b5decd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-thumbs-down {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/placeholders.scss
index fa3f288a85ce5..ec4c0dc3f7d8b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-thumbs-down-icon {
   --icon-name: icon-thumbs-down;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/property-16.scss
index ae34fd68e92c7..f9dee244b0103 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-thumbs-down-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8.404 14.484l2.56-5.759V1.5H3.488a.75.75 0 00-.741.637l-.995 6.55a.75.75 0 00.742.862h3.767c.69 0 1.25.56 1.25 1.25v2.626c0 .53.385.972.892 1.06zM12.464 1.5v6.634h1.286a.75.75 0 00.75-.75V2.25a.75.75 0 00-.75-.75h-1.287zM12.2 9.634l-2.511 5.65A1.206 1.206 0 018.588 16a2.575 2.575 0 01-2.576-2.575v-2.376H2.495A2.25 2.25 0 01.27 8.46l.995-6.549A2.25 2.25 0 013.489 0H13.75A2.25 2.25 0 0116 2.25v5.134a2.25 2.25 0 01-2.25 2.25H12.2z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/property-24.scss
index 6cbe0c321135b..5a8e01f9fcac7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-down/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-thumbs-down-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12.77 21.484l3.73-8.393V2.5H5.52a1.25 1.25 0 00-1.237 1.062l-1.442 9.5A1.25 1.25 0 004.077 14.5H9.25c.966 0 1.75.784 1.75 1.75v3.225c0 1.032.772 1.884 1.77 2.01zM18 2.5v10h2.25c.69 0 1.25-.56 1.25-1.25v-7.5c0-.69-.56-1.25-1.25-1.25H18zM17.737 14l-3.71 8.349a1.097 1.097 0 01-1.002.651A3.525 3.525 0 019.5 19.475V16.25a.25.25 0 00-.25-.25H4.077a2.75 2.75 0 01-2.72-3.163l1.443-9.5A2.75 2.75 0 015.52 1h14.73A2.75 2.75 0 0123 3.75v7.5A2.75 2.75 0 0120.25 14h-2.513z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/keyframes.scss
index bd7312b8870a2..cd9aa42cf8e6d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-thumbs-up {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/placeholders.scss
index dd06caec82e01..b9aecb2da0855 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-thumbs-up-icon {
   --icon-name: icon-thumbs-up;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/property-16.scss
index 987c95869f9d9..30a86a33da4bd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-thumbs-up-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M7.596 1.516l-2.56 5.759V14.5h7.475a.75.75 0 00.741-.637l.994-6.55a.75.75 0 00-.741-.862H9.738c-.69 0-1.25-.56-1.25-1.25V2.575c0-.53-.385-.972-.892-1.06zM3.536 14.5V7.866H2.25a.75.75 0 00-.75.75v5.134c0 .414.336.75.75.75h1.287zM3.8 6.366L6.31.716A1.206 1.206 0 017.412 0a2.575 2.575 0 012.576 2.575v2.376h3.517a2.25 2.25 0 012.224 2.588l-.994 6.549A2.25 2.25 0 0112.511 16H2.25A2.25 2.25 0 010 13.75V8.616a2.25 2.25 0 012.25-2.25H3.8z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/property-24.scss
index 2465a6f43efd8..e5abd2f295665 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/thumbs-up/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-thumbs-up-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M11.23 2.516L7.5 10.909V21.5h10.98a1.25 1.25 0 001.237-1.062l1.442-9.5A1.25 1.25 0 0019.923 9.5H14.75A1.75 1.75 0 0113 7.75V4.525a2.025 2.025 0 00-1.77-2.01zM6 21.5v-10H3.75c-.69 0-1.25.56-1.25 1.25v7.5c0 .69.56 1.25 1.25 1.25H6zM6.263 10l3.71-8.349A1.097 1.097 0 0110.975 1 3.525 3.525 0 0114.5 4.525V7.75c0 .138.112.25.25.25h5.173a2.75 2.75 0 012.72 3.163l-1.443 9.5A2.75 2.75 0 0118.48 23H3.75A2.75 2.75 0 011 20.25v-7.5A2.75 2.75 0 013.75 10h2.513z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/keyframes.scss
index 729960ce41881..641970bd47c47 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-toggle-left {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/placeholders.scss
index 0b07b786c1d2d..630e2d1c62203 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-toggle-left-icon {
   --icon-name: icon-toggle-left;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/property-16.scss
index 1ac16b2343feb..08a39e019c2d3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-toggle-left-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M3 8a2 2 0 114 0 2 2 0 01-4 0z"/><path fill-rule="evenodd" d="M5 3a5 5 0 000 10h6a5 5 0 000-10H5zM1.5 8A3.5 3.5 0 015 4.5h6a3.5 3.5 0 110 7H5A3.5 3.5 0 011.5 8z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/property-24.scss
index a837d629fe171..29dda8026411d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-left/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-toggle-left-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 8a4 4 0 100 8 4 4 0 000-8zm-2.5 4a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z"/><path d="M8 5a7 7 0 000 14h8a7 7 0 100-14H8zm-5.5 7A5.5 5.5 0 018 6.5h8a5.5 5.5 0 110 11H8A5.5 5.5 0 012.5 12z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/keyframes.scss
index b3349eb8bee49..db573217b79c0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-toggle-right {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/placeholders.scss
index 6473d2778b90a..fabe64b3e69ba 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-toggle-right-icon {
   --icon-name: icon-toggle-right;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/property-16.scss
index 9aa767b85e8c6..fd39dcb78df04 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-toggle-right-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M13 8a2 2 0 10-4 0 2 2 0 004 0z"/><path fill-rule="evenodd" d="M11 3a5 5 0 010 10H5A5 5 0 015 3h6zm3.5 5A3.5 3.5 0 0011 4.5H5a3.5 3.5 0 100 7h6A3.5 3.5 0 0014.5 8z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/property-24.scss
index 2520aa610fee2..c62a860c20c0a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/toggle-right/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-toggle-right-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M16 8a4 4 0 110 8 4 4 0 010-8zm2.5 4a2.5 2.5 0 10-5 0 2.5 2.5 0 005 0z"/><path d="M16 5a7 7 0 110 14H8A7 7 0 118 5h8zm5.5 7A5.5 5.5 0 0016 6.5H8a5.5 5.5 0 100 11h8a5.5 5.5 0 005.5-5.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/token/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/token/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/token/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/token/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/token/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/token/keyframes.scss
index b08e3d6806672..4335688a52507 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/token/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/token/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-token {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/token/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/token/placeholders.scss
index 55896ec406aca..644d186982610 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/token/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/token/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-token-icon {
   --icon-name: icon-token;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/token/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/token/property-16.scss
index 4ae5d21e3d604..4bfbda5f3ef2a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/token/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/token/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-token-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M5.791 3.318L3.316 5.793a1 1 0 000 1.414l2.475 2.475a1 1 0 001.415 0L9.68 7.207a1 1 0 000-1.414L7.206 3.318a1 1 0 00-1.415 0zm.707 4.95L4.731 6.5l1.767-1.768L8.266 6.5 6.498 8.268z"/><path d="M0 6.5a6.5 6.5 0 0112.346-2.845 6.5 6.5 0 11-8.691 8.691A6.5 6.5 0 010 6.5zm6.5-5a5 5 0 100 10 5 5 0 000-10zm6.5 5c0-.201-.01-.4-.027-.597a5 5 0 11-7.07 7.07A6.5 6.5 0 0013 6.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/token/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/token/property-24.scss
index 8aaf6aa7c531c..f3f703bf07a4b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/token/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/token/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-token-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8.762 5.228L5.227 8.763a1.75 1.75 0 000 2.475l3.535 3.535a1.75 1.75 0 002.475 0l3.536-3.535a1.75 1.75 0 000-2.475l-3.536-3.535a1.75 1.75 0 00-2.475 0zM6.287 9.824l3.536-3.536a.25.25 0 01.354 0l3.535 3.536a.25.25 0 010 .353l-3.535 3.536a.25.25 0 01-.354 0l-3.536-3.536a.25.25 0 010-.353z"/><path d="M1 10a9 9 0 0117.043-4.043A9 9 0 115.957 18.043 9 9 0 011 10zm9-7.5a7.5 7.5 0 100 15 7.5 7.5 0 000-15zm9 7.5c0-.594-.058-1.174-.167-1.736A7.5 7.5 0 118.264 18.833 9 9 0 0019 10z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tools/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tools/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tools/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tools/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tools/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tools/keyframes.scss
index 2286e64175434..aeaed581834ed 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tools/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tools/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-tools {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tools/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tools/placeholders.scss
index ea541c95a11ca..0dbb35488f73c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tools/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tools/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-tools-icon {
   --icon-name: icon-tools;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tools/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tools/property-16.scss
index a85cf1b94a418..08aaa56e783e6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tools/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tools/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-tools-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M5 3v-.75A2.25 2.25 0 017.25 0h1.5A2.25 2.25 0 0111 2.25V3h.79a2.25 2.25 0 011.609.678l1.96 2.007c.411.42.641.985.641 1.573v5.492A2.25 2.25 0 0113.75 15H2.25A2.25 2.25 0 010 12.75V7.258c0-.588.23-1.152.64-1.573l1.961-2.007A2.25 2.25 0 014.211 3H5zm1.5-.75a.75.75 0 01.75-.75h1.5a.75.75 0 01.75.75V3h-3v-.75zM3.674 4.726a.75.75 0 01.537-.226h7.578a.75.75 0 01.537.226l1.96 2.008a.75.75 0 01.214.524V8h-4v-.25c0-.69-.56-1.25-1.25-1.25h-2.5c-.69 0-1.25.56-1.25 1.25V8h-4v-.742a.75.75 0 01.213-.524l1.961-2.008zM5.5 9.5h-4v3.25c0 .414.336.75.75.75h11.5a.75.75 0 00.75-.75V9.5h-4v.25c0 .69-.56 1.25-1.25 1.25h-2.5c-.69 0-1.25-.56-1.25-1.25V9.5zm1.5 0V8h2v1.5H7z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tools/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tools/property-24.scss
index 9520e1fd88fe2..5faf7b6a640a8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tools/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tools/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-tools-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M7 6V4.75A2.75 2.75 0 019.75 2h4.5A2.75 2.75 0 0117 4.75V6h.422c.729 0 1.428.29 1.944.805l2.829 2.829A2.75 2.75 0 0123 11.578v7.672A2.75 2.75 0 0120.25 22H3.75A2.75 2.75 0 011 19.25v-7.672c0-.729.29-1.428.805-1.944l2.829-2.829A2.75 2.75 0 016.578 6H7zm1.5-1.25c0-.69.56-1.25 1.25-1.25h4.5c.69 0 1.25.56 1.25 1.25V6h-7V4.75zM6.578 7.5c-.331 0-.649.132-.883.366l-2.829 2.829a1.25 1.25 0 00-.366.883V13H9v-.75c0-.69.56-1.25 1.25-1.25h3.5c.69 0 1.25.56 1.25 1.25V13h6.5v-1.422c0-.331-.132-.649-.366-.883l-2.829-2.829a1.25 1.25 0 00-.883-.366H6.578zM15 15.75V14.5h6.5v4.75c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V14.5H9v1.25c0 .69.56 1.25 1.25 1.25h3.5c.69 0 1.25-.56 1.25-1.25zm-4.5-3.25v3h3v-3h-3z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/top/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/top/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/top/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/top/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/top/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/top/keyframes.scss
index 8a92c5bd4213b..eccc7eb86bbb2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/top/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/top/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-top {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/top/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/top/placeholders.scss
index a7cb89edc8032..39e6386d6cb1b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/top/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/top/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-top-icon {
   --icon-name: icon-top;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/top/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/top/property-16.scss
index cd277acdb3802..dbc096a3b89e3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/top/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/top/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-top-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M2.5 2.5a.75.75 0 010-1.5H13a.75.75 0 010 1.5H2.5zM2.985 9.795a.75.75 0 001.06-.03L7 6.636v7.614a.75.75 0 001.5 0V6.636l2.955 3.129a.75.75 0 001.09-1.03l-4.25-4.5a.75.75 0 00-1.09 0l-4.25 4.5a.75.75 0 00.03 1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/top/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/top/property-24.scss
index 08fd4efc35cc4..c5fc91621d2ee 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/top/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/top/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-top-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M3.5 3.5a.75.75 0 010-1.5H20a.75.75 0 010 1.5H3.5zM4.98 13.79a.75.75 0 001.06-.02L11 8.612V21.25a.75.75 0 001.5 0V8.612l4.96 5.158a.75.75 0 101.08-1.04l-6.25-6.5a.75.75 0 00-1.08 0l-6.25 6.5a.75.75 0 00.02 1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trash/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trash/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trash/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trash/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trash/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trash/keyframes.scss
index 6985c66751f20..3313b2f471f4c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trash/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trash/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-trash {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trash/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trash/placeholders.scss
index c3056c5997e00..1677c81df3627 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trash/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trash/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-trash-icon {
   --icon-name: icon-trash;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trash/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trash/property-16.scss
index 1323334adf32c..c457fd372ee8d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trash/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trash/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-trash-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.25 6a.75.75 0 01.75.75v5.5a.75.75 0 01-1.5 0v-5.5A.75.75 0 016.25 6zM10.5 6.75a.75.75 0 00-1.5 0v5.5a.75.75 0 001.5 0v-5.5z"/><path fill-rule="evenodd" d="M4 3v-.75A2.25 2.25 0 016.25 0h3.5A2.25 2.25 0 0112 2.25V3h2.25a.75.75 0 010 1.5H14v9.25A2.25 2.25 0 0111.75 16h-7.5A2.25 2.25 0 012 13.75V4.5h-.25a.75.75 0 010-1.5H4zm1.5-.75a.75.75 0 01.75-.75h3.5a.75.75 0 01.75.75V3h-5v-.75zm-2 2.25v9.25c0 .414.336.75.75.75h7.5a.75.75 0 00.75-.75V4.5h-9z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trash/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trash/property-24.scss
index ff725a7ba8c43..d8aeac8d92acb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trash/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trash/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-trash-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M9.75 9a.75.75 0 01.75.75v8.5a.75.75 0 01-1.5 0v-8.5A.75.75 0 019.75 9zM15 9.75a.75.75 0 00-1.5 0v8.5a.75.75 0 001.5 0v-8.5z"/><path fill-rule="evenodd" d="M7 5V3.75A2.75 2.75 0 019.75 1h4.5A2.75 2.75 0 0117 3.75V5h4.25a.75.75 0 010 1.5H20v13.75A2.75 2.75 0 0117.25 23H6.75A2.75 2.75 0 014 20.25V6.5H2.75a.75.75 0 010-1.5H7zm1.5-1.25c0-.69.56-1.25 1.25-1.25h4.5c.69 0 1.25.56 1.25 1.25V5h-7V3.75zm-3 2.75v13.75c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25V6.5h-13z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/keyframes.scss
index 2e1c47d1e9a98..2ffef660811f9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-trend-down {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/placeholders.scss
index 12552f7167894..d5ab1e26abe48 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-trend-down-icon {
   --icon-name: icon-trend-down;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/property-16.scss
index 2aca1c3e99647..fe9031f0a793b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-trend-down-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M1.28 3.22A.75.75 0 00.22 4.28l4.5 4.5a.75.75 0 00.894.126l3.96-2.2L13.6 11.5H10.75a.75.75 0 000 1.5h4.5a.75.75 0 00.75-.75v-4.5a.75.75 0 00-1.5 0v2.489l-4.176-4.971a.75.75 0 00-.938-.174L5.38 7.32l-4.1-4.1z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/property-24.scss
index 5179ad2e82f52..66d79eb199820 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-down/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-trend-down-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M1.28 5.22A.75.75 0 00.22 6.28l7.5 7.5a.75.75 0 001.005.05L13.7 9.76l7.74 7.74h-4.69a.75.75 0 000 1.5h6.5a.75.75 0 00.75-.75v-6.5a.75.75 0 00-1.5 0v4.69l-8.22-8.22a.75.75 0 00-1.005-.05L8.3 12.24 1.28 5.22z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/keyframes.scss
index d44bdcde5a3af..395d5fda66e6a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-trend-up {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/placeholders.scss
index c7c24018a06ef..a0a0375efe68a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-trend-up-icon {
   --icon-name: icon-trend-up;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/property-16.scss
index b9ffc46648632..6b80ad0314f03 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-trend-up-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M16 8.25a.75.75 0 01-1.5 0V5.761l-4.176 4.971a.75.75 0 01-.938.174L5.38 8.68l-4.1 4.1a.75.75 0 01-1.06-1.06l4.5-4.5a.75.75 0 01.894-.126l3.96 2.2L13.6 4.5H10.75a.75.75 0 010-1.5h4.5a.75.75 0 01.75.75v4.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/property-24.scss
index 9c49de52be743..6be4186c5896d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/trend-up/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-trend-up-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M24 12.25a.75.75 0 01-1.5 0V7.56l-8.22 8.22a.75.75 0 01-1.005.05L8.3 11.76l-7.02 7.02a.75.75 0 01-1.06-1.06l7.5-7.5a.75.75 0 011.005-.05l4.975 4.07 7.74-7.74h-4.69a.75.75 0 010-1.5h6.5a.75.75 0 01.75.75v6.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/keyframes.scss
index 4c6d222714ee9..3d1a8b3f9a21b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-triangle-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/placeholders.scss
index b1b794f28e6ac..0db145269f376 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-triangle-fill-icon {
   --icon-name: icon-triangle-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/property-16.scss
index a08031d09adb9..f73c52c096017 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-triangle-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M8 1.25a2.101 2.101 0 00-1.785.996l.64.392-.642-.388-5.675 9.373-.006.01a2.065 2.065 0 00.751 2.832c.314.183.67.281 1.034.285h11.366a2.101 2.101 0 001.791-1.045 2.064 2.064 0 00-.006-2.072L9.788 2.25l-.003-.004A2.084 2.084 0 008 1.25z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/property-24.scss
index 7875fd88a7798..fe58c6b72433f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-triangle-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M12 2c-.472 0-.934.127-1.342.366a2.75 2.75 0 00-.984.99l.648.378-.65-.374-8.31 14.45-.005.01a2.86 2.86 0 00-.007 2.758c.23.423.566.778.975 1.03.41.25.877.386 1.357.392h16.637c.479-.006.947-.142 1.356-.393.41-.25.744-.606.976-1.029a2.86 2.86 0 00-.008-2.758L14.328 3.36l-.002-.004a2.75 2.75 0 00-.984-.99A2.651 2.651 0 0012 2z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/keyframes.scss
index dbfbbd67bf599..59f3bcda0d983 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-triangle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/placeholders.scss
index 6d1e6eff5b3be..49b53dea0da83 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-triangle-icon {
   --icon-name: icon-triangle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/property-16.scss
index 70211277cfe22..0a3f8c1f4c369 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-triangle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M6.978 1.515a2.101 2.101 0 012.807.731l.002.004 5.681 9.383a2.065 2.065 0 01-.751 2.832c-.314.183-.67.281-1.034.285H2.317a2.101 2.101 0 01-1.791-1.045 2.065 2.065 0 01.006-2.072l.006-.01L6.213 2.25l.002-.004c.187-.305.45-.557.763-.73zm.517 1.514l-.001.001-5.67 9.363a.565.565 0 00.214.776c.088.051.189.08.292.081h11.34a.601.601 0 00.504-.294.564.564 0 00.001-.563L8.506 3.03V3.03A.584.584 0 008 2.75a.601.601 0 00-.505.279z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/property-24.scss
index 9904dc0f6e9a8..462d03d9df0d4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/triangle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-triangle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M10.658 2.366a2.651 2.651 0 012.684 0c.407.239.745.581.984.99l.002.004 8.315 14.46a2.86 2.86 0 01.008 2.758 2.757 2.757 0 01-.976 1.03c-.41.25-.877.386-1.357.392H3.682a2.653 2.653 0 01-1.357-.393 2.757 2.757 0 01-.975-1.029 2.86 2.86 0 01.007-2.758l.006-.01 8.31-14.45.001-.004a2.75 2.75 0 01.984-.99zm.313 1.744v.001L2.665 18.552a1.36 1.36 0 000 1.306c.108.198.262.36.443.47.18.11.382.169.586.172h16.61c.204-.003.406-.061.586-.172.181-.11.335-.272.444-.47a1.361 1.361 0 00-.001-1.306L13.03 4.112l-.001-.002a1.25 1.25 0 00-.446-.45 1.151 1.151 0 00-1.166 0 1.25 1.25 0 00-.446.45z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/truck/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/truck/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/truck/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/truck/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/truck/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/truck/keyframes.scss
index b5e95cea4a6af..7d6b5ef2b4b22 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/truck/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/truck/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-truck {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/truck/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/truck/placeholders.scss
index 22f04eab3ed75..da1a7631e5f16 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/truck/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/truck/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-truck-icon {
   --icon-name: icon-truck;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/truck/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/truck/property-16.scss
index 1eee5961745a6..75e3101851201 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/truck/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/truck/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-truck-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M0 3.25A2.25 2.25 0 012.25 1h7a2.25 2.25 0 012.25 2.25v.328h.643a2.25 2.25 0 011.565.634l1.608 1.557A2.25 2.25 0 0116 7.385v2.865A1.75 1.75 0 0114.292 12a2.5 2.5 0 11-4.584 0H6.292a2.5 2.5 0 11-4.584 0A1.75 1.75 0 010 10.25v-7zM12 12a1 1 0 100 2 1 1 0 000-2zm2.25-1.5a.25.25 0 00.25-.25V7.385a.75.75 0 00-.228-.538l-1.608-1.558a.75.75 0 00-.521-.211H11.5V10.5h2.75zm-4.25 0H1.75a.25.25 0 01-.25-.25v-7a.75.75 0 01.75-.75h7a.75.75 0 01.75.75v7.25zM3 13a1 1 0 112 0 1 1 0 01-2 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/truck/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/truck/property-24.scss
index ce55155e13695..c81927f8953e8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/truck/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/truck/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-truck-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M0 4.75A2.75 2.75 0 012.75 2h11.5A2.75 2.75 0 0117 4.75V6h1.245c.74 0 1.447.297 1.965.825l3.004 3.067A2.75 2.75 0 0124 11.817v3.433A1.75 1.75 0 0122.25 17h-1.014a3 3 0 11-4.472 0H7.236a3 3 0 11-4.472 0H1.75A1.75 1.75 0 010 15.25V4.75zm15.5 0c0-.69-.56-1.25-1.25-1.25H2.75c-.69 0-1.25.56-1.25 1.25v10.5c0 .138.112.25.25.25H15.5V4.75zM17 15.5v-8h1.245c.336 0 .658.135.893.375l3.005 3.067c.229.233.357.547.357.874v3.434a.25.25 0 01-.25.25H17zm-12 2a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM17.5 19a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tune/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tune/index.scss
index dda8ce20e9457..a6fb0e7c0cafa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tune/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tune/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../sliders/property-16';
         @import '../sliders/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tune/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tune/keyframes.scss
index 47e3b87379da0..b94e2ce5f4201 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tune/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tune/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-tune {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tune/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tune/placeholders.scss
index 3e6c69d2c3c3f..456043988b4c8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tune/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tune/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-tune-icon {
   --icon-name: icon-tune;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tv/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tv/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tv/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tv/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tv/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tv/keyframes.scss
index 05b4e4a37ebb2..0c5c37c8eae04 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tv/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tv/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-tv {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tv/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tv/placeholders.scss
index 5abc9ec870786..882cde1ecc3e5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tv/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tv/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-tv-icon {
   --icon-name: icon-tv;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tv/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tv/property-16.scss
index b3cb4a4654481..ce70717f46368 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tv/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tv/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-tv-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M6.624.334a.75.75 0 00-1.248.832L6.599 3H2.25A2.25 2.25 0 000 5.25v7.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-7.5A2.25 2.25 0 0013.75 3H9.401l1.223-1.834A.75.75 0 109.376.334L8 2.398 6.624.334zM7.989 4.5a.798.798 0 00.022 0h5.739a.75.75 0 01.75.75v7.5a.75.75 0 01-.75.75H2.25a.75.75 0 01-.75-.75v-7.5a.75.75 0 01.75-.75h5.739z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/tv/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/tv/property-24.scss
index a6b0e8bbb56ec..c2ef5f2dc3231 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/tv/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/tv/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-tv-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M9.379 1.341a.75.75 0 10-1.258.818L10.618 6H3.75A2.75 2.75 0 001 8.75v11.5A2.75 2.75 0 003.75 23h16.5A2.75 2.75 0 0023 20.25V8.75A2.75 2.75 0 0020.25 6h-6.868l2.497-3.841a.75.75 0 00-1.258-.818L12 5.374 9.379 1.34zm2.61 6.159a.725.725 0 00.022 0h8.239c.69 0 1.25.56 1.25 1.25v11.5c0 .69-.56 1.25-1.25 1.25H3.75c-.69 0-1.25-.56-1.25-1.25V8.75c0-.69.56-1.25 1.25-1.25h8.239z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/keyframes.scss
index 7a70f86ed6c33..55d86264b479c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-twitch-color {
   100% {
     background-image: var(--icon-twitch-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/placeholders.scss
index ba612afdf2693..b9ea4c5404acf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-twitch-color-icon {
   --icon-name: icon-twitch-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/property-16.scss
index c20cd16965a77..13d187ee6f58c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-twitch-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23fff" d="M13 7.5l-2 2H9l-1.75 1.75V9.5H5V2h8v5.5z"/><g fill="%239146FF"><path d="M4.5 1L2 3.5v9h3V15l2.5-2.5h2L14 8V1H4.5zM13 7.5l-2 2H9l-1.75 1.75V9.5H5V2h8v5.5z"/><path d="M11.5 3.75h-1v3h1v-3zM8.75 3.75h-1v3h1v-3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/property-24.scss
index 18d3cbed47142..f05bdfeaddd0d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-twitch-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23fff" d="M19.857 11.214l-3.143 3.143h-3.143l-2.75 2.75v-2.75H7.286V2.571h12.571v8.643z"/><g fill="%239146FF"><path d="M6.5 1L2.57 4.929V19.07h4.715V23l3.928-3.929h3.143L21.428 12V1H6.5zm13.357 10.214l-3.143 3.143h-3.143l-2.75 2.75v-2.75H7.286V2.571h12.571v8.643z"/><path d="M17.5 5.321h-1.572v4.715H17.5V5.32zM13.178 5.321h-1.571v4.715h1.571V5.32z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/index.scss
index 962d20aecbc92..29a0b9df58d40 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../twitch-color/property-16';
         @import '../twitch-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/keyframes.scss
index dfd15fe0cf3d9..3fb1f12c2c643 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-twitch {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/placeholders.scss
index 30937ed81db26..cdf826fbbeccc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-twitch-icon {
   --icon-name: icon-twitch;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/property-16.scss
index 0c6269e4c30c1..b099a61f0f0a2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-twitch-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.5 1L2 3.5v9h3V15l2.5-2.5h2L14 8V1H4.5zM13 7.5l-2 2H9l-1.75 1.75V9.5H5V2h8v5.5z"/><path d="M11.5 3.75h-1v3h1v-3zM8.75 3.75h-1v3h1v-3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/property-24.scss
index ea679aff10890..5754897e3e20c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitch/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-twitch-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.5 1L2 3.5v9h3V15l2.5-2.5h2L14 8V1H4.5zM13 7.5l-2 2H9l-1.75 1.75V9.5H5V2h8v5.5z"/><path d="M11.5 3.75h-1v3h1v-3zM8.75 3.75h-1v3h1v-3z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/keyframes.scss
index 0e2d58e645469..d6d11a1354efa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-twitter-color {
   100% {
     background-image: var(--icon-twitter-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/placeholders.scss
index 2fd51e6ff5d2b..005575bda1dc0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-twitter-color-icon {
   --icon-name: icon-twitter-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/property-16.scss
index 21cb39a034d13..a4747576e4d21 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-twitter-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%231D9BF0" d="M13.567 5.144c.008.123.008.247.008.371 0 3.796-2.889 8.173-8.172 8.173v-.002A8.131 8.131 0 011 12.398a5.768 5.768 0 004.25-1.19 2.876 2.876 0 01-2.683-1.995c.431.083.875.066 1.297-.05A2.873 2.873 0 011.56 6.348v-.036c.4.222.847.345 1.304.36a2.876 2.876 0 01-.89-3.836 8.152 8.152 0 005.92 3 2.874 2.874 0 014.895-2.619 5.763 5.763 0 001.824-.697 2.883 2.883 0 01-1.262 1.588A5.712 5.712 0 0015 3.656a5.834 5.834 0 01-1.433 1.488z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/property-24.scss
index af2d4f0897d60..48684a1d4bb21 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-twitter-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%231D9BF0" d="M20.748 7.512c.013.194.013.388.013.584 0 5.964-4.54 12.842-12.842 12.842v-.003A12.777 12.777 0 011 18.91a9.063 9.063 0 006.68-1.87 4.52 4.52 0 01-4.217-3.135 4.5 4.5 0 002.038-.078 4.514 4.514 0 01-3.62-4.424v-.057c.627.35 1.33.543 2.048.565a4.52 4.52 0 01-1.397-6.027 12.81 12.81 0 009.302 4.716 4.518 4.518 0 017.692-4.117c1.01-.2 1.98-.57 2.866-1.096a4.53 4.53 0 01-1.984 2.497A8.977 8.977 0 0023 5.174a9.169 9.169 0 01-2.252 2.338z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/index.scss
index f9f080ad2142d..91f8567ed2dde 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../twitter-color/property-16';
         @import '../twitter-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/keyframes.scss
index 4e6680be0c342..761bec327f6d5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-twitter {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/placeholders.scss
index 18ba55c5d3798..7133f564fd4f4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-twitter-icon {
   --icon-name: icon-twitter;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/property-16.scss
index d6d194ac8d491..3f11fd0dc3d94 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-twitter-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M13.567 5.144c.008.123.008.247.008.371 0 3.796-2.889 8.173-8.172 8.173v-.002A8.131 8.131 0 011 12.398a5.768 5.768 0 004.25-1.19 2.876 2.876 0 01-2.683-1.995c.431.083.875.066 1.297-.05A2.873 2.873 0 011.56 6.348v-.036c.4.222.847.345 1.304.36a2.876 2.876 0 01-.89-3.836 8.152 8.152 0 005.92 3 2.874 2.874 0 014.895-2.619 5.763 5.763 0 001.824-.697 2.883 2.883 0 01-1.262 1.588A5.712 5.712 0 0015 3.656a5.834 5.834 0 01-1.433 1.488z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/property-24.scss
index 60ea7e9356f96..17eadff7bba0b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/twitter/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-twitter-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M13.567 5.144c.008.123.008.247.008.371 0 3.796-2.889 8.173-8.172 8.173v-.002A8.131 8.131 0 011 12.398a5.768 5.768 0 004.25-1.19 2.876 2.876 0 01-2.683-1.995c.431.083.875.066 1.297-.05A2.873 2.873 0 011.56 6.348v-.036c.4.222.847.345 1.304.36a2.876 2.876 0 01-.89-3.836 8.152 8.152 0 005.92 3 2.874 2.874 0 014.895-2.619 5.763 5.763 0 001.824-.697 2.883 2.883 0 01-1.262 1.588A5.712 5.712 0 0015 3.656a5.834 5.834 0 01-1.433 1.488z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/type/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/type/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/type/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/type/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/type/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/type/keyframes.scss
index 51324f781ae30..7b5bf8154a042 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/type/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/type/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-type {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/type/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/type/placeholders.scss
index 3c2fd1585b03c..300e2bbba407b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/type/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/type/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-type-icon {
   --icon-name: icon-type;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/type/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/type/property-16.scss
index 67e66ad7f93b3..fc636a895d88c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/type/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/type/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-type-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M2 2.75A.75.75 0 012.75 2h10a.75.75 0 01.75.75v1.5a.75.75 0 01-1.5 0V3.5H8.5v9H10a.75.75 0 010 1.5H5.5a.75.75 0 010-1.5H7v-9H3.5v.75a.75.75 0 01-1.5 0v-1.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/type/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/type/property-24.scss
index 07906e083c417..84fb73a4bd799 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/type/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/type/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-type-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M3 3.75A.75.75 0 013.75 3h16a.75.75 0 01.75.75v2.5a.75.75 0 01-1.5 0V4.5h-6.5v15h2a.75.75 0 010 1.5H9a.75.75 0 010-1.5h2v-15H4.5v1.75a.75.75 0 01-1.5 0v-2.5z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/keyframes.scss
index ab2b76426865f..b1a6b0849d039 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-unfold-close {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/placeholders.scss
index f482568d4302a..79dfd8e1ad7f3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-unfold-close-icon {
   --icon-name: icon-unfold-close;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/property-16.scss
index 8a84a6e8ff21e..a9640682599bc 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-unfold-close-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 6a.75.75 0 00.55-.24l3.25-3.5a.75.75 0 10-1.1-1.02L8 4.148 5.3 1.24a.75.75 0 00-1.1 1.02l3.25 3.5A.75.75 0 008 6zM8 10a.75.75 0 01.55.24l3.25 3.5a.75.75 0 11-1.1 1.02L8 11.852 5.3 14.76a.75.75 0 11-1.1-1.02l3.25-3.5A.75.75 0 018 10zM1.75 7.124a.626.626 0 100 1.253h.5a.627.627 0 000-1.253h-.5zM4.75 7.124a.626.626 0 100 1.253h.5a.627.627 0 000-1.253h-.5zM7.75 7.124a.626.626 0 100 1.253h.5a.627.627 0 000-1.253h-.5zM10.75 7.124a.627.627 0 000 1.253h.5a.627.627 0 000-1.253h-.5zM13.75 7.124a.627.627 0 000 1.253h.5a.627.627 0 000-1.253h-.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/property-24.scss
index 4a67fdb2a2082..da681af8fdd9f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-close/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-unfold-close-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 9a.75.75 0 00.543-.232l5.25-5.5a.75.75 0 10-1.085-1.036L12 7.164 7.293 2.232a.75.75 0 00-1.086 1.036l5.25 5.5A.75.75 0 0012 9zM12 15a.75.75 0 01.543.232l5.25 5.5a.75.75 0 01-1.085 1.036L12 16.836l-4.707 4.932a.75.75 0 01-1.086-1.036l5.25-5.5A.75.75 0 0112 15zM1.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM6.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM11.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM16.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM21.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-less/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-less/index.scss
index b9cbc8778c8fc..98ee12ab8bb8f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-less/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-less/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../unfold-close/property-16';
         @import '../unfold-close/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-less/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-less/keyframes.scss
index bc9fddc57e813..f0d09906d879e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-less/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-less/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-unfold-less {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-less/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-less/placeholders.scss
index da2492183e171..3f445c9431103 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-less/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-less/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-unfold-less-icon {
   --icon-name: icon-unfold-less;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-more/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-more/index.scss
index 4c5aff0294c0e..8f7197cd262df 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-more/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-more/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../unfold-open/property-16';
         @import '../unfold-open/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-more/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-more/keyframes.scss
index 50c7cdb91b10d..fc861ca63c675 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-more/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-more/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-unfold-more {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-more/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-more/placeholders.scss
index 879a857906c7f..75d5c428a8885 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-more/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-more/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-unfold-more-icon {
   --icon-name: icon-unfold-more;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/keyframes.scss
index 43fa474d20f21..2a1189244f79b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-unfold-open {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/placeholders.scss
index 6432019547f91..7ebf83314e600 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-unfold-open-icon {
   --icon-name: icon-unfold-open;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/property-16.scss
index 51d0d6dc24168..7d5766d6e98d3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-unfold-open-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M8 1a.75.75 0 01.55.24l3.25 3.5a.75.75 0 11-1.1 1.02L8 2.852 5.3 5.76a.75.75 0 01-1.1-1.02l3.25-3.5A.75.75 0 018 1zM8 15a.75.75 0 00.55-.24l3.25-3.5a.75.75 0 10-1.1-1.02L8 13.148 5.3 10.24a.75.75 0 10-1.1 1.02l3.25 3.5A.75.75 0 008 15zM1.75 7.124a.626.626 0 100 1.253h.5a.627.627 0 000-1.253h-.5zM4.75 7.124a.626.626 0 100 1.253h.5a.627.627 0 000-1.253h-.5zM7.75 7.124a.626.626 0 100 1.253h.5a.627.627 0 000-1.253h-.5zM10.75 7.124a.627.627 0 000 1.253h.5a.627.627 0 000-1.253h-.5zM13.75 7.124a.627.627 0 000 1.253h.5a.627.627 0 000-1.253h-.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/property-24.scss
index 0418b3d04900f..5f821862dc370 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unfold-open/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-unfold-open-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12 2a.75.75 0 01.543.232l5.25 5.5a.75.75 0 11-1.085 1.036L12 3.836 7.293 8.768a.75.75 0 01-1.086-1.036l5.25-5.5A.75.75 0 0112 2zM12 22a.75.75 0 00.543-.232l5.25-5.5a.75.75 0 00-1.085-1.036L12 20.164l-4.707-4.932a.75.75 0 00-1.086 1.036l5.25 5.5A.75.75 0 0012 22zM1.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM6.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM11.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM16.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5zM21.25 11a.75.75 0 000 1.5h1.5a.75.75 0 000-1.5h-1.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/union/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/union/index.scss
index 68293edadf9dc..86cee0b297c2b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/union/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/union/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/union/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/union/keyframes.scss
index b4a9c02fde9fa..7c458f80b078f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/union/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/union/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-union {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/union/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/union/placeholders.scss
index 1f4b33fe9a4df..720c7ac2d98aa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/union/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/union/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-union-icon {
   --icon-name: icon-union;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/union/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/union/property-16.scss
index dfd30b0753285..82f03053e73a3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/union/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/union/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-union-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M0 0V9V10H1H9V9H1L1 0H0Z" fill="%23000"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/union/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/union/property-24.scss
index fe679d2fb7ac1..4132651eeae92 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/union/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/union/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-union-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M0 0V9V10H1H9V9H1L1 0H0Z" fill="%23000"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/keyframes.scss
index 503c763474e51..ea1c2b85c36ea 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-unlock {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/placeholders.scss
index af8cde2570cc7..e26ad3036792e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-unlock-icon {
   --icon-name: icon-unlock;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/property-16.scss
index ed58fbcff3b35..b780689a0410c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-unlock-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M10.239 2.25A2.46 2.46 0 0112 1.5c.657 0 1.29.267 1.761.75.471.483.739 1.142.739 1.833a.75.75 0 001.5 0 4.127 4.127 0 00-1.165-2.88A3.96 3.96 0 0012 0a3.96 3.96 0 00-2.835 1.203A4.127 4.127 0 008 4.083V5H2.25A2.25 2.25 0 000 7.25v5.5A2.25 2.25 0 002.25 15h7.5A2.25 2.25 0 0012 12.75v-5.5A2.25 2.25 0 009.75 5H9.5v-.917c0-.69.268-1.35.739-1.833zm-8.739 5a.75.75 0 01.75-.75h7.5a.75.75 0 01.75.75v5.5a.75.75 0 01-.75.75h-7.5a.75.75 0 01-.75-.75v-5.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/property-24.scss
index 33e13627418d7..9fb7b8a2d3063 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/unlock/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-unlock-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M14.805 3.758A4.636 4.636 0 0118 2.5c1.205 0 2.354.456 3.195 1.258.84.8 1.305 1.877 1.305 2.992a.75.75 0 001.5 0 5.632 5.632 0 00-1.77-4.079A6.136 6.136 0 0018 1c-1.58 0-3.102.597-4.23 1.671A5.632 5.632 0 0012 6.75V10H3.75A2.75 2.75 0 001 12.75v7.5A2.75 2.75 0 003.75 23h10.5A2.75 2.75 0 0017 20.25v-7.5A2.75 2.75 0 0014.25 10h-.75V6.75c0-1.115.465-2.192 1.305-2.992zM3.75 11.5c-.69 0-1.25.56-1.25 1.25v7.5c0 .69.56 1.25 1.25 1.25h10.5c.69 0 1.25-.56 1.25-1.25v-7.5c0-.69-.56-1.25-1.25-1.25H3.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/upload/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/upload/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/upload/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/upload/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/upload/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/upload/keyframes.scss
index afcbe1d0aa937..0d02de8978222 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/upload/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/upload/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-upload {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/upload/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/upload/placeholders.scss
index f9ce3ed9fda20..9bbff7d2be9d6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/upload/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/upload/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-upload-icon {
   --icon-name: icon-upload;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/upload/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/upload/property-16.scss
index bd3ec7e8b8f4b..2dde6667f8351 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/upload/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/upload/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-upload-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.24 5.8a.75.75 0 001.06-.04l1.95-2.1v6.59a.75.75 0 001.5 0V3.66l1.95 2.1a.75.75 0 101.1-1.02l-3.25-3.5a.75.75 0 00-1.101.001L4.2 4.74a.75.75 0 00.04 1.06z"/><path d="M1.75 9a.75.75 0 01.75.75v3c0 .414.336.75.75.75h9.5a.75.75 0 00.75-.75v-3a.75.75 0 011.5 0v3A2.25 2.25 0 0112.75 15h-9.5A2.25 2.25 0 011 12.75v-3A.75.75 0 011.75 9z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/upload/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/upload/property-24.scss
index bc2d0cdcef4f1..a6fbdfd656497 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/upload/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/upload/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-upload-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M6.232 8.793a.75.75 0 001.06-.025l3.958-4.146V15.25a.75.75 0 001.5 0V4.622l3.957 4.146a.75.75 0 001.085-1.036l-5.25-5.5a.747.747 0 00-1.086.001l-5.249 5.5a.75.75 0 00.025 1.06z"/><path d="M2.75 14a.75.75 0 01.75.75v4.5c0 .69.56 1.25 1.25 1.25h14.5c.69 0 1.25-.56 1.25-1.25v-4.5a.75.75 0 011.5 0v4.5A2.75 2.75 0 0119.25 22H4.75A2.75 2.75 0 012 19.25v-4.5a.75.75 0 01.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-add/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-add/index.scss
index 5f2cdb956186d..da4d685328d16 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-add/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-add/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../user-plus/property-16';
         @import '../user-plus/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-add/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-add/keyframes.scss
index 784197674b8d0..21270ceda701e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-add/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-add/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-user-add {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-add/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-add/placeholders.scss
index ae176d12110f2..591fa5b56c991 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-add/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-add/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-user-add-icon {
   --icon-name: icon-user-add;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/keyframes.scss
index ca4f24d3b377a..e403d81d8b68f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-user-check {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/placeholders.scss
index c09c453baa5a5..83c8ad649e554 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-user-check-icon {
   --icon-name: icon-user-check;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/property-16.scss
index 8b9c792e4c87b..b77ef8de3d5e2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-user-check-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M6 2a3.5 3.5 0 100 7 3.5 3.5 0 000-7zM4 5.5a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/><path d="M4.25 10A3.75 3.75 0 00.5 13.75v.5a.75.75 0 001.5 0v-.5a2.25 2.25 0 012.25-2.25h3.5A2.25 2.25 0 0110 13.75v.5a.75.75 0 001.5 0v-.5A3.75 3.75 0 007.75 10h-3.5zM14.78 6.22a.75.75 0 010 1.06l-2.5 2.5a.75.75 0 01-1.06 0l-1-1a.75.75 0 111.06-1.06l.47.47 1.97-1.97a.75.75 0 011.06 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/property-24.scss
index e2f6a66df91df..4caee58c1ce57 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-check/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-user-check-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M9 3a5 5 0 100 10A5 5 0 009 3zM5.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z" clip-rule="evenodd"/><path d="M4.75 14.5A4.75 4.75 0 000 19.25v1a.75.75 0 001.5 0v-1A3.25 3.25 0 014.75 16h8.5a3.25 3.25 0 013.25 3.25v1a.75.75 0 001.5 0v-1a4.75 4.75 0 00-4.75-4.75h-8.5zM23.28 8.72a.75.75 0 010 1.06l-4 4a.75.75 0 01-1.06 0l-2-2a.75.75 0 111.06-1.06l1.47 1.47 3.47-3.47a.75.75 0 011.06 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/keyframes.scss
index 684449a27c8ab..e4f4000cbc91b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-user-circle-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/placeholders.scss
index 29603757f470e..ffde65ecd9e35 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-user-circle-fill-icon {
   --icon-name: icon-user-circle-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/property-16.scss
index 88ae5c06143f2..d10ab28c693bf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-user-circle-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M.25 8a7.75 7.75 0 1115.5 0A7.75 7.75 0 01.25 8zm3.19 1.833A3.24 3.24 0 015.624 9h4.75a3.24 3.24 0 012.186.833c.528.484.939 1.048.939 1.917a.75.75 0 01-1.5 0c0-.284-.09-.478-.452-.81-.3-.275-.722-.44-1.173-.44h-4.75c-.451 0-.872.165-1.173.44-.363.332-.452.526-.452.81a.75.75 0 01-1.5 0c0-.869.411-1.433.94-1.917zM6.5 5a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0zM8 2a3 3 0 100 6 3 3 0 000-6z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/property-24.scss
index a193a328bc740..7044286781228 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-user-circle-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M.25 12C.25 5.51 5.51.25 12 .25S23.75 5.51 23.75 12 18.49 23.75 12 23.75.25 18.49.25 12zM4 18a4 4 0 014-4h8a4 4 0 014 4v.25a.75.75 0 01-1.5 0V18a2.5 2.5 0 00-2.5-2.5H8A2.5 2.5 0 005.5 18v.25a.75.75 0 01-1.5 0V18zM9 8a3 3 0 116 0 3 3 0 01-6 0zm3-4.5a4.5 4.5 0 100 9 4.5 4.5 0 000-9z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/keyframes.scss
index 6fa9a8acaee21..5646cca6efdfd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-user-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/placeholders.scss
index 3426fb51d93f3..178c03edb9b6f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-user-circle-icon {
   --icon-name: icon-user-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/property-16.scss
index ea277ac9048fe..6e6ebff60bc9f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-user-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M8 3a3 3 0 100 6 3 3 0 000-6zM6.5 6a1.5 1.5 0 113 0 1.5 1.5 0 01-3 0z"/><path d="M.25 8a7.75 7.75 0 1115.5 0A7.75 7.75 0 01.25 8zM8 1.75a6.25 6.25 0 00-5.274 9.604c.15-.194.325-.369.514-.533C3.855 10.286 4.67 10 5.5 10h5c.83 0 1.645.286 2.26.82.189.165.365.34.514.534A6.25 6.25 0 008 1.75zm0 12.5a6.228 6.228 0 01-4.238-1.656c.035-.196.153-.372.462-.641.323-.281.78-.453 1.276-.453h5c.495 0 .953.172 1.276.453.31.269.427.445.462.641A6.228 6.228 0 018 14.25z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/property-24.scss
index 38c50de775616..b7808ad1d66b0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-user-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000" fill-rule="evenodd" clip-rule="evenodd"><path d="M12 4.5a4.5 4.5 0 100 9 4.5 4.5 0 000-9zM9 9a3 3 0 116 0 3 3 0 01-6 0z"/><path d="M.25 12C.25 5.51 5.51.25 12 .25S23.75 5.51 23.75 12 18.49 23.75 12 23.75.25 18.49.25 12zM12 1.75C6.34 1.75 1.75 6.34 1.75 12c0 2.298.756 4.42 2.034 6.13A4.752 4.752 0 018.25 15h7.5a4.752 4.752 0 014.466 3.13A10.204 10.204 0 0022.25 12c0-5.66-4.59-10.25-10.25-10.25zm0 20.5c-2.702 0-5.16-1.045-6.99-2.753A3.25 3.25 0 018.25 16.5h7.5a3.25 3.25 0 013.24 2.997A10.214 10.214 0 0112 22.25z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/keyframes.scss
index a49f31bdc5b82..4fdde610644c1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-user-minus {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/placeholders.scss
index 24b88c45f548b..2421921cc296d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-user-minus-icon {
   --icon-name: icon-user-minus;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/property-16.scss
index c631f80061dc0..07964042b06e5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-user-minus-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M2.5 5.5a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0zm3.5-2a2 2 0 100 4 2 2 0 000-4z" clip-rule="evenodd"/><path d="M.5 13.75A3.75 3.75 0 014.25 10h3.5a3.75 3.75 0 013.75 3.75v.5a.75.75 0 01-1.5 0v-.5a2.25 2.25 0 00-2.25-2.25h-3.5A2.25 2.25 0 002 13.75v.5a.75.75 0 01-1.5 0v-.5zM11.25 7.5a.75.75 0 000 1.5h3.5a.75.75 0 000-1.5h-3.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/property-24.scss
index 661f6e04bb790..b3c4017a139df 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-minus/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-user-minus-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M4 8a5 5 0 1110 0A5 5 0 014 8zm5-3.5a3.5 3.5 0 100 7 3.5 3.5 0 000-7z" clip-rule="evenodd"/><path d="M0 19.25a4.75 4.75 0 014.75-4.75h8.5A4.75 4.75 0 0118 19.25v1a.75.75 0 01-1.5 0v-1A3.25 3.25 0 0013.25 16h-8.5a3.25 3.25 0 00-3.25 3.25v1a.75.75 0 01-1.5 0v-1zM16.75 10.5a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-organization/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-organization/index.scss
index 83cff19dd7b40..a495242b2c4af 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-organization/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-organization/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../org/property-16';
         @import '../org/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-organization/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-organization/keyframes.scss
index b2ab84432193c..6d619740324cd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-organization/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-organization/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-user-organization {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-organization/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-organization/placeholders.scss
index c458a3c9fc3c6..d7adee2c13165 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-organization/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-organization/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-user-organization-icon {
   --icon-name: icon-user-organization;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plain/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plain/index.scss
index 6db7a950f3434..ee91b678f6e60 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plain/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plain/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../user/property-16';
         @import '../user/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plain/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plain/keyframes.scss
index 43f11fd67f723..b31e7c2eecdf2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plain/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plain/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-user-plain {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plain/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plain/placeholders.scss
index b40a473c75d6c..3175e6b3bbaaf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plain/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plain/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-user-plain-icon {
   --icon-name: icon-user-plain;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/keyframes.scss
index a05bf722efb5d..5aef31c85ed39 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-user-plus {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/placeholders.scss
index ab2a931d695fd..0d5b59187f073 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-user-plus-icon {
   --icon-name: icon-user-plus;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/property-16.scss
index 2c7b4d9fdc214..135e0ea591ce8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-user-plus-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M6 2a3.5 3.5 0 100 7 3.5 3.5 0 000-7zM4 5.5a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/><path d="M4.25 10A3.75 3.75 0 00.5 13.75v.5a.75.75 0 001.5 0v-.5a2.25 2.25 0 012.25-2.25h3.5A2.25 2.25 0 0110 13.75v.5a.75.75 0 001.5 0v-.5A3.75 3.75 0 007.75 10h-3.5zM10.25 8.25A.75.75 0 0111 7.5h1v-1a.75.75 0 011.5 0v1h1a.75.75 0 010 1.5h-1v1a.75.75 0 01-1.5 0V9h-1a.75.75 0 01-.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/property-24.scss
index d6116a9aef9c4..01ae6992ab6fe 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-plus/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-user-plus-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M9 3a5 5 0 100 10A5 5 0 009 3zM5.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z" clip-rule="evenodd"/><path d="M4.75 14.5A4.75 4.75 0 000 19.25v1a.75.75 0 001.5 0v-1A3.25 3.25 0 014.75 16h8.5a3.25 3.25 0 013.25 3.25v1a.75.75 0 001.5 0v-1a4.75 4.75 0 00-4.75-4.75h-8.5zM15.75 11.25a.75.75 0 01.75-.75h2v-2a.75.75 0 011.5 0v2h2a.75.75 0 010 1.5h-2v2a.75.75 0 01-1.5 0v-2h-2a.75.75 0 01-.75-.75z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-fill/index.scss
index 125ad097364b5..f8e20e521ff81 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../user-circle-fill/property-16';
         @import '../user-circle-fill/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-fill/keyframes.scss
index 30f7c5209e48d..d971fc8663372 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-user-square-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-fill/placeholders.scss
index 576167627aa2e..c6759d12179a4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-user-square-fill-icon {
   --icon-name: icon-user-square-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-outline/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-outline/index.scss
index c886827f40aa4..be53f56f29cab 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-outline/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-outline/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../user-circle/property-16';
         @import '../user-circle/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-outline/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-outline/keyframes.scss
index 99a7462fa2f44..bcd0a8268183c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-outline/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-outline/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-user-square-outline {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-outline/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-outline/placeholders.scss
index 129d957718015..f91456d85ecf9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-outline/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-square-outline/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-user-square-outline-icon {
   --icon-name: icon-user-square-outline;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-team/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-team/index.scss
index 73fd36573c8c3..4cf95abc6f2fb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-team/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-team/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../users/property-16';
         @import '../users/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-team/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-team/keyframes.scss
index b6283e9a398b2..2c06caf7fc74f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-team/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-team/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-user-team {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-team/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-team/placeholders.scss
index bc83a3b61682e..ad625e5de8fac 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-team/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-team/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-user-team-icon {
   --icon-name: icon-user-team;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/keyframes.scss
index 225f53e99c12f..eef0459d95408 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-user-x {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/placeholders.scss
index 023c5becfa6c0..97a542ee68efb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-user-x-icon {
   --icon-name: icon-user-x;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/property-16.scss
index 99b8de4bf67a7..b385b82e8c00a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-user-x-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M6 2a3.5 3.5 0 100 7 3.5 3.5 0 000-7zM4 5.5a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/><path d="M4.25 10A3.75 3.75 0 00.5 13.75v.5a.75.75 0 001.5 0v-.5a2.25 2.25 0 012.25-2.25h3.5A2.25 2.25 0 0110 13.75v.5a.75.75 0 001.5 0v-.5A3.75 3.75 0 007.75 10h-3.5zM11.22 5.22a.75.75 0 011.06 0l1.22 1.22 1.22-1.22a.75.75 0 111.06 1.06L14.56 7.5l1.22 1.22a.75.75 0 01-1.06 1.06L13.5 8.56l-1.22 1.22a.75.75 0 11-1.06-1.06l1.22-1.22-1.22-1.22a.75.75 0 010-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/property-24.scss
index e832ec22934c6..396b52b59c7b5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user-x/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-user-x-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M9 3a5 5 0 100 10A5 5 0 009 3zM5.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z" clip-rule="evenodd"/><path d="M4.75 14.5A4.75 4.75 0 000 19.25v1a.75.75 0 001.5 0v-1A3.25 3.25 0 014.75 16h8.5a3.25 3.25 0 013.25 3.25v1a.75.75 0 001.5 0v-1a4.75 4.75 0 00-4.75-4.75h-8.5zM16.22 8.22a.75.75 0 011.06 0L19 9.94l1.72-1.72a.75.75 0 111.06 1.06L20.06 11l1.72 1.72a.75.75 0 11-1.06 1.06L19 12.06l-1.72 1.72a.75.75 0 11-1.06-1.06L17.94 11l-1.72-1.72a.75.75 0 010-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user/keyframes.scss
index 5a2912244c022..9c973b3e6d251 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-user {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user/placeholders.scss
index 0720df48b7baf..94309b12f6cb9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-user-icon {
   --icon-name: icon-user;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user/property-16.scss
index 48a18c6002a5f..f37c8eab8e22e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-user-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M8 1a4 4 0 100 8 4 4 0 000-8zM5.5 5a2.5 2.5 0 115 0 2.5 2.5 0 01-5 0z" clip-rule="evenodd"/><path d="M5.25 10a3.75 3.75 0 00-3.75 3.75v.5a.75.75 0 001.5 0v-.5a2.25 2.25 0 012.25-2.25h5.5A2.25 2.25 0 0113 13.75v.5a.75.75 0 001.5 0v-.5A3.75 3.75 0 0010.75 10h-5.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/user/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/user/property-24.scss
index f703df6c034f1..9f49da48295b5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/user/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/user/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-user-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M12 3a5 5 0 100 10 5 5 0 000-10zM8.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z" clip-rule="evenodd"/><path d="M7.75 14.5A4.75 4.75 0 003 19.25v1a.75.75 0 001.5 0v-1A3.25 3.25 0 017.75 16h8.5a3.25 3.25 0 013.25 3.25v1a.75.75 0 001.5 0v-1a4.75 4.75 0 00-4.75-4.75h-8.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/users/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/users/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/users/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/users/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/users/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/users/keyframes.scss
index 5ae77a0d5313d..2dd8cd378b6a7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/users/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/users/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-users {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/users/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/users/placeholders.scss
index 0b57fe19db88b..8a1be0c949ad0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/users/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/users/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-users-icon {
   --icon-name: icon-users;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/users/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/users/property-16.scss
index fa3dc4cd641da..eb1fa791d9d87 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/users/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/users/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-users-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M6 2a3.5 3.5 0 100 7 3.5 3.5 0 000-7zM4 5.5a2 2 0 114 0 2 2 0 01-4 0z" clip-rule="evenodd"/><path d="M4.25 10A3.75 3.75 0 00.5 13.75v.5a.75.75 0 001.5 0v-.5a2.25 2.25 0 012.25-2.25h3.5A2.25 2.25 0 0110 13.75v.5a.75.75 0 001.5 0v-.5A3.75 3.75 0 007.75 10h-3.5zM11.25 10.75A.75.75 0 0112 10h.25a3.25 3.25 0 013.25 3.25v1a.75.75 0 01-1.5 0v-1a1.75 1.75 0 00-1.75-1.75H12a.75.75 0 01-.75-.75zM11.273 2.24a.75.75 0 00-.546 1.396 2.001 2.001 0 010 3.728.75.75 0 00.546 1.397 3.501 3.501 0 000-6.522z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/users/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/users/property-24.scss
index 875cf9bc9d5a2..a544f22b84de4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/users/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/users/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-users-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M9 3a5 5 0 100 10A5 5 0 009 3zM5.5 8a3.5 3.5 0 117 0 3.5 3.5 0 01-7 0z" clip-rule="evenodd"/><path d="M4.75 14.5A4.75 4.75 0 000 19.25v1a.75.75 0 001.5 0v-1A3.25 3.25 0 014.75 16h8.5a3.25 3.25 0 013.25 3.25v1a.75.75 0 001.5 0v-1a4.75 4.75 0 00-4.75-4.75h-8.5zM18.25 15.25a.75.75 0 01.75-.75h.25A4.75 4.75 0 0124 19.25v1a.75.75 0 01-1.5 0v-1A3.25 3.25 0 0019.25 16H19a.75.75 0 01-.75-.75zM15 3a.75.75 0 000 1.5 3.5 3.5 0 110 7 .75.75 0 000 1.5 5 5 0 000-10z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/keyframes.scss
index a3c5ee2f0dfac..48eab05bd53ac 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-vagrant-color {
   100% {
     background-image: var(--icon-vagrant-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/placeholders.scss
index f0ae6452159cb..a30737c69dabe 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-vagrant-color-icon {
   --icon-name: icon-vagrant-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/property-16.scss
index 31fd40931e8ed..7bf5cadb2fac0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-vagrant-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%231868F2" d="M13.08.75L9.924 2.58v1.123L8 8.245 6.076 3.703V2.58L2.92.75 1 1.864v1.293l4.276 10.514L8 15.25l2.724-1.579L15 3.157V1.864L13.08.75z"/><path fill="%230850C5" d="M15 1.865l-3.157 1.829v1.124L9.28 10.57 8 11.312v3.939l2.724-1.579L15 3.158V1.865zM6.076 3.703V2.58l-1.92 1.113v1.125l2.564 5.751L8 9.827V8.245L6.076 3.703z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/property-24.scss
index 053265ab63712..143b30891634d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-vagrant-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%231868F2" d="M19.983.6l-4.96 2.877v1.767L12 12.384l-3.023-7.14V3.477L4.017.6 1 2.352v2.034l6.719 16.532L12 23.4l4.281-2.482L23 4.386V2.352L19.983.6z"/><path fill="%230850C5" d="M23 2.352l-4.96 2.875v1.77l-4.028 9.043L12 17.207V23.4l4.28-2.482L23 4.386V2.352zM8.977 5.244V3.477l-3.019 1.75v1.77l4.03 9.043L12 14.873v-2.488L8.977 5.244z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/index.scss
index 1525999371cce..55b89be6ece1f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../vagrant-color/property-16';
         @import '../vagrant-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/keyframes.scss
index 4252a8a2696e5..dc4820e0e95c3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-vagrant {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/placeholders.scss
index e86f1ea566754..8a96337c66ba9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-vagrant-icon {
   --icon-name: icon-vagrant;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/property-16.scss
index 9d49f05909f00..123c7c4cbc20d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-vagrant-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M13.08.75L9.924 2.58v1.123L8 8.245 6.076 3.703V2.58L2.92.75 1 1.864v1.293l4.276 10.514L8 15.25l2.724-1.579L15 3.157V1.864L13.08.75z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/property-24.scss
index 78f54de336de2..08ab1e586d74d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vagrant/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-vagrant-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M13.08.75L9.924 2.58v1.123L8 8.245 6.076 3.703V2.58L2.92.75 1 1.864v1.293l4.276 10.514L8 15.25l2.724-1.579L15 3.157V1.864L13.08.75z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/keyframes.scss
index 24770cf5c5ed4..5246a48a29962 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-vault-color {
   100% {
     background-image: var(--icon-vault-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/placeholders.scss
index 1f4b4295c98a6..407e00a25fd6e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-vault-color-icon {
   --icon-name: icon-vault-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/property-16.scss
index 9373592c97373..a849f759720a2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-vault-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23FFD814" d="M0 0l7.971 15.516L16 0H0zm6.732 6.16h-1.27V4.89h1.27v1.27zm0-1.906h-1.27V2.985h1.27v1.269zm1.904 3.81h-1.27v-1.27h1.27v1.27zm0-1.905h-1.27V4.89h1.27v1.27zm0-1.905h-1.27V2.985h1.27v1.269zm1.894 1.905H9.26V4.89h1.27v1.27zM9.26 4.254V2.985h1.27v1.269H9.26z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/property-24.scss
index 655d4ba2b3392..b2500a4f01090 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vault-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-vault-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23FFD814" d="M1 1l10.96 21.334L23 1H1zm9.256 8.469H8.51V7.723h1.746v1.746zm0-2.62H8.51V5.105h1.746v1.744zm2.618 5.238h-1.746v-1.746h1.746v1.746zm0-2.618h-1.746V7.723h1.746v1.746zm0-2.62h-1.746V5.105h1.746v1.744zm2.604 2.62h-1.746V7.723h1.746v1.746zm-1.746-2.62V5.105h1.746v1.744h-1.746z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vault/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vault/index.scss
index e41aea05fa49e..a7a0211c2695b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vault/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vault/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../vault-color/property-16';
         @import '../vault-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vault/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vault/keyframes.scss
index 636c78c8342b3..89c1ccfc4e67e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vault/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vault/keyframes.scss
@@ -1,12 +1,9 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-vault {
   100% {
+
     -webkit-mask-image: var(--icon-vault-color-16);
     mask-image: var(--icon-vault-color-16);
-    background-color: var(--icon-color, var(--color-vault, currentColor));
+    background-color: var(--icon-color, var(--color-vault-500, currentColor));
+
   }
-}
+}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vault/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vault/placeholders.scss
index 4f40e3c32fe22..169c07ded1e89 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vault/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vault/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-vault-icon {
   --icon-name: icon-vault;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vault/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vault/property-16.scss
index f5046702ae1da..15c6decf39dda 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vault/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vault/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-vault-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M0 0l7.971 15.516L16 0H0zm6.732 6.16h-1.27V4.89h1.27v1.27zm0-1.906h-1.27V2.985h1.27v1.269zm1.904 3.81h-1.27v-1.27h1.27v1.27zm0-1.905h-1.27V4.89h1.27v1.27zm0-1.905h-1.27V2.985h1.27v1.269zm1.894 1.905H9.26V4.89h1.27v1.27zM9.26 4.254V2.985h1.27v1.269H9.26z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vault/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vault/property-24.scss
index 2199a89b6f3c7..b583a6c39c886 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vault/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vault/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-vault-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M0 0l7.971 15.516L16 0H0zm6.732 6.16h-1.27V4.89h1.27v1.27zm0-1.906h-1.27V2.985h1.27v1.269zm1.904 3.81h-1.27v-1.27h1.27v1.27zm0-1.905h-1.27V4.89h1.27v1.27zm0-1.905h-1.27V2.985h1.27v1.269zm1.894 1.905H9.26V4.89h1.27v1.27zM9.26 4.254V2.985h1.27v1.269H9.26z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/verified/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/verified/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/verified/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/verified/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/verified/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/verified/keyframes.scss
index 5545eef120a5a..62912b4982c83 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/verified/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/verified/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-verified {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/verified/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/verified/placeholders.scss
index c58ecbe47bf1d..d16f166ef4f10 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/verified/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/verified/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-verified-icon {
   --icon-name: icon-verified;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/verified/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/verified/property-16.scss
index 66c84e314e6e9..0ad62c5957785 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/verified/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/verified/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-verified-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.28 5.72a.75.75 0 010 1.06l-4 4a.75.75 0 01-1.06 0l-1.5-1.5a.75.75 0 011.06-1.06l.97.97 3.47-3.47a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M6.402 1.22a2.75 2.75 0 013.196 0l.69.493c.154.11.332.184.519.215l.865.146a2.75 2.75 0 012.254 2.254l.146.866c.031.187.105.364.215.518l.493.69a2.75 2.75 0 010 3.197l-.493.69c-.11.154-.184.33-.215.518l-.146.865a2.75 2.75 0 01-2.254 2.254l-.865.146a1.25 1.25 0 00-.519.216l-.69.492a2.75 2.75 0 01-3.196 0l-.69-.492a1.25 1.25 0 00-.519-.216l-.865-.146a2.75 2.75 0 01-2.254-2.254l-.146-.865a1.25 1.25 0 00-.215-.519l-.493-.69a2.75 2.75 0 010-3.196l.493-.69a1.25 1.25 0 00.215-.518l.146-.866a2.75 2.75 0 012.254-2.254l.865-.146a1.25 1.25 0 00.519-.215l.69-.493zm2.324 1.22a1.25 1.25 0 00-1.453 0l-.69.493a2.75 2.75 0 01-1.14.474l-.865.146a1.25 1.25 0 00-1.025 1.025l-.146.865a2.75 2.75 0 01-.474 1.141l-.492.69a1.25 1.25 0 000 1.453l.492.69c.243.339.405.729.474 1.14l.146.865c.089.525.5.936 1.025 1.025l.865.146c.411.07.801.232 1.14.474l.69.493a1.25 1.25 0 001.454 0l.69-.493a2.75 2.75 0 011.14-.474l.865-.146a1.25 1.25 0 001.025-1.024l.146-.866a2.75 2.75 0 01.474-1.14l.492-.69a1.25 1.25 0 000-1.453l-.492-.69a2.75 2.75 0 01-.474-1.14l-.146-.866a1.25 1.25 0 00-1.025-1.025l-.865-.146a2.75 2.75 0 01-1.14-.474l-.69-.492z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/verified/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/verified/property-24.scss
index c598613c0a4ad..2292cc48ece8c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/verified/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/verified/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-verified-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M16.78 8.22a.75.75 0 010 1.06l-6.5 6.5a.75.75 0 01-1.06 0l-3-3a.75.75 0 111.06-1.06l2.47 2.47 5.97-5.97a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M9.82 1.635a3.75 3.75 0 014.36 0l1.193.853c.278.198.597.33.934.387l1.492.252a3.75 3.75 0 013.074 3.074l.252 1.492c.056.337.189.656.387.934l.853 1.193a3.75 3.75 0 010 4.36l-.853 1.193a2.248 2.248 0 00-.387.934l-.252 1.492a3.75 3.75 0 01-3.074 3.073l-1.492.252a2.25 2.25 0 00-.934.388l-1.193.853a3.75 3.75 0 01-4.36 0l-1.193-.853a2.25 2.25 0 00-.934-.388l-1.492-.252A3.75 3.75 0 013.127 17.8l-.251-1.492a2.25 2.25 0 00-.388-.934l-.853-1.193a3.75 3.75 0 010-4.36l.853-1.193a2.25 2.25 0 00.388-.934l.251-1.492a3.75 3.75 0 013.074-3.074l1.492-.252a2.25 2.25 0 00.934-.387l1.193-.853zm3.488 1.22a2.25 2.25 0 00-2.616 0L9.5 3.709a3.75 3.75 0 01-1.556.646l-1.492.252A2.25 2.25 0 004.606 6.45l-.251 1.493a3.75 3.75 0 01-.647 1.555l-.852 1.194a2.25 2.25 0 000 2.616l.852 1.193c.331.463.552.995.647 1.556l.251 1.492c.16.945.9 1.685 1.845 1.844l1.492.252c.56.095 1.093.316 1.556.646l1.193.853a2.25 2.25 0 002.616 0l1.193-.852c.463-.331.995-.552 1.556-.647l1.492-.252a2.25 2.25 0 001.845-1.844l.252-1.492a3.75 3.75 0 01.646-1.556l.852-1.193a2.25 2.25 0 000-2.616l-.852-1.194a3.75 3.75 0 01-.647-1.555l-.251-1.493a2.25 2.25 0 00-1.845-1.844l-1.492-.252a3.75 3.75 0 01-1.556-.646l-1.193-.852z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/keyframes.scss
index 3b9e0c92c6929..0fe053d9f6b70 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-video-off {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/placeholders.scss
index e36e35a71af87..9a44d5b29bea3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-video-off-icon {
   --icon-name: icon-video-off;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/property-16.scss
index fa16ba9defe53..d81049e7616f4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-video-off-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M2.28 1.22a.75.75 0 00-1.06 1.06l.738.739A2.25 2.25 0 000 5.25v5.5A2.25 2.25 0 002.25 13h6.5a2.25 2.25 0 001.99-1.2l2.98 2.98a.75.75 0 101.06-1.06L2.28 1.22zm7.22 9.34L3.44 4.5H2.25a.75.75 0 00-.75.75v5.5c0 .414.336.75.75.75h6.5a.75.75 0 00.75-.75v-.19z" clip-rule="evenodd"/><path d="M7.688 3a.75.75 0 000 1.5H8.75a.75.75 0 01.75.75v.733a1.544 1.544 0 002.424 1.27L14.5 5.47v5.54a.75.75 0 001.5 0V4.99c0-1.021-1.157-1.61-1.982-1.013L11.07 6.02a.045.045 0 01-.07-.037V5.25A2.25 2.25 0 008.75 3H7.687z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/property-24.scss
index 15e7b822b5cec..4cf11bc50a8f3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/video-off/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-video-off-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M2.28 1.22a.75.75 0 00-1.06 1.06L2.94 4h-.19A2.75 2.75 0 000 6.75v10.5A2.75 2.75 0 002.75 20h11.5c1.271 0 2.34-.862 2.656-2.034l4.814 4.814a.75.75 0 101.06-1.06L2.28 1.22zM15.5 16.56L4.44 5.5H2.75c-.69 0-1.25.56-1.25 1.25v10.5c0 .69.56 1.25 1.25 1.25h11.5c.69 0 1.25-.56 1.25-1.25v-.69z" clip-rule="evenodd"/><path d="M10.5 4a.75.75 0 000 1.5h3.75c.69 0 1.25.56 1.25 1.25v3.514a1.32 1.32 0 002.148 1.028l4.426-3.563.014-.012a.25.25 0 01.412.19v8.185c0 .06-.015.101-.035.133a.253.253 0 01-.096.087.75.75 0 00.708 1.322c.527-.281.923-.84.923-1.542V7.908c0-1.487-1.736-2.295-2.873-1.342L17 9.888V6.75A2.75 2.75 0 0014.25 4H10.5z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/video/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/video/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/video/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/video/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/video/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/video/keyframes.scss
index 17f1a5d359ceb..ea2d349710a11 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/video/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/video/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-video {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/video/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/video/placeholders.scss
index 2b26528c16bed..398e3642593ad 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/video/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/video/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-video-icon {
   --icon-name: icon-video;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/video/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/video/property-16.scss
index d40ecf5302247..318e9ba3ea053 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/video/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/video/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-video-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M0 5.25A2.25 2.25 0 012.25 3h6.5A2.25 2.25 0 0111 5.25v.818l3.018-2.09C14.843 3.382 16 3.97 16 4.991v6.018c0 1.021-1.157 1.61-1.982 1.013L11 9.932v.818A2.25 2.25 0 018.75 13h-6.5A2.25 2.25 0 010 10.75v-5.5zM11 8c0 .067.033.13.088.168l3.412 2.363V5.47l-3.412 2.363A.204.204 0 0011 8zM9.5 5.25a.75.75 0 00-.75-.75h-6.5a.75.75 0 00-.75.75v5.5c0 .414.336.75.75.75h6.5a.75.75 0 00.75-.75v-5.5z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/video/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/video/property-24.scss
index 74d3c50079a34..3810245be426c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/video/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/video/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-video-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M0 6.75A2.75 2.75 0 012.75 4h11.5A2.75 2.75 0 0117 6.75v3.138l4.127-3.322C22.264 5.613 24 6.42 24 7.908v8.184c0 1.488-1.738 2.296-2.875 1.34L17 14.078v3.173A2.75 2.75 0 0114.25 20H2.75A2.75 2.75 0 010 17.25V6.75zm17 5.23c0 .103.047.201.127.267l4.95 4.026.011.01a.25.25 0 00.412-.19V7.907a.25.25 0 00-.412-.19l-.014.011-4.945 3.981a.345.345 0 00-.129.27zm-1.5-5.23c0-.69-.56-1.25-1.25-1.25H2.75c-.69 0-1.25.56-1.25 1.25v10.5c0 .69.56 1.25 1.25 1.25h11.5c.69 0 1.25-.56 1.25-1.25V6.75z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-hide/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-hide/index.scss
index 4fa32e6813cd4..38c4103b7f708 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-hide/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-hide/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../eye-off/property-16';
         @import '../eye-off/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-hide/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-hide/keyframes.scss
index ab98a2f54d84e..6d0e7dfd8c709 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-hide/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-hide/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-visibility-hide {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-hide/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-hide/placeholders.scss
index 3ee61904adc92..e9cafc47ccf43 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-hide/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-hide/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-visibility-hide-icon {
   --icon-name: icon-visibility-hide;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-show/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-show/index.scss
index 6d2d4ebcc3b47..ca98fc3f5ffa5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-show/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-show/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../eye/property-16';
         @import '../eye/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-show/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-show/keyframes.scss
index d7b309a2b63c7..b1d25385d5eb1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-show/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-show/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-visibility-show {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-show/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-show/placeholders.scss
index cb1bfb4e30bd5..64bc541d039c0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-show/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/visibility-show/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-visibility-show-icon {
   --icon-name: icon-visibility-show;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/keyframes.scss
index 3b5287fdc99bc..731070f9cc392 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-vmware-color {
   100% {
     background-image: var(--icon-vmware-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/placeholders.scss
index 0bdaef42eae48..44cfb957b6af0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-vmware-color-icon {
   --icon-name: icon-vmware-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/property-16.scss
index 6b1c191bd2156..812bdf546a649 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-vmware-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23696566" d="M1.677 5.14c-.201-.46-.698-.67-1.162-.454-.465.216-.636.756-.426 1.218l1.949 4.436c.306.696.63 1.06 1.236 1.06.647 0 .93-.397 1.236-1.06l1.717-3.916a.247.247 0 01.245-.165c.146 0 .27.123.27.287v3.79c0 .585.308 1.064.904 1.064.595 0 .916-.48.916-1.064V7.235c0-.599.41-.987.968-.987s.929.402.929.987v3.101c0 .585.31 1.064.905 1.064s.918-.48.918-1.064V7.235c0-.599.408-.987.966-.987.557 0 .93.402.93.987v3.101c0 .585.31 1.064.905 1.064.594 0 .917-.48.917-1.064v-3.53C16 5.51 15.004 4.6 13.805 4.6c-1.197 0-1.947.868-1.947.868-.4-.542-.949-.867-1.878-.867-.982 0-1.84.867-1.84.867-.4-.542-1.078-.867-1.64-.867-.87 0-1.56.4-1.982 1.41L3.274 9.082 1.677 5.14z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/property-24.scss
index 0b01835b1a19b..169a078113dfd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-vmware-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23696566" d="M4.096 8.468c-.251-.57-.873-.829-1.453-.562-.58.267-.795.934-.532 1.505l2.436 5.48c.383.859.787 1.31 1.545 1.31.81 0 1.163-.491 1.545-1.31l2.147-4.838a.309.309 0 01.306-.204.345.345 0 01.336.355v4.682c0 .722.387 1.314 1.131 1.314s1.146-.592 1.146-1.314v-3.831c0-.74.512-1.219 1.21-1.219.697 0 1.16.497 1.16 1.219v3.831c0 .722.389 1.314 1.132 1.314.743 0 1.147-.592 1.147-1.314v-3.831c0-.74.51-1.219 1.208-1.219.696 0 1.162.497 1.162 1.219v3.831c0 .722.388 1.314 1.131 1.314.744 0 1.147-.592 1.147-1.314v-4.36C22 8.922 20.755 7.8 19.256 7.8c-1.497 0-2.434 1.072-2.434 1.072-.498-.669-1.185-1.07-2.347-1.07-1.227 0-2.3 1.07-2.3 1.07-.499-.669-1.348-1.07-2.05-1.07-1.087 0-1.95.494-2.477 1.74l-1.556 3.795-1.996-4.869z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/index.scss
index 5058ca3046cd1..00f6f1d949b9d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../vmware-color/property-16';
         @import '../vmware-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/keyframes.scss
index e50cb6c39712a..36afdc4420f48 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-vmware {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/placeholders.scss
index ee92baac79408..efc4a5167b129 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-vmware-icon {
   --icon-name: icon-vmware;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/property-16.scss
index 842ea362e229f..a6552f1b955e5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-vmware-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M1.677 5.14c-.201-.46-.698-.67-1.162-.454-.465.216-.636.756-.426 1.218l1.949 4.436c.306.696.63 1.06 1.236 1.06.647 0 .93-.397 1.236-1.06l1.717-3.916a.247.247 0 01.245-.166c.146.001.27.124.27.288v3.79c0 .585.308 1.064.904 1.064.595 0 .916-.48.916-1.064V7.235c0-.599.41-.987.968-.987s.929.402.929.987v3.101c0 .585.31 1.064.905 1.064s.918-.48.918-1.064V7.235c0-.599.408-.987.966-.987.557 0 .93.402.93.987v3.101c0 .585.31 1.064.905 1.064.594 0 .917-.48.917-1.064v-3.53C16 5.51 15.004 4.6 13.805 4.6c-1.197 0-1.947.867-1.947.867-.4-.54-.949-.866-1.878-.866-.982 0-1.84.866-1.84.866-.4-.54-1.078-.866-1.64-.866-.87 0-1.56.4-1.982 1.41L3.274 9.082 1.677 5.14z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/property-24.scss
index c43869fbdd7e8..4a43b641dbdf6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/vmware/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-vmware-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M1.677 5.14c-.201-.46-.698-.67-1.162-.454-.465.216-.636.756-.426 1.218l1.949 4.436c.306.696.63 1.06 1.236 1.06.647 0 .93-.397 1.236-1.06l1.717-3.916a.247.247 0 01.245-.166c.146.001.27.124.27.288v3.79c0 .585.308 1.064.904 1.064.595 0 .916-.48.916-1.064V7.235c0-.599.41-.987.968-.987s.929.402.929.987v3.101c0 .585.31 1.064.905 1.064s.918-.48.918-1.064V7.235c0-.599.408-.987.966-.987.557 0 .93.402.93.987v3.101c0 .585.31 1.064.905 1.064.594 0 .917-.48.917-1.064v-3.53C16 5.51 15.004 4.6 13.805 4.6c-1.197 0-1.947.867-1.947.867-.4-.54-.949-.866-1.878-.866-.982 0-1.84.866-1.84.866-.4-.54-1.078-.866-1.64-.866-.87 0-1.56.4-1.982 1.41L3.274 9.082 1.677 5.14z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/keyframes.scss
index fd1d7a1877d85..70146e7c94970 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-volume-2 {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/placeholders.scss
index 80f997e07b373..5cf4f355393af 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-volume-2-icon {
   --icon-name: icon-volume-2;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/property-16.scss
index ffebfd22f4c3c..6e2b961eb10c6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-volume-2-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M13.242 2.184a.75.75 0 10-.984 1.132C13.709 4.578 14.5 6.266 14.5 8s-.79 3.422-2.242 4.684a.75.75 0 10.984 1.132C14.992 12.293 16 10.204 16 8c0-2.204-1.008-4.293-2.758-5.816z"/><path fill-rule="evenodd" d="M7.033 2.686A1.25 1.25 0 019 3.71v8.58a1.25 1.25 0 01-1.967 1.024L3.728 11H1.25C.56 11 0 10.44 0 9.75v-3.5C0 5.56.56 5 1.25 5h2.478l3.305-2.314zM7.5 4.19L4.524 6.274a1.25 1.25 0 01-.717.226H1.5v3h2.307c.256 0 .506.079.717.226L7.5 11.809V4.19z" clip-rule="evenodd"/><path d="M10.701 5.239a.75.75 0 011.06-.038A3.826 3.826 0 0113 8c0 1.06-.453 2.066-1.239 2.799A.75.75 0 1110.74 9.7c.494-.46.761-1.074.761-1.701s-.267-1.24-.761-1.701a.75.75 0 01-.038-1.06z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/property-24.scss
index 02175de2b1900..fac4ec64f8c8e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-2/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-volume-2-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M18.72 4.22a.75.75 0 011.06 0 11.009 11.009 0 010 15.56.75.75 0 11-1.06-1.06 9.51 9.51 0 000-13.44.75.75 0 010-1.06z"/><path fill-rule="evenodd" d="M9.046 4.804C10.162 3.748 12 4.538 12 6.074v11.851c0 1.536-1.838 2.327-2.954 1.27l-3.3-3.127A.25.25 0 005.574 16H2.75A1.75 1.75 0 011 14.25v-4.5C1 8.783 1.784 8 2.75 8h2.824a.25.25 0 00.172-.069l3.3-3.127zm1.454 1.27a.25.25 0 00-.422-.18l-3.3 3.126a1.75 1.75 0 01-1.204.48H2.75a.25.25 0 00-.25.25v4.5c0 .138.112.25.25.25h2.824c.448 0 .878.171 1.203.48l3.301 3.127a.25.25 0 00.422-.182V6.075z" clip-rule="evenodd"/><path d="M16.271 7.96a.75.75 0 10-1.042 1.08A4.118 4.118 0 0116.5 12c0 1.105-.454 2.17-1.271 2.96a.75.75 0 101.042 1.08A5.617 5.617 0 0018 12c0-1.52-.625-2.972-1.729-4.04z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/keyframes.scss
index 84e30b1bf1343..ffb73168ceb91 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-volume-down {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/placeholders.scss
index e360b57760153..1e1ebb3e6708b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-volume-down-icon {
   --icon-name: icon-volume-down;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/property-16.scss
index 9e92d8e4aa998..158b851b45f43 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-volume-down-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M9 3.71a1.25 1.25 0 00-1.967-1.024L3.728 5H1.25C.56 5 0 5.56 0 6.25v3.5C0 10.44.56 11 1.25 11h2.478l3.305 2.314A1.25 1.25 0 009 12.29V3.71zM4.524 6.274L7.5 4.19v7.62L4.524 9.725a1.25 1.25 0 00-.717-.226H1.5v-3h2.307c.256 0 .506-.079.717-.226z" clip-rule="evenodd"/><path d="M11.761 5.201A.75.75 0 0010.74 6.3c.494.46.761 1.074.761 1.701s-.267 1.24-.761 1.701A.75.75 0 1011.76 10.8 3.826 3.826 0 0013 8c0-1.06-.453-2.066-1.239-2.799z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/property-24.scss
index 4248c72b42dc3..2fa8d865c71f3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-down/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-volume-down-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M12 6.075c0-1.537-1.838-2.327-2.954-1.27l-3.3 3.126A.25.25 0 015.574 8H2.75A1.75 1.75 0 001 9.75v4.5c0 .966.784 1.75 1.75 1.75h2.824a.25.25 0 01.172.068l3.3 3.127c1.116 1.057 2.954.266 2.954-1.27V6.075zm-1.922-.182a.25.25 0 01.422.182v11.85a.25.25 0 01-.422.181l-3.3-3.127a1.75 1.75 0 00-1.204-.48H2.75a.25.25 0 01-.25-.25v-4.5a.25.25 0 01.25-.25h2.824a1.75 1.75 0 001.203-.479l3.301-3.127z" clip-rule="evenodd"/><path d="M16.271 7.96a.75.75 0 10-1.042 1.08A4.118 4.118 0 0116.5 12c0 1.105-.454 2.17-1.271 2.96a.75.75 0 101.042 1.08A5.617 5.617 0 0018 12c0-1.52-.625-2.972-1.729-4.04z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/keyframes.scss
index 011b90efcdb11..674003af9e423 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-volume-x {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/placeholders.scss
index 19ea59b8dba27..7d1760d076f74 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-volume-x-icon {
   --icon-name: icon-volume-x;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/property-16.scss
index bedf986761322..e74f8d41ffb8c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-volume-x-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path fill-rule="evenodd" d="M7.033 2.686A1.25 1.25 0 019 3.71v8.58a1.25 1.25 0 01-1.967 1.024L3.728 11H1.25C.56 11 0 10.44 0 9.75v-3.5C0 5.56.56 5 1.25 5h2.478l3.305-2.314zM7.5 4.19L4.524 6.274a1.25 1.25 0 01-.717.226H1.5v3h2.307c.256 0 .506.079.717.226L7.5 11.809V4.19z" clip-rule="evenodd"/><path d="M15.28 5.72a.75.75 0 010 1.06L14.06 8l1.22 1.22a.75.75 0 11-1.06 1.06L13 9.06l-1.22 1.22a.75.75 0 11-1.06-1.06L11.94 8l-1.22-1.22a.75.75 0 011.06-1.06L13 6.94l1.22-1.22a.75.75 0 011.06 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/property-24.scss
index c831cf2eccf41..8bfde557b1f7d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume-x/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-volume-x-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M9.046 4.804C10.162 3.748 12 4.538 12 6.074v11.851c0 1.536-1.838 2.327-2.954 1.27l-3.3-3.127A.25.25 0 005.574 16H2.75A1.75 1.75 0 011 14.25v-4.5C1 8.783 1.784 8 2.75 8h2.824a.25.25 0 00.172-.069l3.3-3.127zm1.454 1.27a.25.25 0 00-.422-.18l-3.3 3.126a1.75 1.75 0 01-1.204.48H2.75a.25.25 0 00-.25.25v4.5c0 .138.112.25.25.25h2.824c.448 0 .878.171 1.203.48l3.301 3.127a.25.25 0 00.422-.182V6.075z" clip-rule="evenodd"/><path d="M22.78 8.22a.75.75 0 010 1.06L20.06 12l2.72 2.72a.75.75 0 11-1.06 1.06L19 13.06l-2.72 2.72a.75.75 0 11-1.06-1.06L17.94 12l-2.72-2.72a.75.75 0 011.06-1.06L19 10.94l2.72-2.72a.75.75 0 011.06 0z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume/keyframes.scss
index d2516189e0e10..a0b5ff97d39d2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-volume {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume/placeholders.scss
index 98b1ac92611f7..707235c27ee34 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-volume-icon {
   --icon-name: icon-volume;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume/property-16.scss
index 906a420346ae1..53b82d6795ca5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-volume-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M7.5 4.19L4.524 6.274a1.25 1.25 0 01-.717.226H1.5v3h2.307c.256 0 .506.079.717.226L7.5 11.809V4.19zm-.467-1.504A1.25 1.25 0 019 3.71v8.58a1.25 1.25 0 01-1.967 1.024L3.728 11H1.25C.56 11 0 10.44 0 9.75v-3.5C0 5.56.56 5 1.25 5h2.478l3.305-2.314z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/volume/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/volume/property-24.scss
index f09d9f1da374c..ac4f6b735c415 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/volume/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/volume/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-volume-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M10.5 6.075a.25.25 0 00-.422-.182l-3.3 3.127a1.75 1.75 0 01-1.204.48H2.75a.25.25 0 00-.25.25v4.5c0 .138.112.25.25.25h2.824c.448 0 .878.171 1.203.48l3.301 3.127a.25.25 0 00.422-.182V6.075zm-1.454-1.27C10.162 3.747 12 4.537 12 6.074v11.85c0 1.536-1.838 2.327-2.954 1.27l-3.3-3.127A.25.25 0 005.574 16H2.75A1.75 1.75 0 011 14.25v-4.5C1 8.783 1.784 8 2.75 8h2.824a.25.25 0 00.172-.069l3.3-3.127z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wall/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wall/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wall/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wall/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wall/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wall/keyframes.scss
index f92ac586f3b65..39879c00bc3f4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wall/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wall/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-wall {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wall/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wall/placeholders.scss
index f6f38e086ddda..61e06021aab3a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wall/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wall/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-wall-icon {
   --icon-name: icon-wall;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wall/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wall/property-16.scss
index 079bc79f52500..032c5914ee785 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wall/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wall/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-wall-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M2.25 1A2.25 2.25 0 000 3.25v9.5A2.25 2.25 0 002.25 15h11.5A2.25 2.25 0 0016 12.75v-9.5A2.25 2.25 0 0013.75 1H2.25zM4.5 2.5H2.25a.75.75 0 00-.75.75V5h3V2.5zm-3 4v3H7v-3H1.5zm0 4.5v1.75c0 .414.336.75.75.75H4.5V11h-3zM6 13.5h4V11H6v2.5zm5.5 0h2.25a.75.75 0 00.75-.75V11h-3v2.5zm3-4v-3h-6v3h6zm0-4.5V3.25a.75.75 0 00-.75-.75H11.5V5h3zM10 2.5V5H6V2.5h4z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wall/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wall/property-24.scss
index d326d39121bd3..6801ea7552e5d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wall/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wall/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-wall-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M3.75 2A2.75 2.75 0 001 4.75v14.5A2.75 2.75 0 003.75 22h16.5A2.75 2.75 0 0023 19.25V4.75A2.75 2.75 0 0020.25 2H3.75zM6.5 3.5H3.75c-.69 0-1.25.56-1.25 1.25V8h4V3.5zm-4 6v5H11v-5H2.5zm0 6.5v3.25c0 .69.56 1.25 1.25 1.25H6.5V16h-4zM8 20.5h8V16H8v4.5zm9.5 0h2.75c.69 0 1.25-.56 1.25-1.25V16h-4v4.5zm4-6v-5h-9v5h9zm0-6.5V4.75c0-.69-.56-1.25-1.25-1.25H17.5V8h4zM16 3.5V8H8V3.5h8z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wand/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wand/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wand/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wand/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wand/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wand/keyframes.scss
index 3e10ff9a75708..5e5d87241dcff 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wand/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wand/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-wand {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wand/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wand/placeholders.scss
index 3e4c14cbc91c9..eea652dcc1b53 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wand/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wand/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-wand-icon {
   --icon-name: icon-wand;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wand/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wand/property-16.scss
index f57ecdd1c7e66..6725e8fa8ac09 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wand/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wand/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-wand-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.083.183a.5.5 0 00-.65.65l.393.981a.5.5 0 010 .371l-.393.982a.5.5 0 00.65.65l.981-.393a.5.5 0 01.372 0l.98.392a.5.5 0 00.65-.65l-.392-.98a.5.5 0 010-.372l.393-.981a.5.5 0 00-.65-.65l-.981.392a.5.5 0 01-.372 0l-.98-.392z"/><path fill-rule="evenodd" d="M11.414 4.104a2 2 0 00-2.828 0L.808 11.882a2 2 0 002.828 2.828l7.778-7.778a2 2 0 000-2.828zm-1.768 1.06a.5.5 0 11.707.707l-.883.884-.707-.707.883-.884zM7.702 7.11l.707.707-5.834 5.834a.5.5 0 11-.707-.707l5.834-5.834z" clip-rule="evenodd"/><path d="M10.572 11.21a.5.5 0 010-.92l1.219-.522a.5.5 0 00.263-.262l.522-1.22a.5.5 0 01.92 0l.521 1.22a.5.5 0 00.263.262l1.219.522a.5.5 0 010 .92l-1.219.522a.5.5 0 00-.263.263l-.522 1.218a.5.5 0 01-.919 0l-.522-1.218a.5.5 0 00-.263-.263l-1.219-.522zM12.833.183a.5.5 0 00-.65.65l.293.731a.5.5 0 010 .371l-.293.732a.5.5 0 00.65.65l.731-.293a.5.5 0 01.372 0l.73.292a.5.5 0 00.65-.65l-.292-.73a.5.5 0 010-.372l.293-.731a.5.5 0 00-.65-.65l-.731.292a.5.5 0 01-.372 0l-.73-.292z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wand/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wand/property-24.scss
index 48acce94a99d4..86037b14f9e67 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wand/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wand/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-wand-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M18.875 1.15a.75.75 0 00-.975.975l.289.721a.75.75 0 010 .557l-.29.722a.75.75 0 00.976.975l.721-.289a.75.75 0 01.558 0l.721.289a.75.75 0 00.975-.975l-.289-.722a.75.75 0 010-.557l.29-.721a.75.75 0 00-.976-.975l-.721.288a.75.75 0 01-.558 0l-.721-.288zM7.125 1.15a.75.75 0 00-.975.975l.439 1.096a.75.75 0 010 .557l-.44 1.097a.75.75 0 00.976.975l1.096-.439a.75.75 0 01.558 0l1.096.439a.75.75 0 00.975-.975l-.439-1.097a.75.75 0 010-.557l.44-1.096a.75.75 0 00-.976-.975l-1.096.438a.75.75 0 01-.558 0L7.125 1.15z"/><path fill-rule="evenodd" d="M17.017 6.707a2.5 2.5 0 00-3.535 0L2.168 18.021a2.5 2.5 0 003.536 3.535l11.313-11.313a2.5 2.5 0 000-3.536zm-2.474 1.06a1 1 0 011.414 1.415l-1.591 1.591-1.414-1.414 1.59-1.591zM11.89 10.42l1.414 1.415-8.662 8.662a1 1 0 01-1.414-1.414l8.662-8.663z" clip-rule="evenodd"/><path d="M16.108 16.69a.75.75 0 010-1.38l1.334-.57a.75.75 0 00.393-.395l.572-1.333a.75.75 0 011.378 0l.572 1.333a.75.75 0 00.394.394l1.333.572a.75.75 0 010 1.378l-1.333.572a.75.75 0 00-.394.394l-.572 1.333a.75.75 0 01-1.378 0l-.572-1.333a.75.75 0 00-.393-.394l-1.334-.572z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/watch/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/watch/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/watch/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/watch/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/watch/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/watch/keyframes.scss
index 3c9eb0cba0f4d..c8c50873921cd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/watch/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/watch/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-watch {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/watch/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/watch/placeholders.scss
index 6bd02b2d3a33b..f9f435171ee79 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/watch/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/watch/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-watch-icon {
   --icon-name: icon-watch;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/watch/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/watch/property-16.scss
index 9f7fab4c3dc64..a2a4c4ffeb9d6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/watch/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/watch/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-watch-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M9 6.25a.75.75 0 00-1.5 0V8.5c0 .323.207.61.513.712l1.5.5a.75.75 0 10.474-1.424L9 7.96V6.25z"/><path fill-rule="evenodd" d="M4.574 1.932A2.25 2.25 0 016.8 0h2.398c1.12 0 2.07.823 2.227 1.932l.288 2.011A5.485 5.485 0 0113.5 8a5.485 5.485 0 01-1.786 4.057l-.288 2.011A2.25 2.25 0 019.2 16H6.801a2.25 2.25 0 01-2.227-1.932l-.288-2.011A5.485 5.485 0 012.5 8c0-1.606.688-3.051 1.786-4.057l.288-2.011zM5.95 13.106l.107.75a.75.75 0 00.743.644h2.398a.75.75 0 00.742-.644l.108-.75A5.485 5.485 0 018 13.5c-.724 0-1.416-.14-2.049-.394zm3.99-10.962l.108.75A5.485 5.485 0 008 2.5c-.724 0-1.416.14-2.049.394l.107-.75a.75.75 0 01.743-.644h2.398a.75.75 0 01.742.644zM4 8a4 4 0 118 0 4 4 0 01-8 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/watch/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/watch/property-24.scss
index da63eb64d92cf..78b49c50654e0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/watch/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/watch/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-watch-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M12.5 8.25a.75.75 0 00-1.5 0v4.25c0 .284.16.544.415.67l2.5 1.25a.75.75 0 10.67-1.34L12.5 12.036V8.25z"/><path fill-rule="evenodd" d="M7.464 2.258A2.75 2.75 0 0110.169 0h3.662a2.75 2.75 0 012.706 2.258l.666 3.665A7.982 7.982 0 0120 12a7.982 7.982 0 01-2.797 6.077l-.666 3.665A2.75 2.75 0 0113.83 24h-3.662a2.75 2.75 0 01-2.705-2.258l-.667-3.665A7.982 7.982 0 014 12a7.982 7.982 0 012.797-6.077l.667-3.665zM8.528 19.21l.411 2.265a1.25 1.25 0 001.23 1.026h3.662a1.25 1.25 0 001.23-1.026l.411-2.265A7.968 7.968 0 0112 20a7.97 7.97 0 01-3.472-.79zM15.06 2.526l.411 2.265A7.968 7.968 0 0012 4a7.968 7.968 0 00-3.472.79l.411-2.264A1.25 1.25 0 0110.17 1.5h3.662a1.25 1.25 0 011.23 1.026zM5.5 12a6.5 6.5 0 1113 0 6.5 6.5 0 01-13 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/keyframes.scss
index a731fa1f074e3..6638f0e88fa58 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-waypoint-color {
   100% {
     background-image: var(--icon-waypoint-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/placeholders.scss
index 50e27ad6e6743..0a61c4981a8a6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-waypoint-color-icon {
   --icon-name: icon-waypoint-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/property-16.scss
index c4ec749b978be..c9ac6d56006da 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-waypoint-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%2314C6CB"><path d="M16 3l-1.998 3.463L12.004 3H16zM5.334 5.312H4l3.332 5.777L6 13.4 0 3h6.667L10 8.778l.666-1.155L8 3h2.666L12 5.312l1.334 2.31L10 13.4 5.334 5.312z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/property-24.scss
index c7d7af6c0be0b..2285f7ac2d4dd 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-waypoint-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%2314C6CB"><path d="M24 5l-2.997 5.194L18.006 5H24zM8 8.468H6l5 8.666L9 20.6 0 5h10l5 8.667 1-1.733L12 5h4l2 3.468 2 3.466-5 8.666L8 8.468z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/index.scss
index 34b53ee6da1a6..97f66579659b8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../waypoint-color/property-16';
         @import '../waypoint-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/keyframes.scss
index 6a93e273b3dfb..b0ddf3d3d6eb6 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-waypoint {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/placeholders.scss
index 2ca77b7391b5a..3bac39e376ab0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-waypoint-icon {
   --icon-name: icon-waypoint;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/property-16.scss
index 676b66188a92e..d6f2df66bb86d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-waypoint-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4 5.312h1.334L10 13.4l3.334-5.777L10.666 3H8l2.666 4.623L10 8.778 6.667 3H0l6 10.4 1.333-2.31L4 5.311zM14.002 6.463L16 3h-3.996l1.998 3.463z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/property-24.scss
index d85370042956b..9e7237eb4a48a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/waypoint/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-waypoint-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4 5.312h1.334L10 13.4l3.334-5.777L10.666 3H8l2.666 4.623L10 8.778 6.667 3H0l6 10.4 1.333-2.31L4 5.311zM14.002 6.463L16 3h-3.996l1.998 3.463z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/keyframes.scss
index 85f3ebedec43c..d625ee533d716 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-webhook {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/placeholders.scss
index 4467374cbbe0c..e6ed95ed82a71 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-webhook-icon {
   --icon-name: icon-webhook;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/property-16.scss
index 4994d8688bafd..ae87ce0eca287 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-webhook-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M6.032 4.132c0-1.039.843-1.882 1.886-1.882.709 0 1.328.39 1.65.97a.75.75 0 101.311-.728A3.385 3.385 0 007.918.75a3.383 3.383 0 00-3.386 3.382c0 .94.385 1.79 1.003 2.402l-2.054 3.594a1.25 1.25 0 00.151 2.49h.007a1.25 1.25 0 001.146-1.75l2.369-4.144a.75.75 0 00-.249-1.005 1.879 1.879 0 01-.873-1.587z"/><path d="M7.793 5.375a1.25 1.25 0 01.125-2.494h.006a1.25 1.25 0 011.157 1.725l2.159 3.572a3.383 3.383 0 014.51 3.19 3.383 3.383 0 01-4.23 3.275.75.75 0 11.373-1.452 1.883 1.883 0 002.357-1.822 1.883 1.883 0 00-2.897-1.588.75.75 0 01-1.045-.245l-2.515-4.16z"/><path d="M2.002 10.429a.75.75 0 00-1.298-.752 3.383 3.383 0 002.932 5.073c1.61 0 2.96-1.124 3.301-2.632h4.42c.229.304.592.5 1.001.5h.007a1.25 1.25 0 000-2.5h-.007c-.409 0-.772.197-1 .5H6.271a.75.75 0 00-.75.75 1.883 1.883 0 01-1.886 1.882 1.883 1.883 0 01-1.633-2.821z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/property-24.scss
index 54604d759e9f5..81be6a26e6ca4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/webhook/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-webhook-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M8.75 6a3.25 3.25 0 016.094-1.574.75.75 0 101.312-.728 4.75 4.75 0 10-7.307 5.856l-3.485 5.477A2.013 2.013 0 005.01 15H5a2 2 0 100 4h.01a2 2 0 001.623-3.17l3.852-6.052a.75.75 0 00-.23-1.035A3.247 3.247 0 018.75 6z"/><path d="M12.364 7.969c-.115.02-.233.031-.354.031H12a2 2 0 110-4h.01a2 2 0 011.623 3.17l3.481 5.47a4.75 4.75 0 11.7 8.96.75.75 0 11.373-1.452 3.25 3.25 0 10-.931-5.89.75.75 0 01-1.037-.23l-3.855-6.06z"/><path d="M2.184 15.376a.75.75 0 10-1.298-.752A4.75 4.75 0 109.69 17.75h7.454A2 2 0 0019 19h.01a2 2 0 100-4H19a2 2 0 00-1.855 1.25H9a.75.75 0 00-.75.75 3.25 3.25 0 11-6.066-1.624z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/keyframes.scss
index d704759dabc1c..c9eea74efc88b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-wifi-off {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/placeholders.scss
index 772825b2e3510..0b925eb698398 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-wifi-off-icon {
   --icon-name: icon-wifi-off;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/property-16.scss
index 1879beb27469b..d5ddf1729d84a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-wifi-off-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.22 1.22a.75.75 0 011.06 0l12.5 12.5a.75.75 0 11-1.06 1.06l-3.558-3.557a.749.749 0 01-.276-.122 3.25 3.25 0 00-3.765 0 .75.75 0 01-.869-1.223A4.75 4.75 0 017.94 9L6.198 7.26c-.867.25-1.68.68-2.385 1.266a.75.75 0 01-.96-1.153A8.083 8.083 0 015.02 6.08L3.513 4.573a9.914 9.914 0 00-2.07 1.405.75.75 0 11-.992-1.126c.605-.533 1.26-.997 1.954-1.387L1.22 2.28a.75.75 0 010-1.06zM8 3.5c-.42 0-.837.027-1.25.08a.75.75 0 11-.19-1.489 11.418 11.418 0 018.99 2.761.75.75 0 01-.993 1.126A9.917 9.917 0 008 3.5zM9.794 6.427a.75.75 0 01.959-.453A8.083 8.083 0 0113.2 7.372a.75.75 0 11-.96 1.153 6.583 6.583 0 00-1.993-1.14.75.75 0 01-.453-.958z"/><path d="M8 12a1 1 0 100 2h.007a1 1 0 100-2H8z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/property-24.scss
index 690824abdc823..ad033825ae696 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi-off/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-wifi-off-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M1.22 1.22a.75.75 0 011.06 0l20.5 20.5a.75.75 0 11-1.06 1.06l-6.175-6.174a.747.747 0 01-.5-.136 5.25 5.25 0 00-6.08 0 .75.75 0 01-.87-1.223 6.75 6.75 0 014.92-1.171l-3.307-3.307a10.249 10.249 0 00-4.228 2.105.75.75 0 01-.96-1.152A11.749 11.749 0 018.49 9.55L5.77 6.83a15.247 15.247 0 00-3.854 2.48.75.75 0 11-.992-1.125 16.746 16.746 0 013.718-2.482L1.22 2.28a.75.75 0 010-1.06zM12 5.5c-.72 0-1.436.051-2.142.151a.75.75 0 01-.21-1.485 16.75 16.75 0 0113.428 4.019.75.75 0 01-.992 1.125A15.25 15.25 0 0012 5.5zM14.278 9.954a.75.75 0 01.924-.52 11.75 11.75 0 014.358 2.288.75.75 0 01-.96 1.152 10.248 10.248 0 00-3.802-1.996.75.75 0 01-.52-.924zM12 19a1 1 0 100 2h.01a1 1 0 100-2H12z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/keyframes.scss
index aaa9e215dc239..400648d031b42 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-wifi {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/placeholders.scss
index 4679089a0e093..b5a48b1506555 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-wifi-icon {
   --icon-name: icon-wifi;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/property-16.scss
index 7367f5d4106f8..9482bb5c634d4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-wifi-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M1.443 5.978a9.917 9.917 0 0113.114 0 .75.75 0 00.992-1.126 11.417 11.417 0 00-15.098 0 .75.75 0 10.992 1.126z"/><path d="M3.813 8.525a6.583 6.583 0 018.427 0 .75.75 0 00.96-1.153 8.083 8.083 0 00-10.347 0 .75.75 0 00.96 1.153z"/><path d="M8.003 10.5a3.25 3.25 0 00-1.882.6.75.75 0 01-.869-1.222 4.75 4.75 0 015.502 0 .75.75 0 11-.868 1.223 3.25 3.25 0 00-1.883-.601zM8 12a1 1 0 100 2h.007a1 1 0 100-2H8z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/property-24.scss
index 9da4b7ec85c81..33f8c830f1384 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wifi/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-wifi-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M1.916 9.31a15.25 15.25 0 0120.168 0 .75.75 0 00.992-1.125 16.75 16.75 0 00-22.152 0 .75.75 0 10.992 1.125z"/><path d="M5.48 12.874a10.25 10.25 0 0113.12 0 .75.75 0 00.96-1.152 11.75 11.75 0 00-15.04 0 .75.75 0 00.96 1.152zM12.005 15.5a5.25 5.25 0 00-3.04.97.75.75 0 01-.87-1.223 6.75 6.75 0 017.82 0 .75.75 0 11-.87 1.223 5.25 5.25 0 00-3.04-.97zM12 19a1 1 0 100 2h.01a1 1 0 100-2H12z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/keyframes.scss
index 943ca2b4cb68d..2b004a290b6b7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-wrench {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/placeholders.scss
index 1802b73367335..fa592ba12fe0a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-wrench-icon {
   --icon-name: icon-wrench;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/property-16.scss
index 8983fcf5b2055..4567c44d4724e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-wrench-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M10.973 1.506a18.525 18.525 0 00-.497-.006A4.024 4.024 0 006.45 5.524c0 .43.095.865.199 1.205.054.18.116.356.192.527v.002a.75.75 0 01-.15.848l-4.937 4.911a.871.871 0 000 1.229.869.869 0 001.227 0L7.896 9.31a.75.75 0 01.847-.151c.17.079.35.139.529.193.34.103.774.198 1.204.198A4.024 4.024 0 0014.5 5.524c0-.177-.002-.338-.006-.483-.208.25-.438.517-.675.774-.32.345-.677.696-1.048.964-.354.257-.82.512-1.339.512-.396 0-.776-.156-1.059-.433L9.142 5.627a1.513 1.513 0 01-.432-1.06c0-.52.256-.985.514-1.34.27-.37.623-.727.97-1.046.258-.237.529-.466.78-.675zm-2.36 9.209l-4.57 4.59a2.37 2.37 0 01-3.35-3.348l.002-.001 4.591-4.568a6.887 6.887 0 01-.072-.223 5.77 5.77 0 01-.263-1.64A5.524 5.524 0 0110.476 0 12 12 0 0112 .076c.331.044.64.115.873.264a.92.92 0 01.374.45.843.843 0 01-.013.625.922.922 0 01-.241.332c-.26.257-.547.487-.829.72-.315.26-.647.535-.957.82a5.947 5.947 0 00-.771.824c-.197.27-.227.415-.227.457 0 .003 0 .006.003.008l1.211 1.211a.013.013 0 00.008.004c.043 0 .19-.032.46-.227.253-.183.532-.45.826-.767.284-.308.56-.638.82-.95.233-.28.463-.565.72-.823a.925.925 0 01.31-.235.841.841 0 01.628-.033.911.911 0 01.467.376c.15.233.22.543.262.87.047.356.075.847.075 1.522a5.524 5.524 0 01-5.524 5.525c-.631 0-1.221-.136-1.64-.263a6.969 6.969 0 01-.222-.071z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/property-24.scss
index a95e7a08fe1a9..0dd4a8ef18ec0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/wrench/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-wrench-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M15.5 2.5a6 6 0 00-6 6c0 .65.143 1.296.294 1.794a7.667 7.667 0 00.285.78l.003.007a.75.75 0 01-.15.85L2.95 18.873A1.54 1.54 0 004.038 21.5c.408 0 .799-.162 1.087-.45l6.948-6.98a.75.75 0 01.848-.15l.008.003.037.016.156.065c.139.054.34.129.586.203.497.15 1.143.293 1.792.293a6 6 0 006-6c0-.635-.018-1.122-.047-1.492l-.207.248-.034.04c-.362.435-.778.934-1.213 1.404-.446.483-.935.96-1.436 1.323-.483.35-1.075.664-1.71.664-.479 0-.939-.188-1.28-.523l-.006-.005-1.73-1.732a1.829 1.829 0 01-.524-1.28c0-.637.317-1.229.669-1.711.364-.5.844-.989 1.33-1.434.473-.434.975-.85 1.412-1.212l.04-.032.251-.209c-.373-.03-.867-.049-1.515-.049zm3.348.432a.982.982 0 00.266-.363c.07-.165.11-.4.015-.653a.991.991 0 00-.405-.485c-.27-.172-.648-.265-1.108-.327C17.129 1.04 16.449 1 15.5 1A7.5 7.5 0 008 8.5c0 .85.183 1.653.358 2.23.056.184.112.348.163.487L1.89 17.814a3.038 3.038 0 004.297 4.296l6.6-6.63c.138.05.301.107.485.162.576.175 1.377.358 2.228.358A7.5 7.5 0 0023 8.5c0-.948-.039-1.627-.103-2.111-.06-.456-.152-.835-.324-1.104a.978.978 0 00-.5-.406.879.879 0 00-.658.035.989.989 0 00-.34.262c-.287.287-.63.7-.98 1.119l-.026.03c-.368.442-.763.915-1.171 1.357-.42.454-.832.849-1.214 1.125-.399.29-.672.38-.831.38a.329.329 0 01-.228-.092l-1.72-1.72a.328.328 0 01-.091-.228c0-.157.09-.43.38-.828.278-.382.675-.792 1.132-1.212.444-.408.92-.802 1.365-1.17l.029-.023c.423-.35.84-.695 1.128-.982z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/keyframes.scss
index b188cddf010c7..a56ef3a482ba9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-x-circle-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/placeholders.scss
index 354b81252819f..1f84b9a46b4ba 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-x-circle-fill-icon {
   --icon-name: icon-x-circle-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/property-16.scss
index 1ff7e9177dcac..92d29c931a74b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-circle-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M8 .25a7.75 7.75 0 100 15.5A7.75 7.75 0 008 .25zm2.72 3.97a.75.75 0 111.06 1.06L9.06 8l2.72 2.72a.75.75 0 11-1.06 1.06L8 9.06l-2.72 2.72a.75.75 0 01-1.06-1.06L6.94 8 4.22 5.28a.75.75 0 011.06-1.06L8 6.94l2.72-2.72z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/property-24.scss
index 03d635c53e7aa..92b24143b9dd7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-circle-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M12 1.25C6.063 1.25 1.25 6.063 1.25 12S6.063 22.75 12 22.75 22.75 17.937 22.75 12 17.937 1.25 12 1.25zM7.22 7.22a.75.75 0 011.06 0L12 10.94l3.72-3.72a.75.75 0 111.06 1.06L13.06 12l3.72 3.72a.75.75 0 11-1.06 1.06L12 13.06l-3.72 3.72a.75.75 0 01-1.06-1.06L10.94 12 7.22 8.28a.75.75 0 010-1.06z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/keyframes.scss
index 855ebcf8deaaf..2ba398eb083fa 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-x-circle {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/placeholders.scss
index f2e12e620dc58..ea55e0746d267 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-x-circle-icon {
   --icon-name: icon-x-circle;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/property-16.scss
index 83066351ac86c..69c03221f55c3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-circle-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M11.28 4.72a.75.75 0 010 1.06L9.06 8l2.22 2.22a.75.75 0 11-1.06 1.06L8 9.06l-2.22 2.22a.75.75 0 01-1.06-1.06L6.94 8 4.72 5.78a.75.75 0 011.06-1.06L8 6.94l2.22-2.22a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M.25 8a7.75 7.75 0 1115.5 0A7.75 7.75 0 01.25 8zM8 1.75a6.25 6.25 0 100 12.5 6.25 6.25 0 000-12.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/property-24.scss
index e9c138b7603d9..eb51608e00951 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-circle/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-circle-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M16.78 7.22a.75.75 0 010 1.06L13.06 12l3.72 3.72a.75.75 0 11-1.06 1.06L12 13.06l-3.72 3.72a.75.75 0 01-1.06-1.06L10.94 12 7.22 8.28a.75.75 0 011.06-1.06L12 10.94l3.72-3.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M1.25 12C1.25 6.063 6.063 1.25 12 1.25S22.75 6.063 22.75 12 17.937 22.75 12 22.75 1.25 17.937 1.25 12zM12 2.75a9.25 9.25 0 100 18.5 9.25 9.25 0 000-18.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/keyframes.scss
index f58bed0909ede..ff70e36abfa30 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-x-diamond-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/placeholders.scss
index d3117ad9f1580..d5a7cc57baf4b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-x-diamond-fill-icon {
   --icon-name: icon-x-diamond-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/property-16.scss
index cac0e04c53abb..9086d8d653bda 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-diamond-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M9.57.752a2.25 2.25 0 00-3.183 0L.73 6.41a2.25 2.25 0 000 3.182l5.657 5.657a2.25 2.25 0 003.182 0l5.657-5.657a2.25 2.25 0 000-3.182L9.569.752zM5.22 5.22a.75.75 0 011.06 0L8 6.94l1.72-1.72a.75.75 0 111.06 1.06L9.06 8l1.72 1.72a.75.75 0 11-1.06 1.06L8 9.06l-1.72 1.72a.75.75 0 11-1.06-1.06L6.94 8 5.22 6.28a.75.75 0 010-1.06z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/property-24.scss
index 782517eadcb32..fbe7e9dd8b1c1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-diamond-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M13.944 1.884a2.75 2.75 0 00-3.889 0l-8.171 8.172a2.75 2.75 0 000 3.889l8.171 8.171a2.75 2.75 0 003.89 0l8.171-8.171a2.75 2.75 0 000-3.89l-8.171-8.17zM8.22 8.22a.75.75 0 011.06 0L12 10.94l2.72-2.72a.75.75 0 011.06 1.06L13.06 12l2.72 2.72a.75.75 0 01-1.06 1.06L12 13.06l-2.72 2.72a.75.75 0 11-1.06-1.06L10.94 12 8.22 9.28a.75.75 0 010-1.06z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/keyframes.scss
index 444074c37f227..7a9a3f99be6e4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-x-diamond {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/placeholders.scss
index 8d2de2b540d9e..d88fd9b87cec4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-x-diamond-icon {
   --icon-name: icon-x-diamond;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/property-16.scss
index 9f9df096ebf23..3f4ce0f477c8e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-diamond-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M10.78 5.22a.75.75 0 010 1.06L9.06 8l1.72 1.72a.75.75 0 01-1.06 1.06L8 9.06l-1.72 1.72a.75.75 0 11-1.06-1.06L6.94 8 5.22 6.28a.75.75 0 011.06-1.06L8 6.94l1.72-1.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M.75 6.41L6.407.753a2.25 2.25 0 013.182 0l5.657 5.657a2.25 2.25 0 010 3.182l-5.657 5.656a2.25 2.25 0 01-3.182 0L.75 9.592a2.25 2.25 0 010-3.182zm6.718-4.597L1.81 7.47a.75.75 0 000 1.06l5.657 5.658a.75.75 0 001.06 0l5.657-5.657a.75.75 0 000-1.06L8.53 1.812a.75.75 0 00-1.061 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/property-24.scss
index 0af6196bfe3f5..ccdf99a6b764c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-diamond/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-diamond-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M15.78 8.22a.75.75 0 010 1.06L13.06 12l2.72 2.72a.75.75 0 11-1.06 1.06L12 13.06l-2.72 2.72a.75.75 0 01-1.06-1.06L10.94 12 8.22 9.28a.75.75 0 111.06-1.06L12 10.94l2.72-2.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M1.884 10.056l8.171-8.172a2.75 2.75 0 013.89 0l8.171 8.172a2.75 2.75 0 010 3.889l-8.171 8.171a2.75 2.75 0 01-3.89 0l-8.171-8.171a2.75 2.75 0 010-3.89zm9.232-7.111l-8.172 8.171a1.25 1.25 0 000 1.768l8.172 8.172a1.25 1.25 0 001.768 0l8.171-8.172a1.25 1.25 0 000-1.768l-8.171-8.171a1.25 1.25 0 00-1.768 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/keyframes.scss
index db1fd08c3de5a..3a33dd94266e2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-x-hexagon-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/placeholders.scss
index 57cb2cb11502e..8c6b16133ee9a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-x-hexagon-fill-icon {
   --icon-name: icon-x-hexagon-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/property-16.scss
index d24dcd290dcd6..a02a46836dc94 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-hexagon-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M9.166.33a2.25 2.25 0 00-2.332 0l-5.25 3.182A2.25 2.25 0 00.5 5.436v5.128a2.25 2.25 0 001.084 1.924l5.25 3.182a2.25 2.25 0 002.332 0l5.25-3.182a2.25 2.25 0 001.084-1.924V5.436a2.25 2.25 0 00-1.084-1.924L9.166.33zM5.22 5.22a.75.75 0 011.06 0L8 6.94l1.72-1.72a.75.75 0 111.06 1.06L9.06 8l1.72 1.72a.75.75 0 11-1.06 1.06L8 9.06l-1.72 1.72a.75.75 0 11-1.06-1.06L6.94 8 5.22 6.28a.75.75 0 010-1.06z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/property-24.scss
index 0e77178056acf..2b008114f48e1 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-hexagon-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M13.441 1.006a2.75 2.75 0 00-2.882 0l-7.75 4.77A2.75 2.75 0 001.5 8.116v7.765a2.75 2.75 0 001.309 2.342l7.75 4.77a2.75 2.75 0 002.882 0l7.75-4.77a2.75 2.75 0 001.309-2.342V8.117a2.75 2.75 0 00-1.309-2.342l-7.75-4.769zM14.72 8.22a.75.75 0 111.06 1.061L13.06 12l2.72 2.72a.75.75 0 01-1.06 1.06L12 13.06l-2.72 2.72a.75.75 0 11-1.06-1.06L10.94 12 8.22 9.28a.75.75 0 011.06-1.06L12 10.94l2.72-2.72z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/keyframes.scss
index d21a8ee93400e..ff82cfa7bfd16 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-x-hexagon {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/placeholders.scss
index f770aefddee15..b075ce0ae9ef2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-x-hexagon-icon {
   --icon-name: icon-x-hexagon;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/property-16.scss
index 83b1671fb15b8..0c415ee78670f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-hexagon-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M10.78 5.22a.75.75 0 010 1.06L9.06 8l1.72 1.72a.75.75 0 11-1.06 1.06L8 9.06l-1.72 1.72a.75.75 0 11-1.06-1.06L6.94 8 5.22 6.28a.75.75 0 011.06-1.06L8 6.94l1.72-1.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M6.834.33a2.25 2.25 0 012.332 0l5.25 3.182A2.25 2.25 0 0115.5 5.436v5.128a2.25 2.25 0 01-1.084 1.924l-5.25 3.182a2.25 2.25 0 01-2.332 0l-5.25-3.182A2.25 2.25 0 01.5 10.564V5.436a2.25 2.25 0 011.084-1.924L6.834.33zm1.555 1.283a.75.75 0 00-.778 0l-5.25 3.181A.75.75 0 002 5.436v5.128a.75.75 0 00.361.642l5.25 3.181a.75.75 0 00.778 0l5.25-3.181a.75.75 0 00.361-.642V5.436a.75.75 0 00-.361-.642l-5.25-3.181z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/property-24.scss
index 702b0d6ebeaa7..34e4679f81356 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-hexagon/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-hexagon-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M15.78 8.22a.75.75 0 010 1.06L13.06 12l2.72 2.72a.75.75 0 11-1.06 1.06L12 13.06l-2.72 2.72a.75.75 0 01-1.06-1.06L10.94 12 8.22 9.28a.75.75 0 011.06-1.06L12 10.94l2.72-2.72a.75.75 0 011.06 0z"/><path fill-rule="evenodd" d="M10.559 1.006a2.75 2.75 0 012.882 0l7.75 4.77A2.75 2.75 0 0122.5 8.116v7.765a2.75 2.75 0 01-1.309 2.342l-7.75 4.77a2.75 2.75 0 01-2.882 0l-7.75-4.77A2.75 2.75 0 011.5 15.882V8.117a2.75 2.75 0 011.309-2.342l7.75-4.769zm2.096 1.278a1.25 1.25 0 00-1.31 0l-7.75 4.769A1.25 1.25 0 003 8.117v7.765c0 .434.225.837.595 1.065l7.75 4.769a1.25 1.25 0 001.31 0l7.75-4.77c.37-.227.595-.63.595-1.064V8.117a1.25 1.25 0 00-.595-1.064l-7.75-4.77z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/keyframes.scss
index 435414882fa18..f45e5c11994a0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-x-square-fill {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/placeholders.scss
index 205cb360c2ca2..155a1a8312fb8 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-x-square-fill-icon {
   --icon-name: icon-x-square-fill;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/property-16.scss
index 9c08ba70d751b..71fe3881d12b9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-square-fill-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M1 3.139C1 1.958 1.958 1 3.139 1h9.722C14.042 1 15 1.958 15 3.139v9.722A2.139 2.139 0 0112.861 15H3.14A2.139 2.139 0 011 12.861V3.14zm4.28 1.08A.75.75 0 004.22 5.28L6.94 8l-2.72 2.72a.75.75 0 101.06 1.06L8 9.06l2.72 2.72a.75.75 0 101.06-1.06L9.06 8l2.72-2.72a.75.75 0 00-1.06-1.06L8 6.94 5.28 4.22z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/property-24.scss
index 30a1056e78ad0..e279508891b96 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square-fill/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-square-fill-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M2 4.806A2.806 2.806 0 014.806 2h14.388A2.806 2.806 0 0122 4.806v14.388A2.806 2.806 0 0119.194 22H4.806A2.806 2.806 0 012 19.194V4.806zM8.28 7.22a.75.75 0 00-1.06 1.06L10.94 12l-3.72 3.72a.75.75 0 101.06 1.06L12 13.06l3.72 3.72a.75.75 0 101.06-1.06L13.06 12l3.72-3.72a.75.75 0 00-1.06-1.06L12 10.94 8.28 7.22z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/keyframes.scss
index a7c16b0d4d24e..56cbf6b617e8c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-x-square {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/placeholders.scss
index b9e78d224c4b8..7c371dac64531 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-x-square-icon {
   --icon-name: icon-x-square;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/property-16.scss
index 3957e075a3620..008fed1f35991 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-square-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M3.139 2.5a.639.639 0 00-.639.639v9.722c0 .353.286.639.639.639h9.722a.639.639 0 00.639-.639V3.14a.639.639 0 00-.639-.639H3.14zM1 3.139C1 1.958 1.958 1 3.139 1h9.722C14.042 1 15 1.958 15 3.139v9.722A2.139 2.139 0 0112.861 15H3.14A2.139 2.139 0 011 12.861V3.14zm3.72 1.58a.75.75 0 011.06 0L8 6.94l2.22-2.22a.75.75 0 111.06 1.061L9.06 8l2.22 2.22a.75.75 0 11-1.06 1.06L8 9.06l-2.22 2.22a.75.75 0 01-1.06-1.06L6.94 8 4.72 5.78a.75.75 0 010-1.06z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/property-24.scss
index ad1ab859b50c0..b5e6c0b54d183 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x-square/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-square-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M4.806 3.5c-.721 0-1.306.585-1.306 1.306v14.388c0 .722.585 1.306 1.306 1.306h14.388c.722 0 1.306-.584 1.306-1.306V4.806c0-.721-.584-1.306-1.306-1.306H4.806zM2 4.806A2.806 2.806 0 014.806 2h14.388A2.806 2.806 0 0122 4.806v14.388A2.806 2.806 0 0119.194 22H4.806A2.806 2.806 0 012 19.194V4.806zM7.22 7.22a.75.75 0 011.06 0L12 10.94l3.72-3.72a.75.75 0 111.06 1.06L13.06 12l3.72 3.72a.75.75 0 11-1.06 1.06L12 13.06l-3.72 3.72a.75.75 0 01-1.06-1.06L10.94 12 7.22 8.28a.75.75 0 010-1.06z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x/keyframes.scss
index 5f8be89485bcb..c4ceea4436b6b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-x {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x/placeholders.scss
index 68bf5b15e1121..9c76ad4e7fa55 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-x-icon {
   --icon-name: icon-x;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x/property-16.scss
index 87ba4f65f156e..501b97619fdd9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" d="M12.78 4.28a.75.75 0 00-1.06-1.06L8 6.94 4.28 3.22a.75.75 0 00-1.06 1.06L6.94 8l-3.72 3.72a.75.75 0 101.06 1.06L8 9.06l3.72 3.72a.75.75 0 101.06-1.06L9.06 8l3.72-3.72z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/x/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/x/property-24.scss
index d4fc1bd48e02e..7c8b44df85423 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/x/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/x/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-x-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" d="M18.78 6.28a.75.75 0 00-1.06-1.06L12 10.94 6.28 5.22a.75.75 0 00-1.06 1.06L10.94 12l-5.72 5.72a.75.75 0 101.06 1.06L12 13.06l5.72 5.72a.75.75 0 101.06-1.06L13.06 12l5.72-5.72z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/keyframes.scss
index 5d4ce4e9160af..b51e455c59699 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-youtube-color {
   100% {
     background-image: var(--icon-youtube-color-16);
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/placeholders.scss
index c0e7c80c2e2d6..7c8085dab9ad4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-youtube-color-icon {
   --icon-name: icon-youtube-color;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/property-16.scss
index a3738fc3665a6..6e31fc712add0 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-youtube-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="red" d="M14.712 4.633a1.754 1.754 0 00-1.234-1.234C12.382 3.11 8 3.11 8 3.11s-4.382 0-5.478.289c-.6.161-1.072.634-1.234 1.234C1 5.728 1 8 1 8s0 2.283.288 3.367c.162.6.635 1.073 1.234 1.234C3.618 12.89 8 12.89 8 12.89s4.382 0 5.478-.289a1.754 1.754 0 001.234-1.234C15 10.272 15 8 15 8s0-2.272-.288-3.367z"/><path fill="%23fff" d="M6.593 10.11l3.644-2.098-3.644-2.11v4.208z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/property-24.scss
index 167f2239acc79..fc6e76a7be54d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube-color/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-youtube-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="red" d="M22.547 6.708a2.757 2.757 0 00-1.94-1.939C18.888 4.316 12 4.316 12 4.316s-6.886 0-8.608.453a2.756 2.756 0 00-1.939 1.94C1 8.43 1 12 1 12s0 3.588.453 5.292a2.756 2.756 0 001.94 1.939c1.72.453 8.607.453 8.607.453s6.886 0 8.608-.453a2.757 2.757 0 001.939-1.94C23 15.57 23 12 23 12s0-3.57-.453-5.292z"/><path fill="%23fff" d="M9.79 15.316l5.726-3.298-5.727-3.316v6.614z"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/index.scss
index 1edaae143fe3b..e469843a661f7 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import '../youtube-color/property-16';
         @import '../youtube-color/property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/keyframes.scss
index 06c76bcb9b7df..2c3c0c7d5bb2f 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-youtube {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/placeholders.scss
index a669469823486..c04e464e7f9cf 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-youtube-icon {
   --icon-name: icon-youtube;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/property-16.scss
index d93b8fea5c201..5225a587a794a 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-youtube-color-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M13.478 3.399c.6.161 1.072.634 1.234 1.234C15 5.728 15 8 15 8s0 2.272-.288 3.367a1.754 1.754 0 01-1.234 1.234C12.382 12.89 8 12.89 8 12.89s-4.382 0-5.478-.289a1.754 1.754 0 01-1.234-1.234C1 10.283 1 8 1 8s0-2.272.288-3.367c.162-.6.635-1.073 1.234-1.234C3.618 3.11 8 3.11 8 3.11s4.382 0 5.478.289zm-3.24 4.612l-3.645 2.1V5.9l3.644 2.11z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/property-24.scss
index 9a3b65c5208fc..0e484a83156a3 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/youtube/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-youtube-color-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M13.478 3.399c.6.161 1.072.634 1.234 1.234C15 5.728 15 8 15 8s0 2.272-.288 3.367a1.754 1.754 0 01-1.234 1.234C12.382 12.89 8 12.89 8 12.89s-4.382 0-5.478-.289a1.754 1.754 0 01-1.234-1.234C1 10.283 1 8 1 8s0-2.272.288-3.367c.162-.6.635-1.073 1.234-1.234C3.618 3.11 8 3.11 8 3.11s4.382 0 5.478.289zm-3.24 4.612l-3.645 2.1V5.9l3.644 2.11z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/keyframes.scss
index e45a66bf41207..ff9ffa8fbb0fe 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-zap-off {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/placeholders.scss
index 2e0fa51aa1e0f..cb0aa31281e4e 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-zap-off-icon {
   --icon-name: icon-zap-off;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/property-16.scss
index 893cd4ee2944c..bfb9b1dfe2e23 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-zap-off-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M9.777.898A.75.75 0 008.479.255L6.473 2.533a.75.75 0 001.126.991l.155-.175-.164.814a.75.75 0 101.47.296L9.778.898z"/><path fill-rule="evenodd" d="M10.874 11.935l-3.353 3.81a.75.75 0 01-1.309-.57l.452-4.489-5.047-.912a.75.75 0 01-.43-1.234l2.946-3.347L1.22 2.28a.75.75 0 011.06-1.06l12.5 12.5a.75.75 0 11-1.06 1.06l-2.846-2.845zM5.195 6.256L3.191 8.534l4.422.8a.75.75 0 01.612.813L7.938 13l1.874-2.129-4.617-4.616z" clip-rule="evenodd"/><path d="M11.248 5.707a.75.75 0 00-.246 1.48l1.792.296-.322.367a.75.75 0 001.126.99l1.215-1.38a.75.75 0 00-.44-1.236l-3.125-.517z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/property-24.scss
index 6d510810d71e8..abe94faf2795d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zap-off/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-zap-off-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path fill-rule="evenodd" d="M2.28 1.22a.75.75 0 00-1.06 1.06l5.659 5.66-4.705 5.63a.75.75 0 00.493 1.226l8.48.94-.917 6.408a.75.75 0 001.318.587l4.608-5.515 5.564 5.564a.75.75 0 101.06-1.06l-6.067-6.067a.753.753 0 00-.154-.154L2.28 1.219zM15.09 16.15L7.945 9.004 4.222 13.46l7.86.87a.75.75 0 01.66.852l-.653 4.563 3.002-3.593z" clip-rule="evenodd"/><path d="M13.77 1.856a.75.75 0 00-1.318-.587l-2.57 3.075a.75.75 0 101.152.962l.877-1.05-.332 2.32a.75.75 0 101.485.213l.706-4.933zM14.973 8.5a.75.75 0 10-.165 1.49l4.97.552-1.673 2.002a.75.75 0 001.151.962l2.57-3.075a.75.75 0 00-.493-1.226l-6.36-.705z"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zap/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zap/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zap/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zap/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zap/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zap/keyframes.scss
index 44b0f424a8b51..11901828733e4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zap/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zap/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-zap {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zap/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zap/placeholders.scss
index 75817e99d5e57..5e164810357cb 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zap/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zap/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-zap-icon {
   --icon-name: icon-zap;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zap/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zap/property-16.scss
index e6bea26b279c6..a9932a1c19ed9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zap/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zap/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-zap-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path fill="%23000" fill-rule="evenodd" d="M9.375.078a.75.75 0 01.402.82l-.889 4.418 5.485.908a.75.75 0 01.44 1.236l-7.292 8.285a.75.75 0 01-1.298-.643l.889-4.418-5.485-.908a.75.75 0 01-.44-1.236L8.479.255a.75.75 0 01.896-.177zm-6.17 8.439l4.918.815a.75.75 0 01.612.887l-.489 2.433 4.548-5.169-4.917-.814a.75.75 0 01-.612-.888l.489-2.432-4.548 5.168z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zap/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zap/property-24.scss
index c6f6c6ebc16ec..17b1c3ca2f4d2 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zap/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zap/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-zap-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="%23000" fill-rule="evenodd" d="M13.333 1.065a.75.75 0 01.437.791l-.918 6.409 8.48.94a.75.75 0 01.494 1.226l-10.278 12.3a.75.75 0 01-1.318-.587l.918-6.409-8.48-.94a.75.75 0 01-.494-1.226l10.278-12.3a.75.75 0 01.881-.204zM4.222 13.458l7.86.872a.75.75 0 01.66.851l-.653 4.563 7.69-9.202-7.862-.872a.75.75 0 01-.66-.851l.654-4.563-7.69 9.203z" clip-rule="evenodd"/></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/keyframes.scss
index 66af845acd401..7560a7a2ce9c5 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-zoom-in {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/placeholders.scss
index c59403a4fc501..fa27575960e98 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-zoom-in-icon {
   --icon-name: icon-zoom-in;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/property-16.scss
index 36ff59104568b..3cf0015d18234 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-zoom-in-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M7.25 4a.75.75 0 01.75.75V6.5h1.75a.75.75 0 010 1.5H8v1.75a.75.75 0 01-1.5 0V8H4.75a.75.75 0 010-1.5H6.5V4.75A.75.75 0 017.25 4z"/><path fill-rule="evenodd" d="M7.25 1a6.25 6.25 0 103.857 11.168l2.613 2.612a.75.75 0 101.06-1.06l-2.612-2.613A6.25 6.25 0 007.25 1zM2.5 7.25a4.75 4.75 0 119.5 0 4.75 4.75 0 01-9.5 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/property-24.scss
index 96fe29dd050fb..93119640a97b4 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-in/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-zoom-in-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M10.75 6.5a.75.75 0 01.75.75V10h2.75a.75.75 0 010 1.5H11.5v2.75a.75.75 0 01-1.5 0V11.5H7.25a.75.75 0 010-1.5H10V7.25a.75.75 0 01.75-.75z"/><path fill-rule="evenodd" d="M10.75 2a8.75 8.75 0 105.634 15.445l4.336 4.335a.75.75 0 101.06-1.06l-4.335-4.336A8.75 8.75 0 0010.75 2zM3.5 10.75a7.25 7.25 0 1114.5 0 7.25 7.25 0 01-14.5 0z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/index.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/index.scss
index 0cf5474ebfc47..ba3c10a4ec45c 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
         @import './property-16';
         @import './property-24';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/keyframes.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/keyframes.scss
index 4992c364f73ea..ac2085ed3d25b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes icon-zoom-out {
   100% {
 
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/placeholders.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/placeholders.scss
index 784a447247171..e1d30a771701b 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/placeholders.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 
 %with-zoom-out-icon {
   --icon-name: icon-zoom-out;
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/property-16.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/property-16.scss
index 94405ff34495c..e4e9c00c8cf49 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/property-16.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/property-16.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-zoom-out-16: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><g fill="%23000"><path d="M4.75 6.5a.75.75 0 000 1.5h5a.75.75 0 000-1.5h-5z"/><path fill-rule="evenodd" d="M1 7.25a6.25 6.25 0 1111.168 3.857l2.612 2.613a.75.75 0 11-1.06 1.06l-2.613-2.612A6.25 6.25 0 011 7.25zM7.25 2.5a4.75 4.75 0 100 9.5 4.75 4.75 0 000-9.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/property-24.scss b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/property-24.scss
index 80295aa67eaa3..cd0959d147cf9 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/property-24.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/icons/zoom-out/property-24.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-zoom-out-24: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><g fill="%23000"><path d="M7.25 10a.75.75 0 000 1.5h7a.75.75 0 000-1.5h-7z"/><path fill-rule="evenodd" d="M2 10.75a8.75 8.75 0 1115.445 5.634l4.335 4.336a.75.75 0 11-1.06 1.06l-4.336-4.335A8.75 8.75 0 012 10.75zm8.75-7.25a7.25 7.25 0 100 14.5 7.25 7.25 0 000-14.5z" clip-rule="evenodd"/></g></svg>');
 }
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/styles/base/icons/index.scss b/ui/packages/consul-ui/app/styles/base/icons/index.scss
index 3827b3f406c50..ce58e68bdb072 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './base-keyframes';
 @import './base-placeholders';
 @import './icons/index';
diff --git a/ui/packages/consul-ui/app/styles/base/icons/overrides.scss b/ui/packages/consul-ui/app/styles/base/icons/overrides.scss
index e923d75442d22..b0cccf321875d 100644
--- a/ui/packages/consul-ui/app/styles/base/icons/overrides.scss
+++ b/ui/packages/consul-ui/app/styles/base/icons/overrides.scss
@@ -1,10 +1,5 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %without-mask {
   -webkit-mask-image: none;
   mask-image: none;
-  background-color: transparent !important;
+  background-color: var(--transparent) !important;
 }
diff --git a/ui/packages/consul-ui/app/styles/base/index.scss b/ui/packages/consul-ui/app/styles/base/index.scss
index b26472480431f..c352c682ed8a9 100644
--- a/ui/packages/consul-ui/app/styles/base/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './component/index';
 @import './decoration/index';
 @import './color/index';
diff --git a/ui/packages/consul-ui/app/styles/base/reset/base-variables.scss b/ui/packages/consul-ui/app/styles/base/reset/base-variables.scss
index 5908b64e82c8d..0a644f3c3efc8 100644
--- a/ui/packages/consul-ui/app/styles/base/reset/base-variables.scss
+++ b/ui/packages/consul-ui/app/styles/base/reset/base-variables.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %reset-margin {
   margin: 0;
 }
@@ -10,6 +5,10 @@
   margin: 0;
   padding: 0;
 }
+%reset-typo {
+  font-size: 100%;
+  font-weight: normal;
+}
 
 %reset-list {
   list-style: none;
diff --git a/ui/packages/consul-ui/app/styles/base/reset/index.scss b/ui/packages/consul-ui/app/styles/base/reset/index.scss
index e60669bbccca4..0aec96d2de6c3 100644
--- a/ui/packages/consul-ui/app/styles/base/reset/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/reset/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './base-variables';
 @import './system';
 @import './minireset';
diff --git a/ui/packages/consul-ui/app/styles/base/reset/minireset.scss b/ui/packages/consul-ui/app/styles/base/reset/minireset.scss
index 43b1e0fa6f240..ae2ce63f234ec 100644
--- a/ui/packages/consul-ui/app/styles/base/reset/minireset.scss
+++ b/ui/packages/consul-ui/app/styles/base/reset/minireset.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 html,
 body,
 p,
@@ -17,10 +12,25 @@ figure,
 fieldset,
 legend,
 textarea,
+pre,
 iframe,
-hr {
+hr,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   @extend %reset-box;
 }
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  @extend %reset-typo;
+}
 
 ul {
   @extend %reset-list;
diff --git a/ui/packages/consul-ui/app/styles/base/reset/system.scss b/ui/packages/consul-ui/app/styles/base/reset/system.scss
index 42b03d9e00c20..f2357b386388e 100644
--- a/ui/packages/consul-ui/app/styles/base/reset/system.scss
+++ b/ui/packages/consul-ui/app/styles/base/reset/system.scss
@@ -1,48 +1,48 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 a {
   text-decoration: none;
 }
-td,
-th,
-span,
-strong {
+td, th,
+span, strong {
   color: inherit;
 }
 /* %typo-body */
 body {
-  color: var(--token-color-foreground-strong);
+  color: rgb(var(--tone-gray-900));
 }
 /* TODO: Consider changing this to 'p a, dd a, td a' etc etc */
 a {
-  color: var(--token-color-foreground-action);
+  color: rgb(var(--color-action));
 }
 html {
-  background-color: var(--token-color-surface-primary);
+  background-color: rgb(var(--tone-gray-000));
 }
 hr {
-  background-color: var(--token-color-surface-interactive-active);
+  background-color: rgb(var(--tone-gray-200));
+}
+button {
+  background-color: var(--transparent);
 }
 html {
-  font-size: 16px;
+  font-size: var(--typo-size-000);
+}
+/* %typo-body */
+body {
+  line-height: 1.5;
 }
-
 body,
+button,
 input,
 select,
 textarea {
-  font-family: var(--token-typography-font-stack-text);
+  font-family: var(--typo-family-sans);
 }
 code,
 pre {
-  font-family: var(--token-typography-font-stack-code);
+  font-family: var(--typo-family-mono);
 }
 strong {
   font-style: inherit;
-  @extend %body-200-semibold;
+  font-weight: var(--typo-weight-bold);
 }
 html {
   text-rendering: optimizeLegibility;
@@ -69,9 +69,7 @@ html {
 html {
   box-sizing: border-box;
 }
-*,
-*::before,
-*::after {
+*, *::before, *::after {
   box-sizing: inherit;
 }
 fieldset {
@@ -87,8 +85,8 @@ hr {
   border: none;
   display: block;
 }
-input[type='checkbox'],
-input[type='radio'] {
+input[type="checkbox"],
+input[type="radio"] {
   vertical-align: baseline;
 }
 td,
diff --git a/ui/packages/consul-ui/app/styles/base/typography/base-keyframes.scss b/ui/packages/consul-ui/app/styles/base/typography/base-keyframes.scss
index 0e331ac1fe879..7f29930ebb4d5 100644
--- a/ui/packages/consul-ui/app/styles/base/typography/base-keyframes.scss
+++ b/ui/packages/consul-ui/app/styles/base/typography/base-keyframes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @keyframes typo-truncate {
   100% {
     white-space: nowrap;
diff --git a/ui/packages/consul-ui/app/styles/base/typography/base-placeholders.scss b/ui/packages/consul-ui/app/styles/base/typography/base-placeholders.scss
index 404ba9ff390bb..e724015528345 100644
--- a/ui/packages/consul-ui/app/styles/base/typography/base-placeholders.scss
+++ b/ui/packages/consul-ui/app/styles/base/typography/base-placeholders.scss
@@ -1,75 +1,78 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
-%display-500-bold {
-  @extend .hds-typography-display-500;
-  @extend .hds-font-weight-bold;
-}
-%display-400-bold {
-  @extend .hds-typography-display-400;
-  @extend .hds-font-weight-bold;
-}
-%display-400-semibold {
-  @extend .hds-typography-display-400;
-  @extend .hds-font-weight-semibold;
-}
-%display-400-medium {
-  @extend .hds-typography-display-400;
-  @extend .hds-font-weight-medium;
-}
-%display-300-bold {
-  @extend .hds-typography-display-300;
-  @extend .hds-font-weight-bold;
-}
-%display-300-semibold {
-  @extend .hds-typography-display-300;
-  @extend .hds-font-weight-semibold;
-}
-%display-300-medium {
-  @extend .hds-typography-display-300;
-  @extend .hds-font-weight-medium;
-}
-%display-200-semibold {
-  @extend .hds-typography-display-200;
-  @extend .hds-font-weight-semibold;
-}
-%display-100-medium {
-  @extend .hds-typography-display-100;
-  @extend .hds-font-weight-medium;
-}
-%display-100-semibold {
-  @extend .hds-typography-display-100;
-  @extend .hds-font-weight-semibold;
-}
-
-$sizes: 100, 200, 300;
-@each $size in $sizes {
-  %body-#{$size}-regular {
-    @extend .hds-typography-body-#{$size};
-    @extend .hds-font-weight-regular;
-  }
-  %body-#{$size}-medium {
-    @extend .hds-typography-body-#{$size};
-    @extend .hds-font-weight-medium;
-  }
-  %body-#{$size}-semibold {
-    @extend .hds-typography-body-#{$size};
-    @extend .hds-font-weight-semibold;
-  }
-
-  %code-#{$size}-regular {
-    font-family: var(--token-typography-font-stack-code);
-    font-size: var(--token-typography-code-#{$size}-font-size);
-    line-height: var(--token-typography-code-#{$size}-line-height);
-    font-weight: var(--token-typography-font-weight-regular);
-  }
-}
-
 %typo-inherit {
   font-size: inherit;
   font-weight: inherit;
   line-height: inherit;
   font-style: inherit;
 }
+%typo-body {
+  font-size: var(--typo-size-600);
+  font-family: var(--typo-family-sans);
+  line-height: var(--typo-lead-700);
+}
+%typo-header {
+  line-height: var(--typo-lead-200);
+}
+%h000,
+%h100,
+%h200,
+%h300,
+%h400,
+%h500,
+%h600,
+%h400,
+%h500,
+%h600 {
+  @extend %typo-header;
+}
+%h100 {
+  font-weight: var(--typo-weight-bold);
+}
+%h200,
+%h300,
+%h400 {
+  font-weight: var(--typo-weight-semibold);
+}
+%h500,
+%h600 {
+  font-weight: var(--typo-weight-medium);
+}
+%h000 {
+  font-size: var(--typo-size-100);
+}
+%h100 {
+  font-size: var(--typo-size-200);
+}
+%h200 {
+  font-size: var(--typo-size-300);
+}
+%h300 {
+  font-size: var(--typo-size-500);
+}
+/*p1 strong, differing weights */
+%h400,
+%h500 {
+  font-size: var(--typo-size-600);
+}
+/*p2 strong */
+%h600 {
+  font-size: var(--typo-size-700);
+}
+%typo-p {
+  line-height: inherit;
+  font-size: inherit;
+}
+%p,
+%p1,
+%p2,
+%p3 {
+  @extend %typo-p;
+}
+%p1 {
+  font-size: var(--typo-size-600);
+}
+%p2 {
+  font-size: var(--typo-size-700);
+}
+%p3 {
+  font-size: var(--typo-size-800);
+}
diff --git a/ui/packages/consul-ui/app/styles/base/typography/base-variables.scss b/ui/packages/consul-ui/app/styles/base/typography/base-variables.scss
new file mode 100644
index 0000000000000..0d4294737ef97
--- /dev/null
+++ b/ui/packages/consul-ui/app/styles/base/typography/base-variables.scss
@@ -0,0 +1,47 @@
+:root {
+  /* families */
+  /* -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; */
+  --typo-family-sans: BlinkMacSystemFont, -apple-system, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
+  --typo-family-mono: monospace;
+
+  /* sizes */
+  /* --typo-size-inherit: inherit; worthwhile? */
+  --typo-size-000: 16px;
+  /* TODO: Numbering of these should possibly be reversed, more likely to add bigger*/
+  /* also maybe use 100, 200 etc like colors */
+  --typo-size-100: 3.5rem;
+  --typo-size-200: 1.8rem;
+  --typo-size-250: 1.750rem; /* 28px */
+  --typo-size-300: 1.3rem;
+  /* mktg only ^ */
+  --typo-size-400: 1.2rem; /* $size-large? 24 */
+  --typo-size-450: 1.125rem;
+  --typo-size-500: 1rem; /* $size-medium? // 18 */
+  --typo-size-600: 0.875rem; /* $size-normal? // 14 */
+  --typo-size-700: 0.8125rem; /* $size-small? // 13 */
+  --typo-size-800: 0.75rem; /* $size-small? // 12 */
+
+  /* weights */
+  --typo-weight-light: 300;
+  --typo-weight-normal: 400;
+  --typo-weight-medium: 500;
+  --typo-weight-semibold: 600;
+  --typo-weight-bold: 700;
+
+  /* line-heights. lead/leading is easier to write */
+  /* is this worthwhile? Should we use font-size relative?*/
+  /* DS uses ~ 1.3 */
+  --typo-lead-000: 0;
+  --typo-lead-050: 1;
+  --typo-lead-100: 1.2;
+  --typo-lead-200: 1.25;
+  --typo-lead-300: 1.28;
+  --typo-lead-500: 1.33;
+  --typo-lead-600: 1.4;
+  --typo-lead-700: 1.5;
+  --typo-lead-800: 1.7;
+
+  /* letter-spacing. kern is easier to write*/
+  /* --typo-kern-000: normal; */
+  /* --typo-kern-100: 1px; */
+}
diff --git a/ui/packages/consul-ui/app/styles/base/typography/index.scss b/ui/packages/consul-ui/app/styles/base/typography/index.scss
index a846f0f2e9002..72abf8e5aa193 100644
--- a/ui/packages/consul-ui/app/styles/base/typography/index.scss
+++ b/ui/packages/consul-ui/app/styles/base/typography/index.scss
@@ -1,7 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
+@import './base-variables';
 @import './base-keyframes';
 @import './base-placeholders';
diff --git a/ui/packages/consul-ui/app/styles/components.scss b/ui/packages/consul-ui/app/styles/components.scss
index d4e1c39e824ee..656b05cf1ca3f 100644
--- a/ui/packages/consul-ui/app/styles/components.scss
+++ b/ui/packages/consul-ui/app/styles/components.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import 'ember-power-select';
 
 @import 'consul-ui/components/anchors';
@@ -71,6 +66,7 @@
 @import 'consul-ui/components/inline-code';
 @import 'consul-ui/components/overlay';
 @import 'consul-ui/components/tooltip';
+@import 'consul-ui/components/notice';
 @import 'consul-ui/components/modal-dialog';
 @import 'consul-ui/components/list-collection';
 @import 'consul-ui/components/filter-bar';
diff --git a/ui/packages/consul-ui/app/styles/debug.scss b/ui/packages/consul-ui/app/styles/debug.scss
index 23ae675cb1baa..718ae65ace51f 100644
--- a/ui/packages/consul-ui/app/styles/debug.scss
+++ b/ui/packages/consul-ui/app/styles/debug.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import 'prism-coldark-dark';
 
 // temporary component debugging setup
@@ -16,6 +11,9 @@
 @import 'consul-ui/components/inline-alert/debug';
 @import 'consul-ui/components/definition-table/debug';
 
+.theme-dark {
+  @extend %theme-dark;
+}
 %debug-grid {
   display: flex;
   flex-wrap: wrap;
@@ -33,7 +31,7 @@
   width: 140px;
 }
 %debug-grid figcaption {
-  @extend %body-100-regular;
+  @extend %p3;
   text-align: center;
 }
 [id^='docfy-demo-preview-color'] ul,
@@ -45,7 +43,7 @@
 [id^='docfy-demo-preview-typography'] figure,
 [id^='docfy-demo-preview-icons'] figure {
   border: var(--decor-border-100);
-  border-color: var(--token-color-palette-neutral-300);
+  border-color: rgb(var(--tone-gray-300));
   height: 80px;
 }
 
@@ -57,43 +55,47 @@
   height: 40px;
 }
 #docfy-demo-preview-color0 {
-  background-color: var(--token-color-surface-primary);
+  @extend %theme-light;
+  background-color: rgb(var(--white));
 }
 #docfy-demo-preview-color1 {
-  background-color: var(--token-color-hashicorp-brand);
+  background-color: rgb(var(--black));
+  @extend %theme-dark;
 }
 
 [id^='docfy-demo-preview-typography'] {
-  .debug-h000,
+  .debug-h000 {
+    @extend %h000;
+  }
   .debug-h100 {
-    @extend %display-500-bold;
+    @extend %h100;
   }
   .debug-h200 {
-    @extend %display-400-semibold;
+    @extend %h200;
   }
   .debug-h300 {
-    @extend %display-300-semibold;
+    @extend %h300;
   }
   .debug-h400 {
-    @extend %display-100-semibold;
+    @extend %h400;
   }
   .debug-h500 {
-    @extend %display-100-medium;
+    @extend %h500;
   }
   .debug-h600 {
-    @extend %display-100-medium;
+    @extend %h600;
   }
   .debug-p {
-    @extend %body-200-regular;
+    @extend %p;
   }
   .debug-p1 {
-    @extend %body-200-regular;
+    @extend %p1;
   }
   .debug-p2 {
-    @extend %body-100-regular;
+    @extend %p2;
   }
   .debug-p3 {
-    @extend %body-100-regular;
+    @extend %p3;
   }
 }
 
@@ -118,7 +120,7 @@ html:not(.with-data-source) .data-source-debug {
 }
 html.with-href-to [href^='console://']::before
 {
-  @extend %body-100-regular;
+  @extend %p3;
   @extend %debug-box;
   content: attr(href);
   display: inline;
@@ -138,7 +140,7 @@ html.with-route-announcer .route-title {
 }
 .docs {
   & {
-    background-color: var(--token-color-surface-primary);
+    background-color: rgb(var(--tone-gray-000));
   }
   .tabular-collection,
   .list-collection {
@@ -190,25 +192,25 @@ html.with-route-announcer .route-title {
     }
     > h1 {
       padding-top: 20px;
-      @extend %display-500-bold;
+      @extend %h100;
     }
     > h2 {
-      @extend %display-400-semibold;
+      @extend %h200;
     }
     > h3 {
-      @extend %display-300-semibold;
+      @extend %h300;
     }
     > h4 {
-      @extend %display-100-semibold;
+      @extend %h400;
     }
     > p {
-      @extend %body-200-regular;
+      @extend %p1;
     }
     > table {
       margin-bottom: 3em;
     }
     > table td {
-      font-weight: var(--token-typography-font-weight-regular) !important;
+      font-weight: normal !important;
       cursor: default !important;
     }
     > table td code {
@@ -233,7 +235,7 @@ html.with-route-announcer .route-title {
         border-top: 1px solid;
         border-left: 1px solid;
         border-right: 1px solid;
-        border-color: var(--token-color-surface-interactive-active);
+        border-color: rgb(var(--tone-gray-200));
         padding: 1rem;
         margin-bottom: 0;
       }
@@ -246,19 +248,19 @@ html.with-route-announcer .route-title {
       }
       figcaption {
         margin-bottom: 0.5rem;
-        color: var(--token-color-foreground-disabled);
+        color: rgb(var(--tone-gray-400));
         font-style: italic;
       }
       figcaption code {
         @extend %inline-code;
       }
       figure > [type='text'] {
-        border: 1px solid var(--token-color-hashicorp-brand);
+        border: 1px solid rgb(var(--tone-gray-999));
         width: 100%;
         padding: 0.5rem;
       }
       figure > select {
-        border: 1px solid var(--token-color-hashicorp-brand);
+        border: 1px solid rgb(var(--tone-gray-999));
         padding: 0.5rem;
       }
     }
diff --git a/ui/packages/consul-ui/app/styles/icons.scss b/ui/packages/consul-ui/app/styles/icons.scss
index 713d1576c2d8c..ca277f1d74d80 100644
--- a/ui/packages/consul-ui/app/styles/icons.scss
+++ b/ui/packages/consul-ui/app/styles/icons.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --icon-loading: icon-loading-motion;
 }
@@ -15,6 +10,18 @@
   }
 }
 
+%theme-light {
+  --icon-aws: icon-aws-color;
+  --icon-vault: icon-vault;
+  --color-vault-500: rgb(var(--black));
+}
+%theme-dark {
+  --icon-aws: icon-aws;
+  --icon-vault: icon-vault;
+  --color-aws-500: rgb(var(--white));
+  --color-vault-500: rgb(var(--tone-lemon-500));
+}
+
 %with-vault-100,
 %with-vault-300 {
   --icon-name: icon-vault;
@@ -22,7 +29,7 @@
 }
 %with-aws-100,
 %with-aws-300 {
-  --icon-name: icon-aws-color;
+  --icon-name: var(--icon-aws);
   content: '';
 }
 %with-allow-100,
@@ -40,12 +47,12 @@
 %with-allow-300,
 %with-allow-500 {
   --icon-name: icon-arrow-right;
-  --icon-color: var(--token-color-foreground-success-on-surface);
+  --icon-color: rgb(var(--tone-green-500));
 }
 %with-deny-300,
 %with-deny-500 {
   --icon-name: icon-skip;
-  --icon-color: var(--token-color-foreground-critical-on-surface);
+  --icon-color: rgb(var(--tone-red-500));
 }
 %with-l7-300,
 %with-l7-500 {
@@ -54,7 +61,7 @@
 %with-allow-500,
 %with-deny-500,
 %with-l7-500 {
-  --icon-resolution: 0.5;
+  --icon-resolution: .5;
 }
 %with-allow-300,
 %with-allow-500,
diff --git a/ui/packages/consul-ui/app/styles/layout.scss b/ui/packages/consul-ui/app/styles/layout.scss
index 75f42c71551ba..1fe6db81fa89e 100644
--- a/ui/packages/consul-ui/app/styles/layout.scss
+++ b/ui/packages/consul-ui/app/styles/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import 'layouts/index';
 
 /* position main app-view when there are/aren't breadcrumbs */
@@ -80,10 +75,12 @@ html[data-route='dc.services.index'] .consul-service-list ul,
 .consul-role-list ul,
 .consul-policy-list ul,
 .consul-token-list ul,
-.consul-peer-list ul,
 .consul-auth-method-list ul {
   @extend %list-after-filter-bar;
 }
+.notice + .consul-token-list ul {
+  border-top-width: 1px !important;
+}
 
 // TODO: This shouldn't be done here, decide the best way to do this
 // %main-decoration ? %main-skin ? %content-skin ?
diff --git a/ui/packages/consul-ui/app/styles/layouts/index.scss b/ui/packages/consul-ui/app/styles/layouts/index.scss
index 4970da98d8cf9..f9405fbd43af3 100644
--- a/ui/packages/consul-ui/app/styles/layouts/index.scss
+++ b/ui/packages/consul-ui/app/styles/layouts/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // workaround bulma's sweeping box-sizing
 
 %viewport-container {
@@ -31,7 +26,7 @@ fieldset [role='group'] {
 [role='group'] fieldset:not(:first-of-type) {
   padding-left: 20px;
   border-left: 1px solid;
-  border-left: var(--token-color-foreground-faint);
+  border-left: rgb(var(--tone-gray-500));
 }
 [role='group'] fieldset:not(:last-of-type) {
   padding-right: 20px;
diff --git a/ui/packages/consul-ui/app/styles/prism-coldark-cold.scss b/ui/packages/consul-ui/app/styles/prism-coldark-cold.scss
index 8608926b2247b..1f03a27dd471b 100644
--- a/ui/packages/consul-ui/app/styles/prism-coldark-cold.scss
+++ b/ui/packages/consul-ui/app/styles/prism-coldark-cold.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /**
  * Coldark Theme for Prism.js
  * Theme variation: Cold
@@ -15,7 +10,7 @@ code[class*='language-'],
 pre[class*='language-'] {
   color: #111b27;
   background: none;
-  font-family: var(--token-typography-font-stack-code);
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
   text-align: left;
   white-space: pre;
   word-spacing: normal;
@@ -147,7 +142,7 @@ pre[class*='language-'] {
 .token.keyword-this,
 .token.this,
 .token.bold {
-  font-weight: var(--token-typography-font-weight-bold);
+  font-weight: bold;
 }
 
 .token.delimiter.important {
@@ -165,7 +160,7 @@ pre[class*='language-'] {
 .language-markdown .token.title,
 .language-markdown .token.title .token.punctuation {
   color: #005a8e;
-  font-weight: var(--token-typography-font-weight-bold);
+  font-weight: bold;
 }
 
 .language-markdown .token.blockquote.punctuation {
diff --git a/ui/packages/consul-ui/app/styles/prism-coldark-dark.scss b/ui/packages/consul-ui/app/styles/prism-coldark-dark.scss
index 98033b9b30d09..d766d65eee022 100644
--- a/ui/packages/consul-ui/app/styles/prism-coldark-dark.scss
+++ b/ui/packages/consul-ui/app/styles/prism-coldark-dark.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /**
  * Coldark Theme for Prism.js
  * Theme variation: Dark
@@ -15,7 +10,7 @@ code[class*='language-'],
 pre[class*='language-'] {
   color: #e3eaf2;
   background: none;
-  font-family: var(--token-typography-font-stack-code);
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
   text-align: left;
   white-space: pre;
   word-spacing: normal;
@@ -147,7 +142,7 @@ pre[class*='language-'] {
 .token.keyword-this,
 .token.this,
 .token.bold {
-  font-weight: var(--token-typography-font-weight-bold);
+  font-weight: bold;
 }
 
 .token.delimiter.important {
@@ -165,7 +160,7 @@ pre[class*='language-'] {
 .language-markdown .token.title,
 .language-markdown .token.title .token.punctuation {
   color: #6cb8e6;
-  font-weight: var(--token-typography-font-weight-bold);
+  font-weight: bold;
 }
 
 .language-markdown .token.blockquote.punctuation {
diff --git a/ui/packages/consul-ui/app/styles/routes.scss b/ui/packages/consul-ui/app/styles/routes.scss
index 9b8ad0b0d871a..624ff4570cea9 100644
--- a/ui/packages/consul-ui/app/styles/routes.scss
+++ b/ui/packages/consul-ui/app/styles/routes.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import 'routes/dc/services/index';
 @import 'routes/dc/nodes/index';
 @import 'routes/dc/kv/index';
diff --git a/ui/packages/consul-ui/app/styles/routes/dc/acls/index.scss b/ui/packages/consul-ui/app/styles/routes/dc/acls/index.scss
index d4d46c09742d4..3600be20c19de 100644
--- a/ui/packages/consul-ui/app/styles/routes/dc/acls/index.scss
+++ b/ui/packages/consul-ui/app/styles/routes/dc/acls/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 html[data-route^='dc.acls.index'] main td strong {
   @extend %pill-500, %frame-gray-900;
   margin-right: 3px;
@@ -13,6 +8,9 @@ html[data-route^='dc.acls.index'] .filter-bar {
 html[data-route^='dc.acls.index'] .filter-bar [role='radiogroup'] {
   @extend %expanded-single-select;
 }
+html[data-route^='dc.acls.tokens.edit'] header .actions button {
+  @extend %secondary-button;
+}
 
 @media #{$--lt-wide-form} {
   html[data-route^='dc.acls.create'] main header .actions,
diff --git a/ui/packages/consul-ui/app/styles/routes/dc/intentions/index.scss b/ui/packages/consul-ui/app/styles/routes/dc/intentions/index.scss
index 68bebc3a5b3f5..15496bae21548 100644
--- a/ui/packages/consul-ui/app/styles/routes/dc/intentions/index.scss
+++ b/ui/packages/consul-ui/app/styles/routes/dc/intentions/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 html[data-route^='dc.intentions.edit'] .definition-table {
   margin-bottom: 1em;
 }
diff --git a/ui/packages/consul-ui/app/styles/routes/dc/kv/index.scss b/ui/packages/consul-ui/app/styles/routes/dc/kv/index.scss
index a8c5b0bc85eca..47f238569a964 100644
--- a/ui/packages/consul-ui/app/styles/routes/dc/kv/index.scss
+++ b/ui/packages/consul-ui/app/styles/routes/dc/kv/index.scss
@@ -1,16 +1,11 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 html[data-route^='dc.kv'] .type-toggle {
   float: right;
   margin-bottom: 0 !important;
 }
 html[data-route^='dc.kv.edit'] h2 {
-  @extend %display-400-semibold;
+  @extend %h200;
   border-bottom: var(--decor-border-200);
-  border-color: var(--token-color-surface-interactive-active);
+  border-color: rgb(var(--tone-gray-200));
   padding-bottom: 0.2em;
   margin-bottom: 0.5em;
 }
diff --git a/ui/packages/consul-ui/app/styles/routes/dc/nodes/index.scss b/ui/packages/consul-ui/app/styles/routes/dc/nodes/index.scss
index 3513f73da779f..aa433dc9047dd 100644
--- a/ui/packages/consul-ui/app/styles/routes/dc/nodes/index.scss
+++ b/ui/packages/consul-ui/app/styles/routes/dc/nodes/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 html[data-route^='dc.nodes.show.metadata'] table tr {
   cursor: default;
 }
diff --git a/ui/packages/consul-ui/app/styles/routes/dc/overview/license.scss b/ui/packages/consul-ui/app/styles/routes/dc/overview/license.scss
index bedd44ab81420..eaf92dbb868fb 100644
--- a/ui/packages/consul-ui/app/styles/routes/dc/overview/license.scss
+++ b/ui/packages/consul-ui/app/styles/routes/dc/overview/license.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 section[data-route='dc.show.license'] {
   @extend %license-route;
 }
@@ -14,15 +9,15 @@ section[data-route='dc.show.license'] {
 }
 
 %license-route h2 {
-  @extend %display-400-semibold;
+  @extend %h200;
 }
 
 %license-validity p {
-  color: var(--token-color-foreground-faint);
+  color: rgb(var(--tone-gray-700));
 }
 %license-validity dl {
   @extend %horizontal-kv-list;
-  @extend %body-300-regular;
+  font-size: var(--typo-size-400);
 }
 %license-validity dl .expired + dd {
   @extend %visually-hidden;
@@ -33,28 +28,36 @@ section[data-route='dc.show.license'] {
 }
 %license-validity dl .expired::before {
   --icon-name: icon-x-circle;
-  --icon-color: var(--token-color-foreground-critical);
+  --icon-color: rgb(var(--red-500));
 }
 %license-validity dl .warning::before {
   --icon-name: icon-alert-circle;
-  --icon-color: var(--token-color-foreground-warning);
+  --icon-color: rgb(var(--orange-500));
 }
 %license-validity dl .valid:not(.warning)::before {
   --icon-name: icon-check-circle;
-  --icon-color: var(--token-color-foreground-success);
+  --icon-color: rgb(var(--green-500));
 }
 
 %license-route-learn-more {
   @extend %panel;
-  box-shadow: none;
+  box-shadow: var(--decor-elevation-000);
   padding: var(--padding-y) var(--padding-x);
   width: 40%;
   min-width: 413px;
   margin-top: 1rem; /* 16px */
 }
 %license-route-learn-more header > :first-child {
-  @extend %display-300-semibold;
+  @extend %h300;
 }
 %license-route-learn-more header {
   margin-bottom: 1rem; /* 16px */
 }
+%license-route-learn-more li {
+  margin-bottom: 0.25rem; /* 4px */
+}
+%license-route-learn-more a::before {
+  --icon-name: icon-docs-link;
+  content: '';
+  margin-right: 0.375rem; /* 6px */
+}
diff --git a/ui/packages/consul-ui/app/styles/routes/dc/overview/serverstatus.scss b/ui/packages/consul-ui/app/styles/routes/dc/overview/serverstatus.scss
index 9ba150dbc5465..df790a6d87a1e 100644
--- a/ui/packages/consul-ui/app/styles/routes/dc/overview/serverstatus.scss
+++ b/ui/packages/consul-ui/app/styles/routes/dc/overview/serverstatus.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 section[data-route='dc.show.serverstatus'] {
   @extend %serverstatus-route;
 }
@@ -20,12 +15,12 @@ section[data-route='dc.show.serverstatus'] {
 
 %serverstatus-route h2,
 %serverstatus-route h3 {
-  @extend %display-300-semibold;
+  @extend %h200;
 }
 
 %server-failure-tolerance {
   @extend %panel;
-  box-shadow: none;
+  box-shadow: var(--decor-elevation-000);
   padding: var(--padding-y) var(--padding-x);
   max-width: 770px;
   display: flex;
@@ -33,23 +28,24 @@ section[data-route='dc.show.serverstatus'] {
 }
 %server-failure-tolerance > header {
   width: 100%;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  padding-bottom: 0.5rem; /* 8px */
+  padding-bottom: 0.500rem; /* 8px */
   margin-bottom: 1rem; /* 16px */
   border-bottom: var(--decor-border-100);
-  border-color: var(--tone-border);
+  border-color: rgb(var(--tone-border));
+}
+%server-failure-tolerance > header a {
+  float: right;
+  margin-top: 4px;
+  font-weight: var(--typo-weight-semibold);
 }
-
 %server-failure-tolerance header em {
   @extend %pill-200;
-  @extend %body-100-regular;
-  background-color: var(--token-color-surface-interactive-active);
+  font-size: 0.812rem; /* 13px */
+  background-color: rgb(var(--tone-gray-200));
 
   text-transform: uppercase;
   font-style: normal;
+
 }
 %server-failure-tolerance > section {
   width: 50%;
@@ -70,25 +66,25 @@ section[data-route='dc.show.serverstatus'] {
 %server-failure-tolerance dl.warning dd::before {
   --icon-name: icon-alert-circle;
   --icon-size: icon-800;
-  --icon-color: var(--token-color-foreground-warning);
+  --icon-color: rgb(var(--tone-orange-400));
   content: '';
-  margin-right: 0.5rem; /* 8px */
+  margin-right: 0.500rem; /* 8px */
 }
 %server-failure-tolerance section:first-of-type dl {
-  padding-right: 1.5rem; /* 24px */
+  padding-right: 1.500rem; /* 24px */
 }
 %server-failure-tolerance dt {
-  @extend %body-100-regular;
-  color: var(--token-color-foreground-faint);
+  @extend %p2;
+  color: rgb(var(--tone-gray-700));
 }
 %server-failure-tolerance dd {
-  @extend %display-300-semibold;
-  color: var(--token-color-hashicorp-brand);
+  font-size: var(--typo-size-250);
+  color: rgb(var(--tone-gray-999));
 }
 %server-failure-tolerance header span::before {
   --icon-name: icon-info;
   --icon-size: icon-300;
-  --icon-color: var(--token-color-foreground-faint);
+  --icon-color: rgb(var(--tone-gray-500));
   vertical-align: unset;
   content: '';
 }
@@ -102,8 +98,9 @@ section[data-route='dc.show.serverstatus'] {
   margin-bottom: 18px;
 }
 
+
 %redundancy-zones h3 {
-  @extend %display-300-semibold;
+  @extend %h300;
 }
 %redundancy-zone header {
   display: flow-root;
@@ -121,11 +118,11 @@ section[data-route='dc.show.serverstatus'] {
   @extend %visually-unhidden;
 }
 %redundancy-zone header dl:not(.warning) {
-  background-color: var(--token-color-surface-strong);
+  background-color: rgb(var(--tone-gray-100));
 }
 %redundancy-zone header dl.warning {
-  background-color: var(--token-color-border-warning);
-  color: var(--token-color-palette-amber-400);
+  background-color: rgb(var(--tone-orange-100));
+  color: rgb(var(--tone-orange-800));
 }
 %redundancy-zone header dl.warning::before {
   --icon-name: icon-alert-circle;
@@ -137,5 +134,6 @@ section[data-route='dc.show.serverstatus'] {
   content: ':';
   display: inline-block;
   vertical-align: revert;
-  background-color: transparent;
+  background-color: var(--transparent);
 }
+
diff --git a/ui/packages/consul-ui/app/styles/routes/dc/services/index.scss b/ui/packages/consul-ui/app/styles/routes/dc/services/index.scss
index 3065579e11078..ed24d44f41d11 100644
--- a/ui/packages/consul-ui/app/styles/routes/dc/services/index.scss
+++ b/ui/packages/consul-ui/app/styles/routes/dc/services/index.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* drop the external dashboard button down if it exists */
 /* so it doesn't sit next to the Intentions create button */
 /* awkwardly */
@@ -19,7 +14,7 @@ html[data-route^='dc.services.instance'] .app-view > header dl {
   margin-right: 50px;
 }
 html[data-route^='dc.services.instance'] .app-view > header dt {
-  font-weight: var(--token-typography-font-weight-bold);
+  font-weight: var(--typo-weight-bold);
 }
 html[data-route^='dc.services.instance'] .tab-nav {
   border-top: var(--decor-border-100);
@@ -29,12 +24,12 @@ html[data-route^='dc.services.instance'] .tab-section section:not(:last-child) {
 }
 html[data-route^='dc.services.instance'] .tab-nav,
 html[data-route^='dc.services.instance'] .tab-section section:not(:last-child) {
-  border-color: var(--token-color-surface-interactive-active);
+  border-color: rgb(var(--tone-gray-200));
 }
 html[data-route^='dc.services.instance'] .tab-section section:not(:last-child) {
   padding-bottom: 24px;
 }
 html[data-route^='dc.services.instance.metadata'] .tab-section section h2 {
-  @extend %display-300-semibold;
+  @extend %h300;
   margin: 24px 0 12px 0;
 }
diff --git a/ui/packages/consul-ui/app/styles/tailwind.scss b/ui/packages/consul-ui/app/styles/tailwind.scss
index c03d22ee28d90..71a73a82620b5 100644
--- a/ui/packages/consul-ui/app/styles/tailwind.scss
+++ b/ui/packages/consul-ui/app/styles/tailwind.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
diff --git a/ui/packages/consul-ui/app/styles/themes.scss b/ui/packages/consul-ui/app/styles/themes.scss
index 56bee00761c12..69282b79e7e67 100644
--- a/ui/packages/consul-ui/app/styles/themes.scss
+++ b/ui/packages/consul-ui/app/styles/themes.scss
@@ -1,16 +1,26 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './base/color/ui/index';
+@import './base/color/magenta/index';
+@import './base/color/strawberry/index';
+@import './base/color/vault/index';
 
+:root:not(.prefers-color-scheme-dark) {
+  @extend %theme-light;
+}
+:root.prefers-color-scheme-dark {
+  @extend %theme-dark;
+}
+
+%main-header-horizontal,
+%main-nav-vertical,
+%main-nav-horizontal {
+  @extend %theme-dark;
+}
 %main-nav-horizontal .dangerous button:hover,
 %main-nav-horizontal .dangerous button:focus {
-  color: var(--token-color-surface-primary) !important;
+  color: rgb(var(--white)) !important;
 }
 
 %main-nav-vertical .menu-panel a:hover,
 %main-nav-vertical .menu-panel a:focus {
-  background-color: var(--token-color-foreground-action);
+  background-color: rgb(var(--tone-blue-500));
 }
diff --git a/ui/packages/consul-ui/app/styles/typography.scss b/ui/packages/consul-ui/app/styles/typography.scss
index b0dac04edb3b2..8bf6a3238e322 100644
--- a/ui/packages/consul-ui/app/styles/typography.scss
+++ b/ui/packages/consul-ui/app/styles/typography.scss
@@ -1,77 +1,79 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 body,
 %form-element-text-input {
-  @extend %body-200-regular;
+  @extend %typo-body;
 }
 %radio-card header,
 fieldset > header,
+%main-nav-horizontal-action,
 %definition-table dt,
 %table caption,
 %tbody-th,
 %form-element > span {
-  @extend %display-100-semibold;
-}
-%main-nav-horizontal-action {
-  @extend %body-200-medium;
+  @extend %h400;
 }
 %definition-table dt {
-  line-height: var(--token-typography-body-300-line-height);
+  line-height: var(--typo-lead-700);
 }
 %internal-button,
 %breadcrumbs li > *,
 %tab-nav {
-  @extend %body-200-medium;
+  @extend %h500;
 }
-%table td p,
-%table td {
-  @extend %body-200-regular;
-}
-
 %healthcheck-output dt,
-%table td:first-child p,
-%table td:first-child,
+%table th,
+%table td strong,
 %sliding-toggle label span {
-  @extend %body-200-semibold;
+  @extend %h600;
 }
 
+pre code,
+%notice,
+%notice p,
+%flash-message p,
 %filter-bar input,
 %tab-section p {
-  @extend %body-200-regular;
+  @extend %p1;
 }
 %empty-state-anchor,
+.type-dialog,
+%table td p,
+%table td,
+%healthcheck-output dl > dd,
 %form-element-label,
 %stats-card header a span,
 %footer,
 %app-view h1 span.kind-proxy {
-  @extend %body-100-regular;
+  @extend %p2;
 }
 %empty-state-subheader,
 %empty-state p,
+%button,
 %main-content p,
 %form-element-note,
 %form-element-error > strong {
-  @extend %body-100-regular;
+  @extend %p3;
 }
 %main-content p code {
   @extend %inline-code;
 }
 
 %radio-group label {
-  line-height: var(--token-typography-body-100-line-height);
+  line-height: var(--typo-lead-200);
+}
+%tab-nav {
+  letter-spacing: 0.03em;
 }
 
+/*TODO: See if we can collapse these into a */
+/* strong %p3 */
 %form-element-label,
 %button {
-  @extend %body-100-semibold;
+  font-weight: var(--typo-weight-semibold);
 }
 %route-card section dt,
 %route-card header:not(.short) dd,
 %splitter-card > header {
-  @extend .hds-font-weight-bold;
+  font-weight: var(--typo-weight-bold);
 }
 /**/
 
@@ -81,8 +83,9 @@ fieldset > header,
 %pill,
 %form-element > strong,
 %tbody-th em,
+%app-view h1 em,
 %route-card header dt {
-  @extend .hds-font-weight-regular;
+  font-weight: var(--typo-weight-normal);
 }
 
 %form-element-note,
@@ -94,7 +97,8 @@ fieldset > header,
 
 /* composite row */
 %composite-row-header {
-  @extend %display-300-medium;
+  font-size: var(--typo-size-450);
+  font-weight: var(--typo-weight-medium);
 }
 %composite-row-header *:not(button) {
   font-size: inherit;
@@ -102,31 +106,14 @@ fieldset > header,
 }
 /**/
 
+/* TODO: We have nothing else with a 500 */
+/* either make this the biggest %p or don't use it */
 %app-view h1 em {
-  @extend %body-200-medium;
+  font-size: var(--typo-size-500);
 }
 /*TODO: This should go in reset, and probably needs select etc adding  */
 @media (max-width: 420px) and (-webkit-min-device-pixel-ratio: 0) {
   input {
-    font-size: var(--token-typography-body-300-font-size) !important;
+    font-size: 16px !important;
   }
 }
-%healthcheck-output dl > dd {
-  @extend %body-200-regular;
-}
-
-h1 {
-  @extend %display-500-bold;
-}
-
-%healthcheck-output pre code,
-pre code,
-pre,
-code {
-  @extend %code-200-regular;
-}
-
-dd code,
-dd pre code {
-  @extend %code-100-regular;
-}
diff --git a/ui/packages/consul-ui/app/styles/variables.scss b/ui/packages/consul-ui/app/styles/variables.scss
index d857778f16e1c..2405a6cee9873 100644
--- a/ui/packages/consul-ui/app/styles/variables.scss
+++ b/ui/packages/consul-ui/app/styles/variables.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './base/reset/index';
 @import './base/index';
 @import './variables/custom-query';
diff --git a/ui/packages/consul-ui/app/styles/variables/custom-query.scss b/ui/packages/consul-ui/app/styles/variables/custom-query.scss
index 77c31f86f4eb9..4b228471d316b 100644
--- a/ui/packages/consul-ui/app/styles/variables/custom-query.scss
+++ b/ui/packages/consul-ui/app/styles/variables/custom-query.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 $ideal-width: 1260px;
 
 $--horizontal-filters: '(min-width: 1300px)';
diff --git a/ui/packages/consul-ui/app/styles/variables/layout.scss b/ui/packages/consul-ui/app/styles/variables/layout.scss
index e4f4252a43a74..7bae140828a6b 100644
--- a/ui/packages/consul-ui/app/styles/variables/layout.scss
+++ b/ui/packages/consul-ui/app/styles/variables/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 :root {
   --chrome-width: 280px;
   --chrome-height: 64px;
diff --git a/ui/packages/consul-ui/app/styles/variables/skin.scss b/ui/packages/consul-ui/app/styles/variables/skin.scss
index 2644344c4c30c..cece201ac0136 100644
--- a/ui/packages/consul-ui/app/styles/variables/skin.scss
+++ b/ui/packages/consul-ui/app/styles/variables/skin.scss
@@ -1,12 +1,31 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './custom-query';
 
+// TODO: Setup only the CSS props we actually need here
+// potentially see if our compiler can automatically remove
+// unused CSS props
 :root {
-  --typo-action: var(--token-color-foreground-action);
-  --decor-error: var(--token-color-foreground-critical);
-  --typo-contrast: var(--token-color-hashicorp-brand);
+  /* base brand colors */
+  --tone-brand-050: var(--tone-magenta-050);
+  --tone-brand-100: var(--tone-strawberry-100);
+  /* --tone-brand-200: var(--tone-strawberry-200) */
+  /* --tone-brand-300: var(--tone-strawberry-300) */
+  /* --tone-brand-400: var(--tone-strawberry-400) */
+  /* --tone-brand-500: var(--tone-strawberry-500) */
+  /* temporary strawberry-like color until its replaced by a numbered one */
+  --tone-brand-600: 224 56 117;
+  /* --tone-brand-700: var(--tone-strawberry-700) */
+  --tone-brand-800: var(--tone-magenta-800);
+  /* --tone-brand-900: var(--tone-strawberry-900) */
+
+  /* themeable ui colors */
+  --typo-action-500: rgb(var(--tone-blue-500));
+  --decor-error-500: rgb(var(--tone-red-500));
+  --typo-contrast-999: rgb(var(--tone-gray-999));
+
+  /* themeable brand colors */
+  --typo-brand-050: rgb(var(--tone-brand-050));
+  --typo-brand-600: rgb(var(--tone-brand-600));
+  --decor-brand-600: rgb(var(--tone-brand-600));
+  --swatch-brand-600: rgb(var(--tone-brand-600));
+  --swatch-brand-800: rgb(var(--tone-brand-800));
 }
diff --git a/ui/packages/consul-ui/app/templates/application.hbs b/ui/packages/consul-ui/app/templates/application.hbs
index 7be739bf64b81..9eb1536ad8f89 100644
--- a/ui/packages/consul-ui/app/templates/application.hbs
+++ b/ui/packages/consul-ui/app/templates/application.hbs
@@ -1,21 +1,16 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route @name={{routeName}} as |route|>
 
   {{! Add the a11y route announcer }}
   <route.Announcer @title='Consul' />
   {{! Tell CSS what we have enabled }}
   {{#if (can 'use acls')}}
-    {{document-attrs class="has-acls"}}
+    {{document-attrs class='has-acls'}}
   {{/if}}
   {{#if (can 'use nspaces')}}
-    {{document-attrs class="has-nspaces" }}
+    {{document-attrs class='has-nspaces'}}
   {{/if}}
   {{#if (can 'use partitions')}}
-    {{document-attrs class="has-partitions" }}
+    {{document-attrs class='has-partitions'}}
   {{/if}}
 
   {{! Listen out for blocking query/client setting changes }}
@@ -28,7 +23,7 @@
   <DataSource @src={{uri 'settings://consul:theme'}} as |source|>
     {{#each-in source.data as |key value|}}
       {{#if (and value (includes key (array 'color-scheme' 'contrast')))}}
-        {{document-attrs class=(concat "prefers-" key "-" value) }}
+        {{document-attrs class=(concat 'prefers-' key '-' value)}}
       {{/if}}
     {{/each-in}}
   </DataSource>
diff --git a/ui/packages/consul-ui/app/templates/dc.hbs b/ui/packages/consul-ui/app/templates/dc.hbs
index ad4664bcd38c8..a02351727a2b4 100644
--- a/ui/packages/consul-ui/app/templates/dc.hbs
+++ b/ui/packages/consul-ui/app/templates/dc.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls.hbs b/ui/packages/consul-ui/app/templates/dc/acls.hbs
index ad4664bcd38c8..a02351727a2b4 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/index.hbs
index d221d5e819ee5..687e6360089e0 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -107,23 +102,11 @@ as |route|>
                 }}
               </BlockSlot>
               <BlockSlot @name="actions">
-                <li>
-                  <Hds::Link::Standalone
-                    @text='Documentation on auth methods'
-                    @href="{{env 'CONSUL_DOCS_URL'}}/security/acl/auth-methods"
-                    @icon='docs-link'
-                    @iconPosition='trailing'
-                    @size='small'
-                  />
+                <li class="docs-link">
+                  <a href="{{env 'CONSUL_DOCS_URL'}}/security/acl/auth-methods" rel="noopener noreferrer" target="_blank">Documentation on auth methods</a>
                 </li>
-                <li>
-                  <Hds::Link::Standalone
-                    @text='Read the API Docs'
-                    @href='{{env 'CONSUL_DOCS_API_URL'}}/acl/auth-methods.html'
-                    @icon='learn-link'
-                    @iconPosition='trailing'
-                    @size='small'
-                  />
+                <li class="learn-link">
+                  <a href="{{env 'CONSUL_DOCS_API_URL'}}/acl/auth-methods.html" rel="noopener noreferrer" target="_blank">Read the API Docs</a>
                 </li>
               </BlockSlot>
             </EmptyState>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show.hbs b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show.hbs
index efa683681ca93..d48894251b3f1 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/auth-method.hbs b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/auth-method.hbs
index f2a687d385591..cc28d28f6d2b4 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/auth-method.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/auth-method.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/binding-rules.hbs b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/binding-rules.hbs
index 8f155eeabc94b..f1e09e636555a 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/binding-rules.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/binding-rules.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/nspace-rules.hbs b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/nspace-rules.hbs
index d0a8529a44b77..6013bc17b58bc 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/nspace-rules.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/nspace-rules.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/index.hbs
index 8ef6f6e324258..26070ffdcfe0f 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/policies/-form.hbs b/ui/packages/consul-ui/app/templates/dc/acls/policies/-form.hbs
index 687f5ec8e1d7c..bb362b9785bed 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/policies/-form.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/policies/-form.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <form>
   <PolicyForm
     @form={{form}}
@@ -33,58 +28,37 @@
     {{/if}}
 {{/if}}
     <div>
-      <Hds::ButtonSet>
-        {{#if (and create (can "create tokens")) }}
+{{#if (and create (can "create tokens")) }}
         {{! we only need to check for an empty name here as ember munges autofocus, once we have autofocus back revisit this}}
-          <Hds::Button
-            @text='Save'
-            type='submit'
-            {{ on 'click' (route-action 'create' item)}}
-            disabled={{if (or item.isPristine item.isInvalid (eq item.Name '')) 'disabled'}}
-          />
-        {{ else }}
-          {{#if (can "write policy" item=item)}}
-            <Hds::Button
-              @text='Save'
-              type='submit'
-              {{ on 'click' (route-action 'update' item)}}
-              disabled={{if item.isInvalid 'disabled'}}
-            />
-          {{/if}}
-        {{/if}}
-        <Hds::Button
-          @text='Cancel'
-          @color='secondary'
-          type='reset'
-          {{ action "cancel" item}}
-        />
-        {{# if (and (not create) (can "delete policy" item=item) ) }}
-          <ConfirmationDialog @message="Are you sure you want to delete this Policy?">
+        <button type="submit" {{ action "create" item}} disabled={{if (or item.isPristine item.isInvalid (eq item.Name '')) 'disabled'}}>Save</button>
+{{ else }}
+  {{#if (can "write policy" item=item)}}
+        <button
+          type="submit" {{ action "update" item}} disabled={{if item.isInvalid 'disabled'}}>Save</button>
+  {{/if}}
+{{/if}}
+        <button type="reset" {{ action "cancel" item}}>Cancel</button>
+{{# if (and (not create) (can "delete policy" item=item) ) }}
+        <ConfirmationDialog @message="Are you sure you want to delete this Policy?">
             <BlockSlot @name="action" as |confirm|>
-              <Hds::Button
-                @text='Delete'
-                @color='critical'
-                {{action confirm 'delete' item}}
-                data-test-delete
-              />
+                <button type="button" data-test-delete class="type-delete" {{action confirm 'delete' item}}>Delete</button>
             </BlockSlot>
             <BlockSlot @name="dialog" as |execute cancel message|>
-              {{#if (gt items.length 0)}}
-                <ModalDialog
-                  data-test-delete-modal
-                  @onclose={{action cancel}}
-                  @open={{true}}
-                  @aria={{hash
+    {{#if (gt items.length 0)}}
+              <ModalDialog
+                data-test-delete-modal
+                @onclose={{action cancel}}
+                @open={{true}}
+                @aria={{hash
                   label="Policy in Use"
                 }}
-                >
+              >
                   <BlockSlot @name="header">
-                    <h2>Policy in Use</h2>
+                      <h2>Policy in Use</h2>
                   </BlockSlot>
                   <BlockSlot @name="body">
                     <p>
-                      This Policy is currently in use. If you choose to delete this Policy, it will be removed from the
-                      following <strong>{{items.length}} Tokens</strong>:
+                      This Policy is currently in use. If you choose to delete this Policy, it will be removed from the following <strong>{{items.length}} Tokens</strong>:
                     </p>
                     <TokenList @items={{items}} @target="_blank" />
                     <p>
@@ -92,27 +66,15 @@
                     </p>
                   </BlockSlot>
                   <BlockSlot @name="actions" as |close|>
-                    <Hds::ButtonSet>
-                      <Hds::Button
-                        @text='Yes, Delete'
-                        data-test-delete
-                        @color='critical'
-                        {{action execute}}
-                      />
-                      <Hds::Button
-                        @text='Cancel'
-                        @color='secondary'
-                        {{action close}}
-                      />
-                    </Hds::ButtonSet>
+                    <button type="button" class="type-delete" {{action execute}}>Yes, Delete</button>
+                    <button type="button" class="type-cancel" {{action close}}>Cancel</button>
                   </BlockSlot>
-                </ModalDialog>
-              {{else}}
+              </ModalDialog>
+    {{else}}
                 <DeleteConfirmation @message={{message}} @execute={{execute}} @cancel={{cancel}} />
-              {{/if}}
+    {{/if}}
             </BlockSlot>
-          </ConfirmationDialog>
-        {{/if}}
-      </Hds::ButtonSet>
+        </ConfirmationDialog>
+{{/if}}
     </div>
 </form>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs b/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs
index eba325d6e1947..63cc8ea667b06 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -75,16 +70,20 @@ as |dc partition nspace id item create|}}
             </dl>
         </div>
   {{/if}}
-  {{#if (or (eq (policy/typeof item) 'policy-management') (eq (policy/typeof item) 'read-only'))}}
-    <Hds::Alert @type="inline" @icon="star-fill" class="mb-3 mt-2" as |A|>
-      <A.Title>Built-in policy</A.Title>
-      <A.Description>This policy is built into Consul's ACL system. You can use this special policy by adding it to a token. This policy is not editable or removable, but can be ignored by not applying it to any tokens.
-      </A.Description>
-      <A.Link::Standalone @text='Learn more'
-                          @href="{{env 'CONSUL_DOCS_URL'}}/guides/acl.html#builtin-policies"
-                          @icon='docs-link'
-                          @iconPosition='trailing' />
-    </Hds::Alert>
+  {{#if (eq (policy/typeof item) 'policy-management')}}
+    <Notice
+      class="policy-management"
+      @type="none"
+    as |notice|>
+      <notice.Header>
+        <h3>Management</h3>
+      </notice.Header>
+      <notice.Body>
+        <p>
+          This global-management token is built into Consul's policy system. You can apply this special policy to tokens for full access. This policy is not editable or removeable, but can be ignored by not applying it to any tokens. Learn more in our <a href="{{env 'CONSUL_DOCS_URL'}}/guides/acl.html#builtin-policies" target="_blank" rel="noopener noreferrer">documentation</a>.
+        </p>
+      </notice.Body>
+    </Notice>
     <div class="definition-table">
       <dl>
         <dt>Name</dt>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs
index 1ac23da4350c6..583b896ed25f2 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -67,11 +62,7 @@ as |route|>
       </BlockSlot>
       <BlockSlot @name="actions">
   {{#if (can "create policies")}}
-    <Hds::Button
-      @text='Create'
-      @route='dc.acls.policies.create'
-      data-test-create
-    />
+          <a data-test-create href="{{href-to 'dc.acls.policies.create'}}" class="type-create">Create</a>
   {{/if}}
       </BlockSlot>
       <BlockSlot @name="toolbar">
@@ -120,23 +111,11 @@ as |route|>
                 }}
               </BlockSlot>
               <BlockSlot @name="actions">
-                <li>
-                  <Hds::Link::Standalone
-                    @text='Documentation on policies'
-                    @href="{{env 'CONSUL_DOCS_URL'}}/commands/acl/policy"
-                    @icon='docs-link'
-                    @iconPosition='trailing'
-                    @size='small'
-                  />
+                <li class="docs-link">
+                  <a href="{{env 'CONSUL_DOCS_URL'}}/commands/acl/policy" rel="noopener noreferrer" target="_blank">Documentation on policies</a>
                 </li>
-                <li>
-                  <Hds::Link::Standalone
-                    @text='Take the tutorial'
-                    @href="{{env 'CONSUL_LEARN_URL'}}/consul/security-networking/managing-acl-policies"
-                    @icon='learn-link'
-                    @iconPosition='trailing'
-                    @size='small'
-                  />
+                <li class="learn-link">
+                  <a href="{{env 'CONSUL_LEARN_URL'}}/consul/security-networking/managing-acl-policies" rel="noopener noreferrer" target="_blank">Take the tutorial</a>
                 </li>
               </BlockSlot>
             </EmptyState>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/roles/-form.hbs b/ui/packages/consul-ui/app/templates/dc/acls/roles/-form.hbs
index a703f1d571acd..df5151a8e6c7a 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/roles/-form.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/roles/-form.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <form>
   <RoleForm
     @form={{form}}
@@ -11,107 +6,71 @@
     @nspace={{nspace}}
     @partition={{partition}}
   />
-  {{#if (not create)}}
-    <DataSource
-      @src={{uri '/${partition}/${nspace}/${dc}/tokens/for-role/${id}'
-                 (hash
-                   partition=partition
-                   nspace=nspace
-                   dc=dc
-                   id=(or id '')
-                 )
+{{#if (not create)}}
+  <DataSource
+    @src={{uri '/${partition}/${nspace}/${dc}/tokens/for-role/${id}'
+      (hash
+        partition=partition
+        nspace=nspace
+        dc=dc
+        id=(or id '')
+      )
     }}
-      as |loader|>
-      {{#if (gt loader.data.length 0)}}
-        <h2>Where is this role used?</h2>
-        <p>
-          We're only able to show information for the primary datacenter and the current datacenter. This list may not
-          show every case where this role is applied.
-        </p>
-        <TokenList @caption="Tokens" @items={{loader.data}} />
-      {{/if}}
-    </DataSource>
+  as |loader|>
+  {{#if (gt loader.data.length 0)}}
+    <h2>Where is this role used?</h2>
+    <p>
+      We're only able to show information for the primary datacenter and the current datacenter. This list may not show every case where this role is applied.
+    </p>
+    <TokenList @caption="Tokens" @items={{loader.data}} />
   {{/if}}
-  <div>
-    <Hds::ButtonSet>
-      {{#if (and create (can "create roles")) }}
-      {{! we only need to check for an empty name here as ember munges autofocus, once we have autofocus back revisit this}}
-        <Hds::Button
-          @text='Save'
-          type='submit'
-          {{ on 'click' (route-action 'create' item)}}
-          disabled={{or item.isPristine item.isInvalid (eq item.Name '')}}
-        />
-      {{ else }}
-        {{#if (can "write role" item=item)}}
-          <Hds::Button
-            @text='Save'
-            type='submit'
-            {{ on 'click' (route-action 'update' item)}}
-            disabled={{item.isInvalid}}
-          />
-        {{/if}}
-      {{/if}}
-      <Hds::Button
-        @text='Cancel'
-        @color='secondary'
-        type='reset'
-        {{ action "cancel" item}}
-      />
-
-      {{# if (and (not create) (can "delete role" item=item) ) }}
+  </DataSource>
+{{/if}}
+    <div>
+{{#if (and create (can "create roles")) }}
+        {{! we only need to check for an empty name here as ember munges autofocus, once we have autofocus back revisit this}}
+        <button type="submit" {{ action "create" item}} disabled={{if (or item.isPristine item.isInvalid (eq item.Name '')) 'disabled'}}>Save</button>
+{{ else }}
+  {{#if (can "write role" item=item)}}
+        <button type="submit" {{ action "update" item}} disabled={{if item.isInvalid 'disabled'}}>Save</button>
+  {{/if}}
+{{/if}}
+        <button type="reset" {{ action "cancel" item}}>Cancel</button>
+{{# if (and (not create) (can "delete role" item=item) ) }}
         <ConfirmationDialog @message="Are you sure you want to delete this Role?">
-          <BlockSlot @name="action" as |confirm|>
-            <Hds::Button
-              @text='Delete'
-              @color='critical'
-              {{action confirm 'delete' item}}
-              data-test-delete
-            />
-          </BlockSlot>
-          <BlockSlot @name="dialog" as |execute cancel message|>
-            {{#if (gt items.length 0)}}
+            <BlockSlot @name="action" as |confirm|>
+                <button type="button" data-test-delete class="type-delete" {{action confirm 'delete' item}}>Delete</button>
+            </BlockSlot>
+            <BlockSlot @name="dialog" as |execute cancel message|>
+    {{#if (gt items.length 0)}}
               <ModalDialog
                 @onclose={{action cancel}}
                 @aria={{hash
-                label="Role in Use"
-              }}
+                  label="Role in Use"
+                }}
               >
-                <BlockSlot @name="header">
-                  <h2>Role in Use</h2>
-                </BlockSlot>
-                <BlockSlot @name="body">
-                  <p>
-                    This Role is currently in use. If you choose to delete this Role, it will be removed from the
-                    following <strong>{{items.length}} Tokens</strong>:
-                  </p>
-                  <TokenList @items={{items}} @target="_blank" />
-                  <p>
-                    This action cannot be undone. {{message}}
-                  </p>
-                </BlockSlot>
-                <BlockSlot @name="actions" as |close|>
-                  <Hds::ButtonSet>
-                    <Hds::Button
-                      @text='Yes, Delete'
-                      @color='critical'
-                      data-test-delete
-                      {{action execute}}
-                    />
-                    <Hds::Button
-                      @text='Cancel'
-                      @color='secondary'
-                      {{action close}}
-                    />
-                  </Hds::ButtonSet>
-                </BlockSlot>
-              </ModalDialog>
-            {{else}}
-              <DeleteConfirmation @message={{message}} @execute={{execute}} @cancel={{cancel}} />
-            {{/if}}
-          </BlockSlot>
+                  <BlockSlot @name="header">
+                      <h2>Role in Use</h2>
+                  </BlockSlot>
+                  <BlockSlot @name="body">
+                    <p>
+                      This Role is currently in use. If you choose to delete this Role, it will be removed from the following <strong>{{items.length}} Tokens</strong>:
+                    </p>
+                    <TokenList @items={{items}} @target="_blank" />
+                    <p>
+                      This action cannot be undone. {{message}}
+                    </p>
+                  </BlockSlot>
+                  <BlockSlot @name="actions" as |close|>
+                    <button type="button" class="type-delete" {{action execute}}>Yes, Delete</button>
+                    <button type="button" class="type-cancel" {{action close}}>Cancel</button>
+                  </BlockSlot>
+                </ModalDialog>
+    {{else}}
+                <DeleteConfirmation @message={{message}} @execute={{execute}} @cancel={{cancel}} />
+    {{/if}}
+            </BlockSlot>
         </ConfirmationDialog>
-      {{/if}}
-    </Hds::ButtonSet>
-  </div>
+{{/if}}
+    </div>
 </form>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/roles/edit.hbs b/ui/packages/consul-ui/app/templates/dc/acls/roles/edit.hbs
index 78168a73cc05b..8caa4ff094e7f 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/roles/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/roles/edit.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs
index 2a83e8224a5bf..a1b76fb63f737 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
   @title="Roles"
@@ -61,11 +56,7 @@ as |route|>
       </BlockSlot>
       <BlockSlot @name="actions">
   {{#if (can "create roles")}}
-      <Hds::Button
-        @text='Create'
-        @route='dc.acls.roles.create'
-        data-test-create
-      />
+        <a data-test-create href="{{href-to 'dc.acls.roles.create'}}" class="type-create">Create</a>
   {{/if}}
       </BlockSlot>
       <BlockSlot @name="toolbar">
@@ -112,23 +103,11 @@ as |route|>
                 }}
               </BlockSlot>
               <BlockSlot @name="actions">
-                <li>
-                  <Hds::Link::Standalone
-                    @text='Documentation on roles'
-                    @href="{{env 'CONSUL_DOCS_URL'}}/commands/acl/role"
-                    @icon='docs-link'
-                    @iconPosition='trailing'
-                    @size='small'
-                  />
+                <li class="docs-link">
+                  <a href="{{env 'CONSUL_DOCS_URL'}}/commands/acl/role" rel="noopener noreferrer" target="_blank">Documentation on roles</a>
                 </li>
-                <li>
-                  <Hds::Link::Standalone
-                    @text='Read the API Docs'
-                    @href="{{env 'CONSUL_DOCS_API_URL'}}/acl/roles.html"
-                    @icon='learn-link'
-                    @iconPosition='trailing'
-                    @size='small'
-                  />
+                <li class="learn-link">
+                  <a href="{{env 'CONSUL_DOCS_API_URL'}}/acl/roles.html" rel="noopener noreferrer" target="_blank">Read the API Docs</a>
                 </li>
               </BlockSlot>
             </EmptyState>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/tokens/-fieldsets-legacy.hbs b/ui/packages/consul-ui/app/templates/dc/acls/tokens/-fieldsets-legacy.hbs
index dbe188fc2ff79..445e295b213f9 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/tokens/-fieldsets-legacy.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/tokens/-fieldsets-legacy.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
     <fieldset
       disabled={{if (not (can "write token" item=item)) "disabled"}}
     >
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/tokens/-fieldsets.hbs b/ui/packages/consul-ui/app/templates/dc/acls/tokens/-fieldsets.hbs
index 89ea6bd3c1e0a..6666a61a1c49b 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/tokens/-fieldsets.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/tokens/-fieldsets.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <fieldset
   disabled={{if (not (can "write token" item=item)) "disabled"}}
 >
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/tokens/-form.hbs b/ui/packages/consul-ui/app/templates/dc/acls/tokens/-form.hbs
index de6b9dccf1ae6..00aa0f48eb0f6 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/tokens/-form.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/tokens/-form.hbs
@@ -1,56 +1,30 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <form>
-  {{#if (not (token/is-legacy item))}}
-    {{partial 'dc/acls/tokens/fieldsets'}}
-  {{else}}
-    {{partial 'dc/acls/tokens/fieldsets-legacy'}}
+{{#if (not (token/is-legacy item))}}
+  {{partial 'dc/acls/tokens/fieldsets'}}
+{{else}}
+  {{partial 'dc/acls/tokens/fieldsets-legacy'}}
+{{/if}}
+    {{!TODO: Make this into a slotted component}}
+    <div>
+{{#if (and create (can "create tokens")) }}
+  {{! new tokens can be saved without you filling anything in, old tokens remain using isPristine }}
+        <button type="submit" {{ action "create" item}} disabled={{if (or (and (token/is-legacy item) item.isPristine) item.isInvalid) 'disabled'}}>Save</button>
+{{ else }}
+  {{#if (can "write token" item=item)}}
+        <button type="submit" {{ action "update" item}} disabled={{if item.isInvalid 'disabled'}}>Save</button>
   {{/if}}
-  {{!TODO: Make this into a slotted component}}
-  <div>
-    <Hds::ButtonSet>
-      {{#if (and create (can "create tokens")) }}
-      {{! new tokens can be saved without you filling anything in, old tokens remain using isPristine }}
-        <Hds::Button
-          @text='Save'
-          type='submit'
-          {{ on 'click' (route-action 'create' item)}}
-          disabled={{if (or (and (token/is-legacy item) item.isPristine) item.isInvalid) 'disabled'}}
-        />
-      {{ else }}
-        {{#if (can "write token" item=item)}}
-          <Hds::Button
-            @text='Save'
-            type='submit'
-            {{ on 'click' (route-action 'update' item)}}
-            disabled={{if item.isInvalid 'disabled'}}
-          />
-        {{/if}}
-      {{/if}}
-      <Hds::Button
-        @text='Cancel'
-        @color='secondary'
-        type='reset'
-        {{ action "cancel" item}}
-      />
-      {{# if (and (not create) (can "delete token" item=item token=token) ) }}
+{{/if}}
+
+        <button type="reset" {{ action "cancel" item}}>Cancel</button>
+{{# if (and (not create) (can "delete token" item=item token=token) ) }}
         <ConfirmationDialog @message="Are you sure you want to delete this Token?">
-          <BlockSlot @name="action" as |confirm|>
-            <Hds::Button
-              @text='Delete'
-              @color='critical'
-              {{action confirm 'delete' item}}
-              data-test-delete
-            />
-          </BlockSlot>
-          <BlockSlot @name="dialog" as |execute cancel message|>
-            <DeleteConfirmation @message={{message}} @execute={{execute}} @cancel={{cancel}} />
-          </BlockSlot>
+            <BlockSlot @name="action" as |confirm|>
+                <button type="button" data-test-delete class="type-delete" {{action confirm 'delete' item}}>Delete</button>
+            </BlockSlot>
+            <BlockSlot @name="dialog" as |execute cancel message|>
+              <DeleteConfirmation @message={{message}} @execute={{execute}} @cancel={{cancel}} />
+            </BlockSlot>
         </ConfirmationDialog>
-      {{/if}}
-    </Hds::ButtonSet>
-  </div>
+{{/if}}
+    </div>
 </form>
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs b/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs
index 4960fdc1a1e15..e1f4c79292f5e 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -57,58 +52,39 @@ as |dc partition nspace item create|}}
       </BlockSlot>
       <BlockSlot @name="actions">
   {{#if (not create)}}
-    <Hds::ButtonSet>
     {{#if (not-eq item.AccessorID token.AccessorID)}}
         <ConfirmationDialog @message="Are you sure you want to use this ACL token?">
           <BlockSlot @name="action" as |confirm|>
-            <Hds::Button
-              @text='Use'
-              @color='secondary'
-              data-test-use
-              {{ action confirm 'use' item }}
-            />
+              <button data-test-use type="button" {{ action confirm 'use' item }}>Use</button>
           </BlockSlot>
           <BlockSlot @name="dialog" as |execute cancel message|>
             <p>
                 {{message}}
             </p>
-            <Hds::ButtonSet>
-              <Hds::Button
-                @text='Confirm Use'
-                @color='critical'
-                data-test-confirm-use
-                {{action execute}}
-              />
-              <Hds::Button
-                @text='Cancel'
-                @color='secondary'
-                {{action cancel}}
-              />
-            </Hds::ButtonSet>
+            <button type="button" class="type-delete" {{action execute}}>Confirm Use</button>
+            <button type="button" class="type-cancel" {{action cancel}}>Cancel</button>
           </BlockSlot>
         </ConfirmationDialog>
     {{/if}}
     {{#if (can "duplicate token" item=item)}}
-      <Hds::Button
-        @text='Duplicate'
-        @color='secondary'
-        data-test-clone
-        {{ action "clone" item }}
-      />
+        <button data-test-clone type="button" {{ action "clone" item }}>Duplicate</button>
     {{/if}}
-    </Hds::ButtonSet>
   {{/if}}
       </BlockSlot>
       <BlockSlot @name="content">
           {{#if (token/is-legacy item)}}
-            <Hds::Alert @type='inline' class='mb-6' as |A|>
-              <A.Title>Update</A.Title>
-              <A.Description>We have upgraded our ACL system by allowing you to create reusable policies which you can then apply to tokens. Don't worry, even though this token was written in the old style, it is still valid. However, we do recommend upgrading your old tokens to the new style.</A.Description>
-              <A.Link::Standalone @text='Learn more'
-                                  @href="{{env 'CONSUL_DOCS_URL'}}/guides/acl-migrate-tokens.html"
-                                  @icon='docs-link'
-                                  @iconPosition='trailing' />
-            </Hds::Alert>
+            <Notice
+              @type="info"
+            as |notice|>
+              <notice.Header>
+                <h2>Update</h2>
+              </notice.Header>
+              <notice.Body>
+                <p>
+                  We have upgraded our ACL system by allowing you to create reusable policies which you can then apply to tokens. Don't worry, even though this token was written in the old style, it is still valid. However, we do recommend upgrading your old tokens to the new style. Learn how in our <a href="{{env 'CONSUL_DOCS_URL'}}/guides/acl-migrate-tokens.html" target="_blank" rel="noopener noreferrer">documentation</a>.
+                </p>
+              </notice.Body>
+            </Notice>
           {{/if}}
   {{#if (not create) }}
         <div class="definition-table">
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs
index 9fb37f50fa0ab..ffd05ffee020a 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -64,11 +59,7 @@ as |route|>
       </BlockSlot>
       <BlockSlot @name="actions">
   {{#if (can "create tokens")}}
-    <Hds::Button
-      @text='Create'
-      @route='dc.acls.tokens.create'
-      data-test-create
-    />
+          <a data-test-create href="{{href-to 'dc.acls.tokens.create'}}" class="type-create">Create</a>
   {{/if}}
       </BlockSlot>
       <BlockSlot @name="toolbar">
@@ -85,14 +76,16 @@ as |route|>
       </BlockSlot>
       <BlockSlot @name="content">
     {{#if (token/is-legacy items)}}
-      <Hds::Alert @type='inline' class='mb-3 mt-3' as |A|>
-        <A.Title>Update</A.Title>
-        <A.Description data-test-notification-update>We have upgraded our ACL System to allow the creation of reusable policies that can be applied to tokens. Read more about the changes and how to upgrade legacy tokens.</A.Description>
-        <A.Link::Standalone @text='Learn more'
-                            @href="{{env 'CONSUL_DOCS_URL'}}/guides/acl-migrate-tokens.html"
-                            @icon='docs-link'
-                            @iconPosition='trailing' />
-      </Hds::Alert>
+        <Notice
+          @type="info"
+        as |notice|>
+          <notice.Header>
+            <h2>Update</h2>
+          </notice.Header>
+          <notice.Body>
+            <p data-test-notification-update>We have upgraded our ACL System to allow the creation of reusable policies that can be applied to tokens. Read more about the changes and how to upgrade legacy tokens in our <a href="{{env 'CONSUL_DOCS_URL'}}/guides/acl-migrate-tokens.html" target="_blank" rel="noopener noreferrer">documentation</a>.</p>
+          </notice.Body>
+        </Notice>
     {{/if}}
         <DataCollection
           @type="token"
diff --git a/ui/packages/consul-ui/app/templates/dc/intentions/edit.hbs b/ui/packages/consul-ui/app/templates/dc/intentions/edit.hbs
index 8f44fe34fd54c..2affe93b2808e 100644
--- a/ui/packages/consul-ui/app/templates/dc/intentions/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/intentions/edit.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs b/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs
index b4d12269ca161..88406a1c43d65 100644
--- a/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -59,11 +54,7 @@ as |route|>
       </BlockSlot>
       <BlockSlot @name="actions">
   {{#if (can 'create intentions')}}
-    <Hds::Button
-      @text='Create'
-      @route='dc.intentions.create'
-      data-test-create
-    />
+          <a data-test-create href="{{href-to 'dc.intentions.create'}}" class="type-create">Create</a>
   {{/if}}
       </BlockSlot>
       <BlockSlot @name="toolbar">
@@ -128,23 +119,11 @@ as |route|>
                     }}
                   </BlockSlot>
                   <BlockSlot @name="actions">
-                    <li>
-                      <Hds::Link::Standalone
-                        @text='Documentation on intentions'
-                        @href="{{env 'CONSUL_DOCS_URL'}}/commands/intention"
-                        @icon='docs-link'
-                        @iconPosition='trailing'
-                        @size='small'
-                      />
+                    <li class="docs-link">
+                      <a href="{{env 'CONSUL_DOCS_URL'}}/commands/intention" rel="noopener noreferrer" target="_blank">Documentation on intentions</a>
                     </li>
-                    <li>
-                      <Hds::Link::Standalone
-                        @text='Take the tutorial'
-                        @href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/getting-started/connect"
-                        @icon='learn-link'
-                        @iconPosition='trailing'
-                        @size='small'
-                      />
+                    <li class="learn-link">
+                      <a href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/getting-started/connect" rel="noopener noreferrer" target="_blank">Take the tutorial</a>
                     </li>
                   </BlockSlot>
                 </EmptyState>
diff --git a/ui/packages/consul-ui/app/templates/dc/kv/edit.hbs b/ui/packages/consul-ui/app/templates/dc/kv/edit.hbs
index 3278a55ea2a49..282b670a402a8 100644
--- a/ui/packages/consul-ui/app/templates/dc/kv/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/kv/edit.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/kv/index.hbs b/ui/packages/consul-ui/app/templates/dc/kv/index.hbs
index c730f719b6d0e..ec0dc58497f20 100644
--- a/ui/packages/consul-ui/app/templates/dc/kv/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/kv/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -35,35 +30,56 @@ as |route|>
     </BlockSlot>
       <BlockSlot @name="disconnected" as |after|>
         {{#if (eq loader.error.status "404")}}
-          <Hds::Toast
-            @color='warning'
-            {{notification sticky=true}}
-            as |T|>
-            <T.Title>Warning!</T.Title>
-            <T.Description>
-              This KV or parent of this KV was deleted.
-            </T.Description>
-          </Hds::Toast>
+          <Notice
+            {{notification
+              sticky=true
+            }}
+            class="notification-update"
+            @type="warning"
+          as |notice|>
+            <notice.Header>
+              <strong>Warning!</strong>
+            </notice.Header>
+            <notice.Body>
+              <p>
+                This KV or parent of this KV was deleted.
+              </p>
+            </notice.Body>
+          </Notice>
         {{else if (eq loader.error.status "403")}}
-          <Hds::Toast
-            @color='critical'
-            {{notification sticky=true}}
-            as |T|>
-            <T.Title>Error!</T.Title>
-            <T.Description>
-              You no longer have access to this KV.
-            </T.Description>
-          </Hds::Toast>
+          <Notice
+            {{notification
+              sticky=true
+            }}
+            class="notification-update"
+            @type="error"
+          as |notice|>
+            <notice.Header>
+              <strong>Error!</strong>
+            </notice.Header>
+            <notice.Body>
+              <p>
+                You no longer have access to this KV.
+              </p>
+            </notice.Body>
+          </Notice>
         {{else}}
-          <Hds::Toast
-            @color='warning'
-            {{notification sticky=true}}
-            as |T|>
-            <T.Title>Warning!</T.Title>
-            <T.Description>
-              An error was returned whilst loading this data, refresh to try again.
-            </T.Description>
-          </Hds::Toast>
+          <Notice
+            {{notification
+              sticky=true
+            }}
+            class="notification-update"
+            @type="warning"
+          as |notice|>
+            <notice.Header>
+              <strong>Warning!</strong>
+            </notice.Header>
+            <notice.Body>
+              <p>
+                An error was returned whilst loading this data, refresh to try again.
+              </p>
+            </notice.Body>
+          </Notice>
         {{/if}}
       </BlockSlot>
 
@@ -121,19 +137,10 @@ as |sort filters parent items|}}
       </BlockSlot>
       <BlockSlot @name="actions">
 {{#if (can 'create kvs')}}
-    {{#if (and parent.Key (not-eq parent.Key '/')) }}
-      <Hds::Button
-        @text='Create'
-        @isHrefExternal={{false}}
-        @href="{{href-to 'dc.kv.create' parent.Key}}"
-        data-test-create
-      />
+    {{#if (not-eq parent.Key '/') }}
+          <a data-test-create href="{{href-to 'dc.kv.create' parent.Key}}" class="type-create">Create</a>
     {{else}}
-      <Hds::Button
-        @text='Create'
-        @route='dc.kv.root-create'
-        data-test-create
-      />
+          <a data-test-create href="{{href-to 'dc.kv.root-create'}}" class="type-create">Create</a>
     {{/if}}
 {{/if}}
       </BlockSlot>
@@ -184,23 +191,11 @@ as |sort filters parent items|}}
                     }}
                   </BlockSlot>
                   <BlockSlot @name="actions">
-                    <li>
-                      <Hds::Link::Standalone
-                        @text='Documentation on K/V'
-                        @href="{{env 'CONSUL_DOCS_URL'}}/agent/kv"
-                        @icon='docs-link'
-                        @iconPosition='trailing'
-                        @size='small'
-                      />
+                    <li class="docs-link">
+                      <a href="{{env 'CONSUL_DOCS_URL'}}/agent/kv" rel="noopener noreferrer" target="_blank">Documentation on K/V</a>
                     </li>
-                    <li>
-                      <Hds::Link::Standalone
-                        @text='Take the tutorial'
-                        @href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/getting-started/kv"
-                        @icon='learn-link'
-                        @iconPosition='trailing'
-                        @size='small'
-                      />
+                    <li class="learn-link">
+                      <a href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/getting-started/kv" rel="noopener noreferrer" target="_blank">Take the tutorial</a>
                     </li>
                   </BlockSlot>
                 </EmptyState>
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs
index 9e9f14d9be9cf..8459018cce551 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route @name={{routeName}} as |route|>
 
   <DataSource
@@ -40,15 +35,10 @@
               change=(action (mut searchproperty) value='target.selectedItems')
               default=this._searchProperties
             )
-            version=(hash 
-              value=(if this.version (split this.version ',') undefined)
-              change=(action (mut this.version) value='target.selectedItems')
-            )
           )
           api.data
           leader.data
-          api.data.meta.versions
-          as |sort filters items leader versions|
+          as |sort filters items leader|
         }}
           {{#let (reject-by 'Meta.synthetic-node' items) as |filtered|}}
             <AppView>
@@ -66,7 +56,6 @@
                     @onsearch={{action (mut search) value='target.value'}}
                     @sort={{sort}}
                     @filter={{filters}}
-                    @versions={{versions}}
                   />
                 {{/if}}
               </BlockSlot>
@@ -99,27 +88,25 @@
                         }}
                       </BlockSlot>
                       <BlockSlot @name='actions'>
-                        <li>
-                          <Hds::Button
-                            @text={{t 'routes.dc.nodes.index.empty.documentation'}}
-                            @href='{{env "CONSUL_DOCS_DEVELOPER_URL"}}/agent'
-                            @color='tertiary'
-                            @icon='docs-link'
-                            @iconPosition='trailing'
-                            @size='small'
-                          />
+                        <li class='docs-link'>
+                          <a
+                            href='{{env "CONSUL_DOCS_DEVELOPER_URL"}}/agent'
+                            rel='noopener noreferrer'
+                            target='_blank'
+                          >
+                            {{t 'routes.dc.nodes.index.empty.documentation'}}
+                          </a>
                         </li>
-                        <li>
-                          <Hds::Button
-                            @text={{t 'routes.dc.nodes.index.empty.learn'}}
-                            @href='{{env
+                        <li class='learn-link'>
+                          <a
+                            href='{{env
                               "CONSUL_DOCS_LEARN_URL"
                             }}/tutorials/consul/deployment-guide?in=consul/production-deploy#configure-consul-agents'
-                            @color='tertiary'
-                            @icon='learn-link'
-                            @iconPosition='trailing'
-                            @size='small'
-                          />
+                            rel='noopener noreferrer'
+                            target='_blank'
+                          >
+                            {{t 'routes.dc.nodes.index.empty.learn'}}
+                          </a>
                         </li>
                       </BlockSlot>
                     </EmptyState>
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs
index 5b8aba956730d..ec7f464939982 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -34,32 +29,56 @@ as |route|>
 
     <BlockSlot @name="disconnected" as |after|>
       {{#if (eq loader.error.status "404")}}
-        <Hds::Toast
-          @color='warning'
+        <Notice
           {{notification
             sticky=true
-          }} as |T|>
-          <T.Title>Warning!</T.Title>
-          <T.Description>This node no longer exists in the catalog.</T.Description>
-        </Hds::Toast>
+          }}
+          class="notification-update"
+          @type="warning"
+        as |notice|>
+          <notice.Header>
+            <strong>Warning!</strong>
+          </notice.Header>
+          <notice.Body>
+            <p>
+              This node no longer exists in the catalog.
+            </p>
+          </notice.Body>
+        </Notice>
       {{else if (eq loader.error.status "403")}}
-        <Hds::Toast
-          @color='critical'
+        <Notice
           {{notification
             sticky=true
-          }} as |T|>
-          <T.Title>Error!</T.Title>
-          <T.Description>You no longer have access to this node.</T.Description>
-        </Hds::Toast>
+          }}
+          class="notification-update"
+          @type="error"
+        as |notice|>
+          <notice.Header>
+            <strong>Error!</strong>
+          </notice.Header>
+          <notice.Body>
+            <p>
+              You no longer have access to this node
+            </p>
+          </notice.Body>
+        </Notice>
       {{else}}
-        <Hds::Toast
-          @color='warning'
+        <Notice
           {{notification
             sticky=true
-          }} as |T|>
-          <T.Title>Warning!</T.Title>
-          <T.Description>An error was returned whilst loading this data, refresh to try again.</T.Description>
-        </Hds::Toast>
+          }}
+          class="notification-update"
+          @type="warning"
+        as |notice|>
+          <notice.Header>
+            <strong>Warning!</strong>
+          </notice.Header>
+          <notice.Body>
+            <p>
+              An error was returned whilst loading this data, refresh to try again.
+            </p>
+          </notice.Body>
+        </Notice>
       {{/if}}
     </BlockSlot>
     <BlockSlot @name="loaded">
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/healthchecks.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/healthchecks.hbs
index d073bd889eb4b..8a8f9b87659a1 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/show/healthchecks.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/healthchecks.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -54,10 +49,22 @@ as |route|>
           {{/if}}
           {{#let (find-by "Type" "serf" items) as |serf|}}
             {{#if (and serf (eq serf.Status "critical"))}}
-              <Hds::Alert @type="inline" @color="warning" class="mb-3 mt-2" data-test-critical-serf-notice as |A|>
-                <A.Title>{{t "routes.dc.nodes.show.healthchecks.critical-serf-notice.header"}}</A.Title>
-                <A.Description>{{t "routes.dc.nodes.show.healthchecks.critical-serf-notice.body"}}</A.Description>
-              </Hds::Alert>
+              <Notice
+                data-test-critical-serf-notice
+                @type="warning"
+              as |notice|>
+                <notice.Header>
+                  <h2>
+                    {{t "routes.dc.nodes.show.healthchecks.critical-serf-notice.header"}}
+                  </h2>
+                </notice.Header>
+                <notice.Body>
+                  {{t
+                    "routes.dc.nodes.show.healthchecks.critical-serf-notice.body"
+                    htmlSafe=true
+                  }}
+                </notice.Body>
+              </Notice>
             {{/if}}
           {{/let}}
           <DataCollection
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/index.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/index.hbs
index 9cecd7e83193b..097d75ac315a4 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/show/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs
index 89cc3e12f4ff4..cc5b84fff62f3 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/rtt.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/rtt.hbs
index 3ce2159ca5ea4..4be2a3b740a87 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/show/rtt.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/rtt.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/services.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/services.hbs
index 05499d8141c9e..2c7c67a18513e 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/show/services.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/services.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/routing-config.hbs b/ui/packages/consul-ui/app/templates/dc/routing-config.hbs
index a141aad424501..0b61230620afe 100644
--- a/ui/packages/consul-ui/app/templates/dc/routing-config.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/routing-config.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/index.hbs
index 37a73c419f7fc..c5d53cf3016c1 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -123,23 +118,21 @@ as |sort filters items partition nspace|}}
                 }}
               </BlockSlot>
               <BlockSlot @name="actions">
-                <li>
-                  <Hds::Link::Standalone
-                    @text='Documentation on Services'
+                <li class="docs-link">
+                  <Action
                     @href="{{env 'CONSUL_DOCS_URL'}}/commands/services"
-                    @icon='docs-link'
-                    @iconPosition='trailing'
-                    @size='small'
-                  />
+                    @external={{true}}
+                  >
+                    Documentation on Services
+                  </Action>
                 </li>
-                <li>
-                  <Hds::Link::Standalone
-                    @text='Take the tutorial'
+                <li class="learn-link">
+                  <Action
                     @href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/getting-started/services"
-                    @icon='learn-link'
-                    @iconPosition='trailing'
-                    @size='small'
-                  />
+                    @external={{true}}
+                  >
+                    Take the tutorial
+                  </Action>
                 </li>
               </BlockSlot>
             </EmptyState>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance.hbs
index 4926bbd609f80..dcbb0a3ddb5c1 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route @name={{routeName}} as |route|>
   <DataLoader
     @src={{uri
@@ -26,35 +21,43 @@
 
     <BlockSlot @name='disconnected' as |after|>
       {{#if (eq loader.error.status '404')}}
-        <Hds::Toast
-          @color='warning'
+        <Notice
           {{notification sticky=true}}
-          as |T|>
-          <T.Title>Warning!</T.Title>
-          <T.Description>
-            This service has been deregistered and no longer exists in the catalog.
-          </T.Description>
-        </Hds::Toast>
+          class='notification-update'
+          @type='warning'
+          as |notice|
+        >
+          <notice.Header>
+            <strong>Warning!</strong>
+          </notice.Header>
+          <notice.Body>
+            <p>
+              This service has been deregistered and no longer exists in the catalog.
+            </p>
+          </notice.Body>
+        </Notice>
       {{else if (eq loader.error.status '403')}}
-        <Hds::Toast
-          @color='critical'
-          {{notification sticky=true}}
-          as |T|>
-          <T.Title>Error!</T.Title>
-          <T.Description>
-            You no longer have access to this service.
-          </T.Description>
-        </Hds::Toast>
+        <Notice {{notification sticky=true}} class='notification-update' @type='error' as |notice|>
+          <notice.Header>
+            <strong>Error!</strong>
+          </notice.Header>
+          <notice.Body>
+            <p>
+              You no longer have access to this service
+            </p>
+          </notice.Body>
+        </Notice>
       {{else}}
-        <Hds::Toast
-          @color='critical'
-          {{notification sticky=true}}
-          as |T|>
-          <T.Title>Warning!</T.Title>
-          <T.Description>
-            An error was returned whilst loading this data, refresh to try again.
-          </T.Description>
-        </Hds::Toast>
+        <Notice {{notification sticky=true}} class='notification-update' @type='error' as |notice|>
+          <notice.Header>
+            <strong>Warning!</strong>
+          </notice.Header>
+          <notice.Body>
+            <p>
+              An error was returned whilst loading this data, refresh to try again.
+            </p>
+          </notice.Body>
+        </Notice>
       {{/if}}
     </BlockSlot>
 
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs
index 1dcc4819a6297..45980f3ab7872 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs
index 0f04962d89f69..c044d97dd3c9a 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs
index c709bd91a2011..f9630f2d3bb42 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route @name={{routeName}} as |route|>
   {{#let
     (filter (action 'syntheticNodeSearchPropertyFilter' route.model.item) searchProperties)
@@ -50,13 +45,19 @@
 
         {{#let (find-by 'Type' 'serf' items) as |serf|}}
           {{#if (and serf (eq serf.Status 'critical'))}}
-            <Hds::Alert @type="inline" @color="warning" class="mb-3 mt-2" data-test-critical-serf-notice as |A|>
-              <A.Title>{{t 'routes.dc.services.instance.healthchecks.critical-serf-notice.header'}}</A.Title>
-              <A.Description>{{t
-                'routes.dc.services.instance.healthchecks.critical-serf-notice.body'
-                htmlSafe=true
-              }}</A.Description>
-            </Hds::Alert>
+            <Notice data-test-critical-serf-notice @type='warning' as |notice|>
+              <notice.Header>
+                <h2>
+                  {{t 'routes.dc.services.instance.healthchecks.critical-serf-notice.header'}}
+                </h2>
+              </notice.Header>
+              <notice.Body>
+                {{t
+                  'routes.dc.services.instance.healthchecks.critical-serf-notice.body'
+                  htmlSafe=true
+                }}
+              </notice.Body>
+            </Notice>
           {{/if}}
         {{/let}}
         <DataCollection
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs
index 1b69aab03c8ba..ed36fdf7a33c5 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
index 7db110dd36db0..c5282482fe808 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -49,19 +44,25 @@ as |route|>
       {{! TODO: Looks like we can get this straight from item.Proxy.Mode }}
       {{! the less we need `proxy` and `meta` the better }}
       {{#if (eq meta.ServiceProxy.Mode 'transparent')}}
-        <Hds::Alert @type="inline" @color="warning" class="mb-3 mt-2" as |A|>
-          <A.Title>{{t "routes.dc.services.instance.upstreams.tproxy-mode.header"}}</A.Title>
-          <A.Description>
-            {{t "routes.dc.services.instance.upstreams.tproxy-mode.body"}}
-          </A.Description>
-          <A.Link::Standalone
-            @text={{t "routes.dc.services.instance.upstreams.tproxy-mode.footer.text"}}
-            @href='{{concat (env 'CONSUL_DOCS_URL') (t "routes.dc.services.instance.upstreams.tproxy-mode.footer.link")}}'
-            @icon="docs-link"
-            @iconPosition="trailing"
-            @size="small"
-          />
-        </Hds::Alert>
+        <Notice
+          @type="warning"
+        as |notice|>
+          <notice.Header>
+            <h3>
+              {{t "routes.dc.services.instance.upstreams.tproxy-mode.header"}}
+            </h3>
+          </notice.Header>
+          <notice.Body>
+            {{t "routes.dc.services.instance.upstreams.tproxy-mode.body"
+              htmlSafe=true
+            }}
+          </notice.Body>
+          <notice.Footer>
+            {{t "routes.dc.services.instance.upstreams.tproxy-mode.footer"
+              htmlSafe=true
+            }}
+          </notice.Footer>
+        </Notice>
       {{/if}}
       <DataCollection
         @type="upstream-instance"
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show.hbs b/ui/packages/consul-ui/app/templates/dc/services/show.hbs
index 18fa606c71f98..e8c0044e65a25 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -27,32 +22,56 @@ as |route|>
 
       <BlockSlot @name="disconnected" as |after|>
         {{#if (eq loader.error.status "404")}}
-          <Hds::Toast
-            @color='warning'
+          <Notice
             {{notification
               sticky=true
-            }} as |T|>
-            <T.Title>Warning!</T.Title>
-            <T.Description>This service has been deregistered and no longer exists in the catalog.</T.Description>
-          </Hds::Toast>
+            }}
+            class="notification-update"
+            @type="warning"
+          as |notice|>
+            <notice.Header>
+              <strong>Warning!</strong>
+            </notice.Header>
+            <notice.Body>
+              <p>
+                This service has been deregistered and no longer exists in the catalog.
+              </p>
+            </notice.Body>
+          </Notice>
         {{else if (eq loader.error.status "403")}}
-          <Hds::Toast
-            @color='critical'
+          <Notice
             {{notification
               sticky=true
-            }} as |T|>
-            <T.Title>Error!</T.Title>
-            <T.Description>You no longer have access to this service.</T.Description>
-          </Hds::Toast>
+            }}
+            class="notification-update"
+            @type="error"
+          as |notice|>
+            <notice.Header>
+              <strong>Error!</strong>
+            </notice.Header>
+            <notice.Body>
+              <p>
+                You no longer have access to this service
+              </p>
+            </notice.Body>
+          </Notice>
         {{else}}
-          <Hds::Toast
-            @color='warning'
+          <Notice
             {{notification
               sticky=true
-            }} as |T|>
-            <T.Title>Warning!</T.Title>
-            <T.Description>An error was returned whilst loading this data, refresh to try again.</T.Description>
-          </Hds::Toast>
+            }}
+            class="notification-update"
+            @type="warning"
+          as |notice|>
+            <notice.Header>
+              <strong>Warning!</strong>
+            </notice.Header>
+            <notice.Body>
+              <p>
+                An error was returned whilst loading this data, refresh to try again.
+              </p>
+            </notice.Body>
+          </Notice>
         {{/if}}
       </BlockSlot>
 
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/index.hbs
index 391a2fc70a06a..1ab6982dcd1fb 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs
index 8ea481e651a4a..cde2e5ed91c8c 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/intentions.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/intentions.hbs
index ad4664bcd38c8..a02351727a2b4 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/intentions.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/intentions.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/intentions/edit.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/intentions/edit.hbs
index e8bd180c30518..719190902dd1c 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/intentions/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/intentions/edit.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs
index 92429b9abb971..763e47e63a9ca 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -49,11 +44,7 @@ as |route|>
     <div class="tab-section">
   {{#if (can 'create intention for service' item=item.Service)}}
         <Portal @target="app-view-actions">
-          <Hds::Button
-            @text='Create'
-            @route='dc.services.show.intentions.create'
-            data-test-create
-          />
+          <a data-test-create href={{href-to 'dc.services.show.intentions.create'}} class="type-create">Create</a>
         </Portal>
   {{/if}}
   {{#if (gt items.length 0) }}
@@ -116,23 +107,11 @@ as |route|>
                     }}
                   </BlockSlot>
                   <BlockSlot @name="actions">
-                    <li>
-                      <Hds::Link::Standalone
-                        @text='Documentation on intentions'
-                        @href="{{env 'CONSUL_DOCS_URL'}}/commands/intention"
-                        @icon='docs-link'
-                        @iconPosition='trailing'
-                        @size='small'
-                      />
+                    <li class="docs-link">
+                      <a href="{{env 'CONSUL_DOCS_URL'}}/commands/intention" rel="noopener noreferrer" target="_blank">Documentation on intentions</a>
                     </li>
-                    <li>
-                      <Hds::Link::Standalone
-                        @text='Take the tutorial'
-                        @href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/getting-started/connect"
-                        @icon='learn-link'
-                        @iconPosition='trailing'
-                        @size='small'
-                      />
+                    <li class="learn-link">
+                      <a href="{{env 'CONSUL_DOCS_LEARN_URL'}}/consul/getting-started/connect" rel="noopener noreferrer" target="_blank">Take the tutorial</a>
                     </li>
                   </BlockSlot>
                 </EmptyState>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/routing.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/routing.hbs
index 20e0c5c982404..cd1254b117487 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/routing.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/routing.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/services.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/services.hbs
index 337490004596e..04d568e8ecb66 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/services.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/services.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/tags.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/tags.hbs
index 8d2e1f661ae78..5aae2f633f166 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/tags.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/tags.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs
index 4354e1e3a8877..2c4e99d4b3887 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -64,61 +59,51 @@ as |nspace dc items topology|}}
                 <disclosure.Details
                   @auto={{false}}
                 as |details|>
-                  <Hds::Alert id={{details.id}}
-                              @type='inline'
-                              @color={{if (includes prop (array 'filtered-by-acls' 'no-dependencies'))
-                                          'neutral'
-                                          'warning'}}
-                              class='mb-3 mt-2 topology-metrics-notice'
-                              data-test-notice={{prop}}
-                              as |A|>
-                    <A.Title>
-                      {{compute (fn route.t 'notice.${prop}.header'
-                                  (hash
-                                    prop=prop
-                                  ))
-                      }}
-                    </A.Title>
+                  <Notice
+                    class="topology-metrics-notice"
+                    id={{details.id}}
+                    data-test-notice={{prop}}
+                    @type={{if (includes prop (array 'filtered-by-acls' 'no-dependencies'))
+                      'info'
+                      'warning'
+                    }}
+                  as |notice|>
+                    <notice.Header>
+                      <h3>
+                        {{compute (fn route.t 'notice.${prop}.header'
+                          (hash
+                            prop=prop
+                          )
+                        )}}
+                      </h3>
+                    </notice.Header>
                     {{#if disclosure.expanded}}
-                      <A.Description>
-                        {{compute (fn route.t 'notice.${prop}.body'
-                                    (hash
-                                      prop=prop
-                                    ))
-                        }}
-                      </A.Description>
+                      <notice.Body>
+                        <p>
+                          {{compute (fn route.t 'notice.${prop}.body'
+                            (hash
+                              prop=prop
+                            )
+                          )}}
+                        </p>
+                      </notice.Body>
                     {{/if}}
-                    {{#if (and disclosure.expanded (not-eq prop 'filtered-by-acls'))}}
-                      {{#if (includes prop (array 'wildcard-intention' 'default-allow' 'no-intentions'))}}
-                        <A.Button
-                          @color='secondary'
-                          @size='small'
-                          @route='dc.services.show.intentions'
-                          @text={{compute (fn route.t 'notice.${prop}.footer.link-text'
-                                            (hash
-                                              prop=prop
-                                            ))}}
-                          @icon={{compute (fn route.t 'notice.${prop}.footer.icon'
-                                            (hash
-                                              prop=prop
-                                            ))}}
-                        />
-                      {{else}}
-                        <A.Link::Standalone
-                          @text={{compute (fn route.t 'notice.${prop}.footer.link-text'
-                                            (hash
-                                              prop=prop
-                                            ))}}
-                          @href={{compute (fn route.t 'notice.${prop}.footer.link'
-                                            (hash
-                                              prop=prop
-                                            ))}}
-                          @icon='docs-link'
-                          @iconPosition='trailing'
-                        />
+                    {{#let
+                      (compute (fn route.t 'notice.${prop}.footer'
+                        (hash
+                          route_intentions=(href-to 'dc.services.show.intentions')
+                          prop=prop
+                          htmlSafe=true
+                        )
+                      ))
+                    as |footer|}}
+                      {{#if (and disclosure.expanded (not-eq prop 'filtered-by-acls'))}}
+                        <notice.Footer>
+                          {{footer}}
+                        </notice.Footer>
                       {{/if}}
-                    {{/if}}
-                  </Hds::Alert>
+                    {{/let}}
+                  </Notice>
                 </disclosure.Details>
               {{/if}}
             {{/each-in}}
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs
index 661c7e77b09e0..1f4c8efbc2596 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/show.hbs b/ui/packages/consul-ui/app/templates/dc/show.hbs
index 7d9b7462c4cf7..497c2a100e55d 100644
--- a/ui/packages/consul-ui/app/templates/dc/show.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/show.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/show/index.hbs b/ui/packages/consul-ui/app/templates/dc/show/index.hbs
index fe7d8ceb78e5b..96d39860a1ba1 100644
--- a/ui/packages/consul-ui/app/templates/dc/show/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/show/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/dc/show/license.hbs b/ui/packages/consul-ui/app/templates/dc/show/license.hbs
index 669abf7fb0d4d..3b5861210edee 100644
--- a/ui/packages/consul-ui/app/templates/dc/show/license.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/show/license.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -29,29 +24,56 @@ as |item|}}
 
     <BlockSlot @name="disconnected" as |after|>
       {{#if (eq loader.error.status "404")}}
-        <Hds::Toast @color='warning'
+        <Notice
           {{notification
             sticky=true
-          }} as |T|>
-          <T.Title>Warning!</T.Title>
-          <T.Description>This service has been deregistered and no longer exists in the catalog.</T.Description>
-        </Hds::Toast>
+          }}
+          class="notification-update"
+          @type="warning"
+        as |notice|>
+          <notice.Header>
+            <strong>Warning!</strong>
+          </notice.Header>
+          <notice.Body>
+            <p>
+              This service has been deregistered and no longer exists in the catalog.
+            </p>
+          </notice.Body>
+        </Notice>
       {{else if (eq loader.error.status "403")}}
-        <Hds::Toast @color='critical'
+        <Notice
           {{notification
             sticky=true
-          }} as |T|>
-          <T.Title>Error!</T.Title>
-          <T.Description>You no longer have access to this service.</T.Description>
-        </Hds::Toast>
+          }}
+          class="notification-update"
+          @type="error"
+        as |notice|>
+          <notice.Header>
+            <strong>Error!</strong>
+          </notice.Header>
+          <notice.Body>
+            <p>
+              You no longer have access to this service
+            </p>
+          </notice.Body>
+        </Notice>
       {{else}}
-        <Hds::Toast @color='warning'
+        <Notice
           {{notification
             sticky=true
-          }} as |T|>
-          <T.Title>Warning!</T.Title>
-          <T.Description>An error was returned whilst loading this data, refresh to try again.</T.Description>
-        </Hds::Toast>
+          }}
+          class="notification-update"
+          @type="warning"
+        as |notice|>
+          <notice.Header>
+            <strong>Warning!</strong>
+          </notice.Header>
+          <notice.Body>
+            <p>
+              An error was returned whilst loading this data, refresh to try again.
+            </p>
+          </notice.Body>
+        </Notice>
       {{/if}}
     </BlockSlot>
 
@@ -115,26 +137,11 @@ as |item|}}
                 {{compute (fn route.t 'documentation.title')}}
               </h3>
             </header>
-            <div class="flex gap-1.5 flex-col">
-              <Hds::Link::Standalone
-                @text={{compute (fn route.t 'documentation.links.license-expiration.text')}}
-                @href='{{concat (env 'CONSUL_DOCS_URL') (compute (fn route.t 'documentation.links.license-expiration.link'))}}'
-                @icon='docs-link'
-                @iconPosition='trailing'
-              />
-              <Hds::Link::Standalone
-                @text={{compute (fn route.t 'documentation.links.renewing-license.text')}}
-                @href='{{concat (env 'CONSUL_DOCS_URL') (compute (fn route.t 'documentation.links.renewing-license.link'))}}'
-                @icon='docs-link'
-                @iconPosition='trailing'
-              />
-              <Hds::Link::Standalone
-                @text={{compute (fn route.t 'documentation.links.applying-new-license.text')}}
-                @href='{{concat (env 'CONSUL_DOCS_URL') (compute (fn route.t 'documentation.links.applying-new-license.link'))}}'
-                @icon='docs-link'
-                @iconPosition='trailing'
-              />
-            </div>
+            {{compute (fn route.t 'documentation.body'
+              (hash
+                htmlSafe=true
+              )
+            )}}
           </aside>
 
         </section>
diff --git a/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs b/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs
index 7f4ae6bb5ffe0..dd2472ec80ded 100644
--- a/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -29,32 +24,56 @@ as |item|}}
 
     <BlockSlot @name="disconnected" as |after|>
       {{#if (eq loader.error.status "404")}}
-        <Hds::Toast
-          @color='warning'
+        <Notice
           {{notification
             sticky=true
-          }} as |T|>
-          <T.Title>Warning!</T.Title>
-          <T.Description>This service has been deregistered and no longer exists in the catalog.</T.Description>
-        </Hds::Toast>
+          }}
+          class="notification-update"
+          @type="warning"
+        as |notice|>
+          <notice.Header>
+            <strong>Warning!</strong>
+          </notice.Header>
+          <notice.Body>
+            <p>
+              This service has been deregistered and no longer exists in the catalog.
+            </p>
+          </notice.Body>
+        </Notice>
       {{else if (eq loader.error.status "403")}}
-        <Hds::Toast
-          @color='critical'
+        <Notice
           {{notification
             sticky=true
-          }} as |T|>
-          <T.Title>Error!</T.Title>
-          <T.Description>You no longer have access to this service.</T.Description>
-        </Hds::Toast>
+          }}
+          class="notification-update"
+          @type="error"
+        as |notice|>
+          <notice.Header>
+            <strong>Error!</strong>
+          </notice.Header>
+          <notice.Body>
+            <p>
+              You no longer have access to this service
+            </p>
+          </notice.Body>
+        </Notice>
       {{else}}
-        <Hds::Toast
-          @color='warning'
+        <Notice
           {{notification
             sticky=true
-          }} as |T|>
-          <T.Title>Warning!</T.Title>
-          <T.Description>An error was returned whilst loading this data, refresh to try again.</T.Description>
-        </Hds::Toast>
+          }}
+          class="notification-update"
+          @type="warning"
+        as |notice|>
+          <notice.Header>
+            <strong>Warning!</strong>
+          </notice.Header>
+          <notice.Body>
+            <p>
+              An error was returned whilst loading this data, refresh to try again.
+            </p>
+          </notice.Body>
+        </Notice>
       {{/if}}
     </BlockSlot>
 
@@ -68,15 +87,12 @@ as |item|}}
           >
 
             <header>
+              {{compute (fn route.t 'tolerance.link' (hash
+                htmlSafe=true
+              ))}}
               <h2>
                 {{compute (fn route.t 'tolerance.header')}}
               </h2>
-              <Hds::Link::Standalone
-                @icon='docs-link'
-                @iconPosition='trailing'
-                @text={{compute (fn route.t 'tolerance.link-text')}}
-                @href='{{concat (env 'CONSUL_DOCS_URL') (compute (fn route.t 'tolerance.link'))}}'
-              />
             </header>
 
             <section
diff --git a/ui/packages/consul-ui/app/templates/debug.hbs b/ui/packages/consul-ui/app/templates/debug.hbs
index dbdff5ff8e5d3..b767b51971f27 100644
--- a/ui/packages/consul-ui/app/templates/debug.hbs
+++ b/ui/packages/consul-ui/app/templates/debug.hbs
@@ -1,20 +1,15 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{page-title 'Engineering Docs - Consul' separator=' - '}}
 
-{{document-attrs class="is-debug" }}
+{{document-attrs class="is-debug"}}
 {{! Tell CSS what we have enabled }}
 {{#if (can "use acls")}}
-  {{document-attrs class="has-acls" }}
+  {{document-attrs class="has-acls"}}
 {{/if}}
 {{#if (can "use nspaces")}}
-  {{document-attrs class="has-nspaces" }}
+  {{document-attrs class="has-nspaces"}}
 {{/if}}
 {{#if (can "use partitions")}}
-  {{document-attrs class="has-partitions" }}
+  {{document-attrs class="has-partitions"}}
 {{/if}}
 <App class="docs" id="wrapper">
 
diff --git a/ui/packages/consul-ui/app/templates/error.hbs b/ui/packages/consul-ui/app/templates/error.hbs
index 196b78779640a..5b4d4e210a82f 100644
--- a/ui/packages/consul-ui/app/templates/error.hbs
+++ b/ui/packages/consul-ui/app/templates/error.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{#if error}}
 <AppError @error={{error}} />
 {{/if}}
diff --git a/ui/packages/consul-ui/app/templates/index.hbs b/ui/packages/consul-ui/app/templates/index.hbs
index ad4664bcd38c8..a02351727a2b4 100644
--- a/ui/packages/consul-ui/app/templates/index.hbs
+++ b/ui/packages/consul-ui/app/templates/index.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/loading.hbs b/ui/packages/consul-ui/app/templates/loading.hbs
index c7faa82f2bb8f..e69de29bb2d1d 100644
--- a/ui/packages/consul-ui/app/templates/loading.hbs
+++ b/ui/packages/consul-ui/app/templates/loading.hbs
@@ -1,5 +0,0 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
diff --git a/ui/packages/consul-ui/app/templates/notfound.hbs b/ui/packages/consul-ui/app/templates/notfound.hbs
index 9e9a350a3f5ab..65398b0437b71 100644
--- a/ui/packages/consul-ui/app/templates/notfound.hbs
+++ b/ui/packages/consul-ui/app/templates/notfound.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/oauth-provider-debug.hbs b/ui/packages/consul-ui/app/templates/oauth-provider-debug.hbs
index ea9f223fdc2f8..6c2db7d4fcc1b 100644
--- a/ui/packages/consul-ui/app/templates/oauth-provider-debug.hbs
+++ b/ui/packages/consul-ui/app/templates/oauth-provider-debug.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/app/templates/settings.hbs b/ui/packages/consul-ui/app/templates/settings.hbs
index 66251636dccef..4493bb936e21a 100644
--- a/ui/packages/consul-ui/app/templates/settings.hbs
+++ b/ui/packages/consul-ui/app/templates/settings.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
@@ -31,10 +26,18 @@ as |item|}}
       </h1>
     </BlockSlot>
     <BlockSlot @name="content">
-      <Hds::Alert @type="inline" class='mb-3 mt-2' as |A|>
-        <A.Title>Local Storage</A.Title>
-        <A.Description>These settings are immediately saved to local storage and persisted through browser usage.</A.Description>
-      </Hds::Alert>
+      <Notice
+        @type="info"
+      as |notice|>
+        <notice.Header>
+          <h2>Local Storage</h2>
+        </notice.Header>
+        <notice.Body>
+          <p>
+            These settings are immediately saved to local storage and persisted through browser usage.
+          </p>
+        </notice.Body>
+      </Notice>
       <form>
       {{#if (not (env 'CONSUL_UI_DISABLE_REALTIME'))}}
       <Disclosure as |disclosure|>
diff --git a/ui/packages/consul-ui/app/utils/ascend.js b/ui/packages/consul-ui/app/utils/ascend.js
index 0c7fe354d261a..1a4a34909f4bc 100644
--- a/ui/packages/consul-ui/app/utils/ascend.js
+++ b/ui/packages/consul-ui/app/utils/ascend.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (path, num) {
   const parts = path.split('/');
   return parts.length > num ? parts.slice(0, -num).concat('').join('/') : '';
diff --git a/ui/packages/consul-ui/app/utils/atob.js b/ui/packages/consul-ui/app/utils/atob.js
index 4afb5cfe471f0..3315790c3cf20 100644
--- a/ui/packages/consul-ui/app/utils/atob.js
+++ b/ui/packages/consul-ui/app/utils/atob.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import base64js from 'base64-js';
 export default function (str, encoding = 'utf-8') {
   // decode
diff --git a/ui/packages/consul-ui/app/utils/btoa.js b/ui/packages/consul-ui/app/utils/btoa.js
index ff7abdabc630f..0ac200d012311 100644
--- a/ui/packages/consul-ui/app/utils/btoa.js
+++ b/ui/packages/consul-ui/app/utils/btoa.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import base64js from 'base64-js';
 export default function (str) {
   // encode
diff --git a/ui/packages/consul-ui/app/utils/callable-type.js b/ui/packages/consul-ui/app/utils/callable-type.js
index 33a5f5fd2023e..6023bc92c3612 100644
--- a/ui/packages/consul-ui/app/utils/callable-type.js
+++ b/ui/packages/consul-ui/app/utils/callable-type.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (obj) {
   if (typeof obj !== 'function') {
     return function () {
diff --git a/ui/packages/consul-ui/app/utils/create-fingerprinter.js b/ui/packages/consul-ui/app/utils/create-fingerprinter.js
index 738b89233ecca..f2f46576303e2 100644
--- a/ui/packages/consul-ui/app/utils/create-fingerprinter.js
+++ b/ui/packages/consul-ui/app/utils/create-fingerprinter.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { get } from '@ember/object';
 import { isEmpty } from '@ember/utils';
 
diff --git a/ui/packages/consul-ui/app/utils/distance.js b/ui/packages/consul-ui/app/utils/distance.js
index 099f9e8e17114..1d1e33ac7bb31 100644
--- a/ui/packages/consul-ui/app/utils/distance.js
+++ b/ui/packages/consul-ui/app/utils/distance.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // TODO: Istanbul is ignored for the moment as it's not mine,
 // once I come here properly and 100% follow unignore
 /* istanbul ignore file */
diff --git a/ui/packages/consul-ui/app/utils/dom/click-first-anchor.js b/ui/packages/consul-ui/app/utils/dom/click-first-anchor.js
index 2f27a8c427c73..8d60125012cdf 100644
--- a/ui/packages/consul-ui/app/utils/dom/click-first-anchor.js
+++ b/ui/packages/consul-ui/app/utils/dom/click-first-anchor.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 const clickEvent = function ($el) {
   ['mousedown', 'mouseup', 'click']
     .map(function (type) {
diff --git a/ui/packages/consul-ui/app/utils/dom/closest.js b/ui/packages/consul-ui/app/utils/dom/closest.js
index eaabea413418c..db984b0c7fb15 100644
--- a/ui/packages/consul-ui/app/utils/dom/closest.js
+++ b/ui/packages/consul-ui/app/utils/dom/closest.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (sel, el) {
   // basic DOM closest utility to cope with no support
   // TODO: instead of degrading gracefully
diff --git a/ui/packages/consul-ui/app/utils/dom/create-listeners.js b/ui/packages/consul-ui/app/utils/dom/create-listeners.js
index 81d48ca239468..c603dfe1996b9 100644
--- a/ui/packages/consul-ui/app/utils/dom/create-listeners.js
+++ b/ui/packages/consul-ui/app/utils/dom/create-listeners.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 class Listeners {
   constructor(listeners = []) {
     this.listeners = listeners;
diff --git a/ui/packages/consul-ui/app/utils/dom/event-source/blocking.js b/ui/packages/consul-ui/app/utils/dom/event-source/blocking.js
index c5cf8c47b1fd0..ae2a25bb806ca 100644
--- a/ui/packages/consul-ui/app/utils/dom/event-source/blocking.js
+++ b/ui/packages/consul-ui/app/utils/dom/event-source/blocking.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { get } from '@ember/object';
 
 const pause = 2000;
diff --git a/ui/packages/consul-ui/app/utils/dom/event-source/cache.js b/ui/packages/consul-ui/app/utils/dom/event-source/cache.js
index 5427a72b49afa..34e2cb7eda5bc 100644
--- a/ui/packages/consul-ui/app/utils/dom/event-source/cache.js
+++ b/ui/packages/consul-ui/app/utils/dom/event-source/cache.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (source, DefaultEventSource, P = Promise) {
   return function (sources) {
     return function (cb, configuration) {
diff --git a/ui/packages/consul-ui/app/utils/dom/event-source/callable.js b/ui/packages/consul-ui/app/utils/dom/event-source/callable.js
index d96b40e79d47a..4d3ccd091fa75 100644
--- a/ui/packages/consul-ui/app/utils/dom/event-source/callable.js
+++ b/ui/packages/consul-ui/app/utils/dom/event-source/callable.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export const defaultRunner = function (target, configuration, isClosed) {
   if (isClosed(target)) {
     target.dispatchEvent({ type: 'close' });
diff --git a/ui/packages/consul-ui/app/utils/dom/event-source/index.js b/ui/packages/consul-ui/app/utils/dom/event-source/index.js
index f8b3dcffa82c6..80919d6e0bb51 100644
--- a/ui/packages/consul-ui/app/utils/dom/event-source/index.js
+++ b/ui/packages/consul-ui/app/utils/dom/event-source/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import ObjectProxy from '@ember/object/proxy';
 import ArrayProxy from '@ember/array/proxy';
 
diff --git a/ui/packages/consul-ui/app/utils/dom/event-source/openable.js b/ui/packages/consul-ui/app/utils/dom/event-source/openable.js
index 0611663abe26d..516f74ea13ffc 100644
--- a/ui/packages/consul-ui/app/utils/dom/event-source/openable.js
+++ b/ui/packages/consul-ui/app/utils/dom/event-source/openable.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /**
  * Wraps an EventSource so that you can `close` and `reopen`
  *
diff --git a/ui/packages/consul-ui/app/utils/dom/event-source/proxy.js b/ui/packages/consul-ui/app/utils/dom/event-source/proxy.js
index 963a7401c6d1f..333e1322b0fc2 100644
--- a/ui/packages/consul-ui/app/utils/dom/event-source/proxy.js
+++ b/ui/packages/consul-ui/app/utils/dom/event-source/proxy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { get, set } from '@ember/object';
 
 const proxies = {};
diff --git a/ui/packages/consul-ui/app/utils/dom/event-source/resolver.js b/ui/packages/consul-ui/app/utils/dom/event-source/resolver.js
index 52560b9f318bc..3046f2da3a33c 100644
--- a/ui/packages/consul-ui/app/utils/dom/event-source/resolver.js
+++ b/ui/packages/consul-ui/app/utils/dom/event-source/resolver.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (P = Promise) {
   return function (source, listeners) {
     let current;
diff --git a/ui/packages/consul-ui/app/utils/dom/event-source/storage.js b/ui/packages/consul-ui/app/utils/dom/event-source/storage.js
index 66f56581f331c..183b4434c5ce8 100644
--- a/ui/packages/consul-ui/app/utils/dom/event-source/storage.js
+++ b/ui/packages/consul-ui/app/utils/dom/event-source/storage.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (EventTarget, P = Promise) {
   const handler = function (e) {
     // e is undefined on the opening call
diff --git a/ui/packages/consul-ui/app/utils/dom/get-component-factory.js b/ui/packages/consul-ui/app/utils/dom/get-component-factory.js
index d10c486646fb9..9bd69c3449aef 100644
--- a/ui/packages/consul-ui/app/utils/dom/get-component-factory.js
+++ b/ui/packages/consul-ui/app/utils/dom/get-component-factory.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (owner, key = '-view-registry:main') {
   const components = owner.lookup(key);
   return function (el) {
diff --git a/ui/packages/consul-ui/app/utils/dom/is-outside.js b/ui/packages/consul-ui/app/utils/dom/is-outside.js
index ea52f04928512..378140a38bafc 100644
--- a/ui/packages/consul-ui/app/utils/dom/is-outside.js
+++ b/ui/packages/consul-ui/app/utils/dom/is-outside.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (el, target, doc = document) {
   if (el) {
     // TODO: Potentially type check el and target
diff --git a/ui/packages/consul-ui/app/utils/dom/normalize-event.js b/ui/packages/consul-ui/app/utils/dom/normalize-event.js
index 206fcee9dc5b2..4b0f41ffe1bab 100644
--- a/ui/packages/consul-ui/app/utils/dom/normalize-event.js
+++ b/ui/packages/consul-ui/app/utils/dom/normalize-event.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (e, value, target = {}) {
   if (typeof e.target !== 'undefined') {
     return e;
diff --git a/ui/packages/consul-ui/app/utils/dom/qsa-factory.js b/ui/packages/consul-ui/app/utils/dom/qsa-factory.js
index fdaa675e9d89b..592db4749e173 100644
--- a/ui/packages/consul-ui/app/utils/dom/qsa-factory.js
+++ b/ui/packages/consul-ui/app/utils/dom/qsa-factory.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (doc = document) {
   return function (sel, context = doc) {
     return context.querySelectorAll(sel);
diff --git a/ui/packages/consul-ui/app/utils/dom/sibling.js b/ui/packages/consul-ui/app/utils/dom/sibling.js
index cd39e82ebb20e..cd2708990c8ab 100644
--- a/ui/packages/consul-ui/app/utils/dom/sibling.js
+++ b/ui/packages/consul-ui/app/utils/dom/sibling.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (el, name) {
   let sibling = el;
   while ((sibling = sibling.nextSibling)) {
diff --git a/ui/packages/consul-ui/app/utils/editor/lint.js b/ui/packages/consul-ui/app/utils/editor/lint.js
index 4c3e824e44bbd..ed38c4cfe8359 100644
--- a/ui/packages/consul-ui/app/utils/editor/lint.js
+++ b/ui/packages/consul-ui/app/utils/editor/lint.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /*global CodeMirror*/
 
 // CodeMirror doesn't seem to have anyway to hook into whether a mode
diff --git a/ui/packages/consul-ui/app/utils/filter/index.js b/ui/packages/consul-ui/app/utils/filter/index.js
index c46ec8452ca15..1791634ab6b17 100644
--- a/ui/packages/consul-ui/app/utils/filter/index.js
+++ b/ui/packages/consul-ui/app/utils/filter/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import setHelpers from 'mnemonist/set';
 
 const createPossibles = function (predicates) {
diff --git a/ui/packages/consul-ui/app/utils/form/builder.js b/ui/packages/consul-ui/app/utils/form/builder.js
index 0d9572ec9c44b..e0b140aa4c595 100644
--- a/ui/packages/consul-ui/app/utils/form/builder.js
+++ b/ui/packages/consul-ui/app/utils/form/builder.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { get, set } from '@ember/object';
 import { Changeset as createChangeset } from 'ember-changeset';
 import Changeset from 'consul-ui/utils/form/changeset';
diff --git a/ui/packages/consul-ui/app/utils/form/changeset.js b/ui/packages/consul-ui/app/utils/form/changeset.js
index 0fd0072679040..8073a68f79d6a 100644
--- a/ui/packages/consul-ui/app/utils/form/changeset.js
+++ b/ui/packages/consul-ui/app/utils/form/changeset.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { get } from '@ember/object';
 import { EmberChangeset as Changeset } from 'ember-changeset';
 const CHANGES = '_changes';
diff --git a/ui/packages/consul-ui/app/utils/get-environment.js b/ui/packages/consul-ui/app/utils/get-environment.js
index a4284a24f7d46..e427c38c12a80 100644
--- a/ui/packages/consul-ui/app/utils/get-environment.js
+++ b/ui/packages/consul-ui/app/utils/get-environment.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { runInDebug } from '@ember/debug';
 // 'environment' getter
 // there are currently 3 levels of environment variables:
diff --git a/ui/packages/consul-ui/app/utils/get-form-name-property.js b/ui/packages/consul-ui/app/utils/get-form-name-property.js
index b67f0a0c5d361..4ce8746210f53 100644
--- a/ui/packages/consul-ui/app/utils/get-form-name-property.js
+++ b/ui/packages/consul-ui/app/utils/get-form-name-property.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (name) {
   if (name.indexOf('[') !== -1) {
     return name.match(/(.*)\[(.*)\]/).slice(1);
diff --git a/ui/packages/consul-ui/app/utils/helpers/call-if-type.js b/ui/packages/consul-ui/app/utils/helpers/call-if-type.js
index 440daab7d88c5..73a58a5db12b3 100644
--- a/ui/packages/consul-ui/app/utils/helpers/call-if-type.js
+++ b/ui/packages/consul-ui/app/utils/helpers/call-if-type.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (type) {
   return function (cb) {
     return function (params, hash = {}) {
diff --git a/ui/packages/consul-ui/app/utils/http/consul.js b/ui/packages/consul-ui/app/utils/http/consul.js
index 6e30b4cb09c59..c9609b41d927c 100644
--- a/ui/packages/consul-ui/app/utils/http/consul.js
+++ b/ui/packages/consul-ui/app/utils/http/consul.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // TODO: Need to make all these headers capital case
 export const HEADERS_PARTITION = 'X-Consul-Partition';
 export const HEADERS_NAMESPACE = 'X-Consul-Namespace';
diff --git a/ui/packages/consul-ui/app/utils/http/create-headers.js b/ui/packages/consul-ui/app/utils/http/create-headers.js
index 842e808952783..9ead9e7ce7f0e 100644
--- a/ui/packages/consul-ui/app/utils/http/create-headers.js
+++ b/ui/packages/consul-ui/app/utils/http/create-headers.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function () {
   return function (lines) {
     return lines.reduce(function (prev, item) {
diff --git a/ui/packages/consul-ui/app/utils/http/create-query-params.js b/ui/packages/consul-ui/app/utils/http/create-query-params.js
index 54c6b54864165..aade6f0b5cfec 100644
--- a/ui/packages/consul-ui/app/utils/http/create-query-params.js
+++ b/ui/packages/consul-ui/app/utils/http/create-query-params.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (encode = encodeURIComponent) {
   return function stringify(obj, parent) {
     return Object.entries(obj)
diff --git a/ui/packages/consul-ui/app/utils/http/create-url.js b/ui/packages/consul-ui/app/utils/http/create-url.js
index ad7e40d1c5448..aa0f8096c5358 100644
--- a/ui/packages/consul-ui/app/utils/http/create-url.js
+++ b/ui/packages/consul-ui/app/utils/http/create-url.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // const METHOD_PARSING = 0;
 const PATH_PARSING = 1;
 const QUERY_PARSING = 2;
diff --git a/ui/packages/consul-ui/app/utils/http/error.js b/ui/packages/consul-ui/app/utils/http/error.js
index 7bfbddb8a50d4..ff2b222aa7f6b 100644
--- a/ui/packages/consul-ui/app/utils/http/error.js
+++ b/ui/packages/consul-ui/app/utils/http/error.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default class extends Error {
   constructor(statusCode, message) {
     super(message);
diff --git a/ui/packages/consul-ui/app/utils/http/headers.js b/ui/packages/consul-ui/app/utils/http/headers.js
index bdd5802ed6084..51dc7f9c9a377 100644
--- a/ui/packages/consul-ui/app/utils/http/headers.js
+++ b/ui/packages/consul-ui/app/utils/http/headers.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export const CACHE_CONTROL = 'Cache-Control';
 export const CONTENT_TYPE = 'Content-Type';
diff --git a/ui/packages/consul-ui/app/utils/http/method.js b/ui/packages/consul-ui/app/utils/http/method.js
index 9ed76983133d7..d7c44593c4cf7 100644
--- a/ui/packages/consul-ui/app/utils/http/method.js
+++ b/ui/packages/consul-ui/app/utils/http/method.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export const PUT = 'PUT';
 export const DELETE = 'DELETE';
 export const POST = 'POST';
diff --git a/ui/packages/consul-ui/app/utils/http/request.js b/ui/packages/consul-ui/app/utils/http/request.js
index 3388566d861ee..9737dfd31a845 100644
--- a/ui/packages/consul-ui/app/utils/http/request.js
+++ b/ui/packages/consul-ui/app/utils/http/request.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import EventTarget from 'consul-ui/utils/dom/event-target/rsvp';
 export default class extends EventTarget {
   constructor(method, url, headers) {
diff --git a/ui/packages/consul-ui/app/utils/http/status.js b/ui/packages/consul-ui/app/utils/http/status.js
index be6816ee2a55c..6b1a76873ab79 100644
--- a/ui/packages/consul-ui/app/utils/http/status.js
+++ b/ui/packages/consul-ui/app/utils/http/status.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export const OK = 200;
 export const UNAUTHORIZED = 401;
 export const FORBIDDEN = 403;
diff --git a/ui/packages/consul-ui/app/utils/http/xhr.js b/ui/packages/consul-ui/app/utils/http/xhr.js
index fcb688ed9c606..29440f2a23fcc 100644
--- a/ui/packages/consul-ui/app/utils/http/xhr.js
+++ b/ui/packages/consul-ui/app/utils/http/xhr.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (parseHeaders, XHR) {
   return function (options) {
     const xhr = new (XHR || XMLHttpRequest)();
diff --git a/ui/packages/consul-ui/app/utils/intl/missing-message.js b/ui/packages/consul-ui/app/utils/intl/missing-message.js
index a638cb7eddcf3..3d1758659987b 100644
--- a/ui/packages/consul-ui/app/utils/intl/missing-message.js
+++ b/ui/packages/consul-ui/app/utils/intl/missing-message.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* eslint no-console: ["error", { allow: ["debug"] }] */
 import { runInDebug } from '@ember/debug';
 
diff --git a/ui/packages/consul-ui/app/utils/isFolder.js b/ui/packages/consul-ui/app/utils/isFolder.js
index 55e8379c8c6ef..51b8c146a946b 100644
--- a/ui/packages/consul-ui/app/utils/isFolder.js
+++ b/ui/packages/consul-ui/app/utils/isFolder.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // Boolean if the key is a "folder" or not, i.e is a nested key
 // that feels like a folder.
 export default function (path = '') {
diff --git a/ui/packages/consul-ui/app/utils/keyToArray.js b/ui/packages/consul-ui/app/utils/keyToArray.js
index 763075ca31510..316125f757928 100644
--- a/ui/packages/consul-ui/app/utils/keyToArray.js
+++ b/ui/packages/consul-ui/app/utils/keyToArray.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /**
  * Turns a separated path or 'key name' in this case to
  * an array. If the key name is simply the separator (for example '/')
diff --git a/ui/packages/consul-ui/app/utils/left-trim.js b/ui/packages/consul-ui/app/utils/left-trim.js
index 324412d831517..279b3d02d545a 100644
--- a/ui/packages/consul-ui/app/utils/left-trim.js
+++ b/ui/packages/consul-ui/app/utils/left-trim.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function leftTrim(str = '', search = '') {
   return str.indexOf(search) === 0 ? str.substr(search.length) : str;
 }
diff --git a/ui/packages/consul-ui/app/utils/maybe-call.js b/ui/packages/consul-ui/app/utils/maybe-call.js
index c91bb3db8ea47..c76b8a61c2372 100644
--- a/ui/packages/consul-ui/app/utils/maybe-call.js
+++ b/ui/packages/consul-ui/app/utils/maybe-call.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /**
  * Promise aware conditional function call
  *
diff --git a/ui/packages/consul-ui/app/utils/merge-checks.js b/ui/packages/consul-ui/app/utils/merge-checks.js
index ec26d0496c4ee..9f444cdb6367d 100644
--- a/ui/packages/consul-ui/app/utils/merge-checks.js
+++ b/ui/packages/consul-ui/app/utils/merge-checks.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { get, set } from '@ember/object';
 import MultiMap from 'mnemonist/multi-map';
 
diff --git a/ui/packages/consul-ui/app/utils/minimizeModel.js b/ui/packages/consul-ui/app/utils/minimizeModel.js
index cec582a6f4ea1..c48819c7a1c16 100644
--- a/ui/packages/consul-ui/app/utils/minimizeModel.js
+++ b/ui/packages/consul-ui/app/utils/minimizeModel.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { get } from '@ember/object';
 
 export default function (arr) {
diff --git a/ui/packages/consul-ui/app/utils/non-empty-set.js b/ui/packages/consul-ui/app/utils/non-empty-set.js
index 62767b5876fcb..b2ca9de05970d 100644
--- a/ui/packages/consul-ui/app/utils/non-empty-set.js
+++ b/ui/packages/consul-ui/app/utils/non-empty-set.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (prop) {
   return function (value) {
     if (typeof value === 'undefined' || value === null || value === '') {
diff --git a/ui/packages/consul-ui/app/utils/path/resolve.js b/ui/packages/consul-ui/app/utils/path/resolve.js
index 358e21e927f0b..80fa362a92103 100644
--- a/ui/packages/consul-ui/app/utils/path/resolve.js
+++ b/ui/packages/consul-ui/app/utils/path/resolve.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /**
  * basic path.resolve like function for resolving ember Route-type paths
  * importantly your from should look ember-y route-like (i.e. with no prefix /)
diff --git a/ui/packages/consul-ui/app/utils/promisedTimeout.js b/ui/packages/consul-ui/app/utils/promisedTimeout.js
index 5fc9b2d349e97..f7984bde3637f 100644
--- a/ui/packages/consul-ui/app/utils/promisedTimeout.js
+++ b/ui/packages/consul-ui/app/utils/promisedTimeout.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (P = Promise, timeout = setTimeout) {
   // var interval;
   return function (milliseconds, cb = function () {}) {
diff --git a/ui/packages/consul-ui/app/utils/right-trim.js b/ui/packages/consul-ui/app/utils/right-trim.js
index 9377126f53208..35af22815cb66 100644
--- a/ui/packages/consul-ui/app/utils/right-trim.js
+++ b/ui/packages/consul-ui/app/utils/right-trim.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function rightTrim(str = '', search = '') {
   const pos = str.length - search.length;
   if (pos >= 0) {
diff --git a/ui/packages/consul-ui/app/utils/routing/redirect-to.js b/ui/packages/consul-ui/app/utils/routing/redirect-to.js
index d8c3584af8f0e..cfdd0dd5ea367 100644
--- a/ui/packages/consul-ui/app/utils/routing/redirect-to.js
+++ b/ui/packages/consul-ui/app/utils/routing/redirect-to.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (to, route) {
   return function (model, transition) {
     const parent = this.routeName.split('.').slice(0, -1).join('.');
diff --git a/ui/packages/consul-ui/app/utils/routing/transitionable.js b/ui/packages/consul-ui/app/utils/routing/transitionable.js
index 559d03e282ee4..81bf23dc518f3 100644
--- a/ui/packages/consul-ui/app/utils/routing/transitionable.js
+++ b/ui/packages/consul-ui/app/utils/routing/transitionable.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 const filter = function (routeName, atts, params) {
   return [routeName, ...atts];
 };
diff --git a/ui/packages/consul-ui/app/utils/routing/walk.js b/ui/packages/consul-ui/app/utils/routing/walk.js
index 52320146ba0eb..9e25566148b65 100644
--- a/ui/packages/consul-ui/app/utils/routing/walk.js
+++ b/ui/packages/consul-ui/app/utils/routing/walk.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { runInDebug } from '@ember/debug';
 
 export const walk = function (routes) {
diff --git a/ui/packages/consul-ui/app/utils/routing/wildcard.js b/ui/packages/consul-ui/app/utils/routing/wildcard.js
index 327bdcd24f703..f3339280b4cf5 100644
--- a/ui/packages/consul-ui/app/utils/routing/wildcard.js
+++ b/ui/packages/consul-ui/app/utils/routing/wildcard.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { get } from '@ember/object';
 export default function (routes) {
   return function (name) {
diff --git a/ui/packages/consul-ui/app/utils/search/exact.js b/ui/packages/consul-ui/app/utils/search/exact.js
index 5c75251379fb0..70aea39f090f5 100644
--- a/ui/packages/consul-ui/app/utils/search/exact.js
+++ b/ui/packages/consul-ui/app/utils/search/exact.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import PredicateSearch from './predicate';
 
 export default class ExactSearch extends PredicateSearch {
diff --git a/ui/packages/consul-ui/app/utils/search/fuzzy.js b/ui/packages/consul-ui/app/utils/search/fuzzy.js
index 670f10eda1e1f..c8130b543e747 100644
--- a/ui/packages/consul-ui/app/utils/search/fuzzy.js
+++ b/ui/packages/consul-ui/app/utils/search/fuzzy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Fuse from 'fuse.js';
 
 export default class FuzzySearch {
diff --git a/ui/packages/consul-ui/app/utils/search/predicate.js b/ui/packages/consul-ui/app/utils/search/predicate.js
index 5f8e0fe7ba5a8..a72cc69ad60b8 100644
--- a/ui/packages/consul-ui/app/utils/search/predicate.js
+++ b/ui/packages/consul-ui/app/utils/search/predicate.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default class PredicateSearch {
   constructor(items, options) {
     this.items = items;
diff --git a/ui/packages/consul-ui/app/utils/search/regexp.js b/ui/packages/consul-ui/app/utils/search/regexp.js
index bec9f5c95fc9b..583e17aa79008 100644
--- a/ui/packages/consul-ui/app/utils/search/regexp.js
+++ b/ui/packages/consul-ui/app/utils/search/regexp.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import PredicateSearch from './predicate';
 
 export default class RegExpSearch extends PredicateSearch {
diff --git a/ui/packages/consul-ui/app/utils/storage/local-storage.js b/ui/packages/consul-ui/app/utils/storage/local-storage.js
index 8da8946aa524e..f5e84f44c10ad 100644
--- a/ui/packages/consul-ui/app/utils/storage/local-storage.js
+++ b/ui/packages/consul-ui/app/utils/storage/local-storage.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (
   scheme = '',
   storage = window.localStorage,
diff --git a/ui/packages/consul-ui/app/utils/templatize.js b/ui/packages/consul-ui/app/utils/templatize.js
index 9cd9cb1c59707..0931c38b7030a 100644
--- a/ui/packages/consul-ui/app/utils/templatize.js
+++ b/ui/packages/consul-ui/app/utils/templatize.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (arr = []) {
   return arr.map((item) => `template-${item}`);
 }
diff --git a/ui/packages/consul-ui/app/utils/ticker/index.js b/ui/packages/consul-ui/app/utils/ticker/index.js
index 7c478ad9c513b..ce6022a9ab1f7 100644
--- a/ui/packages/consul-ui/app/utils/ticker/index.js
+++ b/ui/packages/consul-ui/app/utils/ticker/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import EventTarget from 'consul-ui/utils/dom/event-target/rsvp';
 import { set } from '@ember/object';
 const IntervalTickerGroup = class extends EventTarget {
diff --git a/ui/packages/consul-ui/app/utils/tomography.js b/ui/packages/consul-ui/app/utils/tomography.js
index 0ebf422220a3d..a636f5a2c4c14 100644
--- a/ui/packages/consul-ui/app/utils/tomography.js
+++ b/ui/packages/consul-ui/app/utils/tomography.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // TODO: Istanbul is ignored for the moment as it's not mine,
 // once I come here properly and 100% follow unignore
 /* istanbul ignore file */
diff --git a/ui/packages/consul-ui/app/utils/ucfirst.js b/ui/packages/consul-ui/app/utils/ucfirst.js
index ca55892670bd7..fa2f2ee07d7a9 100644
--- a/ui/packages/consul-ui/app/utils/ucfirst.js
+++ b/ui/packages/consul-ui/app/utils/ucfirst.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (str) {
   return `${str.substr(0, 1).toUpperCase()}${str.substr(1)}`;
 }
diff --git a/ui/packages/consul-ui/app/utils/update-array-object.js b/ui/packages/consul-ui/app/utils/update-array-object.js
index 4a98f9980fddc..716ea402f17e2 100644
--- a/ui/packages/consul-ui/app/utils/update-array-object.js
+++ b/ui/packages/consul-ui/app/utils/update-array-object.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { get, set } from '@ember/object';
 import ObjectProxy from '@ember/object/proxy';
 export default function (items, item, prop, value) {
diff --git a/ui/packages/consul-ui/app/validations/intention-permission-http-header.js b/ui/packages/consul-ui/app/validations/intention-permission-http-header.js
index 931529a585abe..9322bce72edfc 100644
--- a/ui/packages/consul-ui/app/validations/intention-permission-http-header.js
+++ b/ui/packages/consul-ui/app/validations/intention-permission-http-header.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { validatePresence } from 'ember-changeset-validations/validators';
 import validateSometimes from 'consul-ui/validations/sometimes';
 export default (schema) => ({
diff --git a/ui/packages/consul-ui/app/validations/intention-permission.js b/ui/packages/consul-ui/app/validations/intention-permission.js
index 9e2194e7917d4..a7556e812d66d 100644
--- a/ui/packages/consul-ui/app/validations/intention-permission.js
+++ b/ui/packages/consul-ui/app/validations/intention-permission.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import {
   validateInclusion,
   validatePresence,
diff --git a/ui/packages/consul-ui/app/validations/intention.js b/ui/packages/consul-ui/app/validations/intention.js
index bfc0960b1f7ee..89b002486451f 100644
--- a/ui/packages/consul-ui/app/validations/intention.js
+++ b/ui/packages/consul-ui/app/validations/intention.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { validatePresence, validateLength } from 'ember-changeset-validations/validators';
 import validateSometimes from 'consul-ui/validations/sometimes';
 export default {
diff --git a/ui/packages/consul-ui/app/validations/kv.js b/ui/packages/consul-ui/app/validations/kv.js
index ffccec1d76eda..17d4f1b1c00e7 100644
--- a/ui/packages/consul-ui/app/validations/kv.js
+++ b/ui/packages/consul-ui/app/validations/kv.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { validatePresence, validateLength } from 'ember-changeset-validations/validators';
 export default {
   Key: [validatePresence(true), validateLength({ min: 1 })],
diff --git a/ui/packages/consul-ui/app/validations/policy.js b/ui/packages/consul-ui/app/validations/policy.js
index 4c0b1ba50bb04..bae9ddab3ff0a 100644
--- a/ui/packages/consul-ui/app/validations/policy.js
+++ b/ui/packages/consul-ui/app/validations/policy.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { validateFormat } from 'ember-changeset-validations/validators';
 export default {
   Name: validateFormat({ regex: /^[A-Za-z0-9\-_]{1,128}$/ }),
diff --git a/ui/packages/consul-ui/app/validations/role.js b/ui/packages/consul-ui/app/validations/role.js
index e7fb655999d52..eabd7b65571d2 100644
--- a/ui/packages/consul-ui/app/validations/role.js
+++ b/ui/packages/consul-ui/app/validations/role.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { validateFormat } from 'ember-changeset-validations/validators';
 export default {
   Name: validateFormat({ regex: /^[A-Za-z0-9\-_]{1,256}$/ }),
diff --git a/ui/packages/consul-ui/app/validations/sometimes.js b/ui/packages/consul-ui/app/validations/sometimes.js
index d32ee3e9dffa0..4ea54ecca85a2 100644
--- a/ui/packages/consul-ui/app/validations/sometimes.js
+++ b/ui/packages/consul-ui/app/validations/sometimes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* eslint-disable no-prototype-builtins */
 import { get } from '@ember/object';
 
diff --git a/ui/packages/consul-ui/app/validations/token.js b/ui/packages/consul-ui/app/validations/token.js
index 21717bcb3fdd0..ff8b4c56321a3 100644
--- a/ui/packages/consul-ui/app/validations/token.js
+++ b/ui/packages/consul-ui/app/validations/token.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default {};
diff --git a/ui/packages/consul-ui/blueprints/adapter-test/index.js b/ui/packages/consul-ui/blueprints/adapter-test/index.js
index 8f832005f3ff7..76be5362fbbf5 100644
--- a/ui/packages/consul-ui/blueprints/adapter-test/index.js
+++ b/ui/packages/consul-ui/blueprints/adapter-test/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /*eslint node/no-extraneous-require: "off"*/
 const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
 
diff --git a/ui/packages/consul-ui/blueprints/adapter-test/qunit-files/__root__/__path__/integration/adapters/__test__.js b/ui/packages/consul-ui/blueprints/adapter-test/qunit-files/__root__/__path__/integration/adapters/__test__.js
index ad0ab0b79806e..7ff3a0fbb77b5 100644
--- a/ui/packages/consul-ui/blueprints/adapter-test/qunit-files/__root__/__path__/integration/adapters/__test__.js
+++ b/ui/packages/consul-ui/blueprints/adapter-test/qunit-files/__root__/__path__/integration/adapters/__test__.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/blueprints/adapter-test/qunit-files/__root__/__path__/unit/adapters/__test__.js b/ui/packages/consul-ui/blueprints/adapter-test/qunit-files/__root__/__path__/unit/adapters/__test__.js
index 89a2c27facbc5..ea5e2dafb8472 100644
--- a/ui/packages/consul-ui/blueprints/adapter-test/qunit-files/__root__/__path__/unit/adapters/__test__.js
+++ b/ui/packages/consul-ui/blueprints/adapter-test/qunit-files/__root__/__path__/unit/adapters/__test__.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/blueprints/adapter/files/__root__/__path__/__name__.js b/ui/packages/consul-ui/blueprints/adapter/files/__root__/__path__/__name__.js
index c3d1b3a58df4c..9097f4d1be464 100644
--- a/ui/packages/consul-ui/blueprints/adapter/files/__root__/__path__/__name__.js
+++ b/ui/packages/consul-ui/blueprints/adapter/files/__root__/__path__/__name__.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Adapter from './application';
 
 export default class <%= classifiedModuleName %>Adapter extends Adapter {
diff --git a/ui/packages/consul-ui/blueprints/adapter/index.js b/ui/packages/consul-ui/blueprints/adapter/index.js
index 6abbb5cd75bfd..76d2fe87303fb 100644
--- a/ui/packages/consul-ui/blueprints/adapter/index.js
+++ b/ui/packages/consul-ui/blueprints/adapter/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 'use strict';
 
 module.exports = {
diff --git a/ui/packages/consul-ui/blueprints/component/files/__root__/__templatepath__/__templatename__.hbs b/ui/packages/consul-ui/blueprints/component/files/__root__/__templatepath__/__templatename__.hbs
index 4c7b4919504ac..889d9eeadc101 100644
--- a/ui/packages/consul-ui/blueprints/component/files/__root__/__templatepath__/__templatename__.hbs
+++ b/ui/packages/consul-ui/blueprints/component/files/__root__/__templatepath__/__templatename__.hbs
@@ -1,6 +1 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 {{yield}}
diff --git a/ui/packages/consul-ui/blueprints/component/index.js b/ui/packages/consul-ui/blueprints/component/index.js
index d09784b46b09a..011f1d2e15368 100644
--- a/ui/packages/consul-ui/blueprints/component/index.js
+++ b/ui/packages/consul-ui/blueprints/component/index.js
@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 module.exports = Object.assign(require('ember-source/blueprints/component/index.js'));
diff --git a/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__.scss b/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__.scss
index f3b2523ee7412..fc107ee09317d 100644
--- a/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__.scss
+++ b/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './<%= dasherizedModuleName %>/index';
 .<%= dasherizedModuleName %> {
   @extend %<%= dasherizedModuleName %>;
diff --git a/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__/index.scss b/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__/index.scss
index 981c57196e019..bc182521964a3 100644
--- a/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__/index.scss
+++ b/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__/index.scss
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 @import './skin';
 @import './layout';
diff --git a/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__/layout.scss b/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__/layout.scss
index 0937c16e84de6..481ab0cddf0ce 100644
--- a/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__/layout.scss
+++ b/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__/layout.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %<%= dasherizedModuleName %> {
 
 }
diff --git a/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__/skin.scss b/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__/skin.scss
index dbdca6fcf179c..63a5b2cf1200c 100644
--- a/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__/skin.scss
+++ b/ui/packages/consul-ui/blueprints/css-component/files/__root__/__path__/__name__/skin.scss
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 %<%= dasherizedModuleName %> {
 
 }
diff --git a/ui/packages/consul-ui/blueprints/css-component/index.js b/ui/packages/consul-ui/blueprints/css-component/index.js
index 7c78cda38cce2..b8c23a8376900 100644
--- a/ui/packages/consul-ui/blueprints/css-component/index.js
+++ b/ui/packages/consul-ui/blueprints/css-component/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 'use strict';
 
 const path = require('path');
diff --git a/ui/packages/consul-ui/blueprints/model-test/index.js b/ui/packages/consul-ui/blueprints/model-test/index.js
index f150de2c13eb6..6c8f155dffe72 100644
--- a/ui/packages/consul-ui/blueprints/model-test/index.js
+++ b/ui/packages/consul-ui/blueprints/model-test/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /*eslint node/no-extraneous-require: "off"*/
 const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
 
diff --git a/ui/packages/consul-ui/blueprints/model-test/qunit-files/__root__/__path__/unit/models/__test__.js b/ui/packages/consul-ui/blueprints/model-test/qunit-files/__root__/__path__/unit/models/__test__.js
index d59a0b3f00423..a032120ec7fe1 100644
--- a/ui/packages/consul-ui/blueprints/model-test/qunit-files/__root__/__path__/unit/models/__test__.js
+++ b/ui/packages/consul-ui/blueprints/model-test/qunit-files/__root__/__path__/unit/models/__test__.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/blueprints/model/files/__root__/__path__/__name__.js b/ui/packages/consul-ui/blueprints/model/files/__root__/__path__/__name__.js
index 9a5f9b0e8d78d..e7dc6a36f2599 100644
--- a/ui/packages/consul-ui/blueprints/model/files/__root__/__path__/__name__.js
+++ b/ui/packages/consul-ui/blueprints/model/files/__root__/__path__/__name__.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 //import { nullValue } from 'consul-ui/decorators/replace';
diff --git a/ui/packages/consul-ui/blueprints/model/index.js b/ui/packages/consul-ui/blueprints/model/index.js
index 8e6dbb641b8e1..3855bc4c1f6e2 100644
--- a/ui/packages/consul-ui/blueprints/model/index.js
+++ b/ui/packages/consul-ui/blueprints/model/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 'use strict';
 
 module.exports = {
diff --git a/ui/packages/consul-ui/blueprints/repository-test/index.js b/ui/packages/consul-ui/blueprints/repository-test/index.js
index 31299be1fd091..650ec6ebb1dd1 100644
--- a/ui/packages/consul-ui/blueprints/repository-test/index.js
+++ b/ui/packages/consul-ui/blueprints/repository-test/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /*eslint node/no-extraneous-require: "off"*/
 const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
 
diff --git a/ui/packages/consul-ui/blueprints/repository-test/qunit-files/__root__/__path__/integration/services/repository/__test__.js b/ui/packages/consul-ui/blueprints/repository-test/qunit-files/__root__/__path__/integration/services/repository/__test__.js
index c35831f7cb98b..e2dbc803eda84 100644
--- a/ui/packages/consul-ui/blueprints/repository-test/qunit-files/__root__/__path__/integration/services/repository/__test__.js
+++ b/ui/packages/consul-ui/blueprints/repository-test/qunit-files/__root__/__path__/integration/services/repository/__test__.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { moduleFor, test } from 'ember-qunit';
 import repo from 'consul-ui/tests/helpers/repo';
 
diff --git a/ui/packages/consul-ui/blueprints/repository-test/qunit-files/__root__/__path__/unit/services/repository/__test__.js b/ui/packages/consul-ui/blueprints/repository-test/qunit-files/__root__/__path__/unit/services/repository/__test__.js
index 0c5c7cf4ec925..ff5dad85aef3b 100644
--- a/ui/packages/consul-ui/blueprints/repository-test/qunit-files/__root__/__path__/unit/services/repository/__test__.js
+++ b/ui/packages/consul-ui/blueprints/repository-test/qunit-files/__root__/__path__/unit/services/repository/__test__.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/blueprints/repository/files/__root__/__path__/__name__.js b/ui/packages/consul-ui/blueprints/repository/files/__root__/__path__/__name__.js
index 56f8263c0de61..c2430d4e5937c 100644
--- a/ui/packages/consul-ui/blueprints/repository/files/__root__/__path__/__name__.js
+++ b/ui/packages/consul-ui/blueprints/repository/files/__root__/__path__/__name__.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import RepositoryService from 'consul-ui/services/repository';
 import dataSource from 'consul-ui/decorators/data-source';
 
diff --git a/ui/packages/consul-ui/blueprints/repository/index.js b/ui/packages/consul-ui/blueprints/repository/index.js
index 6c1dd01abc749..6dc50bddaecc4 100644
--- a/ui/packages/consul-ui/blueprints/repository/index.js
+++ b/ui/packages/consul-ui/blueprints/repository/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 'use strict';
 
 const path = require('path');
diff --git a/ui/packages/consul-ui/blueprints/route-test/index.js b/ui/packages/consul-ui/blueprints/route-test/index.js
index 8474fc5b600ba..e69de29bb2d1d 100644
--- a/ui/packages/consul-ui/blueprints/route-test/index.js
+++ b/ui/packages/consul-ui/blueprints/route-test/index.js
@@ -1,4 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
diff --git a/ui/packages/consul-ui/blueprints/route/index.js b/ui/packages/consul-ui/blueprints/route/index.js
index aaa76f8c46c13..e3b9ab3e2420b 100644
--- a/ui/packages/consul-ui/blueprints/route/index.js
+++ b/ui/packages/consul-ui/blueprints/route/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* eslint-env node */
 const chalk = require('chalk');
 
diff --git a/ui/packages/consul-ui/blueprints/route/native-files/__root__/__templatepath__/__templatename__.hbs b/ui/packages/consul-ui/blueprints/route/native-files/__root__/__templatepath__/__templatename__.hbs
index 864de38d70cb5..495c3108c0092 100644
--- a/ui/packages/consul-ui/blueprints/route/native-files/__root__/__templatepath__/__templatename__.hbs
+++ b/ui/packages/consul-ui/blueprints/route/native-files/__root__/__templatepath__/__templatename__.hbs
@@ -1,8 +1,3 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
 <Route
   @name={{routeName}}
 as |route|>
diff --git a/ui/packages/consul-ui/blueprints/serializer-test/index.js b/ui/packages/consul-ui/blueprints/serializer-test/index.js
index 15fb83f029397..ca22ba7c2b619 100644
--- a/ui/packages/consul-ui/blueprints/serializer-test/index.js
+++ b/ui/packages/consul-ui/blueprints/serializer-test/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /*eslint node/no-extraneous-require: "off"*/
 const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
 
diff --git a/ui/packages/consul-ui/blueprints/serializer-test/qunit-files/__root__/__path__/integration/serializers/__test__.js b/ui/packages/consul-ui/blueprints/serializer-test/qunit-files/__root__/__path__/integration/serializers/__test__.js
index 836591cad32e1..23133e03df8d3 100644
--- a/ui/packages/consul-ui/blueprints/serializer-test/qunit-files/__root__/__path__/integration/serializers/__test__.js
+++ b/ui/packages/consul-ui/blueprints/serializer-test/qunit-files/__root__/__path__/integration/serializers/__test__.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/blueprints/serializer-test/qunit-files/__root__/__path__/unit/serializers/__test__.js b/ui/packages/consul-ui/blueprints/serializer-test/qunit-files/__root__/__path__/unit/serializers/__test__.js
index 1335f1c0c8771..6e10f7b6e0f39 100644
--- a/ui/packages/consul-ui/blueprints/serializer-test/qunit-files/__root__/__path__/unit/serializers/__test__.js
+++ b/ui/packages/consul-ui/blueprints/serializer-test/qunit-files/__root__/__path__/unit/serializers/__test__.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/blueprints/serializer/files/__root__/__path__/__name__.js b/ui/packages/consul-ui/blueprints/serializer/files/__root__/__path__/__name__.js
index ea3d43baa6e64..d5234a5366be1 100644
--- a/ui/packages/consul-ui/blueprints/serializer/files/__root__/__path__/__name__.js
+++ b/ui/packages/consul-ui/blueprints/serializer/files/__root__/__path__/__name__.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Serializer from './application';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/<%= dasherizedModuleName  %>';
 
diff --git a/ui/packages/consul-ui/blueprints/serializer/index.js b/ui/packages/consul-ui/blueprints/serializer/index.js
index 7109e43af70bc..72cfdc81061e8 100644
--- a/ui/packages/consul-ui/blueprints/serializer/index.js
+++ b/ui/packages/consul-ui/blueprints/serializer/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 'use strict';
 
 module.exports = {
diff --git a/ui/packages/consul-ui/config/deprecation-workflow.js b/ui/packages/consul-ui/config/deprecation-workflow.js
index b0b4d1299d0b2..dc412eaec4b47 100644
--- a/ui/packages/consul-ui/config/deprecation-workflow.js
+++ b/ui/packages/consul-ui/config/deprecation-workflow.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* eslint-disable no-undef */
 self.deprecationWorkflow = self.deprecationWorkflow || {};
 self.deprecationWorkflow.config = {
diff --git a/ui/packages/consul-ui/config/ember-cli-update.json b/ui/packages/consul-ui/config/ember-cli-update.json
index dd50f3d6ab451..439897f2bb3e6 100644
--- a/ui/packages/consul-ui/config/ember-cli-update.json
+++ b/ui/packages/consul-ui/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.28.6",
+      "version": "3.27.0",
       "blueprints": [
         {
           "name": "app",
diff --git a/ui/packages/consul-ui/config/ember-intl.js b/ui/packages/consul-ui/config/ember-intl.js
index e8cf4f4c7564b..4fc7158d7cbb5 100644
--- a/ui/packages/consul-ui/config/ember-intl.js
+++ b/ui/packages/consul-ui/config/ember-intl.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* jshint node:true */
 
 module.exports = function (/* environment */) {
diff --git a/ui/packages/consul-ui/config/environment.js b/ui/packages/consul-ui/config/environment.js
index b694f7e894ec4..1289a2ca37195 100644
--- a/ui/packages/consul-ui/config/environment.js
+++ b/ui/packages/consul-ui/config/environment.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // All of the configuration here is shared between buildtime and runtime and
 // is therefore added to ember's <meta> tag in the actual app, if the
 // configuration is for buildtime only you should probably just use
diff --git a/ui/packages/consul-ui/config/targets.js b/ui/packages/consul-ui/config/targets.js
index 0eaba1021893b..1b777480891db 100644
--- a/ui/packages/consul-ui/config/targets.js
+++ b/ui/packages/consul-ui/config/targets.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 'use strict';
 
 // Technically this file configures babel transpilation support but we also
diff --git a/ui/packages/consul-ui/config/utils.js b/ui/packages/consul-ui/config/utils.js
index 0b43caee75bb7..6b3e24d708ad8 100644
--- a/ui/packages/consul-ui/config/utils.js
+++ b/ui/packages/consul-ui/config/utils.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 const read = require('fs').readFileSync;
 const exec = require('child_process').execSync;
 
diff --git a/ui/packages/consul-ui/ember-cli-build.js b/ui/packages/consul-ui/ember-cli-build.js
index c483cbf678aa4..6a1f6bc9522be 100644
--- a/ui/packages/consul-ui/ember-cli-build.js
+++ b/ui/packages/consul-ui/ember-cli-build.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /*eslint ember/no-jquery: "off", ember/no-global-jquery: "off"*/
 'use strict';
 const path = require('path');
diff --git a/ui/packages/consul-ui/lib/.eslintrc.js b/ui/packages/consul-ui/lib/.eslintrc.js
index 44a958908fe4f..548ea343c9f00 100644
--- a/ui/packages/consul-ui/lib/.eslintrc.js
+++ b/ui/packages/consul-ui/lib/.eslintrc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 module.exports = {
   env: {
     node: true,
diff --git a/ui/packages/consul-ui/lib/colocated-components/index.js b/ui/packages/consul-ui/lib/colocated-components/index.js
index b388833dce2ab..8c8f75e5478c7 100644
--- a/ui/packages/consul-ui/lib/colocated-components/index.js
+++ b/ui/packages/consul-ui/lib/colocated-components/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /*eslint node/no-extraneous-require: "off"*/
 'use strict';
 
diff --git a/ui/packages/consul-ui/lib/commands/bin/list.js b/ui/packages/consul-ui/lib/commands/bin/list.js
index a4b9c575b8ec5..3d8783f7dadcd 100755
--- a/ui/packages/consul-ui/lib/commands/bin/list.js
+++ b/ui/packages/consul-ui/lib/commands/bin/list.js
@@ -1,7 +1,3 @@
 #!/usr/bin/env node
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
 
 require('../lib/list.js')(`${process.cwd()}/tests/steps.js`);
diff --git a/ui/packages/consul-ui/lib/commands/index.js b/ui/packages/consul-ui/lib/commands/index.js
index 7a52499389421..c5219bb849143 100644
--- a/ui/packages/consul-ui/lib/commands/index.js
+++ b/ui/packages/consul-ui/lib/commands/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* eslint no-console: "off" */
 /* eslint-env node */
 'use strict';
diff --git a/ui/packages/consul-ui/lib/commands/lib/list.js b/ui/packages/consul-ui/lib/commands/lib/list.js
index ce067d41785e1..f34863f5f610c 100644
--- a/ui/packages/consul-ui/lib/commands/lib/list.js
+++ b/ui/packages/consul-ui/lib/commands/lib/list.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* eslint no-console: "off" */
 /* eslint-env node */
 'use strict';
diff --git a/ui/packages/consul-ui/lib/custom-element/index.js b/ui/packages/consul-ui/lib/custom-element/index.js
index 0029bd6e1cf07..f5ad21011f061 100644
--- a/ui/packages/consul-ui/lib/custom-element/index.js
+++ b/ui/packages/consul-ui/lib/custom-element/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 'use strict';
 
 module.exports = {
diff --git a/ui/packages/consul-ui/lib/startup/index.js b/ui/packages/consul-ui/lib/startup/index.js
index c35697b23ef88..6f6e854e358d8 100644
--- a/ui/packages/consul-ui/lib/startup/index.js
+++ b/ui/packages/consul-ui/lib/startup/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* eslint-env node */
 /*eslint node/no-extraneous-require: "off"*/
 'use strict';
diff --git a/ui/packages/consul-ui/lib/startup/templates/body.html.js b/ui/packages/consul-ui/lib/startup/templates/body.html.js
index 93d25f96018ba..5ce4af49d1dfe 100644
--- a/ui/packages/consul-ui/lib/startup/templates/body.html.js
+++ b/ui/packages/consul-ui/lib/startup/templates/body.html.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // rootURL in production equals `{{.ContentPath}}` and therefore is replaced
 // with the value of -ui-content-path. During development rootURL uses the
 // value as set in environment.js
diff --git a/ui/packages/consul-ui/lib/startup/templates/head.html.js b/ui/packages/consul-ui/lib/startup/templates/head.html.js
index 2b5f8424d7e94..fc2c7dd49b0b4 100644
--- a/ui/packages/consul-ui/lib/startup/templates/head.html.js
+++ b/ui/packages/consul-ui/lib/startup/templates/head.html.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // rootURL in production equals `{{.ContentPath}}` and therefore is replaced
 // with the value of -ui-content-path. During development rootURL uses the
 // value as set in environment.js
diff --git a/ui/packages/consul-ui/mock-api/v1/acl/policies b/ui/packages/consul-ui/mock-api/v1/acl/policies
index 2c1a1487cc5fd..db1264b1f64bb 100644
--- a/ui/packages/consul-ui/mock-api/v1/acl/policies
+++ b/ui/packages/consul-ui/mock-api/v1/acl/policies
@@ -29,23 +29,6 @@ ${typeof location.search.partition !== 'undefined' ? `
             }
           `
         }
-        if(i === 2) {
-          return `
-            {
-              "ID": "00000000-0000-0000-0000-000000000002",
-              "Name": "global-read-only",
-${typeof location.search.ns !== 'undefined' ? `
-              "Namespace": "${location.search.ns}",
-` : ``}
-${typeof location.search.partition !== 'undefined' ? `
-            "Partition": "${location.search.partition}",
-` : ``}
-              "Description": "Built-In Read-only Policy",
-              "CreateIndex": 10,
-              "ModifyIndex": 10
-            }
-          `
-        }
         return `
           {
             "ID": "${fake.random.uuid()}",
diff --git a/ui/packages/consul-ui/mock-api/v1/acl/policy/_ b/ui/packages/consul-ui/mock-api/v1/acl/policy/_
index 810c6d164647c..a442f70f1ffc5 100644
--- a/ui/packages/consul-ui/mock-api/v1/acl/policy/_
+++ b/ui/packages/consul-ui/mock-api/v1/acl/policy/_
@@ -11,6 +11,6 @@ ${ location.pathname.get(3) !== '00000000-0000-0000-0000-000000000001' ? `
   policy = "write"
 }`)},
 ` : "" }
-  "Name": "${location.pathname.get(3) === '00000000-0000-0000-0000-000000000001' ? 'global-management' : location.pathname.get(3) === '00000000-0000-0000-0000-000000000002' ? 'global-read-only': fake.hacker.noun() + '-policy'}"
+  "Name": "${location.pathname.get(3) === '00000000-0000-0000-0000-000000000001' ? 'global-management' : fake.hacker.noun() + '-policy'}"
 }
 
diff --git a/ui/packages/consul-ui/mock-api/v1/internal/ui/node/_ b/ui/packages/consul-ui/mock-api/v1/internal/ui/node/_
index 2adf163f72178..27afd9c8ef4d1 100644
--- a/ui/packages/consul-ui/mock-api/v1/internal/ui/node/_
+++ b/ui/packages/consul-ui/mock-api/v1/internal/ui/node/_
@@ -30,7 +30,6 @@ return `
   "TaggedAddresses":{"lan":"${ip}","wan":"${ip}"},
   "Meta":{
     "consul-network-segment":"",
-    "consul-version": "${env('CONSUL_VERSION') ? fake.helpers.randomize([env('CONSUL_VERSION'),"1.10.4","1.15.2", "1.17.8","1.7.2","1.12.4", "1.17.2","1.0.9","2.0.2"]) : fake.helpers.randomize(["1.10.4","1.15.2", "1.17.8","1.7.2","1.12.4", "1.17.2","1.0.9","2.0.2"])  }",
     "consul-dashboard-url": "${fake.internet.protocol()}://${fake.internet.domainName()}/?id={{Node}}"
   },
   "Services":[
diff --git a/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes b/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes
index 5cabfb42460d6..2740d824a4f60 100644
--- a/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes
+++ b/ui/packages/consul-ui/mock-api/v1/internal/ui/nodes
@@ -13,7 +13,6 @@
       function(item, i)
       {
         const peerNameString = i === 0 ? '"PeerName": "billing",' : '"PeerName": "",'
-        const isSyntheticNode = env('CONSUL_AGENTLESS_ENABLED') ? fake.helpers.randomize([true, false, false, false]) : false
         return `
           {
             "ID":"${fake.random.uuid()}",
@@ -26,10 +25,7 @@
             },
             "Meta": {
               "consul-network-segment":"",
-              ${isSyntheticNode ? `` : `
-              "consul-version": "${env('CONSUL_VERSION') ? fake.helpers.randomize([env('CONSUL_VERSION'),"1.10.4","1.15.2", "1.17.8","1.7.2","1.12.4", "1.17.2","1.0.9","2.0.2"]) : fake.helpers.randomize(["1.10.4","1.15.2", "1.17.8","1.7.2","1.12.4", "1.17.2","1.0.9","2.0.2"])  }",
-              `}
-              "synthetic-node": ${isSyntheticNode}
+              "synthetic-node": ${env('CONSUL_AGENTLESS_ENABLED') ? fake.helpers.randomize([true, false, false, false]) : false}
             },
             "Services":[
                 ${
diff --git a/ui/packages/consul-ui/node-tests/config/environment.js b/ui/packages/consul-ui/node-tests/config/environment.js
index 4779500d63ac2..0f8506c61e2b1 100644
--- a/ui/packages/consul-ui/node-tests/config/environment.js
+++ b/ui/packages/consul-ui/node-tests/config/environment.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* eslint-env node */
 
 const test = require('tape');
diff --git a/ui/packages/consul-ui/node-tests/config/utils.js b/ui/packages/consul-ui/node-tests/config/utils.js
index 76050e5bf3cf1..02505c6d7fcdd 100644
--- a/ui/packages/consul-ui/node-tests/config/utils.js
+++ b/ui/packages/consul-ui/node-tests/config/utils.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* eslint-env node */
 
 const test = require('tape');
diff --git a/ui/packages/consul-ui/package.json b/ui/packages/consul-ui/package.json
index 971521680d0c0..5898c888faf83 100644
--- a/ui/packages/consul-ui/package.json
+++ b/ui/packages/consul-ui/package.json
@@ -38,8 +38,6 @@
     "test:coverage": "COVERAGE=true ember test --environment test --filter=Unit --test-port=${EMBER_TEST_PORT:-7357}",
     "test:coverage:ci": "COVERAGE=true ember test --environment test --filter=Unit --path dist --test-port=${EMBER_TEST_PORT:-7357}",
     "test:coverage:view": "COVERAGE=true ember test --server --environment test --filter=Unit --test-port=${EMBER_TEST_PORT:-7357}",
-    "toolkit:link": "yalc link @hashicorp/consul-ui-toolkit",
-    "toolkit:remove": "yalc remove @hashicorp/consul-ui-toolkit",
     "steps:list": "node ./lib/commands/bin/list.js",
     "storybook": "start-storybook -p 6006 -s dist",
     "build-storybook": "build-storybook -s dist"
@@ -66,13 +64,13 @@
     "@docfy/ember": "^0.4.1",
     "@ember/optional-features": "^2.0.0",
     "@ember/render-modifiers": "^1.0.2",
-    "@ember/test-helpers": "^2.6.0",
+    "@ember/test-helpers": "^2.2.5",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
-    "@hashicorp/design-system-components": "^1.6.0",
+    "@hashicorp/design-system-components": "^1.0.4",
     "@hashicorp/design-system-tokens": "^1.0.0",
     "@hashicorp/ember-cli-api-double": "^4.0.0",
-    "@hashicorp/ember-flight-icons": "^3.0.2",
+    "@hashicorp/ember-flight-icons": "^3.0.0",
     "@html-next/vertical-collection": "^4.0.0",
     "@lit/reactive-element": "^1.2.1",
     "@xstate/fsm": "^1.4.0",
@@ -89,7 +87,7 @@
     "broccoli-funnel": "^3.0.3",
     "broccoli-merge-trees": "^4.2.0",
     "chalk": "^4.1.0",
-    "clipboard": "^2.0.11",
+    "clipboard": "^2.0.4",
     "consul-acls": "*",
     "consul-hcp": "*",
     "consul-lock-sessions": "*",
@@ -110,15 +108,15 @@
     "ember-auto-import": "^2.4.2",
     "ember-can": "^4.2.0",
     "ember-changeset-validations": "~3.15.2",
-    "ember-cli": "3.28.6",
+    "ember-cli": "~3.27.0",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.10",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-code-coverage": "^1.0.0-beta.4",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-deprecation-workflow": "^2.1.0",
     "ember-cli-flash": "^2.1.1",
-    "ember-cli-htmlbars": "^5.7.2",
-    "ember-cli-inject-live-reload": "^2.1.0",
+    "ember-cli-htmlbars": "^5.7.1",
+    "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-page-object": "^1.17.11",
     "ember-cli-postcss": "^8.1.0",
     "ember-cli-sri": "^2.1.1",
@@ -129,7 +127,7 @@
     "ember-collection": "^1.0.0",
     "ember-compatibility-helpers": "^1.2.5",
     "ember-composable-helpers": "^5.0.0",
-    "ember-data": "~3.28.6",
+    "ember-data": "~3.27.1",
     "ember-data-model-fragments": "5.0.0-beta.8",
     "ember-decorators": "^6.1.1",
     "ember-exam": "^6.1.0",
@@ -147,25 +145,25 @@
     "ember-page-title": "^6.2.2",
     "ember-power-select": "^4.0.5",
     "ember-power-select-with-create": "^0.8.0",
-    "ember-qunit": "^5.1.5",
+    "ember-qunit": "^5.1.4",
     "ember-ref-bucket": "^4.1.0",
     "ember-render-helpers": "^0.2.0",
-    "ember-resolver": "^8.0.3",
+    "ember-resolver": "^8.0.2",
     "ember-route-action-helper": "^2.0.8",
     "ember-router-helpers": "^0.4.0",
     "ember-set-helper": "^2.0.0",
     "ember-sinon-qunit": "5.0.0",
-    "ember-source": "3.28.8",
+    "ember-source": "~3.27.2",
     "ember-stargate": "^0.2.0",
     "ember-string-fns": "^1.4.0",
     "ember-test-selectors": "^5.0.0",
     "ember-truth-helpers": "^3.0.0",
-    "eslint": "^7.32.0",
+    "eslint": "^7.27.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^10.5.8",
+    "eslint-plugin-ember": "^10.4.2",
     "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-prettier": "^3.4.1",
-    "eslint-plugin-qunit": "^6.2.0",
+    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-qunit": "^6.1.1",
     "faker": "^5.5.3",
     "flat": "^5.0.0",
     "hast-util-to-string": "^1.0.4",
@@ -179,9 +177,9 @@
     "ngraph.graph": "^19.1.0",
     "parse-duration": "^1.0.0",
     "pretender": "^3.2.0",
-    "prettier": "^2.5.1",
+    "prettier": "^2.3.0",
     "pretty-ms": "^7.0.1",
-    "qunit": "^2.17.2",
+    "qunit": "^2.15.0",
     "qunit-dom": "^1.6.0",
     "react-is": "^17.0.1",
     "refractor": "^3.5.0",
@@ -199,7 +197,7 @@
     "webpack": "^5.74.0"
   },
   "engines": {
-    "node": ">=14 <=16"
+    "node": ">=10 <=14"
   },
   "ember": {
     "edition": "octane"
@@ -215,8 +213,5 @@
   },
   "volta": {
     "node": "14.20.1"
-  },
-  "dependencies": {
-    "doctoc": "^2.0.0"
   }
 }
diff --git a/ui/packages/consul-ui/server/index.js b/ui/packages/consul-ui/server/index.js
index f708225412d26..ee9541eb6ebd9 100644
--- a/ui/packages/consul-ui/server/index.js
+++ b/ui/packages/consul-ui/server/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /*eslint node/no-extraneous-require: "off"*/
 'use strict';
 const fs = require('fs');
diff --git a/ui/packages/consul-ui/tailwind.config.js b/ui/packages/consul-ui/tailwind.config.js
index fce13d56ec380..1b9f46ec4c3b9 100644
--- a/ui/packages/consul-ui/tailwind.config.js
+++ b/ui/packages/consul-ui/tailwind.config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /** @type {import('tailwindcss').Config} */
 module.exports = {
   content: ['../**/*.{html.js,hbs,mdx}'],
diff --git a/ui/packages/consul-ui/testem.js b/ui/packages/consul-ui/testem.js
index f1eb569840538..4afc0bba302dc 100644
--- a/ui/packages/consul-ui/testem.js
+++ b/ui/packages/consul-ui/testem.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-existing.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-existing.feature
index bf9464e507093..54e64f8b474a4 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-existing.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-existing.feature
@@ -41,8 +41,8 @@ Feature: dc / acls / policies / as many / add existing: Add existing policy
           Name: Policy 2
     ---
     Then the url should be /datacenter/acls/[Model]s
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   Where:
     -------------
     | Model     |
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-new.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-new.feature
index 599fc69e75273..367ae9221d8ef 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-new.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/as-many/add-new.feature
@@ -39,8 +39,8 @@ Feature: dc / acls / policies / as many / add new: Add new policy
             Name: New-Policy
     ---
     Then the url should be /datacenter/acls/[Model]s
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   Where:
     -------------
     | Model     |
@@ -62,8 +62,8 @@ Feature: dc / acls / policies / as many / add new: Add new policy
           - ServiceName: New-Service-Identity
     ---
     Then the url should be /datacenter/acls/[Model]s
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   Where:
     -------------
     | Model     |
@@ -86,8 +86,8 @@ Feature: dc / acls / policies / as many / add new: Add new policy
             Datacenter: datacenter
     ---
     Then the url should be /datacenter/acls/[Model]s
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   Where:
     -------------
     | Model     |
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/create.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/create.feature
index 85589fcfecaad..0e9f6a21d15c0 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/create.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/create.feature
@@ -24,8 +24,8 @@ Feature: dc / acls / policies / create
         Description: [Description]
     ---
     Then the url should be /datacenter/acls/policies
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-create" class
+    And "[data-notification]" has the "success" class
     Where:
       ---------------------------
       | Description             |
@@ -46,5 +46,5 @@ Feature: dc / acls / policies / create
       - Namespace
     ---
     Then the url should be /datacenter/acls/policies
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-create" class
+    And "[data-notification]" has the "success" class
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/delete.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/delete.feature
index 87a6be3e1e6da..c75b75c896a33 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/delete.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/delete.feature
@@ -15,8 +15,8 @@ Feature: dc / acls / policies / delete: Policy Delete
     And I click delete on the policies
     And I click confirmDelete on the policies
     Then a DELETE request was made to "/v1/acl/policy/1981f51d-301a-497b-89a0-05112ef02b4b?dc=datacenter&ns=@!namespace"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "success" class
   Scenario: Deleting a policy model from the policies listing page errors
     Given the url "/v1/acl/policy/1981f51d-301a-497b-89a0-05112ef02b4b?dc=datacenter&ns=@namespace" responds with a 500 status
     And 1 policy model from yaml
@@ -30,8 +30,8 @@ Feature: dc / acls / policies / delete: Policy Delete
     And I click actions on the policies
     And I click delete on the policies
     And I click confirmDelete on the policies
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "error" class
   Scenario: Deleting a policy from the policy detail page
     When I visit the policy page for yaml
     ---
@@ -41,8 +41,8 @@ Feature: dc / acls / policies / delete: Policy Delete
     And I click delete
     And I click confirmDelete on the deleteModal
     Then a DELETE request was made to "/v1/acl/policy/1981f51d-301a-497b-89a0-05112ef02b4b?dc=datacenter&ns=@!namespace"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "success" class
   # FIXME
   # Scenario: Deleting a policy from the policy detail page errors
   #   Given the url "/v1/acl/policy/1981f51d-301a-497b-89a0-05112ef02b4b?dc=datacenter&ns=@namespace" responds with a 500 status
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/update.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/update.feature
index f207a078dd536..e0857d14ed913 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/update.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/update.feature
@@ -37,8 +37,8 @@ Feature: dc / acls / policies / update: ACL Policy Update
 
     ---
     Then the url should be /datacenter/acls/policies
-        And "[data-notification]" has the "hds-toast" class
-        And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
     Where:
       ------------------------------------------------------------------------------
       | Name          |  Rules                        | Description                |
@@ -50,8 +50,8 @@ Feature: dc / acls / policies / update: ACL Policy Update
     Given the url "/v1/acl/policy/policy-id" responds with a 500 status
     And I submit
     Then the url should be /datacenter/acls/policies/policy-id
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    Then "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "error" class
 
   @notNamespaceable
   Scenario: Updating a simple ACL policy when Namespaces are disabled does not send Namespace
@@ -65,5 +65,5 @@ Feature: dc / acls / policies / update: ACL Policy Update
       - Namespace
     ---
     Then the url should be /datacenter/acls/policies
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/view-read-only.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/view-read-only.feature
deleted file mode 100644
index 8887815cbb1a7..0000000000000
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/view-read-only.feature
+++ /dev/null
@@ -1,20 +0,0 @@
-@setupApplicationTest
-Feature: dc / acls / policies / view read-only policy: Readonly management policy
-  Background:
-    Given 1 datacenter model with the value "datacenter"
-    And 1 policy model from yaml
-    ---
-      ID: 00000000-0000-0000-0000-000000000002
-    ---
-  Scenario:
-    When I visit the policy page for yaml
-    ---
-      dc: datacenter
-      policy: 00000000-0000-0000-0000-000000000002
-    ---
-    Then the url should be /datacenter/acls/policies/00000000-0000-0000-0000-000000000002
-    Then I see the text "View Policy" in "h1"
-    Then I don't see confirmDelete
-    Then I don't see cancel
-    And I see tokens
-
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-existing.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-existing.feature
index acf4e16a2c4b0..6f22975753d12 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-existing.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-existing.feature
@@ -46,5 +46,5 @@ Feature: dc / acls / roles / as many / add existing: Add existing
           Name: Role 2
     ---
     Then the url should be /datacenter/acls/tokens
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-new.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-new.feature
index 601c17bb73fab..45249a8e4a5c3 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-new.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/as-many/add-new.feature
@@ -46,8 +46,8 @@ Feature: dc / acls / roles / as-many / add-new: Add new
             ID: ee52203d-989f-4f7a-ab5a-2bef004164ca-1
     ---
     Then the url should be /datacenter/acls/tokens
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   Scenario: Add Role that has an existing Policy
     And I click "#new-role .ember-power-select-trigger"
     And I click ".ember-power-select-option:first-child"
@@ -71,8 +71,8 @@ Feature: dc / acls / roles / as-many / add-new: Add new
             ID: ee52203d-989f-4f7a-ab5a-2bef004164ca-1
     ---
     Then the url should be /datacenter/acls/tokens
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   Scenario: Add Role and add a new Policy
     And I click roles.form.policies.create
     Then I fill in the roles.form.policies.form with yaml
@@ -111,8 +111,8 @@ Feature: dc / acls / roles / as-many / add-new: Add new
             ID: ee52203d-989f-4f7a-ab5a-2bef004164ca-1
     ---
     Then the url should be /datacenter/acls/tokens
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   Scenario: Add Role and add a new Service Identity
     And I click roles.form.policies.create
     Then I fill in the roles.form.policies.form with yaml
@@ -141,8 +141,8 @@ Feature: dc / acls / roles / as-many / add-new: Add new
             ID: ee52203d-989f-4f7a-ab5a-2bef004164ca-1
     ---
     Then the url should be /datacenter/acls/tokens
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
 @ignore:
   Scenario: Click the cancel form
     Then ok
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/create.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/create.feature
index 0c5a511015c68..ce63a93df59d4 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/create.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/create.feature
@@ -24,8 +24,8 @@ Feature: dc / acls / roles / create
         Description: [Description]
     ---
     Then the url should be /datacenter/acls/roles
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-create" class
+    And "[data-notification]" has the "success" class
     Where:
       ---------------------------
       | Description             |
@@ -45,5 +45,6 @@ Feature: dc / acls / roles / create
       - Namespace
     ---
     Then the url should be /datacenter/acls/roles
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-create" class
+    And "[data-notification]" has the "success" class
+
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/update.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/update.feature
index 081dc174cd902..795fd7908f210 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/update.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/roles/update.feature
@@ -29,8 +29,8 @@ Feature: dc / acls / roles / update: ACL Role Update
         Description: [Description]
     ---
     Then the url should be /datacenter/acls/roles
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
     Where:
       ------------------------------------------
       | Name        | Description              |
@@ -42,8 +42,8 @@ Feature: dc / acls / roles / update: ACL Role Update
     Given the url "/v1/acl/role/role-id" responds with a 500 status
     And I submit
     Then the url should be /datacenter/acls/roles/role-id
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    Then "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "error" class
 
   @notNamespaceable
   Scenario: Updating a simple ACL role when Namespaces are disabled does not send Namespace
@@ -57,5 +57,5 @@ Feature: dc / acls / roles / update: ACL Role Update
       - Namespace
     ---
     Then the url should be /datacenter/acls/roles
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/clone.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/clone.feature
index c03c5ef35b943..dba4efc39e0ef 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/clone.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/clone.feature
@@ -16,8 +16,8 @@ Feature: dc / acls / tokens / clone: Cloning an ACL token
     And I click actions on the tokens
     And I click clone on the tokens
     Then a PUT request was made to "/v1/acl/token/token/clone?dc=datacenter&ns=@!namespace"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    Then "[data-notification]" has the "notification-clone" class
+    And "[data-notification]" has the "success" class
   Scenario: Using an ACL token from the detail page
     When I visit the token page for yaml
     ---
@@ -26,5 +26,5 @@ Feature: dc / acls / tokens / clone: Cloning an ACL token
     ---
     And I click clone
     Then the url should be /datacenter/acls/tokens
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    Then "[data-notification]" has the "notification-clone" class
+    And "[data-notification]" has the "success" class
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/create.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/create.feature
index c330e4f07c365..351b21aa397e9 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/create.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/create.feature
@@ -21,8 +21,8 @@ Feature: dc / acls / tokens / create
         Description: [Description]
     ---
     Then the url should be /datacenter/acls/tokens
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-create" class
+    And "[data-notification]" has the "success" class
     Where:
       ---------------------------
       | Description             |
@@ -41,5 +41,5 @@ Feature: dc / acls / tokens / create
       - Namespace
     ---
     Then the url should be /datacenter/acls/tokens
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-create" class
+    And "[data-notification]" has the "success" class
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/own-no-delete.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/own-no-delete.feature
index b5e5484f413cf..b3e05853c1d21 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/own-no-delete.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/own-no-delete.feature
@@ -25,8 +25,8 @@ Feature: dc / acls / tokens / own-no-delete: Your current token has no delete bu
     And I click actions on the tokens
     And I click use on the tokens
     And I click confirmUse on the tokens
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    Then "[data-notification]" has the "notification-use" class
+    And "[data-notification]" has the "success" class
     Then I have settings like yaml
     ---
     consul:token: "{\"AccessorID\":\"token\",\"SecretID\":\"ee52203d-989f-4f7a-ab5a-2bef004164ca\",\"Namespace\":\"@namespace\",\"Partition\":\"default\"}"
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/update.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/update.feature
index 7455214564805..4770cedf585a8 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/update.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/update.feature
@@ -26,8 +26,8 @@ Feature: dc / acls / tokens / update: ACL Token Update
         Description: [Description]
     ---
     Then the url should be /datacenter/acls/tokens
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
     Where:
       ---------------------------
       | Description             |
@@ -38,8 +38,8 @@ Feature: dc / acls / tokens / update: ACL Token Update
     Given the url "/v1/acl/token/key" responds with a 500 status
     And I submit
     Then the url should be /datacenter/acls/tokens/key
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    Then "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "error" class
 
   @notNamespaceable
   Scenario: Updating a simple ACL token when Namespaces are disabled does not send Namespace
@@ -53,5 +53,5 @@ Feature: dc / acls / tokens / update: ACL Token Update
       - Namespace
     ---
     Then the url should be /datacenter/acls/tokens
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/use.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/use.feature
index 52c9b973d8eae..1e354f4045c53 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/use.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/tokens/use.feature
@@ -24,8 +24,8 @@ Feature: dc / acls / tokens / use: Using an ACL token
     And I click actions on the tokens
     And I click use on the tokens
     And I click confirmUse on the tokens
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    Then "[data-notification]" has the "notification-use" class
+    And "[data-notification]" has the "success" class
     Then I have settings like yaml
     ---
     consul:token: "{\"AccessorID\":\"token\",\"SecretID\":\"ee52203d-989f-4f7a-ab5a-2bef004164ca\",\"Namespace\":\"@namespace\",\"Partition\":\"default\"}"
@@ -40,8 +40,8 @@ Feature: dc / acls / tokens / use: Using an ACL token
     ---
     And I click use
     And I click confirmUse
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    Then "[data-notification]" has the "notification-use" class
+    And "[data-notification]" has the "success" class
     Then I have settings like yaml
     ---
     consul:token: "{\"AccessorID\":\"token\",\"SecretID\":\"ee52203d-989f-4f7a-ab5a-2bef004164ca\",\"Namespace\":\"@namespace\",\"Partition\":\"default\"}"
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/intentions/create.feature b/ui/packages/consul-ui/tests/acceptance/dc/intentions/create.feature
index 2d074876ec9b8..0b4c6baa65872 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/intentions/create.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/intentions/create.feature
@@ -59,8 +59,8 @@ Feature: dc / intentions / create: Intention Create
     ---
     Then the url should be /datacenter/intentions
     And the title should be "Intentions - Consul"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   @notNamespaceable
   Scenario: with namespaces disabled
     Given 1 datacenter model with the value "datacenter"
@@ -101,5 +101,5 @@ Feature: dc / intentions / create: Intention Create
     ---
     Then the url should be /datacenter/intentions
     And the title should be "Intentions - Consul"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/intentions/delete.feature b/ui/packages/consul-ui/tests/acceptance/dc/intentions/delete.feature
index f85b0b2b6893e..85424e943ccd0 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/intentions/delete.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/intentions/delete.feature
@@ -21,10 +21,10 @@ Feature: dc / intentions / deleting: Deleting items with confirmations, success
     ---
     And I click actions on the intentionList.intentions
     And I click delete on the intentionList.intentions
-    And I click confirmInlineDelete on the intentionList.intentions
+    And I click confirmDelete on the intentionList.intentions
     Then a DELETE request was made to "/v1/connect/intentions/exact?source=default%2Fdefault%2Fname&destination=default%2Fdefault%2Fdestination&dc=datacenter"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "success" class
   Scenario: Deleting an intention from the intention detail page
     When I visit the intention page for yaml
     ---
@@ -34,8 +34,8 @@ Feature: dc / intentions / deleting: Deleting items with confirmations, success
     And I click delete
     And I click confirmDelete
     Then a DELETE request was made to "/v1/connect/intentions/exact?source=default%2Fdefault%2Fname&destination=default%2Fdefault%2Fdestination&dc=datacenter"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "success" class
   Scenario: Deleting an intention from the intention detail page and getting an error
     When I visit the intention page for yaml
     ---
@@ -45,8 +45,8 @@ Feature: dc / intentions / deleting: Deleting items with confirmations, success
     Given the url "/v1/connect/intentions/exact?source=default%2Fdefault%2Fname&destination=default%2Fdefault%2Fdestination&dc=datacenter" responds with a 500 status
     And I click delete
     And I click confirmDelete
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "error" class
   Scenario: Deleting an intention from the intention detail page and getting an error due to a duplicate intention
     When I visit the intention page for yaml
     ---
@@ -60,5 +60,6 @@ Feature: dc / intentions / deleting: Deleting items with confirmations, success
     ---
     And I click delete
     And I click confirmDelete
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "error" class
+    And I see the text "Intention exists" in "[data-notification] strong"
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/intentions/filtered-select.feature b/ui/packages/consul-ui/tests/acceptance/dc/intentions/filtered-select.feature
index e15947b0d0b94..316c92b891c11 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/intentions/filtered-select.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/intentions/filtered-select.feature
@@ -31,6 +31,42 @@ Feature: dc / intentions / filtered-select: Intention Service Select Dropdowns
       | source      |
       | destination |
     ---------------
+  @onlyNamespaceable
+  Scenario: Opening and closing the nspace [Name] dropdown doesn't double up items
+    Given 1 datacenter model with the value "datacenter"
+    And 2 nspace models from yaml
+    ---
+    - Name: nspace-0
+    - Name: nspace-1
+    ---
+    When I visit the intention page for yaml
+    ---
+      dc: datacenter
+    ---
+    Then the url should be /datacenter/intentions/create
+    Given a network latency of 60000
+    And I click "[data-test-[Name]-nspace] .ember-power-select-trigger"
+    Then I see the text "* (All Namespaces)" in ".ember-power-select-option:nth-last-child(3)"
+    Then I see the text "nspace-0" in ".ember-power-select-option:nth-last-child(2)"
+    Then I see the text "nspace-1" in ".ember-power-select-option:last-child"
+    And I click ".ember-power-select-option:last-child"
+    And I click "[data-test-[Name]-nspace] .ember-power-select-trigger"
+    And I click ".ember-power-select-option:last-child"
+    And I click "[data-test-[Name]-nspace] .ember-power-select-trigger"
+    And I click ".ember-power-select-option:last-child"
+    And I click "[data-test-[Name]-nspace] .ember-power-select-trigger"
+    Then I don't see the text "nspace-1" in ".ember-power-select-option:nth-last-child(6)"
+    Then I don't see the text "nspace-1" in ".ember-power-select-option:nth-last-child(5)"
+    Then I don't see the text "nspace-1" in ".ember-power-select-option:nth-last-child(4)"
+    Then I see the text "* (All Namespaces)" in ".ember-power-select-option:nth-last-child(3)"
+    Then I see the text "nspace-0" in ".ember-power-select-option:nth-last-child(2)"
+    Then I see the text "nspace-1" in ".ember-power-select-option:last-child"
+    Where:
+      ---------------
+      | Name        |
+      | source      |
+      | destination |
+      ---------------
   Scenario: Opening the [Name] dropdown with 2 services with the same name from different nspaces
     Given 1 datacenter model with the value "datacenter"
     And 2 service models from yaml
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/intentions/update.feature b/ui/packages/consul-ui/tests/acceptance/dc/intentions/update.feature
index 5faa162816c99..0d7b8525c746a 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/intentions/update.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/intentions/update.feature
@@ -33,8 +33,8 @@ Feature: dc / intentions / update: Intention Update
     ---
     Then the url should be /datacenter/intentions
     And the title should be "Intentions - Consul"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
     Where:
       ------------------------------
       | Description       | Action |
@@ -44,6 +44,6 @@ Feature: dc / intentions / update: Intention Update
     Given the url "/v1/connect/intentions/exact?source=default%2Fdefault%2Fweb&destination=default%2Fdefault%2Fdb&dc=datacenter" responds with a 500 status
     And I submit
     Then the url should be /datacenter/intentions/intention-id
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    Then "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "error" class
 
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/kvs/create.feature b/ui/packages/consul-ui/tests/acceptance/dc/kvs/create.feature
index 9a98ba71fc215..bd10541a759d0 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/kvs/create.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/kvs/create.feature
@@ -16,8 +16,8 @@ Feature: dc / kvs / create
     And I submit
     Then the url should be /datacenter/kv
     Then a PUT request was made to "/v1/kv/key-value?dc=datacenter&ns=@namespace"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   Scenario: Creating a folder
     Given 1 datacenter model with the value "datacenter"
     When I visit the kv page for yaml
@@ -33,8 +33,8 @@ Feature: dc / kvs / create
     And I submit
     Then the url should be /datacenter/kv
     Then a PUT request was made to "/v1/kv/key-value/?dc=datacenter&ns=@namespace"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   Scenario: Clicking create from within a folder
     Given 1 datacenter model with the value "datacenter"
     And 1 kv model from yaml
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/kvs/delete.feature b/ui/packages/consul-ui/tests/acceptance/dc/kvs/delete.feature
index 01d3f99d2668e..d22bfad39e26b 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/kvs/delete.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/kvs/delete.feature
@@ -13,10 +13,10 @@ Feature: dc / kvs / deleting: Deleting items with confirmations, success and err
     ---
     And I click actions on the kvs
     And I click delete on the kvs
-    And I click confirmInlineDelete on the kvs
+    And I click confirmDelete on the kvs
     Then a DELETE request was made to "/v1/kv/key-name?dc=datacenter&ns=@!namespace"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "success" class
   Scenario: Deleting an kv from the kv detail page
     When I visit the kv page for yaml
     ---
@@ -26,8 +26,8 @@ Feature: dc / kvs / deleting: Deleting items with confirmations, success and err
     And I click delete
     And I click confirmDelete
     Then a DELETE request was made to "/v1/kv/key-name?dc=datacenter&ns=@!namespace"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "success" class
   Scenario: Deleting an kv from the kv detail page and getting an error
     When I visit the kv page for yaml
     ---
@@ -37,6 +37,6 @@ Feature: dc / kvs / deleting: Deleting items with confirmations, success and err
     Given the url "/v1/kv/key-name?dc=datacenter&ns=@!namespace" responds with a 500 status
     And I click delete
     And I click confirmDelete
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "error" class
 
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/kvs/sessions/invalidate.feature b/ui/packages/consul-ui/tests/acceptance/dc/kvs/sessions/invalidate.feature
index 66d46a3a1021d..6959dba8b74dc 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/kvs/sessions/invalidate.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/kvs/sessions/invalidate.feature
@@ -21,12 +21,12 @@ Feature: dc / kvs / sessions / invalidate: Invalidate Lock Sessions
     And I click confirmDelete on the session
     Then a PUT request was made to "/v1/session/destroy/ee52203d-989f-4f7a-ab5a-2bef004164ca?dc=datacenter&ns=@!namespace"
     Then the url should be /datacenter/kv/key/edit
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "success" class
   Scenario: Invalidating a lock session and receiving an error
     Given the url "/v1/session/destroy/ee52203d-989f-4f7a-ab5a-2bef004164ca?dc=datacenter&ns=@namespace" responds with a 500 status
     And I click delete on the session
     And I click confirmDelete on the session
     Then the url should be /datacenter/kv/key/edit
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "error" class
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/kvs/update.feature b/ui/packages/consul-ui/tests/acceptance/dc/kvs/update.feature
index 4ee40a60b9ece..ce9773914bbb6 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/kvs/update.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/kvs/update.feature
@@ -23,8 +23,8 @@ Feature: dc / kvs / update: KV Update
     ---
     And I submit
     Then a PUT request was made to "/v1/kv/[EncodedName]?dc=datacenter&ns=@!namespace&flags=12" with the body "[Value]"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   Where:
       ---------------------------------------------------------
       | Name            | EncodedName          | Value        |
@@ -56,8 +56,8 @@ Feature: dc / kvs / update: KV Update
     Then a PUT request was made to "/v1/kv/key?dc=datacenter&ns=@!namespace&flags=12" with the body "   "
     Then the url should be /datacenter/kv
     And the title should be "Key / Value - Consul"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   Scenario: Update to a key change value to ''
     And 1 kv model from yaml
     ---
@@ -79,8 +79,8 @@ Feature: dc / kvs / update: KV Update
     And I submit
     Then a PUT request was made to "/v1/kv/key?dc=datacenter&ns=@!namespace&flags=12" with no body
     Then the url should be /datacenter/kv
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   Scenario: Update to a key when the value is empty
     And 1 kv model from yaml
     ---
@@ -97,8 +97,8 @@ Feature: dc / kvs / update: KV Update
     And I submit
     Then a PUT request was made to "/v1/kv/key?dc=datacenter&ns=@!namespace&flags=12" with no body
     Then the url should be /datacenter/kv
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   Scenario: There was an error saving the key
     When I visit the kv page for yaml
     ---
@@ -110,8 +110,8 @@ Feature: dc / kvs / update: KV Update
     Given the url "/v1/kv/key" responds with a 500 status
     And I submit
     Then the url should be /datacenter/kv/key/edit
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    Then "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "error" class
 @ignore
   Scenario: KV's with spaces are saved correctly
     Then ok
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nodes/sessions/invalidate.feature b/ui/packages/consul-ui/tests/acceptance/dc/nodes/sessions/invalidate.feature
index b6df7fc16831e..43dfcb7ae5753 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/nodes/sessions/invalidate.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/nodes/sessions/invalidate.feature
@@ -27,12 +27,12 @@ Feature: dc / nodes / sessions / invalidate: Invalidate Lock Sessions
     And I click confirmDelete on the sessions
     Then a PUT request was made to "/v1/session/destroy/7bbbd8bb-fff3-4292-b6e3-cfedd788546a?dc=dc1&ns=@!namespace"
     Then the url should be /dc1/nodes/node-0/lock-sessions
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "success" class
   Scenario: Invalidating a lock session and receiving an error
     Given the url "/v1/session/destroy/7bbbd8bb-fff3-4292-b6e3-cfedd788546a?dc=dc1&ns=@namespace" responds with a 500 status
     And I click delete on the sessions
     And I click confirmDelete on the sessions
     Then the url should be /dc1/nodes/node-0/lock-sessions
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "error" class
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nspaces/delete.feature b/ui/packages/consul-ui/tests/acceptance/dc/nspaces/delete.feature
index e536b66fc42af..36bce2f653c6d 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/nspaces/delete.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/nspaces/delete.feature
@@ -19,8 +19,8 @@ Feature: dc / nspaces / delete: Deleting items with confirmations, success and e
     And I click delete on the [Listing]
     And I click confirmDelete on the [Listing]
     Then a [Method] request was made to "[URL]"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "success" class
   Where:
     --------------------------------------------------------------------------------------------------------
     | Edit     | Listing     | Method | URL                                      | Data                    |
@@ -35,8 +35,8 @@ Feature: dc / nspaces / delete: Deleting items with confirmations, success and e
     And I click delete
     And I click confirmDelete
     Then a DELETE request was made to "/v1/namespace/a-namespace?dc=datacenter"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "success" class
   Scenario: Deleting a [Model] from the [Model] detail page with error
     When I visit the [Model] page for yaml
     ---
@@ -46,8 +46,8 @@ Feature: dc / nspaces / delete: Deleting items with confirmations, success and e
     Given the url "[URL]" responds with a 500 status
     And I click delete
     And I click confirmDelete
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "error" class
   Where:
     -------------------------------------------------------------------------------------------
     | Model     | Method | URL                                      | Slug                    |
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/nspaces/update.feature b/ui/packages/consul-ui/tests/acceptance/dc/nspaces/update.feature
index 7feb09ca76b23..0b4a5bdc6aa39 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/nspaces/update.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/nspaces/update.feature
@@ -28,8 +28,8 @@ Feature: dc / nspaces / update: Nspace Update
         Description: [Description]
     ---
     Then the url should be /datacenter/namespaces
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
     Where:
       ---------------------------
       | Description             |
@@ -40,5 +40,5 @@ Feature: dc / nspaces / update: Nspace Update
     Given the url "/v1/namespace/namespace?dc=datacenter" responds with a 500 status
     And I submit
     Then the url should be /datacenter/namespaces/namespace
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    Then "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "error" class
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/peers/delete.feature b/ui/packages/consul-ui/tests/acceptance/dc/peers/delete.feature
index 7106105cbaf85..7cd6b4b3122ca 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/peers/delete.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/peers/delete.feature
@@ -16,8 +16,8 @@ Feature: dc / peers / delete: Deleting items with confirmations, success and err
     And I click delete on the peers
     And I click confirmDelete on the peers
     Then a DELETE request was made to "/v1/peering/peer-name"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "success" class
   Scenario: Deleting a peer from the peer listing page with error
     Given 1 peer model from yaml
     ---
@@ -32,8 +32,8 @@ Feature: dc / peers / delete: Deleting items with confirmations, success and err
     And I click actions on the peers
     And I click delete on the peers
     And I click confirmDelete on the peers
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "error" class
   Scenario: A Peer currently deleting cannot be deleted
     Given 1 peer model from yaml
     ---
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/peers/establish.feature b/ui/packages/consul-ui/tests/acceptance/dc/peers/establish.feature
index 6388f824a8aca..c773155aca8b4 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/peers/establish.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/peers/establish.feature
@@ -26,6 +26,6 @@ Feature: dc / peers / establish: Peer Establish Peering
         PeerName: new-peer
         PeeringToken: an-encoded-token
     ---
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
     And the url should be /dc-1/peers/new-peer/imported-services
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/services/show.feature b/ui/packages/consul-ui/tests/acceptance/dc/services/show.feature
index 647217eece4a1..496b17742864a 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/services/show.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/services/show.feature
@@ -299,7 +299,6 @@ Feature: dc / services / show: Show Service
     # authorization requests are not blocking so we just wait until the next
     # service blocking query responds
     Then pause until I see the text "no longer have access" in "[data-notification]"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    And "[data-notification]" has the "error" class
     And I see status on the error like "403"
 
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/create.feature b/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/create.feature
index 0f518420e016c..e95b03d62f61e 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/create.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/create.feature
@@ -62,8 +62,8 @@ Feature: dc / services / intentions / create: Intention Create per Service
         Action: deny
     ---
     Then the url should be /datacenter/services/db/intentions
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
   @notNamespaceable
   Scenario: with namespaces disabled
     Given 1 datacenter model with the value "datacenter"
@@ -104,5 +104,5 @@ Feature: dc / services / intentions / create: Intention Create per Service
         Action: deny
     ---
     Then the url should be /datacenter/services/db/intentions
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/index.feature b/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/index.feature
index b94c4ab3ba9b8..0148fa6f9d2e5 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/index.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/services/show/intentions/index.feature
@@ -48,7 +48,7 @@ Feature: dc / services / show / intentions / index: Intentions per service
   Scenario: I can delete intentions
     And I click actions on the intentionList.intentions component
     And I click delete on the intentionList.intentions component
-    And I click confirmInlineDelete on the intentionList.intentions
+    And I click confirmDelete on the intentionList.intentions
     Then a DELETE request was made to "/v1/connect/intentions/exact?source=default%2Fdefault%2Fname&destination=default%2Fdefault%2Fdestination&dc=dc1"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "success" class
diff --git a/ui/packages/consul-ui/tests/acceptance/dc/services/show/topology/intentions.feature b/ui/packages/consul-ui/tests/acceptance/dc/services/show/topology/intentions.feature
index 35e823711d6d3..a93e27c6aabc2 100644
--- a/ui/packages/consul-ui/tests/acceptance/dc/services/show/topology/intentions.feature
+++ b/ui/packages/consul-ui/tests/acceptance/dc/services/show/topology/intentions.feature
@@ -36,8 +36,7 @@ Feature: dc / services / show / topology / intentions
     ---
     When I click ".consul-topology-metrics [data-test-action]"
     And I click ".consul-topology-metrics [data-test-confirm]"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "success" class
   Scenario: There was an error saving the intention
     Given the url "/v1/connect/intentions/exact?source=default%2Fweb&destination=default%2Fdb&dc=datacenter" responds with a 500 status
     When I visit the service page for yaml
@@ -47,5 +46,4 @@ Feature: dc / services / show / topology / intentions
     ---
     When I click ".consul-topology-metrics [data-test-action]"
     And I click ".consul-topology-metrics [data-test-confirm]"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
\ No newline at end of file
+    And "[data-notification]" has the "error" class
\ No newline at end of file
diff --git a/ui/packages/consul-ui/tests/acceptance/deleting.feature b/ui/packages/consul-ui/tests/acceptance/deleting.feature
index 2aa21edb34824..f3e58219ed8de 100644
--- a/ui/packages/consul-ui/tests/acceptance/deleting.feature
+++ b/ui/packages/consul-ui/tests/acceptance/deleting.feature
@@ -18,8 +18,8 @@ Feature: deleting: Deleting items with confirmations, success and error notifica
     And I click delete on the [Listing]
     And I click confirmDelete on the [Listing]
     Then a [Method] request was made to "[URL]"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "success" class
   Where:
     --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     | Edit     | Listing     | Method | URL                                                                             | Data                                                                 |
@@ -34,8 +34,8 @@ Feature: deleting: Deleting items with confirmations, success and error notifica
     And I click delete
     And I click confirmDelete
     Then a [Method] request was made to "[URL]"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "success" class
   Where:
     -----------------------------------------------------------------------------------------------------------------------------------------------------------
     | Model     | Method | URL                                                                              | Slug                                            |
@@ -50,8 +50,8 @@ Feature: deleting: Deleting items with confirmations, success and error notifica
     Given the url "[URL]" responds with a 500 status
     And I click delete
     And I click confirmDelete
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-critical" class
+    And "[data-notification]" has the "notification-delete" class
+    And "[data-notification]" has the "error" class
   Where:
     -----------------------------------------------------------------------------------------------------------------------------------------------------------
     | Model     | Method | URL                                                                              | Slug                                            |
diff --git a/ui/packages/consul-ui/tests/acceptance/hcp-login-test.js b/ui/packages/consul-ui/tests/acceptance/hcp-login-test.js
index 4c401f80ce383..7f39381d89ac0 100644
--- a/ui/packages/consul-ui/tests/acceptance/hcp-login-test.js
+++ b/ui/packages/consul-ui/tests/acceptance/hcp-login-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { visit } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
diff --git a/ui/packages/consul-ui/tests/acceptance/login.feature b/ui/packages/consul-ui/tests/acceptance/login.feature
index 8e59f5892ccfa..9af0bbfeeed48 100644
--- a/ui/packages/consul-ui/tests/acceptance/login.feature
+++ b/ui/packages/consul-ui/tests/acceptance/login.feature
@@ -48,5 +48,5 @@ Feature: login
     And I click ".okta-oidc-provider"
     Then a POST request was made to "/v1/acl/oidc/auth-url?dc=dc-1&ns=@!namespace&partition=partition"
     And a POST request was made to "/v1/acl/oidc/callback?dc=dc-1&ns=@!namespace&partition=partition"
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-authorize" class
+    And "[data-notification]" has the "success" class
diff --git a/ui/packages/consul-ui/tests/acceptance/settings/update.feature b/ui/packages/consul-ui/tests/acceptance/settings/update.feature
index 9409d5ad98c30..680c69577f35a 100644
--- a/ui/packages/consul-ui/tests/acceptance/settings/update.feature
+++ b/ui/packages/consul-ui/tests/acceptance/settings/update.feature
@@ -18,6 +18,6 @@ Feature: settings / update: Update Settings
     consul:token: ''
     ---
     And the url should be /settings
-    And "[data-notification]" has the "hds-toast" class
-    And "[data-notification]" has the "hds-alert--color-success" class
+    And "[data-notification]" has the "notification-update" class
+    And "[data-notification]" has the "success" class
 
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/api-prefix-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/api-prefix-steps.js
index 34f897464f313..28bb92a0c2766 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/api-prefix-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/api-prefix-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from './steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/components/acl-filter-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/components/acl-filter-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/components/acl-filter-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/components/acl-filter-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/components/catalog-filter-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/components/catalog-filter-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/components/catalog-filter-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/components/catalog-filter-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/components/catalog-toolbar-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/components/catalog-toolbar-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/components/catalog-toolbar-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/components/catalog-toolbar-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/components/copy-button-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/components/copy-button-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/components/copy-button-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/components/copy-button-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/components/kv-filter-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/components/kv-filter-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/components/kv-filter-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/components/kv-filter-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/components/text-input-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/components/text-input-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/components/text-input-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/components/text-input-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/access-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/access-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/access-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/access-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/auth-methods/index-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/auth-methods/index-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/auth-methods/index-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/auth-methods/index-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/auth-methods/navigation-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/auth-methods/navigation-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/auth-methods/navigation-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/auth-methods/navigation-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/auth-methods/sorting-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/auth-methods/sorting-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/auth-methods/sorting-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/auth-methods/sorting-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/index-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/index-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/index-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/index-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/list-order-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/list-order-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/list-order-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/list-order-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/add-existing-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/add-existing-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/add-existing-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/add-existing-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/add-new-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/add-new-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/add-new-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/add-new-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/list-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/list-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/list-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/list-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/nspaces-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/nspaces-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/nspaces-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/nspaces-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/remove-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/remove-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/remove-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/remove-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/reset-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/reset-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/reset-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/as-many/reset-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/create-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/create-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/create-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/create-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/delete-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/delete-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/delete-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/delete-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/index-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/index-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/index-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/index-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/navigation-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/navigation-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/navigation-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/navigation-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/sorting-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/sorting-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/sorting-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/sorting-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/update-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/update-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/update-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/update-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/view-management-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/view-management-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/view-management-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/view-management-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/view-read-only-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/view-read-only-steps.js
deleted file mode 100644
index 34296881e74e0..0000000000000
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/view-read-only-steps.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
-import steps from '../../../steps';
-
-// step definitions that are shared between features should be moved to the
-// tests/acceptance/steps/steps.js file
-
-export default function (assert) {
-  return steps(assert).then('I should find a file', function () {
-    assert.ok(true, this.step);
-  });
-}
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/add-existing-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/add-existing-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/add-existing-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/add-existing-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/add-new-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/add-new-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/add-new-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/add-new-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/list-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/list-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/list-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/list-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/remove-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/remove-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/remove-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/as-many/remove-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/create-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/create-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/create-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/create-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/index-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/index-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/index-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/index-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/navigation-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/navigation-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/navigation-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/navigation-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/sorting-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/sorting-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/sorting-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/sorting-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/update-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/update-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/update-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/roles/update-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/anonymous-no-delete-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/anonymous-no-delete-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/anonymous-no-delete-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/anonymous-no-delete-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/clone-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/clone-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/clone-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/clone-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/create-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/create-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/create-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/create-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/index-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/index-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/index-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/index-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/legacy/update-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/legacy/update-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/legacy/update-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/legacy/update-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/login-errors-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/login-errors-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/login-errors-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/login-errors-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/login-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/login-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/login-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/login-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/navigation-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/navigation-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/navigation-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/navigation-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/own-no-delete-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/own-no-delete-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/own-no-delete-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/own-no-delete-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/sorting-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/sorting-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/sorting-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/sorting-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/update-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/update-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/update-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/update-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/use-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/use-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/use-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/tokens/use-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/update-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/update-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/update-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/update-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/use-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/use-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/use-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/use-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/error-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/error-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/error-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/error-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/forwarding-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/forwarding-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/forwarding-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/forwarding-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/index-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/index-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/index-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/index-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/create-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/create-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/create-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/create-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/delete-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/delete-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/delete-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/delete-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/filtered-select-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/filtered-select-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/filtered-select-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/filtered-select-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/form-select-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/form-select-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/form-select-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/form-select-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/index-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/index-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/index-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/index-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/navigation-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/navigation-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/navigation-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/navigation-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/permissions/create-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/permissions/create-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/permissions/create-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/permissions/create-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/permissions/warn-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/permissions/warn-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/permissions/warn-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/permissions/warn-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/read-only-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/read-only-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/read-only-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/read-only-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/sorting-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/sorting-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/sorting-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/sorting-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/update-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/update-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/update-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/intentions/update-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/kv/index/view-kvs-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/kv/index/view-kvs-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/kv/index/view-kvs-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/kv/index/view-kvs-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/create-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/create-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/create-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/create-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/delete-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/delete-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/delete-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/delete-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/edit-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/edit-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/edit-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/edit-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/index-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/index-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/index-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/index-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/list-order-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/list-order-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/list-order-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/list-order-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/sessions/invalidate-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/sessions/invalidate-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/sessions/invalidate-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/sessions/invalidate-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/trailing-slash-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/trailing-slash-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/trailing-slash-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/trailing-slash-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/update-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/update-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/update-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/kvs/update-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/list-blocking-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/list-blocking-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/list-blocking-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/list-blocking-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/list-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/list-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/list-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/list-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/empty-ids-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/empty-ids-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/empty-ids-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/empty-ids-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/index-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/index-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/index-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/index-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/index/view-nodes-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/index/view-nodes-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/index/view-nodes-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/index/view-nodes-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/navigation-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/navigation-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/navigation-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/navigation-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/no-leader-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/no-leader-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/no-leader-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/no-leader-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/services/list-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/services/list-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/services/list-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/services/list-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/sessions/invalidate-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/sessions/invalidate-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/sessions/invalidate-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/sessions/invalidate-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/sessions/list-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/sessions/list-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/sessions/list-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/sessions/list-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/show-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/show-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/show-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/show-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/show/health-checks-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/show/health-checks-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/show/health-checks-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/show/health-checks-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/sorting-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/sorting-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/sorting-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nodes/sorting-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/create-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/create-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/create-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/create-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/delete-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/delete-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/delete-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/delete-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/index-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/index-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/index-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/index-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/manage-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/manage-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/manage-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/manage-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/sorting-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/sorting-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/sorting-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/sorting-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/update-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/update-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/update-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/nspaces/update-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/create-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/create-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/create-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/create-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/delete-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/delete-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/delete-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/delete-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/establish-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/establish-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/establish-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/establish-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/index-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/index-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/index-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/index-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/regenerate-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/regenerate-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/regenerate-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/regenerate-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/show-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/show-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/show-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/peers/show-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/routing-config-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/routing-config-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/routing-config-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/routing-config-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/dc-switch-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/dc-switch-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/dc-switch-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/dc-switch-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/error-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/error-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/error-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/error-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/index-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/index-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/index-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/index-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/index/view-services-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/index/view-services-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/index/view-services-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/index/view-services-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/error-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/error-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/error-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/error-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/exposed-paths-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/exposed-paths-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/exposed-paths-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/exposed-paths-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/gateway-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/gateway-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/gateway-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/gateway-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/health-checks-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/health-checks-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/health-checks-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/health-checks-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/navigation-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/navigation-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/navigation-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/navigation-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/proxy-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/proxy-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/proxy-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/proxy-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/show-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/show-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/show-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/show-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/sidecar-proxy-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/sidecar-proxy-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/sidecar-proxy-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/sidecar-proxy-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/upstreams-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/upstreams-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/upstreams-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/upstreams-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/with-proxy-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/with-proxy-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/with-proxy-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/with-proxy-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/with-sidecar-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/with-sidecar-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/with-sidecar-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/instances/with-sidecar-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/list-blocking-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/list-blocking-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/list-blocking-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/list-blocking-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/list-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/list-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/list-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/list-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/navigation-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/navigation-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/navigation-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/navigation-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show-routing-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show-routing-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show-routing-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show-routing-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show-with-slashes-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show-with-slashes-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show-with-slashes-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show-with-slashes-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/dc-switch-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/dc-switch-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/dc-switch-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/dc-switch-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/intentions-error-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/intentions-error-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/intentions-error-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/intentions-error-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/intentions/create-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/intentions/create-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/intentions/create-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/intentions/create-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/intentions/index-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/intentions/index-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/intentions/index-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/intentions/index-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/navigation-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/navigation-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/navigation-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/navigation-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/services-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/services-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/services-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/services-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/tags-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/tags-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/tags-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/tags-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/empty-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/empty-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/empty-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/empty-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/index-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/index-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/index-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/index-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/intentions-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/intentions-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/intentions-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/intentions-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/metrics-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/metrics-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/metrics-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/metrics-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/notices-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/notices-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/notices-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/notices-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/routing-config-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/routing-config-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/routing-config-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/routing-config-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/stats-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/stats-steps.js
index 34a533faf8b70..bf28aa4b1a8ec 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/stats-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/topology/stats-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/upstreams-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/upstreams-steps.js
index 34296881e74e0..0d8916bbbd118 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/upstreams-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/show/upstreams-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/sorting-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/sorting-steps.js
index f97b73cd66024..06173e1e01caf 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/dc/services/sorting-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/services/sorting-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/deleting-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/deleting-steps.js
index 34f897464f313..28bb92a0c2766 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/deleting-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/deleting-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from './steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/index-forwarding-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/index-forwarding-steps.js
index 34f897464f313..28bb92a0c2766 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/index-forwarding-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/index-forwarding-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from './steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/login-errors-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/login-errors-steps.js
index 34f897464f313..28bb92a0c2766 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/login-errors-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/login-errors-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from './steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/login-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/login-steps.js
index 34f897464f313..28bb92a0c2766 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/login-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/login-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from './steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/navigation-links-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/navigation-links-steps.js
index 34f897464f313..28bb92a0c2766 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/navigation-links-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/navigation-links-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from './steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/nodes/sorting-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/nodes/sorting-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/nodes/sorting-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/nodes/sorting-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/page-navigation-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/page-navigation-steps.js
index 34f897464f313..28bb92a0c2766 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/page-navigation-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/page-navigation-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from './steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/settings/show-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/settings/show-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/settings/show-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/settings/show-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/settings/update-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/settings/update-steps.js
index 9f2f33024ba58..fc7b6f81868df 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/settings/update-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/settings/update-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from '../steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/startup-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/startup-steps.js
index 34f897464f313..28bb92a0c2766 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/startup-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/startup-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from './steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/steps.js b/ui/packages/consul-ui/tests/acceptance/steps/steps.js
index 2907491399621..1c98ad37662e6 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Inflector from 'ember-inflector';
 import helpers from '@ember/test-helpers';
 import $ from '-jquery';
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/submit-blank-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/submit-blank-steps.js
index 34f897464f313..28bb92a0c2766 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/submit-blank-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/submit-blank-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from './steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/acceptance/steps/token-header-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/token-header-steps.js
index 34f897464f313..28bb92a0c2766 100644
--- a/ui/packages/consul-ui/tests/acceptance/steps/token-header-steps.js
+++ b/ui/packages/consul-ui/tests/acceptance/steps/token-header-steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import steps from './steps';
 
 // step definitions that are shared between features should be moved to the
diff --git a/ui/packages/consul-ui/tests/dictionary.js b/ui/packages/consul-ui/tests/dictionary.js
index 0d39f99a32eab..cdebb2813f612 100644
--- a/ui/packages/consul-ui/tests/dictionary.js
+++ b/ui/packages/consul-ui/tests/dictionary.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* eslint no-control-regex: "off" */
 import Yadda from 'yadda';
 import YAML from 'js-yaml';
diff --git a/ui/packages/consul-ui/tests/helpers/api.js b/ui/packages/consul-ui/tests/helpers/api.js
index 5d70913364f05..86e711576a7c8 100644
--- a/ui/packages/consul-ui/tests/helpers/api.js
+++ b/ui/packages/consul-ui/tests/helpers/api.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import config from 'consul-ui/config/environment';
 
 import apiDouble from '@hashicorp/ember-cli-api-double';
diff --git a/ui/packages/consul-ui/tests/helpers/destroy-app.js b/ui/packages/consul-ui/tests/helpers/destroy-app.js
index 797ac5c748b4a..28dec908e56ae 100644
--- a/ui/packages/consul-ui/tests/helpers/destroy-app.js
+++ b/ui/packages/consul-ui/tests/helpers/destroy-app.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { run } from '@ember/runloop';
 
 export default function destroyApp(application) {
diff --git a/ui/packages/consul-ui/tests/helpers/flash-message.js b/ui/packages/consul-ui/tests/helpers/flash-message.js
index fe35b65a9fca3..56646e876660a 100644
--- a/ui/packages/consul-ui/tests/helpers/flash-message.js
+++ b/ui/packages/consul-ui/tests/helpers/flash-message.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import FlashObject from 'ember-cli-flash/flash/object';
 
 FlashObject.reopen({ init() {} });
diff --git a/ui/packages/consul-ui/tests/helpers/get-nspace-runner.js b/ui/packages/consul-ui/tests/helpers/get-nspace-runner.js
index 74fd2c18bb66c..07d00144b44b3 100644
--- a/ui/packages/consul-ui/tests/helpers/get-nspace-runner.js
+++ b/ui/packages/consul-ui/tests/helpers/get-nspace-runner.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (type) {
   return function (cb, withNspaces, withoutNspaces, container, assert) {
     let CONSUL_NSPACES_ENABLED = true;
diff --git a/ui/packages/consul-ui/tests/helpers/measure.js b/ui/packages/consul-ui/tests/helpers/measure.js
index 6a4f36214cee6..0ba4f07694dbb 100644
--- a/ui/packages/consul-ui/tests/helpers/measure.js
+++ b/ui/packages/consul-ui/tests/helpers/measure.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* eslint no-console: "off" */
 import getMeasure from 'consul-ui/tests/lib/measure/getMeasure';
 let report;
diff --git a/ui/packages/consul-ui/tests/helpers/module-for-acceptance.js b/ui/packages/consul-ui/tests/helpers/module-for-acceptance.js
index 0f9c096ffd138..35ecb4bc036b2 100644
--- a/ui/packages/consul-ui/tests/helpers/module-for-acceptance.js
+++ b/ui/packages/consul-ui/tests/helpers/module-for-acceptance.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module } from 'qunit';
 import { resolve } from 'rsvp';
 import startApp from '../helpers/start-app';
diff --git a/ui/packages/consul-ui/tests/helpers/normalizers.js b/ui/packages/consul-ui/tests/helpers/normalizers.js
index cd887d3028bde..9d6f2f273cfad 100644
--- a/ui/packages/consul-ui/tests/helpers/normalizers.js
+++ b/ui/packages/consul-ui/tests/helpers/normalizers.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export const createPolicies = function (item) {
   return item.Policies.map(function (item) {
     return {
diff --git a/ui/packages/consul-ui/tests/helpers/page.js b/ui/packages/consul-ui/tests/helpers/page.js
index b8b1d0b250923..29d4ef1fca962 100644
--- a/ui/packages/consul-ui/tests/helpers/page.js
+++ b/ui/packages/consul-ui/tests/helpers/page.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 const mb = function (path) {
   return function (obj) {
     return (
diff --git a/ui/packages/consul-ui/tests/helpers/repo.js b/ui/packages/consul-ui/tests/helpers/repo.js
index 736f004ad9838..aa8a94cd69809 100644
--- a/ui/packages/consul-ui/tests/helpers/repo.js
+++ b/ui/packages/consul-ui/tests/helpers/repo.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { get as httpGet } from 'consul-ui/tests/helpers/api';
 import { getProperties, set } from '@ember/object';
 import measure from 'consul-ui/tests/helpers/measure';
diff --git a/ui/packages/consul-ui/tests/helpers/set-cookies.js b/ui/packages/consul-ui/tests/helpers/set-cookies.js
index c8fc40cb87358..23c818b7bf54e 100644
--- a/ui/packages/consul-ui/tests/helpers/set-cookies.js
+++ b/ui/packages/consul-ui/tests/helpers/set-cookies.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (type, value, doc = document) {
   const obj = {};
   if (type !== '*') {
diff --git a/ui/packages/consul-ui/tests/helpers/stub-super.js b/ui/packages/consul-ui/tests/helpers/stub-super.js
index 3be402e326849..067ed0ba95892 100644
--- a/ui/packages/consul-ui/tests/helpers/stub-super.js
+++ b/ui/packages/consul-ui/tests/helpers/stub-super.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /**
  * super stubber
  * Ember's `_super` functionality is a little challenging to stub.
diff --git a/ui/packages/consul-ui/tests/helpers/type-to-url.js b/ui/packages/consul-ui/tests/helpers/type-to-url.js
index 328851bad1343..9ac4f616acd63 100644
--- a/ui/packages/consul-ui/tests/helpers/type-to-url.js
+++ b/ui/packages/consul-ui/tests/helpers/type-to-url.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (type) {
   let requests = null;
   switch (type) {
diff --git a/ui/packages/consul-ui/tests/helpers/yadda-annotations.js b/ui/packages/consul-ui/tests/helpers/yadda-annotations.js
index 4a991b08c92e9..fb817b9500aa0 100644
--- a/ui/packages/consul-ui/tests/helpers/yadda-annotations.js
+++ b/ui/packages/consul-ui/tests/helpers/yadda-annotations.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { skip, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import Yadda from 'yadda';
diff --git a/ui/packages/consul-ui/tests/index.html b/ui/packages/consul-ui/tests/index.html
index 67721753d4f51..3e2cff93aa35c 100644
--- a/ui/packages/consul-ui/tests/index.html
+++ b/ui/packages/consul-ui/tests/index.html
@@ -1,9 +1,4 @@
 <!DOCTYPE html>
-<!--
- Copyright (c) HashiCorp, Inc.
- SPDX-License-Identifier: BUSL-1.1
--->
-
 <html class="{{content-for "root-class"}}">
   <head>
     <meta charset="utf-8">
diff --git a/ui/packages/consul-ui/tests/integration/adapters/auth-method-test.js b/ui/packages/consul-ui/tests/integration/adapters/auth-method-test.js
index a0ec88808219b..6e2f436a416e9 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/auth-method-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/auth-method-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import getNspaceRunner from 'consul-ui/tests/helpers/get-nspace-runner';
diff --git a/ui/packages/consul-ui/tests/integration/adapters/binding-rule-test.js b/ui/packages/consul-ui/tests/integration/adapters/binding-rule-test.js
index bc86968ee9ebc..d9ecc7e60f080 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/binding-rule-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/binding-rule-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import getNspaceRunner from 'consul-ui/tests/helpers/get-nspace-runner';
diff --git a/ui/packages/consul-ui/tests/integration/adapters/coordinate-test.js b/ui/packages/consul-ui/tests/integration/adapters/coordinate-test.js
index 769e0dcef0e5b..3940603f6ea25 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/coordinate-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/coordinate-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 module('Integration | Adapter | coordinate', function (hooks) {
diff --git a/ui/packages/consul-ui/tests/integration/adapters/discovery-chain-test.js b/ui/packages/consul-ui/tests/integration/adapters/discovery-chain-test.js
index 4726c9df64d72..d678acc5a5d7f 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/discovery-chain-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/discovery-chain-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import getNspaceRunner from 'consul-ui/tests/helpers/get-nspace-runner';
diff --git a/ui/packages/consul-ui/tests/integration/adapters/intention-test.js b/ui/packages/consul-ui/tests/integration/adapters/intention-test.js
index 821914ab86d55..6fa9ac6d995fa 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/intention-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/intention-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import getNspaceRunner from 'consul-ui/tests/helpers/get-nspace-runner';
diff --git a/ui/packages/consul-ui/tests/integration/adapters/kv-test.js b/ui/packages/consul-ui/tests/integration/adapters/kv-test.js
index 539f353e889eb..83b3bc4b6b27f 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/kv-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/kv-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { env } from '../../../env';
diff --git a/ui/packages/consul-ui/tests/integration/adapters/node-test.js b/ui/packages/consul-ui/tests/integration/adapters/node-test.js
index dd30d78729181..f79e383be9d81 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/node-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/node-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { env } from '../../../env';
diff --git a/ui/packages/consul-ui/tests/integration/adapters/nspace-test.js b/ui/packages/consul-ui/tests/integration/adapters/nspace-test.js
index 47ad8f5810779..08cd748a9a5b7 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/nspace-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/nspace-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/integration/adapters/oidc-provider-test.js b/ui/packages/consul-ui/tests/integration/adapters/oidc-provider-test.js
index d9995384e5a13..d0ab01bb209e2 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/oidc-provider-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/oidc-provider-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/integration/adapters/partition-test.js b/ui/packages/consul-ui/tests/integration/adapters/partition-test.js
index 949a1589291de..a4663ff9b2801 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/partition-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/partition-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/integration/adapters/permission-test.js b/ui/packages/consul-ui/tests/integration/adapters/permission-test.js
index a3ca0fe738be9..6d21fc775fcd1 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/permission-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/permission-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { env } from '../../../env';
diff --git a/ui/packages/consul-ui/tests/integration/adapters/policy-test.js b/ui/packages/consul-ui/tests/integration/adapters/policy-test.js
index 542ba3d25f14e..a3a5fbc4df74d 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/policy-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/policy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test, skip } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { env } from '../../../env';
diff --git a/ui/packages/consul-ui/tests/integration/adapters/role-test.js b/ui/packages/consul-ui/tests/integration/adapters/role-test.js
index 6a0eea75f280c..b163f8de016e5 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/role-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/role-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { env } from '../../../env';
diff --git a/ui/packages/consul-ui/tests/integration/adapters/service-instance-test.js b/ui/packages/consul-ui/tests/integration/adapters/service-instance-test.js
index 69b743d4a6005..3e48573ecf79b 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/service-instance-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/service-instance-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { env } from '../../../env';
diff --git a/ui/packages/consul-ui/tests/integration/adapters/service-test.js b/ui/packages/consul-ui/tests/integration/adapters/service-test.js
index a2638cfc96929..e32893e8338ce 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/service-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/service-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { env } from '../../../env';
diff --git a/ui/packages/consul-ui/tests/integration/adapters/session-test.js b/ui/packages/consul-ui/tests/integration/adapters/session-test.js
index 917889eb84bfb..b1155ee97e525 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/session-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/session-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { env } from '../../../env';
diff --git a/ui/packages/consul-ui/tests/integration/adapters/token-test.js b/ui/packages/consul-ui/tests/integration/adapters/token-test.js
index 0b32c1165f24a..5632662aa4277 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/token-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/token-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { env } from '../../../env';
diff --git a/ui/packages/consul-ui/tests/integration/adapters/topology-test.js b/ui/packages/consul-ui/tests/integration/adapters/topology-test.js
index 67904b2cbf1e0..f20df73ab3e0d 100644
--- a/ui/packages/consul-ui/tests/integration/adapters/topology-test.js
+++ b/ui/packages/consul-ui/tests/integration/adapters/topology-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import getNspaceRunner from 'consul-ui/tests/helpers/get-nspace-runner';
diff --git a/ui/packages/consul-ui/tests/integration/components/app-view-test.js b/ui/packages/consul-ui/tests/integration/components/app-view-test.js
index f6dca3bd043dc..77a959f476147 100644
--- a/ui/packages/consul-ui/tests/integration/components/app-view-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/app-view-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/aria-menu-test.js b/ui/packages/consul-ui/tests/integration/components/aria-menu-test.js
index 69e34cb0191a2..3ff35acb287ee 100644
--- a/ui/packages/consul-ui/tests/integration/components/aria-menu-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/aria-menu-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/auth-profile-test.js b/ui/packages/consul-ui/tests/integration/components/auth-profile-test.js
index 59f6173d954dd..0edd2152cad2c 100644
--- a/ui/packages/consul-ui/tests/integration/components/auth-profile-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/auth-profile-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/code-editor-test.js b/ui/packages/consul-ui/tests/integration/components/code-editor-test.js
index f0a5d9d2cbccc..43bef80f46d77 100644
--- a/ui/packages/consul-ui/tests/integration/components/code-editor-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/code-editor-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/confirmation-dialog-test.js b/ui/packages/consul-ui/tests/integration/components/confirmation-dialog-test.js
index 26e47951fb964..4d620e18ce022 100644
--- a/ui/packages/consul-ui/tests/integration/components/confirmation-dialog-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/confirmation-dialog-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/consul/bucket/list-test.js b/ui/packages/consul-ui/tests/integration/components/consul/bucket/list-test.js
index a8ba14b15943d..e6921c4430888 100644
--- a/ui/packages/consul-ui/tests/integration/components/consul/bucket/list-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/consul/bucket/list-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
diff --git a/ui/packages/consul-ui/tests/integration/components/consul/datacenter/selector-test.js b/ui/packages/consul-ui/tests/integration/components/consul/datacenter/selector-test.js
index 2394e3a16e9b1..5e3b51566a657 100644
--- a/ui/packages/consul-ui/tests/integration/components/consul/datacenter/selector-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/consul/datacenter/selector-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
diff --git a/ui/packages/consul-ui/tests/integration/components/consul/discovery-chain-test.js b/ui/packages/consul-ui/tests/integration/components/consul/discovery-chain-test.js
index 32b49533a8335..382b97bc29e74 100644
--- a/ui/packages/consul-ui/tests/integration/components/consul/discovery-chain-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/consul/discovery-chain-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/consul/hcp/home-test.js b/ui/packages/consul-ui/tests/integration/components/consul/hcp/home-test.js
index 99ac5e6e4a8d2..a43496860ec6f 100644
--- a/ui/packages/consul-ui/tests/integration/components/consul/hcp/home-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/consul/hcp/home-test.js
@@ -1,7 +1,2 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // temporary import until we are running as separate applications
 import 'consul-ui/components/consul/hcp/home/index.test';
diff --git a/ui/packages/consul-ui/tests/integration/components/consul/intention/permission/form-test.js b/ui/packages/consul-ui/tests/integration/components/consul/intention/permission/form-test.js
index 8625b2d5c044e..24f711f945b04 100644
--- a/ui/packages/consul-ui/tests/integration/components/consul/intention/permission/form-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/consul/intention/permission/form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/consul/intention/permission/header/form-test.js b/ui/packages/consul-ui/tests/integration/components/consul/intention/permission/header/form-test.js
index 6d8ed7fb0dffa..824aaa0062963 100644
--- a/ui/packages/consul-ui/tests/integration/components/consul/intention/permission/header/form-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/consul/intention/permission/header/form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/consul/node/agentless-notice-test.js b/ui/packages/consul-ui/tests/integration/components/consul/node/agentless-notice-test.js
index ce8daa2f84d73..db05c8162f502 100644
--- a/ui/packages/consul-ui/tests/integration/components/consul/node/agentless-notice-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/consul/node/agentless-notice-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
diff --git a/ui/packages/consul-ui/tests/integration/components/data-collection-test.js b/ui/packages/consul-ui/tests/integration/components/data-collection-test.js
index 8b79275829fe9..e869d8da111cc 100644
--- a/ui/packages/consul-ui/tests/integration/components/data-collection-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/data-collection-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/data-source-test.js b/ui/packages/consul-ui/tests/integration/components/data-source-test.js
index 8007ae61c120a..dcb650da437dc 100644
--- a/ui/packages/consul-ui/tests/integration/components/data-source-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/data-source-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { clearRender, render, waitUntil } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/delete-confirmation-test.js b/ui/packages/consul-ui/tests/integration/components/delete-confirmation-test.js
index e662ca0c36936..a040c0fe459fe 100644
--- a/ui/packages/consul-ui/tests/integration/components/delete-confirmation-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/delete-confirmation-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -17,13 +12,13 @@ module('Integration | Component | delete confirmation', function (hooks) {
 
     await render(hbs`{{delete-confirmation}}`);
 
-    assert.dom('[data-test-delete]').exists({ count: 1 });
+    assert.dom('.type-delete').exists({ count: 1 });
 
     // Template block usage:
     await render(hbs`
       {{#delete-confirmation}}{{/delete-confirmation}}
     `);
 
-    assert.dom('[data-test-delete]').exists({ count: 1 });
+    assert.dom('.type-delete').exists({ count: 1 });
   });
 });
diff --git a/ui/packages/consul-ui/tests/integration/components/event-source-test.js b/ui/packages/consul-ui/tests/integration/components/event-source-test.js
index 54af26cf76b29..42befdaef89cf 100644
--- a/ui/packages/consul-ui/tests/integration/components/event-source-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/event-source-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/freetext-filter-test.js b/ui/packages/consul-ui/tests/integration/components/freetext-filter-test.js
index 9a665721ec64a..ecfa65a3a6de6 100644
--- a/ui/packages/consul-ui/tests/integration/components/freetext-filter-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/freetext-filter-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/hashicorp-consul-test.js b/ui/packages/consul-ui/tests/integration/components/hashicorp-consul-test.js
index 7fb039532634f..20ae2a0a6e600 100644
--- a/ui/packages/consul-ui/tests/integration/components/hashicorp-consul-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/hashicorp-consul-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/jwt-source-test.js b/ui/packages/consul-ui/tests/integration/components/jwt-source-test.js
index 21b82fc0826a4..2d5d50f91763d 100644
--- a/ui/packages/consul-ui/tests/integration/components/jwt-source-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/jwt-source-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/list-collection-test.js b/ui/packages/consul-ui/tests/integration/components/list-collection-test.js
index 6c951a96f67e9..5bbc97d9fd45c 100644
--- a/ui/packages/consul-ui/tests/integration/components/list-collection-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/list-collection-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/oidc-select-test.js b/ui/packages/consul-ui/tests/integration/components/oidc-select-test.js
index d662f4b105ccd..5b3b43cd894aa 100644
--- a/ui/packages/consul-ui/tests/integration/components/oidc-select-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/oidc-select-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/popover-menu-test.js b/ui/packages/consul-ui/tests/integration/components/popover-menu-test.js
index b609aad0dc72e..7b1c82f8403fa 100644
--- a/ui/packages/consul-ui/tests/integration/components/popover-menu-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/popover-menu-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/radio-group-test.js b/ui/packages/consul-ui/tests/integration/components/radio-group-test.js
index 1e58f39265585..5516982bd8584 100644
--- a/ui/packages/consul-ui/tests/integration/components/radio-group-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/radio-group-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/ref-test.js b/ui/packages/consul-ui/tests/integration/components/ref-test.js
index 13bb955c77863..1660b02bb451a 100644
--- a/ui/packages/consul-ui/tests/integration/components/ref-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/ref-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/resolver-card-test.js b/ui/packages/consul-ui/tests/integration/components/resolver-card-test.js
index b8c48f25cb88d..845ddee456035 100644
--- a/ui/packages/consul-ui/tests/integration/components/resolver-card-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/resolver-card-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/route-card-test.js b/ui/packages/consul-ui/tests/integration/components/route-card-test.js
index 36b6d7baf5b99..a728dd50c8df1 100644
--- a/ui/packages/consul-ui/tests/integration/components/route-card-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/route-card-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/splitter-card-test.js b/ui/packages/consul-ui/tests/integration/components/splitter-card-test.js
index 2bf1a8b8e8993..f1e406fd1524e 100644
--- a/ui/packages/consul-ui/tests/integration/components/splitter-card-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/splitter-card-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/state-test.js b/ui/packages/consul-ui/tests/integration/components/state-test.js
index f93c60b5d09d0..aaa0f47966054 100644
--- a/ui/packages/consul-ui/tests/integration/components/state-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/state-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/tab-nav-test.js b/ui/packages/consul-ui/tests/integration/components/tab-nav-test.js
index 992d051c1b67e..07e0610fe7319 100644
--- a/ui/packages/consul-ui/tests/integration/components/tab-nav-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/tab-nav-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/tabular-collection-test.js b/ui/packages/consul-ui/tests/integration/components/tabular-collection-test.js
index 1e14362702844..e019d36e360e4 100644
--- a/ui/packages/consul-ui/tests/integration/components/tabular-collection-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/tabular-collection-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/tabular-details-test.js b/ui/packages/consul-ui/tests/integration/components/tabular-details-test.js
index f3930e93a9927..903787074911c 100644
--- a/ui/packages/consul-ui/tests/integration/components/tabular-details-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/tabular-details-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/tag-list-test.js b/ui/packages/consul-ui/tests/integration/components/tag-list-test.js
index 6c6bda573dd40..acec121e13270 100644
--- a/ui/packages/consul-ui/tests/integration/components/tag-list-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/tag-list-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/toggle-button-test.js b/ui/packages/consul-ui/tests/integration/components/toggle-button-test.js
index 6bb68165401ce..32ed11174cd34 100644
--- a/ui/packages/consul-ui/tests/integration/components/toggle-button-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/toggle-button-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/components/token-list-test.js b/ui/packages/consul-ui/tests/integration/components/token-list-test.js
index 60b71eca2aaa9..2de9f8f615698 100644
--- a/ui/packages/consul-ui/tests/integration/components/token-list-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/token-list-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/atob-test.js b/ui/packages/consul-ui/tests/integration/helpers/atob-test.js
index fa1dc1f6a5d06..e3929d99428d5 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/atob-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/atob-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/dom-position-test.js b/ui/packages/consul-ui/tests/integration/helpers/dom-position-test.js
index b0d51b970756e..2949763578eb3 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/dom-position-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/dom-position-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/duration-from-test.js b/ui/packages/consul-ui/tests/integration/helpers/duration-from-test.js
index 2628d98b3bbbc..fe2c310f06d46 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/duration-from-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/duration-from-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/format-short-time-test.js b/ui/packages/consul-ui/tests/integration/helpers/format-short-time-test.js
index be58137709c5e..afac4430578a5 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/format-short-time-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/format-short-time-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/is-href-test.js b/ui/packages/consul-ui/tests/integration/helpers/is-href-test.js
index da95294b58d90..65983a0161d12 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/is-href-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/is-href-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/last-test.js b/ui/packages/consul-ui/tests/integration/helpers/last-test.js
index 9ae69538ef895..69834fc53a2d5 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/last-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/last-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/left-trim-test.js b/ui/packages/consul-ui/tests/integration/helpers/left-trim-test.js
index bed82a171a6fd..71d50a847011d 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/left-trim-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/left-trim-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/policy/datacenters-test.js b/ui/packages/consul-ui/tests/integration/helpers/policy/datacenters-test.js
index 8e2a0fed97abe..8e24498727adc 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/policy/datacenters-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/policy/datacenters-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/policy/typeof-test.js b/ui/packages/consul-ui/tests/integration/helpers/policy/typeof-test.js
index ad5c9b08f09be..e06d498ece04c 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/policy/typeof-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/policy/typeof-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
@@ -11,14 +6,12 @@ import hbs from 'htmlbars-inline-precompile';
 module('Integration | Helper | policy/typeof', function (hooks) {
   setupRenderingTest(hooks);
 
-  test('it renders read-only cluster', async function (assert) {
-    this.set('inputValue', {
-      ID: '00000000-0000-0000-0000-000000000002',
-      template: 'some-template',
-    });
+  // Replace this with your real tests.
+  test('it renders', async function (assert) {
+    this.set('inputValue', '1234');
 
     await render(hbs`{{policy/typeof inputValue}}`);
 
-    assert.equal(this.element.textContent.trim(), 'read-only');
+    assert.equal(this.element.textContent.trim(), 'role');
   });
 });
diff --git a/ui/packages/consul-ui/tests/integration/helpers/render-template-test.js b/ui/packages/consul-ui/tests/integration/helpers/render-template-test.js
index 74cc7586840cb..bede74beaa00c 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/render-template-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/render-template-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/right-trim-test.js b/ui/packages/consul-ui/tests/integration/helpers/right-trim-test.js
index 289a27302b666..7ffdbacd26af1 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/right-trim-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/right-trim-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/route-match-test.js b/ui/packages/consul-ui/tests/integration/helpers/route-match-test.js
index 9437d05773acb..3da40f5f897ab 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/route-match-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/route-match-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/searchable-test.js b/ui/packages/consul-ui/tests/integration/helpers/searchable-test.js
index e976e6216ae59..29da9f33a6dfe 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/searchable-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/searchable-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/service/card-permissions-test.js b/ui/packages/consul-ui/tests/integration/helpers/service/card-permissions-test.js
index b537f6c705737..96b407d4d5bb5 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/service/card-permissions-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/service/card-permissions-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/service/external-source-test.js b/ui/packages/consul-ui/tests/integration/helpers/service/external-source-test.js
index de1e810a0b8a2..71c0a9ebceab3 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/service/external-source-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/service/external-source-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/service/health-percentage-test.js b/ui/packages/consul-ui/tests/integration/helpers/service/health-percentage-test.js
index 37ef964cf29d4..3ac6bccb1deb8 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/service/health-percentage-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/service/health-percentage-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/slugify-test.js b/ui/packages/consul-ui/tests/integration/helpers/slugify-test.js
index 29548eb1d3adb..c86c0880dc85d 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/slugify-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/slugify-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/split-test.js b/ui/packages/consul-ui/tests/integration/helpers/split-test.js
index f355c6d39b780..3bdfaa3a4e462 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/split-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/split-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/state-matches-test.js b/ui/packages/consul-ui/tests/integration/helpers/state-matches-test.js
index c89779226bd6e..2075c30d1f3f5 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/state-matches-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/state-matches-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/substr-test.js b/ui/packages/consul-ui/tests/integration/helpers/substr-test.js
index fcdc14131dd4c..d7ce40439ebb4 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/substr-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/substr-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/svg-curve-test.js b/ui/packages/consul-ui/tests/integration/helpers/svg-curve-test.js
index d7aabd055a561..cab67bf03e665 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/svg-curve-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/svg-curve-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/token/is-anonymous-test.js b/ui/packages/consul-ui/tests/integration/helpers/token/is-anonymous-test.js
index 5b3d0b0ea78b9..012db32661342 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/token/is-anonymous-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/token/is-anonymous-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/token/is-legacy-test.js b/ui/packages/consul-ui/tests/integration/helpers/token/is-legacy-test.js
index cc7cb336e807c..a8f47c8f76920 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/token/is-legacy-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/token/is-legacy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/helpers/tween-to-test.js b/ui/packages/consul-ui/tests/integration/helpers/tween-to-test.js
index c0a2ca553d0ba..0070908f7287b 100644
--- a/ui/packages/consul-ui/tests/integration/helpers/tween-to-test.js
+++ b/ui/packages/consul-ui/tests/integration/helpers/tween-to-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
diff --git a/ui/packages/consul-ui/tests/integration/serializers/auth-method-test.js b/ui/packages/consul-ui/tests/integration/serializers/auth-method-test.js
index 2314f715e6f5d..f08462c85794b 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/auth-method-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/auth-method-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
diff --git a/ui/packages/consul-ui/tests/integration/serializers/binding-rule-test.js b/ui/packages/consul-ui/tests/integration/serializers/binding-rule-test.js
index f1d1cee779e0f..d840138e977b2 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/binding-rule-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/binding-rule-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
diff --git a/ui/packages/consul-ui/tests/integration/serializers/coordinate-test.js b/ui/packages/consul-ui/tests/integration/serializers/coordinate-test.js
index 5a3d6ff3fa046..7f48bd2a1d5e9 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/coordinate-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/coordinate-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
diff --git a/ui/packages/consul-ui/tests/integration/serializers/discovery-chain-test.js b/ui/packages/consul-ui/tests/integration/serializers/discovery-chain-test.js
index 9b807c30eef10..dabbde3b7e2c0 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/discovery-chain-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/discovery-chain-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/integration/serializers/intention-test.js b/ui/packages/consul-ui/tests/integration/serializers/intention-test.js
index e15aa8380367f..76e2114ab605b 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/intention-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/intention-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
diff --git a/ui/packages/consul-ui/tests/integration/serializers/kv-test.js b/ui/packages/consul-ui/tests/integration/serializers/kv-test.js
index 17b23ea75a5b9..59bda030cc8fc 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/kv-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/kv-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
diff --git a/ui/packages/consul-ui/tests/integration/serializers/node-test.js b/ui/packages/consul-ui/tests/integration/serializers/node-test.js
index 8f574cce3fdd7..9275e29219a15 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/node-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/node-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
diff --git a/ui/packages/consul-ui/tests/integration/serializers/nspace-test.js b/ui/packages/consul-ui/tests/integration/serializers/nspace-test.js
index 60993001409e2..a71df3d264dc8 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/nspace-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/nspace-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/integration/serializers/oidc-provider-test.js b/ui/packages/consul-ui/tests/integration/serializers/oidc-provider-test.js
index beb6ed17d5196..768c2c695d950 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/oidc-provider-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/oidc-provider-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/integration/serializers/partition-test.js b/ui/packages/consul-ui/tests/integration/serializers/partition-test.js
index 3b400ac70cb03..f2499eb2ebbea 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/partition-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/partition-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test, skip } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/integration/serializers/policy-test.js b/ui/packages/consul-ui/tests/integration/serializers/policy-test.js
index f6b68b7db2118..feeecda8e18dc 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/policy-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/policy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
diff --git a/ui/packages/consul-ui/tests/integration/serializers/role-test.js b/ui/packages/consul-ui/tests/integration/serializers/role-test.js
index 0f7b754d1c960..41904dc67ea5c 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/role-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/role-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
diff --git a/ui/packages/consul-ui/tests/integration/serializers/service-instance-test.js b/ui/packages/consul-ui/tests/integration/serializers/service-instance-test.js
index b47bba9aedb87..6191f201f103d 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/service-instance-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/service-instance-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
diff --git a/ui/packages/consul-ui/tests/integration/serializers/service-test.js b/ui/packages/consul-ui/tests/integration/serializers/service-test.js
index 56b089ee1b868..2602fc075bb6f 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/service-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/service-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
diff --git a/ui/packages/consul-ui/tests/integration/serializers/session-test.js b/ui/packages/consul-ui/tests/integration/serializers/session-test.js
index 07d72aebdb4be..d0b840f2e92d4 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/session-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/session-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
diff --git a/ui/packages/consul-ui/tests/integration/serializers/token-test.js b/ui/packages/consul-ui/tests/integration/serializers/token-test.js
index 71931326192c5..a6581efe8e466 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/token-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/token-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { get } from 'consul-ui/tests/helpers/api';
diff --git a/ui/packages/consul-ui/tests/integration/serializers/topology-test.js b/ui/packages/consul-ui/tests/integration/serializers/topology-test.js
index 09ae55d93d108..80da039783e29 100644
--- a/ui/packages/consul-ui/tests/integration/serializers/topology-test.js
+++ b/ui/packages/consul-ui/tests/integration/serializers/topology-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/integration/services/repository/auth-method-test.js b/ui/packages/consul-ui/tests/integration/services/repository/auth-method-test.js
index 7fb802b224d0c..04983347363e2 100644
--- a/ui/packages/consul-ui/tests/integration/services/repository/auth-method-test.js
+++ b/ui/packages/consul-ui/tests/integration/services/repository/auth-method-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { setupTest } from 'ember-qunit';
 import repo from 'consul-ui/tests/helpers/repo';
 import { module, skip, test } from 'qunit';
diff --git a/ui/packages/consul-ui/tests/integration/services/repository/coordinate-test.js b/ui/packages/consul-ui/tests/integration/services/repository/coordinate-test.js
index 8809684758da9..2f3d1b4c7d354 100644
--- a/ui/packages/consul-ui/tests/integration/services/repository/coordinate-test.js
+++ b/ui/packages/consul-ui/tests/integration/services/repository/coordinate-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { setupTest } from 'ember-qunit';
 import { module, test } from 'qunit';
 import repo from 'consul-ui/tests/helpers/repo';
diff --git a/ui/packages/consul-ui/tests/integration/services/repository/dc-test.js b/ui/packages/consul-ui/tests/integration/services/repository/dc-test.js
index 06b7b267e40e5..98c5657d28c07 100644
--- a/ui/packages/consul-ui/tests/integration/services/repository/dc-test.js
+++ b/ui/packages/consul-ui/tests/integration/services/repository/dc-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { setupTest } from 'ember-qunit';
 import { module, skip } from 'qunit';
 import repo from 'consul-ui/tests/helpers/repo';
diff --git a/ui/packages/consul-ui/tests/integration/services/repository/discovery-chain-test.js b/ui/packages/consul-ui/tests/integration/services/repository/discovery-chain-test.js
index cc877f7706624..20ea9e9a74053 100644
--- a/ui/packages/consul-ui/tests/integration/services/repository/discovery-chain-test.js
+++ b/ui/packages/consul-ui/tests/integration/services/repository/discovery-chain-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import repo from 'consul-ui/tests/helpers/repo';
diff --git a/ui/packages/consul-ui/tests/integration/services/repository/kv-test.js b/ui/packages/consul-ui/tests/integration/services/repository/kv-test.js
index 3604d46c186ef..6991e060e9aa5 100644
--- a/ui/packages/consul-ui/tests/integration/services/repository/kv-test.js
+++ b/ui/packages/consul-ui/tests/integration/services/repository/kv-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import repo from 'consul-ui/tests/helpers/repo';
diff --git a/ui/packages/consul-ui/tests/integration/services/repository/node-test.js b/ui/packages/consul-ui/tests/integration/services/repository/node-test.js
index ed309ca0336d3..70b370f88a0c2 100644
--- a/ui/packages/consul-ui/tests/integration/services/repository/node-test.js
+++ b/ui/packages/consul-ui/tests/integration/services/repository/node-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { setupTest } from 'ember-qunit';
 import { module, test } from 'qunit';
 import repo from 'consul-ui/tests/helpers/repo';
diff --git a/ui/packages/consul-ui/tests/integration/services/repository/policy-test.js b/ui/packages/consul-ui/tests/integration/services/repository/policy-test.js
index c6782ca5e479e..776886fd8dced 100644
--- a/ui/packages/consul-ui/tests/integration/services/repository/policy-test.js
+++ b/ui/packages/consul-ui/tests/integration/services/repository/policy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import repo from 'consul-ui/tests/helpers/repo';
diff --git a/ui/packages/consul-ui/tests/integration/services/repository/role-test.js b/ui/packages/consul-ui/tests/integration/services/repository/role-test.js
index be101abf849d6..9be3a6b4a4500 100644
--- a/ui/packages/consul-ui/tests/integration/services/repository/role-test.js
+++ b/ui/packages/consul-ui/tests/integration/services/repository/role-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import repo from 'consul-ui/tests/helpers/repo';
diff --git a/ui/packages/consul-ui/tests/integration/services/repository/service-test.js b/ui/packages/consul-ui/tests/integration/services/repository/service-test.js
index 68dc7267bdba6..8c02e3114763a 100644
--- a/ui/packages/consul-ui/tests/integration/services/repository/service-test.js
+++ b/ui/packages/consul-ui/tests/integration/services/repository/service-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import repo from 'consul-ui/tests/helpers/repo';
diff --git a/ui/packages/consul-ui/tests/integration/services/repository/session-test.js b/ui/packages/consul-ui/tests/integration/services/repository/session-test.js
index 7c9cb0d34e391..e2afee77157db 100644
--- a/ui/packages/consul-ui/tests/integration/services/repository/session-test.js
+++ b/ui/packages/consul-ui/tests/integration/services/repository/session-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import repo from 'consul-ui/tests/helpers/repo';
diff --git a/ui/packages/consul-ui/tests/integration/services/repository/token-test.js b/ui/packages/consul-ui/tests/integration/services/repository/token-test.js
index f822eefc2eed9..c3b5732406fa0 100644
--- a/ui/packages/consul-ui/tests/integration/services/repository/token-test.js
+++ b/ui/packages/consul-ui/tests/integration/services/repository/token-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import repo from 'consul-ui/tests/helpers/repo';
diff --git a/ui/packages/consul-ui/tests/integration/services/repository/topology-test.js b/ui/packages/consul-ui/tests/integration/services/repository/topology-test.js
index ca16a925734fb..9728a45e2327a 100644
--- a/ui/packages/consul-ui/tests/integration/services/repository/topology-test.js
+++ b/ui/packages/consul-ui/tests/integration/services/repository/topology-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import repo from 'consul-ui/tests/helpers/repo';
diff --git a/ui/packages/consul-ui/tests/integration/services/routlet-test.js b/ui/packages/consul-ui/tests/integration/services/routlet-test.js
index 006473b850a86..defba5df236fb 100644
--- a/ui/packages/consul-ui/tests/integration/services/routlet-test.js
+++ b/ui/packages/consul-ui/tests/integration/services/routlet-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/integration/utils/dom/event-source/callable-test.js b/ui/packages/consul-ui/tests/integration/utils/dom/event-source/callable-test.js
index f02b89830ae49..d0a5610591814 100644
--- a/ui/packages/consul-ui/tests/integration/utils/dom/event-source/callable-test.js
+++ b/ui/packages/consul-ui/tests/integration/utils/dom/event-source/callable-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import domEventSourceCallable from 'consul-ui/utils/dom/event-source/callable';
 import EventTarget from 'consul-ui/utils/dom/event-target/rsvp';
 
diff --git a/ui/packages/consul-ui/tests/lib/measure/getMeasure.js b/ui/packages/consul-ui/tests/lib/measure/getMeasure.js
index b39313bdce5ba..41bde6280c736 100644
--- a/ui/packages/consul-ui/tests/lib/measure/getMeasure.js
+++ b/ui/packages/consul-ui/tests/lib/measure/getMeasure.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* eslint no-console: "off" */
 const log = function (results, measurement, tags) {
   console.log(measurement, results, tags);
diff --git a/ui/packages/consul-ui/tests/lib/page-object/createCancelable.js b/ui/packages/consul-ui/tests/lib/page-object/createCancelable.js
index ba9ba39e9c7ec..91e4193d70505 100644
--- a/ui/packages/consul-ui/tests/lib/page-object/createCancelable.js
+++ b/ui/packages/consul-ui/tests/lib/page-object/createCancelable.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (clickable, is) {
   return function (obj, scope = '') {
     if (scope !== '') {
diff --git a/ui/packages/consul-ui/tests/lib/page-object/createCreatable.js b/ui/packages/consul-ui/tests/lib/page-object/createCreatable.js
index da0f5b6e197a4..1b0aa139e80a1 100644
--- a/ui/packages/consul-ui/tests/lib/page-object/createCreatable.js
+++ b/ui/packages/consul-ui/tests/lib/page-object/createCreatable.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (clickable, is) {
   return function (obj) {
     return {
diff --git a/ui/packages/consul-ui/tests/lib/page-object/createDeletable.js b/ui/packages/consul-ui/tests/lib/page-object/createDeletable.js
index c02e9fb669957..c5a24b0726b6e 100644
--- a/ui/packages/consul-ui/tests/lib/page-object/createDeletable.js
+++ b/ui/packages/consul-ui/tests/lib/page-object/createDeletable.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (clickable) {
   return function (obj = {}, scope = '') {
     if (scope !== '') {
@@ -12,8 +7,7 @@ export default function (clickable) {
       ...obj,
       ...{
         delete: clickable(scope + '[data-test-delete]'),
-        confirmDelete: clickable(scope + '[data-test-delete]'),
-        confirmInlineDelete: clickable(scope + 'button.type-delete'),
+        confirmDelete: clickable(scope + 'button.type-delete'),
       },
     };
   };
diff --git a/ui/packages/consul-ui/tests/lib/page-object/createSubmitable.js b/ui/packages/consul-ui/tests/lib/page-object/createSubmitable.js
index 4655e460e94ed..54aad89dc6248 100644
--- a/ui/packages/consul-ui/tests/lib/page-object/createSubmitable.js
+++ b/ui/packages/consul-ui/tests/lib/page-object/createSubmitable.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (clickable, is) {
   return function (obj = {}, scope = '') {
     if (scope !== '') {
diff --git a/ui/packages/consul-ui/tests/lib/page-object/index.js b/ui/packages/consul-ui/tests/lib/page-object/index.js
index 156ebb8a26bd1..55b58d28146d1 100644
--- a/ui/packages/consul-ui/tests/lib/page-object/index.js
+++ b/ui/packages/consul-ui/tests/lib/page-object/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { isPresent as present, fillable, clickable, property } from 'ember-cli-page-object';
 
 export const input = function () {
diff --git a/ui/packages/consul-ui/tests/lib/page-object/visitable.js b/ui/packages/consul-ui/tests/lib/page-object/visitable.js
index fc6db15549090..05c806780257a 100644
--- a/ui/packages/consul-ui/tests/lib/page-object/visitable.js
+++ b/ui/packages/consul-ui/tests/lib/page-object/visitable.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { getContext } from '@ember/test-helpers';
 import { getExecutionContext } from 'ember-cli-page-object/-private/execution_context';
 import createQueryParams from 'consul-ui/utils/http/create-query-params';
diff --git a/ui/packages/consul-ui/tests/pages.js b/ui/packages/consul-ui/tests/pages.js
index 8d85b5e562fa7..a14d23293c89b 100644
--- a/ui/packages/consul-ui/tests/pages.js
+++ b/ui/packages/consul-ui/tests/pages.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import {
   create as createPage,
   clickable,
diff --git a/ui/packages/consul-ui/tests/pages/dc.js b/ui/packages/consul-ui/tests/pages/dc.js
index 3b6839acab5e0..dc9987eaef8fa 100644
--- a/ui/packages/consul-ui/tests/pages/dc.js
+++ b/ui/packages/consul-ui/tests/pages/dc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, clickable, attribute, collection) {
   return {
     visit: visitable('/:dc/'),
diff --git a/ui/packages/consul-ui/tests/pages/dc/acls/auth-methods/index.js b/ui/packages/consul-ui/tests/pages/dc/acls/auth-methods/index.js
index 6e9b3c1c439ed..825b6fa3720e5 100644
--- a/ui/packages/consul-ui/tests/pages/dc/acls/auth-methods/index.js
+++ b/ui/packages/consul-ui/tests/pages/dc/acls/auth-methods/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, creatable, authMethods, popoverSelect) {
   return creatable({
     visit: visitable('/:dc/acls/auth-methods'),
diff --git a/ui/packages/consul-ui/tests/pages/dc/acls/edit.js b/ui/packages/consul-ui/tests/pages/dc/acls/edit.js
index 37e525a250e7b..4880b9ffef4fa 100644
--- a/ui/packages/consul-ui/tests/pages/dc/acls/edit.js
+++ b/ui/packages/consul-ui/tests/pages/dc/acls/edit.js
@@ -1,15 +1,10 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, submitable, deletable, cancelable, clickable) {
   return submitable(
     cancelable(
       deletable({
         visit: visitable(['/:dc/acls/:acl', '/:dc/acls/create']),
         use: clickable('[data-test-use]'),
-        confirmUse: clickable('[data-test-confirm-use]'),
+        confirmUse: clickable('button.type-delete'),
       })
     ),
     'main'
diff --git a/ui/packages/consul-ui/tests/pages/dc/acls/index.js b/ui/packages/consul-ui/tests/pages/dc/acls/index.js
index e43331028e2cf..5f67b7c28deb8 100644
--- a/ui/packages/consul-ui/tests/pages/dc/acls/index.js
+++ b/ui/packages/consul-ui/tests/pages/dc/acls/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, deletable, creatable, clickable, attribute, collection) {
   return creatable({
     visit: visitable('/:dc/acls'),
diff --git a/ui/packages/consul-ui/tests/pages/dc/acls/policies/edit.js b/ui/packages/consul-ui/tests/pages/dc/acls/policies/edit.js
index 40705227d6269..5d2a3d83a7a1d 100644
--- a/ui/packages/consul-ui/tests/pages/dc/acls/policies/edit.js
+++ b/ui/packages/consul-ui/tests/pages/dc/acls/policies/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, submitable, deletable, cancelable, clickable, tokenList) {
   return {
     visit: visitable(['/:dc/acls/policies/:policy', '/:dc/acls/policies/create']),
diff --git a/ui/packages/consul-ui/tests/pages/dc/acls/policies/index.js b/ui/packages/consul-ui/tests/pages/dc/acls/policies/index.js
index 93409130e889b..2e5589bae96a0 100644
--- a/ui/packages/consul-ui/tests/pages/dc/acls/policies/index.js
+++ b/ui/packages/consul-ui/tests/pages/dc/acls/policies/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, creatable, policies, popoverSelect) {
   return creatable({
     visit: visitable('/:dc/acls/policies'),
diff --git a/ui/packages/consul-ui/tests/pages/dc/acls/roles/edit.js b/ui/packages/consul-ui/tests/pages/dc/acls/roles/edit.js
index 56463a0de0e2d..b5975492261a6 100644
--- a/ui/packages/consul-ui/tests/pages/dc/acls/roles/edit.js
+++ b/ui/packages/consul-ui/tests/pages/dc/acls/roles/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, submitable, deletable, cancelable, policySelector, tokenList) {
   return {
     visit: visitable(['/:dc/acls/roles/:role', '/:dc/acls/roles/create']),
diff --git a/ui/packages/consul-ui/tests/pages/dc/acls/roles/index.js b/ui/packages/consul-ui/tests/pages/dc/acls/roles/index.js
index c219441cc89b9..890c84c6bd88e 100644
--- a/ui/packages/consul-ui/tests/pages/dc/acls/roles/index.js
+++ b/ui/packages/consul-ui/tests/pages/dc/acls/roles/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, creatable, roles, popoverSelect) {
   return {
     visit: visitable('/:dc/acls/roles'),
diff --git a/ui/packages/consul-ui/tests/pages/dc/acls/tokens/edit.js b/ui/packages/consul-ui/tests/pages/dc/acls/tokens/edit.js
index a5d98fd035f82..91f19b41d5749 100644
--- a/ui/packages/consul-ui/tests/pages/dc/acls/tokens/edit.js
+++ b/ui/packages/consul-ui/tests/pages/dc/acls/tokens/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (
   visitable,
   submitable,
@@ -18,7 +13,7 @@ export default function (
     ...cancelable({}, 'main form > div'),
     ...deletable({}, 'main form > div'),
     use: clickable('[data-test-use]'),
-    confirmUse: clickable('[data-test-confirm-use]'),
+    confirmUse: clickable('button.type-delete'),
     clone: clickable('[data-test-clone]'),
     policies: policySelector(),
     roles: roleSelector(),
diff --git a/ui/packages/consul-ui/tests/pages/dc/acls/tokens/index.js b/ui/packages/consul-ui/tests/pages/dc/acls/tokens/index.js
index 7cd031c33c92a..e33d4ab1c8442 100644
--- a/ui/packages/consul-ui/tests/pages/dc/acls/tokens/index.js
+++ b/ui/packages/consul-ui/tests/pages/dc/acls/tokens/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, creatable, text, tokens, popoverSelect) {
   return {
     visit: visitable('/:dc/acls/tokens'),
diff --git a/ui/packages/consul-ui/tests/pages/dc/intentions/edit.js b/ui/packages/consul-ui/tests/pages/dc/intentions/edit.js
index ae19b36d4d5b0..107bec702bd7d 100644
--- a/ui/packages/consul-ui/tests/pages/dc/intentions/edit.js
+++ b/ui/packages/consul-ui/tests/pages/dc/intentions/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (
   visitable,
   clickable,
diff --git a/ui/packages/consul-ui/tests/pages/dc/intentions/index.js b/ui/packages/consul-ui/tests/pages/dc/intentions/index.js
index 0ea000bc9d47a..bdc72e1d23943 100644
--- a/ui/packages/consul-ui/tests/pages/dc/intentions/index.js
+++ b/ui/packages/consul-ui/tests/pages/dc/intentions/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, creatable, clickable, intentions, popoverSelect) {
   return {
     visit: visitable('/:dc/intentions'),
diff --git a/ui/packages/consul-ui/tests/pages/dc/kv/edit.js b/ui/packages/consul-ui/tests/pages/dc/kv/edit.js
index 2df838575be2c..cbf9a3afe0233 100644
--- a/ui/packages/consul-ui/tests/pages/dc/kv/edit.js
+++ b/ui/packages/consul-ui/tests/pages/dc/kv/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, attribute, present, submitable, deletable, cancelable) {
   return {
     visit: visitable(['/:dc/kv/:kv/edit', '/:dc/kv/create'], function (str) {
diff --git a/ui/packages/consul-ui/tests/pages/dc/kv/index.js b/ui/packages/consul-ui/tests/pages/dc/kv/index.js
index 1c54fdabb509b..1ea6b9d5d6f58 100644
--- a/ui/packages/consul-ui/tests/pages/dc/kv/index.js
+++ b/ui/packages/consul-ui/tests/pages/dc/kv/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, creatable, kvs) {
   return creatable({
     visit: visitable(['/:dc/kv/:kv', '/:dc/kv'], (str) => str),
diff --git a/ui/packages/consul-ui/tests/pages/dc/nodes/index.js b/ui/packages/consul-ui/tests/pages/dc/nodes/index.js
index 17aebadf3c83f..a7e81d9fa359c 100644
--- a/ui/packages/consul-ui/tests/pages/dc/nodes/index.js
+++ b/ui/packages/consul-ui/tests/pages/dc/nodes/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, text, clickable, attribute, collection, popoverSelect) {
   const node = {
     name: text('[data-test-node]'),
diff --git a/ui/packages/consul-ui/tests/pages/dc/nodes/show.js b/ui/packages/consul-ui/tests/pages/dc/nodes/show.js
index 9795a603d4315..63989f448bcbc 100644
--- a/ui/packages/consul-ui/tests/pages/dc/nodes/show.js
+++ b/ui/packages/consul-ui/tests/pages/dc/nodes/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (
   visitable,
   deletable,
diff --git a/ui/packages/consul-ui/tests/pages/dc/nspaces/edit.js b/ui/packages/consul-ui/tests/pages/dc/nspaces/edit.js
index b936af285bbd4..35b17e29d0c63 100644
--- a/ui/packages/consul-ui/tests/pages/dc/nspaces/edit.js
+++ b/ui/packages/consul-ui/tests/pages/dc/nspaces/edit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (
   visitable,
   submitable,
diff --git a/ui/packages/consul-ui/tests/pages/dc/nspaces/index.js b/ui/packages/consul-ui/tests/pages/dc/nspaces/index.js
index 86b5b9d7133c1..74a4667c75209 100644
--- a/ui/packages/consul-ui/tests/pages/dc/nspaces/index.js
+++ b/ui/packages/consul-ui/tests/pages/dc/nspaces/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, creatable, nspaces, popoverSelect) {
   return creatable({
     visit: visitable('/:dc/namespaces'),
diff --git a/ui/packages/consul-ui/tests/pages/dc/peers/index.js b/ui/packages/consul-ui/tests/pages/dc/peers/index.js
index bec77adff8325..27d17646655e5 100644
--- a/ui/packages/consul-ui/tests/pages/dc/peers/index.js
+++ b/ui/packages/consul-ui/tests/pages/dc/peers/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import tabgroup from 'consul-ui/components/tab-nav/pageobject';
 
 export default function (visitable, creatable, items, popoverSelect) {
diff --git a/ui/packages/consul-ui/tests/pages/dc/peers/show.js b/ui/packages/consul-ui/tests/pages/dc/peers/show.js
index 3cb0fa43ab692..25dcbe60f2903 100644
--- a/ui/packages/consul-ui/tests/pages/dc/peers/show.js
+++ b/ui/packages/consul-ui/tests/pages/dc/peers/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable) {
   return {
     visit: visitable('/:dc/peers/:peer'),
diff --git a/ui/packages/consul-ui/tests/pages/dc/routing-config.js b/ui/packages/consul-ui/tests/pages/dc/routing-config.js
index c962811be99fa..9cb404a809f22 100644
--- a/ui/packages/consul-ui/tests/pages/dc/routing-config.js
+++ b/ui/packages/consul-ui/tests/pages/dc/routing-config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { text } from 'ember-cli-page-object';
 
 export default function (visitable, isPresent) {
diff --git a/ui/packages/consul-ui/tests/pages/dc/services/index.js b/ui/packages/consul-ui/tests/pages/dc/services/index.js
index 8ae98effe0571..4183bdd931254 100644
--- a/ui/packages/consul-ui/tests/pages/dc/services/index.js
+++ b/ui/packages/consul-ui/tests/pages/dc/services/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (
   visitable,
   clickable,
diff --git a/ui/packages/consul-ui/tests/pages/dc/services/instance.js b/ui/packages/consul-ui/tests/pages/dc/services/instance.js
index 923b7f2c7551d..63548b9527fca 100644
--- a/ui/packages/consul-ui/tests/pages/dc/services/instance.js
+++ b/ui/packages/consul-ui/tests/pages/dc/services/instance.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (
   visitable,
   alias,
diff --git a/ui/packages/consul-ui/tests/pages/dc/services/show.js b/ui/packages/consul-ui/tests/pages/dc/services/show.js
index 5d92ff9f55a47..f5b0d04f11a21 100644
--- a/ui/packages/consul-ui/tests/pages/dc/services/show.js
+++ b/ui/packages/consul-ui/tests/pages/dc/services/show.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (
   visitable,
   clickable,
diff --git a/ui/packages/consul-ui/tests/pages/index.js b/ui/packages/consul-ui/tests/pages/index.js
index b0fb04d789392..2f52ffcce0235 100644
--- a/ui/packages/consul-ui/tests/pages/index.js
+++ b/ui/packages/consul-ui/tests/pages/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, collection) {
   return {
     visit: visitable('/'),
diff --git a/ui/packages/consul-ui/tests/pages/settings.js b/ui/packages/consul-ui/tests/pages/settings.js
index ebebad25ca779..3903b8a203134 100644
--- a/ui/packages/consul-ui/tests/pages/settings.js
+++ b/ui/packages/consul-ui/tests/pages/settings.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (visitable, submitable, isPresent) {
   return submitable({
     visit: visitable('/setting'),
diff --git a/ui/packages/consul-ui/tests/steps.js b/ui/packages/consul-ui/tests/steps.js
index aa08f356f0f70..5e7516b890523 100644
--- a/ui/packages/consul-ui/tests/steps.js
+++ b/ui/packages/consul-ui/tests/steps.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // This files export is executed from 2 places:
 // 1. consul-ui/tests/acceptance/steps/steps.js - run during testing
 // 2. consul-ui/lib/commands/lib/list.js - run when listing steps via the CLI
diff --git a/ui/packages/consul-ui/tests/steps/assertions/dom.js b/ui/packages/consul-ui/tests/steps/assertions/dom.js
index 0aabc73cfb8b9..d508911e66363 100644
--- a/ui/packages/consul-ui/tests/steps/assertions/dom.js
+++ b/ui/packages/consul-ui/tests/steps/assertions/dom.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 const dont = `( don't| shouldn't| can't)?`;
 export default function (scenario, assert, pauseUntil, find, currentURL, clipboard) {
   scenario
diff --git a/ui/packages/consul-ui/tests/steps/assertions/form.js b/ui/packages/consul-ui/tests/steps/assertions/form.js
index 1b7ef6f85f5d8..a23f802fdea33 100644
--- a/ui/packages/consul-ui/tests/steps/assertions/form.js
+++ b/ui/packages/consul-ui/tests/steps/assertions/form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (scenario, assert, find, currentPage) {
   scenario.then('I see the $property form with yaml\n$yaml', function (property, data) {
     let obj;
diff --git a/ui/packages/consul-ui/tests/steps/assertions/http.js b/ui/packages/consul-ui/tests/steps/assertions/http.js
index b42eb3afcccf1..3daad4a22ff78 100644
--- a/ui/packages/consul-ui/tests/steps/assertions/http.js
+++ b/ui/packages/consul-ui/tests/steps/assertions/http.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 const not = `(n't| not)?`;
 export default function (scenario, assert, lastNthRequest) {
   // lastNthRequest should return a
diff --git a/ui/packages/consul-ui/tests/steps/assertions/model.js b/ui/packages/consul-ui/tests/steps/assertions/model.js
index 4355aa9419574..bc733d649e679 100644
--- a/ui/packages/consul-ui/tests/steps/assertions/model.js
+++ b/ui/packages/consul-ui/tests/steps/assertions/model.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (scenario, assert, find, currentPage, pauseUntil, pluralize) {
   function getModelItems(model, component) {
     let obj;
diff --git a/ui/packages/consul-ui/tests/steps/assertions/page.js b/ui/packages/consul-ui/tests/steps/assertions/page.js
index 731ff6e3c8914..c676dcaf51d2b 100644
--- a/ui/packages/consul-ui/tests/steps/assertions/page.js
+++ b/ui/packages/consul-ui/tests/steps/assertions/page.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /*eslint no-console: "off", ember/no-jquery: "off", ember/no-global-jquery: "off"*/
 
 const elementNotFound = 'Element not found';
diff --git a/ui/packages/consul-ui/tests/steps/debug/index.js b/ui/packages/consul-ui/tests/steps/debug/index.js
index 5bf042eee881d..9e125ae18884b 100644
--- a/ui/packages/consul-ui/tests/steps/debug/index.js
+++ b/ui/packages/consul-ui/tests/steps/debug/index.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* eslint no-console: "off" */
 export default function (scenario, assert, currentURL) {
   scenario
diff --git a/ui/packages/consul-ui/tests/steps/doubles/http.js b/ui/packages/consul-ui/tests/steps/doubles/http.js
index 1eb8e9bced5e7..7795532347d9b 100644
--- a/ui/packages/consul-ui/tests/steps/doubles/http.js
+++ b/ui/packages/consul-ui/tests/steps/doubles/http.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (scenario, respondWith, set, oidc) {
   // respondWith should set the url to return a certain response shape
   scenario
diff --git a/ui/packages/consul-ui/tests/steps/doubles/model.js b/ui/packages/consul-ui/tests/steps/doubles/model.js
index 95828cb15cf89..e6271d4b756c3 100644
--- a/ui/packages/consul-ui/tests/steps/doubles/model.js
+++ b/ui/packages/consul-ui/tests/steps/doubles/model.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (scenario, create, set, win = window, doc = document) {
   scenario
     .given(['an external edit results in $number $model model[s]?'], function (number, model) {
diff --git a/ui/packages/consul-ui/tests/steps/interactions/click.js b/ui/packages/consul-ui/tests/steps/interactions/click.js
index 6d98bba341abb..7bce8659aa207 100644
--- a/ui/packages/consul-ui/tests/steps/interactions/click.js
+++ b/ui/packages/consul-ui/tests/steps/interactions/click.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (scenario, find, click) {
   scenario
     .when('I click "$selector"', function (selector) {
diff --git a/ui/packages/consul-ui/tests/steps/interactions/form.js b/ui/packages/consul-ui/tests/steps/interactions/form.js
index bdd14a5396163..adf6ad7ed4a60 100644
--- a/ui/packages/consul-ui/tests/steps/interactions/form.js
+++ b/ui/packages/consul-ui/tests/steps/interactions/form.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 export default function (scenario, find, fillIn, triggerKeyEvent, currentPage) {
   const dont = `( don't| shouldn't| can't)?`;
   const fillInElement = async function (page, name, value) {
diff --git a/ui/packages/consul-ui/tests/steps/interactions/visit.js b/ui/packages/consul-ui/tests/steps/interactions/visit.js
index 64639281b8538..fc382e6c712c6 100644
--- a/ui/packages/consul-ui/tests/steps/interactions/visit.js
+++ b/ui/packages/consul-ui/tests/steps/interactions/visit.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { visit } from '@ember/test-helpers';
 
 export default function (scenario, pages, set, reset) {
diff --git a/ui/packages/consul-ui/tests/test-helper.js b/ui/packages/consul-ui/tests/test-helper.js
index 661a3f0c08b34..21b8cea395324 100644
--- a/ui/packages/consul-ui/tests/test-helper.js
+++ b/ui/packages/consul-ui/tests/test-helper.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import Application from 'consul-ui/app';
 import config from 'consul-ui/config/environment';
 import * as QUnit from 'qunit';
diff --git a/ui/packages/consul-ui/tests/unit/abilities/-test.js b/ui/packages/consul-ui/tests/unit/abilities/-test.js
index f64d514a61d49..b0a7d4925f9dd 100644
--- a/ui/packages/consul-ui/tests/unit/abilities/-test.js
+++ b/ui/packages/consul-ui/tests/unit/abilities/-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /* globals requirejs */
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
diff --git a/ui/packages/consul-ui/tests/unit/adapters/application-test.js b/ui/packages/consul-ui/tests/unit/adapters/application-test.js
index 42f0be04a572f..a0d3f9f5aadff 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/application-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/application-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/auth-method-test.js b/ui/packages/consul-ui/tests/unit/adapters/auth-method-test.js
index 10da2545d2049..9592137f9a648 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/auth-method-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/auth-method-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/binding-rule-test.js b/ui/packages/consul-ui/tests/unit/adapters/binding-rule-test.js
index 67ae7ab976925..9e8a0ebcc5bb0 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/binding-rule-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/binding-rule-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/coordinate-test.js b/ui/packages/consul-ui/tests/unit/adapters/coordinate-test.js
index 506e1a3fa0d22..90896166854a2 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/coordinate-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/coordinate-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/discovery-chain-test.js b/ui/packages/consul-ui/tests/unit/adapters/discovery-chain-test.js
index b0a207a63dd5c..5fa6934da53fc 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/discovery-chain-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/discovery-chain-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/http-test.js b/ui/packages/consul-ui/tests/unit/adapters/http-test.js
index 62e04efce7151..2c2144a8d561e 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/http-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/http-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/intention-test.js b/ui/packages/consul-ui/tests/unit/adapters/intention-test.js
index 322a71cac13c4..e55f9416dbb15 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/intention-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/intention-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/kv-test.js b/ui/packages/consul-ui/tests/unit/adapters/kv-test.js
index ea846b3af9ede..c3a712470fdd4 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/kv-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/kv-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/node-test.js b/ui/packages/consul-ui/tests/unit/adapters/node-test.js
index 41f226f6851a0..47d9a7c0c2f97 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/node-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/node-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/nspace-test.js b/ui/packages/consul-ui/tests/unit/adapters/nspace-test.js
index 5f25b46b5cf33..adf6798a8d0dc 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/nspace-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/nspace-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/oidc-provider-test.js b/ui/packages/consul-ui/tests/unit/adapters/oidc-provider-test.js
index f9aedea835273..7399f3097e3eb 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/oidc-provider-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/oidc-provider-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/partition-test.js b/ui/packages/consul-ui/tests/unit/adapters/partition-test.js
index a6418f7ca32a5..6e24f95ca4d8b 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/partition-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/partition-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/permission-test.js b/ui/packages/consul-ui/tests/unit/adapters/permission-test.js
index 6c4a4ffc7b149..57ed1ad4b2f55 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/permission-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/permission-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/policy-test.js b/ui/packages/consul-ui/tests/unit/adapters/policy-test.js
index df60ec979ce63..10d8e8031b95b 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/policy-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/policy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/proxy-test.js b/ui/packages/consul-ui/tests/unit/adapters/proxy-test.js
index 1bd140b21ad9d..2f8742a335efc 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/proxy-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/proxy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/role-test.js b/ui/packages/consul-ui/tests/unit/adapters/role-test.js
index 33e7490968c1e..76323f7ee787d 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/role-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/role-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/service-instance-test.js b/ui/packages/consul-ui/tests/unit/adapters/service-instance-test.js
index 99cba66655f74..96f91c585c46f 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/service-instance-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/service-instance-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/session-test.js b/ui/packages/consul-ui/tests/unit/adapters/session-test.js
index db5c71692d222..ae06fe6639c3c 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/session-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/session-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/adapters/token-test.js b/ui/packages/consul-ui/tests/unit/adapters/token-test.js
index d18e04b9fc7b5..c2a13e129ace4 100644
--- a/ui/packages/consul-ui/tests/unit/adapters/token-test.js
+++ b/ui/packages/consul-ui/tests/unit/adapters/token-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-alternate-services-test.js b/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-alternate-services-test.js
index f3175f1d79cc3..873ce49a99193 100644
--- a/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-alternate-services-test.js
+++ b/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-alternate-services-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { getAlternateServices } from 'consul-ui/components/consul/discovery-chain/utils';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-resolvers-test.js b/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-resolvers-test.js
index d79af58a009f1..c299338071b4d 100644
--- a/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-resolvers-test.js
+++ b/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-resolvers-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { getResolvers } from 'consul-ui/components/consul/discovery-chain/utils';
 import { module, test } from 'qunit';
 import { get } from 'consul-ui/tests/helpers/api';
diff --git a/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-splitters-test.js b/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-splitters-test.js
index 274faf0aa37f6..cc1eeef635323 100644
--- a/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-splitters-test.js
+++ b/ui/packages/consul-ui/tests/unit/components/consul/discovery-chain/get-splitters-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { getSplitters } from 'consul-ui/components/consul/discovery-chain/utils';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/components/search-bar/filters-test.js b/ui/packages/consul-ui/tests/unit/components/search-bar/filters-test.js
index 4cb8c2f47ee57..c3a05afa697e6 100644
--- a/ui/packages/consul-ui/tests/unit/components/search-bar/filters-test.js
+++ b/ui/packages/consul-ui/tests/unit/components/search-bar/filters-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { filters } from 'consul-ui/components/search-bar/utils';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/controllers/application-test.js b/ui/packages/consul-ui/tests/unit/controllers/application-test.js
index 24b5d637b5b1b..eb120e471bb88 100644
--- a/ui/packages/consul-ui/tests/unit/controllers/application-test.js
+++ b/ui/packages/consul-ui/tests/unit/controllers/application-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/controllers/dc/acls/policies/create-test.js b/ui/packages/consul-ui/tests/unit/controllers/dc/acls/policies/create-test.js
index 4d9696bbc77b2..aff47f6361af0 100644
--- a/ui/packages/consul-ui/tests/unit/controllers/dc/acls/policies/create-test.js
+++ b/ui/packages/consul-ui/tests/unit/controllers/dc/acls/policies/create-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/controllers/dc/acls/policies/edit-test.js b/ui/packages/consul-ui/tests/unit/controllers/dc/acls/policies/edit-test.js
index 14692ed7727a6..ccf2be0e21c63 100644
--- a/ui/packages/consul-ui/tests/unit/controllers/dc/acls/policies/edit-test.js
+++ b/ui/packages/consul-ui/tests/unit/controllers/dc/acls/policies/edit-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/controllers/dc/acls/roles/create-test.js b/ui/packages/consul-ui/tests/unit/controllers/dc/acls/roles/create-test.js
index c729fabfd7cad..5ea165c7afa61 100644
--- a/ui/packages/consul-ui/tests/unit/controllers/dc/acls/roles/create-test.js
+++ b/ui/packages/consul-ui/tests/unit/controllers/dc/acls/roles/create-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/controllers/dc/acls/roles/edit-test.js b/ui/packages/consul-ui/tests/unit/controllers/dc/acls/roles/edit-test.js
index c09fe6ff8a473..9067a80b3b884 100644
--- a/ui/packages/consul-ui/tests/unit/controllers/dc/acls/roles/edit-test.js
+++ b/ui/packages/consul-ui/tests/unit/controllers/dc/acls/roles/edit-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/controllers/dc/acls/tokens/create-test.js b/ui/packages/consul-ui/tests/unit/controllers/dc/acls/tokens/create-test.js
index aacd287523dc1..55306752381e2 100644
--- a/ui/packages/consul-ui/tests/unit/controllers/dc/acls/tokens/create-test.js
+++ b/ui/packages/consul-ui/tests/unit/controllers/dc/acls/tokens/create-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/controllers/dc/acls/tokens/edit-test.js b/ui/packages/consul-ui/tests/unit/controllers/dc/acls/tokens/edit-test.js
index 441490f351612..696d51343c59b 100644
--- a/ui/packages/consul-ui/tests/unit/controllers/dc/acls/tokens/edit-test.js
+++ b/ui/packages/consul-ui/tests/unit/controllers/dc/acls/tokens/edit-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/filter/predicates/intention-test.js b/ui/packages/consul-ui/tests/unit/filter/predicates/intention-test.js
index c07a58f789650..c25384c82bae6 100644
--- a/ui/packages/consul-ui/tests/unit/filter/predicates/intention-test.js
+++ b/ui/packages/consul-ui/tests/unit/filter/predicates/intention-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { andOr } from 'consul-ui/utils/filter';
 import predicates from 'consul-ui/filter/predicates/intention';
 import { module, test } from 'qunit';
diff --git a/ui/packages/consul-ui/tests/unit/filter/predicates/service-test.js b/ui/packages/consul-ui/tests/unit/filter/predicates/service-test.js
index 851a7b0dd761d..2ed38cd0383d4 100644
--- a/ui/packages/consul-ui/tests/unit/filter/predicates/service-test.js
+++ b/ui/packages/consul-ui/tests/unit/filter/predicates/service-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import predicates from 'consul-ui/filter/predicates/service';
 import { andOr } from 'consul-ui/utils/filter';
 import { module, test } from 'qunit';
diff --git a/ui/packages/consul-ui/tests/unit/helpers/document-attrs-test.js b/ui/packages/consul-ui/tests/unit/helpers/document-attrs-test.js
index 61e581301b1e6..9db69d911285f 100644
--- a/ui/packages/consul-ui/tests/unit/helpers/document-attrs-test.js
+++ b/ui/packages/consul-ui/tests/unit/helpers/document-attrs-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import Helper from 'consul-ui/helpers/document-attrs';
 
diff --git a/ui/packages/consul-ui/tests/unit/helpers/policy/datacenters-test.js b/ui/packages/consul-ui/tests/unit/helpers/policy/datacenters-test.js
index 0c55c5bda015a..a508ac79d0450 100644
--- a/ui/packages/consul-ui/tests/unit/helpers/policy/datacenters-test.js
+++ b/ui/packages/consul-ui/tests/unit/helpers/policy/datacenters-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { datacenters } from 'consul-ui/helpers/policy/datacenters';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/helpers/token/is-anonymous-test.js b/ui/packages/consul-ui/tests/unit/helpers/token/is-anonymous-test.js
index 1ba0bd952cfba..22abc0b2d74f2 100644
--- a/ui/packages/consul-ui/tests/unit/helpers/token/is-anonymous-test.js
+++ b/ui/packages/consul-ui/tests/unit/helpers/token/is-anonymous-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { isAnonymous } from 'consul-ui/helpers/token/is-anonymous';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/helpers/token/is-legacy-test.js b/ui/packages/consul-ui/tests/unit/helpers/token/is-legacy-test.js
index fa698e1880452..006b13196ed70 100644
--- a/ui/packages/consul-ui/tests/unit/helpers/token/is-legacy-test.js
+++ b/ui/packages/consul-ui/tests/unit/helpers/token/is-legacy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { isLegacy } from 'consul-ui/helpers/token/is-legacy';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/mixins/policy/as-many-test.js b/ui/packages/consul-ui/tests/unit/mixins/policy/as-many-test.js
index 93e6a5cf50698..373b390c72fbd 100644
--- a/ui/packages/consul-ui/tests/unit/mixins/policy/as-many-test.js
+++ b/ui/packages/consul-ui/tests/unit/mixins/policy/as-many-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import EmberObject from '@ember/object';
 import PolicyAsManyMixin from 'consul-ui/mixins/policy/as-many';
 import { module, test } from 'qunit';
diff --git a/ui/packages/consul-ui/tests/unit/mixins/role/as-many-test.js b/ui/packages/consul-ui/tests/unit/mixins/role/as-many-test.js
index 214429e2f886a..6fc0e69147897 100644
--- a/ui/packages/consul-ui/tests/unit/mixins/role/as-many-test.js
+++ b/ui/packages/consul-ui/tests/unit/mixins/role/as-many-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import EmberObject from '@ember/object';
 import RoleAsManyMixin from 'consul-ui/mixins/role/as-many';
 import { module, test } from 'qunit';
diff --git a/ui/packages/consul-ui/tests/unit/mixins/with-blocking-actions-test.js b/ui/packages/consul-ui/tests/unit/mixins/with-blocking-actions-test.js
index 191db25a4bd9f..bd06672339b0d 100644
--- a/ui/packages/consul-ui/tests/unit/mixins/with-blocking-actions-test.js
+++ b/ui/packages/consul-ui/tests/unit/mixins/with-blocking-actions-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test, skip } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import Route from '@ember/routing/route';
diff --git a/ui/packages/consul-ui/tests/unit/models/auth-method-test.js b/ui/packages/consul-ui/tests/unit/models/auth-method-test.js
index 5c4ac96099042..dbd7b773a4701 100644
--- a/ui/packages/consul-ui/tests/unit/models/auth-method-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/auth-method-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/models/coordinate-test.js b/ui/packages/consul-ui/tests/unit/models/coordinate-test.js
index 9171e4f83a011..f4acbd1fe6ffd 100644
--- a/ui/packages/consul-ui/tests/unit/models/coordinate-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/coordinate-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/models/dc-test.js b/ui/packages/consul-ui/tests/unit/models/dc-test.js
index bcb9165ba3d3a..8b3a33e2fce92 100644
--- a/ui/packages/consul-ui/tests/unit/models/dc-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/dc-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/models/discovery-chain-test.js b/ui/packages/consul-ui/tests/unit/models/discovery-chain-test.js
index 6b1916bcfcc61..4a83c847b7e44 100644
--- a/ui/packages/consul-ui/tests/unit/models/discovery-chain-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/discovery-chain-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/models/intention-test.js b/ui/packages/consul-ui/tests/unit/models/intention-test.js
index 85f0215004bd9..8bb92b1c42d63 100644
--- a/ui/packages/consul-ui/tests/unit/models/intention-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/intention-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/models/kv-test.js b/ui/packages/consul-ui/tests/unit/models/kv-test.js
index f9ad4d7802122..f0072975266a2 100644
--- a/ui/packages/consul-ui/tests/unit/models/kv-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/kv-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/models/node-test.js b/ui/packages/consul-ui/tests/unit/models/node-test.js
index 19e5956599ccf..6562762a69256 100644
--- a/ui/packages/consul-ui/tests/unit/models/node-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/node-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/models/oidc-provider-test.js b/ui/packages/consul-ui/tests/unit/models/oidc-provider-test.js
index 9ad475e7703b3..57481b2f6d06b 100644
--- a/ui/packages/consul-ui/tests/unit/models/oidc-provider-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/oidc-provider-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/models/partition-test.js b/ui/packages/consul-ui/tests/unit/models/partition-test.js
index e5e214f272068..06a4e05ed6d05 100644
--- a/ui/packages/consul-ui/tests/unit/models/partition-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/partition-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/models/permission-test.js b/ui/packages/consul-ui/tests/unit/models/permission-test.js
index b5dd6fb21c388..c988e4f38cc5d 100644
--- a/ui/packages/consul-ui/tests/unit/models/permission-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/permission-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/models/policy-test.js b/ui/packages/consul-ui/tests/unit/models/policy-test.js
index 76bc9c3e6eb3c..ee83f53ffd8ff 100644
--- a/ui/packages/consul-ui/tests/unit/models/policy-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/policy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/models/proxy-test.js b/ui/packages/consul-ui/tests/unit/models/proxy-test.js
index f2dc810cc3ef6..2cd10508b0f19 100644
--- a/ui/packages/consul-ui/tests/unit/models/proxy-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/proxy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/models/role-test.js b/ui/packages/consul-ui/tests/unit/models/role-test.js
index 93aebe689b834..77387e50d18b7 100644
--- a/ui/packages/consul-ui/tests/unit/models/role-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/role-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/models/service-instance-test.js b/ui/packages/consul-ui/tests/unit/models/service-instance-test.js
index d0d1139363e88..1835f95a5c2fc 100644
--- a/ui/packages/consul-ui/tests/unit/models/service-instance-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/service-instance-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/models/service-test.js b/ui/packages/consul-ui/tests/unit/models/service-test.js
index 68548e9d734db..072cc87af9e54 100644
--- a/ui/packages/consul-ui/tests/unit/models/service-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/service-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/models/session-test.js b/ui/packages/consul-ui/tests/unit/models/session-test.js
index 51eab61ddb038..93b152a6b6ea6 100644
--- a/ui/packages/consul-ui/tests/unit/models/session-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/session-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/models/token-test.js b/ui/packages/consul-ui/tests/unit/models/token-test.js
index c7cd395a857ce..3920e41773c3b 100644
--- a/ui/packages/consul-ui/tests/unit/models/token-test.js
+++ b/ui/packages/consul-ui/tests/unit/models/token-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/routes/application-test.js b/ui/packages/consul-ui/tests/unit/routes/application-test.js
index a070afbfe9d72..a65ec1f35339d 100644
--- a/ui/packages/consul-ui/tests/unit/routes/application-test.js
+++ b/ui/packages/consul-ui/tests/unit/routes/application-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/routes/dc-test.js b/ui/packages/consul-ui/tests/unit/routes/dc-test.js
index 024b96804ca0f..1aed5de5e457a 100644
--- a/ui/packages/consul-ui/tests/unit/routes/dc-test.js
+++ b/ui/packages/consul-ui/tests/unit/routes/dc-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/routes/dc/acls/policies/create-test.js b/ui/packages/consul-ui/tests/unit/routes/dc/acls/policies/create-test.js
index 25ba0db161d21..ffe773ec11d61 100644
--- a/ui/packages/consul-ui/tests/unit/routes/dc/acls/policies/create-test.js
+++ b/ui/packages/consul-ui/tests/unit/routes/dc/acls/policies/create-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/routes/dc/acls/policies/edit-test.js b/ui/packages/consul-ui/tests/unit/routes/dc/acls/policies/edit-test.js
index d0c5a5be5a858..a0a6d3c145d15 100644
--- a/ui/packages/consul-ui/tests/unit/routes/dc/acls/policies/edit-test.js
+++ b/ui/packages/consul-ui/tests/unit/routes/dc/acls/policies/edit-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/routes/dc/acls/policies/index-test.js b/ui/packages/consul-ui/tests/unit/routes/dc/acls/policies/index-test.js
index 694a3aedde4a5..7179bc90b72d1 100644
--- a/ui/packages/consul-ui/tests/unit/routes/dc/acls/policies/index-test.js
+++ b/ui/packages/consul-ui/tests/unit/routes/dc/acls/policies/index-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/routes/dc/acls/roles/create-test.js b/ui/packages/consul-ui/tests/unit/routes/dc/acls/roles/create-test.js
index 33c934e6c0de9..71a783c251ebb 100644
--- a/ui/packages/consul-ui/tests/unit/routes/dc/acls/roles/create-test.js
+++ b/ui/packages/consul-ui/tests/unit/routes/dc/acls/roles/create-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/routes/dc/acls/roles/edit-test.js b/ui/packages/consul-ui/tests/unit/routes/dc/acls/roles/edit-test.js
index a915006a670e6..764da885d7b89 100644
--- a/ui/packages/consul-ui/tests/unit/routes/dc/acls/roles/edit-test.js
+++ b/ui/packages/consul-ui/tests/unit/routes/dc/acls/roles/edit-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/routes/dc/acls/roles/index-test.js b/ui/packages/consul-ui/tests/unit/routes/dc/acls/roles/index-test.js
index 71cf811b87110..24b305f978301 100644
--- a/ui/packages/consul-ui/tests/unit/routes/dc/acls/roles/index-test.js
+++ b/ui/packages/consul-ui/tests/unit/routes/dc/acls/roles/index-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/routes/dc/acls/tokens/create-test.js b/ui/packages/consul-ui/tests/unit/routes/dc/acls/tokens/create-test.js
index faa8f76ea3733..32471b8d2d9ea 100644
--- a/ui/packages/consul-ui/tests/unit/routes/dc/acls/tokens/create-test.js
+++ b/ui/packages/consul-ui/tests/unit/routes/dc/acls/tokens/create-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/routes/dc/acls/tokens/edit-test.js b/ui/packages/consul-ui/tests/unit/routes/dc/acls/tokens/edit-test.js
index a79c35a52784d..9cfc3f00352c9 100644
--- a/ui/packages/consul-ui/tests/unit/routes/dc/acls/tokens/edit-test.js
+++ b/ui/packages/consul-ui/tests/unit/routes/dc/acls/tokens/edit-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/routes/dc/acls/tokens/index-test.js b/ui/packages/consul-ui/tests/unit/routes/dc/acls/tokens/index-test.js
index 4f9cf14372636..4b17158fee153 100644
--- a/ui/packages/consul-ui/tests/unit/routes/dc/acls/tokens/index-test.js
+++ b/ui/packages/consul-ui/tests/unit/routes/dc/acls/tokens/index-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/search/predicates/intention-test.js b/ui/packages/consul-ui/tests/unit/search/predicates/intention-test.js
index 48b41cb91bf6a..55843d323b5dd 100644
--- a/ui/packages/consul-ui/tests/unit/search/predicates/intention-test.js
+++ b/ui/packages/consul-ui/tests/unit/search/predicates/intention-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 
 import ExactSearch from 'consul-ui/utils/search/exact';
diff --git a/ui/packages/consul-ui/tests/unit/search/predicates/kv-test.js b/ui/packages/consul-ui/tests/unit/search/predicates/kv-test.js
index 7c4fef714643c..35d0df76b5321 100644
--- a/ui/packages/consul-ui/tests/unit/search/predicates/kv-test.js
+++ b/ui/packages/consul-ui/tests/unit/search/predicates/kv-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 
 import ExactSearch from 'consul-ui/utils/search/exact';
diff --git a/ui/packages/consul-ui/tests/unit/search/predicates/node-test.js b/ui/packages/consul-ui/tests/unit/search/predicates/node-test.js
index 4ebfc0f88b91e..f1e6730239ee0 100644
--- a/ui/packages/consul-ui/tests/unit/search/predicates/node-test.js
+++ b/ui/packages/consul-ui/tests/unit/search/predicates/node-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 
 import ExactSearch from 'consul-ui/utils/search/exact';
diff --git a/ui/packages/consul-ui/tests/unit/search/predicates/policy-test.js b/ui/packages/consul-ui/tests/unit/search/predicates/policy-test.js
index 7af816c19ee06..69879fc8730be 100644
--- a/ui/packages/consul-ui/tests/unit/search/predicates/policy-test.js
+++ b/ui/packages/consul-ui/tests/unit/search/predicates/policy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 
 import ExactSearch from 'consul-ui/utils/search/exact';
diff --git a/ui/packages/consul-ui/tests/unit/search/predicates/role-test.js b/ui/packages/consul-ui/tests/unit/search/predicates/role-test.js
index 8159fc899a503..efcd48dd634aa 100644
--- a/ui/packages/consul-ui/tests/unit/search/predicates/role-test.js
+++ b/ui/packages/consul-ui/tests/unit/search/predicates/role-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 
 import ExactSearch from 'consul-ui/utils/search/exact';
diff --git a/ui/packages/consul-ui/tests/unit/search/predicates/service-test.js b/ui/packages/consul-ui/tests/unit/search/predicates/service-test.js
index 55a7bb65d773d..95196e7324ce4 100644
--- a/ui/packages/consul-ui/tests/unit/search/predicates/service-test.js
+++ b/ui/packages/consul-ui/tests/unit/search/predicates/service-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 
 import ExactSearch from 'consul-ui/utils/search/exact';
diff --git a/ui/packages/consul-ui/tests/unit/search/predicates/token-test.js b/ui/packages/consul-ui/tests/unit/search/predicates/token-test.js
index dceab57d8d166..4e4b3186da65d 100644
--- a/ui/packages/consul-ui/tests/unit/search/predicates/token-test.js
+++ b/ui/packages/consul-ui/tests/unit/search/predicates/token-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 
 import ExactSearch from 'consul-ui/utils/search/exact';
diff --git a/ui/packages/consul-ui/tests/unit/serializers/application-test.js b/ui/packages/consul-ui/tests/unit/serializers/application-test.js
index 180ae76172405..2f7a8c38d0000 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/application-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/application-test.js
@@ -1,12 +1,6 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { HEADERS_SYMBOL as META } from 'consul-ui/utils/http/consul';
-import Node from 'consul-ui/models/node';
 
 module('Unit | Serializer | application', function (hooks) {
   setupTest(hooks);
@@ -123,94 +117,4 @@ module('Unit | Serializer | application', function (hooks) {
     assert.deepEqual(actual, expected);
     // assert.ok(adapter.uidForURL.calledTwice);
   });
-  test('normalizeResponse for Node returns the expected meta in response', function (assert) {
-    const store = this.owner.lookup('service:store');
-    const serializer = store.serializerFor('application');
-    serializer.timestamp = () => 1234567890; //mocks actual timestamp
-    serializer.primaryKey = 'primary-key-name';
-    serializer.slugKey = 'Name';
-    serializer.fingerprint = function (primary, slug, foreignValue) {
-      return function (item) {
-        return {
-          ...item,
-          ...{
-            Datacenter: foreignValue,
-            [primary]: item[slug],
-          },
-        };
-      };
-    };
-
-    const payload = [
-      {
-        Node: 'node-0',
-        Meta: { 'consul-version': '1.7.2' },
-        uid: '1234',
-        SyncTime: 1234567890,
-      },
-      {
-        Node: 'node-1',
-        Meta: { 'consul-version': '1.18.0' },
-        uid: '1235',
-        SyncTime: 1234567891,
-      },
-      // synthetic-node without consul-version meta
-      {
-        Node: 'node-2',
-        Meta: { 'synthetic-node': true },
-        uid: '1236',
-        SyncTime: 1234567891,
-      },
-    ];
-
-    const expected = {
-      data: [
-        {
-          attributes: {
-            Node: 'node-0',
-            Meta: { 'consul-version': '1.7.2' },
-            SyncTime: 1234567890,
-            uid: '1234',
-          },
-          id: '1234',
-          relationships: {},
-          type: 'node',
-        },
-        {
-          attributes: {
-            Node: 'node-1',
-            Meta: { 'consul-version': '1.18.0' },
-            SyncTime: 1234567890,
-            uid: '1235',
-          },
-          id: '1235',
-          relationships: {},
-          type: 'node',
-        },
-        {
-          attributes: {
-            Node: 'node-2',
-            Meta: { 'synthetic-node': true },
-            SyncTime: 1234567890,
-            uid: '1236',
-          },
-          id: '1236',
-          relationships: {},
-          type: 'node',
-        },
-      ],
-      included: [],
-      meta: {
-        versions: ['1.18', '1.7'], //expect distinct major versions sorted
-        cacheControl: undefined,
-        cursor: undefined,
-        date: 1234567890,
-        dc: undefined,
-        nspace: undefined,
-        partition: undefined,
-      },
-    };
-    const actual = serializer.normalizeResponse(store, Node, payload, '2', 'query');
-    assert.deepEqual(actual, expected);
-  });
 });
diff --git a/ui/packages/consul-ui/tests/unit/serializers/auth-method-test.js b/ui/packages/consul-ui/tests/unit/serializers/auth-method-test.js
index 966140c5198a3..e8e1d65eb4a65 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/auth-method-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/auth-method-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/serializers/binding-rule-test.js b/ui/packages/consul-ui/tests/unit/serializers/binding-rule-test.js
index 32167e1f91fd0..25639642e8691 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/binding-rule-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/binding-rule-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/serializers/coordinate-test.js b/ui/packages/consul-ui/tests/unit/serializers/coordinate-test.js
index e113e4741ce8f..a996a2350c975 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/coordinate-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/coordinate-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/serializers/discovery-chain-test.js b/ui/packages/consul-ui/tests/unit/serializers/discovery-chain-test.js
index abaf69a1f5b37..da877eecb8cd7 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/discovery-chain-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/discovery-chain-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/serializers/intention-test.js b/ui/packages/consul-ui/tests/unit/serializers/intention-test.js
index 69b499526992a..141f37406f0e0 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/intention-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/intention-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/serializers/kv-test.js b/ui/packages/consul-ui/tests/unit/serializers/kv-test.js
index 6ca2c6501163f..e435609ce6ee5 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/kv-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/kv-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/serializers/node-test.js b/ui/packages/consul-ui/tests/unit/serializers/node-test.js
index 5f9447b269ce9..a6b9d50de4e28 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/node-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/node-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/serializers/nspace-test.js b/ui/packages/consul-ui/tests/unit/serializers/nspace-test.js
index 13df59b8df005..f903ca066636d 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/nspace-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/nspace-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/serializers/oidc-provider-test.js b/ui/packages/consul-ui/tests/unit/serializers/oidc-provider-test.js
index 724aaf4701cdd..cfb8a473c0e9e 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/oidc-provider-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/oidc-provider-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/serializers/partition-test.js b/ui/packages/consul-ui/tests/unit/serializers/partition-test.js
index d20a20d520c9c..58d23ad77dd97 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/partition-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/partition-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/serializers/permission-test.js b/ui/packages/consul-ui/tests/unit/serializers/permission-test.js
index 62b12040a9090..babba9fed686c 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/permission-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/permission-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/serializers/policy-test.js b/ui/packages/consul-ui/tests/unit/serializers/policy-test.js
index 92ec70d25537e..8d7499709cc55 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/policy-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/policy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/serializers/proxy-test.js b/ui/packages/consul-ui/tests/unit/serializers/proxy-test.js
index 41c96cfe373a9..1cd0bbe5923d4 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/proxy-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/proxy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/serializers/role-test.js b/ui/packages/consul-ui/tests/unit/serializers/role-test.js
index 1b3480406b17d..2c7a27b6c814a 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/role-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/role-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/serializers/service-instance-test.js b/ui/packages/consul-ui/tests/unit/serializers/service-instance-test.js
index 1243f801a0dcf..e4e791176c416 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/service-instance-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/service-instance-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/serializers/service-test.js b/ui/packages/consul-ui/tests/unit/serializers/service-test.js
index cb86999c71dc4..4f4a17918932f 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/service-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/service-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/serializers/session-test.js b/ui/packages/consul-ui/tests/unit/serializers/session-test.js
index 8a84cfd0acf12..31e49a6256c23 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/session-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/session-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/serializers/token-test.js b/ui/packages/consul-ui/tests/unit/serializers/token-test.js
index 5c74e5de982a5..6994348ebd42f 100644
--- a/ui/packages/consul-ui/tests/unit/serializers/token-test.js
+++ b/ui/packages/consul-ui/tests/unit/serializers/token-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
diff --git a/ui/packages/consul-ui/tests/unit/services/atob-test.js b/ui/packages/consul-ui/tests/unit/services/atob-test.js
index 81efeab86abe9..1ca0b96c6db4d 100644
--- a/ui/packages/consul-ui/tests/unit/services/atob-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/atob-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/btoa-test.js b/ui/packages/consul-ui/tests/unit/services/btoa-test.js
index a2a33048d3e8a..b7da1ac89d168 100644
--- a/ui/packages/consul-ui/tests/unit/services/btoa-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/btoa-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/client/connections-test.js b/ui/packages/consul-ui/tests/unit/services/client/connections-test.js
index 9ec6eb986aac2..87b8e25cadf44 100644
--- a/ui/packages/consul-ui/tests/unit/services/client/connections-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/client/connections-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/client/http-test.js b/ui/packages/consul-ui/tests/unit/services/client/http-test.js
index daeb9c2c90e0d..3f7249d522b5f 100644
--- a/ui/packages/consul-ui/tests/unit/services/client/http-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/client/http-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/client/transports/xhr-test.js b/ui/packages/consul-ui/tests/unit/services/client/transports/xhr-test.js
index 7666345c5350f..5fa042345744f 100644
--- a/ui/packages/consul-ui/tests/unit/services/client/transports/xhr-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/client/transports/xhr-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/clipboard/local-storage-test.js b/ui/packages/consul-ui/tests/unit/services/clipboard/local-storage-test.js
index 8145897d1f5c5..7f9293ab28849 100644
--- a/ui/packages/consul-ui/tests/unit/services/clipboard/local-storage-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/clipboard/local-storage-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/clipboard/os-test.js b/ui/packages/consul-ui/tests/unit/services/clipboard/os-test.js
index d2daeb5d9355a..37a15537d2626 100644
--- a/ui/packages/consul-ui/tests/unit/services/clipboard/os-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/clipboard/os-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/code-mirror/linter-test.js b/ui/packages/consul-ui/tests/unit/services/code-mirror/linter-test.js
index ec7c35002e398..6452cbc76f133 100644
--- a/ui/packages/consul-ui/tests/unit/services/code-mirror/linter-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/code-mirror/linter-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/data-source/protocols/http-test.js b/ui/packages/consul-ui/tests/unit/services/data-source/protocols/http-test.js
index b36d8662bb0e2..d991ae4e5bf8a 100644
--- a/ui/packages/consul-ui/tests/unit/services/data-source/protocols/http-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/data-source/protocols/http-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/data-source/protocols/local-storage-test.js b/ui/packages/consul-ui/tests/unit/services/data-source/protocols/local-storage-test.js
index 6989f1224bd22..591b62dd5895d 100644
--- a/ui/packages/consul-ui/tests/unit/services/data-source/protocols/local-storage-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/data-source/protocols/local-storage-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/data-structs-test.js b/ui/packages/consul-ui/tests/unit/services/data-structs-test.js
index 5605bf213d78a..9bf0f082c3dde 100644
--- a/ui/packages/consul-ui/tests/unit/services/data-structs-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/data-structs-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/dom-test.js b/ui/packages/consul-ui/tests/unit/services/dom-test.js
index f59fe47988cdf..6e369582bdac0 100644
--- a/ui/packages/consul-ui/tests/unit/services/dom-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/dom-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/encoder-test.js b/ui/packages/consul-ui/tests/unit/services/encoder-test.js
index 69217f9a145cb..69781aadf995d 100644
--- a/ui/packages/consul-ui/tests/unit/services/encoder-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/encoder-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/env-test.js b/ui/packages/consul-ui/tests/unit/services/env-test.js
index f8227a0debddc..7f24073666679 100644
--- a/ui/packages/consul-ui/tests/unit/services/env-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/env-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/feedback-test.js b/ui/packages/consul-ui/tests/unit/services/feedback-test.js
index c0198fb80bf52..3ee0360796ac4 100644
--- a/ui/packages/consul-ui/tests/unit/services/feedback-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/feedback-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/form-test.js b/ui/packages/consul-ui/tests/unit/services/form-test.js
index c0da3021c2671..219d6e2a4c982 100644
--- a/ui/packages/consul-ui/tests/unit/services/form-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/form-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/logger-test.js b/ui/packages/consul-ui/tests/unit/services/logger-test.js
index baa4c0d6c2882..c9692b3defd66 100644
--- a/ui/packages/consul-ui/tests/unit/services/logger-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/logger-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository-test.js b/ui/packages/consul-ui/tests/unit/services/repository-test.js
index 8a2a0ee71634b..687a0aac56101 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/auth-method-test.js b/ui/packages/consul-ui/tests/unit/services/repository/auth-method-test.js
index 45680b4ff2c8c..809b4fcd9ed5c 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/auth-method-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/auth-method-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/coordinate-test.js b/ui/packages/consul-ui/tests/unit/services/repository/coordinate-test.js
index 583df58d65d64..dd94dbe3bebc7 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/coordinate-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/coordinate-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/dc-test.js b/ui/packages/consul-ui/tests/unit/services/repository/dc-test.js
index b140b3782fdf0..37d6ee590510d 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/dc-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/dc-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/discovery-chain-test.js b/ui/packages/consul-ui/tests/unit/services/repository/discovery-chain-test.js
index 764f06fd3d4e0..f1fa73a2a32c4 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/discovery-chain-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/discovery-chain-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/intention-test.js b/ui/packages/consul-ui/tests/unit/services/repository/intention-test.js
index dd820573721b9..31054fb82272a 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/intention-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/intention-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/kv-test.js b/ui/packages/consul-ui/tests/unit/services/repository/kv-test.js
index d556f32815770..59e3795c115d1 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/kv-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/kv-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/node-test.js b/ui/packages/consul-ui/tests/unit/services/repository/node-test.js
index a82cf48de3d1e..9bc0f98b631e0 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/node-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/node-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/nspace-test.js b/ui/packages/consul-ui/tests/unit/services/repository/nspace-test.js
index 9b586e59778ef..cd6677a2b96b9 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/nspace-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/nspace-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/oidc-provider-test.js b/ui/packages/consul-ui/tests/unit/services/repository/oidc-provider-test.js
index f6ed9caec4464..2482775a60dba 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/oidc-provider-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/oidc-provider-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/partition-test.js b/ui/packages/consul-ui/tests/unit/services/repository/partition-test.js
index 24508b765c7db..f1403bfd1af85 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/partition-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/partition-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/permission-test.js b/ui/packages/consul-ui/tests/unit/services/repository/permission-test.js
index 8f938aff7d059..2b908d4c9a5b9 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/permission-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/permission-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/policy-test.js b/ui/packages/consul-ui/tests/unit/services/repository/policy-test.js
index e3ca6725ec461..34b3f6ebeef3e 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/policy-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/policy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/role-test.js b/ui/packages/consul-ui/tests/unit/services/repository/role-test.js
index 45e2f155ff6ac..b05cde742f4c6 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/role-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/role-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/service-instance-test.js b/ui/packages/consul-ui/tests/unit/services/repository/service-instance-test.js
index 2b7282e9108c5..81fd752b90180 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/service-instance-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/service-instance-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/service-test.js b/ui/packages/consul-ui/tests/unit/services/repository/service-test.js
index 2005c7b51a30a..9b96de1afe7b9 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/service-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/service-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/session-test.js b/ui/packages/consul-ui/tests/unit/services/repository/session-test.js
index ae574013b2104..577c468eaa48e 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/session-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/session-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/repository/token-test.js b/ui/packages/consul-ui/tests/unit/services/repository/token-test.js
index bc254bbda92db..77996c65246b9 100644
--- a/ui/packages/consul-ui/tests/unit/services/repository/token-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/repository/token-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/search-test.js b/ui/packages/consul-ui/tests/unit/services/search-test.js
index 7d6f3394543d8..05c56e13c5120 100644
--- a/ui/packages/consul-ui/tests/unit/services/search-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/search-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/settings-test.js b/ui/packages/consul-ui/tests/unit/services/settings-test.js
index c55715de12c59..6dafa15af650e 100644
--- a/ui/packages/consul-ui/tests/unit/services/settings-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/settings-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/sort-test.js b/ui/packages/consul-ui/tests/unit/services/sort-test.js
index 2d5aaff2fe3d0..16ab97eec8ffc 100644
--- a/ui/packages/consul-ui/tests/unit/services/sort-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/sort-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/state-test.js b/ui/packages/consul-ui/tests/unit/services/state-test.js
index 66d646dd4bbc7..38d0cb7da197e 100644
--- a/ui/packages/consul-ui/tests/unit/services/state-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/state-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/store-test.js b/ui/packages/consul-ui/tests/unit/services/store-test.js
index 49ba4efd3b2b5..145b84a616297 100644
--- a/ui/packages/consul-ui/tests/unit/services/store-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/store-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/temporal-test.js b/ui/packages/consul-ui/tests/unit/services/temporal-test.js
index f593dff693f09..73651056a7d09 100644
--- a/ui/packages/consul-ui/tests/unit/services/temporal-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/temporal-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/ticker-test.js b/ui/packages/consul-ui/tests/unit/services/ticker-test.js
index 69e73eaf7b6fe..11a0a71d90cd9 100644
--- a/ui/packages/consul-ui/tests/unit/services/ticker-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/ticker-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/services/timeout-test.js b/ui/packages/consul-ui/tests/unit/services/timeout-test.js
index b057e79d6eda2..d8d0dc5ac4a58 100644
--- a/ui/packages/consul-ui/tests/unit/services/timeout-test.js
+++ b/ui/packages/consul-ui/tests/unit/services/timeout-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/sort/comparators/node-test.js b/ui/packages/consul-ui/tests/unit/sort/comparators/node-test.js
deleted file mode 100644
index 2d8eaa6bd85cb..0000000000000
--- a/ui/packages/consul-ui/tests/unit/sort/comparators/node-test.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
-import comparators from 'consul-ui/sort/comparators/node';
-import { properties } from 'consul-ui/services/sort';
-import { module, test } from 'qunit';
-
-module('Unit | Sort | Comparator | node', function () {
-  const comparator = comparators({ properties });
-  test('items are sorted by a fake Version', function (assert) {
-    const items = [
-      {
-        Version: '2.24.1',
-      },
-      {
-        Version: '1.12.6',
-      },
-      {
-        Version: '2.09.3',
-      },
-    ];
-    const comp = comparator('Version:asc');
-    assert.equal(typeof comp, 'function');
-
-    const expected = [
-      {
-        Version: '1.12.6',
-      },
-      {
-        Version: '2.09.3',
-      },
-      {
-        Version: '2.24.1',
-      },
-    ];
-    let actual = items.sort(comp);
-    assert.deepEqual(actual, expected);
-
-    expected.reverse();
-    actual = items.sort(comparator('Version:desc'));
-    assert.deepEqual(actual, expected);
-  });
-});
diff --git a/ui/packages/consul-ui/tests/unit/sort/comparators/service-test.js b/ui/packages/consul-ui/tests/unit/sort/comparators/service-test.js
index f40ae6da6499a..e5c124f6169ae 100644
--- a/ui/packages/consul-ui/tests/unit/sort/comparators/service-test.js
+++ b/ui/packages/consul-ui/tests/unit/sort/comparators/service-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import comparators from 'consul-ui/sort/comparators/service';
 import { properties } from 'consul-ui/services/sort';
 import { module, test } from 'qunit';
diff --git a/ui/packages/consul-ui/tests/unit/utils/ascend-test.js b/ui/packages/consul-ui/tests/unit/utils/ascend-test.js
index d9dca4ef6125c..9e11565dd3f5e 100644
--- a/ui/packages/consul-ui/tests/unit/utils/ascend-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/ascend-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import ascend from 'consul-ui/utils/ascend';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/atob-test.js b/ui/packages/consul-ui/tests/unit/utils/atob-test.js
index d18c751460f6e..9ca4d199619d0 100644
--- a/ui/packages/consul-ui/tests/unit/utils/atob-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/atob-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip, test } from 'qunit';
 import atob from 'consul-ui/utils/atob';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/btoa-test.js b/ui/packages/consul-ui/tests/unit/utils/btoa-test.js
index c70a7824035f1..f4fd57d0b78cc 100644
--- a/ui/packages/consul-ui/tests/unit/utils/btoa-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/btoa-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import btoa from 'consul-ui/utils/btoa';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/callable-type-test.js b/ui/packages/consul-ui/tests/unit/utils/callable-type-test.js
index f82517c36373f..cd09d79b07ec6 100644
--- a/ui/packages/consul-ui/tests/unit/utils/callable-type-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/callable-type-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import callableType from 'consul-ui/utils/callable-type';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/create-fingerprinter-test.js b/ui/packages/consul-ui/tests/unit/utils/create-fingerprinter-test.js
index cc885604eec7b..e624aa2e5b36f 100644
--- a/ui/packages/consul-ui/tests/unit/utils/create-fingerprinter-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/create-fingerprinter-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import createFingerprinter from 'consul-ui/utils/create-fingerprinter';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/click-first-anchor-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/click-first-anchor-test.js
index 002f7a74f6291..8bc66dcfaaf53 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/click-first-anchor-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/click-first-anchor-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import domClickFirstAnchor from 'consul-ui/utils/dom/click-first-anchor';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/closest-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/closest-test.js
index f91f3464dd4ba..5e18ac102392f 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/closest-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/closest-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import domClosest from 'consul-ui/utils/dom/closest';
 import { module, skip, test } from 'qunit';
 import sinon from 'sinon';
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/create-listeners-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/create-listeners-test.js
index cc9e787d2af3c..1a24c173abf25 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/create-listeners-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/create-listeners-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import createListeners from 'consul-ui/utils/dom/create-listeners';
 import { module, test } from 'qunit';
 import sinon from 'sinon';
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/blocking-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/blocking-test.js
index 88e2a45c832cc..aaa2e3064a0fb 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/blocking-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/blocking-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import domEventSourceBlocking, {
   validateCursor,
   createErrorBackoff,
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/cache-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/cache-test.js
index bc77a11e03e3f..4bcb098654a0f 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/cache-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/cache-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import domEventSourceCache from 'consul-ui/utils/dom/event-source/cache';
 import { module, test } from 'qunit';
 import sinon from 'sinon';
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/callable-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/callable-test.js
index d08d6f2153fc4..ea55c875bd80a 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/callable-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/callable-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import domEventSourceCallable, { defaultRunner } from 'consul-ui/utils/dom/event-source/callable';
 import { module, test } from 'qunit';
 import sinon from 'sinon';
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/index-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/index-test.js
index e5bfb1885a834..d82c52338469a 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/index-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/index-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import {
   source,
   proxy,
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/openable-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/openable-test.js
index 7146351d338e4..ca960691c3650 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/openable-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/openable-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import domEventSourceOpenable from 'consul-ui/utils/dom/event-source/openable';
 import { module, test } from 'qunit';
 import sinon from 'sinon';
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/proxy-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/proxy-test.js
index 0ed911a628223..2633c9cb07a3e 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/proxy-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/proxy-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import domEventSourceProxy from 'consul-ui/utils/dom/event-source/proxy';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/resolver-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/resolver-test.js
index 92bdb2fb0f30e..b1834f6412dab 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/resolver-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/resolver-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import domEventSourceResolver from 'consul-ui/utils/dom/event-source/resolver';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/storage-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/storage-test.js
index 40bfd2ec3a592..a4f010ed97564 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/event-source/storage-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/event-source/storage-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import domEventSourceStorage from 'consul-ui/utils/dom/event-source/storage';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/event-target/rsvp-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/event-target/rsvp-test.js
index 792819a4a1288..72a9ebcc2e5bb 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/event-target/rsvp-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/event-target/rsvp-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import domEventTargetRsvp from 'consul-ui/utils/dom/event-target/rsvp';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/get-component-factory-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/get-component-factory-test.js
index 9f36ac1e5dd03..0d05a2cdf0cf5 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/get-component-factory-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/get-component-factory-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import getComponentFactory from 'consul-ui/utils/dom/get-component-factory';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/is-outside-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/is-outside-test.js
index deb701a31cc58..1f2ee13fbc124 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/is-outside-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/is-outside-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import domIsOutside from 'consul-ui/utils/dom/is-outside';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/normalize-event-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/normalize-event-test.js
index 393aed012a35c..f712ba15fda0e 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/normalize-event-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/normalize-event-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import domNormalizeEvent from 'consul-ui/utils/dom/normalize-event';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/qsa-factory-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/qsa-factory-test.js
index 16c46f6287cc9..0198deaf994cf 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/qsa-factory-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/qsa-factory-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import qsaFactory from 'consul-ui/utils/dom/qsa-factory';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/dom/sibling-test.js b/ui/packages/consul-ui/tests/unit/utils/dom/sibling-test.js
index 41657164df698..185621c34d950 100644
--- a/ui/packages/consul-ui/tests/unit/utils/dom/sibling-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/dom/sibling-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import domSibling from 'consul-ui/utils/dom/sibling';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/get-environment-test.js b/ui/packages/consul-ui/tests/unit/utils/get-environment-test.js
index e83f898629aef..26f37fb0a110a 100644
--- a/ui/packages/consul-ui/tests/unit/utils/get-environment-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/get-environment-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import getEnvironment from 'consul-ui/utils/get-environment';
 import { module, test } from 'qunit';
 const getEntriesByType = function (type) {
diff --git a/ui/packages/consul-ui/tests/unit/utils/get-form-name-property-test.js b/ui/packages/consul-ui/tests/unit/utils/get-form-name-property-test.js
index 988c393986ba9..f9d31eea6e9a2 100644
--- a/ui/packages/consul-ui/tests/unit/utils/get-form-name-property-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/get-form-name-property-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import getFormNameProperty from 'consul-ui/utils/get-form-name-property';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/helpers/call-if-type-test.js b/ui/packages/consul-ui/tests/unit/utils/helpers/call-if-type-test.js
index 25a2f9978f54e..eb067eac1b5da 100644
--- a/ui/packages/consul-ui/tests/unit/utils/helpers/call-if-type-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/helpers/call-if-type-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import callIfType from 'consul-ui/utils/helpers/call-if-type';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/http/create-headers-test.js b/ui/packages/consul-ui/tests/unit/utils/http/create-headers-test.js
index 281c74e94c14d..9df9073cdd13b 100644
--- a/ui/packages/consul-ui/tests/unit/utils/http/create-headers-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/http/create-headers-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import createHeaders from 'consul-ui/utils/http/create-headers';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/http/create-query-params-test.js b/ui/packages/consul-ui/tests/unit/utils/http/create-query-params-test.js
index d933545f6b230..b2db23932f737 100644
--- a/ui/packages/consul-ui/tests/unit/utils/http/create-query-params-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/http/create-query-params-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import createQueryParams from 'consul-ui/utils/http/create-query-params';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/http/create-url-test.js b/ui/packages/consul-ui/tests/unit/utils/http/create-url-test.js
index adcb66470b851..18a0778512bb3 100644
--- a/ui/packages/consul-ui/tests/unit/utils/http/create-url-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/http/create-url-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip, test } from 'qunit';
 import createURL from 'consul-ui/utils/http/create-url';
 import createQueryParams from 'consul-ui/utils/http/create-query-params';
diff --git a/ui/packages/consul-ui/tests/unit/utils/http/error-test.js b/ui/packages/consul-ui/tests/unit/utils/http/error-test.js
index 1a0ae840ec44a..17ba08994ac68 100644
--- a/ui/packages/consul-ui/tests/unit/utils/http/error-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/http/error-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import HttpError from 'consul-ui/utils/http/error';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/http/request-test.js b/ui/packages/consul-ui/tests/unit/utils/http/request-test.js
index 8ddc0f416446b..18ede423380de 100644
--- a/ui/packages/consul-ui/tests/unit/utils/http/request-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/http/request-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import httpRequest from 'consul-ui/utils/http/request';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/http/xhr-test.js b/ui/packages/consul-ui/tests/unit/utils/http/xhr-test.js
index eaf08a35b5be3..bf19d51930fac 100644
--- a/ui/packages/consul-ui/tests/unit/utils/http/xhr-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/http/xhr-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import httpXhr from 'consul-ui/utils/http/xhr';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/isFolder-test.js b/ui/packages/consul-ui/tests/unit/utils/isFolder-test.js
index f609ad5ef6353..b4cdcc33ff448 100644
--- a/ui/packages/consul-ui/tests/unit/utils/isFolder-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/isFolder-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import isFolder from 'consul-ui/utils/isFolder';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/keyToArray-test.js b/ui/packages/consul-ui/tests/unit/utils/keyToArray-test.js
index 919805eb58313..0272e5b345bf0 100644
--- a/ui/packages/consul-ui/tests/unit/utils/keyToArray-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/keyToArray-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import keyToArray from 'consul-ui/utils/keyToArray';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/left-trim-test.js b/ui/packages/consul-ui/tests/unit/utils/left-trim-test.js
index b3b11c3129104..674dcebbcb3a2 100644
--- a/ui/packages/consul-ui/tests/unit/utils/left-trim-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/left-trim-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import leftTrim from 'consul-ui/utils/left-trim';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/maybe-call-test.js b/ui/packages/consul-ui/tests/unit/utils/maybe-call-test.js
index ed46c61233f15..6ae205098cd5e 100644
--- a/ui/packages/consul-ui/tests/unit/utils/maybe-call-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/maybe-call-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import maybeCall from 'consul-ui/utils/maybe-call';
 import { module, test } from 'qunit';
 import { Promise } from 'rsvp';
diff --git a/ui/packages/consul-ui/tests/unit/utils/merge-checks-test.js b/ui/packages/consul-ui/tests/unit/utils/merge-checks-test.js
index 743a7e1ca77fa..63ab724bb7cd2 100644
--- a/ui/packages/consul-ui/tests/unit/utils/merge-checks-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/merge-checks-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import mergeChecks from 'consul-ui/utils/merge-checks';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/non-empty-set-test.js b/ui/packages/consul-ui/tests/unit/utils/non-empty-set-test.js
index c8babd8a07c06..87093f5acba17 100644
--- a/ui/packages/consul-ui/tests/unit/utils/non-empty-set-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/non-empty-set-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import nonEmptySet from 'consul-ui/utils/non-empty-set';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/path/resolve-test.js b/ui/packages/consul-ui/tests/unit/utils/path/resolve-test.js
index 62fdd9ba417e2..31ce37daa248f 100644
--- a/ui/packages/consul-ui/tests/unit/utils/path/resolve-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/path/resolve-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import resolve from 'consul-ui/utils/path/resolve';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/promisedTimeout-test.js b/ui/packages/consul-ui/tests/unit/utils/promisedTimeout-test.js
index 646f670fd3581..b7c502f1210c0 100644
--- a/ui/packages/consul-ui/tests/unit/utils/promisedTimeout-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/promisedTimeout-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, skip, test } from 'qunit';
 import promisedTimeout from 'consul-ui/utils/promisedTimeout';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/right-trim-test.js b/ui/packages/consul-ui/tests/unit/utils/right-trim-test.js
index e2367a582d68a..3f2db90526814 100644
--- a/ui/packages/consul-ui/tests/unit/utils/right-trim-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/right-trim-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import rightTrim from 'consul-ui/utils/right-trim';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/routing/transitionable-test.js b/ui/packages/consul-ui/tests/unit/utils/routing/transitionable-test.js
index ffb5be1fb3eee..f7df6fa5ca121 100644
--- a/ui/packages/consul-ui/tests/unit/utils/routing/transitionable-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/routing/transitionable-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import transitionable from 'consul-ui/utils/routing/transitionable';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/routing/walk-test.js b/ui/packages/consul-ui/tests/unit/utils/routing/walk-test.js
index 6449b3d267e59..47bf25c09ecfa 100644
--- a/ui/packages/consul-ui/tests/unit/utils/routing/walk-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/routing/walk-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { walk } from 'consul-ui/utils/routing/walk';
 import { module, test } from 'qunit';
 import sinon from 'sinon';
diff --git a/ui/packages/consul-ui/tests/unit/utils/routing/wildcard-test.js b/ui/packages/consul-ui/tests/unit/utils/routing/wildcard-test.js
index 1b186ea495f6d..569ce3fda5c6b 100644
--- a/ui/packages/consul-ui/tests/unit/utils/routing/wildcard-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/routing/wildcard-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import wildcard from 'consul-ui/utils/routing/wildcard';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/storage/local-storage-test.js b/ui/packages/consul-ui/tests/unit/utils/storage/local-storage-test.js
index 9dc567b2a13dd..529faddaa2074 100644
--- a/ui/packages/consul-ui/tests/unit/utils/storage/local-storage-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/storage/local-storage-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import localStorage from 'consul-ui/utils/storage/local-storage';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/templatize-test.js b/ui/packages/consul-ui/tests/unit/utils/templatize-test.js
index 3d523fe7dd36c..70a35a4fb4a06 100644
--- a/ui/packages/consul-ui/tests/unit/utils/templatize-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/templatize-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import templatize from 'consul-ui/utils/templatize';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/ticker/index-test.js b/ui/packages/consul-ui/tests/unit/utils/ticker/index-test.js
index 11a8adf83b09a..6533c79ff0c40 100644
--- a/ui/packages/consul-ui/tests/unit/utils/ticker/index-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/ticker/index-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import tickerIndex from 'consul-ui/utils/ticker/index';
 import { module, skip } from 'qunit';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/ucfirst-test.js b/ui/packages/consul-ui/tests/unit/utils/ucfirst-test.js
index 0d4641777bc8f..b07b511b5fd50 100644
--- a/ui/packages/consul-ui/tests/unit/utils/ucfirst-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/ucfirst-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import { module, test } from 'qunit';
 import ucfirst from 'consul-ui/utils/ucfirst';
 
diff --git a/ui/packages/consul-ui/tests/unit/utils/update-array-object-test.js b/ui/packages/consul-ui/tests/unit/utils/update-array-object-test.js
index 11ac8a3f2b2e6..a5e0f08100361 100644
--- a/ui/packages/consul-ui/tests/unit/utils/update-array-object-test.js
+++ b/ui/packages/consul-ui/tests/unit/utils/update-array-object-test.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 import updateArrayObject from 'consul-ui/utils/update-array-object';
 import { module, test } from 'qunit';
 
diff --git a/ui/packages/consul-ui/translations/common/en-us.yaml b/ui/packages/consul-ui/translations/common/en-us.yaml
index 87e617e90c154..18180f2073a14 100644
--- a/ui/packages/consul-ui/translations/common/en-us.yaml
+++ b/ui/packages/consul-ui/translations/common/en-us.yaml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 brand:
   consul: Consul
   consul-api-gateway: Consul API Gateway
@@ -53,7 +50,6 @@ consul:
   redundancyzone: Redundancy zone
   peername: Peer
   partition: Admin Partitions
-  version: Version
 search:
   search: Search
   searchproperty: Search Across
@@ -78,9 +74,6 @@ sort:
   status:
     asc: Unhealthy to Healthy
     desc: Healthy to Unhealthy
-  version:
-    asc: Oldest to Latest
-    desc: Latest to Oldest
 validations:
   dns-hostname:
     help: |
diff --git a/ui/packages/consul-ui/translations/components/app/en-us.yaml b/ui/packages/consul-ui/translations/components/app/en-us.yaml
index b636cd2c687c2..251a49abe8ed7 100644
--- a/ui/packages/consul-ui/translations/components/app/en-us.yaml
+++ b/ui/packages/consul-ui/translations/components/app/en-us.yaml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 skip_to_content: Skip to Content
 toggle_menu: Toggle Menu
 # landmark aria-labels - only screen read, so potentially included with
diff --git a/ui/packages/consul-ui/translations/components/consul/en-us.yaml b/ui/packages/consul-ui/translations/components/consul/en-us.yaml
index 647d96f7f90ef..b8ee183e31212 100644
--- a/ui/packages/consul-ui/translations/components/consul/en-us.yaml
+++ b/ui/packages/consul-ui/translations/components/consul/en-us.yaml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 peer:
   search-bar:
     state:
diff --git a/ui/packages/consul-ui/translations/components/copy-button/en-us.yaml b/ui/packages/consul-ui/translations/components/copy-button/en-us.yaml
index c9d8b01c428c6..2011513de5a55 100644
--- a/ui/packages/consul-ui/translations/components/copy-button/en-us.yaml
+++ b/ui/packages/consul-ui/translations/components/copy-button/en-us.yaml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 title: Copy {name} to the clipboard
 success: Copied {name}
 error: There was a problem.
diff --git a/ui/packages/consul-ui/translations/models/en-us.yaml b/ui/packages/consul-ui/translations/models/en-us.yaml
index bab5f63ef8191..f5119e858b9a0 100644
--- a/ui/packages/consul-ui/translations/models/en-us.yaml
+++ b/ui/packages/consul-ui/translations/models/en-us.yaml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 auth-method:
   Description: Description
   DisplayName: Display name
diff --git a/ui/packages/consul-ui/translations/routes/en-us.yaml b/ui/packages/consul-ui/translations/routes/en-us.yaml
index 0989aed2e7a3c..57ed8aaff4aea 100644
--- a/ui/packages/consul-ui/translations/routes/en-us.yaml
+++ b/ui/packages/consul-ui/translations/routes/en-us.yaml
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 dc:
   show:
     title: Cluster Overview
@@ -8,8 +5,8 @@ dc:
       title: Server status
       unassigned: Unassigned Zones
       tolerance:
-        link-text: Learn how to improve fault tolerance
-        link: /architecture/improving-consul-resilience#strategies-to-increase-fault-tolerance
+        link: |
+          <a href="{CONSUL_DOCS_URL}/architecture/improving-consul-resilience#strategies-to-increase-fault-tolerance" target="_blank" rel="noopener noreferrer">Learn how to improve fault tolerance</a>
         header: Server fault tolerance
         immediate:
           header: Immediate
@@ -37,16 +34,25 @@ dc:
             </p>
       documentation:
         title: Learn More
-        links:
-          license-expiration:
-            text: License expiration
-            link: '/enterprise/license/faq#q-is-there-a-grace-period-when-licenses-expire'
-          renewing-license:
-            text: Renewing a license
-            link: '/enterprise/license/faq#q-how-can-i-renew-a-license'
-          applying-new-license:
-            text: Applying a new license
-            link: '/tutorials/nomad/hashicorp-enterprise-license?in=consul/enterprise'
+        body: |
+          <ul>
+            <li>
+              <a href="{CONSUL_DOCS_URL}/enterprise/license/faq#q-is-there-a-grace-period-when-licenses-expire" target="_blank" rel="noopener noreferrer">
+                License expiration
+              </a>
+            </li>
+            <li>
+              <a href="{CONSUL_DOCS_URL}/enterprise/license/faq#q-how-can-i-renew-a-license" target="_blank" rel="noopener noreferrer">
+                Renewing a license
+              </a>
+            </li>
+            <li>
+              <a href="{CONSUL_DOCS_LEARN_URL}/tutorials/nomad/hashicorp-enterprise-license?in=consul/enterprise" target="_blank" rel="noopener noreferrer">
+                Applying a new license
+              </a>
+            </li>
+          </ul>
+
   nodes:
     index:
       agentless:
@@ -248,14 +254,21 @@ dc:
           </p>
         critical-serf-notice:
           header: Failing serf check
-          body: This instance has a failing serf node check. The health statuses shown on this page are the statuses as they were known before the node became unreachable.
+          body: |
+            <p>
+              This instance has a failing serf node check. The health statuses shown on this page are the statuses as they were known before the node became unreachable.
+            </p>
       upstreams:
         tproxy-mode:
           header: Transparent proxy mode
-          body: The upstreams listed on this page have been defined in a proxy registration. There may be more upstreams, though, as "transparent" mode is enabled on this proxy.
-          footer:
-            link: "/connect/transparent-proxy"
-            text: Read the documentation
+          body: |
+            <p>
+              The upstreams listed on this page have been defined in a proxy registration. There may be more upstreams, though, as "transparent" mode is enabled on this proxy.
+            </p>
+          footer: |
+            <p>
+              <a href="{CONSUL_DOCS_URL}/connect/transparent-proxy" target="_blank" rel="noopener noreferrer">Read the documentation
+            </p>
         empty: |
           <p>
             This Service Instance has no Upstreams{items, select,
@@ -275,39 +288,45 @@ dc:
           default-allow:
             header: Restrict which services can connect
             body: Your current ACL settings allow all services to connect to each other. Either create a deny intention between all services, or set your default ACL policy to deny to improve your security posture and make this topology view reflect the actual upstreams and downstreams of this service.
-            footer:
-              link-text: Create a wildcard deny Intention
-              icon: plus
+            footer: |
+              <p>
+                <a href="{route_intentions}">Create a wildcard deny Intention</a>
+              </p>
           wildcard-intention:
             header: Restrict which services can connect
             body: There is currently a wildcard Intention that allows all services to connect to each other. Change the action of that Intention to deny to improve your security posture and have this topology view reflect the actual upstreams and downstreams of this service.
-            footer:
-              link-text: Edit wildcard intentions
-              icon: edit
+            footer: |
+              <p>
+                <a href="{route_intentions}">Edit wildcard intentions</a>
+              </p>
           not-defined-intention:
             header: Add upstream to allow traffic
             body: An Intention was defined that allows traffic between services, but those services are unable to communicate. Define an explicit upstream in the service definition or enable transparent proxy to fix this.
-            footer:
-              link: '{CONSUL_DOCS_URL}/connect/registration/service-registration#upstreams'
-              link-text: Learn how to add upstreams
+            footer: |
+              <p>
+                <a href="{CONSUL_DOCS_URL}/connect/registration/service-registration#upstreams" target="_blank" rel="noopener noreferrer">Learn how to add upstreams</a>
+              </p>
           no-dependencies:
             header: No dependencies
             body: The service you are viewing currently has no dependencies. You will only see metrics for the current service until dependencies are added.
-            footer:
-              link: '{CONSUL_DOCS_URL}/connect/registration/service-registration#upstream-configuration-reference'
-              link-text: Read the documentation
+            footer: |
+              <p>
+                <a href="{CONSUL_DOCS_URL}/connect/registration/service-registration#upstream-configuration-reference" target="_blank" rel="noopener noreferrer">Read the documentation</a>
+              </p>
           acls-disabled:
             header: Restrict which services can connect
             body: Your current ACL settings allow all services to connect to each other. Either create a deny intention between all services, or enable ACLs and set your default ACL policy to deny to improve your security posture and make this topology view reflect the actual upstreams and downstreams of this service.
-            footer:
-              link: '{ CONSUL_DOCS_URL }/security/acl/acl-system#configuring-acls'
-              link-text: Read the documentation
+            footer: |
+              <p>
+                <a href="{CONSUL_DOCS_URL}/security/acl/acl-system#configuring-acls" target="_blank" rel="noopener noreferrer">Read the documentation</a>
+              </p>
           no-intentions:
             header: Add Intention to allow traffic
             body: There is an upstream registered for this service, but that upstream cannot receive traffic without creating an allow intention.
-            footer:
-              link-text: Edit Intentions
-              icon: edit
+            footer: |
+              <p>
+                <a href="{route_intentions}">Edit Intentions</a>
+              </p>
       intentions:
         index:
           empty:
diff --git a/ui/packages/consul-ui/vendor/consul-ui/routes-debug.js b/ui/packages/consul-ui/vendor/consul-ui/routes-debug.js
index 9b253336c6747..575bef096f49c 100644
--- a/ui/packages/consul-ui/vendor/consul-ui/routes-debug.js
+++ b/ui/packages/consul-ui/vendor/consul-ui/routes-debug.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (routes =>
   routes({
     ['oauth-provider-debug']: {
diff --git a/ui/packages/consul-ui/vendor/consul-ui/routes.js b/ui/packages/consul-ui/vendor/consul-ui/routes.js
index 07abd5c1b701e..459b13cc07baf 100644
--- a/ui/packages/consul-ui/vendor/consul-ui/routes.js
+++ b/ui/packages/consul-ui/vendor/consul-ui/routes.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (routes =>
   routes({
     dc: {
@@ -218,7 +213,6 @@
             queryParams: {
               sortBy: 'sort',
               status: 'status',
-              version: 'version',
               searchproperty: {
                 as: 'searchproperty',
                 empty: [['Node', 'Address', 'Meta', 'PeerName']],
diff --git a/ui/packages/consul-ui/vendor/consul-ui/services-debug.js b/ui/packages/consul-ui/vendor/consul-ui/services-debug.js
index 7bd4a8e4c01c3..f585db5f17063 100644
--- a/ui/packages/consul-ui/vendor/consul-ui/services-debug.js
+++ b/ui/packages/consul-ui/vendor/consul-ui/services-debug.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (services =>
   services({
     'route:application': {
diff --git a/ui/packages/consul-ui/vendor/consul-ui/services.js b/ui/packages/consul-ui/vendor/consul-ui/services.js
index e325871a93916..2b2258d52c43c 100644
--- a/ui/packages/consul-ui/vendor/consul-ui/services.js
+++ b/ui/packages/consul-ui/vendor/consul-ui/services.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (services =>
   services({
     'route:basic': {
diff --git a/ui/packages/consul-ui/vendor/init.js b/ui/packages/consul-ui/vendor/init.js
index 5bdf4d3166a6b..cefbbb81f79d3 100644
--- a/ui/packages/consul-ui/vendor/init.js
+++ b/ui/packages/consul-ui/vendor/init.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (function(doc, appName) {
   const fs = new Map(
     Object.entries(JSON.parse(doc.querySelector(`[data-${appName}-fs]`).textContent))
diff --git a/ui/packages/consul-ui/vendor/metrics-providers/consul.js b/ui/packages/consul-ui/vendor/metrics-providers/consul.js
index a14b606f8e3de..a77f64e90725e 100644
--- a/ui/packages/consul-ui/vendor/metrics-providers/consul.js
+++ b/ui/packages/consul-ui/vendor/metrics-providers/consul.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 (function(global) {
   // Current interface is these three methods.
   const requiredMethods = [
diff --git a/ui/packages/consul-ui/vendor/metrics-providers/prometheus.js b/ui/packages/consul-ui/vendor/metrics-providers/prometheus.js
index 56f33b2996079..8bd5c87fc806a 100644
--- a/ui/packages/consul-ui/vendor/metrics-providers/prometheus.js
+++ b/ui/packages/consul-ui/vendor/metrics-providers/prometheus.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 /*eslint no-console: "off"*/
 (function () {
   var emptySeries = { unitSuffix: '', labels: {}, data: [] };
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 44a87f13f5532..19ff697e44f52 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@^2.2.0":
+"@ampproject/remapping@^2.1.0", "@ampproject/remapping@^2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
   integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
@@ -17,19 +17,75 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
+  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
+  dependencies:
+    "@babel/highlight" "^7.12.13"
+
+"@babel/code-frame@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
+  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+  dependencies:
+    "@babel/highlight" "^7.16.7"
+
+"@babel/code-frame@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
   integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
   dependencies:
     "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5":
+"@babel/compat-data@^7.13.0", "@babel/compat-data@^7.13.8":
+  version "7.13.11"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.11.tgz#9c8fe523c206979c9a81b1e12fe50c1254f1aa35"
+  integrity sha512-BwKEkO+2a67DcFeS3RLl0Z3Gs2OvdXewuWjc1Hfokhb5eQWP9YRYH1/+VrVZvql2CfjOiNGqSAFOYt4lsqTHzg==
+
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34"
+  integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==
+
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.13.tgz#6aff7b350a1e8c3e40b029e46cbe78e24a913483"
+  integrity sha512-5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw==
+
+"@babel/compat-data@^7.20.0":
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30"
+  integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==
+
+"@babel/compat-data@^7.20.5":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.0.tgz#c241dc454e5b5917e40d37e525e2f4530c399298"
   integrity sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==
 
-"@babel/core@^7.0.0", "@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.13.10", "@babel/core@^7.13.8", "@babel/core@^7.16.7", "@babel/core@^7.2.2", "@babel/core@^7.3.4":
+"@babel/core@^7.0.0", "@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.2.2", "@babel/core@^7.3.4", "@babel/core@^7.7.5":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.10.tgz#07de050bbd8193fcd8a3c27918c0890613a94559"
+  integrity sha512-bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.13.9"
+    "@babel/helper-compilation-targets" "^7.13.10"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helpers" "^7.13.10"
+    "@babel/parser" "^7.13.10"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    lodash "^4.17.19"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
+"@babel/core@^7.13.10":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.0.tgz#1341aefdcc14ccc7553fcc688dd8986a2daffc13"
   integrity sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==
@@ -50,6 +106,84 @@
     json5 "^2.2.2"
     semver "^6.3.0"
 
+"@babel/core@^7.13.8":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.2.tgz#8dc9b1620a673f92d3624bd926dc49a52cf25b92"
+  integrity sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g==
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.2"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-module-transforms" "^7.20.2"
+    "@babel/helpers" "^7.20.1"
+    "@babel/parser" "^7.20.2"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.1"
+    "@babel/types" "^7.20.2"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.1"
+    semver "^6.3.0"
+
+"@babel/core@^7.16.7":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.13.tgz#9be8c44512751b05094a4d3ab05fc53a47ce00ac"
+  integrity sha512-ZisbOvRRusFktksHSG6pjj1CSvkPkcZq/KHD45LAkVP/oiHJkNBZWfpvlLmX8OtHDG8IuzsFlVRWo08w7Qxn0A==
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.18.13"
+    "@babel/helper-compilation-targets" "^7.18.9"
+    "@babel/helper-module-transforms" "^7.18.9"
+    "@babel/helpers" "^7.18.9"
+    "@babel/parser" "^7.18.13"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.18.13"
+    "@babel/types" "^7.18.13"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.1"
+    semver "^6.3.0"
+
+"@babel/generator@^7.13.0", "@babel/generator@^7.13.9":
+  version "7.13.9"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
+  integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
+  dependencies:
+    "@babel/types" "^7.13.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200"
+  integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==
+  dependencies:
+    "@babel/types" "^7.17.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.18.13":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.13.tgz#59550cbb9ae79b8def15587bdfbaa388c4abf212"
+  integrity sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==
+  dependencies:
+    "@babel/types" "^7.18.13"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    jsesc "^2.5.1"
+
+"@babel/generator@^7.20.1", "@babel/generator@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.2.tgz#c2e89e22613a039285c1e7b749e2cd0b30b9a481"
+  integrity sha512-SD75PMIK6i9H8G/tfGvB4KKl4Nw6Ssos9nGgYwxbgyTP0iX/Z55DveoH86rmUB/YHTQQ+ZC0F7xxaY8l2OF44Q==
+  dependencies:
+    "@babel/types" "^7.20.2"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    jsesc "^2.5.1"
+
 "@babel/generator@^7.21.0", "@babel/generator@^7.21.1":
   version "7.21.1"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.1.tgz#951cc626057bc0af2c35cd23e9c64d384dea83dd"
@@ -60,6 +194,20 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
+"@babel/helper-annotate-as-pure@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
+  integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-annotate-as-pure@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
+  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
@@ -67,6 +215,22 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
+  integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
+  integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
@@ -83,7 +247,47 @@
     "@babel/helper-hoist-variables" "^7.12.13"
     "@babel/types" "^7.12.13"
 
-"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7":
+"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.10", "@babel/helper-compilation-targets@^7.13.8":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz#1310a1678cb8427c07a753750da4f8ce442bdd0c"
+  integrity sha512-/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA==
+  dependencies:
+    "@babel/compat-data" "^7.13.8"
+    "@babel/helper-validator-option" "^7.12.17"
+    browserslist "^4.14.5"
+    semver "^6.3.0"
+
+"@babel/helper-compilation-targets@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b"
+  integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==
+  dependencies:
+    "@babel/compat-data" "^7.16.4"
+    "@babel/helper-validator-option" "^7.16.7"
+    browserslist "^4.17.5"
+    semver "^6.3.0"
+
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf"
+  integrity sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==
+  dependencies:
+    "@babel/compat-data" "^7.18.8"
+    "@babel/helper-validator-option" "^7.18.6"
+    browserslist "^4.20.2"
+    semver "^6.3.0"
+
+"@babel/helper-compilation-targets@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a"
+  integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
+  dependencies:
+    "@babel/compat-data" "^7.20.0"
+    "@babel/helper-validator-option" "^7.18.6"
+    browserslist "^4.21.3"
+    semver "^6.3.0"
+
+"@babel/helper-compilation-targets@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb"
   integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==
@@ -94,32 +298,99 @@
     lru-cache "^5.1.1"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.8.3":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz#64f49ecb0020532f19b1d014b03bccaa1ab85fb9"
-  integrity sha512-Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ==
+"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.8.3":
+  version "7.13.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz#30d30a005bca2c953f5653fc25091a492177f4f6"
+  integrity sha512-ays0I7XYq9xbjCSvT+EvysLgfc3tOkwCULHjrnscGT3A9qD4sk3wXnJ3of0MAWsWGjdinFvajHU2smYuqXKMrw==
+  dependencies:
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-member-expression-to-functions" "^7.13.0"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.13.0"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+
+"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6":
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
+  integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.18.9":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.13.tgz#63e771187bd06d234f95fdf8bd5f8b6429de6298"
+  integrity sha512-hDvXp+QYxSRL+23mpAlSGxHMDyIGChm0/AwTfTAAK5Ufe40nCsyNdaYCGuK91phn/fVu9kqayImRDkvNAgdrsA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-member-expression-to-functions" "^7.21.0"
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
     "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/helper-replace-supers" "^7.18.9"
     "@babel/helper-split-export-declaration" "^7.18.6"
 
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz#53ff78472e5ce10a52664272a239787107603ebb"
-  integrity sha512-N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg==
+"@babel/helper-create-regexp-features-plugin@^7.12.13":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7"
+  integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    regexpu-core "^4.7.1"
+
+"@babel/helper-create-regexp-features-plugin@^7.16.7":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1"
+  integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    regexpu-core "^5.0.1"
+
+"@babel/helper-create-regexp-features-plugin@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz#3e35f4e04acbbf25f1b3534a657610a000543d3c"
+  integrity sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
-    regexpu-core "^5.3.1"
+    regexpu-core "^5.1.0"
 
-"@babel/helper-define-polyfill-provider@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
-  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
+"@babel/helper-define-polyfill-provider@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz#3c2f91b7971b9fc11fe779c945c014065dea340e"
+  integrity sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
+"@babel/helper-define-polyfill-provider@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665"
+  integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
+"@babel/helper-define-polyfill-provider@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz#bd10d0aca18e8ce012755395b05a79f45eca5073"
+  integrity sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==
   dependencies:
     "@babel/helper-compilation-targets" "^7.17.7"
     "@babel/helper-plugin-utils" "^7.16.7"
@@ -128,11 +399,32 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
+"@babel/helper-environment-visitor@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
+  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-environment-visitor@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
   integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
 
+"@babel/helper-explode-assignable-expression@^7.12.13":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f"
+  integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==
+  dependencies:
+    "@babel/types" "^7.13.0"
+
+"@babel/helper-explode-assignable-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
+  integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-explode-assignable-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
@@ -140,7 +432,41 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0":
+"@babel/helper-function-name@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
+  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-function-name@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
+  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-function-name@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0"
+  integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==
+  dependencies:
+    "@babel/template" "^7.18.6"
+    "@babel/types" "^7.18.9"
+
+"@babel/helper-function-name@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
+  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
+  dependencies:
+    "@babel/template" "^7.18.10"
+    "@babel/types" "^7.19.0"
+
+"@babel/helper-function-name@^7.21.0":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
   integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
@@ -148,28 +474,142 @@
     "@babel/template" "^7.20.7"
     "@babel/types" "^7.21.0"
 
-"@babel/helper-hoist-variables@^7.12.13", "@babel/helper-hoist-variables@^7.18.6":
+"@babel/helper-get-function-arity@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
+  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-get-function-arity@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
+  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-hoist-variables@^7.12.13", "@babel/helper-hoist-variables@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz#5d5882e855b5c5eda91e0cadc26c6e7a2c8593d8"
+  integrity sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==
+  dependencies:
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
+"@babel/helper-hoist-variables@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
+  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
   integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5"
-  integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==
+"@babel/helper-member-expression-to-functions@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz#6aa4bb678e0f8c22f58cdb79451d30494461b091"
+  integrity sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==
   dependencies:
-    "@babel/types" "^7.21.0"
+    "@babel/types" "^7.13.0"
 
-"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.8.3":
+"@babel/helper-member-expression-to-functions@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0"
+  integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-member-expression-to-functions@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815"
+  integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==
+  dependencies:
+    "@babel/types" "^7.18.9"
+
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0"
+  integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-module-imports@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
+  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-module-imports@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
   integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.0", "@babel/helper-module-transforms@^7.21.2":
+"@babel/helper-module-transforms@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz#42eb4bd8eea68bab46751212c357bfed8b40f6f1"
+  integrity sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.13.0"
+    "@babel/helper-simple-access" "^7.12.13"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+    lodash "^4.17.19"
+
+"@babel/helper-module-transforms@^7.16.7":
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz#3c3b03cc6617e33d68ef5a27a67419ac5199ccd0"
+  integrity sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-simple-access" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.17.3"
+    "@babel/types" "^7.17.0"
+
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712"
+  integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/template" "^7.18.6"
+    "@babel/traverse" "^7.18.9"
+    "@babel/types" "^7.18.9"
+
+"@babel/helper-module-transforms@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712"
+  integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.1"
+    "@babel/types" "^7.20.2"
+
+"@babel/helper-module-transforms@^7.21.0":
   version "7.21.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2"
   integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
@@ -183,6 +623,20 @@
     "@babel/traverse" "^7.21.2"
     "@babel/types" "^7.21.2"
 
+"@babel/helper-optimise-call-expression@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
+  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-optimise-call-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
+  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
@@ -190,12 +644,40 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
-  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
+  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
+
+"@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
+  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
+
+"@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f"
+  integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==
+
+"@babel/helper-remap-async-to-generator@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209"
+  integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-wrap-function" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
+"@babel/helper-remap-async-to-generator@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
+  integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-wrap-function" "^7.16.8"
+    "@babel/types" "^7.16.8"
 
-"@babel/helper-remap-async-to-generator@^7.18.9":
+"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
   integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
@@ -205,17 +687,58 @@
     "@babel/helper-wrap-function" "^7.18.9"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331"
-  integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==
+"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24"
+  integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.13.0"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
+"@babel/helper-replace-supers@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
+  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/traverse" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz#1092e002feca980fbbb0bd4d51b74a65c6a500e6"
+  integrity sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-member-expression-to-functions" "^7.20.7"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
     "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.7"
-    "@babel/types" "^7.20.7"
+    "@babel/traverse" "^7.18.9"
+    "@babel/types" "^7.18.9"
+
+"@babel/helper-simple-access@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4"
+  integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-simple-access@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7"
+  integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-simple-access@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea"
+  integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==
+  dependencies:
+    "@babel/types" "^7.18.6"
 
 "@babel/helper-simple-access@^7.20.2":
   version "7.20.2"
@@ -224,12 +747,40 @@
   dependencies:
     "@babel/types" "^7.20.2"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
-  integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
+  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
   dependencies:
-    "@babel/types" "^7.20.0"
+    "@babel/types" "^7.12.1"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
+  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818"
+  integrity sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==
+  dependencies:
+    "@babel/types" "^7.18.9"
+
+"@babel/helper-split-export-declaration@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
+  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-split-export-declaration@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
+  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
+  dependencies:
+    "@babel/types" "^7.16.7"
 
 "@babel/helper-split-export-declaration@^7.18.6":
   version "7.18.6"
@@ -238,30 +789,107 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-string-parser@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
+  integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
+
 "@babel/helper-string-parser@^7.19.4":
   version "7.19.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
   integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
-"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
+"@babel/helper-validator-identifier@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+
+"@babel/helper-validator-identifier@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
+  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
+
+"@babel/helper-validator-identifier@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
+  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
+
+"@babel/helper-validator-identifier@^7.19.1":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
+"@babel/helper-validator-option@^7.12.17":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
+  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
+
+"@babel/helper-validator-option@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
+  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
+
 "@babel/helper-validator-option@^7.18.6":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
-  integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
+  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
+
+"@babel/helper-wrap-function@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4"
+  integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==
+  dependencies:
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
+"@babel/helper-wrap-function@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
+  integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
+  dependencies:
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.8"
+    "@babel/types" "^7.16.8"
 
 "@babel/helper-wrap-function@^7.18.9":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3"
-  integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==
+  version "7.18.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz#bff23ace436e3f6aefb61f85ffae2291c80ed1fb"
+  integrity sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==
+  dependencies:
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.18.11"
+    "@babel/types" "^7.18.10"
+
+"@babel/helpers@^7.13.10":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"
+  integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==
+  dependencies:
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
+"@babel/helpers@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9"
+  integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==
+  dependencies:
+    "@babel/template" "^7.18.6"
+    "@babel/traverse" "^7.18.9"
+    "@babel/types" "^7.18.9"
+
+"@babel/helpers@^7.20.1":
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.1.tgz#2ab7a0fcb0a03b5bf76629196ed63c2d7311f4c9"
+  integrity sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==
   dependencies:
-    "@babel/helper-function-name" "^7.19.0"
     "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.5"
-    "@babel/types" "^7.20.5"
+    "@babel/traverse" "^7.20.1"
+    "@babel/types" "^7.20.0"
 
 "@babel/helpers@^7.21.0":
   version "7.21.0"
@@ -272,7 +900,25 @@
     "@babel/traverse" "^7.21.0"
     "@babel/types" "^7.21.0"
 
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6":
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
+  integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/highlight@^7.16.7":
+  version "7.16.10"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88"
+  integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/highlight@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
   integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
@@ -281,11 +927,38 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.12.3", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.21.2", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
+"@babel/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.13.0", "@babel/parser@^7.13.10", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
+  version "7.13.11"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.11.tgz#f93ebfc99d21c1772afbbaa153f47e7ce2f50b88"
+  integrity sha512-PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q==
+
+"@babel/parser@^7.16.7", "@babel/parser@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0"
+  integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==
+
+"@babel/parser@^7.18.10", "@babel/parser@^7.18.13":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4"
+  integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==
+
+"@babel/parser@^7.20.1", "@babel/parser@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.2.tgz#9aeb9b92f64412b5f81064d46f6a1ac0881337f4"
+  integrity sha512-afk318kh2uKbo7BEj2QtEi8HVCGrwHUffrYDy7dgVcSa2j9lY3LDjPzcyGdpX7xgm35aWqvciZJ4WKmdF/SxYg==
+
+"@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.21.2":
   version "7.21.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.2.tgz#dacafadfc6d7654c3051a66d6fe55b6cb2f2a0b3"
   integrity sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==
 
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
+  integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -293,26 +966,69 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9"
+  integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
+
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1"
-  integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50"
+  integrity sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
+    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
 
-"@babel/plugin-proposal-async-generator-functions@^7.20.1":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
-  integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
+"@babel/plugin-proposal-async-generator-functions@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz#87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1"
+  integrity sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-remap-async-to-generator" "^7.13.0"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
+"@babel/plugin-proposal-async-generator-functions@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
+  integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
+"@babel/plugin-proposal-async-generator-functions@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz#85ea478c98b0095c3e4102bff3b67d306ed24952"
+  integrity sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.10.1", "@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7", "@babel/plugin-proposal-class-properties@^7.18.6":
+"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.10.1", "@babel/plugin-proposal-class-properties@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37"
+  integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
+  integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-proposal-class-properties@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
   integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
@@ -320,25 +1036,59 @@
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-proposal-class-static-block@^7.16.7":
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c"
+  integrity sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.17.6"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
 "@babel/plugin-proposal-class-static-block@^7.18.6":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d"
-  integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020"
+  integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-decorators@^7.13.5", "@babel/plugin-proposal-decorators@^7.16.7":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.21.0.tgz#70e0c89fdcd7465c97593edb8f628ba6e4199d63"
-  integrity sha512-MfgX49uRrFUTL/HvWtmx3zmpyzMMr4MTj3d527MLlr/4RTT9G/ytFFP7qet2uM2Ve03b+BkpWUpK+lRXnQ+v9w==
+"@babel/plugin-proposal-decorators@^7.13.5":
+  version "7.13.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.5.tgz#d28071457a5ba8ee1394b23e38d5dcf32ea20ef7"
+  integrity sha512-i0GDfVNuoapwiheevUOuSW67mInqJ8qw7uWfpjNVeHMn143kXblEy/bmL9AdZ/0yf/4BMQeWXezK0tQIvNPqag==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-decorators" "^7.12.13"
+
+"@babel/plugin-proposal-decorators@^7.16.7":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.10.tgz#788650d01e518a8a722eb8b3055dd9d73ecb7a35"
+  integrity sha512-wdGTwWF5QtpTY/gbBtQLAiCnoxfD4qMbN87NYZle1dOZ9Os8Y6zXcKrIaOU8W+TIvFUWVGG9tUgNww3CjXRVVw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-replace-supers" "^7.20.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-replace-supers" "^7.18.9"
     "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/plugin-syntax-decorators" "^7.21.0"
+    "@babel/plugin-syntax-decorators" "^7.18.6"
+
+"@babel/plugin-proposal-dynamic-import@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d"
+  integrity sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
+"@babel/plugin-proposal-dynamic-import@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
+  integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
 "@babel/plugin-proposal-dynamic-import@^7.18.6":
   version "7.18.6"
@@ -348,6 +1098,22 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
+"@babel/plugin-proposal-export-namespace-from@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d"
+  integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
+"@babel/plugin-proposal-export-namespace-from@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
+  integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
 "@babel/plugin-proposal-export-namespace-from@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
@@ -356,6 +1122,22 @@
     "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
+"@babel/plugin-proposal-json-strings@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b"
+  integrity sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
+"@babel/plugin-proposal-json-strings@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
+  integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
 "@babel/plugin-proposal-json-strings@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
@@ -364,15 +1146,47 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
+"@babel/plugin-proposal-logical-assignment-operators@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a"
+  integrity sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
+"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
+  integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
 "@babel/plugin-proposal-logical-assignment-operators@^7.18.9":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
-  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23"
+  integrity sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6", "@babel/plugin-proposal-nullish-coalescing-operator@^7.4.4":
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.4.4":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3"
+  integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
+  integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
   integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
@@ -380,6 +1194,22 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
+"@babel/plugin-proposal-numeric-separator@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db"
+  integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
+"@babel/plugin-proposal-numeric-separator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
+  integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
 "@babel/plugin-proposal-numeric-separator@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
@@ -388,16 +1218,54 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.20.2", "@babel/plugin-proposal-object-rest-spread@^7.5.5":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
-  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
+"@babel/plugin-proposal-object-rest-spread@^7.13.8", "@babel/plugin-proposal-object-rest-spread@^7.5.5":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz#5d210a4d727d6ce3b18f9de82cc99a3964eed60a"
+  integrity sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==
   dependencies:
-    "@babel/compat-data" "^7.20.5"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/compat-data" "^7.13.8"
+    "@babel/helper-compilation-targets" "^7.13.8"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.13.0"
+
+"@babel/plugin-proposal-object-rest-spread@^7.16.7":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390"
+  integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==
+  dependencies:
+    "@babel/compat-data" "^7.17.0"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.16.7"
+
+"@babel/plugin-proposal-object-rest-spread@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7"
+  integrity sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==
+  dependencies:
+    "@babel/compat-data" "^7.18.8"
+    "@babel/helper-compilation-targets" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.20.7"
+    "@babel/plugin-transform-parameters" "^7.18.8"
+
+"@babel/plugin-proposal-optional-catch-binding@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107"
+  integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
+"@babel/plugin-proposal-optional-catch-binding@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf"
+  integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.18.6":
   version "7.18.6"
@@ -407,16 +1275,50 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.18.9", "@babel/plugin-proposal-optional-chaining@^7.20.7", "@babel/plugin-proposal-optional-chaining@^7.6.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
-  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
+"@babel/plugin-proposal-optional-chaining@^7.13.8", "@babel/plugin-proposal-optional-chaining@^7.6.0":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz#e39df93efe7e7e621841babc197982e140e90756"
+  integrity sha512-hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+"@babel/plugin-proposal-optional-chaining@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
+  integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+"@babel/plugin-proposal-optional-chaining@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993"
+  integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.5", "@babel/plugin-proposal-private-methods@^7.18.6":
+"@babel/plugin-proposal-private-methods@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"
+  integrity sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-proposal-private-methods@^7.16.11", "@babel/plugin-proposal-private-methods@^7.16.5":
+  version "7.16.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
+  integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.16.10"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-proposal-private-methods@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
   integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
@@ -424,17 +1326,43 @@
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-private-property-in-object@^7.16.5", "@babel/plugin-proposal-private-property-in-object@^7.18.6":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc"
-  integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==
+"@babel/plugin-proposal-private-property-in-object@^7.16.5", "@babel/plugin-proposal-private-property-in-object@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
+  integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
+"@babel/plugin-proposal-private-property-in-object@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz#a64137b232f0aca3733a67eb1a144c192389c503"
+  integrity sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
+  integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
+  integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
   integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
@@ -463,12 +1391,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.21.0.tgz#d2b3f31c3e86fa86e16bb540b7660c55bd7d0e78"
-  integrity sha512-tIoPpGBR8UuM4++ccWN3gifhVvQu7ZizuR1fklhRJrd5ewgbkUS+0KVFeWWxELtn18NTLoW32XV7zyOgIAiz+w==
+"@babel/plugin-syntax-decorators@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz#fac829bf3c7ef4a1bc916257b403e58c6bdaf648"
+  integrity sha512-Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-syntax-decorators@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.18.6.tgz#2e45af22835d0b0f8665da2bfd4463649ce5dbc1"
+  integrity sha512-fqyLgjcxf/1yhyZ6A+yo1u9gJ7eleFQod2lkaUsF9DQ7sbbY3Ligym3L0+I2c0WmqNKDpoD9UTb1AKP3qRMOAQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -484,12 +1419,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-import-assertions@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
-  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
+"@babel/plugin-syntax-import-assertions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz#cd6190500a4fa2fe31990a963ffab4b63e4505e4"
+  integrity sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
@@ -547,6 +1482,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-syntax-top-level-await@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
+  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-syntax-top-level-await@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
@@ -554,28 +1496,74 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.2.0", "@babel/plugin-syntax-typescript@^7.20.0", "@babel/plugin-syntax-typescript@^7.8.3":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7"
-  integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==
+"@babel/plugin-syntax-typescript@^7.12.13", "@babel/plugin-syntax-typescript@^7.2.0", "@babel/plugin-syntax-typescript@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474"
+  integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-arrow-functions@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
+  integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-arrow-functions@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
+  integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-arrow-functions@^7.18.6":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551"
-  integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe"
+  integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-async-to-generator@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
+  integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==
+  dependencies:
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-remap-async-to-generator" "^7.13.0"
+
+"@babel/plugin-transform-async-to-generator@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
+  integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-remap-async-to-generator" "^7.16.8"
 
 "@babel/plugin-transform-async-to-generator@^7.18.6":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354"
-  integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615"
+  integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==
   dependencies:
     "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-remap-async-to-generator" "^7.18.6"
+
+"@babel/plugin-transform-block-scoped-functions@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
+  integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-block-scoped-functions@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620"
+  integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-block-scoped-functions@^7.18.6":
   version "7.18.6"
@@ -584,50 +1572,147 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.20.2", "@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02"
-  integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==
+"@babel/plugin-transform-block-scoping@^7.12.13", "@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61"
+  integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-classes@^7.20.2":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665"
-  integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==
+"@babel/plugin-transform-block-scoping@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
+  integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-block-scoping@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz#f9b7e018ac3f373c81452d6ada8bd5a18928926d"
+  integrity sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.9"
+
+"@babel/plugin-transform-classes@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b"
+  integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-replace-supers" "^7.13.0"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-classes@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
+  integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-classes@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz#90818efc5b9746879b869d5ce83eb2aa48bbc3da"
+  integrity sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-compilation-targets" "^7.20.7"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
+    "@babel/helper-function-name" "^7.18.9"
     "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-replace-supers" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-replace-supers" "^7.18.9"
     "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
+"@babel/plugin-transform-computed-properties@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
+  integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-computed-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
+  integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
 "@babel/plugin-transform-computed-properties@^7.18.9":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa"
-  integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e"
+  integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/template" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-destructuring@^7.20.2":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz#8bda578f71620c7de7c93af590154ba331415454"
-  integrity sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==
+"@babel/plugin-transform-destructuring@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz#c5dce270014d4e1ebb1d806116694c12b7028963"
+  integrity sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-destructuring@^7.16.7":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz#c445f75819641788a27a0a3a759d9df911df6abc"
+  integrity sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-destructuring@^7.18.9":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz#9e03bc4a94475d62b7f4114938e6c5c33372cbf5"
+  integrity sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.9"
+
+"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
+  integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
+"@babel/plugin-transform-dotall-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
+  integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-dotall-regex@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
   integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-duplicate-keys@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
+  integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-duplicate-keys@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
+  integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-duplicate-keys@^7.18.9":
   version "7.18.9"
@@ -636,6 +1721,22 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
+"@babel/plugin-transform-exponentiation-operator@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
+  integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-exponentiation-operator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"
+  integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
 "@babel/plugin-transform-exponentiation-operator@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
@@ -644,12 +1745,43 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-for-of@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062"
+  integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-for-of@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
+  integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
 "@babel/plugin-transform-for-of@^7.18.8":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e"
-  integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==
+  version "7.18.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1"
+  integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-function-name@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
+  integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-function-name@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf"
+  integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-function-name@^7.18.9":
   version "7.18.9"
@@ -660,6 +1792,20 @@
     "@babel/helper-function-name" "^7.18.9"
     "@babel/helper-plugin-utils" "^7.18.9"
 
+"@babel/plugin-transform-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
+  integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
+  integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
 "@babel/plugin-transform-literals@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
@@ -667,6 +1813,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
+"@babel/plugin-transform-member-expression-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
+  integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-member-expression-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384"
+  integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
 "@babel/plugin-transform-member-expression-literals@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
@@ -674,32 +1834,111 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.19.6":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a"
-  integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==
+"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz#8c91f8c5115d2202f277549848874027d7172d21"
+  integrity sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.19.6":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7"
-  integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==
+"@babel/plugin-transform-modules-amd@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz#19f511d60e3d8753cc5a6d4e775d3a5184866cc3"
+  integrity sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.21.2"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-amd@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
+  integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.19.6":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e"
-  integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==
+"@babel/plugin-transform-modules-commonjs@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz#7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b"
+  integrity sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-simple-access" "^7.12.13"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-commonjs@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe"
+  integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-simple-access" "^7.16.7"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-commonjs@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz#afd243afba166cca69892e24a8fd8c9f2ca87883"
+  integrity sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-simple-access" "^7.18.6"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-systemjs@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
+  integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.13.0"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-identifier" "^7.12.11"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-systemjs@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7"
+  integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.16.7"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-systemjs@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz#545df284a7ac6a05125e3e405e536c5853099a06"
+  integrity sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==
   dependencies:
     "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/helper-module-transforms" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-validator-identifier" "^7.18.6"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-umd@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz#8a3d96a97d199705b9fd021580082af81c06e70b"
+  integrity sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-modules-umd@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
+  integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-modules-umd@^7.18.6":
   version "7.18.6"
@@ -709,13 +1948,41 @@
     "@babel/helper-module-transforms" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
-  integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
+  integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
+  integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz#c89bfbc7cc6805d692f3a49bc5fc1b630007246d"
+  integrity sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-new-target@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
+  integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-new-target@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
+  integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.20.5"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-new-target@^7.18.6":
   version "7.18.6"
@@ -725,11 +1992,27 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-object-assign@^7.8.3":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.18.6.tgz#7830b4b6f83e1374a5afb9f6111bcfaea872cdd2"
-  integrity sha512-mQisZ3JfqWh2gVXvfqYCAAyRs6+7oev+myBsTwW5RnPhYXOTuCEw2oe3YgxlXMViXUS53lG8koulI7mJ+8JE+A==
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.12.13.tgz#d9b9200a69e03403a813e44a933ad9f4bddfd050"
+  integrity sha512-4QxDMc0lAOkIBSfCrnSGbAJ+4epDBF2XXwcLXuBcG1xl9u7LrktNVD4+LwhL47XuKVPQ7R25e/WdcV+h97HyZA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-object-super@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
+  integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.12.13"
+
+"@babel/plugin-transform-object-super@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94"
+  integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
 
 "@babel/plugin-transform-object-super@^7.18.6":
   version "7.18.6"
@@ -739,12 +2022,40 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/helper-replace-supers" "^7.18.6"
 
-"@babel/plugin-transform-parameters@^7.20.1", "@babel/plugin-transform-parameters@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz#0ee349e9d1bc96e78e3b37a7af423a4078a7083f"
-  integrity sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==
+"@babel/plugin-transform-parameters@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007"
+  integrity sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-parameters@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
+  integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-parameters@^7.18.8":
+  version "7.18.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz#ee9f1a0ce6d78af58d0956a9378ea3427cccb48a"
+  integrity sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-property-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
+  integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-property-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55"
+  integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-property-literals@^7.18.6":
   version "7.18.6"
@@ -753,13 +2064,41 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-regenerator@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5"
+  integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA==
+  dependencies:
+    regenerator-transform "^0.14.2"
+
+"@babel/plugin-transform-regenerator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb"
+  integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==
+  dependencies:
+    regenerator-transform "^0.14.2"
+
 "@babel/plugin-transform-regenerator@^7.18.6":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d"
-  integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73"
+  integrity sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+    regenerator-transform "^0.15.0"
+
+"@babel/plugin-transform-reserved-words@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
+  integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-reserved-words@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
+  integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    regenerator-transform "^0.15.1"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-reserved-words@^7.18.6":
   version "7.18.6"
@@ -769,17 +2108,31 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-runtime@^7.12.1", "@babel/plugin-transform-runtime@^7.13.9":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.0.tgz#2a884f29556d0a68cd3d152dcc9e6c71dfb6eee8"
-  integrity sha512-ReY6pxwSzEU0b3r2/T/VhqMKg/AkceBT19X0UptA3/tYi5Pe2eXgEUH+NNMC5nok6c6XQz5tyVTUpuezRfSMSg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    babel-plugin-polyfill-corejs2 "^0.3.3"
-    babel-plugin-polyfill-corejs3 "^0.6.0"
-    babel-plugin-polyfill-regenerator "^0.4.1"
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.10.tgz#a1e40d22e2bf570c591c9c7e5ab42d6bf1e419e1"
+  integrity sha512-Y5k8ipgfvz5d/76tx7JYbKQTcgFSU6VgJ3kKQv4zGTKr+a9T/KBvfRvGtSFgKDQGt/DBykQixV0vNWKIdzWErA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    babel-plugin-polyfill-corejs2 "^0.1.4"
+    babel-plugin-polyfill-corejs3 "^0.1.3"
+    babel-plugin-polyfill-regenerator "^0.1.2"
     semver "^6.3.0"
 
+"@babel/plugin-transform-shorthand-properties@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
+  integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-shorthand-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
+  integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
 "@babel/plugin-transform-shorthand-properties@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
@@ -787,13 +2140,43 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@^7.19.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e"
-  integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==
+"@babel/plugin-transform-spread@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
+  integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+
+"@babel/plugin-transform-spread@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44"
+  integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+
+"@babel/plugin-transform-spread@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz#6ea7a6297740f381c540ac56caf75b05b74fb664"
+  integrity sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
+
+"@babel/plugin-transform-sticky-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
+  integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-sticky-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660"
+  integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-sticky-regex@^7.18.6":
   version "7.18.6"
@@ -802,6 +2185,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-template-literals@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
+  integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-template-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
+  integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
 "@babel/plugin-transform-template-literals@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
@@ -809,6 +2206,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
+"@babel/plugin-transform-typeof-symbol@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
+  integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-typeof-symbol@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
+  integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
 "@babel/plugin-transform-typeof-symbol@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
@@ -817,13 +2228,13 @@
     "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-typescript@^7.13.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.0.tgz#f0956a153679e3b377ae5b7f0143427151e4c848"
-  integrity sha512-xo///XTPp3mDzTtrqXoBlK9eiAYW3wv9JXglcn/u1bi60RW11dEUxIgA8cbnDhutS1zacjMRmAwxE0gMklLnZg==
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz#4a498e1f3600342d2a9e61f60131018f55774853"
+  integrity sha512-elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-typescript" "^7.20.0"
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-typescript" "^7.12.13"
 
 "@babel/plugin-transform-typescript@~7.4.0":
   version "7.4.5"
@@ -851,6 +2262,20 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-typescript" "^7.8.3"
 
+"@babel/plugin-transform-unicode-escapes@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74"
+  integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-unicode-escapes@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
+  integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
 "@babel/plugin-transform-unicode-escapes@^7.18.10":
   version "7.18.10"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
@@ -858,6 +2283,22 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
+"@babel/plugin-transform-unicode-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
+  integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-unicode-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2"
+  integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
 "@babel/plugin-transform-unicode-regex@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
@@ -874,18 +2315,172 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.16.5", "@babel/preset-env@^7.16.7":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506"
-  integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==
+"@babel/preset-env@^7.10.2":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.10.tgz#b5cde31d5fe77ab2a6ab3d453b59041a1b3a5252"
+  integrity sha512-nOsTScuoRghRtUsRr/c69d042ysfPHcu+KOB4A9aAO9eJYqrkat+LF8G1yp1HD18QiwixT2CisZTr/0b3YZPXQ==
+  dependencies:
+    "@babel/compat-data" "^7.13.8"
+    "@babel/helper-compilation-targets" "^7.13.10"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-option" "^7.12.17"
+    "@babel/plugin-proposal-async-generator-functions" "^7.13.8"
+    "@babel/plugin-proposal-class-properties" "^7.13.0"
+    "@babel/plugin-proposal-dynamic-import" "^7.13.8"
+    "@babel/plugin-proposal-export-namespace-from" "^7.12.13"
+    "@babel/plugin-proposal-json-strings" "^7.13.8"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8"
+    "@babel/plugin-proposal-numeric-separator" "^7.12.13"
+    "@babel/plugin-proposal-object-rest-spread" "^7.13.8"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.13.8"
+    "@babel/plugin-proposal-optional-chaining" "^7.13.8"
+    "@babel/plugin-proposal-private-methods" "^7.13.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.12.13"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.12.13"
+    "@babel/plugin-transform-arrow-functions" "^7.13.0"
+    "@babel/plugin-transform-async-to-generator" "^7.13.0"
+    "@babel/plugin-transform-block-scoped-functions" "^7.12.13"
+    "@babel/plugin-transform-block-scoping" "^7.12.13"
+    "@babel/plugin-transform-classes" "^7.13.0"
+    "@babel/plugin-transform-computed-properties" "^7.13.0"
+    "@babel/plugin-transform-destructuring" "^7.13.0"
+    "@babel/plugin-transform-dotall-regex" "^7.12.13"
+    "@babel/plugin-transform-duplicate-keys" "^7.12.13"
+    "@babel/plugin-transform-exponentiation-operator" "^7.12.13"
+    "@babel/plugin-transform-for-of" "^7.13.0"
+    "@babel/plugin-transform-function-name" "^7.12.13"
+    "@babel/plugin-transform-literals" "^7.12.13"
+    "@babel/plugin-transform-member-expression-literals" "^7.12.13"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.13.8"
+    "@babel/plugin-transform-modules-systemjs" "^7.13.8"
+    "@babel/plugin-transform-modules-umd" "^7.13.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13"
+    "@babel/plugin-transform-new-target" "^7.12.13"
+    "@babel/plugin-transform-object-super" "^7.12.13"
+    "@babel/plugin-transform-parameters" "^7.13.0"
+    "@babel/plugin-transform-property-literals" "^7.12.13"
+    "@babel/plugin-transform-regenerator" "^7.12.13"
+    "@babel/plugin-transform-reserved-words" "^7.12.13"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.13"
+    "@babel/plugin-transform-spread" "^7.13.0"
+    "@babel/plugin-transform-sticky-regex" "^7.12.13"
+    "@babel/plugin-transform-template-literals" "^7.13.0"
+    "@babel/plugin-transform-typeof-symbol" "^7.12.13"
+    "@babel/plugin-transform-unicode-escapes" "^7.12.13"
+    "@babel/plugin-transform-unicode-regex" "^7.12.13"
+    "@babel/preset-modules" "^0.1.4"
+    "@babel/types" "^7.13.0"
+    babel-plugin-polyfill-corejs2 "^0.1.4"
+    babel-plugin-polyfill-corejs3 "^0.1.3"
+    babel-plugin-polyfill-regenerator "^0.1.2"
+    core-js-compat "^3.9.0"
+    semver "^6.3.0"
+
+"@babel/preset-env@^7.16.5":
+  version "7.16.11"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
+  integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
   dependencies:
-    "@babel/compat-data" "^7.20.1"
-    "@babel/helper-compilation-targets" "^7.20.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/compat-data" "^7.16.8"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-validator-option" "^7.16.7"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7"
+    "@babel/plugin-proposal-async-generator-functions" "^7.16.8"
+    "@babel/plugin-proposal-class-properties" "^7.16.7"
+    "@babel/plugin-proposal-class-static-block" "^7.16.7"
+    "@babel/plugin-proposal-dynamic-import" "^7.16.7"
+    "@babel/plugin-proposal-export-namespace-from" "^7.16.7"
+    "@babel/plugin-proposal-json-strings" "^7.16.7"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7"
+    "@babel/plugin-proposal-numeric-separator" "^7.16.7"
+    "@babel/plugin-proposal-object-rest-spread" "^7.16.7"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.16.7"
+    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
+    "@babel/plugin-proposal-private-methods" "^7.16.11"
+    "@babel/plugin-proposal-private-property-in-object" "^7.16.7"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.16.7"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
+    "@babel/plugin-transform-arrow-functions" "^7.16.7"
+    "@babel/plugin-transform-async-to-generator" "^7.16.8"
+    "@babel/plugin-transform-block-scoped-functions" "^7.16.7"
+    "@babel/plugin-transform-block-scoping" "^7.16.7"
+    "@babel/plugin-transform-classes" "^7.16.7"
+    "@babel/plugin-transform-computed-properties" "^7.16.7"
+    "@babel/plugin-transform-destructuring" "^7.16.7"
+    "@babel/plugin-transform-dotall-regex" "^7.16.7"
+    "@babel/plugin-transform-duplicate-keys" "^7.16.7"
+    "@babel/plugin-transform-exponentiation-operator" "^7.16.7"
+    "@babel/plugin-transform-for-of" "^7.16.7"
+    "@babel/plugin-transform-function-name" "^7.16.7"
+    "@babel/plugin-transform-literals" "^7.16.7"
+    "@babel/plugin-transform-member-expression-literals" "^7.16.7"
+    "@babel/plugin-transform-modules-amd" "^7.16.7"
+    "@babel/plugin-transform-modules-commonjs" "^7.16.8"
+    "@babel/plugin-transform-modules-systemjs" "^7.16.7"
+    "@babel/plugin-transform-modules-umd" "^7.16.7"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8"
+    "@babel/plugin-transform-new-target" "^7.16.7"
+    "@babel/plugin-transform-object-super" "^7.16.7"
+    "@babel/plugin-transform-parameters" "^7.16.7"
+    "@babel/plugin-transform-property-literals" "^7.16.7"
+    "@babel/plugin-transform-regenerator" "^7.16.7"
+    "@babel/plugin-transform-reserved-words" "^7.16.7"
+    "@babel/plugin-transform-shorthand-properties" "^7.16.7"
+    "@babel/plugin-transform-spread" "^7.16.7"
+    "@babel/plugin-transform-sticky-regex" "^7.16.7"
+    "@babel/plugin-transform-template-literals" "^7.16.7"
+    "@babel/plugin-transform-typeof-symbol" "^7.16.7"
+    "@babel/plugin-transform-unicode-escapes" "^7.16.7"
+    "@babel/plugin-transform-unicode-regex" "^7.16.7"
+    "@babel/preset-modules" "^0.1.5"
+    "@babel/types" "^7.16.8"
+    babel-plugin-polyfill-corejs2 "^0.3.0"
+    babel-plugin-polyfill-corejs3 "^0.5.0"
+    babel-plugin-polyfill-regenerator "^0.3.0"
+    core-js-compat "^3.20.2"
+    semver "^6.3.0"
+
+"@babel/preset-env@^7.16.7":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.10.tgz#83b8dfe70d7eea1aae5a10635ab0a5fe60dfc0f4"
+  integrity sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==
+  dependencies:
+    "@babel/compat-data" "^7.18.8"
+    "@babel/helper-compilation-targets" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/helper-validator-option" "^7.18.6"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-async-generator-functions" "^7.20.1"
+    "@babel/plugin-proposal-async-generator-functions" "^7.18.10"
     "@babel/plugin-proposal-class-properties" "^7.18.6"
     "@babel/plugin-proposal-class-static-block" "^7.18.6"
     "@babel/plugin-proposal-dynamic-import" "^7.18.6"
@@ -894,7 +2489,7 @@
     "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
     "@babel/plugin-proposal-numeric-separator" "^7.18.6"
-    "@babel/plugin-proposal-object-rest-spread" "^7.20.2"
+    "@babel/plugin-proposal-object-rest-spread" "^7.18.9"
     "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
     "@babel/plugin-proposal-optional-chaining" "^7.18.9"
     "@babel/plugin-proposal-private-methods" "^7.18.6"
@@ -905,7 +2500,7 @@
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.20.0"
+    "@babel/plugin-syntax-import-assertions" "^7.18.6"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -918,10 +2513,10 @@
     "@babel/plugin-transform-arrow-functions" "^7.18.6"
     "@babel/plugin-transform-async-to-generator" "^7.18.6"
     "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
-    "@babel/plugin-transform-block-scoping" "^7.20.2"
-    "@babel/plugin-transform-classes" "^7.20.2"
+    "@babel/plugin-transform-block-scoping" "^7.18.9"
+    "@babel/plugin-transform-classes" "^7.18.9"
     "@babel/plugin-transform-computed-properties" "^7.18.9"
-    "@babel/plugin-transform-destructuring" "^7.20.2"
+    "@babel/plugin-transform-destructuring" "^7.18.9"
     "@babel/plugin-transform-dotall-regex" "^7.18.6"
     "@babel/plugin-transform-duplicate-keys" "^7.18.9"
     "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
@@ -929,32 +2524,43 @@
     "@babel/plugin-transform-function-name" "^7.18.9"
     "@babel/plugin-transform-literals" "^7.18.9"
     "@babel/plugin-transform-member-expression-literals" "^7.18.6"
-    "@babel/plugin-transform-modules-amd" "^7.19.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.19.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.19.6"
+    "@babel/plugin-transform-modules-amd" "^7.18.6"
+    "@babel/plugin-transform-modules-commonjs" "^7.18.6"
+    "@babel/plugin-transform-modules-systemjs" "^7.18.9"
     "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.18.6"
     "@babel/plugin-transform-new-target" "^7.18.6"
     "@babel/plugin-transform-object-super" "^7.18.6"
-    "@babel/plugin-transform-parameters" "^7.20.1"
+    "@babel/plugin-transform-parameters" "^7.18.8"
     "@babel/plugin-transform-property-literals" "^7.18.6"
     "@babel/plugin-transform-regenerator" "^7.18.6"
     "@babel/plugin-transform-reserved-words" "^7.18.6"
     "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.19.0"
+    "@babel/plugin-transform-spread" "^7.18.9"
     "@babel/plugin-transform-sticky-regex" "^7.18.6"
     "@babel/plugin-transform-template-literals" "^7.18.9"
     "@babel/plugin-transform-typeof-symbol" "^7.18.9"
     "@babel/plugin-transform-unicode-escapes" "^7.18.10"
     "@babel/plugin-transform-unicode-regex" "^7.18.6"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.20.2"
-    babel-plugin-polyfill-corejs2 "^0.3.3"
-    babel-plugin-polyfill-corejs3 "^0.6.0"
-    babel-plugin-polyfill-regenerator "^0.4.1"
-    core-js-compat "^3.25.1"
+    "@babel/types" "^7.18.10"
+    babel-plugin-polyfill-corejs2 "^0.3.2"
+    babel-plugin-polyfill-corejs3 "^0.5.3"
+    babel-plugin-polyfill-regenerator "^0.4.0"
+    core-js-compat "^3.22.1"
     semver "^6.3.0"
 
+"@babel/preset-modules@^0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
+  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
+
 "@babel/preset-modules@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
@@ -966,11 +2572,6 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/regjsgen@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
-  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
-
 "@babel/runtime@7.12.18":
   version "7.12.18"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.18.tgz#af137bd7e7d9705a412b3caaf991fe6aaa97831b"
@@ -979,22 +2580,112 @@
     regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.12.5", "@babel/runtime@^7.8.4":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
-  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
+  integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/template@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
+  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/parser" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
+"@babel/template@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
+  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/parser" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
+"@babel/template@^7.18.10", "@babel/template@^7.18.6":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
+  integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.18.10"
+    "@babel/types" "^7.18.10"
+
+"@babel/template@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
+  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
+
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc"
+  integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.13.0"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/parser" "^7.13.0"
+    "@babel/types" "^7.13.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.19"
+
+"@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
+  integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.17.3"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.17.3"
+    "@babel/types" "^7.17.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.13", "@babel/traverse@^7.18.9":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.13.tgz#5ab59ef51a997b3f10c4587d648b9696b6cb1a68"
+  integrity sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==
   dependencies:
-    regenerator-runtime "^0.13.11"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.18.13"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.18.13"
+    "@babel/types" "^7.18.13"
+    debug "^4.1.0"
+    globals "^11.1.0"
 
-"@babel/template@^7.18.10", "@babel/template@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
-  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
+"@babel/traverse@^7.20.1":
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.1.tgz#9b15ccbf882f6d107eeeecf263fbcdd208777ec8"
+  integrity sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==
   dependencies:
     "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
+    "@babel/generator" "^7.20.1"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.20.1"
+    "@babel/types" "^7.20.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
 
-"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.1", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0":
+"@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2":
   version "7.21.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.2.tgz#ac7e1f27658750892e815e60ae90f382a46d8e75"
   integrity sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==
@@ -1010,7 +2701,42 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.1.6", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
+"@babel/types@^7.1.6", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80"
+  integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
+  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.18.10", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.13.tgz#30aeb9e514f4100f7c1cb6e5ba472b30e48f519a"
+  integrity sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==
+  dependencies:
+    "@babel/helper-string-parser" "^7.18.10"
+    "@babel/helper-validator-identifier" "^7.18.6"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842"
+  integrity sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==
+  dependencies:
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2":
   version "7.21.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.2.tgz#92246f6e00f91755893c2876ad653db70c8310d1"
   integrity sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==
@@ -1046,10 +2772,10 @@
   resolved "https://registry.yarnpkg.com/@csstools/sass-import-resolve/-/sass-import-resolve-1.0.0.tgz#32c3cdb2f7af3cd8f0dca357b592e7271f3831b5"
   integrity sha512-pH4KCsbtBLLe7eqUrw8brcuFO8IZlN36JjdKlOublibVdAIPHCzEnpBWOVUXK5sCf+DpBi8ZtuWtjF0srybdeA==
 
-"@docfy/core@^0.4.4":
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/@docfy/core/-/core-0.4.4.tgz#041157870abcde99e64068cdbd79767b2c1a97b4"
-  integrity sha512-m1q0KsRQZepXO5xZouOPXH9K8KJS7lnM6eDutHbYJsiUOG8e4ZpYYGJ+ckOTGzLKSXJGYFoRJRxO82Y9yaPhMA==
+"@docfy/core@^0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@docfy/core/-/core-0.4.2.tgz#6e33378d0bee4e612a9d66bb98050bd08bcd1aad"
+  integrity sha512-Y/AC+wsKCgBtXT+NxmjgjU44QVrLg4N3/VQD0Yg36XVegqCRZGFR6jXfDt8qf2ysCL6TJAqrC6Rm2zhHXl76+A==
   dependencies:
     debug "^4.3.1"
     fast-glob "^3.2.5"
@@ -1073,11 +2799,11 @@
     yaml "^1.9.2"
 
 "@docfy/ember@^0.4.1":
-  version "0.4.8"
-  resolved "https://registry.yarnpkg.com/@docfy/ember/-/ember-0.4.8.tgz#8fe3c525b0d44790bdc801bc3b5f588a27c840bd"
-  integrity sha512-IxkLQJp4/pn4HvW6mxnd9ezErbrKM5i/maNUPCa3ixxFgPFMWRmwn05EP+6Y2ZAqOHaJXtkDMxllCg6tdFFFBQ==
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@docfy/ember/-/ember-0.4.2.tgz#f3a15709f2c94f846985306b4670fbe94e4b2db9"
+  integrity sha512-NsKhYgwHD8/EvE042nogXHNOiOs6Sj3YqWfkEhHBeJmrt7Y8vnMvW6Xmf6aPNHIW0GS7pWFwTfBFxu/YOx+8Vg==
   dependencies:
-    "@docfy/core" "^0.4.4"
+    "@docfy/core" "^0.4.2"
     broccoli-bridge "^1.0.0"
     broccoli-file-creator "^2.1.1"
     broccoli-funnel "^3.0.3"
@@ -1085,7 +2811,6 @@
     broccoli-node-api "^1.7.0"
     broccoli-plugin "^4.0.3"
     broccoli-source "^3.0.0"
-    calculate-cache-key-for-tree "2.0.0"
     debug "^4.3.1"
     ember-cli-babel "^7.23.1"
     ember-cli-htmlbars "^5.3.1"
@@ -1097,79 +2822,78 @@
     unist-util-find "^1.0.2"
     unist-util-visit "^2.0.2"
 
-"@ember-data/adapter@3.28.13":
-  version "3.28.13"
-  resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-3.28.13.tgz#3b921365046a329f3eb1c72fc4964c6aff06e53b"
-  integrity sha512-AwLJTs+GvxX72vfP3edV0hoMLD9oPWJNbnqxakXVN9xGTuk6/TeGQLMrVU3222GCoMMNrJ357Nip7kZeFo4IdA==
+"@ember-data/adapter@3.27.1":
+  version "3.27.1"
+  resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-3.27.1.tgz#4258b138ae43f1329995b8fce54e866d0b9b79a3"
+  integrity sha512-g9JPXn2QvV47xFWbY7xRiVp4LEbE4vkVo/qu3NtrvD+MLHNmfWn6VHhx2+v5mQB0pBe8lK8nPZGoS8PM/3CMuA==
   dependencies:
-    "@ember-data/private-build-infra" "3.28.13"
-    "@ember-data/store" "3.28.13"
+    "@ember-data/private-build-infra" "3.27.1"
+    "@ember-data/store" "3.27.1"
     "@ember/edition-utils" "^1.2.0"
-    "@ember/string" "^3.0.0"
+    "@ember/string" "^1.0.0"
     ember-cli-babel "^7.26.6"
     ember-cli-test-info "^1.0.0"
-    ember-cli-typescript "^4.1.0"
+    ember-cli-typescript "^4.0.0"
 
-"@ember-data/canary-features@3.28.13":
-  version "3.28.13"
-  resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-3.28.13.tgz#59cd75b94bfff86f85affb42e66016c71f45f02e"
-  integrity sha512-fgpcB0wmtUjZeqcIKkfP/MclQjY5r8ft8YZhPlvQh2MIx+3d3nCNRXB6lEUdRdQphFEag2towONFEIsiOAgs3Q==
+"@ember-data/canary-features@3.27.1":
+  version "3.27.1"
+  resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-3.27.1.tgz#fa589ff8a37f6dcc607f874303be024a4f7a186a"
+  integrity sha512-7RLYG1W1woBu116h4bE3zfEHCV+EVVzNZcgRD3tUH9cg/EvOfXfn3naAFNnoA7TIEl2ZShRPgNNi2SjkYYy52Q==
   dependencies:
     ember-cli-babel "^7.26.6"
     ember-cli-typescript "^4.1.0"
 
-"@ember-data/debug@3.28.13":
-  version "3.28.13"
-  resolved "https://registry.yarnpkg.com/@ember-data/debug/-/debug-3.28.13.tgz#eb20779de83429f5d493d3c8e81ced468fa5974d"
-  integrity sha512-ofny/Grpqx1lM6KWy5q75/b2/B+zQ4B4Ynk7SrQ//sFvpX3gjuP8iN07SKTHSN07vedlC+7QNhNJdCQwyqK1Fg==
+"@ember-data/debug@3.27.1":
+  version "3.27.1"
+  resolved "https://registry.yarnpkg.com/@ember-data/debug/-/debug-3.27.1.tgz#76ec39fd981ad9e97d140a30dfae6e3258144c0e"
+  integrity sha512-VWAzZFqKiheMc7Qx5yIekpdfamSBWURjNF5NKCQGGLRv7SsQe1eOjbW5iaq+gsnNr/gk4U95yLd225kUf6ubEQ==
   dependencies:
-    "@ember-data/private-build-infra" "3.28.13"
+    "@ember-data/private-build-infra" "3.27.1"
     "@ember/edition-utils" "^1.2.0"
-    "@ember/string" "^3.0.0"
+    "@ember/string" "^1.0.0"
     ember-cli-babel "^7.26.6"
     ember-cli-test-info "^1.0.0"
-    ember-cli-typescript "^4.1.0"
+    ember-cli-typescript "^4.0.0"
 
-"@ember-data/model@3.28.13":
-  version "3.28.13"
-  resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-3.28.13.tgz#50ac1bd5783e7cc51344767d5ff46f84198f4d1a"
-  integrity sha512-V5Hgzz5grNWTSrKGksY9xeOsTDLN/d3qsVMu26FWWHP5uqyWT0Cd4LSRpNxs14PsTFDcbrtGKaZv3YVksZfFEQ==
+"@ember-data/model@3.27.1":
+  version "3.27.1"
+  resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-3.27.1.tgz#e35730da811c21e85f2bd334eb4a741f5368ce50"
+  integrity sha512-GC5bf2wAad6ePCoreOj4JknJaJ62FBwR9q+/zFxADU1Ns68kyVm/Xg7KD1sDvcXEwLJebH09j9sN7LkwZaN3Og==
   dependencies:
-    "@ember-data/canary-features" "3.28.13"
-    "@ember-data/private-build-infra" "3.28.13"
-    "@ember-data/store" "3.28.13"
+    "@ember-data/canary-features" "3.27.1"
+    "@ember-data/private-build-infra" "3.27.1"
+    "@ember-data/store" "3.27.1"
     "@ember/edition-utils" "^1.2.0"
-    "@ember/string" "^3.0.0"
-    ember-cached-decorator-polyfill "^0.1.4"
+    "@ember/string" "^1.0.0"
     ember-cli-babel "^7.26.6"
     ember-cli-string-utils "^1.1.0"
     ember-cli-test-info "^1.0.0"
-    ember-cli-typescript "^4.1.0"
+    ember-cli-typescript "^4.0.0"
     ember-compatibility-helpers "^1.2.0"
-    inflection "~1.13.1"
+    inflection "1.12.0"
 
-"@ember-data/private-build-infra@3.28.13":
-  version "3.28.13"
-  resolved "https://registry.yarnpkg.com/@ember-data/private-build-infra/-/private-build-infra-3.28.13.tgz#828a27e724240b1ef70ae5dd8ab8be1f61275929"
-  integrity sha512-8gT3/gnmbNgFIMVdHBpl3xFGJefJE26VUIidFHTF1/N1aumVUlEhnXH0BSPxvxTnFXz/klGSTOMs+sDsx3jw6A==
+"@ember-data/private-build-infra@3.27.1":
+  version "3.27.1"
+  resolved "https://registry.yarnpkg.com/@ember-data/private-build-infra/-/private-build-infra-3.27.1.tgz#040a9f646a1ca2764e67bf1108dc489d2008e7d5"
+  integrity sha512-Cox/CRovg1gFGuO2zn64JSAezbbO1XHP+tLWDXRIiB2Oqlk3CtNxEs9K02DxMCojK4C8itFDOVpBKLYCB5MbYQ==
   dependencies:
     "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@ember-data/canary-features" "3.28.13"
+    "@ember-data/canary-features" "3.27.1"
     "@ember/edition-utils" "^1.2.0"
     babel-plugin-debug-macros "^0.3.3"
     babel-plugin-filter-imports "^4.0.0"
     babel6-plugin-strip-class-callcheck "^6.0.0"
     broccoli-debug "^0.6.5"
     broccoli-file-creator "^2.1.1"
-    broccoli-funnel "^3.0.3"
+    broccoli-funnel "^2.0.2"
     broccoli-merge-trees "^4.2.0"
-    broccoli-rollup "^5.0.0"
+    broccoli-rollup "^4.1.1"
     calculate-cache-key-for-tree "^2.0.0"
     chalk "^4.0.0"
     ember-cli-babel "^7.26.6"
     ember-cli-path-utils "^1.0.0"
     ember-cli-string-utils "^1.1.0"
-    ember-cli-typescript "^4.1.0"
+    ember-cli-typescript "^3.1.3"
     ember-cli-version-checker "^5.1.1"
     esm "^3.2.25"
     git-repo-info "^2.1.1"
@@ -1180,48 +2904,49 @@
     semver "^7.1.3"
     silent-error "^1.1.1"
 
-"@ember-data/record-data@3.28.13":
-  version "3.28.13"
-  resolved "https://registry.yarnpkg.com/@ember-data/record-data/-/record-data-3.28.13.tgz#2bf169404732e126489d3b3a8dc6c0dfca8b5f5f"
-  integrity sha512-0qYOxQr901eZ0JoYVt/IiszZYuNefqO6yiwKw0VH2dmWhVniQSp+Da9YnoKN9U2KgR4NdxKiUs2j9ZLNZ+bH7g==
+"@ember-data/record-data@3.27.1":
+  version "3.27.1"
+  resolved "https://registry.yarnpkg.com/@ember-data/record-data/-/record-data-3.27.1.tgz#2d9e35e36404790adebc24890ca0eb8ee1ecfb65"
+  integrity sha512-QSY7vJIbfCCpVNhAXkGc73UiXqX7UyELq0Mc3URoVCKRYZJOCSnydPYARLgN/NM99HV0Mw1aa+KP8Nco8Z/gFg==
   dependencies:
-    "@ember-data/canary-features" "3.28.13"
-    "@ember-data/private-build-infra" "3.28.13"
-    "@ember-data/store" "3.28.13"
+    "@ember-data/canary-features" "3.27.1"
+    "@ember-data/private-build-infra" "3.27.1"
+    "@ember-data/store" "3.27.1"
     "@ember/edition-utils" "^1.2.0"
+    "@ember/ordered-set" "^4.0.0"
     ember-cli-babel "^7.26.6"
     ember-cli-test-info "^1.0.0"
-    ember-cli-typescript "^4.1.0"
+    ember-cli-typescript "^4.0.0"
 
 "@ember-data/rfc395-data@^0.0.4":
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843"
   integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==
 
-"@ember-data/serializer@3.28.13":
-  version "3.28.13"
-  resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-3.28.13.tgz#6dfa8ba17c0ea192313134643dbe56adf45a722a"
-  integrity sha512-BlYXi8ObH0B5G7QeWtkf9u8PrhdlfAxOAsOuOPZPCTzWsQlmyzV6M9KvBmIAvJtM2IQ3a5BX2o71eP6/7MJDUg==
+"@ember-data/serializer@3.27.1":
+  version "3.27.1"
+  resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-3.27.1.tgz#17301698281e9d888f6c38b59c4b460c9ab27fd7"
+  integrity sha512-kJE+kiisk1d9KQYRcRK4BFQhhsZ3n7ADlyK5eCsaNEwJm4YsfvKgjUgaC16MJddX4LG9d7QORHNJT9rWcCL9fg==
   dependencies:
-    "@ember-data/private-build-infra" "3.28.13"
-    "@ember-data/store" "3.28.13"
+    "@ember-data/private-build-infra" "3.27.1"
+    "@ember-data/store" "3.27.1"
     ember-cli-babel "^7.26.6"
     ember-cli-test-info "^1.0.0"
-    ember-cli-typescript "^4.1.0"
+    ember-cli-typescript "^4.0.0"
 
-"@ember-data/store@3.28.13":
-  version "3.28.13"
-  resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-3.28.13.tgz#be3c3fca03d155767af72422f6a3c6dcd6147be8"
-  integrity sha512-y1ddWLfR20l3NN9fNfIAFWCmREnC6hjKCZERDgkvBgZOCAKcs+6bVJGyMmKBcsp4W7kanqKn71tX7Y63jp+jXQ==
+"@ember-data/store@3.27.1":
+  version "3.27.1"
+  resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-3.27.1.tgz#2026adbeee893d3a71417b82095b4921fdd590fb"
+  integrity sha512-RL9OkNBB9DtT5nkYTmGuk46hbVs2avuvSggiPJU3iuQYD3dJ8jC2XGGs3Z4FHEzAVWwlCnFiwVT03GfYbuIbUw==
   dependencies:
-    "@ember-data/canary-features" "3.28.13"
-    "@ember-data/private-build-infra" "3.28.13"
-    "@ember/string" "^3.0.0"
+    "@ember-data/canary-features" "3.27.1"
+    "@ember-data/private-build-infra" "3.27.1"
+    "@ember/string" "^1.0.0"
     "@glimmer/tracking" "^1.0.4"
-    ember-cached-decorator-polyfill "^0.1.4"
     ember-cli-babel "^7.26.6"
     ember-cli-path-utils "^1.0.0"
-    ember-cli-typescript "^4.1.0"
+    ember-cli-typescript "^4.0.0"
+    heimdalljs "^0.3.0"
 
 "@ember-decorators/component@^6.1.1":
   version "6.1.1"
@@ -1263,6 +2988,14 @@
     mkdirp "^1.0.4"
     silent-error "^1.1.1"
 
+"@ember/ordered-set@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@ember/ordered-set/-/ordered-set-4.0.0.tgz#c5ec021ab8d4734c6db92708a81edd499d45fd31"
+  integrity sha512-cUCcme4R5H37HyK8w0qzdG5+lpb3XVr2RQHLyWEP4JsKI66Ob4tizoJOs8rb/XdHCv+F5WeA321hfPMi3DrZbg==
+  dependencies:
+    ember-cli-babel "^7.22.1"
+    ember-compatibility-helpers "^1.1.1"
+
 "@ember/render-modifiers@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-1.0.2.tgz#2e87c48db49d922ce4850d707215caaac60d8444"
@@ -1272,33 +3005,33 @@
     ember-modifier-manager-polyfill "^1.1.0"
 
 "@ember/render-modifiers@^2.0.0":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-2.0.5.tgz#4b1d9496a82ca471aeaa3ecddd94ef089450f415"
-  integrity sha512-5cJ1niIdOJC6k6KtIn9HGbr1DATJQp4ZqMv1vbi6LKQWbVCQ3byvKONtUEi3H0wcewlrcaWCqXOgm0nACzCOQA==
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-2.0.0.tgz#7106928078c6463bc6ee3cbffb6d71dbb8602145"
+  integrity sha512-FbvowKEnYx102MaNMrePBC7RCmuf3BaqPKbp6QP7S6oJaDMuLrGblXW4TxOrE93C6II+6D4QNB4WFGuPeQ3ZBg==
   dependencies:
-    "@embroider/macros" "^1.0.0"
-    ember-cli-babel "^7.26.11"
+    ember-cli-babel "^7.26.6"
+    ember-compatibility-helpers "^1.2.5"
     ember-modifier-manager-polyfill "^1.2.0"
 
-"@ember/string@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@ember/string/-/string-3.0.1.tgz#42cf032031a4432c2dd69c327ae1876d2c13df9c"
-  integrity sha512-ntnmXS+upOWVXE+rVw2l03DjdMnaGdWbYVUxUBuPJqnIGZu2XFRsoXc7E6mOw62s8i1Xh1RgTuFHN41QGIolEQ==
+"@ember/string@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@ember/string/-/string-1.1.0.tgz#58ec0e8867e94d3bcdcde7aa7a9fe06d450079e8"
+  integrity sha512-T8UHFSO9hrkRM9+OingBmbQ69mdb8xjEXxZLCNprQX+cEJI+dyI0Nv3JAYt/0SFTT+/IQW40r004O2n/CsNnEQ==
   dependencies:
-    ember-cli-babel "^7.26.6"
+    ember-cli-babel "^7.4.0"
 
-"@ember/test-helpers@^2.6.0":
-  version "2.9.3"
-  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.9.3.tgz#c2a9d6ab1c367af92cf1a334f97eb19b8e06e6e1"
-  integrity sha512-ejVg4Dj+G/6zyLvQsYOvmGiOLU6AS94tY4ClaO1E2oVvjjtVJIRmVLFN61I+DuyBg9hS3cFoPjQRTZB9MRIbxQ==
+"@ember/test-helpers@^2.2.5":
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.8.1.tgz#20f2e30d48172c2ff713e1db7fbec5352f918d4e"
+  integrity sha512-jbsYwWyAdhL/pdPu7Gb3SG1gvIXY70FWMtC/Us0Kmvk82Y+5YUQ1SOC0io75qmOGYQmH7eQrd/bquEVd+4XtdQ==
   dependencies:
     "@ember/test-waiters" "^3.0.0"
-    "@embroider/macros" "^1.10.0"
-    "@embroider/util" "^1.9.0"
+    "@embroider/macros" "^1.6.0"
+    "@embroider/util" "^1.6.0"
     broccoli-debug "^0.6.5"
     broccoli-funnel "^3.0.8"
-    ember-cli-babel "^7.26.11"
-    ember-cli-htmlbars "^6.1.1"
+    ember-cli-babel "^7.26.6"
+    ember-cli-htmlbars "^5.7.1"
     ember-destroyable-polyfill "^2.0.3"
 
 "@ember/test-waiters@^3.0.0":
@@ -1311,14 +3044,52 @@
     ember-cli-version-checker "^5.1.2"
     semver "^7.3.5"
 
-"@embroider/addon-shim@^1.0.0", "@embroider/addon-shim@^1.5.0", "@embroider/addon-shim@^1.8.4":
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.4.tgz#0e7f32c5506bf0f3eb0840506e31c36c7053763c"
-  integrity sha512-sFhfWC0vI18KxVenmswQ/ShIvBg4juL8ubI+Q3NTSdkCTeaPQ/DIOUF6oR5DCQ8eO/TkIaw+kdG3FkTY6yNJqA==
+"@embroider/addon-shim@^1.5.0":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.3.tgz#2368510b8ce42d50d02cb3289c32e260dfa34bd9"
+  integrity sha512-7pyHwzT6ESXc3nZsB8rfnirLkUhQWdvj6CkYH+0MUPN74mX4rslf7pnBqZE/KZkW3uBIaBYvU8fxi0hcKC/Paw==
   dependencies:
-    "@embroider/shared-internals" "^2.0.0"
-    broccoli-funnel "^3.0.8"
-    semver "^7.3.8"
+    "@embroider/shared-internals" "^1.8.3"
+    semver "^7.3.5"
+
+"@embroider/core@0.33.0", "@embroider/core@^0.33.0":
+  version "0.33.0"
+  resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.33.0.tgz#0fb1752d6e34ea45368e65c42e13220a57ffae76"
+  integrity sha512-Kd3W4vBJCSwskVislwldhuoe1RtdA04lRr2r2ccnPI4msCXxLn292WBaS7/x0LdEu2EMO5ffRDeQva2/xoS4Yg==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.12.3"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-transform-runtime" "^7.12.1"
+    "@babel/runtime" "^7.12.5"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
+    "@embroider/macros" "0.33.0"
+    assert-never "^1.1.0"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    broccoli-node-api "^1.7.0"
+    broccoli-persistent-filter "^3.1.2"
+    broccoli-plugin "^4.0.1"
+    broccoli-source "^3.0.0"
+    debug "^3.1.0"
+    escape-string-regexp "^4.0.0"
+    fast-sourcemap-concat "^1.4.0"
+    filesize "^4.1.2"
+    fs-extra "^7.0.1"
+    fs-tree-diff "^2.0.0"
+    handlebars "^4.4.2"
+    js-string-escape "^1.0.1"
+    jsdom "^16.4.0"
+    json-stable-stringify "^1.0.1"
+    lodash "^4.17.10"
+    pkg-up "^2.0.0"
+    resolve "^1.8.1"
+    resolve-package-path "^1.2.2"
+    semver "^7.3.2"
+    strip-bom "^3.0.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^1.1.3"
+    wrap-legacy-hbs-plugin-if-needed "^1.0.1"
 
 "@embroider/core@0.36.0":
   version "0.36.0"
@@ -1359,6 +3130,21 @@
     walk-sync "^1.1.3"
     wrap-legacy-hbs-plugin-if-needed "^1.0.1"
 
+"@embroider/macros@0.33.0":
+  version "0.33.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.33.0.tgz#d5826ea7565bb69b57ba81ed528315fe77acbf9d"
+  integrity sha512-nl/1zRn+Wd3MO8Bb+YPqHmFl/2vwQLTsEB6Zt+K9bWXsM/kA+dPCeeCReLN6PbkMP16xxqtNSIrQ8Y49hnWjpg==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
+    "@embroider/core" "0.33.0"
+    assert-never "^1.1.0"
+    ember-cli-babel "^7.23.0"
+    lodash "^4.17.10"
+    resolve "^1.8.1"
+    semver "^7.3.2"
+
 "@embroider/macros@0.36.0", "@embroider/macros@^0.36.0":
   version "0.36.0"
   resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.36.0.tgz#5330f1e6f12112f0f68e34b3e4855dc7dd3c69a5"
@@ -1399,28 +3185,28 @@
     resolve "^1.20.0"
     semver "^7.3.2"
 
-"@embroider/macros@^0.42.3":
-  version "0.42.3"
-  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.42.3.tgz#eb4dc35c43f1cb1d14298219ba037f8cead06081"
-  integrity sha512-4I+Sde8FU7QMwNQ3gYtj8fdBTqUeoPDn61XuV4Xng7p9LszQksGDXtyEhWrf9KWU3G+NtrZotY5LICd5P+E3tw==
+"@embroider/macros@1.8.3", "@embroider/macros@^1.0.0", "@embroider/macros@^1.6.0":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.8.3.tgz#2f0961ab8871f6ad819630208031d705b357757e"
+  integrity sha512-gnIOfTL/pUkoD6oI7JyWOqXlVIUgZM+CnbH10/YNtZr2K0hij9eZQMdgjOZZVgN0rKOFw9dIREqc1ygrJHRYQA==
   dependencies:
-    "@embroider/shared-internals" "0.42.3"
+    "@embroider/shared-internals" "1.8.3"
     assert-never "^1.2.1"
+    babel-import-util "^1.1.0"
     ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
     lodash "^4.17.21"
     resolve "^1.20.0"
     semver "^7.3.2"
 
-"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0":
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.10.0.tgz#af3844d5db48f001b85cfb096c76727c72ad6c1e"
-  integrity sha512-LMbfQGk/a+f6xtvAv5fq/wf2LRxETnbgSCLUf/z6ebzmuskOUxrke+uP55chF/loWrARi9g6erFQ7RDOUoBMSg==
+"@embroider/macros@^0.42.3":
+  version "0.42.3"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.42.3.tgz#eb4dc35c43f1cb1d14298219ba037f8cead06081"
+  integrity sha512-4I+Sde8FU7QMwNQ3gYtj8fdBTqUeoPDn61XuV4Xng7p9LszQksGDXtyEhWrf9KWU3G+NtrZotY5LICd5P+E3tw==
   dependencies:
-    "@embroider/shared-internals" "2.0.0"
+    "@embroider/shared-internals" "0.42.3"
     assert-never "^1.2.1"
-    babel-import-util "^1.1.0"
     ember-cli-babel "^7.26.6"
-    find-up "^5.0.0"
     lodash "^4.17.21"
     resolve "^1.20.0"
     semver "^7.3.2"
@@ -1464,21 +3250,7 @@
     semver "^7.3.5"
     typescript-memoize "^1.0.1"
 
-"@embroider/shared-internals@2.0.0", "@embroider/shared-internals@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.0.0.tgz#d8205ec6944362aeecfbb51143db352430ced316"
-  integrity sha512-qZ2/xky9mWm5YC6noOa6AiAwgISEQ78YTZNv4SNu2PFgEK/H+Ha/3ddngzGSsnXkVnIHZyxIBzhxETonQYHY9g==
-  dependencies:
-    babel-import-util "^1.1.0"
-    ember-rfc176-data "^0.3.17"
-    fs-extra "^9.1.0"
-    js-string-escape "^1.0.1"
-    lodash "^4.17.21"
-    resolve-package-path "^4.0.1"
-    semver "^7.3.5"
-    typescript-memoize "^1.0.1"
-
-"@embroider/shared-internals@^1.0.0":
+"@embroider/shared-internals@1.8.3", "@embroider/shared-internals@^1.0.0", "@embroider/shared-internals@^1.8.3":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.8.3.tgz#52d868dc80016e9fe983552c0e516f437bf9b9f9"
   integrity sha512-N5Gho6Qk8z5u+mxLCcMYAoQMbN4MmH+z2jXwQHVs859bxuZTxwF6kKtsybDAASCtd2YGxEmzcc1Ja/wM28824w==
@@ -1510,14 +3282,14 @@
     broccoli-funnel "^3.0.5"
     ember-cli-babel "^7.23.1"
 
-"@embroider/util@^1.9.0":
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.10.0.tgz#8320d73651e7f5d48dac1b71fb9e6d21cac7c803"
-  integrity sha512-utAFKoq6ajI27jyqjvX3PiGL4m+ZyGVlVNbSbE/nOqi2llRyAkh5ltH1WkIK7jhdwQFJouo1NpOSj9J3/HDa3A==
+"@embroider/util@^1.6.0":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.8.3.tgz#7267a2b6fcbf3e56712711441159ab373f9bee7a"
+  integrity sha512-FvsPzsb9rNeveSnIGnsfLkWWBdSM5QIA9lDVtckUktRnRnBWZHm5jDxU/ST//pWMhZ8F0DucRlFWE149MTLtuQ==
   dependencies:
-    "@embroider/macros" "^1.10.0"
+    "@embroider/macros" "1.8.3"
     broccoli-funnel "^3.0.5"
-    ember-cli-babel "^7.26.11"
+    ember-cli-babel "^7.23.1"
 
 "@eslint/eslintrc@^0.4.3":
   version "0.4.3"
@@ -1534,56 +3306,17 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@formatjs/ecma402-abstract@1.11.4":
-  version "1.11.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.4.tgz#b962dfc4ae84361f9f08fbce411b4e4340930eda"
-  integrity sha512-EBikYFp2JCdIfGEb5G9dyCkTGDmC57KSHhRQOC3aYxoPWVZvfWCDjZwkGYHN7Lis/fmuWl906bnNTJifDQ3sXw==
-  dependencies:
-    "@formatjs/intl-localematcher" "0.2.25"
-    tslib "^2.1.0"
-
-"@formatjs/ecma402-abstract@1.6.4":
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.6.4.tgz#cff5ef03837fb6bae70b16d04940213c17e87884"
-  integrity sha512-ukFjGD9dLsxcD9D5AEshJqQElPQeUAlTALT/lzIV6OcYojyuU81gw/uXDUOrs6XW79jtOJwQDkLqHbCJBJMOTw==
-  dependencies:
-    tslib "^2.1.0"
-
-"@formatjs/fast-memoize@1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-1.2.1.tgz#e6f5aee2e4fd0ca5edba6eba7668e2d855e0fc21"
-  integrity sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==
-  dependencies:
-    tslib "^2.1.0"
-
-"@formatjs/icu-messageformat-parser@2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.0.tgz#a54293dd7f098d6a6f6a084ab08b6d54a3e8c12d"
-  integrity sha512-Qxv/lmCN6hKpBSss2uQ8IROVnta2r9jd3ymUEIjm2UyIkUCHVcbUVRGL/KS/wv7876edvsPe+hjHVJ4z8YuVaw==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.11.4"
-    "@formatjs/icu-skeleton-parser" "1.3.6"
-    tslib "^2.1.0"
-
-"@formatjs/icu-skeleton-parser@1.3.6":
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.6.tgz#4ce8c0737d6f07b735288177049e97acbf2e8964"
-  integrity sha512-I96mOxvml/YLrwU2Txnd4klA7V8fRhb6JG/4hm3VMNmeJo1F03IpV2L3wWt7EweqNLES59SZ4d6hVOPCSf80Bg==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.11.4"
-    tslib "^2.1.0"
-
-"@formatjs/intl-localematcher@0.2.25":
-  version "0.2.25"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.25.tgz#60892fe1b271ec35ba07a2eb018a2dd7bca6ea3a"
-  integrity sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==
+"@formatjs/ecma402-abstract@1.6.3":
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.6.3.tgz#f82bd2cf3aa8aaa0f12f9339902942b8d4b96912"
+  integrity sha512-7ijswObmYXabVy5GvcpKG29jbyJ9rGtFdRBdmdQvoDmMo0PwlOl/L08GtrjA4YWLAZ0j2owb2YrRLGNAvLBk+Q==
   dependencies:
     tslib "^2.1.0"
 
-"@glimmer/component@^1.0.0", "@glimmer/component@^1.0.4":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.1.2.tgz#892ec0c9f0b6b3e41c112be502fde073cf24d17c"
-  integrity sha512-XyAsEEa4kWOPy+gIdMjJ8XlzA3qrGH55ZDv6nA16ibalCR17k74BI0CztxuRds+Rm6CtbUVgheCVlcCULuqD7A==
+"@glimmer/component@^1.0.0", "@glimmer/component@^1.0.2", "@glimmer/component@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.0.4.tgz#1c85a5181615a6647f6acfaaed68e28ad7e9626e"
+  integrity sha512-sS4N8wtcKfYdUJ6O3m8nbTut6NjErdz94Ap8VB1ekcg4WSD+7sI7Nmv6kt2rdPoe363nUdjUbRBzHNWhLzraBw==
   dependencies:
     "@glimmer/di" "^0.1.9"
     "@glimmer/env" "^0.1.7"
@@ -1603,7 +3336,7 @@
 "@glimmer/di@^0.1.9":
   version "0.1.11"
   resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280"
-  integrity sha512-moRwafNDwHTnTHzyyZC9D+mUSvYrs1Ak0tRPjjmCghdoHHIvMshVbEnwKb/1WmW5CUlKc2eL9rlAV32n3GiItg==
+  integrity sha1-poeMB6E6LCx2/N5ZilyXY3v8QoA=
 
 "@glimmer/encoder@^0.42.2":
   version "0.42.2"
@@ -1616,19 +3349,19 @@
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
-  integrity sha512-JKF/a9I9jw6fGoz8kA7LEQslrwJ5jms5CXhu/aqkBWk+PmZ6pTl8mlb/eJ/5ujBGTiQzBhy5AIWF712iA+4/mw==
+  integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.65.4":
-  version "0.65.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.65.4.tgz#1da1d59dd4260ce912c40e474cd39c2e82de51b8"
-  integrity sha512-RSYCPG/uVR5XCDcPREBclncU7R0zkjACbADP+n3FWAH1TfWbXRMDIkvO/ZlwHkjHoCZf6tIM6p5S/MoFzfJEJA==
+"@glimmer/global-context@0.65.2":
+  version "0.65.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.65.2.tgz#6c522dbe0996de2ea308c257492a3782620ed2ee"
+  integrity sha512-BUWgPmPoWb6ILnJxvG0WgASJ9RVjhd3wSZwEpUIVGdOc9CHfD+4WhpYJNjPPoYMbq2NS5B6QXT1MP66hyGqq8Q==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.65.4":
-  version "0.65.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.65.4.tgz#d298cc2b12b8ebcf269f39246ca7ab92816f6680"
-  integrity sha512-R0kby79tGNKZOojVJa/7y0JH9Eq4SV+L1s6GcZy30QUZ1g1AAGS5XwCIXc9Sc09coGcv//q+6NLeSw7nlx1y4A==
+"@glimmer/interfaces@0.65.2":
+  version "0.65.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.65.2.tgz#9630e39c0f66ad166e7c617579cee8d858bf3653"
+  integrity sha512-/YdkmFFB4c7TAF71fhsQCLM1HUOuYp19bnKv+gAdlK3R2TooOpfg+ijoaAzI9WXgTK9V6zA5SE42ncLREBRGdQ==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
@@ -1659,15 +3392,15 @@
     "@glimmer/util" "^0.42.2"
 
 "@glimmer/reference@^0.65.0":
-  version "0.65.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.65.4.tgz#bbc8becd6a1bf01fc189b6489e27446437194711"
-  integrity sha512-yuRVE4qyqrlCndDMrHKDWUbDmGDCjPzsFtlTmxxnhDMJAdQsnr2cRLITHvQRDm1tXfigVvyKnomeuYhRRbBqYQ==
+  version "0.65.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.65.2.tgz#9dae205ee48d7eb08042f7bf805cda4e0303c0f8"
+  integrity sha512-koGW9mGyFhVKykDrINdiqD9l/Q8TFv2okmrTvCFleS9+2kJ56x3V3wa5xQU2cRIAewkbXCWNiNbyDz5EVq9alw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.65.4"
-    "@glimmer/interfaces" "0.65.4"
-    "@glimmer/util" "0.65.4"
-    "@glimmer/validator" "0.65.4"
+    "@glimmer/global-context" "0.65.2"
+    "@glimmer/interfaces" "0.65.2"
+    "@glimmer/util" "0.65.2"
+    "@glimmer/validator" "0.65.2"
 
 "@glimmer/runtime@^0.42.1":
   version "0.42.2"
@@ -1693,30 +3426,30 @@
     simple-html-tokenizer "^0.5.8"
 
 "@glimmer/syntax@^0.65.0":
-  version "0.65.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.65.4.tgz#49164de5dc9e8b67084ec009bdd865e379d8a971"
-  integrity sha512-y+/C3e8w96efk3a/Z5If9o4ztKJwrr8RtDpbhV2J8X+DUsn5ic2N3IIdlThbt/Zn6tkP1K3dY6uaFUx3pGTvVQ==
+  version "0.65.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.65.2.tgz#7aa66e5da0d48f0d67f9841201e8ca91d350674a"
+  integrity sha512-cfAqRgka8EVhDgDJKu3d1WMOZLJu1H+tuOb4J4LutcbYRswLYkvPYED2UA8Bw6oekpN34GYFRzwb/JODAWNBpA==
   dependencies:
-    "@glimmer/interfaces" "0.65.4"
-    "@glimmer/util" "0.65.4"
+    "@glimmer/interfaces" "0.65.2"
+    "@glimmer/util" "0.65.2"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/tracking@^1.0.0", "@glimmer/tracking@^1.0.1", "@glimmer/tracking@^1.0.4":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-1.1.2.tgz#74e71be07b0a7066518d24044d2665d0cf8281eb"
-  integrity sha512-cyV32zsHh+CnftuRX84ALZpd2rpbDrhLhJnTXn9W//QpqdRZ5rdMsxSY9fOsj0CKEc706tmEU299oNnDc0d7tA==
+"@glimmer/tracking@^1.0.0", "@glimmer/tracking@^1.0.1", "@glimmer/tracking@^1.0.2", "@glimmer/tracking@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-1.0.4.tgz#f1bc1412fe5e2236d0f8d502994a8f88af1bbb21"
+  integrity sha512-F+oT8I55ba2puSGIzInmVrv/8QA2PcK1VD+GWgFMhF6WC97D+uZX7BFg+a3s/2N4FVBq5KHE+QxZzgazM151Yw==
   dependencies:
     "@glimmer/env" "^0.1.7"
     "@glimmer/validator" "^0.44.0"
 
-"@glimmer/util@0.65.4":
-  version "0.65.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.65.4.tgz#e464145078f3f40da9013ff2590a6016515455d2"
-  integrity sha512-aofe+rdBhkREKP2GZta6jy1UcbRRMfWx7M18zxGxspPoeD08NscD04Kx+WiOKXmC1TcrfITr8jvqMfrKrMzYWQ==
+"@glimmer/util@0.65.2":
+  version "0.65.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.65.2.tgz#da9c6fa68a117ac1cb74fc79dad3eaa40d9cd4cb"
+  integrity sha512-xLjmGBSCTfDhi4tskVzg1M/Ii90wPL711O3TNLZF//ztv8SFRGNzh73oVbBzdYmEWR1OdED73ZTYL5MGzqBWLw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.65.4"
+    "@glimmer/interfaces" "0.65.2"
     "@simple-dom/interface" "^1.4.0"
 
 "@glimmer/util@^0.42.2":
@@ -1729,23 +3462,23 @@
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.44.0.tgz#45df98d73812440206ae7bda87cfe04aaae21ed9"
   integrity sha512-duAsm30uVK9jSysElCbLyU6QQYO2X9iLDLBIBUcCqck9qN1o3tK2qWiHbGK5d6g8E2AJ4H88UrfElkyaJlGrwg==
 
-"@glimmer/validator@0.65.4", "@glimmer/validator@^0.65.0":
-  version "0.65.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.65.4.tgz#12c27a9a63706c60e6499fd687940e9d1affb32c"
-  integrity sha512-0YUjAyo45DF5JkQxdv5kHn96nMNhvZiEwsAD4Jme0kk5Q9MQcPOUtN76pQAS4f+C6GdF9DeUr2yGXZLFMmb+LA==
+"@glimmer/validator@0.65.2", "@glimmer/validator@^0.65.0":
+  version "0.65.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.65.2.tgz#a3e0dc737b0ff73e23f0444d9e45c5bb202c3454"
+  integrity sha512-IQxvCueyORlwa5kDd0AwFvVLYAaIKvT4EeMvOCqOp/jJ32dGGSXG++V37UY0cYUc9Ir3gTPE7bE9/0piTXSdag==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.65.4"
+    "@glimmer/global-context" "0.65.2"
 
 "@glimmer/validator@^0.44.0":
   version "0.44.0"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.44.0.tgz#03d127097dc9cb23052cdb7fcae59d0a9dca53e1"
   integrity sha512-i01plR0EgFVz69GDrEuFgq1NheIjZcyTy3c7q+w7d096ddPVeVcRzU3LKaqCfovvLJ+6lJx40j45ecycASUUyw==
 
-"@glimmer/vm-babel-plugins@0.80.3":
-  version "0.80.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.3.tgz#434b62172318cac43830d3ac29818cf2c5f111c1"
-  integrity sha512-9ej6xlm5MzHBJ5am2l0dbbn8Z0wJoYoMpM8FcrGMlUP6SPMLWxvxpMsApgQo8u6dvZRCjR3/bw3fdf7GOy0AFw==
+"@glimmer/vm-babel-plugins@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.78.2.tgz#b530a19f54da385c7099a22cf348e9062d186838"
+  integrity sha512-GSEf16h6OCtKx7PsSvD21cLXZuVc6swW2rSOAvfLeZco1DEWMRgYTwkCkColydKZcQ3gvwbPBeYwTC2K6tlnjg==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
@@ -1783,31 +3516,25 @@
     faker "^4.1.0"
     js-yaml "^3.13.1"
 
-"@hashicorp/design-system-components@^1.6.0":
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/@hashicorp/design-system-components/-/design-system-components-1.7.3.tgz#27c15baf2abec67a7126cb63e7126da867196a9d"
-  integrity sha512-c6p8bl6BqWK4sx1EgKB0/Il2deIDy7CCwFFWrOkXHLHMLZQDL5IUXOrqcAQl5Q0L2MkoSc8P6cC90DU4kCbihg==
-  dependencies:
-    "@hashicorp/design-system-tokens" "^1.4.1"
-    "@hashicorp/ember-flight-icons" "^3.0.2"
-    dialog-polyfill "^0.5.6"
-    ember-auto-import "^2.6.0"
-    ember-cached-decorator-polyfill "^0.1.4"
+"@hashicorp/design-system-components@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@hashicorp/design-system-components/-/design-system-components-1.0.4.tgz#e258cad1a41b00db3363db25bfdafaa598326b98"
+  integrity sha512-aaOncgPH4yDEvQuFfOa/cwAOttxwbaEdaENEl+88EOi/HLUe0mdS2HgpC96w3sWhedE/xylCgSHz0DemIj5dJQ==
+  dependencies:
+    "@hashicorp/design-system-tokens" "^1.0.0"
+    "@hashicorp/ember-flight-icons" "^2.0.12"
+    ember-auto-import "^2.4.1"
     ember-cli-babel "^7.26.11"
-    ember-cli-htmlbars "^6.2.0"
+    ember-cli-htmlbars "^6.0.1"
     ember-cli-sass "^10.0.1"
-    ember-composable-helpers "^4.5.0"
-    ember-focus-trap "^1.0.1"
     ember-keyboard "^8.1.0"
     ember-named-blocks-polyfill "^0.2.5"
-    ember-style-modifier "^0.8.0"
-    ember-truth-helpers "^3.0.0"
-    sass "^1.58.3"
+    sass "^1.43.4"
 
-"@hashicorp/design-system-tokens@^1.0.0", "@hashicorp/design-system-tokens@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@hashicorp/design-system-tokens/-/design-system-tokens-1.4.1.tgz#461ee2ff7ccc46eb83098c30c20c6bba33e49cd0"
-  integrity sha512-e5bolI2Ch1+AW2/tQrkHG6QPx4g1oONum36CfhBmX4gDChpAVoBbTG2BT+XnlBJOM5vk1uuL39ysM5QSn/BZYQ==
+"@hashicorp/design-system-tokens@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@hashicorp/design-system-tokens/-/design-system-tokens-1.0.0.tgz#06ab55873ef444b0958a5192db310278c6501f0b"
+  integrity sha512-akziX9jiHnQ8KfJA6s8l+98Ukz30C5Lw7BpSPeTduOmdOlJv1uP7w4TV0hC6VIDMDrJrxIF5Y/HnpSCdQGlxQA==
 
 "@hashicorp/ember-cli-api-double@^4.0.0":
   version "4.0.0"
@@ -1824,25 +3551,39 @@
     pretender "^3.2.0"
     recursive-readdir-sync "^1.0.6"
 
-"@hashicorp/ember-flight-icons@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@hashicorp/ember-flight-icons/-/ember-flight-icons-3.0.2.tgz#8d884c07842a6c88df18ca680d7883a59222a2ba"
-  integrity sha512-WomQg1hw/IHA1N9hC77WbTNazVXqu2RdRoaVCGT99NTXQ4S7Bw7vhHheR4JAgt10ksMZFI3X/bJVHxFfjUCkSQ==
+"@hashicorp/ember-flight-icons@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@hashicorp/ember-flight-icons/-/ember-flight-icons-2.0.12.tgz#788adf7a4fedc468d612d35b604255df948f4012"
+  integrity sha512-8fHPGaSpMkr5dLWaruwbq9INwZCi2EyTof/TR/dL8PN4UbCuY+KXNqG0lLIKNGFFTj09B1cO303m5GUfKKDGKQ==
   dependencies:
-    "@hashicorp/flight-icons" "^2.12.0"
-    ember-auto-import "^2.4.2"
+    "@hashicorp/flight-icons" "^2.10.0"
     ember-cli-babel "^7.26.11"
-    ember-cli-htmlbars "^6.1.0"
+    ember-cli-htmlbars "^6.0.1"
 
-"@hashicorp/flight-icons@^2.12.0":
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-2.12.0.tgz#48bc21f21678668ffe9147b181a2991d8b151fc7"
-  integrity sha512-PhjTTHCjoq4EJirifbxLxnxXnCRf1NUAYZ1WnFW8i0yOmmax6fgjsJRPlf0VIGsR8R7isFpjuy6gJ5c7mNhE0w==
+"@hashicorp/ember-flight-icons@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@hashicorp/ember-flight-icons/-/ember-flight-icons-3.0.0.tgz#fddeb8adfb036aa3573c55b7236b34172b49cba9"
+  integrity sha512-+QrV38Ix9dWLwMzdVcMcSmFfeSVGvWvB+3OVBq3ltOTmnoLPIAx8LT9UDZUZ1wa65ciO+a1YzLMmwWnQgX/r9Q==
+  dependencies:
+    "@hashicorp/flight-icons" "^2.11.0"
+    ember-auto-import "^2.4.1"
+    ember-cli-babel "^7.26.11"
+    ember-cli-htmlbars "^6.0.1"
+
+"@hashicorp/flight-icons@^2.10.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-2.10.0.tgz#24b03043bacda16e505200e6591dfef896ddacf1"
+  integrity sha512-jYUA0M6Tz+4RAudil+GW/fHbhZPcKCiIZZAguBDviqbLneMkMgPOBgbXWCGWsEQ1fJzP2cXbUaio8L0aQZPWQw==
+
+"@hashicorp/flight-icons@^2.11.0":
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-2.11.0.tgz#1500be99a42ee8512e7caece4bdae60ce8790577"
+  integrity sha512-teFkUY2di63JZ2gsegQgS+3f5YEP+GPuycB1Z2O+weInIrL33Ds0/J+lxFCmi2vkPAeY5xOnsclHYnhU6xOSmA==
 
 "@html-next/vertical-collection@^4.0.0":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@html-next/vertical-collection/-/vertical-collection-4.0.2.tgz#7e9885423eb8c445bce0cc110ac3be281ca6ff87"
-  integrity sha512-S8cgntEDdXrOwdylVGDh1BFe+nX5uuUzzb3teh1FE++/kbqsOfUpXOYRUsEzsqb0fRqcm6eLxvtNb282Zr67rQ==
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@html-next/vertical-collection/-/vertical-collection-4.0.0.tgz#b3b3d52358e15e7ed46e028d12424dab994690ed"
+  integrity sha512-/c4y6ASmkMwyG+rcoXH3kx50LiK2MuPX0bsktd+j9LhOD6zkJyT4wJ73m20dCEvxjgwA/nCQ8hj3lApQlHG0CQ==
   dependencies:
     babel6-plugin-strip-class-callcheck "^6.0.0"
     broccoli-funnel "^3.0.8"
@@ -1900,7 +3641,7 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/resolve-uri@3.1.0":
+"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
@@ -1923,7 +3664,15 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
+"@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774"
+  integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@jridgewell/trace-mapping@^0.3.17":
   version "0.3.17"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
   integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
@@ -1931,17 +3680,10 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
-"@lit-labs/ssr-dom-shim@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.0.0.tgz#427e19a2765681fd83411cd72c55ba80a01e0523"
-  integrity sha512-ic93MBXfApIFTrup4a70M/+ddD8xdt2zxxj9sRwHQzhS9ag/syqkD8JPdTXsc1gUy2K8TTirhlCqyTEM/sifNw==
-
 "@lit/reactive-element@^1.2.1":
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.6.1.tgz#0d958b6d479d0e3db5fc1132ecc4fa84be3f0b93"
-  integrity sha512-va15kYZr7KZNNPZdxONGQzpUr+4sxVu7V/VG7a8mRfPPXUyhEYj5RzXCQmGrlP3tAh0L3HHm5AjBMFYRqlM9SA==
-  dependencies:
-    "@lit-labs/ssr-dom-shim" "^1.0.0"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.2.1.tgz#8620d7f0baf63e12821fa93c34d21e23477736f7"
+  integrity sha512-03FYfMguIWo9E1y1qcTpXzoO8Ukpn0j5o4GjNFq/iHqJEPY6pYopsU44e7NSFIgCTorr8wdUU5PfVy8VeD6Rwg==
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
@@ -1951,18 +3693,18 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@nodelib/fs.scandir@2.1.5":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
-  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+"@nodelib/fs.scandir@2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
+  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
   dependencies:
-    "@nodelib/fs.stat" "2.0.5"
+    "@nodelib/fs.stat" "2.0.4"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
-  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
+  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
 
 "@nodelib/fs.stat@^1.1.2":
   version "1.1.3"
@@ -1970,17 +3712,17 @@
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
 "@nodelib/fs.walk@^1.2.3":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
-  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
+  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
   dependencies:
-    "@nodelib/fs.scandir" "2.1.5"
+    "@nodelib/fs.scandir" "2.1.4"
     fastq "^1.6.0"
 
-"@popperjs/core@^2.9.0":
-  version "2.11.6"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45"
-  integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==
+"@popperjs/core@^2.8.3":
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.1.tgz#7f554e7368c9ab679a11f4a042ca17149d70cf12"
+  integrity sha512-DvJbbn3dUgMxDnJLH+RZQPnXak1h4ZVYQ7CWiFWjQwBFkVajT4rfw2PdpHLTSTwxrYfnoEXkuBiwkDm6tPMQeA==
 
 "@simple-dom/interface@^1.4.0":
   version "1.4.0"
@@ -1988,9 +3730,9 @@
   integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA==
 
 "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.8.1":
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9"
-  integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b"
+  integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==
   dependencies:
     type-detect "4.0.8"
 
@@ -2011,48 +3753,46 @@
     type-detect "^4.0.8"
 
 "@sinonjs/text-encoding@^0.7.1":
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz#5981a8db18b56ba38ef0efb7d995b12aa7b51918"
-  integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
+  integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
 
 "@socket.io/component-emitter@~3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
   integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
 
-"@textlint/ast-node-types@^12.6.1":
-  version "12.6.1"
-  resolved "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-12.6.1.tgz#35ecefe74e701d7f632c083d4fda89cab1b89012"
-  integrity sha512-uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA==
+"@textlint/ast-node-types@^4.2.5":
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-4.4.2.tgz#d3fda5c9086baba04bc75440039ccf18415c8446"
+  integrity sha512-m5brKbI7UY/Q8sbIZ7z1KB8ls04nRILshz5fPQ4EZ04jL19qrrUHJR8A6nK3vJ/GelkDWl4I0VDYSAjLEFQV8g==
 
-"@textlint/markdown-to-ast@^12.1.1":
-  version "12.6.1"
-  resolved "https://registry.yarnpkg.com/@textlint/markdown-to-ast/-/markdown-to-ast-12.6.1.tgz#fcccb5733b3e76cd0db78a323763ab101f2d803b"
-  integrity sha512-T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ==
+"@textlint/markdown-to-ast@~6.1.7":
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/@textlint/markdown-to-ast/-/markdown-to-ast-6.1.7.tgz#7ed9561b577bcd5307c8ef82660bc568ce31647e"
+  integrity sha512-B0QtokeQR4a9+4q0NQr8T9l7A1fFihTN5Ze57tVgqW+3ymzXEouh8DvPHeNQ4T6jEkAThvdjk95mxAMpGRJ79w==
   dependencies:
-    "@textlint/ast-node-types" "^12.6.1"
-    debug "^4.3.4"
-    mdast-util-gfm-autolink-literal "^0.1.3"
-    remark-footnotes "^3.0.0"
-    remark-frontmatter "^3.0.0"
-    remark-gfm "^1.0.0"
-    remark-parse "^9.0.0"
-    traverse "^0.6.7"
-    unified "^9.2.2"
-
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+    "@textlint/ast-node-types" "^4.2.5"
+    debug "^4.1.1"
+    remark-frontmatter "^1.2.0"
+    remark-parse "^5.0.0"
+    structured-source "^3.0.2"
+    traverse "^0.6.6"
+    unified "^6.1.6"
 
 "@types/body-parser@*":
-  version "1.19.2"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
-  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f"
+  integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
 
+"@types/broccoli-plugin@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@types/broccoli-plugin/-/broccoli-plugin-1.3.0.tgz#38f8462fecaebc4e09a32e4d4ed1b9808f75bbca"
+  integrity sha512-SLk4/hFc2kGvgwNFrpn2O1juxFOllcHAywvlo7VwxfExLzoz1GGJ0oIZCwj5fwSpvHw4AWpZjJ1fUvb62PDayQ==
+
 "@types/broccoli-plugin@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/broccoli-plugin/-/broccoli-plugin-3.0.0.tgz#290fda2270c47a568edfd0cefab8bb840d8bb7b2"
@@ -2061,21 +3801,21 @@
     broccoli-plugin "*"
 
 "@types/chai-as-promised@^7.1.2":
-  version "7.1.5"
-  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.5.tgz#6e016811f6c7a64f2eed823191c3a6955094e255"
-  integrity sha512-jStwss93SITGBwt/niYrkf2C+/1KTeZCZl1LaeezTlqppAKeoQC7jxyqYuP72sxBGKCIbw7oHgbYssIRzT5FCQ==
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.3.tgz#779166b90fda611963a3adbfd00b339d03b747bd"
+  integrity sha512-FQnh1ohPXJELpKhzjuDkPLR2BZCAqed+a6xV4MI/T3XzHfd2FlarfUGUdZYgqYe8oxkYn0fchHEeHfHqdZ96sg==
   dependencies:
     "@types/chai" "*"
 
 "@types/chai@*", "@types/chai@^4.2.9":
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.4.tgz#e913e8175db8307d78b4e8fa690408ba6b65dee4"
-  integrity sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==
+  version "4.2.15"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.15.tgz#b7a6d263c2cecf44b6de9a051cf496249b154553"
+  integrity sha512-rYff6FI+ZTKAPkJUoyz7Udq3GaoDZnxYDEvdEdFZASiA7PoErltHezDishqQiSDWrGxvxmplH304jyzQmjp0AQ==
 
 "@types/connect@*":
-  version "3.4.35"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
-  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+  version "3.4.34"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901"
+  integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==
   dependencies:
     "@types/node" "*"
 
@@ -2085,11 +3825,9 @@
   integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
 
 "@types/cors@^2.8.12":
-  version "2.8.13"
-  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.13.tgz#b8ade22ba455a1b8cb3b5d3f35910fd204f84f94"
-  integrity sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==
-  dependencies:
-    "@types/node" "*"
+  version "2.8.12"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
+  integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
 
 "@types/eslint-scope@^3.7.3":
   version "3.7.4"
@@ -2100,39 +3838,39 @@
     "@types/estree" "*"
 
 "@types/eslint@*":
-  version "8.21.1"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.21.1.tgz#110b441a210d53ab47795124dbc3e9bb993d1e7c"
-  integrity sha512-rc9K8ZpVjNcLs8Fp0dkozd5Pt2Apk1glO4Vgz8ix1u6yFByxfqo5Yavpy65o+93TAe24jr7v+eSBtFLvOQtCRQ==
+  version "8.4.6"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.6.tgz#7976f054c1bccfcf514bff0564c0c41df5c08207"
+  integrity sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
 "@types/estree@*":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
-  integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
+  version "0.0.46"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe"
+  integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==
 
 "@types/estree@^0.0.51":
   version "0.0.51"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
   integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
 
-"@types/express-serve-static-core@^4.17.33":
-  version "4.17.33"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543"
-  integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==
+"@types/express-serve-static-core@^4.17.18":
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d"
+  integrity sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
     "@types/range-parser" "*"
 
 "@types/express@^4.17.2":
-  version "4.17.17"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4"
-  integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"
+  integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==
   dependencies:
     "@types/body-parser" "*"
-    "@types/express-serve-static-core" "^4.17.33"
+    "@types/express-serve-static-core" "^4.17.18"
     "@types/qs" "*"
     "@types/serve-static" "*"
 
@@ -2144,66 +3882,68 @@
     "@types/node" "*"
 
 "@types/fs-extra@^8.1.0":
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.2.tgz#7125cc2e4bdd9bd2fc83005ffdb1d0ba00cca61f"
-  integrity sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg==
-  dependencies:
-    "@types/node" "*"
-
-"@types/glob@*":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
-  integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068"
+  integrity sha512-TcUlBem321DFQzBNuz8p0CLLKp0VvF/XH9E4KHNmgwyp4E3AfgI5cjiIVZWlbfThBop2qxFIh4+LeY6hVWWZ2w==
   dependencies:
-    "@types/minimatch" "^5.1.2"
     "@types/node" "*"
 
-"@types/glob@^7.1.1":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
-  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
+"@types/glob@*", "@types/glob@^7.1.1":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
+  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
   dependencies:
     "@types/minimatch" "*"
     "@types/node" "*"
 
 "@types/hast@^2.0.0":
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz#8aa5ef92c117d20d974a82bdfb6a648b08c0bafc"
-  integrity sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.1.tgz#b16872f2a6144c7025f296fb9636a667ebb79cd9"
+  integrity sha512-viwwrB+6xGzw+G1eWpF9geV3fnsDgXqHG+cqgiHrvQfDUW5hzhCyV7Sy3UJxhfRFBsgky2SSW33qi/YrIkjX5Q==
   dependencies:
     "@types/unist" "*"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
 
+"@types/json-schema@^7.0.5":
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
+  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
+
 "@types/mdast@^3.0.0", "@types/mdast@^3.0.3":
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af"
-  integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"
+  integrity sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==
   dependencies:
     "@types/unist" "*"
 
-"@types/mime@*":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
-  integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
-"@types/minimatch@*", "@types/minimatch@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
-  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
+"@types/minimatch@*", "@types/minimatch@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
-"@types/minimatch@^3.0.3", "@types/minimatch@^3.0.4":
+"@types/minimatch@^3.0.4":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
-"@types/node@*", "@types/node@>=10.0.0":
-  version "18.15.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.0.tgz#286a65e3fdffd691e170541e6ecb0410b16a38be"
-  integrity sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w==
+"@types/node@*":
+  version "14.14.35"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.35.tgz#42c953a4e2b18ab931f72477e7012172f4ffa313"
+  integrity sha512-Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag==
+
+"@types/node@>=10.0.0":
+  version "18.7.15"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.15.tgz#20ae1ec80c57ee844b469f968a1cd511d4088b29"
+  integrity sha512-XnjpaI8Bgc3eBag2Aw4t2Uj/49lLBSStHWfqKvIuXD7FIrZyMLWp8KuAFHAqxMZYTF9l08N1ctUn9YNybZJVmQ==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -2211,29 +3951,29 @@
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
 "@types/qs@*":
-  version "6.9.7"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
-  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
+  version "6.9.6"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1"
+  integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==
 
 "@types/range-parser@*":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
-  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
+  integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
 
 "@types/rimraf@^2.0.2", "@types/rimraf@^2.0.3":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.5.tgz#368fb04d59630b727fc05a74d2ca557f64a8ef98"
-  integrity sha512-YyP+VfeaqAyFmXoTh3HChxOQMyjByRMsHU7kc5KOJkSlXudhMhQIALbYV7rHh/l8d2lX3VUQzprrcAgWdRuU8g==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
+  integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
   dependencies:
     "@types/glob" "*"
     "@types/node" "*"
 
 "@types/serve-static@*":
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d"
-  integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==
+  version "1.13.9"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e"
+  integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==
   dependencies:
-    "@types/mime" "*"
+    "@types/mime" "^1"
     "@types/node" "*"
 
 "@types/symlink-or-copy@^1.2.0":
@@ -2242,9 +3982,9 @@
   integrity sha512-Lja2xYuuf2B3knEsga8ShbOdsfNOtzT73GyJmZyY7eGl2+ajOqrs8yM5ze0fsSoYwvA6bw7/Qr7OZ7PEEmYwWg==
 
 "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
-  integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
+  integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
 
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
@@ -2513,14 +4253,14 @@
     "@xtuc/long" "4.2.2"
 
 "@xmldom/xmldom@^0.8.0":
-  version "0.8.6"
-  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.6.tgz#8a1524eb5bd5e965c1e3735476f0262469f71440"
-  integrity sha512-uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg==
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.2.tgz#b695ff674e8216efa632a3d36ad51ae9843380c0"
+  integrity sha512-+R0juSseERyoPvnBQ/cZih6bpF7IpCXlWbHRoCRzYzqpz6gWHOgf8o4MOEf6KBVuOyqU+gCNLkCWVIJAro8XyQ==
 
 "@xstate/fsm@^1.4.0":
-  version "1.6.5"
-  resolved "https://registry.yarnpkg.com/@xstate/fsm/-/fsm-1.6.5.tgz#f599e301997ad7e3c572a0b1ff0696898081bea5"
-  integrity sha512-b5o1I6aLNeYlU/3CPlj/Z91ybk1gUsKT+5NAJI+2W4UjvS5KLG28K9v5UvNoFVjHV8PajVZ00RH3vnjyQO7ZAw==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@xstate/fsm/-/fsm-1.6.0.tgz#589cefcef426d5bf3d654edbca89e84e3b637c5f"
+  integrity sha512-YJpzKLPxMBUUQCTkjIbicsax6svTbPz5ykTkotIaa3kOoTnBJ4CWfC0cSQuMg7FAsfV2XWOuEsFq0dbmY7NtXg==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -2535,32 +4275,32 @@
 JSV@^4.0.x:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
-  integrity sha512-ZJ6wx9xaKJ3yFUhq5/sk82PJMuUyLk277I8mQeyDgCTjGdjWJIvPfaU5LIXaMuaN2UO1X3kZH4+lgphublZUHw==
+  integrity sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=
 
 a11y-dialog@^6.0.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/a11y-dialog/-/a11y-dialog-6.1.1.tgz#947abaf7542fdefb466afe372a7590ff8545a2e5"
-  integrity sha512-bMvrxCupDFZJVHNVZFibO+qL6/BMmGI3d9oRIKpzwFpuidwe9czIrHXw256dieA0nCRadqm0GlMaK2JfqcLDkA==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/a11y-dialog/-/a11y-dialog-6.1.0.tgz#e7855d5116f235d7d9f8b01cfe606247f579064f"
+  integrity sha512-jopJLSBJrEnFgigxXk23j+QRqo5O4kHyitucFGdprZPuJnJ5nIgYfTIeNX2ZbsyybHCNPrtquCyxYvQgrH0mfg==
   dependencies:
     focusable-selectors "^0.3.0"
 
 abab@^2.0.3, abab@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
-  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
+  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
 
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
-  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
   dependencies:
-    mime-types "~2.1.34"
-    negotiator "0.6.3"
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
 
 acorn-globals@^6.0.0:
   version "6.0.0"
@@ -2576,9 +4316,9 @@ acorn-import-assertions@^1.7.6:
   integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
 
 acorn-jsx@^5.3.1:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
-  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
 acorn-node@^1.8.2:
   version "1.8.2"
@@ -2599,22 +4339,20 @@ acorn@^6.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-acorn@^7.0.0, acorn@^7.1.1, acorn@^7.4.0:
+acorn@^7.0.0, acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.2.4, acorn@^8.5.0, acorn@^8.7.1:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+acorn@^8.0.5:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz#52311fd7037ae119cbb134309e901aa46295b3fe"
+  integrity sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==
 
-agent-base@6:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
-  dependencies:
-    debug "4"
+acorn@^8.5.0, acorn@^8.7.1:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
+  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
 aggregate-error@^3.0.0:
   version "3.1.0"
@@ -2648,7 +4386,7 @@ ajv-keywords@^5.0.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2659,9 +4397,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
     uri-js "^4.2.2"
 
 ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
-  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
+  integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -2686,19 +4424,19 @@ amd-name-resolver@^1.3.1:
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
-anchor-markdown-header@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/anchor-markdown-header/-/anchor-markdown-header-0.6.0.tgz#908f2031281766f44ac350380ca0de77ab7065b8"
-  integrity sha512-v7HJMtE1X7wTpNFseRhxsY/pivP4uAJbidVhPT+yhz4i/vV1+qx371IXuV9V7bN6KjFtheLJxqaSm0Y/8neJTA==
+anchor-markdown-header@~0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/anchor-markdown-header/-/anchor-markdown-header-0.5.7.tgz#045063d76e6a1f9cd327a57a0126aa0fdec371a7"
+  integrity sha1-BFBj125qH5zTJ6V6ASaqD97Dcac=
   dependencies:
-    emoji-regex "~10.1.0"
+    emoji-regex "~6.1.0"
 
 ansi-colors@^4.1.1:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
-  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
 ansi-escapes@^3.2.0:
   version "3.2.0"
@@ -2706,31 +4444,36 @@ ansi-escapes@^3.2.0:
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
   dependencies:
-    type-fest "^0.21.3"
+    type-fest "^0.11.0"
 
 ansi-html@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-  integrity sha512-JoAxEa1DfP9m2xfB/y2r/aKcwXNlltr4+0QSBC4TrLfcxyvepX2Pv0t/xpgGV5bGsDzCYV8SzjWgyCW0T9yYbA==
+  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
 
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
-  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
 ansi-regex@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
-  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
 
 ansi-regex@^5.0.1:
   version "5.0.1"
@@ -2740,7 +4483,7 @@ ansi-regex@^5.0.1:
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
 ansi-styles@^3.0.0, ansi-styles@^3.2.1:
   version "3.2.1"
@@ -2759,19 +4502,26 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
 ansi-styles@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
-  integrity sha512-3iF4FIKdxaVYT3JqQuY3Wat/T2t7TRbbQ94Fu50ZUCbLy4TFbTzr90NOHQodQkNqmeEGCw8WbeP78WNi6SKYUA==
+  integrity sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=
 
-ansi-to-html@^0.6.15, ansi-to-html@^0.6.6:
+ansi-to-html@^0.6.15:
   version "0.6.15"
   resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.15.tgz#ac6ad4798a00f6aa045535d7f6a9cb9294eebea7"
   integrity sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==
   dependencies:
     entities "^2.0.0"
 
+ansi-to-html@^0.6.6:
+  version "0.6.14"
+  resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.14.tgz#65fe6d08bba5dd9db33f44a20aec331e0010dad8"
+  integrity sha512-7ZslfB1+EnFSDO5Ju+ue5Y6It19DRnZXWv8jrGHgIlPna5Mh4jz7BV5jCbQneXNFurQcKoolaaAjHtgSBfOIuA==
+  dependencies:
+    entities "^1.1.2"
+
 ansicolors@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
-  integrity sha512-tOIuy1/SK/dr94ZA0ckDohKXNeBNqZ4us6PjMVLs5h1w2GBB6uPtOknp2+VF4F/zcy9LI70W+Z+pE2Soajky1w==
+  integrity sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8=
 
 anymatch@^2.0.0:
   version "2.0.0"
@@ -2781,10 +4531,18 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
+anymatch@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 anymatch@~3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
-  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
@@ -2792,7 +4550,7 @@ anymatch@~3.1.2:
 aot-test-generators@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/aot-test-generators/-/aot-test-generators-0.1.0.tgz#43f0f615f97cb298d7919c1b0b4e6b7310b03cd0"
-  integrity sha512-PKyBQsPgkrCbUZS0PexdnyS3pVfYe4U1dLLQOf3is5RcYSaxbA7fsnnj6i8hcubsz+iS0miGPSJlONv/tXjfiA==
+  integrity sha1-Q/D2Ffl8spjXkZwbC05rcxCwPNA=
   dependencies:
     jsesc "^2.5.0"
 
@@ -2815,9 +4573,9 @@ are-we-there-yet@^3.0.0:
     readable-stream "^3.6.0"
 
 are-we-there-yet@~1.1.2:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
-  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -2842,7 +4600,7 @@ argparse@^2.0.1:
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.1.0:
   version "1.1.0"
@@ -2852,39 +4610,44 @@ arr-flatten@^1.1.0:
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
-  integrity sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA==
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
+
+array-filter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
+  integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
 
 array-find-index@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
 array-range@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/array-range/-/array-range-1.0.1.tgz#f56e46591843611c6a56f77ef02eda7c50089bfc"
-  integrity sha512-shdaI1zT3CVNL2hnx9c0JMc0ZogGaxDs5e85akgHWKYa0yVbIyp06Ind3dVkTj/uuFrzaHBOyqFzo+VV6aXgtA==
+  integrity sha1-9W5GWRhDYRxqVvd+8C7afFAIm/w=
 
 array-to-error@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-to-error/-/array-to-error-1.1.1.tgz#d68812926d14097a205579a667eeaf1856a44c07"
-  integrity sha512-kqcQ8s7uQfg3UViYON3kCMcck3A9exxgq+riVuKy08Mx00VN4EJhK30L2VpjE58LQHKhcE/GRpvbVUhqTvqzGQ==
+  integrity sha1-1ogSkm0UCXogVXmmZ+6vGFakTAc=
   dependencies:
     array-to-sentence "^1.1.0"
 
 array-to-sentence@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/array-to-sentence/-/array-to-sentence-1.1.0.tgz#c804956dafa53232495b205a9452753a258d39fc"
-  integrity sha512-YkwkMmPA2+GSGvXj1s9NZ6cc2LBtR+uSeWTy2IGi5MR1Wag4DdrcjTxA/YV/Fw+qKlBeXomneZgThEbm/wvZbw==
+  integrity sha1-yASVba+lMjJJWyBalFJ1OiWNOfw=
 
 array-union@^2.1.0:
   version "2.1.0"
@@ -2894,22 +4657,12 @@ array-union@^2.1.0:
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
-
-array.prototype.every@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.every/-/array.prototype.every-1.1.4.tgz#2762daecd9cec87cb63f3ca6be576817074a684e"
-  integrity sha512-Aui35iRZk1HHLRAyF7QP0KAnOnduaQ6fo6k1NVWfRc0xTs2AZ70ytlXvOmkC6Di4JmUs2Wv3DYzGtCQFSk5uGg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    is-string "^1.0.7"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 asap@^2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 asn1.js@^5.2.0:
   version "5.4.1"
@@ -2921,11 +4674,23 @@ asn1.js@^5.2.0:
     minimalistic-assert "^1.0.0"
     safer-buffer "^2.1.0"
 
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
+
 assert-never@^1.1.0, assert-never@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
   integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
 
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
 assert@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
@@ -2937,7 +4702,7 @@ assert@^1.1.1:
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 ast-types@0.13.3:
   version "0.13.3"
@@ -2976,9 +4741,9 @@ async-disk-cache@^2.0.0:
     username-sync "^1.0.2"
 
 async-each@^1.0.1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.6.tgz#52f1d9403818c179b7561e11a5d1b77eb2160e77"
-  integrity sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
 async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
   version "1.0.5"
@@ -2988,7 +4753,14 @@ async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
     async "^2.4.1"
     debug "^2.6.8"
 
-async@^2.4.1, async@^2.6.4:
+async@^2.4.1:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
+
+async@^2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
   integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
@@ -2998,12 +4770,12 @@ async@^2.4.1, async@^2.6.4:
 async@~0.2.9:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
-  integrity sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==
+  integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 at-least-node@^1.0.0:
   version "1.0.0"
@@ -3016,26 +4788,38 @@ atob@^2.1.2:
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^10.4.8:
-  version "10.4.14"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.14.tgz#e28d49902f8e759dd25b153264e862df2705f79d"
-  integrity sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==
+  version "10.4.8"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.8.tgz#92c7a0199e1cfb2ad5d9427bd585a3d75895b9e5"
+  integrity sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw==
   dependencies:
-    browserslist "^4.21.5"
-    caniuse-lite "^1.0.30001464"
+    browserslist "^4.21.3"
+    caniuse-lite "^1.0.30001373"
     fraction.js "^4.2.0"
     normalize-range "^0.1.2"
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
-available-typed-arrays@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
-  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+available-typed-arrays@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5"
+  integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==
+  dependencies:
+    array-filter "^1.0.0"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
 babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
@@ -3095,7 +4879,7 @@ babel-generator@^6.26.0:
 babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
-  integrity sha512-gCtfYORSG1fUMX4kKraymq607FWgMWg+j42IFPc18kFQEsmtaibP4UrqsXt8FlEJle25HUd4tsoDR7H2wDhe9Q==
+  integrity sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=
   dependencies:
     babel-helper-explode-assignable-expression "^6.24.1"
     babel-runtime "^6.22.0"
@@ -3104,7 +4888,7 @@ babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
 babel-helper-call-delegate@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
-  integrity sha512-RL8n2NiEj+kKztlrVJM9JT1cXzzAdvWFh76xh/H1I4nKwunzE4INBXn8ieCZ+wh4zWszZk7NBS1s/8HR5jDkzQ==
+  integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=
   dependencies:
     babel-helper-hoist-variables "^6.24.1"
     babel-runtime "^6.22.0"
@@ -3114,7 +4898,7 @@ babel-helper-call-delegate@^6.24.1:
 babel-helper-define-map@^6.24.1:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
-  integrity sha512-bHkmjcC9lM1kmZcVpA5t2om2nzT/xiZpo6TJq7UlZ3wqKfzia4veeXbIhKvJXAMzhhEBd3cR1IElL5AenWEUpA==
+  integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=
   dependencies:
     babel-helper-function-name "^6.24.1"
     babel-runtime "^6.26.0"
@@ -3124,7 +4908,7 @@ babel-helper-define-map@^6.24.1:
 babel-helper-explode-assignable-expression@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
-  integrity sha512-qe5csbhbvq6ccry9G7tkXbzNtcDiH4r51rrPUbwwoTzZ18AqxWYRZT6AOmxrpxKnQBW0pYlBI/8vh73Z//78nQ==
+  integrity sha1-8luCz33BBDPFX3BZLVdGQArCLKo=
   dependencies:
     babel-runtime "^6.22.0"
     babel-traverse "^6.24.1"
@@ -3133,7 +4917,7 @@ babel-helper-explode-assignable-expression@^6.24.1:
 babel-helper-function-name@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
-  integrity sha512-Oo6+e2iX+o9eVvJ9Y5eKL5iryeRdsIkwRYheCuhYdVHsdEQysbc2z2QkqCLIYnNxkT5Ss3ggrHdXiDI7Dhrn4Q==
+  integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=
   dependencies:
     babel-helper-get-function-arity "^6.24.1"
     babel-runtime "^6.22.0"
@@ -3144,7 +4928,7 @@ babel-helper-function-name@^6.24.1:
 babel-helper-get-function-arity@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
-  integrity sha512-WfgKFX6swFB1jS2vo+DwivRN4NB8XUdM3ij0Y1gnC21y1tdBoe6xjVnd7NSI6alv+gZXCtJqvrTeMW3fR/c0ng==
+  integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
@@ -3152,7 +4936,7 @@ babel-helper-get-function-arity@^6.24.1:
 babel-helper-hoist-variables@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
-  integrity sha512-zAYl3tqerLItvG5cKYw7f1SpvIxS9zi7ohyGHaI9cgDUjAT6YcY9jIEH5CstetP5wHIVSceXwNS7Z5BpJg+rOw==
+  integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY=
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
@@ -3160,7 +4944,7 @@ babel-helper-hoist-variables@^6.24.1:
 babel-helper-optimise-call-expression@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
-  integrity sha512-Op9IhEaxhbRT8MDXx2iNuMgciu2V8lDvYCNQbDGjdBNCjaMvyLf4wl4A3b8IgndCyQF8TwfgsQ8T3VD8aX1/pA==
+  integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
@@ -3168,7 +4952,7 @@ babel-helper-optimise-call-expression@^6.24.1:
 babel-helper-regex@^6.24.1:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
-  integrity sha512-VlPiWmqmGJp0x0oK27Out1D+71nVVCTSdlbhIVoaBAj2lUgrNjBCRR9+llO4lTSb2O4r7PJg+RobRkhBrf6ofg==
+  integrity sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=
   dependencies:
     babel-runtime "^6.26.0"
     babel-types "^6.26.0"
@@ -3177,7 +4961,7 @@ babel-helper-regex@^6.24.1:
 babel-helper-remap-async-to-generator@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
-  integrity sha512-RYqaPD0mQyQIFRu7Ho5wE2yvA/5jxqCIj/Lv4BXNq23mHYu/vxikOy2JueLiBxQknwapwrJeNCesvY0ZcfnlHg==
+  integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=
   dependencies:
     babel-helper-function-name "^6.24.1"
     babel-runtime "^6.22.0"
@@ -3188,7 +4972,7 @@ babel-helper-remap-async-to-generator@^6.24.1:
 babel-helper-replace-supers@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
-  integrity sha512-sLI+u7sXJh6+ToqDr57Bv973kCepItDhMou0xCP2YPVmR1jkHSCY+p1no8xErbV1Siz5QE8qKT1WIwybSWlqjw==
+  integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo=
   dependencies:
     babel-helper-optimise-call-expression "^6.24.1"
     babel-messages "^6.23.0"
@@ -3200,7 +4984,7 @@ babel-helper-replace-supers@^6.24.1:
 babel-helpers@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
-  integrity sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ==
+  integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
   dependencies:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
@@ -3210,32 +4994,32 @@ babel-import-util@^0.2.0:
   resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-0.2.0.tgz#b468bb679919601a3570f9e317536c54f2862e23"
   integrity sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==
 
-babel-import-util@^1.1.0, babel-import-util@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.3.0.tgz#dc9251ea39a7747bd586c1c13b8d785a42797f8e"
-  integrity sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g==
+babel-import-util@^1.1.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.2.2.tgz#1027560e143a4a68b1758e71d4fadc661614e495"
+  integrity sha512-8HgkHWt5WawRFukO30TuaL9EiDUOdvyKtDwLma4uBNeUSDbOO0/hiPfavrOWxSS6J6TKXfukWHZ3wiqZhJ8ONQ==
 
 babel-loader@^8.0.6, babel-loader@^8.1.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8"
-  integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
+  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
   dependencies:
     find-cache-dir "^3.3.1"
-    loader-utils "^2.0.0"
+    loader-utils "^1.4.0"
     make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  integrity sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-check-es2015-constants@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
-  integrity sha512-B1M5KBP29248dViEo1owyY32lk1ZSH2DaNNrXLGt8lyjjHm7pBqAdQ7VKUPR6EEDO323+OvT3MQXbCin8ooWdA==
+  integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=
   dependencies:
     babel-runtime "^6.22.0"
 
@@ -3253,6 +5037,13 @@ babel-plugin-debug-macros@^0.3.3, babel-plugin-debug-macros@^0.3.4:
   dependencies:
     semver "^5.3.0"
 
+babel-plugin-dynamic-import-node@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
+  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
+  dependencies:
+    object.assign "^4.1.0"
+
 babel-plugin-ember-data-packages-polyfill@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/babel-plugin-ember-data-packages-polyfill/-/babel-plugin-ember-data-packages-polyfill-0.1.2.tgz#21154c095ddc703722b1fb8bb06c126c0b6d77dc"
@@ -3267,19 +5058,22 @@ babel-plugin-ember-modules-api-polyfill@^2.6.0:
   dependencies:
     ember-rfc176-data "^0.3.13"
 
-babel-plugin-ember-modules-api-polyfill@^3.2.0, babel-plugin-ember-modules-api-polyfill@^3.5.0:
+babel-plugin-ember-modules-api-polyfill@^3.2.0, babel-plugin-ember-modules-api-polyfill@^3.4.0, babel-plugin-ember-modules-api-polyfill@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-3.5.0.tgz#27b6087fac75661f779f32e60f94b14d0e9f6965"
   integrity sha512-pJajN/DkQUnStw0Az8c6khVcMQHgzqWr61lLNtVeu0g61LRW0k9jyK7vaedrHDWGe/Qe8sxG5wpiyW9NsMqFzA==
   dependencies:
     ember-rfc176-data "^0.3.17"
 
-babel-plugin-ember-template-compilation@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.0.tgz#41d895874ba6119dd461f61993c16d1154bf8a57"
-  integrity sha512-d+4jaB2ik0rt9TH0K9kOlKJeRBHEb373FgFMcU9ZaJL2zYuVXe19bqy+cWlLpLf1tpOBcBG9QTlFBCoImlOt1g==
+babel-plugin-ember-template-compilation@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-1.0.1.tgz#64baf434ff1b751c6292936f8b9eb75a2f8149dc"
+  integrity sha512-V/kY6CDyUNrl5Kx6UPKUPhzSKNfdrxNii+S5zK4dgJvVyoxFv7Ykg06Ct/yskY0LkA4wUPdYN7JOBtYJwHk2sg==
   dependencies:
-    babel-import-util "^1.3.0"
+    babel-import-util "^0.2.0"
+    line-column "^1.0.2"
+    magic-string "^0.25.7"
+    string.prototype.matchall "^4.0.5"
 
 babel-plugin-filter-imports@^4.0.0:
   version "4.0.0"
@@ -3294,7 +5088,14 @@ babel-plugin-htmlbars-inline-precompile@^3.2.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.2.0.tgz#c4882ea875d0f5683f0d91c1f72e29a4f14b5606"
   integrity sha512-IUeZmgs9tMUGXYu1vfke5I18yYJFldFGdNFQOWslXTnDWXzpwPih7QFduUqvT+awDpDuNtXpdt5JAf43Q1Hhzg==
 
-babel-plugin-htmlbars-inline-precompile@^5.0.0, babel-plugin-htmlbars-inline-precompile@^5.2.1, babel-plugin-htmlbars-inline-precompile@^5.3.0:
+babel-plugin-htmlbars-inline-precompile@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-5.0.0.tgz#b3a3008bdedbd3543e745fc953769cc10d4a7021"
+  integrity sha512-ZPIV7zVwVcwRyTWCp29HSwIPcvqX7PoslpKlNu53AzAx5X4QBwuMb9fFsUYY3JcriNZb5xWFOM4AE95XW0UYeA==
+  dependencies:
+    babel-plugin-ember-modules-api-polyfill "^3.4.0"
+
+babel-plugin-htmlbars-inline-precompile@^5.2.1, babel-plugin-htmlbars-inline-precompile@^5.3.0:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-5.3.1.tgz#5ba272e2e4b6221522401f5f1d98a73b1de38787"
   integrity sha512-QWjjFgSKtSRIcsBhJmEwS2laIdrA6na8HAlc/pEAhjHgQsah/gMiBFRZvbQTy//hWxR4BMwV7/Mya7q5H8uHeA==
@@ -3306,14 +5107,14 @@ babel-plugin-htmlbars-inline-precompile@^5.0.0, babel-plugin-htmlbars-inline-pre
     string.prototype.matchall "^4.0.5"
 
 babel-plugin-istanbul@^6.0.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
-  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
+  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@istanbuljs/load-nyc-config" "^1.0.0"
     "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^5.0.4"
+    istanbul-lib-instrument "^4.0.0"
     test-exclude "^6.0.0"
 
 babel-plugin-module-resolver@^3.2.0:
@@ -3338,59 +5139,107 @@ babel-plugin-module-resolver@^4.1.0:
     reselect "^4.0.0"
     resolve "^1.13.1"
 
-babel-plugin-polyfill-corejs2@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
-  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
+babel-plugin-polyfill-corejs2@^0.1.4:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz#a2c5c245f56c0cac3dbddbf0726a46b24f0f81d1"
+  integrity sha512-DO95wD4g0A8KRaHKi0D51NdGXzvpqVLnLu5BTvDlpqUEpTmeEtypgC1xqesORaWmiUOQI14UHKlzNd9iZ2G3ZA==
+  dependencies:
+    "@babel/compat-data" "^7.13.0"
+    "@babel/helper-define-polyfill-provider" "^0.1.5"
+    semver "^6.1.1"
+
+babel-plugin-polyfill-corejs2@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5"
+  integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==
+  dependencies:
+    "@babel/compat-data" "^7.13.11"
+    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    semver "^6.1.1"
+
+babel-plugin-polyfill-corejs2@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz#e4c31d4c89b56f3cf85b92558954c66b54bd972d"
+  integrity sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==
   dependencies:
     "@babel/compat-data" "^7.17.7"
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    "@babel/helper-define-polyfill-provider" "^0.3.2"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
-  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
+babel-plugin-polyfill-corejs3@^0.1.3:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz#80449d9d6f2274912e05d9e182b54816904befd0"
+  integrity sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-    core-js-compat "^3.25.1"
+    "@babel/helper-define-polyfill-provider" "^0.1.5"
+    core-js-compat "^3.8.1"
 
-babel-plugin-polyfill-regenerator@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
-  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
+babel-plugin-polyfill-corejs3@^0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72"
+  integrity sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    core-js-compat "^3.21.0"
+
+babel-plugin-polyfill-corejs3@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7"
+  integrity sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.2"
+    core-js-compat "^3.21.0"
+
+babel-plugin-polyfill-regenerator@^0.1.2:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz#0fe06a026fe0faa628ccc8ba3302da0a6ce02f3f"
+  integrity sha512-OUrYG9iKPKz8NxswXbRAdSwF0GhRdIEMTloQATJi4bDuFqrXaXcCUT/VGNrr8pBcjMh1RxZ7Xt9cytVJTJfvMg==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.1.5"
+
+babel-plugin-polyfill-regenerator@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990"
+  integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.1"
+
+babel-plugin-polyfill-regenerator@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz#8f51809b6d5883e07e71548d75966ff7635527fe"
+  integrity sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    "@babel/helper-define-polyfill-provider" "^0.3.2"
 
 babel-plugin-strip-function-call@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/babel-plugin-strip-function-call/-/babel-plugin-strip-function-call-1.0.2.tgz#374a68b5648e16e2b6d1effd280c3abc88648e3a"
-  integrity sha512-2K0dgOk0AMceFHEpizpQU35nVwZ3HdygyXDedVv88+UkxjAH88k7ns8giaRkc8Tfjw6fPDvHkTC40xbI3bpbUA==
+  integrity sha1-N0potWSOFuK20e/9KAw6vIhkjjo=
 
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
-  integrity sha512-4Zp4unmHgw30A1eWI5EpACji2qMocisdXhAftfhXoSV9j0Tvj6nRFE3tOmRY912E0FMRm/L5xWE7MGVT2FoLnw==
+  integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=
 
 babel-plugin-syntax-dynamic-import@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
-  integrity sha512-MioUE+LfjCEz65Wf7Z/Rm4XCP5k2c+TbMd2Z2JKc7U9uwjBhAfNPE48KC4GTGKhppMeYVepwDBNO/nGY6NYHBA==
+  integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=
 
 babel-plugin-syntax-exponentiation-operator@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
-  integrity sha512-Z/flU+T9ta0aIEKl1tGEmN/pZiI1uXmCiGFRegKacQfEJzp7iNsKloZmyJlQr+75FCJtiFfGIK03SiCvCt9cPQ==
+  integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=
 
 babel-plugin-syntax-trailing-function-commas@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
-  integrity sha512-Gx9CH3Q/3GKbhs07Bszw5fPTlU+ygrOGfAhEt7W2JICwufpC4SuO0mG0+4NykPBSYPMJhqvVlDBU17qB1D+hMQ==
+  integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=
 
 babel-plugin-transform-async-to-generator@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
-  integrity sha512-7BgYJujNCg0Ti3x0c/DL3tStvnKS6ktIYOmo9wginv/dfZOrbSZ+qG4IRRHMBOzZ5Awb1skTiAsQXg/+IWkZYw==
+  integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=
   dependencies:
     babel-helper-remap-async-to-generator "^6.24.1"
     babel-plugin-syntax-async-functions "^6.8.0"
@@ -3399,21 +5248,21 @@ babel-plugin-transform-async-to-generator@^6.22.0:
 babel-plugin-transform-es2015-arrow-functions@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
-  integrity sha512-PCqwwzODXW7JMrzu+yZIaYbPQSKjDTAsNNlK2l5Gg9g4rz2VzLnZsStvp/3c46GfXpwkyufb3NCyG9+50FF1Vg==
+  integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
-  integrity sha512-2+ujAT2UMBzYFm7tidUsYh+ZoIutxJ3pN9IYrF1/H6dCKtECfhmB8UkHVpyxDwkj0CYbQG35ykoz925TUnBc3A==
+  integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-es2015-block-scoping@^6.23.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
-  integrity sha512-YiN6sFAQ5lML8JjCmr7uerS5Yc/EMbgg9G8ZNmk2E3nYX4ckHR01wrkeeMijEf5WHNK5TW0Sl0Uu3pv3EdOJWw==
+  integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=
   dependencies:
     babel-runtime "^6.26.0"
     babel-template "^6.26.0"
@@ -3424,7 +5273,7 @@ babel-plugin-transform-es2015-block-scoping@^6.23.0:
 babel-plugin-transform-es2015-classes@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
-  integrity sha512-5Dy7ZbRinGrNtmWpquZKZ3EGY8sDgIVB4CU8Om8q8tnMLrD/m94cKglVcHps0BCTdZ0TJeeAWOq2TK9MIY6cag==
+  integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=
   dependencies:
     babel-helper-define-map "^6.24.1"
     babel-helper-function-name "^6.24.1"
@@ -3439,7 +5288,7 @@ babel-plugin-transform-es2015-classes@^6.23.0:
 babel-plugin-transform-es2015-computed-properties@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
-  integrity sha512-C/uAv4ktFP/Hmh01gMTvYvICrKze0XVX9f2PdIXuriCSvUmV9j+u+BB9f5fJK3+878yMK6dkdcq+Ymr9mrcLzw==
+  integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=
   dependencies:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
@@ -3447,14 +5296,14 @@ babel-plugin-transform-es2015-computed-properties@^6.22.0:
 babel-plugin-transform-es2015-destructuring@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
-  integrity sha512-aNv/GDAW0j/f4Uy1OEPZn1mqD+Nfy9viFGBfQ5bZyT35YqOiqx7/tXdyfZkJ1sC21NyEsBdfDY6PYmLHF4r5iA==
+  integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
-  integrity sha512-ossocTuPOssfxO2h+Z3/Ea1Vo1wWx31Uqy9vIiJusOP4TbF7tPs9U0sJ9pX9OJPf4lXRGj5+6Gkl/HHKiAP5ug==
+  integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4=
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
@@ -3462,14 +5311,14 @@ babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
 babel-plugin-transform-es2015-for-of@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
-  integrity sha512-DLuRwoygCoXx+YfxHLkVx5/NpeSbVwfoTeBykpJK7JhYWlL/O8hgAK/reforUnZDlxasOrVPPJVI/guE3dCwkw==
+  integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-es2015-function-name@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
-  integrity sha512-iFp5KIcorf11iBqu/y/a7DK3MN5di3pNCzto61FqCNnUX4qeBwcV1SLqe10oXNnCaxBUImX3SckX2/o1nsrTcg==
+  integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=
   dependencies:
     babel-helper-function-name "^6.24.1"
     babel-runtime "^6.22.0"
@@ -3478,14 +5327,14 @@ babel-plugin-transform-es2015-function-name@^6.22.0:
 babel-plugin-transform-es2015-literals@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
-  integrity sha512-tjFl0cwMPpDYyoqYA9li1/7mGFit39XiNX5DKC/uCNjBctMxyL1/PT/l4rSlbvBG1pOKI88STRdUsWXB3/Q9hQ==
+  integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
-  integrity sha512-LnIIdGWIKdw7zwckqx+eGjcS8/cl8D74A3BpJbGjKTFFNJSMrjN4bIh22HY1AlkUbeLG6X6OZj56BDvWD+OeFA==
+  integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=
   dependencies:
     babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
     babel-runtime "^6.22.0"
@@ -3504,7 +5353,7 @@ babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-e
 babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
-  integrity sha512-ONFIPsq8y4bls5PPsAWYXH/21Hqv64TBxdje0FvU3MhIV6QM2j5YS7KvAzg/nTIVLot2D2fmFQrFWCbgHlFEjg==
+  integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=
   dependencies:
     babel-helper-hoist-variables "^6.24.1"
     babel-runtime "^6.22.0"
@@ -3513,7 +5362,7 @@ babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
 babel-plugin-transform-es2015-modules-umd@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
-  integrity sha512-LpVbiT9CLsuAIp3IG0tfbVo81QIhn6pE8xBJ7XSeCtFlMltuar5VuBV6y6Q45tpui9QWcy5i0vLQfCfrnF7Kiw==
+  integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg=
   dependencies:
     babel-plugin-transform-es2015-modules-amd "^6.24.1"
     babel-runtime "^6.22.0"
@@ -3522,7 +5371,7 @@ babel-plugin-transform-es2015-modules-umd@^6.23.0:
 babel-plugin-transform-es2015-object-super@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
-  integrity sha512-8G5hpZMecb53vpD3mjs64NhI1au24TAmokQ4B+TBFBjN9cVoGoOvotdrMMRmHvVZUEvqGUPWL514woru1ChZMA==
+  integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40=
   dependencies:
     babel-helper-replace-supers "^6.24.1"
     babel-runtime "^6.22.0"
@@ -3530,7 +5379,7 @@ babel-plugin-transform-es2015-object-super@^6.22.0:
 babel-plugin-transform-es2015-parameters@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
-  integrity sha512-8HxlW+BB5HqniD+nLkQ4xSAVq3bR/pcYW9IigY+2y0dI+Y7INFeTbfAQr+63T3E4UDsZGjyb+l9txUnABWxlOQ==
+  integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=
   dependencies:
     babel-helper-call-delegate "^6.24.1"
     babel-helper-get-function-arity "^6.24.1"
@@ -3542,7 +5391,7 @@ babel-plugin-transform-es2015-parameters@^6.23.0:
 babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
-  integrity sha512-mDdocSfUVm1/7Jw/FIRNw9vPrBQNePy6wZJlR8HAUBLybNp1w/6lr6zZ2pjMShee65t/ybR5pT8ulkLzD1xwiw==
+  integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
@@ -3550,14 +5399,14 @@ babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
 babel-plugin-transform-es2015-spread@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
-  integrity sha512-3Ghhi26r4l3d0Js933E5+IhHwk0A1yiutj9gwvzmFbVV0sPMYk2lekhOufHBswX7NCoSeF4Xrl3sCIuSIa+zOg==
+  integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-es2015-sticky-regex@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
-  integrity sha512-CYP359ADryTo3pCsH0oxRo/0yn6UsEZLqYohHmvLQdfS9xkf+MbCzE3/Kolw9OYIY4ZMilH25z/5CbQbwDD+lQ==
+  integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw=
   dependencies:
     babel-helper-regex "^6.24.1"
     babel-runtime "^6.22.0"
@@ -3566,21 +5415,21 @@ babel-plugin-transform-es2015-sticky-regex@^6.22.0:
 babel-plugin-transform-es2015-template-literals@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
-  integrity sha512-x8b9W0ngnKzDMHimVtTfn5ryimars1ByTqsfBDwAqLibmuuQY6pgBQi5z1ErIsUOWBdw1bW9FSz5RZUojM4apg==
+  integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
-  integrity sha512-fz6J2Sf4gYN6gWgRZaoFXmq93X+Li/8vf+fb0sGDVtdeWvxC9y5/bTD7bvfWMEq6zetGEHpWjtzRGSugt5kNqw==
+  integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-es2015-unicode-regex@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
-  integrity sha512-v61Dbbihf5XxnYjtBN04B/JBvsScY37R1cZT5r9permN1cp+b70DY3Ib3fIkgn1DI9U3tGgBJZVD8p/mE/4JbQ==
+  integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek=
   dependencies:
     babel-helper-regex "^6.24.1"
     babel-runtime "^6.22.0"
@@ -3589,7 +5438,7 @@ babel-plugin-transform-es2015-unicode-regex@^6.22.0:
 babel-plugin-transform-exponentiation-operator@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
-  integrity sha512-LzXDmbMkklvNhprr20//RStKVcT8Cu+SQtX18eMHLhjHf2yFzwtQ0S2f0jQ+89rokoNdmwoSqYzAhq86FxlLSQ==
+  integrity sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=
   dependencies:
     babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
     babel-plugin-syntax-exponentiation-operator "^6.8.0"
@@ -3598,14 +5447,14 @@ babel-plugin-transform-exponentiation-operator@^6.22.0:
 babel-plugin-transform-regenerator@^6.22.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
-  integrity sha512-LS+dBkUGlNR15/5WHKe/8Neawx663qttS6AGqoOUhICc9d1KciBvtrQSuc0PI+CxQ2Q/S1aKuJ+u64GtLdcEZg==
+  integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=
   dependencies:
     regenerator-transform "^0.10.0"
 
 babel-plugin-transform-strict-mode@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
-  integrity sha512-j3KtSpjyLSJxNoCDrhwiJad8kw0gJ9REGj8/CqL0HeRyLnvUNYV9zcqluL6QJSXh3nfsLEmSLvwRfGzrgR96Pw==
+  integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
@@ -3613,7 +5462,7 @@ babel-plugin-transform-strict-mode@^6.24.1:
 babel-polyfill@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
-  integrity sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==
+  integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
   dependencies:
     babel-runtime "^6.26.0"
     core-js "^2.5.0"
@@ -3658,7 +5507,7 @@ babel-preset-env@^1.7.0:
 babel-register@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
-  integrity sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A==
+  integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
   dependencies:
     babel-core "^6.26.0"
     babel-runtime "^6.26.0"
@@ -3671,7 +5520,7 @@ babel-register@^6.26.0:
 babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
@@ -3679,7 +5528,7 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
 babel-template@^6.24.1, babel-template@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
-  integrity sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
   dependencies:
     babel-runtime "^6.26.0"
     babel-traverse "^6.26.0"
@@ -3690,7 +5539,7 @@ babel-template@^6.24.1, babel-template@^6.26.0:
 babel-traverse@^6.24.1, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-  integrity sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
   dependencies:
     babel-code-frame "^6.26.0"
     babel-messages "^6.23.0"
@@ -3705,7 +5554,7 @@ babel-traverse@^6.24.1, babel-traverse@^6.26.0:
 babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-  integrity sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
   dependencies:
     babel-runtime "^6.26.0"
     esutils "^2.0.2"
@@ -3715,7 +5564,7 @@ babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
 babel6-plugin-strip-class-callcheck@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/babel6-plugin-strip-class-callcheck/-/babel6-plugin-strip-class-callcheck-6.0.0.tgz#de841c1abebbd39f78de0affb2c9a52ee228fddf"
-  integrity sha512-biNFJ7JAK4+9BwswDGL0dmYpvXHvswOFR/iKg3Q/f+pNxPEa5bWZkLHI1fW4spPytkHGMe7f/XtYyhzml9hiWg==
+  integrity sha1-3oQcGr6705943gr/ssmlLuIo/d8=
 
 babylon@^6.18.0:
   version "6.18.0"
@@ -3723,9 +5572,9 @@ babylon@^6.18.0:
   integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
 backbone@^1.1.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.4.1.tgz#099a78184bc07b034048a8332229c2ccca1e3e62"
-  integrity sha512-ADy1ztN074YkWbHi8ojJVFe3vAanO/lrzMGZWUClIP7oDD/Pjy2vrASraUP+2EVCfIiTtCW4FChVow01XneivA==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.4.0.tgz#54db4de9df7c3811c3f032f34749a4cd27f3bd12"
+  integrity sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==
   dependencies:
     underscore ">=1.8.3"
 
@@ -3740,9 +5589,9 @@ bail@^1.0.0:
   integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
 
 balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-js@^1.0.2, base64-js@^1.3.0, base64-js@^1.3.1:
   version "1.5.1"
@@ -3774,6 +5623,13 @@ basic-auth@~2.0.1:
   dependencies:
     safe-buffer "5.1.2"
 
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  dependencies:
+    tweetnacl "^0.14.3"
+
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -3813,7 +5669,7 @@ bl@^4.1.0:
 blank-object@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/blank-object/-/blank-object-1.0.2.tgz#f990793fbe9a8c8dd013fb3219420bec81d5f4b9"
-  integrity sha512-kXQ19Xhoghiyw66CUiGypnuRpWlbHAzY/+NyvqTEdTfhfQGH1/dbEMYiXju7fYKIFePpzp/y9dsu5Cu/PkmawQ==
+  integrity sha1-+ZB5P76ajI3QE/syGUIL7IHV9Lk=
 
 bluebird@^3.4.6, bluebird@^3.5.5, bluebird@^3.7.2:
   version "3.7.2"
@@ -3821,9 +5677,9 @@ bluebird@^3.4.6, bluebird@^3.5.5, bluebird@^3.7.2:
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 blueimp-md5@^2.10.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.19.0.tgz#b53feea5498dcb53dc6ec4b823adb84b729c4af0"
-  integrity sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.18.0.tgz#1152be1335f0c6b3911ed9e36db54f3e6ac52935"
+  integrity sha512-vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
   version "4.12.0"
@@ -3831,56 +5687,41 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
   integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
 bn.js@^5.0.0, bn.js@^5.1.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
-  integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
+  integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
 
-body-parser@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
+body-parser@1.19.0, body-parser@^1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
   dependencies:
-    bytes "3.1.2"
+    bytes "3.1.0"
     content-type "~1.0.4"
     debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.11.0"
-    raw-body "2.5.1"
-    type-is "~1.6.18"
-    unpipe "1.0.0"
-
-body-parser@^1.19.0:
-  version "1.20.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
-  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
-  dependencies:
-    bytes "3.1.2"
-    content-type "~1.0.5"
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
+    depd "~1.1.2"
+    http-errors "1.7.2"
     iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.11.0"
-    raw-body "2.5.2"
-    type-is "~1.6.18"
-    unpipe "1.0.0"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
 
 body@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
-  integrity sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ==
+  integrity sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=
   dependencies:
     continuable-cache "^0.3.1"
     error "^7.0.0"
     raw-body "~1.1.0"
     safe-json-parse "~1.0.1"
 
+boundary@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/boundary/-/boundary-1.0.1.tgz#4d67dc2602c0cc16dd9bce7ebf87e948290f5812"
+  integrity sha1-TWfcJgLAzBbdm85+v4fpSCkPWBI=
+
 bower-config@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.3.tgz#3454fecdc5f08e7aa9cc6d556e492be0669689ae"
@@ -3896,7 +5737,7 @@ bower-config@^1.4.3:
 bower-endpoint-parser@0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6"
-  integrity sha512-YWZHhWkPdXtIfH3VRu3QIV95sa75O9vrQWBOHjexWCLBCTy5qJvRr36LXTqFwTchSXVlzy5piYJOjzHr7qhsNg==
+  integrity sha1-ALVlrb+rby01rd3pd+l5Yqy8s/Y=
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -3922,7 +5763,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -3973,9 +5814,9 @@ broccoli-babel-transpiler@^6.5.0:
     workerpool "^2.3.0"
 
 broccoli-babel-transpiler@^7.8.0:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.1.tgz#a5dc04cf4f59de98124fc128683ab2b83e5d28c1"
-  integrity sha512-6IXBgfRt7HZ61g67ssBc6lBb3Smw3DPZ9dEYirgtvXWpRZ2A9M22nxy6opEwJDgDJzlu/bB7ToppW33OFkA1gA==
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.0.tgz#7e0f01fce5739f49bbadeee7f1e625ca51cad66e"
+  integrity sha512-dv30Td5uL7dO3NzQUqQKQs+Iq7JGKnCNtvc6GBO76uVPqGnRlsQZcYqdBVr33JrctR+ZrpTUf7TjsFKeDRFA8Q==
   dependencies:
     "@babel/core" "^7.12.0"
     "@babel/polyfill" "^7.11.5"
@@ -3993,7 +5834,7 @@ broccoli-babel-transpiler@^7.8.0:
 broccoli-bridge@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-bridge/-/broccoli-bridge-1.0.0.tgz#6223fd64b62062c31333539f0f3c42d0acd92fb1"
-  integrity sha512-WvU6T6AJrtpFSScgyCVEFAajPAJTOYYIIpGvs/PbkSq9OUBvI3/IEUHg+Ipx376M/clGFwa7K9crEtpauqC66A==
+  integrity sha1-YiP9ZLYgYsMTM1OfDzxC0KzZL7E=
   dependencies:
     broccoli-plugin "^1.3.0"
     fs-extra "^7.0.0"
@@ -4002,7 +5843,7 @@ broccoli-bridge@^1.0.0:
 broccoli-builder@^0.18.14:
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.14.tgz#4b79e2f844de11a4e1b816c3f49c6df4776c312d"
-  integrity sha512-YoUHeKnPi4xIGZ2XDVN9oHNA9k3xF5f5vlA+1wvrxIIDXqQU97gp2FxVAF503Zxdtt0C5CRB5n+47k2hlkaBzA==
+  integrity sha1-S3ni+ETeEaThuBbD9Jxt9HdsMS0=
   dependencies:
     broccoli-node-info "^1.1.0"
     heimdalljs "^0.2.0"
@@ -4015,7 +5856,7 @@ broccoli-builder@^0.18.14:
 broccoli-caching-writer@^2.2.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
-  integrity sha512-lfoDx98VaU8tG4mUXCxKdKyw2Lr+iSIGUjCgV83KC2zRC07SzYTGuSsMqpXFiOQlOGuoJxG3NRoyniBa1BWOqA==
+  integrity sha1-uTz1j5Jk8AMHWGjbBXdPTn8lvQc=
   dependencies:
     broccoli-kitchen-sink-helpers "^0.2.5"
     broccoli-plugin "1.1.0"
@@ -4027,7 +5868,7 @@ broccoli-caching-writer@^2.2.0:
 broccoli-caching-writer@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-3.0.3.tgz#0bd2c96a9738d6a6ab590f07ba35c5157d7db476"
-  integrity sha512-g644Kb5uBPsy+6e2DvO3sOc+/cXZQQNgQt64QQzjA9TSdP0dl5qvetpoNIx4sy/XIjrPYG1smEidq9Z9r61INw==
+  integrity sha1-C9LJapc41qarWQ8HujXFFX19tHY=
   dependencies:
     broccoli-kitchen-sink-helpers "^0.3.1"
     broccoli-plugin "^1.2.1"
@@ -4039,14 +5880,31 @@ broccoli-caching-writer@^3.0.3:
 broccoli-clean-css@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-1.1.0.tgz#9db143d9af7e0ae79c26e3ac5a9bb2d720ea19fa"
-  integrity sha512-S7/RWWX+lL42aGc5+fXVLnwDdMtS0QEWUFalDp03gJ9Na7zj1rWa351N2HZ687E2crM9g+eDWXKzD17cbcTepg==
+  integrity sha1-nbFD2a9+CuecJuOsWpuy1yDqGfo=
   dependencies:
     broccoli-persistent-filter "^1.1.6"
     clean-css-promise "^0.1.0"
     inline-source-map-comment "^1.0.5"
     json-stable-stringify "^1.0.0"
 
-broccoli-concat@^4.2.2, broccoli-concat@^4.2.4, broccoli-concat@^4.2.5:
+broccoli-concat@^4.2.2, broccoli-concat@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-4.2.4.tgz#78e359ddc540b999d815355163bf3cfb6bd67322"
+  integrity sha512-NgdBIE57r+U/AslBohQr0mCS7PopIWL8dihMI1CzqffQkisAgqWMuddjYmizqRBQlml7crBFaBeUnPDHhf4/RQ==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^4.0.2"
+    ensure-posix-path "^1.0.2"
+    fast-sourcemap-concat "^2.1.0"
+    find-index "^1.1.0"
+    fs-extra "^8.1.0"
+    fs-tree-diff "^2.0.1"
+    lodash.merge "^4.6.2"
+    lodash.omit "^4.1.0"
+    lodash.uniq "^4.2.0"
+
+broccoli-concat@^4.2.5:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-4.2.5.tgz#d578f00094048b5fc87195e82fbdbde20d838d29"
   integrity sha512-dFB5ATPwOyV8S2I7a07HxCoutoq23oY//LhM6Mou86cWUTB174rND5aQLR7Fu8FjFFLxoTbkk7y0VPITJ1IQrw==
@@ -4073,7 +5931,7 @@ broccoli-config-loader@^1.0.1:
 broccoli-config-replace@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/broccoli-config-replace/-/broccoli-config-replace-1.1.2.tgz#6ea879d92a5bad634d11329b51fc5f4aafda9c00"
-  integrity sha512-qLlEY3V7p3ZWJNRPdPgwIM77iau1qR03S9BupMMFngjzBr7S6RSzcg96HbCYXmW9gfTbjRm9FC4CQT81SBusZg==
+  integrity sha1-bqh52SpbrWNNETKbUfxfSq/anAA=
   dependencies:
     broccoli-kitchen-sink-helpers "^0.3.1"
     broccoli-plugin "^1.2.0"
@@ -4126,7 +5984,7 @@ broccoli-filter@^1.2.2, broccoli-filter@^1.2.3:
 broccoli-funnel-reducer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea"
-  integrity sha512-SaOCEdh+wnt2jFUV2Qb32m7LXyElvFwW3NKNaEJyi5PGQNwxfqpkc0KI6AbQANKgdj/40U2UC0WuGThFwuEUaA==
+  integrity sha1-ETZbKnha7JsXlyo234fu8kxcwOo=
 
 broccoli-funnel@2.0.1:
   version "2.0.1"
@@ -4150,7 +6008,7 @@ broccoli-funnel@2.0.1:
 broccoli-funnel@^1.0.1, broccoli-funnel@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
-  integrity sha512-0pbFNUA5Ml+gPPd58Rj/M26OS21+bMiV0F+m6+9OVzAhAdppVLxylSsXfWAt2WOD3kS+D8UsDv6GSmnZhbw/dw==
+  integrity sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=
   dependencies:
     array-equal "^1.0.0"
     blank-object "^1.0.1"
@@ -4186,7 +6044,7 @@ broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
     symlink-or-copy "^1.0.0"
     walk-sync "^0.3.1"
 
-broccoli-funnel@^3.0.0, broccoli-funnel@^3.0.2, broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.5, broccoli-funnel@^3.0.8:
+broccoli-funnel@^3.0.0, broccoli-funnel@^3.0.5, broccoli-funnel@^3.0.8:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.8.tgz#f5b62e2763c3918026a15a3c833edc889971279b"
   integrity sha512-ng4eIhPYiXqMw6SyGoxPHR3YAwEd2lr9FgBI1CyTbspl4txZovOsmzFkMkGAlu88xyvYXJqHiM2crfLa65T1BQ==
@@ -4199,10 +6057,26 @@ broccoli-funnel@^3.0.0, broccoli-funnel@^3.0.2, broccoli-funnel@^3.0.3, broccoli
     minimatch "^3.0.0"
     walk-sync "^2.0.2"
 
+broccoli-funnel@^3.0.1, broccoli-funnel@^3.0.2, broccoli-funnel@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.3.tgz#26fd42632471f67a91f4770d1987118087219937"
+  integrity sha512-LPzZ91BwStoHZXdXHQAJeYORl189OrRKM5NdIi86SDU9wZ4s/3lV1PRFOiobDT/jKM10voM7CDzfvicHbCYxAQ==
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^4.0.1"
+    debug "^4.1.1"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^2.0.1"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    path-posix "^1.0.0"
+    walk-sync "^2.0.2"
+
 broccoli-kitchen-sink-helpers@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
-  integrity sha512-C+oEqivDofZv/h80rgN4WJkbZkbfwkrIeu8vFn4bb4m4jPd3ICNNplhkXGl3ps439pzc2yjZ1qIwz0yy8uHcQg==
+  integrity sha1-peCYbtjXb7WYS2jD8EUNOpbjbsw=
   dependencies:
     glob "^5.0.10"
     mkdirp "^0.5.1"
@@ -4210,7 +6084,7 @@ broccoli-kitchen-sink-helpers@^0.2.5:
 broccoli-kitchen-sink-helpers@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.3.1.tgz#77c7c18194b9664163ec4fcee2793444926e0c06"
-  integrity sha512-gqYnKSJxBSjj/uJqeuRAzYVbmjWhG0mOZ8jrp6+fnUIOgLN6MvI7XxBECDHkYMIFPJ8Smf4xaI066Q2FqQDnXg==
+  integrity sha1-d8fBgZS5ZkFj7E/O4nk0RJJuDAY=
   dependencies:
     glob "^5.0.10"
     mkdirp "^0.5.1"
@@ -4228,7 +6102,7 @@ broccoli-merge-files@^0.8.0:
 broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
-  integrity sha512-RXJAleytlED0dxXGEo2EXwrg5cCesY8LQzzGRogwGQmluoz+ijzxajpyWAW6wu/AyuQZj1vgnIqnld8jvuuXtQ==
+  integrity sha1-oAFRm7UGfwZYnZGvopQkRaLQ/bU=
   dependencies:
     broccoli-plugin "^1.3.0"
     can-symlink "^1.0.0"
@@ -4281,12 +6155,12 @@ broccoli-node-api@^1.6.0, broccoli-node-api@^1.7.0:
 broccoli-node-info@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-1.1.0.tgz#3aa2e31e07e5bdb516dd25214f7c45ba1c459412"
-  integrity sha512-DUohSZCdfXli/3iN6SmxPbck1OVG8xCkrLx47R25his06xVc1ZmmrOsrThiM8BsCWirwyocODiYJqNP5W2Hg1A==
+  integrity sha1-OqLjHgflvbUW3SUhT3xFuhxFlBI=
 
 broccoli-node-info@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.2.0.tgz#feb01c13020792f429e01d7f7845dc5b3a7932b3"
-  integrity sha512-VabSGRpKIzpmC+r+tJueCE5h8k6vON7EIMMWu6d/FyPdtijwLQ7QvzShEw+m3mHoDzUaj/kiZsDYrS8X2adsBg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.1.0.tgz#ca84560e8570ff78565bea1699866ddbf58ad644"
+  integrity sha512-l6qDuboJThHfRVVWQVaTs++bFdrFTP0gJXgsWenczc1PavRVUmL1Eyb2swTAXXMpDOnr2zhNOBLx4w9AxkqbPQ==
 
 broccoli-output-wrapper@^2.0.0:
   version "2.0.0"
@@ -4343,7 +6217,7 @@ broccoli-persistent-filter@^2.1.0, broccoli-persistent-filter@^2.2.1, broccoli-p
     sync-disk-cache "^1.3.3"
     walk-sync "^1.0.0"
 
-broccoli-persistent-filter@^3.1.1, broccoli-persistent-filter@^3.1.2:
+broccoli-persistent-filter@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.3.tgz#aca815bf3e3b0247bd0a7b567fdb0d0e08c99cc2"
   integrity sha512-Q+8iezprZzL9voaBsDY3rQVl7c7H5h+bvv8SpzCZXPZgfBFCbx7KFQ2c3rZR6lW5k4Kwoqt7jG+rZMUg67Gwxw==
@@ -4360,7 +6234,24 @@ broccoli-persistent-filter@^3.1.1, broccoli-persistent-filter@^3.1.2:
     symlink-or-copy "^1.0.1"
     sync-disk-cache "^2.0.0"
 
-broccoli-plugin@*, broccoli-plugin@^4.0.0, broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3, broccoli-plugin@^4.0.5, broccoli-plugin@^4.0.7:
+broccoli-persistent-filter@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.2.tgz#41da6b9577be09a170ecde185f2c5a6099f99c4e"
+  integrity sha512-CbU95RXXVyy+eJV9XTiHUC7NnsY3EvdVrGzp3YgyvO2bzXZFE5/GzDp4X/VQqX+jsk4qyT1HvMOF0sD1DX68TQ==
+  dependencies:
+    async-disk-cache "^2.0.0"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^4.0.3"
+    fs-tree-diff "^2.0.0"
+    hash-for-dep "^1.5.0"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    promise-map-series "^0.2.1"
+    rimraf "^3.0.0"
+    symlink-or-copy "^1.0.1"
+    sync-disk-cache "^2.0.0"
+
+broccoli-plugin@*, broccoli-plugin@^4.0.5, broccoli-plugin@^4.0.7:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.7.tgz#dd176a85efe915ed557d913744b181abe05047db"
   integrity sha512-a4zUsWtA1uns1K7p9rExYVYG99rdKeGRymW0qOCNkvDPHQxVi3yVyJHhQbM3EZwdt2E0mnhr5e0c/bPpJ7p3Wg==
@@ -4376,7 +6267,7 @@ broccoli-plugin@*, broccoli-plugin@^4.0.0, broccoli-plugin@^4.0.1, broccoli-plug
 broccoli-plugin@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02"
-  integrity sha512-dY1QsA20of9wWEto8yhN7JQjpfjySmgeIMsvnQ9aBAv1wEJJCe04B0ekdgq7Bduyx9yWXdoC5CngGy81swmp2w==
+  integrity sha1-c+LPoF+OoeP8FCDEDD2efcckvwI=
   dependencies:
     promise-map-series "^0.2.1"
     quick-temp "^0.1.3"
@@ -4393,7 +6284,7 @@ broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli
     rimraf "^2.3.4"
     symlink-or-copy "^1.1.8"
 
-broccoli-plugin@^2.1.0:
+broccoli-plugin@^2.0.0, broccoli-plugin@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-2.1.0.tgz#2fab6c578219cfcc64f773e9616073313fc8b334"
   integrity sha512-ElE4caljW4slapyEhSD9jU9Uayc8SoSABWdmY9SqbV8DHNxU6xg1jJsPcMm+cXOvggR3+G+OXAYQeFjWVnznaw==
@@ -4416,6 +6307,19 @@ broccoli-plugin@^3.1.0:
     rimraf "^2.3.4"
     symlink-or-copy "^1.1.8"
 
+broccoli-plugin@^4.0.0, broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.5.tgz#71e5597f31a652c0e0a6bcb7bbdb50142cc5c959"
+  integrity sha512-WA8FQP2EQCBOd1Z6RhXlyTyt/F+sJEwWGTCUrIIBDxHhSURibPW/n0NfwgLdEZSD8/3Ec4B9L3PUqaWxVuVC2A==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-output-wrapper "^3.2.5"
+    fs-merger "^3.1.0"
+    promise-map-series "^0.3.0"
+    quick-temp "^0.1.8"
+    rimraf "^3.0.2"
+    symlink-or-copy "^1.3.1"
+
 broccoli-postcss-single@^5.0.1:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/broccoli-postcss-single/-/broccoli-postcss-single-5.0.2.tgz#f23661b3011494d8a2dbd8ff39eb394e80313682"
@@ -4439,6 +6343,21 @@ broccoli-postcss@^6.0.1:
     object-assign "^4.1.1"
     postcss "^8.1.4"
 
+broccoli-rollup@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-4.1.1.tgz#7531a24d88ddab9f1bace1c6ee6e6ca74a38d36f"
+  integrity sha512-hkp0dB5chiemi32t6hLe5bJvxuTOm1TU+SryFlZIs95KT9+94uj0C8w6k6CsZ2HuIdIZg6D252t4gwOlcTXrpA==
+  dependencies:
+    "@types/broccoli-plugin" "^1.3.0"
+    broccoli-plugin "^2.0.0"
+    fs-tree-diff "^2.0.1"
+    heimdalljs "^0.2.6"
+    node-modules-path "^1.0.1"
+    rollup "^1.12.0"
+    rollup-pluginutils "^2.8.1"
+    symlink-or-copy "^1.2.0"
+    walk-sync "^1.1.3"
+
 broccoli-rollup@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-5.0.0.tgz#a77b53bcef1b70e988913fee82265c0a4ca530da"
@@ -4455,13 +6374,15 @@ broccoli-rollup@^5.0.0:
     walk-sync "^2.2.0"
 
 broccoli-sass-source-maps@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-4.1.0.tgz#e0843d2cef17b788a8fc000be84af29b4c3049bc"
-  integrity sha512-So3gTlP9AEJTponlRoL9Ti+xaMX1LnJUWD52mVT0Oq6PI8nIjX97XMW91JfY/4CXsprIDyGe/7rkiauE+XHdPQ==
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-4.0.0.tgz#1ee4c10a810b10955b0502e28f85ab672f5961a2"
+  integrity sha512-Bjgg0Q626pPwiPU+Sk7jJNjblPEwhceuTzMPw2F5XY+FzdTBMYQKuJYlJ4x2DdsubE95e3rVQeSZ68jA13Nhzg==
   dependencies:
     broccoli-caching-writer "^3.0.3"
     include-path-searcher "^0.1.0"
-    rsvp "^4.8.5"
+    mkdirp "^0.3.5"
+    object-assign "^2.0.0"
+    rsvp "^3.0.6"
 
 broccoli-slow-trees@^3.0.1, broccoli-slow-trees@^3.1.0:
   version "3.1.0"
@@ -4473,7 +6394,7 @@ broccoli-slow-trees@^3.0.1, broccoli-slow-trees@^3.1.0:
 broccoli-source@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-1.1.0.tgz#54f0e82c8b73f46580cbbc4f578f0b32fca8f809"
-  integrity sha512-ahvqmwF6Yvh6l+sTJJdey4o4ynwSH8swSSBSGmUXGSPPCqBWvquWB/4rWN65ZArKilBFq/29O0yQnZNIf//sTg==
+  integrity sha1-VPDoLItz9GWAy7xPV48LMvyo+Ak=
 
 broccoli-source@^2.1.2:
   version "2.1.2"
@@ -4490,7 +6411,7 @@ broccoli-source@^3.0.0:
 broccoli-sri-hash@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/broccoli-sri-hash/-/broccoli-sri-hash-2.1.2.tgz#bc69905ed7a381ad325cc0d02ded071328ebf3f3"
-  integrity sha512-toLD/v7ut2ajcH8JsdCMG2Bpq2qkwTcKM6CMzVMSAJjaz/KpK69fR+gSqe1dsjh+QTdxG0yVvkq3Sij/XMzV6A==
+  integrity sha1-vGmQXtejga0yXMDQLe0HEyjr8/M=
   dependencies:
     broccoli-caching-writer "^2.2.0"
     mkdirp "^0.5.1"
@@ -4567,7 +6488,7 @@ broccoli@^3.5.1:
 brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
@@ -4643,15 +6564,37 @@ browserslist@^3.2.6:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
 
-browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.5:
-  version "4.21.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
-  integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
+browserslist@^4.14.5, browserslist@^4.16.3:
+  version "4.16.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
+  integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==
+  dependencies:
+    caniuse-lite "^1.0.30001181"
+    colorette "^1.2.1"
+    electron-to-chromium "^1.3.649"
+    escalade "^3.1.1"
+    node-releases "^1.1.70"
+
+browserslist@^4.17.5, browserslist@^4.19.1:
+  version "4.19.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.3.tgz#29b7caad327ecf2859485f696f9604214bedd383"
+  integrity sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==
+  dependencies:
+    caniuse-lite "^1.0.30001312"
+    electron-to-chromium "^1.4.71"
+    escalade "^3.1.1"
+    node-releases "^2.0.2"
+    picocolors "^1.0.0"
+
+browserslist@^4.20.2, browserslist@^4.21.3:
+  version "4.21.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a"
+  integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==
   dependencies:
-    caniuse-lite "^1.0.30001449"
-    electron-to-chromium "^1.4.284"
-    node-releases "^2.0.8"
-    update-browserslist-db "^1.0.10"
+    caniuse-lite "^1.0.30001370"
+    electron-to-chromium "^1.4.202"
+    node-releases "^2.0.6"
+    update-browserslist-db "^1.0.5"
 
 bser@2.1.1:
   version "2.1.1"
@@ -4661,14 +6604,14 @@ bser@2.1.1:
     node-int64 "^0.4.0"
 
 buffer-from@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
-  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-  integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
 buffer@^4.3.0:
   version "4.9.2"
@@ -4690,27 +6633,27 @@ buffer@^5.5.0:
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-  integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
-  integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
+  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
 bytes@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
-  integrity sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==
+  integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-bytes@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
-  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
 cacache@^12.0.2:
   version "12.0.4"
@@ -4748,13 +6691,6 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-calculate-cache-key-for-tree@2.0.0, calculate-cache-key-for-tree@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-2.0.0.tgz#7ac57f149a4188eacb0a45b210689215d3fef8d6"
-  integrity sha512-Quw8a6y8CPmRd6eU+mwypktYCwUcf8yVFIRbNZ6tPQEckX9yd+EBVEPC/GSZZrMWH9e7Vz4pT7XhpmyApRByLQ==
-  dependencies:
-    json-stable-stringify "^1.0.1"
-
 calculate-cache-key-for-tree@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-1.2.3.tgz#5a5e4fcfa2d374a63e47fe967593f179e8282825"
@@ -4762,6 +6698,13 @@ calculate-cache-key-for-tree@^1.1.0:
   dependencies:
     json-stable-stringify "^1.0.1"
 
+calculate-cache-key-for-tree@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-2.0.0.tgz#7ac57f149a4188eacb0a45b210689215d3fef8d6"
+  integrity sha512-Quw8a6y8CPmRd6eU+mwypktYCwUcf8yVFIRbNZ6tPQEckX9yd+EBVEPC/GSZZrMWH9e7Vz4pT7XhpmyApRByLQ==
+  dependencies:
+    json-stable-stringify "^1.0.1"
+
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -4771,9 +6714,9 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     get-intrinsic "^1.0.2"
 
 call-me-maybe@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.2.tgz#03f964f19522ba643b1b0693acb9152fe2074baa"
-  integrity sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
 
 callsites@^3.0.0, callsites@^3.1.0:
   version "3.1.0"
@@ -4793,14 +6736,24 @@ camelcase@^5.3.1:
 can-symlink@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/can-symlink/-/can-symlink-1.0.0.tgz#97b607d8a84bb6c6e228b902d864ecb594b9d219"
-  integrity sha512-RbsNrFyhwkx+6psk/0fK/Q9orOUr9VMxohGd8vTa4djf4TGLfblBgUfqZChrZuW0Q+mz2eBPFLusw9Jfukzmhg==
+  integrity sha1-l7YH2KhLtsbiKLkC2GTstZS50hk=
   dependencies:
     tmp "0.0.28"
 
-caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464:
-  version "1.0.30001464"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001464.tgz#888922718df48ce5e33dcfe1a2af7d42676c5eb7"
-  integrity sha512-oww27MtUmusatpRpCGSOneQk2/l5czXANDSFvsc7VuOQ86s3ANhZetpwXNf1zY/zdfP63Xvjz325DAdAoES13g==
+caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001181:
+  version "1.0.30001203"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001203.tgz#a7a34df21a387d9deffcd56c000b8cf5ab540580"
+  integrity sha512-/I9tvnzU/PHMH7wBPrfDMSuecDeUKerjCPX7D0xBbaJZPxoT9m+yYxt0zCTkcijCkjTdim3H56Zm0i5Adxch4w==
+
+caniuse-lite@^1.0.30001312:
+  version "1.0.30001312"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz#e11eba4b87e24d22697dae05455d5aea28550d5f"
+  integrity sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==
+
+caniuse-lite@^1.0.30001370, caniuse-lite@^1.0.30001373:
+  version "1.0.30001384"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001384.tgz#029527c2d781a3cfef13fa63b3a78a6088e35973"
+  integrity sha512-BBWt57kqWbc0GYZXb47wTXpmAgqr5LSibPzNjk/AWMdmJMQhLqOl3c/Kd4OAU/tu4NLfYkMx8Tlq3RVBkOBolQ==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -4812,11 +6765,16 @@ capture-exit@^2.0.0:
 cardinal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9"
-  integrity sha512-INsuF4GyiFLk8C91FPokbKTc/rwHqV4JnfatVZ6GPhguP1qmkRWX2dp5tepYboYdPpGWisLVLI+KsXoXFPRSMg==
+  integrity sha1-UOIcGwqjdyn5N33vGWtanOyTLuk=
   dependencies:
     ansicolors "~0.2.1"
     redeyed "~1.0.0"
 
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
 ccount@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043"
@@ -4825,12 +6783,12 @@ ccount@^1.0.0:
 ceibo@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ceibo/-/ceibo-2.0.0.tgz#9a61eb054a91c09934588d4e45d9dd2c3bf04eee"
-  integrity sha512-Zt+Nhkzd1s9hsOhEmCMkmzAn1AmjQ/RuEnXOF3H46NYlkrQoApA8PIiacz/YASdxeFse1F50B7eoppw4pPie6g==
+  integrity sha1-mmHrBUqRwJk0WI1ORdndLDvwTu4=
 
 chalk@^1.0.0, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -4856,9 +6814,9 @@ chalk@^3.0.0:
     supports-color "^7.1.0"
 
 chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
@@ -4866,7 +6824,7 @@ chalk@^4.0.0, chalk@^4.1.0:
 chalk@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
-  integrity sha512-sQfYDlfv2DGVtjdoQqxS0cEZDroyG8h6TamA6rvxwlrU5BaSLDx9xhatBYl2pxZ7gmpNaPFVwBtdGdu5rQ+tYQ==
+  integrity sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=
   dependencies:
     ansi-styles "~1.0.0"
     has-color "~0.1.0"
@@ -4900,11 +6858,26 @@ chardet@^0.7.0:
 charm@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
-  integrity sha512-wqW3VdPnlSWT4eRiYX+hcs+C6ViBPUWk1qTCd+37qw9kEm/a5n2qcyQDMBWvSYKN/ctqZzeXNQaeBjOetJJUkw==
+  integrity sha1-it02cVOm2aWBMxBSxAkJkdqZXjU=
   dependencies:
     inherits "^2.0.1"
 
-"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.5.3:
+"chokidar@>=2.0.0 <4.0.0", chokidar@^3.4.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
+  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.5.0"
+  optionalDependencies:
+    fsevents "~2.3.1"
+
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -4944,9 +6917,11 @@ chownr@^1.1.1:
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
 chrome-trace-event@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
-  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
+  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
+  dependencies:
+    tslib "^1.9.0"
 
 ci-info@^2.0.0:
   version "2.0.0"
@@ -4979,12 +6954,12 @@ cldr-core@^36.0.0:
 clean-base-url@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clean-base-url/-/clean-base-url-1.0.0.tgz#c901cf0a20b972435b0eccd52d056824a4351b7b"
-  integrity sha512-9q6ZvUAhbKOSRFY7A/irCQ/rF0KIpa3uXpx6izm8+fp7b2H4hLeUJ+F1YYk9+gDQ/X8Q0MEyYs+tG3cht//HTg==
+  integrity sha1-yQHPCiC5ckNbDszVLQVoJKQ1G3s=
 
 clean-css-promise@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/clean-css-promise/-/clean-css-promise-0.1.1.tgz#43f3d2c8dfcb2bf071481252cd9b76433c08eecb"
-  integrity sha512-tzWkANXMD70ETa/wAu2TXAAxYWS0ZjVUFM2dVik8RQBoAbGMFJv4iVluz3RpcoEbo++fX4RV/BXfgGoOjp8o3Q==
+  integrity sha1-Q/PSyN/LK/BxSBJSzZt2QzwI7ss=
   dependencies:
     array-to-error "^1.0.0"
     clean-css "^3.4.5"
@@ -4993,7 +6968,7 @@ clean-css-promise@^0.1.0:
 clean-css@^3.4.5:
   version "3.4.28"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
-  integrity sha512-aTWyttSdI2mYi07kWqHi24NUU9YlELFKGOAgFzZjDN1064DMAOy2FBuoyGmkKRlXkbpXd0EVHmiVkbKhKoirTw==
+  integrity sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=
   dependencies:
     commander "2.8.x"
     source-map "0.4.x"
@@ -5011,7 +6986,7 @@ clean-up-path@^1.0.0:
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
@@ -5023,23 +6998,23 @@ cli-cursor@^3.1.0:
     restore-cursor "^3.1.0"
 
 cli-spinners@^2.0.0, cli-spinners@^2.5.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a"
-  integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.0.tgz#36c7dc98fb6a9a76bd6238ec3f77e2425627e939"
+  integrity sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==
 
 cli-table3@^0.6.0:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2"
-  integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a"
+  integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==
   dependencies:
     string-width "^4.2.0"
   optionalDependencies:
     "@colors/colors" "1.5.0"
 
 cli-table@^0.3.1:
-  version "0.3.11"
-  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.11.tgz#ac69cdecbe81dccdba4889b9a18b7da312a9d3ee"
-  integrity sha512-IqLQi4lO0nIB4tcdTpN4LCB9FI3uqrJZK7RC515EnhZ6qBaglkIgICb1wjeAqpdoOabm1+SuQtkXIPdYC93jhQ==
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.6.tgz#e9d6aa859c7fe636981fd3787378c2a20bce92fc"
+  integrity sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ==
   dependencies:
     colors "1.0.3"
 
@@ -5061,10 +7036,10 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-clipboard@^2.0.11:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.11.tgz#62180360b97dd668b6b3a84ec226975762a70be5"
-  integrity sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==
+clipboard@^2.0.4:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.8.tgz#ffc6c103dd2967a83005f3f61976aa4655a4cdba"
+  integrity sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==
   dependencies:
     good-listener "^1.2.2"
     select "^1.1.2"
@@ -5082,27 +7057,32 @@ cliui@^7.0.2:
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
 clone@^2.0.0, clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 codemirror@~5.15.0:
   version "5.15.2"
   resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.15.2.tgz#58b3dc732c6d10d7aae806f4c7cdd56a9b87fe8f"
-  integrity sha512-QHZClCGimKVK86/+K1YcKwa2/9pzy5OfAsv0nsXlPxxoWOhGc+HxPWQISnIrYMHwA5QCtiObxo5O/tmV4fzOSQ==
+  integrity sha1-WLPccyxtENeq6Ab0x83VapuH/o8=
+
+collapse-white-space@^1.0.2:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
+  integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==
 
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -5124,7 +7104,7 @@ color-convert@^2.0.1:
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 color-name@^1.1.4, color-name@~1.1.4:
   version "1.1.4"
@@ -5136,22 +7116,22 @@ color-support@^1.1.3:
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-colorette@^2.0.16:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
-  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
+colorette@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
-  integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==
+  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
 
 colors@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-combined-stream@^1.0.8:
+combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -5166,7 +7146,7 @@ comma-separated-tokens@^1.0.0:
 commander@2.8.x:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
-  integrity sha512-+pJLBFVk+9ZZdlAOB5WuIElVPPth47hILFkmGym57aq8kwxsowvByvB0DHs1vQAhyMZzdcpTtF0VDKGkSDR4ZQ==
+  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
   dependencies:
     graceful-readlink ">= 1.0.0"
 
@@ -5185,20 +7165,20 @@ commander@^4.1.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-commander@^6.2.0, commander@^6.2.1:
+commander@^6.2.0:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
 common-tags@^1.8.0:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
-  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
+  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
 
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
 compare-versions@^3.6.0:
   version "3.6.0"
@@ -5233,7 +7213,7 @@ compression@^1.7.4:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 concat-stream@^1.5.0:
   version "1.6.2"
@@ -5275,7 +7255,7 @@ console-browserify@^1.1.0:
 console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 console-ui@^3.0.4, console-ui@^3.1.2:
   version "3.1.2"
@@ -5298,58 +7278,55 @@ consolidate@^0.16.0:
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-  integrity sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
-content-disposition@0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
-  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
   dependencies:
-    safe-buffer "5.2.1"
+    safe-buffer "5.1.2"
 
-content-type@~1.0.4, content-type@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
-  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 continuable-cache@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
-  integrity sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA==
+  integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
 
 convert-source-map@^1.5.1, convert-source-map@^1.7.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
-  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  dependencies:
+    safe-buffer "~5.1.1"
 
 cookie-parser@^1.4.4:
-  version "1.4.6"
-  resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.6.tgz#3ac3a7d35a7a03bbc7e365073a26074824214594"
-  integrity sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.5.tgz#3e572d4b7c0c80f9c61daf604e4336831b5d1d49"
+  integrity sha512-f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw==
   dependencies:
-    cookie "0.4.1"
+    cookie "0.4.0"
     cookie-signature "1.0.6"
 
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
 
-cookie@0.4.1:
+cookie@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
   integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
 
-cookie@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
-
-cookie@~0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
-  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
-
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -5365,19 +7342,36 @@ copy-concurrently@^1.0.0:
 copy-dereference@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/copy-dereference/-/copy-dereference-1.0.0.tgz#6b131865420fd81b413ba994b44d3655311152b6"
-  integrity sha512-40TSLuhhbiKeszZhK9LfNdazC67Ue4kq/gGwN5sdxEUWPXTIMmKmGmgD9mPfNKVAeecEW+NfEIpBaZoACCQLLw==
+  integrity sha1-axMYZUIP2BtBO6mUtE02VTERUrY=
 
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
+core-js-compat@^3.20.2, core-js-compat@^3.21.0:
+  version "3.21.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82"
+  integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==
+  dependencies:
+    browserslist "^4.19.1"
+    semver "7.0.0"
 
-core-js-compat@^3.25.1:
-  version "3.29.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.29.0.tgz#1b8d9eb4191ab112022e7f6364b99b65ea52f528"
-  integrity sha512-ScMn3uZNAFhK2DGoEfErguoiAHhV2Ju+oJo/jK08p7B3f3UhocUrCCkTvnZaiS+edl5nlIoiBXKcwMc6elv4KQ==
+core-js-compat@^3.22.1:
+  version "3.25.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.25.0.tgz#489affbfbf9cb3fa56192fe2dd9ebaee985a66c5"
+  integrity sha512-extKQM0g8/3GjFx9US12FAgx8KJawB7RCQ5y8ipYLbmfzEzmFRWdDjIlxDx82g7ygcNG85qMVUSRyABouELdow==
   dependencies:
-    browserslist "^4.21.5"
+    browserslist "^4.21.3"
+    semver "7.0.0"
+
+core-js-compat@^3.8.1, core-js-compat@^3.9.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.1.tgz#4e572acfe90aff69d76d8c37759d21a5c59bb455"
+  integrity sha512-jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA==
+  dependencies:
+    browserslist "^4.16.3"
+    semver "7.0.0"
 
 core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
   version "2.6.12"
@@ -5391,10 +7385,10 @@ core-object@^3.1.5:
   dependencies:
     chalk "^2.0.0"
 
-core-util-is@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+core-util-is@1.0.2, core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 cors@~2.8.5:
   version "2.8.5"
@@ -5405,9 +7399,9 @@ cors@~2.8.5:
     vary "^1"
 
 cosmiconfig@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
-  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
+  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
   dependencies:
     "@types/parse-json" "^4.0.0"
     import-fresh "^3.2.1"
@@ -5505,17 +7499,17 @@ css-loader@^5.2.0:
     semver "^7.3.5"
 
 css-tree@^2.0.4:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
-  integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032"
+  integrity sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==
   dependencies:
-    mdn-data "2.0.30"
+    mdn-data "2.0.28"
     source-map-js "^1.0.1"
 
 css.escape@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
-  integrity sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==
+  integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=
 
 css@^3.0.0:
   version "3.0.0"
@@ -5551,12 +7545,12 @@ cssstyle@^2.3.0:
 cyclist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
-  integrity sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==
+  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
-d3-array@2, d3-array@^2.3.0, d3-array@^2.8.0:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.12.1.tgz#e20b41aafcdffdf5d50928004ececf815a465e81"
-  integrity sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==
+d3-array@^2.3.0, d3-array@^2.8.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.12.0.tgz#68a74d153e52d6bf4608d9f6388cca48b42a4c3f"
+  integrity sha512-T6H/qNldyD/1OlRkJbonb3u3MPhNwju8OPxYv0YSjDb/B2RUeeBEHzIpNrYiinwpmz8+am+puMrpcrDWgY9wRg==
   dependencies:
     internmap "^1.0.0"
 
@@ -5591,14 +7585,14 @@ d3-scale-chromatic@^2.0.0:
     d3-interpolate "1 - 2"
 
 d3-scale@^3.2.3:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-3.3.0.tgz#28c600b29f47e5b9cd2df9749c206727966203f3"
-  integrity sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-3.2.3.tgz#be380f57f1f61d4ff2e6cbb65a40593a51649cfd"
+  integrity sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g==
   dependencies:
     d3-array "^2.3.0"
     d3-format "1 - 2"
     d3-interpolate "1.2.0 - 2"
-    d3-time "^2.1.1"
+    d3-time "1 - 2"
     d3-time-format "2 - 3"
 
 d3-selection@^2.0.0:
@@ -5620,17 +7614,22 @@ d3-shape@^2.0.0:
   dependencies:
     d3-time "1 - 2"
 
-"d3-time@1 - 2", d3-time@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-2.1.1.tgz#e9d8a8a88691f4548e68ca085e5ff956724a6682"
-  integrity sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==
-  dependencies:
-    d3-array "2"
-
+"d3-time@1 - 2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-2.0.0.tgz#ad7c127d17c67bd57a4c61f3eaecb81108b1e0ab"
+  integrity sha512-2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q==
+
 dag-map@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dag-map/-/dag-map-2.0.2.tgz#9714b472de82a1843de2fba9b6876938cab44c68"
-  integrity sha512-xnsprIzYuDeiyu5zSKwilV/ajRHxnoMlAhEREfyfTgTSViMVY2fGP1ZcHJbtwup26oCkofySU/m6oKJ3HrkW7w==
+  integrity sha1-lxS0ct6CoYQ94vuptodpOMq0TGg=
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
 
 data-urls@^2.0.0:
   version "2.0.0"
@@ -5642,9 +7641,9 @@ data-urls@^2.0.0:
     whatwg-url "^8.0.0"
 
 dayjs@^1.9.3:
-  version "1.11.7"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
-  integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
+  version "1.10.4"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.4.tgz#8e544a9b8683f61783f570980a8a80eaf54ab1e2"
+  integrity sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw==
 
 debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
@@ -5653,13 +7652,6 @@ debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
 debug@^3.0.1, debug@^3.1.0, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -5667,85 +7659,96 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+  dependencies:
+    ms "2.1.2"
+
+debug@~4.3.1, debug@~4.3.2:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
-  integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
 
 decimal.js@^10.2.1:
-  version "10.4.3"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
-  integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
+  integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
 
 decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-  integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
+  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
 
-deep-equal@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.0.tgz#5caeace9c781028b9ff459f33b779346637c43e6"
-  integrity sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==
+deep-equal@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.5.tgz#55cd2fe326d83f9cbf7261ef0e060b3f724c5cb9"
+  integrity sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==
   dependencies:
-    call-bind "^1.0.2"
-    es-get-iterator "^1.1.2"
-    get-intrinsic "^1.1.3"
-    is-arguments "^1.1.1"
-    is-array-buffer "^3.0.1"
-    is-date-object "^1.0.5"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
+    call-bind "^1.0.0"
+    es-get-iterator "^1.1.1"
+    get-intrinsic "^1.0.1"
+    is-arguments "^1.0.4"
+    is-date-object "^1.0.2"
+    is-regex "^1.1.1"
     isarray "^2.0.5"
-    object-is "^1.1.5"
+    object-is "^1.1.4"
     object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
-    side-channel "^1.0.4"
-    which-boxed-primitive "^1.0.2"
+    object.assign "^4.1.2"
+    regexp.prototype.flags "^1.3.0"
+    side-channel "^1.0.3"
+    which-boxed-primitive "^1.0.1"
     which-collection "^1.0.1"
-    which-typed-array "^1.1.9"
+    which-typed-array "^1.1.2"
 
 deep-is@^0.1.3, deep-is@~0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
-  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
 deepmerge@^4.2.2:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.0.tgz#65491893ec47756d44719ae520e0e2609233b59b"
-  integrity sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
 defaults@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
-  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.3, define-properties@^1.1.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
-  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
+define-properties@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
   dependencies:
-    has-property-descriptors "^1.0.0"
-    object-keys "^1.1.1"
+    object-keys "^1.0.12"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
@@ -5757,15 +7760,15 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-defined@^1.0.0, defined@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.1.tgz#c0b9db27bfaffd95d6f61399419b893df0f91ebf"
-  integrity sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==
+defined@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
 
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegate@^3.1.2:
   version "3.2.0"
@@ -5775,17 +7778,17 @@ delegate@^3.1.2:
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
-
-depd@2.0.0, depd@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+
+depd@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
 des.js@^1.0.0:
   version "1.0.1"
@@ -5795,27 +7798,27 @@ des.js@^1.0.0:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
 
-destroy@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
-  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
 detect-file@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-  integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==
+  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
-  integrity sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A==
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
   dependencies:
     repeating "^2.0.0"
 
 detect-indent@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
-  integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
+  integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==
 
 detect-newline@3.1.0:
   version "3.1.0"
@@ -5832,18 +7835,13 @@ detective@^5.2.1:
     minimist "^1.2.6"
 
 dezalgo@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"
-  integrity sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
   dependencies:
     asap "^2.0.0"
     wrappy "1"
 
-dialog-polyfill@^0.5.6:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/dialog-polyfill/-/dialog-polyfill-0.5.6.tgz#7507b4c745a82fcee0fa07ce64d835979719599a"
-  integrity sha512-ZbVDJI9uvxPAKze6z146rmfUZjBqNEwcnFTVamQzXH+svluiV7swmVIGr7miwADgfgt1G2JQIytypM9fbyhX4w==
-
 didyoumean@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037"
@@ -5881,16 +7879,16 @@ dlv@^1.1.3:
   integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
 
 doctoc@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/doctoc/-/doctoc-2.2.1.tgz#83f6a6bf4df97defbe027c9a82d13091a138ffe2"
-  integrity sha512-qNJ1gsuo7hH40vlXTVVrADm6pdg30bns/Mo7Nv1SxuXSM1bwF9b4xQ40a6EFT/L1cI+Yylbyi8MPI4G4y7XJzQ==
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/doctoc/-/doctoc-2.0.0.tgz#3c5c51ba89acb9b8e1924cc429500d6de2dfb90e"
+  integrity sha512-thvCndtwVPe3GCDUG09NYPu9D72Ons3MFh/Fe5A3bePMHGa1XSMgJWyL04bkxa0DyyaylEB2UrqigbQM0fcj7w==
   dependencies:
-    "@textlint/markdown-to-ast" "^12.1.1"
-    anchor-markdown-header "^0.6.0"
-    htmlparser2 "^7.2.0"
-    minimist "^1.2.6"
-    underscore "^1.13.2"
-    update-section "^0.3.3"
+    "@textlint/markdown-to-ast" "~6.1.7"
+    anchor-markdown-header "~0.5.7"
+    htmlparser2 "~4.1.0"
+    minimist "~1.2.5"
+    underscore "~1.10.2"
+    update-section "~0.3.3"
 
 doctrine@^3.0.0:
   version "3.0.0"
@@ -5900,12 +7898,12 @@ doctrine@^3.0.0:
     esutils "^2.0.2"
 
 dom-serializer@^1.0.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
-  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.2.0.tgz#3433d9136aeb3c627981daa385fc7f32d27c48f1"
+  integrity sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==
   dependencies:
     domelementtype "^2.0.1"
-    domhandler "^4.2.0"
+    domhandler "^4.0.0"
     entities "^2.0.0"
 
 domain-browser@^1.1.1:
@@ -5913,10 +7911,10 @@ domain-browser@^1.1.1:
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domelementtype@^2.0.1, domelementtype@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
+domelementtype@^2.0.1, domelementtype@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
+  integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==
 
 domexception@^2.0.1:
   version "2.0.1"
@@ -5925,21 +7923,28 @@ domexception@^2.0.1:
   dependencies:
     webidl-conversions "^5.0.0"
 
-domhandler@^4.2.0, domhandler@^4.2.2:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
-  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
+domhandler@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.3.0.tgz#6db7ea46e4617eb15cf875df68b2b8524ce0037a"
+  integrity sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==
+  dependencies:
+    domelementtype "^2.0.1"
+
+domhandler@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.0.0.tgz#01ea7821de996d85f69029e81fa873c21833098e"
+  integrity sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==
   dependencies:
-    domelementtype "^2.2.0"
+    domelementtype "^2.1.0"
 
-domutils@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
-  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
+domutils@^2.0.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.5.0.tgz#42f49cffdabb92ad243278b331fd761c1c2d3039"
+  integrity sha512-Ho16rzNMOFk2fPwChGh3D2D9OEHAfG19HgmRR2l+WLSsIstNsAYBzePH412bL0y5T44ejABIVfTHQ8nqi/tBCg==
   dependencies:
     dom-serializer "^1.0.1"
-    domelementtype "^2.2.0"
-    domhandler "^4.2.0"
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
 
 dot-case@^3.0.4:
   version "3.0.4"
@@ -5973,6 +7978,14 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
 editions@^1.1.1:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
@@ -5989,12 +8002,22 @@ editions@^2.2.0:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.649:
+  version "1.3.692"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.692.tgz#4d00479055a7282cdd1b19caec09ed7779529640"
+  integrity sha512-Ix+zDUAXWZuUzqKdhkgN5dP7ZM+IwMG4yAGFGDLpGJP/3vNEEwuHG1LIhtXUfW0FFV0j38t5PUv2n/3MFSRviQ==
 
-electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.284:
-  version "1.4.328"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.328.tgz#b4565ffa502542b561cea16086d6d9b916c7095a"
-  integrity sha512-DE9tTy2PNmy1v55AZAO542ui+MLC2cvINMK4P2LXGsJdput/ThVG9t+QGecPuAZZSgC8XoI+Jh9M1OG9IoNSCw==
+electron-to-chromium@^1.4.202:
+  version "1.4.233"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.233.tgz#aa142e45468bda111b88abc9cc59d573b75d6a60"
+  integrity sha512-ejwIKXTg1wqbmkcRJh9Ur3hFGHFDZDw1POzdsVrB2WZjgRuRMHIQQKNpe64N/qh3ZtH2otEoRoS+s6arAAuAAw==
+
+electron-to-chromium@^1.4.71:
+  version "1.4.75"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.75.tgz#d1ad9bb46f2f1bf432118c2be21d27ffeae82fdd"
+  integrity sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -6010,9 +8033,9 @@ elliptic@^6.5.3:
     minimalistic-crypto-utils "^1.0.1"
 
 ember-array-fns@^1.4.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/ember-array-fns/-/ember-array-fns-1.4.2.tgz#7087cbedcde195dcae25576832920499171b1749"
-  integrity sha512-ceUebR8CeU/dOSLwyXIAfLsxvve8FTD9O8m8XQqdCpY1mUh43dAz5INaF/PGPA+Rkbxrq67Cidvr5AewjwQlPg==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ember-array-fns/-/ember-array-fns-1.4.0.tgz#92188edecb91c0b69c78e411f1b3339dfe0006a5"
+  integrity sha512-dKQ2wvuh+rVYhGsbR8pk8j9TX/Kqwf3sRehtJ+HqEi3VavH/WPPvsY2sH5nczYEtQwgkV1NAzgSzLr1iYj4uXQ==
   dependencies:
     ember-cli-babel "^7.7.3"
 
@@ -6024,7 +8047,7 @@ ember-assign-helper@^0.3.0:
     ember-cli-babel "^7.19.0"
     ember-cli-htmlbars "^4.3.1"
 
-ember-auto-import@^1.10.1, ember-auto-import@^1.11.2, ember-auto-import@^1.11.3, ember-auto-import@^1.5.3:
+ember-auto-import@^1.10.1, ember-auto-import@^1.11.3:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.2.tgz#cc7298ee5c0654b0249267de68fb27a2861c3579"
   integrity sha512-gLqML2k77AuUiXxWNon1FSzuG1DV7PEPpCLCU5aJvf6fdL6rmFfElsZRh+8ELEB/qP9dT+LHjNEunVzd2dYc8A==
@@ -6059,17 +8082,51 @@ ember-auto-import@^1.10.1, ember-auto-import@^1.11.2, ember-auto-import@^1.11.3,
     walk-sync "^0.3.3"
     webpack "^4.43.0"
 
-ember-auto-import@^2.2.3, ember-auto-import@^2.4.2, ember-auto-import@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.6.1.tgz#bd8d434143bd411b99f4a8f32d8b58414d7da4f3"
-  integrity sha512-3bCRi/pXp4QslmuCXGlSz9xwR7DF5oDx3zZO5OXKzNZihtkqAM1xvGuRIdQSl46pvbAXOkp8Odl5fOen1i0dRw==
+ember-auto-import@^1.5.3, ember-auto-import@^1.6.0:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.10.1.tgz#6c93a875e494aa0a58b759867d3f20adfd514ae3"
+  integrity sha512-7bOWzPELlVwdWDOkB+phDIjg8BNW+/2RiLLQ+Xa/eIvCLT4ABYhHV5wqW5gs5BnXTDVLfE4ddKZdllnGuPGGDQ==
+  dependencies:
+    "@babel/core" "^7.1.6"
+    "@babel/preset-env" "^7.10.2"
+    "@babel/traverse" "^7.1.6"
+    "@babel/types" "^7.1.6"
+    "@embroider/core" "^0.33.0"
+    babel-core "^6.26.3"
+    babel-loader "^8.0.6"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babylon "^6.18.0"
+    broccoli-debug "^0.6.4"
+    broccoli-node-api "^1.7.0"
+    broccoli-plugin "^4.0.0"
+    debug "^3.1.0"
+    ember-cli-babel "^7.0.0"
+    enhanced-resolve "^4.0.0"
+    fs-extra "^6.0.1"
+    fs-tree-diff "^2.0.0"
+    handlebars "^4.3.1"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.19"
+    mkdirp "^0.5.1"
+    resolve-package-path "^3.1.0"
+    rimraf "^2.6.2"
+    semver "^7.3.4"
+    symlink-or-copy "^1.2.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^0.3.3"
+    webpack "^4.43.0"
+
+ember-auto-import@^2.2.3, ember-auto-import@^2.4.1, ember-auto-import@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.4.2.tgz#d4d3bc6885a11cf124f606f5c37169bdf76e37ae"
+  integrity sha512-REh+1aJWpTkvN42a/ga41OuRpUsSW7UQfPr2wPtYx56o/xoSNhVBXejy7yV9ObrkN7gogz6fs2xZwih5cOwpYg==
   dependencies:
     "@babel/core" "^7.16.7"
     "@babel/plugin-proposal-class-properties" "^7.16.7"
     "@babel/plugin-proposal-decorators" "^7.16.7"
     "@babel/preset-env" "^7.16.7"
     "@embroider/macros" "^1.0.0"
-    "@embroider/shared-internals" "^2.0.0"
+    "@embroider/shared-internals" "^1.0.0"
     babel-loader "^8.0.6"
     babel-plugin-ember-modules-api-polyfill "^3.5.0"
     babel-plugin-htmlbars-inline-precompile "^5.2.1"
@@ -6095,7 +8152,7 @@ ember-auto-import@^2.2.3, ember-auto-import@^2.4.2, ember-auto-import@^2.6.0:
     typescript-memoize "^1.0.0-alpha.3"
     walk-sync "^3.0.0"
 
-ember-basic-dropdown@3.0.21, ember-basic-dropdown@^3.0.21:
+ember-basic-dropdown@3.0.21, ember-basic-dropdown@^3.0.16:
   version "3.0.21"
   resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-3.0.21.tgz#5711d071966919c9578d2d5ac2c6dcadbb5ea0e0"
   integrity sha512-Wu9hJWyqorKo+ZT2PMSIO1BxAeAdaiIC2IjSic0+HcKjmMU47botvG0xbxlprimOWaS9vM+nHat6Pt3xPvcB0A==
@@ -6113,26 +8170,6 @@ ember-basic-dropdown@3.0.21, ember-basic-dropdown@^3.0.21:
     ember-style-modifier "^0.6.0"
     ember-truth-helpers "^2.1.0 || ^3.0.0"
 
-ember-cache-primitive-polyfill@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ember-cache-primitive-polyfill/-/ember-cache-primitive-polyfill-1.0.1.tgz#a27075443bd87e5af286c1cd8a7df24e3b9f6715"
-  integrity sha512-hSPcvIKarA8wad2/b6jDd/eU+OtKmi6uP+iYQbzi5TQpjsqV6b4QdRqrLk7ClSRRKBAtdTuutx+m+X+WlEd2lw==
-  dependencies:
-    ember-cli-babel "^7.22.1"
-    ember-cli-version-checker "^5.1.1"
-    ember-compatibility-helpers "^1.2.1"
-    silent-error "^1.1.1"
-
-ember-cached-decorator-polyfill@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/ember-cached-decorator-polyfill/-/ember-cached-decorator-polyfill-0.1.4.tgz#f1e2c65cc78d0d9c4ac0e047e643af477eb85ace"
-  integrity sha512-JOK7kBCWsTVCzmCefK4nr9BACDJk0owt9oIUaVt6Q0UtQ4XeAHmoK5kQ/YtDcxQF1ZevHQFdGhsTR3JLaHNJgA==
-  dependencies:
-    "@glimmer/tracking" "^1.0.4"
-    ember-cache-primitive-polyfill "^1.0.1"
-    ember-cli-babel "^7.21.0"
-    ember-cli-babel-plugin-helpers "^1.1.1"
-
 ember-can@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/ember-can/-/ember-can-4.2.0.tgz#08bfec3b2b57aad3dc6e4dc36fe9692bd1794dab"
@@ -6178,7 +8215,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, em
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
-ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2:
+ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
   integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
@@ -6197,7 +8234,7 @@ ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.6.0, e
     ember-cli-version-checker "^2.1.2"
     semver "^5.5.0"
 
-ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.0, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.0, ember-cli-babel@^7.26.1, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
+ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.0, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.1, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.4.0, ember-cli-babel@^7.7.3:
   version "7.26.11"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
   integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
@@ -6234,9 +8271,9 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-c
     semver "^5.5.0"
 
 ember-cli-code-coverage@^1.0.0-beta.4:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/ember-cli-code-coverage/-/ember-cli-code-coverage-1.0.3.tgz#9a6e5e6350d70761eba749d68ebe2e0d9aa3492f"
-  integrity sha512-tyWeQ22vxpDmfhIrRCMqZPq9Coppefg19hBgME4yb9Na2qslxCNK0USThigZhesb7hfw2ZgdrKJCrmCVNwkq7g==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-code-coverage/-/ember-cli-code-coverage-1.0.2.tgz#615fc7af8bc7d9388a28371c2825c224a936d73f"
+  integrity sha512-uD0RA6A4p/AOpPGq8JXIiZeDFWjzEm5fyWZLU5W8nCF//t3wbkly8tZukiYchJNNYEeESzd6gqdwgDkLMRzZYA==
   dependencies:
     babel-plugin-istanbul "^6.0.0"
     body-parser "^1.19.0"
@@ -6249,9 +8286,9 @@ ember-cli-code-coverage@^1.0.0-beta.4:
     walk-sync "^2.1.0"
 
 ember-cli-dependency-checker@^3.2.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.3.1.tgz#16b44d7a1a1e946f59859fad97f32e616d78323a"
-  integrity sha512-Tg6OeijjXNKWkDm6057Tr0N9j9Vlz/ITewXWpn1A/+Wbt3EowBx5ZKfvoupqz05EznKgL1B/ecG0t+JN7Qm6MA==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.2.0.tgz#9202ad9e14d6fda33cffc22a11c343c2a8885330"
+  integrity sha512-dkSmcJ/jY/2ms/S6ph2jXSfOW5VfOpLfg5DFEbra0SaMNgYkNDFF1o0U4OdTsG37L5h/AXWNuVtnOa4TMabz9Q==
   dependencies:
     chalk "^2.3.0"
     find-yarn-workspace-root "^1.1.0"
@@ -6270,18 +8307,18 @@ ember-cli-deprecation-workflow@^2.1.0:
     ember-cli-htmlbars "^5.3.2"
 
 ember-cli-flash@^2.1.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/ember-cli-flash/-/ember-cli-flash-2.2.2.tgz#19b47f7704cac91a21a790be220eb021ac37c80d"
-  integrity sha512-cHjChy9jYtXiprHwAZCVh8FbsfxBvvqKmz+XlAX6kqf/9uBdrxHzGR0jE0PR8aabX9tWAmjdR0hpT2IbbAwwAg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-flash/-/ember-cli-flash-2.1.1.tgz#a1547676d20a8d6f5d0f523228d3e7c8a76486ee"
+  integrity sha512-JLqrc2gOwCFI8dB1hUV537Iv+yzplsgfVG3u4JSp8QAsQHPCGAT0XZR1yQDlXfoLwFGr1Akw8y72/TwN9jBW9w==
   dependencies:
-    "@ember/render-modifiers" "^1.0.2"
-    ember-cli-babel "^7.26.6"
-    ember-cli-htmlbars "^5.7.1"
+    ember-cli-babel "^7.18.0"
+    ember-cli-htmlbars "^4.2.3"
+    ember-runtime-enumerable-includes-polyfill "^2.1.0"
 
 ember-cli-get-component-path-option@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
-  integrity sha512-k47TDwcJ2zPideBCZE8sCiShSxQSpebY2BHcX2DdipMmBox5gsfyVrbKJWIHeSTTKyEUgmBIvQkqTOozEziCZA==
+  integrity sha1-DXtZVVni+QUKvtgE8djv8bCLx3E=
 
 ember-cli-htmlbars@^3.0.1:
   version "3.1.0"
@@ -6293,7 +8330,7 @@ ember-cli-htmlbars@^3.0.1:
     json-stable-stringify "^1.0.1"
     strip-bom "^3.0.0"
 
-ember-cli-htmlbars@^4.3.1:
+ember-cli-htmlbars@^4.2.3, ember-cli-htmlbars@^4.3.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.5.0.tgz#d299e4f7eba6f30dc723ee086906cc550beb252e"
   integrity sha512-bYJpK1pqFu9AadDAGTw05g2LMNzY8xTCIqQm7dMJmKEoUpLRFbPf4SfHXrktzDh7Q5iggl6Skzf1M0bPlIxARw==
@@ -6313,7 +8350,29 @@ ember-cli-htmlbars@^4.3.1:
     strip-bom "^4.0.0"
     walk-sync "^2.0.2"
 
-ember-cli-htmlbars@^5.0.0, ember-cli-htmlbars@^5.1.0, ember-cli-htmlbars@^5.1.2, ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.3.2, ember-cli-htmlbars@^5.7.1, ember-cli-htmlbars@^5.7.2:
+ember-cli-htmlbars@^5.0.0, ember-cli-htmlbars@^5.1.0, ember-cli-htmlbars@^5.1.2, ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.6.3:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.1.tgz#eb5b88c7d9083bc27665fb5447a9b7503b32ce4f"
+  integrity sha512-9laCgL4tSy48orNoQgQKEHp93MaqAs9ZOl7or5q+8iyGGJHW6sVXIYrVv5/5O9HfV6Ts8/pW1rSoaeKyLUE+oA==
+  dependencies:
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-htmlbars-inline-precompile "^5.0.0"
+    broccoli-debug "^0.6.5"
+    broccoli-persistent-filter "^3.1.2"
+    broccoli-plugin "^4.0.3"
+    common-tags "^1.8.0"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^5.1.2"
+    fs-tree-diff "^2.0.1"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.10"
+    json-stable-stringify "^1.0.1"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+    strip-bom "^4.0.0"
+    walk-sync "^2.2.0"
+
+ember-cli-htmlbars@^5.3.2, ember-cli-htmlbars@^5.7.1, ember-cli-htmlbars@^5.7.2:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.2.tgz#e0cd2fb3c20d85fe4c3e228e6f0590ee1c645ba8"
   integrity sha512-Uj6R+3TtBV5RZoJY14oZn/sNPnc+UgmC8nb5rI4P3fR/gYoyTFIZSXiIM7zl++IpMoIrocxOrgt+mhonKphgGg==
@@ -6335,13 +8394,34 @@ ember-cli-htmlbars@^5.0.0, ember-cli-htmlbars@^5.1.0, ember-cli-htmlbars@^5.1.2,
     strip-bom "^4.0.0"
     walk-sync "^2.2.0"
 
-ember-cli-htmlbars@^6.0.0, ember-cli-htmlbars@^6.0.1, ember-cli-htmlbars@^6.1.0, ember-cli-htmlbars@^6.1.1, ember-cli-htmlbars@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.2.0.tgz#18ec48ee1c93f9eed862a64eb24a9d14604f1dfc"
-  integrity sha512-j5EGixjGau23HrqRiW/JjoAovg5UBHfjbyN7wX5ekE90knIEqUUj1z/Mo/cTx/J2VepQ2lE6HdXW9LWQ/WdMtw==
+ember-cli-htmlbars@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.0.0.tgz#9d0b67c0f107467b6c8ecdc47d64e877489841bf"
+  integrity sha512-7h9Lb1kfvLecMUOX8wCbwjzCsgXdNDs8qpOsDuKV6YaGS9jDZHu4P5xTYLX78YepEUnwOw1atCYWzBUsJHWrzA==
+  dependencies:
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-ember-template-compilation "^1.0.0"
+    babel-plugin-htmlbars-inline-precompile "^5.3.0"
+    broccoli-debug "^0.6.5"
+    broccoli-persistent-filter "^3.1.2"
+    broccoli-plugin "^4.0.3"
+    ember-cli-version-checker "^5.1.2"
+    fs-tree-diff "^2.0.1"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.10"
+    json-stable-stringify "^1.0.1"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+    strip-bom "^4.0.0"
+    walk-sync "^2.2.0"
+
+ember-cli-htmlbars@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.1.0.tgz#97150c2a6f9a981475599d74817df66f5d816c2b"
+  integrity sha512-kT+MA2JsNLk10HpxAjpB5HHtR0WCoxZEUwLsy/BBww5lXmsrf34QzmTw7SL6DabZVxs+YCb9RhU9KTmFygGxCg==
   dependencies:
     "@ember/edition-utils" "^1.2.0"
-    babel-plugin-ember-template-compilation "^2.0.0"
+    babel-plugin-ember-template-compilation "^1.0.0"
     babel-plugin-htmlbars-inline-precompile "^5.3.0"
     broccoli-debug "^0.6.5"
     broccoli-persistent-filter "^3.1.2"
@@ -6355,10 +8435,10 @@ ember-cli-htmlbars@^6.0.0, ember-cli-htmlbars@^6.0.1, ember-cli-htmlbars@^6.1.0,
     silent-error "^1.1.1"
     walk-sync "^2.2.0"
 
-ember-cli-inject-live-reload@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.1.0.tgz#ef63c733c133024d5726405a3c247fa12e88a385"
-  integrity sha512-YV5wYRD5PJHmxaxaJt18u6LE6Y+wo455BnmcpN+hGNlChy2piM9/GMvYgTAz/8Vin8RJ5KekqP/w/NEaRndc/A==
+ember-cli-inject-live-reload@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.0.2.tgz#95edb543b386239d35959e5ea9579f5382976ac7"
+  integrity sha512-HDD6o/kBHT/kUtazklU0OW23q2jigIN42QmcpFdXUSvJ2/2SYA6yIqSUxWfJgISmtn5gTNZ2KPq1p3dLkhJxSQ==
   dependencies:
     clean-base-url "^1.0.0"
     ember-cli-version-checker "^3.1.3"
@@ -6366,17 +8446,17 @@ ember-cli-inject-live-reload@^2.1.0:
 ember-cli-is-package-missing@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-is-package-missing/-/ember-cli-is-package-missing-1.0.0.tgz#6e6184cafb92635dd93ca6c946b104292d4e3390"
-  integrity sha512-9hEoZj6Au5onlSDdcoBqYEPT8ehlYntZPxH8pBKV0GO7LNel88otSAQsCfXvbi2eKE+MaSeLG/gNaCI5UdWm9g==
+  integrity sha1-bmGEyvuSY13ZPKbJRrEEKS1OM5A=
 
 ember-cli-lodash-subset@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
-  integrity sha512-QkLGcYv1WRK35g4MWu/uIeJ5Suk2eJXKtZ+8s+qE7C9INmpCPyPxzaqZABquYzcWNzIdw6kYwz3NWAFdKYFxwg==
+  integrity sha1-IMtop5D+D94kiN39jvu332/nZvI=
 
 ember-cli-node-assets@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/ember-cli-node-assets/-/ember-cli-node-assets-0.2.2.tgz#d2d55626e7cc6619f882d7fe55751f9266022708"
-  integrity sha512-pFyjlhzwx2FxAmkxSVJvP+i+MwHDhmgsmma1ZQbFLYwBeufo1GIzqSJUfStcpOE1NDg8fXm2yZVVzdZYf9lW2w==
+  integrity sha1-0tVWJufMZhn4gtf+VXUfkmYCJwg=
   dependencies:
     broccoli-funnel "^1.0.1"
     broccoli-merge-trees "^1.1.1"
@@ -6388,14 +8468,14 @@ ember-cli-node-assets@^0.2.2:
 ember-cli-normalize-entity-name@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz#0b14f7bcbc599aa117b5fddc81e4fd03c4bad5b7"
-  integrity sha512-rF4P1rW2P1gVX1ynZYPmuIf7TnAFDiJmIUFI1Xz16VYykUAyiOCme0Y22LeZq8rTzwBMiwBwoE3RO4GYWehXZA==
+  integrity sha1-CxT3vLxZmqEXtf3cgeT9A8S61bc=
   dependencies:
     silent-error "^1.0.0"
 
 ember-cli-page-object@^1.17.11:
-  version "1.17.12"
-  resolved "https://registry.yarnpkg.com/ember-cli-page-object/-/ember-cli-page-object-1.17.12.tgz#bb5e3b01e81798cbea064d218bbff8cd52e4229b"
-  integrity sha512-G5HCIp8Fp2ywrlBoaxdKNsAsJClnLyG+6Xg7liygnJxYpjc2e9BNcCXShxVsfkG3thlEFhNRWm5TY2TXNguOVA==
+  version "1.17.11"
+  resolved "https://registry.yarnpkg.com/ember-cli-page-object/-/ember-cli-page-object-1.17.11.tgz#e5972484525d0f0da9b4b715843c830b49b9c662"
+  integrity sha512-k1VagZdUHHkPGW5l+vZnKNVW1dPRpWm4Hqy75o1dF3oVHF+NFUmEI/ZDV3m2dS0YindReGfbojeox9vGgKYlcQ==
   dependencies:
     broccoli-file-creator "^2.1.1"
     broccoli-merge-trees "^2.0.0"
@@ -6409,12 +8489,12 @@ ember-cli-page-object@^1.17.11:
 ember-cli-path-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-path-utils/-/ember-cli-path-utils-1.0.0.tgz#4e39af8b55301cddc5017739b77a804fba2071ed"
-  integrity sha512-Qq0vvquzf4cFHoDZavzkOy3Izc893r/5spspWgyzLCPTaG78fM3HsrjZm7UWEltbXUqwHHYrqZd/R0jS08NqSA==
+  integrity sha1-Tjmvi1UwHN3FAXc5t3qAT7ogce0=
 
 ember-cli-postcss@^8.1.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-postcss/-/ember-cli-postcss-8.2.0.tgz#9cc1fee624d2d13c41633cf32d4e8cb8d5f88eff"
-  integrity sha512-S2HQqmNtcezmLSt/OPZKCXg+aRV7yFoZp+tn1HCLSbR/eU95xl7MWxTjbj/wOIGMfhggy/hBT2+STDh8mGuVpw==
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-postcss/-/ember-cli-postcss-8.1.0.tgz#a7bbcb7799f3fb9c908247de30c0bee312e0399b"
+  integrity sha512-GkvMgM/GMoSi5H1xl+cp/nudQJ1uT49cgvFOx1anjhFiWDvym5Okq83JOhfbUcUAOurHjMLWugDmpAaxDM8KyA==
   dependencies:
     broccoli-merge-trees "^4.2.0"
     broccoli-postcss "^6.0.1"
@@ -6445,7 +8525,7 @@ ember-cli-sass@^10.0.1:
 ember-cli-sri@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ember-cli-sri/-/ember-cli-sri-2.1.1.tgz#971620934a4b9183cf7923cc03e178b83aa907fd"
-  integrity sha512-YG/lojDxkur9Bnskt7xB6gUOtJ6aPl/+JyGYm9HNDk3GECVHB3SMN3rlGhDKHa1ndS5NK2W2TSLb9bzRbGlMdg==
+  integrity sha1-lxYgk0pLkYPPeSPMA+F4uDqpB/0=
   dependencies:
     broccoli-sri-hash "^2.1.0"
 
@@ -6462,7 +8542,7 @@ ember-cli-string-helpers@^6.1.0:
 ember-cli-string-utils@^1.0.0, ember-cli-string-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
-  integrity sha512-PlJt4fUDyBrC/0X+4cOpaGCiMawaaB//qD85AXmDRikxhxVzfVdpuoec02HSiTGTTB85qCIzWBIh8lDOiMyyFg==
+  integrity sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=
 
 ember-cli-template-lint@^2.0.1:
   version "2.0.2"
@@ -6491,7 +8571,7 @@ ember-cli-terser@^4.0.2:
 ember-cli-test-info@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-test-info/-/ember-cli-test-info-1.0.0.tgz#ed4e960f249e97523cf891e4aed2072ce84577b4"
-  integrity sha512-dEVTIpmUfCzweC97NGf6p7L6XKBwV2GmSM4elmzKvkttEp5P7AvGA9uGyN4GqFq+RwhW+2b0I2qlX00w+skm+A==
+  integrity sha1-7U6WDySel1I8+JHkrtIHLOhFd7Q=
   dependencies:
     ember-cli-string-utils "^1.0.0"
 
@@ -6557,10 +8637,26 @@ ember-cli-typescript@^3.1.3, ember-cli-typescript@^3.1.4:
     stagehand "^1.0.0"
     walk-sync "^2.0.0"
 
-ember-cli-typescript@^4.0.0, ember-cli-typescript@^4.1.0, ember-cli-typescript@^4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-4.2.1.tgz#54d08fc90318cc986f3ea562f93ce58a6cc4c24d"
-  integrity sha512-0iKTZ+/wH6UB/VTWKvGuXlmwiE8HSIGcxHamwNhEC5x1mN3z8RfvsFZdQWYUzIWFN2Tek0gmepGRPTwWdBYl/A==
+ember-cli-typescript@^4.0.0, ember-cli-typescript@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-4.1.0.tgz#2ff17be2e6d26b58c88b1764cb73887e7176618b"
+  integrity sha512-zSuKG8IQuYE3vS+c7V0mHJqwrN/4Wo9Wr50+0NUjnZH3P99ChynczQHu/P7WSifkO6pF6jaxwzf09XzWvG8sVw==
+  dependencies:
+    ansi-to-html "^0.6.6"
+    broccoli-stew "^3.0.0"
+    debug "^4.0.0"
+    execa "^4.0.0"
+    fs-extra "^9.0.1"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^7.3.2"
+    stagehand "^1.0.0"
+    walk-sync "^2.2.0"
+
+ember-cli-typescript@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-5.1.0.tgz#460eb848564e29d64f2b36b2a75bbe98172b72a4"
+  integrity sha512-wEZfJPkjqFEZAxOYkiXsDrJ1HY75e/6FoGhQFg8oNFJeGYpIS/3W0tgyl1aRkSEEN1NRlWocDubJ4aZikT+RTA==
   dependencies:
     ansi-to-html "^0.6.15"
     broccoli-stew "^3.0.0"
@@ -6573,10 +8669,10 @@ ember-cli-typescript@^4.0.0, ember-cli-typescript@^4.1.0, ember-cli-typescript@^
     stagehand "^1.0.0"
     walk-sync "^2.2.0"
 
-ember-cli-typescript@^5.0.0, ember-cli-typescript@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-5.2.1.tgz#553030f1ce3e8958b8e4fc34909acd1218cb35f2"
-  integrity sha512-qqp5TAIuPHxHiGXJKL+78Euyhy0zSKQMovPh8sJpN/ZBYx0H90pONufHR3anaMcp1snVfx4B+mb9+7ijOik8ZA==
+ember-cli-typescript@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-5.1.1.tgz#cf561026f3e7bd05312c1c212acffa1c30d5fa0c"
+  integrity sha512-DbzATYWY8nbXwSxXqtK8YlqGJTcyFyL+eg6IGCc2ur0AMnq/H+o6Z9np9eGoq1sI+HwX7vBkOVoD3k0WurAwXg==
   dependencies:
     ansi-to-html "^0.6.15"
     broccoli-stew "^3.0.0"
@@ -6636,10 +8732,10 @@ ember-cli-yadda@^0.7.0:
     qunit "^2.16.0"
     yadda "*"
 
-ember-cli@3.28.6:
-  version "3.28.6"
-  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.28.6.tgz#477a6a134501639d6cb03da6746158501c41efce"
-  integrity sha512-aGHIDXM5KujhU+tHyfp1X5bUp3yj47sIWI0zgybyIw6vv6ErAu/eKWWMSib5PF8cQDdXG9vttBcXnvQ4QBNIPQ==
+ember-cli@~3.27.0:
+  version "3.27.0"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.27.0.tgz#8ccf9db51d7b462f86210b853d086a4543605c34"
+  integrity sha512-vFLPFkplXn5v005fattHdOcs5AbSp7RG4w1wpHDWHzOSYpl2Dr+5zzZtqLS7V5IVaLf3XK4l24XwhSW9HpMfsQ==
   dependencies:
     "@babel/core" "^7.13.8"
     "@babel/plugin-transform-modules-amd" "^7.12.1"
@@ -6655,7 +8751,7 @@ ember-cli@3.28.6:
     broccoli-config-loader "^1.0.1"
     broccoli-config-replace "^1.1.2"
     broccoli-debug "^0.6.5"
-    broccoli-funnel "^3.0.5"
+    broccoli-funnel "^2.0.2"
     broccoli-funnel-reducer "^1.0.0"
     broccoli-merge-trees "^3.0.2"
     broccoli-middleware "^2.1.1"
@@ -6721,7 +8817,7 @@ ember-cli@3.28.6:
     sane "^4.1.0"
     semver "^7.3.4"
     silent-error "^1.1.1"
-    sort-package-json "^1.49.0"
+    sort-package-json "^1.48.0"
     symlink-or-copy "^1.3.1"
     temp "0.9.4"
     testem "^3.2.0"
@@ -6730,7 +8826,7 @@ ember-cli@3.28.6:
     uuid "^8.3.2"
     walk-sync "^2.2.0"
     watch-detector "^1.0.0"
-    workerpool "^6.1.4"
+    workerpool "^6.0.3"
     yam "^1.0.0"
 
 ember-collection@^1.0.0:
@@ -6742,26 +8838,24 @@ ember-collection@^1.0.0:
     ember-cli-htmlbars "^3.0.1"
     layout-bin-packer "^1.4.0"
 
-ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.4, ember-compatibility-helpers@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.6.tgz#603579ab2fb14be567ef944da3fc2d355f779cd8"
-  integrity sha512-2UBUa5SAuPg8/kRVaiOfTwlXdeVweal1zdNPibwItrhR0IvPrXpaqwJDlEZnWKEoB+h33V0JIfiWleSG6hGkkA==
+ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.2.tgz#839e0c24190b7a2ec8c39b80e030811b1a95b6d3"
+  integrity sha512-EKyCGOGBvKkBsk6wKfg3GhjTvTTkcEwzl/cv4VYvZM18cihmjGNpliR4BymWsKRWrv4VJLyq15Vhk3NHkSNBag==
   dependencies:
     babel-plugin-debug-macros "^0.2.0"
     ember-cli-version-checker "^5.1.1"
-    find-up "^5.0.0"
-    fs-extra "^9.1.0"
     semver "^5.4.1"
 
-ember-composable-helpers@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-4.5.0.tgz#94febbdf4348e64f45f7a6f993f326e32540a61e"
-  integrity sha512-XjpDLyVPsLCy6kd5dIxZonOECCO6AA5sY5Hr6tYUbJg3s5ghFAiFWaNcYraYC+fL2yPJQAswwpfwGlQORUJZkw==
+ember-compatibility-helpers@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.5.tgz#b8363b1d5b8725afa9a4fe2b2986ac28626c6f23"
+  integrity sha512-7cddkQQp8Rs2Mqrj0xqZ0uO7eC9tBCKyZNcP2iE1RxQqOGPv8fiPkj1TUeidUB/Qe80lstoVXWMEuqqhW7Yy9A==
   dependencies:
-    "@babel/core" "^7.0.0"
-    broccoli-funnel "2.0.1"
-    ember-cli-babel "^7.26.3"
-    resolve "^1.10.0"
+    babel-plugin-debug-macros "^0.2.0"
+    ember-cli-version-checker "^5.1.1"
+    fs-extra "^9.1.0"
+    semver "^5.4.1"
 
 ember-composable-helpers@^5.0.0:
   version "5.0.0"
@@ -6784,16 +8878,13 @@ ember-concurrency-decorators@^2.0.0:
     ember-cli-typescript "^3.1.4"
 
 "ember-concurrency@>=1.0.0 <3":
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-2.3.7.tgz#52d786e37704b9054da1952638797e23714ec0e1"
-  integrity sha512-sz6sTIXN/CuLb5wdpauFa+rWXuvXXSnSHS4kuNzU5GSMDX1pLBWSuovoUk61FUe6CYRqBmT1/UushObwBGickQ==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-2.0.3.tgz#d8ac917fdf013a277bfc7b26e417937ee0638455"
+  integrity sha512-+fOOFt32odnunDL3Du0LqMgnRzDDNKnzo1ry9ppICpvLXekJzYFwU1RniVivfJ+9nbpHMJZQUlZJAm1ZAnTExw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/types" "^7.12.13"
-    "@glimmer/tracking" "^1.0.4"
-    ember-cli-babel "^7.26.11"
-    ember-cli-babel-plugin-helpers "^1.1.1"
-    ember-cli-htmlbars "^5.7.1"
+    "@glimmer/tracking" "^1.0.2"
+    ember-cli-babel "^7.22.1"
+    ember-cli-htmlbars "^5.6.3"
     ember-compatibility-helpers "^1.2.0"
     ember-destroyable-polyfill "^2.0.2"
 
@@ -6818,20 +8909,21 @@ ember-data-model-fragments@5.0.0-beta.8:
     git-repo-info "^2.1.1"
     npm-git-info "^1.0.3"
 
-ember-data@~3.28.6:
-  version "3.28.13"
-  resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.28.13.tgz#68668d84924453c2baeeb0cf7d25f75b2c07e8b9"
-  integrity sha512-j1YjPl2JNHxQwQW6Bgfis44XSr4WCtdwMXr/SPpLsF1oVeTWIn3kwefcDnbuCI8Spmt1B9ab3ZLKzf2KkGN/7g==
-  dependencies:
-    "@ember-data/adapter" "3.28.13"
-    "@ember-data/debug" "3.28.13"
-    "@ember-data/model" "3.28.13"
-    "@ember-data/private-build-infra" "3.28.13"
-    "@ember-data/record-data" "3.28.13"
-    "@ember-data/serializer" "3.28.13"
-    "@ember-data/store" "3.28.13"
+ember-data@~3.27.1:
+  version "3.27.1"
+  resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.27.1.tgz#02d6b76c1d5de0f50d24274147b8711f6ca4f28d"
+  integrity sha512-36P8+7B6Z5ZjyITFbf2Wcub/fdE2DTsLoPPZK7It488fub5s90o85XC0WlwUQPvff39us2N4pzjwmCZ8Jj/gjg==
+  dependencies:
+    "@ember-data/adapter" "3.27.1"
+    "@ember-data/debug" "3.27.1"
+    "@ember-data/model" "3.27.1"
+    "@ember-data/private-build-infra" "3.27.1"
+    "@ember-data/record-data" "3.27.1"
+    "@ember-data/serializer" "3.27.1"
+    "@ember-data/store" "3.27.1"
     "@ember/edition-utils" "^1.2.0"
-    "@ember/string" "^3.0.0"
+    "@ember/ordered-set" "^4.0.0"
+    "@ember/string" "^1.0.0"
     "@glimmer/env" "^0.1.7"
     broccoli-merge-trees "^4.2.0"
     ember-cli-babel "^7.26.6"
@@ -6897,14 +8989,6 @@ ember-factory-for-polyfill@^1.3.1:
   dependencies:
     ember-cli-version-checker "^2.1.0"
 
-ember-focus-trap@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ember-focus-trap/-/ember-focus-trap-1.0.1.tgz#a99565f6ce55d500b92a0965e79e3ad04219f157"
-  integrity sha512-ZUyq5ZkIuXp+ng9rCMkqBh36/V95PltL7iljStkma4+651xlAy3Z84L9WOu/uOJyVpNUxii8RJBbAySHV6c+RQ==
-  dependencies:
-    "@embroider/addon-shim" "^1.0.0"
-    focus-trap "^6.7.1"
-
 ember-get-config@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.3.0.tgz#a73a1a87b48d9dde4c66a0e52ed5260b8a48cfbd"
@@ -6921,7 +9005,7 @@ ember-getowner-polyfill@^2.0.0:
     ember-cli-version-checker "^2.1.0"
     ember-factory-for-polyfill "^1.3.1"
 
-ember-in-element-polyfill@^1.0.0:
+ember-in-element-polyfill@^1.0.0, ember-in-element-polyfill@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ember-in-element-polyfill/-/ember-in-element-polyfill-1.0.1.tgz#143504445bb4301656a2eaad42644d684f5164dd"
   integrity sha512-eHs+7D7PuQr8a1DPqsJTsEyo3FZ1XuH6WEZaEBPDa9s0xLlwByCNKl8hi1EbXOgvgEZNHHi9Rh0vjxyfakrlgg==
@@ -6932,18 +9016,25 @@ ember-in-element-polyfill@^1.0.0:
     ember-cli-version-checker "^5.1.2"
 
 ember-in-viewport@^3.8.1:
-  version "3.10.3"
-  resolved "https://registry.yarnpkg.com/ember-in-viewport/-/ember-in-viewport-3.10.3.tgz#317472bb82bed11f7895821b799349c6a7406e81"
-  integrity sha512-hSX7p+G6hJjZaY2BAqzyuiMP7QIHzQ4g0+ZBnEwAa8GMbILFAtzPx5A4XEX8wY6dSzhHB9n9jkcWZdmaML6q8A==
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/ember-in-viewport/-/ember-in-viewport-3.8.1.tgz#fd8305366d425c3912def49210e63fd582a7e60d"
+  integrity sha512-abzKIa7FiOBz3fLkZ3ZSgxJQf5enGe1IdrLdjfo5HjdyWTq9j+B0lzuZCoOYUuWdoiTiXvT3gDFNqQ5j7ky2kw==
   dependencies:
-    ember-auto-import "^1.11.2"
-    ember-cli-babel "^7.26.3"
+    ember-auto-import "^1.6.0"
+    ember-cli-babel "^7.22.1"
     ember-modifier "^2.1.0"
     fast-deep-equal "^2.0.1"
-    intersection-observer-admin "~0.3.2"
+    intersection-observer-admin "~0.2.13"
     raf-pool "~0.1.4"
 
-ember-inflector@^4.0.1, ember-inflector@^4.0.2:
+ember-inflector@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-4.0.1.tgz#e0aa9e39119156a278c80bb8cdec8462ecb8e6ab"
+  integrity sha512-D14nH2wVMp13ciOONcHMXwdL/IoMBSDXsGObF2rsQX7F8vGjwp+jnSNzZuGjjIvlBFQydOJ+R2n86J2e8HRTQA==
+  dependencies:
+    ember-cli-babel "^7.23.0"
+
+ember-inflector@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-4.0.2.tgz#4494f1a5f61c1aca7702d59d54024cc92211d8ec"
   integrity sha512-+oRstEa52mm0jAFzhr51/xtEWpCEykB3SEBr7vUg8YnXUZJ5hKNBppP938q8Zzr9XfJEbzrtDSGjhKwJCJv6FQ==
@@ -6999,18 +9090,18 @@ ember-load-initializers@^2.1.2:
     ember-cli-typescript "^2.0.2"
 
 ember-math-helpers@^2.4.0:
-  version "2.18.2"
-  resolved "https://registry.yarnpkg.com/ember-math-helpers/-/ember-math-helpers-2.18.2.tgz#5778f0aae08f3502be8defbacd383794f42b177e"
-  integrity sha512-ikAXlIiT0wk8X8uuMtHkrRYt8HnDt9Wk+iNoY9IoBmt6IRZjCD5BmuxrIPj5Eop2/afMfKmNKnc4L1StkXM3wg==
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/ember-math-helpers/-/ember-math-helpers-2.15.0.tgz#3feb3328354589e4508f7035bd6b37d7df275096"
+  integrity sha512-dxHU0jgErvK+ihl/GEn7FZycgZFZeUgS1P0DlEqSOuzbZ0klikntUgBDfUS1xuF31gRxnDx2V9com28htZJHaA==
   dependencies:
-    broccoli-funnel "^3.0.8"
-    ember-cli-babel "^7.26.11"
-    ember-cli-htmlbars "^6.0.1"
+    broccoli-funnel "^3.0.1"
+    ember-cli-babel "^7.20.5"
+    ember-cli-htmlbars "^5.1.2"
 
 ember-maybe-import-regenerator@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-0.1.6.tgz#35d41828afa6d6a59bc0da3ce47f34c573d776ca"
-  integrity sha512-aX9UINiUXIjzsCNNna1ioASB/2lbnFgSHI63bBcd4MOVE9AqoLdOL7h+ocyylYXyYoBj2JDRwCzjWNf2Xbp5wg==
+  integrity sha1-NdQYKK+m1qWbwNo85H80xXPXdso=
   dependencies:
     broccoli-funnel "^1.0.1"
     broccoli-merge-trees "^1.0.0"
@@ -7018,13 +9109,14 @@ ember-maybe-import-regenerator@^0.1.6:
     regenerator-runtime "^0.9.5"
 
 ember-maybe-in-element@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ember-maybe-in-element/-/ember-maybe-in-element-2.1.0.tgz#f7bd8e41ca90a4f8038d919a9c135cbe7a7f271b"
-  integrity sha512-6WAzPbf4BNQIQzkur2+zRJJJ/PKQoujIYgFjrpj3fOPy8iRlxVUm0/B41qbFyg1LE6bVbg0cWbuESWEvJ9Rswg==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/ember-maybe-in-element/-/ember-maybe-in-element-2.0.3.tgz#640ea56b492bdacd1c41c128c2163d933c18c3ec"
+  integrity sha512-XKuBYPYELwsEmDnJXI7aNSZtt/SKGgRZNMFhASODLz7j0OHSNrcJtjo5Wam/alxIjUIYVjEnMnOzqBLMfJnQkQ==
   dependencies:
-    ember-cli-babel "^7.26.11"
-    ember-cli-htmlbars "^6.1.1"
-    ember-cli-version-checker "^5.1.2"
+    ember-cli-babel "^7.21.0"
+    ember-cli-htmlbars "^5.2.0"
+    ember-cli-version-checker "^5.1.1"
+    ember-in-element-polyfill "^1.0.1"
 
 ember-modifier-manager-polyfill@^1.1.0, ember-modifier-manager-polyfill@^1.2.0:
   version "1.2.0"
@@ -7036,28 +9128,18 @@ ember-modifier-manager-polyfill@^1.1.0, ember-modifier-manager-polyfill@^1.2.0:
     ember-compatibility-helpers "^1.2.0"
 
 ember-modifier@^2.1.0, ember-modifier@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-2.1.2.tgz#62d18faedf972dcd9d34f90d5321fbc943d139b1"
-  integrity sha512-3Lsu1fV1sIGa66HOW07RZc6EHISwKt5VA5AUnFss2HX6OTfpxTJ2qvPctt2Yt0XPQXJ4G6BQasr/F35CX7UGJA==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-2.1.1.tgz#aa3a12e2d6cf1622f774f3f1eab4880982a43fa9"
+  integrity sha512-g9mcpFWgw5lgNU40YNf0USNWqoGTJ+EqjDQKjm7556gaRNDeGnLylFKqx9O3opwLHEt6ZODnRDy9U0S5YEMREg==
   dependencies:
     ember-cli-babel "^7.22.1"
     ember-cli-normalize-entity-name "^1.0.0"
     ember-cli-string-utils "^1.1.0"
     ember-cli-typescript "^3.1.3"
-    ember-compatibility-helpers "^1.2.4"
     ember-destroyable-polyfill "^2.0.2"
     ember-modifier-manager-polyfill "^1.2.0"
 
-"ember-modifier@^2.1.2 || ^3.1.0 || ^4.0.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-4.1.0.tgz#cb91efbf8ca4ff4a1a859767afa42dddba5a2bbd"
-  integrity sha512-YFCNpEYj6jdyy3EjslRb2ehNiDvaOrXTilR9+ngq+iUqSHYto2zKV0rleiA1XJQ27ELM1q8RihT29U6Lq5EyqQ==
-  dependencies:
-    "@embroider/addon-shim" "^1.8.4"
-    ember-cli-normalize-entity-name "^1.0.0"
-    ember-cli-string-utils "^1.1.0"
-
-ember-modifier@^3.2.7:
+"ember-modifier@^2.1.2 || ^3.1.0 || ^4.0.0", ember-modifier@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-3.2.7.tgz#f2d35b7c867cbfc549e1acd8d8903c5ecd02ea4b"
   integrity sha512-ezcPQhH8jUfcJQbbHji4/ZG/h0yyj1jRDknfYue/ypQS8fM8LrGcCMo0rjDZLzL1Vd11InjNs3BD7BdxFlzGoA==
@@ -7068,7 +9150,15 @@ ember-modifier@^3.2.7:
     ember-cli-typescript "^5.0.0"
     ember-compatibility-helpers "^1.2.5"
 
-ember-named-blocks-polyfill@^0.2.3, ember-named-blocks-polyfill@^0.2.5:
+ember-named-blocks-polyfill@^0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/ember-named-blocks-polyfill/-/ember-named-blocks-polyfill-0.2.4.tgz#f5f30711ee89244927b55aae7fa9630edaadc974"
+  integrity sha512-PsohC7ejjS7V++6i/JSy0pl1hXLV3IS3Qs+O7SrjIPYcg1UEmUwqgPiDmXqNgy0p2dc5TK5bIJTtX8wofCI63Q==
+  dependencies:
+    ember-cli-babel "^7.19.0"
+    ember-cli-version-checker "^5.1.1"
+
+ember-named-blocks-polyfill@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/ember-named-blocks-polyfill/-/ember-named-blocks-polyfill-0.2.5.tgz#d5841406277026a221f479c815cfbac6cdcaeecb"
   integrity sha512-OVMxzkfqJrEvmiky7gFzmuTaImCGm7DOudHWTdMBPO7E+dQSunrcRsJMgO9ZZ56suqBIz/yXbEURrmGS+avHxA==
@@ -7118,23 +9208,23 @@ ember-power-select-with-create@^0.8.0:
     ember-power-select "^4.0.0"
 
 ember-power-select@^4.0.0, ember-power-select@^4.0.5:
-  version "4.1.7"
-  resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-4.1.7.tgz#eb547dd37448357d8f3fa789db18ddbba43fb8ca"
-  integrity sha512-Q4cjUudWb7JA6q7qe0jhcpLsipuFUHMwkYC05HxST5qm3MRMEzs6KfZ3Xd/TcrjBLSoWniw3Q61Quwcb41w5Jw==
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-4.1.3.tgz#660d3bec86ce71db43a4a7368a2827b07e65c8b6"
+  integrity sha512-/8HdYb8PptMbrB4lxiPkfRQt6ts83lGRB+ZA6Xr4OaCzWk+5evYm/+a0Q5Gy3XnyhRiQgbzXO07G+fAijXGTOQ==
   dependencies:
-    "@glimmer/component" "^1.0.4"
-    "@glimmer/tracking" "^1.0.4"
+    "@glimmer/component" "^1.0.2"
+    "@glimmer/tracking" "^1.0.2"
     ember-assign-helper "^0.3.0"
-    ember-basic-dropdown "^3.0.21"
-    ember-cli-babel "^7.26.0"
-    ember-cli-htmlbars "^6.0.0"
-    ember-cli-typescript "^4.2.0"
+    ember-basic-dropdown "^3.0.16"
+    ember-cli-babel "^7.23.0"
+    ember-cli-htmlbars "^5.3.1"
+    ember-cli-typescript "^4.1.0"
     ember-concurrency ">=1.0.0 <3"
     ember-concurrency-decorators "^2.0.0"
     ember-text-measurer "^0.6.0"
     ember-truth-helpers "^2.1.0 || ^3.0.0"
 
-ember-qunit@^5.1.5:
+ember-qunit@^5.1.4:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-5.1.5.tgz#24a7850f052be24189ff597dfc31b923e684c444"
   integrity sha512-2cFA4oMygh43RtVcMaBrr086Tpdhgbn3fVZ2awLkzF/rnSN0D0PSRpd7hAD7OdBPerC/ZYRwzVyGXLoW/Zes4A==
@@ -7181,10 +9271,10 @@ ember-resize-observer-service@^0.3.0:
     ember-cli-babel "^7.20.5"
     ember-cli-htmlbars "^5.1.2"
 
-ember-resolver@^8.0.3:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-8.1.0.tgz#8ada162746fde3e6ea6a703bbb9910fbe62ab1e5"
-  integrity sha512-MGD7X2ztZVswGqs1mLgzhZJRhG7XiF6Mg4DgC7xJFWRYQQUHyGJpGdNWY9nXyrYnRIsCrQoL1do41zpxbrB/cg==
+ember-resolver@^8.0.2:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-8.0.3.tgz#40f243aa58281bf195c695fe84a6b291e204690a"
+  integrity sha512-fA53fxfG821BRqNiB9mQDuzZpzSRcSAYZTYBlRQOHsJwoYdjyE7idz4YcytbSsa409G5J2kP6B+PiKOBh0odlw==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
     broccoli-funnel "^3.0.8"
@@ -7194,9 +9284,9 @@ ember-resolver@^8.0.3:
     resolve "^1.20.0"
 
 ember-rfc176-data@^0.3.13, ember-rfc176-data@^0.3.15, ember-rfc176-data@^0.3.17:
-  version "0.3.18"
-  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.18.tgz#bb6fdcef49999981317ea81b6cc9210fb4108d65"
-  integrity sha512-JtuLoYGSjay1W3MQAxt3eINWXNYYQliK90tLwtb8aeCuQK8zKGCRbBodVIrkcTqshULMnRuTOS6t1P7oQk3g6Q==
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.17.tgz#d4fc6c33abd6ef7b3440c107a28e04417b49860a"
+  integrity sha512-EVzTTKqxv9FZbEh6Ktw56YyWRAA0MijKvl7H8C06wVF+8f/cRRz3dXxa4nkwjzyVwx4rzKGuIGq77hxJAQhWWw==
 
 ember-route-action-helper@^2.0.8:
   version "2.0.8"
@@ -7222,12 +9312,21 @@ ember-router-helpers@^0.4.0:
   dependencies:
     ember-cli-babel "^7.20.0"
 
+ember-runtime-enumerable-includes-polyfill@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-2.1.0.tgz#dc6d4a028471e4acc350dfd2a149874fb20913f5"
+  integrity sha512-au18iI8VbEDYn3jLFZzETnKN5ciPgCUxMRucEP3jkq7qZ6sE0FVKpWMPY/h9tTND3VOBJt6fgPpEBJoJVCUudg==
+  dependencies:
+    ember-cli-babel "^6.9.0"
+    ember-cli-version-checker "^2.1.0"
+
 ember-set-helper@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ember-set-helper/-/ember-set-helper-2.0.1.tgz#e39417531e25089b45ccb905b8c00eda7b3fbbde"
-  integrity sha512-6IIimVGOdehZcncH1ilCY4p7hWBtZqWYMc1Xodr1ATOCuIk6ZO1yztKcUQhlmwl7fE82gL4wHD01T6XP5W59Ng==
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ember-set-helper/-/ember-set-helper-2.0.0.tgz#afdb6cf2f5750f6f69e38a387f19615560f30a0f"
+  integrity sha512-cnKbQEkPi+plRI9eWj76zt4pjRKM/PsKIlYP2ZcSI7R83c1Zig5DLDUft+1PJI/1/fnPGLB8s3E6hjFBQo+T9g==
   dependencies:
     ember-cli-babel "^7.18.0"
+    ember-cli-htmlbars "^4.2.3"
 
 ember-sinon-qunit@5.0.0:
   version "5.0.0"
@@ -7255,17 +9354,17 @@ ember-source-channel-url@^3.0.0:
   dependencies:
     node-fetch "^2.6.0"
 
-ember-source@3.28.8:
-  version "3.28.8"
-  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.28.8.tgz#c58fd4a1538d6c4b9aebe76c764cabf5396c64d9"
-  integrity sha512-hA15oYzbRdi9983HIemeVzzX2iLcMmSPp6akUiMQhFZYWPrKksbPyLrO6YpZ4hNM8yBjQSDXEkZ1V3yxBRKjUA==
+ember-source@~3.27.2:
+  version "3.27.5"
+  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.27.5.tgz#8e9ce24c17e7a16dc3c2b128d3d3e24ea79e6726"
+  integrity sha512-oSGM9mD6BuOcGilYqU+F2MtCferQhKWO3REX1P9qgN1Wzfa5kXjbjBBdPNWfBtg7bZLGM27H8JgiV6+t3uGegA==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/plugin-transform-block-scoping" "^7.8.3"
     "@babel/plugin-transform-object-assign" "^7.8.3"
     "@ember/edition-utils" "^1.2.0"
-    "@glimmer/vm-babel-plugins" "0.80.3"
-    babel-plugin-debug-macros "^0.3.4"
+    "@glimmer/vm-babel-plugins" "0.78.2"
+    babel-plugin-debug-macros "^0.3.3"
     babel-plugin-filter-imports "^4.0.0"
     broccoli-concat "^4.2.4"
     broccoli-debug "^0.6.4"
@@ -7300,9 +9399,9 @@ ember-stargate@^0.2.0:
     tracked-maps-and-sets "^2.1.0"
 
 ember-string-fns@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/ember-string-fns/-/ember-string-fns-1.4.1.tgz#3890c80e4d73db78a5d3027c0ec9a3e677b3813a"
-  integrity sha512-PtMjvFq34+ygsIaug0QYW+0e/CsHHRfffFEMIR+R2MIgNYLz/FED4gRMwtPZsUXsrYVr0JMvvbwwAeFxpyxFFw==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ember-string-fns/-/ember-string-fns-1.4.0.tgz#bde188643d54b58c501d332e15ba5c04733a6233"
+  integrity sha512-1pcdUA40PdzzsUAUQ7U4eMRDtxOeUpKwyyInCkj3f/Qdt/QbXZkA/Ix9vWWly9N4QcO7akK0xHWIJiu4XzP8Rw==
   dependencies:
     ember-cli-babel "^7.7.3"
 
@@ -7314,14 +9413,6 @@ ember-style-modifier@^0.6.0:
     ember-cli-babel "^7.21.0"
     ember-modifier "^2.1.0"
 
-ember-style-modifier@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-0.8.0.tgz#ef46b3f288e63e3d850418ea8dc6f7b12edde721"
-  integrity sha512-I7M+oZ+poYYOP7n521rYv7kkYZbxotL8VbtHYxLQ3tasRZYQJ21qfu3vVjydSjwyE3w7EZRgKngBoMhKSAEZnw==
-  dependencies:
-    ember-cli-babel "^7.26.6"
-    ember-modifier "^3.2.7"
-
 ember-template-lint@^2.0.1:
   version "2.21.0"
   resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-2.21.0.tgz#7e120abf309a8810eeed26c52377943faf15a95b"
@@ -7340,30 +9431,30 @@ ember-template-lint@^2.0.1:
     yargs "^16.2.0"
 
 ember-template-recast@^5.0.1:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-5.0.3.tgz#79df27a70bdce7be17f14db13886afde1e9d02d6"
-  integrity sha512-qsJYQhf29Dk6QMfviXhUPE+byMOs6iRQxUDHgkj8yqjeppvjHaFG96hZi/NAXJTm/M7o3PpfF5YlmeaKtI9UeQ==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-5.0.1.tgz#c5d9e7208bf629ee368a3792328f245f3c651003"
+  integrity sha512-MtjyYtr5jnE72i/jVkI3m2QOdozglLwXS3HN74Ge9cm7dz5GoDszVvUksyj/9xqpIP31LMXjs2bZetRGvinU1Q==
   dependencies:
     "@glimmer/reference" "^0.65.0"
     "@glimmer/syntax" "^0.65.0"
     "@glimmer/validator" "^0.65.0"
     async-promise-queue "^1.0.5"
     colors "^1.4.0"
-    commander "^6.2.1"
-    globby "^11.0.3"
-    ora "^5.4.0"
+    commander "^6.2.0"
+    globby "^11.0.1"
+    ora "^5.1.0"
     slash "^3.0.0"
     tmp "^0.2.1"
-    workerpool "^6.1.4"
+    workerpool "^6.0.3"
 
 ember-test-selectors@^5.0.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/ember-test-selectors/-/ember-test-selectors-5.5.0.tgz#114bd29c4a33eee3a328c9ce32a57a018c27f5f6"
-  integrity sha512-PiKhbPnidRYQ5ed/CTU3teJV3XmzkjYjsCGx1UTy7qEY/1dEqxezlZu1DtisoLJ9Y+BcjTVlE+596lo9cOXd3w==
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ember-test-selectors/-/ember-test-selectors-5.0.0.tgz#36c30f64498039cb88797cdda682275a460ee624"
+  integrity sha512-hqAPqyJLEGBYcQ9phOKvHhSCyvcSbUL8Yj2si8OASsQWxwRqbxrtk5YlkN2aZiZdp9PAd2wErS8uClG0U7tNpA==
   dependencies:
     calculate-cache-key-for-tree "^2.0.0"
-    ember-cli-babel "^7.26.4"
-    ember-cli-version-checker "^5.1.2"
+    ember-cli-babel "^7.22.1"
+    ember-cli-version-checker "^5.1.1"
 
 ember-text-measurer@^0.6.0:
   version "0.6.0"
@@ -7382,9 +9473,9 @@ ember-tracked-storage-polyfill@^1.0.0:
     ember-cli-htmlbars "^5.7.1"
 
 "ember-truth-helpers@^2.1.0 || ^3.0.0", ember-truth-helpers@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-3.1.1.tgz#434715926d72bcc63b8a115dec09745fda4474dc"
-  integrity sha512-FHwJAx77aA5q27EhdaaiBFuy9No+8yaWNT5A7zs0sIFCmf14GbcLn69vJEp6mW7vkITezizGAWhw7gL0Wbk7DA==
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-3.0.0.tgz#86766bdca4ac9b86bce3d262dff2aabc4a0ea384"
+  integrity sha512-hPKG9QqruAELh0li5xaiLZtr88ioWYxWCXisAWHWE0qCP4a2hgtuMzKUPpiTCkltvKjuqpzTZCU4VhQ+IlRmew==
   dependencies:
     ember-cli-babel "^7.22.1"
 
@@ -7397,15 +9488,20 @@ ember-validators@~4.0.0:
     ember-cli-babel "^7.26.3"
     ember-cli-htmlbars "^5.7.1"
 
+"emoji-regex@>=6.0.0 <=6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz#c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"
+  integrity sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4=
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emoji-regex@~10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.1.0.tgz#d50e383743c0f7a5945c47087295afc112e3cf66"
-  integrity sha512-xAEnNCT3w2Tg6MA7ly6QqYJvEoY1tm9iIjJ3yMKK9JPlWuRHAMoe5iETwQnx3M9TVbFMfsrBgWKR+IsmswwNjg==
+emoji-regex@~6.1.0:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.3.tgz#ec79a3969b02d2ecf2b72254279bf99bc7a83932"
+  integrity sha1-7HmjlpsC0uzytyJUJ5v5m8eoOTI=
 
 emojis-list@^3.0.0:
   version "3.0.0"
@@ -7415,7 +9511,7 @@ emojis-list@^3.0.0:
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.4"
@@ -7425,14 +9521,14 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
     once "^1.4.0"
 
 engine.io-parser@~5.0.3:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.6.tgz#7811244af173e157295dec9b2718dfe42a64ef45"
-  integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0"
+  integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==
 
-engine.io@~6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.1.tgz#8056b4526a88e779f9c280d820422d4e3eeaaae5"
-  integrity sha512-JFYQurD/nbsA5BSPmbaOSLa3tSVj8L6o4srSwXXY3NqE+gGUNmmPTbhn8tjzcCtSqhFgIeqef81ngny8JM25hw==
+engine.io@~6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.2.0.tgz#003bec48f6815926f2b1b17873e576acd54f41d0"
+  integrity sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"
@@ -7443,7 +9539,7 @@ engine.io@~6.4.1:
     cors "~2.8.5"
     debug "~4.3.1"
     engine.io-parser "~5.0.3"
-    ws "~8.11.0"
+    ws "~8.2.3"
 
 enhanced-resolve@^4.0.0, enhanced-resolve@^4.5.0:
   version "4.5.0"
@@ -7455,9 +9551,9 @@ enhanced-resolve@^4.0.0, enhanced-resolve@^4.5.0:
     tapable "^1.0.0"
 
 enhanced-resolve@^5.10.0:
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
-  integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
+  integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -7474,21 +9570,16 @@ ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, en
   resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
   integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==
 
+entities@^1.1.2, entities@~1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
 entities@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
-entities@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
-  integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
-
-entities@~1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
-  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-
 entities@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
@@ -7520,74 +9611,73 @@ error@^7.0.0:
   dependencies:
     string-template "~0.2.1"
 
-es-abstract@^1.19.0, es-abstract@^1.20.4:
-  version "1.21.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6"
-  integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==
+es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
+  integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.2"
+    is-callable "^1.2.3"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.2"
+    is-string "^1.0.5"
+    object-inspect "^1.9.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.0"
+
+es-abstract@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
+  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
   dependencies:
-    available-typed-arrays "^1.0.5"
     call-bind "^1.0.2"
-    es-set-tostringtag "^2.0.1"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.3"
+    get-intrinsic "^1.1.1"
     get-symbol-description "^1.0.0"
-    globalthis "^1.0.3"
-    gopd "^1.0.1"
     has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-proto "^1.0.1"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.4"
-    is-array-buffer "^3.0.1"
-    is-callable "^1.2.7"
-    is-negative-zero "^2.0.2"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.1"
     is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
+    is-shared-array-buffer "^1.0.1"
     is-string "^1.0.7"
-    is-typed-array "^1.1.10"
-    is-weakref "^1.0.2"
-    object-inspect "^1.12.2"
+    is-weakref "^1.0.1"
+    object-inspect "^1.11.0"
     object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
-    safe-regex-test "^1.0.0"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
-    typed-array-length "^1.0.4"
-    unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.9"
-
-es-get-iterator@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6"
-  integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
+
+es-get-iterator@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz#9234c54aba713486d7ebde0220864af5e2b283f7"
+  integrity sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==
   dependencies:
     call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
-    has-symbols "^1.0.3"
-    is-arguments "^1.1.1"
+    get-intrinsic "^1.1.0"
+    has-symbols "^1.0.1"
+    is-arguments "^1.1.0"
     is-map "^2.0.2"
     is-set "^2.0.2"
-    is-string "^1.0.7"
+    is-string "^1.0.5"
     isarray "^2.0.5"
-    stop-iteration-iterator "^1.0.0"
 
 es-module-lexer@^0.9.0:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
   integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
-es-set-tostringtag@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
-  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
-  dependencies:
-    get-intrinsic "^1.1.3"
-    has "^1.0.3"
-    has-tostringtag "^1.0.0"
-
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -7605,12 +9695,12 @@ escalade@^3.1.1:
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escape-string-regexp@^4.0.0:
   version "4.0.0"
@@ -7630,11 +9720,11 @@ escodegen@^2.0.0:
     source-map "~0.6.1"
 
 eslint-config-prettier@^8.3.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.7.0.tgz#f1cc58a8afebc50980bd53475451df146c13182d"
-  integrity sha512-HHVXLSlVUhMSmyW4ZzEuvjpwqamgmlfkutD53cYXLikh4pt/modINRcCIApJ84czDxM4GZInwUrromsDdTImTA==
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
+  integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
 
-eslint-plugin-ember@^10.5.8:
+eslint-plugin-ember@^10.4.2:
   version "10.6.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-10.6.1.tgz#04ea84cc82307f64a2faa4f2855b30e5ebf9f722"
   integrity sha512-R+TN3jwhYQ2ytZCA1VkfJDZSGgHFOHjsHU1DrBlRXYRepThe56PpuGxywAyDvQ7inhoAz3e6G6M60PzpvjzmNg==
@@ -7668,14 +9758,14 @@ eslint-plugin-node@^11.0.0:
     resolve "^1.10.1"
     semver "^6.1.0"
 
-eslint-plugin-prettier@^3.4.1:
+eslint-plugin-prettier@^3.4.0:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5"
   integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-qunit@^6.2.0:
+eslint-plugin-qunit@^6.1.1:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-6.2.0.tgz#f4efda29da99523e560848d9592c39c0590c308d"
   integrity sha512-KvPmkIC2MHpfRxs/r8WUeeGkG6y+3qwSi2AZIBtjcM/YG6Z3k0GxW5Hbu3l7X0TDhljVCeBb9Q5puUkHzl83Mw==
@@ -7719,11 +9809,11 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
 eslint-visitor-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
+  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@^7.32.0:
+eslint@^7.27.0:
   version "7.32.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
   integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
@@ -7791,12 +9881,12 @@ esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
 esprima@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
-  integrity sha512-xoBq/MIShSydNZOkjkoCEjqod963yHNXTLC40ypBhop6yPqflPz/vTinmCfSrGcywVLnSftRf6a0kJLdFdzemw==
+  integrity sha1-U88kes2ncxPlUcOqLnM0LT+099k=
 
 esquery@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
-  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
   dependencies:
     estraverse "^5.1.0"
 
@@ -7813,9 +9903,9 @@ estraverse@^4.1.1:
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
-  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
 
 estree-walker@^0.6.1:
   version "0.6.1"
@@ -7830,7 +9920,7 @@ esutils@^2.0.2:
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
 eventemitter3@^4.0.0:
   version "4.0.7"
@@ -7840,7 +9930,7 @@ eventemitter3@^4.0.0:
 events-to-array@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.1.2.tgz#2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6"
-  integrity sha512-inRWzRY7nG+aXZxBzEqYKB3HPgwflZRopAjDCHv0whhRx+MTUr1ei0ICZUypdyE0HRm4L2d5VEcIqLD6yl+BFA==
+  integrity sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y=
 
 events@^3.0.0, events@^3.2.0:
   version "3.3.0"
@@ -7856,9 +9946,9 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     safe-buffer "^5.1.1"
 
 exec-sh@^0.3.2:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
-  integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
+  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
 
 execa@^1.0.0:
   version "1.0.0"
@@ -7937,17 +10027,17 @@ execa@^5.0.0:
 exists-sync@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.4.tgz#9744c2c428cc03b01060db454d4b12f0ef3c8879"
-  integrity sha512-cy5z7K+05RFxHAWY37dSDkPWmuTi+VzrA/xLwPDHmwQPMnO/kVhu6jheGaItlnNRoOE6f5MAjxy3VEupfrHigQ==
+  integrity sha1-l0TCxCjMA7AQYNtFTUsS8O88iHk=
 
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -7960,43 +10050,42 @@ expand-brackets@^2.1.4:
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==
+  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
   dependencies:
     homedir-polyfill "^1.0.1"
 
 express@^4.10.7, express@^4.17.1:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
   dependencies:
-    accepts "~1.3.8"
+    accepts "~1.3.7"
     array-flatten "1.1.1"
-    body-parser "1.20.1"
-    content-disposition "0.5.4"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
     content-type "~1.0.4"
-    cookie "0.5.0"
+    cookie "0.4.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
-    depd "2.0.0"
+    depd "~1.1.2"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "1.2.0"
+    finalhandler "~1.1.2"
     fresh "0.5.2"
-    http-errors "2.0.0"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
-    on-finished "2.4.1"
+    on-finished "~2.3.0"
     parseurl "~1.3.3"
     path-to-regexp "0.1.7"
-    proxy-addr "~2.0.7"
-    qs "6.11.0"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
     range-parser "~1.2.1"
-    safe-buffer "5.2.1"
-    send "0.18.0"
-    serve-static "1.15.0"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
     type-is "~1.6.18"
     utils-merge "1.0.1"
     vary "~1.1.2"
@@ -8004,19 +10093,19 @@ express@^4.10.7, express@^4.17.1:
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@^3.0.2:
+extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -8049,7 +10138,17 @@ extract-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/extract-stack/-/extract-stack-2.0.0.tgz#11367bc865bfcd9bc0db3123e5edb57786f11f9b"
   integrity sha512-AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ==
 
-fake-xml-http-request@^2.1.2:
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fake-xml-http-request@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-2.1.2.tgz#f1786720cae50bbb46273035a0173414f3e85e74"
   integrity sha512-HaFMBi7r+oEC9iJNpc3bvcW7Z7iLmM26hPDmlb0mFwyANSsOQAtJxbdWsXITKOzZUyMYK0zYCv3h5yDj9TsiXg==
@@ -8057,7 +10156,7 @@ fake-xml-http-request@^2.1.2:
 faker@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f"
-  integrity sha512-ILKg69P6y/D8/wSmDXw35Ly0re8QzQ8pMfBCflsGiZG2ZjMUNLYNexA6lz5pkmJlepVdsiDFUxYAzPQ9/+iGLA==
+  integrity sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=
 
 faker@^5.5.3:
   version "5.5.3"
@@ -8067,7 +10166,7 @@ faker@^5.5.3:
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
@@ -8091,10 +10190,22 @@ fast-glob@^2.2.6:
     merge2 "^1.2.3"
     micromatch "^3.1.10"
 
-fast-glob@^3.0.3, fast-glob@^3.2.12, fast-glob@^3.2.5, fast-glob@^3.2.9:
-  version "3.2.12"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
-  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.5:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
+  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
+
+fast-glob@^3.2.11:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
+  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -8110,7 +10221,7 @@ fast-json-stable-stringify@^2.0.0:
 fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fast-memoize@^2.5.2:
   version "2.5.2"
@@ -8120,7 +10231,7 @@ fast-memoize@^2.5.2:
 fast-ordered-set@^1.0.0, fast-ordered-set@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/fast-ordered-set/-/fast-ordered-set-1.0.3.tgz#3fbb36634f7be79e4f7edbdb4a357dee25d184eb"
-  integrity sha512-MxBW4URybFszOx1YlACEoK52P6lE3xiFcPaGCUZ7QQOZ6uJXKo++Se8wa31SjcZ+NC/fdAWX7UtKEfaGgHS2Vg==
+  integrity sha1-P7s2Y097555PftvbSjV97iXRhOs=
   dependencies:
     blank-object "^1.0.1"
 
@@ -8153,13 +10264,13 @@ fast-sourcemap-concat@^2.1.0:
     sourcemap-validator "^1.1.0"
 
 fastq@^1.6.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
-  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
+  integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
   dependencies:
     reusify "^1.0.4"
 
-fault@^1.0.0:
+fault@^1.0.0, fault@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13"
   integrity sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==
@@ -8174,9 +10285,9 @@ faye-websocket@^0.11.3:
     websocket-driver ">=0.5.1"
 
 fb-watchman@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
-  integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
   dependencies:
     bser "2.1.1"
 
@@ -8188,11 +10299,11 @@ figgy-pudding@^3.5.1:
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
   dependencies:
     escape-string-regexp "^1.0.5"
 
-figures@^3.0.0:
+figures@^3.0.0, figures@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
   integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
@@ -8217,14 +10328,14 @@ filesize@^4.1.2:
   integrity sha512-bP82Hi8VRZX/TUBKfE24iiUGsB/sfm2WUrwTQyAzQrhO3V9IhcBBNBXMyzLY5orACxRyYJ3d2HeRVX+eFv4lmA==
 
 filesize@^6.1.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.4.0.tgz#914f50471dd66fdca3cefe628bd0cde4ef769bcd"
-  integrity sha512-mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz#e81bdaa780e2451d714d71c0d7a4f3238d37ad00"
+  integrity sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg==
 
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -8238,7 +10349,7 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-finalhandler@1.1.2:
+finalhandler@1.1.2, finalhandler@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
   integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
@@ -8251,19 +10362,6 @@ finalhandler@1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-finalhandler@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
-  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "2.4.1"
-    parseurl "~1.3.3"
-    statuses "2.0.1"
-    unpipe "~1.0.0"
-
 find-babel-config@^1.1.0, find-babel-config@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
@@ -8282,9 +10380,9 @@ find-cache-dir@^2.1.0:
     pkg-dir "^3.0.0"
 
 find-cache-dir@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
-  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
+  integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
   dependencies:
     commondir "^1.0.1"
     make-dir "^3.0.2"
@@ -8298,7 +10396,7 @@ find-index@^1.1.0:
 find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
@@ -8358,9 +10456,9 @@ findup-sync@^4.0.0:
     resolve-dir "^1.0.1"
 
 fireworm@^0.7.0:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/fireworm/-/fireworm-0.7.2.tgz#bc5736515b48bd30bf3293a2062e0b0e0361537a"
-  integrity sha512-GjebTzq+NKKhfmDxjKq3RXwQcN9xRmZWhnnuC9L+/x5wBQtR0aaQM50HsjrzJ2wc28v1vSdfOpELok0TKR4ddg==
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/fireworm/-/fireworm-0.7.1.tgz#ccf20f7941f108883fcddb99383dbe6e1861c758"
+  integrity sha1-zPIPeUHxCIg/zduZOD2+bhhhx1g=
   dependencies:
     async "~0.2.9"
     is-type "0.0.1"
@@ -8397,9 +10495,9 @@ fixturify@^1.2.0:
     matcher-collection "^2.0.0"
 
 fixturify@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-2.1.1.tgz#e962d72f062600cb81a9651086f60d822c72d998"
-  integrity sha512-SRgwIMXlxkb6AUgaVjIX+jCEqdhyXu9hah7mcK+lWynjKtX73Ux1TDv71B7XyaQ+LJxkYRHl5yCL8IycAvQRUw==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-2.1.0.tgz#a0437faac9b6e4aeb35910a1214df866aeec5d75"
+  integrity sha512-gHq6UCv8DE91EpiaRSzrmvLoRvFOBzI961IQ3gXE5wfmMM1TtApDcZAonG2hnp6GJrVFCxHwP01wSw9VQJiJ1w==
   dependencies:
     "@types/fs-extra" "^8.1.0"
     "@types/minimatch" "^3.0.3"
@@ -8422,9 +10520,9 @@ flat@^5.0.0:
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
 flatted@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
-  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
+  integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
 
 flush-write-stream@^1.0.0:
   version "1.1.1"
@@ -8434,22 +10532,15 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-focus-trap@^6.7.1:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-6.9.4.tgz#436da1a1d935c48b97da63cd8f361c6f3aa16444"
-  integrity sha512-v2NTsZe2FF59Y+sDykKY+XjqZ0cPfhq/hikWVL88BqLivnNiEffAsac6rP6H45ff9wG9LL5ToiDqrLEP9GX9mw==
-  dependencies:
-    tabbable "^5.3.3"
-
 focusable-selectors@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/focusable-selectors/-/focusable-selectors-0.3.1.tgz#7eacbca8dc6cc8d7f7563e5f5cc3699b91e20aaa"
-  integrity sha512-5JLtr0e1YJIfmnVlpLiG+av07dd0Xkf/KfswsXcei5KmLfdwOysTQsjF058ynXniujb1fvev7nql1x+CkC5ikw==
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/focusable-selectors/-/focusable-selectors-0.3.0.tgz#0cf0c617c0f130b3d421be6787acb95b0b4936c4"
+  integrity sha512-R3zJNkDh17VnJZVFtMI3JGoUF8Zld55MKrfiHEjhVAN0+BXxYnjiyMkvAHoLNVs4jvJjjbT9O9c3QInrDZiBOA==
 
 follow-redirects@^1.0.0:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267"
+  integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -8461,26 +10552,36 @@ for-each@^0.3.3:
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-form-data@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
-  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "^1.0.8"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
 format@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
-  integrity sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==
+  integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=
 
-forwarded@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
-  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
 fraction.js@^4.2.0:
   version "4.2.0"
@@ -8490,19 +10591,19 @@ fraction.js@^4.2.0:
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
 from2@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
@@ -8510,7 +10611,7 @@ from2@^2.1.0:
 fs-extra@^0.24.0:
   version "0.24.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
-  integrity sha512-w1RvhdLZdU9V3vQdL+RooGlo6b9R9WVoBanOfoJvosWlqSKvrjFlci2oVhwvLwZXBtM7khyPvZ8r3fwsim3o0A==
+  integrity sha1-1OQ0KpZnXLeEZjOmCZJJMytTmVI=
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^2.1.0"
@@ -8581,7 +10682,19 @@ fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-merger@^3.0.1, fs-merger@^3.2.1:
+fs-merger@^3.0.1, fs-merger@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.1.0.tgz#f30f74f6c70b2ff7333ec074f3d2f22298152f3b"
+  integrity sha512-RZ9JtqugaE8Rkt7idO5NSwcxEGSDZpLmVFjtVQUm3f+bWun7JAU6fKyU6ZJUeUnKdJwGx8uaro+K4QQfOR7vpA==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-node-info "^2.1.0"
+    fs-extra "^8.0.1"
+    fs-tree-diff "^2.0.1"
+    rimraf "^2.6.3"
+    walk-sync "^2.0.2"
+
+fs-merger@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.2.1.tgz#a225b11ae530426138294b8fbb19e82e3d4e0b3b"
   integrity sha512-AN6sX12liy0JE7C2evclwoo0aCG3PFulLjrTLsJpWh/2mM+DinhpSGqYLbHBBbIW1PLRNcFhJG8Axtz8mQW3ug==
@@ -8627,7 +10740,7 @@ fs-updater@^1.0.4:
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-  integrity sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
   dependencies:
     graceful-fs "^4.1.2"
     iferr "^0.1.5"
@@ -8637,7 +10750,7 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.7:
   version "1.2.13"
@@ -8647,7 +10760,7 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
-fsevents@~2.3.2:
+fsevents@~2.3.1, fsevents@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
@@ -8657,30 +10770,15 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
-
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
-
-functions-have-names@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
-  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
 fuse.js@^6.4.6:
-  version "6.6.2"
-  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.6.2.tgz#fe463fed4b98c0226ac3da2856a415576dc9a111"
-  integrity sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==
+  version "6.4.6"
+  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.4.6.tgz#62f216c110e5aa22486aff20be7896d19a059b79"
+  integrity sha512-/gYxR/0VpXmWSfZOIPS3rWwU8SHgsRTwWuXhyb2O6s7aRuVtHtxCkR33bNYu3wyLyNx/Wpv0vU7FZy8Vj53VNw==
 
 gauge@^4.0.3:
   version "4.0.4"
@@ -8699,7 +10797,7 @@ gauge@^4.0.3:
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -8720,14 +10818,14 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f"
-  integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
+get-intrinsic@^1.0.1, get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
   dependencies:
     function-bind "^1.1.1"
     has "^1.0.3"
-    has-symbols "^1.0.3"
+    has-symbols "^1.0.1"
 
 get-own-enumerable-property-symbols@^3.0.0:
   version "3.0.2"
@@ -8742,7 +10840,7 @@ get-package-type@^0.1.0:
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
 get-stdin@^8.0.0:
   version "8.0.0"
@@ -8779,7 +10877,14 @@ get-symbol-description@^1.0.0:
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
 
 git-hooks-list@1.0.3:
   version "1.0.3"
@@ -8792,19 +10897,21 @@ git-repo-info@^2.1.1:
   integrity sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg==
 
 github-slugger@^1.0.0, github-slugger@^1.2.1, github-slugger@^1.3.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.5.0.tgz#17891bbc73232051474d68bd867a34625c955f7d"
-  integrity sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.3.0.tgz#9bd0a95c5efdfc46005e82a906ef8e2a059124c9"
+  integrity sha512-gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q==
+  dependencies:
+    emoji-regex ">=6.0.0 <=6.1.1"
 
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.1.2, glob-parent@~5.1.2:
+glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -8821,7 +10928,7 @@ glob-parent@^6.0.2:
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
-  integrity sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==
+  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
 glob-to-regexp@^0.4.1:
   version "0.4.1"
@@ -8831,7 +10938,7 @@ glob-to-regexp@^0.4.1:
 glob@^5.0.10:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -8839,15 +10946,15 @@ glob@^5.0.10:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.4, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.3:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+glob@^7.0.4, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.1.1"
+    minimatch "^3.0.4"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
@@ -8863,7 +10970,7 @@ global-modules@^1.0.0:
 global-prefix@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==
+  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
   dependencies:
     expand-tilde "^2.0.2"
     homedir-polyfill "^1.0.1"
@@ -8876,10 +10983,17 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.20.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
-  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
+globals@^13.6.0:
+  version "13.7.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.7.0.tgz#aed3bcefd80ad3ec0f0be2cf0c895110c0591795"
+  integrity sha512-Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA==
+  dependencies:
+    type-fest "^0.20.2"
+
+globals@^13.9.0:
+  version "13.17.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz#902eb1e680a41da93945adbdcb5a9f361ba69bd4"
+  integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==
   dependencies:
     type-fest "^0.20.2"
 
@@ -8888,13 +11002,6 @@ globals@^9.18.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
   integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
-globalthis@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
-  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
-  dependencies:
-    define-properties "^1.1.3"
-
 globalyzer@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
@@ -8914,16 +11021,16 @@ globby@10.0.0:
     merge2 "^1.2.3"
     slash "^3.0.0"
 
-globby@^11.0.2, globby@^11.0.3:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
-  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+globby@^11.0.1, globby@^11.0.2:
+  version "11.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83"
+  integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==
   dependencies:
     array-union "^2.1.0"
     dir-glob "^3.0.1"
-    fast-glob "^3.2.9"
-    ignore "^5.2.0"
-    merge2 "^1.4.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
     slash "^3.0.0"
 
 globrex@^0.1.2:
@@ -8934,18 +11041,16 @@ globrex@^0.1.2:
 good-listener@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
-  integrity sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==
+  integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=
   dependencies:
     delegate "^3.1.2"
 
-gopd@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
-  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
-  dependencies:
-    get-intrinsic "^1.1.3"
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -8953,12 +11058,12 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==
+  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
 
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
-  integrity sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==
+  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
 handlebars@^4.0.13, handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.4.2, handlebars@^4.7.3:
   version "4.7.7"
@@ -8972,64 +11077,57 @@ handlebars@^4.0.13, handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.4.2, han
   optionalDependencies:
     uglify-js "^3.1.4"
 
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
 has-ansi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-3.0.0.tgz#36077ef1d15f333484aa7fa77a28606f1c655b37"
-  integrity sha512-5JRDTvNq6mVkaMHQVXrGnaCXHD6JfqxwCy8LA/DQSqLLqePR9uaJVm2u3Ek/UziJFQz+d1ul99RtfIhE2aorkQ==
+  integrity sha1-Ngd+8dFfMzSEqn+neihgbxxlWzc=
   dependencies:
     ansi-regex "^3.0.0"
 
-has-bigints@^1.0.1, has-bigints@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
-  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
+has-bigints@^1.0.0, has-bigints@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
+  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
 
 has-color@~0.1.0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
-  integrity sha512-kaNz5OTAYYmt646Hkqw50/qyxP2vFnTVu5AQ1Zmk22Kk5+4Qx6BpO8+u7IKsML5fOsFk0ZT0AcCJNYwcvaLBvw==
-
-has-dynamic-import@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-dynamic-import/-/has-dynamic-import-2.0.1.tgz#9bca87846aa264f2ad224fcd014946f5e5182f52"
-  integrity sha512-X3fbtsZmwb6W7fJGR9o7x65fZoodygCrZ3TVycvghP62yYQfS0t4RS0Qcz+j5tQYUKeSWS09tHkWW6WhFV3XhQ==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
+  integrity sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-property-descriptors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
-  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
-  dependencies:
-    get-intrinsic "^1.1.1"
-
-has-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
-  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
-
-has-symbols@^1.0.2, has-symbols@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+has-symbols@^1.0.0, has-symbols@^1.0.1, has-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
+  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
 has-tostringtag@^1.0.0:
   version "1.0.0"
@@ -9041,12 +11139,12 @@ has-tostringtag@^1.0.0:
 has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -9055,7 +11153,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -9064,12 +11162,12 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
@@ -9121,9 +11219,9 @@ hast-util-parse-selector@^2.0.0:
   integrity sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==
 
 hast-util-to-html@^7.1.1:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-7.1.3.tgz#9f339ca9bea71246e565fc79ff7dbfe98bb50f5e"
-  integrity sha512-yk2+1p3EJTEE9ZEUkgHsUSVhIpCsL/bvT8E5GzmWc+N1Po5gBw+0F8bo7dpxXR0nu0bQVxVZGX2lBGF21CmeDw==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-7.1.2.tgz#db677f0ee483658cea0eecc9dec30aba42b67111"
+  integrity sha512-pu73bvORzdF6XZgwl9eID/0RjBb/jtRfoGRRSykpR1+o9rCdiAHpgkSukZsQBRlIqMg6ylAcd7F0F7myJUb09Q==
   dependencies:
     ccount "^1.0.0"
     comma-separated-tokens "^1.0.0"
@@ -9188,10 +11286,17 @@ heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3, heimdalljs@^0.2.5, heim
   dependencies:
     rsvp "~3.2.1"
 
+heimdalljs@^0.3.0:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.3.3.tgz#e92d2c6f77fd46d5bf50b610d28ad31755054d0b"
+  integrity sha1-6S0sb3f9RtW/ULYQ0orTF1UFTQs=
+  dependencies:
+    rsvp "~3.2.1"
+
 hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
@@ -9200,7 +11305,7 @@ hmac-drbg@^1.0.1:
 home-or-tmp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
-  integrity sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg==
+  integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
@@ -9213,9 +11318,9 @@ homedir-polyfill@^1.0.1:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
 hosted-git-info@^3.0.8:
   version "3.0.8"
@@ -9225,9 +11330,9 @@ hosted-git-info@^3.0.8:
     lru-cache "^6.0.0"
 
 hosted-git-info@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
-  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.1.tgz#710ef5452ea429a844abc33c981056e7371edab7"
+  integrity sha512-eT7NrxAsppPRQEBSwKSosReE+v8OzABwEScQYk5d4uxaEPlzxTIku7LINXtBGalthkLhJnq5lBI89PfK43zAKg==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -9248,50 +11353,52 @@ html-void-elements@^1.0.0:
   resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483"
   integrity sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==
 
-htmlparser2@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-7.2.0.tgz#8817cdea38bbc324392a90b1990908e81a65f5a5"
-  integrity sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==
+htmlparser2@~4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz#9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"
+  integrity sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==
   dependencies:
     domelementtype "^2.0.1"
-    domhandler "^4.2.2"
-    domutils "^2.8.0"
-    entities "^3.0.1"
+    domhandler "^3.0.0"
+    domutils "^2.0.0"
+    entities "^2.0.0"
 
-http-errors@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
-  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
+http-errors@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
   dependencies:
-    depd "2.0.0"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    toidentifier "1.0.1"
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
 
 http-errors@~1.6.2:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
-http-parser-js@>=0.5.1:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
-  integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
-
-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
+http-errors@~1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
   dependencies:
-    "@tootallnate/once" "1"
-    agent-base "6"
-    debug "4"
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-parser-js@>=0.5.1:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
+  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
 
 http-proxy@^1.13.1, http-proxy@^1.18.1:
   version "1.18.1"
@@ -9302,23 +11409,24 @@ http-proxy@^1.13.1, http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-  integrity sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==
-
-https-proxy-agent@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
-  dependencies:
-    agent-base "6"
-    debug "4"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 https@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz#3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4"
-  integrity sha512-4EC57ddXrkaF0x83Oj8sM6SLQHAWXw90Skqu2M4AEWENZ3F02dFJE/GARA8igO79tcgYqGrD7ae4f5L3um2lgg==
+  integrity sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q=
 
 human-signals@^1.1.1:
   version "1.1.1"
@@ -9366,22 +11474,22 @@ ieee754@^1.1.13, ieee754@^1.1.4:
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-  integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.1, ignore@^5.2.0:
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
-  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+ignore@^5.1.1, ignore@^5.1.4:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
 immutable@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be"
-  integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
+  integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
 
 import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
@@ -9394,12 +11502,12 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
 include-path-searcher@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/include-path-searcher/-/include-path-searcher-0.1.0.tgz#c0cf2ddfa164fb2eae07bc7ca43a7f191cb4d7bd"
-  integrity sha512-KlpXnsZOrBGo4PPKqPFi3Ft6dcRyh8fTaqgzqDRi8jKAsngJEWWOxeFIWC8EfZtXKaZqlsNf9XRwcQ49DVgl/g==
+  integrity sha1-wM8t36Fk+y6uB7x8pDp/GRy0170=
 
 indent-string@^4.0.0:
   version "4.0.0"
@@ -9411,20 +11519,20 @@ infer-owner@^1.0.3:
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
   integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
 
-inflection@^1.12.0, inflection@~1.13.1:
-  version "1.13.4"
-  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.4.tgz#65aa696c4e2da6225b148d7a154c449366633a32"
-  integrity sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==
+inflection@1.12.0, inflection@^1.12.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
+  integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -9432,12 +11540,12 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-  integrity sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
 inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.4:
   version "1.3.8"
@@ -9447,7 +11555,7 @@ ini@^1.3.4:
 inline-source-map-comment@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/inline-source-map-comment/-/inline-source-map-comment-1.0.5.tgz#50a8a44c2a790dfac441b5c94eccd5462635faf6"
-  integrity sha512-a3/m6XgooVCXkZCduOb7pkuvUtNKt4DaqaggKKJrMQHQsqt6JcJXEreExeZiiK4vWL/cM/uF6+chH05pz2/TdQ==
+  integrity sha1-UKikTCp5DfrEQbXJTszVRiY1+vY=
   dependencies:
     chalk "^1.0.0"
     get-stdin "^4.0.1"
@@ -9493,12 +11601,12 @@ inquirer@^7.3.3:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
-internal-slot@^1.0.3, internal-slot@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
-  integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
+internal-slot@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
+  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
   dependencies:
-    get-intrinsic "^1.2.0"
+    get-intrinsic "^1.1.0"
     has "^1.0.3"
     side-channel "^1.0.4"
 
@@ -9507,27 +11615,26 @@ internmap@^1.0.0:
   resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95"
   integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==
 
-intersection-observer-admin@~0.3.2:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/intersection-observer-admin/-/intersection-observer-admin-0.3.3.tgz#176a2a08c1cfa9ec3bc74d81cb9ba6483c30e625"
-  integrity sha512-aKMJPw/8cxybcgYTbnwGn87VgSFbSNNqeChRJahD+ai+jtwlCOdIcEvtuBd2BWO9bPuylVgeQVmGGfX2aS1NIg==
+intersection-observer-admin@~0.2.13:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/intersection-observer-admin/-/intersection-observer-admin-0.2.13.tgz#00a021695bf5aef8d198204514d2f849fd27d089"
+  integrity sha512-REIM59IHXPe9U5eTnowurzzfhgqVkSImZJnOSJZTAJ0LnyJqw8S/eD5s8ZYneQfm9JszhGIBwudF9gF02A3BpQ==
 
-intl-messageformat-parser@^6.0.5:
-  version "6.4.4"
-  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-6.4.4.tgz#abbd94e96dc4ff41607376bfab024553450cc1e0"
-  integrity sha512-7AaFKNZEfzLQR6+jivOuz9e7yA8ka5KrmLebgY4QHTRLf8r64dp3LjnW98LkBWjdk8GK0sawD2dHDqW++A/pXA==
+intl-messageformat-parser@6.4.3, intl-messageformat-parser@^6.0.5:
+  version "6.4.3"
+  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-6.4.3.tgz#4326201256c52907f342c7bb058208113c3c7f95"
+  integrity sha512-gpB7OeKDSd9wqjIQ7wVQM9byrpMlokGoUfJND7DS9SjoBbOsZIHAHw+lrmAWYmq+MI3WQUeLouSFdYAZ6zSX9A==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.6.4"
+    "@formatjs/ecma402-abstract" "1.6.3"
     tslib "^2.1.0"
 
 intl-messageformat@^9.3.6:
-  version "9.13.0"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.13.0.tgz#97360b73bd82212e4f6005c712a4a16053165468"
-  integrity sha512-7sGC7QnSQGa5LZP7bXLDhVDtQOeKGeBFGHF2Y8LVBwYZoQZCgWeKoPGTa5GMG8g/TzDgeXuYJQis7Ggiw2xTOw==
+  version "9.5.3"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.5.3.tgz#cb89a91cc2da875c5c824d374ba8209fac63a3ca"
+  integrity sha512-Ei8vH41/icJsc16ZfWk1FzZ2SpaVn0gElXsQCKKPerxK/28m1gVdH0G26GuCqAyz5ETEJiSRn8sPMaSWJDuTjg==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.11.4"
-    "@formatjs/fast-memoize" "1.2.1"
-    "@formatjs/icu-messageformat-parser" "2.1.0"
+    fast-memoize "^2.5.2"
+    intl-messageformat-parser "6.4.3"
     tslib "^2.1.0"
 
 invariant@^2.2.2:
@@ -9545,7 +11652,7 @@ ipaddr.js@1.9.1:
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
@@ -9569,39 +11676,27 @@ is-alphanumerical@^1.0.0:
     is-alphabetical "^1.0.0"
     is-decimal "^1.0.0"
 
-is-arguments@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
-  integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-array-buffer@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
-  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
+is-arguments@^1.0.4, is-arguments@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
+  integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.2.0"
-    is-typed-array "^1.1.10"
+    call-bind "^1.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-bigint@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
-  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
-  dependencies:
-    has-bigints "^1.0.1"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
+  integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
 
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  integrity sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
@@ -9613,14 +11708,13 @@ is-binary-path@~2.1.0:
     binary-extensions "^2.0.0"
 
 is-boolean-object@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
-  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
+  integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
   dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
+    call-bind "^1.0.0"
 
-is-buffer@^1.1.5:
+is-buffer@^1.1.4, is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -9630,22 +11724,34 @@ is-buffer@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
   integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
 
-is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
-  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
+is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
+  integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
+
+is-callable@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
+  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
+
+is-core-module@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  dependencies:
+    has "^1.0.3"
 
 is-core-module@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
-  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
+  integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
   dependencies:
     has "^1.0.3"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
@@ -9656,12 +11762,10 @@ is-data-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-date-object@^1.0.1, is-date-object@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
-  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
-  dependencies:
-    has-tostringtag "^1.0.0"
+is-date-object@^1.0.1, is-date-object@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
 
 is-decimal@^1.0.0:
   version "1.0.4"
@@ -9687,14 +11791,14 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     kind-of "^6.0.2"
 
 is-docker@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
-  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
+  integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
@@ -9706,7 +11810,7 @@ is-extendable@^1.0.1:
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.1.0"
@@ -9716,14 +11820,14 @@ is-finite@^1.0.0:
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
@@ -9733,16 +11837,23 @@ is-fullwidth-code-point@^3.0.0:
 is-git-url@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
-  integrity sha512-UCFta9F9rWFSavp9H3zHEHrARUfZbdJvmHKeEpds4BK3v7W2LdXoNypMtXXi5w5YBDEBCTYmbI+vsSwI8LYJaQ==
+  integrity sha1-U/aEzRQyhbUsMkS05vKCU1J69ms=
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-glob@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -9769,22 +11880,20 @@ is-map@^2.0.1, is-map@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
   integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
 
-is-negative-zero@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
-  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+is-negative-zero@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
 
 is-number-object@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
-  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
-  dependencies:
-    has-tostringtag "^1.0.0"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
+  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
@@ -9796,7 +11905,7 @@ is-number@^7.0.0:
 is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
 is-obj@^2.0.0:
   version "2.0.0"
@@ -9808,10 +11917,10 @@ is-plain-obj@2.1.0, is-plain-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
   integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
 
-is-plain-obj@^1.1:
+is-plain-obj@^1.1, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
@@ -9820,10 +11929,18 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-potential-custom-element-name@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
-  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
+is-potential-custom-element-name@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
+  integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
+
+is-regex@^1.1.1, is-regex@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
+  integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
+  dependencies:
+    call-bind "^1.0.2"
+    has-symbols "^1.0.1"
 
 is-regex@^1.1.4:
   version "1.1.4"
@@ -9836,31 +11953,34 @@ is-regex@^1.1.4:
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
-  integrity sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==
+  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
 
 is-set@^2.0.1, is-set@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
   integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
 
-is-shared-array-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
-  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
-  dependencies:
-    call-bind "^1.0.2"
+is-shared-array-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
+  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
 
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+
+is-string@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
+  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
 
-is-string@^1.0.5, is-string@^1.0.7:
+is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
   integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
@@ -9868,34 +11988,34 @@ is-string@^1.0.5, is-string@^1.0.7:
     has-tostringtag "^1.0.0"
 
 is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
-  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
+  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
   dependencies:
-    has-symbols "^1.0.2"
+    has-symbols "^1.0.1"
 
 is-type@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/is-type/-/is-type-0.0.1.tgz#f651d85c365d44955d14a51d8d7061f3f6b4779c"
-  integrity sha512-YwJh/zBVrcJ90aAnPBM0CbHvm7lG9ao7lIFeqTZ1UQj4iFLpM5CikdaU+dGGesrMJwxLqPGmjjrUrQ6Kn3Zh+w==
+  integrity sha1-9lHYXDZdRJVdFKUdjXBh8/a0d5w=
   dependencies:
     core-util-is "~1.0.0"
 
-is-typed-array@^1.1.10, is-typed-array@^1.1.9:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
-  integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
+is-typed-array@^1.1.3:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.5.tgz#f32e6e096455e329eb7b423862456aa213f0eb4e"
+  integrity sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug==
   dependencies:
-    available-typed-arrays "^1.0.5"
+    available-typed-arrays "^1.0.2"
     call-bind "^1.0.2"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
+    es-abstract "^1.18.0-next.2"
+    foreach "^2.0.5"
+    has-symbols "^1.0.1"
 
-is-typedarray@^1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-unicode-supported@^0.1.0:
   version "0.1.0"
@@ -9907,30 +12027,37 @@ is-weakmap@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
   integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
 
-is-weakref@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
-  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
+is-weakref@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
+  integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==
   dependencies:
-    call-bind "^1.0.2"
+    call-bind "^1.0.0"
 
 is-weakset@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d"
-  integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83"
+  integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==
+
+is-whitespace-character@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
+  integrity sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==
 
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
+is-word-character@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230"
+  integrity sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==
+
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 is-wsl@^2.2.0:
   version "2.2.0"
@@ -9942,12 +12069,12 @@ is-wsl@^2.2.0:
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isarray@^2.0.5:
   version "2.0.5"
@@ -9955,41 +12082,45 @@ isarray@^2.0.5:
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
 isbinaryfile@^4.0.6:
-  version "4.0.10"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3"
-  integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b"
+  integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
-  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-istanbul-lib-instrument@^5.0.4:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
-  integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
+istanbul-lib-coverage@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
+  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+
+istanbul-lib-instrument@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
+  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
   dependencies:
-    "@babel/core" "^7.12.3"
-    "@babel/parser" "^7.14.7"
+    "@babel/core" "^7.7.5"
     "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.2.0"
+    istanbul-lib-coverage "^3.0.0"
     semver "^6.3.0"
 
 istanbul-lib-report@^3.0.0:
@@ -10002,9 +12133,9 @@ istanbul-lib-report@^3.0.0:
     supports-color "^7.1.0"
 
 istanbul-reports@^3.0.2:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
-  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
+  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
@@ -10012,7 +12143,7 @@ istanbul-reports@^3.0.2:
 istextorbinary@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.1.0.tgz#dbed2a6f51be2f7475b68f89465811141b758874"
-  integrity sha512-kT1g2zxZ5Tdabtpp9VSdOzW9lb6LXImyWbzbQeTxoRtHhurC9Ej9Wckngr2+uepPL09ky/mJHmN9jeJPML5t6A==
+  integrity sha1-2+0qb1G+L3R1to+JRlgRFBt1iHQ=
   dependencies:
     binaryextensions "1 || 2"
     editions "^1.1.1"
@@ -10030,7 +12161,7 @@ istextorbinary@^2.5.1:
 ivy-codemirror@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ivy-codemirror/-/ivy-codemirror-2.1.0.tgz#c06f1606c375610bf62b007a21a9e63f5854175e"
-  integrity sha512-+Ha6Yf39fiK3dfQD5vlanrQ8GMIf/KVRbxzEzG+AsvAgUNSO8VECCfIRzdHQZcBfi9jNCaT+9q6VQd7mSqNalQ==
+  integrity sha1-wG8WBsN1YQv2KwB6IanmP1hUF14=
   dependencies:
     codemirror "~5.15.0"
     ember-cli-babel "^6.0.0"
@@ -10045,15 +12176,20 @@ jest-worker@^27.4.5:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jquery@^3.4.1, jquery@^3.5.1:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.4.tgz#ba065c188142100be4833699852bf7c24dc0252f"
-  integrity sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==
+jquery@^3.4.1:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
+
+jquery@^3.5.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16"
+  integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==
 
 js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
-  integrity sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==
+  integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
@@ -10063,7 +12199,7 @@ js-string-escape@^1.0.1:
 js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
 js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7:
   version "3.14.1"
@@ -10074,19 +12210,24 @@ js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7:
     esprima "^4.0.0"
 
 js-yaml@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
+  integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
   dependencies:
     argparse "^2.0.1"
 
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
 jsdom@^16.4.0:
-  version "16.7.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
-  integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.1.tgz#4ced6bbd7b77d67fb980e64d9e3e6fb900f97dd6"
+  integrity sha512-pF73EOsJgwZekbDHEY5VO/yKXUkab/DuvrQB/ANVizbr6UAHJsDdHXuotZYwkJSGQl1JM+ivXaqY+XBDDL4TiA==
   dependencies:
     abab "^2.0.5"
-    acorn "^8.2.4"
+    acorn "^8.0.5"
     acorn-globals "^6.0.0"
     cssom "^0.4.4"
     cssstyle "^2.3.0"
@@ -10094,13 +12235,12 @@ jsdom@^16.4.0:
     decimal.js "^10.2.1"
     domexception "^2.0.1"
     escodegen "^2.0.0"
-    form-data "^3.0.0"
     html-encoding-sniffer "^2.0.1"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
-    is-potential-custom-element-name "^1.0.1"
+    is-potential-custom-element-name "^1.0.0"
     nwsapi "^2.2.0"
     parse5 "6.0.1"
+    request "^2.88.2"
+    request-promise-native "^1.0.9"
     saxes "^5.0.1"
     symbol-tree "^3.2.4"
     tough-cookie "^4.0.0"
@@ -10109,14 +12249,14 @@ jsdom@^16.4.0:
     webidl-conversions "^6.1.0"
     whatwg-encoding "^1.0.5"
     whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.5.0"
-    ws "^7.4.6"
+    whatwg-url "^8.0.0"
+    ws "^7.4.4"
     xml-name-validator "^3.0.0"
 
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
-  integrity sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA==
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
 jsesc@^2.5.0, jsesc@^2.5.1:
   version "2.5.2"
@@ -10126,12 +12266,12 @@ jsesc@^2.5.0, jsesc@^2.5.1:
 jsesc@~0.3.x:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.3.0.tgz#1bf5ee63b4539fe2e26d0c1e99c240b97a457972"
-  integrity sha512-UHQmAeTXV+iwEk0aHheJRqo6Or90eDxI6KIYpHSjKLXKuKlPt1CQ7tGBerFcFA8uKU5mYxiPMlckmFptd5XZzA==
+  integrity sha1-G/XuY7RTn+LibQwemcJAuXpFeXI=
 
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
 json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
@@ -10153,31 +12293,53 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
 json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.2.tgz#e06f23128e0bbe342dc996ed5a19e28b57b580e0"
-  integrity sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
   dependencies:
-    jsonify "^0.0.1"
+    jsonify "~0.0.0"
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
 json5@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
-  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.2.2:
+json5@^2.1.2:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
+  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
+  dependencies:
+    minimist "^1.2.5"
+
+json5@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+
+json5@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -10185,14 +12347,14 @@ json5@^2.1.2, json5@^2.2.2:
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  integrity sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==
+  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -10205,10 +12367,10 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonify@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"
-  integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
 jsonlint@^1.6.3:
   version "1.6.3"
@@ -10218,22 +12380,32 @@ jsonlint@^1.6.3:
     JSV "^4.0.x"
     nomnom "^1.5.x"
 
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
 just-extend@^4.0.2:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744"
-  integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.1.tgz#158f1fdb01f128c411dc8b286a7b4837b3545282"
+  integrity sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
@@ -10257,7 +12429,7 @@ layout-bin-packer@^1.4.0:
 leek@0.0.24:
   version "0.0.24"
   resolved "https://registry.yarnpkg.com/leek/-/leek-0.0.24.tgz#e400e57f0e60d8ef2bd4d068dc428a54345dbcda"
-  integrity sha512-6PVFIYXxlYF0o6hrAsHtGpTmi06otkwNrMcmQ0K96SeSRHPREPa9J3nJZ1frliVH7XT0XFswoJFQoXsDukzGNQ==
+  integrity sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=
   dependencies:
     debug "^2.1.0"
     lodash.assign "^3.2.0"
@@ -10274,7 +12446,7 @@ levn@^0.4.1:
 levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
@@ -10296,22 +12468,22 @@ license-checker@^25.0.1:
     treeify "^1.1.0"
 
 lilconfig@^2.0.5, lilconfig@^2.0.6:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
-  integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4"
+  integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==
 
 line-column@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2"
-  integrity sha512-Ktrjk5noGYlHsVnYWh62FLVs4hTb8A3e+vucNZMgPeAOITdshMSgv4cCZQeRDjm7+goqmo6+liZwTXo+U3sVww==
+  integrity sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI=
   dependencies:
     isarray "^1.0.0"
     isobject "^2.0.0"
 
 lines-and-columns@^1.1.6:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
-  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
+  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
 linkify-it@^2.0.0:
   version "2.2.0"
@@ -10321,9 +12493,9 @@ linkify-it@^2.0.0:
     uc.micro "^1.0.1"
 
 linkify-it@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
-  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz#f55eeb8bc1d3ae754049e124ab3bb56d97797fb8"
+  integrity sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==
   dependencies:
     uc.micro "^1.0.1"
 
@@ -10349,16 +12521,17 @@ lint-staged@^10.2.11:
     stringify-object "^3.3.0"
 
 listr2@^3.2.2:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e"
-  integrity sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.4.3.tgz#543bcf849d5ffc70602708b69d2daac73f751699"
+  integrity sha512-wZmkzNiuinOfwrGqAwTCcPw6aKQGTAMGXwG5xeU1WpDjJNeBA35jGBeWxR3OF+R6Yl5Y3dRG+3vE8t6PDcSNHA==
   dependencies:
+    chalk "^4.1.0"
     cli-truncate "^2.1.0"
-    colorette "^2.0.16"
+    figures "^3.2.0"
+    indent-string "^4.0.0"
     log-update "^4.0.0"
     p-map "^4.0.0"
-    rfdc "^1.3.0"
-    rxjs "^7.5.1"
+    rxjs "^6.6.6"
     through "^2.3.8"
     wrap-ansi "^7.0.0"
 
@@ -10370,7 +12543,7 @@ livereload-js@^3.3.1:
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==
+  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^4.0.0"
@@ -10387,19 +12560,19 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
   integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
-loader-utils@^1.2.3:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
-  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
+loader-utils@^1.2.3, loader-utils@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
     json5 "^1.0.1"
 
 loader-utils@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
-  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
+  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -10418,7 +12591,7 @@ locale-emoji@^0.3.0:
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
@@ -10448,7 +12621,7 @@ locate-path@^6.0.0:
 lodash._baseassign@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  integrity sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ==
+  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
   dependencies:
     lodash._basecopy "^3.0.0"
     lodash.keys "^3.0.0"
@@ -10456,12 +12629,12 @@ lodash._baseassign@^3.0.0:
 lodash._basecopy@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==
+  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
 
 lodash._baseflatten@^3.0.0:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz#0770ff80131af6e34f3b511796a7ba5214e65ff7"
-  integrity sha512-fESngZd+X4k+GbTxdMutf8ohQa0s3sJEHIcwtu4/LsIQ2JTDzdRxDCMQjW+ezzwRitLmHnacVVmosCbxifefbw==
+  integrity sha1-B3D/gBMa9uNPO1EXlqe6UhTmX/c=
   dependencies:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
@@ -10469,12 +12642,12 @@ lodash._baseflatten@^3.0.0:
 lodash._bindcallback@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==
+  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
 
 lodash._createassigner@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
-  integrity sha512-LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw==
+  integrity sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=
   dependencies:
     lodash._bindcallback "^3.0.0"
     lodash._isiterateecall "^3.0.0"
@@ -10483,22 +12656,22 @@ lodash._createassigner@^3.0.0:
 lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==
+  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
 
 lodash._isiterateecall@^3.0.0:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==
+  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
 
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
 lodash.assign@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
-  integrity sha512-/VVxzgGBmbphasTg51FrztxQJ/VgAUpol6zmJuSVSGcNg4g7FA4z7rQV8Ovr9V3vFBNWZhvKWHfpAytjTVUfFA==
+  integrity sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=
   dependencies:
     lodash._baseassign "^3.0.0"
     lodash._createassigner "^3.0.0"
@@ -10507,34 +12680,34 @@ lodash.assign@^3.2.0:
 lodash.assignin@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
-  integrity sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==
+  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
 
 lodash.castarray@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115"
-  integrity sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==
+  integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU=
 
 lodash.clonedeep@^4.4.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
 lodash.debounce@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz#812211c378a94cc29d5aa4e3346cf0bfce3a7df5"
-  integrity sha512-lcmJwMpdPAtChA4hfiwxTtgFeNAaow701wWUgVUqeD0XJF7vMXIN+bu/2FJSGxT0NUbZy9g9VFrlOFfPjl+0Ew==
+  integrity sha1-gSIRw3ipTMKdWqTjNGzwv846ffU=
   dependencies:
     lodash._getnative "^3.0.0"
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
 lodash.defaults@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
-  integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
+  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
 
 lodash.defaultsdeep@^4.6.1:
   version "4.6.1"
@@ -10544,12 +12717,12 @@ lodash.defaultsdeep@^4.6.1:
 lodash.find@^4.5.1:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
-  integrity sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg==
+  integrity sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E=
 
 lodash.flatten@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-3.0.2.tgz#de1cf57758f8f4479319d35c3e9cc60c4501938c"
-  integrity sha512-jCXLoNcqQRbnT/KWZq2fIREHWeczrzpTR0vsycm96l/pu5hGeAntVBG0t7GuM/2wFqmnZs3d1eGptnAH2E8+xQ==
+  integrity sha1-3hz1d1j49EeTGdNcPpzGDEUBk4w=
   dependencies:
     lodash._baseflatten "^3.0.0"
     lodash._isiterateecall "^3.0.0"
@@ -10557,27 +12730,27 @@ lodash.flatten@^3.0.2:
 lodash.foreach@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
-  integrity sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==
+  integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
 
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
+  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
 lodash.isarguments@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==
+  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
 
 lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==
+  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
 
 lodash.iteratee@^4.5.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.iteratee/-/lodash.iteratee-4.7.0.tgz#be4177db289a8ccc3c0990f1db26b5b22fc1554c"
-  integrity sha512-yv3cSQZmfpbIKo4Yo45B1taEvxjNvcpF1CEOc0Y6dEyvhPIfEJE3twDwPgWTPQubcSgXyBwBKG6wpQvWMDOf6Q==
+  integrity sha1-vkF32yiajMw8CZDx2ya1si/BVUw=
 
 lodash.kebabcase@^4.1.1:
   version "4.1.1"
@@ -10587,7 +12760,7 @@ lodash.kebabcase@^4.1.1:
 lodash.keys@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==
+  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
   dependencies:
     lodash._getnative "^3.0.0"
     lodash.isarguments "^3.0.0"
@@ -10596,7 +12769,7 @@ lodash.keys@^3.0.0:
 lodash.last@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash.last/-/lodash.last-3.0.0.tgz#242f663112dd4c6e63728c60a3c909d1bdadbd4c"
-  integrity sha512-14mq7rSkCxG4XMy9lF2FbIOqqgF0aH0NfPuQ3LPR3vIh0kHnUvIYP70dqa1Hf47zyXfQ8FzAg0MYOQeSuE1R7A==
+  integrity sha1-JC9mMRLdTG5jcoxgo8kJ0b2tvUw=
 
 lodash.merge@^4.6.0, lodash.merge@^4.6.2:
   version "4.6.2"
@@ -10606,12 +12779,17 @@ lodash.merge@^4.6.0, lodash.merge@^4.6.2:
 lodash.omit@^4.1.0, lodash.omit@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
-  integrity sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==
+  integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=
 
 lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==
+  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
+
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
 lodash.template@^4.5.0:
   version "4.5.0"
@@ -10636,14 +12814,14 @@ lodash.truncate@^4.4.2:
 lodash.uniq@^4.2.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-  integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
 lodash.uniqby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
-  integrity sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==
+  integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
 
-lodash@^4.17.10, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.5.1, lodash@^4.7.0:
+lodash@^4.17.10, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.5.1:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -10707,11 +12885,11 @@ lru-cache@^6.0.0:
     yallist "^4.0.0"
 
 magic-string@^0.25.7:
-  version "0.25.9"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
-  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
+  version "0.25.7"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
+  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
   dependencies:
-    sourcemap-codec "^1.4.8"
+    sourcemap-codec "^1.4.4"
 
 make-dir@^2.0.0:
   version "2.1.0"
@@ -10728,25 +12906,30 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
-makeerror@1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
-  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
+makeerror@1.0.x:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
   dependencies:
-    tmpl "1.0.5"
+    tmpl "1.0.x"
 
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
+markdown-escapes@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
+  integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
+
 markdown-it-terminal@0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.2.1.tgz#670fd5ea824a7dcaa1591dcbeef28bf70aff1705"
@@ -10841,14 +13024,6 @@ mdast-util-find-and-replace@^1.1.0:
     unist-util-is "^4.0.0"
     unist-util-visit-parents "^3.0.0"
 
-mdast-util-footnote@^0.1.0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/mdast-util-footnote/-/mdast-util-footnote-0.1.7.tgz#4b226caeab4613a3362c144c94af0fdd6f7e0ef0"
-  integrity sha512-QxNdO8qSxqbO2e3m09KwDKfWiLgqyCurdWTQ198NpbZ2hxntdc+VKS4fDJCmNWbAroUdYnSthu+XbZ8ovh8C3w==
-  dependencies:
-    mdast-util-to-markdown "^0.6.0"
-    micromark "~2.11.0"
-
 mdast-util-from-markdown@^0.8.0:
   version "0.8.5"
   resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c"
@@ -10867,7 +13042,7 @@ mdast-util-frontmatter@^0.2.0:
   dependencies:
     micromark-extension-frontmatter "^0.2.0"
 
-mdast-util-gfm-autolink-literal@^0.1.0, mdast-util-gfm-autolink-literal@^0.1.3:
+mdast-util-gfm-autolink-literal@^0.1.0:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz#9c4ff399c5ddd2ece40bd3b13e5447d84e385fb7"
   integrity sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==
@@ -10909,7 +13084,7 @@ mdast-util-gfm@^0.1.0:
     mdast-util-gfm-task-list-item "^0.1.0"
     mdast-util-to-markdown "^0.6.1"
 
-mdast-util-to-hast@^10.2.0:
+mdast-util-to-hast@^10.0.0:
   version "10.2.0"
   resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.2.0.tgz#61875526a017d8857b71abc9333942700b2d3604"
   integrity sha512-JoPBfJ3gBnHZ18icCwHR50orC9kNH81tiR1gs01D8Q5YpV6adHNO9nKNuFBCJQ941/32PT1a63UF/DitmS3amQ==
@@ -10958,25 +13133,25 @@ mdast-util-toc@^5.1.0:
     unist-util-is "^4.0.0"
     unist-util-visit "^2.0.0"
 
-mdn-data@2.0.30:
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
-  integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
+mdn-data@2.0.28:
+  version "2.0.28"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba"
+  integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==
 
 mdurl@^1.0.0, mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
+  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
 memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  integrity sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ==
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
@@ -10999,12 +13174,12 @@ memory-streams@^0.1.3:
 memorystream@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
-  integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==
+  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
 
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
 merge-options@^1.0.1:
   version "1.0.1"
@@ -11021,7 +13196,7 @@ merge-stream@^2.0.0:
 merge-trees@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-1.0.1.tgz#ccbe674569787f9def17fd46e6525f5700bbd23e"
-  integrity sha512-O7TWwipLHhc9tErjq3WBvNP7I1g7Wgudl1ZkLqpT7F2MZy1yEdgnI9cpZZxBaqk+wJZu+2b9FE7D3ubUmGFHFA==
+  integrity sha1-zL5nRWl4f53vF/1G5lJfVwC70j4=
   dependencies:
     can-symlink "^1.0.0"
     fs-tree-diff "^0.5.4"
@@ -11038,7 +13213,7 @@ merge-trees@^2.0.0:
     fs-updater "^1.0.4"
     heimdalljs "^0.2.5"
 
-merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
+merge2@^1.2.3, merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -11051,14 +13226,7 @@ merge@^2.1.1:
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
-
-micromark-extension-footnote@^0.3.0:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/micromark-extension-footnote/-/micromark-extension-footnote-0.3.2.tgz#129b74ef4920ce96719b2c06102ee7abb2b88a20"
-  integrity sha512-gr/BeIxbIWQoUm02cIfK7mdMZ/fbroRpLsck4kvFtjbzP4yi+OPVbnukTc/zy0i7spC2xYE/dbX1Sur8BEDJsQ==
-  dependencies:
-    micromark "~2.11.0"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
 micromark-extension-frontmatter@^0.2.0:
   version "0.2.2"
@@ -11068,9 +13236,9 @@ micromark-extension-frontmatter@^0.2.0:
     fault "^1.0.0"
 
 micromark-extension-gfm-autolink-literal@~0.5.0:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz#53866c1f0c7ef940ae7ca1f72c6faef8fed9f204"
-  integrity sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.6.tgz#406a58914d7a9cc6fb4cfafccc61a8ca36d7a12a"
+  integrity sha512-nHbR1NUOVhmlZNsnhE5B7WJzL7Xd8lc888z4AF27IpHMtO3NstclZmbrMI+AcdTPpO1wuGVwlK1Cnq+n8Sxlrw==
   dependencies:
     micromark "~2.11.3"
 
@@ -11139,7 +13307,15 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
+micromatch@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -11155,12 +13331,24 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
+mime-db@1.46.0, "mime-db@>= 1.43.0 < 2":
+  version "1.46.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee"
+  integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==
+
+mime-db@1.52.0:
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.26, mime-types@^2.1.27, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.26, mime-types@~2.1.19, mime-types@~2.1.24:
+  version "2.1.29"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2"
+  integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==
+  dependencies:
+    mime-db "1.46.0"
+
+mime-types@^2.1.27:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -11183,9 +13371,9 @@ mimic-fn@^2.1.0:
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
 mini-css-extract-plugin@^2.5.2:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.3.tgz#794aa4d598bf178a66b2a35fe287c3df3eac394e"
-  integrity sha512-CD9cXeKeXLcnMw8FZdtfrRrLaM7gwCl4nKuKn2YkY2Bw5wdlB8zU2cCzw+w2zS9RFvbrufTBkMCJACNPwqQA0w==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz#9a1251d15f2035c342d99a468ab9da7a0451b71e"
+  integrity sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==
   dependencies:
     schema-utils "^4.0.0"
 
@@ -11197,24 +13385,29 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
 minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@>=1.2.5, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+minimist@>=1.2.5, minimist@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 minimist@^0.2.1:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.4.tgz#0085d5501e29033748a2f2a4da0180142697a475"
-  integrity sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ==
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz#827ba4e7593464e7c221e8c5bed930904ee2c455"
+  integrity sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==
+
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@~1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
 minipass@^2.2.0:
   version "2.9.0"
@@ -11248,7 +13441,19 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@^0.5.6:
+mkdirp@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7"
+  integrity sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==
+
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  dependencies:
+    minimist "^1.2.5"
+
+mkdirp@^0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
@@ -11263,14 +13468,14 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
 mktemp@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
-  integrity sha512-IXnMcJ6ZyTuhRmJSjzvHSRhlVPiN9Jwc6e59V0bEJ0ba6OBeX2L0E+mRN1QseeOF4mM+F1Rit6Nh7o+rl2Yn/A==
+  integrity sha1-bQUVYRyKjITkhKogABKbmOmB/ws=
 
 mnemonist@^0.38.0:
-  version "0.38.5"
-  resolved "https://registry.yarnpkg.com/mnemonist/-/mnemonist-0.38.5.tgz#4adc7f4200491237fe0fa689ac0b86539685cade"
-  integrity sha512-bZTFT5rrPKtPJxj8KSV0WkPyNxl72vQepqqVUAW2ARUpUSF2qXMB6jZj7hW5/k7C1rtpzqbD/IIbJwLXUjCHeg==
+  version "0.38.3"
+  resolved "https://registry.yarnpkg.com/mnemonist/-/mnemonist-0.38.3.tgz#35ec79c1c1f4357cfda2fe264659c2775ccd7d9d"
+  integrity sha512-2K9QYubXx/NAjv4VLq1d1Ly8pWNC5L3BrixtdkyTegXWJIqY+zLNDhhX/A+ZwWt70tB1S8H4BE8FLYEFyNoOBw==
   dependencies:
-    obliterator "^2.0.0"
+    obliterator "^1.6.1"
 
 morgan@^1.10.0:
   version "1.10.0"
@@ -11284,14 +13489,14 @@ morgan@^1.10.0:
     on-headers "~1.0.2"
 
 mout@^1.0.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.4.tgz#9ffd261c4d6509e7ebcbf6b641a89b36ecdf8155"
-  integrity sha512-mZb9uOruMWgn/fw28DG4/yE3Kehfk1zKCLhuDU2O3vlKdnBBr4XaOCqVTflJ5aODavGUPqFHZgrFX3NJVuxGhQ==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.2.tgz#c9b718a499806a0632cede178e80f436259e777d"
+  integrity sha512-w0OUxFEla6z3d7sVpMZGBCpQvYh8PHS1wZ6Wu9GNKHMpAHWJ0if0LsQZh3DlOqw55HlhJEOMLpFnwtxp99Y5GA==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-  integrity sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
   dependencies:
     aproba "^1.1.1"
     copy-concurrently "^1.0.0"
@@ -11303,14 +13508,19 @@ move-concurrently@^1.0.1:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.1.1:
+ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -11323,7 +13533,7 @@ mustache@^4.2.0:
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
 mute-stream@0.0.8:
   version "0.0.8"
@@ -11331,14 +13541,14 @@ mute-stream@0.0.8:
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
 nan@^2.12.1:
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
-  integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
+  version "2.14.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
 nanoassert@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/nanoassert/-/nanoassert-1.1.0.tgz#4f3152e09540fde28c76f44b19bbcd1d5a42478d"
-  integrity sha512-C40jQ3NzfkP53NsO8kEOFd79p4b9kDXQMwgiY1z8ZwrDZgUyom0AHwGegF4Dm99L+YoYhuaB0ceerUcXmqr1rQ==
+  integrity sha1-TzFS4JVA/eKMdvRLGbvNHVpCR40=
 
 nanoid@^3.3.4:
   version "3.3.4"
@@ -11365,12 +13575,12 @@ nanomatch@^1.2.9:
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-negotiator@0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
-  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
 neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1, neo-async@^2.6.2:
   version "2.6.2"
@@ -11378,9 +13588,9 @@ neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1, neo-async@^2.6.2:
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 ngraph.events@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/ngraph.events/-/ngraph.events-1.2.2.tgz#3ceb92d676a04a4e7ce60a09fa8e17a4f0346d7f"
-  integrity sha512-JsUbEOzANskax+WSYiAPETemLWYXmixuPAlmZmhIbIj6FH/WDgEGCGnRwUQBK0GjOnVm8Ui+e5IJ+5VZ4e32eQ==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ngraph.events/-/ngraph.events-1.2.1.tgz#6e40425ef9dec1e074bbef6da56c8d79b9188fd8"
+  integrity sha512-D4C+nXH/RFxioGXQdHu8ELDtC6EaCiNsZtih0IvyGN81OZSUby4jXoJ5+RNWasfsd0FnKxxpAROyUMzw64QNsw==
 
 ngraph.graph@^19.1.0:
   version "19.1.0"
@@ -11416,21 +13626,21 @@ no-case@^3.0.4:
 node-dir@^0.1.17:
   version "0.1.17"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
-  integrity sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==
+  integrity sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=
   dependencies:
     minimatch "^3.0.2"
 
 node-fetch@^2.6.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
-  integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
   dependencies:
     whatwg-url "^5.0.0"
 
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
-  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
 node-libs-browser@^2.2.1:
   version "2.2.1"
@@ -11478,10 +13688,20 @@ node-notifier@^10.0.0:
     uuid "^8.3.2"
     which "^2.0.2"
 
-node-releases@^2.0.8:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f"
-  integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==
+node-releases@^1.1.70:
+  version "1.1.71"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
+  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+
+node-releases@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
+  integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
+
+node-releases@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
+  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
 node-watch@0.7.3:
   version "0.7.3"
@@ -11491,7 +13711,7 @@ node-watch@0.7.3:
 nomnom@^1.5.x:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
-  integrity sha512-5s0JxqhDx9/rksG2BTMVN1enjWSvPidpoSgViZU4ZXULyTe+7jxcCRLB6f42Z0l1xYJpleCBtSyY6Lwg3uu5CQ==
+  integrity sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=
   dependencies:
     chalk "~0.4.0"
     underscore "~1.6.0"
@@ -11499,7 +13719,7 @@ nomnom@^1.5.x:
 nopt@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  integrity sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
   dependencies:
     abbrev "1"
 
@@ -11524,7 +13744,7 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.2:
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
@@ -11541,7 +13761,7 @@ normalize-range@^0.1.2:
 npm-git-info@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/npm-git-info/-/npm-git-info-1.0.3.tgz#a933c42ec321e80d3646e0d6e844afe94630e1d5"
-  integrity sha512-i5WBdj4F/ULl16z9ZhsJDMl1EQCMQhHZzBwNnKL2LOA+T8IHNeRkLCVz9uVV9SzUdGTbDq+1oXhIYMe+8148vw==
+  integrity sha1-qTPELsMh6A02RuDW6ESv6UYw4dU=
 
 npm-normalize-package-bin@^1.0.0:
   version "1.0.1"
@@ -11575,7 +13795,7 @@ npm-run-all@^4.1.5:
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
@@ -11616,22 +13836,32 @@ npmlog@^6.0.0:
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 nwsapi@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
-  integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@4.1.1, object-assign@^4, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+object-assign@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
+  integrity sha512-CdsOUYIh5wIiozhJ3rLQgmUTgcyzFwZZrqhkKhODMoGtPKM+wt0h0CNIoauJWMsS9822EdzPsF/6mb4nLvPN5g==
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -11647,12 +13877,17 @@ object-hash@^3.0.0:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
   integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
 
-object-inspect@^1.12.2, object-inspect@^1.12.3, object-inspect@^1.9.0:
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
-  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
+object-inspect@^1.11.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
+  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
 
-object-is@^1.1.5:
+object-inspect@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
+  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
+
+object-is@^1.1.4, object-is@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
   integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
@@ -11660,7 +13895,7 @@ object-is@^1.1.5:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-object-keys@^1.1.1:
+object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -11668,43 +13903,36 @@ object-keys@^1.1.1:
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
-  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
+object.assign@^4.1.0, object.assign@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    has-symbols "^1.0.3"
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
-obliterator@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/obliterator/-/obliterator-2.0.4.tgz#fa650e019b2d075d745e44f1effeb13a2adbe816"
-  integrity sha512-lgHwxlxV1qIg1Eap7LgIeoBWIMFibOjbrYPIPJZcI1mmGAI2m3lNYpK12Y+GBdPQ0U1hRwSord7GIaawz962qQ==
-
-on-finished@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
-  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
-  dependencies:
-    ee-first "1.1.1"
+obliterator@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/obliterator/-/obliterator-1.6.1.tgz#dea03e8ab821f6c4d96a299e17aef6a3af994ef3"
+  integrity sha512-9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig==
 
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
   dependencies:
     ee-first "1.1.1"
 
@@ -11716,14 +13944,14 @@ on-headers@~1.0.2:
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
   dependencies:
     mimic-fn "^1.0.0"
 
@@ -11775,10 +14003,10 @@ ora@^3.4.0:
     strip-ansi "^5.2.0"
     wcwidth "^1.0.1"
 
-ora@^5.4.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
-  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
+ora@^5.1.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.0.tgz#42eda4855835b9cd14d33864c97a3c95a3f56bf4"
+  integrity sha512-1StwyXQGoU6gdjYkyVcqOLnVlbKj+6yPNNOxJVgpt9t4eksKjiriiHuxktLYkgllwk+D6MbC4ihH84L1udRXPg==
   dependencies:
     bl "^4.1.0"
     chalk "^4.1.0"
@@ -11793,17 +14021,17 @@ ora@^5.4.0:
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-  integrity sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
 osenv@^0.1.3, osenv@^0.1.4:
   version "0.1.5"
@@ -11828,7 +14056,7 @@ p-event@^2.3.1:
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-finally@^2.0.0:
   version "2.0.1"
@@ -11859,7 +14087,7 @@ p-limit@^3.0.2:
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
@@ -11901,7 +14129,7 @@ p-timeout@^2.0.1:
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
   version "2.2.0"
@@ -11941,9 +14169,21 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
     safe-buffer "^5.1.1"
 
 parse-duration@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/parse-duration/-/parse-duration-1.0.3.tgz#b6681f5edcc2689643b34c09ea63f86f58a35814"
-  integrity sha512-o6NAh12na5VvR6nFejkU0gpQ8jmOY9Y9sTU2ke3L3G/d/3z8jqmbBbeyBGHU73P4JLXfc7tJARygIK3WGIkloA==
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parse-duration/-/parse-duration-1.0.0.tgz#8605651745f61088f6fb14045c887526c291858c"
+  integrity sha512-X4kUkCTHU1N/kEbwK9FpUJ0UZQa90VzeczfS704frR30gljxDG0pSziws06XlK+CGRSo/1wtG1mFIdBFQTMQNw==
+
+parse-entities@^1.1.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.2.tgz#c31bf0f653b6661354f8973559cb86dd1d5edf50"
+  integrity sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==
+  dependencies:
+    character-entities "^1.0.0"
+    character-entities-legacy "^1.0.0"
+    character-reference-invalid "^1.0.0"
+    is-alphanumerical "^1.0.0"
+    is-decimal "^1.0.0"
+    is-hexadecimal "^1.0.0"
 
 parse-entities@^2.0.0:
   version "2.0.0"
@@ -11960,7 +14200,7 @@ parse-entities@^2.0.0:
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -11983,7 +14223,7 @@ parse-ms@^2.1.0:
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
+  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
 parse-static-imports@^1.1.0:
   version "1.1.0"
@@ -12003,7 +14243,7 @@ parseurl@~1.3.3:
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-browserify@0.0.1:
   version "0.0.1"
@@ -12013,12 +14253,12 @@ path-browserify@0.0.1:
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-exists@^4.0.0:
   version "4.0.0"
@@ -12028,18 +14268,23 @@ path-exists@^4.0.0:
 path-is-absolute@1.0.1, path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
 path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
@@ -12048,24 +14293,24 @@ path-parse@^1.0.7:
 path-posix@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz#06b26113f56beab042545a23bfa88003ccac260f"
-  integrity sha512-1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA==
+  integrity sha1-BrJhE/Vr6rBCVFojv6iAA8ysJg8=
 
 path-root-regex@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-  integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==
+  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
 
 path-root@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==
+  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
   dependencies:
     path-root-regex "^0.1.0"
 
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
 path-to-regexp@^1.7.0:
   version "1.8.0"
@@ -12087,9 +14332,9 @@ path-type@^4.0.0:
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
 pbkdf2@^3.0.3:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
-  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94"
+  integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -12097,12 +14342,22 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
+picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -12120,7 +14375,7 @@ pify@^2.3.0:
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
 pify@^4.0.1:
   version "4.0.1"
@@ -12130,14 +14385,14 @@ pify@^4.0.1:
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 pkg-dir@^3.0.0:
   version "3.0.0"
@@ -12163,7 +14418,7 @@ pkg-dir@^5.0.0:
 pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
-  integrity sha512-fjAPuiws93rm7mPUu21RdBnkeZNrbfCFCwfAhPWY+rR3zG0ubpe5cEReHOw5fIbfmsxEV/g2kSxGTATY3Bpnwg==
+  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
   dependencies:
     find-up "^2.1.0"
 
@@ -12193,7 +14448,7 @@ portfinder@^1.0.28:
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-import@^14.1.0:
   version "14.1.0"
@@ -12205,9 +14460,9 @@ postcss-import@^14.1.0:
     resolve "^1.1.7"
 
 postcss-js@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.1.tgz#61598186f3703bab052f1c4f7d805f3991bee9d2"
-  integrity sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.0.tgz#31db79889531b80dc7bc9b0ad283e418dce0ac00"
+  integrity sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==
   dependencies:
     camelcase-css "^2.0.1"
 
@@ -12247,17 +14502,17 @@ postcss-modules-values@^4.0.0:
   dependencies:
     icss-utils "^5.0.0"
 
-postcss-nested@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.0.tgz#1572f1984736578f360cffc7eb7dca69e30d1735"
-  integrity sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==
+postcss-nested@5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc"
+  integrity sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==
   dependencies:
-    postcss-selector-parser "^6.0.10"
+    postcss-selector-parser "^6.0.6"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
-  version "6.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
-  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.6:
+  version "6.0.10"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
+  integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -12267,10 +14522,19 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.0.9, postcss@^8.1.4, postcss@^8.2.15:
-  version "8.4.21"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
-  integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
+postcss@^8.1.4, postcss@^8.4.14:
+  version "8.4.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c"
+  integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
+postcss@^8.2.15:
+  version "8.4.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.17.tgz#f87863ec7cd353f81f7ab2dec5d67d861bbb1be5"
+  integrity sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q==
   dependencies:
     nanoid "^3.3.4"
     picocolors "^1.0.0"
@@ -12284,14 +14548,14 @@ prelude-ls@^1.2.1:
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
 pretender@^3.2.0:
-  version "3.4.7"
-  resolved "https://registry.yarnpkg.com/pretender/-/pretender-3.4.7.tgz#34a2ae2d1fc9db440a990d50e6c0f5481d8755fc"
-  integrity sha512-jkPAvt1BfRi0RKamweJdEcnjkeu7Es8yix3bJ+KgBC5VpG/Ln4JE3hYN6vJym4qprm8Xo5adhWpm3HCoft1dOw==
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/pretender/-/pretender-3.4.3.tgz#a3b4160516007075d29127262f3a0063d19896e9"
+  integrity sha512-AlbkBly9R8KR+R0sTCJ/ToOeEoUMtt52QVCetui5zoSmeLOU3S8oobFsyPLm1O2txR6t58qDNysqPnA1vVi8Hg==
   dependencies:
-    fake-xml-http-request "^2.1.2"
+    fake-xml-http-request "^2.1.1"
     route-recognizer "^0.3.3"
 
 prettier-linter-helpers@^1.0.0:
@@ -12301,10 +14565,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^2.5.1:
-  version "2.8.4"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz#34dd2595629bfbb79d344ac4a91ff948694463c3"
-  integrity sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==
+prettier@^2.3.0:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
+  integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
 
 pretty-ms@^7.0.1:
   version "7.0.1"
@@ -12318,10 +14582,10 @@ printf@^0.6.1:
   resolved "https://registry.yarnpkg.com/printf/-/printf-0.6.1.tgz#b9afa3d3b55b7f2e8b1715272479fc756ed88650"
   integrity sha512-is0ctgGdPJ5951KulgfzvHGwJtZ5ck8l042vRkV6jrkpBzTmb/lueTqguWHy2JfVA+RY6gFVlaZgUS0j7S/dsw==
 
-prismjs@~1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057"
-  integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==
+prismjs@~1.25.0:
+  version "1.25.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756"
+  integrity sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg==
 
 private@^0.1.6, private@^0.1.8:
   version "0.1.8"
@@ -12336,14 +14600,14 @@ process-nextick-args@~2.0.0:
 process-relative-require@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/process-relative-require/-/process-relative-require-1.0.0.tgz#1590dfcf5b8f2983ba53e398446b68240b4cc68a"
-  integrity sha512-r8G5WJPozMJAiv8sDdVWKgJ4In/zBXqwJdMCGAXQt2Kd3HdbAuJVzWYM4JW150hWoaI9DjhtbjcsCCHIMxm8RA==
+  integrity sha1-FZDfz1uPKYO6U+OYRGtoJAtMxoo=
   dependencies:
     node-modules-path "^1.0.0"
 
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
 progress@^2.0.0:
   version "2.0.3"
@@ -12353,12 +14617,12 @@ progress@^2.0.0:
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
 promise-map-series@^0.2.1:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.2.3.tgz#c2d377afc93253f6bd03dbb77755eb88ab20a847"
-  integrity sha512-wx9Chrutvqu1N/NHzTayZjE1BgIwt6SJykQoCOic4IZ9yUDjKyVYrpLa/4YCNsV61eRENfs29hrEquVuB13Zlw==
+  integrity sha1-wtN3r8kyU/a9A9u3d1XriKsgqEc=
   dependencies:
     rsvp "^3.0.14"
 
@@ -12379,23 +14643,23 @@ property-information@^5.0.0:
   dependencies:
     xtend "^4.0.0"
 
-proxy-addr@~2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
-  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
+proxy-addr@~2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
+  integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
   dependencies:
-    forwarded "0.2.0"
+    forwarded "~0.1.2"
     ipaddr.js "1.9.1"
 
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
-psl@^1.1.33:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
-  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
+psl@^1.1.28, psl@^1.1.33:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
 public-encrypt@^4.0.0:
   version "4.0.3"
@@ -12437,51 +14701,49 @@ pumpify@^1.3.3:
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
 punycode@^1.2.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0, punycode@^2.1.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
-  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-qs@6.11.0:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
-  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
-  dependencies:
-    side-channel "^1.0.4"
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
 qs@^6.4.0:
-  version "6.11.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.1.tgz#6c29dff97f0c0060765911ba65cbc9764186109f"
-  integrity sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.0.tgz#8b6519121ab291c316a3e4d49cecf6d13d8c7fe5"
+  integrity sha512-yjACOWijC6L/kmPZZAsVBNY2zfHSIbpdpL977quseu56/8BZ2LoF5axK2bGhbzhVKt7V9xgWTtpyLbxwIoER0Q==
   dependencies:
     side-channel "^1.0.4"
 
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-  integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==
-
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 queue-microtask@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
-  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3"
+  integrity sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==
 
 quick-lru@^5.1.1:
   version "5.1.1"
@@ -12491,7 +14753,7 @@ quick-lru@^5.1.1:
 quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408"
-  integrity sha512-YsmIFfD9j2zaFwJkzI6eMG7y0lQP7YeWzgtFgNl38pGWZBSXJooZbOWwkcRot7Vt0Fg9L23pX0tqWU3VvLDsiA==
+  integrity sha1-urAqJCq4+w3XWKPJd2sy+aXZRAg=
   dependencies:
     mktemp "~0.4.0"
     rimraf "^2.5.4"
@@ -12507,10 +14769,19 @@ qunit-dom@^1.6.0:
     ember-cli-babel "^7.23.0"
     ember-cli-version-checker "^5.1.1"
 
-qunit@^2.16.0, qunit@^2.17.2:
-  version "2.19.4"
-  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.19.4.tgz#2d689bb1165edd4b812e3ed2ee06ff907e9f2ece"
-  integrity sha512-aqUzzUeCqlleWYKlpgfdHHw9C6KxkB9H3wNfiBg5yHqQMzy0xw/pbCRHYFkjl8MsP/t8qkTQE+JTYL71azgiew==
+qunit@^2.15.0:
+  version "2.19.3"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.19.3.tgz#bcf81a2e8d176dc19fe8dd358c4cbd08619af03a"
+  integrity sha512-vEnspSZ37u2oR01OA/IZ1Td5V7BvQYFECdKPv86JaBplDNa5IHg0v7jFSPoP5L5o78Dbi8sl7/ATtpRDAKlSdw==
+  dependencies:
+    commander "7.2.0"
+    node-watch "0.7.3"
+    tiny-glob "0.2.9"
+
+qunit@^2.16.0:
+  version "2.19.1"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.19.1.tgz#eb1afd188da9e47f07c13aa70461a1d9c4505490"
+  integrity sha512-gSGuw0vErE/rNjnlBW/JmE7NNubBlGrDPQvsug32ejYhcVFuZec9yoU0+C30+UgeCGwq6Ap89K65dMGo+kDGZQ==
   dependencies:
     commander "7.2.0"
     node-watch "0.7.3"
@@ -12541,38 +14812,28 @@ range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
-  dependencies:
-    bytes "3.1.2"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
-raw-body@2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
-  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
   dependencies:
-    bytes "3.1.2"
-    http-errors "2.0.0"
+    bytes "3.1.0"
+    http-errors "1.7.2"
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
 raw-body@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
-  integrity sha512-WmJJU2e9Y6M5UzTOkHaM7xJGAPQD8PNzx3bAd2+uhZAim6wDk6dAZxPVYLF67XhbR4hmKGh33Lpmh4XWrCH5Mg==
+  integrity sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=
   dependencies:
     bytes "1"
     string_decoder "0.10"
 
 react-is@^17.0.1:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
-  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
+  integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
 
 read-cache@^1.0.0:
   version "1.0.0"
@@ -12584,7 +14845,7 @@ read-cache@^1.0.0:
 read-installed@~4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067"
-  integrity sha512-O03wg/IYuV/VtnK2h/KXEt9VIbMUFbk3ERG0Iu4FhLZw0EP0T9znqrYDGn6ncbEsXUFaUjiVAWXHzxwt3lhRPQ==
+  integrity sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=
   dependencies:
     debuglog "^1.0.1"
     read-package-json "^2.0.0"
@@ -12608,16 +14869,16 @@ read-package-json@^2.0.0:
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==
+  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
   dependencies:
     load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
-  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -12628,9 +14889,9 @@ read-pkg@^3.0.0:
     util-deprecate "~1.0.1"
 
 "readable-stream@2 || 3", readable-stream@^3.4.0, readable-stream@^3.6.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
-  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -12639,7 +14900,7 @@ read-pkg@^3.0.0:
 readable-stream@~1.0.2:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==
+  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -12665,6 +14926,13 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
+readdirp@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
+  dependencies:
+    picomatch "^2.2.1"
+
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -12685,32 +14953,39 @@ recast@^0.18.1:
 recursive-readdir-sync@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/recursive-readdir-sync/-/recursive-readdir-sync-1.0.6.tgz#1dbf6d32f3c5bb8d3cde97a6c588d547a9e13d56"
-  integrity sha512-QhkBh/V7T3L2m8FrwZEZ/VnSZU35bv7DSy/VlKVfcq10zvwwuxeuDLH7DZYFGHFyXefHchZmsHFLELR7poGjog==
+  integrity sha1-Hb9tMvPFu4083pemxYjVR6nhPVY=
 
 redeyed@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a"
-  integrity sha512-8eEWsNCkV2rvwKLS1Cvp5agNjMhwRe2um+y32B2+3LqOzg4C9BBPs6vzAfV16Ivb8B9HPNKIqd8OrdBws8kNlQ==
+  integrity sha1-6WwZO0DAgWsArshCaY5hGF5VSYo=
   dependencies:
     esprima "~3.0.0"
 
 refractor@^3.5.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.6.0.tgz#ac318f5a0715ead790fcfb0c71f4dd83d977935a"
-  integrity sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA==
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.5.0.tgz#334586f352dda4beaf354099b48c2d18e0819aec"
+  integrity sha512-QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg==
   dependencies:
     hastscript "^6.0.0"
     parse-entities "^2.0.0"
-    prismjs "~1.27.0"
+    prismjs "~1.25.0"
 
-regenerate-unicode-properties@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
-  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
+regenerate-unicode-properties@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56"
+  integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==
   dependencies:
     regenerate "^1.4.2"
 
-regenerate@^1.2.1, regenerate@^1.4.2:
+regenerate-unicode-properties@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
+  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+  dependencies:
+    regenerate "^1.4.0"
+
+regenerate@^1.2.1, regenerate@^1.4.0, regenerate@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
@@ -12718,22 +14993,22 @@ regenerate@^1.2.1, regenerate@^1.4.2:
 regenerator-runtime@^0.10.5:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
-  integrity sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==
+  integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.4:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
-  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
+regenerator-runtime@^0.13.4:
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
+  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
 
 regenerator-runtime@^0.9.5:
   version "0.9.6"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029"
-  integrity sha512-D0Y/JJ4VhusyMOd/o25a3jdUqN/bC85EFsaoL9Oqmy/O4efCh+xhp7yj2EEOsj974qvMkcW8AwUzJ1jB/MbxCw==
+  integrity sha1-0z65XQ0gAaS+OWWXB8UbDLcc4Ck=
 
 regenerator-transform@^0.10.0:
   version "0.10.1"
@@ -12744,10 +15019,17 @@ regenerator-transform@^0.10.0:
     babel-types "^6.19.0"
     private "^0.1.6"
 
-regenerator-transform@^0.15.1:
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56"
-  integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
+regenerator-transform@^0.14.2:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
+  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+
+regenerator-transform@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
+  integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
@@ -12759,57 +15041,97 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
-  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
+regexp.prototype.flags@^1.3.0, regexp.prototype.flags@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
+  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    functions-have-names "^1.2.2"
 
 regexpp@^3.0.0, regexpp@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
 
 regexpu-core@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
-  integrity sha512-tJ9+S4oKjxY8IZ9jmjnp/mtytu1u3iyIQAfmI51IKWH6bFf7XR1ybtaO6j7INhZKXOTYADk7V5qxaqLkmNxiZQ==
+  integrity sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=
   dependencies:
     regenerate "^1.2.1"
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
-regexpu-core@^5.3.1:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
-  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
+regexpu-core@^4.7.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
+  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^8.2.0"
+    regjsgen "^0.5.1"
+    regjsparser "^0.6.4"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.2.0"
+
+regexpu-core@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3"
+  integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==
+  dependencies:
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^10.0.1"
+    regjsgen "^0.6.0"
+    regjsparser "^0.8.2"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.0.0"
+
+regexpu-core@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.1.0.tgz#2f8504c3fd0ebe11215783a41541e21c79942c6d"
+  integrity sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==
   dependencies:
-    "@babel/regjsgen" "^0.8.0"
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.1.0"
-    regjsparser "^0.9.1"
+    regenerate-unicode-properties "^10.0.1"
+    regjsgen "^0.6.0"
+    regjsparser "^0.8.2"
     unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.1.0"
+    unicode-match-property-value-ecmascript "^2.0.0"
 
 regjsgen@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
-  integrity sha512-x+Y3yA24uF68m5GA+tBjbGYo64xXVJpbToBaWCoSNSc1hdk6dfctaRWrNFTVJZIIhL5GxW8zwjoixbnifnK59g==
+  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
+
+regjsgen@^0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
+  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
+
+regjsgen@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d"
+  integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==
 
 regjsparser@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
-  integrity sha512-jlQ9gYLfk2p3V5Ag5fYhA7fv7OHzd1KUH0PRP46xc3TgwjwgROIW572AfYg/X9kaNq/LJnu6oJcFRXlIrGoTRw==
+  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
   dependencies:
     jsesc "~0.5.0"
 
-regjsparser@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
-  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
+regjsparser@^0.6.4:
+  version "0.6.7"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.7.tgz#c00164e1e6713c2e3ee641f1701c4b7aa0a7f86c"
+  integrity sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==
+  dependencies:
+    jsesc "~0.5.0"
+
+regjsparser@^0.8.2:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f"
+  integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==
   dependencies:
     jsesc "~0.5.0"
 
@@ -12821,27 +15143,25 @@ rehype-stringify@^8.0.0:
     hast-util-to-html "^7.1.1"
 
 remark-autolink-headings@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/remark-autolink-headings/-/remark-autolink-headings-6.1.0.tgz#45fa1f8860e0fc6b78bcbc4b0f5d5dd696170e04"
-  integrity sha512-oeMSIfjaNboWPDVKahQAjF8iJ8hsz5aI8KFzAmmBdznir7zBvkgUjYE/BrpWvd02DCf/mSQ1IklznLkl3dVvZQ==
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/remark-autolink-headings/-/remark-autolink-headings-6.0.1.tgz#074470b8ec7714a0f06fa151e293152bf9723df9"
+  integrity sha512-LTV5G5NMjypHEr14tMNJ36yrP+xwT7mejJelZOPXKiF5WvRH9o36zXnr2QGqfms2yVASNpDaC9NBOwKlJJKuQw==
   dependencies:
-    "@types/hast" "^2.0.0"
     extend "^3.0.0"
-    unified "^9.0.0"
     unist-util-visit "^2.0.0"
 
 remark-extract-frontmatter@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/remark-extract-frontmatter/-/remark-extract-frontmatter-3.2.0.tgz#bab57f599114f233702dea819431eec28e708656"
-  integrity sha512-PmYwNCo0cMAUV3oAGg5Hn6YSZgiSDwVdxLJmPIZ804aYuvE5mAzozo5AkO0C8ELroWrtN/f9zzb0jqFPBkMnwg==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/remark-extract-frontmatter/-/remark-extract-frontmatter-3.1.0.tgz#8ac209bf5e7377578ebfd6dc3504e9fccabea112"
+  integrity sha512-16TIAq0QTGs2GrbFi9azDxfcjwacf25W33h8zXAwiUbdW9lJN5KPaY6TZ7u2iSPTOSbIYBYmj9E0Q+8e+eGGPQ==
 
-remark-footnotes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/remark-footnotes/-/remark-footnotes-3.0.0.tgz#5756b56f8464fa7ed80dbba0c966136305d8cb8d"
-  integrity sha512-ZssAvH9FjGYlJ/PBVKdSmfyPc3Cz4rTWgZLI4iE/SX8Nt5l3o3oEjv3wwG5VD7xOjktzdwp5coac+kJV9l4jgg==
+remark-frontmatter@^1.2.0:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/remark-frontmatter/-/remark-frontmatter-1.3.3.tgz#67ec63c89da5a84bb793ecec166e11b4eb47af10"
+  integrity sha512-fM5eZPBvu2pVNoq3ZPW22q+5Ativ1oLozq2qYt9I2oNyxiUd/tDl0iLLntEVAegpZIslPWg1brhcP1VsaSVUag==
   dependencies:
-    mdast-util-footnote "^0.1.0"
-    micromark-extension-footnote "^0.3.0"
+    fault "^1.0.1"
+    xtend "^4.0.1"
 
 remark-frontmatter@^3.0.0:
   version "3.0.0"
@@ -12860,9 +15180,9 @@ remark-gfm@^1.0.0:
     micromark-extension-gfm "^0.3.0"
 
 remark-hbs@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/remark-hbs/-/remark-hbs-0.4.1.tgz#07f5ce6cc85d64c673fd4ef7cd5a51189a2abe20"
-  integrity sha512-q1qnjA473z409IGqj3iu0Rex9YVN3cfwf6siPP+SQN9Yx66OxyL2cU4VHWK6IxWHSa/cughU2CBUbDPPsWxlfg==
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/remark-hbs/-/remark-hbs-0.4.0.tgz#3b0af809091fbee872487c7d695acf687a1a0b96"
+  integrity sha512-2dtEz+t8FMedZgJ7oT76ON4bCYlsnqhL9xvo1UXzv0x3P54YYb7jssEiWsAGNzn0/HXtF+/CVNR6SBJhbB7bUQ==
   dependencies:
     unist-builder "^2.0.3"
     unist-util-visit "^2.0.3"
@@ -12874,6 +15194,27 @@ remark-normalize-headings@^2.0.0:
   dependencies:
     mdast-normalize-headings "^2.0.0"
 
+remark-parse@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz#4c077f9e499044d1d5c13f80d7a98cf7b9285d95"
+  integrity sha512-b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA==
+  dependencies:
+    collapse-white-space "^1.0.2"
+    is-alphabetical "^1.0.0"
+    is-decimal "^1.0.0"
+    is-whitespace-character "^1.0.0"
+    is-word-character "^1.0.0"
+    markdown-escapes "^1.0.0"
+    parse-entities "^1.1.0"
+    repeat-string "^1.5.4"
+    state-toggle "^1.0.0"
+    trim "0.0.1"
+    trim-trailing-lines "^1.0.0"
+    unherit "^1.0.4"
+    unist-util-remove-position "^1.0.0"
+    vfile-location "^2.0.0"
+    xtend "^4.0.1"
+
 remark-parse@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
@@ -12882,16 +15223,16 @@ remark-parse@^9.0.0:
     mdast-util-from-markdown "^0.8.0"
 
 remark-rehype@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-8.1.0.tgz#610509a043484c1e697437fa5eb3fd992617c945"
-  integrity sha512-EbCu9kHgAxKmW1yEYjx3QafMyGY3q8noUbNUI5xyKbaFP89wbhDrKxyIQNukNYthzjNHZu6J7hwFg7hRm1svYA==
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-8.0.0.tgz#5a8afc8262a59d205fba21dafb27a673fb3b92fa"
+  integrity sha512-gVvOH02TMFqXOWoL6iXU7NXMsDJguNkNuMrzfkQeA4V6WCyHQnOKptn+IQBVVPuIH2sMJBwo8hlrmtn1MLTh9w==
   dependencies:
-    mdast-util-to-hast "^10.2.0"
+    mdast-util-to-hast "^10.0.0"
 
 remark-slug@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/remark-slug/-/remark-slug-6.1.0.tgz#0503268d5f0c4ecb1f33315c00465ccdd97923ce"
-  integrity sha512-oGCxDF9deA8phWvxFuyr3oSJsdyUAxMFbA0mZ7Y1Sas+emILtO+e5WutF9564gDsEN4IXaQXm5pFo6MLH+YmwQ==
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/remark-slug/-/remark-slug-6.0.0.tgz#2b54a14a7b50407a5e462ac2f376022cce263e2c"
+  integrity sha512-ln67v5BrGKHpETnm6z6adlJPhESFJwfuZZ3jrmi+lKTzeZxh2tzFzUfDD4Pm2hRGOarHLuGToO86MNMZ/hA67Q==
   dependencies:
     github-slugger "^1.0.0"
     mdast-util-to-string "^1.0.0"
@@ -12900,29 +15241,76 @@ remark-slug@^6.0.0:
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
-  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^1.0.0, repeat-string@^1.6.1:
+repeat-string@^1.0.0, repeat-string@^1.5.4, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  integrity sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
+replace-ext@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
+  integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
+
+request-promise-core@1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
+  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
+  dependencies:
+    lodash "^4.17.19"
+
+request-promise-native@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
+  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
+  dependencies:
+    request-promise-core "1.1.4"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
+
+request@^2.88.2:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 require-from-string@^2.0.2:
   version "2.0.2"
@@ -12937,22 +15325,22 @@ requireindex@^1.2.0:
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
 reselect@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
-  integrity sha512-b/6tFZCmRhtBMa4xGqiiRp9jh9Aqi2A687Lo265cN0/QohJQEBPiQ52f4QB6i0eF3yp3hmLL21LSGBcML2dlxA==
+  integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
 
 reselect@^4.0.0:
-  version "4.1.7"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.7.tgz#56480d9ff3d3188970ee2b76527bd94a95567a42"
-  integrity sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A==
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
+  integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==
 
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==
+  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
   dependencies:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
@@ -13001,7 +15389,7 @@ resolve-package-path@^4.0.1, resolve-package-path@^4.0.3:
 resolve-path@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
-  integrity sha512-i1xevIst/Qa+nA9olDxLWnLk8YZbi8R/7JPbCMcgyWaFR6bKWaexgJgEB5oc2PKMjYdrHynyz0NY+if+H98t1w==
+  integrity sha1-xL2p9e+y/OZSR4c6s2u02DT+Fvc=
   dependencies:
     http-errors "~1.6.2"
     path-is-absolute "1.0.1"
@@ -13009,9 +15397,17 @@ resolve-path@^1.4.0:
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
+resolve@^1.22.1:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -13020,19 +15416,18 @@ resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^2.0.0-next.4:
-  version "2.0.0-next.4"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660"
-  integrity sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==
+resolve@^2.0.0-next.3:
+  version "2.0.0-next.3"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46"
+  integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==
   dependencies:
-    is-core-module "^2.9.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
 
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
@@ -13048,7 +15443,7 @@ restore-cursor@^3.1.0:
 resumer@^0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/resumer/-/resumer-0.0.0.tgz#f1e8f461e4064ba39e82af3cdc2a8c893d076759"
-  integrity sha512-Fn9X8rX8yYF4m81rZCK/5VmrmsSbqS/i3rDLl6ZZHAXgC2nTAx3dhwG8q8odP/RmdLa2YrybDJaAMg+X1ajY3w==
+  integrity sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=
   dependencies:
     through "~2.3.4"
 
@@ -13062,11 +15457,6 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rfdc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
-  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
-
 rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -13103,6 +15493,15 @@ rollup-pluginutils@^2.8.1:
   dependencies:
     estree-walker "^0.6.1"
 
+rollup@^1.12.0:
+  version "1.32.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.32.1.tgz#4480e52d9d9e2ae4b46ba0d9ddeaf3163940f9c4"
+  integrity sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==
+  dependencies:
+    "@types/estree" "*"
+    "@types/node" "*"
+    acorn "^7.1.0"
+
 rollup@^2.50.0:
   version "2.79.1"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
@@ -13128,7 +15527,7 @@ rsvp@^4.7.0, rsvp@^4.8.1, rsvp@^4.8.2, rsvp@^4.8.4, rsvp@^4.8.5:
 rsvp@~3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"
-  integrity sha512-Rf4YVNYpKjZ6ASAmibcwTNciQ5Co5Ztq6iZPEykHpkoflnD/K5ryE/rHehFsTm4NJj8nKDhbi3eKBWGogmNnkg==
+  integrity sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo=
 
 run-async@^2.2.0, run-async@^2.4.0:
   version "2.4.1"
@@ -13145,30 +15544,23 @@ run-parallel@^1.1.9:
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-  integrity sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^6.4.0, rxjs@^6.6.0:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+rxjs@^6.4.0, rxjs@^6.6.0, rxjs@^6.6.6:
+  version "6.6.6"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.6.tgz#14d8417aa5a07c5e633995b525e1e3c0dec03b70"
+  integrity sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^7.5.1:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
-  integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
-  dependencies:
-    tslib "^2.1.0"
-
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -13176,25 +15568,16 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0,
 safe-json-parse@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
-  integrity sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A==
-
-safe-regex-test@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
-  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
-    is-regex "^1.1.4"
+  integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0:
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -13214,10 +15597,26 @@ sane@^4.0.0, sane@^4.1.0:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sass@^1.28.0, sass@^1.49.7, sass@^1.58.3:
-  version "1.59.2"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.59.2.tgz#537f6d11614d4f20f97696f23ad358ee398b1937"
-  integrity sha512-jJyO6SmbzkJexF8MUorHx5tAilcgabioYxT/BHbY4+OvoqmbHxsYlrjZ8Adhqcgl6Zqwie0TgMXLCAmPFxXOuw==
+sass@^1.28.0:
+  version "1.32.8"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz#f16a9abd8dc530add8834e506878a2808c037bdc"
+  integrity sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==
+  dependencies:
+    chokidar ">=2.0.0 <4.0.0"
+
+sass@^1.43.4:
+  version "1.54.6"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.6.tgz#5a12c268db26555c335028e355d6b7b1a5b9b4c8"
+  integrity sha512-DUqJjR2WxXBcZjRSZX5gCVyU+9fuC2qDfFzoKX9rV4rCOcec5mPtEafTcfsyL3YJuLONjWylBne+uXVh5rrmFw==
+  dependencies:
+    chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
+
+sass@^1.49.7:
+  version "1.54.5"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.5.tgz#93708f5560784f6ff2eab8542ade021a4a947b3a"
+  integrity sha512-p7DTOzxkUPa/63FU0R3KApkRHwcVZYC0PLnLm5iyZACyp15qSi32x7zVUhRdABAATmkALqgGrjCJAcWvobmhHw==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -13270,53 +15669,65 @@ schema-utils@^4.0.0:
 select@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
-  integrity sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==
+  integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
 
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
+  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
 
 semver-regex@^3.1.2:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.4.tgz#13053c0d4aa11d070a2f2872b6b1e3ae1e1971b4"
-  integrity sha512-6IiqeZNgq01qGf0TId0t3NvKzSvUsjcpdEO3AQNeIjR6A2+ckTnQlDpl4qu1bjRv0RzN3FP9hzFmws3lKqRWkA==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz#34b4c0d361eef262e07199dbef316d0f2ab11807"
+  integrity sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA==
 
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
+semver@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+
 semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@^7.3.5:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
   dependencies:
     lru-cache "^6.0.0"
 
-send@0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
-  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
   dependencies:
     debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
+    depd "~1.1.2"
+    destroy "~1.0.4"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
     fresh "0.5.2"
-    http-errors "2.0.0"
+    http-errors "~1.7.2"
     mime "1.6.0"
-    ms "2.1.3"
-    on-finished "2.4.1"
+    ms "2.1.1"
+    on-finished "~2.3.0"
     range-parser "~1.2.1"
-    statuses "2.0.1"
+    statuses "~1.5.0"
 
 serialize-javascript@^4.0.0:
   version "4.0.0"
@@ -13325,27 +15736,27 @@ serialize-javascript@^4.0.0:
   dependencies:
     randombytes "^2.1.0"
 
-serialize-javascript@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c"
-  integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
+serialize-javascript@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
+  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
   dependencies:
     randombytes "^2.1.0"
 
-serve-static@1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
-  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     parseurl "~1.3.3"
-    send "0.18.0"
+    send "0.17.1"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
@@ -13360,17 +15771,17 @@ set-value@^2.0.0, set-value@^2.0.1:
 setimmediate@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
-setprototypeof@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
-  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
@@ -13383,7 +15794,7 @@ sha.js@^2.4.0, sha.js@^2.4.8:
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
@@ -13397,7 +15808,7 @@ shebang-command@^2.0.0:
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shebang-regex@^3.0.0:
   version "3.0.0"
@@ -13405,16 +15816,16 @@ shebang-regex@^3.0.0:
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 shell-quote@^1.6.1:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.0.tgz#20d078d0eaf71d54f43bd2ba14a1b5b9bfa5c8ba"
-  integrity sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
+  integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
 shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
-side-channel@^1.0.4:
+side-channel@^1.0.3, side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
   integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
@@ -13423,7 +15834,12 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+
+signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -13455,7 +15871,7 @@ sinon@^9.0.0:
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-  integrity sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
 slash@^3.0.0:
   version "3.0.0"
@@ -13483,7 +15899,7 @@ slice-ansi@^4.0.0:
 slide@~1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-  integrity sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==
+  integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
 
 snake-case@^3.0.3:
   version "3.0.4"
@@ -13523,39 +15939,37 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socket.io-adapter@~2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz#5de9477c9182fdc171cd8c8364b9a8894ec75d12"
-  integrity sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==
-  dependencies:
-    ws "~8.11.0"
+socket.io-adapter@~2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6"
+  integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==
 
-socket.io-parser@~4.2.1:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206"
-  integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==
+socket.io-parser@~4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5"
+  integrity sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==
   dependencies:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
 
 socket.io@^4.1.2:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.6.1.tgz#62ec117e5fce0692fa50498da9347cfb52c3bc70"
-  integrity sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.2.tgz#1eb25fd380ab3d63470aa8279f8e48d922d443ac"
+  integrity sha512-6fCnk4ARMPZN448+SQcnn1u8OHUC72puJcNtSgg2xS34Cu7br1gQ09YKkO1PFfDn/wyUE9ZgMAwosJed003+NQ==
   dependencies:
     accepts "~1.3.4"
     base64id "~2.0.0"
     debug "~4.3.2"
-    engine.io "~6.4.1"
-    socket.io-adapter "~2.5.2"
-    socket.io-parser "~4.2.1"
+    engine.io "~6.2.0"
+    socket.io-adapter "~2.4.0"
+    socket.io-parser "~4.2.0"
 
 sort-object-keys@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
   integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
 
-sort-package-json@^1.49.0:
+sort-package-json@^1.48.0:
   version "1.57.0"
   resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.57.0.tgz#e95fb44af8ede0bb6147e3f39258102d4bb23fc4"
   integrity sha512-FYsjYn2dHTRb41wqnv+uEqCUvBpK3jZcTp9rbz2qDTmel7Pmdtf+i2rLaaPMRZeSVM60V3Se31GyWFpmKs4Q5Q==
@@ -13603,7 +16017,15 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@~0.5.12, source-map-support@~0.5.20:
+source-map-support@~0.5.12:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -13614,7 +16036,7 @@ source-map-support@~0.5.12, source-map-support@~0.5.20:
 source-map-url@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
-  integrity sha512-QU4fa0D6aSOmrT+7OHpUXw+jS84T0MLaQNtFs8xzLNe6Arj44Magd7WEbyVW5LNYoAPVV35aKs4azxIfVJrToQ==
+  integrity sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=
 
 source-map-url@^0.4.0:
   version "0.4.1"
@@ -13624,14 +16046,14 @@ source-map-url@^0.4.0:
 source-map@0.4.x, source-map@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.6, source-map@^0.5.7:
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
@@ -13641,7 +16063,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
 source-map@~0.1.x:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  integrity sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
   dependencies:
     amdefine ">=0.0.4"
 
@@ -13650,7 +16072,7 @@ source-map@~0.7.3:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
   integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
 
-sourcemap-codec@^1.4.8:
+sourcemap-codec@^1.4.4:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
@@ -13673,7 +16095,7 @@ space-separated-tokens@^1.0.0:
 spawn-args@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/spawn-args/-/spawn-args-0.2.0.tgz#fb7d0bd1d70fd4316bd9e3dec389e65f9d6361bb"
-  integrity sha512-73BoniQDcRWgnLAf/suKH6V5H54gd1KLzwYN9FB6J/evqTV33htH9xwV/4BHek+++jzxpVlZQKKZkqstPQPmQg==
+  integrity sha1-+30L0dcP1DFr2ePew4nmX51jYbs=
 
 spdx-compare@^1.0.0:
   version "1.0.0"
@@ -13685,9 +16107,9 @@ spdx-compare@^1.0.0:
     spdx-ranges "^2.0.0"
 
 spdx-correct@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
-  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -13706,9 +16128,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.13"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5"
-  integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
 
 spdx-ranges@^2.0.0:
   version "2.1.1"
@@ -13731,7 +16153,7 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
-sprintf-js@^1.1.1:
+sprintf-js@^1.0.3:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
@@ -13739,51 +16161,64 @@ sprintf-js@^1.1.1:
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sri-toolbox@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/sri-toolbox/-/sri-toolbox-0.2.0.tgz#a7fea5c3fde55e675cf1c8c06f3ebb5c2935835e"
-  integrity sha512-DQIMWCAr/M7phwo+d3bEfXwSBEwuaJL+SJx9cuqt1Ty7K96ZFoHpYnSbhrQZEr0+0/GtmpKECP8X/R4RyeTAfw==
+  integrity sha1-p/6lw/3lXmdc8cjAbz67XCk1g14=
+
+sshpk@^1.7.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
 
 ssri@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
-  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
   dependencies:
     figgy-pudding "^3.5.1"
 
 stagehand@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stagehand/-/stagehand-1.0.1.tgz#0cbca6f906e4a7be36c5830dc31d9cc7091a827e"
-  integrity sha512-GqXBq2SPWv9hTXDFKS8WrKK1aISB0aKGHZzH+uD4ShAgs+Fz20ZfoerLOm8U+f62iRWLrw6nimOY/uYuTcVhvg==
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stagehand/-/stagehand-1.0.0.tgz#79515e2ad3a02c63f8720c7df9b6077ae14276d9"
+  integrity sha512-zrXl0QixAtSHFyN1iv04xOBgplbT4HgC8T7g+q8ESZbDNi5uZbMtxLukFVXPJ5Nl7zCYvYcrT3Mj24WYCH93hw==
   dependencies:
     debug "^4.1.0"
 
+state-toggle@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe"
+  integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-statuses@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
-  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
-
-"statuses@>= 1.4.0 < 2", statuses@~1.5.0:
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-stop-iteration-iterator@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4"
-  integrity sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==
-  dependencies:
-    internal-slot "^1.0.4"
+stealthy-require@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
 stream-browserify@^2.0.1:
   version "2.0.2"
@@ -13825,18 +16260,26 @@ string-argv@0.3.1:
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
-  integrity sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==
+  integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
 
 string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width@^1.0.2 || 2", string-width@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -13845,68 +16288,67 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
+  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
   dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
 
 string.prototype.matchall@^4.0.5:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3"
-  integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"
+  integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    get-intrinsic "^1.1.3"
-    has-symbols "^1.0.3"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+    get-intrinsic "^1.1.1"
+    has-symbols "^1.0.2"
     internal-slot "^1.0.3"
-    regexp.prototype.flags "^1.4.3"
+    regexp.prototype.flags "^1.3.1"
     side-channel "^1.0.4"
 
 string.prototype.padend@^3.0.0:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.4.tgz#2c43bb3a89eb54b6750de5942c123d6c98dd65b6"
-  integrity sha512-67otBXoksdjsnXXRUq+KMVTdlVRZ2af422Y0aTyTjVaoQkGr3mxl2Bc5emi7dOQ3OGVVQQskmLEWwFXwommpNw==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.2.tgz#6858ca4f35c5268ebd5e8615e1327d55f59ee311"
+  integrity sha512-/AQFLdYvePENU3W5rgurfWSMU6n+Ww8n/3cUt7E+vPBB/D7YDG8x+qjoFs4M/alR2bW7Qg6xMjVwWUOvuQ0XpQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.2"
 
-string.prototype.trim@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
-  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
+string.prototype.trim@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz#6014689baf5efaf106ad031a5fa45157666ed1bd"
+  integrity sha512-hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.2"
 
-string.prototype.trimend@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
-  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+string.prototype.trimend@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
+  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.1.3"
 
-string.prototype.trimstart@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
-  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+string.prototype.trimstart@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
+  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.1.3"
 
 string_decoder@0.10, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
 string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.3.0"
@@ -13943,14 +16385,14 @@ stringify-object@^3.3.0:
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
@@ -13961,7 +16403,14 @@ strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
+strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -13971,12 +16420,12 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
 strip-ansi@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
-  integrity sha512-behete+3uqxecWlDAm5lmskaSaISA+ThQ4oNNBDTBJt0x2ppR6IPqfZNuj6BLaLJ/Sji4TPZlcRyOis8wXQTLg==
+  integrity sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=
 
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
 strip-bom@^4.0.0:
   version "4.0.0"
@@ -13986,7 +16435,7 @@ strip-bom@^4.0.0:
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-final-newline@^2.0.0:
   version "2.0.0"
@@ -13998,6 +16447,13 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+structured-source@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/structured-source/-/structured-source-3.0.2.tgz#dd802425e0f53dc4a6e7aca3752901a1ccda7af5"
+  integrity sha1-3YAkJeD1PcSm56yjdSkBoczaevU=
+  dependencies:
+    boundary "^1.0.1"
+
 style-loader@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz#9669602fd4690740eaaec137799a03addbbc393c"
@@ -14009,19 +16465,19 @@ style-loader@^2.0.0:
 styled_string@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/styled_string/-/styled_string-0.0.1.tgz#d22782bd81295459bc4f1df18c4bad8e94dd124a"
-  integrity sha512-DU2KZiB6VbPkO2tGSqQ9n96ZstUPjW7X4sGO6V2m1myIQluX0p1Ol8BrA/l6/EesqhMqXOIXs3cJNOy1UuU2BA==
+  integrity sha1-0ieCvYEpVFm8Tx3xjEutjpTdEko=
 
 sum-up@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e"
-  integrity sha512-zw5P8gnhiqokJUWRdR6F4kIIIke0+ubQSGyYUY506GCbJWtV7F6Xuy0j6S125eSX2oF+a8KdivsZ8PlVEH0Mcw==
+  integrity sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=
   dependencies:
     chalk "^1.0.0"
 
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
 supports-color@^5.3.0:
   version "5.5.0"
@@ -14081,15 +16537,10 @@ sync-disk-cache@^2.0.0:
     rimraf "^3.0.0"
     username-sync "^1.0.2"
 
-tabbable@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.3.3.tgz#aac0ff88c73b22d6c3c5a50b1586310006b47fbf"
-  integrity sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==
-
 table@^6.0.9:
-  version "6.8.1"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf"
-  integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca"
+  integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==
   dependencies:
     ajv "^8.0.1"
     lodash.truncate "^4.4.2"
@@ -14098,9 +16549,9 @@ table@^6.0.9:
     strip-ansi "^6.0.1"
 
 tailwindcss@^3.1.8:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.2.7.tgz#5936dd08c250b05180f0944500c01dce19188c07"
-  integrity sha512-B6DLqJzc21x7wntlH/GsZwEXTBttVSl1FtCzC8WP4oBc/NKef7kaax5jeihkkCEWc831/5NDJ9gRNDK6NEioQQ==
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.8.tgz#4f8520550d67a835d32f2f4021580f9fddb7b741"
+  integrity sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==
   dependencies:
     arg "^5.0.2"
     chokidar "^3.5.3"
@@ -14108,20 +16559,19 @@ tailwindcss@^3.1.8:
     detective "^5.2.1"
     didyoumean "^1.2.2"
     dlv "^1.1.3"
-    fast-glob "^3.2.12"
+    fast-glob "^3.2.11"
     glob-parent "^6.0.2"
     is-glob "^4.0.3"
     lilconfig "^2.0.6"
-    micromatch "^4.0.5"
     normalize-path "^3.0.0"
     object-hash "^3.0.0"
     picocolors "^1.0.0"
-    postcss "^8.0.9"
+    postcss "^8.4.14"
     postcss-import "^14.1.0"
     postcss-js "^4.0.0"
     postcss-load-config "^3.1.4"
-    postcss-nested "6.0.0"
-    postcss-selector-parser "^6.0.11"
+    postcss-nested "5.0.6"
+    postcss-selector-parser "^6.0.10"
     postcss-value-parser "^4.2.0"
     quick-lru "^5.1.1"
     resolve "^1.22.1"
@@ -14146,30 +16596,26 @@ tapable@^2.1.1, tapable@^2.2.0:
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
 tape@^5.0.1:
-  version "5.6.3"
-  resolved "https://registry.yarnpkg.com/tape/-/tape-5.6.3.tgz#0d3cc82f96b0906f73b0981df1a38a44fec7901d"
-  integrity sha512-cUDDGSbyoSIpdUAqbqLI/r7i/S4BHuCB9M5j7E/LrLs/x/i4zeAJ798aqo+FGo+kr9seBZwr8AkZW6rjceyAMQ==
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/tape/-/tape-5.2.2.tgz#a98475ecf30aa0ed2a89c36439bb9438d24d2184"
+  integrity sha512-grXrzPC1ly2kyTMKdqxh5GiLpb0BpNctCuecTB0psHX4Gu0nc+uxWR4xKjTh/4CfQlH4zhvTM2/EXmHXp6v/uA==
   dependencies:
-    array.prototype.every "^1.1.4"
     call-bind "^1.0.2"
-    deep-equal "^2.2.0"
-    defined "^1.0.1"
+    deep-equal "^2.0.5"
+    defined "^1.0.0"
     dotignore "^0.1.2"
     for-each "^0.3.3"
-    get-package-type "^0.1.0"
-    glob "^7.2.3"
+    glob "^7.1.6"
     has "^1.0.3"
-    has-dynamic-import "^2.0.1"
     inherits "^2.0.4"
-    is-regex "^1.1.4"
-    minimist "^1.2.7"
-    object-inspect "^1.12.3"
+    is-regex "^1.1.2"
+    minimist "^1.2.5"
+    object-inspect "^1.9.0"
     object-is "^1.1.5"
-    object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    resolve "^2.0.0-next.4"
+    object.assign "^4.1.2"
+    resolve "^2.0.0-next.3"
     resumer "^0.0.0"
-    string.prototype.trim "^1.2.7"
+    string.prototype.trim "^1.2.4"
     through "^2.3.8"
 
 temp@0.9.4:
@@ -14196,29 +16642,29 @@ terser-webpack-plugin@^1.4.3:
     worker-farm "^1.7.0"
 
 terser-webpack-plugin@^5.1.3:
-  version "5.3.7"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz#ef760632d24991760f339fe9290deb936ad1ffc7"
-  integrity sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==
+  version "5.3.6"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c"
+  integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.17"
+    "@jridgewell/trace-mapping" "^0.3.14"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
-    serialize-javascript "^6.0.1"
-    terser "^5.16.5"
+    serialize-javascript "^6.0.0"
+    terser "^5.14.1"
 
 terser@^4.1.2:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
-  integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-terser@^5.16.5, terser@^5.3.0:
-  version "5.16.6"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.6.tgz#f6c7a14a378ee0630fbe3ac8d1f41b4681109533"
-  integrity sha512-IBZ+ZQIA9sMaXmRZCUMDjNH0D5AQQfdn4WUjHL0+1lF4TP1IHRJbrhb6fNaXWikrYQTSkb7SLxkeXAiy1p7mbg==
+terser@^5.14.1, terser@^5.3.0:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.15.0.tgz#e16967894eeba6e1091509ec83f0c60e179f2425"
+  integrity sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==
   dependencies:
     "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
@@ -14235,9 +16681,9 @@ test-exclude@^6.0.0:
     minimatch "^3.0.4"
 
 testem@^3.2.0:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-3.10.1.tgz#bab8a83bec11e975f7d1e47e924eed6135957e5b"
-  integrity sha512-42c4e7qlAelwMd8O3ogtVGRbgbr6fJnX6H51ACOIG1V1IjsKPlcQtxPyOwaL4iikH22Dfh+EyIuJnMG4yxieBQ==
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-3.9.0.tgz#a82ccf01e5a248e3924244186e348c665ab90f7d"
+  integrity sha512-YTxCYKj0cc8uUSKEziJtSC5T/pw4fQnY0ZXNOyvAFgrijfsN9NxmncJZOHLhPgFOuhbRd5i+DBQxw0Cpe0SEFg==
   dependencies:
     "@xmldom/xmldom" "^0.8.0"
     backbone "^1.1.2"
@@ -14277,7 +16723,7 @@ text-encoding@^0.7.0:
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
 "textextensions@1 || 2", textextensions@^2.5.0:
   version "2.6.0"
@@ -14303,7 +16749,7 @@ through2@^3.0.1:
 through@^2.3.6, through@^2.3.8, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 timers-browserify@^2.0.4:
   version "2.0.12"
@@ -14338,16 +16784,16 @@ tiny-lr@^2.0.0:
     qs "^6.4.0"
 
 tippy.js@^6.2.7:
-  version "6.3.7"
-  resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz#8ccfb651d642010ed9a32ff29b0e9e19c5b8c61c"
-  integrity sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.1.tgz#3788a007be7015eee0fd589a66b98fb3f8f10181"
+  integrity sha512-JnFncCq+rF1dTURupoJ4yPie5Cof978inW6/4S6kmWV7LL9YOSEVMifED3KdrVPEG+Z/TFH2CDNJcQEfaeuQww==
   dependencies:
-    "@popperjs/core" "^2.9.0"
+    "@popperjs/core" "^2.8.3"
 
 tmp@0.0.28:
   version "0.0.28"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120"
-  integrity sha512-c2mmfiBmND6SOVxzogm1oda0OJ1HZVIk/5n26N59dDTh80MUeavpiCls4PGAdkX1PFkKokLpcf7prSjCeXLsJg==
+  integrity sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=
   dependencies:
     os-tmpdir "~1.0.1"
 
@@ -14372,37 +16818,37 @@ tmp@^0.2.1:
   dependencies:
     rimraf "^3.0.0"
 
-tmpl@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
-  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-  integrity sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
-  integrity sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -14432,10 +16878,10 @@ to-vfile@^6.1.0:
     is-buffer "^2.0.0"
     vfile "^4.0.0"
 
-toidentifier@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
-  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
 torii@^1.0.0-beta.1:
   version "1.0.0-beta.1"
@@ -14445,20 +16891,27 @@ torii@^1.0.0-beta.1:
     ember-cli-babel "^7.26.10"
     ember-cli-htmlbars "^5.7.2"
 
+tough-cookie@^2.3.3, tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tough-cookie@^4.0.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
-  integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
+  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
-    universalify "^0.2.0"
-    url-parse "^1.5.3"
+    universalify "^0.1.2"
 
-tr46@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
-  integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
+tr46@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
+  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
   dependencies:
     punycode "^2.1.1"
 
@@ -14468,9 +16921,9 @@ tr46@~0.0.3:
   integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
 tracked-built-ins@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/tracked-built-ins/-/tracked-built-ins-3.1.1.tgz#c16a1418d9c3b216527b1b40a2a80e293229359f"
-  integrity sha512-W8qLBxZzeC2zhEDdbPKi2GTffsiFn8PRbgal/2Fl6E/84CMvnpS6cPMmkvUmSLgKbqcAxl/RhyjWnhIZ9iPQjQ==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/tracked-built-ins/-/tracked-built-ins-3.1.0.tgz#827703e8e8857e45ac449dfc41e8706e0d6da309"
+  integrity sha512-yPEZV1aYaw7xFWdoEluvdwNxIJIA834HaBQaMATjNAYPwd1fRqIJ46YnuRo6+9mRRWu6nM6sJqrVVa5H6UhFuw==
   dependencies:
     ember-cli-babel "^7.26.10"
     ember-cli-typescript "^5.1.0"
@@ -14484,10 +16937,10 @@ tracked-maps-and-sets@^2.1.0:
     "@glimmer/tracking" "^1.0.0"
     ember-cli-babel "^7.17.2"
 
-traverse@^0.6.7:
-  version "0.6.7"
-  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.7.tgz#46961cd2d57dd8706c36664acde06a248f1173fe"
-  integrity sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==
+traverse@^0.6.6:
+  version "0.6.6"
+  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
+  integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
 
 tree-sync@^1.2.2:
   version "1.4.0"
@@ -14519,7 +16972,17 @@ treeify@^1.1.0:
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-  integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
+
+trim-trailing-lines@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0"
+  integrity sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==
+
+trim@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
+  integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0=
 
 trough@^1.0.0, trough@^1.0.5:
   version "1.0.5"
@@ -14532,14 +16995,26 @@ tslib@^1.9.0:
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
 tslib@^2.0.3, tslib@^2.1.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
-  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
+  integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
 
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-  integrity sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
@@ -14551,7 +17026,7 @@ type-check@^0.4.0, type-check@~0.4.0:
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
 
@@ -14570,12 +17045,7 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
-type-is@~1.6.18:
+type-is@~1.6.17, type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
   integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
@@ -14583,15 +17053,6 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typed-array-length@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
-  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
-  dependencies:
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    is-typed-array "^1.1.9"
-
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -14602,12 +17063,17 @@ typedarray-to-buffer@^3.1.5:
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.1.tgz#02737495d5df6ebf72c07ba0d002e8f4cf5ccfa0"
-  integrity sha512-GQ90TcKpIH4XxYTI2F98yEQYZgjNMOGPpOgdjIBhaLaWji5HPWlRnZ4AeA1hfBxtY7bCGDJsqDDHk/KaHOl5bA==
+typescript-memoize@^1.0.0-alpha.3:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.0.tgz#ad3b0e7e5a411ca234be123f913a2a31302b7eb6"
+  integrity sha512-B1eufjs/mGzHqoGeI1VT/dnSBoZr2v3i3/Wm8NmdxlZflyVdleE8wO0QwUuj4NfundD7T5nU3I7HSKp/5BD9og==
+
+typescript-memoize@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
+  integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
@@ -14615,43 +17081,79 @@ uc.micro@^1.0.1, uc.micro@^1.0.5:
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
 uglify-js@^3.1.4:
-  version "3.17.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
-  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.1.tgz#2749d4b8b5b7d67460b4a418023ff73c3fefa60a"
+  integrity sha512-EWhx3fHy3M9JbaeTnO+rEqzCe1wtyQClv6q3YWq0voOj4E+bMZBErVS1GAHPDiRGONYq34M1/d8KuQMgvi6Gjw==
 
-unbox-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
-  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
+unbox-primitive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.0.tgz#eeacbc4affa28e9b3d36b5eaeccc50b3251b1d3f"
+  integrity sha512-P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA==
   dependencies:
-    call-bind "^1.0.2"
-    has-bigints "^1.0.2"
-    has-symbols "^1.0.3"
+    function-bind "^1.1.1"
+    has-bigints "^1.0.0"
+    has-symbols "^1.0.0"
+    which-boxed-primitive "^1.0.1"
+
+unbox-primitive@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
+  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+  dependencies:
+    function-bind "^1.1.1"
+    has-bigints "^1.0.1"
+    has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
 underscore.string@^3.2.2, underscore.string@~3.3.4:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.6.tgz#ad8cf23d7423cb3b53b898476117588f4e2f9159"
-  integrity sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023"
+  integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==
   dependencies:
-    sprintf-js "^1.1.1"
+    sprintf-js "^1.0.3"
     util-deprecate "^1.0.2"
 
-underscore@>=1.8.3, underscore@^1.13.2:
-  version "1.13.6"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
-  integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
+underscore@>=1.8.3:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.1.tgz#7bb8cc9b3d397e201cf8553336d262544ead829e"
+  integrity sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==
+
+underscore@~1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.10.2.tgz#73d6aa3668f3188e4adb0f1943bd12cfd7efaaaf"
+  integrity sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==
 
 underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
-  integrity sha512-z4o1fvKUojIWh9XuaVLUDdf86RQiq13AC1dmHbTpoyuu+bquHms76v16CjycCbec87J7z0k//SiQVk0sMdFmpQ==
+  integrity sha1-izixDKze9jM3uLJOT/htRa6lKag=
+
+unherit@^1.0.4:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22"
+  integrity sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==
+  dependencies:
+    inherits "^2.0.0"
+    xtend "^4.0.0"
+
+unicode-canonical-property-names-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
+  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
   integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
+unicode-match-property-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
+  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+  dependencies:
+    unicode-canonical-property-names-ecmascript "^1.0.4"
+    unicode-property-aliases-ecmascript "^1.0.4"
+
 unicode-match-property-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
@@ -14660,20 +17162,42 @@ unicode-match-property-ecmascript@^2.0.0:
     unicode-canonical-property-names-ecmascript "^2.0.0"
     unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
-  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
+unicode-match-property-value-ecmascript@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
+  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+
+unicode-match-property-value-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
+  integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
+
+unicode-property-aliases-ecmascript@^1.0.4:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
+  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
 
 unicode-property-aliases-ecmascript@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
-  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
+  integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
+
+unified@^6.1.6:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz#7fbd630f719126d67d40c644b7e3f617035f6dba"
+  integrity sha512-1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA==
+  dependencies:
+    bail "^1.0.0"
+    extend "^3.0.0"
+    is-plain-obj "^1.1.0"
+    trough "^1.0.0"
+    vfile "^2.0.0"
+    x-is-string "^0.1.0"
 
-unified@^9.0.0, unified@^9.2.2:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.2.tgz#67649a1abfc3ab85d2969502902775eb03146975"
-  integrity sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==
+unified@^9.0.0:
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.1.tgz#ae18d5674c114021bfdbdf73865ca60f410215a3"
+  integrity sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==
   dependencies:
     bail "^1.0.0"
     extend "^3.0.0"
@@ -14746,6 +17270,18 @@ unist-util-position@^3.0.0:
   resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47"
   integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==
 
+unist-util-remove-position@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz#ec037348b6102c897703eee6d0294ca4755a2020"
+  integrity sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==
+  dependencies:
+    unist-util-visit "^1.1.0"
+
+unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz#3f37fcf351279dcbca7480ab5889bb8a832ee1c6"
+  integrity sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==
+
 unist-util-stringify-position@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
@@ -14784,16 +17320,11 @@ unist-util-visit@^2.0.0, unist-util-visit@^2.0.2, unist-util-visit@^2.0.3:
     unist-util-is "^4.0.0"
     unist-util-visit-parents "^3.0.0"
 
-universalify@^0.1.0:
+universalify@^0.1.0, universalify@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
-universalify@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
-  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
-
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
@@ -14802,12 +17333,12 @@ universalify@^2.0.0:
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
@@ -14815,7 +17346,7 @@ unset-value@^1.0.0:
 untildify@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-2.1.0.tgz#17eb2807987f76952e9c0485fc311d06a826a2e0"
-  integrity sha512-sJjbDp2GodvkB0FZZcn7k6afVisqX5BZD7Yq3xp4nN2O15BBK0cLm3Vwn2vQaF7UDS0UUsrQMkkplmDI5fskig==
+  integrity sha1-F+soB5h/dpUunASF/DEdBqgmouA=
   dependencies:
     os-homedir "^1.0.0"
 
@@ -14824,18 +17355,18 @@ upath@^1.1.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-update-browserslist-db@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
-  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+update-browserslist-db@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz#be06a5eedd62f107b7c19eb5bcefb194411abf38"
+  integrity sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-update-section@^0.3.3:
+update-section@~0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/update-section/-/update-section-0.3.3.tgz#458f17820d37820dc60e20b86d94391b00123158"
-  integrity sha512-BpRZMZpgXLuTiKeiu7kK0nIPwGdyrqrs6EDSaXtjD/aQ2T+qVo9a5hRC3HN3iJjCMxNT/VxoLGQ7E/OzE5ucnw==
+  integrity sha1-RY8Xgg03gg3GDiC4bZQ5GwASMVg=
 
 uri-js@^4.2.2:
   version "4.4.1"
@@ -14847,20 +17378,12 @@ uri-js@^4.2.2:
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
-
-url-parse@^1.5.3:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
-  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
@@ -14871,24 +17394,24 @@ use@^3.1.0:
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 username-sync@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.3.tgz#ae41c5c8a4c8c2ecc1443a7d0742742bd7e36732"
-  integrity sha512-m/7/FSqjJNAzF2La448c/aEom0gJy7HY7Y509h6l0ePvEkFictAGptwWaj1msWJ38JbfEDOUoE8kqFee9EHKdA==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.2.tgz#0a3697909fb7b5768d29e2921f573acfdd427592"
+  integrity sha512-ayNkOJdoNSGNDBE46Nkc+l6IXmeugbzahZLSMkwvgRWv5y5ZqNY2IrzcgmkR4z32sj1W3tM3TuTUMqkqBzO+RA==
 
 util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util-extend@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
-  integrity sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==
+  integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=
 
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  integrity sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
   dependencies:
     inherits "2.0.1"
 
@@ -14902,7 +17425,12 @@ util@^0.11.0:
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
+uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 uuid@^8.3.2:
   version "8.3.2"
@@ -14925,7 +17453,7 @@ validate-npm-package-license@^3.0.1:
 validate-npm-package-name@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
-  integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==
+  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
   dependencies:
     builtins "^1.0.3"
 
@@ -14945,7 +17473,28 @@ validated-changeset@1.0.0, validated-changeset@~1.0.0:
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+vfile-location@^2.0.0:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.6.tgz#8a274f39411b8719ea5728802e10d9e0dff1519e"
+  integrity sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==
+
+vfile-message@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.1.1.tgz#5833ae078a1dfa2d96e9647886cd32993ab313e1"
+  integrity sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==
+  dependencies:
+    unist-util-stringify-position "^1.1.1"
 
 vfile-message@^2.0.0:
   version "2.0.4"
@@ -14955,6 +17504,16 @@ vfile-message@^2.0.0:
     "@types/unist" "^2.0.0"
     unist-util-stringify-position "^2.0.0"
 
+vfile@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz#e62d8e72b20e83c324bc6c67278ee272488bf84a"
+  integrity sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==
+  dependencies:
+    is-buffer "^1.1.4"
+    replace-ext "1.0.0"
+    unist-util-stringify-position "^1.0.0"
+    vfile-message "^1.0.0"
+
 vfile@^4.0.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624"
@@ -14987,7 +17546,7 @@ w3c-xmlserializer@^2.0.0:
 walk-sync@^0.2.5:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969"
-  integrity sha512-OH8GdRMowEFr0XSHQeX5fGweO6zSVHo7bG/0yJQx6LAj9Oukz0C8heI3/FYectT66gY0IPGe89kOvU410/UNpg==
+  integrity sha1-tJvk7mhnZXrrc2l4tWop0Q+jmWk=
   dependencies:
     ensure-posix-path "^1.0.0"
     matcher-collection "^1.0.0"
@@ -15030,18 +17589,19 @@ walk-sync@^3.0.0:
     minimatch "^3.0.4"
 
 walker@~1.0.5:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
-  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
   dependencies:
-    makeerror "1.0.12"
+    makeerror "1.0.x"
 
 watch-detector@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-1.0.2.tgz#95deb9189f8c89c0a9f211739cef6d01cffcf452"
-  integrity sha512-MrJK9z7kD5Gl3jHBnnBVHvr1saVGAfmkyyrvuNzV/oe0Gr1nwZTy5VSA0Gw2j2Or0Mu8HcjUa44qlBvC2Ofnpg==
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-1.0.0.tgz#c7b722d8695fee9ab6071e0f38f258e6adb22609"
+  integrity sha512-siywMl3fXK30Tlpu/dUBHhlpxhQmHdguZ8OIb813eU9lrVmmsJa9k0+n1HtJ+7p3SzFCPq2XbmR3GUYpPC3TBA==
   dependencies:
     heimdalljs-logger "^0.1.10"
+    semver "^6.3.0"
     silent-error "^1.1.1"
     tmp "^0.1.0"
 
@@ -15081,7 +17641,7 @@ wayfarer@^7.0.1:
 wcwidth@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
   dependencies:
     defaults "^1.0.3"
 
@@ -15143,9 +17703,9 @@ webpack@^4.43.0:
     webpack-sources "^1.4.1"
 
 webpack@^5.74.0:
-  version "5.76.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.1.tgz#7773de017e988bccb0f13c7d75ec245f377d295c"
-  integrity sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==
+  version "5.74.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
+  integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^0.0.51"
@@ -15206,16 +17766,16 @@ whatwg-url@^5.0.0:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
-whatwg-url@^8.0.0, whatwg-url@^8.5.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
-  integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
+whatwg-url@^8.0.0:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837"
+  integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==
   dependencies:
-    lodash "^4.7.0"
-    tr46 "^2.1.0"
+    lodash.sortby "^4.7.0"
+    tr46 "^2.0.2"
     webidl-conversions "^6.1.0"
 
-which-boxed-primitive@^1.0.2:
+which-boxed-primitive@^1.0.1, which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
   integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
@@ -15237,21 +17797,22 @@ which-collection@^1.0.1:
     is-weakset "^2.0.1"
 
 which-pm-runs@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.1.0.tgz#35ccf7b1a0fce87bd8b92a478c9d045785d3bf35"
-  integrity sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
+  integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
 
-which-typed-array@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
-  integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
+which-typed-array@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff"
+  integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==
   dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
-    is-typed-array "^1.1.10"
+    available-typed-arrays "^1.0.2"
+    call-bind "^1.0.0"
+    es-abstract "^1.18.0-next.1"
+    foreach "^2.0.5"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.1"
+    is-typed-array "^1.1.3"
 
 which@^1.2.14, which@^1.2.9:
   version "1.3.1"
@@ -15267,7 +17828,14 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0, wide-align@^1.1.5:
+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+  dependencies:
+    string-width "^1.0.2 || 2"
+
+wide-align@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -15282,12 +17850,12 @@ word-wrap@^1.2.3, word-wrap@~1.2.3:
 wordwrap@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
 wordwrap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
 worker-farm@^1.7.0:
   version "1.7.0"
@@ -15297,9 +17865,9 @@ worker-farm@^1.7.0:
     errno "~0.1.7"
 
 workerpool@^2.3.0:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-2.3.4.tgz#661335ded59a08c01ca009e30cc96929a7b4b0aa"
-  integrity sha512-c2EWrgB9IKHi1jbf4LG9sxKgHYOY+Ej5li6siEGtFecCXWG7eQOqATPEJ0rg1KFETXROEkErc1t5XiNrLG666Q==
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-2.3.3.tgz#49a70089bd55e890d68cc836a19419451d7c81d7"
+  integrity sha512-L1ovlYHp6UObYqElXXpbd214GgbEKDED0d3sj7pRdFXjNkb2+un/AUcCkceHizO0IVI6SOGGncrcjozruCkRgA==
   dependencies:
     object-assign "4.1.1"
 
@@ -15312,10 +17880,15 @@ workerpool@^3.1.1:
     object-assign "4.1.1"
     rsvp "^4.8.4"
 
-workerpool@^6.0.0, workerpool@^6.1.4:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.4.0.tgz#f8d5cfb45fde32fa3b7af72ad617c3369567a462"
-  integrity sha512-i3KR1mQMNwY2wx20ozq2EjISGtQWDIfV56We+yGJ5yDs8jTwQiLLaqHlkBHITlCuJnYlVRmXegxFxZg7gqI++A==
+workerpool@^6.0.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
+  integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
+
+workerpool@^6.0.3:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.2.tgz#52bb8c05d89e9b699b68d39f9687419cb2f6ca5c"
+  integrity sha512-I/gDW4LwV3bslk4Yiqd4XoNYlnvV03LON7KuIjmQ90yDnKND1sR2LK/JA1g1tmd71oe6KPSvN0JpBzXIH6xAgA==
 
 wrap-ansi@^6.2.0:
   version "6.2.0"
@@ -15348,7 +17921,7 @@ wrap-legacy-hbs-plugin-if-needed@^1.0.1:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^3.0.0:
   version "3.0.3"
@@ -15360,15 +17933,20 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-ws@^7.4.6:
-  version "7.5.9"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+ws@^7.4.4:
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz#383bc9742cb202292c9077ceab6f6047b17f2d59"
+  integrity sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==
 
-ws@~8.11.0:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
-  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
+ws@~8.2.3:
+  version "8.2.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
+  integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
+
+x-is-string@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
+  integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=
 
 xdg-basedir@^4.0.0:
   version "4.0.0"
@@ -15390,25 +17968,25 @@ xmlhttprequest-ssl@^1.6.3:
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz#03b713873b01659dfa2c1c5d056065b27ddc2de6"
   integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==
 
-xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.1:
+xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
+  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
 
 y18n@^5.0.5:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
-  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"
+  integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
 
 yadda@*:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/yadda/-/yadda-2.2.0.tgz#748a2ae921a968aa5f914324898ccecb1fa5ee32"
-  integrity sha512-TO5YH2XzFZjtInULMZHKTStTOaxRG5hB/nN8qxHOJedsd0HLeqRoP/TW1qKqTeGhIUzq7CVR7iIEFIwerbXIkg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/yadda/-/yadda-2.1.0.tgz#44b2279f552d0df49e5af663457ee65a796df7ef"
+  integrity sha512-jWEhhPemaU2OBNjOmwtdbNm7dHS43bNFexsV4aEDhlkz/vuGvYYHsySdSCM0YWdGLzlyqEJqLkXva+vFRTOblg==
 
 yallist@^3.0.0, yallist@^3.0.2:
   version "3.1.1"
@@ -15434,9 +18012,9 @@ yaml@^1.10.0, yaml@^1.10.2, yaml@^1.9.2:
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
 yargs-parser@^20.2.2:
-  version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+  version "20.2.7"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"
+  integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==
 
 yargs@^16.2.0:
   version "16.2.0"
diff --git a/version/VERSION b/version/VERSION
index ee8855caa4a79..86660e56fc64c 100644
--- a/version/VERSION
+++ b/version/VERSION
@@ -1 +1 @@
-1.17.0-dev
+1.15.7-dev
diff --git a/version/fips.go b/version/fips.go
deleted file mode 100644
index 922d60644f2ee..0000000000000
--- a/version/fips.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !fips
-
-package version
-
-func IsFIPS() bool {
-	return false
-}
-
-func GetFIPSInfo() string {
-	return ""
-}
diff --git a/version/version.go b/version/version.go
index ea52f0ff89d28..36b2eacfa5a1a 100644
--- a/version/version.go
+++ b/version/version.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package version
 
 import (
@@ -33,14 +30,6 @@ var (
 	BuildDate string = "1970-01-01T00:00:01Z"
 )
 
-// BuildInfo includes all available version info for this build
-type BuildInfo struct {
-	SHA          string
-	BuildDate    string
-	HumanVersion string
-	FIPS         string
-}
-
 // GetHumanVersion composes the parts of the version in a way that's suitable
 // for displaying to humans.
 func GetHumanVersion() string {
@@ -52,10 +41,6 @@ func GetHumanVersion() string {
 		version += fmt.Sprintf("-%s", release)
 	}
 
-	if IsFIPS() {
-		version += ".fips1402"
-	}
-
 	if metadata != "" {
 		version += fmt.Sprintf("+%s", metadata)
 	}
@@ -63,13 +48,3 @@ func GetHumanVersion() string {
 	// Strip off any single quotes added by the git information.
 	return strings.ReplaceAll(version, "'", "")
 }
-
-// GetBuildInfo returns all available version information for this build.
-func GetBuildInfo() *BuildInfo {
-	return &BuildInfo{
-		SHA:          GitCommit,
-		BuildDate:    BuildDate,
-		HumanVersion: GetHumanVersion(),
-		FIPS:         GetFIPSInfo(),
-	}
-}
diff --git a/version/version_test.go b/version/version_test.go
index f295602f75170..a7afb7dbc25b2 100644
--- a/version/version_test.go
+++ b/version/version_test.go
@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
 package version
 
 import (
diff --git a/website/.eslintrc.js b/website/.eslintrc.js
index 32359e4f8d0d3..266f4d5fa9cb1 100644
--- a/website/.eslintrc.js
+++ b/website/.eslintrc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 module.exports = {
   ...require('@hashicorp/platform-cli/config/.eslintrc'),
   ignorePatterns: ['public/'],
diff --git a/website/.stylelintrc.js b/website/.stylelintrc.js
index b651a84609307..497a1c999eefb 100644
--- a/website/.stylelintrc.js
+++ b/website/.stylelintrc.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 module.exports = {
   ...require('@hashicorp/platform-cli/config/stylelint.config'),
   /* Specify overrides here */
diff --git a/website/README.md b/website/README.md
index 2babc35c2d53a..4633bae501418 100644
--- a/website/README.md
+++ b/website/README.md
@@ -100,16 +100,6 @@ The significant keys in the YAML frontmatter are:
 
 > ⚠️ If there is a need for a `/api/*` url on this website, the url will be changed to `/api-docs/*`, as the `api` folder is reserved by next.js.
 
-### Validating Content
-
-Content changes are automatically validated against a set of rules as part of the pull request process. If you want to run these checks locally to validate your content before comitting your changes, you can run the following command:
-
-```
-npm run content-check
-```
-
-If the validation fails, actionable error messages will be displayed to help you address detected issues.
-
 ### Creating New Pages
 
 There is currently a small bug with new page creation - if you create a new page and link it up via subnav data while the server is running, it will report an error saying the page was not found. This can be resolved by restarting the server.
diff --git a/website/content/api-docs/acl/index.mdx b/website/content/api-docs/acl/index.mdx
index 57a527d99d63b..835a8e28dd40e 100644
--- a/website/content/api-docs/acl/index.mdx
+++ b/website/content/api-docs/acl/index.mdx
@@ -444,7 +444,7 @@ replication enabled.
   login. This must be of type [`oidc`](/consul/docs/security/acl/auth-methods/oidc).
 
 - `State` `(string: <required>)` - Opaque state ID that is part of the
-  Authorization URL and will be included in the redirect following
+  Authorization URL and will be included in the the redirect following
   successful authentication on the provider.
 
 - `Code` `(string: <required>)` - Provider-generated authorization code that
diff --git a/website/content/api-docs/agent/check.mdx b/website/content/api-docs/agent/check.mdx
index 5faf7286295f7..03364b6aeb313 100644
--- a/website/content/api-docs/agent/check.mdx
+++ b/website/content/api-docs/agent/check.mdx
@@ -239,10 +239,6 @@ The table below shows this endpoint's support for
   made to both addresses, and the first successful connection attempt will
   result in a successful check.
 
-- `TCPUseTLS` `(bool: false)` - Specifies whether to use TLS for this `TCP` health check.
-  If TLS is enabled, then by default, a valid TLS certificate is expected. Certificate
-  verification can be turned off by setting `TLSSkipVerify` to `true`.
-
 - `UDP` `(string: "")` - Specifies a `UDP` IP address/hostname and port.
 The check sends datagrams to the value specified at the interval specified in the `Interval` configuration.
 If the datagram is sent successfully or a timeout is returned, the check is set to the `passing` state.
diff --git a/website/content/api-docs/agent/index.mdx b/website/content/api-docs/agent/index.mdx
index d76cc1910775b..f84bad1be00b8 100644
--- a/website/content/api-docs/agent/index.mdx
+++ b/website/content/api-docs/agent/index.mdx
@@ -206,24 +206,6 @@ $ curl \
 }
 ```
 
-## Retrieve version information
-
-This endpoint returns version information about Consul.
-
-| Method | Path             | Produces           |
-| ------ | ---------------- | ------------------ |
-| `GET`  | `/agent/version` | `application/json` |
-
-The table below shows this endpoint's support for
-[blocking queries](/consul/api-docs/features/blocking),
-[consistency modes](/consul/api-docs/features/consistency),
-[agent caching](/consul/api-docs/features/caching), and
-[required ACLs](/consul/api-docs/api-structure#authentication).
-
-| Blocking Queries | Consistency Modes | Agent Caching | ACL Required |
-| ---------------- | ----------------- | ------------- | ------------ |
-| `NO`             | `none`            | `none`        | `none`       |
-
 ## List Members
 
 This endpoint returns the members the agent sees in the cluster gossip pool. Due
diff --git a/website/content/api-docs/agent/service.mdx b/website/content/api-docs/agent/service.mdx
index cf821c9ddf139..3be17aced197c 100644
--- a/website/content/api-docs/agent/service.mdx
+++ b/website/content/api-docs/agent/service.mdx
@@ -635,11 +635,11 @@ The `/agent/service/register` endpoint supports camel case and _snake case_ for
   - `"connect-proxy"` for [service mesh](/consul/docs/connect) proxies representing another service
   - `"mesh-gateway"` for instances of a [mesh gateway](/consul/docs/connect/gateways/mesh-gateway#service-mesh-proxy-configuration)
   - `"terminating-gateway"` for instances of a [terminating gateway](/consul/docs/connect/gateways/terminating-gateway)
-  - `"ingress-gateway"` for instances of an [ingress gateway](/consul/docs/connect/gateways/ingress-gateway)
+  - `"ingress-gateway"` for instances of a [ingress gateway](/consul/docs/connect/gateways/ingress-gateway)
 
 - `Proxy` `(Proxy: nil)` - From 1.2.3 on, specifies the configuration for a
   service mesh proxy instance. This is only valid if `Kind` defines a proxy or gateway.
-  Refer to the [Service mesh proxy configuration reference](/consul/docs/connect/proxies/proxy-config-reference)
+  See the [Proxy documentation](/consul/docs/connect/registration/service-registration)
   for full details.
 
 - `Connect` `(Connect: nil)` - Specifies the
@@ -693,13 +693,13 @@ For the `Connect` field, the parameters are:
   If this is true, then service mesh proxies, DNS queries, etc. will be able to
   service discover this service.
 - `Proxy` `(Proxy: nil)` -
-  **Deprecated** Specifies that a managed service mesh proxy should be started 
-  for this service instance, and optionally provides configuration for the proxy. 
-  Managed proxies (which have been deprecated since Consul v1.3.0) have been 
-  [removed](/consul/docs/connect/proxies) since v1.6.0.
+  [**Deprecated**](/consul/docs/connect/proxies/managed-deprecated) Specifies that
+  a managed service mesh proxy should be started for this service instance, and
+  optionally provides configuration for the proxy. The format is as documented
+  in [Managed Proxy Deprecation](/consul/docs/connect/proxies/managed-deprecated).
 - `SidecarService` `(ServiceDefinition: nil)` - Specifies an optional nested
-  service definition to register. Refer to 
-  [Deploy sidecar services](/consul/docs/connect/proxies/deploy-sidecar-services) for additional information.
+  service definition to register. For more information see
+  [Sidecar Service Registration](/consul/docs/connect/registration/sidecar-service).
 
 ### Sample Payload
 
diff --git a/website/content/api-docs/catalog.mdx b/website/content/api-docs/catalog.mdx
index 91d1fe7f7e696..7b3a1bb0cd481 100644
--- a/website/content/api-docs/catalog.mdx
+++ b/website/content/api-docs/catalog.mdx
@@ -55,7 +55,7 @@ The table below shows this endpoint's support for
 - `NodeMeta` `(map<string|string>: nil)` - Specifies arbitrary KV metadata
   pairs for filtering purposes.
 
-- `Service` `(Service: nil)` - Contains an object the specifies the service to register. The `Service.Service` field is required. If `Service.ID` is not provided, the default is the `Service.Service`.
+- `Service` `(Service: nil)` - Contains an object the specifies the service to register. The the `Service.Service` field is required. If `Service.ID` is not provided, the default is the `Service.Service`.
   You can only specify one service with a given `ID` per node. We recommend using
   valid DNS labels for service definition names. Refer to the Internet Engineering Task Force's [RFC 1123](https://datatracker.ietf.org/doc/html/rfc1123#page-72) for additional information. Service names that conform to standard usage ensures compatibility with external DNSs. Refer to [Services Configuration Reference](/consul/docs/services/configuration/services-configuration-reference#name) for additional information.
   The following fields are optional: 
diff --git a/website/content/api-docs/config.mdx b/website/content/api-docs/config.mdx
index a79e024fa46f0..96e6a7b4de773 100644
--- a/website/content/api-docs/config.mdx
+++ b/website/content/api-docs/config.mdx
@@ -215,7 +215,6 @@ The corresponding CLI command is [`consul config list`](/consul/commands/config/
 ### Path Parameters
 
 - `kind` `(string: <required>)` - Specifies the kind of the entry to list.
-- `filter` `(string: "")` - Specifies an expression to use for filtering the results.
 
 ### Query Parameters
 
diff --git a/website/content/api-docs/discovery-chain.mdx b/website/content/api-docs/discovery-chain.mdx
index ecde4b3146110..ba222116ec65d 100644
--- a/website/content/api-docs/discovery-chain.mdx
+++ b/website/content/api-docs/discovery-chain.mdx
@@ -13,13 +13,13 @@ description: The /discovery-chain endpoints are for interacting with the discove
 high-level proxy integration APIs may obviate the need for this API over time.
 
 The `/discovery-chain` endpoint returns the compiled [discovery
-chain](/consul/docs/connect/manage-traffic/discovery-chain) for a service.
+chain](/consul/docs/connect/l7-traffic/discovery-chain) for a service.
 
 This will fetch all related [configuration
 entries](/consul/docs/agent/config-entries) and render them into a form suitable
 for use by a [service mesh proxy](/consul/docs/connect/proxies) implementation. This
 is a key component of [L7 Traffic
-Management](/consul/docs/connect/manage-traffic).
+Management](/consul/docs/connect/l7-traffic).
 
 ## Read Compiled Discovery Chain
 
@@ -57,8 +57,10 @@ The table below shows this endpoint's support for
 - `compile-dc` `(string: "")` - Specifies the datacenter to use as the basis of
   compilation. This will default to the datacenter of the agent being queried.
 
-  This value comes from the `datacenter` parameter in an [upstream
-  configuration](/consul/docs/connect/proxies/proxy-config-reference#upstream-configuration-reference).
+  This value comes from an [upstream
+  configuration](/consul/docs/connect/registration/service-registration#upstream-configuration-reference)
+  [`datacenter`](/consul/docs/connect/registration/service-registration#datacenter)
+  parameter.
 
 - `ns` `(string: "")` <EnterpriseAlert inline /> - Specifies the source namespace you use as the basis of compilation.
   You can also [specify the namespace through other methods](#methods-to-specify-namespace).
@@ -69,8 +71,11 @@ The table below shows this endpoint's support for
   timeout](/consul/docs/connect/config-entries/service-resolver#connecttimeout) for
   any service resolved in the compiled chain.
 
-  This value comes from the `connect_timeout_ms` key in the opaque `config` field of the [upstream
-  configuration](/consul/docs/connect/proxies/proxy-config-reference#upstream-configuration-reference).
+  This value comes from the `connect_timeout_ms` key in an [upstream
+  configuration](/consul/docs/connect/registration/service-registration#upstream-configuration-reference)
+  opaque
+  [`config`](/consul/docs/connect/registration/service-registration#config-1)
+  parameter.
 
 - `OverrideProtocol` `(string: "")` - Overrides the final
   [protocol](/consul/docs/connect/config-entries/service-defaults#protocol) used in
@@ -81,24 +86,30 @@ The table below shows this endpoint's support for
   would be L7 and TCP is passed here the chain will not include Routers or
   Splitters.
 
-  This value comes from the `protocol` key in an opaque `config` field of the [upstream
-  configuration](/consul/docs/connect/proxies/proxy-config-reference#upstream-configuration-reference).
+  This value comes from the `protocol` key in an [upstream
+  configuration](/consul/docs/connect/registration/service-registration#upstream-configuration-reference)
+  opaque
+  [`config`](/consul/docs/connect/registration/service-registration#config-1)
+  parameter.
 
 - `OverrideMeshGateway` `(MeshGatewayConfig: <optional>)` - Overrides the final
   [mesh gateway configuration](/consul/docs/connect/gateways/mesh-gateway#connect-proxy-configuration)
   for this any service resolved in the compiled chain.
 
-  This value comes from the `mesh_gateway` parameter in either the [proxy
-  configuration](/consul/docs/connect/proxies/proxy-config-reference#proxy-parameters) or [upstream
-  configuration](/consul/docs/connect/proxies/proxy-config-reference#upstream-configuration-reference)
-  If both parameters are configured, Consul uses the value defined on the upstream.
+  This value comes from either the [proxy
+  configuration](/consul/docs/connect/registration/service-registration#complete-configuration-example)
+  [`mesh_gateway`](/consul/docs/connect/registration/service-registration#mesh_gateway)
+  parameter or an [upstream
+  configuration](/consul/docs/connect/registration/service-registration#upstream-configuration-reference)
+  [`mesh_gateway`](/consul/docs/connect/registration/service-registration#mesh_gateway-1)
+  parameter. If both are present the value defined on the upstream is used.
 
   - `Mode` `(string: "")` - One of `none`, `local`, or `remote`.
 
 ### Sample Compilations
 
 Full documentation for the output fields is found on the [discovery chain
-internals](/consul/docs/connect/manage-traffic/discovery-chain#compileddiscoverychain)
+internals](/consul/docs/connect/l7-traffic/discovery-chain#compileddiscoverychain)
 page.
 
 #### Multi-Datacenter Failover
diff --git a/website/content/api-docs/operator/autopilot.mdx b/website/content/api-docs/operator/autopilot.mdx
index e59898862a263..c03f688b60ce4 100644
--- a/website/content/api-docs/operator/autopilot.mdx
+++ b/website/content/api-docs/operator/autopilot.mdx
@@ -396,7 +396,7 @@ $ curl \
   `leader`, `voter`, `non-voter`, or `staging`.
 - `Meta` is the node metadata of this server. Values within this map are used for determining a server's
   redundancy zone and upgrade version.
-- `NodeType` is the desired type autopilot thinks this server should have. In Consul CE, the only possible
+- `NodeType` is the desired type autopilot thinks this server should have. In Consul OSS the only possible
   value is `voter` as all present servers should having voting rights. In Consul Enterprise the possible values also
   include `read-replica`, `zone-voter`, `zone-standby` and `zone-extra-voter`. `zone-voter` indicates that autopilot
   wants this server to be the voter for a particular redundancy zone. When a zone has no voter all nodes will be typed
diff --git a/website/content/api-docs/operator/usage.mdx b/website/content/api-docs/operator/usage.mdx
index 1bd1f054c7ef5..b1dc75c39e088 100644
--- a/website/content/api-docs/operator/usage.mdx
+++ b/website/content/api-docs/operator/usage.mdx
@@ -49,7 +49,7 @@ $ curl \
 
 <Tabs>
 
-<Tab heading="CE">
+<Tab heading="OSS">
 
 ```json
 {
@@ -64,8 +64,7 @@ $ curl \
         "mesh-gateway": 0,
         "terminating-gateway": 0
       },
-      "BillableServiceInstances": 0,
-      "Nodes": 1
+      "BillableServiceInstances": 0
     }
   },
   "Index": 13,
diff --git a/website/content/api-docs/query.mdx b/website/content/api-docs/query.mdx
index f8c71bfb065a8..c71e4c441d26b 100644
--- a/website/content/api-docs/query.mdx
+++ b/website/content/api-docs/query.mdx
@@ -10,7 +10,7 @@ The `/query` endpoints create, update, destroy, and execute prepared queries.
 
 Prepared queries allow you to register a complex service query and then execute
 it later by specifying the query ID or name. Consul returns a set of healthy nodes that provide a given
-service. Refer to
+service. Refer to 
 [Enable Dynamic DNS Queries](/consul/docs/services/discovery/dns-dynamic-lookups) for additional information.
 
 Check the [Geo Failover tutorial](/consul/tutorials/developer-discovery/automate-geo-failover) for details and
@@ -177,22 +177,13 @@ The table below shows this endpoint's support for
   - `Service` `(string: <required>)` - Specifies the name of the service to
     query.
 
-  - `SamenessGroup` `(string: "")` <EnterpriseAlert inline /> - Specifies a Sameness group to forward the
-  query to. The `SamenessGroup` will forward to its members in the order defined, returning on the first
-  healthy query. `SamenessGroup` is mutually exclusive with `Failover` as `SamenessGroup` members will be used
-  in place of a defined list of failovers.
-
   - `Namespace` `(string: "")` <EnterpriseAlert inline /> - Specifies the Consul namespace
-    to query. If not provided the query will use Consul default namespace for resolution. When combined with
-  `SamenessGroup` this will specify the namespaces in which the `SamenessGroup` will resolve all members listed.
-
-  - `Partition` `(string: "")` <EnterpriseAlert inline /> - Specifies the Consul partition
-  to query. If not provided the query will use Consul's default partition for resolution. When combined with
-  `SamenessGroup`, this will specify the partition where the `SamenessGroup` exists.
+    to query. If not provided the query will use Consul default namespace for resolution.
 
-  - `Failover` Determines what happens if no healthy nodes are available in the local datacenter when
+  - `Failover` contains two fields, both of which are optional, and determine
+    what happens if no healthy nodes are available in the local datacenter when
     the query is executed. It allows the use of nodes in other datacenters with
-    very little configuration. This field is mutually exclusive with `SamenessGroup`.
+    very little configuration.
 
     - `NearestN` `(int: 0)` - Specifies that the query will be forwarded to up
       to `NearestN` other datacenters based on their estimated network round
@@ -221,12 +212,6 @@ The table below shows this endpoint's support for
       - `Datacenter` `(string: "")` - Specifies a WAN federated datacenter to forward the
         query to.
 
-      - `Partition` `(string: "")` <EnterpriseAlert inline /> - Specifies a Partition to forward the
-      query to.
-
-      - `Namespace` `(string: "")` <EnterpriseAlert inline /> - Specifies a Namespace to forward the
-      query to.
-
   - `IgnoreCheckIDs` `(array<string>: nil)` - Specifies a list of check IDs that
     should be ignored when filtering unhealthy instances. This is mostly useful
     in an emergency or as a temporary measure when a health check is found to be
diff --git a/website/content/api-docs/status.mdx b/website/content/api-docs/status.mdx
index 2eb466b97fb5e..1a14e5d4fcac6 100644
--- a/website/content/api-docs/status.mdx
+++ b/website/content/api-docs/status.mdx
@@ -51,7 +51,7 @@ $ curl http://127.0.0.1:8500/v1/status/leader
 
 ## List Raft Peers
 
-This endpoint retrieves the Raft peers for the datacenter in which the agent
+This endpoint retrieves the Raft peers for the datacenter in which the the agent
 is running. This list of peers is strongly consistent and can be useful in
 determining when a given server has successfully joined the cluster.
 
diff --git a/website/content/commands/config/list.mdx b/website/content/commands/config/list.mdx
index e453b11943192..1a70af1787253 100644
--- a/website/content/commands/config/list.mdx
+++ b/website/content/commands/config/list.mdx
@@ -44,7 +44,6 @@ Usage: `consul config list [options]`
 #### Command Options
 
 - `-kind` - Specifies the kind of the config entry to list.
-- `-filter` - Specifies an expression to use for filtering the results.
 
 #### Enterprise Options
 
@@ -58,16 +57,7 @@ Usage: `consul config list [options]`
 
 ## Examples
 
-To list all service-defaults config entries:
-
     $ consul config list -kind service-defaults
     billing
     db
     web
-
-The following lists service-defaults with a filter expression:
-
-    $ consul config list -kind service-defaults -filter 'MutualTLSMode == "permissive"'
-    db
-    web
-
diff --git a/website/content/commands/connect/envoy.mdx b/website/content/commands/connect/envoy.mdx
index 744873df5656c..bb2cc5d77e811 100644
--- a/website/content/commands/connect/envoy.mdx
+++ b/website/content/commands/connect/envoy.mdx
@@ -36,7 +36,7 @@ Usage: `consul connect envoy [options] [-- pass-through options]`
 
 #### Envoy Options for both Sidecars and Gateways
 
-- `-proxy-id` - The [proxy service](/consul/docs/connect/proxies/proxy-config-reference) ID.
+- `-proxy-id` - The [proxy service](/consul/docs/connect/registration/service-registration) ID.
   This service ID must already be registered with the local agent unless a gateway is being
   registered with the `-register` flag. As of Consul 1.8.0, this can also be
   specified via the `CONNECT_PROXY_ID` environment variable.
@@ -133,7 +133,7 @@ compatibility with Envoy and prevent potential issues. Default is `false`.
 - `-sidecar-for` - The _ID_ (not name if they differ) of the service instance
   this proxy will represent. The target service doesn't need to exist on the
   local agent yet but a [sidecar proxy
-  registration](/consul/docs/proxies/deploy-sidecar-services) with
+  registration](/consul/docs/connect/registration/service-registration) with
   `proxy.destination_service_id` equal to the passed value must be present. If
   multiple proxy registrations targeting the same local service instance are
   present the command will error and `-proxy-id` should be used instead.
@@ -225,9 +225,9 @@ proxy configuration needed.
 
 ## Examples
 
-In the following examples, a local service instance is registered on the local agent with a
+Assume a local service instance is registered on the local agent with a
 sidecar proxy (using the [sidecar service
-registration](/consul/docs/connect/proxies/deploy-sidecar-services) helper):
+registration](/consul/docs/connect/registration/service-registration) helper) as below.
 
 ```hcl
 service {
@@ -342,7 +342,7 @@ immediately unlinks it so it can't be read by any other process that doesn't
 already have the file descriptor. It then writes the bootstrap JSON, and unsets
 the CLOEXEC bit on the file handle so that it remains available to the Envoy
 process after exec. Finally it `exec`s Envoy with `--config-file /dev/fd/X`
-where `X` is the file descriptor number of the temp file.
+where `X` is the the file descriptor number of the temp file.
 
 This ensures that Envoy can read the file without any other normal user process
 being able to (assuming they don't have privileged access to /proc). Once the
diff --git a/website/content/commands/connect/proxy.mdx b/website/content/commands/connect/proxy.mdx
index 0a4571df5f9e8..db3192dbee4f7 100644
--- a/website/content/commands/connect/proxy.mdx
+++ b/website/content/commands/connect/proxy.mdx
@@ -24,14 +24,14 @@ Usage: `consul connect proxy [options]`
 - `-sidecar-for` - The _ID_ (not name if they differ) of the service instance
   this proxy will represent. The target service doesn't need to exist on the
   local agent yet but a [sidecar proxy
-  registration](/consul/docs/connect/proxies/deploy-sidecar-services) with
+  registration](/consul/docs/connect/registration/service-registration) with
   `proxy.destination_service_id` equal to the passed value must be present. If
   multiple proxy registrations targeting the same local service instance are
   present the command will error and `-proxy-id` should be used instead.
   This can also be specified via the `CONNECT_SIDECAR_FOR` environment variable.
 
 - `-proxy-id` - The [proxy
-  service](/consul/docs/connect/proxies/proxy-config-reference) ID on the
+  service](/consul/docs/connect/registration/service-registration) ID on the
   local agent. This must already be present on the local agent. This option
   can also be specified via the `CONNECT_PROXY_ID` environment variable.
 
diff --git a/website/content/commands/connect/redirect-traffic.mdx b/website/content/commands/connect/redirect-traffic.mdx
index af59baee56b79..44decfef40715 100644
--- a/website/content/commands/connect/redirect-traffic.mdx
+++ b/website/content/commands/connect/redirect-traffic.mdx
@@ -38,7 +38,7 @@ Usage: `consul connect redirect-traffic [options]`
 
 - `-consul-dns-port` - The port of the Consul DNS resolver. If provided, DNS queries will be redirected to the provided IP address for name resolution.
 
-- `-proxy-id` - The [proxy service](/consul/docs/connect/proxies/proxy-config-reference) ID.
+- `-proxy-id` - The [proxy service](/consul/docs/connect/registration/service-registration) ID.
   This service ID must already be registered with the local agent.
 
 - `-proxy-inbound-port` - The inbound port that the proxy is listening on.
diff --git a/website/content/commands/debug.mdx b/website/content/commands/debug.mdx
index 6feeb685f452a..49e3fa4d5f06f 100644
--- a/website/content/commands/debug.mdx
+++ b/website/content/commands/debug.mdx
@@ -83,13 +83,13 @@ information when `debug` is running. By default, it captures all information.
 | `members` | A list of all the WAN and LAN members in the cluster.                                                                                                                                                                                                                                                                                                                                                                     |
 | `metrics` | Metrics from the in-memory metrics endpoint in the target, captured at the interval.                                                                                                                                                                                                                                                                                                                                      |
 | `logs`    | `TRACE` level logs for the target agent, captured for the duration.                                                                                                                                                                                                                                                                                                                                                       |
-| `pprof`   | Golang heap, CPU, goroutine, and trace profiling. CPU and traces are captured for `duration` in a single file while heap and goroutine are separate snapshots for each `interval`. This information is not retrieved unless [`enable_debug`](/consul/docs/agent/config/config-files#enable_debug) is set to `true` on the target agent or ACLs are enabled and an ACL token with `operator:read` is provided. |
+| `pprof`   | Golang heap, CPU, goroutine, and trace profiling. CPU and traces are captured for `duration` in a single file while heap and goroutine are separate snapshots for each `interval`. This information is not retrieved unless [`enable_debug`](/consul/docs/agent/config/config-files#enable_debug) is set to `true` on the target agent or ACLs are enable and an ACL token with `operator:read` is provided. |
 
 ## Examples
 
 This command can be run from any host with the Consul binary, but requires
 network access to the target agent in order to retrieve data. Once retrieved,
-the data is written to the specified path (defaulting to the current
+the data is written to the the specified path (defaulting to the current
 directory) on the host where the command runs.
 
 By default the command will capture all available data from the default
diff --git a/website/content/commands/exec.mdx b/website/content/commands/exec.mdx
index 07754bd2b938c..a90cdb35df1bc 100644
--- a/website/content/commands/exec.mdx
+++ b/website/content/commands/exec.mdx
@@ -40,7 +40,7 @@ execute this command.
 | `key:write`     | `"_rexec"` prefix |
 | `event:write`   | `"_rexec"` prefix |
 
-In addition to the above, the policy associated with the [agent token](/consul/docs/security/acl/tokens#acl-agent-token) should have `write` on `"_rexec"` key prefix. This policy permits agents to read the `exec` command and write its output back to the KV store.
+In addition to the above, the policy associated with the [agent token](/consul/docs/security/acl/acl-tokens#acl-agent-token) should have `write` on `"_rexec"` key prefix. This is for the agents to read the `exec` command and write its output back to the KV store.
 
 ## Usage
 
diff --git a/website/content/commands/intention/list.mdx b/website/content/commands/intention/list.mdx
index 4cdfa5c8a2f7e..85a7d6b9d6ce3 100644
--- a/website/content/commands/intention/list.mdx
+++ b/website/content/commands/intention/list.mdx
@@ -2,7 +2,7 @@
 layout: commands
 page_title: 'Commands: Intention List'
 description: >-
-  The `consul intention list` command returns all L4 service intentions, including a unique ID and intention precedence. It was deprecated in Consul v1.9.0; use `consul config` instead.
+  The `consul intention list` command returns all L4 service intentions, including a unique ID and intention precendence. It was deprecated in Consul v1.9.0; use `consul config` instead.
 ---
 
 # Consul Intention List
diff --git a/website/content/commands/kv/index.mdx b/website/content/commands/kv/index.mdx
index 0dd8796d8ebe1..f95f8be8850f7 100644
--- a/website/content/commands/kv/index.mdx
+++ b/website/content/commands/kv/index.mdx
@@ -2,7 +2,7 @@
 layout: commands
 page_title: 'Commands: KV'
 description: >-
-  The `consul kv` command interacts with Consul's key/value store. It exposes top level commands to insert, update, read, and delete data from the store.
+  The `consul kv` command interacts with Consul's key/value store. It exposes top level commands to insert, update, read, and delte data from the store.
 ---
 
 # Consul KV
diff --git a/website/content/commands/leave.mdx b/website/content/commands/leave.mdx
index 8c3744cc287c0..3dccedc7cc2bd 100644
--- a/website/content/commands/leave.mdx
+++ b/website/content/commands/leave.mdx
@@ -22,13 +22,8 @@ For nodes in server mode, the node is removed from the Raft peer set
 in a graceful manner. This is critical, as in certain situations a
 non-graceful leave can affect cluster availability.
 
-Depending on how many Consul servers are running, running `consul leave` on a server explicitly can reduce the quorum
-size (which is derived from the number of Consul servers, see
-[deployment_table](/consul/docs/architecture/consensus#deployment_table)).
-Even if the cluster used `bootstrap_expect` to set a number of servers and thus quorum size initially,
-issuing `consul leave` on a server will reconfigure the cluster to have fewer servers.
-This means you could end up with just one server that is still able to commit writes because the quorum size for
-1-server setup is only 1, but those writes might be lost if that server fails before more are added.
+Running `consul leave` on a server explicitly will reduce the quorum size. Even if the cluster used `bootstrap_expect` to set a quorum size initially, issuing `consul leave` on a server will reconfigure the cluster to have fewer servers.
+This means you could end up with just one server that is still able to commit writes because quorum is only 1, but those writes might be lost if that server fails before more are added.
 
 The table below shows this command's [required ACLs](/consul/api-docs/api-structure#authentication). Configuration of
 [blocking queries](/consul/api-docs/features/blocking) and [agent caching](/consul/api-docs/features/caching)
diff --git a/website/content/commands/operator/usage.mdx b/website/content/commands/operator/usage.mdx
index 83ae028f6c957..56d364862690a 100644
--- a/website/content/commands/operator/usage.mdx
+++ b/website/content/commands/operator/usage.mdx
@@ -50,12 +50,6 @@ Billable Services
 Services      Service instances
 2             3
 
-Nodes
-Datacenter      Count            
-dc1             1
-                
-Total           1
-
 Connect Services
 Type                     Service instances
 connect-native           0
@@ -80,13 +74,6 @@ dc2             1             1
 
 Total           3             4
 
-Nodes
-Datacenter      Count            
-dc1             1
-dc2             2
-                
-Total           3
-
 Connect Services
 Datacenter      Type                     Service instances
 dc1             connect-native           0
diff --git a/website/content/commands/services/deregister.mdx b/website/content/commands/services/deregister.mdx
index edc493866e1c3..79ea7cba27bae 100644
--- a/website/content/commands/services/deregister.mdx
+++ b/website/content/commands/services/deregister.mdx
@@ -2,7 +2,7 @@
 layout: commands
 page_title: 'Commands: Services Deregister'
 description: |
-  The `consul services deregister` command removes a service from the Consul catalog. Run the command on the agent that initially registered the service.
+  The `consul services deregister` command removes a service from the Consul catalog. Run the commeand on the agent that initially registered the service.
 ---
 
 # Consul Agent Service Deregistration
@@ -13,12 +13,12 @@ Corresponding HTTP API Endpoint: [\[PUT\] /v1/agent/service/deregister/:service_
 
 The `services deregister` command deregisters a service with the local agent.
 Note that this command can only deregister services that were registered
-with the agent specified and is intended to be paired with `services register`.
-By default, the command deregisters services on the local agent.
+with the agent specified and is intended to be paired with `services register`. 
+By default, the command deregisters services on the local agent. 
 
 We recommend deregistering services registered with a configuration file by deleting the file and [reloading](/consul/commands/reload) Consul. Refer to [Services Overview](/consul/docs/services/services) for additional information about services.
 
-The following table shows the [ACLs](/consul/api-docs/api-structure#authentication) required to run the `consul services deregister` command:
+The following table shows the [ACLs](/consul/api-docs/api-structure#authentication) required to run the `consul services deregister` command: 
 
 | ACL Required    |
 | --------------- |
diff --git a/website/content/commands/services/export.mdx b/website/content/commands/services/export.mdx
deleted file mode 100644
index 281d5f23e7d7c..0000000000000
--- a/website/content/commands/services/export.mdx
+++ /dev/null
@@ -1,64 +0,0 @@
----
-layout: commands
-page_title: 'Commands: Services Export'
-description: |
-  The `consul services export` command exports a service from one peer or admin partition to another.
----
-
-# Consul Services Export
-
-Command: `consul services export`
-
-The `services export` command exports a service from one admin partition
-or cluster peer to another. This command can be used in lieu of creating or updating the corresponding
-`exported-services` configuration entry. Running the command multiple times with the same
-arguments results in a no-op.
-
-```text
-Usage: consul services export [options] -name <service name> -consumer-peers <other cluster name>
-
-  Export a service to a peered cluster.
-
-      $ consul services export -name=web -consumer-peers=other-cluster
-
-  Use the -consumer-partitions flag instead of -consumer-peers to export to a different partition in the same cluster.
-
-      $ consul services export -name=web -consumer-partitions=other-partition
-
-  Additional flags and more advanced use cases are detailed below.
-```
-
-#### Command options
-
-- `-name=<string>` - (Required) The name of the service to export.
-
-- `-consumer-peers=<string>` - (Required) A comma-separated list of cluster peers to export the service to.
-  In Consul Enterprise, this flag is optional when `-consumer-partitions` is specified.
-
-#### Enterprise options
-
-- `-consumer-partitions=<string>` - A comma-separated list of admin partitions within the
-  same datacenter to export the service to. This flag is optional when `-consumer-peers` is specified.
-
-@include 'http_api_partition_options.mdx'
-
-@include 'http_api_namespace_options.mdx'
-
-#### API options
-
-@include 'http_api_options_client.mdx'
-
-## Examples
-
-In the following example, the `consul services export` command makes the `web` service available to services running in a cluster named `dc2` that has a previously-established cluster peering connection.
-
-```shell-session hideClipboard
-$ consul services export -name=web -consumer-peers=dc2
-```
-
-In the following example, the `consul services export` command makes the `web` service located in the
-namespace `ns1` and the admin partition `alpha` to other admin partitions named `beta` and `delta`.
-
-```shell-session hideClipboard
-$ consul services export -name=web -namespace=ns1 -partition=alpha -consumer-partitions=beta,delta
-```
diff --git a/website/content/commands/services/index.mdx b/website/content/commands/services/index.mdx
index f511ffe2efce0..ec26946c580a0 100644
--- a/website/content/commands/services/index.mdx
+++ b/website/content/commands/services/index.mdx
@@ -31,7 +31,6 @@ Usage: consul services <subcommand> [options] [args]
 Subcommands:
     deregister    Deregister services with the local agent
     register      Register services with the local agent
-    export        Export services from one cluster peer or admin partition to another
 ```
 
 For more information, examples, and usage about a subcommand, click on the name
diff --git a/website/content/commands/services/register.mdx b/website/content/commands/services/register.mdx
index a1cbd8cf580e4..cefa2359230b3 100644
--- a/website/content/commands/services/register.mdx
+++ b/website/content/commands/services/register.mdx
@@ -14,7 +14,7 @@ Corresponding HTTP API Endpoint: [\[PUT\] /v1/agent/service/register](/consul/ap
 The `services register` command registers a service with the local agent.
 This command returns after registration and must be paired with explicit
 service deregistration. This command simplifies service registration from
-scripts. Refer to [Register Services and Health Checks](/consul/docs/services/usage/register-services-checks) for information about other service registration methods.
+scripts. Refer to [Register Services and Health Checks](/consul/docs/services/usage/register-services-checks) for information about other service registeration methods. 
 
 The following table shows the [ACLs](/consul/api-docs/api-structure#authentication) required to use the `consul services register` command:
 
diff --git a/website/content/commands/snapshot/agent.mdx b/website/content/commands/snapshot/agent.mdx
index fe5821dcf40f1..9f7c5d1d50eb7 100644
--- a/website/content/commands/snapshot/agent.mdx
+++ b/website/content/commands/snapshot/agent.mdx
@@ -14,7 +14,7 @@ Command: `consul snapshot agent`
 ~> The [`agent`](/consul/commands/snapshot/agent) subcommand described here is
 available only in [Consul Enterprise](https://www.hashicorp.com/products/consul/)
 version 0.7.1 and later. All other [snapshot subcommands](/consul/commands/snapshot)
-are available in the community edition of Consul.
+are available in the open source version of Consul.
 
 The `snapshot agent` subcommand starts a process that takes snapshots of the
 state of the Consul servers and saves them locally, or pushes them to an
@@ -339,7 +339,7 @@ no `aws-s3-static-snapshot-name` configured.
 | `ListBucket`         | `arn:aws:s3:::<bucket name>`       | Required only when snapshot rotation is enabled |
 | `ListBucketVersions` | `arn:aws:s3:::<bucket name>`       | Required only when snapshot rotation is enabled |
 
-Within the table `<key>` refers to the key used to store the snapshot. When `aws-s3-static-snapshot-name` is configured the `<key>` is simply the value of that configuration. Otherwise the `<key>` will be the `<aws-s3-key-prefix configuration>/consul-*.snap`.
+Within the table `<key>` refers to the the key used to store the snapshot. When `aws-s3-static-snapshot-name` is configured the `<key>` is simply the value of that configuration. Otherwise the `<key>` will be the `<aws-s3-key-prefix configuration>/consul-*.snap`.
 
 The following example IAM policy document assumes that the `aws-s3-bucket` is `consul-data` with defaults for `aws-s3-key-prefix`, `aws-s3-static-snapshot-name` and `retain`:
 
diff --git a/website/content/commands/troubleshoot/proxy.mdx b/website/content/commands/troubleshoot/proxy.mdx
index fcd9552247dd0..d9749c0c254f7 100644
--- a/website/content/commands/troubleshoot/proxy.mdx
+++ b/website/content/commands/troubleshoot/proxy.mdx
@@ -31,7 +31,6 @@ The following example illustrates how to troubleshoot Consul service mesh config
 
   ```shell-session
   $ consul troubleshoot proxy -upstream-ip 10.4.6.160
-
   ==> Validation
    ✓ Certificates are valid
    ✓ Envoy has 0 rejected configurations
@@ -52,7 +51,6 @@ The following example troubleshoots Consul service mesh configuration and networ
 
   ```shell-session
   $ consul-k8s troubleshoot proxy -upstream-envoy-id db
-
   ==> Validation
    ✓ Certificates are valid
    ✓ Envoy has 0 rejected configurations
@@ -61,7 +59,6 @@ The following example troubleshoots Consul service mesh configuration and networ
    ✓ Route for upstream "db" found
    ✓ Cluster "db.default.dc1.internal.e08fa6d6-e91e-dfe0.consul" for upstream "db" found
    ✓ Healthy endpoints for cluster "db.default.dc1.internal.e08fa6d6-e91e-dfe0.consul" for upstream "db" found
-
   If you are still experiencing issues, you can:
   -> Check intentions to ensure the upstream allows traffic from this source
   -> If using transparent proxy, ensure DNS resolution is to the same IP you have verified here
diff --git a/website/content/commands/troubleshoot/upstreams.mdx b/website/content/commands/troubleshoot/upstreams.mdx
index f04a8beedc089..425ec39e46426 100644
--- a/website/content/commands/troubleshoot/upstreams.mdx
+++ b/website/content/commands/troubleshoot/upstreams.mdx
@@ -27,10 +27,8 @@ Display all transparent proxy upstreams in Consul service mesh from the current
   ```shell-session
   $ consul troubleshoot upstreams
   ==> Upstreams (explicit upstreams only) (0)
-
   ==> Upstreams IPs (transparent proxy only) (1)
   [10.4.6.160 240.0.0.3] true map[backend.default.dc1.internal.e08fa6d6-e91e-dfe0-f6e1-ba097a828e31.consul backend2.default.dc1.internal.e08fa6d6-e91e-dfe0-f6e1-ba097a828e31.consul]
-
   If you cannot find the upstream address or cluster for a transparent proxy upstream:
   - Check intentions: Tproxy upstreams are configured based on intentions. Make sure you have configured intentions to allow traffic to your upstream.
   - To check that the right cluster is being dialed, run a DNS lookup for the upstream you are dialing. For example, run `dig backend.svc.consul` to return the IP address for the `backend` service. If the address you get from that is missing from the upstream IPs, it means that your proxy may be misconfigured.
diff --git a/website/content/commands/watch.mdx b/website/content/commands/watch.mdx
index 806864dae9539..da32cdefdc4d0 100644
--- a/website/content/commands/watch.mdx
+++ b/website/content/commands/watch.mdx
@@ -53,11 +53,6 @@ or optionally provided. There is more documentation on watch
 - `-type` - Watch type. Required, one of "`key`, `keyprefix`, `services`,
   `nodes`, `service`, `checks`, or `event`.
 
-- `-filter=<filter>` - Expression to use for filtering the results. Optional for
-  `checks` `nodes`, `services`, and `service` type.
-  See the [`/catalog/nodes` API documentation](/consul/api-docs/catalog#filtering) for a
-  description of what is filterable.
-
 #### API Options
 
 @include 'http_api_options_client.mdx'
diff --git a/website/content/docs/agent/config/cli-flags.mdx b/website/content/docs/agent/config/cli-flags.mdx
index 3ec1e8ba12b3e..5def9683197d6 100644
--- a/website/content/docs/agent/config/cli-flags.mdx
+++ b/website/content/docs/agent/config/cli-flags.mdx
@@ -273,7 +273,7 @@ information.
 
 - `-config-dir` ((#\_config_dir)) - A directory of configuration files to
   load. Consul will load all files in this directory with the suffix ".json" or ".hcl".
-  The load order is alphabetical, and the same merge routine is used as with
+  The load order is alphabetical, and the the same merge routine is used as with
   the [`config-file`](#_config_file) option above. This option can be specified multiple
   times to load multiple directories. Sub-directories of the config directory are
   not loaded. For more information on the format of the configuration files, see
diff --git a/website/content/docs/agent/config/config-files.mdx b/website/content/docs/agent/config/config-files.mdx
index 869d6f990b75d..384e84bc2b0eb 100644
--- a/website/content/docs/agent/config/config-files.mdx
+++ b/website/content/docs/agent/config/config-files.mdx
@@ -472,7 +472,8 @@ Refer to the [formatting specification](https://golang.org/pkg/time/#ParseDurati
   that match a registering service instance. If it finds any, the agent will merge the centralized defaults with the service instance configuration. This allows for things like service protocol or proxy configuration to be defined centrally and inherited by any affected service registrations.
   This defaults to `false` in versions of Consul prior to 1.9.0, and defaults to `true` in Consul 1.9.0 and later.
 
-- `enable_debug` (boolean, default is `false`): When set to `true`, enables Consul to report additional debugging information, including runtime profiling (`pprof`) data. This setting is only required for clusters without ACL [enabled](#acl_enabled). If you change this setting, you must restart the agent for the change to take effect.
+- `enable_debug` When set, enables some additional debugging features. Currently, this is only used to
+  access runtime profiling HTTP endpoints, which are available with an `operator:read` ACL regardless of the value of `enable_debug`.
 
 - `enable_script_checks` Equivalent to the [`-enable-script-checks` command-line flag](/consul/docs/agent/config/cli-flags#_enable_script_checks).
 
@@ -636,16 +637,16 @@ Refer to the [formatting specification](https://golang.org/pkg/time/#ParseDurati
   - `server` ((#server_rpc_port)) - Server RPC address. Default 8300. TCP
     only.
   - `sidecar_min_port` ((#sidecar_min_port)) - Inclusive minimum port number
-    to use for automatically assigned [sidecar service registrations](/consul/docs/connect/proxies/deploy-sidecar-services).
+    to use for automatically assigned [sidecar service registrations](/consul/docs/connect/registration/sidecar-service).
     Default 21000. Set to `0` to disable automatic port assignment.
   - `sidecar_max_port` ((#sidecar_max_port)) - Inclusive maximum port number
-    to use for automatically assigned [sidecar service registrations](/consul/docs/connect/proxies/deploy-sidecar-services).
+    to use for automatically assigned [sidecar service registrations](/consul/docs/connect/registration/sidecar-service).
     Default 21255. Set to `0` to disable automatic port assignment.
   - `expose_min_port` ((#expose_min_port)) - Inclusive minimum port number
-    to use for automatically assigned [exposed check listeners](/consul/docs/connect/proxies/proxy-config-reference#expose-paths-configuration-reference).
+    to use for automatically assigned [exposed check listeners](/consul/docs/connect/registration/service-registration#expose-paths-configuration-reference).
     Default 21500. Set to `0` to disable automatic port assignment.
   - `expose_max_port` ((#expose_max_port)) - Inclusive maximum port number
-    to use for automatically assigned [exposed check listeners](/consul/docs/connect/proxies/proxy-config-reference#expose-paths-configuration-reference).
+    to use for automatically assigned [exposed check listeners](/consul/docs/connect/registration/service-registration#expose-paths-configuration-reference).
     Default 21755. Set to `0` to disable automatic port assignment.
 
 - `primary_datacenter` - This designates the datacenter
@@ -710,10 +711,6 @@ Refer to the [formatting specification](https://golang.org/pkg/time/#ParseDurati
     servers in all federated datacenters must have this enabled before any client can use
     [`use_streaming_backend`](#use_streaming_backend).
 
-- `reporting`<EnterpriseAlert inline /> - This option allows options for HashiCorp reporting.
-    - `license` - The license object allows users to control automatic reporting of license utilization metrics to HashiCorp.
-      - `enabled`: (Defaults to `true`) Enables automatic license utilization reporting.
-
 - `segment` <EnterpriseAlert inline /> - Equivalent to the [`-segment` command-line flag](/consul/docs/agent/config/cli-flags#_segment).
 
   ~> **Warning:** The `segment` option cannot be used with the [`partition`](#partition-1) option.
@@ -908,7 +905,7 @@ Refer to the [formatting specification](https://golang.org/pkg/time/#ParseDurati
 
     - `default` ((#acl_tokens_default)) - When provided, this agent will
       use this token by default when making requests to the Consul servers
-      instead of the [anonymous token](/consul/docs/security/acl/tokens#anonymous-token).
+      instead of the [anonymous token](/consul/docs/security/acl/acl-tokens#anonymous-token).
       Consul HTTP API requests can provide an alternate token in their authorization header
       to override the `default` or anonymous token on a per-request basis,
       as described in [HTTP API Authentication](/consul/api-docs/api-structure#authentication).
@@ -949,7 +946,7 @@ Refer to the [formatting specification](https://golang.org/pkg/time/#ParseDurati
       `service:write` permissions for service "B", the agent will successfully register service "A"
       and fail to register service "B". Failed registration requests are eventually retried as part
       of [anti-entropy enforcement](/consul/docs/architecture/anti-entropy). If a registration request is
-      failing due to missing permissions, the token for this agent can be updated with
+      failing due to missing permissions, the the token for this agent can be updated with
       additional policy rules or the `config_file_service_registration` token can be replaced using
       the [Set Agent Token](/consul/commands/acl/set-agent-token) CLI command.
 
@@ -1097,16 +1094,6 @@ Refer to the [formatting specification](https://golang.org/pkg/time/#ParseDurati
 
 - `bootstrap_expect` Equivalent to the [`-bootstrap-expect` command-line flag](/consul/docs/agent/config/cli-flags#_bootstrap_expect).
 
-## Self-managed HCP Parameters
-
-- `cloud` This object specifies settings for connecting self-managed clusters to HCP. This was added in Consul 1.14
-
-  - `client_id` The OAuth2 client ID for authentication with HCP. This can be overridden using the `HCP_CLIENT_ID` environment variable.
-
-  - `client_secret` The OAuth2 client secret for authentication with HCP. This can be overridden using the `HCP_CLIENT_SECRET` environment variable.
-
-  - `resource_id` The HCP resource identifier. This can be overridden using the `HCP_RESOURCE_ID` environment variable.
-
 ## Service Mesh Parameters ((#connect-parameters))
 
 The noun _connect_ is used throughout this documentation to refer to the connect
@@ -1280,10 +1267,6 @@ subsystem that provides Consul's service mesh capabilities.
         corresponding to the NIST P-\* curves of the same name.
       - `private_key_type = rsa`: `2048, 4096`
 
-- `locality` <EnterpriseAlert inline/>: Specifies a map of configurations that set the region and zone of the Consul agent. When specified on server agents, `locality` applies to all partitions on the server. When specified on clients, `locality` applies to all services registered to the client. Configure this field to enable Consul to route traffic to the nearest physical service instance. Refer to [Route traffic to local upstreams](/consul/docs/connect/manage-traffic/route-to-local-upstreams) for additional information.
-  - `region`:  String value that specifies the region where the Consul agent is running. Consul matches this value to regions defined for services in the network. When service agent regions match, Consul is able to prioritize routes between the agent and the service in the same region over healthy service instances in other regions. When multiple healthy service instances are available in the local region, Consul prioritizes services that match the agent's `zone`. You must specify values that are consistent with how regions are defined in your network, for example `us-west-1` for networks in AWS.
-  - `zone`: String value that specifies the availability zone where the Consul agent is running. Consul matches this value to zones defined for services in the region. When service agent zones match, Consul is able to prioritize routes between the agent and the service in the same zone over healthy service instances in other zones. When multiple healthy service instances are available in the local zone, Consul distributes traffic equally the services. You must specify values that are consistent with how zones are defined in your network, for example `us-west-1a` for networks in AWS.    
-
 ## DNS and Domain Parameters
 
 - `dns_config` This object allows a number of sub-keys
@@ -1550,6 +1533,16 @@ subsystem that provides Consul's service mesh capabilities.
     part of the cluster before declaring it dead, giving that suspect node more time
     to refute if it is indeed still alive. The default is 6.
 
+## Self-managed HCP Parameters
+
+- `cloud` This object specifies settings for connecting self-managed clusters to HCP. This was added in Consul 1.14
+
+  - `client_id` The OAuth2 client ID for authentication with HCP. This can be overridden using the `HCP_CLIENT_ID` environment variable.
+
+  - `client_secret` The OAuth2 client secret for authentication with HCP. This can be overridden using the `HCP_CLIENT_SECRET` environment variable.
+
+  - `resource_id` The HCP resource identifier. This can be overridden using the `HCP_RESOURCE_ID` environment variable.
+
 ## Join Parameters
 
 - `rejoin_after_leave` Equivalent to the [`-rejoin` command-line flag](/consul/docs/agent/config/cli-flags#_rejoin).
@@ -2099,12 +2092,6 @@ specially crafted certificate signed by the CA can be used to gain full access t
       * `TLSv1_2` (default)
       * `TLSv1_3`
 
-    - `verify_server_hostname` ((#tls_internal_rpc_verify_server_hostname)) When
-      set to true, Consul verifies the TLS certificate presented by the servers
-      match the hostname `server.<datacenter>.<domain>`. By default this is false,
-      and Consul does not verify the hostname of the certificate, only that it
-      is signed by a trusted CA.
-
       **WARNING: TLS 1.1 and lower are generally considered less secure and
       should not be used if possible.**
 
@@ -2212,7 +2199,7 @@ specially crafted certificate signed by the CA can be used to gain full access t
       only way to enforce that no client can communicate with a server unencrypted
       is to also enable `verify_incoming` which requires client certificates too.
 
-    - `verify_server_hostname` Overrides [tls.defaults.verify_server_hostname](#tls_defaults_verify_server_hostname). When
+    - `verify_server_hostname` ((#tls_internal_rpc_verify_server_hostname)) When
       set to true, Consul verifies the TLS certificate presented by the servers
       match the hostname `server.<datacenter>.<domain>`. By default this is false,
       and Consul does not verify the hostname of the certificate, only that it
@@ -2296,6 +2283,9 @@ tls {
     ca_file = "/etc/pki/tls/certs/ca-bundle.crt"
     verify_incoming = true
     verify_outgoing = true
+  }
+
+  internal_rpc {
     verify_server_hostname = true
   }
 }
@@ -2324,7 +2314,9 @@ tls {
       "cert_file": "/etc/pki/tls/certs/my.crt",
       "ca_file": "/etc/pki/tls/certs/ca-bundle.crt",
       "verify_incoming": true,
-      "verify_outgoing": true,
+      "verify_outgoing": true
+    },
+    "internal_rpc": {
       "verify_server_hostname": true
     }
   }
diff --git a/website/content/docs/agent/config/index.mdx b/website/content/docs/agent/config/index.mdx
index c620ef72e05a1..0ea4a030fb7fb 100644
--- a/website/content/docs/agent/config/index.mdx
+++ b/website/content/docs/agent/config/index.mdx
@@ -73,7 +73,6 @@ The following agent configuration options are reloadable at runtime:
     them without a restart provides a recovery path that doesn't involve
     downtime. They generally shouldn't be changed otherwise.
 - [RPC rate limits](/consul/docs/agent/config/config-files#limits)
-- [Reporting](/consul/docs/agent/config/config-files#reporting)
 - [HTTP Maximum Connections per Client](/consul/docs/agent/config/config-files#http_max_conns_per_client)
 - Services
 - TLS Configuration
diff --git a/website/content/docs/agent/index.mdx b/website/content/docs/agent/index.mdx
index b5a06b39e6409..c7bf699f87c10 100644
--- a/website/content/docs/agent/index.mdx
+++ b/website/content/docs/agent/index.mdx
@@ -62,6 +62,7 @@ its consequences during outage situations). Reaping is similar to leaving,
 causing all associated services to be deregistered.
 
 ## Limit traffic rates
+
 You can define a set of rate limiting configurations that help operators protect Consul servers from excessive or peak usage. The configurations enable you to gracefully degrade Consul servers to avoid a global interruption of service. Consul supports global server rate limiting, which lets configure Consul servers to deny requests that exceed the read or write limits. Refer to [Traffic Rate Limits Overview](/consul/docs/agent/limits).
 
 ## Requirements
@@ -276,6 +277,9 @@ tls {
     ca_file = "/consul/config/certs/consul-agent-ca.pem"
     cert_file = "/consul/config/certs/dc1-server-consul-0.pem"
     key_file = "/consul/config/certs/dc1-server-consul-0-key.pem"
+  }
+
+  internal_rpc {
     verify_server_hostname = true
   }
 }
diff --git a/website/content/docs/agent/limits/index.mdx b/website/content/docs/agent/limits/index.mdx
index ecf6deac49bd1..75fb4f1ac0e8e 100644
--- a/website/content/docs/agent/limits/index.mdx
+++ b/website/content/docs/agent/limits/index.mdx
@@ -2,60 +2,30 @@
 layout: docs
 page_title: Limit Traffic Rates Overview
 description: Rate limiting is a set of Consul server agent configurations that you can use to mitigate the risks to Consul servers when clients send excessive requests to Consul resources. 
----
 
-# Traffic rate limiting overview
+---
 
+# Limit traffic rates overview
 
-This topic provides overview information about the traffic rates limits you can configure for Consul datacenters. 
+This topic provides overview information about the traffic rates limits you can configure for Consul servers.
 
 ## Introduction
+You can configure global RPC rate limits to mitigate the risks to Consul servers when clients send excessive read or write requests to Consul resources. A read request is defined as any request that does not modify Consul internal state. A write request is defined as any request that modifies Consul internal state. Read and write requests are limited separately.
 
-Configuring rate limits on RPC and gRPC traffic mitigates the risks to Consul servers when client agents or services send excessive read or write requests to Consul resources. A _read_ request is defined as any request that does not modify Consul internal state. A _write_ request is defined as any request that modifies Consul internal state. Configure read and write request limits independently.
-
-## Workflow 
-
-You can set global limits on the rate of read and write requests that affect individual servers in the datacenter. You can set limits for all source IP addresses, which enables you to specify a budget for read and write requests to prevent any single source IP from overwhelming the Consul server and negatively affecting the network. The following steps describe the general process for setting global read and write rate limits:
-
-1. Set arbitrary limits to begin understanding the upper boundary of RPC and gRPC loads in your network. Refer to [Initialize rate limit settings](/consul/docs/agent/limits/usage/init-rate-limits) for additional information.    
-
-1. Monitor the metrics and logs and readjust the initial configurations as necessary. Refer to [Monitor rate limit data](/consul/docs/agent/limits/usage/monitor-rate-limits)
-
-1. Define your final operational limits based on your observations. If you are defining global rate limits, refer to [Set global traffic rate limits](/consul/docs/agent/limits/usage/set-global-traffic-rate-limits) for additional information. For information about setting limits per source IP address, refer to [Limit traffic rates for a source IP](/consul/docs/agent/limits/usage/limit-request-rates-from-ips).
-
-<EnterpriseAlert>
-Setting limits per source IP requires Consul Enterprise.
-</EnterpriseAlert>
-
-### Order of operations
+## Rate limit modes
+You can set one of the following modes, which determine how Consul servers react when the request limits are exceeded.
+ 
+- **Enforcing mode**: In this mode, the rate limiter denies requests to a server beyond a configurable rate. Consul generates metrics and logs to help operators understand their Consul load and configure limits accordingly. 
+- **Permissive mode**: The rate limiter allows requests if the limits are reached and produces metrics and logs to help operators understand their Consul load and configure limits accordingly. This mode is intended to help you configure limits and debug specific issues.
+- **Disabled mode**: Disables the rate limiter. All requests are allowed and no logs or metrics are produced. This is the default mode. 
 
-You can define request rate limits in the agent configuration and in the control plane request limit configuration entry. The configuration entry also supports rate limit configurations for Consul resources. Consul performs the following order of operations when determining request rate limits:
+Refer to [`rate_limits`](/consul/docs/agent/config/config-files#request_limits) for additional configuration information.
 
-![Flowchart that describes the order of operations for determining request rate limits.](/img/agent-rate-limiting-ops-order.jpg#light-theme-only)
-![Flowchart that describes the order of operations for determining request rate limits.](/img/agent-rate-limiting-ops-order-dark.jpg#dark-theme-only)
+## Request denials
+When an HTTP request is denied for rate limiting reason, Consul returns one of the following errors:
 
-<!--
-1. Parse request.
-1. Does the request reach a global server limit?
-   - No: Proceed to the next stage.
-   - Yes: Return an error that the requested resource has been exhausted.
-1. Does the request reach a limit associated with its source IP address?
-   - No: Proceed to the next stage.
-   - Yes: Return an error that the requested resource has been exhausted.
-1. Resolve the Consul Enterprise metadata.
-1. Does the request reach a limit associated with the source partition?
-   - No: Proceed to the next stage.
-   - Yes: Return an error that the requested resource has been exhausted.
-1. Does the request reach a limit associated with the source namespace?
-   - No: Proceed to the next stage.
-   - Yes: Return an error that the requested resource has been exhausted.
-1. Resolve the ACL identity associated with the request.
-1. Does the request reach a limit associated with its identity?
-   - No: Proceed to the next stage.
-   - Yes: Return an error that the requested resource has been exhausted.
-1. Handle the request.
--->
+- **429 Resource Exhausted**: Indicates that a server is not able to perform the request but that another server could potentially fulfill it. This error is most common on stale reads because any server may fulfill state read requests. To resolve this type of error,  we recommend immediately retrying the request to another server. If the request came from a Consul client agent, the agent automatically retries the request up to the limit set in the [`rpc_hold_timeout`](/consul/docs/agent/config/config-files#rpc_hold_timeout) configuration .
 
-## Kubernetes
+- **503 Service Unavailable**: Indicates that server is unable to perform the request and that no other server can fulfill the request, either. This usually occurs on consistent reads or for writes. In this case we recommend retrying according to an exponential backoff schedule.  If the request came from a Consul client agent, the agent automatically retries the request according to the [`rpc_hold_timeout`](/consul/docs/agent/config/config-files#rpc_hold_timeout) configuration. 
 
-To define global rate limits, configure the `request_limits` settings in the Consul Helm chart. Refer to the [Helm chart reference](/consul/docs/k8s/helm) for additional information. Refer to the [control plane request limit configuration entry reference](/consul/docs/connect/config-entries/control-plane-request-limit) for information about applying a CRD for limiting traffic rates from source IPs. 
+Refer to [Rate limit reached on the server](/consul/docs/troubleshoot/common-errors#rate-limit-reached-on-the-server) for additional information.
\ No newline at end of file
diff --git a/website/content/docs/agent/limits/init-rate-limits.mdx b/website/content/docs/agent/limits/init-rate-limits.mdx
new file mode 100644
index 0000000000000..3205718453098
--- /dev/null
+++ b/website/content/docs/agent/limits/init-rate-limits.mdx
@@ -0,0 +1,32 @@
+---
+layout: docs
+page_title: Initialize Rate Limit Settings
+description: Learn how to determins regular and peak loads in your network so that you can set the initial global rate limit configurations.
+---
+
+# Initialize rate limit settings
+
+In order to set limits for traffic, you must first understand regular and peak loads in your network. We recommend completing the following steps to benchmark request rates in your environment so that you can implement limits appropriate for your applications.
+
+1. Specify a global rate limit with arbitrary values in the agent configuration file based on the following conditions:
+
+    - Environment where Consul servers are running 
+    - Number of servers and the projected load
+    - Existing metrics expressing requests per second
+
+1. Set the `mode` to `permissive`. In the following example, Consul agents are allowed up to 1000 reads and 500 writes per second:
+
+    ```hcl
+    request_limits { 
+	    mode = "permissive"
+	    read_rate = 1000.0
+	    write_rate =500.0
+    }
+    ```
+
+1. Observe the logs and metrics for your application's typical cycle, such as a 24 hour period. Refer to [`log_file`](/consul/docs/agent/config/config-files#log_file) for information about where to retrieve logs. Call the [`/agent/metrics`](/consul/api-docs/agent#view-metrics) HTTP API endpoint and check the data for the following metrics:  
+
+    - `rpc.rate_limit.exceeded` with value `global/read` for label `limit_type`
+    - `rpc.rate_limit.exceeded` with value `global/write` for label `limit_type`
+
+1. If the limits are not reached, set the `mode` configuration to `enforcing`. Otherwise adjust and iterate limits.
\ No newline at end of file
diff --git a/website/content/docs/agent/limits/set-global-traffic-rate-limits.mdx b/website/content/docs/agent/limits/set-global-traffic-rate-limits.mdx
new file mode 100644
index 0000000000000..369d1b7b58398
--- /dev/null
+++ b/website/content/docs/agent/limits/set-global-traffic-rate-limits.mdx
@@ -0,0 +1,108 @@
+---
+layout: docs
+page_title: Set a Global Limit on Traffic Rates
+description: Use global rate limits to prevent excessive rates of requests to Consul servers.
+---
+
+# Set a global limit on traffic rates
+
+This topic describes how to configure rate limits for RPC and gRPC traffic to the Consul server. 
+
+## Introduction 
+Rate limits apply to each Consul server separately and are intended to limit the number of read requests or write requests to the server on the RPC and internal gRPC endpoints.
+
+Because all requests coming to a Consul server eventually perform an RPC or an internal gRPC request, these limits also apply to other user interfaces, such as the HTTP API interface, the CLI, and the external gRPC endpoint for services in the Consul service mesh.
+
+Refer to [Initialize Rate Limit Settings](/consul/docs/agent/limits/init-rate-limits) for additional information about right-sizing your gRPC request configurations. 
+
+## Set a global rate limit for a Consul server   
+Configure the following settings in your Consul server configuration to limit the RPC and gRPC traffic rates.
+
+- Set the rate limiter [`mode`](/consul/docs/agent/config/config-files#mode-1)
+- Set the [`read_rate`](/consul/docs/agent/config/config-files#read_rate) 
+- Set the [`write_rate`](/consul/docs/agent/config/config-files#write_rate)
+
+In the following example, the Consul server is configured to prevent more than `500` read and `200` write RPC calls:
+
+<CodeTabs heading="Consul server agent">
+
+```hcl
+limits = {
+    rate_limit = {
+        mode = "enforcing"
+        read_rate = 500
+        write_rate = 200
+    }
+}
+```
+
+```json
+{
+    "limits" : {
+        "rate_limit" : {
+            "mode" : "enforcing",
+            "read_rate" : 500,
+            "write_rate" : 200
+        }
+    }
+}
+
+```
+
+</CodeTabs>
+
+## Access rate limit logs 
+Consul prints a log line for each rate limit request. The log provides the information necessary for identifying the source of the request and the configured limit. Consul prints the log `DEBUG` log level and can drop the log to avoid affecting the server health. Dropping a log line increments the `rpc.rate_limit.log_dropped` metric.
+
+The following example log shows that RPC request from `127.0.0.1:53562` to `KVS.Apply` exceeded the limit:
+
+<CodeBlockConfig hideClipboard>
+
+```shell-session
+2023-02-17T10:01:15.565-0500 [DEBUG] agent.server.rpc-rate-limit: RPC 
+exceeded allowed rate limit: rpc=KVS.Apply source_addr=127.0.0.1:53562 
+limit_type=global/write limit_enforced=false
+```
+</CodeBlockConfig>
+
+## Review rate limit metrics
+Consul captures the following metrics associated with rate limits:
+
+- Type of limit
+- Operation
+- Rate limit mode
+
+Call the `agent/metrics` API endpoint to view the metrics associated with rate limits. Refer to [View Metrics](/consul/api-docs/agent#view-metrics) for API usage information. In the following example, Consul dropped a call to the `consul` service because it exceeded the limit by one call:
+
+```shell-session
+$ curl http://127.0.0.1:8500/v1/agent/metrics
+{
+  . . .  
+  "Counters": [
+    {
+      "Name": "consul.rpc.rate_limit.exceeded",
+      "Count": 1,
+      "Sum": 1,
+      "Min": 1,
+      "Max": 1,
+      "Mean": 1,
+      "Stddev": 0,
+      "Labels": {
+        "service": "consul"
+      }
+    },
+    {
+      "Name": "consul.rpc.rate_limit.log_dropped",
+      "Count": 1,
+      "Sum": 1,
+      "Min": 1,
+      "Max": 1,
+      "Mean": 1,
+      "Stddev": 0,
+      "Labels": {}
+    }
+  ],
+  . . .
+```
+
+Refer to [Telemetry]() for additional information.
diff --git a/website/content/docs/agent/limits/usage/init-rate-limits.mdx b/website/content/docs/agent/limits/usage/init-rate-limits.mdx
deleted file mode 100644
index 1c84ca4f6e582..0000000000000
--- a/website/content/docs/agent/limits/usage/init-rate-limits.mdx
+++ /dev/null
@@ -1,31 +0,0 @@
----
-layout: docs
-page_title: Initialize rate limit settings
-description: Learn how to determine regular and peak loads in your network so that you can set the initial global rate limit configurations.
----
-
-# Initialize rate limit settings
-
-Because each network has different needs and application, you need to find out what the regular and peak loads in your network are before you set traffic limits. We recommend completing the following steps to benchmark request rates in your environment so that you can implement limits appropriate for your applications.
-
-1. In the agent configuration file, specify a global rate limit with arbitrary values based on the following conditions:
-
-    - Environment where Consul servers are running 
-    - Number of servers and the projected load
-    - Existing metrics expressing requests per second
-
-1. Set the [`limits.request_limits.mode`](/consul/docs/agent/config/config-files#mode-1) parameter in the agent configuration to `permissive`. In the following example, the configuration allows up to 1000 reads and 500 writes per second for each Consul agent:
-
-    ```hcl
-    request_limits { 
-	    mode = "permissive"
-	    read_rate = 1000.0
-	    write_rate = 500.0
-    }
-    ``` 
-1. Observe the logs and metrics for your application's typical cycle, such as a 24 hour period. Refer to [Monitor traffic rate limit data](/consul/docs/agent/limits/usage/monitor-rate-limits) for additional information. Call the [`/agent/metrics`](/consul/api-docs/agent#view-metrics) HTTP API endpoint and check the data for the following metrics:  
-
-    - `rpc.rate_limit.exceeded` with value `global/read` for label `limit_type`
-    - `rpc.rate_limit.exceeded` with value `global/write` for label `limit_type`
-
-1. If the limits are not reached, set the `mode` configuration to `enforcing`. Otherwise, continue to adjust and iterate until you find your network's unique limits.
\ No newline at end of file
diff --git a/website/content/docs/agent/limits/usage/limit-request-rates-from-ips.mdx b/website/content/docs/agent/limits/usage/limit-request-rates-from-ips.mdx
deleted file mode 100644
index 530ad7b26a7b2..0000000000000
--- a/website/content/docs/agent/limits/usage/limit-request-rates-from-ips.mdx
+++ /dev/null
@@ -1,72 +0,0 @@
----
-layout: docs
-page_title: Limit traffic rates for a source IP address
-description: Learn how to set read and request rate limits on RPC and gRPC traffic from all source IP addresses to a Consul resource.
----
-
-# Limit traffic rates from source IP addresses
-
-This topic describes how to configure RPC and gRPC traffic rate limits for source IP addresses. This enables you to specify a budget for read and write requests to prevent any single source IP from overwhelming the Consul server and negatively affecting the network. For information about setting global traffic rate limits, refer to [Set a global limit on traffic rates](/consul/docs/agent/limits/usage/set-global-traffic-rate-limits). For an overview of Consul's server rate limiting capabilities, refer to [Limit traffic rates overview](/consul/docs/agent/limits).
-
-<EnterpriseAlert>
-
-This feature requires Consul Enterprise. Refer to the [feature compatibility matrix](/consul/docs/enterprise#consul-enterprise-feature-availability) for additional information.
-
-</EnterpriseAlert>
-
-## Overview
-
-You can set limits on the rate of read and write requests from source IP addresses to specific resources, which mitigates the risks to Consul servers when consul clients send excessive requests to a specific resource type. Before configuring traffic rate limits, you should complete the initialization process to understand normal traffic loads in your network. Refer to [Initialize rate limit settings](/consul/docs/agent/limits/init-rate-limits) for additional information.
-
-Complete the following steps to configure traffic rate limits from a source IP address:
-
-1. Define rate limits in a control plan request limit configuration entry. You can set limits for different types of resources calls.
-
-1. Apply the configuration entry to enact the limits.
-
-You should also monitor read and write rate activity and make any necessary adjustments. Refer to [Monitor rate limit data](/consul/docs/agent/limits/usage/monitor-rate-limits) for additional information.
-
-## Define rate limits
-
-Create a control plane request limit configuration entry in the `default` partition. The configuration entry applies to all client requests targeting any partition. Refer to the [control plane request limit configuration entry](/consul/docs/connect/config-entries/control-plane-request-limit) reference documentation for details about the available configuration parameters.
-
-Specify the following parameters:
-
-- `kind`: This must be set to `control-plane-request-limit`.
-- `name`: Specify the name of the service that you want to limit read and write operations to.
--  `read_rate`: Specify overall number of read operations per second allowed from the service.
--  `write_rate`: Specify overall number of write operations per second allowed from the service.
-
-You can also configure limits on calls to the key-value store, ACL system, and Consul catalog.
-
-## Apply the configuration entry
-
-If your network is deployed to virtual machines, use the `consul config write` command and specify the control plane request limit configuration entry to apply the configuration. For Kubernetes-orchestrated networks, use the `kubectl apply` command.
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
-
-```shell-session
-$ consul config write control-plane-request-limit.hcl
-```
-
-</Tab>
-<Tab heading="JSON" group="json">
-
-```shell-session
-$ consul config write control-plane-request-limit.json
-```
-
-</Tab>
-<Tab heading="Kubernetes" group="kubernetes">
-
-```shell-session
-$ kubectl apply control-plane-request-limit.yaml
-```
-
-</Tab>
-</Tabs>
-
-## Disable request rate limits
-
-Set the [limits.request_limits.mode](/consul/docs/agent/config/config-files#mode-1) in the agent configuration to `disabled` to allow services to exceed the specified read and write requests limits. The `disabled` mode applies to all request rate limits, even limits specified in the [control plane request limits configuration entry](/consul/docs/connect/config-entries/control-plane-request-limit).  Note that any other mode specified in the agent configuration only applies to global traffic rate limits.
diff --git a/website/content/docs/agent/limits/usage/monitor-rate-limits.mdx b/website/content/docs/agent/limits/usage/monitor-rate-limits.mdx
deleted file mode 100644
index 23502d1cb1490..0000000000000
--- a/website/content/docs/agent/limits/usage/monitor-rate-limits.mdx
+++ /dev/null
@@ -1,77 +0,0 @@
----
-layout: docs
-page_title: Monitor traffic rate limit data 
-description: Learn about the metrics and logs you can use to monitor server rate limiting activity, include rate limits for read operations and writer operations
----
-
-# Monitor traffic rate limit data
-
-This topic describes Consul functionality that enables you to monitor read and write request operations taking place in your network. Use the functionality to help you understand normal workloads and set safe limits on the number of requests Consul client agents and services can make to Consul servers. 
-
-## Access rate limit logs 
-
-Consul prints a log line for each rate limit request. The log provides the necessary information for identifying the source of the request and the configured limit. The log provides the information necessary for identifying the source of the request and the configured limit. Consul prints the log `DEBUG` log level and can drop the log to avoid affecting the server health. Dropping a log line increments the `rpc.rate_limit.log_dropped` metric.
-
-The following example log shows that RPC request from `127.0.0.1:53562` to `KVS.Apply` exceeded the limit:
-
-```text
-2023-02-17T10:01:15.565-0500 [DEBUG] agent.server.rpc-rate-limit: RPC 
-exceeded allowed rate limit: rpc=KVS.Apply source_addr=127.0.0.1:53562 
-limit_type=global/write limit_enforced=false
-```
-
-Refer to [`log_file`](/consul/docs/agent/config/config-files#log_file) for information about where to retrieve log files.
-
-## Review rate limit metrics
-
-Consul captures the following metrics associated with rate limits:
-
-- Type of limit
-- Operation
-- Rate limit mode
-
-Call the `/agent/metrics` API endpoint to view the metrics associated with rate limits. Refer to [View Metrics](/consul/api-docs/agent#view-metrics) for API usage information. In the following example, Consul dropped a call to the consul service because it exceeded the limit by one call:
-
-```shell-session
-$ curl http://127.0.0.1:8500/v1/agent/metrics
-{
-  . . .  
-  "Counters": [
-    {
-      "Name": "consul.rpc.rate_limit.exceeded",
-      "Count": 1,
-      "Sum": 1,
-      "Min": 1,
-      "Max": 1,
-      "Mean": 1,
-      "Stddev": 0,
-      "Labels": {
-        "service": "consul"
-      }
-    },
-    {
-      "Name": "consul.rpc.rate_limit.log_dropped",
-      "Count": 1,
-      "Sum": 1,
-      "Min": 1,
-      "Max": 1,
-      "Mean": 1,
-      "Stddev": 0,
-      "Labels": {}
-    }
-  ],
-  . . .
-}
-```
-
-Refer to [Telemetry](/consul/docs/agent/telemetry) for additional information.
-
-## Request denials
-
-When an HTTP request is denied for rate limiting reason, Consul returns one of the following errors:
-
-- **429 Resource Exhausted**: Indicates that a server is not able to perform the request but that another server could potentially fulfill it. This error is most common on stale reads because any server may fulfill stale read requests. To resolve this type of error,  we recommend immediately retrying the request to another server. If the request came from a Consul client agent, the agent automatically retries the request up to the limit set in the [`rpc_hold_timeout`](/consul/docs/agent/config/config-files#rpc_hold_timeout) configuration .
-
-- **503 Service Unavailable**: Indicates that server is unable to perform the request and that no other server can fulfill the request, either. This usually occurs on consistent reads or for writes. In this case we recommend retrying according to an exponential backoff schedule. If the request came from a Consul client agent, the agent automatically retries the request according to the [`rpc_hold_timeout`](/consul/docs/agent/config/config-files#rpc_hold_timeout) configuration. 
-
-Refer to [Rate limit reached on the server](/consul/docs/troubleshoot/common-errors#rate-limit-reached-on-the-server) for additional information.
\ No newline at end of file
diff --git a/website/content/docs/agent/limits/usage/set-global-traffic-rate-limits.mdx b/website/content/docs/agent/limits/usage/set-global-traffic-rate-limits.mdx
deleted file mode 100644
index c0afeec9010e5..0000000000000
--- a/website/content/docs/agent/limits/usage/set-global-traffic-rate-limits.mdx
+++ /dev/null
@@ -1,62 +0,0 @@
----
-layout: docs
-page_title: Set a global limit on traffic rates
-description: Use global rate limits to prevent excessive rates of requests to Consul servers.
----
-
-# Set a global limit on traffic rates
-
-This topic describes how to configure rate limits for RPC and gRPC traffic to the Consul server.
-
-## Introduction
-
-Rate limits apply to each Consul server separately and limit the number of read requests or write requests to the server on the RPC and internal gRPC endpoints.
-
-Because all requests coming to a Consul server eventually perform an RPC or an internal gRPC request, global rate limits apply to Consul's user interfaces, such as the HTTP API interface, the CLI, and the external gRPC endpoint for services in the service mesh.
-
-Refer to [Initialize Rate Limit Settings](/consul/docs/agent/limits/init-rate-limits) for additional information about right-sizing your gRPC request configurations.
-
-## Set a global rate limit for a Consul server
-
-Configure the following settings in your Consul server configuration to limit the RPC and gRPC traffic rates.
-
-- Set the rate limiter [`mode`](/consul/docs/agent/config/config-files#mode-1)
-- Set the [`read_rate`](/consul/docs/agent/config/config-files#read_rate)
-- Set the [`write_rate`](/consul/docs/agent/config/config-files#write_rate)
-
-In the following example, the Consul server is configured to prevent more than `500` read and `200` write RPC calls:
-
-<CodeTabs heading="Consul server agent">
-
-```hcl
-limits = {
-    rate_limit = {
-        mode = "enforcing"
-        read_rate = 500
-        write_rate = 200
-    }
-}
-```
-
-```json
-{
-    "limits" : {
-        "rate_limit" : {
-            "mode" : "enforcing",
-            "read_rate" : 500,
-            "write_rate" : 200
-        }
-    }
-}
-
-```
-
-</CodeTabs>
-
-## Monitor request rate traffic
-
-You should continue to monitor request traffic to ensure that request rates remain within the threshold you defined. Refer to [Monitor traffic rate limit data](/consul/docs/agent/limits/usage/monitor-rate-limits) for instructions about checking metrics and log entries, as well as troubleshooting information.
-
-## Disable request rate limits
-
-Set the [`limits.request_limits.mode`](/consul/docs/agent/config/config-files#mode-1) to `disabled` to allow services to exceed the specified read and write requests limits, even limits specified in the [control plane request limits configuration entry](/consul/docs/connect/config-entries/control-plane-request-limit). Note that any other mode specified in the agent configuration only applies to global traffic rate limits.
diff --git a/website/content/docs/agent/rpc.mdx b/website/content/docs/agent/rpc.mdx
new file mode 100644
index 0000000000000..bdff4a05fc5e1
--- /dev/null
+++ b/website/content/docs/agent/rpc.mdx
@@ -0,0 +1,260 @@
+---
+layout: docs
+page_title: Legacy RPC Protocol
+description: >-
+  Consul agents originally could be controlled through the RPC protocol. This feature was deprecated in version 0.8 in favor of the HTTP API. Learn about agent RPC interactions and how they worked.
+---
+
+# RPC Protocol
+
+~> The RPC Protocol is deprecated and support was removed in Consul
+0.8. Please use the [HTTP API](/consul/api-docs), which has
+support for all features of the RPC Protocol.
+
+The Consul agent provides a complete RPC mechanism that can
+be used to control the agent programmatically. This RPC
+mechanism is the same one used by the CLI but can be
+used by other applications to easily leverage the power
+of Consul without directly embedding.
+
+It is important to note that the RPC protocol does not support
+all the same operations as the [HTTP API](/consul/api-docs).
+
+## Implementation Details
+
+The RPC protocol is implemented using [MsgPack](http://msgpack.org/)
+over TCP. This choice was driven by the fact that all operating
+systems support TCP, and MsgPack provides a fast serialization format
+that is broadly available across languages.
+
+All RPC requests have a request header, and some requests have
+a request body. The request header looks like:
+
+```javascript
+{
+  "Command": "Handshake",
+  "Seq": 0
+}
+```
+
+All responses have a response header, and some may contain
+a response body. The response header looks like:
+
+```javascript
+{
+  "Seq": 0,
+  "Error": ""
+}
+```
+
+The `Command` in the request is used to specify what command the server should
+run, and the `Seq` is used to track the request. Responses are
+tagged with the same `Seq` as the request. This allows for some
+concurrency on the server side as requests are not purely FIFO.
+Thus, the `Seq` value should not be re-used between commands.
+All responses may be accompanied by an error.
+
+Possible commands include:
+
+- handshake - Initializes the connection and sets the version
+- force-leave - Removes a failed node from the cluster
+- join - Requests Consul join another node
+- members-lan - Returns the list of LAN members
+- members-wan - Returns the list of WAN members
+- monitor - Starts streaming logs over the connection
+- stop - Stops streaming logs
+- leave - Instructs the Consul agent to perform a graceful leave and shutdown
+- stats - Provides various debugging statistics
+- reload - Triggers a configuration reload
+
+Each command is documented below along with any request or
+response body that is applicable.
+
+### handshake
+
+This command is used to initialize an RPC connection. As it informs
+the server which version the client is using, handshake MUST be the
+first command sent.
+
+The request header must be followed by a handshake body, like:
+
+```javascript
+{
+  "Version": 1
+}
+```
+
+The body specifies the IPC version being used; however, only version
+1 is currently supported. This is to ensure backwards compatibility
+in the future.
+
+There is no special response body, but the client should wait for the
+response and check for an error.
+
+### force-leave
+
+This command is used to remove failed nodes from a cluster. It takes
+the following body:
+
+```javascript
+{
+  "Node": "failed-node-name"
+}
+```
+
+There is no special response body.
+
+### join
+
+This command is used to join an existing cluster using one or more known nodes.
+It takes the following body:
+
+```javascript
+{
+  "Existing": [
+    "192.168.0.1:6000",
+    "192.168.0.2:6000"
+  ],
+  "WAN": false
+}
+```
+
+The `Existing` nodes are each contacted, and `WAN` controls if we are adding a
+WAN member or LAN member. LAN members are expected to be in the same datacenter
+and should be accessible at relatively low latencies. WAN members are expected to
+be operating in different datacenters with relatively high access latencies. It is
+important that only agents running in "server" mode are able to join nodes over the
+WAN.
+
+The response contains both a header and body. The body looks like:
+
+```javascript
+{
+  "Num": 2
+}
+```
+
+'Num' indicates the number of nodes successfully joined.
+
+### members-lan
+
+This command is used to return all the known LAN members and associated
+information. All agents will respond to this command.
+
+There is no request body, but the response looks like:
+
+```javascript
+{
+  "Members": [
+    {
+      "Name": "TestNode"
+      "Addr": [127, 0, 0, 1],
+      "Port": 5000,
+      "Tags": {
+        "role": "test"
+      },
+      "Status": "alive",
+      "ProtocolMin": 0,
+      "ProtocolMax": 3,
+      "ProtocolCur": 2,
+      "DelegateMin": 0,
+      "DelegateMax": 1,
+      "DelegateCur": 1,
+    },
+  ...
+  ]
+}
+```
+
+### members-wan
+
+This command is used to return all the known WAN members and associated
+information. Only agents in server mode will respond to this command.
+
+There is no request body, and the response is the same as `members-lan`
+
+### monitor
+
+The monitor command subscribes the channel to log messages from the Agent.
+
+The request looks like:
+
+```javascript
+{
+  "LogLevel": "DEBUG"
+}
+```
+
+This subscribes the client to all messages of at least DEBUG level.
+
+The server will respond with a standard response header indicating if the monitor
+was successful. If so, any future logs will be sent and tagged with
+the same `Seq` as in the `monitor` request.
+
+Assume we issued the previous monitor command with `"Seq": 50`. We may start
+getting messages like:
+
+```javascript
+{
+  "Seq": 50,
+  "Error": ""
+}
+
+{
+  "Log": "2013/12/03 13:06:53 [INFO] agent: Received event: member-join"
+}
+```
+
+It is important to realize that these messages are sent asynchronously
+and not in response to any command. If a client is streaming
+commands, there may be logs streamed while a client is waiting for a
+response to a command. This is why the `Seq` must be used to pair requests
+with their corresponding responses.
+
+The client can only be subscribed to at most a single monitor instance.
+To stop streaming, the `stop` command is used.
+
+### stop
+
+This command stops a monitor.
+
+The request looks like:
+
+```javascript
+{
+  "Stop": 50
+}
+```
+
+This unsubscribes the client from the monitor with `Seq` value of 50.
+
+There is no response body.
+
+### leave
+
+This command is used to trigger a graceful leave and shutdown.
+There is no request body or response body.
+
+### stats
+
+This command provides debug information. There is no request body, and the
+response body looks like:
+
+```javascript
+{
+  "agent": {
+    "check_monitors": 0,
+    ...
+  },
+  "consul: {
+    "server": "true",
+    ...
+  },
+  ...
+}
+```
+
+### reload
+
+This command is used to trigger a reload of configurations.
+There is no request body or response body.
diff --git a/website/content/docs/agent/telemetry.mdx b/website/content/docs/agent/telemetry.mdx
index 82594504bacbb..3d7eb97aff21d 100644
--- a/website/content/docs/agent/telemetry.mdx
+++ b/website/content/docs/agent/telemetry.mdx
@@ -28,7 +28,7 @@ getting a better view of what Consul is doing. Review the [Monitoring and
 Metrics tutorial](/consul/tutorials/day-2-operations/monitor-datacenter-health?utm_source=docs) to learn how collect and interpret Consul data.
 
 By default, all metric names of gauge type are prefixed with the hostname of the consul agent, e.g.,
-`consul.hostname.server.isLeader`. To disable prefixing the hostname, set
+`consul.<hostname>.server.isLeader`. To disable prefixing the hostname, set
 `telemetry.disable_hostname=true` in the [agent configuration](/consul/docs/agent/config/config-files#telemetry).
 
 Additionally, if the [`telemetry` configuration options](/consul/docs/agent/config/config-files#telemetry)
@@ -93,27 +93,6 @@ These are some metrics emitted that can help you understand the health of your c
 
 **What to look for:** For a healthy cluster, you're looking for a `lastContact` lower than 200ms, `leader` > 0 and `candidate` == 0. Deviations from this might indicate flapping leadership.
 
-### Certificate Authority Expiration
-
-| Metric Name                            | Description                                                             | Unit    | Type  |
-| :------------------------- | :---------------------------------------------------------------------------------- | :------ | :---- |
-| `consul.mesh.active-root-ca.expiry`    | The number of seconds until the root CA expires, updated every hour.       | seconds | gauge |
-| `consul.mesh.active-signing-ca.expiry` | The number of seconds until the signing CA expires, updated every hour.    | seconds | gauge |
-| `consul.agent.tls.cert.expiry` | The number of seconds until the server agent's TLS certificate expires, updated every hour. | seconds | gauge |
-
-** Why they're important:** Consul Mesh requires a CA to sign all certificates
-used to connect the mesh and the mesh network ceases to work if they expire and
-become invalid. The Root is particularly important to monitor as Consul does
-not automatically rotate it. The TLS certificate metric monitors the certificate
-that the server's agent uses to connect with the other agents in the cluster.
-
-** What to look for:** The Root CA should be monitored for an approaching
-expiration, to indicate it is time for you to rotate the "root" CA either
-manually or with external automation. Consul should rotate the signing (intermediate) certificate
-automatically, but we recommend monitoring the rotation.  When the certificate does not rotate, check the server agent logs for
-messages related to the CA system. The agent TLS certificate's rotation handling
-varies based on the configuration.
-
 ### Autopilot
 
 | Metric Name                | Description                                                                                                                                                                  | Unit         | Type  |
@@ -566,7 +545,7 @@ These metrics are used to monitor the health of the Consul servers.
 | `consul.rpc.raft_handoff`                           | Increments when a server accepts a Raft-related RPC connection.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | connections                       | counter |
 | `consul.rpc.request`                                | Increments when a server receives a Consul-related RPC request.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | requests                          | counter |
 | `consul.rpc.request_error`                          | Increments when a server returns an error from an RPC request.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | errors                            | counter |
-| `consul.rpc.query`                                  | Increments when a server receives a read RPC request, indicating the rate of new read queries. See consul.rpc.queries_blocking for the current number of in-flight blocking RPC calls. This metric changed in 1.7.0 to only increment on the start of a query. The rate of queries will appear lower, but is more accurate.                                                                                                                                                                                                                                                                                                                                                                                                                        | queries                           | counter |
+| `consul.rpc.query`                                  | Increments when a server receives a read RPC request, indicating the rate of new read queries. See consul.rpc.queries_blocking for the current number of in-flight blocking RPC calls. This metric changed in 1.7.0 to only increment on the the start of a query. The rate of queries will appear lower, but is more accurate.                                                                                                                                                                                                                                                                                                                                                                                                                    | queries                           | counter |
 | `consul.rpc.queries_blocking`                       | The current number of in-flight blocking queries the server is handling.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | queries                           | gauge   |
 | `consul.rpc.cross-dc`                               | Increments when a server sends a (potentially blocking) cross datacenter RPC query.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | queries                           | counter |
 | `consul.rpc.consistentRead`                         | Measures the time spent confirming that a consistent read can be performed.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | ms                                | timer   |
@@ -603,7 +582,7 @@ Label based RPC metrics were added in Consul 1.12.0 as a Beta feature to better
 
 ### Labels
 
-The server workload metrics above come with the following labels:
+The the server workload metrics above come with the following labels:
 
 | Label Name                            | Description                                                          | Possible values                         |
 | ------------------------------------- | -------------------------------------------------------------------- | --------------------------------------- |
@@ -651,7 +630,7 @@ Any metric in this section can be turned off with the [`prefix_filter`](/consul/
 These metrics give insight into the health of the cluster as a whole.
 Query for the `consul.memberlist.*` and `consul.serf.*` metrics can be appended
 with certain labels to further distinguish data between different gossip pools.
-The supported label for CE is `network`, while `segment`, `partition`, `area`
+The supported label for OSS is `network`, while `segment`, `partition`, `area`
 are allowed for <EnterpriseAlert inline />.
 
 | Metric                                 | Description                                                                                                                                                                                                                                                                                                                                                                                                                        | Unit                                    | Type    |
@@ -693,6 +672,9 @@ are allowed for <EnterpriseAlert inline />.
 | `consul.catalog.connect.query-tag`     | Increments for each mesh-based catalog query for the given service with the given tag.                                                                                                                                                                                                                                                                                                                                          | queries                                 | counter |
 | `consul.catalog.connect.query-tags`    | Increments for each mesh-based catalog query for the given service with the given tags.                                                                                                                                                                                                                                                                                                                                         | queries                                 | counter |
 | `consul.catalog.connect.not-found`     | Increments for each mesh-based catalog query where the given service could not be found.                                                                                                                                                                                                                                                                                                                                        | queries                                 | counter |
+| `consul.mesh.active-root-ca.expiry`    | The number of seconds until the root CA expires, updated every hour.                                                                                                                                                                                                                                                                                                                                                               | seconds                                 | gauge   |
+| `consul.mesh.active-signing-ca.expiry` | The number of seconds until the signing CA expires, updated every hour.                                                                                                                                                                                                                                                                                                                                                            | seconds                                 | gauge   |
+| `consul.agent.tls.cert.expiry`         | The number of seconds until the Agent TLS certificate expires, updated every hour.                                                                                                                                                                                                                                                                                                                                                 | seconds                                 | gauge   |
 
 ## Service Mesh Built-in Proxy Metrics
 
@@ -763,7 +745,7 @@ Consul servers can report the following metrics about the host's system resource
 This feature must be enabled in the [agent telemetry configuration](/consul/docs/agent/config/config-files#telemetry-enable_host_metrics).
 Note that if the Consul server is operating inside a container these metrics
 still report host resource usage and do not report any resource limits placed
-on the container.
+on the container.  
 
 **Requirements:**
 - Consul 1.15.3+
diff --git a/website/content/docs/agent/wal-logstore/enable.mdx b/website/content/docs/agent/wal-logstore/enable.mdx
index e80315928f2ab..2a339fcf89e11 100644
--- a/website/content/docs/agent/wal-logstore/enable.mdx
+++ b/website/content/docs/agent/wal-logstore/enable.mdx
@@ -34,7 +34,8 @@ We recommend taking the following additional measures:
 
 ## Known issues
 
-The following issues exist in Consul 1.15.0 and 1.15.1.
+The following issues were discovered after release of Consul 1.15.1 and will be
+fixed in a future patch release.
 
  * A follower that is disconnected may be unable to catch up if it is using the WAL backend.
  * Restoring user snapshots can break replication to WAL-enabled followers.
@@ -47,11 +48,11 @@ While their likelihood remains low to very low, be aware of the following risks
  - If WAL corrupts data on a Consul server agent, the server data cannot be recovered. Restart the server with an empty data directory and reload its state from the leader to resolve the issue.
  - WAL may corrupt data or contain a defect that causes the server to panic and crash. WAL may not restart if the defect recurs when WAL reads from the logs on startup. Restart the server with an empty data directory and reload its state from the leader to resolve the issue.
  -  If WAL corrupts data, clients may read corrupted data from the Consul server, such as invalid IP addresses or unmatched tokens. This outcome is unlikely even if a recurring defect causes WAL to corrupt data because replication uses objects cached in memory instead of reads from disk. Restart the server with an empty data directory and reload its state from the leader to resolve the issue.
- - If you enable a Consul CE server to use WAL or enable WAL on a voting server with Consul Enterprise, WAL may corrupt the server's state, become the leader, and replicate the corrupted state to all other servers. In this case, restoring from backup is required to recover a completely uncorrupted state. Test WAL on a non-voting server in Enterprise to prevent this outcome. You can add a new non-voting server to the cluster to test with if there are no existing ones.
+ - If you enable a Consul OSS server to use WAL or enable WAL on a voting server with Consul Enterprise, WAL may corrupt the server's state, become the leader, and replicate the corrupted state to all other servers. In this case, restoring from backup is required to recover a completely uncorrupted state. Test WAL on a non-voting server in Enterprise to prevent this outcome. You can add a new non-voting server to the cluster to test with if there are no existing ones.
 
 ## Enable log verification
 
-You must enable log verification on all voting servers in Enterprise and all servers in CE because the leader writes verification checkpoints.
+You must enable log verification on all voting servers in Enterprise and all servers in OSS because the leader writes verification checkpoints.
 
 1. On each voting server, add the following to the server's configuration file:
 
@@ -64,8 +65,8 @@ You must enable log verification on all voting servers in Enterprise and all ser
   }
   ```
 
-1. Restart the server to apply the changes. The `consul reload` command is not sufficient to apply `raft_logstore` configuration changes.
-1. Run the `consul operator raft list-peers` command to wait for each server to become a healthy voter before moving on to the next. This may take a few minutes for large snapshots.
+1. Restart the server to apply the changes. The `consul reload` command is not sufficient to apply `raft_logstore` configuration changes. 
+1. Run the `consul operator raft list-peers` command to wait for each server to become a healthy voter before moving on to the next. This may take a few minutes for large snapshots. 
 
 When complete, the server's logs should contain verifier reports that appear like the following example:
 
@@ -75,7 +76,7 @@ When complete, the server's logs should contain verifier reports that appear lik
 
 ## Select target server to enable WAL
 
-If you are using Consul CE, or Consul Enterprise without non-voting servers, select a follower server to enable WAL. As noted in [Risks](#risks), Consul Enterprise users with non-voting servers should first select a non-voting server, or consider adding another server as a non-voter to test on.
+If you are using Consul OSS or Consul Enterprise without non-voting servers, select a follower server to enable WAL. As noted in [Risks](#risks), Consul Enterprise users with non-voting servers should first select a non-voting server, or consider adding another server as a non-voter to test on. 
 
 Retrieve the current state of the servers by running the following command:
 
@@ -85,7 +86,7 @@ $ consul operator raft list-peers
 
 ## Stop target server
 
-Stop the target server gracefully. For example, if you are using `systemd`,
+Stop the target server gracefully. For example, if you are using `systemd`, 
 run the following command:
 
 ```shell-session
@@ -148,4 +149,4 @@ If you disabled configuration management automation, consider reenabling it duri
 
 - If you do not see errors and would like to expand the test further, you can repeat the above procedure on another target server. We suggest waiting after each test expansion and slowly rolling WAL out to other parts of your environment. Once the majority of your servers use WAL, any bugs not yet discovered may result in cluster unavailability.
 
-- If you wish to permanently enable WAL on all servers, repeat the steps described in this topic for each server. Even if `backend = "wal"` is set in logs, servers continue to use BoltDB if they find an existing raft.db file in the data directory.
+- If you wish to permanently enable WAL on all servers, repeat the steps described in this topic for each server. Even if `backend = "wal"` is set in logs, servers continue to use BoltDB if they find an existing raft.db file in the data directory.
\ No newline at end of file
diff --git a/website/content/docs/agent/wal-logstore/index.mdx b/website/content/docs/agent/wal-logstore/index.mdx
index 77dc1dd058464..491255e8ed5ac 100644
--- a/website/content/docs/agent/wal-logstore/index.mdx
+++ b/website/content/docs/agent/wal-logstore/index.mdx
@@ -24,15 +24,15 @@ WAL implements a traditional log with rotating, append-only log files. WAL resol
 
 The existing BoltDB log store inefficiently stores append-only logs to disk because it was designed as a full key-value database. It is a single file that only ever grows. Deleting the oldest logs, which Consul does regularly when it makes new snapshots of the state, leaves free space in the file. The free space must be tracked in a `freelist` so that BoltDB can reuse it on future writes. By contrast, a simple segmented log can delete the oldest log files from disk.
 
-A burst of writes at double or triple the normal volume can suddenly cause the log file to grow to several times its steady-state size. After Consul takes the next snapshot and truncates the oldest logs, the resulting file is mostly empty space.
+A burst of writes at double or triple the normal volume can suddenly cause the log file to grow to several times its steady-state size. After Consul takes the next snapshot and truncates the oldest logs, the resulting file is mostly empty space. 
 
 To track the free space, Consul must write extra metadata to disk with every write. The metadata is proportional to the amount of free pages, so after a large burst write latencies tend to increase. In some cases, the latencies cause serious performance degradation to the cluster.
 
-To mitigate risks associated with sudden bursts of log data, Consul tries to limit lots of logs from accumulating in the LogStore. Significantly larger BoltDB files are slower to append to because the tree is deeper and freelist larger. For this reason, Consul's default options associated with snapshots, truncating logs, and keeping the log history have been aggressively set toward keeping BoltDB small rather than using disk IO optimally.
+To mitigate risks associated with sudden bursts of log data, Consul tries to limit lots of logs from accumulating in the LogStore. Significantly larger BoltDB files are slower to append to because the tree is deeper and freelist larger. For this reason, Consul's default options associated with snapshots, truncating logs, and keeping the log history have been aggressively set toward keeping BoltDB small rather than using disk IO optimally. 
 
-But the larger the file, the more likely it is to have a large freelist or suddenly form one after a burst of writes. For this reason, the many of Consul's default options associated with snapshots, truncating logs, and keeping the log history aggressively keep BoltDT small rather than using disk IO more efficiently.
+But the larger the file, the more likely it is to have a large freelist or suddenly form one after a burst of writes. For this reason, the many of Consul's default options asssociated with snapshots, truncating logs, and keeping the log history aggressively keep BoltDT small rather than uisng disk IO more efficiently. 
 
-Other reliability issues, such as [raft replication capacity issues](/consul/docs/agent/telemetry#raft-replication-capacity-issues), are much simpler to solve without the performance concerns caused by storing more logs in BoltDB.
+Other reliability issues, such as [raft replication capacity issues](/consul/docs/agent/telemetry#raft-replication-capacity-issues), are much simpler to solve without the performance concerns caused by storing more logs in BoltDB. 
 
 ### WAL approaches storage issues differently
 
@@ -43,11 +43,11 @@ When directly measured, WAL is more performant than BoltDB because it solves a s
 The WAL backend has been tested thoroughly during development:
 
 - Every component in the WAL, such as [metadata management](https://github.com/hashicorp/raft-wal/blob/main/types/meta.go), [log file encoding](https://github.com/hashicorp/raft-wal/blob/main/types/segment.go) to actual [file-system interaction](https://github.com/hashicorp/raft-wal/blob/main/types/vfs.go) are abstracted so unit tests can simulate difficult-to-reproduce disk failures.
-
+ 
 - We used the [application-level intelligent crash explorer (ALICE)](https://github.com/hashicorp/raft-wal/blob/main/alice/README.md) to exhaustively simulate thousands of possible crash failure scenarios. WAL correctly recovered from all scenarios.
 
 - We ran hundreds of tests in a performance testing cluster with checksum verification enabled and did not detect data loss or corruption. We will continue testing before making WAL the default backend.
 
 We are aware of how complex and critical disk-persistence is for your data.
 
-We hope that many users at different scales will try WAL in their environments after upgrading to 1.15 or later and report success or failure so that we can confidently replace BoltDB as the default for new clusters in a future release.
+We hope that many users at different scales will try WAL in their environments after upgrading to 1.15 or later and report success or failure so that we can confidently replace BoltDB as the default for new clusters in a future release.
\ No newline at end of file
diff --git a/website/content/docs/agent/wal-logstore/revert-to-boltdb.mdx b/website/content/docs/agent/wal-logstore/revert-to-boltdb.mdx
index 9ba6923b42db2..2bd0638b7cd36 100644
--- a/website/content/docs/agent/wal-logstore/revert-to-boltdb.mdx
+++ b/website/content/docs/agent/wal-logstore/revert-to-boltdb.mdx
@@ -5,7 +5,7 @@ description: >-
   Learn how to revert Consul to the BoltDB backend after enabled the WAL (write-ahead log) LogStore backend shipped in Consul 1.15.
 ---
 
-# Revert storage backend to BoltDB from WAL
+# Revert storage backend to BoltDB from WAL 
 
 This topic describes how to revert your Consul storage backend from the experimental WAL LogStore backend to the default BoltDB.
 
@@ -18,14 +18,14 @@ The overall process for reverting to BoltDB consists of the following steps. Rep
 
 ## Stop target server gracefully
 
-Stop the target server gracefully. For example, if you are using `systemd`,
+Stop the target server gracefully. For example, if you are using `systemd`, 
 run the following command:
 
 ```shell-session
 $ systemctl stop consul
 ```
 
-If your environment uses configuration management automation that might interfere with this process, such as Chef or Puppet, you must disable them until you have completely reverted the storage backend.
+If your environment uses configuration management automation that might interfere with this process, such as Chef or Puppet, you must disable them until you have completely revereted the storage backend.
 
 ## Remove data directory from target server
 
@@ -73,4 +73,4 @@ If necessary, clean up any `raft.wal.bak` directories. Replace `/data-dir` with
 
 ```shell-session
 $ rm /data-dir/raft.bak
-```
+```
\ No newline at end of file
diff --git a/website/content/docs/connect/gateways/api-gateway/configuration/gateway.mdx b/website/content/docs/api-gateway/configuration/gateway.mdx
similarity index 95%
rename from website/content/docs/connect/gateways/api-gateway/configuration/gateway.mdx
rename to website/content/docs/api-gateway/configuration/gateway.mdx
index 60825a3a91fdb..9d9b87b3b7366 100644
--- a/website/content/docs/connect/gateways/api-gateway/configuration/gateway.mdx
+++ b/website/content/docs/api-gateway/configuration/gateway.mdx
@@ -13,7 +13,7 @@ This topic provides full details about the `Gateway` resource.
 
 A `Gateway` is an instance of network infrastructure that determines how service traffic should be handled. A `Gateway` contains one or more [`listeners`](#listeners) that bind to a set of IP addresses. An `HTTPRoute` or `TCPRoute` can then attach to a gateway listener to direct traffic from the gateway to a service.
 
-Gateway instances derive their configurations from the [`GatewayClass`](/consul/docs/connect/gateways/api-gateway/configuration/gatewayclass) resource, which acts as a template for individual `Gateway` deployments. Refer to [GatewayClass](/consul/docs/connect/gateways/api-gateway/configuration/gatewayclass) for additional information.
+Gateway instances derive their configurations from the [`GatewayClass`](/consul/docs/api-gateway/configuration/gatewayclass) resource, which acts as a template for individual `Gateway` deployments. Refer to [GatewayClass](/consul/docs/api-gateway/configuration/gatewayclass) for additional information.
 
 Specify the following parameters to declare a `Gateway`:
 
@@ -26,6 +26,7 @@ Specify the following parameters to declare a `Gateway`:
 | `fields`      | Specifies the configurations for the Gateway. The fields are listed in the [configuration model](#configuration-model). Details for each field are described in the [specification](#specification). | Required |
 
 
+
 ## Configuration model
 
 The following outline shows how to format the configurations in the `Gateway` object. Click on a property name to view details about the configuration.
@@ -57,7 +58,7 @@ The following outline shows how to format the configurations in the `Gateway` ob
 This topic provides details about the configuration parameters.
 
 ### gatewayClassName
-Specifies the name of the [`GatewayClass`](/consul/docs/connect/gateways/api-gateway/configuration/gatewayclass) resource used for the `Gateway` instance. Unless you are using a custom [GatewayClass](/consul/docs/connect/gateways/api-gateway/configuration/gatewayclass), this value should be set to `consul`.
+Specifies the name of the [`GatewayClass`](/consul/docs/api-gateway/configuration/gatewayclass) resource used for the `Gateway` instance. Unless you are using a custom [GatewayClass](/consul/docs/api-gateway/configuration/gatewayclass), this value should be set to `consul-api-gateway`.
 * Type: string
 * Required: required
 
@@ -195,7 +196,7 @@ The following example creates a `Gateway` named `example-gateway` in namespace `
     name: example-gateway
     namespace: gateway-namespace
   spec:
-    gatewayClassName: consul
+    gatewayClassName: consul-api-gateway
     listeners:
     - protocol: HTTPS
       port: 443
diff --git a/website/content/docs/connect/gateways/api-gateway/configuration/gatewayclass.mdx b/website/content/docs/api-gateway/configuration/gatewayclass.mdx
similarity index 95%
rename from website/content/docs/connect/gateways/api-gateway/configuration/gatewayclass.mdx
rename to website/content/docs/api-gateway/configuration/gatewayclass.mdx
index 2111e95e83d89..fa8fab2d2cbb8 100644
--- a/website/content/docs/connect/gateways/api-gateway/configuration/gatewayclass.mdx
+++ b/website/content/docs/api-gateway/configuration/gatewayclass.mdx
@@ -15,7 +15,7 @@ The `GatewayClass` specification includes the name of the controller (`controlle
 
 When gateways are created from a `GatewayClass`, they use the parameters specified in the `GatewayClass` at the time of instantiation.
 
-The `GatewayClass` resource is a generic Kubernetes gateway object. For configuration specific to Consul API Gateway, refer to [GatewayClassConfig](/consul/docs/connect/gateways/api-gateway/configuration/gatewayclassconfig).
+The `GatewayClass` resource is a generic Kubernetes gateway object. For configuration specific to Consul API Gateway, see [GatewayClassConfig](/consul/docs/api-gateway/configuration/gatewayclassconfig).
 
 ## Configuration model
 The following outline shows how to format the configurations in the `GatewayClass` object. Click on a property name to view details about the configuration.
diff --git a/website/content/docs/connect/gateways/api-gateway/configuration/gatewayclassconfig.mdx b/website/content/docs/api-gateway/configuration/gatewayclassconfig.mdx
similarity index 87%
rename from website/content/docs/connect/gateways/api-gateway/configuration/gatewayclassconfig.mdx
rename to website/content/docs/api-gateway/configuration/gatewayclassconfig.mdx
index 2fa35a75521e1..ea3357deceefd 100644
--- a/website/content/docs/connect/gateways/api-gateway/configuration/gatewayclassconfig.mdx
+++ b/website/content/docs/api-gateway/configuration/gatewayclassconfig.mdx
@@ -38,9 +38,7 @@ The following outline shows how to format the configurations in the `GatewayClas
   * [`consulAPIGateway`](#image-consulapigateway): string | optional
   * [`envoy`](#image-envoy): string | optional
 * [`logLevel`](#loglevel): string | optional
-* [`matchPrivilegedContainerPorts`](#matchPrivilegedContainerPorts): integer | optional
 * [`nodeSelector`](#nodeselector): string | optional
-* [`openshiftSCCName`](#openshiftSCCName): string | optional
 * [`serviceType`](#servicetype): string | optional
 * [`useHostPorts`](#usehostports): boolean | optional
 
@@ -154,26 +152,12 @@ You can specify the following strings:
 * `debug`
 * `trace`
 
-### matchPrivilegedContainerPorts
-Specifies a value that Consul adds to privileged ports defined in the gateway. Privileged ports are port numbers less than 1024 and some platforms, such as Red Hat OpenShift, explicitly configure Kubernetes to avoid running containers on privileged ports. The total value of the configured port number and the `matchPriviledgedContainerPorts` value must not exceed 65535, which is the highest possible TCP port number allowed.
-for gateway containers
-* Type: Integer
-* Required: optional
-
-You can specify an integer between `0` and `64512`
-
 ### nodeSelector
 Pods normally run on multiple nodes. You can specify a set of parameters in the `nodeSelector` that constrain the nodes on which the pod can run, enabling the pod to fit on a node. The selector must match a node's labels for the pod to be scheduled on that node. Refer to the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) for additional information.
 
 * Type: string
 * Required: optional
 
-### openshiftSCCName
-Specifies the OpenShift security context constraint (SCC) for the `GatewayClassConfig` to use. Refer to the [OpenShift SCC documentation](https://docs.openshift.com/container-platform/4.13/authentication/managing-security-context-constraints.html#default-sccs_configuring-internal-oauth) for additional information about the available default SCCs.
-* Type: string
-* Required: optional
-* Default: `restricted-v2`
-
 ### serviceType
 Specifies the ingress methods for the gateway's Kubernetes service.
 * Type: string
diff --git a/website/content/docs/api-gateway/configuration/index.mdx b/website/content/docs/api-gateway/configuration/index.mdx
new file mode 100644
index 0000000000000..b2d0b19a52d36
--- /dev/null
+++ b/website/content/docs/api-gateway/configuration/index.mdx
@@ -0,0 +1,23 @@
+---
+layout: docs
+page_title: Consul API Gateway Configuration - Overview
+description: >-
+  Configure your Consul API Gateway to manage traffic into your service mesh. Learn about the Kubernetes Gateway Specification items you can configure and how to configure custom API Gateways.
+---
+
+# Consul API Gateway Configuration Overview
+
+This topic provides an overview of the configuration items that enable Consul API Gateway to manage traffic into your Consul service mesh.
+
+- [Gateway](/consul/docs/api-gateway/configuration/gateway) defines the main infrastructure resource that links API gateway components. It specifies the name of the `GatewayClass` and one or more [listeners](/consul/docs/api-gateway/configuration/gateway#listeners), which specify the logical endpoints bound to the gateway's addresses.
+- [GatewayClass](/consul/docs/api-gateway/configuration/gatewayclass) defines a class of gateway resources that you can use as a template for creating gateways.
+- [GatewayClassConfig](/consul/docs/api-gateway/configuration/gatewayclassconfig) describes additional Consul API Gateway-related configuration parameters for the GatewayClass resource.
+- [Routes](/consul/docs/api-gateway/configuration/routes) specifies the path from the gateway to the backend service(s) client to the listener.
+
+You can create a basic Gateway object using the default [`gatewayClassName`](/consul/docs/api-gateway/configuration/gateway#gatewayclassname) (`consul-api-gateway`). If you want to create custom Gateways suitable for your environment, complete the following steps:
+
+1. Define a [GatewayClassConfig](/consul/docs/api-gateway/configuration/gatewayclassconfig) that contains your custom configurations.
+1. Define a [GatewayClass](/consul/docs/api-gateway/configuration/gatewayclass) and configure the [`parametersRef.name`](/consul/docs/api-gateway/configuration/gatewayclass#parametersref-name) to reference the name of your [GatewayClassConfig](/consul/docs/api-gateway/configuration/gatewayclassconfig).
+1. Define a [Gateway](/consul/docs/api-gateway/configuration/gateway) and configure the [`gatewayClassName`](/consul/docs/api-gateway/configuration/gateway#gatewayclassname) to reference the name of your [GatewayClass](/consul/docs/api-gateway/configuration/gatewayclass).
+
+<!--TODO add diagram -->
diff --git a/website/content/docs/connect/gateways/api-gateway/configuration/meshservice.mdx b/website/content/docs/api-gateway/configuration/meshservice.mdx
similarity index 100%
rename from website/content/docs/connect/gateways/api-gateway/configuration/meshservice.mdx
rename to website/content/docs/api-gateway/configuration/meshservice.mdx
diff --git a/website/content/docs/api-gateway/configuration/routes.mdx b/website/content/docs/api-gateway/configuration/routes.mdx
new file mode 100644
index 0000000000000..27b520340248a
--- /dev/null
+++ b/website/content/docs/api-gateway/configuration/routes.mdx
@@ -0,0 +1,266 @@
+---
+layout: docs
+page_title: Route Resource Configuration
+description: >-
+  The `HTTPRoute` and `TCPRoute` resources define Consul API Gateway routing behavior for traffic into the service mesh according to rules. Learn about its configuration model and reference specifications, and review an example configuration.
+---
+
+# Route Resource Configuration
+
+This topic describes how to create and configure `Route` resources. Routes are independent configuration objects that are associated with specific listeners.
+
+## Create a `Route`
+
+Declare a route with either `kind: HTTPRoute` or `kind: TCPRoute` and configure the route parameters in the `spec` block.
+Refer to the Kubernetes Gateway API documentation for each object type for details:
+
+- [HTTPRoute](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRoute)
+- [TCPRoute](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.TCPRoute)
+
+The following example creates a route named `example-route` associated with a listener defined in `example-gateway`.
+
+<CodeBlockConfig filename="routes.yaml">
+
+  ```yaml
+  apiVersion: gateway.networking.k8s.io/v1alpha2
+  kind: HTTPRoute
+  metadata:
+    name: example-route
+  spec:
+    parentRefs:
+    - name: example-gateway
+    rules:
+    - backendRefs:
+      - kind: Service
+        name: echo
+        port: 8080
+  ```
+
+</CodeBlockConfig>
+
+## Configuration model
+
+The following outline shows how to format the configurations for the `Route` object. The top-level `spec` field is the root for all configurations. Click on a property name to view details about the configuration.
+
+* [`parentRefs`](#parentrefs): array of objects | optional
+  * [`group`](#parentrefs): string | optional
+  * [`kind`](#parentrefs): string | optional
+  * [`name`](#parentrefs): string | required
+  * [`namespace`](#parentrefs): string | optional
+  * [`sectionName`](#parentrefs): string | optional
+* [`rules`](#rules): list of objects | optional
+  * [`backendRefs`](#rules-backendrefs): list of objects | optional
+    * [`group`](#rules-backend-refs): string | optional
+    * [`kind`](#rules-backendrefs): string | optional
+    * [`name`](#rules-backendrefs): string | required
+    * [`namespace`](#rules-backendrefs): string | optional
+    * [`port`](#rules-backendrefs): integer | required
+    * [`weight`](#rules-backendrefs): integer | optional
+  * [`filters`](#rules-filters): list of objects | optional
+    * [`type`](#rules-filters-type): string | required
+    * [`requestHeaderModifier`](#rules-filters-requestheadermodifier): object | optional
+      * [`set`](#rules-filters-requestheadermodifier): array of objects | optional
+        * [`name`](#rules-filters-requestheadermodifier): string | required
+        * [`value`](#rules-filters-requestheadermodifier): string | required
+      * [`add`](#rules-filters-requestheadermodifier): array of objects | optional
+        * [`name`](#rules-filters-requestheadermodifier): string | required
+        * [`value`](#rules-filters-requestheadermodifier): string | required
+      * [`remove`](#rules-filters-requestheadermodifier): array of strings | optional
+    * [`urlRewrite`](#rules-filters-urlrewrite): object | optional
+      * [`path`](#rules-filters-urlrewrite-path): object | required
+        * [`replacePrefixMatch`](#rules-filters-urlrewrite-path): string | required
+        * [`type`](#rules-filters-urlrewrite-path): string | required
+  * [`matches`](#rules-matches): array of objects | optional
+    * [`path`](#rules-matches-path): list of objects | optional
+      * [`type`](#rules-matches-path): string | required
+      * [`value`](#rules-matches-path): string | required
+    * [`headers`](#rules-matches-headers): list of objects | optional
+      * [`type`](#rules-matches-headers): string | required
+      * [`name`](#rules-matches-headers): string | required
+      * [`value`](#rules-matches-headers): string | required
+    * [`queryParams`](#rules-matches-queryparams): list of objects | optional
+      * [`type`](#rules-matches-queryparams): string | required
+      * [`name`](#rules-matches-queryparams): string | required
+      * [`value`](#rules-matches-queryparams): string | required
+    * [`method`](#rules-matches-method): string | optional
+
+
+## Specification
+
+This topic provides details about the configuration parameters.
+
+### parentRefs
+
+This field contains the list of `Gateways` that the route should attach to. If not set, the route will not attach to a `Gateway`. The following table describes the objects you can configure in the `parentRefs` block:
+
+| Parameter | Description | Type | Required |
+| ---       | ---         | ---  | ---      |
+| `group` | Specifies the Kubernetes API group of the `Gateway` to attach to. You can specify the following values: <ul><li>`gateway.networking.k8s.io`</li></ul>. Defaults to `gateway.networking.k8s.io`. | String | Optional |
+| `kind` | Specifies the Kubernetes kind of the `Gateway` to attach to. you can specify the following values: <ul><li>`Gateway`</li></ul>. Defaults to `Gateway`.  | String | Optional |
+| `name` | Specifies the name of the `Gateway` the route is attached to. | String | Required |
+| `namespace` | Specifies the Kubernetes namespace containing the `Gateway` to attach to. If the `Gateway` is in a different Kubernetes namespace than the `Route`, then you must specify a value. Defaults to the `Route` namespace. | String | Optional |
+| `sectionName` | Specifies the name of a specific listener on the `Gateway` to attach to. The `Route` attempts to attach to all listeners on the `Gateway`. | String | Required |
+
+
+### rules
+
+The `rules` field contains a list of objects that define behaviors for network traffic that goes through the route. The rule configuration contains the following objects:
+
+* [`backendRefs`](#rules-backendrefs): Specifies which backend services the `Route` references when processing traffic.
+* [`filters`](#rules-filters): Specifies which operations Consul API Gateway performs when traffic goes through the `Route`.
+* [`matches`](#rules-matches): Determines which requests Consul API Gateway processes.
+
+Rules are optional.
+
+### rules.backendRefs
+
+This field specifies backend services that the `Route` references. The following table describes the parameters for `backendRefs`:
+
+| Parameter | Description | Type | Required |
+| ---       | ---         | ---  | ---      |
+| `group` | Specifies the Kubernetes API Group of the referenced backend. You can specify the following values: <ul><li>`""`: Specifies the core Kubernetes API group. This value must be used when `kind` is set to `Service`. This is the default value if unspecified.</li><li>`api-gateway.consul.hashicorp.com`: This value must be used when `kind` is set to `MeshService`.</li></ul> | String | Optional |
+| `kind` |  Specifies the Kubernetes Kind of the referenced backend. You can specify the following values: <ul><li>`Service` (default): Indicates that the `backendRef` references a Service in the Kubernetes cluster. </li><li>`MeshService`: Indicates that the `backendRef` references a service in the Consul mesh. Refer to the `MeshService` [documentation](/consul/docs/api-gateway/configuration/meshservice) for additional information.</li></ul> | String | Optional |
+| `name` | Specifies the name of the Kubernetes Service or Consul mesh service resource. | String | Required |
+| `namespace` | Specifies the Kubernetes namespace containing the Kubernetes Service or Consul mesh service resource. You must specify a value if the Service or Consul mesh service is defined in a different namespace from the `Route`. Defaults to the namespace of the `Route`. <br/>To create a route for a `backendRef` in a different namespace, you must also create a [ReferenceGrant](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferenceGrant). Refer to the [example route](#example-cross-namespace-backendref) configured to reference across namespaces. | String | Optional |
+| `port` | Specifies the port number for accessing the Kubernetes or Consul service. | Integer | Required |
+| `weight` | Specifies the proportion of requests sent to the backend. Computed as weight divided by the sum of all weights in this `backendRefs` list. Defaults to `1`. A value of `0` indicates that no requests should be sent to the backend. | Integer | Optional |
+
+#### Example cross-namespace backendRef
+
+The following example creates a route named `example-route` in namespace `gateway-namespace`. This route has a `backendRef` in namespace `service-namespace`. Traffic is allowed because the `ReferenceGrant`, named `reference-grant` in namespace `service-namespace`, allows traffic from `HTTPRoutes` in `gateway-namespace` to `Services` in `service-namespace`.
+
+<CodeBlockConfig filename="route_with_referencegrant.yaml">
+
+  ```yaml
+  apiVersion: gateway.networking.k8s.io/v1alpha2
+  kind: HTTPRoute
+  metadata:
+    name: example-route
+    namespace: gateway-namespace
+  spec:
+    parentRefs:
+      - name: example-gateway
+    rules:
+      - backendRefs:
+        - kind: Service
+          name: echo
+          namespace: service-namespace
+          port: 8080
+  ---
+
+  apiVersion: gateway.networking.k8s.io/v1alpha2
+  kind: ReferenceGrant
+  metadata:
+    name: reference-grant
+    namespace: service-namespace
+  spec:
+    from:
+    - group: gateway.networking.k8s.io
+      kind: HTTPRoute
+      namespace: gateway-namespace
+      to:
+        - group: ""
+          kind: Service
+          name: echo
+  ```
+
+</CodeBlockConfig>
+
+### rules.filters
+
+The `filters` block defines steps for processing requests. You can configure filters to modify the properties of matching incoming requests and enable Consul API Gateway features, such as rewriting path prefixes (refer to [Reroute HTTP requests](/consul/docs/api-gateway/usage/reroute-http-requests) for additional information).
+
+* Type: Array of objects
+* Required: Optional
+
+### rules.filters.type
+
+Specifies the type of filter you want to apply to the route. The parameter is optional and takes a string value.
+
+You can specify the following values:
+
+* `RequestHeaderModifier`: The `RequestHeaderModifier` type modifies the HTTP headers on the incoming request. You must define the [`rules.filters.requestHeaderModifier`](#rules-filters-requestheadermodifier) configurations to use this filter type.
+
+* `URLRewrite`: The `URLRewrite` type  modifies the URL path on the incoming request. You must define the [`rules.filters.urlRewrite`](#rules-filters-urlrewrite) configurations to use this filter type.
+
+### rules.filters.requestHeaderModifier
+
+Defines operations to perform on matching request headers when `rules.filters.type` is configured to `RequestHeaderModifier`. This field contains the following configuration objects:
+
+| Parameter | Description | Type | Required |
+| ---       | ---         | ---  | ---      |
+| `set` | Configure this field to rewrite the HTTP request header. It specifies the name of an HTTP header to overwrite and the new value to set. Any existing values associated with the header name are overwritten. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to set.</li><li>`value`: Required string that specifies the value of the HTTP header to set.</li></ul> | List of objects | Optional |
+| `add` | Configure this field to append the request header with a new value. It specifies the name of an HTTP header to append and the value(s) to add. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to append.</li><li>`value`: Required string that specifies the value of the HTTP header to add.</li></ul> | List of objects | Optional |
+| `remove` | Configure this field to specify an array of header names to remove from the request header. | Array of strings | Optional |
+
+
+### rules.filters.urlRewrite
+
+Specifies rules for rewriting the URL of incoming requests when `rules.filters.type` is configured to `URLRewrite`.
+
+* Type: Object
+* Required: Optional
+
+### rules.filters.urlRewrite.path
+
+Specifies a list of objects that determine how Consul API Gateway rewrites URL paths (refer to [Reroute HTTP requests](/consul/docs/api-gateway/usage/reroute-http-requests) for additional information).
+
+The following table describes the parameters for `path`:
+
+| Parameter | Description | Type | Required |
+| ---       | ---         | ---  | ---      |
+| `replacePrefixMatch` | Specifies a value that replaces the path prefix for incoming HTTP requests. The operation only affects the path prefix. The rest of the path is unchanged. | String | Required |
+| `type` | Specifies the type of replacement to use for the URL path. You can specify the following values: <ul><li>`ReplacePrefixMatch`: Replaces the the matched prefix of the URL path (default). </li></ul> | String | Optional |
+
+### rules.matches
+
+Specifies rules for matching incoming requests. You can apply [`filters`](#rulesfilters) to requests that match the defined rules. You can match incoming requests based on the following elements:
+
+* [paths](#rules-matches-path)
+* [headers](#rules-matches-headers)
+* [query parameters](#rules-matches-queryparams)
+* [request method](#rules-matches-method)
+
+Each rule matches requests independently. As a result, a request matching any of the conditions is considered a match.  You can configure several matching rules for each type to widen or narrow matches.
+### rules.matches.path
+
+Specifies a list of objects that define matches based on URL path. The following table describes the parameters for the `path` field:
+
+| Parameter | Description | Type | Required |
+| ---       | ---         | ---  | ---      |
+| `type` | Specifies the type of comparison to use for matching the path value. You can specify the following types. <ul><li>`Exact`: Returns a match only when the entire path matches the `value` field (default).</li><li> `PathPrefix`: Returns a match when the path has the prefix defined in the `value` field.</li><li>`RegularExpression`: Returns a match when the path matches the regex defined in the `value` field.</li></ul> | String | Required |
+| `value` | Specifies the value to match on. You can specify a specific string when `type` is `Exact` or `PathPrefix`. You can specify a regular expression if `type` is `RegularExpression`. | String | Required |
+
+### rules.matches.headers
+
+Specifies a list of objects that define matches based HTTP request headers. The following table describes the parameters for the `headers` field:
+
+| Parameter | Description | Type | Required |
+| ---       | ---         | ---  | ---      |
+| `type` | Specifies the type of comparison to use for matching the header value. You can specify the following types. <ul><li>`Exact`: Returns a match only when the entire header matches the `value` field (default).</li><li> `RegularExpression`: Returns a match when the header matches the regex defined in the `value` field.</li></ul> | String | Required |
+| `name` | Specifies the name of the header to match on. | String | Required |
+| `value` | Specifies value to match on. You can specify a specific string or a regular expression. | String | Required |
+
+### rules.matches.queryParams
+
+Specifies a list of objects that define matches based query parameters. The following table describes the parameters for the `queryParams` field:
+
+| Parameter | Description | Type | Required |
+| ---       | ---         | ---  | ---      |
+| `type` | Specifies the type of comparison to use for matching a query parameter value. You can specify the following types. <ul><li>`Exact`: Returns a match only when the query parameter match the `value` field (default).</li><li> `RegularExpression`: Returns a match when the query parameter matches the regex defined in the `value` field.</li></ul> | String | Required |
+| `name` | Specifies the name of the query parameter to match on. | String | Required |
+| `value` | Specifies value to match on. You can specify a specific string or a regular expression. | String | Required |
+
+### rules.matches.method
+
+Specifies a list of strings that define matches based on HTTP request method. You may specify the following values:
+
+* `HEAD`
+* `POST`
+* `PUT`
+* `PATCH`
+* `GET`
+* `DELETE`
+* `OPTIONS`
+* `TRACE`
+* `CONNECT`
diff --git a/website/content/docs/api-gateway/index.mdx b/website/content/docs/api-gateway/index.mdx
new file mode 100644
index 0000000000000..83372546ac46d
--- /dev/null
+++ b/website/content/docs/api-gateway/index.mdx
@@ -0,0 +1,45 @@
+---
+layout: docs
+page_title: API Gateway for Kubernetes Overview
+description: >-
+  Consul API Gateway enables external network client access to a service mesh on Kubernetes and forwards requests based on path or header information. Learn about how the k8s Gateway API specification configures Consul API Gateway so you can control access and simplify traffic management.
+---
+
+# API Gateway for Kubernetes overview
+
+This topic provides an overview of the Consul API Gateway for deploying on Kubernetes. If you would like to deploy on virtual machines, refer to [API Gateways on Virtual Machines](/consul/docs/connect/gateways/api-gateway/usage).
+
+## What is Consul API Gateway?
+
+Consul API Gateway is an add-on for Consul that helps users control access to services running within a Consul service mesh. The API gateway enables external network clients to access applications and services running in a Consul datacenter. This type of network traffic is commonly referred to as "north-south" network traffic as it refers to the flow of data into and out of a specific environment. Requests from clients can also be forwarded based on path or request protocol.
+
+Consul API Gateway solves the following primary use cases:
+
+- **Controlling access at the point of entry**: Consul API Gateway allows users to set the protocols of external connection requests and provide clients with TLS certificates from trusted providers (e.g., Verisign, Let's Encrypt).
+- **Simplifying traffic management**: The Consul API Gateway can load balance requests across services and route traffic to the appropriate service by matching one or more criteria, such as hostname, path, header presence or value, and HTTP Method type (e.g., GET, POST, PATCH).
+
+## How Does Consul API Gateway Work?
+
+Consul API Gateway can be deployed on Kubernetes-based runtime environments and requires that Consul service mesh be deployed on the Kubernetes cluster.
+
+API Gateway routes traffic to services connected to the same service mesh. Those services can be running on the same Kubernetes cluster as the API Gateway, a different Kubernetes cluster, or another runtime, as long as they are connected to the same service mesh deployment and reachable over the network.
+
+Consul API Gateway implements and is configured through the Kubernetes [Gateway API Specification](https://gateway-api.sigs.k8s.io/). This specification defines a set of custom resource definitions (CRD) that can create logical gateways which route traffic based on a client request's path or protocol.
+
+### Supported Kubernetes Gateway Specification Features
+
+The Consul API Gateway supports a subset of the Kubernetes [v1alpha2 Gateway API specification](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/). The following table
+describes the supported features of the specification. For a complete list of features, including the list of gateway and route statuses and an explanation on how they
+are used, see the [documentation in our GitHub repo](https://github.com/hashicorp/consul-api-gateway/blob/main/dev/docs/supported-features.md).
+
+| Kubernetes Object  | Description |
+| ----- | ----------------------------- |
+| [`GatewayClass`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.GatewayClass) | <ul><li>Parameter specification via `GatewayClassConfig` CRD</li><li>Controller matching on `"hashicorp.com/consul-api-gateway-controller"`</li></ul> |
+| [`Gateway`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.Gateway) | <ul><li>Supported protocols: `HTTP`, `HTTPS`, `TCP`</li><li>Header-based hostname matching (no SNI support)</li><li>Supported filters: header addition, removal, and setting</li><li>TLS modes supported: `terminate`</li><li>Certificate types supported: `core/v1/Secret`</li><li>Extended options: TLS version and cipher constraints</li></ul> |
+| [`HTTPRoute`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRoute) | <ul><li>Weight-based load balancing</li><li>Supported rules: path, header, query, and method-based matching</li><li>Supported filters: header addition, removal, and setting</li><li>Supported backend types: <ol><li>`core/v1/Service` (must map to a registered Consul service)</li><li>`api-gateway.consul.hashicorp.com/v1alpha1/MeshService`</li></ol></li></ul> |
+| [`TCPRoute`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.TCPRoute) | <ul><li>Supported backend types: <ol><li>`core/v1/Service` (must map to a registered Consul service)</li><li>`api-gateway.consul.hashicorp.com/v1alpha1/MeshService`</li></ol></li></ul> |
+| [`ReferenceGrant`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferenceGrant) | <ul><li>Required to allow any reference from a `Gateway` to a Kubernetes `core/v1/Secret` in a different namespace.</li><ul><li>A Gateway with an unpermitted `certificateRefs` caused by the lack of a` ReferenceGrant` sets a `ResolvedRefs` status to `False` with the reason `InvalidCertificateRef`. The Gateway will not become ready in this case.</li></ul><li>Required to allow any reference from an `HTTPRoute` or `TCPRoute` to a Kubernetes `core/v1/Service` in a different namespace.</li><ul><li>A route with an unpermitted `backendRefs` caused by the lack of a `ReferenceGrant` sets a `ResolvedRefs` status to `False` with the reason `RefNotPermitted`. The gateway listener rejects routes with an unpermitted `backendRefs`.</li><li>WARNING: If a route `backendRefs` becomes unpermitted, the entire route is removed from the gateway listener. <ul><li>A `backendRefs` can become unpermitted when you delete a `ReferenceGrant` or add a new unpermitted `backendRefs` to an existing route.</li></ul></li></ul></ul> |
+
+## Additional Resources
+
+You can learn more about using Consul API Gateway by completing the [Consul API Gateway tutorial](/consul/tutorials/kubernetes/kubernetes-api-gateway).
diff --git a/website/content/docs/api-gateway/install.mdx b/website/content/docs/api-gateway/install.mdx
new file mode 100644
index 0000000000000..1d715c0c47865
--- /dev/null
+++ b/website/content/docs/api-gateway/install.mdx
@@ -0,0 +1,87 @@
+---
+layout: docs
+page_title: Install API Gateway for Kubernetes
+description: >-
+  Learn how to install custom resource definitions (CRDs) and configure the Helm chart so that you can run Consul API Gateway on your Kubernetes deployment.
+---
+
+# Install API Gateway for Kubernetes
+
+This topic describes how to install and configure Consul API Gateway.
+
+## Requirements
+
+Ensure that the environment you are deploying Consul API Gateway in meets the requirements listed in the [Technical Specifications][tech-specs]. This includes validating that the requirements for minimum versions of software are met. Refer to the [Release Notes][rel-notes] for the version of API Gateway you are deploying.
+
+## Installation
+
+1. Set the version of Consul API Gateway you are installing as an environment variable. The following steps use this environment variable in commands and configurations.
+
+  ```shell-session
+  $ export VERSION=0.5.1
+  ```
+
+1. Issue the following command to install the CRDs:
+
+  ```shell-session
+  $ kubectl apply --kustomize="github.com/hashicorp/consul-api-gateway/config/crd?ref=v$VERSION"
+  ```
+
+1. Create a `values.yaml` file for your Consul API Gateway deployment by copying the following content and running it in the environment where you set the `VERSION` environment variable. The Consul Helm chart uses this `values.yaml` file to deploy the API Gateway. Available versions of the [Consul](https://hub.docker.com/r/hashicorp/consul/tags) and [Consul API Gateway](https://hub.docker.com/r/hashicorp/consul-api-gateway/tags) Docker images can be found on DockerHub, with additional context on version compatibility published in [GitHub releases](https://github.com/hashicorp/consul-api-gateway/releases). For more options to configure your Consul API Gateway deployment through the Helm chart, refer to [Helm Chart Configuration - apiGateway](/consul/docs/k8s/helm#apigateway).
+
+    <CodeBlockConfig filename="values.yaml">
+
+      ```shell
+        cat <<EOF > values.yaml
+          global:
+            name: consul
+          connectInject:
+            enabled: true
+          apiGateway:
+            enabled: true
+            image: hashicorp/consul-api-gateway:$VERSION
+        EOF
+      ```
+    </CodeBlockConfig>
+
+1. Install Consul API Gateway using the standard Consul Helm chart or Consul K8s CLI specify the custom values file. Available versions of the [Consul Helm chart](https://github.com/hashicorp/consul-k8s/releases) can be found in GitHub releases.
+
+  <Tabs>
+    <Tab heading="Consul K8s CLI (Mac Only)">
+
+    ~> **Note:** Refer to the official [Consul K8S CLI documentation](/consul/docs/k8s/k8s-cli) to find additional settings.
+
+    ```shell-session
+    $ brew tap hashicorp/tap
+    ```
+
+    ```shell-session
+    $ brew install hashicorp/tap/consul-k8s
+    ```
+
+    ```shell-session
+    $ consul-k8s install -config-file=values.yaml -set global.image=hashicorp/consul:1.14.3
+    ```
+
+    </Tab>
+    <Tab heading="Helm">
+
+    Add the HashiCorp Helm repository.
+
+    ```shell-session
+    $ helm repo add hashicorp https://helm.releases.hashicorp.com
+    ```
+    Install Consul with API Gateway on your Kubernetes cluster by specifying the `values.yaml` file.
+
+    ```shell-session
+    $ helm install consul hashicorp/consul --version 1.0.2 --values values.yaml --create-namespace --namespace consul
+    ```
+    </Tab>
+  </Tabs>
+
+<!--
+****** KEEP ALL PAGE CONTENT ABOVE THIS LINE *******
+Only Reference style links should be added below this comment
+--->
+[tech-specs]: /consul/docs/api-gateway/tech-specs
+[rel-notes]: /consul/docs/release-notes
diff --git a/website/content/docs/api-gateway/tech-specs.mdx b/website/content/docs/api-gateway/tech-specs.mdx
new file mode 100644
index 0000000000000..7fb142340dec1
--- /dev/null
+++ b/website/content/docs/api-gateway/tech-specs.mdx
@@ -0,0 +1,78 @@
+---
+layout: docs
+page_title: API Gateway for Kubernetes Technical Specifications
+description: >-
+  Consul API Gateway is a service mesh add-on for Kubernetes deployments. Learn about its requirements for system resources, ports, and component versions, its Enterprise limitations, and compatible k8s cloud environments.
+---
+
+# API Gateway for Kubernetes Technical Specifications
+
+This topic describes the technical specifications associated with using Consul API Gateway.
+
+## Requirements
+
+Verify that your environment meets the following requirements prior to using Consul API Gateway.
+
+### Datacenter Requirements
+
+Your datacenter must meet the following requirements prior to configuring the Consul API Gateway:
+
+- Kubernetes 1.21+
+- `kubectl` 1.21+
+- Consul 1.11.2+
+- HashiCorp Consul Helm chart 0.47.1+
+- Consul Service Mesh must be deployed on the Kubernetes cluster that API Gateway is deployed on.
+- Envoy:  Envoy proxy support is determined by the Consul version deployed. Refer to [Envoy Integration](/consul/docs/connect/proxies/envoy) for details.
+
+### TCP Port Requirements
+
+The following table describes the TCP port requirements for each component of the API Gateway.
+
+| Port | Description | Component |
+| ---- | ----------- | --------- |
+| 9090 | Secret discovery service (SDS) | Gateway controller pod <br/> Gateway instance pod |
+| 20000 | Kubernetes readiness probe | Gateway instance pod |
+| Configurable | Port for scraping Prometheus metrics. Disabled by default. | Gateway controller pod |
+
+## Consul Server Deployments
+
+- Consul Editions supported: OSS and Enterprise
+- Supported Consul Server deployment types:
+  - Self-Managed
+  - HCP Consul
+
+### Limited Support of some Consul Features
+
+The following table lists API Gateway limitations related to specific Consul features
+
+| Consul Feature | Limitation |
+| -------------- | ---------- |
+| [Admin partitions](/consul/docs/enterprise/admin-partitions) | You can deploy Consul API Gateway into the `default` admin partition only. You can route to services in other `default` admin partitions through peered connections. Refer to [Route Traffic to Peered Services](/consul/docs/api-gateway/usage/route-to-peered-services) for additional information. |
+| Routing between datacenters | If you are connecting multiple Consul datacenters to create a federated network, you can route to services in other datacenters through peered connections. Refer to [Route Traffic to Peered Services](/consul/docs/api-gateway/usage/route-to-peered-services) for additional information. |
+
+## Deployment Environments
+
+Consul API Gateway can be deployed in the following Kubernetes-based environments:
+
+- Generic Kubernetes
+- AWS Elastic Kubernetes Service (EKS)
+- Google Kubernetes Engine (GKE)
+- Azure Kubernetes Service (AKS)
+
+## Kubernetes Gateway API Specification - Supported Versions
+
+See the Release Notes for the version of Consul API Gateway being used.
+
+## Resource Allocations
+
+The following resources are allocated for each component of the API Gateway.
+
+### Gateway Controller Pod
+
+- **CPU**: None. Either the namespace or cluster default is allocated, depending on the Kubernetes cluster configuration.
+- **Memory**: None. Either the the namespace or cluster default is allocated, depending on the Kubernetes cluster configuration.
+
+### Gateway Instance Pod
+
+- **CPU**: None. Either the namespace or cluster default is allocated, depending on the Kubernetes cluster configuration.
+- **Memory**: None. Either the namespace or cluster default is allocated, depending on the Kubernetes cluster configuration.
diff --git a/website/content/docs/api-gateway/upgrades.mdx b/website/content/docs/api-gateway/upgrades.mdx
new file mode 100644
index 0000000000000..e67c3a0de9c1e
--- /dev/null
+++ b/website/content/docs/api-gateway/upgrades.mdx
@@ -0,0 +1,596 @@
+---
+layout: docs
+page_title: Upgrade API Gateway for Kubernetes
+description: >-
+  Upgrade Consul API Gateway to use newly supported features. Learn about the requirements, procedures, and post-configuration changes involved in standard and specific version upgrades.
+---
+
+# Upgrade API Gateway for Kubernetes
+
+This topic describes how to upgrade Consul API Gateway.
+
+## Upgrade to v0.4.0
+
+Consul API Gateway v0.4.0 adds support for [Gateway API v0.5.0](https://github.com/kubernetes-sigs/gateway-api/releases/tag/v0.5.0) and the following resources:
+
+- The graduated v1beta1 `GatewayClass`, `Gateway` and `HTTPRoute` resources.
+
+- The [`ReferenceGrant`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferenceGrant) resource, which replaces the identical [`ReferencePolicy`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferencePolicy) resource.
+
+Consul API Gateway v0.4.0 is backward-compatible with existing `ReferencePolicy` resources, but we will remove support for `ReferencePolicy` resources in a future release. We recommend that you migrate to `ReferenceGrant` after upgrading.
+
+### Requirements
+
+Ensure that the following requirements are met prior to upgrading:
+
+- Consul API Gateway should be running version v0.3.0.
+
+### Procedure
+
+1. Complete the [standard upgrade](#standard-upgrade).
+
+1. After completing the upgrade, complete the [post-upgrade configuration changes](#v0.4.0-post-upgrade-configuration-changes). The post-upgrade procedure describes how to replace your `ReferencePolicy` resources with `ReferenceGrant` resources and how to upgrade your `GatewayClass`, `Gateway`, and `HTTPRoute` resources from v1alpha2 to v1beta1.
+
+<a name="v0.4.0-post-upgrade-configuration-changes"/>
+
+### Post-upgrade configuration changes
+Complete the following steps after performing standard upgrade procedure.
+#### Requirements
+
+- Consul API Gateway should be running version v0.4.0.
+- Consul Helm chart should be v0.47.0 or later.
+- You should have the ability to run `kubectl` CLI commands.
+- `kubectl` should be configured to point to the cluster containing the installation you are upgrading.
+- You should have the following permissions for your Kubernetes cluster:
+  - `Gateway.read`
+  - `ReferenceGrant.create` (Added in Consul Helm chart v0.47.0)
+  - `ReferencePolicy.delete`
+
+#### Procedure
+
+1. Verify the current version of the `consul-api-gateway-controller` `Deployment`:
+
+  ```shell-session
+  $ kubectl get deployment --namespace consul consul-api-gateway-controller --output=jsonpath="{@.spec.template.spec.containers[?(@.name=='api-gateway-controller')].image}"
+  ```
+
+  You should receive a response similar to the following:
+
+  ```log
+  "hashicorp/consul-api-gateway:0.4.0"
+  ```
+
+  <a name="referencegrant"/>
+
+1. Issue the following command to get all `ReferencePolicy` resources across all namespaces.
+
+  ```shell-session
+  $ kubectl get referencepolicy --all-namespaces
+  ```
+If you have any active `ReferencePolicy` resources, you will receive output similar to the response below.
+
+  ```log
+  Warning: ReferencePolicy has been renamed to ReferenceGrant. ReferencePolicy will be removed in v0.6.0 in favor of the identical ReferenceGrant resource.
+  NAMESPACE   NAME
+  default     example-reference-policy
+  ```
+
+  If your output is empty, upgrade your `GatewayClass`, `Gateway` and `HTTPRoute` resources to v1beta1 as described in [step 7](#v1beta1-gatewayclass-gateway-httproute).
+
+1. For each `ReferencePolicy` in the source YAML files, change the `kind` field to `ReferenceGrant`. You can optionally update the `metadata.name` field or filename if they include the term "policy". In the following example, the `kind` and `metadata.name` fields and filename have been changed to reflect the new resource. Note that updating the `kind` field prevents you from using the `kubectl edit` command to edit the remote state directly.
+
+  <CodeBlockConfig hideClipboard filename="referencegrant.yaml">
+
+  ```yaml
+  apiVersion: gateway.networking.k8s.io/v1alpha2
+  kind: ReferenceGrant
+  metadata:
+    name: reference-grant
+    namespace: web-namespace
+  spec:
+    from:
+    - group: gateway.networking.k8s.io
+      kind: HTTPRoute
+      namespace: example-namesapce
+    to:
+    - group: ""
+      kind: Service
+      name: web-backend
+  ```
+
+  </CodeBlockConfig>
+
+1. For each file, apply the updated YAML to your cluster to create a new `ReferenceGrant` resource.
+
+  ```shell-session
+  $ kubectl apply --filename <file>
+  ```
+
+1. Check to confirm that each new `ReferenceGrant` was created successfully.
+
+  ```shell-session
+  $ kubectl get referencegrant <name> --namespace <namespace>
+  NAME
+  example-reference-grant
+  ```
+
+1. Finally, delete each corresponding old `ReferencePolicy` resource. Because replacement `ReferenceGrant` resources have already been created, there should be no interruption in the availability of any referenced `Service` or `Secret`.
+
+  ```shell-session
+  $ kubectl delete referencepolicy <name> --namespace <namespace>
+  Warning: ReferencePolicy has been renamed to ReferenceGrant. ReferencePolicy will be removed in v0.6.0 in favor of the identical ReferenceGrant resource.
+  referencepolicy.gateway.networking.k8s.io "example-reference-policy" deleted
+  ```
+
+  <a name="v1beta1-gatewayclass-gateway-httproute"/>
+
+1. For each `GatewayClass`, `Gateway`, and `HTTPRoute` in the source YAML, update the `apiVersion` field to `gateway.networking.k8s.io/v1beta1`. Note that updating the `apiVersion` field prevents you from using the `kubectl edit` command to edit the remote state directly.
+
+  <CodeBlockConfig hideClipboard>
+
+  ```yaml
+  apiVersion: gateway.networking.k8s.io/v1beta1
+  kind: Gateway
+  metadata:
+    name: example-gateway
+    namespace: gateway-namespace
+  spec:
+    ...
+  ```
+
+  </CodeBlockConfig>
+
+1. For each file, apply the updated YAML to your cluster to update the existing `GatewayClass`, `Gateway` or `HTTPRoute` resources.
+
+  ```shell-session
+  $ kubectl apply --filename <file>
+  gateway.gateway.networking.k8s.io/example-gateway configured
+  ```
+
+<!--
+1. Deploy [kube-storage-version-migrator](https://github.com/kubernetes-sigs/kube-storage-version-migrator) to your cluster. following the steps in the [user guide](https://github.com/kubernetes-sigs/kube-storage-version-migrator/blob/master/USER_GUIDE.md#deploy-the-storage-version-migrator-in-your-cluster), but set the `REGISTRY` and `VERSION` environment variable explicitly when building the manifests with `REGISTRY=us.gcr.io/k8s-artifacts-prod/storage-migrator VERSION=v0.0.5 make local-manifests`.
+
+  > If you don't explicitly set the `REGISTRY` and `VERSION` env vars, `make local-manifests` will default to values for local development, causing an `ErrImagePull` error when deploying the `migrator` and `trigger` storage version migrator deployments.
+
+  Confirm that the `migrator` and `trigger` storage version migrator deployments are running.
+
+  ```shell-session
+  $ kubectl get deployment migrator --namespace kube-system
+  NAME       READY   UP-TO-DATE   AVAILABLE   AGE
+  migrator   1/1     1            1           1m
+  ```
+
+  ```shell-session
+  $ kubectl get deployment trigger --namespace kube-system
+  NAME       READY   UP-TO-DATE   AVAILABLE   AGE
+  trigger    1/1     1            1           1m
+  ```
+-->
+
+## Upgrade to v0.3.0 from v0.2.0 or lower
+
+Consul API Gateway v0.3.0 introduces a change for people upgrading from lower versions. Gateways with `listeners` with a `certificateRef` defined in a different namespace now require a [`ReferencePolicy`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferencePolicy) that explicitly allows `Gateways` from the gateway's namespace to use `certificateRef` in the `certificateRef`'s namespace.
+
+### Requirements
+
+Ensure that the following requirements are met prior to upgrading:
+
+- Consul API Gateway should be running version v0.2.1 or lower.
+- You should have the ability to run `kubectl` CLI commands.
+- `kubectl` should be configured to point to the cluster containing the installation you are upgrading.
+- You should have the following permission rights on your Kubernetes cluster:
+  - `Gateway.read`
+  - `ReferencePolicy.create`
+- (Optional) The [jq](https://stedolan.github.io/jq/download/) command line processor for JSON can be installed, which will ease gateway retrieval during the upgrade process.
+
+### Procedure
+
+
+1. Verify the current version of the `consul-api-gateway-controller` `Deployment`:
+
+  ```shell-session
+  $ kubectl get deployment --namespace consul consul-api-gateway-controller --output=jsonpath="{@.spec.template.spec.containers[?(@.name=='api-gateway-controller')].image}"
+  ```
+
+  You should receive a response similar to the following:
+
+  ```log
+  "hashicorp/consul-api-gateway:0.2.1"
+  ```
+
+1. Retrieve all gateways that have a `certificateRefs` in a different namespace. If you have installed the [`jq`](https://stedolan.github.io/jq/) utility, you can skip to [step 4](#jq-command-secrets). Otherwise, issue the following command to get all `Gateways` across all namespaces:
+
+  ```shell-session
+  $ kubectl get Gateway --output json --all-namespaces
+  ```
+
+  If you have any active `Gateways`, you will receive output similar to the following response. The output has been truncated to show only relevant fields:
+
+  ```yaml
+  apiVersion: gateway.networking.k8s.io/v1alpha2
+  kind: Gateway
+  metadata:
+    name: example-gateway
+    namespace: gateway-namespace
+  spec:
+    gatewayClassName: "consul-api-gateway"
+    listeners:
+      - name: https
+        port: 443
+        protocol: HTTPS
+        allowedRoutes:
+          namespaces:
+            from: All
+        tls:
+          certificateRefs:
+            - group: ""
+              kind: Secret
+              name: example-certificate
+              namespace: certificate-namespace
+  ```
+
+1. Inspect the `certificateRefs` entries for each of the routes.
+
+  If a `namespace` field is not defined in the `certificateRefs` or if the namespace matches the namespace of the parent `Gateway`, then no additional action is required for the `certificateRefs`. Otherwise, note the `namespace` field values for `certificateRefs` configurations with a `namespace` field that do not match the namespace of the parent `Gateway`. You must also note the `namespace` of the parent gateway. You will need these to create a `ReferencePolicy` that explicitly allows each cross-namespace certificateRefs-to-gateway pair. (see [step 5](#create-secret-reference-policy)).
+
+  After completing this step, you will have a list of all secrets similar to the following:
+
+  <CodeBlockConfig hideClipboard>
+
+  ```yaml hideClipboard
+    example-certificate:
+      - namespace: certificate-namespace
+        parentNamespace: gateway-namespace
+  ```
+
+  </CodeBlockConfig>
+
+  Proceed with the [standard-upgrade](#standard-upgrade) if your list is empty.
+
+  <a name="jq-command-secrets"/>
+
+1. If you have installed [`jq`](https://stedolan.github.io/jq/), issue the following command to get all `Gateways` and filter for secrets that require a `ReferencePolicy`.
+
+  ```shell-session
+
+  $ kubectl get Gateway -o json -A | jq -r '.items[] | {gateway_name: .metadata.name, gateway_namespace: .metadata.namespace, kind: .kind, crossNamespaceSecrets: ( .metadata.namespace as $parentnamespace | .spec.listeners[] | select(has("tls")) | .tls.certificateRefs[] | select(.namespace != null and .namespace != $parentnamespace )  )} '
+
+  ```
+
+  The output will resemble the following response if gateways that require a new `ReferencePolicy` are returned:
+
+  <CodeBlockConfig hideClipboard>
+
+  ```log hideClipboard
+  {
+    "gateway_name": "example-gateway",
+    "gateway_namespace": "gateway-namespace",
+    "kind": "Gateway",
+    "crossNamespaceSecrets": {
+      "group": "",
+      "kind": "Secret",
+      "name": "cexample-certificate",
+      "namespace": "certificate-namespace"
+    }
+  }
+  ```
+
+  </CodeBlockConfig>
+
+  If your output is empty, proceed with the [standard-upgrade](#standard-upgrade).
+<a name="create-secret-reference-policy"/>
+
+1. Using the list of secrets you created earlier as a guide, create a [`ReferencePolicy`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferencePolicy) to allow each gateway cross namespace secret access.
+  The `ReferencePolicy` explicitly allows each cross-namespace gateway to secret pair. The `ReferencePolicy` must be created in the same `namespace` as the `certificateRefs`.
+
+  Skip to the next step if you've already created a `ReferencePolicy`.
+  <!---
+  TODO: add link to our docs on Cross Namespace Reference Policies, once we have written then, and tell the user to see them for more details on how to create these policies.
+  --->
+  The following example `ReferencePolicy` enables `example-gateway` in `gateway-namespace` to utilize `certificateRefs` in the `certificate-namespace` namespace:
+
+  <CodeBlockConfig filename="referencepolicy.yaml">
+
+  ```yaml
+  apiVersion: gateway.networking.k8s.io/v1alpha2
+  kind: ReferencePolicy
+  metadata:
+    name: reference-policy
+    namespace: certificate-namespace
+  spec:
+    from:
+      - group: gateway.networking.k8s.io
+        kind: Gateway
+        namespace: gateway-namespace
+    to:
+      - group: ""
+        kind: Secret
+  ```
+
+  </CodeBlockConfig>
+
+1. If you have already created a `ReferencePolicy`, modify it to allow your gateway to access your `certificateRef` and save it as `referencepolicy.yaml`. Note that each `ReferencePolicy` only supports one `to` field and one `from` field (refer the [`ReferencePolicy`](https://gateway-api.sigs.k8s.io/v1alpha2/api-types/referencepolicy/#api-design-decisions) documentation). As a result, you may need to create multiple `ReferencePolicy`s.
+
+1. Issue the following command to apply it to your cluster:
+
+  ```shell-session
+  $ kubectl apply --filename referencepolicy.yaml
+  ```
+
+  Repeat this step as needed until each of your cross-namespace `certificateRefs` have a corresponding `ReferencePolicy`.
+
+  Proceed with the [standard-upgrade](#standard-upgrade).
+
+## Upgrade to v0.2.0
+
+Consul API Gateway v0.2.0 introduces a change for people upgrading from Consul API Gateway v0.1.0. Routes with a `backendRef` defined in a different namespace now require a [`ReferencePolicy`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferencePolicy) that explicitly allows traffic from the route's namespace to the `backendRef`'s namespace.
+
+### Requirements
+
+Ensure that the following requirements are met prior to upgrading:
+
+- Consul API Gateway should be running version v0.1.0.
+- You should have the ability to run `kubectl` CLI commands.
+- `kubectl` should be configured to point to the cluster containing the installation you are upgrading.
+- You should have the following permission rights on your Kubernetes cluster:
+  - `HTTPRoute.read`
+  - `TCPRoute.read`
+  - `ReferencePolicy.create`
+- (Optional) The [jq](https://stedolan.github.io/jq/download/) command line processor for JSON can be installed, which will ease route retrieval during the upgrade process.
+
+### Procedure
+
+1. Verify the current version of the `consul-api-gateway-controller` `Deployment`:
+
+  ```shell-session
+  $ kubectl get deployment --namespace consul consul-api-gateway-controller --output=jsonpath= "{@.spec.template.spec.containers[?(@.name=='api-gateway-controller')].image}"
+  ```
+
+  You should receive the following response:
+
+  ```log
+  "hashicorp/consul-api-gateway:0.1.0"
+  ```
+
+1. Retrieve all routes that have a backend in a different namespace. If you have installed the [`jq`](https://stedolan.github.io/jq/) utility, you can skip to [step 4](#jq-command). Otherwise, issue the following command to get all `HTTPRoutes` and `TCPRoutes` across all namespaces:
+
+  ```shell-session
+  $ kubectl get HTTPRoute,TCPRoute --output json --all-namespaces
+  ```
+
+  Note that the command only retrieves `HTTPRoutes` and `TCPRoutes`. `TLSRoutes` and `UDPRoutes` are not supported in v0.1.0.
+
+  If you have any active `HTTPRoutes` or `TCPRoutes`, you will receive output similar to the following response. The output has been truncated to show only relevant fields:
+
+  ```yaml
+    apiVersion: v1
+    items:
+    - apiVersion: gateway.networking.k8s.io/v1alpha2
+      kind: HTTPRoute
+      metadata:
+        name: example-http-route,
+        namespace: example-namespace,
+        ...
+      spec:
+        parentRefs:
+        - group: gateway.networking.k8s.io
+          kind: Gateway
+          name: gateway
+          namespace: gw-ns
+        rules:
+        - backendRefs:
+          - group: ""
+            kind: Service
+            name: web-backend
+            namespace: gateway-namespace
+            ...
+          ...
+    - apiVersion: gateway.networking.k8s.io/v1alpha2
+      kind: TCPRoute
+      metadata:
+        name: example-tcp-route,
+        namespace: a-different-namespace,
+        ...
+      spec:
+        parentRefs:
+        - group: gateway.networking.k8s.io
+          kind: Gateway
+          name: gateway
+          namespace: gateway-namespace
+        rules:
+        - backendRefs:
+          - group: ""
+            kind: Service
+            name: web-backend
+            namespace: gateway-namespace
+            ...
+      ...
+  ```
+
+1. Inspect the `backendRefs` entries for each of the routes.
+
+  If a `namespace` field is not defined in the `backendRef` or if the namespace matches the namespace of the route, then no additional action is required for the `backendRef`. Otherwise, note the `group`, `kind`, `name`, and `namespace` field values for `backendRef` configurations that have a `namespace` defined that do not match the namespace of the parent route. You must also note the `kind` and `namespace` of the parent route. You will need these to create a `ReferencePolicy` that explicitly allows each cross-namespace route-to-service pair (see [step 5](#create-reference-policy)).
+
+  After completing this step, you will have a list of all routes similar to the following:
+
+  <CodeBlockConfig hideClipboard>
+
+  ```yaml hideClipboard
+    example-http-route:
+      - namespace: example-namespace
+        kind: HTTPRoute
+        backendReferences:
+          - group : ""
+            kind: Service
+            name: web-backend
+            namespace: gateway-namespace
+
+    example-tcp-route:
+      - namespace: a-different-namespace
+        kind: HTTPRoute
+        backendReferences:
+          - group : ""
+            kind: Service
+            name: web-backend
+            namespace: gateway-namespace
+  ```
+
+  </CodeBlockConfig>
+
+  Proceed with [standard-upgrade](#standard-upgrade) if your list is empty.
+<a name="jq-command"/>
+
+1. If you have installed [`jq`](https://stedolan.github.io/jq/), issue the following command to get all `HTTPRoutes` and `TCPRoutes` and filter for routes that require a `ReferencePolicy`.
+
+  ```shell-session
+  $ kubectl get HTTPRoute,TCPRoute -o json -A | jq -r '.items[] | {name: .metadata.name, namespace: .metadata.namespace, kind: .kind, crossNamespaceBackendReferences: ( .metadata.namespace as $parentnamespace | .spec.rules[] .backendRefs[] | select(.namespace != null and .namespace != $parentnamespace )  )} '
+  ```
+
+  Note that the command retrieves all `HTTPRoutes` and `TCPRoutes`. `TLSRoutes` and `UDPRoutes` are not supported in v0.1.0.
+
+  The output will resemble the following response if routes that require a new `ReferencePolicy` are returned:
+
+  <CodeBlockConfig hideClipboard>
+
+  ```log hideClipboard
+  {
+    "name": "example-http-route",
+    "namespace": "example-namespace",
+    "kind": "HTTPRoute",
+    "crossNamespaceBackendReferences": {
+      "group": "",
+      "kind": "Service",
+      "name": "web-backend",
+      "namespace": "gateway-namespace",
+      "port": 8080,
+      "weight": 1
+    }
+  }
+  {
+    "name": "example-tcp-route",
+    "namespace": "a-different-namespace",
+    "kind": "TCPRoute",
+    "crossNamespaceBackendReferences": {
+      "group": "",
+      "kind": "Service",
+      "name": "web-backend",
+      "namespace": "gateway-namespace",
+      "port": 8080,
+      "weight": 1
+    }
+  }
+  ```
+
+  </CodeBlockConfig>
+
+  If your output is empty, proceed with the [standard-upgrade](#standard-upgrade).
+<a name="create-reference-policy"/>
+
+1. Using the list of routes you created earlier as a guide, create a [`ReferencePolicy`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferencePolicy) to allow cross namespace traffic for each route service pair.
+  The `ReferencePolicy` explicitly allows each cross-namespace route to service pair. The `ReferencePolicy` must be created in the same `namespace` as the backend `Service`.
+
+  Skip to the next step if you've already created a `ReferencePolicy`.
+  <!---
+  TODO: add link to our docs on Cross Namespace Reference Policies, once we have written then, and tell the user to see them for more details on how to create these policies.
+  --->
+  The following example `ReferencePolicy` enables `HTTPRoute` traffic from the `example-namespace` to Kubernetes Services in the `web-backend` namespace:
+
+  <CodeBlockConfig filename="referencepolicy.yaml">
+
+  ```yaml
+  apiVersion: gateway.networking.k8s.io/v1alpha2
+  kind: ReferencePolicy
+  metadata:
+    name: reference-policy
+    namespace: gateway-namespace
+  spec:
+    from:
+      - group: gateway.networking.k8s.io
+        kind: HTTPRoute
+        namespace: example-namespace
+    to:
+      - group: ""
+        kind: Service
+        name: web-backend
+  ```
+
+  </CodeBlockConfig>
+
+1. If you have already created a `ReferencePolicy`, modify it to allow your route and save it as `referencepolicy.yaml`. Note that each `ReferencePolicy` only supports one `to` field and one `from` field (refer the [`ReferencePolicy`](https://gateway-api.sigs.k8s.io/v1alpha2/api-types/referencepolicy/#api-design-decisions) documentation). As a result, you may need to create multiple `ReferencePolicy`s.
+
+1. Issue the following command to apply it to your cluster:
+
+  ```shell-session
+  $ kubectl apply --filename referencepolicy.yaml
+  ```
+
+  Repeat this step as needed until each of your cross-namespace routes have a corresponding `ReferencePolicy`.
+
+  Proceed with the [standard-upgrade](#standard-upgrade).
+
+
+## Standard Upgrade
+
+~> **Note:** When you see `VERSION` in examples of commands or configuration settings, replace `VERSION` with the version number of the release you are installing, like `0.2.0`. If there is a lower case "v" in front of `VERSION` the version number needs to follow the "v" as is `v0.2.0`
+
+### Requirements
+
+Ensure that the following requirements are met prior to upgrading:
+
+- You should have the ability to run `kubectl` CLI commands.
+- `kubectl` should be configured to point to the cluster containing the installation you are upgrading.
+
+
+### Procedure
+
+This is the upgrade path to use when there are no version specific steps to take.
+
+<a name="standard-upgrade"/>
+
+1. Issue the following command to install the new version of CRDs into your cluster:
+
+  ``` shell-session
+  $ kubectl apply --kustomize="github.com/hashicorp/consul-api-gateway/config/crd?ref=vVERSION"
+  ```
+
+1. Update `apiGateway.image` in `values.yaml`:
+
+  <CodeBlockConfig hideClipboard filename="values.yaml">
+
+  ```yaml
+  ...
+  apiGateway:
+    image: hashicorp/consul-api-gateway:VERSION
+    ...
+  ```
+
+  </CodeBlockConfig>
+
+1. Issue the following command to upgrade your Consul installation:
+
+  ```shell-session
+  $ helm upgrade --values values.yaml --namespace consul --version <NEW_VERSION> <DEPLOYMENT_NAME> hashicorp/consul
+  ```
+
+  Note that the upgrade will cause the Consul API Gateway controller shut down and restart with the new version.
+
+1. According to the Kubernetes Gateway API specification, [Gateway Class](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io%2fv1alpha2.GatewayClass) configurations should only be applied to a gateway upon creation. To see the effects on preexisting gateways after upgrading your CRD installation, delete and recreate any gateways by issuing the following commands:
+
+  ```shell-session
+  $ kubectl delete --filename <path_to_gateway_config.yaml>
+  $ kubectl create --filename <path_to_gateway_config.yaml>
+  ```
+  <!---
+  remove this warning once updating a gateway triggers reconciliation on child routes
+  --->
+
+1. (Optional) Delete and recreate your routes. Note that it may take several minutes for attached routes to reconcile and start reporting bind errors.
+
+  ```shell-session
+  $ kubectl delete --filename <path_to_route_config.yaml>
+  $ kubectl create --filename <path_to_route_config.yaml>
+  ```
+
+### Post-Upgrade Configuration Changes
+
+No additional configuration changes are required for this upgrade.
diff --git a/website/content/docs/connect/gateways/api-gateway/errors.mdx b/website/content/docs/api-gateway/usage/errors.mdx
similarity index 76%
rename from website/content/docs/connect/gateways/api-gateway/errors.mdx
rename to website/content/docs/api-gateway/usage/errors.mdx
index 96ed7364fe6e8..c873c55812db1 100644
--- a/website/content/docs/connect/gateways/api-gateway/errors.mdx
+++ b/website/content/docs/api-gateway/usage/errors.mdx
@@ -57,19 +57,4 @@ Consul API Gateway generates this error when the required CRD files have not bee
 The installation process typically fails after this error message is generated.
 
 **Resolution:**
-Install the required CRDs. Refer to the [Consul API Gateway installation instructions](/consul/docs/connect/gateways/api-gateway/deploy/install-k8s) for instructions.
-
-## Operation cannot be fulfilled, the object has been modified
-
-```
-{"error": "Operation cannot be fulfilled on gatewayclassconfigs.consul.hashicorp.com \"consul-api-gateway\": the object has been modified; please apply your changes to the latest version and try again"}
-
-```
-**Conditions:**
-This error occurs when the gateway controller attempts to update an object that has been modified previously. It is a normal part of running the controller and will resolve itself by automatically retrying.
-
-**Impact:**
-Excessive error logs are produced, but there is no impact to the functionality of the controller.
-
-**Resolution:**
-No action needs to be taken to resolve this issue.
+Install the required CRDs. Refer to the [Consul API Gateway installation instructions](/consul/docs/api-gateway/install#installation) for instructions.
diff --git a/website/content/docs/api-gateway/usage/reroute-http-requests.mdx b/website/content/docs/api-gateway/usage/reroute-http-requests.mdx
new file mode 100644
index 0000000000000..62d55a5c5a610
--- /dev/null
+++ b/website/content/docs/api-gateway/usage/reroute-http-requests.mdx
@@ -0,0 +1,58 @@
+---
+layout: docs
+page_title: Reroute HTTP Requests
+description: >-
+  Learn how to configure Consul API Gateway to reroute HTTP requests to a specific path. 
+---
+
+# Reroute HTTP Requests
+
+This topic describes how to configure Consul API Gateway to reroute HTTP requests. 
+
+## Requirements
+
+1. Verify that the [requirements](/consul/docs/api-gateway/tech-specs) have been met.
+1. Verify that the Consul API Gateway CRDs and controller have been installed and applied. Refer to [Installation](/consul/docs/api-gateway/install) for details.
+
+## Configuration
+
+Specify the following fields in your `Route` configuration. Refer to the [Route configuration reference](/consul/docs/api-gateway/configuration/routes) for details about the parameters.
+
+- [`rules.filters.type`](/consul/docs/api-gateway/configuration/routes#rules-filters-type): Set this parameter to `URLRewrite` to instruct Consul API Gateway to rewrite the URL when specific conditions are met. 
+- [`rules.filters.urlRewrite`](/consul/docs/api-gateway/configuration/routes#rules-filters-urlrewrite): Specify the `path` configuration.
+- [`rules.filters.urlRewrite.path`](/consul/docs/api-gateway/configuration/routes#rules-filters-urlrewrite-path): Contains the paths that incoming requests should be rewritten to based on the match conditions.  
+
+To configure the route to accept paths with or without a trailing slash, you must make two separate routes to handle each case.
+
+### Example
+
+In the following example, requests to` /incoming-request-prefix/` are forwarded to the `backendRef` as `/prefix-backend-receives/`. As a result, requests to `/incoming-request-prefix/request-path` are received by `backendRef` as `/prefix-backend-receives/request-path`.
+
+<CodeBlockConfig filename="route.yaml">
+
+```yaml hideClipboard
+apiVersion: gateway.networking.k8s.io/v1beta1
+kind: HTTPRoute
+metadata:
+ name: example-route
+ ##...
+spec:
+ parentRefs:
+   - group: gateway.networking.k8s.io
+     kind: Gateway
+     name: api-gateway
+ rules:
+   - backendRefs:
+     . . .
+     filters:
+       - type: URLRewrite
+         urlRewrite:
+           path:
+             replacePrefixMatch: /prefix-backend-receives/
+             type: ReplacePrefixMatch
+     matches:
+       - path:
+           type: PathPrefix
+           value: /incoming–request-prefix/
+```
+</CodeBlockConfig>
\ No newline at end of file
diff --git a/website/content/docs/api-gateway/usage/route-to-peered-services.mdx b/website/content/docs/api-gateway/usage/route-to-peered-services.mdx
new file mode 100644
index 0000000000000..509247623974d
--- /dev/null
+++ b/website/content/docs/api-gateway/usage/route-to-peered-services.mdx
@@ -0,0 +1,76 @@
+---
+page_title: Route Traffic to Peered Services
+description: Learn how to configure Consul API Gateway to route traffic to services connected to the mesh through a peering connection.
+---
+
+# Route Traffic to Peered Services
+
+This topic describes how to configure Consul API Gateway to route traffic to services connected to the mesh through a cluster peering connection.
+
+## Requirements
+
+1. Consul 1.14 or later
+1. Verify that the [requirements](/consul/docs/api-gateway/tech-specs) have been met.
+1. Verify that the Consul API Gateway CRDs and controller have been installed and applied. Refer to [Installation](/consul/docs/api-gateway/install) for details.
+1. A peering connection must already be established between Consul clusters. Refer to [Cluster Peering on Kubernetes](/consul/docs/k8s/connect/cluster-peering/tech-specs) for instructions.
+1. The Consul service that you want to route traffic to must be exported to the cluster containing your `Gateway`. Refer to [Cluster Peering on Kubernetes](/consul/docs/k8s/connect/cluster-peering/tech-specs) for instructions.
+1. A `ServiceResolver` for the Consul service you want to route traffic to must be created in the cluster that contains your `Gateway`. Refer to [Service Resolver Configuration Entry](/consul/docs/connect/config-entries/service-resolver) for instructions.
+
+## Configuration
+
+Specify the following fields in your `MeshService` configuration to use this feature. Refer to the [MeshService configuration reference](/consul/docs/api-gateway/configuration/meshservice) for details about the parameters.
+
+- [`name`](/consul/docs/api-gateway/configuration/meshservice#name)
+- [`peer`](/consul/docs/api-gateway/configuration/meshservice#peer)
+
+## Example
+
+In the following example, routes that use `example-mesh-service` as a backend are configured to send requests to the `echo` service exported by the peered Consul cluster `cluster-02`.
+
+<CodeBlockConfig filename="serviceresolver.yaml">
+
+```yaml hideClipboard
+apiVersion: consul.hashicorp.com/v1alpha1
+kind: ServiceResolver
+metadata:
+  name: echo
+spec:
+  redirect:
+    peer: cluster-02
+    service: echo
+```
+</CodeBlockConfig>
+
+<CodeBlockConfig filename="meshservice.yaml">
+
+```yaml hideClipboard
+apiVersion: api-gateway.consul.hashicorp.com/v1alpha1
+kind: MeshService
+metadata:
+  name: example-mesh-service
+spec:
+  name: echo
+  peer: cluster-02
+```
+</CodeBlockConfig>
+
+After applying the `meshservice.yaml` configuration, an `HTTPRoute` may then reference `example-mesh-service` as its `backendRef`.
+
+<CodeBlockConfig filename="route.yaml">
+
+```yaml hideClipboard
+apiVersion: gateway.networking.k8s.io/v1beta1
+kind: HTTPRoute
+metadata:
+  name: example-route
+spec:
+  ...
+  rules:
+    - backendRefs:
+        - group: api-gateway.consul.hashicorp.com
+          kind: MeshService
+          name: example-mesh-service
+          port: 3000
+      ...
+```
+</CodeBlockConfig>
diff --git a/website/content/docs/api-gateway/usage/usage.mdx b/website/content/docs/api-gateway/usage/usage.mdx
new file mode 100644
index 0000000000000..b9b864ce234aa
--- /dev/null
+++ b/website/content/docs/api-gateway/usage/usage.mdx
@@ -0,0 +1,92 @@
+---
+layout: docs
+page_title: Deploy API Gateway for Kubernetes
+description: >-
+  Learn how to apply a configured Consul API Gateway to your Kubernetes cluster, review the required fields for rerouting HTTP requests, and troubleshoot an error message.
+---
+
+# Deploy API Gateway for Kubernetes
+
+This topic describes how to use Consul API Gateway.
+
+## Requirements
+
+Complete the following steps to use Consul API Gateway in your network.
+
+1. Verify that the [requirements](/consul/docs/api-gateway/tech-specs) have been met.
+1. Verify that the Consul API Gateway CRDs and controller have been installed and applied. Refer to [Installation](/consul/docs/api-gateway/install) for details.
+
+## Configuration
+
+Configure your [`Gateway`](/consul/docs/api-gateway/configuration/gateway) and [`Routes`](/consul/docs/api-gateway/configuration/routes) as described in [Consul API Gateway Configuration](/consul/docs/api-gateway/configuration).
+
+  <CodeBlockConfig hideClipboard filename="values.yaml">
+
+    ```yaml
+      apiGateway:
+        enabled: true
+        managedGatewayClass:
+    ```
+
+  </CodeBlockConfig>
+
+## Apply configurations
+
+Issue the `kubectl apply` command to implement the configurations:
+
+  ```shell-session
+    $ kubectl apply -f gateway.yaml routes.yaml
+  ```
+
+
+<!--- Commented out per https://github.com/hashicorp/consul/pull/11951/files#r791204596
+
+### Using the Consul API Gateway Binary
+
+You can download the Consul API Gateway binary and use it to manually start the control plane server.
+
+1. Download the binary from the [Consul API Gateway repository](https://github.com/hashicorp/consul-api-gateway).
+1. Navigate to the `consul-api-gateway-main` directory and build the binary:
+
+```shell-session
+$ go build
+```
+
+1.  (Optional) Copy the binary to the execution path, e.g.:
+
+```shell-session
+$ cp consul-api-gateway /usr/bin
+```
+
+1.  Use the `server` command to interact with the Consul API Gateway binary:
+
+```shell-session
+$ ./consul-api-gateway server <options>
+```
+
+The following options are supported:
+
+| Option                 | Description                                                                                                                                                                           | Required | Default                                                                 |
+| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ----------------------------------------------------------------------- |
+| `-ca-file`             | String value that specifies the path to the CA for the Consul server.                                                                                                                 | Required | none                                                                    |
+| `-ca-secret`           | String value that specifies the CA secret for the Consul server.                                                                                                                      | Required | none                                                                    |
+| `-ca-secret-namespace` | String value that specifies the CA secret namespace for the Consul server.                                                                                                            | Required | none                                                                    |
+| `-k8-context`          | String value that specifies the Kubernetes context to use when starting the Consul server.                                                                                            | Optional | current context                                                         |
+| `-k8-namespace`        | String value that specifies the Kubernetes namespace to use when starting the Consul server.                                                                                          | Optional | `default`                                                               |
+| `-log-json`            | Boolean value that enables or disables JSON format for the log output.                                                                                                                | Required | `false`                                                                 |
+| `-log-level`           | String value that specifies the logging level. The following values are supported: <br/>- `trace` (highest level of detail) <br/>- `debug` <br/>- `info` <br/>- `warn` <br/>- `error` | Optional | `info`                                                                  |
+| `-metrics-port`        | Integer value that specifies the port number for collecting metrics.                                                                                                                  | Optional | none                                                                    |
+| `-pprof`               | Integer value that specifies the Go pprof port number for collecting metrics.                                                                                                         | Optional | none                                                                    |
+| `-sds-server-host`     | String value that specifies the host server for the secret discovery service (SDS).                                                                                                   | Optional | `consul-api-gateway-controller.default.`<br/>`svc.cluster.`<br/>`local` |
+| `-sds-server-host`     | Integer value that specifies the port number for the secret discovery service (SDS).                                                                                                  | Optional | `9090`                                                                  |
+
+You can also issue the `version` command to print the Consul API Gateway version to the console:
+
+```shell-session
+$ ./consul-api-gateway version
+consul-api-gateway 0.1.0
+```
+--->
+
+
+
diff --git a/website/content/docs/architecture/anti-entropy.mdx b/website/content/docs/architecture/anti-entropy.mdx
index 292f5c0070d5d..39d2a08156cc2 100644
--- a/website/content/docs/architecture/anti-entropy.mdx
+++ b/website/content/docs/architecture/anti-entropy.mdx
@@ -117,7 +117,7 @@ the source of truth for tag information. For example, the Redis
 database and its monitoring service Redis Sentinel have this kind of
 relationship. Redis instances are responsible for much of their
 configuration, but Sentinels determine whether the Redis instance is a
-primary or a secondary. Enable the
+primary or a secondary. Enable the 
 [`enable_tag_override`](/consul/docs/services/configuration/services-configuration-reference#enable_tag_override) parameter in your service definition file to tell the Consul agent where the Redis database is running to bypass
-tags during anti-entropy synchronization. Refer to
-[Modify anti-entropy synchronization](/consul/docs/services/usage/define-services#modify-anti-entropy-synchronization) for additional information.
+tags during anti-entropy synchronization. Refer to 
+[Modify anti-entropy synchronozation](/consul/docs/services/usage/define-services#modify-anti-entropy-synchronization) for additional information.
diff --git a/website/content/docs/architecture/scale.mdx b/website/content/docs/architecture/scale.mdx
index ba03f23c666db..1cf31162da862 100644
--- a/website/content/docs/architecture/scale.mdx
+++ b/website/content/docs/architecture/scale.mdx
@@ -1,7 +1,7 @@
 ---
 layout: docs
 page_title: Recommendations for operating Consul at scale
-description: >-
+description: >-  
   When using Consul for large scale deployments, you can ensure network resilience by tailoring your network to your needs. Learn more about HashiCorp's recommendations for deploying Consul at scale.
 ---
 
@@ -57,7 +57,7 @@ If appropriate for your use case, we recommend breaking up a single Consul datac
 
 Be aware that the number 5,000 is a heuristic for deployments. The number of agents you deploy per datacenter is limited by performance, not Consul itself. Because gossip stability risk is determined by _the rate of agent churn_ rather than _the number of nodes_, a gossip pool with mostly static nodes may be able to operate effectively with more than 5,000 agents. Meanwhile, a gossip pool with highly dynamic agents, such as spot fleet instances and serverless functions where 10% of agents are replaced each day, may need to be smaller than 5,000 agents.
 
-For additional information about the specific tests we conducted on Consul deployments at scale in order to generate these recommendations, refer to [Consul Scale Test Report to Observe Gossip Stability](https://www.hashicorp.com/blog/consul-scale-test-report-to-observe-gossip-stability) on the HashiCorp blog.
+For additional information about the specifc tests we conducted on Consul deployments at scale in order to generate these recommendations, refer to [Consul Scale Test Report to Observe Gossip Stability](https://www.hashicorp.com/blog/consul-scale-test-report-to-observe-gossip-stability) on the HashiCorp blog.
 
 For most use cases, a limit of 5,000 agents is appropriate. When the `consul.serf.queue.Intent` metric is consistently high, it is an indication that the gossip pool cannot keep up with the sustained level of churn. In this situation, reduce the churn by lowering the number agents per datacenter.
 
@@ -175,13 +175,13 @@ Refer to [Consul agent telemetry](/consul/docs/agent/telemetry#bolt-db-performan
 
 #### Raft database size
 
-Raft writes logs to BoltDB, which is designed as a single grow-only file. As a result, if you add 1GB of log entries and then you take a snapshot, only a small number of recent log entries may appear in the file. However, the actual file on disk never shrinks smaller than the 1GB size it grew.
+Raft writes logs to BoltDB, which is designed as a single grow-only file. As a result, if you add 1GB of log entries and then you take a snapshot, only a small number of recent log entries may appear in the file. However, the actual file on disk never shrinks smaller than the 1GB size it grew.  
 
 If you need to reclaim disk space, use the `bbolt` CLI to copy the data to a new database and repoint to the new database in the process. However, be aware that the `bbolt compact` command requires the database to be offline while being pointed to the new database.
 
 In many cases, including in large clusters, disk space is not a primary concern because Raft logs rarely grow larger than a small number of GiB. However, an inflated file with lots of free space significantly degrades write performance overall due to _freelist management_.
 
-After they are written to disk, Raft logs are eventually captured in a snapshot and log nodes are removed from BoltDB. BoltDB keeps track of the pages for the removed nodes in its freelist. BoltDB also writes this freelist to disk every time there is a Raft write. When the Raft log grows large quickly and then gets truncated, the size of the freelist can become very large. In the worst case reported to us, the freelist was over 10MB. When this large freelist is written to disk on every Raft commit, the result is a large write amplification for what should be a small Raft commit.
+After they are written to disk, Raft logs are eventually captured in a snapshot and log nodes are removed from BoltDB. BoltDB keeps track of the pages for the removed nodes in its freelist. BoltDB also writes this freelist to disk every time there is a Raft write. When the Raft log grows large quickly and then gets truncated, the size of the freelist can become very large. In the worst case reported to us, the freelist was over 10MB. When this large freelist is written to disk on every Raft commit, the result is a large write amplification for what should be a small Raft commit.  
 
 To figure out if a Consul server’s disk performance issues are the result of BoldDB’s freelist, try the following strategies:
 
@@ -208,7 +208,7 @@ For example, if snapshot A on the leader has an index of 99 and the current inde
 
 When the leader takes snapshot B at index 199, it truncates the logs that accumulated between snapshot A and snapshot B, which means it truncates Raft logs with indexes between 100 and 199.
 
-Because the new server restored snapshot A, the new server has a current index of 99. It requests logs 100 to 150 because index 150 was the current index when it started the replication restore process. At this point, the leader recognizes that it only has logs 200 and higher, and does not have logs for indexes 100 to 150. The leader determines that the new server’s state is stale and starts the process over by sending the new server the latest snapshot, snapshot B.
+Because the new server restored snapshot A, the new server has a current index of 99. It requests logs 100 to 150 because index 150 was the current index when it started the replication restore process. At this point, the leader recognizes that it only has logs 200 and higher, and does not have logs for indexes 100 to 150. The leader determines that the new server’s state is stale and starts the process over by sending the new server the latest snapshot, snapshot B.  
 
 Consul keeps a configurable number of [Raft trailing logs](/consul/docs/agent/config/config-files#raft_trailing_logs) to prevent the snapshot install loop from repeating. The trailing logs are the last logs that went into the snapshot, and the new server can more easily catch up to the current state using these logs. The default Raft trailing logs configuration value is suitable for most deployments.
 
diff --git a/website/content/docs/concepts/service-mesh.mdx b/website/content/docs/concepts/service-mesh.mdx
index 947984484e45c..2e793f2441c86 100644
--- a/website/content/docs/concepts/service-mesh.mdx
+++ b/website/content/docs/concepts/service-mesh.mdx
@@ -53,13 +53,13 @@ The API gateway will route the incoming requests to the respective service. The
 
 A service mesh specializes in the network management of services and the communication between services.
 The mesh is responsible for keeping track of services and their health status, IP address, and traffic routing and ensuring all traffic between services is authenticated and encrypted.
-Unlike some API gateways, a service mesh will track all registered services' lifecycle and ensure requests are routed to healthy instances of the service.
+Unlike API gateways, a service mesh will track all registered services' lifecycle and ensure requests are routed to healthy instances of the service.
 API gateways are frequently deployed alongside a load balancer to ensure traffic is directed to healthy and available instances of the service.
 The mesh reduces the load balancer footprint as routing responsibilities are handled in a decentralized manner.
 
 API gateways can be used with a service mesh to bridge external networks (non-mesh) with a service mesh.
 
--> **API gateways and traffic direction:** API gateways are often used to accept north-south traffic. North-south traffic is networking traffic that either enters or exits a datacenter or a virtual private network (VPC). You can connect API gateways to a service mesh and provide access to it from outside the mesh.
+-> **API gateways and traffic direction:** API gateways are often used to accept north-south traffic. North-south traffic is networking traffic that either enters or exits a data center or a virtual private network (VPC).
 A service mesh is primarily used for handling east-west traffic. East-west traffic traditionally remains inside a data center or a VPC.
 A service mesh can be connected to another service mesh in another data center or VPC to form a federated mesh.
 
diff --git a/website/content/docs/connect/ca/consul.mdx b/website/content/docs/connect/ca/consul.mdx
index 870bea4fe4349..8d36c001211ff 100644
--- a/website/content/docs/connect/ca/consul.mdx
+++ b/website/content/docs/connect/ca/consul.mdx
@@ -100,13 +100,13 @@ In order to use the Update CA Configuration HTTP endpoint, the private key and c
 must be passed via JSON:
 
 ```shell-session
-$ jq --null-input --rawfile key root.key --rawfile cert root.crt '
+$ jq --null-input --arg key "$(cat root.key)" --arg cert "$(cat root.crt)" '
 {
     "Provider": "consul",
     "Config": {
         "LeafCertTTL": "72h",
-        "PrivateKey": $key | sub("\\n$"; ""),
-        "RootCert": $cert | sub("\\n$"; ""),
+        "PrivateKey": $key,
+        "RootCert": $cert,
         "IntermediateCertTTL": "8760h"
     }
 }' > ca_config.json
diff --git a/website/content/docs/connect/ca/index.mdx b/website/content/docs/connect/ca/index.mdx
index c49e07516fae6..13cc56c72d35d 100644
--- a/website/content/docs/connect/ca/index.mdx
+++ b/website/content/docs/connect/ca/index.mdx
@@ -21,7 +21,7 @@ support for using
 [Vault as a CA](/consul/docs/connect/ca/vault). With Vault, the root certificate
 and private key material remain with the Vault cluster.
 
-## CA and Certificate relationship
+### CA and Certificate relationship
 
 This diagram shows the relationship between the CA certificates in a Consul primary datacenter and a
 secondary Consul datacenter.
@@ -34,22 +34,9 @@ services.
 - the Leaf Cert Client Agent is created by auto-encrypt and auto-config. It is used by
 client agents for HTTP API TLS, and for mTLS for RPC requests to servers.
 
-Any secondary datacenters use their CA provider to generate an intermediate certificate
-signing request (CSR) to be signed by the primary root CA. They receive an intermediate
-CA certificate, which is used to sign leaf certificates in the secondary datacenter.
-
-You can use different providers across primary and secondary datacenters.
-For example, an operator may use a Vault CA provider for extra security in the primary
-datacenter but choose to use the built-in CA provider in the secondary datacenter, which
-may not have a reachable Vault cluster. The following table compares the built-in and Vault providers.
-
-## CA Provider Comparison
-
-|            | Consul built-in                    | Vault                                                                             |
-|------------|------------------------------------|-----------------------------------------------------------------------------------|
-| Security   | CA private keys are stored on disk | CA private keys are stored in Vault and are never exposed to Consul server agents |
-| Resiliency | No dependency on external systems. If Consul is available, it can sign certificates | Dependent on Vault availability  |
-| Latency    | Consul signs certificates locally  | A network call to Vault is required to sign certificates                          |
+Any secondary datacenters receive an intermediate certificate, signed by the Primary Root
+CA, which is used as the CA certificate to sign leaf certificates in the secondary
+datacenter.
 
 ## CA Bootstrapping
 
diff --git a/website/content/docs/connect/ca/vault.mdx b/website/content/docs/connect/ca/vault.mdx
index a172a693a04da..9c9abf8724fc4 100644
--- a/website/content/docs/connect/ca/vault.mdx
+++ b/website/content/docs/connect/ca/vault.mdx
@@ -7,27 +7,19 @@ description: >-
 
 # Vault as a Service Mesh Certificate Authority
 
-You can configure Consul to use [Vault](/vault) as the certificate authority (CA) so that Vault can manage and sign certificates distributed to services in the mesh.
-The Vault CA provider uses the [Vault PKI secrets engine](/vault/docs/secrets/pki) to generate and sign certificates.
+You can configure Consul to use [Vault](https://www.vaultproject.io/) as the certificate authority (CA) so that Vault can manage and sign certificates distributed to services in the mesh. 
+The Vault CA provider uses the [Vault PKI secrets engine](/vault/docs/secrets/pki) to generate and sign certificates. 
 This page describes how configure the Vault CA provider.
 
 > **Tutorial:** Complete the [Vault as Consul Service Mesh Certification Authority](/consul/tutorials/vault-secure/vault-pki-consul-connect-ca) tutorial for hands-on guidance on how to configure Vault as the Consul service mesh certification authority.
 
 ## Requirements
 
-- Vault 0.10.3 or higher
-
-~> **Compatibility note:** If you use Vault 1.11.0+ as Consul's service mesh CA, versions of Consul released before Dec 13, 2022 will develop an issue with Consul control plane or service mesh communication ([GH-15525](https://github.com/hashicorp/consul/pull/15525)). Use or upgrade to a [Consul version that includes the fix](https://support.hashicorp.com/hc/en-us/articles/11308460105491#01GMC24E6PPGXMRX8DMT4HZYTW) to avoid this problem.
-
-## Recommendations
-
 - Refer to [Service Mesh Certificate Authority Overview](/consul/docs/connect/ca) for important background information about how Consul manages certificates with configurable CA providers.
 
-- For best performance and resiliency, every datacenter should have a Vault cluster local to its Consul cluster.
+- Vault 0.10.3 to 1.10.x.
 
-- If your Consul datacenters are WAN-federated and the secondary datacenter uses Vault Enterprise
-  [performance secondaries](/vault/docs/enterprise/replication#performance-replication), we recommend
-  configuring [`local`](/vault/docs/enterprise/replication#local) mounts for their [`intermediate_pki_path`](/consul/docs/connect/ca/vault#intermediatepkipath).
+~> **Compatibility note:** If you use Vault 1.11.0+ as Consul's service mesh CA, versions of Consul released before Dec 13, 2022 will develop an issue with Consul control plane or service mesh communication ([GH-15525](https://github.com/hashicorp/consul/pull/15525)). Use or upgrade to a [Consul version that includes the fix](https://support.hashicorp.com/hc/en-us/articles/11308460105491#01GMC24E6PPGXMRX8DMT4HZYTW) to avoid this problem.
 
 ## Enable Vault as the CA
 
@@ -36,7 +28,7 @@ and including the required provider configuration options.
 You can provide the CA configuration in the server agents' configuration file
 or in the body of a `PUT` request to the
 [`/connect/ca/configuration`](/consul/api-docs/connect/ca#update-ca-configuration) API endpoint.
-Refer to the [Configuration Reference](#configuration-reference) for details about configuration options and for example use cases.
+Refer to the [Configuration Reference](#configuration-reference) for details about configuration options and for example use cases. 
 
 The following example shows the required configurations for a default implementation:
 
@@ -83,7 +75,7 @@ connect {
 You can specify the following configuration options.
 Note that a configuration option's name may differ between API calls and the agent configuration file.
 The first key refers to the option name for use in API calls.
-The key after the slash refers to the corresponding option name in the agent configuration file.
+The key after the slash refers to the corresponding option name in the agent configuration file. 
 
 - `Address` / `address` (`string: <required>`) - The address of the Vault
   server.
@@ -102,18 +94,20 @@ The key after the slash refers to the corresponding option name in the agent con
   on how to configure individual auth methods. If auth method is provided, Consul will obtain
   a new token from Vault when the token can no longer be renewed.
 
-   - `Type`/ `type` (`string: ""`) - The type of Vault auth method. Valid options are "approle", "aws", "azure", "gcp", "jwt" and "kubernetes".
+   - `Type`/ `type` (`string: ""`) - The type of Vault auth method.
 
    - `MountPath`/ `mount_path` (`string: <AuthMethod.Type>`) - The mount path of the auth method.
       If not provided the auth method type will be used as the mount path.
 
-   - `Params`/`params` (`map: nil`) - The parameters to configure the auth method. The required configuration parameters depend on which auth type you are using. Refer to the Vault Agent auto-auth method documentation for details on their configuration options: [AppRole](/vault/docs/agent-and-proxy/autoauth/methods/approle#configuration), [AWS](/vault/docs/agent-and-proxy/autoauth/methods/aws#configuration), [Azure](/vault/docs/agent-and-proxy/autoauth/methods/azure#configuration), [GCP](/vault/docs/agent-and-proxy/autoauth/methods/gcp#configuration), [JWT](/vault/docs/agent-and-proxy/autoauth/methods/jwt#configuration), [Kubernetes](/vault/docs/agent-and-proxy/autoauth/methods/kubernetes#configuration).
-
-   Only the authentication related fields (for example, JWT's `path` and `role`) are supported. The optional management fields (for example: `remove_jwt_after_reading`) are not supported.
+   - `Params`/`params` (`map: nil`) - The parameters to configure the auth method. Please see
+    [Vault Auth Methods](/vault/docs/auth) for information on how to configure the
+    auth method you wish to use. If using the Kubernetes auth method,
+    Consul will read the service account token from the
+    default mount path `/var/run/secrets/kubernetes.io/serviceaccount/token` if the `jwt` parameter
+    is not provided.
 
 - `RootPKIPath` / `root_pki_path` (`string: <required>`) - The path to
-  a PKI secrets engine for the root certificate. Required for primary
-  datacenters. Secondary datacenters do not use this path.
+  a PKI secrets engine for the root certificate.
 
   If the path does not
   exist, Consul will mount a new PKI secrets engine at the specified path with the
@@ -123,6 +117,9 @@ The key after the slash refers to the corresponding option name in the agent con
   the root certificate TTL was set to 8760 hour, or 1 year, and was not configurable.
   The root certificate will expire at the end of the specified period.
 
+  When WAN Federation is enabled, each secondary datacenter must use the same Vault cluster and share the same `root_pki_path`
+  with the primary datacenter.
+
   To use an intermediate certificate as the primary CA in Consul, initialize the
   `RootPKIPath` in Vault with a PEM bundle. The first certificate in the bundle
   must be the intermediate certificate that Consul will use as the primary CA.
@@ -139,10 +136,8 @@ The key after the slash refers to the corresponding option name in the agent con
   path does not exist, Consul will attempt to mount and configure this
   automatically.
 
-  When WAN federation is enabled, every secondary datacenter that shares a common Vault cluster
-  must specify a unique `intermediate_pki_path`. If a Vault cluster is not used by more than one Consul datacenter,
-  then you do not need to specify a unique value for the `intermediate_pki_path`. We still recommend using a
-  unique `intermediate_pki_path` for each datacenter, however, to improve operational and diagnostic clarity.
+  When WAN Federation is enabled, every secondary
+  datacenter must specify a unique `intermediate_pki_path`.
 
 - `IntermediatePKINamespace` / `intermediate_pki_namespace` (`string: <optional>`) - The absolute namespace
   that the `IntermediatePKIPath` is in. Setting this parameter overrides the `Namespace` option for the `IntermediatePKIPath`. Introduced in 1.12.3.
@@ -250,7 +245,7 @@ Then, attach the following Vault ACL policy to the CA provider's
   path "/<root_pki_path>/" {
     capabilities = [ "read" ]
   }
-
+  
   path "/<root_pki_path>/root/sign-intermediate" {
     capabilities = [ "update" ]
   }
@@ -276,7 +271,7 @@ Then, attach the following Vault ACL policy to the CA provider's
     capabilities = [ "read" ]
   }
   ```
-
+  
   </CodeBlockConfig>
 
 #### Define a policy for Consul-managed PKI paths ((#consul-managed-pki-paths))
@@ -337,7 +332,7 @@ Then, attach the following Vault ACL policy to the CA provider's
     capabilities = [ "read" ]
   }
   ```
-
+  
   </CodeBlockConfig>
 
 #### Additional Vault ACL policies for sensitive operations
@@ -348,7 +343,7 @@ following CA provider configuration changes:
 - Changing the `RootPKIPath`
 
 Those configuration modifications trigger a root CA change that requires an
-extremely privileged root cross-sign operation.
+extremely privileged root cross-sign operation. 
 For that operation to succeed, the CA provider's [Vault token](#token) or
 [auth method](#authmethod) must contain the following rule:
 
diff --git a/website/content/docs/connect/cluster-peering/index.mdx b/website/content/docs/connect/cluster-peering/index.mdx
index 864dadd418635..f69f093330ef1 100644
--- a/website/content/docs/connect/cluster-peering/index.mdx
+++ b/website/content/docs/connect/cluster-peering/index.mdx
@@ -2,7 +2,7 @@
 layout: docs
 page_title: Cluster Peering Overview
 description: >-
-  Cluster peering establishes communication between independent clusters in Consul, allowing services to interact across datacenters. Learn how cluster peering works, its differences with WAN federation for multi-datacenter deployments, and how to troubleshoot common issues.
+  Cluster peering establishes communication between independent clusters in Consul, allowing services to interact across datacenters. Learn how cluster peering works, its differences with WAN federation for multi-datacenter deployments, and how to troubleshoot common issues.  
 ---
 
 # Cluster peering overview
@@ -22,7 +22,7 @@ In this diagram, the `default` partition in Consul DC 1 has a cluster peering co
 
 Cluster peering leverages several components of Consul's architecture to enforce secure communication between services:
 
-- A _peering token_ contains an embedded secret that securely establishes communication when shared symmetrically between datacenters. Sharing this token enables each datacenter's server agents to recognize requests from authorized peers, similar to how the [gossip encryption key secures agent LAN gossip](/consul/docs/security/encryption#gossip-encryption).
+- A _peering token_ contains an embedded secret that securely establishes communication when shared symetrically between datacenters. Sharing this token enables each datacenter's server agents to recognize requests from authorized peers, similar to how the [gossip encryption key secures agent LAN gossip](/consul/docs/security/encryption#gossip-encryption).
 - A _mesh gateway_ encrypts outgoing traffic, decrypts incoming traffic, and directs traffic to healthy services. Consul's service mesh features must be enabled in order to use mesh gateways. Mesh gateways support the specific admin partitions they are deployed on. Refer to [Mesh gateways](/consul/docs/connect/gateways/mesh-gateway) for more information.
 - An _exported service_ communicates with downstreams deployed in other admin partitions. They are explicitly defined in an [`exported-services` configuration entry](/consul/docs/connect/config-entries/exported-services).
 - A _service intention_ secures [service-to-service communication in a service mesh](/consul/docs/connect/intentions). Intentions enable identity-based access between services by exchanging TLS certificates, which the service's sidecar proxy verifies upon each request.
@@ -41,7 +41,6 @@ Regardless of whether you connect your clusters through WAN federation or cluste
 | Shares support queries and service endpoints       |    &#9989;     |    &#9989;      |
 | Connects clusters owned by different operators     |    &#10060;    |    &#9989;      |
 | Functions without declaring primary datacenter     |    &#10060;    |    &#9989;      |
-| Can use sameness groups for identical services     |    &#10060;    |    &#9989;      |
 | Replicates exported services for service discovery |    &#10060;    |    &#9989;      |
 | Gossip protocol: Requires LAN gossip only          |    &#10060;    |    &#9989;      |
 | Forwards service requests for service discovery    |    &#9989;     |    &#10060;     |
@@ -54,14 +53,13 @@ The following resources are available to help you use Consul's cluster peering f
 
 ### Tutorials
 
-- To learn how to peer clusters and connect services across peers in AWS Elastic Kubernetes Service (EKS) and Google Kubernetes Engine (GKE) environments, complete the [Connect services between Consul datacenters with cluster peering tutorial](/consul/tutorials/developer-mesh/cluster-peering).
+- To learn how to peer clusters and connect services across peers in AWS Elastic Kubernetes Service (EKS) and Google Kubernetes Engine (GKE) environments, complete the [Consul Cluster Peering on Kubernetes tutorial](/consul/tutorials/developer-mesh/cluster-peering).
 
 ### Usage documentation
 
 - [Establish cluster peering connections](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering)
 - [Manage cluster peering connections](/consul/docs/connect/cluster-peering/usage/manage-connections)
 - [Manage L7 traffic with cluster peering](/consul/docs/connect/cluster-peering/usage/peering-traffic-management)
-- [Create sameness groups](/consul/docs/connect/cluster-peering/usage/create-sameness-groups)
 
 ### Kubernetes documentation
 
@@ -69,14 +67,13 @@ The following resources are available to help you use Consul's cluster peering f
 - [Establish cluster peering connections on Kubernetes](/consul/docs/k8s/connect/cluster-peering/usage/establish-peering)
 - [Manage cluster peering connections on Kubernetes](/consul/docs/k8s/connect/cluster-peering/usage/manage-peering)
 - [Manage L7 traffic with cluster peering on Kubernetes](/consul/docs/k8s/connect/cluster-peering/usage/l7-traffic)
-- [Create sameness groups on Kubernetes](/consul/docs/k8s/connect/cluster-peering/usage/create-sameness-groups)
 
 ### HCP Consul documentation
 
 - [Cluster peering](/hcp/docs/consul/usage/cluster-peering)
 - [Cluster peering topologies](/hcp/docs/consul/usage/cluster-peering/topologies)
-- [Establish cluster peering connections on HCP Consul](/hcp/docs/consul/usage/cluster-peering/create-connections)
-- [Cluster peering with HCP Consul Central](/hcp/docs/extend/cluster-peering/establish)
+- [Establish cluster peering connnections on HCP Consul](/hcp/docs/consul/usage/cluster-peering/create-connections)
+- [Cluster peering with management plane](/hcp/docs/consul/usage/management-plane#cluster-peering)
 
 ### Reference documentation
 
@@ -93,4 +90,4 @@ If you experience errors when using Consul's cluster peering features, refer to
 - Two admin partitions in the same datacenter cannot be peered. Use the [`exported-services` configuration entry](/consul/docs/connect/config-entries/exported-services#exporting-services-to-peered-clusters) instead.
 - To manage intentions that specify services in peered clusters, use [configuration entries](/consul/docs/connect/config-entries/service-intentions). The `consul intention` CLI command is not supported.
 - The Consul UI does not support exporting services between clusters or creating service intentions. Use either the API or the CLI to complete these required steps when establishing new cluster peering connections.
-- Accessing key/value stores across peers is not supported.
+- Accessing key/value stores across peers is not supported.
\ No newline at end of file
diff --git a/website/content/docs/connect/cluster-peering/tech-specs.mdx b/website/content/docs/connect/cluster-peering/tech-specs.mdx
index 36c7dc9d91308..929a25f924dcf 100644
--- a/website/content/docs/connect/cluster-peering/tech-specs.mdx
+++ b/website/content/docs/connect/cluster-peering/tech-specs.mdx
@@ -64,14 +64,14 @@ Refer to [mesh gateway modes](/consul/docs/connect/gateways/mesh-gateway#modes)
 
 The Envoy proxies that function as sidecars in your service mesh require configuration in order to properly route traffic to peers. Sidecar proxies are defined in the [service definition](/consul/docs/services/usage/define-services).
 
-- Configure the `proxy.upstreams` parameters to route traffic to the correct service, namespace, and peer. Refer to the [`upstreams`](/consul/docs/connect/proxies/proxy-config-reference#upstream-configuration-reference) documentation for details.
+- Configure the `proxy.upstreams` parameters to route traffic to the correct service, namespace, and peer. Refer to the [`upstreams`](/consul/docs/connect/registration/service-registration#upstream-configuration-reference) documentation for details.
 - The `proxy.upstreams.destination_name` parameter is always required.
 - The `proxy.upstreams.destination_peer` parameter must be configured to enable cross-cluster traffic.
 - The `proxy.upstream/destination_namespace` configuration is only necessary if the destination service is in a non-default namespace.
 
 ## Exported service specifications
 
-The `exported-services` configuration entry is required in order for services to communicate across partitions with cluster peering connections. Basic guidance on using the `exported-services` configuration entry is included in [Establish cluster peering connections](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering#export-services-between-clusters).
+The `exported-services` configuration entry is required in order for services to communicate across partitions with cluster peering connections. Basic guidance on using the `exported-services` configuration entry is included in [Establish cluster peering connections](/consul/docs/connect/cluster-peering/usage/establish-peering#export-services-between-clusters).
 
 Refer to the [`exported-services` configuration entry](/consul/docs/connect/config-entries/exported-services) reference for more information.
 
diff --git a/website/content/docs/connect/cluster-peering/usage/create-sameness-groups.mdx b/website/content/docs/connect/cluster-peering/usage/create-sameness-groups.mdx
deleted file mode 100644
index 49b8141777997..0000000000000
--- a/website/content/docs/connect/cluster-peering/usage/create-sameness-groups.mdx
+++ /dev/null
@@ -1,308 +0,0 @@
----
-page_title: Create sameness groups
-description: |-
-  Learn how to create sameness groups between partitions and cluster peers so that Consul can identify instances of the same service across partitions and datacenters.
----
-
-# Create sameness groups
-
-This topic describes how to create a sameness group, which designates a set of admin partitions as functionally identical in your network. Adding an admin partition to a sameness group enables Consul to recognize services registered to remote partitions with cluster peering connections as instances of the same service when they share a name and namespace.
-
-For information about configuring a failover strategy using sameness groups, refer to [Failover with sameness groups](/consul/docs/connect/manage-traffic/failover/sameness).
-
-## Workflow
-
-Sameness groups are a user-defined set of partitions with identical configurations, including configuration entries for service and proxy defaults. Partitions on separate clusters should have an established cluster peering connection in order to recognize each other.
-
-To create and use sameness groups in your network, complete the following steps:
-
-- **Create sameness group configuration entries for each member of the group**. For each partition that you want to include in the sameness group, you must write and apply a sameness group configuration entry that defines the group’s members from that partition’s perspective. Refer to the [sameness group configuration entry reference](/consul/docs/connect/config-entries/sameness-group) for details on configuration hierarchy, default values, and specifications.
-- **Export services to members of the sameness group**. You must write and apply an exported services configuration entry that makes the partition’s services available to other members of the group. Refer to [exported services configuration entry reference](/consul/docs/connect/config-entries/exported-services) for additional specification information.
-- **Create service intentions to authorize other members of the sameness group**. For each partition that you want to include in the sameness group, you must write and apply service intentions configuration entries to authorize traffic to your services from all members of the group. Refer to the [service intentions configuration entry reference](/consul/docs/connect/config-entries/service-intentions) for additional specification information.
-
-## Requirements
-
-- All datacenters where you want to create sameness groups must run Consul v1.16 or later. Refer to [upgrade instructions](/consul/docs/upgrading/instructions) for more information about how to upgrade your deployment.
-- A [Consul Enterprise license](/consul/docs/enterprise/license/overview) is required.
-
-### Before you begin
-
-Before creating a sameness group, take the following actions to prepare your network:
-
-#### Check namespace and service naming conventions
-
-Sameness groups are defined at the partition level. Consul assumes all partitions in the group have identical configurations, including identical service names and identical namespaces. This behavior occurs even when partitions in the group contain functionally different services that share a common name and namespace. For example, if distinct services named `api` were registered to different members of a sameness group, it could lead to errors because requests may be sent to the incorrect service.
-
-To prevent errors, check the names of the services deployed to your network and the namespaces they are deployed in. Pay particular attention to the default namespace to confirm that services have unique names. If different services share a name, you should either change one of the service’s names or deploy one of the services to a different namespace.
-
-#### Deploy mesh gateways for each partition
-
-Mesh gateways are required for cluster peering connections and recommended to secure cross-partition traffic in a single datacenter. Therefore, we recommend securing your network, and especially your production environment, by deploying mesh gateways to each datacenter. Refer to [mesh gateways specifications](/consul/docs/connect/cluster-peering/tech-specs#mesh-gateway-specifications) for more information about configuring mesh gateways.
-
-#### Establish cluster peering relationships between remote partitions
-
-You must establish connections with cluster peers before you can create a sameness group that includes them. A cluster peering connection exists between two admin partitions in different datacenters, and each connection between two partitions must be established separately with each peer. Refer to [establish cluster peering connections](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering) for step-by-step instructions.
-
-You can establish and manage cluster peering relationships between all of your self-managed clusters using [HCP Consul Central](/hcp/docs/consul/concepts/consul-central). For more information, refer to [cluster peering global view](/hcp/docs/consul/monitor/consul-central/global-views#cluster-peering) in the HCP documentation.
-
-To establish cluster peering connections and define a group as part of the same workflow, follow instructions up to [Export services between clusters](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering#export-services-between-clusters). You can use the same exported services and service intention configuration entries to establish the cluster peering connection and create the sameness group.
-
-## Create a sameness group
-
-To create a sameness group, you must write and apply a set of three configuration entries for each partition that is a member of the group:
-
-- Sameness group configuration entries: Defines the sameness group from each partition’s perspective.
-- Exported services configuration entries: Makes services available to other partitions in the group.
-- Service intentions configuration entries: Authorizes traffic between services across partitions.
-
-### Define the sameness group from each partition’s perspective
-
-To define a sameness group for a partition, create a [sameness group configuration entry](/consul/docs/connect/config-entries/sameness-group) that describes the partitions and cluster peers that are part of the group. Typically, the order follows this pattern:
-
-1. The local partition
-1. Other partitions in the same datacenter
-1. Partitions with established cluster peering relationships
-
-If you want all services to failover to other instances in the sameness group by default, set `DefaultForFailover=true` and list the group members in the order you want to use in a failover scenario. Refer to [failover with sameness groups](/consul/docs/connect/manage-traffic/failover/sameness) for more information.
-
-Be aware that the sameness group configuration entries are different for each partition. The following example demonstrates how to format three different configuration entries for three partitions that are part of the sameness group `product-group` when Partition 1 and Partition 2 are in DC1, and the third partition is Partition 1 in DC2:
-
-<CodeTabs tabs={[ "dc1-partition-1", "dc1-partition-2", "dc2-partition-1" ]}>
-
-<CodeBlockConfig filename="product-group.hcl" hideClipboard lineNumbers highlight="3,6-8">
-
-```hcl
-Kind                     = "sameness-group"  
-Name                   = "product-group"
-Partition                = "partition-1" 
-Members                = [
-      {Partition = "partition-1"},
-      {Partition = "partition-2"},
-      {Peer      = "dc2-partition-1"}
-      ]
-```
-
-</CodeBlockConfig>
-
-<CodeBlockConfig filename="product-group.hcl" hideClipboard lineNumbers highlight="3,6-8">
-
-```hcl
-Kind                     = "sameness-group"  
-Name                   = "product-group"
-Partition                = "partition-2" 
-Members                = [
-      {Partition = "partition-2"},
-      {Partition = "partition-1"},
-      {Peer      = "dc2-partition-1"}
-      ]
-```
-
-</CodeBlockConfig>
-
-<CodeBlockConfig filename="product-group.hcl" hideClipboard lineNumbers highlight="3,6-8">
-
-```hcl
-Kind                     = "sameness-group"  
-Name                   = "product-group"
-Partition                = "partition-1" 
-Members                = [
-      {Partition = "partition-1"},
-      {Peer = "dc1-partition-1"},
-      {Peer = "dc1-partition-2"}
-      ]
-```
-
-</CodeBlockConfig>
-
-</CodeTabs>
-
-After you create the configuration entry, apply it to the Consul server with the following CLI command:
-
-```shell-session
-$ consul config write product-group.hcl
-```
-
-Then, repeat the process to create and apply a configuration entry for every partition that is a member of the sameness group.
-
-### Export services to other partitions in the sameness group
-
-To make services available to other members of the sameness group, you must write and apply an [exported services configuration entry](/consul/docs/connect/config-entries/exported-services) to each partition in the group. This configuration entry exports the local partition's services to the rest of the group members. In each configuration entry, set the sameness group as the `Consumer` for the exported services. You can export multiple services in a single exported services configuration entry.
-
-Because you are configuring the consumer to reference the sameness group instead of listing out each partition and cluster peer, you do not need to edit this configuration again when you add a partition or peer to the group.
-
-The following example demonstrates how to format three different `exported-service` configuration entries to make a service named `api` deployed to the `store` namespace of each partition available to all other group members:
-
-<CodeTabs tabs={[ "dc1-partition-1", "dc1-partition-2", "dc2-partition-1" ]}>
-
-<CodeBlockConfig hideClipboard lineNumbers highlight="3,8-9">
-
-```hcl
-Kind                     = "exported-services"  
-Name                   = "product-sg-export"
-Partition                = "partition-1" 
-Services = [
-  {
-    Name = "api"
-    Namespace = "store"
-    Consumers = [
-        {SamenessGroup="product-group"}
-      ]
-    }
- ]
-```
-
-</CodeBlockConfig>
-
-<CodeBlockConfig hideClipboard lineNumbers highlight="3,8-9">
-
-```hcl
-Kind                     = "exported-services"  
-Name                   = "product-sg-export"
-Partition                = "partition-2" 
-Services = [
-  {
-    Name = "api"
-    Namespace = "store"
-    Consumers = [
-        {SamenessGroup="product-group"}
-      ]
-    }
- ]
-```
-
-</CodeBlockConfig>
-
-<CodeBlockConfig hideClipboard lineNumbers highlight="3,8-9">
-
-```hcl
-Kind                     = "exported-services"  
-Name                   = "product-sg-export"
-Partition                = "partition-1" 
-Services = [
-  {
-    Name = "api"
-    Namespace = "store"
-    Consumers = [
-        {SamenessGroup="product-group"}
-      ]
-    }
- ]
-```
-
-</CodeBlockConfig>
-
-</CodeTabs>
-
-For more information about exporting services, including examples of configuration entries that export multiple services at the same time, refer to the [exported services configuration entry reference](/consul/docs/connect/config-entries/exported-services).
-
-After you create each exported services configuration entry, apply it to the Consul server with the following CLI command:
-
-```shell-session
-$ consul config write product-sg-export.hcl
-```
-
-#### Export services for cluster peers and sameness groups as part of the same workflow
-
-Creating a cluster peering connection between two partitions and then adding the partitions to a sameness group requires that you write and apply two separate exported services configuration entries. One configuration entry exports services to the peer, and a second entry exports services to other members of the group.
-
-If your goal for peering clusters is to create a sameness group, you can write and apply a single exported services configuration entry by configuring the `Services[].Consumers` block with the `SamenessGroup` field instead of the `Peer` field.
-
-Be aware that this scenario requires you to write the `sameness-group` configuration entry to Consul before you apply the `exported-services` configuration entry that references the sameness group.
-
-### Create service intentions to authorize traffic between group members
-
-Exporting the service to other members of the sameness group makes the services visible to remote partitions, but you must also create service intentions so that local services are authorized to send and receive traffic from a member of the sameness group.
-
-For each partition that is member of the group, write and apply a [service intentions configuration entry](/consul/docs/connect/config-entries/service-intentions) that defines intentions for the services that are part of the group. In the `Sources` block of the configuration entry, include the service name, its namespace, the sameness group, and grant `allow` permissions.
-
-Because you are using the sameness group in the `Sources` block rather than listing out each partition and cluster peer, you do not have to make further edits to the service intentions configuration entries when members are added to or removed from the group.
-
-The following example demonstrates how to format three different `service-intentions` configuration entries to make a service named `api` available to all instances of `payments` deployed in all members of the sameness group including the local partition. In this example, `api` is deployed to the `store` namespace in all three partitions.
-
-<CodeTabs tabs={[ "dc1-partition-1", "dc1-partition-2", "dc2-partition-1" ]}>
-
-<CodeBlockConfig hideClipboard lineNumbers highlight="3-4,6-11">
-
-
-```hcl
-Kind      = "service-intentions"
-Name      = "api-intentions"
-Namespace = "store"
-Partition = "partition-1"
-Sources   = [
-  {
-    Name          = "api"
-    Action        = "allow"
-    Namespace     = "store"
-    SamenessGroup = "product-group"
-  }
-]
-```
-
-</CodeBlockConfig>
-
-<CodeBlockConfig hideClipboard lineNumbers highlight="3-4,6-11">
-
-```hcl
-Kind      = "service-intentions"
-Name      = "api-intentions"
-Namespace = "store"
-Partition = "partition-2"
-Sources   = [
-  {
-    Name          = "api"
-    Action        = "allow"
-    Namespace     = "store"
-    SamenessGroup = "product-group"
-  }
-]
-```
-
-</CodeBlockConfig>
-
-<CodeBlockConfig hideClipboard lineNumbers highlight="3-4,6-11">
-
-```hcl
-Kind      = "service-intentions"
-Name      = "api-intentions"
-Namespace = "store"
-Partition = "partition-1"
-Sources   = [
-  {
-    Name          = "api"
-    Action        = "allow"
-    Namespace     = "store"
-    SamenessGroup = "product-group"
-  }
-]
-```
-
-</CodeBlockConfig>
-
-</CodeTabs>
-
-Refer to [create and manage intentions](/consul/docs/connect/intentions/create-manage-intentions) for more information about how to create and apply service intentions in Consul.
-
-After you create each service intentions configuration entry, apply it to the Consul server with the following CLI command:
-
-```shell-session
-$ consul config write api-intentions.hcl
-```
-
-#### Create service intentions for cluster peers and sameness groups as part of the same workflow
-
-Creating a cluster peering connection between two remote partitions and then adding the partitions to a sameness group requires that you write and apply two separate service intention configuration entries. One configuration entry authorizes services to the peer, and a second entry authorizes services to other members of the group.
-
-If you are peering clusters with the goal of creating a sameness group, it is possible to combine these workflows by using a single service intentions configuration entry.
-
-Configure the `Sources` block with the `SamenessGroup` field instead of the `Peer` field. Be aware that this scenario requires you to write the `sameness-group` configuration entry to Consul before you apply the `service-intentions` configuration entry that references the sameness group.
-
-## Next steps
-
-When `DefaultForFailover=true` in a sameness group configuration entry, additional upstream configuration is not required. 
-
-After creating a sameness group, you can use them with static Consul DNS lookups and dynamic DNS lookups (prepared queries) for service discovery use cases. You can also set up failover between services in a sameness group. Refer to the following topics for more details:
-
-- [Static Consul DNS lookups](/consul/docs/services/discovery/dns-static-lookups)
-- [Dynamic Consul DNS lookups](/consul/docs/services/discovery/dns-dynamic-lookups)
-- [Failover overview](/consul/docs/connect/manage-traffic/failover)
diff --git a/website/content/docs/connect/cluster-peering/usage/establish-cluster-peering.mdx b/website/content/docs/connect/cluster-peering/usage/establish-cluster-peering.mdx
index 96e7815d75d93..b8549c5c3fbe1 100644
--- a/website/content/docs/connect/cluster-peering/usage/establish-cluster-peering.mdx
+++ b/website/content/docs/connect/cluster-peering/usage/establish-cluster-peering.mdx
@@ -14,7 +14,7 @@ This page details the process for establishing a cluster peering connection betw
 1. Export services between clusters.
 1. Create intentions to authorize services for peers.
 
-Cluster peering between services cannot be established until all four steps are complete. If you want to establish cluster peering connections and create sameness groups at the same time, refer to the guidance in [create sameness groups](/consul/docs/connect/cluster-peering/usage/create-sameness-groups).
+Cluster peering between services cannot be established until all four steps are complete.
 
 For Kubernetes guidance, refer to [Establish cluster peering connections on Kubernetes](/consul/docs/k8s/connect/cluster-peering/usage/establish-peering). For HCP Consul guidance, refer to [Establish cluster peering connections on HCP Consul](/hcp/docs/consul/usage/cluster-peering/create-connections).
 
diff --git a/website/content/docs/connect/cluster-peering/usage/peering-traffic-management.mdx b/website/content/docs/connect/cluster-peering/usage/peering-traffic-management.mdx
index 63942e5bdeefd..240b56dc9742d 100644
--- a/website/content/docs/connect/cluster-peering/usage/peering-traffic-management.mdx
+++ b/website/content/docs/connect/cluster-peering/usage/peering-traffic-management.mdx
@@ -13,7 +13,7 @@ For Kubernetes-specific guidance for managing L7 traffic with cluster peering, r
 
 ## Service resolvers for redirects and failover
 
-When you use cluster peering to connect datacenters through their admin partitions, you can use [dynamic traffic management](/consul/docs/connect/manage-traffic) to configure your service mesh so that services automatically forward traffic to services hosted on peer clusters.
+When you use cluster peering to connect datacenters through their admin partitions, you can use [dynamic traffic management](/consul/docs/connect/l7-traffic) to configure your service mesh so that services automatically forward traffic to services hosted on peer clusters.
 
 However, the `service-splitter` and `service-router` configuration entry kinds do not natively support directly targeting a service instance hosted on a peer. Before you can split or route traffic to a service on a peer, you must define the service hosted on the peer as an upstream service by configuring a failover in the `service-resolver` configuration entry. Then, you can set up a redirect in a second service resolver to interact with the peer service by name.
 
diff --git a/website/content/docs/connect/config-entries/api-gateway.mdx b/website/content/docs/connect/config-entries/api-gateway.mdx
deleted file mode 100644
index 5f5b40902639a..0000000000000
--- a/website/content/docs/connect/config-entries/api-gateway.mdx
+++ /dev/null
@@ -1,562 +0,0 @@
----
-layout: docs
-page_title: API Gateway Configuration Entry Reference
-description: Learn how to configure a Consul API gateway on VMs.
----
-
-# API gateway configuration entry reference
-
-This topic provides reference information for the API gateway configuration entry that you can deploy to networks in virtual machine (VM) environments. For reference information about configuring Consul API gateways on Kubernetes, refer to [Gateway Resource Configuration](/consul/docs/connect/gateways/api-gateway/configuration/gateway).
-
-## Introduction
-
-A gateway is a type of network infrastructure that determines how service traffic should be handled. Gateways contain one or more listeners that bind to a set of hosts and ports. An HTTP Route or TCP Route can then attach to a gateway listener to direct traffic from the gateway to a service.
-
-## Configuration model
-
-The following list outlines field hierarchy, language-specific data types, and requirements in an `api-gateway` configuration entry. Click on a property name to view additional details, including default values.
-
-- [`Kind`](#kind): string | must be `"api-gateway"`
-- [`Name`](#name): string | no default
-- [`Namespace`](#namespace): string | no default <EnterpriseAlert inline />
-- [`Partition`](#partition): string | no default <EnterpriseAlert inline />
-- [`Meta`](#meta): map | no default
-- [`Listeners`](#listeners): list of objects | no default
-  - [`Name`](#listeners-name): string | no default
-  - [`Port`](#listeners-port): number | no default
-  - [`Hostname`](#listeners-hostname): string | `"*"`
-  - [`Protocol`](#listeners-protocol): string | `"tcp"`
-  - [`TLS`](#listeners-tls): map | none
-    - [`MinVersion`](#listeners-tls-minversion): string | no default
-    - [`MaxVersion`](#listeners-tls-maxversion): string | no default
-    - [`CipherSuites`](#listeners-tls-ciphersuites): list of strings | Envoy default cipher suites
-    - [`Certificates`](#listeners-tls-certificates): list of objects | no default
-      - [`Kind`](#listeners-tls-certificates-kind): string | must be `"inline-certificate"`
-      - [`Name`](#listeners-tls-certificates-name): string | no default
-      - [`Namespace`](#listeners-tls-certificates-namespace): string | no default <EnterpriseAlert inline />
-      - [`Partition`](#listeners-tls-certificates-partition): string | no default <EnterpriseAlert inline />
-  - [`default`](#listeners-default): map
-    - [`JWT`](#listeners-default-jwt): map 
-      - [`Providers`](#listeners-default-jwt-providers): list
-        - [`Name`](#listeners-default-jwt-providers): string
-          - [`VerifyClaims`](#listeners-default-jwt-providers): map
-              - [`Path`](#listeners-default-jwt-providers): list
-              - [`Value`](#listeners-default-jwt-providers): string
-  - [`override`](#listeners-override): map
-    - [`JWT`](#listeners-override-jwt): map 
-      - [`Providers`](#listeners-override-jwt-providers): list
-        - [`Name`](#listeners-override-jwt-providers): string
-          - [`VerifyClaims`](#listeners-override-jwt-providers): map
-            - [`Path`](#listeners-override-jwt-providers): list
-            - [`Value`](#listeners-override-jwt-providers): string
-
-
-
-## Complete configuration
-
-When every field is defined, an `api-gateway` configuration entry has the following form:
-
-<CodeTabs>
-
-```hcl
-Kind = "api-gateway"
-Name = "<name of api gateway>"
-Namespace = "<enterprise: namespace of the gateway>"
-Partition = "<enterprise: partition of the gateway>"
-
-Meta = {
-  <any key> = "<any value>"
-}
-
-Listeners = [
-  {
-    Port = <external service port>
-    Name = "<unique name for this listener>"
-    Protocol = "<protocol used by external service>"
-    TLS = {
-      MaxVersion = "<version of TLS>"
-      MinVersion = "<version of TLS>"
-      CipherSuites = [
-        "<cipher suite>"
-      ]
-      Certificates = [
-        {
-          Kind = "inline-certificate"
-          Name = "<name of inline-certificate>"
-          Namespace = "<enterprise: namespace of the certificate>"
-          Partition = "<enterprise: partition of the certificate>"
-        }
-      ]
-    }
-    default = {
-     JWT = {
-      Providers = [
-        Name = "<provider>"
-        VerifyClaims = {
-          Path = ["<path to claim>"]
-          Value = "<value of claim>"
-        }
-      ]
-     } 
-    }
-    override = {
-     JWT = {
-      Providers = [
-        Name = "<provider>"
-        VerifyClaims = {
-          Path = ["<path to claim>"]
-          Value = "<value of claim>"
-        }
-      ]
-     } 
-    }
-  }
-]
-```
-
-```json
-{
-  "Kind": "api-gateway",
-  "Name": "<name of api gateway>",
-  "Namespace": "<enterprise: namespace of the gateway>",
-  "Partition": "<enterprise: partition of the gateway>",
-  "Meta": {
-    "<any key>": "<any value>"
-  },
-  "Listeners": [
-    {
-      "Name": "<unique name for this listener>",
-      "Port": <external service port>,
-      "Protocol": "<protocol used by external service>",
-      "TLS": {
-        "MaxVersion": "<version of TLS>",
-        "MinVersion": "<version of TLS>",
-        "CipherSuites": [
-          "<cipher suite>"
-        ],
-        "Certificates": [
-          {
-            "Kind": "inline-certificate",
-            "Name": "<name of inline-certificate>",
-            "Namespace": "<enterprise: namespace of the certificate>",
-            "Partition": "<enterprise: partition of the certificate>"
-          }
-        ]
-      }
-    },
-    {
-      "default": {
-        "JWT": {
-          "Providers": [
-            {
-              "Name": "<name of provider>",
-              "VerifyClaims": {
-                "Path": ["<path to claim>"],
-                "Value": "<value of the claim>"
-              }
-            }
-          ]
-        }
-      }
-    },
-    {
-      "override": {
-        "JWT": {
-          "Providers": [
-            {
-              "Name": "<name of provider>",
-              "VerifyClaims": {
-                "Path": ["<path to claim>"],
-                "Value": "<value of the claim>"
-              }
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
-```
-
-</CodeTabs>
-
-## Specification
-
-This section provides details about the fields you can configure in the
-`api-gateway` configuration entry.
-
-### `Kind`
-
-Specifies the type of configuration entry to implement. This must be
-`api-gateway`.
-
-#### Values
-
-- Default: none
-- This field is required.
-- Data type: string value that must be set to `"api-gateway"`.
-
-### `Name`
-
-Specifies a name for the configuration entry. The name is metadata that you can
-use to reference the configuration entry when performing Consul operations,
-such as applying a configuration entry to a specific cluster.
-
-#### Values
-
-- Default: none
-- This field is required.
-- Data type: string
-
-### `Namespace` <EnterpriseAlert inline />
-
-Specifies the Enterprise [namespace](/consul/docs/enterprise/namespaces) to apply to the configuration entry.
-
-#### Values
-
-- Default: `"default"` in Enterprise
-- Data type: string
-
-### `Partition` <EnterpriseAlert inline />
-
-Specifies the Enterprise [admin partition](/consul/docs/enterprise/admin-partitions) to apply to the configuration entry.
-
-#### Values
-
-- Default: `"default"` in Enterprise
-- Data type: string
-
-### `Meta`
-
-Specifies an arbitrary set of key-value pairs to associate with the gateway.
-
-#### Values
-
-- Default: none
-- Data type: map containing one or more keys and string values.
-
-### `Listeners[]`
-
-Specifies a list of listeners that gateway should set up. Listeners are
-uniquely identified by their port number.
-
-#### Values
-
-- Default: none
-- This field is required.
-- Data type: List of maps. Each member of the list contains the following fields:
-  - [`Name`](#listeners-name)
-  - [`Port`](#listeners-port)
-  - [`Hostname`](#listeners-hostname)
-  - [`Protocol`](#listeners-protocol)
-  - [`TLS`](#listeners-tls)
-
-### `Listeners[].Name`
-
-Specifies the unique name for the listener. This field accepts letters, numbers, and hyphens.
-
-#### Values
-
-- Default: none
-- This field is required.
-- Data type: string
-
-### `Listeners[].Port`
-
-Specifies the port number that the listener receives traffic on.
-
-#### Values
-
-- Default: `0`
-- This field is required.
-- Data type: integer
-
-### `Listeners[].Hostname`
-
-Specifies the hostname that the listener receives traffic on.
-
-#### Values
-
-- Default: `"*"`
-- This field is optional.
-- Data type: string
-
-### `Listeners[].Protocol`
-
-Specifies the protocol associated with the listener.
-
-#### Values
-
-- Default: none
-- This field is required.
-- The data type is one of the following string values: `"tcp"` or `"http"`.
-
-### `Listeners[].TLS`
-
-Specifies the TLS configurations for the listener.
-
-#### Values
-
-- Default: none
-- Map that contains the following fields:
-  - [`MaxVersion`](#listeners-tls-maxversion)
-  - [`MinVersion`](#listeners-tls-minversion)
-  - [`CipherSuites`](#listeners-tls-ciphersuites)
-  - [`Certificates`](#listeners-tls-certificates)
-
-### `Listeners[].TLS.MaxVersion`
-
-Specifies the maximum TLS version supported for the listener.
-
-#### Values
-
-- Default depends on the version of Envoy:
-  - Envoy 1.22.0 and later default to `TLSv1_2`
-  - Older versions of Envoy default to `TLSv1_0`
-- Data type is one of the following string values:
-  - `TLS_AUTO`
-  - `TLSv1_0`
-  - `TLSv1_1`
-  - `TLSv1_2`
-  - `TLSv1_3`
-
-### `Listeners[].TLS.MinVersion`
-
-Specifies the minimum TLS version supported for the listener.
-
-#### Values
-
-- Default: none
-- Data type is one of the following string values:
-  - `TLS_AUTO`
-  - `TLSv1_0`
-  - `TLSv1_1`
-  - `TLSv1_2`
-  - `TLSv1_3`
-
-### `Listeners[].TLS.CipherSuites[]`
-
-Specifies a list of cipher suites that the listener supports when negotiating connections using TLS 1.2 or older.
-
-#### Values
-
-- Defaults to the ciphers supported by the version of Envoy in use. Refer to the
-  [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/transport_sockets/tls/v3/common.proto#envoy-v3-api-field-extensions-transport-sockets-tls-v3-tlsparameters-cipher-suites)
-  for details.
-- Data type: List of string values. Refer to the
-  [Consul repository](https://github.com/hashicorp/consul/blob/v1.11.2/types/tls.go#L154-L169)
-  for a list of supported ciphers.
-
-### `Listeners[].TLS.Certificates[]`
-
-The list of references to inline certificates that the listener uses for TLS termination.
-
-#### Values
-
-- Default: None
-- Data type: List of maps. Each member of the list has the following fields:
-  - [`Kind`](#listeners-tls-certificates-kind)
-  - [`Name`](#listeners-tls-certificates-name)
-  - [`Namespace`](#listeners-tls-certificates-namespace) <EnterpriseAlert inline />
-  - [`Partition`](#listeners-tls-certificates-partition) <EnterpriseAlert inline />
-
-### `Listeners[].TLS.Certificates[].Kind`
-
-The list of references to inline-certificates that the listener uses for TLS termination.
-
-#### Values
-
-- Default: None
-- This field is required and must be set to `"inline-certificate"`.
-- Data type: string
-
-### `Listeners[].TLS.Certificates[].Name`
-
-The list of references to inline certificates that the listener uses for TLS termination.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: string
-
-### `Listeners[].TLS.Certificates[].Namespace` <EnterpriseAlert inline />
-
-Specifies the Enterprise [namespace](/consul/docs/enterprise/namespaces) where the certificate can be found.
-
-#### Values
-
-- Default: `"default"` in Enterprise
-- Data type: string
-
-### `Listeners[].TLS.Certificates[].Partition` <EnterpriseAlert inline />
-
-Specifies the Enterprise [admin partition](/consul/docs/enterprise/admin-partitions) where the certificate can be found.
-
-#### Values
-
-- Default: `"default"` in Enterprise
-- Data type: string
-
-### `Listeners[].default`
-
-Specifies a block of default configurations to apply to the gateway listener. All routes attached to the listener inherit the default configurations. You can specify override configurations that have precedence over default configurations in the [`override` block](#listeners-override) as well as in the `JWT` block in the [HTTP route configuration entry](/consul/docs/connect/config-entries/http-route).  
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `Listeners[].default{}.JWT`
-
-Specifies a block of default JWT verification configurations to apply to the gateway listener. Specify configurations that have precedence over the defaults in either the [`override.JWT` block](#listeners-override) or in the [`JWT` block](/consul/docs/connect/config-entries/http-route#rules-filters-jwt) in the HTTP route configuration. Refer to [Use JWTs to verify requests to API gateways](/consul/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-vms) for order of precedence and other details about using JWT verification in API gateways. 
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `Listeners[].default{}.JWT{}.Providers`
-
-Specifies a list of default JWT provider configurations to apply to the gateway listener. A provider configuration contains the name of the provider and claims. Specify configurations that have precedence over the defaults in either the [`override.JWT.Providers` block](#listeners-override-providers) or in the [`JWT` block](/consul/docs/connect/config-entries/http-route#rules-filters-jwt-providers) of the HTTP route configuration. Refer to [Use JWTs to verify requests to API gateways](/consul/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-vms) for order of precedence and other details about using JWT verification in API gateways. 
-
-#### Values
-
-- Default: None
-- Data type: List of maps
-
-The following table describes the parameters you can specify in a member of the `Providers` list:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `Name` | Specifies the name of the provider. | String | None |
-| `VerifyClaims` | Specifies a list of paths and a value that define the claim that Consul verifies when it receives a request. The `VerifyClaims` map specifies the following settings: <ul><li>`Path`: Specifies a list of one or more registered or custom claims.</li><li>`Value`: Specifies the expected value of the claim.</li></ul> | Map | None |
-
-Refer to [Configure JWT verification settings](#configure-jwt-verification-settings) for an example configuration. 
-
-### `Listeners[].override`
-
-Specifies a block of configurations to apply to the gateway listener. The override settings have precedence over the configurations in the [`Listeners[].default` block](#listeners-default).
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `Listeners[].override{}.JWT`
-
-Specifies a block of JWT verification configurations to apply to the gateway listener. The override settings have precedence over the [`Listeners[].default` configurations](#listeners-default) as well as any route-specific JWT configurations.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `Listeners[].override{}.JWT{}.Providers`
-
-Specifies a list of JWT provider configurations to apply to the gateway listener. A provider configuration contains the name of the provider and claims. The override settings have precedence over `Listeners[].defaults{}.JWT{}.Providers` as well as any listener-specific configuration. 
-
-#### Values
-
-- Default: None
-- Data type: List of maps
-
-The following table describes the parameters you can specify in a member of the `Providers` list:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `Name` | Specifies the name of the provider. | String | None |
-| `VerifyClaims` | Specifies a list of paths and a value that define the claim that Consul verifies when it receives a request. The `VerifyClaims` map specifies the following settings: <ul><li>`Path`: Specifies a list of one or more registered or custom claims.</li><li>`Value`: Specifies the expected value of the claim.</li></ul> | Map | None |
-
-Refer to [Configure JWT verification settings](#configure-jwt-verification-settings) for an example configuration. 
-
-## Examples
-
-The following examples demonstrate common API gateway configuration patterns for specific use cases.
-
-### Configure JWT verification settings
-
-The following example configures `listener-one` to verify that requests include a token with Okta user permissions by default. The listener also verifies that the token has an audience of `api.apps.organization.com`.
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
-
-```hcl
-Kind = "api-gateway"
-Name = "api-gateway"
-Listeners = [
-    {
-        name = "listener-one"
-        port     = 9001
-        protocol = "http"
-        # override and default are backed by the same type of data structure, see the following section for more on how they interact
-        override = {
-            JWT = {
-                Providers = [
-                    {
-                        Name = "okta",
-                        VerifyClaims = {
-                            Path = ["aud"],
-                            Value = "api.apps.organization.com",
-                        }
-                    },
-                ]
-            }
-        }
-        default = {
-            JWT = {
-                Providers = [
-                     {
-                        Name = "okta",
-                        VerifyClaims = {
-                            Path = ["perms", "role"],
-                            Value = "user",
-                        }
-                    }
-                ]
-            }
-        }
-    }
-]
-```
-</Tab>
-<Tab heading="JSON" group="json">
-
-```json
-{
-  "Kind": "api-gateway",
-  "Name": "api-gateway",
-  "Listeners": [
-    {
-      "name": "listener-one",
-      "port": 9001,
-      "protocol": "http",      
-      "override": {
-        "JWT": {
-          "Providers": [{
-            "Name": "okta",
-            "VerifyClaims": {
-              "Path": ["aud"],
-              "Value": "api.apps.organization.com"
-            }
-          }]
-        }
-      },
-      "default": {
-        "JWT": {
-          "Providers": [{
-              "Name": "okta",
-              "VerifyClaims": {
-                "Path": ["perms", "role"],
-                "Value": "user"
-              }
-            }]
-          }
-        }
-      }
-    ]
-}
-```
-
-</Tab>
-</Tabs>
\ No newline at end of file
diff --git a/website/content/docs/connect/config-entries/control-plane-request-limit.mdx b/website/content/docs/connect/config-entries/control-plane-request-limit.mdx
deleted file mode 100644
index c89e87832dbda..0000000000000
--- a/website/content/docs/connect/config-entries/control-plane-request-limit.mdx
+++ /dev/null
@@ -1,239 +0,0 @@
----
-layout: docs
-page_title: Control Plane Request Limit Configuration Entry Configuration Reference
-description:  Learn how to configure the control-plane-request-limit configuration entry, which defines how Consul agents limit read and request traffic rate limits.
----
-
-# Control Plane Request Limit Configuration Entry Configuration Reference
-
-This topic describes the configuration options for the `control-plane-request-limit` configuration entry. You can only write the `control-plane-request-limit` configuration entry to the `default` partition, but the configuration entry applies to all client requests that target any partition.
-
-<EnterpriseAlert>
-
-This feature requires Consul Enterprise. Refer to the [feature compatibility matrix](/consul/docs/enterprise#consul-enterprise-feature-availability) for additional information.
-
-</EnterpriseAlert>
-
-## Configuration model
-
-The following list outlines field hierarchy, language-specific data types, and requirements in a control plane request limit configuration entry. Click on a property name to view additional details, including default values.
-
-- [`kind`](#kind): string | required | must be set to `control-plane-request-limit`
-- [`mode`](#mode): string | required | default is `permissive`
-- [`name`](#name): string | required
-- [`read_rate`](#read-rate): number | `100`
-- [`write_rate`](#write-rate): number | `100`
-- [`kv`](#kv): map | no default
-   - [`read_rate`](#kv-read-rate): number | `100`
-   - [`write_rate`](#kv-write-rate): number | `100`
-- [`acl`](#acl): map | no default
-   - [`read_rate`](#acl-read-rate): number | `100`
-   - [`write_rate`](#acl-write-rate): number | `100`
-- [`catalog`](#catalog): map
-   - [`read_rate`](#catalog-read-rate): number | default is `100`
-   - [`write_rate`](#catalog-write-rate): number | default is `100`
-
-## Complete configuration
-
-When every field is defined, a control plane request limit configuration entry has the following form:
-
-<CodeTabs>
-
-```hcl
-kind = "control-plane-request-limit"
-name = "<name-for-the-entry>"
-
-mode = "permissive"
-
-read_rate =  100
-write_rate = 100
-
-kv = {
-  read_rate =  100
-  write_rate = 100
-}
-
-acl = {
-  read_rate =  100
-  write_rate = 100
-}
-
-catalog = {
-  read_rate =  100
-  write_rate = 100
-}
-```
-
-```json
-{
-  "kind": "control-plane-request-limit",
-  "name": "<name-for-the-entry>",
-  "mode": "permissive",
-  "read_rate":  100,
-  "write_rate": 100,
-  "kv": {
-    "read_rate": 100,
-    "write_rate": 100
-    },
-  "acl": {
-    "read_rate": 100,
-    "write_rate": 100
-    },
-  "catalog": {
-    "read_rate": 100,
-    "write_rate": 100
-  }
-}
-```
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ControlPlaneRequestLimit
-metadata:
-  name: <name-for-the-entry>
-spec:
-  mode: permissive
-  # the maximum number of read requests per second that the agent allows.
-  readRate: 100
-  # the maximum number of write requests per second that the agent allows.
-  writeRate: 100
-  kv:
-    readRate: 100
-    writeRate: 100
-  acl:
-    readRate: 100
-    writeRate: 100
-  catalog:
-    readRate: 100
-    writeRate: 100
-```
-
-</CodeTabs>
-
-## Specification
-
-This section provides details about the fields you can configure in the control plane request limit configuration entry.
-
-### `kind`
-
-Specifies the type of configuration entry to implement. Must be set to`control-plane-request-limit`
-
-#### Values
-
-- Default: none
-- This field is required.
-- Data type: String value that must be set to`control-plane-request-limit`.
-
-### `mode`
-
-Specifies an action to take if the rate of requests exceeds the limit.
-
-#### Values
-
-- Default: None
-- This field is required.
-- One of the following string values:
-  - `permissive`: The server continues to allow requests and records an error in the logs. This is the default value for `mode`.
-  - `enforcing`: The server stops accepting requests and records an error in the logs.
-  - `disabled`: Limits are not enforced or tracked.
-
-### `name`
-
-Specifies the name of the configuration entry.
-
-#### Values
-
-- Default: none
-- This field is required.
-- Data type: string
-
-### `read_rate`
-
-Specifies the maximum number of read requests per second that the agent allows.
-
-#### Values
-
-- Default: No limit.
-- Data type: number
-
-### `write_rate`
-
-Specifies the maximum number of write requests per second that the agent allows.
-
-#### Values
-
-- Default: No limit.
-- Data type: number
-
-### `kv`
-
-Specifies the maximum number of read and write requests to the Consul key-value store.
-
-#### Values
-
-- Default: none
-- Data type is a map containing the following parameters:
-  - `read_rate`
-  - `write_rate`
-
-### `kv.read_rate`
-
-Specifies the maximum number of read requests per second allowed to the Consul key-value store.
-
-#### Values
-
-- Default: No limit.
-- Data type: number
-
-### `kv.write_rate`
-
-Specifies the maximum number of write requests per second allowed to the Consul key-value store.
-
-#### Values
-
-- Default: No limit.
-- Data type: number
-
-### `acl`
-
-Specifies the maximum number of read and write ACL requests to the Consul server.
-
-### `acl.read_rate`
-S
-Specifies the maximum number of ACL read requests per second allowed to the Consul server.
-
-#### Values
-
-- Default: No limit.
-- Data type: number
-
-### `acl.write_rate`
-
-Specifies the maximum number of ACL write requests per second allowed to the Consul server.
-
-#### Values
-
-- Default: No limit.
-- Data type: number
-
-### catalog
-
-Specifies the maximum number of read and write requests to the Consul catalog.
-
-### `catalog.read_rate`
-
-Specifies the maximum number of read requests per second allowed to the Consul catalog.
-
-#### Values
-
-- Default: No limit.
-- Data type: number
-
-### `catalog.write_rate`
-
-Specifies the maximum number of write requests per second allowed to the Consul catalog.
-
-#### Values
-
-- Default: No limit.
-- Data type: number
diff --git a/website/content/docs/connect/config-entries/exported-services.mdx b/website/content/docs/connect/config-entries/exported-services.mdx
index 4efa62ad11b4d..8d2762d7e6617 100644
--- a/website/content/docs/connect/config-entries/exported-services.mdx
+++ b/website/content/docs/connect/config-entries/exported-services.mdx
@@ -11,7 +11,7 @@ This topic describes the `exported-services` configuration entry type. The `expo
 
 ## Introduction
 
-To configure Consul to export services contained in a Consul Enterprise admin partition or Consul CE datacenter to one or more additional clusters, create a new configuration entry and declare `exported-services` in the `kind` field. This configuration entry enables you to route traffic between services in different clusters.
+To configure Consul to export services contained in a Consul Enterprise admin partition or Consul OSS datacenter to one or more additional clusters, create a new configuration entry and declare `exported-services` in the `kind` field. This configuration entry enables you to route traffic between services in different clusters.
 
 You can configure the settings defined in the `exported-services` configuration entry to apply to all namespaces in a Consul Enterprise admin partition.
 
@@ -31,7 +31,7 @@ You can configure the settings defined in the `exported-services` configuration
 Configure the following parameters to define a `exported-services` configuration entry:
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 <CodeTabs heading="Exported services configuration syntax" tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
 ```hcl
@@ -188,62 +188,6 @@ spec:
 }
 ```
 
-</CodeTabs>
-</Tab>
-
-
-<Tab heading="Consul Enterprise (Sameness Group)">
-<CodeTabs heading="Exported services configuration syntax" tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
-
-```hcl
-Kind = "exported-services"
-Partition = "<partition containing services to export>"
-Name = "<partition containing services to export>"
-Services = [
-  {
-    Name = "<name of service to export>"
-    Namespace = "<namespace in the partition containing the service to export>"
-    Consumers = [
-      {
-        SamenessGroup = "<name of the sameness group that dials the exported service>"
-      }
-    ]
-  }
-]
-```
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ExportedServices
-metadata:
-  name: <partition containing services to export>
-spec:
-  services:
-    - name: <name of service to export>
-      namespace: <namespace in the partition containing the service to export>
-      consumers:
-        - samenessGroup: <name of the sameness group that dials the exported service>
-```
-
-```json
-{
-  "Kind": "exported-services",
-  "Partition": "<partition containing services to export>",
-  "Name": "<partition containing services to export>",
-  "Services": [
-    {
-      "Name": "<name of service to export>",
-      "Namespace": "<namespace in the partition containing the service to export>",
-      "Consumers": [
-        {
-          "SamenessGroup": "<name of the sameness group that dials the exported service>"
-        }
-      ]
-    }
-  ]
-}
-```
-
 </CodeTabs>
 </Tab>
 </Tabs>
@@ -256,7 +200,7 @@ The following table describes the parameters associated with the `exported-servi
 | ----------- | --------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ------- |
 | `Kind`      | String value that enables the configuration entry. The value should always be `exported-services` (HCL and JSON) or `ExportedServices` (YAML)                                    | Required | None    |
 | `Partition` | <EnterpriseAlert inline /> String value that specifies the name of the partition that contains the services you want to export.                                              | Required | None    |
-| `Name`      | String value that specifies the name of the partition that contains the services you want to export. Must be `default` in Consul CE.                                          | Required | None    |
+| `Name`      | String value that specifies the name of the partition that contains the services you want to export. Must be `default` in Consul OSS.                                          | Required | None    |
 | `Services`  | List of objects that specify which services to export. For details, refer to [`Services`](#services).                                                                            | Required | None    |
 | `Meta`      | Object that defines a map of the max 64 key/value pairs.                                                                                                                         | Optional | None    |
 
@@ -277,9 +221,6 @@ an exported service. Each item in the `Consumers` list must contain exactly one
 A asterisk wildcard (`*`) cannot be specified as the `Peer`. Added in Consul 1.13.0.
 - `Partition`: <EnterpriseAlert inline /> Specifies an admin partition in the datacenter to export the service to.
 A asterisk wildcard (`*`) cannot be specified as the `Partition`.
-- `SamenessGroup`: <EnterpriseAlert inline /> Specifies as sameness group to export the service to.
-A asterisk wildcard (`*`) cannot be specified as the `SamenessGroup`.
-
 
 ## Examples
 
@@ -288,7 +229,7 @@ A asterisk wildcard (`*`) cannot be specified as the `SamenessGroup`.
 
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 
 The following example configures Consul to export the `payments` and `refunds` services to the peered `web-shop` cluster.
 
@@ -524,63 +465,10 @@ spec:
 </Tab>
 </Tabs>
 
-### Exporting a service to a sameness group
-
-The following example configures Consul to export a service named `api` to a defined group of partitions that belong to a separately defined [sameness group](/consul/docs/connect/config-entries/sameness-group) named `monitoring`.
-
-<CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
-
-```hcl
-Kind = "exported-services"
-Name = "default"
-
-Services = [
-  {
-    Name      = "api"
-    Consumers = [
-        {
-            SamenessGroup  = "monitoring"
-        }
-    ]
-  }
-]
-```
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-Kind: ExportedServices
-metadata:
-  name: default
-spec:
-  services:
-    - name: api
-      consumers:
-        - samenessGroup: monitoring
-```
-
-```json
-{
-  "Kind": "exported-services",
-  "Name": "default",
-  "Services": [
-    {
-      "Name": "api",
-      "Consumers": [
-        {
-          "SamenessGroup": "monitoring"
-        }
-      ]
-    }
-  ]
-}
-```
-
-</CodeTabs>
-
 ### Exporting all services
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 
 The following example configures Consul to export all services in the datacenter to the peered `monitoring` and `platform` clusters.
 
@@ -780,7 +668,7 @@ spec:
 When an exported service has been imported to another cluster, you can use the `health` REST API endpoint to query the service on the consumer cluster.
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 
 The following example queries the `finance` peer for the imported `payments` service:
 
@@ -795,7 +683,7 @@ If the call in the previous example is made from a service named `web`, then the
 - A token with `service:write` permissions to `web`.
 - A token with `service:read` and `node:read` to all names in the datacenter.
 
-<CodeTabs heading="Example ACL rules for reading imported services in Consul CE">
+<CodeTabs heading="Example ACL rules for reading imported services in Consul OSS">
 
 ```hcl
 service "web" {
diff --git a/website/content/docs/connect/config-entries/http-route.mdx b/website/content/docs/connect/config-entries/http-route.mdx
deleted file mode 100644
index 4aa807b47b704..0000000000000
--- a/website/content/docs/connect/config-entries/http-route.mdx
+++ /dev/null
@@ -1,1128 +0,0 @@
----
-layout: docs
-page_title: HTTP Route Configuration
-description: Learn how to configure an HTTP Route bound to an API Gateway on VMs.
----
-
-# HTTP route configuration reference
-
-This topic provides reference information for the gateway routes configuration entry. Refer to [Route Resource Configuration](/consul/docs/connect/gateways/api-gateway/configuration/routes) for information about configuring API gateway routes in Kubernetes environments.
-
-## Configuration model
-
-The following list outlines field hierarchy, language-specific data types, and
-requirements in an `http-route` configuration entry. Click on a property name
-to view additional details, including default values.
-
-- [`Kind`](#kind): string | must be `http-route`
-- [`Name`](#name): string | no default
-- [`Namespace`](#namespace): string | no default <EnterpriseAlert inline />
-- [`Partition`](#partition): string | no default <EnterpriseAlert inline />
-- [`Meta`](#meta): map | no default
-- [`Hostnames`](#hostnames): list | no default
-- [`Parents`](#parents): list | no default
-  - [`Kind`](#parents-kind): string | must be `api-gateway`
-  - [`Name`](#parents-name): string | no default
-  - [`Namespace`](#parents-namespace): string | no default <EnterpriseAlert inline />
-  - [`Partition`](#parents-partition): string | no default <EnterpriseAlert inline />
-  - [`SectionName`](#parents-sectionname): string | no default
-- [`Rules`](#rules): list | no default
-  - [`Filters`](#rules-filters): map | no default
-    - [`Headers`](#rules-filters-headers): list | no default
-      - [`Add`](#rules-filters-headers-add): map | no default
-      - [`Remove`](#rules-filters-headers-remove): list | no default
-      - [`Set`](#rules-filters-headers-set): map | no default
-    - [`URLRewrite`](#rules-filters-urlrewrite): map | no default
-      - [`Path`](#rules-filters-urlrewrite-path): string | no default
-    - [`RetryFilter`](#rules-filters-retryfilter): map
-      - [`NumRetries`](#rules-filters-retryfilter-numretries): number | `1`
-      - [`RetryOnConnectionFailure`](#rules-filters-retryfilter-retryonconnectionfailure): boolean | `false`
-      - [`RetryOn`](#rules-filters-retryfilter-retryon): list of strings
-      - [`RetryOnStatusCodes`](#rules-filters-retryfilter-retryon): list of numbers
-    - [`TimeoutFilter`](#rules-filters-timeoutfilter): map
-      - [`IdleTimeout`](#rules-filters-timeoutfilter): number | `0`
-      - [`RequestTimeout`](#rules-filters-timeoutfilter): number | `0`
-    - [`JWT`](#rules-filters-jwt): map
-         - [`Providers`](#rules-filters-jwt-providers): list
-            - [`Name`](#rules-filters-jwt-providers): string
-            - [`VerifyClaims`](#rules-filters-jwt-providers): map
-               - [`Path`](#rules-filters-jwt-providers): list
-               - [`Value`](#rules-filters-jwt-providers): string
-  - [`ResponseFilters`](#rules-responsefilters)
-    - [`Headers`](#rules-responsefilters-headers): list | no default
-      - [`Add`](#rules-responsefilters-headers-add): map | no default
-      - [`Remove`](#rules-responsefilters-headers-remove): list | no default
-      - [`Set`](#rules-responsefilters-headers-set): map | no default
-  - [`Matches`](#rules-matches): list | no default
-    - [`Headers`](#rules-matches-headers): list | no default
-      - [`Match`](#rules-matches-headers-match): string | no default
-      - [`Name`](#rules-matches-headers-name): string | no default
-      - [`Value`](#rules-matches-headers-value): string | no default
-    - [`Method`](#rules-matches-method): string | no default
-    - [`Path`](#rules-matches-path): map | no default
-      - [`Match`](#rules-matches-path-match): string | no default
-      - [`Value`](#rules-matches-path-value): string | no default
-    - [`Query`](#rules-matches-query): list | no default
-      - [`Match`](#rules-matches-query-match): string | no default
-      - [`Name`](#rules-matches-query-name): string | no default
-      - [`Value`](#rules-matches-query-value): string | no default
-  - [`Services`](#rules-services): list | no default
-    - [`Name`](#rules-services-name): string | no default
-    - [`Namespace`](#rules-services-namespace): string <EnterpriseAlert inline />
-    - [`Partition`](#rules-services-partition): string <EnterpriseAlert inline />
-    - [`Weight`](#rules-services-weight): number | `1`
-    - [`Filters`](#rules-services-filters): map | no default
-      - [`Headers`](#rules-services-filters-headers): list | no default
-        - [`Add`](#rules-services-filters-headers-add): map | no default
-        - [`Remove`](#rules-services-filters-headers-remove): list | no default
-        - [`Set`](#rules-services-filters-headers-set): map | no default
-      - [`URLRewrite`](#rules-services-filters-urlrewrite): map | no default
-        - [`Path`](#rules-services-filters-urlrewrite-path): string | no default
-      - [`RetryFilter`](#rules-services-filters-retryfilter): map
-        - [`NumRetries`](#rules-services-filters-retryfilter-numretries): number | `1`
-        - [`RetryOnConnectionFailure`](#rules-services-filters-retryfilter-retryonconnectionfailure): boolean | `false`
-        - [`RetryOn`](#rules-services-filters-retryfilter-retryon): list of strings
-        - [`RetryOnStatusCodes`](#rules-services-filters-retryfilter-retryon): list of numbers
-      - [`TimeoutFilter`](#rules-services-filters-timeoutfilter): map
-        - [`IdleTimeout`](#rules-services-filters-timeoutfilter): number | `0`
-        - [`RequestTimeout`](#rules-services-filters-timeoutfilter): number | `0`
-    - [`ResponseFilters`](#rules-services-responsefilters)
-      - [`Headers`](#rules-services-responsefilters-headers): list | no default
-        - [`Add`](#rules-services-responsefilters-headers-add): map | no default
-        - [`Remove`](#rules-services-responsefilters-headers-remove): list | no default
-        - [`Set`](#rules-services-responsefilters-headers-set): map | no default
-
-
-## Complete configuration
-
-When every field is defined, an `http-route` configuration entry has the following form:
-
-<CodeTabs>
-
-```hcl
-Kind = "http-route"
-Name = "<name of the route>"
-Namespace = "<enterprise: namespace of the service>"
-Partition = "<enterprise: partition of the service>"
-Meta = {
-  "<any key>" = "<any value>"
-}
-Hostnames = ["<hostnames for which this HTTPRoute should respond to requests>"]
-
-Parents = [
-  {
-    Kind        = "api-gateway"
-    Name        = "<name of the api-gateway to bind to>"
-    Namespace = "<enterprise: namespace of the service>"
-    Partition = "<enterprise: partition of the service>"
-    SectionName = "<optional name of a specific listener on the api-gateway to bind to>"
-  }
-]
-
-Rules = [
-  {
-    Filters = {
-      Headers = [
-        {
-          Add = {
-            "<name of header to add>" = "<value of header to add>"
-          }
-          Remove = [
-            "<name of header to remove from request>"
-          ]
-          Set = {
-            "<name of header to set>" = "<value of header to set>"
-          }
-        }
-      ]
-      URLRewrite = {
-        Path = "<path to rewrite request to>"
-      }
-      JWT = {
-        Providers = [
-          Name = "<name of the provider>"
-          VerifyClaim = {
-            Path = ["<path to claim>"]
-            Value = "<value of claim>"
-          }
-        ]
-      }
-    }
-    ResponseFilters = {
-      Headers = [
-        {
-          Add = {
-            "<name of header to add>" = "<value of header to add>"
-          }
-          Remove = [
-            "<name of header to remove from response>"
-          ]
-          Set = {
-            "<name of header to set>" = "<value of header to set>"
-          }
-        }
-      ]
-    }
-    Matches = [
-      {
-        Headers = [
-          {
-            Match = "<type of match: exact, prefix or regex>"
-            Name = "<name of header to match on>"
-            Value = "<value of header to match on>"
-          }
-        ]
-        Method = "<method type to match on>"
-        Path = {
-          Match = "<type of match: exact, prefix or regex>"
-          Value = "<value to match on>"
-        }
-        Query = [
-          {
-            Match = "<type of match: exact, present or regex>"
-            Name = "<name of query parameter to match on>"
-            Value = "<value of query parameter to match on>"
-          }
-        ]
-      }
-    ]
-    Services = [
-      {
-        Name   = "<name of Consul service to route to>"
-        Namespace = "<enterprise: namespace of the service>"
-        Partition = "<enterprise: partition of the service>"
-        Weight = "<number proportional to other weights>"
-        Filters = {
-          Headers = [
-            {
-              Add = {
-                "<name of header to add>" = "<value of header to add>"
-              }
-              Remove = [
-                "<name of header to remove from request>"
-              ]
-              Set = {
-                "<name of header to set>" = "<value of header to set>"
-              }
-            }
-          ]
-          URLRewrite = {
-            Path = "<path to rewrite request to>"
-          }
-        }
-      }
-    ]
-  }
-]
-
-```
-
-```json
-{
-  "Kind": "http-route",
-  "Name": "<name of the route>",
-  "Namespace": "<enterprise: namespace of the route>",
-  "Partition": "<enterprise: partition of the route>",
-  "Meta": {
-    "<any key>": "<any value>"
-  },
-  "Hostnames": [
-    "<hostnames for which this HTTPRoute should respond to requests>"
-  ],
-  "Parents": [
-    {
-      "Kind": "api-gateway",
-      "Name": "<name of the api-gateway to bind to>",
-      "Namespace": "<enterprise: namespace of the route>",
-      "Partition": "<enterprise: partition of the route>",
-      "SectionName": "<optional name of a specific listener on the api-gateway to bind to>"
-    }
-  ],
-  "Rules": [
-    {
-      "Filters": [
-        {
-          "Headers": [
-            {
-              "Add": [
-                {
-                  "<name of header to add>": "<value of header to add>"
-                }
-              ],
-              "Remove": ["<header to remove from request>"],
-              "Set": [
-                {
-                  "<name of header to set>": "<value of header to set>"
-                }
-              ]
-            }
-          ],
-          "URLRewrite": [
-            {
-              "Path": "<path to rewrite request to>"
-            }
-          ],
-        "JWT": {
-          "Providers": [{
-            "Name": "okta",
-            "VerifyClaims": {
-              "Path": ["perms", "role"],
-              "Value": "user"
-            }
-          }]
-        }
-      }
-    ],
-    "Matches": [
-      {
-        "Headers": [
-          {
-            "Match": "<type of match: exact, prefix or regex>",
-            "Name": "<name of header to match on>",
-            "Value": "<value of header to match on>"
-          }
-        ],
-        "Method": "<method type to match on>",
-        "Path": [
-          {
-            "Match": "<type of match: exact, prefix or regex>",
-            "Value": "<value to match on>"
-          }
-        ],
-        "Query": [
-          {
-            "Match": "<type of match: exact, present or regex>",
-            "Name": "<name of query parameter to match on>",
-            "Value": "<value of query parameter to match on>"
-          }
-        ]
-      }
-    ],
-    "Services": [
-      {
-        "Name": "<name of Consul service to route to>",
-        "Namespace": "<enterprise: namespace of the route>",
-        "Partition": "<enterprise: partition of the route>",
-        "Weight": "<number proportional to other weights>",
-        "Filters": [
-          {
-            "Headers": [
-              {
-                "Add": [
-                  {
-                    "<name of header to add": "<value of header to add>"
-                  }
-                ],
-                "Remove": ["<header to remove from request>"],
-                "Set": [
-                  {
-                    "<name of header to set": "<value of header to set>"
-                  }
-                ]
-              }
-            ],
-            "URLRewrite": [
-              {
-                "Path": "<path to rewrite request to>"
-              }
-            ]
-          }
-        ],
-        "ResponseFilters": [
-          {
-            "Headers": [
-              {
-                "Add": [
-                  {
-                    "<name of header to add": "<value of header to add>"
-                  }
-                ],
-                "Remove": ["<header to remove from response>"],
-                "Set": [
-                  {
-                    "<name of header to set": "<value of header to set>"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  }]
-}
-```
-
-</CodeTabs>
-
-## Specification
-
-This section provides details about the fields you can configure in the `http-route` configuration entry.
-
-### `Kind`
-
-Specifies the type of configuration entry to implement. For HTTP routes, this must be `http-route`.
-
-#### Values
-
-- Default: none
-- This field is required.
-- Data type: string value that must be set to `"http-route"`.
-
-### `Name`
-
-Specifies a name for the configuration entry. The name is metadata that you can
-use to reference the configuration entry when performing Consul operations,
-such as applying a configuration entry to a specific cluster.
-
-#### Values
-
-- Default: Defaults to the name of the node after writing the entry to the Consul server.
-- This field is required.
-- Data type: string
-
-### `Namespace` <EnterpriseAlert inline />
-
-Specifies the Enterprise [namespace](/consul/docs/enterprise/namespaces) to apply to the configuration entry.
-
-#### Values
-
-- Default: `"default"` in Enterprise
-- Data type: string
-
-### `Partition` <EnterpriseAlert inline />
-
-Specifies the Enterprise [admin partition](/consul/docs/enterprise/admin-partitions) to apply to the configuration entry.
-
-#### Values
-
-- Default: `"default"` in Enterprise
-- Data type: string
-
-### `Meta`
-
-Specifies an arbitrary set of key-value pairs to associate with the route.
-
-#### Values
-
-- Default: none
-- Data type: map containing one or more keys and string values.
-
-### `Parents[]`
-
-Specifies the list of gateways that this route binds to.
-
-#### Values
-
-- Default: none
-- Data type: List of map. Each member of the list contains the following fields:
-  - `Kind`
-  - `Name`
-  - `Namespace` <EnterpriseAlert inline />
-  - `Partition` <EnterpriseAlert inline />
-  - `SectionName`
-
-### `Parents[].Kind`
-
-Specifies the type of resource to bind to. This field is required and must be
-set to `"api-gateway"`
-
-#### Values
-
-- Default: none
-- This field is required.
-- Data type: string value set to `"api-gateway"`
-
-### `Parents[].Name`
-
-Specifies the name of the api-gateway to bind to.
-
-#### Values
-
-- Default: none
-- This field is required.
-- Data type: string
-
-### `Parents[].Namespace` <EnterpriseAlert inline />
-
-Specifies the Enterprise [namespace](/consul/docs/enterprise/namespaces) to apply to the configuration entry.
-
-#### Values
-
-- Default: `"default"` in Enterprise
-- Data type: string
-
-### `Parents[].Partition` <EnterpriseAlert inline />
-
-Specifies the Enterprise [admin partition](/consul/docs/enterprise/admin-partitions) to apply to the configuration entry.
-
-#### Values
-
-- Default: `"default"` in Enterprise
-- Data type: string
-
-### `Parents[].SectionName`
-
-Specifies the name of the listener to bind to on the `api-gateway`. If left
-empty, this route binds to _all listeners_ on the parent gateway.
-
-#### Values
-
-- Default: ""
-- Data type: string
-
-### `Rules[]`
-
-Specifies the list of HTTP-based routing rules that this route uses to construct a route table.
-
-#### Values
-
-- Default:
-- Data type: List of maps. Each member of the list contains the following fields:
-  - `Filters`
-  - `Matches`
-  - `Services`
-
-### `Rules[].Filters[]`
-
-Specifies the list of HTTP-based filters used to modify a request prior to routing it to the upstream service.
-
-#### Values
-
-- Default: none
-- Data type: Map that contains the following fields:
-  - `Headers`
-  - `UrlRewrite`
-  - `RetryFilter`
-  - `TimeoutFilter`
-
-### `Rules[].Filters[].Headers[]`
-
-Defines operations to perform on matching request headers when an incoming request matches the `Rules.Matches` configuration.
-
-#### Values
-
-This field contains the following configuration objects:
-
-| Parameter | Description                                                                                                                                                                                                                                                                                                                                                                                                                                  | Type            |
-| --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
-| `set`     | Configure this field to rewrite the HTTP request header. It specifies the name of an HTTP header to overwrite and the new value to set. Any existing values associated with the header name are overwritten. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to set.</li><li>`value`: Required string that specifies the value of the HTTP header to set.</li></ul> | List of maps    |
-| `add`     | Configure this field to append the request header with a new value. It specifies the name of an HTTP header to append and the values to add. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to append.</li><li>`value`: Required string that specifies the value of the HTTP header to add.</li></ul>                                                              | List of maps    |
-| `remove`  | Configure this field to specify an array of header names to remove from the request header.                                                                                                                                                                                                                                                                                                                                                  | List of strings |
-
-### `Rules[].Filters[].URLRewrite`
-
-Specifies rule for rewriting the URL of incoming requests when an incoming request matches the `Rules.Matches` configuration.
-
-#### Values
-
-- Default: none
-- This field is a map that contains a `Path` field.
-
-### `Rules[].Filters[].URLRewrite.Path`
-
-Specifies a path that determines how Consul API Gateway rewrites a URL path. Refer to [Reroute HTTP requests](/consul/docs/connect/gateways/api-gateway/define-routes/reroute-http-requests) for additional information.
-
-#### Values
-
-The following table describes the parameters for `path`:
-
-| Parameter            | Description                                                                                                                                                                                      | Type   |
-| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------ |
-| `replacePrefixMatch` | Specifies a value that replaces the path prefix for incoming HTTP requests. The operation only affects the path prefix. The rest of the path is unchanged.                                       | String |
-| `type`               | Specifies the type of replacement to use for the URL path. You can specify the following values: <ul><li>`ReplacePrefixMatch`: Replaces the matched prefix of the URL path (default). </li></ul> | String |
-
-### `Rules[].Filters[].RetryFilter`
-
-Specifies a block of settings Consul uses to retry a request if it fails.
-
-#### Values
-
-- Default: None
-- Data type: Map containing the following parameters:
-  - `NumRetries`
-  - `RetryOnConnectFailure`
-  - `RetryOn`
-  - `RetryOnStatusCodes`
-
-### `Rules[].Filters[].RetryFilter{}.NumRetries`
-
-Specifies the number of times to retry the request when a retry condition occurs.
-
-#### Values
-
-- Default: `1`
-- Data type: Integer
-
-### `Rules[].Filters[].RetryFilter{}.RetryOnConnectFailure`
-
-Enables Consul to retry the request if the connection fails. Define the one or more retry configurations to define the retry logic for the route.
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `Rules[].Filters[].RetryFilter{}.RetryOn`
-
-Specifies a list of conditions for Consul to retry requests based on the response from an upstream service. The following retry conditions are supported:
-
-| Conditions           | Description                                                                                              |
-| :------------------- | :------------------------------------------------------------------------------------------------------- |
-| `5xx`                | Consul retries the request when an upstream responds with any 5xx error code or does not respond at all. |
-| `gateway-error`      | Consul retries the request when the upstream responds with a 502, 503, or 504 error.                     |
-| `reset`              | Consul retries the request when the upstream does not respond at all.                                    |
-| `connect-failure`    | Consul retries the request when the connection to the upstream fails.                                    |
-| `envoy-ratelimited`  | Consul retries the request when the header `x-envoy-ratelimited` is present.                             |
-| `retriable-4xx`      | Consul retries the request when the upstream responds with a retriable 4xx code.                         |
-| `refused-stream`     | Consul retries the request when the upstream resets the stream with a `REFUSED_STREAM` error code.       |
-| `cancelled`          | Consul retries the request when the gRPC status code in the response headers is `cancelled`.             |
-| `deadline-exceeded`  | Consul retries the request when the gRPC status code in the response headers is `deadline-exceeded`.     |
-| `internal`           | Consul retries the request when the gRPC status code in the response headers is `internal`.              |
-| <nobr>`resource-exhausted`</nobr> | Consul retries the request when the gRPC status code in the response headers is `resource-exhausted`.    |
-| `unavailable`        | Consul retries the request when the gRPC status code in the response headers is `unavailable`.           |
-
-#### Values
-
-- Default: None
-- Data type: List of strings. Strings must match one of the following values:
-
-  - `5xx`
-  - `gateway-error`
-  - `reset`
-  - `connect-failure`
-  - `envoy-ratelimited`
-  - `retriable-4xx`
-  - `refused-stream`
-  - `cancelled`
-  - `deadline-exceeded`
-  - `internal`
-  - `resource-exhausted`
-  - `unavailable`
-
-### `Rules[].Filters[].RetryFilter{}.RetryOnStatusCodes`
-
-Specifies a list of integers for [HTTP response status codes](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status) that trigger a retry request.
-
-#### Values
-
-- Default: None
-- Data type: List of integers
-
-### `Rules[].Filters[].TimeoutFilter`
-
-Specifies timeout settings for routes from an API gateway listener to the destination service in Consul service mesh.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-The following table describes the settings you can configure in the `TimeoutFilter` map:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `IdleTimeout` | Specifies the total amount of time permitted for the request stream to be idle. | Integer | `0` |
-| `RequestTimeout` | Specifies the total amount of time in nanoseconds, including retry attempts, Consul permits for the entire downstream request to be processed. | Integer | `0` |
-
-### `Rules[].Filters{}.JWT`
-
-Specifies a block of JWT verification configurations to apply to the route. These route-specific settings have precedence over default configurations defined for listeners the route attaches to on the API gateway.  Refer to [`Listeners[].default{}.JWT`](/consul/docs/connect/config-entries/api-gateway#listeners-default-jwt) for additional information.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `Rules[].Filters[].JWT{}.Providers`
-
-Specifies a list of JWT provider configurations to apply to the route. A provider configuration contains the name of the provider and claims.
-
-#### Values
-
-- Default: None
-- Data type: List of maps
-
-The following table describes the parameters you can specify in a member of the `Providers` list:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `Name` | Specifies the name of the provider. | String | None |
-| `VerifyClaims` | Specifies a list of paths and a value that define the claim. Consul verifies requests that match the claims declared in the listener JWT configuration and allow the request through the gateway. The `VerifyClaims` map specifies the following settings: <ul><li>`Path`: Specifies a list of one or more registered or custom claims.</li><li>`Value`: Specifies the expected value of the claim.</li></ul> | Map | None |
-
-Refer to [Configure JWT verification settings](#configure-jwt-verification-settings) for an example configuration.
-
-### `Rules[].ResponseFilters[]`
-
-Specifies the list of HTTP-based filters used to modify a response prior to routing it to the calling client.
-
-#### Values
-
-- Default: none
-- Data type: Map that contains the following fields:
-  - `Headers`
-
-### `Rules[].ResponseFilters[].Headers[]`
-
-Defines operations to perform on matching response headers when an incoming request matches the `Rules.Matches` configuration.
-
-#### Values
-
-This field contains the following configuration objects:
-
-| Parameter | Description                                                                                                                                                                                                                                                                                                                                                                                                                                  | Type            |
-| --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
-| `set`     | Configure this field to rewrite the HTTP response header. It specifies the name of an HTTP header to overwrite and the new value to set. Any existing values associated with the header name are overwritten. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to set.</li><li>`value`: Required string that specifies the value of the HTTP header to set.</li></ul> | List of maps    |
-| `add`     | Configure this field to append the response header with a new value. It specifies the name of an HTTP header to append and the values to add. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to append.</li><li>`value`: Required string that specifies the value of the HTTP header to add.</li></ul>                                                              | List of maps    |
-| `remove`  | Configure this field to specify an array of header names to remove from the response header.                                                                                                                                                                                                                                                                                                                                                  | List of strings |
-
-
-### `Rules[].Matches[]`
-
-Specifies the matching criteria used in the routing table. When an incoming
-request matches the given HTTPMatch configuration, traffic routes to
-services specified in the [`Rules.Services`](#rules-services) field.
-
-#### Values
-
-- Default: none
-- Data type: List containing maps. Each member of the list contains the following fields:
-  - `Headers`
-  - `Method`
-  - `Path`
-  - `Query`
-
-### `Rules[].Matches[].Headers[]`
-
-Specifies rules for matching incoming request headers. You can specify multiple rules in a list, as well as multiple lists of rules. If all rules in a single list are satisfied, then the route forwards the request to the appropriate service defined in the [`Rules.Services`](#rules-services) configuration. You can create multiple `Header[]` lists to create a range of matching criteria. When at least one list of matching rules are satisfied, the route forwards the request to the appropriate service defined in the [`Rules.Services`](#rules-services) configuration.
-
-#### Values
-
-- Default: none
-- Data type: List containing maps with the following fields:
-  - `Match`
-  - `Name`
-  - `Value`
-
-### `Rules.Matches.Headers.Match`
-
-Specifies type of match for headers: `"exact"`, `"prefix"`, or `"regex"`.
-
-#### Values
-
-- Default: none
-- Data type: string
-
-### `Rules.Matches.Headers.Name`
-
-Specifies the name of the header to match.
-
-#### Values
-
-- Default: none
-- Data type: string
-
-### `Rules[].Matches.Headers.Value`
-
-Specifies the value of the header to match.
-
-#### Values
-
-- Default: none
-- Data type: string
-
-### `Rules[].Matches[].Method`
-
-Specifies a list of strings that define matches based on HTTP request method.
-
-#### Values
-
-Specify one of the following string values:
-
-- `HEAD`
-- `POST`
-- `PUT`
-- `PATCH`
-- `GET`
-- `DELETE`
-- `OPTIONS`
-- `TRACE`
-- `CONNECT`
-
-### `Rules[].Matches[].Path`
-
-Specifies the HTTP method to match.
-
-#### Values
-
-- Default: none
-- Data type: map containing the following fields:
-  - `Match`
-  - `Value`
-
-### `Rules[].Matches[].Path.Match`
-
-Specifies type of match for the path: `"exact"`, `"prefix"`, or `"regex"`.
-
-If set to `prefix`, Consul uses simple string matching to identify incoming request prefixes. For example, if the route is configured to match incoming requests to services prefixed with `/dev`, then the gateway would match requests to `/dev-` and `/deviate` and route to the upstream.
-
-This deviates from the
-[Kubernetes Gateway API specification](https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io%2fv1beta1.PathMatchType), which matches on full path elements. In the previous example, _only_ requests to `/dev` or `/dev/` would match.
-
-#### Values
-
-- Default: none
-- Data type: string
-
-### `Rules[].Matches[].Path.Value`
-
-Specifies the value of the path to match.
-
-#### Values
-
-- Default: none
-- Data type: string
-
-### `Rules[].Matches[].Query[]`
-
-Specifies how a match is completed on a request’s query parameters.
-
-#### Values
-
-- Default: none
-- Data type: List of map that contains the following fields:
-  - `Match`
-  - `Name`
-  - `Value`
-
-### `Rules[].Matches[].Query[].Match`
-
-Specifies type of match for query parameters: `"exact"`, `"prefix"`, or `"regex"`.
-
-#### Values
-
-- Default: none
-- Data type: string
-
-### `Rules[].Matches[].Query[].Name`
-
-Specifies the name of the query parameter to match.
-
-#### Values
-
-- Default: none
-- Data type: string
-
-### `Rules[].Matches[].Query[].Value`
-
-Specifies the value of the query parameter to match.
-
-#### Values
-
-- Default: none
-- Data type: string
-
-### `Rules[].Services[]`
-
-Specifies the service that the API gateway routes incoming requests to when the
-requests match the `Rules.Matches` configuration.
-
-#### Values
-
-- Default: none
-- This field contains a list of maps. Each member of the list contains the following fields:
-  - `Name`
-  - `Weight`
-  - `Filters`
-  - `Namespace` <EnterpriseAlert inline />
-  - `Partition` <EnterpriseAlert inline />
-
-### `Rules[].Services[].Name`
-
-Specifies the name of an HTTP-based service to route to.
-
-#### Values
-
-- Default: none
-- Data type: string
-
-### `Rules[].Services[].Namespace` <EnterpriseAlert inline />
-
-Specifies the Enterprise [namespace](/consul/docs/enterprise/namespaces) to apply to the configuration entry.
-
-#### Values
-
-- Default: `"default"` in Enterprise
-- Data type: string
-
-### `Rules[].Services.Partition` <EnterpriseAlert inline />
-
-Specifies the Enterprise [admin partition](/consul/docs/enterprise/admin-partitions) to apply to the configuration entry.
-
-#### Values
-
-- Default: `"default"` in Enterprise
-- Data type: string
-
-### `Rules[].Services[].Weight`
-
-Specifies the proportion of requests forwarded to the specified service. If no weight is specified, or if the specified
-weight is set to less than or equal to `0`, the weight is normalized to `1`. The
-proportion is determined by dividing the value of the weight by the sum of all
-weights in the service list. For non-zero values, there may be some deviation
-from the exact proportion depending on the precision an implementation
-supports. Weight is not a percentage and the sum of weights does not need to
-equal 100.
-
-#### Values
-
-- Default: none
-- Data type: integer
-
-### `Rules[].Services[].Filters[]`
-
-Specifies the list of HTTP-based filters used to modify a request prior to
-routing it to this upstream service.
-
-#### Values
-
-- Default: none
-- Data type: Map that contains the following fields:
-  - `Headers`
-  - `UrlRewrite`
-
-### `Rules[].Services[].Filters[].Headers[]`
-
-Defines operations to perform on matching request headers.
-
-#### Values
-
-This field contains the following configuration objects:
-
-| Parameter | Description                                                                                                                                                                                                                                                                                                                                                                                                                                  | Type            |
-| --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
-| `set`     | Configure this field to rewrite the HTTP request header. It specifies the name of an HTTP header to overwrite and the new value to set. Any existing values associated with the header name are overwritten. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to set.</li><li>`value`: Required string that specifies the value of the HTTP header to set.</li></ul> | List of maps    |
-| `add`     | Configure this field to append the request header with a new value. It specifies the name of an HTTP header to append and the values to add. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to append.</li><li>`value`: Required string that specifies the value of the HTTP header to add.</li></ul>                                                              | List of maps    |
-| `remove`  | Configure this field to specify an array of header names to remove from the request header.                                                                                                                                                                                                                                                                                                                                                  | List of strings |
-
-### `Rules[].Services[].Filters[].URLRewrite`
-
-Specifies rule for rewriting the URL of incoming requests.
-
-#### Values
-
-- Default: none
-- This field is a map that contains a `Path` field.
-
-### `Rules[].Services[].Filters[].RetryFilters`
-
-Specifies a block of settings Consul uses to retry a request if it fails.
-
-### Values
-
-- Default: None
-- Data type: Map containing the following parameters:
-  - `NumRetries`
-  - `RetryOnConnectFailure`
-  - `RetryOn`
-  - `RetryOnStatusCodes`
-
-### `Rules[].Services[].Filters[].RetryFilters{}.NumRetries`
-
-Specifies the number of times to retry the request when a retry condition occurs.
-
-#### Values
-
-- Default: `1`
-- Data type: Integer
-
-### `Rules[].Services[].Filters[].RetryFilters{}.RetryOnConnectFailure`
-
-Enables Consul to retry the request if the connection fails. Define the one or more retry configurations to define the retry logic for the route.
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `Rules[].Services[].Filters[].RetryFilters{}.RetryOn`
-
-Specifies a list of conditions for Consul to retry requests based on the response from an upstream service. The following retry conditions are supported:
-
-| Conditions           | Description                                                                                              |
-| :------------------- | :------------------------------------------------------------------------------------------------------- |
-| `5xx`                | Consul retries the request when an upstream responds with any 5xx error code or does not respond at all. |
-| `gateway-error`      | Consul retries the request when the upstream responds with a 502, 503, or 504 error.                     |
-| `reset`              | Consul retries the request when the upstream does not respond at all.                                    |
-| `connect-failure`    | Consul retries the request when the connection to the upstream fails.                                    |
-| `envoy-ratelimited`  | Consul retries the request when the header `x-envoy-ratelimited` is present.                             |
-| `retriable-4xx`      | Consul retries the request when the upstream responds with a retriable 4xx code.                         |
-| `refused-stream`     | Consul retries the request when the upstream resets the stream with a `REFUSED_STREAM` error code.       |
-| `cancelled`          | Consul retries the request when the gRPC status code in the response headers is `cancelled`.             |
-| `deadline-exceeded`  | Consul retries the request when the gRPC status code in the response headers is `deadline-exceeded`.     |
-| `internal`           | Consul retries the request when the gRPC status code in the response headers is `internal`.              |
-| <nobr>`resource-exhausted`</nobr> | Consul retries the request when the gRPC status code in the response headers is `resource-exhausted`.    |
-| `unavailable`        | Consul retries the request when the gRPC status code in the response headers is `unavailable`.           |
-
-#### Values
-
-- Default: None
-- Data type: List of strings. Strings must match one of the following values:
-
-  - `5xx`
-  - `gateway-error`
-  - `reset`
-  - `connect-failure`
-  - `envoy-ratelimited`
-  - `retriable-4xx`
-  - `refused-stream`
-  - `cancelled`
-  - `deadline-exceeded`
-  - `internal`
-  - `resource-exhausted`
-  - `unavailable`
-
-### `Rules[].Services[].Filters[].RetryFilters{}.RetryOnStatusCodes`
-
-Specifies a list of integers for [HTTP response status codes](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status) that trigger a retry request.
-
-#### Values
-
-- Default: None
-- Data type: List of integers
-
-### `Rules[].Services[].Filters[].TimeoutFilter`
-
-Specifies timeout settings for routes from an API gateway listener to the destination service in Consul service mesh.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-The following table describes the settings you can configure in the `TimeoutFilter` map:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `IdleTimeout` | Specifies the total amount of time permitted for the request stream to be idle. | Integer | `0` |
-| `RequestTimeout` | Specifies the total amount of time in nanoseconds, including retry attempts, Consul permits for the entire downstream request to be processed. | Integer | `0` |
-
-
-### `Rules[].Services[].ResponseFilters[]`
-
-Specifies the list of HTTP-based filters used to modify a response prior to routing it to the calling client.
-
-#### Values
-
-- Default: none
-- Data type: Map that contains the following fields:
-  - `Headers`
-
-### `Rules[].Services[].ResponseFilters[].Headers[]`
-
-Defines operations to perform on matching response headers when an incoming request matches the `Rules.Matches` configuration.
-
-#### Values
-
-This field contains the following configuration objects:
-
-| Parameter | Description                                                                                                                                                                                                                                                                                                                                                                                                                                  | Type            |
-| --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
-| `set`     | Configure this field to rewrite the HTTP response header. It specifies the name of an HTTP header to overwrite and the new value to set. Any existing values associated with the header name are overwritten. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to set.</li><li>`value`: Required string that specifies the value of the HTTP header to set.</li></ul> | List of maps    |
-| `add`     | Configure this field to append the response header with a new value. It specifies the name of an HTTP header to append and the values to add. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to append.</li><li>`value`: Required string that specifies the value of the HTTP header to add.</li></ul>                                                              | List of maps    |
-| `remove`  | Configure this field to specify an array of header names to remove from the response header.                                                                                                                                                                                                                                                                                                                                                  | List of strings |
-
-
-## Examples
-
-The following examples demonstrate common HTTP route configuration patterns for specific use cases.
-
-### Configure JWT verification settings
-
-In the following example, the route is configured to accept incoming requests from the `okta` provider that requires the client to have `admin` permissions.
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
-
-```hcl
-kind = "http-route"
-name = "api-gateway-route"
-parents = [
-  {
-    sectionName = "listener-one"
-    name = "api-gateway"
-    kind = "api-gateway"
-  },
-]
-rules = [
-  {
-    matches = /
-  }
-  {
-    matches = /admin
-    filters = {
-      JWT = {
-        Providers = [
-          {
-            Name = "okta", # this is referencing an existing JWT provider config entry
-            VerifyClaims = {
-              Path = ["perms", "role"],
-              Value = "admin",
-            }
-          }
-        ]
-      }
-    }
-    services = [
-      {
-        name = "bender"
-      }
-    ]
-  }
-]
-```
-</Tab>
-<Tab heading="JSON" group="json">
-
-```json
-{
-  "kind": "http-route",
-  "name": "api-gateway-route",
-  "parents": [
-    {
-      "sectionName": "listener-one",
-      "name": "api-gateway",
-      "kind": "api-gateway"
-    }
-  ],
-  "rules": [
-    {
-      "matches": "/"
-    },
-    {
-      "matches": "/admin",
-      "filters": {
-        "JWT": {
-          "Providers": [
-            {
-              "Name": "okta",
-              "VerifyClaims": {
-                "Path": ["perms", "role"],
-                "Value": "admin"
-              }
-            }
-          ]
-        }
-      },
-    "services": [
-      {
-        "name": "okta-verified-service"
-      }
-    ]
-  }]
-}
-
-```
-
-</Tab>
-</Tabs>
diff --git a/website/content/docs/connect/config-entries/index.mdx b/website/content/docs/connect/config-entries/index.mdx
index a27bca1c5d3f1..de5acd1bce965 100644
--- a/website/content/docs/connect/config-entries/index.mdx
+++ b/website/content/docs/connect/config-entries/index.mdx
@@ -23,8 +23,6 @@ The following configuration entries are supported:
 - [Proxy Defaults](/consul/docs/connect/config-entries/proxy-defaults) - controls
   proxy configuration
 
-- [Sameness Group](/consul/docs/connect/config-entries/sameness-group) - defines partitions and cluster peers with identical services
-
 - [Service Defaults](/consul/docs/connect/config-entries/service-defaults) - configures
   defaults for all the instances of a given service
 
diff --git a/website/content/docs/connect/config-entries/ingress-gateway.mdx b/website/content/docs/connect/config-entries/ingress-gateway.mdx
index 7b5eb23e17790..6af84751546da 100644
--- a/website/content/docs/connect/config-entries/ingress-gateway.mdx
+++ b/website/content/docs/connect/config-entries/ingress-gateway.mdx
@@ -7,14 +7,6 @@ description: >-
 
 # Ingress gateway configuration entry reference
 
-<Note>
-
-Ingress gateway is deprecated and will not be enhanced beyond its current capabilities. Ingress gateway is fully supported in this version but will be removed in a future release of Consul.
-
-Consul's API gateway is the recommended alternative to ingress gateway.
-
-</Note>
-
 This topic provides configuration reference information for the ingress gateway configuration entry. An ingress gateway is a type of proxy you register as a service in Consul to enable network connectivity from external services to services inside of the service mesh. Refer to [Ingress gateways overview](/consul/docs/connect/gateways/ingress-gateway) for additional information.
 
 ## Configuration model
@@ -723,7 +715,7 @@ Specifies a list of services that the listener exposes to services outside the m
 Specifies the name of a service to expose to the listener. You can specify services in the following ways:
 
 - Provide the name of a service registered in the Consul catalog.
-- Provide the name of a service defined in other configuration entries. Refer to [Service Mesh Traffic Management Overview](/consul/docs/connect/manage-traffic) for additional information.
+- Provide the name of a service defined in other configuration entries. Refer to [Service Mesh Traffic Management Overview](/consul/docs/connect/l7-traffic) for additional information.
 - Provide a `*` wildcard to expose all services in the datacenter. Wild cards are not supported for listeners configured for TCP. Refer to [`Listeners[].Protocol`](#listeners-protocol) for additional information.
 
 #### Values
@@ -961,7 +953,7 @@ Specifies a list of cipher suites that the listener supports when negotiating co
 
 ### `Listeners[].TLS.SDS`
 
-Specifies parameters for loading the TLS certificates from an external SDS service. Refer to [Serve custom TLS certificates from an external service](/consul/docs/connect/gateways/ingress-gateway/tls-external-service) for additional information.
+Specifies parameters for loading the TLS certificates from an external SDS service. Refer to [Serve custom TLS certificates from an external service](/consul/docs/connect/gateways/ingress-gateway/ingress-gateways-tls-external-service) for additional information.
 
 Consul applies the SDS configuration specified in this field to all services in the listener. You can override the `Listeners.TLS.SDS` configuration per service by configuring the  [`Listeners.Services.TLS.SDS`](#listeners-services-tls-sds) settings for each service.
 
@@ -970,7 +962,7 @@ Consul applies the SDS configuration specified in this field to all services in
 - Default: None
 - The data type is a map containing `ClusterName` and `CertResource` fields.
 
-The following table describes how to configure SDS parameters. Refer to [Configure static SDS clusters](/consul/docs/connect/gateways/ingress-gateway/tls-external-service#configure-static-sds-clusters) for usage information:
+The following table describes how to configure SDS parameters. Refer to [Configure static SDS clusters](/consul/docs/connect/gateways/ingress-gateway/ingress-gateways-tls-external-service#configure-static-sds-clusters) for usage information:
 
 | Parameter | Description | Data type |
 | ---       | ---         | ---       |
@@ -1054,18 +1046,15 @@ Specifies the TLS configuration settings for the gateway.
   - [`tlsMaxVersion`](#spec-tls-tlsmaxversion)
   - [`cipherSuites`](#spec-tls-tlsciphersuites)
   - [`sds`](#spec-tls-sds)
-
 ### `spec.tls.enabled`
 
 Enables and disables TLS for the configuration entry. Set to `true` to enable built-in TLS for every listener on the gateway. TLS is disabled by default.
 
 When enabled, Consul adds each host defined in every service's `Hosts` field to the gateway's x509 certificate as a DNS subject alternative name (SAN).
-
 #### Values
 
  - Default: `false`
  - Data type: boolean
-
 ### `spec.tls.tlsMinVersion`
 
 Specifies the minimum TLS version supported for gateway listeners.
@@ -1109,7 +1098,7 @@ Specifies a list of cipher suites that gateway listeners support when negotiatin
 
 ### `spec.tls.sds`
 
-Specifies parameters for loading the TLS certificates from an external SDS service. Refer to [Serve custom TLS certificates from an external service](/consul/docs/connect/gateways/ingress-gateway/tls-external-service) for additional information.
+Specifies parameters for loading the TLS certificates from an external SDS service. Refer to [Serve custom TLS certificates from an external service](/consul/docs/connect/gateways/ingress-gateway/ingress-gateways-tls-external-service) for additional information.
 
 Consul applies the SDS configuration specified in this field as defaults for all listeners defined in the gateway. You can override the SDS settings for per listener or per service defined in the listener. Refer to the following configurations for additional information:
 
@@ -1258,7 +1247,7 @@ Specifies a list of services that the listener exposes to services outside the m
 Specifies the name of a service to expose to the listener. You can specify services in the following ways:
 
 - Provide the name of a service registered in the Consul catalog.
-- Provide the name of a service defined in other configuration entries. Refer to [Service Mesh Traffic Management Overview](/consul/docs/connect/manage-traffic) for additional information. Refer to [HTTP listener with path-based routes](#http-listener-with-path-based-routes) for an example.
+- Provide the name of a service defined in other configuration entries. Refer to [Service Mesh Traffic Management Overview](/consul/docs/connect/l7-traffic) for additional information. Refer to [HTTP listener with path-based routes](#http-listener-with-path-based-routes) for an example.
 - Provide a `*` wildcard to expose all services in the datacenter. Wild cards are not supported for listeners configured for TCP. Refer to [`spec.listeners.protocol`](#spec-listeners-protocol) for additional information.
 
 #### Values
@@ -1372,7 +1361,7 @@ If unspecified, Consul applies the [`sds`](#spec-tls-sds) settings configured fo
   - `clusterName`
   - `certResource`
 
-The following table describes how to configure SDS parameters. Refer to [Serve custom TLS certificates from an external service](/consul/docs/connect/gateways/ingress-gateway/tls-external-service) for usage information:
+The following table describes how to configure SDS parameters. Refer to [Serve custom TLS certificates from an external service](/consul/docs/connect/gateways/ingress-gateway/ingress-gateways-tls-external-service) for usage information:
 
 | Parameter | Description | Data type |
 | ---       | ---         | ---       |
@@ -1497,7 +1486,7 @@ Specifies a list of cipher suites that the listener supports when negotiating co
 
 ### `spec.listeners[].tls.sds`
 
-Specifies parameters for loading the TLS certificates from an external SDS service. Refer to [Serve custom TLS certificates from an external service](/consul/docs/connect/gateways/ingress-gateway/tls-external-service) for additional information.
+Specifies parameters for loading the TLS certificates from an external SDS service. Refer to [Serve custom TLS certificates from an external service](/consul/docs/connect/gateways/ingress-gateway/ingress-gateways-tls-external-service) for additional information.
 
 Consul applies the SDS configuration specified in this field to all services in the listener. You can override the `spec.listeners[].tls.sds` configuration per service by configuring the  [`spec.listeners.services.tls.sds`](#spec-listeners-services-tls-sds) settings for each service.
 
@@ -1508,7 +1497,7 @@ Consul applies the SDS configuration specified in this field to all services in
   - `clusterName`
   - `certResource`
 
-The following table describes how to configure SDS parameters. Refer to [Configure static SDS clusters](/consul/docs/connect/gateways/ingress-gateway/tls-external-service#configure-static-sds-clusters) for usage information:
+The following table describes how to configure SDS parameters. Refer to [Configure static SDS clusters](/consul/docs/connect/gateways/ingress-gateway/ingress-gateways-tls-external-service#configure-static-sds-clusters) for usage information:
 
 | Parameter | Description | Data type |
 | ---       | ---         | ---       |
@@ -1530,7 +1519,7 @@ Refer to the following examples for common ingress gateway configuration pattern
 
 The following example sets up a TCP listener on an ingress gateway named `us-east-ingress` that proxies traffic to the `db` service. For Consul Enterprise, the `db` service can only listen for traffic in the `default` namespace inside the `team-frontend` admin partition:
 
-#### Consul CE
+#### Consul OSS
 
 <CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
@@ -1657,7 +1646,7 @@ The Consul Enterprise version implements the following additional configurations
 - The ingress gateway is set up in the `default` [namespace](/consul/docs/enterprise/namespaces) and proxies traffic to all services in the `frontend` namespace.
 - The `api` and `web` services are proxied to team-specific [admin partitions](/consul/docs/enterprise/admin-partitions):
 
-#### Consul CE
+#### Consul OSS
 
 <CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
diff --git a/website/content/docs/connect/config-entries/jwt-provider.mdx b/website/content/docs/connect/config-entries/jwt-provider.mdx
deleted file mode 100644
index 9ea7ce40ba01b..0000000000000
--- a/website/content/docs/connect/config-entries/jwt-provider.mdx
+++ /dev/null
@@ -1,1298 +0,0 @@
----
-page_title: JWT provider configuration entry reference
-description: |-
- JWT provider configuration entries add JSON Web Token token validation to intentions in the service mesh. Learn how to write `jwt-provider` config entries in HCL or YAML with a specification reference, configuration model, a complete example, and example code by use case.
----
-
-# JWT provider configuration entry reference
-
-This page provides reference information for the JWT provider configuration entry, which configures Consul to use a JSON Web Token (JWT) and JSON Web Key Set (JWKS) in order to add JWT validation to proxies in the service mesh. Refer to [Use JWT authorization with service intentions](/consul/docs/connect/intentions/jwt-authorization) for more information.
-
-## Configuration model
-
-The following list outlines field hierarchy, language-specific data types, and requirements in a JWT provider configuration entry. Click on a property name to view additional details, including default values.
-
-<Tabs>
-
-<Tab heading="HCL and JSON" group="hcl">
-
-- [`Kind`](#kind): string | required | must be set to `jwt-provider`
-- [`Name`](#name): string | required
-- [`Issuer`](#issuer): string
-- [`JSONWebKeySet`](#jsonwebkeyset): map
-  - [`Local`](#jsonwebkeyset-local): map
-    - [`JWKS`](#jsonwebkeyset-local-jwks): string
-    - [`Filename`](#jsonwebkeyset-local-filename): string
-  - [`Remote`](#jsonwebkeyset-remote): map
-    - [`URI`](#jsonwebkeyset-remote-uri): string
-    - [`RequestTimeoutMs`](#jsonwebkeyset-remote-requesttimeoutms): integer
-    - [`CacheDuration`](#jsonwebkeyset-remote-cacheduration): string | `5m`
-    - [`FetchAsynchronously`](#jsonwebkeyset-remote-fetchasynchronously): boolean | `false`
-    - [`JWKSCluster`](#jsonwebkeyset-remote-jwkscluster): map
-      - [`DiscoveryType`](#jsonwebkeyset-remote-jwkscluster-discoverytype): string | `STRICT_DNS`
-      - [`ConnectTimeout`](#jsonwebkeyset-remote-jwkscluster-connecttimeout): string | `5s`
-      - [`TLSCertificates`](#jsonwebkeyset-remote-jwkscluster-tlscertificates): map
-        - [`CaCertificateProviderInstance`](#jsonwebkeyset-remote-jwkscluster-tlscertificates-cacertificateproviderinstance): map
-          - [`InstanceName`](#jsonwebkeyset-remote-jwkscluster-tlscertificates-cacertificateproviderinstance): string | `default`
-          - [`CertificateName`](#jsonwebkeyset-remote-jwkscluster-tlscertificates-cacertificateproviderinstance): string
-        - [`TrustedCA`](#jsonwebkeyset-remote-jwkscluster-tlscertificates-trustedca): map
-          - [`Filename`](#jsonwebkeyset-remote-jwkscluster-tlscertificates-trustedca): string
-          - [`EnvironmentVariable`](#jsonwebkeyset-remote-jwkscluster-tlscertificates-trustedca): string
-          - [`InlineString`](#jsonwebkeyset-remote-jwkscluster-tlscertificates-trustedca): string
-          - [`InlineBytes`](#jsonwebkeyset-remote-jwkscluster-tlscertificates-trustedca): string
-    - [`RetryPolicy`](#jsonwebkeyset-remote-retrypolicy): map
-      - [`NumRetries`](#jsonwebkeyset-remote-retrypolicy-numretries): integer | `0`
-      - [`RetryPolicyBackoff`](#jsonwebkeyset-remote-retrypolicy-retry-policy-backoff): map
-        - [`BaseInterval`](#jsonwebkeyset-remote-retrypolicy-retry-policy-backoff): string
-        - [`MaxInterval`](#jsonwebkeyset-remote-retrypolicy-retry-policy-backoff): string
-- [`Audiences`](#audiences): list of strings
-- [`Locations`](#locations): list of maps
-  - [`Header`](#locations-header): map
-    - [`Name`](#locations-header-name): string
-    - [`ValuePrefix`](#locations-header-valueprefix): string
-    - [`Forward`](#locations-header-forward): boolean | `false`
-  - [`QueryParam`](#locations-queryparam): map
-    - [`Name`](#locations-queryparam): string
-  - [`Cookie`](#locations-cookie): map
-    - [`Name`](#locations-cookie): string
-- [`Forwarding`](#forwarding): map
-  - [`HeaderName`](#forwarding-headername): string
-  - [`PadForwardPayloadHeader`](#forwarding-padforwardpayloadheader): boolean | `false`
-- [`ClockSkewSeconds`](#clockskewseconds): integer | `30`
-- [`CacheConfig`](#cacheconfig): map
-  - [`Size`](#cacheconfig-size): integer | `0`
-
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-
-- [`apiVersion`](#apiversion): string | required | must be set to `consul.hashicorp.com/v1alpha1`
-- [`kind`](#kind): string | required | must be set to `JWTProvider`
-- [`metadata`](#metadata): map | required
-  - [`name`](#metadata-name): string | required
-  - [`namespace`](#metadata-namespace): string
-- [`spec`](#spec): map | required
-  - [`issuer`](#spec-issuer): string
-  - [`jsonWebKeySet`](#spec-jsonwebkeyset): map
-    - [`local`](#spec-jsonwebkeyset-local): map
-      - [`jwks`](#spec-jsonwebkeyset-local-jwks): string
-      - [`filename`](#spec-jsonwebkeyset-local-filename): string
-    - [`remote`](#spec-jsonwebkeyset-remote): map
-      - [`uri`](#spec-jsonwebkeyset-remote-uri): string
-      - [`requestTimeoutMs`](#spec-jsonwebkeyset-remote-requesttimeoutms): integer
-      - [`cacheDuration`](#spec-jsonwebkeyset-remote-cacheduration): string | `5m`
-      - [`fetchAsynchronously`](#spec-jsonwebkeyset-remote-fetchasynchronously): boolean | `false`
-      - [`retryPolicy`](#spec-jsonwebkeyset-remote-retrypolicy): map
-        - [`numRetries`](#spec-jsonwebkeyset-remote-retrypolicy-numretries): integer | `0`
-        - [`retryPolicyBackoff`](#spec-jsonwebkeyset-remote-retrypolicy-retry-policy-backoff): map
-          - [`baseInterval`](#spec-jsonwebkeyset-remote-retrypolicy-retry-policy-backoff): string
-          - [`maxInterval`](#spec-jsonwebkeyset-remote-retrypolicy-retry-policy-backoff): string
-      - [`jwksCluster`](#spec-jsonwebkeyset-remote-jwkscluster): map
-        - [`discoveryType`](#spec-jsonwebkeyset-remote-jwkscluster-discoverytype): string | `STRICT_DNS`
-        - [`connectTimeout`](#spec-jsonwebkeyset-remote-jwkscluster-connecttimeout): string | `5s`
-        - [`tlsCertificates`](#spec-jsonwebkeyset-remote-jwkscluster-tlscertificates): map
-          - [`caCertificateProviderInstance`](#spec-jsonwebkeyset-remote-jwkscluster-tlscertificates-cacertificateproviderinstance): map
-            - [`instanceName`](#spec-jsonwebkeyset-remote-jwkscluster-tlscertificates-cacertificateproviderinstance): string | `default`
-            - [`certificateName`](#spec-jsonwebkeyset-remote-jwkscluster-tlscertificates-cacertificateproviderinstance): string
-          - [`trustedCA`](#spec-jsonwebkeyset-remote-jwkscluster-tlscertificates-trustedca): map
-            - [`filename`](#spec-jsonwebkeyset-remote-jwkscluster-tlscertificates-trustedca): string
-            - [`environmentVariable`](#spec-jsonwebkeyset-remote-jwkscluster-tlscertificates-trustedca): string
-            - [`inlineString`](#spec-jsonwebkeyset-remote-jwkscluster-tlscertificates-trustedca): string
-            - [`inlineBytes`](#spec-jsonwebkeyset-remote-jwkscluster-tlscertificates-trustedca): string
-  - [`audiences`](#spec-audiences): list of strings
-  - [`locations`](#spec-locations): list of maps
-    - [`header`](#spec-locations-header): map
-      - [`name`](#spec-locations-header-name): string
-      - [`valuePrefix`](#spec-locations-header-valueprefix): string
-      - [`forward`](#spec-locations-header-forward): boolean | `false`
-    - [`queryParam`](#spec-locations-queryparam): map
-      - [`name`](#spec-locations-queryparam): string
-    - [`cookie`](#spec-locations-cookie): map
-      - [`name`](#spec-locations-cookie): string
-  - [`forwarding`](#spec-forwarding): map
-    - [`headerName`](#spec-forwarding-headername): string
-    - [`padForwardPayloadHeader`](#spec-forwarding-padforwardpayloadheader): boolean | `false`
-  - [`clockSkewSeconds`](#spec-clockskewseconds): integer | `30`
-  - [`cacheConfig`](#spec-cacheconfig): map
-    - [`size`](#spec-cacheconfig-size): integer | `0`
-
-</Tab>
-</Tabs>
-
-## Complete configuration
-
-When every field is defined, a JWT provider configuration entry has the following form:
-
-<Tabs>
-
-<Tab heading="HCL" group="hcl">
-
-```hcl
-Kind = "jwt-provider"                                # required
-Name = "<name-of-provider-configuration-entry>"      # required
-Issuer = "<jwt-issuer>"                              # required
-JSONWebKeySet = {                                    # required
-  Local = {                                        # cannot specify with JWKS{}.Remote
-    JWKS = "<JWKS-as-base64-string>"             # cannot specify with JWKS{}.Local{}.Filename
-    Filename = "<path/to/JWKS/file>"             # cannot specify with JWKS{}.Local{}.String
-  }
-}
-JSONWebKeySet = {
-  Remote = {                                   # cannot specify with JWKS{}.Local
-    URI = "<uniform-resource-identifier>"
-    RequestTimeoutMs = 1500
-    CacheDuration = "5m"
-    FetchAsynchronously = false
-    RetryPolicy = {
-      NumRetries = 0
-      RetryPolicyBackoff = {
-        BaseInterval = "1s"
-        MaxInterval = "10s"
-      }
-    }
-    JWKSCluster = {
-      DiscoveryType = "STATIC"
-      ConnectTimeout = "10s"
-      # specify only one child: TrustedCA or CaCertificateProviderInstance
-      TLSCertificates = {
-        # specify only one child: Filename, EnvironmentVariable, InlineString or InlineBytes
-        TrustedCA = {
-          Filename = "<path/to/cert/file>"
-          EnvironmentVariable = "<env-variable>"
-          InlineString = "<inline-string>"
-          InlineBytes = "\302\000\302\302\302\302"
-        }
-      }
-      TLSCertificates = {
-        CaCertificateProviderInstance = {
-          InstanceName = "<instance-name>"
-          CertificateName = "<certificate-name>"
-        }
-      }
-    }
-  }
-}
-
-Audiences = ["<aud-claims>"]
-Locations = [
-  {
-    Header = {
-      Name = "<name-of-header-with-token>"
-      ValuePrefix = "<prefix-in-header-before-token>"
-      Forward = false
-    }
-  },
-  {
-    QueryParam = {
-      Name = "<name-of-query-parameter-with-token>"
-    }
-  },
-  {
-    Cookie = {
-      Name = "<name-of-cookie-with-token>"
-    }
-  }
-]
-Forwarding = {
-  HeaderName = "<name-appended-to-forwarding-header>"
-  PadForwardPayloadHeader = false
-}
-ClockSkewSeconds = 30
-CacheConfig = {
-  Size = 0
-}
-```
-
-</Tab>
-
-<Tab heading="JSON" group="json">
-
-```json
-{
-  "Kind": "jwt-provider",                               // required
-  "Name": "<name-of-provider-configuration-entry>",     // required
-  "Issuer": "<jwt-issuer>",                             // required
-  "JSONWebKeySet": {                                    // required
-    "Local": {                                        // cannot specify with JWKS.Remote
-      "JWKS": "<JWKS-as-base64-string>",            // cannot specify with JWKS.Local.Filename
-      "Filename": "<path/to/JWKS/file>"             // cannot specify with JWKS.Local.String
-    }
-  },
-  "JSONWebKeySet": {
-    "Remote": {                                   // cannot specify with JWKS.Local
-      "URI": "<uniform-resource-identifier>",
-      "RequestTimeoutMs": "1500",
-      "CacheDuration": "5m",
-      "FetchAsynchronously": "false",
-      "RetryPolicy": {
-        "NumRetries": "0",
-        "RetryPolicyBackOff": {
-          "BaseInterval": "1s",
-          "MaxInterval": "10s"
-        }
-      },
-      "JWKSCluster": {
-        "DiscoveryType": "STATIC",
-        "ConnectTimeout": "10s",
-        // specify only one child: TrustedCA or CaCertificateProviderInstance
-        "TLSCertificates": {
-          // specify only one child: Filename, EnvironmentVariable, InlineString or InlineBytes
-          "TrustedCA": {
-            "Filename": "<path/to/cert/file>",
-            "EnvironmentVariable": "<env-variable>",
-            "InlineString": "<inline-string>",
-            "InlineBytes": "\302\000\302\302\302\302"
-          },
-        },
-        "TLSCertificates": {
-          "CaCertificateProviderInstance": {
-            "InstanceName": "<instance-name>",
-            "CertificateName": "<certificate-name>"
-          }
-        }
-      }
-    }
-  },
-  "Audiences": ["<aud-claims>"],
-  "Locations": [
-    {
-      "Header": {
-        "Name": "<name-of-header-with-token>",
-        "ValuePrefix": "<prefix-in-header-before-token>",
-        "Forward": "false"
-      }
-    },
-    {
-      "QueryParam": {
-        "Name":"<name-of-query-parameter-with-token>",
-      }
-    },
-    {
-      "Cookie": {
-        "Name": "<name-of-cookie-with-token>"
-      }
-    }
-  ],
-  "Forwarding": {
-    "HeaderName": "<name-appended-to-forwarding-header>",
-    "PadForwardPayloadHeader": "false"
-  },
-  "ClockSkewSeconds": "30",
-  "CacheConfig": {
-    "Size": "0"
-  }
-}
-```
-
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1         # required
-kind: JWTProvider                                 # required
-metadata:                                         # required
-  name: <name-of-provider-configuration-entry>    # required
-  namespace: <namespace>
-spec:                                             # required
-  issuer: <jwt-issuer>
-  jsonWebKeySet:
-    local:                                        # cannot specify with spec.jsonWebKeySet.remote
-     jwks: <jwks-as-base64-string>                # cannot specify with spec.jsonWebKeySet.local.filename
-     filename: <path/to/jwks/file>                # cannot specify with spec.jsonWebKeySet.local.string
-  jsonWebKeySet:
-    remote:                                       # cannot specify with spec.jsonWebKeySet.local
-      uri: <uniform-resource-identifier>
-      requestTimeoutMs: 1500
-      cacheDuration: 5m
-      fetchAsynchronously: false
-      retryPolicy:
-        numRetries: 0
-        retryPolicyBackoff:
-          baseInterval: 1s
-          maxInterval: 10s
-      jwksCluster:
-        discoveryType: STATIC
-        connectTimeout: 10s
-        # specify only one child: trustedCA or caCertificateProviderInstance
-        tlsCertificates:
-          # specify only one child: filename, environmentVariable, inlineString or inlineBytes
-          trustedCA:
-            filename: <path/to/cert/file>
-            environmentVariable: <env-variable>
-            inlineString: <inline-string>
-            inlineBytes: \302\000\302\302\302\302
-        tlsCertificates:
-          caCertificateProviderInstance:
-            instanceName: <instance-name>
-            certificateName: <certificate-name>
-  audiences: [<aud-claims>]
-  locations:
-    header:
-      name: <name-of-header-with-token>
-      valuePrefix: "<prefix-in-header-before-token>"
-      forward: false
-    queryParam:
-      name: "<name-of-query-parameter-with-token>"
-    cookie:
-      name: "<name-of-cookie-with-token>"
-  forwarding:
-    headerName: "<name-appended-to-forwarding-header>"
-    padForwardPayloadHeader: false
-  clockSkewSeconds: 30
-  cacheConfig:
-    size: 0
-```
-
-</Tab>
-</Tabs>
-
-## Specification
-
-This section provides details about the fields you can configure in the JWT provider configuration entry.
-
-<Tabs>
-
-<Tab heading="HCL" group="hcl">
-
-### `Kind`
-
-Specifies the type of configuration entry to implement.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String value that must be set to `jwt-provider`.
-
-### `Name`
-
-Specifies a name for the configuration entry. We recommend naming the configuration file after the JWT provider used in the configuration. Refer to the [Okta JWT Provider example](#okta-jwt-provider) for an example configuration.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String
-
-### `Issuer`
-
-Specifies the provider that issued the JWT. This value must match the token’s `iss` (issuer) claim.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `JSONWebKeySet`
-
-Defines a JSON Web Key Set. This field can be configured for a local file, or it can specify instructions to fetch a key set from a remote server. You cannot specify [`JSONWebKeySet{}.Local`](#jsonwebkeyset-local) and [`JSONWebKeySet{}.Remote`](#jsonwebkeyset-remote) in the same map.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain one of the following parameters:
-
-  - [`Local`](#jsonwebkeyset-local)
-  - [`Remote`](#jsonwebkeyset-remote)
-
-### `JSONWebKeySet{}.Local`
-
-Specifies a local source for the JSON Web Key Set. You can specify the source as a string in the configuration entry or you can include a local filename that contains the set. You cannot specify both `JWKS` and `Filename` in the same map.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain one of the following parameters:
-
-  - [`JWKS`](#jsonwebkeyset-local-jwks)
-  - [`Filename`](#jsonwebkeyset-local-filename)
-
-### `JSONWebKeySet{}.Local{}.JWKS`
-
-Specifies the JSON Web Key Set that validates the JWT’s signature, formatted as a base64 encoded string. You cannot specify the `JWKS` parameter if [`JWKS{}.Local{}.Filename`](#jsonwebkeyset-local-filename) is also specified in the same map.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `JSONWebKeySet{}.Local{}.Filename`
-
-Specifies the path to the JSON Web Key Set’s location on the local disk. When this field is specified, the file must be present on the disk for all proxies with service intentions referencing this provider. You cannot specify the `Filename` parameter if [`JWKS{}.Local{}.String`](#jsonwebkeyset-local-string) is also specified in the same map.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `JSONWebKeySet{}.Remote`
-
-Specifies a remote source for the JSON Web Key Set and configures behavior when fetching the key set.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-  - [`URI`](#jsonwebkeyset-remote-uri)
-  - [`RequestTimeoutMs`](#jsonwebkeyset-remote-requesttimeoutms)
-  - [`CacheDuration`](#jsonwebkeyset-remote-cacheduration)
-  - [`FetchAsynchronously`](#jsonwebkeyset-remote-fetchasynchronously)
-  - [`RetryPolicy`](#jsonwebkeyset-remote-retrypolicy)
-  - [`JWKSCluster`](#jsonwebkeyset-remote-jwkscluster)
-
-### `JSONWebKeySet{}.Remote{}.URI`
-
-Specifies the URI of the server to query for the JSON Key Web Set.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `JSONWebKeySet{}.Remote{}.RequestTimeoutMs`
-
-Specifies the length of time before a request to the remote URI times out, measured in milliseconds (ms).
-
-#### Values
-
-- Default: None
-- Data type: Integer
-
-### `JSONWebKeySet{}.Remote{}.CacheDuration`
-
-Specifies the amount of time cached keys are available before they expire.
-
-The default cache duration is 5 minutes.
-
-#### Values
-
-- Default: `5m`
-- Data type: String
-
-### `JSONWebKeySet{}.Remote{}.FetchAsynchronously`
-
-Determines if the JSON Web Key Set is fetched before a client request arrives. When enabled, the JWKS is fetched before incoming requests. When not enabled, the JWKS is fetched after each request arrives and the proxy listener waits for the JWKS to be fetched before activating.
-
-This parameter is set to `false` by default.
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `JSONWebKeySet{}.Remote{}.RetryPolicy`
-
-Defines a retry policy when fetching the JSON Web Key Set from the remote location.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-  - [`NumRetries`](#jsonwebkeyset-remote-retrypolicy-numretries)
-  - [`RetryPolicyBackoff`](#jsonwebkeyset-remote-retrypolicy-retrypolicybackoff)
-
-### `JSONWebKeySet{}.Remote{}.RetryPolicy{}.NumRetries`
-
-Specifies the number of times to attempt to fetch the JSON Web Key Set when the previous attempt fails.
-
-#### Values
-
-- Default: `0`
-- Data type: Integer
-
-### `JSONWebKeySet{}.Remote{}.RetryPolicy{}.RetryPolicyBackoff`
-
-Specifies a jittered exponential backoff strategy. When this field is empty, Envoy's default policy is used. This policy has a 1 second base interval and a 10 second max interval.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-| Parameter | Description                                        | Data type | Default value |
-| :-------- | :------------------------------------------------- | :-------- | :------------ |
-| `BaseInterval`| Specifies the base interval to use for the next back off computation. | String | `1s` |
-| `MaxInterval` | Specifies the maximum interval between retries. By default, this value is 10 times `BaseInterval`. | String | `10s` |
-
-### `JSONWebKeySet{}.Remote{}.JWKSCluster`
-
-Defines how Envoy fetches the remote JSON Web Key Set URI.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-  - [`DiscoveryType`](#jsonwebkeyset-remote-jwkscluster-discoverytype)
-  - [`ConnectTimeout`](#jsonwebkeyset-remote-jwkscluster-connecttimeout)
-  - [`TLSCertificates`](#jsonwebkeyset-remote-jwkscluster-tlscertificates)
-
-
-### `JSONWebKeySet{}.Remote{}.JWKSCluster{}.DiscoveryType`
-
-Specifies the service discovery type to use for resolving the cluster.
-You can specify the following discovery types:
-- `STRICT_DNS`
-- `STATIC`
-- `LOGICAL_DNS`
-- `EDS`
-- `ORIGINAL_DST`
-
-#### Values
-
-- Default: `STRICT_DNS`
-- Data type: String
-
-### `JSONWebKeySet{}.Remote{}.JWKSCluster{}.ConnectTimeout`
-
-Specifies the duration of time new network connections attempt to connect to hosts in the cluster before they timeout.
-
-#### Values
-
-- Default: `5s`
-- Data type: String
-
-### `JSONWebKeySet{}.Remote{}.JWKSCluster{}.TLSCertificates`
-
-Specifies the data containing certificate authority certificates to use for verifying a presented peer certificate.
-Envoy does not verify certificates that peers present if this field is not configured.
-
-You cannot specify [`TLSCertificates{}.CaCertificateProviderInstance`](#jsonwebkeyset-remote-jwkscluster-tlscertificates-cacertificateproviderinstance) and [`TLSCertificates{}.TrustedCA`](#jsonwebkeyset-remote-jwkscluster-tlscertificates-trustedca) in the same map.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-  - [`CaCertificateProviderInstance`](#jsonwebkeyset-remote-jwkscluster-tlscertificates-cacertificateproviderinstance)
-  - [`TrustedCA`](#jsonwebkeyset-remote-jwkscluster-tlscertificates-trustedca)
-
-### `JSONWebKeySet{}.Remote{}.JWKSCluster{}.TLSCertificates{}.CaCertificateProviderInstance`
-
-Specifies the certificate provider instance for fetching TLS certificates.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-| Parameter | Description                                        | Data type | Default value |
-| :-------- | :------------------------------------------------- | :-------- | :------------ |
-| `InstanceName`| Refers to the certificate provider instance name. | String | `default` |
-| `CertificateName` | Specifies the certificate instances or types. For example, use `ROOTCA` to specify a root-certificate. | String | None |
-
-### `JSONWebKeySet{}.Remote{}.JWKSCluster{}.TLSCertificates{}.TrustedCA`
-
-Specifies TLS certificate data containing certificate authority certificates. Specify exactly one of the following data holders:
-- `Filename`
-- `EnvironmentVariable`
-- `InlineString`
-- `InlineBytes`
-
-#### Values
-
-- Default: None
-- Data type: Map containing one of the following parameters:
-
-| Parameter | Description                                        | Data type | Default value |
-| :-------- | :------------------------------------------------- | :-------- | :------------ |
-| `Filename`| The name of the file on the local system to use a data source for trusted CA certificates. | String | None |
-| `EnvironmentVariable` | The environment variable on the local system to use a data source for trusted CA certificates. | String | None |
-| `InlineString` | A string to inline in the configuration for use as a data source for trusted CA certificates. | String    | None |
-| `InlineBytes` | A sequence of bytes to inline in the configuration for use as a data source for trusted CA certificates. | String | None |
-
-### `Audiences`
-
-Specifies a set of audiences that the JWT is allowed to access, formatted as a list of `aud` (audience) claims. When this field is specified, all JWTs verified with the provider must address at least one of the audiences in order to be considered valid.
-
-#### Values
-
-- Default: None
-- Data type: List of strings
-
-### `Locations`
-
-Specifies the locations in requests where the JWT can be found. Envoy checks all of these locations to extract a JWT.
-
-This field can specify token locations in a header, a query parameter, or a cookie. When no locations are specified, Envoy defaults to the following locations:
-
-1. Authorization header with Bearer schema: `"Authorization: Bearer <token>"`
-1. `access_token` query parameter.
-
-#### Values
-
-- Default: None
-- Data type: List that can contain maps of the following parameters:
-
-  - [`Header`](#locations-header)
-  - [`QueryParam`](#locations-queryparam)
-  - [`Cookie`](#locations-cookie)
-
-### `Locations[].Header`
-
-Defines how to extract a JWT from an HTTP request header.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-  - [`Name`](#locations-header-name)
-  - [`ValuePrefix`](#locations-header-valueprefix)
-  - [`Forward`](#locations-header-forward)
-
-### `Locations[].Header{}.Name`
-
-Specifies the name of the HTTP request header containing the token.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `Locations[].Header{}.ValuePrefix`
-
-Specifies a prefix that must precede the token in the header value.
-
-For example, `Bearer` is a standard value prefix for a header named "Authorization" that is formatted as `Authorization: Bearer <token>`. The prefix is not part of the token.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `Locations[].Header{}.Forward`
-
-Specifies whether the header with the JWT is forwarded after the token is verified. When set to `false`, the header is not forwarded.
-
-The default value is `false`.
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `Locations[].QueryParam`
-
-Defines how to extract a JWT from an HTTP request query parameter.
-
-#### Values
-
-- Default: None
-- Data type: Map that contains the following parameter:
-
-| Parameter | Description                                                     | Data type | Default value |
-| :-------- | :-------------------------------------------------------------- | :-------- | :------------ |
-| `Name`    | Specifies the name of the query parameter containing the token. | String    | None          |
-
-### `Locations[].Cookie`
-
-Defines how to extract a JWT from an HTTP request cookie.
-
-#### Values
-
-- Default: None
-- Data type: Map that contains the following parameter:
-
-| Parameter | Description                                        | Data type | Default value |
-| :-------- | :------------------------------------------------- | :-------- | :------------ |
-| `Name`| Specifies the name of the cookie containing the token. | String    | None          |
-
-### `Forwarding`
-
-Defines rules for forwarding JWTs to the backend after they are verified.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-  - [`HeaderName`](#forwarding-headername)
-  - [`PadForwardPayloadHeader`](#forwarding-padforwardpayloadheader)
-
-### `Forwarding{}.HeaderName`
-
-Specifies a header name to use when forwarding a verified JWT to the backend. This field does not assume where the JWT was extracted from, and it can be applied to tokens extracted from headers, query parameters, or cookies.
-
-The header value is base64 URL encoded. It is not padded by default.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `Forwarding{}.PadForwardPayloadHeader`
-
-Determines whether to add padding to the base64 encoded token specified in [`Forwarding{}.HeaderName`](#forwarding-header-name).
-
-By default, this field is set to `false`.
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `ClockSkewSeconds`
-
-Specifies the maximum allowable time difference from clock skew when validating the JSON web token’s `exp` (expiration) and `nbf`  (not before) claims, measured in seconds.
-
-By default, this parameter is configured to 30 seconds.
-
-#### Values
-
-- Default: `30`
-- Data type: Integer
-
-### `CacheConfig`
-
-Defines behavior for caching the validation result of previously encountered JWTs. Caching results can speed up verification when the same tokens are expected to be handled multiple times. By default, the cache can hold 100 JWTs.
-
-#### Values
-
-- Default: None
-- Data type: Map that contains the following parameter:
-
-| Parameter | Description                                        | Data type | Default value |
-| :-------- | :------------------------------------------------- | :-------- | :------------ |
-| `Size`    | Specifies the number of JSON web tokens to cache.  | Integer   | `100`         |
-
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-
-### `apiVersion`
-
-Specifies the version of the Consul API for integrating with Kubernetes. The value must be `consul.hashicorp.com/v1alpha1`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- String value that must be set to `consul.hashicorp.com/v1alpha1`.
-
-### `kind`
-
-Specifies the type of configuration entry to implement. Must be set to `jwtProvider`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String value that must be set to `jwtProvider`.
-
-### `metadata`
-
-Map that contains an arbitrary name for the configuration entry and the namespace it applies to.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `metadata.name`
-
-Specifies a name for the configuration entry. The name is metadata that you can use to reference the configuration entry when performing Consul operations, such as applying a configuration entry to a specific cluster. We recommend naming the configuration file after the JWT provider used in the configuration. Refer to the [Okta JWT Provider example](#okta-jwt-provider) for an example configuration.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String
-
-### `metadata.namespace` <EnterpriseAlert inline />
-
-Specifies the namespace that the configuration applies to. Refer to [namespaces](/consul/docs/enterprise/namespaces) for more information.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `spec`
-
-Map that contains the details about the `jwtProvider` configuration entry. The `apiVersion`, `kind`, and `metadata` fields are siblings of the spec field. All other configurations are children.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-### `spec.issuer`
-
-Specifies the provider that issued the JWT. This value must match the token’s `iss` (issuer) claim.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `spec.jsonWebKeySet`
-
-Defines a JSON Web Key Set. This field can be configured for a local file, or it can specify instructions to fetch a key set from a remote server. You cannot specify [`spec.jsonWebKeySet.local`](#spec-jsonwebkeyset-local) and [`spec.jsonWebKeySet.remote`](#spec-jsonwebkeyset-remote) in the same map.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain one of the following parameters:
-
-  - [`local`](#spec-jsonwebkeyset-local)
-  - [`remote`](#spec-jsonwebkeyset-remote)
-
-### `spec.jsonWebKeySet.local`
-
-Specifies a local source for the JSON Web Key Set. You can specify the source as a string in the configuration entry or you can include a local filename that contains the set. You cannot specify both `string` and `filename` in the same map.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain one of the following parameters:
-
-  - [`jwks`](#spec-jsonwebkeyset-local-jwks)
-  - [`filename`](#spec-jsonwebkeyset-local-filename)
-
-### `spec.jsonWebKeySet.local.jwks`
-
-Specifies the JSON Web Key Set that validates the JWT’s signature, formatted as a base64 encoded string. You cannot specify the `jwks` parameter if [`spec.jsonWebKeySet.local.filename`](#spec-jsonwebkeyset-local-filename) is also specified in the same map.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `spec.jsonWebKeySet.local.filename`
-
-Specifies the path to the JSON Web Key Set’s location on the local disk. When this field is specified, the file must be present on the disk for all proxies with service intentions referencing this provider. You cannot specify the `filename` parameter if [`spec.jsonWebKeySet.local.jwks`](#spec-jsonwebkeyset-local-jwks) is also specified in the same map.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `spec.jsonWebKeySet.remote`
-
-Specifies a remote source for the JSON Web Key Set and configures behavior when fetching the key set.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-  - [`uri`](#spec-jsonwebkeyset-remote-uri)
-  - [`requestTimeoutMs`](#spec-jsonwebkeyset-remote-requesttimeoutms)
-  - [`cacheDuration`](#spec-jsonwebkeyset-remote-cacheduration)
-  - [`fetchAsynchronously`](#spec-jsonwebkeyset-remote-fetchasynchronously)
-  - [`retryPolicy`](#spec-jsonwebkeyset-remote-retrypolicy)
-
-### `spec.jsonWebKeySet.remote.uri`
-
-Specifies the URI of the server to query for the JSON Key Web Set.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `spec.jsonWebKeySet.remote.requestTimeoutMs`
-
-Specifies the length of time before a request to the remote URI times out, measured in milliseconds (ms).
-
-#### Values
-
-- Default: None
-- Data type: Integer
-
-### `spec.jsonWebKeySet.remote.cacheDuration`
-
-Specifies the amount of time cached keys are available before they expire.
-
-The default cache duration is 5 minutes.
-
-#### Values
-
-- Default: `5m`
-- Data type: String
-
-### `spec.jsonWebKeySet.remote.fetchAsynchronously`
-
-Determines if the JSON Web Key Set is fetched before a client request arrives. When enabled, the JWKS is fetched before incoming requests. When not enabled, the JWKS is fetched after each request arrives and the proxy listener waits for the JWKS to be fetched before activating.
-
-This parameter is set to `false` by default.
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `spec.jsonWebKeySet.remote.retryPolicy`
-
-Defines a retry policy when fetching the JSON Web Key Set from the remote location.
-
-#### Values
-
-- Default: None
-- Data type: Map that contains the following parameter:
-
-  - [`numRetries`](#spec-jsonwebkeyset-remote-retrypolicy-numretries)
-  - [`retryPolicyBackoff`](#spec-jsonwebkeyset-remote-retrypolicy-retrypolicybackoff)
-
-### `spec.jsonWebKeySet.remote.retryPolicy.numRetries`
-
-Specifies the number of times to attempt to fetch the JSON Web Key Set when the previous attempt fails.
-
-#### Values
-
-- Default: `0`
-- Data type: Integer
-
-### `spec.jsonWebKeySet.remote.retryPolicy.retryPolicyBackoff`
-
-Specifies a jittered exponential backoff strategy. When this field is empty, Envoy's default policy is used. This policy has a 1 second base interval and a 10 second max interval.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-| Parameter | Description                                        | Data type | Default value |
-| :-------- | :------------------------------------------------- | :-------- | :------------ |
-| `baseInterval`| Specifies the base interval to use for the next back off computation. | String | `1s` |
-| `maxInterval` | Specifies the maximum interval between retries. By default, this value is 10 times `BaseInterval`. | String | `10s` |
-
-### `spec.jsonWebKeySet.remote.jwksCluster`
-
-Defines how Envoy fetches the remote JSON Web Key Set URI.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-  - [`discoveryType`](#spec-jsonwebkeyset-remote-jwkscluster-discoverytype)
-  - [`connectTimeout`](#spec-jsonwebkeyset-remote-jwkscluster-connecttimeout)
-  - [`tlsCertificates`](#spec-jsonwebkeyset-remote-jwkscluster-tlscertificates)
-
-### `spec.jsonWebKeySet.remote.jwksCluster.discoveryType`
-
-Specifies the service discovery type to use for resolving the cluster.
-You can specify the following discovery types:
-- `STRICT_DNS`
-- `STATIC`
-- `LOGICAL_DNS`
-- `EDS`
-- `ORIGINAL_DST`
-
-String values must be a valid [Cluster DiscoveryType](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/cluster/v3/cluster.proto#envoy-v3-api-enum-config-cluster-v3-cluster-discoverytype).
-
-#### Values
-
-- Default: `STRICT_DNS`
-- Data type: String
-
-### `spec.jsonWebKeySet.remote.jwksCluster.connectTimeout`
-
-Specifies the timeout for new network connections to hosts in the cluster.
-
-#### Values
-
-- Default: `5s`
-- Data type: String
-
-### `spec.jsonWebKeySet.remote.jwksCluster.tlsCertificates`
-
-Specifies the data containing certificate authority certificates to use for verifying a presented peer certificate.
-Envoy does not verify certificates that peers present if this field is not configured.
-
-You cannot specify [`spec.tlsCertificates.caCertificateProviderInstance`](#spec-jsonwebkeyset-remote-jwkscluster-tlscertificates-cacertificateproviderinstance) and [`spec.tlsCertificates.trustedCA`](#spec-jsonwebkeyset-remote-jwkscluster-tlscertificates-trustedca) in the same map.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-  - [`caCertificateProviderInstance`](#spec-jsonwebkeyset-remote-jwkscluster-tlscertificates-cacertificateproviderinstance)
-  - [`trustedCA`](#spec-jsonwebkeyset-remote-jwkscluster-tlscertificates-trustedca)
-
-### `spec.jsonWebKeySet.remote.jwksCluster.tlsCertificates.caCertificateProviderInstance`
-
-Specifies the certificate provider instance for fetching TLS certificates.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-| Parameter | Description                                        | Data type | Default value |
-| :-------- | :------------------------------------------------- | :-------- | :------------ |
-| `instanceName`| Refers to the certificate provider instance name. | String | `default` |
-| `certificateName` | Specifies the certificate instances or types. For example, use `ROOTCA` to specify a root-certificate. | String | None |
-
-### `spec.jsonWebKeySet.remote.jwksCluster.tlsCertificates.trustedCA`
-
-Specifies TLS certificate data containing certificate authority certificates. Specify exactly one of the following data holders:
-- `Filename`
-- `EnvironmentVariable`
-- `InlineString`
-- `InlineBytes`
-
-#### Values
-
-- Default: None
-- Data type: Map containing one of the following parameters:
-
-| Parameter | Description                                        | Data type | Default value |
-| :-------- | :------------------------------------------------- | :-------- | :------------ |
-| `filename`| The name of the file on the local system to use a data source for trusted CA certificates. | String | None  |
-| `environmentVariable` | The environment variable on the local system to use a data source for trusted CA certificates. | String | None |
-| `inlineString` | A string to inline in the configuration for use as a data source for trusted CA certificates. | String | None |
-| `inlineBytes` | A sequence of bytes to inline in the configuration for use as a data source for trusted CA certificates. | String | None |
-
-### `spec.audiences`
-
-Specifies a set of audiences that the JWT is allowed to access, formatted as a list of `aud` (audience) claims. When this field is specified, all JWTs verified with the provider must address at least one of the audiences in order to be considered valid.
-
-#### Values
-
-- Default: None
-- Data type: List of strings
-
-### `spec.locations`
-
-Specifies the locations in requests where the JWT can be found. Envoy checks all of these locations to extract a JWT.
-
-This field can specify token locations in a header, a query parameter, or a cookie. When no locations are specified, Envoy defaults to the following locations:
-
-1. Authorization header with Bearer schema: `"Authorization: Bearer <token>"`
-1. `access_token` query parameter.
-
-#### Values
-
-- Default: None
-- Data type: List that can contain maps of the following parameters:
-
-  - [`header`](#spec-locations-header)
-  - [`queryParam`](#spec-locations-queryparam)
-  - [`cookie`](#spec-locations-cookie)
-
-### `spec.locations[].header`
-
-Defines how to extract a JWT from an HTTP request header.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-  - [`name`](#spec-locations-header-name)
-  - [`valuePrefix`](#spec-locations-header-valueprefix)
-  - [`forward`](#spec-locations-header-forward)
-
-### `spec.locations[].header.name`
-
-Specifies the name of the HTTP request header containing the token.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `spec.locations[].header.valuePrefix`
-
-Specifies a prefix that must precede the token in the header value.
-
-For example, `Bearer` is a standard value prefix for a header named "Authorization" that is formatted as `Authorization: Bearer <token>`. The prefix is not part of the token.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `spec.locations[].header.forward`
-
-Specifies whether the header with the JWT is forwarded after the token is verified. When set to  `false`, the header is not forwarded.
-
-The default value is `false`.
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `spec.locations[].queryParam`
-
-Defines how to extract a JWT from an HTTP request query parameter.
-
-#### Values
-
-- Default: None
-- Data type: Map that contains the following parameter:
-
-| Parameter | Description                                                     | Data type | Default value |
-| :-------- | :-------------------------------------------------------------- | :-------- | :------------ |
-| `name`    | Specifies the name of the query parameter containing the token. | String    | None          |
-
-### `spec.locations[].cookie`
-
-Defines how to extract a JWT from an HTTP request cookie.
-
-#### Values
-
-- Default: None
-- Data type: Map that contains the following parameter:
-
-| Parameter | Description                                        | Data type | Default value |
-| :-------- | :------------------------------------------------- | :-------- | :------------ |
-| `name`| Specifies the name of the cookie containing the token. | String    | None          |
-
-### `spec.forwarding`
-
-Defines rules for forwarding JWTs to the backend after they are verified.
-
-#### Values
-
-- Default: None
-- Data type: Map that can contain the following parameters:
-
-  - [`headerName`](#spec-forwarding-headername)
-  - [`padForwardPayloadHeader`](#spec-forwarding-padforwardpayloadheader)
-
-### `spec.forwarding.headerName`
-
-Specifies a header name to use when forwarding a verified JWT to the backend. This field does not assume where the JWT was extracted from, and it can be applied to tokens extracted from headers, query parameters, or cookies.
-
-The header value is base64 URL encoded. It is not padded by default.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `spec.forwarding.padForwardPayloadHeader`
-
-Determines whether to add padding to the base64 encoded token specified in [spec.forwarding.headerName`](#spec-forwarding-header-name).
-
-By default, this field is set to `false`.
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `spec.clockSkewSeconds`
-
-Specifies the maximum allowable time difference from clock skew when validating the JSON web token’s `exp` (expiration) and `nbf`  (not before) claims, measured in seconds.
-
-By default, this parameter is configured to 30 seconds.
-
-#### Values
-
-- Default: `30`
-- Data type: Integer
-
-### `spec.cacheConfig`
-
-Defines behavior for caching the validation result of previously encountered JWTs. Caching results can speed up verification when the same tokens are expected to be handled multiple times. By default, the cache can hold 100 JWTs.
-
-#### Values
-
-- Default: None
-- Data type: Map that contains the following parameter:
-
-| Parameter | Description                                        | Data type | Default value |
-| :-------- | :------------------------------------------------- | :-------- | :------------ |
-| `size`    | Specifies the number of JSON web tokens to cache.  | Integer   | `100`         |
-
-</Tab>
-</Tabs>
-
-## Metrics
-
-Envoy proxies expose metrics that can track JWT authentication details. Use the following Envoy metrics:
-
-```yaml
-http.public_listener.jwt_authn.allowed
-http.public_listener.jwt_authn.cors_preflight_bypassed
-http.public_listener.jwt_authn.denied
-http.public_listener.jwt_authn.jwks_fetch_failed
-http.public_listener.jwt_authn.jwks_fetch_success
-http.public_listener.jwt_authn.jwt_cache_hit
-http.public_listener.jwt_authn.jwt_cache_miss
-```
-
-~> **Note:** Currently, Envoy does not reference these metrics in their documentation. Refer to [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/) for more information about exposed metrics.
-
-## Examples
-
-The following examples demonstrate common JWT provider configuration patterns for specific use cases.
-
-### Okta JWT provider
-
-The following example configures Consul to fetch a JSON Web Token issued by Okta. Consul fetches the token from the URI and keeps it in its cache for 30 minutes before the token expires. After validation, the token is forwarded to the backend with `user-token` appended to the HTTP header.
-
-<Tabs>
-
-<Tab heading="HCL" group="hcl">
-
-```hcl
-Kind = "jwt-provider"
-Name = "okta"
-
-Issuer = "okta"
-
-JSONWebKeySet = {
-    Remote = {
-        URI = "https://<org>.okta.com/oauth2/default/v1/keys"
-        CacheDuration = "30m"
-    }
-}
-
-Forwarding = {
-    HeaderName = "user-token"
-}
-```
-
-</Tab>
-
-<Tab heading="JSON" group="json">
-
-```json
-{
-  "Kind": "jwt-provider",
-  "Name": "okta",
-  "Issuer": "okta",
-  "JSONWebKeySet": {
-    "Remote": {
-        "URI": "https://<org>.okta.com/oauth2/default/v1/keys",
-        "CacheDuration": "30m"
-    }
-  },
-  "Forwarding": {
-    "HeaderName": "user-token"
-  }
-}
-```
-
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: JWTProvider
-metadata:
-  name: okta
-spec:
-  issuer: okta
-  jsonWebKeySet:
-    remote:
-      uri: https://<org>.okta.com/oauth2/default/v1/keys
-      cacheDuration: 30m
-  forwarding:
-    headerName: user-token
-```
-
-</Tab>
-</Tabs>
diff --git a/website/content/docs/connect/config-entries/mesh.mdx b/website/content/docs/connect/config-entries/mesh.mdx
index 4b5bb7ee2dfae..f83c1298052a2 100644
--- a/website/content/docs/connect/config-entries/mesh.mdx
+++ b/website/content/docs/connect/config-entries/mesh.mdx
@@ -17,7 +17,7 @@ Settings in this config entry apply across all namespaces and federated datacent
 Enforce that service mesh mTLS traffic uses TLS v1.2 or newer.
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 
 <CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
@@ -108,7 +108,7 @@ Note that the Kubernetes example does not include a `partition` field. Configura
 Only allow transparent proxies to dial addresses in the mesh.
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 
 <CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
@@ -189,7 +189,7 @@ Note that the Kubernetes example does not include a `partition` field. Configura
 Set the `PeerThroughMeshGateways` parameter to `true` to route peering control plane traffic through mesh gateways.
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 
 <CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
@@ -315,7 +315,7 @@ Note that the Kubernetes example does not include a `partition` field. Configura
           name: 'namespace',
           enterprise: true,
           description:
-            'Must be set to `default`. If running Consul Community Edition, the namespace is ignored (see [Kubernetes Namespaces in Consul CE](/consul/docs/k8s/crds#consul-ce)). If running Consul Enterprise see [Kubernetes Namespaces in Consul Enterprise](/consul/docs/k8s/crds#consul-enterprise) for additional information.',
+            'Must be set to `default`. If running Consul Open Source, the namespace is ignored (see [Kubernetes Namespaces in Consul OSS](/consul/docs/k8s/crds#consul-oss)). If running Consul Enterprise see [Kubernetes Namespaces in Consul Enterprise](/consul/docs/k8s/crds#consul-enterprise) for additional information.',
         },
       ],
       hcl: false,
@@ -336,12 +336,6 @@ Note that the Kubernetes example does not include a `partition` field. Configura
         },
       ],
     },
-    {
-      name: 'AllowEnablingPermissiveMutualTLS',
-      type: 'bool: false',
-      description:
-        'Controls whether `MutualTLSMode=permissive` can be set in the `proxy-defaults` and `service-defaults` configuration entries. '
-    },
     {
       name: 'TLS',
       type: 'TLSConfig: <optional>',
diff --git a/website/content/docs/connect/config-entries/proxy-defaults.mdx b/website/content/docs/connect/config-entries/proxy-defaults.mdx
index 31e436724bdf5..043d992637279 100644
--- a/website/content/docs/connect/config-entries/proxy-defaults.mdx
+++ b/website/content/docs/connect/config-entries/proxy-defaults.mdx
@@ -1,145 +1,58 @@
 ---
 layout: docs
-page_title: Proxy defaults configuration entry reference
+page_title: Proxy Defaults - Configuration Entry Reference
 description: >-
   The proxy defaults configuration entry kind defines default behaviors for proxies in the service mesh. Use the reference guide to learn about `""proxy-defaults""` config entry parameters.
 ---
 
-# Proxy defaults configuration reference
+# Proxy Defaults Configuration Entry
 
-This topic provides reference information for proxy defaults configuration entries. Refer to [Service mesh proxy overview](/consul/docs/connect/proxies) for information about using proxies in Consul.
+The `proxy-defaults` configuration entry (`ProxyDefaults` on Kubernetes) allows you to globally configure passthrough Envoy settings for proxies in the service mesh, including both sidecars and gateways.
+It is different from the [`mesh` configuration entry](/consul/docs/connect/config-entries/mesh), which sets Consul features for cluster peering, transparent proxy, and TLS behavior that also affect Consul servers.
 
-## Introduction
+Only one global entry is supported.
+For Consul Enterprise, only the global entry in the `default` partition is recognized.
 
-Proxy defaults configuration entries set global passthrough Envoy settings for proxies in the service mesh, including sidecars and gateways. Proxy defaults configuration entries do not control features for peered clusters, transparent proxy, or TLS behavior. For information about configuring Consul settings that affect service mesh behavior, refer to the [mesh configuration entry reference](/consul/docs/connect/config-entries/mesh).
+## Introduction
 
-Consul only supports one global proxy defaults configuration entry at a time. If multiple configuration entries are defined in Consul Enterprise, Consul implements the configuration entry in the `default` partition.
+You can customize some service registration settings for service mesh proxies centrally using the `proxy-defaults` configuration entry in the `kind` field.
 
-## Configuration model
+You can still override this centralized configuration for specific services
+with the [`service-defaults`](/consul/docs/connect/config-entries/service-defaults)
+configuration entry `kind` or for individual proxy instances in their [sidecar
+service definitions](/consul/docs/connect/registration/sidecar-service).
 
-The following list outlines field hierarchy, language-specific data types, and requirements in proxy defaults configuration entries. Click on a property name to view additional details, including default values.
+## Usage
 
-<Tabs>
+1. Verify that your datacenter meets the conditions specified in the [Requirements](#requirements).
+1. Determine the settings you want to implement (see [Configuration](#configuration)). You can create a file containing the configuration or pass them to the state store directly to apply the configuration.
+1. Apply the configuration using one of the following methods:
+   - Kubernetes CRD: Refer to the [Custom Resource Definitions](/consul/docs/k8s/crds) documentation for details.
+   - Issue the `consul config write` command: Refer to the [Consul Config Write](/consul/commands/config/write) documentation for details.
 
-<Tab heading="HCL and JSON" group="hcl">
-
-- [`Kind`](#kind): string | required | must be set to `proxy-defaults`
-- [`Name`](#name): string | must be set to `global`
-- [`Namespace`](#namespace): string | `default` | <EnterpriseAlert inline/>
-- [`Partition`](#partition): string | `default` |  <EnterpriseAlert inline/>
-- [`Meta`](#meta): map 
-- [`Config`](#meta): map
-- [`EnvoyExtensions`](#envoyextensions): list of maps
-   - [`Name`](#envoyextensions): string
-   - [`Required`](#envoyextensions): string
-   - [`Arguments`](#envoyextensions): string
-   - [`ConsulVersion`](#envoyextensions): string
-   - [`EnvoyVersion`](#envoyextensions): string
-- [`Mode`](#mode): string
-- [`TransparentProxy`](#transparentproxy): map
-   - [`OutboundListenerPort`](#transparentproxy): number | `15001`
-   - [`DialedDirectly`](#transparentproxy): boolean | `false`
-- [`MutualTLSMode`](#mutualtlsmode): string 
-- [`MeshGateway`](#meshgateway): map
-   - [`Mode`](#meshgateway): string
-- [`Expose`](#expose): map
-   - [`Checks`](#expose-checks): boolean | `false`
-   - [`Paths`](#expose-paths): list of maps
-      - [`Path`](#expose-paths-path): string | must begin with `/` 
-      - [`LocalPathPort`](#expose-paths): number | `0` 
-      - [`ListenerPort`](#expose-paths): number | `0` 
-      - [`Protocol`](#expose-paths): string | `http` 
-- [`PrioritizeByLocality`](#prioritizebylocality): map | <EnterpriseAlert inline/>
-  - [`Mode`](#prioritizebylocality): string | `failover`
-- [`FailoverPolicy`](#failoverpolicy): map
-   - [`Mode`](#failoverpolicy-mode): string
-- [`AccessLogs`](#accesslogs): map
-   - [`Enabled`](#accesslogs): boolean | `false`
-   - [`DisableListenerLogs`](#accesslogs): boolean | `false`
-   - [`Type`](#accesslogs): string | `stdout`
-   - [`Path`](#accesslogs): string
-   - [`JSONFormat`](#accesslogs): string 
-   - [`TextFormat`](#accesslogs): string 
+## Configuration
 
-</Tab>
-<Tab heading="YAML" group="yaml">
-
-- [`apiVersion`](#apiversion): string | required | must be set to `consul.hashicorp.com/v1alpha1`
-- [`kind`](#kind): string | required | must be set to `ProxyDefaults`
-- [`metadata`](#metadata): map | required
-   - [`name`](#metadata-name): string | required | must be set to `global`
-   - [`namespace`](#metadata-namespace): string | `default` | <EnterpriseAlert inline/>
-- [`spec`](#spec): map | required
-   - [`config`](#spec-config): map
-   - [`EnvoyExtensions`](#spec-EnvoyExtensions): list of maps
-      - [`name`](#spec-EnvoyExtensions): string
-      - [`required`](#spec-EnvoyExtensions): string
-      - [`arguments`](#spec-EnvoyExtensions): string
-      - [`consulVersion`](#spec-EnvoyExtensions): string
-      - [`envoyVersion`](#spec-EnvoyExtensions): string
-   - [`mode`](#spec-mode): string
-   - [`transparentProxy`](#spec-transparentproxy): map
-      - [`outboundListenerPort`](#spec-transparentproxy): number | `15001`
-      - [`dialedDirectly`](#spec-transparentproxy): boolean | `false`
-   - [`mutualTLSMode`](#spec-mutualtlsmode): string 
-   - [`meshGateway`](#spec-meshgateway): map
-      - [`mode`](#spec-meshgateway): string
-  - [`expose`](#spec-expose): map
-     - [`checks`](#spec-expose-checks): boolean | `false`
-     - [`paths`](#spec-expose-paths): list
-         - [`path`](#spec-expose-paths): string | must begin with `/` 
-         - [`localPathPort`](#spec-expose-paths): number | `0` 
-         - [`listenerPort`](#spec-expose-paths): number | `0` 
-         - [`protocol`](#spec-expose-paths): string | `http` 
-  - [`prioritizeByLocality`](#prioritizebylocality): map | <EnterpriseAlert inline/>
-    - [`mode`](#prioritizebylocality): string | `failover` 
-  - [`failoverPolicy`](#spec-failoverpolicy): map
-      - [`mode`](#spec-failoverpolicy-mode): string
-  - [`accessLogs`](#spec-accesslogs): map
-     - [`enabled`](#spec-accesslogs): boolean | `false`
-     - [`disableListenerLogs`](#spec-accesslogs): boolean | `false`
-     - [`type`](#spec-accesslogs): string | `stdout`
-     - [`path`](#spec-accesslogs): string
-     - [`jsonFormat`](#spec-accesslogs): string 
-     - [`textFormat`](#spec-accesslogs): string 
-
-</Tab>
-
-</Tabs>
-
-## Complete configuration
-
-When every field is defined, a proxy defaults configuration entry has the following form:
+Configure the following parameters to define a `proxy-defaults` configuration entry:
 
 <Tabs>
+<Tab heading="Consul OSS">
 
-<Tab heading="HCL" group="hcl">
+<CodeTabs heading="Proxy defaults configuration syntax" tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
 ```hcl
 Kind      = "proxy-defaults"
 Name      = "global"
-Namespace = "default"
 Meta {
   <arbitrary string key> = "<arbitrary string value>"
 }
 Config {
   <arbitrary string key> = <arbitrary value>
 }
-EnvoyExtensions = [ 		
-  { 
-    Name= "<name of the extension>"
-    Required = "required"
-    Arguments = "<arguments to pass to the extension>"
-    ConsulVersion = "<Consul version required by the extension>"
-    EnvoyVersion = "<Envoy version required by the extension>"
-  }
-]   
 Mode = "<name of proxy mode>"
 TransparentProxy {
   OutboundListenerPort = <port the proxy should listen on for outbound traffic>
   DialedDirectly       = <true if proxy instances should be dialed directly>
 }
-MutualTLSMode = "<mutual TLS mode for all proxies>"
 MeshGateway {
   Mode = "<name of mesh gateway configuration for all proxies>"
 }
@@ -155,9 +68,6 @@ Expose {
     }
   ]
 }
-PrioritizeByLocality = {
-   Mode = "failover"
-}
 AccessLogs {
   Enabled              = < true | false >
   DisableListenerLogs  = < true | false , disables listener access logs for unrecognized traffic>
@@ -167,32 +77,21 @@ AccessLogs {
   TextFormat           = "< text representation of access log format >"
 }
 ```
-</Tab>
-
-<Tab heading="YAML" group="yaml">
 
 ```yaml
 apiVersion: consul.hashicorp.com/v1alpha1
 kind: ProxyDefaults
 metadata:
   name: global
-  namespace: default
 spec:
   meta:
     <arbitrary string key>: <arbitrary string value>
   config:
     <arbitrary string key>: <arbitrary value>
-  EnvoyExtensions:
-  - name: <name of the extension>
-    required: required
-    arguments: <arguments to pass to the extension>
-    consulVersion: <Consul version required by the extension>
-    envoyVersion: <Envoy version required by the extension> 
   mode: <name of proxy mode>
   transparentProxy:
     outboundListenerPort: <port the proxy should listen on for outbound traffic>
     dialedDirectly: <true if proxy instances should be dialed directly>
-  mutualTLSMode: <mutual TLS mode for all proxies>
   meshGateway:
     mode: <name of mesh gateway configuration for all proxies>
   expose:
@@ -211,36 +110,21 @@ spec:
     textFormat: < text representation of access log format >
 ```
 
-</Tab>
-
-<Tab heading="JSON" group="json">
-
 ```json
 {
   "Kind": "proxy-defaults",
   "Name": "global",
-  "Namespace": "default",
   "Meta": {
     "<arbitrary string key>": "<arbitrary string value>"
   },
   "Config": {
     "<arbitrary string key>": <arbitrary value>
   },
-  "EnvoyExtensions": [
-    {
-      "Name": "<name of the extension>",
-      "Required": "required",
-      "Arguments": "<arguments to pass to the extension>",
-      "ConsulVersion": "<Consul version required by the extension>",
-      "EnvoyVersion": "<Envoy version required by the extension>"
-    }
-  ],
   "Mode": "<name of proxy mode>",
   "TransparentProxy": {
     "OutboundListenerPort": <port the proxy should listen on for outbound traffic>,
     "DialedDirectly": <true if proxy instances should be dialed directly>
   },
-  "MutualTLSMode": "<mutual TLS mode for all proxies>",
   "MeshGateway": {
     "Mode": = "<name of mesh gateway configuration for all proxies>"
   },
@@ -266,537 +150,396 @@ spec:
 }
 ```
 
-</Tab>
-
-</Tabs>
-
-## Specification
-
-This section provides details about the fields you can configure in the proxy defaults configuration entry.
-
-<Tabs>
-
-<Tab heading="HCL and JSON" group="hcl">
-
-### `Kind`
-
-Specifies the type of configuration entry to implement. Must be set to `proxy-defaults`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String value that must be set to `proxy-defaults`.
-
-### `Name`
-
-Specifies a name for the configuration entry that is used to identify the configuration entry. Must be set to `global`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String that must be set to `global`.
-
-### `Namespace`
-
-Specifies the namespace that the proxy defaults apply to. You can only specify the `default` namespace. 
-
-#### Values
-
-- Default: `default`
-- Data type: String
-
-### `Partition`
-
-Specifies the local admin partition that the proxy defaults apply to. Refer to [admin partitions](/consul/docs/enterprise/admin-partitions) for more information.
-
-#### Values
-
-- Default: `default`
-- Data type: String
-
-### `Meta`
-
-Specifies a set of custom key-value pairs to add the [Consul KV](#/consul/docs/dynamic-app-config/kv) store. 
-
-#### Values
-
-- Default: None
-- Data type: Map of one or more key-value pairs.
-   - Keys: String
-   - Values: String, integer, or float
-
-### `Config`
-
-Specifies an arbitrary map of configuration values used by service mesh proxies. The available configurations depend on the mesh proxy you use. You can configure any global values that your proxy allows in this field. Refer to the following topics for additional information:
-
-- [Envoy proxy configuration option](/consul/docs/connect/proxies/envoy#proxy-config-options)
-- [Built-in proxy configuration options](/consul/docs/connect/proxies/built-in#proxy-config-key-reference) 
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `EnvoyExtensions`
-
-Specifies a list of extensions that modify Envoy proxy configurations. Refer to [Envoy extensions](/consul/docs/connect/proxies/envoy-extensions) for additional information.
-
-#### Values
-
-- Default: None
-- Data type: List of maps containing the following fields:
-   - `Name`
-   - `Required`
-   - `Arguments`
-   - `ConsulVersion`
-   - `EnvoyVersion`
-
-The following table describes how to configure values in the `EnvoyExtensions` map:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `Name` | Specifies the name of the extension. | String | None |
-| `Required` | Specify `true` to require Consul to implement the extension. <p>Use this parameter to ensure that extensions required for secure communication are not unintentionally bypassed.</p><p>Consul returns an error when `Required` is set to `true` and the extension does not update Envoy resources. </p> | String | None |
-| `Arguments` | Specifies the arguments to pass to the extension executable. Refer to the documentation for the extension you want to implement for additional information. | Map | None |
-| `ConsulVersion` | Specifies the version of Consul that the extension is allowed to work with. Consul validates the version during xDS updates. If a different version is in use, Consul skips the extension and writes the event to the log. <p>The `ConsulVersion` and `EnvoyVersion` must both validate for Consul to implement the extension.</p> | String | None |
-| `EnvoyVersion` | Specifies the version of Envoy that the extension is allowed to work with. Consul validates the version during xDS updates. If a different version is in use, Consul skips the extension and writes the event to the log. <p>The `ConsulVersion` and `EnvoyVersion` must both validate for Consul to implement the extension.</p> | String | None |
-
-### `Mode`
-
-Specifies a mode for how proxies direct inbound and outbound traffic. You can specify one of the following values:
-
-- `transparent`: In transparent mode, proxies capture and redirect inbound and outbound traffic. The mode does not enable traffic redirection, but directs Consul to configure Envoy as if traffic is already being redirected. 
-
-- `direct`: In this mode, the local application and other proxies must directly dial proxy listeners. 
-
-#### Values
-
-- Default: None
-- Data type: String 
-
-### `TransparentProxy`
-
-Contains configurations for proxies that are running in transparent proxy mode. This mode enables permissive mTLS for Consul so that you can use your Kubernetes cluster's DNS service instead of Consul DNS. Refer to [Transparent proxy mode](/consul/docs/k8s/connect/transparent-proxy) for additional information. 
-
-#### Values
-
-- Default: None
-- Data type: Map of containing the following fields:
-   - `OutboundListenerPort`
-   - `DialedDirectly`
-
-The following table describes how to configure values in the `TransparentProxy` map:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `OutboundListenerPort` | Specifies the port that the proxy listens on for outbound traffic. Outbound application traffic must be captured and redirected to this port. | Integer | `15001` |
-| `DialedDirectly` | Determines whether other proxies in transparent mode can directly dial this proxy instance's IP address. Proxies in transparent mode commonly dial upstreams at the [`virtual` tagged address](/consul/docs/services/configuration/services-configuration-reference#tagged_addresses-virtual), which load balances across instances. Dialing individual instances can be helpful when sending requests to stateful services, such as database clusters with a leader. | Boolean | `false` |
-
-### `MutualTLSMode`
-
-Controls the default mutual TLS (mTLS) mode for all proxies. You can only set mutual TLS mode for services in transparent proxy mode. 
-
-You can specify one of the following modes:
-
-`strict`: The sidecar proxy requires mTLS for incoming traffic. 
-`permissive`: The sidecar proxy accepts mTLS traffic on the sidecar proxy service port and accepts any traffic on the destination service port. We recommend only using permissive mode if necessary while onboarding services to the service mesh.
-
-#### Values
-
-- Default: `strict`
-- Data type: One of the following string values:
-   - `strict`
-   - `permissive`
-
-### `MeshGateway`
-
-Sets the default mesh gateway `mode` field for all proxies. You can specify the following string values for the `mode` field:
-
-- `none`: The proxy does not make outbound connections through a mesh gateway. Instead, it makes outbound connections directly to the destination services.
-- `local`: The proxy makes an outbound connection to a gateway running in the same datacenter.
-- `remote`: The proxy makes an outbound connection to a gateway running in the destination datacenter.
-
-#### Values
-
-- Default: None
-- Data type: Map containing the `mode` field
-
-### `Expose`
-
-Specifies default configurations for exposing HTTP paths through Envoy. Exposing paths through Envoy enables services to protect themselves by only listening on `localhost`. Applications that are not Consul service mesh-enabled are still able to contact an HTTP endpoint. 
-
-Example use-cases include exposing the `/metrics` endpoint to a monitoring system, such as Prometheus, and exposing the `/healthz` endpoint to the kubelet for liveness checks. Refer to [Expose Paths Configuration Reference](/consul/docs/connect/proxy-config-reference#expose-paths-configuration-reference) for additional information.
-
-#### Values
-
-- Default: None
-- Data type: Map containing the following parameters:
-   - [`Checks`](#expose-checks)
-   - [`Paths`](#expose-paths)
-
-### `Expose{}.Checks`
-
-Exposes all HTTP and gRPC checks registered with the agent when set to `true`. Envoy exposes listeners for the checks and only accepts connections originating from localhost or the [Consul agent's `advertise_addr`](/consul/docs/agent/config/config-files#advertise). The ports for the listeners are dynamically allocated from the [agent's `expose_min_port`](/consul/docs/agent/config/config-files#expose_min_port) and [`expose_max_port`](/consul/docs/agent/config/config-files#expose_max_port) configurations.
-
-We recommend enabling the `Checks` configuration when a Consul client cannot reach registered services over localhost.
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `Expose{}.Paths[]`
-
-Specifies a list of configuration maps that define paths to expose through Envoy when `Expose.Checks` is set to `true`. 
-
-#### Values
-
-- Default: None
-- Data type: List of maps 
-
-The following table describes the parameters for each map you can define in the list:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `Path` | Specifies the HTTP path to expose. You must prepend the path with a forward slash (`/`). | String | None |
-| `LocalPathPort` | Specifies the port where the local service listens for connections to the path. | Integer | `0` |
-| `ListenPort` | Specifies the port where the proxy listens for connections. The port must be available. If the port is unavailable, Envoy does not expose a listener for the path and the proxy registration still succeeds. | Integer | `0` |
-| `Protocol` | Specifies the protocol of the listener. You can configure one of the following values: <li>`http`</li><li>`http2`: Use with gRPC traffic</li> | String | `http` |
-
-### `PrioritizeByLocality` 
-
-Sets a default `mode` for proxies that allows them to prioritize upstream targets that are in the same geographic area. You can specify the following string values for the `mode` field:
-
-- `failover`: If the upstream target that a service is connected to becomes unreachable, the service prioritizes a healthy upstream with the same `locality` configuration. Refer to [Route traffic to local upstreams](/consul/docs/connect/manage-traffic/route-to-local-upstreams) for additional information.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `FailoverPolicy`
-
-Sets the failover policy `mode` field for all proxies. The failover policy mode defines how Consul directs traffic to failover service instances if the primary instance becomes unreachable. For example, you can direct Consul to send failover traffic to local service instances. Refer to [Failover overview](/consul/docs/connect/manage-traffic/failover) for additional information.
-
-You can specify the following string values for the `mode` field:
-
-- `default`: Envoy sends failover traffic to the first failover target with healthy instances.  
-- `order-by-locality`: Envoy prioritizes failover targets that are closer to the downstream service. Envoy deterministically orders failover targets that are the same distance from the local proxy. 
-
-#### Values
-
-- Default: None
-- Data type: Map containing the `mode` field
-
-### `AccessLogs`
-
-Specifies [Envoy access logger](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/observability/access_logging.html?highlight=access%20logs) configurations for all proxies in the service mesh, including gateways. This field also configures access logs on [Envoy's administration interface](https://www.envoyproxy.io/docs/envoy/latest/operations/admin.html?highlight=administration%20logs).
-
-#### Values
-
-- Default: None
-- Data type: Map 
-
-The following table describes the parameters you can define in the `AccessLogs` map:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `Enabled` | Enables Envoy to emit access logs for all proxies in the service mesh. | Boolean | `false` |
-| `DisabledListenerLogs` | Disables access logs for traffic rejected at the listener level. Rejected traffic includes connections that do not match any of Envoy's configured filters, such as Consul upstream services. Set this option to `true` if you do not want to log unknown requests that Envoy is not forwarding. | Boolean | `false` |
-| `Type` | Specifies the destination for access logs. You can specify one of the following types: <li>`stdout`</li><li>`stderr`</li><li>`file`</li> | String | None |
-| `Path` | Specifies the destination for writing access logs to file when `Type` is set to `file`. | String | None |
-| `JSONFormat` | Specifies a JSON-formatted string that represents the format for each emitted access log. You can use [Envoy command operators](https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage#command-operators) to customize the emitted data. You can also nest data. You cannot set this field and the `TextFormat` field concurrently. | String | [Default log format](/consul/docs/connect/observability/access-logs#default-log-format) |
-| `TextFormat` | Specifies a  text-formatted string that represents the format for each emitted access log. You can use [Envoy command operators](https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage#command-operators) to customize the emitted data. You can also nest data. You cannot set this field and the `JSONFormat` field concurrently. | String | None |
+</CodeTabs>
 
 </Tab>
+<Tab heading="Consul Enterprise">
 
-<Tab heading="YAML" group="yaml">
-
-### apiVersion
-
-Specifies the verion of the Consul API to use to apply the configuration entry. This must be set to `consul.hashicorp.com/v1alpha1`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String value that must be set to `consul.hashicorp.com/v1alpha1`.
-
-### `kind`
-
-Specifies the type of configuration entry to implement. Must be set to `ProxyDefaults`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String value that must be set to `ProxyDefaults`.
-
-
-### `metadata`
-
-Map that contains the service name, namespace, and admin partition that the configuration entry applies to.
-
-#### Values
-
-- Default: none
-- Map containing the following strings:
-  - `name`
-  - `namespace`
-
-
-### `metadata.name`
-
-Specifies a name for the configuration entry that is used to identify the configuration entry. Must be set to `global`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String that must be set to `global`.
-
-### `metadata.namespace`
-
-Specifies the namespace that the proxy defaults apply to. If you are on the community version, Consul ignores the `namespace` field. Refer to [Kubernetes namespaces in Consul](/consul/docs/k8s/crds#consul-oss) for additional information. If you are on Consul Enterprise, refer to [Kubernetes namespaces in Consul Enterprise](/consul/docs/k8s/crds#consul-enterprise) for additional information.
-
-#### Values
-
-- Default: `default`
-- Data type: String
-
-### `spec`
-
-Map that contains the details about the ProxyDefaults configuration entry. The `apiVersion`, `kind``, and `metadata` fields are siblings of the `spec` field. All other configurations are children.
-
-### `spec.config`
-
-Specifies an arbitrary map of configuration values used by service mesh proxies. The available configurations depend on the mesh proxy you use. You can configure any global values that your proxy allows in this field. Refer to the following topics for additional information:
-
-- [Envoy proxy configuration option](/consul/docs/connect/proxies/envoy#proxy-config-options)
-- [Built-in proxy configuration options](/consul/docs/connect/proxies/built-in#proxy-config-key-reference) 
-
-#### Values
-
-- Default: None
-- Data type: Map 
-
-### `spec.envoyExtensions`
-
-Specifies a list of extensions that modify Envoy proxy configurations. Refer to [Envoy extensions](/consul/docs/connect/proxies/envoy-extensions) for additional information.
-
-#### Values
-
-- Default: None
-- Data type: List of maps of containing the following fields:
-   - `name`
-   - `required`
-   - `arguments`
-   - `consulVersion`
-   - `envoyVersion`
-
-The following table describes how to configure values in the `EnvoyExtensions` map:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `name` | Specifies the name of the extension. | String | None |
-| `required` | Specify `true` to require Consul to implement the extension. <p>Use this parameter to ensure that extensions required for secure communication are not unintentionally bypassed.</p><p>Consul returns an error when `Required` is set to `true` and the extension does not update Envoy resources. </p> | String | None |
-| `arguments` | Specifies the arguments to pass to the extension executable. Refer to the documentation for the extension you want to implement for additional information. | Map | None |
-| `consulVersion` | Specifies the version of Consul that the extension is allowed to work with. Consul validates the version during xDS updates. If a different version is in use, Consul skips the extension and writes the event to the log. <p>The `consulVersion` and `envoyVersion` must both validate for Consul to implement the extension.</p> | String | None |
-| `envoyVersion` | Specifies the version of Envoy that the extension is allowed to work with. Consul validates the version during xDS updates. If a different version is in use, Consul skips the extension and writes the event to the log. <p>The `consulVersion` and `envoyVersion` must both validate for Consul to implement the extension.</p> | String | None |
-
-### `spec.mode`
-
-Specifies a mode for how proxies direct inbound and outbound traffic. You can specify one of the following values:
-
-- `transparent`: In transparent mode, proxies capture and redirect inbound and outbound traffic. The mode does not enable traffic redirection, but directs Consul to configure Envoy as if traffic is already being redirected. 
-
-- `direct`: In this mode, the local application and other proxies must directly dial proxy listeners. 
-
-#### Values
+-> **NOTE:** The `proxy-defaults` config entry can only be created in the `default`
+namespace and it will configure proxies in **all** namespaces.
 
-- Default: None
-- Data type: String 
+<CodeTabs heading="Proxy defaults configuration syntax" tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
-### `spec.transparentProxy`
-
-Contains configurations for proxies that are running in transparent proxy mode. This mode enables permissive mTLS for Consul so that you can use your Kubernetes cluster's DNS service instead of Consul DNS. Refer to [Transparent proxy mode](/consul/docs/k8s/connect/transparent-proxy) for additional information. 
-
-#### Values
-
-- Default: None
-- Data type: Map of containing the following fields:
-   - `outboundListenerPort`
-   - `dialedDirectly`
-
-The following table describes how to configure values in the `TransparentProxy` map:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `outboundListenerPort` | Specifies the port that the proxy listens on for outbound traffic. Outbound application traffic must be captured and redirected to this port. | Integer | `15001` |
-| `dialedDirectly` | Determines whether other proxies in transparent mode can directly dial this proxy instance's IP address. Proxies in transparent mode commonly dial upstreams at the [`virtual` tagged address](/consul/docs/services/configuration/services-configuration-reference#tagged_addresses-virtual), which load balances across instances. Dialing individual instances can be helpful when sending requests to stateful services, such as database clusters with a leader. | Boolean | `false` |
-
-### `spec.mutualTLSMode`
-
-Controls the default mutual TLS (mTLS) mode for all proxies. You can only set mutual TLS mode for services in transparent proxy mode. 
-
-You can specify one of the following modes:
-
-`strict`: The sidecar proxy requires mTLS for incoming traffic. 
-`permissive`: The sidecar proxy accepts mTLS traffic on the sidecar proxy service port and accepts any traffic on the destination service port. We recommend only using permissive mode if necessary while onboarding services to the service mesh.
-
-#### Values
-
-- Default: `strict`
-- Data type: One of the following string values:
-   - `strict`
-   - `permissive`
-
-### `spec.meshGateway`
-
-Sets the default mesh gateway `mode` field for all proxies. You can specify the following string values for the `mode` field:
-
-- `none`: The proxy does not make outbound connections through a mesh gateway. Instead, it makes outbound connections directly to the destination services.
-- `local`: The proxy makes an outbound connection to a gateway running in the same datacenter.
-- `remote`: The proxy makes an outbound connection to a gateway running in the destination datacenter.
-
-#### Values
-
-- Default: None
-- Data type: Map containing the `mode` field
-
-### `spec.expose`
-
-Specifies default configurations for exposing HTTP paths through Envoy. Exposing paths through Envoy enables services to protect themselves by only listening on `localhost`. Applications that are not Consul service mesh-enabled are still able to contact an HTTP endpoint. 
-
-Example use-cases include exposing the `/metrics` endpoint to a monitoring system, such as Prometheus, and exposing the `/healthz` endpoint to the kubelet for liveness checks. Refer to [Expose Paths Configuration Reference](/consul/docs/connect/proxy-config-reference#expose-paths-configuration-reference) for additional information.
-
-#### Values
-
-- Default: None
-- Data type: Map containing the following parameters:
-   - [`checks`](#expose-checks)
-   - [`aths`](#expose-paths)
-
-### `spec.expose{}.checks`
-
-Exposes all HTTP and gRPC checks registered with the agent when set to `true`. Envoy exposes listeners for the checks and only accepts connections originating from localhost or the [Consul agent's `advertise_addr`](/consul/docs/agent/config/config-files#advertise). The ports for the listeners are dynamically allocated from the [agent's `expose_min_port`](/consul/docs/agent/config/config-files#expose_min_port) and [`expose_max_port`](/consul/docs/agent/config/config-files#expose_max_port) configurations.
-
-We recommend enabling the `Checks` configuration when a Consul client cannot reach registered services over localhost, such as when Consul agents run in their own pods in Kubernetes.
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `spec.expose{}.paths[]`
-
-Specifies a list of configuration maps that define paths to expose through Envoy when `spec.expose.checks` is set to `true`. 
-
-#### Values
-
-- Default: None
-- Data type: List of maps. 
-
-The following table describes the parameters for each map you can define in the list:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `path` | Specifies the HTTP path to expose. You must prepend the path with a forward slash (`/`). | String | None |
-| `localPathPort` | Specifies the port where the local service listens for connections to the path. | Integer | `0` |
-| `listenPort` | Specifies the port where the proxy listens for connections. The port must be available. If the port is unavailable, Envoy does not expose a listener for the path and the proxy registration still succeeds. | Integer | `0` |
-| `protocol` | Specifies the protocol of the listener. You can configure one of the following values: <li>`http`</li><li>`http2`: Use with gRPC traffic</li> | String | `http` |
-
-### `spec.prioritizeByLocality`
-
-Sets a default `mode` for proxies that allows them to prioritize upstream targets that are in the same geographic area. You can specify the following string values for the `mode` field:
-
-- `failover`: If the upstream target that a service is connected to becomes unreachable, the service prioritizes a healthy upstream with the same `locality` configuration. Refer to [Route traffic to local upstreams](/consul/docs/connect/manage-traffic/route-to-local-upstreams) for additional information.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-
-### `spec.failoverPolicy`
-
-Sets the failover policy `mode` field for all proxies. The failover policy mode defines how Consul directs traffic to failover service instances if the primary instance becomes unreachable. For example, you can direct Consul to send failover traffic to local service instances. Refer to [Failover overview](/consul/docs/connect/manage-traffic/failover) for additional information.
-
-You can specify the following string values for the `mode` field:
-
-- `default`: Envoy sends failover traffic to the first failover target with healthy instances.  
-- `order-by-locality`: Envoy prioritizes failover targets that are closer to the downstream service. Envoy deterministically orders failover targets that are the same distance from the local proxy. 
-
-#### Values
-
-- Default: None
-- Data type: Map containing the `mode` field
-
-### `spec.accessLogs`
-
-Specifies [Envoy access logger](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/observability/access_logging.html?highlight=access%20logs) configurations for all proxies in the service mesh, including gateways. This field also configures access logs on [Envoy's administration interface](https://www.envoyproxy.io/docs/envoy/latest/operations/admin.html?highlight=administration%20logs).
+```hcl
+Kind      = "proxy-defaults"
+Name      = "global"
+Namespace = "default" # Can only be set to "default".
+Meta {
+  <arbitrary string key> = "<arbitrary string value>"
+}
+Config {
+  <arbitrary string key> = <arbitrary value>
+}
+Mode = "<name of proxy mode>"
+TransparentProxy {
+  OutboundListenerPort = <port the proxy should listen on for outbound traffic>
+  DialedDirectly       = <true if proxy instances should be dialed directly>
+}
+MeshGateway {
+  Mode = "<name of mesh gateway configuration for all proxies>"
+}
+Expose {
+  Checks = <true to expose all HTTP and gRPC checks through Envoy>
 
-#### Values
+  Paths = [
+    {
+      Path          = "<the HTTP path to expose>"
+      LocalPathPort = <port where the local service is listening for connections to the path>
+      ListenerPort  = <port where the proxy will listen for connections>
+      Protocol      = "<protocol of the listener>"
+    }
+  ]
+}
+AccessLogs {
+  Enabled              = < true | false >
+  DisableListenerLogs  = < true | false , disables listener access logs for unrecognized traffic>
+  Type                 = "< file | stdout | stdout, the destination for access logs >"
+  Path                 = "< set the output path for 'file' based access logs >"
+  JSONFormat           = "< json representation of access log format >"
+  TextFormat           = "< text representation of access log format >"
+}
+```
 
-- Default: None
-- Data type: Map 
+```yaml
+apiVersion: consul.hashicorp.com/v1alpha1
+kind: ProxyDefaults
+metadata:
+  name: global
+  namespace: default
+spec:
+  meta:
+    <arbitrary string key>: <arbitrary string value>
+  config:
+    <arbitrary string key>: <arbitrary value>
+  mode: <name of proxy mode>
+  transparentProxy:
+    outboundListenerPort: <port the proxy should listen on for outbound traffic>
+    dialedDirectly: <true if proxy instances should be dialed directly>
+  meshGateway:
+    mode: <name of mesh gateway configuration for all proxies>
+  expose:
+    checks: <true to expose all HTTP and gRPC checks through Envoy>
+    paths:
+      - path: <the HTTP path to expose>
+        localPathPort: <port where the local service is listening for connections to the path>
+        listenerPort: <port where the proxy will listen for connections>
+        protocol:= <protocol of the listener>
+  accessLogs:
+    enabled: < true | false >
+    disableListenerLogs:  < true | false , disables listener access logs for unrecognized traffic>
+    type: < file | stdout | stdout, the destination for access logs >
+    path: < set the output path for 'file' based access logs >
+    jsonFormat: < json representation of access log format >
+    textFormat: < text representation of access log format >
+```
 
-The following table describes the parameters you can define in the `accessLogs` map:
+```json
+{
+  "Kind": "proxy-defaults",
+  "Name": "global",
+  "Namespace": "default",
+  "Meta": {
+    "<arbitrary string key>": "<arbitrary string value>"
+  },
+  "Config": {
+    "<arbitrary string key>": <arbitrary value>
+  },
+  "Mode": "<name of proxy mode>",
+  "TransparentProxy": {
+    "OutboundListenerPort": <port the proxy should listen on for outbound traffic>,
+    "DialedDirectly": <true if proxy instances should be dialed directly>
+  },
+  "MeshGateway": {
+    "Mode": = "<name of mesh gateway configuration for all proxies>"
+  },
+  "Expose": {
+    "Checks": <true to expose all HTTP and gRPC checks through Envoy>,
+    "Paths": [
+      {
+        "Path": "<the HTTP path to expose>",
+        "LocalPathPort": <port where the local service is listening for connections to the path>,
+        "ListenerPort": <port where the proxy will listen for connections>,
+        "Protocol": "<protocol of the listener>"
+      }
+    ]
+  },
+  "AccessLogs": {
+    "Enabled": < true | false >,
+    "DisableListenerLogs": < true | false , disables listener access logs for unrecognized traffic>,
+    "Type": "< file | stdout | stdout, the destination for access logs >",
+    "Path": "< set the output path for 'file' based access logs >",
+    "JSONFormat": "< json representation of access log format >",
+    "TextFormat": "< text representation of access log format >"
+  }
+}
+```
 
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `enabled` | Enables Envoy to emit access logs for all proxies in the service mesh. | Boolean | `false` |
-| `disabledListenerLogs` | Disables access logs for traffic rejected at the listener level. Rejected traffic includes connections that do not match any of Envoy's configured filters, such as Consul upstream services. Set this option to `true` if you do not want to log unknown requests that Envoy is not forwarding. | Boolean | `false` |
-| `type` | Specifies the destination for access logs. You can specify one of the following types: <li>`stdout`</li><li>`stderr`</li><li>`file`</li> | String | None |
-| `path` | Specifies the destination for writing access logs to file when `type` is set to `file`. | String | None |
-| `jsonFormat` | Specifies a JSON-formatted string that represents the format for each emitted access log. You can use [Envoy command operators](https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage#command-operators) to customize the emitted data. You can also nest data. You cannot set this field and the `textFormat` field concurrently. | String | [Default log format](/consul/docs/connect/observability/access-logs#default-log-format) |
-| `textFormat` | Specifies a  text-formatted string that represents the format for each emitted access log. You can use [Envoy command operators](https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage#command-operators) to customize the emitted data. You can also nest data. You cannot set this field and the `jsonFormat` field concurrently. | String | None |
+</CodeTabs>
 
 </Tab>
-
 </Tabs>
 
+### Configuration Parameters
 
-## Examples
+<ConfigEntryReference
+  keys={[
+    {
+      name: 'apiVersion',
+      description: 'Must be set to `consul.hashicorp.com/v1alpha1`',
+      hcl: false,
+    },
+    {
+      name: 'Kind',
+      description: {
+        hcl: 'Must be set to `proxy-defaults`',
+        yaml: 'Must be set to `ProxyDefaults`',
+      },
+    },
+    {
+      name: 'Name',
+      description: 'Must be set to `global`',
+      yaml: false,
+    },
+    {
+      name: 'Namespace',
+      type: `string: "default"`,
+      enterprise: true,
+      description:
+        'Must be set to `default`. The configuration will apply to all namespaces.',
+      yaml: false,
+    },
+    {
+      name: 'Partition',
+      type: `string: "default"`,
+      enterprise: true,
+      description:
+        'Specifies the name of the admin partition in which the configuration entry applies. Refer to the [Admin Partitions documentation](/consul/docs/enterprise/admin-partitions) for additional information.',
+      yaml: false,
+    },
+    {
+      name: 'Meta',
+      type: 'map<string|string>: nil',
+      description:
+        'Specifies arbitrary KV metadata pairs. Added in Consul 1.8.4.',
+      yaml: false,
+    },
+    {
+      name: 'metadata',
+      children: [
+        {
+          name: 'name',
+          description: 'Must be set to `global`',
+        },
+        {
+          name: 'namespace',
+          enterprise: true,
+          description:
+            'If running Consul Open Source, the namespace is ignored (see [Kubernetes Namespaces in Consul OSS](/consul/docs/k8s/crds#consul-oss)). If running Consul Enterprise see [Kubernetes Namespaces in Consul Enterprise](/consul/docs/k8s/crds#consul-enterprise) for more details.',
+        },
+      ],
+      hcl: false,
+    },
+    {
+      name: 'Config',
+      type: 'map[string]arbitrary',
+      description: `An arbitrary map of configuration values used by service mesh proxies.
+    The available configurations depend on the mesh proxy you use.
+     Any values that your proxy allows can be configured globally here. To explore these options please see the documentation for your chosen proxy.
+     <ul><li>[Envoy](/consul/docs/connect/proxies/envoy#proxy-config-options)</li>
+     <li>[Consul's built-in proxy](/consul/docs/connect/proxies/built-in#proxy-config-key-reference)</li></ul>`,
+    },
+    {
+      name: 'EnvoyExtensions',
+      type: 'array<EnvoyExtension>: []',
+      description: `A list of extensions to modify Envoy proxy configuration.<br><br>
+        Applying \`EnvoyExtensions\` to \`ProxyDefaults\` may produce unintended consequences. We recommend enabling \`EnvoyExtensions\` with [\`ServiceDefaults\`](/consul/docs/connect/config-entries/service-defaults#envoyextensions) in most cases.`,
+      children: [
+        {
+          name: 'Name',
+          type: `string: ""`,
+          description: `Name of the extension.`,
+        },
+        {
+          name: 'Required',
+          type: `string: ""`,
+          description: `When \`Required\` is true and the extension does not update any Envoy resources, an error is
+          returned. Use this parameter to ensure that extensions required for secure communication are not unintentionally
+          bypassed.`,
+        },
+        {
+          name: 'Arguments',
+          type: 'map<string|Any>: nil',
+          description: `Arguments to pass to the extension executable.`,
+        },
+      ],
+    },
+    {
+      name: 'Mode',
+      type: `string: ""`,
+      description: `One of \`direct\` or \`transparent\`.
+                    \`transparent\` represents that inbound and outbound application traffic is being
+                    captured and redirected through the proxy. This mode does not enable the traffic redirection
+                     itself. Instead it signals Consul to configure Envoy as if traffic is already being redirected.
+                    \`direct\` represents that the proxy's listeners must be dialed directly by the local
+                    application and other proxies.
+                    Added in v1.10.0.`,
+    },
+    {
+      name: 'TransparentProxy',
+      type: 'TransparentProxyConfig: <optional>',
+      description: `Controls configuration specific to proxies in transparent mode. Added in v1.10.0.`,
+      children: [
+        {
+          name: 'OutboundListenerPort',
+          type: 'int: "15001"',
+          description: `The port the proxy should listen on for outbound traffic. This must be the port where
+                        outbound application traffic is captured and redirected to.`,
+        },
+        {
+          name: 'DialedDirectly',
+          type: 'bool: false',
+          description: `Determines whether this proxy instance's IP address can be dialed directly by transparent proxies.
+                        Typically transparent proxies dial upstreams using the "virtual" tagged address, which load balances
+                        across instances. Dialing individual instances can be helpful in cases like stateful services such
+                        as a database cluster with a leader. `,
+        },
+      ],
+    },
+    {
+      name: 'MeshGateway',
+      type: 'MeshGatewayConfig: <optional>',
+      description: `Controls the default
+      [mesh gateway configuration](/consul/docs/connect/gateways/mesh-gateway#service-mesh-proxy-configuration)
+      for all proxies. Added in v1.6.0.`,
+      children: [
+        {
+          name: 'Mode',
+          type: 'string: ""',
+          description: 'One of `none`, `local`, or `remote`.',
+        },
+      ],
+    },
+    {
+      name: 'Expose',
+      type: 'ExposeConfig: <optional>',
+      description: `Controls the default
+                      [expose path configuration](/consul/docs/connect/registration/service-registration#expose-paths-configuration-reference)
+                      for Envoy. Added in v1.6.2.<br><br>
+                      Exposing paths through Envoy enables a service to protect itself by only listening on localhost, while still allowing
+                      non-mesh-enabled applications to contact an HTTP endpoint.
+                      Some examples include: exposing a \`/metrics\` path for Prometheus or \`/healthz\` for kubelet liveness checks.`,
+      children: [
+        {
+          name: 'Checks',
+          type: 'bool: false',
+          description: `If enabled, all HTTP and gRPC checks registered with the agent are exposed through Envoy.
+        Envoy will expose listeners for these checks and will only accept connections originating from localhost or Consul's
+        [advertise address](/consul/docs/agent/config/config-files#advertise). The port for these listeners are dynamically allocated from
+        [expose_min_port](/consul/docs/agent/config/config-files#expose_min_port) to [expose_max_port](/consul/docs/agent/config/config-files#expose_max_port).
+        This flag is useful when a Consul client cannot reach registered services over localhost.`,
+        },
+        {
+          name: 'Paths',
+          type: 'array<Path>: []',
+          description: 'A list of paths to expose through Envoy.',
+          children: [
+            {
+              name: 'Path',
+              type: 'string: ""',
+              description:
+                'The HTTP path to expose. The path must be prefixed by a slash. ie: `/metrics`.',
+            },
+            {
+              name: 'LocalPathPort',
+              type: 'int: 0',
+              description:
+                'The port where the local service is listening for connections to the path.',
+            },
+            {
+              name: 'ListenerPort',
+              type: 'int: 0',
+              description: `The port where the proxy will listen for connections. This port must be available
+           for the listener to be set up. If the port is not free then Envoy will not expose a listener for the path,
+           but the proxy registration will not fail.`,
+            },
+            {
+              name: 'Protocol',
+              type: 'string: "http"',
+              description:
+                'Sets the protocol of the listener. One of `http` or `http2`. For gRPC use `http2`.',
+            },
+          ],
+        },
+      ],
+    },
+    {
+      name: 'AccessLogs',
+      type: 'AccessLogsConfig: <optional>',
+      description: `Controls the configuration of [Envoy's access logging](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/observability/access_logging.html?highlight=access%20logs)
+                      for all proxies in the mesh, including gateways. It also configures access logs on [Envoy's administration interface](https://www.envoyproxy.io/docs/envoy/latest/operations/admin.html?highlight=administration%20logs).`,
+      children: [
+        {
+          name: 'Enabled',
+          type: 'bool: false',
+          description: 'When enabled, access logs are emitted for all proxies in the mesh, including gateways.',
+        },
+        {
+          name: 'DisableListenerLogs',
+          type: 'bool: false',
+          description: `When enabled, access logs for traffic rejected at the listener-level are not emitted.
+          This traffic includes connections that do not match any of Envoy's configured filters, such as Consul upstream services.
+          Set this option to \`true\` if you do not want to log unknown requests that Envoy is not forwarding`,
+        },
+        {
+          name: 'Type',
+          type: 'string: "stdout"',
+          description: 'The destination for access logs.  One of \`stdout\`, \`stderr\`, or \`file\`.',
+        },
+        {
+          name: 'Path',
+          type: 'string: ""',
+          description: 'The destination file for access logs. Only valid with \`Type\` set to \`file\`.',
+        },
+        {
+          name: 'JSONFormat',
+          type: 'string: (default as follows)',
+          description: `A JSON-formatted string that represents the format of each emitted access log.
+          By default, it is set  to the [default access log format](/consul/docs/connect/observability/access-logs#default-log-format).
+          You can use Envoy [command operators](https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage#command-operators) to customize the emitted data.
+          Nesting is supported.
+          Invalid if a custom format is specified with TextFormat.`,
+        },
+        {
+          name: 'TextFormat',
+          type: 'string: ""',
+          description: `A formatted string that represents the format of each emitted access log.
+          Envoy [command operators](https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage#command-operators) can be used to customize the data emitted.
+          A new line is added to the string automatically.
+          Invalid when a custom JSONFormat is already specified.`,
+        }
+      ],
+    },
+  ]}
+/>
 
-The following examples demonstrate common patterns for configuring proxy defaults configuration entries.
+## Examples
 
 ### Default protocol
 
-The following example sets the default protocol for all proxies to `http`.
+The following example configures the default protocol for all proxies.
 
 <Tabs>
-<Tab heading="HCL" group="hcl">
-
-#### Community edition
-
-```hcl
-Kind      = "proxy-defaults"
-Name      = "global"
-Config {
-  protocol = "http"
-}
-```
+<Tab heading="Consul OSS">
 
-#### Consul Enterprise
-
-When using multiple namespaces with Consul Enterprise, the only configuration entry that affects proxy defaults is the one in the `default` namespace. This configuration applies to proxies in all namespaces.
+<CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
 ```hcl
 Kind      = "proxy-defaults"
 Name      = "global"
-Namespace = "default" # Can only be set to "default".
 Config {
   protocol = "http"
 }
 ```
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-
-#### Community edition
 
 ```yaml
 apiVersion: consul.hashicorp.com/v1alpha1
@@ -808,9 +551,34 @@ spec:
     protocol: http
 ```
 
-#### Consul Enterprise
+```json
+{
+  "Kind": "proxy-defaults",
+  "Name": "global",
+  "Config": {
+    "protocol": "http"
+  }
+}
+```
+
+</CodeTabs>
+
+</Tab>
+<Tab heading="Consul Enterprise">
 
-When using multiple namespaces with Consul Enterprise, the only configuration entry that affects proxy defaults is the one in the `default` namespace. This configuration applies to proxies in all namespaces.
+-> **NOTE:** The `proxy-defaults` config entry can only be created in the `default`
+namespace and it will configure proxies in **all** namespaces.
+
+<CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
+
+```hcl
+Kind      = "proxy-defaults"
+Name      = "global"
+Namespace = "default" # Can only be set to "default".
+Config {
+  protocol = "http"
+}
+```
 
 ```yaml
 apiVersion: consul.hashicorp.com/v1alpha1
@@ -823,25 +591,6 @@ spec:
     protocol: http
 ```
 
-</Tab>
-
-<Tab heading="JSON" group="json">
-
-#### Community edition
-
-```json
-{
-  "Kind": "proxy-defaults",
-  "Name": "global",
-  "Config": {
-    "protocol": "http"
-  }
-}
-```
-#### Consul Enterprise
-
-When using multiple namespaces with Consul Enterprise, the only configuration entry that affects proxy defaults is the one in the `default` namespace. This configuration applies to proxies in all namespaces.
-
 ```json
 {
   "Kind": "proxy-defaults",
@@ -853,16 +602,16 @@ When using multiple namespaces with Consul Enterprise, the only configuration en
 }
 ```
 
-</Tab>
+</CodeTabs>
 
+</Tab>
 </Tabs>
 
 ### Prometheus
 
 The following example configures all proxies to expose Prometheus metrics.
 
-<Tabs>
-<Tab heading="HCL" group="hcl">
+<CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
 ```hcl
 Kind      = "proxy-defaults"
@@ -872,11 +621,6 @@ Config {
 }
 ```
 
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-
-
 ```yaml
 apiVersion: consul.hashicorp.com/v1alpha1
 kind: ProxyDefaults
@@ -887,10 +631,6 @@ spec:
     envoy_prometheus_bind_addr: '0.0.0.0:9102'
 ```
 
-</Tab>
-
-<Tab heading="JSON" group="json">
-
 ```json
 {
   "Kind": "proxy-defaults",
@@ -901,17 +641,14 @@ spec:
 }
 ```
 
-</Tab>
-
-</Tabs>
+</CodeTabs>
 
 ### Access Logs
 
-The following example enables access logs for all proxies. Refer to [access logs](/consul/docs/connect/observability/access-logs) for more detailed examples.
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
+The following example is a minimal configuration for enabling access logs for all proxies.
+Refer to [access logs](/consul/docs/connect/observability/access-logs) for advanced configurations.
 
+<CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
 ```hcl
 Kind      = "proxy-defaults"
@@ -921,10 +658,6 @@ AccessLogs {
 }
 ```
 
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-
 ```yaml
 apiVersion: consul.hashicorp.com/v1alpha1
 kind: ProxyDefaults
@@ -935,10 +668,6 @@ spec:
     enabled: true
 ```
 
-</Tab>
-
-<Tab heading="JSON" group="json">
-
 ```json
 {
   "Kind": "proxy-defaults",
@@ -949,16 +678,13 @@ spec:
 }
 ```
 
-</Tab>
-
-</Tabs>
+</CodeTabs>
 
 ### Proxy-specific defaults
 
-The following example configures custom default values for all proxies.
+The following example configures some custom default values for all proxies.
 
-<Tabs>
-<Tab heading="HCL" group="hcl">
+<CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
 ```hcl
 Kind      = "proxy-defaults"
@@ -969,10 +695,6 @@ Config {
 }
 ```
 
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-
 ```yaml
 apiVersion: consul.hashicorp.com/v1alpha1
 kind: ProxyDefaults
@@ -984,10 +706,6 @@ spec:
     handshake_timeout_ms: 10000
 ```
 
-</Tab>
-
-<Tab heading="JSON" group="json">
-
 ```json
 {
   "Kind": "proxy-defaults",
@@ -999,6 +717,13 @@ spec:
 }
 ```
 
-</Tab>
+</CodeTabs>
 
-</Tabs>
+## ACLs
+
+Configuration entries may be protected by [ACLs](/consul/docs/security/acl).
+
+Reading a `proxy-defaults` config entry requires no specific privileges.
+
+Creating, updating, or deleting a `proxy-defaults` config entry requires
+`operator:write`.
diff --git a/website/content/docs/connect/config-entries/sameness-group.mdx b/website/content/docs/connect/config-entries/sameness-group.mdx
deleted file mode 100644
index 7a101b4f79c94..0000000000000
--- a/website/content/docs/connect/config-entries/sameness-group.mdx
+++ /dev/null
@@ -1,395 +0,0 @@
----
-page_title: Sameness group configuration entry reference
-description: |-
-  Sameness groups enable Consul to associate service instances with the same name deployed to the same namespace as identical services. Learn how to configure a `sameness-group` configuration entry to enable failover between partitions and cluster peers in non-federated networks.
----
-
-# Sameness groups configuration entry reference
-
-This page provides reference information for sameness group configuration entries. Sameness groups associate identical admin partitions to facilitate traffic between identical services. When partitions are part of the same Consul datacenter, you can create a sameness group by listing them in the `Members[].Partition` field. When partitions are located on remote clusters, you must establish cluster peering connections between remote partitions in order to add them to a sameness group in the `Members[].Peer` field.
-
-To learn more about creating a sameness group, refer to [Create sameness groups](/consul/docs/connect/cluster-peering/usage/create-sameness-groups) or [Create sameness groups on Kubernetes](/consul/docs/k8s/connect/cluster-peering/usage/create-sameness-groups).
-
-## Configuration model
-
-The following list outlines field hierarchy, language-specific data types, and requirements in the sameness group configuration entry. Click on a property name to view additional details, including default values.
-
-<Tabs>
-
-<Tab heading="HCL and JSON" group="hcl">
-
-- [`Kind`](#kind): string | required | must be set to `sameness-group`
-- [`Name`](#name): string | required
-- [`Partition`](#partition): string | `default`
-- [`DefaultForFailover`](#defaultforfailover): boolean | `false`
-- [`IncludeLocal`](#includelocal): boolean | `false`
-- [`Members`](#members): list of maps | required
-  - [`Partition`](#members-partition): string
-  - [`Peer`](#members-peer): string
-
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-
-- [`apiVersion`](#apiversion): string | required | must be set to `consul.hashicorp.com/v1alpha1`
-- [`kind`](#kind): string | required | must be set to `SamenessGroup`
-- [`metadata`](#metadata): map | required
-  - [`name`](#metadata-name): string | required
-- [`spec`](#spec): map | required
-  - [`defaultForFailover`](#spec-defaultforfailover): boolean | `false`
-  - [`includeLocal`](#spec-includelocal): boolean | `false`
-  - [`members`](#spec-members): list of maps | required
-    - [`partition`](#spec-members-partition): string
-    - [`peer`](#spec-members-peer): string
-
-</Tab>
-</Tabs>
-
-## Complete configuration
-
-When every field is defined, a sameness group configuration entry has the following form:
-
-<Tabs>
-
-<Tab heading="HCL" group="hcl">
-
-```hcl
-Kind               = "sameness-group"             # required
-Name               = "<group-name>"               # required
-Partition          = "<partition-configuration-applies-to>"
-DefaultForFailover = false
-IncludeLocal       = true
-Members = [                                       # required
-  { Partition = "<partition-with-services-in-group>" },
-  { Peer = "<cluster-peer-with-services-in-group>" }
-]
-```
-
-</Tab>
-
-<Tab heading="JSON" group="json">
-
-```json
-{
-    "Kind": "sameness-group",                           // required
-    "Name": "<group-name>",                             // required
-    "Partition": "<partition-configuration-applies-to>",
-    "DefaultForFailover": false,
-    "IncludeLocal": true,    
-    "Members": [                                        // required
-        {
-            "Partition": "<partition-with-services-in-group>"
-        },
-        {
-            "Peer": "<cluster-peer-with-services-in-group>"
-        }
-    ]
-}
-```
-
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1         # required
-kind: SamenessGroup                               # required
-metadata:
-  name: <groupName>
-spec:
-  defaultForFailover: false
-  includeLocal: true
-  members:                                        # required
-    - partition: <partitionWithServicesInGroup>
-    - peer: <clusterPeerWithServicesInGroup>
-```
-
-</Tab>
-</Tabs>
-
-## Specifications
-
-This section provides details about the fields you can configure in the sameness group configuration entry.
-
-<Tabs>
-
-<Tab heading="HCL" group="hcl">
-
-### `Kind`
-
-Specifies the type of configuration entry to implement. Must be set to `sameness-group`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String value that must be set to `sameness-group`.
-
-### `Name`
-
-Specifies a name for the configuration entry that is used to identify the sameness group. To ensure consistency, use descriptive names and make sure that the same name is used when creating configuration entries to add each member to the sameness group.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String
-
-### `Partition`
-
-Specifies the local admin partition that the sameness group applies to. Refer to [admin partitions](/consul/docs/enterprise/admin-partitions) for more information.
-
-#### Values
-
-- Default: `default`
-- Data type: String
-
-### `DefaultForFailover`
-
-Determines whether the sameness group should be used to establish connections to services with the same name during failover scenarios.
-
-When this field is set to `true`, upstream requests automatically fail over to services in the sameness group according to the order of the members in the `Members` list. It impacts all services on the partition.
-
-When this field is set to `false`, you can use a sameness group for failover by configuring the `Failover` block of a [service resolver configuration entry](/consul/docs/connect/config-entries/service-resolver).
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `IncludeLocal`
-
-Determines whether the local partition should be considered the first member of the sameness group. When this field is set to `true`, DNS queries, upstream requests, and failover traffic returns a health instance from the local partition unless one does not exist.
-
-If you enable this parameter, you do not need to list the local partition as the first member in the group.
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `Members`
-
-Specifies the partitions and cluster peers that are members of the sameness group from the perspective of the local partition.
-
-The local partition should be the first member listed unless `IncludeLocal=true`. The order of the members determines their precedence during failover scenarios. If a member is listed but Consul cannot connect to it, failover proceeds with the next healthy member in the list. For an example demonstrating how to configure this parameter, refer to [Failover between sameness groups](#failover-between-sameness-groups).
-
-Each partition can belong to a single sameness group. You cannot associate a partition or cluster peer with multiple sameness groups.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: List that can contain maps of the following parameters:
-  - [`Partition`](#members-partition)
-  - [`Peer`](#members-peer)
-
-### `Members[].Partition`
-
-Specifies a partition in the local datacenter that is a member of the sameness group. Local partitions do not require cluster peering connections before they are added to a sameness group.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `Members[].Peer`
-
-Specifies the name of a cluster peer that is a member of the sameness group.
-
-Cluster peering connections must be established before adding a remote partition to the list of members. Refer to [establish cluster peering connections](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering) for more information.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-
-### `apiVersion`
-
-Specifies the version of the Consul API for integrating with Kubernetes. The value must be `consul.hashicorp.com/v1alpha1`. 
-
-#### Values
-
-- Default: None
-- This field is required.
-- String value that must be set to `consul.hashicorp.com/v1alpha1`.
-
-### `kind`
-
-Specifies the type of configuration entry to implement. Must be set to `SamenessGroup`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String value that must be set to `SamenessGroup`.
-
-## `metadata`
-
-Map that contains an arbitrary name for the configuration entry and the namespace it applies to.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `metadata.name`
-
-Specifies a name for the configuration entry that is used to identify the sameness group. To ensure consistency, use descriptive names and make sure that the same name is used when creating configuration entries to add each member to the sameness group.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String
-
-### `spec`
-
-Map that contains the details about the `SamenessGroup` configuration entry. The `apiVersion`, `kind`, and `metadata` fields are siblings of the spec field. All other configurations are children.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-### `spec.defaultForFailover`
-
-Determines whether the sameness group should be used to establish connections to services with the same name during failover scenarios. When this field is set to `true`, upstream requests automatically failover to services in the sameness group according to the order of the members in the `spec.members` list. This setting affects all services on the partition.
-
-When this field is set to `false`, you can use a sameness group for failover by configuring the `spec.failover` block of a [service resolver CRD](/consul/docs/connect/config-entries/service-resolver).
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `spec.includeLocal`
-
-Determines whether the local partition should be considered the first member of the sameness group. When this field is set to `true`, DNS queries, upstream requests, and failover traffic target return a healthy instance from the local partition unless a healthy instance does not exist.
-
-If you enable this parameter, you do not need to list the local partition as the first member in the group.
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `spec.members`
-
-Specifies the local partitions and cluster peers that are members of the sameness group from the perspective of the local partition.
-
-The local partition should be the first member listed unless `spec.includeLocal: true`. The order of the members determines their precedence during failover scenarios. If a member is listed but Consul cannot connect to it, failover proceeds with the next healthy member in the list. For an example demonstrating how to configure this parameter, refer to [Failover between sameness groups](#failover-between-sameness-groups).
-
-Each partition can belong to a single sameness group. You cannot associate a partition or cluster peer with multiple sameness groups.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: List that can contain maps of the following parameters:
-  
-  - [`partition`](#spec-members-partition)
-  - [`peer`](#spec-members-peer)
-
-### `spec.members[].partition`
-
-Specifies a partition in the local datacenter that is a member of the sameness group. Local partitions do not require cluster peering connections before they are added to a sameness group.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `spec.members[].peer`
-
-Specifies the name of a cluster peer that is a member of the sameness group.
-
-Cluster peering connections must be established before adding a peer to the list of members. Refer to [establish cluster peering connections](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering) for more information.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-</Tab>
-</Tabs>
-
-## Examples
-
-The following examples demonstrate common sameness group configuration patterns for specific use cases.
-
-### Failover between members of a sameness group
-
-In the following example, the configuration entry defines a sameness group named `products-api` that applies to the `store-east` partition in the local datacenter. The sameness group is configured so that when a service instance in `store-east` fails, Consul attempts to establish a failover connection in the following order:
-
-- Services with the same name in the `store-east` partition
-- Services with the same name in the `inventory-east` partition in the same datacenter
-- Services with the same name in the `store-west` partition of datacenter `dc2`, which has an established cluster peering connection.
-- Services with the same name in the `inventory-west` partition of `dc2`, which has an established cluster peering connection.
-
-<Tabs>
-
-<Tab heading="HCL" group="hcl">
-
-```hcl
-Kind                     = "sameness-group"  
-Name                     = "products-api"
-Partition                = "store-east"
-Members = [
-    { Partition = "store-east" },
-    { Partition = "inventory-east" },
-    { Peer      = "dc2-store-west" },
-    { Peer      = "dc2-inventory-west" }
-]
-```
-
-</Tab>
-
-<Tab heading="JSON" group="json">
-
-```json
-{
-    "Kind": "sameness-group", 
-    "Name": "products-api", 
-    "Partition": "store-east",
-    "Members": [
-        {
-            "Partition": "store-east"
-        },
-        {
-            "Partition": "inventory-east"
-        },
-        {
-            "Peer": "dc2-store-west"
-        },
-        {
-            "Peer": "dc2-inventory-west"
-        }
-    ]
-}
-```
-
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: SamenessGroup 
-metadata:
-  name: products-api
-spec:
-  members:                                   
-    - partition: store-east
-    - partition: inventory-east
-    - peer: dc2-store-west
-    - peer: dc2-inventory-west
-```
-
-</Tab>
-</Tabs>
diff --git a/website/content/docs/connect/config-entries/service-defaults.mdx b/website/content/docs/connect/config-entries/service-defaults.mdx
index b7b128a4356a3..2e048e5b27251 100644
--- a/website/content/docs/connect/config-entries/service-defaults.mdx
+++ b/website/content/docs/connect/config-entries/service-defaults.mdx
@@ -1,98 +1,84 @@
 ---
 layout: docs
-page_title: Service defaults configuration entry reference
+page_title: Service Defaults Configuration Reference
 description: ->
   Use the service-defaults configuration entry to set default configurations for services, such as upstreams, protocols, and namespaces. Learn how to configure service-defaults.
 ---
 
-# Service defaults configuration reference
-
+# Service Defaults Configuration Reference
 This topic describes how to configure service defaults configuration entries. The service defaults configuration entry contains common configuration settings for service mesh services, such as upstreams and gateways. Refer to [Define service defaults](/consul/docs/services/usage/define-services#define-service-defaults) for usage information.
 
 ## Configuration model
 
-The following list outlines field hierarchy, language-specific data types, requirements, and any applicable default values in service defaults configuration entries. Click on a property name to view additional details.
+The following outline shows how to format the service defaults configuration entry. Click on a property name to view details about the configuration.
 
 <Tabs>
 <Tab heading="HCL and JSON" group="hcl">
 
 - [`Kind`](#kind): string | required
 - [`Name`](#name): string | required
-- [`Namespace`](#namespace): string | `default` <EnterpriseAlert inline />
-- [`Partition`](#partition): string | `default` <EnterpriseAlert inline />
-- [`Meta`](#meta): map
-- [`Protocol`](#protocol): string | `tcp`
-- [`BalanceInboundConnections`](#balanceinboundconnections): string
-- [`Mode`](#mode): string
-- [`RateLimits`](#ratelimits): map
-  - [`InstanceLevel`](#ratelimits-instancelevel): map
-    - [`RequestsPerSecond`](#ratelimits-instancelevel-requestspersecond): number
-    - [`RequestsMaxBurst`](#ratelimits-instancelevel-requestsmaxburst): number
-    - [`Routes`](#ratelimits-instancelevel-routes): list maps
-      - [`PathExact`](#ratelimits-instancelevel-routes): string
-      - [`PathPrefix`](#ratelimits-instancelevel-routes): string
-      - [`PathRegex`](#ratelimits-instancelevel-routes): string
-      - [`RequestsPerSecond`](#ratelimits-instancelevel-routes): number | required
-      - [`RequestsMaxBurst`](#ratelimits-instancelevel-routes): number
-- [`UpstreamConfig`](#upstreamconfig): map
-  - [`Overrides`](#upstreamconfig-overrides): map
-    - [`Name`](#upstreamconfig-overrides-name): string
-    - [`Namespace`](#upstreamconfig-overrides-namespace): string
-    - [`Peer`](#upstreamconfig-overrides-peer): string
-    - [`Protocol`](#upstreamconfig-overrides-protocol): string
-    - [`ConnectTimeoutMs`](#upstreamconfig-overrides-connecttimeoutms): int | `5000`
-    - [`MeshGateway`](#upstreamconfig-overrides-meshgateway): map
-      - [`mode`](#upstreamconfig-overrides-meshgateway): string
-    - [`BalanceOutboundConnections`](#upstreamconfig-overrides-balanceoutboundconnections): string
-    - [`Limits`](#upstreamconfig-overrides-limits): map
-      - [`MaxConnections`](#upstreamconfig-overrides-limits): number | `0`
-      - [`MaxPendingRequests`](#upstreamconfig-overrides-limits): number | `0`
-      - [`MaxConcurrentRequests`](#upstreamconfig-overrides-limits): number | `0`
-    - [`PassiveHealthCheck`](#upstreamconfig-overrides-passivehealthcheck): map
+- [`Namespace`](#namespace): string  <EnterpriseAlert inline />
+- [`Partition`](#partition): string  <EnterpriseAlert inline />
+- [`Meta`](#meta): map | no default
+- [`Protocol`](#protocol): string | default: `tcp`
+- [`BalanceInboundConnections`](#balanceinboundconnections): string | no default
+- [`Mode`](#mode): string | no default
+- [`UpstreamConfig`](#upstreamconfig): map | no default
+  - [`Overrides`](#upstreamconfig-overrides): map | no default
+    - [`Name`](#upstreamconfig-overrides-name): string | no default
+    - [`Namespace`](#upstreamconfig-overrides-namespace): string | no default
+    - [`Peer`](#upstreamconfig-overrides-peer): string | no default
+    - [`Protocol`](#upstreamconfig-overrides-protocol): string | no default
+    - [`ConnectTimeoutMs`](#upstreamconfig-overrides-connecttimeoutms): int | default: `5000`
+    - [`MeshGateway`](#upstreamconfig-overrides-meshgateway): map | no default
+      - [`mode`](#upstreamconfig-overrides-meshgateway): string | no default
+    - [`BalanceOutboundConnections`](#upstreamconfig-overrides-balanceoutboundconnections): string | no default
+    - [`Limits`](#upstreamconfig-overrides-limits): map | optional
+      - [`MaxConnections`](#upstreamconfig-overrides-limits): integer | `0`
+      - [`MaxPendingRequests`](#upstreamconfig-overrides-limits): integer | `0`
+      - [`MaxConcurrentRequests`](#upstreamconfig-overrides-limits): integer | `0`
+    - [`PassiveHealthCheck`](#upstreamconfig-overrides-passivehealthcheck): map | optional
       - [`Interval`](#upstreamconfig-overrides-passivehealthcheck): string | `0s`
-      - [`MaxFailures`](#upstreamconfig-overrides-passivehealthcheck): number | `0`
-      - [`EnforcingConsecutive5xx`](#upstreamconfig-overrides-passivehealthcheck): number | `0`
-      - [`MaxEjectionPercent`](#upstreamconfig-overrides-passivehealthcheck): number | `0`
+      - [`MaxFailures`](#upstreamconfig-overrides-passivehealthcheck): integer | `0`
+      - [`EnforcingConsecutive5xx`](#upstreamconfig-overrides-passivehealthcheck): integer | `0`
+      - [`MaxEjectionPercent`](#upstreamconfig-overrides-passivehealthcheck): integer | `0`
       - [`BaseEjectionTime`](#upstreamconfig-overrides-passivehealthcheck): string | `30s`
-  - [`Defaults`](#upstreamconfig-defaults): map
-    - [`Protocol`](#upstreamconfig-defaults-protocol): string
-    - [`ConnectTimeoutMs`](#upstreamconfig-defaults-connecttimeoutms): int | `5000`
-    - [`MeshGateway`](#upstreamconfig-defaults-meshgateway): map
-      - [`mode`](#upstreamconfig-defaults-meshgateway): string
-    - [`BalanceOutboundConnections`](#upstreamconfig-defaults-balanceoutboundconnections): string
-    - [`Limits`](#upstreamconfig-defaults-limits): map
-      - [`MaxConnections`](#upstreamconfig-defaults-limits): number | `0`
-      - [`MaxPendingRequests`](#upstreamconfig-defaults-limits): number | `0`
-      - [`MaxConcurrentRequests`](#upstreamconfig-defaults-limits): number | `0`
-    - [`PassiveHealthCheck`](#upstreamconfig-defaults-passivehealthcheck): map
+  - [`Defaults`](#upstreamconfig-defaults): map | no default
+    - [`Protocol`](#upstreamconfig-defaults-protocol): string | no default
+    - [`ConnectTimeoutMs`](#upstreamconfig-defaults-connecttimeoutms): int | default: `5000`
+    - [`MeshGateway`](#upstreamconfig-defaults-meshgateway): map | no default
+      - [`mode`](#upstreamconfig-defaults-meshgateway): string | no default
+    - [`BalanceOutboundConnections`](#upstreamconfig-defaults-balanceoutboundconnections): string | no default
+    - [`Limits`](#upstreamconfig-defaults-limits): map | optional
+      - [`MaxConnections`](#upstreamconfig-defaults-limits): integer | `0`
+      - [`MaxPendingRequests`](#upstreamconfig-defaults-limits): integer | `0`
+      - [`MaxConcurrentRequests`](#upstreamconfig-defaults-limits): integer | `0`
+    - [`PassiveHealthCheck`](#upstreamconfig-defaults-passivehealthcheck): map | optional
       - [`Interval`](#upstreamconfig-defaults-passivehealthcheck): string | `0s`
-      - [`MaxFailures`](#upstreamconfig-defaults-passivehealthcheck): number | `0`
-      - [`EnforcingConsecutive5xx`](#upstreamconfig-defaults-passivehealthcheck): number | `100`
-      - [`MaxEjectionPercent`](#upstreamconfig-defaults-passivehealthcheck): number | `0`
+      - [`MaxFailures`](#upstreamconfig-defaults-passivehealthcheck): integer | `0`
+      - [`EnforcingConsecutive5xx`](#upstreamconfig-defaults-passivehealthcheck): integer | `100`
+      - [`MaxEjectionPercent`](#upstreamconfig-defaults-passivehealthcheck): integer | `0`
       - [`BaseEjectionTime`](#upstreamconfig-defaults-passivehealthcheck): string | `30s`
-- [`TransparentProxy`](#transparentproxy): map
-  - [`OutboundListenerPort`](#transparentproxy): number | `15001`
+- [`TransparentProxy`](#transparentproxy): map | no default
+  - [`OutboundListenerPort`](#transparentproxy): integer | `15001`
   - [`DialedDirectly`](#transparentproxy  ): boolean | `false`
-- [`MutualTLSMode`](#mutualtlsmode): string
-- [`EnvoyExtensions`](#envoyextensions): list
-  - [`Name`](#envoyextensions): string
-  - [`Required`](#envoyextensions): string
-  - [`Arguments`](#envoyextensions): map
-  - [`ConsulVersion`](#envoyextensions): string
-  - [`EnvoyVersion`](#envoyextensions): string
-- [`Destination`](#destination): map
-  - [`Addresses`](#destination): list
+- [`EnvoyExtensions`](#envoyextensions): list | no default
+  - [`Name`](#envoyextensions): string | `""`
+  - [`Required`](#envoyextensions): string | `""`
+  - [`Arguments`](#envoyextensions): map | `nil`
+- [`Destination`](#destination): map | no default
+  - [`Addresses`](#destination): list | no default
   - [`Port`](#destination): integer | `0`
-- [`MaxInboundConnections`](#maxinboundconnections): number | `0`
-- [`LocalConnectTimeoutMs`](#localconnecttimeoutms): number | `0`
-- [`LocalRequestTimeoutMs`](#localrequesttimeoutms): number | `0`
-- [`MeshGateway`](#meshgateway): map
-  - [`Mode`](#meshgateway): string
-- [`ExternalSNI`](#externalsni): string
-- [`Expose`](#expose): map
+- [`MaxInboundConnections`](#maxinboundconnections): integer | `0`
+- [`LocalConnectTimeoutMs`](#localconnecttimeoutms): integer | `0`
+- [`LocalRequestTimeoutMs`](#localrequesttimeoutms): integer | `0`
+- [`MeshGateway`](#meshgateway): map | no default
+  - [`Mode`](#meshgateway): string | no default
+- [`ExternalSNI`](#externalsni): string | no default
+- [`Expose`](#expose): map | no default
   - [`Checks`](#expose-checks): boolean | `false`
-  - [`Paths`](#expose-paths): list
-    - [`Path`](#expose-paths): string
+  - [`Paths`](#expose-paths): list | no default
+    - [`Path`](#expose-paths): string | no default
     - [`LocalPathPort`](#expose-paths): integer | `0`
     - [`ListenerPort`](#expose-paths): integer | `0`
     - [`Protocol`](#expose-paths): string | `http`
@@ -100,86 +86,72 @@ The following list outlines field hierarchy, language-specific data types, requi
 </Tab>
 <Tab heading="Kubernetes YAML" group="yaml">
 
-- [`apiVersion`](#apiversion): string | required | must be set to `consul.hashicorp.com/v1alpha1`
-- [`kind`](#kind): string
-- [`metadata`](#metadata): map
-  - [`name`](#name): string
-  - [`namespace`](#namespace): string | `default`` | <EnterpriseAlert inline />
-- [`spec`](#spec): map
-  - [`protocol`](#protocol): string | `tcp`
-  - [`balanceInboundConnections`](#balanceinboundconnections): string
-  - [`mode`](#mode): string
-  - [`rateLimits`](#spec-ratelimits): map
-    - [`instanceLevel`](#spec-ratelimits-instancelevel): map
-      - [`requestsPerSecond`](#spec-ratelimits-instancelevel-requestspersecond): number
-      - [`requestsMaxBurst`](#spec-ratelimits-instancelevel-requestsmaxburst): number
-      - [`routes`](#spec-ratelimits-instancelevel-routes): list maps
-        - [`pathExact`](#spec-ratelimits-instancelevel-routes): string
-        - [`pathPrefix`](#spec-ratelimits-instancelevel-routes): string
-        - [`pathRegex`](#spec-ratelimits-instancelevel-routes): string
-        - [`requestsPerSecond`](#spec-ratelimits-instancelevel-routes): number | required
-        - [`requestsMaxBurst`](#spec-ratelimits-instancelevel-routes): number
-  - [`upstreamConfig`](#upstreamconfig): map
-    - [`overrides`](#upstreamconfig-overrides): list
-      - [`name`](#upstreamconfig-overrides-name): string
-      - [`namespace`](#upstreamconfig-overrides-namespace): string
-      - [`peer`](#upstreamconfig-overrides-peer): string
-      - [`protocol`](#upstreamconfig-overrides-protocol): string
-      - [`connectTimeoutMs`](#upstreamconfig-overrides-connecttimeoutms): number | `5000`
-      - [`meshGateway`](#upstreamconfig-overrides-meshgateway): map
-        - [`mode`](#upstreamconfig-overrides-meshgateway): string
-      - [`balanceOutboundConnections`](#overrides-balanceoutboundconnections): string
-      - [`limits`](#upstreamconfig-overrides-limits): map
-        - [`maxConnections`](#upstreamconfig-overrides-limits): number | `0`
-        - [`maxPendingRequests`](#upstreamconfig-overrides-limits): number | `0`
-        - [`maxConcurrentRequests`](#upstreamconfig-overrides-limits): number | `0`
-      - [`passiveHealthCheck`](#upstreamconfig-overrides-passivehealthcheck): map
+- [`apiVersion`](#apiversion): string | must be set to `consul.hashicorp.com/v1alpha1`
+- [`kind`](#kind): string | no default
+- [`metadata`](#metadata): map | no default
+  - [`name`](#name): string | no default
+  - [`namespace`](#namespace): string | no default | <EnterpriseAlert inline />
+- [`spec`](#spec): map | no default
+  - [`protocol`](#protocol): string | default: `tcp`
+  - [`balanceInboundConnections`](#balanceinboundconnections): string | no default
+  - [`mode`](#mode): string | no default
+  - [`upstreamConfig`](#upstreamconfig): map | no default
+    - [`overrides`](#upstreamconfig-overrides): list | no default
+      - [`name`](#upstreamconfig-overrides-name): string | no default
+      - [`namespace`](#upstreamconfig-overrides-namespace): string | no default
+      - [`protocol`](#upstreamconfig-overrides-protocol): string | no default
+      - [`connectTimeoutMs`](#upstreamconfig-overrides-connecttimeoutms): int | default: `5000`
+      - [`meshGateway`](#upstreamconfig-overrides-meshgateway): map | no default
+        - [`mode`](#upstreamconfig-overrides-meshgateway): string | no default
+      - [`balanceOutboundConnections`](#overrides-balanceoutboundconnections): string | no default
+      - [`limits`](#upstreamconfig-overrides-limits): map | optional
+        - [`maxConnections`](#upstreamconfig-overrides-limits): integer | `0`
+        - [`maxPendingRequests`](#upstreamconfig-overrides-limits): integer | `0`
+        - [`maxConcurrentRequests`](#upstreamconfig-overrides-limits): integer | `0`
+      - [`passiveHealthCheck`](#upstreamconfig-overrides-passivehealthcheck): map | optional
         - [`interval`](#upstreamconfig-overrides-passivehealthcheck): string | `0s`
-        - [`maxFailures`](#upstreamconfig-overrides-passivehealthcheck): number | `0`
-        - [`enforcingConsecutive5xx`](#upstreamconfig-overrides-passivehealthcheck): number | `100`
-        - [`maxEjectionPercent`](#upstreamconfig-overrides-passivehealthcheck): number | `10`
+        - [`maxFailures`](#upstreamconfig-overrides-passivehealthcheck): integer | `0`
+        - [`enforcingConsecutive5xx`](#upstreamconfig-overrides-passivehealthcheck): integer | `100`
+        - [`maxEjectionPercent`](#upstreamconfig-overrides-passivehealthcheck): integer | `10`
         - [`baseEjectionTime`](#upstreamconfig-overrides-passivehealthcheck): string | `30s`
-    - [`defaults`](#upstreamconfig-defaults): map
-      - [`protocol`](#upstreamconfig-defaults-protocol): string
-      - [`connectTimeoutMs`](#upstreamconfig-defaults-connecttimeoutms): number | `5000`
-      - [`meshGateway`](#upstreamconfig-defaults-meshgateway): map
-        - [`mode`](#upstreamconfig-defaults-meshgateway): string
-      - [`balanceOutboundConnections`](#upstreamconfig-defaults-balanceoutboundconnections): string
-      - [`limits`](#upstreamconfig-defaults-limits): map
-        - [`maxConnections`](#upstreamconfig-defaults-limits): number | `0`
-        - [`maxPendingRequests`](#upstreamconfig-defaults-limits): number | `0`
-        - [`maxConcurrentRequests`](#upstreamconfig-defaults-limits): number | `0`
-      - [`passiveHealthCheck`](#upstreamconfig-defaults-passivehealthcheck): map
+    - [`defaults`](#upstreamconfig-defaults): map | no default
+      - [`protocol`](#upstreamconfig-defaults-protocol): string | no default
+      - [`connectTimeoutMs`](#upstreamconfig-defaults-connecttimeoutms): int | default: `5000`
+      - [`meshGateway`](#upstreamconfig-defaults-meshgateway): map | no default
+        - [`mode`](#upstreamconfig-defaults-meshgateway): string | no default
+      - [`balanceOutboundConnections`](#upstreamconfig-defaults-balanceoutboundconnections): string | no default
+      - [`limits`](#upstreamconfig-defaults-limits): map | optional
+        - [`maxConnections`](#upstreamconfig-defaults-limits): integer | `0`
+        - [`maxPendingRequests`](#upstreamconfig-defaults-limits): integer | `0`
+        - [`maxConcurrentRequests`](#upstreamconfig-defaults-limits): integer | `0`
+      - [`passiveHealthCheck`](#upstreamconfig-defaults-passivehealthcheck): map | optional
         - [`interval`](#upstreamconfig-defaults-passivehealthcheck): string | `0s`
-        - [`maxFailures`](#upstreamconfig-defaults-passivehealthcheck): number | `0`
-        - [`enforcingConsecutive5xx`](#upstreamconfig-defaults-passivehealthcheck): number | `100`
-        - [`maxEjectionPercent`](#upstreamconfig-defaults-passivehealthcheck): number | `10`
+        - [`maxFailures`](#upstreamconfig-defaults-passivehealthcheck): integer | `0`
+        - [`enforcingConsecutive5xx`](#upstreamconfig-defaults-passivehealthcheck): integer | `100`
+        - [`maxEjectionPercent`](#upstreamconfig-defaults-passivehealthcheck): integer | `10`
         - [`baseEjectionTime`](#upstreamconfig-defaults-passivehealthcheck): string | `30s`
-  - [`transparentProxy`](#transparentproxy): map
-    - [`outboundListenerPort`](#transparentproxy): number | `15001`
+  - [`transparentProxy`](#transparentproxy): map | no default
+    - [`outboundListenerPort`](#transparentproxy): integer | `15001`
     - [`dialedDirectly`](#transparentproxy): boolean | `false`
-  - [`mutualTLSMode`](#mutualtlsmode): string
-  - [`envoyExtensions`](#envoyextensions): list
-    - [`name`](#envoyextensions): string
-    - [`required`](#envoyextensions): string
-    - [`arguments`](#envoyextensions): map
-    - [`consulVersion`](#envoyextensions): string
-    - [`envoyVersion`](#envoyextensions): string
-  - [`destination`](#destination): map
-    - [`addresses`](#destination): list
-    - [`port`](#destination): number | `0`
-  - [`maxInboundConnections`](#maxinboundconnections): number | `0`
-  - [`localConnectTimeoutMs`](#localconnecttimeoutms): number | `0`
-  - [`localRequestTimeoutMs`](#localrequesttimeoutms): number | `0`
-  - [`meshGateway`](#meshgateway): map
-    - [`mode`](#meshgateway): string
-  - [`externalSNI`](#externalsni): string
-  - [`expose`](#expose): map
+  - [`envoyExtensions`](#envoyextensions): list | no default
+    - [`name`](#envoyextensions): string | `""`
+    - [`required`](#envoyextensions): string | `""`
+    - [`arguments`](#envoyextensions): map | `nil`
+  - [`destination`](#destination): map | no default
+    - [`addresses`](#destination): list | no default
+    - [`port`](#destination): integer | `0`
+  - [`maxInboundConnections`](#maxinboundconnections): integer | `0`
+  - [`localConnectTimeoutMs`](#localconnecttimeoutms): integer | `0`
+  - [`localRequestTimeoutMs`](#localrequesttimeoutms): integer | `0`
+  - [`meshGateway`](#meshgateway): map | no default
+    - [`mode`](#meshgateway): string | no default
+  - [`externalSNI`](#externalsni): string | no default
+  - [`expose`](#expose): map | no default
     - [`checks`](#expose-checks): boolean | `false`
-    - [`paths`](#expose-paths): list
-      - [`path`](#expose-paths): string
-      - [`localPathPort`](#expose-paths): number | `0`
-      - [`listenerPort`](#expose-paths): number | `0`
+    - [`paths`](#expose-paths): list | no default
+      - [`path`](#expose-paths): string | no default
+      - [`localPathPort`](#expose-paths): integer | `0`
+      - [`listenerPort`](#expose-paths): integer | `0`
       - [`protocol`](#expose-paths): string | `http`
 
 </Tab>
@@ -194,110 +166,85 @@ When every field is defined, a service-defaults configuration entry has the foll
 
 ```hcl
 Kind      = "service-defaults"
-Name      = "<service_name>"
-Namespace = "default"
-Partition = "default"
+Name      = "service_name"
+Namespace = "namespace"
+Partition = "partition"
 Meta = {
   Key = "value"
 }
 Protocol                  = "tcp"
 BalanceInboundConnections = "exact_balance"
-Mode                      = "<mode for directing traffic>"
-RateLimits = {
-  InstanceLevel = {
-    RequestsPerScond = <average number of requests allowed to the service per second>
-    RequestsMaxBurst = <max number of concurrent requests allowed to the service>
-    Routes = [		# Configure RequestsPerSecond and one route matching parameter for each member of the list
-      {
-        PathExact = "<limits apply paths that match this value>"
-        PathPrefix = "<limits apply to paths starting with this value>"
-        PathRegex = "<limits apply to paths that match this expression>"
-        RequestsPerSecond = <overrides top-level limit>
-        RequestMaxBurst = <overrides top-level limit>
-      }
-  ]
-}
+Mode                      = "transparent"
 UpstreamConfig = {
   Overrides = {
-    Name             = "<name of upstreams to override>"
-    Namespace        = "<namespace containing upstreams to override>"
-    Peer             = "<peer name of upstream service>"
-    Protocol         = "<protocol for requests to upstream services>"
-    ConnectTimeoutMs = 5000
+    Name             = "name-of-upstreams-to-override"
+    Namespace        = "namespace-containing-upstreams-to-override"
+    Protocol         = "http"
+    ConnectTimeoutMs = 100
     MeshGateway = {
-      mode = "<mode for mesh gateway services>"
+      mode = "remote"
     }
     BalanceOutboundConnections = "exact_balance"
     Limits = {
-      MaxConnections        = 0
-      MaxPendingRequests    = 0
-      MaxConcurrentRequests = 0
+      MaxConnections        = 10
+      MaxPendingRequests    = 50
+      MaxConcurrentRequests = 100
     }
     PassiveHealthCheck = {
-      Interval                = "0s"
-      MaxFailures             = 0
-      EnforcingConsecutive5xx = 100
+      Interval                = "5s"
+      MaxFailures             = 5
+      EnforcingConsecutive5xx = 99
       MaxEjectionPercent      = 10
       BaseEjectionTime        = "30s"
     }
   }
   Defaults = {
-    Protocol         = "<default protocol for upstream traffic>"
-    ConnectTimeoutMs = 5000
+    Protocol         = "http2"
+    ConnectTimeoutMs = 2000
     MeshGateway = {
-      mode = "<default mode for mesh gateway services>"
+      mode = "local"
     }
     BalanceOutboundConnections = "exact_balance"
     Limits = {
-      MaxConnections        = 0
-      MaxPendingRequests    = 0
-      MaxConcurrentRequests = 0
+      MaxConnections        = 100
+      MaxPendingRequests    = 500
+      MaxConcurrentRequests = 1000
     }
     PassiveHealthCheck = {
-      Interval                = "0s"
-      MaxFailures             = 0
-      EnforcingConsecutive5xx = 100
+      Interval                = "1s"
+      MaxFailures             = 1
+      EnforcingConsecutive5xx = 89
       MaxEjectionPercent      = 10
       BaseEjectionTime        = "30s"
     }
   }
 }
 TransparentProxy = {
-  OutboundListenerPort = 15001
-  DialedDirectly       = false
+  OutboundListenerPort = 15002
+  DialedDirectly       = true
 }
-MutualTLSMode = "strict" # only supported when services are in transparent proxy mode
-EnvoyExtensions = [
-  {
-    Name = "<name of the extension>"
-    Required = `false`
-    Arguments = { <specific to each extension> }
-    ConsulVersion = "<Consul version constraint for applying the extension>"
-    EnvoyVersion = "<Envoy version constraint for applying the extension>"
-  }
-]
 Destination = {
   Addresses = [
-    "<first IP address>",
-    "<second IP address>"
+    "First IP address",
+    "Second IP address"
   ]
-  Port = 0
+  Port = 88
 }
-MaxInboundConnections = 0
-LocalConnectTimeoutMs = 5000
-LocalRequestTimeoutMs = "15s"
+MaxInboundConnections = 100
+LocalConnectTimeoutMs = 10
+LocalRequestTimeoutMs = 10
 MeshGateway = {
-  Mode = "<default mode for mesh gateway services>"
+  Mode = "remote"
 }
-ExternalSNI = "<SNI server host>"
+ExternalSNI = "sni-server-host"
 Expose = {
-  Checks = false
+  Checks = true
   Paths = [
     {
-      Path          = "</local/dir>"
-      LocalPathPort = 0
-      LocalListenerPort = 0
-      Protocol      = "http"
+      Path          = "/local/dir"
+      LocalPathPort = 99
+      LocalListenerPort = 98
+      Protocol      = "http2"
     }
   ]
 }
@@ -311,46 +258,35 @@ apiVersion: consul.hashicorp.com/v1alpha1
 kind: ServiceDefaults
 metadata:
   name: <name of the service you are configuring>
-  namespace: default
+  namespace: <Consul Enterprise namespace>
 spec:
   protocol: tcp
   balanceInboundConnections: exact_balance
-  mode: <mode for directing traffic>
-  rateLimits:
-    instanceLevel:
-      requestsPerScond: <average number of requests allowed to the service per second>
-      requestsMaxBurst: <max number of concurrent requests allowed to the service>
-      routes: 		# Configure RequestsPerSecond and one route matching parameter for each member of the list
-      - pathExact: "<limits apply paths that match this value>"
-        pathPrefix: "<limits apply to paths starting with this value>"
-        pathRegex: "<limits apply to paths that match this expression>"
-        requestsPerSecond: <overrides top-level limit>
-        requestMaxBurst: <overrides top-level limit>
+  mode: transparent
   upstreamConfig:
     overrides:
-    - name: <name of upstreams to override>
-      namespace: <namespace containing upstream>
-      peer: <peer name of upstream services>
+    - name: <name of upstream>
+      namespace: <namespace containing upstream - Consul Enterprise>
       protocol: <protocol for the upstream listener>
       connectTimeoutMs: 5000
       meshGateway:
-        mode: <mode for mesh gateway services>
+        mode: <type of mesh gateway>
       balanceOutboundConnections: exact_balance
       limits:
         maxConnections: 0
         maxPendingRequests: 0
         maxConcurrentRequests: 0
       passiveHealthCheck:
-        interval: "0s"
+        interval: "10s"
         maxFailures: 0
         enforcingConsecutive5xx: 100
         maxEjectionPercent: 10
         baseEjectionTime: "30s"
     defaults:
-      protocol: <default protocol for the upstream listener>
+      protocol: <protocol for the upstream listener>
       connectTimeoutMs: 5000
       meshGateway:
-        mode: <default mode for mesh gateway services>
+        mode: <type of mesh gateway>
       balanceOutboundConnections: exact_balance
       limits:
         maxConnections: 0
@@ -365,22 +301,14 @@ spec:
   transparentProxy:
     outboundListenerPort: 15001
     dialedDirectly: false
-  mutualTLSMode: strict
-  envoyExtensions:
-  - name: <name of the extension>
-    required: false
-    arguments:
-    - <specific to each extension>
-    consulVersion: <Consul version constraint for applying the extension>
-    envoyVersion: <Envoy version constraint for applying the extension>
   destination:
     addresses:
-    - <first hostname or IP address>
-      <second hostname or IP address>
+    - <First hostname or IP address>
+      <Second hostname or IP address>
     port:  0
   maxInboundConnections: 0
   meshGateway:
-    mode: <default mode for mesh gateway services>
+    mode: <type of mesh gateway>
   externalSNI: <name of TLS SNI outside o f the mesh>
   expose:
     checks: false
@@ -397,111 +325,92 @@ spec:
 
 ```json
 {
-	"Kind": "ServiceDefaults",
-	"Name": "<name of the service you are configuring>",
-	"Namespace": "default",
-	"Partition": "default",
-	"Meta": {
-		"<Keys>": "<Values>"
-	},
-	"Protocol": "tcp",
-	"BalanceInboundConnections": "exact_balance",
-	"Mode": "<mode for directing traffic>",
-  "RateLimits": {
-    "InstanceLevel": {
-      "RequestsPerScond": 100,
-      "RequestsMaxBurst": 200,
-      "Routes": [
+  "apiVersion": "consul.hashicorp.com/v1alpha1",
+  "kind": "ServiceDefaults",
+  "metadata": {
+    "name": "<name of the service you are configuring>",
+    "namespace": "<Consul Enterprise namespace>",
+    "partition": "<Consul Enterprise admin partition>"
+  },
+  "spec": {
+    "protocol": "tcp",
+    "balanceInboundConnections": "exact_balance",
+    "mode": "transparent",
+    "upstreamConfig": {
+      "overrides": [
         {
-          "PathExact": "<limits apply paths that match this value>",
-          "PathPrefix": "<limits apply to paths starting with this value>",
-          "PathRegex": "<limits apply to paths that match this expression>",
-          "RequestsPerSecond":  50,
-          "RequestMaxBurst": 100
+          "name": "<name of upstream>",
+          "namespace": "<namespace containing upstream - Consul Enterprise>",
+          "peer": "<peer name of the upstream service>",
+          "protocol": "<protocol for the upstream listener>",
+          "connectTimeoutMs": 5000,
+          "meshGateway": {
+            "mode": "<type of mesh gateway>"
+          },
+          "balanceOutboundConnections": "exact_balance",
+          "limits": {
+            "maxConnections": 0,
+            "maxPendingRequests": 0,
+            "maxConcurrentRequests": 0
+          },
+          "passiveHealthCheck": {
+            "interval": "0s",
+            "maxFailures": 0,
+            "enforcingConsecutive5xx": 100,
+            "maxEjectionPercent": 10,
+            "baseEjectionTime": "30s",
+          },
+        }
+      ],
+      "defaults": {
+        "protocol": "<protocol for the upstream listener>",
+        "connectTimeoutMs": 5000,
+        "meshGateway": {
+          "mode": "<type of mesh gateway>"
+        },
+        "balanceOutboundConnections": "exact_balance",
+        "limits": {
+          "maxConnections": 0,
+          "maxPendingRequests": 0,
+          "maxConcurrentRequests": 0
+        },
+        "passiveHealthCheck": {
+          "interval": "0s",
+          "maxFailures": 0,
+          "enforcingConsecutive5xx": 100,
+          "maxEjectionPercent": 10,
+          "baseEjectionTime": "30s",
+        }
+      }
+    },
+    "transparentProxy": {
+      "outboundListenerPort": 15001,
+      "dialedDirectly": false
+    },
+    "destination": {
+      "addresses": [
+        "<First hostname or IP address>",
+        "<Second hostname or IP address>"
+      ],
+      "port": 0
+    },
+    "maxInboundConnections": 0,
+    "meshGateway": {
+      "mode": "<type of mesh gateway>"
+    },
+    "externalSNI": "<name of TLS SNI outside o f the mesh>",
+    "expose": {
+      "checks": false,
+      "paths": [
+        {
+          "path": "<HTTP path to expose through Envoy>",
+          "localPathPort": 0,
+          "listenerPort": 0,
+          "protocol": "http"
         }
       ]
     }
-  },
-	"UpstreamConfig": {
-		"Overrides": [{
-			"Name": "<name of upstream>",
-			"Namespace": "<namespace containing upstream - Consul Enterprise>",
-			"Peer": "<peer name of the upstream service>",
-			"Protocol": "<protocol for the upstream listener>",
-			"ConnectTimeoutMs": 5000,
-			"MeshGateway": {
-				"Mode": "<mode for mesh gateway services>"
-			},
-			"BalanceOutboundConnections": "exact_balance",
-			"Limits": {
-				"MaxConnections": 0,
-				"MaxPendingRequests": 0,
-				"MaxConcurrentRequests": 0
-			},
-			"PassiveHealthCheck": {
-				"Interval": "0s",
-				"MaxFailures": 0,
-				"EnforcingConsecutive5xx": 100,
-				"MaxEjectionPercent": 10,
-				"BaseEjectionTime": "30s"
-			}
-		}]
-	},
-	"Defaults": {
-		"Protocol": "<protocol for the upstream listener>",
-		"ConnectTimeoutMs": 5000,
-		"MeshGateway": {
-			"Mode": "<mode for mesh gateway services>"
-		},
-		"BalanceOutboundConnections": "exact_balance",
-		"Limits": {
-			"MaxConnections": 0,
-			"MaxPendingRequests": 0,
-			"MaxConcurrentRequests": 0
-		},
-		"PassiveHealthCheck": {
-			"Interval": "0s",
-			"MaxFailures": 0,
-			"EnforcingConsecutive5xx": 100,
-			"MaxEjectionPercent": 10,
-			"BaseEjectionTime": "30s"
-		}
-	},
-	"TransparentProxy": {
-		"OutboundListenerPort": 15001,
-		"DialedDirectly": false
-	},
-	"MutualTLSMode": "strict",
-	"EnvoyExtensions": [{
-		"Name": "<name of the extension>",
-		"Required": false,
-		"Arguments": {
-			"<specific to each extension>": "<specific to each extension>"
-		},
-		"ConsulVersion": "<Consul version constraint for applying the extension>",
-		"EnvoyVersion": "<Envoy version constraint for applying the extension>"
-	}],
-	"Destination": {
-		"Addresses": [
-			"<first hostname or IP address>",
-			"<second hostname or IP address>"
-		],
-		"Port": 0
-	},
-	"MaxInboundConnections": 0,
-	"MeshGateway": {
-		"Mode": "<mode for mesh gateway services>"
-	},
-	"ExternalSNI": "<name of TLS SNI outside o f the mesh>",
-	"Expose": {
-		"Checks": false,
-		"Paths": [{
-			"Path": "<HTTP path to expose through Envoy>",
-			"LocalPathPort": 0,
-			"ListenerPort": 0,
-			"Protocol": "http"
-		}]
-	}
+  }
 }
 ```
 
@@ -514,11 +423,11 @@ spec:
 This section provides details about the fields you can configure in the service defaults configuration entry.
 
 <Tabs>
-<Tab heading="HCL and JSON" group="hcl">
+<Tab heading="HCL" group="hcl">
 
 ### `Kind`
 
-Specifies the configuration entry type. The value must be set to `service-defaults`.
+Specifies the configuration entry type.
 
 #### Values
 
@@ -534,25 +443,25 @@ Specifies the name of the service you are setting the defaults for.
 
 - Default: none
 - This field is required.
-- Data type: String
+- Data type: string
 
-### `Namespace` <EnterpriseAlert inline/>
+### `Namespace` <Enterprise/>
 
 Specifies the Consul namespace that the configuration entry applies to.
 
 #### Values
 
 - Default: `default`
-- Data type: String
+- Data type: string
 
-### `Partition` <EnterpriseAlert inline/>
+### `Partition` <Enterprise/>
 
 Specifies the name of the name of the Consul admin partition that the configuration entry applies to.  Refer to [Admin Partitions](/consul/docs/enterprise/admin-partitions) for additional information.
 
 #### Values
 
 - Default: `default`
-- Data type: String
+- Data type: string
 
 ### `Meta`
 
@@ -562,8 +471,8 @@ Specifies a set of custom key-value pairs to add to the [Consul KV](/consul/docs
 
 - Default: none
 - Data type: Map of one or more key-value pairs.
-  - keys: String
-  - values: String, integer, or float
+  - keys: string
+  - values: string, integer, or float
 
 ### `Protocol`
 
@@ -579,7 +488,7 @@ You can set the global protocol for proxies in the [`proxy-defaults`](/consul/do
 #### Values
 
 - Default: `tcp`
-- You can specify one of the following String values:
+- You can specify one of the following string values:
   - `tcp` (default)
   - `http`
   - `http2`
@@ -593,78 +502,18 @@ Specifies the strategy for allocating inbound connections to the service across
 
 #### Values
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 ### `Mode`
 
 Specifies a mode for how the service directs inbound and outbound traffic.
 
-- Default: None
+- Default: none
 - You can specify the following string values:
   - `direct`: The proxy's listeners must be dialed directly by the local application and other proxies.
   - `transparent`: The service captures inbound and outbound traffic and redirects it through the proxy. The mode does not enable the traffic redirection. It instructs Consul to configure Envoy as if traffic is already being redirected.
 
-### `RateLimits`
-
-Map containing an instance-level configuration for limiting the service's traffic rate.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `RateLimits{}.InstanceLevel`
-
-Map containing a set of request rate limit configurations for instances of the service.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `RateLimits{}.InstanceLevel{}.RequestsPerScond`
-
-Specifies the average number of requests per second allowed to the service. If the [`RequestsMaxBurst`](#ratelimits-instancelevel-requestsmaxburst) parameter is set, the number of requests per second to the service can temporarily exceed the limit specified in the `RequestsPerSecond` up to the value specified in `RequestsMaxBurst`. Internally, this is the refill rate of the token bucket used for rate limiting.
-
-#### Values
-
-- Default: None
-- Data type: Integer
-
-### `RateLimits{}.InstanceLevel{}.RequestsMaxBurst`
-
-Specifies the maximum number of concurrent requests momentarily allowed to the service. When the limit is reached, Consul blocks additional requests. You must specify a value equal to or greater than the [`RequestsPerSecond`](#ratelimits-instancelevel-requestspersecond) parameter. If unspecified, this parameter defaults to `RequestsPerSecond`. Internally, this is the maximum size of the token bucket used for rate limiting.
-
-#### Values
-
-- Default: None
-- Data type: Integer
-
-### `RateLimits{}.InstanceLevel{}.Routes`
-
-Specifies a list of rate limiting configurations to apply to specific routes to the service. Each member of the `Routes` list must configure the `RequestsPerSecond` parameter and one of the following route-matching parameters:
-
-- `PathExact`
-- `PathPrefix`
-- `PathRegex`
-
-Refer to [Examples](#enable-request-rate-limit-on-a-prefixed-path) for example configurations.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-The following table describes the parameters you can specify in the `Routes` map:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `PathExact` | Specifies the exact path to match on the request path. When using this field, do not configure `PathPrefix` or `PathRegex` in the same `Routes` map. | String | None |
-| `PathPrefix` | Specifies the path prefix to match on the request path. When using this field, do not configure `PathExact` or `PathRegex` in the same `Routes` map. | String | None |
-| `PathRegex` | Specifies a regular expression to match on the request path. When using this field, do not configure `PathExact` or `PathPrefix` in the same `Routes` map. The syntax is proxy-specific. When [using Envoy](/consul/docs/connect/proxies/envoy), refer to [the documentation for Envoy v1.11.2 or newer](https://github.com/google/re2/wiki/Syntax) or [the documentation for Envoy v1.11.1 or older](https://en.cppreference.com/w/cpp/regex/ecmascript), depending on the version of Envoy you use. | String | None |
-| `RequestsPerSecond` | Specifies the average number of requests per second allowed to the service. Overrides the  [`RequestsPerSecond`](#ratelimits-instancelevel-requestspersecond) parameter specified for the service. | Integer | None |
-| `RequestsMaxBurst` | Specifies the maximum number of concurrent requests temporarily allowed to the service. When the limit is reached, Consul blocks additional requests. You must specify a value equal to or greater than the `Routes.RequestsPerSecond` parameter. Overrides the [`RequestsMaxBurst`](#ratelimits-instancelevel-requestsmaxburst) parameter specified for the service. | Integer | None |
 
 ### `UpstreamConfig`
 
@@ -675,8 +524,8 @@ Controls default upstream connection settings and custom overrides for individua
 
 #### Values
 
-- Default: None
-- Data type: Map
+- Default: none
+- Data type: map
 
 ### `UpstreamConfig.Overrides[]`
 
@@ -684,8 +533,8 @@ Specifies options that override the [default upstream configurations](#upstreamc
 
 #### Values
 
-- Default: None
-- Data type: List
+- Default: none
+- Data type: list
 
 ### `UpstreamConfig.Overrides[].Name`
 
@@ -693,48 +542,39 @@ Specifies the name of the upstream service that the configuration applies to. We
 
 #### Values
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 ### `UpstreamConfig.Overrides[].Namespace` <Enterprise/>
 
-Specifies the namespace containing the upstream service that the configuration applies to. Do not use the `*` wildcard to prevent the configuration from applying to unintended upstreams.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `UpstreamConfig.Overrides[].Peer`
-
-Specifies the peer name of the upstream service that the configuration applies to. The `*` wildcard is not supported.
+Specifies the namespace containing the upstream service that the configuration applies to. Do not use the `*` wildcard to prevent the configuration from appling to unintended upstreams.
 
 #### Values
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 ### `UpstreamConfig.Overrides[].Protocol`
 Specifies the protocol to use for requests to the upstream listener.
 
-We recommend configuring the protocol in the main [`Protocol`](#protocol) field of the configuration entry so that you can leverage [L7 features](/consul/docs/connect/manage-traffic). Setting the protocol in an upstream configuration limits L7 management functionality.
+We recommend configuring the protocol in the main [`Protocol`](#protocol) field of the configuration entry so that you can leverage [L7 features](/consul/docs/connect/l7-traffic). Setting the protocol in an upstream configuration limits L7 management functionality.
 
 #### Values
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 
 ### `UpstreamConfig.Overrides[].ConnectTimeoutMs`
 
 Specifies how long in milliseconds that the service should attempt to establish an upstream connection before timing out.
 
-We recommend configuring the upstream timeout in the [`connection_timeout`](/consul/docs/connect/config-entries/service-resolver#connecttimeout) field of the `service-resolver` configuration entry for the upstream destination service. Doing so enables you to leverage [L7 features](/consul/docs/connect/manage-traffic). Configuring the timeout in the `service-defaults` upstream configuration limits L7 management functionality.
+We recommend configuring the upstream timeout in the [`connection_timeout`](/consul/docs/connect/config-entries/service-resolver#connecttimeout) field of the `service-resolver` configuration entry for the upstream destination service. Doing so enables you to leverage [L7 features](/consul/docs/connect/l7-traffic). Configuring the timeout in the `service-defaults` upstream configuration limits L7 management functionality.
 
 #### Values
 
 - Default: `5000`
-- Data type: Integer
+- Data type: integer
 
 ### `UpstreamConfig.Overrides[].MeshGateway`
 
@@ -757,8 +597,8 @@ Sets the strategy for allocating outbound connections from the upstream across E
 
 The only supported value is `exact_balance`. By default, no connections are balanced. Refer to the [Envoy documentation](https://cloudnative.to/envoy/api-v3/config/listener/v3/listener.proto.html#config-listener-v3-listener-connectionbalanceconfig) for details.
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 ### `UpstreamConfig.Overrides[].Limits`
 
@@ -770,9 +610,9 @@ The following table describes limits you can configure:
 
 | Limit | Description | Data type | Default |
 | ---   | ---         | ---       | ---     |
-| `MaxConnections` | Specifies the maximum number of connections a service instance can establish against the upstream. Define this limit for HTTP/1.1 traffic. | Integer | `0` |
-| `MaxPendingRequests` | Specifies the maximum number of requests that are queued while waiting for a connection to establish. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | Integer | `0` |
-| `MaxConcurrentRequests` | Specifies the maximum number of concurrent requests. Define this limit for HTTP/2 traffic. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | Integer | `0` |
+| `MaxConnections` | Specifies the maximum number of connections a service instance can establish against the upstream. Define this limit for HTTP/1.1 traffic. | integer | `0` |
+| `MaxPendingRequests` | Specifies the maximum number of requests that are queued while waiting for a connection to establish. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | integer | `0` |
+| `MaxConcurrentRequests` | Specifies the maximum number of concurrent requests. Define this limit for HTTP/2 traffic. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | integer | `0` |
 
 Refer to the [upstream configuration example](#upstream-configuration) for additional guidance.
 
@@ -786,11 +626,11 @@ The following table describes passive health check parameters you can configure:
 
 | Limit | Description | Data type | Default |
 | ---   | ---         | ---       | ---     |
-| `Interval` | Specifies the time between checks. | String | `0s` |
-| `MaxFailures` | Specifies the number of consecutive failures allowed per check interval. If exceeded, Consul removes the host from the load balancer. | Integer | `0` |
-| `EnforcingConsecutive5xx` | Specifies a percentage that indicates how many times out of 100 that Consul ejects the host when it detects an outlier status. The outlier status is determined by consecutive errors in the 500-599 response range. | Integer | `100` |
-  | `MaxEjectionPercent` | Specifies the maximum percentage of an upstream cluster that Consul ejects when the proxy reports an outlier. Consul ejects at least one host when an outlier is detected regardless of the value. | Integer | `10` |
-  | `BaseEjectionTime` | Specifies the minimum amount of time that an ejected host must remain outside the cluster before rejoining. The real time is equal to the value of the `BaseEjectionTime` multiplied by the number of times the host has been ejected. | String | `30s` |
+| `Interval` | Specifies the time between checks. | string | `0s` |
+| `MaxFailures` | Specifies the number of consecutive failures allowed per check interval. If exceeded, Consul removes the host from the load balancer. | integer | `0` |
+| `EnforcingConsecutive5xx` | Specifies a percentage that indicates how many times out of 100 that Consul ejects the host when it detects an outlier status. The outlier status is determined by consecutive errors in the 500-599 response range. | integer | `100` |
+  | `MaxEjectionPercent` | Specifies the maximum percentage of an upstream cluster that Consul ejects when the proxy reports an outlier. Consul ejects at least one host when an outlier is detected regardless of the value. | integer | `10` |
+  | `BaseEjectionTime` | Specifies the minimum amount of time that an ejected host must remain outside the cluster before rejoining. The real time is equal to the value of the `BaseEjectionTime` multiplied by the number of times the host has been ejected. | string | `30s` |
 
 ### `UpstreamConfig.Defaults`
 
@@ -798,26 +638,26 @@ Specifies configurations that set default upstream settings. For information abo
 
 #### Values
 
-- Default: None
-- Data type: Map
+- Default: none
+- Data type: map
 
 ### `UpstreamConfig.Defaults.Protocol`
 
 Specifies default protocol for upstream listeners.
 
-We recommend configuring the protocol in the main [`Protocol`](#protocol) field of the configuration entry so that you can leverage [L7 features](/consul/docs/connect/manage-traffic). Setting the protocol in an upstream configuration limits L7 management functionality.
+We recommend configuring the protocol in the main [`Protocol`](#protocol) field of the configuration entry so that you can leverage [L7 features](/consul/docs/connect/l7-traffic). Setting the protocol in an upstream configuration limits L7 management functionality.
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 ### `UpstreamConfig.Defaults.ConnectTimeoutMs`
 
 Specifies how long in milliseconds that all services should continue attempting to establish an upstream connection before timing out.
 
-For non-Kubernetes environments, we recommend configuring the upstream timeout in the [`connection_timeout`](/consul/docs/connect/config-entries/service-resolver#connecttimeout) field of the `service-resolver` configuration entry for the upstream destination service. Doing so enables you to leverage [L7 features](/consul/docs/connect/manage-traffic). Configuring the timeout in the `service-defaults` upstream configuration limits L7 management functionality.
+For non-Kubernetes environments, we recommend configuring the upstream timeout in the [`connection_timeout`](/consul/docs/connect/config-entries/service-resolver#connecttimeout) field of the `service-resolver` configuration entry for the upstream destination service. Doing so enables you to leverage [L7 features](/consul/docs/connect/l7-traffic). Configuring the timeout in the `service-defaults` upstream configuration limits L7 management functionality.
 
 - Default: `5000`
-- Data type: Integer
+- Data type: integer
 
 ### `UpstreamConfig.Defaults.MeshGateway`
 
@@ -825,7 +665,7 @@ Specifies the default mesh gateway `mode` field for all upstreams. Refer to [Ser
 
 You can specify the following string values for the `mode` field:
 
-- `None`: The service does not make outbound connections through a mesh gateway. Instead, the service makes outbound connections directly to the destination services.
+- `none`: The service does not make outbound connections through a mesh gateway. Instead, the service makes outbound connections directly to the destination services.
 - `local`: The service mesh proxy makes an outbound connection to a gateway running in the same datacenter.
 - `remote`: The service mesh proxy makes an outbound connection to a gateway running in the destination datacenter.
 
@@ -833,8 +673,8 @@ You can specify the following string values for the `mode` field:
 
 Sets the strategy for allocating outbound connections from upstreams across Envoy proxy threads. The only supported value is `exact_balance`. By default, no connections are balanced. Refer to the [Envoy documentation](https://cloudnative.to/envoy/api-v3/config/listener/v3/listener.proto.html#config-listener-v3-listener-connectionbalanceconfig) for details.
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 ### `UpstreamConfig.Defaults.Limits`
 
@@ -842,9 +682,9 @@ Map that specifies a set of limits to apply to when connecting upstream services
 
 | Limit | Description | Data type | Default |
 | ---   | ---         | ---       | ---     |
-| `MaxConnections` | Specifies the maximum number of connections a service instance can establish against the upstream. Define this limit for HTTP/1.1 traffic. | Integer | `0` |
-| `MaxPendingRequests` | Specifies the maximum number of requests that are queued while waiting for a connection to establish. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | Integer | `0` |
-| `MaxConcurrentRequests` | Specifies the maximum number of concurrent requests. Define this limit for HTTP/2 traffic. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | Integer | `0` |
+| `MaxConnections` | Specifies the maximum number of connections a service instance can establish against the upstream. Define this limit for HTTP/1.1 traffic. | integer | `0` |
+| `MaxPendingRequests` | Specifies the maximum number of requests that are queued while waiting for a connection to establish. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | integer | `0` |
+| `MaxConcurrentRequests` | Specifies the maximum number of concurrent requests. Define this limit for HTTP/2 traffic. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | integer | `0` |
 
 ### `UpstreamConfig.Defaults.PassiveHealthCheck`
 
@@ -852,83 +692,66 @@ Map that specifies a set of rules that enable Consul to remove hosts from the up
 
 | Limit | Description | Data type | Default |
 | ---   | ---         | ---       | ---     |
-| `Interval` | Specifies the time between checks. | String | `0s` |
-| `MaxFailures` | Specifies the number of consecutive failures allowed per check interval. If exceeded, Consul removes the host from the load balancer. | Integer | `0` |
-| `EnforcingConsecutive5xx ` | Specifies a percentage that indicates how many times out of 100 that Consul ejects the host when it detects an outlier status. The outlier status is determined by consecutive errors in the 500-599 response range. | Integer | `100` |
-  | `MaxEjectionPercent` | Specifies the maximum percentage of an upstream cluster that Consul ejects when the proxy reports an outlier. Consul ejects at least one host when an outlier is detected regardless of the value. | Integer | `10` |
-  | `BaseEjectionTime` | Specifies the minimum amount of time that an ejected host must remain outside the cluster before rejoining. The real time is equal to the value of the `BaseEjectionTime` multiplied by the number of times the host has been ejected. | String | `30s` |
+| `Interval` | Specifies the time between checks. | string | `0s` |
+| `MaxFailures` | Specifies the number of consecutive failures allowed per check interval. If exceeded, Consul removes the host from the load balancer. | integer | `0` |
+| `EnforcingConsecutive5xx ` | Specifies a percentage that indicates how many times out of 100 that Consul ejects the host when it detects an outlier status. The outlier status is determined by consecutive errors in the 500-599 response range. | integer | `100` |
+  | `MaxEjectionPercent` | Specifies the maximum percentage of an upstream cluster that Consul ejects when the proxy reports an outlier. Consul ejects at least one host when an outlier is detected regardless of the value. | integer | `10` |
+  | `BaseEjectionTime` | Specifies the minimum amount of time that an ejected host must remain outside the cluster before rejoining. The real time is equal to the value of the `BaseEjectionTime` multiplied by the number of times the host has been ejected. | string | `30s` |
 
 ### `TransparentProxy`
 
-Controls configurations specific to proxies in transparent mode. Refer to [Transparent Proxy Mode](/consul/docs/k8s/connect/transparent-proxy) for additional information.
+Controls configurations specific to proxies in transparent mode. Refer to [Transparent Proxy](/consul/docs/connect/transparent-proxy) for additional information.
 
 You can configure the following parameters in the `TransparentProxy` block:
 
 | Parameter | Description | Data type | Default |
 | ---   | ---         | ---       | ---     |
-| `OutboundListenerPort` | Specifies the port that the proxy listens on for outbound traffic. This must be the same port number where outbound application traffic is redirected. | Integer | `15001` |
-| `DialedDirectly` | Enables transparent proxies to dial the proxy instance's IP address directly when set to `true`. Transparent proxies commonly dial upstreams at the `"virtual"` tagged address, which load balances across instances. Dialing individual instances can be helpful for stateful services, such as a database cluster with a leader. | Boolean | `false` |
-
-### `MutualTLSMode`
-
-Controls whether mutual TLS is required for incoming connections to this service. This setting is
-only supported for services with transparent proxy enabled. We recommend only using `permissive`
-mode if necessary while onboarding services to the service mesh.
-
-You can specify the following string values for the `MutualTLSMode` field:
-
-- `""`: When this field is empty, the value is inherited from the `proxy-defaults` config entry.
-- `strict`: The sidecar proxy requires mutual TLS for incoming traffic.
-- `permissive`: The sidecar proxy accepts mutual TLS traffic on the sidecar proxy service port,
-  and accepts any traffic on the destination service's port.
+| `OutboundListenerPort` | Specifies the port that the proxy listens on for outbound traffic. This must be the same port number where outbound application traffic is redirected. | integer | `15001` |
+| `DialedDirectly` | Enables transparent proxies to dial the proxy instance's IP address directly when set to `true`. Transparent proxies commonly dial upstreams at the `"virtual"` tagged address, which load balances across instances. Dialing individual instances can be helpful for stateful services, such as a database cluster with a leader. | boolean | `false` |
 
 ### `EnvoyExtensions`
 
 List of extensions to modify Envoy proxy configuration. Refer to [Envoy Extensions](/consul/docs/connect/proxies/envoy-extensions) for additional information.
 
-The following table describes how to configure values in the `EnvoyExtensions` map:
+You can configure the following parameters in the `EnvoyExtensions` block:
 
 | Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `Name` | Specifies the name of the extension. | String | None |
-| `Required` | Specify `true` to require the extension to apply successfully. <p>Use this parameter to ensure that extensions required for secure communication are not unintentionally bypassed.</p><p>When Envoy fails to apply a required extension, Consul logs an error and skips all extensions, leaving xDS resources unchanged. </p> | String | None |
-| `Arguments` | Specifies the arguments to pass to the extension. Refer to the documentation for the extension you want to implement for additional information. | Map | None |
-| `ConsulVersion` | Specifies the Consul [version constraint](https://github.com/hashicorp/go-version) for the extension. Consul validates the version constraint against the runtime version during xDS updates. If a non-matching version is in use, Consul logs and skips the extension. <p>Use this parameter to avoid upgrade issues when a configured extension is not compatible with a new version of Consul.</p> | String | None |
-| `EnvoyVersion` | Specifies the Envoy [version constraint](https://github.com/hashicorp/go-version) for the extension. Consul validates the version constraint against the version of the running Envoy proxy during xDS updates. If a non-matching version is in use, Consul logs and skips the extension. <p>Use this parameter to avoid upgrade issues when a configured extension is not compatible with a new version of Envoy.</p> | String | None |
+| ---   | ---         | ---       | ---     |
+| `Name` | Name of the extension. | string | `""` |
+| `Required` | When Required is true and the extension does not update any Envoy resources, an error is returned. Use this parameter to ensure that extensions required for secure communication are not unintentionally bypassed. | string | `""` |
+| `Arguments` | Arguments to pass to the extension executable. | map | `nil` |
 
-### `Destination{}`
+### `Destination[]`
 
 Configures the destination for service traffic through terminating gateways. Refer to [Terminating Gateway](/consul/docs/connect/gateways/terminating-gateway) for additional information.
 
-To use the `Destination` block, proxy services must be in transparent proxy mode. Refer to [Enable transparent proxy mode](/consul/docs/k8s/connect/transparent-proxy/enable-transparent-proxy) for additional information.
-
 You can configure the following parameters in the `Destination` block:
 
 | Parameter | Description | Data type | Default |
 | ---   | ---         | ---       | ---     |
-| `Addresses` | Specifies a list of addresses for the destination. You can configure a list of hostnames and IP addresses. Wildcards are  not supported.  | List | None |
-| `Port` | Specifies the port number of the destination. | Integer | `0` |
+| `Address` | Specifies a list of addresses for the destination. You can configure a list of hostnames and IP addresses. Wildcards are  not supported.  | list | none |
+| `Port` | Specifies the port number of the destination. | integer | `0` |
 
 ### `MaxInboundConnections`
 
 Specifies the maximum number of concurrent inbound connections to each service instance.
 
 - Default: `0`
-- Data type: Integer
+- Data type: integer
 
 ### `LocalConnectTimeoutMs`
 
 Specifies the number of milliseconds allowed for establishing connections to the local application instance before timing out.
 
 - Default: `5000`
-- Data type: Integer
+- Data type: integer
 
 ### `LocalRequestTimeoutMs`
 
 Specifies the timeout for HTTP requests to the local application instance. Applies to HTTP-based protocols only. If not specified, inherits the Envoy default for route timeouts.
 
 - Default: Inherits `15s` from Envoy as the default
-- Data type: String
+- Data type: string
 
 ### `MeshGateway`
 
@@ -944,15 +767,15 @@ You can specify the following string values for the `mode` field:
 
 Specifies the TLS server name indication (SNI) when federating with an external system.
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 ### `Expose`
 
-Specifies default configurations for exposing HTTP paths through Envoy. Exposing paths through Envoy enables services to listen on `localhost` only. Applications that are not Consul service mesh-enabled can still contact an HTTP endpoint. Refer to [Expose Paths Configuration Reference](/consul/docs/proxies/proxy-config-reference#expose-paths-configuration-reference) for additional information and example configurations.
+Specifies default configurations for exposing HTTP paths through Envoy. Exposing paths through Envoy enables services to listen on localhost only. Applications that are not Consul service mesh-enabled can still contact an HTTP endpoint. Refer to [Expose Paths Configuration Reference](/consul/docs/connect/registration/service-registration#expose-paths-configuration-reference) for additional information and example configurations.
 
-- Default: None
-- Data type: Map
+- Default: none
+- Data type: map
 
 ### `Expose.Checks`
 
@@ -961,7 +784,7 @@ Exposes all HTTP and gRPC checks registered with the agent if set to `true`. Env
 We recommend enabling the `Checks` configuration when a Consul client cannot reach registered services over localhost, such as when Consul agents run in their own pods in Kubernetes.
 
 - Default: `false`
-- Data type: Boolean
+- Data type: boolean
 
 ### `Expose.Paths[]`
 
@@ -969,10 +792,10 @@ Specifies a list of configuration maps that define paths to expose through Envoy
 
 | Parameter | Description | Data type | Default |
 | ---   | ---         | ---       | ---     |
-| `Path` | Specifies the HTTP path to expose. You must prepend the path with a forward slash (`/`). | String | None |
-| `LocalPathPort` | Specifies the port where the local service listens for connections to the path. | Integer | `0` |
-| `ListenPort` | Specifies the port where the proxy listens for connections. The port must be available. If the port is unavailable, Envoy does not expose a listener for the path and the proxy registration still succeeds. | Integer | `0` |
-| `Protocol` | Specifies the protocol of the listener. You can configure one of the following values: <li>`http`</li><li>`http2`: Use with gRPC traffic</li> | Integer | `http` |
+| `Path` | Specifies the HTTP path to expose. You must prepend the path with a forward slash (`/`). | string | none |
+| `LocalPathPort` | Specifies the port where the local service listens for connections to the path. | integer | `0` |
+| `ListenPort` | Specifies the port where the proxy listens for connections. The port must be available. If the port is unavailable, Envoy does not expose a listener for the path and the proxy registration still succeeds. | integer | `0` |
+| `Protocol` | Specifies the protocol of the listener. You can configure one of the following values: <li>`http`</li><li>`http2`: Use with gRPC traffic</li> | integer | `http` |
 
 </Tab>
 
@@ -982,7 +805,7 @@ Specifies a list of configuration maps that define paths to expose through Envoy
 
 Specifies the version of the Consul API for integrating with Kubernetes. The value must be `consul.hashicorp.com/v1alpha1`. The `apiVersion` field is not supported for non-Kubernetes deployments.
 
-- Default: None
+- Default: none
 - This field is required.
 - String value that must be set to `consul.hashicorp.com/v1alpha1`.
 
@@ -999,7 +822,7 @@ Map that contains the service name, namespace, and admin partition that the conf
 
 #### Values
 
-- Default: None
+- Default: none
 - Map containing the following strings:
   - [`name`](#name)
   - [`namespace`](#namespace)
@@ -1012,16 +835,16 @@ Specifies the name of the service you are setting the defaults for.
 
 #### Values
 
-- Default: None
+- Default: none
 - This field is required
-- Data type: String
+- Data type: string
 
 ### `metadata.namespace` <Enterprise/>
 
-Specifies the Consul namespace that the configuration entry applies to. Refer to [Consul Enterprise](/consul/docs/k8s/crds#consul-enterprise) for information about how Consul namespaces map to Kubernetes Namespaces. Consul Community Edition (Consul CE) ignores the `metadata.namespace` configuration.
+Specifies the Consul namespace that the configuration entry applies to. Refer to [Consul Enterprise](/consul/docs/k8s/crds#consul-enterprise) for information about how Consul namespaces map to Kubernetes Namespaces. Open source Consul distributions (Consul OSS) ignore the `metadata.namespace` configuration.
 
 - Default: `default`
-- Data type: String
+- Data type: string
 
 ### `spec`
 
@@ -1055,8 +878,8 @@ Specifies the strategy for allocating inbound connections to the service across
 
 #### Values
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 ### `spec.mode`
 
@@ -1064,81 +887,20 @@ Specifies a mode for how the service directs inbound and outbound traffic.
 
 #### Values
 
-- Default: None
+- Default: none
 - Required: optional
 - You can specified the following string values:
 
 - `direct`: The proxy's listeners must be dialed directly by the local application and other proxies.
 - `transparent`: The service captures inbound and outbound traffic and redirects it through the proxy. The mode does not enable the traffic redirection. It instructs Consul to configure Envoy as if traffic is already being redirected.
 
-### `spec.rateLimits`
-
-Map containing an instance-level configuration for limiting the service's traffic rate.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `spec.rateLimits{}.instanceLevel`
-
-Map containing a set of request rate limit configurations for instances of the service.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `spec.rateLimits{}.instanceLevel{}.requestsPerSecond`
-
-Specifies the average number of requests per second allowed to the service. If the [`requestsMaxBurst`](#spec-ratelimits-instancelevel-requestsmaxburst) parameter is set, the number of requests per second to the service can temporarily exceed the limit specified in the `requestsPerSecond` up to the value specified in `requestsMaxBurst`. Internally, this is the refill rate of the token bucket used for rate limiting.
-
-#### Values
-
-- Default: None
-- Data type: Integer
-
-### `spec.rateLimits{}.instanceLevel{}.requestsMaxBurst`
-
-Specifies the maximum number of concurrent requests momentarily allowed to the service. When the limit is reached, Consul blocks additional requests. You must specify a value equal to or greater than the [`requestsPerSecond`](#spec-ratelimits-instancelevel-requestspersecond) parameter. If unspecified, this parameter defaults to `requestsPerSecond`. Internally, this is the maximum size of the token bucket used for rate limiting.
-
-#### Values
-
-- Default: None
-- Data type: Integer
-
-### `spec.rateLimits{}.instanceLevel{}.routes`
-
-Specifies a list of rate limiting configurations to apply to specific routes to the service. Each member of the `routes` list must configure the `requestsPerSecond` parameter and one of the following route-matching parameters:
-
-- `pathExact`
-- `pathPrefix`
-- `pathRegex`
-
-Refer to [Examples](#enable-request-rate-limit-on-a-prefixed-path) for example configurations.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-The following table describes the parameters you can specify in the `routes` map:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `pathExact` | Specifies the exact path to match on the request path. When using this field, do not configure `pathPrefix` or `pathRegex` in the same `routes` map. | String | None |
-| `pathPrefix` | Specifies the path prefix to match on the request path. When using this field, do not configure `pathExact` or `pathRegex` in the same `routes` map. | String | None |
-| `pathRegex` | Specifies a regular expression to match on the request path. When using this field, do not configure `pathExact` or `pathPrefix` in the same `routes` map. The syntax is proxy-specific. When [using Envoy](/consul/docs/connect/proxies/envoy), refer to [the documentation for Envoy v1.11.2 or newer](https://github.com/google/re2/wiki/Syntax) or [the documentation for Envoy v1.11.1 or older](https://en.cppreference.com/w/cpp/regex/ecmascript), depending on the version of Envoy you use. | String | None |
-| `requestsPerSecond` | Specifies the average number of requests per second allowed to the service. Overrides the [`requestsPerSecond`](#spec-ratelimits-instancelevel-requestspersecond) parameter specified for the service. | Integer | None |
-| `requestsMaxBurst` | Specifies the maximum number of concurrent requests temporarily allowed to the service. When the limit is reached, Consul blocks additional requests. You must specify a value equal to or greater than the `routes.requestsPerSecond` parameter. Overrides the [`requestsMaxBurst`](#spec-ratelimits-instancelevel-requestsmaxburst) parameter specified for the service. | Integer | None |
-
 ### `spec.upstreamConfig`
 
 Specifies a map that controls default upstream connection settings and custom overrides for individual upstream services. If your network contains federated datacenters, individual upstream configurations apply to all pairs of source and upstream destination services in the network.
 
 #### Values
 
-- Default: None
+- Default: none
 - Map that contains the following configurations:
   - [`UpstreamConfig.Overrides`](#upstreamconfig-overrides)
   - [`UpstreamConfig.Defaults`](#upstreamconfig-defaults)
@@ -1149,8 +911,8 @@ Specifies options that override the [default upstream configurations](#spec-upst
 
 #### Values
 
-- Default: None
-- Data type: List
+- Default: none
+- Data type: list
 
 ### `spec.upstreamConfig.overrides[].name`
 
@@ -1158,47 +920,38 @@ Specifies the name of the upstream service that the configuration applies to. Do
 
 #### Values
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
-### `spec.upstreamConfig.overrides[].namespace` <EnterpriseAlert inline/>
+### `spec.upstreamConfig.overrides[].namespace` <Enterprise/>
 
 Specifies the namespace containing the upstream service that the configuration applies to. Do not use the `*` wildcard to prevent the configuration from applying to unintended upstreams.
 
 #### Values
 
-- Default: None
-- Data type: String
-
-### `spec.upstreamConfig.overrides[].peer`
-
-Specifies the peer name of the upstream service that the configuration applies to. The `*` wildcard is not supported.
-
-#### Values
-
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 ### `spec.upstreamConfig.overrides[].protocol`
 
-Specifies the protocol to use for requests to the upstream listener. We recommend configuring the protocol in the main [`protocol`](#protocol) field of the configuration entry so that you can leverage [L7 features](/consul/docs/connect/manage-traffic). Setting the protocol in an upstream configuration limits L7 management functionality.
+Specifies the protocol to use for requests to the upstream listener. We recommend configuring the protocol in the main [`protocol`](#protocol) field of the configuration entry so that you can leverage [L7 features](/consul/docs/connect/l7-traffic). Setting the protocol in an upstream configuration limits L7 management functionality.
 
 #### Values
 
 - Default: inherits the main [`protocol`](#protocol) configuration
-- Data type: String
+- Data type: string
 
 
 ### `spec.upstreamConfig.overrides[].connectTimeoutMs`
 
 Specifies how long in milliseconds that the service should attempt to establish an upstream connection before timing out.
 
-We recommend configuring the upstream timeout in the [`connectTimeout`](/consul/docs/connect/config-entries/service-resolver#connecttimeout) field of the `ServiceResolver` CRD for the upstream destination service. Doing so enables you to leverage [L7 features](/consul/docs/connect/manage-traffic). Configuring the timeout in the `ServiceDefaults` upstream configuration limits L7 management functionality.
+We recommend configuring the upstream timeout in the [`connectTimeout`](/consul/docs/connect/config-entries/service-resolver#connecttimeout) field of the `ServiceResolver` CRD for the upstream destination service. Doing so enables you to leverage [L7 features](/consul/docs/connect/l7-traffic). Configuring the timeout in the `ServiceDefaults` upstream configuration limits L7 management functionality.
 
 #### Values
 
 - Default: `5000`
-- Data type: Integer
+- Data type: integer
 
 ### `spec.upstreamConfig.overrides[].meshGateway.mode`
 
@@ -1218,8 +971,8 @@ Sets the strategy for allocating outbound connections from the upstream across E
 
 #### Values
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 ### `spec.upstreamConfig.overrides[].limits`
 
@@ -1231,9 +984,9 @@ The following table describes limits you can configure:
 
 | Limit | Description | Data type | Default |
 | ---   | ---         | ---       | ---     |
-| `maxConnections` | Specifies the maximum number of connections a service instance can establish against the upstream. Define this limit for HTTP/1.1 traffic. | Integer | `0` |
-| `maxPendingRequests` | Specifies the maximum number of requests that are queued while waiting for a connection to establish. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | Integer | `0` |
-| `maxConcurrentRequests` | Specifies the maximum number of concurrent requests. Define this limit for HTTP/2 traffic. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | Integer | `0` |
+| `maxConnections` | Specifies the maximum number of connections a service instance can establish against the upstream. Define this limit for HTTP/1.1 traffic. | integer | `0` |
+| `maxPendingRequests` | Specifies the maximum number of requests that are queued while waiting for a connection to establish. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | integer | `0` |
+| `maxConcurrentRequests` | Specifies the maximum number of concurrent requests. Define this limit for HTTP/2 traffic. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | integer | `0` |
 
 ### `spec.upstreamConfig.overrides[].passiveHealthCheck`
 
@@ -1245,11 +998,11 @@ The following table describes passive health check parameters you can configure:
 
 | Limit | Description | Data type | Default |
 | ---   | ---         | ---       | ---     |
-| `interval` | Specifies the time between checks. | String | `0s` |
-| `maxFailures` | Specifies the number of consecutive failures allowed per check interval. If exceeded, Consul removes the host from the load balancer. | Integer | `0` |
-| `enforcingConsecutive5xx ` | Specifies a percentage that indicates how many times out of 100 that Consul ejects the host when it detects an outlier status. The outlier status is determined by consecutive errors in the 500-599 response range. | Integer | `100` |
-  | `maxEjectionPercent` | The maximum % of an upstream cluster that can be ejected due to outlier detection. Defaults to 10% but will eject at least one host regardless of the value. | Integer | `10` |
-  | `baseEjectionTime` | The base time that a host is ejected for. The real time is equal to the base time multiplied by the number of times the host has been ejected and is capped by max_ejection_time (Default 300s). Defaults to 30000ms or 30s. | String | `30s` |
+| `interval` | Specifies the time between checks. | string | `0s` |
+| `maxFailures` | Specifies the number of consecutive failures allowed per check interval. If exceeded, Consul removes the host from the load balancer. | integer | `0` |
+| `enforcingConsecutive5xx ` | Specifies a percentage that indicates how many times out of 100 that Consul ejects the host when it detects an outlier status. The outlier status is determined by consecutive errors in the 500-599 response range. | integer | `100` |
+  | `maxEjectionPercent` | The maximum % of an upstream cluster that can be ejected due to outlier detection. Defaults to 10% but will eject at least one host regardless of the value. | integer | `10` |
+  | `baseEjectionTime` | The base time that a host is ejected for. The real time is equal to the base time multiplied by the number of times the host has been ejected and is capped by max_ejection_time (Default 300s). Defaults to 30000ms or 30s. | string | `30s` |
 
 ### `spec.upstreamConfig.defaults`
 
@@ -1257,28 +1010,28 @@ Map of configurations that set default upstream configurations for the service.
 
 #### Values
 
-- Default: None
-- Data type: List
+- Default: none
+- Data type: list
 
 ### `spec.upstreamConfig.defaults.protocol`
 
-Specifies default protocol for upstream listeners. We recommend configuring the protocol in the main [`Protocol`](#protocol) field of the configuration entry so that you can leverage [L7 features](/consul/docs/connect/manage-traffic). Setting the protocol in an upstream configuration limits L7 management functionality.
+Specifies default protocol for upstream listeners. We recommend configuring the protocol in the main [`Protocol`](#protocol) field of the configuration entry so that you can leverage [L7 features](/consul/docs/connect/l7-traffic). Setting the protocol in an upstream configuration limits L7 management functionality.
 
 #### Values
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 ### `spec.upstreamConfig.default.connectTimeoutMs`
 
 Specifies how long in milliseconds that all services should continue attempting to establish an upstream connection before timing out.
 
-We recommend configuring the upstream timeout in the [`connectTimeout`](/consul/docs/connect/config-entries/service-resolver#connecttimeout) field of the `ServiceResolver` CRD for upstream destination services. Doing so enables you to leverage [L7 features](/consul/docs/connect/manage-traffic). Configuring the timeout in the `ServiceDefaults` upstream configuration limits L7 management functionality.
+We recommend configuring the upstream timeout in the [`connectTimeout`](/consul/docs/connect/config-entries/service-resolver#connecttimeout) field of the `ServiceResolver` CRD for upstream destination services. Doing so enables you to leverage [L7 features](/consul/docs/connect/l7-traffic). Configuring the timeout in the `ServiceDefaults` upstream configuration limits L7 management functionality.
 
 #### Values
 
 - Default: `5000`
-- Data type: Integer
+- Data type: integer
 
 ### `spec.upstreamConfig.defaults.meshGateway.mode`
 
@@ -1298,8 +1051,8 @@ Sets the strategy for allocating outbound connections from upstreams across Envo
 
 #### Values
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 ### `spec.upstreamConfig.defaults.limits`
 
@@ -1311,9 +1064,9 @@ The following table describes limits you can configure:
 
 | Limit | Description | Data type | Default |
 | ---   | ---         | ---       | ---     |
-| `maxConnections` | Specifies the maximum number of connections a service instance can establish against the upstream. Define this limit for HTTP/1.1 traffic. | Integer | `0` |
-| `maxPendingRequests` | Specifies the maximum number of requests that are queued while waiting for a connection to establish. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | Integer | `0` |
-| `maxConcurrentRequests` | Specifies the maximum number of concurrent requests. Define this limit for HTTP/2 traffic. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | Integer | `0` |
+| `maxConnections` | Specifies the maximum number of connections a service instance can establish against the upstream. Define this limit for HTTP/1.1 traffic. | integer | `0` |
+| `maxPendingRequests` | Specifies the maximum number of requests that are queued while waiting for a connection to establish. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | integer | `0` |
+| `maxConcurrentRequests` | Specifies the maximum number of concurrent requests. Define this limit for HTTP/2 traffic. An L7 protocol must be defined in the [`protocol`](#protocol) field for this limit to take effect. | integer | `0` |
 
 ### `spec.upstreamConfig.defaults.passiveHealthCheck`
 Map that specifies a set of rules that enable Consul to remove hosts from the upstream cluster that are unreachable or that return errors.
@@ -1324,11 +1077,11 @@ The following table describes the health check parameters you can configure:
 
 | Limit | Description | Data type | Default |
 | ---   | ---         | ---       | ---     |
-| `interval` | Specifies the time between checks. | String | `0s` |
-| `maxFailures` | Specifies the number of consecutive failures allowed per check interval. If exceeded, Consul removes the host from the load balancer. | Integer | `0` |
-| `enforcingConsecutive5xx ` | Specifies a percentage that indicates how many times out of 100 that Consul ejects the host when it detects an outlier status. The outlier status is determined by consecutive errors in the 500-599 response range. | Integer | `100` |
-  | `MaxEjectionPercent` | Specifies the maximum percentage of an upstream cluster that Consul ejects when the proxy reports an outlier. Consul ejects at least one host when an outlier is detected regardless of the value. | Integer | `10` |
-  | `BaseEjectionTime` | Specifies the minimum amount of time that an ejected host must remain outside the cluster before rejoining. The real time is equal to the value of the `BaseEjectionTime` multiplied by the number of times the host has been ejected. | String | `30s` |
+| `interval` | Specifies the time between checks. | string | `0s` |
+| `maxFailures` | Specifies the number of consecutive failures allowed per check interval. If exceeded, Consul removes the host from the load balancer. | integer | `0` |
+| `enforcingConsecutive5xx ` | Specifies a percentage that indicates how many times out of 100 that Consul ejects the host when it detects an outlier status. The outlier status is determined by consecutive errors in the 500-599 response range. | integer | `100` |
+  | `MaxEjectionPercent` | Specifies the maximum percentage of an upstream cluster that Consul ejects when the proxy reports an outlier. Consul ejects at least one host when an outlier is detected regardless of the value. | integer | `10` |
+  | `BaseEjectionTime` | Specifies the minimum amount of time that an ejected host must remain outside the cluster before rejoining. The real time is equal to the value of the `BaseEjectionTime` multiplied by the number of times the host has been ejected. | string | `30s` |
 
 ### `spec.transparentProxy`
 
@@ -1340,23 +1093,8 @@ You can configure the following parameters in the `TransparentProxy` block:
 
 | Parameter | Description | Data type | Default |
 | ---   | ---         | ---       | ---     |
-| `outboundListenerPort` | Specifies the port that the proxy listens on for outbound traffic. This must be the same port number where outbound application traffic is redirected. | Integer | `15001` |
-| `dialedDirectly` | Enables transparent proxies to dial the proxy instance's IP address directly when set to `true`. Transparent proxies commonly dial upstreams at the `"virtual"` tagged address, which load balances across instances. Dialing individual instances can be helpful for stateful services, such as a database cluster with a leader. | Boolean | `false` |
-
-### `spec.mutualTLSMode`
-
-Controls whether mutual TLS is required for incoming connections to this service. This setting is
-only supported for services with transparent proxy enabled. We recommend only using `permissive`
-mode if necessary while onboarding services to the service mesh.
-
-#### Values
-
-You can specify the following string values for the `MutualTLSMode` field:
-
-- `""`: When this field is empty, the value is inherited from the `proxy-defaults` config entry.
-- `strict`: The sidecar proxy requires mutual TLS for incoming traffic.
-- `permissive`: The sidecar proxy accepts mutual TLS traffic on the sidecar proxy service port,
-  and accepts any traffic on the destination service's port.
+| `outboundListenerPort` | Specifies the port that the proxy listens on for outbound traffic. This must be the same port number where outbound application traffic is redirected. | integer | `15001` |
+| `dialedDirectly` | Enables transparent proxies to dial the proxy instance's IP address directly when set to `true`. Transparent proxies commonly dial upstreams at the `"virtual"` tagged address, which load balances across instances. Dialing individual instances can be helpful for stateful services, such as a database cluster with a leader. | boolean | `false` |
 
 ### `spec.envoyExtensions`
 
@@ -1364,30 +1102,26 @@ List of extensions to modify Envoy proxy configuration. Refer to [Envoy Extensio
 
 #### Values
 
-The following table describes how to configure values in the `envoyExtensions` map:
+You can configure the following parameters in the `EnvoyExtensions` block:
 
 | Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `name` | Specifies the name of the extension. | String | None |
-| `required` | Specify `true` to require the extension to apply successfully. <p>Use this parameter to ensure that extensions required for secure communication are not unintentionally bypassed.</p><p>When Envoy fails to apply a required extension, Consul logs an error and skips all extensions, leaving xDS resources unchanged. </p> | String | None |
-| `arguments` | Specifies the arguments to pass to the extension. Refer to the documentation for the extension for additional information. | Map | None |
-| `consulVersion` | Specifies the Consul [version constraint](https://github.com/hashicorp/go-version) for the extension. Consul validates the version constraint against the runtime version during xDS updates. If a non-matching version is in use, Consul logs and skips the extension. <p>Use this parameter to avoid upgrade issues when a configured extension is not compatible with a new version of Consul.</p> | String | None |
-| `envoyVersion` | Specifies the Envoy [version constraint](https://github.com/hashicorp/go-version) for the extension. Consul validates the version constraint against the version of the running Envoy proxy during xDS updates. If a non-matching version is in use, Consul logs and skips the extension. <p>Use this parameter to avoid upgrade issues when a configured extension is not compatible with a new version of Envoy.</p> | String | None |
+| ---   | ---         | ---       | ---     |
+| `name` | Name of the extension. | string | `""` |
+| `required` | When Required is true and the extension does not update any Envoy resources, an error is returned. Use this parameter to ensure that extensions required for secure communication are not unintentionally bypassed. | string | `""` |
+| `arguments` | Arguments to pass to the extension executable. | map | `nil` |
 
 ### `spec.destination`
 
 Map of configurations that specify one or more destinations for service traffic routed through terminating gateways. Refer to [Terminating Gateway](/consul/docs/connect/gateways/terminating-gateway) for additional information.
 
-To use the `destination` block, proxy services must be in transparent proxy mode. Refer to [Enable transparent proxy mode](/consul/docs/k8s/connect/transparent-proxy/enable-transparent-proxy) for additional information.
-
 #### Values
 
-You can configure the following parameters in the `destination` block:
+You can configure the following parameters in the `Destination` block:
 
 | Parameter | Description | Data type | Default |
 | ---   | ---         | ---       | ---     |
-| `addresses` | Specifies a list of addresses for the destination. You can configure a list of hostnames and IP addresses. Wildcards are  not supported.  | List | None |
-| `port` | Specifies the port number of the destination. | Integer | `0` |
+| `address` | Specifies a list of addresses for the destination. You can configure a list of hostnames and IP addresses. Wildcards are  not supported.  | list | none |
+| `port` | Specifies the port number of the destination. | integer | `0` |
 
 ### `spec.maxInboundConnections`
 
@@ -1396,7 +1130,7 @@ Specifies the maximum number of concurrent inbound connections to each service i
 #### Values
 
 - Default: `0`
-- Data type: Integer
+- Data type: integer
 
 ### `spec.localConnectTimeoutMs`
 
@@ -1405,7 +1139,7 @@ Specifies the number of milliseconds allowed for establishing connections to the
 #### Values
 
 - Default: `5000`
-- Data type: Integer
+- Data type: integer
 
 ### `spec.localRequestTimeoutMs`
 
@@ -1414,7 +1148,7 @@ Specifies the timeout for HTTP requests to the local application instance. Appli
 #### Values
 
 - Default of `15s` is inherited from Envoy
-- Data type: String
+- Data type: string
 
 ### `spec.meshGateway.mode`
 Specifies the default mesh gateway `mode` field for the service. Refer to [Service Mesh Proxy Configuration](/consul/docs/connect/gateways/mesh-gateway#service-mesh-proxy-configuration) in the mesh gateway documentation for additional information.
@@ -1433,17 +1167,17 @@ Specifies the TLS server name indication (SNI) when federating with an external
 
 #### Values
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 ### `spec.expose`
 
-Specifies default configurations for exposing HTTP paths through Envoy. Exposing paths through Envoy enables services to listen on `localhost` only. Applications that are not Consul service mesh-enabled can still contact an HTTP endpoint. Refer to [Expose Paths Configuration Reference](/consul/docs/connect/proxies/proxy-config-reference#expose-paths-configuration-reference) for additional information and example configurations.
+Specifies default configurations for exposing HTTP paths through Envoy. Exposing paths through Envoy enables services to listen on `localhost` only. Applications that are not Consul service mesh-enabled can still contact an HTTP endpoint. Refer to [Expose Paths Configuration Reference](/consul/docs/connect/registration/service-registration#expose-paths-configuration-reference) for additional information and example configurations.
 
 #### Values
 
-- Default: None
-- Data type: String
+- Default: none
+- Data type: string
 
 ### `spec.expose.checks`
 
@@ -1454,7 +1188,7 @@ We recommend enabling the `Checks` configuration when a Consul client cannot rea
 #### Values
 
 - Default: `false`
-- Data type: Boolean
+- Data type: boolean
 
 ### `spec.expose.paths[]`
 
@@ -1466,10 +1200,10 @@ The following table describes the parameters for each map:
 
 | Parameter | Description | Data type | Default |
 | ---   | ---         | ---       | ---     |
-| `path` | Specifies the HTTP path to expose. You must prepend the path with a forward slash (`/`). | String | None |
-| `localPathPort` | Specifies the port where the local service listens for connections to the path. | Integer | `0` |
-| `listenPort` | Specifies the port where the proxy listens for connections. The port must be available. If the port is unavailable, Envoy does not expose a listener for the path and the proxy registration still succeeds. | Integer | `0` |
-| `protocol` | Specifies the protocol of the listener. You can configure one of the following values: <li>`http`</li><li>`http2`: Use with gRPC traffic</li> | Integer | `http` |
+| `path` | Specifies the HTTP path to expose. You must prepend the path with a forward slash (`/`). | string | none |
+| `localPathPort` | Specifies the port where the local service listens for connections to the path. | integer | `0` |
+| `listenPort` | Specifies the port where the proxy listens for connections. The port must be available. If the port is unavailable, Envoy does not expose a listener for the path and the proxy registration still succeeds. | integer | `0` |
+| `protocol` | Specifies the protocol of the listener. You can configure one of the following values: <li>`http`</li><li>`http2`: Use with gRPC traffic</li> | integer | `http` |
 
 </Tab>
 </Tabs>
@@ -1516,7 +1250,7 @@ You can also set the global default protocol for all proxies in the [`proxy-defa
 ### Upstream configuration
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 
 The following example sets default connection limits and mesh gateway mode across all upstreams of the `dashboard` service.
 It also overrides the mesh gateway mode used when dialing its `counting` upstream  service.
@@ -1695,7 +1429,6 @@ spec:
 
 The following examples creates a default destination assigned to a terminating gateway. A destination
 represents a location outside the Consul cluster. Services can dial destinations dialed directly when transparent proxy mode is enabled.
-Proxy services must be in transparent proxy mode to configure destinations. Refer to [Enable transparent proxy mode](/consul/docs/k8s/connect/transparent-proxy/enable-transparent-proxy) for additional information.
 
 <CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
@@ -1737,172 +1470,626 @@ Proxy services must be in transparent proxy mode to configure destinations. Refe
 
 </CodeTabs>
 
+<!-- CONTINUE OLD CONTENT>
+## Available Fields
 
-### Enable request rate limit for a service on all paths
-
-The following example limits the request rate on all paths to `service-foo` to an average of `1000` requests per second but allows up to `1500` temporary concurrent requests.
-
-<CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
-
-```hcl
-Kind = "service-defaults"
-Name = "service-foo"
-Protocol = "http"
-
-RateLimit {
-  InstanceLevel {
-    RequestsPerSecond = 1000
-    RequestsMaxBurst = 1500
-  }
-}
-```
-```yaml
-kind: ServiceDefaults
-name: service-foo
-protocol: http
-rateLimit:
-  instanceLevel:
-    requestsPerSecond: 1000
-    requestsMaxBurst: 1500
-  }
-}
-```
-```json
-{
-  "Kind": "service-defaults",
-  "Name": "service-foo",
-  "Protocol": "http",
-  "RateLimit": {
-    "InstanceLevel": {
-      "RequestsPerSecond": 1000,
-      "RequestsMaxBurst": 1500
-    }
-  }
-}
-```
-</CodeTabs>
-
-### Enable request rate limit on a prefixed path
-
-The following example limits the request rate on all paths to `service-foo` to an average of `1000` requests per second but allows up to `1500` temporary concurrent requests. Request paths that begin with `/admin`, however, are limited to `20` requests per second.
-
-<CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
-
-```hcl
-Kind = "service-defaults"
-Name = "service-foo"
-Protocol = "http"
-
-RateLimit {
-  InstanceLevel {
-    RequestsPerSecond = 1000
-    RequestsMaxBurst = 1500
-
-    Routes = [
-      {
-         PathPrefix = "/admin"
-         RequestsPerSecond = 20
-      }
-    ]
-  }
-}
-```
-
-```yaml
-kind: service-defaults
-name: service-foo
-protocol: http
-rateLimit:
-  instanceLevel:
-    requestsPerSecond: 1000
-    requestsMaxBurst: 1500
-    routes:
-      - pathPrefix: /admin
-        requestsPerSecond: 20
-```
-
-```json
-{
-  "Kind": "service-defaults",
-  "Name": "service-foo",
-  "Protocol": "http",
-  "RateLimit": {
-    "InstanceLevel": {
-      "RequestsPerSecond": 1000,
-      "RequestsMaxBurst": 1500,
-      "Routes": [
+<ConfigEntryReference
+  keys={[
+    {
+      name: 'apiVersion',
+      description: 'Must be set to `consul.hashicorp.com/v1alpha1`',
+      hcl: false,
+    },
+    {
+      name: 'Kind',
+      description: {
+        hcl: 'Must be set to `service-defaults`',
+        yaml: 'Must be set to `ServiceDefaults`',
+      },
+    },
+    {
+      name: 'Name',
+      description: 'Set to the name of the service being configured.',
+      type: 'string: <required>',
+      yaml: false,
+    },
+    {
+      name: 'Namespace',
+      type: `string: "default"`,
+      enterprise: true,
+      description: 'Specifies the namespace the config entry will apply to.',
+      yaml: false,
+    },
+    {
+      name: 'Partition',
+      type: `string: "default"`,
+      enterprise: true,
+      description:
+        'Specifies the name of the admin partition in which the configuration entry applies. Refer to the [Admin Partitions documentation](/consul/docs/enterprise/admin-partitions) for additional information.',
+      yaml: false,
+    },
+    {
+      name: 'Meta',
+      type: 'map<string|string>: nil',
+      description:
+        'Specifies arbitrary KV metadata pairs. Added in Consul 1.8.4.',
+      yaml: false,
+    },
+    {
+      name: 'metadata',
+      children: [
         {
-          "PathPrefix": "/admin",
-          "RequestsPerSecond": 20
-        }
+          name: 'name',
+          description: 'Set to the name of the service being configured.',
+        },
+        {
+          name: 'namespace',
+          description:
+            'If running Consul Open Source, the namespace is ignored (see [Kubernetes Namespaces in Consul OSS](/consul/docs/k8s/crds#consul-oss)). If running Consul Enterprise see [Kubernetes Namespaces in Consul Enterprise](/consul/docs/k8s/crds#consul-enterprise) for more details.',
+        },
+        {
+          name: 'partition',
+          enterprise: true,
+          description:
+            'Specifies the admin partition in which the configuration will apply. The current partition is used if unspecified. Refer to the [Admin Partitions documentation](/consul/docs/enterprise/admin-partitions) for details. The partitions parameter is not supported in Consul OSS.',
+        },
+      ],
+      hcl: false,
+    },
+    {
+      name: 'Protocol',
+      type: `string: "tcp"`,
+      description: `Sets the protocol of the service. This is used
+                      by service mesh proxies for things like observability features and to unlock usage
+                      of the [\`service-splitter\`](/consul/docs/connect/config-entries/service-splitter) and
+                      [\`service-router\`](/consul/docs/connect/config-entries/service-router) config entries
+                      for a service. It also unlocks the ability to define L7 intentions via
+                      [\`service-intentions\`](/consul/docs/connect/config-entries/service-intentions).
+                      Supported values are one of \`tcp\`, \`http\`, \`http2\`, or \`grpc\`.`,
+    },
+    {
+      name: 'BalanceInboundConnections',
+      type: `string: ""`,
+      description: `Sets the strategy for allocating inbound connections to the service across proxy threads.
+                      The only supported value is \`exact_balance\`. By default, no connection balancing is used.
+                      Refer to the
+                      [Envoy Connection Balance config](https://cloudnative.to/envoy/api-v3/config/listener/v3/listener.proto.html#config-listener-v3-listener-connectionbalanceconfig)
+                      for details.`
+    },
+    {
+      name: 'EnvoyExtensions',
+      type: 'list<EnvoyExtension>: []',
+      description: `A list of extensions to modify Envoy proxy configuration.`,
+      children: [
+        {
+          name: 'Name',
+          type: `string: ""`,
+          description: `Name of the extension.`,
+        },
+        {
+          name: 'Required',
+          type: `string: ""`,
+          description: `When \`Required\` is true and the extension does not update any Envoy resources, an error is
+          returned. Use this parameter to ensure that extensions required for secure communication are not unintentionally
+          bypassed.`,
+        },
+        {
+          name: 'Arguments',
+          type: 'map<string|Any>: nil',
+          description: `Arguments to pass to the extension executable.`,
+        },
+      ],
+    },
+    {
+      name: 'Mode',
+      type: `string: ""`,
+      description: `One of \`direct\` or \`transparent\`.
+                    \`transparent\` represents that inbound and outbound application traffic is being
+                    captured and redirected through the proxy. This mode does not enable the traffic redirection
+                     itself. Instead it signals Consul to configure Envoy as if traffic is already being redirected.
+                    \`direct\` represents that the proxy's listeners must be dialed directly by the local
+                    application and other proxies.
+                    Added in v1.10.0.`,
+    },
+    {
+      name: 'UpstreamConfig',
+      type: 'UpstreamConfiguration: <optional>',
+      description: `Controls default configuration settings that apply across all upstreams, and per-upstream
+                    configuration overrides. Note that per-upstream configuration applies across all federated datacenters
+                    to the pairing of source and upstream destination services.
+                    Added in v1.10.0.`,
+      children: [
+        {
+          name: 'Overrides',
+          type: 'list<UpstreamConfig>: []',
+          description: `A list of optional overrides for per-upstream configuration.`,
+          children: [
+            {
+              name: 'Name',
+              type: 'string: ""',
+              description:
+                'The upstream name to apply the configuration to. This should not be set to the wildcard specifier `*`.',
+            },
+            {
+              name: 'Namespace',
+              type: 'string: ""',
+              description:
+                'The namespace of the upstream. This should not be set to the wildcard specifier `*`.',
+            },
+            {
+              name: 'Peer',
+              type: 'string: ""',
+              description:
+                `The name of the peer containing the upstream. Do not use a wildcard specifier ( \`*\`).<br><br>
+                    If the \`peer\` field is not set in any \`Overrides\` configuration, then Consul applies overrides to peered services with the same [\`name\`](/consul/docs/connect/config-entries/service-defaults#name).
+                    This maintains backward compatibility with Consul 1.14.0.
+                    If the \`peer\` field is specified in any override, then backward compatibility with Consul 1.14.0 is disabled.
+                    As a result, each peered service must have a separate override configuration if desired.` ,
+            },
+            {
+              name: 'Protocol',
+              type: 'string: ""',
+              description: `The protocol for the upstream listener.<br><br>
+                  NOTE: The protocol of a service should ideally be configured via the
+                    [\`protocol\`](/consul/docs/connect/config-entries/service-defaults#protocol)
+                    field of a
+                    [\`service-defaults\`](/consul/docs/connect/config-entries/service-defaults)
+                    config entry for the upstream destination service. Configuring it in a
+                    proxy upstream config will not fully enable some
+                    [L7 features](/consul/docs/connect/l7-traffic).
+                    It is supported here for backwards compatibility with Consul versions prior to 1.6.0.
+                    In addition, the \`protocol\` of a peered service cannot be overridden. Any value in
+                    this field is ignored for peered services.
+                  `,
+            },
+            {
+              name: 'ConnectTimeoutMs',
+              type: 'int: 5000',
+              description: {
+                hcl: `The number of milliseconds to allow when making upstream connections before timing out.<br><br>
+                    NOTE: The connect timeout of a service should ideally be configured via the
+                      [\`connect_timeout\`](/consul/docs/connect/config-entries/service-resolver#connecttimeout)
+                      field of a
+                      [\`service-resolver\`](/consul/docs/connect/config-entries/service-resolver)
+                      config entry for the upstream destination service.
+                      Configuring it in a proxy upstream config will not fully enable some
+                      [L7 features](/consul/docs/connect/l7-traffic).
+                      It is supported here for backwards compatibility with Consul versions prior to 1.6.0.
+                    `,
+                yaml: `The number of milliseconds to allow when making upstream connections before timing out.<br><br>
+                    NOTE: The connect timeout of a service should ideally be configured via the
+                      [\`connectTimeout\`](/consul/docs/connect/config-entries/service-resolver#connecttimeout)
+                      field of a
+                      [\`ServiceResolver\`](/consul/docs/connect/config-entries/service-resolver)
+                      CRD for the upstream destination service.
+                      Configuring it in a proxy upstream config will not fully enable some
+                      [L7 features](/consul/docs/connect/l7-traffic).
+                      It is supported here for backwards compatibility with Consul versions prior to 1.6.0.
+                `,
+              },
+            },
+            {
+              name: 'MeshGateway',
+              type: 'MeshGatewayConfig: <optional>',
+              description: `Controls the default
+                [mesh gateway configuration](/consul/docs/connect/gateways/mesh-gateway#connect-proxy-configuration)
+                for this upstream.`,
+              children: [
+                {
+                  name: 'Mode',
+                  type: 'string: ""',
+                  description: 'One of `none`, `local`, or `remote`.',
+                },
+              ],
+            },
+            {
+              name: 'BalanceOutboundConnections',
+              type: `string: ""`,
+              description: `Sets the strategy for allocating outbound connections from the upstream across proxy threads.
+                  The only supported value is \`exact_balance\`. By default, no connection balancing is used.
+                  Refer to the
+                  [Envoy Connection Balance config](https://cloudnative.to/envoy/api-v3/config/listener/v3/listener.proto.html#config-listener-v3-listener-connectionbalanceconfig)
+                  for details.`
+            },
+            {
+              name: 'Limits',
+              type: 'Limits: <optional>',
+              description: `A set of limits to apply when connecting to the upstream service.
+                    These limits are applied on a per-service-instance basis.
+                    The following limits are respected.`,
+              children: [
+                {
+                  name: 'MaxConnections',
+                  type: 'int: 0',
+                  description: `The maximum number of connections a service instance
+                        will be allowed to establish against the given upstream. Use this to limit
+                        HTTP/1.1 traffic, since HTTP/1.1 has a request per connection.`,
+                },
+                {
+                  name: 'MaxPendingRequests',
+                  type: 'int: 0',
+                  description: `The maximum number of requests that will be queued
+                        while waiting for a connection to be established. For this configuration to
+                        be respected, a L7 protocol must be defined in the \`protocol\` field.`,
+                },
+                {
+                  name: 'MaxConcurrentRequests',
+                  type: 'int: 0',
+                  description: `The maximum number of concurrent requests that
+                        will be allowed at a single point in time. Use this to limit HTTP/2 traffic,
+                        since HTTP/2 has many requests per connection. For this configuration to be
+                        respected, a L7 protocol must be defined in the \`protocol\` field.`,
+                },
+              ],
+            },
+            {
+              name: 'PassiveHealthCheck',
+              type: 'PassiveHealthCheck: <optional>',
+              description: `Passive health checks are used to remove hosts from
+                    the upstream cluster which are unreachable or are returning errors..`,
+              children: [
+                {
+                  name: 'Interval',
+                  type: 'duration: 0s',
+                  description: {
+                    hcl: `The time between checks. Each check will cause hosts which
+                          have exceeded \`max_failures\` to be removed from the load balancer, and
+                          any hosts which have passed their ejection time to be returned to the
+                          load balancer.`,
+                    yaml: `The time between checks. Each check will cause hosts which
+                          have exceeded \`maxFailures\` to be removed from the load balancer, and
+                          any hosts which have passed their ejection time to be returned to the
+                          load balancer.`,
+                  },
+                },
+                {
+                  name: 'MaxFailures',
+                  type: 'int: 0',
+                  description: `The number of consecutive failures which cause a host to be
+                      removed from the load balancer.`,
+                },
+                {
+                  name: 'EnforcingConsecutive5xx',
+                  type: 'int: 100',
+                  description: {
+                    hcl: `Measured in percent (%), the probability of a host's ejection
+                      after a passive health check detects an outlier status through consecutive 5xx.`,
+                    yaml: `Measured in percent (%), the probability of a host's ejection
+                       after a passive health check detects an outlier status through consecutive 5xx.`,
+                  },
+                },
+                {
+                  name: 'MaxEjectionPercent',
+                  type: 'int: 10',
+                  description: `Measured in percent (%), the maximum percentage of hosts that can be ejected
+                    from a upstream cluster due to passive health check failures. If not specified, inherits
+                    Envoy's default of 10% or at least one host.`,
+                },
+                {
+                  name: 'BaseEjectionTime',
+                  type: 'duration: 30s',
+                  description: `The base time that a host is ejected for. The real time is equal to the base
+                    time multiplied by the number of times the host has been ejected and is capped by
+                    max_ejection_time (Default 300s). If not specified, inherits Envoy's default value of 30s.`,
+                },
+              ],
+            },
+          ],
+        },
+        {
+          name: 'Defaults',
+          type: 'UpstreamConfig: <optional>',
+          description: `Default configuration that applies to all upstreams of this service.`,
+          children: [
+            {
+              name: 'Protocol',
+              type: 'string: ""',
+              description: {
+                hcl: `The protocol for the upstream listener.<br><br>
+                    NOTE: The protocol of a service should ideally be configured via the
+                      [\`protocol\`](/consul/docs/connect/config-entries/service-defaults#protocol)
+                      field of a
+                      [\`service-defaults\`](/consul/docs/connect/config-entries/service-defaults)
+                      config entry for the upstream destination service. Configuring it in a
+                      proxy upstream config will not fully enable some
+                      [L7 features](/consul/docs/connect/l7-traffic).
+                      It is supported here for backwards compatibility with Consul versions prior to 1.6.0.
+                    `,
+                yaml: `The protocol for the upstream listener.<br><br>
+                    NOTE: The protocol of a service should ideally be configured via the
+                      [\`protocol\`](/consul/docs/connect/config-entries/service-defaults#protocol)
+                      field of a
+                      [\`ServiceDefaults\`](/consul/docs/connect/config-entries/service-defaults)
+                      CRD for the upstream destination service. Configuring it in a
+                      proxy upstream config will not fully enable some
+                      [L7 features](/consul/docs/connect/l7-traffic).
+                      It is supported here for backwards compatibility with Consul versions prior to 1.6.0.
+                    `,
+              },
+            },
+            {
+              name: 'ConnectTimeoutMs',
+              type: 'int: 5000',
+              description: {
+                hcl: `The number of milliseconds to allow when making upstream connections before timing out.<br><br>
+                    NOTE: The connect timeout of a service should ideally be configured via the
+                      [\`connect_timeout\`](/consul/docs/connect/config-entries/service-resolver#connecttimeout)
+                      field of a
+                      [\`service-resolver\`](/consul/docs/connect/config-entries/service-resolver)
+                      config entry for the upstream destination service.
+                      Configuring it in a proxy upstream config will not fully enable some
+                      [L7 features](/consul/docs/connect/l7-traffic).
+                      It is supported here for backwards compatibility with Consul versions prior to 1.6.0.
+                    `,
+                yaml: `The number of milliseconds to allow when making upstream connections before timing out.<br><br>
+                    NOTE: The connect timeout of a service should ideally be configured via the
+                      [\`connectTimeout\`](/consul/docs/connect/config-entries/service-resolver#connecttimeout)
+                      field of a
+                      [\`ServiceResolver\`](/consul/docs/connect/config-entries/service-resolver)
+                      CRD for the upstream destination service.
+                      Configuring it in a proxy upstream config will not fully enable some
+                      [L7 features](/consul/docs/connect/l7-traffic).
+                      It is supported here for backwards compatibility with Consul versions prior to 1.6.0.
+                    `,
+              },
+            },
+            {
+              name: 'MeshGateway',
+              type: 'MeshGatewayConfig: <optional>',
+              description: `Controls the default
+                  [mesh gateway configuration](/consul/docs/connect/gateways/mesh-gateway/service-to-service-traffic-wan-datacenters#connect-proxy-configuration)
+                  for this upstream.`,
+              children: [
+                {
+                  name: 'Mode',
+                  type: 'string: ""',
+                  description: 'One of `none`, `local`, or `remote`.',
+                },
+              ],
+            },
+            {
+              name: 'BalanceOutboundConnections',
+              type: `string: ""`,
+              description: `Sets the strategy for allocating outbound connections from the upstream across proxy threads.
+                  The only supported value is \`exact_balance\`. By default, no connection balancing is used.
+                  Refer to the
+                  [Envoy Connection Balance config](https://cloudnative.to/envoy/api-v3/config/listener/v3/listener.proto.html#config-listener-v3-listener-connectionbalanceconfig)
+                  for details.`
+            },
+            {
+              name: 'Limits',
+              type: 'Limits: <optional>',
+              description: `A set of limits to apply when connecting to the upstream service.
+                  These limits are applied on a per-service-instance basis.
+                  The following limits are respected.`,
+              children: [
+                {
+                  name: 'MaxConnections',
+                  type: 'int: 0',
+                  description: `The maximum number of connections a service instance
+                      will be allowed to establish against the given upstream. Use this to limit
+                      HTTP/1.1 traffic, since HTTP/1.1 has a request per connection.`,
+                },
+                {
+                  name: 'MaxPendingRequests',
+                  type: 'int: 0',
+                  description: `The maximum number of requests that will be queued
+                      while waiting for a connection to be established. For this configuration to
+                      be respected, a L7 protocol must be defined in the \`protocol\` field.`,
+                },
+                {
+                  name: 'MaxConcurrentRequests',
+                  type: 'int: 0',
+                  description: `The maximum number of concurrent requests that
+                      will be allowed at a single point in time. Use this to limit HTTP/2 traffic,
+                      since HTTP/2 has many requests per connection. For this configuration to be
+                      respected, a L7 protocol must be defined in the \`protocol\` field.`,
+                },
+              ],
+            },
+            {
+              name: 'PassiveHealthCheck',
+              type: 'PassiveHealthCheck: <optional>',
+              description: `Passive health checks are used to remove hosts from
+                    the upstream cluster which are unreachable or are returning errors..`,
+              children: [
+                {
+                  name: 'Interval',
+                  type: 'duration: 0s',
+                  description: {
+                    hcl: `The time between checks. Each check will cause hosts which
+                        have exceeded \`max_failures\` to be removed from the load balancer, and
+                        any hosts which have passed their ejection time to be returned to the
+                        load balancer.`,
+                    yaml: `The time between checks. Each check will cause hosts which
+                        have exceeded \`maxFailures\` to be removed from the load balancer, and
+                        any hosts which have passed their ejection time to be returned to the
+                        load balancer.`,
+                  },
+                },
+                {
+                  name: 'MaxFailures',
+                  type: 'int: 0',
+                  description: `The number of consecutive failures which cause a host to be
+                    removed from the load balancer.`,
+                },
+                {
+                  name: 'EnforcingConsecutive5xx',
+                  type: 'int: 100',
+                  description: {
+                    hcl: `Measured in percent (%), the probability of a host's ejection
+                       after a passive health check detects an outlier status through consecutive 5xx.`,
+                    yaml: `Measured in percent (%), the probability of a host's ejection
+                       after a passive health check detects an outlier status through consecutive 5xx.`,
+                  },
+                },
+                {
+                  name: 'MaxEjectionPercent',
+                  type: 'int: 10',
+                  description: `Measured in percent (%), the maximum percentage of hosts that can be ejected
+                    from a upstream cluster due to passive health check failures. If not specified, inherits
+                    Envoy's default of 10% or at least one host.`,
+                },
+                {
+                  name: 'BaseEjectionTime',
+                  type: 'duration: 30s',
+                  description: `The base time that a host is ejected for. The real time is equal to the base
+                    time multiplied by the number of times the host has been ejected and is capped by
+                    max_ejection_time (Default 300s). If not specified, inherits Envoy's default value of 30s.`,
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
+    {
+      name: 'TransparentProxy',
+      type: 'TransparentProxyConfig: <optional>',
+      description: `Controls configuration specific to proxies in transparent mode. Added in v1.10.0.`,
+      children: [
+        {
+          name: 'OutboundListenerPort',
+          type: 'int: "15001"',
+          description: `The port the proxy should listen on for outbound traffic. This must be the port where
+                        outbound application traffic is redirected to.`,
+        },
+        {
+          name: 'DialedDirectly',
+          type: 'bool: false',
+          description: {
+            hcl: `Determines whether this proxy instance's IP address can be dialed directly by transparent proxies.
+              Typically transparent proxies dial upstreams using the "virtual" tagged address, which load balances
+              across instances. Dialing individual instances can be helpful in cases like stateful services such
+              as a database cluster with a leader.`,
+            yaml: `Determines whether the Pod IPs can be dialed directly (versus the Cluster IP).
+              Dialing Pod IPs can be helpful in cases like stateful services such
+              as a database cluster with a leader or with an ingress controller that dials Pod IPs instead of Cluster IPs.`,
+          },
+        },
+      ],
+    },
+    {
+      name: 'Destination',
+      type: 'DestinationConfig: <optional>',
+      description: `Controls configuration specific to destinations through terminating-gateway. Added in v1.13.0.`,
+      children: [
+        {
+          name: 'Addresses',
+          type: 'list<string>: []',
+          description:`List of addresses associated with the destination. This can be a hostname or an IP address.
+          Wildcards are not accepted.`,
+        },
+        {
+          name: 'Port',
+          type: 'int: 0',
+          description: `Port number associated with the destination.`,
+        },
       ]
-    }
-  }
-}
-```
-</CodeTabs>
-
-### Enable request rate limits on multiple paths
-
-The following example limits the request rate to the `billing` service when requests begin with `/api` and `/login`.
+    },
+    {
+      name: 'MaxInboundConnections',
+      description: 'The maximum number of concurrent inbound connections to each service instance.',
+      type: 'int: 0',
+      yaml: true,
+    },
+    {
+      name: 'LocalConnectTimeoutMs',
+      description: ' The number of milliseconds allowed to make connections to the local application instance before timing out. Defaults to 5000.',
+      type: 'int: 0',
+      yaml: false,
+    },
+    {
+      name: 'LocalRequestTimeoutMs',
+      description: ' In milliseconds, the timeout for HTTP requests to the local application instance. Applies to HTTP-based protocols only. If not specified, inherits the Envoy default for route timeouts (15s).',
+      type: 'int: 0',
+      yaml: false,
+    },
+    {
+      name: 'MeshGateway',
+      type: 'MeshGatewayConfig: <optional>',
+      description: `Controls the default
+      [mesh gateway configuration](/consul/docs/connect/gateways/mesh-gateway/service-to-service-traffic-wan-datacenters#connect-proxy-configuration)
+      for this service. Added in v1.6.0.`,
+      children: [
+        {
+          name: 'Mode',
+          type: 'string: ""',
+          description: 'One of `none`, `local`, or `remote`.',
+        },
+      ],
+    },
+    {
+      name: 'ExternalSNI',
+      type: 'string: ""',
+      description: `This is an optional setting that allows for
+                      the TLS [SNI](https://en.wikipedia.org/wiki/Server_Name_Indication) value to
+                      be changed to a non-mesh value when federating with an external system.
+                      Added in v1.6.0.`,
+    },
+    {
+      name: 'Expose',
+      type: 'ExposeConfig: <optional>',
+      description: `Controls the default
+                      [expose path configuration](/consul/docs/connect/registration/service-registration#expose-paths-configuration-reference)
+                      for Envoy. Added in v1.6.2.<br><br>
+                      Exposing paths through Envoy enables a service to protect itself by only listening on localhost, while still allowing
+                      non-mesh-enabled applications to contact an HTTP endpoint.
+                      Some examples include: exposing a \`/metrics\` path for Prometheus or \`/healthz\` for kubelet liveness checks.`,
+      children: [
+        {
+          name: 'Checks',
+          type: 'bool: false',
+          description: `If enabled, all HTTP and gRPC checks registered with the agent are exposed through Envoy.
+        Envoy will expose listeners for these checks and will only accept connections originating from localhost or Consul's
+        [advertise address](/consul/docs/agent/config/config-files#advertise). The port for these listeners are dynamically allocated from
+        [expose_min_port](/consul/docs/agent/config/config-files#expose_min_port) to [expose_max_port](/consul/docs/agent/config/config-files#expose_max_port).
+        This flag is useful when a Consul client cannot reach registered services over localhost. One example is when running
+        Consul on Kubernetes, and Consul agents run in their own pods.`,
+        },
+        {
+          name: 'Paths',
+          type: 'list<Path>: []',
+          description: 'A list of paths to expose through Envoy.',
+          children: [
+            {
+              name: 'Path',
+              type: 'string: ""',
+              description:
+                'The HTTP path to expose. The path must be prefixed by a slash. ie: `/metrics`.',
+            },
+            {
+              name: 'LocalPathPort',
+              type: 'int: 0',
+              description:
+                'The port where the local service is listening for connections to the path.',
+            },
+            {
+              name: 'ListenerPort',
+              type: 'int: 0',
+              description: `The port where the proxy will listen for connections. This port must be available
+           for the listener to be set up. If the port is not free then Envoy will not expose a listener for the path,
+           but the proxy registration will not fail.`,
+            },
+            {
+              name: 'Protocol',
+              type: 'string: "http"',
+              description:
+                'Sets the protocol of the listener. One of `http` or `http2`. For gRPC use `http2`.',
+            },
+          ],
+        },
+      ],
+    },
+  ]}
+/>
 
-<CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
+## ACLs
 
-```hcl
-Kind = "service-defaults"
-Name = "billing"
-Protocol = "http"
+Configuration entries may be protected by [ACLs](/consul/docs/security/acl).
 
-RateLimit {
-  InstanceLevel {
-    Routes = [
-      {
-         PathPrefix = "/api"
-         RequestsPerSecond = 500
-      },
-      {
-         PathPrefix = "/login"
-         RequestsPerSecond = 100
-         RequestsMaxBurst = 500
-      }
-    ]
-  }
-}
-```
+Reading a `service-defaults` config entry requires `service:read` on the resource.
 
-```yaml
-kind: service-defaults
-name: billing
-protocol: http
-rateLimit:
-  instanceLevel:
-    routes:
-      - pathPrefix: /api
-        requestsPerSecond: 500
-      - pathPrefix: /login
-        requestsPerSecond: 100
-        requestsMaxBurst: 500
-```
-```json
-{
-  "Kind": "service-defaults",
-  "Name": "billing",
-  "Protocol": "http",
-  "RateLimit": {
-    "InstanceLevel": {
-      "Routes": [
-        {
-          "PathPrefix": "/api",
-          "RequestsPerSecond": 500
-        },
-        {
-          "PathPrefix": "/login",
-          "RequestsPerSecond": 100,
-          "RequestsMaxBurst": 500
-        }
-      ]
-    }
-  }
-}
-```
-</CodeTabs>
+Creating, updating, or deleting a `service-defaults` config entry requires
+`service:write` on the resource.
+-->
diff --git a/website/content/docs/connect/config-entries/service-intentions.mdx b/website/content/docs/connect/config-entries/service-intentions.mdx
index e2f78e488a531..321b7f1605803 100644
--- a/website/content/docs/connect/config-entries/service-intentions.mdx
+++ b/website/content/docs/connect/config-entries/service-intentions.mdx
@@ -18,87 +18,74 @@ The following outline shows how to format the service intentions configuration e
 <Tab heading="HCL and JSON" group="hcl">
 
 - [`Kind`](#kind): string | required | must be set to `service-intentions`
-- [`Name`](#name): string | required
+- [`Name`](#name): string | required  
 - [`Namespace`](#namespace): string |  `default` | <EnterpriseAlert inline/>
 - [`Partition`](#partition): string |  `default` | <EnterpriseAlert inline />
-- [`Meta`](#meta): map
-- [`JWT`](#jwt): map
-  - [`Providers`](#jwt-providers): list of maps
-    - [`Name`](#jwt-providers-name): string
-    - [`VerifyClaims`](#jwt-provider-verifyclaims): list of maps
-      - [`Path`](#jwt-provider-verifyclaims-path): list of strings
-      - [`Value`](#jwt-provider-verifyclaims-value): string
+- [`Meta`](#meta): map | no default 
 - [`Sources`](#sources): list | no default
   - [`Name`](#sources-name): string | no default
   - [`Peer`](#sources-peer): string | no default
-  - [`Namespace`](#sources-namespace): string | no default | <EnterpriseAlert inline />
-  - [`Partition`](#sources-partition): string | no default | <EnterpriseAlert inline />
-  - [`SamenessGroup`](#sources-samenessgroup): string | no default | <EnterpriseAlert inline />
+  - [`Namespace`](#sources-namespace): string | no default  | <EnterpriseAlert inline />
+  - [`Partition`](#sources-partition): string | no default  | <EnterpriseAlert inline />
   - [`Action`](#sources-action): string | no default  | required for L4 intentions
   - [`Permissions`](#sources-permissions): list | no default
     - [`Action`](#sources-permissions-action): string | no default  | required
     - [`HTTP`](#sources-permissions-http): map | required
-      - [`PathExact`](#sources-permissions-http): string
-      - [`PathPrefix`](#sources-permissions-http): string
-      - [`PathRegex`](#sources-permissions-http): string
-      - [`Methods`](#sources-permissions-http): list
-      - [`Header`](#sources-permissions-http-header): list of maps
+      - [`PathExact`](#sources-permissions-http): string | no default 
+      - [`PathPrefix`](#sources-permissions-http): string | no default 
+      - [`PathRegex`](#sources-permissions-http): string | no default 
+      - [`Methods`](#sources-permissions-http): list | no default 
+      - [`Header`](#sources-permissions-http-header): list of maps |no default 
         - [`Name`](#sources-permissions-http-header): string | required
-        - [`Present`](#sources-permissions-http-header): boolean | `false`
-        - [`Exact`](#sources-permissions-http-header): string
-        - [`Prefix`](#sources-permissions-http-header): string
-        - [`Suffix`](#sources-permissions-http-header): string
-        - [`Regex`](#sources-permissions-http-header): string
-        - [`Invert`](#sources-permissions-http-header): boolean | `false`
-  - [`Precedence`](#sources-precedence): number
-  - [`Type`](#sources-type): string | `consul`
-  - [`Description`](#sources-description): string
-  - [`LegacyID`](#sources-legacyid): string
-  - [`LegacyMeta`](#sources-legacymeta): map
-  - [`LegacyCreateTime`](#sources-legacycreatetime): string
-  - [`LegacyUpdateTime`](#sources-legacyupdatetime): string
+        - [`Present`](#sources-permissions-http-header): boolean | `false` 
+        - [`Exact`](#sources-permissions-http-header): string | no default
+        - [`Prefix`](#sources-permissions-http-header): string | no default
+        - [`Suffix`](#sources-permissions-http-header): string | no default
+        - [`Regex`](#sources-permissions-http-header): string | no default
+        - [`Invert`](#sources-permissions-http-header): boolean | `false` 
+  - [`Precedence`](#sources-precedence): number | no default | _read-only_   
+  - [`Type`](#sources-type): string | `consul` 
+  - [`Description`](#sources-description): string 
+  - [`LegacyID`](#sources-legacyid): string | no default | _read-only_ 
+  - [`LegacyMeta`](#sources-legacymeta): map | no default | _read-only_ 
+  - [`LegacyCreateTime`](#sources-legacycreatetime): string | no default | _read-only_
+  - [`LegacyUpdateTime`](#sources-legacyupdatetime): string | no default | _read-only_
 
 </Tab>
-<Tab heading= "YAML" group="yaml">
+<Tab heading="YAML" group="yaml">
 
 - [`apiVersion`](#apiversion): string | must be set to `consul.hashicorp.com/v1alpha1`
-- [`kind`](#kind): string | must be set to `ServiceIntentions`
-- [`metadata`](#metadata): map | required
-  - [`name`](#metadata-name): string | required
+- [`kind`](#kind): string | must be set to `ServiceIntentions` 
+- [`metadata`](#metadata): map | required 
+  - [`name`](#metadata-name): string | required  
   - [`namespace`](#metadata-namespace): string | `default` | <EnterpriseAlert inline/>
-- [`spec`](#spec): map | no default
+- [`spec`](#spec): map | no default 
   - [`destination`](#spec-destination): map | no default
     - [`name`](#spec-destination-name): string | required
     - [`namespace`](#metadata-namespace): string | `default` | <EnterpriseAlert inline/>
-  - [`jwt`](#spec-jwt): map
-    - [`providers`](#spec-jwt-providers): list of maps
-        - [`name`](#spec-jwt-providers-name): string
-        - [`verifyClaims`](#spec-jwt-provider-verifyclaims): list of maps
-            - [`path`](#spec-jwt-provider-verifyclaims-path): list of strings
-            - [`value`](#spec-jwt-provider-verifyclaims-value): string
   - [`sources`](#spec-sources): list | no default
     - [`name`](#spec-sources-name): string | no default
     - [`peer`](#spec-sources-peer): string | no default
     - [`namespace`](#spec-sources-namespace): string | no default  | <EnterpriseAlert inline />
     - [`partition`](#spec-sources-partition): string | no default  | <EnterpriseAlert inline />
-    - [`samenessGroup`](#spec-sources-samenessgroup): string | no default | <EnterpriseAlert inline />
     - [`action`](#spec-sources-action): string | no default  | required for L4 intentions
     - [`permissions`](#spec-sources-permissions): list | no default
       - [`action`](#spec-sources-permissions-action): string | no default  | required
       - [`http`](#spec-sources-permissions-http): map | required
-        - [`pathExact`](#spec-sources-permissions-http): string | no default
-        - [`pathPrefix`](#spec-sources-permissions-http): string | no default
-        - [`pathRegex`](#spec-sources-permissions-http): string | no default
-        - [`methods`](#spec-sources-permissions-http): list | no default
-          - [`header`](#spec-sources-permissions-http-header): list of maps |no default
+        - [`pathExact`](#spec-sources-permissions-http): string | no default 
+        - [`pathPrefix`](#spec-sources-permissions-http): string | no default 
+        - [`pathRegex`](#spec-sources-permissions-http): string | no default 
+        - [`methods`](#spec-sources-permissions-http): list | no default 
+          - [`header`](#spec-sources-permissions-http-header): list of maps |no default 
             - [`name`](#spec-sources-permissions-http-header): string | required
-            - [`present`](#spec-sources-permissions-http-header): boolean | `false`
+            - [`present`](#spec-sources-permissions-http-header): boolean | `false` 
             - [`exact`](#spec-sources-permissions-http-header): string | no default
             - [`prefix`](#spec-sources-permissions-http-header): string | no default
             - [`suffix`](#spec-sources-permissions-http-header): string | no default
             - [`regex`](#spec-sources-permissions-http-header): string | no default
-            - [`invert`](#spec-sources-permissions-http-header): boolean | `false`
-    - [`description`](#spec-sources-description): string
+            - [`invert`](#spec-sources-permissions-http-header): boolean | `false` 
+    - [`type`](#spec-sources-type): string | `consul` 
+    - [`description`](#spec-sources-description): string 
 
 </Tab>
 </Tabs>
@@ -113,42 +100,28 @@ When every field is defined, a service intentions configuration entry has the fo
 
 ```hcl
 Kind =  "service-intentions"
-Name = "<name of destination service>"
+Name = "<name of destination service>"  
 Namespace = "<destination namespace>"                    # string
 Partition = "<destination partition>"                    # string
 Meta = {
-  "<key-1>" = "<value-1>"
-  "<key-2>" = "<value-2>"
-  }
-JWT = {
-    Providers = [
-      {
-        Name = "<JWT-provider-name>"
-        VerifyClaims = [
-            {
-                Path = ["<claim>"]
-                Value = "<api.apps.organization.com>"
-            }
-        ]
-      }
-    ]
-}
+  "<key-1>" = "<value-1>"    
+  "<key-2>" = "<value-2>"    
+  } 
 Sources = [
   {
     Name =  "<name of service sending traffic>"            # string
     Peer =  "<name of cluster containing source service>"  # string
     Namespace = "<namespace containing source service>"    # string
     Partition = "<sources-partition>"                      # string
-    SamenessGroup = "<group-name>"                         # string
     Action = "allow" or "deny"                             # string for L4 intentions
-    Permissions = [
-      {
-        Action = "allow" or "deny"                   # string for L7 intentions
-        HTTP =  {
-          PathExact =  "<exact path to match>"       # string
-          PathPrefix = "<path prefix to match>"      # string
-          PathRegex = "<regex pattern to match>"     # string
-          Methods = [
+    Permissions = [                                        
+      {                                                  
+        Action = "allow" or "deny"                   # string for L7 intenions
+        HTTP =  {                                      
+          PathExact =  "<exact path to match>"       # string 
+          PathPrefix = "<path prefix to match>"      # string 
+          PathRegex = "<regex pattern to match>"     # string 
+          Methods = [                    
             "<fist http method to match>",           # string
             "<second http method to match>"
           ]
@@ -174,17 +147,17 @@ Sources = [
               Regex = "<regex pattern to match>"       # string
               Invert = <true or false>                 # boolean
             }
-         ]
+         ] 
         }
-      }
+      } 
     ]
-    Type = "consul"                                     # string
-    Description = "<description for API responses>"     # string
+    Type = "consul"                                     # string     
+    Description = "<description for API responses>"     # string 
     Precedence = <read-only>                            # number
-    LegacyID = <read-only>                              # string
+    LegacyID = <read-only>                              # string 
     LegacyMeta = <read-only>                            # string
     LegacyCreateTime = <read-only>                      # string
-    LegacyUpdateTime = <read-only>                      # string
+    LegacyUpdateTime = <read-only>                      # string            
   }
 ]
 ```
@@ -194,26 +167,20 @@ Sources = [
 
 ```yaml
 apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceIntentions
+kind: service-intentions
 metadata:
   name: <name of destination service>
   namespace: <destination namespace>
 spec:
   destination:
-    name: <name of destination service>
-    namespace: <destination namespace>
-  jwt:
-    providers:
-      name: <JWT-provider-name>
-      verifyClaims:
-                path: [<aud>]
-                value: <api.apps.organization.com>
+    destination: 
+      name: <name of destination service>
+      namespace: <destination namespace>
   sources:
-  - name: <name of service sending traffic>
+    name: <name of service sending traffic>
     peer: <name of cluster containing source service>
     namespace: <namespace containing source service>
     partition: <sources-partition>
-    samenessGroup: <group-name>
     action: allow or deny
     permissions:
     - action: allow or deny
@@ -236,6 +203,7 @@ spec:
       - name: <http header name>
         regex: <regex pattern to match>
         invert: false
+  type: consul
   description: <description for API responses>
 ```
 </Tab>
@@ -252,26 +220,12 @@ spec:
       "key-1":"<value-1>",
       "key-2":"<value-2>"
    },
-   "JWT": {
-    "Providers": [
-      {
-        "Name": "<JWT-provider-name>",
-        "VerifyClaims": [
-            {
-                "Path": ["<aud>"],
-                "Value": "<api.apps.organization.com>"
-            }
-        ]
-      }
-    ]
-   },
    "Sources":[
       {
          "Name":"<name of service sending traffic>",
          "Peer":"<name of cluster containing source service>",
          "Namespace":"<namespace containing source service>",
          "Partition":"<sources-partition>",
-         "SamenessGroup":"<group-name>",
          "Action":"allow or deny",
          "Permissions":[
             {
@@ -346,7 +300,7 @@ Specifies the type of configuration entry to implement. Must be set to `service-
 
 ### `Name`
 
-Specifies a name of the destination service for all intentions defined in the configuration entry.
+Specifies a name of the destination service for all intentions defined in the configuration entry. 
 
 #### Values
 
@@ -354,22 +308,22 @@ Specifies a name of the destination service for all intentions defined in the co
 - This field is required.
 - Data type: String
 
-You can also specify a wildcard character (`*`) to match all services without intentions. Intentions that are applied with a wildcard, however, are not supported when defining L7 [`Permissions`](#sources-permissions).
+You can also specify a wildcard character (`*`) to match all services without intentions. Intentions that are applied with a wildcard, however, are not supported when defining L7 [`Permissions`](#sources-permissions). 
 
-### `Namespace` <EnterpriseAlert inline />
+### `Namespace` <EnterpriseAlert inline /> 
 
-Specifies the [namespace](/consul/docs/enterprise/namespaces) that the configuration entry applies to. Services in the namespace are the traffic destinations that the intentions allow or deny traffic to.
+Specifies the [namespace](/consul/docs/enterprise/namespaces) that the configuration entry applies to. Services in the namespace are the traffic destinations that the intentions allow or deny traffic to. 
 
 #### Values
 
 - Default: `default`
 - Data type: String
 
-You can also specify a wildcard character (`*`) to match all namespaces. Intentions that are applied with a wildcard, however, are not supported when defining L7 [`Permissions`](#sources-permissions).
+You can also specify a wildcard character (`*`) to match all namespaces. Intentions that are applied with a wildcard, however, are not supported when defining L7 [`Permissions`](#sources-permissions). 
 
-### `Partition` <EnterpriseAlert inline />
+### `Partition` <EnterpriseAlert inline /> 
 
-Specifies the [admin partition](/consul/docs/enterprise/admin-partitions) to apply the configuration entry. Services in the specified partition are the traffic destinations that the intentions allow or deny traffic to.
+Specifies the [admin partition](/consul/docs/enterprise/admin-partitions) to apply the configuration entry. Services in the specified partition are the traffic destinations that the intentions allow or deny traffic to. 
 
 #### Values
 
@@ -387,63 +341,6 @@ Specifies key-value pairs to add to the KV store when the configuration entry is
   - keys: String
   - values: String, integer, or float
 
-### `JWT`
-
-Specifies a JSON Web Token provider configured in a [JWT provider configuration entry](/consul/docs/connect/config-entries/jwt-provider), as well as additional configurations for verifying a service's JWT before authorizing communication between services
-
-#### Values
-
-- Default: None
-- Data type: Map that contains [`JWT{}.Providers`](#jwt-providers)
-
-### `JWT{}.Providers`
-
-Specifies the names of one or more previously configured [JWT provider configuration entries](/consul/docs/connect/config-entries/jwt-provider), which include the information necessary to validate a JSON web token.
-
-#### Values
-
-- Default: None
-- Data type: List of maps
-
-### `JWT{}.Providers[].Name`
-
-Specifies the name of a JWT provider defined in the `Name` field of the [`jwt-provider` configuration entry](/consul/docs/connect/config-entries/jwt-provider). You must write the JWT Provider to Consul before referencing it in a service intention.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `JWT{}.Providers[].VerifyClaims`
-
-Specifies additional token information to verify beyond what is configured in the JWT provider configuration entry. This map takes the form of a JSON web token claim and a value to match for verification.
-
-#### Values
-
-- Default: None
-- Data type: List of maps that can contain the following parameters:
-
-  - [`Path`](#jwt-providers-verifyclaims-path)
-  - [`Value`](#jwt-providers-verifyclaims-value)
-
-### `JWT{}.Providers[].VerifyClaims[].Path`
-
-Specifies the path to the claim in the JSON web token. For more information about JWT claims, refer to the [IETF standards documentation](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1).
-
-#### Values
-
-- Default: None
-- Data type: List of strings
-
-### `JWT{}.Providers[].VerifyClaims.Value`
-
-Specifies the value to match on when verifying the the claim designated in [`JWT{}.Providers[].VerifyClaims[].Path`](#jwt-providers-verifyclaims-path).
-
-#### Values
-
-- Default: None
-- Data type: String
-
 ### `Sources[]`
 
 List of configurations that define intention sources and the authorization granted to the sources. You can specify source configurations in any order, but Consul stores and evaluates them in order of reverse precedence at runtime. Refer to [`Precedence`](#sources-precedence) for additional information.
@@ -456,7 +353,6 @@ List of configurations that define intention sources and the authorization grant
   - `Peer`
   - `Namespace` <EnterpriseAlert inline/>
   - `Partition` <EnterpriseAlert inline/>
-  - `SamenessGroup` <EnterpriseAlert inline/>
   - `Action`
   - `Permissions`
   - `Precedence`
@@ -469,7 +365,7 @@ List of configurations that define intention sources and the authorization grant
 
 ### `Sources[].Name`
 
-Specifies the name of the source that the intention allows or denies traffic from. If [`Type`](#sources-type) is set to `consul`, then the value refers to the name of a Consul service. The source is not required to be registered into the Consul catalog.
+Specifies the name of the source that the intention allows or denies traffic from. If [`Type`](#sources-type) is set to `consul`, then the value refers to the name of a Consul service. The source is not required to be registered into the Consul catalog. 
 
 #### Values
 
@@ -479,53 +375,43 @@ Specifies the name of the source that the intention allows or denies traffic fro
 
 ### `Sources[].Peer`
 
-Specifies the name of a peered Consul cluster that the intention allows or denies traffic from. Refer to [Cluster peering overview](/consul/docs/connect/cluster-peering) for additional information about peers.
+Specifies the name of a peered Consul cluster that the intention allows or denies traffic from. Refer to [Cluster peering overview](/consul/docs/connect/cluster-peering) for additional information about peers. 
 
-The `Peer` and `Partition` fields are mutually exclusive.
+The `Peer` and `Partition` fields are mutually exclusive. 
 
 #### Values
 
 - Default: None
 - Data type: String
 
-### `Sources[].Namespace` <EnterpriseAlert inline />
+### `Sources[].Namespace` <EnterpriseAlert inline /> 
 
-Specifies the traffic source namespace that the intention allows or denies traffic from.
+Specifies the traffic source namespace that the intention allows or denies traffic from. 
 
 #### Values
 
 - Default: If [`Peer`](#sources-peer) is unspecified, defaults to the destination [`Namespace`](#namespace).
 - Data type: String
 
-### `Sources[].Partition` <EnterpriseAlert inline />
+### `Sources[].Partition` <EnterpriseAlert inline /> 
 
-Specifies the name of an admin partition that the intention allows or denies traffic from. Refer to [Admin Partitions](/consul/docs/enterprise/admin-partitions) for additional information about partitions.
+Specifies the name of an admin partition that the intention allows or denies traffic from. Refer to [Admin Partitions](/consul/docs/enterprise/admin-partitions) for additional information about partitions. 
 
-The `Peer` and `Partition` fields are mutually exclusive.
+The `Peer` and `Partition` fields are mutually exclusive. 
 
 #### Values
 
 - Default: If [`Peer`](#sources-peer) is unspecified, defaults to the destination [`Partition`](#partition).
 - Data type: string
 
-### `Sources[].SamenessGroup` <EnterpriseAlert inline />
-
-Specifies the name of a sameness group that the intention allows or denies traffic from. Refer to [create sameness groups](/consul/docs/connect/cluster-peering/usage/create-sameness-groups) for additional information.
-
-#### Values
-
-- Default: None
-- Data type: string
-
-
 ### `Sources[].Action`
 
-Specifies the action to take when the source sends traffic to the destination service. The value  is either `allow` or `deny`. Do not configure this field to apply L7 intentions to the same source. Configure the [`Permissions`](#sources-permissions) field instead.
+Specifies the action to take when the source sends traffic to the destination service. The value  is either `allow` or `deny`. Do not configure this field to apply L7 intentions to the same source. Configure the [`Permissions`](#sources-permissions) field instead. 
 
 #### Values
 
 - Default: None
-- This field is required for L4 intentions.
+- This field is required for L4 intentions. 
 - Data type: String value set to either `allow` or `deny`
 
 Refer to the following examples for additional guidance:
@@ -537,13 +423,13 @@ Refer to the following examples for additional guidance:
 
 ### `Sources[].Permissions[]`
 
-Specifies a list of permissions for L7 traffic sources. The list contains one or more actions and a set of match criteria for each action.
+Specifies a list of permissions for L7 traffic sources. The list contains one or more actions and a set of match criteria for each action. 
 
-Consul applies permissions in the order specified in the configuration. Beginning at the top of the list, Consul applies the first matching request and stops evaluating against the remaining configurations.
+Consul applies permissions in the order specified in the configuration. Beginning at the top of the list, Consul applies the first matching request and stops evaluating against the remaining configurations. 
 
-For requests that do not match any of the defined permissions, Consul applies the intention behavior defined in the [`acl_default_policy`](/consul/docs/agent/config/config-files#acl_default_policy) configuration.
+For requests that do not match any of the defined permissions, Consul applies the intention behavior defined in the [`acl_default_policy`](/consul/docs/agent/config/config-files#acl_default_policy) configuration. 
 
-Do not configure this field for L4 intentions. Use the [`Sources.Action`](#sources-action) parameter instead.
+Do not configure this field for L4 intentions. Use the [`Sources.Action`](#sources-action) parameter instead. 
 
 The `Permissions` only applies to services with a compatible protocol. `Permissions` are not supported when the [`Name`](#name) or [`Namespace`](#namespace) field is configured with a wildcard because service instances or services in a namespace may use different protocols.
 
@@ -563,12 +449,12 @@ Refer to the following examples for additional guidance:
 
 ### `Sources[].Permissions[].Action`
 
-Specifies the action to take when the source sends traffic to the destination service. The value  is either `allow` or `deny`.
+Specifies the action to take when the source sends traffic to the destination service. The value  is either `allow` or `deny`. 
 
 #### Values
 
 - Default: None
-- This field is required.
+- This field is required. 
 - Data type: String value set to either `allow` or `deny`.
 
 ### `Sources[].Permissions[].HTTP`
@@ -579,7 +465,7 @@ Specifies a set of HTTP-specific match criteria. Consul applies the action defin
 
 - Default: None
 - This field is required.
-- Data type: Map
+- Data type: Map 
 
 The following table describes the parameters that the HTTP map may contain:
 
@@ -593,14 +479,14 @@ The following table describes the parameters that the HTTP map may contain:
 
 ### `Sources[].Permissions[].HTTP[].Header[]`
 
-Specifies a header name and matching criteria for HTTP request headers. The request header must match all specified criteria for the permission to apply.
+Specifies a header name and matching criteria for HTTP request headers. The request header must match all specified criteria for the permission to apply. 
 
 #### Values
 
 - Default: None
-- Data type: list of objects
+- Data type: list of objects 
 
-Each member of the `Header` list is a map that contains a `Name` field and at least one match criterion. The following table describes the parameters that each member of the `Header` list may contain:
+Each member of the `Header` list is a map that contains a `Name` field and at least one match criterion. The following table describes the parameters that each member of the `Header` list may contain: 
 
 | Parameter | Description | Data type | Required |
 | --- | --- | --- | --- |
@@ -612,13 +498,14 @@ Each member of the `Header` list is a map that contains a `Name` field and at le
 | `Regex` | Specifies a regular expression pattern as the value for the header key set in the `Name` field. If the request header value matches the regex, Consul applies the permission. Do not specify `Regex` if `Present`, `Exact`, `Prefix`, or `Suffix` are configured in the same `Header` configuration. The regex syntax is proxy-specific. If using Envoy, refer to the [re2 documentation](https://github.com/google/re2/wiki/Syntax) for details. | string | optional |
 | `Invert` | Inverts the matching logic configured in the `Header`. Default is `false`. | boolean | optional |
 
+
 ### `Sources[].Precedence`
 
-The `Precedence` field contains a read-only integer. Consul generates the value based on name configurations for the source and destination services. Refer to [Precedence and matching order](/consul/docs/connect/intentions/create-manage-intentions#precedence-and-matching-order) for additional information.
+The `Precedence` field contains a read-only integer. Consul generates the value based on name configurations for the source and destination services. Refer to [Precedence and matching order](/consul/docs/connect/intentions/create-manage-intentions#precedence-and-matching-order) for additional information. 
 
 ### `Sources[].Type`
 
-Specifies the type of destination service that the configuration entry applies to. The only value supported is `consul`.
+Specifies the type of destination service that the configuration entry applies to. The only value supported is `consul`. 
 
 #### Values
 
@@ -627,7 +514,7 @@ Specifies the type of destination service that the configuration entry applies t
 
 ### `Sources[].Description`
 
-Specifies a description of the intention. Consul presents the description in API responses to assist other tools integrated into the network.
+Specifies a description of the intention. Consul presents the description in API responses to assist other tools integrated into the network. 
 
 #### Values
 
@@ -656,7 +543,7 @@ Read-only timestamp marking the most recent intention update. Consul exposes the
 
 ### `apiVersion`
 
-Specifies the version of the Consul API for integrating with Kubernetes. The value must be `consul.hashicorp.com/v1alpha1`.
+Specifies the version of the Consul API for integrating with Kubernetes. The value must be `consul.hashicorp.com/v1alpha1`. 
 
 #### Values
 
@@ -676,7 +563,7 @@ Specifies the type of configuration entry to implement. Must be set to `ServiceI
 
 ### `metadata`
 
-Map that contains an arbitrary name for the configuration entry and the namespace it applies to.
+Map that contains an arbitrary name for the configuration entry and the namespace it applies to. 
 
 #### Values
 
@@ -687,7 +574,7 @@ Map that contains an arbitrary name for the configuration entry and the namespac
 
 Specifies an arbitrary name for the configuration entry. Note that in other configuration entries, the `metadata.name` field specifies the name of the service that the settings apply to. For service intentions, the service that accepts the configurations is the _destination_ and is specified in the [`spec.destination.name`](#spec-destination-name) field. Refer to the following topics for additional information:
 
-- [ServiceIntentions Special Case (CE)](/consul/docs/k8s/crds#serviceintentions-special-case)
+- [ServiceIntentions Special Case (OSS)](/consul/docs/k8s/crds#serviceintentions-special-case) 
 - [ServiceIntentions Special Case (Enterprise)](/consul/docs/k8s/crds#serviceintentions-special-case-enterprise)
 
 #### Values
@@ -695,9 +582,9 @@ Specifies an arbitrary name for the configuration entry. Note that in other conf
 - Default: None
 - Data type: String
 
-### `metadata.namespace` <EnterpriseAlert inline />
+### `metadata.namespace` <EnterpriseAlert inline /> 
 
-Specifies the [namespace](/consul/docs/enterprise/namespaces) that the configuration entry applies to. Refer to [Consul Enterprise](/consul/docs/k8s/crds#consul-enterprise) for information about how Consul namespaces map to Kubernetes Namespaces. Consul Community Edition (Consul CE) ignores the `metadata.namespace` configuration.
+Specifies the [namespace](/consul/docs/enterprise/namespaces) that the configuration entry applies to. Refer to [Consul Enterprise](/consul/docs/k8s/crds#consul-enterprise) for information about how Consul namespaces map to Kubernetes Namespaces. Open source Consul distributions (Consul OSS) ignore the `metadata.namespace` configuration.
 
 #### Values
 
@@ -705,96 +592,49 @@ Specifies the [namespace](/consul/docs/enterprise/namespaces) that the configura
 - Data type: String
 
 ### `spec`
-
 Map that contains the details about the `ServiceIntentions` configuration entry. The `apiVersion`, `kind`, and `metadata` fields are siblings of the spec field. All other configurations are children.
 
 #### Values
 
 - Default: None
 - This field is required.
-- Data type: Map
+- Data type: Map 
 
 ### `spec.destination`
 
-Map that identifies the destination name and destination namespace that source services are allowed or denied access to.
+Map that identifies the destination name and destination namespace that source services are allowed or denied access to. 
 
 #### Values
 
 - Default: None
 - This field is required.
-- Data type: Map
+- Data type: Map 
 
 ### `spec.destination.name`
 
 Specifies the name of the destination service in the mesh that the intentions apply to.
-You can also specify a wildcard character (`*`) to match all services that are missing intention settings. Intentions that are applied with a wildcard, however, are not supported when defining L7 [`permissions`](#spec-sources-permissions).
+You can also specify a wildcard character (`*`) to match all services that are missing intention settings. Intentions that are applied with a wildcard, however, are not supported when defining L7 [`permissions`](#spec-sources-permissions). 
 
 #### Values
 
 - Default: None
 - This field is required.
-- Data type: String
-
-### `spec.jwt`
-
-Specifies a JSON Web Token provider configured in a [JWT provider configuration entry](/consul/docs/connect/config-entries/jwt-provider), as well as additional configurations for verifying a service's JWT before authorizing communication between services
-
-#### Values
-
-- Default: None
-- Data type: Map that contains [`spec.jwt.providers`](#spec-jwt-providers)
-
-### `spec.jwt.providers`
-
-Specifies the names of one or more previously configured [JWT provider configuration entries](/consul/docs/connect/config-entries/jwt-provider), which include the information necessary to validate a JSON web token.
-
-#### Values
-
-- Default: None
-- Data type: List of maps
-
-### `spec.jwt.providers[].name`
-
-Specifies the name of a JWT provider defined in the `metadata.name` field of the [JWT provider configuration entry](/consul/docs/connect/config-entries/jwt-provider). You must write the JWT Provider to Consul before referencing it in a service intention.
+- Data type: String 
 
-#### Values
-
-- Default: None
-- Data type: String
-
-### `spec.jwt.providers[].verifyClaims`
-
-Specifies additional token information to verify beyond what is configured in the JWT provider configuration entry. This map takes the form of a JSON web token claim and a value to match for verification.
-
-#### Values
-
-- Default: None
-- Data type: List of maps that can contain the following parameters:
-
-  - [`path`](#spec-jwt-providers-verifyclaims-path)
-  - [`value`](#spec-jwt-providers-verifyclaims-value)
+### `spec.metadata.namespace` <EnterpriseAlert inline /> 
 
-### `spec.jwt.providers[].verifyClaims[].path`
+Specifies the [namespace](/consul/docs/enterprise/namespaces) that the configuration entry applies to. You can also specify a wildcard character (`*`) to match all namespaces. Intentions that are applied with a wildcard, however, are not supported when defining L7 [`permissions`](#spec-sources-permissions). 
 
-Specifies the path to the claim in the JSON web token. For more information about JWT claims, refer to the [IETF standards documentation](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1).
+Refer to [Consul Enterprise](/consul/docs/k8s/crds#consul-enterprise) for information about how Consul namespaces map to Kubernetes Namespaces. Open source Consul distributions (Consul OSS) ignore the `metadata.namespace` configuration.
 
 #### Values
 
-- Default: None
-- Data type: List of strings
-
-### `spec.jwt.providers[].verifyClaims[].value`
-
-Specifies the value to match on when verifying the the claim designated in [`JWT{}.Providers[].VerifyClaims[].Path`](#jwt-providers-verifyclaims-path).
-
-#### Values
-
-- Default: None
+- Default: If not set, destination service namespace is inherited from the `connectInject.consulNamespaces` configuration. Refer to [ServiceIntentions Special Case (Enterprise)](/consul/docs/k8s/crds#serviceintentions-special-case-enterprise) for details. 
 - Data type: String
 
 ### `spec.sources[]`
 
-List of configurations that define intention sources and the authorization granted to the sources. You can specify source configurations in any order, but Consul stores and evaluates them in order of reverse precedence at runtime.
+List of configurations that define intention sources and the authorization granted to the sources. You can specify source configurations in any order, but Consul stores and evaluates them in order of reverse precedence at runtime. 
 
 #### Values
 
@@ -804,15 +644,14 @@ List of configurations that define intention sources and the authorization grant
   - `peer`
   - `namespace` <EnterpriseAlert inline/>
   - `partition` <EnterpriseAlert inline/>
-  - `samenessGroup` <EnterpriseAlert inline/>
-  - `action`
+  - `Action`
   - `permissions`
   - `type`
   - `description`
 
 ### `spec.sources[].name`
 
-Specifies the name of the source that the intention allows or denies traffic from. If [`type`](#sources-type) is set to `consul`, then the value refers to the name of a Consul service. The source is not required to be registered into the Consul catalog.
+Specifies the name of the source that the intention allows or denies traffic from. If [`type`](#sources-type) is set to `consul`, then the value refers to the name of a Consul service. The source is not required to be registered into the Consul catalog. 
 
 #### Values
 
@@ -822,58 +661,49 @@ Specifies the name of the source that the intention allows or denies traffic fro
 
 ### `spec.sources[].peer`
 
-Specifies the name of a peered Consul cluster that the intention allows or denies traffic from. Refer to [Cluster peering overview](/consul/docs/connect/cluster-peering) for additional information about peers. The `peer` and `partition` fields are mutually exclusive.
+Specifies the name of a peered Consul cluster that the intention allows or denies traffic from. Refer to [Cluster peering overview](/consul/docs/connect/cluster-peering) for additional information about peers. The `peer` and `partition` fields are mutually exclusive. 
 #### Values
 
 - Default: None
 - Data type: String
 
-### `spec.sources[].namespace` <EnterpriseAlert inline />
+### `spec.sources[].namespace` <EnterpriseAlert inline /> 
 
-Specifies the traffic source namespace that the intention allows or denies traffic from.
+Specifies the traffic source namespace that the intention allows or denies traffic from. 
 
 #### Values
 
 - Default: If [`peer`](#spec-sources-peer) is unspecified, defaults to the namespace specified in the [`spec.destination.namespace`](#spec-destination-namespace) field.
 - Data type: String
 
-### `spec.sources[].partition` <EnterpriseAlert inline />
+### `spec.sources[].partition` <EnterpriseAlert inline /> 
 
-Specifies the name of an admin partition that the intention allows or denies traffic from. Refer to [Admin Partitions](/consul/docs/enterprise/admin-partitions) for additional information about partitions. The `peer` and `partition` fields are mutually exclusive.
+Specifies the name of an admin partition that the intention allows or denies traffic from. Refer to [Admin Partitions](/consul/docs/enterprise/admin-partitions) for additional information about partitions. The `peer` and `partition` fields are mutually exclusive. 
 
 #### Values
 
 - Default: If [`peer`](#sources-peer) is unspecified, defaults to the partition specified in  [`spec.destination.partition`](#spec-destination-partition).
 - Data type: String
 
-### `spec.sources[].samenessGroup` <EnterpriseAlert inline />
-
-Specifies the name of a sameness group that the intention allows or denies traffic from. Refer to [create sameness groups](/consul/docs/k8s/connect/cluster-peering/usage/create-sameness-groups) for additional information.
-
-#### Values
-
-- Default: None
-- Data type: string
-
 ### `spec.sources[].action`
 
-Specifies the action to take when the source sends traffic to the destination service. The value  is either `allow` or `deny`. Do not configure this field for L7 intentions. Configure the [`spec.sources.permissions`](#spec-sources-permissions) field instead.
+Specifies the action to take when the source sends traffic to the destination service. The value  is either `allow` or `deny`. Do not configure this field for L7 intentions. Configure the [`spec.sources.permissions`](#spec-sources-permissions) field instead. 
 
 #### Values
 
 - Default: None
-- This field is required for L4 intentions.
+- This field is required for L4 intentions. 
 - Data type: String value set to either `allow` or `deny`
 
 ### `spec.sources[].permissions[]`
 
-Specifies a list of permissions for L7 traffic sources. The list contains one or more actions and a set of match criteria for each action.
+Specifies a list of permissions for L7 traffic sources. The list contains one or more actions and a set of match criteria for each action. 
 
-Consul applies permissions in the order specified in the configuration. Starting at the beginning of the list, Consul applies the first matching request and stops evaluating against the remaining configurations.
+Consul applies permissions in the order specified in the configuration. Starting at the beginning of the list, Consul applies the first matching request and stops evaluating against the remaining configurations. 
 
-For requests that do not match any of the defined permissions, Consul applies the intention behavior defined in the [`acl_default_policy`](/consul/docs/agent/config/config-files#acl_default_policy) configuration.
+For requests that do not match any of the defined permissions, Consul applies the intention behavior defined in the [`acl_default_policy`](/consul/docs/agent/config/config-files#acl_default_policy) configuration. 
 
-Do not configure this field for L4 intentions. Use the [`spec.sources.action`](#sources-action) parameter instead.
+Do not configure this field for L4 intentions. Use the [`spec.sources.action`](#sources-action) parameter instead. 
 
 `permissions` configurations only apply to services with a compatible protocol. As a result, they are not supported when the [`spec.destination.name`](#spec-destination-name) or [`spec.destination.namespace`](#spec-destination-namespace) field is configured with a wildcard because service instances or services in a namespace may use different protocols.
 
@@ -886,12 +716,12 @@ Do not configure this field for L4 intentions. Use the [`spec.sources.action`](#
 
 ### `spec.sources[].permissions[].action`
 
-Specifies the action to take when the source sends traffic to the destination service. The value  is either `allow` or `deny`.
+Specifies the action to take when the source sends traffic to the destination service. The value  is either `allow` or `deny`. 
 
 #### Values
 
 - Default: None
-- This field is required.
+- This field is required. 
 - Data type: String value set to either `allow` or `deny`
 
 ### `spec.sources[].permissions[].http`
@@ -902,7 +732,7 @@ Specifies a set of HTTP-specific match criteria. Consul applies the action defin
 
 - Default: None
 - This field is required.
-- Data type: Map
+- Data type: Map 
 
 The following table describes the parameters that the HTTP map may contain:
 
@@ -916,7 +746,7 @@ The following table describes the parameters that the HTTP map may contain:
 
 ### `spec.sources[].permissions[].http[].header`
 
-Specifies a set of criteria for matching HTTP request headers. The request header must match all specified criteria for the permission to apply.
+Specifies a set of criteria for matching HTTP request headers. The request header must match all specified criteria for the permission to apply. 
 
 #### Values
 
@@ -937,7 +767,7 @@ Each member of the `header` list is a map that contains a `name` field and at le
 
 ### `spec.sources[].type`
 
-Specifies the type of destination service that the configuration entry applies to. The only value supported is `consul`.
+Specifies the type of destination service that the configuration entry applies to. The only value supported is `consul`. 
 
 #### Values
 
@@ -946,7 +776,7 @@ Specifies the type of destination service that the configuration entry applies t
 
 ### `spec.sources[].description`
 
-Specifies a description of the intention. Consul presents the description in API responses to assist other tools integrated into the network.
+Specifies a description of the intention. Consul presents the description in API responses to assist other tools integrated into the network. 
 
 #### Values
 
@@ -964,9 +794,9 @@ The following examples demonstrate potential use-cases for the service intention
 
 ### L4 Intentions for specific sources and destinations
 
-The following example configuration entry specifies an L4 intention that denies traffic from `web` to `db` service instances, but allows traffic from `api` to `db`.
+The following example configuration entry specifies an L4 intention that denies traffic from `web` to `db` service instances, but allows traffic from `api` to `db`. 
 
-<CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
+<CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}> 
 
 ```hcl
 Kind = "service-intentions"
@@ -1019,7 +849,7 @@ spec:
 
 ### L4 intentions for all destinations
 
-In the following L4 example, the destination is configured with a `*` wildcard. As a result, traffic from `web` service instances is denied for any service in the datacenter.
+In the following L4 example, the destination is configured with a `*` wildcard. As a result, traffic from `web` service instances is denied for any service in the datacenter. 
 
 <CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
@@ -1064,7 +894,7 @@ spec:
 
 ### L4 intentions for all sources
 
-In the following L4 example, the source is configured with a `*` wildcard. As a result, traffic from any service is denied to `db` service instances.
+In the following L4 example, the source is configured with a `*` wildcard. As a result, traffic from any service is denied to `db` service instances. 
 
 <CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
@@ -1206,7 +1036,7 @@ spec:
 
 ### gRPC
 
-In the following example, Consul denies requests from `frontend-web` to the `IssueRefund` gRPC service.
+In the following example, Consul denies requests from `frontend-web` to the `IssueRefund` gRPC service. 
 Because gRPC method calls use the [HTTP/2 protocol](https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md), you can apply an HTTP path-matching rule to control traffic:
 
 <CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
@@ -1457,111 +1287,3 @@ When using cluster peering connections, intentions secure your deployments with
   ```
 
   </CodeTabs>
-
-### JWT validation with intentions
-
-The following example configures a service intention that evaluates requests when a service named `backend` receives a request from the `frontend` service. When the request is sent to the `/admin` HTTP path, a JSON Web Token provided by Okta is evaluated. In addition to the validation requirements in a separate JWT provider configuration entry, an additional check occurs to confirm that the token has either a `perms` or `role` claim with the `admin` value. If it does, the request is authorized.
-
-Because the intention allows requests that come from the `/` HTTP path, only requests on the `/admin` path are subject to token validation.
-
-<CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
-
-```hcl
-Kind = "service-intentions"
-Name = "backend"
-Sources = [
-  {
-    Name = "frontend"
-    Permissions = [
-      {
-        HTTP = {
-          PathExact = "/admin"
-        }
-        JWT = {
-          Providers = [
-            {
-              Name = "okta"
-              VerifyClaims = [
-                {
-                  Path = ["perms", "role"]
-                  Value = "admin"
-                }
-              ]
-            }
-          ]
-        }
-      },
-      {
-        Action = "allow"
-        HTTP = {
-          PathPrefix = "/"
-        }
-      }
-    ]
-  }
-]
-```
-
-```yaml
-  apiVersion: consul.hashicorp.com/v1alpha1
-  kind: ServiceIntentions
-  metadata:
-    name: backend
-  spec:
-    sources:
-    - name: frontend
-      permissions:
-      - http:
-          pathExact: /admin
-        jwt:
-          providers:
-          - name: okta
-            verifyClaims:
-            - path:
-                - perms
-                - role
-              value: admin
-      action: allow
-      http:
-        pathPrefix: /
-```
-
-```json
-{
-"Kind": "service-intentions",
-"Name": "backend",
-"Sources": [
-  {
-    "Name": "frontend",
-    "Permissions": [
-      {
-        "HTTP": {
-          "PathExact": "/admin"
-        },
-        "JWT": {
-          "Providers": [
-            {
-              "Name": "okta",
-              "VerifyClaims": [
-                {
-                  "Path": ["perms", "role"],
-                  "Value": "admin"
-                }
-              ]
-            }
-          ]
-        }
-      },
-      {
-        "Action": "allow",
-        "HTTP": {
-          "PathPrefix": "/"
-        }
-      }
-    ]
-  }
-]
-}
-```
-
-</CodeTabs>
diff --git a/website/content/docs/connect/config-entries/service-resolver.mdx b/website/content/docs/connect/config-entries/service-resolver.mdx
index 14ac35eb4325c..73f1e5619fd50 100644
--- a/website/content/docs/connect/config-entries/service-resolver.mdx
+++ b/website/content/docs/connect/config-entries/service-resolver.mdx
@@ -1,7 +1,7 @@
 ---
 layout: docs
 page_title: Service Resolver Configuration Entry Reference
-description: >-
+description: >- 
   Service resolver configuration entries are L7 traffic management tools for defining sets of service instances that resolve upstream requests and Consul’s behavior when resolving them. Learn how to write `service-resolver` config entries in HCL or YAML with a specification reference, configuration model, a complete example, and example code by use case.
 ---
 
@@ -9,7 +9,7 @@ description: >-
 
 This page provides reference information for service resolver configuration entries. Configure and apply service resolvers to create named subsets of service instances and define their behavior when satisfying upstream requests.
 
-Refer to [L7 traffic management overview](/consul/docs/connect/manage-traffic) for additional information.
+Refer to [L7 traffic management overview](/consul/docs/connect/l7-traffic) for additional information.
 
 ## Configuration model
 
@@ -35,16 +35,12 @@ The following list outlines field hierarchy, language-specific data types, and r
   - [`ServiceSubset`](#redirect-servicesubset): string
   - [`Namespace`](#redirect-namespace): string <EnterpriseAlert inline />
   - [`Partition`](#redirect-partition): string | `default` <EnterpriseAlert inline />
-  - [`SamenessGroup`](#redirect-samenessgroup): string <EnterpriseAlert inline />
   - [`Datacenter`](#redirect-datacenter): string
   - [`Peer`](#redirect-peer): string
-- [`PrioritizeByLocality`](#prioritizebylocality): map <EnterpriseAlert inline/>
-   - [`Mode`](#prioritizebylocality): string | `failover`
 - [`Failover`](#failover): map
   - [`Service`](#failover-service): string
   - [`ServiceSubset`](#failover-servicesubset): string
   - [`Namespace`](#failover-namespace): string <EnterpriseAlert inline />
-  - [`SamenessGroup`](#failover-samenessgroup): string <EnterpriseAlert inline />
   - [`Datacenters`](#failover-datacenters): list
   - [`Targets`](#failover-targets): list
     - [`Service`](#failover-targets-service): string
@@ -91,16 +87,12 @@ The following list outlines field hierarchy, language-specific data types, and r
     - [`serviceSubset`](#spec-redirect-servicesubset): string
     - [`namespace`](#spec-redirect-namespace): string <EnterpriseAlert inline />
     - [`partition`](#spec-redirect-partition): string <EnterpriseAlert inline />
-    - [`samenessGroup`](#spec-redirect-samenessgroup): string <EnterpriseAlert inline />
     - [`datacenter`](#spec-redirect-datacenter): string
     - [`peer`](#spec-redirect-peer): string
-  - [`prioritizeByLocality`](#spec-prioritizebylocality): map | <EnterpriseAlert inline/>
-    - [`mode`](#spec-prioritizebylocality): string | `failover`
   - [`failover`](#spec-failover): map
     - [`service`](#spec-failover-service): string
     - [`serviceSubset`](#spec-failover-servicesubset): string
     - [`namespace`](#spec-failover-namespace): string <EnterpriseAlert inline />
-    - [`samenessGroup`](#spec-failover-samenessgroup): string <EnterpriseAlert inline />
     - [`datacenters`](#spec-failover-datacenters): string
     - [`targets`](#spec-failover-targets): list
       - [`service`](#spec-failover-targets-service): string
@@ -140,8 +132,8 @@ When every field is defined, a service resolver configuration entry has the foll
 ```hcl
 Kind      = "service-resolver"                                     ## required
 Name      = "<name-of-service-configuration-applies-to>"
-Namespace = "<namespace-configuration-applies-to>"
-Partition = "<partition-configuration-applies-to>"
+Namespace = "<namespace-configuration-applies-to>" 
+Partition = "<partition-configuration-applies-to>" 
 Meta = {
  <key> = "<value>"
 }
@@ -165,16 +157,11 @@ Redirect = {
  ServiceSubset = "<destination-subset>"
  Namespace     = "<destination-namespace>"
  Partition     = "<destination-partition>"
- SamenessGroup = "<destination-sameness-group>"
  Datacenter    = "<destination-datacenter>"
  Peer          = "<destination-peer>"
 }
 
-PrioritizeByLocality = {
-   Mode = "failover"
-}
-
-Failover = {                   ## requires at least one of the following: Service, ServiceSubset, Namespace, Targets, Datacenters, SamenessGroup
+Failover = {                   ## requires at least one of the following: Service, ServiceSubset, Namespace, Targets, Datacenters
  <local-subset-name> = {
    Targets = [
      { Service = "<destination-service>" },
@@ -228,7 +215,7 @@ LoadBalancer = {
   "Kind":"service-resolver",                             // required
   "Name":"<name-of-service-configuration-applies-to>",
   "Namespace":"<namespace-configuration-applies-to>",
-  "Partition":"partition-configuration-applies-to>",
+  "Partition":"parition-configuration-applies-to>", 
   "Meta":{
    "<key>":"<value>"
   },
@@ -246,19 +233,17 @@ LoadBalancer = {
    }
   },
   "DefaultSubset ":"<subset01-name>",
+
   "Redirect":{
    "Service":"<destination-service>",
    "ServiceSubset":"<destination-subset>",
    "Namespace":"<destination-namespace>",
    "Partition":"<destination-partition>",
-   "SamenessGroup":"<destination-sameness-group>",
    "Datacenter":"<destination-datacenter>",
    "Peer":"<destination-peer>"
   },
-  "PrioritizeByLocality" : {
-   "Mode":  "failover"
-},
-  "Failover":{                   // requires at least one of the following": Service, ServiceSubset, Namespace, Targets, Datacenters, SamenessGroup
+
+  "Failover":{                   // requires at least one of the following": Service, ServiceSubset, Namespace, Targets, Datacenters
    "<local=subset-name>":{
      "Targets":[
        {"Service":"<destination-service>"},
@@ -297,7 +282,7 @@ LoadBalancer = {
        },
        "SourceIP":false,                       // cannot specify with Field or FieldValue
        "Terminal":false
-    }
+    } 
    ]
   }
 }
@@ -309,7 +294,7 @@ LoadBalancer = {
 
 ```yaml
 apiVersion: consul.hashicorp.com/v1alpha1         # required
-kind: ServiceResolver                             # required
+kind: ServiceResolver                             # required            
 metadata:
   name: <serviceName>
   namespace: <namespace>
@@ -324,17 +309,14 @@ spec:
       filter: <expression.to.match.on == value02>
       onlyPassing: false
   defaultSubset: <definedSubsetName>
-  redirect:
+  redirect:                                 
     service: <serviceName>
     servicesubset: <subsetName>
     namespace: <namespaceName>
     partition: <partitionName>
-    samenessGroup: <samenessGroupName>
     peer: <peerName>
-  prioritizeByLocality: 
-    mode: failover
-  failover:                         # requires at least one of the following: service, serviceSubset, namespace, targets, datacenters, samenessGroup
-    <localSubsetName>:
+  failover:                         # requires at least one of the following: service, serviceSubset, namespace, targets, datacenters
+    <localSubsetName>: 
       targets:
       - service: <serviceName>
       - serviceSubset: <serviceSubset>
@@ -456,7 +438,7 @@ For additional guidance, refer to the [filter on service version configuration e
 - Data type: Map containing a key-value pair.
   - `<KEY>`: String that names the subset. The string must be valid as a DNS subdomain element.
   - `<VALUE>`: Map that can contain the following parameters:
-
+  
     | Parameter     | Description                                                                                                                                                                                                                                                                                   | Data type | Default |
     | :------------ | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | ------- |
     | `Filter`      | Specifies an expression that filters the DNS elements of service instances that belong to the subset. If empty, all healthy instances of a service are returned. This expression can filter on the same DNS selectors as the [Health API endpoint](/consul/api-docs/health#filtering-2). For more information about creating and using expressions to filter, refer to [filtering](/consul/api-docs/features/filtering).     | String    | None    |
@@ -483,7 +465,6 @@ Specifies redirect instructions for local service traffic so that services deplo
   - [`ServiceSubset`](#redirect-servicesubset)
   - [`Namespace`](#redirect-namespace)
   - [`Partition`](#redirect-partition)
-  - [`SamenessGroup`](#redirect-samenessgroup)
   - [`Datacenter`](#redirect-datacenter)
   - [`Peer`](#redirect-peer)
 
@@ -523,14 +504,6 @@ Specifies the admin partition at the redirect’s destination that resolves loca
 - Default: None
 - Data type: String
 
-### `Redirect{}.SamenessGroup` <EnterpriseAlert inline />
-
-Specifies the sameness group at the redirect’s destination that resolves local upstream requests.
-
-#### Values
-
-- Default: None
-- Data type: String
 
 ### `Redirect{}.Datacenter`
 
@@ -550,24 +523,13 @@ Specifies the cluster with an active cluster peering connection at the redirect
 - Default: None
 - Data type: String
 
-### `PrioritizeByLocality` 
-
-Sets a mode for the service that allows instances to prioritize upstream targets that are in the same geographic area. You can specify the following string values for the `mode` field:
-
-- `Failover`: If the upstream target that a service is connected to becomes unreachable, the service prioritizes a healthy upstream with the same `Locality` configuration. Refer to [Route traffic to local upstreams](/consul/docs/connect/manage-traffic/route-to-local-upstreams) for additional information.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
 ### `Failover`
 
 Specifies controls for rerouting traffic to an alternate pool of service instances if the target service fails.
 
 This parameter is a map, and its key is the name of the local service subset that resolves to another location when it fails. You can specify a `"*"` wildcard to apply failovers to any subset.
 
-`Service`, `ServiceSubset`, `Namespace`, `Targets`, `SamenessGroup`, and `Datacenters` cannot all be empty at the same time.
+`Service`, `ServiceSubset`, `Namespace`, `Targets`, and `Datacenters` cannot all be empty at the same time.
 
 #### Values
 
@@ -576,10 +538,9 @@ This parameter is a map, and its key is the name of the local service subset tha
   - [`Service`](#failover-service)
   - [`ServiceSubset`](#failover-servicesubset)
   - [`Namespace`](#failover-namespace)
-  - [`SamenessGroup`](#failover-samenessgroup)
   - [`Datacenters`](#failover-datacenters)
   - [`Targets`](#failover-targets)
-
+  
 ### `Failover{}.Service`
 
 Specifies the name of the service to resolve at the failover location during a failover scenario.
@@ -607,15 +568,6 @@ Specifies the namespace at the failover location where the failover services are
 - Default: None
 - Data type: String
 
-### `Failover{}.SamenessGroup` <EnterpriseAlert inline />
-
-Specifies the sameness group at the failover location where the failover services are deployed.
-
-#### Values
-
-- Default: None
-- Data type: String
-
 ### `Failover{}.Datacenters`
 
 Specifies an ordered list of datacenters at the failover location to attempt connections to during a failover scenario. When Consul cannot establish a connection with the first datacenter in the list, it proceeds sequentially until establishing a connection with another datacenter.
@@ -728,10 +680,10 @@ Specifies the type of load balancing policy for selecting a host. Supported load
 - Data type: String containing one of the following values:
 
   - `random`
-  - `round_robin`
+  - `round_robin` 
   - `least_request`
-  - `ring_hash`
-  - `maglev`
+  - `ring_hash` 
+  - `maglev`  
 
 ### `LoadBalancer{}.LeastRequestConfig`
 
@@ -741,7 +693,7 @@ Specifies configuration for the `least_request` policy type.
 
 - Default: None
 - Data type: Map containing the following parameter:
-
+  
   | Parameter     | Description                                                                                        | Data type | Default |
   | :------------ | :------------------------------------------------------------------------------------------------- | --------- | ------- |
   | `ChoiceCount` | Specifies the number of random healthy hosts from which to select the one with the least requests. | Integer   | `2`     |
@@ -754,7 +706,7 @@ Specifies configuration for the `ring_hash` policy type.
 
 - Default: None
 - Data type: List that can contain the following parameters:
-
+  
   | Parameter     | Description                                                    | Data type | Default |
   | :------------ | :------------------------------------------------------------- | --------- | ------- |
   | `MinimumRingSize` | Determines the minimum number of entries in the hash ring. | Integer   | `1024`  |
@@ -811,7 +763,7 @@ Specifies additional configuration options for the `cookie` hash policy type. Th
 
 - Default: None
 - Data type: Map that can contain the following parameters:
-
+  
   | Parameter      | Description                                                                       | Data type | Default |
   | :------------- | :-------------------------------------------------------------------------------- | --------- | ------- |
   | `Session`      | Directs Consul to generate a session cookie with no expiration.                   | Boolean   | `false` |
@@ -820,13 +772,13 @@ Specifies additional configuration options for the `cookie` hash policy type. Th
 
 ### `LoadBalancer{}.HashPolicies[].SourceIP`
 
-Determines if the hash type should be source IP address. You cannot specify `SourceIP` if `Field` or `FieldValue` are configured.
+Determines if the hash type should besource IP address. You cannot specify `SourceIP` if `Field` or `FieldValue` are configured.
 
 #### Values
 
 - Default: `false`
 - Data type: Boolean
-
+  
 ### `LoadBalancer{}.HashPolicies[].Terminal`
 
  Determines if Consul should stop computing the hash when multiple hash policies are present. If a hash is computed when a terminal policy is evaluated, then that hash is used and subsequent hash policies are ignored.
@@ -835,14 +787,14 @@ Determines if the hash type should be source IP address. You cannot specify `Sou
 
 - Default: `false`
 - Data type: Boolean
-
+  
 </Tab>
 
 <Tab heading="YAML" group="yaml">
 
 ### `apiVersion`
 
-Specifies the version of the Consul API for integrating with Kubernetes. The value must be `consul.hashicorp.com/v1alpha1`.
+Specifies the version of the Consul API for integrating with Kubernetes. The value must be `consul.hashicorp.com/v1alpha1`. 
 
 #### Values
 
@@ -862,7 +814,7 @@ Specifies the type of configuration entry to implement. Must be set to `ServiceR
 
 ## `metadata`
 
-Map that contains an arbitrary name for the configuration entry and the namespace it applies to.
+Map that contains an arbitrary name for the configuration entry and the namespace it applies to. 
 
 #### Values
 
@@ -955,7 +907,6 @@ Specifies redirect instructions for local service traffic so that services deplo
   - [`serviceSubset`](#spec-redirect-servicesubset)
   - [`namespace`](#spec-redirect-namespace)
   - [`partition`](#spec-redirect-partition)
-  - [`samenessGroup`](#spec-redirect-samenessgroup)
   - [`datacenter`](#spec-redirect-datacenter)
   - [`peer`](#spec-redirect-peer)
 
@@ -995,15 +946,6 @@ Specifies the admin partition at the redirect’s destination that resolves loca
 - Default: None
 - Data type: String
 
-### `spec.redirect.samenessGroup` <EnterpriseAlert inline />
-
-Specifies the sameness group at the redirect’s destination that resolves local upstream requests.
-
-#### Values
-
-- Default: None
-- Data type: String
-
 
 ### `spec.redirect.datacenter`
 
@@ -1023,24 +965,13 @@ Specifies the cluster with an active cluster peering connection at the redirect
 - Default: None
 - Data type: String
 
-### `spec.prioritizeByLocality` 
-
-Sets a mode for the service that allows instances to prioritize upstream targets that are in the same geographic area. You can specify the following string values for the `mode` field:
-
-- `failover`: If the upstream target that a service is connected to becomes unreachable, the service prioritizes a healthy upstream with the same `locality` configuration. Refer to [Route traffic to local upstreams](/consul/docs/connect/manage-traffic/route-to-local-upstreams) for additional information.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
 ### `spec.failover`
 
 Specifies controls for rerouting traffic to an alternate pool of service instances if the target service fails.
 
 This parameter is a map, and its key is the name of the local service subset that resolves to another location when it fails. You can specify a `"*"` wildcard to apply failovers to any subset.
 
-`service`, `serviceSubset`, `namespace`, `targets`, `samenessGroup`, and `datacenters` cannot all be empty at the same time.
+`service`, `serviceSubset`, `namespace`, `targets`, and `datacenters` cannot all be empty at the same time.
 
 #### Values
 
@@ -1049,10 +980,9 @@ This parameter is a map, and its key is the name of the local service subset tha
   - [`service`](#spec-failover-service)
   - [`serviceSubset`](#spec-failover-servicesubset)
   - [`namespace`](#spec-failover-namespace)
-  - [`samenessGroup`](#spec-failover-samenessgroup)
   - [`datacenters`](#spec-failover-datacenters)
   - [`targets`](#spec-failover-targets)
-
+  
 ### `spec.failover.service`
 
 Specifies the name of the service to resolve at the failover location during a failover scenario.
@@ -1080,15 +1010,6 @@ Specifies the namespace at the failover location where the failover services are
 - Default: None
 - Data type: String
 
-### `spec.failover.samenessGroup` <EnterpriseAlert inline />
-
-Specifies the sameness group at the failover location where the failover services are deployed.
-
-#### Values
-
-- Default: None
-- Data type: String
-
 ### `spec.failover.datacenters`
 
 Specifies an ordered list of datacenters at the failover location to attempt connections to during a failover scenario. When Consul cannot establish a connection with the first datacenter in the list, it proceeds sequentially until establishing a connection with another datacenter.
@@ -1200,9 +1121,9 @@ Specifies the type of load balancing policy for selecting a host. Supported load
 - Data type: String containing one of the following values:
 
   - `random`
-  - `round_robin`
+  - `round_robin` 
   - `least_request`
-  - `ring_hash`
+  - `ring_hash` 
   - `maglev`
 
 ### `spec.loadBalancer.leastRequestConfig`
@@ -1213,7 +1134,7 @@ Specifies configuration for the `least_request` policy type.
 
 - Default: None
 - Data type: Map containing the following parameter:
-
+  
   | Parameter     | Description                                                                                        | Data type | Default |
   | :------------ | :------------------------------------------------------------------------------------------------- | --------- | ------- |
   | `choiceCount` | Specifies the number of random healthy hosts from which to select the one with the least requests. | Integer   | `2`     |
@@ -1226,7 +1147,7 @@ Specifies configuration for the `ring_hash` policy type.
 
 - Default: None
 - Data type: List that can contain the following parameters:
-
+  
   | Parameter     | Description                                                    | Data type | Default |
   | :------------ | :------------------------------------------------------------- | --------- | ------- |
   | `minimumRingSize` | Determines the minimum number of entries in the hash ring. | Integer   | `1024`  |
@@ -1250,7 +1171,7 @@ Specifies a list of hash policies to use for hashing load balancing algorithms.
 
  Specifies the attribute type to hash on. You cannot specify the `field` parameter if `sourceIP` is also configured.
 
-Supported attribute types include the following:
+Supported attribute types include the following: 
 
 | Attribute | Description                                                     |
 | :--------- | :-------------------------------------------------------------- |
@@ -1283,7 +1204,7 @@ Specifies additional configuration options for the `cookie` hash policy type. Th
 
 - Default: None
 - Data type: Map that can contain the following parameters:
-
+  
   | Parameter      | Description                                                                       | Data type | Default |
   | :------------- | :-------------------------------------------------------------------------------- | --------- | ------- |
   | `session`      | Directs Consul to generate a session cookie with no expiration.                   | Boolean   | `false` |
@@ -1292,7 +1213,7 @@ Specifies additional configuration options for the `cookie` hash policy type. Th
 
 ### `spec.loadBalancer.hashPolicies[].sourceIP`
 
-Determines if the hash type should be source IP address. You cannot specify `sourceIP` if `field` or `fieldValue` are configured.
+Determines if the hash type should besource IP address. You cannot specify `sourceIP` if `field` or `fieldValue` are configured.
 
 #### Values
 
@@ -1379,7 +1300,7 @@ spec:
 
 ### Resolve virtual upstreams
 
-The following example uses the [`Redirect` parameter](#redirect) to expose a set of services to another datacenter as a virtual service.
+The folowing example uses the [`Redirect` parameter](#redirect) to expose a set of services to another datacenter as a virtual service.
 
 <Tabs>
 <Tab heading="HCL" group="hcl">
diff --git a/website/content/docs/connect/config-entries/service-router.mdx b/website/content/docs/connect/config-entries/service-router.mdx
index 2888bc3a79ec7..4362925f59fbe 100644
--- a/website/content/docs/connect/config-entries/service-router.mdx
+++ b/website/content/docs/connect/config-entries/service-router.mdx
@@ -1,7 +1,7 @@
 ---
 layout: docs
 page_title: Service Router Configuration Entry Reference
-description: >-
+description: >- 
   Service router configuration entries are L7 traffic management tools for redirecting requests for a service to a particular instance or set of instances. Learn how to write `service-router` config entries in HCL or YAML with a specification reference, configuration model, a complete example, and example code by use case.
 ---
 
@@ -9,7 +9,7 @@ description: >-
 
 This page provides reference information for service router configuration entries. Service routers use L7 network information to redirect a traffic request for a service to one or more specific service instances.
 
-Refer to [L7 traffic management overview](/consul/docs/connect/manage-traffic) for additional information.
+Refer to [L7 traffic management overview](/consul/docs/connect/l7-traffic) for additional information.
 
 ## Configuration model
 
@@ -23,7 +23,7 @@ The following list outlines field hierarchy, language-specific data types, and r
 - [`Name`](#name): string | required
 - [`Namespace`](#namespace): string <EnterpriseAlert inline />
 - [`Partition`](#partition): string | `default` <EnterpriseAlert inline />
-- [`Meta`](#meta): map
+- [`Meta`](#meta): map 
 - [`Routes`](#routes): list
   - [`Match`](#routes-match): map
     - [`HTTP`](#routes-match-http): map
@@ -114,7 +114,7 @@ The following list outlines field hierarchy, language-specific data types, and r
         - [`add`](#spec-routes-destination-responseheaders): map
         - [`set`](#spec-routes-destination-responseheaders): map
         - [`remove`](#spec-routes-destination-responseheaders): map
-
+  
 </Tab>
 </Tabs>
 
@@ -169,7 +169,7 @@ Routes = [
         Name   = "<text-to-match-in-query-parameter>"      ## required when specifying Routes.Match.HTTP.Header
         Present = false
         Exact = "<exact-text-to-match-in-query-parameter>"
-        Regex = "<regex-to-match-in-query-parameter>"
+        Regex = "<regex-to-match-in-query-paramater>"
       ]
      }
    },
@@ -181,7 +181,7 @@ Routes = [
        Namespace             = "<namespace-at-destination>"
        Partition             = "<partition-at-destination>"
        PrefixRewrite         = "<new-prefix-after-routing>"   ## required specifying either Routes.Match.HTTP.PathPrefix or Routes.Match.HTTP.PathExact
-       RequestTimeout        = 0
+       RequestTimeout        = 0 
        IdleTimeout           = 0
        NumRetries            = 1
        RetryOnConnectFailure = false
@@ -222,9 +222,9 @@ Routes = [
       "HTTP": {
         "PathExact": "<exact/http/path>"                     // cannot specify with PathPrefix or PathRegex
       },
-      "HTTP": {
+      "HTTP": { 
         "PathPrefix": "<path/prefix>"                        // cannot specify with PathExact or PathRegex
-      },
+      }, 
       "HTTP": {
        "PathRegex": "<regex/path>"                           // cannot specify with PathPrefix or PathExact
       },
@@ -249,7 +249,7 @@ Routes = [
          "Name": "<text-to-match-in-query-parameter>",         // required when specifying Routes.Match.HTTP.Header
          "Present": false,
          "Exact": "<exact-text-to-match-in-query-parameter>",
-         "Regex": "<regex-to-match-in-query-parameter>"
+         "Regex": "<regex-to-match-in-query-paramater>"
        ]
       }
     },
@@ -260,7 +260,7 @@ Routes = [
        "Namespace": "<namespace-at-destination>",
        "Partition": "<partition-at-destination>",
        "PrefixRewrite": "<new-prefix-after-routing>",           // required specifying either Routes.Match.HTTP.PathPrefix or Routes.Match.HTTP.PathExact
-       "RequestTimeout": 0,
+       "RequestTimeout": 0, 
        "IdleTimeout": 0,
        "NumRetries": 1,
        "RetryOnConnectFailure": false,
@@ -288,7 +288,7 @@ Routes = [
 
 ```yaml
 apiVersion: consul.hashicorp.com/v1alpha1                  # required
-kind: ServiceRouter                                        # required
+kind: ServiceRouter                                        # required            
 metadata:
   name: <serviceName>
   namespace: <namespace>
@@ -301,7 +301,7 @@ spec:
          pathPrefix: <path/prefix>                         ## cannot specify with pathExact or pathRegex
        http:
          pathRegex: <regex/path>                           ## cannot specify with pathPrefix or pathExact
-       http:
+       http: 
          methods: [GET, POST, PUT]
        http:
          header:                                           ## do not specify present, exact, prefix, suffix, and regex in a single header
@@ -317,7 +317,7 @@ spec:
           - name: <text-to-match-in-query-parameter>        ## required when specifying spec.routes.match.http.header
             present: false
             exact: <exact-text-to-match-in-query-parameter>
-            regex: <regex-to-match-in-query-parameter>
+            regex: <regex-to-match-in-query-paramater>
 
     destination:
        service: <service-name-at-destination>
@@ -325,7 +325,7 @@ spec:
        namespace: <namespace-at-destination>
        partition: <partition-at-destination>
        prefixRewrite: <new-prefix-after-routing>             ## required specifying either spec.routes.match.http.pathPrefix or spec.routes.match.http.pathExact
-       requestTimeout: 0
+       requestTimeout: 0 
        idleTimeout: 0
        numRetries: 1
        retryOnConnectFailure: false
@@ -351,15 +351,15 @@ This section provides details about the fields you can configure in the service
 
 <Tab heading="HCL" group="hcl">
 
-### `Kind`
+### `Kind` 
 
-Specifies the type of configuration entry to implement.
+Specifies the type of configuration entry to implement. 
 
 #### Values
 
 - Default: none
 - This field is required.
-- Data type: String value that must be set to `service-router`.
+- Data type: String value that must be set to `service-router`. 
 
 ### `Name`
 
@@ -609,7 +609,7 @@ Specifies that a request matches when the query parameter with the given name is
 
 - Default: None
 - Data type: String
-
+  
 ### `Routes[].Match{}.HTTP{}.QueryParam[].Regex`
 
 Specifies that a request matches when the query parameter with the given name matches this regular expression. When using this field, do not configure `Present` or `Exact` in the same map. The syntax for the regular expression field is proxy-specific. When [using Envoy](/consul/docs/connect/proxies/envoy), refer to [the documentation for Envoy v1.11.2 or newer](https://github.com/google/re2/wiki/Syntax) or [the documentation for Envoy v1.11.1 or older](https://en.cppreference.com/w/cpp/regex/ecmascript), depending on the version of Envoy you use.
@@ -646,7 +646,7 @@ Specifies the target service to route matching requests to, as well as behavior
 
 Specifies the name of the service to resolve. If this parameter is not specified, the default service name is inherited from the configuration entry’s [`Name` field](#name).
 
-#### Values
+#### Values 
 
 - Default: None
 - Data type: String
@@ -655,7 +655,7 @@ Specifies the name of the service to resolve. If this parameter is not specified
 
 Specifies a named subset of the given service to resolve instead of the one defined as that service's `DefaultSubset` in the [service resolver configuration entry](/consul/docs/connect/config-entries/service-resolver). If this parameter is not specified, the default subset is used.
 
-#### Values
+#### Values 
 
 - Default: None
 - Data type: String
@@ -664,7 +664,7 @@ Specifies a named subset of the given service to resolve instead of the one defi
 
 Specifies the Consul namespace to resolve the service from instead of the current namespace. If this parameter is not specified, the current namespace is used.
 
-#### Values
+#### Values 
 
 - Default: None
 - Data type: String
@@ -673,7 +673,7 @@ Specifies the Consul namespace to resolve the service from instead of the curren
 
 Specifies the Consul admin partition to resolve the service from instead of the current partition. If this parameter is not specified, the current partition is used.
 
-#### Values
+#### Values 
 
 - Default: None
 - Data type: String
@@ -682,7 +682,7 @@ Specifies the Consul admin partition to resolve the service from instead of the
 
 Specifies rewrites to the HTTP request path before proxying it to its final destination. This field requires that either [`Routes[].Match{}.HTTP{}.PathPrefix`](#routes-match-http-pathprefix) or [`Routes[].Match{}.HTTP{}.PathExact`](#routes-match-http-pathexact) be configured on this route.
 
-#### Values
+#### Values 
 
 - Default: None
 - Data type: String
@@ -691,7 +691,7 @@ Specifies rewrites to the HTTP request path before proxying it to its final dest
 
 Specifies the total amount of time permitted for the entire downstream request to be processed, including retry attempts.
 
-#### Values
+#### Values 
 
 - Default: `0`
 - Data type: Integer
@@ -700,7 +700,7 @@ Specifies the total amount of time permitted for the entire downstream request t
 
 Specifies the total amount of time permitted for the request stream to be idle.
 
-#### Values
+#### Values 
 
 - Default: `0`
 - Data type: Integer
@@ -709,7 +709,7 @@ Specifies the total amount of time permitted for the request stream to be idle.
 
 Specifies the number of times to retry the request when a retry condition occurs. Configure this field and other retry fields in `Destination` to configure the logic for retry attempts. For examples, refer to the [retry logic example configurations](#retry-logic). You cannot set the value to `0`. To disable retries, unset all other retry settings: `RetryOnConnectFailure`, `RetryOn`, `RetryOnStatusCodes`.
 
-#### Values
+#### Values 
 
 - Default: `1`
 - Data type: Integer
@@ -718,7 +718,7 @@ Specifies the number of times to retry the request when a retry condition occurs
 
 Specifies that connection failure errors that trigger a retry request. Configure this field and other retry fields in `Destination` to configure the logic for retry attempts. For examples, refer to the [retry logic example configurations](#retry-logic).
 
-#### Values
+#### Values 
 
 - Default: `false`
 - Data type: Boolean
@@ -766,7 +766,7 @@ The following retry conditions are supported:
 
 Specifies a list of integers for [HTTP response status codes](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status) that trigger a retry request. Configure this field and other retry fields in `Destination` to configure the logic for retry attempts. For examples, refer to the [retry logic example configurations](#retry-logic)
 
-#### Values
+#### Values 
 
 - Default: None
 - Data type: List of integers
@@ -785,10 +785,10 @@ Specifies a set of HTTP-specific header modification rules applied to requests r
 
 The following table describes how to configure values for request headers:
 
-| Rule | Description | Type |
-| ---       | ---         | ---         |
-| `Add` | Defines a set of key-value pairs to add to the header. Use header names as the keys. Header names are not case-sensitive. If header values with the same name already exist, the value is appended and Consul applies both headers. You can [use variable placeholders](#use-variable-placeholders). | map of strings |
-| `Set` | Defines a set of key-value pairs to add to the request header or to replace existing header values with. Use header names as the keys. Header names are not case-sensitive. If header values with the same names already exist, Consul replaces the header values. You can [use variable placeholders](#use-variable-placeholders). | map of strings |
+| Rule | Description | Type |   
+| ---       | ---         | ---         |  
+| `Add` | Defines a set of key-value pairs to add to the header. Use header names as the keys. Header names are not case-sensitive. If header values with the same name already exist, the value is appended and Consul applies both headers. You can [use variable placeholders](#use-variable-placeholders). | map of strings | 
+| `Set` | Defines a set of key-value pairs to add to the request header or to replace existing header values with. Use header names as the keys. Header names are not case-sensitive. If header values with the same names already exist, Consul replaces the header values. You can [use variable placeholders](#use-variable-placeholders). | map of strings | 
 | `Remove` | Defines a list of headers to remove. Consul removes only headers containing exact matches. Header names are not case-sensitive. | list of strings |
 
 #### Use variable placeholders
@@ -797,7 +797,7 @@ For `Add` and `Set`, if the service is configured to use Envoy as the proxy, the
 
 ### `Routes[].Destination{}.ResponseHeaders`
 
-Specifies a set of HTTP-specific header modification rules applied to responses routed with the service router. You cannot configure request headers if the listener protocol is set to `tcp`.
+Specifies a set of HTTP-specific header modification rules applied to responses routed with the service router. You cannot configure request headers if the listener protocol is set to `tcp`. 
 
 #### Values
 
@@ -808,12 +808,12 @@ Specifies a set of HTTP-specific header modification rules applied to responses
   - `Remove`: Map of one or more string key-value pairs.
 
 The following table describes how to configure values for response headers:
-
-| Rule | Description | Type |
-| ---       | ---         | ---         |
-| `Add` | Defines a set of key-value pairs to add to the header. Use header names as the keys. Header names are not case-sensitive. If header values with the same name already exist, the value is appended and Consul applies both headers. You can [use variable placeholders](#use-variable-placeholders). | map of strings |
-| `Set` | Defines a set of key-value pairs to add to the request header or to replace existing header values with. Use header names as the keys. Header names are not case-sensitive. If header values with the same names already exist, Consul replaces the header values. You can [use variable placeholders](#use-variable-placeholders). | map of strings |
-| `Remove` | Defines a list of headers to remove. Consul removes only headers containing exact matches. Header names are not case-sensitive. | list of strings |
+  
+| Rule | Description | Type | 
+| ---       | ---         | ---         |  
+| `Add` | Defines a set of key-value pairs to add to the header. Use header names as the keys. Header names are not case-sensitive. If header values with the same name already exist, the value is appended and Consul applies both headers. You can [use variable placeholders](#use-variable-placeholders). | map of strings | 
+| `Set` | Defines a set of key-value pairs to add to the request header or to replace existing header values with. Use header names as the keys. Header names are not case-sensitive. If header values with the same names already exist, Consul replaces the header values. You can [use variable placeholders](#use-variable-placeholders). | map of strings | 
+| `Remove` | Defines a list of headers to remove. Consul removes only headers containing exact matches. Header names are not case-sensitive. | list of strings | 
 
 #### Use variable placeholders
 
@@ -825,21 +825,21 @@ For `Add` and `Set`, if the service is configured to use Envoy as the proxy, the
 
 ### `apiVersion`
 
-Kubernetes-only parameter that specifies the version of the Consul API that the configuration entry maps to Kubernetes configurations. The value must be `consul.hashicorp.com/v1alpha1`.
+Kubernetes-only parameter that specifies the version of the Consul API that the configuration entry maps to Kubernetes configurations. The value must be `consul.hashicorp.com/v1alpha1`.  
 
-### `kind`
+### `kind` 
 
-Specifies the type of configuration entry to implement.
+Specifies the type of configuration entry to implement. 
 
 #### Values
 
 - Default: None
 - This field is required.
-- Data type: String value that must be set to `ServiceRouter`.
+- Data type: String value that must be set to `ServiceRouter`. 
 
 ### `metadata.name`
 
-Specifies a name for the configuration entry. The name is metadata that you can use to reference the configuration entry when performing Consul operations, such as applying a configuration entry to a specific cluster.
+Specifies a name for the configuration entry. The name is metadata that you can use to reference the configuration entry when performing Consul operations, such as applying a configuration entry to a specific cluster. 
 
 #### Values
 
@@ -861,9 +861,9 @@ Map that contains the details about the `ServiceRouter` configuration entry. The
 
 #### Values
 
-- Default: None
+- Default: None 
 - This field is required.
-- Data type: Object containing [`spec.routes`](#spec-routes) configuration
+- Data type: Object containing [`spec.routes`](#spec-routes) configuration 
 
 ### `spec.meta`
 
@@ -871,10 +871,10 @@ Specifies key-value pairs to add to the KV store.
 
 #### Values
 
-- Default: none
-- Data type: Map of one or more key-value pairs
+- Default: none 
+- Data type: Map of one or more key-value pairs 
   - keys: String
-  - values: String, integer, or float
+  - values: String, integer, or float 
 
 ### `spec.routes`
 
@@ -1085,7 +1085,7 @@ Specifies that a request matches when the query parameter with the given name is
 
 - Default: None
 - Data type: String
-
+  
 ### `spec.routes[].match.http.queryParam[].regex`
 
 Specifies that a request matches when the query parameter with the given name matches this regular expression. When using this field, do not configure `present` or `exact` in the same map. The syntax for the regular expression field is proxy-specific. When [using Envoy](/consul/docs/connect/proxies/envoy), refer to [the documentation for Envoy v1.11.2 or newer](https://github.com/google/re2/wiki/Syntax) or [the documentation for Envoy v1.11.1 or older](https://en.cppreference.com/w/cpp/regex/ecmascript), depending on the version of Envoy you use.
@@ -1122,7 +1122,7 @@ Specifies the target service to route matching requests to, as well as behavior
 
 Specifies the name of the service to resolve. If this parameter is not specified, the default service name is inherited from the configuration entry’s [`metadata.name` field](#metadata-name).
 
-#### Values
+#### Values 
 
 - Default: None
 - Data type: String
@@ -1131,7 +1131,7 @@ Specifies the name of the service to resolve. If this parameter is not specified
 
 Specifies a named subset of the given service to resolve instead of the one defined as that service's `defaultSubset` in the [service resolver configuration entry](/consul/docs/connect/config-entries/service-resolver). If this parameter is not specified, the default subset is used.
 
-#### Values
+#### Values 
 
 - Default: None
 - Data type: String
@@ -1140,7 +1140,7 @@ Specifies a named subset of the given service to resolve instead of the one defi
 
 Specifies the Consul namespace to resolve the service from instead of the current namespace. If this parameter is not specified, the current namespace is used.
 
-#### Values
+#### Values 
 
 - Default: None
 - Data type: String
@@ -1149,7 +1149,7 @@ Specifies the Consul namespace to resolve the service from instead of the curren
 
 Specifies the Consul admin partition to resolve the service from instead of the current partition. If this parameter is not specified, the current partition is used.
 
-#### Values
+#### Values 
 
 - Default: None
 - Data type: String
@@ -1158,7 +1158,7 @@ Specifies the Consul admin partition to resolve the service from instead of the
 
 Specifies rewrites to the HTTP request path before proxying it to its final destination. This field requires that either [`spec.routes[].match.http.pathPrefix`](#spec-routes-match-http-pathprefix) or [`spec.routes[].match.http.pathExact`](#spec-routes-match-http-pathexact) be configured on this route.
 
-#### Values
+#### Values 
 
 - Default: None
 - Data type: String
@@ -1167,7 +1167,7 @@ Specifies rewrites to the HTTP request path before proxying it to its final dest
 
 Specifies the total amount of time permitted for the entire downstream request to be processed, including retry attempts.
 
-#### Values
+#### Values 
 
 - Default: `0`
 - Data type: Integer
@@ -1176,7 +1176,7 @@ Specifies the total amount of time permitted for the entire downstream request t
 
 Specifies the total amount of time permitted for the request stream to be idle.
 
-#### Values
+#### Values 
 
 - Default: `0`
 - Data type: Integer
@@ -1185,7 +1185,7 @@ Specifies the total amount of time permitted for the request stream to be idle.
 
 Specifies the number of times to retry the request when a retry condition occurs. Configure this field and other retry fields in `spec.routes.destination` to configure the logic for retry attempts. For examples, refer to the [retry logic example configurations](#retry-logic). You cannot set the value to `0`. To disable retries, unset all other retry settings: `retryOnConnectFailure`, `retryOn`, `retryOnStatusCodes`.
 
-#### Values
+#### Values 
 
 - Default: `1`
 - Data type: Integer
@@ -1194,7 +1194,7 @@ Specifies the number of times to retry the request when a retry condition occurs
 
 Specifies that connection failure errors that trigger a retry request. Configure this field and other retry fields in `spec.routes[].destination` to configure the logic for retry attempts. For examples, refer to the [retry logic example configurations](#retry-logic).
 
-#### Values
+#### Values 
 
 - Default: `false`
 - Data type: Boolean
@@ -1242,7 +1242,7 @@ The following retry conditions are supported:
 
 Specifies a list of integers for [HTTP response status codes](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status) that trigger a retry request. Configure this field and other retry fields in `spec.routes[].destination` to configure the logic for retry attempts. For examples, refer to the [retry logic example configurations](#retry-logic)
 
-#### Values
+#### Values 
 
 - Default: None
 - Data type: List of integers
@@ -1261,10 +1261,10 @@ Specifies a set of HTTP-specific header modification rules applied to requests r
 
 The following table describes how to configure values for request headers:
 
-| Rule | Description | Type |
-| --- 	    | ---	       | ---         |
-| `add` | Defines a set of key-value pairs to add to the header. Use header names as the keys. Header names are not case-sensitive. If header values with the same name already exist, the value is appended and Consul applies both headers. You can [use variable placeholders](#use-variable-placeholders). | map of strings |
-| `set` | Defines a set of key-value pairs to add to the request header or to replace existing header values with. Use header names as the keys. Header names are not case-sensitive. If header values with the same names already exist, Consul replaces the header values. You can [use variable placeholders](#use-variable-placeholders). | map of strings |
+| Rule | Description | Type |   
+| --- 	    | ---	       | ---         |  
+| `add` | Defines a set of key-value pairs to add to the header. Use header names as the keys. Header names are not case-sensitive. If header values with the same name already exist, the value is appended and Consul applies both headers. You can [use variable placeholders](#use-variable-placeholders). | map of strings | 
+| `set` | Defines a set of key-value pairs to add to the request header or to replace existing header values with. Use header names as the keys. Header names are not case-sensitive. If header values with the same names already exist, Consul replaces the header values. You can [use variable placeholders](#use-variable-placeholders). | map of strings | 
 | `remove` | Defines a list of headers to remove. Consul removes only headers containing exact matches. Header names are not case-sensitive. | list of strings |
 
 #### Use variable placeholders
@@ -1284,12 +1284,12 @@ Specifies a set of HTTP-specific header modification rules applied to responses
   - `remove`: Map of one or more string key-value pairs.
 
 The following table describes how to configure values for response headers:
-
-| Rule | Description | Type |
-| --- 	    | ---	       | ---         |
-| `add` | Defines a set of key-value pairs to add to the header. Use header names as the keys. Header names are not case-sensitive. If header values with the same name already exist, the value is appended and Consul applies both headers. You can [use variable placeholders](#use-variable-placeholders). | map of strings |
-| `set` | Defines a set of key-value pairs to add to the request header or to replace existing header values with. Use header names as the keys. Header names are not case-sensitive. If header values with the same names already exist, Consul replaces the header values. You can [use variable placeholders](#use-variable-placeholders). | map of strings |
-| `remove` | Defines a list of headers to remove. Consul removes only headers containing exact matches. Header names are not case-sensitive. | list of strings |
+  
+| Rule | Description | Type | 
+| --- 	    | ---	       | ---         |  
+| `add` | Defines a set of key-value pairs to add to the header. Use header names as the keys. Header names are not case-sensitive. If header values with the same name already exist, the value is appended and Consul applies both headers. You can [use variable placeholders](#use-variable-placeholders). | map of strings | 
+| `set` | Defines a set of key-value pairs to add to the request header or to replace existing header values with. Use header names as the keys. Header names are not case-sensitive. If header values with the same names already exist, Consul replaces the header values. You can [use variable placeholders](#use-variable-placeholders). | map of strings | 
+| `remove` | Defines a list of headers to remove. Consul removes only headers containing exact matches. Header names are not case-sensitive. | list of strings | 
 
 #### Use variable placeholders
 
@@ -1301,7 +1301,7 @@ For `add` and `set`, if the service is configured to use Envoy as the proxy, the
 
 ## Examples
 
-The following examples demonstrate common service router configuration patterns for specific use cases.
+The following examples demonstrate common service router configuration patterns for specific use cases. 
 
 ### Path prefix matching
 
@@ -1568,7 +1568,7 @@ spec:
 
 The following example configures Consul so that when a request for the `orders` service passes through the service mesh, Consul routes the traffic to the `products` service or the `procurement` service based on the HTTP path that originated the request:
 
-- If it originates from the `/coffees` path, the request routes to the `products` service, times out after 15 seconds, and attempts 5 retries.
+- If it originates from the `/coffees` path, the request routes to the `products` service, times out after 15 seconds, and attempts 5 retries. 
 - If it originates from the `/orders` path, the request routes to the `procurement` services, times out after 10 seconds, and attempts 3 retries.
 
 <Tabs>
@@ -1685,4 +1685,4 @@ spec:
 ```
 
 </Tab>
-</Tabs>
+</Tabs>
\ No newline at end of file
diff --git a/website/content/docs/connect/config-entries/terminating-gateway.mdx b/website/content/docs/connect/config-entries/terminating-gateway.mdx
index 36b1a2dc2073d..04a6869a979f2 100644
--- a/website/content/docs/connect/config-entries/terminating-gateway.mdx
+++ b/website/content/docs/connect/config-entries/terminating-gateway.mdx
@@ -46,7 +46,7 @@ traffic from the mesh to those services will be evenly load-balanced between the
 ### Access an external service
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 
 Link gateway named "us-west-gateway" with the billing service.
 
@@ -144,7 +144,7 @@ spec:
 ### Access an external service over TLS
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 
 Link gateway named "us-west-gateway" with the billing service, and specify a CA
 file to be used for one-way TLS authentication.
@@ -259,7 +259,7 @@ spec:
 ### Access an external service over mutual TLS
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 
 Link gateway named "us-west-gateway" with the billing service, and specify a CA
 file, key file, and cert file to be used for mutual TLS authentication.
@@ -385,7 +385,7 @@ spec:
 ### Override connection parameters for a specific service
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 
 Link gateway named "us-west-gateway" with all services in the datacenter, and configure default certificates for mutual TLS.
 
@@ -611,7 +611,7 @@ spec:
         {
           name: 'namespace',
           description:
-            'If running Consul Community Edition, the namespace is ignored (see [Kubernetes Namespaces in Consul CE](/consul/docs/k8s/crds#consul-ce)). If running Consul Enterprise see [Kubernetes Namespaces in Consul Enterprise](/consul/docs/k8s/crds#consul-enterprise) for more details.',
+            'If running Consul Open Source, the namespace is ignored (see [Kubernetes Namespaces in Consul OSS](/consul/docs/k8s/crds#consul-oss)). If running Consul Enterprise see [Kubernetes Namespaces in Consul Enterprise](/consul/docs/k8s/crds#consul-enterprise) for more details.',
         },
       ],
       hcl: false,
diff --git a/website/content/docs/connect/configuration.mdx b/website/content/docs/connect/configuration.mdx
index dd1e8e156d8ca..a7bc90cbbeb77 100644
--- a/website/content/docs/connect/configuration.mdx
+++ b/website/content/docs/connect/configuration.mdx
@@ -80,7 +80,7 @@ needed for a secure deployment.
 ## Centralized proxy and service configuration
 
 If your network contains many instances of the same service and many colocated sidecar proxies, you can specify global settings for proxies or services in [Configuration Entries](/consul/docs/agent/config-entries). You can override the centralized configurations for individual proxy instances in their
-[sidecar service definitions](/consul/docs/connect/proxies/deploy-sidecar-services),
+[sidecar service definitions](/consul/docs/connect/registration/sidecar-service),
 and the default protocols for service instances in their [service
 definitions](/consul/docs/services/usage/define-services).
 
diff --git a/website/content/docs/connect/connect-internals.mdx b/website/content/docs/connect/connect-internals.mdx
index 99541f012c3b9..73a3cc1e8980a 100644
--- a/website/content/docs/connect/connect-internals.mdx
+++ b/website/content/docs/connect/connect-internals.mdx
@@ -97,7 +97,7 @@ a long period of inactivity (3 days by default), the cache will empty itself.
 
 ## Connections Across Datacenters
 
-A sidecar proxy's [upstream configuration](/consul/docs/connect/proxies/proxy-config-reference#upstream-configuration-reference)
+A sidecar proxy's [upstream configuration](/consul/docs/connect/registration/service-registration#upstream-configuration-reference)
 may specify an alternative datacenter or a prepared query that can address services
 in multiple datacenters (such as the [geo failover](/consul/tutorials/developer-discovery/automate-geo-failover) pattern).
 
diff --git a/website/content/docs/connect/dataplane/consul-dataplane.mdx b/website/content/docs/connect/dataplane/consul-dataplane.mdx
index 4bbc9602a74f6..ab59a5ba60cc5 100644
--- a/website/content/docs/connect/dataplane/consul-dataplane.mdx
+++ b/website/content/docs/connect/dataplane/consul-dataplane.mdx
@@ -15,14 +15,14 @@ Usage: `consul-dataplane [options]`
 
 ### Requirements
 
-Consul Dataplane requires servers running Consul version `v1.14+`. To find a specific version of Consul, refer to [HashiCorp's Official Release Channels](https://www.hashicorp.com/official-release-channels).
+Consul Dataplane requires servers running Consul version `v1.14+`. To find a specific version of Consul, refer to [Hashicorp's Official Release Channels](https://www.hashicorp.com/official-release-channels).
 
 ### Startup
 
 The following options are required when starting `consul-dataplane` with the CLI:
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 
 - `-addresses`
 - `-service-node-name`
@@ -54,8 +54,6 @@ The following options are required when starting `consul-dataplane` with the CLI
 - `-envoy-concurrency` - The number of worker threads that Envoy uses. Default is `2`. Accepted environment variable is `DP_ENVOY_CONCURRENCY`.
 - `-envoy-ready-bind-address` - The address Envoy's readiness probe is available on. Accepted environment variable is `DP_ENVOY_READY_BIND_ADDRESS`.
 - `-envoy-ready-bind-port` - The port Envoy's readiness probe is available on. Accepted environment variable is `DP_ENVOY_READY_BIND_PORT`.
-- `-graceful-port` - The port to serve HTTP endpoints for graceful operations. Accepted environment variable is `DP_GRACEFUL_PORT`.
-- `-graceful-shutdown-path` - The HTTP path to serve the graceful shutdown endpoint. Accepted environment variable is `DP_GRACEFUL_SHUTDOWN_PATH`.
 - `-grpc-port` - The Consul server gRPC port to which `consul-dataplane` connects. Default is `8502`. Accepted environment variable is `DP_CONSUL_GRPC_PORT`.
 - `-log-json` - Enables log messages in JSON format. Default is `false`. Accepted environment variable is `DP_LOG_JSON`.
 - `-log-level` - Log level of the messages to print. Available log levels are `"trace"`, `"debug"`, `"info"`, `"warn"`, and `"error"`. Default is `"info"`. Accepted environment variable is `DP_LOG_LEVEL`.
@@ -73,8 +71,6 @@ The following options are required when starting `consul-dataplane` with the CLI
 - `-service-node-id` - The ID of the Consul node to which the proxy service instance is registered. Accepted environment variable is `DP_SERVICE_NODE_ID`.
 - `-service-node-name` - The name of the Consul node to which the proxy service instance is registered. Accepted environment variable is `DP_SERVICE_NODE_NAME`.
 - `-service-partition` <EnterpriseAlert inline /> - The Consul Enterprise partition in which the proxy service instance is registered. Accepted environment variable is `DP_SERVICE_PARTITION`.
-- `-shutdown-drain-listeners` - Wait for proxy listeners to drain before terminating the proxy container. Accepted environment variable is `DP_SHUTDOWN_DRAIN_LISTENERS`.
-- `-shutdown-grace-period-seconds` - Amount of time to wait after receiving a SIGTERM signal before terminating the proxy. Accepted environment variable is `DP_SHUTDOWN_GRACE_PERIOD_SECONDS`.
 - `-static-token` - The ACL token used to authenticate requests to Consul servers when `-credential-type` is set to `"static"`. Accepted environment variable is `DP_CREDENTIAL_STATIC_TOKEN`.
 - `-telemetry-prom-ca-certs-path` - The path to a file or directory containing CA certificates used to verify the Prometheus server's certificate. Accepted environment variable is `DP_TELEMETRY_PROM_CA_CERTS_PATH`.
 - `-telemetry-prom-cert-file` - The path to the client certificate used to serve Prometheus metrics. Accepted environment variable is `DP_TELEMETRY_PROM_CERT_FILE`.
@@ -139,7 +135,7 @@ A static ACL token is passed to Consul Dataplane.
 Consul Dataplane logs in to one of Consul's supported [auth methods](/consul/docs/security/acl/auth-methods).
 
   <Tabs>
-  <Tab heading="Consul CE">
+  <Tab heading="Consul OSS">
 
   ```shell-session
   $ consul-dataplane -credential-type "login"
diff --git a/website/content/docs/connect/dataplane/index.mdx b/website/content/docs/connect/dataplane/index.mdx
index 9b8f1a7e87874..9c097d79dbbe4 100644
--- a/website/content/docs/connect/dataplane/index.mdx
+++ b/website/content/docs/connect/dataplane/index.mdx
@@ -2,35 +2,28 @@
 layout: docs
 page_title: Simplified Service Mesh with Consul Dataplane
 description: >-
-   Consul Dataplane removes the need to run a client agent for service discovery and service mesh by leveraging orchestrator functions. Learn about Consul Dataplane, how it can lower latency for Consul on Kubernetes and AWS ECS, and how it enables Consul support for AWS Fargate and GKE Autopilot.
+   Consul Dataplane removes the need to a run client agent for service discovery and service mesh by leveraging orchestrator functions. Learn about Consul Dataplane, how it can lower latency for Consul on Kubernetes, and how it enables Consul support for AWS Fargate and GKE Autopilot.
 ---
 
 # Simplified Service Mesh with Consul Dataplane
 
-This topic provides an overview of Consul Dataplane, a lightweight process for managing Envoy proxies. Consul Dataplane removes the need to run client agents on every node in a cluster for service discovery and service mesh. Instead, Consul deploys sidecar proxies that provide lower latency, support additional runtimes, and integrate with cloud infrastructure providers.
-
-## Supported environments
-
-- Dataplanes can connect to Consul servers v1.14.0 and newer. 
-- Dataplanes on Kubernetes requires Consul K8s v1.0.0 and newer.  
-- Dataplanes on AWS Elastic Container Services (ECS) requires Consul ECS v0.7.0 and newer. 
+This topic provides an overview of Consul Dataplane, a lightweight process for managing Envoy proxies introduced in Consul v1.14.0. Consul Dataplane removes the need to run client agents on every node in a cluster for service discovery and service mesh. Instead, Consul deploys sidecar proxies that provide lower latency, support additional runtimes, and integrate with cloud infrastructure providers.
 
+Consul Dataplane requires servers running Consul v1.14.0+ and Consul K8s v1.0.0+.
 
 ## What is Consul Dataplane?
 
-When deployed to virtual machines or bare metal environments, the Consul control plane requires _server agents_ and _client agents_. Server agents maintain the service catalog and service mesh, including its security and consistency, while client agents manage communications between service instances, their sidecar proxies, and the servers. While this model is optimal for applications deployed on virtual machines or bare metal servers, orchestrators such as Kubernetes and ECS have native components that support health checking and service location functions typically provided by the client agent.
-
-Consul Dataplane manages Envoy proxies and leaves responsibility for other functions to the orchestrator. As a result, it removes the need to run client agents on every node. In addition, services no longer need to be reregistered to a local client agent after restarting a service instance, as a client agent’s lack of access to persistent data storage in container-orchestrated deployments is no longer an issue.
+In standard deployments, Consul uses a control plane that contains both _server agents_ and _client agents_. Server agents maintain the service catalog and service mesh, including its security and consistency, while client agents manage communications between service instances, their sidecar proxies, and the servers. While this model is optimal for applications deployed on virtual machines or bare metal servers, orchestrators such as Kubernetes already include components called _kubelets_ that support health checking and service location functions typically provided by the client agent.
 
-The following diagram shows how Consul Dataplanes facilitate service mesh in a Kubernetes-orchestrated environment.
+Consul Dataplane manages Envoy proxies and leaves responsibility for other functions to the orchestrator. As a result, it removes the need to run client agents on every node. In addition, services no longer need to be reregistered to a local client agent after restarting a service instance, as a client agent’s lack of access to persistent data storage in Kubernetes deployments is no longer an issue.
 
 ![Diagram of Consul Dataplanes in Kubernetes deployment](/img/k8s-dataplanes-architecture.png)
 
 ### Impact on performance
 
-Consul Dataplanes replace node-level client agents and function as sidecars attached to each service instance. Dataplanes handle communication between Consul servers and Envoy proxies, using fewer resources than client agents. Consul servers need to consume additional resources in order to generate xDS resources for Envoy proxies.
+The most significant differences between traditional deployments and Consul Dataplane deployments result from the removal of node-level client agents with gossip communication. They are replaced by _dataplanes_, which are the sidecars injected alongside each service instance that handle communication between Consul servers and Envoy proxies. While dataplanes use fewer resources than client agents, Consul servers need to consume additional resources in order to generate xDS resources for Envoy proxies.
 
-As a result, small deployments require fewer overall resources. For especially large deployments or deployments that expect to experience high levels of churn, consider the following impacts to your network's performance:
+As a result, small deployments require fewer resources overall. For deployments that are especially large or expected to experience high levels of churn, consider the following impacts to your network's performance:
 
 1. In our internal tests, which used 5000 proxies and services flapping every 2 seconds, additional CPU utilization remained under 10% on the control plane.
 1. As you deploy more services, the resource usage for dataplanes grows on a linear scale.
@@ -44,7 +37,7 @@ As a result, small deployments require fewer overall resources. For especially l
 
 **Simplified set up**: Because there are no client agents to engage in gossip, you do not have to generate and distribute a gossip encryption key to agents during the initial bootstrapping process. Securing agent communication also becomes simpler, with fewer tokens to track, distribute, and rotate.
 
-**Additional environment and runtime support**: Consul on Kubernetes versions _prior_ to v1.0 (Consul v1.14) require the use of hostPorts and DaemonSets for client agents, which limits Consul’s ability to be deployed in environments where those features are not supported.
+**Additional environment and runtime support**: Consul on Kubernetes versions *prior* to 1.0 (Consul 1.14) require using hostPorts and DaemonSets for client agents, which limits Consul’s ability to be deployed in environments where those features are not supported.
 As of Consul on Kubernetes version 1.0 (Consul 1.14) with the new Consul Dataplane, `hostPorts` are no longer required and Consul now supports AWS Fargate and GKE Autopilot.
 
 **Easier upgrades**: With Consul Dataplane, updating Consul to a new version no longer requires upgrading client agents. Consul Dataplane also has better compatibility across Consul server versions, so the process to upgrade Consul servers becomes easier.
@@ -56,15 +49,9 @@ To get started with Consul Dataplane, use the following reference resources:
 - For `consul-dataplane` commands and usage examples, including required flags for startup, refer to the [`consul-dataplane` CLI reference](/consul/docs/connect/dataplane/consul-dataplane).
 - For Helm chart information, refer to the [Helm Chart reference](/consul/docs/k8s/helm).
 - For Envoy, Consul, and Consul Dataplane version compatibility, refer to the [Envoy compatibility matrix](/consul/docs/connect/proxies/envoy).
-- For Consul on ECS workloads, refer to [Consul on AWS Elastic Container Service (ECS) Overview](/consul/docs/ecs).
-
 
 ### Installation
 
-<Tabs>
-
-<Tab heading="Kubernetes" group="k8s">
-
 To install Consul Dataplane, set `VERSION` to `1.0.0` and then follow the instructions to install a specific version of Consul [with the Helm Chart](/consul/docs/k8s/installation/install#install-consul) or [with the Consul-k8s CLI](/consul/docs/k8s/installation/install-cli#install-a-previous-version).
 
 #### Helm
@@ -80,41 +67,14 @@ $ helm install consul hashicorp/consul --set global.name=consul --version ${VERS
 $ export VERSION=1.0.0 && \
     curl --location "https://releases.hashicorp.com/consul-k8s/${VERSION}/consul-k8s_${VERSION}_darwin_amd64.zip" --output consul-k8s-cli.zip
 ```
-</Tab>
-
-<Tab heading="ECS" group="ecs">
-
-Refer to the following documentation for Consul on ECS workloads:
-
-- [Deploy Consul with the Terraform module](/consul/docs/ecs/deploy/terraform)
-- [Deploy Consul manually](/consul/ecs/install-manul) 
-
-</Tab>
-
-</Tabs>
-
 
 ### Upgrading
 
-<Tabs>
-
-<Tab heading="Kubernetes" group="k8s">
-
 Before you upgrade Consul to a version that uses Consul Dataplane, you must edit your Helm chart so that client agents are removed from your deployments. Refer to [upgrading to Consul Dataplane](/consul/docs/k8s/upgrade#upgrading-to-consul-dataplanes) for more information.
 
-</Tab>
-
-<Tab heading="ECS" group="ecs">
-
-Refer to [Upgrade to dataplane architecture](/consul/docs/ecs/upgrade-to-dataplanes) for instructions.
-
-</Tab>
-
-</Tabs>
-
 ## Feature support
 
-Consul Dataplane on Kubernetes supports the following features:
+Consul Dataplane supports the following features:
 
 - Single and multi-cluster installations, including those with WAN federation, cluster peering, and admin partitions are supported.
 - Ingress, terminating, and mesh gateways are supported.
@@ -122,17 +82,10 @@ Consul Dataplane on Kubernetes supports the following features:
 - xDS load balancing is supported.
 - Servers running in Kubernetes and servers external to Kubernetes are both supported.
 - HCP Consul is supported.
-- Consul API Gateway
-
-Consul Dataplane on ECS support the following features:
-
-- Single and multi-cluster installations, including those with WAN federation, cluster peering, and admin partitions
-- Mesh gateways
-- Running Consul service mesh in AWS Fargate and EC2
-- xDS load balancing
-- Self-managed and HCP Consul managed servers
+- Consul API Gateway is supported.
 
 ### Technical Constraints
 
-- Consul Dataplane is not supported on Windows.
+Be aware of the following limitations and recommendations for Consul Dataplane:
 
+- Consul Dataplane is not supported on Windows.
diff --git a/website/content/docs/connect/distributed-tracing.mdx b/website/content/docs/connect/distributed-tracing.mdx
index ffe5ef033bb6f..363cded6f7ad4 100644
--- a/website/content/docs/connect/distributed-tracing.mdx
+++ b/website/content/docs/connect/distributed-tracing.mdx
@@ -145,9 +145,9 @@ spec:
 
 </CodeTabs>
 
--> **NOTE:** This example uses a [proxy defaults](/consul/docs/connect/config-entries/proxy-defaults) configuration entry, which applies to all proxies,
-but you can also apply the configuration in the
-[`proxy` block of your service configuration](/consul/docs/connect/proxies/proxy-config-reference#proxy-parameters). The proxy service registration is not supported on Kubernetes.
+-> **NOTE:** This example uses a [proxy defaults](/consul/docs/connect/config-entries/proxy-defaults) config entry which will apply to all proxies
+but you can also apply this config in the
+[proxy service registration](/consul/docs/connect/registration/service-registration#proxy-parameters) (not supported on Kubernetes).
 
 Within the config there are two keys you need to customize:
 
diff --git a/website/content/docs/connect/gateways/api-gateway/configuration/api-gateway.mdx b/website/content/docs/connect/gateways/api-gateway/configuration/api-gateway.mdx
new file mode 100644
index 0000000000000..11ad78f2d276f
--- /dev/null
+++ b/website/content/docs/connect/gateways/api-gateway/configuration/api-gateway.mdx
@@ -0,0 +1,331 @@
+---
+layout: docs
+page_title: API Gateway Configuration Entry Reference
+description: Learn how to configure a Consul API Gateway on VMs.
+---
+
+# API gateway configuration entry reference
+
+This topic provides reference information for the API gateway configuration entry that you can deploy to networks in virtual machine (VM) environments. For reference information about configuring Consul API gateways on Kubernetes, refer to [Gateway Resource Configuration](/consul/docs/api-gateway/configuration/gateway).
+
+## Introduction
+
+A gateway is a type of network infrastructure that determines how service traffic should be handled. Gateways contain one or more listeners that bind to a set of hosts and ports. An HTTP Route or TCP Route can then attach to a gateway listener to direct traffic from the gateway to a service.
+
+## Configuration model
+
+The following list outlines field hierarchy, language-specific data types, and requirements in an `api-gateway` configuration entry. Click on a property name to view additional details, including default values.
+
+- [`Kind`](#kind): string | must be `"api-gateway"`
+- [`Name`](#name): string | no default
+- [`Namespace`](#namespace): string | no default <EnterpriseAlert inline />
+- [`Partition`](#partition): string | no default <EnterpriseAlert inline />
+- [`Meta`](#meta): map | no default
+- [`Listeners`](#listeners): list of objects | no default
+  - [`Name`](#listeners-name): string | no default
+  - [`Port`](#listeners-port): number | no default
+  - [`Hostname`](#listeners-hostname): string | `"*"`
+  - [`Protocol`](#listeners-protocol): string | `"tcp"`
+  - [`TLS`](#listeners-tls): map | none
+    - [`MinVersion`](#listeners-tls-minversion): string | no default
+    - [`MaxVersion`](#listeners-tls-maxversion): string | no default
+    - [`CipherSuites`](#listeners-tls-ciphersuites): list of strings | Envoy default cipher suites
+    - [`Certificates`](#listeners-tls-certificates): list of objects | no default
+      - [`Kind`](#listeners-tls-certificates-kind): string | must be `"inline-certificate"`
+      - [`Name`](#listeners-tls-certificates-name): string | no default
+      - [`Namespace`](#listeners-tls-certificates-namespace): string | no default <EnterpriseAlert inline />
+      - [`Partition`](#listeners-tls-certificates-partition): string | no default <EnterpriseAlert inline />
+
+## Complete configuration
+
+When every field is defined, an `api-gateway` configuration entry has the following form:
+
+<CodeTabs>
+
+```hcl
+Kind = "api-gateway"
+Name = "<name of api gateway>"
+Namespace = "<enterprise: namespace of the gateway>"
+Partition = "<enterprise: partition of the gateway>"
+
+Meta = {
+  <any key> = "<any value>"
+}
+
+Listeners = [
+  {
+    Port = <external service port>
+    Name = "<unique name for this listener>"
+    Protocol = "<protocol used by external service>"
+    TLS = {
+      MaxVersion = "<version of TLS>"
+      MinVersion = "<version of TLS>"
+      CipherSuites = [
+        "<cipher suite>"
+      ]
+      Certificates = [
+        {
+          Kind = "inline-certificate"
+          Name = "<name of inline-certificate>"
+          Namespace = "<enterprise: namespace of the certificate>"
+          Partition = "<enterprise: partition of the certificate>"
+        }
+      ]
+    }
+  }
+]
+```
+
+```json
+{
+  "Kind": "api-gateway",
+  "Name": "<name of api gateway>",
+  "Namespace": "<enterprise: namespace of the gateway>",
+  "Partition": "<enterprise: partition of the gateway>",
+  "Meta": {
+    "<any key>": "<any value>"
+  },
+  "Listeners": [
+    {
+      "Name": "<unique name for this listener>",
+      "Port": <external service port>,
+      "Protocol": "<protocol used by external service>",
+      "TLS": {
+        "MaxVersion": "<version of TLS>",
+        "MinVersion": "<version of TLS>",
+        "CipherSuites": [
+          "<cipher suite>"
+        ],
+        "Certificates": [
+          {
+            "Kind": "inline-certificate",
+            "Name": "<name of inline-certificate>",
+            "Namespace": "<enterprise: namespace of the certificate>",
+            "Partition": "<enterprise: partition of the certificate>"
+          }
+        ]
+      }
+    }
+  ]
+}
+```
+
+</CodeTabs>
+
+## Specification
+
+This section provides details about the fields you can configure in the
+`api-gateway` configuration entry.
+
+### `Kind`
+
+Specifies the type of configuration entry to implement. This must be
+`api-gateway`.
+
+#### Values
+
+- Default: none
+- This field is required.
+- Data type: string value that must be set to `"api-gateway"`.
+
+### `Name`
+
+Specifies a name for the configuration entry. The name is metadata that you can
+use to reference the configuration entry when performing Consul operations,
+such as applying a configuration entry to a specific cluster.
+
+#### Values
+
+- Default: none
+- This field is required.
+- Data type: string
+
+### `Namespace` <EnterpriseAlert inline />
+
+Specifies the Enterprise [namespace](/consul/docs/enterprise/namespaces) to apply to the configuration entry.
+
+#### Values
+
+- Default: `"default"` in Enterprise
+- Data type: string
+
+### `Partition` <EnterpriseAlert inline />
+
+Specifies the Enterprise [admin partition](/consul/docs/enterprise/admin-partitions) to apply to the configuration entry.
+
+#### Values
+
+- Default: `"default"` in Enterprise
+- Data type: string
+
+### `Meta`
+
+Specifies an arbitrary set of key-value pairs to associate with the gateway.
+
+#### Values
+
+- Default: none
+- Data type: map containing one or more keys and string values.
+
+### `Listeners[]`
+
+Specifies a list of listeners that gateway should set up. Listeners are
+uniquely identified by their port number.
+
+#### Values
+
+- Default: none
+- This field is required.
+- Data type: List of maps. Each member of the list contains the following fields:
+  - [`Name`](#listeners-name)
+  - [`Port`](#listeners-port)
+  - [`Hostname`](#listeners-hostname)
+  - [`Protocol`](#listeners-protocol)
+  - [`TLS`](#listeners-tls)
+
+### `Listeners[].Name`
+
+Specifies the unique name for the listener. This field accepts letters, numbers, and hyphens.
+
+#### Values
+
+- Default: none
+- This field is required.
+- Data type: string
+
+### `Listeners[].Port`
+
+Specifies the port number that the listener receives traffic on.
+
+#### Values
+
+- Default: `0`
+- This field is required.
+- Data type: integer
+
+### `Listeners[].Hostname`
+
+Specifies the hostname that the listener receives traffic on.
+
+#### Values
+
+- Default: `"*"`
+- This field is optional.
+- Data type: string
+
+### `Listeners[].Protocol`
+
+Specifies the protocol associated with the listener.
+
+#### Values
+
+- Default: none
+- This field is required.
+- The data type is one of the following string values: `"tcp"` or `"http"`.
+
+### `Listeners[].TLS`
+
+Specifies the TLS configurations for the listener.
+
+#### Values
+
+- Default: none
+- Map that contains the following fields:
+  - [`MaxVersion`](#listeners-tls-maxversion)
+  - [`MinVersion`](#listeners-tls-minversion)
+  - [`CipherSuites`](#listeners-tls-ciphersuites)
+  - [`Certificates`](#listeners-tls-certificates)
+
+### `Listeners[].TLS.MaxVersion`
+
+Specifies the maximum TLS version supported for the listener.
+
+#### Values
+
+- Default depends on the version of Envoy:
+  - Envoy 1.22.0 and later default to `TLSv1_2`
+  - Older versions of Envoy default to `TLSv1_0`
+- Data type is one of the following string values:
+  - `TLS_AUTO`
+  - `TLSv1_0`
+  - `TLSv1_1`
+  - `TLSv1_2`
+  - `TLSv1_3`
+
+### `Listeners[].TLS.MinVersion`
+
+Specifies the minimum TLS version supported for the listener.
+
+#### Values
+
+- Default: none
+- Data type is one of the following string values:
+  - `TLS_AUTO`
+  - `TLSv1_0`
+  - `TLSv1_1`
+  - `TLSv1_2`
+  - `TLSv1_3`
+
+### `Listeners[].TLS.CipherSuites[]`
+
+Specifies a list of cipher suites that the listener supports when negotiating connections using TLS 1.2 or older.
+
+#### Values
+
+- Defaults to the ciphers supported by the version of Envoy in use. Refer to the
+  [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/transport_sockets/tls/v3/common.proto#envoy-v3-api-field-extensions-transport-sockets-tls-v3-tlsparameters-cipher-suites)
+  for details.
+- Data type: List of string values. Refer to the
+  [Consul repository](https://github.com/hashicorp/consul/blob/v1.11.2/types/tls.go#L154-L169)
+  for a list of supported ciphers.
+
+### `Listeners[].TLS.Certificates[]`
+
+The list of references to inline certificates that the listener uses for TLS termination.
+
+#### Values
+
+- Default: None
+- Data type: List of maps. Each member of the list has the following fields:
+  - [`Kind`](#listeners-tls-certificates-kind)
+  - [`Name`](#listeners-tls-certificates-name)
+  - [`Namespace`](#listeners-tls-certificates-namespace) <EnterpriseAlert inline />
+  - [`Partition`](#listeners-tls-certificates-partition) <EnterpriseAlert inline />
+
+### `Listeners[].TLS.Certificates[].Kind`
+
+The list of references to inline-certificates that the listener uses for TLS termination.
+
+#### Values
+
+- Default: None
+- This field is required and must be set to `"inline-certificate"`.
+- Data type: string
+
+### `Listeners[].TLS.Certificates[].Name`
+
+The list of references to inline certificates that the listener uses for TLS termination.
+
+#### Values
+
+- Default: None
+- This field is required.
+- Data type: string
+
+### `Listeners[].TLS.Certificates[].Namespace` <EnterpriseAlert inline />
+
+Specifies the Enterprise [namespace](/consul/docs/enterprise/namespaces) where the certificate can be found.
+
+#### Values
+
+- Default: `"default"` in Enterprise
+- Data type: string
+
+### `Listeners[].TLS.Certificates[].Partition` <EnterpriseAlert inline />
+
+Specifies the Enterprise [admin partition](/consul/docs/enterprise/admin-partitions) where the certificate can be found.
+
+#### Values
+
+- Default: `"default"` in Enterprise
+- Data type: string
diff --git a/website/content/docs/connect/gateways/api-gateway/configuration/gatewaypolicy.mdx b/website/content/docs/connect/gateways/api-gateway/configuration/gatewaypolicy.mdx
deleted file mode 100644
index dc638fbf7208f..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/configuration/gatewaypolicy.mdx
+++ /dev/null
@@ -1,259 +0,0 @@
----
-layout: docs
-page_title: GatewayPolicy configuration reference
-description: Learn about the configuration options for the GatewayPolicy configuration resource. GatewayPolicy resources define API gateway polcies for Consul service mesh on Kubernetes.
----
-
-# GatewayPolicy
-
-This topic provides reference information for the API gateway policy resource. These resources define policies for listeners on API gateways deployed to Kubernetes-orchestrated networks.
-
-## Configuration model
-
-The following list outlines field hierarchy, data types, and requirements in a gateway policy resource. Click on a property name to view additional details, including default values.
-
-- [`apiVersion`](#apiversion): string | required | must be set to `consul.hashicorp.com/v1alpha1`
-- [`kind`](#kind): string | required | must be set to `GatewayPolicy`
-- [`metadata`](#metadata): map | required
-   - [`name`](#metadata-name): string | required 
-   - [`namespace`](#metadata-namespace): string  | `default`
-- [`spec`](#spec): map | required
-   - [`targetRef`](#spec-targetref): map | required
-      - [`namespace`](#spec-targetref): string | `default` 
-      - [`name`](#spec-targetref): string | required 
-      - [`kind`](#spec-targetref): string | required | must be set to `Gateway`
-      - [`group`](#spec-targetref): string | required 
-      - [`sectionName`](#spec-targetref): string 
-   - [`override`](#spec-override): map | required 
-      - [`jwt`](#spec-override-jwt): map | required 
-         - [`providers`](#spec-override-providers): list | required 
-            - [`name`](#spec-override-providers): string | required 
-            - [`verifyClaims`](#spec-override-providers): map | required 
-               - [`path`](#spec-override-providers): list of strings | required 
-               - [`value`](#spec-override-providers): string | required 
-   - [`default`](#spec-default): map | required 
-      - [`jwt`](#spec-default-jwt): map | required 
-         - [`providers`](#spec-default-providers): list | required 
-            - [`name`](#spec-default-providers): string | required 
-            - [`verifyClaims`](#spec-default-providers): map | required 
-               - [`path`](#spec-default-providers): list of strings | required 
-               - [`value`](#spec-default-providers): string | required 
-
-## Complete configuration
-
-When every field is defined, a gateway policy has the following form: 
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: GatewayPolicy
-metadata:
-   name: <name for the policy>
-   namespace: <Consul namespace the policy applies to>
-spec:
-  targetRef:
-    name: gateway
-    kind: Gateway
-    group: gateway.networking.kuberenetes.io
-    sectionName: <name of a specific listener the policy applies>
-  override:
-    jwt:
-      providers:
-      - name: "<name of the provider all listeners verify against>"
-        verifyClaims:
-        - path:
-          - "aud"
-          value: "api.apps.organization.com"
-  default:
-    jwt:
-      providers:
-      - name: "<name of the JWT provider to verify against>"
-        verifyClaims:
-        - path:
-          - "roles"
-          - "perm"
-          value: "user"
-```
-
-## Specification
-
-This section provides details about the fields you can configure in the gateway policy resource.
-
-### `apiVersion`
-
-Specifies the version of the Consul API for integrating with Kubernetes. The value must be `consul.hashicorp.com/v1alpha1`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- String value that must be set to `consul.hashicorp.com/v1alpha1`.
-
-### `kind`
-
-Specifies the type of configuration entry to implement. Must be set to `GatewayPolicy`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String value that must be set to `GatewayPolicy`.
-
-### `metadata`
-
-Map that contains an arbitrary name for the resource and the namespace it applies to.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `metadata.name`
-
-Specifies a name for the resource. The name is metadata that you can use to reference the resource when performing Consul operations, such as applying the resource to a specific cluster. 
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String
-
-### `metadata.namespace` 
-
-Specifies the namespace that the configuration applies to. Refer to [namespaces](/consul/docs/enterprise/namespaces) for more information.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `spec`
-
-Map that contains the details about the gateway policy. The `apiVersion`, `kind`, and `metadata` fields are siblings of the `spec` field. All other configurations are children.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-### `targetRef`
-
-Map that contains references to the gateway that the policy applies to. 
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-The following table describes the members of the `targetRef` map:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `namespace` | Specifies the namespace that the target reference is a member of. | String | `default` |
-| `name` | Specifies the name of the API gateway that the policy attaches to. | String | None |
-| `kind` | Specifies the type of resource that the policy attaches to. Must be set to `Gateway`. | String | None |
-| `group` | Specifies the resource group. Must be set to `gateway.networking.kuberenetes.io`. | String | None |
-| `sectionName` | Specifies a part of the gateway that the policy applies to. | String | None |
-
-### `spec.override`
-
-Map that contains configurations to apply to the listener when the policy is attached to the gateway. The override settings have precedence over the [`spec.default` configurations](#spec-default).
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `spec.override.jwt`
-
-Map that contains JWT verification configurations to apply to listeners when the policy is attached to the gateway. The override settings have precedence over the [`default` configurations](#listeners-default) as well as any route-specific JWT configurations defined in [`RouteAuthFilter` configurations](/consul/docs/connect/gateways/api-gateway/configuration/routeauthfilter).
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `spec.override.jwt.providers`
-
-Specifies a list of JWT provider configurations to apply to listeners when the policy is attached to the gateway listener. A provider configuration contains the name of the provider and claims. The override settings have precedence over defaults as well as any listener specific configuration. Refer to [Use JWTs to verify requests to API gateways on Kubernetes](/consul/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-k8s) for additional information.
-
-#### Values
-
-- Default: None
-- Data type: List of maps
-
-The following table describes the parameters you can specify in a member of the `Providers` list:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `name` | Specifies the name of the provider. | String | None |
-| `verifyClaims` | Specifies a list of paths and a value that define the claim. Consul verifies requests that match the claims declared in the listener JWT configuration and allow the request through the gateway. The `VerifyClaims` map specifies the following settings: <ul><li>`path`: Specifies a list of one or more registered or custom claims.</li><li>`value`: Specifies the expected value of the claim.</li></ul>  | Map | None |
-
-### `spec.default`
-
-Map that contains default configurations to apply to listeners when the policy is attached to the gateway. All routes attached to the gateway listener inherit the default configurations. You can specify override configurations that have precedence over default configurations. Refer to [`spec.override`](#spec-override) for details.  
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `spec.default.jwt`
-
-Specifies default JWT configurations to apply to listeners when the policy is attached to the gateway. Specify configurations that have precedence over the defaults in either the [`spec.override.JWT` block](#spec-override-jwt) or in an [`RouteAuthFilter`](/consul/docs/connect/gateways/api-gateway/configuration/routeauthfilter) attached to an  HTTP route. Refer to [Use JWTs to verify requests to API gateways](/consul/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-k8s) for order of precedence and other details about using JWT verification in API gateways.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `spec.default.jwt.providers`
-
-Specifies default JWT provider configurations to apply to the listener when the policy is attached to the gateway. A provider configuration contains the name of the provider and claims. Specify configurations that have precedence over the defaults in either the [`spec.override.JWT.providers` block](#spec-override-jwt) or in an [`RouteAuthFilter`](/consul/docs/connect/gateways/api-gateway/configuration/routeauthfilter) attached to an  HTTP route configuration. Refer to [Use JWTs to verify requests to API gateways](/consul/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-k8s) for order of precedence and other details about using JWT verification in API gateways.
-
-#### Values
-
-- Default: None
-- Data type: List of maps
-
-The following table describes the parameters you can specify in a member of the `Providers` list:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `name` | Specifies the name of the provider. | String | None |
-| `verifyClaims` | Specifies a list of paths and a value that define the claim. Consul verifies requests that match the claims declared in the listener JWT configuration and allow the request through the gateway. The `VerifyClaims` map specifies the following settings: <ul><li>`path`: Specifies a list of one or more registered or custom claims.</li><li>`value`: Specifies the expected value of the claim.</li></ul>  | Map | None |
-
-## Example configuration
-
-In the following example, all requests through the gateway must have the `api.apps.organization.com` audience claim. Additionally, requests through the gateway must have a `user` role by default. 
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: GatewayPolicy
-metadata:
-  name: my-policy
-spec:
-  targetRef:
-    name: gateway
-    kind: Gateway
-    group: gateway.networking.kuberenetes.io
-    sectionName: to-server
-  override:
-    jwt:
-      providers:
-      - name: "okta"
-        verifyClaims:
-        - path:
-          - "aud"
-          value: "api.apps.organization.com"
-  default:
-    jwt:
-      providers:
-      - name: "okta"
-        verifyClaims:
-        - path:
-          - "roles"
-          - "perm"
-          value: "user"
-```
\ No newline at end of file
diff --git a/website/content/docs/connect/gateways/api-gateway/configuration/http-route.mdx b/website/content/docs/connect/gateways/api-gateway/configuration/http-route.mdx
new file mode 100644
index 0000000000000..997e2bbf692e4
--- /dev/null
+++ b/website/content/docs/connect/gateways/api-gateway/configuration/http-route.mdx
@@ -0,0 +1,679 @@
+---
+layout: docs
+page_title: HTTP Route Configuration
+description: Learn how to configure an HTTP Route bound to an API Gateway on VMs.
+---
+
+# HTTP route configuration reference
+
+This topic provides reference information for the gateway routes configuration entry. Refer to [Route Resource Configuration](/consul/docs/api-gateway/configuration/routes) for information about configuring API gateway routes in Kubernetes environments.
+
+## Configuration model
+
+The following list outlines field hierarchy, language-specific data types, and
+requirements in an `http-route` configuration entry. Click on a property name
+to view additional details, including default values.
+
+- [`Kind`](#kind): string | must be `http-route`
+- [`Name`](#name): string | no default
+- [`Namespace`](#namespace): string | no default <EnterpriseAlert inline />
+- [`Partition`](#partition): string | no default <EnterpriseAlert inline />
+- [`Meta`](#meta): map | no default
+- [`Hostnames`](#hostnames): list | no default
+- [`Parents`](#parents): list | no default
+  - [`Kind`](#parents-kind): string | must be `api-gateway`
+  - [`Name`](#parents-name): string | no default
+  - [`Namespace`](#parents-namespace): string | no default <EnterpriseAlert inline />
+  - [`Partition`](#parents-partition): string | no default <EnterpriseAlert inline />
+  - [`SectionName`](#parents-sectionname): string | no default
+- [`Rules`](#rules): list | no default
+  - [`Filters`](#rules-filters): map | no default
+    - [`Headers`](#rules-filters-headers): list | no default
+      - [`Add`](#rules-filters-headers-add): map | no default
+      - [`Remove`](#rules-filters-headers-remove): list | no default
+      - [`Set`](#rules-filters-headers-set): map | no default
+    - [`URLRewrite`](#rules-filters-urlrewrite): map | no default
+      - [`Path`](#rules-filters-urlrewrite-path): string | no default
+  - [`Matches`](#rules-matches): list | no default
+    - [`Headers`](#rules-matches-headers): list | no default
+      - [`Match`](#rules-matches-headers-match): string | no default
+      - [`Name`](#rules-matches-headers-name): string | no default
+      - [`Value`](#rules-matches-headers-value): string | no default
+    - [`Method`](#rules-matches-method): string | no default
+    - [`Path`](#rules-matches-path): map | no default
+      - [`Match`](#rules-matches-path-match): string | no default
+      - [`Value`](#rules-matches-path-value): string | no default
+    - [`Query`](#rules-matches-query): list | no default
+      - [`Match`](#rules-matches-query-match): string | no default
+      - [`Name`](#rules-matches-query-name): string | no default
+      - [`Value`](#rules-matches-query-value): string | no default
+  - [`Services`](#rules-services): list | no default
+    - [`Name`](#rules-services-name): string | no default
+    - [`Namespace`](#rules-services-namespace): string <EnterpriseAlert inline />
+    - [`Partition`](#rules-services-partition): string <EnterpriseAlert inline />
+    - [`Weight`](#rules-services-weight): number | `1`
+    - [`Filters`](#rules-services-filters): map | no default
+      - [`Headers`](#rules-services-filters-headers): list | no default
+        - [`Add`](#rules-services-filters-headers-add): map | no default
+        - [`Remove`](#rules-services-filters-headers-remove): list | no default
+        - [`Set`](#rules-services-filters-headers-set): map | no default
+      - [`URLRewrite`](#rules-services-filters-urlrewrite): map | no default
+        - [`Path`](#rules-services-filters-urlrewrite-path): string | no default
+
+## Complete configuration
+
+When every field is defined, an `http-route` configuration entry has the following form:
+
+<CodeTabs>
+
+```hcl
+Kind = "http-route"
+Name = "<name of the route>"
+Namespace = "<enterprise: namespace of the service>"
+Partition = "<enterprise: partition of the service>"
+Meta = {
+  "<any key>" = "<any value>"
+}
+Hostnames = ["<hostnames for which this HTTPRoute should respond to requests>"]
+
+Parents = [
+  {
+    Kind        = "api-gateway"
+    Name        = "<name of the api-gateway to bind to>"
+    Namespace = "<enterprise: namespace of the service>"
+    Partition = "<enterprise: partition of the service>"
+    SectionName = "<optional name of a specific listener on the api-gateway to bind to>"
+  }
+]
+
+Rules = [
+  {
+    Filters = {
+      Headers = [
+        {
+          Add = {
+            "<name of header to add>" = "<value of header to add>"
+          }
+          Remove = [
+            "<name of header to remove from request>"
+          ]
+          Set = {
+            "<name of header to set>" = "<value of header to set>"
+          }
+        }
+      ]
+      URLRewrite = {
+        Path = "<path to rewrite request to>"
+      }
+    }
+    Matches = [
+      {
+        Headers = [
+          {
+            Match = "<type of match: exact, prefix or regex>"
+            Name = "<name of header to match on>"
+            Value = "<value of header to match on>"
+          }
+        ]
+        Method = "<method type to match on>"
+        Path = {
+          Match = "<type of match: exact, prefix or regex>"
+          Value = "<value to match on>"
+        }
+        Query = [
+          {
+            Match = "<type of match: exact, present or regex>"
+            Name = "<name of query parameter to match on>"
+            Value = "<value of query parameter to match on>"
+          }
+        ]
+      }
+    ]
+    Services = [
+      {
+        Name   = "<name of Consul service to route to>"
+        Namespace = "<enterprise: namespace of the service>"
+        Partition = "<enterprise: partition of the service>"
+        Weight = "<number proportional to other weights>"
+        Filters = {
+          Headers = [
+            {
+              Add = {
+                "<name of header to add>" = "<value of header to add>"
+              }
+              Remove = [
+                "<name of header to remove from request>"
+              ]
+              Set = {
+                "<name of header to set>" = "<value of header to set>"
+              }
+            }
+          ]
+          URLRewrite = {
+            Path = "<path to rewrite request to>"
+          }
+        }
+      }
+    ]
+  }
+]
+
+```
+
+```json
+{
+  "Kind": "http-route",
+  "Name": "<name of the route>",
+  "Namespace": "<enterprise: namespace of the route>",
+  "Partition": "<enterprise: partition of the route>",
+  "Meta": {
+    "<any key>": "<any value>"
+  },
+  "Hostnames": [
+    "<hostnames for which this HTTPRoute should respond to requests>"
+  ],
+  "Parents": [
+    {
+      "Kind": "api-gateway",
+      "Name": "<name of the api-gateway to bind to>",
+      "Namespace": "<enterprise: namespace of the route>",
+      "Partition": "<enterprise: partition of the route>",
+      "SectionName": "<optional name of a specific listener on the api-gateway to bind to>"
+    }
+  ],
+  "Rules": [
+    {
+      "Filters": [
+        {
+          "Headers": [
+            {
+              "Add": [
+                {
+                  "<name of header to add>": "<value of header to add>"
+                }
+              ],
+              "Remove": ["<header to remove from request>"],
+              "Set": [
+                {
+                  "<name of header to set>": "<value of header to set>"
+                }
+              ]
+            }
+          ],
+          "URLRewrite": [
+            {
+              "Path": "<path to rewrite request to>"
+            }
+          ]
+        }
+      ],
+      "Matches": [
+        {
+          "Headers": [
+            {
+              "Match": "<type of match: exact, prefix or regex>",
+              "Name": "<name of header to match on>",
+              "Value": "<value of header to match on>"
+            }
+          ],
+          "Method": "<method type to match on>",
+          "Path": [
+            {
+              "Match": "<type of match: exact, prefix or regex>",
+              "Value": "<value to match on>"
+            }
+          ],
+          "Query": [
+            {
+              "Match": "<type of match: exact, present or regex>",
+              "Name": "<name of query parameter to match on>",
+              "Value": "<value of query parameter to match on>"
+            }
+          ]
+        }
+      ],
+      "Services": [
+        {
+          "Name": "<name of Consul service to route to>",
+          "Namespace": "<enterprise: namespace of the route>",
+          "Partition": "<enterprise: partition of the route>",
+          "Weight": "<number proportional to other weights>",
+          "Filters": [
+            {
+              "Headers": [
+                {
+                  "Add": [
+                    {
+                      "<name of header to add": "<value of header to add>"
+                    }
+                  ],
+                  "Remove": ["<header to remove from request>"],
+                  "Set": [
+                    {
+                      "<name of header to set": "<value of header to set>"
+                    }
+                  ]
+                }
+              ],
+              "URLRewrite": [
+                {
+                  "Path": "<path to rewrite request to>"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
+```
+
+</CodeTabs>
+
+## Specification
+
+This section provides details about the fields you can configure in the `http-route` configuration entry.
+
+### `Kind`
+
+Specifies the type of configuration entry to implement. For HTTP routes, this must be `http-route`.
+
+#### Values
+
+- Default: none
+- This field is required.
+- Data type: string value that must be set to `"http-route"`.
+
+### `Name`
+
+Specifies a name for the configuration entry. The name is metadata that you can
+use to reference the configuration entry when performing Consul operations,
+such as applying a configuration entry to a specific cluster.
+
+#### Values
+
+- Default: Defaults to the name of the node after writing the entry to the Consul server.
+- This field is required.
+- Data type: string
+
+### `Namespace` <EnterpriseAlert inline />
+
+Specifies the Enterprise [namespace](/consul/docs/enterprise/namespaces) to apply to the configuration entry.
+
+#### Values
+
+- Default: `"default"` in Enterprise
+- Data type: string
+
+### `Partition` <EnterpriseAlert inline />
+
+Specifies the Enterprise [admin partition](/consul/docs/enterprise/admin-partitions) to apply to the configuration entry.
+
+#### Values
+
+- Default: `"default"` in Enterprise
+- Data type: string
+
+### `Meta`
+
+Specifies an arbitrary set of key-value pairs to associate with the route.
+
+#### Values
+
+- Default: none
+- Data type: map containing one or more keys and string values.
+
+### `Parents[]`
+
+Specifies the list of gateways that this route binds to.
+
+#### Values
+
+- Default: none
+- Data type: List of map. Each member of the list contains the following fields:
+  - `Kind`
+  - `Name`
+  - `Namespace` <EnterpriseAlert inline />
+  - `Partition` <EnterpriseAlert inline />
+  - `SectionName`
+
+### `Parents[].Kind`
+
+Specifies the type of resource to bind to. This field is required and must be
+set to `"api-gateway"`
+
+#### Values
+
+- Default: none
+- This field is required.
+- Data type: string value set to `"api-gateway"`
+
+### `Parents[].Name`
+
+Specifies the name of the api-gateway to bind to.
+
+#### Values
+
+- Default: none
+- This field is required.
+- Data type: string
+
+### `Parents[].Namespace` <EnterpriseAlert inline />
+
+Specifies the Enterprise [namespace](/consul/docs/enterprise/namespaces) to apply to the configuration entry.
+
+#### Values
+
+- Default: `"default"` in Enterprise
+- Data type: string
+
+### `Parents[].Partition` <EnterpriseAlert inline />
+
+Specifies the Enterprise [admin partition](/consul/docs/enterprise/admin-partitions) to apply to the configuration entry.
+
+#### Values
+
+- Default: `"default"` in Enterprise
+- Data type: string
+
+### `Parents[].SectionName`
+
+Specifies the name of the listener to bind to on the `api-gateway`. If left
+empty, this route binds to _all listeners_ on the parent gateway.
+
+#### Values
+
+- Default: ""
+- Data type: string
+
+### `Rules[]`
+
+Specifies the list of HTTP-based routing rules that this route uses to construct a route table.
+
+#### Values
+
+- Default:
+- Data type: List of maps. Each member of the list contains the following fields:
+  - `Filters`
+  - `Matches`
+  - `Services`
+
+### `Rules[].Filters`
+
+Specifies the list of HTTP-based filters used to modify a request prior to routing it to the upstream service.
+
+#### Values
+
+- Default: none
+- Data type: Map that contains the following fields:
+  - `Headers`
+  - `UrlRewrite`
+
+### `Rules[].Filters.Headers[]`
+
+Defines operations to perform on matching request headers when an incoming request matches the `Rules.Matches` configuration.
+
+#### Values
+
+This field contains the following configuration objects:
+
+| Parameter | Description                                                                                                                                                                                                                                                                                                                                                                                                                                  | Type            |
+| --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
+| `set`     | Configure this field to rewrite the HTTP request header. It specifies the name of an HTTP header to overwrite and the new value to set. Any existing values associated with the header name are overwritten. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to set.</li><li>`value`: Required string that specifies the value of the HTTP header to set.</li></ul> | List of maps    |
+| `add`     | Configure this field to append the request header with a new value. It specifies the name of an HTTP header to append and the values to add. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to append.</li><li>`value`: Required string that specifies the value of the HTTP header to add.</li></ul>                                                              | List of maps    |
+| `remove`  | Configure this field to specify an array of header names to remove from the request header.                                                                                                                                                                                                                                                                                                                                                  | List of strings |
+
+### `Rules[].Filters.URLRewrite`
+
+Specifies rule for rewriting the URL of incoming requests when an incoming request matches the `Rules.Matches` configuration.
+
+#### Values
+
+- Default: none
+- This field is a map that contains a `Path` field.
+
+### Rules[].Filters.URLRewrite.Path
+
+Specifies a path that determines how Consul API Gateway rewrites a URL path. Refer to [Reroute HTTP requests](/consul/docs/api-gateway/usage/reroute-http-requests) for additional information.
+
+#### Values
+
+The following table describes the parameters for `path`:
+
+| Parameter            | Description                                                                                                                                                                                      | Type   |
+| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------ |
+| `replacePrefixMatch` | Specifies a value that replaces the path prefix for incoming HTTP requests. The operation only affects the path prefix. The rest of the path is unchanged.                                       | String |
+| `type`               | Specifies the type of replacement to use for the URL path. You can specify the following values: <ul><li>`ReplacePrefixMatch`: Replaces the matched prefix of the URL path (default). </li></ul> | String |
+
+### `Rules[].Matches[]`
+
+Specifies the matching criteria used in the routing table. When an incoming
+request matches the given HTTPMatch configuration, traffic routes to
+services specified in the [`Rules.Services`](#rules-services) field.
+
+#### Values
+
+- Default: none
+- Data type: List containing maps. Each member of the list contains the following fields:
+  - `Headers`
+  - `Method`
+  - `Path`
+  - `Query`
+
+### `Rules[].Matches[].Headers[]`
+
+Specifies rules for matching incoming request headers. You can specify multiple rules in a list, as well as multiple lists of rules. If all rules in a single list are satisfied, then the route forwards the request to the appropriate service defined in the [`Rules.Services`](#rules-services) configuration. You can create multiple `Header[]` lists to create a range of matching criteria. When at least one list of matching rules are satisfied, the route forwards the request to the appropriate service defined in the [`Rules.Services`](#rules-services) configuration.
+
+#### Values
+
+- Default: none
+- Data type: List containing maps with the following fields:
+  - `Match`
+  - `Name`
+  - `Value`
+
+### `Rules.Matches.Headers.Match`
+
+Specifies type of match for headers: `"exact"`, `"prefix"`, or `"regex"`.
+
+#### Values
+
+- Default: none
+- Data type: string
+
+### `Rules.Matches.Headers.Name`
+
+Specifies the name of the header to match.
+
+#### Values
+
+- Default: none
+- Data type: string
+
+### `Rules[].Matches.Headers.Value`
+
+Specifies the value of the header to match.
+
+#### Values
+
+- Default: none
+- Data type: string
+
+### `Rules[].Matches[].Method`
+
+Specifies a list of strings that define matches based on HTTP request method.
+
+#### Values
+
+Specify one of the following string values:
+
+- `HEAD`
+- `POST`
+- `PUT`
+- `PATCH`
+- `GET`
+- `DELETE`
+- `OPTIONS`
+- `TRACE`
+- `CONNECT`
+
+### `Rules[].Matches[].Path`
+
+Specifies the HTTP method to match.
+
+#### Values
+
+- Default: none
+- Data type: map containing the following fields:
+  - `Match`
+  - `Value`
+
+### `Rules[].Matches[].Path.Match`
+
+Specifies type of match for the path: `"exact"`, `"prefix"`, or `"regex"`.
+
+#### Values
+
+- Default: none
+- Data type: string
+
+### `Rules[].Matches[].Path.Value`
+
+Specifies the value of the path to match.
+
+#### Values
+
+- Default: none
+- Data type: string
+
+### `Rules[].Matches[].Query[]`
+
+Specifies how a match is completed on a request’s query parameters.
+
+#### Values
+
+- Default: none
+- Data type: List of map that contains the following fields:
+  - `Match`
+  - `Name`
+  - `Value`
+
+### `Rules[].Matches[].Query[].Match`
+
+Specifies type of match for query parameters: `"exact"`, `"prefix"`, or `"regex"`.
+
+#### Values
+
+- Default: none
+- Data type: string
+
+### `Rules[].Matches[].Query[].Name`
+
+Specifies the name of the query parameter to match.
+
+#### Values
+
+- Default: none
+- Data type: string
+
+### `Rules[].Matches[].Query[].Value`
+
+Specifies the value of the query parameter to match.
+
+#### Values
+
+- Default: none
+- Data type: string
+
+### `Rules[].Services[]`
+
+Specifies the service that the API gateway routes incoming requests to when the
+requests match the `Rules.Matches` configuration.
+
+#### Values
+
+- Default: none
+- This field contains a list of maps. Each member of the list contains the following fields:
+  - `Name`
+  - `Weight`
+  - `Filters`
+  - `Namespace` <EnterpriseAlert inline />
+  - `Partition` <EnterpriseAlert inline />
+
+### `Rules[].Services[].Name`
+
+Specifies the name of an HTTP-based service to route to.
+
+#### Values
+
+- Default: none
+- Data type: string
+
+### `Rules[].Services[].Namespace` <EnterpriseAlert inline />
+
+Specifies the Enterprise [namespace](/consul/docs/enterprise/namespaces) to apply to the configuration entry.
+
+#### Values
+
+- Default: `"default"` in Enterprise
+- Data type: string
+
+### `Rules[].Services.Partition` <EnterpriseAlert inline />
+
+Specifies the Enterprise [admin partition](/consul/docs/enterprise/admin-partitions) to apply to the configuration entry.
+
+#### Values
+
+- Default: `"default"` in Enterprise
+- Data type: string
+
+### `Rules[].Services[].Weight`
+
+Specifies the proportion of requests forwarded to the specified service. If no weight is specified, or if the specified
+weight is set to less than or equal to `0`, the weight is normalized to `1`. The
+proportion is determined by dividing the value of the weight by the sum of all
+weights in the service list. For non-zero values, there may be some deviation
+from the exact proportion depending on the precision an implementation
+supports. Weight is not a percentage and the sum of weights does not need to
+equal 100.
+
+#### Values
+
+- Default: none
+- Data type: integer
+
+### `Rules[].Services[].Filters`
+
+Specifies the list of HTTP-based filters used to modify a request prior to
+routing it to this upstream service.
+
+#### Values
+
+- Default: none
+- Data type: Map that contains the following fields:
+  - `Headers`
+  - `UrlRewrite`
+
+### `Rules[].Services[].Filters.Headers[]`
+
+Defines operations to perform on matching request headers.
+
+#### Values
+
+This field contains the following configuration objects:
+
+| Parameter | Description                                                                                                                                                                                                                                                                                                                                                                                                                                  | Type            |
+| --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
+| `set`     | Configure this field to rewrite the HTTP request header. It specifies the name of an HTTP header to overwrite and the new value to set. Any existing values associated with the header name are overwritten. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to set.</li><li>`value`: Required string that specifies the value of the HTTP header to set.</li></ul> | List of maps    |
+| `add`     | Configure this field to append the request header with a new value. It specifies the name of an HTTP header to append and the values to add. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to append.</li><li>`value`: Required string that specifies the value of the HTTP header to add.</li></ul>                                                              | List of maps    |
+| `remove`  | Configure this field to specify an array of header names to remove from the request header.                                                                                                                                                                                                                                                                                                                                                  | List of strings |
+
+### `Rules[].Services[].Filters.URLRewrite`
+
+Specifies rule for rewriting the URL of incoming requests.
+
+#### Values
+
+- Default: none
+- This field is a map that contains a `Path` field.
diff --git a/website/content/docs/connect/gateways/api-gateway/configuration/index.mdx b/website/content/docs/connect/gateways/api-gateway/configuration/index.mdx
deleted file mode 100644
index b73fec3b9fe39..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/configuration/index.mdx
+++ /dev/null
@@ -1,44 +0,0 @@
----
-layout: docs
-page_title: Consul API gateway configuration overview
-description: >-
-  Configure your Consul API Gateway to manage traffic into your service mesh. Learn about the Kubernetes Gateway Specification items you can configure and how to configure custom API Gateways.
----
-
-# Consul API gateway configuration overview
-
-This topic provides an overview of the configuration items you can use to create API gateways, configure listeners, define routes, and apply additional resources that may be necessary to operate Consul API gateways in your environment. 
-
-## Configurations for virtual machines
-
-Apply the following configuration items if your network runs on virtual machines nodes:
-
-| Configuration | Description | Usage |
-| ---  | ---         | ---   |
-| [`api-gateway`](/consul/docs/connect/config-entries/api-gateway) | Defines the main infrastructure resource for declaring an API gateway and listeners on the gateway. | [Deploy API gateway listeners on virtual machines](/consul/docs/connect/gateways/api-gateway/deploy/listeners-vms) |
-| [`http-route`](/consul/docs/connect/config-entries/http-route) | Enables HTTP traffic to reach services in the mesh from a listener on the gateway.| <nobr>[Define routes on virtual machines](/consul/docs/connect/gateways/api-gateway/define-routes/routes-vms)</nobr> |
-| [`tcp-route`](/consul/docs/connect/config-entries/tcp-route) | Enables TCP traffic to reach services in the mesh from a listener on the gateway.| [Define routes on virtual machines](/consul/docs/connect/gateways/api-gateway/define-routes/routes-vms) |
-| <nobr>[`inline-certificate`](/consul/docs/connect/config-entries/inline-certificate)</nobr> | Provides gateway artificats with a CA certificate so that requests between the user and the gateway endpoint are encrypted. | [Encrypt API gateway traffic on virtual machines](/consul/docs/connect/gateways/api-gateway/secure-traffic/encrypt-vms) |
-| [`service-intentions`](/consul/docs/connect/config-entries/service-intentions) | Specifies traffic communication rules between services in the mesh. Intentions also enforce rules for service-to-service traffic routed through a Consul API gateway. | General configuration for securing a service mesh |
- 
-## Configurations for Kubernetes
-
-Apply the following configuration items if your network runs on Kubernetes:
-
-| Configuration | Description | Usage |
-| ---  | ---         | ---   |
-| [`Gateway`](/consul/docs/connect/gateways/api-gateway/configuration/gateway) | Defines the main infrastructure resource for declaring an API gateway and listeners on the gateway. It also specifies the name of the `GatewayClass`. | [Deploy listeners on Kubernetes](/consul/docs/connect/gateways/api-gateway/deploy/listeners-k8s) |
-| [`GatewayClass`](/consul/docs/connect/gateways/api-gateway/configuration/gatewayclass) | Defines a class of gateway resources used as a template for creating gateways. The default gateway class is `consul` and is suitable for most API gateway implementations.  | [Deploy listeners on Kubernetes](/consul/docs/connect/gateways/api-gateway/deploy/listeners-k8s) |
-| [`GatewayClassConfig`](/consul/docs/connect/gateways/api-gateway/configuration/gatewayclassconfig) | Describes additional gateway-related configuration parameters for the `GatewayClass` resource. | [Deploy listeners on Kubernetes](/consul/docs/connect/gateways/api-gateway/deploy/listeners-k8s) |
-| [`Routes`](/consul/docs/connect/gateways/api-gateway/configuration/routes) | Specifies paths from the gateway listener to backend services. | <nobr>[Define routes on Kubernetes](/consul/docs/connect/gateways/api-gateway/define-routes/routes-k8s)</nobr><p>[Reroute traffic in Kubernetes](/consul/docs/connect/gateways/api-gateway/define-routes/reroute-http-requests)</p><p>[Route traffic to peered services in Kubernetes](/consul/docs/connect/gateways/api-gateway/define-routes/route-to-peered-services)</p> |
-| [`MeshServices`](/consul/docs/connect/gateways/api-gateway/configuration/meshservices) | Enables routes to reference services in Consul. | [Route traffic to peered services in Kubernetes](/consul/docs/connect/gateways/api-gateway/define-routes/route-to-peered-services) |
-| [`ServiceIntentions`](/consul/docs/connect/config-entries/service-intentions) | Specifies traffic communication rules between services in the mesh. Intentions also enforce rules for service-to-service traffic routed through a Consul API gateway. | General configuration for securing a service mesh | 
-
-<!-- Reuse later for a topic about creating custom api gateway classes
-You can create a basic Gateway object using the default [`gatewayClassName`](/consul/docs/connect/gateways/api-gateway/configuration/gateway#gatewayclassname) (`consul`). If you want to create custom Gateways suitable for your environment, complete the following steps:
-
-1. Define a [GatewayClassConfig](/consul/docs/connect/gateways/api-gateway/configuration/gatewayclassconfig) that contains your custom configurations.
-1. Define a [GatewayClass](/consul/docs/connect/gateways/api-gateway/configuration/gatewayclass) and configure the [`parametersRef.name`](/consul/docs/connect/gateways/api-gateway/configuration/configuration/gatewayclass#parametersref-name) to reference the name of your [GatewayClassConfig](/consul/docs/connect/gateways/api-gateway/configuration/gatewayclassconfig).
-1. Define a [Gateway](/consul/docs/connect/gateways/api-gateway/configuration/configuration/gateway) and configure the [`gatewayClassName`](/consul/docs/connect/gateways/api-gateway/configuration/gateway#gatewayclassname) to reference the name of your [GatewayClass](/consul/docs/connect/gateways/api-gateway/configuration/gatewayclass).
-
-<!--TODO add diagram -->
diff --git a/website/content/docs/connect/config-entries/inline-certificate.mdx b/website/content/docs/connect/gateways/api-gateway/configuration/inline-certificate.mdx
similarity index 97%
rename from website/content/docs/connect/config-entries/inline-certificate.mdx
rename to website/content/docs/connect/gateways/api-gateway/configuration/inline-certificate.mdx
index 496650f859460..4fca7c54ee601 100644
--- a/website/content/docs/connect/config-entries/inline-certificate.mdx
+++ b/website/content/docs/connect/gateways/api-gateway/configuration/inline-certificate.mdx
@@ -7,7 +7,7 @@ description: Learn how to configure an inline certificate bound to an API Gatewa
 # Inline certificate configuration reference
 
 This topic provides reference information for the gateway inline certificate
-configuration entry. For information about certificate configuration for Kubernetes environments, refer to [Gateway Resource Configuration](/consul/docs/connect/gateways/api-gateway/configuration/gateway).
+configuration entry. For information about certificate configuration for Kubernetes environments, refer to [Gateway Resource Configuration](/consul/docs/api-gateway/configuration/gateway).
 
 ## Configuration model
 
diff --git a/website/content/docs/connect/gateways/api-gateway/configuration/routeauthfilter.mdx b/website/content/docs/connect/gateways/api-gateway/configuration/routeauthfilter.mdx
deleted file mode 100644
index 27c4974d9350a..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/configuration/routeauthfilter.mdx
+++ /dev/null
@@ -1,139 +0,0 @@
----
-layout: docs
-page_title: RouteAuthFilter configuration reference
-description: Learn how to configure the `RouteAuthFilter` resource, which defines behaviors for gateway listeners that are attached to specific HTTP routes.
----
-
-# RouteAuthFilter configuration reference
-
-This topic provides reference information for the HTTP route auth filter resource, which defines authorization filter configurations for specific routes in Consul service mesh on Kubernetes-orchestrated networks.
-
-## Configuration model
-
-The following list outlines field hierarchy, data types, and requirements in an HTTP route auth filter resource. Click on a property name to view additional details, including default values.
-
-- [`apiVersion`](#apiversion): string | required | must be set to `consul.hashicorp.com/v1alpha1`
-- [`kind`](#kind): string | required | must be set to `RouteAuthFilter`
-- [`metadata`](#metadata): map | required
-   - [`name`](#metadata-name): string | required 
-   - [`namespace`](#metadata-namespace): string | `default`
-- [`spec`](#spec): map | required
-   - [`jwt`](#spec-jwt): map | required 
-      - [`providers`](#spec-providers): list | required 
-         - [`name`](#spec-providers): string | required 
-         - [`verifyClaims`](#spec-providers): map | required 
-            - [`path`](#spec-providers): list of strings | required 
-            - [`value`](#spec-providers): string | required 
-
-## Complete configuration
-
-When every field is defined, an HTTP route auth filter has the following form: 
-
-## Specification
-
-This section provides details about the fields you can configure in the HTTP route auth filter resource.
-
-### `apiVersion`
-
-Specifies the version of the Consul API for integrating with Kubernetes. The value must be `consul.hashicorp.com/v1alpha1`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- String value that must be set to `consul.hashicorp.com/v1alpha1`.
-
-### `kind`
-
-Specifies the type of configuration entry to implement. Must be set to `RouteAuthFilter`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String value that must be set to `RouteAuthFilter`.
-
-### `metadata`
-
-Map that contains an arbitrary name for the resource and the namespace it applies to.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `metadata.name`
-
-Specifies a name for the resource. The name is metadata that you can use to reference the resource when performing Consul operations, such as applying the resource to a specific cluster. 
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String
-
-### `metadata.namespace` 
-
-Specifies the namespace that the configuration applies to. Refer to [Namespaces](/consul/docs/enterprise/namespaces) for more information.
-
-#### Values
-
-- Default: `default`
-- Data type: String
-
-### `spec`
-
-Map that contains the details about the HTTP route auth filter. The `apiVersion`, `kind`, and `metadata` fields are siblings of the `spec` field. All other configurations are children.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-
-### `spec.jwt`
-
-Map that contains JWT verification configurations to apply to listeners when the filter is attached to the route. These route-specific settings have precedence over the `default` configurations, but not `override` JWT configurations, that are defined in the [`GatewayPolicy`](/consul/docs/connect/gateways/api-gateway/configuration/gatewaypolicy) resource.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `spec.jwt.providers`
-
-Specifies a list of JWT provider configurations to apply to listeners when the filter is attached to the route. A provider configuration contains the name of the provider and claims. The route-specific settings have precedence over the `default` configurations, but not `override` configurations, that are defined in the [`GatewayPolicy`](/consul/docs/connect/gateways/api-gateway/configuration/gatewaypolicy) resource. Refer to [Use JWTs to verify requests to API gateways on Kubernetes](/consul/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-k8s) for additional information.
-
-#### Values
-
-- Default: None
-- Data type: List of maps
-
-The following table describes the parameters you can specify in a member of the `providers` list:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `name` | Specifies the name of the provider. | String | None |
-| `verifyClaims` | Specifies a list of paths and a value that define the claim. Consul verifies requests that match the claims declared in the listener JWT configuration and allow the request through the gateway. The `VerifyClaims` map specifies the following settings: <ul><li>`path`: Specifies a list of one or more registered or custom claims.</li><li>`value`: Specifies the expected value of the claim.</li></ul>  | Map | None |
-
-## Example configuration
-
-In the following example, requests sent to HTTP routes attached to the filter must have `admin` permissions.
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: RouteAuthFilter
-metadata:
-    name: example-route-jwt-filter
-    namespace: default
-spec:
-    JWT:
-      Providers:
-        - Name: "okta"
-          VerifyClaims:
-          - Path:
-            - "roles"
-            - "perm"
-            Value: "admin"
-```
\ No newline at end of file
diff --git a/website/content/docs/connect/gateways/api-gateway/configuration/routeretryfilter.mdx b/website/content/docs/connect/gateways/api-gateway/configuration/routeretryfilter.mdx
deleted file mode 100644
index 669750c069117..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/configuration/routeretryfilter.mdx
+++ /dev/null
@@ -1,206 +0,0 @@
----
-layout: docs
-page_title: RouteRetryFilter configuration reference
-description: >-
-  Learn how to configure the `RouteRetryFilter` resource, which defines retry settings for specific routes from an API gateway listener to the destination service in Consul service mesh.
----
-
-# RouteRetryFilter configuration reference
-
-This topic provides configuration reference information for  details about the `RouteRetryFilter` resource, which defines retry settings for specific routes from an API gateway listener to the destination service in Consul service mesh. 
-
-## Introduction
-
-Define the one or more configurations in the `spec` to define the retry logic for the route. Refer to the [retry logic example configuration](#example) for additional information. 
-
-To apply retry settings to a `HTTPRoute`, set the `rules.filters.type` parameter in an route to `extensionRef` and specify the name of the filter in `rules.filters.extensionRef.name` field. Refer to [Route resource configuration reference](/consul/docs/connect/gateways/api-gateway/configuration/routes) for additional information. 
-
-## Configuration Model
-
-The following list outlines field hierarchy, data types, and requirements in a `RouteRetryFilter` resource. Click on a property name to view additional details, including default values.
-
-- [`apiVersion`](#apiversion): string | required | must be set to `consul.hashicorp.com/v1alpha1`
-- [`kind`](#kind): string | required | must be set to `RouteRetryFilter`
-- [`metadata`](#metadata): map | required
-   - [`name`](#metadata-name): string | required 
-   - [`namespace`](#metadata-namespace): string  | `default`
-- [`spec`](#spec): map | required
-  - [`numRetries`](#spec-numretries): number | `1`
-  - [`retryOnConnectFailure`](#spec-retryonconnectfailure): boolean | `false`
-  - [`retryOn`](#spec-retryon): list
-  - [`retryOnStatusCodes`](#spec-retryonstatuscodes): list
-
-## Complete configuration
-
-When every field is defined, this resource has the following form: 
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: RouteRetryFilter
-metadata:
-  name: <name for the retry filter>
-spec:
-  requestTimeout: <amount of time to wait before retrying>
-  numRetries: <number of times to retry>
-  retryOnConnectFailure: false
-  retryOn: ['<condition types that trigger retries>']
-```
-
-## Specification
-
-This section provides details about the fields you can configure in the resource.
-
-### `apiVersion`
-
-Specifies the version of the Consul API for integrating with Kubernetes. The value must be `consul.hashicorp.com/v1alpha1`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- String value that must be set to `consul.hashicorp.com/v1alpha1`.
-
-### `kind`
-
-Specifies the type of configuration entry to implement. Must be set to `RouteRetryFilter`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String value that must be set to `RouteRetryFilter`.
-
-### `metadata`
-
-Map that contains an arbitrary name for the resource and the namespace it applies to.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `metadata.name`
-
-Specifies a name for the resource. The name is metadata that you can use to reference the resource when performing Consul operations, such as applying the resource to a specific cluster. 
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String
-
-### `metadata.namespace` 
-
-Specifies the namespace that the configuration applies to. Refer to [namespaces](/consul/docs/enterprise/namespaces) for more information.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `spec`
-
-Map that contains the details about the gateway policy. The `apiVersion`, `kind`, and `metadata` fields are siblings of the `spec` field. All other configurations are children.
-
-### `spec.numRetries`
-
-Specifies the number of times to retry the request when a retry condition occurs. 
-
-#### Values
-
-- Default: `1`
-- Data type: Integer
-
-### `spec.retryOnConnectFailure`
-
-Enables Consul to retry the request if the connection fails. Define the one or more retry configurations to define the retry logic for the route. 
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `spec.retryOn`
-
-Specifies a list of conditions for Consul to retry requests based on the response from an upstream service. The following retry conditions are supported:
-
-| Conditions           | Description                                                                                              |
-| :------------------- | :------------------------------------------------------------------------------------------------------- |
-| `5xx`                | Consul retries the request when an upstream responds with any 5xx error code or does not respond at all. |
-| `gateway-error`      | Consul retries the request when the upstream responds with a 502, 503, or 504 error.                     |
-| `reset`              | Consul retries the request when the upstream does not respond at all.                                    |
-| `connect-failure`    | Consul retries the request when the connection to the upstream fails.                                    |
-| `envoy-ratelimited`  | Consul retries the request when the header `x-envoy-ratelimited` is present.                             |
-| `retriable-4xx`      | Consul retries the request when the upstream responds with a retriable 4xx code.                         |
-| `refused-stream`     | Consul retries the request when the upstream resets the stream with a `REFUSED_STREAM` error code.       |
-| `cancelled`          | Consul retries the request when the gRPC status code in the response headers is `cancelled`.             |
-| `deadline-exceeded`  | Consul retries the request when the gRPC status code in the response headers is `deadline-exceeded`.     |
-| `internal`           | Consul retries the request when the gRPC status code in the response headers is `internal`.              |
-| <nobr>`resource-exhausted`</nobr> | Consul retries the request when the gRPC status code in the response headers is `resource-exhausted`.    |
-| `unavailable`        | Consul retries the request when the gRPC status code in the response headers is `unavailable`.           |
-
-#### Values
-
-- Default: None
-- Data type: List of strings. Strings must match one of the following values:
-
-  - `5xx`
-  - `gateway-error`
-  - `reset`
-  - `connect-failure`
-  - `envoy-ratelimited`
-  - `retriable-4xx`
-  - `refused-stream`
-  - `cancelled`
-  - `deadline-exceeded`
-  - `internal`
-  - `resource-exhausted`
-  - `unavailable`
-
-### `spec.retryOnStatusCodes`
-
-Specifies a list of integers for [HTTP response status codes](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status) that trigger a retry request.
-
-#### Values
-
-- Default: None
-- Data type: List of integers
-
-
-## Example
-
-The following example configures Consul to retry the route five times after 15 when the connection fails:
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: RouteRetryFilter
-metadata:
-  name: orders
-spec:
-  numRetries: 5
-  retryOnConnectFailure: true
-  retryOn: ['reset']
-  
-  ---
-  
-apiVersion: gateway.networking.k8s.io/v1beta1
-kind: HTTPRoute
-metadata:
-  name: example-route
-  namespace: default
-spec:
-  parentRefs:
-    - name: gateway
-  rules:
-     - backendRefs:
-          - name: example-service
-            kind: Service
-            port: 80
-       filters:
-        - type: ExtensionRef
-          extensionRef:
-            group: consul.hashicorp.com
-            kind: RouteRetryFilter
-            name: orders
-
-```
\ No newline at end of file
diff --git a/website/content/docs/connect/gateways/api-gateway/configuration/routes.mdx b/website/content/docs/connect/gateways/api-gateway/configuration/routes.mdx
deleted file mode 100644
index 828a7e69e1c82..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/configuration/routes.mdx
+++ /dev/null
@@ -1,309 +0,0 @@
----
-layout: docs
-page_title: Route resource configuration reference
-description: >-
-  Learn about the configuration fields for `HTTPRoute` and `TCPRoute` resources for Consul API gateway. Apply routes to configure how Consul routes traffic into the service mesh according.
----
-
-# Route resource configuration reference
-
-This topic describes how to create and configure `Route` resources. Routes are independent configuration objects that are associated with specific listeners.
-
-## Configuration model
-
-The following outline shows how to format the configurations for the `Route` object. The top-level `spec` field is the root for all configurations. Click on a property name to view details about the configuration.
-
-- [`parentRefs`](#parentrefs): array of objects | optional
-  - [`group`](#parentrefs): string | optional
-  - [`kind`](#parentrefs): string | optional
-  - [`name`](#parentrefs): string | required
-  - [`namespace`](#parentrefs): string | optional
-  - [`sectionName`](#parentrefs): string | optional
-- [`rules`](#rules): list of objects | optional
-  - [`backendRefs`](#rules-backendrefs): list of objects | optional
-    - [`group`](#rules-backend-refs): string | optional
-    - [`kind`](#rules-backendrefs): string | optional
-    - [`name`](#rules-backendrefs): string | required
-    - [`namespace`](#rules-backendrefs): string | optional
-    - [`port`](#rules-backendrefs): integer | required
-    - [`weight`](#rules-backendrefs): integer | optional
-  - [`filters`](#rules-filters): list of objects | optional
-    - [`type`](#rules-filters-type): string | required
-    - [`requestHeaderModifier`](#rules-filters-requestheadermodifier): object | optional
-      - [`set`](#rules-filters-requestheadermodifier): array of objects | optional
-        - [`name`](#rules-filters-requestheadermodifier): string | required
-        - [`value`](#rules-filters-requestheadermodifier): string | required
-      - [`add`](#rules-filters-requestheadermodifier): array of objects | optional
-        - [`name`](#rules-filters-requestheadermodifier): string | required
-        - [`value`](#rules-filters-requestheadermodifier): string | required
-      - [`remove`](#rules-filters-requestheadermodifier): array of strings | optional
-    - [`responseHeaderModifier`](#rules-filters-responseheadermodifier): object | optional
-      - [`set`](#rules-filters-responseheadermodifier): array of objects | optional
-        - [`name`](#rules-filters-responseheadermodifier): string | required
-        - [`value`](#rules-filters-responseheadermodifier): string | required
-      - [`add`](#rules-filters-responseheadermodifier): array of objects | optional
-        - [`name`](#rules-filters-responseheadermodifier): string | required
-        - [`value`](#rules-filters-responseheadermodifier): string | required
-      - [`remove`](#rules-filters-responseheadermodifier): array of strings | optional
-    - [`urlRewrite`](#rules-filters-urlrewrite): object | optional
-      - [`path`](#rules-filters-urlrewrite-path): object | required
-        - [`replacePrefixMatch`](#rules-filters-urlrewrite-path): string | required
-        - [`type`](#rules-filters-urlrewrite-path): string | required
-    - [`extensionRef`](#rules-filters-extensionref): map
-      - [`group`](#rultes-filters-extensionref): string | must be set to `consul.hashicorp.com`
-      - [`kind`](#rultes-filters-extensionref): string | must be set to `RouteAuthFilter`
-      - [`name`](#rultes-filters-extensionref): string | must be set to `consul.hashicorp.com`
-  - [`matches`](#rules-matches): array of objects | optional
-    - [`path`](#rules-matches-path): list of objects | optional
-      - [`type`](#rules-matches-path): string | required
-      - [`value`](#rules-matches-path): string | required
-    - [`headers`](#rules-matches-headers): list of objects | optional
-      - [`type`](#rules-matches-headers): string | required
-      - [`name`](#rules-matches-headers): string | required
-      - [`value`](#rules-matches-headers): string | required
-    - [`queryParams`](#rules-matches-queryparams): list of objects | optional
-      - [`type`](#rules-matches-queryparams): string | required
-      - [`name`](#rules-matches-queryparams): string | required
-      - [`value`](#rules-matches-queryparams): string | required
-    - [`method`](#rules-matches-method): string | optional
-
-
-## Specification
-
-This topic provides details about the configuration parameters.
-
-### `parentRefs`
-
-This field contains the list of `Gateways` that the route should attach to. If not set, the route will not attach to a `Gateway`. The following table describes the objects you can configure in the `parentRefs` block:
-
-| Parameter | Description | Type | Required |
-| ---       | ---         | ---  | ---      |
-| `group` | Specifies the Kubernetes API group of the `Gateway` to attach to. You can specify the following values: <ul><li>`gateway.networking.k8s.io`</li></ul>. Defaults to `gateway.networking.k8s.io`. | String | Optional |
-| `kind` | Specifies the Kubernetes kind of the `Gateway` to attach to. you can specify the following values: <ul><li>`Gateway`</li></ul>. Defaults to `Gateway`.  | String | Optional |
-| `name` | Specifies the name of the `Gateway` the route is attached to. | String | Required |
-| `namespace` | Specifies the Kubernetes namespace containing the `Gateway` to attach to. If the `Gateway` is in a different Kubernetes namespace than the `Route`, then you must specify a value. Defaults to the `Route` namespace. | String | Optional |
-| `sectionName` | Specifies the name of a specific listener on the `Gateway` to attach to. The `Route` attempts to attach to all listeners on the `Gateway`. | String | Required |
-
-
-### `rules`
-
-The `rules` field contains a list of objects that define behaviors for network traffic that goes through the route. The rule configuration contains the following objects:
-
-- [`backendRefs`](#rules-backendrefs): Specifies which backend services the `Route` references when processing traffic.
-- [`filters`](#rules-filters): Specifies which operations Consul API Gateway performs when traffic goes through the `Route`.
-- [`matches`](#rules-matches): Determines which requests Consul API Gateway processes.
-
-Rules are optional.
-
-### `rules.backendRefs`
-
-This field specifies backend services that the `Route` references. The following table describes the parameters for `backendRefs`:
-
-| Parameter | Description | Type | Required |
-| ---       | ---         | ---  | ---      |
-| `group` | Specifies the Kubernetes API Group of the referenced backend. You can specify the following values: <ul><li>`""`: Specifies the core Kubernetes API group. This value must be used when `kind` is set to `Service`. This is the default value if unspecified.</li><li>`api-gateway.consul.hashicorp.com`: This value must be used when `kind` is set to `MeshService`.</li></ul> | String | Optional |
-| `kind` |  Specifies the Kubernetes Kind of the referenced backend. You can specify the following values: <ul><li>`Service` (default): Indicates that the `backendRef` references a Service in the Kubernetes cluster. </li><li>`MeshService`: Indicates that the `backendRef` references a service in the Consul mesh. Refer to the `MeshService` [documentation](/consul/docs/connect/gateways/api-gateway/configuration/meshservice) for additional information.</li></ul> | String | Optional |
-| `name` | Specifies the name of the Kubernetes Service or Consul mesh service resource. | String | Required |
-| `namespace` | Specifies the Kubernetes namespace containing the Kubernetes Service or Consul mesh service resource. You must specify a value if the Service or Consul mesh service is defined in a different namespace from the `Route`. Defaults to the namespace of the `Route`. <br/>To create a route for a `backendRef` in a different namespace, you must also create a [ReferenceGrant](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferenceGrant). Refer to the [example route](#example-cross-namespace-backendref) configured to reference across namespaces. | String | Optional |
-| `port` | Specifies the port number for accessing the Kubernetes or Consul service. | Integer | Required |
-| `weight` | Specifies the proportion of requests sent to the backend. Computed as weight divided by the sum of all weights in this `backendRefs` list. Defaults to `1`. A value of `0` indicates that no requests should be sent to the backend. | Integer | Optional |
-
-Refer to [Example cross-namespace backendRef](#example-cross-namespace-backendref) for an example configuration.
-
-
-### `rules.filters`
-
-The `filters` block defines steps for processing requests. You can configure filters to modify the properties of matching incoming requests and enable Consul API Gateway features, such as rewriting path prefixes (refer to [Reroute HTTP requests](/consul/docs/connect/gateways/api-gateway/define-routes/reroute-http-requests) for additional information).
-
-- Type: Array of objects
-- Required: Optional
-
-### `rules.filters.type`
-
-Specifies the type of filter you want to apply to the route. The parameter is optional and takes a string value.
-
-You can specify the following values:
-
-- `RequestHeaderModifier`: The `RequestHeaderModifier` type modifies the HTTP headers on the incoming request. You must define the [`rules.filters.requestHeaderModifier`](#rules-filters-requestheadermodifier) configurations to use this filter type.
-
-- `ResponseHeaderModifier`: The `ResponseHeaderModifier` type modifies the HTTP headers on the outgoing response to the caller. You must define the [`rules.filters.requestHeaderModifier`](#rules-filters-requestheadermodifier) configurations to use this filter type.
-
-
-- `URLRewrite`: The `URLRewrite` type  modifies the URL path on the incoming request. You must define the [`rules.filters.urlRewrite`](#rules-filters-urlrewrite) configurations to use this filter type.
-
-- `ExtensionRef`: Attaches an extension reference to an HTTP route. You can create extensions that enable different behaviors, such as defining JWT verification for requests to the route, and attach them to the route. You must define the [`rules.filters.extensionRef`](#rules-filters-extensionref) configuration to use this filter type.
-
-### `rules.filters.requestHeaderModifier`
-
-Defines operations to perform on matching request headers when `rules.filters.type` is configured to `RequestHeaderModifier`. This field contains the following configuration objects:
-
-| Parameter | Description | Type | Required |
-| ---       | ---         | ---  | ---      |
-| `set` | Configure this field to rewrite the HTTP request header. It specifies the name of an HTTP header to overwrite and the new value to set. Any existing values associated with the header name are overwritten. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to set.</li><li>`value`: Required string that specifies the value of the HTTP header to set.</li></ul> | List of objects | Optional |
-| `add` | Configure this field to append the request header with a new value. It specifies the name of an HTTP header to append and the value(s) to add. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to append.</li><li>`value`: Required string that specifies the value of the HTTP header to add.</li></ul> | List of objects | Optional |
-| `remove` | Configure this field to specify an array of header names to remove from the request header. | Array of strings | Optional |
-
-### `rules.filters.responseHeaderModifier`
-
-Defines operations to perform on matching response headers when `rules.filters.type` is configured to `ResponseHeaderModifier`. This field contains the following configuration objects:
-
-| Parameter | Description | Type | Required |
-| ---       | ---         | ---  | ---      |
-| `set` | Configure this field to rewrite the HTTP response header. It specifies the name of an HTTP header to overwrite and the new value to set. Any existing values associated with the header name are overwritten. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to set.</li><li>`value`: Required string that specifies the value of the HTTP header to set.</li></ul> | List of objects | Optional |
-| `add` | Configure this field to append the response header with a new value. It specifies the name of an HTTP header to append and the value(s) to add. You can specify the following configurations: <ul><li>`name`: Required string that specifies the name of the HTTP header to append.</li><li>`value`: Required string that specifies the value of the HTTP header to add.</li></ul> | List of objects | Optional |
-| `remove` | Configure this field to specify an array of header names to remove from the response header. | Array of strings | Optional |
-
-### `rules.filters.urlRewrite`
-
-Specifies rules for rewriting the URL of incoming requests when `rules.filters.type` is configured to `URLRewrite`.
-
-- Type: Object
-- Required: Optional
-
-### `rules.filters.urlRewrite.path`
-
-Specifies a list of objects that determine how Consul API Gateway rewrites URL paths (refer to [Reroute HTTP requests](/consul/docs/connect/gateways/api-gateway/define-routes/reroute-http-requests) for additional information).
-
-The following table describes the parameters for `path`:
-
-| Parameter | Description | Type | Required |
-| ---       | ---         | ---  | ---      |
-| `replacePrefixMatch` | Specifies a value that replaces the path prefix for incoming HTTP requests. The operation only affects the path prefix. The rest of the path is unchanged. | String | Required |
-| `type` | Specifies the type of replacement to use for the URL path. You can specify the following values: <ul><li>`ReplacePrefixMatch`: Replaces the matched prefix of the URL path (default). </li></ul> | String | Optional |
-
-### `rules.filters.extensionRef`
-
-Map that attaches an extension reference to an HTTP route when `rules.filters.type` is set to `ExtensionRef`. You can create extensions that enable different behaviors, such as defining JWT verification for requests to the route, and attach them to the route.
-
-You can configure the following parameters:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `group`   | Specifies the resource group.           | String    | None    |
-| `kind`    | Specifies the type of extension reference. You can specify the following types: <ul><li>`RouteAuthFilter`: Contains JWT verification settings. Refer to [Use JWTs to verify requests to API gateways on Kubernetes](/consul/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-k8s) for additional information.</li><li>`RouteRetryFilter`: Defines retry logic for the route if the request is unsuccessful. Refer to [RouteRetryFilter configuration reference](/consul/docs/connect/gateways/api-gateway/configuration/routeretryfilter) for additional information.</li><li>`RouteTimeoutFilter`: Specifies timeout settings for specific routes. Refer to [RouteTimeoutFilter configuration reference](/consul/docs/connect/gateways/api-gateway/configuration/routetimeoutfilter) for additional information. </li> </ul> | String | None |
-| `name` | Specifies the name of the filter to attach to the route. | String | None |
-
-### `rules.matches`
-
-Specifies rules for matching incoming requests. You can apply [`filters`](#rulesfilters) to requests that match the defined rules. You can match incoming requests based on the following elements:
-
-- [paths](#rules-matches-path)
-- [headers](#rules-matches-headers)
-- [query parameters](#rules-matches-queryparams)
-- [request method](#rules-matches-method)
-
-Each rule matches requests independently. As a result, a request matching any of the conditions is considered a match.  You can configure several matching rules for each type to widen or narrow matches.
-### `rules.matches.path`
-
-Specifies a list of objects that define matches based on URL path. The following table describes the parameters for the `path` field:
-
-| Parameter | Description | Type | Required |
-| ---       | ---         | ---  | ---      |
-| `type` | Specifies the type of comparison to use for matching the path value. You can specify the following types. <ul><li>`Exact`: Returns a match only when the entire path matches the `value` field (default).</li><li> `PathPrefix`: Returns a match when the path has the prefix defined in the `value` field.</li><li>`RegularExpression`: Returns a match when the path matches the regex defined in the `value` field.</li></ul> | String | Required |
-| `value` | Specifies the value to match on. You can specify a specific string when `type` is `Exact` or `PathPrefix`. You can specify a regular expression if `type` is `RegularExpression`. | String | Required |
-
-### `rules.matches.headers`
-
-Specifies a list of objects that define matches based HTTP request headers. The following table describes the parameters for the `headers` field:
-
-| Parameter | Description | Type | Required |
-| ---       | ---         | ---  | ---      |
-| `type` | Specifies the type of comparison to use for matching the header value. You can specify the following types. <ul><li>`Exact`: Returns a match only when the entire header matches the `value` field (default).</li><li> `RegularExpression`: Returns a match when the header matches the regex defined in the `value` field.</li></ul> | String | Required |
-| `name` | Specifies the name of the header to match on. | String | Required |
-| `value` | Specifies value to match on. You can specify a specific string or a regular expression. | String | Required |
-
-### `rules.matches.queryParams`
-
-Specifies a list of objects that define matches based query parameters. The following table describes the parameters for the `queryParams` field:
-
-| Parameter | Description | Type | Required |
-| ---       | ---         | ---  | ---      |
-| `type` | Specifies the type of comparison to use for matching a query parameter value. You can specify the following types. <ul><li>`Exact`: Returns a match only when the query parameter match the `value` field (default).</li><li> `RegularExpression`: Returns a match when the query parameter matches the regex defined in the `value` field.</li></ul> | String | Required |
-| `name` | Specifies the name of the query parameter to match on. | String | Required |
-| `value` | Specifies value to match on. You can specify a specific string or a regular expression. | String | Required |
-
-### `rules.matches.method`
-
-Specifies a list of strings that define matches based on HTTP request method. You may specify the following values:
-
-- `HEAD`
-- `POST`
-- `PUT`
-- `PATCH`
-- `GET`
-- `DELETE`
-- `OPTIONS`
-- `TRACE`
-- `CONNECT`
-
-## Examples
-
-Refer to the following Consul and Kubernetes Gateway API documentation for additional information:
-
-- [Define routes on Kubernetes](/consul/docs/connect/gateways/api-gateway/define-routes/routes-k8s)
-- [`HTTPRoute` in Kubernetes documentation](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRoute)
-- [`TCPRoute`  in Kubernetes documentation](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.TCPRoute)
-
-### Basic route
-
-The following example creates a route named `example-route` associated with a listener defined in `example-gateway`.
-
-<CodeBlockConfig filename="routes.yaml">
-
-  ```yaml
-  apiVersion: gateway.networking.k8s.io/v1beta1
-  kind: HTTPRoute
-  metadata:
-    name: example-route
-  spec:
-    parentRefs:
-    - name: example-gateway
-    rules:
-    - backendRefs:
-      - kind: Service
-        name: echo
-        port: 8080
-  ```
-
-</CodeBlockConfig>
-
-### Example cross-namespace backendRef
-
-The following example creates a route named `example-route` in namespace `gateway-namespace`. This route has a `backendRef` in namespace `service-namespace`. Traffic is allowed because the `ReferenceGrant`, named `reference-grant` in namespace `service-namespace`, allows traffic from `HTTPRoutes` in `gateway-namespace` to `Services` in `service-namespace`.
-
-<CodeBlockConfig filename="route_with_referencegrant.yaml">
-
-  ```yaml
-  apiVersion: gateway.networking.k8s.io/v1beta1
-  kind: HTTPRoute
-  metadata:
-    name: example-route
-    namespace: gateway-namespace
-  spec:
-    parentRefs:
-      - name: example-gateway
-    rules:
-      - backendRefs:
-        - kind: Service
-          name: echo
-          namespace: service-namespace
-          port: 8080
-  ---
-
-  apiVersion: gateway.networking.k8s.io/v1alpha2
-  kind: ReferenceGrant
-  metadata:
-    name: reference-grant
-    namespace: service-namespace
-  spec:
-    from:
-    - group: gateway.networking.k8s.io
-      kind: HTTPRoute
-      namespace: gateway-namespace
-      to:
-        - group: ""
-          kind: Service
-          name: echo
-  ```
-
-</CodeBlockConfig>
diff --git a/website/content/docs/connect/gateways/api-gateway/configuration/routetimeoutfilter.mdx b/website/content/docs/connect/gateways/api-gateway/configuration/routetimeoutfilter.mdx
deleted file mode 100644
index 6be1f22ae358d..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/configuration/routetimeoutfilter.mdx
+++ /dev/null
@@ -1,114 +0,0 @@
----
-layout: docs
-page_title: RouteTimeoutFilter configuration reference
-description: >-
-  Learn how to configure the `RouteTimeoutFilter` resource, which defines timeout settings for specific routes from an API gateway listener to the destination service in Consul service mesh.
----
-
-# RouteTimeoutFilter configuration reference
-
-This topic provides configuration reference information for  details about the `RouteTimeoutFilter` resource, which defines timeout settings for specific routes from an API gateway listener to the destination service in Consul service mesh. 
-
-To apply retry settings to a `HTTPRoute`, set the `rules.filters.type` parameter in an route to `extensionRef` and specify the name of the filter in `rules.filters.extensionRef.name` field. Refer to [Route resource configuration reference](/consul/docs/connect/gateways/api-gateway/configuration/routes) for additional information. 
-
-## Configuration Model
-
-The following list outlines field hierarchy, data types, and requirements in a `RouteTimeoutFilter` resource. Click on a property name to view additional details, including default values.
-
-- [`apiVersion`](#apiversion): string | required | must be set to `consul.hashicorp.com/v1alpha1`
-- [`kind`](#kind): string | required | must be set to `RouteTimeoutFilter`
-- [`metadata`](#metadata): map | required
-   - [`name`](#metadata-name): string | required 
-   - [`namespace`](#metadata-namespace): string  | `default`
-- [`spec`](#spec): map | required
-  - [`idleTimeout`](#spec-idletimeout): number | `0`
-  - [`requestTimeout`](#spec-retryonconnectfailure): number | `0`
-
-## Complete configuration
-
-When every field is defined, this resource has the following form: 
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: RouteTimeoutFilter
-metadata:
-  name: <name for the retry filter>
-spec:
-  idleTimeout: <amount of time the request stream can remain idle>
-  requestTimeout: <total amount of time Consul allows for processing the request stream>
-```
-
-## Specification
-
-This section provides details about the fields you can configure in the resource.
-
-### `apiVersion`
-
-Specifies the version of the Consul API for integrating with Kubernetes. The value must be `consul.hashicorp.com/v1alpha1`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- String value that must be set to `consul.hashicorp.com/v1alpha1`.
-
-### `kind`
-
-Specifies the type of configuration entry to implement. Must be set to `RouteTimeoutFilter`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String value that must be set to `RouteTimeoutFilter`.
-
-### `metadata`
-
-Map that contains an arbitrary name for the resource and the namespace it applies to.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `metadata.name`
-
-Specifies a name for the resource. The name is metadata that you can use to reference the resource when performing Consul operations, such as applying the resource to a specific cluster. 
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String
-
-### `metadata.namespace` 
-
-Specifies the namespace that the configuration applies to. Refer to [namespaces](/consul/docs/enterprise/namespaces) for more information.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `spec`
-
-Map that contains the details about the gateway policy. The `apiVersion`, `kind`, and `metadata` fields are siblings of the `spec` field. All other configurations are children.
-
-
-### `spec.idleTimeout
-
-Specifies the total amount of time permitted for the request stream to be idle.
-
-#### Values
-
-- Default: 0
-- Data type: Integer
-
-### `spec.requestTimeout`
-
-Specifies the total amount of time in nanoseconds, including retry attempts, Consul permits for the entire downstream request to be processed.
-
-#### Values
-
-- Default: 0
-- Data type: Integer
\ No newline at end of file
diff --git a/website/content/docs/connect/config-entries/tcp-route.mdx b/website/content/docs/connect/gateways/api-gateway/configuration/tcp-route.mdx
similarity index 98%
rename from website/content/docs/connect/config-entries/tcp-route.mdx
rename to website/content/docs/connect/gateways/api-gateway/configuration/tcp-route.mdx
index e573a0183a766..23b32662d923d 100644
--- a/website/content/docs/connect/config-entries/tcp-route.mdx
+++ b/website/content/docs/connect/gateways/api-gateway/configuration/tcp-route.mdx
@@ -7,7 +7,7 @@ description: Learn how to configure a TCP Route that is bound to an API gateway
 # TCP route configuration Reference
 
 This topic provides reference information for the gateway TCP routes configuration
-entry. Refer to [Route Resource Configuration](/consul/docs/connect/gateways/api-gateway/configuration/routes) for information
+entry. Refer to [Route Resource Configuration](/consul/docs/api-gateway/configuration/routes) for information
 about configuring API gateways in Kubernetes environments.
 
 ## Configuration model
diff --git a/website/content/docs/connect/gateways/api-gateway/define-routes/reroute-http-requests.mdx b/website/content/docs/connect/gateways/api-gateway/define-routes/reroute-http-requests.mdx
deleted file mode 100644
index 5a56aeee792a8..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/define-routes/reroute-http-requests.mdx
+++ /dev/null
@@ -1,58 +0,0 @@
----
-layout: docs
-page_title: Reroute HTTP Requests
-description: >-
-  Learn how to configure Consul API Gateway to reroute HTTP requests to a specific path. 
----
-
-# Reroute HTTP Requests
-
-This topic describes how to configure Consul API Gateway to reroute HTTP requests. 
-
-## Requirements
-
-1. Verify that the [requirements](/consul/docs/api-gateway/tech-specs) have been met.
-1. Verify that the Consul API Gateway CRDs and controller have been installed and applied. Refer to [Installation](/consul/docs/connect/gateways/api-gateway/deploy/install-k8s) for details.
-
-## Configuration
-
-Specify the following fields in your `Route` configuration. Refer to the [Route configuration reference](/consul/docs/connect/gateways/api-gateway/configuration/routes) for details about the parameters.
-
-- [`rules.filters.type`](/consul/docs/connect/gateways/api-gateway/configuration/routes#rules-filters-type): Set this parameter to `URLRewrite` to instruct Consul API Gateway to rewrite the URL when specific conditions are met. 
-- [`rules.filters.urlRewrite`](/consul/docs/connect/gateways/api-gateway/configuration/routes#rules-filters-urlrewrite): Specify the `path` configuration.
-- [`rules.filters.urlRewrite.path`](/consul/docs/connect/gateways/api-gateway/configuration/routes#rules-filters-urlrewrite-path): Contains the paths that incoming requests should be rewritten to based on the match conditions.  
-
-To configure the route to accept paths with or without a trailing slash, you must make two separate routes to handle each case.
-
-### Example
-
-In the following example, requests to` /incoming-request-prefix/` are forwarded to the `backendRef` as `/prefix-backend-receives/`. As a result, requests to `/incoming-request-prefix/request-path` are received by `backendRef` as `/prefix-backend-receives/request-path`.
-
-<CodeBlockConfig filename="route.yaml">
-
-```yaml hideClipboard
-apiVersion: gateway.networking.k8s.io/v1beta1
-kind: HTTPRoute
-metadata:
- name: example-route
- ##...
-spec:
- parentRefs:
-   - group: gateway.networking.k8s.io
-     kind: Gateway
-     name: api-gateway
- rules:
-   - backendRefs:
-     . . .
-     filters:
-       - type: URLRewrite
-         urlRewrite:
-           path:
-             replacePrefixMatch: /prefix-backend-receives/
-             type: ReplacePrefixMatch
-     matches:
-       - path:
-           type: PathPrefix
-           value: /incoming–request-prefix/
-```
-</CodeBlockConfig>
\ No newline at end of file
diff --git a/website/content/docs/connect/gateways/api-gateway/define-routes/route-to-peered-services.mdx b/website/content/docs/connect/gateways/api-gateway/define-routes/route-to-peered-services.mdx
deleted file mode 100644
index 414ce45f53530..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/define-routes/route-to-peered-services.mdx
+++ /dev/null
@@ -1,76 +0,0 @@
----
-page_title: Route Traffic to Peered Services
-description: Learn how to configure Consul API Gateway to route traffic to services connected to the mesh through a peering connection.
----
-
-# Route Traffic to Peered Services
-
-This topic describes how to configure Consul API Gateway to route traffic to services connected to the mesh through a cluster peering connection.
-
-## Requirements
-
-- Consul v1.14 or later
-- Verify that the [requirements](/consul/docs/api-gateway/tech-specs) have been met.
-- Verify that the Consul API Gateway CRDs and controller have been installed and applied. Refer to [Installation](/consul/docs/connect/gateways/api-gateway/deploy/install-k8s) for details.
-- A peering connection must already be established between Consul clusters. Refer to [Cluster Peering on Kubernetes](/consul/docs/k8s/connect/cluster-peering/tech-specs) for instructions.
-- The Consul service that you want to route traffic to must be exported to the cluster containing your `Gateway`. Refer to [Cluster Peering on Kubernetes](/consul/docs/k8s/connect/cluster-peering/tech-specs) for instructions.
-- A `ServiceResolver` for the Consul service you want to route traffic to must be created in the cluster that contains your `Gateway`. Refer to [Service Resolver Configuration Entry](/consul/docs/connect/config-entries/service-resolver) for instructions.
-
-## Configuration
-
-Specify the following fields in your `MeshService` configuration to use this feature. Refer to the [MeshService configuration reference](/consul/docs/connect/gateways/api-gateway/configuration/meshservice) for details about the parameters.
-
-- [`name`](/consul/docs/connect/gateways/api-gateway/configuration/meshservice#name)
-- [`peer`](/consul/docs/connect/gateways/api-gateway/configuration/meshservice#peer)
-
-## Example
-
-In the following example, routes that use `example-mesh-service` as a backend are configured to send requests to the `echo` service exported by the peered Consul cluster `cluster-02`.
-
-<CodeBlockConfig filename="serviceresolver.yaml">
-
-```yaml hideClipboard
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceResolver
-metadata:
-  name: echo
-spec:
-  redirect:
-    peer: cluster-02
-    service: echo
-```
-</CodeBlockConfig>
-
-<CodeBlockConfig filename="meshservice.yaml">
-
-```yaml hideClipboard
-apiVersion: api-gateway.consul.hashicorp.com/v1alpha1
-kind: MeshService
-metadata:
-  name: example-mesh-service
-spec:
-  name: echo
-  peer: cluster-02
-```
-</CodeBlockConfig>
-
-After applying the `meshservice.yaml` configuration, an `HTTPRoute` may then reference `example-mesh-service` as its `backendRef`.
-
-<CodeBlockConfig filename="route.yaml">
-
-```yaml hideClipboard
-apiVersion: gateway.networking.k8s.io/v1beta1
-kind: HTTPRoute
-metadata:
-  name: example-route
-spec:
-  ...
-  rules:
-    - backendRefs:
-        - group: api-gateway.consul.hashicorp.com
-          kind: MeshService
-          name: example-mesh-service
-          port: 3000
-      ...
-```
-</CodeBlockConfig>
diff --git a/website/content/docs/connect/gateways/api-gateway/define-routes/routes-k8s.mdx b/website/content/docs/connect/gateways/api-gateway/define-routes/routes-k8s.mdx
deleted file mode 100644
index 3e29ac2d346d8..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/define-routes/routes-k8s.mdx
+++ /dev/null
@@ -1,68 +0,0 @@
----
-layout: docs
-page_title: Define API gateway routes on Kubernetes
-description: Learn how to define and attach HTTP and TCP routes to Consul API gateway listeners in Kubernetes-orchestrated networks. 
----
-
-# Define API gateway routes on Kubernetes
-
-This topic describes how to configure HTTP and TCP routes and attach them to Consul API gateway listeners in Kubernetes-orchestrated networks. Routes are rule-based configurations that allow external clients to send requests to services in the mesh. For information   
-
-## Overview
-
-The following steps describe the general workflow for defining and deploying routes:
-
-1. Define a route configuration that specifies the protocol type, name of the gateway to attach to, and rules for routing requests.  
-1. Deploy the configuration to create the routes and attach them to the gateway.
-
-Routes and the gateways they are attached to are eventually-consistent objects. They provide feedback about their current state through a series of status conditions. As a result, you must manually check the route status to determine if the route successfully bound to the gateway.
-
-## Requirements
-
-Verify that your environment meets the requirements specified in [Technical specifications for Kubernetes](/consul/docs/connect/gateways/api-gateway/tech-specs).
-
-### OpenShift
-
-If your Kubernetes-orchestrated network runs on OpenShift, verify that OpenShift is enabled for your Consul installation. Refer to [OpenShift requirements](/consul/docs/connect/gateways/api-gateway/tech-specs#openshift-requirements) for additional information. 
-
-## Define routes
-
-Define route configurations and bind them to listeners configured on the gateway so that Consul can route incoming requests to services in the mesh.
-
-1. Create a configuration file and specify the following fields:
-
-   - `apiVersion`: Specifies the Kuberenetes API gateway version. This must be set to `gateway.networking.k8s.io/v1beta1`
-   - `kind`: Set to `HTTPRoute` or `TCPRoute`.
-   - `metadata.name`:  Specify a name for the route. The name is metadata that you can use to reference the configuration when performing Consul operations.
-   - `spec.parentRefs.name`: Specifies a list of API gateways that the route binds to. 
-   - `spec. rules`: Specifies a list of routing rules for constructing a routing table that maps listeners to services.
-   
-   Refer to the [`Routes` configuration reference](/consul/docs/connect/gateways/api-gateway/configuration/routes) for details about configuring route rules.
-
-1. Configure any additional fields necessary for your use case, such as the namespace or admin partition.
-1. Save the configuration.
-
-The following example creates a route named `example-route` associated with a listener defined in `example-gateway`.
-
-```yaml
-apiVersion: gateway.networking.k8s.io/v1beta1
-kind: HTTPRoute
-metadata:
-  name: example-route
-spec:
-  parentRefs:
-  - name: example-gateway
-  rules:
-  - backendRefs:
-    - kind: Service
-      name: echo
-      port: 8080
-```
-
-## Deploy the route configuration
-
-Apply the configuration to your cluster using the `kubectl` command. The following command applies the configuration to the `consul` namespace:
-
-```shell-session
-$ kubectl apply -f my-route.yaml -n consul
-```
diff --git a/website/content/docs/connect/gateways/api-gateway/define-routes/routes-vms.mdx b/website/content/docs/connect/gateways/api-gateway/define-routes/routes-vms.mdx
deleted file mode 100644
index 5fe459d2062b3..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/define-routes/routes-vms.mdx
+++ /dev/null
@@ -1,121 +0,0 @@
----
-layout: docs
-page_title: Define API gateway routes on virtual machines
-description: Learn how to define and attach HTTP and TCP routes to Consul API gateway listeners so that requests from external clients can reach services in the mesh. 
----
-
-# Define API gateway routes on virtual machines
-
-This topic describes how to configure HTTP and TCP routes and attach them to Consul API gateway listeners. Routes are rule-based configurations that allow external clients to send requests to services in the mesh. 
-
-## Overview
-
-The following steps describe the general workflow for defining and deploying routes:
-
-1. Define routes in an HTTP or TCP configuration entry. The configuration entry includes rules for routing requests, target services in the mesh for the traffic, and the name of the gateway to attach to.  
-1. Deploy the configuration entry to create the routes and attach them to the gateway.
-
-Routes and the gateways they are attached to are eventually-consistent objects. They provide feedback about their current state through a series of status conditions. As a result, you must manually check the route status to determine if the route is bound to the gateway successfully.
-
-## Requirements
-
-The following requirements must be satisfied to use API gateways on VMs:
-
-- Consul 1.15 or later
-- A Consul cluster with service mesh enabled. Refer to [`connect`](/consul/docs/agent/config/config-files#connect)
-- Network connectivity between the machine deploying the API Gateway and a Consul cluster agent or server
-
-### ACL requirements
-
-If ACLs are enabled, you must present a token with the following permissions to
-configure Consul and deploy API gateway routes:
-
-- `mesh: read`
-- `mesh: write`
-
-Refer [Mesh Rules](/consul/docs/security/acl/acl-rules#mesh-rules) for
-additional information about configuring policies that enable you to interact
-with Consul API gateway configurations.
-
-## Define the routes
-
-Define route configurations and bind them to listeners configured on the gateway so that Consul can route incoming requests to services in the mesh.
-
-1. Create a route configuration entry file and specify the following settings:
-   - `Kind`: Set to `http` or `tcp`.
-   - `Name`:  Specify a name for the route. The name is metadata that you can use to reference the configuration when performing Consul operations.
-   - `Parents`: Specifies a list of API gateways that the route binds to. 
-   - `Rules`: If you are configuring HTTP routes, define a list of routing rules for constructing a routing table that maps listeners to services. Each member of the list is a map that may containing the following fields:
-      - `Filters`
-      - `Matches`
-      - `Services`
-
-   Refer to the [HTTP route configuration entry](/consul/docs/connect/config-entries/http-route) and [TCP route configuration entry](/consul/docs/connect/config-entries/tcp-route) reference for details about configuring routes.
-
-1. Configure any additional fields necessary for your use case, such as the namespace or admin partition.
-1. Save the configuration.
-
-
-The following example routes requests from the listener on the API gateway at port `8443` to services in Consul based on the path of the request. When an incoming request starts at path `/`, Consul forwards 90 percent of the requests to the `ui` service and 10 percent to `experimental-ui`. Consul also forwards requests starting with `/api` to `api`.
-
-```hcl
-Kind = "http-route"
-Name = "my-http-route"
-
-// Rules define how requests will be routed
-Rules = [
-  // Send all requests to UI services with 10% going to the "experimental" UI
-  {
-    Matches = [
-      {
-        Path = {
-          Match = "prefix"
-          Value = "/"
-        }
-      }
-    ]
-    Services = [
-      {
-        Name = "ui"
-        Weight = 90
-      },
-      {
-        Name = "experimental-ui"
-        Weight = 10
-      }
-    ]
-  },
-  // Send all requests that start with the path `/api` to the API service
-  {
-    Matches = [
-      {
-        Path = {
-          Match = "prefix"
-          Value = "/api"
-        }
-      }
-    ]
-    Services = [
-      {
-        Name = "api"
-      }
-    ]
-  }
-]
-
-Parents = [
-  {
-    Kind = "api-gateway"
-    Name = "my-gateway"
-    SectionName = "my-http-listener"
-  }
-]
-```
-
-## Deploy the route configuration
-
-Run the `consul config write` command to attach the routes to the specified gateways. The following example writes a configuration called `my-http-route.hcl`:
-
-```shell-session
-$ consul config write my-http-route.hcl
-```
\ No newline at end of file
diff --git a/website/content/docs/connect/gateways/api-gateway/deploy/listeners-k8s.mdx b/website/content/docs/connect/gateways/api-gateway/deploy/listeners-k8s.mdx
deleted file mode 100644
index 7ce6ed9c50029..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/deploy/listeners-k8s.mdx
+++ /dev/null
@@ -1,74 +0,0 @@
----
-layout: docs
-page_title: Deploy API gateway listeners in Kubernetes
-description: >-
-  Learn how to create API gateway configurations in Kubernetes that enable you to instantiate gateway instances.
----
-
-# Deploy API gateway listeners in Kubernetes
-
-This topic describes how to deploy Consul API gateway listeners to Kubernetes-orchestrated environments. If you want to implement API gateway listeners on VMs, refer to [Deploy API gateway listeners to virtual machines](/consul/docs/connect/gateways/api-gateway/deploy/listeners-vms).
-
-## Overview
-
-API gateways have one or more listeners that serve as ingress points for requests to services in a Consul service mesh. Create an [API gateway configuration](/consul/docs/connect/gateways/api-gateway/configuration/gateway) and define listeners that expose ports on the endpoint for ingress. Apply the configuration to direct Kubernetes to start API gateway services. 
-
-### Routes
-
-After deploying the gateway, attach HTTP or TCP [routes](/consul/docs/connect/gateways/api-gateway/configuration/routes) to listeners defined in the gateway to control how requests route to services in the network.
-
-### Intentions
-
-Configure Consul intentions to allow or prevent traffic between gateway listeners and services in the mesh. Refer to [Service intentions](/consul/docs/connect/intentions) for additional information. 
-
-
-## Requirements
-
-1. Verify that your environment meets the requirements specified in [Technical specifications for Kubernetes](/consul/docs/connect/gateways/api-gateway/tech-specs).
-1. Verify that the Consul API Gateway CRDs were applied. Refer to [Installation](/consul/docs/connect/gateways/api-gateway/install-k8s) for details.
-1. If your Kubernetes-orchestrated network runs on OpenShift, verify that OpenShift is enabled for your Consul installation. Refer to [OpenShift requirements](/consul/docs/connect/gateways/api-gateway/tech-specs#openshift-requirements) for additional information. 
-
-## Define the gateway and listeners
-
-Create an API gateway values file that defines the gateway and listeners.
-
-1. Specify the following fields:
-    - `apiVersion`: Specifies the Kubernetes gateway API version. Must be `gateway.networking.k8s.io/v1beta1`.
-    - `kind`: Specifies the type of configuration entry to implement. This must be `Gateway`. 
-    - `metadata.name`:  Specify a name for the gateway configuration. The name is metadata that you can use to reference the configuration when performing Consul operations.
-    - `spec.gatewayClassName`:  Specify the name of a `gatewayClass` configuration. Gateway classes are template-like resources in Kubernetes for instantiating gateway services. Specify `consul` to use the default gateway class shipped with Consul. Refer to the [GatewayClass configuration reference](/consul/docs/connect/gateways/api-gateway/configuration/gatewayclass) for additional information.
-    - `spec.listeners`: Specify a list of listener configurations. Each listener is map containing the following fields:
-      - `port`: Specifies the port that the listener receives traffic on.
-      - `name`: Specifies a unique name for the listener.
-      - `protocol`: You can set either `tcp` or `http` 
-      - `allowedRoutes.namespaces`: Contains configurations for determining which namespaces are allowed to attach a route to the listener. 
-1. Configure any additional fields necessary for your use case, such as the namespace or admin partition. Refer to the [API gateway configuration entry reference](/consul/docs/connect/gateways/api-gateway/configuration/gateway) for additional information.
-1. Save the configuration.
-
-In the following example, the API gateway specifies an HTTP listener on port `80`:
-
-```yaml
-apiVersion: gateway.networking.k8s.io/v1beta1
-kind: Gateway
-metadata:
-  name: my-gateway
-  namespace: consul
-spec:
-  gatewayClassName: consul
-  listeners:
-  - protocol: HTTP
-    port: 80
-    name: http
-    allowedRoutes:
-      namespaces:
-        from: "All"
-```
-
-
-## Deploy the API gateway and listeners
-
-Apply the configuration to your cluster using the `kubectl` command. The following command applies the configuration to the `consul` namespace:
-
-```shell-session
-$ kubectl apply -f my-gateway.yaml -n consul
-```
\ No newline at end of file
diff --git a/website/content/docs/connect/gateways/api-gateway/deploy/listeners-vms.mdx b/website/content/docs/connect/gateways/api-gateway/deploy/listeners-vms.mdx
deleted file mode 100644
index 1a868ca857034..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/deploy/listeners-vms.mdx
+++ /dev/null
@@ -1,113 +0,0 @@
----
-layout: docs
-page_title: Deploy API gateway listeners to virtual machines
-description: Learn how to configure and Consul API gateways and gateway listeners on virtual machines so that you can enable ingress requests to services in your service mesh in VM environments.
----
-
-# Deploy API gateway listeners to virtual machines
-
-This topic describes how to deploy Consul API gateway listeners to networks that operate in virtual machine (VM) environments. If you want to implement API gateway listeners in a Kubernetes environment, refer to [Deploy API gateway listeners to Kubernetes](/consul/docs/connect/gateways/api-gateway/deploy/listeners-k8s).
-
-## Overview
-
-API gateways have one or more listeners that serve as ingress points for requests to services in a Consul service mesh. Create an [API gateway configuration entry](/consul/docs/connect/config-entries/api-gateway) and define listeners that expose ports on the endpoint for ingress.
-
-The following steps describe the general workflow for deploying a Consul API gateway to a VM environment:
-
-1. Create an API gateway configuration entry. The configuration entry includes listener configurations and references to TLS certificates.
-1. Deploy the API gateway configuration entry to create the listeners.
-
-### Encryption
-
-To encrypt traffic between the external client and the service that the API gateway routes traffic to, define an inline certificate configuration and attach it to your listeners. Refer to [Encrypt API gateway traffic on virtual machines](/consul/docs/connect/gateways/api-gateway/secure-traffic/encrypt-vms) for additional information.
-
-### Routes
-
-After deploying the gateway, attach [HTTP](/consul/docs/connect/config-entries/http-route) routes and [TCP](/consul/docs/connect/config-entries/tcp-route) routes to listeners defined in the gateway to control how requests route to services in the network. Refer to [Define API gateway routes on VMs](/consul/docs/connect/gateways/api-gateway/define-routes/routes-vms) for additional information.
-
-## Requirements
-
-The following requirements must be satisfied to use API gateways on VMs:
-
-- Consul 1.15 or later
-- A Consul cluster with service mesh enabled. Refer to [`connect`](/consul/docs/agent/config/config-files#connect)
-- Network connectivity between the machine deploying the API Gateway and a
-  Consul cluster agent or server
-
-### ACL requirements
-
-If ACLs are enabled, you must present a token with the following permissions to
-configure Consul and deploy API gateways:
-
-- `mesh: read`
-- `mesh: write`
-
-Refer to [Mesh Rules](/consul/docs/security/acl/acl-rules#mesh-rules) for
-additional information about configuring policies that enable you to interact
-with Consul API gateway configurations.
-
-## Define the gateway and listeners
-
-Create an API gateway configuration entry that defines listeners and TLS certificates
-in the mesh.
-
-1. Specify the following fields:
-	- `Kind`: Specifies the type of configuration entry to implement. This must be `api-gateway`. 
-  	- `Name`:  Specify a name for the gateway configuration. The name is metadata that you can use to reference the configuration entry when performing Consul operations.
-	- `Listeners`: Specify a list of listener configurations. Each listener is map containing the following fields:
-    	- `Port`: Specifies the port that the listener receives traffic on.
-		- `Name`: Specifies a unique name for the listener.
-		- `Protocol`: You can set either `tcp` or `http`
-		- `TLS`: Defines TLS encryption configurations for the listener. 
-
-	Refer to the [API gateway configuration entry reference](/consul/docs/connect/config-entries/api-gateway) for details on how to define fields in the `Listeners` block. 
-1. Configure any additional fields necessary for your use case, such as the namespace or admin partition. Refer to the [API gateway configuration entry reference](/consul/docs/connect/config-entries/api-gateway) for additional information.
-1. Save the configuration.
-
-In the following example, the API gateway specifies an HTTP listener on port `8443`. It also requires an inline-certificate configuration entry named `my-certificate` that contains a valid certificate and private key pair:
-
-```hcl
-Kind = "api-gateway"
-Name = "my-gateway"
-
-// Each listener configures a port which can be used to access the Consul cluster
-Listeners = [
-	{
-		Port = 8443
-		Name = "my-http-listener"
-		Protocol = "http"
-		TLS = {
-			Certificates = [
-				{
-					Kind = "inline-certificate"
-					Name = "my-certificate"
-				}
-			]
-		}
-	}
-]
-```
-
-Refer to [API Gateway Configuration Reference](/consul/docs/connect/gateways/api-gateway/configuration/api-gateway) for
-information about all configuration fields.
-
-Gateways and routes are eventually-consistent objects that provide feedback
-about their current state through a series of status conditions. As a result,
-you must manually check the route status to determine if the route
-bound to the gateway successfully.
-
-## Deploy the API gateway and listeners
-
-Use the `consul config write` command to implement the API gateway configuration entry. The following command applies the configuration entry for the main gateway object:
-
-```shell-session
-$ consul config write gateways.hcl
-```
-
-Run the following command to deploy an API gateway instance:
-
-```shell-session
-$ consul connect envoy -gateway api -register -service my-api-gateway
-```
-
-The command directs Consul to configure Envoy as an API gateway. Gateways and routes are eventually-consistent objects that provide feedback about their current state through a series of status conditions. As a result, you must manually check the route status to determine if the route successfully bound to the gateway successfully.
diff --git a/website/content/docs/connect/gateways/api-gateway/index.mdx b/website/content/docs/connect/gateways/api-gateway/index.mdx
index a5edc2cf7038c..832fd943b2eef 100644
--- a/website/content/docs/connect/gateways/api-gateway/index.mdx
+++ b/website/content/docs/connect/gateways/api-gateway/index.mdx
@@ -1,61 +1,28 @@
 ---
 layout: docs
-page_title: API gateways overview
-description: API gateways provide an ingress point for service mesh traffic. Learn how API gateways add listeners for external traffic and route HTTP requests to services in the mesh.
+page_title: API Gateways Overview
+description: API gateways are objects in Consul that enable ingress requests to services in your service mesh. Learn about API gateways for VMs in this overview.
 ---
 
-# API gateways overview
+# API gateway overview
 
-This topic provides overview information about API gateways in Consul. API gateways enable external network clients to access applications and services running in a Consul datacenter. Consul API gateways can also forward requests from clients to specific destinations based on path or request protocol.
-
-## API gateway use cases
+API gateways enable external network clients to access applications and services
+running in a Consul datacenter. This type of network traffic is commonly
+called _north-south_ network traffic because it refers to the flow of
+data into and out of a specific environment. API gateways can also forward
+requests from clients to specific destinations based on path or request
+protocol.
 
 API gateways solve the following primary use cases:
 
-- **Control access at the point of entry**: Set the protocols of external connection requests and secure inbound connections with TLS certificates from trusted providers, such as Verisign and Let's Encrypt.
-- **Simplify traffic management**: Load balance requests across services and route traffic to the appropriate service by matching one or more criteria, such as hostname, path, header presence or value, and HTTP method.
-
-## Workflows
-
-You can deploy API gateways to networks that implement a variety of computing environments: 
-
-- Services hosted on VMs
-- Kubernetes-orchestrated service containers
-- Kubernetes-orchestrated service containers in OpenShift
-
-The following steps describe the general workflow for deploying a Consul API gateways:
-
-1. For Kubernetes-orchestrated services, install Consul on your cluster. For Kubernetes-orchestrated services on OpenShift, you must also enable the `openShift.enabled` parameter. Refer to [Install Consul on Kubernetes](/consul/docs/connect/gateways/api-gateway/install-k8s) for additional information.  
-1. Define and deploy the API gateway configurations to create the API gateway artifacts. For VM-hosted services, create configuration entries for the gateway service, listeners configurations, and references to TLS certificates. For Kubernetes-orchestrated, configurations also include `GatewayClassConfig`s and `parametersRef`s. 
-1. Define and deploy routes between the gateway listeners and services in the mesh. 
-
-Gateway configurations are modular, so you can define and attach routes and inline certificates to multiple gateways.
-
-## Technical specifications
-
-Refer to [Technical specifications for API gateways on Kubernetes](/consul/docs/connect/gateways/api-gateway/tech-specs) for additional details and considerations about using API gateways in Kubernetes-orchestrated networks. 
-
-## Guidance
-
-Refer to the following resources for help setting up and using API gateways:
-
-### Tutorials
-
-- [Control access into the service mesh with Consul API gateway](/consul/tutorials/developer-mesh/kubernetes-api-gateway)
-
-### Usage documentation
-
-- [Deploy API gateway listeners to VMs](/consul/docs/connect/gateways/api-gateway/deploy/listeners-vms)
-- [Deploy API gateway listeners to Kubernetes](/consul/docs/connect/gateways/api-gateway/deploy/listeners-k8s)
-- [Deploy API gateway routes to VMs](/consul/docs/connect/gateways/api-gateway/define-routes/routes-vms)
-- [Deploy API gateway routes to Kubernetes](/consul/docs/connect/gateways/api-gateway/define-routes/routes-k8s)
-- [Reroute HTTP requests in Kubernetes](/consul/docs/connect/gateways/api-gateway/define-routes/reroute-http-requests)
-- [Route traffic to peered services in Kubernetes](/consul/docs/connect/gateways/api-gateway/define-routes/route-to-peered-services)
-- [Encrypt API gateway traffic on VMs](/consul/docs/connect/gateways/api-gateway/secure-traffic/encrypt-vms)
-- [Use JWTs to verify requests to API gateways on VMs](/consul/docs/connect/gateways/api-gateway/secure-traffic/jwts-vms)
-- [Use JWTs to verify requests to API gateways on Kubernetes](/consul/docs/connect/gateways/api-gateway/secure-traffic/jwts-k8s)
-
-### Reference
-
-- [API gateway configuration reference overview](/consul/docs/connect/gateways/api-gateway/configuration/)
-- [Error messages](/consul/docs/connect/gateways/api-gateway/errors)
+- **Control access at the point of entry**: Set the protocols of external connection
+  requests and secure inbound connections with TLS certificates from trusted
+  providers, such as Verisign and Let's Encrypt.
+- **Simplify traffic management**: Load balance requests across services and route
+  traffic to the appropriate service by matching one or more criteria, such as
+  hostname, path, header presence or value, and HTTP method.
+
+Consul supports API
+gateways for virtual machines and Kubernetes networks. Refer to the following documentation for next steps:
+- [API Gateways on VMs](/consul/docs/connect/gateways/api-gateway/usage)
+- [API Gateways for Kubernetes](/consul/docs/api-gateway).
diff --git a/website/content/docs/connect/gateways/api-gateway/install-k8s.mdx b/website/content/docs/connect/gateways/api-gateway/install-k8s.mdx
deleted file mode 100644
index 786e1e0304bb8..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/install-k8s.mdx
+++ /dev/null
@@ -1,83 +0,0 @@
----
-layout: docs
-page_title: Install API Gateway for Kubernetes
-description: >-
-  Learn how to install custom resource definitions (CRDs) and configure the Helm chart so that you can run Consul API Gateway on your Kubernetes deployment.
----
-
-# Install API gateway for Kubernetes
-
-The Consul API gateway ships with Consul and is automatically installed when you install Consul on Kubernetes. Before you begin the installation process, verify that the environment you are deploying Consul and the API gateway in meets the requirements listed in the [Technical Specifications](/consul/docs/connect/gateways/api-gateway/tech-specs). Refer to the [Release Notes](/consul/docs/release-notes) for any additional information about the version you are deploying.
-
-1. Create a `values.yaml` file for configuring your Consul API gateway deployment and include the following settings:
-
-    <CodeBlockConfig filename="values.yaml">
-
-    ```yaml
-    global:
-      name: consul
-    connectInject:
-      enabled: true
-      apiGateway:
-        manageExternalCRDs: true
-    ```
-
-    </CodeBlockConfig>
-
-  The Consul Helm chart deploys the API gateway using the configuration specified in the `values.yaml` file. Refer to [Helm Chart Configuration - `connectInject.apiGateway`](/consul/docs/k8s/helm#apigateway) for information about the Helm chart configuration options.
-
-1. If you are installing Consul on an OpenShift Kubernetes cluster, you must include the `global.openShift.enabled` parameter and set it to `true`:
-
-   <CodeBlockConfig filename="values.yaml">
-
-   ```yaml
-   global:
-     openshift:
-       enabled: true
-  ```
-
-  </CodeBlockConfig>
-
-  Refer to [OpenShift requirements](/consul/docs/connect/gateways/api-gateway/tech-specs#openshift-requirements) for additional information.
-
-1. Install Consul API Gateway using the standard Consul Helm chart or Consul K8s CLI specify the custom values file. Refer to the [Consul Helm chart](https://github.com/hashicorp/consul-k8s/releases) in GitHub releases for the available versions.
-
-<Tabs>
-<Tab heading="Consul K8s CLI (Mac Only)">
-
-Refer to the official [Consul K8S CLI documentation](/consul/docs/k8s/k8s-cli) to find additional settings.
-
-```shell-session
-$ brew tap hashicorp/tap
-```
-
-```shell-session
-$ brew install hashicorp/tap/consul-k8s
-```
-
-```shell-session
-$ consul-k8s install -config-file=values.yaml -set global.image=hashicorp/consul:1.16.0
-```
-
-</Tab>
-<Tab heading="Helm">
-
-Add the HashiCorp Helm repository.
-
-```shell-session
-$ helm repo add hashicorp https://helm.releases.hashicorp.com
-```
-Install Consul with API Gateway on your Kubernetes cluster by specifying the `values.yaml` file.
-
-```shell-session
-$ helm install consul hashicorp/consul --version 1.2.0 --values values.yaml --create-namespace --namespace consul
-```
-</Tab>
-</Tabs>
-
-<!--
-****** KEEP ALL PAGE CONTENT ABOVE THIS LINE *******
-Only Reference style links should be added below this comment
---->
-[tech-specs]: /consul/docs/api-gateway/tech-specs
-[rel-notes]: /consul/docs/release-notes
diff --git a/website/content/docs/connect/gateways/api-gateway/secure-traffic/encrypt-vms.mdx b/website/content/docs/connect/gateways/api-gateway/secure-traffic/encrypt-vms.mdx
deleted file mode 100644
index 3520dfbc2ee5d..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/secure-traffic/encrypt-vms.mdx
+++ /dev/null
@@ -1,66 +0,0 @@
----
-layout: docs
-page_title: Encrypt API gateway traffic on virtual machines
-description: Learn how to define inline certificate config entries and deploy them to Consul. Inline certificate configuration entries enable you to attach TLS certificates and keys to gateway listeners so that traffic between external clients and gateway listeners is encrypted.
----
-
-# Encrypt API gateway traffic on virtual machines
-
-This topic describes how to make TLS certificates available to API gateways so that requests between the user and the gateway endpoint are encrypted. 
-
-## Requirements
-
-- Consul 1.15 or later
-- You must have a certificate and key from your CA   
-- A Consul cluster with service mesh enabled. Refer to [`connect`](/consul/docs/agent/config/config-files#connect)
-- Network connectivity between the machine deploying the API gateway and a
-  Consul cluster agent or server
-
-### ACL requirements
-
-If ACLs are enabled, you must present a token with the following permissions to
-configure Consul and deploy API gateways:
-
-- `mesh: read`
-- `mesh: write`
-
-Refer [Mesh Rules](/consul/docs/security/acl/acl-rules#mesh-rules) for
-additional information about configuring policies that enable you to interact
-with Consul API gateway configurations.
-
-## Define TLS certificates
-
-1. Create an [`inline-certificate` configuration entry](/consul/docs/connect/gateways/api-gateway/configuration/inline-certificate) and specify the following fields:
-   - `Kind`: Specifies the type of configuration entry. This must be set to `inline-certificate`.
-   - `Name`: Specify the name in the [API gateway listener configuration](/consul/docs/connect/gateways/api-gateway/configuration/api-gateway#listeners) to bind the certificate to that listener.  
-   - `Certificate`: Specifies the inline public certificate to use for TLS as plain text.
-   - `PrivateKey`: Specifies the inline private key to use for TLS as plain text.
-1. Configure any additional fields necessary for your use case, such as the namespace or admin partition. Refer to the [`inline-certificate` configuration entry](/consul/docs/connect/gateways/api-gateway/configuration/inline-certificate) reference for additional information.
-1. Save the configuration.
-
-The following example defines a certificate named `my-certificate`. API gateway configurations that specify `inline-certificate` in the `Certificate.Kind` field and `my-certificate` in the `Certificate.Name` field are able to use the certificate.
-
-```hcl
-Kind = "inline-certificate"
-Name = "my-certificate"
-
-Certificate = <<EOF
------BEGIN CERTIFICATE-----
-...
------END CERTIFICATE-----
-EOF
-
-PrivateKey = <<EOF
------BEGIN RSA PRIVATE KEY-----
-...
------END RSA PRIVATE KEY-----
-EOF
-```
-
-## Deploy the configuration to Consul
-
-Run the `consul config write` command to enable listeners to use the certificate. The following example writes a configuration called `my-certificate.hcl`:
-
-```shell-session
-$ consul config write my-certificate.hcl
-```
diff --git a/website/content/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-k8s.mdx b/website/content/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-k8s.mdx
deleted file mode 100644
index dc390baad04be..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-k8s.mdx
+++ /dev/null
@@ -1,72 +0,0 @@
----
-layout: docs
-page_title: Use JWTs to verify requests to API gateways on Kubernetes
-description: Learn how to use JSON web tokens (JWT) to verify requests from external clients to listeners on an API gateway on Kubernetes-orchestrated networks.
----
-
-# Use JWTs to verify requests to API gateways on Kubernetes
-
-This topic describes how to use JSON web tokens (JWT) to verify requests to API gateways deployed to Kubernetes-orchestrated containers. If your API gateway is deployed to virtual machines, refer to [Use JWTs to verify requests to API gateways on VMs](/consu/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-vms).
-
-## Overview
- 
-You can configure API gateways to use JWTs to verify incoming requests so that you can stop unverified traffic at the gateway. You can configure JWT verification at different levels:
-
-- Listener defaults: Define basic defaults that apply to all routes attached to a listener.
-- HTTP route-specific settings: You can define JWT authentication settings for specific HTTP routes. Route-specific JWT settings override default listener configurations. 
-- Listener overrides: Define override settings that take precedence over default and route-specific configurations. This enables you to set enforceable policies for listeners.
-
-
-Complete the following steps to use JWTs to verify requests:
-
-1. Define a policy that specifies default and override settings for API gateway listeners and attach it to the gateway.   
-1. Define an HTTP route auth filter that specifies route-specific JWT verification settings.
-1. Attach the auth filter to the HTTP route values file. 
-1. Apply the configurations. 
-
-
-## Requirements
-
-- Consul v1.17+
-- Consul on Kubernetes CLI or Helm chart v1.3.0+
-- JWT details, such as claims and provider
-
-## Define override and default settings
-
-Create a `GatewayPolicy` values file and configure the following fields to define default and override settings for JWT verification. Refer to [`GatewayPolicy` configuration reference](/consul/docs/connect/gateways/api-gateway/configuration/gatewaypolicy) for details.  
-
-- `kind`: Must be set to `GatewayPolicy`
-- `metadata.name`: Specifies a name for the policy.
-- `spec.targetRef.name`: Specifies the name of the API gateway to attach the policy to.
-- `spec.targetRef.kind`: Specifies the kind of resource to attach to the policy to. Must be set to `Gateway`. 
-- `spec.targetRef.group`: Specifies the resource group. Unless you have created a custom group, this should be set to `gateway.networking.kuberenetes.io`.
-- `spec.targetRef.sectionName`: Specifies a part of the gateway that the policy applies to.
-- `spec.targetRef.override.jwt.providers`: Specifies a list of providers and claims used to verify requests to the gateway. The override settings take precedence over the default and route-specific JWT verification settings. 
-- `spec.targetRef.default.jwt.providers`: Specifies a list of default providers and claims used to verify requests to the gateway. 
-
-## Define an HTTP route auth filter
-
-Create an `RouteAuthFilter` values file and configure the following fields. Refer to [`RouteAuthFilter` configuration reference](/consul/docs/connect/gateways/api-gateway/configuration/routeauthfilter) for details.  
-
-- `kind`: Must be set to `HTTRouteAuthFilter`
-- `metadata.name`: Specifies a name for the filter.
-- `metadata.namespace`: Specifies the Consul namespace the filter applies to.
-- `spec.jwt.providers`: Specifies a list of providers and claims used to verify requests to the gateway. The override settings take precedence over the default and route-specific JWT verification settings. 
-
-## Attach the auth filter to your HTTP routes
-
-In the `filters` field of your HTTP route configuration, add the following fields. Refer to the [`extensionRef` configuration reference](/consul/docs/connect/gateways/api-gateway/configuration/routes#rules-filters-extensionref) for details: 
-
-- `type: extensionRef`: Declare list of extension references. 
-- `extensionRef.group`: Specifies the resource group. Unless you have created a custom group, this should be set to `gateway.networking.kuberenetes.io`.
-- `extensionRef.kind`: Specifies the type of extension reference to attach to the route. Must be `RouteAuthFilter`
-- `extensionRef.name`: Specifies the name of the auth filter. 
-
-## Apply the configurations
-
-Run the `kubectl apply` command and specify the values files to apply the configurations. The following example applies the values files stored in the `jwt-routes` directory:
-
-```shell-session
-$ kubectl apply -f jwt-routes
-```
-
diff --git a/website/content/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-vms.mdx b/website/content/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-vms.mdx
deleted file mode 100644
index efb960f580ff8..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-vms.mdx
+++ /dev/null
@@ -1,43 +0,0 @@
----
-layout: docs
-page_title: Use JWTs to verify requests to API gateways on virtual machines
-description: Learn how to use JSON web tokens (JWT) to verify requests from external clients to listeners on an API gateway.
----
-
-# Use JWTs to verify requests to API gateways on virtual machines
-
-This topic describes how to use JSON web tokens (JWT) to verify requests to API gateways on virtual machines (VM). If your services are deployed to Kubernetes-orchestrated containers, refer to [Use JWTs to verify requests to API gateways on Kubernetes](/consul/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-vms).
-
-## Overview
- 
-You can configure API gateways to use JWTs to verify incoming requests so that you can stop unverified traffic at the gateway. You can configure JWT verification at different levels:
-
-- Listener defaults: Define basic defaults that apply to all routes attached to a listener.
-- HTTP route-specific settings: You can define JWT authentication settings for specific HTTP routes. Route-specific JWT settings override default configurations. 
-- Listener overrides: Define override settings that take precedence over default and route-specific configurations. This enables you to set enforceable policies for listeners.
-
-Complete the following steps to use JWTs to verify requests:
-
-1. Configure default and override settings for listeners in the API gateway configuration entry. 
-1. Define route-specific JWT verification settings as filters in the HTTP route configuration entries. 
-1. Write the configuration entries to Consul to begin verifying requests using JWTs.
-
-## Requirements
-
-- Consul 1.17 or later
-- JWT details, such as claims and provider
-
-## Configure default and override settings
-
-Define default and override settings for JWT verification in the [API gateway configuration entry](/consul/docs/connect/gateways/api-gateway/configuration/api-gateway). 
-
-1. Add a `default.JWT` block to the listener that you want to apply JWT verification to. Consul applies these configurations to routes attached to the listener. Refer to the [`Listeners.default.JWT`](/consul/docs/connect/config-entries/api-gateway#listeners-default-jwt) configuration reference for details. 
-1. Add an `override.JWT` block to the listener that you want to apply JWT verification policies to. Consul applies these configurations to all routes attached to the listener, regardless of the `default` or route-specific settings. Refer to the [`Listeners.override.JWT`](/consul/docs/connect/config-entries/api-gateway#listeners-override-jwt) configuration reference for details. 
-1. Apply the settings in the API gateway configuration entry. You can use the [`/config` API endpoint](/consul/api-docs/config#apply-configuration) or the [`consul config write` command](/consul/commands/config/write). 
-
-## Configure verification for specific HTTP routes
-
-Define filters to enable route-specific JWT verification settings in the [HTTP route configuration entry](/consul/docs/connect/config-entries/http-route). 
-
-1. Add a `JWT` configuration to the `rules.filter` block. Route-specific configurations that overlap the [default settings ](/consul/docs/connect/config-entries/api-gateway#listeners-default-jwt) in the API gateway configuration entry take precedence. Configurations defined in the [listener override settings](/consul/docs/connect/config-entries/api-gateway#listeners-override-jwt) take the highest precedence.
-1. Apply the settings in the API gateway configuration entry. You can use the [`/config` API endpoint](/consul/api-docs/config#apply-configuration) or the [`consul config write` command](/consul/commands/config/write). 
diff --git a/website/content/docs/connect/gateways/api-gateway/tech-specs.mdx b/website/content/docs/connect/gateways/api-gateway/tech-specs.mdx
deleted file mode 100644
index 98f5e28c0c1a2..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/tech-specs.mdx
+++ /dev/null
@@ -1,157 +0,0 @@
----
-layout: docs
-page_title: API gateway for Kubernetes technical specifications
-description: >-
-  Learn about the requirements for installing and using the Consul API gateway for Kubernetes, including required ports, component version minimums, Consul Enterprise limitations, and compatible k8s cloud environments.
----
-
-# API gateway for Kubernetes technical specifications
-
-This topic describes the requirements and technical specifications associated with using Consul API gateway.
-
-## Datacenter requirements
-
-Your datacenter must meet the following requirements prior to configuring the Consul API gateway:
-
-- HashiCorp Consul Helm chart v1.2.0 and later
-
-## TCP port requirements
-
-The following table describes the TCP port requirements for each component of the API gateway.
-
-| Port | Description | Component |
-| ---- | ----------- | --------- |
-| 20000 | Kubernetes readiness probe | Gateway instance pod |
-| Configurable | Port for scraping Prometheus metrics. Disabled by default. | Gateway controller pod |
-
-## OpenShift requirements
-
-You can deploy API gateways to Kubernetes clusters managed by Red Hat OpenShift, which is a security-conscious, opinionated wrapper for Kubernetes. To enable OpenShift support, add the following parameters to your Consul values file and apply the configuration:
-
-```yaml
-  openshift:
-    enabled: true
- ```
-
-Refer to the following topics for additional information:
-
-- [Install Consul on OpenShift clusters with Helm](/consul/docs/k8s/installation/install#install-consul-on-openshift-clusters)
-- [Install Consul on OpenShift clusters with the `consul-k8s` CLI](/consul/docs/k8s/installation/install-cli#install-consul-on-openshift-clusters)
-
-### Security context constraints
-
-OpenShift requires a security context constraint (SCC) configuration, which restricts pods to specific groups. You can create a custom SCC or use one of the default constraints. Refer to the [OpenShift documentation](https://docs.openshift.com/container-platform/4.13/authentication/managing-security-context-constraints.html) for additional information. 
-
-By default, the SCC is set to `restricted-v2` for the `managedGatewayClass` that Consul automatically creates. The `restricted-v2` SCC is one of OpenShifts default SCCs, but you can specify a different SCC in the `openshiftSCCName` parameter:
-
-```yaml
-connectInject:
-  apiGateway:
-    managedGatewayClass:
-      openshiftSCCName: "restricted-v2"
-```
-
-### Privileged container ports
- 
-Containers cannot use privileged ports when OpenShift is enabled. Privileged ports are 1 through 1024, and serving applications from that range is a security risk.
-
-To allow gateway listeners to use privileged port numbers, specify an integer value in the `mapPrivilegedContainerPorts` field of your Consul values configuration. Consul adds the value to listener port numbers that are set to a number in the privileged container range. Consul maps the configured port number to the total port number so that traffic sent to the configured port number is correctly forwarded to the service.
-
-For example, if a gateway listener is configured to port `80` and the `mapPrivilegedContainerPorts` field is configured to `2000`, then the actual port number on the underlying container is `2080`. 
-
-You can set the `mapPrivilegedContainerPorts` parameter in the following map in your Consul values file:
-
-```yaml
-connectInject:
-  apiGateway:
-    managedGatewayClass:
-      mapPrivilegedContainerPorts: <value>
-```
-
-## Supported versions of the Kubernetes gateway API specification
-
-Refer to the [release notes](/consul/docs/release-notes) for your version of Consul.
-
-## Supported Kubernetes gateway specification features
-
-Consul API gateways for Kuberentes support a subset of the Kubernetes Gateway API specification. For a complete list of features, including the list of gateway and route statuses and an explanation on how they
-are used, refer to the [documentation in our GitHub repo](https://github.com/hashicorp/consul-api-gateway/blob/main/dev/docs/supported-features.md): 
-
-### `GatewayClass`
-
-The `GatewayClass` resource describes a class of gateway configurations to use a template for creating `Gateway` resources. You can also specify custom API gateway configurations in a `GatewayClassConfig` CRD and attach them to resource to the `GatewayClass` using the `parametersRef` field. 
-
-You must specify the `"hashicorp.com/consul-api-gateway-controller"` controller so that Consul can manage gateways generated by the `GatewayClass`. Refer to the [Kubernetes `GatewayClass` documentation](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.GatewayClass) for additional information.
-
-### `Gateway` 
-
-The `Gateway` resource is the core API gateway component. Gateways have one or more listeners that can route `HTTP`, `HTTPS`, or `TCP` traffic. You can define header-based hostname matching for listeners, but SNI is not supported. 
-
-You can apply filters to add, remove, and set header values on incoming requests. Gateways support the `terminate` TLS mode and `core/v1/Secret` TLS certificates. Extended option support includes TLS version and cipher constraints. Refer to the [Kubernetes `Gateway` documentation](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.Gateway) for additional information.
-
-### `HTTPRoute`
-
-`HTTPRoute` configurations determine HTTP paths between listeners defined on the gateway and services in the mesh. You can specify weights to load balance traffic, as well as define rules for matching request paths, headers, queries, and methods to ensure that traffic is routed appropriately. You can apply filters to add, remove, and set header values on requests sent through th route. 
-
-Routes support the following backend types:
-
-- `core/v1/Service` backend types when the route maps to service registered with Consul. 
-- `api-gateway.consul.hashicorp.com/v1alpha1/MeshService`. 
-
-Refer to [Kubernetes `HTTPRoute` documentation](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.HTTPRoute) for additional information.
-
-### `TCPRoute`
-
-`TCPRoute` configurations determine TCP paths between listeners defined on the gateway and services in the mesh. Routes support the following backend types:
-
-- `core/v1/Service` backend types when the route maps to service registered with Consul. 
-- `api-gateway.consul.hashicorp.com/v1alpha1/MeshService`. 
-
-Refer to [Kubernetes `TCPRoute` documentation](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.TCPRoute) for additional information.
-
-### `ReferenceGrant`
-
-`ReferenceGrant` resources allow resources to reference resources in other namespaces. They are required to allow references from a `Gateway` to a Kubernetes `core/v1/Secret` in a different namespace. Without a `ReferenceGrant`, `backendRefs` attached to the gateway may not be permitted. As a result, the `ReferenceGrant` sets a `ResolvedRefs` status to `False` with the reason `InvalidCertificateRef`, which prevents the gateway from becoming ready.
-
-`ReferenceGrant` resources are also required for references from an `HTTPRoute` or `TCPRoute` to a Kubernetes `core/v1/Service` in a different namespace. Without a `ReferenceGrant`, `backendRefs` attached to the route may not be permitted. As a result, Kubernetes sets a `ResolvedRefs` status to `False` with the reason `RefNotPermitted`, which causes the gateway listener to reject the route.
-
-If a route `backendRefs` becomes unpermitted, the entire route is removed from the gateway listener. A `backendRefs` can become unpermitted when you delete a `ReferenceGrant` or add a new unpermitted `backendRefs` to an existing route.
-
-Refer to the [Kubernetes `ReferenceGrant` documentation](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferenceGrant) for additional information.
-
-## Consul server deployments
-
-- Consul Enterprise and the free community edition are both supported.
-- Supported Consul Server deployment types:
-  - Self-Managed
-  - HCP Consul
-
-### Consul feature support
-
-API gateways on Kubernetes support all Consul features, but you can only route traffic between multiple datacenters through peered connections. Refer to [Route Traffic to Peered Services](/consul/docs/connect/gateways/api-gateway/define-routes/route-to-peered-services) for additional information. WAN federation is not supported.
-
-## Deployment Environments
-
-Consul API gateway can be deployed in the following Kubernetes-based environments:
-
-- Standard Kubernetes environments
-- AWS Elastic Kubernetes Service (EKS)
-- Google Kubernetes Engine (GKE)
-- Azure Kubernetes Service (AKS)
-
-## Resource allocations
-
-The following resources are allocated for each component of the API gateway.
-
-### Gateway controller pod
-
-- **CPU**: None. Either the namespace or cluster default is allocated, depending on the Kubernetes cluster configuration.
-- **Memory**: None. Either the namespace or cluster default is allocated, depending on the Kubernetes cluster configuration.
-
-### Gateway instance pod
-
-- **CPU**: None. Either the namespace or cluster default is allocated, depending on the Kubernetes cluster configuration.
-- **Memory**: None. Either the namespace or cluster default is allocated, depending on the Kubernetes cluster configuration.
-
-
-
diff --git a/website/content/docs/connect/gateways/api-gateway/upgrades-k8s.mdx b/website/content/docs/connect/gateways/api-gateway/upgrades-k8s.mdx
deleted file mode 100644
index 5b514340268f7..0000000000000
--- a/website/content/docs/connect/gateways/api-gateway/upgrades-k8s.mdx
+++ /dev/null
@@ -1,745 +0,0 @@
----
-layout: docs
-page_title: Upgrade API Gateway for Kubernetes
-description: >-
-  Upgrade Consul API Gateway to use newly supported features. Learn about the requirements, procedures, and post-configuration changes involved in standard and specific version upgrades.
----
-
-# Upgrade API gateway for Kubernetes
-
-Since Consul v1.15, the Consul API gateway is a native feature within the Consul binary and is installed during the normal Consul installation process. Since Consul on Kubernetes v1.2 (Consul v1.16), the CRDs necessary for using the Consul API gateway for Kubernetes are also included. You can install Consul v1.16 using the Consul Helm chart v1.2 and later. Refer to [Install API gateway for Kubernetes](/consul/docs/connect/gateways/api-gateway/deploy/install-k8s) for additional information.
-
-## Introduction
-
-Because Consul API gateway releases as part of Consul, it no longer has an independent version number. Instead, the API gateway inherits the same version number as the Consul binary. Refer to the [release notes](/consul/docs/release-notes) for additional information.
-
-To begin using the native API gateway, complete one of the following upgrade paths:
-
-### Upgrade from Consul on Kubernetes v1.1.x
-
-1. Complete the instructions for [upgrading to the native Consul API gateway](#upgrade-to-native-consul-api-gateway).
-
-### Upgrade from v0.4.x - v0.5.x
-
-1. Complete the [standard upgrade instructions](#standard-upgrade)
-1. Complete the instructions for [upgrading to the native Consul API gateway](#upgrade-to-native-consul-api-gateway).
-
-### Upgrade from v0.3.x
-
-1. Complete the instructions for [upgrading to v0.4.0](#upgrade-to-v0-4-0)
-1. Complete the [standard upgrade instructions](#standard-upgrade)
-1. Complete the instructions for [upgrading to the native Consul API gateway](#upgrade-to-native-consul-api-gateway).
-
-### Upgrade from v0.2.x
-
-1. Complete the instructions for [upgrading to v0.3.0](#upgrade-to-v0-2-0)
-1. Complete the instructions for [upgrading to v0.4.0](#upgrade-to-v0-4-0)
-1. Complete the [standard upgrade instructions](#standard-upgrade)
-1. Complete the instructions for [upgrading to the native Consul API gateway](#upgrade-to-native-consul-api-gateway).
-
-### Upgrade from v0.1.x
-
-1. Complete the instructions for [upgrading to v0.2.0](#upgrade-to-v0-2-0)
-1. Complete the instructions for [upgrading to v0.3.0](#upgrade-to-v0-3-0)
-1. Complete the instructions for [upgrading to v0.4.0](#upgrade-to-v0-4-0)
-1. Complete the [standard upgrade instructions](#standard-upgrade)
-1. Complete the instructions for [upgrading to the native Consul API gateway](#upgrade-to-native-consul-api-gateway).
-
-## Upgrade to native Consul API gateway
-
-You must begin the upgrade procedure with API gateway with Consul on Kubernetes v1.1 installed. If you are currently using a version of Consul on Kubernetes older than v1.1, complete the necessary stages of the upgrade path to v1.1 before you begin upgrading to the native API gateway. Refer to the [Introduction](#introduction) for an overview of the upgrade paths.
-
-### Consul-managed CRDs
-
-If you are able to tolerate downtime for your applications, you should delete previously installed CRDs and allow Consul to install and manage them for future updates. The amount of downtime depends on how quickly you are able to install the new version of Consul. If you are unable to tolerate any downtime, refer to [Self-managed CRDs](#self-managed-crds) for instructions on how to upgrade without downtime.
-
-1. Run the `kubectl delete` command and reference the `kustomize` directory to delete the existing CRDs. The following example deletes the CRDs that were installed with API gateway `v0.5.1`:
-
-  ```shell-session
-  $ kubectl delete --kustomize="github.com/hashicorp/consul-api-gateway/config/crd?ref=v0.5.1"
-  ```
-
-1. Issue the following command to use the API gateway packaged in Consul. Since Consul will not detected an external CRD, it will try to install the API gateway packaged with Consul.
-
-  ```shell-session
-  $ consul-k8s install -config-file values.yaml
-  ```
-
-1. Create `ServiceIntentions` allowing `Gateways` to communicate with any backend services that they route to. Refer to [Service intentions configuration entry reference](/consul/docs/connect/config-entries/service-intentions) for additional information.
-
-1. Change any existing `Gateways` to reference the new `GatewayClass` `consul`. Refer to [gatewayClass](/consul/docs/connect/gateways/api-gateway/configuration/gateway#gatewayclassname) for additional information.
-
-1. After updating all of your `gateway` configurations to use the new controller, you can remove the `apiGateway` block from the Helm chart and upgrade your Consul cluster. This completely removes the old gateway controller.
-
-  <CodeBlockConfig filename="values.yaml">
-
-    ```diff
-    global:
-      image: hashicorp/consul:1.15
-      imageK8S: hashicorp/consul-k8s-control-plane:1.1
-    - apiGateway:
-    -  enabled: true
-    -  image: hashicorp/consul-api-gateway:0.5.4
-    -  managedGatewayClass:
-    -    enabled: true
-    ```
-
-  </CodeBlockConfig>
-
-  ```shell-session
-  $ consul-k8s install -config-file values.yaml
-  ```
-
-### Self-managed CRDs
-
-<Note>
-
-  This upgrade method uses `connectInject.apiGateway.manageExternalCRDs`, which was introduced in Consul on Kubernetes v1.2. As a result, you must be on at least Consul on Kubernetes v1.2 for this upgrade method.
-
-</Note>
-
-If you are unable to tolerate any downtime, you can complete the following steps to upgrade to the native Consul API gateway. If you choose this upgrade option, you must continue to manually install the CRDs necessary for operating the API gateway.
-
-1. Create a Helm chart that installs the version of Consul API gateway that ships with Consul and disables externally-managed CRDs:
-
-  <CodeBlockConfig filename="values.yaml" highlight="2-3,5-6">
-
-    ```yaml
-    global:
-      image: hashicorp/consul:1.16
-      imageK8S: hashicorp/consul-k8s-control-plane:1.2
-    connectInject:
-      apiGateway:
-        manageExternalCRDs: false
-    apiGateway:
-      enabled: true
-      image: hashicorp/consul-api-gateway:0.5.4
-      managedGatewayClass:
-        enabled: true
-    ```
-
-  </CodeBlockConfig>
-
-  You must set `connectInject.apiGateway.manageExternalCRDs` to `false`. If you have external CRDs with legacy installation and you do not set this, you will get an error when you try to upgrade because Helm will try to install CRDs that already exist.
-
-1. Issue the following command to install the new version of API gateway and disables externally-managed CRDs:
-
-  ```shell-session
-  $ consul-k8s install -config-file values.yaml
-  ```
-
-1. Create `ServiceIntentions` allowing `Gateways` to communicate with any backend services that they route to. Refer to [Service intentions configuration entry reference](/consul/docs/connect/config-entries/service-intentions) for additional information.
-
-1. Change any existing `Gateways` to reference the new `GatewayClass` `consul`. Refer to [gatewayClass](/consul/docs/connect/gateways/api-gateway/configuration/gateway#gatewayclassname) for additional information.
-
-1. After updating all of your `gateway` configurations to use the new controller, you can remove the `apiGateway` block from the Helm chart and upgrade your Consul cluster. This completely removes the old gateway controller.
-
-  <CodeBlockConfig filename="values.yaml">
-
-    ```diff
-    global:
-      image: hashicorp/consul:1.16
-      imageK8S: hashicorp/consul-k8s-control-plane:1.2
-    connectInject:
-      apiGateway:
-        manageExternalCRDs: false
-    - apiGateway:
-    -  enabled: true
-    -  image: hashicorp/consul-api-gateway:0.5.4
-    -  managedGatewayClass:
-    -    enabled: true
-    ```
-
-  </CodeBlockConfig>
-
-  ```shell-session
-  $ consul-k8s install -config-file values.yaml
-  ```
-
-## Upgrade to v0.4.0
-
-Consul API Gateway v0.4.0 adds support for [Gateway API v0.5.0](https://github.com/kubernetes-sigs/gateway-api/releases/tag/v0.5.0) and the following resources:
-
-- The graduated v1beta1 `GatewayClass`, `Gateway` and `HTTPRoute` resources.
-
-- The [`ReferenceGrant`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferenceGrant) resource, which replaces the identical [`ReferencePolicy`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferencePolicy) resource.
-
-Consul API Gateway v0.4.0 is backward-compatible with existing `ReferencePolicy` resources, but we will remove support for `ReferencePolicy` resources in a future release. We recommend that you migrate to `ReferenceGrant` after upgrading.
-
-### Requirements
-
-Ensure that the following requirements are met prior to upgrading:
-
-- Consul API Gateway should be running version v0.3.0.
-
-### Procedure
-
-1. Complete the [standard upgrade](#standard-upgrade).
-
-1. After completing the upgrade, complete the [post-upgrade configuration changes](#v0.4.0-post-upgrade-configuration-changes). The post-upgrade procedure describes how to replace your `ReferencePolicy` resources with `ReferenceGrant` resources and how to upgrade your `GatewayClass`, `Gateway`, and `HTTPRoute` resources from v1alpha2 to v1beta1.
-
-<a name="v0.4.0-post-upgrade-configuration-changes"/>
-
-### Post-upgrade configuration changes
-
-Complete the following steps after performing standard upgrade procedure.
-
-#### Requirements
-
-- Consul API Gateway should be running version v0.4.0.
-- Consul Helm chart should be v0.47.0 or later.
-- You should have the ability to run `kubectl` CLI commands.
-- `kubectl` should be configured to point to the cluster containing the installation you are upgrading.
-- You should have the following permissions for your Kubernetes cluster:
-  - `Gateway.read`
-  - `ReferenceGrant.create` (Added in Consul Helm chart v0.47.0)
-  - `ReferencePolicy.delete`
-
-#### Procedure
-
-1. Verify the current version of the `consul-api-gateway-controller` `Deployment`:
-
-  ```shell-session
-  $ kubectl get deployment --namespace consul consul-api-gateway-controller --output=jsonpath="{@.spec.template.spec.containers[?(@.name=='api-gateway-controller')].image}"
-  ```
-
-  You should receive a response similar to the following:
-
-  ```log hideClipboard
-  "hashicorp/consul-api-gateway:0.4.0"
-  ```
-
-  <a name="referencegrant"/>
-
-1. Issue the following command to get all `ReferencePolicy` resources across all namespaces.
-
-  ```shell-session
-  $ kubectl get referencepolicy --all-namespaces
-  ```
-If you have any active `ReferencePolicy` resources, you will receive output similar to the response below.
-
-  ```log hideClipboard
-  Warning: ReferencePolicy has been renamed to ReferenceGrant. ReferencePolicy will be removed in v0.6.0 in favor of the identical ReferenceGrant resource.
-  NAMESPACE   NAME
-  default     example-reference-policy
-  ```
-
-  If your output is empty, upgrade your `GatewayClass`, `Gateway` and `HTTPRoute` resources to v1beta1 as described in [step 7](#v1beta1-gatewayclass-gateway-httproute).
-
-1. For each `ReferencePolicy` in the source YAML files, change the `kind` field to `ReferenceGrant`. You can optionally update the `metadata.name` field or filename if they include the term "policy". In the following example, the `kind` and `metadata.name` fields and filename have been changed to reflect the new resource. Note that updating the `kind` field prevents you from using the `kubectl edit` command to edit the remote state directly.
-
-  <CodeBlockConfig hideClipboard filename="referencegrant.yaml">
-
-  ```yaml
-  apiVersion: gateway.networking.k8s.io/v1alpha2
-  kind: ReferenceGrant
-  metadata:
-    name: reference-grant
-    namespace: web-namespace
-  spec:
-    from:
-    - group: gateway.networking.k8s.io
-      kind: HTTPRoute
-      namespace: example-namespace
-    to:
-    - group: ""
-      kind: Service
-      name: web-backend
-  ```
-
-  </CodeBlockConfig>
-
-1. For each file, apply the updated YAML to your cluster to create a new `ReferenceGrant` resource.
-
-  ```shell-session
-  $ kubectl apply --filename <file>
-  ```
-
-1. Check to confirm that each new `ReferenceGrant` was created successfully.
-
-  ```shell-session
-  $ kubectl get referencegrant <name> --namespace <namespace>
-  NAME
-  example-reference-grant
-  ```
-
-1. Finally, delete each corresponding old `ReferencePolicy` resource. Because replacement `ReferenceGrant` resources have already been created, there should be no interruption in the availability of any referenced `Service` or `Secret`.
-
-  ```shell-session
-  $ kubectl delete referencepolicy <name> --namespace <namespace>
-  Warning: ReferencePolicy has been renamed to ReferenceGrant. ReferencePolicy will be removed in v0.6.0 in favor of the identical ReferenceGrant resource.
-  referencepolicy.gateway.networking.k8s.io "example-reference-policy" deleted
-  ```
-
-  <a name="v1beta1-gatewayclass-gateway-httproute"/>
-
-1. For each `GatewayClass`, `Gateway`, and `HTTPRoute` in the source YAML, update the `apiVersion` field to `gateway.networking.k8s.io/v1beta1`. Note that updating the `apiVersion` field prevents you from using the `kubectl edit` command to edit the remote state directly.
-
-  <CodeBlockConfig hideClipboard>
-
-  ```yaml
-  apiVersion: gateway.networking.k8s.io/v1beta1
-  kind: Gateway
-  metadata:
-    name: example-gateway
-    namespace: gateway-namespace
-  spec:
-    ...
-  ```
-
-  </CodeBlockConfig>
-
-1. For each file, apply the updated YAML to your cluster to update the existing `GatewayClass`, `Gateway` or `HTTPRoute` resources.
-
-  ```shell-session
-  $ kubectl apply --filename <file>
-  gateway.gateway.networking.k8s.io/example-gateway configured
-  ```
-
-<!--
-1. Deploy [kube-storage-version-migrator](https://github.com/kubernetes-sigs/kube-storage-version-migrator) to your cluster. following the steps in the [user guide](https://github.com/kubernetes-sigs/kube-storage-version-migrator/blob/master/USER_GUIDE.md#deploy-the-storage-version-migrator-in-your-cluster), but set the `REGISTRY` and `VERSION` environment variable explicitly when building the manifests with `REGISTRY=us.gcr.io/k8s-artifacts-prod/storage-migrator VERSION=v0.0.5 make local-manifests`.
-
-  > If you don't explicitly set the `REGISTRY` and `VERSION` env vars, `make local-manifests` will default to values for local development, causing an `ErrImagePull` error when deploying the `migrator` and `trigger` storage version migrator deployments.
-
-  Confirm that the `migrator` and `trigger` storage version migrator deployments are running.
-
-  ```shell-session
-  $ kubectl get deployment migrator --namespace kube-system
-  NAME       READY   UP-TO-DATE   AVAILABLE   AGE
-  migrator   1/1     1            1           1m
-  ```
-
-  ```shell-session
-  $ kubectl get deployment trigger --namespace kube-system
-  NAME       READY   UP-TO-DATE   AVAILABLE   AGE
-  trigger    1/1     1            1           1m
-  ```
--->
-
-## Upgrade to v0.3.0 from v0.2.0 or lower
-
-Consul API Gateway v0.3.0 introduces a change for people upgrading from lower versions. Gateways with `listeners` with a `certificateRef` defined in a different namespace now require a [`ReferencePolicy`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferencePolicy) that explicitly allows `Gateways` from the gateway's namespace to use `certificateRef` in the `certificateRef`'s namespace.
-
-### Requirements
-
-Ensure that the following requirements are met prior to upgrading:
-
-- Consul API Gateway should be running version v0.2.1 or lower.
-- You should have the ability to run `kubectl` CLI commands.
-- `kubectl` should be configured to point to the cluster containing the installation you are upgrading.
-- You should have the following permission rights on your Kubernetes cluster:
-  - `Gateway.read`
-  - `ReferencePolicy.create`
-- (Optional) The [jq](https://stedolan.github.io/jq/download/) command line processor for JSON can be installed, which will ease gateway retrieval during the upgrade process.
-
-### Procedure
-
-
-1. Verify the current version of the `consul-api-gateway-controller` `Deployment`:
-
-  ```shell-session
-  $ kubectl get deployment --namespace consul consul-api-gateway-controller --output=jsonpath="{@.spec.template.spec.containers[?(@.name=='api-gateway-controller')].image}"
-  ```
-
-  You should receive a response similar to the following:
-
-  ```log hideClipboard
-  "hashicorp/consul-api-gateway:0.2.1"
-  ```
-
-1. Retrieve all gateways that have a `certificateRefs` in a different namespace. If you have installed the [`jq`](https://stedolan.github.io/jq/) utility, you can skip to [step 4](#jq-command-secrets). Otherwise, issue the following command to get all `Gateways` across all namespaces:
-
-  ```shell-session
-  $ kubectl get Gateway --output json --all-namespaces
-  ```
-
-  If you have any active `Gateways`, you will receive output similar to the following response. The output has been truncated to show only relevant fields:
-
-  ```yaml
-  apiVersion: gateway.networking.k8s.io/v1alpha2
-  kind: Gateway
-  metadata:
-    name: example-gateway
-    namespace: gateway-namespace
-  spec:
-    gatewayClassName: "consul-api-gateway"
-    listeners:
-      - name: https
-        port: 443
-        protocol: HTTPS
-        allowedRoutes:
-          namespaces:
-            from: All
-        tls:
-          certificateRefs:
-            - group: ""
-              kind: Secret
-              name: example-certificate
-              namespace: certificate-namespace
-  ```
-
-1. Inspect the `certificateRefs` entries for each of the routes.
-
-  If a `namespace` field is not defined in the `certificateRefs` or if the namespace matches the namespace of the parent `Gateway`, then no additional action is required for the `certificateRefs`. Otherwise, note the `namespace` field values for `certificateRefs` configurations with a `namespace` field that do not match the namespace of the parent `Gateway`. You must also note the `namespace` of the parent gateway. You will need these to create a `ReferencePolicy` that explicitly allows each cross-namespace certificateRefs-to-gateway pair. (see [step 5](#create-secret-reference-policy)).
-
-  After completing this step, you will have a list of all secrets similar to the following:
-
-  <CodeBlockConfig hideClipboard>
-
-  ```yaml hideClipboard
-    example-certificate:
-      - namespace: certificate-namespace
-        parentNamespace: gateway-namespace
-  ```
-
-  </CodeBlockConfig>
-
-  Proceed with the [standard-upgrade](#standard-upgrade) if your list is empty.
-
-  <a name="jq-command-secrets"/>
-
-1. If you have installed [`jq`](https://stedolan.github.io/jq/), issue the following command to get all `Gateways` and filter for secrets that require a `ReferencePolicy`.
-
-  ```shell-session
-
-  $ kubectl get Gateway -o json -A | jq -r '.items[] | {gateway_name: .metadata.name, gateway_namespace: .metadata.namespace, kind: .kind, crossNamespaceSecrets: ( .metadata.namespace as $parentnamespace | .spec.listeners[] | select(has("tls")) | .tls.certificateRefs[] | select(.namespace != null and .namespace != $parentnamespace )  )} '
-
-  ```
-
-  The output will resemble the following response if gateways that require a new `ReferencePolicy` are returned:
-
-  <CodeBlockConfig hideClipboard>
-
-  ```log hideClipboard
-  {
-    "gateway_name": "example-gateway",
-    "gateway_namespace": "gateway-namespace",
-    "kind": "Gateway",
-    "crossNamespaceSecrets": {
-      "group": "",
-      "kind": "Secret",
-      "name": "example-certificate",
-      "namespace": "certificate-namespace"
-    }
-  }
-  ```
-
-  </CodeBlockConfig>
-
-  If your output is empty, proceed with the [standard-upgrade](#standard-upgrade).
-<a name="create-secret-reference-policy"/>
-
-1. Using the list of secrets you created earlier as a guide, create a [`ReferencePolicy`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferencePolicy) to allow each gateway cross namespace secret access.
-  The `ReferencePolicy` explicitly allows each cross-namespace gateway to secret pair. The `ReferencePolicy` must be created in the same `namespace` as the `certificateRefs`.
-
-  Skip to the next step if you've already created a `ReferencePolicy`.
-  <!---
-  TODO: add link to our docs on Cross Namespace Reference Policies, once we have written then, and tell the user to see them for more details on how to create these policies.
-  --->
-  The following example `ReferencePolicy` enables `example-gateway` in `gateway-namespace` to utilize `certificateRefs` in the `certificate-namespace` namespace:
-
-  <CodeBlockConfig filename="referencepolicy.yaml">
-
-  ```yaml
-  apiVersion: gateway.networking.k8s.io/v1alpha2
-  kind: ReferencePolicy
-  metadata:
-    name: reference-policy
-    namespace: certificate-namespace
-  spec:
-    from:
-      - group: gateway.networking.k8s.io
-        kind: Gateway
-        namespace: gateway-namespace
-    to:
-      - group: ""
-        kind: Secret
-  ```
-
-  </CodeBlockConfig>
-
-1. If you have already created a `ReferencePolicy`, modify it to allow your gateway to access your `certificateRef` and save it as `referencepolicy.yaml`. Note that each `ReferencePolicy` only supports one `to` field and one `from` field (refer the [`ReferencePolicy`](https://gateway-api.sigs.k8s.io/v1alpha2/api-types/referencegrant/#api-design-decisions) documentation). As a result, you may need to create multiple `ReferencePolicy`s.
-
-1. Issue the following command to apply it to your cluster:
-
-  ```shell-session
-  $ kubectl apply --filename referencepolicy.yaml
-  ```
-
-  Repeat this step as needed until each of your cross-namespace `certificateRefs` have a corresponding `ReferencePolicy`.
-
-  Proceed with the [standard-upgrade](#standard-upgrade).
-
-## Upgrade to v0.2.0
-
-Consul API Gateway v0.2.0 introduces a change for people upgrading from Consul API Gateway v0.1.0. Routes with a `backendRef` defined in a different namespace now require a [`ReferencePolicy`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferencePolicy) that explicitly allows traffic from the route's namespace to the `backendRef`'s namespace.
-
-### Requirements
-
-Ensure that the following requirements are met prior to upgrading:
-
-- Consul API Gateway should be running version v0.1.0.
-- You should have the ability to run `kubectl` CLI commands.
-- `kubectl` should be configured to point to the cluster containing the installation you are upgrading.
-- You should have the following permission rights on your Kubernetes cluster:
-  - `HTTPRoute.read`
-  - `TCPRoute.read`
-  - `ReferencePolicy.create`
-- (Optional) The [jq](https://stedolan.github.io/jq/download/) command line processor for JSON can be installed, which will ease route retrieval during the upgrade process.
-
-### Procedure
-
-1. Verify the current version of the `consul-api-gateway-controller` `Deployment`:
-
-  ```shell-session
-  $ kubectl get deployment --namespace consul consul-api-gateway-controller --output=jsonpath= "{@.spec.template.spec.containers[?(@.name=='api-gateway-controller')].image}"
-  ```
-
-  You should receive the following response:
-
-  ```log hideClipboard
-  "hashicorp/consul-api-gateway:0.1.0"
-  ```
-
-1. Retrieve all routes that have a backend in a different namespace. If you have installed the [`jq`](https://stedolan.github.io/jq/) utility, you can skip to [step 4](#jq-command). Otherwise, issue the following command to get all `HTTPRoutes` and `TCPRoutes` across all namespaces:
-
-  ```shell-session
-  $ kubectl get HTTPRoute,TCPRoute --output json --all-namespaces
-  ```
-
-  Note that the command only retrieves `HTTPRoutes` and `TCPRoutes`. `TLSRoutes` and `UDPRoutes` are not supported in v0.1.0.
-
-  If you have any active `HTTPRoutes` or `TCPRoutes`, you will receive output similar to the following response. The output has been truncated to show only relevant fields:
-
-  ```yaml
-    apiVersion: v1
-    items:
-    - apiVersion: gateway.networking.k8s.io/v1alpha2
-      kind: HTTPRoute
-      metadata:
-        name: example-http-route,
-        namespace: example-namespace,
-        ...
-      spec:
-        parentRefs:
-        - group: gateway.networking.k8s.io
-          kind: Gateway
-          name: gateway
-          namespace: gw-ns
-        rules:
-        - backendRefs:
-          - group: ""
-            kind: Service
-            name: web-backend
-            namespace: gateway-namespace
-            ...
-          ...
-    - apiVersion: gateway.networking.k8s.io/v1alpha2
-      kind: TCPRoute
-      metadata:
-        name: example-tcp-route,
-        namespace: a-different-namespace,
-        ...
-      spec:
-        parentRefs:
-        - group: gateway.networking.k8s.io
-          kind: Gateway
-          name: gateway
-          namespace: gateway-namespace
-        rules:
-        - backendRefs:
-          - group: ""
-            kind: Service
-            name: web-backend
-            namespace: gateway-namespace
-            ...
-      ...
-  ```
-
-1. Inspect the `backendRefs` entries for each of the routes.
-
-  If a `namespace` field is not defined in the `backendRef` or if the namespace matches the namespace of the route, then no additional action is required for the `backendRef`. Otherwise, note the `group`, `kind`, `name`, and `namespace` field values for `backendRef` configurations that have a `namespace` defined that do not match the namespace of the parent route. You must also note the `kind` and `namespace` of the parent route. You will need these to create a `ReferencePolicy` that explicitly allows each cross-namespace route-to-service pair (see [step 5](#create-reference-policy)).
-
-  After completing this step, you will have a list of all routes similar to the following:
-
-  <CodeBlockConfig hideClipboard>
-
-  ```yaml hideClipboard
-    example-http-route:
-      - namespace: example-namespace
-        kind: HTTPRoute
-        backendReferences:
-          - group : ""
-            kind: Service
-            name: web-backend
-            namespace: gateway-namespace
-
-    example-tcp-route:
-      - namespace: a-different-namespace
-        kind: HTTPRoute
-        backendReferences:
-          - group : ""
-            kind: Service
-            name: web-backend
-            namespace: gateway-namespace
-  ```
-
-  </CodeBlockConfig>
-
-  Proceed with [standard-upgrade](#standard-upgrade) if your list is empty.
-<a name="jq-command"/>
-
-1. If you have installed [`jq`](https://stedolan.github.io/jq/), issue the following command to get all `HTTPRoutes` and `TCPRoutes` and filter for routes that require a `ReferencePolicy`.
-
-  ```shell-session
-  $ kubectl get HTTPRoute,TCPRoute -o json -A | jq -r '.items[] | {name: .metadata.name, namespace: .metadata.namespace, kind: .kind, crossNamespaceBackendReferences: ( .metadata.namespace as $parentnamespace | .spec.rules[] .backendRefs[] | select(.namespace != null and .namespace != $parentnamespace )  )} '
-  ```
-
-  Note that the command retrieves all `HTTPRoutes` and `TCPRoutes`. `TLSRoutes` and `UDPRoutes` are not supported in v0.1.0.
-
-  The output will resemble the following response if routes that require a new `ReferencePolicy` are returned:
-
-  <CodeBlockConfig hideClipboard>
-
-  ```log hideClipboard
-  {
-    "name": "example-http-route",
-    "namespace": "example-namespace",
-    "kind": "HTTPRoute",
-    "crossNamespaceBackendReferences": {
-      "group": "",
-      "kind": "Service",
-      "name": "web-backend",
-      "namespace": "gateway-namespace",
-      "port": 8080,
-      "weight": 1
-    }
-  }
-  {
-    "name": "example-tcp-route",
-    "namespace": "a-different-namespace",
-    "kind": "TCPRoute",
-    "crossNamespaceBackendReferences": {
-      "group": "",
-      "kind": "Service",
-      "name": "web-backend",
-      "namespace": "gateway-namespace",
-      "port": 8080,
-      "weight": 1
-    }
-  }
-  ```
-
-  </CodeBlockConfig>
-
-  If your output is empty, proceed with the [standard-upgrade](#standard-upgrade).
-<a name="create-reference-policy"/>
-
-1. Using the list of routes you created earlier as a guide, create a [`ReferencePolicy`](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io/v1alpha2.ReferencePolicy) to allow cross namespace traffic for each route service pair.
-  The `ReferencePolicy` explicitly allows each cross-namespace route to service pair. The `ReferencePolicy` must be created in the same `namespace` as the backend `Service`.
-
-  Skip to the next step if you've already created a `ReferencePolicy`.
-  <!---
-  TODO: add link to our docs on Cross Namespace Reference Policies, once we have written then, and tell the user to see them for more details on how to create these policies.
-  --->
-  The following example `ReferencePolicy` enables `HTTPRoute` traffic from the `example-namespace` to Kubernetes Services in the `web-backend` namespace:
-
-  <CodeBlockConfig filename="referencepolicy.yaml">
-
-  ```yaml
-  apiVersion: gateway.networking.k8s.io/v1alpha2
-  kind: ReferencePolicy
-  metadata:
-    name: reference-policy
-    namespace: gateway-namespace
-  spec:
-    from:
-      - group: gateway.networking.k8s.io
-        kind: HTTPRoute
-        namespace: example-namespace
-    to:
-      - group: ""
-        kind: Service
-        name: web-backend
-  ```
-
-  </CodeBlockConfig>
-
-1. If you have already created a `ReferencePolicy`, modify it to allow your route and save it as `referencepolicy.yaml`. Note that each `ReferencePolicy` only supports one `to` field and one `from` field (refer the [`ReferencePolicy`](https://gateway-api.sigs.k8s.io/api-types/referencegrant/#api-design-decisions) documentation). As a result, you may need to create multiple `ReferencePolicy`s.
-
-2. Issue the following command to apply it to your cluster:
-
-  ```shell-session
-  $ kubectl apply --filename referencepolicy.yaml
-  ```
-
-  Repeat this step as needed until each of your cross-namespace routes have a corresponding `ReferencePolicy`.
-
-  Proceed with the [standard-upgrade](#standard-upgrade).
-
-
-## Standard Upgrade
-
-~> **Note:** When you see `VERSION` in examples of commands or configuration settings, replace `VERSION` with the version number of the release you are installing, like `0.2.0`. If there is a lower case "v" in front of `VERSION` the version number needs to follow the "v" as is `v0.2.0`
-
-### Requirements
-
-Ensure that the following requirements are met prior to upgrading:
-
-- You should have the ability to run `kubectl` CLI commands.
-- `kubectl` should be configured to point to the cluster containing the installation you are upgrading.
-
-
-### Procedure
-
-This is the upgrade path to use when there are no version specific steps to take.
-
-<a name="standard-upgrade"/>
-
-1. Issue the following command to install the new version of CRDs into your cluster:
-
-  ``` shell-session
-  $ kubectl apply --kustomize="github.com/hashicorp/consul-api-gateway/config/crd?ref=vVERSION"
-  ```
-
-1. Update `apiGateway.image` in `values.yaml`:
-
-  <CodeBlockConfig hideClipboard filename="values.yaml">
-
-  ```yaml
-  ...
-  apiGateway:
-    image: hashicorp/consul-api-gateway:VERSION
-    ...
-  ```
-
-  </CodeBlockConfig>
-
-1. Issue the following command to upgrade your Consul installation:
-
-  ```shell-session
-  $ helm upgrade --values values.yaml --namespace consul --version <NEW_VERSION> <DEPLOYMENT_NAME> hashicorp/consul
-  ```
-
-  Note that the upgrade will cause the Consul API Gateway controller shut down and restart with the new version.
-
-1. According to the Kubernetes Gateway API specification, [Gateway Class](https://gateway-api.sigs.k8s.io/v1alpha2/references/spec/#gateway.networking.k8s.io%2fv1alpha2.GatewayClass) configurations should only be applied to a gateway upon creation. To see the effects on preexisting gateways after upgrading your CRD installation, delete and recreate any gateways by issuing the following commands:
-
-  ```shell-session
-  $ kubectl delete --filename <path_to_gateway_config.yaml>
-  $ kubectl create --filename <path_to_gateway_config.yaml>
-  ```
-  <!---
-  remove this warning once updating a gateway triggers reconciliation on child routes
-  --->
-
-1. (Optional) Delete and recreate your routes. Note that it may take several minutes for attached routes to reconcile and start reporting bind errors.
-
-  ```shell-session
-  $ kubectl delete --filename <path_to_route_config.yaml>
-  $ kubectl create --filename <path_to_route_config.yaml>
-  ```
-
-### Post-Upgrade Configuration Changes
-
-No additional configuration changes are required for this upgrade.
diff --git a/website/content/docs/connect/gateways/api-gateway/usage.mdx b/website/content/docs/connect/gateways/api-gateway/usage.mdx
new file mode 100644
index 0000000000000..9f314fd2f4e3d
--- /dev/null
+++ b/website/content/docs/connect/gateways/api-gateway/usage.mdx
@@ -0,0 +1,211 @@
+---
+layout: docs
+page_title: API Gateways on Virtual Machines
+description: Learn how to configure and Consul API gateways and gateway routes on virtual machines so that you can enable ingress requests to services in your service mesh in VM environments.
+---
+
+# API gateways on virtual machines
+
+This topic describes how to deploy Consul API gateways to networks that operate
+in virtual machine (VM) environments. If you want to implement an API gateway
+in a Kubernetes environment, refer to [API Gateway for Kubernetes](/consul/docs/api-gateway).
+
+## Introduction
+
+Consul API gateways provide a configurable ingress points for requests into a Consul network. Use the following configuration entries to set up API gateways:
+
+- [API gateway](/consul/docs/connect/gateways/api-gateway/configuration/api-gateway): Provides an endpoint for requests to enter the network. Define listeners that expose ports on the endpoint for ingress.
+- [HTTP routes](/consul/docs/connect/gateways/api-gateway/configuration/http-route) and [TCP routes](/consul/docs/connect/gateways/api-gateway/configuration/tcp-route): The routes attach to listeners defined in the gateway and control how requests route to services in the network.
+- [Inline certificates](/consul/docs/connect/gateways/api-gateway/configuration/inline-certificate): Makes TLS certificates available to gateways so that requests between the user and the gateway endpoint are encrypted.
+
+You can configure and reuse configuration entries separately. You can define and attach routes and inline certificates to multiple gateways.
+
+The following steps describe the general workflow for deploying a Consul API
+gateway to a VM environment:
+
+1. Create an API gateway configuration entry. The configuration entry includes
+   listener configurations and references to TLS certificates.
+1. Deploy the API gateway configuration entry to create the listeners.
+1. Create and deploy routes to bind to the gateway.
+
+Refer to [API Gateway for Kubernetes](/consul/docs/api-gateway) for information
+about using Consul API gateway on Kubernetes.
+
+## Requirements
+
+The following requirements must be satisfied to use API gateways on VMs:
+
+- Consul 1.15 or later
+- A Consul cluster with service mesh enabled. Refer to [`connect`](/consul/docs/agent/config/config-files#connect)
+- Network connectivity between the machine deploying the API Gateway and a
+  Consul cluster agent or server
+
+If ACLs are enabled, you must present a token with the following permissions to
+configure Consul and deploy API gateways:
+
+- `mesh: read`
+- `mesh: write`
+
+Refer [Mesh Rules](/consul/docs/security/acl/acl-rules#mesh-rules) for
+additional information about configuring policies that enable you to interact
+with Consul API gateway configurations.
+
+## Create the API gateway configuration
+
+Create an API gateway configuration that defines listeners and TLS certificates
+in the mesh. In the following example, the API gateway specifies an HTTP
+listener on port `8443` that routes can use to connect external traffic to
+services in the mesh.
+
+```hcl
+Kind = "api-gateway"
+Name = "my-gateway"
+
+// Each listener configures a port which can be used to access the Consul cluster
+Listeners = [
+	{
+		Port = 8443
+		Name = "my-http-listener"
+		Protocol = "http"
+		TLS = {
+			Certificates = [
+				{
+					Kind = "inline-certificate"
+					Name = "my-certificate"
+				}
+			]
+		}
+	}
+]
+```
+
+Refer to [API Gateway Configuration Reference](/consul/docs/connect/gateways/api-gateway/configuration/api-gateway) for
+information about all configuration fields.
+
+Gateways and routes are eventually-consistent objects that provide feedback
+about their current state through a series of status conditions. As a result,
+you must manually check the route status to determine if the route
+bound to the gateway successfully.
+
+## Deploy the API gateway
+
+Use the `consul config write` command to implement the API gateway
+configuration entries. The following command applies the configuration entry
+for the main gateway object:
+
+```shell-session
+$ consul config write gateways.hcl
+```
+
+Run the following command to deploy an API gateway instance:
+
+```shell-session
+$ consul connect envoy -gateway api -register -service my-api-gateway
+```
+
+The command directs Consul to configure Envoy as an API gateway.
+
+## Route requests
+
+Define route configurations and bind them to listeners configured on the
+gateway so that Consul can route incoming requests to services in the mesh.
+Create HTTP or TCP routes by setting the `Kind` parameter to `http-route` or
+`tcp-route` and configuring rules that define request traffic flows.
+
+The following example routes requests from the listener on the API gateway at
+port `8443` to services in Consul based on the path of the request. When an
+incoming request starts at path `/`, Consul forwards 90 percent of the requests
+to the `ui` service and 10 percent to `experimental-ui`. Consul also forwards
+requests starting with `/api` to `api`.
+
+```hcl
+Kind = "http-route"
+Name = "my-http-route"
+
+// Rules define how requests will be routed
+Rules = [
+  // Send all requests to UI services with 10% going to the "experimental" UI
+  {
+    Matches = [
+      {
+        Path = {
+          Match = "prefix"
+          Value = "/"
+        }
+      }
+    ]
+    Services = [
+      {
+        Name = "ui"
+        Weight = 90
+      },
+      {
+        Name = "experimental-ui"
+        Weight = 10
+      }
+    ]
+  },
+  // Send all requests that start with the path `/api` to the API service
+  {
+    Matches = [
+      {
+        Path = {
+          Match = "prefix"
+          Value = "/api"
+        }
+      }
+    ]
+    Services = [
+      {
+        Name = "api"
+      }
+    ]
+  }
+]
+
+Parents = [
+  {
+    Kind = "api-gateway"
+    Name = "my-gateway"
+    SectionName = "my-http-listener"
+  }
+]
+```
+
+Create this configuration by saving it to a file called `my-http-route.hcl` and using the command
+
+```shell-session
+$ consul config write my-http-route.hcl
+```
+
+Refer to [HTTP Route Configuration Entry Reference](/consul/docs/connect/gateways/api-gateway/configuration/http-route)
+and [TCP Route Configuration Entry Reference](/consul/docs/connect/gateways/api-gateway/configuration/tcp-route) for details about route configurations.
+
+## Add a TLS certificate
+
+Define an [`inline-certificate` configuration entry](/consul/docs/connect/gateways/api-gateway/configuration/inline-certificate) with a name matching the name in the [API gateway listener configuration](/consul/docs/connect/gateways/api-gateway/configuration/api-gateway#listeners) to bind the certificate to that listener.  The inline certificate configuration entry takes a public certificate and private key in plaintext.
+
+The following example defines a certificate named `my-certificate`. API gateway configurations that specify `inline-certificate` in the `Certificate.Kind` field and `my-certificate` in the `Certificate.Name` field are able to use the certificate.
+
+```hcl
+Kind = "inline-certificate"
+Name = "my-certificate"
+
+Certificate = <<EOF
+-----BEGIN CERTIFICATE-----
+...
+-----END CERTIFICATE-----
+EOF
+
+PrivateKey = <<EOF
+-----BEGIN RSA PRIVATE KEY-----
+...
+-----END RSA PRIVATE KEY-----
+EOF
+```
+
+Create this configuration by saving it to a file called `my-certificate.hcl` and using the command
+
+```shell-session
+$ consul config write my-certificate.hcl
+```
diff --git a/website/content/docs/connect/gateways/index.mdx b/website/content/docs/connect/gateways/index.mdx
index 067d3b2776727..b333615c4ed07 100644
--- a/website/content/docs/connect/gateways/index.mdx
+++ b/website/content/docs/connect/gateways/index.mdx
@@ -17,6 +17,8 @@ This topic provides an overview of the gateway features shipped with Consul. Gat
 
 ## Mesh Gateways
 
+-> **1.6.0+:** This feature is available in Consul versions 1.6.0 and newer.
+
 Mesh gateways enable service mesh traffic to be routed between different Consul datacenters and admin partitions. The datacenters or partitions can reside
 in different clouds or runtime environments where general interconnectivity between all services in all datacenters
 isn't feasible.
@@ -33,37 +35,9 @@ Mesh gateways enable the following scenarios:
 
 -> **Mesh gateway tutorial**: Follow the [mesh gateway tutorial](/consul/tutorials/developer-mesh/service-mesh-gateways) to learn concepts associated with mesh gateways.
 
-## API Gateways
-
-API gateways enable network access, from outside a service mesh, to services running in a Consul service mesh. The
-systems accessing the services in the mesh, may be within your organizational network or external to it. This type of
-network traffic is commonly called _north-south_ network traffic because it refers to the flow of data into and out of
-a specific environment.
-
-API gateways solve the following primary use cases:
-
-- **Control access at the point of entry**: Set the protocols of external connection
-  requests and secure inbound connections with TLS certificates from trusted
-  providers, such as Verisign and Let's Encrypt.
-- **Simplify traffic management**: Load balance requests across services and route
-  traffic to the appropriate service by matching one or more criteria, such as
-  hostname, path, header presence or value, and HTTP method.
-
-Refer to the following documentation for information on how to configure and deploy API gateways:
-- [API Gateways on VMs](/consul/docs/connect/gateways/api-gateway/deploy/listeners-vms)
-- [API Gateways for Kubernetes](/consul/docs/connect/gateways/api-gateway/deploy/listeners-k8s).
-
-
 ## Ingress Gateways
 
-<Note>
-
-Ingress gateway is deprecated and will not be enhanced beyond its current capabilities. Ingress gateway is fully supported
-in this version but will be removed in a future release of Consul.
-
-Consul's API gateway is the recommended alternative to ingress gateway.
-
-</Note>
+-> **1.8.0+:** This feature is available in Consul versions 1.8.0 and newer.
 
 Ingress gateways enable connectivity within your organizational network from services outside the Consul service mesh
 to services in the mesh. To accept ingress traffic from the public internet, use Consul's
@@ -82,6 +56,8 @@ and the [ingress gateway tutorial](/consul/tutorials/developer-mesh/service-mesh
 
 ## Terminating Gateways
 
+-> **1.8.0+:** This feature is available in Consul versions 1.8.0 and newer.
+
 Terminating gateways enable connectivity within your organizational network from services in the Consul service mesh
 to services outside the mesh.
 Services outside the mesh do not have sidecar proxies or are not [integrated natively](/consul/docs/connect/native).
diff --git a/website/content/docs/connect/gateways/ingress-gateway/index.mdx b/website/content/docs/connect/gateways/ingress-gateway/index.mdx
index 3f0b4ea836f9d..d6f012697a464 100644
--- a/website/content/docs/connect/gateways/ingress-gateway/index.mdx
+++ b/website/content/docs/connect/gateways/ingress-gateway/index.mdx
@@ -11,25 +11,16 @@ An ingress gateway is a type of proxy that enables network connectivity from ext
 
 ![Ingress Gateway Architecture](/img/ingress-gateways.png)
 
-<Note>
-
-Ingress gateway is deprecated and will not be enhanced beyond its current capabilities. Ingress gateway is fully supported
-in this version but will be removed in a future release of Consul.
-
-Consul's API gateway is the recommended alternative to ingress gateway.
-
-</Note>
-
 ## Workflow
 
 The following stages describe how to add an ingress gateway to your service mesh: 
 
 1. Configure ingress gateway listeners: Create an ingress gateway configuration entry and specify which services to expose to external requests. The configuration entry allows you to define what services should be exposed, on what port, and by what hostname. You can expose services registered with Consul or expose virtual services defined in other configuration entries. Refer to [Ingress gateway configuration entry reference](/consul/docs/connect/config-entries/ingress-gateway) for details on the configuration parameters you can specify.
 
-1. Define an ingress gateway proxy service: Ingress gateways are a special-purpose proxy service that you can define and register in a similar manner to other services. When you register the ingress gateway service, Consul applies the configurations defined in the ingress gateway configuration reference. Refer to [Implement an ingress gateway](/consul/docs/connect/gateways/ingress-gateway/usage) for additional information.
+1. Define an ingress gateway proxy service: Ingress gateways are a special-purpose proxy service that you can define and register in a similar manner to other services. When you register the ingress gateway service, Consul applies the configurations defined in the ingress gateway configuration reference. Refer to [Implement an ingress gateway](/consul/docs/connect/gateways/ingress-gateway/ingress-gateways-usage) for additional information.
 
 1. Start the network proxy: The ingress gateway proxy service accepts configurations from the configuration entry and directs requests to the exposed services. When the external traffic passes through the ingress gateway, your sidecar proxy handles the inbound and outbound connections between the exposed services and the gateway. Refer to [Service mesh proxy overview](/consul/docs/connect/proxies) to learn more about the proxies Consul supports.
 
 ## Integrations with custom TLS management solutions
 
-You can configure the ingress gateway to retrieve and serve custom TLS certificates from external systems. This functionality is designed to help you integrate with custom TLS management software. Refer to [Serve custom TLS certificates from an external service](/consul/docs/connect/gateways/ingress-gateway/tls-external-service) for additional information. 
\ No newline at end of file
+You can configure the ingress gateway to retrieve and serve custom TLS certificates from external systems. This functionality is designed to help you integrate with custom TLS management software. Refer to [Serve custom TLS certificates from an external service](/consul/docs/connect/gateways/ingress-gateway/ingress-gateways-tls-external-service) for additional information. 
\ No newline at end of file
diff --git a/website/content/docs/connect/gateways/ingress-gateway/ingress-gateways-tls-external-service.mdx b/website/content/docs/connect/gateways/ingress-gateway/ingress-gateways-tls-external-service.mdx
new file mode 100644
index 0000000000000..f01bb7932c250
--- /dev/null
+++ b/website/content/docs/connect/gateways/ingress-gateway/ingress-gateways-tls-external-service.mdx
@@ -0,0 +1,245 @@
+---
+layout: docs
+page_title: Serve custom TLS certificates from an external service
+description: Learn how to configure ingress gateways to serve TLS certificates from an external service to using secret discovery service. The SDS feature is designed for developers building integrations with custom TLS management solutions.
+---
+
+# Serve custom TLS certificates from an external service
+
+This is an advanced topic that describes how to configure ingress gateways to serve TLS certificates sourced from an external service to inbound traffic using secret discovery service (SDS). SDS is a low-level feature designed for developers building integrations with custom TLS management solutions. For instructions on more common ingress gateway implementations, refer to [Implement an ingress gateway](/consul/docs/connect/gateways/ingress-gateway/ingress-gateways-usage). 
+
+## Overview
+
+The following process describes the general procedure for configuring ingress gateways to serve TLS certificates sourced from external services:
+
+1. Configure static SDS clusters in the ingress gateway service definition.
+1. Register the service definition.
+1. Configure TLS client authentication
+1. Start Envoy.
+1. Configure SDS settings in an ingress gateway configuration entry.
+1. Register the ingress gateway configuration entry with Consul.  
+
+## Requirements
+
+- The external service must implement Envoy's [gRPC secret discovery service (SDS) API](https://www.envoyproxy.io/docs/envoy/latest/configuration/security/secret).
+- You should have some familiarity with Envoy configuration and the SDS protocol.
+- The [`connect.enabled` parameter](/consul/docs/agent/config/config-files#connect) must be set to `true` for all server agents in the Consul datacenter.
+- The [`ports.grpc` parameter](/consul/docs/agent/config/config-files#connect) must be configured for all server agents in the Consul datacenter.
+
+### ACL requirements
+
+If ACLs are enabled, you must present a token when registering ingress gateways that grant the following permissions:
+
+- `service:write` for the ingress gateway's service name 
+- `service:read` for all services in the ingress gateway's configuration entry
+- `node:read` for all nodes of the services in the ingress gateway's configuration entry.
+
+These privileges authorize the token to route communications to other services in the mesh. If the Consul client agent on the gateway's node is not configured to use the default gRPC port, `8502`, then the gateway's token must also provide `agent:read` for its node's name in order to discover the agent's gRPC port. gRPC is used to expose Envoy's xDS API to Envoy proxies.
+
+## Configure static SDS clusters
+
+You must define one or more additional static clusters in the ingress gateway service definition for each Envoy proxy associated with the gateway. The additional clusters define how Envoy should connect to the required SDS services.
+
+Configure the static clusters in the [`Proxy.Config.envoy_envoy_extra_static_clusters_json`](/consul/docs/connect/proxies/envoy#envoy_extra_static_clusters_json) parameter in the service definition. 
+
+The clusters must provide connection information and any necessary authentication information, such as mTLS credentials.
+
+You must manually register the ingress gateway with Consul proxy to define extra clusters in Envoy's bootstrap configuration. You can not use the `-register` flag with `consul connect envoy -gateway=ingress` to automatically register the proxy to define static clusters. 
+
+In the following example, the `public-ingress` gateway includes a static cluster named `sds-cluster` that specifies paths to the SDS certificate and SDS certification validation files:
+
+
+<CodeBlockConfig filename="public-ingress-service.hcl">
+
+```hcl
+Services {
+  Name = "public-ingress"
+  Kind = "ingress-gateway"
+
+  Proxy {
+    Config {
+      envoy_extra_static_clusters_json = <<EOF
+{
+  "name": "sds-cluster",
+  "connect_timeout": "5s",
+  "http2_protocol_options": {},
+  "type": "LOGICAL_DNS",
+  "transport_socket": {
+    "name":"tls",
+    "typed_config": {
+      "@type":"type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+      "common_tls_context":{
+        "tls_certificate_sds_secret_configs": [
+          {
+            "name":"tls_sds",
+            "sds_config":{
+              "path":"/certs/sds-auth-cert.json"
+            }
+          }
+        ],
+        "validation_context_sds_secret_config": {
+          "name":"validation_context_sds",
+          "sds_config":{
+              "path":"/certs/sds-validation.json"
+          }
+        }
+      }
+    }
+  },
+  "load_assignment": {
+    "cluster_name": "sds-cluster",
+    "endpoints": [
+      {
+        "lb_endpoints": [
+          {
+            "endpoint": {
+              "address": {
+                "socket_address": {
+                  "address": "sds-server.svc.cluster.local",
+                  "port_value": 8080,
+                }
+              }
+            }
+          }
+        ]
+      }
+    ]
+  }
+}
+EOF
+    }
+  }
+}
+```
+
+</CodeBlockConfig>
+
+Refer to the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/v1.17.2/api-v3/config/bootstrap/v3/bootstrap.proto#envoy-v3-api-field-config-bootstrap-v3-bootstrap-staticresources-clusters) for details about configuration parameters for SDS clusters. 
+
+## Register the ingress gateway service definition 
+
+Issue the `consul services register` command on the Consul agent on the Envoy proxy's node to register the service. The following example command registers an ingress gateway proxy from a `public-ingress.hcl` file:
+
+```shell-session
+$ consul services register public-ingress.hcl
+```
+
+Refer to [Register services and health checks](/consul/docs/services/usage/register-services-checks) for additional information about registering services in Consul.
+
+## Configure TLS client authentication
+
+Store TLS client authentication files, certificate files, and keys on disk where the Envoy proxy runs and ensure that they are available to Consul. Refer to the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/bootstrap/bootstrap) for details on configuring authentication files.
+
+The following example specifies certificate chain:
+
+
+<CodeBlockConfig filename="certs/sds-auth-cert.json">
+
+```json
+{
+  "resources": [
+    {
+      "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+      "name": "tls_sds",
+      "tls_certificate": {
+        "certificate_chain": {
+          "filename": "/certs/sds-client-auth.crt"
+        },
+        "private_key": {
+          "filename": "/certs/sds-client-auth.key"
+        }
+      }
+    }
+  ]
+}
+```
+
+</CodeBlockConfig>
+The following example specifies the validation context:
+
+<CodeBlockConfig filename="/certs/sds-validation.json">
+
+```json
+{
+  "resources": [
+    {
+      "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
+      "name": "validation_context_sds",
+      "validation_context": {
+        "trusted_ca": {
+          "filename": "/certs/sds-ca.crt"
+        }
+      }
+    }
+  ]
+}
+```
+
+</CodeBlockConfig>
+
+## Start Envoy
+
+Issue the `consul connect envoy` command to bootstrap Envoy. The following example starts Envoy and registers it as a service called `public-ingress`:
+
+```shell-session
+$ ​​consul connect envoy -gateway=ingress -service public-ingress
+```
+
+Refer to [Consul Connect Envoy](/consul/commands/connect/envoy) for additional information about using the `consul connect envoy` command.
+
+## Define an ingress gateway configuration entry
+
+Create an ingress gateway configuration entry that enables the gateway to use certificates from SDS. The configuration entry also maps downstream ingress listeners to upstream services. Configure the following fields:
+
+- [`Kind`](/consul/docs/connect/config-entries/ingress-gateway#kind): Set the value to `ingress-gateway`.
+- [`Name`](/consul/docs/connect/config-entries/ingress-gateway#name): Consul applies the configuration entry settings to ingress gateway proxies with names that match the `Name` field.  
+- [`TLS`](/consul/docs/connect/config-entries/ingress-gateway#tls): The main `TLS` parameter for the configuration entry holds the SDS configuration. You can also specify TLS configurations per listener and per service. 
+  - [`TLS.SDS`](/consul/docs/connect/config-entries/ingress-gateway#tls-sds): The `SDS` map includes the following configuration settings:
+    - [`ClusterName`](/consul/docs/connect/config-entries/ingress-gateway#tls-sds-clustername): Specifies the name of the cluster you specified when [configuring the SDS cluster](#configure-static-SDS-clusters). 
+    - [`CertResource`](/consul/docs/connect/config-entries/ingress-gateway#tls-sds-certresource): Specifies the name of the certificate resource to load.   
+- [`Listeners`](/consul/docs/connect/config-entries/ingress-gateway#listeners): Specify one or more listeners.
+   - [`Listeners.Port`](/consul/docs/connect/config-entries/ingress-gateway#listeners-port): Specify a port for the listener. Each listener is uniquely identified by its port number.
+   - [`Listeners.Protocol`](/consul/docs/connect/config-entries/ingress-gateway#listeners-protocol): The default protocol is `tcp`, but you must specify the protocol used by the services you want to allow traffic from.
+   - [`Listeners.Services`](/consul/docs/connect/config-entries/ingress-gateway#listeners-services): The `Services` field contains the services that you want to expose to upstream services. The field contains several options and sub-configurations that enable granular control over ingress traffic, such as health check and TLS configurations.  
+
+For Consul Enterprise service meshes, you may also need to configure the [`Partition`](/consul/docs/connect/config-entries/ingress-gateway#partition) and [`Namespace`](/consul/docs/connect/config-entries/ingress-gateway#namespace) fields for the gateway and for each exposed service. 
+
+Refer to [Ingress gateway configuration entry reference](/consul/docs/connect/config-entries/ingress-gateway) for details about the supported parameters. 
+
+The following example directs Consul to retrieve `example.com-public-cert` certificates from an SDS cluster named `sds-cluster` and serve them to all listeners:
+
+<CodeBlockConfig filename="public-ingress-cfg.hcl">
+
+```hcl
+Kind = "ingress-gateway"
+Name = "public-ingress"
+
+TLS {
+  SDS {
+    ClusterName = "sds-cluster"
+    CertResource = "example.com-public-cert"
+  }
+}
+
+Listeners = [
+  {
+    Port = 8443
+    Protocol = "http"
+    Services = ["*"]
+  }
+]
+```
+
+</CodeBlockConfig>
+
+##  Register the ingress gateway configuration entry
+
+You can register the configuration entry using the [`consul config` command](/consul/commands/config) or by calling the [`/config` API endpoint](/consul/api-docs/config). Refer to [How to Use Configuration Entries](/consul/docs/agent/config-entries) for details about applying configuration entries.
+
+The following example registers an ingress gateway configuration entry named `public-ingress-cfg.hcl` that is stored on the local system:
+
+```shell-session
+$ consul config write public-ingress-cfg.hcl
+```
+
+The Envoy instance starts a listener on the port specified in the configuration entry and fetches the TLS certificate named from the SDS server.
diff --git a/website/content/docs/connect/gateways/ingress-gateway/ingress-gateways-usage.mdx b/website/content/docs/connect/gateways/ingress-gateway/ingress-gateways-usage.mdx
new file mode 100644
index 0000000000000..0e42511b120e4
--- /dev/null
+++ b/website/content/docs/connect/gateways/ingress-gateway/ingress-gateways-usage.mdx
@@ -0,0 +1,117 @@
+---
+layout: docs
+page_title: Implement an ingress gateway
+description: Learn how to implement ingress gateways, which are Consul service mesh constructs that listen for requests from external network locations and route authorized traffic to destinations in the service mesh.
+---
+
+# Implement an ingress gateway
+
+This topic describes how to add ingress gateways to your Consul service mesh. Ingress gateways enable connectivity within your organizational network by allowing services outside of the service mesh to send traffic to services in the mesh. Refer to [Ingress gateways overview](/consul/docs/connect/gateways/ingress-gateway/) for additional information about ingress gateways. 
+
+This topic describes ingress gateway usage for virtual machine (VM) environments. Refer to [Configure ingress gateways for Consul on Kubernetes](/consul/docs/k8s/connect/ingress-gateways) for instructions on how to implement ingress gateways in Kubernetes environments.
+
+## Overview
+
+Ingress gateways are a type of proxy service included with Consul. Complete the following steps to set up an ingress gateway:
+
+1. Define listeners and the services they expose. Specify these details in an ingress gateway configuration entry.
+1. Register an ingress gateway service. Define the services in a service definition file.
+1. Start the ingress gateway. This step deploys the Envoy proxy that functions as the ingress gateway.
+
+After specifying listeners and services in the  ingress gateway configuration entry, you can register the gateway service and start Envoy with a single CLI command instead of completing these steps separately. Refer [Register an ingress service on Envoy startup](#register-an-ingress-service-on-envoy-startup).
+
+## Requirements
+- Service mesh must be enabled for all agents. Set the [`connect.enabled` parameter](/consul/docs/agent/config/config-files#connect) to `true` to enable service mesh.
+- The gRPC port must be configured for all server agents in the datacenter. Specify the gRPC port in the [`ports.grpc` parameter](/consul/docs/agent/config/config-files#grpc_port). We recommend setting the port to `8502` to simplify configuration when ACLs are enabled. Refer to [ACL requirements](#acl-requirements) for additional information.
+- You must use Envoy for sidecar proxies in your service mesh. Refer to [Envoy Proxy Configuration for Service Mesh](/consul/docs/connect/proxies/envoy) for supported versions. 
+### ACL requirements
+If ACLs are enabled, you must present a token when registering ingress gateways that grant the following permissions:
+
+`service:write` for the ingress gateway's service name 
+`service:read` for all services in the ingress gateway's configuration entry
+`node:read` for all nodes of the services in the ingress gateway's configuration entry.
+
+These privileges authorize the token to route communications to other services in the mesh. If the Consul client agent on the gateway's node is not configured to use the default `8502` gRPC port, then the gateway's token must also provide `agent:read` for its node's name in order to discover the agent's gRPC port. gRPC is used to expose Envoy's xDS API to Envoy proxies. 
+
+## Expose services
+
+Define and apply an ingress gateway configuration entry to specify which services in the mesh to expose to external services.  
+### Define an ingress gateway configuration entry
+Ingress gateway configuration entries map downstream ingress listeners to upstream services. When you register an ingress gateway proxy that matches the configuration entry name, Consul applies the settings specified in the configuration entry. Configure the following fields:
+
+- [`Kind`](/consul/docs/connect/config-entries/ingress-gateway#kind): Set the value to `ingress-gateway`.
+- [`Name`](/consul/docs/connect/config-entries/ingress-gateway#name): Consul applies the configuration entry settings to ingress gateway proxies with names that match the `Name` field.  
+- [`Listeners`](/consul/docs/connect/config-entries/ingress-gateway#listeners): Specify one or more listeners.
+   - [`Listeners.Port`](/consul/docs/connect/config-entries/ingress-gateway#listeners-port): Specify a port for the listener. Each listener is uniquely identified by its port number.
+   - [`Listeners.Protocol`](/consul/docs/connect/config-entries/ingress-gateway#listeners-protocol): The default protocol is `tcp`, but you must specify the protocol used by the services you want to allow traffic from.
+   - [`Listeners.Services`](/consul/docs/connect/config-entries/ingress-gateway#listeners-services): The `Services` field contains the services that you want to expose to upstream services. The field contains several options and sub-configurations that enable granular control over ingress traffic, such as health check and TLS configurations.  
+
+For Consul Enterprise service meshes, you may also need to configure the [`Partition`](/consul/docs/connect/config-entries/ingress-gateway#partition) and [`Namespace`](/consul/docs/connect/config-entries/ingress-gateway#namespace) fields for the gateway and for each exposed service. 
+
+Refer to [Ingress gateway configuration entry reference](/consul/docs/connect/config-entries/ingress-gateway) for details about the supported parameters. 
+###  Register an ingress gateway configuration entry
+
+You can register the configuration entry using the [`consul config` command](/consul/commands/config) or by calling the [`/config` API endpoint](/consul/api-docs/config). Refer to [How to Use Configuration Entries](/consul/docs/agent/config-entries) for details about applying configuration entries. 
+
+The following example registers an ingress gateway configuration entry named `public-ingress.hcl` that is stored on the local system:
+
+```shell-session
+$ consul config write public-ingress.hcl
+```
+## Deploy an ingress gateway service
+
+To deploy an ingress gateway service, create a service definition and register it with Consul. 
+
+You can also define an ingress gateway service and register it with Consul while starting an Envoy proxy from the command line. Refer to [Register an ingress service on Envoy startup](#register-an-ingress-service-on-envoy-startup) for details.
+### Create a service definition for the ingress gateway 
+
+Consul applies the settings defined in the ingress gateway configuration entry to ingress gateway services that match the configuration entry name. Refer to [Define services](/consul/docs/services/usage/define-services) for additional information about defining services in Consul. 
+
+The following fields are required for the ingress gateway service definition:
+
+[`Kind`](/consul/docs/services/configuration/services-configuration-reference#kind): The field must be set to `ingress-gateway`.
+[`Name`](/consul/docs/services/configuration/services-configuration-reference#name): The name should match the value specified for the `Name` field in the configuration entry.
+
+All other service definition fields are optional, but we recommend defining health checks to verify the health of the gateway. Refer to [Services configuration reference](/consul/docs/services/configuration/services-configuration-reference) for information about defining services. 
+
+### Register the ingress gateway proxy service
+ 
+You can register the ingress gateway using API or CLI. Refer to [Register services and health checks](/consul/docs/services/usage/register-services-checks) for instructions on registering services in Consul. 
+
+The following example registers an ingress gateway defined in `ingress-gateway.hcl` from the Consul CLI:
+
+```shell-session
+$ consul services register ingress-service.hcl
+```
+## Start an Envoy proxy
+
+Run the `consul connect envoy` command to start Envoy. Specify the name of the ingress gateway service and include the `-gateway=ingress` flag. Refer to [Consul Connect Envoy](/consul/commands/connect/envoy) for details about using the command.
+
+The following example starts Envoy for the `ingress-service` gateway service:
+
+```shell-session
+$ consul connect envoy -gateway=ingress ingress-service'
+```
+
+### Register an ingress service on Envoy startup
+
+You can also automatically register the ingress gateway service when starting the Envoy proxy. Specify the following flags with the `consul connect envoy` command:  
+
+- `-gateway=ingress`
+- `-register`: This  
+- `-service=<name of the service>`
+
+The following example starts Envoy and registers an ingress gateway service named `ingress-service` bound to the agent address at port `8888`: 
+
+```shell-session
+$ consul connect envoy -gateway=ingress -register -service ingress-service
+   -address '{{ GetInterfaceIP "eth0" }}:8888'
+```
+You cannot register the ingress gateway service and start the proxy at the same time if you configure the gateway to retrieve and serve TLS certificates from their external downstreams. Refer to [Serve custom TLS certificates from an external service](/consul/docs/connect/gateways/ingress-gateway/ingress-gateways-tls-external-service) for more information.
+
+## Additional Envoy configurations
+
+Ingress gateways support additional Envoy gateway options and escape-hatch overrides. Specify gateway options in the ingress gateway service definition to use them. To use escape-hatch overrides, you must add them to your global proxy defaults configuration entry. Refer to the following documentation for additional information:
+
+- [Gateway options](/consul/docs/connect/proxies/envoy#gateway-options)
+- [Escape-hatch overrides](/consul/docs/connect/proxies/envoy#escape-hatch-overrides) 
diff --git a/website/content/docs/connect/gateways/ingress-gateway/tls-external-service.mdx b/website/content/docs/connect/gateways/ingress-gateway/tls-external-service.mdx
deleted file mode 100644
index c214616853c4b..0000000000000
--- a/website/content/docs/connect/gateways/ingress-gateway/tls-external-service.mdx
+++ /dev/null
@@ -1,246 +0,0 @@
----
-layout: docs
-page_title: Serve custom TLS certificates from an external service
-description: Learn how to configure ingress gateways to serve TLS certificates from an external service to using secret discovery service. The SDS feature is designed for developers building integrations with custom TLS management solutions.
----
-
-# Serve custom TLS certificates from an external service
-
-This is an advanced topic that describes how to configure ingress gateways to serve TLS certificates sourced from an external service to inbound traffic using secret discovery service (SDS). SDS is a low-level feature designed for developers building integrations with custom TLS management solutions. For instructions on more common ingress gateway implementations, refer to [Implement an ingress gateway](/consul/docs/connect/gateways/ingress-gateway/usage). 
-
-## Overview
-
-The following process describes the general procedure for configuring ingress gateways to serve TLS certificates sourced from external services:
-
-1. Configure static SDS clusters in the ingress gateway service definition.
-1. Register the service definition.
-1. Configure TLS client authentication
-1. Start Envoy.
-1. Configure SDS settings in an ingress gateway configuration entry.
-1. Register the ingress gateway configuration entry with Consul.  
-
-## Requirements
-
-- The external service must implement Envoy's [gRPC secret discovery service (SDS) API](https://www.envoyproxy.io/docs/envoy/latest/configuration/security/secret).
-- You should have some familiarity with Envoy configuration and the SDS protocol.
-- The [`connect.enabled` parameter](/consul/docs/agent/config/config-files#connect) must be set to `true` for all server agents in the Consul datacenter.
-- The [`ports.grpc` parameter](/consul/docs/agent/config/config-files#connect) must be configured for all server agents in the Consul datacenter.
-
-### ACL requirements
-
-If ACLs are enabled, you must present a token when registering ingress gateways that grant the following permissions:
-
-- `service:write` for the ingress gateway's service name 
-- `service:read` for all services in the ingress gateway's configuration entry
-- `node:read` for all nodes of the services in the ingress gateway's configuration entry.
-
-These privileges authorize the token to route communications to other services in the mesh. If the Consul client agent on the gateway's node is not configured to use the default gRPC port, `8502`, then the gateway's token must also provide `agent:read` for its node's name in order to discover the agent's gRPC port. gRPC is used to expose Envoy's xDS API to Envoy proxies.
-
-## Configure static SDS clusters
-
-You must define one or more additional static clusters in the ingress gateway service definition for each Envoy proxy associated with the gateway. The additional clusters define how Envoy should connect to the required SDS services.
-
-Configure the static clusters in the [`Proxy.Config.envoy_envoy_extra_static_clusters_json`](/consul/docs/connect/proxies/envoy#envoy_extra_static_clusters_json) parameter in the service definition. 
-
-The clusters must provide connection information and any necessary authentication information, such as mTLS credentials.
-
-You must manually register the ingress gateway with Consul proxy to define extra clusters in Envoy's bootstrap configuration. You can not use the `-register` flag with `consul connect envoy -gateway=ingress` to automatically register the proxy to define static clusters. 
-
-In the following example, the `public-ingress` gateway includes a static cluster named `sds-cluster` that specifies paths to the SDS certificate and SDS certification validation files:
-
-
-<CodeBlockConfig filename="public-ingress-service.hcl">
-
-```hcl
-Services {
-  Name = "public-ingress"
-  Kind = "ingress-gateway"
-
-  Proxy {
-    Config {
-      envoy_extra_static_clusters_json = <<EOF
-{
-  "name": "sds-cluster",
-  "connect_timeout": "5s",
-  "http2_protocol_options": {},
-  "type": "LOGICAL_DNS",
-  "transport_socket": {
-    "name":"tls",
-    "typed_config": {
-      "@type":"type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-      "common_tls_context":{
-        "tls_certificate_sds_secret_configs": [
-          {
-            "name":"tls_sds",
-            "sds_config":{
-              "path":"/certs/sds-auth-cert.json"
-            }
-          }
-        ],
-        "validation_context_sds_secret_config": {
-          "name":"validation_context_sds",
-          "sds_config":{
-              "path":"/certs/sds-validation.json"
-          }
-        }
-      }
-    }
-  },
-  "load_assignment": {
-    "cluster_name": "sds-cluster",
-    "endpoints": [
-      {
-        "lb_endpoints": [
-          {
-            "endpoint": {
-              "address": {
-                "socket_address": {
-                  "address": "sds-server.svc.cluster.local",
-                  "port_value": 8080,
-                }
-              }
-            }
-          }
-        ]
-      }
-    ]
-  }
-}
-EOF
-    }
-  }
-}
-```
-
-</CodeBlockConfig>
-
-Refer to the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/v1.17.2/api-v3/config/bootstrap/v3/bootstrap.proto#envoy-v3-api-field-config-bootstrap-v3-bootstrap-staticresources-clusters) for details about configuration parameters for SDS clusters. 
-
-## Register the ingress gateway service definition 
-
-Issue the `consul services register` command on the Consul agent on the Envoy proxy's node to register the service. The following example command registers an ingress gateway proxy from a `public-ingress.hcl` file:
-
-```shell-session
-$ consul services register public-ingress.hcl
-```
-
-Refer to [Register services and health checks](/consul/docs/services/usage/register-services-checks) for additional information about registering services in Consul.
-
-## Configure TLS client authentication
-
-Store TLS client authentication files, certificate files, and keys on disk where the Envoy proxy runs and ensure that they are available to Consul. Refer to the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/bootstrap/bootstrap) for details on configuring authentication files.
-
-The following example specifies certificate chain:
-
-
-<CodeBlockConfig filename="certs/sds-auth-cert.json">
-
-```json
-{
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-      "name": "tls_sds",
-      "tls_certificate": {
-        "certificate_chain": {
-          "filename": "/certs/sds-client-auth.crt"
-        },
-        "private_key": {
-          "filename": "/certs/sds-client-auth.key"
-        }
-      }
-    }
-  ]
-}
-```
-
-</CodeBlockConfig>
-
-The following example specifies the validation context:
-
-<CodeBlockConfig filename="/certs/sds-validation.json">
-
-```json
-{
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret",
-      "name": "validation_context_sds",
-      "validation_context": {
-        "trusted_ca": {
-          "filename": "/certs/sds-ca.crt"
-        }
-      }
-    }
-  ]
-}
-```
-
-</CodeBlockConfig>
-
-## Start Envoy
-
-Issue the `consul connect envoy` command to bootstrap Envoy. The following example starts Envoy and registers it as a service called `public-ingress`:
-
-```shell-session
-$ ​​consul connect envoy -gateway=ingress -service public-ingress
-```
-
-Refer to [Consul Connect Envoy](/consul/commands/connect/envoy) for additional information about using the `consul connect envoy` command.
-
-## Define an ingress gateway configuration entry
-
-Create an ingress gateway configuration entry that enables the gateway to use certificates from SDS. The configuration entry also maps downstream ingress listeners to upstream services. Configure the following fields:
-
-- [`Kind`](/consul/docs/connect/config-entries/ingress-gateway#kind): Set the value to `ingress-gateway`.
-- [`Name`](/consul/docs/connect/config-entries/ingress-gateway#name): Consul applies the configuration entry settings to ingress gateway proxies with names that match the `Name` field.  
-- [`TLS`](/consul/docs/connect/config-entries/ingress-gateway#tls): The main `TLS` parameter for the configuration entry holds the SDS configuration. You can also specify TLS configurations per listener and per service. 
-  - [`TLS.SDS`](/consul/docs/connect/config-entries/ingress-gateway#tls-sds): The `SDS` map includes the following configuration settings:
-    - [`ClusterName`](/consul/docs/connect/config-entries/ingress-gateway#tls-sds-clustername): Specifies the name of the cluster you specified when [configuring the SDS cluster](#configure-static-SDS-clusters). 
-    - [`CertResource`](/consul/docs/connect/config-entries/ingress-gateway#tls-sds-certresource): Specifies the name of the certificate resource to load.   
-- [`Listeners`](/consul/docs/connect/config-entries/ingress-gateway#listeners): Specify one or more listeners.
-   - [`Listeners.Port`](/consul/docs/connect/config-entries/ingress-gateway#listeners-port): Specify a port for the listener. Each listener is uniquely identified by its port number.
-   - [`Listeners.Protocol`](/consul/docs/connect/config-entries/ingress-gateway#listeners-protocol): The default protocol is `tcp`, but you must specify the protocol used by the services you want to allow traffic from.
-   - [`Listeners.Services`](/consul/docs/connect/config-entries/ingress-gateway#listeners-services): The `Services` field contains the services that you want to expose to upstream services. The field contains several options and sub-configurations that enable granular control over ingress traffic, such as health check and TLS configurations.  
-
-For Consul Enterprise service meshes, you may also need to configure the [`Partition`](/consul/docs/connect/config-entries/ingress-gateway#partition) and [`Namespace`](/consul/docs/connect/config-entries/ingress-gateway#namespace) fields for the gateway and for each exposed service. 
-
-Refer to [Ingress gateway configuration entry reference](/consul/docs/connect/config-entries/ingress-gateway) for details about the supported parameters. 
-
-The following example directs Consul to retrieve `example.com-public-cert` certificates from an SDS cluster named `sds-cluster` and serve them to all listeners:
-
-<CodeBlockConfig filename="public-ingress-cfg.hcl">
-
-```hcl
-Kind = "ingress-gateway"
-Name = "public-ingress"
-
-TLS {
-  SDS {
-    ClusterName = "sds-cluster"
-    CertResource = "example.com-public-cert"
-  }
-}
-
-Listeners = [
-  {
-    Port = 8443
-    Protocol = "http"
-    Services = ["*"]
-  }
-]
-```
-
-</CodeBlockConfig>
-
-##  Register the ingress gateway configuration entry
-
-You can register the configuration entry using the [`consul config` command](/consul/commands/config) or by calling the [`/config` API endpoint](/consul/api-docs/config). Refer to [How to Use Configuration Entries](/consul/docs/agent/config-entries) for details about applying configuration entries.
-
-The following example registers an ingress gateway configuration entry named `public-ingress-cfg.hcl` that is stored on the local system:
-
-```shell-session
-$ consul config write public-ingress-cfg.hcl
-```
-
-The Envoy instance starts a listener on the port specified in the configuration entry and fetches the TLS certificate named from the SDS server.
\ No newline at end of file
diff --git a/website/content/docs/connect/gateways/ingress-gateway/usage.mdx b/website/content/docs/connect/gateways/ingress-gateway/usage.mdx
deleted file mode 100644
index 2b4c55e279a42..0000000000000
--- a/website/content/docs/connect/gateways/ingress-gateway/usage.mdx
+++ /dev/null
@@ -1,127 +0,0 @@
----
-layout: docs
-page_title: Implement an ingress gateway
-description: Learn how to implement ingress gateways, which are Consul service mesh constructs that listen for requests from external network locations and route authorized traffic to destinations in the service mesh.
----
-
-# Implement an ingress gateway
-
-This topic describes how to add ingress gateways to your Consul service mesh. Ingress gateways enable connectivity within your organizational network by allowing services outside of the service mesh to send traffic to services in the mesh. Refer to [Ingress gateways overview](/consul/docs/connect/gateways/ingress-gateway/) for additional information about ingress gateways. 
-
-This topic describes ingress gateway usage for virtual machine (VM) environments. Refer to [Configure ingress gateways for Consul on Kubernetes](/consul/docs/k8s/connect/ingress-gateways) for instructions on how to implement ingress gateways in Kubernetes environments.
-
-## Overview
-
-Ingress gateways are a type of proxy service included with Consul. Complete the following steps to set up an ingress gateway:
-
-1. Define listeners and the services they expose. Specify these details in an ingress gateway configuration entry.
-1. Register an ingress gateway service. Define the services in a service definition file.
-1. Start the ingress gateway. This step deploys the Envoy proxy that functions as the ingress gateway.
-
-After specifying listeners and services in the  ingress gateway configuration entry, you can register the gateway service and start Envoy with a single CLI command instead of completing these steps separately. Refer [Register an ingress service on Envoy startup](#register-an-ingress-service-on-envoy-startup).
-
-## Requirements
-
-- Service mesh must be enabled for all agents. Set the [`connect.enabled` parameter](/consul/docs/agent/config/config-files#connect) to `true` to enable service mesh.
-- The gRPC port must be configured for all server agents in the datacenter. Specify the gRPC port in the [`ports.grpc` parameter](/consul/docs/agent/config/config-files#grpc_port). We recommend setting the port to `8502` to simplify configuration when ACLs are enabled. Refer to [ACL requirements](#acl-requirements) for additional information.
-- You must use Envoy for sidecar proxies in your service mesh. Refer to [Envoy Proxy Configuration for Service Mesh](/consul/docs/connect/proxies/envoy) for supported versions. 
-
-### ACL requirements
-
-If ACLs are enabled, you must present a token when registering ingress gateways that grant the following permissions:
-
-`service:write` for the ingress gateway's service name 
-`service:read` for all services in the ingress gateway's configuration entry
-`node:read` for all nodes of the services in the ingress gateway's configuration entry.
-
-These privileges authorize the token to route communications to other services in the mesh. If the Consul client agent on the gateway's node is not configured to use the default `8502` gRPC port, then the gateway's token must also provide `agent:read` for its node's name in order to discover the agent's gRPC port. gRPC is used to expose Envoy's xDS API to Envoy proxies. 
-
-## Expose services
-
-Define and apply an ingress gateway configuration entry to specify which services in the mesh to expose to external services.  
-
-### Define an ingress gateway configuration entry
-
-Ingress gateway configuration entries map downstream ingress listeners to upstream services. When you register an ingress gateway proxy that matches the configuration entry name, Consul applies the settings specified in the configuration entry. Configure the following fields:
-
-- [`Kind`](/consul/docs/connect/config-entries/ingress-gateway#kind): Set the value to `ingress-gateway`.
-- [`Name`](/consul/docs/connect/config-entries/ingress-gateway#name): Consul applies the configuration entry settings to ingress gateway proxies with names that match the `Name` field.  
-- [`Listeners`](/consul/docs/connect/config-entries/ingress-gateway#listeners): Specify one or more listeners.
-   - [`Listeners.Port`](/consul/docs/connect/config-entries/ingress-gateway#listeners-port): Specify a port for the listener. Each listener is uniquely identified by its port number.
-   - [`Listeners.Protocol`](/consul/docs/connect/config-entries/ingress-gateway#listeners-protocol): The default protocol is `tcp`, but you must specify the protocol used by the services you want to allow traffic from.
-   - [`Listeners.Services`](/consul/docs/connect/config-entries/ingress-gateway#listeners-services): The `Services` field contains the services that you want to expose to upstream services. The field contains several options and sub-configurations that enable granular control over ingress traffic, such as health check and TLS configurations.  
-
-For Consul Enterprise service meshes, you may also need to configure the [`Partition`](/consul/docs/connect/config-entries/ingress-gateway#partition) and [`Namespace`](/consul/docs/connect/config-entries/ingress-gateway#namespace) fields for the gateway and for each exposed service. 
-
-Refer to [Ingress gateway configuration entry reference](/consul/docs/connect/config-entries/ingress-gateway) for details about the supported parameters. 
-
-###  Register an ingress gateway configuration entry
-
-You can register the configuration entry using the [`consul config` command](/consul/commands/config) or by calling the [`/config` API endpoint](/consul/api-docs/config). Refer to [How to Use Configuration Entries](/consul/docs/agent/config-entries) for details about applying configuration entries. 
-
-The following example registers an ingress gateway configuration entry named `public-ingress.hcl` that is stored on the local system:
-
-```shell-session
-$ consul config write public-ingress.hcl
-```
-
-## Deploy an ingress gateway service
-
-To deploy an ingress gateway service, create a service definition and register it with Consul. 
-
-You can also define an ingress gateway service and register it with Consul while starting an Envoy proxy from the command line. Refer to [Register an ingress service on Envoy startup](#register-an-ingress-service-on-envoy-startup) for details.
-
-### Create a service definition for the ingress gateway 
-
-Consul applies the settings defined in the ingress gateway configuration entry to ingress gateway services that match the configuration entry name. Refer to [Define services](/consul/docs/services/usage/define-services) for additional information about defining services in Consul. 
-
-The following fields are required for the ingress gateway service definition:
-
-- [`Kind`](/consul/docs/services/configuration/services-configuration-reference#kind): The field must be set to `ingress-gateway`.
-- [`Name`](/consul/docs/services/configuration/services-configuration-reference#name): The name should match the value specified for the `Name` field in the configuration entry.
-
-All other service definition fields are optional, but we recommend defining health checks to verify the health of the gateway. Refer to [Services configuration reference](/consul/docs/services/configuration/services-configuration-reference) for information about defining services. 
-
-### Register the ingress gateway proxy service
- 
-You can register the ingress gateway using API or CLI. Refer to [Register services and health checks](/consul/docs/services/usage/register-services-checks) for instructions on registering services in Consul. 
-
-The following example registers an ingress gateway defined in `ingress-gateway.hcl` from the Consul CLI:
-
-```shell-session
-$ consul services register ingress-service.hcl
-```
-
-## Start an Envoy proxy
-
-Run the `consul connect envoy` command to start Envoy. Specify the name of the ingress gateway service and include the `-gateway=ingress` flag. Refer to [Consul Connect Envoy](/consul/commands/connect/envoy) for details about using the command.
-
-The following example starts Envoy for the `ingress-service` gateway service:
-
-```shell-session
-$ consul connect envoy -gateway=ingress ingress-service
-```
-
-### Register an ingress service on Envoy startup
-
-You can also automatically register the ingress gateway service when starting the Envoy proxy. Specify the following flags with the `consul connect envoy` command:  
-
-- `-gateway=ingress`
-- `-register`
-- `-service=<name of the service>`
-
-The following example starts Envoy and registers an ingress gateway service named `ingress-service` bound to the agent address at port `8888`: 
-
-```shell-session
-$ consul connect envoy -gateway=ingress -register \
-   -service ingress-service \
-   -address '{{ GetInterfaceIP "eth0" }}:8888'
-```
-You cannot register the ingress gateway service and start the proxy at the same time if you configure the gateway to retrieve and serve TLS certificates from their external downstreams. Refer to [Serve custom TLS certificates from an external service](/consul/docs/connect/gateways/ingress-gateway/tls-external-service) for more information.
-
-## Additional Envoy configurations
-
-Ingress gateways support additional Envoy gateway options and escape-hatch overrides. Specify gateway options in the ingress gateway service definition to use them. To use escape-hatch overrides, you must add them to your global proxy defaults configuration entry. Refer to the following documentation for additional information:
-
-- [Gateway options](/consul/docs/connect/proxies/envoy#gateway-options)
-- [Escape-hatch overrides](/consul/docs/connect/proxies/envoy#escape-hatch-overrides) 
diff --git a/website/content/docs/connect/gateways/mesh-gateway/index.mdx b/website/content/docs/connect/gateways/mesh-gateway/index.mdx
index efb1bc1066e32..f168192e9da07 100644
--- a/website/content/docs/connect/gateways/mesh-gateway/index.mdx
+++ b/website/content/docs/connect/gateways/mesh-gateway/index.mdx
@@ -12,16 +12,16 @@ Datacenters can reside in different clouds or runtime environments where general
 
 ## Prerequisites
 
-Mesh gateways can be used with any of the following Consul configurations for managing separate datacenters or partitions.
+Mesh gateways can be used with any of the following Consul configrations for managing separate datacenters or partitions.
 
 1. WAN Federation
-    * [Mesh gateways can be used to route service-to-service traffic between datacenters](/consul/docs/connect/gateways/mesh-gateway/service-to-service-traffic-wan-datacenters)
-    * [Mesh gateways can be used to route all WAN traffic, including from Consul servers](/consul/docs/connect/gateways/mesh-gateway/wan-federation-via-mesh-gateways)
+  * [Mesh gateways can be used to route service-to-service traffic between datacenters](/consul/docs/connect/gateways/mesh-gateway/service-to-service-traffic-wan-datacenters)
+  * [Mesh gateways can be used to route all WAN traffic, including from Consul servers](/consul/docs/connect/gateways/mesh-gateway/wan-federation-via-mesh-gateways)
 2. Cluster Peering
-    * [Mesh gateways can be used to route service-to-service traffic between datacenters](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering)
-    * [Mesh gateways can be used to route control-plane traffic from Consul servers](/consul/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways)
+  * [Mesh gateways can be used to route service-to-service traffic between datacenters](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering)
+  * [Mesh gateways can be used to route control-plane traffic from Consul servers](/consul/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways)
 3. Admin Partitions
-    * [Mesh gateways can be used to route service-to-service traffic between admin partitions in the same Consul datacenter](/consul/docs/connect/gateways/mesh-gateway/service-to-service-traffic-partitions)
+  * [Mesh gateways can be used to route service-to-service traffic between admin partitions in the same Consul datacenter](/consul/docs/connect/gateways/mesh-gateway/service-to-service-traffic-partitions)
 
 ### Consul
 
@@ -48,7 +48,7 @@ Sidecar proxies that do not send upstream traffic through a gateway are not affe
 Configure the following settings to register the mesh gateway as a service in Consul.
 
 * Specify `mesh-gateway` in the `kind` field to register the gateway with Consul.
-* Configure the `proxy.upstreams` parameters to route traffic to the correct service, namespace, and datacenter. Refer to the [`upstreams` documentation](/consul/docs/connect/proxies/proxy-config-reference#upstream-configuration-reference) for details. The service `proxy.upstreams.destination_name` is always required. The `proxy.upstreams.datacenter` must be configured to enable cross-datacenter traffic. The `proxy.upstreams.destination_namespace` configuration is only necessary if the destination service is in a different namespace.
+* Configure the `proxy.upstreams` parameters to route traffic to the correct service, namespace, and datacenter. Refer to the [`upstreams` documentation](/consul/docs/connect/registration/service-registration#upstream-configuration-reference) for details. The service `proxy.upstreams.destination_name` is always required. The `proxy.upstreams.datacenter` must be configured to enable cross-datacenter traffic. The `proxy.upstreams.destination_namespace` configuration is only necessary if the destination service is in a different namespace.
 * Define the `Proxy.Config` settings using opaque parameters compatible with your proxy (i.e., Envoy). For Envoy, refer to the [Gateway Options](/consul/docs/connect/proxies/envoy#gateway-options) and [Escape-hatch Overrides](/consul/docs/connect/proxies/envoy#escape-hatch-overrides) documentation for additional configuration information.
 * If ACLs are enabled, a token granting `service:write` for the gateway's service name and `service:read` for all services in the datacenter or partition must be added to the gateway's service definition. These permissions authorize the token to route communications for other Consul service mesh services, but does not allow decrypting any of their communications.
 
@@ -59,7 +59,7 @@ Depending on your network, the proxy's connection to the gateway can operate in
 
 * `none` - No gateway is used and a service mesh sidecar proxy makes its outbound connections directly
   to the destination services. This is the default for WAN federation. This setting is invalid for peered clusters
-  and will be treated as remote instead.
+  and will be treated as remote instead. 
 
 * `local` - The service mesh sidecar proxy makes an outbound connection to a gateway running in the
   same datacenter. That gateway is responsible for ensuring that the data is forwarded to gateways in the destination datacenter.
@@ -84,24 +84,21 @@ Use the following example configurations to help you understand some of the comm
 
 The following `proxy-defaults` configuration will enable gateways for all mesh services in the `local` mode.
 
-<CodeTabs heading="Example: Enabling gateways globally">
+<CodeTabs heading="Example: Enabling gateways globally.">
 
 ```hcl
 Kind = "proxy-defaults"
 Name = "global"
 MeshGateway {
-  Mode = "local"
+   Mode = "local"
 }
 ```
 
 ```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ProxyDefaults
-metadata:
-  name: global
-spec:
-  meshGateway:
-    mode: local
+Kind: proxy-defaults
+MeshGateway:
+- Mode: local
+Name: global
 ```
 
 ```json
@@ -126,18 +123,15 @@ The following `service-defaults` configuration will enable gateways for all mesh
 Kind = "service-defaults"
 Name = "web"
 MeshGateway {
-  Mode = "local"
+   Mode = "local"
 }
 ```
 
 ```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceDefaults
-metadata:
-  name: web
-spec:
-  meshGateway:
-    mode: local
+Kind: service-defaults
+MeshGateway:
+- Mode: local
+Name: web
 ```
 
 ```json
@@ -154,29 +148,29 @@ spec:
 
 ### Enabling Gateways for a Service Instance
 
-The following [proxy service configuration](/consul/docs/connect/proxies/deploy-service-mesh-proxies)
- enables gateways for the service instance in the `remote` mode.
+The following [Proxy Service Registration](/consul/docs/connect/registration/service-registration)
+definition will enable gateways for the service instance in the `remote` mode.
 
 <CodeTabs heading="Example: Enabling gateways for a service instance.">
 
 ```hcl
 service {
-  name = "web-sidecar-proxy"
-  kind = "connect-proxy"
-  port = 8181
-  proxy {
-    destination_service_name = "web"
-    mesh_gateway {
-      mode = "remote"
-    }
-    upstreams = [
-      {
-        destination_name = "api"
-        datacenter = "secondary"
-        local_bind_port = 10000
+   name = "web-sidecar-proxy"
+   kind = "connect-proxy"
+   port = 8181
+   proxy {
+      destination_service_name = "web"
+      mesh_gateway {
+         mode = "remote"
       }
-    ]
-  }
+      upstreams = [
+         {
+            destination_name = "api"
+            datacenter = "secondary"
+            local_bind_port = 10000
+         }
+      ]
+   }
 }
 
 # Or alternatively inline with the service definition:
@@ -236,38 +230,38 @@ The following service definition will enable gateways in the `local` mode for on
 
 ```hcl
 service {
-  name = "web-sidecar-proxy"
-  kind = "connect-proxy"
-  port = 8181
-  proxy {
-    destination_service_name = "web"
-    upstreams = [
-      {
-        destination_name = "api"
-        destination_peer = "cluster-01"
-        local_bind_port = 10000
-        mesh_gateway {
-          mode = "remote"
-        }
-      },
-      {
-        destination_name = "db"
-        datacenter = "secondary"
-        local_bind_port = 10001
-        mesh_gateway {
-          mode = "local"
-        }
-      },
-      {
-        destination_name = "logging"
-        datacenter = "secondary"
-        local_bind_port = 10002
-        mesh_gateway {
-          mode = "none"
-        }
-      },
-    ]
-  }
+   name = "web-sidecar-proxy"
+   kind = "connect-proxy"
+   port = 8181
+   proxy {
+      destination_service_name = "web"
+      upstreams = [
+         {
+            destination_name = "api"
+            destination_peer = "cluster-01"
+            local_bind_port = 10000
+            mesh_gateway {
+               mode = "remote"
+            }
+         },
+         {
+            destination_name = "db"
+            datacenter = "secondary"
+            local_bind_port = 10001
+            mesh_gateway {
+               mode = "local"
+            }
+         },
+         {
+            destination_name = "logging"
+            datacenter = "secondary"
+            local_bind_port = 10002
+            mesh_gateway {
+               mode = "none"
+            }
+         },
+      ]
+   }
 }
 ```
 ```json
diff --git a/website/content/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways.mdx b/website/content/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways.mdx
index 97334950f62a2..806d161fcdc12 100644
--- a/website/content/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways.mdx
+++ b/website/content/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways.mdx
@@ -55,13 +55,13 @@ For Consul Enterprise clusters, mesh gateways must be registered in the "default
 ### ACL configuration
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 
-In addition to the [ACL Configuration](/consul/docs/connect/cluster-peering/tech-specs#acl-specifications) necessary for service-to-service traffic, mesh gateways that route peering control plane traffic must be granted `peering:read` access to all peerings.
+In addition to the [ACL Configuration](/consul/docs/connect/cluster-peering/tech-specs#acl-specifications) necessary for service-to-service traffic, mesh gateways that route peering control plane traffic must be granted `peering:read` access to all peerings. 
 
 This access allows the mesh gateway to list all peerings in a Consul cluster and generate unique routing per peered datacenter.
 
-<CodeTabs heading="Example ACL rules for Mesh Gateway Peering Control Plane Traffic in Consul CE">
+<CodeTabs heading="Example ACL rules for Mesh Gateway Peering Control Plane Traffic in Consul OSS">
 
 ```hcl
 peering = "read"
@@ -79,7 +79,7 @@ peering = "read"
 
 <Tab heading="Consul Enterprise">
 
-In addition to the [ACL Configuration](/consul/docs/connect/cluster-peering/tech-specs#acl-specifications) necessary for service-to-service traffic, mesh gateways that route peering control plane traffic must be granted `peering:read` access to all peerings in all partitions.
+In addition to the [ACL Configuration](/consul/docs/connect/cluster-peering/tech-specs#acl-specifications) necessary for service-to-service traffic, mesh gateways that route peering control plane traffic must be granted `peering:read` access to all peerings in all partitions. 
 
 This access allows the mesh gateway to list all peerings in a Consul cluster and generate unique routing per peered partition.
 
@@ -108,7 +108,7 @@ partition_prefix "" {
 
 ### Modes
 
-Connect proxy configuration [Modes](/consul/docs/connect/gateways/mesh-gateway#connect-proxy-configuration#modes) are not applicable to peering control plane traffic.
+Connect proxy configuration [Modes](/consul/docs/connect/gateways/mesh-gateway#connect-proxy-configuration#modes) are not applicable to peering control plane traffic. 
 The flow of control plane traffic through the gateway is implied by the presence of a [Mesh config entry](/consul/docs/connect/config-entries/mesh#peer-through-mesh-gateways) with `PeerThroughMeshGateways = true`.
 
 <CodeTabs heading="Example: Enabling Peering Control Plane Traffic for Mesh Gateways">
@@ -121,19 +121,15 @@ Peering {
 ```
 
 ```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: Mesh
-metadata:
-  name: mesh
-spec:
-  peering:
-    peerThroughMeshGateways: true
+Kind: mesh
+Peeering:
+  PeerThroughMeshGateways: true
 ```
 </CodeTabs>
 
-By setting this mesh config on a cluster before [creating a peering token](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering#create-a-peering-token), inbound control plane traffic will be sent through the mesh gateway registered this cluster, also known the accepting cluster.
+By setting this mesh config on a cluster before [creating a peering token](/consul/docs/connect/cluster-peering/create-manage-peering#create-a-peering-token), inbound control plane traffic will be sent through the mesh gateway registered this cluster, also known the accepting cluster. 
 As mesh gateway instances are registered at the accepting cluster, their addresses will be exposed to the dialing cluster over the bi-directional peering stream.
 
-Setting this mesh config on a cluster before [establishing a connection](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering#establish-a-connection-between-clusters) will cause the outbound control plane traffic to flow through the mesh gateway.
+Setting this mesh config on a cluster before [establishing a connection](/consul/docs/connect/cluster-peering/create-manage-peering#establish-a-connection-between-clusters) will cause the outbound control plane traffic to flow through the mesh gateway.
 
 To route all peering control plane traffic though mesh gateways, both the accepting and dialing cluster must have the mesh config entry applied.
diff --git a/website/content/docs/connect/gateways/mesh-gateway/service-to-service-traffic-partitions.mdx b/website/content/docs/connect/gateways/mesh-gateway/service-to-service-traffic-partitions.mdx
index 4c7fe3ba2aa19..28331ff174010 100644
--- a/website/content/docs/connect/gateways/mesh-gateway/service-to-service-traffic-partitions.mdx
+++ b/website/content/docs/connect/gateways/mesh-gateway/service-to-service-traffic-partitions.mdx
@@ -43,7 +43,7 @@ Sidecar proxies that do not send upstream traffic through a gateway are not affe
 Configure the following settings to register the mesh gateway as a service in Consul.
 
 * Specify `mesh-gateway` in the `kind` field to register the gateway with Consul.
-* Configure the `proxy.upstreams` parameters to route traffic to the correct service, namespace, and partition. Refer to the [`upstreams` documentation](/consul/docs/connect/proxies/proxy-config-reference#upstream-configuration-reference) for details. The service `proxy.upstreams.destination_name` is always required. The `proxy.upstreams.destination_partition` must be configured to enable cross-partition traffic. The `proxy.upstreams.destination_namespace` configuration is only necessary if the destination service is in a different namespace.
+* Configure the `proxy.upstreams` parameters to route traffic to the correct service, namespace, and partition. Refer to the [`upstreams` documentation](/consul/docs/connect/registration/service-registration#upstream-configuration-reference) for details. The service `proxy.upstreams.destination_name` is always required. The `proxy.upstreams.destination_partition` must be configured to enable cross-partition traffic. The `proxy.upstreams.destination_namespace` configuration is only necessary if the destination service is in a different namespace.
 * Configure the `exported-services` configuration entry to enable Consul to export services contained in an admin partition to one or more additional partitions. Refer to the [Exported Services documentation](/consul/docs/connect/config-entries/exported-services) for details.
 * Define the `Proxy.Config` settings using opaque parameters compatible with your proxy, i.e., Envoy. For Envoy, refer to the [Gateway Options](/consul/docs/connect/proxies/envoy#gateway-options) and [Escape-hatch Overrides](/consul/docs/connect/proxies/envoy#escape-hatch-overrides) documentation for additional configuration information.
 * If ACLs are enabled, a token granting `service:write` for the gateway's service name and `service:read` for all services in the datacenter or partition must be added to the gateway's service definition. These permissions authorize the token to route communications for other Consul service mesh services, but does not allow decrypting any of their communications.
@@ -78,7 +78,7 @@ Use the following example configurations to help you understand some of the comm
 
 The following `proxy-defaults` configuration will enable gateways for all mesh services in the `local` mode.
 
-<CodeTabs heading="Example: Enabling gateways globally">
+<CodeTabs heading="Example: Enabling gateways globally.">
 
 ```hcl
 Kind = "proxy-defaults"
@@ -89,13 +89,10 @@ MeshGateway {
 ```
 
 ```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ProxyDefaults
-metadata:
-  name: global
-spec:
-  meshGateway:
-    mode: local
+Kind: proxy-defaults
+MeshGateway:
+- Mode: local
+Name: global
 ```
 
 ```json
@@ -125,13 +122,10 @@ MeshGateway {
 ```
 
 ```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceDefaults
-metadata:
-  name: web
-spec:
-  meshGateway:
-    mode: local
+Kind: service-defaults
+MeshGateway:
+- Mode: local
+Name: web
 ```
 
 ```json
@@ -148,8 +142,8 @@ spec:
 
 ### Enabling Gateways for a Service Instance
 
-The following [proxy service configuration](/consul/docs/connect/proxies/deploy-service-mesh-proxies)
-enables gateways for `web` service instances in the `finance` partition.
+The following [Proxy Service Registration](/consul/docs/connect/registration/service-registration)
+definition will enable gateways for `web` service instances in the `finance` partition.
 
 <CodeTabs heading="Example: Enabling gateways for a service instance">
 
diff --git a/website/content/docs/connect/gateways/mesh-gateway/service-to-service-traffic-wan-datacenters.mdx b/website/content/docs/connect/gateways/mesh-gateway/service-to-service-traffic-wan-datacenters.mdx
index d9df2de8f18cb..917d925294f27 100644
--- a/website/content/docs/connect/gateways/mesh-gateway/service-to-service-traffic-wan-datacenters.mdx
+++ b/website/content/docs/connect/gateways/mesh-gateway/service-to-service-traffic-wan-datacenters.mdx
@@ -57,7 +57,7 @@ Sidecar proxies that do not send upstream traffic through a gateway are not affe
 Configure the following settings to register the mesh gateway as a service in Consul.
 
 * Specify `mesh-gateway` in the `kind` field to register the gateway with Consul.
-* Configure the `proxy.upstreams` parameters to route traffic to the correct service, namespace, and datacenter. Refer to the [`upstreams` documentation](/consul/docs/connect/proxies/proxy-config-reference#upstream-configuration-reference) for details. The service `proxy.upstreams.destination_name` is always required. The `proxy.upstreams.datacenter` must be configured to enable cross-datacenter traffic. The `proxy.upstreams.destination_namespace` configuration is only necessary if the destination service is in a different namespace.
+* Configure the `proxy.upstreams` parameters to route traffic to the correct service, namespace, and datacenter. Refer to the [`upstreams` documentation](/consul/docs/connect/registration/service-registration#upstream-configuration-reference) for details. The service `proxy.upstreams.destination_name` is always required. The `proxy.upstreams.datacenter` must be configured to enable cross-datacenter traffic. The `proxy.upstreams.destination_namespace` configuration is only necessary if the destination service is in a different namespace.
 * Define the `Proxy.Config` settings using opaque parameters compatible with your proxy (i.e., Envoy). For Envoy, refer to the [Gateway Options](/consul/docs/connect/proxies/envoy#gateway-options) and [Escape-hatch Overrides](/consul/docs/connect/proxies/envoy#escape-hatch-overrides) documentation for additional configuration information.
 * If ACLs are enabled, a token granting `service:write` for the gateway's service name and `service:read` for all services in the datacenter or partition must be added to the gateway's service definition. These permissions authorize the token to route communications for other Consul service mesh services, but does not allow decrypting any of their communications.
 
@@ -94,7 +94,7 @@ Use the following example configurations to help you understand some of the comm
 
 The following `proxy-defaults` configuration will enable gateways for all mesh services in the `local` mode.
 
-<CodeTabs heading="Example: Enabling gateways globally">
+<CodeTabs heading="Example: Enabling gateways globally.">
 
 ```hcl
 Kind = "proxy-defaults"
@@ -105,13 +105,10 @@ MeshGateway {
 ```
 
 ```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ProxyDefaults
-metadata:
-  name: global
-spec:
-  meshGateway:
-    mode: local
+Kind: proxy-defaults
+MeshGateway:
+- Mode: local
+Name: global
 ```
 
 ```json
@@ -140,13 +137,10 @@ MeshGateway {
 ```
 
 ```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceDefaults
-metadata:
-  name: web
-spec:
-  meshGateway:
-    mode: local
+Kind: service-defaults
+MeshGateway:
+- Mode: local
+Name: web
 ```
 
 ```json
@@ -162,8 +156,8 @@ spec:
 
 ### Enabling Gateways for a Service Instance
 
-The following [proxy service configuration](/consul/docs/connect/proxies/deploy-service-mesh-proxies)
-enables gateways for the service instance in the `remote` mode.
+The following [Proxy Service Registration](/consul/docs/connect/registration/service-registration)
+definition will enable gateways for the service instance in the `remote` mode.
 
 <CodeTabs heading="Example: Enabling gateways for a service instance.">
 
diff --git a/website/content/docs/connect/gateways/terminating-gateway.mdx b/website/content/docs/connect/gateways/terminating-gateway.mdx
index 86014850eb206..17a926c0cd989 100644
--- a/website/content/docs/connect/gateways/terminating-gateway.mdx
+++ b/website/content/docs/connect/gateways/terminating-gateway.mdx
@@ -20,7 +20,7 @@ For additional use cases and usage patterns, review the tutorial for
 [understanding terminating gateways](/consul/tutorials/developer-mesh/service-mesh-terminating-gateways?utm_source=docs).
 
 ~> **Known limitations:** Terminating gateways currently do not support targeting service subsets with
-[L7 configuration](/consul/docs/connect/manage-traffic). They route to all instances of a service with no capabilities
+[L7 configuration](/consul/docs/connect/l7-traffic). They route to all instances of a service with no capabilities
 for filtering by instance.
 
 ## Security Considerations
diff --git a/website/content/docs/connect/intentions/create-manage-intentions.mdx b/website/content/docs/connect/intentions/create-manage-intentions.mdx
index 46ec146824fbf..a862f4cdf6af9 100644
--- a/website/content/docs/connect/intentions/create-manage-intentions.mdx
+++ b/website/content/docs/connect/intentions/create-manage-intentions.mdx
@@ -7,22 +7,22 @@ description: >-
 
 # Create and manage intentions
 
-This topic describes how to create and manage service intentions, which are configurations for controlling access between services in the service mesh.
+This topic describes how to create and manage service intentions, which are configurations for controlling access between services in the service mesh. 
 
 ## Overview
 
-You can create single intentions or create them in batches using the Consul API, CLI, or UI. You can also define a service intention configuration entry that sets default intentions for all services in the mesh. Refer to [Service intentions overview](/consul/docs/connect/intentions/) for additional background information about intentions.
+You can create single intentions or create them in batches using the Consul API, CLI, or UI. You can also define a service intention configuration entry that sets default intentions for all services in the mesh. Refer to [Service intentions overview](/consul/docs/connnect/intentions/intentions) for additional background information about intentions.
 
 ## Requirements
 
-- At least two services must be registered in the datacenter.
+- At least two services must be registered in the datacenter. 
 - TLS must be enabled to enforce L4 intentions. Refer to [Encryption](/consul/docs/security/encryption) for additional information.
 
 ### ACL requirements
 
-Consul grants permissions for creating and managing intentions based on the destination, not the source. When ACLs are enabled, services and operators must present a token linked to a policy that grants read and write permissions to the destination service.
+Consul grants permissions for creating and managing intentions based on the destination, not the source. When ACLs are enabled, services and operators must present a token linked to a policy that grants read and write permissions to the destination service. 
 
-Consul implicitly grants `intentions:read` permissions to destination services when they are configured with `service:read` or `service:write` permissions. This is so that the services can allow or deny inbound connections when they attempt to join the service mesh. Refer to [Service rules](/consul/docs/security/acl/acl-rules#service-rules) for additional information about configuring ACLs for intentions.
+Consul implicitly grants `intentions:read` permissions to destination services when they are configured with `service:read` or `service:write` permissions. This is so that the services can allow or deny inbound connections when they attempt to join the service mesh. Refer to [Service rules](/consul/docs/security/acl/acl-rules#service-rules) for additional information about configuring ALCs for intentions. 
 
 The default ACL policy configuration determines the default behavior for intentions. If the policy is set to `deny`, then all connections or requests are denied and you must enable them explicitly. Refer to [`default_policy`](/consul/docs/agent/config/config-files#acl_default_policy) for details.
 
@@ -38,19 +38,19 @@ Send a `PUT` request to the `/connect/intentions/exact` HTTP API endpoint and sp
 - `destination`: Service responding to the request
 - `ns`: Namespace of the destination service <EnterpriseAlert inline/>
 
-For L4 intentions, you must also specify the intention action in the request payload.
+For L4 intentions, you must also specify the intention action in the request payload. 
 
-The following example creates an intention that allows `web` to send request to `db`:
+The following example creates an intention that allows `web` to send request to `db`: 
 
 ```shell-session
-$ curl --request PUT \
+$ curl --request PUT \ 
 --data ' { "Action": "allow" } ' \
-http://localhost:8500/v1/connect/intentions/exact\?source\=web\&destination\=db
+http://localhost:8500/v1/connect/intentions/exact\?source\=web\&destination\=db 
 ```
 
 Refer to the `/connect/intentions/exact` [HTTP API endpoint documentation](/consul/api-docs/connect/intentions) for additional information request payload parameters.
 
-For L7 intentions, specify the `Permissions` in the request payload to configure attributes for dynamically enforcing intentions. In the following example payload, Consul allows HTTP GET requests if the request body is empty:
+For L7 intentions, specify the `Permissions` in the request payload to configure attributes for dynamically enforcing intentions. In the following example payload, Consul allows HTTP GET requests if the request body is empty:   
 
 <CodeBlockConfig filename="payload.json">
 
@@ -76,18 +76,18 @@ For L7 intentions, specify the `Permissions` in the request payload to configure
 
 </CodeBlockConfig>
 
-The `Permissions` object specifies a list of permissions for L7 traffic sources. The list contains one or more actions and a set of match criteria for each action. Refer to the [`Sources[].Permissions[]` parameter](/consul/docs/connect/config-entries/service-intentions#sources-permissions) in the service intentions configuration entry reference for configuration details.
+The `Permissions` object specifies a list of permissions for L7 traffic sources. The list contains one or more actions and a set of match criteria for each action. Refer to the [`Sources[].Permissions[]` parameter](/consul/connect/config-entries/service-intentions#source-permissions) in the service intentions configuration entry reference for configuration details.   
 
 To apply the intention, call the endpoint and pass the configuration file containing the attributes to the endpoint:
 
 ```shell-session
-$ curl --request PUT \
+$ curl --request PUT \ 
 --data @payload.json \
-http://localhost:8500/v1/connect/intentions/exact\?source\=svc1\&destination\=sv2
+http://localhost:8500/v1/connect/intentions/exact\?source\=svc1\&destination\=sv2 
 ```
 ### CLI
 
-Use the `consul intention create` command according to the following syntax to create a new intention:
+Use the `consul intention create` command according to the following syntax to create a new intention: 
 
 ```shell-session
 $ consul intention create -<action> <source> <destination>
@@ -99,7 +99,7 @@ The following example creates an intention that allows `web` service instances t
 $ consul intention create -allow web db
 ```
 
-You can use the asterisk (`*`) wildcard to specify multiple destination services. Refer to [Precedence and match order](/consul/docs/connect/intentions/create-manage-intentions#precedence-and-match-order) for additional information.
+You can use the asterisk (`*`) wildcard to specify multiple destination services. Refer to [Precedence and match order](/consul/docs/connect/intentions/create-manage-intentions#precedence-and-match-order) for additional information.  
 
 ### Consul UI
 
@@ -111,7 +111,7 @@ You can use the asterisk (`*`) wildcard to specify multiple destination services
     1. **Allow**: Allows the source service to send requests to the destination.
     1. **Deny**: Prevents the source service from sending requests to the destination.
     1. **Application Aware**: Enables you to specify L7 criteria for dynamically enforcing intentions. Refer to [Configure application aware settings](#configure-application-aware-settings) for additional information.
-1. Click **Save**.
+1. Click **Save**. 
 
 Repeat the procedure as necessary to create additional intentions.
 
@@ -128,7 +128,7 @@ Repeat the procedure as necessary to create additional permissions.
 
 ## Create multiple intentions
 
-You can create a service intentions configuration entry to specify default intentions for your service mesh. You can specify default settings for L4 or L7 application-aware traffic.
+You can create a service intentions configuration entry to specify default intentions for your service mesh. You can specify default settings for L4 or L7 application-aware traffic. 
 
 ### Define a service intention configuration entry
 
@@ -136,7 +136,7 @@ Configure the following fields:
 
 <Tabs>
 
-<Tab heading="HCL" group="hcl">
+<Tab heading="HCL" group="hcl"> 
 
 - [`Kind`](/consul/docs/connect/config-entries/service-intentions#kind): Declares the type of configuration entry. Must be set to `service-intentions`.
 - [`Name`](/consul/docs/connect/config-entries/service-intentions#kind): Specifies the name of the destination service for intentions defined in the configuration entry. You can use a wildcard character (*) to set L4 intentions for all services that are not protected by specific intentions. Wildcards are not supported for L7 intentions.
@@ -147,7 +147,7 @@ Configure the following fields:
 
 <Tab heading="YAML" group="yaml">
 
-- [`apiVersion`](/consul/docs/connect/config-entries/service-intentions#apiversion): Specifies the Consul API version. Must be set to `consul.hashicorp.com/v1alpha1`.
+- [`apiVersion`](/consul/docs/connect/config-entries/service-intentions#apiversion): Specifies the Consul API version. Must be set to `consul.hashicorp.com/v1alpha1`. 
 - [`kind`](/consul/docs/connect/config-entries/service-intentions#kind): Declares the type of configuration entry. Must be set to `ServiceIntentions`.
 - [`spec.destination.name`](/consul/docs/connect/config-entries/service-intentions#spec-destination-name): Specifies the name of the destination service for intentions defined in the configuration entry. You can use a wildcard character (*) to set L4 intentions for all services that are not protected by specific intentions. Wildcards are not supported for L7 intentions.
 - [`spec.sources`](/consul/docs/connect/config-entries/service-intentions#spec-sources): Specifies an unordered list of all intention sources and the authorizations granted to those sources. Consul stores and evaluates the list in reverse order sorted by intention precedence.
@@ -159,20 +159,20 @@ Configure the following fields:
 
 Refer to the [service intentions configuration entry](/consul/docs/connect/config-entries/service-intentions) reference documentation for details about all configuration options.
 
-Refer to the [example service intentions configurations](/consul/docs/connect/config-entries/service-intentions#examples) for additional guidance.
+Refer to the [example service intentions configurations](/consul/docs/connect/config-entries/service-intentions#examples) for additional guidance.  
 
 #### Interaction with other configuration entries
 
 L7 intentions defined in a configuration entry are restricted to destination services
 configured with an HTTP-based protocol as defined in a corresponding
-[service defaults configuration entry](/consul/docs/connect/config-entries/service-defaults)
+[service defaults configuration entry](/consul/docs/connect/config-entries/service-defaults) 
 or globally in a [proxy defaults configuration entry](/consul/docs/connect/config-entries/proxy-defaults).
 
 ### Apply the service intentions configuration entry
 
-You can apply the configuration entry using the [`consul config` command](/consul/commands/config) or by calling the [`/config` API endpoint](/consul/api-docs/config). In Kubernetes environments, apply the `ServiceIntentions` custom resource definitions (CRD) to implement and manage Consul configuration entries.
+You can apply the configuration entry using the [`consul config` command](/consul/commands/config) or by calling the [`/config` API endpoint](/consul/api-docs/config). In Kubernetes environments, apply the `ServiceIntentions` custom resource definitions (CRD) to implement and manage Consul configuration entries.  
 
-Refer to the following topics for details about applying configuration entries:
+Refer to the following topics for details about applying configuration entries: 
 
-- [How to Use Configuration Entries](/consul/docs/agent/config-entries)
-- [Custom Resource Definitions for Consul on Kubernetes](/consul/docs/k8s/crds)
+- [How to Use Configuration Entries](/consul/docs/agent/config-entries) 
+- [Custom Resource Definitions for Consul on Kubernetes](/consul/docs/k8s/crds)
\ No newline at end of file
diff --git a/website/content/docs/connect/intentions/index.mdx b/website/content/docs/connect/intentions/index.mdx
index c9bbbabf2acc0..9cb0f36ee1b3a 100644
--- a/website/content/docs/connect/intentions/index.mdx
+++ b/website/content/docs/connect/intentions/index.mdx
@@ -78,7 +78,7 @@ The following table shows match precedence in descending order:
 Consul prints the precedence value to the service intentions configuration entry after it processes the matching criteria. The value is read-only. Refer to 
 [`Precedence`](/consul/docs/connect/config-entries/service-intentions#precedence) for additional information. 
 
-Namespaces are an Enterprise feature. In Consul CE, the only allowable value for either namespace field is `"default"`. Other rows in the table are not applicable.
+Namespaces are an Enterprise feature. In Consul OSS, the only allowable value for either namespace field is `"default"`. Other rows in the table are not applicable.
 
 The [intention match API](/consul/api-docs/connect/intentions#list-matching-intentions)
 should be periodically called to retrieve all relevant intentions for the
@@ -88,4 +88,4 @@ determine if it should be accepted or rejected.
 
 The default intention behavior is defined by the [`default_policy`](/consul/docs/agent/config/config-files#acl_default_policy) configuration.
 If the configuration is set `allow`, then all service-to-service connections in the mesh will be allowed by default.
-If is set to `deny`, then all connections or requests will be denied by default.
+If is set to `deny`, then all connections or requests will be denied by default.
\ No newline at end of file
diff --git a/website/content/docs/connect/intentions/jwt-authorization.mdx b/website/content/docs/connect/intentions/jwt-authorization.mdx
deleted file mode 100644
index 1c1c0f994e892..0000000000000
--- a/website/content/docs/connect/intentions/jwt-authorization.mdx
+++ /dev/null
@@ -1,105 +0,0 @@
----
-page_title: JWT authorization overview
-description: |-
-  Consul can use service mesh proxies to check and validate JSON Web Tokens (JWT) to enable additional identify-based access security for both human and machine users. Learn how to configure a JWT provider configuration entry and a service intentions configuration entry to authorize requests.
----
-
-# Use JWT authorization with service intentions
-
-JSON Web Tokens (JWT) are a method for identity-based access to services for both humans and machines. The [JWT provider configuration entry](/consul/docs/connect/config-entries/jwt-provider) enables you to define JWTs as part of a JSON Web Key Set (JWKS), which contains the information necessary for Consul to validate access and configure behavior for requests that include JWTs.
-
-By specifying a JSON Web Key Set (JWKS) in the configuration entry and referencing the key set in a service intention, Consul can enforce service intentions based on the presence of a JWT. This security configuration is not related to the [JSON Web Token Auth Method](/consul/docs/security/acl/auth-methods/jwt), which associates JWTs with the Consul ACLs instead of service intentions.
-
-## Workflow
-
-The process to configure your network to enforce service intentions based on JSON web tokens consists of the following steps:
-
-1. **Create a JWT provider configuration entry**. This configuration entry defines rules and behaviors for verifying tokens. These configurations apply to admin partitions in Consul Enterprise, which is functionally equivalent to a datacenter in Consul CE. Then, write the `jwt-provider` configuration entry to Consul. The ACL policy requirement to read and modify this configuration entry is `mesh:write`.
-
-1. **Create or update a service intentions configuration entry to reference the JWT provider**. This configuration invokes the name of the `jwt-provider` configuration entry you created, which causes the Envoy proxy to verify the token and the permissions it authorizes before the incoming request is accepted. Then, write the `service-intentions` configuration entry that references the JWT to Consul. The ACL policy requirement to read and modify this configuration entry is `mesh:write`.
-
-### Wildcards and intention defaults
-
-Because intentions without tokens are authorized when they arrive at the destination proxy, a [common pattern for the service-intentions configuration entry](/consul/docs/connect/config-entries/service-intentions#l4-intentions-for-all-destinations) sets the entry’s `Name` field as a wildcard, `*`. This pattern enables you to apply incoming requests from specific services to every service in the datacenter.
-
-When configuring your deployment to enforce service intentions with JSON Web Tokens, it is possible for multiple tokens with different permissions to apply to a single service’s incoming request based on attributes such as HTTP path or the request method. Because the `service-intentions` configuration entry applies the intention that most closely matches the request, using the `Name` wildcard with specific JWT authorization configurations can lead to unintended results.
-
-When you set the `JWT{}.Providers` field in a service intentions configuration entry to the wildcard `*`, you can configure default behavior for all services that present a token that matches an existing JWT provider configuration entry. In this configuration, services that have a valid token but do not have a more specific matching intention default to the behavior defined in the wildcard intention.
-
-## Requirements
-
-* **Enable ACLs**. Verify that ACLs are enabled and that the default_policy is set to deny.
-
-## Usage
-
-To configure Envoy proxies in the service mesh to validate JWTs before forwarding requests to servers, complete the following steps:
-
-### Create a JWT provider configuration entry
-
-The `jwt-provider` configuration requires the following fields:
-
-- `Kind`: This field must be set to `"jwt-provider"`
-- `Name`: We recommend naming the configuration file after the JWT provider used in the configuration.
-- `Issuer`: This field must match the token's `iss` claim
-
-You must also specify a JSON Web Key Set in the `JSONWebKeySet` field. You can specify the JWKS as one of the following:
-
-- A local string
-- A path to a local file
-- A remote location specified with a URI
-
-A JWKS can be made available locally or remotely, but not both. In addition, a local JWKS must be specified as either a string or a path to the file containing the token.
-
-You can also specify where the JWT is located, a retry policy, and text to append to the header when forwarding the request after token validation.
-
-The following example configures Consul to fetch a JSON Web Token issued by Okta. Consul fetches the token from the URI and keeps it in its cache for 30 minutes before the token expires. After validation, the token is forwarded to the backend with `user-token` appended to the HTTP header.
-
-```hcl
-Kind = "jwt-provider"
-Name = "okta"
-
-Issuer = "okta"
-
-JSONWebKeySet = {
-    Remote = {
-        URI = "https://<org>.okta.com/oauth2/default/v1/keys"
-        CacheDuration = "30m"
-    }
-}
-
-Forwarding = {
-    HeaderName = "user-token"
-}
-```
-
-Refer to [JWT provider configuration entry](/consul/docs/connect/config-entries/jwt-provider) for more information about the fields you can configure.
-
-To write the configuration entry to Consul, use the [`consul config write` command](/consul/commands/config/write):
-
-```shell-session
-$ consul config write okta-provider.hcl
-```
-
-### Update service intentions
-
-After you create the JWT provider entry, you can update your service intentions so that proxies validate the token before authorizing a request. The following example includes the minimum required configuration to enable JWT authorization with service intentions:
-
-```hcl
-Kind = "service-intentions"
-Name = "web"
-JWT = {
-  Providers = [
-    {
-      Name = "okta"
-    }
-  ]
-}
-```
-
-You can include additional configuration information to require the token to match specific claims. You can also configure the `JWT` field to apply only to requests that come from certain HTTP paths. Refer to [JWT validations with intentions](/consul/docs/connect/config-entries/service-intentions#jwt-validations-with-intentions) for an example configuration.
-
-After you update the service intention, write the configuration to Consul so that it takes effect:
-
-```shell-session
-$ consul config write web-intention.hcl
-```
diff --git a/website/content/docs/connect/intentions/legacy.mdx b/website/content/docs/connect/intentions/legacy.mdx
index 9151b1e8ca621..df9ca5c663651 100644
--- a/website/content/docs/connect/intentions/legacy.mdx
+++ b/website/content/docs/connect/intentions/legacy.mdx
@@ -117,7 +117,7 @@ valid non-wildcard intentions to match.
 The numbers in the table above are not stable. Their ordering will remain
 fixed but the actual number values may change in the future.
 
--> **Consul Enterprise** - Namespaces are an Enterprise feature. In Consul CE, any of the rows in
+-> **Consul Enterprise** - Namespaces are an Enterprise feature. In Consul OSS any of the rows in
 the table with a `*` for either the source namespace or destination namespace are not applicable.
 
 ## Intention Management Permissions
diff --git a/website/content/docs/connect/manage-traffic/discovery-chain.mdx b/website/content/docs/connect/l7-traffic/discovery-chain.mdx
similarity index 95%
rename from website/content/docs/connect/manage-traffic/discovery-chain.mdx
rename to website/content/docs/connect/l7-traffic/discovery-chain.mdx
index b7ee4e975ef84..ae7582509c991 100644
--- a/website/content/docs/connect/manage-traffic/discovery-chain.mdx
+++ b/website/content/docs/connect/l7-traffic/discovery-chain.mdx
@@ -59,10 +59,11 @@ various configuration entries interact in more complex ways. For example:
   [`proxy-defaults`](/consul/docs/connect/config-entries/proxy-defaults) config
   entry. Violations must be rejected as invalid.
 
-- When an [upstream
-  configuration](/consul/docs/connect/proxies/proxy-config-reference#upstream-configuration-reference)
-  `datacenter` parameter is defined, any configuration entry that does not explicitly
-  refer to a desired datacenter uses the value defined in the upstream.
+- If an [upstream
+  configuration](/consul/docs/connect/registration/service-registration#upstream-configuration-reference)
+  [`datacenter`](/consul/docs/connect/registration/service-registration#datacenter)
+  parameter is defined then any configuration entry that does not explicitly
+  refer to a desired datacenter should use that value from the upstream.
 
 ## Compilation
 
@@ -79,9 +80,9 @@ API](/consul/api-docs/discovery-chain).
 - **Datacenter** - The datacenter to use as the basis of compilation.
 - **Overrides** - Discovery-time tweaks to apply when compiling. These should
   be derived from either the
-  [proxy](/consul/docs/connect/proxies/proxy-config-reference#complete-configuration-example)
+  [proxy](/consul/docs/connect/registration/service-registration#complete-configuration-example)
   or
-  [upstream](/consul/docs/connect/proxies/proxy-config-reference#upstream-configuration-reference)
+  [upstream](/consul/docs/connect/registration/service-registration#upstream-configuration-reference)
   configurations if either are set.
 
 ### Compilation Results
diff --git a/website/content/docs/connect/l7-traffic/index.mdx b/website/content/docs/connect/l7-traffic/index.mdx
new file mode 100644
index 0000000000000..9f5fe8da2b5a8
--- /dev/null
+++ b/website/content/docs/connect/l7-traffic/index.mdx
@@ -0,0 +1,126 @@
+---
+layout: docs
+page_title: Service Mesh Traffic Management - Overview
+description: >-
+  Consul can route, split, and resolve Layer 7 traffic in a service mesh to support workflows like canary testing and blue/green deployments. Learn about the three configuration entry kinds that define L7 traffic management behavior in Consul.
+---
+
+-> **1.6.0+:** This feature is available in Consul versions 1.6.0 and newer.
+
+# Service Mesh Traffic Management Overview
+
+Layer 7 traffic management allows operators to divide L7 traffic between
+different
+[subsets](/consul/docs/connect/config-entries/service-resolver#service-subsets) of
+service instances when using service mesh.
+
+There are many ways you may wish to carve up a single datacenter's pool of
+services beyond simply returning all healthy instances for load balancing.
+Canary testing, A/B tests, blue/green deploys, and soft multi-tenancy
+(prod/qa/staging sharing compute resources) all require some mechanism of
+carving out portions of the Consul catalog smaller than the level of a single
+service and configuring when that subset should receive traffic.
+
+-> **Note:** This feature is not compatible with the
+[built-in proxy](/consul/docs/connect/proxies/built-in),
+[native proxies](/consul/docs/connect/native),
+and some [Envoy proxy escape hatches](/consul/docs/connect/proxies/envoy#escape-hatch-overrides).
+
+## Stages
+
+Service mesh proxy upstreams are discovered using a series of stages: routing,
+splitting, and resolution. These stages represent different ways of managing L7
+traffic.
+
+![screenshot of L7 traffic visualization in the UI](/img/l7-routing/full.png)
+
+Each stage of this discovery process can be dynamically reconfigured via various
+[configuration entries](/consul/docs/agent/config-entries). When a configuration
+entry is missing, that stage will fall back on reasonable default behavior.
+
+### Routing
+
+A [`service-router`](/consul/docs/connect/config-entries/service-router) config
+entry kind is the first configurable stage.
+
+![screenshot of service router in the UI](/img/l7-routing/Router.png)
+
+A router config entry allows for a user to intercept traffic using L7 criteria
+such as path prefixes or http headers, and change behavior such as by sending
+traffic to a different service or service subset.
+
+These config entries may only reference `service-splitter` or
+`service-resolver` entries.
+
+[Examples](/consul/docs/connect/config-entries/service-router#sample-config-entries)
+can be found in the `service-router` documentation.
+
+### Splitting
+
+A [`service-splitter`](/consul/docs/connect/config-entries/service-splitter) config
+entry kind is the next stage after routing.
+
+![screenshot of service splitter in the UI](/img/l7-routing/Splitter.png)
+
+A splitter config entry allows for a user to choose to split incoming requests
+across different subsets of a single service (like during staged canary
+rollouts), or perhaps across different services (like during a v2 rewrite or
+other type of codebase migration).
+
+These config entries may only reference `service-splitter` or
+`service-resolver` entries.
+
+If one splitter references another splitter the overall effects are flattened
+into one effective splitter config entry which reflects the multiplicative
+union. For instance:
+
+    splitter[A]:           A_v1=50%, A_v2=50%
+    splitter[B]:           A=50%,    B=50%
+    ---------------------
+    splitter[effective_B]: A_v1=25%, A_v2=25%, B=50%
+
+[Examples](/consul/docs/connect/config-entries/service-splitter#sample-config-entries)
+can be found in the `service-splitter` documentation.
+
+### Resolution
+
+A [`service-resolver`](/consul/docs/connect/config-entries/service-resolver) config
+entry kind is the last stage.
+
+![screenshot of service resolver in the UI](/img/l7-routing/Resolver.png)
+
+A resolver config entry allows for a user to define which instances of a
+service should satisfy discovery requests for the provided name.
+
+Examples of things you can do with resolver config entries:
+
+- Control where to send traffic if all instances of `api` in the current
+  datacenter are unhealthy.
+
+- Configure service subsets based on `Service.Meta.version` values.
+
+- Send all traffic for `web` that does not specify a service subset to the
+  `version1` subset.
+
+- Send all traffic for `api` to `new-api`.
+
+- Send all traffic for `api` in all datacenters to instances of `api` in `dc2`.
+
+- Create a "virtual service" `api-dc2` that sends traffic to instances of `api`
+  in `dc2`. This can be referenced in upstreams or in other config entries.
+
+If no resolver config is defined for a service it is assumed 100% of traffic
+flows to the healthy instances of a service with the same name in the current
+datacenter/namespace and discovery terminates.
+
+This should feel similar in spirit to various uses of Prepared Queries, but is
+not intended to be a drop-in replacement currently.
+
+These config entries may only reference other `service-resolver` entries.
+
+[Examples](/consul/docs/connect/config-entries/service-resolver#sample-config-entries)
+can be found in the `service-resolver` documentation.
+
+-> **Note:** `service-resolver` config entries kinds can function at L4 (unlike
+`service-router` and `service-splitter` kinds). These can be created for
+services of any protocol such as `tcp`.
\ No newline at end of file
diff --git a/website/content/docs/connect/manage-traffic/failover/index.mdx b/website/content/docs/connect/manage-traffic/failover/index.mdx
deleted file mode 100644
index 8069763045b2b..0000000000000
--- a/website/content/docs/connect/manage-traffic/failover/index.mdx
+++ /dev/null
@@ -1,54 +0,0 @@
----
-layout: docs
-page_title: Failover configuration overview
-description: Learn about failover strategies and service mesh features you can implement to route traffic if services become unhealthy or unreachable, including sameness groups, prepared queries, and service resolvers.
----
-
-# Failover overview
-
-Services in your mesh may become unhealthy or unreachable for many reasons, but you can mitigate some of the effects associated with infrastructure issues by configuring Consul to automatically route traffic to and from failover service instances. This topic provides an overview of the failover strategies you can implement with Consul.
-
-## Service failover strategies in Consul
-
-There are several methods for implementing failover strategies between datacenters in Consul. You can adopt one of the following strategies based on your deployment configuration and network requirements:
-
-- Configure the `Failover` stanza in a service resolver configuration entry to explicitly define which services should failover and the targeting logic they should follow.
-- Make a prepared query for each service that you can use to automate geo-failover.
-- Create a sameness group to identify partitions with identical namespaces and service names to establish default failover targets.
-
-The following table compares these strategies in deployments with multiple datacenters to help you determine the best approach for your service:
-
-| | `Failover` stanza | Prepared<br/> query | Sameness groups | 
-| --- | :---:           | :---:            | :---:             |
-| <nobr>**Supports WAN federation**</nobr> | &#9989;  | &#9989;  | &#10060; |
-| **Supports cluster peering** | &#9989;  | &#10060;  | &#9989; |
-| **Supports locality-aware routing** | &#9989;  | &#10060;  | &#9989; |
-| **Multi-datacenter failover strength** | &#9989;  | &#10060;  | &#9989; |
-| **Multi-datacenter usage scenario** | Enables more granular logic for failover targeting. | Central policies that can automatically target the nearest datacenter. | Group size changes without edits to existing member configurations. |
-| **Multi-datacenter usage scenario** | Configuring failover for a single service or service subset, especially for testing or debugging purposes | WAN-federated deployments where a primary datacenter is configured. Prepared queries are not replicated over peer connections. | Cluster peering deployments with consistently named services and namespaces. |
-
-Although cluster peering connections support the [`Failover` field of the prepared query request schema](/consul/api-docs/query#failover) when using Consul's service discovery features to [perform dynamic DNS queries](/consul/docs/services/discovery/dns-dynamic-lookups), they do not support prepared queries for service mesh failover scenarios.
-
-### Failover configurations for a service mesh with a single datacenter
-
-You can implement a service resolver configuration entry and specify a pool of failover service instances that other services can exchange messages with when the primary service becomes unhealthy or unreachable. We recommend adopting this strategy as a minimum baseline when implementing Consul service mesh and layering additional failover strategies to build resilience into your application network. 
-
-Refer to the [`Failover` configuration ](/consul/docs/connect/config-entries/service-resolver#failover) for examples of how to configure failover services in the service resolver configuration entry on both VMs and Kubernetes deployments.
-
-### Failover configuration for WAN-federated datacenters
-
-If your network has multiple Consul datacenters that are WAN-federated, you can configure your applications to look for failover services with prepared queries. [Prepared queries](/consul/api-docs/) are configurations that enable you to define complex service discovery lookups. This strategy hinges on the secondary datacenter containing service instances that have the same name and residing in the same namespace as their counterparts in the primary datacenter.
-
-Refer to the [Automate geo-failover with prepared queries tutorial](/consul/tutorials/developer-discovery/automate-geo-failover) for additional information.
-
-### Failover configuration for peered clusters and partitions
-
-In networks with multiple datacenters or partitions that share a peer connection, each datacenter or partition functions as an independent unit. As a result, Consul does not correlate services that have the same name, even if they are in the same namespace.
-
-You can configure sameness groups for this type of network. Sameness groups allow you to define a group of admin partitions where identical services are deployed in identical namespaces. After you configure the sameness group, you can reference the `SamenessGroup` parameter in service resolver, exported service, and service intention configuration entries, enabling you to add or remove cluster peers from the group without making changes to every cluster peer every time.
-
-You can configure a sameness group so that it functions as the default for failover behavior. You can also reference sameness groups in a service resolver's `Failover` stanza or in a prepared query. Refer to [Failover with sameness groups](/consul/docs/connect/manage-traffic/failover/sameness) for more information.
-
-## Locality-aware routing
-
-By default, Consul balances traffic to all healthy upstream instances in the cluster, even if the instances are in different network regions and zones. You can configure Consul to route requests to upstreams in the same geographic region, which reduces latency and transfer costs. Refer to [Route traffic to local upstreams](/consul/docs/connect/manage-traffic/route-to-local-upstreams) for additional information.
\ No newline at end of file
diff --git a/website/content/docs/connect/manage-traffic/failover/sameness.mdx b/website/content/docs/connect/manage-traffic/failover/sameness.mdx
deleted file mode 100644
index 98117bd283353..0000000000000
--- a/website/content/docs/connect/manage-traffic/failover/sameness.mdx
+++ /dev/null
@@ -1,205 +0,0 @@
----
-layout: docs
-page_title: Failover with sameness groups
-description: You can configure sameness groups so that when a service instance fails, traffic automatically routes to an identical service instance. Learn how to use sameness groups to create a failover strategy for deployments with multiple datacenters and cluster peering connections.
----
-
-# Failover with sameness groups
-
-This page describes how to use sameness groups to automatically redirect service traffic to healthy instances in failover scenarios. Sameness groups are a user-defined set of Consul admin partitions with identical registered services. These admin paritions typically belong to Consul datacenters in different cloud regions, which enables sameness groups to participate in several service failover configuration strategies.
-
-To create a sameness group and configure each Consul datacenter to allow traffic from other members of the group, refer to [create sameness groups](/consul/docs/connect/cluster-peering/usage/create-sameness-groups).
-
-## Failover strategies
-
-You can edit a sameness group configuration entry so that all services failover to healthy instances on other members of a sameness group by default. You can also reference the sameness group in other configuration entries to enact other failover strategies for your network. 
-
-You can establish a failover strategy by configuring sameness group behavior in the following locations:
-
-- Sameness group configuration entry
-- Service resolver configuration entry
-- Prepared queries
-
-You can also configure service instances to route to upstreams in the same availability region during a failover. Refer to [Route traffic to local upstreams](/consul/docs/connect/manage-traffic/route-to-local-upstreams) for additional information.
-
-### Failover with a sameness group configuration entry
-
-To define failover behavior using a sameness group configuration entry, set `DefaultForFailover=true` and then apply the updated configuration to all clusters that are members of the group.
-
-In the following example configuration entry, datacenter `dc1` has two partitions, `partition-1` and `partition-2`. A second datacenter, `dc2`, has a single partition named `partition-1`. All three partitions have identically configured services and established cluster peering connections. The configuration entry defines a sameness group, `example-sg` in `dc1`. When redirecting traffic during a failover scenario, Consul attempts to find a healthy instance in a specific order: `dc1-partition-1`, then `dc1-partition-2`, then `dc2-partition-1`.
-
-<Tabs>
-
-<Tab heading="HCL" group="hcl">
-
-```hcl
-Kind                     = "sameness-group"  
-Name                     = "example-sg"
-Partition                = "partition-1" 
-DefaultForFailover       = true
-Members                = [
-      {Partition = "partition-1"},
-      {Partition = "partition-2"},
-      {Peer      = "dc2-partition-1"}
-      ]
-```
-
-</Tab>
-
-<Tab heading="JSON" group="json">
-
-```
-{
-    "Kind": "sameness-group", 
-    "Name": "example-sg", 
-    "Partition": "partition-1",
-    "DefaultForFailover": true,
-    "Members": [
-        {
-            "Partition": "partition-1"
-        },
-        {
-            "Partition": "partition-2"
-        },
-        {
-            "Peer": "dc2-partition-1"
-        }
-    ]
-}
-```
-
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: SamenessGroup 
-metadata:
-  name: example-sg
-spec:
-  defaultForFailover: true
-  members:                                   
-    - partition: partition-1
-    - partition: partition-2
-    - peer: dc2-partition-1
-```
-
-</Tab>
-</Tabs>
-
-When a sameness group is configured as the failover default, sameness group fail over takes place when a service resolver configuration entry does not implement more specific failover behavior. When a service resolver is defined for an upstream, it is used instead of the sameness group for default failover behavior.
-
-All services registered in the admin partition must failover to another member of the sameness group. You cannot choose subsets of services to use the sameness group as the failover default. If groups do not have identical services, or if a service is registered to some group members but not all members, this failover strategy may produce errors.
-
-For more information about specifying sameness group members and failover, refer to [sameness group configuration entry reference](/consul/docs/connects/config-entries/sameness-group).
-
-All services registered in the admin partition must fail over to another member of the sameness group. You cannot choose subsets of services to use the sameness group as the failover default. If groups do not have identical services, or if a service is registered to some group members but not all members, this failover strategy may produce errors.
-
-### Failover with a service resolver configuration entry
-
-When the sameness group is not configured as the failover default, you can reference the sameness group in a service resolver configuration entry. This approach enables you to use the sameness group as the failover destination for some services registered to group members.
-
-In the following example configuration, a database service called `db` is filtered into subsets based on a user-defined `version` tag. Services with a `v1` tag belong to the default subset, which uses the `product-group` sameness group for its failover. Instances of `db` with the `v2` tag, meanwhile, fail over to a service named `canary-db`.
-
-<Tabs>
-
-<Tab heading="HCL" group="hcl">
-
-```hcl
-Kind          = "service-resolver"
-Name          = "db"
-DefaultSubset = "v1"
-Subsets = {
-  v1 = {
-    Filter = "Service.Meta.version == v1"
-  }
-  v2 = {
-    Filter = "Service.Meta.version == v2"
-  }
-}
-Failover {
-  v1 = {
-    SamenessGroup = "product-group"
-  }
-  v2 = {
-    Service = "canary-db"
-  }
-}
-```
-
-</Tab>
-
-<Tab heading="JSON" group="json">
-
-```
-{
-  "Kind": "service-resolver", 
-  "Name": "db", 
-  "DefaultSubset": "v1",
-  "Subsets": {
-    "v1": {
-      "Filter": "Service.Meta.version == v1"
-    },
-    "v2": {
-      "Filter": "Service.Meta.version == v2"
-    }
-  },   
-  "Failover": {
-      "v1": {
-            "SamenessGroup": "product-group"
-      },
-      "v2": {
-            "Service": "canary-db"
-      }
-  }
-}
-```
-
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceResolver
-metadata:
-  name: db
-spec:
-  defaultSubset: v1
-  subsets:
-    v1:
-      filter: 'Service.Meta.version == v1'
-    v2:
-      filter: 'Service.Meta.version == v2'
-  failover:
-    v1:
-      samenessGroup: "product-group"
-    v2:
-      service: "canary-db"
-```
-
-</Tab>
-</Tabs>
-
-For more information, including additional examples, refer to [service resolver configuration entry reference](/consul/docs/connect/config-entries/service-resolver).
-
-### Failover with a prepared query
-
-You can specify a sameness group in a prepared query to return service instances from the first member that has healthy instances. When a member does not have healthy instances, Consul queries group members in the order defined in the list of members in the sameness group configuration entry.
-
-The following example demonstrates a prepared query that can be referenced with the name `query-1`. It queries members of the sameness group for healthy instances of `db` that are registered to the `store-ns` namespace on partitions named `partition-1`.
-
-```json
-{
-  "Name": "query-1",
-  "Service": {
-    "Service": "db",
-    "SamenessGroup": "product-group",
-    "Partition": "partition-1",
-    "Namespace": "store-ns"
-  }
-}
-```
-
-In prepared queries, the sameness group is mutually exclusive with the [`Failover`](/consul/api-docs/query#failover) field because the sameness group includes failover targets based on the sameness group’s members. For more information about using prepared queries, refer to [Enable dynamic DNS queries](/consul/docs/services/discovery/dns-dynamic-lookups).
\ No newline at end of file
diff --git a/website/content/docs/connect/manage-traffic/index.mdx b/website/content/docs/connect/manage-traffic/index.mdx
deleted file mode 100644
index be615dd6de5e7..0000000000000
--- a/website/content/docs/connect/manage-traffic/index.mdx
+++ /dev/null
@@ -1,84 +0,0 @@
----
-layout: docs
-page_title: Service mesh traffic management overview
-description: >-
-  Consul can route, split, and resolve Layer 7 traffic in a service mesh to support workflows like canary testing and blue/green deployments. Learn about the three configuration entry kinds that define L7 traffic management behavior in Consul.
----
-
-# Service mesh traffic management overview
-
-This topic provides overview information about the application layer traffic management capabilities available in Consul service mesh. These capabilities are also referred to as *Layer 7* or *L7 traffic management*.
-
-## Introduction
-
-Consul service mesh allows you to divide application layer traffic between different subsets of service instances. You can leverage L7 traffic management capabilities to perform complex processes, such as configuring backup services for failover scenarios, canary and A-B testing, blue-green deployments, and soft multi-tenancy in which production, QA, and staging environments share compute resources. L7 traffic management with Consul service mesh allows you to designate groups of service instances in the Consul catalog smaller than all instances of single service and configure when that subset should receive traffic.
-
-You cannot manage L7 traffic with the [built-in proxy](/consul/docs/connect/proxies/built-in),
-[native proxies](/consul/docs/connect/native), or some [Envoy proxy escape hatches](/consul/docs/connect/proxies/envoy#escape-hatch-overrides).
-
-## Discovery chain
-
-Consul uses a series of stages to discover service mesh proxy upstreams. Each stage represents different ways of managing L7 traffic. They are referred to as the _discovery chain_: 
-
-- routing 
-- splitting 
-- resolution 
-
-For information about integrating service mesh proxy upstream discovery using the discovery chain, refer to [Discovery Chain for Service Mesh Traffic Management](/consul/docs/connect/manage-traffic/discovery-chain).
-
-The Consul UI shows discovery chain stages in the **Routing** tab of the **Services** page:
-
-![screenshot of L7 traffic visualization in the UI](/img/l7-routing/full.png)
-
-You can define how Consul manages each stage of the discovery chain in a Consul _configuration entry_. [Configuration entries](/consul/docs/connect/config-entries) modify the default behavior of the Consul service mesh.   
-
-When managing L7 traffic with cluster peering, there are additional configuration requirements to resolve peers in the discovery chain. Refer to [Cluster peering L7 traffic management](/consul/docs/connect/cluster-peering/usage/peering-traffic-management) for more information.
-
-### Routing
-
-The first stage of the discovery chain is the service router. Routers intercept traffic according to a set of L7 attributes, such as path prefixes and HTTP headers, and route the traffic to a different service or service subset.
-
-Apply a [service router configuration entry](/consul/docs/connect/config-entries/service-router) to implement a router. Service router configuration entries can only reference service splitter or service resolver configuration entries.
-
-![screenshot of service router in the UI](/img/l7-routing/Router.png)
-
-### Splitting
-
-The second stage of the discovery chain is the service splitter. Service splitters split incoming requests and route them to different services or service subsets. Splitters enable staged canary rollouts, versioned releases, and similar use cases.  
-
-Apply a [service splitter configuration entry](/consul/docs/connect/config-entries/service-splitter) to implement a splitter. Service splitters configuration entries can only reference other service splitters or service resolver configuration entries.
-
-![screenshot of service splitter in the UI](/img/l7-routing/Splitter.png)
-
-If multiple service splitters are chained, Consul flattens the splits so that they behave as a single service spitter. In the following equation, `splitter[A]` references `splitter[B]`:
-
-```text
-splitter[A]:           A_v1=50%, A_v2=50%
-splitter[B]:           A=50%,    B=50%
----------------------
-splitter[effective_B]: A_v1=25%, A_v2=25%, B=50%
-```
-
-
-### Resolution
-
-The third stage of the discovery chain is the service resolver. Service resolvers specify which instances of a service satisfy discovery requests for the provided service name. Service resolvers enable several use cases, including: 
-
-- Designate failovers when service instances become unhealthy or unreachable. 
-- Configure service subsets based on DNS values.
-- Route traffic to the latest version of a service.
-- Route traffic to specific Consul datacenters.
-- Create virtual services that route traffic to instances of the actual service in specific Consul datacenters.
-
-Apply a [service resolver configuration entry](/consul/docs/connect/config-entries/service-resolver) to implement a resolver. Service resolver configuration entries can only reference other service resolvers.
-
-
-![screenshot of service resolver in the UI](/img/l7-routing/Resolver.png)
-
-If no resolver is configured for a service, Consul sends all traffic to healthy instances of the service that have the same name in the current datacenter or specified namespace and ends the discovery chain. 
-
-Service resolver configuration entries can also process network layer, also called level 4 (L4), traffic. As a result, you can implement service resolvers for services that communicate over `tcp` and other non-HTTP protocols.
-
-## Locality-aware routing
-
-By default, Consul balances traffic to all healthy upstream instances in the cluster, even if the instances are in different availability zones. You can configure Consul to route requests to upstreams in the same network zone, which reduces latency and transfer costs. Refer to [Route traffic to local upstreams](/consul/docs/connect/manage-traffic/route-to-local-upstreams) for additional information.
diff --git a/website/content/docs/connect/manage-traffic/limit-request-rates.mdx b/website/content/docs/connect/manage-traffic/limit-request-rates.mdx
deleted file mode 100644
index d9324dbaa98ce..0000000000000
--- a/website/content/docs/connect/manage-traffic/limit-request-rates.mdx
+++ /dev/null
@@ -1,76 +0,0 @@
----
-layout: docs
-page_title: Limit request rates to services in the mesh
-description: Learn how to limit the rate of requests to services in a Consul service mesh. Rate limits on requests improves network resilience and availability
----
-
-# Limit request rates to services in the mesh
-
-This topic describes how to configure Consul to limit the request rate to services in the mesh.
-
-## Introduction
-
-Consul allows you to configure settings to limit the rate of HTTP requests a service receives from sources in the mesh. Limiting request rates is one strategy for building a resilient and highly-available network.
-
-Consul applies rate limits per service instance. As an example, if you specify a rate limit of 100 requests per second (RPS) for a service and five instances of the service are available, the service accepts a total of 500 RPS, which equals 100 RPS per instance.
-
-You can limit request rates for all traffic to a service, as well as set rate limits for specific URL paths on a service. When multiple rate limits are configured on a service, Consul applies the limit configured for the first matching path. As a result, the maximum RPS for a service is equal to the number of service instances deployed for a service multiplied by either the rate limit configured for that service or the rate limit for the path. 
-
-## Requirements
-
-Consul v1.17.0 or later
-
-## Limit request rates to a service on all paths
-
-Specify request rate limits in the service defaults configuration entry. Create or edit the existing service defaults configuration entry for your service and specify the following fields:
-
-<Tabs>
-<Tab heading="VMs" group="vms">
-
-1. `RateLimits.InstanceLevel.RequestPerSecond`: Set an average number of requests per second that Consul should allow to the service. The number of requests may momentarily exceed this value up to the value specified in the `RequestsMaxBurst` parameter, but Consul temporarily lowers the speed of the transactions.
-1. `RateLimits.InstanceLevel.RequestsMaxBurst`: Set the maximum number of concurrent requests that Consul momentarily allows to the service. Consul blocks any additional requests over this limit. 
-
-</Tab>
-<Tab heading="Kubernetes" group="k8s">
-
-1. `spec.rateLimits.instanceLevel.requestPerSecond`: Set an average number of requests per second that Consul should allow to the service. The number of requests may momentarily exceed this value up to the value specified in the `requestsMaxBurst` parameter, but Consul temporarily lowers the speed of the transactions.
-1. `spec.rateLimits.instanceLevel.requestsMaxBurst`: Set the maximum number of concurrent requests that Consul momentarily allows to the service. Consul blocks any additional requests over this limit.
-
-</Tab>
-</Tabs>
-
-Refer to the [service defaults configuration entry reference](/consul/docs/connect/config-entries/service-defaults) for additional specifications and example configurations.  
-
-## Specify request rate limits for specific paths
-
-Specify request rate limits in the service defaults configuration entry. Create or edit the existing service defaults configuration entry for your service and configure the following parameters:
-
-<Tabs>
-<Tab heading="VMs" group="vms">
-
-1. Add a `RateLimits.InstanceLevel.Routes` block to the configuration entry. The block contains the limits and matching criteria for determining which paths to set limits on. 
-1. In the `Routes` block, configure one of the following match criteria to determine which path to set the limits on:
-   - `PathExact`: Specifies the exact path to match on the request path.
-   - `PathPrefix`: Specifies the path prefix to match on the request path.
-   - `PathRegex`: Specifies a regular expression to match on the request path.
-1. Configure the limits you want to enforce in the `Routes` block as well. You can configure the following parameters:
-   - `RequestsPerSecond`: Set an average number of requests per second that Consul should allow to the service through the matching path. The number of requests may momentarily exceed this value up to the value specified in the `RequestsMaxBurst` parameter, but Consul temporarily lowers the speed of the transactions. This configuration overrides the value specified in `RateLimits.InstanceLevel.RequestPerSecond` field of the configuration entry.
-   - `RequestsMaxBurst`: Set the maximum number of concurrent requests that Consul momentarily allows to the service through the matching path. Consul blocks any additional requests over this limit. This configuration overrides the value specified in `RateLimits.InstanceLevel.RequestsMaxBurst` field of the configuration entry.
-
-</Tab>
-<Tab heading="Kubernetes" group="k8s">
-
-1. Add a `spec.rateLimits.instanceLevel.routes` block to the configuration entry. The block contains the limits and matching criteria for determining which paths to set limits on. 
-1. In the `routes` block, configure one of the following match criteria for enabling Consul to determine which path to set the limits on: 
-   - `pathExact`: Specifies the exact path to match on the request path. When using this field.
-   - `pathPrefix`: Specifies the path prefix to match on the request path.
-   - `pathRegex`: Specifies a regular expression to match on the request path.
-1. Configure the limits you want to enforce in the `routes` block as well. You can configure the following parameters:
-   - `requestsPerSecond`: Set an average number of requests per second that Consul should allow to the service through the matching path. The number of requests may momentarily exceed this value up to the value specified in the `requestsMaxBurst` parameter, but Consul temporarily lowers the speed of the transactions. This configuration overrides the value specified in `spec.rateLimits.instanceLevel.requestPerSecond` field of the CRD.
-   - `requestsMaxBurst`: Set the maximum number of concurrent requests that Consul momentarily allows to the service through the matching path. Consul blocks any additional requests over this limit. This configuration overrides the value specified in `spec.rateLimits.instanceLevel.requestsMaxBurst` field of the CRD.
-
-</Tab>
-</Tabs>
-
-Refer to the [service defaults configuration entry reference](/consul/docs/connect/config-entries/service-defaults) for additional specifications and example configurations.
-
diff --git a/website/content/docs/connect/manage-traffic/route-to-local-upstreams.mdx b/website/content/docs/connect/manage-traffic/route-to-local-upstreams.mdx
deleted file mode 100644
index afe68369de220..0000000000000
--- a/website/content/docs/connect/manage-traffic/route-to-local-upstreams.mdx
+++ /dev/null
@@ -1,113 +0,0 @@
----
-layout: docs
-page_title: Route traffic to local upstreams
-description: Learn how to configure Consul to route traffic to upstreams in the same region and zone as the downstream service. Routing traffic based on locality can reduce latency and cost.
----
-
-# Route traffic to local upstreams
-
-This topic describes how to configure Consul to prioritize upstream services that are in the same region and zone as the downstream service. You should only follow these instructions when every service within a zone has at least enough capacity to handle requests from downstream services within the same zone. 
-
-<EnterpriseAlert> This feature is available in Consul Enterprise. </EnterpriseAlert>
-
-## Introduction
-
-By default, Consul balances traffic to all healthy upstream instances in the cluster, even if the instances are in different network zones. You can specify the cloud service provider (CSP) locale for Consul server agents and services registered to the service mesh, which enables several benefits:
-
-- Consul prioritizes the nearest upstream when routing traffic through the mesh. 
-- When a service instance in the same partition becomes unhealthy, Consul prioritizes failing over to upstream services that are in the same region as the downstream service. Refer to [Failover](/consul/docs/connect/traffic-management/failover) for additional information about failover strategies in Consul.
-
-When properly implemented, routing traffic to local upstreams can reduce latency and transfer costs associated with sending requests to other regions. 
-
-### Workflow
-
-For networks deployed to virtual machines, complete the following steps to route traffic to local upstream services:
-
-1. Specify the region and zone for your Consul client agents. 
-1. It is not required, but you can specify the region and zone for your services. Skip this step to allow services to inherit the region and zone configured for the Consul client that the services are registered with. 
-1. Enable service mesh proxies to route traffic locally within the partition.
-1. Start service mesh proxies.
-
-For Kubernetes-orchestrated networks, Consul automatically populates geographic information about service instances using the `topology.kubernetes.io/region` and `topology.kubernetes.io/zone` annotations from the Kubernetes nodes. As a result, you do not need to specify the regions and zones unless you are implementing a custom Kuberenetes deployment.
-
-## Specify the locality of your Consul agents
-
-The `locality` configuration on a Consul client applies to all services registered to the client.
-
-1. Configure the `locality` block in your Consul client agent configuration files. The `locality` block is a map containing the `region` and `zone` parameters. 
-
-   The parameters should match the values for regions and zones defined in your network. Refer to [`locality`](/consul/docs/agent/config/config-files#locality) in the agent configuration reference for additional information.
-
-1. Start or restart the agent to apply the configuration. Refer to [Starting a Consul agent](/consul/docs/agent#starting-the-consul-agent) for instructions.
-
-In the following example, the agent is running in the `us-west-1` region and `us-west-1a` zone on AWS:
-
-```hcl
-locality = {
-  region = "us-west-1"
-  zone = "us-west-1a"
-}
-```
-
-## Specify the localities of your service instances
-
-You may only need to configure service localities in service mesh deployments that use [Consul dataplane](/consul/docs/connect/dataplane). This step is optional for networks deployed to virtual machines, which you should allow services to inherit the localities of the Consul agent that they are registered with.  
-
-1. Configure the `locality` block in your service definition. The `locality` block is a map containing the `region` and `zone` parameters. When you start a proxy for the service, Consul passes the locale to the proxy so that it can route traffic accordingly. 
-
-   The parameters should match the values for regions and zones defined in your network. Refer to [`locality`](/consul/docs/services/configuration/services-configuration-reference#locality) in the services configuration reference for additional information.
-
-1. Verify that your service is also configured with a proxy. Refer to [Define service mesh proxy](/consul/docs/connect/proxies/deploy-sidecar-services#define-service-mesh-proxy) for additional information.
-Register or re-register the service to apply the configuration. Refer to [Register services and health checks](/consul/docs/services/usage/register-services-checks) for instructions.
-
-In the following example, the `web` service is available in the `us-west-1` region and `us-west-1a` zone on AWS:
-
-```hcl 
-service {
-  id  = "web"
-  locality = {
-    region = "us-west-1"
-    zone = "us-west-1a"
-  }
-}
-```
-
-## Enable service mesh proxies to route traffic locally
-
-You can configure the default routing behavior for all proxies in the mesh as well as configure the routing behavior for specific services.
-
-### Configure default routing behavior
-
-1. Configure the `PrioritizeByLocality` block in the proxy defaults configuration entry and specify the `failover` mode. This configuration enables proxies in the mesh to use the region and zone defined in the service configuration to route traffic. Refer to [`PrioritizeByLocality`](/consul/docs/connect/config-entries/proxy-defaults#prioritizebylocality) in the proxy defaults reference for details about the configuration.
-1. Apply the configuration by either calling the [`/config` HTTP API endpoint](/consul/api-docs/config) or running the [`consul config write` CLI command](/consul/commands/config/write). 
-
-   The following example writes a proxy defaults configuration entry from a local HCL file using the CLI:
-
-   ```shell-session
-   $ consul config write proxy-defaults.hcl
-   ```
-### Configure routing behavior for individual service
-
-1. Create a service resolver configuration entry and specify the following fields:
-   - `Name`: Specify the name of the service that the routing behavior defined in the configuration entry applies to.
-   - `PrioritizeByLocality`: This block enables proxies in the mesh to use the region and zone defined in the service configuration to route traffic. Set the `mode` inside the block to - `failover`. Refer to [`PrioritizeByLocality`](/consul/docs/connect/config-entries/service-resolver#prioritzebylocality) in the service resolver reference for details about the configuration. 
-1. Apply the configuration by either calling the [`/config` HTTP API endpoint](/consul/api-docs/config) or running the [`consul config write` CLI command](/consul/commands/config/write). 
-   The following example writes a proxy defaults configuration entry from a local HCL file using the CLI:
-
-   ```shell-session
-   $ consul config write web-resolver.hcl
-   ```
-
-## Start the proxies in your datacenter
-
-Envoy requires a bootstrap configuration file before it can start. Use the [`consul connect envoy` command](/consul/commands/connect/envoy) to create the Envoy bootstrap configuration and start the sidecar proxy service. Specify the ID of the sidecar proxy you want to start with the `-sidecar-for` option.  
-
-The following example command starts an Envoy proxy for the `web` proxy service:
-
-```shell-session
-$ consul connect envoy -sidecar-for=web
-```
-
-For details about operating an Envoy proxy in Consul, refer to the [Envoy proxy reference](/consul/docs/connect/proxies/envoy). 
-
-Use the `/agent/service/register` API endpoint to register sidecars independently from their application services. You must include the `locality` configuration in the payload. Refer to [Register Service](/consul/api-docs/agent/service#register-service) in the API documentation for additional information.
diff --git a/website/content/docs/connect/native/go.mdx b/website/content/docs/connect/native/go.mdx
index e3068058fd1eb..df9080f17f74d 100644
--- a/website/content/docs/connect/native/go.mdx
+++ b/website/content/docs/connect/native/go.mdx
@@ -7,13 +7,6 @@ description: >-
 
 # Service Mesh Native Integration for Go Applications
 
-<Note>
-
-The Connect Native golang SDK is currently deprecated and will be removed in a future Consul release.
-The SDK will be removed when the long term replacement to native application integration (such as a proxyless gRPC service mesh integration) is delivered. Refer to [GH-10339](https://github.com/hashicorp/consul/issues/10339) for additional information and to track progress toward one potential solution that is tracked as replacement functionality.
-
-</Note>
-
 We provide a library that makes it drop-in simple to integrate Consul service mesh
 with most [Go](https://golang.org/) applications. This page shows examples
 of integrating this library for accepting or establishing mesh-based
diff --git a/website/content/docs/connect/native/index.mdx b/website/content/docs/connect/native/index.mdx
index 3cf64f346c2e6..e8cc421af8ac4 100644
--- a/website/content/docs/connect/native/index.mdx
+++ b/website/content/docs/connect/native/index.mdx
@@ -7,17 +7,10 @@ description: >-
 
 # Service Mesh Native App Integration Overview
 
-<Note>
-
-The Connect Native Golang SDK and `v1/agent/connect/authorize`, `v1/agent/connect/ca/leaf`, 
-and `v1/agent/connect/ca/roots` APIs are deprecated and will be removed in a future release. Although Connect Native 
-will still operate as designed, we do not recommend leveraging this feature because it is deprecated and will be removed 
-removed when the long term replacement to native application integration (such as a proxyless gRPC service mesh integration) is delivered. Refer to [GH-10339](https://github.com/hashicorp/consul/issues/10339) for additional information and to track progress toward one potential solution that is tracked as replacement functionality.
-
-The Native App Integration does not support many of the Consul's service mesh features, and is not under active development.
-The [Envoy proxy](/consul/docs/connect/proxies/envoy) should be used for most production environments. 
-
-</Note>
+~> **Note:** The Native App Integration does not support many of the Consul's service
+mesh features, and is not under active development.
+The [Envoy proxy](/consul/docs/connect/proxies/envoy) should be used for most production
+environments.
 
 Applications can natively integrate with Consul's service mesh API to support accepting
 and establishing connections to other mesh services without the overhead of a
diff --git a/website/content/docs/connect/observability/index.mdx b/website/content/docs/connect/observability/index.mdx
index 95dce806a0abf..35db2edd4b499 100644
--- a/website/content/docs/connect/observability/index.mdx
+++ b/website/content/docs/connect/observability/index.mdx
@@ -44,7 +44,7 @@ Find other possible metrics syncs in the [Envoy documentation](/consul/docs/conn
 ### Service protocol
 
 You can specify the [`protocol`](/consul/docs/connect/config-entries/service-defaults#protocol)
-for all service instances in the `service-defaults` configuration entry. You can also override the default protocol when defining and registering proxies in a service definition file. Refer to [Expose Paths Configuration Reference](/consul/docs/connect/proxies/proxy-config-reference#expose-paths-configuration-reference) for additional information. 
+for all service instances in the `service-defaults` configuration entry. You can also override the default protocol when defining and registering proxies in a service definition file. Refer to [Expose Paths Configuration Reference](/consul/docs/connect/registration/service-registration#expose-paths-configuration-reference) for additional information. 
 
 By default, proxies only provide L4 metrics. 
 Defining the protocol allows proxies to handle requests at the L7
@@ -54,5 +54,5 @@ load balancing and routing decisions.
 ### Service upstreams
 
 You can set the upstream for each service using the proxy's
-[`upstreams`](/consul/docs/connect/proxies/proxy-config-reference#upstreams)
-sidecar parameter, which can be defined in a service's [sidecar registration](/consul/docs/connect/proxies/deploy-sidecar-services).
+[`upstreams`](/consul/docs/connect/registration/service-registration#upstreams)
+sidecar parameter, which can be defined in a service's [sidecar registration](/consul/docs/connect/registration/sidecar-service).
diff --git a/website/content/docs/connect/observability/ui-visualization.mdx b/website/content/docs/connect/observability/ui-visualization.mdx
index 2cbf0b0ae26b0..8e109e74b1594 100644
--- a/website/content/docs/connect/observability/ui-visualization.mdx
+++ b/website/content/docs/connect/observability/ui-visualization.mdx
@@ -225,7 +225,7 @@ With ACLs enabled, the proxy endpoint requires a valid token with read access
 to all nodes and services (across all namespaces in Enterprise):
 
 <Tabs>
-<Tab heading="Consul CE">
+<Tab heading="Consul OSS">
 
 <CodeTabs heading="Example policy granting read-only access to all services and nodes">
 
diff --git a/website/content/docs/connect/proxies/built-in.mdx b/website/content/docs/connect/proxies/built-in.mdx
index 284bfa9035e9f..fc82cd2870d1b 100644
--- a/website/content/docs/connect/proxies/built-in.mdx
+++ b/website/content/docs/connect/proxies/built-in.mdx
@@ -77,7 +77,7 @@ All fields are optional with a reasonable default.
 - `upstreams`- **Deprecated** Upstreams are now specified
   in the `connect.proxy` definition. Upstreams specified in the opaque config map
   here will continue to work for compatibility but it's strongly recommended that
-  you move to using the higher level [upstream configuration](/consul/docs/connect/proxies/proxy-config-reference#upstream-configuration-reference).
+  you move to using the higher level [upstream configuration](/consul/docs/connect/registration/service-registration#upstream-configuration-reference).
 
 ## Proxy Upstream Config Key Reference
 
diff --git a/website/content/docs/connect/proxies/deploy-service-mesh-proxies.mdx b/website/content/docs/connect/proxies/deploy-service-mesh-proxies.mdx
deleted file mode 100644
index 630da4a131de8..0000000000000
--- a/website/content/docs/connect/proxies/deploy-service-mesh-proxies.mdx
+++ /dev/null
@@ -1,79 +0,0 @@
----
-layout: docs
-page_title: Deploy service mesh proxies
-description: >- 
-   Envoy and other proxies in Consul service mesh enable service-to-service communication across your network. Learn how to deploy service mesh proxies in this topic.
----
-
-# Deploy service mesh proxies services
-
-This topic describes how to create, register, and start service mesh proxies in Consul. Refer to [Service mesh proxies overview](/consul/docs/connect/proxies) for additional information about how proxies enable Consul functionalities. 
-
-For information about deploying proxies as sidecars for service instances, refer to [Deploy sidecar proxy services](/consul/docs/connect/proxies/deploy-sidecar-services).
-
-## Overview
-
-Complete the following steps to deploy a service mesh proxy:
-
-1. It is not required, but you can create a proxy defaults configuration entry that contains global passthrough settings for all Envoy proxies. 
-1. Create a service definition file and specify the proxy configurations in the `proxy` block.
-1. Register the service using the API or CLI.
-1. Start the proxy service. Proxies appear in the list of services registered to Consul, but they must be started before they begin to route traffic in your service mesh.
-
-## Requirements
-
-If ACLs are enabled and you want to configure global Envoy settings using the [proxy defaults configuration entry](/consul/docs/connect/config-entries/proxy-defaults), you must present a token with `operator:write` permissions. Refer to [Create a service token](/consul/docs/security/acl/tokens/create/create-a-service-token) for additional information.
-
-## Configure global Envoy passthrough settings
-
-If you want to define global passthrough settings for all Envoy proxies, create a proxy defaults configuration entry and specify default settings, such as access log configuration. Note that [service defaults configuration entries](/consul/docs/connect/config-entries/service-defaults) override proxy defaults and individual service configurations override both configuration entries.
-
-1. Create a proxy defaults configuration entry and specify the following parameters:
-   - `Kind`: Must be set to `proxy-defaults`
-   - `Name`: Must be set to `global`
-1. Configure any additional settings you want to apply to all proxies. Refer to [Proxy defaults configuration entry reference](/consul/docs/connect/config-entries/proxy-defaults) for details about all settings available in the configuraiton entry. 
-1. Apply the configuration by either calling the [`/config` HTTP API endpoint](/consul/api-docs/config) or running the [`consul config write` CLI command](/consul/commands/config/write). The following example writes a proxy defaults configuration entry from a local HCL file using the CLI:
-
-```shell-session
-$ consul config write proxy-defaults.hcl
-```
-
-## Define service mesh proxy 
-
-Create a service definition file and configure the following fields to define a service mesh proxy:
-
-1. Set the `kind` field to `connect-proxy`. Refer to the [services configuration reference](/consul/docs/services/configuration/services-configuration-reference#kind) for information about other kinds of proxies you can declare.
-1. Specify a name for the proxy service in the `name` field. Consul applies the configurations to any proxies you bootstrap with the same name.
-1. In the `proxy.destination_service_name` field, specify the name of the service that the proxy represents. 
-1. Configure any additional proxy behaviors that you want to implement in the `proxy` block. Refer to the [Service mesh proxy configuration reference](/consul/docs/connect/proxies/proxy-config-reference) for information about all parameters. 
-1. Specify a port number where other services registered with Consul can discover and connect to the proxies service in the `port` field. To ensure that services only allow external connections established through the service mesh protocol, you should configure all services to only accept connections on a loopback address.
-
-Refer to the [Service mesh proxy configuration reference](/consul/docs/connect/proxies/proxy-config-reference) for example configurations.
-
-## Register the service 
-
-Provide the service definition to the Consul agent to register your proxy service. You can use the same methods for registering proxy services as you do for registering application services:
- 
-- Place the service definition in a Consul agent's configuration directory and start, restart, or reload the agent. Use this method when implementing changes to an existing proxy service.
-- Use the `consul services register` command to register the proxy service with a running Consul agent.
-- Call the `/agent/service/register` HTTP API endpoint to register the proxy service with a running Consul agent.
-
-Refer to [Register services and health checks](/consul/docs/services/usage/register-services-checks) for instructions.
-
-In the following example, the `consul services register` command registers a proxy service stored in `proxy.hcl`:
-
-```shell-session
-$ consul services register proxy.hcl
-```
-
-## Start the proxy
-
-Envoy requires a bootstrap configuration file before it can start. Use the [`consul connect envoy` command](/consul/commands/connect/envoy) to create the Envoy bootstrap configuration and start the proxy service. Specify the ID of the proxy you want to start with the `-proxy-id` option.  
-
-The following example command starts an Envoy proxy for the `web-proxy` service:
-
-```shell-session
-$ consul connect envoy -proxy-id=web-proxy
-```
-
-For details about operating an Envoy proxy in Consul, refer to the [Envoy proxy reference](/consul/docs/connect/proxies/envoy).  
diff --git a/website/content/docs/connect/proxies/deploy-sidecar-services.mdx b/website/content/docs/connect/proxies/deploy-sidecar-services.mdx
deleted file mode 100644
index ad533b59468ee..0000000000000
--- a/website/content/docs/connect/proxies/deploy-sidecar-services.mdx
+++ /dev/null
@@ -1,284 +0,0 @@
----
-layout: docs
-page_title: Deploy proxies as sidecar services
-description: >-
-  You can register a service instance and its sidecar proxy at the same time. Learn about default settings, customizable parameters, limitations, and lifecycle behaviors of the sidecar proxy.
----
-
-# Deploy sidecar services
-
-This topic describes how to create, register, and start sidecar proxy services in Consul. Refer to [Service mesh proxies overview](/consul/docs/connect/proxies) for additional information about how proxies enable Consul's functions and operations. For information about deploying service mesh proxies, refer to [Deploy service mesh proxies](/consul/docs/connect/proxies/deploy-service-mesh-proxies).
-
-## Overview
-
-Sidecar proxies run on the same node as the single service instance that they handle traffic for. 
-They may be on the same VM or running as a separate container in the same network namespace. 
-
-You can attach a sidecar proxy to a service you want to deploy to your mesh:
-
-1. It is not required, but you can create a proxy defaults configuration entry that contains global  passthrough settings for all Envoy proxies. 
-1. Create the service definition and include the `connect` block. The `connect` block contains the sidecar proxy configurations that allow the service to interact with other services in the mesh.
-1. Register the service using either the API or CLI.
-1. Start the sidecar proxy service. 
-
-## Requirements
-
-If ACLs are enabled and you want to configure global Envoy settings in the [proxy defaults configuration entry](/consul/docs/connect/config-entries/proxy-defaults), you must present a token with `operator:write` permissions. Refer to [Create a service token](/consul/docs/security/acl/tokens/create/create-a-service-token) for additional information.
-
-## Configure global Envoy passthrough settings
-
-If you want to define global passthrough settings for all Envoy proxies, create a proxy defaults configuration entry and specify default settings, such as access log configuration. [Service defaults configuration entries](/consul/docs/connect/config-entries/service-defaults) override proxy defaults and individual service configurations override both configuration entries.
-
-1. Create a proxy defaults configuration entry and specify the following parameters:
-   - `Kind`: Must be set to `proxy-defaults`
-   - `Name`: Must be set to `global`
-1. Configure any additional settings you want to apply to all proxies. Refer to [Proxy defaults configuration entry reference](/consul/docs/connect/config-entries/proxy-defaults) for details about all settings available in the configuraiton entry. 
-1. Apply the configuration by either calling the [`/config` API endpoint](/consul/api-docs/config) or running the [`consul config write` CLI command](/consul/commands/config/write). The following example writes a proxy defaults configuration entry from a local HCL file using the CLI:
-
-```shell-session
-$ consul config write proxy-defaults.hcl
-```
-
-## Define service mesh proxy 
-
-Create a service definition and configure the following fields: 
-
-1. `name`: Specify a name for the service you want to attach a sidecar proxy to in the `name` field. This field is required for all services you want to register in Consul.  
-1. `port`: Specify a port number where other services registered with Consul can discover and connect to the service in the `port` field. This field is required for all services you want to register in Consul.
-1. `connect`: Set the `connect` field to `{ sidecar_service: {} }`. The `{ sidecar_service: {} }` value is a macro that applies a set of default configurations that enable you to quickly implement a sidecar. Refer to [Sidecar service defaults](#sidecar-service-defaults) for additional information.
-1. Configure any additional options for your service. Refer to [Services configuration reference](/consul/docs/services/configuration/services-configuration-reference) for details. 
-
-In the following example, a service named `web` is configured with a sidecar proxy:
-
-<Tabs>
-
-<Tab heading="HCL" group="hcl">
-
-```hcl
-service = {
-  name = "web"
-  port = 8080
-  connect = { sidecar_service = {} }
-}
-```  
-
-</Tab>
-
-<Tab heading="JSON" group="json">
-
-```json
-
-{
-  "service": {
-    "name": "web",
-    "port": 8080,
-    "connect": { "sidecar_service": {} }
-  }
-}
-
-```
-
-</Tab>
-
-</Tabs>
-
-When Consul processes the service definition, it generates the following configuration in place of the `sidecar_service` macro. Note that sidecar proxies services are based on the `connect-proxy` type:
-
-<Tabs>
-
-<Tab heading="HCL" group="hcl">
-
-```hcl
-services = [ 
-  {
-    name = "web"
-    port = 8080
-  }
-    checks = {
-      Interval = "10s"
-      Name = "Connect Sidecar Listening"
-      TCP = "127.0.0.1:20000"
-    }
-    checks = {
-      alias_service = "web"
-      name = "Connect Sidecar Aliasing web"
-    }
-    kind = "connect-proxy"
-    name = "web-sidecar-proxy"
-    port = 20000
-    proxy = {
-      destination_service_id = "web"
-      destination_service_name = "web"
-      local_service_address = "127.0.0.1"
-      local_service_port = 8080
-    }
-]
-
-```  
-
-</Tab>
-
-<Tab heading="JSON" group="json">
-
-```json
-{
-  "services": [
-    {
-      "name": "web",
-      "port": 8080
-    },
-    {
-      "name": "web-sidecar-proxy",
-      "port": 20000,
-      "kind": "connect-proxy",
-      "checks": [
-        {
-          "Name": "Connect Sidecar Listening",
-          "TCP": "127.0.0.1:20000",
-          "Interval": "10s"
-        },
-        {
-          "name": "Connect Sidecar Aliasing web",
-          "alias_service": "web"
-        }
-      ],
-      "proxy": {
-        "destination_service_name": "web",
-        "destination_service_id": "web",
-        "local_service_address": "127.0.0.1",
-        "local_service_port": 8080
-      }
-    }
-  ]
-}
-
-```
-
-</Tab>
-
-</Tabs>    
-
-## Register the service 
-
-Provide the service definition to the Consul agent to register your proxy service. You can use the same methods for registering proxy services as you do for registering application services:
- 
-- Place the service definition in a Consul agent's configuration directory and start, restart, or reload the agent. Use this method when implementing changes to an existing proxy service.
-- Use the `consul services register` command to register the proxy service with a running Consul agent.
-- Call the `/agent/service/register` HTTP API endpoint to register the proxy service with a running Consul agent.
-
-Refer to [Register services and health checks](/consul/docs/services/usage/register-services-checks) for instructions.
-
-In the following example, the `consul services register` command registers a proxy service stored in `proxy.hcl`:
-
-```shell-session
-$ consul services register proxy.hcl
-```
-
-## Start the proxy
-
-Envoy requires a bootstrap configuration file before it can start. Use the [`consul connect envoy` command](/consul/commands/connect/envoy) to create the Envoy bootstrap configuration and start the proxy service. Specify the name of the service with the attached proxy with the `-sidecar-for` option.  
-
-The following example command starts an Envoy sidecar proxy for the `web` service:
-
-```shell-session
-$ consul connect envoy -sidecar-for=web
-```
-
-For details about operating an Envoy proxy in Consul, refer to [](/consul/docs/connect/proxies/envoy)  
-
-## Configuration reference
-
-The `sidecar_service` block is a service definition that can contain most regular service definition fields. Refer to [Limitations](#limitations) for information about unsupported service definition fields for sidecar proxies. 
-
-Consul treats sidecar proxy service definitions as a root-level service definition. All fields are optional in nested definitions, which default to opinionated settings that are intended to reduce burden of setting up a sidecar proxy.
-
-## Sidecar service defaults
-
-The following fields are set by default on a sidecar service registration. With
-[the exceptions noted](#limitations) any field may be overridden explicitly in
-the `connect.sidecar_service` definition to customize the proxy registration.
-The "parent" service refers to the service definition that embeds the sidecar
-proxy.
-
-- `id` - ID defaults to `<parent-service-id>-sidecar-proxy`. This value cannot
-  be overridden as it is used to [manage the lifecycle](#lifecycle) of the
-  registration.
-- `name` - Defaults to `<parent-service-name>-sidecar-proxy`.
-- `tags` - Defaults to the tags of the parent service.
-- `meta` - Defaults to the service metadata of the parent service.
-- `port` - Defaults to being auto-assigned from a configurable
-  range specified by [`sidecar_min_port`](/consul/docs/agent/config/config-files#sidecar_min_port)
-  and [`sidecar_max_port`](/consul/docs/agent/config/config-files#sidecar_max_port).
-- `kind` - Defaults to `connect-proxy`. This value cannot be overridden.
-- `check`, `checks` - By default we add a TCP check on the local address and
-  port for the proxy, and a [service alias
-  check](/consul/docs/services/usage/checks#alias-checks) for the parent service. If either
-  `check` or `checks` fields are set, only the provided checks are registered.
-- `proxy.destination_service_name` - Defaults to the parent service name.
-- `proxy.destination_service_id` - Defaults to the parent service ID.
-- `proxy.local_service_address` - Defaults to `127.0.0.1`.
-- `proxy.local_service_port` - Defaults to the parent service port.
-
-### Example with overwritten configurations
-
-In the following example, the `sidecar_service` macro sets baselines configurations for the proxy, but the [proxy
-upstreams](/consul/docs/connect/proxies/proxy-config-reference#upstream-configuration-reference)
-and [built-in proxy
-configuration](/consul/docs/connect/proxies/built-in) fields contain custom values:  
-
-```json
-{
-  "name": "web",
-  "port": 8080,
-  "connect": {
-    "sidecar_service": {
-      "proxy": {
-        "upstreams": [
-          {
-            "destination_name": "db",
-            "local_bind_port": 9191
-          }
-        ],
-        "config": {
-          "handshake_timeout_ms": 1000
-        }
-      }
-    }
-  }
-}
-```
-
-## Limitations
-
-The following fields are not supported in the `connect.sidecar_service` block:
-
-- `id` - Sidecar services get an ID assigned and it is an error to override
-  this value. This ID is required to ensure that the agent can correctly deregister the sidecar service
-  later when the parent service is removed.
-- `kind` - Kind defaults to `connect-proxy` and there is no way to
-  unset this behavior.
-- `connect.sidecar_service` - Service definitions cannot be nested recursively.
-- `connect.native` - The `kind` is fixed to `connect-proxy` and it is
-  an error to register a `connect-proxy` that is also service mesh-native.
-
-## Lifecycle
-
-Sidecar service registration is mostly a configuration syntax helper to avoid
-adding lots of boiler plate for basic sidecar options, however the agent does
-have some specific behavior around their lifecycle that makes them easier to
-work with.
-
-The agent fixes the ID of the sidecar service to be based on the parent
-service's ID, which enables the following behavior.
-
-- A service instance can only ever have one sidecar service registered.
-- When re-registering through the HTTP API or reloading from configuration file:
-  - If something changes in the nested sidecar service definition, the update is applied to the current sidecar registration instead of creating a new
-    one.
-  - If a service registration removes the nested `sidecar_service` then the
-    previously registered sidecar for that service is deregistered
-    automatically.
-- When reloading the configuration files, if a service definition changes its
-  ID, then a new service instance and a new sidecar instance are
-  registered. The old instance and proxy are removed because they are no longer found in
-  the configuration files.
\ No newline at end of file
diff --git a/website/content/docs/connect/proxies/envoy-extensions/configuration/ext-authz.mdx b/website/content/docs/connect/proxies/envoy-extensions/configuration/ext-authz.mdx
deleted file mode 100644
index ebe7f99a96e33..0000000000000
--- a/website/content/docs/connect/proxies/envoy-extensions/configuration/ext-authz.mdx
+++ /dev/null
@@ -1,739 +0,0 @@
----
-layout: docs
-page_title: External authorization extension configuration reference
-description: Learn how to configure the ext-authz Envoy extension, which is a builtin Consul extension that configures Envoy proxies to request authorization from an external service.
----
-
-# External authorization extension configuration reference
-
-This topic describes how to configure the external authorization Envoy extension, which configures Envoy proxies to request authorization from an external service. Refer to [Delegate authorization to an external service](/consul/docs/connect/proxies/envoy-extensions/usage/ext-authz) for usage information.
-
-## Configuration model
-
-The following list outlines the field hierarchy, data types, and requirements for the external authorization configuration. Place the configuration inside the `EnvoyExtension.Arguments` field in the proxy defaults or service defaults configuration entry. Refer to the following documentation for additional information:
-
-- [`EnvoyExtensions` in proxy defaults](/consul/docs/connect/config-entries/proxy-defaults#envoyextensions)
-- [`EnvoyExtensions` in service defaults](/consul/docs/connect/config-entries/service-defaults#envoyextensions)
- - [Envoy External Authorization documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/filters/http/ext_authz/v3/ext_authz.proto)
-
-Click on a property name to view additional details, including default values.
-
-- [`Name`](#name): string | required | must be set to `builtin/ext-authz` 
-- [`Arguments`](#arguments): map | required
-   - [`ProxyType`](#arguments-proxytype): string | required | `connect-proxy`
-   - [`ListenerType`](#arguments-listenertype): string | required | `inbound`
-   - [`InsertOptions`](#arguments-insertoptions): map
-      - [`Location`](#arguments-insertoptions-location): string
-      - [FilterName](#arguments-insertoptions-filtername): string
-   - [`Config`](#arguments-config): map | required
-      - [`BootstrapMetadataLabelsKey`](#arguments-config-bootstrapmetadatalabelskey): string
-      - [`ClearRouteCache`](#arguments-config-grpcservice): boolean | `false` | HTTP only
-      - [`GrpcService`](#arguments-config-grpcservice): map
-        - [`Target`](#arguments-config-grpcservice-target): map | required
-           - [`Service`](#arguments-config-grpcservice-target-service): map
-              - [`Name`](#arguments-config-grpcservice-target-service): string
-              - [`Namespace`](#arguments-config-grpcservice-target-service): string | <EnterpriseAlert inline/>
-              - [`Partition`](#arguments-config-grpcservice-target-service): string | <EnterpriseAlert inline/>
-           - [`URI`](#arguments-config-grpcservice-target-uri): string   
-           - [`Timeout`](#arguments-config-grpcservice-target-uri): string | `1s`
-        - [`Authority`](#arguments-config-grpcservice-authority): string    
-        - [`InitialMetadata`](#arguments-config-grpcservice-initialmetadata): list
-           - [`Key`](#arguments-config-grpcservice-initialmetadata): string  
-           - [`Value`](#arguments-config-grpcservice-initialmetadata): string  
-      - [`HttpService`](#arguments-config-httpservice): map
-        - [`Target`](#arguments-config-httpservice-target): map | required
-           - [`Service`](#arguments-config-httpservice): string
-              - [`Name`](#arguments-config-httpservice-target-service): string
-              - [`Namespace`](#arguments-config-httpservice-target-service): string | <EnterpriseAlert inline/>
-              - [`Partition`](#arguments-config-httpservice-target-service): string | <EnterpriseAlert inline/>     
-           - [`URI`](#arguments-config-httpservice): string   
-           - [`Timeout`](#arguments-config-httpservice): string | `1s`   
-        - [`PathPrefix`](#arguments-config-httpservice-pathprefix): string    
-        - [`AuthorizationRequest`](#arguments-config-httpservice-authorizationrequest): map    
-           - [`AllowedHeaders`](#arguments-config-httpservice-authorizationrequest-allowedheaders): list
-              - [`Contains`](#arguments-config-httpservice-authorizationrequest-allowedheaders): string   
-              - [`Exact`](#arguments-config-httpservice-authorizationrequest-allowedheaders): string   
-              - [`IgnoreCase`](#arguments-config-httpservice-authorizationrequest-allowedheaders): boolean  
-              - [`Prefix`](#arguments-config-httpservice-authorizationrequest-allowedheaders): string   
-              - [`SafeRegex`](#arguments-config-httpservice-authorizationrequest-allowedheaders): string   
-           - [`HeadersToAdd`](#arguments-config-httpservice-authorizationrequest-headerstoadd): list
-              - [`Key`](#arguments-config-httpservice-authorizationrequest-headerstoadd): string  
-              - [`Value`](#arguments-config-httpservice-authorizationrequest-headerstoadd): string  
-        - [`AuthorizationResponse`](#arguments-config-httpservice-authorizationresponse): map
-           - [`AllowedUpstreamHeaders`](#arguments-config-httpservice-authorizationresponse-allowedupstreamheaders): list
-              - [`Contains`](#arguments-config-httpservice-authorizationresponse-allowedupstreamheaders): string   
-              - [`Exact`](#arguments-config-httpservice-authorizationresponse-allowedheaders): string   
-              - [`IgnoreCase`](#arguments-config-httpservice-authorizationresponse-allowedheaders): boolean  
-              - [`Prefix`](#arguments-config-httpservice-authorizationresponse-allowedheaders): string   
-              - [`SafeRegex`](#arguments-config-httpservice-authorizationresponse-allowedheaders): string   
-              - [`Suffix`](#arguments-config-httpservice-authorizationresponse-allowedheaders): string   
-           - [`AllowedUpstreamHeadersToAppend`](#arguments-config-httpservice-authorizationresponse-allowedupstreamheaderstoappend): list
-              - [`Contains`](#arguments-config-httpservice-authorizationresponse-allowedupstreamheaderstoappend): string   
-              - [`Exact`](#arguments-config-httpservice-authorizationresponse-allowedupstreamheaderstoappend): string   
-              - [`IgnoreCase`](#arguments-config-httpservice-authorizationresponse-allowedupstreamheaderstoappend): boolean  
-              - [`Prefix`](#arguments-config-httpservice-authorizationresponse-allowedupstreamheaderstoappend): string   
-              - [`SafeRegex`](#arguments-config-httpservice-authorizationresponse-allowedupstreamheaderstoappend): string   
-              - [`Suffix`](#arguments-config-httpservice-authorizationresponse-allowedupstreamheaderstoappend): string   
-           - [`AllowedClientHeaders`](#arguments-config-httpservice-authorizationresponse-allowedclientheaders): list
-              - [`Contains`](#arguments-config-httpservice-authorizationresponse-allowedclientheaders): string   
-              - [`Exact`](#arguments-config-httpservice-authorizationresponse-allowedclientheaders): string   
-              - [`IgnoreCase`](#arguments-config-httpservice-authorizationresponse-allowedclientheaders): boolean  
-              - [`Prefix`](#arguments-config-httpservice-authorizationresponse-allowedclientheaders): string   
-              - [`SafeRegex`](#arguments-config-httpservice-authorizationresponse-allowedclientheaders): string   
-              - [`Suffix`](#arguments-config-httpservice-authorizationresponse-allowedclientheaders): string   
-           - [`AllowedClientHeadersOnSuccess`](#arguments-config-httpservice-authorizationresponse-allowedclientheadersonsuccess): list
-              - [`Contains`](#arguments-config-httpservice-authorizationresponse-allowedclientheadersonsuccess): string   
-              - [`Exact`](#arguments-config-httpservice-authorizationresponse-allowedclientheadersonsuccess): string   
-              - [`IgnoreCase`](#arguments-config-httpservice-authorizationresponse-allowedclientheadersonsuccess): boolean  
-              - [`Prefix`](#arguments-config-httpservice-authorizationresponse-allowedclientheadersonsuccess): string   
-              - [`SafeRegex`](#arguments-config-httpservice-authorizationresponse-allowedclientheadersonsuccess): string   
-              - [`Suffix`](#arguments-config-httpservice-authorizationresponse-allowedclientheadersonsuccess): string   
-           - [`DynamicMetadataFromHeaders`](#arguments-config-httpservice-authorizationresponse-dynamicmetadatafromheaders): list
-              - [`Contains`](#arguments-config-httpservice-authorizationresponse-dynamicmetadatafromheaders): string   
-              - [`Exact`](#arguments-config-httpservice-authorizationresponse-dynamicmetadatafromheaders): string   
-              - [`IgnoreCase`](#arguments-config-httpservice-authorizationresponse-dynamicmetadatafromheaders): boolean  
-              - [`Prefix`](#arguments-config-httpservice-authorizationresponse-dynamicmetadatafromheaders): string   
-              - [`SafeRegex`](#arguments-config-httpservice-authorizationresponse-dynamicmetadatafromheaders): string   
-              - [`Suffix`](#arguments-config-httpservice-authorizationresponse-dynamicmetadatafromheaders): string   
-      - [`IncludePeerCertificate`](#arguments-config-includepeercertificate): boolean | `false`
-      - [`MetadataContextNamespaces`](#arguments-config-metadatacontextnamespaces): list of strings | HTTP only
-      - [`StatusOnError`](#arguments-config-statusonerror): number | `403` | HTTP only
-      - [`StatPrefix`](#arguments-config-statprefix): string | `response`
-      - [`WithRequestBody`](#arguments-config-withrequestbody): map | HTTP only
-         - [`MaxRequestBytes`](#arguments-config-withrequestbody-maxrequestbytes): number
-         - [`AllowPartialMessage`](#arguments-config-withrequestbody-allowpartialmessage): boolean | `false`
-         - [`PackAsBytes`](#arguments-config-withrequestbody-packasbytes): boolean | `false`
-
-## Complete configuration
-
-When each field is defined, an `ext-authz` configuration has the following form:
-
-```hcl
-Name = "builtin/ext-authz" 
-Arguments = {
-   ProxyType = "connect-proxy"
-   InsertOptions = {
-      Location = "<location in the filter chain>" 
-      FilterName = "<filter relative to the location>"
-   }
-   Config = {
-      BootstrapMetadataLabelsKey = "<key from bootstrap metadata>"
-      ClearRouteCache = false // HTTP only
-      GrpcService = {
-         Target = {
-            Service = {
-               Name = "<upstream service to send gRPC authorization requests to>"
-               Namespace = "<namespace containing the upstream service>"
-               Partition = "<partition containing the upstream service>"
-            URI = "<URI of the upstream service>"   
-            Timeout = "1s"
-         Authority = "<authority header to send in the gRPC request>"     
-         InitialMetadata = [
-            "<Key>" : "<value>"  
-      HttpService = {
-         Target = {
-            Service = {
-               Name = "<upstream service to send gRPC authorization requests to>"
-               Namespace = "<namespace containing the upstream service>"
-               Partition = "<partition containing the upstream service>"
-            URI = "<URI of the upstream service>"   
-            Timeout = "1s"
-            }
-         }
-         PathPrefix = "/<authorization-request-header-prefix>/"    
-         AuthorizationRequest = {
-            AllowedHeaders = [
-               Contains = "<client request headers must contain this value>",   
-               Exact = "<client request headers can only be this value>",   
-               IgnoreCase = false,  
-               Prefix = "<client request headers must begin with this value>",   
-               SafeRegex = "<client request headers can match this regex pattern>"
-            ]   
-            HeadersToAdd = [ 
-               "<header key>" = "<header value>"
-            ]
-         }  
-         AuthorizationResponse = {
-            AllowedUpstreamHeaders = [
-               Contains = "<authorization response headers must contain this value>",   
-               Exact = "<authorization response headers can only be this value>",   
-               IgnoreCase = false,  
-               Prefix = "<authorization response headers must begin with this value>",   
-               SafeRegex = "<authorization response headers can match this regex pattern>"
-               Suffix = "<authorization response headers must end with this value>"
-            ]   
-            AllowedUpstreamHeadersToAppend = [
-               Contains = "<authorization response headers must contain this value>",   
-               Exact = "<authorization response headers can only be this value>",   
-               IgnoreCase = false,  
-               Prefix = "<authorization response headers must begin with this value>",   
-               SafeRegex = "<authorization response headers can match this regex pattern>"
-               Suffix = "<authorization response headers must end with this value>"   
-             ]   
-            AllowedClientHeaders = [
-               Contains = "<client response headers must contain this value>",   
-               Exact = "<client response headers can only be this value>",   
-               IgnoreCase = false,  
-               Prefix = "<client response headers must begin with this value>",   
-               SafeRegex = "<client response headers can match this regex pattern>"
-               Suffix = "<client response headers must end with the value>"
-            ]   
-            AllowedClientHeadersOnSuccess = [
-               Contains = "<client response headers must contain this value>",   
-               Exact = "<client response headers can only be this value>",   
-               IgnoreCase = false,  
-               Prefix = "<client response headers must begin with this value>",   
-               SafeRegex = "<client response headers can match this regex pattern>"
-               Suffix = "<client response headers must end with the value>"
-            DynamicMetadataFromHeaders = [
-               Contains = "<authorization response headers must contain this value>",   
-               Exact = "<authorization response headers can only be this value>",   
-               IgnoreCase = false,  
-               Prefix = "<authorization response headers must begin with this value>",   
-               SafeRegex = "<authorization response headers can match this regex pattern>"
-               Suffix = "<authorization response headers must end with the value>"
-            ]
-      IncludePeerCertificate = false
-      MetadataContextNamespaces = [ 
-         "<metadata namespace>"
-      ]
-      StatusOnError = 403 // HTTP only
-      StatPrefix = "response"
-      WithRequestBody = {   //HTTP only
-         MaxRequestBytes = <uint32 value specifying the max size of the message body>  
-         AllowPartialMessage = false
-         PackAsBytes = false
-```
-
-## Specification
-
-This section provides details about the fields you can configure for the external authorization extension.
-### `Name`
-
-Specifies the name of the extension. Must be set to `builtin/ext-authz`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String value set to `builtin/ext-authz`.
-
-### `Arguments`
-
-Contains the global configuration for the extension.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-### `Arguments.ProxyType`
-
-Specifies the type of Envoy proxy that this extension applies to. The extension only applies to proxies that match this type and is ignored for all other proxy types. The only supported value is `connect-proxy`.
-
-#### Values
-
-- Default: `connect-proxy`
-- This field is required.
-- Data type: String
-
-### `Arguments.ListenerType`
-
-Specifies the type of listener the extension applies to. The listener type is either `inbound` or `outbound`. If the listener type is set to `inbound`, Consul applies the extension so the external authorization is enabled when other services in the mesh send messages to the service attached to the proxy. If the listener type is set to `outbound`, Consul applies the extension so the external authorization is enabled when the attached proxy sends messages to other services in the mesh.
-
-#### Values
-
-- Default: `inbound`
-- This field is required.
-- Data type is one of the following string values:
-  - `inbound`
-  - `outbound`
-
-### `Arguments.InsertOptions`
-
-Specifies options for defining the insertion point for the external authorization filter in the Envoy filter chain. By default, the external authorization filter is inserted as the first filter in the filter chain per the default setting for the [`Location`](#arguments-insertoptions-location) field. 
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `Arguments.InsertOptions.Location`
-
-Specifies the insertion point for the external authorization filter in the Envoy filter chain. You can specify one of the following string values:
-
-- `First`: Inserts the filter as the first filter in the filter chain, regardless of the filter specified in the `FilterName` field.
-- `BeforeLast`: Inserts the filter before the last filter in the chain, regardless of the filter specified in the `FilterName` field. This allows the filter to be inserted after all other filters and immediately before the terminal filter. 
-- `AfterFirstMatch`: Inserts the filter after the first filter in the chain that has a name matching the value of the `FilterName` field.
-- `AfterLastMatch`: Inserts the filter after the last filter in the chain that has a name matching the value of the `FilterName` field.
-- `BeforeFirstMatch`: Inserts the filter before the first filter in the chain that has a name matching the value of the `FilterName` field.
-- `BeforeLastMatch`: Inserts the filter before the last filter in the chain that has a name matching the value of the `FilterName` field. 
-
-#### Values
-
-- Default: `BeforeFirstMatch`
-- Data type: String
-
-### `Arguments.InsertOptions.FilterName`
-
-Specifies the name of an existing filter in the chain to match when inserting the external authorization filter. Specifying a filter name enables  you to configure an insertion point relative to the position of another filter in the chain.  
-
-#### Values
-
-- Default: `envoy.filters.network.tcp_proxy` for TCP services. `envoy.filters.http.router` for HTTP services.
-- Data type: String
-
-### `Arguments.Config`
-
-Contains the configuration settings for the extension.  
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-### `Arguments.Config.BootstrapMetadataLabelsKey`
-
-Specifies a key from the Envoy bootstrap metadata. Envoy adds labels associated with the key to the authorization request context. 
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `Arguments.Config.ClearRouteCache`
-
-Directs Envoy to clear the route cache so that the external authorization service correctly affects routing decisions. If set to `true`, the filter clears all cached routes. 
-
-Envoy also clears cached routes if the status returned from the authorization service is `200` for HTTP responses or `0` for gRPC responses. Envoy also clears cached routes if at least one authorization response header is added to the client request or is used for altering another client request header.
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-
-### `Arguments.Config.GrpcService`
-
-Specifies the external authorization configuration for gRPC requests. Configure the `GrpcService` or the [`HttpService`](#arguments-config-httpservice) settings, but not both.
-
-#### Values
-
-- Default: None
-- Either the `GrpcService` or the `HttpService` configuration is required.
-- Data type: Map
-
-### `Arguments.Config.GrpcService.Target`
-
-Configuration for specifying the service to send gRPC authorization requests to. The `Target` field may contain the following fields:
-
-- [`Service`](#arguments-config-grpcservice-target-service) or [`Uri`](#arguments-config-grpcservice-target-uri)
-- [`Timeout`](#arguments-config-grpcservice-target-timeout)
-
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-### `Arguments{}.Config{}.GrpcService{}.Target{}.Service{}`
-
-Specifies the upstream external authorization service. Configure this field when authorization requests are sent to an upstream service within the service mesh. The service must be configured as an upstream of the service that the filter is applied to.
-
-Configure either the `Service` field or the [`Uri`](#arguments-config-grpcservice-target-uri) field, but not both. 
- 
-#### Values
-
-- Default: None
-- This field or [`Uri`](#arguments-config-grpcservice-target-uri) is required.
-- Data type: Map
-
-The following table describes how to configure parameters for the `Service` field:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `Name` | Specifies the name of the upstream service. | String | None |
-| `Namespace` | <EnterpriseAlert inline/> Specifies the Consul namespace that the upstream service belongs to. | String | `default` |
-| `Partition` | <EnterpriseAlert inline/> Specifies the Consul admin partition that the upstream service belongs to. | String | `default` |
-
-### `Arguments.Config.GrpcService.Target.Uri`
-
-Specifies the URI of the external authorization service. Configure this field when you must provide an explicit URI to the external authorization service, such as cases in which the authorization service is running on the same host or pod. If set, the value of this field must be one of `localhost:<port>`, `127.0.0.1:<port>`, or `::1:<port>`.
-
-Configure either the `Uri` field or the [`Service`](#arguments-config-grpcservice-target-service) field, but not both. 
- 
-#### Values
-
-- Default: None
-- This field or [`Service`](#arguments-config-grpcservice-target-service) is required.
-- Data type: String
-
-### `Arguments.Config.GrpcService.Target.Timeout`
-
-Specifies the maximum duration that a response can take to arrive upon request.
- 
-#### Values
-
-- Default: `1s`
-- Data type: String
-
-### `Arguments.Config.GrpcService.Authority`
-
-Specifies the authority header to send in the gRPC request. If this field is not set, the authority field is set to the cluster name. This field does not override the SNI that Envoy sends to the external authorization service.
- 
-#### Values
-
-- Default: Cluster name
-- Data type: String
-
-### `Arguments.Config.GrpcService.InitialMetadata[]`
-
-Specifies additional metadata to include in streams initiated to the `GrpcService`. You can specify metadata for injecting additional ad-hoc authorization headers, for example, `x-foo-bar: baz-key`. For more information, including details on header value syntax, refer to the [Envoy documentation on custom request headers](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_conn_man/headers#config-http-conn-man-headers-custom-request-headers).
- 
-#### Values
-
-- Default: None
-- Data type: List of one or more key-value pairs:
-
-   - KEY: String
-   - VALUE: String
-
-### `Arguments{}.Config{}.HttpService{}`
-
-Contains the configuration for raw HTTP communication between the filter and the external authorization service. Configure the `HttpService` or the [`GrpcService`](#arguments-config-grpcservice) settings, but not both.
-
-#### Values
-
-- Default: None
-- Either the `HttpService` or the `GrpcService` configuration is required.
-- Data type: Map
-
-### `Arguments{}.Config{}.HttpService{}.Target{}`
-
-Configuration for specifying the service to send HTTP authorization requests to. The `Target` field may contain the following fields:
-
-- [`Service`](#arguments-config-httpservice-target-service) or [`Uri`](#arguments-config-httpservice-target-uri)
-- [`Timeout`](#arguments-config-httpservice-target-timeout)
-
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-### `Arguments{}.Config{}.HttpService{}.Target{}.Service{}`
-
-Specifies the upstream external authorization service. Configure this field when HTTP authorization requests are sent to an upstream service within the service mesh. The service must be configured as an upstream of the service that the filter is applied to.
-
-Configure either the `Service` field or the [`Uri`](#arguments-config-httpservice-target-uri) field, but not both. 
- 
-#### Values
-
-- Default: None
-- This field or [`Uri`](#arguments-config-httpservice-target-uri) is required.
-- Data type: Map
-
-The following table describes how to configure parameters for the `Service` field:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `Name` | Specifies the name of the upstream service. | String | None |
-| `Namespace` | <EnterpriseAlert inline/> Specifies the Consul namespace that the upstream service belongs to. | String | `default` |
-| `Partition` | <EnterpriseAlert inline/> Specifies the Consul admin partition that the upstream service belongs to. | String | `default` |
-
-### `Arguments{}.Config{}.HttpService{}.Target{}.Uri`
-
-Specifies the URI of the external authorization service. Configure this field when you must provide an explicit URI to the external authorization service, such as cases in which the authorization service is running on the same host or pod. If set, the value of this field must be one of `localhost:<port>`, `127.0.0.1:<port>`, or `::1:<port>`.
-
-Configure either the `Uri` field or the [`Service`](#arguments-config-httpservice-target-service) field, but not both. 
- 
-#### Values
-
-- Default: None
-- This field or [`Service`](#arguments-config-httpservice-target-service) is required.
-- Data type: String
-
-### `Arguments{}.Config{}.HttpService{}.Target{}.Timeout`
-
-Specifies the maximum duration that a response can take to arrive upon request.
- 
-#### Values
-
-- Default: `1s`
-- Data type: String
-
-### `Arguments{}.Config{}.HttpService{}.PathPrefix`
-
-Specifies a prefix for the value of the authorization request header `Path`. You must include the preceding forward slash (`/`).
- 
-#### Values
-
-- Default: None
-- Data type: String
-
-### `Arguments{}.Config{}.HttpService{}.AuthorizationRequest{}`
-
-HTTP-only configuration that controls the HTTP authorization request metadata. The `AuthorizationRequest` field may contain the following parameters:
-
-- [`AllowHeaders`](#arguments-config-httpservice-authorizationrequest-allowheaders)
-- [`HeadersToAdd`](#arguments-config-httpservice-authorizationrequest-headerstoadd)
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `Arguments{}.Config{}.HttpService{}.AuthorizationRequest{}.AllowHeaders[]`
-
-Specifies a set of rules for matching client request headers. The request to the external authorization service includes any client request headers that satisfy any of the rules. Refer to the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/filters/http/ext_authz/v3/ext_authz.proto#extensions-filters-http-ext-authz-v3-extauthz) for a detailed explanation.
-
-#### Values
-
-- Default: None
-- Data type: List of key-value pairs
-
-The following table describes the matching rules you can configure in the `AllowHeaders` field:
-
-@include 'envoy_ext_rule_matcher.mdx'
-
-### `Arguments{}.Config{}.HttpService{}.AuthorizationRequest{}.HeadersToAdd[]`
-
-Specifies a list of headers to include in the request to the authorization service. Note that Envoy overwrites client request headers with the same key.
-
-#### Values
-
-- Default: None
-- Data type: List of one or more key-value pairs:
-
-   - KEY: String
-   - VALUE: String
-
-### `Arguments{}.Config{}.HttpService{}.AuthorizationResponse{}`
-
-HTTP-only configuration that controls HTTP authorization response metadata. The `AuthorizationResponse` field may contain the following parameters:
-
-- [`AllowedUpstreamHeaders`](#arguments-config-httpservice-authorizationresponse-allowedupstreamheaders)
-- [`AllowedUpstreamHeadersToAppend`](#arguments-config-httpservice-authorizationresponse-allowedupstreamheaderstoappend)
-- [`AllowedClientHeaders`](#arguments-config-httpservice-authorizationresponse-allowedclientheaders)
-- [`AllowedClientHeadersOnSuccess`](#arguments-config-httpservice-authorizationresponse-allowedclientheadersonsuccess)
-- [`DynamicMetadataFromHeaders`](#arguments-config-httpservice-authorizationresponse-dynamicmetadatafromheaders)
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `Arguments{}.Config{}.HttpService{}.AuthorizationResponse{}.AllowedUpstreamHeaders[]`
-
-Specifies a set of rules for matching authorization response headers. Envoy adds any headers from the external authorization service to the client response that satisfy the rules. Envoy overwrites existing headers.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-The following table describes the matching rules you can configure in the `AllowedUpstreamHeaders` field:
-
-@include 'envoy_ext_rule_matcher.mdx'
-
-### `Arguments{}.Config{}.HttpService{}.AuthorizationResponse{}.AllowedUpstreamHeadersToAppend[]`
-
-Specifies a set of rules for matching authorization response headers. Envoy appends any headers from the external authorization service to the client response that satisfy the rules. Envoy appends existing headers.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-The following table describes the matching rules you can configure in the `AllowedUpstreamHeadersToAppend` field:
-
-@include 'envoy_ext_rule_matcher.mdx'
-
-### `Arguments{}.Config{}.HttpService{}.AuthorizationResponse{}.AllowedClientHeaders[]`
-
-Specifies a set of rules for matching client response headers. Envoy adds any headers from the external authorization service to the client response that satisfy the rules. When the list is not set, Envoy includes all authorization response headers except `Authority (Host)`. When a header is included in this list, Envoy automatically adds the following headers: 
-
-- `Path`
-- `Status`
-- `Content-Length`
-- `WWWAuthenticate`
-- `Location`
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-The following table describes the matching rules you can configure in the `AllowedClientHeaders` field:
-
-@include 'envoy_ext_rule_matcher.mdx'
-
-### `Arguments{}.Config{}.HttpService{}.AuthorizationResponse{}.AllowedClientHeadersOnSuccess[]`
-
-Specifies a set of rules for matching client response headers. Envoy adds headers from the external authorization service to the client response when the headers satisfy the rules and the authorization is successful. If the headers match the rules but the authorization fails or is denied, the headers are not added. If this field is not set, Envoy does not add any additional headers to the client's response on success. 
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-The following table describes the matching rules you can configure in the `AllowedClientHeadersOnSuccess` field:
-
-@include 'envoy_ext_rule_matcher.mdx'
-
-### `Arguments{}.Config{}.HttpService{}.AuthorizationResponse{}.DynamicMetadataFromHeaders[]`
-
-Specifies a set of rules for matching authorization response headers. Envoy emits headers from the external authorization service as dynamic metadata that the next filter in the chain can consume. 
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-The following table describes the matching rules you can configure in the `DynamicMetadataFromHeaders` field:
-
-@include 'envoy_ext_rule_matcher.mdx'
-
-### `Arguments{}.Config{}.IncludePeerCertificate`
-
-If set to `true`, Envoy includes the peer X.509 certificate in the authorization request if the certificate is available.  
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `Arguments{}.Config{}.MetadataContextNamespace[]`
-
-HTTP only field that specifies a list of metadata namespaces. The values of the namespaces  are included in the authorization request context.  The `consul` namespace is always included in addition to the namespaces you configure.
-
-#### Values
-
-- Default: `["consul"]`
-- Data type: List of string values
-
-### `Arguments{}.Config{}.StatusOnError`
-
-HTTP only field that specifies a return code status to respond with on error. Refer to the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/type/v3/http_status.proto#enum-type-v3-statuscode) for additional information.
-
-#### Values
-
-- Default: `403`
-- Data type: Integer
-
-### `Arguments{}.Config{}.StatPrefix`
-
-Specifies a prefix to add when writing statistics.
-
-#### Values
-
-- Default: `response`
-- Data type: String
-
-### `Arguments{}.Config{}.WithRequestBody{}`
-
-HTTP only field that configures Envoy to buffer the client request body and send it with the authorization request. If unset, the request body is not sent with the authorization request.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-The following table describes the parameters that you can include in the `WithRequestBody` field:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `MaxRequestBytes` | Specifies the maximum size of the message body that the filter holds in memory. Envoy returns HTTP `403` and does not initiate the authorization process when the buffer reaches the number set in this field unless `AllowPartialMessage` is set to `true`. | uint32 | None |
-| `AllowPartialMessage` | If set to `true`, Envoy buffers the request body until the value of `MaxRequestBytes` is reached. The authorization request is dispatched with a partial body and no `413` HTTP error returns by the filter. | Boolean | `false` |
-| `PackAsBytes` | If set to `true`, Envoy sends the request body to the external authorization as raw bytes. Otherwise, Envoy sends the request body as a UTF-8 encoded string. | Boolean | `false` |
-
-## Examples
-
-The following examples demonstrate common configuration patterns for specific use cases.
-
-### Authorize gRPC requests to a URI
-
-In the following example, a service defaults configuration entry contains an `ext-authz` configuration. The configuration allows the `api` service to make gRPC authorization requests to a service at `localhost:9191`:
-
-```hcl
-Kind = "service-defaults"
-Name = "api"
-EnvoyExtensions = [
-  {
-    Name = "builtin/ext-authz"
-    Arguments = {
-      ProxyType = "connect-proxy"
-      Config = {
-        GrpcService = {
-          Target = {
-            URI = "127.0.0.1:9191"
-          }
-        }
-      }
-    }
-  }
-]
-```
-  
-### Upstream authorization
-
-In the following example, a service defaults configuration entry contains an `ext-authz` configuration. The configuration allows the `api` service to make gRPC authorization requests to a service named `authz`:
-
-```hcl
-Kind = "service-defaults"
-Name = "api"
-EnvoyExtensions = [
-  {
-    Name = "builtin/ext-authz"
-    Arguments = {
-      ProxyType = "connect-proxy"
-      Config = {
-        GrpcService = {
-          Target = {
-            Service = {
-              Name = "authz"
-            }
-          }
-        }
-      }
-    }
-  }
-]
-```
-
-### Authorization requests after service intentions for Consul Enterprise
-
-In the following example for Consul Enterprise, the `api` service is configured to make an HTTP authorization requests to a service named `authz` in the `foo` namespace and `bar` partition. Envoy also inserts the external authorization filter after the `envoy.filters.http.rbac` filter:
-
-```hcl
-Kind = "service-defaults"
-Name = "api"
-Protocol = "http"
-EnvoyExtensions = [
-  {
-    Name = "builtin/ext-authz"
-    Arguments = {
-      ProxyType = "connect-proxy"
-      InsertOptions = {
-        Location   = "AfterLastMatch"
-        FilterName = "envoy.filters.http.rbac"
-      }
-      Config = {
-        HttpService = {
-          Target = {
-            Service = {
-              Name      = "authz"
-              Namespace = "foo"
-              Partition = "bar"
-            }
-          }
-        }
-      }
-    }
-  }
-]
-```
diff --git a/website/content/docs/connect/proxies/envoy-extensions/configuration/otel-access-logging.mdx b/website/content/docs/connect/proxies/envoy-extensions/configuration/otel-access-logging.mdx
deleted file mode 100644
index 9cef3a5636506..0000000000000
--- a/website/content/docs/connect/proxies/envoy-extensions/configuration/otel-access-logging.mdx
+++ /dev/null
@@ -1,390 +0,0 @@
----
-layout: docs
-page_title: OpenTelemetry Access Logging extension configuration reference
-description: Learn how to configure the otel-access-logging Envoy extension, which is a builtin Consul extension that configures Envoy proxies to send access logs to OpenTelemetry collector service.
----
-
-# OpenTelemetry Access Logging extension configuration reference
-
-This topic describes how to configure the OpenTelemetry access logging Envoy extension, which configures Envoy proxies to send access logs to OpenTelemetry collector service. Refer to [Send access logs to OpenTelemetry collector service](/consul/docs/connect/proxies/envoy-extensions/usage/otel-access-logging) for usage information.
-
-## Configuration model
-
-The following list outlines the field hierarchy, data types, and requirements for the OpenTelemetry access logging configuration. Place the configuration inside the `EnvoyExtension.Arguments` field in the proxy defaults or service defaults configuration entry. Refer to the following documentation for additional information:
-
-- [`EnvoyExtensions` in proxy defaults](/consul/docs/connect/config-entries/proxy-defaults#envoyextensions)
-- [`EnvoyExtensions` in service defaults](/consul/docs/connect/config-entries/service-defaults#envoyextensions)
-- [Envoy OpenTelemetry Access Logging Configuration documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/access_loggers/open_telemetry/v3/logs_service.proto#extensions-access-loggers-open-telemetry-v3-opentelemetryaccesslogconfig)
-
-Click on a property name to view additional details, including default values.
-
-- [`Name`](#name): string | required | must be set to `builtin/otel-access-logging` 
-- [`Arguments`](#arguments): map | required
-   - [`ProxyType`](#arguments-proxytype): string | required | `connect-proxy`
-   - [`ListenerType`](#arguments-listenertype): string | required | `inbound`
-   - [`Config`](#arguments-config): map | required
-      - [`LogName`](#arguments-config-logname): string
-      - [`GrpcService`](#arguments-config-grpcservice): map
-        - [`Target`](#arguments-config-grpcservice-target): map | required
-          - [`Service`](#arguments-config-grpcservice-target-service): map
-            - [`Name`](#arguments-config-grpcservice-target-service): string
-            - [`Namespace`](#arguments-config-grpcservice-target-service): string | <EnterpriseAlert inline/>
-            - [`Partition`](#arguments-config-grpcservice-target-service): string | <EnterpriseAlert inline/>
-          - [`URI`](#arguments-config-grpcservice-target-uri): string
-          - [`Timeout`](#arguments-config-grpcservice-target-timeout): string | `1s`
-        - [`Authority`](#arguments-config-grpcservice-authority): string
-        - [`InitialMetadata`](#arguments-config-grpcservice-initialmetadata): list
-          - [`Key`](#arguments-config-grpcservice-initialmetadata): string
-          - [`Value`](#arguments-config-grpcservice-initialmetadata): string
-      - [`BufferFlushInterval`](#arguments-config-bufferflushinterval): string
-      - [`BufferSizeBytes`](#arguments-config-buffersizebytes): number
-      - [`FilterStateObjectsToLog`](#arguments-config-filterstateobjectstolog): list of strings
-      - [`RetryPolicy`](#arguments-config-retrypolicy): map
-        - [`RetryBackOff`](#arguments-config-retrypolicy-retrybackoff): map
-          - [`BaseInterval`](#arguments-config-retrypolicy-retrybackoff): string | `1s`
-          - [`MaxInterval`](#arguments-config-retrypolicy-retrybackoff): string | `30s`
-        - [`NumRetries`](#arguments-config-retrypolicy-numretries): number
-      - [`Body`](#arguments-config-body): string, number, boolean or list of bytes
-      - [`Attributes`](#arguments-config-attributes): map of string to string, number, boolean or list of bytes
-      - [`ResourceAttributes`](#arguments-config-resourceattributes): map of string to string, number, boolean or list of bytes
-
-## Complete configuration
-
-When each field is defined, an `otel-access-logging` configuration has the following form:
-
-```hcl
-Name = "builtin/otel-access-logging" 
-Arguments = {
-   ProxyType = "connect-proxy"
-   ListenerType = "<inbound or outbound>"
-   Config = {
-      LogName = "<user-readable name of the access log>"
-      GrpcService = {
-        Target = {
-            Service = {
-              Name = "<upstream service to send gRPC authorization requests to>"
-              Namespace = "<namespace containing the upstream service>"
-              Partition = "<partition containing the upstream service>"
-            }
-            URI = "<URI of the upstream service>"   
-            Timeout = "1s"
-        }
-        Authority = "<authority header to send in the gRPC request>"     
-        InitialMetadata = [
-            "<Key>" : "<value>"
-        ]
-      }
-      BufferFlushInterval = "1s"
-      BufferSizeBytes = 16384
-      FilterStateObjectsToLog = [
-        "Additional filter state objects to log in filter_state_objects"
-      ]
-      RetryPolicy = {
-        RetryBackOff = {
-            BaseInterval = "1s"
-            MaxInterval = "30s"
-        }
-        NumRetries = <uint32 value specifying the max number of retries>
-      }
-      Body = "Log Request Body"
-      Attributes = {
-         "<Key>" : "<value>"
-      }
-      ResourceAttributes = {
-         "<Key>" : "<value>"
-      }
-```
-
-## Specification
-
-This section provides details about the fields you can configure for the OpenTelemetry Access Logging extension.
-### `Name`
-
-Specifies the name of the extension. Must be set to `builtin/otel-access-logging`.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String value set to `builtin/otel-access-logging`.
-
-### `Arguments`
-
-Contains the global configuration for the extension.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-### `Arguments.ProxyType`
-
-Specifies the type of Envoy proxy that this extension applies to. The extension only applies to proxies that match this type and is ignored for all other proxy types. The only supported value is `connect-proxy`.
-
-#### Values
-
-- Default: `connect-proxy`
-- This field is required.
-- Data type: String
-
-### `Arguments.ListenerType`
-
-Specifies the type of listener the extension applies to. The listener type is either `inbound` or `outbound`. If the listener type is set to `inbound`, Consul applies the extension so the access logging is enabled when other services in the mesh send messages to the service attached to the proxy. If the listener type is set to `outbound`, Consul applies the extension so the access logging is enabled when the attached proxy sends messages to other services in the mesh.
-
-#### Values
-
-- Default: `inbound`
-- This field is required.
-- Data type is one of the following string values:
-  - `inbound`
-  - `outbound`
-
-### `Arguments.Config`
-
-Contains the configuration settings for the extension.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-### `Arguments.Config.LogName`
-
-Specifies the user-readable name of the access log to be returned in `StreamAccessLogsMessage.Identifier`. This allows the access log server to differentiate between different access logs coming from the same Envoy. If you leave it empty, it inherits the value from `ListenerType`.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `Arguments.Config.GrpcService`
-
-Specifies the OpenTelemetry Access Logging configuration for gRPC requests.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-### `Arguments.Config.GrpcService.Target`
-
-Configuration for specifying the service to send gRPC access logging requests to. The `Target` field may contain the following fields:
-
-- [`Service`](#arguments-config-grpcservice-target-service) or [`Uri`](#arguments-config-grpcservice-target-uri)
-- [`Timeout`](#arguments-config-grpcservice-target-timeout)
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-### `Arguments.Config.GrpcService.Target.Service`
-
-Specifies the upstream OpenTelemetry collector service. Configure this field when access logging requests are sent to an upstream service within the service mesh. The service must be configured as an upstream of the service that the filter is applied to.
-
-Configure either the `Service` field or the [`Uri`](#arguments-config-grpcservice-target-uri) field, but not both. 
- 
-#### Values
-
-- Default: None
-- This field or [`Uri`](#arguments-config-grpcservice-target-uri) is required.
-- Data type: Map
-
-The following table describes how to configure parameters for the `Service` field:
-
-| Parameter   | Description                                                                                          | Data type | Default   |
-| ----------- | ---------------------------------------------------------------------------------------------------- | --------- | --------- |
-| `Name`      | Specifies the name of the upstream service.                                                          | String    | None      |
-| `Namespace` | <EnterpriseAlert inline/> Specifies the Consul namespace that the upstream service belongs to.       | String    | `default` |
-| `Partition` | <EnterpriseAlert inline/> Specifies the Consul admin partition that the upstream service belongs to. | String    | `default` |
-
-### `Arguments.Config.GrpcService.Target.Uri`
-
-Specifies the URI of the OpenTelemetry collector service. Configure this field when you must provide an explicit URI to the OpenTelemetry collector service, such as cases in which the access logging service is running on the same host or pod. If set, the value of this field must be one of `localhost:<port>`, `127.0.0.1:<port>`, or `::1:<port>`.
-
-Configure either the `Uri` field or the [`Service`](#arguments-config-grpcservice-target-service) field, but not both. 
- 
-#### Values
-
-- Default: None
-- This field or [`Service`](#arguments-config-grpcservice-target-service) is required.
-- Data type: String
-
-### `Arguments.Config.GrpcService.Target.Timeout`
-
-Specifies the maximum duration that a response can take to arrive upon request.
- 
-#### Values
-
-- Default: `1s`
-- Data type: String
-
-### `Arguments.Config.GrpcService.Authority`
-
-Specifies the authority header to send in the gRPC request. If this field is not set, the authority field is set to the cluster name. This field does not override the SNI that Envoy sends to the OpenTelemetry collector service.
- 
-#### Values
-
-- Default: Cluster name
-- Data type: String
-
-### `Arguments.Config.GrpcService.InitialMetadata`
-
-Specifies additional metadata to include in streams initiated to the `GrpcService`. You can specify metadata for injecting additional ad-hoc authorization headers, for example, `x-foo-bar: baz-key`. For more information, including details on header value syntax, refer to the [Envoy documentation on custom request headers](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_conn_man/headers#config-http-conn-man-headers-custom-request-headers).
- 
-#### Values
-
-- Default: None
-- Data type: List of one or more key-value pairs:
-
-   - KEY: String
-   - VALUE: String
-
-### `Arguments.Config.BufferFlushInterval`
-
-Specifies an interval for flushing access logs to the gRPC stream. The logger flushes requests at the end of every interval or when the log reaches the batch size limit, whichever comes first.
-
-#### Values
-
-- Default: `1s`
-- Data type: String
-
-### `Arguments.Config.BufferSizeBytes`
-
-Specifies the soft size limit in bytes for the access log entries buffer. The logger buffers requests until it reaches this limit or every time the flush interval elapses, whichever comes first. Set this field to `0` to disable batching.
-
-#### Values
-
-- Default: `16384`
-- Data type: Integer
-
-### `Arguments.Config.FilterStateObjectsToLog`
-
-Specifies additional filter state objects to log in `filter_state_objects`. The logger calls `FilterState::Object::serializeAsProto` to serialize the filter state object.
-
-#### Values
-
-- Default: None
-- Data type: List of String
-
-### `Arguments.Config.RetryPolicy`
-
-Defines a policy for retrying requests to the upstream service when fetching the plugin data. The `RetryPolicy` field is a map containing the following parameters:
-
-- [`RetryBackoff`](#pluginconfig-vmconfig-code-remote-retrypolicy)
-- [`NumRetries`](#pluginconfig-vmconfig-code-remote-numretries)
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `Arguments.Config.RetryPolicy.RetryBackOff`
-
-Specifies parameters that control retry backoff strategy. 
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-The following table describes the fields you can specify in the `RetryBackOff` map:
-
-| Parameter      | Description                                                                                                                                                | Data type | Default |
-| -------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | ------- |
-| `BaseInterval` | Specifies the base interval for determining the next backoff computation. Set a value greater than `0` and less than or equal to the `MaxInterval` value.  | String    | `1s`    |
-| `MaxInterval`  | Specifies the maximum interval between retries. Set the value greater than or equal to the `BaseInterval` value.                                           | String    | `10s`   |
-
-### `Arguments.Config.RetryPolicy.NumRetries`
-
-Specifies the number of times Envoy retries to fetch plugin data if the initial attempt is unsuccessful.
-
-#### Values
-
-- Default: `1`
-- Data type: Integer
-
-### `Arguments.Config.Body`
-
-Specifies OpenTelemetry [LogResource](https://github.com/open-telemetry/opentelemetry-proto/blob/main/opentelemetry/proto/logs/v1/logs.proto) fields, following [Envoy access logging formatting](https://www.envoyproxy.io/docs/envoy/latest/configuration/observability/access_log/usage). See ‘body’ in the LogResource proto for more details.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `Arguments.Config.Attributes`
-
-Specifies `attributes` in the [LogResource](https://github.com/open-telemetry/opentelemetry-proto/blob/main/opentelemetry/proto/logs/v1/logs.proto). Refer to `attributes` in the LogResource proto for more details.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `Arguments.Config.ResourceAttributes`
-
-Specifies OpenTelemetry [Resource](https://github.com/open-telemetry/opentelemetry-proto/blob/main/opentelemetry/proto/logs/v1/logs.proto#L51) attributes are filled with Envoy node information.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-## Examples
-
-The following examples demonstrate common configuration patterns for specific use cases.
-
-### OpenTelemetry Access Logging requests to URI
-
-In the following example, a service defaults configuration entry contains an `otel-access-logging` configuration. The configuration allows the `api` service to make gRPC OpenTelemetry Access Logging requests to a service at `localhost:9191`:
-
-```hcl
-Kind = "service-defaults"
-Name = "api"
-EnvoyExtensions = [
-  {
-    Name = "builtin/otel-access-logging"
-    Arguments = {
-      ProxyType = "connect-proxy"
-      Config = {
-        GrpcService = {
-          Target = {
-              URI = "127.0.0.1:9191"
-          }
-        }
-      }
-    }
-  }
-]
-```
-  
-### Upstream OpenTelemetry Access Logging
-
-In the following example, a service defaults configuration entry contains an `otel-access-logging` configuration. The configuration allows the `api` service to make gRPC OpenTelemetry Access Logging requests to a service named `otel-collector`:
-
-```hcl
-Kind = "service-defaults"
-Name = "api"
-EnvoyExtensions = [
-  {
-    Name = "builtin/otel-access-logging"
-    Arguments = {
-      ProxyType = "connect-proxy"
-      Config = {
-        GrpcService = {
-          Target = {
-            Service = {
-              Name = "otel-collector"
-            }
-          }
-        }
-      }
-    }
-  }
-]
-```
diff --git a/website/content/docs/connect/proxies/envoy-extensions/configuration/property-override.mdx b/website/content/docs/connect/proxies/envoy-extensions/configuration/property-override.mdx
deleted file mode 100644
index 610371b303dad..0000000000000
--- a/website/content/docs/connect/proxies/envoy-extensions/configuration/property-override.mdx
+++ /dev/null
@@ -1,280 +0,0 @@
----
-layout: docs
-page_title: Property override configuration reference
-description: Learn how to configure the property-override plugin, which is a builtin Consul plugin that allows you to set and remove Envoy proxy properties.
----
-
-# Property override configuration reference
-
-This topic describes how to configure the `property-override` extension so that you can set and remove individual properties on the Envoy resources Consul generates. Refer to [Configure Envoy proxy properties](/consul/docs/connect/proxies/envoy-extensions/usage/property-override) for usage information.
-
-## Configuration model
-
-The following list outlines the field hierarchy, data types, and requirements for the `property-override` configuration. Place the configuration inside the `EnvoyExtension.Arguments` field in the proxy defaults or service defaults configuration entry. Refer the following documentation for additional information:
-
-- [`EnvoyExtensions` in proxy defaults](/consul/docs/connect/config-entries/proxy-defaults#envoyextensions)
-- [`EnvoyExtensions` in service defaults](/consul/docs/connect/config-entries/service-defaults#envoyextensions)
-
-Click on a property name to view additional details, including default values.
-  
-- [`ProxyType`](#proxytype): string | `connect-proxy`
-- [`Debug`](#debug): bool | `false` 
-- [`Patches`](#patches): list | required
-   - [`ResourceFilter`](#patches-resourcefilter): map         
-      - [`ResourceType`](#patches-resourcefilter-resourcetype): string | required
-      - [`TrafficDirection`](#patches-resourcefilter-trafficdirection): string | required
-      - [`Services`](#patches-resourcefilter-services): list
-         - [`Name`](#patches-resourcefilter-services-name): string
-         - [`Namespace`](#patches-resourcefilter-services-namespace): string | `default` | <EnterpriseAlert inline/>
-         - [`Partition`](#patches-resourcefilter-services-partition): string | `default` | <EnterpriseAlert inline/>
-   - [`Op`](#patches-op): string | required
-   - [`Path`](#patches-path): string | required
-   - [`Value`](#patches-value): map, number, boolean, or string
-
-## Complete configuration
-
-When each field is defined, a `property-override` configuration has the following form:
-
-
-```hcl
-ProxyType = "connect-proxy"
-Debug = false
-Patches = [
-  {
-    ResourceFilter = {
-      ResourceType = "<type of resource>"
-      TrafficDirection = "<inbound or outbound>"
-      Services = [
-        {
-          Name = "<name of service to filter for>"
-          Namespace = "<Consul namespace containing the service>"
-          Partition = "<Consul partition containing the service>"
-        }
-      ]
-    }
-    Op = "<add or remove>"
-    Path = "</path/to/field>"
-    Value = "<values or map of field-values>"
-  }
-]
-```       
-
-## Specification
-
-This section provides details about the fields you can configure for the `property-override` extension.
-
-### `ProxyType`
-
-Specifies the type of Envoy proxy that the extension applies to. The only supported value is `connect-proxy`.
-
-#### Values
-
-- Default: `connect-proxy`
-- Data type: String 
-
-### `Debug`
-
-Enables full debug mode. When `Debug` is set to `true`, all possible fields for the given `ResourceType` and first unmatched segment of `Path` are returned on error. When set to `false`, the error message only includes the first ten possible fields. 
-
-#### Values
-
-- Default: `false`
-- Data type: Boolean
-
-### `Patches[]`
-
-Specifies a list of one or more JSON Patches that map to the Envoy proxy configurations you want to modify. Refer to [IETF RFC 6902](https://datatracker.ietf.org/doc/html/rfc6902/) for information about the JSON Patch specification. 
-
-#### Values
-
-- Default: None
-- The `Patches` parameter is a list of configurations in JSON Patch format. Each patch can contain the following fields:
-   - [`ResourceFilter`](#patches-resourcefilter)
-   - [`Op`](#patches-op)
-   - [`Path`](#patches-path)
-   - [`Value`](#patches-value)
-
-
-### `Patches[].ResourceFilter{}`
-
-Specifies the filter for targeting specific Envoy resources. The `ResourceFilter` configuration is not part of the JSON Patch specification. 
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-The following table describes how to configure a `ResourceFilter`:
-
-| Parameter | Description | Type |
-| ---       | ---         | ---  |
-| `ProxyType` | Specifies the proxy type that the extension applies to. The only supported value is `connect-proxy`. | String |
-| `ResourceType` | Specifies the Envoy resource type that the extension applies to. You can specify one of the following values for each `ResourceFilter`: <ul><li>`cluster`</li><li>`cluster-load-assignment`</li><li>`route`</li><li>`listener`</li></ul> | String |
-| `TrafficDirection` | Specifies the type of traffic that the extension applies to relative to the current proxy. You can specify one of the following values for each `ResourceFilter`: <ul><li>`inbound`: Targets resources for the proxy's inbound traffic.</li> <li>`outbound`: Targets resources for the proxy's upstream services.</li></ul> | String |
-| `Services` | Specifies a list of services to target. Each member of the list has the following fields:<ul><li>`Name`: Specifies the service associated with the traffic.</li><li>`Namespace`: Specifies the Consul Enterprise namespace the service is in.</li><li>`Partition`: Specifies the Consul Enterprise admin partition the service is in.</li> </ul>If `TrafficDirection` is set to `outbound`, upstream services in this field correspond to local Envoy resources that Consul patches at runtime. <p>Do not configure the `Services` field if `TrafficDirection` is set to `inbound`.</p> If this field is not set, Envoy targets all applicable resources. When patching outbound listeners, the patch includes the outbound transparent proxy listener only if `Services` is unset and if the local service is in transparent proxy mode. | List of maps |
-
-### `Patches[].Op`
-
-Specifies the JSON Patch operation to perform when the `ResourceFilter` matches a local Envoy proxy configuration. You can specify one of the following values for each patch:
-
-- `add`: Replaces a property or message specified by [`Path`](#patches-path) with the given value. The JSON Patch `add` operation does not merge objects. To emulate merges, you must configure discrete `add` operations for each changed field. Consul returns an error if the target field does not exist in the corresponding schema.
-- `remove`: Unsets the value of the field specified by [`Path`](#patches-path). If the field is not set, no changes are made. Consul returns an error if the target field does not exist in the corresponding schema.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type is one of the following string values:
-   - `add`
-   - `remove`
-
-### `Patches[].Path`
-
-Specifies where the extension performs the associated operation on the specified resource type. Refer to [`ResourceType`](#patches-resourcefilter) for information about specifying a resource type to target. Refer to [`Op`](#patches-op) for information about setting an operation to perform on the resources. 
-
-The `Path` field does not support addressing array elements or protobuf map field entries. Refer to [Constructing paths](/consul/docs/connect/proxies/envoy-extensions/usage/property-override#constructing-paths) for information about how to construct paths. 
-
-When setting fields, the extension sets any unset intermediate fields to their default values. A single operation on a nested field can set multiple intermediate fields. Because Consul sets the intermediate fields to their default values, you may need to configure subsequent patches to satisfy Envoy or Consul validation. 
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String
-
-### `Patches[].Value{}`
-
-Defines a value to set at the specified [path](#patches-path) if the [operation](#patches-op) is set to `add`. You can specify either a scalar or enum value, an array of scalar or enum values (for repeated fields), or define a map that contains string keys and values corresponding to scalar or enum child fields. Single and repeated scalar and enum values are supported. Refer to the [example configurations](#examples) for additional guidance and to the [Envoy API documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/api) for additional information about Envoy proxy interfaces.
-
-If Envoy specifies a wrapper as the target field type, the extension automatically coerces simple values to the wrapped type when patching. For example, the value `32768` is allowed when targeting a cluster's `per_connection_buffer_limit_bytes`, which is a `UInt32Value` field. Refer to the [protobuf documentation](https://github.com/protocolbuffers/protobuf/blob/main/src/google/protobuf/wrappers.proto) for additional information about wrappers.
-
-#### Values
-
-- Default: None
-- This field is required if [`Op`](#patches-op) is set to `add`, otherwise you must omit the field.
-- This field takes one of the following data types:
-   - scalar
-   - enum
-   - map 
-
-## Examples
-
-The following examples demonstrate patterns that you may be able to model your configurations on.
-
-### Enable `respect_dns_ttl` in a cluster
-
-In the following example, the `add` operation patches the outbound cluster corresponding to the `other-svc` upstream service to enable `respect_dns_ttl`. The `Path` specifies the [Cluster `/respect_dns_ttl`](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/cluster/v3/cluster.proto#envoy-v3-api-field-config-cluster-v3-cluster-respect-dns-ttl) top-level field and `Value` specifies a value of `true`:
-
-```hcl
-Kind = "service-defaults"
-Name = "my-svc"
-Protocol = "http"
-EnvoyExtensions = [
-  {
-    Name = "builtin/property-override",
-    Arguments = {
-      ProxyType = "connect-proxy",
-      Patches = [
-        {
-          ResourceFilter = {
-            ResourceType = "cluster"
-            TrafficDirection = "outbound"
-            Service = {
-              Name = "other-svc"
-            }
-          }
-          Op = "add"
-          Path =  "/respect_dns_ttl"
-          Value = true
-        }
-      ]
-    }
-  }
-]
-```
-
-### Update multiple values in a message field
-
-In the following example, both `ResourceFilter` blocks target the cluster corresponding to the `other-svc` upstream service and modify [Cluster `/outlier_detection`](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/cluster/v3/outlier_detection.proto) properties:
-
-```hcl
-Kind = "service-defaults"
-Name = "my-svc"
-Protocol = "http"
-EnvoyExtensions = [
-  {
-    Name = "builtin/property-override",
-    Arguments = {
-      ProxyType = "connect-proxy",
-      Patches = [
-        {
-          ResourceFilter = {
-            ResourceType = "cluster"
-            TrafficDirection = "outbound"
-            Services = [{
-              Name = "other-svc"
-            }]
-          }
-          Op = "add"
-          Path = "/outlier_detection/max_ejection_time/seconds"
-          Value = 120
-        },
-        {
-          ResourceFilter = {
-            ResourceType = "cluster"
-            TrafficDirection = "outbound"
-            Services = [{
-              Name = "other-svc"
-            }]
-          }
-          Op = "add"
-          Path = "/outlier_detection/max_ejection_time_jitter/seconds"
-          Value = 1
-        }
-      ]
-    }
-  }
-]
-```
-
-The use of `/seconds` in these examples corresponds to the same field in the [google.protobuf.Duration](https://github.com/protocolbuffers/protobuf/blob/main/src/google/protobuf/duration.proto) proto definition, since the extension does not support JSON serialized string forms of common protobuf types (e.g. `120s`).
-
--> **Note:** Using separate patches per field preserves any existing configuration of other fields in `outlier_detection` that may be directly set by Consul, such as [`enforcing_consecutive_5xx`](https://developer.hashicorp.com/consul/docs/connect/proxies/envoy#enforcing_consecutive_5xx).
-
-### Replace a message field
-
-In the following example, a `ResourceFilter` targets the cluster corresponding to the `other-svc` upstream service and _replaces_ the entire map of properties located at `/outlier_detection`, including explicitly set `enforcing_success_rate` and `success_rate_minimum_hosts` properties:
-
-```hcl
-Kind = "service-defaults"
-Name = "my-svc"
-Protocol = "http"
-EnvoyExtensions = [
-  {
-    Name = "builtin/property-override"
-    Arguments = {
-      ProxyType = "connect-proxy"
-      Patches = [
-        {
-          ResourceFilter = {
-            ResourceType = "cluster"
-            TrafficDirection = "outbound"
-            Services = [{
-              Name = "other-svc"
-            }]
-          }
-          Op = "add"
-          Path =  "/outlier_detection"
-          Value = {
-            "enforcing_success_rate" = 80
-            "success_rate_minimum_hosts" = 2
-          }
-        }
-      ]
-    }
-  }
-]
-```
-
-Unlike the previous example, other `/outlier_detection` values set by Consul will _not_ be retained unless they match Envoy's defaults, because the entire value of `/outlier_detection` will be replaced.
diff --git a/website/content/docs/connect/proxies/envoy-extensions/configuration/wasm.mdx b/website/content/docs/connect/proxies/envoy-extensions/configuration/wasm.mdx
deleted file mode 100644
index 6884112aba312..0000000000000
--- a/website/content/docs/connect/proxies/envoy-extensions/configuration/wasm.mdx
+++ /dev/null
@@ -1,484 +0,0 @@
----
-layout: docs
-page_title: WebAssembly extension configuration reference
-description: Learn how to configure the wasm Envoy extension, which is a builtin Consul extension that allows you to run WebAssembly plugins in Envoy proxies.
----
-
-# WebAssembly extension configuration reference
-
-This topic describes how to configure the `wasm` extension, which directs Consul to run WebAssembly (Wasm) plugins in Envoy proxies. Refer to [Run WebAssembly plug-ins in Envoy proxy](/consul/docs/connect/proxies/envoy-extensions/usage/wasm) for usage information.
-
-## Configuration model
-
-The following list outlines the field hierarchy, data types, and requirements for the `wasm` configuration. Place the configuration inside the `EnvoyExtension.Arguments` field in the proxy defaults or service defaults configuration entry. Refer the following documentation for additional information:
-
-- [`EnvoyExtensions` in proxy defaults](/consul/docs/connect/config-entries/proxy-defaults#envoyextensions)
-- [`EnvoyExtensions` in service defaults](/consul/docs/connect/config-entries/service-defaults#envoyextensions)
-
-Click on a property name to view additional details, including default values.
-
-- [`Protocol`](#protocol): string
-- [`ListenerType`](#listenertype): string | required
-- [`ProxyType`](#proxytype): string | `connect-proxy`
-- [`PluginConfig`](#pluginconfig): map | required
-   - [`Name`](#pluginconfig-name): string
-   - [`RootID`](#pluginconfig-rootid): string | required
-   - [`VmConfig`](#pluginconfig-vmconfig): map
-      - [`VmID`](#pluginconfig-vmconfig-vmid): string
-      - [`Runtime`](#pluginconfig-vmconfig): string | `v8`
-      - [`Code`](#pluginconfig-vmconfig-code): map
-         - [`Local`](#pluginconfig-vmconfig-code-local): map
-            - [`Filename`](#pluginconfig-vmconfig-code-local): string
-         - [`Remote`](#pluginconfig-vmconfig-code-remote): map
-            - [`HttpURI`](#pluginconfig-vmconfig-code-remote-httpuri): map
-               - [`Service`](#pluginconfig-vmconfig-code-remote-httpuri-service): map
-                  - [`Name`](#pluginconfig-vmconfig-code-remote-httpuri-service): string
-                  - [`Namespace`](#pluginconfig-vmconfig-code-remote-httpuri-service): string
-                  - [`Partition`](#pluginconfig-vmconfig-code-remote-httpuri-service): string
-               - [`URI`](#pluginconfig-vmconfig-code-remote-httpuri-uri): string
-               - [`Timeout`](#pluginconfig-vmconfig-code-remote-httpuri-timeout): string
-            - [`SHA256`](#pluginconfig-vmconfig-code-remote-sha256): string
-            - [`RetryPolicy`](#pluginconfig-vmconfig-code-remote-retrypolicy): map
-               - [`RetryBackOff`](#pluginconfig-vmconfig-code-remote-retrypolicy-retrybackoff): map
-                  - [`BaseInterval`](#pluginconfig-vmconfig-code-remote-retrypolicy-retrybackoff): string
-                  - [`MaxInterval`](#pluginconfig-vmconfig-code-remote-retrypolicy-retrybackoff): string
-               - [`NumRetries`](#pluginconfig-vmconfig-code-remote-retrypolicy-numretries): number | `-1`
-      - [`Configuration`](#pluginconfig-vmconfig-configuration): string
-      - [`EnvironmentVariables`](#pluginconfig-vmconfig-environmentvariables): map
-         - [`HostEnvKeys`](#pluginconfig-vmconfig-environmentvariables-hostenvkeys): list of strings
-         - [`KeyValues`](#pluginconfig-vmconfig-environmentvariables-keyvalues): map
-   - [`Configuration`](#pluginconfig-configuration): string
-   - [`CapabilityRestrictionConfiguration`](#pluginconfig-vmconfig-capabilityrestrictionconfiguration): map
-      - [`AllowedCapabilities`](#pluginconfig-vmconfig-capabilityrestrictionconfiguration): map of strings
-
-## Complete configuration
-
-When all parameters are set for the extension, the configuration has the following form:
-
-```hcl
-Protocol = "<tcp or http>"
-ListenerType = "<inbound or outbound>"
-ProxyType = "connect-proxy"
-PluginConfig = {
-   Name = "<name for the filter>"
-   RootID = "<ID for the set of filters on a VM>"
-   VmConfig = {
-      VmID = "<ID of the VM>"
-      Runtime = "v8"
-      Code = {
-         Local = {      # Set either `Local` or `Remote', not both
-            Filename = "</path/to/plugin>"
-         }
-         Remote = {     # Set either `Local` or `Remote', not both
-            HttpURI =  {
-               Service = {
-                  Name = "<name of the upstream service>"
-                  Namespace = "<Consul namespace containing the upstream service>"
-                  Partition = "<Consul partition containing the upstream service>"
-               }
-               URI = "<URI of the plugin data>"
-               Timeout = "1s"
-            SHA256 = "<SHA256 for verifying the remote data>"
-            RetryPolicy = {
-                  RetryBackOff = {
-                     BaseInterval = "1s"
-                     MaxInterval = "10s"
-                  }
-                  NumRetries = -1
-               }
-            }
-      Configuration = "<configuration passed to plugin on VM startup>"
-      EnvironmentVariables = {
-         HostEnvKeys = [
-            <"keys">
-         ]
-         KeyValues = {
-            [
-               <"key = value">
-            ]
-         }
-      }
-   Configuration = "<configuration passed to plugin on plugin startup>"
-   CapabilityRestrictionConfiguration = {
-      AllowedCapabilities = {
-         "fd_read"        = {}
-         "fd_seek"        = {}
-         "environ_get"    = {}
-         "clock_get_time" = {}
-      }
-   }
-}
-```
-
-## Specification
-
-This section provides details about the fields you can configure for the `wasm` extension.
-
-### `Protocol`
-
-Specifies the type of Wasm filter to apply. You can set either `tcp` or `http`. Set the `Protocol` to the protocol that the Wasm plugin implements when loaded by the filter. For Consul to apply the filter, the protocol must match the service's protocol.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type is one of the following string values:
-  - `tcp`
-  - `http`
-
-### `ListenerType`
-
-Specifies the type of listener the extension applies to. The listener type is either `inbound` or `outbound`. If the listener type is set to `inbound`, Consul applies the extension so the Wasm plugin is run when other services in the mesh send messages to the service attached to the proxy. If the listener type is set to `outbound`, Consul applies the extension so the Wasm plugin is run when the attached proxy sends messages to other services in the mesh.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type is one of the following string values:
-  - `inbound`
-  - `outbound`
-
-### `ProxyType`
-
-Specifies the type of Envoy proxy that the extension applies to. The only supported value is `connect-proxy`.
-
-#### Values
-
-- Default: `connect-proxy`
-- This field is required.
-- Data type: String
-
-### `PluginConfig{}`
-
-Map containing the following configuration parameters for your Wasm plugin:
-
-- [`Name`](#pluginconfig-name)
-- [`RootID`](#pluginconfig-rootid)
-- [`VmConfig`](#pluginconfig-vmconfig)
-- [`Configuration`](#pluginconfig-configuration)
-- [`CapabilitiesRestrictionConfiguration`](#pluginconfig-capabilitiesrestrictionconfiguration)
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: Map
-
-### `PluginConfig{}.Name`
-
-Specifies a unique name for a filter in a VM. Envoy uses the name to identify specific filters if multiple filters are processed on a VM with the same `VmID` and `RootID`. The name also appears in logs for debugging purposes.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `PluginConfig{}.RootID`
-
-Specifies a unique ID for a set of filters in a VM that share a `RootContext` and `Contexts`, such as a Wasm `HttpFilter` and a Wasm `AccessLog`, if applicable. All filters with the same `RootID` and `VmID` share `Context`s.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `PluginConfig{}.VmConfig{}`
-
-Map containing the following configuration parameters for the VM that runs your Wasm plugin:
-
-- [`VmID`](#pluginconfig-vmconfig-vmid)
-- [`Runtime`](#pluginconfig-vmconfig-runtime)
-- [`Code`](#pluginconfig-vmconfig-code)
-- [`Configuration`](#pluginconfig-vmconfig-configuration)
-- [`EnvironmentVariables`](#pluginconfig-vmconfig-environmentvariables)
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `PluginConfig{}.VmConfig{}.VmID`
-
-Specifies an ID that Envoy uses with a hash of the Wasm code to determine which VM runs the plugin. All plugins with the same `VmID` and `Code` use the same VM. If unspecified, all plugins with the same code run in the same VM.  Sharing a VM between plugins may have security implications, but can reduce memory utilization and can make data sharing easier.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `PluginConfig{}.VmConfig{}.Runtime`
-
-Specifies the type of Wasm runtime.
-#### Values
-
-- Default: `v8`
-- Data type is one of the following string values:
-  - `v8`
-  - `wastime`
-  - `wamr`
-  - `wavm`
-
-### `PluginConfig{}.VmConfig{}.Code{}`
-
-Map containing one of the following configuration parameters:
-
-- [`Local`](#pluginconfig-vmconfig-code-local)
-- [`Remote`](#pluginconfig-vmconfig-code-local)
-
-You can configure either `Local` or `Remote`, but not both. The `Code` block instructs Consul how to find the Wasm plugin code for Envoy to execute.
-
-#### Values
-
-- Default: None
-- This field is  required.
-- Data type is a map containing one of the following configurations:
-  - [`Local`](#pluginconfig-vmconfig-code-local)
-  - [`Remote`](#pluginconfig-vmconfig-code-local)
-
-### `PluginConfig{}.VmConfig{}.Code{}.Local{}`
-
-Instructs Envoy to load the plugin code from a local volume. Do not configure the `Local` parameter if the plugin code is on a remote server.
-
-The `Local` field is a map that contains a `Filename` parameter. The `Filename` parameter takes a string value that specifies the path to the plugin on the local file system.
-
-Local plug-ins are not supported in Kubernetes-orchestrated environments.
-
-#### Values
-
-- Default: None
-- Data type is a map containing the `Filename` parameter. The `Filename` parameter takes a string value that specifies the path to the plugin on the local file system.
-
-### `PluginConfig{}.VmConfig{}.Code{}.Remote{}`
-
-Instructs Envoy to load the plugin code from a remote server. Do not configure the `Remote` parameter if the plugin code is on the local VM.
-
-The `Remote` field is a map containing the following parameters:
-
-- [`HttpURI`](#pluginconfig-vmconfig-code-remote-httpuri)
-- [`SHA256`](#pluginconfig-vmconfig-code-remote-sha256)
-- [`RetryPolicy`](#pluginconfig-vmconfig-code-remote-retrypolicy)
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `PluginConfig{}.VmConfig{}.Code{}.Remote{}.HttpURI{}`
-
-Specifies the configuration for fetching the remote data. The `HttpURI` field is a map containing the following parameters:
-
-- [`Service`](#pluginconfig-vmconfig-code-remote-httpuri-service)
-- [`URI`](#pluginconfig-vmconfig-code-remote-httpuri-uri)
-- [`Timeout`](#pluginconfig-vmconfig-code-remote-httpuri-uri)
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-### `PluginConfig{}.VmConfig{}.Code{}.Remote{}.HttpURI{}.Service`
-
-Specifies the upstream service to fetch the remote plugin from.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-The following table describes the fields you can specify in the `Service` map:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `Name` | Specifies the name of the upstream service. | String | None |
-| `Namespace` | <EnterpriseAlert inline/> Specifies the Consul namespace that the upstream service belongs to. | String | `default` |
-| `Partition` | <EnterpriseAlert inline/> Specifies the Consul admin partition that the upstream service belongs to. | String | `default` |
-
-### `PluginConfig{}.VmConfig{}.Code{}.Remote{}.HttpURI{}.URI`
-
-Specifies the URI Envoy uses to fetch the plugin file from the upstream. This field is required for Envoy to retrieve plugin code from a remote location. You must specify the fully-qualified domain name (FQDN) of the remote URI, which includes the protocol, host, and path.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String value that specifies a FQDN
-
-### `PluginConfig{}.VmConfig{}.Code{}.Remote{}.HttpURI{}.Timeout`
-
-Specifies the maximum duration that a response can take to complete the request for the plugin data.
-
-#### Values
-
-- Default: `1s`
-- Data type: String
-
-### `PluginConfig{}.VmConfig{}.Code{}.Remote{}.SHA256`
-
-Specifies the required SHA256 string for verifying the remote data.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String
-
-### `PluginConfig{}.VmConfig{}.Code{}.Remote{}.RetryPolicy{}`
-
-Defines a policy for retrying requests to the upstream service when fetching the plugin data. The `RetryPolicy` field is a map containing the following parameters:
-
-- [`RetryBackoff`](#pluginconfig-vmconfig-code-remote-retrypolicy)
-- [`NumRetries`](#pluginconfig-vmconfig-code-remote-numretries)
-
-#### Values
-
-- Default: None
-- Data type: Map
-### `PluginConfig{}.VmConfig{}.Code{}.Remote{}.RetryPolicy{}.RetryBackOff{}`
-
-Specifies parameters that control retry backoff strategy.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-The following table describes the fields you can specify in the `RetryBackOff` map:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `BaseInterval` | Specifies the base interval for determining the next backoff computation. Set a value greater than `0` and less than or equal to the `MaxInterval` value.  | String | `1s` |
-| `MaxInterval` | Specifies the maximum interval between retries. Set the value greater than or equal to the `BaseInterval` value. | String | `10s` |
-
-### `PluginConfig{}.VmConfig{}.Code{}.Remote{}.RetryPolicy{}.NumRetries`
-
-Specifies the number of times Envoy retries to fetch plugin data if the initial attempt is unsuccessful.
-
-#### Values
-
-- Default: `1`
-- Data type: Integer
-
-### `PluginConfig{}.VmConfig{}.Configuration`
-
-Specifies the configuration Envoy encodes as bytes and passes to the plugin during VM startup. Refer to [`proxy_on_vm_start` in the Proxy Wasm ABI documentation](https://github.com/proxy-wasm/spec/tree/cefc2cbab70eaba2c187523dff0b38fce2f90771/abi-versions/vNEXT#proxy_on_vm_start) for additional information.
-
-#### Values
-
-- Default: None
-- This field is required.
-- Data type: String
-
-### `PluginConfig{}.VmConfig{}.EnvironmentVariables{}`
-
-Specifies environment variables for Envoy to inject into this VM so that they are available through WASI's `environ_get` and `environ_get_sizes` system calls.
-
-In most cases, WASI calls the functions implicitly in your language's standard library. As a result, you do not need to call them directly. You can also access environment variables as you would on native platforms.
-
-Envoy rejects the configuration if there is a key space conflict.
-
-The `EnvironmentVariables` field is a map containing parameters for setting the keys and values.
-
-#### Values
-
-- Default: None
-- Data type: Map
-
-The following table describes the parameters contained in the `EnvironmentVariables` map:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `HostEnvKeys` | Specifies a list of Envoy environment variable keys to expose to the VM. If a key exists in Envoy's environment variables, then the key-value pair is injected. Envoy ignores `HostEnvKeys` that do not exist in its environment variables. | List | None |
-| `KeyValues` | Specifies a map of explicit key-value pairs to inject into the VM. | <nobr>Map of </nobr>string keys and values | None |
-
-### `PluginConfig{}.Configuration`
-
-Specifies the configuration Consul encodes as bytes and passes to the plugin during plugin startup. Refer to [`proxy_on_configure` in the Envoy documentation](https://github.com/proxy-wasm/spec/tree/cefc2cbab70eaba2c187523dff0b38fce2f90771/abi-versions/vNEXT#proxy_on_configure) for additional information.
-
-#### Values
-
-- Default: None
-- Data type: String
-
-### `PluginConfig{}.CapabilityRestrictionConfiguration{}`
-
-Specifies a configuration for restricting the proxy-Wasm capabilities that are available to the module.
-
-The `CapabilityRestrictionConfiguration` field is a map that contains a `AllowedCapabilities` parameter. The `AllowedCapabilities` parameter takes a map of string values that correspond to Envoy capability names. Refer to the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/wasm/v3/wasm.proto#extensions-wasm-v3-capabilityrestrictionconfig) for additional information.
-
-!> **Security warning**: Consul ignores the value that each capability maps to. You can leave the `AllowedCapabilities` empty to allow all capabilities, but doing so gives the configured plugin full unrestricted access to the runtime API provided by the Wasm VM. You must set this to a non-empty map if you want to restrict access to specific capabilities provided by the Wasm runtime API.
-
-#### Values
-
-- Default: `""`
-- Data type is a map containing the `AllowedCapabilities` parameter. The `AllowedCapabilities` parameter takes a map of string values that correspond to Envoy capability names. Refer to the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/wasm/v3/wasm.proto#extensions-wasm-v3-capabilityrestrictionconfig) for additional information.
-
-## Examples
-
-The following examples demonstrate patterns that you may be able to model your configurations on.
-
-### Run a Wasm plugin from a local file
-
-In the following example, Consul figures the Envoy proxy for the `db` service with an inbound TCP Wasm filter that uses the plugin code from the local `/consul/extensions/sqli.wasm` file.
-
-```hcl
-
-Kind = "service-defaults"
-Name = "db"
-Protocol = "tcp"
-EnvoyExtensions = [
-  {
-    Name      = "builtin/wasm"
-    Required  = true
-    Arguments = {
-      Protocol = "tcp"
-      ListenerType = "inbound"
-      PluginConfig = {
-        VmConfig = {
-          Code = {
-            Local = {
-              Filename = "file:///consul/extensions/sqli.wasm"
-            }
-          }
-        }
-        Configuration = <<EOF
-{
-  "key": "value"
-}
-EOF
-      }
-    }
-  }
-]
-```
-
-### Run a Wasm plugin from a remote file
-
-In the following example, Consul configures the Envoy proxy for all HTTP services with an HTTP Wasm filter. The filter uses the plugin code from a remote `https://extension-server/waf.wasm` file. The Envoy proxy for each service fetches the remote file and verify the SHA256 checksum. The proxy times if Consul cannot fetch the remote plugin after three seconds.
-
-```hcl
-Kind   = "proxy-defaults"
-Name   = "global"
-EnvoyExtensions = [
-  {
-    Name      = "builtin/wasm"
-    Arguments = {
-      Protocol = "http"
-      ListenerType = "inbound"
-      PluginConfig = {
-        VmConfig = {
-          Code = {
-            Remote = {
-              HttpURI = {
-                URI     = "https://extension-server/waf.wasm"
-                Timeout = "3s"
-              }
-              SHA256 = "ef57657e..."
-            }
-          }
-        }
-        Configuration = "..."
-      }
-    }
-  }
-]
-```
diff --git a/website/content/docs/connect/proxies/envoy-extensions/index.mdx b/website/content/docs/connect/proxies/envoy-extensions/index.mdx
index 79f1dbb1f37db..ecd9e63e07402 100644
--- a/website/content/docs/connect/proxies/envoy-extensions/index.mdx
+++ b/website/content/docs/connect/proxies/envoy-extensions/index.mdx
@@ -2,7 +2,7 @@
 layout: docs
 page_title: Envoy Extensions
 description: >-
-  Learn how Envoy extensions enables you to add support for additional Envoy features without modifying the Consul codebase.
+  Learn how Envoy extensions enables you to add support for additional Envoy features without modifying the Consul codebase. 
 ---
 
 # Envoy extensions overview
@@ -15,38 +15,17 @@ Consul supports two methods for modifying Envoy behavior. You can either modify
 
 Instead of modifying Consul code, you can configure your services to use Envoy extensions through the `EnvoyExtensions` field. This field is definable in [`proxy-defaults`](/consul/docs/connect/config-entries/proxy-defaults#envoyextensions) and [`service-defaults`](/consul/docs/connect/config-entries/service-defaults#envoyextensions) configuration entries.
 
-
 ## Supported extensions
 
-Envoy extensions enable additional service mesh functionality in Consul by changing how the sidecar proxies behave. Extensions dynamically modify the configuration of Envoy proxies based on Consul configuration entries, enabling a wider set of use cases for the service mesh  traffic that passes through an Envoy proxy. Consul supports the following extensions:
+Envoy extensions enable additional service mesh functionality in Consul by changing how the sidecar proxies behave. Extensions invoke custom code when traffic passes through an Envoy proxy. Consul supports the following extensions:
 
-- External authorization
 - Lua
 - Lambda
-- OpenTelemetry Access Logging
-- Property override
-- WebAssembly (Wasm)
-
-### External authorization
-
-The `ext-authz` extension lets you configure external authorization filters for Envoy proxy so that you can route requests to external authorization systems. Refer to the [external authorization documentation](/consul/docs/connect/proxies/envoy-extensions/usage/ext-authz) for more information.
-
-### Lambda
-
-The `lambda` Envoy extension enables services to make requests to AWS Lambda functions through the mesh as if they are a normal part of the Consul catalog. Refer to the [Lambda extension documentation](/consul/docs/connect/proxies/envoy-extensions/usage/lambda) for more information.
 
 ### Lua
 
-The `lua` Envoy extension enables HTTP Lua filters in your Consul Envoy proxies. It allows you to run Lua scripts during Envoy requests and responses from Consul-generated Envoy resources. Refer to the [Lua extension documentation](/consul/docs/connect/proxies/envoy-extensions/usage/lua) for more information.
+The `lua` Envoy extension enables HTTP Lua filters in your Consul Envoy proxies. It allows you to run Lua scripts during Envoy requests and responses from Consul-generated Envoy resources. Refer to the [`lua`](/consul/docs/connect/proxies/envoy-extensions/usage/lua) documentation for more information.
 
-### OpenTelemetry Access Logging
-
-The `otel-access-logging` Envoy extension lets you configure Envoy proxies to send access logs to OpenTelemetry collector service. Refer to the [OpenTelemetry Access Logging extension documentation](/consul/docs/connect/proxies/envoy-extensions/usage/otel-access-logging) for more information.
-
-### Property override
-
-The `property-override` extension lets you set and unset individual properties on the Envoy resources that Consul generates. Use the extension instead of [escape-hatch overrides](/consul/docs/connect/proxies/envoy#escape-hatch-overrides) to enable advanced Envoy configuration. Refer to the [property override documentation](/consul/docs/connect/proxies/envoy-extensions/usage/property-override) for more information.
-
-### WebAssembly
+### Lambda
 
-The `wasm` extension enables you to configure TCP and HTTP filters that invoke custom WebAssembly (Wasm) plugins. Refer to the [WebAssembly extension documentation](/consul/docs/connect/proxies/envoy-extensions/usage/wasm) for more information.
+The `lambda` Envoy extension enables services to make requests to AWS Lambda functions through the mesh as if they are a normal part of the Consul catalog. Refer to the [`lambda`](/consul/docs/connect/proxies/envoy-extensions/usage/lambda) documentation for more information.
diff --git a/website/content/docs/connect/proxies/envoy-extensions/usage/apigee-ext-authz.mdx b/website/content/docs/connect/proxies/envoy-extensions/usage/apigee-ext-authz.mdx
deleted file mode 100644
index a0492de0b246d..0000000000000
--- a/website/content/docs/connect/proxies/envoy-extensions/usage/apigee-ext-authz.mdx
+++ /dev/null
@@ -1,199 +0,0 @@
----
-layout: docs
-page_title: Delegate authorization to Apigee
-description: Learn how to use the `ext-authz` Envoy extension to delegate data plane authorization requests to Apigee. 
----
-
-# Delegate authorization to Apigee
-
-This topic describes how to use the external authorization Envoy extension to delegate data plane authorization requests to Apigee.
-
-For more detailed guidance, refer to the [`learn-consul-apigee-external-authz` repo](https://github.com/hashicorp-education/learn-consul-apigee-external-authz) on GitHub.
-
-## Workflow
-
-Complete the following steps to use the external authorization extension with Apigee:
-
-1. Deploy the Apigee Adapter for Envoy and register the service in Consul.
-1. Configure the `EnvoyExtensions` block in a service defaults or proxy defaults configuration entry.
-1. Apply the configuration entry.
-
-## Deploy the Apigee Adapter for Envoy
-
-The [Apigee Adapter for Envoy](https://cloud.google.com/apigee/docs/api-platform/envoy-adapter/v2.0.x/concepts) is an Apigee-managed API gateway that uses Envoy to proxy API traffic.
-
-To download and install Apigee Adapter for Envoy, refer to the [getting started documentation](https://cloud.google.com/apigee/docs/api-platform/envoy-adapter/v2.0.x/getting-started) or follow along with the [`learn-consul-apigee-external-authz` repo](https://github.com/hashicorp-education/learn-consul-apigee-external-authz) on GitHub.
-
-After you deploy the service in your desired runtime, create a service defaults configuration entry for the service's gRPC protocol.
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
-<CodeBlockConfig filename="apigee-remote-service-envoy.hcl">
-
-```hcl
-Kind = "service-defaults"
-Name = "apigee-remote-service-envoy"
-Protocol = "grpc"
-```
-</CodeBlockConfig>
-</Tab>
-<Tab heading="JSON" group="json">
-<CodeBlockConfig filename="apigee-remote-service-envoy.json">
-
-```json
-{
-  "kind": "service-defaults",
-  "name": "apigee-remote-service-envoy",
-  "protocol": "grpc"
-}
-```
-
-</CodeBlockConfig>
-</Tab>
-<Tab heading="YAML" group="yaml">
-<CodeBlockConfig filename="apigee-remote-service-envoy.yaml">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceDefaults
-metadata:
-  name: apigee-remote-service-envoy
-  namespace: apigee
-spec:
-  protocol: grpc
-```
-</CodeBlockConfig>
-</Tab>
-</Tabs>
-
-## Configure the `EnvoyExtensions`
-
-Add Envoy extension configurations to a proxy defaults or service defaults configuration entry. Place the extension configuration in an `EnvoyExtensions` block in the configuration entry.
-
-- When you configure Envoy extensions on proxy defaults, they apply to every service.
-- When you configure Envoy extensions on service defaults, they apply to all instances of a service with that name.
-
-<Warning>
-  Adding Envoy extensions default proxy configurations may have unintended consequences. We recommend configuring `EnvoyExtensions` in service defaults configuration entries in most cases.
-</Warning>
-
-Consul applies Envoy extensions configured in proxy defaults before it applies extensions in service defaults. As a result, the Envoy extension configuration in service defaults may override configurations in proxy defaults.
-
-The following example configures the default behavior for all services named `api` so that the Envoy proxies running as sidecars for those service instances target the apigee-remote-service-envoy service for gRPC authorization requests:
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
-<CodeBlockConfig filename="api-auth-service-defaults.hcl">
-
-```hcl
-Kind = "service-defaults"
-Name = "api"
-EnvoyExtensions = [
-  {
-    Name = "builtin/ext-authz"
-    Arguments = {
-      ProxyType = "connect-proxy"
-      Config = {
-        GrpcService = {
-          Target = {
-            Service = {
-              Name = "apigee-remote-service-envoy"
-            }
-          }
-        }
-      }
-    }
-  }
-]
-```
-</CodeBlockConfig>
-</Tab>
-
-<Tab heading="JSON" group="json">
-<CodeBlockConfig filename="api-auth-service-defaults.json">
-
-```json
-{
-  "Kind": "service-defaults",
-  "Name": "api",
-  "EnvoyExtensions": [{
-    "Name": "builtin/ext-authz",
-    "Arguments": {
-      "ProxyType": "connect-proxy",
-      "Config": {
-        "GrpcService": {
-          "Target": {
-            "Service": {
-              "Name": "apigee-remote-service-envoy"
-              }
-            }
-          }
-        }
-      }
-    }
-  ]
-}
-```
-
-</CodeBlockConfig>
-</Tab>
-
-<Tab heading="YAML" group="yaml">
-<CodeBlockConfig filename="api-auth-service-defaults.yaml">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceDefaults
-metadata:
-  name: api
-  namespace: default
-spec:
-  envoyExtensions:
-  - name: builtin/ext-authz
-    arguments:
-      proxyType: connect-proxy
-      config:
-        grpcService:
-          target:
-            service:
-              name: apigee-remote-service-envoy
-              namespace: apigee
-```
-</CodeBlockConfig>
-</Tab>
-</Tabs>
-
-Refer to the [external authorization extension configuration reference](/consul/docs/connect/proxies/envoy-extensions/configuration/ext-authz) for details on how to configure the extension. 
-
-Refer to the [proxy defaults configuration entry reference](/consul/docs/connect/config-entries/proxy-defaults) and [service defaults configuration entry reference](/consul/docs/connect/config-entries/service-defaults) for details on how to define the configuration entries. 
-
-## Apply the configuration entry
-
-On the CLI, you can use the `consul config write` command and specify the names of the configuration entries to apply them to Consul. For Kubernetes-orchestrated networks, use the `kubectl apply` command to update the relevant CRD.
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
-
-```shell-session
-$ consul config write apigee-remote-service-envoy.hcl
-$ consul config write api-auth-service-defaults.hcl
-```
-
-</Tab>
-<Tab heading="JSON" group="json">
-
-```shell-session
-$ consul config write apigee-remote-service-envoy.json
-$ consul config write api-auth-service-defaults.json
-```
-
-</Tab>
-<Tab heading="YAML" group="yaml">
-
-```shell-session
-$ kubectl apply -f apigee-remote-service-envoy.yaml
-$ kubectl apply -f api-auth-service-defaults.yaml
-```
-
-</Tab>
-</Tabs>
diff --git a/website/content/docs/connect/proxies/envoy-extensions/usage/ext-authz.mdx b/website/content/docs/connect/proxies/envoy-extensions/usage/ext-authz.mdx
deleted file mode 100644
index 51a004c17b32e..0000000000000
--- a/website/content/docs/connect/proxies/envoy-extensions/usage/ext-authz.mdx
+++ /dev/null
@@ -1,153 +0,0 @@
----
-layout: docs
-page_title: Delegate authorization to an external service
-description: Learn how to use the `ext-authz` Envoy extension to delegate data plane authorization requests to external systems. 
----
-
-# Delegate authorization to an external service
-
-This topic describes how to use the external authorization Envoy extension to delegate data plane authorization requests to external systems. 
-
-## Workflow
-
-Complete the following steps to use the external authorization extension:
-
-1. Configure an `EnvoyExtensions` block in a service defaults or proxy defaults configuration entry. 
-1. Apply the configuration entry.
-
-## Add the `EnvoyExtensions`
-
-Add Envoy extension configurations to a proxy defaults or service defaults configuration entry. Place the extension configuration in an `EnvoyExtensions` block in the configuration entry.
-
-- When you configure Envoy extensions on proxy defaults, they apply to every service.
-- When you configure Envoy extensions on service defaults, they apply to a specific service.
-
-Consul applies Envoy extensions configured in proxy defaults before it applies extensions in service defaults. As a result, the Envoy extension configuration in service defaults may  override configurations in proxy defaults.
-
-The following example shows a service defaults configuration entry for the `api` service that directs the Envoy proxy to make gRPC authorization requests to the `authz` service:
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
-<CodeBlockConfig filename="api-auth-service-defaults.hcl">
-
-```hcl
-Kind = "service-defaults"
-Name = "api"
-EnvoyExtensions = [
-  {
-    Name = "builtin/ext-authz"
-    Arguments = {
-      ProxyType = "connect-proxy"
-      Config = {
-        GrpcService = {
-          Target = {
-            Service = {
-              Name = "authz"
-            }
-          }
-        }
-      }
-    }
-  }
-]
-```
-</CodeBlockConfig>
-</Tab>
-<Tab heading="JSON" group="json">
-<CodeBlockConfig filename="api-auth-service-defaults.json">
-
-```json
-{
-  "Kind": "service-defaults",
-  "Name": "api",
-  "EnvoyExtensions": [{
-    "Name": "builtin/ext-authz",
-    "Arguments": {
-      "ProxyType": "connect-proxy",
-      "Config": {
-        "GrpcService": {
-          "Target": {
-            "Service": {
-              "Name": "authz"
-              }
-            }
-          }
-        }
-      }
-    }
-  ]
-}
-```
-
-</CodeBlockConfig>
-</Tab>
-<Tab heading="Kubernetes" group="yaml">
-<CodeBlockConfig filename="api-auth-service-defaults.yaml">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceDefaults
-metadata:
-  name: api
-  namespace: default
-spec:
-  envoyExtensions:
-  - name: builtin/ext-authz
-    arguments:
-      proxyType: connect-proxy
-      config:
-        grpcService:
-          target:
-            service:
-              name: authz
-              namespace: authz
-```
-</CodeBlockConfig>
-</Tab>
-</Tabs>
-
-Refer to the [external authorization extension configuration reference](/consul/docs/connect/proxies/envoy-extensions/configuration/ext-authz) for details on how to configure the extension. 
-
-Refer to the [proxy defaults configuration entry reference](/consul/docs/connect/config-entries/proxy-defaults) and [service defaults configuration entry reference](/consul/docs/connect/config-entries/service-defaults) for details on how to define the configuration entries. 
-
-!> **Warning:** Adding Envoy extensions default proxy configurations may have unintended consequences. We recommend configuring `EnvoyExtensions` in service defaults configuration entries in most cases.
-
-### Unsupported Envoy configuration fields
-
-The following Envoy configurations are not supported:
-
-| Configuration | Workaround |
-| --- | --- |
-| `deny_at_disable` | Disable filter by removing it from the service’s configuration in the configuration entry. |
-| `failure_mode_allow` | Set the `EnvoyExtension.Required` field to `true` in the [service defaults configuration entry](/consul/docs/connect/config-entries/service-defaults#envoyextensions) or [proxy defaults configuration entry](/consul/docs/connect/config-entries/proxy-defaults#envoyextensions). |
-| `filter_enabled` | Set the `EnvoyExtension.Required` field to `true` in the [service defaults configuration entry](/consul/docs/connect/config-entries/service-defaults#envoyextensions) or [proxy defaults configuration entry](/consul/docs/connect/config-entries/proxy-defaults#envoyextensions). |
-| `filter_enabled_metadata` | Set the `EnvoyExtension.Required` field to `true` in the [service defaults configuration entry](/consul/docs/connect/config-entries/service-defaults#envoyextensions) or [proxy defaults configuration entry](/consul/docs/connect/config-entries/proxy-defaults#envoyextensions). |
-| `transport_api_version` | Consul only supports v3 of the transport API. As a result, there is no workaround for implementing the behavior of this field. |
-
-## Apply the configuration entry
-
-If your network is deployed to virtual machines, use the `consul config write` command and specify the proxy defaults or service defaults configuration entry to apply the configuration. For Kubernetes-orchestrated networks, use the `kubectl apply` command. The following example applies the extension in a proxy defaults configuration entry.
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
-
-```shell-session
-$ consul config write api-auth-service-defaults.hcl
-```
-
-</Tab>
-<Tab heading="JSON" group="json">
-
-```shell-session
-$ consul config write api-auth-service-defaults.json
-```
-
-</Tab>
-<Tab heading="Kubernetes" group="kubernetes">
-
-```shell-session
-$ kubectl apply -f api-auth-service-defaults.yaml
-```
-
-</Tab>
-</Tabs>
diff --git a/website/content/docs/connect/proxies/envoy-extensions/usage/lambda.mdx b/website/content/docs/connect/proxies/envoy-extensions/usage/lambda.mdx
index c06bf3bd220c8..ce1554641969c 100644
--- a/website/content/docs/connect/proxies/envoy-extensions/usage/lambda.mdx
+++ b/website/content/docs/connect/proxies/envoy-extensions/usage/lambda.mdx
@@ -21,7 +21,7 @@ The Lambda Envoy extension has the following arguments:
 | `InvocationMode`     | Determines if Consul configures the Lambda to be invoked using the synchronous or asynchronous [invocation mode](https://docs.aws.amazon.com/lambda/latest/operatorguide/invocation-modes.html). |
 | `PayloadPassthrough` | Determines if the body Envoy receives is converted to JSON or directly passed to Lambda.         |
 
-Be aware  that unlike [manual lambda registration](/consul/docs/lambda/registration/manual#supported-meta-fields), region is  inferred from the ARN when specified through an Envoy extension.
+Be aware that unlike [manual lambda registration](/consul/docs/lambda/registration/manual#supported-meta-fields), region is  inferred from the ARN when specified through an Envoy extension.
 
 ## Workflow
 
diff --git a/website/content/docs/connect/proxies/envoy-extensions/usage/lua.mdx b/website/content/docs/connect/proxies/envoy-extensions/usage/lua.mdx
index 5bac9081360b8..496b7d5fa58f3 100644
--- a/website/content/docs/connect/proxies/envoy-extensions/usage/lua.mdx
+++ b/website/content/docs/connect/proxies/envoy-extensions/usage/lua.mdx
@@ -15,9 +15,11 @@ Envoy filters support setting and getting dynamic metadata, allowing a filter to
 
 To use the Lua Envoy extension, configure the following arguments in the `EnvoyExtensions` block:
 
-- `ProxyType`: string | `connect-proxy` - Determines the proxy type the extension applies to. The only supported value is `connect-proxy`.
-- `ListenerType`: string | required - Specifies if the extension is applied to the `inbound` or `outbound` listener.
-- `Script`: string | required - The Lua script that is configured to run by the HTTP Lua filter.
+| Arguments      | Description                                                                                      |
+| -------------- | ------------------------------------------------------------------------------------------------ |
+| `ProxyType`    | Determines the proxy type the extension applies to. The only supported value is `connect-proxy`. |
+| `ListenerType` | Specifies if the extension is applied to the `inbound` or `outbound` listener.                   |
+| `Script`       | The Lua script that is configured to run by the HTTP Lua filter.                                 |
 
 ## Workflow
 
@@ -44,15 +46,14 @@ The following example configures the Lua Envoy extension on every service by usi
 ```hcl
 Kind = "proxy-defaults"
 Name = "global"
-Config {
-  protocol = "http"
-}
+Protocol  = "http"
 EnvoyExtensions {
   Name = "builtin/lua"
+  
   Arguments = {
     ProxyType = "connect-proxy"
-    Listener  = "inbound"
-    Script    = <<-EOF
+    Listener = "inbound"
+    Script = <<-EOS
 function envoy_on_request(request_handle)
   meta = request_handle:streamInfo():dynamicMetadata()
   m = meta:get("consul")
@@ -61,7 +62,7 @@ function envoy_on_request(request_handle)
   request_handle:headers():add("x-consul-datacenter", m["datacenter"])
   request_handle:headers():add("x-consul-trust-domain", m["trust-domain"])
 end
- EOF
+EOS
   }
 }
 ```
@@ -158,7 +159,7 @@ $ kubectl apply lua-envoy-extension-proxy-defaults.yaml
 
 In the following example, the `service-defaults` configure the Lua Envoy extension to insert the HTTP Lua filter for service `myservice` and add the Consul service name to the`x-consul-service` header for all inbound requests. The `ListenerType` makes it so that the extension applies only on the inbound listener of the service's connect proxy.
 
-<CodeBlockConfig filename="lua-envoy-extension.hcl">
+<CodeBlockConfig filename="lua-envoy-extension.json">
 
 ```hcl
 Kind = "service-defaults"
@@ -169,8 +170,8 @@ EnvoyExtensions = [
     
     Arguments = {
       ProxyType = "connect-proxy"
-      Listener  = "inbound"
-      Script    = <<EOF
+      Listener = "inbound"
+      Script = <<EOF
   function envoy_on_request(request_handle)
     local service = request_handle:streamInfo():dynamicMetadata():get("consul")["service"]
     request_handle:headers():add("x-consul-service", service)
@@ -187,7 +188,7 @@ Alternatively, you can apply the same extension configuration to [`proxy-default
 
 You can also specify multiple Lua filters through the Envoy extensions. They will not override each other.
 
-<CodeBlockConfig filename="lua-envoy-extension.hcl">
+<CodeBlockConfig filename="lua-envoy-extension.json">
 
 ```hcl
 Kind = "service-defaults"
@@ -197,8 +198,8 @@ EnvoyExtensions = [
     Name = "builtin/lua",
     Arguments = {
       ProxyType = "connect-proxy"
-      Listener  = "inbound"
-      Script    = <<-EOF
+      Listener = "inbound"
+      Script = <<-EOF
 function envoy_on_request(request_handle)
   meta = request_handle:streamInfo():dynamicMetadata()
   m = meta:get("consul")
@@ -211,8 +212,8 @@ end
     Name = "builtin/lua",
     Arguments = {
       ProxyType = "connect-proxy"
-      Listener  = "inbound"
-      Script    = <<-EOF
+      Listener = "inbound"
+      Script = <<-EOF
 function envoy_on_request(request_handle)
   meta = request_handle:streamInfo():dynamicMetadata()
   m = meta:get("consul")
@@ -224,4 +225,4 @@ end
 ]
 ```
 
-</CodeBlockConfig>
+</CodeBlockConfig>
\ No newline at end of file
diff --git a/website/content/docs/connect/proxies/envoy-extensions/usage/otel-access-logging.mdx b/website/content/docs/connect/proxies/envoy-extensions/usage/otel-access-logging.mdx
deleted file mode 100644
index 34b4d844acbd5..0000000000000
--- a/website/content/docs/connect/proxies/envoy-extensions/usage/otel-access-logging.mdx
+++ /dev/null
@@ -1,148 +0,0 @@
----
-layout: docs
-page_title: Send access logs to OpenTelemetry collector service
-description: Learn how to use the `otel-access-logging` Envoy extension to send access logs to OpenTelemetry collector service.
----
-
-# Send access logs to OpenTelemetry collector service
-
-This topic describes how to use the OpenTelemetry Access Logging Envoy extension to send access logs to OpenTelemetry collector service.
-
-## Workflow
-
-Complete the following steps to use the OpenTelemetry Access Logging extension:
-
-1. Configure an `EnvoyExtensions` block in a service defaults or proxy defaults configuration entry.
-1. Apply the configuration entry.
-
-## Add the `EnvoyExtensions`
-
-Add Envoy extension configurations to a proxy defaults or service defaults configuration entry. Place the extension configuration in an `EnvoyExtensions` block in the configuration entry.
-
-- When you configure Envoy extensions on proxy defaults, they apply to every service.
-- When you configure Envoy extensions on service defaults, they apply to a specific service.
-
-Consul applies Envoy extensions configured in proxy defaults before it applies extensions in service defaults. As a result, the Envoy extension configuration in service defaults may override configurations in proxy defaults.
-
-The following example shows a service defaults configuration entry for the `api` service that directs the Envoy proxy to make gRPC OpenTelemetry Access Logging requests to the `otel-collector` service:
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
-<CodeBlockConfig filename="api-otel-collector-service-defaults.hcl">
-
-```hcl
-Kind = "service-defaults"
-Name = "api"
-EnvoyExtensions = [
-  {
-    Name = "builtin/otel-access-logging"
-    Arguments = {
-      ProxyType = "connect-proxy"
-      Config = {
-        GrpcService = {
-          Target = {
-            Service = {
-              Name = "otel-collector"
-            }
-          }
-        }
-      }
-    }
-  }
-]
-```
-</CodeBlockConfig>
-</Tab>
-<Tab heading="JSON" group="json">
-<CodeBlockConfig filename="api-otel-collector-service-defaults.json">
-
-```json
-{
-  "Kind": "service-defaults",
-  "Name": "api",
-  "EnvoyExtensions": [{
-    "Name": "builtin/otel-access-logging",
-    "Arguments": {
-      "ProxyType": "connect-proxy",
-      "Config": {
-        "GrpcService": {
-          "Target": {
-            "Service": {
-              "Name": "otel-collector"
-            }
-          }
-        }
-      }
-    }
-  }]
-}
-```
-
-</CodeBlockConfig>
-</Tab>
-<Tab heading="Kubernetes" group="yaml">
-<CodeBlockConfig filename="api-otel-collector-service-defaults.yaml">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceDefaults
-metadata:
-  name: api
-  namespace: default
-spec:
-  envoyExtensions:
-  - name: builtin/otel-access-logging
-    arguments:
-      proxyType: connect-proxy
-      config:
-        grpcService:
-          target:
-            service:
-              name: otel-collector
-              namespace: otel-collector
-```
-</CodeBlockConfig>
-</Tab>
-</Tabs>
-
-Refer to the [OpenTelemetry Access Logging extension configuration reference](/consul/docs/connect/proxies/envoy-extensions/configuration/otel-access-logging) for details on how to configure the extension.
-
-Refer to the [proxy defaults configuration entry reference](/consul/docs/connect/config-entries/proxy-defaults) and [service defaults configuration entry reference](/consul/docs/connect/config-entries/service-defaults) for details on how to define the configuration entries.
-
-!> **Warning:** Adding Envoy extensions default proxy configurations may have unintended consequences. We recommend configuring `EnvoyExtensions` in service defaults configuration entries in most cases.
-
-### Unsupported Envoy configuration fields
-
-The following Envoy configurations are not supported:
-
-| Configuration           | Workaround                                                                                                                     |
-| ----------------------- | ------------------------------------------------------------------------------------------------------------------------------ |
-| `transport_api_version` | Consul only supports v3 of the transport API. As a result, there is no workaround for implementing the behavior of this field. |
-
-## Apply the configuration entry
-
-If your network is deployed to virtual machines, use the `consul config write` command and specify the proxy defaults or service defaults configuration entry to apply the configuration. For Kubernetes-orchestrated networks, use the `kubectl apply` command. The following example applies the extension in a proxy defaults configuration entry.
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
-
-```shell-session
-$ consul config write api-otel-collector-service-defaults.hcl
-```
-
-</Tab>
-<Tab heading="JSON" group="json">
-
-```shell-session
-$ consul config write api-otel-collector-service-defaults.json
-```
-
-</Tab>
-<Tab heading="Kubernetes" group="kubernetes">
-
-```shell-session
-$ kubectl apply -f api-otel-collector-service-defaults.yaml
-```
-
-</Tab>
-</Tabs>
diff --git a/website/content/docs/connect/proxies/envoy-extensions/usage/property-override.mdx b/website/content/docs/connect/proxies/envoy-extensions/usage/property-override.mdx
deleted file mode 100644
index 3c82d3c7c2ca1..0000000000000
--- a/website/content/docs/connect/proxies/envoy-extensions/usage/property-override.mdx
+++ /dev/null
@@ -1,219 +0,0 @@
----
-layout: docs
-page_title: Configure Envoy proxy properties
-description: Learn how to use the property-override extension for Envoy proxies to set and remove individual properties for the Envoy resources Consul generates.
----
-
-# Configure Envoy proxy properties
-
-This topic describes how to use the `property-override` extension to set and remove individual properties for the Envoy resources Consul generates. The extension uses the [protoreflect](https://pkg.go.dev/google.golang.org/protobuf/reflect/protoreflect), which enables Consul to dynamically manipulate messages.
-
-The extension currently supports setting scalar and enum fields, removing individual fields addressable by `Path`, and initializing unset intermediate message fields indicated in `Path`.
-
-It currently does _not_ support the following use cases:
-- Adding, updating, or removing repeated field members
-- Adding or updating [protobuf `map`](https://protobuf.dev/programming-guides/proto3/#maps) fields
-- Adding or updating [protobuf `Any`](https://protobuf.dev/programming-guides/proto3/#any) fields
-
-## Workflow
-
-- Complete the following steps to use the `property-override` extension:
-- Configure an `EnvoyExtensions` block in a service defaults or proxy defaults configuration entry. 
-- Apply the configuration entry.
-
-!> **Security warning**: The property override extension is an advanced feature capable of introducing unintended consequences or reducing cluster security if used incorrectly. Consul does not enforce TLS retention, intentions, or other security-critical components of the Envoy configuration. Additionally, Consul does not verify that the configuration does not contain errors that affect service traffic.
-
-## Add the `EnvoyExtensions`
-
-Add Envoy extension configurations to a proxy defaults or service defaults configuration entry. Place the extension configuration in an `EnvoyExtensions` block in the configuration entry.
-
-- When you configure Envoy extensions on proxy defaults, they apply to every service.
-- When you configure Envoy extensions on service defaults, they apply to a specific service.
-
-Consul applies Envoy extensions configured in proxy defaults before it applies extensions in service defaults. As a result, the Envoy extension configuration in service defaults may override configurations in proxy defaults.
-
-In the following proxy defaults configuration entry example, Consul sets the `/respect_dns_ttl` field on the `api` service proxy's cluster configuration for the `other-svc` upstream service:
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
-<CodeBlockConfig filename="property-override-extension-service-defaults.hcl">
-
-```hcl
-Kind     = "service-defaults"
-Name     = "api"
-Protocol = "http"
-EnvoyExtensions = [ 
-  {
-    Name = "builtin/property-override"
-    Arguments = {
-      ProxyType = "connect-proxy"
-      Patches = [
-        {
-          ResourceFilter  = {
-            ResourceType     = "cluster"
-            TrafficDirection = "outbound"
-            Services = [{
-               Name =  "other-svc"
-            }]
-          }
-          Op    = "add"
-          Path  = "/respect_dns_ttl"
-          Value = true
-        }
-      ]
-    }
-  }
-]
-```
-</CodeBlockConfig>
-</Tab>
-
-<Tab heading="JSON" group="json">
-<CodeBlockConfig filename="property-override-extension-service-defaults.json">
-
-```json
-{
-  "kind": "service-defaults",
-  "name": "api",
-  "protocol": "http",
-  "envoyExtensions": [{
-    "name": "builtin/property-override",
-    "arguments": {
-      "proxyType": "connect-proxy",
-      "patches": [{
-        "resourceFilter": {
-          "resourceType": "cluster",
-          "trafficDirection": "outbound",
-          "services": [{ "name":  "other-svc" }]
-        },
-        "op": "add",
-        "path": "/respect_dns_ttl",
-        "value": true
-      }]
-    }
-  }]
-}
-```
-</CodeBlockConfig>
-</Tab>
-<Tab heading="Kubernetes" group="kubernetes">
-<CodeBlockConfig filename="property-override-extension-service-defaults.yaml">
-
-```yaml
-apiversion: consul.hashicorp.com/v1alpha1
-kind: ServiceDefaults
-metadata:
-  name: api
-spec:
-  protocol: http
-  envoyExtensions:
-    name = "builtin/property-override"
-    arguments: 
-      proxyType: "connect-proxy",
-      patches: 
-      - resourceFilter: 
-          resourceType: "cluster" 
-          trafficDirection: "outbound"
-          services: 
-            - name:  "other-svc"
-        op: "add"
-        path: "/respect_dns_ttl",
-        value: true
-```
-
-</CodeBlockConfig>
-</Tab>
-</Tabs>
-
-
-Refer to the [property override configuration reference](/consul/docs/connect/proxies/envoy-extensions/configuration/property-override) for details on how to configure the extension. 
-
-Refer to the [proxy defaults configuration entry reference](/consul/docs/connect/config-entries/proxy-defaults) and [service defaults configuration entry reference](/consul/docs/connect/config-entries/service-defaults) for details on how to define the configuration entries. 
-
-!> **Warning:** Adding Envoy extensions default proxy configurations may have unintended consequences. We recommend configuring `EnvoyExtensions` in service defaults configuration entries in most cases.
-
-### Constructing paths
-
-To target the properties for an Envoy resource type, you must specify the path where the properties exist in the [`Path` field](/consul/docs/connect/proxies/envoy-extensions/configuration/property-override#patches-path) of the property override extension configuration. Set the `Path` field to an empty or partially invalid string when saving the configuration entry and Consul returns an error with a list of supported fields for the first unrecognized segment of the path. By default, Consul only returns the first ten fields, but you can set the [`Debug` field](/consul/docs/connect/proxies/envoy-extensions/configuration/property-override#debug) to `true`  to direct Consul to output all possible fields. 
-
-In the following example, Consul outputs the top-level fields available for the Envoy cluster resource:
-
-```hcl
-Kind = "service-defaults"
-Name = "api"
-EnvoyExtensions = [
-  {
-    Name = "builtin/property-override"
-    Arguments = {
-      Debug = true
-      ProxyType = "connect-proxy"
-      Patches = [
-        {
-          ResourceFilter = {
-            ResourceType = "cluster"
-            TrafficDirection = "outbound"
-          }
-          Op = "add"
-          Path =  ""
-          Value =  5
-        }
-      ]
-    }
-  }
-]
-```
-
-After applying the configuration entry, Consul prints a message that includes the possible fields for the resource:
-
-```shell-session
-$ consul config write api.hcl
-non-empty, non-root Path is required;
-available envoy.config.cluster.v3.Cluster fields:
-transport_socket_matches
-name
-alt_stat_name
-type
-cluster_type
-eds_cluster_config
-connect_timeout
-...
-```
-
-You can use the output to help you construct the appropriate value for the `Path` field. For example:
-
-```shell-session
-$ consul config write api.hcl 2>&1 | grep round_robin
-round_robin_lb_config
-```
-
-
-
-
-## Apply the configuration entry
-
-If your network is deployed to virtual machines, use the `consul config write` command and specify the proxy defaults or service defaults configuration entry to apply the configuration. For Kubernetes-orchestrated networks, use the `kubectl apply` command. The following example applies the extension in a proxy defaults configuration entry.
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
-
-```shell-session
-$ consul config write property-override-extension-service-defaults.hcl
-```
-
-</Tab>
-<Tab heading="JSON" group="json">
-
-```shell-session
-$ consul config write property-override-extension-service-defaults.json
-
-```
-
-</Tab>
-<Tab heading="Kubernetes" group="kubernetes">
-
-```shell-session
-$ kubectl apply property-override-extension-service-defaults.yaml
-```
-
-</Tab>
-</Tabs>
diff --git a/website/content/docs/connect/proxies/envoy-extensions/usage/wasm.mdx b/website/content/docs/connect/proxies/envoy-extensions/usage/wasm.mdx
deleted file mode 100644
index 5f5b371e73628..0000000000000
--- a/website/content/docs/connect/proxies/envoy-extensions/usage/wasm.mdx
+++ /dev/null
@@ -1,194 +0,0 @@
----
-layout: docs
-page_title: Run WebAssembly plug-ins in Envoy proxy
-description: Learn how to use the Consul wasm extension for Envoy, which directs Consul to run your WebAssembly (Wasm) plugins for Envoy proxies in your service mesh.
----
-
-
-# Run WebAssembly plug-ins in Envoy proxy     
-
-This topic describes how to use the `wasm` extension, which directs Consul to run your WebAssembly (Wasm) plug-ins for Envoy proxies. 
-
-## Workflow
-
-You can create Wasm plugins for Envoy and integrate them using the `wasm` extension. Wasm is a binary instruction format for stack-based virtual machines that has the potential to run anywhere after it has been compiled. Wasm plug-ins run as filters in a service mesh application's sidecar proxy.
-
-The following steps describe the process of integrating Wasm plugins:
-
-- Create your Wasm plugin. You must ensure that your plugin functions as expected. Refer to the [WebAssembly website](https://webassembly.org/) for information and links to documentation.
-- Configure an `EnvoyExtensions` block in a service defaults or proxy defaults configuration entry. 
-- Apply the configuration entry.
-
-## Add the `EnvoyExtensions`
-
-Add Envoy extension configuration to a proxy defaults or service defaults configuration entry. Place the extension configuration in an `EnvoyExtensions` block in the configuration entry.
-
-- When you configure Envoy extensions on proxy defaults, they apply to every service.
-- When you configure Envoy extensions on service defaults, they apply to a specific service.
-
-Consul applies Envoy extensions configured in proxy defaults before it applies extensions in service defaults. As a result, the Envoy extension configuration in service defaults may override configurations in proxy defaults.
-
-In the following example, the extension uses an upstream service named `file-server` to serve a Wasm-based web application firewall (WAF). 
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
-<CodeBlockConfig filename="wasm-extension-serve-waf.hcl">
-
-```hcl
-Kind = "service-defaults"
-Name = "api"
-Protocol = "http"
-EnvoyExtensions = [
-  {
-    Name = "builtin/wasm"
-    Arguments = {
-      Protocol = "http"
-      ListenerType = "inbound"
-      PluginConfig = {
-        VmConfig = {
-          Code = {
-            Remote = {
-              HttpURI = {
-                Service = {
-                  Name = "file-server"
-                }
-                URI = "https://file-server/waf.wasm"
-              }
-              SHA256  = "c9ef17f48dcf0738b912111646de6d30575718ce16c0cbde3e38b21bb1771807"
-            }
-          }
-        }
-      Configuration =  <<EOF
-{
-  "rules": [
-    "Include @demo-conf",
-    "Include @crs-setup-demo-conf",
-    "SecDebugLogLevel 9",
-    "SecRuleEngine On",
-    "Include @owasp_crs/*.conf"
-  ]
-}
-EOF
-      }
-    }
-  }
-]
-```
-</CodeBlockConfig>
-</Tab>
-<Tab heading="JSON" group="json">
-<CodeBlockConfig filename="wasm-extension-serve-waf.json">
-
-```json
-{
-	"kind": "service-defaults",
-	"name": "api",
-	"protocol": "http",
-	"envoyExtensions": [{
-		"name": "builtin/wasm",
-		"arguments": {
-			"protocol": "http",
-			"listenerType": "inbound",
-			"pluginConfig": {
-				"VmConfig": {
-					"Code": {
-						"Remote": {
-							"HttpURI": {
-								"Service": {
-									"Name": "file-server"
-								},
-								"URI": "https://file-server/waf.wasm"
-							}
-						}
-					}
-				},
-				"Configuration": {
-					"rules": [
-						"Include @demo-conf",
-						"Include @crs-setup-demo-conf",
-						"SecDebugLogLevel 9",
-						"SecRuleEngine On",
-						"Include @owasp_crs/*.conf"
-					]
-				}
-
-			}
-		}
-	}]
-}
-```
-
-
-</CodeBlockConfig>
-</Tab>
-<Tab heading="YAML" group="yaml">
-<CodeBlockConfig filename="wasm-extension-serve-waf.yaml">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceDefaults
-metadata:
-  name: api
-spec:
-  protocol: http
-  envoyExtensions:
-    - name: builtin/wasm
-      required: true
-      arguments:
-        protocol: http
-        listenerType: inbound
-        pluginConfig:
-          VmConfig:
-            Code:
-              Remote:
-                HttpURI:
-                  Service:
-                    Name: file-server
-                    URI: https://file-server/waf.wasm
-          Configuration:
-            rules:
-            - Include @demo-conf
-            - Include @crs-setup-demo-conf
-            - SecDebugLogLevel 9
-            - SecRuleEngine On
-            - Include @owasp_crs/*.conf
-```
-
-</CodeBlockConfig>
-</Tab>
-</Tabs>
-
-
-Refer to the [Wasm extension configuration reference](/consul/docs/connect/proxies/envoy-extensions/configuration/wasm) for details on how to configure the extension. 
-
-Refer to the [proxy defaults configuration entry reference](/consul/docs/connect/config-entries/proxy-defaults) and [service defaults configuration entry reference](/consul/docs/connect/config-entries/service-defaults) for details on how to define the configuration entries. 
-
-!> **Warning:** Adding Envoy extensions default proxy configurations may have unintended consequences. We recommend configuring `EnvoyExtensions` in service defaults configuration entries in most cases.
-
-## Apply the configuration entry
-
-If your network is deployed to virtual machines, use the `consul config write` command and specify the proxy defaults or service defaults configuration entry to apply the configuration. For Kubernetes-orchestrated networks, use the `kubectl apply` command. The following example applies the extension in a proxy defaults configuration entry.
-
-<Tabs>
-<Tab heading="HCL" group="hcl">
-
-```shell-session
-$ consul config write wasm-extension-serve-waf.hcl
-```
-
-</Tab>
-<Tab heading="JSON" group="json">
-
-```shell-session
-$ consul config write wasm-extension-serve-waf.json
-```
-
-</Tab>
-<Tab heading="Kubernetes" group="kubernetes">
-
-```shell-session
-$ kubectl apply wasm-extension-serve-waf.yaml
-```
-
-</Tab>
-</Tabs>
diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx
index 1b9f270320b5f..f2c74182bc8a3 100644
--- a/website/content/docs/connect/proxies/envoy.mdx
+++ b/website/content/docs/connect/proxies/envoy.mdx
@@ -24,7 +24,7 @@ Consul can configure Envoy sidecars to proxy traffic over the following protocol
 
 On Consul 1.5.0 and older, Envoy proxies can only proxy TCP traffic at L4.
 
-You can configure some [L7 features](/consul/docs/connect/manage-traffic) in [configuration entries](/consul/docs/agent/config-entries). You can add [custom Envoy configurations](#advanced-configuration) to the [proxy service definition](/consul/docs/connect/proxies/proxy-config-reference), which enables you to leverage Envoy features that are not exposed through configuration entries. You can also use the [Consul Envoy extensions](/consul/docs/connect/proxies/envoy-extensions) to implement Envoy features.
+Some [L7 features](/consul/docs/connect/l7-traffic) can be configured using [configuration entries](/consul/docs/agent/config-entries). You can add [custom Envoy configurations](#advanced-configuration) to the [proxy service definition](/consul/docs/connect/registration/service-registration) to use Envoy features that are not currently exposed through configuration entries. Adding custom Envoy configurations to the service definition is an interim solution that enables you to use the more powerful features of Envoy.
 
 ~> **Note:** When using Envoy with Consul and not using the [`consul connect envoy` command](/consul/commands/connect/envoy)
 Envoy must be run with the `--max-obj-name-len` option set to `256` or greater for Envoy versions prior to 1.11.0.
@@ -39,19 +39,18 @@ Consul supports **four major Envoy releases** at the beginning of each major Con
 
 | Consul Version      | Compatible Envoy Versions                                                          |
 | ------------------- | -----------------------------------------------------------------------------------|
-| 1.16.x              | 1.26.4, 1.25.9, 1.24.10, 1.23.12                                                   |
 | 1.15.x              | 1.25.9, 1.24.10, 1.23.12, 1.22.11                                                  |
 | 1.14.x              | 1.24.10, 1.23.12, 1.22.11, 1.21.6                                                  |
+| 1.13.x              | 1.23.1, 1.22.5, 1.21.5, 1.20.7                                                     |
 
 ### Envoy and Consul Dataplane
 
-The Consul dataplane component was introduced in Consul v1.14 as a way to manage Envoy proxies without the use of Consul clients. Each new minor version of Consul is released with a new minor version of Consul dataplane, which packages both Envoy and the `consul-dataplane` binary in a single container image. For backwards compatibility reasons, each new minor version of Consul will also support the previous minor version of Consul dataplane to allow for seamless upgrades. In addition, each minor version of Consul will support the next minor version of Consul dataplane to allow for extended dataplane support via newer versions of Envoy.
+The Consul dataplane component was introduced in Consul v1.14 as a way to manage Envoy proxies without the use of Consul clients. Each new minor version of Consul is released with a new minor version of Consul dataplane, which packages both Envoy and the `consul-dataplane` binary in a single container image. For backwards compatability reasons, each new minor version of Consul will also support the previous minor version of Consul dataplane to allow for seamless upgrades. In addition, each minor version of Consul will support the next minor version of Consul dataplane to allow for extended dataplane support via newer versions of Envoy.
 
-| Consul Version      | Default `consul-dataplane` Version                          | Other compatible `consul-dataplane` Versions |
-| ------------------- | ------------------------------------------------------------|----------------------------------------------|
-| 1.16.x              | 1.2.x (Envoy 1.26.x)                                        | 1.1.x (Envoy 1.25.x)                         |
-| 1.15.x              | 1.1.x (Envoy 1.25.x)                                        | 1.2.x (Envoy 1.26.x), 1.0.x (Envoy 1.24.x)   |
-| 1.14.x              | 1.0.x (Envoy 1.24.x)                                        | 1.1.x (Envoy 1.25.x)                         |
+| Consul Version      | Consul Dataplane Version (Bundled Envoy Version)  |
+| ------------------- | ------------------------------------------------- |
+| 1.15.x              | 1.1.x (Envoy 1.25.x), 1.0.x (Envoy 1.24.x)        |
+| 1.14.x              | 1.1.x (Envoy 1.25.x), 1.0.x (Envoy 1.24.x)        |
 
 ## Getting Started
 
@@ -77,7 +76,7 @@ The dynamic configuration Consul service mesh provides to each Envoy instance in
 - Service-discovery results for upstreams to enable each sidecar proxy to load-balance
   outgoing connections.
 - L7 configuration including timeouts and protocol-specific options.
-- Configuration to [expose specific HTTP paths](/consul/docs/connect/proxies/proxy-config-reference#expose-paths-configuration-reference).
+- Configuration to [expose specific HTTP paths](/consul/docs/connect/registration/service-registration#expose-paths-configuration-reference).
 
 For more information on the parts of the Envoy proxy runtime configuration
 that are currently controllable via Consul service mesh, refer to [Dynamic
@@ -139,9 +138,9 @@ Consul service mesh can control some parts of the bootstrap configuration by spe
 
 Add the following configuration items to the [global `proxy-defaults` configuration
 entry](/consul/docs/connect/config-entries/proxy-defaults) or override them directly in the `proxy.config`
-field of a [proxy service definition](/consul/docs/proxies/proxy-config-reference). When
+field of a [proxy service definition](/consul/docs/connect/registration/service-registration). When
 connected to a Consul client agent, you can place the configuration in the `proxy.config` field of
-the [`sidecar_service`](/consul/docs/connect/proxies/deploy-sidecar-services) block.
+the [`sidecar_service`](/consul/docs/connect/registration/sidecar-service) block.
 
 - `envoy_statsd_url` - A URL in the form `udp://ip:port` identifying a UDP
   StatsD listener that Envoy should deliver metrics to. For example, this may be
@@ -194,7 +193,7 @@ the [`sidecar_service`](/consul/docs/connect/proxies/deploy-sidecar-services) bl
 - `envoy_telemetry_collector_bind_socket_dir` - Specifies the directory where Envoy creates a Unix socket.
   Envoy sends metrics to the socket where a Consul telemetry collector can collect them.
   The socket is not configured by default.
-
+  
 The [Advanced Configuration](#advanced-configuration) section describes additional configurations that allow incremental or complete control over the bootstrap configuration generated.
 
 ### Bootstrap Envoy on Windows VMs
@@ -204,7 +203,7 @@ The [Advanced Configuration](#advanced-configuration) section describes addition
 If you are running Consul on a Windows VM, attempting to bootstrap Envoy with the `consul connect envoy` command returns the following output:
 
 ```shell-session hideClipboard
-Directly running Envoy is only supported on linux and macOS since envoy itself doesn't build on other platforms currently.
+Directly running Envoy is only supported on linux and macOS since envoy itself doesn't build on other plataforms currently.
 Use the -bootstrap option to generate the JSON to use when running envoy on a supported OS or via a container or VM.
 ```
 
@@ -279,7 +278,7 @@ automatically configure its upstream listeners appropriately too as below.
 
 This automated discovery results in Consul auto-populating the `proxy.config`
 and `proxy.upstreams[*].config` fields of the [proxy service
-definition](/consul/docs/connect/proxies/proxy-config-reference) that is
+definition](/consul/docs/connect/registration/service-registration) that is
 actually registered.
 
 To learn about other options that can be configured centrally see the
@@ -288,7 +287,7 @@ To learn about other options that can be configured centrally see the
 ### Proxy Config Options
 
 These fields may also be overridden explicitly in `proxy.config` of the [proxy service
-definition](/consul/docs/connect/proxies/proxy-config-reference), or defined in
+definition](/consul/docs/connect/registration/service-registration), or defined in
 the [global `proxy-defaults` configuration
 entry](/consul/docs/connect/config-entries/proxy-defaults) to act as
 defaults that are inherited by all services.
@@ -322,7 +321,7 @@ defaults that are inherited by all services.
     [`service-defaults`](/consul/docs/connect/config-entries/service-defaults)
     config entry for the service. Configuring it in a
     proxy config will not fully enable some [L7
-    features](/consul/docs/connect/manage-traffic).
+    features](/consul/docs/connect/l7-traffic).
     It is supported here for backwards compatibility with Consul versions prior to 1.6.0.
 
 - `bind_address` - Override the address Envoy's public listener binds to. By
@@ -360,8 +359,8 @@ defaults that are inherited by all services.
 
 The following configuration items may be overridden directly in the
 `proxy.upstreams[].config` field of a [proxy service
-definition](/consul/docs/connect/proxies/proxy-config-reference) or
-[`sidecar_service`](/consul/docs/connect/proxies/deploy-sidecar-services) block.
+definition](/consul/docs/connect/registration/service-registration) or
+[`sidecar_service`](/consul/docs/connect/registration/sidecar-service) block.
 
 - `protocol` - Same as above in main config but affects the listener setup for
   the upstream.
@@ -372,7 +371,7 @@ definition](/consul/docs/connect/proxies/proxy-config-reference) or
   [`service-defaults`](/consul/docs/connect/config-entries/service-defaults)
   config entry for the upstream destination service. Configuring it in a
   proxy upstream config will not fully enable some [L7
-  features](/consul/docs/connect/manage-traffic).
+  features](/consul/docs/connect/l7-traffic).
   It is supported here for backwards compatibility with Consul versions prior to 1.6.0.
 
 - `connect_timeout_ms` - The number of milliseconds to allow when making upstream
@@ -418,13 +417,6 @@ definition](/consul/docs/connect/proxies/proxy-config-reference) or
     host will be actually ejected when the proxy detects an outlier status
     through consecutive errors in the 500 code range. If not specified, Consul
     uses the proxy's default value. For example, `100` for Envoy proxy.
-  - `max_ejection_percent` - The maximum percentage of hosts that can be ejected
-    from a upstream cluster due to passive health check failures. If not specified,
-    inherits Envoy's default of 10% or at least one host.
-  - `base_ejection_time` - The base time that a host is ejected for. The real
-     time is equal to the base time multiplied by the number of times the host has
-     been ejected and is capped by max_ejection_time (Default 300s). If not
-     specified, inherits Envoy's default value of 30s.
 
 - `balance_outbound_connections` - Specifies the strategy for balancing outbound connections
   across Envoy worker threads. Consul service mesh Envoy integration supports the
@@ -437,7 +429,7 @@ definition](/consul/docs/connect/proxies/proxy-config-reference) or
 ### Gateway Options
 
 These fields may also be overridden explicitly in the [proxy service
-definition](/consul/docs/connect/proxies/proxy-config-reference), or defined in
+definition](/consul/docs/connect/registration/service-registration), or defined in
 the [global `proxy-defaults` configuration
 entry](/consul/docs/connect/config-entries/proxy-defaults) to act as
 defaults that are inherited by all services.
@@ -611,8 +603,8 @@ Users may add the following configuration items to the [global `proxy-defaults`
 configuration
 entry](/consul/docs/connect/config-entries/proxy-defaults) or
 override them directly in the `proxy.config` field of a [proxy service
-definition](/consul/docs/connect/proxies/proxy-config-reference) or
-[`sidecar_service`](/consul/docs/connect/proxies/deploy-sidecar-services) block.
+definition](/consul/docs/connect/registration/service-registration) or
+[`sidecar_service`](/consul/docs/connect/registration/sidecar-service) block.
 
 - `envoy_extra_static_clusters_json` - Specifies one or more [Envoy clusters](https://www.envoyproxy.io/docs/envoy/v1.17.2/api-v3/config/cluster/v3/cluster.proto)
   that will be appended to the array of [static
@@ -792,8 +784,8 @@ Users may add the following configuration items to the [global `proxy-defaults`
 configuration
 entry](/consul/docs/connect/config-entries/proxy-defaults) or
 override them directly in the `proxy.config` field of a [proxy service
-definition](/consul/docs/connect/proxies/proxy-config-reference) or
-[`sidecar_service`](/consul/docs/connect/proxies/deploy-sidecar-services) block.
+definition](/consul/docs/connect/registration/service-registration) or
+[`sidecar_service`](/consul/docs/connect/registration/sidecar-service) block.
 
 - `envoy_bootstrap_json_tpl` - Specifies a template in Go template syntax that
   is used in place of [the default
@@ -989,8 +981,8 @@ definition](/consul/docs/connect/proxies/proxy-config-reference) or
 
 The following configuration items may be overridden directly in the
 `proxy.upstreams[].config` field of a [proxy service
-definition](/consul/docs/connect/proxies/proxy-config-reference) or
-[`sidecar_service`](/consul/docs/connect/deploy/deploy-sidecar-services) block.
+definition](/consul/docs/connect/registration/service-registration) or
+[`sidecar_service`](/consul/docs/connect/registration/sidecar-service) block.
 
 ~> **Note:** - When a
 [`service-router`](/consul/docs/connect/config-entries/service-router),
diff --git a/website/content/docs/connect/proxies/index.mdx b/website/content/docs/connect/proxies/index.mdx
index 839a24a49f4f5..ff344e56d2d2f 100644
--- a/website/content/docs/connect/proxies/index.mdx
+++ b/website/content/docs/connect/proxies/index.mdx
@@ -1,87 +1,29 @@
 ---
 layout: docs
-page_title: Service mesh proxy overview
+page_title: Service Mesh Proxy Overview
 description: >-
   In Consul service mesh, each service has a sidecar proxy that secures connections with other services in the mesh without modifying the underlying application code. You can use the built-in proxy, Envoy, or a custom proxy to handle communication and verify TLS connections.
 ---
 
-# Service mesh proxy overview
+# Service Mesh Proxy Overview
 
-This topic provides an overview of how Consul uses proxies in your service mesh. A proxy is a type of service that enables unmodified applications to connect to other services in the service mesh. Consul ships with a built-in L4 proxy and has first class support for Envoy. You can plug other proxies into your environment as well, and apply configurations in Consul to define proxy behavior.
+Proxies enable unmodified applications to connect to other services in the service mesh. A
+per-service proxy sidecar transparently handles inbound and outbound service
+connections, automatically wrapping and verifying TLS connections. Consul
+ships with a built-in L4 proxy and has first class support for Envoy. You
+can plug other proxies into your environment as well. This section describes how to
+configure Envoy or the built-in proxy using Consul service mesh, and how to integrate the
+proxy of your choice.
 
-## Proxy use cases
+To ensure that services only allow external connections established through
+the service mesh protocol, you should configure all services to only accept connections on a loopback address.
 
-You can configure proxies to perform several different types of functions in Consul.
+## Dynamic upstreams require native integration
 
-### Service mesh proxies
+Service mesh proxies do not support dynamic upstreams.
 
-A _service mesh proxy_ is any type of proxy service that you use for communication in a service mesh. Specialized proxy implementations, such as sidecar proxies and gateways, are subsets of service mesh proxies. Refer to [Deploy service mesh proxy services](/consul/docs/connect/proxies/deploy-service-mesh-proxies) for instructions on how to deploy a service mesh proxy.
-
-### Sidecars
-
-Sidecar proxies are service mesh proxy implementations that transparently handles inbound and outbound service connections. Sidecars automatically wrap and verify TLS connections. In a non-containerized network, each service in your mesh should have its own sidecar proxy.   
-
-Refer to [Deploy sidecar services](/consul/docs/connect/proxies/deploy-sidecar-services) for additional information.
-
-### Gateways
-
-You can configure service mesh proxies to operate as gateway services, which allow service-to-service traffic across different network areas, including peered clusters, WAN-federated datacenters, and nodes outside the mesh. Consul ships with several types of gateway capabilities, but gateways deliver the underlying functionality.
-
-Refer to [Gateways overview](/consul/docs/connect/gateways) for additional information.
-
-### Dynamic traffic control
-
-You can configure proxies to dynamically redirect or split traffic to implement a failover strategy, test new features, and roll out new versions of your applications. You can apply a combination of configurations to enable complex scenarios, such as failing over to the geographically nearest service or to services in different network areas that you have designated as being functionally identical.     
-
-Refer to the following topics for additional information:
-
-- [Service mesh traffic management overview](/consul/docs/connect/manage-traffic)
-- [Failover overview](/consul/docs/connect/manage-traffic/failover)
-
-
-## Supported proxies
-
-Consul has first-class support for Envoy proxies, which is a highly configurable open source edge service proxy. Consul configures Envoy by optionally exposing a gRPC service on the local agent that serves Envoy's xDS configuration API. Refer to the following documentation for additional information:
-
-- [Envoy proxy reference](/consul/docs/connect/proxies/envoy)
-- [Envoy API documentation](https://www.envoyproxy.io/docs/envoy/v1.17.2/api-docs/xds_protocol)
- 
-You can use Consul's built-in proxy service that supports L4 network traffic, which is suitable for testing and development but not recommended for production environments. Refer to the [built-in proxy reference](/consul/docs/connect/proxies/built-in) for additional information.
-
-## Workflow
-
-The following procedure describes how to implement proxies:
-
-1. **Configure global proxy settings**. You can configure global passthrough settings for all proxies deployed to your service mesh in the proxy defaults configuration entry. This step is not required, but it enables you to define common behaviors in a central configuration.
-1. **Deploy your service mesh proxy**. Configure proxy behavior in a service definition and register the proxy with Consul. 
-1. **Start the proxy service**. Proxies appear in the list of services registered to Consul and must be started before they begin to route traffic in your service mesh.
-
-### Dynamic upstreams require native integration
-
-Service mesh proxies do not support dynamic upstreams. If an application requires dynamic dependencies that are only available at runtime, you must [natively integrate](/consul/docs/connect/native) the application with Consul service mesh. After integration, the application can use the HTTP API or [DNS interface](/consul/docs/services/discovery/dns-static-lookups#service-mesh-enabled-service-lookups) to connect to other services in the mesh.
-
-## Proxies in Kubernetes-orchestrated networks
-
-For Kubernetes-orchestrated environments, Consul deploys _dataplanes_ by default to manage sidecar proxies. Consul dataplanes are light-weight processes that leverage existing Kubernetes sidecar orchestration capabilities.  Refer to the [dataplanes documentation](/consul/docs/connect/dataplane) for additional information.
-
-## Guidance
-
-Refer to the following resources for help using service mesh proxies:
-
-### Tutorial
-
-- [Using Envoy with Consul service mesh](/consul/tutorials/developer-mesh/service-mesh-with-envoy-proxy)
-
-### Usage documentation
-
-- [Deploy service mesh proxies](/consul/docs/connect/proxies/deploy-service-mesh-proxies) 
-- [Deploy sidecar proxies](/consul/docs/connect/proxies/deploy-sidecar-services)
-- [Extend Envoy proxies](/consul/docs/connect/proxies/envoy-extensions)
-- [Integrate custom proxies](/consul/docs/connect/proxies/integrate)
-
-### Reference documentation
-
-- [Proxy defaults configuration entry reference](/consul/docs/connect/config-entries/proxy-defaults) for additional information. 
-- [Envoy proxies reference](/consul/docs/connect/proxies/envoy)
-- [Service mesh proxy configuration reference](/consul/docs/connect/proxies/proxy-config-reference)
-- [`consul connect envoy` command](/consul/commands/connect/envoy)
+If an application requires dynamic dependencies that are only available
+at runtime, you must [natively integrate](/consul/docs/connect/native)
+the application with Consul service mesh. After natively integrating, the HTTP API or
+[DNS interface](/consul/docs/services/discovery/dns-static-lookups#service-mesh-enabled-service-lookups)
+can be used.
\ No newline at end of file
diff --git a/website/content/docs/connect/proxies/integrate.mdx b/website/content/docs/connect/proxies/integrate.mdx
index 80708badff0e9..1ad9f4b911566 100644
--- a/website/content/docs/connect/proxies/integrate.mdx
+++ b/website/content/docs/connect/proxies/integrate.mdx
@@ -7,17 +7,6 @@ description: >-
 
 # Custom Proxy Configuration for Service Mesh
 
-<Note>
-
- The Connect Native Golang SDK and `v1/agent/connect/authorize`, `v1/agent/connect/ca/leaf`, 
- and `v1/agent/connect/ca/roots` APIs are deprecated and will be removed in a future release. Although Connect Native 
- will still operate as designed, we do not recommend leveraging this feature because it is deprecated and will be removed when the long term replacement to native application integration (such as a proxyless gRPC service mesh integration) is delivered. Refer to [GH-10339](https://github.com/hashicorp/consul/issues/10339) for additional information and to track progress toward one potential solution that is tracked as replacement functionality.
-
- The Native App Integration does not support many of the Consul's service mesh features, and is not under active development.
- The [Envoy proxy](/consul/docs/connect/proxies/envoy) should be used for most production environments. 
-
-</Note>
-
 This topic describes the process and API endpoints you can use to extend proxies for integration with Consul.
 
 ## Overview
@@ -139,7 +128,7 @@ If you are only implementing L4 support in your proxy, set the
 fetching the discovery chain so that L7 features, such as HTTP routing rules, are
 not returned.
 
-For each [target](/consul/docs/connect/manage-traffic/discovery-chain#targets) in the resulting
+For each [target](/consul/docs/connect/l7-traffic/discovery-chain#targets) in the resulting
 discovery chain, a list of healthy, mesh-capable endpoints may be fetched
 from the [`/v1/health/connect/:service_id`] API endpoint as described in the [Service
 Discovery](#service-discovery) section.
@@ -227,6 +216,6 @@ ID for the name specified in `-sidecar-for` flag.
 [`api` package]: https://github.com/hashicorp/consul/tree/main/api
 [`consul/connect/proxy/config.go`]: https://github.com/hashicorp/consul/blob/v1.8.3/connect/proxy/config.go#L187
 [`consul/connect/tls.go`]: https://github.com/hashicorp/consul/blob/v1.8.3/connect/tls.go#L232-L237
-[discovery chain]: /consul/docs/connect/manage-traffic/discovery-chain
+[discovery chain]: /consul/docs/connect/l7-traffic/discovery-chain
 [`usecache`]: https://github.com/hashicorp/consul/blob/v1.8.3/api/api.go#L99-L102
 [protocol]: /consul/docs/connect/config-entries/service-defaults#protocol
diff --git a/website/content/docs/connect/proxies/proxy-config-reference.mdx b/website/content/docs/connect/proxies/proxy-config-reference.mdx
deleted file mode 100644
index 2d64f0e225b80..0000000000000
--- a/website/content/docs/connect/proxies/proxy-config-reference.mdx
+++ /dev/null
@@ -1,556 +0,0 @@
----
-layout: docs
-page_title: Service mesh proxy configuration reference
-description: >-
-  You can register a service mesh sidecar proxy separately from the registration of the service instance it fronts. Learn about proxy configuration options and how to format them with examples.
----
-
-# Service mesh proxy configuration
-
-This topic describes how to declare a service mesh proxy in a service definition. The `kind` must be declared and information about the service they represent must be provided to function as a Consul service mesh proxy.
-
-## Configuration
-
-Configure a service mesh proxy using the following syntax:
-
-<CodeTabs heading="Basic syntax for configuring a service mesh proxy">
-
-```hcl
-name =  <name of the service>
-kind = "connect-proxy"
-proxy = {
-  destination_service_name = "<name of the service that the proxy represents>"
-  <additional proxy parameters> = "<additional parameter values>"
-}
-port = <port where services can discover and connect to proxied services>
-```
-
-```json
-{
-  "name": "<name of the service>",
-  "kind": "connect-proxy",
-  "proxy": {
-    "destination_service_name": "<name of the service that the proxy represents>",
-    "<additional proxy parameters>" : "<additional parameter values>"
-  },
-  "port": <port where services can discover and connect to proxied services>
-}
-```
-
-</CodeTabs>
-
-The following table describes the parameters that must be added to the service definition to declare the service as a proxy.
-
-| Parameter | Description | Required | Default |
-| ---       | ---         | ---      | ---     |
-| `kind`    | String value that declares the type for the service. This should always be set to `connect-proxy` to declare the services as a service mesh proxy. | Required | None |
-| `proxy` | Object that contains the [proxies parameters](#proxy-parameters). <br/>The `destination_service_name` parameter must be included in the `proxy` configuration. The `destination_service_name` parameter specifies the name of the services that the proxy represents. <br/>This parameter replaces `proxy_destination` used in Consul 1.2.0 to 1.3.0. The `proxy_destination` parameter was deprecated in 1.5.0. | Required | None |
-| `port` | Integer value that specifies the port where other services in the mesh can discover and connect to proxied services. | Required | None |
-| `address` | Specifies the IP address of the proxy. | Optional <br/>The address will be inherited from the node configuration. | `address` specified in the node configuration. |
-
-You can specify several additional parameters to configure the proxy to meet your requirements. See [Proxy Parameters](#proxy-parameters) for additional information.
-
-### Example
-
-In the following example, a proxy named `redis-proxy` is registered as a service mesh proxy. It proxies to the `redis` service and is available at port `8181`. As a result, any service mesh clients searching for a mesh-capable endpoint for `redis` will find this proxy.
-
-<CodeTabs heading="Minimal example of a service mesh proxy">
-
-```hcl
-kind = "connect-proxy"
-name = "redis-proxy"
-port = 8181
-proxy = {
-  destination_service_name = "redis"
-}
-```
-
-```json
-{
-  "name": "redis-proxy",
-  "kind": "connect-proxy",
-  "proxy": {
-    "destination_service_name": "redis"
-  },
-  "port": 8181
-}
-```
-
-</CodeTabs>
-
-### Sidecar proxy configuration
-
-Many service mesh proxies are deployed as sidecars.
-Sidecar proxies are co-located with the single service instance they represent and proxy all inbound traffic to.
-
-Specify the following parameters in the `proxy` code block to configure a sidecar proxy in its own service registration:
-
-* `destination_service_id`: String value that specifies the ID of the service being proxied. Refer to the [proxy parameters reference](#destination-service-id) for details.
-* `local_service_port`: Integer value that specifies the port that the proxy should use to connect to the _local_ service instance. Refer to the [proxy parameters reference](#local-service-port) for details.
-* `local_service_address`: String value that specifies the IP address or hostname that the proxy should use to connect to the _local_ service. Refer to the [proxy parameters reference](#local-service-address) for details.
-
-Refer to [Deploy sidecar services](/consul/docs/connect/proxies/deploy-sidecar-services) for additional information about configuring service mesh proxies as sidecars.
-
-### Complete configuration example
-
-The following example includes values for all available options when registering a proxy instance.
-
-<CodeTabs heading="Example that includes all configuration options when registering a proxy instance">
-
-```hcl
-kind = "connect-proxy"
-name = "redis-proxy"
-port = 8181
-proxy = {
-  config = {}
-  destination_service_id = "redis1"
-  destination_service_name = "redis"
-  expose = {}
-  local_service_address = "127.0.0.1"
-  local_service_port = 9090
-  local_service_socket_path = "/tmp/redis.sock"
-  mesh_gateway = {}
-  mode = "transparent"
-  transparent_proxy = {}
-  upstreams = []
-}
-```
-
-```json
-{
-  "name": "redis-proxy",
-  "kind": "connect-proxy",
-  "proxy": {
-    "destination_service_name": "redis",
-    "destination_service_id": "redis1",
-    "local_service_address": "127.0.0.1",
-    "local_service_port": 9090,
-    "local_service_socket_path": "/tmp/redis.sock",
-    "mode": "transparent",
-    "transparent_proxy": {},
-    "config": {},
-    "upstreams": [],
-    "mesh_gateway": {},
-    "expose": {}
-  },
-  "port": 8181
-}
-```
-
-</CodeTabs>
-
-### Proxy parameters
-
-The following table describes all parameters that can be defined in the `proxy` block.
-
-| Parameter | Description | Required | Default |
-| ---       | ---         | ---      | ---     |
-| `destination_service_id` <a name="destination-service-id"/>| String value that specifies the ID of a single service instance represented by the proxy. <br/>This parameter is only applicable for sidecar proxies that run on the same node as the service. <br/>Consul checks for the proxied service on the same agent. <br/>The ID is unique and may differ from its `name` value. <br/>Specifying this parameter helps tools identify which sidecar proxy instances are associated with which application instance, as well as enable fine-grained analysis of the metrics coming from the proxy.| Required when registering proxy as a sidecar | None |
-| `local_service_port` <a name="local-service-port"/>| Integer value that specifies the port that a sidecar proxy should use to connect to the _local_ service instance. | Required when registering proxy as a sidecar | Port advertised by the service instance configured in `destination_service_id` |
-| `local_service_address` <a name="local-service-address"/>| String value that specifies the IP address or hostname that a sidecar proxy should use to connect to the _local_ service. | Optional | `127.0.0.1` |
-| `destination_service_name` | String value that specifies the _name_ of the service the instance is proxying. The name is used during service discovery to route to the correct proxy instances for a given service name. | Required | None |
-| `local_service_socket_path` | String value that specifies the path of a Unix domain socket for connecting to the local application instance. <br/>This parameter value is created by the application and conflicts with `local_service_address` and `local_service_port`. <br/>Supported when using Envoy for the proxy. | Optional | None |
-| `mode` | String value that specifies the proxy mode. See [Proxy Modes](#proxy-modes) for additional information. | Optional | `direct` |
-| `transparent_proxy` | Object value that specifies the configuration specific to proxies in `transparent` mode. <br/>See [Proxy Modes](#proxy-modes) and [Transparent Proxy Configuration Reference](#transparent-proxy-configuration-reference) for additional information. <br/>This parameter was added in Consul 1.10.0. | Optional | None |
-| `config` | Object value that specifies an opaque JSON configuration. The JSON is stored and returned along with the service instance when called from the API. | Optional | None |
-| `upstreams` | An array of objects that specify the upstream services that the proxy should create listeners for. Refer to  [Upstream Configuration Reference](#upstream-configuration-reference) for details. | Optional | None |
-| `mesh_gateway` | Object value that specifies the mesh gateway configuration for the proxy. Refer to [Mesh Gateway Configuration Reference](#mesh-gateway-configuration-reference) for details. | Optional | None |
-| `expose` | Object value that specifies a configuration for exposing HTTP paths through the proxy. <br/>This parameter is only compatible with Envoy proxies. <br/>Refer to [Expose Paths Configuration Reference](#expose-paths-configuration-reference) for details. | Optional | None |
-
-### Upstream configuration reference
-
-You can configure the service mesh proxy to create listeners for upstream services. The listeners enable the upstream service to accept requests. You can specify the following parameters to configure upstream service listeners.
-
-| Parameter | Description | Required | Default |
-| ---       | ---         | ---      | ---     |
-|`destination_name` | String value that specifies the name of the service or prepared query to route the service mesh to. The prepared query should be the name or the ID of the prepared query. | Required | None |
-| `destination_namespace` | String value that specifies the namespace containing the upstream service. <EnterpriseAlert inline /> | Optional | Defaults to the local namespace |
-| `destination_peer` | String value that specifies the name of the peer cluster containing the upstream service. | Optional | None |
-| `destination_partition` | String value that specifies the name of the admin partition containing the upstream service. If `destination_peer` is set, `destination_partition` refers to the local admin partition in which the peering was established. <EnterpriseAlert inline /> | Optional | Defaults to the local partition |
-| `local_bind_port` | Integer value that specifies the port to bind a local listener to. The application will make outbound connections to the upstream from the local port. | Required | None |
-| `local_bind_address` | String value that specifies the address to bind a local listener to. The application will make outbound connections to the upstream service from the local bind address. | Optional | `127.0.0.1` |
-| `local_bind_socket_path` | String value that specifies the path at which to bind a Unix domain socket listener. The application will make outbound connections to the upstream from the local bind socket path. <br/>This parameter conflicts with the `local_bind_port` or `local_bind_address` parameters. <br/>Supported when using Envoy as a proxy. | Optional | None|
-| `local_bind_socket_mode` | String value that specifies a Unix octal that configures file permissions for the socket. | Optional | None |
-| `destination_type` | String value that specifies the type of discovery query the proxy should use for finding service mesh instances. The following values are supported: <li>`service`: Queries for upstream `service` types. </li><li> `prepared_query`: Queries for upstream prepared queries.</li> | Optional | `service` |
-| `datacenter` | String value that specifies the datacenter to issue the discovery query to. | Optional | Defaults to the local datacenter. |
-| `config` | Object value that specifies opaque configuration options that will be provided to the proxy instance for the upstream. <br/>Valid JSON objects are also supported. <br/>The `config` parameter can specify timeouts, retries, and other proxy-specific features for the given upstream. <br/>See the [built-in proxy configuration reference](/consul/docs/connect/proxies/built-in#proxy-upstream-config-key-reference) for configuration options when using the built-in proxy. <br/>If using Envoy as a proxy, see [Envoy configuration reference](/consul/docs/connect/proxies/envoy#proxy-upstream-config-options) | Optional | None |
-| `mesh_gateway` | Object that defines the mesh gateway configuration for the proxy. Refer to the [Mesh Gateway Configuration Reference](#mesh-gateway-configuration-reference) for configuration details. | Optional | None |
-
-### Upstream configuration examples
-
-Upstreams support multiple destination types. The following examples include information about each implementation. Note that the examples in this topic use snake case, which is a convention that separates words with underscores, because the format is supported in configuration files and API registrations. 
-
-<CodeTabs heading="Example service destination upstream">
-
-```hcl
-destination_type = "service"
-destination_name = "redis"
-datacenter = "dc1"
-local_bind_address = "127.0.0.1"
-local_bind_port = 1234
-local_bind_socket_path = "/tmp/redis_5678.sock"
-local_bind_socket_mode = "0700"
-mesh_gateway = {
-    mode = "local"
-}
-```
-
-```json
-{
-  "destination_type": "service",
-  "destination_name": "redis",
-  "datacenter": "dc1",
-  "local_bind_address": "127.0.0.1",
-  "local_bind_port": 1234,
-  "local_bind_socket_path": "/tmp/redis_5678.sock",
-  "local_bind_socket_mode": "0700",
-  "mesh_gateway": {
-    "mode": "local"
-  }
-}
-```
-
-</CodeTabs>
-
-<CodeTabs heading="Example prepared query upstream">
-
-```hcl
-destination_type = "prepared_query"
-destination_name = "database"
-local_bind_address = "127.0.0.1"
-local_bind_port = 1234
-config = {}
-```
-
-```json
-{
-  "destination_type": "prepared_query",
-  "destination_name": "database",
-  "local_bind_address": "127.0.0.1",
-  "local_bind_port": 1234,
-  "config": {}
-}
-```
-
-</CodeTabs>
-
-<CodeTabs heading="Example of dialing remote upstreams across admin partitions">
-
-```hcl
-destination_partition = "finance"
-destination_namespace = "default"
-destination_type = "service"
-destination_name = "billing"
-local_bind_port = 9090
-```
-
-```json
-{
-  "destination_partition": "finance",
-  "destination_namespace": "default",
-  "destination_type": "service",
-  "destination_name": "billing",
-  "local_bind_port": 9090
-}
-```
-
-</CodeTabs>
-<CodeTabs heading="Example of dialing remote upstreams across peers">
-
-```hcl
-destination_peer = "cloud-services"
-destination_partition = "finance"
-destination_namespace = "default"
-destination_type = "service"
-destination_name = "api"
-local_bind_port = 9090
-```
-
-```json
-{
-  "destination_peer": "cloud-services",
-  "destination_partition": "finance",
-  "destination_namespace": "default",
-  "destination_type": "service",
-  "destination_name": "api",
-  "local_bind_port": 9090
-}
-```
-
-</CodeTabs>
-
-## Proxy modes
-
-You can configure which mode a proxy operates in by specifying `"direct"` or `"transparent"` in the `mode` parameter. The proxy mode determines the how proxies direct traffic. This feature was added in Consul 1.10.0.
-
-* `transparent`: In this mode, inbound and outbound application traffic is captured and redirected through the proxy. This mode does not enable the traffic redirection. It directs Consul to configure Envoy as if traffic is already being redirected.
-* `direct`: In this mode, the proxy's listeners must be dialed directly by the local application and other proxies.
-
-You can also specify an empty string (`""`), which configures the proxy to operate in the default mode. The default mode is inherited from parent parameters in the following order of precedence:
-
-1. Proxy service's `Proxy` configuration
-1. The `service-defaults` configuration for the service.
-1. The `global` `proxy-defaults`.
-
-The proxy will default to `direct` mode if a mode cannot be determined from the parent parameters.
-
-### Transparent proxy configuration reference
-
-The following examples show additional configuration for transparent proxies.
-
-Note that the examples in this topic use snake case, which is a convention that separates words with underscores, because the format is supported in configuration files and API registrations.
-
-#### Configure a proxy listener for outbound traffic on port 22500
-
-```json
-{
-  "outbound_listener_port": 22500,
-  "dialed_directly": true
-}
-```
-
-- `outbound_listener_port` `(int: 15001)` - The port the proxy should listen on for outbound traffic.
-   This must be the port where outbound application traffic is captured and redirected to.
-- `dialed_directly` `(bool: false)` - Determines whether this proxy instance's IP address can be dialed
-   directly by transparent proxies. Transparent proxies typically dial upstreams using the "virtual"
-   tagged address, which load balances across instances. A database cluster with a leader is an example
-   where dialing individual instances can be helpful. Cannot be used with upstreams which define a `destination_peer`.
-
-  ~> **Note:** Dynamic routing rules such as failovers and redirects do not apply to services dialed directly.
-     Additionally, the connection is proxied using a TCP proxy with a connection timeout of 5 seconds.
-
-### Mesh gateway configuration reference
-
-The following examples show all possible mesh gateway configurations.
-
- Note that the examples in this topic use snake case, which is a convention that separates words with underscores, because the format is supported in configuration files and API registrations.
-
-#### Using local and egress gateways in the local datacenter
-
-```json
-{
-  "mode": "local"
-}
-```
-
-#### Direct to remote and ingress services in a remote datacenter
-
-```json
-{
-  "mode": "remote"
-}
-```
-
-#### Disable a mesh gateway
-
-```json
-{
-  "mode": "none"
-}
-```
-
-#### Specify the default mesh gateway mode
-
-```json
-{
-  "mode": ""
-}
-```
-
-- `mode` `(string: "")` - This defines the mode of operation for how
-  upstreams with a remote destination datacenter get resolved.
-  - `"local"` - Mesh gateway services in the local datacenter will be used
-    as the next-hop destination for the upstream connection.
-  - `"remote"` - Mesh gateway services in the remote/target datacenter will
-    be used as the next-hop destination for the upstream connection.
-  - `"none"` - No mesh gateway services will be used and the next-hop destination
-    for the connection will be directly to the final service(s).
-  - `""` - Default mode. The default mode will be `"none"` if no other configuration
-    enables them. The order of precedence for setting the mode is
-    1.  Upstream
-    2.  Proxy Service's `Proxy` configuration
-    3.  The `service-defaults` configuration for the service.
-    4.  The `global` `proxy-defaults`.
-
-### Expose paths configuration reference
-
-The following examples show possible configurations to expose HTTP paths through Envoy.
-
-Exposing paths through Envoy enables a service to protect itself by only listening on localhost, while still allowing
-non-mesh-enabled applications to contact an HTTP endpoint.
-Some examples include: exposing a `/metrics` path for Prometheus or `/healthz` for kubelet liveness checks.
- 
-Note that the examples in this topic use snake case, which is a convention that separates words with underscores, because the format is supported in configuration files and API registrations.
-
-#### Expose listeners in Envoy for health checks
-
-The following example exposes Envoy listeners to HTTP and GRPC checks registered with the local Consul agent:
-
-```json
-{
-  "expose": {
-    "checks": true
-  }
-}
-```
-
-#### Expose an HTTP listener 
-
-The following example exposes and HTTP listener in Envoy at port `21500` that routes to an HTTP server listening at port `8080`:
-
-```json
-{
-  "expose": {
-    "paths": [
-      {
-        "path": "/healthz",
-        "local_path_port": 8080,
-        "listener_port": 21500
-      }
-    ]
-  }
-}
-```
-
-#### Expose an HTTP2 listener 
-
-The following example expose an HTTP2 listener in Envoy at port `21501` that routes to a gRPC server listening at port `9090`:
-
-```json
-{
-  "expose": {
-    "paths": [
-      {
-        "path": "/grpc.health.v1.Health/Check",
-        "protocol": "http2",
-        "local_path_port": 9090,
-        "listener_port": 21501
-      }
-    ]
-  }
-}
-```
-
-- `checks` `(bool: false)` - If enabled, all HTTP and gRPC checks registered with the agent are exposed through Envoy.
-  Envoy will expose listeners for these checks and will only accept connections originating from localhost or Consul's
-  [advertise address](/consul/docs/agent/config/config-files#advertise). The port for these listeners are dynamically allocated from
-  [expose_min_port](/consul/docs/agent/config/config-files#expose_min_port) to [expose_max_port](/consul/docs/agent/config/config-files#expose_max_port).
-  This flag is useful when a Consul client cannot reach registered services over localhost. One example is when running
-  Consul on Kubernetes, and Consul agents run in their own pods.
-- `paths` `array<Path>: []` - A list of paths to expose through Envoy.
-  - `path` `(string: "")` - The HTTP path to expose. The path must be prefixed by a slash. ie: `/metrics`.
-  - `local_path_port` `(int: 0)` - The port where the local service is listening for connections to the path.
-  - `listener_port` `(int: 0)` - The port where the proxy will listen for connections. This port must be available for
-    the listener to be set up. If the port is not free then Envoy will not expose a listener for the path,
-    but the proxy registration will not fail.
-  - `protocol` `(string: "http")` - Sets the protocol of the listener. One of `http` or `http2`. For gRPC use `http2`.
-
-### Unix domain sockets
-
-To connect to a service using a local Unix domain socket instead of a port, add `local_bind_socket_path` and optionally `local_bind_socket_mode` to the upstream config for a service. The following examples show additional configurations for Unix domain sockets:
-
-<CodeTabs>
-
-```hcl
-upstreams = [
-  {
-    destination_name = "service-1"
-    local_bind_socket_path = "/tmp/socket_service_1"
-    local_bind_socket_mode = "0700"
-  }
-]
-```
-
-```json
-{
-  "upstreams": [
-    {
-        "destination_name":  "service-1",
-        "local_bind_socket_path": "/tmp/socket_service_1",
-        "local_bind_socket_mode": "0700"
-    }
-  ]
-}
-```
-
-</CodeTabs>
-
-Envoy creates a socket with the specified path and mode and connects to `service-1`.
-
-The `mode` field is optional. When omitted, Envoy uses the default mode. This is not applicable for abstract sockets. Refer to the
-[Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/address.proto#envoy-v3-api-msg-config-core-v3-pipe)
-for details.
-
--> These options conflict with the `local_bind_socket_port` and
-`local_bind_socket_address` options. For a given upstream the proxy can bind either to an IP port or
-a Unix socket, but not both.
-
-Similarly to expose a service listening on a Unix Domain socket to the service
-mesh, use either the `socket_path` field in the service definition or the
-`local_service_socket_path` field in the proxy definition. These
-fields are analogous to the `port` and `service_port` fields in their
-respective locations.
-
-<CodeTabs>
-
-```hcl
-services {
-  name = "service-2"
-  socket_path = "/tmp/socket_service_2"
-}
-```
-
-```json
-{
-  "services": {
-    "name": "service-2",
-    "socket_path": "/tmp/socket_service_2"
-  }
-}
-```
-
-</CodeTabs>
-
-Or in the proxy definition:
-
-<CodeTabs>
-
-```hcl
-services {
-  name = "socket_service_2"
-  connect {
-    sidecar_service {
-      proxy {
-        name = "service-2"
-        local_service_socket_path = "/tmp/socket_service_2"
-      }
-    }
-  }
-}
-```
-
-```json
-{
-  "services": [
-    {
-      "name": "socket_service_2",
-      "connect": {
-        "sidecar_service": {
-          "proxy": {
-            "name": "service-2",
-            "local_service_socket_path": "/tmp/socket_service_2"
-          }
-        }
-      }
-    }
-  ]
-}
-```
-
-</CodeTabs>
-
-There is no mode field since the service is expected to create the
-socket it is listening on, not the Envoy proxy.
-Again, the `socket_path` and `local_service_socket_path` fields conflict
-with `address`/`port` and `local_service_address`/`local_service_port`
-configuration options.
diff --git a/website/content/docs/connect/registration/index.mdx b/website/content/docs/connect/registration/index.mdx
new file mode 100644
index 0000000000000..96db32788776b
--- /dev/null
+++ b/website/content/docs/connect/registration/index.mdx
@@ -0,0 +1,22 @@
+---
+layout: docs
+page_title: Service Mesh Proxy Registration Overview
+description: >-
+  To make Consul aware of proxies in your service mesh, you must register them. Learn about methods for configuring and registering sidecar proxies.
+---
+
+# Service Mesh Proxy Overview
+
+To enable service mesh proxies, you must define and register them with Consul. Proxies are a type of service in Consul that facilitate highly secure communication between services in a service mesh. The topics in the section outline your options for registering service mesh proxies. You can register proxies independently or nested inside a sidecar service registration.
+
+## Proxy service registration
+
+To register proxies with independent proxy service registrations, you can define them in either in config files or via the API just like any other service. Learn more about all of the options you can define when registering your proxy service in the [proxy registration documentation](/consul/docs/connect/registration/service-registration).
+
+## Sidecar service registration
+
+To reduce the amount of boilerplate needed for a sidecar proxy,
+application service definitions may define an inline sidecar service block. This is an opinionated
+shorthand for a separate full proxy registration as described above. For a
+description of how to configure the sidecar proxy as well as the opinionated defaults, see the [sidecar service registrations
+documentation](/consul/docs/connect/registration/sidecar-service).
diff --git a/website/content/docs/connect/registration/service-registration.mdx b/website/content/docs/connect/registration/service-registration.mdx
new file mode 100644
index 0000000000000..18658b289239d
--- /dev/null
+++ b/website/content/docs/connect/registration/service-registration.mdx
@@ -0,0 +1,559 @@
+---
+layout: docs
+page_title: Register a Service Mesh Proxy Outside of a Service Registration
+description: >-
+  You can register a service mesh sidecar proxy separately from the registration of the service instance it fronts. Learn about proxy configuration options and how to format them with examples.
+---
+
+# Register a Service Mesh Proxy Outside of a Service Registration
+
+This topic describes how to declare a service mesh proxy in a service definition. The `kind` must be declared and information about the service they represent must be provided to function as a Consul service mesh proxy.
+
+
+## Configuration
+
+Configure a service mesh proxy using the following syntax:
+
+<CodeTabs heading="Basic syntax for configuring a service mesh proxy">
+
+```hcl
+name =  <name of the service>
+kind = "connect-proxy"
+proxy = {
+  destination_service_name = "<name of the service that the proxy represents>"
+  <additional proxy parameters> = "<additional parameter values>"
+}
+port = <port where services can discover and connect to proxied services>
+```
+
+```json
+{
+  "name": "<name of the service>",
+  "kind": "connect-proxy",
+  "proxy": {
+    "destination_service_name": "<name of the service that the proxy represents>",
+    "<additional proxy parameters>" : "<additional parameter values>"
+  },
+  "port": <port where services can discover and connect to proxied services>
+}
+```
+
+</CodeTabs>
+
+The following table describes the parameters that must be added to the service definition to declare the service as a proxy.
+
+| Parameter | Description | Required | Default |
+| ---       | ---         | ---      | ---     |
+| `kind`    | String value that declares the type for the service. This should always be set to `connect-proxy` to declare the services as a service mesh proxy. | Required | None |
+| `proxy` | Object that contains the [proxies parameters](#proxy-parameters). <br/>The `destination_service_name` parameter must be included in the `proxy` configuration. The `destination_service_name` parameter specifies the name of the services that the proxy represents. <br/>This parameter replaces `proxy_destination` used in Consul 1.2.0 to 1.3.0. The `proxy_destination` parameter was deprecated in 1.5.0. | Required | None |
+| `port` | Integer value that specifies the port where other services in the mesh can discover and connect to proxied services. | Required | None |
+| `address` | Specifies the IP address of the proxy. | Optional <br/>The address will be inherited from the node configuration. | `address` specified in the node configuration. |
+
+You can specify several additional parameters to configure the proxy to meet your requirements. See [Proxy Parameters](#proxy-parameters) for additional information.
+
+### Example
+
+In the following example, a proxy named `redis-proxy` is registered as a service mesh proxy. It proxies to the `redis` service and is available at port `8181`. As a result, any service mesh clients searching for a mesh-capable endpoint for `redis` will find this proxy.
+
+<CodeTabs heading="Minimal example of a service mesh proxy">
+
+```hcl
+kind = "connect-proxy"
+name = "redis-proxy"
+port = 8181
+proxy = {
+  destination_service_name = "redis"
+}
+```
+
+```json
+{
+  "name": "redis-proxy",
+  "kind": "connect-proxy",
+  "proxy": {
+    "destination_service_name": "redis"
+  },
+  "port": 8181
+}
+```
+
+</CodeTabs>
+
+### Sidecar Proxy Configuration
+
+Many service mesh proxies are deployed as sidecars.
+Sidecar proxies are co-located with the single service instance they represent and proxy all inbound traffic to.
+
+Specify the following parameters in the `proxy` code block to configure a sidecar proxy in its own service registration:
+
+* `destination_service_id`: String value that specifies the ID of the service being proxied. Refer to the [proxy parameters reference](#destination-service-id) for details.
+* `local_service_port`: Integer value that specifies the port that the proxy should use to connect to the _local_ service instance. Refer to the [proxy parameters reference](#local-service-port) for details.
+* `local_service_address`: String value that specifies the IP address or hostname that the proxy should use to connect to the _local_ service. Refer to the [proxy parameters reference](#local-service-address) for details.
+
+See [Sidecar Service Registration](/consul/docs/connect/registration/sidecar-service) for additional information about configuring service mesh proxies as sidecars.
+
+### Complete Configuration Example
+
+The following example includes values for all available options when registering a proxy instance.
+
+<CodeTabs heading="Example that includes all configuration options when registering a proxy instance">
+
+```hcl
+kind = "connect-proxy"
+name = "redis-proxy"
+port = 8181
+proxy = {
+  config = {}
+  destination_service_id = "redis1"
+  destination_service_name = "redis"
+  expose = {}
+  local_service_address = "127.0.0.1"
+  local_service_port = 9090
+  local_service_socket_path = "/tmp/redis.sock"
+  mesh_gateway = {}
+  mode = "transparent"
+  transparent_proxy = {}
+  upstreams = []
+}
+```
+
+```json
+{
+  "name": "redis-proxy",
+  "kind": "connect-proxy",
+  "proxy": {
+    "destination_service_name": "redis",
+    "destination_service_id": "redis1",
+    "local_service_address": "127.0.0.1",
+    "local_service_port": 9090,
+    "local_service_socket_path": "/tmp/redis.sock",
+    "mode": "transparent",
+    "transparent_proxy": {},
+    "config": {},
+    "upstreams": [],
+    "mesh_gateway": {},
+    "expose": {}
+  },
+  "port": 8181
+}
+```
+
+</CodeTabs>
+
+### Proxy Parameters
+
+The following table describes all parameters that can be defined in the `proxy` block.
+
+| Parameter | Description | Required | Default |
+| ---       | ---         | ---      | ---     |
+| `destination_service_id` <a name="destination-service-id"/>| String value that specifies the ID of a single service instance represented by the proxy. <br/>This parameter is only applicable for sidecar proxies that run on the same node as the service. <br/>Consul checks for the proxied service on the same agent. <br/>The ID is unique and may differ from its `name` value. <br/>Specifying this parameter helps tools identify which sidecar proxy instances are associated with which application instance, as well as enable fine-grained analysis of the metrics coming from the proxy.| Required when registering proxy as a sidecar | None |
+| `local_service_port` <a name="local-service-port"/>| Integer value that specifies the port that a sidecar proxy should use to connect to the _local_ service instance. | Required when registering proxy as a sidecar | Port advertised by the service instance configured in `destination_service_id` |
+| `local_service_address` <a name="local-service-address"/>| String value that specifies the IP address or hostname that a sidecar proxy should use to connect to the _local_ service. | Optional | `127.0.0.1` |
+| `destination_service_name` | String value that specifies the _name_ of the service the instance is proxying. The name is used during service discovery to route to the correct proxy instances for a given service name. | Required | None |
+| `local_service_socket_path` | String value that specifies the path of a Unix domain socket for connecting to the local application instance. <br/>This parameter value is created by the application and conflicts with `local_service_address` and `local_service_port`. <br/>Supported when using Envoy for the proxy. | Optional | None |
+| `mode` | String value that specifies the proxy mode. See [Proxy Modes](#proxy-modes) for additional information. | Optional | `direct` |
+| `transparent_proxy` | Object value that specifies the configuration specific to proxies in `transparent` mode. <br/>See [Proxy Modes](#proxy-modes) and [Transparent Proxy Configuration Reference](#transparent-proxy-configuration-reference) for additional information. <br/>This parameter was added in Consul 1.10.0. | Optional | None |
+| `config` | Object value that specifies an opaque JSON configuration. The JSON is stored and returned along with the service instance when called from the API. | Optional | None |
+| `upstreams` | An array of objects that specify the upstream services that the proxy should create listeners for. Refer to  [Upstream Configuration Reference](#upstream-configuration-reference) for details. | Optional | None |
+| `mesh_gateway` | Object value that specifies the mesh gateway configuration for the proxy. Refer to [Mesh Gateway Configuration Reference](#mesh-gateway-configuration-reference) for details. | Optional | None |
+| `expose` | Object value that specifies a configuration for exposing HTTP paths through the proxy. <br/>This parameter is only compatible with Envoy proxies. <br/>Refer to [Expose Paths Configuration Reference](#expose-paths-configuration-reference) for details. | Optional | None |
+
+### Upstream Configuration Reference
+
+You can configure the service mesh proxy to create listeners for upstream services. The listeners enable the upstream service to accept requests. You can specify the following parameters to configure upstream service listeners.
+
+| Parameter | Description | Required | Default |
+| ---       | ---         | ---      | ---     |
+|`destination_name` | String value that specifies the name of the service or prepared query to route the service mesh to. The prepared query should be the name or the ID of the prepared query. | Required | None |
+| `destination_namespace` | String value that specifies the namespace containing the upstream service. <EnterpriseAlert inline /> | Optional | `default` |
+| `destination_peer` | String value that specifies the name of the peer cluster containing the upstream service. | Optional | None |
+| `destination_partition` | String value that specifies the name of the admin partition containing the upstream service. If `destination_peer` is set, `destination_partition` refers to the local admin partition in which the peering was established. <EnterpriseAlert inline /> | Optional | `default` |
+| `local_bind_port` | Integer value that specifies the port to bind a local listener to. The application will make outbound connections to the upstream from the local port. | Required | None |
+| `local_bind_address` | String value that specifies the address to bind a local listener to. The application will make outbound connections to the upstream service from the local bind address. | Optional | `127.0.0.1` |
+| `local_bind_socket_path` | String value that specifies the path at which to bind a Unix domain socket listener. The application will make outbound connections to the upstream from the local bind socket path. <br/>This parameter conflicts with the `local_bind_port` or `local_bind_address` parameters. <br/>Supported when using Envoy as a proxy. | Optional | None|
+| `local_bind_socket_mode` | String value that specifies a Unix octal that configures file permissions for the socket. | Optional | None |
+| `destination_type` | String value that specifies the type of discovery query the proxy should use for finding service mesh instances. The following values are supported: <li>`service`: Queries for upstream `service` types. </li><li> `prepared_query`: Queries for upstream prepared queries.</li> | Optional | `service` |
+| `datacenter` | String value that specifies the datacenter to issue the discovery query to. | Optional | Defaults to the local datacenter. |
+| `config` | Object value that specifies opaque configuration options that will be provided to the proxy instance for the upstream. <br/>Valid JSON objects are also supported. <br/>The `config` parameter can specify timeouts, retries, and other proxy-specific features for the given upstream. <br/>See the [built-in proxy configuration reference](/consul/docs/connect/proxies/built-in#proxy-upstream-config-key-reference) for configuration options when using the built-in proxy. <br/>If using Envoy as a proxy, see [Envoy configuration reference](/consul/docs/connect/proxies/envoy#proxy-upstream-config-options) | Optional | None |
+| `mesh_gateway` | Object that defines the mesh gateway configuration for the proxy. Refer to the [Mesh Gateway Configuration Reference](#mesh-gateway-configuration-reference) for configuration details. | Optional | None |
+
+### Upstream Configuration Examples
+
+Upstreams support multiple destination types. The following examples include information about each implementation. Note that the examples in this topic use snake case, which is a convention that separates words with underscores, because the format is supported in configuration files and API registrations. 
+
+<CodeTabs heading="Example service destination upstream">
+
+```hcl
+destination_type = "service"
+destination_name = "redis"
+datacenter = "dc1"
+local_bind_address = "127.0.0.1"
+local_bind_port = 1234
+local_bind_socket_path = "/tmp/redis_5678.sock"
+local_bind_socket_mode = "0700"
+mesh_gateway = {
+    mode = "local"
+}
+```
+
+```json
+{
+  "destination_type": "service",
+  "destination_name": "redis",
+  "datacenter": "dc1",
+  "local_bind_address": "127.0.0.1",
+  "local_bind_port": 1234,
+  "local_bind_socket_path": "/tmp/redis_5678.sock",
+  "local_bind_socket_mode": "0700",
+  "mesh_gateway": {
+    "mode": "local"
+  }
+}
+```
+
+</CodeTabs>
+
+<CodeTabs heading="Example prepared query upstream">
+
+```hcl
+destination_type = "prepared_query"
+destination_name = "database"
+local_bind_address = "127.0.0.1"
+local_bind_port = 1234
+config = {}
+```
+
+```json
+{
+  "destination_type": "prepared_query",
+  "destination_name": "database",
+  "local_bind_address": "127.0.0.1",
+  "local_bind_port": 1234,
+  "config": {}
+}
+```
+
+</CodeTabs>
+
+<CodeTabs heading="Example of dialing remote upstreams across admin partitions">
+
+```hcl
+destination_partition = "finance"
+destination_namespace = "default"
+destination_type = "service"
+destination_name = "billing"
+local_bind_port = 9090
+```
+
+```json
+{
+  "destination_partition": "finance",
+  "destination_namespace": "default",
+  "destination_type": "service",
+  "destination_name": "billing",
+  "local_bind_port": 9090
+}
+```
+
+</CodeTabs>
+<CodeTabs heading="Example of dialing remote upstreams across peers">
+
+```hcl
+destination_peer = "cloud-services"
+destination_partition = "finance"
+destination_namespace = "default"
+destination_type = "service"
+destination_name = "api"
+local_bind_port = 9090
+```
+
+```json
+{
+  "destination_peer": "cloud-services",
+  "destination_partition": "finance",
+  "destination_namespace": "default",
+  "destination_type": "service",
+  "destination_name": "api",
+  "local_bind_port": 9090
+}
+```
+
+</CodeTabs>
+
+## Proxy Modes
+
+You can configure which mode a proxy operates in by specifying `"direct"` or `"transparent"` in the `mode` parameter. The proxy mode determines the how proxies direct traffic. This feature was added in Consul 1.10.0.
+
+* `transparent`: In this mode, inbound and outbound application traffic is captured and redirected through the proxy. This mode does not enable the traffic redirection. It directs Consul to configure Envoy as if traffic is already being redirected.
+* `direct`: In this mode, the proxy's listeners must be dialed directly by the local application and other proxies.
+
+You can also specify an empty string (`""`), which configures the proxy to operate in the default mode. The default mode is inherited from parent parameters in the following order of precedence:
+
+1. Proxy service's `Proxy` configuration
+1. The `service-defaults` configuration for the service.
+1. The `global` `proxy-defaults`.
+
+The proxy will default to `direct` mode if a mode cannot be determined from the parent parameters.
+
+### Transparent Proxy Configuration Reference
+
+The following examples show additional configuration for transparent proxies.
+
+Note that the examples in this topic use snake case, which is a convention that separates words with underscores, because the format is supported in configuration files and API registrations.
+
+#### Configure a proxy listener for outbound traffic on port 22500
+
+```json
+{
+  "outbound_listener_port": 22500,
+  "dialed_directly": true
+}
+```
+
+- `outbound_listener_port` `(int: 15001)` - The port the proxy should listen on for outbound traffic.
+   This must be the port where outbound application traffic is captured and redirected to.
+- `dialed_directly` `(bool: false)` - Determines whether this proxy instance's IP address can be dialed
+   directly by transparent proxies. Transparent proxies typically dial upstreams using the "virtual"
+   tagged address, which load balances across instances. A database cluster with a leader is an example
+   where dialing individual instances can be helpful. Cannot be used with upstreams which define a `destination_peer`.
+
+  ~> **Note:** Dynamic routing rules such as failovers and redirects do not apply to services dialed directly.
+     Additionally, the connection is proxied using a TCP proxy with a connection timeout of 5 seconds.
+
+### Mesh Gateway Configuration Reference
+
+The following examples show all possible mesh gateway configurations.
+
+ Note that the examples in this topic use snake case, which is a convention that separates words with underscores, because the format is supported in configuration files and API registrations.
+
+#### Using a Local/Egress Gateway in the Local Datacenter
+
+```json
+{
+  "mode": "local"
+}
+```
+
+#### Direct to a Remote/Ingress in a Remote Datacenter
+
+```json
+{
+  "mode": "remote"
+}
+```
+
+#### Prevent Using a Mesh Gateway
+
+```json
+{
+  "mode": "none"
+}
+```
+
+#### Default Mesh Gateway Mode
+
+```json
+{
+  "mode": ""
+}
+```
+
+- `mode` `(string: "")` - This defines the mode of operation for how
+  upstreams with a remote destination datacenter get resolved.
+  - `"local"` - Mesh gateway services in the local datacenter will be used
+    as the next-hop destination for the upstream connection.
+  - `"remote"` - Mesh gateway services in the remote/target datacenter will
+    be used as the next-hop destination for the upstream connection.
+  - `"none"` - No mesh gateway services will be used and the next-hop destination
+    for the connection will be directly to the final service(s).
+  - `""` - Default mode. The default mode will be `"none"` if no other configuration
+    enables them. The order of precedence for setting the mode is
+    1.  Upstream
+    2.  Proxy Service's `Proxy` configuration
+    3.  The `service-defaults` configuration for the service.
+    4.  The `global` `proxy-defaults`.
+
+### Expose Paths Configuration Reference
+
+The following examples show possible configurations to expose HTTP paths through Envoy.
+
+Exposing paths through Envoy enables a service to protect itself by only listening on localhost, while still allowing
+non-mesh-enabled applications to contact an HTTP endpoint.
+Some examples include: exposing a `/metrics` path for Prometheus or `/healthz` for kubelet liveness checks.
+ 
+Note that the examples in this topic use snake case, which is a convention that separates words with underscores, because the format is supported in configuration files and API registrations.
+
+#### Expose listeners in Envoy for HTTP and GRPC checks registered with the local Consul agent
+
+```json
+{
+  "expose": {
+    "checks": true
+  }
+}
+```
+
+#### Expose an HTTP listener in Envoy at port 21500 that routes to an HTTP server listening at port 8080
+
+```json
+{
+  "expose": {
+    "paths": [
+      {
+        "path": "/healthz",
+        "local_path_port": 8080,
+        "listener_port": 21500
+      }
+    ]
+  }
+}
+```
+
+#### Expose an HTTP2 listener in Envoy at port 21501 that routes to a gRPC server listening at port 9090
+
+```json
+{
+  "expose": {
+    "paths": [
+      {
+        "path": "/grpc.health.v1.Health/Check",
+        "protocol": "http2",
+        "local_path_port": 9090,
+        "listener_port": 21501
+      }
+    ]
+  }
+}
+```
+
+- `checks` `(bool: false)` - If enabled, all HTTP and gRPC checks registered with the agent are exposed through Envoy.
+  Envoy will expose listeners for these checks and will only accept connections originating from localhost or Consul's
+  [advertise address](/consul/docs/agent/config/config-files#advertise). The port for these listeners are dynamically allocated from
+  [expose_min_port](/consul/docs/agent/config/config-files#expose_min_port) to [expose_max_port](/consul/docs/agent/config/config-files#expose_max_port).
+  This flag is useful when a Consul client cannot reach registered services over localhost. One example is when running
+  Consul on Kubernetes, and Consul agents run in their own pods.
+- `paths` `array<Path>: []` - A list of paths to expose through Envoy.
+  - `path` `(string: "")` - The HTTP path to expose. The path must be prefixed by a slash. ie: `/metrics`.
+  - `local_path_port` `(int: 0)` - The port where the local service is listening for connections to the path.
+  - `listener_port` `(int: 0)` - The port where the proxy will listen for connections. This port must be available for
+    the listener to be set up. If the port is not free then Envoy will not expose a listener for the path,
+    but the proxy registration will not fail.
+  - `protocol` `(string: "http")` - Sets the protocol of the listener. One of `http` or `http2`. For gRPC use `http2`.
+
+### Unix Domain Sockets
+
+The following examples show additional configuration for Unix domain sockets.
+
+Added in v1.10.0.
+
+To connect to a service via local Unix Domain Socket instead of a
+port, add `local_bind_socket_path` and optionally `local_bind_socket_mode`
+to the upstream config for a service:
+
+<CodeTabs>
+
+```hcl
+upstreams = [
+  {
+    destination_name = "service-1"
+    local_bind_socket_path = "/tmp/socket_service_1"
+    local_bind_socket_mode = "0700"
+  }
+]
+```
+
+```json
+{
+  "upstreams": [
+    {
+        "destination_name":  "service-1",
+        "local_bind_socket_path": "/tmp/socket_service_1",
+        "local_bind_socket_mode": "0700"
+    }
+  ]
+}
+```
+
+</CodeTabs>
+
+This will cause Envoy to create a socket with the path and mode
+provided, and connect that to service-1.
+
+The mode field is optional, and if omitted will use the default mode
+for Envoy. This is not applicable for abstract sockets. See the
+[Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/address.proto#envoy-v3-api-msg-config-core-v3-pipe)
+for details.
+
+-> These options conflict with the `local_bind_socket_port` and
+`local_bind_socket_address` options. For a given upstream the proxy can bind either to an IP port or
+a Unix socket, but not both.
+
+Similarly to expose a service listening on a Unix Domain socket to the service
+mesh, use either the `socket_path` field in the service definition or the
+`local_service_socket_path` field in the proxy definition. These
+fields are analogous to the `port` and `service_port` fields in their
+respective locations.
+
+<CodeTabs>
+
+```hcl
+services {
+  name = "service-2"
+  socket_path = "/tmp/socket_service_2"
+}
+```
+
+```json
+{
+  "services": {
+    "name": "service-2",
+    "socket_path": "/tmp/socket_service_2"
+  }
+}
+```
+
+</CodeTabs>
+
+Or in the proxy definition:
+
+<CodeTabs>
+
+```hcl
+services {
+  name = "socket_service_2"
+  connect {
+    sidecar_service {
+      proxy {
+        name = "service-2"
+        local_service_socket_path = "/tmp/socket_service_2"
+      }
+    }
+  }
+}
+```
+
+```json
+{
+  "services": [
+    {
+      "name": "socket_service_2",
+      "connect": {
+        "sidecar_service": {
+          "proxy": {
+            "name": "service-2",
+            "local_service_socket_path": "/tmp/socket_service_2"
+          }
+        }
+      }
+    }
+  ]
+}
+```
+
+</CodeTabs>
+
+There is no mode field since the service is expected to create the
+socket it is listening on, not the Envoy proxy.
+Again, the `socket_path` and `local_service_socket_path` fields conflict
+with `address`/`port` and `local_service_address`/`local_service_port`
+configuration options.
diff --git a/website/content/docs/connect/registration/sidecar-service.mdx b/website/content/docs/connect/registration/sidecar-service.mdx
new file mode 100644
index 0000000000000..46e14869c31ea
--- /dev/null
+++ b/website/content/docs/connect/registration/sidecar-service.mdx
@@ -0,0 +1,175 @@
+---
+layout: docs
+page_title: Register a Service Mesh Proxy in a Service Registration
+description: >-
+  You can register a service instance and its sidecar proxy at the same time. Learn about default settings, customizable parameters, limitations, and lifecycle behaviors of the sidecar proxy.
+---
+
+# Register a Service Mesh Proxy in a Service Registration
+
+This topic describes how to declare a proxy as a _sidecar_ proxy. 
+Sidecar proxies run on the same node as the single service instance that they handle traffic for. 
+They may be on the same VM or running as a separate container in the same network namespace.
+
+## Configuration
+
+Add the `connect.sidecar_service` block to your service definition file and specify the parameters to configure sidecar proxy behavior. The `sidecar_service` block is a service definition that can contain most regular service definition fields. Refer to [Limitations](#limitations) for information about unsupported service definition fields for sidecar proxies. 
+
+Consul treats sidecar proxy service definitions as a root-level service definition. All fields are optional in nested
+definitions, which default to opinionated settings that are intended to reduce burden of setting up a sidecar proxy.
+
+## Minimal Example
+
+To register a service instance with a sidecar, all that's needed is:
+
+```json
+{
+  "service": {
+    "name": "web",
+    "port": 8080,
+    "connect": { "sidecar_service": {} }
+  }
+}
+```
+
+This will register the `web` service as normal, but will also register another
+[proxy service](/consul/docs/connect/proxies) with defaults values used.
+
+The above expands out to be equivalent to the following explicit service
+definitions:
+
+```json
+{
+  "services": [
+    {
+      "name": "web",
+      "port": 8080
+    },
+    {
+      "name": "web-sidecar-proxy",
+      "port": 20000,
+      "kind": "connect-proxy",
+      "checks": [
+        {
+          "Name": "Connect Sidecar Listening",
+          "TCP": "127.0.0.1:20000",
+          "Interval": "10s"
+        },
+        {
+          "name": "Connect Sidecar Aliasing web",
+          "alias_service": "web"
+        }
+      ],
+      "proxy": {
+        "destination_service_name": "web",
+        "destination_service_id": "web",
+        "local_service_address": "127.0.0.1",
+        "local_service_port": 8080
+      }
+    }
+  ]
+}
+```
+
+Details on how the defaults are determined are [documented
+below](#sidecar-service-defaults).
+
+-> **Note:** Sidecar service registrations are only a shorthand for registering
+multiple services. Consul will not start up or manage the actual proxy processes
+for you.
+
+## Overridden Example
+
+The following example shows a service definition where some fields are
+overridden to customize the proxy configuration.
+
+```json
+{
+  "name": "web",
+  "port": 8080,
+  "connect": {
+    "sidecar_service": {
+      "proxy": {
+        "upstreams": [
+          {
+            "destination_name": "db",
+            "local_bind_port": 9191
+          }
+        ],
+        "config": {
+          "handshake_timeout_ms": 1000
+        }
+      }
+    }
+  }
+}
+```
+
+This example customizes the [proxy
+upstreams](/consul/docs/connect/registration/service-registration#upstream-configuration-reference)
+and some [built-in proxy
+configuration](/consul/docs/connect/proxies/built-in).
+
+## Sidecar Service Defaults
+
+The following fields are set by default on a sidecar service registration. With
+[the exceptions noted](#limitations) any field may be overridden explicitly in
+the `connect.sidecar_service` definition to customize the proxy registration.
+The "parent" service refers to the service definition that embeds the sidecar
+proxy.
+
+- `id` - ID defaults to being `<parent-service-id>-sidecar-proxy`. This can't
+  be overridden as it is used to [manage the lifecycle](#lifecycle) of the
+  registration.
+- `name` - Defaults to being `<parent-service-name>-sidecar-proxy`.
+- `tags` - Defaults to the tags of the parent service.
+- `meta` - Defaults to the service metadata of the parent service.
+- `port` - Defaults to being auto-assigned from a configurable
+  range specified by [`sidecar_min_port`](/consul/docs/agent/config/config-files#sidecar_min_port)
+  and [`sidecar_max_port`](/consul/docs/agent/config/config-files#sidecar_max_port).
+- `kind` - Defaults to `connect-proxy`. This can't be overridden currently.
+- `check`, `checks` - By default we add a TCP check on the local address and
+  port for the proxy, and a [service alias
+  check](/consul/docs/services/usage/checks#alias-checks) for the parent service. If either
+  `check` or `checks` fields are set, only the provided checks are registered.
+- `proxy.destination_service_name` - Defaults to the parent service name.
+- `proxy.destination_service_id` - Defaults to the parent service ID.
+- `proxy.local_service_address` - Defaults to `127.0.0.1`.
+- `proxy.local_service_port` - Defaults to the parent service port.
+
+## Limitations
+
+The following fields are not supported in the `connect.sidecar_service` block:
+
+- `id` - Sidecar services get an ID assigned and it is an error to override
+  this. This ensures the agent can correctly deregister the sidecar service
+  later when the parent service is removed.
+- `kind` - Kind defaults to `connect-proxy` and there is currently no way to
+  unset this to make the registration be for a regular non-connect-proxy
+  service.
+- `connect.sidecar_service` - Service definitions can't be nested recursively.
+- `connect.native` - Currently the `kind` is fixed to `connect-proxy` and it's
+  an error to register a `connect-proxy` that is also service mesh-native.
+
+## Lifecycle
+
+Sidecar service registration is mostly a configuration syntax helper to avoid
+adding lots of boiler plate for basic sidecar options, however the agent does
+have some specific behavior around their lifecycle that makes them easier to
+work with.
+
+The agent fixes the ID of the sidecar service to be based on the parent
+service's ID. This enables the following behavior.
+
+- A service instance can _only ever have one_ sidecar service registered.
+- When re-registering via API or reloading from configuration file:
+  - If something changes in the nested sidecar service definition, the change
+    will _update_ the current sidecar registration instead of creating a new
+    one.
+  - If a service registration removes the nested `sidecar_service` then the
+    previously registered sidecar for that service will be deregistered
+    automatically.
+- When reloading the configuration files, if a service definition changes its
+  ID, then a new service instance _and_ a new sidecar instance will be
+  registered. The old ones will be removed since they are no longer found in
+  the config files.
diff --git a/website/content/docs/connect/transparent-proxy.mdx b/website/content/docs/connect/transparent-proxy.mdx
new file mode 100644
index 0000000000000..b24da63b774ee
--- /dev/null
+++ b/website/content/docs/connect/transparent-proxy.mdx
@@ -0,0 +1,282 @@
+---
+layout: docs
+page_title:  Service Mesh - Enable Transparent Proxy Mode
+description: >-
+  Learn how transparent proxy enables Consul on Kubernetes to direct inbound and outbound traffic through the service mesh. Use transparent proxying to increase application security without configuring individual upstream services.
+---
+
+# Enable Transparent Proxy Mode
+
+This topic describes how to use Consul’s transparent proxy feature, which allows applications to communicate through the service mesh without modifying their configurations. Transparent proxy also hardens application security by preventing direct inbound connections that bypass the mesh.
+
+## Introduction
+
+When transparent proxy is enabled, Consul is able to perform the following actions automatically:
+
+- Infer the location of upstream services using service intentions.
+- Redirect outbound connections that point to KubeDNS through the proxy.
+- Force traffic through the proxy to prevent unauthorized direct access to the application.
+
+The following diagram shows how transparent proxy routes traffic:
+
+![Diagram demonstrating that with transparent proxy, connections are automatically routed through the mesh](/img/consul-connect/with-transparent-proxy.png)
+
+When transparent proxy is disabled, you must manually specify the following configurations so that your applications can communicate with other services in the mesh:
+
+* Explicitly configure upstream services by specifying a local port to access them.
+* Change application to access `localhost:<chosen port>`.
+* Configure applications to only listen on the loopback interface to prevent unauthorized traffic from bypassing the mesh.
+
+The following diagram shows how traffic flows through the mesh without transparent proxy enabled:
+
+![Diagram demonstrating that without transparent proxy, applications must "opt in" to connecting to their dependencies through the mesh](/img/consul-connect/without-transparent-proxy.png)
+
+Transparent proxy is available for Kubernetes environments. As part of the integration with Kubernetes, Consul registers Kubernetes Services, injects sidecar proxies, and enables traffic redirection.
+
+## Requirements
+
+Your network must meet the following environment and software requirements to use transparent proxy.
+
+* Transparent proxy is available for Kubernetes environments.
+* Consul 1.10.0+
+* Consul Helm chart 0.32.0+. If you want to use the Consul CNI plugin to redirect traffic, Helm chart 0.48.0+ is required. Refer to [Enable the Consul CNI plugin](#enable-the-consul-cni-plugin) for additional information.
+* [Service intentions](/consul/docs/connect/intentions) must be configured to allow communication between intended services.
+* The `ip_tables` kernel module must be running on all worker nodes within a Kubernetes cluster. If you are using the `modprobe` Linux utility, for example, issue the following command:
+
+  `$ modprobe ip_tables`
+
+~> **Upgrading to a supported version**: Always follow the [proper upgrade path](/consul/docs/upgrading/upgrade-specific/#transparent-proxy-on-kubernetes) when upgrading to a supported version of Consul, Consul on Kubernetes (`consul-k8s`), and the Consul Helm chart.
+
+## Configuration
+
+This section describes how to configure the transparent proxy.
+
+### Enable transparent proxy
+
+You can enable the transparent proxy for an entire cluster, individual Kubernetes namespaces, and individual services.
+
+When you install Consul using the Helm chart, transparent proxy is enabled for the entire cluster by default.
+
+#### Entire cluster
+
+Use the `connectInject.transparentProxy.defaultEnabled` Helm value to enable or disable transparent proxy for the entire cluster:
+
+```yaml
+connectInject:
+  transparentProxy:
+    defaultEnabled: true
+```
+
+#### Kubernetes namespace
+
+Apply the `consul.hashicorp.com/transparent-proxy=true` label to enable transparent proxy for a Kubernetes namespace. The label overrides the `connectInject.transparentProxy.defaultEnabled` Helm value and defines the default behavior of Pods in the namespace. The following example enables transparent proxy for Pods in the `my-app` namespace:
+
+```shell-session
+$ kubectl label namespaces my-app "consul.hashicorp.com/transparent-proxy=true"
+```
+#### Individual service
+
+Apply the `consul.hashicorp.com/transparent-proxy=true` annotation to enable transparent proxy on the Pod for each service. The annotation overrides the Helm value and the namespace label. The following example enables transparent proxy for the `static-server` service:
+
+```yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: static-server
+spec:
+  selector:
+    app: static-server
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 8080
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: static-server
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: static-server
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: static-server
+  template:
+    metadata:
+      name: static-server
+      labels:
+        app: static-server
+      annotations:
+        'consul.hashicorp.com/connect-inject': 'true'
+        'consul.hashicorp.com/transparent-proxy': 'true'
+    spec:
+      containers:
+        - name: static-server
+          image: hashicorp/http-echo:latest
+          args:
+            - -text="hello world"
+            - -listen=:8080
+          ports:
+            - containerPort: 8080
+              name: http
+      serviceAccountName: static-server
+```
+
+### Enable the Consul CNI plugin
+
+By default, Consul generates a `connect-inject init` container as part of the Kubernetes Pod startup process. The container configures traffic redirection in the service mesh through the sidecar proxy. To configure redirection, the container requires elevated CAP_NET_ADMIN privileges, which may not be compatible with security policies in your organization.
+
+Instead, you can enable the Consul container network interface (CNI) plugin to perform traffic redirection. Because the plugin is executed by the Kubernetes kubelet, it already has the elevated privileges necessary to configure the network. Additionally, you do not need to specify annotations that automatically overwrite Kubernetes HTTP health probes when the plugin is enabled (see [Overwrite Kubernetes HTTP health probes](#overwrite-kubernetes-http-health-probes)).
+
+The Consul Helm chart installs the CNI plugin, but it is disabled by default. Refer to the [instructions for enabling the CNI plugin](/consul/docs/k8s/installation/install#enable-the-consul-cni-plugin) in the Consul on Kubernetes installation documentation for additional information.
+
+### Traffic redirection
+
+There are two mechanisms for redirecting traffic through the sidecar proxies. By default, Consul injects an init container that redirects all inbound and outbound traffic. The default mechanism requires elevated permissions (CAP_NET_ADMIN) in order to redirect traffic to the service mesh.
+
+Alternatively, you can enable the Consul CNI plugin to handle traffic redirection. Because the Kubernetes kubelet runs CNI plugins, the Consul CNI plugin has the necessary privileges to apply routing tables in the network.
+
+Both mechanisms redirect all inbound and outbound traffic, but you can configure exceptions for specific Pods or groups of Pods. The following annotations enable you to exclude certain traffic from being redirected to sidecar proxies.
+
+#### Exclude inbound ports
+
+The [`consul.hashicorp.com/transparent-proxy-exclude-inbound-ports`](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-transparent-proxy-exclude-inbound-ports) annotation defines a comma-separated list of inbound ports to exclude from traffic redirection when running in transparent proxy mode. The port numbers are string data values. In the following example, services in the pod at port `8200` and `8201` are not redirected through the transparent proxy:
+
+<CodeBlockConfig heading="Exclude inbound port numbers from redirection">
+
+```yaml
+metadata:
+  annotations:
+    consul.hashicorp.com/transparent-proxy-exclude-inbound-ports: "8200, 8201"
+```
+
+</CodeBlockConfig>
+
+#### Exclude outbound ports
+
+The [`consul.hashicorp.com/transparent-proxy-exclude-outbound-ports`](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-transparent-proxy-exclude-outbound-ports) annotation defines a comma-separated list of outbound ports to exclude from traffic redirection when running in transparent proxy mode. The port numbers are string data values. In the following example, services in the pod at port `8200` and `8201` are not redirected through the transparent proxy:
+
+<CodeBlockConfig heading="Exclude outbound port numbers from redirection">
+
+```yaml
+metadata:
+  annotations":
+    consul.hashicorp.com/transparent-proxy-exclude-outbound-ports: "8200, 8201"
+```
+
+</CodeBlockConfig>
+
+#### Exclude outbound CIDR blocks
+
+The [`consul.hashicorp.com/transparent-proxy-exclude-outbound-cidrs`](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-transparent-proxy-exclude-outbound-cidrs) annotation
+defines a comma-separated list of outbound CIDR blocks to exclude from traffic redirection when running in transparent proxy mode. The CIDR blocks are string data values.
+In the following example, services in the `3.3.3.3/24` IP range are not redirected through the transparent proxy:
+
+<CodeBlockConfig heading="Exclude outbound CIDR blocks from redirection">
+
+```yaml
+metadata:
+  annotations:
+    consul.hashicorp.com/transparent-proxy-exclude-outbound-cidrs: "3.3.3.3,3.3.3.3/24"
+```
+</CodeBlockConfig>
+
+#### Exclude user IDs
+
+The [`consul.hashicorp.com/transparent-proxy-exclude-uids`](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-transparent-proxy-exclude-uids) annotation
+defines a comma-separated list of additional user IDs to exclude from traffic redirection when running in transparent proxy mode. The user IDs are string data values.
+In the following example, services with the IDs `4444 ` and `44444 ` are not redirected through the transparent proxy:
+
+<CodeBlockConfig heading="Exclude user IDs from redirection">
+
+```yaml
+metadata:
+  annotations:
+    consul.hashicorp.com/transparent-proxy-exclude-uids: "4444,44444"
+  }
+}
+```
+
+</CodeBlockConfig>
+
+### Kubernetes HTTP health probes configuration
+
+By default, `connect-inject` is disabled. As a result, Consul on Kubernetes uses a mechanism for traffic redirection that interferes with [Kubernetes HTTP health
+probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/). This is because probes expect the kubelet to reach the application container on the probe's endpoint. Instead, traffic is redirected through the sidecar proxy. As a result, health probes return errors because the kubelet does not encrypt that traffic using a mesh proxy.
+
+There are two methods for solving this issue. The first method is to set the `connectInject.transparentProxy.defaultOverwriteProbes` annotation to overwrite the Kubernetes HTTP health probes so that they point to the proxy. The second method is to [enable the Consul container network interface (CNI) plugin](#enable-the-consul-cni-plugin) to perform traffic redirection. Refer to the [Consul on Kubernetes installation instructions](/consul/docs/k8s/installation/install) for additional information.
+
+#### Overwrite Kubernetes HTTP health probes
+
+You can either include the `connectInject.transparentProxy.defaultOverwriteProbes` Helm value to your command or add the `consul.hashicorp.com/transparent-proxy-overwrite-probes` Kubernetes annotation to your pod configuration to overwrite health probes.
+
+Refer to [Kubernetes Health Checks in Consul on Kubernetes](/consul/docs/k8s/connect/health) for additional information.
+
+### Dial services across Kubernetes cluster
+
+If your [Consul servers are federated between Kubernetes clusters](/consul/docs/k8s/deployment-configurations/multi-cluster/kubernetes),
+then you must configure services in one Kubernetes cluster to explicitly dial a service in the datacenter of another Kubernetes cluster using the
+[consul.hashicorp.com/connect-service-upstreams](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-connect-service-upstreams) annotation.
+The following example configures the service to dial an upstream service called `my-service` in datacenter `dc2` on port `1234`:
+
+```yaml
+consul.hashicorp.com/connect-service-upstreams: "my-service:1234:dc2"
+```
+
+If your Consul cluster is deployed to a [single datacenter spanning multiple Kubernetes clusters](/consul/docs/k8s/deployment-configurations/single-dc-multi-k8s),
+then you must configure services in one Kubernetes cluster to explicitly dial a service in another Kubernetes cluster using the
+[consul.hashicorp.com/connect-service-upstreams](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-connect-service-upstreams) annotation.
+The following example configures the service to dial an upstream service called `my-service` in another Kubernetes cluster on port `1234`:
+
+```yaml
+consul.hashicorp.com/connect-service-upstreams: "my-service:1234"
+```
+
+You do not need to configure services to explicitly dial upstream services if your Consul clusters are connected with a [peering connection](/consul/docs/connect/cluster-peering).
+
+## Usage
+
+When transparent proxy is enabled, traffic sent to [KubeDNS](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/)
+or Pod IP addresses is redirected through the proxy. You must use a selector to bind Kubernetes Services to Pods as you define Kubernetes Services in the mesh.
+The Kubernetes Service name must match the Consul service name to use KubeDNS. This is the default behavior unless you have applied the `consul.hashicorp.com/connect-service`
+Kubernetes annotation to the service pods. The annotation overrides the Consul service name.
+
+Consul configures redirection for each Pod bound to the Kubernetes Service using  `iptables` rules. The rules redirect all inbound and outbound traffic through an inbound and outbound listener on the sidecar proxy. Consul configures the proxy to route traffic to the appropriate upstream services based on [service
+intentions](/consul/docs/connect/config-entries/service-intentions), which address the upstream services using KubeDNS.
+
+In the following example, the Kubernetes service selects `sample-app` application Pods so that they can be reached within the mesh.
+
+<CodeBlockConfig heading="Example service selector">
+
+```yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: sample-app
+  namespace: default
+spec:
+  selector:
+    app: sample-app
+  ports:
+    - protocol: TCP
+      port: 80
+```
+
+</CodeBlockConfig>
+
+Additional services can query the [KubeDNS](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/) at `sample-app.default.svc.cluster.local` to reach `sample-app`. If ACLs are enabled and configured with default `deny` policies, the configuration also requires a [`ServiceIntention`](/consul/docs/connect/config-entries/service-intentions) to allow it to talk to `sample-app`.
+
+### Headless Services
+For services that are not addressed using a virtual cluster IP, you must configure the upstream service using the [DialedDirectly](/consul/docs/connect/config-entries/service-defaults#dialeddirectly) option. Then, use DNS to discover individual instance addresses and dial them through the transparent proxy. When this mode is enabled on the upstream, services present service mesh certificates for mTLS and intentions are enforced at the destination.
+
+Note that when dialing individual instances, Consul ignores the HTTP routing rules configured with configuration entries. The transparent proxy acts as a TCP proxy to the original destination IP address.
+
+## Known Limitations
+
+- Deployment configurations with federation across or a single datacenter spanning multiple clusters must explicitly dial a service in another datacenter or cluster using annotations.
+
+- When dialing headless services, the request is proxied using a plain TCP proxy. Consul does not take into consideration the upstream's protocol.
diff --git a/website/content/docs/consul-vs-other/service-mesh-compare.mdx b/website/content/docs/consul-vs-other/service-mesh-compare.mdx
index 1164336781ae7..419f5679bae1b 100644
--- a/website/content/docs/consul-vs-other/service-mesh-compare.mdx
+++ b/website/content/docs/consul-vs-other/service-mesh-compare.mdx
@@ -2,14 +2,14 @@
 layout: docs
 page_title: Consul compared to other service meshes
 description: >-
-  Consul's service mesh provides zero trust networking based on service identities to authorize, authenticate, and encrypt network services. Consul's service mesh can also provide advanced traffic management capabilities. Although there are many similar capabilities between Consul and other providers like Istio, Solo, Linkerd, Kong, Tetrate, and AWS App Mesh, we highlight the main differentiating factors for help customers compare.
+  Consul's service mesh provides zero trust networking based on service identities to authorize, authenticate, and encrypt network services. Consul's service mesh can also provide advanced traffic management capabilties. Although there are many similar capabilities between Consul and other providers like Istio, Solo, Linkerd, Kong, Tetrate, and AWS App Mesh, we highlight the main differentiating factors for help customers compare. 
 ---
 
 # Consul compared to other service mesh software
 
 **Examples**: Istio, Solo Gloo Mesh, Linkerd, Kong/Kuma, AWS App Mesh
 
-Consul’s service mesh allows organizations to securely connect and manage their network services across multiple different environments. Using Envoy as the sidecar proxy attached to every service, Consul ensures that all service-to-service communication is authorized, authenticated, and encrypted. Consul includes traffic management capabilities like load balancing and traffic splitting, which help developers perform canary testing, A/B tests, and blue/green deployments. Consul also includes health check and observability features.
+Consul’s service mesh allows organizations to securely connect and manage their network services across multiple different environments. Using Envoy as the sidecar proxy attached to every service, Consul ensures that all service-to-service communication is authorized, authenticated, and encrypted. Consul includes traffic management capabilities like load balancing and traffic splitting, which help developers perform canary testing, A/B tests, and blue/green deployments. Consul also includes health check and observability features. 
 
 Consul is platform agnostic — it supports any runtime (Kubernetes, EKS, AKS, GKE, VMs, ECS, Lambda, Nomad) and any cloud provider (AWS, Microsoft Azure, GCP, private clouds). This makes it one of the most flexible service discovery and service mesh platforms. While other service mesh software provides support for multiple runtimes for the data plane, they require you to run the control plane solely on Kubernetes. With Consul, you can run both the control plane and data plane in different runtimes.
 
diff --git a/website/content/docs/dynamic-app-config/kv.mdx b/website/content/docs/dynamic-app-config/kv.mdx
index 982c7729380d5..62406e019dfa0 100644
--- a/website/content/docs/dynamic-app-config/kv.mdx
+++ b/website/content/docs/dynamic-app-config/kv.mdx
@@ -7,10 +7,6 @@ description: >-
 
 # Key/Value (KV) Store Overview
 
-<Note>
-The Consul KV API, CLI, and UI are now considered feature complete and no new feature development is planned for future releases.
-</Note>
-
 Consul KV is a core feature of Consul and is installed with the Consul agent.
 Once installed with the agent, it will have reasonable defaults. Consul KV allows
 users to store indexed objects, though its main uses are storing configuration
@@ -37,7 +33,7 @@ To restrict access, enable and configure
 [ACLs](/consul/tutorials/security/access-control-setup-production).
 Once the ACL system has been bootstrapped, users and services, will need a
 valid token with KV [privileges](/consul/docs/security/acl/acl-rules#key-value-rules) to
-access the data store, this includes even reads. We recommend creating a
+access the the data store, this includes even reads. We recommend creating a
 token with limited privileges, for example, you could create a token with write
 privileges on one key for developers to update the value related to their
 application.
@@ -65,24 +61,6 @@ and when recursively searching within the data store. We also recommend that
 you avoid the use of `*`, `?`, `'`, and `%` because they can cause issues when
 using the API and in shell scripts.
 
-## Using Sentinel to apply policies for Consul KV 
-
-<EnterpriseAlert>
-
-This feature requires
-HashiCorp Cloud Platform (HCP) or self-managed Consul Enterprise.
-
-</EnterpriseAlert>
-
-You can also use Sentinel as a Policy-as-code framework for defining advanced key-value storage access control policies. Sentinel policies extend the ACL system in Consul beyond static "read", "write",
-and "deny" policies to support full conditional logic and integration with
-external systems. Reference the [Sentinel documentation](https://docs.hashicorp.com/sentinel/concepts) for high-level Sentinel concepts.
-
-To get started with Sentinel in Consul,
-refer to the [Sentinel documentation](https://docs.hashicorp.com/sentinel/consul) or
-[Consul documentation](/consul/docs/agent/sentinel).
-
-
 ## Extending Consul KV
 
 ### Consul Template
diff --git a/website/content/docs/dynamic-app-config/watches.mdx b/website/content/docs/dynamic-app-config/watches.mdx
index 8eac5888628c7..7274821b030cf 100644
--- a/website/content/docs/dynamic-app-config/watches.mdx
+++ b/website/content/docs/dynamic-app-config/watches.mdx
@@ -535,7 +535,6 @@ An example of the output of this command:
           "TLSServerName": "",
           "TLSSkipVerify": false,
           "TCP": "",
-          "TCPUseTLS": false,
           "GRPC": "",
           "GRPCUseTLS": false
         },
diff --git a/website/content/docs/ecs/architecture.mdx b/website/content/docs/ecs/architecture.mdx
index 0f35b11b6dab8..a0c84805a6199 100644
--- a/website/content/docs/ecs/architecture.mdx
+++ b/website/content/docs/ecs/architecture.mdx
@@ -1,85 +1,257 @@
 ---
 layout: docs
-page_title: Consul on AWS Elastic Container Service (ECS) architecture
+page_title: Consul on AWS Elastic Container Service (ECS) Architecture
 description: >-
-  Learn about the Consul architecture on Amazon Web Services ECS deployments. Learn about how the two work together, including the order tasks and containers startup and shutdown, as well as requirements for the AWS IAM auth method, the ACL controller and tokens, and health check syncing.
+  Consul's architecture supports Amazon Web Services ECS deployments. Learn about how the two work together, including the order tasks and containers startup and shutdown, as well as requirements for the AWS IAM auth method, the ACL controller and tokens, and health check syncing.
 ---
 
-# Consul on AWS Elastic Container Service (ECS) architecture
+# Consul on AWS Elastic Container Service (ECS) Architecture
 
-This topic provides reference information about the Consul's deployment architecture on AWS ECS. The following diagram shows the main components of the Consul architecture when deployed to an ECS cluster.
+The following diagram shows the main components of the Consul architecture when deployed to an ECS cluster:
 
-![Diagram that provides an overview of the Consul Architecture on ECS](/img/ecs/consul-on-ecs-architecture-dataplanes.jpg#light-theme-only)
-![Diagram that provides an overview of the Consul Architecture on ECS ](/img/ecs/consul-on-ecs-architecture-dataplanes-dark.jpg#dark-theme-only)
+![Consul on ECS Architecture](/img/consul-ecs-arch.png)
 
-## Components
-Consul starts several components and containers inside the ECS cluster. Refer to [Startup sequence](#startup-sequence) for details about the order of the startup procedure:
- 
-### Control-plane container
+1. **Consul servers:** Production-ready Consul server cluster
+1. **Application tasks:** Runs user application containers along with two helper containers:
+   1. **Consul client:** The Consul client container runs Consul. The Consul client communicates
+      with the Consul server and configures the Envoy proxy sidecar. This communication
+      is called _control plane_ communication.
+   1. **Sidecar proxy:** The sidecar proxy container runs [Envoy](https://envoyproxy.io/). All requests
+      to and from the application container(s) run through the sidecar proxy. This communication
+      is called _data plane_ communication.
+1. **Mesh Init:** Each task runs a short-lived container, called `mesh-init`, which sets up initial configuration
+   for Consul and Envoy.
+1. **Health Syncing:** Optionally, an additional `health-sync` container can be included in a task to sync health statuses
+   from ECS into Consul.
+1. **ACL Controller:** The ACL controller is responsible for automating configuration and cleanup in the Consul servers.
+   The ACL controller will automatically configure the [AWS IAM Auth Method](/consul/docs/security/acl/auth-methods/aws-iam), and cleanup
+   unused ACL tokens from Consul. When using Consul Enterprise namespaces, the ACL controller will automatically create Consul
+   namespaces for ECS tasks.
 
-The control-plane container performs the following actions:
+For more information about how Consul works in general, see Consul's [Architecture Overview](/consul/docs/architecture).
 
-- Logs into Consul servers
-- Communicates directly with Consul server
-- Registers proxies and services
-- Creates a bootstrap configuration file for Consul dataplane container and stores it in a shared volume
-- Synchronizes ECS health checks
-- Watches the Consul server for changes
+## Task Startup
 
-### Dataplane containers
+This diagram shows the timeline of a task starting up and all its containers:
 
-The dataplane process runs in the same container as the Envoy proxy and performs the following actions:
+<ImageConfig width={400}>
 
-- Consumes and configures itself according to the bootstrap configuration written by the control-plane container.
-- Contains and starts up the Envoy sidecar.
+![Task Startup Timeline](/img/ecs-task-startup.svg)
 
-### ECS controller container
+</ImageConfig>
 
-One ECS task in the cluster contains the controller container, which performs the following actions:
+- **T0:** ECS starts the task. The `consul-client` and `mesh-init` containers start:
+  - `consul-client` does the following:
+    - If ACLs are enabled, a startup script runs a `consul login` command to obtain a
+      token from the AWS IAM auth method for the Consul client. This token has `node:write`
+      permissions.
+    - It uses the `retry-join` option to join the Consul cluster.
+  - `mesh-init` does the following:
+    - If ACLs are enabled, mesh-init runs a `consul login` command to obtain a token from
+      the AWS IAM auth method for the service registration. This token has `service:write`
+      permissions for the service and its sidecar proxy. This token is written to a shared
+      volume for use by the `health-sync` container.
+    - It registers the service for the current task and its sidecar proxy with Consul.
+    - It runs `consul connect envoy -bootstrap` to generate Envoy's bootstrap JSON file and
+      writes it to a shared volume.
+- **T1:** The following containers start:
+  - `sidecar-proxy` starts using a custom entrypoint command, `consul-ecs envoy-entrypoint`.
+     The entrypoint command starts Envoy by running `envoy -c <path-to-bootstrap-json>`.
+  - `health-sync` starts if ECS health checks are defined or if ACLs are enabled. It syncs health
+    checks from ECS to Consul (see [ECS Health Check Syncing](#ecs-health-check-syncing)).
+- **T2:** The `sidecar-proxy` container is marked as healthy by ECS. It uses a health check that
+  detects if its public listener port is open. At this time, your application containers are started
+  since all Consul machinery is ready to service requests.
 
-- Creates AWS IAM auth methods
-- Creates ACL policies and roles
-- Maintains ACL state
-- Removes tokens when services exit
-- Deregisters services if the ECS task exits without deregistering them
-- Registers a _synthetic node_ that enables Consul to register services to the catalog  
- 
-## Startup sequence
+## Task Shutdown
 
-Deploying Consul to ECS starts the following process to build the architecture:
+This diagram shows an example timeline of a task shutting down:
 
-1. The control-plane container starts and logs into Consul.
-1. The control-plane container registers services and proxies with the Consul servers.
-1. The control-plane container writes the bootstrap configuration for the Consul dataplane process and stores it in a shared volume.
-1. The dataplane container starts and configures itself using the bootstrap configuration generated by the control-plane container. 
-1. The dataplane container starts the Envoy sidecar proxy.
-1. The control-plane container starts listening for ECS health checks.
-1. When the ECS task indicates that the application instance is healthy, the control-plane container marks the service as healthy and starts allowing traffic to flow.
+<ImageConfig width={400}>
 
-## Consul security components
+![Task Shutdown Timeline](/img/ecs-task-shutdown.svg)
 
-Consul leverages AWS components to facilitate its own security features.  
+</ImageConfig>
 
-### Auth methods
+- **T0**: ECS sends a TERM signal to all containers. Each container reacts to the TERM signal:
+  - `consul-client` begins to gracefully leave the Consul cluster.
+  - `health-sync` stops syncing health status from ECS into Consul checks.
+  - `sidecar-proxy` ignores the TERM signal and continues running until the `user-app` container
+    exits. The custom entrypoint command, `consul-ecs envoy-entrypoint`, monitors the local ECS task
+    metadata. It waits until the `user-app` container has exited before terminating Envoy. This
+    enables the application to continue making outgoing requests through the proxy to the mesh for
+    graceful shutdown.
+  - `user-app` exits if it is not configured to ignore the TERM signal. The `user-app` container
+    will continue running if it is configured to ignore the TERM signal.
+- **T1**:
+  - `health-sync` does the following:
+    - It updates its Consul checks to critical status and exits. This ensures this service instance is marked unhealthy.
+    - If ACLs are enabled, it runs `consul logout` for the two tokens created by the `consul-client` and `mesh-init` containers.
+      This removes those tokens from Consul. If `consul logout` fails for some reason, the ACL controller will remove the tokens
+      after the task has stopped.
+  - `sidecar-proxy` notices the `user-app` container has stopped and exits.
+- **T2**: `consul-client` finishes gracefully leaving the Consul datacenter and exits.
+- **T3**:
+  - ECS notices all containers have exited, and will soon change the Task status to `STOPPED`
+  - Updates about this task have reached the rest of the Consul cluster, so downstream proxies have been updated to stopped sending traffic to this task.
+- **T4**: At this point task shutdown should be complete. Otherwise, ECS will send a KILL signal to any containers still running. The KILL signal cannot be ignored and will forcefully stop containers. This will interrupt in-progress operations and possibly cause errors.
 
-Consul on ECS uses the AWS IAM auth method so that ECS tasks can automatically obtain Consul ACL tokens during startup.
+## ACL Tokens
 
-When ACLs are enabled, the Terraform modules for Consul on ECS support AWS IAM auth methods by default. The ECS controller sets up the auth method on the Consul servers. The `mesh-task` module configures the ECS task definition to be compatible with the auth method.
+Two types of ACL tokens are required by ECS tasks:
 
-A unique task IAM role is required for each ECS task family. A task family represents only one Consul service and the task IAM role must encode the Consul service name. As a result, task IAM roles must not be shared by different task families. 
+* **Client tokens:** used by the `consul-client` containers to join the Consul cluster
+* **Service tokens:** used by sidecar containers for service registration and health syncing
 
-By default, the mesh-task module creates and configures the task IAM role for you.
+With Consul on ECS, these tokens are obtained dynamically when a task starts up by logging
+in via Consul's AWS IAM auth method.
 
-To pass an existing IAM role to the mesh-task module using the `task_role` input variable, configure the IAM role as described in ECS Task Role Configuration to be compatible with the AWS IAM auth method.
+### Consul Client Token
 
-### ECS task roles
+Consul client tokens require `node:write` for any node name, which is necessary because the Consul node
+names on ECS are not known until runtime.
 
-The [ECS task role](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html) is an IAM role associated with an ECS task.
+### Service Token
 
-When an ECS task starts up, it runs a `consul login` command. The command obtains credentials for the task role from AWS and then uses those credentials to sign the login request to the AWS IAM auth method. The credentials prove the ECS task's identity to the Consul servers.
+Service tokens are associated with a [service identity](/consul/docs/security/acl#service-identities).
+The service identity includes `service:write` permissions for the service and sidecar proxy.
 
-You must configure the task role with the following details for it to be compatible with the AWS IAM auth method:
+## AWS IAM Auth Method
 
-- An `iam:GetRole` permission to fetch itself. Refer to [IAM Policies](/consul/docs/security/acl/auth-methods/aws-iam#iam-policies) for additional information. 
-- A `consul.hashicorp.com.service-name` tag on the task role which contains the Consul service name for the application in this task.
-- When using Consul Enterprise, add a `consul.hashicorp.com.namespace` tag on the task role indicating the Consul Enterprise namespace where this service is registered.
\ No newline at end of file
+Consul's [AWS IAM Auth Method](/consul/docs/security/acl/auth-methods/aws-iam) is used by ECS tasks to
+automatically obtain Consul ACL tokens. When a service mesh task on ECS starts up, it runs two
+`consul login` commands to obtain a client token and a service token via the auth method. When the
+task stops, it attempts two `consul logout` commands in order to destroy these tokens.
+
+During a `consul login`, the [task's IAM
+role](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html) is presented
+to the AWS IAM auth method on the Consul servers. The role is validated with AWS. If the role is
+valid, and if the auth method trusts the IAM role, then the role is permitted to login. A new Consul
+ACL token is created and [Binding Rules](/consul/docs/security/acl/auth-methods#binding-rules) associate
+permissions with the newly created token. These permissions are mapped to the token based on the IAM
+role details. For example, tags on the IAM role are used to specify the service name and the
+Consul Enterprise namespace to be associated with a service token that is created by a successful
+login to the auth method.
+
+### Task IAM Role
+
+The following configuration is required for the task IAM role in order to be compatible with the
+auth method. When using Terraform, the `mesh-task` module creates the task role with this
+configuration by default.
+
+* A scoped `iam:GetRole` permission must be included on the IAM role, enabling the role to fetch
+  details about itself.
+* A `consul.hashicorp.com.service-name` tag on the IAM role must be set to the Consul service name.
+* <EnterpriseAlert inline /> A <code>consul.hashicorp.com.namespace</code> tag must be set on the
+  IAM role to the Consul Enterprise namespace of the Consul service for the task.
+
+Task IAM roles should not typically be shared across task families. Since a task family represents a
+single Consul service, and since the task role must include the Consul service name, one task role
+is required for each task family when using the auth method.
+
+### Security
+
+The auth method relies on the configuration of AWS resources, such as IAM roles, IAM policies, and
+ECS tasks. If these AWS resources are misconfigured or if the account has loose access controls,
+then the security of your service mesh may be at risk.
+
+Any entity in your AWS account with the ability to obtain credentials for an IAM role could potentially
+obtain a Consul ACL token and impersonate a Consul service. The `mesh-task` Terraform module
+mitigates against this concern by creating the task role with an `AssumeRolePolicyDocument` that
+allows only the AWS ECS service to assume the task role. By default, other entities are unable
+to obtain credentials for task roles, and are unable to abuse the AWS IAM auth method to obtain
+Consul ACL tokens.
+
+However, other entities in your AWS account with the ability to create or modify IAM roles can
+potentially circumvent this. For example, if they are able to create an IAM role with the correct
+tags, they can obtain a Consul ACL token for any service. Or, if they can pass a role to an ECS task
+and start an ECS task, they can use the task to obtain a Consul ACL token via the auth method.
+
+The IAM policy actions `iam:CreateRole`, `iam:TagRole`, `iam:PassRole`, and `sts:AssumeRole` can be
+used to restrict these capabilities in your AWS account and improve security when using the AWS IAM
+auth method. See the [AWS
+documentation](https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html) to learn how
+to restrict these permissions in your AWS account.
+
+## ACL Controller
+
+The ACL controller performs the following operations on the Consul servers:
+
+* Configures the Consul AWS IAM auth method.
+* Monitors tasks in ECS cluster where the controller is running.
+* Cleans up unused Consul ACL tokens created by tasks in this cluster.
+* <EnterpriseAlert inline /> Manages Consul admin partitions and namespaces.
+
+### Auth Method Configuration
+
+The ACL controller is responsible for configuring the AWS IAM auth method. The following resources
+are created by the ACL controller when it starts up:
+
+* **Client role**: The controller creates the Consul (not IAM) role and policy used for client
+  tokens if these do not exist. This policy has `node:write` permissions to enable Consul clients to
+  join the Consul cluster.
+* **Auth method for client tokens**: One instance of the AWS IAM auth method is created for client
+  tokens, if it does not exist. A binding rule is configured that attaches the Consul client role to each
+  token created during a successful login to this auth method instance.
+* **Auth method for service tokens**: One instance of the AWS IAM auth method is created for service
+  tokens, if it does not exist:
+  * A binding rule is configured to attach a [service identity](/consul/docs/security/acl#service-identities)
+    to each token created during a successful login to this auth method instance. The service name for
+    this service identity is taken from the tag, `consul.hashicorp.com.service-name`, on the IAM role
+    used to log in.
+  * <EnterpriseAlert inline /> A namespace binding rule is configured to create service tokens in
+    the namespace specified by the tag, <code>consul.hashicorp.com.namespace</code>, on the IAM
+    role used to log in.
+
+The ACL controller configures both instances of the auth method to permit only certain IAM roles to login,
+by setting the [`BoundIAMPrincipalARNs`](/consul/docs/security/acl/auth-methods/aws-iam#boundiamprincipalarns)
+field of the AWS IAM auth method as follows:
+
+* By default, the only IAM roles permitted to log in must have an ARN matching the pattern,
+  `arn:aws:iam::<ACCOUNT>:role/consul-ecs/*`. This allows IAM roles at the role path `/consul-ecs/`
+  to log in, and only those IAM roles in the same AWS account where the ACL controller is running.
+* The role path can be changed by setting the `iam_role_path` input variable for the `mesh-task` and
+  `acl-controller` modules, or by passing the `-iam-role-path` flag to the `consul-ecs
+  acl-controller` command.
+* Each instance of the auth method is shared by ACL controllers in the same Consul datacenter. Each
+  controller updates the auth method, if necessary, to include additional entries in the
+  `BoundIAMPrincipalARNs` list. This enables the use of the auth method with ECS clusters in
+  different AWS accounts, for example. This does not apply when using Consul Enterprise admin
+  partitions because auth method instances are not shared by multiple controllers in that case.
+
+### Task Monitoring
+
+After startup, the ACL controller monitors tasks in the same ECS cluster where the ACL controller is
+running in order to discover newly running tasks and tasks that have stopped.
+
+The ACL controller cleans up tokens created by `consul login` for tasks that are no longer running.
+Normally, each task attempts `consul logout` commands when the task stops to destroy its tokens.
+However, in unstable conditions the `consul logout` command may fail to clean up a token.
+The ACL controller runs continually to ensure those unused tokens are soon removed.
+
+### Admin Partitions and Namespaces<EnterpriseAlert inline />
+
+When [admin partitions and namespaces](/consul/docs/ecs/enterprise#admin-partitions-and-namespaces) are enabled,
+the ACL controller is assigned to its configured admin partition. It supports one ACL controller instance per ECS
+cluster. This results in an architecture with one admin partition per ECS cluster.
+
+When admin partitions and namespace are enabled, the ACL controller performs the following
+additional actions:
+
+* At startup, creates its assigned admin partition if it does not exist.
+* Inspects task tags for new ECS tasks to discover the task's intended partition
+  and namespace. The ACL controller ignores tasks with a partition tag that does not match the
+  controller's assigned partition.
+* Creates namespaces when tasks start up. Namespaces are only created if they do not exist.
+* Creates auth method instances for client and service tokens in controller's assigned admin partition.
+
+## ECS Health Check Syncing
+
+If the following conditions apply, ECS health checks automatically sync with Consul health checks for all application containers:
+
+* marked as `essential`
+* have ECS `healthChecks`
+* are not configured with native Consul health checks
+
+The `mesh-init` container creates a TTL health check for every container that fits these criteria
+and the `health-sync` container ensures that the ECS and Consul health checks remain in sync.
diff --git a/website/content/docs/ecs/compatibility.mdx b/website/content/docs/ecs/compatibility.mdx
new file mode 100644
index 0000000000000..803d4e3c269ba
--- /dev/null
+++ b/website/content/docs/ecs/compatibility.mdx
@@ -0,0 +1,25 @@
+---
+layout: docs
+page_title: Consul on AWS Elastic Container Service (ECS) Compatability Matrix
+description: >-
+  The binary for Consul on Amazon Web Services ECS and the Terraform modules for automating deployments are tightly coupled and have specific version requirements. Review compatibility information for versions of Consul and `consul-ecs` to help you choose compatible versions.
+---
+
+# Consul on AWS Elastic Container Service (ECS) Compatability Matrix
+
+For every release of Consul on ECS, the `consul-ecs` binary and `consul-ecs` Terraform module are updated. The versions of the Terraform module and binary are tightly coupled. For example, `consul-ecs` 0.5.2 binary must use the `consul-ecs` 0.5.2 Terraform module.
+
+## Supported Consul versions
+
+| Consul Version | Compatible consul-ecs Versions  |
+| -------------- | ------------------------------- |
+| 1.14.x         | 0.5.2+                          |
+| 1.13.x         | 0.5.2+                          |
+| 1.12.x         | 0.5.x                           |
+| 1.11.x         | 0.3.0, 0.4.x                    |
+| 1.10.x         | 0.2.x                           |
+
+
+## Supported Envoy versions
+
+Refer to [Envoy - Supported Versions](/consul/docs/connect/proxies/envoy#supported-versions) for information about which versions of Envoy are supported for each version of Consul. As a best practice, we recommend using the default version of Envoy that is provided in the Terraform module. This is because we test the default versions with Consul ECS binaries for the given version.
diff --git a/website/content/docs/ecs/reference/configuration-reference.mdx b/website/content/docs/ecs/configuration-reference.mdx
similarity index 95%
rename from website/content/docs/ecs/reference/configuration-reference.mdx
rename to website/content/docs/ecs/configuration-reference.mdx
index 4c366d7795d33..fed887bc835d1 100644
--- a/website/content/docs/ecs/reference/configuration-reference.mdx
+++ b/website/content/docs/ecs/configuration-reference.mdx
@@ -7,7 +7,7 @@ description: >-
 
 # Consul on AWS Elastic Container Service (ECS) Configuration Reference
 
-This topic describes configuration options for the JSON configuration format used
+This pages details the configuration options for the JSON config format used
 by the `consul-ecs` binary. This configuration is passed to the `consul-ecs`
 binary as a string using the `CONSUL_ECS_CONFIG_JSON` environment variable.
 
@@ -189,10 +189,9 @@ Defines the Consul checks for the service. Each `check` object may contain the f
 | `status` | `string` | optional | Specifies the initial status the health check. Must be one of `passing`, `warning`, `critical`, `maintenance`, or `null`. |
 | `successBeforePassing` | `integer` | optional | Specifies the number of consecutive successful results required before check status transitions to passing.  |
 | `tcp` | `string` | optional | Specifies this is a TCP check. Must be an IP/hostname plus port to which a TCP connection is made every `interval`.  |
-| `tcpUseTls` | `boolean` | optional | Specifies whether to use TLS for this `TCP` health check. If TLS is enabled, then by default, a valid TLS certificate is expected. Certificate verification can be disabled by setting `TLSSkipVerify` to `true`.  |
 | `timeout` | `string` | optional | Specifies a timeout for outgoing connections. Applies to script, HTTP, TCP, UDP, and gRPC checks. Must be a duration string, such as `10s` or `5m`.  |
 | `tlsServerName` | `string` | optional | Specifies an optional string used to set the SNI host when connecting via TLS.  |
-| `tlsSkipVerify` | `boolean` | optional | Specifies if the check should verify the chain and hostname of the certificate presented by the server being checked. Set to `true` to disable verification. We recommend setting to `false` for production use. Default is `false`. Supported check types: `HTTP`, `H2Ping`, `gRPC`, and `TCP`|
+| `tlsSkipVerify` | `boolean` | optional | Specifies if the certificate for an HTTPS check should not be verified.  |
 | `ttl` | `string` | optional | Specifies this is a TTL check. Must be a duration string, such as `10s` or `5m`.  |
 | `udp` | `string` | optional | Specifies this is a UDP check. Must be an IP/hostname plus port to which UDP datagrams are sent every `interval`.  |
 
diff --git a/website/content/docs/ecs/deploy/bind-addresses.mdx b/website/content/docs/ecs/deploy/bind-addresses.mdx
deleted file mode 100644
index 0eea916687b8b..0000000000000
--- a/website/content/docs/ecs/deploy/bind-addresses.mdx
+++ /dev/null
@@ -1,47 +0,0 @@
----
-layout: docs
-page_title: Configure the ECS task bind address
-description: >-
-  Learn how to bind workloads to the loopback address, also called localhost and 127.0.0.1, so that your applications only send and receive traffic through Consul service mesh.
----
-
-# Configure the ECS task bind address
-
-This topic describes how to configure the bind address for your workloads to the loopback address. 
-
-## Introduction
-
-Binding workloads to the loopback address ensures that your application only receives traffic through the dataplane container running in the same task, which limits requests to the service mesh. The loopback address is also called `localhost`, `lo`, and `127.0.0.1`. If your application is listening on all interfaces, such as `0.0.0.0`, then other applications can bypass the proxy and call it directly.
-
-## Requirements
-
-Consul service mesh must be deployed to ECS before you can bind a network address. For more information, refer to the following topics:
-
-- [Deploy Consul to ECS using the Terraform module](/consul/docs/ecs/deploy/install-terraform)
-- [Deploy Consul to ECS manually](/consul/docs/ecs/deploy/install-manual)
-
-## Change the listening address
-
-Changing the listening address is specific to your language and framework, but binding the loopback address to a dynamic value, such as an environment variable, is a best practice:
-
-```bash
-$ export BIND_ADDRESS="127.0.0.1:8080"
-```
-
-The following examples demonstrate how to bind the loopback address to an environment variable in golang and Django (Python):
-
-<CodeTabs>
-
-```go
-s := &http.Server{
-	Addr: os.Getenv("BIND_ADDRESS"),
-  ...
-}
-log.Fatal(s.ListenAndServe())
-```
-
-```bash
-python manage.py runserver "$BIND_ADDRESS"
-```
-
-</CodeTabs>
diff --git a/website/content/docs/ecs/deploy/configure-routes.mdx b/website/content/docs/ecs/deploy/configure-routes.mdx
deleted file mode 100644
index 11014f99a3ce0..0000000000000
--- a/website/content/docs/ecs/deploy/configure-routes.mdx
+++ /dev/null
@@ -1,79 +0,0 @@
----
-layout: docs
-page_title: Configure routes between ECS tasks
-description: >-
-  Learn how to configure routes between tasks after deploying Consul service mesh to your ECS workloads.
----
-
-# Configure routes between ECS tasks
-
-This topic describes how to configure routes between tasks after registering the tasks to Consul service mesh.
-
-## Overview
-
-To enable tasks to call through the service mesh, complete the following steps:
-
-1. Configure the sidecar proxy to listen on a different port for each upstream service your application needs to call. 
-1. Modify your application to make requests to the sidecar proxy on the specified port.
-
-## Requirements
-
-Consul service mesh must be deployed to ECS before you can bind a network address. For more information, refer to the following topics:
-
-- [Deploy Consul to ECS using the Terraform module](/consul/docs/ecs/deploy/install-terraform)
-- [Deploy Consul to ECS manually](/consul/docs/ecs/deploy/install-manual)
-
-## Configure the sidecar proxy 
-
-Add the `upstreams` block to your application configuration and specify the following fields:
-
-- `destinationName`: Specifies the name of the upstream service as it is registered in the Consul service catalog.  
-- `localBindPort`: Specifies the port that the proxy forwards requests to. You must specify an unused port but it does not need to match the upstream service port.
-
-In the following example, the route from an application named `web` to an application named `backend` goes through port `8080`:
-
-```hcl
-module "web" {
-  family = "web"
-  upstreams = [
-    {
-      destinationName = "backend"
-      localBindPort = 8080
-    }
-  ]
-}
-```
-
-You must include all upstream services in the `upstream` configuration. 
-
-## Configure your application 
-
-Use an appropriate environment variable in your container definition to configure your application to call the upstream service at the loopback address. 
-
-In the following example, the `web` application calls the `backend` service by sending requests to the
-`BACKEND_URL` environment variable:
-
-```hcl
-module "web" {
-  family = "web"
-  upstreams = [
-    {
-      destinationName = "backend"
-      localBindPort = 8080
-    }
-  ]
-  container_definitions = [
-    {
-      name        = "web"
-      environment = [
-        {
-          name  = "BACKEND_URL"
-          value = "http://localhost:8080"
-        }
-      ]
-      ...
-    }
-  ]
-  ...
-}
-```
\ No newline at end of file
diff --git a/website/content/docs/ecs/deploy/manual.mdx b/website/content/docs/ecs/deploy/manual.mdx
deleted file mode 100644
index 708a49213ad1a..0000000000000
--- a/website/content/docs/ecs/deploy/manual.mdx
+++ /dev/null
@@ -1,342 +0,0 @@
----
-layout: docs
-page_title: Deploy Consul to ECS manually
-description: >-
-  Manually install Consul on Amazon Web Services ECS by using the Docker `consul-ecs` image to create task definitions that include required containers. Learn how to configure task definitions with example configurations.
----
-
-# Deploy Consul to ECS manually
-
-The following instructions describe how to use the `consul-ecs` Docker image to manually create the ECS task definition without Terraform. If you intend to peer the service mesh to multiple Consul datacenters or partitions, you must use the Consul ECS Terraform module to install your service mesh on ECS. There is no manual process for deploying a mesh gateway to an ECS cluster.
-
-## Requirements
-
-You should have some familiarity with AWS ECS. Refer to [What is Amazon Elastic Container Service](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/Welcome.html) for details.
-
-### Secure configuration requirements
-
-You must meet the following requirements and prerequisites to enable security features in Consul service mesh:
-
-- Enable [TLS encryption](https://developer.hashicorp.com/consul/docs/security/encryption#rpc-encryption-with-tls) on your Consul servers so that they can communicate security with Consul dataplane containers over gRPC.
-- Enable [access control lists (ACLs)](/consul/docs/security/acl) on your Consul servers. ALCs provide authentication and authorization for access to Consul servers on the mesh.
-- You should be familiar with specifying sensitive data on ECS. Refer to [Passing sensitive data to a container](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/specifying-sensitive-data.html) in the AWS documentation for additional information.
-
-You should be familiar with configuring Consul's secure features, including how to create ACL tokens and policies. Refer to the following resources:
-- [Create a service token](/consul/docs/security/acl/tokens/create/create-a-service-token)
-- [Day 1: Security tutorial](https://developer.hashicorp.com/consul/tutorials/security) for additional information.
-
-Consul requires a unique IAM role for each ECS task family. Task IAM roles cannot be shared by different task families because the task family is unique to each Consul service. 
-
-## Configure ECS task definition file
-
-Create a JSON file for the task definition. The task definition is the ECS blueprint for your software services on AWS. Refer to the [ECS task definitions in the AWS documentation](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html) for additional information. 
-
-In addition to your application container, add configurations to your task definition that creates the following Consul containers:
-
-- Dataplane container
-- Control-plane container
-- ECS controller container 
-
-## Top-level fields
-
-The following table describes the top-level fields you must include in the task definition:
-
-| Field name | Description | Type |
-| --- | --- | --- |
-| `family` |  The task family name. This is used as the Consul service name by default. | string |
-| `networkMode` | Must be `awsvpc`, which is the only network mode supported by Consul on ECS. | string |
-| `volumes` | Volumes on the host for sharing configuration between containers for initial task setup. You must define a `consul_data` and `consul_binary` bind mount. Bind mounts can be mounted into one or more containers in order to share files among containers. For Consul on ECS, certain binaries and configuration are shared among containers during task startup. | list  |
-| `containerDefinitions` | Defines the application container that runs in the task. Refer to [Define your application container](#define-your-application-container). | list | 
-
-The following example shows the top-level fields:
-
-```json
-{
-  "family": "my-example-client-app",
-  "networkMode": "awsvpc",
-  "volumes": [
-    {
-      "name": "consul_data"
-    },
-    {
-      "name": "consul_binary"
-    }
-  ],
-  "containerDefinitions": [...],
-  "tags": [
-    {
-      "key": "consul.hashicorp.com/mesh",
-      "value": "true"
-    },
-    {
-      "key": "consul.hashicorp.com/service-name",
-      "value":  "example-client-app"
-    }
-  ]
-}
-```
-
-## Configure task tags
-
-The `tags` list must include the following tags if you are using the ECS controller in a [secure configuration](/consul/docs/ecs/deploy/manual#secure-configuration-requirements).
-Without these tags, the ACL controller is unable to provision a service token for the task.
-
-| Tag | Description | Type | Default | 
-| --- | --- | --- | --- |
-| `consul.hashicorp.com/mesh` |  Enables the ECS controller. Set to `false` to disable the ECS controller. | String | `true` |
-| `consul.hashicorp.com/service-name` | Specifies the name of the Consul service associated with this task. Required if the service name is different than the task `family`. | String | None |
-| `consul.hashicorp.com/partition` |  <EnterpriseAlert inline/> Specifies the Consul admin partition associated with this task. | String | `default` |
-| `consul.hashicorp.com/namespace` | <EnterpriseAlert inline/> Specifies the name of the Consul namespace associated with this task. | String | `default` |
-
-## Define your application container
-
-Specify your application container configurations in the `containerDefinitions` field. The following table describes all `containerDefinitions` fields:
-
-| Field name |  Description | Type |
-| --- | --- | ---  |
-| `name`   | The name of your application container. | string |
-| `image` |  The container image used to run your application. | string |
-| `essential` | Must be `true` to ensure the health of your application container affects the health status of the task. | boolean | 
-| `dependsOn` | Specifies container dependencies that ensure your application container starts after service mesh setup is complete. Refer to [Application container dependency configuration](#application-container-dependency-configuration) for details. | list |
-
-Refer to the [ECS Task Definition](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html) documentation for a complete reference.
-
-###  Application container dependency configuration
-
-The control-plane and the dataplane containers are dependencies that enforce a specific startup order. The settings ensure that your application container starts after the control-plane container finishes setting up the task and after the dataplane is ready to proxy traffic between this task and the service mesh.
-
-The `dependsOn` list must include the following maps:
-
-```json
-{
-  {
-    "containerName": "consul-ecs-control-plane",
-    "condition": "SUCCESS"
-  },
-  {
-    "containerName": "consul-dataplane",
-    "condition": "HEALTHY"
-  }
-}
-```
-
-## Configure the dataplane container 
-
-The dataplane container runs Envoy proxy for Consul service mesh. Specify the fields described in the following table to declare a dataplane container:
-
-| Field name |  Description | Type |
-| --- | --- | --- |
-| `name` |  Specifies the name of the container. This must be `consul-dataplane`. | string |
-| `image` | Specifies the Envoy image. This must be a [supported version of Envoy](/consul/docs/connect/proxies/envoy#supported-versions). | string |
-| `dependsOn` | Specifies container dependencies that ensure the dataplane container starts after the control-pane container has written the Envoy bootstrap configuration file. Refer to [Dataplane container dependency configuration](#dataplane-container-dependency-configuration) for details. | list |
-| `healthCheck` | Must be set as shown above to monitor the health of Envoy's primary listener port, which ties into container dependencies and startup ordering. | map |
-| `mountPoints` |  Specifies a shared volume so that the dataplane container can access and consume the Envoy configuration file that the control-plane container generates. The keys and values in this configuration must be defined as described in [Dataplane container dependency configuration](#dataplane-container-dependency-configuration). | list |
-| `ulimits`     |  The nofile ulimit must be raised to a sufficiently high value so that Envoy does not fail to open sockets. | list |
-| `entrypoint`  | Must be set to the custom Envoy entrypoint `consul-ecs envoy-entrypoint` to facilitate graceful shutdown. | list |
-| `command` |  Specifies the startup command to pass the bootstrap configuration to Envoy. | list |
-
-### Dataplane container dependency configuration
-
-The `dependsOn` configuration ensures that the dataplane container starts after the control-plane container successfully writes the Envoy bootstrap configuration file to the shared volume. The `dependsOn` list must include the following map:
-
-```json
-[
-  {
-    "containerName": "consul-ecs-control-plane",
-    "condition": "SUCCESS"
-  }
-]
-```
-
-### Dataplane container volume mount configuration
-
-The `mountPoints` configuration defines a volume and path where dataplane container can consume the Envoy bootstrap configuration file generated by the control-plane container. You must specify the following keys and values:
-
-```json
-{
-  "mountPoints": [
-    {
-      "readOnly": true,
-      "containerPath": "/consul",
-      "sourceVolume": "consul_data"
-    }
-  ],
-}
-```
-
-## Configure the control-plane container
-
-The control-plane container is the first Consul container to start and set up the instance for Consul service mesh. It registers the service and proxy for this task with Consul and writes the Envoy bootstrap configuration to a shared volume.
-
-Specify the fields described in the following table to declare the control-plane container:
-
-| Field name | Description | Type |
-| --- | --- | --- |
-| `name` | Specifies the name of the container. This must be `control-plane`. | string  |
-| `image` | Specifies the `consul-ecs` image. Specify the following public AWS registry to avoid rate limits: `public.ecr.aws/hashicorp/consul-ecs` | string |
-| `mountPoints` | Specifies a shared volume to store the Envoy bootstrap configuration file that the dataplane container can access and consume. The keys and values in this configuration must be defined as described in [Control-plane shared volume configuration](#control-plane-shared-volume-configuration). | list | 
-| `command` | Set to `["control-plane"]` so that the container runs the `control-plane` command. | list |
-| `environment` | Specifies the `CONSUL_ECS_CONFIG_JSON` environment variable, which configures the container to connect to the Consul servers. Refer to [Control-plane to Consul servers configuration](#control-plane-to-Consul-servers-configuration) for details. | list |
-
-### Control-plane shared volume configuration
-
-The `mountPoints` configuration defines a volume and path where the control-plane container stores the Envoy bootstrap configuration file required to start Envoy. You must specify the following keys and values:
-
-```json
-"mountPoints": [
-  {
-    "readOnly": false,
-    "containerPath": "/consul",
-    "sourceVolume": "consul_data"
-  },
-  {
-    "readOnly": true,
-    "containerPath": "/bin/consul-inject",
-    "sourceVolume": "consul_binary"
-  }
-],
-```
-
-### Control-plane to Consul servers configuration
-
-Provide Consul server connection settings to the mesh task module so that the module can configure the control-plane and ECS controller containers to connect to the servers. 
-
-1. In your `variables.tf` file, define variables for the host URL and TLS settings for gRPC and HTTP traffic. Refer to the [mesh task module reference](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/mesh-task?tab=inputs) for information about the variables you can define. In the following example, the Consul server address is defined in the `consul_server_hosts` variable:
-
-  ```hcl
-  variable "consul_server_hosts" {
-    description = "Address of Consul servers."
-    type        = string
-  }
-
-  ```
-1. Add an `environment` block to the control-plane and ECS controller containers definition 
-1. Set the `environment.name` field to the `CONSUL_ECS_CONFIG_JSON` environment variable and the value to `local.encoded_config`.
-
-  ```hcl
-  environment = [
-    {
-      name  = "CONSUL_ECS_CONFIG_JSON",
-      value = local.encoded_config
-    }
-  ]
-  ```
-  When you apply the configuration, the mesh task module interpolates the server configuration variables, builds a `config.tf` file, and injects the settings into the appropriate containers.
-
-For additional information about the `config.tf` file, refer to the [JSON schema reference documentation](/consul/docs/ecs/reference/config-json-schema). 
-
-## Register the task definition configuration
-
-Register the task definition with your ECS cluster using the AWS Console, AWS CLI, or another method supported by AWS. You must also create an ECS Service to start tasks using the task definition. Refer to the following ECS documentation for information on how to register the task definition:
-
-- [Creating a task definition using the classic console](https://docs.aws.amazon.com/AmazonECS/latest/userguide/create-task-definition-classic.html)
-- [Register task definition CLI](https://docs.aws.amazon.com/cli/latest/reference/ecs/register-task-definition.html)
-
-## Deploy the controller container
-
-The controller container runs in a separate ECS task and is responsible for Consul security features. The controller uses the AWS IAM auth method to enable ECS tasks to automatically obtain Consul ACL tokens when the task starts up. Refer to [Consul security components](/consul/docs/ecs/architecture#consul-security-components) for additional information.
-
-Verify that you have completed the prerequisites described in [Secure configuration requirements](#secure-configuration-requirements) and configure the following components to enable Consul security features.
-
-- ACL policy
-- ECS task role
-- Auth method for service tokens
-### Create an ACL policy
-
-On the Consul server, create a policy that grants the following access for the controller:
-
-- `acl:write` 
-- `operator:write` 
-- `node:write` 
-
-The policy allows Consul to generate a token linked to the policy. Refer to [Create a service token](/consul/docs/security/acl/tokens/create/create-a-service-token) for instructions.
-
-### ECS task role
-
-1. Create an ECS task role and configure an `iam:GetRole` permission so that it can fetch itself. Refer to [IAM Policies](/consul/docs/security/acl/auth-methods/aws-iam#iam-policies) for instructions.
-1. Add an `consul.hashicorp.com.service-name` tag to the task role that contains the Consul service name for the application in the task.
-1. When using Consul Enterprise, you must also include the `consul.hashicorp.com.namespace` tag to specify the namespace to register the service in.
-
-### Configure the auth method for service tokens
-
-Run the `consul acl auth-method create` command on a Consul server to create an instance of the auth method for service tokens. 
-
-The following example command configures the auth method to associate a service identity
-to each token created during login to this auth method instance.
-
-```shell-session
-$ consul acl auth-method create \
-    -type aws-iam \
-    -name iam-ecs-service-token \
-    -description="AWS IAM auth method for ECS service tokens" \
-    -config '{
-  "BoundIAMPrincipalArns": ["arn:aws:iam::<ACCOUNT>:role/consul-ecs/*"],
-  "EnableIAMEntityDetails": true,
-  "IAMEntityTags": [
-    "consul.hashicorp.com.service-name"
-  ]
-}'
-```
-
-If you want to create these resources in a particular partition, include the `-partition <partition-name>` option when creating Consul ACL roles, policies, auth methods, and binding rules with the Consul CLI.
-
-You must specify the following flags in the command:
-
-| Flag | Description | Type |
-| ---  | ---         | ---  |
-| `-type` | Must be `aws-iam`. | String |
-| `-name` | Specify a name for the auth method. Must be unique among all auth methods. | String |
-| `-description` | Specify a description for the auth method. | String |
-| `-config` | A JSON string containing the configuration for the auth method. Refer to [Auth method `-config` parameter](#auth-method–config-parameter) for details. | String |
-| `-partition` | <EnterpriseAlert inline/> Specifies an admin partition that the auth method is valid for. | String |
-
-#### Auth method `-config` parameter
-
-You must specify the following configuration in the `-config` flag:
-
-| Flag | Description | Type |
-| ---  | ---         | ---  |
-| `BoundIAMPrincipalArns` | Specifies a list of trusted IAM roles. We recommend using a wildcard to trust IAM roles at a particular path. | List |
-| `EnableIAMEntityDetails` | Must be `true` so that the auth method can retrieve IAM role details, such as the role path and role tags. | Boolean |
-| `IAMEntityTags` | Specifies a list of IAM role tags to make available to binding rules. Must include the service name tag. | List |
-
-Refer to the [auth method configuration parameters documentation](/consul/docs/security/acl/auth-methods/aws-iam#config-parameters) for additional information.
-
-### Create the binding rule 
-
-Run the `consul acl binding-rule create` command on a Consul server to create a binding rule. The rule associates a service identity with each token created on successful login to this instance of the auth method. 
-
-In the following example, Consul takes the service identity name from the `consul.hashicorp.com.service-name` tag specified for authenticating IAM role identity.
-
-```shell-session
-$ consul acl binding-rule create \
-   -method iam-ecs-service-token \
-   -description 'Bind a service identity from IAM role tags for ECS service tokens' \
-   -bind-type service \
-   -bind-name '${entity_tags.consul.hashicorp.com.service-name}'
-```
-
-Note that you must include the `-partition <partition-name>` option to the Consul CLI when creating Consul ACL roles, policies, auth methods, and binding rules, in order to create these resources in a particular partition.
-
-### Configure storage for secrets
-
-Secure and store Consul Server CA certificates so that they are available to ECS tasks. You may require more than one certificate for different Consul protocols. Refer to the following documentation for instructions on how to store and pass secrets to ECS tasks:
-
-- [AWS Systems Manager Parameter Store](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/specifying-sensitive-data-parameters.html)
-- [AWS Secrets Manager](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/specifying-sensitive-data-secrets.html)
-
-You can reference stored secrets using their ARN. The examples show ARNs for secrets stored in AWS Secrets Manager:
-
-- **Consul Server CA Cert for RPC**:  `arn:aws:secretsmanager:us-west-2:000000000000:secret:my-consul-ca-cert`
-- **Consul Server CA Cert for HTTPS**: `arn:aws:secretsmanager:us-west-2:000000000000:secret:my-consul-https-ca-cert`
-
-### Configure audit logging <EnterpriseAlert inline/>
-
-You can configure Consul servers connected to your ECS workloads to capture a log of authenticated events. Refer to [Audit Logging](/consul/docs/enterprise/audit-logging) for details.
-
-## Next steps
- 
-After deploying the Consul service mesh infrastructure, you must still define routes between service instances as well as configure the bind address for your applications so that they only receive traffic through the mesh. Refer to the following topics:
-
-- [Configure routes between ECS tasks](/consul/docs/ecs/deploy/configure-routes)
-- [Configure the ECS task bind address](/consul/docs/ecs/deploy/bind-addresses)
diff --git a/website/content/docs/ecs/deploy/migrate-existing-tasks.mdx b/website/content/docs/ecs/deploy/migrate-existing-tasks.mdx
deleted file mode 100644
index 77ab4ded7f0b2..0000000000000
--- a/website/content/docs/ecs/deploy/migrate-existing-tasks.mdx
+++ /dev/null
@@ -1,99 +0,0 @@
----
-layout: docs
-page_title: Migrate existing tasks to Consul service mesh
-description: >-
-  You can migrate tasks in existing Amazon Web Services ECS deployments to a service mesh deployed with Terraform. Learn how to convert a task specified as an ECS task definition into a `mesh-task` Terraform module.
----
-
-# Migrate existing tasks to Consul on ECS with Terraform 
-
-To migrate existing tasks to Consul, rewrite the existing Terraform code for your tasks so that the container definitions include the [`mesh-task` Terraform module](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/mesh-task). 
-
-Your tasks must already be defined in Terraform using the `ecs_task_definition` resource so that they can then be converted to use the `mesh-task` module.
-
-## Example 
-
-The following example shows an existing task definition configured in Terraform:
-
-```hcl
-resource "aws_ecs_task_definition" "my_task" {
-  family                   = "my_task"
-  requires_compatibilities = ["FARGATE"]
-  network_mode             = "awsvpc"
-  cpu                      = 256
-  memory                   = 512
-  execution_role_arn       = "arn:aws:iam::111111111111:role/execution-role"
-  task_role_arn            = "arn:aws:iam::111111111111:role/task-role"
-  container_definitions = jsonencode(
-    [{
-      name             = "example-client-app"
-      image            = "docker.io/org/my_task:v0.0.1"
-      essential        = true
-      portMappings = [
-        {
-          containerPort = 9090
-          hostPort      = 9090
-          protocol      = "tcp"
-        }
-      ]
-      cpu         = 0
-      mountPoints = []
-      volumesFrom = []
-    }]
-  )
-}
-
-resource "aws_ecs_service" "my_task" {
-  name            = "my_task"
-  cluster         = "arn:aws:ecs:us-east-1:111111111111:cluster/my-cluster"
-  task_definition = aws_ecs_task_definition.my_task.arn
-  desired_count   = 1
-  network_configuration {
-    subnets = ["subnet-abc123"]
-  }
-  launch_type            = "FARGATE"
-}
-```
-
-
-Replace the `aws_ecs_task_definition` resource with the `mesh-task` module so that Consul adds the necessary dataplane containers that enable your task to join the mesh. The `mesh-task` module uses inputs similar to your old ECS task definition but creates a new version of the task definition with additional containers.
-
-The following Terraform configuration uses the `mesh-task` module to replace the previous example's task definition:
-
-```hcl
-module "my_task" {
-  source  = "hashicorp/consul-ecs/aws//modules/mesh-task"
-  version = "<latest version>"
-
-  family                = "my_task"
-  container_definitions = [
-    {
-      name         = "example-client-app"
-      image        = "docker.io/org/my_task:v0.0.1"
-      essential    = true
-      portMappings = [
-        {
-          containerPort = 9090
-          hostPort      = 9090
-          protocol      = "tcp"
-        }
-      ]
-      cpu         = 0
-      mountPoints = []
-      volumesFrom = []
-    }
-  ]
-
-  port       = 9090
-  consul_server_hosts = "<address of the Consul server>"
-}
-
-```
-
-Note the following differences:
-
-- The `execution_role_arn` and `task_role_arn` fields are removed. The `mesh-task` module creates the task and execution roles by default. If you need to use existing IAM roles, set the `task_role` and `execution_role` fields to pass in existing roles.
-- The `port` field specifes the port that your application listens on. If your application has no listening port, set `outbound_only = true` and remove the `port` field.
-- The `jsonencode()` function is removed from the `container_definitions` field.
-
-The `mesh-task` module creates a new version of your task definition with the necessary dataplane containers so you can delete your existing `aws_ecs_task_definition` resource.
\ No newline at end of file
diff --git a/website/content/docs/ecs/deploy/terraform.mdx b/website/content/docs/ecs/deploy/terraform.mdx
deleted file mode 100644
index 623fdb87e3d7b..0000000000000
--- a/website/content/docs/ecs/deploy/terraform.mdx
+++ /dev/null
@@ -1,478 +0,0 @@
----
-layout: docs
-page_title: Deploy Consul to ECS using the Terraform module
-description: >-
-  Terraform modules simplify the process to install Consul on Amazon Web Services ECS. Learn how to create task definitions, schedule tasks for your service mesh, and configure routes with example configurations so that you can Deploy Consul to ECS using Terraform.
----
-
-# Deploy Consul to ECS using the Terraform module
-
-This topic describes how to create a Terraform configuration that deploys Consul service mesh to your ECS cluster workloads. Consul server agents do not run on ECS and must be deployed to another runtime, such as EKS, and connected to your ECS workloads. Refer [Consul on AWS Elastic Container Service overview](/consul/docs/ecs) for additional information.
-
-## Overview
-
-Create a Terraform configuration file that includes the ECS task definition and Terraform modules that build the Consul service mesh components. The task definition is the ECS blueprint for your software services on AWS. Refer to the [ECS task definitions documentation](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definitions.html) for additional information. 
-
-You can add the following modules and resources to your Terraform configuration:
-
-- `mesh-task` module: Adds the Consul ECS control-plane and Consul dataplane containers to the task definition along with your application container. Envoy runs as a subprocess within the Consul dataplane container. 
-- `aws_ecs_service` resource: Adds an ECS service to run and maintain your task instance.
-- `gateway-task` module: Adds mesh gateway containers to the cluster. Mesh gateways enable service-to-service communication across different types of network areas.
-
-To enable Consul security features for your production workloads, you must also deploy the `controller` module, which provisions ACL tokens for service mesh tasks. 
-
-After defining your Terraform configuration, use `terraform apply` to deploy Consul to your ECS cluster. 
-
-## Requirements
-
-- You should be familiar with creating Terraform configuration files. Refer to the [Terraform documentation](/terraform/docs) for information about how to get started with Terraform.
-- You should be familiar with AWS ECS. Refer to [What is Amazon Elastic Container Service](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/Welcome.html) in the Amazon AWS documentation for additional information.
-- If you intend to use the `gateway-task` module to deploy mesh gateways, you must enable TLS. Refer to [Configure the ECS controller](#configure-the-ecs-controller) for additional information.
-
-### Secure configuration requirements
-
-You must meet the following requirements and prerequisites to enable security features in Consul service mesh:
-
-- Enable [TLS encryption](/consul/docs/security/encryption#rpc-encryption-with-tls) on your Consul servers so that they can communicate securely with Consul containers over gRPC.
-- Enable [access control lists (ACLs)](/consul/docs/security/acl) on your Consul servers. ALCs provide authentication and authorization for access to Consul servers on the mesh.
-- You should be familiar with specifying sensitive data on ECS. Refer to [Passing sensitive data to a container](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/specifying-sensitive-data.html) in the AWS documentation for additional information.
-
-Additionally, Consul requires a unique IAM role for each ECS task family. Task IAM roles cannot be shared by different task families because the task family is unique to each Consul service.    
-
-You should be familiar with configuring Consul's secure features, including how to create ACL tokens and policies. Refer to the following resources for additional information:
-
-- [Create a service token](/consul/docs/security/acl/tokens/create/create-a-service-token)
-- [Day 1: Security tutorial](https://developer.hashicorp.com/consul/tutorials/security)
-
-## Create the task definition
-
-Create a Terraform configuration file and add your ECS task definition. The task definition includes your application containers, Consul control-plane container, dataplane container, and controller container. If you intend to peer the service mesh to multiple Consul datacenters or partitions, [add the gateway-task module](#configure-the-gateway-task-module), which deploys gateway containers that enable connectivity between network areas in your network.
-
-## Configure the mesh task module
-
-Add a `module` block to your Terraform configuration and specify the following fields:
-
-- `source`: Specifies the location of the `mesh-task` module. This field must be set to `hashicorp/consul-ecs/aws//modules/mesh-task`. The `mesh-task` module automatically adds the Consul service mesh infrastructure when you apply the Terraform configuration.
-- `version`: Specifies the version of the `mesh-task` module to use. 
-- `family`: Specifies the [ECS task definition family](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html#family). Consul also uses the `family` value as the Consul service name by default.
-- `container_definitions`: Specifies a list of [container definitions](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html#container_definitions) for the task definition. This field is where you include your application containers.
-
-Refer to the [`mesh-task` module reference documentation in the Terraform registry](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/mesh-task?tab=inputs) for information about all options you can configure.
-
-You should also configure the ACL and encryption settings if they are enabled on your Consul servers. Refer to [Enable secure deployment](#enable-secure-deployment) for additional information.
-
-In the following example, the Terraform configuration file `mesh-task.tf` creates a task definition with an application container called `example-client-app`:
-
-<CodeBlockConfig filename="mesh-task.tf">
-
-```hcl
-module "my_task" {
-  source  = "hashicorp/consul-ecs/aws//modules/mesh-task"
-  version = "<latest version>"
-
-  family                = "my_task"
-  container_definitions = [
-    {
-      name         = "example-client-app"
-      image        = "docker.io/org/my_task:v0.0.1"
-      essential    = true
-      portMappings = [
-        {
-          containerPort = 9090
-          hostPort      = 9090
-          protocol      = "tcp"
-        }
-      ]
-      cpu         = 0
-      mountPoints = []
-      volumesFrom = []
-    }
-  ]
-
-  port       = 9090
-}
-```
-
-</CodeBlockConfig>
-
-The following fields are required. Refer to the [module reference documentation](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/mesh-task?tab=inputs) for a complete reference.
-
-## Configure Consul server settings
-
-Provide Consul server connection settings to the mesh task module so that the module can configure the control-plane and ECS controller containers to connect to the servers. 
-
-1. In your `variables.tf` file, define variables for the host URL and the TLS settings for gRPC and HTTP traffic. Refer to the [mesh task module reference](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/gateway-task?tab=inputs) for information about the variables you can define. In the following example, the Consul server address is defined in the `consul_server_hosts` variable:
-
-  ```hcl
-  variable "consul_server_hosts" {
-    description = "Address of Consul servers."
-    type        = string
-  }
-  ```
-1. Add an `environment` block to the control-plane and ECS controller containers definition.
-1. Set the `environment.name` field to the `CONSUL_ECS_CONFIG_JSON` environment variable and the value to `local.encoded_config`.
-
-  ```hcl
-  environment = [
-    {
-      name  = "CONSUL_ECS_CONFIG_JSON",
-      value = local.encoded_config
-    }
-  ]
-  ```
-
-  When you apply the configuration, the mesh task module interpolates the server configuration variables, builds a `config.tf` file, and injects the settings into the appropriate containers. For additional information about the `config.tf` file, refer to the [JSON schema reference documentation](/consul/docs/ecs/reference/consul-server-json). 
-
-## Configure an ECS service to run your task instances
-
-To start a task using the task definition, add the `aws_ecs_service` resource to your configuration to create an ECS service. [ECS services](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs_services.html) are one of the most common ways to start tasks using a task definition.
-
-Reference the `mesh-task` module's `task_definition_arn` output value in your `aws_ecs_service` resource. The following example adds an ECS service for a task definition referenced in as `module.my_task.task_defintion_arn`:
-
-<CodeBlockConfig filename="mesh-task.tf" highlight="6-12">
-
-```hcl
-module "my_task" {
-  source  = "hashicorp/consul-ecs/aws//modules/mesh-task"
-  ...
-}
-
-resource "aws_ecs_service" "my_task" {
-  name            = "my_task_service"
-  task_definition = module.my_task.task_definition_arn
-  launch_type     = "FARGATE"
-  propagate_tags  = "TASK_DEFINITION"
-  ...
-}
-```
-
-</CodeBlockConfig>
-
-Refer to  [`aws_ecs_service` in the Terraform registry](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecs_service) for a complete configuration reference.
-
-If you are deploying a test instance of your ECS application, you can apply your configuration in Terraform. Refer to [Run your configuration](#run-your-configuration) for instructions. To configure your deployment for a production environment, you must also deploy the ECS controller module. Refer to [Configure the ECS controller](#configure-the-ecs-controller) for instructions.
-
-If you intend to leverage multi-datacenter Consul features, such as WAN federation and cluster peering, then you must add the `gateway-task` module for each Consul datacenter in your network. Refer to [Configure the gateway task module](#configure-the-gateway-task-module) for instructions.
-
-## Configure the gateway task module    
-
-The `gateway-task` module deploys a mesh gateway, which enables service-to-service communication across network areas. Mesh gateways detect the server name indication (SNI) header from the service mesh session and route the connection to the appropriate destination.
-
-Refer to the following documentation for additional information:
-
-- [WAN Federation via Mesh Gateways](/consul/docs/connect/gateways/mesh-gateway/wan-federation-via-mesh-gateways)
-- [Service-to-service Traffic Across Datacenters](/consul/docs/connect/gateways/mesh-gateway/service-to-service-traffic-wan-datacenters)
-
-To use mesh gateways, TLS must be enabled in your cluster. Refer to the [requirements section](#requirements) for additional information. 
-
-1. Add a `module` block to your Terraform configuration file and specify a label. The label is a unique identifier for the gateway.
-1. Add a `source` to the `module` and specify the location of the `gateway-task`. The value must be `hashicorp/consul-ecs/aws//modules/gateway-task`.
-1. Specify the following required inputs:
-    - `ecs_cluster_arn`: The ARN of the ECS cluster for the gateway. 
-    - `family`: Specifies a name for multiple versions of the task. Refer to the [AWS documentation](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html#family) for details.
-    - `kind`: Set to `mesh-gateway`
-    - `subnets`: Specifies a list of subnet IDs where the gateway task should be deployed.
-1. If you are deploying to a production environment, you must also add the `acl` and `tls` configurations. Refer to [Configure the ECS controller](#configure-the-ecs-controller) for details.
-1. Configure any additional parameters necessary for your environment. Refer to the [module reference documentation](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/gateway-task?tab=inputs) for information about all parameters.
-
-The following example defines a mesh gateway task called `my-gateway`:
-
-<CodeBlockConfig filename="mesh-gateway.tf">
-
-```hcl
-module "my_mesh_gateway" {
-  source  = "hashicorp/consul-ecs/aws//modules/gateway-task"
-  version = "<latest version>"
-  kind    = "mesh-gateway"
-
-  family                    = "my-gateway"
-  ecs_cluster_arn           = "<ECS cluster ARN>"
-  subnets                   = ["<subnet ID>"]
-  consul_server_hosts       = "<address of the Consul server>"
-  tls                       = true
-  consul_ca_cert_arn = "<Secrets manager secret ARN>"
-}
-```
-
-</CodeBlockConfig>
-
-Refer to [gateway-task module in the Terraform registry](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/gateway-task?tab=inputs) for a complete reference.
-
-Refer to the [gateway task configuration examples](#gateway-task-configuration-examples) for additional example configurations.
-
-## Configure the ECS controller 
-
-Deploy the ECS controller container to its own ECS task in the cluster. Refer to [ECS controller container](/consul/docs/ecs/reference/architecture#ecs-controller) for details about the container. 
-
-Verify that you have completed the prerequisites described in [Secure configuration requirements](#secure-configuration-requirements) and complete the following steps to configure the controller container.
-
-### Create a an ACL token for the controller
-
-1. On the Consul server, create a policy that grants the following access for the controller:
-
-    - `acl:write`
-    - `operator:write` 
-    - `node:write` 
-    
-    The policy allows Consul to generate a token linked to the policy. Refer to [Create a service token](/consul/docs/security/acl/tokens/create/create-a-service-token) for instructions.
-1. Create a token and link it to the ACL controller policy. Refer to the [ACL tokens documentation](/consul/docs/security/acl/tokens) for instructions.
-
-### Configure an AWS secrets manager secret
-
-Add the `aws_secretsmanager_secret` resource to your Terraform configuration and specify values for retrieving the CA and TLS certificates. The resource enables services to communicate over TLS and present ACL tokens. The ECS controller also uses the secret manager to retrieve the value of the bootstrap token. 
-
-In the following example, Terraform creates the CA certificates for gRPC and HTTPS in the secrets manager. Consul retrieves the CA certificate PEM file from the secret manager so that the mesh task can use TLS for HTTP and gRPC traffic:
-
-<CodeBlockConfig filename="secret.tf">
-
-```hcl
-resource "tls_private_key" "ca" {
-  algorithm   = "ECDSA"
-  ecdsa_curve = "P384"
-}
-
-resource "tls_self_signed_cert" "ca" {
-  private_key_pem = tls_private_key.ca.private_key_pem
-
-  subject {
-    common_name  = "Consul Agent CA"
-    organization = "HashiCorp Inc."
-  }
-
-  // 5 years.
-  validity_period_hours = 43800
-
-  is_ca_certificate  = true
-  set_subject_key_id = true
-
-  allowed_uses = [
-    "digital_signature",
-    "cert_signing",
-    "crl_signing",
-  ]
-}
-
-resource "aws_secretsmanager_secret" "ca_key" {
-  name                    = "${var.name}-${var.datacenter}-ca-key"
-  recovery_window_in_days = 0
-}
-
-resource "aws_secretsmanager_secret_version" "ca_key" {
-  secret_id     = aws_secretsmanager_secret.ca_key.id
-  secret_string = tls_private_key.ca.private_key_pem
-}
-
-resource "aws_secretsmanager_secret" "ca_cert" {
-  name                    = "${var.name}-${var.datacenter}-ca-cert"
-  recovery_window_in_days = 0
-}
-
-resource "aws_secretsmanager_secret_version" "ca_cert" {
-  secret_id     = aws_secretsmanager_secret.ca_cert.id
-  secret_string = tls_self_signed_cert.ca.cert_pem
-}
-```
-
-</CodeBlockConfig>
-
-Note that you could use a single `CERT PEM` for both variables. The `consul_ca_cert_arn` is the default ARN applicable to both the protocols. You can also use protocol-specific certificate PEMs with the `consul_https_ca_cert_arn` and `consul_grpc_ca_cert_arn` variables.
-
-The following Terraform configuration passes the generated CA certificate ARN to the `mesh-task` module and ensures that the CA certificate and PEM variable are set for both HTTPS and gRPC communication.
-
-<CodeBlockConfig filename="secret.tf">
-
-```hcl
-module "my_task" {
-  source  = "hashicorp/consul-ecs/aws//modules/mesh-task"
-  version = "<version>"
-
-  ...
-
-  tls                       = true
-  consul_ca_cert_arn = aws_secretsmanager_secret.ca_cert.arn
-}
-```
-
-</CodeBlockConfig>
-
-### Enable secure deployment
-
-To enable secure deployment, add the following configuration to the task module.
-
-<CodeBlockConfig filename="secret.tf">
-
-```hcl
-module "my_task" {
-  source  = "hashicorp/consul-ecs/aws//modules/mesh-task"
-  version = "<version>"
-
-  ...
-
-  tls                       = true
-  consul_grpc_ca_cert_arn = aws_secretsmanager_secret.ca_cert.arn
-
-  acls                      = true
-  consul_server_hosts          = "https://consul-server.example.com"
-  consul_https_ca_cert_arn  = aws_secretsmanager_secret.ca_cert.arn
-}
-
-```
-
-</CodeBlockConfig>
-
-### Complete configuration examples
-
-The [terraform-aws-consul-ecs GitHub repository](https://github.com/hashicorp/terraform-aws-consul-ecs/tree/main/examples) contains examples that you can reference to help you deploy Consul service mesh to your ECS workloads.
-
-## Apply your Terraform configuration
-
-Run Terraform to create the task definition.
-
-Save the Terraform configuration for the task definition to a file, such as `mesh-task.tf`.
-You should place this file in a directory alongside other Terraform configuration files for your project.
-
-The `mesh-task` module requires the AWS Terraform provider. The following example shows how to include
-and configure the AWS provider in a file called `provider.tf`. Refer to [AWS provider in the Terraform registry](https://registry.terraform.io/providers/hashicorp/aws/latest/docs)
-for additional documentation and specifications.
-
-<CodeBlockConfig filename="provider.tf">
-
-```hcl
-terraform {
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = "<latest version>"
-    }
-  }
-}
-
-provider "aws" {
-  region = "<AWS region>"
-  ...
-}
-```
-
-</CodeBlockConfig>
-
-Specify any additional AWS resources for your project in Terraform configuration files
-in the same directory. The following example shows a basic project directory:
-
-```shell-session
-$ ls
-mesh-task.tf
-provider.tf
-...
-```
-
-Issue the following commands to run the configuration:
-
-1. `terraform init`: This command downloads dependencies, such as Terraform providers.
-1. `terraform apply`: This command directs Terraform to create the AWS resources, such as the task definition from the `mesh-task` module.
-
-Terraform reads all files in the current directory that have a `.tf` file extension.
-Refer to the [Terraform documentation](/terraform/docs) for more information and Terraform best practices.
-
-## Next steps
- 
-After deploying the Consul service mesh infrastructure, you must still define routes between service instances as well as configure the bind address for your applications so that they only receive traffic through the mesh. Refer to the following topics:
-
-- [Configure routes between ECS tasks](/consul/docs/ecs/deploy/configure-routes)
-- [Configure the ECS task bind address](/consul/docs/ecs/deploy/bind-addresses)
-
-## Gateway task configuration examples
-
-The following examples illustrate how to configure the `gateway-task` for different use cases.
-
-### Ingress
-
-Mesh gateways need to be reachable over the WAN to route traffic between datacenters. Configure the following options in the `gateway-task` module to enable ingress through the mesh gateway.
-
-| Input variable | Type | Description |
-| ---    | ---  | ---         |
-| `lb_enabled` | Boolean | Set to `true` to automatically deploy and configure a network load balancer for ingress to the mesh gateway. |
-| `lb_vpc_id` | string | Specifies the VPC to launch the load balancer in. |
-| `lb_subnets` | list of strings | Specifies one or more public subnets to associate with the load balancer. |
-
-<CodeBlockConfig filename="mesh-gateway.tf">
-
-```hcl
-module "my_mesh_gateway" {
-  ...
-
-  lb_enabled = true
-  lb_vpc_id  = "<VPC ID>"
-  lb_subnets = ["<public subnet IDs>"]
-}
-```
-
-</CodeBlockConfig>
-
-Alternatively, you can manually configure ingress to the mesh gateway and provide the `wan_address` and `wan_port` inputs to the `gateway-task` module. The `wan_port` field is optional. Port `8443` is used by default.
-
-<CodeBlockConfig filename="mesh-gateway.tf">
-
-```hcl
-module "my_mesh_gateway" {
-  ...
-
-  wan_address = "<public WAN address>"
-  wan_port    = <public WAN port>
-}
-```
-
-</CodeBlockConfig>
-
-Mesh gateways route L4 TCP connections and do not terminate mTLS sessions. If you manually configure [AWS Elastic Load Balancing](https://aws.amazon.com/elasticloadbalancing/) for ingress to a mesh gateway, you must use an [AWS Network Load Balancer](https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html) or a [Classic Load Balancer](https://docs.aws.amazon.com/elasticloadbalancing/latest/classic/introduction.html).
-
-### ACLs
-
-When ACLs are enabled, configure the following options in the `gateway-task` module.
-
-| Option | Type | Description |
-| ---    | ---  | ---         |
-| `acl` | Boolean | Set to `true` when ACLs are enabled. |
-| `consul_server_hosts` | string |  Specifies the HTTP `address` of the Consul server. Required for the mesh gateway task to log into Consul using the IAM auth method so that it can obtain its client and service tokens. |
-| `consul_https_ca_cert_arn` | string |  Specifies ARN of the Secrets Manager secret that contains the certificate for the Consul HTTPS API. |
-
-<CodeBlockConfig filename="mesh-gateway.tf">
-
-```hcl
-module "my_mesh_gateway" {
-  ...
-
-  acls                         = true
-  consul_server_hosts          = "<HTTP address of the Consul server>"
-  tls = true
-  consul_https_ca_cert_arn  = "<Secrets Manager secret ARN>"
-}
-```
-
-</CodeBlockConfig>
-
-### WAN federation
-
-Configure the following options in the `gateway-task` to enable [WAN federation through mesh gateways](/consul/docs/connect/gateways/mesh-gateway/wan-federation-via-mesh-gateways).
-
-| Option | Type | Description |
-| ---    | ---  | ---         |
-| `consul_datacenter` | string | Specifies the name of the local Consul datacenter. |
-| `consul_primary_datacenter` | string | Specifies the name of the primary Consul datacenter. |
-| `enable_mesh_gateway_wan_federation` | Boolean | Set to `true` to enable WAN federation. |
-| `enable_acl_token_replication` | Boolean | Set to `true` to enable ACL token replication and allow the creation of local tokens secondary datacenters. |
-
-The following example shows how to configure the `gateway-task` module.
-
-<CodeBlockConfig filename="mesh-gateway.tf">
-
-```hcl
-module "my_mesh_gateway" {
-  ...
-
-  enable_mesh_gateway_wan_federation = true
-}
-```
-
-</CodeBlockConfig>
-
-When federating Consul datacenters over the WAN with ACLs enabled, [ACL Token replication](/consul/docs/security/acl/acl-federated-datacenters) must be enabled on all server and client agents in all datacenters.
diff --git a/website/content/docs/ecs/enterprise.mdx b/website/content/docs/ecs/enterprise.mdx
index c07a41c58d60a..1063453455bec 100644
--- a/website/content/docs/ecs/enterprise.mdx
+++ b/website/content/docs/ecs/enterprise.mdx
@@ -26,7 +26,7 @@ module "my_task" {
 
 ## Licensing
 
-!> **Warning:** Consul Enterprise is currently only fully supported when [ACLs are enabled](/consul/docs/ecs/deploy/terraform#secure-configuration-requirements).
+!> **Warning:** Consul Enterprise is currently only fully supported when [ACLs are enabled](/consul/docs/ecs/terraform/secure-configuration).
 
 Consul Enterprise [requires a license](/consul/docs/enterprise/license/overview). If running
 Consul on ECS with ACLs enabled, the license will be automatically pulled down from Consul servers.
@@ -34,14 +34,14 @@ Consul on ECS with ACLs enabled, the license will be automatically pulled down f
 Currently there is no capability for specifying the license when ACLs are disabled so if you wish to
 run Consul Enterprise clients then you must enable ACLs.
 
-## Running Consul Community Edition clients
+## Running Open Source Consul Clients
 
-You can operate Consul Enterprise servers with Consul CE (community edition) clients as long as the features you are using do not require Consul Enterprise client support. Admin partitions and namespaces, for example, require Consul Enterprise clients and are not supported with Consul CE.
+You can operate Consul Enterprise servers with Consul OSS (open source) clients as long as the features you are using do not require Consul Enterprise client support. Admin partitions and namespaces, for example, require Consul Enterprise clients and are not supported with Consul OSS.
 
 ## Feature Support
 
 Consul on ECS supports the following Consul Enterprise features.
-If you are only using features that run on Consul servers, then you can use a CE client in your service mesh tasks on ECS.
+If you are only using features that run on Consul servers, then you can use an OSS client in your service mesh tasks on ECS.
 If client support is required for any of the features, then you must use a Consul Enterprise client in your `mesh-tasks`.
 
 | Feature                           | Supported     | Description                                                                                                                                                                                  |
@@ -54,8 +54,8 @@ If client support is required for any of the features, then you must use a Consu
 | Advanced Federation/Network Areas | Yes (servers) | This feature runs on Consul servers.                                                                                                                                                         |
 | Sentinel                          | Yes (servers) | This feature runs on Consul servers.                                                                                                                                                         |
 | Network Segments                  | No            | Currently there is no capability to configure the network segment Consul clients on ECS run in.                                                                                              |
-| Namespaces                        | Yes           | This feature requires Consul Enterprise servers. CE clients can register into the `default` namespace. Registration into a non-default namespace requires a Consul Enterprise client.       |
-| Admin Partitions                  | Yes           | This feature requires Consul Enterprise servers. CE clients can register into the `default` admin partition. Registration into a non-default partition requires a Consul Enterprise client. |
+| Namespaces                        | Yes           | This feature requires Consul Enterprise servers. OSS clients can register into the `default` namespace. Registration into a non-default namespace requires a Consul Enterprise client.       |
+| Admin Partitions                  | Yes           | This feature requires Consul Enterprise servers. OSS clients can register into the `default` admin partition. Registration into a non-default partition requires a Consul Enterprise client. |
 | Audit Logging                     | Yes           | This feature requires Consul Enterprise clients.                                                                                                                                             |
 
 ### Admin Partitions and Namespaces
@@ -95,7 +95,7 @@ module "acl_controller" {
 
 </CodeBlockConfig>
 
-Services are assigned to admin partitions and namespaces through the use of [task tags](/consul/docs/ecs/deploy/manual#configure-task-tags).
+Services are assigned to admin partitions and namespaces through the use of [task tags](/consul/docs/ecs/manual/install#task-tags).
 The `mesh-task` module automatically adds the necessary tags to the task definition.
 If the ACL controller is configured for admin partitions, services on the mesh will
 always be assigned to an admin partition and namespace. If the `mesh-task` does not define
diff --git a/website/content/docs/ecs/index.mdx b/website/content/docs/ecs/index.mdx
index 7238765af2663..963604188aef4 100644
--- a/website/content/docs/ecs/index.mdx
+++ b/website/content/docs/ecs/index.mdx
@@ -2,53 +2,39 @@
 layout: docs
 page_title: Consul on AWS Elastic Container Service (ECS) Overview
 description: >-
-  You can deploy Consul service mesh applications to Amazon Web Services ECS by running each task with an application container, a client agent, and an Envoy proxy. Learn how Consul service mesh works on ECS and find getting started tutorials for several scenarios.
+  Consul's architecture adapts to Amazon Web Services ECS by running each task with an application container, a client agent, and an Envoy proxy. Learn how Consul service mesh works on ECS and find getting started tutorials for several scenarios.
 ---
 
-# Consul on AWS Elastic Container Service (ECS) overview
-This overview provides information about connecting your workloads managed by [AWS Elastic Container Service (ECS)](https://aws.amazon.com/ecs/) to a Consul service mesh. A Consul service mesh automates service-to-service authorization and encryption across your Consul services. You can use a service mesh in ECS networks to secure communication between ECS tasks and communication between tasks and external services.
+# Consul on AWS Elastic Container Service (ECS) Overview
 
+You can deploy Consul service mesh applications to [AWS Elastic Container Service](https://aws.amazon.com/ecs/) (ECS) using either our official [Terraform modules](/consul/docs/ecs/terraform/install) or by [manually configuring the task definition](/consul/docs/ecs/manual/install).
 
-## Workflow 
+## Service Mesh
 
-You can install Consul on ECS with the [HashiCorp Terraform modules](/consul/docs/ecs/deploy/terraform) or by [manually configuring the task definition](/consul/docs/ecs/deploy/manual). We strongly recommend using the Terraform modules and resources because Terraform automatically builds and enables Consul service mesh containers for your workloads. The Terraform module installation method also allows you to add your existing ECS task definitions to the Consul service mesh without additional configuration. 
+Using Consul on AWS ECS enables you to add your ECS tasks to the service mesh and
+take advantage of features such as zero-trust-security, intentions, observability,
+traffic policy, and more. You can also connect service meshes so that services deployed across your infrastructure environments can communicate.
 
-### Terraform module installation 
+## Architecture
 
-1. Create and run a Terraform configuration that includes the ECS task, modules, and resources. 
-1. Configure routes between ECS tasks in your cluster. Once the service mesh is built, you must define paths for traffic between services.
-1. Configure the ECS bind address. Binding to the loopback address allows the sidecar proxy running in the same task to only make requests within the service mesh.
+![Consul on ECS Architecture](/img/consul-ecs-arch.png)
 
+Consul on ECS follows an [architecture](/consul/docs/architecture) similar to other platforms, but each ECS task is a
+Consul node. An ECS task runs the user application container(s), as well as a Consul client container for control plane
+communication and an [Envoy](https://envoyproxy.io/) sidecar proxy container to facilitate data plane communication for
+[Consul service mesh](/consul/docs/connect).
 
-### Manual installation
+For a detailed architecture overview, see the [Architecture](/consul/docs/ecs/architecture) page.
 
-To manually install Consul, you must create definitions for each container that operates in the ECS cluster. Refer to [Architecture](/consul/docs/ecs/architecture) for information about the Consul containers you must deploy. Note that there is no manual process for creating gateway task containers. Gateways enable you to connect multiple datacenters or admin partitions. You must use Terraform if you want to deploy gateways to your network.
+## Getting Started
 
-## Guidance
+There are several ways to get started with Consul with ECS.
 
-Refer to the following documentation and tutorials for additional guidance.
+- The [Integrate your AWS ECS services into Consul service mesh](/consul/tutorials/cloud-integrations/consul-ecs) tutorial shows how to use Terraform to run Consul service mesh applications on ECS with self-managed Consul or HCP-managed Consul.
+- The [Consul with Dev Server on Fargate](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/examples/dev-server-fargate) example installation deploys a sample application in ECS using the Fargate launch type.
+- The [Consul with Dev Server on EC2](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/examples/dev-server-ec2) example installation deploys a sample application in ECS using the EC2 launch type.
 
-### Tutorials
+Refer to the [Requirements](/consul/docs/ecs/requirements) and use one of the following sets of instructions when you're ready to install Consul on an existing ECS cluster and add tasks to the service mesh:
 
-- [Integrate your AWS ECS services into Consul service mesh](/consul/tutorials/cloud-integrations/consul-ecs): Shows how to use Terraform to run Consul service mesh applications on ECS with self-managed Consul or HCP-managed Consul.
-
-You can also refer to the following example configurations:
-
-- [Examples on GitHub](https://github.com/hashicorp/terraform-aws-consul-ecs/tree/main/examples)
-- [Consul with dev server on ECS using the Fargate launch type](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/examples/dev-server-fargate) 
-- [Consul with dev server onn ECS using the EC2 launch type](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/examples/dev-server-ec2)
-
-### Documentation
- 
-- [Install Consul on ECS with Terraform](/consul/docs/ecs/deploy/terraform)
-- [Configure routes between ECS tasks](/consul/docs/ecs/deploy/configure-routes)
-- [Configure the ECS task bind address](/consul/docs/ecs/deploy/bind-addresses)
-- [Install Consul on ECS manually](/consul/docs/ecs/deploy/manual)
-
-### Reference
-
-- [Architecture](/consul/docs/ecs/architecture)
-- [Technical specifications](/consul/docs/ecs/tech-specs)
-- [Task configuration reference](/consul/docs/ecs/reference/configuration-reference)
-- [Cross-compatibility reference](/consul/docs/ecs/reference/compatibility)
-- [Consul server JSON schema reference](/consul/docs/ecs/reference/consul-server-json)
\ No newline at end of file
+- [Install with Terraform](/consul/docs/ecs/terraform/install)
+- [Install Manually](/consul/docs/ecs/manual/install)
diff --git a/website/content/docs/ecs/manual/acl-controller.mdx b/website/content/docs/ecs/manual/acl-controller.mdx
new file mode 100644
index 0000000000000..bb7d88638acee
--- /dev/null
+++ b/website/content/docs/ecs/manual/acl-controller.mdx
@@ -0,0 +1,190 @@
+---
+layout: docs
+page_title: ACL Controller Manual Installation - Consul on AWS Elastic Container Service (ECS)
+description: >-
+  An ACL Controller is required to configure the AWS IAM auth method on Amazon Web Services ECS. Learn how to manually install ACL controllers by defining a task and a service and then configuring role policies.
+---
+
+# Manual Installation of ACL Controller for Consul on AWS Elastic Container Service (ECS)
+
+This topic describes how to manually deploy the ACL controller, which will automatically configure the [AWS IAM Auth Method](/consul/docs/security/acl/auth-methods/aws-iam). If you are using Terraform, refer to the [Terraform Secure Configuration](/consul/docs/ecs/terraform/secure-configuration) page to deploy the ACL controller.
+
+## Prerequisites
+
+* Your application tasks must include certain tags to be compatible with the ACL controller.
+Refer to the [Task Tags](/consul/docs/ecs/manual/install#task-tags) section of the installation page.
+* You should be familiar with configuring Consul's secure features, including how to create ACL tokens and policies. Refer to the [Consul Security tutorials](/consul/tutorials/security) for an introduction and the [ACL system](/consul/docs/security/acl) documentation for more information.
+* If you are using Consul with multiple ECS clusters, each cluster requires its own instance of the ACL controller.
+
+## Set Up Secrets
+
+Before deploying the ACL controller for the first time, you must [store the following secrets](https://docs.aws.amazon.com/secretsmanager/latest/userguide/manage_create-basic-secret.html) from Consul in AWS Secrets Manager.
+
+| Secret                | Sample Secret Name           | Description                                                                                                                                                               |
+| --------------------- | ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Consul server CA cert | `my-consul-ca-cert`          | The Consul server CA Cert for the HTTPS interface. This is required if the Consul server uses a self-signed or internal CA. It is not required for Consul servers in HCP. |
+| Bootstrap ACL Token   | `my-consul-bootstrap-token`  | A Consul ACL token with `acl:write` and `operator:write` permissions.                                                                                                     |
+
+## Task Definition
+
+You must create a task definition to deploy the ACL controller in your ECS cluster.
+The ACL controller must run in the same ECS cluster that hosts your service mesh application
+tasks.
+
+The following example shows how the task definition should be configured for the ACL controller.
+
+```json
+{
+  "family": "my-consul-acl-controller",
+  "networkMode": "awsvpc",
+  "containerDefinitions": [
+    {
+      "name": "acl-controller",
+      "image": "public.ecr.aws/hashicorp/consul-ecs:<CONSUL_ECS_VERSION>",
+      "essential": true,
+      "command": ["acl-controller", "-iam-role-path", "/consul-ecs/"],
+      "secrets": [
+        {
+          "name": "CONSUL_HTTP_TOKEN",
+          "valueFrom": "arn:aws:secretsmanager:us-west-2:000000000000:secret:my-consul-bootstrap-token"
+        },
+        {
+          "name": "CONSUL_CACERT_PEM",
+          "valueFrom": "arn:aws:secretsmanager:us-west-2:000000000000:secret:my-consul-ca-cert"
+        }
+      ],
+      "environment": [
+        {
+          "name": "CONSUL_HTTP_ADDR",
+          "value": "<Consul server HTTP API address>"
+        }
+      ]
+    }
+  ]
+}
+```
+
+You must include the following top-level fields.
+
+| Field name    | Type    | Description                                                                  |
+| -----------   | ------- | ---------------------------------------------------------------------------- |
+| `family`      | string  | The task family name of your choice.                                         |
+| `networkMode` | string  | Must be `awsvpc`, which is the only network mode supported by Consul on ECS. |
+
+In the `containerDefinitions` list, include one container with the following fields.
+
+| Field name    | Type    | Description                                                                                                                                                                                                                |
+| ------------- | ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------                        |
+| `name`        | string  | The container name, which should be `acl-controller`                                                                                                                                                                       |
+| `image`       | string  | The `consul-ecs` image. Use our public AWS registry, `public.ecr.aws/hashicorp/consul-ecs`, to avoid rate limits.                                                                                                          |
+| `command`     | list    | Should be set as shown. The startup command for the ACL controller.                                                                                                                                                        |
+| `essential`   | boolean | Must be `true` to ensure the health of your application container affects the health status of the task.                                                                                                                   |
+| `secrets`     | list    | Should be set as shown. Configures the secrets the ECS service will retrieve and set as environment variables in the `acl-controller` container.                                                                           |
+| `environment` | string  | Must be set as shown. Configures environment variables that the ECS service will set in the `acl-controller` container. Must set the `CONSUL_HTTP_ADDR` environment variable to the HTTP(S) address of the Consul servers. |
+
+The following CLI options are available in the `command` field of the container definition.
+
+| Flag               | Type    | Description                                                                                   |
+| ------------------ | ------- | --------------------------------------------------------------------------------------------- |
+| `-iam-role-path`   | string  | Specifies the path to IAM roles trusted by the AWS IAM auth method created by the controller. |
+| `-log-level`       | string  | The log level for the ACL controller. Can be set to `DEBUG` for additional detail.            |
+
+The following describes the entries to include in the `secrets` list.
+
+| Name                | Description                                                                                                                                    |
+| ------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- |
+| `CONSUL_HTTP_TOKEN` | Must be set to the secret containing the bootstrap ACL token.                                                                                  |
+| `CONSUL_CACERT_PEM` | If applicable, should be set to the secret containing the Consul server CA certificate. This must not be set when using Consul servers in HCP. |
+
+## ECS Service
+
+Once the task definition is created, define an ECS service in order to start an ACL controller task.
+
+The following example contains the recommended settings for the ACL controller. Refer to
+the [ECS service](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service_definition_parameters.html) documentation
+to complete the remaining details for your use case.
+
+```json
+{
+   "cluster": "<Your ECS cluster ARN>"
+   "desiredCount": 1,
+   "launchType": "FARGATE",
+   "serviceName": "my-acl-controller",
+   "taskDefinition": "<task definition ARN>",
+   ...
+}
+```
+
+| Field name       | Type    | Description                                                                                                      |
+| ---------------- | ------- | ---------------------------------------------------------------------------------------------------------------- |
+| `cluster`        | string  | Set to your ECS cluster name or ARN. This must be the same ECS cluster where your service mesh applications run. |
+| `desiredCount`   | integer | Must be `1`. Only one instance of the ACL controller should run per ECS cluster.                                   |
+| `launchType`     | string  | Consul on ECS supports both the `FARGATE` and `EC2` launch types.                                                |
+| `serviceName`    | string  | The service name of your choice.                                                                                 |
+| `taskDefinition` | string  | Must be set to the ACL controller [task definition](/consul/docs/ecs/manual/acl-controller#task-definition).            |
+
+## AWS IAM Roles
+
+The ECS task and execution roles must be configured to allow the ACL controller access
+to the ECS API and Secrets Manager API.
+
+### Task Role Policy
+
+The following example shows the policy needed for the ECS task role for the ACL controller.
+This grants the ACL controller permission to list tasks, describe tasks, and read and update
+secrets.
+
+```json
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Action": [
+        "ecs:ListTasks",
+        "ecs:DescribeTasks"
+      ],
+      "Resource": ["*"]
+    }
+  ]
+}
+```
+
+The following are the required permissions.
+
+| Action                | Resource  | Description                                                  |
+| --------------------- | --------- | ------------------------------------------------------------ |
+| `ecs:ListTasks`       | `*`       | Allow the ACL controller to watch for new tasks.             |
+| `ecs:DescribeTasks`   | `*`       | Allow the ACL controller to retrieve details for new tasks.  |
+
+### Execution Role Policy
+
+The following IAM policy document allows ECS to retrieve secrets needed
+to start the ACL controller task from AWS Secrets Manager, including the ACL
+bootstrap token.
+
+The following example shows the policy needed for the execution role.
+
+```json
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Action": [
+        "secretsmanager:GetSecretValue"
+      ],
+      "Resource": [
+        "arn:aws:secretsmanager:us-west-2:000000000000:secret:my-consul-bootstrap-token",
+        "arn:aws:secretsmanager:us-west-2:000000000000:secret:my-consul-ca-cert"
+      ]
+    }
+  ]
+}
+```
+
+The following are the required permissions.
+
+| Action                          | Resource                                                      | Description                                                            |
+| ------------------------------- | ------------------------------------------------------------- | ---------------------------------------------------------------------- |
+| `secretsmanager:GetSecretValue` | `arn:aws:secretsmanager:us-west-2:000000000000:secret:<NAME>` | Allow ECS to retrieve this secret and inject the secret into the task. |
diff --git a/website/content/docs/ecs/manual/install.mdx b/website/content/docs/ecs/manual/install.mdx
new file mode 100644
index 0000000000000..f22560e64e617
--- /dev/null
+++ b/website/content/docs/ecs/manual/install.mdx
@@ -0,0 +1,556 @@
+---
+layout: docs
+page_title: Install Manually - Consul on AWS Elastic Container Service (ECS)
+description: >-
+  Manually install Consul on Amazon Web Services ECS by using the Docker `consul-ecs` image to create task definitions that include required containers. Learn how to configure task definitions with example configurations.
+---
+
+# Manual Installation of Consul on AWS Elastic Container Service (ECS)
+
+The following instructions describe how to use the [`consul-ecs` Docker image](https://gallery.ecr.aws/hashicorp/consul-ecs) to manually create the ECS task definition without Terraform. If you prefer to use Terraform, refer to [Consul ECS Terraform module](/consul/docs/ecs/terraform/install).
+
+If you intend to peer the service mesh to multiple Consul datacenters or partitions, you must use the Consul ECS Terraform module to install your service mesh on ECS. Manually configuring mesh gateways without using the `gateway-task` Terraform module is not supported.
+
+This topic does not include instructions for creating all AWS resources necessary to install Consul, such as a VPC or the ECS cluster. Refer to the linked guides in the [Getting Started](/consul/docs/ecs#getting-started) section for complete, runnable examples.
+
+## Prerequisites
+
+You should have some familiarity with AWS ECS. See [What is Amazon Elastic Container Service](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/Welcome.html) for details.
+
+## Task Definition
+
+Configure a task definition that creates the containers:
+
+- Your application container
+- An Envoy sidecar-proxy container
+- A Consul client container
+- A `consul-ecs-mesh-init` container for service mesh setup
+- (Optional) A `consul-ecs-health-sync` container to sync ECS health checks into Consul
+
+## Top-level fields
+
+Your task definition must include the following top-level fields.
+
+The `volumes` list contains two [bind mounts](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/bind-mounts.html),
+named `consul_data` and `consul_binary`. Bind mounts are directories on the host which can be mounted into one or more containers
+in order to share files among containers. For Consul on ECS, certain binaries and configuration are shared among containers
+during task startup.
+
+```json
+{
+  "family": "my-example-client-app",
+  "networkMode": "awsvpc",
+  "volumes": [
+    {
+      "name": "consul_data"
+    },
+    {
+      "name": "consul_binary"
+    }
+  ],
+  "containerDefinitions": [...],
+  "tags": [
+    {
+      "key": "consul.hashicorp.com/mesh",
+      "value": "true"
+    },
+    {
+      "key": "consul.hashicorp.com/service-name",
+      "value":  "example-client-app"
+    }
+  ]
+}
+```
+
+| Field name             | Type   | Description                                                                                                        |
+| ---------------------- | ------ | ------------------------------------------------------------------------------------------------------------------ |
+| `family`               | string | The task family name. This is used as the Consul service name by default.                                          |
+| `networkMode`          | string | Must be `awsvpc`, which is the only network mode supported by Consul on ECS.                                       |
+| `volumes`              | list   | Must be defined as shown above. Volumes are used to share configuration between containers for initial task setup. |
+| `containerDefinitions` | list   | The list of containers to run in this task (see [Application container](#application-container)).                  |
+
+### Task Tags
+
+The `tags` list must include the following if you are using the ACL controller in a [secure configuration](/consul/docs/ecs/manual/secure-configuration).
+Without these tags, the ACL controller will be unable to provision a service token for the task.
+
+| Tag Key                             | Tag Value              | Description                                                                                                                                     |
+| ----------------------------------- | ---------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
+| `consul.hashicorp.com/mesh`         | `true` (string)        | The ACL controller ignores tasks without this tag set to `true`.                                                                                |
+| `consul.hashicorp.com/service-name` | Consul service name    | Specifies the Consul service associated with this task. Required if the service name is different than the task `family`.                       |
+| `consul.hashicorp.com/partition`    | Consul admin partition | <EnterpriseAlert inline />Specifies the Consul admin partition associated with this task. Defaults to the `default` admin partition if omitted. |
+| `consul.hashicorp.com/namespace`    | Consul namespace       | <EnterpriseAlert inline />Specifies the Consul namespace associated with this task. Defaults to the `default` namespace if omitted.             |
+
+## Application container
+
+First, include your application container in the `containerDefinitions` list
+in the task definition.
+
+Ensure that the `containerName` and `condition` fields in the `dependsOn` list
+are specified as described in the following example. These are container dependencies,
+which must be used to enforce a specific [startup order](/consul/docs/ecs/architecture#task-startup).
+By using the following settings, your application container will start after `consul-ecs-mesh-init`
+has completed task setup and after `sidecar-proxy` is ready to proxy traffic between
+this task and the service mesh.
+
+```json
+{
+  "containerDefinitions": [
+    {
+      "name": "example-client-app",
+      "image": "docker.io/org/my_task:v0.0.1",
+      "essential": true,
+      "dependsOn": [
+        {
+          "containerName": "consul-ecs-mesh-init",
+          "condition": "SUCCESS"
+        },
+        {
+          "containerName": "sidecar-proxy",
+          "condition": "HEALTHY"
+        }
+      ],
+      ...
+    }
+  ]
+}
+```
+
+| Field name  | Type    | Description                                                                                                                       |
+| ----------- | ------- | --------------------------------------------------------------------------------------------------------------------------------  |
+| `name`      | string  | The name of your application container.                                                                                           |
+| `image`     | string  | The container image used to run your application.                                                                                 |
+| `essential` | boolean | Must be `true` to ensure the health of your application container affects the health status of the task.                          |
+| `dependsOn` | list    | Must be set as shown above. Container dependencies ensure your application container starts after service mesh setup is complete. |
+
+See the [ECS Task Definition](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html) documentation for a complete reference.
+
+## `sidecar-proxy` container
+
+The `sidecar-proxy` container runs [Envoy proxy](/consul/docs/connect/proxies/envoy) for Consul service mesh. In most cases, the container should contain the following parameters and values.
+
+The `mountPoints` list must be set as shown in the following example. This will mount the shared `consul_data` volume into the
+`sidecar-proxy` container at the path `/consul`. This volume is where the `consul-ecs-mesh-init` container copies the `envoy-bootstrap.json`
+file and the `consul-ecs` binary, which are required to start Envoy. The `dependsOn` list must also be defined as follows to ensure the
+`sidecar-proxy` container starts after `consul-ecs-mesh-init` has successfully written these files to the shared volume.
+
+<CodeBlockConfig highlight="8-40">
+
+```json
+{
+  "containerDefinitions": [
+    {
+      "name": "example-client-app",
+      "image": "docker.io/org/my_task:v0.0.1",
+      ...
+    },
+    {
+      "name": "sidecar-proxy",
+      "image": "envoyproxy/envoy-alpine:<VERSION>",
+      "essential": false,
+      "dependsOn": [
+        {
+          "containerName": "consul-ecs-mesh-init",
+          "condition": "SUCCESS"
+        }
+      ],
+      "healthCheck": {
+        "retries": 3,
+        "command": ["nc", "-z", "127.0.0.1", "20000"],
+        "timeout": 5,
+        "interval": 30
+      },
+      "mountPoints": [
+        {
+          "readOnly": true,
+          "containerPath": "/consul",
+          "sourceVolume": "consul_data"
+        }
+      ],
+      "ulimits": [
+        {
+          "name": "nofile",
+          "softLimit": 1048576,
+          "hardLimit": 1048576
+        }
+      ],
+      "command": ["envoy", "--config-path", "/consul/envoy-bootstrap.json"],
+      "entryPoint": ["/consul/consul-ecs", "envoy-entrypoint"],
+    }
+  ]
+}
+```
+
+</CodeBlockConfig>
+
+The following table describes the necessary configuration settings.
+
+| Field name    | Type    | Description                                                                                                                                                |
+| ------------- | ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `name`        | string  | The container name, which must be `sidecar-proxy`.                                                                                                         |
+| `image`       | string  | The Envoy image. This must be a [supported version of Envoy](/consul/docs/connect/proxies/envoy#supported-versions).                                              |
+| `dependsOn`   | list    | Must be set as shown above to ensure Envoy starts after the `consul-ecs-mesh-init` container has written the `envoy-bootstrap.json` config file for Envoy. |
+| `healthCheck` | list    | Must be set as shown above to monitor the health of Envoy's primary listener port, which ties into container dependencies and startup ordering.            |
+| `mountPoints` | list    | Must be set as shown above to access the files shared in the `/consul` directory, like the Envoy bootstrap configuration file and the `consul-ecs` binary. |
+| `ulimits`     | list    | The `nofile` ulimit must be raised to a sufficiently high value so that Envoy does not fail to open sockets.                                               |
+| `entrypoint`  | list    | Must be set to the custom Envoy entrypoint, `consul-ecs envoy-entrypoint`, to facilitate graceful shutdown.                                                |
+| `command`     | list    | The startup command. This passes the bootstrap configuration to Envoy.                                                                                     |
+
+-> **NOTE**: Envoy and Consul must be compatible versions. See the [supported versions of Envoy](/consul/docs/connect/proxies/envoy#supported-versions) in the Consul documentation.
+
+## `consul-client` container
+
+Each task must include a Consul client container in order for the task to join your Consul cluster.
+
+<CodeBlockConfig highlight="13-31">
+
+```json
+{
+  "containerDefinitions": [
+    {
+      "name": "example-client-app",
+      "image": "docker.io/org/my_task:v0.0.1",
+      ...
+    },
+    {
+      "name": "sidecar-proxy",
+      "image": "envoyproxy/envoy-alpine:<ENVOY_VERSION>",
+      ...
+    }
+    {
+      "name": "consul-client",
+      "image": "public.ecr.aws/hashicorp/consul:<CONSUL_VERSION>",
+      "mountPoints": [
+        {
+          "readOnly": false,
+          "containerPath": "/consul",
+          "sourceVolume": "consul_data"
+        },
+        {
+          "containerPath": "/bin/consul-inject",
+          "sourceVolume": "consul_binary"
+        }
+      ],
+      "entryPoint": ["/bin/sh", "-ec"],
+      "command": [
+        "cp /bin/consul /bin/consul-inject/consul\n\nECS_IPV4=$(curl -s $ECS_CONTAINER_METADATA_URI_V4 | jq -r '.Networks[0].IPv4Addresses[0]')\n\n\ncat << EOF > /consul/agent-defaults.hcl\naddresses = {\n  dns = \"127.0.0.1\"\n  grpc = \"127.0.0.1\"\n  http = \"127.0.0.1\"\n}\nadvertise_addr = \"$ECS_IPV4\"\nadvertise_reconnect_timeout = \"15m\"\nclient_addr = \"0.0.0.0\"\ndatacenter = \"dc1\"\nenable_central_service_config = true\nleave_on_terminate = true\nports {\n  grpc = 8502\n}\nretry_join = [\n  \"<Consul server location>\",\n]\ntelemetry {\n  disable_compat_1.9 = true\n}\n\nEOF\n\ncat << EOF > /consul/agent-extra.hcl\naddresses = {\n  dns = \"0.0.0.0\"\n}\nlog_level = \"debug\"\n\nEOF\n\nexec consul agent \\\n    -data-dir /consul/data \\\n    -config-file /consul/agent-defaults.hcl \\\n    -config-file /consul/agent-extra.hcl\n"
+      ]
+    }
+  ]
+}
+```
+
+</CodeBlockConfig>
+
+| Field name    | Type    | Description                                                                                                                       |
+| ------------- | ------- | --------------------------------------------------------------------------------------------------------------------------------- |
+| `name`        | string  | The container name, which should always be `consul-client`.                                                                       |
+| `image`       | string  | The Consul image. Use our public AWS registry, `public.ecr.aws/hashicorp/consul`, to avoid rate limits.                           |
+| `mountPoints` | list    | Must be set as shown above. Volumes are mounted to share information with other containers for task setup.                        |
+| `entrypoint`  | list    | Must be set to a plain shell so that the startup `command` works properly.                                                        |
+| `command`     | list    | Specifies the contents of the [startup script](#consul-client-startup-script). Copy the script and format it into a JSON string.  |
+
+### Consul client startup script
+
+The following script is used to start the Consul client for Consul on ECS.
+
+```shell
+# Copy the consul binary to a shared volume for `consul-ecs-mesh-init` to use to generate Envoy configuration.
+cp /bin/consul /bin/consul-inject/consul
+
+# At runtime, determine the IP address assigned to this ECS Task.
+ECS_IPV4=$(curl -s $ECS_CONTAINER_METADATA_URI_V4 | jq -r '.Networks[0].IPv4Addresses[0]')
+
+# Write the Consul agent configuration file.
+cat << EOF > /consul/agent-defaults.hcl
+addresses = {
+  dns = "127.0.0.1"
+  grpc = "127.0.0.1"
+  http = "127.0.0.1"
+}
+advertise_addr = "$ECS_IPV4"
+advertise_reconnect_timeout = "15m"
+client_addr = "0.0.0.0"
+datacenter = "dc1"
+enable_central_service_config = true
+leave_on_terminate = true
+ports {
+  grpc = 8502
+}
+retry_join = ["<consul server location>"]
+telemetry {
+  disable_compat_1.9 = true
+}
+
+EOF
+
+# Start the consul agent.
+exec consul agent \
+    -data-dir /consul/data \
+    -config-file /consul/agent-defaults.hcl
+```
+
+The following table describes the values that you should use to configure the `command` script:
+
+| Field name           | Type    | Description                                                                                                  |
+| -------------------- | ------- | ------------------------------------------------------------------------------------------------------------ |
+| `addresses.*`        | strings | Set the DNS, GRPC, and HTTP addresses to `127.0.0.1` to ensure these are not accessible outside of the task. |
+| `advertise_addr`     | string  | Must be set to the task IP address so that other Consul agents know how to reach this agent.                 |
+| `client_addr`        | string  | Must be set to an interface reachable by other Consul agents.                                                |
+| `datacenter`         | string  | Must be set to the Consul datacenter this task will join.                                                    |
+| `leave_on_terminate` | boolean | Must be set to `true` so that the Consul agent leaves the cluster gracefully before exiting.                 |
+| `retry_join`         | string  | Must be set to your Consul server location(s) so this agent can join the Consul cluster.                     |
+
+-> **NOTE**: Use `exec` to start the Consul agent so that the Consul agent runs as PID 1. This ensures
+the Consul agent directly receives signals from ECS, which is important for graceful shutdown of the Consul agent.
+
+Refer to the [Consul Agent documentation](/consul/docs/agent/config/config-files#configuration_files) for a complete reference of Consul agent
+configuration options.
+
+## `consul-ecs-mesh-init` container
+
+The `consul-ecs-mesh-init` container runs at task startup to setup this instance for Consul service mesh.
+It registers the service and proxy for this task with Consul and writes Envoy bootstrap
+configuration to a shared volume.
+
+<CodeBlockConfig highlight="18-41">
+
+```json
+{
+  "containerDefinitions": [
+    {
+      "name": "example-client-app",
+      "image": "docker.io/org/my_task:v0.0.1",
+      ...
+    },
+    {
+      "name": "sidecar-proxy",
+      "image": "envoyproxy/envoy-alpine:<ENVOY_VERSION>",
+      ...
+    },
+    {
+      "name": "consul-client"
+      "image": "public.ecr.aws/hashicorp/consul:<CONSUL_VERSION>",
+      ...
+    },
+    {
+      "name": "consul-ecs-mesh-init",
+      "image": "public.ecr.aws/hashicorp/consul-ecs:<CONSUL_ECS_VERSION>",
+      "command": ["mesh-init"],
+      "essential": false,
+      "environment": [
+        {
+          "name": "CONSUL_ECS_CONFIG_JSON",
+          "value": "{\"bootstrapDir\":\"/consul\",\"healthSyncContainers\":[],\"proxy\":{\"upstreams\":[{\"destinationName\":\"example-server-app\",\"localBindPort\":1234}]},\"service\":{\"checks\":[],\"meta\":{},\"name\":\"example-client-app\",\"port\":9090,\"tags\":[]}}"
+        }
+      ],
+      "mountPoints": [
+        {
+          "readOnly": false,
+          "containerPath": "/consul",
+          "sourceVolume": "consul_data"
+        },
+        {
+          "readOnly": true,
+          "containerPath": "/bin/consul-inject",
+          "sourceVolume": "consul_binary"
+        }
+      ]
+    }
+  ]
+}
+```
+
+</CodeBlockConfig>
+
+| Field name    | Type    | Description                                                                                                                             |
+| -----------   | ------- | --------------------------------------------------------------------------------------------------------------------------------------- |
+| `name`        | string  | The container name should be `consul-ecs-mesh-init`.                                                                                    |
+| `image`       | string  | The `consul-ecs` image. Use our public AWS registry, `public.ecr.aws/hashicorp/consul-ecs`, to avoid rate limits.                       |
+| `mountPoints` | list    | Must be set as show above, so the `consul` and `consul-ecs` binaries can be shared among containers for task setup.                     |
+| `command`     | list    | Set to `["mesh-init"]` so that the container runs the `consul-ecs mesh-init` command.                                                   |
+| `environment` | list    | This must include the [`CONSUL_ECS_CONFIG_JSON`](/consul/docs/ecs/manual/install#consul_ecs_config_json) variable. See below for details. |
+
+### `CONSUL_ECS_CONFIG_JSON`
+
+Consul uses the `CONSUL_ECS_CONFIG_JSON` environment variable to passed configurations to the `consul-ecs` binary in JSON format.
+
+The following example configures a service named `example-client-app` with one upstream
+service name `example-server-app`. The `proxy` and `service` blocks include information used by `consul-ecs-mesh-init` to register the service with Consul during task start up.
+The same configuration format is used for
+the `consul-ecs-health-sync` container.
+
+```json
+{
+  "bootstrapDir": "/consul",
+  "healthSyncContainers": [],
+  "proxy": {
+    "upstreams": [
+      {
+        "destinationName": "example-server-app",
+        "localBindPort": 1234
+      }
+    ]
+  },
+  "service": {
+    "checks": [],
+    "meta": {},
+    "name": "example-client-app",
+    "port": 9090,
+    "tags": []
+  }
+}
+```
+
+| Field name             | Type    | Description                                                                                                                                     |
+| ---------------------- | ------  | ----------------------------------------------------------------------------------------------------------------------------------------------- |
+| `bootstrapDir`         | string  | This is the path of a  shared volume that is mounted to other containers, where `consul-ecs-mesh-init` will write out Envoy configuration.      |
+| `healthSyncContainers` | list    | Used for [health status syncing](/consul/docs/ecs/architecture#ecs-health-check-syncing) from ECS to Consul. See below for details.     |
+| `proxy.upstreams`      | list    | The upstream services that your application calls over the service mesh, if any. The `destinationName` and `localBindPort` fields are required. |
+| `service.name`         | string  | The name used to register this service into the Consul service catalog.                                                                         |
+| `service.port`         | integer | The port your application listens on. Set to `0` if your application does not listen on any port.                                               |
+| `service.checks`       | list    | Consul [checks](/consul/docs/services/usage/checks) to include so that Consul can run health checks against your application.                               |
+
+See the [Configuration Reference](/consul/docs/ecs/configuration-reference) for a complete reference of fields.
+
+## `consul-ecs-health-sync` container
+
+Optionally, Consul ECS can sync health checks for this task into Consul checks.
+This allows you to configure a health check for your application in one place and
+see a consistent health status in both ECS and Consul.
+
+For example, the following defines an ECS health check command that runs `curl localhost:9090/health`:
+
+<CodeBlockConfig highlight="6-11">
+
+```json
+{
+  "containerDefinitions": [
+    {
+      "name": "example-client-app",
+      "image": "docker.io/org/my_task:v0.0.1",
+      "healthCheck": {
+        "retries": 3,
+        "command": ["CMD-SHELL", "curl localhost:9090/health"],
+        "timeout": 5,
+        "interval": 30
+      },
+      ...
+    },
+    ...
+  ]
+}
+```
+
+</CodeBlockConfig>
+
+First, define which containers need their health status synced into Consul. To do this,
+add the container name(s) to the `healthSyncContainers` list of the `CONSUL_ECS_CONFIG_JSON` variable,
+as shown in the following example. This configuration must be passed to both the `consul-ecs-mesh-init`
+and `consul-ecs-health-sync` containers.
+
+<CodeBlockConfig highlight="3-3">
+
+```json
+{
+  "bootstrapDir": "/consul",
+  "healthSyncContainers": ["example-client-app"],
+  ...
+}
+```
+
+</CodeBlockConfig>
+
+Next, set the `CONSUL_ECS_CONFIG_JSON` variable for the `consul-ecs-mesh-init` container.
+The following example shows how the `CONSUL_ECS_CONFIG_JSON` variable should be formatted.
+The JSON configuration is compacted down to a single line and escaped.
+
+<CodeBlockConfig highlight="7-10">
+
+```json
+{
+  "containerDefinitions": [
+    {
+      "name": "consul-ecs-mesh-init",
+      "image": "public.ecr.aws/hashicorp/consul-ecs:<VERSION>",
+      "environment": [
+        {
+          "name": "CONSUL_ECS_CONFIG_JSON",
+          "value": "{\"bootstrapDir\":\"/consul\",\"healthSyncContainers\":[\"example-client-app\"],\"proxy\":{\"upstreams\":[{\"destinationName\":\"example-server-app\",\"localBindPort\":1234}]},\"service\":{\"checks\":[],\"meta\":{},\"name\":\"example-client-app\",\"port\":9090,\"tags\":[]}}"
+        }
+      ],
+      ...
+    },
+    ...
+  ]
+}
+```
+
+</CodeBlockConfig>
+
+Finally, include the `consul-ecs-health-sync` container in the `containerDefinitions` list.
+Pass the same value for `CONSUL_ECS_CONFIG_JSON` for both the `consul-ecs-health-sync`
+and `consul-ecs-mesh-init` containers.
+
+<CodeBlockConfig highlight="23-40">
+
+```json
+{
+  "containerDefinitions": [
+    {
+      "name": "example-client-app",
+      "image": "docker.io/org/my_task:v0.0.1",
+      ...
+    },
+    {
+      "name": "sidecar-proxy",
+      "image": "envoyproxy/envoy-alpine:<ENVOY_VERSION>",
+      ...
+    },
+    {
+      "name": "consul-client"
+      "image": "public.ecr.aws/hashicorp/consul:<CONSUL_VERSION>",
+      ...
+    },
+    {
+      "name": "consul-ecs-mesh-init",
+      "image": "public.ecr.aws/hashicorp/consul-ecs:<CONSUL_ECS_VERSION>",
+      ...
+    },
+    {
+      "name": "consul-ecs-health-sync",
+      "image": "public.ecr.aws/hashicorp/consul-ecs:<CONSUL_ECS_VERSION>",
+      "command": ["health-sync"],
+      "essential": false,
+      "dependsOn": [
+        {
+          "containerName": "consul-ecs-mesh-init",
+          "condition": "SUCCESS"
+        }
+      ],
+      "environment": [
+        {
+          "name": "CONSUL_ECS_CONFIG_JSON",
+          "value": "{\"bootstrapDir\":\"/consul\",\"healthSyncContainers\":[\"example-client-app\"],\"proxy\":{\"upstreams\":[{\"destinationName\":\"example-server-app\",\"localBindPort\":1234}]},\"service\":{\"checks\":[],\"meta\":{},\"name\":\"example-client-app\",\"port\":9090,\"tags\":[]}}"
+        }
+      ]
+    }
+  ]
+}
+```
+
+</CodeBlockConfig>
+
+| Field name    | Type   | Description                                                                                                       |
+| ------------- | ------ | ----------------------------------------------------------------------------------------------------------------- |
+| `name`        | string | The container name, which must be `consul-ecs-health-sync`.                                                       |
+| `image`       | string | The `consul-ecs` image. Use our public AWS registry, `public.ecr.aws/hashicorp/consul-ecs`, to avoid rate limits. |
+| `command`     | list   | Must be set to `["health-sync"]` to run the `consul-ecs health-sync` command.                                     |
+| `dependsOn`   | list   | Must be set as shown above to ensure the `health-sync` container starts after service registration has completed. |
+| `environment` | list   | Must include the `CONSUL_ECS_CONFIG_JSON` variable to pass configuration to the `consul-ecs health-sync` command. |
+
+# Next Steps
+
+* Create the task definition using the [AWS Console](https://docs.aws.amazon.com/AmazonECS/latest/userguide/create-task-definition-classic.html) or the [AWS CLI](https://docs.aws.amazon.com/cli/latest/reference/ecs/register-task-definition.html), or another method of your choice.
+* Create an [ECS Service](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs_services.html) to start tasks using the task definition.
+* Follow the [Secure Configuration](/consul/docs/ecs/manual/secure-configuration) to get production-ready.
diff --git a/website/content/docs/ecs/manual/secure-configuration.mdx b/website/content/docs/ecs/manual/secure-configuration.mdx
new file mode 100644
index 0000000000000..5a94ed4acda13
--- /dev/null
+++ b/website/content/docs/ecs/manual/secure-configuration.mdx
@@ -0,0 +1,545 @@
+---
+layout: docs
+page_title: Manual Secure Configuration - Consul on AWS Elastic Container Service (ECS)
+description: >-
+  Securely configure Consul Service Mesh on Amazon Web Services ECS to protect the communication of sensitive data in production workloads. Learn how to manually configure auth methods to create tokens for clients and services and then apply tokens by role or policy.
+---
+
+# Manual Secure Configuration of Consul on AWS Elastic Container Service (ECS)
+
+This topic describes how to enable Consul security features for your production workloads.
+
+## Prerequisites
+
+The following features must be configured for your Consul server cluster:
+
+- [TLS encryption](/consul/docs/security/encryption#rpc-encryption-with-tls) for RPC communication between Consul clients and servers.
+- [Gossip encryption](/consul/docs/security/encryption#gossip-encryption) for encrypting gossip traffic.
+- [Access control lists (ACLs)](/consul/docs/security/acl) for authentication and authorization for Consul clients and services on the mesh.
+
+You should already have followed the [manual installation instructions](/consul/docs/ecs/manual/install) to define the necessary components of the task definition for Consul on ECS.
+
+You should be familiar with [specifying sensitive data](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/specifying-sensitive-data.html) on ECS.
+
+You should be familiar with configuring Consul's secure features, including how to create ACL tokens and policies. Refer to the [ACL system documentation](/consul/docs/security/acl) and  [Day 1: Security tutorials](/consul/tutorials/security) for an introduction and additional information.
+
+## Auth Method
+
+Tokens are artifacts within the ACL system that authenticate users, services, and Consul agents. Tokens are linked to policies that specify the resources the token bearer has access to when making requests in the network.
+
+Auth Methods are a Consul server component that performs authentication against a trusted external party to authorize the creation of ACL tokens. The [AWS IAM auth method](/consul/docs/security/acl/auth-methods/aws-iam) is used to enable an ECS task to automatically obtain ACL tokens when the task starts up.
+
+There are two types of ACL tokens for Consul on ECS:
+
+* **Client tokens:** used by the `consul-client` containers to join the Consul cluster
+* **Service tokens:** used by sidecar containers for service registration and health syncing
+
+This section describes how to manually configure the AWS IAM auth method for Consul on ECS. Alternatively, you can install the ACL controller to ease the burden of creating these resources. The ACL controller can automatically configure ACL resources for Consul on ECS. For additional details, refer to [ACL Controller](/consul/docs/ecs/manual/acl-controller) and [Architecture](/consul/docs/ecs/architecture).
+
+### ECS Task Role Configuration
+
+The ECS [task role](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html)
+is an IAM role associated with an ECS task.
+
+When an ECS task starts up, it runs a `consul login` command. The `consul login` command obtains
+credentials for the task role role from AWS. It uses those credentials to sign the login request to
+the AWS IAM auth method. This proves the ECS task's identity to the Consul servers.
+
+The task role must be configured with the following details to compatible with the AWS IAM auth
+method.
+
+* An `iam:GetRole` permission to fetch itself. See
+  [IAM Policies](/consul/docs/security/acl/auth-methods/aws-iam#iam-policies) for details.
+* A `consul.hashicorp.com.service-name` tag on the task role which contains the Consul service name
+  for the application in this task.
+* <EnterpriseAlert inline /> A <code>consul.hashicorp.com.namespace</code> tag on the task role
+  indicating the Consul Enterprise namespace where this service is registering.
+
+The following sections describe how to configure the auth method to enable task roles to
+successfully authenticate to the AWS IAM auth method and obtain tokens with the necessary
+permissions.
+
+### Auth Method for Client Tokens
+
+The following steps configure an instance of the auth method that creates client tokens for tasks.
+
+1. Create the auth method instance
+2. Create the client policy and role
+3. Create the binding rule
+
+#### Create Auth Method for Client Tokens
+
+The following Consul CLI command creates an instance of the auth method for client tokens.
+
+```shell
+consul acl auth-method create \
+    -type aws-iam \
+    -name iam-ecs-client-token \
+    -description="AWS IAM auth method for ECS client tokens" \
+    -config '{
+  "BoundIAMPrincipalArns": ["arn:aws:iam::<ACCOUNT>:role/consul-ecs/*"],
+  "EnableIAMEntityDetails": true
+}'
+```
+
+The following flags are required:
+
+| Flag            | Type    | Description                                                                                                                       |
+| --------------- | ------- | --------------------------------------------------------------------------------------------------------------------------------- |
+| `-type`         | string  | Must be `aws-iam`.                                                                                                                |
+| `-name`         | string  | A name of your choice. Must be unique among all auth methods.                                                                     |
+| `-description`  | string  | A description of your choice.                                                                                                     |
+| `-config`       | string  | A JSON string containing the [configuration](/consul/docs/security/acl/auth-methods/aws-iam#config-parameters) for the the auth method.  |
+
+In the `-config` option, the following fields are required:
+
+| Field                     | Type    | Description                                                                                               |
+| ------------------------- | ------- | --------------------------------------------------------------------------------------------------------- |
+| `BoundIAMPrincipalArns`   | list    | The list of trusted IAM roles. We recommend using a wildcard to trust IAM roles at a particular path.     |
+| `EnableIAMEntityDetails`  | boolean | Must be true so that the auth method can retrieve IAM role details, such as the role path and role tags.  |
+
+#### Create Client Policy and Role
+
+Configure the following ACL policy for Consul client tokens:
+
+<CodeBlockConfig filename="client-token-policy.hcl">
+
+```hcl
+node_prefix "" {
+  policy = "write"
+}
+service_prefix "" {
+  policy = "read"
+}
+```
+
+</CodeBlockConfig>
+
+The policy allows `node:write` for any node name, which is necessary because the Consul node names on ECS are not known until runtime.
+
+You can add the policy in Consul using the [`consul acl policy create`](/consul/commands/acl/policy/create) command or the [`[PUT] /v1/acl/policy`](/consul/api-docs/acl/policies#create-a-policy) API endpoint.
+
+After the policy is created, create a Consul role associated with the policy by using the [`consul acl role create`](/consul/commands/acl/role/create) command or the [`[PUT] /v1/acl/role`](/consul/api-docs/acl/roles#create-a-role) API endpoint.
+
+The following example shows how to use the Consul CLI to create the client policy and role.
+
+```shell
+consul acl policy create -name consul-ecs-client-policy -rules @client-token-policy.hcl
+
+consul acl role create -name consul-ecs-client-role -policy-name consul-ecs-client-policy
+```
+
+#### Create Binding Rule for Client Tokens
+
+The following creates a binding rule for the auth method for client tokens. The binding rule
+associates the client role with each token created by a successful login to this auth
+method instance.
+
+```shell
+consul acl binding-rule create -method iam-ecs-client-token \
+   -description 'Bind a role for Consul clients on ECS' \
+   -bind-type role \
+   -bind-name consul-ecs-client-role
+```
+
+### Auth Method for Service Tokens
+
+
+The following steps configure an instance of the auth method that creates service tokens for tasks.
+
+* Create the auth method instance
+* Create the binding rule
+
+#### Create Auth Method for Service Tokens
+
+The following uses the Consul CLI to create an instance of the auth method
+for service tokens. This configures the auth method to associate a service identity
+to each token created during login to this auth method instance.
+
+```shell
+consul acl auth-method create \
+    -type aws-iam \
+    -name iam-ecs-service-token \
+    -description="AWS IAM auth method for ECS service tokens" \
+    -config '{
+  "BoundIAMPrincipalArns": ["arn:aws:iam::<ACCOUNT>:role/consul-ecs/*"],
+  "EnableIAMEntityDetails": true,
+  "IAMEntityTags": [
+    "consul.hashicorp.com.service-name"
+  ]
+}'
+```
+
+The following flags are required:
+
+| Flag            | Type    | Description                                                                                                                       |
+| --------------- | ------- | --------------------------------------------------------------------------------------------------------------------------------- |
+| `-type`         | string  | Must be `aws-iam`.                                                                                                                |
+| `-name`         | string  | A name of your choice. Must be unique among all auth methods.                                                                     |
+| `-description`  | string  | A description of your choice.                                                                                                     |
+| `-config`       | string  | A JSON string containing the [configuration](/consul/docs/security/acl/auth-methods/aws-iam#config-parameters) for the the auth method.  |
+
+In the `-config` option, the following fields are required:
+
+| Field                    | Type    | Description                                                                                               |
+| ---                      | ---     | ---                                                                                                       |
+| `BoundIAMPrincipalArns`  | list    | The list of trusted IAM roles. We recommend using a wildcard to trust IAM roles at a particular path.     |
+| `EnableIAMEntityDetails` | boolean | Must be true so that the auth method can retrieve IAM role details, such as the role path and role tags.  |
+| `IAMEntityTags`          | list    | The list of IAM role tags to make available to binding rules. Must include the service name tag as shown. |
+
+The following binding rule is used to associate a service identity with each token created by
+successful login to this instance of the auth method. The service identity name is taken from the
+`consul.hashicorp.com.service-name` tag from the authenticating IAM role identity.
+
+#### Create Binding Rule
+
+```shell
+consul acl binding-rule create \
+   -method iam-ecs-service-token \
+   -description 'Bind a service identity from IAM role tags for ECS service tokens' \
+   -bind-type service \
+   -bind-name '${entity_tags.consul.hashicorp.com.service-name}'
+```
+
+### Configuration for Consul Enterprise<EnterpriseAlert inline />
+
+When using Consul Enterprise namespaces and admin partitions, pass the `-partition <partition-name>`
+option to the Consul CLI when creating Consul ACL roles, policies, auth methods, and binding rules,
+in order to create these resources in a particular partition.
+
+The following shows how to create the ACL policy for client tokens. This ensures permissions for the
+client token are scoped to a particular partition.
+
+<CodeBlockConfig filename="client-token-policy-ent.hcl">
+
+```hcl
+partition "<partition-name>" {
+  node_prefix "" {
+    policy = "write"
+  }
+  namespace_prefix "" {
+    service_prefix "" {
+      policy = "read"
+    }
+  }
+}
+```
+
+</CodeBlockConfig>
+
+The following commands show how to use the Consul CLI to create the policy and role.
+
+```shell
+consul acl policy create -partition <partition-name> \
+    -name consul-ecs-client-policy \
+    -rules @client-token-policy-ent.hcl
+
+consul acl role create \
+  -partition <partition-name> \
+  -name consul-ecs-client-role \
+  -policy-name consul-ecs-client-policy
+```
+
+The auth method for *service tokens* requires the following additional configuration to include a
+namespace binding rule. This ensures the service tokens are created in the right namespace during
+login. (The namespace binding rule must not be configured on the instance of the auth method
+instance for *client tokens*.)
+
+<CodeBlockConfig highlight="2-2,6-7,13-13">
+
+```shell
+consul acl auth-method create \
+    -partition <partition-name> \
+    -type aws-iam \
+    -name iam-ecs-service-token \
+    -description="AWS IAM auth method for ECS service tokens" \
+    -namespace-rule-selector 'entity_tags["consul.hashicorp.com.namespace"] != ""' \
+    -namespace-rule-bind-namespace '${entity_tags.consul.hashicorp.com.namespace}' \
+    -config '{
+  "BoundIAMPrincipalArns": ["arn:aws:iam::<ACCOUNT>:role/consul-ecs/*"],
+  "EnableIAMEntityDetails": true,
+  "IAMEntityTags": [
+    "consul.hashicorp.com.service-name",
+    "consul.hashicorp.com.namespace"
+  ]
+}'
+```
+
+</CodeBlockConfig>
+
+| Field                            | Type   | Description                                                                                                                                                                                                           |
+| -------------------------------- | ------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `-partition`                     | string | The Consul Enterprise admin partition in which the auth method is created.                                                                                                                                            |
+| `-namespace-rule-selector`       | string | When this expression evaluates to true during login, the `-namespace-rule-bind-namespace` is applied. As shown, it evaluates to true when the `consul.hashicorp.com.namespace` tag is non-empty on the task IAM role. |
+| `-namespace-rule-bind-namespace` | string | This expression is evaluated to determine the namespace where the token is created during login. As shown, it uses the namespace from the `consul.hashicorp.com.namespace` tag on the task IAM role.                   |
+| `IAMEntityTags`                  | list   | Must include `consul.hashicorp.com.namespace` to enable use of this tag in binding rules.                                                                                                                             |
+
+## Secret storage
+
+You should securely store the following secrets in order to make them available to ECS tasks.
+
+1. Consul Server CA certificates. More than one may be required for different Consul protocols.
+2. Consul gossip encryption key
+
+These secrets can be securely stored and passed to ECS tasks using either of the following AWS secret services:
+
+* [AWS Systems Manager Parameter Store](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/specifying-sensitive-data-parameters.html)
+* [AWS Secrets Manager](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/specifying-sensitive-data-secrets.html)
+
+Once the secrets are stored they can be referenced using their ARN. The following shows
+example secret ARNs when using AWS Secrets Manager:
+
+| Secret                          | Sample Secret ARN                                                                  |
+| ----------------------          | ---------------------------------------------------------------------------------- |
+| Consul Server CA Cert for RPC   | `arn:aws:secretsmanager:us-west-2:000000000000:secret:my-consul-ca-cert`           |
+| Consul Server CA Cert for HTTPS | `arn:aws:secretsmanager:us-west-2:000000000000:secret:my-consul-https-ca-cert`     |
+| Gossip encryption key           | `arn:aws:secretsmanager:us-west-2:000000000000:secret:my-consul-gossip-key`        |
+
+## Configure `consul-client`
+
+The following secrets must be passed to the `consul-client` container:
+
+* Consul server CA certificates
+* Gossip encryption key
+
+The following example shows how to include these secrets in the task definition. The `secrets`
+list specifies environment variable `name`s that will be set to the secret values for this container.
+ECS automatically fetches the secret values specified in the `valueFrom` fields during task provisioning.
+
+```json
+{
+  "containerDefinitions": [
+    {
+      "name": "consul-client"
+      "image": "public.ecr.aws/hashicorp/consul:<CONSUL_VERSION>",
+      "secrets": [
+        {
+          "name": "CONSUL_CACERT_PEM",
+          "valueFrom": "arn:aws:secretsmanager:us-west-2:000000000000:secret:my-consul-ca-cert"
+        },
+        {
+          "name": "CONSUL_HTTPS_CACERT_PEM",
+          "valueFrom": "arn:aws:secretsmanager:us-west-2:000000000000:secret:my-consul-https-ca-cert"
+        },
+        {
+          "name": "CONSUL_GOSSIP_ENCRYPTION_KEY",
+          "valueFrom": "arn:aws:secretsmanager:us-west-2:000000000000:secret:my-consul-gossip-key"
+        }
+      ]
+    },
+    ...
+  ]
+}
+```
+
+Next, update the Consul client startup script with the `consul login` command and additional Consul configuration
+options for a secure configuration.
+
+The following is an example of the *additional* content to include in the `consul-client` startup script. Refer to the [install
+page](/consul/docs/ecs/manual/install#consul-client-container) for the remainder of the startup script and how to pass this
+script to the container.
+
+<CodeBlockConfig highlight="3-60,66-91">
+
+```shell
+...
+
+# Obtain details from the task metadata
+ECS_TASK_META=$(curl -s $ECS_CONTAINER_METADATA_URI_V4/task)
+TASK_REGION=$(echo "$ECS_TASK_META" | jq -r .TaskARN | cut -d ':' -f 4)
+TASK_ID=$(echo "$ECS_TASK_META" | jq -r .TaskARN | cut -d '/' -f 3)
+CLUSTER_ARN=$(echo "$ECS_TASK_META" | jq -r .TaskARN | sed -E 's|:task/([^/]+).*|:cluster/\1|')
+
+# Write the CA certs to a files in the shared volume
+echo "$CONSUL_CACERT_PEM" > /consul/consul-ca-cert.pem
+echo "$CONSUL_HTTPS_CACERT_PEM" > /consul/consul-https-ca-cert.pem
+
+consul_login() {
+    echo "Logging into auth method"
+    consul login \
+      -http-addr "<consul server address>" \
+      -ca-file /consul/consul-https-ca-cert.pem \
+      -partition "<partition>" \
+      -type aws-iam \
+      -method iam-ecs-client-token \
+      -meta "consul.hashicorp.com/task-id=$TASK_ID" \
+      -meta "consul.hashicorp.com/cluster=$CLUSTER_ARN" \
+      -aws-region "$TASK_REGION" \
+      -aws-auto-bearer-token -aws-include-entity \
+      -token-sink-file /consul/client-token
+}
+
+read_token_stale() {
+    consul acl token read -http-addr ${ consul_http_addr } \
+      -ca-file /consul/consul-https-ca-cert.pem \
+      -stale -self -token-file /consul/client-token \
+      > /dev/null
+}
+
+# Retry in order to login successfully.
+while ! consul_login; do
+    sleep 2
+done
+
+# Allow the health-sync container to read this token for consul logout.
+chmod 0644 /consul/client-token
+
+# Wait for raft replication to hopefully occur. Without this, an "ACL not found" may be cached for a while.
+COUNT=20
+while [ "$COUNT" -gt 0 ]; do
+    echo "Checking that the ACL token exists when reading it in the stale consistency mode ($COUNT attempts remaining)"
+    if read_token_stale; then
+        echo "Successfully read ACL token from the server"
+        break
+    fi
+    sleep 0.1
+    COUNT=$((COUNT - 1))
+done
+if [ "$COUNT" -eq 0 ]; then
+   echo "Unable to read ACL token from a Consul server; please check that your server cluster is healthy"
+   exit 1
+fi
+
+# This is interpolated into the agent-defaults.hcl
+export AGENT_TOKEN=$(cat /consul/client-token)
+
+# Write the Consul agent configuration file.
+cat << EOF > /consul/agent-defaults.hcl
+...
+
+# Configure gossip encryption key
+encrypt = "$CONSUL_GOSSIP_ENCRYPTION_KEY"
+
+# Configure TLS settings
+auto_encrypt = {
+  tls = true
+  ip_san = ["$ECS_IPV4"]
+}
+tls {
+  defaults {
+    ca_file = "/consul/consul-ca-cert.pem"
+    verify_outgoing = true
+  }
+}
+
+# Configure ACLs
+acl {
+  enabled = true
+  default_policy = "deny"
+  down_policy = "async-cache"
+  tokens {
+    agent = "$AGENT_TOKEN"
+  }
+}
+
+partition = "<partition>"
+
+EOF
+```
+
+</CodeBlockConfig>
+
+The following describes the additional steps added to the startup script:
+
+* Fetch additional details from the task metadata: the AWS region, task id, and cluster arn.
+  These details are necessary for the `consul login` command used to obtain a Consul client token.
+* Write CA certificates to files for Consul CLI and Consul client
+* Run the `consul login` command in a retry loop.
+* Wait for Raft replication to hopefully occur for this token.
+* Configure the Consul client config file with additional fields necessary for secure configuration.
+
+The following flags are passed to the `consul login` command:
+
+| Field name                                                                      | Type    | Description                                                                                           |
+| ------------------------------------------------------------------------------- | ------- | ------------------------------------------------------------------------------------                  |
+| [`-http-addr`](/consul/commands/login#http-addr)                                       | string  | HTTP(S) address of the Consul server.                                                                 |
+| [`-ca-file`](/consul/commands/login#ca-file)                                           | string  | Path of the CA cert for Consul's HTTPS interface. Not required when using Consul servers on HCP.      |
+| `-partition`                                                                    | string  | <EnterpriseAlert inline /> The Consul Enterprise admin partition the auth method belongs to.          |
+| [`-type`](/consul/commands/login#type)                                                 | string  | The auth method type. Must be `aws-iam`.                                                              |
+| [`-method`](/consul/commands/login#type)                                               | string  | The auth method name. Must be the name of the auth method for ECS client tokens.                      |
+| [`-meta`](/consul/commands/login#meta)                                                 | string  | Metadata to set in description of the created token. Should include the task id and cluster as shown. |
+| `-aws-region`                                                                   | string  | The AWS region where the task is running.                                                             |
+| `-aws-auto-bearer-token`                                                        |         | Must be set to login to the AWS IAM auth method.                                                      |
+| `-aws-include-entity`                                                           |         | Must be set to enable IAM role details.                                                               |
+
+The following table describes the additional fields that must be included in the Consul client configuration file.
+
+| Field name                                                                      | Type    | Description                                                                             |
+| ------------------------------------------------------------------------------- | ------- | ------------------------------------------------------------------------------------    |
+| [`encrypt`](/consul/docs/agent/config/cli-flags#_encrypt)                              | string  | Gossip encryption key                                                                   |
+| [`tls.defaults.ca_file`](/consul/docs/agent/config/config-files#tls_defaults_ca_file)  | string  | Consul server CA cert for TLS verification.                                             |
+| [`acl.enabled`](/consul/docs/agent/config/config-files#acl_enabled)                    | boolean | Enable ACLs for this agent.                                                             |
+| [`acl.tokens.agent`](/consul/docs/agent/config/config-files#acl_tokens_agent)          | string  | Consul client token which authorizes this agent with Consul servers.                    |
+| [`partition`](/consul/docs/agent/config/config-files#partition-1)                      | string  | <EnterpriseAlert inline /> The Consul Enterprise admin partition this agent belongs to. |
+
+### Configure Audit Logging <EnterpriseAlert inline />
+[Audit logging](/consul/docs/enterprise/audit-logging) is supported on clients running Consul Enterprise with ACLs enabled.
+To enable audit logging, update the startup script to add an `audit` stanza to the Consul client configuration file.
+
+The following example modifies the `consul-client` startup script to configure audit logs to be written to the `stdout` of the `consul-client` container.
+
+<CodeBlockConfig highlight="9-17">
+
+```shell
+...
+
+# Write the Consul agent configuration file.
+cat << EOF > /consul/agent-defaults.hcl
+...
+
+partition = "<partition>"
+
+audit {
+  enabled = true
+  sink "stdout" {
+    type   = "file"
+    format = "json"
+    path   = "/dev/stdout"
+    delivery_guarantee = "best-effort"
+  }
+}
+
+EOF
+```
+
+</CodeBlockConfig>
+
+The following table describes the fields that must be included to configure audit logging.
+
+| Field name                                                                      | Type    | Description                                                                             |
+| ------------------------------------------------------------------------------- | ------- | ------------------------------------------------------------------------------------    |
+| [`audit.enabled`](/consul/docs/agent/config/config-files#enabled)                      | boolean | Enable audit logging for this agent.                                                    |
+| [`audit.sink`](/consul/docs/agent/config/config-files#sink)                            | object  | The audit logging sink for this agent.                                                  |
+
+## Configure `consul-ecs-mesh-init` and `consul-ecs-health-sync`
+
+The following *additional* options should be set in the [`CONSUL_ECS_CONFIG_JSON`](/consul/docs/ecs/manual/install#consul_ecs_config_json) environment variable. When these options are specified, the `consul-ecs mesh-init` command will run the `consul login` command to obtain a service token from the Consul AWS IAM Auth method. The `consul-ecs health-sync` command is responsible for running a `consul logout` command for both the service and client tokens when the task shuts down.
+
+<CodeBlockConfig highlight="2-8">
+
+```json
+{
+  "consulHTTPAddr": "<Consul server address>",
+  "consulCACertFile": "/consul/consul-https-ca-cert.pem",
+  "consulLogin": {
+    "enabled": true,
+    "method": "iam-ecs-service-token",
+    "extraLoginFlags": ["-partition", "<partition>"]
+  },
+  "bootstrapDir": "/consul",
+  "healthSyncContainers": [],
+  ...
+}
+```
+
+</CodeBlockConfig>
+
+The following table explains the additional fields for the `CONSUL_ECS_CONFIG_JSON`:
+
+| Field name                    | Type    | Description                                                                                                                                                                   |
+| ----------------------------- | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `consulHTTPAddr`              | string  | HTTP(S) address for the Consul server.                                                                                                                                        |
+| `consulCACertFile`            | string  | Path of the CA cert file for Consul's HTTPS interface. Not required for Consul servers in HCP.                                                                                |
+| `consulLogin.enabled`         | boolean | Must be set to true to log in to the auth method.                                                                                                                             |
+| `consulLogin.method`          | string  | Must be set to the name of the auth method instance for service tokens.                                                                                                       |
+| `consulLogin.extraLoginFlags` | list    | Additional flags passed to the `consul login` command. <EnterpriseAlert inline /> This shows how to pass the Consul Enterprise admin partition to the `consul login` command. |
diff --git a/website/content/docs/ecs/reference/compatibility.mdx b/website/content/docs/ecs/reference/compatibility.mdx
deleted file mode 100644
index c243a95878c7e..0000000000000
--- a/website/content/docs/ecs/reference/compatibility.mdx
+++ /dev/null
@@ -1,24 +0,0 @@
----
-layout: docs
-page_title: Consul on AWS Elastic Container Service (ECS) Compatibility Matrix
-description: >-
-  The binary for Consul on Amazon Web Services ECS and the Terraform modules for automating deployments are tightly coupled and have specific version requirements. Review compatibility information for versions of Consul and `consul-ecs` to help you choose compatible versions.
----
-
-# Consul on AWS Elastic Container Service (ECS) compatibility matrix
-
-For every release of Consul on ECS, the `consul-ecs` binary and `consul-ecs` Terraform module are updated. The versions of the Terraform module and binary are tightly coupled. For example, `consul-ecs` 0.5.2 binary must use the `consul-ecs` 0.5.2 Terraform module.
-
-## Supported Consul versions
-
-| Consul Version          | Compatible consul-ecs Version |
-|----------------------- | ----------------------------- |
-| 1.15.x, 1.14.x, 1.13.x | 0.6.x                         |
-| 1.14.x, 1.13.x, 1.12.x | 0.5.2+                        |
-| 1.11.x                 | 0.3.0, 0.4.x                  |
-| 1.10.x                 | 0.2.x                         |
-
-
-## Supported Envoy versions
-
-Refer to [Envoy - Supported Versions](/consul/docs/connect/proxies/envoy#supported-versions) for information about which versions of Envoy are supported for each version of Consul. As a best practice, we recommend using the default version of Envoy that is provided in the Terraform module. This is because we test the default versions with Consul ECS binaries for the given version.
diff --git a/website/content/docs/ecs/reference/consul-server-json.mdx b/website/content/docs/ecs/reference/consul-server-json.mdx
deleted file mode 100644
index c88450646995f..0000000000000
--- a/website/content/docs/ecs/reference/consul-server-json.mdx
+++ /dev/null
@@ -1,31 +0,0 @@
----
-layout: docs
-page_title: Consul server configuration JSON schema reference
-description: Learn about the fields available in the JSON scheme for configuring ECS task connections to Consul servers.
----
-
-# Consul server configuration JSON schema reference
-
-This topic provides reference information about the JSON schema used to build the `config.tf` file. Refer to [Configure Consul server settings](/consul/docs/ecs/deploy/terraform#configure-consul-server-settings) for information about how Consul on ECS uses the JSON schema. 
-
-```json  
-`consulServers`
-	`hosts`: string
-    	`skipServerWatch`: boolean; set to true if the Consul server is already behind a load balancer 
-	`defaults`: map - applies to both gRPC and HTTP
-		`caCertFile`: string path to the certificate .pem file
-		`tlsServerName`: string name of the TLS server
-		`tls`: boolean that enables TLS 
-	`grpc`: map - overrides for gRPC traffic
-		`port`: number specifying the port for gRPC communication
-		`caCertFile`: string path to the certificate .pem file for authorizing gRPC
-		`tlsServerName`: string name of the TLS server
-		`tls`: boolean that enables TLS for gRPC
-	`http`: map - overrides for HTTP traffic
-		`https`: boolean that enables HTTPS
-		`port`: number specifying the port for HTTPS communication
-		`caCertFile`: string path to the certificate .pem file for authorizing HTTPS
-		`tlsServerName`: string name of the TLS server
-		`tls`: boolean that enables TLS for HTTPS
-
-```
diff --git a/website/content/docs/ecs/requirements.mdx b/website/content/docs/ecs/requirements.mdx
new file mode 100644
index 0000000000000..4e4f997eac5f9
--- /dev/null
+++ b/website/content/docs/ecs/requirements.mdx
@@ -0,0 +1,32 @@
+---
+layout: docs
+page_title: Requirements - Consul on AWS Elastic Container Service (ECS)
+description: >-
+  Consul has requirements to install and run on Amazon Web Services ECS. Learn about Consul's requirements for Fargate and EC2, including network mode and subnet information, as well as server, routing, and ACL controller considerations to keep in mind.
+---
+
+# Requirements for Consul on AWS Elastic Container Service (ECS)
+
+The following requirements must be met in order to install Consul on ECS:
+
+* **Launch Type:** Fargate and EC2 launch types are supported.
+* **Network Mode:** Only `awsvpc` mode is supported.
+* **Subnets:** ECS Tasks can run in private or public subnets. Tasks must have [network access](https://aws.amazon.com/premiumsupport/knowledge-center/ecs-pull-container-api-error-ecr/) to Amazon ECR or other public container registries to pull images.
+* **Consul Servers:** You can use your own Consul servers running on virtual machines or use [HashiCorp Cloud Platform Consul](https://www.hashicorp.com/cloud-platform) to host the servers for you. For development purposes or testing, you may use the `dev-server` [Terraform module](https://github.com/hashicorp/terraform-aws-consul-ecs/tree/main) that runs the Consul server as an ECS task. The `dev-server` does not support persistent storage.
+* **ACL Controller:** If you are running a secure Consul installation with ACLs enabled, configure the ACL controller.
+   * **Admin Partitions:** <EnterpriseAlert inline />Consul on ECS supports [admin partitions](/consul/docs/enterprise/admin-partitions) when ACLs are enabled and the ACL controller is configured.
+      The ACL controller manages one admin partition and each ECS cluster requires an ACL controller.
+      Each `mesh-task` must also be configured to use a Consul Enterprise client.
+   * **Namespaces:** <EnterpriseAlert inline />[Namespaces](/consul/docs/enterprise/namespaces) are supported when ACLs are enabled and the ACL controller is configured.
+      Each `mesh-task` must also be configured to use a Consul Enterprise client.
+* **Sidecar containers:** Consul on ECS requires two sidecar containers to run in each ECS task: a
+   Consul agent container and a sidecar proxy container. These additional sidecar containers must
+   be included in the ECS task definition. The [Consul ECS Terraform module](/consul/docs/ecs/terraform/install)
+   will include these sidecar containers for you. If you do not use Terraform, you can construct
+   the task definition yourself by following [our documentation](/consul/docs/ecs/manual/install).
+* **Routing:** With your application running in tasks as part of the mesh, you must specify the
+   upstream services that your application calls. You will also need to change the URLs your
+   application uses to ensure the application is making requests through the service mesh.
+* **Bind Address:** Once all communication is flowing through the service mesh, you should change
+   the address your application is listening on to `127.0.0.1` so that it only receives requests
+   through the sidecar proxy.
diff --git a/website/content/docs/ecs/task-resource-usage.mdx b/website/content/docs/ecs/task-resource-usage.mdx
new file mode 100644
index 0000000000000..8a566ad01639b
--- /dev/null
+++ b/website/content/docs/ecs/task-resource-usage.mdx
@@ -0,0 +1,37 @@
+---
+layout: docs
+page_title: Resource Usage - Consul on AWS Elastic Container Service (ECS)
+description: >-
+  Learn about the CPU and memory resources Consul uses while running on Amazon Web Services ECS, including performance test procedures and results. 
+---
+
+# Resource Usage for Consul on AWS Elastic Container Service (ECS)
+
+We ran performance tests of Consul on ECS to determine the resource usage of
+the sidecar containers Consul on ECS injects along with the ACL controller.
+[The architecture page](/consul/docs/ecs/architecture) describes each Consul on ECS
+component in depth.
+
+We used the following procedure to measure resource usage:
+
+- Executed performance tests while deploying clusters of various sizes. We
+  ensured that deployment conditions stressed Consul on ESC components.
+- After each performance test session, we recorded resource usage for each
+  component to determine worst-case scenario resource usage in a production
+  environment.
+- We used Fargate's minimum allowed CPU (256 shares) and memory settings (512
+  MB) on ECS during performance testing to demonstrate that Consul on ECS along
+  with application containers can run on the smallest ECS tasks.
+
+Here is the maximum resource usage we observed for each container:
+
+| Container      | CPU | Memory |
+| -------------- | --- | ------ |
+| ACL Controller | 5%  | 43 MB  |
+| Health Sync    | 6%  | 35 MB  |
+| Consul Client  | 10% | 87 MB  |
+| Envoy          | 18% | 55 MB  |
+
+The containers added by Consul on ECS consume resources well below the minimum CPU and
+memory limits for an ECS Task. Use the `memory` and `cpu` settings for the task definition
+if additional resources are necessary for your application task.
diff --git a/website/content/docs/ecs/tech-specs.mdx b/website/content/docs/ecs/tech-specs.mdx
deleted file mode 100644
index 2f70e5ed0dd49..0000000000000
--- a/website/content/docs/ecs/tech-specs.mdx
+++ /dev/null
@@ -1,52 +0,0 @@
----
-layout: docs
-page_title: Technical specifications for Consul on AWS Elastic Container Service (ECS)
-description: >-
-  Consul has requirements to install and run on Amazon Web Services ECS. Learn about Consul's requirements for Fargate and EC2, including network mode and subnet information, as well as server, routing, and ACL controller considerations.
----
-
-# Technical specifications for Consul on ECS
-
-This topic describes the supported runtimes and environments for using Consul service mesh for your ECS workloads.
-
-For requirements associated with using the Terraform `mesh-task` module to deploy Consul service mesh, refer [Deploy Consul with the Terraform module](/consul/docs/ecs/deploy/terraform). For requirements associated with manually deploying Consul service mesh to your ECS cluster, refer [Deploy Consul manually](/consul/docs/ecs/deploy/manual). 
-
-## Supported environments and runtimes
-
-Consul on ECS supports the following environments and runtimes:
-
-- **Launch Types**: Fargate and EC2
-- **Network Modes**: `awsvpc`
-- **Subnets**: Private and public subnets. Tasks must have network access to Amazon ECR or other public container registries to pull images.
-- **Consul servers**: You can use your own Consul servers running on virtual machines or [use HCP Consul to host the servers for you](/hcp/docs/consul/hcp-managed).
-- **ECS controller**: The ECS controller assists with reconciling state back to Consul and facilitates Consul security features.
-- **Admin partitions**: <EnterpriseAlert inline/> Enable ACLs and configure the ECS controller to use admin partitions. You must deploy one controller for each admin partition. 
-- **Namespaces**:  <EnterpriseAlert inline/> Enable ACLs and configure the ECS controller to use namespaces. 
-- **Dataplane containers**: To manage proxies using Consul dataplane, you must use the Terraform `mesh-task` module to install Consul service mesh.
-
-## Resource usage
-
-We used the following procedure to measure resource usage:
-
-- Executed performance tests while deploying clusters of various sizes. We
-  ensured that deployment conditions stressed Consul on ESC components.
-- After each performance test session, we recorded resource usage for each
-  component to determine worst-case scenario resource usage in a production
-  environment.
-- We used Fargate's minimum allowed CPU (256 shares) and memory settings (512
-  MB) on ECS during performance testing to demonstrate that Consul on ECS along
-  with application containers can run on the smallest ECS tasks.
-
-The following table describes the maximum resource usage we observed for each container under these testing conditions:
-
-| Container      | CPU | Memory |
-| -------------- | --- | ------ |
-| ECS controller | 5%  | 43 MB  |
-| Control plane  | 6%  | 35 MB  |
-| Dataplane      | 10% | 87 MB  |
-
-The containers added by Consul on ECS consume resources well below the minimum CPU and
-memory limits for an ECS task. Use the `memory` and `cpu` settings for the task definition
-if additional resources are necessary for your application task.
-
-Refer to [Architecture](/consul/docs/ecs/architecture) for details about each component.
\ No newline at end of file
diff --git a/website/content/docs/ecs/terraform/install.mdx b/website/content/docs/ecs/terraform/install.mdx
new file mode 100644
index 0000000000000..3aa2dff4dfdf6
--- /dev/null
+++ b/website/content/docs/ecs/terraform/install.mdx
@@ -0,0 +1,452 @@
+---
+layout: docs
+page_title: Install with Terraform - Consul on AWS Elastic Container Service (ECS)
+description: >-
+  When you install Consul on Amazon Web Services ECS, you can use Terraform modules to simplify the process. Learn how to create task definitions, schedule tasks for your service mesh, and configure routes with example configurations.
+---
+
+# Install Consul on AWS Elastic Container Service (ECS) with Terraform
+
+This topic describes how to use HashiCorp's Terraform modules to launch your application in AWS ECS as part of Consul service mesh. If you do not use Terraform, refer to the [Manual Installation](/consul/docs/ecs/manual/install) page to install Consul on ECS without Terraform.
+
+This topic does not include instructions for creating all AWS resources necessary to install Consul, such as a VPC or the ECS cluster. Refer to the guides in the [Getting Started](/consul/docs/ecs#getting-started) section for complete and runnable examples.
+
+## Overview
+
+The following procedure describes the general workflow:
+
+1. Create Terraform configuration files for the necessary components:
+
+    - [ECS task definition](#create-the-task-definition): Use the HashiCorp Terraform modules to create the ECS task definition.
+    - [ECS service](#ecs-service): Use the `aws_ecs_service` resource to create an ECS service that schedules service mesh tasks to run on ECS.
+
+2. [Run Terraform](#running-terraform) to deploy the resources in AWS
+
+If you want to operate Consul in production environments, follow the instructions in the [Secure Configuration](/consul/docs/ecs/terraform/secure-configuration) documentation. The instructions describe how to enable ACLs and TLS and gossip encryption, which provide network security for production-grade deployments.
+
+## Requirements
+
+* You should have some familiarity with using Terraform. Refer to the [Terraform documentation](/terraform/docs) to learn about infrastructure as code and how to get started with Terraform.
+* You should also be familiar with AWS ECS before following these instructions. See [What is Amazon Elastic Container Service](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/Welcome.html) for details.
+* If you intend to [use the `gateway-task` module to deploy mesh gateways](#configure-the-gateway-task-module), all Consul server and client agents in all datacenters must have TLS and gossip encryption enabled. Refer to the [Secure Configuration](/consul/docs/ecs/terraform/secure-configuration) documentation for instructions.
+
+## Create the task definition
+
+To run an application in ECS with Consul service mesh, you must create an ECS task definition. The task definition includes your application containers and additional sidecar containers, such as the Consul agent container and the Envoy sidecar proxy container.
+
+Create a Terraform configuration file and include the `mesh-task` module. The module automatically adds the necessary sidecar containers.
+
+If you intend to peer the service mesh to multiple Consul datacenters or partitions, you can also include the `gateway-task` module. The module enables connectivity between datacenters across service meshes.
+
+### Configure the mesh task module
+
+Create a Terraform configuration file and specify the `mesh-task` module in the `source` field. The [`mesh-task` module](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/mesh-task) automatically includes the necessary sidecar containers.
+
+In the following example, the Terraform configuration file called `mesh-task.tf` creates a task definition with an application container called `example-client-app`:
+
+<CodeBlockConfig filename="mesh-task.tf">
+
+```hcl
+module "my_task" {
+  source  = "hashicorp/consul-ecs/aws//modules/mesh-task"
+  version = "<latest version>"
+
+  family                = "my_task"
+  container_definitions = [
+    {
+      name         = "example-client-app"
+      image        = "docker.io/org/my_task:v0.0.1"
+      essential    = true
+      portMappings = [
+        {
+          containerPort = 9090
+          hostPort      = 9090
+          protocol      = "tcp"
+        }
+      ]
+      cpu         = 0
+      mountPoints = []
+      volumesFrom = []
+    }
+  ]
+
+  port       = 9090
+  retry_join = ["<address of the Consul server>"]
+  consul_datacenter = "<name of your Consul datacenter>"
+}
+```
+
+</CodeBlockConfig>
+
+The following fields are required. Refer to the [module reference documentation](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/mesh-task?tab=inputs) for a complete reference.
+
+| Input Variable          | Type     | Description                                                                                                                                                                                                                                    |
+| ----------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `source`                | string   | Must be set to the source location of the `mesh-task` module, `hashicorp/consul-ecs/aws//modules/mesh-task`.                                                                                                                                   |
+| `version`               | string   | Must be set to the version of the `mesh-task` module.                                                                                                                                                                                          |
+| `family`                | string   | The [ECS task definition family](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html#family). The family is also used as the Consul service name by default.                                           |
+| `container_definitions` | list     | This is the list of [container definitions](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html#container_definitions) for the task definition. This is where you include your application containers. |
+| `essential`             | boolean  | Must be `true` to ensure the health of your application container affects the health status of the task.                                                                                                                                       |
+| `port`                  | integer  | The port that your application listens on, if any. If your application does not listen on a port, set `outbound_only = true`.                                                                                                                  |
+| `retry_join`            | list     | This is the [`retry_join`](/consul/docs/agent/config/config-files#retry_join) option for the Consul agent, which specifies the locations of your Consul servers.                                                                                                  |
+### Configure an ECS service for the mesh task module
+
+[ECS services](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs_services.html) are one of the most common
+ways to start tasks using a task definition.
+
+To define an ECS service, reference the `mesh-task` module's `task_definition_arn` output value
+in your `aws_ecs_service` resource. The following example shows how to include the service in the `mesh-task.tf` file.
+
+<CodeBlockConfig filename="mesh-task.tf" highlight="6-12">
+
+```hcl
+module "my_task" {
+  source  = "hashicorp/consul-ecs/aws//modules/mesh-task"
+  ...
+}
+
+resource "aws_ecs_service" "my_task" {
+  name            = "my_task_service"
+  task_definition = module.my_task.task_definition_arn
+  launch_type     = "FARGATE"
+  propagate_tags  = "TASK_DEFINITION"
+  ...
+}
+```
+
+</CodeBlockConfig>
+
+The example shows a partially configured ECS service to highlight significant fields. Refer to  [`aws_ecs_service`](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecs_service) for a complete configuration reference.
+
+| Input Variable    | Type    | Description                                                                                                         |
+| ----------------- | ------- | ------------------------------------------------------------------------------------------------------------------- |
+| `name`            | string  | The name of the ECS service. This name is required by AWS but is not used by Consul service mesh.                        |
+| `task_definition` | string  | The task definition used to start tasks. Set this option to the task definition ARN returned by the `mesh-task` module.    |
+| `launch_type`     | string  | The launch type. Consul on ECS supports the `FARGATE` and `EC2` launch types.                                       |
+| `propagate_tags`  | string  | This option must be set to `TASK_DEFINITION` so that tags added by `mesh-task` to the task definition are copied to tasks. |
+
+After including the ECS service in your Terraform configuration, run `terraform apply`
+from your project directory to create the ECS service resource. The ECS service
+then starts your application in a task. The task automatically registers itself
+into the Consul service catalog during startup.
+
+-> **NOTE:** If your tasks run in a public subnet, they must have `assign_public_ip = true`
+in their [`network_configuration`](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecs_service#network_configuration) block so that ECS can pull the Docker images.
+
+### Configure the gateway task module
+
+Add the `gateway-task` to your Terraform configuration if you want to deploy a mesh gateway. Mesh gateways enable service to service communication across the WAN, as well as federate service mesh traffic across Consul admin partitions and Consul datacenters over the WAN. Refer to the following documentation to learn more about mesh gateways:
+
+* [WAN Federation via Mesh Gateways](/consul/docs/connect/gateways/mesh-gateway/wan-federation-via-mesh-gateways)
+* [Service-to-service Traffic Across Datacenters](/consul/docs/connect/gateways/mesh-gateway/service-to-service-traffic-wan-datacenters).
+
+You must add and configure a `gateway-task` for each Consul datacenter in your network. You must also enable TLS and gossip encryption on all server and client agents in all data centers per the [Requirements](#requirements). Mesh gateways operate by sniffing and extracting the server name indication (SNI) header from the service mesh session and routing the connection to the appropriate destination based on the server name requested.
+
+The module creates an ECS service and a task definition that includes the following containers:
+
+- Consul client
+- Envoy gateway proxy
+- Mesh init
+
+You will need to provide inputs for the artifacts created by the `gateway-task` module. The following example defines a mesh gateway task called `my-gateway` in a file called `mesh-gateway.tf`:
+
+<CodeBlockConfig filename="mesh-gateway.tf">
+
+```hcl
+module "my_mesh_gateway" {
+  source  = "hashicorp/consul-ecs/aws//modules/gateway-task"
+  version = "<latest version>"
+  kind    = "mesh-gateway"
+
+  family                    = "my-gateway"
+  ecs_cluster_arn           = "<ECS cluster ARN>"
+  subnets                   = ["<subnet ID>"]
+  retry_join                = ["<address of the Consul server>"]
+  tls                       = true
+  consul_server_ca_cert_arn = "<Secrets Manager secret ARN>"
+  gossip_key_secret_arn     = "<Secrets Manager secret ARN>"
+}
+```
+
+</CodeBlockConfig>
+
+The following fields are required. Refer to the [module reference documentation](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/gateway-task?tab=inputs) for a complete reference.
+
+| Input variable | Type | Description |
+| --- | --- | --- |
+| `source` | string | Specifies the source location of the `gateway-task` module. Must be set to `hashicorp/consul-ecs/aws//modules/gateway-task`. |
+| `version` | string | Specifies the version of the `gateway-task` module. |
+| `kind` | string | Declares the kind of gateway to create. Must be set to `mesh-gateway` to create a mesh-gateway. |
+| `family` | string   | Specifies the [ECS task definition family](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html#family). The family is also used as the Consul service name by default. |
+| `ecs_cluster_arn` | string | Specifies the ARN of the ECS cluster where the mesh gateway task should be launched. |
+| `subnets` | list of strings | Specifies the subnet IDs where the task will be launched. |
+| `retry_join` | list of strings | Defines a set of arguments to pass to the Consul agent [`-retry-join`](/consul/docs/agent/config/cli-flags#_retry_join) flag. The arguments specify locations of the Consul servers in the local datacenter that Consul client agents can connect to. |
+| `tls` | boolean | Set to `true` to enable TLS. |
+| `consul_server_ca_cert_arn` | string   | Specifies the ARN of the Secrets Manager containing the Consul server CA certificate |
+| `gossip_key_secret_arn` | string | Specifies the ARN of the Secrets Manager containing the Consul's gossip encryption key. |
+
+Refer to the [gateway task configuration examples](#gateway-task-configuration-examples) for additional example configurations.
+
+#### ECS service
+
+The ECS service is automatically created by the `gateway-task` module. The service can run one or more instances of the gateway.
+
+#### Mesh init
+
+The `mesh-init` container is a short-lived container that sets up the initial configurations for Consul and Envoy. The `gateway-task` module automatically configures the `mesh-init` container based on the inputs specified in the [task definition](#task-definition) and [ECS service](#ecs-service) configuration.
+
+For additional information, refer to [Task Startup](/consul/docs/ecs/architecture#task-startup) for additional information.
+
+#### Gateway task configuration examples
+
+The following examples illustrate how to configure the `gateway-task` for different use cases.
+
+##### Ingress
+
+Mesh gateways need to be reachable over the WAN to route traffic between datacenters. Configure the following options in the `gateway-task` to enable ingress through the mesh gateway.
+
+| Input variable | Type | Description |
+| ---    | ---  | ---         |
+| `lb_enabled` | Boolean | Set to `true` to automatically deploy and configure a network load balancer for ingress to the mesh gateway. |
+| `lb_vpc_id` | string | Specifies the VPC to launch the load balancer in. |
+| `lb_subnets` | list of strings | Specifies one or more public subnets to associate with the load balancer. |
+
+<CodeBlockConfig filename="mesh-gateway.tf">
+
+```hcl
+module "my_mesh_gateway" {
+  ...
+
+  lb_enabled = true
+  lb_vpc_id  = "<VPC ID>"
+  lb_subnets = ["<public subnet IDs>"]
+}
+```
+
+</CodeBlockConfig>
+
+Alternatively, you can manually configure ingress to the mesh gateway and provide the `wan_address` and `wan_port` inputs to the `gateway-task` module. The `wan_port` field is optional. Port `8443` is used by default.
+
+<CodeBlockConfig filename="mesh-gateway.tf">
+
+```hcl
+module "my_mesh_gateway" {
+  ...
+
+  wan_address = "<public WAN address>"
+  wan_port    = <public WAN port>
+}
+```
+
+</CodeBlockConfig>
+
+Mesh gateways route L4 TCP connections and do not terminate mTLS sessions. If you manually configure [AWS Elastic Load Balancing](https://aws.amazon.com/elasticloadbalancing/) for ingress to a mesh gateway, you must use an AWS [Network Load Balancer](https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html) or a [Classic Load Balancer](https://docs.aws.amazon.com/elasticloadbalancing/latest/classic/introduction.html).
+
+
+##### ACLs
+
+Configure the following options in the `gateway-task` when ACLs are enabled.
+
+| Option | Type | Description |
+| ---    | ---  | ---         |
+| `acl` | Boolean | Set to `true` if ACLs are enabled. |
+| `consul_http_addr` | string |  Specifies the HTTP `address:port` of the Consul server. Required for the mesh gateway task to log into Consul via the IAM Auth Method to obtain its client and service tokens. |
+| `consul_https_ca_cert_arn` | string |  Specifies ARN of the Secrets Manager secret that contains the certificate for the Consul HTTPS API. |
+
+<CodeBlockConfig filename="mesh-gateway.tf">
+
+```hcl
+module "my_mesh_gateway" {
+  ...
+
+  acls                         = true
+  consul_http_addr          = "<HTTP address of the Consul server>"
+  consul_https_ca_cert_arn  = "<Secrets Manager secret ARN>"
+}
+```
+
+</CodeBlockConfig>
+
+##### WAN federation
+
+Configure the following options in the `gateway-task` to enable [WAN federation via mesh gateways](/consul/docs/connect/gateways/mesh-gateway/wan-federation-via-mesh-gateways).
+
+| Option | Type | Description |
+| ---    | ---  | ---         |
+| `consul_datacenter` | string | Specifies the name of the local Consul datacenter. |
+| `consul_primary_datacenter` | string | Specifies the name of the primary Consul datacenter. |
+| `enable_mesh_gateway_wan_federation` | Boolean | Set to `true` to enable WAN federation. |
+| `enable_acl_token_replication` | Boolean | Set to `true` to enable ACL token replication and allow the creation of local tokens secondary datacenters. |
+
+The following example shows how to configure the `gateway-task` module.
+
+<CodeBlockConfig filename="mesh-gateway.tf">
+
+```hcl
+module "my_mesh_gateway" {
+  ...
+
+  consul_datacenter                  = "<name of the local Consul datacenter>"
+  consul_primary_datacenter          = "<name of the primary Consul datacenter>"
+  enable_mesh_gateway_wan_federation = true
+  enable_acl_token_replication       = true
+}
+```
+
+</CodeBlockConfig>
+
+When federating Consul datacenters over the WAN with ACLs enabled, [ACL Token replication](/consul/docs/security/acl/acl-federated-datacenters) must be enabled on all server and client agents in all datacenters.
+
+## Run Terraform
+
+You will need to run Terraform to create the task definition.
+
+Save the Terraform configuration for the task definition to a file, such as `mesh-task.tf`.
+You should place this file in a directory alongside other Terraform configuration files for your project.
+
+The `mesh-task` module requires the AWS Terraform provider. The following example shows how to include
+and configure the AWS provider in a file called `provider.tf`. Refer to the [AWS Terraform provider](https://registry.terraform.io/providers/hashicorp/aws/latest/docs)
+documentation for complete configuration details.
+
+<CodeBlockConfig filename="provider.tf">
+
+```hcl
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "<latest version>"
+    }
+  }
+}
+
+provider "aws" {
+  region = "<AWS region>"
+  ...
+}
+```
+
+</CodeBlockConfig>
+
+Additional AWS resources for your project can be included in additional Terraform configuration files
+in the same directory. The following example shows a basic project directory:
+
+```shell-session
+$ ls
+mesh-task.tf
+provider.tf
+...
+```
+
+Terraform should be run in your project directory as follows.
+
+* Run `terraform init` first to download dependencies, such as Terraform providers
+* Run `terraform apply` to have Terraform create AWS resources, such as the task definition from the `mesh-task` module.
+
+Terraform automatically reads all files in the current directory that have a `.tf` file extension.
+Refer to the [Terraform documentation](/terraform/docs) for more information and Terraform best practices.
+
+## Configure routes
+
+Now that your tasks are registered in the mesh, you're able to use the service
+mesh to route between them.
+
+In order to make calls through the service mesh, you must configure the sidecar
+proxy to listen on a different port for each upstream service your application
+needs to call. You then must modify your application to make requests to the sidecar
+proxy on that port.
+
+For example, if your application `web` makes calls to another application called `backend`, then you would first configure the `mesh-task` module's upstream(s):
+
+```hcl
+module "web" {
+  family = "web"
+  upstreams = [
+    {
+      destinationName = "backend"
+      localBindPort = 8080
+    }
+  ]
+}
+```
+
+| Input Variable    | Type    | Description                                                                                                                                                      |
+| ----------------- | ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `destinationName` | string  | The name of the upstream service, as it is registered in the Consul service catalog.                                                                             |
+| `localBindPort`   | integer | Requests to this port will be forwarded by the proxy to the upstream service. This must be an unused port, but does not need to match the upstream service port. |
+
+If you have multiple upstream services they each need to be listed here.
+
+Next, configure your application to make requests to `localhost:8080` when
+it wants to call the `backend` service.
+
+For example, if your service allows configuring the URL for `backend` via the
+`BACKEND_URL` environment variable, you would set:
+
+```hcl
+module "web" {
+  family = "web"
+  upstreams = [
+    {
+      destinationName = "backend"
+      localBindPort = 8080
+    }
+  ]
+  container_definitions = [
+    {
+      name        = "web"
+      environment = [
+        {
+          name  = "BACKEND_URL"
+          value = "http://localhost:8080"
+        }
+      ]
+      ...
+    }
+  ]
+  ...
+}
+```
+
+## Configure the bind address
+
+To ensure that your application only receives traffic through the service mesh,
+you must change the address that your application listens on to the loopback address. The loopback address is also called `localhost`, `lo`, and `127.0.0.1`.
+Binding to the loopback address allows the sidecar proxy running in the same task to only make requests within the service mesh.
+
+If your application is listening on all interfaces, such as `0.0.0.0`, then other
+applications can call it directly, bypassing its sidecar proxy.
+
+Changing the listening address is specific to the language and framework you're
+using in your application. Regardless of which language or framework you're using,
+binding the loopback address to a dynamic value, such as an environment variable, is a best practice:
+
+```bash
+export BIND_ADDRESS="127.0.0.1:8080"
+```
+
+The following examples demonstrate how to bind the loopback address to an environment variable in golang and Django (Python):
+
+<CodeTabs>
+
+```go
+s := &http.Server{
+	Addr: os.Getenv("BIND_ADDRESS"),
+  ...
+}
+log.Fatal(s.ListenAndServe())
+```
+
+```bash
+python manage.py runserver "$BIND_ADDRESS"
+```
+
+</CodeTabs>
+
+## Next steps
+
+- Follow the [Secure Configuration](/consul/docs/ecs/terraform/secure-configuration) to get production-ready.
+- Now that your applications are running in the service mesh, read about
+  other [Service Mesh features](/consul/docs/connect).
+- View the [Architecture](/consul/docs/ecs/architecture) documentation to understand
+  what's going on under the hood.
diff --git a/website/content/docs/ecs/terraform/migrate-existing-tasks.mdx b/website/content/docs/ecs/terraform/migrate-existing-tasks.mdx
new file mode 100644
index 0000000000000..5dcfb31e92f5e
--- /dev/null
+++ b/website/content/docs/ecs/terraform/migrate-existing-tasks.mdx
@@ -0,0 +1,115 @@
+---
+layout: docs
+page_title: Migrate Tasks with Terraform - Consul on AWS Elastic Container Service (ECS)
+description: >-
+  You can migrate tasks in existing Amazon Web Services ECS deployments to a service mesh deployed with Terraform. Learn how to convert a task specified as an ECS task definition into a `mesh-task` Terraform module.
+---
+
+# Migrate Tasks to Consul on AWS Elastic Container Service (ECS) with Terraform 
+
+This topic describes how to migrate your existing ECS Tasks to use our [`mesh-task` Terraform module](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/mesh-task).
+
+## Define Tasks in Terraform
+
+Your tasks must first be specified in Terraform using the [`ecs_task_definition`](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecs_task_definition)
+resource so that they can then be converted to use the [`mesh-task` module](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/mesh-task).
+
+For example, your tasks should be defined with Terraform similar to the following:
+
+```hcl
+resource "aws_ecs_task_definition" "my_task" {
+  family                   = "my_task"
+  requires_compatibilities = ["FARGATE"]
+  network_mode             = "awsvpc"
+  cpu                      = 256
+  memory                   = 512
+  execution_role_arn       = "arn:aws:iam::111111111111:role/execution-role"
+  task_role_arn            = "arn:aws:iam::111111111111:role/task-role"
+  container_definitions = jsonencode(
+    [{
+      name             = "example-client-app"
+      image            = "docker.io/org/my_task:v0.0.1"
+      essential        = true
+      portMappings = [
+        {
+          containerPort = 9090
+          hostPort      = 9090
+          protocol      = "tcp"
+        }
+      ]
+      cpu         = 0
+      mountPoints = []
+      volumesFrom = []
+    }]
+  )
+}
+
+resource "aws_ecs_service" "my_task" {
+  name            = "my_task"
+  cluster         = "arn:aws:ecs:us-east-1:111111111111:cluster/my-cluster"
+  task_definition = aws_ecs_task_definition.my_task.arn
+  desired_count   = 1
+  network_configuration {
+    subnets = ["subnet-abc123"]
+  }
+  launch_type            = "FARGATE"
+}
+```
+
+## Convert to the `mesh-task` Module
+
+In order to add the necessary sidecar containers for your task to join the mesh,
+you must use the [`mesh-task` module](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/mesh-task).
+
+The `mesh-task` module uses inputs similar to your old ECS task definition but
+creates a new version of the task definition with additional containers.
+
+The `mesh-task` module is used as follows:
+
+```hcl
+module "my_task" {
+  source  = "hashicorp/consul-ecs/aws//modules/mesh-task"
+  version = "<latest version>"
+
+  family                = "my_task"
+  container_definitions = [
+    {
+      name         = "example-client-app"
+      image        = "docker.io/org/my_task:v0.0.1"
+      essential    = true
+      portMappings = [
+        {
+          containerPort = 9090
+          hostPort      = 9090
+          protocol      = "tcp"
+        }
+      ]
+      cpu         = 0
+      mountPoints = []
+      volumesFrom = []
+    }
+  ]
+
+  port       = 9090
+  retry_join = ["<address of the Consul server>"]
+}
+```
+
+The main differences are:
+
+- You should remove the `execution_role_arn` and `task_role_arn` fields. The `mesh-task` module creates the task and execution roles by default. If you need to use existing IAM role(s), set the `task_role` and `execution_role` fields to pass in existing roles.
+- You must set the `port` field to the port that your application listens on.
+  If your application has no listening port, set `outbound_only = true` and remove the `port` field.
+- You must add the `retry_join` field. This specifies the location of your Consul servers so that your task can join the mesh.
+- You must remove the `jsonencode()` function from the `container_definitions` field.
+
+The `mesh-task` module will create a new version of your task definition with the
+necessary sidecar containers added so you can delete your existing `aws_ecs_task_definition`
+resource.
+
+## Next Steps
+
+Now that your task(s) are migrated to the `mesh-task` module,
+
+- Start at the [ECS Service section](/consul/docs/ecs/terraform/install#configure-an-ecs-service-for-the-mesh-task-module) of the Installation Guide to continue installing Consul on ECS.
+- Refer to the [`mesh-task` reference documentation](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/mesh-task?tab=inputs) for all available inputs to your mesh tasks.
diff --git a/website/content/docs/ecs/terraform/secure-configuration.mdx b/website/content/docs/ecs/terraform/secure-configuration.mdx
new file mode 100644
index 0000000000000..07031f5490e39
--- /dev/null
+++ b/website/content/docs/ecs/terraform/secure-configuration.mdx
@@ -0,0 +1,177 @@
+---
+layout: docs
+page_title: Secure Configuration with Terraform - Consul on AWS Elastic Container Service (ECS)
+description: >-
+  When running Consul on Amazon Web Services ECS, you can use Terraform to secure your service mesh with an auth method and ACL controller. Learn how to configure Terraform modules to enable secure deployment.
+---
+
+# Secure Configuration for Consul on AWS Elastic Container Service (ECS) with Terraform
+
+This topic describes how to enable Consul security features for your production workloads.
+
+## Overview
+
+To enable security in your production workloads, you must deploy the [ACL controller](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/acl-controller), which provisions tokens for other service mesh tasks. Refer to [Architecture](/consul/docs/ecs/architecture#acl-controller) to learn more about the ACL controller.
+
+The controller cannot provision tokens for itself, so you must create the token for the ACL controller. The following steps describe the overall process of enabling security features for your production workloads:
+
+1. Enable the security features on your Consul server cluster per the [Prerequisites](#prerequisites).
+1. Create the ACL token for the ACL controller in the datacenter.
+1. Create a Secrets Manager secret containing the ACL controller's token.
+1. Create a Secrets Manager secret containing the Consul CA certificate.
+1. Deploy the ACL controller
+1. Deploy the other services on the mesh.
+
+## Prerequisites
+
+Implement the following security features for your Consul server clusters before applying them to your workloads:
+
+1. [TLS encryption](/consul/docs/security/encryption#rpc-encryption-with-tls) for RPC communication between Consul clients and servers.
+1. [Gossip encryption](/consul/docs/security/encryption#gossip-encryption) for encrypting gossip traffic.
+1. [Access control lists (ACLs)](/consul/docs/security/acl) for authentication and authorization for Consul clients and services on the mesh.
+
+## Auth Method
+
+Consul on ECS uses the [AWS IAM Auth Method](/consul/docs/ecs/architecture#aws-iam-auth-method) to enable
+tasks to automatically obtain Consul ACL tokens during startup.
+
+With the Terraform modules for Consul on ECS, the auth method is supported by default when ACLs are
+enabled. The ACL controller sets up the auth method on the Consul servers. The `mesh-task` module
+configures the ECS task definition to be compatible with the auth method.
+
+A unique task IAM role is required for each ECS task family. Task IAM roles must not be shared by
+different task families. This is because the task family represents only one Consul service and the
+task IAM role must encode the Consul service name.
+
+By default, the `mesh-task` module will create and configure the task IAM role for you.
+
+~> **Note:** When passing an existing IAM role to the `mesh-task` module using the `task_role` input
+variable, you must configure the IAM role as described in [ECS Task Role
+Configuration](/consul/docs/ecs/manual/secure-configuration#ecs-task-role-configuration) to be compatible with
+the AWS IAM auth method.
+
+## ACL controller
+
+1. Create a policy that grants `acl:write` and `operator:write` access for the controller. Refer to the [ACL policies documentation](/consul/docs/security/acl/acl-policies) for instructions.
+1. Create a token and link it to the ACL controller policy. Refer to the [ACL tokens documentation](/consul/docs/security/acl/acl-tokens) for instructions.
+1. Create a Secrets Manager secret containing the ACL controller's token and a Secrets Manager secret containing the Consul CA cert.
+
+```hcl
+resource "aws_secretsmanager_secret" "bootstrap_token" {
+  name  = "bootstrap-token"
+}
+
+resource "aws_secretsmanager_secret_version" "bootstrap_token" {
+  secret_id     = aws_secretsmanager_secret.bootstrap_token.id
+  secret_string = "<bootstrap token>"
+}
+
+resource "aws_secretsmanager_secret" "ca_cert" {
+  name  = "server-ca-cert"
+}
+
+resource "aws_secretsmanager_secret_version" "ca_cert" {
+  secret_id     = aws_secretsmanager_secret.ca_cert.id
+  secret_string = "<CA certificate for the Consul server's HTTPS endpoint>"
+}
+```
+
+1. Use the [`acl-controller` terraform module](https://registry.terraform.io/modules/hashicorp/consul-ecs/aws/latest/submodules/acl-controller?tab=inputs) to deploy the controller. You must provide the ARN's for the token and CA cert in the `consul_bootstrap_token_secret_arn` and `consul_server_ca_cert_arn` fields, respectively.
+
+   ```hcl
+   module "acl_controller" {
+     source                            = "hashicorp/consul-ecs/aws//modules/acl-controller"
+     version                           = "<version>"
+
+     consul_bootstrap_token_secret_arn = aws_secretsmanager_secret.bootstrap_token.arn
+     consul_server_http_addr           = "https://consul-server.example.com:8501"
+     consul_server_ca_cert_arn         = aws_secretsmanager_secret.ca_cert.arn
+     ecs_cluster_arn                   = "arn:aws:ecs:us-east-1:111111111111:cluster/consul-ecs"
+     region                            = "us-east-1"
+     subnets                           = ["subnet-abcdef123456789"]
+     name_prefix                       = "consul-ecs"
+   }
+   ```
+
+The following table describes the required input variables for the `acl-controller` module.
+
+| Input Variable                      | Type     | Description                                                                                                                                                                                                                                |
+| ----------------------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `source`                            | string   | The location of the `acl-controller` module source.                                                                                                                                                                                        |
+| `version`                           | string   | The version of the `acl-controller` module.                                                                                                                                                                                                |
+| `consul_bootstrap_token_secret_arn` | string   | The Secrets Manager secret containing an ACL token for the ACL controller. The ACL token must have `acl:write` and `operator:write` permissions.                                                                                           |
+| `consul_server_http_addr`           | string   | The HTTP(S) address of the Consul servers.                                                                                                                                                                                                 |
+| `consul_server_ca_cert_arn`         | string   | (Optional) The Secrets Manager secret containing the CA cert for HTTPS communication with Consul servers. Required if the server's certificate is self-signed or signed by an internal CA. This is not required for Consul servers in HCP. |
+| `ecs_cluster_arn`                   | string   | The ECS cluster where the ACL controller will be deployed.                                                                                                                                                                                 |
+| `region`                            | string   | The AWS region where the AWS resources will be created.                                                                                                                                                                                    |
+| `subnets`                           | list     | The AWS VPC subnet ids where the ACL controller will be deployed.                                                                                                                                                                          |
+| `name_prefix`                       | string   | AWS resources created by the `acl-controller` module will include this prefix in the resource name.                                                                                                                                        |
+
+<EnterpriseAlert>
+
+If you are using Consul Enterprise, see the [Admin Partitions and Namespaces requirements documentation](/consul/docs/ecs/requirements) for additional configuration required to support Consul Enterprise on ECS.
+
+</EnterpriseAlert>
+
+## Deploy your services
+
+Follow the instructions described in [Create a task definition](/consul/docs/ecs/terraform/install#create-the-task-definition) to create the basic configuration for the task module. Add the following additional configurations to make the configuration production-ready.
+
+### Create an AWS Secrets Manager secret
+
+The secret stores the gossip encryption key that the Consul clients use.
+
+<CodeBlock>
+
+```hcl
+resource "aws_secretsmanager_secret" "gossip_key" {
+  name  = "gossip-encryption-key"
+}
+
+resource "aws_secretsmanager_secret_version" "gossip_key" {
+  secret_id     = aws_secretsmanager_secret.gossip_key.id
+  secret_string = "<Gossip encryption key>"
+}
+```
+
+</CodeBlock>
+
+### Enable secure deployment
+
+To enable secure deployment, add the following configuration to the task module.
+
+```hcl
+module "my_task" {
+  source  = "hashicorp/consul-ecs/aws//modules/mesh-task"
+  version = "<version>"
+
+  ...
+
+  tls                       = true
+  consul_server_ca_cert_arn = aws_secretsmanager_secret.ca_cert.arn
+  gossip_key_secret_arn     = aws_secretsmanager_secret.gossip_key.arn
+
+  acls                      = true
+  consul_http_addr          = "https://consul-server.example.com:8501"
+  consul_https_ca_cert_arn  = aws_secretsmanager_secret.ca_cert.arn
+  audit_logging             = true
+}
+```
+
+The following table explains the `mesh-task` input variables relevant to a secure configuration:
+
+| Input Variable              | Type     | Description                                                                                                                                                                                                                                |
+| -----------------------     | -------- | -------------------------------------------------------------------------------------------------------------------                                                                                                                        |
+| `tls`                       | boolean  | If true, TLS is enabled for RPC communication with the Consul servers.                                                                                                                                                                     |
+| `consul_server_ca_cert_arn` | string   | The Secrets Manager secret containing the CA certificate for RPC communication with the Consul servers when TLS is enabled.                                                                                                                |
+| `gossip_key_secret_arn`     | string   | The Secrets Manager secret containing Consul's gossip encryption key.                                                                                                                                                                      |
+| `acls`                      | boolean  | If true, ACLs are enabled.                                                                                                                                                                                                                 |
+| `consul_http_addr`          | string   | The Consul server address. Required when `acls = true` in order to log in to Consul's AWS IAM auth method to obtain ACL tokens.                                                                                                            |
+| `consul_https_ca_cert_arn`  | string   | (optional) The Secrets Manager secret containing the CA cert for HTTPS communication with Consul servers. Required if the server's certificate is self-signed or signed by an internal CA. This is not required for Consul servers in HCP. |
+| `audit_logging`             | boolean  | <EnterpriseAlert inline /> (optional) If true, ACL audit logging is enabled. Consul client is configured to print audit logs to `stdout`.                                                                                                  |
+
+Complete the following steps described in the Installation with Terraform chapter to deploy and connect your services:
+
+1. [Run Terraform](/consul/docs/ecs/terraform/install#run-terraform)
+1. [Configure routes](/consul/docs/ecs/terraform/install#configure-routes)
+1. [Configure the bind address](/consul/docs/ecs/terraform/install#configure-the-bind-address)
diff --git a/website/content/docs/ecs/upgrade-to-dataplanes.mdx b/website/content/docs/ecs/upgrade-to-dataplanes.mdx
deleted file mode 100644
index c0a788dc666d8..0000000000000
--- a/website/content/docs/ecs/upgrade-to-dataplanes.mdx
+++ /dev/null
@@ -1,68 +0,0 @@
----
-layout: docs
-page_title: Upgrade to Consul dataplane architecture
-description: Learn how to upgrade your existing Consul service mesh on ECS workloads to the agentless dataplanes architecture.
----
-
-# Upgrade to Consul dataplane architecture
-
-This topic describes how to manually upgrade a live installation of Consul on ECS to the dataplane-based architecture with zero downtime. Since v0.7.0, Consul service mesh on ECS uses [Consul dataplanes](/consul/docs/connect/dataplane), which are lightweight processes for managing Envoy proxies in containerized networks. Refer to the [release notes](/consul/docs/release-notes/consul-ecs/v0_7_x) for additional information about the switch to Consul dataplanes.
-
-## Requirements
-
-Before you upgrading to the dataplane-based architecture, you must upgrade your Consul servers to a version compatible with Consul ECS:
-
-- Consul 1.14.x and later
-- Consul dataplane 1.3.x and later
-
-## Deploy the latest version of the ECS controller module
-
-In an ACL enabled cluster, deploy the latest version of the ECS controller module in `hashicorp/terraform-aws-consul-ecs` along with the older version of the ACL controller. Note that both the controllers should coexist until the upgrade is complete. The new version of the controller only tracks tasks that use dataplanes.
-
-## Upgrade workloads
-
-For application tasks, upgrade the individual task definitions to `v0.7.0` or later of the `mesh-task` module. You must upgrade each task one at a time.
-
-```hcl
-module "my_task" {
-  source  = "hashicorp/consul-ecs/aws//modules/mesh-task"
-  version = "v0.7.0"
-}
-```
-
-For gateway tasks, upgrade the individual task definitions to `v0.7.0` or later of the `gateway-task` module. You must upgrade each task one by one independently. ECS creates new versions of tasks before shutting down the older tasks to support zero downtime deployments.
-
-```hcl
-module "my_task" {
-  source  = "hashicorp/consul-ecs/aws//modules/gateway-task"
-  version = "v0.7.0"
-}
-```
-
-## Delete previous tasks
-
-After upgrading all tasks, you can destroy the `acl-controller` containers, which are replaced by the ECS controller. You can manually remove any artifacts related to the old architecture, including Consul clients and ACL controllers, by executing the following commands:
-
-1. Run `consul acl policy delete` to delete the client policy. You can pass either the ID of the policy or the name of the policy, for example:
-
-   ```shell-session
-   $ consul acl policy delete -name="consul-ecs-client-policy"
-   ```
-
-   Refer to the [`consul acl policy delete`](/consul/commands/acl/policy/delete) documentation for additional information.
-
-1. Run the `consul acl role delete` command to delete the client role. You can pass either the ID of the role or the name of the role, for example:
-
-   ```shell-session
-   $ consul acl role delete -name="consul-ecs-client-role"
-   ```
-
-   Refer to the [`consul acl role delete`](/consul/commands/acl/role/delete) documentation for additional information.
-
-1. Run the `consul acl auth-method delete` command and specify the auth method name to delete. 
-
-   ```shell-session
-   $ consul acl auth-method delete -name="iam-ecs-client-token"
-   ```
-
-   Refer to the [`consul acl auth-method delete`](/consul/commands/acl/auth-method/delete) documentation for additional information.
\ No newline at end of file
diff --git a/website/content/docs/enterprise/admin-partitions.mdx b/website/content/docs/enterprise/admin-partitions.mdx
index 2d060c274be77..42b2251deb6c9 100644
--- a/website/content/docs/enterprise/admin-partitions.mdx
+++ b/website/content/docs/enterprise/admin-partitions.mdx
@@ -23,7 +23,7 @@ Admin partitions exist a level above namespaces in the identity hierarchy. They
 
 As of Consul v1.11, every _datacenter_ contains a single administrative partition named `default` when created. With Consul Enterprise, operators have the option of creating multiple partitions within a single datacenter.
 
--> **Preexisting nodes**: Admin partitions were introduced in Consul 1.11. Nodes existed in global scope prior to 1.11. After upgrading to Consul 1.11 or later, all nodes will be scoped to an admin partition, which will be the `default` partition when initially upgrading an existing deployment or for CE versions.
+-> **Preexisting nodes**: Admin partitions were introduced in Consul 1.11. Nodes existed in global scope prior to 1.11. After upgrading to Consul 1.11 or later, all nodes will be scoped to an admin partition, which will be the `default` partition when initially upgrading an existing deployment or for OSS versions.
 
 There are tutorials available to help you get started with admin partitions.
 
@@ -72,7 +72,7 @@ You can configure services to be discoverable by downstream services in any part
 
 ### Cluster Peering
 
-You can use [cluster peering](/consul/docs/connect/cluster-peering/) between two admin partitions to connect clusters owned by different operators. Without Consul Enterprise, cluster peering is limited to the `default` partitions in each datacenter. Enterprise users can [establish cluster peering connections](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering) between any two admin partitions as long as the partitions are in separate datacenters. It is not possible to establish cluster peering connections between two partitions in a single datacenter.
+You can use [cluster peering](/consul/docs/connect/cluster-peering/) between two admin partitions to connect clusters owned by different operators. Without Consul Enterprise, cluster peering is limited to the `default` partitions in each datacenter. Enterprise users can [create and manage cluster peering connections](/consul/docs/connect/cluster-peering/create-manage-peering) between any two admin partitions as long as the partitions are in separate datacenters. It is not possible to establish cluster peering connections between two partitions in a single datacenter.
 
 ## Requirements
 
@@ -117,6 +117,7 @@ One of the primary use cases for admin partitions is for enabling a service mesh
 
 - If you are deploying Consul servers on Kubernetes, then ensure that the Consul servers are deployed within the same Kubernetes cluster. Consul servers may be deployed external to Kubernetes and configured using the `externalServers` stanza.
 - Workloads deployed on the same Kubernetes cluster as the Consul Servers must use the `default` partition. If the workloads are required to run on a non-default partition, then the clients must be deployed in a separate Kubernetes cluster.
+- For Kubernetes clusters that join the Consul datacenter as admin partitions, ensure that a unique `global.name` value is assigned for the corresponding Helm `values.yaml` file. 
 - A Consul Enterprise license must be installed on each Kubernetes cluster.
 - The helm chart for consul-k8s v0.39.0 or greater.
 - Consul 1.11.1-ent or greater.
@@ -249,6 +250,7 @@ Verify that your Consul deployment meets the [Kubernetes Requirements](#kubernet
   ```
 
 1. Create a configuration for each non-default admin partition.
+   In the following example, the external IP address and the Kubernetes authentication method IP address from the previous steps have been applied. Also, ensure a unique `global.name` value is assigned.
 
   <CodeTabs heading="partition-workload.yaml">
 
diff --git a/website/content/docs/enterprise/fips.mdx b/website/content/docs/enterprise/fips.mdx
deleted file mode 100644
index 5f5cf281967ad..0000000000000
--- a/website/content/docs/enterprise/fips.mdx
+++ /dev/null
@@ -1,127 +0,0 @@
----
-layout: docs
-page_title: FIPS 140-2
-description: >-
-  A version of Consul compliant with FIPS 140-2 is available to Enterprise users. Learn about where to find FIPS-compliant versions of Consul, as well as usage restrictions and technical details.
----
-
-# FIPS 140-2
-
-<EnterpriseAlert>
-  This feature requires Consul Enterprise.
-</EnterpriseAlert>
-
-Builds of Consul Enterprise marked with a `fips1402` feature name include built-in support for FIPS 140-2 compliance.
-
-To use this feature, you must have an [active or trial license for Consul Enterprise](/consul/docs/enterprise/license/overview). To start a trial, contact HashiCorp sales.
-
-## Using FIPS 140-2 Consul Enterprise
-
-FIPS 140-2 builds of Consul Enterprise behave in the same way as non-FIPS builds. There are no restrictions on Consul algorithms and ensuring that Consul remains in a FIPS-compliant mode of operation is your responsibility. To maintain FIPS-compliant operation, you must [ensure that TLS is enabled](/consul/tutorials/security/tls-encryption-secure) so that communication is encrypted. Consul products surface some helpful warnings where settings are insecure.
-
-Encryption is disabled in Consul Enterprise by default. As a result, Consul may transmit sensitive control plane information. You must ensure that gossip encryption and mTLS is enabled for all agents when running Consul with FIPS-compliant settings. In addition, be aware that TLSv1.3 does not work with FIPS 140-2, as HKDF is not a certified primitive.
-
-HashiCorp is not a NIST-certified testing laboratory and can only provide general guidance about using Consul Enterprise in a FIPS-compliant manner. We recommend consulting an approved auditor for further information.
-
-The FIPS 140-2 variant of Consul uses separate binaries that are available from the following sources:
-
-- From the [HashiCorp Releases page](https://releases.hashicorp.com/consul), releases ending with the `+ent.fips1402` suffix.
-- From the [Docker Hub `hashicorp/consul-enterprise-fips`](https://hub.docker.com/r/hashicorp/consul-enterprise-fips) container repository.
-- From the [AWS ECR `hashicorp/consul-enterprise-fips`](https://gallery.ecr.aws/hashicorp/consul-enterprise-fips) container repository.
-- From the [Red Hat Access `hashicorp/consul-enterprise-fips`](https://catalog.redhat.com/software/containers/hashicorp/consul-enterprise-fips/628d50e37ff70c66a88517ea) container repository.
-
-The above naming conventions, which append `.fips1402` to binary names and tags, and `-fips` to registry names, also apply to `consul-k8s`, `consul-k8s-control-plane`, `consul-dataplane`, and `consul-ecs`, which are packaged separately from Consul Enterprise.
-
-### Usage restrictions
-
-When using Consul Enterprise with FIPS 140-2, be aware of the following operation restrictions:
-
-#### Migration restrictions
-
-We do not support in-place migrations from non-FIPS builds of Consul to FIPS builds of Consul, regardless of version. A fresh cluster installation is required to support FIPS 140-2. You cannot upgrade directly to a FIPS-compliant build.
-
-#### TLS restrictions
-Consul Enterprise's FIPS modifications include restrictions to supported TLS cipher suites and key information. Only the following cipher suites are allowed:
-
-- `TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256`
-- `TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384`
-- `TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256`
-- `TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384`
-- `TLS_RSA_WITH_AES_128_GCM_SHA256`
-- `TLS_RSA_WITH_AES_256_GCM_SHA384`
-
-In addition, only the following key types are allowed in TLS chains of trust:
-
-- RSA 2048, 3072, and 4096-bit
-- ECDSA P-256, P-384, and P-521
-
-Finally, only TLSv1.2 is supported in FIPS mode. These settings are in line with recent NIST guidance and FIPS requirements.
-
-#### Heterogeneous cluster deployments
-
-We do not support mixed deployment scenarios within the same Consul cluster. An example of an unsupported deployment scenario is one that mixes FIPS and non-FIPS Consul binaries. Nodes across the entire cluster must use a single binary or deployment type.
-
-Running a heterogeneous cluster is not permitted by FIPS, as components of the system are not compliant with FIPS. Attempts to join non-FIPS and FIPS nodes or servers may fail.
-
-### Envoy
-
-To enable users to deploy a FIPS compliant service mesh with Consul, HashiCorp provides FIPS compliant versions of Envoy available for download. Contact Hashicorp sales for more information.
-
-## Deployment prerequisites
-
-Depending on your Consul runtime, there are additional requirements for using FIPS 140-2.
-
-### VMs
-
-If using Consul on VMs, you must use a FIPS compliant version of Envoy. Contact HashiCorp sales to learn how to obtain a FIPS compliant version of Envoy.
-
-### Consul-k8s and Helm
-
-When deploying the FIPS builds of Consul on Kubernetes using `consul-k8s` or Helm, you must ensure that the Helm chart is updated to use FIPS builds of Consul Enterprise, Consul Dataplane, and Envoy images.
-
-## Technical details
-
-Consul's FIPS 140-2 Linux products use the BoringCrypto integration in the official Go 1.20+ toolchain, which include a FIPS-validated crypto module.
-
-Consul's FIPS 140-2 products on Windows use the CNGCrypto integration in Microsoft's Go toolchain, which include a FIPS-validated crypto module.
-
-To ensure your build of Consul Enterprise includes FIPS support, confirm that a line with `FIPS: Enabled` appears when you run a `version` command. For example, the following message appears for Linux users:
-
-```log hideClipboard
-FIPS: FIPS 140-2 Enabled, crypto module boringcrypto
-```
-
-The following message appears for Windows users:
-
-```log hideClipboard
-FIPS: FIPS 140-2 Enabled, crypto module cngcrypto
-```
-
-FIPS 140-2 Linux binaries depend on cgo, which require that a GNU C Library (glibc) Linux distribution be used to run Consul. Refer to [instructions for Windows FIPS mode](https://github.com/microsoft/go/blob/microsoft/main/eng/doc/fips/README.md#windows-fips-mode-cng) for more information on running CNGCrypto-enabled Go binaries in FIPS mode.
-
-The NIST Cryptographic Module Validation Program certifications and accompanying security policies for BoringCrypto and CNG are available through the following external links:
-
-- [BoringCrypto](https://csrc.nist.gov/projects/cryptographic-module-validation-program/certificate/4407)
-- [CNG](https://csrc.nist.gov/projects/cryptographic-module-validation-program/certificate/4515)
-
-### Validating FIPS crypto modules
-
-To validate that a FIPS 140-2 Linux binary correctly includes BoringCrypto, run `go tool nm` on the binary to get a symbol dump.  On FIPS-enabled builds, many results appear, as in the following example:
-
-```shell-session
-$ go tool nm consul | grep -i goboringcrypto
-4014d0 T _cgo_6880f0fbb71e_Cfunc__goboringcrypto_AES_cbc_encrypt
-4014f0 T _cgo_6880f0fbb71e_Cfunc__goboringcrypto_AES_ctr128_encrypt
-401520 T _cgo_6880f0fbb71e_Cfunc__goboringcrypto_AES_decrypt
-401540 T _cgo_6880f0fbb71e_Cfunc__goboringcrypto_AES_encrypt
-401560 T _cgo_6880f0fbb71e_Cfunc__goboringcrypto_AES_set_decrypt_key
-```
-
-Similarly, on a FIPS Windows binary, run `go tool nm` on the binary to get a symbol dump, and then search for `go-crypto-winnative`. 
-
-On both Linux and Windows non-FIPS builds, the search output yields no results.
-
-### Compliance validation
-
-A Lab, authorized by the U.S. Government to certify FIPS 140-2 compliance, is in the process of verifying that Consul Enterprise and its related packages are compliant with the requirements of FIPS 140-2 Level 1.
-
diff --git a/website/content/docs/enterprise/index.mdx b/website/content/docs/enterprise/index.mdx
index 34a8725b46483..e63363e81069e 100644
--- a/website/content/docs/enterprise/index.mdx
+++ b/website/content/docs/enterprise/index.mdx
@@ -2,7 +2,7 @@
 layout: docs
 page_title: Consul Enterprise
 description: >-
-  Consul Enterprise is a paid offering that extends Consul Community Edition to support large and complex deployments. Learn about scaling infrastructure, simplifying operations, and making networks more resilient with Enterprise. Evaluate Enterprise features with the feature availability and compatibility matrix.
+  Consul Enterprise is a paid offering that extends Consul’s open source functions to support large and complex deployments. Learn about scaling infrastructure, simplifying operations, and making networks more resilient with Enterprise.
 ---
 
 # Consul Enterprise
@@ -12,50 +12,33 @@ features address the organizational complexities of collaboration, operations, s
 If you have purchased or wish to try out Consul Enterprise,
 refer to [how to access Consul Enterprise](#access-consul-enterprise).
 
-## Enterprise features
+## Enterprise Features
 
 The following features are [available in several forms of Consul Enterprise](#consul-enterprise-feature-availability).
 
 ### Multi-Tenancy
-
 - [Admin Partitions](/consul/docs/enterprise/admin-partitions): Define administrative boundaries between tenants within a single Consul datacenter
 - [Namespaces](/consul/docs/enterprise/namespaces): Define resource boundaries within a single admin partition for further organizational flexibility
-- [Sameness Groups](/consul/docs/connect/config-entries/sameness-group): Define partitions and cluster peers as members of a group with identical services
 
 ### Resiliency
-
 - [Automated Backups](/consul/docs/enterprise/backups): Configure the automatic backup of Consul state
 - [Redundancy Zones](/consul/docs/enterprise/redundancy): Deploy backup voting Consul servers to efficiently improve Consul fault tolerance
-- [Server request rate limits per source IP](/consul/docs/agent/limits/usage/limit-request-rates-from-ips): Limit gRPC and RPC traffic to servers for source IP addresses.
 
 ### Scalability
-
 - [Read Replicas](/consul/docs/enterprise/read-scale): Deploy non-voting Consul servers to enhance the scalability of read requests
 
-### Operational simplification
-
+### Operational Simplification
 - [Automated Upgrades](/consul/docs/enterprise/upgrades): Ease upgrades by automating the transition from existing to newly deployed Consul servers
 - [Consul-Terraform-Sync Enterprise](/consul/docs/nia/enterprise): Leverage the enhanced network infrastructure automation capabilities of the enterprise version of Consul-Terraform-Sync
 
-### Complex network topology support
-
+### Complex Network Topology Support
 - [Network Areas](/consul/docs/enterprise/federation): Support complex network topologies between federated Consul datacenters with pairwise federation rather than full mesh federation
 - [Network Segments](/consul/docs/enterprise/network-segments/network-segments-overview): Support complex network topologies within a Consul datacenter by enforcing boundaries in Consul client gossip traffic
 
 ### Governance
-
 - [OIDC Auth Method](/consul/docs/security/acl/auth-methods/oidc): Manage user access to Consul through an OIDC identity provider instead of Consul ACL tokens directly
-- [Audit Logging](/consul/docs/enterprise/audit-logging): Understand Consul access and usage patterns by reviewing access to the Consul HTTP API
-
-### Regulatory compliance
-
-- [FIPS 140-2 Compliance](/consul/docs/enterprise/fips): Leverage FIPS builds of Consul Enterprise to ensure your Consul deployments are secured with BoringCrypto and CNGCrypto, and compliant with FIPS 140-2.
-
-  <Note>
-
-  FIPS 140-2 builds of Consul Enterprise support all runtimes (VMs, Kubernetes) except for Lambda and ECS. In addition, HCP does not currently support FIPS builds of Consul Enterprise.
-
-  </Note>
+- [Audit Logging](/consul/docs/enterprise/audit-logging): Understand Consul access and usage patterns by reviewing access to the Consul HTTP API 
+- [Sentinel for KV](/consul/docs/enterprise/sentinel): Policy-as-code framework for defining advanced key-value storage access control policies
 
 ## Access Consul Enterprise
 
@@ -78,7 +61,7 @@ to the Consul Enterprise binary that grants access to the desired features.
 
 Contact your [HashiCorp Support contact](https://support.hashicorp.com/) for a development license.
 
-## Consul Enterprise feature availability
+## Consul Enterprise Feature Availability
 
 The Consul Enterprise features that are available depend on your license and the runtimes you use in your deployment.
 
@@ -95,15 +78,12 @@ Available Enterprise features per Consul form and license include:
 | [Automated Server Upgrades](/consul/docs/enterprise/upgrades)   | All tiers                               | Yes                 | Yes                                               |
 | [Consul-Terraform-Sync Enterprise](/consul/docs/nia/enterprise) | All tiers                               | Yes                 | Yes                                               |
 | [Enhanced Read Scalability](/consul/docs/enterprise/read-scale) | No                                      | Yes                 | With Global Visibility, Routing, and Scale module |
-| [FIPS 140-2 Compliance](/consul/docs/enterprise/fips) | No                                      | Yes                 | No |
 | [Namespaces](/consul/docs/enterprise/namespaces)                | All tiers                               | Yes                 | With Governance and Policy module                 |
 | [Network Areas](/consul/docs/enterprise/federation)             | No                                      | Yes                 | With Global Visibility, Routing, and Scale module |
 | [Network Segments](/consul/docs/enterprise/network-segments/network-segments-overview)    | No                                      | Yes                 | With Global Visibility, Routing, and Scale module |
 | [OIDC Auth Method](/consul/docs/security/acl/auth-methods/oidc) | No                                      | Yes                 | Yes                                               |
 | [Redundancy Zones](/consul/docs/enterprise/redundancy)          | Not applicable                          | Yes                 | With Global Visibility, Routing, and Scale module |
-| [Sameness Groups](/consul/docs/connect/config-entries/sameness-group) | No | Yes | N/A |
-| [Server request rate limits per source IP](/consul/docs/agent/limits/usage/limit-request-rates-from-ips) | All tiers | Yes | With Governance and Policy module |
-
+| [Sentinel for KV](/consul/docs/enterprise/sentinel)             | All tiers                               | Yes                 | With Governance and Policy module                 |
 
 [HashiCorp Cloud Platform (HCP) Consul]: https://cloud.hashicorp.com/products/consul
 [Consul Enterprise]: https://www.hashicorp.com/products/consul/
@@ -123,14 +103,12 @@ Consul Enterprise feature availability can change depending on your server and c
 | [Automated Server Backups](/consul/docs/enterprise/backups)             |  &#9989;  |  &#9989;   |   &#9989;  |
 | [Automated Server Upgrades](/consul/docs/enterprise/upgrades)           |  &#9989;  |  &#9989;   |   &#9989;  |
 | [Enhanced Read Scalability](/consul/docs/enterprise/read-scale)         |  &#9989;  |  &#9989;   |   &#9989;  |
-| [FIPS 140-2 Compliance](/consul/docs/enterprise/fips)                   |  &#9989;  |  &#9989;   |   &#10060;  |
 | [Namespaces](/consul/docs/enterprise/namespaces)                        |  &#9989;  |  &#9989;   |   &#9989;  |
 | [Network Areas](/consul/docs/enterprise/federation)                     |  &#9989;  |  &#9989;   |   &#9989;  |
 | [Network Segments](/consul/docs/enterprise/network-segments/network-segments-overview)            |  &#9989;  |  &#10060;  |  &#10060;  |
 | [OIDC Auth Method](/consul/docs/security/acl/auth-methods/oidc)         |  &#9989;  |  &#9989;   |   &#9989;  |
 | [Redundancy Zones](/consul/docs/enterprise/redundancy)                  |  &#9989;  |  &#9989;   |   &#9989;  |
-| [Sameness Groups](/consul/docs/connect/config-entries/sameness-group)    |  &#9989;  |  &#9989;   |   &#9989;  |
-| [Server request rate limits per source IP](/consul/docs/agent/limits/usage/limit-request-rates-from-ips) | &#9989; | &#9989; | &#9989; |
+| [Sentinel ](/consul/docs/enterprise/sentinel)                           |  &#9989;  |  &#9989;   |   &#9989;  |
 
 </Tab>
 
@@ -143,14 +121,12 @@ Consul Enterprise feature availability can change depending on your server and c
 | [Automated Server Backups](/consul/docs/enterprise/backups)             |  &#9989;  |  &#9989;   |  &#9989;  |
 | [Automated Server Upgrades](/consul/docs/enterprise/upgrades)           |  &#10060; |  &#10060;  |  &#10060;  |
 | [Enhanced Read Scalability](/consul/docs/enterprise/read-scale)         |  &#10060; |  &#10060;  |  &#10060;  |
-| [FIPS 140-2 Compliance](/consul/docs/enterprise/fips)                   |  &#9989;  |  &#9989;   |   &#10060;  |
 | [Namespaces](/consul/docs/enterprise/namespaces)                        |  &#9989;  |  &#9989;   |  &#9989;  |
 | [Network Areas](/consul/docs/enterprise/federation)                     |  &#9989;  |  &#9989;   |  &#9989;  |
 | [Network Segments](/consul/docs/enterprise/network-segments/network-segments-overview)            |  &#10060; |  &#10060;  |  &#10060;  |
 | [OIDC Auth Method](/consul/docs/security/acl/auth-methods/oidc)         |  &#9989;  |  &#9989;   |  &#9989;  |
 | [Redundancy Zones](/consul/docs/enterprise/redundancy)                  |  &#10060; |  &#10060;  |  &#10060;  |
-| [Sameness Groups](/consul/docs/connect/config-entries/sameness-group)    |  &#9989;  |  &#9989;   |   &#9989;  |
-| [Server request rate limits per source IP](/consul/docs/agent/limits/usage/limit-request-rates-from-ips) | &#9989; | &#9989; | &#9989; |
+| [Sentinel ](/consul/docs/enterprise/sentinel)                           |  &#9989;  |  &#9989;   |  &#9989;  |
 
 </Tab>
 
@@ -163,14 +139,12 @@ Consul Enterprise feature availability can change depending on your server and c
 | [Automated Server Backups](/consul/docs/enterprise/backups)             |  &#9989;  |  &#9989;   |   &#9989;  |
 | [Automated Server Upgrades](/consul/docs/enterprise/upgrades)           |  &#9989;  |  &#9989;   |   &#9989;  |
 | [Enhanced Read Scalability](/consul/docs/enterprise/read-scale)         |  &#10060; |  &#10060;  |  &#10060;  |
-| [FIPS 140-2 Compliance](/consul/docs/enterprise/fips)                   |  &#10060; |  &#10060;  |  &#10060;  |
 | [Namespaces](/consul/docs/enterprise/namespaces)                        |  &#9989;  |  &#9989;   |   &#9989;  |
 | [Network Areas](/consul/docs/enterprise/federation)                     |  &#10060; |  &#10060;  |  &#10060;  |
 | [Network Segments](/consul/docs/enterprise/network-segments/network-segments-overview)            |  &#10060; |  &#10060;  |  &#10060;  |
 | [OIDC Auth Method](/consul/docs/security/acl/auth-methods/oidc)         |  &#10060; |  &#10060;  |  &#10060;  |
 | [Redundancy Zones](/consul/docs/enterprise/redundancy)                  |  n/a      |  n/a       |  n/a       |
-| [Sameness Groups](/consul/docs/connect/config-entries/sameness-group)    |  &#9989;  |  &#9989;   |   &#9989;  |
-| [Server request rate limits per source IP](/consul/docs/agent/limits/usage/limit-request-rates-from-ips) | &#9989; | &#9989; | &#9989; |
+| [Sentinel ](/consul/docs/enterprise/sentinel)                           |  &#9989;  |  &#9989;   |   &#9989;  |
 
 </Tab>
-</Tabs>
+</Tabs>
\ No newline at end of file
diff --git a/website/content/docs/enterprise/license/utilization-reporting.mdx b/website/content/docs/enterprise/license/utilization-reporting.mdx
index 051f29901c10a..6cbca18aa4b9e 100644
--- a/website/content/docs/enterprise/license/utilization-reporting.mdx
+++ b/website/content/docs/enterprise/license/utilization-reporting.mdx
@@ -20,7 +20,6 @@ Automated license utilization reporting does not support _air-gapped installatio
 
 The following versions of Consul Enterprise support automated license utilization reporting:
 
-- Consul Enterprise v1.16.0 and newer.
 - Patch releases of Consul Enterprise v1.15.4 and newer.
 - Patch releases of Consul Enterprise v1.14.8 and newer.
 - Patch releases of Consul Enterprise v1.13.9 and newer.
@@ -29,7 +28,7 @@ Download a supported release from the [Consul Versions](https://releases.hashico
 
 ## Enable automated reporting
 
-Before you enable automated reporting, make sure that outbound network traffic is configured correctly and upgrade your enterprise product to a version that supports it. If your installation is air-gapped or network settings are not in place, automated reporting will not work.
+Before you enable automated reporting, make sure that outbound network traffic is configured correctly and upgrade your enterprise product to a version that supports it. If your installation is air-gapped or network settings are not in place, automated reporting will not work. 
 
 To enable automated reporting, complete the following steps:
 
@@ -38,7 +37,7 @@ To enable automated reporting, complete the following steps:
 
 ### Allow outbound HTTPS traffic on port 443
 
-Make sure that your network allows HTTPS egress on port 443 from `https://reporting.hashicorp.services` by adding the following IP addresses to your allow-list:
+Make sure that your network allows HTTPS egress on port 443 from `https://reporting.hashicorp.services` by adding the following IP adddresses to your allow-list:
 
 - `100.20.70.12`
 - `35.166.5.222`
@@ -67,7 +66,7 @@ Automatic license utilization reporting starts sending data within roughly 24 ho
 
 </CodeBlockConfig>
 
-If your installation is air-gapped or your network does not allow the correct egress, the logs show an error.
+If your installation is air-gapped or your network does not allow the correct egress, the logs show an error. 
 
 <CodeBlockConfig hideClipboard>
 
@@ -84,17 +83,17 @@ If your installation is air-gapped or your network does not allow the correct eg
 
 </CodeBlockConfig>
 
-In this case, reconfigure your network to allow egress and check the logs again in roughly 24 hours to confirm that automated reporting works correctly.
+In this case, reconfigure your network to allow egress and check the logs again in roughly 24 hours to confirm that automated reporting works correctly. 
 
 ## Opt out
 
-If your installation is air-gapped or you want to manually collect and report on the same license utilization metrics, you can opt out of automated reporting.
+If your installation is air-gapped or you want to manually collect and report on the same license utilization metrics, you can opt out of automated reporting. 
 
-Manually reporting these metrics can be time consuming. Opting out of automated reporting does not mean that you also opt out from sending license utilization metrics. Customers who opt out of automated reporting are still required to manually collect and send license utilization metrics to HashiCorp.
+Manually reporting these metrics can be time consuming. Opting out of automated reporting does not mean that you also opt out from sending license utilization metrics. Customers who opt out of automated reporting are still required to manually collect and send license utilization metrics to HashiCorp. 
 
-If you are considering opting out because you are worried about the data, we strongly recommend that you review the [example payloads](#example-payloads) before opting out. If you have concerns with any of the automatically reported data, raise these concerns with your account manager.
+If you are considering opting out because you are worried about the data, we strongly recommend that you review the [example payloads](#example-payloads) before opting out. If you have concerns with any of the automatically reported data, raise these concerns with your account manager. 
 
-There are two methods for opting out of automated reporting:
+There are two methods for opting out of automated reporting: 
 
 - HCL configuration (recommended)
 - Environment variable (requires restart)
@@ -130,7 +129,7 @@ Check your product logs roughly 24 hours after opting out to make sure that the
 
 ## Example payloads
 
-HashiCorp collects the following utilization data as JSON payloads:
+HashiCorp collects the following utilization data as JSON payloads: 
 `exporter_version` - The version of the licensing exporter
 
 <CodeBlockConfig hideClipboard>
@@ -172,4 +171,4 @@ HashiCorp collects the following utilization data as JSON payloads:
 }
 ```
 
-</CodeBlockConfig>
+</CodeBlockConfig>
\ No newline at end of file
diff --git a/website/content/docs/enterprise/network-segments/create-network-segment.mdx b/website/content/docs/enterprise/network-segments/create-network-segment.mdx
index bc300f7708a6c..b7ef6b66b8ad2 100644
--- a/website/content/docs/enterprise/network-segments/create-network-segment.mdx
+++ b/website/content/docs/enterprise/network-segments/create-network-segment.mdx
@@ -7,16 +7,16 @@ description: >-
 
 # Create Network Segments
 
-This topic describes how to create Consul network segments so that services can connect to other services in the LAN gossip pool that have been placed into separate communication boundaries. Refer to [Network Segments Overview](/consul/docs/enterprise/network-segments/network-segments-overview) for additional information.
+This topic describes how to create Consul network segments so that services can connect to other services in the LAN gossip pool that have been placed into separate communication boundaries. Refer to [Network Segments Overview](/consul/docs/enterprise/network-segments/network-segments-overview) for additional information.  
 
 
 ## Requirements
 
-- Consul Enterprise 0.9.3+
+- Consul Enterprise 0.9.3+  
 
-## Define segments in the server configuration
+## Define segments in the server configuration 
 
-1. Add the `segments` block to your server configuration. Refer to the [`segments`](/consul/docs/agent/config/config-files#segments) documentation for details about how to define the configuration.
+1. Add the `segments` block to your server configuration. Refer to the [`segments`](/consul/docs/agent/config/config-files#segments) documentation for details about how to define the configuration. 
 
   In the following example, an `alpha` segment is configured to listen for traffic on port `8303` and a `beta` segment is configured to listen to traffic on port `8304`:
 
@@ -57,7 +57,7 @@ This topic describes how to create Consul network segments so that services can
    ]
    }
    ```
-
+  
   </CodeTabs>
 
 1. Start the server using the `consul agent` command. Copy the address for each segment listener so that you can [direct clients to join the segment](#configure-clients-to-join-segments) when you start them:
@@ -71,7 +71,7 @@ This topic describes how to create Consul network segments so that services can
   [INFO] consul: Started listener for LAN segment "beta" on 10.20.10.11:8304
   [INFO] serf: EventMemberJoin: server1 10.20.10.11
   ```
-1. Verify that the server is a member of all segments:
+1. Verfiy that the server is a member of all segments:
 
   ```shell-session
   $ consul members
@@ -118,7 +118,7 @@ server    192.168.4.159:8301    alive   server   1.14+ent  2         dc1  defaul
 client1   192.168.4.159:8447    alive   client   1.14+ent  2         dc1  default    alpha
 ```
 
-</CodeBlockConfig>
+</CodeBlockConfig> 
 
 You can also pass the name of a segment in the `-segment` flag to view agents in a specific segment. Note that server agents display their LAN listener port for the specified segment the segment filter applied. In the following example, the command returns port `8303` for alpha, rather than for the `<default>` segment port:
 
@@ -133,18 +133,18 @@ client1      10.20.10.21:8303   alive   client  1.14+ent  2         dc1  alpha
 
 </CodeBlockConfig>
 
-Refer to the [`members`](/consul/commands/members) documentation for additional information.
+Refer to the [`members`](/consul/commands/members) documentation for additional information. 
 
 </Tab>
 
 <Tab heading="API">
 
-Call the `/agent/members` API endpoint to view members that the agent sees in the cluster gossip pool.
+Call the `/agent/members` API endpoint to view members that the agent sees in the cluster gossip pool. 
 
 <CodeBlockConfig highlight="21">
 
 ```shell-session
-$ curl http://127.0.0.1:8500/v1/agent/members?segment=alpha
+$ curl http://127.0.0.1:8500/v1/agent/members?segment=alpha 
 
 {
    "Addr" : "192.168.4.163",
@@ -179,7 +179,7 @@ Refer to the [`/agent/members` API endpoint documentation](/consul/api-docs/agen
 </Tab>
 <Tab heading="UI">
 
-If the UI is enabled in your agent configuration, the segment name appears in the node’s Metadata tab.
+If the UI is enabled in your agent configuration, the segment name appears in the node’s Metadata tab. 
 
 1. Open the URL for the UI. By default, the UI is `localhost:8500`.
 1. Click **Node** in the sidebar and click on the name of the client agent you want to check.
@@ -191,4 +191,4 @@ If the UI is enabled in your agent configuration, the segment name appears in th
 
 ## Related resources
 
-You can also create and run a prepared query to query for additional information about the services registered to client nodes. Prepared queries are HTTP API endpoint features that enable you to run complex queries of Consul nodes. Refer [Prepared Query HTTP Endpoint](/consul/api-docs/query) for usage.
+You can also create and run a prepared query to query for additional information about the services registered to client nodes. Prepared queries are HTTP API endpoint features that enable you to run complex queries of Consul nodes. Refer [Prepared Query HTTP Endpoint](/consul/api-docs/query) for usage.
\ No newline at end of file
diff --git a/website/content/docs/enterprise/network-segments/network-segments-overview.mdx b/website/content/docs/enterprise/network-segments/network-segments-overview.mdx
index 521bdf4e3e5a1..2cae25636c582 100644
--- a/website/content/docs/enterprise/network-segments/network-segments-overview.mdx
+++ b/website/content/docs/enterprise/network-segments/network-segments-overview.mdx
@@ -48,9 +48,9 @@ use [Network Areas (Enterprise)](/consul/docs/enterprise/federation).
 
 Network segments are a subset of other Consul networking models. Understanding the broader models will help you segment your network. Refer to [Architecture Overview](/consul/docs/architecture) for additional information about the following concepts.
 
-### Clusters
+### Clusters 
 
-You can segment networks within a Consul _cluster_. A cluster is one or more Consul servers that form a Raft quorum and one or more Consul clients that are members of the same [datacenter](/consul/docs/agent/config/cli-flags#_datacenter). The cluster is sometimes called the _local cluster_.  Consul clients discover and make RPC requests to Consul servers in their local cluster through the gossip mechanism. Consul CE uses LAN gossip for intra-cluster communication between agents.
+You can segment networks within a Consul _cluster_. A cluster is one or more Consul servers that form a Raft quorum and one or more Consul clients that are members of the same [datacenter](/consul/docs/agent/config/cli-flags#_datacenter). The cluster is sometimes called the _local cluster_.  Consul clients discover and make RPC requests to Consul servers in their local cluster through the gossip mechanism. Consul OSS uses LAN gossip for intra-cluster communication between agents.
 
 ### LAN gossip pool
 
@@ -58,4 +58,4 @@ A set of fully-connected Consul agents is a _LAN gossip pool_. LAN gossip pools
 
 ## Network segments versus network areas
 
-Network segments enable you to operate a Consul datacenter without full mesh connectivity between agents using a LAN gossip pool. To federate multiple Consul datacenters without full mesh connectivity between all server agents in all datacenters, use [network areas](/consul/docs/enterprise/federation). Network areas are a Consul Enterprise capability.
+Network segments enable you to operate a Consul datacenter without full mesh connectivity between agents using a LAN gossip pool. To federate multiple Consul datacenters without full mesh connectivity between all server agents in all datacenters, use [network areas](/consul/docs/enterprise/federation). Network areas are a Consul Enterprise capability.
\ No newline at end of file
diff --git a/website/content/docs/enterprise/sentinel.mdx b/website/content/docs/enterprise/sentinel.mdx
new file mode 100644
index 0000000000000..3fea0c8a9d502
--- /dev/null
+++ b/website/content/docs/enterprise/sentinel.mdx
@@ -0,0 +1,24 @@
+---
+layout: docs
+page_title: Sentinel in Consul (Enterprise)
+description: >-
+  Sentinel is an access-control-policy-as-code framework and language. Learn how Consul can use Sentinel policies to extend the ACL system's capabilities and further secure your clusters by controlling key-value (KV) store write access.
+---
+
+# Sentinel in Consul
+
+<EnterpriseAlert>
+
+This feature requires
+HashiCorp Cloud Platform (HCP) or self-managed Consul Enterprise.
+Refer to the [enterprise feature matrix](/consul/docs/enterprise#consul-enterprise-feature-availability) for additional information.
+
+</EnterpriseAlert>
+
+Sentinel policies extend the ACL system in Consul beyond static "read", "write",
+and "deny" policies to support full conditional logic and integration with
+external systems. Reference the [Sentinel documentation](https://docs.hashicorp.com/sentinel/concepts) for high-level Sentinel concepts.
+
+To get started with Sentinel in Consul,
+[read the general documentation](https://docs.hashicorp.com/sentinel/consul) or
+[Consul documentation](/consul/docs/agent/sentinel).
diff --git a/website/content/docs/integrate/download-tools.mdx b/website/content/docs/integrate/download-tools.mdx
index fb8fb8845ac5a..71ad08504a1ce 100644
--- a/website/content/docs/integrate/download-tools.mdx
+++ b/website/content/docs/integrate/download-tools.mdx
@@ -53,7 +53,7 @@ These Consul tools are created and managed by the amazing members of the Consul
 - [Gonsul](https://github.com/miniclip/gonsul) - A Git to Consul standalone tool made in Go. Updates Consul KV from a repo with multiple strategies.
 - [gradle-consul-plugin](https://github.com/amirkibbar/red-apple) - A Consul Gradle plugin
 - [hashi-ui](https://github.com/jippi/hashi-ui) - A modern user interface for the Consul and Nomad
-- [HashiBox](https://github.com/nunchistudio/hashibox) - Vagrant environment to simulate highly-available cloud with Consul, Nomad, Vault, and optional support for Waypoint. This supports both Consul CE and Enterprise.
+- [HashiBox](https://github.com/nunchistudio/hashibox) - Vagrant environment to simulate highly-available cloud with Consul, Nomad, Vault, and optional support for Waypoint. OSS & Enterprise supported.
 - [Jenkins Consul Plugin](https://plugins.jenkins.io/consul) - Jenkins plugin for service discovery and K/V store
 - [marathon-consul](https://github.com/allegro/marathon-consul) - Service registry bridge for Marathon
 - [marathon-consul](https://github.com/CiscoCloud/marathon-consul) - Bridge from Marathon apps to the Consul K/V store
diff --git a/website/content/docs/integrate/partnerships.mdx b/website/content/docs/integrate/partnerships.mdx
index 024ceeaefc772..50188f07946f7 100644
--- a/website/content/docs/integrate/partnerships.mdx
+++ b/website/content/docs/integrate/partnerships.mdx
@@ -9,7 +9,7 @@ description: >-
 
 The HashiCorp Consul Integration Program enables prospective partners to build integrations with HashiCorp Consul that are reviewed and verified by HashiCorp. You can integrate with any of the following Consul versions: 
 
-- **Self-Managed**. Community Edition, always free
+- **Self-Managed**. Open source, always free
 - **HashiCorp Cloud Platform (HCP)**. A hosted version of Consul managed in the cloud
 - **Consul Enterprise**. Self-managed, with additional features for custom deployments
 
@@ -17,7 +17,7 @@ The program is intended to be largely self-service with links to resources, code
 
 ## Categories of Consul Integrations
 
-By leveraging Consul's RESTful HTTP API system, prospective partners are able to build extensible integrations at the data plane, platform, and the infrastructure layer to extend Consul's functionalities. These integrations can be performed both with the community edition of Consul, Consul Enterprise, and HCP Consul.
+By leveraging Consul's RESTful HTTP API system, prospective partners are able to build extensible integrations at the data plane, platform, and the infrastructure layer to extend Consul's functionalities. These integrations can be performed both with the open source version of Consul, Consul Enterprise, and HCP Consul. 
 
 **The Consul ecosystem of integrations:**
 
@@ -99,7 +99,7 @@ Here are links to resources, documentation, examples and best practices to guide
 
 - [Splunk SignalFX OpenTelemetry integration with Consul](https://docs.splunk.com/Observability/gdi/consul/consul.html)
 - [Ship HashiCorp Consul metrics with OpenTelemetry to Logz.io](https://docs.logz.io/shipping/prometheus-sources/consul.html)
-- [Ingest Consul metrics through OpenTelemetry into Lightstep Observability](https://docs.lightstep.com/integrations/ingest-metrics-consul)
+- [Ingest Consul metrics through OpenTelemetry into Lightstep Observability](https://docs.lightstep.com/docs/ingest-metrics-consul)
 
 **Logging and Alerts**
 
diff --git a/website/content/docs/internals/index.mdx b/website/content/docs/internals/index.mdx
index c4a1d08f6b974..20b3c805710eb 100644
--- a/website/content/docs/internals/index.mdx
+++ b/website/content/docs/internals/index.mdx
@@ -19,7 +19,7 @@ Please review the following documentation to understand how Consul works.
 - [Sessions](/consul/docs/security/acl/auth-methods/oidc)
 - [Anti-Entropy](/consul/docs/architecture/anti-entropy)
 - [Security Model](/consul/docs/security)
-- [Discovery Chain](/consul/docs/connect/manage-traffic/discovery-chain)
+- [Discovery Chain](/consul/docs/connect/l7-traffic/discovery-chain)
 
 You should also be familiar with [Jepsen testing](/consul/docs/architecture/jepsen), before deploying
 a production datacenter.
diff --git a/website/content/docs/intro/index.mdx b/website/content/docs/intro/index.mdx
index 42655814cecb9..90a1759fe2333 100644
--- a/website/content/docs/intro/index.mdx
+++ b/website/content/docs/intro/index.mdx
@@ -10,9 +10,9 @@ description: >-
 HashiCorp Consul is a service networking solution that enables teams to manage secure network connectivity between services and across on-prem and multi-cloud environments and runtimes. Consul offers service discovery, service mesh, traffic management, and automated updates to network infrastructure device. You can use these features individually or together in a single Consul deployment.
 
 > **Hands-on**: Complete the Getting Started tutorials to learn how to deploy Consul:
-- [Get Started on Kubernetes](/consul/tutorials/get-started-kubernetes)
-- [Get Started on VMs](/consul/tutorials/get-started-vms)
-- [HashiCorp Cloud Platform (HCP) Consul](/consul/tutorials/get-started-hcp)
+- [Get Started on Kubernetes](/consul/tutorials/gs-consul-service-mesh)
+- [Get Started on VMs](/consul/tutorials/getting-started)
+- [HashiCorp Cloud Platform (HCP) Consul](/consul/tutorials/cloud-get-started)
 
 ## How does Consul work?
 
@@ -75,7 +75,7 @@ Rolling out changes can be risky, especially in complex network environments. Up
 
 ## Consul Enterprise
 
-HashiCorp offers core Consul functionality for free in the community edition, which is ideal for smaller businesses and teams that want to pilot Consul within their organizations. As your business grows, you can upgrade to Consul Enterprise, which offers additional capabilities designed to address organizational complexities of collaboration, operations, scale, and governance.
+HashiCorp offers core Consul functionality for free in the open source version, which is ideal for smaller businesses and teams that want to pilot Consul within their organizations. As your business grows, you can upgrade to Consul Enterprise, which offers additional capabilities designed to address organizational complexities of collaboration, operations, scale, and governance.  
 
 ### HCP Consul
 
diff --git a/website/content/docs/k8s/annotations-and-labels.mdx b/website/content/docs/k8s/annotations-and-labels.mdx
index 4e4177bc7206f..31c4f9d391939 100644
--- a/website/content/docs/k8s/annotations-and-labels.mdx
+++ b/website/content/docs/k8s/annotations-and-labels.mdx
@@ -81,8 +81,7 @@ The following Kubernetes resource annotations could be used on a pod to control
   local port to listen for those connections. When transparent proxy is enabled,
   this annotation is optional. This annotation can be either _labeled_ or _unlabeled_. We recommend the labeled format because it has a more consistent syntax and can be used to reference cluster peers as upstreams.
 
-    You cannot reference auto-generated environment variables when the upstream annotation contains a dot. This is because Consul also renders the environment variables to include a dot. For example, Consul renders the variables generated for `static-server.svc:8080` as `STATIC-SERVER.SVC_CONNECT_SERVICE_HOST` and `STATIC_SERVER.SVC_CONNECT_SERVICE_PORT`, which makes the variables unusable.
-    - **Labeled**:
+ - **Labeled**:
 
       The labeled annotation format allows you to reference any service as an upstream. You can specify a Consul Enterprise namespace. You can also specify an admin partition in the same datacenter, a cluster peer, or a WAN-federated datacenter.
 
@@ -92,38 +91,38 @@ The following Kubernetes resource annotations could be used on a pod to control
         annotations:
           "consul.hashicorp.com/connect-service-upstreams":"[service-name].svc:[port]"
         ```
-
+      
       - Peer or datacenter: Place the peer or datacenter after `svc.` followed by either `peer` or `dc` and the port number.
-
+        
         ```yaml
         annotations:
           "consul.hashicorp.com/connect-service-upstreams":"[service-name].svc.[service-peer].peer:[port]"
         ```
-
+        
         ```yaml
         annotations:
           "consul.hashicorp.com/connect-service-upstreams":"[service-name].svc.[service-dc].dc:[port]"
         ```
-
+      
       - Namespace (requires Consul Enterprise): Place the namespace after `svc.` followed by `ns` and the port number.
-
+        
         ```yaml
         annotations:
           "consul.hashicorp.com/connect-service-upstreams":"[service-name].svc.[service-namespace].ns:[port]"
         ```
-
+        
         When namespaces are enabled, you must include the namespace in the annotation before specifying a cluster peer, WAN-federated datacenter, or admin partition in the same datacenter.
-
+        
         ```yaml
         annotations:
           "consul.hashicorp.com/connect-service-upstreams":"[service-name].svc.[service-namespace].ns.[service-peer].peer:[port]"
         ```
-
+        
         ```yaml
         annotations:
           "consul.hashicorp.com/connect-service-upstreams":"[service-name].svc.[service-namespace].ns.[service-partition].ap:[port]"
         ```
-
+        
         ```yaml
         annotations:
           "consul.hashicorp.com/connect-service-upstreams":"[service-name].svc.[service-namespace].ns.[service-dc].dc:[port]"
@@ -134,14 +133,9 @@ The following Kubernetes resource annotations could be used on a pod to control
 
       - Service name: Place the service name at the beginning of the annotation to specify the upstream service. You also have the option to append the WAN federated datacenter where the service is deployed.
 
-        ```yaml
-        annotations:
-          "consul.hashicorp.com/connect-service-upstreams":"[service-name]:[port]:[optional datacenter]"
-        ```
-
       - Namespace: Upstream services may be running in a different namespace. Place
       the upstream namespace after the service name. For additional details about configuring the injector, refer to [Consul Enterprise namespaces](#consul-enterprise-namespaces) .
-
+        
         ```yaml
         annotations:
           "consul.hashicorp.com/connect-service-upstreams":"[service-name].[service-namespace]:[port]:[optional datacenter]"
@@ -159,7 +153,7 @@ The following Kubernetes resource annotations could be used on a pod to control
         annotations:
           "consul.hashicorp.com/connect-service-upstreams":"[service-name].[service-namespace].[service-partition]:[port]:[optional datacenter]"
         ```
-
+        
       - Prepared queries: To reference a [prepared query](/consul/api-docs/query) in an upstream annotation, prepend the annotation
         with `prepared_query` and then invoke the name of the query.
 
@@ -167,7 +161,7 @@ The following Kubernetes resource annotations could be used on a pod to control
         annotations:
           'consul.hashicorp.com/connect-service-upstreams': 'prepared_query:[query name]:[port]'
         ```
-
+        
     - **Multiple upstreams**: Delimit multiple services or upstreams with commas. You can specify any of the unlabeled, labeled, or prepared query formats when using the supported versions for the formats.
 
       ```yaml
@@ -240,12 +234,6 @@ The following Kubernetes resource annotations could be used on a pod to control
   - `consul.hashicorp.com/consul-sidecar-memory-limit` - Override the default memory limit.
   - `consul.hashicorp.com/consul-sidecar-memory-request` - Override the default memory request.
 
-- `consul.hashicorp.com/enable-sidecar-proxy-lifecycle` - Override the default Helm value [`connectInject.sidecarProxy.lifecycle.defaultEnabled`](/consul/docs/k8s/helm#v-connectinject-sidecarproxy-lifecycle-defaultenabled)
-- `consul.hashicorp.com/enable-sidecar-proxy-shutdown-drain-listeners` - Override the default Helm value [`connectInject.sidecarProxy.lifecycle.defaultEnableShutdownDrainListeners`](/consul/docs/k8s/helm#v-connectinject-sidecarproxy-lifecycle-defaultenableshutdowndrainlisteners)
-- `consul.hashicorp.com/sidecar-proxy-lifecycle-shutdown-grace-period-seconds` - Override the default Helm value [`connectInject.sidecarProxy.lifecycle.defaultShutdownGracePeriodSeconds`](/consul/docs/k8s/helm#v-connectinject-sidecarproxy-lifecycle-defaultshutdowngraceperiodseconds)
-- `consul.hashicorp.com/sidecar-proxy-lifecycle-graceful-port` - Override the default Helm value [`connectInject.sidecarProxy.lifecycle.defaultGracefulPort`](/consul/docs/k8s/helm#v-connectinject-sidecarproxy-lifecycle-defaultgracefulport)
-- `consul.hashicorp.com/sidecar-proxy-lifecycle-graceful-shutdown-path` - Override the default Helm value [`connectInject.sidecarProxy.lifecycle.defaultGracefulShutdownPath`](/consul/docs/k8s/helm#v-connectinject-sidecarproxy-lifecycle-defaultgracefulshutdownpath)
-
 - `consul.hashicorp.com/enable-metrics` - Override the default Helm value [`connectInject.metrics.defaultEnabled`](/consul/docs/k8s/helm#v-connectinject-metrics-defaultenabled).
 - `consul.hashicorp.com/enable-metrics-merging` - Override the default Helm value [`connectInject.metrics.defaultEnableMerging`](/consul/docs/k8s/helm#v-connectinject-metrics-defaultenablemerging).
 - `consul.hashicorp.com/merged-metrics-port` - Override the default Helm value [`connectInject.metrics.defaultMergedMetricsPort`](/consul/docs/k8s/helm#v-connectinject-metrics-defaultmergedmetricsport).
@@ -288,21 +276,21 @@ Resource labels could be used on a Kubernetes service to control connect-inject
   registration to ignore all services except for the one which should be used for routing requests
   using Consul.
 
-## Service Sync
+## Service Sync 
 
 ### Annotations
 
 The following Kubernetes resource annotations could be used on a pod to [Service Sync](https://developer.hashicorp.com/consul/docs/k8s/service-sync) behavior:
 
-- `consul.hashicorp.com/service-sync`: If this is set to `true`, then the Kubernetes service is explicitly configured to be synced to Consul.
+- `consul.hashicorp.com/service-sync`: If this is set to `true`, then the Kubernetes service is explicitly configured to be synced to Consul.  
 
   ```yaml
   annotations:
     'consul.hashicorp.com/service-sync': 'true'
   ```
 
-- `consul.hashicorp.com/service-port`: Configures the port to register to the Consul Catalog for the Kubernetes service. The annotation value may be a name of a port (recommended) or an exact port value. Refer to [service ports](https://developer.hashicorp.com/consul/docs/k8s/service-sync#service-ports) for more information.
-
+- `consul.hashicorp.com/service-port`: Configures the port to register to the Consul Catalog for the Kubernetes service. The annotation value may be a name of a port (recommended) or an exact port value. Refer to [service ports](https://developer.hashicorp.com/consul/docs/k8s/service-sync#service-ports) for more information. 
+ 
   ```yaml
   annotations:
     'consul.hashicorp.com/service-port': 'http'
@@ -322,7 +310,7 @@ The following Kubernetes resource annotations could be used on a pod to [Service
     'consul.hashicorp.com/service-meta-KEY': 'value'
   ```
 
-- `consul.hashicorp.com/service-weight:` - Configures ability to support weighted loadbalancing by service annotation for Catalog Sync. The integer provided will be applied as a weight for the `passing` state for the health of the service. Refer to [weights](/consul/docs/services/configuration/services-configuration-reference#weights) in service configuration for more information on how this is leveraged for services in the Consul catalog.
+- `consul.hashicorp.com/service-weight:` - Configures ability to support weighted loadbalancing by service annotation for Catalog Sync. The integer provided will be applied as a weight for the `passing` state for the health of the service. Refer to [weights](/consul/docs/services/configuration/services-configuration-reference#weights) in service configuration for more information on how this is leveraged for services in the Consul catalog. 
 
   ```yaml
   annotations:
diff --git a/website/content/docs/k8s/compatibility.mdx b/website/content/docs/k8s/compatibility.mdx
index 637e2ef051851..5f2de78ba1c14 100644
--- a/website/content/docs/k8s/compatibility.mdx
+++ b/website/content/docs/k8s/compatibility.mdx
@@ -13,17 +13,17 @@ For every release of Consul on Kubernetes, a Helm chart, `consul-k8s-control-pla
 
 Consul Kubernetes versions all of its components (`consul-k8s` CLI, `consul-k8s-control-plane`, and Helm chart) with a single semantic version. When installing or upgrading to a specific versions, ensure that you are using the correct Consul version with the compatible Helm chart or `consul-k8s` CLI.
 
-| Consul version | Compatible `consul-k8s` versions | Compatible Kubernetes versions | Compatible OpenShift versions |
-| -------------- | -------------------------------- | -------------------------------| ----------------------------- |
-| 1.16.x         | 1.2.x                            | 1.24.x - 1.27.x                | 4.11.x - 4.14.x               |
-| 1.15.x         | 1.1.x                            | 1.23.x - 1.26.x                | 4.10.x - 4.13.x               |
-| 1.14.x         | 1.0.x                            | 1.22.x - 1.25.x                | 4.9.x - 4.12.x                |
+| Consul version | Compatible `consul-k8s` versions | Compatible Kubernetes versions |
+| -------------- | -------------------------------- | -------------------------------|
+| 1.15.x         | 1.1.x                            | 1.23.x - 1.26.x                |
+| 1.14.x         | 1.0.x                            | 1.22.x - 1.25.x                |
+| 1.13.x         | 0.49.x                           | 1.21.x - 1.24.x                |
 
 ### Version-specific upgrade requirements
 
 As of Consul v1.14.0, Kubernetes deployments use [Consul Dataplane](/consul/docs/connect/dataplane) instead of client agents. If you upgrade Consul from a version that uses client agents to a version that uses dataplanes, you must follow specific steps to update your Helm chart and remove client agents from the existing deployment. Refer to [Upgrading to Consul Dataplane](/consul/docs/k8s/upgrade#upgrading-to-consul-dataplane) for more information.
 
-The v1.0.0 release of the Consul on Kubernetes Helm chart also introduced a change to the [`externalServers[].hosts` parameter](/consul/docs/k8s/helm#v-externalservers-hosts). Previously, you were able to enter a provider lookup as a string in this field. Now, you must include `exec=` at the start of a string containing a provider lookup. Otherwise, the string is treated as a DNS name. Refer to the [`go-netaddrs`](https://github.com/hashicorp/go-netaddrs) library and command line tool for more information.
+The v1.0.0 release of the Consul on Kubernetes Helm chart also introduced a change to the [`externalServers[].hosts` parameter](/consul/docs/k8s/helm#v-externalservers-hosts). Previously, you were able to enter a provider lookup as a string in this field. Now, you must include `exec=` at the start of a string containing a provider lookup. Otherwise, the string is treated as a DNS name. Refer to the [`go-netaddrs` library and command line tool](https://github.com/hashicorp/go-netaddrs) for more information.
 
 ## Supported Envoy versions
 
@@ -41,7 +41,10 @@ Starting with Consul K8s 0.39.0 and Consul 1.11.x, Consul Kubernetes supports th
 
 ### Red Hat OpenShift
 
-You can enable support for Red Hat OpenShift by setting `enabled: true` in the `global.openshift` stanza. Refer to the [Deploy Consul on RedHat OpenShift tutorial](https://developer.hashicorp.com/consul/tutorials/kubernetes/kubernetes-openshift-red-hat) for instructions on deploying to OpenShift. 
+Consul Kubernetes delivered Red Hat OpenShift support starting with Consul Helm chart version 0.25.0 for Consul 1.8.4. Please note the following details regarding OpenShift support.
+
+- Red Hat OpenShift is only supported for OpenShift 4.4.x and above.
+- Only the default CNI Plugin, [OpenShift SDN CNI Plugin](https://docs.openshift.com/container-platform/4.9/networking/openshift_sdn/about-openshift-sdn.html) is currently supported.
 
 ### VMware Tanzu Kubernetes Grid and Tanzu Kubernetes Grid Integrated Edition
 
diff --git a/website/content/docs/k8s/connect/cluster-peering/tech-specs.mdx b/website/content/docs/k8s/connect/cluster-peering/tech-specs.mdx
index 2d27a4f369fc9..cfe4ba7aebc5d 100644
--- a/website/content/docs/k8s/connect/cluster-peering/tech-specs.mdx
+++ b/website/content/docs/k8s/connect/cluster-peering/tech-specs.mdx
@@ -41,7 +41,7 @@ Refer to the following example Helm configuration:
 ```yaml
 global:
   name: consul
-  image: "hashicorp/consul:1.16.0"
+  image: "hashicorp/consul:1.14.1"
   peering:
     enabled: true
   tls:
@@ -166,4 +166,4 @@ If ACLs are enabled, you must add tokens to grant the following permissions:
 
 - Grant `service:write` permissions to services that define mesh gateways in their server definition.
 - Grant `service:read` permissions for all services on the partition.
-- Grant `mesh:write` permissions to the mesh gateways that participate in cluster peering connections. This permission allows a leaf certificate to be issued for mesh gateways to terminate TLS sessions for HTTP requests.
+- Grant `mesh:write` permissions to the mesh gateways that participate in cluster peering connections. This permission allows a leaf certificate to be issued for mesh gateways to terminate TLS sessions for HTTP requests.
\ No newline at end of file
diff --git a/website/content/docs/k8s/connect/cluster-peering/usage/create-sameness-groups.mdx b/website/content/docs/k8s/connect/cluster-peering/usage/create-sameness-groups.mdx
deleted file mode 100644
index c81c3c2b11e68..0000000000000
--- a/website/content/docs/k8s/connect/cluster-peering/usage/create-sameness-groups.mdx
+++ /dev/null
@@ -1,294 +0,0 @@
----
-page_title: Create sameness groups
-description: |-
-  Learn how to create sameness groups between partitions and cluster peers on Kubernetes so that Consul can identify instances of the same service across partitions and datacenters.
----
-
-# Create sameness groups on Kubernetes
-
-This topic describes how to create a sameness group, which designates a set of admin partitions as functionally identical in a Consul deployment running Kubernetes. Adding an admin partition to a sameness group enables Consul to recognize services registered to remote partitions with cluster peering connections as instances of the same service when they share a name and Consul namespace.
-
-For information about configuring a failover strategy using sameness groups, refer to [Failover with sameness groups](/consul/docs/connect/manage-traffic/failover/sameness).
-
-## Overview
-
-Sameness groups are a user-defined set of partitions with identical configurations, includingcustom resource definitions (CRDs) for service and proxy defaults. Partitions on separate clusters should have an established cluster peering connection in order to recognize each other.
-
-To create and use sameness groups in your network, complete the following steps:
-
-- **Create sameness group custom resource definitions (CRDs) for each member of the group**. For each partition that you want to include in the sameness group, you must write and apply a sameness group CRD that defines the group’s members from that partition’s perspective. Refer to the [sameness group configuration entry reference](/consul/docs/connect/config-entries/sameness-group) for details on configuration hierarchy, default values, and specifications.
-- **Export services to members of the sameness group**. You must write and apply an exported services CRD that makes the partition’s services available to other members of the group. Refer to [exported services configuration entry reference](/consul/docs/connect/config-entries/exported-services) for additional specification information.
-- **Create service intentions for each member of the sameness group**. For each partition that you want to include in the sameness group, you must write and apply service intentions CRDs to authorize traffic to your services from all members of the group. Refer to the [service intentions configuration entry reference](/consul/docs/connect/config-entries/service-intentions) for additional specification information.
-
-## Requirements
-
-- All datacenters where you want to create sameness groups must run Consul v1.16 or later. Refer to [upgrade instructions](/consul/docs/k8s/upgrade) for more information about how to upgrade your deployment.
-- A [Consul Enterprise license](/consul/docs/enterprise/license/overview) is required.
-
-### Before you begin
-
-Before creating a sameness group, take the following actions to prepare your network:
-
-#### Check Consul namespaces and service naming conventions
-
-Sameness groups are defined at the partition level. Consul assumes all partitions in the group have identical configurations, including identical service names and identical Consul namespaces. This behavior occurs even when two partitions in the group contain functionally different services that share a common name and namespace. For example, if distinct services both named `api` were registered to different members of a sameness group, it could lead to errors because requests may be sent to the incorrect service.
-
-To prevent errors, check the names of the services deployed to your network and the namespaces they are deployed in. Pay particular attention to the default namespace to confirm that services have unique names. If different services share a name, you should either change one of the service’s names or deploy one of the services to a different namespace.
-
-#### Deploy mesh gateways for each partition
-
-Mesh gateways are required for cluster peering connections and recommended to secure cross-partition traffic in a single datacenter. Therefore, we recommend securing your network, and especially your production environment, by deploying mesh gateways to each datacenter. Refer to [mesh gateways specifications](/consul/docs/k8s/connect/cluster-peering/tech-specs#mesh-gateway-specifications) for more information about configuring mesh gateways.
-
-#### Establish cluster peering relationships between remote partitions
-
-You must establish connections with cluster peers before you can create a sameness group that includes them. A cluster peering connection exists between two admin partitions in different datacenters, and each connection between two partitions must be established separately with each peer. Refer to [establish cluster peering connections](/consul/docs/k8s/connect/cluster-peering/usage/establish-peering) for step-by-step instructions.
-
-You can establish and manage cluster peering relationships between all of your self-managed clusters using [HCP Consul Central](/hcp/docs/consul/concepts/consul-central). For more information, refer to [cluster peering global view](/hcp/docs/consul/monitor/consul-central/global-views#cluster-peering) in the HCP documentation.
-
-To establish cluster peering connections and define a group as part of the same workflow, follow instructions up to [Export services between clusters](/consul/docs/k8s/connect/cluster-peering/usage/establish-peering#export-services-between-clusters). You can use the same exported services and service intention configuration entries to establish the cluster peering connection and create the sameness group.
-
-## Create a sameness group
-
-To create a sameness group, you must write and apply a set of three CRDs for each partition that is a member of the group:
-
-- Sameness group CRDs: Define the sameness group from each partition’s perspective.
-- Exported services CRDs: Make services available to other partitions in the group.
-- Service intentions CRDs: Authorize traffic between services across partitions.
-
-### Define the sameness group from each partition’s perspective
-
-To define a sameness group for a partition, create a [sameness group CRD](/consul/docs/connect/config-entries/sameness-group) that describes the partitions and cluster peers that are part of the group. Typically, this order follows this pattern:
-
-1. The local partition
-1. Other partitions in the same datacenter
-1. Partitions with established cluster peering relationships
-
-If you want all services to failover to other instances in the sameness group by default, set `spec.defaultForFailover=true` and list the group members in the order you want to use in a failover scenario. Refer to [failover with sameness groups](/consul/docs/connect/manage-traffic/failover/sameness) for more information.
-
-Be aware that the sameness group CRDs are different for each partition. The following example demonstrates how to format three different CRDs for three partitions that are part of the sameness group `product-group` when Partition 1 and Partition 2 are in DC1, and the third partition is Partition 1 in DC2:
-
-<CodeTabs tabs={[ "dc1-partition-1", "dc1-partition-2", "dc2-partition-1" ]}>
-
-<CodeBlockConfig filename="product-group.yaml" hideClipboard lineNumbers highlight="4,8-10">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: SamenessGroup 
-metadata:
-  name: product-group
-spec:
-  defaultForFailover: true
-  members:                                   
-    - partition: partition-1
-    - partition: partition-2
-    - peer: dc2-partition-1
-```
-
-</CodeBlockConfig>
-
-<CodeBlockConfig filename="product-group.yaml" hideClipboard lineNumbers highlight="4,8-10">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: SamenessGroup 
-metadata:
-  name: product-group
-spec:
-  defaultForFailover: true
-  members:                                   
-    - partition: partition-2
-    - partition: partition-1
-    - peer: dc2-partition-1  
-```
-
-</CodeBlockConfig>
-
-<CodeBlockConfig filename="product-group.yaml" hideClipboard lineNumbers highlight="4,8-10">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: SamenessGroup 
-metadata:
-  name: product-group
-spec:
-  defaultForFailover: true
-  members:                                   
-    - partition: partition-1
-    - peer: dc1-partition-1
-    - peer: dc2-partition-2
-```
-
-</CodeBlockConfig>
-
-</CodeTabs>
-
-After you create the CRD, apply it to the Consul server with the following `kubectl` CLI command:
-
-```shell-session
-$ kubectl apply -f product-group.yaml
-```
-
-Then, repeat the process to create and apply a CRD for every partition that is a member of the sameness group.
-
-### Export services to other partitions in the sameness group
-
-To make services available to other members of the sameness group, you must write and apply an [exported services CRD](/consul/docs/connect/config-entries/exported-services) for each partition in the group. This CRD exports the local partition's services to the rest of the group members. In each CRD, set the sameness group as the `consumer` for the exported services. You can export multiple services in a single exported services configuration entry.
-
-Because you are configuring the consumer to reference the sameness group instead of listing out each partition and cluster peer, you do not need to edit this configuration again when you add a partition or peer to the group.
-
-The following example demonstrates how to format three different `ExportedServices` CRDs to make a service named `api` deployed to the `store` namespace of each partition available to all other group members:
-
-<CodeTabs tabs={[ "dc1-partition-1", "dc1-partition-2", "dc2-partition-1" ]}>
-
-<CodeBlockConfig hideClipboard lineNumbers highlight="7-10">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-Kind: ExportedServices
-metadata:
-  name: product-group-export
-spec:
-  services:
-    - name: api
-      namespace: store
-      consumers:
-        - samenessGroup: product-group
-```
-
-</CodeBlockConfig>
-
-<CodeBlockConfig hideClipboard lineNumbers highlight="7-10">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-Kind: ExportedServices
-metadata:
-  name: product-group-export
-spec:
-  services:
-    - name: api
-      namespace: store
-      consumers:
-        - samenessGroup: product-group
-```
-
-</CodeBlockConfig>
-
-<CodeBlockConfig hideClipboard lineNumbers highlight="7-10">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-Kind: ExportedServices
-metadata:
-  name: product-group-export
-spec:
-  services:
-    - name: api
-      namespace: store
-      consumers:
-        - samenessGroup: product-group
-```
-
-</CodeBlockConfig>
-
-</CodeTabs>
-
-For more information about exporting services, including examples of CRDs that export multiple services at the same time, refer to the [exported services configuration entry reference](/consul/docs/connect/config-entries/exported-services).
-
-After you create each exported services configuration entry, apply it to the Consul server with the following CLI command:
-
-```shell-session
-$ kubectl apply -f product-group-export.yaml
-```
-
-#### Export services for cluster peers and sameness groups as part of the same workflow
-
-Creating a cluster peering connection between two partitions and then adding the partitions to a sameness group requires that you write and apply two separate exported services CRDs. One CRD exports services to the peer, and a second CRD exports services to other members of the group.
-
-If your goal for peering clusters is to create a sameness group, you can write and apply a single exported services configuration entry by configuring the `services[].consumers` block with the `samenessGroup` field instead of the `peer` field. Be aware that this scenario requires you to write the `SamenessGroup` CRD to Kubernetes before you apply the `ExportedServices` CRD that references the sameness group.
-
-### Create service intentions to authorize traffic between group members
-
-Exporting the service to other members of the sameness group makes the services visible to remote partitions, but you must also create service intentions so that local services are authorized to send and receive traffic from a member of the sameness group.
-
-For each partition that is a member of the group, write and apply a [service intentions CRD](/consul/docs/connect/config-entries/service-intentions) that defines intentions for the services that are part of the group. In the `sources` block of the configuration entry, include the service name, its namespace, the sameness group and grant `allow` permissions.
-
-Because you are using the sameness group in the `sources` block rather than listing out each partition and cluster peer, you do not have to make further edits to the service intentions configuration entries when members are added to or removed from the group.
-
-The following example demonstrates how to format three different `ServiceIntentions` CRDs to make a service named `api` available to all instances of `payments` deployed in all members of the sameness group including the local partition. In this example, `api` is deployed to the `store` namespace in all three partitions.
-
-<CodeTabs tabs={[ "dc1-partition-1", "dc1-partition-2", "dc2-partition-1" ]}>
-
-<CodeBlockConfig hideClipboard lineNumbers highlight="4,7-10">
-
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceIntentions
-metadata:
-  name: api-intentions
-spec:
-  sources:
-  - name: api
-    action: allow
-    namespace: store
-    samenessGroup: product-group
-```
-
-</CodeBlockConfig>
-
-<CodeBlockConfig hideClipboard lineNumbers highlight="4,7-10">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceIntentions
-metadata:
-  name: api-intentions
-spec:
-  sources:
-  - name: api
-    action: allow
-    namespace: store
-    samenessGroup: product-group
-```
-
-</CodeBlockConfig>
-
-<CodeBlockConfig hideClipboard lineNumbers highlight="4,7-10">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceIntentions
-metadata:
-  name: api-intentions
-spec:
-  sources:
-  - name: api
-    action: allow
-    namespace: store
-    samenessGroup: product-group
-```
-
-</CodeBlockConfig>
-
-</CodeTabs>
-
-Refer to [create and manage intentions](/consul/docs/connect/intentions/create-manage-intentions) for more information about how to create and apply service intentions in Consul.
-
-After you create each service intentions configuration entry, apply it to the Consul server with the following CLI command:
-
-```shell-session
-$ kubectl apply -f api-intentions.yaml
-```
-
-#### Create service intentions for cluster peers and sameness groups  as part of the same workflow
-
-Creating a cluster peering connection between two partitions and then adding the partitions to a sameness group requires that you write and apply two separate service intentions CRDs. One CRD authorizes services for the peer, and a second CRD authorizes services for other members of the group.
-
-If your goal for peering clusters is to create a sameness group, you can write and apply a single service intentions CRD by configuring the `sources` block with the `samenessGroup` field instead of the `peer` field. Be aware that this scenario requires you to write the `SamenessGroup` CRD to Kubernetes before you apply the `ServiceIntentions` CRD that references the sameness group.
-
-## Next steps
-
-When `defaultForFailover=true` in a sameness group CRD, additional upstream configuration is not required.
-
-After creating a sameness group, you can also set up failover between services in a sameness group. Refer to [Failover with sameness groups](/consul/docs/connect/manage-traffic/failover/sameness) for more information.
\ No newline at end of file
diff --git a/website/content/docs/k8s/connect/cluster-peering/usage/establish-peering.mdx b/website/content/docs/k8s/connect/cluster-peering/usage/establish-peering.mdx
index c784b57047131..19e504b95d684 100644
--- a/website/content/docs/k8s/connect/cluster-peering/usage/establish-peering.mdx
+++ b/website/content/docs/k8s/connect/cluster-peering/usage/establish-peering.mdx
@@ -18,8 +18,6 @@ The overall process for establishing a cluster peering connection consists of th
 
 Cluster peering between services cannot be established until all four steps are complete.
 
-Cluster peering between services cannot be established until all four steps are complete. If you want to establish cluster peering connections and create sameness groups at the same time, refer to the guidance in [create sameness groups](/consul/docs/k8s/connect/cluster-peering/usage/create-sameness-groups).
-
 For general guidance for establishing cluster peering connections, refer to [Establish cluster peering connections](/consul/docs/connect/cluster-peering/usage/establish-cluster-peering).
 
 ## Prerequisites
@@ -48,7 +46,7 @@ After you provision a Kubernetes cluster and set up your kubeconfig file to mana
   $ export CLUSTER2_CONTEXT=<CONTEXT for second Kubernetes cluster>
   ```
 
-### Install Consul using Helm and configure peering over mesh gateways 
+### Update the Helm chart
 
 To use cluster peering with Consul on Kubernetes deployments, update the Helm chart with [the required values](/consul/docs/k8s/connect/cluster-peering/tech-specs#helm-requirements). After updating the Helm chart, you can use the `consul-k8s` CLI to apply `values.yaml` to each cluster.
 
@@ -59,7 +57,7 @@ To use cluster peering with Consul on Kubernetes deployments, update the Helm ch
   ```
 
   ```shell-session
-  $ helm install ${HELM_RELEASE_NAME1} hashicorp/consul --create-namespace --namespace consul --version "1.2.0" --values values.yaml --set global.datacenter=dc1 --kube-context $CLUSTER1_CONTEXT
+  $ helm install ${HELM_RELEASE_NAME1} hashicorp/consul --create-namespace --namespace consul --version "1.0.1" --values values.yaml --set global.datacenter=dc1 --kube-context $CLUSTER1_CONTEXT
   ```
 
 1. In `cluster-02`, run the following commands:
@@ -69,14 +67,12 @@ To use cluster peering with Consul on Kubernetes deployments, update the Helm ch
   ```
 
   ```shell-session
-  $ helm install ${HELM_RELEASE_NAME2} hashicorp/consul --create-namespace --namespace consul --version "1.2.0" --values values.yaml --set global.datacenter=dc2 --kube-context $CLUSTER2_CONTEXT
+  $ helm install ${HELM_RELEASE_NAME2} hashicorp/consul --create-namespace --namespace consul --version "1.0.1" --values values.yaml --set global.datacenter=dc2 --kube-context $CLUSTER2_CONTEXT
   ```
 
-1. For both clusters apply the `Mesh` configuration entry values provided in [Mesh Gateway Specifications](/consul/docs/k8s/connect/cluster-peering/tech-specs#mesh-gateway-specifications) to allow establishing peering connections over mesh gateways. 
-
 ### Configure the mesh gateway mode for traffic between services
 
-In Kubernetes deployments, you can configure mesh gateways to use `local` mode so that a service dialing a service in a remote peer dials the local mesh gateway instead of the remote mesh gateway. To configure the mesh gateway mode so that this traffic always leaves through the local mesh gateway, you can use the `ProxyDefaults` CRD.
+In Kubernetes deployments, you can configure mesh gateways to use `local` mode so that a service dialing a service in a remote peer dials the remote mesh gateway instead of the local mesh gateway. To configure the mesh gateway mode so that this traffic always leaves through the local mesh gateway, you can use the `ProxyDefaults` CRD.
 
 1. In `cluster-01` apply the following `ProxyDefaults` CRD to configure the mesh gateway mode.
 
@@ -454,4 +450,4 @@ For Consul Enterprise, the permissions apply to all imported services in the ser
 
 Refer to [Reading servers](/consul/docs/connect/config-entries/exported-services#reading-services) in the `exported-services` configuration entry documentation for example rules.
 
-For additional information about how to configure and use ACLs, refer to [ACLs system overview](/consul/docs/security/acl).
+For additional information about how to configure and use ACLs, refer to [ACLs system overview](/consul/docs/security/acl).
\ No newline at end of file
diff --git a/website/content/docs/k8s/connect/cluster-peering/usage/l7-traffic.mdx b/website/content/docs/k8s/connect/cluster-peering/usage/l7-traffic.mdx
index 0c3b28d693ef2..956298fe3cd9e 100644
--- a/website/content/docs/k8s/connect/cluster-peering/usage/l7-traffic.mdx
+++ b/website/content/docs/k8s/connect/cluster-peering/usage/l7-traffic.mdx
@@ -13,7 +13,7 @@ For general guidance for managing L7 traffic with cluster peering, refer to [Man
 
 ## Service resolvers for redirects and failover
 
-When you use cluster peering to connect datacenters through their admin partitions, you can use [dynamic traffic management](/consul/docs/connect/manage-traffic) to configure your service mesh so that services automatically forward traffic to services hosted on peer clusters.
+When you use cluster peering to connect datacenters through their admin partitions, you can use [dynamic traffic management](/consul/docs/connect/l7-traffic) to configure your service mesh so that services automatically forward traffic to services hosted on peer clusters.
 
 However, the `service-splitter` and `service-router` CRDs do not natively support directly targeting a service instance hosted on a peer. Before you can split or route traffic to a service on a peer, you must define the service hosted on the peer as an upstream service by configuring a failover in a `service-resolver` CRD. Then, you can set up a redirect in a second service resolver to interact with the peer service by name.
 
diff --git a/website/content/docs/k8s/connect/cluster-peering/usage/manage-peering.mdx b/website/content/docs/k8s/connect/cluster-peering/usage/manage-peering.mdx
index 42f8fc59832e7..bc622fe15d381 100644
--- a/website/content/docs/k8s/connect/cluster-peering/usage/manage-peering.mdx
+++ b/website/content/docs/k8s/connect/cluster-peering/usage/manage-peering.mdx
@@ -100,7 +100,7 @@ To end a peering connection in Kubernetes deployments, delete both the `PeeringA
   $ kubectl --context $CLUSTER1_CONTEXT delete --filename acceptor.yaml
   ````
 
-To confirm that you deleted your peering connection in `cluster-01`, query the `/health` HTTP endpoint:
+To confirm that you deleted your peering connection in `cluster-01`, query the the `/health` HTTP endpoint:
 
 1. Exec into the server pod for the first cluster.
 
@@ -114,7 +114,7 @@ To confirm that you deleted your peering connection in `cluster-01`, query the `
   $ export CONSUL_HTTP_TOKEN=<INSERT BOOTSTRAP ACL TOKEN>
   ```
 
-1. Query the `/health` HTTP endpoint. Peered services with deleted connections should no longe appear.
+1. Query the the `/health` HTTP endpoint. Peered services with deleted connections should no longe appear.
 
   ```shell-session
   $ curl "localhost:8500/v1/health/connect/backend?peer=cluster-02"
diff --git a/website/content/docs/k8s/connect/health.mdx b/website/content/docs/k8s/connect/health.mdx
index a3096d5c9cba4..654cb5034245b 100644
--- a/website/content/docs/k8s/connect/health.mdx
+++ b/website/content/docs/k8s/connect/health.mdx
@@ -20,7 +20,7 @@ The Consul health check's state reflects the pod's readiness status.
 1. If the pod is using [transparent proxy mode](/consul/docs/connect/transparent-proxy),
 the mutating webhook redirects all `http` based startup, liveness, and readiness probes in the pod through the Envoy proxy.
 This webhook is defined in the
-[`ExposePaths` configuration](/consul/docs/connect/proxies/proxy-config-reference#expose-paths-configuration-reference)
+[`ExposePaths` configuration](/consul/docs/connect/registration/service-registration#expose-paths-configuration-reference)
 for each probe so that kubelet can access the endpoint through the Envoy proxy.
 
 The mutation behavior can be disabled, by setting either the `consul.hashicorp.com/transparent-proxy-overwrite-probes`
diff --git a/website/content/docs/k8s/connect/index.mdx b/website/content/docs/k8s/connect/index.mdx
index a5ba50fcbb8e3..11acc590d4e07 100644
--- a/website/content/docs/k8s/connect/index.mdx
+++ b/website/content/docs/k8s/connect/index.mdx
@@ -7,17 +7,29 @@ description: >-
 
 # How does Consul Service Mesh Work on Kubernetes?
 
-Consul service mesh automates service-to-service authorization and encryption across your Consul services. You can use service mesh in Kubernetes-orchestrated networks to secure communication between pods as well as communication between pods and external Kubernetes services.
+[Consul service mesh](/consul/docs/connect) is a feature built into to Consul that enables
+automatic service-to-service authorization and connection encryption across
+your Consul services. Consul Service Mesh can be used with Kubernetes to secure pod
+communication with other pods and external Kubernetes services.
+
+The noun _connect_ is used throughout this documentation to refer to the connect
+subsystem that provides Consul's service mesh capabilities.
+Where you encounter the _noun_ connect, it is usually functionality specific to
+service mesh.
 
-## Workflow
+Consul can automatically inject the sidecar running Envoy into pods in
+your cluster, making configuration for Kubernetes automatic.
+This functionality is provided by the
+[consul-k8s project](https://github.com/hashicorp/consul-k8s) and can be
+automatically installed and configured using the
+[Consul Helm chart](/consul/docs/k8s/installation/install#helm-chart-installation).
 
-Consul service mesh is enabled by default when you install Consul on Kubernetes using the Consul Helm chart. Consul also automatically injects sidecars into the pods in your clusters that run Envoy. These sidecar proxies,  called Consul dataplanes, are enabled when `connectInject.default` is set to `false` in the Helm chart. Refer to the following documentation for additional information about these concepts:
+## Usage
 
-- [Installation and Configuration](#installation-and-configuration) in this topic
-- [Consul Helm chart reference](/consul/docs/k8s/helm)
-- [Simplified Service Mesh with Consul Dataplane](/consul/docs/connect/dataplane)
+-> **Important:** As of consul-k8s `v0.26.0` and Consul Helm `v0.32.0`, a Kubernetes
+service is required to run services on the Consul service mesh.
 
-If `connectInject.default` is set to `false` or you want to explicitly enable service mesh sidecar proxy injection for a specific deployment, add the `consul.hashicorp.com/connect-inject` annotation to the pod specification template and set it to `true` when connecting services to the mesh.
+Installing Consul on Kubernetes with [`connect-inject` enabled](/consul/docs/k8s/connect#installation-and-configuration) adds a sidecar to all pods. By default, it enables service mesh functionality with Consul Dataplane by injecting an Envoy proxy. You can also configure Consul to inject a client agent sidecar to connect to your service mesh. Refer to [Simplified Service Mesh with Consul Dataplane](/consul/docs/connect/dataplane) for more information.
 
 ### Service names
 
@@ -25,25 +37,23 @@ When the service is onboarded, the name registered in Consul is set to the name
 
 ### Transparent proxy mode
 
-By default, the Consul service mesh runs in transparent proxy mode. This mode forces inbound and outbound traffic through the sidecar proxy even though the service binds to all interfaces. Transparent proxy infers the location of upstream services using Consul service intentions, and also allows you to use Kubernetes DNS as you normally would for your workloads.
+By default, the Consul service mesh runs in transparent proxy mode. This mode forces inbound and outbound traffic through the sidecar proxy even though the service binds to all interfaces. Transparent proxy infers the location of upstream services using Consul service intentions, and also allows you to use Kubernetes DNS as you normally would for your workloads. 
 
 When transparent proxy mode is enabled, all service-to-service traffic is required to use mTLS. When onboarding new services to service mesh, your network may have mixed mTLS and non-mTLS traffic, which can result in broken service-to-service communication. You can temporarily enable permissive mTLS mode during the onboarding process so that existing mesh services can accept traffic from services that are not yet fully onboarded. Permissive mTLS enables sidecar proxies to access both mTLS and non-mTLS traffic. Refer to [Onboard mesh services in transparent proxy mode](/consul/docs/k8s/connect/onboarding-tproxy-mode) for additional information.
 
-### Kubernetes service mesh workload scenarios
+### Kubernetes service mesh workload scenarios 
 
--> **Note:** A Kubernetes Service is required in order to register services on the Consul service mesh. Consul monitors the lifecycle of the Kubernetes Service and its service instances using the service object. In addition, the Kubernetes service is used to register and de-register the service from Consul's catalog.
+-> **Note:** A Kubernetes Service is required in order to register services on the Consul service mesh. Consul monitors the lifecyle of the Kubernetes Service and its service instances using the service object. In addition, the Kubernetes service is used to register and de-register the service from Consul's catalog. 
 
 The following configurations are examples for registering workloads on Kubernetes into Consul's service mesh in different scenarios. Each scenario provides an example Kubernetes manifest to demonstrate how to use Consul's service mesh with a specific Kubernetes workload type.
 
-- [Kubernetes Pods running as a deployment](#kubernetes-pods-running-as-a-deployment)
-- [Connecting to mesh-enabled Services](#connecting-to-mesh-enabled-services)
-- [Kubernetes Jobs](#kubernetes-jobs)
-- [Kubernetes Pods with multiple ports](#kubernetes-pods-with-multiple-ports)
+ - [Kubernetes Pods running as a deployment](#kubernetes-pods-running-as-a-deployment)
+ - [Connecting to mesh-enabled Services](#connecting-to-mesh-enabled-services)
+ - [Kubernetes Jobs](#kubernetes-jobs)
+ - [Kubernetes Pods with multiple ports](#kubernetes-pods-with-multiple-ports)
 
 #### Kubernetes Pods running as a deployment
 
-The following example shows a Kubernetes configuration that specifically enables service mesh connections for the `static-server` service. Consul starts and registers a sidecar proxy that listens on port 20000 by default and proxies valid inbound connections to port 8080.
-
 <CodeBlockConfig filename="static-server.yaml">
 
 ```yaml
@@ -97,9 +107,41 @@ spec:
 
 </CodeBlockConfig>
 
+The only change for service mesh is the addition of the
+`consul.hashicorp.com/connect-inject` annotation. This enables injection
+for the Pod in this Deployment. The injector can also be
+[configured](/consul/docs/k8s/connect#installation-and-configuration)
+to automatically inject unless explicitly disabled, but the default
+installation requires opt-in using the annotation shown above.
+
+~> **A common mistake** is to set the annotation on the Deployment or
+other resource. Ensure that the injector annotations are specified on
+the _pod specification template_ as shown above.
+
+This will start a sidecar proxy that listens on port `20000` registered
+with Consul and proxies valid inbound connections to port 8080 in the pod.
+To establish a connection to the pod using service mesh, a client must use another mesh
+proxy. The client mesh proxy will use Consul service discovery to find
+all available upstream proxies and their public ports.
+
+In the example above, the server is listening on `:8080`.
+By default, the Consul service mesh runs in [transparent proxy](/consul/docs/connect/transparent-proxy) mode.
+This means that even though the server binds to all interfaces,
+the inbound and outbound connections will automatically go through to the sidecar proxy.
+It also allows you to use Kubernetes DNS like you normally would without the
+Consul Service Mesh.
+
+-> **Note:** As of consul `v1.10.0`, consul-k8s `v0.26.0` and Consul Helm `v0.32.0`,
+all Consul Service Mesh services will run with transparent proxy enabled by default. Running with transparent
+proxy will enforce all inbound and outbound traffic to go through the Envoy proxy.
+
+The service name registered in Consul will be set to the name of the Kubernetes service
+associated with the Pod. This can be customized with the `consul.hashicorp.com/connect-service`
+annotation. If using ACLs, this name must be the same as the Pod's `ServiceAccount` name.a
+
 To establish a connection to the upstream Pod using service mesh, a client must dial the upstream workload using a mesh proxy. The client mesh proxy will use Consul service discovery to find all available upstream proxies and their public ports.
 
-#### Connecting to mesh-enabled Services
+### Connecting to mesh-enabled Services
 
 The example Deployment specification below configures a Deployment that is capable
 of establishing connections to our previous example "static-server" service. The
@@ -167,7 +209,6 @@ upstream. This is analogous to the standard Kubernetes service environment varia
 point instead to the correct local proxy port to establish connections via
 service mesh.
 
-You cannot reference auto-generated environment variables when the upstream annotation contains a dot. This is because Consul also renders the environment variables to include a dot. For example, Consul renders the variables generated for `static-server.svc:8080` as `STATIC-SERVER.SVC_CONNECT_SERVICE_HOST` and `STATIC_SERVER.SVC_CONNECT_SERVICE_PORT`, which makes the variables unusable.
 You can verify access to the static text server using `kubectl exec`.
 Because transparent proxy is enabled by default,
 use Kubernetes DNS to connect to your desired upstream.
@@ -193,7 +234,7 @@ command terminated with exit code 52
 
 Kubernetes Jobs run pods that only make outbound requests to services on the mesh and successfully terminate when they are complete. In order to register a Kubernetes Job with the mesh, you must provide an integer value for the `consul.hashicorp.com/sidecar-proxy-lifecycle-shutdown-grace-period-seconds` annotation. Then, issue a request to the `http://127.0.0.1:20600/graceful_shutdown` API endpoint so that Kubernetes gracefully shuts down the `consul-dataplane` sidecar after the job is complete.
 
-Below is an example Kubernetes manifest that deploys a job correctly.
+Below is an example Kubernetes manifest that deploys a job correctly. 
 
 <CodeBlockConfig filename="test-job.yaml">
 
@@ -244,7 +285,7 @@ spec:
             echo "Started test job"
             sleep 10
             echo "Killing proxy"
-            curl --max-time 2 -s -f -X POST http://127.0.0.1:20600/graceful_shutdown
+            curl --max-time 2 -s -f -XPOST http://127.0.0.1:20600/graceful_shutdown
             sleep 10
             echo "Ended test job"
       serviceAccountName: test-job
@@ -256,12 +297,12 @@ spec:
 Upon completing the job you should be able to verify that all containers are shut down within the pod.
 
 ```shell-session
-$ kubectl get pods
+$ kubectl get pods  
 NAME             READY   STATUS      RESTARTS   AGE
 test-job-49st7   0/2     Completed   0          3m55s
 ```
 
-```shell-session
+```shell-session 
 $ kubectl get job
 NAME       COMPLETIONS   DURATION   AGE
 test-job   1/1           30s        4m31s
diff --git a/website/content/docs/k8s/connect/ingress-gateways.mdx b/website/content/docs/k8s/connect/ingress-gateways.mdx
index 2675214d64a8c..4f8dbe91d8094 100644
--- a/website/content/docs/k8s/connect/ingress-gateways.mdx
+++ b/website/content/docs/k8s/connect/ingress-gateways.mdx
@@ -7,14 +7,7 @@ description: >-
 
 # Configure Ingress Gateways for Consul on Kubernetes
 
-<Note>
-
-Ingress gateway is deprecated and will not be enhanced beyond its current capabilities. Ingress gateway is fully supported
-in this version but will be removed in a future release of Consul.
-
-Consul's API gateway is the recommended alternative to ingress gateway.
-
-</Note>
+-> 1.9.0+: This feature is available in Consul versions 1.9.0 and higher
 
 ~> This topic requires familiarity with [Ingress Gateways](/consul/docs/connect/gateways/ingress-gateway).
 
@@ -69,12 +62,6 @@ Ensure you have the latest consul-helm chart and install Consul via helm using t
 [guide](/consul/docs/k8s/installation/install#installing-consul) while being sure to provide the yaml configuration
 as previously discussed.
 
-The following example installs Consul 1.0.4 using the `values.yaml` configuration:
-
-```shell-session
-$ helm install consul -f values.yaml hashicorp/consul --version 1.0.4 --wait --debug
-```
-
 ## Configuring the gateway
 
 Now that Consul has been installed with ingress gateways enabled,
diff --git a/website/content/docs/k8s/connect/onboarding-tproxy-mode.mdx b/website/content/docs/k8s/connect/onboarding-tproxy-mode.mdx
deleted file mode 100644
index 8dd0ebb17c703..0000000000000
--- a/website/content/docs/k8s/connect/onboarding-tproxy-mode.mdx
+++ /dev/null
@@ -1,296 +0,0 @@
----
-layout: docs
-page_title: Onboard services in transparent proxy mode
-description: Learn how to enable permissive mutual transport layer security (permissive mTLS) so that you can safely add services to your service mesh when transparent proxy is enabled in Kubernetes deployments. 
----
-
-# Onboard services while in transparent proxy mode
-
-This topic describes how to run Consul in permissive mTLS mode so that you can safely onboard existing applications to Consul service mesh when transparent proxy mode is enabled.
-
-## Background
-
-When [transparent proxy mode](/consul/docs/k8s/connect/transparent-proxy) is enabled, all service-to-service traffic is secured by mTLS. Until the services that you want to add to the network are fully onboarded, your network may have a mix of mTLS and non-mTLS traffic, which can result in broken service-to-service communication. This situation occurs because sidecar proxies for existing mesh services reject traffic from services that are not yet onboarded.
-
-You can enable the `permissive` mTLS mode to ensure existing non-mTLS service-to-service traffic is allowed during the onboarding phase. The `permissive` mTLS mode enables sidecar proxies to accept both mTLS and non-mTLS traffic to an application. Using this mode enables you to onboard without downtime and without being required to reconfigure or redeploy your application.
-
-We recommend enabling permissive mTLS as a temporary operating mode. After onboarding is complete, you should reconfigure all services to `strict` mTLS mode to ensure all service-to-service communication is automatically secured by Consul service mesh. 
-
-!> **Security warning**: We recommend that you disable permissive mTLS mode after onboarding services to prevent non-mTLS connections to the service. Intentions are not enforced and encryption is not enabled for non-mTLS connections.
-
-## Workflow
-
-The workflow to configure mTLS settings depends on the applications you are onboarding and the order you intend to onboard them, but the following steps describe the general workflow:
-
-1. **Configure global settings**: Configure the mesh to allow services to send non-mTLS messages to services outside the mesh. Additionally, configure the mesh to let services in the mesh use permissive mTLS mode.
-1. **Enable permissive mTLS mode**: If you are onboarding an upstream service prior to its related downstream services, then enable permissive mTLS mode in the service defaults configuration entry. This allows the upstream service to send encrypted messages from the mesh when you register the service with Consul.
-1. **Configure intentions**: Intentions are controls that authorize traffic between services in the mesh. Transparent proxy uses intentions to infer traffic routes between Envoy proxies. Consul does not enforce intentions for non-mTLS connections made while proxies are in permissive mTLS mode, but intentions are necessary for completing the onboarding process. 
-1. **Register the service**: Create the service definition and configure and deploy its sidecar proxy. 
-1. **Re-secure the mesh**: If you enabled permissive mTLS mode, switch back to strict mTLS mode and revert the global settings to disable non-mTLS traffic in the service mesh.
-
-## Requirements
-
-Permissive mTLS is only supported for services running in transparent proxy mode. Transparent proxy mode is only available on Kubernetes deployments.
-
-## Configure global settings
-
-Configure Consul to allow services that are already in the mesh to send non-mTLS messages to services outside the mesh. You can also Consul to allow services to run in permissive mTLS mode. Set both configurations in the mesh gateway configuration entry, which is the global configuration that defines service mesh proxy behavior.
-
-### Allow outgoing non-mTLS traffic
-
-You can configure a global setting that allows services in the mesh to send non-mTLS messages to services outside the mesh.
-
-Add the `MeshDestinationsOnly` property to the mesh configuration entry and set the property to `false`. If the services belong to multiple admin partitions, you must apply the setting in each partition:
-
-<CodeTabs heading="Allow non-mTLS traffic">
-
-```hcl
-Kind = "mesh"
-
-TransparentProxy {
-  MeshDestinationsOnly = false
-}
-```
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: Mesh
-metadata:
-  name: mesh
-spec:
-  transparentProxy:
-    meshDestinationsOnly: true
-```
-
-```json
-{
-    "Kind": "mesh",
-    "TransparentProxy": [
-        {
-            "MeshDestinationsOnly": false
-        }
-    ]
-}
-```
-
-</CodeTabs>
-
-Alternatively, you can selectively allow outgoing traffic on a per-service basis by configuring [outbound port exclusions](/consul/docs/k8s/connect/transparent-proxy/enable-transparent-proxy#exclude-outbound-ports). This setting excludes outgoing traffic from traffic redirection imposed by transparent proxy. When changing this setting, you must redeploy your application.
-
-### Allow permissive mTLS modes for incoming traffic
-
-Set the `AllowEnablingPermissiveMutualTLS` parameter in the mesh configuration entry to `true` so that services in the mesh _are able_ to use permissive mTLS mode for incoming traffic. The parameter does not direct services to use permissive mTLS. It is a global parameter that allows services to run in permissive mTLS mode.
-
-<CodeTabs heading="Allow permissive mTLS mode">
-
-```hcl
-Kind = "mesh"
-
-AllowEnablingPermissiveMutualTLS = true
-TransparentProxy {
-  MeshDestinationsOnly = false
-}
-```
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: Mesh
-metadata:
-  name: mesh
-spec:
-  allowEnablingPermissiveMutualTLS: true
-  transparentProxy:
-    meshDestinationsOnly: false
-```
-
-
-```json
-{
-    "Kind": "mesh",
-    "AllowEnablingPermissiveMutualTLS": true,
-    "TransparentProxy": [
-        {
-            "MeshDestinationsOnly": false
-        }
-    ]
-}
-```
-
-</CodeTabs>
-
-You can change this setting back to `false` at any time, even if there are services currently running in permissive mode. Doing so allows you to decide at which point during the onboarding process to stop allowing services to use permissive mTLS. When the `MeshDestinationOnly` is set to `false`, you must configure all new services added to the mesh with  `MutualTLSMode=strict` for the Consul to securely route traffic throughout the mesh. 
-
-## Enable permissive mTLS mode 
-
-Depending on the services you are onboarding, you may not need to enable permissive mTLS mode. If the service does not accept incoming traffic or accepts traffic from downstream services that are already part of the service mesh, then permissive mTLS mode is not required to continue. 
-
-To enable permissive mTLS mode for the service, set [`MutualTLSMode=permissive`](/consul/docs/connect/config-entries/service-defaults#mutualtlsmode) in the service defaults configuration entry for the service. The following example shows how to configure this setting for a service named `example-service`.
-
-<CodeTabs heading="Enable permissive mTLS for applicable services">
-
-```hcl
-Kind      = "service-defaults"
-Name      = "example-service"
-
-MutualTLSMode = "permissive"
-```
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceDefaults
-metadata:
-  name: example-service
-spec:
-  mutualTLSMode: "permissive"
-```
-
-```json
-{
-    "Kind": "service-defaults",
-    "Name": "example-service",
-    "MutualTLSMode": "permissive"
-}
-```
-
-</CodeTabs>
-
-Refer to the [service defaults configuration reference](/consul/docs/connect/config-entries/service-defaults) for information about all settings.
-
-You can change this setting back to `strict` at any time to ensure mTLS is required for incoming traffic to this service.
-
-## Configure intentions
-
-Service intentions are mechanisms in Consul that control traffic between services in the mesh. 
-
-We recommend creating intentions that restrict services to accepting only necessary traffic. You must identify the downstream services that send messages to the service you want to add to the mesh and then create an intention to allow traffic to the service from its downstreams.
-
-When transparent proxy enabled and the `MutualTLSMode` parameter is set to `permissive`, incoming traffic from a downstream service to another upstream service is not secured by mTLS unless that upstream relationship is known to Consul. You must either define an intention so that Consul can infer the upstream relationship from the intention, or you must include an explicit upstream as part of the service definition for the downstream.
-
-Refer to [Service intentions](/consul/docs/connect/intentions) for additional information about how intentions work and how to create them.
-
-## Add the service to the mesh
-
-Register your service into the catalog and update your application to deploy a sidecar proxy. You should also monitor your service to verify its configuration. Refer to the [Consul on Kubernetes service mesh overview](/consul/docs/k8s/connect) for additional information.
-
-## Re-secure mesh traffic
-
-If the newly added service was placed in permissive mTLS mode for onboarding, then you should switch to strict mode when it is safe to do so. You should also revert the global settings that allow services to send and receive non-mTLS traffic.  
-
-### Disable permissive mTLS mode
-
-Configure the service to operate in strict mTLS mode after the service is no longer receiving incoming non-mTLS traffic. After the downstream services that send messages to this service are all onboarded to the mesh, this service should no longer receive non-mTLS traffic.
-
-Check the following Envoy listener statistics for the sidecar proxy to determine if the sidecar is receiving non-mTLS traffic: 
-
-- The `tcp.permissive_public_listener.*` statistics indicate non-mTLS traffic. If these metrics are static over a sufficient period of time, that indicates the sidecar is not receiving non-mTLS traffic.
-- The `tcp.public_listener.*` statistics indicate mTLS traffic. If incoming traffic is expected to this service and these statistics are changing, then the sidecar is receiving mTLS traffic.
-
-Refer to the [service mesh observability overview](/consul/docs/connect/observability) and [metrics configuration for Consul on Kubernetes documentation](/consul/docs/k8s/connect/observability/metrics) for additional information.
-
-If your service is still receiving non-mTLS traffic, complete the following steps to determine the source of the non-mTLS traffic:
-
-1. Verify the list of downstream services. Optionally, you can enable [Envoy access logging](/consul/docs/connect/observability/access-logs) to determine source IP addresses for incoming traffic, and cross-reference those IP addresses with services in your network.
-1. Verify that each downstream is onboarded to the service mesh. If a downstream is not onboarded, consider onboarding it next.
-1. Verify that each downstream has an intention that allows it to send traffic to the upstream service.
-
-After you determine it is safe to move the service to strict mode, set `MutualTLSMode=strict` in the service defaults configuration entry. 
-
-<CodeTabs heading="Enable strict mTLS mode for applicable services">
-
-```hcl
-Kind      = "service-defaults"
-Name      = "example-service"
-
-MutualTLSMode = "strict"
-```
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceDefaults
-metadata:
-  name: example-service
-spec:
-  mutualTLSMode: "strict"
-```
-
-```json
-{
-    "Kind": "service-defaults",
-    "MutualTLSMode": "strict",
-    "Name": "example-service"
-}
-```
-
-</CodeTabs>
-
-### Disable non-mTLS traffic
-
-After all services are onboarded, revert the global settings that allow non-mTLS traffic and verify that permissive mTLS mode is not being used in the mesh. 
-
-Set `AllowEnablingPermissiveMutualTLS=false` and `MeshDestinationsOnly=true` in the mesh config entry.
-
-<CodeTabs heading="Disable non-mTLS traffic">
-
-```hcl
-Kind = "mesh"
-
-AllowEnablingPermissiveMutualTLS = false
-TransparentProxy {
-  MeshDestinationsOnly = true
-}
-```
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: Mesh
-metadata:
-  name: mesh
-spec:
-  allowEnablingPermissiveMutualTLS: false
-  transparentProxy:
-    meshDestinationsOnly: true
-```
-
-
-```json
-{
-    "Kind": "mesh",
-    "AllowEnablingPermissiveMutualTLS": false,
-    "TransparentProxy": [
-        {
-            "MeshDestinationsOnly": true
-        }
-    ]
-}
-```
-
-</CodeTabs>
-
-For each namespace, admin partition, and datacenter in your Consul deployment, run the `consul config list` and `consul config read` commands to verify that no services are using `permissive` mTLS mode. 
-
-The following command returns any service defaults configuration entries that contain `'MutualTLSMode = "permissive"'`:
-
-```shell-session
-$ consul config list -kind service-defaults -filter 'MutualTLSMode == "permissive"'
-```
-
- In each admin partition and datacenter, verify that `MutualTLSMode = "permissive"` is not set in the proxy defaults configuration entry . If `MutualTLSMode` is either empty or if the configuration entry is not found, then the mode is `strict` by default.
- 
- The following command fetches the proxy defaults configuration entry:
-
-```shell-session
-$ consul config read -kind proxy-defaults -name global
-{
-    "Kind": "proxy-defaults",
-    "Name": "global",
-    "Partition": "default",
-    "Namespace": "default",
-    "TransparentProxy": {},
-    "MutualTLSMode": "",
-    "MeshGateway": {},
-    "Expose": {},
-    "AccessLogs": {},
-    "CreateIndex": 26,
-    "ModifyIndex": 30
-}
-```
diff --git a/website/content/docs/k8s/connect/transparent-proxy/enable-transparent-proxy.mdx b/website/content/docs/k8s/connect/transparent-proxy/enable-transparent-proxy.mdx
deleted file mode 100644
index b2cc5dac0b46d..0000000000000
--- a/website/content/docs/k8s/connect/transparent-proxy/enable-transparent-proxy.mdx
+++ /dev/null
@@ -1,256 +0,0 @@
----
-layout: docs
-page_title:  Enable transparent proxy mode
-description: >-
-  Learn how to enable transparent proxy mode, which enables Consul on Kubernetes to direct inbound and outbound traffic through the service mesh and increase application security without configuring individual upstream services.
----
-
-# Enable transparent proxy mode
-
-This topic describes how to use transparent proxy mode in your service mesh. Transparent proxy allows applications to communicate through the service mesh without modifying their configurations. Transparent proxy also hardens application security by preventing direct inbound connections that bypass the mesh. Refer to [Transparent proxy overview](/consul/docs/k8s/connect/transparent-proxy) for additional information.
-
-## Requirements
-
-Your network must meet the following environment and software requirements to use transparent proxy.
-
-* Transparent proxy is available for Kubernetes environments.
-* Consul 1.10.0+
-* Consul Helm chart 0.32.0+. If you want to use the Consul CNI plugin to redirect traffic, Helm chart 0.48.0+ is required. Refer to [Enable the Consul CNI plugin](#enable-the-consul-cni-plugin) for additional information.
-* You must create [service intentions](/consul/docs/connect/intentions) that explicitly allow communication between intended services so that Consul can infer upstream connections and use sidecar proxies to route messages appropriately.  
-* The `ip_tables` kernel module must be running on all worker nodes within a Kubernetes cluster. If you are using the `modprobe` Linux utility, for example, issue the following command:
-
-  `$ modprobe ip_tables`
-
-~> **Upgrading to a supported version**: Always follow the [proper upgrade path](/consul/docs/upgrading/upgrade-specific/#transparent-proxy-on-kubernetes) when upgrading to a supported version of Consul, Consul on Kubernetes (`consul-k8s`), and the Consul Helm chart.
-
-## Enable transparent proxy
-
-Transparent proxy mode is enabled for the entire cluster by default when you install Consul on Kubernetes using the Consul Helm chart. Refer to the [Consul Helm chart reference](/consul/docs/k8s/helm) for information about all default configurations. 
-
-You can explicitly enable transparent proxy for the entire cluster, individual namespaces, and individual services.
-
-### Entire cluster
-
-Use the `connectInject.transparentProxy.defaultEnabled` Helm value to enable or disable transparent proxy for the entire cluster:
-
-```yaml
-connectInject:
-  transparentProxy:
-    defaultEnabled: true
-```
-
-### Kubernetes namespace
-
-Apply the `consul.hashicorp.com/transparent-proxy=true` label to enable transparent proxy for a Kubernetes namespace. The label overrides the `connectInject.transparentProxy.defaultEnabled` Helm value and defines the default behavior of Pods in the namespace. The following example enables transparent proxy for Pods in the `my-app` namespace:
-
-```shell-session
-$ kubectl label namespaces my-app "consul.hashicorp.com/transparent-proxy=true"
-```
-### Individual service
-
-Apply the `consul.hashicorp.com/transparent-proxy=true` annotation to enable transparent proxy on the Pod for each service. The annotation overrides the Helm value and the namespace label. The following example enables transparent proxy for the `static-server` service:
-
-```yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: static-server
-spec:
-  selector:
-    app: static-server
-  ports:
-    - protocol: TCP
-      port: 80
-      targetPort: 8080
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: static-server
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: static-server
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: static-server
-  template:
-    metadata:
-      name: static-server
-      labels:
-        app: static-server
-      annotations:
-        'consul.hashicorp.com/connect-inject': 'true'
-        'consul.hashicorp.com/transparent-proxy': 'true'
-    spec:
-      containers:
-        - name: static-server
-          image: hashicorp/http-echo:latest
-          args:
-            - -text="hello world"
-            - -listen=:8080
-          ports:
-            - containerPort: 8080
-              name: http
-      serviceAccountName: static-server
-```
-
-## Enable the Consul CNI plugin
-
-By default, Consul generates a `connect-inject init` container as part of the Kubernetes Pod startup process. The container configures traffic redirection in the service mesh through the sidecar proxy. To configure redirection, the container requires elevated CAP_NET_ADMIN privileges, which may not be compatible with security policies in your organization.
-
-Instead, you can enable the Consul container network interface (CNI) plugin to perform traffic redirection. Because the plugin is executed by the Kubernetes kubelet, it already has the elevated privileges necessary to configure the network. Additionally, you do not need to specify annotations that automatically overwrite Kubernetes HTTP health probes when the plugin is enabled (see [Overwrite Kubernetes HTTP health probes](#overwrite-kubernetes-http-health-probes)).
-
-The Consul Helm chart installs the CNI plugin, but it is disabled by default. Refer to the [instructions for enabling the CNI plugin](/consul/docs/k8s/installation/install#enable-the-consul-cni-plugin) in the Consul on Kubernetes installation documentation for additional information.
-
-## Traffic redirection
-
-There are two mechanisms for redirecting traffic through the sidecar proxies. By default, Consul injects an init container that redirects all inbound and outbound traffic. The default mechanism requires elevated permissions (CAP_NET_ADMIN) in order to redirect traffic to the service mesh.
-
-Alternatively, you can enable the Consul CNI plugin to handle traffic redirection. Because the Kubernetes kubelet runs CNI plugins, the Consul CNI plugin has the necessary privileges to apply routing tables in the network.
-
-Both mechanisms redirect all inbound and outbound traffic, but you can configure exceptions for specific Pods or groups of Pods. The following annotations enable you to exclude certain traffic from being redirected to sidecar proxies.
-
-### Exclude inbound ports
-
-The [`consul.hashicorp.com/transparent-proxy-exclude-inbound-ports`](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-transparent-proxy-exclude-inbound-ports) annotation defines a comma-separated list of inbound ports to exclude from traffic redirection when running in transparent proxy mode. The port numbers are string data values. In the following example, services in the pod at port `8200` and `8201` are not redirected through the transparent proxy:
-
-<CodeBlockConfig heading="Exclude inbound port numbers from redirection">
-
-```yaml
-metadata:
-  annotations:
-    consul.hashicorp.com/transparent-proxy-exclude-inbound-ports: "8200, 8201"
-```
-
-</CodeBlockConfig>
-
-### Exclude outbound ports
-
-The [`consul.hashicorp.com/transparent-proxy-exclude-outbound-ports`](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-transparent-proxy-exclude-outbound-ports) annotation defines a comma-separated list of outbound ports to exclude from traffic redirection when running in transparent proxy mode. The port numbers are string data values. In the following example, services in the pod at port `8200` and `8201` are not redirected through the transparent proxy:
-
-<CodeBlockConfig heading="Exclude outbound port numbers from redirection">
-
-```yaml
-metadata:
-  annotations":
-    consul.hashicorp.com/transparent-proxy-exclude-outbound-ports: "8200, 8201"
-```
-
-</CodeBlockConfig>
-
-### Exclude outbound CIDR blocks
-
-The [`consul.hashicorp.com/transparent-proxy-exclude-outbound-cidrs`](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-transparent-proxy-exclude-outbound-cidrs) annotation
-defines a comma-separated list of outbound CIDR blocks to exclude from traffic redirection when running in transparent proxy mode. The CIDR blocks are string data values.
-In the following example, services in the `3.3.3.3/24` IP range are not redirected through the transparent proxy:
-
-<CodeBlockConfig heading="Exclude outbound CIDR blocks from redirection">
-
-```yaml
-metadata:
-  annotations:
-    consul.hashicorp.com/transparent-proxy-exclude-outbound-cidrs: "3.3.3.3,3.3.3.3/24"
-```
-</CodeBlockConfig>
-
-### Exclude user IDs
-
-The [`consul.hashicorp.com/transparent-proxy-exclude-uids`](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-transparent-proxy-exclude-uids) annotation
-defines a comma-separated list of additional user IDs to exclude from traffic redirection when running in transparent proxy mode. The user IDs are string data values.
-In the following example, services with the IDs `4444 ` and `44444 ` are not redirected through the transparent proxy:
-
-<CodeBlockConfig heading="Exclude user IDs from redirection">
-
-```yaml
-metadata:
-  annotations:
-    consul.hashicorp.com/transparent-proxy-exclude-uids: "4444,44444"
-  }
-}
-```
-
-</CodeBlockConfig>
-
-## Kubernetes HTTP health probes configuration
-
-By default, `connect-inject` is disabled. As a result, Consul on Kubernetes uses a mechanism for traffic redirection that interferes with [Kubernetes HTTP health
-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/). This is because probes expect the kubelet to reach the application container on the probe's endpoint. Instead, traffic is redirected through the sidecar proxy. As a result, health probes return errors because the kubelet does not encrypt that traffic using a mesh proxy.
-
-There are two methods for solving this issue. The first method is to set the `connectInject.transparentProxy.defaultOverwriteProbes` annotation to overwrite the Kubernetes HTTP health probes so that they point to the proxy. The second method is to [enable the Consul container network interface (CNI) plugin](#enable-the-consul-cni-plugin) to perform traffic redirection. Refer to the [Consul on Kubernetes installation instructions](/consul/docs/k8s/installation/install) for additional information.
-
-### Overwrite Kubernetes HTTP health probes
-
-You can either include the `connectInject.transparentProxy.defaultOverwriteProbes` Helm value to your command or add the `consul.hashicorp.com/transparent-proxy-overwrite-probes` Kubernetes annotation to your pod configuration to overwrite health probes.
-
-Refer to [Kubernetes Health Checks in Consul on Kubernetes](/consul/docs/k8s/connect/health) for additional information.
-
-## Dial services across Kubernetes cluster
-
-If your [Consul servers are federated between Kubernetes clusters](/consul/docs/k8s/deployment-configurations/multi-cluster/kubernetes),
-then you must configure services in one Kubernetes cluster to explicitly dial a service in the datacenter of another Kubernetes cluster using the
-[consul.hashicorp.com/connect-service-upstreams](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-connect-service-upstreams) annotation.
-The following example configures the service to dial an upstream service called `my-service` in datacenter `dc2` on port `1234`:
-
-```yaml
-consul.hashicorp.com/connect-service-upstreams: "my-service:1234:dc2"
-```
-
-If your Consul cluster is deployed to a [single datacenter spanning multiple Kubernetes clusters](/consul/docs/k8s/deployment-configurations/single-dc-multi-k8s),
-then you must configure services in one Kubernetes cluster to explicitly dial a service in another Kubernetes cluster using the
-[consul.hashicorp.com/connect-service-upstreams](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-connect-service-upstreams) annotation.
-The following example configures the service to dial an upstream service called `my-service` in another Kubernetes cluster on port `1234`:
-
-```yaml
-consul.hashicorp.com/connect-service-upstreams: "my-service:1234"
-```
-
-You do not need to configure services to explicitly dial upstream services if your Consul clusters are connected with a [peering connection](/consul/docs/connect/cluster-peering).
-
-## Configure service selectors
-
-When transparent proxy is enabled, traffic sent to [KubeDNS](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/)
-or Pod IP addresses is redirected through the proxy. You must use a selector to bind Kubernetes Services to Pods as you define Kubernetes Services in the mesh.
-The Kubernetes Service name must match the Consul service name to use KubeDNS. This is the default behavior unless you have applied the `consul.hashicorp.com/connect-service`
-Kubernetes annotation to the service pods. The annotation overrides the Consul service name.
-
-Consul configures redirection for each Pod bound to the Kubernetes Service using  `iptables` rules. The rules redirect all inbound and outbound traffic through an inbound and outbound listener on the sidecar proxy. Consul configures the proxy to route traffic to the appropriate upstream services based on [service
-intentions](/consul/docs/connect/config-entries/service-intentions), which address the upstream services using KubeDNS.
-
-In the following example, the Kubernetes service selects `sample-app` application Pods so that they can be reached within the mesh.
-
-<CodeBlockConfig heading="Example service selector">
-
-```yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: sample-app
-  namespace: default
-spec:
-  selector:
-    app: sample-app
-  ports:
-    - protocol: TCP
-      port: 80
-```
-
-</CodeBlockConfig>
-
-Additional services can query the [KubeDNS](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/) at `sample-app.default.svc.cluster.local` to reach `sample-app`. If ACLs are enabled and configured with default `deny` policies, the configuration also requires a [`ServiceIntention`](/consul/docs/connect/config-entries/service-intentions) to allow it to talk to `sample-app`.
-
-You can query the KubeDNS for a service that belongs to a sameness group at `sample-app.virtual.group-name.sg.consul`. This syntax is required when failover is desired and `spec.defaultForFailover` is set to `false` in the sameness group CRD. Refer to [sameness group configuration entry reference](/consul/docs/connect/config-entries/sameness-group) for more information.
-
-### Headless services
-For services that are not addressed using a virtual cluster IP, you must configure the upstream service using the [DialedDirectly](/consul/docs/connect/config-entries/service-defaults#dialeddirectly) option. Then, use DNS to discover individual instance addresses and dial them through the transparent proxy. When this mode is enabled on the upstream, services present service mesh certificates for mTLS and intentions are enforced at the destination.
-
-Note that when dialing individual instances, Consul ignores the HTTP routing rules configured with configuration entries. The transparent proxy acts as a TCP proxy to the original destination IP address.
-
-## Known limitations
-
-- Deployment configurations with federation across or a single datacenter spanning multiple clusters must explicitly dial a service in another datacenter or cluster using annotations.
-
-- When dialing headless services, the request is proxied using a plain TCP proxy. Consul does not take into consideration the upstream's protocol.
\ No newline at end of file
diff --git a/website/content/docs/k8s/connect/transparent-proxy/index.mdx b/website/content/docs/k8s/connect/transparent-proxy/index.mdx
deleted file mode 100644
index 78db657133f6e..0000000000000
--- a/website/content/docs/k8s/connect/transparent-proxy/index.mdx
+++ /dev/null
@@ -1,47 +0,0 @@
----
-layout: docs
-page_title:  Transparent proxy overview
-description: >-
-  Transparent proxy enables Consul on Kubernetes to direct inbound and outbound traffic through the service mesh. Learn how transparently proxying increases application security without configuring individual upstream services.
----
-
-# Transparent proxy overview
- 
-This topic provides overview information about transparent proxy mode, which allows applications to communicate through the service mesh without modifying their configurations. Transparent proxy also hardens application security by preventing direct inbound connections that bypass the mesh. 
-
-## Introduction
-
-When service mesh proxies are in transparent mode, Consul service mesh uses IPtables to direct all inbound and outbound traffic to the sidecar. Consul also uses information configured in service intentions to infer routes, which eliminates the need to explicitly configure upstreams.
-
-### Transparent proxy enabled
-
-The following diagram shows how Consul routes traffic when proxies are in transparent mode:
-
-![Diagram demonstrating that with transparent proxy, connections are automatically routed through the mesh](/img/consul-connect/with-transparent-proxy.png)
-
-### Transparent proxy disabled
-
-When transparent proxy mode is disabled, you must manually configure explicit upstreams, configure your applications to query for services at `localhost:<port>`, and configure applications to only listen on the loopback interface to prevent services from bypassing the mesh. 
-
-The following diagram shows how Consul routes traffic when transparent proxy mode is disabled:
-
-![Diagram demonstrating that without transparent proxy, applications must "opt in" to connecting to their dependencies through the mesh](/img/consul-connect/without-transparent-proxy.png)
-
-Transparent proxy is available for Kubernetes environments. As part of the integration with Kubernetes, Consul registers Kubernetes Services, injects sidecar proxies, and enables traffic redirection.
-
-## Supported networking architectures
-
-Transparent proxy mode enables several networking architectures and workflows. You can query Consul DNS to discover upstreams for single services, virtual services, and failover service instances that are in peered clusters. 
-
-Consul supports the following intra-datacenter connection types for discovering upstreams when transparent proxy mode is enabled:
-
-- KubeDNS lookups across WAN-federated datacenters
-- Consul DNS lookups across WAN-federated datacenters
-- KubeDNS lookups in peered clusters and admin partitions
-- Consul DNS lookups in peered clusters and admin partitions
-
-## Mutual TLS for transparent proxy mode
-
-Transparent proxy mode is enabled by default when you install Consul on Kubernetes using the Consul Helm chart. As a result, all services in the mesh must communicate through sidecar proxies, which enforce service intentions and mTLS encryption for the service mesh. While onboarding new services to service mesh, your network may have mixed mTLS and non-mTLS traffic, which can result in broken service-to-service communication. 
-
-You can temporarily enable permissive mTLS mode during the onboarding process so that existing mesh services can accept traffic from services that are not yet fully onboarded. Permissive mTLS enables sidecar proxies to access both mTLS and non-mTLS traffic. Refer to [Onboard mesh services in transparent proxy mode](/consul/docs/k8s/connect/onboarding-tproxy-mode) for additional information.
diff --git a/website/content/docs/k8s/crds/index.mdx b/website/content/docs/k8s/crds/index.mdx
index b2ed48854fb1f..6a68960a04df3 100644
--- a/website/content/docs/k8s/crds/index.mdx
+++ b/website/content/docs/k8s/crds/index.mdx
@@ -19,7 +19,6 @@ You can specify the following values in the `kind` field. Click on a configurati
 - [`PeeringAcceptor`](/consul/docs/k8s/connect/cluster-peering/tech-specs#peeringacceptor)
 - [`PeeringDialer`](/consul/docs/k8s/connect/cluster-peering/tech-specs#peeringdialer)
 - [`ProxyDefaults`](/consul/docs/connect/config-entries/proxy-defaults)
-- [`SamenessGroup`](/consul/docs/connect/config-entries/sameness-group)
 - [`ServiceDefaults`](/consul/docs/connect/config-entries/service-defaults)
 - [`ServiceSplitter`](/consul/docs/connect/config-entries/service-splitter)
 - [`ServiceRouter`](/consul/docs/connect/config-entries/service-router)
@@ -159,9 +158,9 @@ the `ServiceSplitter`.
 
 ## Kubernetes Namespaces
 
-### Consul CE ((#consul_oss))
+### Consul OSS
 
-Consul Community Edition (Consul CE) ignores Kubernetes namespaces and registers all services into the same
+Consul Open Source (Consul OSS) ignores Kubernetes namespaces and registers all services into the same
 global Consul registry based on their names. For example, service `web` in Kubernetes namespace
 `web-ns` and service `admin` in Kubernetes namespace `admin-ns` are registered into
 Consul as `web` and `admin` with the Kubernetes source namespace ignored.
diff --git a/website/content/docs/k8s/deployment-configurations/multi-cluster/index.mdx b/website/content/docs/k8s/deployment-configurations/multi-cluster/index.mdx
index dbffe877c9866..fdf5c6d945a88 100644
--- a/website/content/docs/k8s/deployment-configurations/multi-cluster/index.mdx
+++ b/website/content/docs/k8s/deployment-configurations/multi-cluster/index.mdx
@@ -13,7 +13,7 @@ with one another. This enables the following features:
 
 - Services on all clusters can make calls to each other through Consul Service Mesh.
 - [Intentions](/consul/docs/connect/intentions) can be used to enforce rules about which services can communicate across all clusters.
-- [L7 Routing Rules](/consul/docs/connect/manage-traffic) can enable multi-cluster failover
+- [L7 Routing Rules](/consul/docs/connect/l7-traffic) can enable multi-cluster failover
   and traffic splitting.
 - The Consul UI has a drop-down menu that lets you navigate between datacenters.
 
diff --git a/website/content/docs/k8s/deployment-configurations/multi-cluster/vms-and-kubernetes.mdx b/website/content/docs/k8s/deployment-configurations/multi-cluster/vms-and-kubernetes.mdx
index 763dcda5a8f38..7fab4286f80ec 100644
--- a/website/content/docs/k8s/deployment-configurations/multi-cluster/vms-and-kubernetes.mdx
+++ b/website/content/docs/k8s/deployment-configurations/multi-cluster/vms-and-kubernetes.mdx
@@ -259,7 +259,7 @@ You'll need:
      }
    }
    ```
-1. If ACLs are enabled you must also modify the [anonymous token](/consul/docs/security/acl/tokens#anonymous-token) policy to have the following permissions:
+1. If ACLs are enabled you'll also need to modify the [anonymous token](/consul/docs/security/acl/acl-tokens#anonymous-token) policy to have the following permissions:
 
    ```hcl
    node_prefix "" {
diff --git a/website/content/docs/k8s/deployment-configurations/vault/wan-federation.mdx b/website/content/docs/k8s/deployment-configurations/vault/wan-federation.mdx
index 041b73033fc3a..9eaa27cd3cf74 100644
--- a/website/content/docs/k8s/deployment-configurations/vault/wan-federation.mdx
+++ b/website/content/docs/k8s/deployment-configurations/vault/wan-federation.mdx
@@ -311,16 +311,12 @@ Repeat the following steps for each datacenter in the cluster:
   1. Update the Consul on Kubernetes helm chart.
 
 ### Secrets and Policies
-1. Store the ACL bootstrap and replication tokens, gossip encryption key, and root CA certificate secrets in Vault.
+1. Store the ACL Replication Token, Gossip Encryption Key, and Root CA certificate secrets in Vault.
 
     ```shell-session
     $ vault kv put consul/secret/gossip key="$(consul keygen)"
     ```
 
-    ```shell-session
-    $ vault kv put consul/secret/bootstrap token="$(uuidgen | tr '[:upper:]' '[:lower:]')"
-    ```
-
     ```shell-session
     $ vault kv put consul/secret/replication token="$(uuidgen | tr '[:upper:]' '[:lower:]')"
     ```
@@ -338,14 +334,6 @@ Repeat the following steps for each datacenter in the cluster:
     EOF
     ```
 
-    ```shell-session
-    $ vault policy write bootstrap-token - <<EOF
-    path "consul/data/secret/bootstrap" {
-      capabilities = ["read"]
-    }
-    EOF
-    ```
-
     ```shell-session
     $ vault policy write replication-token - <<EOF
     path "consul/data/secret/replication" {
@@ -421,7 +409,7 @@ Repeat the following steps for each datacenter in the cluster:
     $ vault write auth/kubernetes-dc1/role/server-acl-init \
             bound_service_account_names=consul-server-acl-init \
             bound_service_account_namespaces="default" \
-            policies="bootstrap-token,replication-token" \
+            policies="replication-token" \
             ttl=24h
     ```
 
@@ -447,7 +435,7 @@ Repeat the following steps for each datacenter in the cluster:
 
 1. Configure and install Consul in the primary datacenter (dc1).
 
-    <CodeBlockConfig filename="consul-dc1.yaml" linenumbers highlight="4,5,6,7,8,9,10,11,12,13,14,15,19,20,21,22,25,26,27,28,29,30,31,32,33,34">
+    <CodeBlockConfig filename="consul-dc1.yaml" linenumbers highlight="4,5,6,7,8,9,10,11,12,13,14,15,19,20,21,22,25,26,27,28,29,30,33,34">
 
     ```yaml
     global:
@@ -472,13 +460,8 @@ Repeat the following steps for each datacenter in the cluster:
           secretName: pki/cert/ca
       federation:
         enabled: true
-        createFederationSecret: false
       acls:
         manageSystemACLs: true
-        createReplicationToken: true
-        bootstrapToken:
-          secretName: consul/data/secret/bootstrap
-          secretKey: token
         replicationToken:
           secretName: consul/data/secret/replication
           secretKey: token
@@ -628,7 +611,7 @@ Repeat the following steps for each datacenter in the cluster:
 
     -> **Note**:  To configure Vault as the service mesh (connect) CA in secondary datacenters, you need to make sure that the Root CA path is the same. The intermediate path is different for each datacenter. In the `connectCA` Helm configuration for a secondary datacenter, you can specify a `intermediatePKIPath` that is, for example, prefixed with the datacenter for which this configuration is intended (e.g. `dc2/connect-intermediate`).
 
-    <CodeBlockConfig filename="consul-dc2.yaml" linenumbers highlight="4,5,6,7,8,9,10,11,12,13,14,15,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,37,38">
+    <CodeBlockConfig filename="consul-dc2.yaml" linenumbers highlight="4,5,6,7,8,9,10,11,12,13,14,15,19,20,21,22,23,24,25,26,29,30,31,32,33,34,37,38">
 
     ```yaml
     global:
@@ -690,4 +673,4 @@ Repeat the following steps for each datacenter in the cluster:
 ## Next steps
 You have completed the process of federating the secondary datacenter (dc2) with the primary datacenter (dc1) using Vault as the Secrets backend.  To validate that everything is configured properly, please confirm that all pods within both datacenters are in a running state.
 
-For additional information about specific Consul secrets that you can store in Vault, refer to [Data Integration](/consul/docs/k8s/deployment-configurations/vault/data-integration) in the [Vault as a Secrets Backend](/consul/docs/k8s/deployment-configurations/vault) documentation.
+For further detail on specific Consul secrets that are available to be stored in Vault, please checkout the detailed information in the [Data Integration](/consul/docs/k8s/deployment-configurations/vault/data-integration) section of the [Vault as a Secrets Backend](/consul/docs/k8s/deployment-configurations/vault) area of the Consul on Kubernetes documentation.
diff --git a/website/content/docs/k8s/helm.mdx b/website/content/docs/k8s/helm.mdx
index 34bda9400cf23..efd559d395594 100644
--- a/website/content/docs/k8s/helm.mdx
+++ b/website/content/docs/k8s/helm.mdx
@@ -59,7 +59,7 @@ Use these links to navigate to a particular top-level stanza.
     the prefix will be `<helm release name>-consul`.
 
   - `domain` ((#v-global-domain)) (`string: consul`) - The domain Consul will answer DNS queries for
-    (Refer to [`-domain`](/consul/docs/agent/config/cli-flags#_domain)) and the domain services synced from
+    (Refer to [`-domain`](https://developer.hashicorp.com/consul/docs/agent/config/cli-flags#_domain)) and the domain services synced from
     Consul into Kubernetes will have, e.g. `service-name.service.consul`.
 
   - `peering` ((#v-global-peering)) - Configures the Cluster Peering feature. Requires Consul v1.14+ and Consul-K8s v1.0.0+.
@@ -120,7 +120,7 @@ Use these links to navigate to a particular top-level stanza.
   - `secretsBackend` ((#v-global-secretsbackend)) - secretsBackend is used to configure Vault as the secrets backend for the Consul on Kubernetes installation.
     The Vault cluster needs to have the Kubernetes Auth Method, KV2 and PKI secrets engines enabled
     and have necessary secrets, policies and roles created prior to installing Consul.
-    Refer to [Vault as the Secrets Backend](/consul/docs/k8s/deployment-configurations/vault)
+    Refer to [Vault as the Secrets Backend](https://developer.hashicorp.com/consul/docs/k8s/deployment-configurations/vault)
     documentation for full instructions.
 
     The Vault cluster _must_ not have the Consul cluster installed by this Helm chart as its storage backend
@@ -134,6 +134,10 @@ Use these links to navigate to a particular top-level stanza.
 
     - `vault` ((#v-global-secretsbackend-vault))
 
+      - `vaultNamespace` ((#v-global-secretsbackend-vault-vaultnamespace)) (`string: ""`) - Vault namespace (optional). This sets the Vault namespace for the `vault.hashicorp.com/namespace` 
+        agent annotation and [Vault Connect CA namespace](https://developer.hashicorp.com/consul/docs/connect/ca/vault#namespace).
+        To override one of these values individually, see `agentAnnotations` and `connectCA.additionalConfig`.
+
       - `enabled` ((#v-global-secretsbackend-vault-enabled)) (`boolean: false`) - Enabling the Vault secrets backend will replace Kubernetes secrets with referenced Vault secrets.
 
       - `consulServerRole` ((#v-global-secretsbackend-vault-consulserverrole)) (`string: ""`) - The Vault role for the Consul server.
@@ -211,7 +215,7 @@ Use these links to navigate to a particular top-level stanza.
         The provider will be configured to use the Vault Kubernetes auth method
         and therefore requires the role provided by `global.secretsBackend.vault.consulServerRole`
         to have permissions to the root and intermediate PKI paths.
-        Please refer to [Vault ACL policies](/consul/docs/connect/ca/vault#vault-acl-policies)
+        Please refer to [Vault ACL policies](https://developer.hashicorp.com/consul/docs/connect/ca/vault#vault-acl-policies)
         documentation for information on how to configure the Vault policies.
 
         - `address` ((#v-global-secretsbackend-vault-connectca-address)) (`string: ""`) - The address of the Vault server.
@@ -219,13 +223,13 @@ Use these links to navigate to a particular top-level stanza.
         - `authMethodPath` ((#v-global-secretsbackend-vault-connectca-authmethodpath)) (`string: kubernetes`) - The mount path of the Kubernetes auth method in Vault.
 
         - `rootPKIPath` ((#v-global-secretsbackend-vault-connectca-rootpkipath)) (`string: ""`) - The path to a PKI secrets engine for the root certificate.
-          For more details, please refer to [Vault Connect CA configuration](/consul/docs/connect/ca/vault#rootpkipath).
+          For more details, please refer to [Vault Connect CA configuration](https://developer.hashicorp.com/consul/docs/connect/ca/vault#rootpkipath).
 
         - `intermediatePKIPath` ((#v-global-secretsbackend-vault-connectca-intermediatepkipath)) (`string: ""`) - The path to a PKI secrets engine for the generated intermediate certificate.
-          For more details, please refer to [Vault Connect CA configuration](/consul/docs/connect/ca/vault#intermediatepkipath).
+          For more details, please refer to [Vault Connect CA configuration](https://developer.hashicorp.com/consul/docs/connect/ca/vault#intermediatepkipath).
 
         - `additionalConfig` ((#v-global-secretsbackend-vault-connectca-additionalconfig)) (`string: {}`) - Additional Connect CA configuration in JSON format.
-          Please refer to [Vault Connect CA configuration](/consul/docs/connect/ca/vault#configuration)
+          Please refer to [Vault Connect CA configuration](https://developer.hashicorp.com/consul/docs/connect/ca/vault#configuration)
           for all configuration options available for that provider.
 
           Example:
@@ -235,7 +239,6 @@ Use these links to navigate to a particular top-level stanza.
             {
               "connect": [{
                 "ca_config": [{
-                     "namespace": "my-vault-ns",
                      "leaf_cert_ttl": "36h"
                   }]
               }]
@@ -259,7 +262,7 @@ Use these links to navigate to a particular top-level stanza.
             inject webhooks.
 
   - `gossipEncryption` ((#v-global-gossipencryption)) - Configures Consul's gossip encryption key.
-    (Refer to [`-encrypt`](/consul/docs/agent/config/cli-flags#_encrypt)).
+    (Refer to [`-encrypt`](https://developer.hashicorp.com/consul/docs/agent/config/cli-flags#_encrypt)).
     By default, gossip encryption is not enabled. The gossip encryption key may be set automatically or manually.
     The recommended method is to automatically generate the key.
     To automatically generate and set a gossip encryption key, set autoGenerate to true.
@@ -288,19 +291,23 @@ Use these links to navigate to a particular top-level stanza.
     - `secretKey` ((#v-global-gossipencryption-secretkey)) (`string: ""`) - The key within the Kubernetes secret or Vault secret key that holds the gossip
       encryption key.
 
+    - `logLevel` ((#v-global-gossipencryption-loglevel)) (`string: ""`) - Override global log verbosity level for `gossip-encryption-autogenerate-job` pods. One of "trace", "debug", "info", "warn", or "error".
+
   - `recursors` ((#v-global-recursors)) (`array<string>: []`) - A list of addresses of upstream DNS servers that are used to recursively resolve DNS queries.
     These values are given as `-recursor` flags to Consul servers and clients.
-    Refer to [`-recursor`](/consul/docs/agent/config/cli-flags#_recursor) for more details.
+    Refer to [`-recursor`](https://developer.hashicorp.com/consul/docs/agent/config/cli-flags#_recursor) for more details.
     If this is an empty array (the default), then Consul DNS will only resolve queries for the Consul top level domain (by default `.consul`).
 
-  - `tls` ((#v-global-tls)) - Enables [TLS](/consul/tutorials/security/tls-encryption-secure)
+  - `tls` ((#v-global-tls)) - Enables [TLS](https://developer.hashicorp.com/consul/tutorials/security/tls-encryption-secure)
     across the cluster to verify authenticity of the Consul servers and clients.
     Requires Consul v1.4.1+.
 
     - `enabled` ((#v-global-tls-enabled)) (`boolean: false`) - If true, the Helm chart will enable TLS for Consul
       servers and clients and all consul-k8s-control-plane components, as well as generate certificate
       authority (optional) and server and client certificates.
-      This setting is required for [Cluster Peering](/consul/docs/connect/cluster-peering/k8s).
+      This setting is required for [Cluster Peering](https://developer.hashicorp.com/consul/docs/connect/cluster-peering/k8s).
+
+    - `logLevel` ((#v-global-tls-loglevel)) (`string: ""`) - Override global log verbosity level. One of "trace", "debug", "info", "warn", or "error".
 
     - `enableAutoEncrypt` ((#v-global-tls-enableautoencrypt)) (`boolean: false`) - If true, turns on the auto-encrypt feature on clients and servers.
       It also switches consul-k8s-control-plane components to retrieve the CA from the servers
@@ -317,7 +324,7 @@ Use these links to navigate to a particular top-level stanza.
     - `verify` ((#v-global-tls-verify)) (`boolean: true`) - If true, `verify_outgoing`, `verify_server_hostname`,
       and `verify_incoming` for internal RPC communication will be set to `true` for Consul servers and clients.
       Set this to false to incrementally roll out TLS on an existing Consul cluster.
-      Please refer to [TLS on existing clusters](/consul/docs/k8s/operations/tls-on-existing-cluster)
+      Please refer to [TLS on existing clusters](https://developer.hashicorp.com/consul/docs/k8s/operations/tls-on-existing-cluster)
       for more details.
 
     - `httpsOnly` ((#v-global-tls-httpsonly)) (`boolean: true`) - If true, the Helm chart will configure Consul to disable the HTTP port on
@@ -362,7 +369,7 @@ Use these links to navigate to a particular top-level stanza.
       - `secretKey` ((#v-global-tls-cakey-secretkey)) (`string: null`) - The key within the Kubernetes or Vault secret that holds the CA key.
 
     - `annotations` ((#v-global-tls-annotations)) (`string: null`) - This value defines additional annotations for
-      tls init jobs. This should be formatted as a multi-line string.
+      tls init jobs. Format this value as a multi-line string.
 
       ```yaml
       annotations: |
@@ -383,6 +390,8 @@ Use these links to navigate to a particular top-level stanza.
       for all Consul and consul-k8s-control-plane components.
       This requires Consul >= 1.4.
 
+    - `logLevel` ((#v-global-acls-loglevel)) (`string: ""`) - Override global log verbosity level. One of "trace", "debug", "info", "warn", or "error".
+
     - `bootstrapToken` ((#v-global-acls-bootstraptoken)) - A Kubernetes or Vault secret containing the bootstrap token to use for creating policies and
       tokens for all Consul and consul-k8s-control-plane components. If `secretName` and `secretKey`
       are unset, a default secret name and secret key are used. If the secret is populated, then
@@ -440,7 +449,7 @@ Use these links to navigate to a particular top-level stanza.
 
       - `secretName` ((#v-global-acls-partitiontoken-secretname)) (`string: null`) - The name of the Vault secret that holds the partition token.
 
-      - `secretKey` ((#v-global-acls-partitiontoken-secretkey)) (`string: null`) - The key within the Vault secret that holds the partition token.
+      - `secretKey` ((#v-global-acls-partitiontoken-secretkey)) (`string: null`) - The key within the Vault secret that holds the parition token.
 
     - `tolerations` ((#v-global-acls-tolerations)) (`string: ""`) - tolerations configures the taints and tolerations for the server-acl-init
       and server-acl-init-cleanup jobs. This should be a multi-line string matching the
@@ -457,7 +466,7 @@ Use these links to navigate to a particular top-level stanza.
       ```
 
     - `annotations` ((#v-global-acls-annotations)) (`string: null`) - This value defines additional annotations for
-      acl init jobs. This should be formatted as a multi-line string.
+      acl init jobs. Format this value as a multi-line string.
 
       ```yaml
       annotations: |
@@ -465,6 +474,14 @@ Use these links to navigate to a particular top-level stanza.
         "sample/annotation2": "bar"
       ```
 
+  - `argocd` ((#v-global-argocd)) - If argocd.enabled is set to true, following annotations are added to
+    job - server-acl-init-job
+    annotations -
+      argocd.argoproj.io/hook: Sync
+      argocd.argoproj.io/hook-delete-policy: HookSucceeded
+
+    - `enabled` ((#v-global-argocd-enabled)) (`boolean: false`)
+
   - `enterpriseLicense` ((#v-global-enterpriselicense)) - <EnterpriseAlert inline /> This value refers to a Kubernetes or Vault secret that you have created
     that contains your enterprise license. It is required if you are using an
     enterprise binary. Defining it here applies it to your cluster once a leader
@@ -484,7 +501,7 @@ Use these links to navigate to a particular top-level stanza.
     - `enabled` ((#v-global-federation-enabled)) (`boolean: false`) - If enabled, this datacenter will be federation-capable. Only federation
       via mesh gateways is supported.
       Mesh gateways and servers will be configured to allow federation.
-      Requires `global.tls.enabled`, `connectInject.enabled`, and one of
+      Requires `global.tls.enabled`, `connectInject.enabled`, and one of 
       `meshGateway.enabled` or `externalServers.enabled` to be true.
       Requires Consul 1.8+.
 
@@ -506,9 +523,9 @@ Use these links to navigate to a particular top-level stanza.
       This address must be reachable from the Consul servers in the primary datacenter.
       This auth method will be used to provision ACL tokens for Consul components and is different
       from the one used by the Consul Service Mesh.
-      Please refer to the [Kubernetes Auth Method documentation](/consul/docs/security/acl/auth-methods/kubernetes).
+      Please refer to the [Kubernetes Auth Method documentation](https://developer.hashicorp.com/consul/docs/security/acl/auth-methods/kubernetes).
 
-      If `externalServers.enabled` is set to true, `global.federation.k8sAuthMethodHost` and
+      If `externalServers.enabled` is set to true, `global.federation.k8sAuthMethodHost` and 
       `externalServers.k8sAuthMethodHost` should be set to the same value.
 
       You can retrieve this value from your `kubeconfig` by running:
@@ -518,6 +535,8 @@ Use these links to navigate to a particular top-level stanza.
         -o jsonpath="{.clusters[?(@.name=='<your cluster name>')].cluster.server}"
       ```
 
+    - `logLevel` ((#v-global-federation-loglevel)) (`string: ""`) - Override global log verbosity level for the `create-federation-secret-job` pods. One of "trace", "debug", "info", "warn", or "error".
+
   - `metrics` ((#v-global-metrics)) - Configures metrics for Consul service mesh
 
     - `enabled` ((#v-global-metrics-enabled)) (`boolean: false`) - Configures the Helm chart’s components
@@ -632,11 +651,13 @@ Use these links to navigate to a particular top-level stanza.
     Consul server cluster. If you're running Consul externally and want agents
     within Kubernetes to join that cluster, this should probably be false.
 
+  - `logLevel` ((#v-server-loglevel)) (`string: ""`) - Override global log verbosity level. One of "trace", "debug", "info", "warn", or "error".
+
   - `image` ((#v-server-image)) (`string: null`) - The name of the Docker image (including any tag) for the containers running
     Consul server agents.
 
   - `replicas` ((#v-server-replicas)) (`integer: 1`) - The number of server agents to run. This determines the fault tolerance of
-    the cluster. Please refer to the [deployment table](/consul/docs/architecture/consensus#deployment-table)
+    the cluster. Please refer to the [deployment table](https://developer.hashicorp.com/consul/docs/architecture/consensus#deployment-table)
     for more information.
 
   - `bootstrapExpect` ((#v-server-bootstrapexpect)) (`int: null`) - The number of servers that are expected to be running.
@@ -675,7 +696,7 @@ Use these links to navigate to a particular top-level stanza.
     Vault Secrets backend:
     If you are using Vault as a secrets backend, a Vault Policy must be created which allows `["create", "update"]`
     capabilities on the PKI issuing endpoint, which is usually of the form `pki/issue/consul-server`.
-    Complete [this tutorial](/consul/tutorials/vault-secure/vault-pki-consul-secure-tls)
+    Complete [this tutorial](https://developer.hashicorp.com/consul/tutorials/vault-secure/vault-pki-consul-secure-tls)
     to learn how to generate a compatible certificate.
     Note: when using TLS, both the `server.serverCert` and `global.tls.caCert` which points to the CA endpoint of this PKI engine
     must be provided.
@@ -715,19 +736,19 @@ Use these links to navigate to a particular top-level stanza.
     storage classes, the PersistentVolumeClaims would need to be manually created.
     A `null` value will use the Kubernetes cluster's default StorageClass. If a default
     StorageClass does not exist, you will need to create one.
-    Refer to the [Read/Write Tuning](/consul/docs/install/performance#read-write-tuning)
+    Refer to the [Read/Write Tuning](https://developer.hashicorp.com/consul/docs/install/performance#read-write-tuning)
     section of the Server Performance Requirements documentation for considerations
     around choosing a performant storage class.
 
-    ~> **Note:** The [Reference Architecture](/consul/tutorials/production-deploy/reference-architecture#hardware-sizing-for-consul-servers)
+    ~> **Note:** The [Reference Architecture](https://developer.hashicorp.com/consul/tutorials/production-deploy/reference-architecture#hardware-sizing-for-consul-servers)
     contains best practices and recommendations for selecting suitable
     hardware sizes for your Consul servers.
 
-  - `connect` ((#v-server-connect)) (`boolean: true`) - This will enable/disable [service mesh](/consul/docs/connect). Setting this to true
+  - `connect` ((#v-server-connect)) (`boolean: true`) - This will enable/disable [service mesh](https://developer.hashicorp.com/consul/docs/connect). Setting this to true
     _will not_ automatically secure pod communication, this
     setting will only enable usage of the feature. Consul will automatically initialize
     a new CA and set of certificates. Additional service mesh settings can be configured
-    by setting the `server.extraConfig` value or by applying [configuration entries](/consul/docs/connect/config-entries).
+    by setting the `server.extraConfig` value or by applying [configuration entries](https://developer.hashicorp.com/consul/docs/connect/config-entries).
 
   - `serviceAccount` ((#v-server-serviceaccount))
 
@@ -779,7 +800,7 @@ Use these links to navigate to a particular top-level stanza.
     control a rolling update of Consul server agents. This value specifies the
     [partition](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#partitions)
     for performing a rolling update. Please read the linked Kubernetes
-    and [Upgrade Consul](/consul/docs/k8s/upgrade#upgrading-consul-servers)
+    and [Upgrade Consul](https://developer.hashicorp.com/consul/docs/k8s/upgrade#upgrading-consul-servers)
     documentation for more information.
 
   - `disruptionBudget` ((#v-server-disruptionbudget)) - This configures the [`PodDisruptionBudget`](https://kubernetes.io/docs/tasks/run-application/configure-pdb/)
@@ -795,7 +816,7 @@ Use these links to navigate to a particular top-level stanza.
       --set 'server.disruptionBudget.maxUnavailable=0'` flag to the helm chart installation
       command because of a limitation in the Helm templating language.
 
-  - `extraConfig` ((#v-server-extraconfig)) (`string: {}`) - A raw string of extra [JSON configuration](/consul/docs/agent/config/config-files) for Consul
+  - `extraConfig` ((#v-server-extraconfig)) (`string: {}`) - A raw string of extra [JSON configuration](https://developer.hashicorp.com/consul/docs/agent/config/config-files) for Consul
     servers. This will be saved as-is into a ConfigMap that is read by the Consul
     server agents. This can be used to add additional configuration that
     isn't directly exposed by the chart.
@@ -972,18 +993,18 @@ Use these links to navigate to a particular top-level stanza.
     it could be used to configure custom consul parameters.
 
   - `snapshotAgent` ((#v-server-snapshotagent)) - <EnterpriseAlert inline /> Values for setting up and running
-    [snapshot agents](/consul/commands/snapshot/agent)
+    [snapshot agents](https://developer.hashicorp.com/consul/commands/snapshot/agent)
     within the Consul clusters. They run as a sidecar with Consul servers.
 
     - `enabled` ((#v-server-snapshotagent-enabled)) (`boolean: false`) - If true, the chart will install resources necessary to run the snapshot agent.
 
     - `interval` ((#v-server-snapshotagent-interval)) (`string: 1h`) - Interval at which to perform snapshots.
-      Refer to [`interval`](/consul/commands/snapshot/agent#interval)
+      Refer to [`interval`](https://developer.hashicorp.com/consul/commands/snapshot/agent#interval)
 
     - `configSecret` ((#v-server-snapshotagent-configsecret)) - A Kubernetes or Vault secret that should be manually created to contain the entire
       config to be used on the snapshot agent.
       This is the preferred method of configuration since there are usually storage
-      credentials present. Please refer to the [Snapshot agent config](/consul/commands/snapshot/agent#config-file-options)
+      credentials present. Please refer to the [Snapshot agent config](https://developer.hashicorp.com/consul/commands/snapshot/agent#config-file-options)
       for details.
 
       - `secretName` ((#v-server-snapshotagent-configsecret-secretname)) (`string: null`) - The name of the Kubernetes secret or Vault secret path that holds the snapshot agent config.
@@ -1006,7 +1027,7 @@ Use these links to navigate to a particular top-level stanza.
 
   - `auditLogs` ((#v-server-auditlogs)) - <EnterpriseAlert inline /> Added in Consul 1.8, the audit object allow users to enable auditing
     and configure a sink and filters for their audit logs. Please refer to
-    [audit logs](/consul/docs/enterprise/audit-logging) documentation
+    [audit logs](https://developer.hashicorp.com/consul/docs/enterprise/audit-logging) documentation
     for further information.
 
     - `enabled` ((#v-server-auditlogs-enabled)) (`boolean: false`) - Controls whether Consul logs out each time a user performs an operation.
@@ -1054,37 +1075,6 @@ Use these links to navigate to a particular top-level stanza.
 
       - `rotate_max_files` - Defines the limit that Consul should follow before it deletes old log files.
 
-  - `limits` ((#v-server-limits)) - Settings for potentially limiting timeouts, rate limiting on clients as well
-    as servers, and other settings to limit exposure too many requests, requests
-    waiting for too long, and other runtime considerations.
-
-    - `requestLimits` ((#v-server-limits-requestlimits)) - This object specifies configurations that limit the rate of RPC and gRPC
-      requests on the Consul server. Limiting the rate of gRPC and RPC requests
-      also limits HTTP requests to the Consul server.
-      /consul/docs/agent/config/config-files#request_limits
-
-      - `mode` ((#v-server-limits-requestlimits-mode)) (`string: disabled`) - Setting for disabling or enabling rate limiting.  If not disabled, it
-        enforces the action that will occur when RequestLimitsReadRate
-        or RequestLimitsWriteRate is exceeded.  The default value of "disabled" will
-        prevent any rate limiting from occuring.  A value of "enforce" will block
-        the request from processings by returning an error.  A value of
-        "permissive" will not block the request and will allow the request to
-        continue processing.
-
-      - `readRate` ((#v-server-limits-requestlimits-readrate)) (`integer: -1`) - Setting that controls how frequently RPC, gRPC, and HTTP
-        queries are allowed to happen. In any large enough time interval, rate
-        limiter limits the rate to RequestLimitsReadRate tokens per second.
-
-        See https://en.wikipedia.org/wiki/Token_bucket for more about token
-        buckets.
-
-      - `writeRate` ((#v-server-limits-requestlimits-writerate)) (`integer: -1`) - Setting that controls how frequently RPC, gRPC, and HTTP
-        writes are allowed to happen. In any large enough time interval, rate
-        limiter limits the rate to RequestLimitsWriteRate tokens per second.
-
-        See https://en.wikipedia.org/wiki/Token_bucket for more about token
-        buckets.
-
 ### externalServers ((#h-externalservers))
 
 - `externalServers` ((#v-externalservers)) - Configuration for Consul servers when the servers are running outside of Kubernetes.
@@ -1122,9 +1112,9 @@ Use these links to navigate to a particular top-level stanza.
   - `k8sAuthMethodHost` ((#v-externalservers-k8sauthmethodhost)) (`string: null`) - If you are setting `global.acls.manageSystemACLs` and
     `connectInject.enabled` to true, set `k8sAuthMethodHost` to the address of the Kubernetes API server.
     This address must be reachable from the Consul servers.
-    Please refer to the [Kubernetes Auth Method documentation](/consul/docs/security/acl/auth-methods/kubernetes).
+    Please refer to the [Kubernetes Auth Method documentation](https://developer.hashicorp.com/consul/docs/security/acl/auth-methods/kubernetes).
 
-    If `global.federation.enabled` is set to true, `global.federation.k8sAuthMethodHost` and
+    If `global.federation.enabled` is set to true, `global.federation.k8sAuthMethodHost` and 
     `externalServers.k8sAuthMethodHost` should be set to the same value.
 
     You could retrieve this value from your `kubeconfig` by running:
@@ -1145,10 +1135,12 @@ Use these links to navigate to a particular top-level stanza.
     the resources necessary for a Consul client on every Kubernetes node. This _does not_ require
     `server.enabled`, since the agents can be configured to join an external cluster.
 
+  - `logLevel` ((#v-client-loglevel)) (`string: ""`) - Override global log verbosity level. One of "trace", "debug", "info", "warn", or "error".
+
   - `image` ((#v-client-image)) (`string: null`) - The name of the Docker image (including any tag) for the containers
     running Consul client agents.
 
-  - `join` ((#v-client-join)) (`array<string>: null`) - A list of valid [`-retry-join` values](/consul/docs/agent/config/cli-flags#_retry_join).
+  - `join` ((#v-client-join)) (`array<string>: null`) - A list of valid [`-retry-join` values](https://developer.hashicorp.com/consul/docs/agent/config/cli-flags#_retry_join).
     If this is `null` (default), then the clients will attempt to automatically
     join the server cluster running within Kubernetes.
     This means that with `server.enabled` set to true, clients will automatically
@@ -1169,7 +1161,7 @@ Use these links to navigate to a particular top-level stanza.
     required for Connect.
 
   - `nodeMeta` ((#v-client-nodemeta)) - nodeMeta specifies an arbitrary metadata key/value pair to associate with the node
-    (refer to [`-node-meta`](/consul/docs/agent/config/cli-flags#_node_meta))
+    (refer to [`-node-meta`](https://developer.hashicorp.com/consul/docs/agent/config/cli-flags#_node_meta))
 
     - `pod-name` ((#v-client-nodemeta-pod-name)) (`string: ${HOSTNAME}`)
 
@@ -1213,7 +1205,7 @@ Use these links to navigate to a particular top-level stanza.
 
     - `tlsInit` ((#v-client-containersecuritycontext-tlsinit)) (`map`) - The tls-init initContainer
 
-  - `extraConfig` ((#v-client-extraconfig)) (`string: {}`) - A raw string of extra [JSON configuration](/consul/docs/agent/config/config-files) for Consul
+  - `extraConfig` ((#v-client-extraconfig)) (`string: {}`) - A raw string of extra [JSON configuration](https://developer.hashicorp.com/consul/docs/agent/config/config-files) for Consul
     clients. This will be saved as-is into a ConfigMap that is read by the Consul
     client agents. This can be used to add additional configuration that
     isn't directly exposed by the chart.
@@ -1479,16 +1471,16 @@ Use these links to navigate to a particular top-level stanza.
       will inherit from `global.metrics.enabled` value.
 
     - `provider` ((#v-ui-metrics-provider)) (`string: prometheus`) - Provider for metrics. Refer to
-      [`metrics_provider`](/consul/docs/agent/config/config-files#ui_config_metrics_provider)
+      [`metrics_provider`](https://developer.hashicorp.com/consul/docs/agent/config/config-files#ui_config_metrics_provider)
       This value is only used if `ui.enabled` is set to true.
 
     - `baseURL` ((#v-ui-metrics-baseurl)) (`string: http://prometheus-server`) - baseURL is the URL of the prometheus server, usually the service URL.
       This value is only used if `ui.enabled` is set to true.
 
-  - `dashboardURLTemplates` ((#v-ui-dashboardurltemplates)) - Corresponds to [`dashboard_url_templates`](/consul/docs/agent/config/config-files#ui_config_dashboard_url_templates)
+  - `dashboardURLTemplates` ((#v-ui-dashboardurltemplates)) - Corresponds to [`dashboard_url_templates`](https://developer.hashicorp.com/consul/docs/agent/config/config-files#ui_config_dashboard_url_templates)
     configuration.
 
-    - `service` ((#v-ui-dashboardurltemplates-service)) (`string: ""`) - Sets [`dashboardURLTemplates.service`](/consul/docs/agent/config/config-files#ui_config_dashboard_url_templates_service).
+    - `service` ((#v-ui-dashboardurltemplates-service)) (`string: ""`) - Sets [`dashboardURLTemplates.service`](https://developer.hashicorp.com/consul/docs/agent/config/config-files#ui_config_dashboard_url_templates_service).
 
 ### syncCatalog ((#h-synccatalog))
 
@@ -1508,7 +1500,7 @@ Use these links to navigate to a particular top-level stanza.
     to run the sync program.
 
   - `default` ((#v-synccatalog-default)) (`boolean: true`) - If true, all valid services in K8S are
-    synced by default. If false, the service must be [annotated](/consul/docs/k8s/service-sync#enable-and-disable-sync)
+    synced by default. If false, the service must be [annotated](https://developer.hashicorp.com/consul/docs/k8s/service-sync#enable-and-disable-sync)
     properly to sync.
     In either case an annotation can override the default.
 
@@ -1701,7 +1693,7 @@ Use these links to navigate to a particular top-level stanza.
 
   - `default` ((#v-connectinject-default)) (`boolean: false`) - If true, the injector will inject the
     Connect sidecar into all pods by default. Otherwise, pods must specify the
-    [injection annotation](/consul/docs/k8s/connect#consul-hashicorp-com-connect-inject)
+    [injection annotation](https://developer.hashicorp.com/consul/docs/k8s/connect#consul-hashicorp-com-connect-inject)
     to opt-in to Connect injection. If this is true, pods can use the same annotation
     to explicitly opt-out of injection.
 
@@ -1735,64 +1727,6 @@ Use these links to navigate to a particular top-level stanza.
     - `minAvailable` ((#v-connectinject-disruptionbudget-minavailable)) (`integer: null`) - The minimum number of available pods.
       Takes precedence over maxUnavailable if set.
 
-  - `apiGateway` ((#v-connectinject-apigateway)) - Configuration settings for the Consul API Gateway integration.
-
-    - `manageExternalCRDs` ((#v-connectinject-apigateway-manageexternalcrds)) (`boolean: true`) - Enables Consul on Kubernetes to manage the CRDs used for Gateway API.
-      Setting this to true will install the CRDs used for the Gateway API when Consul on Kubernetes is installed.
-      These CRDs can clash with existing Gateway API CRDs if they are already installed in your cluster.
-      If this setting is false, you will need to install the Gateway API CRDs manually.
-
-    - `managedGatewayClass` ((#v-connectinject-apigateway-managedgatewayclass)) - Configuration settings for the GatewayClass installed by Consul on Kubernetes.
-
-      - `nodeSelector` ((#v-connectinject-apigateway-managedgatewayclass-nodeselector)) (`string: null`) - This value defines [`nodeSelector`](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector)
-        labels for gateway pod assignment, formatted as a multi-line string.
-
-        Example:
-
-        ```yaml
-        nodeSelector: |
-          beta.kubernetes.io/arch: amd64
-        ```
-
-      - `tolerations` ((#v-connectinject-apigateway-managedgatewayclass-tolerations)) (`string: null`) - Toleration settings for gateway pods created with the managed gateway class.
-        This should be a multi-line string matching the
-        [Tolerations](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) array in a Pod spec.
-
-      - `serviceType` ((#v-connectinject-apigateway-managedgatewayclass-servicetype)) (`string: LoadBalancer`) - This value defines the type of Service created for gateways (e.g. LoadBalancer, ClusterIP)
-
-      - `copyAnnotations` ((#v-connectinject-apigateway-managedgatewayclass-copyannotations)) - Configuration settings for annotations to be copied from the Gateway to other child resources.
-
-        - `service` ((#v-connectinject-apigateway-managedgatewayclass-copyannotations-service)) (`string: null`) - This value defines a list of annotations to be copied from the Gateway to the Service created, formatted as a multi-line string.
-
-          Example:
-
-          ```yaml
-          service:
-            annotations: |
-              - external-dns.alpha.kubernetes.io/hostname
-          ```
-
-      - `deployment` ((#v-connectinject-apigateway-managedgatewayclass-deployment)) - This value defines the number of pods to deploy for each Gateway as well as a min and max number of pods for all Gateways
-
-        - `defaultInstances` ((#v-connectinject-apigateway-managedgatewayclass-deployment-defaultinstances)) (`integer: 1`)
-
-        - `maxInstances` ((#v-connectinject-apigateway-managedgatewayclass-deployment-maxinstances)) (`integer: 1`)
-
-        - `minInstances` ((#v-connectinject-apigateway-managedgatewayclass-deployment-mininstances)) (`integer: 1`)
-
-    - `serviceAccount` ((#v-connectinject-apigateway-serviceaccount)) - Configuration for the ServiceAccount created for the api-gateway component
-
-      - `annotations` ((#v-connectinject-apigateway-serviceaccount-annotations)) (`string: null`) - This value defines additional annotations for the client service account. This should be formatted as a multi-line
-        string.
-
-        ```yaml
-        annotations: |
-          "sample/annotation1": "foo"
-          "sample/annotation2": "bar"
-        ```
-
-    - `resources` ((#v-connectinject-apigateway-resources)) (`map`) - The resource settings for Pods handling traffic for Gateway API.
-
   - `cni` ((#v-connectinject-cni)) - Configures consul-cni plugin for Consul Service mesh services
 
     - `enabled` ((#v-connectinject-cni-enabled)) (`boolean: false`) - If true, then all traffic redirection setup uses the consul-cni plugin.
@@ -1926,7 +1860,7 @@ Use these links to navigate to a particular top-level stanza.
   - `imageConsul` ((#v-connectinject-imageconsul)) (`string: null`) - The Docker image for Consul to use when performing Connect injection.
     Defaults to global.image.
 
-  - `logLevel` ((#v-connectinject-loglevel)) (`string: ""`) - Override global log verbosity level. One of "debug", "info", "warn", or "error".
+  - `logLevel` ((#v-connectinject-loglevel)) (`string: ""`) - Sets the `logLevel` for the `consul-dataplane` sidecar and the `consul-connect-inject-init` container. When set, this value overrides the global log verbosity level. One of "debug", "info", "warn", or "error".
 
   - `serviceAccount` ((#v-connectinject-serviceaccount))
 
@@ -2049,8 +1983,8 @@ Use these links to navigate to a particular top-level stanza.
     If set to an empty string all service accounts can log in.
     This only has effect if ACLs are enabled.
 
-    Refer to Auth methods [Binding rules](/consul/docs/security/acl/auth-methods#binding-rules)
-    and [Trusted identiy attributes](/consul/docs/security/acl/auth-methods/kubernetes#trusted-identity-attributes)
+    Refer to Auth methods [Binding rules](https://developer.hashicorp.com/consul/docs/security/acl/auth-methods#binding-rules)
+    and [Trusted identiy attributes](https://developer.hashicorp.com/consul/docs/security/acl/auth-methods/kubernetes#trusted-identity-attributes)
     for more details.
     Requires Consul >= v1.5.
 
@@ -2111,15 +2045,15 @@ Use these links to navigate to a particular top-level stanza.
       - `consul.hashicorp.com/sidecar-proxy-lifecycle-graceful-port`
       - `consul.hashicorp.com/sidecar-proxy-lifecycle-graceful-shutdown-path`
 
-        - `defaultEnabled` ((#v-connectinject-sidecarproxy-lifecycle-defaultenabled)) (`boolean: true`)
+      - `defaultEnabled` ((#v-connectinject-sidecarproxy-lifecycle-defaultenabled)) (`boolean: true`)
 
-        - `defaultEnableShutdownDrainListeners` ((#v-connectinject-sidecarproxy-lifecycle-defaultenableshutdowndrainlisteners)) (`boolean: true`)
+      - `defaultEnableShutdownDrainListeners` ((#v-connectinject-sidecarproxy-lifecycle-defaultenableshutdowndrainlisteners)) (`boolean: true`)
 
-        - `defaultShutdownGracePeriodSeconds` ((#v-connectinject-sidecarproxy-lifecycle-defaultshutdowngraceperiodseconds)) (`integer: 30`)
+      - `defaultShutdownGracePeriodSeconds` ((#v-connectinject-sidecarproxy-lifecycle-defaultshutdowngraceperiodseconds)) (`integer: 30`)
 
-        - `defaultGracefulPort` ((#v-connectinject-sidecarproxy-lifecycle-defaultgracefulport)) (`integer: 20600`)
+      - `defaultGracefulPort` ((#v-connectinject-sidecarproxy-lifecycle-defaultgracefulport)) (`integer: 20600`)
 
-        - `defaultGracefulShutdownPath` ((#v-connectinject-sidecarproxy-lifecycle-defaultgracefulshutdownpath)) (`string: /graceful_shutdown`)
+      - `defaultGracefulShutdownPath` ((#v-connectinject-sidecarproxy-lifecycle-defaultgracefulshutdownpath)) (`string: /graceful_shutdown`)
 
   - `initContainer` ((#v-connectinject-initcontainer)) (`map`) - The resource settings for the Connect injected init container. If null, the resources
     won't be set for the initContainer. The defaults are optimized for developer instances of
@@ -2141,13 +2075,15 @@ Use these links to navigate to a particular top-level stanza.
 
 ### meshGateway ((#h-meshgateway))
 
-- `meshGateway` ((#v-meshgateway)) - [Mesh Gateways](/consul/docs/connect/gateways/mesh-gateway) enable Consul Connect to work across Consul datacenters.
+- `meshGateway` ((#v-meshgateway)) - [Mesh Gateways](https://developer.hashicorp.com/consul/docs/connect/gateways/mesh-gateway) enable Consul Connect to work across Consul datacenters.
 
-  - `enabled` ((#v-meshgateway-enabled)) (`boolean: false`) - If [mesh gateways](/consul/docs/connect/gateways/mesh-gateway) are enabled, a Deployment will be created that runs
+  - `enabled` ((#v-meshgateway-enabled)) (`boolean: false`) - If [mesh gateways](https://developer.hashicorp.com/consul/docs/connect/gateways/mesh-gateway) are enabled, a Deployment will be created that runs
     gateways and Consul service mesh will be configured to use gateways.
-    This setting is required for [Cluster Peering](/consul/docs/connect/cluster-peering/k8s).
+    This setting is required for [Cluster Peering](https://developer.hashicorp.com/consul/docs/connect/cluster-peering/k8s).
     Requirements: consul 1.6.0+ if using `global.acls.manageSystemACLs``.
 
+  - `logLevel` ((#v-meshgateway-loglevel)) (`string: ""`) - Override global log verbosity level for `mesh-gateway-deployment` pods. One of "trace", "debug", "info", "warn", or "error".
+
   - `replicas` ((#v-meshgateway-replicas)) (`integer: 1`) - Number of replicas for the Deployment.
 
   - `wanAddress` ((#v-meshgateway-wanaddress)) - What gets registered as WAN address for the gateway.
@@ -2309,7 +2245,10 @@ Use these links to navigate to a particular top-level stanza.
   for a specific gateway.
   Requirements: consul >= 1.8.0
 
-  - `enabled` ((#v-ingressgateways-enabled)) (`boolean: false`) - Enable ingress gateway deployment. Requires `connectInject.enabled=true`.
+  - `enabled` ((#v-ingressgateways-enabled)) (`boolean: false`) - Enable ingress gateway deployment. Requires `connectInject.enabled=true`
+    and `client.enabled=true`.
+
+  - `logLevel` ((#v-ingressgateways-loglevel)) (`string: ""`) - Override global log verbosity level for `ingress-gateways-deployment` pods. One of "trace", "debug", "info", "warn", or "error".
 
   - `defaults` ((#v-ingressgateways-defaults)) - Defaults sets default values for all gateway fields. With the exception
     of annotations, defining any of these values in the `gateways` list
@@ -2423,8 +2362,9 @@ Use these links to navigate to a particular top-level stanza.
 
   - `gateways` ((#v-ingressgateways-gateways)) (`array<map>`) - Gateways is a list of gateway objects. The only required field for
     each is `name`, though they can also contain any of the fields in
-    `defaults`. Values defined here override the defaults except in the
-    case of annotations where both will be applied.
+    `defaults`. You must provide a unique name for each ingress gateway. These names 
+    must be unique across different namespaces. 
+    Values defined here override the defaults, except in the case of annotations where both will be applied.
 
     - `name` ((#v-ingressgateways-gateways-name)) (`string: ingress-gateway`)
 
@@ -2438,7 +2378,10 @@ Use these links to navigate to a particular top-level stanza.
   for a specific gateway.
   Requirements: consul >= 1.8.0
 
-  - `enabled` ((#v-terminatinggateways-enabled)) (`boolean: false`) - Enable terminating gateway deployment. Requires `connectInject.enabled=true`.
+  - `enabled` ((#v-terminatinggateways-enabled)) (`boolean: false`) - Enable terminating gateway deployment. Requires `connectInject.enabled=true`
+    and `client.enabled=true`.
+
+  - `logLevel` ((#v-terminatinggateways-loglevel)) (`string: ""`) - Override global log verbosity level. One of "trace", "debug", "info", "warn", or "error".
 
   - `defaults` ((#v-terminatinggateways-defaults)) - Defaults sets default values for all gateway fields. With the exception
     of annotations, defining any of these values in the `gateways` list
@@ -2545,8 +2488,7 @@ Use these links to navigate to a particular top-level stanza.
 
 ### apiGateway ((#h-apigateway))
 
-- `apiGateway` ((#v-apigateway)) - [DEPRECATED] Use connectInject.apiGateway instead. This stanza will be removed with the release of Consul 1.17
-  Configuration settings for the Consul API Gateway integration
+- `apiGateway` ((#v-apigateway)) - Configuration settings for the Consul API Gateway integration
 
   - `enabled` ((#v-apigateway-enabled)) (`boolean: false`) - When true the helm chart will install the Consul API Gateway controller
 
@@ -2696,6 +2638,8 @@ Use these links to navigate to a particular top-level stanza.
 
   - `enabled` ((#v-telemetrycollector-enabled)) (`boolean: false`) - Enables the consul-telemetry-collector deployment
 
+  - `logLevel` ((#v-telemetrycollector-loglevel)) (`string: ""`) - Override global log verbosity level. One of "trace", "debug", "info", "warn", or "error".
+
   - `image` ((#v-telemetrycollector-image)) (`string: hashicorp/consul-telemetry-collector:0.0.1`) - The name of the Docker image (including any tag) for the containers running
     the consul-telemetry-collector
 
diff --git a/website/content/docs/k8s/installation/install-cli.mdx b/website/content/docs/k8s/installation/install-cli.mdx
index 0621b9459ae97..d9d613516c4e3 100644
--- a/website/content/docs/k8s/installation/install-cli.mdx
+++ b/website/content/docs/k8s/installation/install-cli.mdx
@@ -247,25 +247,6 @@ You can include the `-auto-approve` option set to `true` to proceed with the ins
 
 The pre-install checks may fail if existing `PersistentVolumeClaims` (PVC) are detected. Refer to the [uninstall instructions](/consul/docs/k8s/operations/uninstall#uninstall-consul) for information about removing PVCs.
 
-## Custom installation
-
-You can create a values file and specify parameters to overwrite the default Helm chart installation. Add the `-f` and specify your values file to implement your configuration, for example:
-
-```shell-session
-$ consul-k8s install -f values.yaml
-``` 
-
-### Install Consul on OpenShift clusters
-
-[Red Hat OpenShift](https://www.redhat.com/en/technologies/cloud-computing/openshift) is a security-conscious, opinionated wrapper for Kubernetes. To install Consul on OpenShift-managed Kubernetes, set `global.openshift.enabled=true` in your [custom installation](#custom-installation) values file:
-
-```yaml
-global:
-  openshift:
-    enabled: true
- 
-Refer to [`openshift` in the Helm chart reference](/consul/docs/k8s/helm#v-global-openshift) for additional information.  
-
 ## Check the Consul cluster status
 
 Issue the `consul-k8s status` command to view the status of the installed Consul cluster.
diff --git a/website/content/docs/k8s/installation/install.mdx b/website/content/docs/k8s/installation/install.mdx
index 35eefff333edd..78f90f480797a 100644
--- a/website/content/docs/k8s/installation/install.mdx
+++ b/website/content/docs/k8s/installation/install.mdx
@@ -104,18 +104,6 @@ NAME: consul
 ...
 ```
 
-### Install Consul on OpenShift clusters
-
-[Red Hat OpenShift](https://www.redhat.com/en/technologies/cloud-computing/openshift) is a security-conscious, opinionated wrapper for Kubernetes. To install Consul on OpenShift-managed Kubernetes, set `global.openshift.enabled=true` in your [custom installation](#custom-installation) values file:
-
-```yaml
-global:
-  openshift:
-    enabled: true
-```
-
-Refer to [`openshift` in the Helm chart reference](/consul/docs/k8s/helm#v-global-openshift) for additional information.  
-
 ### Enable the Consul CNI plugin
 
 By default, Consul injects a `connect-inject-init` init container as part of the Kubernetes pod startup process when Consul is in [transparent proxy mode](/consul/docs/connect/transparent-proxy).
@@ -144,7 +132,7 @@ To configure the plugin to be installed, add the following configuration to your
       logLevel: info
       cniBinDir: "/opt/cni/bin"
       cniNetDir: "/etc/cni/net.d"
-  ```
+```
 
 </CodeBlockConfig>
 </Tab>
@@ -163,7 +151,8 @@ To configure the plugin to be installed, add the following configuration to your
       logLevel: info
       cniBinDir: "/home/kubernetes/bin"
       cniNetDir: "/etc/cni/net.d"
-  ```
+```
+
 </CodeBlockConfig>
 </Tab>
 
@@ -207,7 +196,7 @@ By default, Consul Service Mesh is enabled on almost all namespaces within a Kub
 
 1. specify a `namespaceSelector` that matches a label attached to each namespace where you want to deploy the service mesh. In order to default to enabling service mesh on select namespaces by label, the `connectInject.default` value must be set to `true`.
 
-  <CodeBlockConfig filename="values.yaml">
+<CodeBlockConfig filename="values.yaml">
 
   ```yaml
   global:
@@ -218,9 +207,9 @@ By default, Consul Service Mesh is enabled on almost all namespaces within a Kub
     namespaceSelector: |
       matchLabels:
         connect-inject : enabled
-  ```
+```
 
-  </CodeBlockConfig>
+</CodeBlockConfig>
 
 1. Label the namespaces where you would like to enable Consul Service Mesh.
 
diff --git a/website/content/docs/k8s/l7-traffic/failover-tproxy.mdx b/website/content/docs/k8s/l7-traffic/failover-tproxy.mdx
deleted file mode 100644
index b5bd4983a27b0..0000000000000
--- a/website/content/docs/k8s/l7-traffic/failover-tproxy.mdx
+++ /dev/null
@@ -1,124 +0,0 @@
---- 
-layout: docs
-page_title: Configure failover services on Kubernetes
-description: Learn how to define failover services in Consul on Kubernetes when proxies are in transparent proxy mode. Consul can send traffic to backup service instances if a destination service becomes unhealthy or unresponsive. 
---- 
-
-# Configure failover services on Kubernetes
-
-This topic describes how to configure failover service instances in Consul on Kubernetes when proxies are in transparent proxy mode. If a service becomes unhealthy or unresponsive, Consul can use the service resolver configuration entry to send inbound requests to backup services. Service resolvers are part of the service mesh proxy upstream discovery chain. Refer to [Service mesh traffic management](/consul/docs/connect/manage-traffic) for additional information.
-
-## Overview
-
-Complete the following steps to configure failover service instances in Consul on Kubernetes when proxies are in transparent proxy mode:
-
-- Create a service resolver configuration entry
-- Create intentions that allow the downstream service to access the primary and failover service instances.
-- Configure your application to call the discovery chain using the Consul DNS or KubeDNS.
-
-## Requirements
- 
-- `consul-k8s` v1.2.0 or newer.
-- Consul service mesh must be enabled. Refer to [How does Consul Service Mesh Work on Kubernetes](/consul/docs/k8s/connect).
-- Proxies must be configured to run in transparent proxy mode. 
-- To query virtual DNS names, you must use Consul DNS.
-- To query the discovery chain using KubeDNS, the service resolver must be in the same partition as the running service. 
-
-### ACL requirements
-
-The default ACLs that the Consul Helm chart configures are suitable for most cases, but if you have more complex security policies for Consul API access, refer to the [ACL documentation](/consul/docs/security/acl) for additional guidance. 
-
-## Create a service resolver configuration entry
-
-Specify the target failover in the [`spec.failover.targets`](/consul/docs/connect/config-entries/service-resolver#failover-targets-service) field in the service resolver configuration entry. In the following example, the `api-beta` service is configured to failover to the `api` service in any service subset:
-
-<CodeBlockConfig filename="api-beta-failover.yaml">
-
-```yaml
-apiversion: consul.hashicorp.com/v1alpha1
-kind: ServiceResolver
-metadata: 
-  name: api-beta
-spec:
-  failover:
-    '*':
-      targets:
-        - service: api
-```
-
-</CodeBlockConfig>
-
-Refer to the [service resolver configuration entry reference](/consul/docs/connect/config-entries/service-resolver) documentation for information about all service resolver configurations.
-
-You can apply the configuration using the `kubectl apply` command:
-
-```shell-session
-$ kubectl apply -f api-beta-failover.yaml
-```
-
-## Create service intentions 
-
-If intentions are not already defined, create and apply intentions that allow the appropriate downstream to access the target service and the failover service. In the following examples, the `frontend` service is allowed to send messages to the `api` service, which is allowed to send messages to the `api-beta` failover service.
-
-
-<CodeBlockConfig filename="frontend-api-api-beta-allow.yaml">
-
-```yaml
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceIntentions
-metadata:
-  name: api
-spec:
-  destination:
-    name: api
-      sources:
-        - name: frontend
-     action: allow
----
-apiVersion: consul.hashicorp.com/v1alpha1
-kind: ServiceIntentions
-metadata:
-  name: api-beta
-spec:
-  destination:
-    name: api-beta
-      sources:
-   - name: frontend
-     action: allow
-```
-
-</CodeBlockConfig>
-
-Refer to the [service intentions configuration entry reference](/consul/docs/connect/config-entries/service-intentions) for additional information about configuring service intentions. 
-
-You can apply the configuration using the `kubectl apply` command:
-
-```shell-session
-$ kubectl apply -f frontend-api-api-beta-allow.yaml
-```
-
-## Configure your application to call the DNS
-
-Configure your application to contact the discovery chain in either the Consul DNS or the KubeDNS. 
-
-### Consul DNS
-
-You can query the Consul DNS using the `<service>.virtual.consul` lookup format. For Consul Enterprise, your query string may need to include the namespace, partition, or both. Refer to the [DNS documentation](/consul/docs/services/discovery/dns-static-lookups#service-virtual-ip-lookups) for details on building virtual service lookups.
-
-In the following example, the application queries the Consul catalog for `api-beta` over HTTP. By default, the lookup would query the `default` partition and `default` namespace if Consul Enterprise manages the network infrastructure:
-
-```text
-http://api-beta.virtual.consul/
-```
-
-### KubeDNS
-
-You can query the KubeDNS if the failover service is in the same Kubernetes cluster as the primary service. In the following example, the application queries KubeDNS for `api-beta` over HTTP:
-
-```text
-http://api-beta.<namespace>.svc.cluster.local
-```
-
-Note that you cannot use KubeDNS if a corresponding Kubernetes service and pod do not exist. 
-
-
diff --git a/website/content/docs/k8s/l7-traffic/route-to-virtual-services.mdx b/website/content/docs/k8s/l7-traffic/route-to-virtual-services.mdx
deleted file mode 100644
index bd8c9e3db3195..0000000000000
--- a/website/content/docs/k8s/l7-traffic/route-to-virtual-services.mdx
+++ /dev/null
@@ -1,122 +0,0 @@
---- 
-layout: docs
-page_title: Route traffic to a virtual service
-description: Define virtual services in service resolver config entries so that Consul on Kubernetes can route traffic to virtual services when transparent proxy mode is enabled for Envoy proxies.  
----
-
-# Route traffic to a virtual service
-
-This topic describes how to define virtual services so that Consul on Kubernetes can route traffic to virtual services when transparent proxy mode is enabled for Envoy proxies. 
-
-## Overview
-
-You can define virtual services in service resolver configuration entries so that downstream applications can send requests to a virtual service using a Consul DNS name in peered clusters. Your applications can send requests to virtual services in the same cluster using KubeDNS. Service resolvers are part of the service mesh proxy upstream discovery chain. Refer to [Service mesh traffic management](/consul/docs/connect/manage-traffic) for additional information.
-
-Complete the following steps to configure failover service instances in Consul on Kubernetes when proxies are in transparent proxy mode:
-
-1. Create a service resolver configuration entry.
-1. Create intentions that allow the downstream service to access the real service and the virtual service.
-1. Configure your application to call the discovery chain using the Consul DNS or KubeDNS.
-
-## Requirements
- 
-- `consul-k8s` v1.2.0 or newer.
-- Consul service mesh must be enabled. Refer to [How does Consul service mesh work on Kubernetes](/consul/docs/k8s/connect).
-- Proxies must be configured to run in transparent proxy mode. 
-- To query virtual DNS names, you must use Consul DNS.
-- To query the discovery chain using KubeDNS, the service resolver must be in the same partition as the running service. 
-
-### ACL requirements
-
-The default ACLs that the Consul Helm chart configures are suitable for most cases, but if you have more complex security policies for Consul API access, refer to the [ACL documentation](/consul/docs/security/acl) for additional guidance. 
-
-## Create a service resolver configuration entry
-
-Specify the target failover in the [`spec.redirect.service`](/consul/docs/connect/config-entries/service-resolver#spec-redirect-service) field in the service resolver configuration entry. In the following example, the `virtual-api` service is configured to redirect to the `real-api`:
-
-<CodeBlockConfig filename="virtual-api-redirect.yaml">
-
-```yaml
-apiversion: consul.hashicorp.com/v1alpha1
-kind: ServiceResolver
-metadata:
- name: virtual-api
-spec:
- redirect:
-   service: real-api
-```
-
-</CodeBlockConfig>
-
-Refer to the [service resolver configuration entry reference](/consul/docs/connect/config-entries/service-resolver) documentation for information about all service resolver configurations.
-
-You can apply the configuration using the `kubectl apply` command:
-
-```shell-session
-$ kubectl apply -f virtual-api-redirect.yaml
-```
-
-## Create service intentions 
-
-If intentions are not already defined, create and apply intentions that allow the appropriate downstream to access the real service and the target redirect service. In the following examples, the `frontend` service is allowed to send messages to the `virtual-api` and `real-api` services:
-
-
-<CodeBlockConfig filename="frontend-api-api-beta-allow.yaml">
-
-```yaml
-apiversion: consul.hashicorp.com/v1alpha1
-kind: ServiceIntentions
-metadata:
- name: virtual-api
-spec:
- destination:
-   name: virtual-api
- sources:
-   - name: frontend
-     action: allow
----
-apiversion: consul.hashicorp.com/v1alpha1
-kind: ServiceIntentions
-metadata:
- name: real-api
-spec:
- destination:
-   name: real-api
- sources:
-   - name: frontend
-     action: allow
-```
-
-</CodeBlockConfig>
-
-Refer to the [service intentions configuration entry reference](/consul/docs/connect/config-entries/service-intentions) for additional information about configuring service intentions. 
-
-You can apply the configuration using the `kubectl apply` command:
-
-```shell-session
-$ kubectl apply -f frontend-api-api-beta-allow.yaml
-```
-
-## Configure your application to call the DNS
-
-Configure your application to contact the discovery chain in either the Consul DNS or the KubeDNS. 
-
-### Consul DNS
-
-You can query the Consul DNS using the `<service>.virtual.consul` lookup format. For Consul Enterprise, your query string may need to include the namespace, partition, or both. Refer to the [DNS documentation](/consul/docs/services/discovery/dns-static-lookups#service-virtual-ip-lookups) for details on building virtual service lookups.
-
-In the following example, the application queries the Consul catalog for `virtual-api` over HTTP. By default, the lookup would query the `default` partition and `default` namespace if Consul Enterprise manages the network infrastructure:
-
-```text
-http://virtual-api.virtual.consul/
-```
-
-### KubeDNS
-
-You can query the KubeDNS if the real and virtual services are in the same Kubernetes cluster by specifying the name of the service. In the following example, the application queries KubeDNS for `virtual-api` over HTTP:
-
-```text
-http://virtual-api.<namespace>.svc.cluster.local
-```
-
-Note that you cannot use KubeDNS if a corresponding Kubernetes service and pod do not exist. 
diff --git a/website/content/docs/k8s/multiport/configure.mdx b/website/content/docs/k8s/multiport/configure.mdx
deleted file mode 100644
index 0cae43d471f39..0000000000000
--- a/website/content/docs/k8s/multiport/configure.mdx
+++ /dev/null
@@ -1,480 +0,0 @@
----
-layout: docs
-page_title: Configure multi-port services 
-description: Learn how to enable the v2 catalog and configure services to support multiple ports in Consul on Kubernetes. You can configure multiple ports on a single service or multiple services and ports in a single container.
----
-
-# Configure multi-port services
-
-<Warning>
-
-Multi-port services are part of a beta release. This documentation supports testing and development scenarios. Do not use multi-port services or the v2 catalog API in secure production environments.
-
-</Warning>
-
-This page describes the process for integrating a service that uses multiple ports in a single container when running Consul on Kubernetes deployments. It includes example configurations to demonstrate an end-to-end deployment test of Consul's multi-port features.
-
-## Prerequisites
-
-Registering multi-port services with Consul requires Kubernetes. Multi-port services are not supported on VM deployments.
-
-The following software versions are required:
-
-- Consul v1.17.0
-- `consul-k8s` CLI v1.3.0+ or `hashicorp/consul` Helm chart release v1.3.0+
-
-For more information about upgrading versions for `consul-k8s` and Helm charts, refer to [Update the Consul K8s CLI](/consul/docs/k8s/upgrade/upgrade-cli) and [Upgrade Helm chart version](/consul/docs/k8s/upgrade#upgrade-helm-chart-version).
-
-There are additional requirements for service mesh proxies in transparent proxy mode. This mode enables queries through Kube DNS instead of Consul DNS over permissive mTLS settings. For more information about the steps to configure global settings and enable permissive mTLS mode before registering a service, refer to the [onboard services in transparent mode workflow](/consul/docs/k8s/connect/onboarding-tproxy-mode#workflow).
-
-## Enable the v2 catalog
-
-To enable the v2 catalog and its support for multi-port services, set `global.experiments: ["resource-apis"]` and `ui.enabled: false`. The following example includes these parameter in a Helm chart with minimal required configurations for the Consul installation:
-
-<CodeBlockConfig name="values.yaml">
-
-```yaml
-global:
-  enabled: true
-  name: consul
-  image: hashicorp/consul:1.17.0-rc1
-  datacenter: dc1
-  tls:
-    enabled: true
-  experiments: ["resource-apis"]
-server:
-  enabled: true
-  replicas: 1
-connectInject:
-  enabled: true
-ui:
-  enabled: false
-```
-
-</CodeBlockConfig>
-
-Then install Consul to your Kubernetes cluster using either the `consul-k8s` CLI or Helm.
-
-<Tabs>
-
-<Tab heading="consul-k8s CLI" group="consul-k8s">
-
-```shell-session
-$ consul-k8s install -config-file=values.yaml
-```
-
-</Tab>
-
-<Tab heading="Helm" group="helm">
-
-```shell-session
-$ helm install consul hashicorp/consul --create-namespace --namespace consul --values values.yaml
-```
-
-</Tab>
-</Tabs>
-
-## Define the multi-port service
-
-Consul's v2 catalog supports two methods for defining multi-port services in Kubernetes:
-
-- Method 1: Define a single Kubernetes Service that exposes multiple ports
-- Method 2: Define multiple Kubernetes Services that expose individual ports
-
-These methods affect how the Services are addressed in Kubernetes.
-
-Each tab in the following example contains a configuration that defines an `api` service using one of these methods. Both definitions schedule a Pod running two containers that each support traffic to one of the ports exposed by the Service. In `Method 1`, both services are addressed using `api` because both services are exposed by a single service. In `Method 2`, `api` and `api-admin` are defined as separate services and can be addressed using distinct names.
-
-<Tabs>
-
-<Tab heading="Method 1" group="method1">
-
-<CodeBlockConfig filename="api.yaml">
-
-```yaml
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: api
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: api
-spec:
-  selector:
-    app: api
-  ports:
-    - name: api
-      port: 80
-      targetPort: api
-    - name: admin
-      port: 90
-      targetPort: admin
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: api
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: api
-  template:
-    metadata:
-      name: api
-      labels:
-        app: api
-      annotations:
-        "consul.hashicorp.com/mesh-inject": "true"
-        'consul.hashicorp.com/transparent-proxy': 'true'
-    spec:
-      containers:
-        - name: api
-          image: docker.mirror.hashicorp.services/hashicorp/http-echo:latest
-          args:
-            - -text="hello world"
-            - -listen=:8080
-          ports:
-            - containerPort: 8080
-              name: api
-        - name: api-admin
-          image: docker.mirror.hashicorp.services/hashicorp/http-echo:latest
-          args:
-            - -text="hello world from 9090 admin"
-            - -listen=:9090
-          ports:
-            - containerPort: 9090
-              name: admin
-      serviceAccountName: api
-```
-
-</CodeBlockConfig>
-</Tab>
-
-<Tab heading="Method 2" group="method2">
-
-<CodeBlockConfig filename="api.yaml">
-
-```yaml
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: api
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: api
-spec:
-  selector:
-    app: api
-  ports:
-    - name: api
-      port: 80
-      targetPort: api
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: api-admin
-spec:
-  selector:
-    app: api
-  ports:
-    - name: admin
-      port: 90
-      targetPort: admin
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: api
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: api
-  template:
-    metadata:
-      name: api
-      labels:
-        app: api
-      annotations:
-        "consul.hashicorp.com/mesh-inject": "true"
-        'consul.hashicorp.com/transparent-proxy': 'true'
-    spec:
-      containers:
-        - name: api
-          image: docker.mirror.hashicorp.services/hashicorp/http-echo:latest
-          args:
-            - -text="hello world"
-            - -listen=:8080
-          ports:
-            - containerPort: 8080
-              name: api
-        - name: api-admin
-          image: docker.mirror.hashicorp.services/hashicorp/http-echo:latest
-          args:
-            - -text="hello world from 9090 admin"
-            - -listen=:9090
-          ports:
-            - containerPort: 9090
-              name: admin
-      serviceAccountName: api
-```
-
-</CodeBlockConfig>
-</Tab>
-</Tabs>
-
-For testing purposes, the following example defines a Service to function as a static client that you can use to verify that the multi-port services function correctly.
-
-<CodeBlockConfig filename="web.yaml">
-
-```yaml
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: web
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: web
-spec:
-  selector:
-    app: web
-  ports:
-    - port: 80
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: web
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: web
-  template:
-    metadata:
-      name: web
-      labels:
-        app: web
-      annotations:
-        "consul.hashicorp.com/mesh-inject": "true"
-        'consul.hashicorp.com/transparent-proxy': 'true'
-    spec:
-      containers:
-        - name: web
-          image: curlimages/curl:latest
-          # Just spin & wait forever, we'll use `kubectl exec` to demo
-          command: ['/bin/sh', '-c', '--']
-          args: ['while true; do sleep 30; done;']
-      serviceAccountName: web
-```
-
-</CodeBlockConfig>
-
-To apply these services to your Kubernetes deployment and register them with Consul, run the following command:
-
-```shell-session
-$ kubectl apply -f api.yaml -f web.yaml --namespace consul
-```
-
-## Configure traffic permissions
-
-Consul uses traffic permissions to validate communication between services based on L4 identity. In the beta release of the v2 catalog API, traffic permissions allow all services by default. In order to verify that services function correctly on each port, create CRDs that deny traffic to each port.
-
-The following examples create Consul CRDs that allow traffic to only one port of the multi-port service. Each resource separately denies `web` permission when it is a source of traffic to one of the services. These traffic permissions work with either method for defining a multi-port service.
-
-<CodeTabs tabs={[ "Deny port 80", "Deny port 90" ]}>
-
-<CodeBlockConfig filename="deny-80.yaml">
-
-```yaml
-apiVersion: auth.consul.hashicorp.com/v2beta1
-kind: TrafficPermissions
-metadata:
-  name: web-to-api-port-deny
-spec:
-  destination:
-    identityName: api
-  action: deny
-  permissions:
-    - sources:
-        - identityName: web
-      destinationRules:
-        - portNames: ["api"]
-```
-
-</CodeBlockConfig>
-
-<CodeBlockConfig filename="deny-90.yaml">
-
-```yaml
-apiVersion: auth.consul.hashicorp.com/v2beta1
-kind: TrafficPermissions
-metadata:
-  name: web-to-admin-port-deny
-spec:
-  destination:
-    identityName: api
-  action: deny
-  permissions:
-    - sources:
-        - identityName: web
-      destinationRules:
-        - portNames: ["admin"] 
-```
-
-</CodeBlockConfig>
-</CodeTabs>
-
-## Validate multi-port connection
-
-To open a shell to the `web` container, you need the name of the Pod it currently runs on. Run the following command to return a list of Pods:
-
-```shell-session
-$ kubectl get pods
-NAME                   READY   STATUS    RESTARTS   AGE
-api-7dc9d84f-kfnwz     2/2     Running   0          23s
-web-7bc5786747-b5pzl   1/1     Running   0          23s
-```
-
-### Validate both ports
-
-Use the `web` Pod's name to open a shell session and test the `api` service on port 80.
-
-<Tabs>
-
-<Tab heading="Method 1" group="method1">
-
-```shell-session
-$ kubectl exec -it web-7bc5786747-b5pzl -- curl api:80
-hello world
-```
-
-Then test the `api` service on port 90.
-
-```shell-session
-$ kubectl exec -it web-7bc5786747-b5pzl -- curl api:90
-hello world from 9090 admin
-```
-
-</Tab>
-
-<Tab heading="Method 2" group="method2">
-
-```shell-session
-$ kubectl exec -it web-7bc5786747-b5pzl -- curl api:80
-hello world
-```
-
-Then test the `api-admin` service on port 90.
-
-```shell-session
-$ kubectl exec -it web-7bc5786747-b5pzl -- curl api-admin:90
-hello world from 9090 admin
-```
-
-</Tab>
-</Tabs>
-
-### Validate port 80
-
-Apply the CRD to allow traffic to port 80 only:
-
-```shell-session
-$ kubectl apply -f deny-90.yaml --namespace consul
-```
-
-<Tabs>
-
-<Tab heading="Method 1" group="method1">
-
-Then, open a shell session in the `web` container and test the `api` service on port 80.
-
-```shell-session
-$ kubectl exec -it web-7bc5786747-b5pzl -- curl api:80
-hello world
-```
-
-Test the `api` service on port 90. This command should fail, indicating that the traffic permission is in effect.
-
-```shell-session
-$ kubectl exec -it web-7bc5786747-b5pzl -- curl api:90
-```
-
-</Tab>
-
-<Tab heading="Method 2" group="method2">
-
-Then, open a shell session in the `web` container and test the `api` service on port 80.
-
-```shell-session
-$ kubectl exec -it web-7bc5786747-b5pzl -- curl api:80
-hello world
-```
-
-Test the `admin` service on port 90. This command should fail, indicating that the traffic permission is in effect.
-
-```shell-session
-$ kubectl exec -it web-7bc5786747-b5pzl -- curl api-admin:90
-```
-
-</Tab>
-</Tabs>
-
-Before testing the other port, remove the `TrafficPermissions` CRD.
-
-```shell-session
-$ kubectl delete -f deny-90.yaml --namespace consul
-```
-
-### Validate port 90
-
-Apply the CRD to allow traffic to port 90 only:
-
-```shell-session
-$ kubectl apply -f deny-80.yaml --namespace consul
-```
-
-<Tabs>
-
-<Tab heading="Method 1" group="method1">
-
-Then, open a shell session in the `web` container and test the `api` service on port 90.
-
-```shell-session
-$ kubectl exec -it web-7bc5786747-b5pzl -- curl api:90
-hello world from 9090 admin
-```
-
-Test the `api` service on port 80. This command should fail, indicating that the traffic permission is in effect.
-
-```shell-session
-$ kubectl exec -it web-7bc5786747-b5pzl -- curl api:80
-```
-
-</Tab>
-
-<Tab heading="Method 2" group="method2">
-
-Then, open a shell session in the `web` container and test the `api-admin` service on port 90.
-
-```shell-session
-$ kubectl exec -it web-7bc5786747-b5pzl -- curl api-admin:90
-hello world from 9090 admin
-```
-
-Test the `api` service on port 80. This command should fail, indicating that the traffic permission is in effect.
-
-```shell-session
-$ kubectl exec -it web-7bc5786747-b5pzl -- curl api:80
-```
-
-</Tab>
-</Tabs>
\ No newline at end of file
diff --git a/website/content/docs/k8s/multiport/index.mdx b/website/content/docs/k8s/multiport/index.mdx
deleted file mode 100644
index 9b8ef4dac9c1a..0000000000000
--- a/website/content/docs/k8s/multiport/index.mdx
+++ /dev/null
@@ -1,69 +0,0 @@
----
-layout: docs
-page_title: Multi-port services for service mesh
-description: Consul on Kubernetes supports multi-port services for both service discovery and service mesh scenarios. Learn about Consul’s v2 catalog changes to support multiple ports for a service running in a single container.
----
-
-# Multi-port services for service mesh
-
-<Warning>
-
-Multi-port services are part of a beta release. This documentation supports testing and development scenarios. Do not use multi-port services or the v2 catalog API in secure production environments.
-
-</Warning>
-
-This topic describes changes to Consul's catalog that allow you to register a service with multiple ports on Kubernetes deployments.
-
-## Background
-
-When Consul registers services, v1 of its catalog API tracks the following information:
-
-- IDs of the specific _service instances_ that are registered
-- Locations of the _nodes_ the instances run on
-- Names of the _services_ the instances are associated with
-
-This catalog API was designed prior to the introduction of Consul’s service mesh features. Services and service instances are coupled in the catalog such that Consul's ACL system requires a Kubernetes ServiceAccount resource to match the Service name. As a result, only one service can represent a Kubernetes Workload in the Consul catalog.
-
-Since then, the cloud networking needs for applications have evolved and the Consul catalog adapted to support workarounds for these needs. For example, [Kubernetes Pods with multiple ports](/consul/docs/k8s/connect#kubernetes-pods-with-multiple-ports) demonstrates how you can schedule a service with multiple ports so that Consul registers it in the catalog as distinct services with their own service instances. However, this workaround results in additional resource consumption because Consul requires that each service and port use their own proxy and Consul dataplane so that it can recognize them as distinct services.
-
-### Catalog API v2 beta
-
-Consul v1.17 introduces a new version of the catalog API designed to bridge differences between the Consul and Kubernetes data models. The v2 catalog API still tracks services and nodes for Consul, but replaces service instances with _workloads_ and _workload identites_.
-
-- `Workload` is an application instance running in a set of one or more Pods scheduled according to a Kubernetes Workload resource such as a Deployment or StatefulSet. It is similar to [Kubernetes Workloads](https://kubernetes.io/docs/concepts/workloads/).
-- `WorkloadIdentities` provide a distinct identity for a Workload to assume in a Kubernetes cluster. THey are similar to [Kubernetes Service Accounts](https://kubernetes.io/docs/concepts/security/service-accounts/).
-
-This catalog structure enables Consul to associate a single Kubernetes Workload with multiple services in its catalog.
-
-The v2 catalog API also tracks the following information about services when they are registered with Consul:
-
-- `ServiceEndpoints` maps services to workload addresses and endpoints. This resource is computed by Consul.
-- `HealthStatus` is a resource for reporting the health status of a workload.
-- `HealthCheck` is a resource for defining the health checks for a workload.
-- `ProxyConfiguration` represents a configuration for a sidecar or gateway proxy, similar to the `Proxy` field in the current service definition.
-- `Destinations` represents explicit service upstreams.
-- `TrafficPermissions` is a replacement for the `ServiceIntentions` custom resource definition (CRD). Traffic permissions replace service intentions for all services in the v2 catalog, which enables L4 traffic authorization according to workload identity instead of service identity.
-
-The v2 catalog API is available alongside the existing v1 catalog API, but the catalogs cannot be used simultaneously. The v2 catalog is disabled by default. This beta release is for testing and development purposes only. We do not recommend implementing v2 in production environments or migrating to v2 until the API is generally available.
-
-## Workflow
-
-To use a multi-port service in Consul on Kubernetes deployments, complete the following steps:
-
-1. Enable the v2 catalog. Add `global.experiments: ["resource-apis"]` and `ui.enabled: false` to a cluster's Helm chart before deploying Consul.
-1. Use the `"consul.hashicorp.com/mesh-inject": "true"` annotation so that Consul registers the service automatically when Kubernetes deploys containers.
-1. Configure traffic permissions. In the beta release, services registered to the v2 catalog allow all traffic by default. You can use the `TrafficPermissions` CRD to deny traffic to individual services for testing purposes.
-1. Validate multi-port functionality. Send test traffic to each port to confirm that traffic is authorized and routed correctly.
-
-For an example configuration and instructions for each of the steps in this workflow, refer to [configure multi-port services](/consul/docs/k8s/multiport/configure).
-
-## Constraints and limitations
-
-Be aware of the following constraints and technical limitations on using multi-port services and the v2 catalog API:
-
-- The v2 catalog API beta does not support connections with client agents. It is only available for Kubernetes deployments, which use [Consul dataplanes](consul/docs/connect/dataplane) instead of client agents.
-- The v1 and v2 catalog APIs cannot run concurrently.
-- The Consul UI does not support multi-port services or the v2 catalog API in this release. You must disable the UI in the Helm chart in order to use the v2 catalog API.
-- HCP Consul does not support multi-port services or the v2 catalog API in this release.
-- The v2 catalog API does not support ACLs in the beta release.
-- We do not recommend updating existing clusters to enable the v2 catalog in this release. To use the v2 catalog, deploy a new Consul cluster.
\ No newline at end of file
diff --git a/website/content/docs/k8s/service-sync.mdx b/website/content/docs/k8s/service-sync.mdx
index daf03396f21fd..54ebbdd54d2c7 100644
--- a/website/content/docs/k8s/service-sync.mdx
+++ b/website/content/docs/k8s/service-sync.mdx
@@ -287,7 +287,7 @@ metadata:
 ### Service meta
 
 A service registered in Consul from Kubernetes sets the `external-source` key to
-`kubernetes`. This can be used from the API, CLI and UI to filter
+`kubernetes`. This can be used from the APLI, CLI and UI to filter
 service instances that are set in k8s. The Consul UI displays a Kubernetes icon next to all externally
 registered services from Kubernetes.
 
@@ -422,7 +422,7 @@ configuration.
 
 **If a conflicting service is found**: the service is not synced. This
 does not match the Kubernetes to Consul behavior, but given the current
-implementation we must do this because Kubernetes cannot mix both CNAME and
+implementation we must do this because Kubernetes cannott mix both CNAME and
 Endpoint-based services.
 
 ### Kubernetes service labels and annotations
diff --git a/website/content/docs/k8s/upgrade/index.mdx b/website/content/docs/k8s/upgrade/index.mdx
index 26ef776e1b731..80507a45e074f 100644
--- a/website/content/docs/k8s/upgrade/index.mdx
+++ b/website/content/docs/k8s/upgrade/index.mdx
@@ -13,7 +13,7 @@ This topic describes considerations and strategies for upgrading Consul deployme
 
 As of Consul v1.14.0, Kubernetes deployments use [Consul Dataplane](/consul/docs/connect/dataplane) instead of client agents. If you upgrade Consul from a version that uses client agents to a version that uses dataplanes, you must follow specific steps to update your Helm chart and remove client agents from the existing deployment. Refer to [Upgrading to Consul Dataplane](/consul/docs/k8s/upgrade#upgrading-to-consul-dataplane) for more information.
 
-The v1.0.0 release of the Consul on Kubernetes Helm chart also introduced a change to the [`externalServers[].hosts` parameter](/consul/docs/k8s/helm#v-externalservers-hosts). Previously, you were able to enter a provider lookup as a string in this field. Now, you must include `exec=` at the start of a string containing a provider lookup. Otherwise, the string is treated as a DNS name. Refer to the [`go-netaddrs`](https://github.com/hashicorp/go-netaddrs) library and command line tool for more information.
+The v1.0.0 release of the Consul on Kubernetes Helm chart also introduced a change to the [`externalServers[].hosts` parameter](/consul/docs/k8s/helm#v-externalservers-hosts). Previously, you were able to enter a provider lookup as a string in this field. Now, you must include `exec=` at the start of a string containing a provider lookup. Otherwise, the string is treated as a DNS name. Refer to the [`go-netaddrs` library and command line tool](https://github.com/hashicorp/go-netaddrs) for more information.
 
 ## Upgrade types
 
@@ -120,7 +120,7 @@ to update to the new version. Before you upgrade to a new version:
 
    </CodeBlockConfig>
 
-2. Determine the version of your existing Helm installation. In this example, version `0.39.0` (from `consul-k8s:0.39.0`) is being used.
+2. Determine the version of your exisiting Helm installation. In this example, version `0.39.0` (from `consul-k8s:0.39.0`) is being used.
 
   ```shell-session
   $ helm list --filter consul --namespace consul
@@ -174,7 +174,7 @@ that can be used.
 1. Take specific note if `consul-server, StatefulSet` is listed, as it means your Consul server statefulset will be redeployed.
 
   If your Consul server statefulset needs to be redeployed, follow the same pattern for upgrades as
-  on other platforms by redeploying servers one by one. Refer tp [Upgrading Consul](/consul/docs/upgrading) for more information.
+  on other platforms by redploying servers one by one. Refer tp [Upgrading Consul](/consul/docs/upgrading) for more information.
 
   If neither the server statefulset is not being redeployed,
   then you can continue with the Helm upgrade without any specific sequence to follow.
@@ -258,7 +258,7 @@ If you upgrade Consul from a version that uses client agents to a version the us
 1. If ACLs are enabled, outdated ACL tokens will persist a result of the upgrade. You can manually delete the tokens to declutter your Consul environment.
 
    Outdated connect-injector tokens have the following description: `token created via login: {"component":"connect-injector"}`. Do not delete
-   the tokens that have a description where `pod` is a key, for example `token created via login: {"component":"connect-injector","pod":"default/consul-connect-injector-576b65747c-9547x"}`). The dataplane-enabled connect inject pods use these tokens.
+   the tokens that have a description where `pod` is a key, for example `token created via login: {"component":"connect-injector","pod":"default/consul-connect-injector-576b65747c-9547x"}`). The dataplane-enabled connect inject pods use these tokens.    
 
    You can also review the creation date for the tokens and only delete the injector tokens created before your upgrade, but do not delete all old tokens without considering if they are still in use. Some tokens, such as the server tokens, are still necessary.
 
diff --git a/website/content/docs/lambda/registration/automate.mdx b/website/content/docs/lambda/registration/automate.mdx
index 781d37318a353..c21c3ecdd05ff 100644
--- a/website/content/docs/lambda/registration/automate.mdx
+++ b/website/content/docs/lambda/registration/automate.mdx
@@ -1,11 +1,11 @@
 ---
 layout: docs
-page_title: Automate Lambda function registration
+page_title: Automate Lambda Function Registeration
 description: >-
   Register AWS Lambda functions with Consul service mesh using the Consul Lambda registrator. The Consul Lambda registrator automates Lambda function registration.
 ---
 
-# Automate Lambda function registration
+# Automate Lambda Function Registeration
 
 This topic describes how to automate Lambda function registration using Consul's Lambda registrator module for Terraform.
 
@@ -129,7 +129,7 @@ The registrator also requires the following IAM permissions to access the parame
 | `consul_ca_cert_path` | Specifies the path to the CA certificate stored in the AWS Parameter Store. When Lambda registrator makes an HTTPS request to Consul's API and the Consul API is signed by a custom CA, Lambda registrator uses this CA certificate to verify the authenticity of the Consul API. At startup, Lambda registrator pulls the CA certificate at this path from Parameter Store, writes the certificate to the filesystem and stores the path of that file in `CONSUL_CACERT`.  Also refer to [Optional: Store the CA Certificate in Parameter Store](#optional-store-the-ca-certificate-in-parameter-store).|
 | `consul_http_token_path` |  Specifies the path to the ACL token stored in AWS Parameter Store that Lambda registrator presents to access resources. This parameter is only required when ACLs are enabled for the Consul server. It is used to fetch an ACL token from Parameter Store and is stored in the `CONSUL_HTTP_TOKEN` environment variable. Also refer tp [Optional: Store the ACL Token in Parameter Store](#optional-store-the-acl-token-in-parameter-store).|
 | `node_name` | The Consul node name that Lambdas are registered to. Defaults to `lambdas`. |
-| `enterprise` | <EnterpriseAlert inline /> Determines if the Consul server at `consul_http_addr` is running Consul Community Edition or Consul Enterprise. |
+| `enterprise` | <EnterpriseAlert inline /> Determines if the Consul server at `consul_http_addr` is running open source Consul or Consul Enterprise. |
 | `partitions` | <EnterpriseAlert inline /> The partitions that Lambda registrator manages. |
 
 ## Deploy the Lambda registrator
diff --git a/website/content/docs/nia/compatibility.mdx b/website/content/docs/nia/compatibility.mdx
index f160fe644780c..05e301e0282bc 100644
--- a/website/content/docs/nia/compatibility.mdx
+++ b/website/content/docs/nia/compatibility.mdx
@@ -13,7 +13,7 @@ This topic describes Consul-Terraform-Sync (CTS) cross-compatibility with Consul
 
 Below are CTS versions with supported Consul versions. The latest CTS binary supports the three most recent Consul minor versions, along with their latest patch versions.
 
-| CTS Version            | Consul Community Edition & Enterprise Version | HCP Consul Version |
+| CTS Version            | Consul OSS & Enterprise Version | HCP Consul Version |
 | :--------------------- | :------------------------------ | :----------------- |
 | CTS Enterprise 0.6+    | 1.8+                            | 1.9+               |
 | CTS Enterprise 0.3-0.5 | 1.8+                            | N/A                |
diff --git a/website/content/docs/nia/configuration.mdx b/website/content/docs/nia/configuration.mdx
index ec53eccdada39..298e1b2b08c6a 100644
--- a/website/content/docs/nia/configuration.mdx
+++ b/website/content/docs/nia/configuration.mdx
@@ -84,7 +84,7 @@ license {
 
 ### Auto-retrieval
 
-You can use the `auto_retrieval` block to configure the automatic license retrieval in CTS. When enabled, CTS attempts to retrieve a new license from its configured Consul Enterprise backend once a day. If CTS cannot retrieve a license and the current license is reaching its expiration date, CTS attempts to retrieve a license with increased frequency, as defined by the [License Expiration Date Handling](/consul/docs/nia/enterprise/license#license-expiration-handling).
+You can use the `auto_retrieval` block to configure the the automatic license retrieval in CTS. When enabled, CTS attempts to retrieve a new license from its configured Consul Enterprise backend once a day. If CTS cannot retrieve a license and the current license is reaching its expiration date, CTS attempts to retrieve a license with increased frequency, as defined by the [License Expiration Date Handling](/consul/docs/nia/enterprise/license#license-expiration-handling).
 
 ~> Enabling `auto_retrieval` is recommended when using HCP Consul, as HCP Consul licenses expire more frequently than Consul Enterprise licenses. Without auto-retrieval enabled, you have to restart CTS every time you load a new license.
 
diff --git a/website/content/docs/nia/enterprise/index.mdx b/website/content/docs/nia/enterprise/index.mdx
index 56bb164748436..69aefb641b552 100644
--- a/website/content/docs/nia/enterprise/index.mdx
+++ b/website/content/docs/nia/enterprise/index.mdx
@@ -11,10 +11,10 @@ Consul-Terraform-Sync (CTS) Enterprise is available with [Consul Enterprise](htt
 
 Enterprise features of CTS address organization complexities of collaboration, operations, scale, and governance. CTS Enterprise supports an official integration with [Terraform Cloud](https://cloud.hashicorp.com/products/terraform) and [Terraform Enterprise](/terraform/enterprise), the self-hosted distribution, to extend insight into dynamic updates of your network infrastructure.
 
-| Features | Community Edition | Enterprise |
+| Features | Open Source | Enterprise |
 |----------|-------------|------------|
 | Consul Namespace | Default namespace only | Filter task triggers by any namespace |
-| Automation Driver | Terraform Community Edition | Terraform Community Edition, Terraform Cloud, or Terraform Enterprise |
+| Automation Driver | Terraform OSS | Terraform OSS, Terraform Cloud, or Terraform Enterprise |
 | Terraform Workspaces | Local | Local workspaces with the Terraform driver or [remote workspaces](/terraform/cloud-docs/workspaces) with the Terraform Cloud driver |
 | Terraform Backend Options | [azurerm](/terraform/language/settings/backends/azurerm), [consul](/terraform/language/settings/backends/consul), [cos](/terraform/language/settings/backends/cos), [gcs](/terraform/language/settings/backends/gcs), [kubernetes](/terraform/language/settings/backends/kubernetes), [local](/terraform/language/settings/backends/local), [manta](/terraform/language/v1.2.x/settings/backends/manta), [pg](/terraform/language/settings/backends/pg), and [s3](/terraform/language/settings/backends/s3) with the Terraform driver | The supported backends for CTS with the Terraform driver or Terraform Cloud with the Terraform Cloud driver |
 | Terraform Version | One Terraform version for all tasks | Optional Terraform version per task when using the Terraform Cloud driver |
diff --git a/website/content/docs/nia/usage/errors-ref.mdx b/website/content/docs/nia/usage/errors-ref.mdx
index 4cbb525a3a1cf..fafb9faf1ee18 100644
--- a/website/content/docs/nia/usage/errors-ref.mdx
+++ b/website/content/docs/nia/usage/errors-ref.mdx
@@ -11,7 +11,7 @@ This topic explains error messages you may encounter when using Consul-Terraform
 
 ## Example error log messages
 
-If you configured the CTS cluster to run in [high availability mode](/consul/docs/nia/usage/run-ha) and the local module is missing, then the following message appears in the log:
+If you configured the CTS cluster to run in [high availability mode](/consul/docs/nia/usage/run-ha) and the the local module is missing, then the following message appears in the log:
 
 ```shell-session
 [ERROR] ha.compat: error="compatibility check failure: stat ./example-module: no such file or directory"
diff --git a/website/content/docs/nia/usage/requirements.mdx b/website/content/docs/nia/usage/requirements.mdx
index 0fcdf1645ac1c..1950b84fb2ff2 100644
--- a/website/content/docs/nia/usage/requirements.mdx
+++ b/website/content/docs/nia/usage/requirements.mdx
@@ -31,19 +31,19 @@ For information on compatible Consul versions, refer to the [Consul compatibilit
 
 ### Run an agent
 
-The Consul agent must be running in order to dynamically update network devices. Refer to the [Consul agent documentation](/consul/docs/agent) for information about configuring and starting a Consul agent.
+The Consul agent must be running in order to dynamically update network devices. Refer to the [Consul agent documentation](/consul/docs/agent) for information about configuring and starting a Consul agent. For hands-on instructions about running Consul agents, refer to the [Getting Started: Run the Consul Agent Tutorial](/consul/tutorials/getting-started/get-started-agent).
 
 When running a Consul agent with CTS in production, consider that CTS uses [blocking queries](/consul/api-docs/features/blocking) to monitor task dependencies, such as changes to registered services. This  results in multiple long-running TCP connections between CTS and the agent to poll changes for each dependency. Consul may quickly reach the agent connection limits if CTS is monitoring a high number of services.
 
-To avoid reaching the limit prematurely, we recommend using HTTP/2 (requires HTTPS) to communicate between CTS and the Consul agent. When using HTTP/2, CTS establishes a single connection and reuses it for all communication. Refer to the [Consul Configuration section](/consul/docs/nia/configuration#consul) for details.
+To avoid reaching the limit prematurely, we recommend using HTTP/2 (requires HTTPS) to communicate between CTS and the Consul agent. When using HTTP/2, CTS establishes a single connection and reuses it for all communication. Refer to the [Consul Configuration section](/consul/docs/nia/configuration#consul) for details. 
 
-Alternatively, you can configure the [`limits.http_max_conns_per_client`](/consul/docs/agent/config/config-files#http_max_conns_per_client) option to set a maximum number of connections to meet your needs.
+Alternatively, you can configure the [`limits.http_max_conns_per_client`](/consul/docs/agent/config/config-files#http_max_conns_per_client) option to set a maximimum number of connections to meet your needs. 
 
 ### Register services
 
 CTS monitors the Consul catalog for service changes that lead to downstream changes to your network devices. Without services, your CTS daemon is operational but idle. You can register services with your Consul agent by either loading a service definition or by sending an HTTP API request.
 
-The following HTTP API request example registers a service named `web` with your Consul agent:
+The following HTTP API request example registers a service named `web` with your Consul agent: 
 
 ```shell-session
 $ echo '{
@@ -56,17 +56,17 @@ $ echo '{
 $ curl --request PUT --data @payload.json http://localhost:8500/v1/agent/service/register
 ```
 
-The example represents a non-existent web service running at `10.10.10.10:8000` that is now available for CTS to consume.
+The example represents a non-existent web service running at `10.10.10.10:8000` that is now available for CTS to consume. 
 
 You can configure CTS to monitor the web service, execute a task, and update network device(s) by configuring `web` in the [`condition "services"`](/consul/docs/nia/configuration#services-condition) task block. If the web service has any non-default values, it can also be configured in `condition "services"`.
 
 For more details on registering a service using the HTTP API endpoint, refer to the [register service API docs](/consul/api-docs/agent/service#register-service).
 
-For hands-on instructions on registering a service by loading a service definition, refer to the [Getting Started: Register a Service with Consul Service Discovery Tutorial](/consul/tutorials/get-started-vms/virtual-machine-gs-service-discovery).
+For hands-on instructions on registering a service by loading a service definition, refer to the [Getting Started: Register a Service with Consul Service Discovery Tutorial](/consul/tutorials/getting-started/get-started-service-discovery).
 
 ### Run a cluster
 
-For production environments, we recommend operating a Consul cluster rather than a single agent. Refer to [Getting Started: Deploy a Consul Datacenter Tutorial](/consul/tutorials/get-started-vms/virtual-machine-gs-deploy) for instructions on starting multiple Consul agents and joining them into a cluster.
+For production environments, we recommend operating a Consul cluster rather than a single agent. Refer to [Getting Started: Create a Local Consul Datacenter](/consul/tutorials/getting-started/get-started-create-datacenter) for instructions on starting multiple Consul agents and joining them into a cluster.
 
 ## Network infrastructure using a Terraform provider
 
@@ -80,8 +80,8 @@ To find providers for the infrastructure platforms you use, browse the providers
 
 If a Terraform provider does not exist for your environment, you can create a new Terraform provider and publish it to the registry so that you can use it within a network integration task or create a compatible Terraform module. Refer to the following Terraform tutorial and documentation for additional information on creating and publishing providers:
 
-- [Setup and Implement Read](/terraform/tutorials/providers/provider-setup)
-- [Publishing Providers](/terraform/registry/providers/publishing).
+- [Setup and Implement Read](/terraform/tutorials/providers/provider-setup) 
+- [Publishing Providers](/terraform/registry/providers/publishing). 
 
 ## Network integration using a Terraform module
 
diff --git a/website/content/docs/nia/usage/run-ha.mdx b/website/content/docs/nia/usage/run-ha.mdx
index 6152007255b7f..1623cd66ce3b9 100644
--- a/website/content/docs/nia/usage/run-ha.mdx
+++ b/website/content/docs/nia/usage/run-ha.mdx
@@ -1,16 +1,14 @@
 ---
 layout: docs
-page_title: Run Consul-Terraform-Sync with high availability
+page_title: Run Consul-Terraform-Sync with High Availability
 description: >-
   Improve network automation resiliency by enabling high availability for Consul-Terraform-Sync. HA enables persistent task and event data so that CTS functions as expected during a failover event.
 ---
 
-# Run Consul-Terraform-Sync with high availability
-
+# Run Consul-Terraform-Sync with High Availability
 <EnterpriseAlert>
-  An enterprise license is only required for enterprise distributions of Consul-Terraform-Sync (CTS).
+  Licenses are only required for Consul-Terraform-Sync (CTS) Enterprise
 </EnterpriseAlert>
-
 This topic describes how to run Consul-Terraform-Sync (CTS) configured for high availability. High availability is an enterprise capability that ensures that all changes to Consul that occur during a failover transition are processed and that CTS continues to operate as expected.
 
 ## Introduction
@@ -18,10 +16,10 @@ This topic describes how to run Consul-Terraform-Sync (CTS) configured for high
 A network always has exactly one instance of the CTS cluster that is the designated leader. The leader is responsible for monitoring and running tasks. If the leader fails, CTS triggers the following process when it is configured for high availability:
 
 1. The CTS cluster promotes a new leader from the pool of followers in the network.
-1. The new leader begins running all existing tasks in `once-mode` in order to process changes that occurred during the failover transition period. In this mode, CTS runs all existing tasks one time.
-1. The new leader logs any errors that occur during `once-mode` operation and the new leader continues to monitor Consul for changes.
+1. The new leader begins running all existing tasks in `once-mode` in order to process changes that occurred during the failover transition period. In this mode, CTS runs all existing tasks one time. 
+1. The new leader logs any errors that occur during `once-mode` operation and the new leader continues to monitor Consul for changes. 
 
-In a standard configuration, CTS exits if errors occur when the CTS instance runs tasks in `once-mode`. In a high availability configuration, CTS logs the errors and continues to operate without interruption.
+In a standard configuration, CTS exits if errors occur when the CTS instance runs tasks in `once-mode`. In a high availability configuration, CTS logs the errors and continues to operate without interruption. 
 
 The following diagram shows operating state when high availability is enabled. CTS Instance A is the current leader and is responsible for monitoring and running tasks:
 
@@ -36,28 +34,28 @@ The following diagram shows the CTS cluster state after the leader stops. CTS In
 - The time it takes for a new leader to be elected is determined by the `high_availability.cluster.storage.session_ttl` configuration. The minimum failover time is equal to the `session_ttl` value. The maximum failover time is double the `session_ttl` value.
 - If failover occurs during task execution, a new leader is elected. The new leader will attempt to run all tasks once before continuing to monitor for changes.
 - If using the [Terraform Cloud (TFC) driver](/consul/docs/nia/network-drivers/terraform-cloud), the task finishes and CTS starts a new leader that attempts to queue a run for each task in TFC in once-mode.
-- If using [Terraform driver](/consul/docs/nia/network-drivers/terraform), the task may complete depending on the cause of the failover. The new leader starts and attempts to run each task in [once-mode](/consul/docs/nia/cli/start#modes). Depending on the module and provider, the task may require manual intervention to fix any inconsistencies between the infrastructure and Terraform state.
+- If using [Terraform driver](/consul/docs/nia/network-drivers/terraform), the task may complete depending on the cause of the failover. The new leader starts and attempts to run each task in [once-mode](/consul/docs/nia/cli/start#modes). Depending on the module and provider, the task may require manual intervention to fix any inconsistencies between the infrastructure and Terraform state. 
 - If failover occurs when no task is executing, CTS elects a new leader that attempts to run all tasks in once-mode.
 
 Note that driver behavior is consistent whether or not CTS is running in high availability mode.
 
 ## Requirements
 
-Verify that you have met the [basic requirements](/consul/docs/nia/usage/requirements) for running CTS.
+Verify that you have met the [basic requirements](/consul/docs/nia/usage/requirements) for running CTS. 
 
 * CTS Enterprise 0.7 or later
 * Terraform CLI 0.13 or later
 * All instances in a cluster must be in the same datacenter.
 
-You must configure appropriate ACL permissions for your cluster. Refer to [ACL permissions](#) for details.
+You must configure appropriate ACL permissions for your cluster. Refer to [ACL permissions](#) for details. 
 
-We recommend specifying the [TFC driver](/consul/docs/nia/network-drivers/terraform-cloud) in your CTS configuration if you want to run in high availability mode.
+We recommend specifying the [TFC driver](/consul/docs/nia/network-drivers/terraform-cloud) in your CTS configuration if you want to run in high availability mode. 
 
 ## Configuration
 
-Add the `high_availability` block in your CTS configuration and configure the required settings to enable high availability. Refer to the [Configuration reference](/consul/docs/nia/configuration#high-availability) for details about the configuration fields for the `high_availability` block.
+Add the `high_availability` block in your CTS configuration and configure the required settings to enable high availability. Refer to the [Configuration reference](/consul/docs/nia/configuration#high-availability) for details about the configuration fields for the `high_availability` block. 
 
-The following example configures high availability functionality for a cluster named `cts-cluster`:
+The following example configures high availability functionality for a cluster named `cts-cluster`: 
 
 <CodeBlockConfig filename="cts-config.hcl">
 
@@ -83,17 +81,17 @@ high_availability {
 
 The `session` and `keys` resources in your Consul environment must have `write` permissions. Refer to the [ACL documentation](/consul/docs/security/acl) for details on how to define ACL policies.
 
-If the `high_availability.cluster.storage.namespace` field is configured, then your ACL policy must also enable `write` permissions for the `namespace` resource.
+If the `high_availability.cluster.storage.namespace` field is configured, then your ACL policy must also enable `write` permissions for the `namespace` resource.  
 
-## Start a new CTS cluster
+## Start a new CTS cluster 
 
 We recommend deploying a cluster that includes three CTS instances. This is so that the cluster has one leader and two followers.
 
 1. Create an HCL configuration file that includes the settings you want to include, including the `high_availability` block. Refer to [Configuration Options for Consul-Terraform-Sync](/consul/docs/nia/configuration) for all configuration options.
-1. Issue the startup command and pass the configuration file. Refer to the [`start` command reference](/consul/docs/nia/cli/start#modes) for additional information about CTS startup modes.
+1. Issue the startup command and pass the configuration file. Refer to the [`start` command reference](/consul/docs/nia/cli/start#modes) for additional information about CTS startup modes. 
   ```shell-session
   $ consul-terraform-sync start -config-file ha-config.hcl
-  ```
+  ```  
 1. You can call the `/status` API endpoint to verify the status of tasks CTS is configured to monitor. Only the leader of the cluster will return a successful response. Refer to the [`/status` API reference documentation](/consul/docs/nia/api/status) for information about usage and responses.
 
   ```shell-session
@@ -102,9 +100,9 @@ We recommend deploying a cluster that includes three CTS instances. This is so t
 
 Repeat the procedure to start the remaining instances for your cluster. We recommend using near-identical configurations for all instances in your cluster. You may not be able to use exact configurations in all cases, but starting instances with the same configuration improves consistency and reduces confusion if you need to troubleshoot errors.
 
-## Modify an instance configuration
+## Modify an instance configuration 
 
-You can implement a rolling update to update a non-task configuration for a CTS instance, such as the Consul connection settings. If you need to update a task in the instance configuration, refer to [Modify tasks](#modify-tasks).
+You can implement a rolling update to update a non-task configuration for a CTS instance, such as the Consul connection settings. If you need to update a task in the instance configuration, refer to [Modify tasks](#modify-tasks). 
 
 1. Identify the leader CTS instance by either making a call to the [`status/cluster` API endpoint](/consul/docs/nia/api/status#cluster-status) or by checking the logs for the following entry:
   ```shell-session
@@ -112,19 +110,19 @@ You can implement a rolling update to update a non-task configuration for a CTS
   ```
 1. Stop one of the follower CTS instances and apply the new configuration.
 1. Restart the follower instance.
-1. Repeat steps 2 and 3 for other follower instances in your cluster.
+1. Repeat steps 2 and 3 for other follower instances in your cluster. 
 1. Stop the leader instance. One of the follower instances becomes the leader.
 1. Apply the new configuration to the former leader instance and restart it.
 
-## Modify tasks
+## Modify tasks 
 
-When high availability is enabled, CTS persists task and event data. Refer to [State storage and persistence](/consul/docs/nia/architecture#state-storage-and-persistence) for additional information.
+When high availability is enabled, CTS persists task and event data. Refer to [State storage and persistence](/consul/docs/nia/architecture#state-storage-and-persistence) for additional information. 
 
 You can use the following methods for modifying tasks when high availability is enabled. We recommend choosing a single method to make all task configuration changes because inconsistencies between the state and the configuration can occur when mixing methods.
 
-### Delete and recreate the task
-
-We recommend deleting and recreating a task if you need to make a modification. Use the CTS API to identify the CTS leader instance and replace a task.
+### Delete and recreate the task (recommended)
+ 
+Use the CTS API to identify the CTS leader instance as well as delete and replace a task. 
 
 1. Identify the leader CTS instance by either making a call to the [`status/cluster` API endpoint](/consul/docs/nia/api/status#cluster-status) or by checking the logs for the following entry:
 
@@ -137,19 +135,19 @@ We recommend deleting and recreating a task if you need to make a modification.
   $ curl --request DELETE  localhost:8558/v1/tasks/task_a
   ```
 
- You can also use the [`task delete` command](/consul/docs/nia/cli/task#task-delete) to complete this step.
+ You can also use the [`task delete` command](/consul/docs/nia/cli/task#task-delete) to complete this step. 
 
-1. Send a `POST` call to the `/task/<task-name>` endpoint and include the updated task in your payload.
+1. Send a `POST` call to the `/task/<task-name>` endpoint and include the updated task in your payload. 
   ```shell-session
-  $curl --header "Content-Type: application/json" \
-  --request POST \
+  $curl --header "Content-Type: application/json" \  
+  --request POST \  
   --data @payload.json \
   localhost:8558/v1/tasks
-  ```
-
+``` 
+  
   You can also use the [`task-create` command](/consul/docs/nia/cli/task#task-create) to complete this step.
 
-### Discard data with the `-reset-storage` flag
+### Discard data with the `-reset-storage` flag 
 
 You can restart the CTS cluster using the [`-reset-storage` flag](/consul/docs/nia/cli/start#options) to discard persisted data if you need to update a task.
 
@@ -158,7 +156,7 @@ You can restart the CTS cluster using the [`-reset-storage` flag](/consul/docs/n
 1. Restart the instance and include the `-reset-storage` flag.
 1. Stop all other instances so that the updated instance becomes the leader.
 1. Start all other instances again.
-1. Restart the instance you restarted in step 3 without the `-reset-storage` flag so that it starts up with the current state. If you continue to run an instance with the `-reset-storage` flag enabled, then CTS will reset the state data whenever the instance becomes the leader.
+1. Restart the instance you restarted in step 3 without the `-reset-storage` flag so that it starts up with the current state. If you continue to run an instance with the `-reset-storage` flag enabled, then CTS will reset the state data whenever the instance becomes the leader. 
 
 ## Troubleshooting
 
@@ -169,9 +167,9 @@ Use the following troubleshooting procedure if a previous leader had been runnin
   2022-08-23T09:25:09.501-0700 [ERROR] tasksmanager: error applying task: task_name=config-task
   error=
   | error tf-apply for 'config-task': exit status 1
-  |
+  | 
   | Error: GET https://api.github.com/user: 401 Bad credentials []
-  |
+  | 
   | with module.config-task.provider["registry.terraform.io/integrations/github"],
   | on .terraform/modules/config-task/main.tf line 11, in provider "github":
   | 11: provider "github" {
@@ -179,5 +177,5 @@ Use the following troubleshooting procedure if a previous leader had been runnin
   ```
 1. Check for differences between the previous leader and new leader, such as differences in configurations, environment variables, and local resources.
 1. Start a new instance with the fix that resolves the issue.
-1. Tear down the leader instance that has the issue and any other instances that may have the same issue.
-1. Restart the affected instances to implement the fix.
+1. Tear down the leader instance that has the issue and any other instances that may have the same issue. 
+1. Restart the affected instances to implement the fix. 
diff --git a/website/content/docs/release-notes/consul-api-gateway/v0_1_x.mdx b/website/content/docs/release-notes/consul-api-gateway/v0_1_x.mdx
index efb65ec71adfa..293b3ffa83726 100644
--- a/website/content/docs/release-notes/consul-api-gateway/v0_1_x.mdx
+++ b/website/content/docs/release-notes/consul-api-gateway/v0_1_x.mdx
@@ -19,7 +19,7 @@ gateway functionality. It provides additional capabilities that ingress gateway
 
 1. It allows you to configure and deploy new gateways at any time, without
    rerunning the Consul Helm chart. The configuration of a running gateway can
-   be changed dynamically at anytime, usually without disrupting any the
+   be changed dynamically at anytime, usually without disrupting any the the
    traffic flowing through it.
 1. Listeners on a gateway can use TLS server certificates signed by any
    certificate authority (CA). This allows you to use certificates from public
diff --git a/website/content/docs/release-notes/consul-api-gateway/v0_2_x.mdx b/website/content/docs/release-notes/consul-api-gateway/v0_2_x.mdx
index 73e86d94807e9..20603c9ba6321 100644
--- a/website/content/docs/release-notes/consul-api-gateway/v0_2_x.mdx
+++ b/website/content/docs/release-notes/consul-api-gateway/v0_2_x.mdx
@@ -39,7 +39,7 @@ Supported version of the [Gateway API](https://gateway-api.sigs.k8s.io/) spec: `
 
 ~> **Note**: If your current deployment has routes and and services that cross namespaces, those routes will not be applied to their gateways until cross namespace reference policies are created for them.
 
-For detailed information on upgrading, including how to create the required reference policies, please refer to the [upgrade details page](/consul/docs/connect/gateways/api-gateway/upgrades-k8s)
+For detailed information on upgrading, including how to create the required reference policies, please refer to the [upgrade details page](/consul/docs/api-gateway/upgrades)
 
 ## Change logs
 
diff --git a/website/content/docs/release-notes/consul-api-gateway/v0_3_x.mdx b/website/content/docs/release-notes/consul-api-gateway/v0_3_x.mdx
index 8e7b4a7c32139..d5b801d6fab01 100644
--- a/website/content/docs/release-notes/consul-api-gateway/v0_3_x.mdx
+++ b/website/content/docs/release-notes/consul-api-gateway/v0_3_x.mdx
@@ -47,7 +47,7 @@ Supported version of the [Gateway API](https://gateway-api.sigs.k8s.io/) spec: `
 
 ## Upgrading
 
-For detailed information on upgrading, please refer to the [upgrade details page](/consul/docs/connect/gateways/api-gateway/upgrades-k8s)
+For detailed information on upgrading, please refer to the [upgrade details page](/consul/docs/api-gateway/upgrades)
 
 ## Changelogs
 
diff --git a/website/content/docs/release-notes/consul-api-gateway/v0_4_x.mdx b/website/content/docs/release-notes/consul-api-gateway/v0_4_x.mdx
index 5ac32c8685367..71fa38c8965d3 100644
--- a/website/content/docs/release-notes/consul-api-gateway/v0_4_x.mdx
+++ b/website/content/docs/release-notes/consul-api-gateway/v0_4_x.mdx
@@ -31,7 +31,7 @@ description: >-
   to rewrite the URL path in a client's HTTP request before sending the request
   to a service. For example, you could configure the gateway to change the path
   from `//store/checkout` to `//cart/checkout`. Refer to the [usage
-  documentation](/consul/docs/connect/gateways/api-gateway/define-routes/reroute-http-requests) for additional information.  
+  documentation](/consul/docs/connect/gateways/api-gateway/usage) for additional information.  
 
 ## What has Changed
 
@@ -41,7 +41,7 @@ description: >-
   in a future version of the standard.
 
   After upgrading to this version of Consul API Gateway, you should rename all
-  existing `ReferencePolicy` to `ReferenceGrant`. Refer to the [Upgrades](/consul/docs/connect/gateways/api-gateway/upgrades-k8s)
+  existing `ReferencePolicy` to `ReferenceGrant`. Refer to the [Upgrades](/consul/docs/api-gateway/upgrades)
   instructions for additional details.
 
 ## Supported Software
@@ -60,7 +60,7 @@ Supported version of the [Gateway API](https://gateway-api.sigs.k8s.io/) spec: v
 
 ## Upgrading
 
-For detailed information on upgrading, please refer to the [Upgrades page](/consul/docs/connect/gateways/api-gateway/upgrades-k8s)
+For detailed information on upgrading, please refer to the [Upgrades page](/consul/docs/api-gateway/upgrades)
 
 ## Known Issues
 The following issues are know to exist in the v0.4.0 release
diff --git a/website/content/docs/release-notes/consul-api-gateway/v0_5_x.mdx b/website/content/docs/release-notes/consul-api-gateway/v0_5_x.mdx
index 43d788350ae12..c32b735bb6fa7 100644
--- a/website/content/docs/release-notes/consul-api-gateway/v0_5_x.mdx
+++ b/website/content/docs/release-notes/consul-api-gateway/v0_5_x.mdx
@@ -13,7 +13,7 @@ We are pleased to announce the following updates to Consul API Gateway.
 
 - **Consul Dataplane Support:** Consul 1.14 introduces a simplified deployment architecture that eliminates the need to deploy node-level Consul clients on Kubernetes. This is referred to as Consul Dataplane. API Gateway 0.5.0 supports this type of deployment.
 
-- **Routing to Services in Peered Clusters:** API Gateway now supports the ability to route traffic to services that are imported from peered Consul clusters. Cluster peering is was added in Consul 1.14. Refer to the `MeshService` [documentation](/consul/docs/connect/gateways/api-gateway/configuration/meshservice) for additional information.
+- **Routing to Services in Peered Clusters:** API Gateway now supports the ability to route traffic to services that are imported from peered Consul clusters. Cluster peering is was added in Consul 1.14. Refer to the `MeshService` [documentation](/consul/docs/api-gateway/configuration/meshservice) for additional information.
 
 - **Deploy in Admin Partitions:** API Gateway can now be deployed in any Consul admin partition. Previous versions of API Gateway could only be deployed in the default partition. The partition is configured in the `GatewayClassConfig`.
 
@@ -40,7 +40,7 @@ Supported version of the [Gateway API](https://gateway-api.sigs.k8s.io/) spec: v
 
 ## Upgrading
 
-For detailed information on upgrading, please refer to the [Upgrades page](/consul/docs/connect/gateways/api-gateway/upgrades-k8s)
+For detailed information on upgrading, please refer to the [Upgrades page](/consul/docs/api-gateway/upgrades)
 
 ## Known issues
 At the time of release, there are no known issues in API Gateway v0.5.0
diff --git a/website/content/docs/release-notes/consul-ecs/v0_5_x.mdx b/website/content/docs/release-notes/consul-ecs/v0_5_x.mdx
index c6282bffafdd5..4aa6de68a19f7 100644
--- a/website/content/docs/release-notes/consul-ecs/v0_5_x.mdx
+++ b/website/content/docs/release-notes/consul-ecs/v0_5_x.mdx
@@ -11,9 +11,9 @@ description: >-
 
 - **Audit Logging (Enterprise) :** Consul on ECS now captures authentication events and processes them with the HTTP API. Audit logging provides insight into access and usage patterns. Refer to [Audit Logging](/consul/docs/ecs/enterprise#audit-logging) for usage information.
 
-- **AWS IAM Auth Method :** This feature provides support for Consul's AWS IAM auth method. This allows AWS IAM roles and users to authenticate with Consul to obtain ACL tokens. Refer to [ECS Configuration Reference](/consul/docs/ecs/reference/configuration-reference#consullogin) for configuration information.
+- **AWS IAM Auth Method :** This feature provides support for Consul's AWS IAM auth method. This allows AWS IAM roles and users to authenticate with Consul to obtain ACL tokens. Refer to [ECS Configuration Reference](/consul/docs/ecs/configuration-reference#consullogin) for configuration information.
 
-- **Mesh Gateways :** This feature introduces support for running mesh gateways as ECS tasks. Mesh gateways enable service mesh communication across datacenter and admin partition boundaries. Refer to [ECS Installation with Terraform](/consul/docs/ecs/deploy/terraform#configure-the-gateway-task-module) for usage information.
+- **Mesh Gateways :** This feature introduces support for running mesh gateways as ECS tasks. Mesh gateways enable service mesh communication across datacenter and admin partition boundaries. Refer to [ECS Installation with Terraform](/consul/docs/ecs/terraform/install#configure-the-gateway-task-module) for usage information.
 
 ## Supported Software Versions
 
diff --git a/website/content/docs/release-notes/consul-k8s/v1_0_x.mdx b/website/content/docs/release-notes/consul-k8s/v1_0_x.mdx
index caa67d526bc2c..5de0b43f58247 100644
--- a/website/content/docs/release-notes/consul-k8s/v1_0_x.mdx
+++ b/website/content/docs/release-notes/consul-k8s/v1_0_x.mdx
@@ -11,9 +11,9 @@ description: >-
 
 - **Simplified Service Mesh Deployments with Consul Dataplane:** Consul client agents are no longer deployed by default, and Consul service mesh no longer uses Consul clients to operate. A new component `consul-dataplane` is now injected as a sidecar-proxy instead of plain Envoy. `consul-dataplane` manages the Envoy proxy process and proxies xDS requests from Envoy to Consul servers. All service mesh consul-k8s components are configured to talk directly to Consul servers.
 
-- **Cluster Peering GA with Peering over Mesh Gateways:** This version promotes Cluster Peering, a new model to federate Consul clusters for both service mesh and traditional service discovery, to General Availability. Cluster peering allows for service interconnectivity with looser coupling than the existing WAN federation. Cluster Peering on Consul K8s now enables [Cluster Peering with Control Plane traffic routed via Mesh Gateways](/consul/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways) by default instead of provisioning load balancers using the `servers.exposeServers` stanza. In addition, failover for service to service traffic over Cluster Peering can be configured through the `failover.targets` field in the [ServiceResolver](/consul/docs/connect/config-entries/service-resolver#targets) CRD.
-
-- **Consul API Gateway 0.5.0 Support:** Support to run Consul API Gateway without clients and allow Consul API Gateway to directly connect to Consul servers.
+- **Cluster Peering GA with Peering over Mesh Gateways:** This version promotes Cluster Peering, a new model to federate Consul clusters for both service mesh and traditional service discovery, to General Availability. Cluster peering allows for service interconnectivity with looser coupling than the existing WAN federation. Cluster Peering on Consul K8s now enables [Cluster Peering with Control Plane traffic routed via Mesh Gateways](/consul/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways) by default instead of provisioning load balancers using the `servers.exposeServers` stanza. In addtion, failover for service to service traffic over Cluster Peering can be configured through the `failover.targets` field in the [ServiceResolver](/consul/docs/connect/config-entries/service-resolver#targets) CRD.  
+  
+- **Consul API Gateway 0.5.0 Support:** Support to run Consul API Gateway without clients and allow Consul API Gateway to directly connect to Consul servers. 
 
 ## What's Changed
 
@@ -22,27 +22,27 @@ description: >-
 - `externalServers.hosts` no longer supports [cloud auto-join](/consul/docs/install/cloud-auto-join) strings directly. Instead, include an [`exec=`](https://github.com/hashicorp/go-netaddrs#command-line-tool-usage) string in the `externalServers.hosts` list to invoke the `discover` CLI. For example, the following string invokes the `discover` CLI with a cloud auto-join string: `exec=discover -q addrs provider=aws region=us-west-2 tag_key=consul-server tag_value=true`. The `discover` CLI is included in the official `hashicorp/consul-dataplane` images by default.
 - `sync-catalog` now communicates directly to Consul servers. When communicating to servers outside of Kubernetes, use the `externalServers.hosts` stanza as described in [Join External Servers to Consul on Kubernetes](/consul/docs/k8s/deployment-configurations/servers-outside-kubernetes).
 - Consul snapshot agent runs as a sidecar to Consul servers. <EnterpriseAlert inline />
-  - `client.snapshotAgent` values are moved to `server.snapshotAgent`, with the exception of the following values: `client.snapshotAgent.replicas`, `client.snapshotAgent.serviceAccount`
-  - `global.secretsBackend.vault.consulSnapshotAgentRole` value is now removed. You should now use the `global.secretsBackend.vault.consulServerRole` for access to any Vault secrets.
+  - `client.snapshotAgent` values are moved to `server.snapshotAgent`, with the exception of the following values: `client.snaphostAgent.replicas`, `client.snaphostAgent.serviceAccount`
+  - `global.secretsBackend.vault.consulSnapshotAgentRole` value is now removed. You should now use the `global.secretsBackend.vault.consulServerRole` for access to any Vault secrets. 
 -  Support simplified default deployment values to allow for easier quick starts and testing:
-    * Set `server.replicas` to `1`. Formerly, this defaulted to `3`.
-    * `connectInject.enabled` now defaults to true.
-    * `dns.enabled` and `dns.enableRedirection` will now default to the value of `connectInject.transparentProxy.defaultEnabled`. Previously, `dns.enabled` defaulted to the value of `global.enabled` and `dns.enableRedirection` defaulted to the value to `false`.
-    * Set `connectInject.replicas` to 1
+    * Set `server.replicas` to `1`. Formerly, this defaulted to `3`. 
+    * `connectInject.enabled` now defaults to true. 
+    * `dns.enabled` and `dns.enableRedirection` will now default to the value of `connectInject.transparentProxy.defaultEnabled`. Previously, `dns.enabled` defaulted to the value of `global.enabled` and `dns.enableRedirection` defaulted to the value to `false`. 
+    * Set `connectInject.replicas` to 1 
     * Set `meshGateway.affinity` to null and `meshGateway.replicas` to 1
-    * Set `ingressGateways.defaults.affinity` to null and `ingressGateways.defaults.replicas` to 1
+    * Set `ingressGateways.defaults.affinity` to null and `ingressGateways.defaults.replicas` to 1 
     * Set `terminatingGateways.defaults.affinity` to null and `terminatingGateways.defaults.replicas` to 1
     * `syncCatalog.consulNamespaces.mirroringK8S` now defaults to `true`. <EnterpriseAlert inline />
     * `connectInject.consulNamespaces.mirroringK8S` now defaults to `true`. <EnterpriseAlert inline />
-- `global.imageEnvoy` is now replaced with `global.imageConsulDataplane` for running the sidecar proxy. apiGateway.imageEnvoy` is now available  for configuring the version of Envoy that the API Gateway uses.
-
+- `global.imageEnvoy` is now replaced with `global.imageConsulDataplane` for running the sidecar proxy. apiGateway.imageEnvoy` is now available  for configuring the version of Envoy that the API Gateway uses. 
+  
 ## Supported Software
 
-~> **Note:** Consul 1.13.x and 1.12.x is not supported. Please use Consul K8s 0.49.x if you want to use Consul 1.13.x or 1.12.x.
-- Consul 1.14.x.
-- Consul Dataplane v1.0.x. Refer to [Envoy and Consul Dataplane](/consul/docs/connect/proxies/envoy#envoy-and-consul-dataplane) for details about Consul Dataplane versions and the available packaged Envoy version.
+~> **Note:** Consul 1.13.x and 1.12.x is not supported. Please use Consul K8s 0.49.x if you want to use Consul 1.13.x or 1.12.x. 
+- Consul 1.14.x. 
+- Consul Dataplane v1.0.x. Refer to [Envoy and Consul Dataplane](/consul/docs/connect/proxies/envoy#envoy-and-consul-dataplane) for details about Consul Dataplane versions and the available packaged Envoy version. 
 - Kubernetes 1.22.x - 1.25.x
-- `kubectl` 1.22.x - 1.25.x
+- `kubectl` 1.22.x - 1.25.x 
 - Helm 3.6+
 
 ## Upgrading
@@ -51,9 +51,9 @@ For detailed information on upgrading, please refer to the [Upgrades page](/cons
 
 ## Known Issues
 
-The following issues are known to exist in the v1.0.0 release:
+The following issues are known to exist in the v1.0.0 release: 
 
-- Pod Security Standards that are configured for the [Pod Security Admission controller](https://kubernetes.io/blog/2022/08/25/pod-security-admission-stable/) are currently not supported by Consul K8s. OpenShift 4.11.x enables Pod Security Standards on Kubernetes 1.25 [by default](https://connect.redhat.com/en/blog/important-openshift-changes-pod-security-standards) and is also not supported. Support will be added in a future Consul K8s 1.0.x patch release.
+- Pod Security Standards that are configured for the [Pod Security Admission controller](https://kubernetes.io/blog/2022/08/25/pod-security-admission-stable/) are currently not supported by Consul K8s. OpenShift 4.11.x enables Pod Security Standards on Kubernetes 1.25 [by default](https://connect.redhat.com/en/blog/important-openshift-changes-pod-security-standards) and is also not supported. Support will be added in a future Consul K8s 1.0.x patch release. 
 
 ## Changelogs
 
diff --git a/website/content/docs/release-notes/consul-k8s/v1_2_x.mdx b/website/content/docs/release-notes/consul-k8s/v1_2_x.mdx
deleted file mode 100644
index a606042f1f44c..0000000000000
--- a/website/content/docs/release-notes/consul-k8s/v1_2_x.mdx
+++ /dev/null
@@ -1,86 +0,0 @@
----
-layout: docs
-page_title: 1.2.x
-description: >-
-  Consul on Kubernetes release notes for version 1.2.x
----
-
-# Consul on Kubernetes 1.2.0
-
-We are pleased to announce the following Consul updates. 
-
-## Release highlights
-
-- **Sameness groups (Enterprise):** Sameness groups are a user-defined set of partitions that Consul uses to identify services in different administrative partitions with the same name as being the same services. You can use sameness groups to create a blanket failover policy for deployments with cluster peering connections. Refer to the [Sameness groups overview](/consul/docs/connect/cluster-peering/usage/create-sameness-groups) for more information.
-
-   <Note> Sameness groups is currently a beta feature in Consul Enterprise v1.16.0. </Note>
-
-- **Permissive mTLS:** You can enable the `permissive` mTLS mode to enable sidecar proxies to accept both mTLS and non-mTLS traffic. Using this mode enables you to onboard services without downtime and without reconfiguring or redeploying your application. Refer to the [Onboard services while in transparent proxy mode](/consul/docs/k8s/connect/onboarding-tproxy-mode) for more information on how to use permissive mTLS to onboard services to Consul.
-
-- **Transparent proxy enhancements for failover and virtual services:** We have made several internal improvements, such as ensuring that virtual IPs are always available, to reduce the friction associated with operating Consul in transparent proxy mode. Onboarding services, configuring failover redirects, and other operations require less administrative effort and ensure a smoother experience. Refer to the following documentation for additional information: 
-
-    - [Onboard services while in transparent proxy mode](/consul/docs/k8s/connect/onboarding-tproxy-mode)
-    - [Route traffic to virtual services](/consul/docs/k8s/l7-traffic/route-to-virtual-services)
-    - [Configure failover services](/consul/docs/k8s/l7-traffic/failover-tproxy).
-
-- **Granular server-side rate limits (Enterprise):** You can now set limits per source IP address. The following steps describe the general process for setting global read and write rate limits:
-
-    1. Set arbitrary limits to begin understanding the upper boundary of RPC and gRPC loads in your network. Refer to [Initialize rate limit settings](/consul/docs/agent/limits/usage/init-rate-limits) for additional information.
-    1. Monitor the metrics and logs and readjust the initial configurations as necessary. Refer to [Monitor rate limit data](/consul/docs/agent/limits/usage/monitor-rate-limits)
-    1. Define your final operational limits based on your observations. If you are defining global rate limits, refer to [Set global traffic rate limits](/consul/docs/agent/limits/usage/set-global-traffic-rate-limits) for additional information. For information about setting limits based on source IP, refer to [Limit traffic rates for a source IP](/consul/docs/agent/limits/usage/limit-request-rates-from-ips).
-
-- **Consul Envoy Extensions:** Consul Envoy extension system enables you to modify Consul-generated Envoy resources. Refer to [Envoy extension overview](/consul/docs/connect/proxies/envoy-extensions) for more information on how to use these extensions for Consul service mesh.
-
-    - **Property Override:** The property override Envoy extension lets you set, remove, or modify individual properties for the Envoy resources Consul generates. Refer to the [Configure Envoy proxy properties](/consul/docs/connect/proxies/envoy-extensions/usage/property-override) for more information on how to use this extension. 
-
-    - **Wasm:** The Wasm Envoy extension lets you configure Wasm programs to be used as filters in the service's sidecar proxy. Refer to the [Run WebAssembly plug-ins in Envoy proxy](/consul/docs/connect/proxies/envoy-extensions/usage/wasm) for more information on how to use this extension. 
-
-    - **External Authorization:** The external authorization Envoy extension lets you delegate data plane authorization requests to external systems. Refer to the [Delegate authorization to an external service](/consul/docs/connect/proxies/envoy-extensions/usage/ext-authz) for more information on how to use this extension. 
-
-- **Simplified API Gateway installation for Consul on Kubernetes:** API Gateway is now built into Consul. This enables a simplified installation and configuration process for Consul on Kubernetes. Refer to the [API Gateway installation](/consul/docs/connect/gateways/api-gateway/install-k8s) for more information on the simplified native installation method. 
-
-- **FIPS compliance (Enterprise):** HashiCorp now offers FIPS 140-2 compliant builds of Consul Enterprise that meet the security needs of federal agencies protecting sensitive, unclassified information with approved cryptographic measures. These builds use certified cryptographic modules and restrict configuration settings to comply with FIPS 140-2 Level 1 requirements, enabling compliant Consul deployments. Refer to the [Consul Enterprise FIPS](/consul/docs/enterprise/fips) for more information on FIPS compliance.
-
-- **JWT Authorization with service intentions:** Consul can now authorize connections based on claims present in JSON Web Token (JWT). You can configure Consul to use one or more JWT providers, which lets you control access to services and specific HTTP paths based on the validity of JWT claims embedded in the service traffic. This ensures a uniform and low latency mechanism to validate and authorize communication based on JWT claims across all services in a diverse service-oriented architecture. Refer to the [Use JWT authorization with service intentions](/consul/docs/connect/intentions/jwt-authorization) for more information.
-
-- **Automated license utilization reporting (Enterprise):** Consul Enterprise now provides automated license utilization reporting, which sends minimal product-license metering data to HashiCorp. You can use these reports to understand how much more you can deploy under your current contract, which can help you protect against overutilization and budget for predicted consumption. Refer to the [Automated license utilization reporting documentation](/consul/docs/enterprise/license/utilization-reporting) for more information. 
-
-## What's deprecated
-
-- **Ingress gateway:** Starting with this release, ingress gateway is deprecated and will not be enhanced beyond its current capabilities. Ingress gateway is fully supported in this version but may be removed in a future release of Consul. 
-
-  Consul's API gateway is the recommended alternative to ingress gateway. For ingress gateway features not currently supported by API gateway, equivalent functionality will be added to API gateway over the next several releases of Consul.
-
-- **Legacy API Gateway:** The Consul AP Gateway that was previously packaged (`consul-api-gateway`) and released separately from Consul K8s is now deprecated. This is referred to as the "legacy" API Gateway.
-
-  The legacy API Gateway (v0.5.4) is supported with this version of Consul on Kubernetes in order to simplify the process of migrating from legacy to native API gateways.
-
-## What's changed
-
-- The native API Gateway creates "API-gateway" configuration objects in Consul. This is a change from the legacy API Gateway, which creates "ingress-gateway" objects in Consul.
-
-- The native API Gateway in Consul on Kubernetes v1.2 does not create service intentions automatically. 
-
-## Supported software
-
-<Note> Consul 1.15.x and 1.14.x are not supported. Please refer to Supported Consul and Kubernetes versions for more detail on choosing the correct consul-k8s version. </Note>
-
-- Consul 1.16.x.
-- Consul Dataplane v1.2.x. Refer to Envoy and Consul Dataplane for details about Consul Dataplane versions and the available packaged Envoy version.
-- Kubernetes 1.24.x - 1.27.x
-- kubectl 1.24.x - 1.27.x
-- Helm 3.6+
-
-## Upgrading
-
-For more detailed information, please refer to the [upgrade details page](/consul/docs/upgrading/upgrade-specific) and the changelogs.
-
-## Changelogs
-
-The changelogs for this major release version and any maintenance versions are listed below.
-
-<Note> These links take you to the changelogs on the GitHub website. </Note>
-
-- [1.2.0](https://github.com/hashicorp/consul-k8s/releases/tag/v1.2.0)
-- [1.2.1](https://github.com/hashicorp/consul-k8s/releases/tag/v1.2.1)
-- [1.2.2](https://github.com/hashicorp/consul-k8s/releases/tag/v1.2.2)
diff --git a/website/content/docs/release-notes/consul/v1_11_x.mdx b/website/content/docs/release-notes/consul/v1_11_x.mdx
index df29f3002757a..3334c6fbde7f6 100644
--- a/website/content/docs/release-notes/consul/v1_11_x.mdx
+++ b/website/content/docs/release-notes/consul/v1_11_x.mdx
@@ -23,7 +23,7 @@ description: >-
 
 - The legacy ACL system that was deprecated in Consul 1.4.0 has been removed. Before upgrading you should verify that all tokens and policies have been migrated to the newer ACL system. Complete the [Migrate Legacy ACL Tokens](/consul/tutorials/security-operations/access-control-token-migration) tutorial to learn more.
 
-- The `agent_master` ACL token has been renamed to `agent_recovery` ACL token. In addition, the `consul acl set-agent-token master` command has been replaced with `consul acl set-agent-token recovery`. Refer to [ACL Agent Recovery Token](/consul/docs/security/acl/tokens#acl-agent-recovery-token) and [Consul ACL Set Agent Token](/consul/commands/acl/set-agent-token) for more information.
+- The `agent_master` ACL token has been renamed to `agent_recovery` ACL token. In addition, the `consul acl set-agent-token master` command has been replaced with `consul acl set-agent-token recovery`. See [ACL Agent Recovery Token](/consul/docs/security/acl/acl-tokens#acl-agent-recovery-token) and [Consul ACL Set Agent Token](/consul/commands/acl/set-agent-token) for more information.
 
 - Drops support for Envoy versions 1.15.x and 1.16.x
 
diff --git a/website/content/docs/release-notes/consul/v1_12_x.mdx b/website/content/docs/release-notes/consul/v1_12_x.mdx
index 85248802b7f5d..ebdaaed98b0fd 100644
--- a/website/content/docs/release-notes/consul/v1_12_x.mdx
+++ b/website/content/docs/release-notes/consul/v1_12_x.mdx
@@ -30,7 +30,7 @@ description: >-
 
 - The `disable_compat_1.9` option now defaults to true. Metrics formatted in the style of version 1.9, such as `consul.http...`,  can still be enabled by setting disable_compat_1.9 = false. However, these metrics will be removed in 1.13.
 
-- The `agent_master` ACL token has been renamed to `agent_recovery` ACL token. In addition, the `consul acl set-agent-token master` command has been replaced with `consul acl set-agent-token recovery`. Refer to [ACL Agent Recovery Token](/consul/docs/security/acl/tokens#acl-agent-recovery-token) and [Consul ACL Set Agent Token](/consul/commands/acl/set-agent-token) for more information.
+- The `agent_master` ACL token has been renamed to `agent_recovery` ACL token. In addition, the `consul acl set-agent-token master` command has been replaced with `consul acl set-agent-token recovery`. Refer to [ACL Agent Recovery Token](/consul/docs/security/acl/acl-tokens#acl-agent-recovery-token) and [Consul ACL Set Agent Token](/consul/commands/acl/set-agent-token) for more information.
 
 - If TLS min versions and max versions are not specified, the TLS min/max versions default to the following values. For details on how to configure TLS min and max, refer to the [Mesh TLS config entry](/consul/docs/connect/config-entries/mesh#tls) or CRD documentation. 
   - Incoming connections: TLS 1.2 for min0 version, TLS 1.3 for max version
diff --git a/website/content/docs/release-notes/consul/v1_13_x.mdx b/website/content/docs/release-notes/consul/v1_13_x.mdx
index f0c4f586a9063..dd3f7cfe3090b 100644
--- a/website/content/docs/release-notes/consul/v1_13_x.mdx
+++ b/website/content/docs/release-notes/consul/v1_13_x.mdx
@@ -15,7 +15,7 @@ description: >-
 
 - **Enables TLS on the Envoy Prometheus endpoint**: The Envoy prometheus endpoint can be enabled when `envoy_prometheus_bind_addr` is set and then secured over TLS using new CLI flags for the `consul connect envoy` command. These commands are: `-prometheus-ca-file`, `-prometheus-ca-path`, `-prometheus-cert-file` and `-prometheus-key-file`. The CA, cert, and key can be provided to Envoy by a Kubernetes mounted volume so that Envoy can watch the files and dynamically reload the certs when the volume is updated.
 
-- **UDP Health Checks**: Adds the ability to register service discovery health checks that periodically send UDP datagrams to the specified IP/hostname and port. Refer to [UDP checks](/consul/docs/services/usage/checks#udp-checks).
+- **UDP Health Checks**: Adds the ability to register service discovery health checks that periodically send UDP datagrams to the specified IP/hostname and port. Refer to [UDP checks](/consul/docs//services/usage/checks#udp-checks).
 
 ## What's Changed
 
@@ -46,4 +46,4 @@ The changelogs for this major release version and any maintenance versions are l
 - [1.13.3](https://github.com/hashicorp/consul/releases/tag/v1.13.3)
 - [1.13.4](https://github.com/hashicorp/consul/releases/tag/v1.13.4)
 - [1.13.5](https://github.com/hashicorp/consul/releases/tag/v1.13.5)
-- [1.13.6](https://github.com/hashicorp/consul/releases/tag/v1.13.6)
+- [1.13.6](https://github.com/hashicorp/consul/releases/tag/v1.13.6)
\ No newline at end of file
diff --git a/website/content/docs/release-notes/consul/v1_14_x.mdx b/website/content/docs/release-notes/consul/v1_14_x.mdx
index 8efbedf61db22..fabfb75a7b4ca 100644
--- a/website/content/docs/release-notes/consul/v1_14_x.mdx
+++ b/website/content/docs/release-notes/consul/v1_14_x.mdx
@@ -13,7 +13,7 @@ description: >-
  
   - **Cluster Peering Failover:** Cluster Peering now supports the ability to redirect to services running on cluster peers with service resolvers. More details for configuring failover across peers is provided in the Service Resolver [failover](/consul/docs/connect/config-entries/service-resolver#failover) stanza.
   
-  - **Control Plane traffic over Mesh Gateways:** Cluster Peering now supports the establishing peering through Mesh Gateways. More detail on using Mesh Gateways for Cluster Peering are found in [Enabling Peering Control Plane Traffic](/consul/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways). Mesh Gateways are used by default for [Cluster Peering on Kubernetes](/consul/docs/k8s/connect/cluster-peering/tech-specs). 
+  - **Control Plane traffic over Mesh Gateways:** Cluster Peering now supports the establishing peering through Mesh Gateways. More detail on using Mesh Gateways for Cluster Peering are found in [Enabling Peering Control Plane Traffic](/consul/docs/connect/gateways/mesh-gateway/peering-via-mesh-gateways). Mesh Gateways are used by default for [Cluster Peering on Kubernetes](/consul/docs/connect/cluster-peering/k8s). 
   
 - **Simplified Service Mesh with Consul Dataplane:** Support for a new `consul-dataplane`, a lightweight process for managing Envoy proxies introduced in Consul v1.14.0. Consul Dataplane removes the need to run client agents on every node in a cluster for service discovery and service mesh. Instead, Consul deploys sidecar proxies that provide lower latency, support additional runtimes, and integrate with cloud infrastructure providers. Read more in [Simplified Service Mesh with Consul Dataplane](/consul/docs/connect/dataplane). 
 
diff --git a/website/content/docs/release-notes/consul/v1_15_x.mdx b/website/content/docs/release-notes/consul/v1_15_x.mdx
index 4b4e9fb5705c1..d90f918b6373f 100644
--- a/website/content/docs/release-notes/consul/v1_15_x.mdx
+++ b/website/content/docs/release-notes/consul/v1_15_x.mdx
@@ -9,54 +9,54 @@ description: >-
 
 ## Release Highlights
 
-- **Enhanced Envoy Access Logging:** Envoy access logs are now centrally managed via config entries and CRDs to allow operators to easily turn on access logs for all proxies within the service mesh. Refer to [Access logs overview](/consul/docs/connect/observability/access-logs) for more information. Additionally, the [Proxy default configuration entry](/consul/docs/connect/config-entries/proxy-defaults) shows you how to enable access logs centrally via the ProxyDefaults config entry or CRD.
+- **Enhanced Envoy Access Logging:** Envoy access logs are now centrally managed via config entries and CRDs to allow operators to easily turn on access logs for all proxies within the service mesh. Refer to [Access logs overview](/consul/docs/connect/observability/access-logs) for more information. Additionally, the [Proxy default configuration entry](/consul/docs/connect/config-entries/proxy-defaults) shows you how to enable access logs centrally via the ProxyDefaults config entry or CRD.  
 
-- **Consul Envoy Extensions:** The new Envoy extension system enables you to modify Consul-generated Envoy resources outside of the Consul binary. This will allow extensions to add, delete, and modify Envoy listeners, routes, clusters, and endpoints, enabling support for additional Envoy features without changes to the Consul codebase.
-Current supported extensions include the [Lua](/consul/docs/connect/proxies/envoy-extensions#lua) and [AWS Lambda](/consul/docs/connect/proxies/envoy-extensions#lambda) extensions. Refer to [Envoy extensions overview](/consul/docs/connect/proxies/envoy-extensions) for more information on how to use these extensions for Consul service mesh.
+- **Consul Envoy Extensions:** The new Envoy extension system enables you to modify Consul-generated Envoy resources outside of the Consul binary. This will allow extensions to add, delete, and modify Envoy listeners, routes, clusters, and endpoints, enabling support for additional Envoy features without changes to the Consul codebase. 
+Current supported extensions include the [Lua](/consul/docs/connect/proxies/envoy-extensions#lua) and [AWS Lambda](/consul/docs/connect/proxies/envoy-extensions#lambda) extensions. Refer to [Envoy extensions overview](/consul/docs/connect/proxies/envoy-extensions) for more information on how to use these extensions for Consul service mesh.  
 
-- **API Gateway support on Linux VM runtimes:** You can now deploy Consul API Gateway on Linux VM runtimes. API Gateway is built into Consul and, when deploying on Linux VM runtimes, is not separately installed software. Refer to [API gateway overview](/consul/docs/connect/gateways/api-gateway) for more information on API Gateway specifically for VM.
+- **API Gateway support on Linux VM runtimes:** You can now deploy Consul API Gateway on Linux VM runtimes. API Gateway is built into Consul and, when deploying on Linux VM runtimes, is not separately installed software. Refer to [API gateway overview](/consul/docs/connect/gateways/api-gateway) for more information on API Gateway specifically for VM. 
 
   ~> **Note:** Support for API Gateway on Linux VM runtimes is considered a "Beta" feature in Consul v1.15.0. HashiCorp expects to change it to a GA feature as part of a v1.15 patch release in the near future.
 
-- **Limit traffic rates to Consul servers:** You can now configure global RPC rate limits to mitigate the risks to Consul servers when clients send excessive read or write requests to Consul resources. Refer to [Limit traffic rates overview](/consul/docs/agent/limits) for more details on how to use the new troubleshooting commands.
+- **Limit traffic rates to Consul servers:** You can now configure global RPC rate limits to mitigate the risks to Consul servers when clients send excessive read or write requests to Consul resources. Refer to [Limit traffic rates overview](/consul/docs/agent/limits) for more details on how to use the new troubleshooting commands. 
 
-- **Service-to-service troubleshooting:** Consul includes a built-in tool for troubleshooting communication between services in a service mesh. The `consul troubleshoot` command enables you to validate communication between upstream and downstream Envoy proxies on VM and Kubernetes deployments. Refer to [Service-to-service troubleshooting overview](/consul/docs/troubleshoot/troubleshoot-services) for more details on how to use the new troubleshooting commands.
-Refer to [Service-to-service troubleshooting overview](/consul/docs/troubleshoot/troubleshoot-services) for more details on how to use the new troubleshooting commands.
+- **Service-to-service troubleshooting:** Consul includes a built-in tool for troubleshooting communication between services in a service mesh. The `consul troubleshoot` command enables you to validate communication between upstream and downstream Envoy proxies on VM and Kubernetes deployments. Refer to [Service-to-service troubleshooting overview](/consul/docs/troubleshoot/troubleshoot-services) for more details on how to use the new troubleshooting commands. 
+Refer to [Service-to-service troubleshooting overview](/consul/docs/troubleshoot/troubleshoot-services) for more details on how to use the new troubleshooting commands. 
 
-- **Raft write-ahead log (Experimental):** Consul provides an experimental storage backend called write-ahead log (WAL). WAL implements a traditional log with rotating, append-only log files which resolves a number of performance issues with the current BoltDB storage backend. Refer to [Experimental WAL LogStore backend overview](/consul/docs/agent/wal-logstore) for more details.
-
-  ~> **Note:** The new Raft write-ahead log storage backend is not recommended for production use cases yet, but is ready for testing by the general community.
+- **Raft write-ahead log (Experimental):** Consul provides an experimental storage backend called write-ahead log (WAL). WAL implements a traditional log with rotating, append-only log files which resolves a number of performance issues with the current BoltDB storage backend. Refer to [Experimental WAL LogStore backend overview](/consul/docs/agent/wal-logstore) for more details.   
+  
+  ~> **Note:** The new Raft write-ahead log storage backend is not recommended for production use cases yet, but is ready for testing by the general community. 
 
 ## What's Changed
 
-- ACL errors have now been enhanced to return descriptive errors when the specified resource cannot be found. Other ACL request errors provide more information about when a resource is missing. In addition, errors are now gracefully thrown when interacting with the ACL system before the ACL system been bootstrapped.
+- ACL errors have now been ehanced to return descriptive errors when the specified resource cannot be found. Other ACL request errors provide more information about when a resource is missing. In addition, errors are now gracefully thrown when interacting with the ACL system before the ACL system been bootstrapped.
   - The Delete Token/Policy/AuthMethod/Role/BindingRule endpoints now return 404 when the resource cannot be found. The new error format is as follows:
 
     ```log hideClipboard
     Requested * does not exist: ACL not found", "* not found in namespace $NAMESPACE: ACL not found`
     ```
 
-  - The Read Token/Policy/Role endpoints now return 404 when the resource cannot be found. The new error format is as follows:
-
+  - The Read Token/Policy/Role endpoints now return 404 when the resource cannot be found. The new error format is as follows: 
+    
     ```log hideClipboard
     Cannot find * to delete
     ```
-
-  - The Logout endpoint now returns a 401 error when the supplied token cannot be found. The new error format is as follows:
-
+    
+  - The Logout endpoint now returns a 401 error when the supplied token cannot be found. The new error format is as follows: 
+    
     ```log hideClipboard
     Supplied token does not exist
     ```
-
-  - The Token Self endpoint now returns 404 when the token cannot be found. The new error format is as follows:
-
+    
+  - The Token Self endpoint now returns 404 when the token cannot be found. The new error format is as follows: 
+   
     ```log hideClipboard
     Supplied token does not exist
     ```
-
+    
 - Consul v1.15.0 formally removes all uses of legacy ACLs and ACL policies from Consul. The legacy ACL system was deprecated in Consul v1.4.0 and removed in Consul v1.11.0. The documentation for the new ACL system can be found [here](/consul/docs/v1.14.x/security/acl). For information on how to migrate to the new ACL System, please read the [Migrate Legacy ACL Tokens tutorial](/consul/tutorials/security-operations/access-control-token-migration).
-- The following agent flags are now deprecated: `-join`, `-join-wan`, `start_join`, and `start_join_wan`. These options are now aliases of `-retry-join`, `-retry-join-wan`, `retry_join`, and `retry_join_wan`, respectively.
-- A `peer` field has been added to ServiceDefaults upstream overrides to make it possible to apply upstream overrides only to peer services. Prior to this change, overrides would be applied based on matching the namespace and name fields only, which means users could not have different configuration for local versus peer services. With this change, peer upstreams are only affected if the peer field matches the destination peer name.
+- The following agent flags are now deprecated: `-join`, `-join-wan`, `start_join`, and `start_join_wan`. These options are now aliases of `-retry-join`, `-retry-join-wan`, `retry_join`, and `retry_join_wan`, respectively. 
+- A `peer` field has been added to ServiceDefaults upstream overrides to make it possible to apply upstream overrides only to peer services. Prior to this change, overrides would be applied based on matching the namespace and name fields only, which means users could not have different configuration for local versus peer services. With this change, peer upstreams are only affected if the peer field matches the destination peer name. 
 - If you run the `consul connect envoy` command with an incompatible Envoy version, Consul will now error and exit. To ignore this check, use flag `--ignore-envoy-compatibility`.
 - Ingress Gateway upstream clusters will have empty `outlier_detection` if passive health check is unspecified.
 
@@ -74,15 +74,15 @@ The following issues are known to exist in the v1.15.x releases:
   due to a problem with leaf certificate rotation.
   This is resolved in Consul v1.15.2.
 
-- For v1.15.0, Consul is reporting newer releases of Envoy (for example, v1.25.1) as not supported, even though these versions are listed as valid in the [Envoy compatibility matrix](/consul/docs/connect/proxies/envoy#envoy-and-consul-client-agent). The following error would result for newer versions of Envoy:
+- For v1.15.0, Consul is reporting newer releases of Envoy (for example, v1.25.1) as not supported, even though these versions are listed as valid in the [Envoy compatilibity matrix](/consul/docs/connect/proxies/envoy#envoy-and-consul-client-agent). The following error would result for newer versions of Envoy:
 
   ```log hideClipboard
   Envoy version 1.25.1 is not supported. If there is a reason you need to use this version of envoy use the ignore-envoy-compatibility flag. Using an unsupported version of Envoy is not recommended and your experience may vary.
   ```
-
+  
   To workaround this issue on Consul v1.15.0, launch sidecar proxies
-  with the `ignore-envoy-compatibility` flag:
-
+  with the `ignore-envoy-compatiblity` flag: 
+  
   ```shell-session
   $ consul connect envoy --ignore-envoy-compatibility
   ```
@@ -91,7 +91,6 @@ The following issues are known to exist in the v1.15.x releases:
 
 - For v1.15.0, there is a known issue where search filters produced errors and resulted in lists not showing full results until being interacted with. This is resolved in Consul v1.15.1.
 
-
 ## Changelogs
 
 The changelogs for this major release version and any maintenance versions are listed below.
diff --git a/website/content/docs/release-notes/consul/v1_16_x.mdx b/website/content/docs/release-notes/consul/v1_16_x.mdx
deleted file mode 100644
index b623ba299c096..0000000000000
--- a/website/content/docs/release-notes/consul/v1_16_x.mdx
+++ /dev/null
@@ -1,85 +0,0 @@
----
-layout: docs
-page_title: 1.16.x
-description: >-
-  Consul release notes for version 1.16.x
----
-
-# Consul 1.16.0
-
-We are pleased to announce the following Consul updates. 
-
-## Release highlights
-
-- **Sameness groups (Enterprise):** Sameness groups are a user-defined set of partitions that Consul uses to identify services in different administrative partitions with the same name as being the same services. You can use sameness groups to create a blanket failover policy for deployments with cluster peering connections. Refer to the [Sameness groups overview](/consul/docs/connect/cluster-peering/usage/create-sameness-groups) for more information.
-
-   <Note> Sameness groups is currently a beta feature in Consul Enterprise v1.16.0. </Note>
-
-- **Permissive mTLS:** You can enable the `permissive` mTLS mode to enable sidecar proxies to accept both mTLS and non-mTLS traffic. Using this mode enables you to onboard services without downtime and without reconfiguring or redeploying your application. Refer to the [Onboard services while in transparent proxy mode](/consul/docs/k8s/connect/onboarding-tproxy-mode) for more information on how to use permissive mTLS to onboard services to Consul.
-
-- **Transparent proxy enhancements for failover and virtual services:** We have made several internal improvements, such as ensuring that virtual IPs are always available, to reduce the friction associated with operating Consul in transparent proxy mode. Onboarding services, configuring failover redirects, and other operations require less administrative effort and ensure a smoother experience. Refer to the following documentation for additional information: 
-
-    - [Onboard services while in transparent proxy mode](/consul/docs/k8s/connect/onboarding-tproxy-mode)
-    - [Route traffic to virtual services](/consul/docs/k8s/l7-traffic/route-to-virtual-services)
-    - [Configure failover services](/consul/docs/k8s/l7-traffic/failover-tproxy).
-
-- **Granular server-side rate limits (Enterprise):** You can now set limits per source IP address. The following steps describe the general process for setting global read and write rate limits:
-
-    1. Set arbitrary limits to begin understanding the upper boundary of RPC and gRPC loads in your network. Refer to [Initialize rate limit settings](/consul/docs/agent/limits/usage/init-rate-limits) for additional information.
-    1. Monitor the metrics and logs and readjust the initial configurations as necessary. Refer to [Monitor rate limit data](/consul/docs/agent/limits/usage/monitor-rate-limits)
-    1. Define your final operational limits based on your observations. If you are defining global rate limits, refer to [Set global traffic rate limits](/consul/docs/agent/limits/usage/set-global-traffic-rate-limits) for additional information. For information about setting limits based on source IP, refer to [Limit traffic rates for a source IP](/consul/docs/agent/limits/usage/limit-request-rates-from-ips).
-
-- **Consul Envoy Extensions:** Consul Envoy extension system enables you to modify Consul-generated Envoy resources. Refer to [Envoy extension overview](/consul/docs/connect/proxies/envoy-extensions) for more information on how to use these extensions for Consul service mesh.
-
-    - **Property Override:** The property override Envoy extension lets you set, remove, or modify individual properties for the Envoy resources Consul generates. Refer to the [Configure Envoy proxy properties](/consul/docs/connect/proxies/envoy-extensions/usage/property-override) for more information on how to use this extension. 
-
-    - **Wasm:** The Wasm Envoy extension lets you configure Wasm programs to be used as filters in the service's sidecar proxy. Refer to the [Run WebAssembly plug-ins in Envoy proxy](/consul/docs/connect/proxies/envoy-extensions/usage/wasm) for more information on how to use this extension. 
-
-    - **External Authorization:** The external authorization Envoy extension lets you delegate data plane authorization requests to external systems. Refer to the [Delegate authorization to an external service](/consul/docs/connect/proxies/envoy-extensions/usage/ext-authz) for more information on how to use this extension. 
-
-- **Simplified API Gateway installation for Consul on Kubernetes:** API Gateway is now built into Consul. This enables a simplified installation and configuration process for Consul on Kubernetes. Refer to the [API Gateway installation](/consul/docs/connect/gateways/api-gateway/install-k8s) for more information on the simplified native installation method. 
-
-- **FIPS compliance (Enterprise):** HashiCorp now offers FIPS 140-2 compliant builds of Consul Enterprise that meet the security needs of federal agencies protecting sensitive, unclassified information with approved cryptographic measures. These builds use certified cryptographic modules and restrict configuration settings to comply with FIPS 140-2 Level 1 requirements, enabling compliant Consul deployments. Refer to the [Consul Enterprise FIPS](/consul/docs/enterprise/fips) for more information on FIPS compliance.
-
-- **JWT Authorization with service intentions:** Consul can now authorize connections based on claims present in JSON Web Token (JWT). You can configure Consul to use one or more JWT providers, which lets you control access to services and specific HTTP paths based on the validity of JWT claims embedded in the service traffic. This ensures a uniform and low latency mechanism to validate and authorize communication based on JWT claims across all services in a diverse service-oriented architecture. Refer to the [Use JWT authorization with service intentions](/consul/docs/connect/intentions/jwt-authorization) for more information.
-
-- **Automated license utilization reporting (Enterprise):** Consul Enterprise now provides automated license utilization reporting, which sends minimal product-license metering data to HashiCorp. You can use these reports to understand how much more you can deploy under your current contract, which can help you protect against overutilization and budget for predicted consumption. Refer to the [Automated license utilization reporting documentation](/consul/docs/enterprise/license/utilization-reporting) for more information. 
-
-## What's deprecated
-
-- **Ingress gateway:** Starting with this release, ingress gateway is deprecated and will not be enhanced beyond its current capabilities. Ingress gateway is fully supported in this version but may be removed in a future release of Consul. 
-
-  Consul's API gateway is the recommended alternative to ingress gateway. For ingress gateway features not currently supported by API gateway, equivalent functionality will be added to API gateway over the next several releases of Consul.
-
-- **Connect Native Golang SDK:** The Connect Native [Golang SDK](https://github.com/hashicorp/consul/tree/main/connect) is deprecated and will be removed in a future release. No further enhancements or maintenance is expected in the future releases. We will remove the SDK when the long term replacement to native application integration (such as a proxyless gRPC service mesh integration) is delivered. Refer to [GH-10339](https://github.com/hashicorp/consul/issues/10339) for additional information and to track progress toward one potential solution that is tracked as replacement functionality.
-
-- **Connect Native APIs:** The following APIs for Connect Native are deprecated: 
-  - `v1/agent/connect/authorize` - used by the SDK to perform intention based authorization checks
-  - `v1/agent/connect/ca/leaf` - used by the SDK to get a leaf cert for a locally registered service
-  - `v1/agent/connect/ca/roots` - use to retrieved cached CA roots form the local client agent
-  
-  The `v1/agent/connect/authorize` and `v1/agent/connect/ca/leaf` endpoints have corresponding gRPC APIs. We will remove these APIs when the gRPC API for `v1/agent/connect/ca/roots` and HTTP endpoints for all three APIs are available. 
-
-## Upgrading
-
-For more detailed information, please refer to the [upgrade details page](/consul/docs/upgrading/upgrade-specific) and the changelogs.
-
-## Known Issues
-
-The following issues are known to exist in the v1.16.x releases:
-
-- v1.16.0 - v1.16.1 may have issues when a snapshot restore is performed
-    and the servers are hosting xDS streams. When this bug triggers, it
-    will cause Envoy to incorrectly populate upstream endpoints. It is
-    currently recommended for service mesh users running agent-less
-    workloads to upgrade Consul to v1.16.2 and later.
-
-## Changelogs
-
-The changelogs for this major release version and any maintenance versions are listed below.
-
-<Note> These links take you to the changelogs on the GitHub website. </Note>
-
-- [1.16.0](https://github.com/hashicorp/consul/releases/tag/v1.16.0)
-- [1.16.1](https://github.com/hashicorp/consul/releases/tag/v1.16.1)
-- [1.16.2](https://github.com/hashicorp/consul/releases/tag/v1.16.2)
diff --git a/website/content/docs/release-notes/consul/v1_17_x.mdx b/website/content/docs/release-notes/consul/v1_17_x.mdx
deleted file mode 100644
index 28a1a99cdf349..0000000000000
--- a/website/content/docs/release-notes/consul/v1_17_x.mdx
+++ /dev/null
@@ -1,70 +0,0 @@
----
-layout: docs
-page_title: 1.17.x
-description: >-
-  Consul release notes for version 1.17.x
----
-
-# Consul 1.17.0
-
-We are pleased to announce the following Consul updates. 
-
-## Release highlights
-
-**Consul catalog v2 API:** We introduced a new set of APIs for interacting with the catalog, authenticating traffic using identities, and managing Consul service mesh. The Consul catalog v2 API still tracks services and nodes for Consul, but it replaces service instances with workloads and workload identities.
-
-These APIs are the foundation for future versions of Consul and enable new functionalities, such as multi-port and host-name-based canary routing and routing traffic through headless services in native Kubernetes deployments.
-
-For more information, refer to the [Catalog API v2](/consul/docs/k8s/multiport#catalog-api-v2-beta) section in the documentation.
-
-<Note> These APIs are in beta and under active development, so we do not recommend using them in production. </Note>
-
-**Multi-port services in Consul:** You can now register services with multiple ports per service. The v2 catalog API enables a single sidecar proxy to support workloads on different ports. This significantly reduces the operational overhead for managing Consul service mesh. Support for other runtimes outside of Kubernetes is planned for future releases of Consul.
-
-Refer to the [Multi-port services for service mesh](/consul/docs/k8s/multiport#catalog-api-v2-beta) and [Configure multi-port services](/consul/docs/k8s/multiport/configure) for more information.
-
-<Note> Multi-port is currently a beta feature in Consul v1.17. </Note>
-
-**Locality-aware service mesh routing:** Locality-aware routing lets operators prioritize routing to upstream instances located in the same zone over instances in alternate zones. If all of the instances of an upstream service within a zone are unavailable, Consul service mesh automatically fails over to healthy instances in adjacent zones, ensuring service connectivity and availability within the datacenter.
-
-This enables operators to reduce service-to-service latency, which helps improve overall service performance and decrease infrastructure costs.
-
-Refer to the [locality-aware service mesh routing](/consul/docs/connect/manage-traffic/route-to-local-upstreams) documentation for more information.
-
-- **Sameness groups (Enterprise):** Introduced in 1.16, sameness groups are a user-defined set of partitions that Consul uses to identify services that have the same name but are in different administrative partitions as being the same services. You can use sameness groups to create a blanket failover policy for deployments with cluster peering connections. Sameness group is generally available in Consul 1.17. 
-
-Enterprises can use sameness groups to simplify operations and increase service availability for multi-cluster or multi-region deployments.
-
-Refer to the documentation for [creating sameness groups](/consul/docs/connect/cluster-peering/usage/create-sameness-groups) or [creating sameness groups on Kubernetes](/consul/docs/k8s/connect/cluster-peering/usage/create-sameness-groups) for more information.
-
-**JWT-based authentication and authorization for API Gateway:** You can configure API gateway to use policies that control access to services based on JSON Web Tokens (JWT) embedded in the network traffic sent by external clients. These policies can control access to services, and even specific URLs, based on the claims contained in JWTs. 
-
-Administrators can control access to services from outside the service mesh without having to modify services that do not support JWT-based authentication/authorization.
-
-Refer to the API gateway JWT documentation for [virtual machines](/consul/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-vms) and [Kubernetes-orchestrated](/consul/docs/connect/gateways/api-gateway/secure-traffic/verify-jwts-k8s) networks for more information.
-
-**Traffic rate limiting for services:**  You can now configure Consul service mesh to limit the rate of HTTP requests to services. Configure rate limiting per service and apply them per service instance. Operators can set HTTP request rate limits for the service instance or separate rate limits for specific URL paths. The rate limiting configuration includes settings for requests per second (RPS) as well as maximum request burst size. 
-
-Rate limiting helps operators protect service instances from becoming overloaded with requests. They also enable operators to define criteria for allowing traffic to service instances and ensure service capacity is shared fairly. 
-
-For more information, refer to the [rate limiting](/consul/docs/connect/manage-traffic/limit-request-rates) documentation.
-
-**Simplified service mesh deployments on Amazon ECS:** Consul on ECS now leverages a simplified service mesh deployment architecture that eliminates the need to deploy Consul clients per task on Amazon ECS. The new architecture deploys a Consul Dataplane container that is injected as a sidecar in the ECS task. This dataplane container image packages both an Envoy container and Consul dataplane binary.
-
-For more information, refer to the [Consul ECS](/consul/docs/ecs) documentation.
-
-## What's deprecated
-
-**Non DNS-compatible service name:** Starting with this release, non DNS-compatible service names are deprecated.
-
-## Upgrading
-
-For more detailed information, please refer to the [upgrade details page](/consul/docs/upgrading/upgrade-specific) and the changelogs.
-
-## Changelogs
-
-The changelogs for this major release version and any maintenance versions are listed below.
-
-<Note> These links take you to the changelogs on the GitHub website. </Note>
-
-- [1.17.0](https://github.com/hashicorp/consul/releases/tag/v1.17.0)
\ No newline at end of file
diff --git a/website/content/docs/security/acl/acl-federated-datacenters.mdx b/website/content/docs/security/acl/acl-federated-datacenters.mdx
index 80a5ad3b933d9..91f30bfba9270 100644
--- a/website/content/docs/security/acl/acl-federated-datacenters.mdx
+++ b/website/content/docs/security/acl/acl-federated-datacenters.mdx
@@ -180,7 +180,7 @@ $ consul join -token="ACL_MANAGEMENT_TOKEN" -wan [server 1, server 2, ...]
 
 ## Configure Clients in Secondary Datacenters
 
-When ACLs are enabled, client agents need a special token known as the [`agent token`](/consul/docs/security/acl/tokens#acl-agent-token) to perform internal operations. Agent tokens need to have the right policies for node related actions, including
+When ACLs are enabled, client agents need a special token known as the [`agent token`](/consul/docs/security/acl/acl-tokens#acl-agent-token) to perform internal operations. Agent tokens need to have the right policies for node related actions, including
 registering itself in the catalog, updating node level health checks, and performing [anti-entropy](/consul/docs/architecture/anti-entropy) syncing.
 
 ### Generate Agent ACL Token
diff --git a/website/content/docs/security/acl/acl-policies.mdx b/website/content/docs/security/acl/acl-policies.mdx
index ab21b8c892903..e1583f250a291 100644
--- a/website/content/docs/security/acl/acl-policies.mdx
+++ b/website/content/docs/security/acl/acl-policies.mdx
@@ -11,7 +11,7 @@ This topic describes policies, which are components in Consul's access control l
 
 ## Introduction
 
-A policy is a group of one or more ACL rules that are linked to [ACL tokens](/consul/docs/security/acl/tokens). The following diagram describes the relationships between rules, policies, and tokens:
+A policy is a group of one or more ACL rules that are linked to [ACL tokens](/consul/docs/security/acl/acl-tokens). The following diagram describes the relationships between rules, policies, and tokens:
 
 ![ACL system component relationships](/img/acl-token-policy-rule-relationship.png)
 
@@ -326,7 +326,7 @@ A policy that has been implemented must still be linked to a token before the po
 
 The person responsible for administrating ACLs can use the command line or call the API endpoint to link policies to tokens. Tokens can also be generated dynamically from an external system using Consul's [auth methods](/consul/docs/security/acl/auth-methods) functionality.
 
-Refer to the [tokens documentation](/consul/docs/security/acl/tokens), as well as the [ACL tutorial](/consul/tutorials/security/access-control-setup-production#create-the-agent-token), for details about creating and linking policies to tokens.
+Refer to the [tokens documentation](/consul/docs/security/acl/acl-tokens), as well as the [ACL tutorial](/consul/tutorials/security/access-control-setup-production#create-the-agent-token), for details about creating and linking policies to tokens.
 
 ## Policy Attributes
 
diff --git a/website/content/docs/security/acl/acl-roles.mdx b/website/content/docs/security/acl/acl-roles.mdx
index 6f094931ee2db..0f451596c9c05 100644
--- a/website/content/docs/security/acl/acl-roles.mdx
+++ b/website/content/docs/security/acl/acl-roles.mdx
@@ -93,7 +93,7 @@ Use the following syntax to define a service identity:
 - `ServiceIdentities.ServiceName`: String value that specifies the name of the service you want to associate with the policy.
 - `ServiceIdentities.Datacenters`: Array that specifies the names of datacenters in which the service identity applies. This field is optional.
 
-Refer to the [API documentation for roles](/consul/api-docs/acl/roles#sample-payload) for additional information and examples.
+Refer to the the [API documentation for roles](/consul/api-docs/acl/roles#sample-payload) for additional information and examples.
 
 -> **Scope for Namespace and Admin Partition** - In Consul Enterprise, service identities inherit the namespace or admin partition scope of the corresponding ACL token or role.
 
@@ -230,7 +230,7 @@ Use the following syntax to define a node identity:
 - `NodeIdentities.NodeName`: String value that specifies the name of the node you want to associate with the policy.
 - `NodeIdentities.Datacenter`: String value that specifies the name of the datacenter in which the node identity applies.
 
-Refer to the [API documentation for roles](/consul/api-docs/acl/roles#sample-payload) for additional information and examples.
+Refer to the the [API documentation for roles](/consul/api-docs/acl/roles#sample-payload) for additional information and examples.
 
 -> **Consul Enterprise Namespacing** - Node Identities can only be applied to tokens and roles in the `default` namespace. The generated policy rules allow for `service:read` permissions on all services in all namespaces.
 
diff --git a/website/content/docs/security/acl/auth-methods/index.mdx b/website/content/docs/security/acl/auth-methods/index.mdx
index decab071088ab..c26cb05d21f22 100644
--- a/website/content/docs/security/acl/auth-methods/index.mdx
+++ b/website/content/docs/security/acl/auth-methods/index.mdx
@@ -74,7 +74,7 @@ tokens without operator intervention.
 Successful authentication with an auth method returns a set of trusted
 identity attributes corresponding to the authenticated identity. Those
 attributes are matched against all configured binding rules for that auth
-method to determine what privileges to grant the Consul ACL token it will
+method to determine what privileges to grant the the Consul ACL token it will
 ultimately create.
 
 Each binding rule is composed of two portions:
diff --git a/website/content/docs/security/acl/auth-methods/oidc.mdx b/website/content/docs/security/acl/auth-methods/oidc.mdx
index 677db04ffcd5d..e9684ff10b0ac 100644
--- a/website/content/docs/security/acl/auth-methods/oidc.mdx
+++ b/website/content/docs/security/acl/auth-methods/oidc.mdx
@@ -204,7 +204,7 @@ be tricky to debug why things aren't working. Some tips for setting up OIDC:
   request to obtain a JWT that you can inspect. An example of how to decode the
   JWT (in this case located in the `access_token` field of a JSON response):
 
-      jq --raw-output '.access_token / "." | .[1] | @base64d' jwt.json
+      cat jwt.json | jq --raw-output .access_token | cut -d. -f2 | base64 --decode
 
 - The [`VerboseOIDCLogging`](#verboseoidclogging) option is available which
   will log the received OIDC token if debug level logging is enabled. This can
diff --git a/website/content/docs/security/acl/index.mdx b/website/content/docs/security/acl/index.mdx
index 4ee0d18743597..a577bd0114788 100644
--- a/website/content/docs/security/acl/index.mdx
+++ b/website/content/docs/security/acl/index.mdx
@@ -41,7 +41,7 @@ ACL tokens are the core method of authentication in Consul. Tokens contain sever
 
 Refer to the following topics for details about tokens:
 
-- [Tokens](/consul/docs/security/acl/tokens)
+- [Tokens](/consul/docs/security/acl/acl-tokens)
 - [ACL token command line](/consul/commands/acl/token)
 - [ACL tokens API](/consul/api-docs/acl/tokens)
 
diff --git a/website/content/docs/security/acl/tokens/create/create-a-consul-esm-token.mdx b/website/content/docs/security/acl/tokens/create/create-a-consul-esm-token.mdx
index e899a96c8b82d..cf33e95248f9a 100644
--- a/website/content/docs/security/acl/tokens/create/create-a-consul-esm-token.mdx
+++ b/website/content/docs/security/acl/tokens/create/create-a-consul-esm-token.mdx
@@ -32,7 +32,7 @@ Consul ESM only supports `default` admin partitions.
 
 @include 'create-token-requirements.mdx'
 
-## Consul ESM token in Consul CE
+## Consul ESM token in Consul OSS
 
 To create a token for Consul ESM, you must define a policy, register the policy with Consul, and link the policy to a token.
 
diff --git a/website/content/docs/security/acl/tokens/create/create-a-dns-token.mdx b/website/content/docs/security/acl/tokens/create/create-a-dns-token.mdx
index 4fde8bcf9e6f2..059092c581e6d 100644
--- a/website/content/docs/security/acl/tokens/create/create-a-dns-token.mdx
+++ b/website/content/docs/security/acl/tokens/create/create-a-dns-token.mdx
@@ -29,7 +29,7 @@ The DNS token must be linked to policies that grant the following permissions:
 
 @include 'create-token-requirements.mdx'
 
-## DNS token in Consul CE
+## DNS token in Consul OSS
 
 To create a token for DNS, you must define a policy, register the policy with Consul, and link the policy to a token.
 
diff --git a/website/content/docs/security/acl/tokens/create/create-a-mesh-gateway-token.mdx b/website/content/docs/security/acl/tokens/create/create-a-mesh-gateway-token.mdx
index d7de158b30d9e..6e94395d31dd8 100644
--- a/website/content/docs/security/acl/tokens/create/create-a-mesh-gateway-token.mdx
+++ b/website/content/docs/security/acl/tokens/create/create-a-mesh-gateway-token.mdx
@@ -37,7 +37,7 @@ The mesh gateway must present a token linked to a policy that grants the followi
 
 @include 'create-token-requirements.mdx'
 
-## Consul CE
+## Consul OSS
 
 To create a token for the mesh gateway, you must define a policy, register the policy with Consul, and link the policy to a token.
 
diff --git a/website/content/docs/security/acl/tokens/create/create-a-replication-token.mdx b/website/content/docs/security/acl/tokens/create/create-a-replication-token.mdx
index c6b546100a3f9..f38f4682fcc29 100644
--- a/website/content/docs/security/acl/tokens/create/create-a-replication-token.mdx
+++ b/website/content/docs/security/acl/tokens/create/create-a-replication-token.mdx
@@ -27,7 +27,7 @@ For a Consul server agent with ACL replication enabled in a secondary datacenter
 
 @include 'create-token-requirements.mdx'
 
-## Replication token in Consul CE
+## Replication token in Consul OSS
 
 To create a token for ACL replication, you must define a policy, register the policy with Consul, and link the policy to a token.
 
diff --git a/website/content/docs/security/acl/tokens/create/create-a-service-token.mdx b/website/content/docs/security/acl/tokens/create/create-a-service-token.mdx
index 25a3eb700c178..125390b398305 100644
--- a/website/content/docs/security/acl/tokens/create/create-a-service-token.mdx
+++ b/website/content/docs/security/acl/tokens/create/create-a-service-token.mdx
@@ -33,7 +33,7 @@ The service token must be linked to policies that grant the following permission
 
 @include 'create-token-requirements.mdx'
 
-## Service identity in Consul CE
+## Service identity in Consul OSS
 
 Refer to [Service identities](/consul/docs/security/acl#service-identities) for information about creating service identities that you can link to tokens.
 
@@ -123,7 +123,7 @@ $ curl --request PUT http://127.0.0.1:8500/v1/acl/token \
 
 </Tabs>
 
-## Custom policy in Consul CE
+## Custom policy in Consul OSS
 
 When you are unable to link tokens to a service identity, you can define policies, register them with Consul, and link the policies to tokens that enable services to register into the Consul catalog.
 
diff --git a/website/content/docs/security/acl/tokens/create/create-a-snapshot-agent-token.mdx b/website/content/docs/security/acl/tokens/create/create-a-snapshot-agent-token.mdx
index 26801ddfba244..374498a93d75f 100644
--- a/website/content/docs/security/acl/tokens/create/create-a-snapshot-agent-token.mdx
+++ b/website/content/docs/security/acl/tokens/create/create-a-snapshot-agent-token.mdx
@@ -22,7 +22,7 @@ Core ACL functionality is available in all versions of Consul.
 
 ### Requirements for the `agent` command
 
-The [`agent`](/consul/commands/snapshot/agent) subcommand requires [Consul Enterprise](https://www.hashicorp.com/products/consul/). All other [`snapshot` subcommands](/consul/commands/snapshot) are available in Consul Community Edition.
+The [`agent`](/consul/commands/snapshot/agent) subcommand requires [Consul Enterprise](https://www.hashicorp.com/products/consul/). All other [`snapshot` subcommands](/consul/commands/snapshot) are available in the open source version of Consul.
 
 ### Snapshot agent ACL requirements
 
diff --git a/website/content/docs/security/acl/tokens/create/create-a-terminating-gateway-token.mdx b/website/content/docs/security/acl/tokens/create/create-a-terminating-gateway-token.mdx
index 82d15e0982dd6..5ba304a9f84bf 100644
--- a/website/content/docs/security/acl/tokens/create/create-a-terminating-gateway-token.mdx
+++ b/website/content/docs/security/acl/tokens/create/create-a-terminating-gateway-token.mdx
@@ -29,7 +29,7 @@ The terminating gateway token must be linked to policies that grant the appropri
 
 @include 'create-token-requirements.mdx'
 
-## Consul CE
+## Consul OSS
 
 To create a token for the terminating gateway, you must define a policy, register the policy with Consul, and link the policy to a token.
 
diff --git a/website/content/docs/security/acl/tokens/create/create-a-ui-token.mdx b/website/content/docs/security/acl/tokens/create/create-a-ui-token.mdx
index 8faefd2d1daff..9c1e9019b5e78 100644
--- a/website/content/docs/security/acl/tokens/create/create-a-ui-token.mdx
+++ b/website/content/docs/security/acl/tokens/create/create-a-ui-token.mdx
@@ -19,7 +19,7 @@ Core ACL functionality is available in all versions of Consul.
 
 @include 'create-token-requirements.mdx'
 
-## View catalog in Consul CE
+## View catalog in Consul OSS
 
 This section describes how to create a token that grants read-only access to the catalog. This token allows users to view the catalog without the ability to make changes. To create the ACL token, define a policy, create the policy, and then link the policy to a token.
 
@@ -276,7 +276,7 @@ $ curl --request PUT http://127.0.0.1:8500/v1/acl/token \
 
 </Tabs>
 
-## View all resources in Consul CE
+## View all resources in Consul OSS
 
 This section describes how to create a token with read-only access to all resources in the Consul UI. This token allows users to view any resources without the ability to make changes. To create the ACL token, define a policy, create the policy, and then link the policy to a token.
 
diff --git a/website/content/docs/security/acl/tokens/create/create-an-agent-token.mdx b/website/content/docs/security/acl/tokens/create/create-an-agent-token.mdx
index 253d5710be692..1fa06d7c4d3d8 100644
--- a/website/content/docs/security/acl/tokens/create/create-an-agent-token.mdx
+++ b/website/content/docs/security/acl/tokens/create/create-an-agent-token.mdx
@@ -34,7 +34,7 @@ The agent token must be linked to policies that grant the following permissions:
 
 @include 'create-token-requirements.mdx'
 
-## Node identity in Consul CE
+## Node identity in Consul OSS
 
 Refer to [Node identities](/consul/docs/security/acl#node-identities) for information about node identities that you can link to tokens.
 
@@ -125,7 +125,7 @@ $ curl --request PUT http://127.0.0.1:8500/v1/acl/token \
 
 </Tabs>
 
-## Custom policy in Consul CE
+## Custom policy in Consul OSS
 
 When you are unable to link tokens to a node identity, you can define policies, register them with Consul, and link the policies to tokens that enable nodes to register into the Consul catalog.
 
diff --git a/website/content/docs/security/acl/tokens/create/create-an-ingress-gateway-token.mdx b/website/content/docs/security/acl/tokens/create/create-an-ingress-gateway-token.mdx
index 526b51bef0dde..65e01369966ad 100644
--- a/website/content/docs/security/acl/tokens/create/create-an-ingress-gateway-token.mdx
+++ b/website/content/docs/security/acl/tokens/create/create-an-ingress-gateway-token.mdx
@@ -25,7 +25,7 @@ The ingress gateway token must be linked to policies that grant the following pe
 
 @include 'create-token-requirements.mdx'
 
-## Consul CE
+## Consul OSS
 
 To create a token for the ingress gateway, you must define a policy, register the policy with Consul, and link the policy to a token.
 
diff --git a/website/content/docs/security/security-models/core.mdx b/website/content/docs/security/security-models/core.mdx
index 1140cdab30e8e..2f91acf34fe33 100644
--- a/website/content/docs/security/security-models/core.mdx
+++ b/website/content/docs/security/security-models/core.mdx
@@ -128,6 +128,9 @@ environment and adapt these configurations accordingly.
         ca_file = "consul-agent-ca.pem"
         cert_file = "dc1-server-consul-0.pem"
         key_file = "dc1-server-consul-0-key.pem"
+      }
+
+      internal_rpc {
         verify_server_hostname = true
       }
     }
@@ -145,6 +148,9 @@ environment and adapt these configurations accordingly.
           verify_incoming = false
           verify_outgoing = true
           ca_file = "consul-agent-ca.pem"
+        }
+
+        internal_rpc {
           verify_server_hostname = true
         }
       }
@@ -176,7 +182,7 @@ environment and adapt these configurations accordingly.
     deployed within Consul.
 
   - **🏷 Namespace** <EnterpriseAlert inline /> - a named, logical scoping of Consul Enterprise resources, typically to
-    enable multi-tenant environments. Consul CE clusters always operate within the "default" namespace.
+    enable multi-tenant environments. Consul OSS clusters always operate within the "default" namespace.
 
 - **Gossip Encryption** - A shared, base64-encoded 32-byte symmetric key is required to [encrypt Serf gossip
   communication](/consul/tutorials/security/gossip-encryption-secure?utm_source=consul.io&utm_medium=docs) within a cluster using
diff --git a/website/content/docs/services/configuration/checks-configuration-reference.mdx b/website/content/docs/services/configuration/checks-configuration-reference.mdx
index c842d334b6bfa..fee071de51b0a 100644
--- a/website/content/docs/services/configuration/checks-configuration-reference.mdx
+++ b/website/content/docs/services/configuration/checks-configuration-reference.mdx
@@ -10,46 +10,46 @@ description: ->
 This topic provides configuration reference information for health checks. For information about the different kinds of health checks and guidance on defining them, refer to [Define Health Checks].
 
 ## Introduction
-Health checks perform several safety functions, such as allowing a web balancer to gracefully remove failing nodes and allowing a database to replace a failed secondary. You can configure health checks to monitor the health of the entire node. Refer to [Define Health Checks](/consul/docs/services/usage/checks) for information about how to define the different types of health checks available in Consul.
+Health checks perform several safety functions, such as allowing a web balancer to gracefully remove failing nodes and allowing a database to replace a failed secondary. You can configure health checks to monitor the health of the entire node. Refer to [Define Health Checks](/consul/docs/services/usage/checks) for information about how to define the differnet types of health checks available in Consul.
 
 ## Check block
-Specify health check options in the `check` block. To register two or more heath checks in the same configuration, use the [`checks` block](#checks-block). The following table describes the configuration options contained in the `check` block.
+Specify health check options in the `check` block. To register two or more heath checks in the same configuration, use the [`checks` block](#checks-block). The following table describes the configuration options contained in the `check` block. 
 
-| Parameter | Description | Check types |
-| ---       | ---          | ---         |
+| Parameter | Description | Check types | 
+| ---       | ---          | ---         | 
 | `name` | Required string value that specifies the name of the check. Default is `service:<service-id>`. If multiple service checks are registered, the autogenerated default is appended with colon and incrementing number starting with `1`. | <li>Script </li> <li>HTTP </li> <li>TCP </li> <li>UDP </li> <li>OSService </li> <li>TTL </li> <li>Docker </li> <li>gRPC </li> <li>H2ping </li> <li>Alias </li> |
 | `id` | A unique string value that specifies an ID for the check. Default to the `name` value. If `name` values conflict, specify a unique ID to avoid overwriting existing checks with same ID on the same node. Consul auto-generates an ID if the check is defined in a service definition file. |  <li>Script </li> <li>HTTP </li> <li>TCP </li> <li>UDP </li> <li>OSService </li> <li>TTL </li> <li>Docker </li> <li>gRPC </li> <li>H2ping </li> <li>Alias </li>  |
-| `notes` | String value that provides a human-readable description of the check. The contents are not visible to Consul. | <li>Script </li> <li>HTTP </li> <li>TCP </li> <li>UDP </li> <li>OSService </li> <li>TTL </li> <li>Docker </li> <li>gRPC </li> <li>H2ping </li> <li>Alias </li> |
+| `notes` | String value that provides a human-readabiole description of the check. The contents are not visible to Consul. | <li>Script </li> <li>HTTP </li> <li>TCP </li> <li>UDP </li> <li>OSService </li> <li>TTL </li> <li>Docker </li> <li>gRPC </li> <li>H2ping </li> <li>Alias </li> |
 | `interval` | Required string value that specifies how frequently to run the check. The `interval` parameter is required for supported check types. The value is parsed by the golang [time package formatting specification](https://golang.org/pkg/time/#ParseDuration).  | <li>Script </li> <li>HTTP </li> <li>TCP </li> <li>UDP </li> <li>OSService </li> <li>Docker </li> <li>gRPC </li> <li>H2ping</li> |
 | `timeout` | String value that specifies how long unsuccessful requests take to end with a timeout. The `timeout` is optional for the supported check types and has the following defaults: <li> Script: `30s` </li> <li> HTTP: `10s` </li><li> TCP: `10s` </li><li> UDP: `10s` </li><li> gRPC: `10s` </li><li> H2ping: `10s` </li> |  <li>Script </li> <li>HTTP </li> <li>TCP </li> <li>UDP </li> <li>gRPC </li> <li>H2ping </li> |
 | `status` | Optional string value  that specifies the initial status of the health check. You can specify the following values: <li>`critical` (default)</li><li>`warning`</li><li>`passing`</li> | <li>Script </li> <li>HTTP </li> <li>TCP </li> <li>UDP </li> <li>OSService </li> <li>TTL </li> <li>Docker </li> <li>gRPC </li> <li>H2ping </li> <li>Alias </li> |
 | `deregister_critical_service_after` | String value that specifies how long a service and its associated checks are allowed to be in a `critical` state. Consul deregisters services if they are `critical` for the specified amount of time. The value is parsed by the golang [time package formatting specification](https://golang.org/pkg/time/#ParseDuration) | <li>Script </li> <li>HTTP </li> <li>TCP </li> <li>UDP </li> <li>OSService </li> <li>TTL </li> <li>Docker </li> <li>gRPC </li> <li>H2ping </li> <li>Alias </li> |
 | `success_before_passing` | Integer value that specifies how many consecutive times the check must pass before Consul marks the service or node as `passing`. Default is `0`. | <li>Script </li> <li>HTTP </li> <li>TCP </li> <li>UDP </li> <li>OSService </li> <li>TTL </li> <li>Docker </li> <li>gRPC </li> <li>H2ping </li> <li>Alias </li> |
 | `failures_before_warning` | Integer value that specifies how many consecutive times the check must fail before Consul marks the service or node as `warning`. The value cannot be more than `failures_before_critical`. Defaults to the value specified for `failures_before_critical`. | <li>Script </li> <li>HTTP </li> <li>TCP </li> <li>UDP </li> <li>OSService </li> <li>TTL </li> <li>Docker </li> <li>gRPC </li> <li>H2ping </li> <li>Alias </li> |
-| `failures_before_critical` | Integer value that specifies how many consecutive times the check must fail before Consul marks the service or node as `critical`. Default is `0`. | <li>Script </li> <li>HTTP </li> <li>TCP </li> <li>UDP </li> <li>OSService </li> <li>TTL </li> <li>Docker </li> <li>gRPC </li> <li>H2ping </li> <li>Alias </li> |
+| `failures_before_critical` | Integer value that specifies how many consecutive times the check must fail before Consul marks the service or node as `critical`. Default is `0`. | <li>Script </li> <li>HTTP </li> <li>TCP </li> <li>UDP </li> <li>OSService </li> <li>TTL </li> <li>Docker </li> <li>gRPC </li> <li>H2ping </li> <li>Alias </li> |    
 | `args` | Specifies a list of arguments strings to pass to the command line. The list of values includes the path to a script file or external application to invoke and any additional parameters for running the script or application. | <li> Script </li><li> Docker </li> |
 | `docker_container_id` | Specifies the Docker container ID in which to run an external health check application. Specify the external application with the `args` parameter. | <li> Docker </li>  |
 | `shell` | String value that specifies the type of command line shell to use for running the health check application. Specify the external application with the `args` parameter. | <li> Docker </li>  |
-| `grpc` | String value that specifies the gRPC endpoint, including port number, to send requests to. Append the endpoint with `:/` and a service identifier to check a specific service. The endpoint must support the [gRPC health checking protocol](https://github.com/grpc/grpc/blob/master/doc/health-checking.md). | <li>gRPC </li>|
+| `grpc` | String value that specifies the gRPC endpoint, including port number, to send requests to. Append the endpoint with `:/` and a service identifier to check a specific service. The endpoint must support the [gRPC health checking protocol](https://github.com/grpc/grpc/blob/master/doc/health-checking.md). | <li>gRPC </li>|        
 | `grpc_use_tls` | Boolean value that enables TLS for gRPC checks when set to `true`. | <li>gRPC </li> |
-| `h2ping` | String value that specifies the HTTP2 endpoint, including port number, to send HTTP2 requests to. | <li>H2ping</li> |
+| `h2ping` | String value that specifies the HTTP2 endpoint, including port number, to send HTTP2 requests to. | <li>H2ping</li> |        
 | `h2ping_use_tls` | Boolean value that enables TLS for H2ping checks when set to `true`. | <li>H2ping</li> |
 | `http` | String value that specifies an HTTP endpoint to send requests to. | <li>HTTP</li> |
-| `tls_server_name` | String value that specifies the server name used to verify the hostname on the returned certificates unless `tls_skip_verify` is given. Also included in the client's handshake to support SNI. It is recommended that this field be left unspecified. The TLS client will deduce the server name for SNI from the check address unless it's an IP ([RFC 6066, Section 3](https://tools.ietf.org/html/rfc6066#section-3)). There are two common circumstances where supplying a `tls_server_name` can be beneficial: <li>When the check address is an IP, `tls_server_name` can be specified for SNI. Note: setting `tls_server_name` will also override the hostname used to verify the certificate presented by the server being checked.</li><li>When the hostname in the check address won't be present in the SAN (Subject Alternative Name) field of the certificate presented by the server being checked. Note: setting `tls_server_name` will also override the hostname used for SNI.</li> | <li>HTTP </li> <li>H2Ping </li> <li>gRPC </li> |
-| `tls_skip_verify` | Boolean value that determines if the check verifies the chain and hostname of the certificate that the server presents. Set to `true` to disable verification. We recommend setting to `false` for production use. Default is `false`. | <li>HTTP </li> <li>H2Ping </li> <li>gRPC </li> <li>TCP </li> |
+| `tls_server_name` | String value that specifies the name of the TLS server that issues certificates. Defaults to the SNI determined by the address specified in the `http` field. Set the `tls_skip_verify` to `false` to disable this field. | <li>HTTP</li> |
+| `tls_skip_verify` | Boolean value that disbles TLS for HTTP checks when set to `true`. Default is `false`. | <li>HTTP</li> |
 | `method` | String value that specifies the request method to send during HTTP checks. Default is `GET`. | <li>HTTP</li> |
 | `header` | Object that specifies header fields to send in HTTP check requests. Each header specified in `header` object contains a list of string values. | <li>HTTP</li> |
-| `body` | String value that contains JSON attributes to send in HTTP check requests. You must escape the quotation marks around the keys and values for each attribute. | <li>HTTP</li> |
-| `disable_redirects` | Boolean value that prevents HTTP checks from following redirects if set to `true`. Default is `false`. | <li>HTTP</li> |
+| `body` | String value that contains JSON attributes to send in HTTP check requests. You must escap the quotation marks around the keys and values for each attribute. | <li>HTTP</li> |
+| `disable_redirects` | Boolean value that prevents HTTP checks from following redirects if set to `true`. Default is `false`. | <li>HTTP</li> |  
 | `os_service` | String value that specifies the name of the name of a service to check during an OSService check. | <li>OSService</li> |
 | `service_id` | String value that specifies the ID of a service instance to associate with an OSService check. That service instance must be on the same node as the check. If not specified, the check verifies the health of the node. | <li>OSService</li> |
 | `tcp` | String value that specifies an IP address or host and port number for the check establish a TCP connection with. | <li>TCP</li> |
-| `tcp_use_tls` | Boolean value that enables TLS for TCP checks when set to `true`. | <li>TCP </li> |
 | `udp` | String value that specifies an IP address or host and port number for the check to send UDP datagrams to. | <li>UDP</li> |
 | `ttl` | String value that specifies how long to wait for an update from an external process during a TTL check. | <li>TTL</li> |
-| `alias_service` | String value that specifies a service or node that the service associated with the health check aliases. | <li>Alias</li> |
+| `alias_service` | String value that specifies a service or node that the service associated with the health check aliases. | <li>Alias</li> | 
 
 
 
 ## Checks block
-You can define multiple health checks in a single `checks` block. The `checks` block is an array of objects that contain the configuration options described in the [`check` block configuration reference](#check-block).
+You can define multiple health checks in a single `checks` block. The `checks` block is an array of objects that contain the configuration options described in the [`check` block configuration reference](#check-block). 
+
diff --git a/website/content/docs/services/configuration/services-configuration-reference.mdx b/website/content/docs/services/configuration/services-configuration-reference.mdx
index cc0302b7734a8..2105637b8eccc 100644
--- a/website/content/docs/services/configuration/services-configuration-reference.mdx
+++ b/website/content/docs/services/configuration/services-configuration-reference.mdx
@@ -15,52 +15,49 @@ This topic describes the options you can use to define services for registering
 The following outline shows how to format the configurations in the root `service` block. Click on a property name to view details about the configuration.
 
 - [`name`](#name): string | required
-- [`id`](#id): string 
-- [`address`](#address): string 
-- [`port`](#port): number 
-- [`tags`](#tags): list of strings 
-- [`meta`](#meta): map   
-  - [_`custom_meta_key`_](#meta): string 
-- [`tagged_addresses`](#tagged_addresses): map 
-  - [`lan`](#tagged_addresses-lan): map 
-    - [`address`](#tagged_addresses-lan): string 
-    - [`port`](#tagged_addresses-lan): number 
-  - [`wan`](#tagged_addresses-wan): map 
-    - [`address`](#tagged_addresses-wan): string 
-    - [`port`](#tagged_addresses-wan): number 
-- [`socket_path`](#socket_path): string 
-- [`enable_tag_override`](#enable_tag_override): boolean 
-- [`checks`](#checks) : list of maps 
-- [`kind`](#kind): string 
-- [`proxy`](#proxy): map  
-- [`connect`](#connect): map 
-  - [`native`](#connect): boolean   
-  - [`sidecar_service`](#connect): object   
-- [`locality`](#locality): map <EnterpriseAlert inline/>
-   - [`region`](#locality): string
-   - [`zone`](#locality): string
-- [`weights`](#weights): map 
-  - [`passing`](#weights): number 
-  - [`warning`](#weights): number 
+- [`id`](#id): string | optional
+- [`address`](#address): string | optional
+- [`port`](#port): integer | optional
+- [`tags`](#tags): list of strings | optional
+- [`meta`](#meta): object | optional  
+  - [_`custom_meta_key`_](#meta): string | optional
+- [`tagged_addresses`](#tagged_addresses): object | optional
+  - [`lan`](#tagged_addresses-lan): object | optional
+    - [`address`](#tagged_addresses-lan): string | optional
+    - [`port`](#tagged_addresses-lan): integer | optional
+  - [`wan`](#tagged_addresses-wan): object | optional
+    - [`address`](#tagged_addresses-wan): string | optional
+    - [`port`](#tagged_addresses-wan): integer | optional
+- [`socket_path`](#socket_path): string | optional
+- [`enable_tag_override`](#enable_tag_override): boolean | optional
+- [`checks`](#checks) : list of objects | optional
+- [`kind`](#kind): string | optional
+- [`proxy`](#proxy): object | optional 
+- [`connect`](#connect): object | optional
+  - [`native`](#connect): boolean | optional  
+  - [`sidecar_service`](#connect): object | optional  
+- [`weights`](#weights): object | optional
+  - [`passing`](#weights): integer | optional
+  - [`warning`](#weights): integer | optional
 - [`token`](#token): string | required if ACLs are enabled
-- [`namespace`](#namespace): string | <EnterpriseAlert inline /> 
+- [`namespace`](#namespace): string | optional | <EnterpriseAlert inline /> 
 
 ## Specification
 This topic provides details about the configuration parameters.
 
-### `name`
+### name
 Required value that specifies a name for the service. We recommend using valid DNS labels for service definition names for compatibility with external DNSs. The value for this parameter is used as the ID if the `id` parameter is not specified.
 
 - Type: string
 - Default: none
 
-### `id`
+### id
 Specifies an ID for the service. Services on the same node must have unique IDs. We recommend specifying unique values if the default name conflicts with other services.
 
 - Type: string
 - Default: Value of the `name` field.
 
-### `address`
+### address
 String value that specifies a service-specific IP address or hostname.
 If no value is specified, the IP address of the agent node is used by default.
 There is no service-side validation of this parameter.
@@ -68,13 +65,13 @@ There is no service-side validation of this parameter.
 - Type: string
 - Default: IP address of the agent node
 
-### `port`
+### port
 Specifies a port number for the service. To improve service discoverability, we recommend specifying the port number, as well as an address in the [`tagged_addresses`](#tagged_addresses) parameter.
 
 - Type: integer
 - Default: Port number of the agent
 
-### `tags`
+### tags
 Specifies a list of string values that add service-level labels. Tag values are opaque to Consul. We recommend using valid DNS labels for service definition IDs for compatibility with external DNSs.  In the following example, the service is tagged as `v2` and `primary`:
 
 ```hcl
@@ -83,7 +80,7 @@ tags = ["v2", "primary"]
 
 Consul uses tags as an anti-entropy mechanism to maintain the state of the cluster. You can disable the anti-entropy feature for a service using the [`enable_tag_override`](#enable_tag_override) setting, which enables external agents to modify tags on services in the catalog. Refer to [Modify anti-entropy synchronization](/consul/docs/services/usage/define-services#modify-anti-entropy-synchronization) for additional usage information.
 
-### `meta`
+### meta
 The `meta` field contains custom key-value pairs that associate semantic metadata with the service. You can specify up to 64 pairs that meet the following requirements: 
 
 - Keys and values must be strings.
@@ -112,7 +109,7 @@ meta = {
 
 </CodeTabs>
 
-### `tagged_addresses`
+### tagged_addresses
 The `tagged_address` field is an object that configures additional addresses for a node or service. Remote agents and services can communicate with the service using a tagged address as an alternative to the address specified in the [`address`](#address) field. You can configure multiple addresses for a node or service. The following tags are supported:
 
 - [`lan`](#tagged_addresses-lan): IPv4 LAN address where the node or service is accessible.
@@ -123,7 +120,7 @@ The `tagged_address` field is an object that configures additional addresses for
 - [`wan_ipv4`](#tagged_addresses-wan): IPv4 WAN address where the node or service is accessible when dialed from a remote data center.
 - [`wan_ipv6`](#tagged_addresses-lan): IPv6 WAN address at which the node or service is accessible when being dialed from a remote data center.
 
-### `tagged_addresses.lan`
+### tagged_addresses.lan
 Object that specifies either an IPv4 or IPv6 LAN address and port number where the service or node is accessible. You can specify one or more of the following fields: 
 
 - `lan` 
@@ -187,7 +184,7 @@ service {
 
 </CodeTabs>
 
-### `tagged_addresses.virtual`
+### tagged_addresses.virtual
 Object that specifies a fixed IP address and port number that downstream services in a service mesh can use to connect to the service. The `virtual` field contains the following parameters:
 
 - `address`
@@ -236,7 +233,7 @@ service {
 
 </CodeTabs>
 
-### `tagged_addresses.wan`
+### tagged_addresses.wan
 Object that specifies either an IPv4 or IPv6 WAN address and port number where the service or node is accessible from a remote datacenter. You can specify one or more of the following fields: 
 
 - `wan` 
@@ -300,13 +297,13 @@ service {
 
 </CodeTabs>
 
-### `socket_path`
+### socket_path
 String value that specifies the path to the service socket. Specify this parameter to expose the service to the mesh if the service listens on a Unix Domain socket.
 
 - Type: string
 - Default: none
 
-### `enable_tag_override`
+### enable_tag_override
 Boolean value that determines if the anti-entropy feature for the service is enabled.
 Set to `true` to allow external Consul agents modify tags on the services in the Consul catalog. The local Consul agent ignores updated tags during subsequent sync operations.
 
@@ -317,25 +314,25 @@ Refer to [Modify anti-entropy synchronization](/consul/docs/services/usage/defin
 - Type: boolean
 - Default: `false`
 
-### `checks`
+### checks
 The `checks` block contains an array of objects that define health checks for the service. Health checks perform several safety functions, such as allowing a web balancer to gracefully remove failing nodes and allowing a database to replace a failed secondary. Refer to [Health Check Configuration Reference](/consul/docs/services/configuration/checks-configuration-reference) for information about configuring health checks.
 
-### `kind`
+### kind
 String value that identifies the service as a proxy and determines its role in the service mesh. Do not configure the `kind` parameter for non-proxy service instances. Refer to [Consul Service Mesh](/consul/docs/connect) for additional information. 
 
 You can specify the following values:
 
-- `connect-proxy`: Defines the configuration for a service mesh proxy. Refer to [Deploy service mesh proxies](/consul/docs/connect/proxies/deploy-service-mesh-proxies) for details about registering a service as a service mesh proxy.
+- `connect-proxy`: Defines the configuration for a service mesh proxy. Refer to [Register a Service Mesh Proxy Outside of a Service Registration](/consul/docs/connect/registration/service-registration) for details about registering a service as a service mesh proxy.
 - `ingress-gateway`: Defines the configuration for an [ingress gateway](/consul/docs/connect/config-entries/ingress-gateway)
 - `mesh-gateway`: Defines the configuration for a [mesh gateway](/consul/docs/connect/gateways/mesh-gateway)
 - `terminating-gateway`: Defines the configuration for a [terminating gateway](/consul/docs/connect/gateways/terminating-gateway)
 
 For non-service registration roles, the `kind` field has a different context when used to define configuration entries, such as `service-defaults`. Refer to the documentation for the configuration entry you want to implement for additional information. 
 
-### `proxy`
-Object that specifies proxy configurations when the service is configured to operate as a proxy in a service mesh. Do not configure the `proxy` parameter for non-proxy service instances. Refer to [Service mesh proxies overview](/consul/docs/connect/proxies) for details about registering your service as a service mesh proxy. Refer to [`kind`](#kind) for information about the types of proxies you can define. Services that you assign proxy roles to are registered as services in the catalog. 
+### proxy
+Object that specifies proxy configurations when the service is configured to operate as a proxy in a service mesh. Do not configure the `proxy` parameter for non-proxy service instances. Refer to [Register a Service Mesh Proxy Outside of a Service Registration](/consul/docs/connect/registration/service-registration) for details about registering your service as a service mesh proxy. Refer to [`kind`](#kind) for information about the types of proxies you can define. Services that you assign proxy roles to are registered as services in the catalog. 
 
-### `connect`
+### connect
 Object that configures a Consul service mesh connection. You should only configure the `connect` block of parameters if you are using Consul service mesh. Refer to [Consul Service Mesh](/consul/docs/connect) for additional information. 
 
 The following table describes the parameters that you can place in the `connect` block:
@@ -343,21 +340,7 @@ The following table describes the parameters that you can place in the `connect`
 | Parameter | Description | Default |
 | ---       | ---         | ---     |
 | `native` | Boolean value that advertises the service as a native service mesh proxy. Use this parameter to integrate your application with the `connect` API. Refer to [Service Mesh Native App Integration Overview](/consul/docs/connect/native) for additional information. If set to `true`, do not configure a `sidecar_service`. | `false` |
-| `sidecar_service` | Object that defines a sidecar proxy for the service. Do not configure if `native` is set to `true`. Refer to [Deploy sidecar services](/consul/docs/connect/proxies/deploy-sidecar-services) for usage and configuration details. | Refer to [Sidecar service defaults](/consul/docs/connect/proxies/deploy-sidecar-services#sidecar-service-defaults). |
-
-###  `locality` <EnterpriseAlert inline/>  
-
-Map of configurations that specify the region and zone in the cloud service provider (CSP) where the service is available. Configure this field to enable Consul to route traffic to the nearest physical service instance. Refer to [Route traffic to local upstreams](/consul/docs/connect/manage-traffic/route-to-local-upstreams) for additional information.
-
-- Default: None
-- Data type: Map
-
-Services inherit the `locality` configuration of the Consul agent they are registered with, but you can explicitly define locale for your services. The following table describes the parameters you can explicitly configure in the `locality` block:
-
-| Parameter | Description | Data type | Default |
-| ---       | ---         | ---       | ---     |
-| `region` | Specifies the region where the service instance is available. You can specify values that map to regions as defined in your network, for example `us-west-1` for networks in AWS. Consul matches this value to regions defined for Consul agents and other services in the network. When the region matches an entity, Consul is able to prioritize routes between service instances in the same region over healthy service instances in other regions. When multiple healthy service instances are available in the local region, Consul prioritizes services that match the `zone`. | String | None |
-| `zone` | Specifies the zone where the service instance is available. You can specify values that map to zones defined in your network, for example `us-west-1a` for networks in AWS. Consul matches this value to zones defined for Consul agents and other services in the network. When the zone matches an entity, Consul is able to prioritize routes between service instances in the same zone over healthy service instances in other zones. When multiple healthy service instances are available in the local zone, Consul distributes traffic equally the services. | String | None |
+| `sidecar_service` | Object that defines a sidecar proxy for the service. Do not configure if `native` is set to `true`. Refer to [Register a Service Mesh Proxy in a Service Registration](/consul/docs/connect/registration/sidecar-service) for usage and configuration details. | Refer to [Register a Service Mesh Proxy in a Service Registration](/consul/docs/connect/registration/sidecar-service) for default configurations. |
 
 ### weights
 Object that configures how the service responds to DNS SRV requests based on the service's health status. Configuring allows service instances with more capacity to respond to DNS SRV requests. It also reduces the load on services with checks in `warning` status by giving passing instances a higher weight.
diff --git a/website/content/docs/services/discovery/dns-configuration.mdx b/website/content/docs/services/discovery/dns-configuration.mdx
index 0a10edecdd9d0..794be43a206ab 100644
--- a/website/content/docs/services/discovery/dns-configuration.mdx
+++ b/website/content/docs/services/discovery/dns-configuration.mdx
@@ -1,7 +1,7 @@
 ---
 layout: docs
-page_title: Configure Consul DNS behavior
-description: ->
+page_title: Configure Consul DNS behavior 
+description: -> 
     Learn how to modify the default DNS behavior so that services and nodes can easily discover other services and nodes in your network.
 ---
 
@@ -12,29 +12,29 @@ This topic describes the default behavior of the Consul DNS functionality and ho
 ## Introduction
 The Consul DNS is the primary interface for querying records when Consul service mesh is disabled and your network runs in a non-Kubernetes environment. The DNS enables you to look up services and nodes registered with Consul using terminal commands instead of making HTTP API requests to Consul. Refer to the [Discover Consul Nodes and Services Overview](/consul/docs/services/discovery/dns-overview) for additional information.
 
-## Configure DNS behaviors
+## Configure DNS behaviors 
 By default, the Consul DNS listens for queries at `127.0.0.1:8600` and uses the `consul` domain. Specify the following parameters in the agent configuration to determine DNS behavior when querying services:
 
 - [`client_addr`](/consul/docs/agent/config/config-files#client_addr)
 - [`ports.dns`](/consul/docs/agent/config/config-files#dns_port)
 - [`recursors`](/consul/docs/agent/config/config-files#recursors)
-- [`domain`](/consul/docs/agent/config/config-files#domain)
+- [`domain`](/consul/docs/agent/config/config-files#domain) 
 - [`alt_domain`](/consul/docs/agent/config/config-files#alt_domain)
-- [`dns_config`](/consul/docs/agent/config/config-files#dns_config)
+- [`dns_config`](/consul/docs/agent/config/config-files#dns_config) 
 
 ### Configure WAN address translation
 By default, Consul DNS queries return a node's local address, even when being queried from a remote datacenter. You can configure the DNS to reach a node from outside its datacenter by specifying the address in the following configuration fields in the Consul agent:
 
-- [advertise-wan](/consul/docs/agent/config/cli-flags#_advertise-wan)
-- [translate_wan_addrs](/consul/docs/agent/config/config-files#translate_wan_addrs)
+- [advertise-wan](/consul/docs/agent/config/cli-flags#_advertise-wan) 
+- [translate_wan_addrs](/consul//docs/agent/config/config-files#translate_wan_addrs) 
 
 ### Use a custom DNS resolver library
 You can specify a list of addresses in the agent's [`recursors`](/consul/docs/agent/config/config-files#recursors) field to provide upstream DNS servers that recursively resolve queries that are outside the service domain for Consul.
-
-Nodes that query records outside the `consul.` domain resolve to an upstream DNS. You can specify IP addresses or use `go-sockaddr` templates. Consul resolves IP addresses in the specified order and ignores duplicates.
+ 
+Nodes that query records outside the `consul.` domain resolve to an upstream DNS. You can specify IP addresses or use `go-sockaddr` templates. Consul resolves IP addresses in the specified order and ignores duplicates. 
 
 ### Enable non-Consul queries
-You enable non-Consul queries to be resolved by setting Consul as the DNS server for a node and providing a [`recursors`](/consul/docs/agent/config/config-files#recursors) configuration.
+You enable non-Consul queries to be resolved by setting Consul as the DNS server for a node and providing a [`recursors`](/consul/docs/agent/config/config-files#recursors) configuration. 
 
 ### Forward queries to an agent
 You can forward all queries sent to the `consul.` domain from the existing DNS server to a Consul agent. Refer to [Forward DNS for Consul Service Discovery](/consul/tutorials/networking/dns-forwarding) for instructions.
@@ -42,7 +42,7 @@ You can forward all queries sent to the `consul.` domain from the existing DNS s
 ### Query an alternate domain
 By default, Consul responds to DNS queries in the `consul` domain, but you can set a specific domain for responding to DNS queries by configuring the [`domain`](/consul/docs/agent/config/config-files#domain) parameter.
 
-You can also specify an additional domain in the [`alt_domain`](/consul/docs/agent/config/config-files#alt_domain) agent configuration option, which configures Consul to respond to queries in a secondary domain. Configuring an alternate domain may be useful during a DNS migration or to distinguish between internal and external queries, for example.
+You can also specify an additional domain in the [`alt_domain`](/consul/docs/agent/config/config-files#alt_domain) agent configuration option, which configures Consul to respond to queries in a secondary domain. Configuring an alternate domain may be useful during a DNS migration or to distinguish between internal and external queries, for example. 
 
 Consul's DNS response uses the same domain as the query.
 
@@ -62,7 +62,7 @@ machine.node.dc1.test-domain. 0 IN  A 127.0.0.1
 machine.node.dc1.test-domain. 0 IN  TXT "consul-network-segment="
 ```
 #### PTR queries
-Responses to pointer record (PTR) queries, such as `<ip>.in-addr.arpa.`, always use the [primary domain](/consul/docs/agent/config/config-files#domain) and not the alternative domain.
+Responses to pointer record (PTR) queries, such as `<ip>.in-addr.arpa.`, always use the [primary domain](/consul/docs/agent/config/config-files#domain) and not the alternative domain. 
 
 ### Caching
 By default, DNS results served by Consul are not cached. Refer to the [DNS Caching tutorial](/consul/tutorials/networking/dns-caching) for instructions on how to enable caching.
diff --git a/website/content/docs/services/discovery/dns-dynamic-lookups.mdx b/website/content/docs/services/discovery/dns-dynamic-lookups.mdx
index b56d3ce7074e8..71d52cd7d4c40 100644
--- a/website/content/docs/services/discovery/dns-dynamic-lookups.mdx
+++ b/website/content/docs/services/discovery/dns-dynamic-lookups.mdx
@@ -23,7 +23,7 @@ If ACLs are enabled, the querying service must present a token linked to permiss
 
 - [Prepared query rules](/consul/docs/security/acl/acl-rules#prepared-query-rules)
 - [Service rules](/consul/docs/security/acl/acl-rules#service-rules)
-- [Node rules](/consul/docs/security/acl/acl-rules#node-rules)
+- [Node rules](/consul/docs/security/acl/acl-rules#node-rules) 
 
 ## Create prepared queries
 
@@ -47,16 +47,16 @@ Refer to the [prepared query reference](/consul/api-docs/query#create-prepared-q
           "Near": "node1",
           "OnlyPassing": false,
           "Tags": ["primary", "!experimental"],
-          "NodeMeta": {
-            "instance_type": "m3.large"
+          "NodeMeta": { 
+            "instance_type": "m3.large" 
+            },
+          "ServiceMeta": { 
+            "environment": "production" 
+            }
           },
-          "ServiceMeta": {
-            "environment": "production"
-          }
-        },
         "DNS": {
           "TTL": "10s"
-        }
+          }
     }
     ```
 
@@ -64,7 +64,7 @@ Refer to the [prepared query reference](/consul/api-docs/query#create-prepared-q
 
  Refer to the [prepared query configuration reference](/consul/api-docs/query#create-prepared-query) for information about all available options.
 
-1. Send the query in a POST request to the [`/query` API endpoint](/consul/api-docs/query). If the request is successful, Consul prints an ID for the prepared query.
+1. Send the query in a POST request to the [`/query` API endpoint](/consul/api-docs/query). If the request is successful, Consul prints an ID for the prepared query. 
 
     In the following example, the prepared query configuration is stored in the `payload.json` file:
 
@@ -78,7 +78,7 @@ Refer to the [prepared query reference](/consul/api-docs/query#create-prepared-q
     ```shell-session
     $ curl http://127.0.0.1:8500/v1/query/14af5ff-29e6-e972-dcf8-6ee602137127/execute\?near\=_agent
     ```
-
+ 
 ## Execute prepared queries
 
 You can execute a prepared query using the standard lookup format or the strict RFC 2782 SRV lookup.
@@ -86,7 +86,7 @@ You can execute a prepared query using the standard lookup format or the strict
 ### Standard lookup
 
 Use the following format to execute a prepared query using the standard lookup format:
-
+ 
 ```
 <query name or id>.query[.<datacenter>].<domain>
 ```
@@ -107,7 +107,7 @@ For additional information about following the RFC 2782 SRV lookup format in Con
 
 The `datacenter` subdomain is optional. By default, the lookup queries the datacenter of this Consul agent.
 
-The `query name` or `id` subdomain is the name or ID of an existing prepared query.
+The `query name` or `id` subdomain is the name or ID of an existing prepared query. 
 
 ## Results
 
diff --git a/website/content/docs/services/discovery/dns-overview.mdx b/website/content/docs/services/discovery/dns-overview.mdx
index 34e92e5fe8a22..37eda715de255 100644
--- a/website/content/docs/services/discovery/dns-overview.mdx
+++ b/website/content/docs/services/discovery/dns-overview.mdx
@@ -1,41 +1,41 @@
 ---
 layout: docs
-page_title: DNS usage overview
+page_title: DNS usage overview 
 description: >-
   For service discovery use cases, Domain Name Service (DNS) is the main interface to look up, query, and address Consul nodes and services. Learn how a Consul DNS lookup can help you find services by tag, name, namespace, partition, datacenter, or domain.
 ---
 
 # DNS usage overview
 
-This topic provides overview information about how to look up Consul nodes and services using the Consul DNS.
+This topic provides overview information about how to look up Consul nodes and services using the Consul DNS. 
 
 ## Consul DNS
-The Consul DNS is the primary interface for discovering services registered in the Consul catalog. The DNS enables you to look up services and nodes registered with Consul using terminal commands instead of making HTTP API requests to Consul.
+The Consul DNS is the primary interface for discovering services registered in the Consul catalog. The DNS enables you to look up services and nodes registered with Consul using terminal commands instead of making HTTP API requests to Consul. 
 
-We recommend using the DNS for service discovery in virtual machine (VM) environments because it removes the need to modify native applications so that they can consume the Consul service discovery APIs.
+We recommend using the DNS for service discovery in virtual machine (VM) environments because it removes the need to modify native applications so that they can consume the Consul service discovery APIs.  
 
-The DNS has several default configurations, but you can customize how the server processes lookups. Refer to [Configure DNS Behaviors](/consul/docs/services/discovery/dns-configuration) for additional information.
+The DNS has several default configurations, but you can customize how the server processes lookups. Refer to [Configure DNS Behaviors](/consul/docs/services/discovery/dns-configuration) for additional information. 
 
 ### DNS versus native app integration
 You can use DNS to reach services registered with Consul or modify your application to natively consume the Consul service discovery HTTP APIs.
 
-We recommend using the DNS because it is less invasive. You do not have to modify your application with Consul to retrieve the service’s connection information. Instead, you can use a DNS fully qualified domain (FQDN) that conforms to Consul's lookup format to retrieve the relevant information.
+We recommend using the DNS because it is less invasive. You do not have to modify your application with Consul to retrieve the service’s connection information. Instead, you can use a DNS fully qualified domain (FQDN) that conforms to Consul's lookup format to retreive the relevant information.
 
-Refer to [ Native App Integration](/consul/docs/connect/native) and its [Go package](/consul/docs/connect/native/go) for additional information.
+Refer to [ Native App Integration](/consul/docs/connect/native) and its [Go package](/consul/docs/connect/native/go) for additional information. 
 
 ### DNS versus upstreams
-If you are using Consul for service discovery and have not enabled service mesh features, then use the DNS to discover services and nodes in the Consul catalog.
+If you are using Consul for service discovery and have not enabled service mesh features, then use the DNS to discover services and nodes in the Consul catalog. 
 
-If you are using Consul for service mesh on VMs, you can use upstreams or DNS. We recommend using upstreams because you can query services and nodes without modifying the application code or environment variables. Refer to [Upstream Configuration Reference](/consul/docs/connect/proxies/proxy-config-reference#upstream-configuration-reference) for additional information.
+If you are using Consul for service mesh on VMs, you can use upstreams or DNS. We recommend using upstreams because you can query services and nodes without modifying the application code or environment variables. Refer to [Upstream Configuration Reference](/consul/docs/connect/registration/service-registration#upstream-configuration-reference) for additional information.
 
-If you are using Consul on Kubernetes, refer to [the upstreams annotation documentation](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-connect-service-upstreams) for additional information.
+If you are using Consul on Kubernetes, refer to [the upstreams annotation documentation](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-connect-service-upstreams) for additional information. 
 
 ## Static queries
-Node lookups and service lookups are the fundamental types of static queries. Depending on your use case, you may need to use different query methods and syntaxes to query the DNS for services and nodes.
+Node lookups and service lookups are the fundamental types of static queries. Depending on your use case, you may need to use different query methods and syntaxes to query the DNS for services and nodes. 
 
-Consul relies on a very specific format for queries to resolve names. Note that all queries are case-sensitive.
+Consul relies on a very specific format for queries to resolve names. Note that all queries are case-sensitive. 
 
-Refer to [Perform Static DNS Lookups](/consul/docs/services/discovery/dns-static-lookups) for details about how to perform node and service lookups.
+Refer to [Perform Static DNS Lookups](/consul/docs/services/discovery/dns-static-lookups) for details about how to perform node and service lookups.  
 
 ## Prepared queries
 Prepared queries are configurations that enable you to register complex DNS queries. They provide lookup features that extend Consul's service discovery capabilities, such as filtering by multiple tags and automatically querying remote datacenters for services if no healthy nodes are available in the local datacenter. You can also create prepared query templates that match names using a prefix match, allowing a single template to apply to potentially many services. Refer to [Enable Dynamic DNS Queries](/consul/docs/services/discovery/dns-dynamic-lookups) for additional information.
diff --git a/website/content/docs/services/discovery/dns-static-lookups.mdx b/website/content/docs/services/discovery/dns-static-lookups.mdx
index 56e9ccc02e643..c0854bf62a461 100644
--- a/website/content/docs/services/discovery/dns-static-lookups.mdx
+++ b/website/content/docs/services/discovery/dns-static-lookups.mdx
@@ -9,16 +9,16 @@ description: ->
 This topic describes how to query the Consul DNS to look up nodes and services registered with Consul. Refer to [Enable Dynamic DNS Queries](/consul/docs/services/discovery/dns-dynamic-lookups) for information about using prepared queries.
 
 ## Introduction
-Node lookups and service lookups are the fundamental types of queries you can perform using the Consul DNS. Node lookups interrogate the catalog for named Consul agents. Service lookups interrogate the catalog for services registered with Consul. Refer to [DNS Usage Overview](/consul/docs/services/discovery/dns-overview) for additional background information.
+Node lookups and service lookups are the fundamental types of queries you can perform using the Consul DNS. Node lookups interrogate the catalog for named Consul agents. Service lookups interrogate the catalog for services registered with Consul. Refer to [DNS Usage Overivew](/consul/docs/services/discovery/dns-overview) for additional background information. 
 
 ## Requirements
-All versions of Consul support DNS lookup features.
+All versions of Consul support DNS lookup features.  
 
 ### ACLs
 If ACLs are enabled, you must present a token linked with the necessary policies. We recommend using a separate token in production deployments for querying the DNS. By default, Consul agents resolve DNS requests using the preconfigured tokens in order of precedence:
 
 The agent's [`default` token](/consul/docs/agent/config/config-files#acl_tokens_default)
-The built-in [`anonymous` token](/consul/docs/security/acl/tokens#built-in-tokens).
+The built-in [`anonymous` token](/consul/docs/security/acl/acl-tokens#built-in-tokens).
 
 
 The following table describes the available DNS lookups and required policies when ACLs are enabled:
@@ -39,7 +39,7 @@ Specify the name of the node, datacenter, and domain using the following FQDN sy
 
 The `datacenter` subdomain is optional. By default, the lookup queries the datacenter of the agent.
 
-By default, the domain is `consul`. Refer to [Configure DNS Behaviors](/consul/docs/services/discovery/dns-configuration) for information about using alternate domains.
+By default, the domain is `consul`. Refer to [Configure DNS Behaviors](/consul/docs/services/discovery/dns-configuration) for information about using alternate domains. 
 
 ### Node lookup results
 
@@ -75,9 +75,9 @@ consul.     0 IN  SOA ns.consul. postmaster.consul. 1392836399 3600 600 86400 0
 
 ### Node lookups for Consul Enterprise
 
-Consul Enterprise includes the admin partition concept, which is an abstraction that lets you define isolated administrative network areas. Refer to [Admin Partitions](/consul/docs/enterprise/admin-partitions) for additional information.
+Consul Enterprise includes the admin partition concept, which is an abstraction that lets you define isolated administrative network areas. Refer to [Admin Partitions](/consul/docs/enterprise/admin-partitions) for additional information.   
 
-Consul nodes reside in admin partitions within a datacenter. By default, node lookups query the same partition and datacenter of the Consul agent that received the DNS query.
+Consul nodes reside in admin partitions within a datacenter. By default, node lookups query the same partition and datacenter of the Consul agent that received the DNS query. 
 
 Use the following query format to specify a partition for a node lookup:
 
@@ -88,9 +88,9 @@ Use the following query format to specify a partition for a node lookup:
 Consul server agents are in the `default` partition. If you send a DNS query to Consul server agents, you must explicitly specify the partition of the target node if it is not `default`.
 
 ## Service lookups
-You can query the network for service providers using either the [standard lookup](#standard-lookup) method or [strict RFC 2782 lookup](#rfc-2782-lookup) method.
+You can query the network for service providers using either the [standard lookup](#standard-lookup) method or [strict RFC 2782 lookup](#rfc-2782-lookup) method. 
 
-By default, all SRV records are weighted equally in service lookup responses, but you can configure the weights using the [`Weights`](/consul/docs/services/configuration/services-configuration-reference#weights) attribute of the service definition. Refer to [Define Services](/consul/docs/services/usage/define-services) for additional information.
+By default, all SRV records are weighted equally in service lookup responses, but you can configure the weights using the [`Weights`](/consul/docs/services/configuration/services-configuration-reference#weights) attribute of the service definition. Refer to [Define Services](/consul/docs/services/usage/define-services) for additional information. 
 
 The DNS protocol limits the size of requests, even when performing DNS TCP queries, which may affect your experience querying for services. For services with more than 500 instances, you may not be able to retrieve the complete list of instances for the service. Refer to [RFC 1035, Domain Names - Implementation and Specification](https://datatracker.ietf.org/doc/html/rfc1035#section-2.3.4) for additional information.
 
@@ -100,18 +100,16 @@ Consul randomizes DNS SRV records and ignores weights specified in service confi
 To perform standard service lookups, specify tags, the name of the service, datacenter, cluster peer, and domain using the following syntax to query for service providers:
 
 ```text
-[<tag>.]<service>.service[.<datacenter>.dc][.<cluster-peer>.peer][.<sameness-group>.sg].<domain>
+[<tag>.]<service>.service[.<datacenter>.dc][.<cluster-peer>.peer].<domain>
 ```
 
-The `tag` subdomain is optional. It filters responses so that only service providers containing the tag appear.
+The `tag` subdomain is optional. It filters responses so that only service providers containing the tag appear.  
 
 The `datacenter` subdomain is optional. By default, Consul interrogates the querying agent's datacenter.
 
 The `cluster-peer` name is optional, and specifies the [cluster peer](/consul/docs/connect/cluster-peering) whose [exported services](/consul/docs/connect/config-entries/exported-services) should be the target of the query.
 
-The `sameness-group` name is optional, and specifies the [sameness group](/consul/docs/connect/cluster-peering/usage/create-sameness-groups) that should be the target of the query. When Consul receives a DNS request for a service that is tied to a sameness group, it returns service instances from the first healthy member of the sameness group. If the local partition is a member of a sameness group, its service instances take precedence over the members of its sameness group. Optionally, you can include a namespace or admin partition when performing a lookup on a sameness group. Refer to [Service lookups for Consul Enterprise](#service-lookups-for-consul-enterprise) for more information.
-
-By default, the lookups query in the `consul` domain. Refer to [Configure DNS Behaviors](/consul/docs/services/discovery/dns-configuration) for information about using alternate domains.
+By default, the lookups query in the `consul` domain. Refer to [Configure DNS Behaviors](/consul/docs/services/discovery/dns-configuration) for information about using alternate domains. 
 
 #### Standard lookup results
 Standard services queries return A and SRV records. SRV records include the port that the service is registered on. SRV records are only served if the client specifically requests them.
@@ -165,7 +163,7 @@ primary.postgresql.service.dc2.consul. 0 IN  A 10.1.10.12
 ```
 
 ### RFC 2782 lookup
-Per [RFC 2782](https://tools.ietf.org/html/rfc2782), SRV queries must prepend `service` and `protocol` values with an underscore (`_`) to prevent DNS collisions. Use the following syntax to perform RFC 2782 lookups:
+Per [RFC 2782](https://tools.ietf.org/html/rfc2782), SRV queries must prepend `service` and `protocol` values with an underscore (`_`) to prevent DNS collisions. Use the following syntax to perform RFC 2782 lookups: 
 
 ```text
 _<service>._<protocol>[.service][.<datacenter>].<domain>
@@ -233,7 +231,7 @@ _redis._tcp.service.phx1.peer.consul. 0 IN SRV 1 1 29142 0a010d56.addr.consul.
 
 #### SRV responses for hosts in the .addr subdomain
 
-If a service registered with Consul is configured with an explicit IP address or addresses in the  [`address`](/consul/docs/services/configuration/services-configuration-reference#address) or [`tagged_address`](/consul/docs/services/configuration/services-configuration-reference#tagged_address) parameter, then Consul returns the hostname in the target field of the answer section for the DNS SRV query according to the following format:
+If a service registered with Consul is configured with an explicit IP address or addresses in the  [`address`](/consul/docs/services/configuration/services-configuration-reference#address) or [`tagged_address`](/consul/docs/services/configuration/services-configuration-reference#tagged_address) parameter, then Consul returns the hostname in the target field of the answer section for the DNS SRV query according to the following format: 
 
 ```text
 <hexadecimal-encoded IP>.addr.<datacenter>.consul.
@@ -338,7 +336,7 @@ Use the following query format to specify namespace, partition, or datacenter:
 [<tag>.]<service>.service[.<namespace>.ns][.<partition>.ap][.<datacenter>.dc]<domain>
 ```
 
-The `namespace`, `partition`, and `datacenter` are optional. By default, all service lookups use the `default` namespace within the partition and datacenter of the Consul agent that received the DNS query.
+The `namespace`, `partition`, and `datacenter` are optional. By default, all service lookups use the `default` namespace within the partition and datacenter of the Consul agent that received the DNS query. 
 
 Consul server agents reside in the `default` partition. If DNS queries are addressed to Consul server agents, you must explicitly specify the partition of the target service when querying for services in  partitions other than `default`.
 
@@ -373,7 +371,7 @@ Add the `.virtual` subdomain to queries to find the unique virtual IP allocated
 <service>.virtual[.<peer>].<domain>
 ```
 
-This returns the unique virtual IP for any service mesh-capable service. Each service mesh service has a virtual IP assigned to it by Consul. Sidecar proxies use the virtual IP to enable the [transparent proxy](/consul/docs/connect/transparent-proxy) feature.
+This returns the unique virtual IP for any service mesh-capable service. Each service mesh service has a virtual IP assigned to it by Consul. Sidecar proxies use the virtual IP to enable the [transparent proxy](/consul/docs/connect/transparent-proxy) feature. 
 
 The peer name is an optional. The DNS uses it to query for the virtual IP of a service imported from the specified peer.
 
@@ -404,4 +402,4 @@ This endpoint finds services within the same datacenter and does not support tag
 
 ### UDP-based DNS queries
 
-When the DNS query is performed using UDP, Consul truncates the results without setting the truncate bit. This prevents a redundant lookup over TCP that generates additional load. If the lookup is done over TCP, the results are not truncated.
+When the DNS query is performed using UDP, Consul truncateß the results without setting the truncate bit. This prevents a redundant lookup over TCP that generates additional load. If the lookup is done over TCP, the results are not truncated.
\ No newline at end of file
diff --git a/website/content/docs/services/services.mdx b/website/content/docs/services/services.mdx
index 116193afe3612..7300b9d1aa801 100644
--- a/website/content/docs/services/services.mdx
+++ b/website/content/docs/services/services.mdx
@@ -2,19 +2,19 @@
 layout: docs
 page_title: Services overview
 description: >-
-  Learn about services and service discovery workflows and concepts for virtual machine environments.
+  Learn about services and service discovery workflows and concepts for virtual machine environments. 
 ---
 
 # Services overview
 
 This topic provides overview information about services and how to make them discoverable in Consul when your network operates on virtual machines. If service mesh is enabled in your network, refer to the following articles for additional information about connecting services in a mesh:
 
-- [How Service Mesh Works](/consul/docs/connect/connect-internals)
+- [How Service Mesh Works](/consul/docs/connect/connect-internals) 
 - [How Consul Service Mesh Works on Kubernetes](/consul/docs/k8s/connect)
 
 ## Introduction
 
-A _service_ is an entity in your network that performs a specialized operation or set of related operations. In many contexts, a service is software that you want to make available to users or other programs with access to your network. Services can also refer to native Consul functionality, such as _service mesh proxies_ and _gateways_, that enable you to establish connections between different parts of your network.
+A _service_ is an entity in your network that performs a specialized operation or set of related operations. In many contexts, a service is software that you want to make available to users or other programs with access to your network. Services can also refer to native Consul functionality, such as _service mesh proxies_ and _gateways_, that enable you to establish connections between different parts of your network. 
 
 You can define and register services with Consul, which makes them discoverable to other services in the network. You can also define various types of health checks that perform several safety functions, such as allowing a web balancer to gracefully remove failing nodes and allowing a database to replace a failed secondary.
 
@@ -35,15 +35,15 @@ Consul redirects service traffic through sidecar proxies if you use Consul servi
 
 ### Virtual machines
 
-You must define upstream services in the service definition. Consul uses the upstream configuration to bind the service with its upstreams. After registering the service, you must start a sidecar proxy on the VM to enable mesh connectivity. Refer to [Deploy sidecar services](/consul/docs/connect/proxies/deploy-sidecar-services) for additional information.
+You must define upstream services in the service definition. Consul uses the upstream configuration to bind the service with its upstreams. After registering the service, you must start a sidecar proxy on the VM to enable mesh connectivity. Refer to [Register a Service Mesh Proxy in a Service Registration](/consul/docs/connect/registration/sidecar-service) for details.
 
-### Kubernetes
+### Kubernetes 
 
 If you use Consul on Kubernetes, enable the service mesh injector in your Consul Helm chart and Consul automatically adds a sidecar to each of your pods using the Kubernetes `Service` definition as a reference. You can specify upstream annotations in the `Deployment` definition to bind upstream services to the pods.
 Refer to [`connectInject`](/consul/docs/k8s/connect#installation-and-configuration) and [the upstreams annotation documentation](/consul/docs/k8s/annotations-and-labels#consul-hashicorp-com-connect-service-upstreams) for additional information.
 
 ### Multiple services
 
-You can define common characteristics for services in your mesh, such as the admin partition, namespace, or upstreams, by creating and applying a `service-defaults` configuration entry. You can also define override configurations for specific upstreams or service instances. To use `service-defaults` configuration entries, you must enable Consul service mesh in your network.
+You can define common characteristics for services in your mesh, such as the admin partition, namespace, or upstreams, by creating and applying a `service-defaults` configuration entry. You can also define override configurations for specific upstreams or service instances. To use `service-defaults` configuraiton entries, you must enable Consul service mesh in your network.
 
-Refer to [Define Service Defaults](/consul/docs/services/usage/define-services#define-service-defaults) for additional information.
+Refer to [Define Service Defaults](/consul/docs/services/usage/define-services#define-service-defaults) for additional information.
\ No newline at end of file
diff --git a/website/content/docs/services/usage/define-services.mdx b/website/content/docs/services/usage/define-services.mdx
index 493ca6e08b433..a08b28bbf434c 100644
--- a/website/content/docs/services/usage/define-services.mdx
+++ b/website/content/docs/services/usage/define-services.mdx
@@ -1,17 +1,17 @@
 ---
 layout: docs
-page_title: Define services
+page_title: Define services 
 description: >-
-    Learn how to define services so that they are discoverable in your network.
+    Learn how to define services so that they are discoverable in your network. 
 ---
 
 # Define services
 
-This topic describes how to define services so that they can be discovered by other services. Refer to [Services Overview](/consul/docs/services/services) for additional information.
+This topic describes how to define services so that they can be discovered by other services. Refer to [Services Overview](/consul/docs/services/services) for additional information. 
 
 ## Overview
 
-You must tell Consul about the services deployed to your network if you want them to be discoverable. You can define services in a configuration file or send the service definition parameters as a payload to the `/agent/service/register` API endpoint. Refer to [Register Services and Health Checks](/consul/docs/services/usage/register-services-checks) for details about how to register services with Consul.
+You must tell Consul about the services deployed to your network if you want them to be discoverable. You can define services in a configuration file or send the service definition parameters as a payload to the `/agent/service/register` API endpoint. Refer to [Register Services and Health Checks](/consul/docs/services/usage/register-services-checks) for details about how to register services with Consul.  
 
 You can define multiple services individually using `service` blocks or group multiple services into the same `services` configuration block. Refer to [Define multiple services in a single file](#define-multiple-services-in-a-single-file) for additional information.
 
@@ -19,7 +19,7 @@ If Consul service mesh is enabled in your network, you can use the [service defa
 
 ## Requirements
 
-The core service discovery features are available in all versions of Consul.
+The core service discovery features are available in all versions of Consul. 
 
 ### Service defaults
 To use the [service defaults configuration entry](#define-service-defaults), verify that your installation meets the following requirements:
@@ -28,11 +28,11 @@ To use the [service defaults configuration entry](#define-service-defaults), ver
 - Consul 1.8.4+ is required to use the `ServiceDefaults` custom resource on Kubernetes
 
 ### ACLs
-If ACLs are enabled, resources in your network must present a token with `service:read` access to read a service defaults configuration entry.
+If ACLs are enabled, resources in your network must present a token with `service:read` access to read a service defaults configuration entry. 
 
 You must also present a token with `service:write` access to create, update, or delete a service defaults configuration entry.
 
-Service configurations must also contain and present an ACL token to perform anti-entropy syncs and deregistration operations. Refer to [Modify anti-entropy synchronization](#modify-anti-entropy-synchronization) for additional information.
+Service configurations must also contain and present an ACL token to perform anti-entropy syncs and deregistration operations. Refer to [Modify anti-entropy synchronozation](#modify-anti-entropy-synchronization) for additional information.
 
 On Consul Enterprise, you can register services with specific namespaces if the services' ACL tokens are scoped to the namespace. Services registered with a service definition do not inherit the namespace associated with the ACL token specified in the `token` field. The `namespace` and the `token` parameters must be included in the service definition for the service to be registered to the namespace that the ACL token is scoped to.
 
@@ -52,17 +52,17 @@ service {
   id   = "redis"
   port = 80
   tags = ["primary"]
-
+ 
   meta = {
     custom_meta_key = "custom_meta_value"
   }
-
+ 
   tagged_addresses = {
     lan = {
       address = "192.168.0.55"
       port    = 8000
     }
-
+ 
     wan = {
       address = "198.18.0.23"
       port    = 80
@@ -118,17 +118,17 @@ You can add a `check` or `checks` block to your service configuration to define
 
 ### Register a service
 
-You can register your service using the [`consul services` command](/consul/commands/services) or by calling the [`/agent/services` API endpoint](/consul/api-docs/agent/service). Refer to [Register Services and Health Checks](/consul/docs/services/usage/register-services-checks) for details.
+You can register your service using the [`consul services` command](/consul/commands/services) or by calling the [`/agent/services` API endpoint](/consul/api-docs/agent/service). Refer to [Register Services and Health Checks](/consul/docs/services/usage/register-services-checks) for details. 
 
 ## Define service defaults
-If Consul service mesh is enabled in your network, you can define default values for services in your mesh by creating and applying a `service-defaults` configuration entry containing. Refer to [Service Mesh Configuration Overview](/consul/docs/connect/configuration) for additional information.
+If Consul service mesh is enabled in your network, you can define default values for services in your mesh by creating and applying a `service-defaults` configuration entry containing. Refer to [Service Mesh Configuration Overview](/consul/docs/connect/configuration) for additional information. 
 
 Create a file for the configuration entry and specify the required fields. If you are authoring `service-defaults` in HCL or JSON, the `Kind` and `Name` fields are required. On Kubernetes, the `apiVersion`, `kind`, and `metadata.name` fields are required. Refer to [Service Defaults Reference](/consul/docs/connect/config-entries/service-defaults) for details about the configuration options.
 
 If you use Consul Enterprise, you can also specify the `Namespace` and `Partition` fields to apply the configuration to services in a specific namespace or partition. For Kubernetes environments, the configuration entry is always created in the same partition as the Kubernetes cluster.
 
-### Consul CE example
-The following example instructs services named `counting` to send up to `512` concurrent requests to a mesh gateway:
+### Consul OSS example
+The following example instructs services named `counting` to send up to `512` concurrent requests to a mesh gateway: 
 
 <CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
@@ -206,7 +206,7 @@ spec:
 </CodeTabs>
 
 ### Consul Enterprise example
-The following example instructs services named `counting` in the `prod` namespace to send up to `512` concurrent requests to a mesh gateway:
+The following example instructs services named `counting` in the `prod` namespace to send up to `512` concurrent requests to a mesh gateway: 
 
 <CodeTabs tabs={[ "HCL", "Kubernetes YAML", "JSON" ]}>
 
@@ -288,15 +288,15 @@ spec:
 
 ### Apply service defaults
 
-You can apply your `service-defaults` configuration entry using the [`consul config` command](/consul/commands/config) or by calling the [`/config` API endpoint](/consul/api-docs/config). In Kubernetes environments, apply the `service-defaults` custom resource definitions (CRD) to implement and manage Consul configuration entries.
+You can apply your `service-defaults` configuration entry using the [`consul config` command](/consul/commands/config) or by calling the [`/config` API endpoint](/consul/api-docs/config). In Kubernetes environments, apply the `service-defaults` custom resource definitions (CRD) to implement and manage Consul configuration entries.  
 
-Refer to the following topics for details about applying configuration entries:
-- [How to Use Configuration Entries](/consul/docs/agent/config-entries)
+Refer to the following topics for details about applying configuration entries: 
+- [How to Use Configuration Entries](/consul/docs/agent/config-entries) 
 - [Custom Resource Definitions for Consul on Kubernetes](/consul/docs/k8s/crds)
 
 ## Define multiple services in a single file
 
-The `services` block contains an array of `service` objects. It is a wrapper that enables you to define multiple services in the service definition and instruct Consul to expect more than just a single service configuration. As a result, you can register multiple services in a single `consul services register` command. Note that the `/agent/service/register` API endpoint does not support the `services` parameter.
+The `services` block contains an array of `service` objects. It is a wrapper that enables you to define multiple services in the service definition and instruct Consul to expect more than just a single service configuration. As a result, you can register multiple services in a single `consul services register` command. Note that the `/agent/service/register` API endpoint does not support the `services` parameter. 
 
 In the following example, the service definition configures an instance of the `redis` service tagged as `primary` running on port `6000`. It also configures an instance of the service tagged as `secondary` running on port `7000`.
 
@@ -424,7 +424,7 @@ service {
 
 </CodeTabs>
 
-This configuration only applies to the locally registered service. Nodes that register the same service apply the `enable_tag_override` and other service configurations independently. The tags for a service registered on one node update are not affected by operations performed on services with the same name registered on other nodes.
+This configuration only applies to the locally registered service. Nodes that register the same service apply the `enable_tag_override` and other service configurations independently. The tags for a service registered on one node update are not affected by operations performed on services with the same name registered on other nodes. 
 
 Refer to [`enable_tag_override`](/consul/docs/services/configuration/services-configuration-reference#enable_tag_override) for additional configuration information.
 
@@ -432,7 +432,7 @@ Refer to [`enable_tag_override`](/consul/docs/services/configuration/services-co
 Defining services for service mesh environments on virtual machines and in Kubernetes requires a different workflow.
 
 ### Define service mesh proxies
-You can register services to function as service mesh or sidecar proxies so that they can facilitate communication between other services across your network. Refer to [Service Mesh Proxy Overview](/consul/docs/connect/registration) for additional information.
+You can register services to function as service mesh or sidecar proxies so that they can facilitate communication between other services across your network. Refer to [Service Mesh Proxy Overview](/consul/docs/connect/registration) for additional information. 
 
 ### Define services in Kubernetes
-You can enable the services running in Kubernetes and Consul to sync automatically. Doing so ensures that Kubernetes services are available to Consul agents and services in Consul can be available as first-class Kubernetes services. Refer to [Service Sync for Consul on Kubernetes](/consul/docs/k8s/service-sync) for details.
+You can enable the services running in Kubernetes and Consul to sync automatically. Doing so ensures that Kubernetes services are available to Consul agents and services in Consul can be available as first-class Kubernetes services. Refer to [Service Sync for Consul on Kubernetes](/consul/docs/k8s/service-sync) for details.
\ No newline at end of file
diff --git a/website/content/docs/troubleshoot/common-errors.mdx b/website/content/docs/troubleshoot/common-errors.mdx
index b2d41b6314f02..505d360b05e47 100644
--- a/website/content/docs/troubleshoot/common-errors.mdx
+++ b/website/content/docs/troubleshoot/common-errors.mdx
@@ -44,7 +44,7 @@ There is a syntax error in your configuration file. If the error message doesn't
 ```shell-session
 $ consul agent -server -config-file server.json
 ==> Error parsing server.json: invalid character '`' looking for beginning of value
-$ jq . server.json
+$ cat server.json | jq .
 parse error: Invalid numeric literal at line 3, column 29
 ```
 
diff --git a/website/content/docs/upgrading/instructions/general-process.mdx b/website/content/docs/upgrading/instructions/general-process.mdx
index 70fb45b42f536..0c560f71357a0 100644
--- a/website/content/docs/upgrading/instructions/general-process.mdx
+++ b/website/content/docs/upgrading/instructions/general-process.mdx
@@ -22,7 +22,7 @@ First, download the binary for the new version you want.
 <Tabs>
 <Tab heading="Binary">
 
-All current and past versions of the CE and Enterprise releases are
+All current and past versions of the OSS and Enterprise releases are
 available here:
 
 - https://releases.hashicorp.com/consul
@@ -32,7 +32,7 @@ available here:
 
 Docker containers are available at these locations:
 
-- **CE:** https://hub.docker.com/_/consul
+- **OSS:** https://hub.docker.com/_/consul
 - **Enterprise:** https://hub.docker.com/r/hashicorp/consul-enterprise
 
 </Tab>
@@ -171,8 +171,8 @@ Most of these problems can be solved by following the steps outlined in our
 If you are still having trouble after trying the recovery steps outlined there,
 then the following options for further assistance are available:
 
-- CE users without paid support plans can request help in our [Community Forum](https://discuss.hashicorp.com/c/consul/29)
-- Enterprise and CE users with paid support plans can contact [HashiCorp Support](https://support.hashicorp.com/)
+- OSS users without paid support plans can request help in our [Community Forum](https://discuss.hashicorp.com/c/consul/29)
+- Enterprise and OSS users with paid support plans can contact [HashiCorp Support](https://support.hashicorp.com/)
 
 When contacting Hashicorp Support, please include the following information in your ticket:
 
diff --git a/website/content/docs/upgrading/instructions/upgrade-to-1-10-x.mdx b/website/content/docs/upgrading/instructions/upgrade-to-1-10-x.mdx
index b7b749b03770c..0610b95c05120 100644
--- a/website/content/docs/upgrading/instructions/upgrade-to-1-10-x.mdx
+++ b/website/content/docs/upgrading/instructions/upgrade-to-1-10-x.mdx
@@ -19,7 +19,7 @@ will require intermediate version upgrades to a forward-compatible release of v1
 as well as other licensing related configuration changes. If you have multiple Consul datacenters,
 upgrade them in the normal order and take the following instructions into account for each upgrade.
 
-For Consul Community Edition, please follow the
+For the open source version of Consul please follow the
 [General Upgrade Process](/consul/docs/upgrading/instructions/general-process).
 
 ~> You can only upgrade to Consul Enterprise 1.10 from a version of Consul Enterprise
diff --git a/website/content/docs/upgrading/upgrade-specific.mdx b/website/content/docs/upgrading/upgrade-specific.mdx
index 75722fd36a55a..47c40b5b1f46d 100644
--- a/website/content/docs/upgrading/upgrade-specific.mdx
+++ b/website/content/docs/upgrading/upgrade-specific.mdx
@@ -14,46 +14,9 @@ provided for their upgrades as a result of new features or changed behavior.
 This page is used to document those details separately from the standard
 upgrade flow.
 
-## Consul 1.17.x
-#### Audit Log naming changes (Enterprise)
-Prior to Consul 1.17.0, audit logs contained timestamps on both the original log file names as well as rotated log file names.
-After Consul 1.17.0, only timestamps will be included in rotated log file names.
-
-## Consul 1.16.x
-
-### Known issues
-
-Service mesh in Consul versions 1.16.0 and 1.16.1 may have issues when a snapshot restore is performed and the servers are hosting xDS streams.
-When this bug triggers, it causes Envoy to incorrectly populate upstream endpoints. To prevent this issue, service mesh users who run agent-less workloads should upgrade Consul to v1.16.2 or later.
-
-#### Vault Enterprise as CA ((#vault-enterprise-as-ca-1-16))
-Using Vault as CA with Consul version 1.16.2 will fail to initialize the CA if [`namespace`](/consul/docs/connect/ca/vault#namespace) is set
-but [`intermediate_pki_namespace`](/consul/docs/connect/ca/vault#intermediatepkinamespace) or [`root_pki_namespace`](/consul/docs/connect/ca/vault#rootpkinamespace)
-are empty. This is a bug which will be fixed in a future version.
-
-To work around this issue, users must explicitly set [`intermediate_pki_namespace`](/consul/docs/connect/ca/vault#intermediatepkinamespace) and
-[`root_pki_namespace`](/consul/docs/connect/ca/vault#rootpkinamespace) to the same value as [`namespace`](/consul/docs/connect/ca/vault#namespace).
-Set your configuration by calling [set-config](/consul/commands/connect/ca#set-config) then use [get-config](/consul/commands/connect/ca#get-config) to check.
-
-#### API health endpoints return different status code
-
-Consul versions 1.16.0+ now return an error 403 "Permission denied" status
-whenever the `/v1/health/connect/` and `/v1/health/ingress/` endpoints are
-queried with insufficient ACL `service:read` privileges.
-
-In Consul versions older than 1.16.0, the service health API did not return an explicit error when given a token with invalid permissions. Instead, it returned an empty list with a success status code.
-
-Before upgrading, ensure that all of your applications can handle this new API behavior properly. An update is not required unless you have a custom application that is querying one of these API endpoints directly.
-
-#### Remove deprecated service-defaults peer upstream override behavior
-
-When configuring a service defaults configuration entry, the [`UpstreamConfig.Overrides` configuration](/consul/docs/connect/config-entries/service-defaults#upstreamconfig-overrides)
-does not apply to peer upstreams unless the [`Peer`](/consul/docs/connect/config-entries/service-defaults#upstreamconfig-overrides-peer) field is explicitly provided.
-This change removes the backward-compatibility behavior introduced in Consul 1.15.x. Refer to the [upgrade instructions for 1.15.x](#service-defaults-overrides-for-upstream-peered-services) for more information.
-
 ## Consul 1.15.x
 
-### Service mesh compatibility ((#service-mesh-compatibility-1-15))
+#### Service mesh compatibility ((#service-mesh-compatibility-1-15))
 
 Upgrade to **Consul version 1.15.2 or later**.
 If using [Vault Enterprise as CA](#vault-enterprise-as-ca-1-15), **avoid Consul version 1.15.6**.
@@ -253,7 +216,7 @@ If you already use gRPC encryption, change the following fields to ensure compat
 [Cluster peering](/consul/docs/connect/cluster-peering) was released in Consul 1.13 as an experimental feature.
 In Consul 1.14, cluster peering has been improved and is now considered stable. All experimental peering
 connections created by 1.13 should be
-[deleted](/consul/docs/connect/cluster-peering/usage/manage-connections#delete-peering-connections)
+[deleted](/consul/docs/connect/cluster-peering/create-manage-peering#delete-peering-connections)
 prior to upgrading, as they will no longer be compatible with 1.14.
 
 ## Consul 1.13.x
@@ -441,9 +404,9 @@ to Consul 1.13.3 or later to avoid the breaking nature of that change.
 
 ### Nomad Incompatibility
 
-Nomad users should not upgrade to Consul v1.13.8. An API change in this Consul
-release prevents Nomad from correctly detecting the Consul agent version. As a
-result, allocations are not placed in clients running v1.13.8.
+Nomad users should not upgrade to Consul 1.13.8 as an API change in Consul
+prevents Nomad from correctly detecting the Consul agent version, resulting in
+allocations not being placed in those clients.
 
 ## Consul 1.12.x ((#consul-1-12-0))
 
@@ -783,11 +746,11 @@ fields which are those documented in the example payloads in the API documentati
 
 ### DNS PTR Record Output
 
-Consul will now return the canonical service name in response to PTR queries. For CE users, the
+Consul will now return the canonical service name in response to PTR queries. For OSS users the
 change is that the datacenter will be present where it was not before. For Consul Enterprise
 users, both the datacenter and the services namespace will be present. For example, where a
 PTR record would previously have contained `web.service.consul`, it will now be `web.service.dc1.consul`
-in CE, or `web.service.ns1.dc1.consul` for Enterprise.
+in OSS or `web.service.ns1.dc1.consul` for Enterprise.
 
 ### Telemetry: semantics of `consul.rpc.query` changed, see `consul.rpc.queries_blocking`
 
@@ -814,10 +777,10 @@ Starting with Consul 1.7.1 this is the new default.
 
 #### Removal of Deprecated Features
 
-Managed proxies, which are deprecated since Consul v1.3.0, have now been
-[removed](/consul/docs/connect/proxies). Before upgrading, you must
-migrate any managed proxy usage to [sidecar service
-registrations](/consul/docs/connect/proxies/deploy-sidecar-services).
+Managed proxies (which have been [deprecated](/consul/docs/connect/proxies/managed-deprecated)
+since Consul 1.3.0) have now been [removed](/consul/docs/connect/proxies). Before
+upgrading, you will need to migrate any managed proxy usage to [sidecar service
+registrations](/consul/docs/connect/registration/sidecar-service).
 
 ## Consul 1.4.0
 
@@ -901,7 +864,7 @@ API so existing integrations that create tokens (e.g. Vault) will continue to
 work. The "legacy" tokens generated though will not be able to take advantage of
 new policy features. It's recommended that you complete migration of all tokens
 as soon as possible after upgrade, as well as updating any integrations to work
-with the new ACL [Token](/consul/api-docs/acl/tokens) and
+with the the new ACL [Token](/consul/api-docs/acl/tokens) and
 [Policy](/consul/api-docs/acl/policies) APIs.
 
 ### Multi-datacenter service mesh
@@ -922,7 +885,7 @@ datacenters monitor this periodically (every few minutes) and will
 automatically upgrade service mesh to use a federated Certificate Authority when
 they do.
 
-In general, migrating a Consul cluster from CE to Enterprise will update the
+In general, migrating a Consul cluster from OSS to Enterprise will update the
 CA to be federated automatically and without impact on service mesh traffic. When
 upgrading Consul Enterprise 1.3.x to Consul Enterprise 1.4.0 upgrades the CA
 upgrade is seamless, however depending on the size of the cluster, _new_
diff --git a/website/content/partials/envoy_ext_rule_matcher.mdx b/website/content/partials/envoy_ext_rule_matcher.mdx
deleted file mode 100644
index 1d97c34e4b8d5..0000000000000
--- a/website/content/partials/envoy_ext_rule_matcher.mdx
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Potentially adapt to all conf refs that use this matching scheme-->
-| Rule | Description | Data type | Default |
-| ---  | ---         | ---       | ---     |
-| `Contains` | Specifies a string that the input string must contain. | String | N/A |
-| `Exact` | Specifies a string that the input string must match exactly. | String | N/A |
-| `IgnoreCase` | Directs Envoy to ignore capitalization. If set to `true`, the other matching rules in the configuration are not case sensitive. This rule does not affect `SafeRegex`. | Boolean | `false` |
-| `Prefix` | Specifies a string that the input string must begin with. | String | N/A |
-| `SafeRegex` | Specifies a regular expression for matching the input string programmatically. Envoy supports [Google's RE2 regex engine](https://github.com/google/re2/wiki/Syntax). | String | N/A |
-| `Suffix` | Specifies a string that the input string must end with. | String | N/A |
\ No newline at end of file
diff --git a/website/data/commands-nav-data.json b/website/data/commands-nav-data.json
index dd38459a9012d..ee491e9dfa7b6 100644
--- a/website/data/commands-nav-data.json
+++ b/website/data/commands-nav-data.json
@@ -487,10 +487,6 @@
       {
         "title": "deregister",
         "path": "services/deregister"
-      },
-      {
-        "title": "export",
-        "path": "services/export"
       }
     ]
   },
diff --git a/website/data/docs-nav-data.json b/website/data/docs-nav-data.json
index 2989c955e646e..ea5fe2094d328 100644
--- a/website/data/docs-nav-data.json
+++ b/website/data/docs-nav-data.json
@@ -145,14 +145,6 @@
       {
         "title": "Consul",
         "routes": [
-          {
-            "title": "v1.17.x",
-            "path": "release-notes/consul/v1_17_x"
-          },
-          {
-            "title": "v1.16.x",
-            "path": "release-notes/consul/v1_16_x"
-          },
           {
             "title": "v1.15.x",
             "path": "release-notes/consul/v1_15_x"
@@ -186,10 +178,6 @@
       {
         "title": "Consul K8s",
         "routes": [
-          {
-            "title": "v1.2.x",
-            "path": "release-notes/consul-k8s/v1_2_x"
-          },
           {
             "title": "v1.1.x",
             "path": "release-notes/consul-k8s/v1_1_x"
@@ -406,96 +394,100 @@
         "path": "connect/configuration"
       },
       {
-        "title": "Configuration entries",
+        "title": "Configuration Entries",
         "routes": [
           {
             "title": "Overview",
             "path": "connect/config-entries"
           },
           {
-            "title": "API gateway",
-            "path": "connect/config-entries/api-gateway"
+            "title": "API Gateway",
+            "href": "/consul/docs/connect/gateways/api-gateway/configuration/api-gateway",
+            "badge": {
+              "text": "BETA",
+              "type": "outlined",
+              "color": "neutral"
+            }
           },
           {
-            "title": "HTTP route",
-            "path": "connect/config-entries/http-route"
+            "title": "HTTP Route",
+            "href": "/consul/docs/connect/gateways/api-gateway/configuration/http-route",
+            "badge": {
+              "text": "BETA",
+              "type": "outlined",
+              "color": "neutral"
+            }
           },
           {
-            "title": "TCP route",
-            "path": "connect/config-entries/tcp-route"
+            "title": "TCP Route",
+            "href": "/consul/docs/connect/gateways/api-gateway/configuration/tcp-route",
+            "badge": {
+              "text": "BETA",
+              "type": "outlined",
+              "color": "neutral"
+            }
           },
           {
-            "title": "Inline certificate",
-            "path": "connect/config-entries/inline-certificate"
+            "title": "Inline Certificate",
+            "href": "/consul/docs/connect/gateways/api-gateway/configuration/inline-certificate",
+            "badge": {
+              "text": "BETA",
+              "type": "outlined",
+              "color": "neutral"
+            }
           },
           {
-            "title": "Ingress gateway",
+            "title": "Ingress Gateway",
             "path": "connect/config-entries/ingress-gateway"
           },
-          {
-            "title": "JWT Provider",
-            "path": "connect/config-entries/jwt-provider"
-          },
           {
             "title": "Mesh",
             "path": "connect/config-entries/mesh"
           },
           {
-            "title": "Exported services",
+            "title": "Exported Services",
             "path": "connect/config-entries/exported-services"
           },
           {
-            "title": "Proxy defaults",
+            "title": "Proxy Defaults",
             "path": "connect/config-entries/proxy-defaults"
           },
-          {
-            "title": "Sameness Group",
-            "path": "connect/config-entries/sameness-group"
-          },
           {
             "title": "Service Defaults",
             "path": "connect/config-entries/service-defaults"
           },
           {
-            "title": "Service intentions",
+            "title": "Service Intentions",
             "path": "connect/config-entries/service-intentions"
           },
           {
-            "title": "Service resolver",
+            "title": "Service Resolver",
             "path": "connect/config-entries/service-resolver"
           },
           {
-            "title": "Service router",
+            "title": "Service Router",
             "path": "connect/config-entries/service-router"
           },
           {
-            "title": "Service splitter",
+            "title": "Service Splitter",
             "path": "connect/config-entries/service-splitter"
           },
           {
-            "title": "Terminating gateway",
+            "title": "Terminating Gateway",
             "path": "connect/config-entries/terminating-gateway"
-          },
-          {
-            "title": "Control plane request limit",
-            "path": "connect/config-entries/control-plane-request-limit"
           }
         ]
       },
       {
-        "title": "Proxies",
+        "title": "Supported Proxies",
         "routes": [
           {
             "title": "Overview",
             "path": "connect/proxies"
           },
           {
-            "title": "Deploy service mesh proxies",
-            "path": "connect/proxies/deploy-service-mesh-proxies"
-          },
-          {
-            "title": "Deploy sidecar services",
-            "path": "connect/proxies/deploy-sidecar-services"
+            "title": "Envoy",
+            "path": "connect/proxies/envoy"
           },
           {
             "title": "Envoy Extensions",
@@ -507,14 +499,6 @@
               {
                 "title": "Usage",
                 "routes": [
-                  {
-                    "title": "Delegate authorization to Apigee",
-                    "path": "connect/proxies/envoy-extensions/usage/apigee-ext-authz"
-                  },
-                  {
-                    "title": "Delegate authorization to external services",
-                    "path": "connect/proxies/envoy-extensions/usage/ext-authz"
-                  },
                   {
                     "title": "Run Lua scripts in Envoy proxies",
                     "path": "connect/proxies/envoy-extensions/usage/lua"
@@ -522,63 +506,35 @@
                   {
                     "title": "Invoke Lambda functions in Envoy proxies",
                     "path": "connect/proxies/envoy-extensions/usage/lambda"
-                  },
-                  {
-                    "title": "Send access logs to OpenTelemetry collector service",
-                    "path": "connect/proxies/envoy-extensions/usage/otel-access-logging"
-                  },
-                  {
-                    "title": "Configure Envoy proxy properties",
-                    "path": "connect/proxies/envoy-extensions/usage/property-override"
-                  },
-                  {
-                    "title": "Run WebAssembly plug-ins in Envoy proxies",
-                    "path": "connect/proxies/envoy-extensions/usage/wasm"
-                  }
-                ]
-              },
-              {
-                "title": "Configuration",
-                "routes": [
-                  {
-                    "title": "External authorization",
-                    "path": "connect/proxies/envoy-extensions/configuration/ext-authz"
-                  },
-                  {
-                    "title": "OpenTelemetry Access Logging",
-                    "path": "connect/proxies/envoy-extensions/configuration/otel-access-logging"
-                  },
-                  {
-                    "title": "Property override",
-                    "path": "connect/proxies/envoy-extensions/configuration/property-override"
-                  },
-                  {
-                    "title": "WebAssembly",
-                    "path": "connect/proxies/envoy-extensions/configuration/wasm"
                   }
                 ]
               }
             ]
           },
           {
-            "title": "Proxy integration",
-            "path": "connect/proxies/integrate"
+            "title": "Built-in Proxy",
+            "path": "connect/proxies/built-in"
           },
           {
-            "title": "Proxy defaults configuration reference",
-            "href": "/consul/docs/connect/config-entries/proxy-defaults"
-          },
+            "title": "Proxy Integration",
+            "path": "connect/proxies/integrate"
+          }
+        ]
+      },
+      {
+        "title": "Registering Proxies",
+        "routes": [
           {
-            "title": "Envoy proxies reference",
-            "path": "connect/proxies/envoy"
+            "title": "Overview",
+            "path": "connect/registration"
           },
           {
-            "title": "Built-in proxy reference",
-            "path": "connect/proxies/built-in"
+            "title": "Proxy Service Registration",
+            "path": "connect/registration/service-registration"
           },
           {
-            "title": "Service mesh proxy configuration reference",
-            "path": "connect/proxies/proxy-config-reference"
+            "title": "Sidecar Service Registration",
+            "path": "connect/registration/sidecar-service"
           }
         ]
       },
@@ -593,10 +549,6 @@
             "title": "Create and manage service intentions",
             "path": "connect/intentions/create-manage-intentions"
           },
-          {
-            "title": "JWT authorization for intentions",
-            "path": "connect/intentions/jwt-authorization"
-          },
           {
             "title": "Service intentions legacy mode",
             "path": "connect/intentions/legacy"
@@ -607,6 +559,10 @@
           }
         ]
       },
+      {
+        "title": "Transparent Proxy",
+        "path": "connect/transparent-proxy"
+      },
       {
         "title": "Observability",
         "routes": [
@@ -625,57 +581,15 @@
         ]
       },
       {
-        "title": "Manage traffic",
+        "title": "L7 Traffic Management",
         "routes": [
           {
             "title": "Overview",
-            "path": "connect/manage-traffic"
-          },
-          {
-            "title": "Route traffic to local upstreams",
-            "path": "connect/manage-traffic/route-to-local-upstreams"
-          },
-          {
-            "title": "Limit request rates to services",
-            "path": "connect/manage-traffic/limit-request-rates"
-          },
-          {
-            "title": "Failover",
-            "routes": [
-              {
-                "title": "Overview",
-                "path": "connect/manage-traffic/failover"
-              },
-              {
-                "title": "Configure failover services for Kubernetes",
-                "href": "/docs/k8s/l7-traffic/failover-tproxy"
-              },
-              {
-                "title": "Automate geo-failover with prepared queries",
-                "href": "/tutorials/developer-discovery/automate-geo-failover"
-              },
-              {
-                "title": "Failover with sameness groups",
-                "path": "connect/manage-traffic/failover/sameness"
-              },
-              {
-                "title": "Configuration",
-                "routes": [
-                  {
-                    "title": "Service resolver",
-                    "href": "/consul/docs/connect/config-entries/service-resolver"
-                  },
-                  {
-                    "title": "Service intentions",
-                    "href": "/consul/docs/connect/config-entries/service-intentions"
-                  }
-                ]
-              }
-            ]
+            "path": "connect/l7-traffic"
           },
           {
-            "title": "Discovery chain reference",
-            "path": "connect/manage-traffic/discovery-chain"
+            "title": "Discovery Chain",
+            "path": "connect/l7-traffic/discovery-chain"
           }
         ]
       },
@@ -696,122 +610,40 @@
           },
           {
             "title": "API Gateways",
+            "badge": {
+              "text": "BETA",
+              "type": "outlined",
+              "color": "neutral"
+            },
             "routes": [
               {
                 "title": "Overview",
                 "path": "connect/gateways/api-gateway"
               },
               {
-                "title": "Technical specifications for Kubernetes",
-                "path": "connect/gateways/api-gateway/tech-specs"
-              },
-              {
-                "title": "Install on Kubernetes",
-                "path": "connect/gateways/api-gateway/install-k8s"
-              },
-              {
-                "title": "Upgrade on Kubernetes",
-                "path": "connect/gateways/api-gateway/upgrades-k8s"
-              },
-              {
-                "title": "Deploy listeners",
-                "routes": [
-                  {
-                    "title": "Deploy listeners to VMs",
-                    "path": "connect/gateways/api-gateway/deploy/listeners-vms"
-                  },
-                  {
-                    "title": "Deploy listeners to Kubernetes",
-                    "path": "connect/gateways/api-gateway/deploy/listeners-k8s"
-                  }
-                ]
-              },
-              {
-                "title": "Define routes",
-                "routes": [
-                  {
-                    "title": "Define routes on VMs",
-                    "path": "connect/gateways/api-gateway/define-routes/routes-vms"
-                  },
-                  {
-                    "title": "Define routes on Kubernetes",
-                    "path": "connect/gateways/api-gateway/define-routes/routes-k8s"
-                  },
-                  {
-                    "title": "Reroute traffic in Kubernetes",
-                    "path": "connect/gateways/api-gateway/define-routes/reroute-http-requests"
-                  },
-                  {
-                    "title": "Route to peered services in Kubernetes",
-                    "path": "connect/gateways/api-gateway/define-routes/route-to-peered-services"
-                  }
-                ]
-              },
-              {
-                "title": "Secure traffic",
-                "routes": [
-                  {
-                    "title": "Encrypt traffic on virtual machines",
-                    "path": "connect/gateways/api-gateway/secure-traffic/encrypt-vms"
-                  },
-                  {
-                    "title": "Verify incoming requests with JWTs on virtual machines",
-                    "path": "connect/gateways/api-gateway/secure-traffic/verify-jwts-vms"
-                  },
-                  {
-                    "title": "Verify incoming requests with JWTs on Kubernetes",
-                    "path": "connect/gateways/api-gateway/secure-traffic/verify-jwts-k8s"
-                  }
-                ]
+                "title": "Usage",
+                "path": "connect/gateways/api-gateway/usage"
               },
               {
                 "title": "Configuration",
                 "routes": [
                   {
-                    "title": "Overview",
-                    "path": "connect/gateways/api-gateway/configuration"
-                  },
-                  {
-                    "title": "Gateway",
-                    "path": "connect/gateways/api-gateway/configuration/gateway"
-                  },
-                  {
-                    "title": "GatewayClass",
-                    "path": "connect/gateways/api-gateway/configuration/gatewayclass"
-                  },
-                  {
-                    "title": "GatewayClassConfig",
-                    "path": "connect/gateways/api-gateway/configuration/gatewayclassconfig"
-                  },
-                  {
-                    "title": "GatewayPolicy",
-                    "path": "connect/gateways/api-gateway/configuration/gatewaypolicy"
-                  },
-                  {
-                    "title": "RouteAuthFilter",
-                    "path": "connect/gateways/api-gateway/configuration/routeauthfilter"
+                    "title": "API Gateway",
+                    "path": "connect/gateways/api-gateway/configuration/api-gateway"
                   },
                   {
-                    "title": "Routes",
-                    "path": "connect/gateways/api-gateway/configuration/routes"
+                    "title": "HTTP Route",
+                    "path": "connect/gateways/api-gateway/configuration/http-route"
                   },
                   {
-                    "title": "RouteRetryFilter",
-                    "path": "connect/gateways/api-gateway/configuration/routeretryfilter"
+                    "title": "TCP Route",
+                    "path": "connect/gateways/api-gateway/configuration/tcp-route"
                   },
                   {
-                    "title": "RouteTimeoutFilter",
-                    "path": "connect/gateways/api-gateway/configuration/routetimeoutfilter"
-                  },
-                  {
-                    "title": "MeshService",
-                    "path": "connect/gateways/api-gateway/configuration/meshservice"
+                    "title": "Inline Certificate",
+                    "path": "connect/gateways/api-gateway/configuration/inline-certificate"
                   }
                 ]
-              },
-              {
-                "title": "Error Messages",
-                "path": "connect/gateways/api-gateway/errors"
               }
             ]
           },
@@ -849,11 +681,11 @@
               },
               {
                 "title": "Implement an ingress gateway",
-                "path": "connect/gateways/ingress-gateway/usage"
+                "path": "connect/gateways/ingress-gateway/ingress-gateways-usage"
               },
               {
                 "title": "Serve TLS certificates from an external service",
-                "path": "connect/gateways/ingress-gateway/tls-external-service"
+                "path": "connect/gateways/ingress-gateway/ingress-gateways-tls-external-service"
               },
               {
                 "title": "Configuration",
@@ -892,10 +724,6 @@
               {
                 "title": "Manage L7 Traffic With Cluster Peering",
                 "path": "connect/cluster-peering/usage/peering-traffic-management"
-              },
-              {
-                "title": "Create Sameness Groups",
-                "path": "connect/cluster-peering/usage/create-sameness-groups"
               }
             ]
           }
@@ -1151,36 +979,19 @@
         ]
       },
       {
-        "title": "Limit traffic rates",
+        "title": "Limit Traffic Rates",
         "routes": [
           {
             "title": "Overview",
             "path": "agent/limits"
           },
           {
-            "title": "Usage",
-            "routes": [
-              {
-                "title": "Initialize rate limit settings",
-                "path": "agent/limits/usage/init-rate-limits"
-              },
-              {
-                "title": "Monitor traffic rate limits",
-                "path": "agent/limits/usage/monitor-rate-limits"
-              },
-              {
-                "title": "Set global traffic rate limits",
-                "path": "agent/limits/usage/set-global-traffic-rate-limits"
-              },
-              {
-                "title": "Limit traffic rates from source IP addresses",
-                "path": "agent/limits/usage/limit-request-rates-from-ips"
-              }
-            ]
+            "title": "Initialize Rate Limit Settings",
+            "path": "agent/limits/init-rate-limits"
           },
           {
-            "title": "Configuration",
-            "href": "/docs/connect/config-entries/control-plane-request-limit"
+            "title": "Set Global Traffic Rate Limits",
+            "path": "agent/limits/set-global-traffic-rate-limits"
           }
         ]
       },
@@ -1196,6 +1007,11 @@
         "title": "Sentinel",
         "path": "agent/sentinel"
       },
+      {
+        "title": "RPC",
+        "path": "agent/rpc",
+        "hidden": true
+      },
       {
         "title": "Experimental WAL LogStore",
         "routes": [
@@ -1453,10 +1269,6 @@
                   {
                     "title": "Manage L7 Traffic With Cluster Peering",
                     "path": "k8s/connect/cluster-peering/usage/l7-traffic"
-                  },
-                  {
-                    "title": "Create Sameness Groups",
-                    "path": "k8s/connect/cluster-peering/usage/create-sameness-groups"
                   }
                 ]
               }
@@ -1464,24 +1276,7 @@
           },
           {
             "title": "Transparent Proxy",
-            "routes": [
-              {
-                "title": "Overview",
-                "path": "k8s/connect/transparent-proxy"
-              },
-              {
-                "title": "Enable transparent proxy",
-                "path": "k8s/connect/transparent-proxy/enable-transparent-proxy"
-              },
-              {
-                "title": "Route traffic to virtual services",
-                "href": "/docs/k8s/l7-traffic/route-to-virtual-services"
-              }
-            ]
-          },
-          {
-            "title": "Onboarding services in transparent proxy mode",
-            "path": "k8s/connect/onboarding-tproxy-mode"
+            "href": "/docs/connect/transparent-proxy"
           },
           {
             "title": "Ingress Gateways",
@@ -1514,36 +1309,6 @@
           }
         ]
       },
-      {
-        "title": "Multi-port services",
-        "routes": [
-          {
-            "title": "Overview",
-            "path": "k8s/multiport"
-          },
-          {
-            "title": "Configure multi-port services",
-            "path": "k8s/multiport/configure"
-          }
-        ]
-      },
-      {
-        "title": "L7 traffic management",
-        "routes": [
-          {
-            "title": "Overview",
-            "href": "/docs/connect/l7-traffic"
-          },
-          {
-            "title": "Configure failover services",
-            "path": "k8s/l7-traffic/failover-tproxy"
-          },
-          {
-            "title": "Route traffic to virtual services",
-            "path": "k8s/l7-traffic/route-to-virtual-services"
-          }
-        ]
-      },
       {
         "title": "Service Sync",
         "path": "k8s/service-sync"
@@ -1651,62 +1416,62 @@
         "path": "ecs"
       },
       {
-        "title": "Architecture",
-        "path": "ecs/architecture"
+        "title": "Requirements",
+        "path": "ecs/requirements"
       },
       {
-        "title": "Technical specifications",
-        "path": "ecs/tech-specs"
+        "title": "Task Resource Usage",
+        "path": "ecs/task-resource-usage"
       },
       {
-        "title": "Deploy Consul to ECS",
+        "title": "Install with Terraform",
         "routes": [
           {
-            "title": "Deploy using the Terraform module",
-            "path": "ecs/deploy/terraform"
+            "title": "Installation",
+            "path": "ecs/terraform/install"
           },
           {
-            "title": "Deploy manually",
-            "path": "ecs/deploy/manual"
+            "title": "Secure Configuration",
+            "path": "ecs/terraform/secure-configuration"
           },
           {
-            "title": "Configure the ECS task bind address",
-            "path": "ecs/deploy/bind-addresses"
+            "title": "Migrate Existing Tasks",
+            "path": "ecs/terraform/migrate-existing-tasks"
+          }
+        ]
+      },
+      {
+        "title": "Install Manually",
+        "routes": [
+          {
+            "title": "Installation",
+            "path": "ecs/manual/install"
           },
           {
-            "title": "Configure routes between ECS tasks",
-            "path": "ecs/deploy/configure-routes"
+            "title": "Secure Configuration",
+            "path": "ecs/manual/secure-configuration"
           },
           {
-            "title": "Migrate existing tasks",
-            "path": "ecs/deploy/migrate-existing-tasks"
+            "title": "ACL Controller",
+            "path": "ecs/manual/acl-controller"
           }
         ]
       },
       {
-        "title": "Upgrade to Consul dataplane architecture",
-        "path": "ecs/upgrade-to-dataplanes"
+        "title": "Architecture",
+        "path": "ecs/architecture"
       },
       {
         "title": "Consul Enterprise",
         "path": "ecs/enterprise"
       },
       {
-        "title": "Reference",
-        "routes": [
-          {
-            "title": "ECS configuration reference",
-            "path": "ecs/reference/configuration-reference"
-          },
-          {
-            "title": "ECS compatibility matrix",
-            "path": "ecs/reference/compatibility"
-          },
-          {
-            "title": "ECS Consul server JSON schema",
-            "path": "ecs/reference/consul-server-json"
-          }
-        ]
+        "title": "Configuration Reference",
+        "path": "ecs/configuration-reference"
+      },
+      {
+        "title": "Compatibility Matrix",
+        "path": "ecs/compatibility"
       }
     ]
   },
@@ -1783,10 +1548,6 @@
         "title": "Enhanced Read Scalability",
         "path": "enterprise/read-scale"
       },
-      {
-        "title": "FIPS",
-        "path": "enterprise/fips"
-      },
       {
         "title": "Single sign-on - OIDC",
         "href": "/docs/security/acl/auth-methods/oidc"
@@ -1820,6 +1581,10 @@
         "title": "NIA with TFE",
         "href": "/docs/nia/enterprise"
       },
+      {
+        "title": "Sentinel",
+        "path": "enterprise/sentinel"
+      },
       {
         "title": "License",
         "routes": [
@@ -1842,6 +1607,77 @@
   {
     "divider": true
   },
+  {
+    "title": "API Gateway for Kubernetes",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "api-gateway"
+      },
+      {
+        "title": "Installation",
+        "path": "api-gateway/install"
+      },
+      {
+        "title": "Technical Specifications",
+        "path": "api-gateway/tech-specs"
+      },
+      {
+        "title": "Upgrades",
+        "path": "api-gateway/upgrades"
+      },
+      {
+        "title": "Usage",
+        "routes": [
+          {
+            "title": "Deploy",
+            "path": "api-gateway/usage/usage"
+          },
+          {
+            "title": "Reroute HTTP Requests",
+            "path": "api-gateway/usage/reroute-http-requests"
+          },
+          {
+            "title": "Route Traffic to Peered Services",
+            "path": "api-gateway/usage/route-to-peered-services"
+          },
+          {
+            "title": "Error Messages",
+            "path": "api-gateway/usage/errors"
+          }
+        ]
+      },
+      {
+        "title": "Configuration",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "api-gateway/configuration"
+          },
+          {
+            "title": "Gateway",
+            "path": "api-gateway/configuration/gateway"
+          },
+          {
+            "title": "GatewayClass",
+            "path": "api-gateway/configuration/gatewayclass"
+          },
+          {
+            "title": "GatewayClassConfig",
+            "path": "api-gateway/configuration/gatewayclassconfig"
+          },
+          {
+            "title": "Routes",
+            "path": "api-gateway/configuration/routes"
+          },
+          {
+            "title": "MeshService",
+            "path": "api-gateway/configuration/meshservice"
+          }
+        ]
+      }
+    ]
+  },
   {
     "title": "Network Infrastructure Automation",
     "routes": [
diff --git a/website/package-lock.json b/website/package-lock.json
index dceec6c8eddb0..4e2d3f519e6be 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -8,8 +8,7 @@
       "name": "consul-docs",
       "version": "0.0.1",
       "devDependencies": {
-        "@hashicorp/platform-cli": "^2.6.0",
-        "@hashicorp/platform-content-conformance": "^0.0.10",
+        "@hashicorp/platform-cli": "^2.5.1",
         "dart-linkcheck": "2.0.15",
         "husky": "4.3.8",
         "next": "^12.3.1",
@@ -143,10 +142,11 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
-      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
+      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -286,20 +286,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz",
-      "integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.12.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
@@ -365,18 +351,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz",
-      "integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
@@ -421,6 +395,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -470,21 +445,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz",
-      "integrity": "sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.20.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/runtime": {
       "version": "7.20.7",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz",
@@ -630,9 +590,9 @@
       }
     },
     "node_modules/@hashicorp/platform-cli": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@hashicorp/platform-cli/-/platform-cli-2.6.0.tgz",
-      "integrity": "sha512-nMO7Uiy/A5CT/BCE9RyQt6/Uci7bxwTesxCNWkXlciyqlIrz9WmBa9hr710IiMoDzrzQ1tL6AgFIeTbXs4RTqA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@hashicorp/platform-cli/-/platform-cli-2.5.1.tgz",
+      "integrity": "sha512-kW9bxaYB/Tt3Djl75Kh+u/jRAe7MuX6mdcw+amPaBUnO9ZnNXQXe73fv7nYm7CueZZd2y5PWfx5LPaxWQzhM4g==",
       "dev": true,
       "dependencies": {
         "@hashicorp/platform-cms": "0.3.0",
@@ -711,331 +671,6 @@
         "rivet-graphql": "0.3.1"
       }
     },
-    "node_modules/@hashicorp/platform-content-conformance": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/@hashicorp/platform-content-conformance/-/platform-content-conformance-0.0.10.tgz",
-      "integrity": "sha512-vXLbd2w9phS4JfFyh17jCiyu+LXVonTfb7WEUK2eMlOL/wxe2umyJvEQaJNzD5bwyYC8LuXGA5JkbnPXnU5ZQg==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^6.3.0",
-        "flat": "^5.0.2",
-        "globby": "^13.1.2",
-        "mdast-util-to-string": "^3.1.0",
-        "remark": "12.0.1",
-        "remark-mdx": "^1.6.22",
-        "unified-lint-rule": "^2.1.1",
-        "unist-util-stringify-position": "^3.0.2",
-        "unist-util-visit": "^4.1.1",
-        "vfile": "^5.3.6",
-        "vfile-matter": "^4.0.0",
-        "vfile-reporter": "^7.0.4",
-        "vfile-reporter-json": "^3.2.0",
-        "vfile-statistics": "^2.0.0",
-        "yaml": "^2.1.3",
-        "yargs": "^17.4.1",
-        "zod": "^3.19.1"
-      },
-      "bin": {
-        "hc-content": "dist/cli.js"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/find-up": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
-      "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^7.1.0",
-        "path-exists": "^5.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/globby": {
-      "version": "13.1.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
-      "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
-      "dev": true,
-      "dependencies": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.11",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/locate-path": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
-      "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^6.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/mdast-util-to-string": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.1.tgz",
-      "integrity": "sha512-tGvhT94e+cVnQt8JWE9/b3cUQZWS732TJxXHktvP+BYo62PpYD53Ls/6cC60rW21dW+txxiM4zMdc6abASvZKA==",
-      "dev": true,
-      "dependencies": {
-        "@types/mdast": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/p-limit": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^1.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/p-locate": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
-      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/path-exists": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
-      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
-      "dev": true,
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/remark": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-12.0.1.tgz",
-      "integrity": "sha512-gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw==",
-      "dev": true,
-      "dependencies": {
-        "remark-parse": "^8.0.0",
-        "remark-stringify": "^8.0.0",
-        "unified": "^9.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/remark-parse": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
-      "integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
-      "dev": true,
-      "dependencies": {
-        "ccount": "^1.0.0",
-        "collapse-white-space": "^1.0.2",
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-whitespace-character": "^1.0.0",
-        "is-word-character": "^1.0.0",
-        "markdown-escapes": "^1.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.5.4",
-        "state-toggle": "^1.0.0",
-        "trim": "0.0.1",
-        "trim-trailing-lines": "^1.0.0",
-        "unherit": "^1.0.4",
-        "unist-util-remove-position": "^2.0.0",
-        "vfile-location": "^3.0.0",
-        "xtend": "^4.0.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/remark-stringify": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz",
-      "integrity": "sha512-q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==",
-      "dev": true,
-      "dependencies": {
-        "ccount": "^1.0.0",
-        "is-alphanumeric": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-whitespace-character": "^1.0.0",
-        "longest-streak": "^2.0.1",
-        "markdown-escapes": "^1.0.0",
-        "markdown-table": "^2.0.0",
-        "mdast-util-compact": "^2.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.5.4",
-        "state-toggle": "^1.0.0",
-        "stringify-entities": "^3.0.0",
-        "unherit": "^1.0.4",
-        "xtend": "^4.0.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/yaml": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
-      "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/yargs": {
-      "version": "17.7.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@hashicorp/platform-content-conformance/node_modules/yocto-queue": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.8",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@@ -1454,16 +1089,6 @@
         "node": ">= 10.14.2"
       }
     },
-    "node_modules/@mdx-js/util": {
-      "version": "1.6.22",
-      "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.22.tgz",
-      "integrity": "sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/@next/env": {
       "version": "12.3.1",
       "resolved": "https://registry.npmjs.org/@next/env/-/env-12.3.1.tgz",
@@ -1988,12 +1613,6 @@
       "dev": true,
       "peer": true
     },
-    "node_modules/@types/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw==",
-      "dev": true
-    },
     "node_modules/@types/unist": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
@@ -3140,16 +2759,6 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/ccount": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz",
-      "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/chalk": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
@@ -3186,16 +2795,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/character-entities-html4": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz",
-      "integrity": "sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/character-entities-legacy": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
@@ -3453,16 +3052,6 @@
         "node": ">= 0.12.0"
       }
     },
-    "node_modules/collapse-white-space": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
-      "integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/collect-v8-coverage": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
@@ -3991,12 +3580,6 @@
         "domelementtype": "1"
       }
     },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true
-    },
     "node_modules/ejs": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz",
@@ -5411,15 +4994,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/flat": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-      "dev": true,
-      "bin": {
-        "flat": "cli.js"
-      }
-    },
     "node_modules/flat-cache": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
@@ -5568,6 +5142,7 @@
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
@@ -6411,15 +5986,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/is-alphanumeric": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
-      "integrity": "sha512-ZmRL7++ZkcMOfDuWZuMJyIVLr2keE1o/DeNWh1EmgqGhUcV+9BIVsx0BcSBOHTZqzjs4+dISzr2KAeBEWGgXeA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-alphanumerical": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
@@ -6945,16 +6511,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-whitespace-character": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz",
-      "integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -6965,16 +6521,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-word-character": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz",
-      "integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/is-wsl": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -8447,29 +7993,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/markdown-escapes": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz",
-      "integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/markdown-table": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
-      "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
-      "dev": true,
-      "dependencies": {
-        "repeat-string": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/mathml-tag-names": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
@@ -8480,48 +8003,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/mdast-util-compact": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz",
-      "integrity": "sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==",
-      "dev": true,
-      "dependencies": {
-        "unist-util-visit": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-compact/node_modules/unist-util-visit": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-      "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0",
-        "unist-util-visit-parents": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-compact/node_modules/unist-util-visit-parents": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-      "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/mdast-util-from-markdown": {
       "version": "0.8.5",
       "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
@@ -10801,60 +10282,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/remark-mdx": {
-      "version": "1.6.22",
-      "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.22.tgz",
-      "integrity": "sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "7.12.9",
-        "@babel/helper-plugin-utils": "7.10.4",
-        "@babel/plugin-proposal-object-rest-spread": "7.12.1",
-        "@babel/plugin-syntax-jsx": "7.12.1",
-        "@mdx-js/util": "1.6.22",
-        "is-alphabetical": "1.0.4",
-        "remark-parse": "8.0.3",
-        "unified": "9.2.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/remark-mdx/node_modules/@babel/helper-plugin-utils": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-      "dev": true
-    },
-    "node_modules/remark-mdx/node_modules/remark-parse": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
-      "integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
-      "dev": true,
-      "dependencies": {
-        "ccount": "^1.0.0",
-        "collapse-white-space": "^1.0.2",
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-whitespace-character": "^1.0.0",
-        "is-word-character": "^1.0.0",
-        "markdown-escapes": "^1.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.5.4",
-        "state-toggle": "^1.0.0",
-        "trim": "0.0.1",
-        "trim-trailing-lines": "^1.0.0",
-        "unherit": "^1.0.4",
-        "unist-util-remove-position": "^2.0.0",
-        "vfile-location": "^3.0.0",
-        "xtend": "^4.0.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/remark-parse": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
@@ -10912,6 +10339,7 @@
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12068,16 +11496,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/state-toggle": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz",
-      "integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -12314,21 +11732,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/stringify-entities": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz",
-      "integrity": "sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==",
-      "dev": true,
-      "dependencies": {
-        "character-entities-html4": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "xtend": "^4.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/stringify-object": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
@@ -13242,12 +12645,6 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/trim": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-      "integrity": "sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==",
-      "dev": true
-    },
     "node_modules/trim-newlines": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
@@ -13257,16 +12654,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/trim-trailing-lines": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz",
-      "integrity": "sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/trough": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
@@ -13433,20 +12820,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/unherit": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
-      "integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.0",
-        "xtend": "^4.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/unified": {
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
@@ -13465,116 +12838,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/unified-lint-rule": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/unified-lint-rule/-/unified-lint-rule-2.1.1.tgz",
-      "integrity": "sha512-vsLHyLZFstqtGse2gvrGwasOmH8M2y+r2kQMoDSWzSqUkQx2MjHjvZuGSv5FUaiv4RQO1bHRajy7lSGp7XWq5A==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "trough": "^2.0.0",
-        "unified": "^10.0.0",
-        "vfile": "^5.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unified-lint-rule/node_modules/bail": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
-      "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/unified-lint-rule/node_modules/is-plain-obj": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
-      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/unified-lint-rule/node_modules/trough": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz",
-      "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/unified-lint-rule/node_modules/unified": {
-      "version": "10.1.2",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
-      "integrity": "sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "bail": "^2.0.0",
-        "extend": "^3.0.0",
-        "is-buffer": "^2.0.0",
-        "is-plain-obj": "^4.0.0",
-        "trough": "^2.0.0",
-        "vfile": "^5.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unified-lint-rule/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unified-lint-rule/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unified-lint-rule/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/unified/node_modules/is-plain-obj": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
@@ -13623,139 +12886,48 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/unist-util-remove-position": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz",
-      "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==",
-      "dev": true,
-      "dependencies": {
-        "unist-util-visit": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-remove-position/node_modules/unist-util-visit": {
+    "node_modules/unist-util-stringify-position": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-      "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
+      "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
       "dev": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0",
-        "unist-util-visit-parents": "^3.0.0"
+        "@types/unist": "^2.0.2"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/unist-util-remove-position/node_modules/unist-util-visit-parents": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-      "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
+    "node_modules/universalify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
       "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/unist-util-stringify-position": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
-      "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
+    "node_modules/unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.2"
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/unist-util-visit": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz",
-      "integrity": "sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==",
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
       "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^5.0.0",
-        "unist-util-visit-parents": "^5.1.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-visit-parents": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz",
-      "integrity": "sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^5.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-visit-parents/node_modules/unist-util-is": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.0.tgz",
-      "integrity": "sha512-Glt17jWwZeyqrFqOK0pF1Ded5U3yzJnFr8CG1GMjCWTp9zDo2p+cmD6pWbZU8AgM5WU3IzRv6+rBwhzsGh6hBQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-visit/node_modules/unist-util-is": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.0.tgz",
-      "integrity": "sha512-Glt17jWwZeyqrFqOK0pF1Ded5U3yzJnFr8CG1GMjCWTp9zDo2p+cmD6pWbZU8AgM5WU3IzRv6+rBwhzsGh6hBQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-      "dev": true,
-      "peer": true,
+      "peer": true,
       "dependencies": {
         "get-value": "^2.0.3",
         "has-values": "^0.1.4",
@@ -13803,484 +12975,111 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "deprecated": "Please see https://github.com/lydell/urix#deprecated",
       "dev": true,
-      "peer": true
-    },
-    "node_modules/url-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/url-regex/-/url-regex-5.0.0.tgz",
-      "integrity": "sha512-O08GjTiAFNsSlrUWfqF1jH0H1W3m35ZyadHrGv5krdnmPPoxP27oDTqux/579PtaroiSGm5yma6KT1mHFH6Y/g==",
-      "dev": true,
-      "dependencies": {
-        "ip-regex": "^4.1.0",
-        "tlds": "^1.203.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/use-sync-external-store": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
-      "dev": true,
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "node_modules/v8-to-istanbul": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
-      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0",
-        "source-map": "^0.7.3"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/v8-to-istanbul/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/vfile": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
-      "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0",
-        "vfile-message": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-location": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz",
-      "integrity": "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-matter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/vfile-matter/-/vfile-matter-4.0.1.tgz",
-      "integrity": "sha512-ZeACdaxCOxhePpoLO4A5y/VgI9EuWBXu+sUk65aQ7lXBZDFg7X0tuOzigLJUtsQzazFt6K2m9SdlDxZdfL5vVg==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^2.0.0",
-        "vfile": "^5.0.0",
-        "yaml": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-matter/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-matter/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-matter/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-matter/node_modules/yaml": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
-      "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/vfile-message": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
-      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-reporter": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.5.tgz",
-      "integrity": "sha512-NdWWXkv6gcd7AZMvDomlQbK3MqFWL1RlGzMn++/O2TI+68+nqxCPTvLugdOtfSzXmjh+xUyhp07HhlrbJjT+mw==",
-      "dev": true,
-      "dependencies": {
-        "@types/supports-color": "^8.0.0",
-        "string-width": "^5.0.0",
-        "supports-color": "^9.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0",
-        "vfile-sort": "^3.0.0",
-        "vfile-statistics": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-reporter-json": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/vfile-reporter-json/-/vfile-reporter-json-3.3.0.tgz",
-      "integrity": "sha512-/zgRtjxQ2UGJn+HViiZ7+nIXtUzkkXFQum3BmaS/bSyr10P0X41ETRqqwMJ95RtbKUah3m7pKb6oS1eZeXXHzQ==",
-      "dev": true,
-      "dependencies": {
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-reporter-json/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-reporter-json/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-reporter-json/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-reporter/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/vfile-reporter/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
-    },
-    "node_modules/vfile-reporter/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/vfile-reporter/node_modules/strip-ansi": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/vfile-reporter/node_modules/supports-color": {
-      "version": "9.3.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.3.1.tgz",
-      "integrity": "sha512-knBY82pjmnIzK3NifMo3RxEIRD9E0kIzV4BKcyTZ9+9kWgLMxd4PrsTSMoFQUabgRBbF8KOLRDCyKgNV+iK44Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/vfile-reporter/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-reporter/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-reporter/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
+      "peer": true
     },
-    "node_modules/vfile-sort": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-3.0.1.tgz",
-      "integrity": "sha512-1os1733XY6y0D5x0ugqSeaVJm9lYgj0j5qdcZQFyxlZOSy1jYarL77lLyb5gK4Wqr1d5OxmuyflSO3zKyFnTFw==",
+    "node_modules/url-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/url-regex/-/url-regex-5.0.0.tgz",
+      "integrity": "sha512-O08GjTiAFNsSlrUWfqF1jH0H1W3m35ZyadHrGv5krdnmPPoxP27oDTqux/579PtaroiSGm5yma6KT1mHFH6Y/g==",
       "dev": true,
       "dependencies": {
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0"
+        "ip-regex": "^4.1.0",
+        "tlds": "^1.203.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/vfile-sort/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+    "node_modules/use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/vfile-sort/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+    "node_modules/use-sync-external-store": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
+      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
       "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
-    "node_modules/vfile-sort/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
+      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=10.10.0"
       }
     },
-    "node_modules/vfile-statistics": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-2.0.1.tgz",
-      "integrity": "sha512-W6dkECZmP32EG/l+dp2jCLdYzmnDBIw6jwiLZSER81oR5AHRcVqL+k3Z+pfH1R73le6ayDkJRMk0sutj1bMVeg==",
+    "node_modules/v8-to-istanbul/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
       "dev": true,
-      "dependencies": {
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "peer": true,
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/vfile-statistics/node_modules/unist-util-stringify-position": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-      "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "dev": true,
       "dependencies": {
-        "@types/unist": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
       }
     },
-    "node_modules/vfile-statistics/node_modules/vfile": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-      "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+    "node_modules/vfile": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
+      "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
       "dev": true,
       "dependencies": {
         "@types/unist": "^2.0.0",
         "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile-message": "^3.0.0"
+        "unist-util-stringify-position": "^2.0.0",
+        "vfile-message": "^2.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/vfile-statistics/node_modules/vfile-message": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-      "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+    "node_modules/vfile-message": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
+      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
       "dev": true,
       "dependencies": {
         "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^3.0.0"
+        "unist-util-stringify-position": "^2.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -14474,15 +13273,6 @@
       "dev": true,
       "peer": true
     },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
     "node_modules/y18n": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
@@ -14629,15 +13419,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/zod": {
-      "version": "3.20.6",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.20.6.tgz",
-      "integrity": "sha512-oyu0m54SGCtzh6EClBVqDDlAYRz4jrVtKwQ7ZnsEmMI9HnzuZFj8QFwAY1M5uniIYACdGvv0PBWPF2kO0aNofA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
-    },
     "node_modules/zwitch": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
@@ -14766,10 +13547,11 @@
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
-      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
-      "dev": true
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
+      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
+      "dev": true,
+      "peer": true
     },
     "@babel/helper-replace-supers": {
       "version": "7.14.4",
@@ -14887,17 +13669,6 @@
       "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==",
       "dev": true
     },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz",
-      "integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.12.1"
-      }
-    },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
@@ -14948,15 +13719,6 @@
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "@babel/plugin-syntax-jsx": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz",
-      "integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
     "@babel/plugin-syntax-logical-assignment-operators": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
@@ -14992,6 +13754,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
+      "peer": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
@@ -15026,15 +13789,6 @@
         "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz",
-      "integrity": "sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.20.2"
-      }
-    },
     "@babel/runtime": {
       "version": "7.20.7",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz",
@@ -15149,9 +13903,9 @@
       }
     },
     "@hashicorp/platform-cli": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@hashicorp/platform-cli/-/platform-cli-2.6.0.tgz",
-      "integrity": "sha512-nMO7Uiy/A5CT/BCE9RyQt6/Uci7bxwTesxCNWkXlciyqlIrz9WmBa9hr710IiMoDzrzQ1tL6AgFIeTbXs4RTqA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@hashicorp/platform-cli/-/platform-cli-2.5.1.tgz",
+      "integrity": "sha512-kW9bxaYB/Tt3Djl75Kh+u/jRAe7MuX6mdcw+amPaBUnO9ZnNXQXe73fv7nYm7CueZZd2y5PWfx5LPaxWQzhM4g==",
       "dev": true,
       "requires": {
         "@hashicorp/platform-cms": "0.3.0",
@@ -15211,242 +13965,6 @@
         "rivet-graphql": "0.3.1"
       }
     },
-    "@hashicorp/platform-content-conformance": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/@hashicorp/platform-content-conformance/-/platform-content-conformance-0.0.10.tgz",
-      "integrity": "sha512-vXLbd2w9phS4JfFyh17jCiyu+LXVonTfb7WEUK2eMlOL/wxe2umyJvEQaJNzD5bwyYC8LuXGA5JkbnPXnU5ZQg==",
-      "dev": true,
-      "requires": {
-        "find-up": "^6.3.0",
-        "flat": "^5.0.2",
-        "globby": "^13.1.2",
-        "mdast-util-to-string": "^3.1.0",
-        "remark": "12.0.1",
-        "remark-mdx": "^1.6.22",
-        "unified-lint-rule": "^2.1.1",
-        "unist-util-stringify-position": "^3.0.2",
-        "unist-util-visit": "^4.1.1",
-        "vfile": "^5.3.6",
-        "vfile-matter": "^4.0.0",
-        "vfile-reporter": "^7.0.4",
-        "vfile-reporter-json": "^3.2.0",
-        "vfile-statistics": "^2.0.0",
-        "yaml": "^2.1.3",
-        "yargs": "^17.4.1",
-        "zod": "^3.19.1"
-      },
-      "dependencies": {
-        "cliui": {
-          "version": "8.0.1",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-          "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.1",
-            "wrap-ansi": "^7.0.0"
-          }
-        },
-        "find-up": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
-          "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^7.1.0",
-            "path-exists": "^5.0.0"
-          }
-        },
-        "globby": {
-          "version": "13.1.3",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
-          "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
-          "dev": true,
-          "requires": {
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.2.11",
-            "ignore": "^5.2.0",
-            "merge2": "^1.4.1",
-            "slash": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
-          "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^6.0.0"
-          }
-        },
-        "mdast-util-to-string": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.1.tgz",
-          "integrity": "sha512-tGvhT94e+cVnQt8JWE9/b3cUQZWS732TJxXHktvP+BYo62PpYD53Ls/6cC60rW21dW+txxiM4zMdc6abASvZKA==",
-          "dev": true,
-          "requires": {
-            "@types/mdast": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
-          "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
-          "dev": true,
-          "requires": {
-            "yocto-queue": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
-          "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^4.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
-          "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
-          "dev": true
-        },
-        "remark": {
-          "version": "12.0.1",
-          "resolved": "https://registry.npmjs.org/remark/-/remark-12.0.1.tgz",
-          "integrity": "sha512-gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw==",
-          "dev": true,
-          "requires": {
-            "remark-parse": "^8.0.0",
-            "remark-stringify": "^8.0.0",
-            "unified": "^9.0.0"
-          }
-        },
-        "remark-parse": {
-          "version": "8.0.3",
-          "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
-          "integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
-          "dev": true,
-          "requires": {
-            "ccount": "^1.0.0",
-            "collapse-white-space": "^1.0.2",
-            "is-alphabetical": "^1.0.0",
-            "is-decimal": "^1.0.0",
-            "is-whitespace-character": "^1.0.0",
-            "is-word-character": "^1.0.0",
-            "markdown-escapes": "^1.0.0",
-            "parse-entities": "^2.0.0",
-            "repeat-string": "^1.5.4",
-            "state-toggle": "^1.0.0",
-            "trim": "0.0.1",
-            "trim-trailing-lines": "^1.0.0",
-            "unherit": "^1.0.4",
-            "unist-util-remove-position": "^2.0.0",
-            "vfile-location": "^3.0.0",
-            "xtend": "^4.0.1"
-          }
-        },
-        "remark-stringify": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz",
-          "integrity": "sha512-q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==",
-          "dev": true,
-          "requires": {
-            "ccount": "^1.0.0",
-            "is-alphanumeric": "^1.0.0",
-            "is-decimal": "^1.0.0",
-            "is-whitespace-character": "^1.0.0",
-            "longest-streak": "^2.0.1",
-            "markdown-escapes": "^1.0.0",
-            "markdown-table": "^2.0.0",
-            "mdast-util-compact": "^2.0.0",
-            "parse-entities": "^2.0.0",
-            "repeat-string": "^1.5.4",
-            "state-toggle": "^1.0.0",
-            "stringify-entities": "^3.0.0",
-            "unherit": "^1.0.4",
-            "xtend": "^4.0.1"
-          }
-        },
-        "slash": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-          "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-          "dev": true
-        },
-        "unist-util-stringify-position": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-          "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0"
-          }
-        },
-        "vfile": {
-          "version": "5.3.7",
-          "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-          "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "is-buffer": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0",
-            "vfile-message": "^3.0.0"
-          }
-        },
-        "vfile-message": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-          "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0"
-          }
-        },
-        "y18n": {
-          "version": "5.0.8",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-          "dev": true
-        },
-        "yaml": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
-          "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "17.7.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-          "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^8.0.1",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.3",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^21.1.1"
-          }
-        },
-        "yargs-parser": {
-          "version": "21.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-          "dev": true
-        },
-        "yocto-queue": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-          "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
-          "dev": true
-        }
-      }
-    },
     "@humanwhocodes/config-array": {
       "version": "0.11.8",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@@ -15789,12 +14307,6 @@
         "chalk": "^4.0.0"
       }
     },
-    "@mdx-js/util": {
-      "version": "1.6.22",
-      "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.22.tgz",
-      "integrity": "sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==",
-      "dev": true
-    },
     "@next/env": {
       "version": "12.3.1",
       "resolved": "https://registry.npmjs.org/@next/env/-/env-12.3.1.tgz",
@@ -16173,12 +14685,6 @@
       "dev": true,
       "peer": true
     },
-    "@types/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw==",
-      "dev": true
-    },
     "@types/unist": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
@@ -17004,12 +15510,6 @@
         "rsvp": "^4.8.4"
       }
     },
-    "ccount": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz",
-      "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==",
-      "dev": true
-    },
     "chalk": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
@@ -17033,12 +15533,6 @@
       "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
       "dev": true
     },
-    "character-entities-html4": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz",
-      "integrity": "sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==",
-      "dev": true
-    },
     "character-entities-legacy": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
@@ -17246,12 +15740,6 @@
       "dev": true,
       "peer": true
     },
-    "collapse-white-space": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
-      "integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==",
-      "dev": true
-    },
     "collect-v8-coverage": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
@@ -17680,12 +16168,6 @@
         "domelementtype": "1"
       }
     },
-    "eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true
-    },
     "ejs": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz",
@@ -18787,12 +17269,6 @@
         "semver-regex": "^3.1.2"
       }
     },
-    "flat": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-      "dev": true
-    },
     "flat-cache": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
@@ -18906,7 +17382,8 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "get-intrinsic": {
       "version": "1.1.3",
@@ -19532,12 +18009,6 @@
       "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
       "dev": true
     },
-    "is-alphanumeric": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
-      "integrity": "sha512-ZmRL7++ZkcMOfDuWZuMJyIVLr2keE1o/DeNWh1EmgqGhUcV+9BIVsx0BcSBOHTZqzjs4+dISzr2KAeBEWGgXeA==",
-      "dev": true
-    },
     "is-alphanumerical": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
@@ -19882,13 +18353,7 @@
       "requires": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.1.1"
-      }
-    },
-    "is-whitespace-character": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz",
-      "integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==",
-      "dev": true
+      }
     },
     "is-windows": {
       "version": "1.0.2",
@@ -19897,12 +18362,6 @@
       "dev": true,
       "peer": true
     },
-    "is-word-character": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz",
-      "integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==",
-      "dev": true
-    },
     "is-wsl": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -21057,59 +19516,12 @@
         "object-visit": "^1.0.0"
       }
     },
-    "markdown-escapes": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz",
-      "integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==",
-      "dev": true
-    },
-    "markdown-table": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
-      "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
-      "dev": true,
-      "requires": {
-        "repeat-string": "^1.0.0"
-      }
-    },
     "mathml-tag-names": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
       "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
       "dev": true
     },
-    "mdast-util-compact": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz",
-      "integrity": "sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==",
-      "dev": true,
-      "requires": {
-        "unist-util-visit": "^2.0.0"
-      },
-      "dependencies": {
-        "unist-util-visit": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-          "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-is": "^4.0.0",
-            "unist-util-visit-parents": "^3.0.0"
-          }
-        },
-        "unist-util-visit-parents": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-          "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-is": "^4.0.0"
-          }
-        }
-      }
-    },
     "mdast-util-from-markdown": {
       "version": "0.8.5",
       "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
@@ -22834,54 +21246,6 @@
         "unified": "^9.1.0"
       }
     },
-    "remark-mdx": {
-      "version": "1.6.22",
-      "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.22.tgz",
-      "integrity": "sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "7.12.9",
-        "@babel/helper-plugin-utils": "7.10.4",
-        "@babel/plugin-proposal-object-rest-spread": "7.12.1",
-        "@babel/plugin-syntax-jsx": "7.12.1",
-        "@mdx-js/util": "1.6.22",
-        "is-alphabetical": "1.0.4",
-        "remark-parse": "8.0.3",
-        "unified": "9.2.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-          "dev": true
-        },
-        "remark-parse": {
-          "version": "8.0.3",
-          "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
-          "integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
-          "dev": true,
-          "requires": {
-            "ccount": "^1.0.0",
-            "collapse-white-space": "^1.0.2",
-            "is-alphabetical": "^1.0.0",
-            "is-decimal": "^1.0.0",
-            "is-whitespace-character": "^1.0.0",
-            "is-word-character": "^1.0.0",
-            "markdown-escapes": "^1.0.0",
-            "parse-entities": "^2.0.0",
-            "repeat-string": "^1.5.4",
-            "state-toggle": "^1.0.0",
-            "trim": "0.0.1",
-            "trim-trailing-lines": "^1.0.0",
-            "unherit": "^1.0.4",
-            "unist-util-remove-position": "^2.0.0",
-            "vfile-location": "^3.0.0",
-            "xtend": "^4.0.1"
-          }
-        }
-      }
-    },
     "remark-parse": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
@@ -22924,7 +21288,8 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "require-from-string": {
       "version": "2.0.2",
@@ -23865,12 +22230,6 @@
         }
       }
     },
-    "state-toggle": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz",
-      "integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==",
-      "dev": true
-    },
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -24056,17 +22415,6 @@
         "es-abstract": "^1.20.4"
       }
     },
-    "stringify-entities": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz",
-      "integrity": "sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==",
-      "dev": true,
-      "requires": {
-        "character-entities-html4": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
     "stringify-object": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
@@ -24771,24 +23119,12 @@
         }
       }
     },
-    "trim": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-      "integrity": "sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==",
-      "dev": true
-    },
     "trim-newlines": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
       "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
       "dev": true
     },
-    "trim-trailing-lines": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz",
-      "integrity": "sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==",
-      "dev": true
-    },
     "trough": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
@@ -24912,16 +23248,6 @@
         "which-boxed-primitive": "^1.0.2"
       }
     },
-    "unherit": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
-      "integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
     "unified": {
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
@@ -24944,84 +23270,6 @@
         }
       }
     },
-    "unified-lint-rule": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/unified-lint-rule/-/unified-lint-rule-2.1.1.tgz",
-      "integrity": "sha512-vsLHyLZFstqtGse2gvrGwasOmH8M2y+r2kQMoDSWzSqUkQx2MjHjvZuGSv5FUaiv4RQO1bHRajy7lSGp7XWq5A==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.0",
-        "trough": "^2.0.0",
-        "unified": "^10.0.0",
-        "vfile": "^5.0.0"
-      },
-      "dependencies": {
-        "bail": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
-          "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==",
-          "dev": true
-        },
-        "is-plain-obj": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
-          "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
-          "dev": true
-        },
-        "trough": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz",
-          "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==",
-          "dev": true
-        },
-        "unified": {
-          "version": "10.1.2",
-          "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
-          "integrity": "sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "bail": "^2.0.0",
-            "extend": "^3.0.0",
-            "is-buffer": "^2.0.0",
-            "is-plain-obj": "^4.0.0",
-            "trough": "^2.0.0",
-            "vfile": "^5.0.0"
-          }
-        },
-        "unist-util-stringify-position": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-          "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0"
-          }
-        },
-        "vfile": {
-          "version": "5.3.7",
-          "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-          "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "is-buffer": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0",
-            "vfile-message": "^3.0.0"
-          }
-        },
-        "vfile-message": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-          "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0"
-          }
-        }
-      }
-    },
     "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -25050,38 +23298,6 @@
       "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
       "dev": true
     },
-    "unist-util-remove-position": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz",
-      "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==",
-      "dev": true,
-      "requires": {
-        "unist-util-visit": "^2.0.0"
-      },
-      "dependencies": {
-        "unist-util-visit": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-          "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-is": "^4.0.0",
-            "unist-util-visit-parents": "^3.0.0"
-          }
-        },
-        "unist-util-visit-parents": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-          "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-is": "^4.0.0"
-          }
-        }
-      }
-    },
     "unist-util-stringify-position": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
@@ -25091,43 +23307,6 @@
         "@types/unist": "^2.0.2"
       }
     },
-    "unist-util-visit": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz",
-      "integrity": "sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^5.0.0",
-        "unist-util-visit-parents": "^5.1.1"
-      },
-      "dependencies": {
-        "unist-util-is": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.0.tgz",
-          "integrity": "sha512-Glt17jWwZeyqrFqOK0pF1Ded5U3yzJnFr8CG1GMjCWTp9zDo2p+cmD6pWbZU8AgM5WU3IzRv6+rBwhzsGh6hBQ==",
-          "dev": true
-        }
-      }
-    },
-    "unist-util-visit-parents": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz",
-      "integrity": "sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.0",
-        "unist-util-is": "^5.0.0"
-      },
-      "dependencies": {
-        "unist-util-is": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.0.tgz",
-          "integrity": "sha512-Glt17jWwZeyqrFqOK0pF1Ded5U3yzJnFr8CG1GMjCWTp9zDo2p+cmD6pWbZU8AgM5WU3IzRv6+rBwhzsGh6hBQ==",
-          "dev": true
-        }
-      }
-    },
     "universalify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
@@ -25273,62 +23452,6 @@
         "vfile-message": "^2.0.0"
       }
     },
-    "vfile-location": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz",
-      "integrity": "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==",
-      "dev": true
-    },
-    "vfile-matter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/vfile-matter/-/vfile-matter-4.0.1.tgz",
-      "integrity": "sha512-ZeACdaxCOxhePpoLO4A5y/VgI9EuWBXu+sUk65aQ7lXBZDFg7X0tuOzigLJUtsQzazFt6K2m9SdlDxZdfL5vVg==",
-      "dev": true,
-      "requires": {
-        "is-buffer": "^2.0.0",
-        "vfile": "^5.0.0",
-        "yaml": "^2.0.0"
-      },
-      "dependencies": {
-        "unist-util-stringify-position": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-          "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0"
-          }
-        },
-        "vfile": {
-          "version": "5.3.7",
-          "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-          "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "is-buffer": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0",
-            "vfile-message": "^3.0.0"
-          }
-        },
-        "vfile-message": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-          "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0"
-          }
-        },
-        "yaml": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
-          "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
-          "dev": true
-        }
-      }
-    },
     "vfile-message": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
@@ -25339,222 +23462,6 @@
         "unist-util-stringify-position": "^2.0.0"
       }
     },
-    "vfile-reporter": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.5.tgz",
-      "integrity": "sha512-NdWWXkv6gcd7AZMvDomlQbK3MqFWL1RlGzMn++/O2TI+68+nqxCPTvLugdOtfSzXmjh+xUyhp07HhlrbJjT+mw==",
-      "dev": true,
-      "requires": {
-        "@types/supports-color": "^8.0.0",
-        "string-width": "^5.0.0",
-        "supports-color": "^9.0.0",
-        "unist-util-stringify-position": "^3.0.0",
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0",
-        "vfile-sort": "^3.0.0",
-        "vfile-statistics": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "9.2.2",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-          "dev": true,
-          "requires": {
-            "eastasianwidth": "^0.2.0",
-            "emoji-regex": "^9.2.2",
-            "strip-ansi": "^7.0.1"
-          }
-        },
-        "strip-ansi": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^6.0.1"
-          }
-        },
-        "supports-color": {
-          "version": "9.3.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.3.1.tgz",
-          "integrity": "sha512-knBY82pjmnIzK3NifMo3RxEIRD9E0kIzV4BKcyTZ9+9kWgLMxd4PrsTSMoFQUabgRBbF8KOLRDCyKgNV+iK44Q==",
-          "dev": true
-        },
-        "unist-util-stringify-position": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-          "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0"
-          }
-        },
-        "vfile": {
-          "version": "5.3.7",
-          "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-          "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "is-buffer": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0",
-            "vfile-message": "^3.0.0"
-          }
-        },
-        "vfile-message": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-          "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0"
-          }
-        }
-      }
-    },
-    "vfile-reporter-json": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/vfile-reporter-json/-/vfile-reporter-json-3.3.0.tgz",
-      "integrity": "sha512-/zgRtjxQ2UGJn+HViiZ7+nIXtUzkkXFQum3BmaS/bSyr10P0X41ETRqqwMJ95RtbKUah3m7pKb6oS1eZeXXHzQ==",
-      "dev": true,
-      "requires": {
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "dependencies": {
-        "unist-util-stringify-position": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-          "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0"
-          }
-        },
-        "vfile": {
-          "version": "5.3.7",
-          "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-          "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "is-buffer": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0",
-            "vfile-message": "^3.0.0"
-          }
-        },
-        "vfile-message": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-          "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0"
-          }
-        }
-      }
-    },
-    "vfile-sort": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-3.0.1.tgz",
-      "integrity": "sha512-1os1733XY6y0D5x0ugqSeaVJm9lYgj0j5qdcZQFyxlZOSy1jYarL77lLyb5gK4Wqr1d5OxmuyflSO3zKyFnTFw==",
-      "dev": true,
-      "requires": {
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "dependencies": {
-        "unist-util-stringify-position": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-          "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0"
-          }
-        },
-        "vfile": {
-          "version": "5.3.7",
-          "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-          "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "is-buffer": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0",
-            "vfile-message": "^3.0.0"
-          }
-        },
-        "vfile-message": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-          "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0"
-          }
-        }
-      }
-    },
-    "vfile-statistics": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-2.0.1.tgz",
-      "integrity": "sha512-W6dkECZmP32EG/l+dp2jCLdYzmnDBIw6jwiLZSER81oR5AHRcVqL+k3Z+pfH1R73le6ayDkJRMk0sutj1bMVeg==",
-      "dev": true,
-      "requires": {
-        "vfile": "^5.0.0",
-        "vfile-message": "^3.0.0"
-      },
-      "dependencies": {
-        "unist-util-stringify-position": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
-          "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0"
-          }
-        },
-        "vfile": {
-          "version": "5.3.7",
-          "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
-          "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "is-buffer": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0",
-            "vfile-message": "^3.0.0"
-          }
-        },
-        "vfile-message": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
-          "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
-          "dev": true,
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-stringify-position": "^3.0.0"
-          }
-        }
-      }
-    },
     "w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@@ -25712,12 +23619,6 @@
       "dev": true,
       "peer": true
     },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
-    },
     "y18n": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
@@ -25830,12 +23731,6 @@
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true
     },
-    "zod": {
-      "version": "3.20.6",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.20.6.tgz",
-      "integrity": "sha512-oyu0m54SGCtzh6EClBVqDDlAYRz4jrVtKwQ7ZnsEmMI9HnzuZFj8QFwAY1M5uniIYACdGvv0PBWPF2kO0aNofA==",
-      "dev": true
-    },
     "zwitch": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
diff --git a/website/package.json b/website/package.json
index caacb3c5976c4..676e5b1e9ea28 100644
--- a/website/package.json
+++ b/website/package.json
@@ -4,8 +4,7 @@
   "version": "0.0.1",
   "author": "HashiCorp",
   "devDependencies": {
-    "@hashicorp/platform-cli": "^2.6.0",
-    "@hashicorp/platform-content-conformance": "^0.0.10",
+    "@hashicorp/platform-cli": "^2.5.1",
     "dart-linkcheck": "2.0.15",
     "husky": "4.3.8",
     "next": "^12.3.1",
@@ -24,8 +23,7 @@
     "generate:readme": "next-hashicorp markdown-blocks README.md",
     "lint": "next-hashicorp lint",
     "start": "./scripts/website-start.sh",
-    "linkcheck": "linkcheck https://consul.io",
-    "content-check": "hc-content --config base-docs"
+    "linkcheck": "linkcheck https://consul.io"
   },
   "engines": {
     "npm": ">=7.0.0"
diff --git a/website/prettier.config.js b/website/prettier.config.js
index 6cedcca48f42d..b3ac14ab0ee05 100644
--- a/website/prettier.config.js
+++ b/website/prettier.config.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 module.exports = {
   ...require('@hashicorp/platform-cli/config/prettier.config'),
 }
diff --git a/website/public/ie-warning.js b/website/public/ie-warning.js
index 87109b2ed5363..048cc224b2902 100644
--- a/website/public/ie-warning.js
+++ b/website/public/ie-warning.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 !(function () {
   'use strict'
 
diff --git a/website/public/img/agent-rate-limiting-ops-order-dark.jpg b/website/public/img/agent-rate-limiting-ops-order-dark.jpg
deleted file mode 100644
index 8b87f67e24746..0000000000000
Binary files a/website/public/img/agent-rate-limiting-ops-order-dark.jpg and /dev/null differ
diff --git a/website/public/img/agent-rate-limiting-ops-order.jpg b/website/public/img/agent-rate-limiting-ops-order.jpg
deleted file mode 100644
index 2cf0daab26899..0000000000000
Binary files a/website/public/img/agent-rate-limiting-ops-order.jpg and /dev/null differ
diff --git a/website/public/img/consul-connect/consul-service-mesh-intentions-overview.svg b/website/public/img/consul-connect/consul-service-mesh-intentions-overview.svg
index 5422f6069b270..cdd7ea0ad6eb7 100644
--- a/website/public/img/consul-connect/consul-service-mesh-intentions-overview.svg
+++ b/website/public/img/consul-connect/consul-service-mesh-intentions-overview.svg
@@ -1 +1 @@
-<svg version="1.1" viewBox="0.0 0.0 960.0 540.0" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><clipPath id="g22371b66da5_0_4.0"><path d="m0 0l960.0 0l0 540.0l-960.0 0l0 -540.0z" clip-rule="nonzero"/></clipPath><g clip-path="url(#g22371b66da5_0_4.0)"><path fill="#ffffff" d="m0 0l960.0 0l0 540.0l-960.0 0z" fill-rule="evenodd"/><path fill="#ffffff" d="m561.6897 196.50427l0 0c0 -4.9547577 4.0166016 -8.9713745 8.9713745 -8.9713745l269.04938 0c2.3793335 0 4.661255 0.9451904 6.343689 2.627655c1.6824951 1.6824493 2.6276855 3.9643555 2.6276855 6.3437195l0 324.67145c0 4.954712 -4.0166626 8.9713745 -8.9713745 8.9713745l-269.04938 0l0 0c-4.954773 0 -8.9713745 -4.0166626 -8.9713745 -8.9713745z" fill-rule="evenodd"/><path stroke="#d6d6d6" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m561.6897 196.50427l0 0c0 -4.9547577 4.0166016 -8.9713745 8.9713745 -8.9713745l269.04938 0c2.3793335 0 4.661255 0.9451904 6.343689 2.627655c1.6824951 1.6824493 2.6276855 3.9643555 2.6276855 6.3437195l0 324.67145c0 4.954712 -4.0166626 8.9713745 -8.9713745 8.9713745l-269.04938 0l0 0c-4.954773 0 -8.9713745 -4.0166626 -8.9713745 -8.9713745z" fill-rule="evenodd"/><path fill="#ffffff" d="m116.41083 196.50427l0 0c0 -4.9547577 4.0166245 -8.9713745 8.9713745 -8.9713745l269.04938 0c2.379364 0 4.661255 0.9451904 6.3437195 2.627655c1.6824646 1.6824493 2.627655 3.9643555 2.627655 6.3437195l0 324.67145c0 4.954712 -4.016632 8.9713745 -8.9713745 8.9713745l-269.04938 0l0 0c-4.95475 0 -8.9713745 -4.0166626 -8.9713745 -8.9713745z" fill-rule="evenodd"/><path stroke="#d6d6d6" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m116.41083 196.50427l0 0c0 -4.9547577 4.0166245 -8.9713745 8.9713745 -8.9713745l269.04938 0c2.379364 0 4.661255 0.9451904 6.3437195 2.627655c1.6824646 1.6824493 2.627655 3.9643555 2.627655 6.3437195l0 324.67145c0 4.954712 -4.016632 8.9713745 -8.9713745 8.9713745l-269.04938 0l0 0c-4.95475 0 -8.9713745 -4.0166626 -8.9713745 -8.9713745z" fill-rule="evenodd"/><path fill="#e03875" d="m432.13947 51.027424l0 0c0 -22.740562 18.434845 -41.17543 41.175415 -41.17543l0 0c10.92041 0 21.393555 4.338113 29.115417 12.060004c7.7218933 7.7218914 12.059998 18.195024 12.059998 29.115427l0 0c0 22.740566 -18.434845 41.175434 -41.175415 41.175434l0 0c-22.74057 0 -41.175415 -18.434868 -41.175415 -41.175434z" fill-rule="evenodd"/><path fill="#ffffff" d="m473.4852 67.83086c-9.251129 0.0076828003 -16.756775 -7.509384 -16.764313 -16.789547c-0.0075683594 -9.280228 7.4858704 -16.809406 16.736969 -16.816986c4.208252 -0.0034217834 8.263641 1.5822105 11.359558 4.4416084l0 0l-3.9751587 4.171665l0 0c-4.5107117 -4.0889435 -11.471741 -3.735508 -15.547882 0.7893944c-4.0761414 4.524868 -3.7238464 11.50779 0.78689575 15.596733c4.191437 3.799511 10.56955 3.799511 14.760986 0l0 0l3.9751587 4.171665l0 0c-3.086853 2.85577 -7.133148 4.439457 -11.332214 4.435467z" fill-rule="evenodd"/><path fill="#ffffff" d="m486.96402 59.426167c-0.75827026 0 -1.3729553 -0.61660385 -1.3729553 -1.3772507c0 -0.76068115 0.61468506 -1.3772812 1.3729553 -1.3772812c0.7583313 0 1.3729553 0.61660004 1.3729553 1.3772812c-0.0018310547 0.7599449 -0.61553955 1.3755722 -1.3729553 1.3772507z" fill-rule="evenodd"/><path fill="#ffffff" d="m473.37817 54.66863c-2.0028687 0 -3.6265564 -1.6287727 -3.6265564 -3.6379547c0 -2.009182 1.6236877 -3.6379547 3.6265564 -3.6379547c2.0028992 0 3.6265259 1.6287727 3.6265259 3.6379547c-0.0016479492 2.0084763 -1.6243286 3.6362457 -3.6265259 3.6379547z" fill-rule="evenodd"/><path fill="#ffffff" d="m488.53574 54.720764c-0.7583313 0 -1.3729553 -0.61660385 -1.3729553 -1.3772507c0 -0.76067734 0.614624 -1.3772812 1.3729553 -1.3772812c0.7583313 0 1.3729553 0.61660385 1.3729553 1.3772812c-0.0018310547 0.7599449 -0.61550903 1.3755722 -1.3729553 1.3772507z" fill-rule="evenodd"/><path fill="#ffffff" d="m484.4566 54.56433c-0.75827026 0 -1.3729553 -0.61660385 -1.3729553 -1.3772507c0 -0.76067734 0.61468506 -1.3772812 1.3729553 -1.3772812c0.75827026 0 1.3729553 0.61660385 1.3729553 1.3772812c0 0.7606468 -0.61468506 1.3772507 -1.3729553 1.3772507z" fill-rule="evenodd"/><path fill="#ffffff" d="m488.53574 50.092033c-0.7583313 0 -1.3729553 -0.61660385 -1.3729553 -1.3772507c0 -0.76068115 0.614624 -1.3772812 1.3729553 -1.3772812c0.7583313 0 1.3729553 0.61660004 1.3729553 1.3772812c-0.0018310547 0.7599411 -0.61550903 1.3755722 -1.3729553 1.3772507z" fill-rule="evenodd"/><path fill="#ffffff" d="m484.4566 50.24849c-0.75827026 0 -1.3729553 -0.61663437 -1.3729553 -1.3772469c0 -0.76068115 0.6147156 -1.3772812 1.3729553 -1.3772812c0.75827026 0 1.3729553 0.61663437 1.3729553 1.3772812c0 0.0010070801 0 0.0020446777 0 0.0030517578c-0.0016784668 0.7594719 -0.61587524 1.3741951 -1.3729553 1.3741951z" fill-rule="evenodd"/><path fill="#ffffff" d="m487.0435 45.46026c-0.7582092 0.0017127991 -1.3743286 -0.6135483 -1.3760071 -1.3741951c-0.0016784668 -0.7606125 0.6116333 -1.3786583 1.3699036 -1.380333c0.7583313 -0.0016784668 1.374176 0.6135826 1.3760071 1.3741951c0 0.0010070801 0 0.00207901 0 0.00308609c0 0.75943756 -0.61276245 1.3755722 -1.3699036 1.3772469z" fill-rule="evenodd"/><path fill="#ffffff" d="m619.45374 226.63008l0 0c0 -0.87205505 0.7069092 -1.57901 1.5789795 -1.57901l53.682007 0c0.4187622 0 0.82037354 0.16636658 1.1165161 0.46247864c0.29614258 0.29612732 0.46246338 0.6977539 0.46246338 1.1165314l0 53.68199c0 0.8720398 -0.7069092 1.57901 -1.5789795 1.57901l-53.682007 0c-0.8720703 0 -1.5789795 -0.7069702 -1.5789795 -1.57901z" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m619.45374 226.63008l0 0c0 -0.87205505 0.7069092 -1.57901 1.5789795 -1.57901l53.682007 0c0.4187622 0 0.82037354 0.16636658 1.1165161 0.46247864c0.29614258 0.29612732 0.46246338 0.6977539 0.46246338 1.1165314l0 53.68199c0 0.8720398 -0.7069092 1.57901 -1.5789795 1.57901l-53.682007 0c-0.8720703 0 -1.5789795 -0.7069702 -1.5789795 -1.57901z" fill-rule="evenodd"/><path fill="#e03875" d="m661.7447 270.38776l0 0c0 -2.295227 1.8606567 -4.155884 4.155884 -4.155884l0 0c1.1022339 0 2.1593018 0.4378357 2.9387207 1.2172241c0.7793579 0.7793884 1.2172241 1.8364563 1.2172241 2.9386597l0 0c0 2.2952576 -1.8606567 4.1559143 -4.155945 4.1559143l0 0c-2.295227 0 -4.155884 -1.8606567 -4.155884 -4.1559143z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m659.03894 444.36276l111.62201 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="2.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m659.03894 444.36276l111.62201 0" fill-rule="evenodd"/><path fill="#ffffff" d="m270.33618 226.63008l0 0c0 -0.87205505 0.7069397 -1.57901 1.57901 -1.57901l53.681976 0c0.4187622 0 0.82040405 0.16636658 1.1165161 0.46247864c0.29614258 0.29612732 0.4624939 0.6977539 0.4624939 1.1165314l0 53.68199c0 0.8720398 -0.7069397 1.57901 -1.57901 1.57901l-53.681976 0c-0.8720703 0 -1.57901 -0.7069702 -1.57901 -1.57901z" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m270.33618 226.63008l0 0c0 -0.87205505 0.7069397 -1.57901 1.57901 -1.57901l53.681976 0c0.4187622 0 0.82040405 0.16636658 1.1165161 0.46247864c0.29614258 0.29612732 0.4624939 0.6977539 0.4624939 1.1165314l0 53.68199c0 0.8720398 -0.7069397 1.57901 -1.57901 1.57901l-53.681976 0c-0.8720703 0 -1.57901 -0.7069702 -1.57901 -1.57901z" fill-rule="evenodd"/><path fill="#e03875" d="m312.62714 270.38776l0 0c0 -2.295227 1.8606873 -4.155884 4.1559143 -4.155884l0 0c1.1022339 0 2.1593018 0.4378357 2.9386902 1.2172241c0.7793579 0.7793884 1.2172241 1.8364563 1.2172241 2.9386597l0 0c0 2.2952576 -1.8606567 4.1559143 -4.1559143 4.1559143l0 0c-2.295227 0 -4.1559143 -1.8606567 -4.1559143 -4.1559143z" fill-rule="evenodd"/><path fill="#ffffff" d="m603.215 402.8029l0 0c0 -1.5410156 1.2492065 -2.7902527 2.7902222 -2.7902527l83.67932 0c0.74005127 0 1.4497681 0.29397583 1.9730225 0.8172302c0.5233154 0.5232849 0.81726074 1.2330017 0.81726074 1.9730225l0 83.67932c0 1.5410156 -1.2492676 2.7902527 -2.7902832 2.7902527l-83.67932 0l0 0c-1.5410156 0 -2.7902222 -1.2492371 -2.7902222 -2.7902527z" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m603.215 402.8029l0 0c0 -1.5410156 1.2492065 -2.7902527 2.7902222 -2.7902527l83.67932 0c0.74005127 0 1.4497681 0.29397583 1.9730225 0.8172302c0.5233154 0.5232849 0.81726074 1.2330017 0.81726074 1.9730225l0 83.67932c0 1.5410156 -1.2492676 2.7902527 -2.7902832 2.7902527l-83.67932 0l0 0c-1.5410156 0 -2.7902222 -1.2492371 -2.7902222 -2.7902527z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m189.74904 443.592l111.622055 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="2.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m189.74904 443.592l111.622055 0" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m514.45306 50.922737l134.69531 0l0 174.10956" fill-rule="evenodd"/><path stroke="#dc477d" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="4.0,3.0" d="m514.45306 50.922737l134.69531 0l0 174.10956" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m432.104 50.922737l-129.40057 0l0 174.10956" fill-rule="evenodd"/><path stroke="#dc477d" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="4.0,3.0" d="m432.104 50.922737l-129.40057 0l0 174.10956" fill-rule="evenodd"/><path fill="#ffffff" d="m262.94217 105.13187l0 0c0 -0.5111389 0.41436768 -0.92549133 0.9254761 -0.92549133l69.64508 0c0.24545288 0 0.48086548 0.09750366 0.65441895 0.27106476c0.17358398 0.17356873 0.27108765 0.40896606 0.27108765 0.6544266l0 27.75531c0 0.5111389 -0.41436768 0.92549133 -0.9255066 0.92549133l-69.64508 0l0 0c-0.5111084 0 -0.9254761 -0.41435242 -0.9254761 -0.92549133z" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m262.94217 105.13187l0 0c0 -0.5111389 0.41436768 -0.92549133 0.9254761 -0.92549133l69.64508 0c0.24545288 0 0.48086548 0.09750366 0.65441895 0.27106476c0.17358398 0.17356873 0.27108765 0.40896606 0.27108765 0.6544266l0 27.75531c0 0.5111389 -0.41436768 0.92549133 -0.9255066 0.92549133l-69.64508 0l0 0c-0.5111084 0 -0.9254761 -0.41435242 -0.9254761 -0.92549133z" fill-rule="evenodd"/><path fill="#ffffff" d="m254.09747 402.8029l0 0c0 -1.5410156 1.2492371 -2.7902527 2.7902527 -2.7902527l83.67932 0c0.74002075 0 1.4497375 0.29397583 1.9730225 0.8172302c0.5232544 0.5232849 0.8172302 1.2330017 0.8172302 1.9730225l0 83.67932c0 1.5410156 -1.2492371 2.7902527 -2.7902527 2.7902527l-83.67932 0l0 0c-1.5410156 0 -2.7902527 -1.2492371 -2.7902527 -2.7902527z" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m254.09747 402.8029l0 0c0 -1.5410156 1.2492371 -2.7902527 2.7902527 -2.7902527l83.67932 0c0.74002075 0 1.4497375 0.29397583 1.9730225 0.8172302c0.5232544 0.5232849 0.8172302 1.2330017 0.8172302 1.9730225l0 83.67932c0 1.5410156 -1.2492371 2.7902527 -2.7902527 2.7902527l-83.67932 0l0 0c-1.5410156 0 -2.7902527 -1.2492371 -2.7902527 -2.7902527z" fill-rule="evenodd"/><path fill="#e03875" d="m467.49796 443.853l0 0c0 -14.811676 12.007202 -26.818909 26.818878 -26.818909l0.03149414 0l0 0c7.1128235 0 13.934326 2.8255615 18.963806 7.855072c5.029541 5.029541 7.8551025 11.851013 7.8551025 18.963837l0 0l0 0c0 14.811676 -12.007233 26.818909 -26.818909 26.818909l-0.03149414 0l0 0c-14.811676 0 -26.818878 -12.007233 -26.818878 -26.818909z" fill-rule="evenodd"/><path stroke="#ffffff" stroke-width="3.0" stroke-miterlimit="400.0" stroke-linecap="butt" stroke-opacity="0.4784" d="m467.49796 443.853l0 0c0 -14.811676 12.007202 -26.818909 26.818878 -26.818909l0.03149414 0l0 0c7.1128235 0 13.934326 2.8255615 18.963806 7.855072c5.029541 5.029541 7.8551025 11.851013 7.8551025 18.963837l0 0l0 0c0 14.811676 -12.007233 26.818909 -26.818909 26.818909l-0.03149414 0l0 0c-14.811676 0 -26.818878 -12.007233 -26.818878 -26.818909z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m417.1976 92.18537l112.1575 0l0 54.92913l-112.1575 0z" fill-rule="evenodd"/><path fill="#dc477d" d="m447.88504 104.54662q1.78125 0 3.03125 1.015625q1.265625 1.0 1.484375 2.75l-2.234375 0q-0.140625 -0.8125 -0.8125 -1.3125q-0.671875 -0.515625 -1.46875 -0.515625q-1.359375 0 -2.109375 0.984375q-0.734375 0.984375 -0.734375 2.609375q0 1.546875 0.734375 2.53125q0.75 0.96875 2.109375 0.96875q1.0 0 1.609375 -0.609375q0.609375 -0.609375 0.765625 -1.734375l2.234375 0q-0.203125 2.0 -1.453125 3.140625q-1.25 1.140625 -3.15625 1.140625q-1.515625 0 -2.6875 -0.6875q-1.171875 -0.6875 -1.8125 -1.953125q-0.640625 -1.265625 -0.640625 -2.796875q0 -2.40625 1.40625 -3.96875q1.40625 -1.5625 3.734375 -1.5625zm10.863373 0q2.328125 0 3.734375 1.578125q1.40625 1.5625 1.40625 3.953125q0 2.34375 -1.421875 3.890625q-1.40625 1.546875 -3.71875 1.546875q-1.515625 0 -2.6875 -0.6875q-1.171875 -0.703125 -1.8125 -1.953125q-0.640625 -1.265625 -0.640625 -2.796875q0 -2.421875 1.40625 -3.96875q1.421875 -1.5625 3.734375 -1.5625zm-2.84375 5.53125q0 1.546875 0.734375 2.53125q0.75 0.96875 2.109375 0.96875q1.359375 0 2.09375 -0.953125q0.75 -0.96875 0.75 -2.546875q0 -1.65625 -0.765625 -2.625q-0.75 -0.96875 -2.09375 -0.96875q-1.34375 0 -2.09375 0.984375q-0.734375 0.984375 -0.734375 2.609375zm11.837585 -5.28125l4.375 7.03125l0.015625 0l0 -7.03125l2.15625 0l0 10.46875l-2.296875 0l-4.359375 -7.0l-0.03125 0l0 7.0l-2.140625 0l0 -10.46875l2.28125 0zm12.175873 -0.25q1.90625 0 3.046875 0.890625q1.140625 0.875 1.140625 2.484375l-2.21875 0q-0.046875 -0.78125 -0.546875 -1.171875q-0.484375 -0.40625 -1.515625 -0.40625q-0.6875 0 -1.140625 0.3125q-0.453125 0.296875 -0.453125 0.875q0 0.390625 0.1875 0.59375q0.1875 0.1875 0.765625 0.40625q0.578125 0.203125 2.515625 0.65625q1.296875 0.3125 2.03125 1.0625q0.734375 0.75 0.734375 1.90625q0 1.515625 -1.140625 2.4375q-1.140625 0.921875 -3.203125 0.921875q-1.984375 0 -3.234375 -0.96875q-1.234375 -0.984375 -1.234375 -2.6875l0 -0.0625l2.21875 0q0.015625 0.96875 0.65625 1.453125q0.640625 0.484375 1.671875 0.484375q0.921875 0 1.46875 -0.34375q0.5625 -0.34375 0.5625 -0.96875q0 -0.5 -0.421875 -0.828125q-0.421875 -0.328125 -1.359375 -0.5625q-1.203125 -0.28125 -2.1875 -0.578125q-0.984375 -0.296875 -1.625 -0.984375q-0.640625 -0.6875 -0.640625 -1.75q0 -1.40625 1.125 -2.28125q1.140625 -0.890625 2.796875 -0.890625zm8.167053 0.25l0 6.578125q0 1.125 0.515625 1.671875q0.53125 0.53125 1.640625 0.53125q1.203125 0 1.6875 -0.515625q0.484375 -0.53125 0.484375 -1.6875l0 -6.578125l2.296875 0l0 6.578125q0 1.953125 -1.140625 3.046875q-1.125 1.09375 -3.328125 1.09375q-2.203125 0 -3.328125 -1.078125q-1.125 -1.078125 -1.125 -3.0625l0 -6.578125l2.296875 0zm10.910248 0l0 8.53125l5.109375 0l0 1.9375l-7.40625 0l0 -10.46875l2.296875 0z" fill-rule="nonzero"/><path fill="#dc477d" d="m448.43365 122.14662q1.90625 0 3.046875 0.890625q1.140625 0.875 1.140625 2.484375l-2.21875 0q-0.046875 -0.78125 -0.546875 -1.171875q-0.484375 -0.40625 -1.515625 -0.40625q-0.6875 0 -1.140625 0.3125q-0.453125 0.296875 -0.453125 0.875q0 0.390625 0.1875 0.59375q0.1875 0.1875 0.765625 0.40625q0.578125 0.203125 2.515625 0.65625q1.296875 0.3125 2.03125 1.0625q0.734375 0.75 0.734375 1.90625q0 1.515625 -1.140625 2.4375q-1.140625 0.921875 -3.203125 0.921875q-1.984375 0 -3.234375 -0.96875q-1.234375 -0.984375 -1.234375 -2.6875l0 -0.0625l2.21875 0q0.015625 0.96875 0.65625 1.453125q0.640625 0.484375 1.671875 0.484375q0.921875 0 1.46875 -0.34375q0.5625 -0.34375 0.5625 -0.96875q0 -0.5 -0.421875 -0.828125q-0.421875 -0.328125 -1.359375 -0.5625q-1.203125 -0.28125 -2.1875 -0.578125q-0.984375 -0.296875 -1.625 -0.984375q-0.640625 -0.6875 -0.640625 -1.75q0 -1.40625 1.125 -2.28125q1.140625 -0.890625 2.796875 -0.890625zm13.745209 0.25l0 1.9375l-5.53125 0l0 2.234375l5.0625 0l0 1.796875l-5.0625 0l0 2.5625l5.640625 0l0 1.9375l-7.9375 0l0 -10.46875l7.828125 0zm7.3714905 0q1.265625 0 2.125 0.828125q0.875 0.8125 0.875 2.0625q0 1.0 -0.421875 1.65625q-0.40625 0.640625 -1.234375 0.96875l0 0.03125q0.734375 0.1875 1.125 0.875q0.390625 0.6875 0.4375 2.109375q0.015625 1.421875 0.40625 1.9375l-2.3125 0q-0.203125 -0.515625 -0.265625 -1.640625q-0.109375 -1.546875 -0.53125 -2.0q-0.40625 -0.453125 -1.25 -0.453125l-2.359375 0l0 4.09375l-2.296875 0l0 -10.46875l5.703125 0zm-0.84375 4.734375q0.734375 0 1.125 -0.34375q0.40625 -0.359375 0.40625 -1.15625q0 -0.734375 -0.390625 -1.078125q-0.375 -0.359375 -1.140625 -0.359375l-2.5625 0l0 2.9375l2.5625 0zm6.9592896 -4.734375l2.34375 7.359375l0.015625 0l2.375 -7.359375l2.375 0l-3.484375 10.46875l-2.59375 0l-3.390625 -10.46875l2.359375 0zm15.82547 0l0 1.9375l-5.53125 0l0 2.234375l5.0625 0l0 1.796875l-5.0625 0l0 2.5625l5.640625 0l0 1.9375l-7.9375 0l0 -10.46875l7.828125 0zm7.3714905 0q1.265625 0 2.125 0.828125q0.875 0.8125 0.875 2.0625q0 1.0 -0.421875 1.65625q-0.40625 0.640625 -1.234375 0.96875l0 0.03125q0.734375 0.1875 1.125 0.875q0.390625 0.6875 0.4375 2.109375q0.015625 1.421875 0.40625 1.9375l-2.3125 0q-0.203125 -0.515625 -0.265625 -1.640625q-0.109375 -1.546875 -0.53125 -2.0q-0.40625 -0.453125 -1.25 -0.453125l-2.359375 0l0 4.09375l-2.296875 0l0 -10.46875l5.703125 0zm-0.84375 4.734375q0.734375 0 1.125 -0.34375q0.40625 -0.359375 0.40625 -1.15625q0 -0.734375 -0.390625 -1.078125q-0.375 -0.359375 -1.140625 -0.359375l-2.5625 0l0 2.9375l2.5625 0z" fill-rule="nonzero"/><path fill="#ffffff" d="m612.1122 105.13187l0 0c0 -0.5111389 0.41436768 -0.92549133 0.9254761 -0.92549133l69.64508 0c0.2454834 0 0.480896 0.09750366 0.65441895 0.27106476c0.17358398 0.17356873 0.27105713 0.40896606 0.27105713 0.6544266l0 27.75531c0 0.5111389 -0.41430664 0.92549133 -0.9254761 0.92549133l-69.64508 0l0 0c-0.5111084 0 -0.9254761 -0.41435242 -0.9254761 -0.92549133z" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m612.1122 105.13187l0 0c0 -0.5111389 0.41436768 -0.92549133 0.9254761 -0.92549133l69.64508 0c0.2454834 0 0.480896 0.09750366 0.65441895 0.27106476c0.17358398 0.17356873 0.27105713 0.40896606 0.27105713 0.6544266l0 27.75531c0 0.5111389 -0.41430664 0.92549133 -0.9254761 0.92549133l-69.64508 0l0 0c-0.5111084 0 -0.9254761 -0.41435242 -0.9254761 -0.92549133z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m666.8694 101.53694l155.40155 0l0 37.16536l-155.40155 0z" fill-rule="evenodd"/><path fill="#4e515d" d="m703.1088 114.14819l0 10.46875l-2.296875 0l0 -10.46875l2.296875 0zm4.3068237 0l4.375 7.03125l0.015625 0l0 -7.03125l2.15625 0l0 10.46875l-2.296875 0l-4.359375 -7.0l-0.03125 0l0 7.0l-2.140625 0l0 -10.46875l2.28125 0zm16.332092 0l0 1.9375l-3.140625 0l0 8.53125l-2.296875 0l0 -8.53125l-3.140625 0l0 -1.9375l8.578125 0zm9.030762 0l0 1.9375l-5.53125 0l0 2.234375l5.0625 0l0 1.796875l-5.0625 0l0 2.5625l5.640625 0l0 1.9375l-7.9375 0l0 -10.46875l7.828125 0zm3.949646 0l4.375 7.03125l0.015625 0l0 -7.03125l2.15625 0l0 10.46875l-2.296875 0l-4.359375 -7.0l-0.03125 0l0 7.0l-2.140625 0l0 -10.46875l2.28125 0zm16.332092 0l0 1.9375l-3.140625 0l0 8.53125l-2.296875 0l0 -8.53125l-3.140625 0l0 -1.9375l8.578125 0zm3.4995117 0l0 10.46875l-2.296875 0l0 -10.46875l2.296875 0zm6.7130737 -0.25q2.328125 0 3.734375 1.578125q1.40625 1.5625 1.40625 3.953125q0 2.34375 -1.421875 3.890625q-1.40625 1.546875 -3.71875 1.546875q-1.515625 0 -2.6875 -0.6875q-1.171875 -0.703125 -1.8125 -1.953125q-0.640625 -1.265625 -0.640625 -2.796875q0 -2.421875 1.40625 -3.96875q1.421875 -1.5625 3.734375 -1.5625zm-2.84375 5.53125q0 1.546875 0.734375 2.53125q0.75 0.96875 2.109375 0.96875q1.359375 0 2.09375 -0.953125q0.75 -0.96875 0.75 -2.546875q0 -1.65625 -0.765625 -2.625q-0.75 -0.96875 -2.09375 -0.96875q-1.34375 0 -2.09375 0.984375q-0.734375 0.984375 -0.734375 2.609375zm11.837585 -5.28125l4.375 7.03125l0.015625 0l0 -7.03125l2.15625 0l0 10.46875l-2.296875 0l-4.359375 -7.0l-0.03125 0l0 7.0l-2.140625 0l0 -10.46875l2.28125 0zm12.175903 -0.25q1.90625 0 3.046875 0.890625q1.140625 0.875 1.140625 2.484375l-2.21875 0q-0.046875 -0.78125 -0.546875 -1.171875q-0.484375 -0.40625 -1.515625 -0.40625q-0.6875 0 -1.140625 0.3125q-0.453125 0.296875 -0.453125 0.875q0 0.390625 0.1875 0.59375q0.1875 0.1875 0.765625 0.40625q0.578125 0.203125 2.515625 0.65625q1.296875 0.3125 2.03125 1.0625q0.734375 0.75 0.734375 1.90625q0 1.515625 -1.140625 2.4375q-1.140625 0.921875 -3.203125 0.921875q-1.984375 0 -3.234375 -0.96875q-1.234375 -0.984375 -1.234375 -2.6875l0 -0.0625l2.21875 0q0.015625 0.96875 0.65625 1.453125q0.640625 0.484375 1.671875 0.484375q0.921875 0 1.46875 -0.34375q0.5625 -0.34375 0.5625 -0.96875q0 -0.5 -0.421875 -0.828125q-0.421875 -0.328125 -1.359375 -0.5625q-1.203125 -0.28125 -2.1875 -0.578125q-0.984375 -0.296875 -1.625 -0.984375q-0.640625 -0.6875 -0.640625 -1.75q0 -1.40625 1.125 -2.28125q1.140625 -0.890625 2.796875 -0.890625z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m127.416336 101.53694l155.40157 0l0 37.16536l-155.40157 0z" fill-rule="evenodd"/><path fill="#4e515d" d="m163.65578 114.14819l0 10.46875l-2.296875 0l0 -10.46875l2.296875 0zm4.3068237 0l4.375 7.03125l0.015625 0l0 -7.03125l2.15625 0l0 10.46875l-2.296875 0l-4.359375 -7.0l-0.03125 0l0 7.0l-2.140625 0l0 -10.46875l2.28125 0zm16.332123 0l0 1.9375l-3.140625 0l0 8.53125l-2.296875 0l0 -8.53125l-3.140625 0l0 -1.9375l8.578125 0zm9.030746 0l0 1.9375l-5.53125 0l0 2.234375l5.0625 0l0 1.796875l-5.0625 0l0 2.5625l5.640625 0l0 1.9375l-7.9375 0l0 -10.46875l7.828125 0zm3.9496307 0l4.375 7.03125l0.015625 0l0 -7.03125l2.15625 0l0 10.46875l-2.296875 0l-4.359375 -7.0l-0.03125 0l0 7.0l-2.140625 0l0 -10.46875l2.28125 0zm16.332123 0l0 1.9375l-3.140625 0l0 8.53125l-2.296875 0l0 -8.53125l-3.140625 0l0 -1.9375l8.578125 0zm3.4994965 0l0 10.46875l-2.296875 0l0 -10.46875l2.296875 0zm6.7130737 -0.25q2.328125 0 3.734375 1.578125q1.40625 1.5625 1.40625 3.953125q0 2.34375 -1.421875 3.890625q-1.40625 1.546875 -3.71875 1.546875q-1.515625 0 -2.6875 -0.6875q-1.171875 -0.703125 -1.8125 -1.953125q-0.640625 -1.265625 -0.640625 -2.796875q0 -2.421875 1.40625 -3.96875q1.421875 -1.5625 3.734375 -1.5625zm-2.84375 5.53125q0 1.546875 0.734375 2.53125q0.75 0.96875 2.109375 0.96875q1.359375 0 2.09375 -0.953125q0.75 -0.96875 0.75 -2.546875q0 -1.65625 -0.765625 -2.625q-0.75 -0.96875 -2.09375 -0.96875q-1.34375 0 -2.09375 0.984375q-0.734375 0.984375 -0.734375 2.609375zm11.837601 -5.28125l4.375 7.03125l0.015625 0l0 -7.03125l2.15625 0l0 10.46875l-2.296875 0l-4.359375 -7.0l-0.03125 0l0 7.0l-2.140625 0l0 -10.46875l2.28125 0zm12.175873 -0.25q1.90625 0 3.046875 0.890625q1.140625 0.875 1.140625 2.484375l-2.21875 0q-0.046875 -0.78125 -0.546875 -1.171875q-0.484375 -0.40625 -1.515625 -0.40625q-0.6875 0 -1.140625 0.3125q-0.453125 0.296875 -0.453125 0.875q0 0.390625 0.1875 0.59375q0.1875 0.1875 0.765625 0.40625q0.578125 0.203125 2.515625 0.65625q1.296875 0.3125 2.03125 1.0625q0.734375 0.75 0.734375 1.90625q0 1.515625 -1.140625 2.4375q-1.140625 0.921875 -3.203125 0.921875q-1.984375 0 -3.234375 -0.96875q-1.234375 -0.984375 -1.234375 -2.6875l0 -0.0625l2.21875 0q0.015625 0.96875 0.65625 1.453125q0.640625 0.484375 1.671875 0.484375q0.921875 0 1.46875 -0.34375q0.5625 -0.34375 0.5625 -0.96875q0 -0.5 -0.421875 -0.828125q-0.421875 -0.328125 -1.359375 -0.5625q-1.203125 -0.28125 -2.1875 -0.578125q-0.984375 -0.296875 -1.625 -0.984375q-0.640625 -0.6875 -0.640625 -1.75q0 -1.40625 1.125 -2.28125q1.140625 -0.890625 2.796875 -0.890625z" fill-rule="nonzero"/><path fill="#e03875" d="m280.54016 129.08702c-0.460083 0 -0.84906006 -0.37654114 -0.84906006 -0.8500061c0 -0.47346497 0.37643433 -0.8500061 0.84906006 -0.8500061l28.417114 0c0.46011353 0 0.8490906 0.37654114 0.8490906 0.8500061c0 0.47346497 -0.37643433 0.8500061 -0.8490906 0.8500061l-28.417114 0zm0 -9.215828c-0.460083 0 -0.84906006 -0.3765335 -0.84906006 -0.8499985c0 -0.4734726 0.37643433 -0.8500061 0.84906006 -0.8500061l28.417114 0c0.46011353 0 0.8490906 0.3765335 0.8490906 0.8500061c0 0.47346497 -0.37643433 0.8499985 -0.8490906 0.8499985l-28.417114 0zm0 -9.21582c-0.460083 0 -0.84906006 -0.37654114 -0.84906006 -0.8500061c0 -0.47346497 0.37643433 -0.8499985 0.84906006 -0.8499985l28.417114 0c0.46011353 0 0.8490906 0.3765335 0.8490906 0.8499985c0 0.47346497 -0.37643433 0.8500061 -0.8490906 0.8500061l-28.417114 0z" fill-rule="evenodd"/><path fill="#e03875" d="m624.88617 129.08702c-0.46014404 0 -0.8491211 -0.37654114 -0.8491211 -0.8500061c0 -0.47346497 0.37646484 -0.8500061 0.8491211 -0.8500061l28.417053 0c0.46014404 0 0.8491211 0.37654114 0.8491211 0.8500061c0 0.47346497 -0.37646484 0.8500061 -0.8491211 0.8500061l-28.417053 0zm0 -9.215828c-0.46014404 0 -0.8491211 -0.3765335 -0.8491211 -0.8499985c0 -0.4734726 0.37646484 -0.8500061 0.8491211 -0.8500061l28.417053 0c0.46014404 0 0.8491211 0.3765335 0.8491211 0.8500061c0 0.47346497 -0.37646484 0.8499985 -0.8491211 0.8499985l-28.417053 0zm0 -9.21582c-0.46014404 0 -0.8491211 -0.37654114 -0.8491211 -0.8500061c0 -0.47346497 0.37646484 -0.8499985 0.8491211 -0.8499985l28.417053 0c0.46014404 0 0.8491211 0.3765335 0.8491211 0.8499985c0 0.47346497 -0.37646484 0.8500061 -0.8491211 0.8500061l-28.417053 0z" fill-rule="evenodd"/><path fill="#dc477d" d="m659.0366 112.972206l0 0c0 -0.7705078 0.6246338 -1.3951263 1.3951416 -1.3951263l30.690063 0c0.36999512 0 0.7248535 0.14698792 0.9864502 0.40862274c0.2616577 0.26163483 0.40863037 0.6164932 0.40863037 0.9865036l0 30.690056c0 0.7705078 -0.62457275 1.3951263 -1.3950806 1.3951263l-30.690063 0c-0.7705078 0 -1.3951416 -0.62461853 -1.3951416 -1.3951263z" fill-rule="evenodd"/><path fill="#dc477d" d="m315.2149 112.972206l0 0c0 -0.7705078 0.6246338 -1.3951263 1.3951416 -1.3951263l30.690063 0c0.36999512 0 0.7248535 0.14698792 0.9864807 0.40862274c0.2616577 0.26163483 0.40863037 0.6164932 0.40863037 0.9865036l0 30.690056c0 0.7705078 -0.6246033 1.3951263 -1.3951111 1.3951263l-30.690063 0c-0.7705078 0 -1.3951416 -0.62461853 -1.3951416 -1.3951263z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m228.82674 276.68085l139.84251 0l0 35.55905l-139.84251 0z" fill-rule="evenodd"/><path fill="#dc477d" d="m249.62402 288.73087q1.625 0 2.765625 0.921875q1.140625 0.921875 1.328125 2.515625l-2.015625 0q-0.140625 -0.75 -0.75 -1.203125q-0.59375 -0.46875 -1.328125 -0.46875q-1.234375 0 -1.921875 0.890625q-0.671875 0.890625 -0.671875 2.375q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q0.90625 0 1.453125 -0.5625q0.5625 -0.5625 0.703125 -1.5625l2.03125 0q-0.1875 1.8125 -1.328125 2.859375q-1.125 1.03125 -2.859375 1.03125q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.1875 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm9.878967 0q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0625153 -0.640625 -1.6562653 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.2812653 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm10.773285 -4.796875l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm11.082092 -0.234375q1.71875 0 2.75 0.8125q1.046875 0.796875 1.046875 2.265625l-2.015625 0q-0.046875 -0.71875 -0.5 -1.078125q-0.4375 -0.359375 -1.375 -0.359375q-0.640625 0 -1.046875 0.28125q-0.40625 0.265625 -0.40625 0.796875q0 0.359375 0.171875 0.53125q0.171875 0.171875 0.6875 0.375q0.53125 0.1875 2.296875 0.59375q1.1875 0.296875 1.84375 0.984375q0.671875 0.671875 0.671875 1.71875q0 1.390625 -1.046875 2.234375q-1.03125 0.828125 -2.90625 0.828125q-1.796875 0 -2.9375 -0.890625q-1.125 -0.890625 -1.125 -2.453125l0 -0.046875l2.03125 0q0 0.890625 0.578125 1.328125q0.578125 0.421875 1.515625 0.421875q0.859375 0 1.359375 -0.296875q0.5 -0.3125 0.5 -0.875q0 -0.46875 -0.390625 -0.765625q-0.375 -0.296875 -1.234375 -0.515625q-1.09375 -0.234375 -1.984375 -0.515625q-0.890625 -0.28125 -1.484375 -0.890625q-0.578125 -0.625 -0.578125 -1.59375q0 -1.28125 1.03125 -2.078125q1.03125 -0.8125 2.546875 -0.8125zm7.4145813 0.234375l0 5.96875q0 1.03125 0.46875 1.53125q0.484375 0.484375 1.5 0.484375q1.09375 0 1.53125 -0.484375q0.4375 -0.484375 0.4375 -1.515625l0 -5.984375l2.09375 0l0 5.984375q0 1.765625 -1.03125 2.765625q-1.03125 1.0 -3.03125 1.0q-2.015625 0 -3.046875 -0.984375q-1.015625 -0.984375 -1.015625 -2.78125l0 -5.984375l2.09375 0zm9.925842 0l0 7.765625l4.640625 0l0 1.75l-6.734375 0l0 -9.515625l2.09375 0zm13.775421 -0.234375q1.625 0 2.765625 0.921875q1.140625 0.921875 1.328125 2.515625l-2.015625 0q-0.140625 -0.75 -0.75 -1.203125q-0.59375 -0.46875 -1.328125 -0.46875q-1.234375 0 -1.921875 0.890625q-0.671875 0.890625 -0.671875 2.375q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q0.90625 0 1.453125 -0.5625q0.5625 -0.5625 0.703125 -1.5625l2.03125 0q-0.1875 1.8125 -1.328125 2.859375q-1.125 1.03125 -2.859375 1.03125q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.1875 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm7.707062 0.234375l0 7.765625l4.640625 0l0 1.75l-6.734375 0l0 -9.515625l2.09375 0zm7.9005737 0l0 9.515625l-2.09375 0l0 -9.515625l2.09375 0zm8.946381 0l0 1.765625l-5.015625 0l0 2.03125l4.609375 0l0 1.625l-4.609375 0l0 2.34375l5.125 0l0 1.75l-7.21875 0l0 -9.515625l7.109375 0zm3.6047058 0l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm14.847687 0l0 1.765625l-2.859375 0l0 7.75l-2.078125 0l0 -7.75l-2.859375 0l0 -1.765625l7.796875 0z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m580.48737 278.31738l134.70868 0l0 35.55905l-134.70868 0z" fill-rule="evenodd"/><path fill="#dc477d" d="m598.7177 290.36737q1.625 0 2.765625 0.921875q1.140625 0.921875 1.328125 2.515625l-2.015625 0q-0.140625 -0.75 -0.75 -1.203125q-0.59375 -0.46875 -1.328125 -0.46875q-1.234375 0 -1.921875 0.890625q-0.671875 0.890625 -0.671875 2.375q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q0.90625 0 1.453125 -0.5625q0.5625 -0.5625 0.703125 -1.5625l2.03125 0q-0.1875 1.8125 -1.328125 2.859375q-1.125 1.03125 -2.859375 1.03125q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.1875 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm9.878967 0q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm10.773315 -4.796875l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm11.082092 -0.234375q1.71875 0 2.75 0.8125q1.046875 0.796875 1.046875 2.265625l-2.015625 0q-0.046875 -0.71875 -0.5 -1.078125q-0.4375 -0.359375 -1.375 -0.359375q-0.640625 0 -1.046875 0.28125q-0.40625 0.265625 -0.40625 0.796875q0 0.359375 0.171875 0.53125q0.171875 0.171875 0.6875 0.375q0.53125 0.1875 2.296875 0.59375q1.1875 0.296875 1.84375 0.984375q0.671875 0.671875 0.671875 1.71875q0 1.390625 -1.046875 2.234375q-1.03125 0.828125 -2.90625 0.828125q-1.796875 0 -2.9375 -0.890625q-1.125 -0.890625 -1.125 -2.453125l0 -0.046875l2.03125 0q0 0.890625 0.578125 1.328125q0.578125 0.421875 1.515625 0.421875q0.859375 0 1.359375 -0.296875q0.5 -0.3125 0.5 -0.875q0 -0.46875 -0.390625 -0.765625q-0.375 -0.296875 -1.234375 -0.515625q-1.09375 -0.234375 -1.984375 -0.515625q-0.890625 -0.28125 -1.484375 -0.890625q-0.578125 -0.625 -0.578125 -1.59375q0 -1.28125 1.03125 -2.078125q1.03125 -0.8125 2.546875 -0.8125zm7.414551 0.234375l0 5.96875q0 1.03125 0.46875 1.53125q0.484375 0.484375 1.5 0.484375q1.09375 0 1.53125 -0.484375q0.4375 -0.484375 0.4375 -1.515625l0 -5.984375l2.09375 0l0 5.984375q0 1.765625 -1.03125 2.765625q-1.03125 1.0 -3.03125 1.0q-2.015625 0 -3.046875 -0.984375q-1.015625 -0.984375 -1.015625 -2.78125l0 -5.984375l2.09375 0zm9.925842 0l0 7.765625l4.640625 0l0 1.75l-6.734375 0l0 -9.515625l2.09375 0zm13.775452 -0.234375q1.625 0 2.765625 0.921875q1.140625 0.921875 1.328125 2.515625l-2.015625 0q-0.140625 -0.75 -0.75 -1.203125q-0.59375 -0.46875 -1.328125 -0.46875q-1.234375 0 -1.921875 0.890625q-0.671875 0.890625 -0.671875 2.375q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q0.90625 0 1.453125 -0.5625q0.5625 -0.5625 0.703125 -1.5625l2.03125 0q-0.1875 1.8125 -1.328125 2.859375q-1.125 1.03125 -2.859375 1.03125q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.1875 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm7.7070312 0.234375l0 7.765625l4.640625 0l0 1.75l-6.734375 0l0 -9.515625l2.09375 0zm7.9005737 0l0 9.515625l-2.09375 0l0 -9.515625l2.09375 0zm8.946411 0l0 1.765625l-5.015625 0l0 2.03125l4.609375 0l0 1.625l-4.609375 0l0 2.34375l5.125 0l0 1.75l-7.21875 0l0 -9.515625l7.109375 0zm3.6046753 0l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm14.847717 0l0 1.765625l-2.859375 0l0 7.75l-2.078125 0l0 -7.75l-2.859375 0l0 -1.765625l7.796875 0z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m343.3573 444.64255l259.84253 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="2.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m350.9373 444.64255l244.68253 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="2.0" stroke-linecap="butt" d="m344.3573 444.64255c0 -1.8170166 1.472992 -3.2900085 3.2900085 -3.2900085c1.8170166 0 3.2900085 1.472992 3.2900085 3.2900085c0 1.8170166 -1.472992 3.2900085 -3.2900085 3.2900085c-1.8170166 0 -3.2900085 -1.472992 -3.2900085 -3.2900085z" fill-rule="nonzero"/><path stroke="#e03875" stroke-width="2.0" stroke-linecap="butt" d="m602.1998 444.64255c0 1.8170166 -1.4729614 3.2900085 -3.289978 3.2900085c-1.8170166 0 -3.289978 -1.472992 -3.289978 -3.2900085c0 -1.8170166 1.4729614 -3.2900085 3.289978 -3.2900085c1.8170166 0 3.289978 1.472992 3.289978 3.2900085z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m298.748 312.2399l0 73.7323" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m298.748 312.2399l0 67.7323" fill-rule="evenodd"/><path fill="#e03875" stroke="#e03875" stroke-width="1.0" stroke-linecap="butt" d="m297.09625 379.9722l1.6517334 4.538086l1.6517334 -4.538086z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m647.84174 313.87643l0.03149414 72.12598" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m647.8417 313.87643l0.028869629 66.12598" fill-rule="evenodd"/><path fill="#e03875" stroke="#e03875" stroke-width="1.0" stroke-linecap="butt" d="m646.2189 380.00314l1.6536865 4.537384l1.6497192 -4.5388184z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m672.51337 432.07346l-49.35431 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m672.51337 432.07346l-43.35431 0" fill-rule="evenodd"/><path fill="#e03875" stroke="#e03875" stroke-width="1.0" stroke-linecap="butt" d="m629.15906 430.42172l-4.538147 1.6517334l4.538147 1.6517334z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m623.1696 457.24615l49.35437 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m623.1696 457.24615l43.35431 0" fill-rule="evenodd"/><path fill="#e03875" stroke="#e03875" stroke-width="1.0" stroke-linecap="butt" d="m666.5239 458.8979l4.538147 -1.6517334l-4.538147 -1.6517334z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m238.66493 486.155l112.157486 0l0 35.55905l-112.157486 0z" fill-rule="evenodd"/><path fill="#dc477d" d="m276.83417 498.43936q1.484375 0 2.34375 0.84375q0.875 0.828125 0.875 2.203125q0 1.375 -0.875 2.21875q-0.859375 0.84375 -2.34375 0.84375l-2.265625 0l0 3.40625l-2.09375 0l0 -9.515625l4.359375 0zm-0.578125 4.484375q0.890625 0 1.328125 -0.34375q0.4375 -0.34375 0.4375 -1.09375q0 -0.71875 -0.421875 -1.0625q-0.421875 -0.359375 -1.34375 -0.359375l-1.6875 0l0 2.859375l1.6875 0zm10.2960205 -4.484375q1.140625 0 1.9375 0.75q0.796875 0.734375 0.796875 1.875q0 0.90625 -0.375 1.5q-0.375 0.578125 -1.140625 0.890625l0 0.015625q0.671875 0.1875 1.03125 0.8125q0.359375 0.625 0.390625 1.90625q0.015625 1.296875 0.375 1.765625l-2.109375 0q-0.171875 -0.46875 -0.234375 -1.5q-0.109375 -1.40625 -0.484375 -1.8125q-0.375 -0.40625 -1.140625 -0.40625l-2.140625 0l0 3.71875l-2.09375 0l0 -9.515625l5.1875 0zm-0.765625 4.296875q0.65625 0 1.015625 -0.3125q0.375 -0.3125 0.375 -1.046875q0 -0.671875 -0.359375 -0.984375q-0.34375 -0.328125 -1.03125 -0.328125l-2.328125 0l0 2.671875l2.328125 0zm9.468903 -4.53125q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm10.102722 -4.796875l1.875 3.046875l1.921875 -3.046875l2.296875 0l-3.046875 4.546875l3.3125 4.96875l-2.5 0l-2.0625 -3.296875l-2.125 3.296875l-2.359375 0l3.328125 -4.984375l-3.0625 -4.53125l2.421875 0zm8.51474 0l2.234375 3.75l2.203125 -3.75l2.328125 0l-3.515625 5.859375l0 3.65625l-2.09375 0l0 -3.703125l-3.5 -5.8125l2.34375 0z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m591.7826 486.155l112.15747 0l0 35.55905l-112.15747 0z" fill-rule="evenodd"/><path fill="#dc477d" d="m629.95184 498.43936q1.484375 0 2.34375 0.84375q0.875 0.828125 0.875 2.203125q0 1.375 -0.875 2.21875q-0.859375 0.84375 -2.34375 0.84375l-2.265625 0l0 3.40625l-2.09375 0l0 -9.515625l4.359375 0zm-0.578125 4.484375q0.890625 0 1.328125 -0.34375q0.4375 -0.34375 0.4375 -1.09375q0 -0.71875 -0.421875 -1.0625q-0.421875 -0.359375 -1.34375 -0.359375l-1.6875 0l0 2.859375l1.6875 0zm10.2960205 -4.484375q1.140625 0 1.9375 0.75q0.796875 0.734375 0.796875 1.875q0 0.90625 -0.375 1.5q-0.375 0.578125 -1.140625 0.890625l0 0.015625q0.671875 0.1875 1.03125 0.8125q0.359375 0.625 0.390625 1.90625q0.015625 1.296875 0.375 1.765625l-2.109375 0q-0.171875 -0.46875 -0.234375 -1.5q-0.109375 -1.40625 -0.484375 -1.8125q-0.375 -0.40625 -1.140625 -0.40625l-2.140625 0l0 3.71875l-2.09375 0l0 -9.515625l5.1875 0zm-0.765625 4.296875q0.65625 0 1.015625 -0.3125q0.375 -0.3125 0.375 -1.046875q0 -0.671875 -0.359375 -0.984375q-0.34375 -0.328125 -1.03125 -0.328125l-2.328125 0l0 2.671875l2.328125 0zm9.468872 -4.53125q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm10.102722 -4.796875l1.875 3.046875l1.921875 -3.046875l2.296875 0l-3.046875 4.546875l3.3125 4.96875l-2.5 0l-2.0625 -3.296875l-2.125 3.296875l-2.359375 0l3.328125 -4.984375l-3.0625 -4.53125l2.421875 0zm8.5147705 0l2.234375 3.75l2.203125 -3.75l2.328125 0l-3.515625 5.859375l0 3.65625l-2.09375 0l0 -3.703125l-3.5 -5.8125l2.34375 0z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m401.31567 337.4117l155.40161 0l0 67.87402l-155.40161 0z" fill-rule="evenodd"/><path fill="#4e515d" d="m438.945 349.4617q1.625 0 2.765625 0.921875q1.140625 0.921875 1.328125 2.515625l-2.015625 0q-0.140625 -0.75 -0.75 -1.203125q-0.59375 -0.46875 -1.328125 -0.46875q-1.234375 0 -1.921875 0.890625q-0.671875 0.890625 -0.671875 2.375q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q0.90625 0 1.453125 -0.5625q0.5625 -0.5625 0.703125 -1.5625l2.03125 0q-0.1875 1.8125 -1.328125 2.859375q-1.125 1.03125 -2.859375 1.03125q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.1875 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm9.878967 0q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm10.773285 -4.796875l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm9.878967 0l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm14.910187 0l0 1.765625l-5.015625 0l0 2.03125l4.609375 0l0 1.625l-4.609375 0l0 2.34375l5.125 0l0 1.75l-7.21875 0l0 -9.515625l7.109375 0zm5.792206 -0.234375q1.625 0 2.765625 0.921875q1.140625 0.921875 1.328125 2.515625l-2.015625 0q-0.140625 -0.75 -0.75 -1.203125q-0.59375 -0.46875 -1.328125 -0.46875q-1.234375 0 -1.921875 0.890625q-0.671875 0.890625 -0.671875 2.375q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q0.90625 0 1.453125 -0.5625q0.5625 -0.5625 0.703125 -1.5625l2.03125 0q-0.1875 1.8125 -1.328125 2.859375q-1.125 1.03125 -2.859375 1.03125q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.1875 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm12.341187 0.234375l0 1.765625l-2.859375 0l0 7.75l-2.078125 0l0 -7.75l-2.859375 0l0 -1.765625l7.796875 0zm3.1882324 0l0 9.515625l-2.09375 0l0 -9.515625l2.09375 0zm6.1026306 -0.234375q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm10.773315 -4.796875l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0z" fill-rule="nonzero"/><path fill="#4e515d" d="m440.7023 365.69608l3.5625 9.515625l-2.171875 0l-0.71875 -2.125l-3.5625 0l-0.734375 2.125l-2.125 0l3.609375 -9.515625l2.140625 0zm-1.09375 2.34375l-1.25 3.5l2.46875 0l-1.1875 -3.5l-0.03125 0zm7.3740234 -2.34375l0 5.96875q0 1.03125 0.46875 1.53125q0.484375 0.484375 1.5 0.484375q1.09375 0 1.53125 -0.484375q0.4375 -0.484375 0.4375 -1.515625l0 -5.984375l2.09375 0l0 5.984375q0 1.765625 -1.03125 2.765625q-1.03125 1.0 -3.03125 1.0q-2.015625 0 -3.046875 -0.984375q-1.015625 -0.984375 -1.015625 -2.78125l0 -5.984375l2.09375 0zm14.878967 0l0 1.765625l-2.859375 0l0 7.75l-2.078125 0l0 -7.75l-2.859375 0l0 -1.765625l7.796875 0zm3.1882324 0l0 3.65625l3.84375 0l0 -3.65625l2.09375 0l0 9.515625l-2.09375 0l0 -4.109375l-3.84375 0l0 4.109375l-2.09375 0l0 -9.515625l2.09375 0zm12.050812 -0.234375q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm13.88269 -4.796875q1.140625 0 1.9375 0.75q0.796875 0.734375 0.796875 1.875q0 0.90625 -0.375 1.5q-0.375 0.578125 -1.140625 0.890625l0 0.015625q0.671875 0.1875 1.03125 0.8125q0.359375 0.625 0.390625 1.90625q0.015625 1.296875 0.375 1.765625l-2.109375 0q-0.171875 -0.46875 -0.234375 -1.5q-0.109375 -1.40625 -0.484375 -1.8125q-0.375 -0.40625 -1.140625 -0.40625l-2.140625 0l0 3.71875l-2.09375 0l0 -9.515625l5.1875 0zm-0.765625 4.296875q0.65625 0 1.015625 -0.3125q0.375 -0.3125 0.375 -1.046875q0 -0.671875 -0.359375 -0.984375q-0.34375 -0.328125 -1.03125 -0.328125l-2.328125 0l0 2.671875l2.328125 0zm7.2970276 -4.296875l0 9.515625l-2.09375 0l0 -9.515625l2.09375 0zm9.118256 0l0 1.65625l-5.109375 6.109375l5.234375 0l0 1.75l-8.015625 0l0 -1.65625l5.09375 -6.09375l-4.703125 0l0 -1.765625l7.5 0zm8.46405 0l0 1.765625l-5.0155945 0l0 2.03125l4.6093445 0l0 1.625l-4.6093445 0l0 2.34375l5.1249695 0l0 1.75l-7.2187195 0l0 -9.515625l7.1093445 0zm5.6984863 0q1.890625 0 3.0625 1.25q1.1875 1.234375 1.1875 3.453125q0 2.234375 -1.15625 3.53125q-1.140625 1.28125 -3.09375 1.28125l-4.171875 0l0 -9.515625l4.171875 0zm-0.171875 7.765625q1.0 0 1.65625 -0.71875q0.671875 -0.734375 0.671875 -2.15625q0 -1.640625 -0.6875 -2.375q-0.6875 -0.75 -2.0 -0.75l-1.546875 0l0 6.0l1.90625 0z" fill-rule="nonzero"/><path fill="#4e515d" d="m421.32367 381.69608l1.5 6.46875l0.015625 0l1.65625 -6.46875l1.96875 0l1.625 6.546875l0.015625 0l1.5625 -6.546875l2.0625 0l-2.5625 9.515625l-2.078125 0l-1.609375 -6.46875l-0.03125 0l-1.59375 6.46875l-2.109375 0l-2.53125 -9.515625l2.109375 0zm13.454742 0l0 9.515625l-2.09375 0l0 -9.515625l2.09375 0zm8.883881 0l0 1.765625l-2.859375 0l0 7.75l-2.078125 0l0 -7.75l-2.859375 0l0 -1.765625l7.796875 0zm3.1882324 0l0 3.65625l3.84375 0l0 -3.65625l2.09375 0l0 9.515625l-2.09375 0l0 -4.109375l-3.84375 0l0 4.109375l-2.09375 0l0 -9.515625l2.09375 0zm13.58194 0l0 9.515625l-2.09375 0l0 -9.515625l2.09375 0zm3.9151306 0l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm14.847687 0l0 1.765625l-2.859375 0l0 7.75l-2.078125 0l0 -7.75l-2.859375 0l0 -1.765625l7.796875 0zm8.203857 0l0 1.765625l-5.015625 0l0 2.03125l4.609375 0l0 1.625l-4.609375 0l0 2.34375l5.125 0l0 1.75l-7.21875 0l0 -9.515625l7.109375 0zm3.6047058 0l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm14.847717 0l0 1.765625l-2.859375 0l0 7.75l-2.078125 0l0 -7.75l-2.859375 0l0 -1.765625l7.796875 0zm3.1882324 0l0 9.515625l-2.09375 0l0 -9.515625l2.09375 0zm6.1026 -0.234375q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0624695 -0.640625 -1.6562195 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.28125 -3.609375q1.2968445 -1.421875 3.4062195 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm10.773315 -4.796875l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm11.082092 -0.234375q1.71875 0 2.75 0.8125q1.046875 0.796875 1.046875 2.265625l-2.015625 0q-0.046875 -0.71875 -0.5 -1.078125q-0.4375 -0.359375 -1.375 -0.359375q-0.640625 0 -1.046875 0.28125q-0.40625 0.265625 -0.40625 0.796875q0 0.359375 0.171875 0.53125q0.171875 0.171875 0.6875 0.375q0.53125 0.1875 2.296875 0.59375q1.1875 0.296875 1.84375 0.984375q0.671875 0.671875 0.671875 1.71875q0 1.390625 -1.046875 2.234375q-1.03125 0.828125 -2.90625 0.828125q-1.796875 0 -2.9375 -0.890625q-1.125 -0.890625 -1.125 -2.453125l0 -0.046875l2.03125 0q0 0.890625 0.578125 1.328125q0.578125 0.421875 1.515625 0.421875q0.859375 0 1.359375 -0.296875q0.5 -0.3125 0.5 -0.875q0 -0.46875 -0.390625 -0.765625q-0.375 -0.296875 -1.234375 -0.515625q-1.09375 -0.234375 -1.984375 -0.515625q-0.890625 -0.28125 -1.484375 -0.890625q-0.578125 -0.625 -0.578125 -1.59375q0 -1.28125 1.03125 -2.078125q1.03125 -0.8125 2.546875 -0.8125z" fill-rule="nonzero"/><path fill="#ffffff" d="m739.0079 410.3251l0 0c0 -1.234314 1.0006714 -2.2349548 2.2349854 -2.2349548l67.02612 0c0.59277344 0 1.1612549 0.23547363 1.5803833 0.65460205c0.41912842 0.41915894 0.65460205 0.98760986 0.65460205 1.5803528l0 67.02615c0 1.234314 -1.0006714 2.2349548 -2.2349854 2.2349548l-67.02612 0l0 0c-1.234314 0 -2.2349854 -1.0006409 -2.2349854 -2.2349548z" fill-rule="evenodd"/><path stroke="#d6d6d6" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m739.0079 410.3251l0 0c0 -1.234314 1.0006714 -2.2349548 2.2349854 -2.2349548l67.02612 0c0.59277344 0 1.1612549 0.23547363 1.5803833 0.65460205c0.41912842 0.41915894 0.65460205 0.98760986 0.65460205 1.5803528l0 67.02615c0 1.234314 -1.0006714 2.2349548 -2.2349854 2.2349548l-67.02612 0l0 0c-1.234314 0 -2.2349854 -1.0006409 -2.2349854 -2.2349548z" fill-rule="evenodd"/><path fill="#9396a2" d="m774.76404 463.16562c-5.0162964 0 -9.7230835 -0.65496826 -13.259888 -1.8378296c-1.8533936 -0.63882446 -3.2398682 -1.3242188 -4.221985 -2.118744c-1.2164917 -0.9645386 -1.8390503 -2.0543518 -1.8390503 -3.2229004l0 -24.466064c0 -1.4476929 1.0125122 -2.50708 1.8533325 -3.1602478c1.0447998 -0.79455566 2.46344 -1.4799194 4.239868 -2.0561523c3.520752 -1.1524353 8.225769 -1.7912903 13.227722 -1.7912903c5.001953 0 9.70697 0.638855 13.229492 1.7912903c1.7746582 0.5601196 3.1932983 1.2454834 4.238098 2.0561523c0.85687256 0.63705444 1.8533325 1.7125549 1.8533325 3.1602478l0 24.466064c0 1.1685486 -0.6225586 2.2422485 -1.8390503 3.2229004c-0.99645996 0.79452515 -2.3685913 1.4960022 -4.221985 2.118744c-3.5368042 1.1828613 -8.243591 1.8378296 -13.259888 1.8378296zm-17.15448 -7.179474c0 0.32748413 0.16992188 0.8714905 1.0125732 1.5264282c0.81036377 0.638855 2.0411987 1.2455139 3.5671997 1.7590942c3.350769 1.105896 7.821411 1.7143555 12.574707 1.7143555c4.751526 0 9.223938 -0.6084595 12.574707 -1.7143555c1.526001 -0.5135803 2.756836 -1.1202393 3.5671997 -1.7590942c0.84265137 -0.6692505 1.0125732 -1.1989441 1.0125732 -1.5264282l0 -9.2034l-0.5921631 0.35787964c-0.90338135 0.54400635 -2.0089722 1.0271912 -3.3024292 1.4477234c-3.5368042 1.1381226 -8.257935 1.775177 -13.259888 1.775177c-5.001953 0 -9.70697 -0.6227417 -13.259888 -1.775177c-1.293457 -0.42053223 -2.3990479 -0.90371704 -3.3024292 -1.4477234l-0.5921631 -0.35787964l0 9.2034zm0 -12.63031c0 0.31137085 0.16992188 0.8106384 0.99645996 1.4494934c0.81036377 0.60665894 2.0411987 1.1989746 3.5689697 1.6964417c3.348999 1.0755005 7.805298 1.6821594 12.58905 1.6821594c4.7836914 0 9.240051 -0.5923462 12.58905 -1.6821594c1.527771 -0.49746704 2.758545 -1.0897827 3.5689697 -1.6964417c0.8408203 -0.65493774 1.0125732 -1.1524353 1.0125732 -1.4656067l0 -8.408844l-0.5921631 0.35787964c-0.9034424 0.5458069 -2.0250854 1.0289612 -3.3346558 1.4494934c-3.520691 1.1524658 -8.227478 1.7895203 -13.227661 1.7895203c-5.002014 0 -9.707031 -0.63705444 -13.229492 -1.7895203c-1.3095093 -0.42053223 -2.4151 -0.9036865 -3.3346558 -1.4494934l-0.5921631 -0.35787964l0 8.408844zm17.15448 -16.647736c-4.753296 0 -9.207886 0.5923462 -12.558594 1.6821289c-1.5582275 0.51361084 -2.7890625 1.1059265 -3.583313 1.7125549c-0.8265381 0.6227722 -1.0125732 1.1220398 -1.0125732 1.4334106c0 0.31137085 0.16992188 0.8088379 1.0125732 1.4315796c0.7942505 0.60842896 2.0250854 1.2150879 3.583313 1.7143555c3.350708 1.0737 7.805298 1.6821289 12.558594 1.6821289c4.751526 0 9.209656 -0.5923157 12.558594 -1.6821289c1.5582275 -0.5135803 2.7890015 -1.1059265 3.583313 -1.7143555c0.8265381 -0.6227417 1.0125732 -1.1202087 1.0125732 -1.4315796c0 -0.31137085 -0.16992188 -0.8106384 -1.0125732 -1.4334106c-0.7943115 -0.6066284 -2.0250854 -1.2150574 -3.583313 -1.7125549c-3.348938 -1.07547 -7.807068 -1.6821289 -12.558594 -1.6821289z" fill-rule="evenodd"/><path fill="#ffffff" d="m149.48859 410.3251l0 0c0 -1.234314 1.0006409 -2.2349548 2.23497 -2.2349548l67.02614 0c0.5927429 0 1.1612091 0.23547363 1.5803528 0.65460205c0.41914368 0.41915894 0.65460205 0.98760986 0.65460205 1.5803528l0 67.02615c0 1.234314 -1.0006256 2.2349548 -2.2349548 2.2349548l-67.02614 0l0 0c-1.2343292 0 -2.23497 -1.0006409 -2.23497 -2.2349548z" fill-rule="evenodd"/><path stroke="#d6d6d6" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m149.48859 410.3251l0 0c0 -1.234314 1.0006409 -2.2349548 2.23497 -2.2349548l67.02614 0c0.5927429 0 1.1612091 0.23547363 1.5803528 0.65460205c0.41914368 0.41915894 0.65460205 0.98760986 0.65460205 1.5803528l0 67.02615c0 1.234314 -1.0006256 2.2349548 -2.2349548 2.2349548l-67.02614 0l0 0c-1.2343292 0 -2.23497 -1.0006409 -2.23497 -2.2349548z" fill-rule="evenodd"/><path fill="#e03875" d="m425.44894 443.853l0 0c0 -14.811676 12.007233 -26.818909 26.818909 -26.818909l0.03149414 0l0 0c7.112793 0 13.934296 2.8255615 18.963806 7.855072c5.029541 5.029541 7.855072 11.851013 7.855072 18.963837l0 0l0 0c0 14.811676 -12.007233 26.818909 -26.818878 26.818909l-0.03149414 0l0 0c-14.811676 0 -26.818909 -12.007233 -26.818909 -26.818909z" fill-rule="evenodd"/><path stroke="#ffffff" stroke-width="2.0" stroke-miterlimit="400.0" stroke-linecap="butt" stroke-opacity="0.4784" d="m425.44894 443.853l0 0c0 -14.811676 12.007233 -26.818909 26.818909 -26.818909l0.03149414 0l0 0c7.112793 0 13.934296 2.8255615 18.963806 7.855072c5.029541 5.029541 7.855072 11.851013 7.855072 18.963837l0 0l0 0c0 14.811676 -12.007233 26.818909 -26.818878 26.818909l-0.03149414 0l0 0c-14.811676 0 -26.818909 -12.007233 -26.818909 -26.818909z" fill-rule="evenodd"/><path fill="#929292" d="m185.24359 463.98264c-10.656921 0 -19.320938 -8.664001 -19.320938 -19.320923c0 -10.656952 8.664017 -19.320953 19.320938 -19.320953c10.656937 0 19.320953 8.664001 19.320953 19.320953c0 10.656921 -8.664017 19.320923 -19.320953 19.320923zm8.113007 -18.444336c-0.2826538 5.6674805 -2.1485596 11.080902 -5.413437 15.646393l-0.5080719 0.7066345l0.86050415 -0.15563965c7.9859924 -1.4132996 13.8520355 -8.055756 14.2760315 -16.168762l0 -0.38284302l-9.200714 0l0 0.3399048zm-25.455338 0.042938232c0.4239807 8.098694 6.290039 14.755463 14.2760315 16.168762l0.86050415 0.15563965l-0.5080719 -0.7066345c-3.2648926 -4.5654907 -5.130783 -9.978912 -5.413452 -15.646393l0 -0.3399048l-9.243637 0l0 0.38104248zm11.2079315 0c0.31129456 5.6531677 2.3882904 11.179321 5.8517456 15.546204l0.2826538 0.35421753l0.28266907 -0.35421753c3.477768 -4.3668823 5.554764 -9.893036 5.8517303 -15.546204l0 -0.38284302l-12.297424 0l0 0.38284302zm8.862595 -17.428223c3.0806122 4.3257446 4.932205 9.4279175 5.356201 14.755493l0.02861023 0.32559204l9.215027 0l-0.042938232 -0.39535522c-0.80503845 -7.6460876 -6.6424713 -13.921814 -14.204468 -15.251038l-0.8622894 -0.15563965l0.5098572 0.7066345zm-2.9822235 0.057250977c-3.3221283 4.182617 -5.329361 9.243652 -5.7944946 14.642761l-0.028625488 0.39538574l12.211548 0l-0.02861023 -0.39538574c-0.4669342 -5.399109 -2.4741669 -10.460144 -5.7944946 -14.642761l-0.28266907 -0.35421753l-0.2826538 0.35421753zm-2.7711182 -0.60824585c-7.5620117 1.3435059 -13.397644 7.60495 -14.204483 15.251007l-0.041137695 0.39538574l9.215012 0l0.028625488 -0.32559204c0.42219543 -5.3275757 2.2737885 -10.444061 5.356201 -14.755493l0.50805664 -0.7066345l-0.86227417 0.15563965z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m107.53936 484.95804l155.40158 0l0 37.165314l-155.40158 0z" fill-rule="evenodd"/><path fill="#4e515d" d="m170.75928 497.56927l1.65625 7.125l0.03125 0l1.8125 -7.125l2.15625 0l1.796875 7.21875l0.015625 0l1.71875 -7.21875l2.265625 0l-2.8125 10.46875l-2.296875 0l-1.765625 -7.125l-0.03125 0l-1.75 7.125l-2.328125 0l-2.765625 -10.46875l2.296875 0zm20.333267 0l0 1.9375l-5.53125 0l0 2.234375l5.0625 0l0 1.796875l-5.0625 0l0 2.5625l5.640625 0l0 1.9375l-7.9375 0l0 -10.46875l7.828125 0zm6.6683807 0q1.59375 0 2.421875 0.640625q0.84375 0.625 0.84375 1.953125q0 0.796875 -0.375 1.328125q-0.375 0.53125 -1.046875 0.859375q0.953125 0.28125 1.4375 0.96875q0.484375 0.671875 0.484375 1.6875q0 1.4375 -1.046875 2.234375q-1.046875 0.796875 -2.59375 0.796875l-5.125 0l0 -10.46875l5.0 0zm-0.328125 4.25q0.609375 0 0.984375 -0.3125q0.375 -0.328125 0.375 -0.9375q0 -0.625 -0.390625 -0.90625q-0.375 -0.296875 -1.125 -0.296875l-2.21875 0l0 2.453125l2.375 0zm0.140625 4.421875q0.765625 0 1.203125 -0.328125q0.4375 -0.34375 0.4375 -1.03125q0 -0.75 -0.421875 -1.125q-0.40625 -0.375 -1.171875 -0.375l-2.5625 0l0 2.859375l2.515625 0z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m697.05865 484.95804l155.40161 0l0 37.165314l-155.40161 0z" fill-rule="evenodd"/><path fill="#4e515d" d="m742.21436 497.56927q2.09375 0 3.390625 1.375q1.296875 1.359375 1.296875 3.8125q0 2.4375 -1.265625 3.859375q-1.265625 1.421875 -3.421875 1.421875l-4.578125 0l0 -10.46875l4.578125 0zm-0.171875 8.53125q1.09375 0 1.8125 -0.78125q0.734375 -0.796875 0.734375 -2.359375q0 -1.8125 -0.765625 -2.625q-0.75 -0.828125 -2.1875 -0.828125l-1.703125 0l0 6.59375l2.109375 0zm11.309326 -8.53125l3.921875 10.46875l-2.390625 0l-0.78125 -2.328125l-3.921875 0l-0.828125 2.328125l-2.3125 0l3.96875 -10.46875l2.34375 0zm-1.203125 2.578125l-1.359375 3.84375l2.703125 0l-1.3125 -3.84375l-0.03125 0zm12.472717 -2.578125l0 1.9375l-3.140625 0l0 8.53125l-2.296875 0l0 -8.53125l-3.140625 0l0 -1.9375l8.578125 0zm5.0880127 0l3.921875 10.46875l-2.390625 0l-0.78125 -2.328125l-3.921875 0l-0.828125 2.328125l-2.3125 0l3.96875 -10.46875l2.34375 0zm-1.203125 2.578125l-1.359375 3.84375l2.703125 0l-1.3125 -3.84375l-0.03125 0zm11.040405 -2.578125q1.59375 0 2.421875 0.640625q0.84375 0.625 0.84375 1.953125q0 0.796875 -0.375 1.328125q-0.375 0.53125 -1.046875 0.859375q0.953125 0.28125 1.4375 0.96875q0.484375 0.671875 0.484375 1.6875q0 1.4375 -1.046875 2.234375q-1.046875 0.796875 -2.59375 0.796875l-5.125 0l0 -10.46875l5.0 0zm-0.328125 4.25q0.609375 0 0.984375 -0.3125q0.375 -0.328125 0.375 -0.9375q0 -0.625 -0.390625 -0.90625q-0.375 -0.296875 -1.125 -0.296875l-2.21875 0l0 2.453125l2.375 0zm0.140625 4.421875q0.765625 0 1.203125 -0.328125q0.4375 -0.34375 0.4375 -1.03125q0 -0.75 -0.421875 -1.125q-0.40625 -0.375 -1.171875 -0.375l-2.5625 0l0 2.859375l2.515625 0zm10.710144 -8.671875l3.921875 10.46875l-2.390625 0l-0.78125 -2.328125l-3.921875 0l-0.828125 2.328125l-2.3125 0l3.96875 -10.46875l2.34375 0zm-1.203125 2.578125l-1.359375 3.84375l2.703125 0l-1.3125 -3.84375l-0.03125 0zm9.634094 -2.828125q1.90625 0 3.046875 0.890625q1.140625 0.875 1.140625 2.484375l-2.21875 0q-0.046875 -0.78125 -0.546875 -1.171875q-0.484375 -0.40625 -1.515625 -0.40625q-0.6875 0 -1.140625 0.3125q-0.453125 0.296875 -0.453125 0.875q0 0.390625 0.1875 0.59375q0.1875 0.1875 0.765625 0.40625q0.578125 0.203125 2.515625 0.65625q1.296875 0.3125 2.03125 1.0625q0.734375 0.75 0.734375 1.90625q0 1.515625 -1.140625 2.4375q-1.140625 0.921875 -3.203125 0.921875q-1.984375 0 -3.234375 -0.96875q-1.234375 -0.984375 -1.234375 -2.6875l0 -0.0625l2.21875 0q0.015625 0.96875 0.65625 1.453125q0.640625 0.484375 1.671875 0.484375q0.921875 0 1.46875 -0.34375q0.5625 -0.34375 0.5625 -0.96875q0 -0.5 -0.421875 -0.828125q-0.421875 -0.328125 -1.359375 -0.5625q-1.203125 -0.28125 -2.1875 -0.578125q-0.984375 -0.296875 -1.625 -0.984375q-0.640625 -0.6875 -0.640625 -1.75q0 -1.40625 1.125 -2.28125q1.140625 -0.890625 2.796875 -0.890625zm13.745239 0.25l0 1.9375l-5.53125 0l0 2.234375l5.0625 0l0 1.796875l-5.0625 0l0 2.5625l5.640625 0l0 1.9375l-7.9375 0l0 -10.46875l7.828125 0z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m323.36685 432.07346l-49.35434 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m323.36685 432.07346l-43.35434 0" fill-rule="evenodd"/><path fill="#e03875" stroke="#e03875" stroke-width="1.0" stroke-linecap="butt" d="m280.0125 430.42172l-4.5381165 1.6517334l4.5381165 1.6517334z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m274.0231 457.24615l49.35434 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m274.0231 457.24615l43.35431 0" fill-rule="evenodd"/><path fill="#e03875" stroke="#e03875" stroke-width="1.0" stroke-linecap="butt" d="m317.3774 458.8979l4.5381165 -1.6517334l-4.5381165 -1.6517334z" fill-rule="evenodd"/><path fill="#ffffff" d="m447.4663 453.8968c-0.1628418 0 -0.3149414 -0.04660034 -0.44415283 -0.12863159c-0.035003662 -0.023284912 -0.082092285 -0.057769775 -0.11709595 -0.09320068l-8.8871765 -8.890533c-0.15209961 -0.15194702 -0.2341919 -0.35046387 -0.2341919 -0.57321167c0 -0.22183228 0.082092285 -0.42034912 0.2341919 -0.57318115c0.15206909 -0.1519165 0.36203003 -0.23394775 0.57336426 -0.23394775c0.20996094 0 0.41992188 0.08203125 0.5720215 0.23394775l8.30304 8.305237l17.927826 -17.932098c0.15206909 -0.1519165 0.36203003 -0.23391724 0.57336426 -0.23391724c0.20996094 0 0.41992188 0.08200073 0.5720215 0.23391724c0.31628418 0.3159485 0.31628418 0.83044434 0 1.1463928l-18.499847 18.50528c-0.15206909 0.15286255 -0.36206055 0.24606323 -0.57336426 0.24606323z" fill-rule="evenodd"/><path fill="#ffffff" d="m487.37338 458.657c-2.1542358 0 -3.9013672 -1.74646 -3.9013672 -3.90036l0 -9.923065c0 -1.6723633 1.0776367 -3.1581726 2.645813 -3.7014465l0 -4.2351074c0 -2.1113586 0.85849 -4.0992737 2.4266663 -5.5946655c1.558136 -1.4734497 3.6088562 -2.2787476 5.78421 -2.2787476c2.175354 0 4.226074 0.80529785 5.78421 2.2787476c1.5681763 1.4953918 2.4266663 3.483307 2.4266663 5.5946655l0 4.2351074c1.5681763 0.5432739 2.645813 2.0290833 2.645813 3.7014465l0 9.923065c0 2.1539001 -1.7471313 3.90036 -3.9013672 3.90036l-13.900604 0zm6.945282 -8.92981c-0.3981018 0 -0.7328491 0.3347473 -0.7328491 0.732605l0 2.64505c0 0.39648438 0.3347473 0.7312317 0.7328491 0.7312317c0.3970642 0 0.7318115 -0.3347473 0.7318115 -0.7312317l0 -2.64505c0 -0.39785767 -0.3347473 -0.732605 -0.7318115 -0.732605zm5.6896973 -8.803589l0 -4.0361633c0 -1.422699 -0.5860596 -2.7616882 -1.6425781 -3.764557c-1.0766296 -1.0151978 -2.5523376 -1.5900574 -4.058197 -1.5900574c-1.5058594 0 -2.9805603 0.5858154 -4.058197 1.5996704c-1.056488 1.004242 -1.6315002 2.3432312 -1.6315002 3.7645264l0 4.036194l11.379425 0z" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
+<svg version="1.1" viewBox="0.0 0.0 960.0 540.0" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><clipPath id="g22371b66da5_0_4.0"><path d="m0 0l960.0 0l0 540.0l-960.0 0l0 -540.0z" clip-rule="nonzero"/></clipPath><g clip-path="url(#g22371b66da5_0_4.0)"><path fill="#ffffff" d="m0 0l960.0 0l0 540.0l-960.0 0z" fill-rule="evenodd"/><path fill="#ffffff" d="m561.6897 196.50427l0 0c0 -4.9547577 4.0166016 -8.9713745 8.9713745 -8.9713745l269.04938 0c2.3793335 0 4.661255 0.9451904 6.343689 2.627655c1.6824951 1.6824493 2.6276855 3.9643555 2.6276855 6.3437195l0 324.67145c0 4.954712 -4.0166626 8.9713745 -8.9713745 8.9713745l-269.04938 0l0 0c-4.954773 0 -8.9713745 -4.0166626 -8.9713745 -8.9713745z" fill-rule="evenodd"/><path stroke="#d6d6d6" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m561.6897 196.50427l0 0c0 -4.9547577 4.0166016 -8.9713745 8.9713745 -8.9713745l269.04938 0c2.3793335 0 4.661255 0.9451904 6.343689 2.627655c1.6824951 1.6824493 2.6276855 3.9643555 2.6276855 6.3437195l0 324.67145c0 4.954712 -4.0166626 8.9713745 -8.9713745 8.9713745l-269.04938 0l0 0c-4.954773 0 -8.9713745 -4.0166626 -8.9713745 -8.9713745z" fill-rule="evenodd"/><path fill="#ffffff" d="m116.41083 196.50427l0 0c0 -4.9547577 4.0166245 -8.9713745 8.9713745 -8.9713745l269.04938 0c2.379364 0 4.661255 0.9451904 6.3437195 2.627655c1.6824646 1.6824493 2.627655 3.9643555 2.627655 6.3437195l0 324.67145c0 4.954712 -4.016632 8.9713745 -8.9713745 8.9713745l-269.04938 0l0 0c-4.95475 0 -8.9713745 -4.0166626 -8.9713745 -8.9713745z" fill-rule="evenodd"/><path stroke="#d6d6d6" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m116.41083 196.50427l0 0c0 -4.9547577 4.0166245 -8.9713745 8.9713745 -8.9713745l269.04938 0c2.379364 0 4.661255 0.9451904 6.3437195 2.627655c1.6824646 1.6824493 2.627655 3.9643555 2.627655 6.3437195l0 324.67145c0 4.954712 -4.016632 8.9713745 -8.9713745 8.9713745l-269.04938 0l0 0c-4.95475 0 -8.9713745 -4.0166626 -8.9713745 -8.9713745z" fill-rule="evenodd"/><path fill="#e03875" d="m432.13947 51.027424l0 0c0 -22.740562 18.434845 -41.17543 41.175415 -41.17543l0 0c10.92041 0 21.393555 4.338113 29.115417 12.060004c7.7218933 7.7218914 12.059998 18.195024 12.059998 29.115427l0 0c0 22.740566 -18.434845 41.175434 -41.175415 41.175434l0 0c-22.74057 0 -41.175415 -18.434868 -41.175415 -41.175434z" fill-rule="evenodd"/><path fill="#ffffff" d="m473.4852 67.83086c-9.251129 0.0076828003 -16.756775 -7.509384 -16.764313 -16.789547c-0.0075683594 -9.280228 7.4858704 -16.809406 16.736969 -16.816986c4.208252 -0.0034217834 8.263641 1.5822105 11.359558 4.4416084l0 0l-3.9751587 4.171665l0 0c-4.5107117 -4.0889435 -11.471741 -3.735508 -15.547882 0.7893944c-4.0761414 4.524868 -3.7238464 11.50779 0.78689575 15.596733c4.191437 3.799511 10.56955 3.799511 14.760986 0l0 0l3.9751587 4.171665l0 0c-3.086853 2.85577 -7.133148 4.439457 -11.332214 4.435467z" fill-rule="evenodd"/><path fill="#ffffff" d="m486.96402 59.426167c-0.75827026 0 -1.3729553 -0.61660385 -1.3729553 -1.3772507c0 -0.76068115 0.61468506 -1.3772812 1.3729553 -1.3772812c0.7583313 0 1.3729553 0.61660004 1.3729553 1.3772812c-0.0018310547 0.7599449 -0.61553955 1.3755722 -1.3729553 1.3772507z" fill-rule="evenodd"/><path fill="#ffffff" d="m473.37817 54.66863c-2.0028687 0 -3.6265564 -1.6287727 -3.6265564 -3.6379547c0 -2.009182 1.6236877 -3.6379547 3.6265564 -3.6379547c2.0028992 0 3.6265259 1.6287727 3.6265259 3.6379547c-0.0016479492 2.0084763 -1.6243286 3.6362457 -3.6265259 3.6379547z" fill-rule="evenodd"/><path fill="#ffffff" d="m488.53574 54.720764c-0.7583313 0 -1.3729553 -0.61660385 -1.3729553 -1.3772507c0 -0.76067734 0.614624 -1.3772812 1.3729553 -1.3772812c0.7583313 0 1.3729553 0.61660385 1.3729553 1.3772812c-0.0018310547 0.7599449 -0.61550903 1.3755722 -1.3729553 1.3772507z" fill-rule="evenodd"/><path fill="#ffffff" d="m484.4566 54.56433c-0.75827026 0 -1.3729553 -0.61660385 -1.3729553 -1.3772507c0 -0.76067734 0.61468506 -1.3772812 1.3729553 -1.3772812c0.75827026 0 1.3729553 0.61660385 1.3729553 1.3772812c0 0.7606468 -0.61468506 1.3772507 -1.3729553 1.3772507z" fill-rule="evenodd"/><path fill="#ffffff" d="m488.53574 50.092033c-0.7583313 0 -1.3729553 -0.61660385 -1.3729553 -1.3772507c0 -0.76068115 0.614624 -1.3772812 1.3729553 -1.3772812c0.7583313 0 1.3729553 0.61660004 1.3729553 1.3772812c-0.0018310547 0.7599411 -0.61550903 1.3755722 -1.3729553 1.3772507z" fill-rule="evenodd"/><path fill="#ffffff" d="m484.4566 50.24849c-0.75827026 0 -1.3729553 -0.61663437 -1.3729553 -1.3772469c0 -0.76068115 0.6147156 -1.3772812 1.3729553 -1.3772812c0.75827026 0 1.3729553 0.61663437 1.3729553 1.3772812c0 0.0010070801 0 0.0020446777 0 0.0030517578c-0.0016784668 0.7594719 -0.61587524 1.3741951 -1.3729553 1.3741951z" fill-rule="evenodd"/><path fill="#ffffff" d="m487.0435 45.46026c-0.7582092 0.0017127991 -1.3743286 -0.6135483 -1.3760071 -1.3741951c-0.0016784668 -0.7606125 0.6116333 -1.3786583 1.3699036 -1.380333c0.7583313 -0.0016784668 1.374176 0.6135826 1.3760071 1.3741951c0 0.0010070801 0 0.00207901 0 0.00308609c0 0.75943756 -0.61276245 1.3755722 -1.3699036 1.3772469z" fill-rule="evenodd"/><path fill="#ffffff" d="m619.45374 226.63008l0 0c0 -0.87205505 0.7069092 -1.57901 1.5789795 -1.57901l53.682007 0c0.4187622 0 0.82037354 0.16636658 1.1165161 0.46247864c0.29614258 0.29612732 0.46246338 0.6977539 0.46246338 1.1165314l0 53.68199c0 0.8720398 -0.7069092 1.57901 -1.5789795 1.57901l-53.682007 0c-0.8720703 0 -1.5789795 -0.7069702 -1.5789795 -1.57901z" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m619.45374 226.63008l0 0c0 -0.87205505 0.7069092 -1.57901 1.5789795 -1.57901l53.682007 0c0.4187622 0 0.82037354 0.16636658 1.1165161 0.46247864c0.29614258 0.29612732 0.46246338 0.6977539 0.46246338 1.1165314l0 53.68199c0 0.8720398 -0.7069092 1.57901 -1.5789795 1.57901l-53.682007 0c-0.8720703 0 -1.5789795 -0.7069702 -1.5789795 -1.57901z" fill-rule="evenodd"/><path fill="#e03875" d="m661.7447 270.38776l0 0c0 -2.295227 1.8606567 -4.155884 4.155884 -4.155884l0 0c1.1022339 0 2.1593018 0.4378357 2.9387207 1.2172241c0.7793579 0.7793884 1.2172241 1.8364563 1.2172241 2.9386597l0 0c0 2.2952576 -1.8606567 4.1559143 -4.155945 4.1559143l0 0c-2.295227 0 -4.155884 -1.8606567 -4.155884 -4.1559143z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m659.03894 444.36276l111.62201 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="2.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m659.03894 444.36276l111.62201 0" fill-rule="evenodd"/><path fill="#ffffff" d="m270.33618 226.63008l0 0c0 -0.87205505 0.7069397 -1.57901 1.57901 -1.57901l53.681976 0c0.4187622 0 0.82040405 0.16636658 1.1165161 0.46247864c0.29614258 0.29612732 0.4624939 0.6977539 0.4624939 1.1165314l0 53.68199c0 0.8720398 -0.7069397 1.57901 -1.57901 1.57901l-53.681976 0c-0.8720703 0 -1.57901 -0.7069702 -1.57901 -1.57901z" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m270.33618 226.63008l0 0c0 -0.87205505 0.7069397 -1.57901 1.57901 -1.57901l53.681976 0c0.4187622 0 0.82040405 0.16636658 1.1165161 0.46247864c0.29614258 0.29612732 0.4624939 0.6977539 0.4624939 1.1165314l0 53.68199c0 0.8720398 -0.7069397 1.57901 -1.57901 1.57901l-53.681976 0c-0.8720703 0 -1.57901 -0.7069702 -1.57901 -1.57901z" fill-rule="evenodd"/><path fill="#e03875" d="m312.62714 270.38776l0 0c0 -2.295227 1.8606873 -4.155884 4.1559143 -4.155884l0 0c1.1022339 0 2.1593018 0.4378357 2.9386902 1.2172241c0.7793579 0.7793884 1.2172241 1.8364563 1.2172241 2.9386597l0 0c0 2.2952576 -1.8606567 4.1559143 -4.1559143 4.1559143l0 0c-2.295227 0 -4.1559143 -1.8606567 -4.1559143 -4.1559143z" fill-rule="evenodd"/><path fill="#ffffff" d="m603.215 402.8029l0 0c0 -1.5410156 1.2492065 -2.7902527 2.7902222 -2.7902527l83.67932 0c0.74005127 0 1.4497681 0.29397583 1.9730225 0.8172302c0.5233154 0.5232849 0.81726074 1.2330017 0.81726074 1.9730225l0 83.67932c0 1.5410156 -1.2492676 2.7902527 -2.7902832 2.7902527l-83.67932 0l0 0c-1.5410156 0 -2.7902222 -1.2492371 -2.7902222 -2.7902527z" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m603.215 402.8029l0 0c0 -1.5410156 1.2492065 -2.7902527 2.7902222 -2.7902527l83.67932 0c0.74005127 0 1.4497681 0.29397583 1.9730225 0.8172302c0.5233154 0.5232849 0.81726074 1.2330017 0.81726074 1.9730225l0 83.67932c0 1.5410156 -1.2492676 2.7902527 -2.7902832 2.7902527l-83.67932 0l0 0c-1.5410156 0 -2.7902222 -1.2492371 -2.7902222 -2.7902527z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m189.74904 443.592l111.622055 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="2.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m189.74904 443.592l111.622055 0" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m514.45306 50.922737l134.69531 0l0 174.10956" fill-rule="evenodd"/><path stroke="#dc477d" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="4.0,3.0" d="m514.45306 50.922737l134.69531 0l0 174.10956" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m432.104 50.922737l-129.40057 0l0 174.10956" fill-rule="evenodd"/><path stroke="#dc477d" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" stroke-dasharray="4.0,3.0" d="m432.104 50.922737l-129.40057 0l0 174.10956" fill-rule="evenodd"/><path fill="#ffffff" d="m262.94217 105.13187l0 0c0 -0.5111389 0.41436768 -0.92549133 0.9254761 -0.92549133l69.64508 0c0.24545288 0 0.48086548 0.09750366 0.65441895 0.27106476c0.17358398 0.17356873 0.27108765 0.40896606 0.27108765 0.6544266l0 27.75531c0 0.5111389 -0.41436768 0.92549133 -0.9255066 0.92549133l-69.64508 0l0 0c-0.5111084 0 -0.9254761 -0.41435242 -0.9254761 -0.92549133z" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m262.94217 105.13187l0 0c0 -0.5111389 0.41436768 -0.92549133 0.9254761 -0.92549133l69.64508 0c0.24545288 0 0.48086548 0.09750366 0.65441895 0.27106476c0.17358398 0.17356873 0.27108765 0.40896606 0.27108765 0.6544266l0 27.75531c0 0.5111389 -0.41436768 0.92549133 -0.9255066 0.92549133l-69.64508 0l0 0c-0.5111084 0 -0.9254761 -0.41435242 -0.9254761 -0.92549133z" fill-rule="evenodd"/><path fill="#ffffff" d="m254.09747 402.8029l0 0c0 -1.5410156 1.2492371 -2.7902527 2.7902527 -2.7902527l83.67932 0c0.74002075 0 1.4497375 0.29397583 1.9730225 0.8172302c0.5232544 0.5232849 0.8172302 1.2330017 0.8172302 1.9730225l0 83.67932c0 1.5410156 -1.2492371 2.7902527 -2.7902527 2.7902527l-83.67932 0l0 0c-1.5410156 0 -2.7902527 -1.2492371 -2.7902527 -2.7902527z" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m254.09747 402.8029l0 0c0 -1.5410156 1.2492371 -2.7902527 2.7902527 -2.7902527l83.67932 0c0.74002075 0 1.4497375 0.29397583 1.9730225 0.8172302c0.5232544 0.5232849 0.8172302 1.2330017 0.8172302 1.9730225l0 83.67932c0 1.5410156 -1.2492371 2.7902527 -2.7902527 2.7902527l-83.67932 0l0 0c-1.5410156 0 -2.7902527 -1.2492371 -2.7902527 -2.7902527z" fill-rule="evenodd"/><path fill="#e03875" d="m467.49796 443.853l0 0c0 -14.811676 12.007202 -26.818909 26.818878 -26.818909l0.03149414 0l0 0c7.1128235 0 13.934326 2.8255615 18.963806 7.855072c5.029541 5.029541 7.8551025 11.851013 7.8551025 18.963837l0 0l0 0c0 14.811676 -12.007233 26.818909 -26.818909 26.818909l-0.03149414 0l0 0c-14.811676 0 -26.818878 -12.007233 -26.818878 -26.818909z" fill-rule="evenodd"/><path stroke="#ffffff" stroke-width="3.0" stroke-miterlimit="400.0" stroke-linecap="butt" stroke-opacity="0.4784" d="m467.49796 443.853l0 0c0 -14.811676 12.007202 -26.818909 26.818878 -26.818909l0.03149414 0l0 0c7.1128235 0 13.934326 2.8255615 18.963806 7.855072c5.029541 5.029541 7.8551025 11.851013 7.8551025 18.963837l0 0l0 0c0 14.811676 -12.007233 26.818909 -26.818909 26.818909l-0.03149414 0l0 0c-14.811676 0 -26.818878 -12.007233 -26.818878 -26.818909z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m417.1976 92.18537l112.1575 0l0 54.92913l-112.1575 0z" fill-rule="evenodd"/><path fill="#dc477d" d="m447.88504 104.54662q1.78125 0 3.03125 1.015625q1.265625 1.0 1.484375 2.75l-2.234375 0q-0.140625 -0.8125 -0.8125 -1.3125q-0.671875 -0.515625 -1.46875 -0.515625q-1.359375 0 -2.109375 0.984375q-0.734375 0.984375 -0.734375 2.609375q0 1.546875 0.734375 2.53125q0.75 0.96875 2.109375 0.96875q1.0 0 1.609375 -0.609375q0.609375 -0.609375 0.765625 -1.734375l2.234375 0q-0.203125 2.0 -1.453125 3.140625q-1.25 1.140625 -3.15625 1.140625q-1.515625 0 -2.6875 -0.6875q-1.171875 -0.6875 -1.8125 -1.953125q-0.640625 -1.265625 -0.640625 -2.796875q0 -2.40625 1.40625 -3.96875q1.40625 -1.5625 3.734375 -1.5625zm10.863373 0q2.328125 0 3.734375 1.578125q1.40625 1.5625 1.40625 3.953125q0 2.34375 -1.421875 3.890625q-1.40625 1.546875 -3.71875 1.546875q-1.515625 0 -2.6875 -0.6875q-1.171875 -0.703125 -1.8125 -1.953125q-0.640625 -1.265625 -0.640625 -2.796875q0 -2.421875 1.40625 -3.96875q1.421875 -1.5625 3.734375 -1.5625zm-2.84375 5.53125q0 1.546875 0.734375 2.53125q0.75 0.96875 2.109375 0.96875q1.359375 0 2.09375 -0.953125q0.75 -0.96875 0.75 -2.546875q0 -1.65625 -0.765625 -2.625q-0.75 -0.96875 -2.09375 -0.96875q-1.34375 0 -2.09375 0.984375q-0.734375 0.984375 -0.734375 2.609375zm11.837585 -5.28125l4.375 7.03125l0.015625 0l0 -7.03125l2.15625 0l0 10.46875l-2.296875 0l-4.359375 -7.0l-0.03125 0l0 7.0l-2.140625 0l0 -10.46875l2.28125 0zm12.175873 -0.25q1.90625 0 3.046875 0.890625q1.140625 0.875 1.140625 2.484375l-2.21875 0q-0.046875 -0.78125 -0.546875 -1.171875q-0.484375 -0.40625 -1.515625 -0.40625q-0.6875 0 -1.140625 0.3125q-0.453125 0.296875 -0.453125 0.875q0 0.390625 0.1875 0.59375q0.1875 0.1875 0.765625 0.40625q0.578125 0.203125 2.515625 0.65625q1.296875 0.3125 2.03125 1.0625q0.734375 0.75 0.734375 1.90625q0 1.515625 -1.140625 2.4375q-1.140625 0.921875 -3.203125 0.921875q-1.984375 0 -3.234375 -0.96875q-1.234375 -0.984375 -1.234375 -2.6875l0 -0.0625l2.21875 0q0.015625 0.96875 0.65625 1.453125q0.640625 0.484375 1.671875 0.484375q0.921875 0 1.46875 -0.34375q0.5625 -0.34375 0.5625 -0.96875q0 -0.5 -0.421875 -0.828125q-0.421875 -0.328125 -1.359375 -0.5625q-1.203125 -0.28125 -2.1875 -0.578125q-0.984375 -0.296875 -1.625 -0.984375q-0.640625 -0.6875 -0.640625 -1.75q0 -1.40625 1.125 -2.28125q1.140625 -0.890625 2.796875 -0.890625zm8.167053 0.25l0 6.578125q0 1.125 0.515625 1.671875q0.53125 0.53125 1.640625 0.53125q1.203125 0 1.6875 -0.515625q0.484375 -0.53125 0.484375 -1.6875l0 -6.578125l2.296875 0l0 6.578125q0 1.953125 -1.140625 3.046875q-1.125 1.09375 -3.328125 1.09375q-2.203125 0 -3.328125 -1.078125q-1.125 -1.078125 -1.125 -3.0625l0 -6.578125l2.296875 0zm10.910248 0l0 8.53125l5.109375 0l0 1.9375l-7.40625 0l0 -10.46875l2.296875 0z" fill-rule="nonzero"/><path fill="#dc477d" d="m448.43365 122.14662q1.90625 0 3.046875 0.890625q1.140625 0.875 1.140625 2.484375l-2.21875 0q-0.046875 -0.78125 -0.546875 -1.171875q-0.484375 -0.40625 -1.515625 -0.40625q-0.6875 0 -1.140625 0.3125q-0.453125 0.296875 -0.453125 0.875q0 0.390625 0.1875 0.59375q0.1875 0.1875 0.765625 0.40625q0.578125 0.203125 2.515625 0.65625q1.296875 0.3125 2.03125 1.0625q0.734375 0.75 0.734375 1.90625q0 1.515625 -1.140625 2.4375q-1.140625 0.921875 -3.203125 0.921875q-1.984375 0 -3.234375 -0.96875q-1.234375 -0.984375 -1.234375 -2.6875l0 -0.0625l2.21875 0q0.015625 0.96875 0.65625 1.453125q0.640625 0.484375 1.671875 0.484375q0.921875 0 1.46875 -0.34375q0.5625 -0.34375 0.5625 -0.96875q0 -0.5 -0.421875 -0.828125q-0.421875 -0.328125 -1.359375 -0.5625q-1.203125 -0.28125 -2.1875 -0.578125q-0.984375 -0.296875 -1.625 -0.984375q-0.640625 -0.6875 -0.640625 -1.75q0 -1.40625 1.125 -2.28125q1.140625 -0.890625 2.796875 -0.890625zm13.745209 0.25l0 1.9375l-5.53125 0l0 2.234375l5.0625 0l0 1.796875l-5.0625 0l0 2.5625l5.640625 0l0 1.9375l-7.9375 0l0 -10.46875l7.828125 0zm7.3714905 0q1.265625 0 2.125 0.828125q0.875 0.8125 0.875 2.0625q0 1.0 -0.421875 1.65625q-0.40625 0.640625 -1.234375 0.96875l0 0.03125q0.734375 0.1875 1.125 0.875q0.390625 0.6875 0.4375 2.109375q0.015625 1.421875 0.40625 1.9375l-2.3125 0q-0.203125 -0.515625 -0.265625 -1.640625q-0.109375 -1.546875 -0.53125 -2.0q-0.40625 -0.453125 -1.25 -0.453125l-2.359375 0l0 4.09375l-2.296875 0l0 -10.46875l5.703125 0zm-0.84375 4.734375q0.734375 0 1.125 -0.34375q0.40625 -0.359375 0.40625 -1.15625q0 -0.734375 -0.390625 -1.078125q-0.375 -0.359375 -1.140625 -0.359375l-2.5625 0l0 2.9375l2.5625 0zm6.9592896 -4.734375l2.34375 7.359375l0.015625 0l2.375 -7.359375l2.375 0l-3.484375 10.46875l-2.59375 0l-3.390625 -10.46875l2.359375 0zm15.82547 0l0 1.9375l-5.53125 0l0 2.234375l5.0625 0l0 1.796875l-5.0625 0l0 2.5625l5.640625 0l0 1.9375l-7.9375 0l0 -10.46875l7.828125 0zm7.3714905 0q1.265625 0 2.125 0.828125q0.875 0.8125 0.875 2.0625q0 1.0 -0.421875 1.65625q-0.40625 0.640625 -1.234375 0.96875l0 0.03125q0.734375 0.1875 1.125 0.875q0.390625 0.6875 0.4375 2.109375q0.015625 1.421875 0.40625 1.9375l-2.3125 0q-0.203125 -0.515625 -0.265625 -1.640625q-0.109375 -1.546875 -0.53125 -2.0q-0.40625 -0.453125 -1.25 -0.453125l-2.359375 0l0 4.09375l-2.296875 0l0 -10.46875l5.703125 0zm-0.84375 4.734375q0.734375 0 1.125 -0.34375q0.40625 -0.359375 0.40625 -1.15625q0 -0.734375 -0.390625 -1.078125q-0.375 -0.359375 -1.140625 -0.359375l-2.5625 0l0 2.9375l2.5625 0z" fill-rule="nonzero"/><path fill="#ffffff" d="m612.1122 105.13187l0 0c0 -0.5111389 0.41436768 -0.92549133 0.9254761 -0.92549133l69.64508 0c0.2454834 0 0.480896 0.09750366 0.65441895 0.27106476c0.17358398 0.17356873 0.27105713 0.40896606 0.27105713 0.6544266l0 27.75531c0 0.5111389 -0.41430664 0.92549133 -0.9254761 0.92549133l-69.64508 0l0 0c-0.5111084 0 -0.9254761 -0.41435242 -0.9254761 -0.92549133z" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m612.1122 105.13187l0 0c0 -0.5111389 0.41436768 -0.92549133 0.9254761 -0.92549133l69.64508 0c0.2454834 0 0.480896 0.09750366 0.65441895 0.27106476c0.17358398 0.17356873 0.27105713 0.40896606 0.27105713 0.6544266l0 27.75531c0 0.5111389 -0.41430664 0.92549133 -0.9254761 0.92549133l-69.64508 0l0 0c-0.5111084 0 -0.9254761 -0.41435242 -0.9254761 -0.92549133z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m666.8694 101.53694l155.40155 0l0 37.16536l-155.40155 0z" fill-rule="evenodd"/><path fill="#4e515d" d="m703.1088 114.14819l0 10.46875l-2.296875 0l0 -10.46875l2.296875 0zm4.3068237 0l4.375 7.03125l0.015625 0l0 -7.03125l2.15625 0l0 10.46875l-2.296875 0l-4.359375 -7.0l-0.03125 0l0 7.0l-2.140625 0l0 -10.46875l2.28125 0zm16.332092 0l0 1.9375l-3.140625 0l0 8.53125l-2.296875 0l0 -8.53125l-3.140625 0l0 -1.9375l8.578125 0zm9.030762 0l0 1.9375l-5.53125 0l0 2.234375l5.0625 0l0 1.796875l-5.0625 0l0 2.5625l5.640625 0l0 1.9375l-7.9375 0l0 -10.46875l7.828125 0zm3.949646 0l4.375 7.03125l0.015625 0l0 -7.03125l2.15625 0l0 10.46875l-2.296875 0l-4.359375 -7.0l-0.03125 0l0 7.0l-2.140625 0l0 -10.46875l2.28125 0zm16.332092 0l0 1.9375l-3.140625 0l0 8.53125l-2.296875 0l0 -8.53125l-3.140625 0l0 -1.9375l8.578125 0zm3.4995117 0l0 10.46875l-2.296875 0l0 -10.46875l2.296875 0zm6.7130737 -0.25q2.328125 0 3.734375 1.578125q1.40625 1.5625 1.40625 3.953125q0 2.34375 -1.421875 3.890625q-1.40625 1.546875 -3.71875 1.546875q-1.515625 0 -2.6875 -0.6875q-1.171875 -0.703125 -1.8125 -1.953125q-0.640625 -1.265625 -0.640625 -2.796875q0 -2.421875 1.40625 -3.96875q1.421875 -1.5625 3.734375 -1.5625zm-2.84375 5.53125q0 1.546875 0.734375 2.53125q0.75 0.96875 2.109375 0.96875q1.359375 0 2.09375 -0.953125q0.75 -0.96875 0.75 -2.546875q0 -1.65625 -0.765625 -2.625q-0.75 -0.96875 -2.09375 -0.96875q-1.34375 0 -2.09375 0.984375q-0.734375 0.984375 -0.734375 2.609375zm11.837585 -5.28125l4.375 7.03125l0.015625 0l0 -7.03125l2.15625 0l0 10.46875l-2.296875 0l-4.359375 -7.0l-0.03125 0l0 7.0l-2.140625 0l0 -10.46875l2.28125 0zm12.175903 -0.25q1.90625 0 3.046875 0.890625q1.140625 0.875 1.140625 2.484375l-2.21875 0q-0.046875 -0.78125 -0.546875 -1.171875q-0.484375 -0.40625 -1.515625 -0.40625q-0.6875 0 -1.140625 0.3125q-0.453125 0.296875 -0.453125 0.875q0 0.390625 0.1875 0.59375q0.1875 0.1875 0.765625 0.40625q0.578125 0.203125 2.515625 0.65625q1.296875 0.3125 2.03125 1.0625q0.734375 0.75 0.734375 1.90625q0 1.515625 -1.140625 2.4375q-1.140625 0.921875 -3.203125 0.921875q-1.984375 0 -3.234375 -0.96875q-1.234375 -0.984375 -1.234375 -2.6875l0 -0.0625l2.21875 0q0.015625 0.96875 0.65625 1.453125q0.640625 0.484375 1.671875 0.484375q0.921875 0 1.46875 -0.34375q0.5625 -0.34375 0.5625 -0.96875q0 -0.5 -0.421875 -0.828125q-0.421875 -0.328125 -1.359375 -0.5625q-1.203125 -0.28125 -2.1875 -0.578125q-0.984375 -0.296875 -1.625 -0.984375q-0.640625 -0.6875 -0.640625 -1.75q0 -1.40625 1.125 -2.28125q1.140625 -0.890625 2.796875 -0.890625z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m127.416336 101.53694l155.40157 0l0 37.16536l-155.40157 0z" fill-rule="evenodd"/><path fill="#4e515d" d="m163.65578 114.14819l0 10.46875l-2.296875 0l0 -10.46875l2.296875 0zm4.3068237 0l4.375 7.03125l0.015625 0l0 -7.03125l2.15625 0l0 10.46875l-2.296875 0l-4.359375 -7.0l-0.03125 0l0 7.0l-2.140625 0l0 -10.46875l2.28125 0zm16.332123 0l0 1.9375l-3.140625 0l0 8.53125l-2.296875 0l0 -8.53125l-3.140625 0l0 -1.9375l8.578125 0zm9.030746 0l0 1.9375l-5.53125 0l0 2.234375l5.0625 0l0 1.796875l-5.0625 0l0 2.5625l5.640625 0l0 1.9375l-7.9375 0l0 -10.46875l7.828125 0zm3.9496307 0l4.375 7.03125l0.015625 0l0 -7.03125l2.15625 0l0 10.46875l-2.296875 0l-4.359375 -7.0l-0.03125 0l0 7.0l-2.140625 0l0 -10.46875l2.28125 0zm16.332123 0l0 1.9375l-3.140625 0l0 8.53125l-2.296875 0l0 -8.53125l-3.140625 0l0 -1.9375l8.578125 0zm3.4994965 0l0 10.46875l-2.296875 0l0 -10.46875l2.296875 0zm6.7130737 -0.25q2.328125 0 3.734375 1.578125q1.40625 1.5625 1.40625 3.953125q0 2.34375 -1.421875 3.890625q-1.40625 1.546875 -3.71875 1.546875q-1.515625 0 -2.6875 -0.6875q-1.171875 -0.703125 -1.8125 -1.953125q-0.640625 -1.265625 -0.640625 -2.796875q0 -2.421875 1.40625 -3.96875q1.421875 -1.5625 3.734375 -1.5625zm-2.84375 5.53125q0 1.546875 0.734375 2.53125q0.75 0.96875 2.109375 0.96875q1.359375 0 2.09375 -0.953125q0.75 -0.96875 0.75 -2.546875q0 -1.65625 -0.765625 -2.625q-0.75 -0.96875 -2.09375 -0.96875q-1.34375 0 -2.09375 0.984375q-0.734375 0.984375 -0.734375 2.609375zm11.837601 -5.28125l4.375 7.03125l0.015625 0l0 -7.03125l2.15625 0l0 10.46875l-2.296875 0l-4.359375 -7.0l-0.03125 0l0 7.0l-2.140625 0l0 -10.46875l2.28125 0zm12.175873 -0.25q1.90625 0 3.046875 0.890625q1.140625 0.875 1.140625 2.484375l-2.21875 0q-0.046875 -0.78125 -0.546875 -1.171875q-0.484375 -0.40625 -1.515625 -0.40625q-0.6875 0 -1.140625 0.3125q-0.453125 0.296875 -0.453125 0.875q0 0.390625 0.1875 0.59375q0.1875 0.1875 0.765625 0.40625q0.578125 0.203125 2.515625 0.65625q1.296875 0.3125 2.03125 1.0625q0.734375 0.75 0.734375 1.90625q0 1.515625 -1.140625 2.4375q-1.140625 0.921875 -3.203125 0.921875q-1.984375 0 -3.234375 -0.96875q-1.234375 -0.984375 -1.234375 -2.6875l0 -0.0625l2.21875 0q0.015625 0.96875 0.65625 1.453125q0.640625 0.484375 1.671875 0.484375q0.921875 0 1.46875 -0.34375q0.5625 -0.34375 0.5625 -0.96875q0 -0.5 -0.421875 -0.828125q-0.421875 -0.328125 -1.359375 -0.5625q-1.203125 -0.28125 -2.1875 -0.578125q-0.984375 -0.296875 -1.625 -0.984375q-0.640625 -0.6875 -0.640625 -1.75q0 -1.40625 1.125 -2.28125q1.140625 -0.890625 2.796875 -0.890625z" fill-rule="nonzero"/><path fill="#e03875" d="m280.54016 129.08702c-0.460083 0 -0.84906006 -0.37654114 -0.84906006 -0.8500061c0 -0.47346497 0.37643433 -0.8500061 0.84906006 -0.8500061l28.417114 0c0.46011353 0 0.8490906 0.37654114 0.8490906 0.8500061c0 0.47346497 -0.37643433 0.8500061 -0.8490906 0.8500061l-28.417114 0zm0 -9.215828c-0.460083 0 -0.84906006 -0.3765335 -0.84906006 -0.8499985c0 -0.4734726 0.37643433 -0.8500061 0.84906006 -0.8500061l28.417114 0c0.46011353 0 0.8490906 0.3765335 0.8490906 0.8500061c0 0.47346497 -0.37643433 0.8499985 -0.8490906 0.8499985l-28.417114 0zm0 -9.21582c-0.460083 0 -0.84906006 -0.37654114 -0.84906006 -0.8500061c0 -0.47346497 0.37643433 -0.8499985 0.84906006 -0.8499985l28.417114 0c0.46011353 0 0.8490906 0.3765335 0.8490906 0.8499985c0 0.47346497 -0.37643433 0.8500061 -0.8490906 0.8500061l-28.417114 0z" fill-rule="evenodd"/><path fill="#e03875" d="m624.88617 129.08702c-0.46014404 0 -0.8491211 -0.37654114 -0.8491211 -0.8500061c0 -0.47346497 0.37646484 -0.8500061 0.8491211 -0.8500061l28.417053 0c0.46014404 0 0.8491211 0.37654114 0.8491211 0.8500061c0 0.47346497 -0.37646484 0.8500061 -0.8491211 0.8500061l-28.417053 0zm0 -9.215828c-0.46014404 0 -0.8491211 -0.3765335 -0.8491211 -0.8499985c0 -0.4734726 0.37646484 -0.8500061 0.8491211 -0.8500061l28.417053 0c0.46014404 0 0.8491211 0.3765335 0.8491211 0.8500061c0 0.47346497 -0.37646484 0.8499985 -0.8491211 0.8499985l-28.417053 0zm0 -9.21582c-0.46014404 0 -0.8491211 -0.37654114 -0.8491211 -0.8500061c0 -0.47346497 0.37646484 -0.8499985 0.8491211 -0.8499985l28.417053 0c0.46014404 0 0.8491211 0.3765335 0.8491211 0.8499985c0 0.47346497 -0.37646484 0.8500061 -0.8491211 0.8500061l-28.417053 0z" fill-rule="evenodd"/><path fill="#dc477d" d="m659.0366 112.972206l0 0c0 -0.7705078 0.6246338 -1.3951263 1.3951416 -1.3951263l30.690063 0c0.36999512 0 0.7248535 0.14698792 0.9864502 0.40862274c0.2616577 0.26163483 0.40863037 0.6164932 0.40863037 0.9865036l0 30.690056c0 0.7705078 -0.62457275 1.3951263 -1.3950806 1.3951263l-30.690063 0c-0.7705078 0 -1.3951416 -0.62461853 -1.3951416 -1.3951263z" fill-rule="evenodd"/><path fill="#dc477d" d="m315.2149 112.972206l0 0c0 -0.7705078 0.6246338 -1.3951263 1.3951416 -1.3951263l30.690063 0c0.36999512 0 0.7248535 0.14698792 0.9864807 0.40862274c0.2616577 0.26163483 0.40863037 0.6164932 0.40863037 0.9865036l0 30.690056c0 0.7705078 -0.6246033 1.3951263 -1.3951111 1.3951263l-30.690063 0c-0.7705078 0 -1.3951416 -0.62461853 -1.3951416 -1.3951263z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m228.82674 276.68085l139.84251 0l0 35.55905l-139.84251 0z" fill-rule="evenodd"/><path fill="#dc477d" d="m249.62402 288.73087q1.625 0 2.765625 0.921875q1.140625 0.921875 1.328125 2.515625l-2.015625 0q-0.140625 -0.75 -0.75 -1.203125q-0.59375 -0.46875 -1.328125 -0.46875q-1.234375 0 -1.921875 0.890625q-0.671875 0.890625 -0.671875 2.375q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q0.90625 0 1.453125 -0.5625q0.5625 -0.5625 0.703125 -1.5625l2.03125 0q-0.1875 1.8125 -1.328125 2.859375q-1.125 1.03125 -2.859375 1.03125q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.1875 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm9.878967 0q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0625153 -0.640625 -1.6562653 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.2812653 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm10.773285 -4.796875l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm11.082092 -0.234375q1.71875 0 2.75 0.8125q1.046875 0.796875 1.046875 2.265625l-2.015625 0q-0.046875 -0.71875 -0.5 -1.078125q-0.4375 -0.359375 -1.375 -0.359375q-0.640625 0 -1.046875 0.28125q-0.40625 0.265625 -0.40625 0.796875q0 0.359375 0.171875 0.53125q0.171875 0.171875 0.6875 0.375q0.53125 0.1875 2.296875 0.59375q1.1875 0.296875 1.84375 0.984375q0.671875 0.671875 0.671875 1.71875q0 1.390625 -1.046875 2.234375q-1.03125 0.828125 -2.90625 0.828125q-1.796875 0 -2.9375 -0.890625q-1.125 -0.890625 -1.125 -2.453125l0 -0.046875l2.03125 0q0 0.890625 0.578125 1.328125q0.578125 0.421875 1.515625 0.421875q0.859375 0 1.359375 -0.296875q0.5 -0.3125 0.5 -0.875q0 -0.46875 -0.390625 -0.765625q-0.375 -0.296875 -1.234375 -0.515625q-1.09375 -0.234375 -1.984375 -0.515625q-0.890625 -0.28125 -1.484375 -0.890625q-0.578125 -0.625 -0.578125 -1.59375q0 -1.28125 1.03125 -2.078125q1.03125 -0.8125 2.546875 -0.8125zm7.4145813 0.234375l0 5.96875q0 1.03125 0.46875 1.53125q0.484375 0.484375 1.5 0.484375q1.09375 0 1.53125 -0.484375q0.4375 -0.484375 0.4375 -1.515625l0 -5.984375l2.09375 0l0 5.984375q0 1.765625 -1.03125 2.765625q-1.03125 1.0 -3.03125 1.0q-2.015625 0 -3.046875 -0.984375q-1.015625 -0.984375 -1.015625 -2.78125l0 -5.984375l2.09375 0zm9.925842 0l0 7.765625l4.640625 0l0 1.75l-6.734375 0l0 -9.515625l2.09375 0zm13.775421 -0.234375q1.625 0 2.765625 0.921875q1.140625 0.921875 1.328125 2.515625l-2.015625 0q-0.140625 -0.75 -0.75 -1.203125q-0.59375 -0.46875 -1.328125 -0.46875q-1.234375 0 -1.921875 0.890625q-0.671875 0.890625 -0.671875 2.375q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q0.90625 0 1.453125 -0.5625q0.5625 -0.5625 0.703125 -1.5625l2.03125 0q-0.1875 1.8125 -1.328125 2.859375q-1.125 1.03125 -2.859375 1.03125q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.1875 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm7.707062 0.234375l0 7.765625l4.640625 0l0 1.75l-6.734375 0l0 -9.515625l2.09375 0zm7.9005737 0l0 9.515625l-2.09375 0l0 -9.515625l2.09375 0zm8.946381 0l0 1.765625l-5.015625 0l0 2.03125l4.609375 0l0 1.625l-4.609375 0l0 2.34375l5.125 0l0 1.75l-7.21875 0l0 -9.515625l7.109375 0zm3.6047058 0l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm14.847687 0l0 1.765625l-2.859375 0l0 7.75l-2.078125 0l0 -7.75l-2.859375 0l0 -1.765625l7.796875 0z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m580.48737 278.31738l134.70868 0l0 35.55905l-134.70868 0z" fill-rule="evenodd"/><path fill="#dc477d" d="m598.7177 290.36737q1.625 0 2.765625 0.921875q1.140625 0.921875 1.328125 2.515625l-2.015625 0q-0.140625 -0.75 -0.75 -1.203125q-0.59375 -0.46875 -1.328125 -0.46875q-1.234375 0 -1.921875 0.890625q-0.671875 0.890625 -0.671875 2.375q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q0.90625 0 1.453125 -0.5625q0.5625 -0.5625 0.703125 -1.5625l2.03125 0q-0.1875 1.8125 -1.328125 2.859375q-1.125 1.03125 -2.859375 1.03125q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.1875 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm9.878967 0q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm10.773315 -4.796875l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm11.082092 -0.234375q1.71875 0 2.75 0.8125q1.046875 0.796875 1.046875 2.265625l-2.015625 0q-0.046875 -0.71875 -0.5 -1.078125q-0.4375 -0.359375 -1.375 -0.359375q-0.640625 0 -1.046875 0.28125q-0.40625 0.265625 -0.40625 0.796875q0 0.359375 0.171875 0.53125q0.171875 0.171875 0.6875 0.375q0.53125 0.1875 2.296875 0.59375q1.1875 0.296875 1.84375 0.984375q0.671875 0.671875 0.671875 1.71875q0 1.390625 -1.046875 2.234375q-1.03125 0.828125 -2.90625 0.828125q-1.796875 0 -2.9375 -0.890625q-1.125 -0.890625 -1.125 -2.453125l0 -0.046875l2.03125 0q0 0.890625 0.578125 1.328125q0.578125 0.421875 1.515625 0.421875q0.859375 0 1.359375 -0.296875q0.5 -0.3125 0.5 -0.875q0 -0.46875 -0.390625 -0.765625q-0.375 -0.296875 -1.234375 -0.515625q-1.09375 -0.234375 -1.984375 -0.515625q-0.890625 -0.28125 -1.484375 -0.890625q-0.578125 -0.625 -0.578125 -1.59375q0 -1.28125 1.03125 -2.078125q1.03125 -0.8125 2.546875 -0.8125zm7.414551 0.234375l0 5.96875q0 1.03125 0.46875 1.53125q0.484375 0.484375 1.5 0.484375q1.09375 0 1.53125 -0.484375q0.4375 -0.484375 0.4375 -1.515625l0 -5.984375l2.09375 0l0 5.984375q0 1.765625 -1.03125 2.765625q-1.03125 1.0 -3.03125 1.0q-2.015625 0 -3.046875 -0.984375q-1.015625 -0.984375 -1.015625 -2.78125l0 -5.984375l2.09375 0zm9.925842 0l0 7.765625l4.640625 0l0 1.75l-6.734375 0l0 -9.515625l2.09375 0zm13.775452 -0.234375q1.625 0 2.765625 0.921875q1.140625 0.921875 1.328125 2.515625l-2.015625 0q-0.140625 -0.75 -0.75 -1.203125q-0.59375 -0.46875 -1.328125 -0.46875q-1.234375 0 -1.921875 0.890625q-0.671875 0.890625 -0.671875 2.375q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q0.90625 0 1.453125 -0.5625q0.5625 -0.5625 0.703125 -1.5625l2.03125 0q-0.1875 1.8125 -1.328125 2.859375q-1.125 1.03125 -2.859375 1.03125q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.1875 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm7.7070312 0.234375l0 7.765625l4.640625 0l0 1.75l-6.734375 0l0 -9.515625l2.09375 0zm7.9005737 0l0 9.515625l-2.09375 0l0 -9.515625l2.09375 0zm8.946411 0l0 1.765625l-5.015625 0l0 2.03125l4.609375 0l0 1.625l-4.609375 0l0 2.34375l5.125 0l0 1.75l-7.21875 0l0 -9.515625l7.109375 0zm3.6046753 0l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm14.847717 0l0 1.765625l-2.859375 0l0 7.75l-2.078125 0l0 -7.75l-2.859375 0l0 -1.765625l7.796875 0z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m343.3573 444.64255l259.84253 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="2.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m350.9373 444.64255l244.68253 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="2.0" stroke-linecap="butt" d="m344.3573 444.64255c0 -1.8170166 1.472992 -3.2900085 3.2900085 -3.2900085c1.8170166 0 3.2900085 1.472992 3.2900085 3.2900085c0 1.8170166 -1.472992 3.2900085 -3.2900085 3.2900085c-1.8170166 0 -3.2900085 -1.472992 -3.2900085 -3.2900085z" fill-rule="nonzero"/><path stroke="#e03875" stroke-width="2.0" stroke-linecap="butt" d="m602.1998 444.64255c0 1.8170166 -1.4729614 3.2900085 -3.289978 3.2900085c-1.8170166 0 -3.289978 -1.472992 -3.289978 -3.2900085c0 -1.8170166 1.4729614 -3.2900085 3.289978 -3.2900085c1.8170166 0 3.289978 1.472992 3.289978 3.2900085z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m298.748 312.2399l0 73.7323" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m298.748 312.2399l0 67.7323" fill-rule="evenodd"/><path fill="#e03875" stroke="#e03875" stroke-width="1.0" stroke-linecap="butt" d="m297.09625 379.9722l1.6517334 4.538086l1.6517334 -4.538086z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m647.84174 313.87643l0.03149414 72.12598" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m647.8417 313.87643l0.028869629 66.12598" fill-rule="evenodd"/><path fill="#e03875" stroke="#e03875" stroke-width="1.0" stroke-linecap="butt" d="m646.2189 380.00314l1.6536865 4.537384l1.6497192 -4.5388184z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m672.51337 432.07346l-49.35431 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m672.51337 432.07346l-43.35431 0" fill-rule="evenodd"/><path fill="#e03875" stroke="#e03875" stroke-width="1.0" stroke-linecap="butt" d="m629.15906 430.42172l-4.538147 1.6517334l4.538147 1.6517334z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m623.1696 457.24615l49.35437 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m623.1696 457.24615l43.35431 0" fill-rule="evenodd"/><path fill="#e03875" stroke="#e03875" stroke-width="1.0" stroke-linecap="butt" d="m666.5239 458.8979l4.538147 -1.6517334l-4.538147 -1.6517334z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m238.66493 486.155l112.157486 0l0 35.55905l-112.157486 0z" fill-rule="evenodd"/><path fill="#dc477d" d="m276.83417 498.43936q1.484375 0 2.34375 0.84375q0.875 0.828125 0.875 2.203125q0 1.375 -0.875 2.21875q-0.859375 0.84375 -2.34375 0.84375l-2.265625 0l0 3.40625l-2.09375 0l0 -9.515625l4.359375 0zm-0.578125 4.484375q0.890625 0 1.328125 -0.34375q0.4375 -0.34375 0.4375 -1.09375q0 -0.71875 -0.421875 -1.0625q-0.421875 -0.359375 -1.34375 -0.359375l-1.6875 0l0 2.859375l1.6875 0zm10.2960205 -4.484375q1.140625 0 1.9375 0.75q0.796875 0.734375 0.796875 1.875q0 0.90625 -0.375 1.5q-0.375 0.578125 -1.140625 0.890625l0 0.015625q0.671875 0.1875 1.03125 0.8125q0.359375 0.625 0.390625 1.90625q0.015625 1.296875 0.375 1.765625l-2.109375 0q-0.171875 -0.46875 -0.234375 -1.5q-0.109375 -1.40625 -0.484375 -1.8125q-0.375 -0.40625 -1.140625 -0.40625l-2.140625 0l0 3.71875l-2.09375 0l0 -9.515625l5.1875 0zm-0.765625 4.296875q0.65625 0 1.015625 -0.3125q0.375 -0.3125 0.375 -1.046875q0 -0.671875 -0.359375 -0.984375q-0.34375 -0.328125 -1.03125 -0.328125l-2.328125 0l0 2.671875l2.328125 0zm9.468903 -4.53125q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm10.102722 -4.796875l1.875 3.046875l1.921875 -3.046875l2.296875 0l-3.046875 4.546875l3.3125 4.96875l-2.5 0l-2.0625 -3.296875l-2.125 3.296875l-2.359375 0l3.328125 -4.984375l-3.0625 -4.53125l2.421875 0zm8.51474 0l2.234375 3.75l2.203125 -3.75l2.328125 0l-3.515625 5.859375l0 3.65625l-2.09375 0l0 -3.703125l-3.5 -5.8125l2.34375 0z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m591.7826 486.155l112.15747 0l0 35.55905l-112.15747 0z" fill-rule="evenodd"/><path fill="#dc477d" d="m629.95184 498.43936q1.484375 0 2.34375 0.84375q0.875 0.828125 0.875 2.203125q0 1.375 -0.875 2.21875q-0.859375 0.84375 -2.34375 0.84375l-2.265625 0l0 3.40625l-2.09375 0l0 -9.515625l4.359375 0zm-0.578125 4.484375q0.890625 0 1.328125 -0.34375q0.4375 -0.34375 0.4375 -1.09375q0 -0.71875 -0.421875 -1.0625q-0.421875 -0.359375 -1.34375 -0.359375l-1.6875 0l0 2.859375l1.6875 0zm10.2960205 -4.484375q1.140625 0 1.9375 0.75q0.796875 0.734375 0.796875 1.875q0 0.90625 -0.375 1.5q-0.375 0.578125 -1.140625 0.890625l0 0.015625q0.671875 0.1875 1.03125 0.8125q0.359375 0.625 0.390625 1.90625q0.015625 1.296875 0.375 1.765625l-2.109375 0q-0.171875 -0.46875 -0.234375 -1.5q-0.109375 -1.40625 -0.484375 -1.8125q-0.375 -0.40625 -1.140625 -0.40625l-2.140625 0l0 3.71875l-2.09375 0l0 -9.515625l5.1875 0zm-0.765625 4.296875q0.65625 0 1.015625 -0.3125q0.375 -0.3125 0.375 -1.046875q0 -0.671875 -0.359375 -0.984375q-0.34375 -0.328125 -1.03125 -0.328125l-2.328125 0l0 2.671875l2.328125 0zm9.468872 -4.53125q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm10.102722 -4.796875l1.875 3.046875l1.921875 -3.046875l2.296875 0l-3.046875 4.546875l3.3125 4.96875l-2.5 0l-2.0625 -3.296875l-2.125 3.296875l-2.359375 0l3.328125 -4.984375l-3.0625 -4.53125l2.421875 0zm8.5147705 0l2.234375 3.75l2.203125 -3.75l2.328125 0l-3.515625 5.859375l0 3.65625l-2.09375 0l0 -3.703125l-3.5 -5.8125l2.34375 0z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m401.31567 337.4117l155.40161 0l0 67.87402l-155.40161 0z" fill-rule="evenodd"/><path fill="#4e515d" d="m438.945 349.4617q1.625 0 2.765625 0.921875q1.140625 0.921875 1.328125 2.515625l-2.015625 0q-0.140625 -0.75 -0.75 -1.203125q-0.59375 -0.46875 -1.328125 -0.46875q-1.234375 0 -1.921875 0.890625q-0.671875 0.890625 -0.671875 2.375q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q0.90625 0 1.453125 -0.5625q0.5625 -0.5625 0.703125 -1.5625l2.03125 0q-0.1875 1.8125 -1.328125 2.859375q-1.125 1.03125 -2.859375 1.03125q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.1875 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm9.878967 0q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm10.773285 -4.796875l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm9.878967 0l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm14.910187 0l0 1.765625l-5.015625 0l0 2.03125l4.609375 0l0 1.625l-4.609375 0l0 2.34375l5.125 0l0 1.75l-7.21875 0l0 -9.515625l7.109375 0zm5.792206 -0.234375q1.625 0 2.765625 0.921875q1.140625 0.921875 1.328125 2.515625l-2.015625 0q-0.140625 -0.75 -0.75 -1.203125q-0.59375 -0.46875 -1.328125 -0.46875q-1.234375 0 -1.921875 0.890625q-0.671875 0.890625 -0.671875 2.375q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q0.90625 0 1.453125 -0.5625q0.5625 -0.5625 0.703125 -1.5625l2.03125 0q-0.1875 1.8125 -1.328125 2.859375q-1.125 1.03125 -2.859375 1.03125q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.1875 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm12.341187 0.234375l0 1.765625l-2.859375 0l0 7.75l-2.078125 0l0 -7.75l-2.859375 0l0 -1.765625l7.796875 0zm3.1882324 0l0 9.515625l-2.09375 0l0 -9.515625l2.09375 0zm6.1026306 -0.234375q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm10.773315 -4.796875l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0z" fill-rule="nonzero"/><path fill="#4e515d" d="m440.7023 365.69608l3.5625 9.515625l-2.171875 0l-0.71875 -2.125l-3.5625 0l-0.734375 2.125l-2.125 0l3.609375 -9.515625l2.140625 0zm-1.09375 2.34375l-1.25 3.5l2.46875 0l-1.1875 -3.5l-0.03125 0zm7.3740234 -2.34375l0 5.96875q0 1.03125 0.46875 1.53125q0.484375 0.484375 1.5 0.484375q1.09375 0 1.53125 -0.484375q0.4375 -0.484375 0.4375 -1.515625l0 -5.984375l2.09375 0l0 5.984375q0 1.765625 -1.03125 2.765625q-1.03125 1.0 -3.03125 1.0q-2.015625 0 -3.046875 -0.984375q-1.015625 -0.984375 -1.015625 -2.78125l0 -5.984375l2.09375 0zm14.878967 0l0 1.765625l-2.859375 0l0 7.75l-2.078125 0l0 -7.75l-2.859375 0l0 -1.765625l7.796875 0zm3.1882324 0l0 3.65625l3.84375 0l0 -3.65625l2.09375 0l0 9.515625l-2.09375 0l0 -4.109375l-3.84375 0l0 4.109375l-2.09375 0l0 -9.515625l2.09375 0zm12.050812 -0.234375q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0625 -0.640625 -1.65625 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.28125 -3.609375q1.296875 -1.421875 3.40625 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm13.88269 -4.796875q1.140625 0 1.9375 0.75q0.796875 0.734375 0.796875 1.875q0 0.90625 -0.375 1.5q-0.375 0.578125 -1.140625 0.890625l0 0.015625q0.671875 0.1875 1.03125 0.8125q0.359375 0.625 0.390625 1.90625q0.015625 1.296875 0.375 1.765625l-2.109375 0q-0.171875 -0.46875 -0.234375 -1.5q-0.109375 -1.40625 -0.484375 -1.8125q-0.375 -0.40625 -1.140625 -0.40625l-2.140625 0l0 3.71875l-2.09375 0l0 -9.515625l5.1875 0zm-0.765625 4.296875q0.65625 0 1.015625 -0.3125q0.375 -0.3125 0.375 -1.046875q0 -0.671875 -0.359375 -0.984375q-0.34375 -0.328125 -1.03125 -0.328125l-2.328125 0l0 2.671875l2.328125 0zm7.2970276 -4.296875l0 9.515625l-2.09375 0l0 -9.515625l2.09375 0zm9.118256 0l0 1.65625l-5.109375 6.109375l5.234375 0l0 1.75l-8.015625 0l0 -1.65625l5.09375 -6.09375l-4.703125 0l0 -1.765625l7.5 0zm8.46405 0l0 1.765625l-5.0155945 0l0 2.03125l4.6093445 0l0 1.625l-4.6093445 0l0 2.34375l5.1249695 0l0 1.75l-7.2187195 0l0 -9.515625l7.1093445 0zm5.6984863 0q1.890625 0 3.0625 1.25q1.1875 1.234375 1.1875 3.453125q0 2.234375 -1.15625 3.53125q-1.140625 1.28125 -3.09375 1.28125l-4.171875 0l0 -9.515625l4.171875 0zm-0.171875 7.765625q1.0 0 1.65625 -0.71875q0.671875 -0.734375 0.671875 -2.15625q0 -1.640625 -0.6875 -2.375q-0.6875 -0.75 -2.0 -0.75l-1.546875 0l0 6.0l1.90625 0z" fill-rule="nonzero"/><path fill="#4e515d" d="m421.32367 381.69608l1.5 6.46875l0.015625 0l1.65625 -6.46875l1.96875 0l1.625 6.546875l0.015625 0l1.5625 -6.546875l2.0625 0l-2.5625 9.515625l-2.078125 0l-1.609375 -6.46875l-0.03125 0l-1.59375 6.46875l-2.109375 0l-2.53125 -9.515625l2.109375 0zm13.454742 0l0 9.515625l-2.09375 0l0 -9.515625l2.09375 0zm8.883881 0l0 1.765625l-2.859375 0l0 7.75l-2.078125 0l0 -7.75l-2.859375 0l0 -1.765625l7.796875 0zm3.1882324 0l0 3.65625l3.84375 0l0 -3.65625l2.09375 0l0 9.515625l-2.09375 0l0 -4.109375l-3.84375 0l0 4.109375l-2.09375 0l0 -9.515625l2.09375 0zm13.58194 0l0 9.515625l-2.09375 0l0 -9.515625l2.09375 0zm3.9151306 0l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm14.847687 0l0 1.765625l-2.859375 0l0 7.75l-2.078125 0l0 -7.75l-2.859375 0l0 -1.765625l7.796875 0zm8.203857 0l0 1.765625l-5.015625 0l0 2.03125l4.609375 0l0 1.625l-4.609375 0l0 2.34375l5.125 0l0 1.75l-7.21875 0l0 -9.515625l7.109375 0zm3.6047058 0l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm14.847717 0l0 1.765625l-2.859375 0l0 7.75l-2.078125 0l0 -7.75l-2.859375 0l0 -1.765625l7.796875 0zm3.1882324 0l0 9.515625l-2.09375 0l0 -9.515625l2.09375 0zm6.1026 -0.234375q2.125 0 3.390625 1.4375q1.28125 1.421875 1.28125 3.59375q0 2.125 -1.28125 3.546875q-1.28125 1.40625 -3.390625 1.40625q-1.375 0 -2.453125 -0.625q-1.0624695 -0.640625 -1.6562195 -1.78125q-0.578125 -1.140625 -0.578125 -2.546875q0 -2.203125 1.28125 -3.609375q1.2968445 -1.421875 3.4062195 -1.421875zm-2.59375 5.03125q0 1.40625 0.671875 2.296875q0.671875 0.890625 1.921875 0.890625q1.234375 0 1.90625 -0.875q0.671875 -0.875 0.671875 -2.3125q0 -1.5 -0.6875 -2.375q-0.6875 -0.890625 -1.90625 -0.890625q-1.21875 0 -1.90625 0.890625q-0.671875 0.890625 -0.671875 2.375zm10.773315 -4.796875l3.96875 6.390625l0.03125 0l0 -6.390625l1.953125 0l0 9.515625l-2.09375 0l-3.953125 -6.375l-0.03125 0l0 6.375l-1.953125 0l0 -9.515625l2.078125 0zm11.082092 -0.234375q1.71875 0 2.75 0.8125q1.046875 0.796875 1.046875 2.265625l-2.015625 0q-0.046875 -0.71875 -0.5 -1.078125q-0.4375 -0.359375 -1.375 -0.359375q-0.640625 0 -1.046875 0.28125q-0.40625 0.265625 -0.40625 0.796875q0 0.359375 0.171875 0.53125q0.171875 0.171875 0.6875 0.375q0.53125 0.1875 2.296875 0.59375q1.1875 0.296875 1.84375 0.984375q0.671875 0.671875 0.671875 1.71875q0 1.390625 -1.046875 2.234375q-1.03125 0.828125 -2.90625 0.828125q-1.796875 0 -2.9375 -0.890625q-1.125 -0.890625 -1.125 -2.453125l0 -0.046875l2.03125 0q0 0.890625 0.578125 1.328125q0.578125 0.421875 1.515625 0.421875q0.859375 0 1.359375 -0.296875q0.5 -0.3125 0.5 -0.875q0 -0.46875 -0.390625 -0.765625q-0.375 -0.296875 -1.234375 -0.515625q-1.09375 -0.234375 -1.984375 -0.515625q-0.890625 -0.28125 -1.484375 -0.890625q-0.578125 -0.625 -0.578125 -1.59375q0 -1.28125 1.03125 -2.078125q1.03125 -0.8125 2.546875 -0.8125z" fill-rule="nonzero"/><path fill="#ffffff" d="m739.0079 410.3251l0 0c0 -1.234314 1.0006714 -2.2349548 2.2349854 -2.2349548l67.02612 0c0.59277344 0 1.1612549 0.23547363 1.5803833 0.65460205c0.41912842 0.41915894 0.65460205 0.98760986 0.65460205 1.5803528l0 67.02615c0 1.234314 -1.0006714 2.2349548 -2.2349854 2.2349548l-67.02612 0l0 0c-1.234314 0 -2.2349854 -1.0006409 -2.2349854 -2.2349548z" fill-rule="evenodd"/><path stroke="#d6d6d6" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m739.0079 410.3251l0 0c0 -1.234314 1.0006714 -2.2349548 2.2349854 -2.2349548l67.02612 0c0.59277344 0 1.1612549 0.23547363 1.5803833 0.65460205c0.41912842 0.41915894 0.65460205 0.98760986 0.65460205 1.5803528l0 67.02615c0 1.234314 -1.0006714 2.2349548 -2.2349854 2.2349548l-67.02612 0l0 0c-1.234314 0 -2.2349854 -1.0006409 -2.2349854 -2.2349548z" fill-rule="evenodd"/><path fill="#9396a2" d="m774.76404 463.16562c-5.0162964 0 -9.7230835 -0.65496826 -13.259888 -1.8378296c-1.8533936 -0.63882446 -3.2398682 -1.3242188 -4.221985 -2.118744c-1.2164917 -0.9645386 -1.8390503 -2.0543518 -1.8390503 -3.2229004l0 -24.466064c0 -1.4476929 1.0125122 -2.50708 1.8533325 -3.1602478c1.0447998 -0.79455566 2.46344 -1.4799194 4.239868 -2.0561523c3.520752 -1.1524353 8.225769 -1.7912903 13.227722 -1.7912903c5.001953 0 9.70697 0.638855 13.229492 1.7912903c1.7746582 0.5601196 3.1932983 1.2454834 4.238098 2.0561523c0.85687256 0.63705444 1.8533325 1.7125549 1.8533325 3.1602478l0 24.466064c0 1.1685486 -0.6225586 2.2422485 -1.8390503 3.2229004c-0.99645996 0.79452515 -2.3685913 1.4960022 -4.221985 2.118744c-3.5368042 1.1828613 -8.243591 1.8378296 -13.259888 1.8378296zm-17.15448 -7.179474c0 0.32748413 0.16992188 0.8714905 1.0125732 1.5264282c0.81036377 0.638855 2.0411987 1.2455139 3.5671997 1.7590942c3.350769 1.105896 7.821411 1.7143555 12.574707 1.7143555c4.751526 0 9.223938 -0.6084595 12.574707 -1.7143555c1.526001 -0.5135803 2.756836 -1.1202393 3.5671997 -1.7590942c0.84265137 -0.6692505 1.0125732 -1.1989441 1.0125732 -1.5264282l0 -9.2034l-0.5921631 0.35787964c-0.90338135 0.54400635 -2.0089722 1.0271912 -3.3024292 1.4477234c-3.5368042 1.1381226 -8.257935 1.775177 -13.259888 1.775177c-5.001953 0 -9.70697 -0.6227417 -13.259888 -1.775177c-1.293457 -0.42053223 -2.3990479 -0.90371704 -3.3024292 -1.4477234l-0.5921631 -0.35787964l0 9.2034zm0 -12.63031c0 0.31137085 0.16992188 0.8106384 0.99645996 1.4494934c0.81036377 0.60665894 2.0411987 1.1989746 3.5689697 1.6964417c3.348999 1.0755005 7.805298 1.6821594 12.58905 1.6821594c4.7836914 0 9.240051 -0.5923462 12.58905 -1.6821594c1.527771 -0.49746704 2.758545 -1.0897827 3.5689697 -1.6964417c0.8408203 -0.65493774 1.0125732 -1.1524353 1.0125732 -1.4656067l0 -8.408844l-0.5921631 0.35787964c-0.9034424 0.5458069 -2.0250854 1.0289612 -3.3346558 1.4494934c-3.520691 1.1524658 -8.227478 1.7895203 -13.227661 1.7895203c-5.002014 0 -9.707031 -0.63705444 -13.229492 -1.7895203c-1.3095093 -0.42053223 -2.4151 -0.9036865 -3.3346558 -1.4494934l-0.5921631 -0.35787964l0 8.408844zm17.15448 -16.647736c-4.753296 0 -9.207886 0.5923462 -12.558594 1.6821289c-1.5582275 0.51361084 -2.7890625 1.1059265 -3.583313 1.7125549c-0.8265381 0.6227722 -1.0125732 1.1220398 -1.0125732 1.4334106c0 0.31137085 0.16992188 0.8088379 1.0125732 1.4315796c0.7942505 0.60842896 2.0250854 1.2150879 3.583313 1.7143555c3.350708 1.0737 7.805298 1.6821289 12.558594 1.6821289c4.751526 0 9.209656 -0.5923157 12.558594 -1.6821289c1.5582275 -0.5135803 2.7890015 -1.1059265 3.583313 -1.7143555c0.8265381 -0.6227417 1.0125732 -1.1202087 1.0125732 -1.4315796c0 -0.31137085 -0.16992188 -0.8106384 -1.0125732 -1.4334106c-0.7943115 -0.6066284 -2.0250854 -1.2150574 -3.583313 -1.7125549c-3.348938 -1.07547 -7.807068 -1.6821289 -12.558594 -1.6821289z" fill-rule="evenodd"/><path fill="#ffffff" d="m149.48859 410.3251l0 0c0 -1.234314 1.0006409 -2.2349548 2.23497 -2.2349548l67.02614 0c0.5927429 0 1.1612091 0.23547363 1.5803528 0.65460205c0.41914368 0.41915894 0.65460205 0.98760986 0.65460205 1.5803528l0 67.02615c0 1.234314 -1.0006256 2.2349548 -2.2349548 2.2349548l-67.02614 0l0 0c-1.2343292 0 -2.23497 -1.0006409 -2.23497 -2.2349548z" fill-rule="evenodd"/><path stroke="#d6d6d6" stroke-width="1.0" stroke-linejoin="round" stroke-linecap="butt" d="m149.48859 410.3251l0 0c0 -1.234314 1.0006409 -2.2349548 2.23497 -2.2349548l67.02614 0c0.5927429 0 1.1612091 0.23547363 1.5803528 0.65460205c0.41914368 0.41915894 0.65460205 0.98760986 0.65460205 1.5803528l0 67.02615c0 1.234314 -1.0006256 2.2349548 -2.2349548 2.2349548l-67.02614 0l0 0c-1.2343292 0 -2.23497 -1.0006409 -2.23497 -2.2349548z" fill-rule="evenodd"/><path fill="#e03875" d="m425.44894 443.853l0 0c0 -14.811676 12.007233 -26.818909 26.818909 -26.818909l0.03149414 0l0 0c7.112793 0 13.934296 2.8255615 18.963806 7.855072c5.029541 5.029541 7.855072 11.851013 7.855072 18.963837l0 0l0 0c0 14.811676 -12.007233 26.818909 -26.818878 26.818909l-0.03149414 0l0 0c-14.811676 0 -26.818909 -12.007233 -26.818909 -26.818909z" fill-rule="evenodd"/><path stroke="#ffffff" stroke-width="2.0" stroke-miterlimit="400.0" stroke-linecap="butt" stroke-opacity="0.4784" d="m425.44894 443.853l0 0c0 -14.811676 12.007233 -26.818909 26.818909 -26.818909l0.03149414 0l0 0c7.112793 0 13.934296 2.8255615 18.963806 7.855072c5.029541 5.029541 7.855072 11.851013 7.855072 18.963837l0 0l0 0c0 14.811676 -12.007233 26.818909 -26.818878 26.818909l-0.03149414 0l0 0c-14.811676 0 -26.818909 -12.007233 -26.818909 -26.818909z" fill-rule="evenodd"/><path fill="#929292" d="m185.24359 463.98264c-10.656921 0 -19.320938 -8.664001 -19.320938 -19.320923c0 -10.656952 8.664017 -19.320953 19.320938 -19.320953c10.656937 0 19.320953 8.664001 19.320953 19.320953c0 10.656921 -8.664017 19.320923 -19.320953 19.320923zm8.113007 -18.444336c-0.2826538 5.6674805 -2.1485596 11.080902 -5.413437 15.646393l-0.5080719 0.7066345l0.86050415 -0.15563965c7.9859924 -1.4132996 13.8520355 -8.055756 14.2760315 -16.168762l0 -0.38284302l-9.200714 0l0 0.3399048zm-25.455338 0.042938232c0.4239807 8.098694 6.290039 14.755463 14.2760315 16.168762l0.86050415 0.15563965l-0.5080719 -0.7066345c-3.2648926 -4.5654907 -5.130783 -9.978912 -5.413452 -15.646393l0 -0.3399048l-9.243637 0l0 0.38104248zm11.2079315 0c0.31129456 5.6531677 2.3882904 11.179321 5.8517456 15.546204l0.2826538 0.35421753l0.28266907 -0.35421753c3.477768 -4.3668823 5.554764 -9.893036 5.8517303 -15.546204l0 -0.38284302l-12.297424 0l0 0.38284302zm8.862595 -17.428223c3.0806122 4.3257446 4.932205 9.4279175 5.356201 14.755493l0.02861023 0.32559204l9.215027 0l-0.042938232 -0.39535522c-0.80503845 -7.6460876 -6.6424713 -13.921814 -14.204468 -15.251038l-0.8622894 -0.15563965l0.5098572 0.7066345zm-2.9822235 0.057250977c-3.3221283 4.182617 -5.329361 9.243652 -5.7944946 14.642761l-0.028625488 0.39538574l12.211548 0l-0.02861023 -0.39538574c-0.4669342 -5.399109 -2.4741669 -10.460144 -5.7944946 -14.642761l-0.28266907 -0.35421753l-0.2826538 0.35421753zm-2.7711182 -0.60824585c-7.5620117 1.3435059 -13.397644 7.60495 -14.204483 15.251007l-0.041137695 0.39538574l9.215012 0l0.028625488 -0.32559204c0.42219543 -5.3275757 2.2737885 -10.444061 5.356201 -14.755493l0.50805664 -0.7066345l-0.86227417 0.15563965z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m107.53936 484.95804l155.40158 0l0 37.165314l-155.40158 0z" fill-rule="evenodd"/><path fill="#4e515d" d="m170.75928 497.56927l1.65625 7.125l0.03125 0l1.8125 -7.125l2.15625 0l1.796875 7.21875l0.015625 0l1.71875 -7.21875l2.265625 0l-2.8125 10.46875l-2.296875 0l-1.765625 -7.125l-0.03125 0l-1.75 7.125l-2.328125 0l-2.765625 -10.46875l2.296875 0zm20.333267 0l0 1.9375l-5.53125 0l0 2.234375l5.0625 0l0 1.796875l-5.0625 0l0 2.5625l5.640625 0l0 1.9375l-7.9375 0l0 -10.46875l7.828125 0zm6.6683807 0q1.59375 0 2.421875 0.640625q0.84375 0.625 0.84375 1.953125q0 0.796875 -0.375 1.328125q-0.375 0.53125 -1.046875 0.859375q0.953125 0.28125 1.4375 0.96875q0.484375 0.671875 0.484375 1.6875q0 1.4375 -1.046875 2.234375q-1.046875 0.796875 -2.59375 0.796875l-5.125 0l0 -10.46875l5.0 0zm-0.328125 4.25q0.609375 0 0.984375 -0.3125q0.375 -0.328125 0.375 -0.9375q0 -0.625 -0.390625 -0.90625q-0.375 -0.296875 -1.125 -0.296875l-2.21875 0l0 2.453125l2.375 0zm0.140625 4.421875q0.765625 0 1.203125 -0.328125q0.4375 -0.34375 0.4375 -1.03125q0 -0.75 -0.421875 -1.125q-0.40625 -0.375 -1.171875 -0.375l-2.5625 0l0 2.859375l2.515625 0z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m697.05865 484.95804l155.40161 0l0 37.165314l-155.40161 0z" fill-rule="evenodd"/><path fill="#4e515d" d="m742.21436 497.56927q2.09375 0 3.390625 1.375q1.296875 1.359375 1.296875 3.8125q0 2.4375 -1.265625 3.859375q-1.265625 1.421875 -3.421875 1.421875l-4.578125 0l0 -10.46875l4.578125 0zm-0.171875 8.53125q1.09375 0 1.8125 -0.78125q0.734375 -0.796875 0.734375 -2.359375q0 -1.8125 -0.765625 -2.625q-0.75 -0.828125 -2.1875 -0.828125l-1.703125 0l0 6.59375l2.109375 0zm11.309326 -8.53125l3.921875 10.46875l-2.390625 0l-0.78125 -2.328125l-3.921875 0l-0.828125 2.328125l-2.3125 0l3.96875 -10.46875l2.34375 0zm-1.203125 2.578125l-1.359375 3.84375l2.703125 0l-1.3125 -3.84375l-0.03125 0zm12.472717 -2.578125l0 1.9375l-3.140625 0l0 8.53125l-2.296875 0l0 -8.53125l-3.140625 0l0 -1.9375l8.578125 0zm5.0880127 0l3.921875 10.46875l-2.390625 0l-0.78125 -2.328125l-3.921875 0l-0.828125 2.328125l-2.3125 0l3.96875 -10.46875l2.34375 0zm-1.203125 2.578125l-1.359375 3.84375l2.703125 0l-1.3125 -3.84375l-0.03125 0zm11.040405 -2.578125q1.59375 0 2.421875 0.640625q0.84375 0.625 0.84375 1.953125q0 0.796875 -0.375 1.328125q-0.375 0.53125 -1.046875 0.859375q0.953125 0.28125 1.4375 0.96875q0.484375 0.671875 0.484375 1.6875q0 1.4375 -1.046875 2.234375q-1.046875 0.796875 -2.59375 0.796875l-5.125 0l0 -10.46875l5.0 0zm-0.328125 4.25q0.609375 0 0.984375 -0.3125q0.375 -0.328125 0.375 -0.9375q0 -0.625 -0.390625 -0.90625q-0.375 -0.296875 -1.125 -0.296875l-2.21875 0l0 2.453125l2.375 0zm0.140625 4.421875q0.765625 0 1.203125 -0.328125q0.4375 -0.34375 0.4375 -1.03125q0 -0.75 -0.421875 -1.125q-0.40625 -0.375 -1.171875 -0.375l-2.5625 0l0 2.859375l2.515625 0zm10.710144 -8.671875l3.921875 10.46875l-2.390625 0l-0.78125 -2.328125l-3.921875 0l-0.828125 2.328125l-2.3125 0l3.96875 -10.46875l2.34375 0zm-1.203125 2.578125l-1.359375 3.84375l2.703125 0l-1.3125 -3.84375l-0.03125 0zm9.634094 -2.828125q1.90625 0 3.046875 0.890625q1.140625 0.875 1.140625 2.484375l-2.21875 0q-0.046875 -0.78125 -0.546875 -1.171875q-0.484375 -0.40625 -1.515625 -0.40625q-0.6875 0 -1.140625 0.3125q-0.453125 0.296875 -0.453125 0.875q0 0.390625 0.1875 0.59375q0.1875 0.1875 0.765625 0.40625q0.578125 0.203125 2.515625 0.65625q1.296875 0.3125 2.03125 1.0625q0.734375 0.75 0.734375 1.90625q0 1.515625 -1.140625 2.4375q-1.140625 0.921875 -3.203125 0.921875q-1.984375 0 -3.234375 -0.96875q-1.234375 -0.984375 -1.234375 -2.6875l0 -0.0625l2.21875 0q0.015625 0.96875 0.65625 1.453125q0.640625 0.484375 1.671875 0.484375q0.921875 0 1.46875 -0.34375q0.5625 -0.34375 0.5625 -0.96875q0 -0.5 -0.421875 -0.828125q-0.421875 -0.328125 -1.359375 -0.5625q-1.203125 -0.28125 -2.1875 -0.578125q-0.984375 -0.296875 -1.625 -0.984375q-0.640625 -0.6875 -0.640625 -1.75q0 -1.40625 1.125 -2.28125q1.140625 -0.890625 2.796875 -0.890625zm13.745239 0.25l0 1.9375l-5.53125 0l0 2.234375l5.0625 0l0 1.796875l-5.0625 0l0 2.5625l5.640625 0l0 1.9375l-7.9375 0l0 -10.46875l7.828125 0z" fill-rule="nonzero"/><path fill="#000000" fill-opacity="0.0" d="m323.36685 432.07346l-49.35434 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m323.36685 432.07346l-43.35434 0" fill-rule="evenodd"/><path fill="#e03875" stroke="#e03875" stroke-width="1.0" stroke-linecap="butt" d="m280.0125 430.42172l-4.5381165 1.6517334l4.5381165 1.6517334z" fill-rule="evenodd"/><path fill="#000000" fill-opacity="0.0" d="m274.0231 457.24615l49.35434 0" fill-rule="evenodd"/><path stroke="#e03875" stroke-width="1.0" stroke-miterlimit="400.0" stroke-linecap="butt" d="m274.0231 457.24615l43.35431 0" fill-rule="evenodd"/><path fill="#e03875" stroke="#e03875" stroke-width="1.0" stroke-linecap="butt" d="m317.3774 458.8979l4.5381165 -1.6517334l-4.5381165 -1.6517334z" fill-rule="evenodd"/><path fill="#ffffff" d="m447.4663 453.8968c-0.1628418 0 -0.3149414 -0.04660034 -0.44415283 -0.12863159c-0.035003662 -0.023284912 -0.082092285 -0.057769775 -0.11709595 -0.09320068l-8.8871765 -8.890533c-0.15209961 -0.15194702 -0.2341919 -0.35046387 -0.2341919 -0.57321167c0 -0.22183228 0.082092285 -0.42034912 0.2341919 -0.57318115c0.15206909 -0.1519165 0.36203003 -0.23394775 0.57336426 -0.23394775c0.20996094 0 0.41992188 0.08203125 0.5720215 0.23394775l8.30304 8.305237l17.927826 -17.932098c0.15206909 -0.1519165 0.36203003 -0.23391724 0.57336426 -0.23391724c0.20996094 0 0.41992188 0.08200073 0.5720215 0.23391724c0.31628418 0.3159485 0.31628418 0.83044434 0 1.1463928l-18.499847 18.50528c-0.15206909 0.15286255 -0.36206055 0.24606323 -0.57336426 0.24606323z" fill-rule="evenodd"/><path fill="#ffffff" d="m487.37338 458.657c-2.1542358 0 -3.9013672 -1.74646 -3.9013672 -3.90036l0 -9.923065c0 -1.6723633 1.0776367 -3.1581726 2.645813 -3.7014465l0 -4.2351074c0 -2.1113586 0.85849 -4.0992737 2.4266663 -5.5946655c1.558136 -1.4734497 3.6088562 -2.2787476 5.78421 -2.2787476c2.175354 0 4.226074 0.80529785 5.78421 2.2787476c1.5681763 1.4953918 2.4266663 3.483307 2.4266663 5.5946655l0 4.2351074c1.5681763 0.5432739 2.645813 2.0290833 2.645813 3.7014465l0 9.923065c0 2.1539001 -1.7471313 3.90036 -3.9013672 3.90036l-13.900604 0zm6.945282 -8.92981c-0.3981018 0 -0.7328491 0.3347473 -0.7328491 0.732605l0 2.64505c0 0.39648438 0.3347473 0.7312317 0.7328491 0.7312317c0.3970642 0 0.7318115 -0.3347473 0.7318115 -0.7312317l0 -2.64505c0 -0.39785767 -0.3347473 -0.732605 -0.7318115 -0.732605zm5.6896973 -8.803589l0 -4.0361633c0 -1.422699 -0.5860596 -2.7616882 -1.6425781 -3.764557c-1.0766296 -1.0151978 -2.5523376 -1.5900574 -4.058197 -1.5900574c-1.5058594 0 -2.9805603 0.5858154 -4.058197 1.5996704c-1.056488 1.004242 -1.6315002 2.3432312 -1.6315002 3.7645264l0 4.036194l11.379425 0z" fill-rule="evenodd"/></g></svg>
diff --git a/website/public/img/ecs/consul-on-ecs-architecture-dataplanes-dark.jpg b/website/public/img/ecs/consul-on-ecs-architecture-dataplanes-dark.jpg
deleted file mode 100644
index fc88e95145b52..0000000000000
Binary files a/website/public/img/ecs/consul-on-ecs-architecture-dataplanes-dark.jpg and /dev/null differ
diff --git a/website/public/img/ecs/consul-on-ecs-architecture-dataplanes.jpg b/website/public/img/ecs/consul-on-ecs-architecture-dataplanes.jpg
deleted file mode 100644
index 85b9eb7fb4fd5..0000000000000
Binary files a/website/public/img/ecs/consul-on-ecs-architecture-dataplanes.jpg and /dev/null differ
diff --git a/website/redirects.js b/website/redirects.js
index de2abb324440d..5deb7617cc971 100644
--- a/website/redirects.js
+++ b/website/redirects.js
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
 // REDIRECTS FILE
 
 // See the README file in this directory for documentation. Please do not
@@ -38,19 +33,19 @@ module.exports = [
     permanent: true,
   },
   {
-    source: '/consul/docs/connect/transparent-proxy',
-    destination: '/consul/docs/k8s/connect/transparent-proxy',
+    source: '/consul/docs/v1.16.x/connect/transparent-proxy',
+    destination: '/consul/docs/v1.16.x/k8s/connect/transparent-proxy',
     permanent: true,
   },
   {
-    source: '/consul/docs/agent/limits/init-rate-limits',
-    destination: '/consul/docs/agent/limits/usage/init-rate-limits',
+    source: '/consul/docs/1.16.x/agent/limits/init-rate-limits',
+    destination: '/consul/docs/1.16.x/agent/limits/usage/init-rate-limits',
     permanent: true,
   },
   {
-    source: '/consul/docs/agent/limits/set-global-traffic-rate-limits',
+    source: '/consul/docs/1.16.x/agent/limits/set-global-traffic-rate-limits',
     destination:
-      '/consul/docs/agent/limits/usage/set-global-traffic-rate-limits',
+      '/consul/docs/1.16.x/agent/limits/usage/set-global-traffic-rate-limits',
     permanent: true,
   },
   {
@@ -72,139 +67,4 @@ module.exports = [
     destination: '/consul/docs/k8s/deployment-configurations/multi-cluster',
     permanent: true,
   },
-  {
-    source: '/consul/docs/connect/registration/service-registration',
-    destination: '/consul/docs/connect/proxies/proxy-config-reference',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/connect/registration',
-    destination: '/consul/docs/connect/proxies/',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/connect/registration/sidecar-service',
-    destination: '/consul/docs/connect/proxies/deploy-sidecar-services',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/ecs/terraform/install',
-    destination: '/consul/docs/ecs/deploy/terraform',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/ecs/terraform/secure-configuration',
-    destination: '/consul/docs/ecs/deploy/terraform',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/ecs/terraform/migrate-existing-tasks',
-    destination: '/consul/docs/ecs/deploy/migrate-existing-tasks',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/ecs/manual/install',
-    destination: '/consul/docs/ecs/deploy/manual',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/ecs/manual/secure-configuration',
-    destination: '/consul/docs/ecs/deploy/manual',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/ecs/manual/acl-controller',
-    destination: '/consul/docs/ecs/deploy/manual',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/ecs/task-resource-usage',
-    destination: '/consul/docs/ecs/tech-specs',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/ecs/requirements',
-    destination: '/consul/docs/ecs/tech-specs',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/ecs/configuration-reference',
-    destination: '/consul/docs/ecs/reference/configuration-reference',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/ecs/compatibility',
-    destination: '/consul/docs/ecs/reference/compatibility',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/connect/gateways/api-gateway/usage',
-    destination:
-      '/consul/docs/connect/gateways/api-gateway/deploy/listeners-vms',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/agi-gateway',
-    destination: '/consul/docs/connect/gateways/agi-gateway',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/api-gateway/install',
-    destination: '/consul/docs/connect/gateways/api-gateway/deploy/install-k8s',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/api-gateway/usage/reroute-http-requests',
-    destination:
-      '/consul/docs/connect/gateways/api-gateway/define-routes/reroute-http-requests',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/api-gateway/usage/route-to-peered-services',
-    destination:
-      '/consul/docs/connect/gateways/api-gateway/route-to-peered-services',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/api-gateway/usage/errors',
-    destination: '/consul/docs/connect/gateways/api-gateway/errors',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/api-gateway/usage/usage',
-    destination:
-      '/consul/docs/connect/gateways/api-gateway/deploy/listeners-k8s',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/api-gateway/upgrades',
-    destination: '/consul/docs/connect/gateways/api-gateway/upgrades-k8s',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/api-gateway/configuration/',
-    destination: '/consul/docs/connect/gateways/api-gateway/configuration/',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/api-gateway/configuration/:slug',
-    destination:
-      '/consul/docs/connect/gateways/api-gateway/configuration/:slug',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/connect/failover',
-    destination: '/consul/docs/connect/manage-traffic/failover',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/connect/l7',
-    destination: '/consul/docs/connect/manage-traffic',
-    permanent: true,
-  },
-  {
-    source: '/consul/docs/connect/l7/:slug',
-    destination: '/consul/docs/connect/manage-traffic/:slug',
-    permanent: true,
-  },
 ]
diff --git a/website/scripts/should-build.sh b/website/scripts/should-build.sh
index b9ce35e4715b6..9760f47745be0 100644
--- a/website/scripts/should-build.sh
+++ b/website/scripts/should-build.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 
 ######################################################
 # NOTE: This file is managed by the Digital Team's   #
diff --git a/website/scripts/website-build.sh b/website/scripts/website-build.sh
index 9d504653802b6..e2c7b7eaba9e6 100755
--- a/website/scripts/website-build.sh
+++ b/website/scripts/website-build.sh
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 ######################################################
 # NOTE: This file is managed by the Digital Team's   #
 # Terraform configuration @ hashicorp/mktg-terraform #
diff --git a/website/scripts/website-start.sh b/website/scripts/website-start.sh
index e6d639fb397a7..794662ccff347 100755
--- a/website/scripts/website-start.sh
+++ b/website/scripts/website-start.sh
@@ -1,6 +1,3 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
 ######################################################
 # NOTE: This file is managed by the Digital Team's   #
 # Terraform configuration @ hashicorp/mktg-terraform #